From 606bd60ab6fbcb7f73deeef4fa37cfd5e447a200 Mon Sep 17 00:00:00 2001
From: Adrian Hunter
Date: Wed, 27 Mar 2019 09:28:26 +0200
Subject: perf scripts python: exported-sql-viewer.py: Fix python3 support

Unlike python2, python3 strings are not compatible with byte strings.
That results in disassembly not working for the branches reports. Fixup
those places overlooked in the port to python3.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Fixes: beda0e725e5f ("perf script python: Add Python3 support to exported-sql-viewer.py")
Link: http://lkml.kernel.org/r/20190327072826.19168-3-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/scripts/python/exported-sql-viewer.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'tools/perf/scripts/python')

diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index 0cf30956064a..74ef92f1d19a 100755
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -2908,9 +2908,13 @@ class LibXED():
 		ok = self.xed_format_context(2, inst.xedp, inst.bufferp, sizeof(inst.buffer), ip, 0, 0)
 		if not ok:
 			return 0, ""
+		if sys.version_info[0] == 2:
+			result = inst.buffer.value
+		else:
+			result = inst.buffer.value.decode()
 		# Return instruction length and the disassembled instruction text
 		# For now, assume the length is in byte 166
-		return inst.xedd[166], inst.buffer.value
+		return inst.xedd[166], result
 
 def TryOpen(file_name):
 	try:
@@ -2926,9 +2930,14 @@ def Is64Bit(f):
 	header = f.read(7)
 	f.seek(pos)
 	magic = header[0:4]
-	eclass = ord(header[4])
-	encoding = ord(header[5])
-	version = ord(header[6])
+	if sys.version_info[0] == 2:
+		eclass = ord(header[4])
+		encoding = ord(header[5])
+		version = ord(header[6])
+	else:
+		eclass = header[4]
+		encoding = header[5]
+		version = header[6]
 	if magic == chr(127) + "ELF" and eclass > 0 and eclass < 3 and encoding > 0 and encoding < 3 and version == 1:
 		result = True if eclass == 2 else False
 	return result
-- 
cgit v1.2.3-55-g7522

c76f7ec74'>commit</a><a class='active' href='/openslx/kernel-qcow2-linux.git/diff/?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>diff</a><a href='/openslx/kernel-qcow2-linux.git/stats/'>stats</a></td><td class='form'><form class='right' method='get' action='/openslx/kernel-qcow2-linux.git/log/'>
<input type='hidden' name='id' value='92fab77b6b309dc219b02da4a69ad5dc76f7ec74'/><input type='hidden' name='id2' value='3751cbda8f223549d7ea28803cbec8ac87e43ed2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='92fab77b6b309dc219b02da4a69ad5dc76f7ec74'/><input type='hidden' name='id2' value='3751cbda8f223549d7ea28803cbec8ac87e43ed2'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/openslx/kernel-qcow2-linux.git/diff/?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/.clang-format?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>.clang-format</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>.gitignore</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/.mailmap?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>.mailmap</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/obsolete/sysfs-class-net-batman-adv?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/obsolete/sysfs-class-net-batman-adv</a> (renamed from Documentation/ABI/testing/sysfs-class-net-batman-adv)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/obsolete/sysfs-class-net-mesh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/obsolete/sysfs-class-net-mesh</a> (renamed from Documentation/ABI/testing/sysfs-class-net-mesh)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/stable/sysfs-bus-nvmem?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/stable/sysfs-bus-nvmem</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/stable/sysfs-bus-vmbus?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/stable/sysfs-bus-vmbus</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/stable/sysfs-devices-node?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/stable/sysfs-devices-node</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-counter?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-counter</a></td><td class='right'>230</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-counter-104-quad-8?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-counter-104-quad-8</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-iio?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-iio-impedance-analyzer-ad5933?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio-impedance-analyzer-ad5933</a> (renamed from drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933)</td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-iio-sps30?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio-sps30</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-class-mei?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-class-mei</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-devices-platform-ipmi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-devices-platform-ipmi</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-devices-system-cpu?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-devices-system-cpu</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-driver-ucsi-ccg?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-driver-ucsi-ccg</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/sysfs-kernel-livepatch?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-kernel-livepatch</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/ABI/testing/usb-uevent?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/usb-uevent</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/DMA-API-HOWTO.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/DMA-API-HOWTO.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/Design/Data-Structures/Data-Structures.html?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/Design/Data-Structures/Data-Structures.html</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/NMI-RCU.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/NMI-RCU.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/UP.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/UP.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/checklist.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/checklist.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/rcu.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/rcu.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/rcu_dereference.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/rcu_dereference.txt</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/rcubarrier.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/rcubarrier.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/Documentation/RCU/whatisRCU.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/whatisRCU.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/accounting/psi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/accounting/psi.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/aml-debugger.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/aml-debugger.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/apei/output_format.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/apei/output_format.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/dsd/leds.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/dsd/leds.txt</a></td><td class='right'>99</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/i2c-muxes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/i2c-muxes.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/initrd_table_override.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/initrd_table_override.txt</a></td><td class='right'>111</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/method-customizing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/method-customizing.txt</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/method-tracing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/method-tracing.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/acpi/ssdt-overlays.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/ssdt-overlays.txt</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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/acpi/cppc_sysfs.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/acpi/cppc_sysfs.rst</a> (renamed from Documentation/acpi/cppc_sysfs.txt)</td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/acpi/dsdt-override.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/acpi/dsdt-override.rst</a> (renamed from Documentation/acpi/dsdt-override.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/acpi/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/acpi/index.rst</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/acpi/initrd_table_override.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/acpi/initrd_table_override.rst</a></td><td class='right'>115</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/acpi/ssdt-overlays.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/acpi/ssdt-overlays.rst</a></td><td class='right'>180</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/ext4.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/ext4.rst</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/kernel-parameters.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/kernel-parameters.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/kernel-parameters.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/kernel-parameters.txt</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/mm/numaperf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/mm/numaperf.rst</a></td><td class='right'>169</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/cpufreq.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/cpufreq.rst</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/cpuidle.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/cpuidle.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/intel_epb.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/intel_epb.rst</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/intel_pstate.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/intel_pstate.rst</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/sleep-states.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/sleep-states.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/strategies.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/strategies.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/system-wide.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/system-wide.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/admin-guide/pm/working-state.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/working-state.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/arm64/cpu-feature-registers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/cpu-feature-registers.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/arm64/elf_hwcaps.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/elf_hwcaps.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/arm64/silicon-errata.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/silicon-errata.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/arm64/sve.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/sve.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/atomic_bitops.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/atomic_bitops.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/atomic_t.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/atomic_t.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/block/bfq-iosched.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/block/bfq-iosched.txt</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/block/null_blk.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/block/null_blk.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/bpf/bpf_design_QA.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/bpf_design_QA.rst</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/bpf/btf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/btf.rst</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/bpf/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/bpf/prog_cgroup_sysctl.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/prog_cgroup_sysctl.rst</a></td><td class='right'>125</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/bpf/prog_flow_dissector.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/prog_flow_dissector.rst</a></td><td class='right'>126</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/clearing-warn-once.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/clearing-warn-once.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/core-api/cachetlb.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/core-api/cachetlb.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/core-api/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/core-api/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/core-api/printk-formats.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/core-api/printk-formats.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/cputopology.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/cputopology.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/crypto/api-samples.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/crypto/api-samples.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/dev-tools/kselftest.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/dev-tools/kselftest.rst</a></td><td class='right'>136</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/arm/coresight.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/arm/coresight.txt</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/arm/cpus.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/arm/cpus.yaml</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/connector/usb-connector.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/connector/usb-connector.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/counter/ftm-quaddec.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/counter/ftm-quaddec.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt</a> (renamed from Documentation/devicetree/bindings/iio/counter/stm32-lptimer-cnt.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/display/simple-framebuffer.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/simple-framebuffer.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/display/simple-framebuffer.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/simple-framebuffer.yaml</a></td><td class='right'>160</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/gnss/u-blox.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/gnss/u-blox.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/hwmon/adc128d818.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/adc128d818.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/hwmon/g762.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/g762.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/hwmon/lm75.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/lm75.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/hwmon/pwm-fan.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/pwm-fan.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt</a> (renamed from Documentation/devicetree/bindings/i2c/i2c-xscale.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt</a> (renamed from Documentation/devicetree/bindings/i2c/i2c-mtk.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/i2c/i2c-stu300.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-stu300.txt</a> (renamed from Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt</a> (renamed from Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/i2c/i2c-wmt.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-wmt.txt</a> (renamed from Documentation/devicetree/bindings/i2c/i2c-vt8500.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/avia-hx711.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt</a></td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/light/vcnl4000.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/light/vcnl4000.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/pressure/bmp085.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/pressure/bmp085.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/pressure/bmp085.yaml</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/st-sensors.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/st-sensors.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/temperature/max31856.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/temperature/max31856.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/interconnect/interconnect.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/interconnect/interconnect.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/leds/leds-lm3532.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/leds/leds-lm3532.txt</a></td><td class='right'>101</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/aspeed-video.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/aspeed-video.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/cedrus.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/cedrus.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/meson-ao-cec.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/meson-ao-cec.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/rcar_imr.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/rcar_imr.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/rcar_vin.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/rcar_vin.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mfd/axp20x.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/axp20x.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mfd/stm32-lptimer.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/stm32-lptimer.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mfd/stm32-timers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/stm32-timers.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mfd/ti-lmu.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/ti-lmu.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/fsl-esdhc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mmc/mmc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/mmc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mmc/mtk-sd.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/mtk-sd.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/altera_tse.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/altera_tse.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/amd-xgbe.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/amd-xgbe.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/brcm,amac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/brcm,amac.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/cpsw.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/cpsw.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/davinci_emac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/davinci_emac.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/dsa/dsa.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/dsa/dsa.txt</a></td><td class='right'>160</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/dsa/qca8k.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/dsa/qca8k.txt</a></td><td class='right'>73</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/dsa/sja1105.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/dsa/sja1105.txt</a></td><td class='right'>156</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/ethernet.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/ethernet.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/hisilicon-femac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/hisilicon-femac.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/keystone-netcp.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/keystone-netcp.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/macb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/macb.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/marvell-pxa168.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/marvell-pxa168.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/microchip,enc28j60.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/microchip,enc28j60.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/microchip,lan78xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/microchip,lan78xx.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/phy.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/qca,qca7000.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/qca,qca7000.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/samsung-sxgbe.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/samsung-sxgbe.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/socionext-netsec.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/socionext-netsec.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/nvmem/imx-ocotp.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt</a></td><td class='right'>141</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt</a></td><td class='right'>132</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/regulator/gpio-regulator.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/regulator/gpio-regulator.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/serial/cdns,uart.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/cdns,uart.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/serial/mtk-uart.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/mtk-uart.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/serial/sifive-serial.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/sifive-serial.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/serial/sprd-uart.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/sprd-uart.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/fsl-spi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/fsl-spi.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/sh-msiof.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/sh-msiof.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/spi-mt65xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/spi-mt65xx.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/spi-mt7621.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/spi-mt7621.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/trivial-devices.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/trivial-devices.yaml</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/ufs/cdns,ufshc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/cdns,ufshc.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/ufs/ufs-mediatek.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/ufs-mediatek.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/ufs/ufs-qcom.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/ufs-qcom.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/amlogic,dwc3.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/amlogic,dwc3.txt</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/dwc2.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/dwc2.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/generic-ehci.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/generic-ehci.yaml</a></td><td class='right'>95</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/generic-ohci.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/generic-ohci.yaml</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/renesas_usbhs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/renesas_usbhs.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/usb-ehci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-ehci.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/usb-hcd.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-hcd.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/usb-hcd.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-hcd.yaml</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/usb-ohci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-ohci.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/usb-xhci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-xhci.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/usb/usb251xb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb251xb.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/vendor-prefixes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/vendor-prefixes.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/bindings/writing-bindings.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/writing-bindings.txt</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/devicetree/writing-schema.md?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/writing-schema.md</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/doc-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/doc-guide/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/dontdiff?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/dontdiff</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/acpi/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/acpi/index.rst</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/acpi/linuxized-acpica.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/acpi/linuxized-acpica.rst</a> (renamed from Documentation/acpi/linuxized-acpica.txt)</td><td class='right'>109</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/acpi/scan_handlers.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/acpi/scan_handlers.rst</a> (renamed from Documentation/acpi/scan_handlers.txt)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/device-io.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/device-io.rst</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/generic-counter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/generic-counter.rst</a></td><td class='right'>342</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/pci/p2pdma.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pci/p2pdma.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/pm/cpuidle.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/cpuidle.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/pm/devices.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/devices.rst</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/pm/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/pm/notifiers.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/notifiers.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/pm/types.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/types.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/soundwire/stream.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/soundwire/stream.rst</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/driver-api/usb/power-management.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/usb/power-management.rst</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/features/debug/kgdb/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/debug/kgdb/arch-support.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/features/debug/kprobes/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/debug/kprobes/arch-support.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/features/debug/kretprobes/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/debug/kretprobes/arch-support.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/features/time/modern-timekeeping/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/time/modern-timekeeping/arch-support.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/filesystems/Locking?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/Locking</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/filesystems/debugfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/debugfs.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/filesystems/mount_api.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/mount_api.txt</a></td><td class='right'>367</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/filesystems/porting?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/porting</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/filesystems/vfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/vfs.txt</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/DSD-properties-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/DSD-properties-rules.rst</a> (renamed from Documentation/acpi/DSD-properties-rules.txt)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/acpi-lid.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/acpi-lid.rst</a> (renamed from Documentation/acpi/acpi-lid.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/aml-debugger.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/aml-debugger.rst</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/apei/einj.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/apei/einj.rst</a> (renamed from Documentation/acpi/apei/einj.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/apei/output_format.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/apei/output_format.rst</a></td><td class='right'>150</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/debug.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/debug.rst</a> (renamed from Documentation/acpi/debug.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/dsd/data-node-references.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/dsd/data-node-references.rst</a> (renamed from Documentation/acpi/dsd/data-node-references.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/dsd/graph.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/dsd/graph.rst</a> (renamed from Documentation/acpi/dsd/graph.txt)</td><td class='right'>157</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/enumeration.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/enumeration.rst</a> (renamed from Documentation/acpi/enumeration.txt)</td><td class='right'>161</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/gpio-properties.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/gpio-properties.rst</a> (renamed from Documentation/acpi/gpio-properties.txt)</td><td class='right'>78</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/i2c-muxes.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/i2c-muxes.rst</a></td><td class='right'>61</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/index.rst</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/lpit.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/lpit.rst</a> (renamed from Documentation/acpi/lpit.txt)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/method-customizing.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/method-customizing.rst</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/method-tracing.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/method-tracing.rst</a></td><td class='right'>238</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/namespace.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/namespace.rst</a> (renamed from Documentation/acpi/namespace.txt)</td><td class='right'>294</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/osi.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/osi.rst</a> (renamed from Documentation/acpi/osi.txt)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/acpi/video_extension.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/acpi/video_extension.rst</a> (renamed from Documentation/acpi/video_extension.txt)</td><td class='right'>83</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/firmware-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/firmware-guide/index.rst</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ab8500.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ab8500.rst</a> (renamed from Documentation/hwmon/ab8500)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/abituguru?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru</a></td><td class='right'>92</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/abituguru-datasheet.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru-datasheet.rst</a> (renamed from Documentation/hwmon/abituguru-datasheet)</td><td class='right'>160</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/abituguru.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru.rst</a></td><td class='right'>113</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/abituguru3.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru3.rst</a> (renamed from Documentation/hwmon/abituguru3)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/abx500.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abx500.rst</a> (renamed from Documentation/hwmon/abx500)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/acpi_power_meter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/acpi_power_meter.rst</a> (renamed from Documentation/hwmon/acpi_power_meter)</td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ad7314.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ad7314.rst</a> (renamed from Documentation/hwmon/ad7314)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adc128d818.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adc128d818.rst</a> (renamed from Documentation/hwmon/adc128d818)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adm1021.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1021.rst</a> (renamed from Documentation/hwmon/adm1021)</td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adm1025.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1025.rst</a> (renamed from Documentation/hwmon/adm1025)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adm1026.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1026.rst</a> (renamed from Documentation/hwmon/adm1026)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adm1031.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1031.rst</a> (renamed from Documentation/hwmon/adm1031)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adm1275.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1275.rst</a> (renamed from Documentation/hwmon/adm1275)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adm9240.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm9240.rst</a> (renamed from Documentation/hwmon/adm9240)</td><td class='right'>50</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ads1015.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ads1015.rst</a> (renamed from Documentation/hwmon/ads1015)</td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ads7828.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ads7828.rst</a> (renamed from Documentation/hwmon/ads7828)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adt7410.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7410.rst</a> (renamed from Documentation/hwmon/adt7410)</td><td class='right'>49</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adt7411.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7411.rst</a> (renamed from Documentation/hwmon/adt7411)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adt7462.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7462.rst</a> (renamed from Documentation/hwmon/adt7462)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adt7470.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7470.rst</a> (renamed from Documentation/hwmon/adt7470)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/adt7475.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7475.rst</a> (renamed from Documentation/hwmon/adt7475)</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/amc6821.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/amc6821.rst</a> (renamed from Documentation/hwmon/amc6821)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/asb100.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/asb100.rst</a> (renamed from Documentation/hwmon/asb100)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/asc7621.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/asc7621.rst</a> (renamed from Documentation/hwmon/asc7621)</td><td class='right'>146</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/aspeed-pwm-tacho.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/aspeed-pwm-tacho.rst</a> (renamed from Documentation/hwmon/aspeed-pwm-tacho)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/coretemp.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/coretemp.rst</a> (renamed from Documentation/hwmon/coretemp)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/da9052.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/da9052.rst</a> (renamed from Documentation/hwmon/da9052)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/da9055.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/da9055.rst</a> (renamed from Documentation/hwmon/da9055)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/dme1737.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/dme1737.rst</a> (renamed from Documentation/hwmon/dme1737)</td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ds1621.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ds1621.rst</a> (renamed from Documentation/hwmon/ds1621)</td><td class='right'>156</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ds620.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ds620.rst</a> (renamed from Documentation/hwmon/ds620)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/emc1403.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/emc1403.rst</a> (renamed from Documentation/hwmon/emc1403)</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/emc2103.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/emc2103.rst</a> (renamed from Documentation/hwmon/emc2103)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/emc6w201.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/emc6w201.rst</a> (renamed from Documentation/hwmon/emc6w201)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/f71805f.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/f71805f.rst</a> (renamed from Documentation/hwmon/f71805f)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/f71882fg.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/f71882fg.rst</a> (renamed from Documentation/hwmon/f71882fg)</td><td class='right'>56</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/fam15h_power.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/fam15h_power.rst</a> (renamed from Documentation/hwmon/fam15h_power)</td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ftsteutates.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ftsteutates.rst</a> (renamed from Documentation/hwmon/ftsteutates)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/g760a.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/g760a.rst</a> (renamed from Documentation/hwmon/g760a)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/g762.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/g762.rst</a> (renamed from Documentation/hwmon/g762)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/gl518sm.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/gl518sm.rst</a> (renamed from Documentation/hwmon/gl518sm)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/hih6130.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/hih6130.rst</a> (renamed from Documentation/hwmon/hih6130)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/hwmon-kernel-api.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/hwmon-kernel-api.rst</a> (renamed from Documentation/hwmon/hwmon-kernel-api.txt)</td><td class='right'>337</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ibm-cffps.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ibm-cffps.rst</a> (renamed from Documentation/hwmon/ibm-cffps)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ibmaem.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ibmaem.rst</a> (renamed from Documentation/hwmon/ibmaem)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ibmpowernv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ibmpowernv.rst</a> (renamed from Documentation/hwmon/ibmpowernv)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ina209.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ina209.rst</a> (renamed from Documentation/hwmon/ina209)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ina2xx.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ina2xx.rst</a> (renamed from Documentation/hwmon/ina2xx)</td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ina3221.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ina3221.rst</a> (renamed from Documentation/hwmon/ina3221)</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/index.rst</a></td><td class='right'>182</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ir35221.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ir35221.rst</a> (renamed from Documentation/hwmon/ir35221)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ir38064.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ir38064.rst</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/isl68137.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/isl68137.rst</a></td><td class='right'>80</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/it87.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/it87.rst</a> (renamed from Documentation/hwmon/it87)</td><td class='right'>102</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/jc42.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/jc42.rst</a> (renamed from Documentation/hwmon/jc42)</td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/k10temp.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/k10temp.rst</a> (renamed from Documentation/hwmon/k10temp)</td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/k8temp.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/k8temp.rst</a> (renamed from Documentation/hwmon/k8temp)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lineage-pem.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lineage-pem.rst</a> (renamed from Documentation/hwmon/lineage-pem)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm25066.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm25066.rst</a> (renamed from Documentation/hwmon/lm25066)</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm63.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm63.rst</a> (renamed from Documentation/hwmon/lm63)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm70.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm70.rst</a> (renamed from Documentation/hwmon/lm70)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm73.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm73.rst</a> (renamed from Documentation/hwmon/lm73)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm75.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm75.rst</a> (renamed from Documentation/hwmon/lm75)</td><td class='right'>102</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm77.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm77.rst</a> (renamed from Documentation/hwmon/lm77)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm78.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm78.rst</a> (renamed from Documentation/hwmon/lm78)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm80.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm80.rst</a> (renamed from Documentation/hwmon/lm80)</td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm83.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm83.rst</a> (renamed from Documentation/hwmon/lm83)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm85.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm85.rst</a> (renamed from Documentation/hwmon/lm85)</td><td class='right'>97</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm87.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm87.rst</a> (renamed from Documentation/hwmon/lm87)</td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm90.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm90.rst</a> (renamed from Documentation/hwmon/lm90)</td><td class='right'>174</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm92.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm92.rst</a> (renamed from Documentation/hwmon/lm92)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm93.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm93.rst</a> (renamed from Documentation/hwmon/lm93)</td><td class='right'>157</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm95234.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm95234.rst</a> (renamed from Documentation/hwmon/lm95234)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lm95245.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm95245.rst</a> (renamed from Documentation/hwmon/lm95245)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/lochnagar.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lochnagar.rst</a></td><td class='right'>83</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc2945.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc2945.rst</a> (renamed from Documentation/hwmon/ltc2945)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc2978.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc2978.rst</a> (renamed from Documentation/hwmon/ltc2978)</td><td class='right'>267</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc2990.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc2990.rst</a> (renamed from Documentation/hwmon/ltc2990)</td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc3815.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc3815.rst</a> (renamed from Documentation/hwmon/ltc3815)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc4151.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4151.rst</a> (renamed from Documentation/hwmon/ltc4151)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc4215.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4215.rst</a> (renamed from Documentation/hwmon/ltc4215)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc4245.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4245.rst</a> (renamed from Documentation/hwmon/ltc4245)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc4260.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4260.rst</a> (renamed from Documentation/hwmon/ltc4260)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ltc4261.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4261.rst</a> (renamed from Documentation/hwmon/ltc4261)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max16064.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max16064.rst</a> (renamed from Documentation/hwmon/max16064)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max16065.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max16065.rst</a> (renamed from Documentation/hwmon/max16065)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max1619.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max1619.rst</a> (renamed from Documentation/hwmon/max1619)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max1668.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max1668.rst</a> (renamed from Documentation/hwmon/max1668)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max197.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max197.rst</a> (renamed from Documentation/hwmon/max197)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max20751.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max20751.rst</a> (renamed from Documentation/hwmon/max20751)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max31722.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max31722.rst</a> (renamed from Documentation/hwmon/max31722)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max31785.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max31785.rst</a> (renamed from Documentation/hwmon/max31785)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max31790.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max31790.rst</a> (renamed from Documentation/hwmon/max31790)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max34440.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max34440.rst</a> (renamed from Documentation/hwmon/max34440)</td><td class='right'>90</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max6639.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6639.rst</a> (renamed from Documentation/hwmon/max6639)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max6642.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6642.rst</a> (renamed from Documentation/hwmon/max6642)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max6650.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6650.rst</a> (renamed from Documentation/hwmon/max6650)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max6697.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6697.rst</a> (renamed from Documentation/hwmon/max6697)</td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/max8688.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max8688.rst</a> (renamed from Documentation/hwmon/max8688)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/mc13783-adc.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/mc13783-adc.rst</a> (renamed from Documentation/hwmon/mc13783-adc)</td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/mcp3021.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/mcp3021.rst</a> (renamed from Documentation/hwmon/mcp3021)</td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/menf21bmc.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/menf21bmc.rst</a> (renamed from Documentation/hwmon/menf21bmc)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/mlxreg-fan.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/mlxreg-fan.rst</a> (renamed from Documentation/hwmon/mlxreg-fan)</td><td class='right'>60</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/nct6683.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct6683.rst</a> (renamed from Documentation/hwmon/nct6683)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/nct6775.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct6775.rst</a> (renamed from Documentation/hwmon/nct6775)</td><td class='right'>114</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/nct7802.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct7802.rst</a> (renamed from Documentation/hwmon/nct7802)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/nct7904.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct7904.rst</a> (renamed from Documentation/hwmon/nct7904)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/npcm750-pwm-fan.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/npcm750-pwm-fan.rst</a> (renamed from Documentation/hwmon/npcm750-pwm-fan)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/nsa320.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nsa320.rst</a> (renamed from Documentation/hwmon/nsa320)</td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ntc_thermistor.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ntc_thermistor.rst</a> (renamed from Documentation/hwmon/ntc_thermistor)</td><td class='right'>123</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/occ.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/occ.rst</a> (renamed from Documentation/hwmon/occ)</td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/pc87360.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pc87360.rst</a> (renamed from Documentation/hwmon/pc87360)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/pc87427.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pc87427.rst</a> (renamed from Documentation/hwmon/pc87427)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/pcf8591.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pcf8591.rst</a> (renamed from Documentation/hwmon/pcf8591)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/pmbus-core.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pmbus-core.rst</a> (renamed from Documentation/hwmon/pmbus-core)</td><td class='right'>173</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/pmbus.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pmbus.rst</a> (renamed from Documentation/hwmon/pmbus)</td><td class='right'>90</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/powr1220.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/powr1220.rst</a> (renamed from Documentation/hwmon/powr1220)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/pwm-fan.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pwm-fan.rst</a> (renamed from Documentation/hwmon/pwm-fan)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/raspberrypi-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/raspberrypi-hwmon.rst</a> (renamed from Documentation/hwmon/raspberrypi-hwmon)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sch5627.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sch5627.rst</a> (renamed from Documentation/hwmon/sch5627)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sch5636.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sch5636.rst</a> (renamed from Documentation/hwmon/sch5636)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/scpi-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/scpi-hwmon.rst</a> (renamed from Documentation/hwmon/scpi-hwmon)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sht15.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sht15.rst</a> (renamed from Documentation/hwmon/sht15)</td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sht21.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sht21.rst</a> (renamed from Documentation/hwmon/sht21)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sht3x.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sht3x.rst</a> (renamed from Documentation/hwmon/sht3x)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/shtc1.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/shtc1.rst</a> (renamed from Documentation/hwmon/shtc1)</td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sis5595.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sis5595.rst</a> (renamed from Documentation/hwmon/sis5595)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/smm665.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smm665.rst</a> (renamed from Documentation/hwmon/smm665)</td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/smsc47b397.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47b397.rst</a> (renamed from Documentation/hwmon/smsc47b397)</td><td class='right'>162</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/smsc47m1.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47m1.rst</a> (renamed from Documentation/hwmon/smsc47m1)</td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/smsc47m192?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47m192</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/smsc47m192.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47m192.rst</a></td><td class='right'>116</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/submitting-patches.rst</a> (renamed from Documentation/hwmon/submitting-patches)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/sysfs-interface.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sysfs-interface.rst</a> (renamed from Documentation/hwmon/sysfs-interface)</td><td class='right'>721</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tc654.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tc654.rst</a> (renamed from Documentation/hwmon/tc654)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tc74.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tc74.rst</a> (renamed from Documentation/hwmon/tc74)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/thmc50.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/thmc50.rst</a> (renamed from Documentation/hwmon/thmc50)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tmp102.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp102.rst</a> (renamed from Documentation/hwmon/tmp102)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tmp103.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp103.rst</a> (renamed from Documentation/hwmon/tmp103)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tmp108.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp108.rst</a> (renamed from Documentation/hwmon/tmp108)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tmp401.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp401.rst</a> (renamed from Documentation/hwmon/tmp401)</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tmp421.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp421.rst</a> (renamed from Documentation/hwmon/tmp421)</td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/tps40422.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tps40422.rst</a> (renamed from Documentation/hwmon/tps40422)</td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/twl4030-madc-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/twl4030-madc-hwmon.rst</a> (renamed from Documentation/hwmon/twl4030-madc-hwmon)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ucd9000.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ucd9000.rst</a> (renamed from Documentation/hwmon/ucd9000)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/ucd9200.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ucd9200.rst</a> (renamed from Documentation/hwmon/ucd9200)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/userspace-tools.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/userspace-tools.rst</a> (renamed from Documentation/hwmon/userspace-tools)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/vexpress.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/vexpress.rst</a> (renamed from Documentation/hwmon/vexpress)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/via686a.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/via686a.rst</a> (renamed from Documentation/hwmon/via686a)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/vt1211.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/vt1211.rst</a> (renamed from Documentation/hwmon/vt1211)</td><td class='right'>84</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83627ehf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83627ehf.rst</a> (renamed from Documentation/hwmon/w83627ehf)</td><td class='right'>162</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83627hf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83627hf.rst</a> (renamed from Documentation/hwmon/w83627hf)</td><td class='right'>65</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83773g.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83773g.rst</a> (renamed from Documentation/hwmon/w83773g)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83781d.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83781d.rst</a> (renamed from Documentation/hwmon/w83781d)</td><td class='right'>330</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83791d.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83791d.rst</a> (renamed from Documentation/hwmon/w83791d)</td><td class='right'>123</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83792d.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83792d.rst</a> (renamed from Documentation/hwmon/w83792d)</td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83793?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83793</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83793.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83793.rst</a></td><td class='right'>113</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83795?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83795</a></td><td class='right'>127</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83795.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83795.rst</a></td><td class='right'>142</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83l785ts.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83l785ts.rst</a> (renamed from Documentation/hwmon/w83l785ts)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/w83l786ng.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83l786ng.rst</a> (renamed from Documentation/hwmon/w83l786ng)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/wm831x.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/wm831x.rst</a> (renamed from Documentation/hwmon/wm831x)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/wm8350.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/wm8350.rst</a> (renamed from Documentation/hwmon/wm8350)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/xgene-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/xgene-hwmon.rst</a> (renamed from Documentation/hwmon/xgene-hwmon)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/hwmon/zl6100.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/zl6100.rst</a> (renamed from Documentation/hwmon/zl6100)</td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/i2c/busses/i2c-i801?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/i2c/busses/i2c-i801</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/index.rst</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/kbuild/kbuild.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/kbuild/kbuild.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/kprobes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/kprobes.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/livepatch/callbacks.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/callbacks.rst</a> (renamed from Documentation/livepatch/callbacks.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/livepatch/cumulative-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/cumulative-patches.rst</a> (renamed from Documentation/livepatch/cumulative-patches.txt)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/livepatch/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/index.rst</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/livepatch/livepatch.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/livepatch.rst</a> (renamed from Documentation/livepatch/livepatch.txt)</td><td class='right'>62</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/livepatch/module-elf-format.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/module-elf-format.rst</a> (renamed from Documentation/livepatch/module-elf-format.txt)</td><td class='right'>353</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/livepatch/shadow-vars.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/shadow-vars.rst</a> (renamed from Documentation/livepatch/shadow-vars.txt)</td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/lzo.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/lzo.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/kapi/mc-core.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/kapi/mc-core.rst</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/lirc.h.rst.exceptions?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/lirc.h.rst.exceptions</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/mediactl/request-api.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/mediactl/request-api.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/rc/rc-tables.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/rc/rc-tables.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/buffer.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/buffer.rst</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/colorspaces-defs.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/colorspaces-defs.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/colorspaces.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/colorspaces.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/dev-raw-vbi.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-raw-vbi.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/dev-rds.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-rds.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/dev-sliced-vbi.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-sliced-vbi.rst</a></td><td class='right'>22</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/dev-subdev.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-subdev.rst</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/ext-ctrls-camera.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-camera.rst</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/ext-ctrls-codec.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-codec.rst</a></td><td class='right'>235</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/ext-ctrls-detect.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-detect.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/ext-ctrls-dv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-dv.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/ext-ctrls-flash.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-flash.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/field-order.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/field-order.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-compressed.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-compressed.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst</a></td><td class='right'>440</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-srggb10p.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-srggb12p.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-srggb14p.rst</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/pixfmt-y10p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-y10p.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/subdev-formats.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/subdev-formats.rst</a></td><td class='right'>113</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/uapi/v4l/vidioc-qbuf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/vidioc-qbuf.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/v4l-drivers/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/v4l-drivers/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/media/v4l-drivers/zoran.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/v4l-drivers/zoran.rst</a></td><td class='right'>583</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/memory-barriers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/memory-barriers.txt</a></td><td class='right'>249</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/batman-adv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/batman-adv.rst</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/decnet.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/decnet.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/devlink-info-versions.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/devlink-info-versions.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/dsa/bcm_sf2.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/bcm_sf2.rst</a> (renamed from Documentation/networking/dsa/bcm_sf2.txt)</td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/dsa/dsa.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/dsa.rst</a> (renamed from Documentation/networking/dsa/dsa.txt)</td><td class='right'>279</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/dsa/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/index.rst</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/dsa/lan9303.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/lan9303.rst</a> (renamed from Documentation/networking/dsa/lan9303.txt)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/dsa/sja1105.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/sja1105.rst</a></td><td class='right'>220</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/ip-sysctl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/ip-sysctl.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/msg_zerocopy.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/msg_zerocopy.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/netdev-FAQ.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/netdev-FAQ.rst</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/nf_flowtable.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/nf_flowtable.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/rxrpc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/rxrpc.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/networking/snmp_counter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/snmp_counter.rst</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/ntb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ntb.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/packing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/packing.txt</a></td><td class='right'>149</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/preempt-locking.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/preempt-locking.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/5.Posting.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/5.Posting.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/coding-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/coding-style.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/deprecated.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/deprecated.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/howto.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/howto.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/kernel-docs.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/kernel-docs.rst</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/license-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/license-rules.rst</a></td><td class='right'>61</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/maintainer-pgp-guide.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/maintainer-pgp-guide.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/submit-checklist.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/submit-checklist.rst</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/Documentation/process/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/submitting-patches.rst</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/robust-futexes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/robust-futexes.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/rtc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/rtc.txt</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/cyclades_z.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/cyclades_z.rst</a> (renamed from Documentation/serial/README.cycladesZ)</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/driver.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/driver.rst</a> (renamed from Documentation/serial/driver)</td><td class='right'>115</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/index.rst</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/moxa-smartio?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/moxa-smartio</a></td><td class='right'>523</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/moxa-smartio.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/moxa-smartio.rst</a></td><td class='right'>615</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/n_gsm.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/n_gsm.rst</a></td><td class='right'>103</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/n_gsm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/n_gsm.txt</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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/rocket.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/rocket.rst</a> (renamed from Documentation/serial/rocket.txt)</td><td class='right'>152</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/serial-iso7816.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/serial-iso7816.rst</a> (renamed from Documentation/serial/serial-iso7816.txt)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/serial-rs485.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/serial-rs485.rst</a> (renamed from Documentation/serial/serial-rs485.txt)</td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/serial/tty.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/tty.rst</a> (renamed from Documentation/serial/tty.txt)</td><td class='right'>111</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/speculation.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/speculation.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/spi/spi-summary?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/spi/spi-summary</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/sysctl/kernel.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/sysctl/kernel.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/sysctl/vm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/sysctl/vm.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/thermal/sysfs-api.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/thermal/sysfs-api.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/trace/ftrace.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/trace/ftrace.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/trace/histogram.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/trace/histogram.rst</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/trace/intel_th.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/trace/intel_th.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/index.rst</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/core-api/memory-allocation.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/core-api/memory-allocation.rst</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/disclaimer-ita.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/disclaimer-ita.rst</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/doc-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/doc-guide/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/index.rst</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/networking/netdev-FAQ.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/networking/netdev-FAQ.rst</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/5.Posting.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/5.Posting.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/coding-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/coding-style.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/deprecated.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/deprecated.rst</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/kernel-enforcement-statement.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/kernel-enforcement-statement.rst</a></td><td class='right'>168</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/license-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/license-rules.rst</a></td><td class='right'>452</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/maintainer-pgp-guide.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/maintainer-pgp-guide.rst</a></td><td class='right'>939</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/stable-kernel-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/stable-kernel-rules.rst</a></td><td class='right'>194</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/it_IT/process/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/submitting-patches.rst</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/ja_JP/SubmitChecklist?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/ja_JP/SubmitChecklist</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/ja_JP/SubmittingPatches?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/ja_JP/SubmittingPatches</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/ko_KR/memory-barriers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/ko_KR/memory-barriers.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/SubmittingPatches?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/SubmittingPatches</a></td><td class='right'>412</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/disclaimer-zh_CN.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/disclaimer-zh_CN.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/index.rst</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/magic-number.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/magic-number.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/oops-tracing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/oops-tracing.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/1.Intro.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/1.Intro.rst</a></td><td class='right'>186</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/2.Process.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/2.Process.rst</a></td><td class='right'>360</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/3.Early-stage.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/3.Early-stage.rst</a></td><td class='right'>161</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/4.Coding.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/4.Coding.rst</a></td><td class='right'>290</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/5.Posting.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/5.Posting.rst</a></td><td class='right'>240</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/6.Followthrough.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/6.Followthrough.rst</a></td><td class='right'>145</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/7.AdvancedTopics.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/7.AdvancedTopics.rst</a></td><td class='right'>124</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/8.Conclusion.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/8.Conclusion.rst</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/code-of-conduct.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/code-of-conduct.rst</a></td><td class='right'>72</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/coding-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/coding-style.rst</a> (renamed from Documentation/translations/zh_CN/coding-style.rst)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/development-process.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/development-process.rst</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/email-clients.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/email-clients.rst</a> (renamed from Documentation/translations/zh_CN/email-clients.txt)</td><td class='right'>104</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/howto.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/howto.rst</a> (renamed from Documentation/translations/zh_CN/HOWTO)</td><td class='right'>265</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/index.rst</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/license-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/license-rules.rst</a></td><td class='right'>370</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/magic-number.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/magic-number.rst</a></td><td class='right'>151</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/management-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/management-style.rst</a></td><td class='right'>207</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/programming-language.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/programming-language.rst</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/stable-api-nonsense.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/stable-api-nonsense.rst</a> (renamed from Documentation/translations/zh_CN/stable_api_nonsense.txt)</td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/stable-kernel-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/stable-kernel-rules.rst</a> (renamed from Documentation/translations/zh_CN/stable_kernel_rules.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/submit-checklist.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/submit-checklist.rst</a></td><td class='right'>107</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/submitting-drivers.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/submitting-drivers.rst</a> (renamed from Documentation/translations/zh_CN/SubmittingDrivers)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/submitting-patches.rst</a></td><td class='right'>682</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/process/volatile-considered-harmful.rst</a> (renamed from Documentation/translations/zh_CN/volatile-considered-harmful.txt)</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/translations/zh_CN/sparse.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/sparse.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/unaligned-memory-access.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/unaligned-memory-access.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/WUSB-Design-overview.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/WUSB-Design-overview.txt</a></td><td class='right'>56</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/acm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/acm.txt</a></td><td class='right'>164</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/authorization.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/authorization.txt</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/chipidea.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/chipidea.txt</a></td><td class='right'>101</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/dwc3.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/dwc3.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/ehci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/ehci.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/functionfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/functionfs.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/gadget-testing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget-testing.txt</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/gadget_configfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_configfs.txt</a></td><td class='right'>306</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/gadget_hid.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_hid.txt</a></td><td class='right'>175</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/gadget_multi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_multi.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/gadget_printer.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_printer.txt</a></td><td class='right'>155</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/gadget_serial.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_serial.txt</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/iuu_phoenix.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/iuu_phoenix.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/mass-storage.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/mass-storage.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/misc_usbsevseg.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/misc_usbsevseg.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/mtouchusb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/mtouchusb.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/ohci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/ohci.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/rio.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/rio.txt</a></td><td class='right'>83</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/usb-help.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usb-help.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/usb-serial.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usb-serial.txt</a></td><td class='right'>205</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/usbip_protocol.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usbip_protocol.txt</a></td><td class='right'>552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/usb/usbmon.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usbmon.txt</a></td><td class='right'>100</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/userspace-api/seccomp_filter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/userspace-api/seccomp_filter.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/video-output.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/video-output.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/Documentation/virtual/kvm/api.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/virtual/kvm/api.txt</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/virtual/kvm/mmu.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/virtual/kvm/mmu.txt</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/vm/hugetlbfs_reserv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/hugetlbfs_reserv.rst</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/vm/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/index.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/vm/memory-model.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/memory-model.rst</a></td><td class='right'>183</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/vm/numa.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/numa.rst</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/vm/transhuge.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/transhuge.rst</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/x86/boot.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/boot.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/x86/kernel-stacks?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/kernel-stacks</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/Documentation/x86/topology.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/topology.txt</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='/openslx/kernel-qcow2-linux.git/diff/Documentation/x86/x86_64/mm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/x86_64/mm.txt</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='/openslx/kernel-qcow2-linux.git/diff/LICENSES/deprecated/GPL-1.0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/deprecated/GPL-1.0</a> (renamed from LICENSES/other/GPL-1.0)</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='/openslx/kernel-qcow2-linux.git/diff/LICENSES/deprecated/ISC?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/deprecated/ISC</a> (renamed from LICENSES/other/ISC)</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='/openslx/kernel-qcow2-linux.git/diff/LICENSES/deprecated/Linux-OpenIB?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/deprecated/Linux-OpenIB</a> (renamed from LICENSES/other/Linux-OpenIB)</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='/openslx/kernel-qcow2-linux.git/diff/LICENSES/deprecated/X11?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/deprecated/X11</a> (renamed from LICENSES/other/X11)</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='/openslx/kernel-qcow2-linux.git/diff/LICENSES/dual/Apache-2.0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/dual/Apache-2.0</a> (renamed from LICENSES/other/Apache-2.0)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/LICENSES/dual/CDDL-1.0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/dual/CDDL-1.0</a> (renamed from LICENSES/other/CDDL-1.0)</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/LICENSES/dual/MPL-1.1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/dual/MPL-1.1</a> (renamed from LICENSES/other/MPL-1.1)</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='/openslx/kernel-qcow2-linux.git/diff/MAINTAINERS?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>MAINTAINERS</a></td><td class='right'>342</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='/openslx/kernel-qcow2-linux.git/diff/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Makefile</a></td><td class='right'>201</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='/openslx/kernel-qcow2-linux.git/diff/arch/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/asm/rwsem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/rwsem.h</a></td><td class='right'>211</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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/syscall.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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/uapi/asm/kvm_para.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/uapi/asm/kvm_para.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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/uapi/asm/sockios.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='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/kernel/pci_iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/kernel/pci_iommu.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/alpha/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/abilis_tb100.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb100.dtsi</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/abilis_tb100_dvk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb100_dvk.dts</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/abilis_tb101.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb101.dtsi</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/abilis_tb101_dvk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb101_dvk.dts</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/abilis_tb10x.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb10x.dtsi</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/axc001.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axc001.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/axc003.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axc003.dtsi</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/axc003_idu.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axc003_idu.dtsi</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/axs10x_mb.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axs10x_mb.dtsi</a></td><td class='right'>22</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/hsdk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/hsdk.dts</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/vdk_axc003.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/vdk_axc003.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/vdk_axc003_idu.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/vdk_axc003_idu.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/boot/dts/vdk_axs10x_mb.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/vdk_axs10x_mb.dtsi</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/haps_hs_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/haps_hs_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/haps_hs_smp_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/haps_hs_smp_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/hsdk_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/hsdk_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/nsim_700_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsim_700_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/nsim_hs_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsim_hs_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/nsim_hs_smp_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsim_hs_smp_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/nsimosci_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsimosci_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/nsimosci_hs_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsimosci_hs_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/configs/nsimosci_hs_smp_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsimosci_hs_smp_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/arcregs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/arcregs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/elf.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/irqflags-arcv2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/irqflags-arcv2.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/perf_event.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/spinlock.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/syscall.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/head.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/kernel/intc-arcv2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/intc-arcv2.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/setup.c</a></td><td class='right'>211</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/kernel/troubleshoot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/troubleshoot.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/lib/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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/lib/memcpy-archs-unaligned.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/lib/memcpy-archs-unaligned.S</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/lib/memset-archs.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/lib/memset-archs.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/mm/cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/mm/cache.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arc/plat-eznps/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/plat-eznps/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/Kconfig.debug?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/Kconfig.debug</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/compressed/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/compressed/head.S</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/am335x-evm.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/am335x-evm.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/am335x-evmsk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/am335x-evmsk.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/am33xx-l4.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/am33xx-l4.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6dl-yapp4-common.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6ull-pinfunc-snvs.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/ls1021a.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/ls1021a.dtsi</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/omap4-droid4-xt894.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/omap4-droid4-xt894.dts</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/rk3288-tinker.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/rk3288-tinker.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/rk3288-veyron.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/rk3288-veyron.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/rk3288.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/rk3288.dtsi</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/boot/dts/sama5d2-pinfunc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/sama5d2-pinfunc.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/aspeed_g4_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/aspeed_g4_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/aspeed_g5_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/aspeed_g5_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/at91_dt_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/at91_dt_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/clps711x_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/clps711x_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/efm32_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/efm32_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/ezx_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/ezx_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/h3600_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/h3600_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/imote2_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/imote2_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/imx_v4_v5_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/imx_v4_v5_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/imx_v6_v7_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/imx_v6_v7_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/moxart_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/moxart_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/multi_v4t_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/multi_v4t_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/omap1_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/omap1_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/stm32_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/stm32_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/u300_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/u300_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/configs/vexpress_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/vexpress_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/aes-neonbs-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/aes-neonbs-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/chacha-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/chacha-neon-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/crc32-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/crc32-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/crct10dif-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/crct10dif-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/ghash-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/ghash-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/nhpoly1305-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/nhpoly1305-neon-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/sha1-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha1-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/sha1_neon_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha1_neon_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/sha2-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha2-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/sha256_neon_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha256_neon_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/crypto/sha512-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha512-neon-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/arch_timer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/arch_timer.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/cp15.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/cp15.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/kvm_mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/kvm_mmu.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/stage2_pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/stage2_pgtable.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/tlb.h</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/include/uapi/asm/kvm_para.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/uapi/asm/kvm_para.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/kernel/head-nommu.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kernel/head-nommu.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kernel/signal.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kvm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-at91/pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-at91/pm.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-cns3xxx/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-cns3xxx/core.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-ep93xx/edb93xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/edb93xx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-ep93xx/simone.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/simone.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-ep93xx/ts72xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/ts72xx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-ep93xx/vision_ep9307.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/vision_ep9307.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-imx/cpuidle-imx6q.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-imx/cpuidle-imx6q.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-imx/mach-imx51.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-imx/mach-imx51.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-imx/pm-imx6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-imx/pm-imx6.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-iop13xx/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-iop13xx/setup.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-iop13xx/tpmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-iop13xx/tpmi.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-milbeaut/platsmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-milbeaut/platsmp.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-mvebu/kirkwood.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-mvebu/kirkwood.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-omap1/board-ams-delta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-omap1/board-ams-delta.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mach-omap2/display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-omap2/display.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/mm/alignment.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mm/alignment.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/nwfpe/fpmodule.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/nwfpe/fpmodule.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/plat-iop/adma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/plat-iop/adma.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/plat-omap/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/plat-omap/dma.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/plat-orion/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/plat-orion/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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/tools/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/tools/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm/vdso/vgettimeofday.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/vdso/vgettimeofday.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/Kconfig</a></td><td class='right'>137</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/Kconfig.platforms?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/Kconfig.platforms</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/mediatek/mt2712-pinfunc.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/nvidia/tegra186.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/nvidia/tegra186.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/renesas/r8a774c0.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/renesas/r8a774c0.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/renesas/r8a77990.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/renesas/r8a77990.dtsi</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3328-rock64.dts</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/rockchip/rk3328.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3328.dtsi</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/aes-ce-ccm-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-ce-ccm-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/aes-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/aes-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/aes-neonbs-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-neonbs-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/chacha-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/chacha-neon-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/crct10dif-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/crct10dif-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/ghash-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/ghash-ce-glue.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/nhpoly1305-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/nhpoly1305-neon-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sha1-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha1-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sha2-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha2-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sha256-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha256-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sha3-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha3-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sha512-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha512-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sm3-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sm3-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/crypto/sm4-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sm4-ce-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/arch_timer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/arch_timer.h</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/assembler.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/assembler.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/barrier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/barrier.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/brk-imm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/brk-imm.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/cpucaps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/cpucaps.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/cpufeature.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/cpufeature.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/cputype.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/cputype.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/debug-monitors.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/debug-monitors.h</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/elf.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/esr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/esr.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/futex.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/futex.h</a></td><td class='right'>61</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/hwcap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/hwcap.h</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/insn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/insn.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/irqflags.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/irqflags.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/kprobes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/kprobes.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/kvm_hyp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/kvm_hyp.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/kvm_mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/kvm_mmu.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/memory.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/memory.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/module.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/module.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/pgalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/pgalloc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/pgtable.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/pointer_auth.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/pointer_auth.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/processor.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/ptrace.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/sdei.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/sdei.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/signal32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/signal32.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/stage2_pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/stage2_pgtable.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/sysreg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/sysreg.h</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/system_misc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/system_misc.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/unistd.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/unistd32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/unistd32.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/vdso_datapage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/vdso_datapage.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/asm/vmap_stack.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/vmap_stack.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/include/uapi/asm/hwcap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/uapi/asm/hwcap.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/acpi_numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/acpi_numa.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/asm-offsets.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/asm-offsets.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/cpu_errata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpu_errata.c</a></td><td class='right'>256</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/cpu_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpu_ops.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/cpufeature.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpufeature.c</a></td><td class='right'>194</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/cpuinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpuinfo.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/debug-monitors.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/debug-monitors.c</a></td><td class='right'>115</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/entry.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/fpsimd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/fpsimd.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/ftrace.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/head.S</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/insn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/insn.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/kgdb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/kuser32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/kuser32.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/perf_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/perf_event.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/probes/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/probes/kprobes.c</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/probes/uprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/probes/uprobes.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/sdei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/sdei.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/setup.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/signal32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/signal32.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/sigreturn32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/sigreturn32.S</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/smp.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/sys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/sys.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/traps.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/vdso.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/vdso.c</a></td><td class='right'>139</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/vdso/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/vdso/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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kernel/vdso/gettimeofday.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/vdso/gettimeofday.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kvm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/kvm/reset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kvm/reset.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/fault.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/init.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/mm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/mmu.c</a></td><td class='right'>47</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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/mm/numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/numa.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/mm/proc.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/proc.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/net/bpf_jit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/net/bpf_jit.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='/openslx/kernel-qcow2-linux.git/diff/arch/arm64/net/bpf_jit_comp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/net/bpf_jit_comp.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/c6x/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/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='/openslx/kernel-qcow2-linux.git/diff/arch/c6x/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/c6x/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/c6x/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/c6x/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv1/inc/abi/ckmmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv1/inc/abi/ckmmu.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv1/inc/abi/entry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv1/inc/abi/entry.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv1/inc/abi/regdef.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv1/inc/abi/regdef.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv2/cacheflush.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/cacheflush.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv2/inc/abi/ckmmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/inc/abi/ckmmu.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv2/inc/abi/entry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/inc/abi/entry.h</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv2/inc/abi/regdef.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/inc/abi/regdef.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv2/mcount.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/mcount.S</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/abiv2/memmove.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/memmove.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/ftrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/ftrace.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/mmu_context.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/mmu_context.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/page.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/page.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/perf_event.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/ptrace.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/thread_info.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/thread_info.h</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/unistd.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/uapi/asm/perf_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/uapi/asm/perf_regs.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/include/uapi/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/uapi/asm/ptrace.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/atomic.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/atomic.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/entry.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/ftrace.c</a></td><td class='right'>148</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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/head.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/perf_callchain.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/perf_callchain.c</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/perf_regs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/perf_regs.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/ptrace.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/setup.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/csky/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/signal.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: 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='/openslx/kernel-qcow2-linux.git/diff/arch/csky/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/mm/fault.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/h8300/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/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='/openslx/kernel-qcow2-linux.git/diff/arch/h8300/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/h8300/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/h8300/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/h8300/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/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='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/elf.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='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/syscall.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/hexagon/include/uapi/asm/kvm_para.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/uapi/asm/kvm_para.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/io.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/machvec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/machvec.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/machvec_sn2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/machvec_sn2.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/mmiowb.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/rwsem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/rwsem.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/spinlock.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/tlb.h</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: 1.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/tlbflush.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/uapi/asm/sockios.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/kernel/acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/acpi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/ptrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/setup.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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/mm/tlb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/mm/tlb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/ia64/sn/kernel/sn2/sn2_smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/sn/kernel/sn2/sn2_smp.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/amiga/cia.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/amiga/cia.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/amiga/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/amiga/config.c</a></td><td class='right'>49</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/apollo/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/apollo/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/atari/ataints.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/atari/ataints.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/atari/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/atari/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/atari/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/atari/time.c</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/bvme6000/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/bvme6000/config.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/amcore_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/amcore_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/amiga_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/amiga_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/apollo_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/apollo_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/atari_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/atari_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/bvme6000_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/bvme6000_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/hp300_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/hp300_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/m5475evb_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/m5475evb_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/mac_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/mac_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/multi_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/multi_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/mvme147_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/mvme147_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/mvme16x_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/mvme16x_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/q40_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/q40_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/stmark2_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/stmark2_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/sun3_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/sun3_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/configs/sun3x_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/sun3x_defconfig</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/hp300/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/hp300/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/hp300/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/hp300/time.c</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/hp300/time.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/hp300/time.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/include/asm/io_mm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/io_mm.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/include/asm/mvme147hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/mvme147hw.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/syscall.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/mac/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mac/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/mac/via.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mac/via.c</a></td><td class='right'>146</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/mvme147/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mvme147/config.c</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/mvme16x/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mvme16x/config.c</a></td><td class='right'>97</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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/q40/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/q40/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/q40/q40ints.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/q40/q40ints.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/sun3/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/sun3/intersil.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3/intersil.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/sun3/sun3ints.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3/sun3ints.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/sun3x/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3x/config.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/sun3x/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3x/time.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/m68k/sun3x/time.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3x/time.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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/asm/syscall.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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/microblaze/mm/pgtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/mm/pgtable.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/ath79/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/ath79/setup.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/ar7_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/ar7_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/decstation_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/decstation_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/decstation_r4k_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/decstation_r4k_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/generic/board-ocelot.config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/generic/board-ocelot.config</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/loongson1b_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/loongson1b_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/loongson1c_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/loongson1c_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/rb532_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/rb532_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/configs/rbtx49xx_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/rbtx49xx_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/mmiowb.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/mips/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/spinlock.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/mips/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/syscall.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/uapi/asm/sockios.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/kgdb.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/ptrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kernel/scall64-o32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/scall64-o32.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kernel/syscalls/syscall_n32.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/syscalls/syscall_n32.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kernel/syscalls/syscall_n64.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/syscalls/syscall_n64.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kernel/syscalls/syscall_o32.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/syscalls/syscall_o32.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kvm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/net/ebpf_jit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/net/ebpf_jit.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='/openslx/kernel-qcow2-linux.git/diff/arch/mips/sgi-ip27/ip27-irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/sgi-ip27/ip27-irq.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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/elf.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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/nds32/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/tlbflush.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='/openslx/kernel-qcow2-linux.git/diff/arch/nios2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/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='/openslx/kernel-qcow2-linux.git/diff/arch/nios2/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/nios2/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/nios2/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/nios2/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/openrisc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/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='/openslx/kernel-qcow2-linux.git/diff/arch/openrisc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/openrisc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/asm/syscall.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/openrisc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/openrisc/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/boot/compressed/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/boot/compressed/head.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/boot/compressed/misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/boot/compressed/misc.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/configs/generic-32bit_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/configs/generic-32bit_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/assembly.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/assembly.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/cache.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/cache.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/fixmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/fixmap.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/hardware.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/hardware.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/jump_label.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/jump_label.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/kgdb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/kgdb.h</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/kprobes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/kprobes.h</a></td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/mmzone.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/mmzone.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/page.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/page.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/patch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/patch.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/pgalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/pgalloc.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/pgtable.h</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/ptrace.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/sparsemem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/sparsemem.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/spinlock.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/tlbflush.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/uapi/asm/sockios.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/cache.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/drivers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/drivers.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/entry.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/head.S</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/inventory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/inventory.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/jump_label.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/jump_label.c</a></td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/kgdb.c</a></td><td class='right'>209</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/kprobes.c</a></td><td class='right'>291</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/pacache.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/pacache.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/parisc_ksyms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/parisc_ksyms.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/patch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/patch.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/process.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/process.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/processor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/processor.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/ptrace.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/setup.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/sys_parisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/sys_parisc.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/syscall.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/syscall.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/traps.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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/kernel/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/vmlinux.lds.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/mm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/mm/fixmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/fixmap.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/mm/hugetlbpage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/hugetlbpage.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/parisc/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/init.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/configs/skiroot_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/configs/skiroot_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/crypto/crc32c-vpmsum_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/crypto/crc32c-vpmsum_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/crypto/crct10dif-vpmsum_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/crypto/crct10dif-vpmsum_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/io.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/mmiowb.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/mmu.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/paca.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/paca.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/ppc-opcode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/ppc-opcode.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/spinlock.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/syscall.h</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/include/asm/vdso_datapage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/vdso_datapage.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/cpu_setup_6xx.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/cpu_setup_6xx.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/exceptions-64s.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/exceptions-64s.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/head_32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/head_32.S</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/kvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/kvm.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/security.c</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/setup_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/setup_64.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/vdso32/gettimeofday.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/vdso32/gettimeofday.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kernel/vdso64/gettimeofday.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/vdso64/gettimeofday.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kvm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kvm/book3s_64_vio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kvm/book3s_64_vio.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/kvm/book3s_hv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kvm/book3s_hv.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/lib/memcmp_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/lib/memcmp_64.S</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/mm/hash_low_32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/mm/hash_low_32.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/mm/mmu_context_iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/mm/mmu_context_iommu.c</a></td><td class='right'>97</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/mm/ppc_mmu_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/mm/ppc_mmu_32.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/net/bpf_jit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/net/bpf_jit32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit32.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/net/bpf_jit64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit64.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/net/bpf_jit_comp64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit_comp64.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/platforms/52xx/mpc52xx_gpt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/52xx/mpc52xx_gpt.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/platforms/Kconfig.cputype?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/Kconfig.cputype</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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/platforms/cell/spufs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/cell/spufs/file.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/platforms/cell/spufs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/cell/spufs/inode.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/platforms/pseries/pseries_energy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/pseries/pseries_energy.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/platforms/pseries/ras.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/pseries/ras.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/sysdev/tsi108_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/sysdev/tsi108_dev.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='/openslx/kernel-qcow2-linux.git/diff/arch/powerpc/xmon/xmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/xmon/xmon.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/configs/rv32_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/configs/rv32_defconfig</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/include/asm/fixmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/fixmap.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/io.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/mmiowb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/include/asm/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/uaccess.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/kernel/module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/module.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/setup.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/mm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/mm/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='/openslx/kernel-qcow2-linux.git/diff/arch/riscv/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/mm/init.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/Kconfig</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/Makefile</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/als.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/als.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/boot.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/boot.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/compressed/decompressor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/compressed/decompressor.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/compressed/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/compressed/vmlinux.lds.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/head.S</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/ipl_parm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/ipl_parm.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/ipl_report.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/ipl_report.c</a></td><td class='right'>165</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/kaslr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/kaslr.c</a></td><td class='right'>144</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/machine_kexec_reloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/machine_kexec_reloc.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/mem_detect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/mem_detect.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/startup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/startup.c</a></td><td class='right'>121</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/text_dma.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/text_dma.S</a></td><td class='right'>184</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/boot/uv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/uv.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/configs/debug_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/configs/debug_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/configs/performance_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/configs/performance_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/crypto/crc32be-vx.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/crc32be-vx.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/crypto/crc32le-vx.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/crc32le-vx.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/crypto/des_s390.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/des_s390.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/crypto/prng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/prng.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/hypfs/hypfs_diag0c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/hypfs/hypfs_diag0c.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/airq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/airq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/ap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ap.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/bitops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/bitops.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/boot_data.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/boot_data.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/bug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/bug.h</a></td><td class='right'>24</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/diag.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/diag.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/ebcdic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ebcdic.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/elf.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/extable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/extable.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/ftrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ftrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/io.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/ipl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ipl.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/irq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/irq.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/kexec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/kexec.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/linkage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/linkage.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/lowcore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/lowcore.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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/nospec-insn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/nospec-insn.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/pci_clp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci_clp.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/pci_insn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci_insn.h</a></td><td class='right'>97</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/pci_io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci_io.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pgtable.h</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/processor.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/sclp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/sclp.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/sections.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/sections.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/setup.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/stacktrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/stacktrace.h</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/syscall_wrapper.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/syscall_wrapper.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/tlb.h</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/uaccess.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/unwind.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/unwind.h</a></td><td class='right'>101</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/uv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/uv.h</a></td><td class='right'>132</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/asm/vmlinux.lds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/vmlinux.lds.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/include/uapi/asm/ipl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/uapi/asm/ipl.h</a></td><td class='right'>154</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/asm-offsets.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/asm-offsets.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/base.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/base.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/diag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/diag.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/dumpstack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/dumpstack.c</a></td><td class='right'>167</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/early.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/early.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/early_nobss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/early_nobss.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/entry.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/entry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/entry.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/fpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/fpu.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ftrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/head64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/head64.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/ima_arch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ima_arch.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/ipl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ipl.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/ipl_vmparm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ipl_vmparm.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/irq.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/kexec_elf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/kexec_elf.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/kexec_image.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/kexec_image.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/kprobes.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/machine_kexec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/machine_kexec.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/machine_kexec_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/machine_kexec_file.c</a></td><td class='right'>268</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/machine_kexec_reloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/machine_kexec_reloc.c</a></td><td class='right'>53</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/mcount.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/mcount.S</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/nmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/nmi.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/nospec-branch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/nospec-branch.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/nospec-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/nospec-sysfs.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/perf_cpum_cf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_cpum_cf.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/perf_cpum_cf_diag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_cpum_cf_diag.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/perf_cpum_cf_events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_cpum_cf_events.c</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/perf_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/pgm_check.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/pgm_check.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/process.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/process.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/processor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/processor.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/reipl.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/reipl.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/relocate_kernel.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/relocate_kernel.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/setup.c</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/smp.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/stacktrace.c</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/swsusp.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/swsusp.S</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/traps.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/unwind_bc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/unwind_bc.c</a></td><td class='right'>155</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/vdso.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vdso.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/vdso32/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vdso32/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/vdso64/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vdso64/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vmlinux.lds.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kernel/vtime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vtime.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kvm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/kvm/interrupt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kvm/interrupt.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/lib/mem.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/lib/mem.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/fault.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/gup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/gup.c</a></td><td class='right'>300</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/maccess.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/maccess.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/pgalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/pgalloc.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/pgtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/pgtable.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/mm/vmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/vmem.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/net/bpf_jit_comp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/net/bpf_jit_comp.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/oprofile/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/oprofile/init.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/pci/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/pci/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci.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: 1.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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/pci/pci_clp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci_clp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/pci/pci_insn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci_insn.c</a></td><td class='right'>169</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/pci/pci_irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci_irq.c</a></td><td class='right'>486</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/purgatory/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/purgatory/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/purgatory/kexec-purgatory.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/purgatory/kexec-purgatory.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/s390/purgatory/purgatory.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/purgatory/purgatory.lds.S</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/scripts/Makefile.chkbss?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/scripts/Makefile.chkbss</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='/openslx/kernel-qcow2-linux.git/diff/arch/s390/tools/opcodes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/tools/opcodes.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/sh/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/boards/mach-ecovec24/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/boards/mach-ecovec24/setup.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/sh/boards/of-generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/boards/of-generic.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/configs/apsh4ad0a_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/apsh4ad0a_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/configs/ecovec24-romimage_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/ecovec24-romimage_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/configs/rsk7264_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/rsk7264_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/configs/rsk7269_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/rsk7269_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/configs/sh7785lcr_32bit_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/sh7785lcr_32bit_defconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/mmiowb.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/pgalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/pgalloc.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/spinlock-llsc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/spinlock-llsc.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/syscall_32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/syscall_32.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/syscall_64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/syscall_64.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/cpu-sh4/cpu/sh7786.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/cpu-sh4/cpu/sh7786.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/uapi/asm/sockios.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/sh/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/crypto/des_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/crypto/des_glue.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/include/asm/io_64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/io_64.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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/syscall.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/include/asm/tlb_32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/tlb_32.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/include/uapi/asm/kvm_para.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/uapi/asm/kvm_para.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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/uapi/asm/sockios.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/kernel/ds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/kernel/ds.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='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/kernel/pci_sun4v.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/kernel/pci_sun4v.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/sparc/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/um/drivers/harddog_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/drivers/harddog_kern.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='/openslx/kernel-qcow2-linux.git/diff/arch/um/drivers/vector_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/drivers/vector_kern.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='/openslx/kernel-qcow2-linux.git/diff/arch/um/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/um/include/asm/syscall-generic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/include/asm/syscall-generic.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/um/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/um/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/um/kernel/sysrq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/kernel/sysrq.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='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/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='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/elf.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='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/syscall.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/unicore32/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/boot/compressed/acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/compressed/acpi.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/boot/compressed/misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/compressed/misc.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/boot/compressed/misc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/compressed/misc.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/boot/string.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/string.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/configs/i386_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/configs/i386_defconfig</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/configs/x86_64_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/configs/x86_64_defconfig</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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/aegis128-aesni-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aegis128-aesni-glue.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.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/aegis128l-aesni-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aegis128l-aesni-glue.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.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/aegis256-aesni-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aegis256-aesni-glue.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.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/aesni-intel_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aesni-intel_glue.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/chacha_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/chacha_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/crc32-pclmul_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/crc32-pclmul_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/crc32c-intel_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/crc32c-intel_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/crct10dif-pclmul_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/crct10dif-pclmul_glue.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/ghash-clmulni-intel_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/ghash-clmulni-intel_glue.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/morus1280-avx2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus1280-avx2-glue.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/morus1280-sse2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus1280-sse2-glue.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/morus1280_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus1280_glue.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/morus640-sse2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus640-sse2-glue.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/morus640_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus640_glue.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/nhpoly1305-avx2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/nhpoly1305-avx2-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/nhpoly1305-sse2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/nhpoly1305-sse2-glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/poly1305-avx2-x86_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/poly1305-avx2-x86_64.S</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/poly1305-sse2-x86_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/poly1305-sse2-x86_64.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/poly1305_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/poly1305_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/sha1_ssse3_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/sha1_ssse3_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/sha256_ssse3_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/sha256_ssse3_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/crypto/sha512_ssse3_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/sha512_ssse3_glue.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/common.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/entry_32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/entry_32.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/entry_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/entry_64.S</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/syscalls/syscall_32.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/syscalls/syscall_32.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/syscalls/syscall_64.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/syscalls/syscall_64.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/vdso/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/vdso/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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/vdso/vclock_gettime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/vdso/vclock_gettime.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/entry/vdso/vdso2c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/vdso/vdso2c.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/amd/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/amd/core.c</a></td><td class='right'>286</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/core.c</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/core.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/cstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/cstate.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/ds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/ds.c</a></td><td class='right'>505</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/lbr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/lbr.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/pt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/pt.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/rapl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/rapl.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/uncore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/uncore.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/uncore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/uncore.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/intel/uncore_snb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/uncore_snb.c</a></td><td class='right'>91</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/msr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/msr.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/events/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/perf_event.h</a></td><td class='right'>136</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/hyperv/hv_apic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/hyperv/hv_apic.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/hyperv/hv_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/hyperv/hv_init.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/hyperv/hv_spinlock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/hyperv/hv_spinlock.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/ia32/ia32_signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/ia32/ia32_signal.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/alternative-asm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/alternative-asm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/alternative.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/alternative.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/asm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/asm.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/bitops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/bitops.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/cpu_device_id.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/cpu_device_id.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/cpu_entry_area.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/cpu_entry_area.h</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/cpufeature.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/cpufeature.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/debugreg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/debugreg.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/fixmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fixmap.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/fpu/api.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/api.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/fpu/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/internal.h</a></td><td class='right'>140</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/fpu/signal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/signal.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/fpu/types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/types.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/fpu/xstate.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/xstate.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/intel_ds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/intel_ds.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/io.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/irq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/irq.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/irq_vectors.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/irq_vectors.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/kvm_emulate.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/kvm_emulate.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/kvm_host.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/kvm_host.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/mce.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/mce.h</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/mmu_context.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/mmu_context.h</a></td><td class='right'>56</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/msr-index.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/msr-index.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/nospec-branch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/nospec-branch.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/page_32_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/page_32_types.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/page_64_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/page_64_types.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/perf_event.h</a></td><td class='right'>57</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/pgtable.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/processor-cyrix.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/processor-cyrix.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/processor.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/realmode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/realmode.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/rwsem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/rwsem.h</a></td><td class='right'>237</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/set_memory.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/set_memory.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/smap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/smap.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/smp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/smp.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/special_insns.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/special_insns.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/stackprotector.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/stackprotector.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/stacktrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/stacktrace.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/switch_to.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/switch_to.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/sync_bitops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/sync_bitops.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/text-patching.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/text-patching.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/thread_info.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/thread_info.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/tlb.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/tlbflush.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/trace/exceptions.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/trace/exceptions.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/trace/fpu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/trace/fpu.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/uaccess.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/uaccess_64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/uaccess_64.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/asm/xen/hypercall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/xen/hypercall.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/uapi/asm/kvm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/kvm.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/uapi/asm/perf_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/perf_regs.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/sockios.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/include/uapi/asm/vmx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/vmx.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/acpi/boot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/acpi/boot.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/acpi/cstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/acpi/cstate.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/alternative.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/alternative.c</a></td><td class='right'>201</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.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/aperture_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/aperture_64.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/apic/apic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/apic/apic.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/apic/apic_numachip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/apic/apic_numachip.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/asm-offsets_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/asm-offsets_64.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/amd.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/aperfmperf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/aperfmperf.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/bugs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/bugs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/common.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/cpu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/cpu.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/cyrix.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/cyrix.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/hygon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/hygon.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/intel.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/intel_epb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/intel_epb.c</a></td><td class='right'>216</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/mce/amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/amd.c</a></td><td class='right'>52</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/mce/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/core.c</a></td><td class='right'>102</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/mce/genpool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/genpool.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/mce/inject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/inject.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/mce/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/internal.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/microcode/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/microcode/core.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/microcode/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/microcode/intel.c</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/proc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/proc.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/resctrl/ctrlmondata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/resctrl/ctrlmondata.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/resctrl/monitor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/resctrl/monitor.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/cpu/resctrl/rdtgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/resctrl/rdtgroup.c</a></td><td class='right'>182</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/crash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/crash.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/dumpstack_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/dumpstack_32.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/dumpstack_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/dumpstack_64.c</a></td><td class='right'>99</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/fpu/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/core.c</a></td><td class='right'>195</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/fpu/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/init.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/fpu/regset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/regset.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/fpu/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/signal.c</a></td><td class='right'>202</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/fpu/xstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/xstate.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/ftrace.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/head_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/head_64.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/hpet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/hpet.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/hw_breakpoint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/hw_breakpoint.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/idt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/idt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/irq_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/irq_32.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/irq_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/irq_64.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/irqinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/irqinit.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/jump_label.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/jump_label.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/kgdb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/kprobes/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/kprobes/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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/kvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/kvm.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/ldt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/ldt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/module.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/mpparse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/mpparse.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/nmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/nmi.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/paravirt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/paravirt.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/perf_regs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/perf_regs.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/process.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/process.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/process_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/process_32.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/process_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/process_64.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/reboot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/reboot.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/setup.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/setup_percpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/setup_percpu.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/signal.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/smpboot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/smpboot.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/stacktrace.c</a></td><td class='right'>128</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/topology.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/topology.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/traps.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/tsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/tsc.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/vm86_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/vm86_32.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kernel/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/vmlinux.lds.S</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/emulate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/emulate.c</a></td><td class='right'>191</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/hyperv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/hyperv.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/lapic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/lapic.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/lapic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/lapic.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/mmu.c</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/mmu.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/mmutrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/mmutrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/pmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/pmu.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/svm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/svm.c</a></td><td class='right'>111</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/trace.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/vmx/nested.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/nested.c</a></td><td class='right'>130</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/vmx/vmenter.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/vmenter.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/vmx/vmx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/vmx.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/vmx/vmx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/vmx.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/x86.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/x86.c</a></td><td class='right'>205</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/kvm/x86.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/x86.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/copy_user_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/copy_user_64.S</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/csum-partial_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/csum-partial_64.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/delay.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/delay.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/error-inject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/error-inject.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/memcpy_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/memcpy_64.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/rwsem.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/rwsem.S</a></td><td class='right'>156</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/lib/usercopy_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/usercopy_64.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/math-emu/fpu_entry.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/math-emu/fpu_entry.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/cpu_entry_area.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/cpu_entry_area.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/dump_pagetables.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/dump_pagetables.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/extable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/extable.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/fault.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/init.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/ioremap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/ioremap.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/kaslr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/kaslr.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/mmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/mmap.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/mpx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/mpx.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/pageattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pageattr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/pgtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pgtable.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/pkeys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pkeys.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/pti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pti.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/mm/tlb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/tlb.c</a></td><td class='right'>116</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/net/bpf_jit_comp32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/net/bpf_jit_comp32.c</a></td><td class='right'>236</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/platform/efi/quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/platform/efi/quirks.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/platform/uv/tlb_uv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/platform/uv/tlb_uv.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/power/hibernate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/power/hibernate.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/realmode/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/realmode/init.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/x86/tools/relocs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/tools/relocs.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/um/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/um/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/um/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/asm/syscall.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/um/vdso/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/vdso/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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/xen/mmu_pv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/mmu_pv.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/xen/multicalls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/multicalls.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/xen/smp_pv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/smp_pv.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='/openslx/kernel-qcow2-linux.git/diff/arch/x86/xen/xen-head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/xen-head.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/processor.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/syscall.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/tlb.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.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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/uapi/asm/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/uapi/asm/sockios.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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/kernel/entry.S</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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/kernel/stacktrace.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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/kernel/syscalls/syscall.tbl</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='/openslx/kernel-qcow2-linux.git/diff/arch/xtensa/mm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/mm/mmu.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='/openslx/kernel-qcow2-linux.git/diff/block/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/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.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='/openslx/kernel-qcow2-linux.git/diff/block/badblocks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/badblocks.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='/openslx/kernel-qcow2-linux.git/diff/block/bfq-cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-cgroup.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.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='/openslx/kernel-qcow2-linux.git/diff/block/bfq-iosched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-iosched.c</a></td><td class='right'>836</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='/openslx/kernel-qcow2-linux.git/diff/block/bfq-iosched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-iosched.h</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/block/bfq-wf2q.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-wf2q.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.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='/openslx/kernel-qcow2-linux.git/diff/block/bio-integrity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bio-integrity.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.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='/openslx/kernel-qcow2-linux.git/diff/block/bio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bio.c</a></td><td class='right'>308</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/block/blk-cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-cgroup.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-core.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.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-exec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-exec.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-flush.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-flush.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-integrity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-integrity.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.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-iolatency.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-iolatency.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-merge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-merge.c</a></td><td class='right'>147</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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-cpumap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-cpumap.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-debugfs.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.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-pci.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-rdma.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-sched.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-sysfs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-tag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-tag.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq-virtio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-virtio.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-mq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq.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.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-rq-qos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-rq-qos.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-rq-qos.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-rq-qos.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-settings.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-settings.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.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-stat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-stat.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-sysfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/block/blk-timeout.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-timeout.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-wbt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-wbt.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='/openslx/kernel-qcow2-linux.git/diff/block/blk-zoned.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-zoned.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='/openslx/kernel-qcow2-linux.git/diff/block/blk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk.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='/openslx/kernel-qcow2-linux.git/diff/block/bounce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bounce.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='/openslx/kernel-qcow2-linux.git/diff/block/bsg-lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bsg-lib.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.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='/openslx/kernel-qcow2-linux.git/diff/block/bsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bsg.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='/openslx/kernel-qcow2-linux.git/diff/block/elevator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/elevator.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='/openslx/kernel-qcow2-linux.git/diff/block/genhd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/genhd.c</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/block/ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/ioctl.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='/openslx/kernel-qcow2-linux.git/diff/block/ioprio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/ioprio.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='/openslx/kernel-qcow2-linux.git/diff/block/kyber-iosched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/kyber-iosched.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.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='/openslx/kernel-qcow2-linux.git/diff/block/mq-deadline.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/mq-deadline.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='/openslx/kernel-qcow2-linux.git/diff/block/opal_proto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/opal_proto.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/block/partition-generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partition-generic.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/acorn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/acorn.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/aix.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/aix.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/amiga.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/amiga.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/efi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/efi.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.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/efi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/efi.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.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/ibm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ibm.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/karma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/karma.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/ldm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ldm.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.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/ldm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ldm.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.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/msdos.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/msdos.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/osf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/osf.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/sgi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/sgi.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/sun.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/sun.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/sysv68.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/sysv68.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='/openslx/kernel-qcow2-linux.git/diff/block/partitions/ultrix.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ultrix.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='/openslx/kernel-qcow2-linux.git/diff/block/scsi_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/scsi_ioctl.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.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='/openslx/kernel-qcow2-linux.git/diff/block/sed-opal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/sed-opal.c</a></td><td class='right'>726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.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='/openslx/kernel-qcow2-linux.git/diff/block/t10-pi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/t10-pi.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/842.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/842.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='/openslx/kernel-qcow2-linux.git/diff/crypto/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/Kconfig</a></td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/crypto/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/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='/openslx/kernel-qcow2-linux.git/diff/crypto/adiantum.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/adiantum.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='/openslx/kernel-qcow2-linux.git/diff/crypto/aegis128.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aegis128.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='/openslx/kernel-qcow2-linux.git/diff/crypto/aegis128l.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aegis128l.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='/openslx/kernel-qcow2-linux.git/diff/crypto/aegis256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aegis256.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='/openslx/kernel-qcow2-linux.git/diff/crypto/aes_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aes_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/akcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/akcipher.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/algboss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/algboss.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ansi_cprng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ansi_cprng.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='/openslx/kernel-qcow2-linux.git/diff/crypto/anubis.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/anubis.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='/openslx/kernel-qcow2-linux.git/diff/crypto/arc4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/arc4.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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/asym_tpm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/asym_tpm.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/pkcs7_verify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/pkcs7_verify.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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/public_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/public_key.c</a></td><td class='right'>105</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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/verify_pefile.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/verify_pefile.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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/x509.asn1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/x509.asn1</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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/x509_cert_parser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/x509_cert_parser.c</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/crypto/asymmetric_keys/x509_public_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/x509_public_key.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='/openslx/kernel-qcow2-linux.git/diff/crypto/authenc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/authenc.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='/openslx/kernel-qcow2-linux.git/diff/crypto/authencesn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/authencesn.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='/openslx/kernel-qcow2-linux.git/diff/crypto/blowfish_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/blowfish_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/camellia_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/camellia_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/cast5_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cast5_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/cast6_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cast6_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/cbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cbc.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ccm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ccm.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/cfb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cfb.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='/openslx/kernel-qcow2-linux.git/diff/crypto/chacha20poly1305.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/chacha20poly1305.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='/openslx/kernel-qcow2-linux.git/diff/crypto/chacha_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/chacha_generic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/cmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cmac.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='/openslx/kernel-qcow2-linux.git/diff/crypto/crc32_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crc32_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/crc32c_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crc32c_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/crct10dif_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crct10dif_generic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/cryptd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cryptd.c</a></td><td class='right'>252</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/crypto_null.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crypto_null.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='/openslx/kernel-qcow2-linux.git/diff/crypto/crypto_user_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crypto_user_base.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ctr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ctr.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='/openslx/kernel-qcow2-linux.git/diff/crypto/cts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cts.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/deflate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/deflate.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='/openslx/kernel-qcow2-linux.git/diff/crypto/des_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/des_generic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/dh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/dh.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='/openslx/kernel-qcow2-linux.git/diff/crypto/drbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/drbg.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecb.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecc.c</a></td><td class='right'>417</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: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/ecc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecc.h</a></td><td class='right'>153</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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecc_curve_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecc_curve_defs.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecdh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecdh.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='/openslx/kernel-qcow2-linux.git/diff/crypto/echainiv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/echainiv.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecrdsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecrdsa.c</a></td><td class='right'>296</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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecrdsa_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecrdsa_defs.h</a></td><td class='right'>225</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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecrdsa_params.asn1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecrdsa_params.asn1</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='/openslx/kernel-qcow2-linux.git/diff/crypto/ecrdsa_pub_key.asn1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecrdsa_pub_key.asn1</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='/openslx/kernel-qcow2-linux.git/diff/crypto/fcrypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/fcrypt.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='/openslx/kernel-qcow2-linux.git/diff/crypto/fips.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/fips.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='/openslx/kernel-qcow2-linux.git/diff/crypto/gcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/gcm.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ghash-generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ghash-generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/hmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/hmac.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/jitterentropy-kcapi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/jitterentropy-kcapi.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='/openslx/kernel-qcow2-linux.git/diff/crypto/keywrap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/keywrap.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='/openslx/kernel-qcow2-linux.git/diff/crypto/khazad.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/khazad.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='/openslx/kernel-qcow2-linux.git/diff/crypto/lrw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lrw.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/lz4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lz4.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='/openslx/kernel-qcow2-linux.git/diff/crypto/lz4hc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lz4hc.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='/openslx/kernel-qcow2-linux.git/diff/crypto/lzo-rle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lzo-rle.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='/openslx/kernel-qcow2-linux.git/diff/crypto/lzo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lzo.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='/openslx/kernel-qcow2-linux.git/diff/crypto/md4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/md4.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='/openslx/kernel-qcow2-linux.git/diff/crypto/md5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/md5.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='/openslx/kernel-qcow2-linux.git/diff/crypto/michael_mic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/michael_mic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/morus1280.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/morus1280.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='/openslx/kernel-qcow2-linux.git/diff/crypto/morus640.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/morus640.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='/openslx/kernel-qcow2-linux.git/diff/crypto/nhpoly1305.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/nhpoly1305.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='/openslx/kernel-qcow2-linux.git/diff/crypto/ofb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ofb.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='/openslx/kernel-qcow2-linux.git/diff/crypto/pcbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/pcbc.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='/openslx/kernel-qcow2-linux.git/diff/crypto/pcrypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/pcrypt.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='/openslx/kernel-qcow2-linux.git/diff/crypto/poly1305_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/poly1305_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/rmd128.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd128.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='/openslx/kernel-qcow2-linux.git/diff/crypto/rmd160.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd160.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='/openslx/kernel-qcow2-linux.git/diff/crypto/rmd256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd256.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='/openslx/kernel-qcow2-linux.git/diff/crypto/rmd320.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd320.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='/openslx/kernel-qcow2-linux.git/diff/crypto/rsa-pkcs1pad.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rsa-pkcs1pad.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.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='/openslx/kernel-qcow2-linux.git/diff/crypto/rsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rsa.c</a></td><td class='right'>111</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='/openslx/kernel-qcow2-linux.git/diff/crypto/salsa20_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/salsa20_generic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/scompress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/scompress.c</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/crypto/seed.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/seed.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='/openslx/kernel-qcow2-linux.git/diff/crypto/seqiv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/seqiv.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='/openslx/kernel-qcow2-linux.git/diff/crypto/serpent_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/serpent_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/sha1_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha1_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/sha256_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha256_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/sha3_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha3_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/sha512_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha512_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/shash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/shash.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='/openslx/kernel-qcow2-linux.git/diff/crypto/simd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/simd.c</a></td><td class='right'>273</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/skcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/skcipher.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='/openslx/kernel-qcow2-linux.git/diff/crypto/sm3_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sm3_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/sm4_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sm4_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/streebog_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/streebog_generic.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/crypto/tcrypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/tcrypt.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='/openslx/kernel-qcow2-linux.git/diff/crypto/tea.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/tea.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='/openslx/kernel-qcow2-linux.git/diff/crypto/testmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/testmgr.c</a></td><td class='right'>1242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/testmgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/testmgr.h</a></td><td class='right'>225</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/crypto/tgr192.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/tgr192.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='/openslx/kernel-qcow2-linux.git/diff/crypto/twofish_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/twofish_generic.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='/openslx/kernel-qcow2-linux.git/diff/crypto/vmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/vmac.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='/openslx/kernel-qcow2-linux.git/diff/crypto/wp512.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/wp512.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='/openslx/kernel-qcow2-linux.git/diff/crypto/xcbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/xcbc.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='/openslx/kernel-qcow2-linux.git/diff/crypto/xts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/xts.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='/openslx/kernel-qcow2-linux.git/diff/crypto/zstd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/zstd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/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='/openslx/kernel-qcow2-linux.git/diff/drivers/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpi_configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_configfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpi_dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_dbg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpi_lpat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_lpat.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpi_lpss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_lpss.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/aclocal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/aclocal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/dbexec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/dbexec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/dbnames.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/dbnames.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/dsinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/dsinit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/evgpeinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/evgpeinit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/exnames.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/exnames.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsaccess.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsaccess.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsalloc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsdump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsdump.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsinit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsnames.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsnames.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsobject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsobject.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsparse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsparse.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsrepair.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsrepair.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsrepair2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsrepair2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsutils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsutils.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/nsxfname.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsxfname.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/psargs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/psargs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/rsxface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/rsxface.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbdata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbdata.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbfind.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbfind.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbinstal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbinstal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbprint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbprint.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbutils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbutils.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbxface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbxface.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/tbxfload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbxfload.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/utascii.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utascii.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/utdecode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utdecode.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/utmisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utmisc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/utpredef.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utpredef.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/acpica/utstring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utstring.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/arm64/iort.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/arm64/iort.c</a></td><td class='right'>150</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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/bus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/button.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/button.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/cppc_acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/cppc_acpi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/device_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/device_pm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/dptf/dptf_power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/dptf/dptf_power.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/event.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/hmat/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/hmat/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/hmat/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/hmat/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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/hmat/hmat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/hmat/hmat.c</a></td><td class='right'>666</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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/nfit/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/nfit/core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/nfit/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/nfit/intel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/numa.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/power.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/pptt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/pptt.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/processor_perflib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/processor_perflib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/property.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/scan.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/spcr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/spcr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/sysfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/tables.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/tables.c</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/utils.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/acpi/video_detect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/video_detect.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='/openslx/kernel-qcow2-linux.git/diff/drivers/android/binder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/android/binder.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/android/binder_alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/android/binder_alloc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ata/ahci_qoriq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ata/ahci_qoriq.c</a></td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/drivers/ata/libata-zpodd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ata/libata-zpodd.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/atm/firestream.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/atm/firestream.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='/openslx/kernel-qcow2-linux.git/diff/drivers/atm/iphase.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/atm/iphase.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='/openslx/kernel-qcow2-linux.git/diff/drivers/auxdisplay/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/auxdisplay/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/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='/openslx/kernel-qcow2-linux.git/diff/drivers/auxdisplay/charlcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/charlcd.c</a></td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/drivers/auxdisplay/hd44780.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/hd44780.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='/openslx/kernel-qcow2-linux.git/diff/drivers/auxdisplay/panel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/panel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/arch_topology.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/arch_topology.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/dd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/dd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/firmware_loader/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/firmware_loader/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/firmware_loader/builtin/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/firmware_loader/builtin/.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/firmware_loader/fallback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/firmware_loader/fallback.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/memory.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/node.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/node.c</a></td><td class='right'>352</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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/platform.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/clock_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/clock_ops.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/domain.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/domain.c</a></td><td class='right'>133</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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/domain_governor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/domain_governor.c</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/generic_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/generic_ops.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/qos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/qos.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/runtime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/runtime.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/trace.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/wakeirq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/wakeirq.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/power/wakeup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/wakeup.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/property.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regcache-flat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache-flat.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regcache-lzo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache-lzo.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regcache-rbtree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache-rbtree.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regcache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-ac97.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-ac97.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-debugfs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-i2c.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-irq.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-mmio.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-spi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-spmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-spmi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap-w1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-w1.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/base/regmap/regmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/swnode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/swnode.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='/openslx/kernel-qcow2-linux.git/diff/drivers/base/syscore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/syscore.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/base/test/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/test/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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/amiflop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/amiflop.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/ataflop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/ataflop.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/brd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/brd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/drbd/drbd_int.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_int.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/drbd/drbd_nl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_nl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/drbd/drbd_nla.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_nla.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/drbd/drbd_receiver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_receiver.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/drbd/drbd_req.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_req.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/drbd/drbd_worker.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_worker.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/floppy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/floppy.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/block/loop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/loop.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/mtip32xx/mtip32xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/mtip32xx/mtip32xx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/mtip32xx/mtip32xx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/mtip32xx/mtip32xx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/nbd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/nbd.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/block/null_blk_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/null_blk_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/paride/pcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/paride/pcd.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/block/paride/pd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/paride/pd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/paride/pf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/paride/pf.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/block/pktcdvd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/pktcdvd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/ps3disk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/ps3disk.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/rbd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/rbd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/rsxx/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/rsxx/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/swim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/swim.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/swim3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/swim3.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/virtio_blk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/virtio_blk.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/xsysace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/xsysace.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='/openslx/kernel-qcow2-linux.git/diff/drivers/block/zram/zram_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/zram/zram_drv.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btbcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btbcm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btmrvl_sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btmrvl_sdio.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btmtksdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btmtksdio.c</a></td><td class='right'>1101</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btmtkuart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btmtkuart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btqca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btqca.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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btqca.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btqca.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btsdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btsdio.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/btusb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btusb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/hci_bcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/hci_bcm.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/hci_h5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/hci_h5.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='/openslx/kernel-qcow2-linux.git/diff/drivers/bluetooth/hci_qca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/hci_qca.c</a></td><td class='right'>91</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='/openslx/kernel-qcow2-linux.git/diff/drivers/cdrom/gdrom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cdrom/gdrom.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ds1620.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ds1620.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/dtlk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/dtlk.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/hpet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/hpet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/hw_random/omap-rng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/hw_random/omap-rng.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/hw_random/stm32-rng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/hw_random/stm32-rng.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_devintf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_devintf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_dmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_dmi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_msghandler.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_msghandler.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_plat_data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_plat_data.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_plat_data.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_plat_data.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_si_hardcode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_hardcode.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_si_hotmod.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_hotmod.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_si_intf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_intf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_si_platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_platform.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_ssif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_ssif.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/char/ipmi/ipmi_watchdog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_watchdog.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/pcmcia/cm4000_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/pcmcia/cm4000_cs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/pcmcia/scr24x_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/pcmcia/scr24x_cs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/random.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/random.c</a></td><td class='right'>199</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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/tb0219.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tb0219.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/tpm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/tpm/eventlog/tpm2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/eventlog/tpm2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/tpm/tpm-dev-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/tpm-dev-common.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='/openslx/kernel-qcow2-linux.git/diff/drivers/char/tpm/tpm-interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/tpm-interface.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/char/virtio_console.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/virtio_console.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/at91/clk-programmable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/at91/clk-programmable.c</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/at91/pmc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/at91/pmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/at91/sama5d2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/at91/sama5d2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/clkdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/clkdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/imx/clk-pll14xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/imx/clk-pll14xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/mediatek/clk-gate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/mediatek/clk-gate.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/meson/clk-pll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/clk-pll.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/meson/g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/g12a.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/meson/gxbb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/gxbb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/meson/vid-pll-div.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/vid-pll-div.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/sunxi-ng/ccu_nkmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/sunxi-ng/ccu_nkmp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/clk/x86/clk-pmc-atom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/x86/clk-pmc-atom.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/arm_arch_timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/arm_arch_timer.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/clps711x-timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/clps711x-timer.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/mips-gic-timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/mips-gic-timer.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/tcb_clksrc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/tcb_clksrc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/timer-fsl-ftm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-fsl-ftm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/timer-oxnas-rps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-oxnas-rps.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/timer-riscv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-riscv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/clocksource/timer-ti-dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-ti-dm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/104-quad-8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/104-quad-8.c</a></td><td class='right'>1367</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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/Kconfig</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/counter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/counter.c</a></td><td class='right'>1567</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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/ftm-quaddec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/ftm-quaddec.c</a></td><td class='right'>356</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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/stm32-lptimer-cnt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/stm32-lptimer-cnt.c</a></td><td class='right'>754</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='/openslx/kernel-qcow2-linux.git/diff/drivers/counter/stm32-timer-cnt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/counter/stm32-timer-cnt.c</a></td><td class='right'>390</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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/acpi-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/acpi-cpufreq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/amd_freq_sensitivity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/amd_freq_sensitivity.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/armada-37xx-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/armada-37xx-cpufreq.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/armada-8k-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/armada-8k-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/cpufreq.c</a></td><td class='right'>102</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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/cpufreq_governor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/cpufreq_governor.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/cpufreq_stats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/cpufreq_stats.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/freq_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/freq_table.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/imx6q-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/imx6q-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/intel_pstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/intel_pstate.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/kirkwood-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/kirkwood-cpufreq.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/maple-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/maple-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/pasemi-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/pasemi-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/pmac32-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/pmac32-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/powernow-k8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/powernow-k8.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/ppc_cbe_cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/ppc_cbe_cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/qoriq-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/qoriq-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/scpi-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/scpi-cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpufreq/speedstep-centrino.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/speedstep-centrino.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpuidle/cpuidle-exynos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpuidle/cpuidle-exynos.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='/openslx/kernel-qcow2-linux.git/diff/drivers/cpuidle/cpuidle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpuidle/cpuidle.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/amcc/crypto4xx_alg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/amcc/crypto4xx_alg.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/amcc/crypto4xx_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/amcc/crypto4xx_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/amcc/crypto4xx_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/amcc/crypto4xx_core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/atmel-tdes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/atmel-tdes.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/axis/artpec6_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/axis/artpec6_crypto.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/bcm/cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/bcm/cipher.c</a></td><td class='right'>22</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/bcm/spu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/bcm/spu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/bcm/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/bcm/util.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/caamalg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/caamalg_qi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg_qi.c</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/caamalg_qi2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg_qi2.c</a></td><td class='right'>243</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/caamalg_qi2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg_qi2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/caamhash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamhash.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/caampkc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caampkc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/ctrl.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/error.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/error.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/intern.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/intern.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/jr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/jr.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/qi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/qi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/caam/regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/cpt/cptvf_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_algs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/cpt/cptvf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/cpt/cptvf_mbox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_mbox.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/cpt/cptvf_reqmanager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_reqmanager.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/nitrox/nitrox_aead.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_aead.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/nitrox/nitrox_hal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_hal.c</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/nitrox/nitrox_req.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_req.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_reqmgr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/nitrox/nitrox_skcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_skcipher.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/cavium/zip/zip_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/zip/zip_crypto.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccp/ccp-crypto-des3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/ccp-crypto-des3.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccp/ccp-crypto-rsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/ccp-crypto-rsa.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccp/ccp-crypto-sha.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/ccp-crypto-sha.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccp/psp-dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/psp-dev.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_aead.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_aead.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_aead.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_aead.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_buffer_mgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_buffer_mgr.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_buffer_mgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_buffer_mgr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_cipher.c</a></td><td class='right'>585</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_cipher.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_cipher.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_crypto_ctx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_crypto_ctx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_debugfs.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_debugfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_driver.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_driver.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_fips.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_fips.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_fips.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_fips.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_hash.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_hash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_hash.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_host_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_host_regs.h</a></td><td class='right'>123</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_hw_queue_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_hw_queue_defs.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_ivgen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_ivgen.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_ivgen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_ivgen.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_kernel_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_kernel_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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_lli_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_lli_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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_pm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_pm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_pm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_request_mgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_request_mgr.c</a></td><td class='right'>116</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_request_mgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_request_mgr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_sram_mgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_sram_mgr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ccree/cc_sram_mgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_sram_mgr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/chelsio/chcr_algo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/chelsio/chcr_algo.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/hifn_795x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/hifn_795x.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/hisilicon/sec/sec_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/hisilicon/sec/sec_algs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/inside-secure/safexcel_cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/inside-secure/safexcel_cipher.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ixp4xx_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ixp4xx_crypto.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/marvell/cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/marvell/cipher.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/marvell/hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/marvell/hash.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/mediatek/mtk-sha.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/mediatek/mtk-sha.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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/mxc-scc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/mxc-scc.c</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: 3.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/mxs-dcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/mxs-dcp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/n2_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/n2_core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/nx/nx-842-pseries.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-842-pseries.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/nx/nx-842.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-842.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/nx/nx-aes-xcbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-aes-xcbc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/nx/nx-sha256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-sha256.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/nx/nx-sha512.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-sha512.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/omap-des.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/omap-des.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/omap-sham.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/omap-sham.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/padlock-sha.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/padlock-sha.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/picoxcell_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/picoxcell_crypto.c</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/qat/qat_common/qat_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/qat/qat_common/qat_algs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/qat/qat_common/qat_asym_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/qat/qat_common/qat_asym_algs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/qce/ablkcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/qce/ablkcipher.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c</a></td><td class='right'>61</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/s5p-sss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/s5p-sss.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/sahara.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sahara.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/stm32/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/stm32/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/stm32/stm32-cryp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/stm32/stm32-cryp.c</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/stm32/stm32-hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/stm32/stm32-hash.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss-cipher.c</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/sunxi-ss/sun4i-ss-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss-core.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/sunxi-ss/sun4i-ss-hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss-hash.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/sunxi-ss/sun4i-ss.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/talitos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/talitos.c</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ux500/cryp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ux500/cryp/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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/ux500/cryp/cryp_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ux500/cryp/cryp_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/aes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/aes_cbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes_cbc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/aes_ctr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes_ctr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/aes_xts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes_xts.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/aesp8-ppc.pl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aesp8-ppc.pl</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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/ghash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/ghash.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='/openslx/kernel-qcow2-linux.git/diff/drivers/crypto/vmx/vmx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/vmx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/dax/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dax/super.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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/devfreq-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/devfreq-event.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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/devfreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/devfreq.c</a></td><td class='right'>90</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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/event/exynos-ppmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/event/exynos-ppmu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/event/rockchip-dfi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/event/rockchip-dfi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/exynos-bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/exynos-bus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/rk3399_dmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/rk3399_dmc.c</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/drivers/devfreq/tegra-devfreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/tegra-devfreq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/dma-buf/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma-buf/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/dma/bcm2835-dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/bcm2835-dma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/dma/mediatek/mtk-cqdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/mediatek/mtk-cqdma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/dma/sh/rcar-dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/sh/rcar-dmac.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/dma/stm32-mdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/stm32-mdma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/dma/txx9dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/txx9dmac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/altera_edac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/altera_edac.c</a></td><td class='right'>262</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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/altera_edac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/altera_edac.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/amd64_edac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/amd64_edac.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/amd64_edac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/amd64_edac.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/i10nm_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/i10nm_base.c</a></td><td class='right'>52</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/mce_amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/mce_amd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/skx_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/skx_base.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/skx_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/skx_common.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/edac/skx_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/skx_common.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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/devres.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/devres.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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/extcon-arizona.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-arizona.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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/extcon-axp288.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-axp288.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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/extcon-intel-cht-wc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-intel-cht-wc.c</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/extcon-intel-mrfld.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-intel-mrfld.c</a></td><td class='right'>284</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='/openslx/kernel-qcow2-linux.git/diff/drivers/extcon/extcon-intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-intel.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/firewire/nosy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firewire/nosy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firewire/ohci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firewire/ohci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/arm_sdei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/arm_sdei.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/dmi_scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/dmi_scan.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/efi/arm-runtime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/efi/arm-runtime.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/efi/libstub/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/efi/libstub/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/google/vpd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/google/vpd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/iscsi_ibft.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/iscsi_ibft.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='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/psci/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/psci/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/psci/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/psci/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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/psci/psci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/psci/psci.c</a> (renamed from drivers/firmware/psci.c)</td><td class='right'>110</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/firmware/psci/psci_checker.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/psci/psci_checker.c</a> (renamed from drivers/firmware/psci_checker.c)</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gnss/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gnss/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gnss/ubx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gnss/ubx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpio-adnp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-adnp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpio-aspeed.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-aspeed.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpio-eic-sprd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-eic-sprd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpio-exar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-exar.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpio-merrifield.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-merrifield.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpio-mockup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-mockup.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpiolib-devprop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib-devprop.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpiolib-of.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib-of.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpiolib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpio/gpiolib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_device.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_ib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_vm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/gfx_v9_0.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/gmc_v9_0.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/amdkfd/kfd_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdkfd/kfd_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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/dc/core/dc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/core/dc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/dc/core/dc_link.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/core/dc_link.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/dc/dc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dce/dce_aux.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dce/dce_aux.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/bridge/synopsys/dw-hdmi.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/drm_atomic_helper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_atomic_helper.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/drm_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/drm_fb_helper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_fb_helper.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/drm_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_file.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/drm_mm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_mm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/drm_syncobj.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_syncobj.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/exynos/exynos_mixer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/exynos/exynos_mixer.c</a></td><td class='right'>110</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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/cmd_parser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/cmd_parser.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/display.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/dmabuf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/dmabuf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/gtt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/gtt.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/gtt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/gtt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/kvmgt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/kvmgt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/mmio_context.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/mmio_context.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/gvt/scheduler.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/scheduler.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_debugfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_gem.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_gem_execbuffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_gem_execbuffer.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_gpu_error.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_gpu_error.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_reg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/i915_vma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_vma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/icl_dsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/icl_dsi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_bios.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_bios.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_ddi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_ddi.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_display.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_dp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_dp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_fbdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_fbdev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_hdmi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/intel_runtime_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_runtime_pm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/selftests/i915_gem_evict.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/selftests/i915_gem_evict.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/i915/vlv_dsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/vlv_dsi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/imx/ipuv3-crtc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/imx/ipuv3-crtc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_dpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_dpi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_drm_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_drm_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_drm_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_drm_gem.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_drm_gem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_drm_gem.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_hdmi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_hdmi_phy.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_hdmi_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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/meson/meson_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/meson/meson_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/meson/meson_dw_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/meson/meson_dw_hdmi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nouveau_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nouveau_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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nouveau_dmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nouveau_dmem.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/omapdrm/dss/hdmi4_core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/qxl/qxl_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/qxl/qxl_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/qxl/qxl_prime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/qxl/qxl_prime.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/rockchip/rockchip_drm_vop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/rockchip/rockchip_drm_vop.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/scheduler/sched_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/scheduler/sched_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/sun4i/sun4i_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/sun4i/sun4i_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/sun4i/sun8i_dw_hdmi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/sun4i/sun8i_tcon_top.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/sun4i/sun8i_tcon_top.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/tegra/hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/tegra/hdmi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/tegra/hub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/tegra/hub.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/tegra/vic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/tegra/vic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/ttm/ttm_bo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/ttm/ttm_bo.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/ttm/ttm_memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/ttm/ttm_memory.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/ttm/ttm_page_alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/ttm/ttm_page_alloc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/udl/udl_connector.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_connector.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/udl/udl_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/udl/udl_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/udl/udl_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_gem.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/udl/udl_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/vc4/vc4_crtc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vc4/vc4_crtc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/vgem/vgem_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vgem/vgem_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/virtio/virtgpu_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/virtio/virtgpu_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/virtio/virtgpu_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/virtio/virtgpu_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/virtio/virtgpu_prime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/virtio/virtgpu_prime.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/vkms/vkms_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vkms/vkms_gem.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vmwgfx/vmwgfx_fb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/host1x/hw/channel_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/host1x/hw/channel_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='/openslx/kernel-qcow2-linux.git/diff/drivers/gpu/ipu-v3/ipu-dp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/ipu-v3/ipu-dp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-core.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-ids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-ids.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-input.c</a></td><td class='right'>99</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-lg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-lg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-logitech-dj.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-logitech-dj.c</a></td><td class='right'>1142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-logitech-hidpp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-logitech-hidpp.c</a></td><td class='right'>747</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-macally.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-macally.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-picolcd_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-picolcd_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-quirks.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-sensor-custom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-sensor-custom.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-steam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-steam.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-u2fzero.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-u2fzero.c</a></td><td class='right'>374</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/hid-uclogic-params.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-uclogic-params.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ipc/hw-ish.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ipc/hw-ish.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ipc/pci-ish.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ipc/pci-ish.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp-fw-loader.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-fw-loader.c</a></td><td class='right'>1085</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp-hid-client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-hid-client.c</a></td><td class='right'>168</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp-hid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-hid.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp-hid.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-hid.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/bus.c</a></td><td class='right'>96</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp/client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/client.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp/client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/client.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/ishtp-dev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hid/uhid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/uhid.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hv/channel_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/channel_mgmt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hv/hv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/hv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hv/hyperv_vmbus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/hyperv_vmbus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hv/ring_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/ring_buffer.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hv/vmbus_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/vmbus_drv.c</a></td><td class='right'>166</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ad7414.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ad7414.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adc128d818.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adc128d818.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adm1025.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1025.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adm1026.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1026.c</a></td><td class='right'>416</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adm1029.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1029.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adm1031.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1031.c</a></td><td class='right'>201</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adm9240.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm9240.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ads1015.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ads1015.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ads7828.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ads7828.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adt7411.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adt7411.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/adt7475.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adt7475.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/f71805f.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/f71805f.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/fschmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/fschmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/hih6130.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/hih6130.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/hwmon.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/iio_hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/iio_hwmon.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ina209.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ina209.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ina2xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ina2xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ina3221.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ina3221.c</a></td><td class='right'>176</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/jc42.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/jc42.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/jz4740-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/jz4740-hwmon.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm63.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm63.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm75.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm75.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm78.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm78.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm85.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm85.c</a></td><td class='right'>342</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm87.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm87.c</a></td><td class='right'>165</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm90.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm90.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm95241.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm95241.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lm95245.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm95245.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/lochnagar-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lochnagar-hwmon.c</a></td><td class='right'>412</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ltc4151.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ltc4151.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ltc4245.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ltc4245.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ltq-cputemp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ltq-cputemp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/max197.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max197.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/max31790.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max31790.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/max6621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max6621.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/max6650.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max6650.c</a></td><td class='right'>90</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/max6697.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max6697.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/menf21bmc_hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/menf21bmc_hwmon.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/mlxreg-fan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/mlxreg-fan.c</a></td><td class='right'>121</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/nct7904.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/nct7904.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/npcm750-pwm-fan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/npcm750-pwm-fan.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/ntc_thermistor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ntc_thermistor.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/occ/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/occ/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/occ/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/occ/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/occ/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/sysfs.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pc87427.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pc87427.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/ir38064.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/ir38064.c</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/isl68137.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/isl68137.c</a></td><td class='right'>169</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/lm25066.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/lm25066.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/pmbus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/pmbus.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/pmbus_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/pmbus_core.c</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/tps53679.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/tps53679.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/ucd9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/ucd9000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pmbus/ucd9200.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/ucd9200.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/pwm-fan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pwm-fan.c</a></td><td class='right'>116</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/raspberrypi-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/raspberrypi-hwmon.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/s3c-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/s3c-hwmon.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/sht15.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/sht15.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/sis5595.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/sis5595.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/smsc47b397.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/smsc47b397.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/smsc47m1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/smsc47m1.c</a></td><td class='right'>106</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/smsc47m192.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/smsc47m192.c</a></td><td class='right'>146</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/stts751.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/stts751.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/thmc50.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/thmc50.c</a></td><td class='right'>83</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/tmp102.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp102.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/tmp103.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp103.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/tmp108.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp108.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/tmp421.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp421.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/via686a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/via686a.c</a></td><td class='right'>148</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/vt1211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/vt1211.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/vt8231.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/vt8231.c</a></td><td class='right'>166</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/w83627hf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/w83627hf.c</a></td><td class='right'>299</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/w83773g.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/w83773g.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwmon/w83793.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/w83793.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-catu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-catu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-catu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-catu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-dynamic-replicator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-dynamic-replicator.c</a></td><td class='right'>255</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-etb10.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-etb10.c</a></td><td class='right'>97</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-etm-perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-etm-perf.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-etm4x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-etm4x.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-funnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-funnel.c</a></td><td class='right'>116</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-replicator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-replicator.c</a></td><td class='right'>238</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-tmc-etf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc-etf.c</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-tmc-etr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc-etr.c</a></td><td class='right'>266</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-tmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-tmc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight-tpiu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tpiu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/coresight/coresight.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/acpi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/core.c</a></td><td class='right'>139</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/gth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/gth.c</a></td><td class='right'>125</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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/gth.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/gth.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/intel_th.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/intel_th.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/msu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/msu.c</a></td><td class='right'>407</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.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/msu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/msu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/intel_th/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/pci.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/hwtracing/stm/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/stm/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/busses/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/busses/i2c-designware-master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-designware-master.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/busses/i2c-i801.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-i801.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/busses/i2c-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-imx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/busses/i2c-nvidia-gpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-nvidia-gpu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/busses/i2c-synquacer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-synquacer.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i2c/i2c-core-base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/i2c-core-base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i3c/master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i3c/master.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='/openslx/kernel-qcow2-linux.git/diff/drivers/i3c/master/dw-i3c-master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i3c/master/dw-i3c-master.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ide/ide-cd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/ide-cd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ide/ide-cd_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/ide-cd_ioctl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ide/ide-gd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/ide-gd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ide/tx4939ide.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/tx4939ide.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/bma180.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/bma180.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/bmc150-accel-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/bmc150-accel-core.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/cros_ec_accel_legacy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/cros_ec_accel_legacy.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/kxcjk-1013.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/kxcjk-1013.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/kxsd9.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/kxsd9.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/mma8452.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/mma8452.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/st_accel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/st_accel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/st_accel_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/st_accel_core.c</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/accel/st_accel_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/st_accel_i2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/Kconfig</a></td><td class='right'>48</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad7124.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7124.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad7606.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7606.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad7606.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7606.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad7606_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7606_spi.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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad7780.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7780.c</a> (renamed from drivers/staging/iio/adc/ad7780.c)</td><td class='right'>179</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad7923.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7923.c</a></td><td class='right'>24</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ad_sigma_delta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad_sigma_delta.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/at91_adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/at91_adc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/imx7d_adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/imx7d_adc.c</a></td><td class='right'>175</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ingenic-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ingenic-adc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/lpc32xx_adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/lpc32xx_adc.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/meson_saradc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/meson_saradc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/mxs-lradc-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/mxs-lradc-adc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/qcom-spmi-adc5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/qcom-spmi-adc5.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/stm32-dfsdm-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/stm32-dfsdm-adc.c</a></td><td class='right'>628</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/stm32-dfsdm-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/stm32-dfsdm-core.c</a></td><td class='right'>180</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/stmpe-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/stmpe-adc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ti-ads7950.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ti-ads7950.c</a></td><td class='right'>219</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ti-ads8344.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ti-ads8344.c</a></td><td class='right'>204</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/ti-ads8688.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ti-ads8688.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/adc/xilinx-xadc-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/xilinx-xadc-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/buffer/industrialio-buffer-cb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/buffer/industrialio-buffer-cb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/chemical/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/chemical/bme680.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/chemical/bme680_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680_core.c</a></td><td class='right'>54</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/chemical/bme680_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680_i2c.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/chemical/bme680_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/chemical/pms7003.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/pms7003.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/common/ms_sensors/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/ms_sensors/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/common/ssp_sensors/ssp_iio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/ssp_sensors/ssp_iio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/counter/104-quad-8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/104-quad-8.c</a></td><td class='right'>631</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/counter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/counter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/counter/stm32-lptimer-cnt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/stm32-lptimer-cnt.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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/dac/ad5064.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/ad5064.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/dac/ad5758.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/ad5758.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/dac/mcp4725.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/mcp4725.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/dac/ti-dac5571.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/ti-dac5571.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/dummy/iio_dummy_evgen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dummy/iio_dummy_evgen.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/frequency/ad9523.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/frequency/ad9523.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/bmg160_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/bmg160_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/bmg160_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/bmg160_i2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/fxas21002c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/fxas21002c.h</a></td><td class='right'>150</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/fxas21002c_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/fxas21002c_core.c</a></td><td class='right'>1004</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/fxas21002c_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/fxas21002c_i2c.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/fxas21002c_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/fxas21002c_spi.c</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/itg3200_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/itg3200_core.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/gyro/mpu3050-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/mpu3050-core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/humidity/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/humidity/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/adis16400.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16400.c</a> (renamed from drivers/iio/imu/adis16400_core.c)</td><td class='right'>232</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/adis16400.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16400.h</a></td><td class='right'>215</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/adis16400_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16400_buffer.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/adis16480.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16480.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/adis_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis_buffer.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/inv_mpu6050/inv_mpu_core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/st_lsm6dsx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c</a></td><td class='right'>157</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/industrialio-buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/industrialio-buffer.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/industrialio-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/industrialio-core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/industrialio-trigger.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/industrialio-trigger.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/light/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/light/Kconfig</a></td><td class='right'>274</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/light/cros_ec_light_prox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/light/cros_ec_light_prox.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/light/vcnl4000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/light/vcnl4000.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/ak8974.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/ak8974.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/ak8975.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/ak8975.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/bmc150_magn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/bmc150_magn.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/hmc5843.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/hmc5843_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843_core.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/hmc5843_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843_i2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/magnetometer/hmc5843_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843_spi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/potentiometer/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/potentiometer/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/potentiostat/lmp91000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/potentiostat/lmp91000.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/pressure/bmp280-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/pressure/bmp280-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/pressure/cros_ec_baro.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/pressure/cros_ec_baro.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/proximity/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/proximity/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/proximity/as3935.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/as3935.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/proximity/mb1232.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/mb1232.c</a></td><td class='right'>272</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/proximity/srf04.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/srf04.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/temperature/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/temperature/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/temperature/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/temperature/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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/temperature/max31856.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/temperature/max31856.c</a></td><td class='right'>356</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='/openslx/kernel-qcow2-linux.git/diff/drivers/iio/trigger/iio-trig-loop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/trigger/iio-trig-loop.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/addr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/addr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/iwpm_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/iwpm_util.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/nldev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/nldev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/sa_query.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/sa_query.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/ucm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/ucm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/ucma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/ucma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/user_mad.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/user_mad.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/uverbs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/uverbs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/core/uverbs_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/uverbs_main.c</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/cxgb4/restrack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/cxgb4/restrack.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hfi1/chip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/chip.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hfi1/pio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/pio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hfi1/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/qp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hfi1/rc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/rc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hfi1/tid_rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/tid_rdma.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hfi1/vnic_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/vnic_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hns/hns_roce_hem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_hem.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hns/hns_roce_hw_v1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_hw_v1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hns/hns_roce_mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_mr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/hns/hns_roce_qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_qp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/i40iw/i40iw_osdep.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/i40iw/i40iw_osdep.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/i40iw/i40iw_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/i40iw/i40iw_utils.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx4/alias_GUID.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx4/alias_GUID.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx4/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx4/qp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx5/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx5/devx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/devx.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx5/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx5/mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/mr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx5/odp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/odp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mlx5/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/qp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mthca/mthca_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mthca/mthca_cq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_cq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mthca/mthca_qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_qp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/mthca/mthca_srq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_srq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/nes/nes_cm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/nes/nes_cm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/qedr/verbs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qedr/verbs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/qib/qib_iba6120.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_iba6120.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/qib/qib_iba7220.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_iba7220.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/qib/qib_iba7322.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_iba7322.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/qib/qib_sd7220.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_sd7220.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/sw/rdmavt/mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/sw/rdmavt/mr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/sw/rxe/rxe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/sw/rxe/rxe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/evdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/evdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/joydev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/joydev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/keyboard/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/keyboard/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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/keyboard/snvs_pwrkey.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/keyboard/snvs_pwrkey.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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/misc/uinput.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/misc/uinput.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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/mouse/elan_i2c_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/mouse/elan_i2c_core.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/input/rmi4/rmi_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/rmi4/rmi_driver.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='/openslx/kernel-qcow2-linux.git/diff/drivers/input/rmi4/rmi_f11.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/rmi4/rmi_f11.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='/openslx/kernel-qcow2-linux.git/diff/drivers/interconnect/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/interconnect/core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/amd_iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/amd_iommu.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/amd_iommu_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/amd_iommu_init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/amd_iommu_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/amd_iommu_types.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/intel-iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/intel-iommu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/io-pgtable-arm-v7s.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/io-pgtable-arm-v7s.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/iommu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/iommu/iova.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/iova.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-ath79-misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-ath79-misc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-brcmstb-l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-brcmstb-l2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-gic-v2m.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v2m.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-gic-v3-its-pci-msi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3-its-pci-msi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-gic-v3-its-platform-msi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3-its-platform-msi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-gic-v3-its.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3-its.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-gic-v3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-gic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-imx-irqsteer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-imx-irqsteer.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-ls1x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-ls1x.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-mbigen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-mbigen.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-mmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-mmp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-mvebu-sei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-mvebu-sei.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='/openslx/kernel-qcow2-linux.git/diff/drivers/irqchip/irq-stm32-exti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-stm32-exti.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/capi/capi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/capi/capi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/gigaset/bas-gigaset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/gigaset/bas-gigaset.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/hardware/mISDN/hfcmulti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/hardware/mISDN/hfcmulti.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/hardware/mISDN/hfcpci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/hardware/mISDN/hfcpci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/hisax/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/hisax/config.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/i4l/isdn_ppp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/i4l/isdn_ppp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/isdn/mISDN/socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/mISDN/socket.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/led-class.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/led-class.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/led-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/led-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-as3645a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-as3645a.c</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-blinkm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-blinkm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-lm3532.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-lm3532.c</a></td><td class='right'>683</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-lt3593.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-lt3593.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-pca9532.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-pca9532.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-pca955x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-pca955x.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/leds-pca963x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-pca963x.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/trigger/ledtrig-netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/trigger/ledtrig-netdev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/leds/uleds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/uleds.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='/openslx/kernel-qcow2-linux.git/diff/drivers/lightnvm/pblk-read.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/lightnvm/pblk-read.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mailbox/pcc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mailbox/pcc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/alloc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/btree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/btree.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/journal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/journal.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/request.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/request.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/request.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/request.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/super.c</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/bcache/util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/util.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-bufio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-bufio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-crypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-crypt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-exception-store.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-exception-store.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-integrity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-integrity.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-rq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-rq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm-table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-table.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/md-bitmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/md-bitmap.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/md.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/md.c</a></td><td class='right'>199</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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/md.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/md.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/persistent-data/dm-block-manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/persistent-data/dm-block-manager.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/md/raid1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/raid1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/md/raid5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/raid5.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/cec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/cec/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/cec/cec-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/cec/cec-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/cec/cec-notifier.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/cec/cec-notifier.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/common/cx2341x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/cx2341x.c</a></td><td class='right'>151</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/common/siano/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/siano/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/common/videobuf2/videobuf2-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/videobuf2/videobuf2-core.c</a></td><td class='right'>46</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/common/videobuf2/videobuf2-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/videobuf2/videobuf2-v4l2.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/common/videobuf2/videobuf2-vmalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/videobuf2/videobuf2-vmalloc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-core/dvbdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-core/dvbdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/as102_fe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/as102_fe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/dib7000p.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dib7000p.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/dib8000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dib8000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/dib9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dib9000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/drxd_hard.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/drxd_hard.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/dvb-pll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dvb-pll.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/m88ds3103.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/m88ds3103.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/si2165.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/si2165.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/dvb-frontends/ts2020.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/ts2020.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/Kconfig</a></td><td class='right'>271</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/cx25840/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/cx25840/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/et8ek8/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/et8ek8/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/imx214.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/imx214.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/m5mols/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/m5mols/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/ov2659.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov2659.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/ov6650.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov6650.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/ov7670.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov7670.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/ov7740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov7740.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/smiapp/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/smiapp/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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/i2c/st-mipid02.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/st-mipid02.c</a></td><td class='right'>1033</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/media-dev-allocator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-dev-allocator.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/media-devnode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-devnode.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/media-entity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-entity.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/media-request.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-request.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/mmc/siano/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/mmc/siano/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/bt8xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/bt8xx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/bt8xx/dst.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/bt8xx/dst.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/bt8xx/dst_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/bt8xx/dst_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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cobalt/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cobalt/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cobalt/cobalt-irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cobalt/cobalt-irq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cx18/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx18/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cx18/cx18-fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx18/cx18-fileops.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cx23885/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx23885/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cx23885/cx23885-dvb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx23885/cx23885-dvb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cx25821/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx25821/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/cx88/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx88/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/ddbridge/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ddbridge/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/dt3155/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/dt3155/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/dt3155/dt3155.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/dt3155/dt3155.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/intel/ipu3/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/intel/ipu3/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/intel/ipu3/ipu3-cio2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/intel/ipu3/ipu3-cio2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/ivtv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ivtv/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/ivtv/ivtv-fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ivtv/ivtv-fileops.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/mantis/mantis_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/mantis/mantis_i2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/meye/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/meye/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/netup_unidvb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/netup_unidvb/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/ngene/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ngene/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/saa7134/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7134/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/saa7134/saa7134-go7007.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7134/saa7134-go7007.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/saa7146/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7146/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/saa7146/hexium_gemini.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7146/hexium_gemini.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/saa7146/hexium_orion.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7146/hexium_orion.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/saa7164/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7164/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/solo6x10/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/solo6x10/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/tw5864/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/tw5864/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/tw5864/tw5864-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/tw5864/tw5864-video.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/pci/tw68/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/tw68/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/Kconfig</a></td><td class='right'>90</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/am437x/am437x-vpfe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/am437x/am437x-vpfe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/aspeed-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/aspeed-video.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/atmel/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/atmel/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/atmel/atmel-isc-regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/atmel/atmel-isc-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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/atmel/atmel-isc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/atmel/atmel-isc.c</a></td><td class='right'>906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/coda/coda-bit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/coda/coda-bit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/coda/coda-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/coda/coda-common.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/cros-ec-cec/cros-ec-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/cros-ec-cec/cros-ec-cec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/davinci/isif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/isif.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/davinci/vpfe_capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/vpfe_capture.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/davinci/vpif_capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/vpif_capture.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/davinci/vpif_display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/vpif_display.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/exynos4-is/fimc-capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/exynos4-is/fimc-capture.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/exynos4-is/fimc-m2m.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/exynos4-is/fimc-m2m.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/imx-pxp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/imx-pxp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/marvell-ccic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/marvell-ccic/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/meson/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/meson/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/meson/ao-cec-g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/meson/ao-cec-g12a.c</a></td><td class='right'>779</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/meson/ao-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/meson/ao-cec.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mtk-vpu/mtk_vpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vpu/mtk_vpu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/mx2_emmaprp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mx2_emmaprp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/omap/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/omap/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/pxa_camera.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/pxa_camera.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/qcom/venus/hfi_helper.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/qcom/venus/hfi_helper.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/rcar-vin/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/rcar-vin/rcar-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/rcar-core.c</a></td><td class='right'>47</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/rcar-vin/rcar-csi2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/rcar-csi2.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/rcar-vin/rcar-dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/rcar-dma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/rcar_drif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar_drif.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/rcar_fdp1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar_fdp1.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/s5p-cec/s5p_cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/s5p-cec/s5p_cec.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/s5p-g2d/g2d.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/s5p-g2d/g2d.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/seco-cec/seco-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/seco-cec/seco-cec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/sh_veu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sh_veu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/sti/c8sectpfe/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sti/c8sectpfe/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/sti/cec/stih-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sti/cec/stih-cec.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/sti/delta/delta-ipc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sti/delta/delta-ipc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/stm32/stm32-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/stm32/stm32-cec.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/stm32/stm32-dcmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/stm32/stm32-dcmi.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sunxi/sun6i-csi/sun6i_video.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/tegra-cec/tegra_cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/tegra-cec/tegra_cec.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/ti-vpe/cal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/ti-vpe/cal.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/ti-vpe/vpe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/ti-vpe/vpe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vicodec/codec-fwht.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-fwht.c</a></td><td class='right'>121</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vicodec/codec-fwht.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-fwht.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vicodec/codec-v4l2-fwht.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-v4l2-fwht.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vicodec/codec-v4l2-fwht.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-v4l2-fwht.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vicodec/vicodec-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/vicodec-core.c</a></td><td class='right'>762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/video-mux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/video-mux.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vim2m.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vim2m.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-capture.c</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-common.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-common.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-debayer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-debayer.c</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-scaler.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-scaler.c</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-sensor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-sensor.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-streamer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-streamer.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vimc/vimc-streamer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-streamer.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vivid/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vivid/vivid-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/vivid-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vivid/vivid-vid-cap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/vivid-vid-cap.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vivid/vivid-vid-out.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/vivid-vid-out.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/vsp1/vsp1_pipe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vsp1/vsp1_pipe.c</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/platform/xilinx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/xilinx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/radio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/radio/si470x/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/si470x/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/radio/si4713/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/si4713/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/radio/si4713/si4713.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/si4713/si4713.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/radio/wl128x/fmdrv_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/wl128x/fmdrv_common.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/Kconfig</a></td><td class='right'>80</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/bpf-lirc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/bpf-lirc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/ir-rcmm-decoder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/ir-rcmm-decoder.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/keymaps/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/keymaps/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/keymaps/rc-xbox-dvd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/keymaps/rc-xbox-dvd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/lirc_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/lirc_dev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/rc-main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/rc-main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/serial_ir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/serial_ir.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/rc/xbox_remote.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/xbox_remote.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/spi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/spi/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/airspy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/airspy/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/au0828/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/au0828/au0828-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/au0828-core.c</a></td><td class='right'>196</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/au0828/au0828-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/au0828-video.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/au0828/au0828.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/au0828.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/cpia2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/cpia2/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/cpia2/cpia2_v4l.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/cpia2/cpia2_v4l.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/cx231xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/cx231xx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/dvb-usb-v2/af9035.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/dvb-usb-v2/af9035.c</a></td><td class='right'>104</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/dvb-usb-v2/af9035.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/dvb-usb-v2/af9035.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/dvb-usb-v2/dvbsky.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/dvb-usb-v2/dvbsky.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/em28xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/em28xx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/em28xx/em28xx-input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/em28xx/em28xx-input.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/go7007/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/go7007/go7007-fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/go7007-fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/go7007/go7007-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/go7007-usb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/go7007/go7007-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/go7007-v4l2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/gspca/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/gspca/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/gspca/gspca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/gspca/gspca.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/hackrf/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/hackrf/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/hdpvr/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/hdpvr/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/hdpvr/hdpvr-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/hdpvr/hdpvr-video.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pulse8-cec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pulse8-cec/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pulse8-cec/pulse8-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pulse8-cec/pulse8-cec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pvrusb2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pvrusb2/pvrusb2-hdw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/pvrusb2-hdw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pvrusb2/pvrusb2-hdw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/pvrusb2-hdw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/pvrusb2-v4l2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pwc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pwc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/pwc/pwc-ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pwc/pwc-ctrl.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/rainshadow-cec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/rainshadow-cec/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/siano/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/siano/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/stk1160/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/stk1160/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/stkwebcam/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/stkwebcam/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/tm6000/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/tm6000/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/usbtv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/usbtv/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/usbvision/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/usbvision/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/usbvision/usbvision-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/usbvision/usbvision-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/uvc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/uvc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/usb/zr364xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/zr364xx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/v4l2-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-common.c</a></td><td class='right'>186</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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/v4l2-ctrls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-ctrls.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/v4l2-device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-device.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/v4l2-fwnode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-fwnode.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/v4l2-ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-ioctl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/media/v4l2-core/v4l2-subdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-subdev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/memory/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memory/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='/openslx/kernel-qcow2-linux.git/diff/drivers/memory/Makefile.asm-offsets?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memory/Makefile.asm-offsets</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='/openslx/kernel-qcow2-linux.git/diff/drivers/memstick/host/jmb38x_ms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memstick/host/jmb38x_ms.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='/openslx/kernel-qcow2-linux.git/diff/drivers/memstick/host/tifm_ms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memstick/host/tifm_ms.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='/openslx/kernel-qcow2-linux.git/diff/drivers/message/fusion/mptbase.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptbase.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='/openslx/kernel-qcow2-linux.git/diff/drivers/message/fusion/mptctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptctl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/message/fusion/mptsas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptsas.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/message/fusion/mptscsih.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptscsih.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='/openslx/kernel-qcow2-linux.git/diff/drivers/message/fusion/mptspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptspi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/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='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/omap-usb-tll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/omap-usb-tll.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/sprd-sc27xx-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/sprd-sc27xx-spi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/ti-lmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/ti-lmu.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/twl-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/twl-core.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/wm831x-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/wm831x-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mfd/wm8400-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/wm8400-core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/aspeed-p2a-ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/aspeed-p2a-ctrl.c</a></td><td class='right'>444</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/cardreader/rts5260.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/cardreader/rts5260.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/fastrpc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/fastrpc.c</a></td><td class='right'>242</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/genwqe/card_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/genwqe/card_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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/command_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/command_buffer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/command_submission.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/command_submission.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/context.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/context.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/debugfs.c</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/device.c</a></td><td class='right'>164</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/firmware_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/firmware_if.c</a></td><td class='right'>322</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/goya/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/goya/goya.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goya.c</a></td><td class='right'>1283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/goya/goyaP.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goyaP.h</a></td><td class='right'>81</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/goya/goya_coresight.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goya_coresight.c</a></td><td class='right'>628</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/goya/goya_security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goya_security.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/habanalabs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/habanalabs.h</a></td><td class='right'>241</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/habanalabs_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/habanalabs_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/habanalabs_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/habanalabs_ioctl.c</a></td><td class='right'>139</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.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/hw_queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/hw_queue.c</a></td><td class='right'>51</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/armcp_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/armcp_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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/goya_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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h</a></td><td class='right'>306</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/goya.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/goya_async_events.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya_async_events.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/goya_coresight.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya_coresight.h</a></td><td class='right'>199</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/goya/goya_fw_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya_fw_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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/hl_boot_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/hl_boot_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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/irq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/memory.c</a></td><td class='right'>235</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/mmu.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/habanalabs/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/pci.c</a></td><td class='right'>408</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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/ioc4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/ioc4.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/kgdbts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/kgdbts.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/bus-fixup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/bus-fixup.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/bus.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/client.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/client.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/debugfs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/dma-ring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/dma-ring.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hbm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hbm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hbm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hbm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hdcp/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hdcp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hdcp/mei_hdcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/mei_hdcp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hdcp/mei_hdcp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/mei_hdcp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw-me-regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-me-regs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw-me.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-me.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw-me.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-me.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw-txe-regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-txe-regs.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw-txe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-txe.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw-txe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-txe.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/init.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/interrupt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/interrupt.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/mei-trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/mei-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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/mei-trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/mei-trace.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/mei_dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/mei_dev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/pci-me.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/pci-me.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mei/pci-txe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/pci-txe.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/mic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mic/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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/sgi-xp/xpc_uv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/sgi-xp/xpc_uv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/misc/tifm_7xx1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/tifm_7xx1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/core/host.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/host.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/core/mmc_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/mmc_ops.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/core/pwrseq_emmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/pwrseq_emmc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/core/queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/queue.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/core/quirks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/quirks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/core/sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/sd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/alcor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/alcor.c</a></td><td class='right'>100</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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/cqhci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/cqhci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/cqhci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/cqhci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/davinci_mmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/davinci_mmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/meson-gx-mmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/meson-gx-mmc.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mmc_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmc_spi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mmci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci.c</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mmci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mmci_qcom_dml.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci_qcom_dml.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mmci_qcom_dml.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci_qcom_dml.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mmci_stm32_sdmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci_stm32_sdmmc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mtk-sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mtk-sd.c</a></td><td class='right'>97</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mxcmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mxcmmc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/mxs-mmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mxs-mmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/of_mmc_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/of_mmc_spi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/omap_hsmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/omap_hsmmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/pxamci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/pxamci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/renesas_sdhi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/renesas_sdhi_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi_core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/renesas_sdhi_internal_dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi_internal_dmac.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/renesas_sdhi_sys_dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi_sys_dmac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-esdhc-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-esdhc-imx.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-of-arasan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-of-arasan.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-of-esdhc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-of-esdhc.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-omap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-omap.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-pci-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-pci-core.c</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci-tegra.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-tegra.c</a></td><td class='right'>362</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.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci.c</a></td><td class='right'>177</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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/sdhci_am654.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci_am654.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/tifm_sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/tifm_sd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/tmio_mmc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/tmio_mmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/tmio_mmc_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/tmio_mmc_core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/usdhi6rol0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/usdhi6rol0.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mmc/host/via-sdmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/via-sdmmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mtd/chips/cfi_cmdset_0002.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/chips/cfi_cmdset_0002.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mtd/nand/raw/marvell_nand.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/nand/raw/marvell_nand.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/mtd/nand/raw/r852.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/nand/raw/r852.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='/openslx/kernel-qcow2-linux.git/diff/drivers/mtd/nand/raw/txx9ndfmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/nand/raw/txx9ndfmc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/appletalk/ipddp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/appletalk/ipddp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/bonding/bond_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/bonding/bond_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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/bonding/bond_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/bonding/bond_netlink.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/bonding/bond_sysfs_slave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/bonding/bond_sysfs_slave.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/b53/b53_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/b53/b53_common.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/b53/b53_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/b53/b53_priv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/bcm_sf2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/bcm_sf2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/bcm_sf2_cfp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/bcm_sf2_cfp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/lantiq_gswip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/lantiq_gswip.c</a></td><td class='right'>812</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/microchip/ksz9477.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/microchip/ksz9477.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mt7530.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mt7530.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mt7530.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mt7530.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6060.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6060.c</a></td><td class='right'>217</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: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6060.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6060.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/chip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/chip.c</a></td><td class='right'>287</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/chip.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/port.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/port.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/port.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/smi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/smi.c</a></td><td class='right'>158</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/mv88e6xxx/smi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/smi.h</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/qca8k.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/qca8k.c</a></td><td class='right'>174</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/qca8k.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/qca8k.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105.h</a></td><td class='right'>159</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_clocking.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_clocking.c</a></td><td class='right'>601</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_dynamic_config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_dynamic_config.c</a></td><td class='right'>532</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_dynamic_config.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_dynamic_config.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_ethtool.c</a></td><td class='right'>419</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_main.c</a></td><td class='right'>1675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_spi.c</a></td><td class='right'>590</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_static_config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_static_config.c</a></td><td class='right'>987</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dsa/sja1105/sja1105_static_config.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/sja1105/sja1105_static_config.h</a></td><td class='right'>253</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/dummy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dummy.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/3com/3c515.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/3com/3c515.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/8390/mac8390.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/8390/mac8390.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aeroflex/greth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aeroflex/greth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/alacritech/slicoss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/alacritech/slicoss.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/allwinner/sun4i-emac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/allwinner/sun4i-emac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/altera/altera_tse_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/altera/altera_tse_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/amazon/ena/ena_com.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amazon/ena/ena_com.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/amazon/ena/ena_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amazon/ena/ena_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/amazon/ena/ena_netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amazon/ena/ena_netdev.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amd/xgbe/xgbe-dev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amd/xgbe/xgbe-drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c</a></td><td class='right'>125</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_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.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a></td><td class='right'>121</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_nic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a></td><td class='right'>48</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a></td><td class='right'>193</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_ring.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_vec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/arc/emac_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/arc/emac_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/atheros/atlx/atl1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/atheros/atlx/atl1.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/atheros/atlx/atl2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/atheros/atlx/atl2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/aurora/nb8800.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aurora/nb8800.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bcmsysport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bcmsysport.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bcmsysport.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bcmsysport.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bgmac-bcma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bgmac-bcma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bgmac-platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bgmac-platform.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a></td><td class='right'>343</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h</a></td><td class='right'>263</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/cnic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/cnic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/genet/bcmgenet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/tg3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/tg3.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/broadcom/tg3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/tg3.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cadence/macb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cadence/macb_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/liquidio/lio_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/lio_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/octeon_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/octeon_droq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/liquidio/request_manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/request_manager.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/thunder/nicvf_queues.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/thunder/thunder_bgx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb3/l2t.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb3/l2t.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/sge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/sge.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/t4fw_version.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cisco/enic/enic_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cisco/enic/enic_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/cortina/gemini.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cortina/gemini.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/davicom/dm9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/davicom/dm9000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/emulex/benet/be_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/emulex/benet/be_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ethoc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ethoc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ezchip/nps_enet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ezchip/nps_enet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c</a></td><td class='right'>97</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/fec_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fec_main.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/fec_mpc52xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fec_mpc52xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/fman/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fman/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/gianfar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/gianfar.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/ucc_geth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/ucc_geth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/freescale/ucc_geth_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/ucc_geth_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hisi_femac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hisi_femac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hix5hd2_gmac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hnae.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hnae.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hnae.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hnae.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns/hns_enet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_enet.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hclge_mbx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hnae3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hnae3.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hnae3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hnae3.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c</a></td><td class='right'>207</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c</a></td><td class='right'>110</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c</a></td><td class='right'>1017</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c</a></td><td class='right'>52</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/hisilicon/hns_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/huawei/hinic/hinic_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/huawei/hinic/hinic_tx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/i825xx/lasi_82596.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/i825xx/lasi_82596.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ibm/ehea/ehea_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ehea/ehea_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ehea/ehea_qmr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ibm/ibmveth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ibmveth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ibm/ibmvnic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ibmvnic.c</a></td><td class='right'>145</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ibm/ibmvnic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ibmvnic.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/e100.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/e100.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/e1000/e1000_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/e1000/e1000_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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/e1000e/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/e1000e/netdev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_iov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/fm10k/fm10k_iov.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/fm10k/fm10k_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e.h</a></td><td class='right'>46</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_adminq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_adminq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_client.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_common.c</a></td><td class='right'>355</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_dcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_dcb.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_dcb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_ddp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_ddp.c</a></td><td class='right'>481</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_devids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_devids.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_ethtool.c</a></td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_main.c</a></td><td class='right'>441</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_nvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_nvm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_prototype.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_prototype.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_ptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_ptp.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_txrx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_type.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_type.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c</a></td><td class='right'>171</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/i40e/i40e_xsk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_xsk.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/iavf/iavf_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/iavf/iavf_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice.h</a></td><td class='right'>110</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_adminq_cmd.h</a></td><td class='right'>192</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_common.c</a></td><td class='right'>335</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_common.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_controlq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_controlq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_controlq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_controlq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_dcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_dcb.c</a></td><td class='right'>1392</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_dcb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_dcb.h</a></td><td class='right'>179</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_dcb_lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_dcb_lib.c</a></td><td class='right'>551</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_dcb_lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_dcb_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_ethtool.c</a></td><td class='right'>366</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_hw_autogen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_hw_autogen.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_lan_tx_rx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_lib.c</a></td><td class='right'>768</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_lib.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_main.c</a></td><td class='right'>824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_nvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_nvm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_sched.c</a></td><td class='right'>273</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_sched.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_status.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_status.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_switch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_switch.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_switch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_switch.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_txrx.c</a></td><td class='right'>711</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_txrx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_txrx.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_type.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_type.h</a></td><td class='right'>102</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c</a></td><td class='right'>720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igb/e1000_defines.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igb/e1000_defines.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igb/igb_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igb/igb_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igb/igb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igb/igb_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igbvf/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igbvf/netdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igc/igc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc.h</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igc/igc_base.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igc/igc_defines.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_defines.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igc/igc_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_ethtool.c</a></td><td class='right'>839</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igc/igc_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_main.c</a></td><td class='right'>456</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/igc/igc_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_regs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/lantiq_xrx200.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/lantiq_xrx200.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mv643xx_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mv643xx_eth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mvneta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvneta.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2.h</a></td><td class='right'>52</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c</a></td><td class='right'>704</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h</a></td><td class='right'>138</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c</a></td><td class='right'>253</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/pxa168_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/pxa168_eth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/marvell/sky2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/sky2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mediatek/mtk_eth_soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mediatek/mtk_eth_soc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx4/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx4/catas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/catas.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx4/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/cmd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/en_tx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/alloc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/cmd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en.h</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/params.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/params.c</a></td><td class='right'>104</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/params.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/params.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/port.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_common.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_main.c</a></td><td class='right'>306</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_rep.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_rx.c</a></td><td class='right'>224</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_tc.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.c</a></td><td class='right'>233</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.h</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c</a></td><td class='right'>258</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/events.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c</a></td><td class='right'>113</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.c</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/health.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/health.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/lag_mp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/main.c</a></td><td class='right'>494</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/pagealloc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/port.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/qp.c</a></td><td class='right'>72</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/rdma.c</a></td><td class='right'>182</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/rdma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/rdma.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/sriov.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/transobj.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/transobj.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/uar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/uar.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/vport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/vport.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlx5/core/wq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/wq.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/core.c</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/core.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_env.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/core_env.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/minimal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/minimal.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/pci_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/reg.h</a></td><td class='right'>92</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/resources.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/resources.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum.c</a></td><td class='right'>164</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c</a></td><td class='right'>389</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_span.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/switchib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/switchib.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mellanox/mlxsw/switchx2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/switchx2.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/micrel/ks8851.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/micrel/ks8851.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/micrel/ks8851.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/micrel/ks8851.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/micrel/ks8851_mll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/micrel/ks8851_mll.c</a></td><td class='right'>319</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/microchip/enc28j60.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/microchip/enc28j60.c</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/mscc/ocelot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mscc/ocelot.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/myricom/myri10ge/myri10ge.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/neterion/s2io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/s2io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/neterion/vxge/vxge-config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/vxge/vxge-config.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/neterion/vxge/vxge-main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/vxge/vxge-main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/neterion/vxge/vxge-traffic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/vxge/vxge-traffic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/abm/cls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/abm/cls.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/abm/ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/abm/ctrl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/abm/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/abm/main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/cmsg.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/bpf/fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/fw.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/bpf/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/main.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/bpf/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/bpf/offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/offload.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/ccm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/ccm.c</a></td><td class='right'>220</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/ccm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/ccm.h</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/action.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/action.c</a></td><td class='right'>206</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/cmsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/cmsg.c</a></td><td class='right'>58</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/cmsg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/cmsg.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/main.c</a></td><td class='right'>155</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/main.h</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/match.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/match.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/metadata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/metadata.c</a></td><td class='right'>117</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/offload.c</a></td><td class='right'>618</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.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/qos_conf.c</a></td><td class='right'>366</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_app.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_devlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_devlink.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_main.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_common.c</a></td><td class='right'>133</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_repr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_netvf_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_port.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfp_port.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_port.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/nxp/lpc_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/nxp/lpc_eth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/pasemi/pasemi_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/pasemi/pasemi_mac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_dcbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_dcbx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_dev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_int.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_int.c</a></td><td class='right'>96</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_int.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_int.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_spq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_spq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qed/qed_sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_sriov.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qede/qede.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qede/qede_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede_ethtool.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qede/qede_fp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede_fp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qede/qede_ptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede_ptp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qla3xxx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qla3xxx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qlge/qlge.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlge/qlge.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlge/qlge_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qualcomm/qca_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qualcomm/qca_spi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/qualcomm/qca_uart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qualcomm/qca_uart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/rdc/r6040.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/rdc/r6040.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/realtek/atp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/realtek/atp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/realtek/r8169.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/realtek/r8169.c</a></td><td class='right'>847</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/renesas/ravb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/renesas/ravb_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/renesas/ravb_ptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/renesas/ravb_ptp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/renesas/sh_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/renesas/sh_eth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/rocker/rocker_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/rocker/rocker_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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/rocker/rocker_ofdpa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/rocker/rocker_ofdpa.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sfc/falcon/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/falcon/io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sfc/falcon/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/falcon/tx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sfc/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sfc/mcdi_port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/mcdi_port.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sfc/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/tx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/silan/sc92031.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/silan/sc92031.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sis/sis900.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sis/sis900.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/socionext/netsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/socionext/netsec.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/socionext/sni_ave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/socionext/sni_ave.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/descs_com.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/descs_com.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/enh_desc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/enh_desc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/hwif.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/hwif.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/norm_desc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/norm_desc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/ring_mode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/ring_mode.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sun/ldmvsw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sun/ldmvsw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/sun/sunvnet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sun/sunvnet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpmac.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw-common.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw-phy-sel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw-phy-sel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw.c</a></td><td class='right'>1542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_ale.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_ale.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_ale.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_ale.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_ethtool.c</a></td><td class='right'>719</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_priv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_priv.c</a></td><td class='right'>132</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_priv.h</a></td><td class='right'>429</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_sl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_sl.c</a></td><td class='right'>328</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpsw_sl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_sl.h</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpts.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/cpts.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpts.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/davinci_cpdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_cpdma.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/davinci_cpdma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_cpdma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/davinci_emac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_emac.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/davinci_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_mdio.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/netcp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/netcp_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/netcp_ethss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_ethss.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/netcp_sgmii.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_sgmii.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/ti/netcp_xgbepcsr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_xgbepcsr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/via/via-rhine.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/via/via-rhine.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/wiznet/w5100.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/wiznet/w5100.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/wiznet/w5300.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/wiznet/w5300.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/xilinx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/xilinx/ll_temac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/ll_temac.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/xilinx/ll_temac_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/ll_temac_main.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/xilinx/ll_temac_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/ll_temac_mdio.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/xilinx/xilinx_axienet_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/xilinx_axienet_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ethernet/xilinx/xilinx_emaclite.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/geneve.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/geneve.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/gtp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/gtp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/hippi/rrunner.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hippi/rrunner.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/hyperv/hyperv_net.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hyperv/hyperv_net.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/hyperv/netvsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hyperv/netvsc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/hyperv/netvsc_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hyperv/netvsc_drv.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ieee802154/adf7242.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ieee802154/adf7242.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ieee802154/mac802154_hwsim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ieee802154/mac802154_hwsim.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ieee802154/mcr20a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ieee802154/mcr20a.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/loopback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/loopback.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/macsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/macsec.c</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/macvlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/macvlan.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/net_failover.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/net_failover.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/bpf.c</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/bus.c</a></td><td class='right'>341</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/dev.c</a></td><td class='right'>447</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/devlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/devlink.c</a></td><td class='right'>295</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/fib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/fib.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/ipsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/ipsec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/netdev.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/netdevsim.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/netdevsim.h</a></td><td class='right'>145</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/netdevsim/sdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/amd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/aquantia_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/aquantia_main.c</a></td><td class='right'>526</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/asix.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/asix.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/at803x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/at803x.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/bcm-cygnus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm-cygnus.c</a></td><td class='right'>149</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/bcm-phy-lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm-phy-lib.c</a></td><td class='right'>52</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/bcm-phy-lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm-phy-lib.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/bcm63xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm63xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/bcm7xxx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm7xxx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/broadcom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/broadcom.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/cicada.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/cicada.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/davicom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/davicom.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/dp83640.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83640.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/dp83822.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83822.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/dp83848.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83848.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/dp83867.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83867.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/dp83tc811.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83tc811.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/et1011c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/et1011c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/fixed_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/fixed_phy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/icplus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/icplus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/intel-xway.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/intel-xway.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/lxt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/lxt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/marvell.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/marvell.c</a></td><td class='right'>148</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/marvell10g.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/marvell10g.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/mdio-bcm-unimac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio-bcm-unimac.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/mdio-mux-meson-g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio-mux-meson-g12a.c</a></td><td class='right'>380</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/mdio_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio_bus.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/mdio_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio_device.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/meson-gxl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/meson-gxl.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/micrel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/micrel.c</a></td><td class='right'>72</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/microchip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/microchip.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/mscc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mscc.c</a></td><td class='right'>479</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/national.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/national.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/phy-c45.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy-c45.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/phy-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy-core.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: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/phy_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy_device.c</a></td><td class='right'>208</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/qsemi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/qsemi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/realtek.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/realtek.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/rockchip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/rockchip.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/smsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/smsc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/spi_ks8995.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/spi_ks8995.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/ste10Xp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/ste10Xp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/uPD60620.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/uPD60620.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/phy/vitesse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/vitesse.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/ppp/ppp_mppe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ppp/ppp_mppe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/sb1000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/sb1000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/slip/slhc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/slip/slhc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/team/team.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/team/team.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/thunderbolt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/thunderbolt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/tun.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/tun.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/aqc111.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/aqc111.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/cdc_ether.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/cdc_ether.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/cdc_mbim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/cdc_mbim.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/ipheth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/ipheth.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/qmi_wwan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/qmi_wwan.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/r8152.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/r8152.c</a></td><td class='right'>53</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/smsc75xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/smsc75xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/usb/smsc95xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/smsc95xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/veth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/veth.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/virtio_net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/virtio_net.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/vrf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/vrf.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/vxlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/vxlan.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wimax/i2400m/control.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wimax/i2400m/control.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wimax/i2400m/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wimax/i2400m/tx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/ce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/ce.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/coredump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/coredump.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/htt_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/htt_rx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/pci.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath10k/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath5k/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath5k/base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath5k/mac80211-ops.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath6kl/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath6kl/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath9k/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath9k/init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/ath9k/xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath9k/xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wcn36xx/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/cfg80211.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/debugfs.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/fw_inc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/fw_inc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/netdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/pcie_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/pcie_bus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/pm.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/txrx_edma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/txrx_edma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/wil6210.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wil6210.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/wil_crash_dump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wil_crash_dump.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/wmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wmi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ath/wil6210/wmi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wmi.h</a></td><td class='right'>91</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/atmel/at76c50x-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/atmel/at76c50x-usb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43/main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43/phy_lp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43/phy_lp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43/sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43legacy/ilt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/ilt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43legacy/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43legacy/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/phy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43legacy/pio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/pio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43legacy/radio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/radio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a></td><td class='right'>58</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlegacy/3945-debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlegacy/3945-debug.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlegacy/4965.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlegacy/4965.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlegacy/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlegacy/common.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/cfg/5000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/cfg/9000.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a></td><td class='right'>136</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.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a></td><td class='right'>181</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a></td><td class='right'>54</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/dbg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/file.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/img.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/img.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/runtime.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-csr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a></td><td class='right'>148</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-prph.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-trans.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a></td><td class='right'>148</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a></td><td class='right'>303</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/ops.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a></td><td class='right'>94</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/rs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/sta.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/sta.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/drv.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/internal.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/rx.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/trans.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/trans.c</a></td><td class='right'>92</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/tx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intersil/orinoco/mic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intersil/orinoco/mic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/intersil/p54/p54pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intersil/p54/p54pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mac80211_hwsim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mac80211_hwsim.c</a></td><td class='right'>94</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/cfg80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/cfp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/cfp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/cmdevt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sdio.h</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/sta_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sta_event.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sta_rx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwifiex/uap_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/uap_event.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/marvell/mwl8k.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwl8k.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/agg-rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/agg-rx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/dma.c</a></td><td class='right'>167</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/dma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/eeprom.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mac80211.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mmio.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76.h</a></td><td class='right'>123</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a></td><td class='right'>56</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/mac.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a></td><td class='right'>58</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/soc.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/dma.c</a></td><td class='right'>205</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/init.c</a></td><td class='right'>229</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/mac.c</a></td><td class='right'>775</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/mac.h</a></td><td class='right'>300</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/main.c</a></td><td class='right'>499</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.c</a></td><td class='right'>1655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.h</a></td><td class='right'>520</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h</a></td><td class='right'>195</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/pci.c</a></td><td class='right'>150</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7615/regs.h</a></td><td class='right'>203</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/initvals.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a></td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c</a></td><td class='right'>286</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.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.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a></td><td class='right'>342</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a></td><td class='right'>187</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_util.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/init.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/tx.c</a></td><td class='right'>159</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt76/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/usb.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/mediatek/mt7601u/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt7601u/usb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/bus.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/cfg80211.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/commands.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/commands.c</a></td><td class='right'>379</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/commands.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/commands.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/core.c</a></td><td class='right'>91</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/debug.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/qlink.h</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.c</a></td><td class='right'>117</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800lib.c</a></td><td class='right'>628</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800lib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.c</a></td><td class='right'>124</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800soc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800usb.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00dev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00mac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00mmio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00usb.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ray_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ray_cs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtlwifi/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/wifi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/Kconfig</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/debug.c</a></td><td class='right'>637</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/debug.h</a></td><td class='right'>52</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/efuse.c</a></td><td class='right'>160</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/efuse.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/efuse.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/fw.c</a></td><td class='right'>633</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/fw.h</a></td><td class='right'>222</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/hci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/hci.h</a></td><td class='right'>211</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/mac.c</a></td><td class='right'>965</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/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.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/mac80211.c</a></td><td class='right'>481</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/main.c</a></td><td class='right'>1211</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/main.h</a></td><td class='right'>1104</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/pci.c</a></td><td class='right'>1211</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/pci.h</a></td><td class='right'>237</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/phy.c</a></td><td class='right'>1727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/phy.h</a></td><td class='right'>134</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/ps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/ps.c</a></td><td class='right'>166</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/ps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/ps.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/reg.h</a></td><td class='right'>421</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/regd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/regd.c</a></td><td class='right'>391</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/regd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/regd.h</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822b.c</a></td><td class='right'>1594</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822b.h</a></td><td class='right'>170</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822b_table.c</a></td><td class='right'>20783</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b_table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822b_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822c.c</a></td><td class='right'>1890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822c.h</a></td><td class='right'>186</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.c</a></td><td class='right'>11753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 56.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 43.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rx.c</a></td><td class='right'>151</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/rx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/rx.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/sec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/sec.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/sec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/sec.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/tx.c</a></td><td class='right'>367</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/tx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/tx.h</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/realtek/rtw88/util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtw88/util.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rndis_wlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rndis_wlan.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_91x_hal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_hal.c</a></td><td class='right'>199</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_91x_mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_mac80211.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_91x_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_mgmt.c</a></td><td class='right'>232</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_91x_sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_sdio.c</a></td><td class='right'>129</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_91x_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_usb.c</a></td><td class='right'>96</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_boot_params.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_boot_params.h</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_hal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_hal.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_main.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_mgmt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_mgmt.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_sdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/rsi/rsi_usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/st/cw1200/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/st/cw1200/main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ti/wlcore/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/cmd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ti/wlcore/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ti/wlcore/vendor_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/vendor_cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/ti/wlcore/wlcore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/wlcore.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/zydas/zd1211rw/zd_usb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/xen-netback/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netback/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/net/xen-netback/interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netback/interface.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/xen-netback/xenbus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netback/xenbus.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/net/xen-netfront.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netfront.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/mei_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/mei_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/microread/mei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/microread/mei.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/pn533/pn533.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/pn533/pn533.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/pn544/mei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/pn544/mei.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/s3fwrn5/firmware.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/s3fwrn5/firmware.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/st21nfca/dep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/st21nfca/dep.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nfc/st95hf/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/st95hf/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/ntb/hw/idt/ntb_hw_idt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ntb/hw/idt/ntb_hw_idt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ntb/test/ntb_perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ntb/test/ntb_perf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/btt_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/btt_devs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/bus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/dimm_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/dimm_devs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/namespace_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/namespace_devs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/pfn_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/pfn_devs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/pmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/pmem.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvdimm/security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/security.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/core.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/fabrics.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/fabrics.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/fc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/multipath.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/multipath.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/nvme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/nvme.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/pci.c</a></td><td class='right'>300</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/rdma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/host/tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/tcp.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/admin-cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/admin-cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/configfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/discovery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/discovery.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/fabrics-cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/fabrics-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/fc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/io-cmd-bdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/io-cmd-bdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/io-cmd-file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/io-cmd-file.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/loop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/loop.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/nvmet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/nvmet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/rdma.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvme/target/tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/tcp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/core.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/imx-iim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/imx-iim.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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/imx-ocotp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/imx-ocotp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/mxs-ocotp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/mxs-ocotp.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/nvmem-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/nvmem-sysfs.c</a></td><td class='right'>256</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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/nvmem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/nvmem.h</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/stm32-romem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/stm32-romem.c</a></td><td class='right'>202</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='/openslx/kernel-qcow2-linux.git/diff/drivers/nvmem/sunxi_sid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/sunxi_sid.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/address.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/address.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/fdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/fdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/irq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/of_net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/of_net.c</a></td><td class='right'>55</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/of_reserved_mem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/of_reserved_mem.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/of/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/property.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='/openslx/kernel-qcow2-linux.git/diff/drivers/of/unittest.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/unittest.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/opp/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/opp/core.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/drivers/parisc/iosapic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parisc/iosapic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/parisc/led.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parisc/led.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='/openslx/kernel-qcow2-linux.git/diff/drivers/parport/daisy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/daisy.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/parport/ieee1284.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/ieee1284.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='/openslx/kernel-qcow2-linux.git/diff/drivers/parport/parport_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/parport_cs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/parport/probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/probe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/parport/share.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/share.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/controller/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/controller/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/controller/vmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/controller/vmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/hotplug/pciehp_ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/hotplug/pciehp_ctrl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pci-driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pci-driver.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pci.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pcie/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pcie/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pcie/bw_notification.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/bw_notification.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pcie/portdrv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/portdrv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/pcie/portdrv_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/portdrv_core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/probe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/quirks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pci/switch/switchtec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/switch/switchtec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/perf/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/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='/openslx/kernel-qcow2-linux.git/diff/drivers/perf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/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='/openslx/kernel-qcow2-linux.git/diff/drivers/perf/arm-cci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/arm-cci.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/perf/arm-ccn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/arm-ccn.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/perf/arm_smmuv3_pmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/arm_smmuv3_pmu.c</a></td><td class='right'>865</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/allwinner/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/allwinner/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/allwinner/phy-sun4i-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/allwinner/phy-sun4i-usb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/amlogic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/amlogic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/amlogic/phy-meson-g12a-usb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/phy-meson-g12a-usb2.c</a></td><td class='right'>341</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c</a></td><td class='right'>413</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/amlogic/phy-meson-gxl-usb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/phy-meson-gxl-usb2.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/broadcom/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/broadcom/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/broadcom/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/broadcom/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/broadcom/phy-bcm-sr-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/broadcom/phy-bcm-sr-usb.c</a></td><td class='right'>394</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/freescale/phy-fsl-imx8mq-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/freescale/phy-fsl-imx8mq-usb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/hisilicon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/hisilicon/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/hisilicon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/hisilicon/phy-hi3660-usb3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/hisilicon/phy-hi3660-usb3.c</a></td><td class='right'>233</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/marvell/phy-mvebu-a3700-utmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/marvell/phy-mvebu-a3700-utmi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/mediatek/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/mediatek/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/mediatek/phy-mtk-tphy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/phy-mtk-tphy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/mediatek/phy-mtk-ufs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/phy-mtk-ufs.c</a></td><td class='right'>245</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/motorola/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/motorola/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/mscc/phy-ocelot-serdes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mscc/phy-ocelot-serdes.c</a></td><td class='right'>240</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/phy-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/phy-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-qmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-qmp.c</a></td><td class='right'>222</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-qmp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-qmp.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-qusb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-qusb2.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-ufs-i.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs-i.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/qualcomm/phy-qcom-ufs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/renesas/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/renesas/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/renesas/phy-rcar-gen2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/renesas/phy-rcar-gen2.c</a></td><td class='right'>130</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/renesas/phy-rcar-gen3-usb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/renesas/phy-rcar-gen3-usb2.c</a></td><td class='right'>232</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/rockchip/phy-rockchip-emmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/rockchip/phy-rockchip-emmc.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/rockchip/phy-rockchip-typec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/rockchip/phy-rockchip-typec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/socionext/phy-uniphier-usb3hs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/socionext/phy-uniphier-usb3hs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/socionext/phy-uniphier-usb3ss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/socionext/phy-uniphier-usb3ss.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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/tegra/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/tegra/xusb-tegra186.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/xusb-tegra186.c</a></td><td class='right'>899</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/tegra/xusb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/xusb.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/tegra/xusb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/xusb.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/ti/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/ti/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/ti/phy-am654-serdes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/phy-am654-serdes.c</a></td><td class='right'>658</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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/ti/phy-ti-pipe3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/phy-ti-pipe3.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/phy/ti/phy-twl4030-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/phy-twl4030-usb.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/cirrus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/cirrus/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/cirrus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/cirrus/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/cirrus/pinctrl-lochnagar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/cirrus/pinctrl-lochnagar.c</a></td><td class='right'>1235</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/freescale/pinctrl-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-imx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/freescale/pinctrl-imx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-imx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/freescale/pinctrl-imx8mq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-imx8mq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/freescale/pinctrl-scu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-scu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/intel/pinctrl-baytrail.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-baytrail.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/intel/pinctrl-cedarfork.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-cedarfork.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/intel/pinctrl-intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-intel.c</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/intel/pinctrl-intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-intel.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/pinctrl-mt8183.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mt8183.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/pinctrl-mt8516.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mt8516.c</a></td><td class='right'>362</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h</a></td><td class='right'>1182</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/mediatek/pinctrl-paris.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-paris.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-amd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-artpec6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-artpec6.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-axp209.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-axp209.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-bm1880.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-bm1880.c</a></td><td class='right'>965</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-mcp23s08.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-mcp23s08.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-pistachio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-pistachio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-rza1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-rza1.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/pinctrl-st.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-st.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/samsung/pinctrl-exynos-arm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/samsung/pinctrl-exynos-arm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/Kconfig</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/core.c</a></td><td class='right'>130</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/gpio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/gpio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-emev2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-emev2.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a73a4.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7740.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a77470.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77470.c</a></td><td class='right'>136</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7778.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7778.c</a></td><td class='right'>101</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7779.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7779.c</a></td><td class='right'>235</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7790.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7790.c</a></td><td class='right'>132</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7791.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7791.c</a></td><td class='right'>156</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7792.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7792.c</a></td><td class='right'>134</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7794.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7794.c</a></td><td class='right'>127</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c</a></td><td class='right'>222</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7795.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7795.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a7796.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7796.c</a></td><td class='right'>225</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a77965.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77965.c</a></td><td class='right'>294</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a77970.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77970.c</a></td><td class='right'>123</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a77980.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77980.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a77990.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77990.c</a></td><td class='right'>214</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-r8a77995.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77995.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7203.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7203.c</a></td><td class='right'>152</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7264.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7264.c</a></td><td class='right'>232</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7269.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7269.c</a></td><td class='right'>252</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh73a0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh73a0.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7720.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7720.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7722.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7722.c</a></td><td class='right'>220</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7723.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7723.c</a></td><td class='right'>200</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7724.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7724.c</a></td><td class='right'>204</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7734.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7734.c</a></td><td class='right'>140</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7757.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7757.c</a></td><td class='right'>244</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7785.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7785.c</a></td><td class='right'>136</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-sh7786.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7786.c</a></td><td class='right'>80</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/pfc-shx3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-shx3.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sh-pfc/sh_pfc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/sh_pfc.h</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/stm32/pinctrl-stm32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/stm32/pinctrl-stm32.c</a></td><td class='right'>105</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/stm32/pinctrl-stm32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/stm32/pinctrl-stm32.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/stm32/pinctrl-stm32mp157.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/stm32/pinctrl-stm32mp157.c</a></td><td class='right'>1089</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sunxi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/Kconfig</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sun50i-h6.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sunxi/pinctrl-sunxi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sunxi.c</a></td><td class='right'>96</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='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/sunxi/pinctrl-sunxi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sunxi.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pinctrl/zte/pinctrl-zx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/zte/pinctrl-zx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/platform/chrome/cros_ec_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/platform/chrome/cros_ec_debugfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/platform/chrome/wilco_ec/mailbox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/platform/chrome/wilco_ec/mailbox.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='/openslx/kernel-qcow2-linux.git/diff/drivers/platform/x86/pmc_atom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/platform/x86/pmc_atom.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/pnp/quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pnp/quirks.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='/openslx/kernel-qcow2-linux.git/diff/drivers/power/supply/cpcap-battery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/power/supply/cpcap-battery.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='/openslx/kernel-qcow2-linux.git/diff/drivers/power/supply/goldfish_battery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/power/supply/goldfish_battery.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='/openslx/kernel-qcow2-linux.git/diff/drivers/power/supply/power_supply_sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/power/supply/power_supply_sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/pwm/pwm-fsl-ftm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pwm/pwm-fsl-ftm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ras/cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ras/cec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/88pm800.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/88pm800.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/88pm8607.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/88pm8607.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/ab3100.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ab3100.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/ab8500-ext.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ab8500-ext.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/ab8500.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ab8500.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/act8865-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/act8865-regulator.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.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/anatop-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/anatop-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/arizona-ldo1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/arizona-ldo1.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/arizona-micsupp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/arizona-micsupp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/as3711-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/as3711-regulator.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/as3722-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/as3722-regulator.c</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: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/axp20x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/axp20x-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/bcm590xx-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/bcm590xx-regulator.c</a></td><td class='right'>105</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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/bd718x7-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/bd718x7-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/cpcap-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/cpcap-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da903x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da903x.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9052-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9052-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9055-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9055-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9062-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9062-regulator.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9063-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9063-regulator.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9210-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9210-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9210-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9210-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9211-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9211-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/da9211-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9211-regulator.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/db8500-prcmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/db8500-prcmu.c</a></td><td class='right'>143</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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/dbx500-prcmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/dbx500-prcmu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/fan53555.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/fan53555.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/gpio-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/gpio-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/hi6421-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/hi6421-regulator.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/hi6421v530-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/hi6421v530-regulator.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/hi655x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/hi655x-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/lm363x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/lm363x-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/lp8755.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/lp8755.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/lp87565-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/lp87565-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/ltc3589.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ltc3589.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/ltc3676.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ltc3676.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/max14577-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max14577-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/max77620-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max77620-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/max77650-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max77650-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/max8925-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max8925-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/max8998.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max8998.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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/mcp16502.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mcp16502.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/mt6311-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6311-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/mt6311-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6311-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/mt6323-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6323-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/mt6380-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6380-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/mt6397-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6397-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/of_regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/of_regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/palmas-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/palmas-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/pv88060-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88060-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/pv88060-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88060-regulator.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/pv88080-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88080-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/pv88080-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88080-regulator.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/pv88090-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88090-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/pv88090-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88090-regulator.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/rc5t583-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/rc5t583-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/rn5t618-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/rn5t618-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/s2mpa01.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/s2mpa01.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/sc2731-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/sc2731-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/sky81452-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/sky81452-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/stm32-pwr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/stm32-pwr.c</a></td><td class='right'>186</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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/sy8106a-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/sy8106a-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps6507x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps6507x-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps65086-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65086-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps65132-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65132-regulator.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps65217-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65217-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps65218-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65218-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps6524x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps6524x-regulator.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/tps80031-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps80031-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/twl-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/twl-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/vctrl-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/vctrl-regulator.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/vexpress-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/vexpress-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/wm831x-dcdc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm831x-dcdc.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/wm831x-isink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm831x-isink.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/wm831x-ldo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm831x-ldo.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/wm8350-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm8350-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/wm8400-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm8400-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/regulator/wm8994-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm8994-regulator.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/reset/reset-meson-audio-arb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/reset/reset-meson-audio-arb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/rtc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/rtc/rtc-cros-ec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-cros-ec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/rtc/rtc-da9063.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-da9063.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='/openslx/kernel-qcow2-linux.git/diff/drivers/rtc/rtc-ds1374.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-ds1374.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='/openslx/kernel-qcow2-linux.git/diff/drivers/rtc/rtc-m41t80.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-m41t80.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='/openslx/kernel-qcow2-linux.git/diff/drivers/rtc/rtc-sh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-sh.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/block/dasd_eckd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/block/dasd_eckd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/con3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/con3270.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/fs3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/fs3270.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/raw3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/raw3270.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/raw3270.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/raw3270.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/sclp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/sclp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/sclp_early.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp_early.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/sclp_early_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp_early_core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/sclp_sdias.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp_sdias.c</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/tape_char.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/tape_char.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/tty3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/tty3270.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/char/zcore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/zcore.c</a></td><td class='right'>24</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/airq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/airq.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/chsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/chsc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/cio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/cio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/cio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/cio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/ioasm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/ioasm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/qdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/qdio_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_debug.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/qdio_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_main.c</a></td><td class='right'>211</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/qdio_setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_setup.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/qdio_thinint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_thinint.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_async.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_async.c</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_cp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_cp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_cp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_cp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_drv.c</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_fsm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_fsm.c</a></td><td class='right'>143</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_ops.c</a></td><td class='right'>227</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/cio/vfio_ccw_private.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_private.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/crypto/ap_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/ap_bus.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/crypto/ap_bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/ap_bus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/crypto/ap_queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/ap_queue.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/crypto/pkey_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/pkey_api.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/crypto/zcrypt_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/zcrypt_api.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/ctcm_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/ctcm_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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/ism.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/ism.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/ism_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/ism_drv.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core.h</a></td><td class='right'>131</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_core_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core_main.c</a></td><td class='right'>924</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_core_mpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core_mpc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_core_sys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core_sys.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_l2_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_l2_main.c</a></td><td class='right'>106</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_l3_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_l3_main.c</a></td><td class='right'>271</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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/net/qeth_l3_sys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_l3_sys.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/scsi/zfcp_erp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_erp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/scsi/zfcp_ext.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_ext.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/scsi/zfcp_fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_fc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/scsi/zfcp_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_scsi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/s390/virtio/virtio_ccw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/virtio/virtio_ccw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/NCR5380.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/NCR5380.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aacraid/aacraid.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aacraid/aacraid.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aacraid/commsup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aacraid/commsup.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aic7xxx/Kconfig.aic7xxx?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/Kconfig.aic7xxx</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aic7xxx/aic7770_osm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7770_osm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aic7xxx/aic7xxx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_osm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx_osm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx_osm_pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/atp870u.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/atp870u.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/be2iscsi/be_cmds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/be2iscsi/be_cmds.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/be2iscsi/be_iscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/be2iscsi/be_iscsi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/be2iscsi/be_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/be2iscsi/be_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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bfa/bfa.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bfa/bfa_fcpim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa_fcpim.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bfa/bfa_hw_cb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa_hw_cb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bfa/bfa_hw_ct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa_hw_ct.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bnx2fc/bnx2fc_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bnx2fc/bnx2fc_hwi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bnx2fc/bnx2fc_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bnx2fc/bnx2fc_io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/bnx2i/bnx2i_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bnx2i/bnx2i_hwi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/csiostor/csio_isr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/csiostor/csio_isr.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/csiostor/csio_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/csiostor/csio_scsi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/csiostor/csio_wr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/csiostor/csio_wr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/cxgbi/libcxgbi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/cxgbi/libcxgbi.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/dpt_i2o.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/dpt_i2o.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/esp_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/esp_scsi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/gdth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/gdth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/hisi_sas/hisi_sas.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/hisi_sas/hisi_sas_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_main.c</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_v1_hw.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_v2_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_v3_hw.c</a></td><td class='right'>473</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/hpsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hpsa.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ibmvscsi/ibmvfc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ibmvscsi/ibmvfc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ibmvscsi/ibmvfc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ibmvscsi/ibmvfc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ibmvscsi/ibmvscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/imm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/imm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/libfc/fc_rport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libfc/fc_rport.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/libsas/sas_ata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_ata.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/libsas/sas_expander.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_expander.c</a></td><td class='right'>83</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/libsas/sas_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_init.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/libsas/sas_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_phy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/libsas/sas_port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_port.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_attr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_attr.c</a></td><td class='right'>243</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_bsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_bsg.c</a></td><td class='right'>123</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_bsg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_bsg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_ct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_ct.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_debugfs.c</a></td><td class='right'>486</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_debugfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_debugfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_els.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_els.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_hbadisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_hbadisc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_hw4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_hw4.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_init.c</a></td><td class='right'>137</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_nportdisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nportdisc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_nvme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nvme.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_nvmet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nvmet.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_nvmet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nvmet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_scsi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_sli.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_sli.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: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_sli.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_sli.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_sli4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_sli4.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/lpfc/lpfc_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_version.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/megaraid/megaraid_sas_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/megaraid/megaraid_sas_base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/megaraid/megaraid_sas_fusion.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/megaraid/megaraid_sas_fusion.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mpt3sas/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mpt3sas/mpt3sas_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/mpt3sas_base.c</a></td><td class='right'>185</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mpt3sas/mpt3sas_base.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/mpt3sas_base.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mpt3sas/mpt3sas_scsih.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/mpt3sas_scsih.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mvsas/mv_64xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvsas/mv_64xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mvsas/mv_94xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvsas/mv_94xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mvsas/mv_sas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvsas/mv_sas.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/mvumi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvumi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/osst.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/osst.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/pm8001/pm8001_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_hwi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/pm8001/pm8001_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/pm8001/pm8001_sas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_sas.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/pm8001/pm8001_sas.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_sas.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/pm8001/pm80xx_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm80xx_hwi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ppa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ppa.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf.h</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_dbg.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_debugfs.c</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_els.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_els.c</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_fip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_fip.c</a></td><td class='right'>95</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_io.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_main.c</a></td><td class='right'>281</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedf/qedf_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_version.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedi/qedi_fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedi/qedi_fw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedi/qedi_iscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedi/qedi_iscsi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qedi/qedi_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedi/qedi_main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla1280.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla1280.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_attr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_attr.c</a></td><td class='right'>329</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_bsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_bsg.c</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_bsg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_bsg.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dbg.c</a></td><td class='right'>192</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_dbg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dbg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_def.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_def.h</a></td><td class='right'>267</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_dfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_dsd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dsd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_fw.h</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_gbl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_gbl.h</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_gs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_gs.c</a></td><td class='right'>139</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_init.c</a></td><td class='right'>1497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_inline.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_inline.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_iocb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_iocb.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_isr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_isr.c</a></td><td class='right'>144</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_mbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mbx.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_mid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mid.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mr.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_mr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_nvme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nvme.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_nvme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nvme.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_nx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_nx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_nx2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nx2.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_os.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_os.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_sup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_sup.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_target.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_target.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_target.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_target.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_tmpl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_tmpl.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_tmpl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_tmpl.h</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/qla_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_version.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla2xxx/tcm_qla2xxx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/tcm_qla2xxx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qla4xxx/ql4_os.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla4xxx/ql4_os.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/qlogicfas408.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qlogicfas408.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_devinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_devinfo.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_dh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_dh.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_error.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_error.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_lib.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_scan.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_transport_fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_transport_fc.c</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/scsi_transport_iscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_transport_iscsi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/smartpqi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/smartpqi/smartpqi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/smartpqi/smartpqi_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_init.c</a></td><td class='right'>51</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/smartpqi/smartpqi_sas_transport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_sas_transport.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/smartpqi/smartpqi_sis.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_sis.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/smartpqi/smartpqi_sis.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_sis.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/sr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/storvsc_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/storvsc_drv.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/sym53c8xx_2/sym_hipd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sym53c8xx_2/sym_hipd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/sym53c8xx_2/sym_nvram.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sym53c8xx_2/sym_nvram.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/cdns-pltfrm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/cdns-pltfrm.c</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufs-hisi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-hisi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufs-mediatek.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-mediatek.c</a></td><td class='right'>368</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufs-mediatek.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-mediatek.h</a></td><td class='right'>53</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufs-qcom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-qcom.c</a></td><td class='right'>216</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: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufs-qcom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-qcom.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufshcd-pltfrm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufshcd-pltfrm.c</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufshcd-pltfrm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufshcd-pltfrm.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/ufshcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufshcd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/ufs/unipro.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/unipro.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='/openslx/kernel-qcow2-linux.git/diff/drivers/scsi/virtio_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/virtio_scsi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/slimbus/qcom-ngd-ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/slimbus/qcom-ngd-ctrl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/soc/bcm/bcm2835-power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soc/bcm/bcm2835-power.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/soc/sunxi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soc/sunxi/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/bus.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/bus_type.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/bus_type.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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/cadence_master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/cadence_master.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/cadence_master.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/cadence_master.h</a></td><td class='right'>22</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/intel.c</a></td><td class='right'>138</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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/intel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/intel_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/intel_init.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/mipi_disco.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/mipi_disco.c</a></td><td class='right'>122</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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/slave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/slave.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='/openslx/kernel-qcow2-linux.git/diff/drivers/soundwire/stream.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/stream.c</a></td><td class='right'>285</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/atmel-quadspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/atmel-quadspi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-at91-usart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-at91-usart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-bcm2835.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-bcm2835.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-bcm2835aux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-bcm2835aux.c</a></td><td class='right'>205</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-bitbang.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-bitbang.c</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-dw-mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-dw-mmio.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-ep93xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-ep93xx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-fsl-lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-lib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-fsl-lpspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-lpspi.c</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-fsl-qspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-qspi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-fsl-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-spi.c</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-gpio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-gpio.c</a></td><td class='right'>227</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-imx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-mem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-mem.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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-mt7621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-mt7621.c</a> (renamed from drivers/staging/mt7621-spi/spi-mt7621.c)</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-mxic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-mxic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-orion.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-orion.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-pic32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pic32.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-pxa2xx-dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pxa2xx-dma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-pxa2xx-pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pxa2xx-pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-pxa2xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pxa2xx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-rspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-rspi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-sh-msiof.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-sh-msiof.c</a></td><td class='right'>224</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-stm32-qspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-stm32-qspi.c</a></td><td class='right'>229</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-stm32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-stm32.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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-tegra114.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-tegra114.c</a></td><td class='right'>310</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-tegra20-slink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-tegra20-slink.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-topcliff-pch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-topcliff-pch.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi-zynq-qspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-zynq-qspi.c</a></td><td class='right'>761</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/drivers/spi/spidev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spidev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ssb/bridge_pcmcia_80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ssb/bridge_pcmcia_80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ssb/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ssb/pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/ssb/pcmcia.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ssb/pcmcia.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/android/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/android/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/android/ion/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/ion/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/android/vsoc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/vsoc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/axis-fifo/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/axis-fifo/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/axis-fifo/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/axis-fifo/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/board/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/board/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/board/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/board/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/clocking-wizard/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/clocking-wizard/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/clocking-wizard/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/clocking-wizard/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/Kconfig</a></td><td class='right'>255</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/comedi_buf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/comedi_buf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/comedi_fops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/comedi_fops.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/comedidev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/comedidev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/adv_pci1710.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/adv_pci1710.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/amplc_pci230.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/amplc_pci230.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/comedi_isadma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/comedi_isadma.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/comedi_isadma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/comedi_isadma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/das08.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/das08.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/dt2811.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/dt2811.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/dt9812.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/dt9812.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/dyna_pci10xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/dyna_pci10xx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/mite.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/mite.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_660x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_660x.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_at_ao.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_at_ao.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_daq_700.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_daq_700.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_mio_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_mio_common.c</a></td><td class='right'>47</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_pcidio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_pcidio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_routing/tools/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_routing/tools/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_tio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_tio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/ni_usb6501.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_usb6501.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/quatech_daqp_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/quatech_daqp_cs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/s626.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/s626.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/tests/ni_routes_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/tests/ni_routes_test.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/usbdux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/usbdux.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/usbduxfast.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/usbduxfast.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/usbduxsigma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/usbduxsigma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/drivers/vmk80xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/vmk80xx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/comedi/kcomedilib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/kcomedilib/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/emxx_udc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/emxx_udc/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/emxx_udc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/emxx_udc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/emxx_udc/emxx_udc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/emxx_udc/emxx_udc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/Documentation/filesystems/erofs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/Documentation/filesystems/erofs.txt</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/data.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/dir.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/inode.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/internal.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/namei.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/super.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/unzip_pagevec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/unzip_pagevec.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/unzip_vle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/unzip_vle.c</a></td><td class='right'>142</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/unzip_vle_lz4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/unzip_vle_lz4.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/utils.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/erofs/xattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/xattr.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fb_agm1264k-fl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_agm1264k-fl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fb_ra8875.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ra8875.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fb_ssd1306.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ssd1306.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fb_ssd1331.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ssd1331.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fb_ssd1351.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ssd1351.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fb_watterott.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_watterott.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fbtft-io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fbtft-io.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fbtft.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fbtft.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/fbtft_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fbtft_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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fbtft/flexfb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/flexfb.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/Documentation/fieldbus_dev.txt</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/anybuss-client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/anybuss-client.h</a></td><td class='right'>102</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/anybuss-controller.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/anybuss-controller.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/arcx-anybus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/arcx-anybus.c</a></td><td class='right'>399</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/hms-profinet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/hms-profinet.c</a></td><td class='right'>228</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/anybuss/host.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/anybuss/host.c</a></td><td class='right'>1458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/dev_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/dev_core.c</a></td><td class='right'>351</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fieldbus/fieldbus_dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fieldbus/fieldbus_dev.h</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fsl-dpaa2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fsl-dpaa2/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fsl-dpaa2/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fsl-dpaa2/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fsl-dpaa2/ethsw/ethsw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fsl-dpaa2/ethsw/ethsw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fwserial/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fwserial/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fwserial/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fwserial/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/fwserial/fwserial.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fwserial/fwserial.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/apex_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/apex_driver.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/gasket_interrupt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_interrupt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/gasket_page_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_page_table.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/gasket_sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gasket/gasket_sysfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gdm724x/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gdm724x/gdm_lte.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/gdm_lte.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gdm724x/gdm_mux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/gdm_mux.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gdm724x/hci_packet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/hci_packet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/goldfish/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/goldfish/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/goldfish/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/goldfish/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/audio_codec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/audio_codec.h</a></td><td class='right'>122</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/audio_manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/audio_manager.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/bundle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/bundle.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/hid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/hid.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/power_supply.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/power_supply.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/greybus/sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/sdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gs_fpgaboot/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gs_fpgaboot/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/gs_fpgaboot/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gs_fpgaboot/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/accel/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/accel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/accel/adis16203.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/adis16203.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/accel/adis16240.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/adis16240.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/ad7192.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7192.c</a></td><td class='right'>244</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/ad7192.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7192.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/ad7280a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7280a.c</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/ad7280a.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7280a.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/adc/ad7816.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7816.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/addac/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/addac/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/addac/adt7316-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316-i2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/addac/adt7316-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316-spi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/addac/adt7316.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/addac/adt7316.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/cdc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/cdc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/cdc/ad7150.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/ad7150.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/cdc/ad7746.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/ad7746.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/cdc/ad7746.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/ad7746.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/ad9832.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9832.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/ad9832.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9832.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/ad9834.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9834.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/ad9834.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9834.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/frequency/dds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/dds.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/impedance-analyzer/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/impedance-analyzer/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/impedance-analyzer/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/impedance-analyzer/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/impedance-analyzer/ad5933.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/impedance-analyzer/ad5933.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/meter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/meter/ade7854-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/ade7854-i2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/meter/ade7854-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/ade7854-spi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/meter/ade7854.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/ade7854.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/resolver/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/resolver/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/resolver/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/resolver/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/iio/resolver/ad2s1210.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/resolver/ad2s1210.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/Kconfig</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/cell_probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/cell_probe.c</a></td><td class='right'>471</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/core.c</a></td><td class='right'>437</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/dma_common_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/dma_common_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.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/fileops.c</a></td><td class='right'>131</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/kp2000_module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/kp2000_module.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/pcie.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/pcie.h</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc2000/uapi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc2000/uapi.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_dma/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_dma/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_dma/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_dma/dma.c</a></td><td class='right'>264</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_dma/fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_dma/fileops.c</a></td><td class='right'>420</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c</a></td><td class='right'>248</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h</a></td><td class='right'>220</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_dma/uapi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_dma/uapi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_i2c/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_i2c/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_i2c/fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_i2c/fileops.c</a></td><td class='right'>181</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_i2c/i2c_driver.c</a></td><td class='right'>699</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_spi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_spi/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_spi/spi_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_spi/spi_driver.c</a></td><td class='right'>507</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/kpc2000/kpc_spi/spi_parts.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/kpc2000/kpc_spi/spi_parts.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/ks7010/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ks7010/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/ks7010/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ks7010/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/ks7010/ks_hostif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ks7010/ks_hostif.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/bcm2048/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/bcm2048/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/bcm2048/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/bcm2048/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/bcm2048/radio-bcm2048.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/bcm2048/radio-bcm2048.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_ipipe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_ipipe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipe_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipeif.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipeif.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_isif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_isif.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/davinci_vpfe/dm365_resizer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_resizer.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-ic-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic-common.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-ic-prp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic-prp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-ic-prpencvf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic-prpencvf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-ic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-capture.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-csi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-csi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-dev-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-dev-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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-dev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-fim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-fim.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-internal-sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-internal-sd.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-of.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-of.c</a></td><td class='right'>79</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-utils.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media-vdic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-vdic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx-media.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx6-mipi-csi2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx6-mipi-csi2.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx7-media-csi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx7-media-csi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/imx/imx7-mipi-csis.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx7-mipi-csis.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/ipu3/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/ipu3/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/ipu3/ipu3-css.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/ipu3-css.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/ipu3/ipu3-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/ipu3-v4l2.c</a></td><td class='right'>126</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/ipu3/ipu3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/ipu3.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/mt9t031/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/mt9t031/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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/mt9t031/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/mt9t031/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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/mt9t031/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/mt9t031/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/omap4iss/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/omap4iss/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/rockchip/vpu/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/rockchip/vpu/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/imx074.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/imx074.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/mt9t031.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/mt9t031.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/soc_camera.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_camera.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/soc_mediabus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_mediabus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/soc_mt9v022.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_mt9v022.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/soc_ov5642.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_ov5642.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/soc_camera/soc_ov9740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_ov9740.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/cedrus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/cedrus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/cedrus/cedrus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/cedrus/cedrus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/cedrus/cedrus_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus_hw.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/sunxi/cedrus/cedrus_video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus_video.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/tegra-vde/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/tegra-vde/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/tegra-vde/tegra-vde.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/tegra-vde.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/tegra-vde/uapi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/uapi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/Kconfig</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/videocodec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/videocodec.c</a></td><td class='right'>391</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/videocodec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/videocodec.h</a></td><td class='right'>349</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran.h</a></td><td class='right'>402</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_card.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_card.c</a></td><td class='right'>1524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_card.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_card.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_device.c</a></td><td class='right'>1619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_device.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_device.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_driver.c</a></td><td class='right'>2850</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.7%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_procfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_procfs.c</a></td><td class='right'>221</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zoran_procfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_procfs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36016.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36016.c</a></td><td class='right'>516</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36016.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36016.h</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36050.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36050.c</a></td><td class='right'>896</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36050.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36050.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36057.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36057.h</a></td><td class='right'>164</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36060.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36060.c</a></td><td class='right'>1006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/media/zoran/zr36060.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36060.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: 1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/Documentation/ABI/configfs-most.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/Documentation/ABI/configfs-most.txt</a></td><td class='right'>204</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/Documentation/driver_usage.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/Documentation/driver_usage.txt</a></td><td class='right'>131</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/cdev/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/cdev/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/cdev/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/cdev/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/cdev/cdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/cdev/cdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/configfs.c</a></td><td class='right'>676</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/core.c</a></td><td class='right'>305</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/core.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/dim2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/dim2/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/dim2/errors.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/errors.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/dim2/hal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/hal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/dim2/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/dim2/sysfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/sysfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/i2c/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/i2c/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/i2c/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/i2c/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/net/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/net/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/net/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/net/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/net/net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/net/net.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/sound/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/sound/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/sound/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/sound/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/sound/sound.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/sound/sound.c</a></td><td class='right'>61</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/usb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/usb/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/usb/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/usb/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/usb/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/video/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/video/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/video/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/video/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/most/video/video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/video/video.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dma/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dma/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dma/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dma/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dma/mtk-hsdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dma/mtk-hsdma.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dts/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dts/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dts/gbpc1.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/gbpc1.dts</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-dts/mt7621.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/mt7621.dtsi</a></td><td class='right'>96</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/TODO</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/ethtool.c</a></td><td class='right'>250</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/ethtool.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/ethtool.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/gsw_mt7620.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/gsw_mt7620.h</a></td><td class='right'>277</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/gsw_mt7621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/gsw_mt7621.c</a></td><td class='right'>297</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mdio.c</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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/mdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mdio.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/mdio_mt7620.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mdio_mt7620.c</a></td><td class='right'>173</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/mtk_eth_soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mtk_eth_soc.c</a></td><td class='right'>2176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.5%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/mtk_eth_soc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mtk_eth_soc.h</a></td><td class='right'>716</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-eth/soc_mt7621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/soc_mt7621.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/Makefile</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/board.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/board.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/dbg.c</a></td><td class='right'>304</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/dbg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/dbg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/mt6575_sd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/mt6575_sd.h</a></td><td class='right'>488</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-mmc/sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/sd.c</a></td><td class='right'>1855</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci-phy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci-phy/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c</a></td><td class='right'>284</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pci/pci-mt7621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci/pci-mt7621.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pinctrl/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pinctrl/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-pinctrl/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pinctrl/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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-spi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-spi/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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-spi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/mt7621-spi/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-spi/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/netlogic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/netlogic/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/netlogic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/netlogic/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/netlogic/xlr_net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/netlogic/xlr_net.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/nvec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/nvec/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon-usb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon-usb/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon-usb/octeon-hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon-usb/octeon-hcd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon-usb/octeon-hcd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon-usb/octeon-hcd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/TODO</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon/ethernet-mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/ethernet-mdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon/ethernet-tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/ethernet-tx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon/ethernet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/ethernet.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/octeon/octeon-ethernet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/octeon-ethernet.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/olpc_dcon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/olpc_dcon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/olpc_dcon.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/olpc_dcon_xo_1.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c</a></td><td class='right'>56</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/pi433/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/pi433/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/pi433/pi433_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/pi433_if.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/pi433/rf69.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/rf69.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/ralink-gdma/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ralink-gdma/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/ralink-gdma/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ralink-gdma/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/ralink-gdma/ralink-gdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ralink-gdma/ralink-gdma.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_ap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_ap.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_ieee80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_ieee80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_mlme.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_pwrctrl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_recv.c</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_wlan_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_wlan_util.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/core/rtw_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/hal/odm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/hal/odm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/hal/odm_hwconfig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/hal/odm_hwconfig.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/include/odm_precomp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/odm_precomp.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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/include/phydm_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/phydm_reg.h</a> (renamed from drivers/staging/rtlwifi/phydm/phydm_features.h)</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/include/phydm_regdefine11n.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/phydm_regdefine11n.h</a></td><td class='right'>53</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/include/rtw_xmit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/rtw_xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/include/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/wifi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/os_dep/os_intfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/os_dep/os_intfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/os_dep/usb_ops_linux.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/dot11d.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/dot11d.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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/license?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/license</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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8190P_def.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_hw.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_BA.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_BA.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_BAProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_BAProc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_HT.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_HT.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_HTProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_HTProc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_Qos.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_Qos.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_TS.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_TS.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtl819x_TSProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_TSProc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt_tkip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_crypt_tkip.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt_wep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_crypt_wep.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_debug.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_module.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_rx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_softmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_softmac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_softmac_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_softmac_wx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_tx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192e/rtllib_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_wx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_wx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/rtl819x_HT.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8180_93cx6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8180_93cx6.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8190_rtl8256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8190_rtl8256.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8192U_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8192U_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8192U_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8192U_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_wx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8192u/r8192U_wx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_wx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/drv_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/drv_types.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/hal_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/hal_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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/ieee80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/ieee80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/ieee80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/os_intfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/os_intfs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_efuse.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_efuse.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_led.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_recv.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl8712_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_xmit.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl871x_eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_eeprom.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl871x_ioctl_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_ioctl_linux.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl871x_mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_mlme.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl871x_mp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_mp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl871x_pwrctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_pwrctrl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/rtl871x_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/usb_intf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/usb_intf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8712/usb_ops_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/usb_ops_linux.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_ap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_ap.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_cmd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_debug.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_efuse.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_ieee80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_ieee80211.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_ioctl_set.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_mlme.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_mlme_ext.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_sta_mgt.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_wlan_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_wlan_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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/core/rtw_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_xmit.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/hal_btcoex.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/hal_btcoex.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/hal_com.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/hal_com.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/hal_com_phycfg.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/odm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/odm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/odm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/odm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/odm_HWConfig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/odm_HWConfig.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_cmd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_dm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723bs_recv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/hal/sdio_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/sdio_ops.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/cmd_osdep.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/cmd_osdep.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/drv_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/drv_types.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/drv_types_sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/drv_types_sdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/ieee80211.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/rtw_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_cmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/rtw_mlme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_mlme.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_pwrctrl.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/rtw_recv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_recv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/rtw_xmit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_xmit.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/wifi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/include/wlan_bssdef.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/wlan_bssdef.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/ioctl_linux.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/os_dep/os_intfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/os_intfs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/os_dep/osdep_service.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/osdep_service.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/os_dep/sdio_intf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/sdio_intf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/Makefile</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/TODO</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/base.c</a></td><td class='right'>2815</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.5%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/base.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/base.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbt_precomp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbt_precomp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c</a></td><td class='right'>5233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.2%;'/><td class='none' style='width: 74.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h</a></td><td class='right'>433</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c</a></td><td class='right'>5210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.1%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h</a></td><td class='right'>487</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c</a></td><td class='right'>1837</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h</a></td><td class='right'>791</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/rtl_btc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/rtl_btc.c</a></td><td class='right'>517</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/btcoexist/rtl_btc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/rtl_btc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/cam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/cam.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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/cam.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/cam.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/core.c</a></td><td class='right'>1996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.6%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/debug.c</a></td><td class='right'>624</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/debug.h</a></td><td class='right'>223</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/efuse.c</a></td><td class='right'>1329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/efuse.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/efuse.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_2_platform.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_2_platform.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c</a></td><td class='right'>552</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c</a></td><td class='right'>332</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c</a></td><td class='right'>312</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c</a></td><td class='right'>173</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c</a></td><td class='right'>174</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c</a></td><td class='right'>403</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h</a></td><td class='right'>160</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c</a></td><td class='right'>5970</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 28.7%;'/><td class='none' style='width: 71.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h</a></td><td class='right'>385</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c</a></td><td class='right'>318</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c</a></td><td class='right'>963</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c</a></td><td class='right'>543</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c</a></td><td class='right'>4465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.5%;'/><td class='none' style='width: 78.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h</a></td><td class='right'>310</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_api.c</a></td><td class='right'>415</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_api.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_api.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_bit2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_bit2.h</a></td><td class='right'>13396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.5%;'/><td class='none' style='width: 35.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h</a></td><td class='right'>12092</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 58.2%;'/><td class='none' style='width: 41.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_fw_info.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_fw_info.h</a></td><td class='right'>111</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h</a></td><td class='right'>173</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h</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: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h</a></td><td class='right'>105</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_reg2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_reg2.h</a></td><td class='right'>1121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h</a></td><td class='right'>717</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_rx_desc_chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_rx_desc_chip.h</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_rx_desc_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_rx_desc_nic.h</a></td><td class='right'>122</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_sdio_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_sdio_reg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_tx_desc_chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_tx_desc_chip.h</a></td><td class='right'>433</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_tx_desc_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_tx_desc_nic.h</a></td><td class='right'>495</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_type.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_type.h</a></td><td class='right'>1923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.3%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/halmac_usb_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_usb_reg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/rtl_halmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/rtl_halmac.c</a></td><td class='right'>1373</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/halmac/rtl_halmac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/rtl_halmac.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/pci.c</a></td><td class='right'>2496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/pci.h</a></td><td class='right'>319</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/halphyrf_ce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/halphyrf_ce.c</a></td><td class='right'>954</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/halphyrf_ce.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/halphyrf_ce.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/mp_precomp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/mp_precomp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm.c</a></td><td class='right'>1975</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.5%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm.h</a></td><td class='right'>935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_acs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_acs.c</a></td><td class='right'>189</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_acs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_acs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_adaptivity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_adaptivity.c</a></td><td class='right'>930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_adaptivity.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_adaptivity.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c</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: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_antdiv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_antdiv.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_antdiv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_antdiv.h</a></td><td class='right'>290</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_beamforming.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_beamforming.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_ccx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_ccx.c</a></td><td class='right'>447</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_ccx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_ccx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_cfotracking.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_cfotracking.c</a></td><td class='right'>332</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_cfotracking.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_cfotracking.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_debug.c</a></td><td class='right'>2888</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.9%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_debug.h</a></td><td class='right'>164</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dfs.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dig.c</a></td><td class='right'>1521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dig.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dig.h</a></td><td class='right'>230</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dynamic_rx_path.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dynamic_rx_path.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dynamicbbpowersaving.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dynamicbbpowersaving.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dynamicbbpowersaving.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dynamicbbpowersaving.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dynamictxpower.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dynamictxpower.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_dynamictxpower.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_dynamictxpower.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_edcaturbocheck.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_edcaturbocheck.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_edcaturbocheck.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_edcaturbocheck.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_hwconfig.c</a></td><td class='right'>1848</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_hwconfig.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_hwconfig.h</a></td><td class='right'>487</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_interface.c</a></td><td class='right'>307</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_interface.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_interface.h</a></td><td class='right'>183</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_iqk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_iqk.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_kfree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_kfree.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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_kfree.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_kfree.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c</a></td><td class='right'>319</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_noisemonitor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_noisemonitor.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_powertracking_ce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_powertracking_ce.c</a></td><td class='right'>633</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_powertracking_ce.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_powertracking_ce.h</a></td><td class='right'>282</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_pre_define.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_pre_define.h</a></td><td class='right'>602</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_precomp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_precomp.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_psd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_psd.c</a></td><td class='right'>406</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_psd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_psd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_rainfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_rainfo.c</a></td><td class='right'>1196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_rainfo.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_rainfo.h</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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_reg.h</a></td><td class='right'>140</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_regdefine11ac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_regdefine11ac.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h</a></td><td class='right'>202</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/phydm_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_types.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c</a></td><td class='right'>1956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c</a></td><td class='right'>211</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c</a></td><td class='right'>4730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.8%;'/><td class='none' style='width: 77.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halphyrf_8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halphyrf_8822b.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: 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/halphyrf_8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/halphyrf_8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c</a></td><td class='right'>1804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.7%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h</a></td><td class='right'>73</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c</a></td><td class='right'>1399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c</a></td><td class='right'>157</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c</a></td><td class='right'>214</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/phydm_rtl8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/phydm_rtl8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl8822b/version_rtl8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl8822b/version_rtl8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl_phydm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl_phydm.c</a></td><td class='right'>863</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/rtl_phydm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/rtl_phydm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/txbf/haltxbfinterface.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/txbf/haltxbfinterface.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/phydm/txbf/phydm_hal_txbf_api.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/txbf/phydm_hal_txbf_api.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/ps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/ps.c</a></td><td class='right'>996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/ps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/ps.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/pwrseqcmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/pwrseqcmd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rc.c</a></td><td class='right'>309</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rc.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/regd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/regd.c</a></td><td class='right'>458</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/regd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/regd.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/def.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/def.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/fw.c</a></td><td class='right'>962</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/fw.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/hw.c</a></td><td class='right'>2430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.7%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/hw.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/led.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/led.c</a></td><td class='right'>116</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/led.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/led.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/phy.c</a></td><td class='right'>2223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.7%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/phy.h</a></td><td class='right'>134</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/reg.h</a></td><td class='right'>1642</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/sw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/sw.c</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: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/sw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/sw.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/trx.c</a></td><td class='right'>1004</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/rtl8822be/trx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/rtl8822be/trx.h</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/stats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/stats.c</a></td><td class='right'>249</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/stats.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/stats.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rtlwifi/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/wifi.h</a></td><td class='right'>3362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.2%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rts5208/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rts5208/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rts5208/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rts5208/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/rts5208/rtsx_chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rts5208/rtsx_chip.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_chip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_chip.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_chip.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_display.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_display.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_display.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_dvi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_dvi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_power.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_power.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_sii164.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_sii164.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_swi2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_swi2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/ddk750_swi2c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/ddk750_swi2c.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/sm750.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/sm750.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/sm750_accel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/sm750_accel.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/sm750fb/sm750_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/sm750fb/sm750_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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/kobjects.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/kobjects.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/selection.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/selection.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/speakup.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/speakup.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/speakup_decpc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/speakup_decpc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/speakup_keypc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/speakup_keypc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/speakup_soft.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/speakup_soft.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/spk_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/spk_priv.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/spk_ttyio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/spk_ttyio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/speakup/synth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/speakup/synth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/include/iochannel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/include/iochannel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/visorhba/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/visorhba/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/visorhba/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/visorhba/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/visorinput/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/visorinput/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/visorinput/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/visorinput/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/visornic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/visornic/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/unisys/visornic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/unisys/visornic/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vboxvideo/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vboxvideo/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vboxvideo/vbox_mode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vboxvideo/vbox_mode.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vboxvideo/vbox_prime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vboxvideo/vbox_prime.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/bcm2835-audio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/bcm2835-audio/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/bcm2835-audio/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/bcm2835-audio/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/bcm2835-camera/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/bcm2835-camera/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/bcm2835-camera/controls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/bcm2835-camera/controls.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchi/vchi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchi/vchi.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchi/vchi_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchi/vchi_cfg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchi/vchi_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchi/vchi_common.h</a></td><td class='right'>176</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vme/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vme/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vme/devices/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vme/devices/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vme/devices/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vme/devices/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/card.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/card.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/channel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/channel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/desc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/desc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/device.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/device_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/device_cfg.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/device_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/device_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/dpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/dpc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/key.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/key.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/mac.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/power.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/power.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/power.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/rf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/rf.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/rf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/rf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/rxtx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/rxtx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/rxtx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/rxtx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/srom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/srom.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/tmacro.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/tmacro.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6655/upc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6655/upc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/baseband.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/baseband.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/card.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/card.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/channel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/channel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/desc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/desc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/device.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/dpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/dpc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/firmware.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/firmware.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/int.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/int.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/key.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/key.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/power.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/power.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/rf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/rf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/rxtx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/rxtx.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/usbpipe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/usbpipe.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/vt6656/wcmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/vt6656/wcmd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/host_interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/host_interface.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/host_interface.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/host_interface.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/wilc_netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/wilc_netdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/wilc_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/wilc_spi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/wilc_wfi_cfgoperations.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wilc1000/wilc_wlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wilc1000/wilc_wlan.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wlan-ng/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wlan-ng/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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wlan-ng/hfa384x.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wlan-ng/hfa384x.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='/openslx/kernel-qcow2-linux.git/diff/drivers/staging/wlan-ng/hfa384x_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/wlan-ng/hfa384x_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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/target/iscsi/iscsi_target.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/iscsi/iscsi_target.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/iscsi/iscsi_target_auth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/iscsi/iscsi_target_auth.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/iscsi/iscsi_target_login.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/iscsi/iscsi_target_login.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/iscsi/iscsi_target_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/iscsi/iscsi_target_util.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_alua.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_alua.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_configfs.c</a></td><td class='right'>163</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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_device.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_pr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_pr.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_pr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_pr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_tmr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_tmr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_user.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='/openslx/kernel-qcow2-linux.git/diff/drivers/target/target_core_xcopy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/target/target_core_xcopy.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/broadcom/bcm2835_thermal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/broadcom/bcm2835_thermal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/cpu_cooling.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/cpu_cooling.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/intel/int340x_thermal/int3400_thermal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/intel/int340x_thermal/int3400_thermal.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/intel/intel_powerclamp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/intel/intel_powerclamp.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/mtk_thermal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/mtk_thermal.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thermal/samsung/exynos_tmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thermal/samsung/exynos_tmu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/cap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/cap.c</a></td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/ctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/ctl.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/domain.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/domain.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/icm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/icm.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/lc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/lc.c</a></td><td class='right'>179</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/nhi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/nhi.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/path.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/path.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/property.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/switch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/switch.c</a></td><td class='right'>557</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tb.c</a></td><td class='right'>608</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tb.h</a></td><td class='right'>227</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tb_msgs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tb_msgs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tb_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tb_regs.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tunnel.c</a></td><td class='right'>691</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tunnel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tunnel.h</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tunnel_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tunnel_pci.c</a></td><td class='right'>226</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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/tunnel_pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/tunnel_pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/thunderbolt/xdomain.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/thunderbolt/xdomain.c</a></td><td class='right'>170</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/hvc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/hvc/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/ipwireless/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/ipwireless/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/ipwireless/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/ipwireless/main.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/n_tty.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/n_tty.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/rocket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/rocket.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/rocket.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/rocket.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serdev/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serdev/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serdev/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serdev/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/8250/8250_exar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/8250/8250_exar.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/8250/8250_fintek.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/8250/8250_fintek.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/8250/8250_men_mcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/8250/8250_men_mcb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/8250/8250_mtk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/8250/8250_mtk.c</a></td><td class='right'>162</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/8250/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/8250/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/Kconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/ar933x_uart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/ar933x_uart.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/atmel_serial.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/atmel_serial.c</a></td><td class='right'>52</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/cpm_uart/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/cpm_uart/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/jsm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/jsm/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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/kgdboc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/kgdboc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/max310x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/max310x.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/men_z135_uart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/men_z135_uart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/milbeaut_usio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/milbeaut_usio.c</a></td><td class='right'>614</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/mvebu-uart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/mvebu-uart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/mxs-auart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/mxs-auart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/qcom_geni_serial.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/qcom_geni_serial.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/sc16is7xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/sc16is7xx.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/serial_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/serial_core.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/serial_txx9.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/serial_txx9.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/sh-sci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/sh-sci.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/sifive.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/sifive.c</a></td><td class='right'>1056</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/sn_console.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/sn_console.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/sprd_serial.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/sprd_serial.c</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/ucc_uart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/ucc_uart.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/serial/xilinx_uartps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/serial/xilinx_uartps.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/sysrq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/sysrq.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/tty_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/tty_io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/tty_jobctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/tty_jobctrl.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/ttynull.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/ttynull.c</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vcc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vcc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/consolemap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/consolemap.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/cp437.uni?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/cp437.uni</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/defkeymap.c_shipped?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/defkeymap.c_shipped</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/defkeymap.map?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/defkeymap.map</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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/keyboard.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/keyboard.c</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/selection.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/selection.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/vc_screen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/vc_screen.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='/openslx/kernel-qcow2-linux.git/diff/drivers/tty/vt/vt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/tty/vt/vt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/uio/uio_fsl_elbc_gpcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/uio/uio_fsl_elbc_gpcm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/chipidea/ci_hdrc_msm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/chipidea/ci_hdrc_msm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/class/cdc-acm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/class/cdc-acm.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/class/cdc-acm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/class/cdc-acm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/common/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/common/common.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/core/driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/core/driver.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/core/hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/core/hcd.c</a></td><td class='right'>47</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/core/hub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/core/hub.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/core/message.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/core/message.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/core.c</a></td><td class='right'>199</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/core.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/core_intr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/core_intr.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/gadget.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/gadget.c</a></td><td class='right'>101</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/hcd.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/params.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/params.c</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc2/platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc2/platform.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/debug.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/dwc3-meson-g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/dwc3-meson-g12a.c</a></td><td class='right'>604</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/dwc3-of-simple.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/dwc3-of-simple.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/dwc3-pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/dwc3-pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/dwc3/gadget.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/dwc3/gadget.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/early/xhci-dbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/early/xhci-dbc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/function/f_fs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/function/f_fs.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/function/f_hid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/function/f_hid.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/function/f_ncm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/function/f_ncm.c</a></td><td class='right'>57</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/function/f_uac1_legacy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/function/f_uac1_legacy.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/function/u_ncm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/function/u_ncm.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/aspeed-vhub/epn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/aspeed-vhub/epn.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/atmel_usba_udc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/atmel_usba_udc.c</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/atmel_usba_udc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/atmel_usba_udc.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/dummy_hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/dummy_hcd.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/lpc32xx_udc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/lpc32xx_udc.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.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/net2272.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/net2272.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/gadget/udc/net2280.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/gadget/udc/net2280.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/fhci-sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/fhci-sched.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/u132-hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/u132-hcd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-dbgcap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-dbgcap.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-hub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-hub.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-mtk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-mtk.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-plat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-plat.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-rcar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-rcar.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-ring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-ring.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-tegra.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-tegra.c</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci-trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci-trace.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/host/xhci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/host/xhci.h</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/isp1760/isp1760-hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/isp1760/isp1760-hcd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/misc/ldusb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/misc/ldusb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/misc/usb251xb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/misc/usb251xb.c</a></td><td class='right'>137</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/misc/usb3503.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/misc/usb3503.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/misc/yurex.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/misc/yurex.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_debug.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_debugfs.c</a></td><td class='right'>539</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_dr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_dr.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.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_dr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_dr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_gadget.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_gadget.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_gadget_ep0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_gadget_ep0.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_hw_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_hw_regs.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_plat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_plat.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_qmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_qmu.c</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_qmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_qmu.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_trace.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/mtu3/mtu3_trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/mtu3/mtu3_trace.h</a></td><td class='right'>279</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/musb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/musb/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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/musb/jz4740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/musb/jz4740.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/musb/musb_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/musb/musb_core.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/musb/musb_dsps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/musb/musb_dsps.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/musb/omap2430.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/musb/omap2430.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/phy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/phy/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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/ark3116.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/ark3116.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/cp210x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/cp210x.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/cypress_m8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/cypress_m8.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/digi_acceleport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/digi_acceleport.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/f81232.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/f81232.c</a></td><td class='right'>198</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/ftdi_sio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/ftdi_sio.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/ftdi_sio_ids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/ftdi_sio_ids.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/generic.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/io_edgeport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/io_edgeport.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/iuu_phoenix.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/iuu_phoenix.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/mos7720.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/mos7720.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/option.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/option.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/oti6858.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/oti6858.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/pl2303.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/pl2303.c</a></td><td class='right'>58</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/spcp8x5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/spcp8x5.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/serial/usb-serial.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/serial/usb-serial.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/storage/realtek_cr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/storage/realtek_cr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/storage/scsiglue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/storage/scsiglue.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/storage/sierra_ms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/storage/sierra_ms.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/storage/uas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/storage/uas.c</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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/altmodes/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/altmodes/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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/altmodes/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/altmodes/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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/altmodes/displayport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/altmodes/displayport.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/altmodes/displayport.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/altmodes/displayport.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/altmodes/nvidia.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/altmodes/nvidia.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/mux/pi3usb30532.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/mux/pi3usb30532.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/tcpm/fusb302.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/tcpm/fusb302.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/tcpm/tcpci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/tcpm/tcpci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/tcpm/tcpm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/tcpm/tcpm.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/tcpm/wcove.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/tcpm/wcove.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/displayport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/displayport.c</a></td><td class='right'>315</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/trace.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/ucsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/ucsi.c</a></td><td class='right'>404</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/ucsi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/ucsi.h</a></td><td class='right'>118</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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/typec/ucsi/ucsi_ccg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/typec/ucsi/ucsi_ccg.c</a></td><td class='right'>884</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/usbip/stub_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/usbip/stub_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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/usbip/usbip_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/usbip/usbip_common.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='/openslx/kernel-qcow2-linux.git/diff/drivers/usb/usbip/vhci_hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/usb/usbip/vhci_hcd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/vfio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/vfio/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/drivers/vfio/pci/vfio_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/vfio/pci/vfio_pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/vfio/vfio_iommu_spapr_tce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/vfio/vfio_iommu_spapr_tce.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='/openslx/kernel-qcow2-linux.git/diff/drivers/vfio/vfio_iommu_type1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/vfio/vfio_iommu_type1.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/vhost/vhost.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/vhost/vhost.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='/openslx/kernel-qcow2-linux.git/diff/drivers/video/fbdev/efifb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/video/fbdev/efifb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/virt/vboxguest/vboxguest_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virt/vboxguest/vboxguest_core.c</a></td><td class='right'>137</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='/openslx/kernel-qcow2-linux.git/diff/drivers/virt/vboxguest/vboxguest_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virt/vboxguest/vboxguest_core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/virt/vboxguest/vboxguest_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virt/vboxguest/vboxguest_linux.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/virt/vboxguest/vboxguest_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virt/vboxguest/vboxguest_utils.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.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='/openslx/kernel-qcow2-linux.git/diff/drivers/virt/vboxguest/vboxguest_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virt/vboxguest/vboxguest_version.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='/openslx/kernel-qcow2-linux.git/diff/drivers/virt/vboxguest/vmmdev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virt/vboxguest/vmmdev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/virtio/virtio_pci_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virtio/virtio_pci_common.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='/openslx/kernel-qcow2-linux.git/diff/drivers/virtio/virtio_ring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/virtio/virtio_ring.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='/openslx/kernel-qcow2-linux.git/diff/drivers/w1/masters/ds2482.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/w1/masters/ds2482.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/w1/masters/ds2490.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/w1/masters/ds2490.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='/openslx/kernel-qcow2-linux.git/diff/drivers/w1/slaves/w1_ds2408.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/w1/slaves/w1_ds2408.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/drivers/w1/w1_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/w1/w1_io.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/acquirewdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/acquirewdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/advantechwdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/advantechwdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/alim1535_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/alim1535_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/alim7101_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/alim7101_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/ar7_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/ar7_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/at91rm9200_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/at91rm9200_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/ath79_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/ath79_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/bcm63xx_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/bcm63xx_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/cpu5wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/cpu5wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/cpwd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/cpwd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/eurotechwdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/eurotechwdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/f71808e_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/f71808e_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/gef_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/gef_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/geodewdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/geodewdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/ib700wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/ib700wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/ibmasr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/ibmasr.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/indydog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/indydog.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/intel_scu_watchdog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/intel_scu_watchdog.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/iop_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/iop_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/it8712f_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/it8712f_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/ixp4xx_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/ixp4xx_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/ks8695_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/ks8695_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/m54xx_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/m54xx_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/machzwd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/machzwd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/mixcomwd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/mixcomwd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/mtx-1_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/mtx-1_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/mv64x60_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/mv64x60_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/nuc900_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/nuc900_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/nv_tco.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/nv_tco.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/pc87413_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/pc87413_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/pcwd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/pcwd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/pcwd_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/pcwd_pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/pcwd_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/pcwd_usb.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/pika_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/pika_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/pnx833x_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/pnx833x_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/rc32434_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/rc32434_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/rdc321x_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/rdc321x_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/riowd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/riowd.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sa1100_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sa1100_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sb_wdog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sb_wdog.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sbc60xxwdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sbc60xxwdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sbc7240_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sbc7240_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sbc8360.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sbc8360.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sbc_epx_c3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sbc_epx_c3.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sbc_fitpc2_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sbc_fitpc2_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sbsa_gwdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sbsa_gwdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sc1200wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sc1200wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sc520_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sc520_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/sch311x_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/sch311x_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/scx200_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/scx200_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/smsc37b787_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/smsc37b787_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/w83877f_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/w83877f_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/w83977f_wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/w83977f_wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/wafer5823wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/wafer5823wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/watchdog_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/watchdog_dev.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/wdrtas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/wdrtas.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/wdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/wdt.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/wdt285.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/wdt285.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/wdt977.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/wdt977.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='/openslx/kernel-qcow2-linux.git/diff/drivers/watchdog/wdt_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/watchdog/wdt_pci.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='/openslx/kernel-qcow2-linux.git/diff/drivers/xen/biomerge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/xen/biomerge.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='/openslx/kernel-qcow2-linux.git/diff/drivers/xen/events/events_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/xen/events/events_base.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='/openslx/kernel-qcow2-linux.git/diff/drivers/xen/evtchn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/xen/evtchn.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='/openslx/kernel-qcow2-linux.git/diff/drivers/xen/privcmd-buf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/xen/privcmd-buf.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='/openslx/kernel-qcow2-linux.git/diff/drivers/xen/swiotlb-xen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/xen/swiotlb-xen.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.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/drivers/xen/xenbus/xenbus_dev_frontend.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/xen/xenbus/xenbus_dev_frontend.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='/openslx/kernel-qcow2-linux.git/diff/fs/9p/v9fs_vfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/9p/v9fs_vfs.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='/openslx/kernel-qcow2-linux.git/diff/fs/9p/vfs_inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/9p/vfs_inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/9p/vfs_super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/9p/vfs_super.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='/openslx/kernel-qcow2-linux.git/diff/fs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/fs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/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='/openslx/kernel-qcow2-linux.git/diff/fs/adfs/dir_f.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/adfs/dir_f.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='/openslx/kernel-qcow2-linux.git/diff/fs/adfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/adfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/affs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/affs/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/afs_fs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/afs_fs.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/callback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/callback.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/cmservice.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/cmservice.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/dir.c</a></td><td class='right'>167</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/dir_silly.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/dir_silly.c</a></td><td class='right'>239</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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/file.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/flock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/flock.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/fs_probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/fs_probe.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/fsclient.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/fsclient.c</a></td><td class='right'>314</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/inode.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/internal.h</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/misc.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/protocol_yfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/protocol_yfs.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/rxrpc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/rxrpc.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/server.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/server.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/super.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/vl_probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/vl_probe.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/vlclient.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/vlclient.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/write.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/write.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='/openslx/kernel-qcow2-linux.git/diff/fs/afs/xattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/xattr.c</a></td><td class='right'>270</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/afs/yfsclient.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/afs/yfsclient.c</a></td><td class='right'>361</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='/openslx/kernel-qcow2-linux.git/diff/fs/aio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/aio.c</a></td><td class='right'>338</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='/openslx/kernel-qcow2-linux.git/diff/fs/autofs/autofs_i.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/autofs/autofs_i.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='/openslx/kernel-qcow2-linux.git/diff/fs/autofs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/autofs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/befs/linuxvfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/befs/linuxvfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/bfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/bfs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/block_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/block_dev.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/acl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/acl.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/backref.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/backref.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/btrfs_inode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/btrfs_inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/compression.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/compression.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ctree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ctree.c</a></td><td class='right'>254</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ctree.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ctree.h</a></td><td class='right'>79</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/delayed-inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/delayed-inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/delayed-ref.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/delayed-ref.c</a></td><td class='right'>46</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/delayed-ref.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/delayed-ref.h</a></td><td class='right'>122</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/dev-replace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/dev-replace.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/dev-replace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/dev-replace.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/dir-item.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/dir-item.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/disk-io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/disk-io.c</a></td><td class='right'>229</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/disk-io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/disk-io.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/extent-tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/extent-tree.c</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/extent_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/extent_io.c</a></td><td class='right'>366</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/extent_io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/extent_io.h</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/extent_map.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/extent_map.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/file-item.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/file-item.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/file.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/free-space-cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/free-space-cache.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/free-space-cache.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/free-space-cache.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/free-space-tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/free-space-tree.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/free-space-tree.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/free-space-tree.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/inode-item.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/inode-item.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/inode.c</a></td><td class='right'>346</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.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ioctl.c</a></td><td class='right'>191</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/locking.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/locking.c</a></td><td class='right'>157</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ordered-data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ordered-data.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ordered-data.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ordered-data.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/print-tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/print-tree.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/props.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/props.c</a></td><td class='right'>242</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/props.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/props.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/qgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/qgroup.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/raid56.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/raid56.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ref-verify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ref-verify.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/ref-verify.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/ref-verify.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/relocation.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/relocation.c</a></td><td class='right'>123</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/root-tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/root-tree.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/scrub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/scrub.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/send.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/send.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/btrfs-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/btrfs-tests.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/btrfs-tests.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/btrfs-tests.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/extent-buffer-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/extent-buffer-tests.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/extent-io-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/extent-io-tests.c</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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/extent-map-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/extent-map-tests.c</a></td><td class='right'>213</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/free-space-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/free-space-tests.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/free-space-tree-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/free-space-tree-tests.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/inode-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/inode-tests.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tests/qgroup-tests.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tests/qgroup-tests.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/transaction.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/transaction.c</a></td><td class='right'>113</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/transaction.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/transaction.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tree-checker.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tree-checker.c</a></td><td class='right'>513</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tree-checker.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tree-checker.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tree-log.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tree-log.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/tree-log.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/tree-log.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/uuid-tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/uuid-tree.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/volumes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/volumes.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/volumes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/volumes.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/xattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/xattr.c</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/xattr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/xattr.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='/openslx/kernel-qcow2-linux.git/diff/fs/btrfs/zstd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/btrfs/zstd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/buffer.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='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/dir.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='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/file.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='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/inode.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/mds_client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/mds_client.c</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/snap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/snap.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='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/ceph/super.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ceph/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/char_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/char_dev.c</a></td><td class='right'>78</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/cifs_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/cifs_debug.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/cifsfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/cifsfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/cifsfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/cifsfs.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/cifsglob.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/cifsglob.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/cifsproto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/cifsproto.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/cifssmb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/cifssmb.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/connect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/connect.c</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/dfs_cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/dfs_cache.c</a></td><td class='right'>140</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/dfs_cache.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/dfs_cache.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/file.c</a></td><td class='right'>198</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/inode.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/link.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/link.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/misc.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb1ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb1ops.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2file.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2maperror.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2maperror.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2misc.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2ops.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2pdu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2pdu.c</a></td><td class='right'>144</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2pdu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2pdu.h</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2proto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2proto.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smb2status.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smb2status.h</a></td><td class='right'>3480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smbdirect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smbdirect.c</a></td><td class='right'>292</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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smbdirect.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smbdirect.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/smbfsctl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/smbfsctl.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/trace.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='/openslx/kernel-qcow2-linux.git/diff/fs/cifs/transport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/cifs/transport.c</a></td><td class='right'>48</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='/openslx/kernel-qcow2-linux.git/diff/fs/coda/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/coda/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/configfs/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/configfs/dir.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='/openslx/kernel-qcow2-linux.git/diff/fs/crypto/bio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/crypto/bio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/crypto/crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/crypto/crypto.c</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/fs/crypto/fname.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/crypto/fname.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='/openslx/kernel-qcow2-linux.git/diff/fs/crypto/hooks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/crypto/hooks.c</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/fs/crypto/keyinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/crypto/keyinfo.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/crypto/policy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/crypto/policy.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='/openslx/kernel-qcow2-linux.git/diff/fs/dax.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/dax.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/dcache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/dcache.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/debugfs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/debugfs/file.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/fs/debugfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/debugfs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/direct-io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/direct-io.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='/openslx/kernel-qcow2-linux.git/diff/fs/dlm/netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/dlm/netlink.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='/openslx/kernel-qcow2-linux.git/diff/fs/ecryptfs/crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ecryptfs/crypto.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='/openslx/kernel-qcow2-linux.git/diff/fs/ecryptfs/keystore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ecryptfs/keystore.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='/openslx/kernel-qcow2-linux.git/diff/fs/ecryptfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ecryptfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/efs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/efs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext2/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext2/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/block_validity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/block_validity.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/dir.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/ext4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/ext4.h</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/ext4_jbd2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/ext4_jbd2.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/extents_status.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/extents_status.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/file.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/hash.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/ialloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/ialloc.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/indirect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/indirect.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/inline.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/inline.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/inode.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/ioctl.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/mballoc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/mballoc.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/namei.c</a></td><td class='right'>183</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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/page-io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/page-io.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/readpage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/readpage.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/resize.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/resize.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/super.c</a></td><td class='right'>205</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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/sysfs.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='/openslx/kernel-qcow2-linux.git/diff/fs/ext4/xattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ext4/xattr.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='/openslx/kernel-qcow2-linux.git/diff/fs/f2fs/data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/f2fs/data.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='/openslx/kernel-qcow2-linux.git/diff/fs/f2fs/f2fs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/f2fs/f2fs.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='/openslx/kernel-qcow2-linux.git/diff/fs/f2fs/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/f2fs/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/f2fs/node.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/f2fs/node.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='/openslx/kernel-qcow2-linux.git/diff/fs/f2fs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/f2fs/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/fat/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fat/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/fcntl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fcntl.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='/openslx/kernel-qcow2-linux.git/diff/fs/file_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/file_table.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='/openslx/kernel-qcow2-linux.git/diff/fs/freevxfs/vxfs_super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/freevxfs/vxfs_super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/fs_context.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fs_context.c</a></td><td class='right'>160</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='/openslx/kernel-qcow2-linux.git/diff/fs/fs_parser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fs_parser.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='/openslx/kernel-qcow2-linux.git/diff/fs/fsopen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fsopen.c</a></td><td class='right'>477</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/fuse/dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fuse/dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/fuse/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/fuse/inode.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/aops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/aops.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/bmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/bmap.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/bmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/bmap.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/dir.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/glock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/glock.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/glops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/glops.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/incore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/incore.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/log.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/log.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/log.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/log.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/lops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/lops.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/lops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/lops.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/meta_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/meta_io.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/ops_fstype.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/ops_fstype.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/recovery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/recovery.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/recovery.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/recovery.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/rgrp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/rgrp.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/super.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/trans.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/trans.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/trans.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/trans.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='/openslx/kernel-qcow2-linux.git/diff/fs/gfs2/xattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/gfs2/xattr.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='/openslx/kernel-qcow2-linux.git/diff/fs/hfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/hfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/hfsplus/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/hfsplus/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/hostfs/hostfs_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/hostfs/hostfs_kern.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='/openslx/kernel-qcow2-linux.git/diff/fs/hpfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/hpfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/hugetlbfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/hugetlbfs/inode.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/inode.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/fs/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/internal.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='/openslx/kernel-qcow2-linux.git/diff/fs/io_uring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/io_uring.c</a></td><td class='right'>976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/iomap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/iomap.c</a></td><td class='right'>117</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='/openslx/kernel-qcow2-linux.git/diff/fs/isofs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/isofs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/jbd2/checkpoint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jbd2/checkpoint.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='/openslx/kernel-qcow2-linux.git/diff/fs/jbd2/journal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jbd2/journal.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='/openslx/kernel-qcow2-linux.git/diff/fs/jffs2/fs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jffs2/fs.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='/openslx/kernel-qcow2-linux.git/diff/fs/jffs2/readinode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jffs2/readinode.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='/openslx/kernel-qcow2-linux.git/diff/fs/jffs2/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jffs2/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/acl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/acl.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/jfs_incore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/jfs_incore.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/jfs_logmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/jfs_logmgr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/jfs_logmgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/jfs_logmgr.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/jfs_mount.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/jfs_mount.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/jfs_superblock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/jfs_superblock.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/jfs_txnmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/jfs_txnmgr.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/namei.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='/openslx/kernel-qcow2-linux.git/diff/fs/jfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/jfs/super.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/kernfs/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/kernfs/dir.c</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.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='/openslx/kernel-qcow2-linux.git/diff/fs/kernfs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/kernfs/file.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='/openslx/kernel-qcow2-linux.git/diff/fs/kernfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/kernfs/inode.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.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/kernfs/kernfs-internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/kernfs/kernfs-internal.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='/openslx/kernel-qcow2-linux.git/diff/fs/kernfs/symlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/kernfs/symlink.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='/openslx/kernel-qcow2-linux.git/diff/fs/libfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/libfs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/lockd/host.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/lockd/host.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='/openslx/kernel-qcow2-linux.git/diff/fs/locks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/locks.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='/openslx/kernel-qcow2-linux.git/diff/fs/minix/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/minix/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/mpage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/mpage.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='/openslx/kernel-qcow2-linux.git/diff/fs/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/namei.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='/openslx/kernel-qcow2-linux.git/diff/fs/namespace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/namespace.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/client.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/flexfilelayout/flexfilelayout.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/flexfilelayout/flexfilelayout.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/internal.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/nfs42proc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/nfs42proc.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/nfs4file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/nfs4file.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/nfs4proc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/nfs4proc.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/nfs4super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/nfs4super.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/nfs4xdr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/nfs4xdr.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/nfs3proc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/nfs3proc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/nfs3xdr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/nfs3xdr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/nfs4callback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/nfs4callback.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/nfs4proc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/nfs4proc.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/nfs4recover.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/nfs4recover.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='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/nfs4state.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/nfs4state.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/nfsd/state.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nfsd/state.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='/openslx/kernel-qcow2-linux.git/diff/fs/nilfs2/nilfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nilfs2/nilfs.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='/openslx/kernel-qcow2-linux.git/diff/fs/nilfs2/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nilfs2/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/notify/dnotify/dnotify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/dnotify/dnotify.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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/fanotify/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/fanotify/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/fanotify/fanotify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/fanotify/fanotify.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/notify/fanotify/fanotify_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/fanotify/fanotify_user.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/notify/fsnotify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/fsnotify.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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/inotify/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/inotify/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/inotify/inotify.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/inotify/inotify.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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/inotify/inotify_fsnotify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/inotify/inotify_fsnotify.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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/inotify/inotify_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/inotify/inotify_user.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='/openslx/kernel-qcow2-linux.git/diff/fs/notify/mark.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/notify/mark.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/nsfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/nsfs.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/fs/ntfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ntfs/inode.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/ntfs/inode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ntfs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/ntfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ntfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/ocfs2/cluster/quorum.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ocfs2/cluster/quorum.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='/openslx/kernel-qcow2-linux.git/diff/fs/ocfs2/dlmfs/dlmfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ocfs2/dlmfs/dlmfs.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='/openslx/kernel-qcow2-linux.git/diff/fs/ocfs2/refcounttree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ocfs2/refcounttree.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/ocfs2/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ocfs2/super.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/open.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/open.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/openpromfs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/openpromfs/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/orangefs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/orangefs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/overlayfs/export.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/overlayfs/export.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='/openslx/kernel-qcow2-linux.git/diff/fs/overlayfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/overlayfs/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/pipe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/pipe.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='/openslx/kernel-qcow2-linux.git/diff/fs/proc/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/proc/base.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/proc/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/proc/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/proc/kcore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/proc/kcore.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/proc/proc_sysctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/proc/proc_sysctl.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/proc/task_mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/proc/task_mmu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/pstore/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/pstore/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/qnx4/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/qnx4/inode.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/qnx6/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/qnx6/inode.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/read_write.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/read_write.c</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/fs/reiserfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/reiserfs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/romfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/romfs/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/seq_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/seq_file.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='/openslx/kernel-qcow2-linux.git/diff/fs/signalfd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/signalfd.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='/openslx/kernel-qcow2-linux.git/diff/fs/splice.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/splice.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/squashfs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/squashfs/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/stack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/stack.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/sync.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/sync.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/fs/sysv/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/sysv/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/sysv/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/sysv/namei.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/sysv/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/sysv/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/sysv/sysv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/sysv/sysv.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='/openslx/kernel-qcow2-linux.git/diff/fs/ubifs/auth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ubifs/auth.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='/openslx/kernel-qcow2-linux.git/diff/fs/ubifs/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ubifs/dir.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='/openslx/kernel-qcow2-linux.git/diff/fs/ubifs/replay.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ubifs/replay.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='/openslx/kernel-qcow2-linux.git/diff/fs/ubifs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ubifs/super.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/udf/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/udf/inode.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='/openslx/kernel-qcow2-linux.git/diff/fs/udf/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/udf/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/udf/truncate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/udf/truncate.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='/openslx/kernel-qcow2-linux.git/diff/fs/udf/udfdecl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/udf/udfdecl.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='/openslx/kernel-qcow2-linux.git/diff/fs/ufs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ufs/super.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='/openslx/kernel-qcow2-linux.git/diff/fs/ufs/util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/ufs/util.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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/.gitignore</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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/Makefile</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/README.utf8data?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/README.utf8data</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/mkutf8data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/mkutf8data.c</a></td><td class='right'>3419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/utf8-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/utf8-core.c</a></td><td class='right'>187</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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/utf8-norm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/utf8-norm.c</a></td><td class='right'>799</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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/utf8-selftest.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/utf8-selftest.c</a></td><td class='right'>320</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='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/utf8data.h_shipped?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/utf8data.h_shipped</a></td><td class='right'>4109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/unicode/utf8n.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/unicode/utf8n.h</a></td><td class='right'>117</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='/openslx/kernel-qcow2-linux.git/diff/fs/userfaultfd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/userfaultfd.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_ag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_ag.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_ag.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_ag.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_alloc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_attr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_attr.c</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.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_attr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_attr.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_bmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_bmap.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_defer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_defer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_dquot_buf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_dquot_buf.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_fs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_fs.h</a></td><td class='right'>139</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_health.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_health.h</a></td><td class='right'>190</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_quota_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_quota_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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_sb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_sb.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_sb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_sb.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_trans_resv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_trans_resv.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_types.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_types.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/libxfs/xfs_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/libxfs/xfs_types.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/agheader.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/agheader.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/btree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/btree.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/common.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/common.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/dabtree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/dabtree.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/fscounters.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/fscounters.c</a></td><td class='right'>366</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/health.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/health.c</a></td><td class='right'>237</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/health.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/health.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/ialloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/ialloc.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/parent.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/parent.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/quota.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/quota.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/repair.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/repair.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/repair.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/repair.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/scrub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/scrub.c</a></td><td class='right'>49</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/scrub.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/scrub.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/scrub/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/scrub/trace.h</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_aops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_aops.c</a></td><td class='right'>138</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_aops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_aops.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_bmap_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_bmap_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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_buf_item.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_buf_item.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_discard.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_discard.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_dquot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_dquot.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_file.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_fsops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_fsops.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_fsops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_fsops.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_health.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_health.c</a></td><td class='right'>392</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_icache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_icache.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_icache.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_icache.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_inode.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_inode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_inode.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_ioctl.c</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_ioctl32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_ioctl32.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_itable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_itable.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_log.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_log.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_log_cil.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_log_cil.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_log_recover.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_log_recover.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_mount.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_mount.c</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_mount.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_mount.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_qm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_qm.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_qm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_qm.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_quota.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_quota.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_super.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.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_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.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='/openslx/kernel-qcow2-linux.git/diff/fs/xfs/xfs_trans_dquot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>fs/xfs/xfs_trans_dquot.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.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='/openslx/kernel-qcow2-linux.git/diff/include/acpi/acoutput.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/acoutput.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='/openslx/kernel-qcow2-linux.git/diff/include/acpi/acpi_bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/acpi_bus.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='/openslx/kernel-qcow2-linux.git/diff/include/acpi/acpixf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/acpixf.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='/openslx/kernel-qcow2-linux.git/diff/include/acpi/actbl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/actbl.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='/openslx/kernel-qcow2-linux.git/diff/include/acpi/actbl1.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/actbl1.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='/openslx/kernel-qcow2-linux.git/diff/include/acpi/actypes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/actypes.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/acpi/platform/aclinux.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/acpi/platform/aclinux.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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/futex.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/futex.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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/io.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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/mmiowb.h</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/mmiowb_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/mmiowb_types.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/pgtable.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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/rwsem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/rwsem.h</a></td><td class='right'>140</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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/sections.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/sections.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/tlb.h</a></td><td class='right'>297</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='/openslx/kernel-qcow2-linux.git/diff/include/asm-generic/vmlinux.lds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/asm-generic/vmlinux.lds.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/aes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/aes.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/akcipher.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/akcipher.h</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/cryptd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/cryptd.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.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/des.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/des.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/hash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/hash.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/internal/simd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/internal/simd.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/morus1280_glue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/morus1280_glue.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.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/morus640_glue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/morus640_glue.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.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/public_key.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/public_key.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='/openslx/kernel-qcow2-linux.git/diff/include/crypto/streebog.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/crypto/streebog.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='/openslx/kernel-qcow2-linux.git/diff/include/drm/drm_modeset_helper_vtables.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/drm/drm_modeset_helper_vtables.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='/openslx/kernel-qcow2-linux.git/diff/include/drm/ttm/ttm_bo_driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/drm/ttm/ttm_bo_driver.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='/openslx/kernel-qcow2-linux.git/diff/include/dt-bindings/clock/sifive-fu540-prci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/dt-bindings/clock/sifive-fu540-prci.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/dt-bindings/iio/temperature/thermocouple.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/dt-bindings/iio/temperature/thermocouple.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/dt-bindings/phy/phy-am654-serdes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/dt-bindings/phy/phy-am654-serdes.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/dt-bindings/pinctrl/stm32-pinfunc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/dt-bindings/pinctrl/stm32-pinfunc.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='/openslx/kernel-qcow2-linux.git/diff/include/dt-bindings/reset/amlogic,meson-g12a-reset.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/dt-bindings/reset/amlogic,meson-g12a-reset.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='/openslx/kernel-qcow2-linux.git/diff/include/keys/trusted.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/keys/trusted.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/acpi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/acpi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/acpi_iort.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/acpi_iort.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/alcor_pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/alcor_pci.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/atalk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/atalk.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/audit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/audit.h</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/bio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bio.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/bitrev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bitrev.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/blk-mq-rdma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/blk-mq-rdma.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/blk-mq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/blk-mq.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/blk_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/blk_types.h</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/include/linux/blkdev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/blkdev.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/linux/bpf-cgroup.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bpf-cgroup.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/bpf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bpf.h</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/bpf_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bpf_types.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/bpf_verifier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bpf_verifier.h</a></td><td class='right'>72</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/brcmphy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/brcmphy.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/bsg-lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bsg-lib.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/btf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/btf.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/bvec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/bvec.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/ceph/libceph.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/ceph/libceph.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/clk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/clk.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/compiler.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/compiler.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/coresight-pmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/coresight-pmu.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/coresight.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/coresight.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/counter.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/counter.h</a></td><td class='right'>510</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/counter_enum.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/counter_enum.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/linux/cpu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/cpu.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/linux/cpufreq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/cpufreq.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/cpuhotplug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/cpuhotplug.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/cpuidle.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/cpuidle.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/cred.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/cred.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/dcache.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/dcache.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/device.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/device.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/dmi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/dmi.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/dsa/8021q.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/dsa/8021q.h</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/dsa/sja1105.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/dsa/sja1105.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/linux/efi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/efi.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/elevator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/elevator.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/etherdevice.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/etherdevice.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/filter.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/filter.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/firmware/intel/stratix10-smc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/firmware/intel/stratix10-smc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/fs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/fs.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/fs_context.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/fs_context.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/fscrypt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/fscrypt.h</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/fsl/ftm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/fsl/ftm.h</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/fsnotify.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/fsnotify.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/fsnotify_backend.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/fsnotify_backend.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/ftrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/ftrace.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/genhd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/genhd.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/genl_magic_func.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/genl_magic_func.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/gpio/driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/gpio/driver.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/hid.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/hid.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/hugetlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/hugetlb.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/hwmon.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/hwmon.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/hyperv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/hyperv.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/ieee80211.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/if_bridge.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/if_bridge.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/adc/ad_sigma_delta.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/adc/ad_sigma_delta.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/driver.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/frequency/ad9523.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/frequency/ad9523.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/gyro/itg3200.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/gyro/itg3200.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/iio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/iio.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/imu/adis.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/imu/adis.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/iio/timer/stm32-timer-trigger.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iio/timer/stm32-timer-trigger.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/ima.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/ima.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/inetdevice.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/inetdevice.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/intel-ish-client-if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/intel-ish-client-if.h</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/interrupt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/interrupt.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/iomap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/iomap.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/irq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/irq.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/irqchip/arm-gic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/irqchip/arm-gic.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/jbd2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/jbd2.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/jiffies.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/jiffies.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/jump_label_ratelimit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/jump_label_ratelimit.h</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/kcore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/kcore.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/kernel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/kernel.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/kernfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/kernfs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/kobject.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/kobject.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/kprobes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/kprobes.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/kvm_host.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/kvm_host.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/list.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/list.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/livepatch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/livepatch.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/lockdep.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/lockdep.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/lsm_hooks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/lsm_hooks.h</a></td><td class='right'>189</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/marvell_phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/marvell_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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mdio.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mei_cl_bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mei_cl_bus.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/memcontrol.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/memcontrol.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mfd/palmas.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mfd/palmas.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mfd/ti-lmu-register.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mfd/ti-lmu-register.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mfd/ti-lmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mfd/ti-lmu.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mfd/wm831x/regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mfd/wm831x/regulator.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mfd/wm8400-private.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mfd/wm8400-private.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mii.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mii.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/cq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/cq.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/device.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/device.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/doorbell.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/doorbell.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/driver.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/eswitch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/eswitch.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/fs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/fs.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/mlx5_ifc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/mlx5_ifc.h</a></td><td class='right'>183</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/port.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/port.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/qp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/qp.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/transobj.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/transobj.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mlx5/vport.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mlx5/vport.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mm.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mm_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mm_types.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/mmc/sdio_func.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mmc/sdio_func.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/mmc/sdio_ids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mmc/sdio_ids.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/module.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/module.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/moduleparam.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/moduleparam.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/mount.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/mount.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/net.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/net.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/netdevice.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/netdevice.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/netfilter.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/netfilter.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/netfilter/ipset/ip_set.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/netfilter/ipset/ip_set.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/netfilter/nfnetlink_osf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/netfilter/nfnetlink_osf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/netfilter/x_tables.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/netfilter/x_tables.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/netfilter_ipv6.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/netfilter_ipv6.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/node.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/node.h</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/nvme-fc-driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/nvme-fc-driver.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/nvme-rdma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/nvme-rdma.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/nvme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/nvme.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/nvmem-consumer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/nvmem-consumer.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/of.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/of.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/oid_registry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/oid_registry.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/packing.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/packing.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/linux/page-isolation.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/page-isolation.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/parport.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/parport.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/perf_event.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/phy.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/phy/phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/phy/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='/openslx/kernel-qcow2-linux.git/diff/include/linux/pid.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/pid.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/pipe_fs_i.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/pipe_fs_i.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/ads7828.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/ads7828.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/ds620.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/ds620.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/gpio/gpio-amd-fch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/gpio/gpio-amd-fch.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/ina2xx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/ina2xx.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/macb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/macb.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/max197.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/max197.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/mv88e6xxx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/mv88e6xxx.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/ntc_thermistor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/ntc_thermistor.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/spi-ep93xx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/spi-ep93xx.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/x86/clk-pmc-atom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/x86/clk-pmc-atom.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/platform_data/xilinx-ll-temac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/platform_data/xilinx-ll-temac.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/linux/pm_domain.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/pm_domain.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/pm_opp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/pm_opp.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/printk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/printk.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/property.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/property.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/psp-sev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/psp-sev.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/ptrace.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/qed/qed_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/qed/qed_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='/openslx/kernel-qcow2-linux.git/diff/include/linux/random.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/random.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/rcupdate.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/rcupdate.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/rcuwait.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/rcuwait.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/regulator/consumer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/regulator/consumer.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/rhashtable-types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/rhashtable-types.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/rhashtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/rhashtable.h</a></td><td class='right'>358</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/rwsem-spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/rwsem-spinlock.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/rwsem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/rwsem.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/sbitmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sbitmap.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sched.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/sched/mm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sched/mm.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/sched/signal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sched/signal.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/sched/task.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sched/task.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/sched/topology.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sched/topology.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/sched/user.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sched/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='/openslx/kernel-qcow2-linux.git/diff/include/linux/security.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/security.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/sed-opal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sed-opal.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/selection.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/selection.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/serial_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/serial_core.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/set_memory.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/set_memory.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/shmem_fs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/shmem_fs.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/siphash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/siphash.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/skbuff.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/skbuff.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/slab.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/slab.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/smpboot.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/smpboot.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/socket.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/socket.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/soundwire/sdw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/soundwire/sdw.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/soundwire/sdw_intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/soundwire/sdw_intel.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/soundwire/sdw_registers.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/soundwire/sdw_registers.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/soundwire/sdw_type.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/soundwire/sdw_type.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/spi/pxa2xx_spi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/spi/pxa2xx_spi.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/spi/spi-mem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/spi/spi-mem.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/spi/spi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/spi/spi.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/spi/spi_bitbang.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/spi/spi_bitbang.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/spinlock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/srcu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/srcu.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/stackdepot.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/stackdepot.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/stacktrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/stacktrace.h</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/include/linux/string.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/string.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/sunrpc/sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/sunrpc/sched.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/suspend.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/suspend.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/syscalls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/syscalls.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/thunderbolt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/thunderbolt.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/tick.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/tick.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/time64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/time64.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/tracepoint-defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/tracepoint-defs.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/types.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/uaccess.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/uio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/uio.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/unicode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/unicode.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/uprobes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/uprobes.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/usb/ch9.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/usb/ch9.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/usb/hcd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/usb/hcd.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/usb/serial.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/usb/serial.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/usb/tcpm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/usb/tcpm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/usb/typec_dp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/usb/typec_dp.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/vbox_utils.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/vbox_utils.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/virtio_ring.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/virtio_ring.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/vmalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/vmalloc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/linux/vmw_vmci_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/vmw_vmci_defs.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.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='/openslx/kernel-qcow2-linux.git/diff/include/linux/wait.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/linux/wait.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='/openslx/kernel-qcow2-linux.git/diff/include/media/cec-notifier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/cec-notifier.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/media/dvb-usb-ids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/dvb-usb-ids.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='/openslx/kernel-qcow2-linux.git/diff/include/media/fwht-ctrls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/fwht-ctrls.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='/openslx/kernel-qcow2-linux.git/diff/include/media/media-dev-allocator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/media-dev-allocator.h</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/include/media/media-entity.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/media-entity.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.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='/openslx/kernel-qcow2-linux.git/diff/include/media/media-request.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/media-request.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='/openslx/kernel-qcow2-linux.git/diff/include/media/rc-map.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/rc-map.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='/openslx/kernel-qcow2-linux.git/diff/include/media/v4l2-common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/v4l2-common.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/media/v4l2-ctrls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/v4l2-ctrls.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/media/v4l2-subdev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/v4l2-subdev.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/media/videobuf2-core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/media/videobuf2-core.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.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='/openslx/kernel-qcow2-linux.git/diff/include/misc/charlcd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/misc/charlcd.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='/openslx/kernel-qcow2-linux.git/diff/include/net/act_api.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/act_api.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='/openslx/kernel-qcow2-linux.git/diff/include/net/addrconf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/addrconf.h</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.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='/openslx/kernel-qcow2-linux.git/diff/include/net/af_rxrpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/af_rxrpc.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='/openslx/kernel-qcow2-linux.git/diff/include/net/arp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/arp.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='/openslx/kernel-qcow2-linux.git/diff/include/net/bluetooth/hci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/bluetooth/hci.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='/openslx/kernel-qcow2-linux.git/diff/include/net/bluetooth/hci_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/bluetooth/hci_core.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='/openslx/kernel-qcow2-linux.git/diff/include/net/bpf_sk_storage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/bpf_sk_storage.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/cfg80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/cfg80211.h</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/include/net/compat.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/compat.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='/openslx/kernel-qcow2-linux.git/diff/include/net/devlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/devlink.h</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/dsa.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/dsa.h</a></td><td class='right'>223</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='/openslx/kernel-qcow2-linux.git/diff/include/net/dst.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/dst.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.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='/openslx/kernel-qcow2-linux.git/diff/include/net/fib_notifier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/fib_notifier.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='/openslx/kernel-qcow2-linux.git/diff/include/net/flow_dissector.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/flow_dissector.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='/openslx/kernel-qcow2-linux.git/diff/include/net/flow_offload.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/flow_offload.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/fq_impl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/fq_impl.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/genetlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/genetlink.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/geneve.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/geneve.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='/openslx/kernel-qcow2-linux.git/diff/include/net/ife.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ife.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='/openslx/kernel-qcow2-linux.git/diff/include/net/ip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ip.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='/openslx/kernel-qcow2-linux.git/diff/include/net/ip6_fib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ip6_fib.h</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/include/net/ip6_route.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ip6_route.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/ip_fib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ip_fib.h</a></td><td class='right'>124</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='/openslx/kernel-qcow2-linux.git/diff/include/net/ip_vs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ip_vs.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='/openslx/kernel-qcow2-linux.git/diff/include/net/ipv6_frag.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ipv6_frag.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='/openslx/kernel-qcow2-linux.git/diff/include/net/ipv6_stubs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ipv6_stubs.h</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/include/net/lwtunnel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/lwtunnel.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='/openslx/kernel-qcow2-linux.git/diff/include/net/mac80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/mac80211.h</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/include/net/ndisc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/ndisc.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/net/neighbour.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/neighbour.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='/openslx/kernel-qcow2-linux.git/diff/include/net/net_namespace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/net_namespace.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/ipv4/nf_nat_masquerade.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/ipv4/nf_nat_masquerade.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.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/ipv6/nf_nat_masquerade.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/ipv6/nf_nat_masquerade.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.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_conntrack.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_conntrack.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_conntrack_expect.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_conntrack_expect.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_conntrack_helper.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_conntrack_helper.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_conntrack_l4proto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_conntrack_l4proto.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_conntrack_timeout.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_conntrack_timeout.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_nat.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_nat.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_nat_masquerade.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_nat_masquerade.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_queue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_queue.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netfilter/nf_tables.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netfilter/nf_tables.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.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netlink.h</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/netns/conntrack.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netns/conntrack.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netns/hash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netns/hash.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netns/ipv4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netns/ipv4.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netns/ipv6.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netns/ipv6.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='/openslx/kernel-qcow2-linux.git/diff/include/net/netrom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/netrom.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='/openslx/kernel-qcow2-linux.git/diff/include/net/nfc/nci_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/nfc/nci_core.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='/openslx/kernel-qcow2-linux.git/diff/include/net/pkt_cls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/pkt_cls.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/psample.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/psample.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='/openslx/kernel-qcow2-linux.git/diff/include/net/request_sock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/request_sock.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='/openslx/kernel-qcow2-linux.git/diff/include/net/route.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/route.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/net/rtnh.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/rtnh.h</a> (renamed from include/net/nexthop.h)</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='/openslx/kernel-qcow2-linux.git/diff/include/net/sch_generic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/sch_generic.h</a></td><td class='right'>145</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='/openslx/kernel-qcow2-linux.git/diff/include/net/sctp/checksum.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/sctp/checksum.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='/openslx/kernel-qcow2-linux.git/diff/include/net/sctp/command.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/sctp/command.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='/openslx/kernel-qcow2-linux.git/diff/include/net/sctp/sctp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/sctp/sctp.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='/openslx/kernel-qcow2-linux.git/diff/include/net/sctp/ulpqueue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/sctp/ulpqueue.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='/openslx/kernel-qcow2-linux.git/diff/include/net/sock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/sock.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/net/tc_act/tc_gact.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/tc_act/tc_gact.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='/openslx/kernel-qcow2-linux.git/diff/include/net/tc_act/tc_ife.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/tc_act/tc_ife.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='/openslx/kernel-qcow2-linux.git/diff/include/net/tc_act/tc_police.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/tc_act/tc_police.h</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/include/net/tcp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/tcp.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='/openslx/kernel-qcow2-linux.git/diff/include/net/tls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/tls.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/net/udp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/udp.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='/openslx/kernel-qcow2-linux.git/diff/include/net/udp_tunnel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/udp_tunnel.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='/openslx/kernel-qcow2-linux.git/diff/include/net/vxlan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/vxlan.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='/openslx/kernel-qcow2-linux.git/diff/include/net/xdp_sock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/xdp_sock.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='/openslx/kernel-qcow2-linux.git/diff/include/net/xfrm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/net/xfrm.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.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='/openslx/kernel-qcow2-linux.git/diff/include/scsi/libsas.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/libsas.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/include/scsi/osd_attributes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/osd_attributes.h</a></td><td class='right'>398</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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/include/scsi/osd_protocol.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/osd_protocol.h</a></td><td class='right'>676</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='/openslx/kernel-qcow2-linux.git/diff/include/scsi/osd_sec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/osd_sec.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.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='/openslx/kernel-qcow2-linux.git/diff/include/scsi/osd_sense.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/osd_sense.h</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: 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='/openslx/kernel-qcow2-linux.git/diff/include/scsi/osd_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/osd_types.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.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='/openslx/kernel-qcow2-linux.git/diff/include/scsi/scsi_host.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/scsi_host.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='/openslx/kernel-qcow2-linux.git/diff/include/scsi/scsi_transport_fc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/scsi/scsi_transport_fc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/soc/rockchip/rk3399_grf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/soc/rockchip/rk3399_grf.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/soc/rockchip/rockchip_sip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/soc/rockchip/rockchip_sip.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='/openslx/kernel-qcow2-linux.git/diff/include/sound/soc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/sound/soc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/target/iscsi/iscsi_target_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/target/iscsi/iscsi_target_core.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='/openslx/kernel-qcow2-linux.git/diff/include/target/target_core_base.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/target/target_core_base.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='/openslx/kernel-qcow2-linux.git/diff/include/target/target_core_fabric.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/target/target_core_fabric.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/bpf_probe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/bpf_probe.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/afs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/afs.h</a></td><td class='right'>385</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/bpf_test_run.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/bpf_test_run.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/btrfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/btrfs.h</a></td><td class='right'>245</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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/cpuhp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/cpuhp.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/devfreq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/devfreq.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/fib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/fib.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.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/fib6.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/fib6.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/mlxsw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/mlxsw.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/nbd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/nbd.h</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/net.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/net.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/preemptirq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/preemptirq.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/random.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/random.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/rcu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/rcu.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/spi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/spi.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/sunrpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/sunrpc.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/syscalls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/syscalls.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/timer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/timer.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/vmscan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/vmscan.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/workqueue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/workqueue.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='/openslx/kernel-qcow2-linux.git/diff/include/trace/events/xen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/trace/events/xen.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/asm-generic/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/asm-generic/sockios.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/Kbuild</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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/aspeed-p2a-ctrl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/aspeed-p2a-ctrl.h</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/audit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/audit.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/batadv_packet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/batadv_packet.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.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/batman_adv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/batman_adv.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.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/bpf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/bpf.h</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/btf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/btf.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/btrfs_tree.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/btrfs_tree.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/elf-em.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/elf-em.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/ethtool.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/ethtool.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/fcntl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/fcntl.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/fou.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/fou.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/icmpv6.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/icmpv6.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/if_ether.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/if_ether.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/if_tun.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/if_tun.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/if_vlan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/if_vlan.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/input-event-codes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/input-event-codes.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/io_uring.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/io_uring.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/ip_vs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/ip_vs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/lirc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/lirc.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/media-bus-format.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/media-bus-format.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/media.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/media.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/mei.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/mei.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.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/mount.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/mount.h</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/netfilter/nf_tables.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/netfilter/nf_tables.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/nl80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/nl80211.h</a></td><td class='right'>86</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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/openvswitch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/openvswitch.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/pkt_sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/pkt_sched.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/psci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/psci.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/psp-sev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/psp-sev.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/sched.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/sed-opal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/sed-opal.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/serial_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/serial_core.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/sockios.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/spi/spidev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/spi/spidev.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/tcp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/tipc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/tipc.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/tipc_netlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/tipc_netlink.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/tls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/tls.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/v4l2-controls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/v4l2-controls.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/vbox_vmmdev_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/vbox_vmmdev_types.h</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/vfio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/vfio.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/vfio_ccw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/vfio_ccw.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/linux/videodev2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/linux/videodev2.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/include/uapi/misc/habanalabs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/misc/habanalabs.h</a></td><td class='right'>161</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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/rdma/mlx5-abi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/rdma/mlx5-abi.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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/scsi/fc/fc_els.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/scsi/fc/fc_els.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/include/uapi/sound/asound.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/uapi/sound/asound.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='/openslx/kernel-qcow2-linux.git/diff/include/xen/xen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>include/xen/xen.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='/openslx/kernel-qcow2-linux.git/diff/init/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>init/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.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='/openslx/kernel-qcow2-linux.git/diff/init/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>init/main.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.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='/openslx/kernel-qcow2-linux.git/diff/ipc/mqueue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>ipc/mqueue.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='/openslx/kernel-qcow2-linux.git/diff/ipc/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>ipc/util.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='/openslx/kernel-qcow2-linux.git/diff/kernel/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/.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='/openslx/kernel-qcow2-linux.git/diff/kernel/Kconfig.locks?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/Kconfig.locks</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='/openslx/kernel-qcow2-linux.git/diff/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/acct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/acct.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='/openslx/kernel-qcow2-linux.git/diff/kernel/async.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/async.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='/openslx/kernel-qcow2-linux.git/diff/kernel/audit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/audit.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='/openslx/kernel-qcow2-linux.git/diff/kernel/audit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/audit.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='/openslx/kernel-qcow2-linux.git/diff/kernel/audit_fsnotify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/audit_fsnotify.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='/openslx/kernel-qcow2-linux.git/diff/kernel/audit_tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/audit_tree.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='/openslx/kernel-qcow2-linux.git/diff/kernel/audit_watch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/audit_watch.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='/openslx/kernel-qcow2-linux.git/diff/kernel/auditfilter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/auditfilter.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/auditsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/auditsc.c</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/kernel/backtracetest.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/backtracetest.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/arraymap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/arraymap.c</a></td><td class='right'>53</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/btf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/btf.c</a></td><td class='right'>419</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: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/cgroup.c</a></td><td class='right'>370</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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/cpumap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/cpumap.c</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/disasm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/disasm.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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/hashtab.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/hashtab.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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/helpers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/helpers.c</a></td><td class='right'>131</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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/inode.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/local_storage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/local_storage.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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/lpm_trie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/lpm_trie.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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/queue_stack_maps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/queue_stack_maps.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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/syscall.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/syscall.c</a></td><td class='right'>186</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='/openslx/kernel-qcow2-linux.git/diff/kernel/bpf/verifier.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/bpf/verifier.c</a></td><td class='right'>819</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='/openslx/kernel-qcow2-linux.git/diff/kernel/cgroup/cpuset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/cgroup/cpuset.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/cpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/cpu.c</a></td><td class='right'>111</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='/openslx/kernel-qcow2-linux.git/diff/kernel/dma/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/dma/debug.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/dma/swiotlb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/dma/swiotlb.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='/openslx/kernel-qcow2-linux.git/diff/kernel/events/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/events/core.c</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/kernel/events/ring_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/events/ring_buffer.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/events/uprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/events/uprobes.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='/openslx/kernel-qcow2-linux.git/diff/kernel/fail_function.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/fail_function.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='/openslx/kernel-qcow2-linux.git/diff/kernel/fork.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/fork.c</a></td><td class='right'>132</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='/openslx/kernel-qcow2-linux.git/diff/kernel/futex.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/futex.c</a></td><td class='right'>192</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/gen_ikh_data.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/gen_ikh_data.sh</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/kernel/iomem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/iomem.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/chip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/chip.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/devres.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/devres.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/handle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/handle.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/irqdesc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/irqdesc.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/manage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/manage.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/spurious.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/spurious.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='/openslx/kernel-qcow2-linux.git/diff/kernel/irq/timings.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq/timings.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/irq_work.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/irq_work.c</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/kernel/jump_label.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/jump_label.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/kernel/kexec_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/kexec_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='/openslx/kernel-qcow2-linux.git/diff/kernel/kexec_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/kexec_file.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='/openslx/kernel-qcow2-linux.git/diff/kernel/kheaders.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/kheaders.c</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/kernel/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/kprobes.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='/openslx/kernel-qcow2-linux.git/diff/kernel/latencytop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/latencytop.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/livepatch/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/livepatch/core.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/livepatch/transition.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/livepatch/transition.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/lock_events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/lock_events.c</a></td><td class='right'>179</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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/lock_events.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/lock_events.h</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/lock_events_list.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/lock_events_list.h</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/lockdep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/lockdep.c</a></td><td class='right'>377</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/lockdep_internals.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/lockdep_internals.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/locktorture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/locktorture.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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/percpu-rwsem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/percpu-rwsem.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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/qspinlock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/qspinlock.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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/qspinlock_paravirt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/qspinlock_paravirt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/qspinlock_stat.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/qspinlock_stat.h</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: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/rwsem-spinlock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/rwsem-spinlock.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: 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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/rwsem-xadd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/rwsem-xadd.c</a></td><td class='right'>204</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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/rwsem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/rwsem.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/rwsem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/rwsem.h</a></td><td class='right'>174</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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/spinlock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/spinlock.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='/openslx/kernel-qcow2-linux.git/diff/kernel/locking/spinlock_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/locking/spinlock_debug.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='/openslx/kernel-qcow2-linux.git/diff/kernel/module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/module.c</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/kernel/padata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/padata.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='/openslx/kernel-qcow2-linux.git/diff/kernel/panic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/panic.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='/openslx/kernel-qcow2-linux.git/diff/kernel/power/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/power/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='/openslx/kernel-qcow2-linux.git/diff/kernel/power/hibernate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/power/hibernate.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/power/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/power/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/power/snapshot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/power/snapshot.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='/openslx/kernel-qcow2-linux.git/diff/kernel/power/suspend.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/power/suspend.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/power/user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/power/user.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='/openslx/kernel-qcow2-linux.git/diff/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/ptrace.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/rcu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/rcu.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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/rcuperf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/rcuperf.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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/rcutorture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/rcutorture.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/srcutiny.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/srcutiny.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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/srcutree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/srcutree.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/tiny.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/tiny.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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/tree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/tree.c</a></td><td class='right'>510</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/tree.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/tree.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/tree_exp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/tree_exp.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/tree_plugin.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/tree_plugin.h</a></td><td class='right'>257</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='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/tree_stall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/tree_stall.h</a></td><td class='right'>709</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/rcu/update.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rcu/update.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/resource.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/resource.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/rseq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/rseq.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/core.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/cpufreq.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/cpufreq_schedutil.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/cpufreq_schedutil.c</a></td><td class='right'>72</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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/deadline.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/deadline.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/debug.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/fair.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/fair.c</a></td><td class='right'>144</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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/isolation.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/isolation.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/rt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/rt.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/sched.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/sched/topology.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sched/topology.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/seccomp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/seccomp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/signal.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/kernel/softirq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/softirq.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/stacktrace.c</a></td><td class='right'>333</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/stop_machine.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/stop_machine.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sys_ni.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sys_ni.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='/openslx/kernel-qcow2-linux.git/diff/kernel/sysctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/sysctl.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='/openslx/kernel-qcow2-linux.git/diff/kernel/taskstats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/taskstats.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/time/alarmtimer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/alarmtimer.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/clockevents.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/clockevents.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/time/jiffies.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/jiffies.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/ntp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/ntp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/time/ntp_internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/ntp_internal.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/sched_clock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/sched_clock.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/tick-broadcast.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/tick-broadcast.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/tick-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/tick-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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/tick-internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/tick-internal.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/tick-sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/tick-sched.c</a></td><td class='right'>49</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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/tick-sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/tick-sched.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/time/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/time.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/time/timekeeping.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/timekeeping.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/timekeeping.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/timekeeping.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='/openslx/kernel-qcow2-linux.git/diff/kernel/time/timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/time/timer.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/torture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/torture.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/bpf_trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/bpf_trace.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/ftrace.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/ring_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/ring_buffer.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/trace.c</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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace_branch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/trace_branch.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace_dynevent.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/trace_dynevent.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace_events_hist.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/trace_events_hist.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace_stack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/trace_stack.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.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='/openslx/kernel-qcow2-linux.git/diff/kernel/trace/trace_syscalls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/trace/trace_syscalls.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='/openslx/kernel-qcow2-linux.git/diff/kernel/watchdog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/watchdog.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/kernel/watchdog_hld.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/watchdog_hld.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='/openslx/kernel-qcow2-linux.git/diff/kernel/workqueue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/workqueue.c</a></td><td class='right'>71</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='/openslx/kernel-qcow2-linux.git/diff/kernel/workqueue_internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>kernel/workqueue_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='/openslx/kernel-qcow2-linux.git/diff/lib/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/Kconfig.debug?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/Kconfig.debug</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/asn1_decoder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/asn1_decoder.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='/openslx/kernel-qcow2-linux.git/diff/lib/cmdline.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/cmdline.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='/openslx/kernel-qcow2-linux.git/diff/lib/crc-t10dif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/crc-t10dif.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='/openslx/kernel-qcow2-linux.git/diff/lib/digsig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/digsig.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='/openslx/kernel-qcow2-linux.git/diff/lib/error-inject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/error-inject.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='/openslx/kernel-qcow2-linux.git/diff/lib/fault-inject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/fault-inject.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/iov_iter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/iov_iter.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='/openslx/kernel-qcow2-linux.git/diff/lib/kobject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/kobject.c</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/lib/kobject_uevent.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/kobject_uevent.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/libcrc32c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/libcrc32c.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='/openslx/kernel-qcow2-linux.git/diff/lib/lzo/lzo1x_compress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/lzo/lzo1x_compress.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='/openslx/kernel-qcow2-linux.git/diff/lib/lzo/lzo1x_decompress_safe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/lzo/lzo1x_decompress_safe.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='/openslx/kernel-qcow2-linux.git/diff/lib/nlattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/nlattr.c</a></td><td class='right'>200</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/packing.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/packing.c</a></td><td class='right'>213</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='/openslx/kernel-qcow2-linux.git/diff/lib/percpu-refcount.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/percpu-refcount.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='/openslx/kernel-qcow2-linux.git/diff/lib/rhashtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/rhashtable.c</a></td><td class='right'>218</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='/openslx/kernel-qcow2-linux.git/diff/lib/sbitmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/sbitmap.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/siphash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/siphash.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.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='/openslx/kernel-qcow2-linux.git/diff/lib/stackdepot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/stackdepot.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/lib/string.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/string.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/lib/strncpy_from_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/strncpy_from_user.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='/openslx/kernel-qcow2-linux.git/diff/lib/strnlen_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/strnlen_user.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='/openslx/kernel-qcow2-linux.git/diff/lib/syscall.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/syscall.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.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='/openslx/kernel-qcow2-linux.git/diff/lib/test_bitmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/test_bitmap.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.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='/openslx/kernel-qcow2-linux.git/diff/lib/test_printf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/test_printf.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.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='/openslx/kernel-qcow2-linux.git/diff/lib/test_rhashtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/test_rhashtable.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='/openslx/kernel-qcow2-linux.git/diff/lib/test_strscpy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/test_strscpy.c</a></td><td class='right'>150</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='/openslx/kernel-qcow2-linux.git/diff/lib/test_vmalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/test_vmalloc.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='/openslx/kernel-qcow2-linux.git/diff/lib/ubsan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/ubsan.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.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='/openslx/kernel-qcow2-linux.git/diff/lib/ubsan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/ubsan.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='/openslx/kernel-qcow2-linux.git/diff/lib/vsprintf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/vsprintf.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/lib/zstd/bitstream.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/zstd/bitstream.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='/openslx/kernel-qcow2-linux.git/diff/lib/zstd/compress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/zstd/compress.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='/openslx/kernel-qcow2-linux.git/diff/lib/zstd/decompress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/zstd/decompress.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='/openslx/kernel-qcow2-linux.git/diff/lib/zstd/huf_compress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>lib/zstd/huf_compress.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='/openslx/kernel-qcow2-linux.git/diff/mm/compaction.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/compaction.c</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.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='/openslx/kernel-qcow2-linux.git/diff/mm/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/debug.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='/openslx/kernel-qcow2-linux.git/diff/mm/gup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/gup.c</a></td><td class='right'>48</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='/openslx/kernel-qcow2-linux.git/diff/mm/huge_memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/huge_memory.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/mm/hugetlb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/hugetlb.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/kasan/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/kasan/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/kasan/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/kasan/common.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/kasan/kasan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/kasan/kasan.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='/openslx/kernel-qcow2-linux.git/diff/mm/kasan/report.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/kasan/report.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='/openslx/kernel-qcow2-linux.git/diff/mm/kmemleak.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/kmemleak.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/madvise.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/madvise.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='/openslx/kernel-qcow2-linux.git/diff/mm/memblock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/memblock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/memcontrol.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/memcontrol.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/memory.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/memory_hotplug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/memory_hotplug.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/mempolicy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/mempolicy.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/mm/migrate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/migrate.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/mm/mmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/mmap.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='/openslx/kernel-qcow2-linux.git/diff/mm/mmu_gather.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/mmu_gather.c</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/mm/page_alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/page_alloc.c</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/mm/page_isolation.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/page_isolation.c</a></td><td class='right'>51</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='/openslx/kernel-qcow2-linux.git/diff/mm/page_owner.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/page_owner.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/percpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/percpu.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='/openslx/kernel-qcow2-linux.git/diff/mm/shmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/shmem.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/slab.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/slab.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/slab.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/slab.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='/openslx/kernel-qcow2-linux.git/diff/mm/slab_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/slab_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='/openslx/kernel-qcow2-linux.git/diff/mm/slub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/slub.c</a></td><td class='right'>26</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/mm/sparse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/sparse.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='/openslx/kernel-qcow2-linux.git/diff/mm/swapfile.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/swapfile.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/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='/openslx/kernel-qcow2-linux.git/diff/mm/vmalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/vmalloc.c</a></td><td class='right'>113</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='/openslx/kernel-qcow2-linux.git/diff/mm/vmscan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/vmscan.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.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='/openslx/kernel-qcow2-linux.git/diff/mm/vmstat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>mm/vmstat.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='/openslx/kernel-qcow2-linux.git/diff/net/6lowpan/nhc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/6lowpan/nhc.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='/openslx/kernel-qcow2-linux.git/diff/net/8021q/vlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/8021q/vlan.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/8021q/vlan_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/8021q/vlan_dev.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.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='/openslx/kernel-qcow2-linux.git/diff/net/8021q/vlan_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/8021q/vlan_netlink.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/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='/openslx/kernel-qcow2-linux.git/diff/net/appletalk/aarp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/appletalk/aarp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/appletalk/ddp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/appletalk/ddp.c</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/atm/clip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/atm/clip.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='/openslx/kernel-qcow2-linux.git/diff/net/atm/ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/atm/ioctl.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.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='/openslx/kernel-qcow2-linux.git/diff/net/atm/lec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/atm/lec.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='/openslx/kernel-qcow2-linux.git/diff/net/atm/pvc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/atm/pvc.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='/openslx/kernel-qcow2-linux.git/diff/net/atm/svc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/atm/svc.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='/openslx/kernel-qcow2-linux.git/diff/net/ax25/af_ax25.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ax25/af_ax25.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_algo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_algo.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_algo.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_algo.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_iv_ogm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_iv_ogm.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_iv_ogm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_iv_ogm.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_v.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_v.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_v.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_v.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_v_elp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_v_elp.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_v_elp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_v_elp.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_v_ogm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_v_ogm.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bat_v_ogm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bat_v_ogm.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bitarray.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bitarray.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bitarray.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bitarray.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bridge_loop_avoidance.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bridge_loop_avoidance.c</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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/bridge_loop_avoidance.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/bridge_loop_avoidance.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/debugfs.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/debugfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/distributed-arp-table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/distributed-arp-table.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/distributed-arp-table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/distributed-arp-table.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/fragmentation.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/fragmentation.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/fragmentation.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/fragmentation.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/gateway_client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/gateway_client.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/gateway_client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/gateway_client.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/gateway_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/gateway_common.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/gateway_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/gateway_common.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/hard-interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/hard-interface.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/hard-interface.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/hard-interface.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/hash.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/hash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/hash.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/icmp_socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/icmp_socket.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/icmp_socket.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/icmp_socket.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/log.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/log.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/log.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/log.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/main.c</a></td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/multicast.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/multicast.c</a></td><td class='right'>211</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: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/multicast.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/multicast.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/netlink.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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/netlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/network-coding.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/network-coding.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/network-coding.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/network-coding.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/originator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/originator.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/originator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/originator.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/routing.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/routing.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/routing.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/routing.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/send.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/send.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/send.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/send.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/soft-interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/soft-interface.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/soft-interface.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/soft-interface.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/sysfs.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/sysfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/sysfs.h</a></td><td class='right'>50</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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/tp_meter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/tp_meter.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/tp_meter.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/tp_meter.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/trace.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/translation-table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/translation-table.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/translation-table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/translation-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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/tvlv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/tvlv.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/tvlv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/tvlv.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.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='/openslx/kernel-qcow2-linux.git/diff/net/batman-adv/types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/batman-adv/types.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.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/af_bluetooth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/af_bluetooth.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/amp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/amp.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/hci_conn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/hci_conn.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/hci_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/hci_core.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/hci_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/hci_event.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/hci_request.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/hci_request.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/hci_request.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/hci_request.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/hidp/sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/hidp/sock.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/l2cap_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/l2cap_core.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/l2cap_sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/l2cap_sock.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/mgmt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/rfcomm/sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/rfcomm/sock.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/sco.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/sco.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='/openslx/kernel-qcow2-linux.git/diff/net/bluetooth/smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bluetooth/smp.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='/openslx/kernel-qcow2-linux.git/diff/net/bpf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/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='/openslx/kernel-qcow2-linux.git/diff/net/bpf/test_run.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bpf/test_run.c</a></td><td class='right'>203</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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_arp_nd_proxy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_arp_nd_proxy.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_fdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_fdb.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_forward.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_forward.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.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_if.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_input.c</a></td><td class='right'>100</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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_mdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_mdb.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_multicast.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_multicast.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.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_netfilter_hooks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_netfilter_hooks.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_netfilter_ipv6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_netfilter_ipv6.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_netlink.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_netlink_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_netlink_tunnel.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_private.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_private.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.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_stp_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_stp_if.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_vlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_vlan.c</a></td><td class='right'>215</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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/br_vlan_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/br_vlan_tunnel.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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/netfilter/ebtable_broute.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/netfilter/ebtable_broute.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/net/bridge/netfilter/ebtables.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/bridge/netfilter/ebtables.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='/openslx/kernel-qcow2-linux.git/diff/net/caif/caif_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/caif/caif_dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/can/af_can.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/can/af_can.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='/openslx/kernel-qcow2-linux.git/diff/net/can/bcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/can/bcm.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='/openslx/kernel-qcow2-linux.git/diff/net/can/gw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/can/gw.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='/openslx/kernel-qcow2-linux.git/diff/net/can/raw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/can/raw.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='/openslx/kernel-qcow2-linux.git/diff/net/ceph/ceph_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ceph/ceph_common.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ceph/messenger.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ceph/messenger.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='/openslx/kernel-qcow2-linux.git/diff/net/ceph/mon_client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ceph/mon_client.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='/openslx/kernel-qcow2-linux.git/diff/net/ceph/osd_client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ceph/osd_client.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='/openslx/kernel-qcow2-linux.git/diff/net/compat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/compat.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.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='/openslx/kernel-qcow2-linux.git/diff/net/core/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/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='/openslx/kernel-qcow2-linux.git/diff/net/core/bpf_sk_storage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/bpf_sk_storage.c</a></td><td class='right'>804</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/core/datagram.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/datagram.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.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='/openslx/kernel-qcow2-linux.git/diff/net/core/datagram.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/datagram.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/core/dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/dev.c</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/net/core/dev_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/dev_ioctl.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='/openslx/kernel-qcow2-linux.git/diff/net/core/devlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/devlink.c</a></td><td class='right'>427</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: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/core/drop_monitor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/drop_monitor.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='/openslx/kernel-qcow2-linux.git/diff/net/core/dst.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/dst.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.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='/openslx/kernel-qcow2-linux.git/diff/net/core/ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/ethtool.c</a></td><td class='right'>48</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='/openslx/kernel-qcow2-linux.git/diff/net/core/failover.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/failover.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='/openslx/kernel-qcow2-linux.git/diff/net/core/fib_rules.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/fib_rules.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='/openslx/kernel-qcow2-linux.git/diff/net/core/filter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/filter.c</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/core/flow_dissector.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/flow_dissector.c</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/net/core/gen_stats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/gen_stats.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='/openslx/kernel-qcow2-linux.git/diff/net/core/lwt_bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/lwt_bpf.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='/openslx/kernel-qcow2-linux.git/diff/net/core/lwtunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/lwtunnel.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='/openslx/kernel-qcow2-linux.git/diff/net/core/neighbour.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/neighbour.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.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='/openslx/kernel-qcow2-linux.git/diff/net/core/net-procfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/net-procfs.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='/openslx/kernel-qcow2-linux.git/diff/net/core/net-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/net-sysfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/core/net_namespace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/net_namespace.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/core/netpoll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/netpoll.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='/openslx/kernel-qcow2-linux.git/diff/net/core/netprio_cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/netprio_cgroup.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='/openslx/kernel-qcow2-linux.git/diff/net/core/pktgen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/pktgen.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='/openslx/kernel-qcow2-linux.git/diff/net/core/ptp_classifier.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/ptp_classifier.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='/openslx/kernel-qcow2-linux.git/diff/net/core/rtnetlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/rtnetlink.c</a></td><td class='right'>166</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='/openslx/kernel-qcow2-linux.git/diff/net/core/skbuff.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/skbuff.c</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/net/core/sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/sock.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/net/core/sock_reuseport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/sock_reuseport.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='/openslx/kernel-qcow2-linux.git/diff/net/core/sysctl_net_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/core/sysctl_net_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='/openslx/kernel-qcow2-linux.git/diff/net/dcb/dcbnl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dcb/dcbnl.c</a></td><td class='right'>130</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='/openslx/kernel-qcow2-linux.git/diff/net/dccp/feat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dccp/feat.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='/openslx/kernel-qcow2-linux.git/diff/net/dccp/ipv4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dccp/ipv4.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='/openslx/kernel-qcow2-linux.git/diff/net/dccp/ipv6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dccp/ipv6.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='/openslx/kernel-qcow2-linux.git/diff/net/decnet/af_decnet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/decnet/af_decnet.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='/openslx/kernel-qcow2-linux.git/diff/net/decnet/dn_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/decnet/dn_dev.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='/openslx/kernel-qcow2-linux.git/diff/net/decnet/dn_fib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/decnet/dn_fib.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='/openslx/kernel-qcow2-linux.git/diff/net/decnet/dn_route.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/decnet/dn_route.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='/openslx/kernel-qcow2-linux.git/diff/net/decnet/dn_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/decnet/dn_table.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='/openslx/kernel-qcow2-linux.git/diff/net/dns_resolver/dns_query.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dns_resolver/dns_query.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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/Kconfig</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>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.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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/dsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/dsa.c</a></td><td class='right'>177</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/dsa/dsa2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/dsa2.c</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/dsa_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/dsa_priv.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.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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/legacy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/legacy.c</a></td><td class='right'>745</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/port.c</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/slave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/slave.c</a></td><td class='right'>139</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/switch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/switch.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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_8021q.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_8021q.c</a></td><td class='right'>222</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_brcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_brcm.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_dsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_dsa.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_edsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_edsa.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_gswip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_gswip.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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_ksz.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_ksz.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_lan9303.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_lan9303.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.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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_mtk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_mtk.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_qca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_qca.c</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_sja1105.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_sja1105.c</a></td><td class='right'>131</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='/openslx/kernel-qcow2-linux.git/diff/net/dsa/tag_trailer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/dsa/tag_trailer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ethernet/eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ethernet/eth.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/hsr/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_debugfs.c</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_device.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.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_device.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_device.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_forward.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_forward.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.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_forward.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_forward.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_framereg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_framereg.c</a></td><td class='right'>127</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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_framereg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_framereg.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_main.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.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_main.h</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_netlink.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.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_netlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_netlink.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_slave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_slave.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.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='/openslx/kernel-qcow2-linux.git/diff/net/hsr/hsr_slave.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/hsr/hsr_slave.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='/openslx/kernel-qcow2-linux.git/diff/net/ieee802154/ieee802154.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ieee802154/ieee802154.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='/openslx/kernel-qcow2-linux.git/diff/net/ieee802154/netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ieee802154/netlink.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='/openslx/kernel-qcow2-linux.git/diff/net/ieee802154/nl802154.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ieee802154/nl802154.c</a></td><td class='right'>139</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='/openslx/kernel-qcow2-linux.git/diff/net/ieee802154/socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ieee802154/socket.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/af_inet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/af_inet.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/bpfilter/sockopt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/bpfilter/sockopt.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/devinet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/devinet.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/esp4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/esp4.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/esp4_offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/esp4_offload.c</a></td><td class='right'>58</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/fib_frontend.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/fib_frontend.c</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/fib_lookup.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/fib_lookup.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/fib_semantics.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/fib_semantics.c</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/fib_trie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/fib_trie.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/fou.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/fou.c</a></td><td class='right'>157</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/inet_connection_sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/inet_connection_sock.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_forward.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_forward.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_gre.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_gre.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_input.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_options.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_options.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_output.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_tunnel_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_tunnel_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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ip_vti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ip_vti.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ipmr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ipmr.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/ipmr_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/ipmr_base.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/netfilter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/netfilter/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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/netfilter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/netfilter/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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/netfilter/ipt_CLUSTERIP.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/netfilter/ipt_CLUSTERIP.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/netfilter/nf_nat_h323.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/netfilter/nf_nat_h323.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/netfilter/nf_nat_pptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/netfilter/nf_nat_pptp.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/netfilter/nft_chain_route_ipv4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/netfilter/nft_chain_route_ipv4.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/route.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/route.c</a></td><td class='right'>259</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/syncookies.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/syncookies.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/sysctl_net_ipv4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_dctcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_dctcp.c</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_input.c</a></td><td class='right'>121</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_ipv4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_metrics.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_metrics.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_minisocks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_minisocks.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_output.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/tcp_timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/tcp_timer.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/udp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/udp.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/udp_offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/udp_offload.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/xfrm4_mode_beet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/xfrm4_mode_beet.c</a></td><td class='right'>155</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/xfrm4_mode_transport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/xfrm4_mode_transport.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/xfrm4_mode_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/xfrm4_mode_tunnel.c</a></td><td class='right'>152</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/xfrm4_output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/xfrm4_output.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/xfrm4_policy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/xfrm4_policy.c</a></td><td class='right'>134</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv4/xfrm4_protocol.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv4/xfrm4_protocol.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/addrconf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/addrconf.c</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/addrconf_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/addrconf_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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/addrlabel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/addrlabel.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/af_inet6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/af_inet6.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/esp6_offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/esp6_offload.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/fib6_rules.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/fib6_rules.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/icmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/icmp.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ila/ila_lwt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ila/ila_lwt.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ila/ila_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ila/ila_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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ila/ila_xlat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ila/ila_xlat.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_fib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_fib.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_flowlabel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_flowlabel.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_gre.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_gre.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_input.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_output.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_tunnel.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6_vti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6_vti.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ip6mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ip6mr.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/ndisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/ndisc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/netfilter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/netfilter/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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/netfilter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/netfilter/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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/netfilter/ip6t_MASQUERADE.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/netfilter/ip6t_MASQUERADE.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/netfilter/ip6t_srh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/netfilter/ip6t_srh.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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/netfilter/nft_chain_route_ipv6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/netfilter/nft_chain_route_ipv6.c</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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/output_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/output_core.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/raw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/raw.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/route.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/route.c</a></td><td class='right'>1237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/seg6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/seg6.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/seg6_iptunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/seg6_iptunnel.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/seg6_local.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/seg6_local.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/sit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/sit.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/tcp_ipv6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/udp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/udp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_mode_beet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_mode_beet.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_mode_ro.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_mode_ro.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_mode_transport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_mode_transport.c</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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_mode_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_mode_tunnel.c</a></td><td class='right'>151</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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_output.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_policy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_policy.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_protocol.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_protocol.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='/openslx/kernel-qcow2-linux.git/diff/net/ipv6/xfrm6_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ipv6/xfrm6_tunnel.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='/openslx/kernel-qcow2-linux.git/diff/net/kcm/kcmsock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/kcm/kcmsock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/key/af_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/key/af_key.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='/openslx/kernel-qcow2-linux.git/diff/net/l2tp/l2tp_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/l2tp/l2tp_core.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/l2tp/l2tp_ip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/l2tp/l2tp_ip.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='/openslx/kernel-qcow2-linux.git/diff/net/l2tp/l2tp_ip6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/l2tp/l2tp_ip6.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='/openslx/kernel-qcow2-linux.git/diff/net/l2tp/l2tp_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/l2tp/l2tp_netlink.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/l2tp/l2tp_ppp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/l2tp/l2tp_ppp.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='/openslx/kernel-qcow2-linux.git/diff/net/llc/af_llc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/llc/af_llc.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/cfg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/cfg.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/debugfs.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/debugfs_netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/debugfs_netdev.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/driver-ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/driver-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/driver-ops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/driver-ops.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/ht.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/ht.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/ieee80211_i.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/ieee80211_i.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/iface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/iface.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/key.c</a></td><td class='right'>96</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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/key.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/key.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/main.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/mesh.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/mesh.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/mesh_hwmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/mesh_hwmp.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.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/mesh_pathtbl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/mesh_pathtbl.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/mlme.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/rc80211_minstrel_ht.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/rc80211_minstrel_ht.c</a></td><td class='right'>124</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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/rc80211_minstrel_ht.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/rc80211_minstrel_ht.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/rx.c</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/sta_info.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/sta_info.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/tdls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/tdls.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/trace.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/trace_msg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/trace_msg.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/tx.c</a></td><td class='right'>166</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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/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.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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/wme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/wme.c</a></td><td class='right'>82</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='/openslx/kernel-qcow2-linux.git/diff/net/mac80211/wme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mac80211/wme.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='/openslx/kernel-qcow2-linux.git/diff/net/mpls/af_mpls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mpls/af_mpls.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.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='/openslx/kernel-qcow2-linux.git/diff/net/mpls/mpls_iptunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/mpls/mpls_iptunnel.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/ncsi/ncsi-netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ncsi/ncsi-netlink.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.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='/openslx/kernel-qcow2-linux.git/diff/net/ncsi/ncsi-rsp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/ncsi/ncsi-rsp.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/core.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipset/ip_set_bitmap_gen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipset/ip_set_bitmap_gen.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipset/ip_set_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipset/ip_set_core.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.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipset/ip_set_hash_gen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipset/ip_set_hash_gen.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipset/ip_set_list_set.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipset/ip_set_list_set.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipvs/ip_vs_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipvs/ip_vs_core.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipvs/ip_vs_ctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipvs/ip_vs_ctl.c</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/ipvs/ip_vs_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/ipvs/ip_vs_xmit.c</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_amanda.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_amanda.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_core.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_expect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_expect.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_ftp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_ftp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_helper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_helper.c</a></td><td class='right'>86</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_irc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_irc.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>135</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_proto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_proto.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_proto_dccp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_proto_dccp.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_proto_icmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_proto_icmp.c</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_proto_icmpv6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_proto_icmpv6.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.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_proto_sctp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_proto_sctp.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_proto_tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_proto_tcp.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_sane.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_sane.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_sip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_sip.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_standalone.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>48</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_tftp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_tftp.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_conntrack_timeout.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_conntrack_timeout.c</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_flow_table_ip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_flow_table_ip.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_internals.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_internals.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_amanda.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_amanda.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_core.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.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_ftp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_ftp.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_irc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_irc.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_masquerade.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_masquerade.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.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_proto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_proto.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_sip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_sip.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_nat_tftp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_nat_tftp.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_queue.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_tables_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_tables_api.c</a></td><td class='right'>101</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nf_tables_set_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nf_tables_set_core.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink_acct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink_acct.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink_cthelper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink_cthelper.c</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.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink_cttimeout.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink_cttimeout.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink_log.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink_log.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink_osf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink_osf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nfnetlink_queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nfnetlink_queue.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_chain_nat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_chain_nat.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_chain_route.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_chain_route.c</a></td><td class='right'>169</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_compat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_compat.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_ct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_ct.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_dynset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_dynset.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_masq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_masq.c</a></td><td class='right'>83</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_nat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_nat.c</a></td><td class='right'>58</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_objref.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_objref.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_osf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_osf.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_redir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_redir.c</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_set_rbtree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_set_rbtree.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/nft_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/nft_tunnel.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/x_tables.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/x_tables.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/xt_CT.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/xt_CT.c</a></td><td class='right'>93</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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/xt_MASQUERADE.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/xt_MASQUERADE.c</a> (renamed from net/ipv4/netfilter/ipt_MASQUERADE.c)</td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/xt_connlabel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/xt_connlabel.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/xt_hashlimit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/xt_hashlimit.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='/openslx/kernel-qcow2-linux.git/diff/net/netfilter/xt_time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netfilter/xt_time.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netlabel/netlabel_calipso.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netlabel/netlabel_calipso.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='/openslx/kernel-qcow2-linux.git/diff/net/netlabel/netlabel_cipso_v4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netlabel/netlabel_cipso_v4.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/net/netlabel/netlabel_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netlabel/netlabel_mgmt.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/netlabel/netlabel_unlabeled.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netlabel/netlabel_unlabeled.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/netlink/af_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netlink/af_netlink.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='/openslx/kernel-qcow2-linux.git/diff/net/netlink/genetlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netlink/genetlink.c</a></td><td class='right'>55</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='/openslx/kernel-qcow2-linux.git/diff/net/netrom/af_netrom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netrom/af_netrom.c</a></td><td class='right'>90</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='/openslx/kernel-qcow2-linux.git/diff/net/netrom/nr_loopback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netrom/nr_loopback.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='/openslx/kernel-qcow2-linux.git/diff/net/netrom/nr_route.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netrom/nr_route.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='/openslx/kernel-qcow2-linux.git/diff/net/netrom/sysctl_net_netrom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/netrom/sysctl_net_netrom.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='/openslx/kernel-qcow2-linux.git/diff/net/nfc/llcp_sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/nfc/llcp_sock.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='/openslx/kernel-qcow2-linux.git/diff/net/nfc/nci/hci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/nfc/nci/hci.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='/openslx/kernel-qcow2-linux.git/diff/net/nfc/netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/nfc/netlink.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.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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/actions.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/actions.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/conntrack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/conntrack.c</a></td><td class='right'>97</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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/datapath.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/datapath.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/flow_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/flow_netlink.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/meter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/meter.c</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/vport-vxlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/vport-vxlan.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='/openslx/kernel-qcow2-linux.git/diff/net/openvswitch/vport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/openvswitch/vport.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='/openslx/kernel-qcow2-linux.git/diff/net/packet/af_packet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/packet/af_packet.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/net/packet/diag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/packet/diag.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='/openslx/kernel-qcow2-linux.git/diff/net/phonet/pn_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/phonet/pn_netlink.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='/openslx/kernel-qcow2-linux.git/diff/net/psample/psample.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/psample/psample.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='/openslx/kernel-qcow2-linux.git/diff/net/qrtr/qrtr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/qrtr/qrtr.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='/openslx/kernel-qcow2-linux.git/diff/net/rds/af_rds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rds/af_rds.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='/openslx/kernel-qcow2-linux.git/diff/net/rds/bind.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rds/bind.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='/openslx/kernel-qcow2-linux.git/diff/net/rds/ib_fmr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rds/ib_fmr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/rds/ib_rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rds/ib_rdma.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='/openslx/kernel-qcow2-linux.git/diff/net/rds/ib_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rds/ib_recv.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='/openslx/kernel-qcow2-linux.git/diff/net/rds/tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rds/tcp.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='/openslx/kernel-qcow2-linux.git/diff/net/rfkill/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rfkill/core.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='/openslx/kernel-qcow2-linux.git/diff/net/rose/af_rose.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rose/af_rose.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='/openslx/kernel-qcow2-linux.git/diff/net/rose/rose_loopback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rose/rose_loopback.c</a></td><td class='right'>27</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/rose/rose_subr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rose/rose_subr.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/af_rxrpc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/af_rxrpc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/ar-internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/ar-internal.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='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/call_object.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/call_object.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.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='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/conn_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/conn_event.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/input.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/local_object.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/local_object.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='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/output.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/peer_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/peer_event.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='/openslx/kernel-qcow2-linux.git/diff/net/rxrpc/sendmsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/rxrpc/sendmsg.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/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='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_api.c</a></td><td class='right'>141</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='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_bpf.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_connmark.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_connmark.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_csum.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_csum.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_gact.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_gact.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_ife.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_ife.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_ipt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_ipt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_mirred.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_mirred.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_nat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_nat.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_pedit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_pedit.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_police.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_police.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_sample.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_sample.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_simple.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_simple.c</a></td><td class='right'>57</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='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_skbedit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_skbedit.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_skbmod.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_skbmod.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_tunnel_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_tunnel_key.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/act_vlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/act_vlan.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_api.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_basic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_basic.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_bpf.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_cgroup.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_flow.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_flow.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_flower.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_flower.c</a></td><td class='right'>620</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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_fw.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_matchall.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_matchall.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_route.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_route.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_rsvp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_rsvp.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_tcindex.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_tcindex.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/cls_u32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/cls_u32.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/em_ipt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/em_ipt.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/em_meta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/em_meta.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/ematch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/ematch.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_api.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_atm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_atm.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_cake.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_cake.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_cbq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_cbq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_cbs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_cbs.c</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_choke.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_choke.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_codel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_codel.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_drr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_drr.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_dsmark.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_dsmark.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_etf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_etf.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_fq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_fq.c</a></td><td class='right'>115</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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_fq_codel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_fq_codel.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_generic.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_gred.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_gred.c</a></td><td class='right'>25</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_hfsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_hfsc.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_hhf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_hhf.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_htb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_htb.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_ingress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_ingress.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_mq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_mq.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_mqprio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_mqprio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_multiq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_multiq.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_netem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_netem.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_pie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_pie.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_prio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_prio.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_qfq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_qfq.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_red.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_red.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_sfb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_sfb.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='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_taprio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_taprio.c</a></td><td class='right'>749</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sched/sch_tbf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sched/sch_tbf.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/auth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/auth.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/ipv6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/ipv6.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/protocol.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/protocol.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/sm_make_chunk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/sm_make_chunk.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/sm_sideeffect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/sm_sideeffect.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/sm_statefuns.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/sm_statefuns.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sctp/socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/socket.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/stream_interleave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/stream_interleave.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/ulpevent.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/ulpevent.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sctp/ulpqueue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sctp/ulpqueue.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.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='/openslx/kernel-qcow2-linux.git/diff/net/smc/af_smc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/af_smc.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_clc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_clc.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='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_clc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_clc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_close.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_close.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_close.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_close.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='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_core.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.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='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_core.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_ism.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_ism.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='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_pnet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_pnet.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.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='/openslx/kernel-qcow2-linux.git/diff/net/smc/smc_pnet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/smc/smc_pnet.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='/openslx/kernel-qcow2-linux.git/diff/net/socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/socket.c</a></td><td class='right'>358</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='/openslx/kernel-qcow2-linux.git/diff/net/strparser/strparser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/strparser/strparser.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/auth_gss/gss_krb5_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/auth_gss/gss_krb5_crypto.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='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/auth_gss/gss_krb5_mech.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/auth_gss/gss_krb5_mech.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='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/cache.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='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/clnt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/clnt.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.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='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/rpc_pipe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/rpc_pipe.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/xprtrdma/verbs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/xprtrdma/verbs.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='/openslx/kernel-qcow2-linux.git/diff/net/sunrpc/xprtsock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/sunrpc/xprtsock.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/bcast.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/bcast.c</a></td><td class='right'>275</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/tipc/bcast.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/bcast.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/tipc/bearer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/bearer.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.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/core.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/core.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/group.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/group.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/link.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/link.c</a></td><td class='right'>327</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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/link.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/link.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/monitor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/monitor.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/msg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/msg.h</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/name_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/name_table.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/net.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/tipc/netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/netlink.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.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/netlink_compat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/netlink_compat.c</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/node.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/node.c</a></td><td class='right'>126</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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/node.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/node.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/socket.c</a></td><td class='right'>47</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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/sysctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/sysctl.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/topsrv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/topsrv.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='/openslx/kernel-qcow2-linux.git/diff/net/tipc/udp_media.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tipc/udp_media.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.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='/openslx/kernel-qcow2-linux.git/diff/net/tls/tls_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tls/tls_device.c</a></td><td class='right'>99</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='/openslx/kernel-qcow2-linux.git/diff/net/tls/tls_device_fallback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tls/tls_device_fallback.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/tls/tls_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tls/tls_main.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/net/tls/tls_sw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/tls/tls_sw.c</a></td><td class='right'>93</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='/openslx/kernel-qcow2-linux.git/diff/net/unix/af_unix.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/unix/af_unix.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='/openslx/kernel-qcow2-linux.git/diff/net/wimax/stack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wimax/stack.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='/openslx/kernel-qcow2-linux.git/diff/net/wireless/lib80211_crypt_tkip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/lib80211_crypt_tkip.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='/openslx/kernel-qcow2-linux.git/diff/net/wireless/nl80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/nl80211.c</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/wireless/pmsr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/pmsr.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.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='/openslx/kernel-qcow2-linux.git/diff/net/wireless/rdev-ops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/rdev-ops.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/wireless/reg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/reg.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/net/wireless/scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/scan.c</a></td><td class='right'>176</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='/openslx/kernel-qcow2-linux.git/diff/net/wireless/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/trace.h</a></td><td class='right'>87</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='/openslx/kernel-qcow2-linux.git/diff/net/wireless/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/util.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/wireless/wext-compat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/wireless/wext-compat.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='/openslx/kernel-qcow2-linux.git/diff/net/x25/af_x25.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/x25/af_x25.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.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='/openslx/kernel-qcow2-linux.git/diff/net/xdp/xdp_umem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xdp/xdp_umem.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.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='/openslx/kernel-qcow2-linux.git/diff/net/xdp/xsk_queue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xdp/xsk_queue.h</a></td><td class='right'>56</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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_device.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_inout.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_inout.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_input.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_interface.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_output.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_output.c</a></td><td class='right'>381</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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_policy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_policy.c</a></td><td class='right'>282</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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_state.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_state.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.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='/openslx/kernel-qcow2-linux.git/diff/net/xfrm/xfrm_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>net/xfrm/xfrm_user.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.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='/openslx/kernel-qcow2-linux.git/diff/samples/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/samples/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/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='/openslx/kernel-qcow2-linux.git/diff/samples/bpf/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/bpf/.gitignore</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='/openslx/kernel-qcow2-linux.git/diff/samples/bpf/asm_goto_workaround.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/bpf/asm_goto_workaround.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='/openslx/kernel-qcow2-linux.git/diff/samples/bpf/offwaketime_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/bpf/offwaketime_user.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='/openslx/kernel-qcow2-linux.git/diff/samples/bpf/sampleip_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/bpf/sampleip_user.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='/openslx/kernel-qcow2-linux.git/diff/samples/bpf/spintest_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/bpf/spintest_user.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='/openslx/kernel-qcow2-linux.git/diff/samples/bpf/trace_event_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/bpf/trace_event_user.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='/openslx/kernel-qcow2-linux.git/diff/samples/kobject/kset-example.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/kobject/kset-example.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/samples/pidfd/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/pidfd/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='/openslx/kernel-qcow2-linux.git/diff/samples/pidfd/pidfd-metadata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/pidfd/pidfd-metadata.c</a></td><td class='right'>112</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='/openslx/kernel-qcow2-linux.git/diff/samples/seccomp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/seccomp/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='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/samples/vfs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/vfs/Makefile</a> (renamed from samples/statx/Makefile)</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='/openslx/kernel-qcow2-linux.git/diff/samples/vfs/test-fsmount.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/vfs/test-fsmount.c</a></td><td class='right'>133</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='/openslx/kernel-qcow2-linux.git/diff/samples/vfs/test-statx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>samples/vfs/test-statx.c</a> (renamed from samples/statx/test-statx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/Makefile.build?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/Makefile.build</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/Makefile.host?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/Makefile.host</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='/openslx/kernel-qcow2-linux.git/diff/scripts/Makefile.lib?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/Makefile.lib</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='/openslx/kernel-qcow2-linux.git/diff/scripts/Makefile.modbuiltin?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/Makefile.modbuiltin</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='/openslx/kernel-qcow2-linux.git/diff/scripts/Makefile.modpost?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/Makefile.modpost</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='/openslx/kernel-qcow2-linux.git/diff/scripts/Makefile.ubsan?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/Makefile.ubsan</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='/openslx/kernel-qcow2-linux.git/diff/scripts/atomic/gen-atomics.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/atomic/gen-atomics.sh</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/checkpatch.pl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/checkpatch.pl</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/coccinelle/api/stream_open.cocci?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/coccinelle/api/stream_open.cocci</a></td><td class='right'>363</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='/openslx/kernel-qcow2-linux.git/diff/scripts/coccinelle/free/put_device.cocci?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/coccinelle/free/put_device.cocci</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='/openslx/kernel-qcow2-linux.git/diff/scripts/coccinelle/misc/badty.cocci?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/coccinelle/misc/badty.cocci</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/documentation-file-ref-check?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/documentation-file-ref-check</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/scripts/gcc-plugins/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/gcc-plugins/Kconfig</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.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='/openslx/kernel-qcow2-linux.git/diff/scripts/gdb/linux/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/gdb/linux/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='/openslx/kernel-qcow2-linux.git/diff/scripts/kconfig/lxdialog/inputbox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/kconfig/lxdialog/inputbox.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='/openslx/kernel-qcow2-linux.git/diff/scripts/kconfig/nconf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/kconfig/nconf.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='/openslx/kernel-qcow2-linux.git/diff/scripts/kconfig/nconf.gui.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/kconfig/nconf.gui.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/link-vmlinux.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/link-vmlinux.sh</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/mkmakefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/mkmakefile</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.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='/openslx/kernel-qcow2-linux.git/diff/scripts/mod/modpost.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/mod/modpost.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/recordmcount.pl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/recordmcount.pl</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='/openslx/kernel-qcow2-linux.git/diff/scripts/selinux/genheaders/genheaders.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/selinux/genheaders/genheaders.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/selinux/install_policy.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/selinux/install_policy.sh</a></td><td class='right'>92</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='/openslx/kernel-qcow2-linux.git/diff/scripts/selinux/mdp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/selinux/mdp/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='/openslx/kernel-qcow2-linux.git/diff/scripts/selinux/mdp/mdp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/selinux/mdp/mdp.c</a></td><td class='right'>166</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/sphinx-pre-install?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/sphinx-pre-install</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/scripts/tags.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>scripts/tags.sh</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='/openslx/kernel-qcow2-linux.git/diff/security/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/security/Kconfig.hardening?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/Kconfig.hardening</a></td><td class='right'>164</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='/openslx/kernel-qcow2-linux.git/diff/security/apparmor/apparmorfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/apparmor/apparmorfs.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='/openslx/kernel-qcow2-linux.git/diff/security/apparmor/crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/apparmor/crypto.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='/openslx/kernel-qcow2-linux.git/diff/security/apparmor/lsm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/apparmor/lsm.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/security/device_cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/device_cgroup.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='/openslx/kernel-qcow2-linux.git/diff/security/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/inode.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='/openslx/kernel-qcow2-linux.git/diff/security/integrity/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/integrity/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/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='/openslx/kernel-qcow2-linux.git/diff/security/integrity/digsig_asymmetric.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/digsig_asymmetric.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/integrity/evm/evm_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/evm/evm_crypto.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='/openslx/kernel-qcow2-linux.git/diff/security/integrity/evm/evm_secfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/evm/evm_secfs.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='/openslx/kernel-qcow2-linux.git/diff/security/integrity/ima/ima_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/ima/ima_crypto.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/security/integrity/platform_certs/load_ipl_s390.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/integrity/platform_certs/load_ipl_s390.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/security/keys/dh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/keys/dh.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='/openslx/kernel-qcow2-linux.git/diff/security/keys/encrypted-keys/encrypted.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/keys/encrypted-keys/encrypted.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='/openslx/kernel-qcow2-linux.git/diff/security/keys/process_keys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/keys/process_keys.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.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='/openslx/kernel-qcow2-linux.git/diff/security/keys/request_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/keys/request_key.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/keys/trusted.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/keys/trusted.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/security.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/selinux/hooks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/selinux/hooks.c</a></td><td class='right'>229</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='/openslx/kernel-qcow2-linux.git/diff/security/selinux/include/classmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/selinux/include/classmap.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='/openslx/kernel-qcow2-linux.git/diff/security/selinux/include/security.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/selinux/include/security.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='/openslx/kernel-qcow2-linux.git/diff/security/selinux/netlabel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/selinux/netlabel.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/selinux/ss/policydb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/selinux/ss/policydb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/security/selinux/ss/services.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/selinux/ss/services.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='/openslx/kernel-qcow2-linux.git/diff/security/yama/yama_lsm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>security/yama/yama_lsm.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/control.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/control.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/info.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/info.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/core/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/core/oss/pcm_oss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/oss/pcm_oss.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.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/pcm_native.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/pcm_native.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/rawmidi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/rawmidi.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/seq/oss/seq_oss_synth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/seq/oss/seq_oss_synth.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/seq/seq_clientmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/seq/seq_clientmgr.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='/openslx/kernel-qcow2-linux.git/diff/sound/core/timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/core/timer.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='/openslx/kernel-qcow2-linux.git/diff/sound/drivers/opl3/opl3_voice.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/drivers/opl3/opl3_voice.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='/openslx/kernel-qcow2-linux.git/diff/sound/firewire/motu/motu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/firewire/motu/motu.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/hda/ext/hdac_ext_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/hda/ext/hdac_ext_bus.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='/openslx/kernel-qcow2-linux.git/diff/sound/hda/hdac_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/hda/hdac_bus.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='/openslx/kernel-qcow2-linux.git/diff/sound/hda/hdac_component.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/hda/hdac_component.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='/openslx/kernel-qcow2-linux.git/diff/sound/isa/sb/sb8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/isa/sb/sb8.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='/openslx/kernel-qcow2-linux.git/diff/sound/pci/echoaudio/echoaudio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/pci/echoaudio/echoaudio.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='/openslx/kernel-qcow2-linux.git/diff/sound/pci/hda/hda_codec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/pci/hda/hda_codec.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/pci/hda/hda_intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/pci/hda/hda_intel.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/pci/hda/patch_ca0132.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/pci/hda/patch_ca0132.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.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='/openslx/kernel-qcow2-linux.git/diff/sound/pci/hda/patch_realtek.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>143</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/Kconfig</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/ab8500-codec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/ab8500-codec.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/adau1977-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/adau1977-spi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/cs35l35.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/cs35l35.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/cs4270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/cs4270.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/hdac_hda.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/hdac_hda.c</a></td><td class='right'>53</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/hdac_hda.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/hdac_hda.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/hdmi-codec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/hdmi-codec.c</a></td><td class='right'>121</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/nau8810.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/nau8810.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/nau8824.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/nau8824.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/rt5682.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/rt5682.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.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/tlv320aic32x4-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/tlv320aic32x4-i2c.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/tlv320aic32x4-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/tlv320aic32x4-spi.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/tlv320aic32x4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/tlv320aic32x4.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/tlv320aic3x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/tlv320aic3x.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/wm_adsp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/wm_adsp.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/codecs/wm_adsp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/codecs/wm_adsp.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/fsl/fsl_asrc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/fsl/fsl_asrc.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/fsl/fsl_esai.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/fsl/fsl_esai.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/generic/audio-graph-card.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/generic/audio-graph-card.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/generic/simple-card.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/generic/simple-card.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/atom/sst-mfld-platform-pcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/atom/sst-mfld-platform-pcm.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/bytcht_da7213.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/bytcht_da7213.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/bytcht_es8316.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/bytcht_es8316.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/bytcr_rt5640.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/bytcr_rt5640.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/bytcr_rt5651.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/bytcr_rt5651.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/cht_bsw_max98090_ti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/cht_bsw_max98090_ti.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/cht_bsw_rt5645.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/cht_bsw_rt5645.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/cht_bsw_rt5672.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/cht_bsw_rt5672.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/skylake/skl-messages.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/skylake/skl-messages.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/intel/skylake/skl-pcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/intel/skylake/skl-pcm.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/mediatek/common/mtk-btcvsd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/mediatek/common/mtk-btcvsd.c</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/mediatek/mt8183/mt8183-afe-clk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/mediatek/mt8183/mt8183-afe-clk.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/rockchip/rockchip_pdm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/rockchip/rockchip_pdm.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/samsung/i2s.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/samsung/i2s.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/samsung/odroid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/samsung/odroid.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/sh/rcar/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/sh/rcar/core.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/sh/rcar/rsnd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/sh/rcar/rsnd.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/sh/rcar/src.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/sh/rcar/src.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.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/soc-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/soc-core.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/soc-dapm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/soc-dapm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/soc/soc-pcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/soc-pcm.c</a></td><td class='right'>66</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/soc-topology.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/soc-topology.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/stm/stm32_adfsdm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/stm/stm32_adfsdm.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/stm/stm32_i2s.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/stm/stm32_i2s.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/stm/stm32_sai.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/stm/stm32_sai.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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/stm/stm32_sai_sub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/stm/stm32_sai_sub.c</a></td><td class='right'>114</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='/openslx/kernel-qcow2-linux.git/diff/sound/soc/txx9/txx9aclc-ac97.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/soc/txx9/txx9aclc-ac97.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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/card.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/card.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/usb/card.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/card.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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/line6/driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/line6/driver.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/line6/podhd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/line6/podhd.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/usb/line6/toneport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/line6/toneport.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/usb/media.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/media.c</a></td><td class='right'>327</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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/media.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/media.h</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/mixer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/mixer.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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/pcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/pcm.c</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/sound/usb/quirks-table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/quirks-table.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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/stream.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/stream.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='/openslx/kernel-qcow2-linux.git/diff/sound/usb/usbaudio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/usb/usbaudio.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='/openslx/kernel-qcow2-linux.git/diff/sound/xen/xen_snd_front_alsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>sound/xen/xen_snd_front_alsa.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/alpha/include/uapi/asm/mman.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/alpha/include/uapi/asm/mman.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/arc/include/uapi/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/arc/include/uapi/asm/unistd.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/arm64/include/asm/barrier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/arm64/include/asm/barrier.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/arm64/include/uapi/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/arm64/include/uapi/asm/unistd.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/hexagon/include/uapi/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/hexagon/include/uapi/asm/unistd.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/mips/include/uapi/asm/mman.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/mips/include/uapi/asm/mman.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/parisc/include/uapi/asm/mman.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/parisc/include/uapi/asm/mman.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/powerpc/include/uapi/asm/kvm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/powerpc/include/uapi/asm/kvm.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/riscv/include/uapi/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/riscv/include/uapi/asm/unistd.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/x86/include/asm/barrier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/x86/include/asm/barrier.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/x86/include/asm/cpufeatures.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/x86/include/asm/cpufeatures.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/x86/include/uapi/asm/vmx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/x86/include/uapi/asm/vmx.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='/openslx/kernel-qcow2-linux.git/diff/tools/arch/xtensa/include/uapi/asm/mman.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/arch/xtensa/include/uapi/asm/mman.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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/.gitignore</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-btf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-btf.rst</a></td><td class='right'>222</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-cgroup.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-feature.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-feature.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-map.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-map.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-net.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-net.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-perf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-perf.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool-prog.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool-prog.rst</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/Documentation/bpftool.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/Documentation/bpftool.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/bash-completion/bpftool?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/bash-completion/bpftool</a></td><td class='right'>75</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/btf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/btf.c</a></td><td class='right'>586</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/btf_dumper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/btf_dumper.c</a></td><td class='right'>59</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/cgroup.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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/main.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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/map.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/map.c</a></td><td class='right'>67</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/net.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/prog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/prog.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: 1.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='/openslx/kernel-qcow2-linux.git/diff/tools/bpf/bpftool/xlated_dumper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/bpf/bpftool/xlated_dumper.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='/openslx/kernel-qcow2-linux.git/diff/tools/build/Makefile.feature?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/build/Makefile.feature</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='/openslx/kernel-qcow2-linux.git/diff/tools/build/feature/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/build/feature/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='/openslx/kernel-qcow2-linux.git/diff/tools/build/feature/test-all.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/build/feature/test-all.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='/openslx/kernel-qcow2-linux.git/diff/tools/build/feature/test-libopencsd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/build/feature/test-libopencsd.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/build/feature/test-libzstd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/build/feature/test-libzstd.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/include/linux/coresight-pmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/linux/coresight-pmu.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='/openslx/kernel-qcow2-linux.git/diff/tools/include/linux/filter.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/linux/filter.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/include/nolibc/nolibc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/nolibc/nolibc.h</a></td><td class='right'>194</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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/asm-generic/mman-common-tools.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/asm-generic/mman-common-tools.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/asm-generic/mman-common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/asm-generic/mman-common.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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/asm-generic/mman.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/asm-generic/mman.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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/asm-generic/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/asm-generic/unistd.h</a></td><td class='right'>158</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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/drm/i915_drm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/drm/i915_drm.h</a></td><td class='right'>64</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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/linux/bpf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/linux/bpf.h</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/linux/btf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/linux/btf.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/linux/fcntl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/linux/fcntl.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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/linux/in.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/linux/in.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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/linux/mman.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/linux/mman.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='/openslx/kernel-qcow2-linux.git/diff/tools/include/uapi/sound/asound.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/include/uapi/sound/asound.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='/openslx/kernel-qcow2-linux.git/diff/tools/io_uring/io_uring-bench.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/io_uring/io_uring-bench.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/.gitignore</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/Makefile</a></td><td class='right'>62</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/README.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/README.rst</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/bpf.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/bpf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/bpf.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/btf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/btf.c</a></td><td class='right'>176</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/btf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/btf.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/libbpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/libbpf.c</a></td><td class='right'>898</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/libbpf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/libbpf.h</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/libbpf.map?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/libbpf.map</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/libbpf.pc.template?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/libbpf.pc.template</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/libbpf_probes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/libbpf_probes.c</a></td><td class='right'>76</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/libbpf_util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/libbpf_util.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/xsk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/xsk.c</a></td><td class='right'>208</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/bpf/xsk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/bpf/xsk.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/event-parse-api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/event-parse-api.c</a></td><td class='right'>278</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/event-parse-local.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/event-parse-local.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/event-parse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/event-parse.c</a></td><td class='right'>911</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/event-parse.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/event-parse.h</a></td><td class='right'>154</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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/event-plugin.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/event-plugin.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/kbuffer-parse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/kbuffer-parse.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/kbuffer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/kbuffer.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/parse-filter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/parse-filter.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/parse-utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/parse-utils.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_cfg80211.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_function.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_function.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_hrtimer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_hrtimer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_jbd2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_jbd2.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_kmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_kmem.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_kvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_kvm.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_mac80211.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_sched_switch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_sched_switch.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_scsi.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='/openslx/kernel-qcow2-linux.git/diff/tools/lib/traceevent/plugin_xen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/lib/traceevent/plugin_xen.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='/openslx/kernel-qcow2-linux.git/diff/tools/memory-model/Documentation/explanation.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/memory-model/Documentation/explanation.txt</a></td><td class='right'>289</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='/openslx/kernel-qcow2-linux.git/diff/tools/memory-model/README?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/memory-model/README</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/memory-model/linux-kernel.bell?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/memory-model/linux-kernel.bell</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/memory-model/linux-kernel.cat?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/memory-model/linux-kernel.cat</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/memory-model/linux-kernel.def?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/memory-model/linux-kernel.def</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='/openslx/kernel-qcow2-linux.git/diff/tools/memory-model/lock.cat?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/memory-model/lock.cat</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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/Documentation/stack-validation.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/Documentation/stack-validation.txt</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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/arch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/arch.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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/arch/x86/decode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/arch/x86/decode.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/builtin-check.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/builtin-check.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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/builtin.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/builtin.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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/check.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/check.c</a></td><td class='right'>404</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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/check.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/check.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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/elf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/elf.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/elf.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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/special.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/special.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/special.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/special.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='/openslx/kernel-qcow2-linux.git/diff/tools/objtool/warn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/objtool/warn.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/Build.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/Build.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/perf-config.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/perf-config.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/perf-record.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/perf-record.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/perf-report.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/perf-report.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/perf-script.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/perf-script.txt</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/perf-stat.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/perf-stat.txt</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Documentation/tips.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Documentation/tips.txt</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Makefile.config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Makefile.config</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/Makefile.perf?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/Makefile.perf</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/arch/x86/entry/syscalls/syscall_64.tbl</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/arch/x86/util/Build?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/arch/x86/util/Build</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/arch/x86/util/archinsn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/arch/x86/util/archinsn.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/bench/epoll-ctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/bench/epoll-ctl.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/bench/epoll-wait.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/bench/epoll-wait.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/bench/numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/bench/numa.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-kmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-kmem.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-list.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-list.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-record.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-record.c</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-report.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-report.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-script.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-script.c</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-stat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-stat.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-top.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-top.c</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin-version.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin-version.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/builtin.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/builtin.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/check-headers.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/check-headers.sh</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/examples/bpf/augmented_raw_syscalls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/examples/bpf/augmented_raw_syscalls.c</a></td><td class='right'>196</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/perf.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/perf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/perf.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/powerpc/power8/other.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/powerpc/power8/other.json</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: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/s390/cf_z14/extended.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/s390/cf_z14/extended.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/amdfam17h/branch.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/amdfam17h/branch.json</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/amdfam17h/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/amdfam17h/cache.json</a></td><td class='right'>287</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/amdfam17h/core.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/amdfam17h/core.json</a></td><td class='right'>134</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/amdfam17h/floating-point.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/amdfam17h/floating-point.json</a></td><td class='right'>168</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/amdfam17h/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/amdfam17h/memory.json</a></td><td class='right'>162</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/amdfam17h/other.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/amdfam17h/other.json</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/bonnell/frontend.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/bonnell/frontend.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/bonnell/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/bonnell/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json</a></td><td class='right'>260</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwell/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwell/cache.json</a></td><td class='right'>1630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwell/floating-point.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwell/floating-point.json</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwell/frontend.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwell/frontend.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwell/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwell/memory.json</a></td><td class='right'>1640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwell/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwell/pipeline.json</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellde/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellde/cache.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json</a></td><td class='right'>278</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellx/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellx/cache.json</a></td><td class='right'>161</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellx/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellx/memory.json</a></td><td class='right'>148</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json</a></td><td class='right'>304</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmont/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmont/cache.json</a></td><td class='right'>980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmont/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmont/memory.json</a></td><td class='right'>260</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmont/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmont/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmontplus/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmontplus/cache.json</a></td><td class='right'>74</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswell/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswell/cache.json</a></td><td class='right'>175</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswell/floating-point.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswell/floating-point.json</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json</a></td><td class='right'>234</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswell/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswell/memory.json</a></td><td class='right'>172</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswell/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswell/pipeline.json</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswellx/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswellx/cache.json</a></td><td class='right'>173</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json</a></td><td class='right'>252</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswellx/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswellx/memory.json</a></td><td class='right'>172</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/haswellx/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/haswellx/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/ivybridge/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/ivybridge/cache.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json</a></td><td class='right'>250</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json</a></td><td class='right'>256</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/ivytown/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/ivytown/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/jaketown/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/jaketown/cache.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json</a></td><td class='right'>150</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/jaketown/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/jaketown/pipeline.json</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/knightslanding/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/knightslanding/cache.json</a></td><td class='right'>666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/knightslanding/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/knightslanding/memory.json</a></td><td class='right'>268</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/mapfile.csv?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/mapfile.csv</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/cache.json</a></td><td class='right'>680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json</a></td><td class='right'>126</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/frontend.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/frontend.json</a></td><td class='right'>268</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/memory.json</a></td><td class='right'>68</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/other.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/other.json</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json</a></td><td class='right'>1328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json</a></td><td class='right'>144</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json</a></td><td class='right'>108</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/silvermont/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/silvermont/cache.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/silvermont/other.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/silvermont/other.json</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/silvermont/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/silvermont/pipeline.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylake/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylake/cache.json</a></td><td class='right'>2157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylake/frontend.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylake/frontend.json</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylake/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylake/memory.json</a></td><td class='right'>1121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylake/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylake/pipeline.json</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json</a></td><td class='right'>274</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylakex/cache.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylakex/cache.json</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylakex/floating-point.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylakex/floating-point.json</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylakex/frontend.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylakex/frontend.json</a></td><td class='right'>234</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylakex/memory.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylakex/memory.json</a></td><td class='right'>751</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylakex/pipeline.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylakex/pipeline.json</a></td><td class='right'>173</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json</a></td><td class='right'>304</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/scripts/python/export-to-postgresql.py?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/scripts/python/export-to-postgresql.py</a></td><td class='right'>61</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/scripts/python/export-to-sqlite.py?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/scripts/python/export-to-sqlite.py</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/scripts/python/exported-sql-viewer.py?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/scripts/python/exported-sql-viewer.py</a></td><td class='right'>119</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-C0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-C0</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-basic?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-basic</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-any?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-any</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-any?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-any</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-any_call?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-any_call</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-any_ret?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-any_ret</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-hv?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-hv</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-ind_call?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-ind_call</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-k?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-k</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-branch-filter-u?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-branch-filter-u</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-count?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-count</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-data?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-data</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-freq?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-freq</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-graph-default?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-graph-default</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-graph-dwarf?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-graph-dwarf</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-graph-fp?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-graph-fp</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-group?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-group</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-group-sampling?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-group-sampling</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-group1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-group1</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-no-buffering?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-no-buffering</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-no-inherit?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-no-inherit</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-no-samples?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-no-samples</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-period?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-period</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/attr/test-record-raw?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/attr/test-record-raw</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/backward-ring-buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/backward-ring-buffer.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/evsel-tp-sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/evsel-tp-sched.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/expr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/expr.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/tests/openat-syscall-all-cpus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/tests/openat-syscall-all-cpus.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/trace/beauty/mmap_flags.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/trace/beauty/mmap_flags.sh</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/trace/beauty/renameat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/trace/beauty/renameat.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/trace/strace/groups/string?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/trace/strace/groups/string</a></td><td class='right'>65</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/ui/browser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/ui/browser.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/ui/browsers/Build?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/ui/browsers/Build</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/ui/browsers/annotate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/ui/browsers/annotate.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/ui/browsers/hists.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/ui/browsers/hists.c</a></td><td class='right'>141</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/ui/browsers/res_sample.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/ui/browsers/res_sample.c</a></td><td class='right'>91</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/ui/browsers/scripts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/ui/browsers/scripts.c</a></td><td class='right'>274</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/annotate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/annotate.c</a></td><td class='right'>163</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/annotate.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/annotate.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/archinsn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/archinsn.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/bpf-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/bpf-event.c</a></td><td class='right'>425</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/bpf-event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/bpf-event.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/build-id.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/build-id.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/cloexec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/cloexec.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/config.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/cs-etm-decoder/cs-etm-decoder.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/cs-etm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/cs-etm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/data-convert-bt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/data-convert-bt.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/data.c</a></td><td class='right'>107</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/data.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/data.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/dso.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/dso.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/dso.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/dso.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/env.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/env.c</a></td><td class='right'>159</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/env.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/env.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/event.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/evlist.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/evlist.c</a></td><td class='right'>158</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/evlist.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/evlist.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/evsel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/evsel.c</a></td><td class='right'>103</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/evsel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/evsel.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/header.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/header.c</a></td><td class='right'>299</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/header.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/header.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/hist.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/hist.c</a></td><td class='right'>54</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/hist.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/hist.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/intel-pt-decoder/intel-pt-decoder.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/machine.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/machine.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/map.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/map.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/map.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/map.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/mmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/mmap.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/mmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/mmap.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/ordered-events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/ordered-events.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/parse-events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/parse-events.c</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/parse-events.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/parse-events.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/parse-events.l?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/parse-events.l</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/parse-events.y?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/parse-events.y</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/pmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/pmu.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/probe-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/probe-event.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/python.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/python.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/scripting-engines/trace-event-perl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/scripting-engines/trace-event-perl.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/scripting-engines/trace-event-python.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/scripting-engines/trace-event-python.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/session.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/session.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/sort.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/sort.c</a></td><td class='right'>91</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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/sort.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/sort.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/stat-display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/stat-display.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/stat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/stat.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/symbol.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/symbol.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/symbol_conf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/symbol_conf.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/time-utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/time-utils.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/time-utils.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/time-utils.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/trace-event-parse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/trace-event-parse.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/trace-event-read.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/trace-event-read.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='/openslx/kernel-qcow2-linux.git/diff/tools/perf/util/trace-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/perf/util/trace-event.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='/openslx/kernel-qcow2-linux.git/diff/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/power/acpi/os_specific/service_layers/oslinuxtbl.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.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='/openslx/kernel-qcow2-linux.git/diff/tools/power/acpi/tools/acpidump/apdump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/power/acpi/tools/acpidump/apdump.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='/openslx/kernel-qcow2-linux.git/diff/tools/power/acpi/tools/acpidump/apfiles.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/power/acpi/tools/acpidump/apfiles.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='/openslx/kernel-qcow2-linux.git/diff/tools/power/x86/turbostat/turbostat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/power/x86/turbostat/turbostat.c</a></td><td class='right'>280</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/ktest/ktest.pl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/ktest/ktest.pl</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/ktest/sample.conf?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/ktest/sample.conf</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/nvdimm/test/nfit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/nvdimm/test/nfit.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/Makefile</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/Makefile</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/bpf_helpers.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/bpf_helpers.h</a></td><td class='right'>60</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/config</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/flow_dissector_load.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/flow_dissector_load.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/flow_dissector_load.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/flow_dissector_load.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/map_tests/sk_storage_map.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/map_tests/sk_storage_map.c</a></td><td class='right'>629</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/bpf_obj_id.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/flow_dissector.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/flow_dissector.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/flow_dissector_load_bytes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/flow_dissector_load_bytes.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/global_data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/global_data.c</a></td><td class='right'>157</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/map_lock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/map_lock.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_nbd_invalid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_nbd_invalid.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/raw_tp_writable_test_run.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/raw_tp_writable_test_run.c</a></td><td class='right'>80</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/skb_ctx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/skb_ctx.c</a></td><td class='right'>89</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/spinlock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/spinlock.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/bpf_flow.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/bpf_flow.c</a></td><td class='right'>98</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_global_data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_global_data.c</a></td><td class='right'>106</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_jhash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_jhash.h</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_skb_ctx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_skb_ctx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_sock_fields_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_sock_fields_kern.c</a></td><td class='right'>141</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_sysctl_prog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_sysctl_prog.c</a></td><td class='right'>70</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_tc_edt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_tc_edt.c</a></td><td class='right'>109</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_tc_tunnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_tc_tunnel.c</a></td><td class='right'>536</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_tcp_check_syncookie_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_tcp_check_syncookie_kern.c</a></td><td class='right'>129</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_tcpbpf_kern.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_tcpnotify_kern.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_verif_scale1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_verif_scale1.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_verif_scale2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_verif_scale2.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/progs/test_verif_scale3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/progs/test_verif_scale3.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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_btf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_btf.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_btf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_btf.h</a></td><td class='right'>69</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_libbpf_open.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_libbpf_open.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_lwt_ip_encap.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_lwt_ip_encap.sh</a></td><td class='right'>134</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_maps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_maps.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_maps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_maps.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_offload.py?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_offload.py</a></td><td class='right'>227</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_progs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_progs.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_progs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_progs.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_section_names.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_section_names.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_sock_fields.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_sock_fields.c</a></td><td class='right'>249</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='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_sysctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_sysctl.c</a></td><td class='right'>1567</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_tc_edt.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_tc_edt.sh</a></td><td class='right'>99</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_tc_tunnel.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_tc_tunnel.sh</a></td><td class='right'>290</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_tcp_check_syncookie.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_tcp_check_syncookie.sh</a></td><td class='right'>81</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c</a></td><td class='right'>212</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/test_verifier.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/test_verifier.c</a></td><td class='right'>215</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: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/trace_helpers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/trace_helpers.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/urandom_read.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/urandom_read.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/array_access.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/array_access.c</a></td><td class='right'>159</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/calls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/calls.c</a></td><td class='right'>88</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/ctx_skb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/ctx_skb.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/direct_packet_access.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/direct_packet_access.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/direct_value_access.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/direct_value_access.c</a></td><td class='right'>347</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/int_ptr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/int_ptr.c</a></td><td class='right'>160</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/jit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/jit.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/ld_dw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/ld_dw.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/raw_tp_writable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/raw_tp_writable.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/ref_tracking.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/ref_tracking.c</a></td><td class='right'>280</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/scale.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/scale.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/sock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/sock.c</a></td><td class='right'>120</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/unpriv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/unpriv.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/bpf/verifier/var_off.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/bpf/verifier/var_off.c</a></td><td class='right'>186</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/cgroup/test_memcontrol.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/cgroup/test_memcontrol.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh</a></td><td class='right'>311</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh</a></td><td class='right'>98</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh</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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_resources.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_resources.sh</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/efivarfs/efivarfs.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/efivarfs/efivarfs.sh</a></td><td class='right'>28</td><td class='graph'><table summary='file 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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/gpio/gpio-mockup-chardev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/gpio/gpio-mockup-chardev.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='del'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/ima/config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/ima/config</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'>-rwxr-xr-x</td><td class='del'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/ima/test_kexec_load.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/ima/test_kexec_load.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/ipc/msgque.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/ipc/msgque.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kexec/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kexec/Makefile</a> (renamed from tools/testing/selftests/ima/Makefile)</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kexec/config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kexec/config</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kexec/kexec_common_lib.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kexec/kexec_common_lib.sh</a></td><td class='right'>220</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kexec/test_kexec_file_load.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kexec/test_kexec_file_load.sh</a></td><td class='right'>208</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kexec/test_kexec_load.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kexec/test_kexec_load.sh</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kselftest_harness.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kselftest_harness.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kselftest_module.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kselftest_module.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kselftest_module.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kselftest_module.sh</a></td><td class='right'>84</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/dirty_log_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/dirty_log_test.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/include/kvm_util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/include/kvm_util.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/include/x86_64/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/include/x86_64/processor.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/lib/kvm_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/lib/kvm_util.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/lib/x86_64/processor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/lib/x86_64/processor.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/x86_64/evmcs_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/x86_64/evmcs_test.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/x86_64/hyperv_cpuid.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/x86_64/smm_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/x86_64/smm_test.c</a></td><td class='right'>157</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/kvm/x86_64/state_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/kvm/x86_64/state_test.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib.mk?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/lib.mk</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib/bitmap.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/lib/bitmap.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib/config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/lib/config</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib/prime_numbers.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/lib/prime_numbers.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib/printf.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/lib/printf.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/lib/strscpy.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/lib/strscpy.sh</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/livepatch/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/livepatch/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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/media_tests/media_dev_allocator.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/media_tests/media_dev_allocator.sh</a></td><td class='right'>85</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/config</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/fib_rule_tests.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/fib_rule_tests.sh</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/fib_tests.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/fib_tests.sh</a></td><td class='right'>164</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/forwarding/bridge_igmp.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/forwarding/bridge_igmp.sh</a></td><td class='right'>152</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/forwarding/devlink_lib.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/forwarding/devlink_lib.sh</a></td><td class='right'>110</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/forwarding/loopback.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/forwarding/loopback.sh</a></td><td class='right'>94</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/forwarding/router_multicast.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/forwarding/router_multicast.sh</a></td><td class='right'>107</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/forwarding/tc_flower.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/forwarding/tc_flower.sh</a></td><td class='right'>59</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/forwarding/tc_vlan_modify.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/forwarding/tc_vlan_modify.sh</a></td><td class='right'>164</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/pmtu.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/pmtu.sh</a></td><td class='right'>213</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/rtnetlink.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/rtnetlink.sh</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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/run_afpackettests?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/run_afpackettests</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/net/run_netsocktests?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/net/run_netsocktests</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/netfilter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/netfilter/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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/netfilter/bridge_brouter.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/netfilter/bridge_brouter.sh</a></td><td class='right'>146</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'>-rwxr-xr-x</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/netfilter/conntrack_icmp_related.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/netfilter/conntrack_icmp_related.sh</a></td><td class='right'>283</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/netfilter/nft_nat.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/netfilter/nft_nat.sh</a></td><td class='right'>182</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/proc/proc-pid-vm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/proc/proc-pid-vm.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/proc/proc-self-map-files-002.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/proc/proc-self-map-files-002.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/config_override.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/config_override.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/configcheck.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/configcheck.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/configinit.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/configinit.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/cpus2use.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/cpus2use.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/functions.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/functions.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/jitter.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/jitter.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-build.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-build.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh</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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-recheck.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/kvm.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/kvm.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/mkinitrd.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/mkinitrd.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/parse-build.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/parse-build.sh</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/bin/parse-console.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/bin/parse-console.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/configs/rcuperf/ver_functions.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/configs/rcuperf/ver_functions.sh</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.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rseq/rseq-s390.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rseq/rseq-s390.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rseq/rseq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rseq/rseq.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'>-rwxr-xr-x</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/rseq/run_param_test.sh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/rseq/run_param_test.sh</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/seccomp/seccomp_bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/seccomp/seccomp_bpf.c</a></td><td class='right'>77</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/csum.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/csum.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/gact.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/gact.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/ife.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/ife.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/nat.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/nat.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/pedit.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/pedit.json</a></td><td class='right'>954</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='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/police.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/police.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/sample.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/sample.json</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/simple.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/simple.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/skbmod.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/skbmod.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tc-testing/tc-tests/filters/tests.json</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/timers/skew_consistency.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/timers/skew_consistency.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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tpm2/tpm2.py?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tpm2/tpm2.py</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/tpm2/tpm2_tests.py?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/tpm2/tpm2_tests.py</a></td><td class='right'>63</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='/openslx/kernel-qcow2-linux.git/diff/tools/testing/selftests/x86/mpx-dig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>tools/testing/selftests/x86/mpx-dig.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/arch_timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/arch_timer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/arm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/arm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/hyp/vgic-v3-sr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/hyp/vgic-v3-sr.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/mmu.c</a></td><td class='right'>133</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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/vgic/vgic-its.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/vgic/vgic-its.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.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/vgic/vgic-mmio-v3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/vgic/vgic-mmio-v3.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/vgic/vgic-v3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/vgic/vgic-v3.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/vgic/vgic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/vgic/vgic.c</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/arm/vgic/vgic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/arm/vgic/vgic.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/eventfd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/eventfd.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/irqchip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/irqchip.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='/openslx/kernel-qcow2-linux.git/diff/virt/kvm/kvm_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74&amp;id2=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>virt/kvm/kvm_main.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>7861 files changed, 318352 insertions, 257524 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/.clang-format b/.clang-format<br/>index f49620f506f1..2ffd69afc1a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/.clang-format?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>.clang-format</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/.clang-format?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>.clang-format</a></div><div class='hunk'>@@ -78,6 +78,8 @@ ForEachMacros:</div><div class='ctx'>   - 'ata_qc_for_each_with_internal'</div><div class='ctx'>   - 'ax25_for_each'</div><div class='ctx'>   - 'ax25_uid_for_each'</div><div class='add'>+  - '__bio_for_each_bvec'</div><div class='add'>+  - 'bio_for_each_bvec'</div><div class='ctx'>   - 'bio_for_each_integrity_vec'</div><div class='ctx'>   - '__bio_for_each_segment'</div><div class='ctx'>   - 'bio_for_each_segment'</div><div class='hunk'>@@ -118,10 +120,12 @@ ForEachMacros:</div><div class='ctx'>   - 'drm_for_each_legacy_plane'</div><div class='ctx'>   - 'drm_for_each_plane'</div><div class='ctx'>   - 'drm_for_each_plane_mask'</div><div class='add'>+  - 'drm_for_each_privobj'</div><div class='ctx'>   - 'drm_mm_for_each_hole'</div><div class='ctx'>   - 'drm_mm_for_each_node'</div><div class='ctx'>   - 'drm_mm_for_each_node_in_range'</div><div class='ctx'>   - 'drm_mm_for_each_node_safe'</div><div class='add'>+  - 'flow_action_for_each'</div><div class='ctx'>   - 'for_each_active_drhd_unit'</div><div class='ctx'>   - 'for_each_active_iommu'</div><div class='ctx'>   - 'for_each_available_child_of_node'</div><div class='hunk'>@@ -158,6 +162,9 @@ ForEachMacros:</div><div class='ctx'>   - 'for_each_dss_dev'</div><div class='ctx'>   - 'for_each_efi_memory_desc'</div><div class='ctx'>   - 'for_each_efi_memory_desc_in_map'</div><div class='add'>+  - 'for_each_element'</div><div class='add'>+  - 'for_each_element_extid'</div><div class='add'>+  - 'for_each_element_id'</div><div class='ctx'>   - 'for_each_endpoint_of_node'</div><div class='ctx'>   - 'for_each_evictable_lru'</div><div class='ctx'>   - 'for_each_fib6_node_rt_rcu'</div><div class='hunk'>@@ -195,6 +202,7 @@ ForEachMacros:</div><div class='ctx'>   - 'for_each_net_rcu'</div><div class='ctx'>   - 'for_each_new_connector_in_state'</div><div class='ctx'>   - 'for_each_new_crtc_in_state'</div><div class='add'>+  - 'for_each_new_mst_mgr_in_state'</div><div class='ctx'>   - 'for_each_new_plane_in_state'</div><div class='ctx'>   - 'for_each_new_private_obj_in_state'</div><div class='ctx'>   - 'for_each_node'</div><div class='hunk'>@@ -210,8 +218,10 @@ ForEachMacros:</div><div class='ctx'>   - 'for_each_of_pci_range'</div><div class='ctx'>   - 'for_each_old_connector_in_state'</div><div class='ctx'>   - 'for_each_old_crtc_in_state'</div><div class='add'>+  - 'for_each_old_mst_mgr_in_state'</div><div class='ctx'>   - 'for_each_oldnew_connector_in_state'</div><div class='ctx'>   - 'for_each_oldnew_crtc_in_state'</div><div class='add'>+  - 'for_each_oldnew_mst_mgr_in_state'</div><div class='ctx'>   - 'for_each_oldnew_plane_in_state'</div><div class='ctx'>   - 'for_each_oldnew_plane_in_state_reverse'</div><div class='ctx'>   - 'for_each_oldnew_private_obj_in_state'</div><div class='hunk'>@@ -243,6 +253,9 @@ ForEachMacros:</div><div class='ctx'>   - 'for_each_sg_dma_page'</div><div class='ctx'>   - 'for_each_sg_page'</div><div class='ctx'>   - 'for_each_sibling_event'</div><div class='add'>+  - 'for_each_subelement'</div><div class='add'>+  - 'for_each_subelement_extid'</div><div class='add'>+  - 'for_each_subelement_id'</div><div class='ctx'>   - '__for_each_thread'</div><div class='ctx'>   - 'for_each_thread'</div><div class='ctx'>   - 'for_each_zone'</div><div class='hunk'>@@ -252,6 +265,8 @@ ForEachMacros:</div><div class='ctx'>   - 'fwnode_for_each_child_node'</div><div class='ctx'>   - 'fwnode_graph_for_each_endpoint'</div><div class='ctx'>   - 'gadget_for_each_ep'</div><div class='add'>+  - 'genradix_for_each'</div><div class='add'>+  - 'genradix_for_each_from'</div><div class='ctx'>   - 'hash_for_each'</div><div class='ctx'>   - 'hash_for_each_possible'</div><div class='ctx'>   - 'hash_for_each_possible_rcu'</div><div class='hunk'>@@ -293,7 +308,11 @@ ForEachMacros:</div><div class='ctx'>   - 'key_for_each'</div><div class='ctx'>   - 'key_for_each_safe'</div><div class='ctx'>   - 'klp_for_each_func'</div><div class='add'>+  - 'klp_for_each_func_safe'</div><div class='add'>+  - 'klp_for_each_func_static'</div><div class='ctx'>   - 'klp_for_each_object'</div><div class='add'>+  - 'klp_for_each_object_safe'</div><div class='add'>+  - 'klp_for_each_object_static'</div><div class='ctx'>   - 'kvm_for_each_memslot'</div><div class='ctx'>   - 'kvm_for_each_vcpu'</div><div class='ctx'>   - 'list_for_each'</div><div class='hunk'>@@ -324,6 +343,8 @@ ForEachMacros:</div><div class='ctx'>   - 'media_device_for_each_intf'</div><div class='ctx'>   - 'media_device_for_each_link'</div><div class='ctx'>   - 'media_device_for_each_pad'</div><div class='add'>+  - 'mp_bvec_for_each_page'</div><div class='add'>+  - 'mp_bvec_for_each_segment'</div><div class='ctx'>   - 'nanddev_io_for_each_page'</div><div class='ctx'>   - 'netdev_for_each_lower_dev'</div><div class='ctx'>   - 'netdev_for_each_lower_private'</div><div class='hunk'>@@ -366,15 +387,16 @@ ForEachMacros:</div><div class='ctx'>   - 'rhl_for_each_entry_rcu'</div><div class='ctx'>   - 'rhl_for_each_rcu'</div><div class='ctx'>   - 'rht_for_each'</div><div class='del'>-  - 'rht_for_each_continue'</div><div class='add'>+  - 'rht_for_each_from'</div><div class='ctx'>   - 'rht_for_each_entry'</div><div class='del'>-  - 'rht_for_each_entry_continue'</div><div class='add'>+  - 'rht_for_each_entry_from'</div><div class='ctx'>   - 'rht_for_each_entry_rcu'</div><div class='del'>-  - 'rht_for_each_entry_rcu_continue'</div><div class='add'>+  - 'rht_for_each_entry_rcu_from'</div><div class='ctx'>   - 'rht_for_each_entry_safe'</div><div class='ctx'>   - 'rht_for_each_rcu'</div><div class='del'>-  - 'rht_for_each_rcu_continue'</div><div class='add'>+  - 'rht_for_each_rcu_from'</div><div class='ctx'>   - '__rq_for_each_bio'</div><div class='add'>+  - 'rq_for_each_bvec'</div><div class='ctx'>   - 'rq_for_each_segment'</div><div class='ctx'>   - 'scsi_for_each_prot_sg'</div><div class='ctx'>   - 'scsi_for_each_sg'</div><div class='hunk'>@@ -410,6 +432,8 @@ ForEachMacros:</div><div class='ctx'>   - 'v4l2_m2m_for_each_src_buf_safe'</div><div class='ctx'>   - 'virtio_device_for_each_vq'</div><div class='ctx'>   - 'xa_for_each'</div><div class='add'>+  - 'xa_for_each_marked'</div><div class='add'>+  - 'xa_for_each_start'</div><div class='ctx'>   - 'xas_for_each'</div><div class='ctx'>   - 'xas_for_each_conflict'</div><div class='ctx'>   - 'xas_for_each_marked'</div><div class='head'>diff --git a/.gitignore b/.gitignore<br/>index a20ac26aa2f5..d263ca9a276c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/.gitignore?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>.gitignore</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>.gitignore</a></div><div class='hunk'>@@ -58,6 +58,7 @@ modules.builtin</div><div class='ctx'> /vmlinuz</div><div class='ctx'> /System.map</div><div class='ctx'> /Module.markers</div><div class='add'>+/modules.builtin.modinfo</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RPM spec file (make rpm-pkg)</div><div class='hunk'>@@ -90,10 +91,10 @@ modules.builtin</div><div class='ctx'> #</div><div class='ctx'> # Generated include files</div><div class='ctx'> #</div><div class='del'>-include/config</div><div class='del'>-include/generated</div><div class='del'>-include/ksym</div><div class='del'>-arch/*/include/generated</div><div class='add'>+/include/config/</div><div class='add'>+/include/generated/</div><div class='add'>+/include/ksym/</div><div class='add'>+/arch/*/include/generated/</div><div class='ctx'> </div><div class='ctx'> # stgit generated dirs</div><div class='ctx'> patches-*</div><div class='hunk'>@@ -129,7 +130,12 @@ signing_key.x509</div><div class='ctx'> x509.genkey</div><div class='ctx'> </div><div class='ctx'> # Kconfig presets</div><div class='del'>-all.config</div><div class='add'>+/all.config</div><div class='add'>+/alldef.config</div><div class='add'>+/allmod.config</div><div class='add'>+/allno.config</div><div class='add'>+/allrandom.config</div><div class='add'>+/allyes.config</div><div class='ctx'> </div><div class='ctx'> # Kdevelop4</div><div class='ctx'> *.kdev4</div><div class='head'>diff --git a/.mailmap b/.mailmap<br/>index 37e1847c7988..07a777f9d687 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/.mailmap?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>.mailmap</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/.mailmap?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>.mailmap</a></div><div class='hunk'>@@ -16,6 +16,11 @@ Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='ctx'> Alan Cox &lt;root@hraefn.swansea.linux.org.uk&gt;</div><div class='ctx'> Aleksey Gorelov &lt;aleksey_gorelov@phoenix.com&gt;</div><div class='ctx'> Aleksandar Markovic &lt;aleksandar.markovic@mips.com&gt; &lt;aleksandar.markovic@imgtec.com&gt;</div><div class='add'>+Alex Shi &lt;alex.shi@linux.alibaba.com&gt; &lt;alex.shi@intel.com&gt;</div><div class='add'>+Alex Shi &lt;alex.shi@linux.alibaba.com&gt; &lt;alex.shi@linaro.org&gt;</div><div class='add'>+Alexei Starovoitov &lt;ast@kernel.org&gt; &lt;ast@plumgrid.com&gt;</div><div class='add'>+Alexei Starovoitov &lt;ast@kernel.org&gt; &lt;alexei.starovoitov@gmail.com&gt;</div><div class='add'>+Alexei Starovoitov &lt;ast@kernel.org&gt; &lt;ast@fb.com&gt;</div><div class='ctx'> Al Viro &lt;viro@ftp.linux.org.uk&gt;</div><div class='ctx'> Al Viro &lt;viro@zenIV.linux.org.uk&gt;</div><div class='ctx'> Andi Shyti &lt;andi@etezian.org&gt; &lt;andi.shyti@samsung.com&gt;</div><div class='hunk'>@@ -46,6 +51,12 @@ Christoph Hellwig &lt;hch@lst.de&gt;</div><div class='ctx'> Christophe Ricard &lt;christophe.ricard@gmail.com&gt;</div><div class='ctx'> Corey Minyard &lt;minyard@acm.org&gt;</div><div class='ctx'> Damian Hobson-Garcia &lt;dhobsong@igel.co.jp&gt;</div><div class='add'>+Daniel Borkmann &lt;daniel@iogearbox.net&gt; &lt;dborkman@redhat.com&gt;</div><div class='add'>+Daniel Borkmann &lt;daniel@iogearbox.net&gt; &lt;dborkmann@redhat.com&gt;</div><div class='add'>+Daniel Borkmann &lt;daniel@iogearbox.net&gt; &lt;danborkmann@iogearbox.net&gt;</div><div class='add'>+Daniel Borkmann &lt;daniel@iogearbox.net&gt; &lt;daniel.borkmann@tik.ee.ethz.ch&gt;</div><div class='add'>+Daniel Borkmann &lt;daniel@iogearbox.net&gt; &lt;danborkmann@googlemail.com&gt;</div><div class='add'>+Daniel Borkmann &lt;daniel@iogearbox.net&gt; &lt;dxchgb@gmail.com&gt;</div><div class='ctx'> David Brownell &lt;david-b@pacbell.net&gt;</div><div class='ctx'> David Woodhouse &lt;dwmw2@shinybook.infradead.org&gt;</div><div class='ctx'> Dengcheng Zhu &lt;dzhu@wavecomp.com&gt; &lt;dengcheng.zhu@mips.com&gt;</div><div class='hunk'>@@ -117,6 +128,8 @@ Leonid I Ananiev &lt;leonid.i.ananiev@intel.com&gt;</div><div class='ctx'> Linas Vepstas &lt;linas@austin.ibm.com&gt;</div><div class='ctx'> Linus Lüssing &lt;linus.luessing@c0d3.blue&gt; &lt;linus.luessing@web.de&gt;</div><div class='ctx'> Linus Lüssing &lt;linus.luessing@c0d3.blue&gt; &lt;linus.luessing@ascom.ch&gt;</div><div class='add'>+Li Yang &lt;leoyang.li@nxp.com&gt; &lt;leo@zh-kernel.org&gt;</div><div class='add'>+Li Yang &lt;leoyang.li@nxp.com&gt; &lt;leoli@freescale.com&gt;</div><div class='ctx'> Maciej W. Rozycki &lt;macro@mips.com&gt; &lt;macro@imgtec.com&gt;</div><div class='ctx'> Marcin Nowakowski &lt;marcin.nowakowski@mips.com&gt; &lt;marcin.nowakowski@imgtec.com&gt;</div><div class='ctx'> Mark Brown &lt;broonie@sirena.org.uk&gt;</div><div class='hunk'>@@ -156,6 +169,8 @@ Morten Welinder &lt;welinder@darter.rentec.com&gt;</div><div class='ctx'> Morten Welinder &lt;welinder@troll.com&gt;</div><div class='ctx'> Mythri P K &lt;mythripk@ti.com&gt;</div><div class='ctx'> Nguyen Anh Quynh &lt;aquynh@gmail.com&gt;</div><div class='add'>+Nicolas Pitre &lt;nico@fluxnic.net&gt; &lt;nicolas.pitre@linaro.org&gt;</div><div class='add'>+Nicolas Pitre &lt;nico@fluxnic.net&gt; &lt;nico@linaro.org&gt;</div><div class='ctx'> Paolo 'Blaisorblade' Giarrusso &lt;blaisorblade@yahoo.it&gt;</div><div class='ctx'> Patrick Mochel &lt;mochel@digitalimplant.org&gt;</div><div class='ctx'> Paul Burton &lt;paul.burton@mips.com&gt; &lt;paul.burton@imgtec.com&gt;</div><div class='hunk'>@@ -187,6 +202,7 @@ Santosh Shilimkar &lt;ssantosh@kernel.org&gt;</div><div class='ctx'> Santosh Shilimkar &lt;santosh.shilimkar@oracle.org&gt;</div><div class='ctx'> Sascha Hauer &lt;s.hauer@pengutronix.de&gt;</div><div class='ctx'> S.Çağlar Onur &lt;caglar@pardus.org.tr&gt;</div><div class='add'>+Sean Nyekjaer &lt;sean@geanix.com&gt; &lt;sean.nyekjaer@prevas.dk&gt;</div><div class='ctx'> Sebastian Reichel &lt;sre@kernel.org&gt; &lt;sre@debian.org&gt;</div><div class='ctx'> Sebastian Reichel &lt;sre@kernel.org&gt; &lt;sebastian.reichel@collabora.co.uk&gt;</div><div class='ctx'> Shiraz Hashim &lt;shiraz.linux.kernel@gmail.com&gt; &lt;shiraz.hashim@st.com&gt;</div><div class='hunk'>@@ -205,6 +221,8 @@ Tejun Heo &lt;htejun@gmail.com&gt;</div><div class='ctx'> Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='ctx'> Thomas Pedersen &lt;twp@codeaurora.org&gt;</div><div class='ctx'> Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+TripleX Chung &lt;xxx.phy@gmail.com&gt; &lt;zhongyu@18mail.cn&gt;</div><div class='add'>+TripleX Chung &lt;xxx.phy@gmail.com&gt; &lt;triplex@zh-kernel.org&gt;</div><div class='ctx'> Tsuneo Yoshioka &lt;Tsuneo.Yoshioka@f-secure.com&gt;</div><div class='ctx'> Uwe Kleine-König &lt;ukleinek@informatik.uni-freiburg.de&gt;</div><div class='ctx'> Uwe Kleine-König &lt;ukl@pengutronix.de&gt;</div><div class='hunk'>@@ -224,3 +242,5 @@ Yakir Yang &lt;kuankuan.y@gmail.com&gt; &lt;ykk@rock-chips.com&gt;</div><div class='ctx'> Yusuke Goda &lt;goda.yusuke@renesas.com&gt;</div><div class='ctx'> Gustavo Padovan &lt;gustavo@las.ic.unicamp.br&gt;</div><div class='ctx'> Gustavo Padovan &lt;padovan@profusion.mobi&gt;</div><div class='add'>+Changbin Du &lt;changbin.du@intel.com&gt; &lt;changbin.du@intel.com&gt;</div><div class='add'>+Changbin Du &lt;changbin.du@intel.com&gt; &lt;changbin.du@gmail.com&gt;</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/Documentation/ABI/obsolete/sysfs-class-net-batman-adv<br/>index 898106849e27..5bdbc8d40256 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-class-net-batman-adv?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-class-net-batman-adv</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/obsolete/sysfs-class-net-batman-adv?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/obsolete/sysfs-class-net-batman-adv</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+This ABI is deprecated and will be removed after 2021. It is</div><div class='add'>+replaced with the batadv generic netlink family.</div><div class='ctx'> </div><div class='ctx'> What:           /sys/class/net/&lt;iface&gt;/batman-adv/elp_interval</div><div class='ctx'> Date:           Feb 2014</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/obsolete/sysfs-class-net-mesh<br/>index c2b956d44a95..04c1a2932507 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-class-net-mesh?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-class-net-mesh</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/obsolete/sysfs-class-net-mesh?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/obsolete/sysfs-class-net-mesh</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+This ABI is deprecated and will be removed after 2021. It is</div><div class='add'>+replaced with the batadv generic netlink family.</div><div class='ctx'> </div><div class='ctx'> What:           /sys/class/net/&lt;mesh_iface&gt;/mesh/aggregated_ogms</div><div class='ctx'> Date:           May 2010</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-bus-nvmem b/Documentation/ABI/stable/sysfs-bus-nvmem<br/>index 5923ab4620c5..9ffba8576f7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/stable/sysfs-bus-nvmem?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/stable/sysfs-bus-nvmem</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/stable/sysfs-bus-nvmem?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/stable/sysfs-bus-nvmem</a></div><div class='hunk'>@@ -6,6 +6,8 @@ Description:</div><div class='ctx'> 		This file allows user to read/write the raw NVMEM contents.</div><div class='ctx'> 		Permissions for write to this file depends on the nvmem</div><div class='ctx'> 		provider configuration.</div><div class='add'>+		Note: This file is only present if CONFIG_NVMEM_SYSFS</div><div class='add'>+		is enabled</div><div class='ctx'> </div><div class='ctx'> 		ex:</div><div class='ctx'> 		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-bus-vmbus b/Documentation/ABI/stable/sysfs-bus-vmbus<br/>index 826689dcc2e6..8e8d167eca31 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/stable/sysfs-bus-vmbus?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/stable/sysfs-bus-vmbus</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/stable/sysfs-bus-vmbus?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/stable/sysfs-bus-vmbus</a></div><div class='hunk'>@@ -81,7 +81,9 @@ What:		/sys/bus/vmbus/devices/&lt;UUID&gt;/channels/&lt;N&gt;/latency</div><div class='ctx'> Date:		September. 2017</div><div class='ctx'> KernelVersion:	4.14</div><div class='ctx'> Contact:	Stephen Hemminger &lt;sthemmin@microsoft.com&gt;</div><div class='del'>-Description:	Channel signaling latency</div><div class='add'>+Description:	Channel signaling latency. This file is available only for</div><div class='add'>+		performance critical channels (storage, network, etc.) that use</div><div class='add'>+		the monitor page mechanism.</div><div class='ctx'> Users:		Debugging tools</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/vmbus/devices/&lt;UUID&gt;/channels/&lt;N&gt;/out_mask</div><div class='hunk'>@@ -95,7 +97,9 @@ What:		/sys/bus/vmbus/devices/&lt;UUID&gt;/channels/&lt;N&gt;/pending</div><div class='ctx'> Date:		September. 2017</div><div class='ctx'> KernelVersion:	4.14</div><div class='ctx'> Contact:	Stephen Hemminger &lt;sthemmin@microsoft.com&gt;</div><div class='del'>-Description:	Channel interrupt pending state</div><div class='add'>+Description:	Channel interrupt pending state. This file is available only for</div><div class='add'>+		performance critical channels (storage, network, etc.) that use</div><div class='add'>+		the monitor page mechanism.</div><div class='ctx'> Users:		Debugging tools</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/vmbus/devices/&lt;UUID&gt;/channels/&lt;N&gt;/read_avail</div><div class='hunk'>@@ -137,7 +141,9 @@ What:		/sys/bus/vmbus/devices/&lt;UUID&gt;/channels/&lt;N&gt;/monitor_id</div><div class='ctx'> Date:		January. 2018</div><div class='ctx'> KernelVersion:	4.16</div><div class='ctx'> Contact:	Stephen Hemminger &lt;sthemmin@microsoft.com&gt;</div><div class='del'>-Description:	Monitor bit associated with channel</div><div class='add'>+Description:	Monitor bit associated with channel. This file is available only</div><div class='add'>+		for performance critical channels (storage, network, etc.) that</div><div class='add'>+		use the monitor page mechanism.</div><div class='ctx'> Users:		Debugging tools and userspace drivers</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/vmbus/devices/&lt;UUID&gt;/channels/&lt;N&gt;/ring</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-devices-node b/Documentation/ABI/stable/sysfs-devices-node<br/>index 3e90e1f3bf0a..f7ce68fbd4b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/stable/sysfs-devices-node?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/stable/sysfs-devices-node</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/stable/sysfs-devices-node?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/stable/sysfs-devices-node</a></div><div class='hunk'>@@ -90,4 +90,89 @@ Date:		December 2009</div><div class='ctx'> Contact:	Lee Schermerhorn &lt;lee.schermerhorn@hp.com&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		The node's huge page size control/query attributes.</div><div class='del'>-		See Documentation/admin-guide/mm/hugetlbpage.rst
\ No newline at end of file</div><div class='add'>+		See Documentation/admin-guide/mm/hugetlbpage.rst</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The node's relationship to other nodes for access class "Y".</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/initiators/</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The directory containing symlinks to memory initiator</div><div class='add'>+		nodes that have class "Y" access to this target node's</div><div class='add'>+		memory. CPUs and other memory initiators in nodes not in</div><div class='add'>+		the list accessing this node's memory may have different</div><div class='add'>+		performance.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/targets/</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The directory containing symlinks to memory targets that</div><div class='add'>+		this initiator node has class "Y" access.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/initiators/read_bandwidth</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This node's read bandwidth in MB/s when accessed from</div><div class='add'>+		nodes found in this access class's linked initiators.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/initiators/read_latency</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This node's read latency in nanoseconds when accessed</div><div class='add'>+		from nodes found in this access class's linked initiators.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/initiators/write_bandwidth</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This node's write bandwidth in MB/s when accessed from</div><div class='add'>+		found in this access class's linked initiators.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/accessY/initiators/write_latency</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This node's write latency in nanoseconds when access</div><div class='add'>+		from nodes found in this class's linked initiators.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/memory_side_cache/indexY/</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The directory containing attributes for the memory-side cache</div><div class='add'>+		level 'Y'.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/memory_side_cache/indexY/indexing</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The caches associativity indexing: 0 for direct mapped,</div><div class='add'>+		non-zero if indexed.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/memory_side_cache/indexY/line_size</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The number of bytes accessed from the next cache level on a</div><div class='add'>+		cache miss.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/memory_side_cache/indexY/size</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The size of this memory side cache in bytes.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/node/nodeX/memory_side_cache/indexY/write_policy</div><div class='add'>+Date:		December 2018</div><div class='add'>+Contact:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The cache write policy: 0 for write-back, 1 for write-through,</div><div class='add'>+		other or unknown.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-counter b/Documentation/ABI/testing/sysfs-bus-counter<br/>new file mode 100644<br/>index 000000000000..566bd99fe0a5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-counter?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-counter</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/count</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Count data of Count Y represented as a string.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/ceiling</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Count value ceiling for Count Y. This is the upper limit for the</div><div class='add'>+		respective counter.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/floor</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Count value floor for Count Y. This is the lower limit for the</div><div class='add'>+		respective counter.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/count_mode</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Count mode for channel Y. The ceiling and floor values for</div><div class='add'>+		Count Y are used by the count mode where required. The following</div><div class='add'>+		count modes are available:</div><div class='add'>+</div><div class='add'>+		normal:</div><div class='add'>+			Counting is continuous in either direction.</div><div class='add'>+</div><div class='add'>+		range limit:</div><div class='add'>+			An upper or lower limit is set, mimicking limit switches</div><div class='add'>+			in the mechanical counterpart. The upper limit is set to</div><div class='add'>+			the Count Y ceiling value, while the lower limit is set</div><div class='add'>+			to the Count Y floor value. The counter freezes at</div><div class='add'>+			count = ceiling when counting up, and at count = floor</div><div class='add'>+			when counting down. At either of these limits, the</div><div class='add'>+			counting is resumed only when the count direction is</div><div class='add'>+			reversed.</div><div class='add'>+</div><div class='add'>+		non-recycle:</div><div class='add'>+			The counter is disabled whenever a counter overflow or</div><div class='add'>+			underflow takes place. The counter is re-enabled when a</div><div class='add'>+			new count value is loaded to the counter via a preset</div><div class='add'>+			operation or direct write.</div><div class='add'>+</div><div class='add'>+		modulo-n:</div><div class='add'>+			A count value boundary is set between the Count Y floor</div><div class='add'>+			value and the Count Y ceiling value. The counter is</div><div class='add'>+			reset to the Count Y floor value at count = ceiling when</div><div class='add'>+			counting up, while the counter is set to the Count Y</div><div class='add'>+			ceiling value at count = floor when counting down; the</div><div class='add'>+			counter does not freeze at the boundary points, but</div><div class='add'>+			counts continuously throughout.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/count_mode_available</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/error_noise_available</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/function_available</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/signalZ_action_available</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Discrete set of available values for the respective Count Y</div><div class='add'>+		configuration are listed in this file. Values are delimited by</div><div class='add'>+		newline characters.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/direction</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates the count direction of Count</div><div class='add'>+		Y. Two count directions are available: forward and backward.</div><div class='add'>+</div><div class='add'>+		Some counter devices are able to determine the direction of</div><div class='add'>+		their counting. For example, quadrature encoding counters can</div><div class='add'>+		determine the direction of movement by evaluating the leading</div><div class='add'>+		phase of the respective A and B quadrature encoding signals.</div><div class='add'>+		This attribute exposes such count directions.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/enable</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Whether channel Y counter is enabled. Valid attribute values are</div><div class='add'>+		boolean.</div><div class='add'>+</div><div class='add'>+		This attribute is intended to serve as a pause/unpause mechanism</div><div class='add'>+		for Count Y. Suppose a counter device is used to count the total</div><div class='add'>+		movement of a conveyor belt: this attribute allows an operator</div><div class='add'>+		to temporarily pause the counter, service the conveyor belt,</div><div class='add'>+		and then finally unpause the counter to continue where it had</div><div class='add'>+		left off.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/error_noise</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates whether excessive noise is</div><div class='add'>+		present at the channel Y counter inputs.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/function</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Count function mode of Count Y; count function evaluation is</div><div class='add'>+		triggered by conditions specified by the Count Y signalZ_action</div><div class='add'>+		attributes. The following count functions are available:</div><div class='add'>+</div><div class='add'>+		increase:</div><div class='add'>+			Accumulated count is incremented.</div><div class='add'>+</div><div class='add'>+		decrease:</div><div class='add'>+			Accumulated count is decremented.</div><div class='add'>+</div><div class='add'>+		pulse-direction:</div><div class='add'>+			Rising edges on signal A updates the respective count.</div><div class='add'>+			The input level of signal B determines direction.</div><div class='add'>+</div><div class='add'>+		quadrature x1 a:</div><div class='add'>+			If direction is forward, rising edges on quadrature pair</div><div class='add'>+			signal A updates the respective count; if the direction</div><div class='add'>+			is backward, falling edges on quadrature pair signal A</div><div class='add'>+			updates the respective count. Quadrature encoding</div><div class='add'>+			determines the direction.</div><div class='add'>+</div><div class='add'>+		quadrature x1 b:</div><div class='add'>+			If direction is forward, rising edges on quadrature pair</div><div class='add'>+			signal B updates the respective count; if the direction</div><div class='add'>+			is backward, falling edges on quadrature pair signal B</div><div class='add'>+			updates the respective count. Quadrature encoding</div><div class='add'>+			determines the direction.</div><div class='add'>+</div><div class='add'>+		quadrature x2 a:</div><div class='add'>+			Any state transition on quadrature pair signal A updates</div><div class='add'>+			the respective count. Quadrature encoding determines the</div><div class='add'>+			direction.</div><div class='add'>+</div><div class='add'>+		quadrature x2 b:</div><div class='add'>+			Any state transition on quadrature pair signal B updates</div><div class='add'>+			the respective count. Quadrature encoding determines the</div><div class='add'>+			direction.</div><div class='add'>+</div><div class='add'>+		quadrature x4:</div><div class='add'>+			Any state transition on either quadrature pair signals</div><div class='add'>+			updates	the respective count. Quadrature encoding</div><div class='add'>+			determines the direction.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/name</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates the device-specific name of</div><div class='add'>+		Count Y. If possible, this should match the name of the</div><div class='add'>+		respective channel as it appears in the device datasheet.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/preset</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		If the counter device supports preset registers -- registers</div><div class='add'>+		used to load counter channels to a set count upon device-defined</div><div class='add'>+		preset operation trigger events -- the preset count for channel</div><div class='add'>+		Y is provided by this attribute.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/preset_enable</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Whether channel Y counter preset operation is enabled. Valid</div><div class='add'>+		attribute values are boolean.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/signalZ_action</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Action mode of Count Y for Signal Z. This attribute indicates</div><div class='add'>+		the condition of Signal Z that triggers the count function</div><div class='add'>+		evaluation for Count Y. The following action modes are</div><div class='add'>+		available:</div><div class='add'>+</div><div class='add'>+		none:</div><div class='add'>+			Signal does not trigger the count function. In</div><div class='add'>+			Pulse-Direction count function mode, this Signal is</div><div class='add'>+			evaluated as Direction.</div><div class='add'>+</div><div class='add'>+		rising edge:</div><div class='add'>+			Low state transitions to high state.</div><div class='add'>+</div><div class='add'>+		falling edge:</div><div class='add'>+			High state transitions to low state.</div><div class='add'>+</div><div class='add'>+		both edges:</div><div class='add'>+			Any state transition.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/name</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates the device-specific name of</div><div class='add'>+		the Counter. This should match the name of the device as it</div><div class='add'>+		appears in its respective datasheet.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/num_counts</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates the total number of Counts</div><div class='add'>+		belonging to the Counter.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/num_signals</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates the total number of Signals</div><div class='add'>+		belonging to the Counter.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/signalY/signal</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Signal data of Signal Y represented as a string.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/signalY/name</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates the device-specific name of</div><div class='add'>+		Signal Y. If possible, this should match the name of the</div><div class='add'>+		respective signal as it appears in the device datasheet.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-counter-104-quad-8 b/Documentation/ABI/testing/sysfs-bus-counter-104-quad-8<br/>new file mode 100644<br/>index 000000000000..46b1f33b2fce<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-counter-104-quad-8?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-counter-104-quad-8</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/signalY/index_polarity</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Active level of index input Signal Y; irrelevant in</div><div class='add'>+		non-synchronous load mode.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/signalY/index_polarity_available</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/signalY/synchronous_mode_available</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Discrete set of available values for the respective Signal Y</div><div class='add'>+		configuration are listed in this file.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/signalY/synchronous_mode</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Configure the counter associated with Signal Y for</div><div class='add'>+		non-synchronous or synchronous load mode. Synchronous load mode</div><div class='add'>+		cannot be selected in non-quadrature (Pulse-Direction) clock</div><div class='add'>+		mode.</div><div class='add'>+</div><div class='add'>+		non-synchronous:</div><div class='add'>+			A logic low level is the active level at this index</div><div class='add'>+			input. The index function (as enabled via preset_enable)</div><div class='add'>+			is performed directly on the active level of the index</div><div class='add'>+			input.</div><div class='add'>+</div><div class='add'>+		synchronous:</div><div class='add'>+			Intended for interfacing with encoder Index output in</div><div class='add'>+			quadrature clock mode. The active level is configured</div><div class='add'>+			via index_polarity. The index function (as enabled via</div><div class='add'>+			preset_enable) is performed synchronously with the</div><div class='add'>+			quadrature clock on the active level of the index input.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec b/Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec<br/>new file mode 100644<br/>index 000000000000..7d2e7b363467<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/prescaler_available</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Discrete set of available values for the respective Count Y</div><div class='add'>+		configuration are listed in this file. Values are delimited by</div><div class='add'>+		newline characters.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/counter/devices/counterX/countY/prescaler</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Configure the prescaler value associated with Count Y.</div><div class='add'>+		On the FlexTimer, the counter clock source passes through a</div><div class='add'>+		prescaler (i.e. a counter). This acts like a clock</div><div class='add'>+		divider.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio<br/>index 864f8efd12e5..6aef7dbbde44 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-iio</a></div><div class='hunk'>@@ -1656,6 +1656,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_raw</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Raw counter device counts from channel Y. For quadrature</div><div class='ctx'> 		counters, multiplication by an available [Y]_scale results in</div><div class='ctx'> 		the counts of a single quadrature signal phase from channel Y.</div><div class='hunk'>@@ -1664,6 +1666,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_raw</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Raw counter device index value from channel Y. This attribute</div><div class='ctx'> 		provides an absolute positional reference (e.g. a pulse once per</div><div class='ctx'> 		revolution) which may be used to home positional systems as</div><div class='hunk'>@@ -1673,6 +1677,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available</div><div class='ctx'> KernelVersion:	4.12</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		A list of possible counting directions which are:</div><div class='ctx'> 		- "up"	: counter device is increasing.</div><div class='ctx'> 		- "down": counter device is decreasing.</div><div class='hunk'>@@ -1681,6 +1687,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_direction</div><div class='ctx'> KernelVersion:	4.12</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Raw counter device counters direction for channel Y.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_phaseY_raw</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 b/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8<br/>index 7fac2c268d9a..bac3d0d48b7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8</a></div><div class='hunk'>@@ -6,6 +6,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_index_synchronous_mode_available</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Discrete set of available values for the respective counter</div><div class='ctx'> 		configuration are listed in this file.</div><div class='ctx'> </div><div class='hunk'>@@ -13,6 +15,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_mode</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Count mode for channel Y. Four count modes are available:</div><div class='ctx'> 		normal, range limit, non-recycle, and modulo-n. The preset value</div><div class='ctx'> 		for channel Y is used by the count mode where required.</div><div class='hunk'>@@ -47,6 +51,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_noise_error</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Read-only attribute that indicates whether excessive noise is</div><div class='ctx'> 		present at the channel Y count inputs in quadrature clock mode;</div><div class='ctx'> 		irrelevant in non-quadrature clock mode.</div><div class='hunk'>@@ -55,6 +61,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_preset</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		If the counter device supports preset registers, the preset</div><div class='ctx'> 		count for channel Y is provided by this attribute.</div><div class='ctx'> </div><div class='hunk'>@@ -62,6 +70,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_quadrature_mode</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Configure channel Y counter for non-quadrature or quadrature</div><div class='ctx'> 		clock mode. Selecting non-quadrature clock mode will disable</div><div class='ctx'> 		synchronous load mode. In quadrature clock mode, the channel Y</div><div class='hunk'>@@ -83,6 +93,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_countY_set_to_preset_on_index</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Whether to set channel Y counter with channel Y preset value</div><div class='ctx'> 		when channel Y index input is active, or continuously count.</div><div class='ctx'> 		Valid attribute values are boolean.</div><div class='hunk'>@@ -91,6 +103,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_index_polarity</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Active level of channel Y index input; irrelevant in</div><div class='ctx'> 		non-synchronous load mode.</div><div class='ctx'> </div><div class='hunk'>@@ -98,6 +112,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_synchronous_mode</div><div class='ctx'> KernelVersion:	4.10</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='add'>+		This interface is deprecated; please use the Counter subsystem.</div><div class='add'>+</div><div class='ctx'> 		Configure channel Y counter for non-synchronous or synchronous</div><div class='ctx'> 		load mode. Synchronous load mode cannot be selected in</div><div class='ctx'> 		non-quadrature clock mode.</div><div class='head'>diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933 b/Documentation/ABI/testing/sysfs-bus-iio-impedance-analyzer-ad5933<br/>index 79c7e88c64cd..0e86747c67f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio-impedance-analyzer-ad5933?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-iio-impedance-analyzer-ad5933</a></div><div class='hunk'>@@ -1,26 +1,31 @@</div><div class='del'>-What:		/sys/bus/iio/devices/iio:deviceX/outY_freq_start</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency_start</div><div class='add'>+Date:		March 2019</div><div class='ctx'> KernelVersion:	3.1.0</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Frequency sweep start frequency in Hz.</div><div class='ctx'> </div><div class='del'>-What:		/sys/bus/iio/devices/iio:deviceX/outY_freq_increment</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency_increment</div><div class='add'>+Date:		March 2019</div><div class='ctx'> KernelVersion:	3.1.0</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Frequency increment in Hz (step size) between consecutive</div><div class='ctx'> 		frequency points along the sweep.</div><div class='ctx'> </div><div class='del'>-What:		/sys/bus/iio/devices/iio:deviceX/outY_freq_points</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency_points</div><div class='add'>+Date:		March 2019</div><div class='ctx'> KernelVersion:	3.1.0</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Number of frequency points (steps) in the frequency sweep.</div><div class='del'>-		This value, in conjunction with the outY_freq_start and the</div><div class='del'>-		outY_freq_increment, determines the frequency sweep range</div><div class='del'>-		for the sweep operation.</div><div class='add'>+		This value, in conjunction with the</div><div class='add'>+		out_altvoltageY_frequency_start and the</div><div class='add'>+		out_altvoltageY_frequency_increment, determines the frequency</div><div class='add'>+		sweep range for the sweep operation.</div><div class='ctx'> </div><div class='del'>-What:		/sys/bus/iio/devices/iio:deviceX/outY_settling_cycles</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_settling_cycles</div><div class='add'>+Date:		March 2019</div><div class='ctx'> KernelVersion:	3.1.0</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-sps30 b/Documentation/ABI/testing/sysfs-bus-iio-sps30<br/>index 143df8e89d08..06e1c272537b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio-sps30?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-iio-sps30</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio-sps30?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-iio-sps30</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/start_cleaning</div><div class='ctx'> Date:		December 2018</div><div class='del'>-KernelVersion:	4.22</div><div class='add'>+KernelVersion:	5.0</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Writing 1 starts sensor self cleaning. Internal fan accelerates</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856 b/Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856<br/>new file mode 100644<br/>index 000000000000..3b3509a3ef2f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/fault_oc</div><div class='add'>+KernelVersion:	5.1</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Open-circuit fault. The detection of open-circuit faults,</div><div class='add'>+		such as those caused by broken thermocouple wires.</div><div class='add'>+		Reading returns either '1' or '0'.</div><div class='add'>+		'1' = An open circuit such as broken thermocouple wires</div><div class='add'>+		      has been detected.</div><div class='add'>+		'0' = No open circuit or broken thermocouple wires are detected</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/fault_ovuv</div><div class='add'>+KernelVersion:	5.1</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Overvoltage or Undervoltage Input Fault. The internal circuitry</div><div class='add'>+		is protected from excessive voltages applied to the thermocouple</div><div class='add'>+		cables by integrated MOSFETs at the T+ and T- inputs, and the</div><div class='add'>+		BIAS output. These MOSFETs turn off when the input voltage is</div><div class='add'>+		negative or greater than VDD.</div><div class='add'>+		Reading returns either '1' or '0'.</div><div class='add'>+		'1' = The input voltage is negative or greater than VDD.</div><div class='add'>+		'0' = The input voltage is positive and less than VDD (normal</div><div class='add'>+		state).</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc b/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc<br/>index b940c5d91cf7..f54ae244f3f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc</a></div><div class='hunk'>@@ -30,4 +30,12 @@ Description:	(RW) Configure MSC buffer size for "single" or "multi" modes.</div><div class='ctx'> 		there are no active users and tracing is not enabled) and then</div><div class='ctx'> 		allocates a new one.</div><div class='ctx'> </div><div class='add'>+What:		/sys/bus/intel_th/devices/&lt;intel_th_id&gt;-msc&lt;msc-id&gt;/win_switch</div><div class='add'>+Date:		May 2019</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	Alexander Shishkin &lt;alexander.shishkin@linux.intel.com&gt;</div><div class='add'>+Description:	(RW) Trigger window switch for the MSC's buffer, in</div><div class='add'>+		multi-window mode. In "multi" mode, accepts writes of "1", thereby</div><div class='add'>+		triggering a window switch for the buffer. Returns an error in any</div><div class='add'>+		other operating mode or attempts to write something other than "1".</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-mei b/Documentation/ABI/testing/sysfs-class-mei<br/>index 17d7444a2397..a92d844f806e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-class-mei?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-class-mei</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-class-mei?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-class-mei</a></div><div class='hunk'>@@ -65,3 +65,18 @@ Description:	Display the ME firmware version.</div><div class='ctx'> 		&lt;platform&gt;:&lt;major&gt;.&lt;minor&gt;.&lt;milestone&gt;.&lt;build_no&gt;.</div><div class='ctx'> 		There can be up to three such blocks for different</div><div class='ctx'> 		FW components.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/mei/meiN/dev_state</div><div class='add'>+Date:		Mar 2019</div><div class='add'>+KernelVersion:	5.1</div><div class='add'>+Contact:	Tomas Winkler &lt;tomas.winkler@intel.com&gt;</div><div class='add'>+Description:	Display the ME device state.</div><div class='add'>+</div><div class='add'>+		The device state can have following values:</div><div class='add'>+		INITIALIZING</div><div class='add'>+		INIT_CLIENTS</div><div class='add'>+		ENABLED</div><div class='add'>+		RESETTING</div><div class='add'>+		DISABLED</div><div class='add'>+		POWER_DOWN</div><div class='add'>+		POWER_UP</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-devices-platform-ipmi b/Documentation/ABI/testing/sysfs-devices-platform-ipmi<br/>index 2a781e7513b7..afb5db856e1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-devices-platform-ipmi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-devices-platform-ipmi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-devices-platform-ipmi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-devices-platform-ipmi</a></div><div class='hunk'>@@ -212,7 +212,7 @@ Description:</div><div class='ctx'> 					Messages may be broken into parts if</div><div class='ctx'> 					they are long.</div><div class='ctx'> </div><div class='del'>-		receieved_messages:	(RO) Number of message responses</div><div class='add'>+		received_messages:	(RO) Number of message responses</div><div class='ctx'> 					received.</div><div class='ctx'> </div><div class='ctx'> 		received_message_parts: (RO) Number of message fragments</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu<br/>index 9605dbd4b5b5..4fb76c0e8d30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-devices-system-cpu?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-devices-system-cpu</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-devices-system-cpu?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-devices-system-cpu</a></div><div class='hunk'>@@ -511,10 +511,30 @@ Description:	Control Symetric Multi Threading (SMT)</div><div class='ctx'> 		control: Read/write interface to control SMT. Possible</div><div class='ctx'> 			 values:</div><div class='ctx'> </div><div class='del'>-			 "on"		SMT is enabled</div><div class='del'>-			 "off"		SMT is disabled</div><div class='del'>-			 "forceoff"	SMT is force disabled. Cannot be changed.</div><div class='del'>-			 "notsupported" SMT is not supported by the CPU</div><div class='add'>+			 "on"		  SMT is enabled</div><div class='add'>+			 "off"		  SMT is disabled</div><div class='add'>+			 "forceoff"	  SMT is force disabled. Cannot be changed.</div><div class='add'>+			 "notsupported"   SMT is not supported by the CPU</div><div class='add'>+			 "notimplemented" SMT runtime toggling is not</div><div class='add'>+					  implemented for the architecture</div><div class='ctx'> </div><div class='ctx'> 			 If control status is "forceoff" or "notsupported" writes</div><div class='ctx'> 			 are rejected.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/cpu/cpu#/power/energy_perf_bias</div><div class='add'>+Date:		March 2019</div><div class='add'>+Contact:	linux-pm@vger.kernel.org</div><div class='add'>+Description:	Intel Energy and Performance Bias Hint (EPB)</div><div class='add'>+</div><div class='add'>+		EPB for the given CPU in a sliding scale 0 - 15, where a value</div><div class='add'>+		of 0 corresponds to a hint preference for highest performance</div><div class='add'>+		and a value of 15 corresponds to the maximum energy savings.</div><div class='add'>+</div><div class='add'>+		In order to change the EPB value for the CPU, write either</div><div class='add'>+		a number in the 0 - 15 sliding scale above, or one of the</div><div class='add'>+		strings: "performance", "balance-performance", "normal",</div><div class='add'>+		"balance-power", "power" (that represent values reflected by</div><div class='add'>+		their meaning), to this attribute.</div><div class='add'>+</div><div class='add'>+		This attribute is present for all online CPUs supporting the</div><div class='add'>+		Intel EPB feature.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-driver-ucsi-ccg b/Documentation/ABI/testing/sysfs-driver-ucsi-ccg<br/>new file mode 100644<br/>index 000000000000..45cf62ad89e9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-driver-ucsi-ccg?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-driver-ucsi-ccg</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+What:		/sys/bus/i2c/drivers/ucsi_ccg/.../do_flash</div><div class='add'>+Date:		May 2019</div><div class='add'>+Contact:	Ajay Gupta &lt;ajayg@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Tell the driver for Cypress CCGx Type-C controller to attempt</div><div class='add'>+		firmware upgrade by writing [Yy1] to the file.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-kernel-livepatch b/Documentation/ABI/testing/sysfs-kernel-livepatch<br/>index 85db352f68f9..bea7bd5a1d5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-kernel-livepatch?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ABI/testing/sysfs-kernel-livepatch</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/sysfs-kernel-livepatch?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/sysfs-kernel-livepatch</a></div><div class='hunk'>@@ -45,7 +45,7 @@ Description:</div><div class='ctx'> 		use this feature without a clearance from a patch</div><div class='ctx'> 		distributor. Removal (rmmod) of patch modules is permanently</div><div class='ctx'> 		disabled when the feature is used. See</div><div class='del'>-		Documentation/livepatch/livepatch.txt for more information.</div><div class='add'>+		Documentation/livepatch/livepatch.rst for more information.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/kernel/livepatch/&lt;patch&gt;/&lt;object&gt;</div><div class='ctx'> Date:		Nov 2014</div><div class='head'>diff --git a/Documentation/ABI/testing/usb-uevent b/Documentation/ABI/testing/usb-uevent<br/>new file mode 100644<br/>index 000000000000..d35c3cad892c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ABI/testing/usb-uevent?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ABI/testing/usb-uevent</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+What:		Raise a uevent when a USB Host Controller has died</div><div class='add'>+Date:		2019-04-17</div><div class='add'>+KernelVersion:	5.2</div><div class='add'>+Contact:	linux-usb@vger.kernel.org</div><div class='add'>+Description:	When the USB Host Controller has entered a state where it is no</div><div class='add'>+		longer functional a uevent will be raised. The uevent will</div><div class='add'>+		contain ACTION=offline and ERROR=DEAD.</div><div class='add'>+</div><div class='add'>+		Here is an example taken using udevadm monitor -p:</div><div class='add'>+</div><div class='add'>+		KERNEL[130.428945] offline  /devices/pci0000:00/0000:00:10.0/usb2 (usb)</div><div class='add'>+		ACTION=offline</div><div class='add'>+		BUSNUM=002</div><div class='add'>+		DEVNAME=/dev/bus/usb/002/001</div><div class='add'>+		DEVNUM=001</div><div class='add'>+		DEVPATH=/devices/pci0000:00/0000:00:10.0/usb2</div><div class='add'>+		DEVTYPE=usb_device</div><div class='add'>+		DRIVER=usb</div><div class='add'>+		ERROR=DEAD</div><div class='add'>+		MAJOR=189</div><div class='add'>+		MINOR=128</div><div class='add'>+		PRODUCT=1d6b/2/414</div><div class='add'>+		SEQNUM=2168</div><div class='add'>+		SUBSYSTEM=usb</div><div class='add'>+		TYPE=9/0/1</div><div class='add'>+</div><div class='add'>+Users:		chromium-os-dev@chromium.org</div><div class='head'>diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt<br/>index 1a721d0f35c8..db48c6fd3162 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/DMA-API-HOWTO.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/DMA-API-HOWTO.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/DMA-API-HOWTO.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/DMA-API-HOWTO.txt</a></div><div class='hunk'>@@ -147,7 +147,7 @@ networking subsystems make sure that the buffers they use are valid</div><div class='ctx'> for you to DMA from/to.</div><div class='ctx'> </div><div class='ctx'> DMA addressing capabilities</div><div class='del'>-==========================</div><div class='add'>+===========================</div><div class='ctx'> </div><div class='ctx'> By default, the kernel assumes that your device can address 32-bits of DMA</div><div class='ctx'> addressing.  For a 64-bit capable device, this needs to be increased, and for</div><div class='head'>diff --git a/Documentation/Makefile b/Documentation/Makefile<br/>index 9786957c6a35..e889e7cb8511 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/Makefile</a></div><div class='hunk'>@@ -28,8 +28,13 @@ ifeq ($(HAVE_SPHINX),0)</div><div class='ctx'> </div><div class='ctx'> else # HAVE_SPHINX</div><div class='ctx'> </div><div class='del'>-# User-friendly check for pdflatex</div><div class='add'>+# User-friendly check for pdflatex and latexmk</div><div class='ctx'> HAVE_PDFLATEX := $(shell if which $(PDFLATEX) &gt;/dev/null 2&gt;&amp;1; then echo 1; else echo 0; fi)</div><div class='add'>+HAVE_LATEXMK := $(shell if which latexmk &gt;/dev/null 2&gt;&amp;1; then echo 1; else echo 0; fi)</div><div class='add'>+</div><div class='add'>+ifeq ($(HAVE_LATEXMK),1)</div><div class='add'>+	PDFLATEX := latexmk -$(PDFLATEX)</div><div class='add'>+endif #HAVE_LATEXMK</div><div class='ctx'> </div><div class='ctx'> # Internal variables.</div><div class='ctx'> PAPEROPT_a4     = -D latex_paper_size=a4</div><div class='hunk'>@@ -82,7 +87,7 @@ pdfdocs:</div><div class='ctx'> else # HAVE_PDFLATEX</div><div class='ctx'> </div><div class='ctx'> pdfdocs: latexdocs</div><div class='del'>-	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=$(PDFLATEX) LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex || exit;)</div><div class='add'>+	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX="$(PDFLATEX)" LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex || exit;)</div><div class='ctx'> </div><div class='ctx'> endif # HAVE_PDFLATEX</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/RCU/Design/Data-Structures/Data-Structures.html b/Documentation/RCU/Design/Data-Structures/Data-Structures.html<br/>index 18f179807563..c30c1957c7e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/Design/Data-Structures/Data-Structures.html?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/Design/Data-Structures/Data-Structures.html</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/Design/Data-Structures/Data-Structures.html?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/Design/Data-Structures/Data-Structures.html</a></div><div class='hunk'>@@ -155,8 +155,7 @@ keeping lock contention under control at all tree levels regardless</div><div class='ctx'> of the level of loading on the system.</div><div class='ctx'> </div><div class='ctx'> &lt;/p&gt;&lt;p&gt;RCU updaters wait for normal grace periods by registering</div><div class='del'>-RCU callbacks, either directly via &lt;tt&gt;call_rcu()&lt;/tt&gt; and</div><div class='del'>-friends (namely &lt;tt&gt;call_rcu_bh()&lt;/tt&gt; and &lt;tt&gt;call_rcu_sched()&lt;/tt&gt;),</div><div class='add'>+RCU callbacks, either directly via &lt;tt&gt;call_rcu()&lt;/tt&gt;</div><div class='ctx'> or indirectly via &lt;tt&gt;synchronize_rcu()&lt;/tt&gt; and friends.</div><div class='ctx'> RCU callbacks are represented by &lt;tt&gt;rcu_head&lt;/tt&gt; structures,</div><div class='ctx'> which are queued on &lt;tt&gt;rcu_data&lt;/tt&gt; structures while they are</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html b/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html<br/>index 19e7a5fb6b73..57300db4b5ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html</a></div><div class='hunk'>@@ -56,6 +56,7 @@ sections.</div><div class='ctx'> RCU-preempt Expedited Grace Periods&lt;/a&gt;&lt;/h2&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;</div><div class='add'>+&lt;tt&gt;CONFIG_PREEMPT=y&lt;/tt&gt; kernels implement RCU-preempt.</div><div class='ctx'> The overall flow of the handling of a given CPU by an RCU-preempt</div><div class='ctx'> expedited grace period is shown in the following diagram:</div><div class='ctx'> </div><div class='hunk'>@@ -139,6 +140,7 @@ or offline, among other things.</div><div class='ctx'> RCU-sched Expedited Grace Periods&lt;/a&gt;&lt;/h2&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;</div><div class='add'>+&lt;tt&gt;CONFIG_PREEMPT=n&lt;/tt&gt; kernels implement RCU-sched.</div><div class='ctx'> The overall flow of the handling of a given CPU by an RCU-sched</div><div class='ctx'> expedited grace period is shown in the following diagram:</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +148,7 @@ expedited grace period is shown in the following diagram:</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;</div><div class='ctx'> As with RCU-preempt, RCU-sched's</div><div class='del'>-&lt;tt&gt;synchronize_sched_expedited()&lt;/tt&gt; ignores offline and</div><div class='add'>+&lt;tt&gt;synchronize_rcu_expedited()&lt;/tt&gt; ignores offline and</div><div class='ctx'> idle CPUs, again because they are in remotely detectable</div><div class='ctx'> quiescent states.</div><div class='ctx'> However, because the</div><div class='head'>diff --git a/Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html b/Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html<br/>index 8d21af02b1f0..c64f8d26609f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html</a></div><div class='hunk'>@@ -34,12 +34,11 @@ Similarly, any code that happens before the beginning of a given RCU grace</div><div class='ctx'> period is guaranteed to see the effects of all accesses following the end</div><div class='ctx'> of that grace period that are within RCU read-side critical sections.</div><div class='ctx'> </div><div class='del'>-&lt;p&gt;This guarantee is particularly pervasive for &lt;tt&gt;synchronize_sched()&lt;/tt&gt;,</div><div class='del'>-for which RCU-sched read-side critical sections include any region</div><div class='add'>+&lt;p&gt;Note well that RCU-sched read-side critical sections include any region</div><div class='ctx'> of code for which preemption is disabled.</div><div class='ctx'> Given that each individual machine instruction can be thought of as</div><div class='ctx'> an extremely small region of preemption-disabled code, one can think of</div><div class='del'>-&lt;tt&gt;synchronize_sched()&lt;/tt&gt; as &lt;tt&gt;smp_mb()&lt;/tt&gt; on steroids.</div><div class='add'>+&lt;tt&gt;synchronize_rcu()&lt;/tt&gt; as &lt;tt&gt;smp_mb()&lt;/tt&gt; on steroids.</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;RCU updaters use this guarantee by splitting their updates into</div><div class='ctx'> two phases, one of which is executed before the grace period and</div><div class='head'>diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt<br/>index 687777f83b23..881353fd5bff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/NMI-RCU.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/NMI-RCU.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/NMI-RCU.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/NMI-RCU.txt</a></div><div class='hunk'>@@ -81,18 +81,19 @@ currently executing on some other CPU.  We therefore cannot free</div><div class='ctx'> up any data structures used by the old NMI handler until execution</div><div class='ctx'> of it completes on all other CPUs.</div><div class='ctx'> </div><div class='del'>-One way to accomplish this is via synchronize_sched(), perhaps as</div><div class='add'>+One way to accomplish this is via synchronize_rcu(), perhaps as</div><div class='ctx'> follows:</div><div class='ctx'> </div><div class='ctx'> 	unset_nmi_callback();</div><div class='del'>-	synchronize_sched();</div><div class='add'>+	synchronize_rcu();</div><div class='ctx'> 	kfree(my_nmi_data);</div><div class='ctx'> </div><div class='del'>-This works because synchronize_sched() blocks until all CPUs complete</div><div class='del'>-any preemption-disabled segments of code that they were executing.</div><div class='del'>-Since NMI handlers disable preemption, synchronize_sched() is guaranteed</div><div class='add'>+This works because (as of v4.20) synchronize_rcu() blocks until all</div><div class='add'>+CPUs complete any preemption-disabled segments of code that they were</div><div class='add'>+executing.</div><div class='add'>+Since NMI handlers disable preemption, synchronize_rcu() is guaranteed</div><div class='ctx'> not to return until all ongoing NMI handlers exit.  It is therefore safe</div><div class='del'>-to free up the handler's data as soon as synchronize_sched() returns.</div><div class='add'>+to free up the handler's data as soon as synchronize_rcu() returns.</div><div class='ctx'> </div><div class='ctx'> Important note: for this to work, the architecture in question must</div><div class='ctx'> invoke nmi_enter() and nmi_exit() on NMI entry and exit, respectively.</div><div class='head'>diff --git a/Documentation/RCU/UP.txt b/Documentation/RCU/UP.txt<br/>index 90ec5341ee98..53bde717017b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/UP.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/UP.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/UP.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/UP.txt</a></div><div class='hunk'>@@ -86,10 +86,8 @@ even on a UP system.  So do not do it!  Even on a UP system, the RCU</div><div class='ctx'> infrastructure -must- respect grace periods, and -must- invoke callbacks</div><div class='ctx'> from a known environment in which no locks are held.</div><div class='ctx'> </div><div class='del'>-It -is- safe for synchronize_sched() and synchronize_rcu_bh() to return</div><div class='del'>-immediately on an UP system.  It is also safe for synchronize_rcu()</div><div class='del'>-to return immediately on UP systems, except when running preemptable</div><div class='del'>-RCU.</div><div class='add'>+Note that it -is- safe for synchronize_rcu() to return immediately on</div><div class='add'>+UP systems, including !PREEMPT SMP builds running on UP systems.</div><div class='ctx'> </div><div class='ctx'> Quick Quiz #3: Why can't synchronize_rcu() return immediately on</div><div class='ctx'> 	UP systems running preemptable RCU?</div><div class='head'>diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt<br/>index 6f469864d9f5..e98ff261a438 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/checklist.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/checklist.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/checklist.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/checklist.txt</a></div><div class='hunk'>@@ -182,16 +182,13 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 		when publicizing a pointer to a structure that can</div><div class='ctx'> 		be traversed by an RCU read-side critical section.</div><div class='ctx'> </div><div class='del'>-5.	If call_rcu(), or a related primitive such as call_rcu_bh(),</div><div class='del'>-	call_rcu_sched(), or call_srcu() is used, the callback function</div><div class='del'>-	will be called from softirq context.  In particular, it cannot</div><div class='del'>-	block.</div><div class='add'>+5.	If call_rcu() or call_srcu() is used, the callback function will</div><div class='add'>+	be called from softirq context.  In particular, it cannot block.</div><div class='ctx'> </div><div class='del'>-6.	Since synchronize_rcu() can block, it cannot be called from</div><div class='del'>-	any sort of irq context.  The same rule applies for</div><div class='del'>-	synchronize_rcu_bh(), synchronize_sched(), synchronize_srcu(),</div><div class='del'>-	synchronize_rcu_expedited(), synchronize_rcu_bh_expedited(),</div><div class='del'>-	synchronize_sched_expedite(), and synchronize_srcu_expedited().</div><div class='add'>+6.	Since synchronize_rcu() can block, it cannot be called</div><div class='add'>+	from any sort of irq context.  The same rule applies</div><div class='add'>+	for synchronize_srcu(), synchronize_rcu_expedited(), and</div><div class='add'>+	synchronize_srcu_expedited().</div><div class='ctx'> </div><div class='ctx'> 	The expedited forms of these primitives have the same semantics</div><div class='ctx'> 	as the non-expedited forms, but expediting is both expensive and</div><div class='hunk'>@@ -212,20 +209,20 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 	of the system, especially to real-time workloads running on</div><div class='ctx'> 	the rest of the system.</div><div class='ctx'> </div><div class='del'>-7.	If the updater uses call_rcu() or synchronize_rcu(), then the</div><div class='del'>-	corresponding readers must use rcu_read_lock() and</div><div class='del'>-	rcu_read_unlock().  If the updater uses call_rcu_bh() or</div><div class='del'>-	synchronize_rcu_bh(), then the corresponding readers must</div><div class='del'>-	use rcu_read_lock_bh() and rcu_read_unlock_bh().  If the</div><div class='del'>-	updater uses call_rcu_sched() or synchronize_sched(), then</div><div class='del'>-	the corresponding readers must disable preemption, possibly</div><div class='del'>-	by calling rcu_read_lock_sched() and rcu_read_unlock_sched().</div><div class='del'>-	If the updater uses synchronize_srcu() or call_srcu(), then</div><div class='del'>-	the corresponding readers must use srcu_read_lock() and</div><div class='add'>+7.	As of v4.20, a given kernel implements only one RCU flavor,</div><div class='add'>+	which is RCU-sched for PREEMPT=n and RCU-preempt for PREEMPT=y.</div><div class='add'>+	If the updater uses call_rcu() or synchronize_rcu(),</div><div class='add'>+	then the corresponding readers my use rcu_read_lock() and</div><div class='add'>+	rcu_read_unlock(), rcu_read_lock_bh() and rcu_read_unlock_bh(),</div><div class='add'>+	or any pair of primitives that disables and re-enables preemption,</div><div class='add'>+	for example, rcu_read_lock_sched() and rcu_read_unlock_sched().</div><div class='add'>+	If the updater uses synchronize_srcu() or call_srcu(),</div><div class='add'>+	then the corresponding readers must use srcu_read_lock() and</div><div class='ctx'> 	srcu_read_unlock(), and with the same srcu_struct.  The rules for</div><div class='ctx'> 	the expedited primitives are the same as for their non-expedited</div><div class='ctx'> 	counterparts.  Mixing things up will result in confusion and</div><div class='del'>-	broken kernels.</div><div class='add'>+	broken kernels, and has even resulted in an exploitable security</div><div class='add'>+	issue.</div><div class='ctx'> </div><div class='ctx'> 	One exception to this rule: rcu_read_lock() and rcu_read_unlock()</div><div class='ctx'> 	may be substituted for rcu_read_lock_bh() and rcu_read_unlock_bh()</div><div class='hunk'>@@ -288,8 +285,7 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 	d.	Periodically invoke synchronize_rcu(), permitting a limited</div><div class='ctx'> 		number of updates per grace period.</div><div class='ctx'> </div><div class='del'>-	The same cautions apply to call_rcu_bh(), call_rcu_sched(),</div><div class='del'>-	call_srcu(), and kfree_rcu().</div><div class='add'>+	The same cautions apply to call_srcu() and kfree_rcu().</div><div class='ctx'> </div><div class='ctx'> 	Note that although these primitives do take action to avoid memory</div><div class='ctx'> 	exhaustion when any given CPU has too many callbacks, a determined</div><div class='hunk'>@@ -322,7 +318,7 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> </div><div class='ctx'> 11.	Any lock acquired by an RCU callback must be acquired elsewhere</div><div class='ctx'> 	with softirq disabled, e.g., via spin_lock_irqsave(),</div><div class='del'>-	spin_lock_bh(), etc.  Failing to disable irq on a given</div><div class='add'>+	spin_lock_bh(), etc.  Failing to disable softirq on a given</div><div class='ctx'> 	acquisition of that lock will result in deadlock as soon as</div><div class='ctx'> 	the RCU softirq handler happens to run your RCU callback while</div><div class='ctx'> 	interrupting that acquisition's critical section.</div><div class='hunk'>@@ -335,13 +331,16 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 	must use whatever locking or other synchronization is required</div><div class='ctx'> 	to safely access and/or modify that data structure.</div><div class='ctx'> </div><div class='del'>-	RCU callbacks are -usually- executed on the same CPU that executed</div><div class='del'>-	the corresponding call_rcu(), call_rcu_bh(), or call_rcu_sched(),</div><div class='del'>-	but are by -no- means guaranteed to be.  For example, if a given</div><div class='del'>-	CPU goes offline while having an RCU callback pending, then that</div><div class='del'>-	RCU callback will execute on some surviving CPU.  (If this was</div><div class='del'>-	not the case, a self-spawning RCU callback would prevent the</div><div class='del'>-	victim CPU from ever going offline.)</div><div class='add'>+	Do not assume that RCU callbacks will be executed on the same</div><div class='add'>+	CPU that executed the corresponding call_rcu() or call_srcu().</div><div class='add'>+	For example, if a given CPU goes offline while having an RCU</div><div class='add'>+	callback pending, then that RCU callback will execute on some</div><div class='add'>+	surviving CPU.	(If this was not the case, a self-spawning RCU</div><div class='add'>+	callback would prevent the victim CPU from ever going offline.)</div><div class='add'>+	Furthermore, CPUs designated by rcu_nocbs= might well -always-</div><div class='add'>+	have their RCU callbacks executed on some other CPUs, in fact,</div><div class='add'>+	for some  real-time workloads, this is the whole point of using</div><div class='add'>+	the rcu_nocbs= kernel boot parameter.</div><div class='ctx'> </div><div class='ctx'> 13.	Unlike other forms of RCU, it -is- permissible to block in an</div><div class='ctx'> 	SRCU read-side critical section (demarked by srcu_read_lock()</div><div class='hunk'>@@ -381,11 +380,11 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> </div><div class='ctx'> 	SRCU's expedited primitive (synchronize_srcu_expedited())</div><div class='ctx'> 	never sends IPIs to other CPUs, so it is easier on</div><div class='del'>-	real-time workloads than is synchronize_rcu_expedited(),</div><div class='del'>-	synchronize_rcu_bh_expedited() or synchronize_sched_expedited().</div><div class='add'>+	real-time workloads than is synchronize_rcu_expedited().</div><div class='ctx'> </div><div class='del'>-	Note that rcu_dereference() and rcu_assign_pointer() relate to</div><div class='del'>-	SRCU just as they do to other forms of RCU.</div><div class='add'>+	Note that rcu_assign_pointer() relates to SRCU just as it does to</div><div class='add'>+	other forms of RCU, but instead of rcu_dereference() you should</div><div class='add'>+	use srcu_dereference() in order to avoid lockdep splats.</div><div class='ctx'> </div><div class='ctx'> 14.	The whole point of call_rcu(), synchronize_rcu(), and friends</div><div class='ctx'> 	is to wait until all pre-existing readers have finished before</div><div class='hunk'>@@ -405,6 +404,9 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 	read-side critical sections.  It is the responsibility of the</div><div class='ctx'> 	RCU update-side primitives to deal with this.</div><div class='ctx'> </div><div class='add'>+	For SRCU readers, you can use smp_mb__after_srcu_read_unlock()</div><div class='add'>+	immediately after an srcu_read_unlock() to get a full barrier.</div><div class='add'>+</div><div class='ctx'> 16.	Use CONFIG_PROVE_LOCKING, CONFIG_DEBUG_OBJECTS_RCU_HEAD, and the</div><div class='ctx'> 	__rcu sparse checks to validate your RCU code.	These can help</div><div class='ctx'> 	find problems as follows:</div><div class='hunk'>@@ -428,22 +430,19 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 	These debugging aids can help you find problems that are</div><div class='ctx'> 	otherwise extremely difficult to spot.</div><div class='ctx'> </div><div class='del'>-17.	If you register a callback using call_rcu(), call_rcu_bh(),</div><div class='del'>-	call_rcu_sched(), or call_srcu(), and pass in a function defined</div><div class='del'>-	within a loadable module, then it in necessary to wait for</div><div class='del'>-	all pending callbacks to be invoked after the last invocation</div><div class='del'>-	and before unloading that module.  Note that it is absolutely</div><div class='del'>-	-not- sufficient to wait for a grace period!  The current (say)</div><div class='del'>-	synchronize_rcu() implementation waits only for all previous</div><div class='del'>-	callbacks registered on the CPU that synchronize_rcu() is running</div><div class='del'>-	on, but it is -not- guaranteed to wait for callbacks registered</div><div class='del'>-	on other CPUs.</div><div class='add'>+17.	If you register a callback using call_rcu() or call_srcu(), and</div><div class='add'>+	pass in a function defined within a loadable module, then it in</div><div class='add'>+	necessary to wait for all pending callbacks to be invoked after</div><div class='add'>+	the last invocation and before unloading that module.  Note that</div><div class='add'>+	it is absolutely -not- sufficient to wait for a grace period!</div><div class='add'>+	The current (say) synchronize_rcu() implementation is -not-</div><div class='add'>+	guaranteed to wait for callbacks registered on other CPUs.</div><div class='add'>+	Or even on the current CPU if that CPU recently went offline</div><div class='add'>+	and came back online.</div><div class='ctx'> </div><div class='ctx'> 	You instead need to use one of the barrier functions:</div><div class='ctx'> </div><div class='ctx'> 	o	call_rcu() -&gt; rcu_barrier()</div><div class='del'>-	o	call_rcu_bh() -&gt; rcu_barrier()</div><div class='del'>-	o	call_rcu_sched() -&gt; rcu_barrier()</div><div class='ctx'> 	o	call_srcu() -&gt; srcu_barrier()</div><div class='ctx'> </div><div class='ctx'> 	However, these barrier functions are absolutely -not- guaranteed</div><div class='head'>diff --git a/Documentation/RCU/rcu.txt b/Documentation/RCU/rcu.txt<br/>index 721b3e426515..c818cf65c5a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/rcu.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/rcu.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/rcu.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/rcu.txt</a></div><div class='hunk'>@@ -52,10 +52,10 @@ o	If I am running on a uniprocessor kernel, which can only do one</div><div class='ctx'> o	How can I see where RCU is currently used in the Linux kernel?</div><div class='ctx'> </div><div class='ctx'> 	Search for "rcu_read_lock", "rcu_read_unlock", "call_rcu",</div><div class='del'>-	"rcu_read_lock_bh", "rcu_read_unlock_bh", "call_rcu_bh",</div><div class='del'>-	"srcu_read_lock", "srcu_read_unlock", "synchronize_rcu",</div><div class='del'>-	"synchronize_net", "synchronize_srcu", and the other RCU</div><div class='del'>-	primitives.  Or grab one of the cscope databases from:</div><div class='add'>+	"rcu_read_lock_bh", "rcu_read_unlock_bh", "srcu_read_lock",</div><div class='add'>+	"srcu_read_unlock", "synchronize_rcu", "synchronize_net",</div><div class='add'>+	"synchronize_srcu", and the other RCU primitives.  Or grab one</div><div class='add'>+	of the cscope databases from:</div><div class='ctx'> </div><div class='ctx'> 	http://www.rdrop.com/users/paulmck/RCU/linuxusage/rculocktab.html</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/RCU/rcu_dereference.txt b/Documentation/RCU/rcu_dereference.txt<br/>index ab96227bad42..bf699e8cfc75 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/rcu_dereference.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/rcu_dereference.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/rcu_dereference.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/rcu_dereference.txt</a></div><div class='hunk'>@@ -351,3 +351,106 @@ garbage values.</div><div class='ctx'> </div><div class='ctx'> In short, rcu_dereference() is -not- optional when you are going to</div><div class='ctx'> dereference the resulting pointer.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+WHICH MEMBER OF THE rcu_dereference() FAMILY SHOULD YOU USE?</div><div class='add'>+</div><div class='add'>+First, please avoid using rcu_dereference_raw() and also please avoid</div><div class='add'>+using rcu_dereference_check() and rcu_dereference_protected() with a</div><div class='add'>+second argument with a constant value of 1 (or true, for that matter).</div><div class='add'>+With that caution out of the way, here is some guidance for which</div><div class='add'>+member of the rcu_dereference() to use in various situations:</div><div class='add'>+</div><div class='add'>+1.	If the access needs to be within an RCU read-side critical</div><div class='add'>+	section, use rcu_dereference().  With the new consolidated</div><div class='add'>+	RCU flavors, an RCU read-side critical section is entered</div><div class='add'>+	using rcu_read_lock(), anything that disables bottom halves,</div><div class='add'>+	anything that disables interrupts, or anything that disables</div><div class='add'>+	preemption.</div><div class='add'>+</div><div class='add'>+2.	If the access might be within an RCU read-side critical section</div><div class='add'>+	on the one hand, or protected by (say) my_lock on the other,</div><div class='add'>+	use rcu_dereference_check(), for example:</div><div class='add'>+</div><div class='add'>+		p1 = rcu_dereference_check(p-&gt;rcu_protected_pointer,</div><div class='add'>+					   lockdep_is_held(&amp;my_lock));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.	If the access might be within an RCU read-side critical section</div><div class='add'>+	on the one hand, or protected by either my_lock or your_lock on</div><div class='add'>+	the other, again use rcu_dereference_check(), for example:</div><div class='add'>+</div><div class='add'>+		p1 = rcu_dereference_check(p-&gt;rcu_protected_pointer,</div><div class='add'>+					   lockdep_is_held(&amp;my_lock) ||</div><div class='add'>+					   lockdep_is_held(&amp;your_lock));</div><div class='add'>+</div><div class='add'>+4.	If the access is on the update side, so that it is always protected</div><div class='add'>+	by my_lock, use rcu_dereference_protected():</div><div class='add'>+</div><div class='add'>+		p1 = rcu_dereference_protected(p-&gt;rcu_protected_pointer,</div><div class='add'>+					       lockdep_is_held(&amp;my_lock));</div><div class='add'>+</div><div class='add'>+	This can be extended to handle multiple locks as in #3 above,</div><div class='add'>+	and both can be extended to check other conditions as well.</div><div class='add'>+</div><div class='add'>+5.	If the protection is supplied by the caller, and is thus unknown</div><div class='add'>+	to this code, that is the rare case when rcu_dereference_raw()</div><div class='add'>+	is appropriate.  In addition, rcu_dereference_raw() might be</div><div class='add'>+	appropriate when the lockdep expression would be excessively</div><div class='add'>+	complex, except that a better approach in that case might be to</div><div class='add'>+	take a long hard look at your synchronization design.  Still,</div><div class='add'>+	there are data-locking cases where any one of a very large number</div><div class='add'>+	of locks or reference counters suffices to protect the pointer,</div><div class='add'>+	so rcu_dereference_raw() does have its place.</div><div class='add'>+</div><div class='add'>+	However, its place is probably quite a bit smaller than one</div><div class='add'>+	might expect given the number of uses in the current kernel.</div><div class='add'>+	Ditto for its synonym, rcu_dereference_check( ... , 1), and</div><div class='add'>+	its close relative, rcu_dereference_protected(... , 1).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SPARSE CHECKING OF RCU-PROTECTED POINTERS</div><div class='add'>+</div><div class='add'>+The sparse static-analysis tool checks for direct access to RCU-protected</div><div class='add'>+pointers, which can result in "interesting" bugs due to compiler</div><div class='add'>+optimizations involving invented loads and perhaps also load tearing.</div><div class='add'>+For example, suppose someone mistakenly does something like this:</div><div class='add'>+</div><div class='add'>+	p = q-&gt;rcu_protected_pointer;</div><div class='add'>+	do_something_with(p-&gt;a);</div><div class='add'>+	do_something_else_with(p-&gt;b);</div><div class='add'>+</div><div class='add'>+If register pressure is high, the compiler might optimize "p" out</div><div class='add'>+of existence, transforming the code to something like this:</div><div class='add'>+</div><div class='add'>+	do_something_with(q-&gt;rcu_protected_pointer-&gt;a);</div><div class='add'>+	do_something_else_with(q-&gt;rcu_protected_pointer-&gt;b);</div><div class='add'>+</div><div class='add'>+This could fatally disappoint your code if q-&gt;rcu_protected_pointer</div><div class='add'>+changed in the meantime.  Nor is this a theoretical problem:  Exactly</div><div class='add'>+this sort of bug cost Paul E. McKenney (and several of his innocent</div><div class='add'>+colleagues) a three-day weekend back in the early 1990s.</div><div class='add'>+</div><div class='add'>+Load tearing could of course result in dereferencing a mashup of a pair</div><div class='add'>+of pointers, which also might fatally disappoint your code.</div><div class='add'>+</div><div class='add'>+These problems could have been avoided simply by making the code instead</div><div class='add'>+read as follows:</div><div class='add'>+</div><div class='add'>+	p = rcu_dereference(q-&gt;rcu_protected_pointer);</div><div class='add'>+	do_something_with(p-&gt;a);</div><div class='add'>+	do_something_else_with(p-&gt;b);</div><div class='add'>+</div><div class='add'>+Unfortunately, these sorts of bugs can be extremely hard to spot during</div><div class='add'>+review.  This is where the sparse tool comes into play, along with the</div><div class='add'>+"__rcu" marker.  If you mark a pointer declaration, whether in a structure</div><div class='add'>+or as a formal parameter, with "__rcu", which tells sparse to complain if</div><div class='add'>+this pointer is accessed directly.  It will also cause sparse to complain</div><div class='add'>+if a pointer not marked with "__rcu" is accessed using rcu_dereference()</div><div class='add'>+and friends.  For example, -&gt;rcu_protected_pointer might be declared as</div><div class='add'>+follows:</div><div class='add'>+</div><div class='add'>+	struct foo __rcu *rcu_protected_pointer;</div><div class='add'>+</div><div class='add'>+Use of "__rcu" is opt-in.  If you choose not to use it, then you should</div><div class='add'>+ignore the sparse warnings.</div><div class='head'>diff --git a/Documentation/RCU/rcubarrier.txt b/Documentation/RCU/rcubarrier.txt<br/>index 5d7759071a3e..a2782df69732 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/rcubarrier.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/rcubarrier.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/rcubarrier.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/rcubarrier.txt</a></div><div class='hunk'>@@ -83,16 +83,15 @@ Pseudo-code using rcu_barrier() is as follows:</div><div class='ctx'>    2. Execute rcu_barrier().</div><div class='ctx'>    3. Allow the module to be unloaded.</div><div class='ctx'> </div><div class='del'>-There are also rcu_barrier_bh(), rcu_barrier_sched(), and srcu_barrier()</div><div class='del'>-functions for the other flavors of RCU, and you of course must match</div><div class='del'>-the flavor of rcu_barrier() with that of call_rcu().  If your module</div><div class='del'>-uses multiple flavors of call_rcu(), then it must also use multiple</div><div class='add'>+There is also an srcu_barrier() function for SRCU, and you of course</div><div class='add'>+must match the flavor of rcu_barrier() with that of call_rcu().  If your</div><div class='add'>+module uses multiple flavors of call_rcu(), then it must also use multiple</div><div class='ctx'> flavors of rcu_barrier() when unloading that module.  For example, if</div><div class='del'>-it uses call_rcu_bh(), call_srcu() on srcu_struct_1, and call_srcu() on</div><div class='add'>+it uses call_rcu(), call_srcu() on srcu_struct_1, and call_srcu() on</div><div class='ctx'> srcu_struct_2(), then the following three lines of code will be required</div><div class='ctx'> when unloading:</div><div class='ctx'> </div><div class='del'>- 1 rcu_barrier_bh();</div><div class='add'>+ 1 rcu_barrier();</div><div class='ctx'>  2 srcu_barrier(&amp;srcu_struct_1);</div><div class='ctx'>  3 srcu_barrier(&amp;srcu_struct_2);</div><div class='ctx'> </div><div class='hunk'>@@ -185,12 +184,12 @@ module invokes call_rcu() from timers, you will need to first cancel all</div><div class='ctx'> the timers, and only then invoke rcu_barrier() to wait for any remaining</div><div class='ctx'> RCU callbacks to complete.</div><div class='ctx'> </div><div class='del'>-Of course, if you module uses call_rcu_bh(), you will need to invoke</div><div class='del'>-rcu_barrier_bh() before unloading.  Similarly, if your module uses</div><div class='del'>-call_rcu_sched(), you will need to invoke rcu_barrier_sched() before</div><div class='del'>-unloading.  If your module uses call_rcu(), call_rcu_bh(), -and-</div><div class='del'>-call_rcu_sched(), then you will need to invoke each of rcu_barrier(),</div><div class='del'>-rcu_barrier_bh(), and rcu_barrier_sched().</div><div class='add'>+Of course, if you module uses call_rcu(), you will need to invoke</div><div class='add'>+rcu_barrier() before unloading.  Similarly, if your module uses</div><div class='add'>+call_srcu(), you will need to invoke srcu_barrier() before unloading,</div><div class='add'>+and on the same srcu_struct structure.  If your module uses call_rcu()</div><div class='add'>+-and- call_srcu(), then you will need to invoke rcu_barrier() -and-</div><div class='add'>+srcu_barrier().</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Implementing rcu_barrier()</div><div class='hunk'>@@ -223,8 +222,8 @@ shown below. Note that the final "1" in on_each_cpu()'s argument list</div><div class='ctx'> ensures that all the calls to rcu_barrier_func() will have completed</div><div class='ctx'> before on_each_cpu() returns. Line 9 then waits for the completion.</div><div class='ctx'> </div><div class='del'>-This code was rewritten in 2008 to support rcu_barrier_bh() and</div><div class='del'>-rcu_barrier_sched() in addition to the original rcu_barrier().</div><div class='add'>+This code was rewritten in 2008 and several times thereafter, but this</div><div class='add'>+still gives the general idea.</div><div class='ctx'> </div><div class='ctx'> The rcu_barrier_func() runs on each CPU, where it invokes call_rcu()</div><div class='ctx'> to post an RCU callback, as follows:</div><div class='head'>diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt<br/>index 1ace20815bb1..981651a8b65d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/whatisRCU.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/RCU/whatisRCU.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/RCU/whatisRCU.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/RCU/whatisRCU.txt</a></div><div class='hunk'>@@ -310,7 +310,7 @@ reader, updater, and reclaimer.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	    rcu_assign_pointer()</div><div class='del'>-	    			    +--------+</div><div class='add'>+	                            +--------+</div><div class='ctx'> 	    +----------------------&gt;| reader |---------+</div><div class='ctx'> 	    |                       +--------+         |</div><div class='ctx'> 	    |                           |              |</div><div class='hunk'>@@ -318,12 +318,12 @@ reader, updater, and reclaimer.</div><div class='ctx'> 	    |                           |              | rcu_read_lock()</div><div class='ctx'> 	    |                           |              | rcu_read_unlock()</div><div class='ctx'> 	    |        rcu_dereference()  |              |</div><div class='del'>-       +---------+                      |              |</div><div class='del'>-       | updater |&lt;---------------------+              |</div><div class='del'>-       +---------+                                     V</div><div class='add'>+	    +---------+                 |              |</div><div class='add'>+	    | updater |&lt;----------------+              |</div><div class='add'>+	    +---------+                                V</div><div class='ctx'> 	    |                                    +-----------+</div><div class='ctx'> 	    +-----------------------------------&gt;| reclaimer |</div><div class='del'>-	    				         +-----------+</div><div class='add'>+	                                         +-----------+</div><div class='ctx'> 	      Defer:</div><div class='ctx'> 	      synchronize_rcu() &amp; call_rcu()</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/accounting/psi.txt b/Documentation/accounting/psi.txt<br/>index b8ca28b60215..7e71c9c1d8e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/accounting/psi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/accounting/psi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/accounting/psi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/accounting/psi.txt</a></div><div class='hunk'>@@ -56,12 +56,12 @@ situation from a state where some tasks are stalled but the CPU is</div><div class='ctx'> still doing productive work. As such, time spent in this subset of the</div><div class='ctx'> stall state is tracked separately and exported in the "full" averages.</div><div class='ctx'> </div><div class='del'>-The ratios are tracked as recent trends over ten, sixty, and three</div><div class='del'>-hundred second windows, which gives insight into short term events as</div><div class='del'>-well as medium and long term trends. The total absolute stall time is</div><div class='del'>-tracked and exported as well, to allow detection of latency spikes</div><div class='del'>-which wouldn't necessarily make a dent in the time averages, or to</div><div class='del'>-average trends over custom time frames.</div><div class='add'>+The ratios (in %) are tracked as recent trends over ten, sixty, and</div><div class='add'>+three hundred second windows, which gives insight into short term events</div><div class='add'>+as well as medium and long term trends. The total absolute stall time</div><div class='add'>+(in us) is tracked and exported as well, to allow detection of latency</div><div class='add'>+spikes which wouldn't necessarily make a dent in the time averages,</div><div class='add'>+or to average trends over custom time frames.</div><div class='ctx'> </div><div class='ctx'> Cgroup2 interface</div><div class='ctx'> =================</div><div class='head'>diff --git a/Documentation/acpi/aml-debugger.txt b/Documentation/acpi/aml-debugger.txt<br/>deleted file mode 100644<br/>index 75ebeb64ab29..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/aml-debugger.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/aml-debugger.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-The AML Debugger</div><div class='del'>-</div><div class='del'>-Copyright (C) 2016, Intel Corporation</div><div class='del'>-Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This document describes the usage of the AML debugger embedded in the Linux</div><div class='del'>-kernel.</div><div class='del'>-</div><div class='del'>-1. Build the debugger</div><div class='del'>-</div><div class='del'>-   The following kernel configuration items are required to enable the AML</div><div class='del'>-   debugger interface from the Linux kernel:</div><div class='del'>-</div><div class='del'>-   CONFIG_ACPI_DEBUGGER=y</div><div class='del'>-   CONFIG_ACPI_DEBUGGER_USER=m</div><div class='del'>-</div><div class='del'>-   The userspace utilities can be built from the kernel source tree using</div><div class='del'>-   the following commands:</div><div class='del'>-</div><div class='del'>-   $ cd tools</div><div class='del'>-   $ make acpi</div><div class='del'>-</div><div class='del'>-   The resultant userspace tool binary is then located at:</div><div class='del'>-</div><div class='del'>-     tools/power/acpi/acpidbg</div><div class='del'>-</div><div class='del'>-   It can be installed to system directories by running "make install" (as a</div><div class='del'>-   sufficiently privileged user).</div><div class='del'>-</div><div class='del'>-2. Start the userspace debugger interface</div><div class='del'>-</div><div class='del'>-   After booting the kernel with the debugger built-in, the debugger can be</div><div class='del'>-   started by using the following commands:</div><div class='del'>-</div><div class='del'>-   # mount -t debugfs none /sys/kernel/debug</div><div class='del'>-   # modprobe acpi_dbg</div><div class='del'>-   # tools/power/acpi/acpidbg</div><div class='del'>-</div><div class='del'>-   That spawns the interactive AML debugger environment where you can execute</div><div class='del'>-   debugger commands.</div><div class='del'>-</div><div class='del'>-   The commands are documented in the "ACPICA Overview and Programmer Reference"</div><div class='del'>-   that can be downloaded from</div><div class='del'>-</div><div class='del'>-   https://acpica.org/documentation</div><div class='del'>-</div><div class='del'>-   The detailed debugger commands reference is located in Chapter 12 "ACPICA</div><div class='del'>-   Debugger Reference".  The "help" command can be used for a quick reference.</div><div class='del'>-</div><div class='del'>-3. Stop the userspace debugger interface</div><div class='del'>-</div><div class='del'>-   The interactive debugger interface can be closed by pressing Ctrl+C or using</div><div class='del'>-   the "quit" or "exit" commands.  When finished, unload the module with:</div><div class='del'>-</div><div class='del'>-   # rmmod acpi_dbg</div><div class='del'>-</div><div class='del'>-   The module unloading may fail if there is an acpidbg instance running.</div><div class='del'>-</div><div class='del'>-4. Run the debugger in a script</div><div class='del'>-</div><div class='del'>-   It may be useful to run the AML debugger in a test script. "acpidbg" supports</div><div class='del'>-   this in a special "batch" mode.  For example, the following command outputs</div><div class='del'>-   the entire ACPI namespace:</div><div class='del'>-</div><div class='del'>-   # acpidbg -b "namespace"</div><div class='head'>diff --git a/Documentation/acpi/apei/output_format.txt b/Documentation/acpi/apei/output_format.txt<br/>deleted file mode 100644<br/>index 0c49c197c47a..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/apei/output_format.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/apei/output_format.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,147 +0,0 @@</div><div class='del'>-                     APEI output format</div><div class='del'>-                     ~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-APEI uses printk as hardware error reporting interface, the output</div><div class='del'>-format is as follow.</div><div class='del'>-</div><div class='del'>-&lt;error record&gt; :=</div><div class='del'>-APEI generic hardware error status</div><div class='del'>-severity: &lt;integer&gt;, &lt;severity string&gt;</div><div class='del'>-section: &lt;integer&gt;, severity: &lt;integer&gt;, &lt;severity string&gt;</div><div class='del'>-flags: &lt;integer&gt;</div><div class='del'>-&lt;section flags strings&gt;</div><div class='del'>-fru_id: &lt;uuid string&gt;</div><div class='del'>-fru_text: &lt;string&gt;</div><div class='del'>-section_type: &lt;section type string&gt;</div><div class='del'>-&lt;section data&gt;</div><div class='del'>-</div><div class='del'>-&lt;severity string&gt;* := recoverable | fatal | corrected | info</div><div class='del'>-</div><div class='del'>-&lt;section flags strings&gt;# :=</div><div class='del'>-[primary][, containment warning][, reset][, threshold exceeded]\</div><div class='del'>-[, resource not accessible][, latent error]</div><div class='del'>-</div><div class='del'>-&lt;section type string&gt; := generic processor error | memory error | \</div><div class='del'>-PCIe error | unknown, &lt;uuid string&gt;</div><div class='del'>-</div><div class='del'>-&lt;section data&gt; :=</div><div class='del'>-&lt;generic processor section data&gt; | &lt;memory section data&gt; | \</div><div class='del'>-&lt;pcie section data&gt; | &lt;null&gt;</div><div class='del'>-</div><div class='del'>-&lt;generic processor section data&gt; :=</div><div class='del'>-[processor_type: &lt;integer&gt;, &lt;proc type string&gt;]</div><div class='del'>-[processor_isa: &lt;integer&gt;, &lt;proc isa string&gt;]</div><div class='del'>-[error_type: &lt;integer&gt;</div><div class='del'>-&lt;proc error type strings&gt;]</div><div class='del'>-[operation: &lt;integer&gt;, &lt;proc operation string&gt;]</div><div class='del'>-[flags: &lt;integer&gt;</div><div class='del'>-&lt;proc flags strings&gt;]</div><div class='del'>-[level: &lt;integer&gt;]</div><div class='del'>-[version_info: &lt;integer&gt;]</div><div class='del'>-[processor_id: &lt;integer&gt;]</div><div class='del'>-[target_address: &lt;integer&gt;]</div><div class='del'>-[requestor_id: &lt;integer&gt;]</div><div class='del'>-[responder_id: &lt;integer&gt;]</div><div class='del'>-[IP: &lt;integer&gt;]</div><div class='del'>-</div><div class='del'>-&lt;proc type string&gt;* := IA32/X64 | IA64</div><div class='del'>-</div><div class='del'>-&lt;proc isa string&gt;* := IA32 | IA64 | X64</div><div class='del'>-</div><div class='del'>-&lt;processor error type strings&gt;# :=</div><div class='del'>-[cache error][, TLB error][, bus error][, micro-architectural error]</div><div class='del'>-</div><div class='del'>-&lt;proc operation string&gt;* := unknown or generic | data read | data write | \</div><div class='del'>-instruction execution</div><div class='del'>-</div><div class='del'>-&lt;proc flags strings&gt;# :=</div><div class='del'>-[restartable][, precise IP][, overflow][, corrected]</div><div class='del'>-</div><div class='del'>-&lt;memory section data&gt; :=</div><div class='del'>-[error_status: &lt;integer&gt;]</div><div class='del'>-[physical_address: &lt;integer&gt;]</div><div class='del'>-[physical_address_mask: &lt;integer&gt;]</div><div class='del'>-[node: &lt;integer&gt;]</div><div class='del'>-[card: &lt;integer&gt;]</div><div class='del'>-[module: &lt;integer&gt;]</div><div class='del'>-[bank: &lt;integer&gt;]</div><div class='del'>-[device: &lt;integer&gt;]</div><div class='del'>-[row: &lt;integer&gt;]</div><div class='del'>-[column: &lt;integer&gt;]</div><div class='del'>-[bit_position: &lt;integer&gt;]</div><div class='del'>-[requestor_id: &lt;integer&gt;]</div><div class='del'>-[responder_id: &lt;integer&gt;]</div><div class='del'>-[target_id: &lt;integer&gt;]</div><div class='del'>-[error_type: &lt;integer&gt;, &lt;mem error type string&gt;]</div><div class='del'>-</div><div class='del'>-&lt;mem error type string&gt;* :=</div><div class='del'>-unknown | no error | single-bit ECC | multi-bit ECC | \</div><div class='del'>-single-symbol chipkill ECC | multi-symbol chipkill ECC | master abort | \</div><div class='del'>-target abort | parity error | watchdog timeout | invalid address | \</div><div class='del'>-mirror Broken | memory sparing | scrub corrected error | \</div><div class='del'>-scrub uncorrected error</div><div class='del'>-</div><div class='del'>-&lt;pcie section data&gt; :=</div><div class='del'>-[port_type: &lt;integer&gt;, &lt;pcie port type string&gt;]</div><div class='del'>-[version: &lt;integer&gt;.&lt;integer&gt;]</div><div class='del'>-[command: &lt;integer&gt;, status: &lt;integer&gt;]</div><div class='del'>-[device_id: &lt;integer&gt;:&lt;integer&gt;:&lt;integer&gt;.&lt;integer&gt;</div><div class='del'>-slot: &lt;integer&gt;</div><div class='del'>-secondary_bus: &lt;integer&gt;</div><div class='del'>-vendor_id: &lt;integer&gt;, device_id: &lt;integer&gt;</div><div class='del'>-class_code: &lt;integer&gt;]</div><div class='del'>-[serial number: &lt;integer&gt;, &lt;integer&gt;]</div><div class='del'>-[bridge: secondary_status: &lt;integer&gt;, control: &lt;integer&gt;]</div><div class='del'>-[aer_status: &lt;integer&gt;, aer_mask: &lt;integer&gt;</div><div class='del'>-&lt;aer status string&gt;</div><div class='del'>-[aer_uncor_severity: &lt;integer&gt;]</div><div class='del'>-aer_layer=&lt;aer layer string&gt;, aer_agent=&lt;aer agent string&gt;</div><div class='del'>-aer_tlp_header: &lt;integer&gt; &lt;integer&gt; &lt;integer&gt; &lt;integer&gt;]</div><div class='del'>-</div><div class='del'>-&lt;pcie port type string&gt;* := PCIe end point | legacy PCI end point | \</div><div class='del'>-unknown | unknown | root port | upstream switch port | \</div><div class='del'>-downstream switch port | PCIe to PCI/PCI-X bridge | \</div><div class='del'>-PCI/PCI-X to PCIe bridge | root complex integrated endpoint device | \</div><div class='del'>-root complex event collector</div><div class='del'>-</div><div class='del'>-if section severity is fatal or recoverable</div><div class='del'>-&lt;aer status string&gt;# :=</div><div class='del'>-unknown | unknown | unknown | unknown | Data Link Protocol | \</div><div class='del'>-unknown | unknown | unknown | unknown | unknown | unknown | unknown | \</div><div class='del'>-Poisoned TLP | Flow Control Protocol | Completion Timeout | \</div><div class='del'>-Completer Abort | Unexpected Completion | Receiver Overflow | \</div><div class='del'>-Malformed TLP | ECRC | Unsupported Request</div><div class='del'>-else</div><div class='del'>-&lt;aer status string&gt;# :=</div><div class='del'>-Receiver Error | unknown | unknown | unknown | unknown | unknown | \</div><div class='del'>-Bad TLP | Bad DLLP | RELAY_NUM Rollover | unknown | unknown | unknown | \</div><div class='del'>-Replay Timer Timeout | Advisory Non-Fatal</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-&lt;aer layer string&gt; :=</div><div class='del'>-Physical Layer | Data Link Layer | Transaction Layer</div><div class='del'>-</div><div class='del'>-&lt;aer agent string&gt; :=</div><div class='del'>-Receiver ID | Requester ID | Completer ID | Transmitter ID</div><div class='del'>-</div><div class='del'>-Where, [] designate corresponding content is optional</div><div class='del'>-</div><div class='del'>-All &lt;field string&gt; description with * has the following format:</div><div class='del'>-</div><div class='del'>-field: &lt;integer&gt;, &lt;field string&gt;</div><div class='del'>-</div><div class='del'>-Where value of &lt;integer&gt; should be the position of "string" in &lt;field</div><div class='del'>-string&gt; description. Otherwise, &lt;field string&gt; will be "unknown".</div><div class='del'>-</div><div class='del'>-All &lt;field strings&gt; description with # has the following format:</div><div class='del'>-</div><div class='del'>-field: &lt;integer&gt;</div><div class='del'>-&lt;field strings&gt;</div><div class='del'>-</div><div class='del'>-Where each string in &lt;fields strings&gt; corresponding to one set bit of</div><div class='del'>-&lt;integer&gt;. The bit position is the position of "string" in &lt;field</div><div class='del'>-strings&gt; description.</div><div class='del'>-</div><div class='del'>-For more detailed explanation of every field, please refer to UEFI</div><div class='del'>-specification version 2.3 or later, section Appendix N: Common</div><div class='del'>-Platform Error Record.</div><div class='head'>diff --git a/Documentation/acpi/dsd/leds.txt b/Documentation/acpi/dsd/leds.txt<br/>new file mode 100644<br/>index 000000000000..81a63af42ed2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/dsd/leds.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/acpi/dsd/leds.txt</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+Describing and referring to LEDs in ACPI</div><div class='add'>+</div><div class='add'>+Individual LEDs are described by hierarchical data extension [6] nodes under the</div><div class='add'>+device node, the LED driver chip. The "reg" property in the LED specific nodes</div><div class='add'>+tells the numerical ID of each individual LED output to which the LEDs are</div><div class='add'>+connected. [3] The hierarchical data nodes are named "led@X", where X is the</div><div class='add'>+number of the LED output.</div><div class='add'>+</div><div class='add'>+Referring to LEDs in Device tree is documented in [4], in "flash-leds" property</div><div class='add'>+documentation. In short, LEDs are directly referred to by using phandles.</div><div class='add'>+</div><div class='add'>+While Device tree allows referring to any node in the tree[1], in ACPI</div><div class='add'>+references are limited to device nodes only [2]. For this reason using the same</div><div class='add'>+mechanism on ACPI is not possible. A mechanism to refer to non-device ACPI nodes</div><div class='add'>+is documented in [7].</div><div class='add'>+</div><div class='add'>+ACPI allows (as does DT) using integer arguments after the reference. A</div><div class='add'>+combination of the LED driver device reference and an integer argument,</div><div class='add'>+referring to the "reg" property of the relevant LED, is used to identify</div><div class='add'>+individual LEDs. The value of the "reg" property is a contract between the</div><div class='add'>+firmware and software, it uniquely identifies the LED driver outputs.</div><div class='add'>+</div><div class='add'>+Under the LED driver device, The first hierarchical data extension package list</div><div class='add'>+entry shall contain the string "led@" followed by the number of the LED,</div><div class='add'>+followed by the referred object name. That object shall be named "LED" followed</div><div class='add'>+by the number of the LED.</div><div class='add'>+</div><div class='add'>+An ASL example of a camera sensor device and a LED driver device for two LEDs.</div><div class='add'>+Objects not relevant for LEDs or the references to them have been omitted.</div><div class='add'>+</div><div class='add'>+	Device (LED)</div><div class='add'>+	{</div><div class='add'>+		Name (_DSD, Package () {</div><div class='add'>+			ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='add'>+			Package () {</div><div class='add'>+				Package () { "led@0", LED0 },</div><div class='add'>+				Package () { "led@1", LED1 },</div><div class='add'>+			}</div><div class='add'>+		})</div><div class='add'>+		Name (LED0, Package () {</div><div class='add'>+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+			Package () {</div><div class='add'>+				Package () { "reg", 0 },</div><div class='add'>+				Package () { "flash-max-microamp", 1000000 },</div><div class='add'>+				Package () { "flash-timeout-us", 200000 },</div><div class='add'>+				Package () { "led-max-microamp", 100000 },</div><div class='add'>+				Package () { "label", "white:flash" },</div><div class='add'>+			}</div><div class='add'>+		})</div><div class='add'>+		Name (LED1, Package () {</div><div class='add'>+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+			Package () {</div><div class='add'>+				Package () { "reg", 1 },</div><div class='add'>+				Package () { "led-max-microamp", 10000 },</div><div class='add'>+				Package () { "label", "red:indicator" },</div><div class='add'>+			}</div><div class='add'>+		})</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	Device (SEN)</div><div class='add'>+	{</div><div class='add'>+		Name (_DSD, Package () {</div><div class='add'>+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+			Package () {</div><div class='add'>+				Package () {</div><div class='add'>+					"flash-leds",</div><div class='add'>+					Package () { ^LED, "led@0", ^LED, "led@1" },</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		})</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+where</div><div class='add'>+</div><div class='add'>+	LED	LED driver device</div><div class='add'>+	LED0	First LED</div><div class='add'>+	LED1	Second LED</div><div class='add'>+	SEN	Camera sensor device (or another device the LED is</div><div class='add'>+		related to)</div><div class='add'>+</div><div class='add'>+[1] Device tree. &lt;URL:http://www.devicetree.org&gt;, referenced 2019-02-21.</div><div class='add'>+</div><div class='add'>+[2] Advanced Configuration and Power Interface Specification.</div><div class='add'>+    &lt;URL:https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf&gt;,</div><div class='add'>+    referenced 2019-02-21.</div><div class='add'>+</div><div class='add'>+[3] Documentation/devicetree/bindings/leds/common.txt</div><div class='add'>+</div><div class='add'>+[4] Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='add'>+</div><div class='add'>+[5] Device Properties UUID For _DSD.</div><div class='add'>+    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf&gt;,</div><div class='add'>+    referenced 2019-02-21.</div><div class='add'>+</div><div class='add'>+[6] Hierarchical Data Extension UUID For _DSD.</div><div class='add'>+    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf&gt;,</div><div class='add'>+    referenced 2019-02-21.</div><div class='add'>+</div><div class='add'>+[7] Documentation/acpi/dsd/data-node-reference.txt</div><div class='head'>diff --git a/Documentation/acpi/i2c-muxes.txt b/Documentation/acpi/i2c-muxes.txt<br/>deleted file mode 100644<br/>index 9fcc4f0b885e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/i2c-muxes.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/i2c-muxes.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-ACPI I2C Muxes</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-Describing an I2C device hierarchy that includes I2C muxes requires an ACPI</div><div class='del'>-Device () scope per mux channel.</div><div class='del'>-</div><div class='del'>-Consider this topology:</div><div class='del'>-</div><div class='del'>-+------+   +------+</div><div class='del'>-| SMB1 |--&gt;| MUX0 |--CH00--&gt; i2c client A (0x50)</div><div class='del'>-|      |   | 0x70 |--CH01--&gt; i2c client B (0x50)</div><div class='del'>-+------+   +------+</div><div class='del'>-</div><div class='del'>-which corresponds to the following ASL:</div><div class='del'>-</div><div class='del'>-Device (SMB1)</div><div class='del'>-{</div><div class='del'>-    Name (_HID, ...)</div><div class='del'>-    Device (MUX0)</div><div class='del'>-    {</div><div class='del'>-        Name (_HID, ...)</div><div class='del'>-        Name (_CRS, ResourceTemplate () {</div><div class='del'>-            I2cSerialBus (0x70, ControllerInitiated, I2C_SPEED,</div><div class='del'>-                          AddressingMode7Bit, "^SMB1", 0x00,</div><div class='del'>-                          ResourceConsumer,,)</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        Device (CH00)</div><div class='del'>-        {</div><div class='del'>-            Name (_ADR, 0)</div><div class='del'>-</div><div class='del'>-            Device (CLIA)</div><div class='del'>-            {</div><div class='del'>-                Name (_HID, ...)</div><div class='del'>-                Name (_CRS, ResourceTemplate () {</div><div class='del'>-                    I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,</div><div class='del'>-                                  AddressingMode7Bit, "^CH00", 0x00,</div><div class='del'>-                                  ResourceConsumer,,)</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        Device (CH01)</div><div class='del'>-        {</div><div class='del'>-            Name (_ADR, 1)</div><div class='del'>-</div><div class='del'>-            Device (CLIB)</div><div class='del'>-            {</div><div class='del'>-                Name (_HID, ...)</div><div class='del'>-                Name (_CRS, ResourceTemplate () {</div><div class='del'>-                    I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,</div><div class='del'>-                                  AddressingMode7Bit, "^CH01", 0x00,</div><div class='del'>-                                  ResourceConsumer,,)</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-}</div><div class='head'>diff --git a/Documentation/acpi/initrd_table_override.txt b/Documentation/acpi/initrd_table_override.txt<br/>deleted file mode 100644<br/>index 30437a6db373..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/initrd_table_override.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/initrd_table_override.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,111 +0,0 @@</div><div class='del'>-Upgrading ACPI tables via initrd</div><div class='del'>-================================</div><div class='del'>-</div><div class='del'>-1) Introduction (What is this about)</div><div class='del'>-2) What is this for</div><div class='del'>-3) How does it work</div><div class='del'>-4) References (Where to retrieve userspace tools)</div><div class='del'>-</div><div class='del'>-1) What is this about</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-If the ACPI_TABLE_UPGRADE compile option is true, it is possible to</div><div class='del'>-upgrade the ACPI execution environment that is defined by the ACPI tables</div><div class='del'>-via upgrading the ACPI tables provided by the BIOS with an instrumented,</div><div class='del'>-modified, more recent version one, or installing brand new ACPI tables.</div><div class='del'>-</div><div class='del'>-When building initrd with kernel in a single image, option</div><div class='del'>-ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD should also be true for this</div><div class='del'>-feature to work.</div><div class='del'>-</div><div class='del'>-For a full list of ACPI tables that can be upgraded/installed, take a look</div><div class='del'>-at the char *table_sigs[MAX_ACPI_SIGNATURE]; definition in</div><div class='del'>-drivers/acpi/tables.c.</div><div class='del'>-All ACPI tables iasl (Intel's ACPI compiler and disassembler) knows should</div><div class='del'>-be overridable, except:</div><div class='del'>-   - ACPI_SIG_RSDP (has a signature of 6 bytes)</div><div class='del'>-   - ACPI_SIG_FACS (does not have an ordinary ACPI table header)</div><div class='del'>-Both could get implemented as well.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2) What is this for</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-Complain to your platform/BIOS vendor if you find a bug which is so severe</div><div class='del'>-that a workaround is not accepted in the Linux kernel. And this facility</div><div class='del'>-allows you to upgrade the buggy tables before your platform/BIOS vendor</div><div class='del'>-releases an upgraded BIOS binary.</div><div class='del'>-</div><div class='del'>-This facility can be used by platform/BIOS vendors to provide a Linux</div><div class='del'>-compatible environment without modifying the underlying platform firmware.</div><div class='del'>-</div><div class='del'>-This facility also provides a powerful feature to easily debug and test</div><div class='del'>-ACPI BIOS table compatibility with the Linux kernel by modifying old</div><div class='del'>-platform provided ACPI tables or inserting new ACPI tables.</div><div class='del'>-</div><div class='del'>-It can and should be enabled in any kernel because there is no functional</div><div class='del'>-change with not instrumented initrds.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3) How does it work</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-# Extract the machine's ACPI tables:</div><div class='del'>-cd /tmp</div><div class='del'>-acpidump &gt;acpidump</div><div class='del'>-acpixtract -a acpidump</div><div class='del'>-# Disassemble, modify and recompile them:</div><div class='del'>-iasl -d *.dat</div><div class='del'>-# For example add this statement into a _PRT (PCI Routing Table) function</div><div class='del'>-# of the DSDT:</div><div class='del'>-Store("HELLO WORLD", debug)</div><div class='del'>-# And increase the OEM Revision. For example, before modification:</div><div class='del'>-DefinitionBlock ("DSDT.aml", "DSDT", 2, "INTEL ", "TEMPLATE", 0x00000000)</div><div class='del'>-# After modification:</div><div class='del'>-DefinitionBlock ("DSDT.aml", "DSDT", 2, "INTEL ", "TEMPLATE", 0x00000001)</div><div class='del'>-iasl -sa dsdt.dsl</div><div class='del'>-# Add the raw ACPI tables to an uncompressed cpio archive.</div><div class='del'>-# They must be put into a /kernel/firmware/acpi directory inside the cpio</div><div class='del'>-# archive. Note that if the table put here matches a platform table</div><div class='del'>-# (similar Table Signature, and similar OEMID, and similar OEM Table ID)</div><div class='del'>-# with a more recent OEM Revision, the platform table will be upgraded by</div><div class='del'>-# this table. If the table put here doesn't match a platform table</div><div class='del'>-# (dissimilar Table Signature, or dissimilar OEMID, or dissimilar OEM Table</div><div class='del'>-# ID), this table will be appended.</div><div class='del'>-mkdir -p kernel/firmware/acpi</div><div class='del'>-cp dsdt.aml kernel/firmware/acpi</div><div class='del'>-# A maximum of "NR_ACPI_INITRD_TABLES (64)" tables are currently allowed</div><div class='del'>-# (see osl.c):</div><div class='del'>-iasl -sa facp.dsl</div><div class='del'>-iasl -sa ssdt1.dsl</div><div class='del'>-cp facp.aml kernel/firmware/acpi</div><div class='del'>-cp ssdt1.aml kernel/firmware/acpi</div><div class='del'>-# The uncompressed cpio archive must be the first. Other, typically</div><div class='del'>-# compressed cpio archives, must be concatenated on top of the uncompressed</div><div class='del'>-# one. Following command creates the uncompressed cpio archive and</div><div class='del'>-# concatenates the original initrd on top:</div><div class='del'>-find kernel | cpio -H newc --create &gt; /boot/instrumented_initrd</div><div class='del'>-cat /boot/initrd &gt;&gt;/boot/instrumented_initrd</div><div class='del'>-# reboot with increased acpi debug level, e.g. boot params:</div><div class='del'>-acpi.debug_level=0x2 acpi.debug_layer=0xFFFFFFFF</div><div class='del'>-# and check your syslog:</div><div class='del'>-[    1.268089] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]</div><div class='del'>-[    1.272091] [ACPI Debug]  String [0x0B] "HELLO WORLD"</div><div class='del'>-</div><div class='del'>-iasl is able to disassemble and recompile quite a lot different,</div><div class='del'>-also static ACPI tables.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4) Where to retrieve userspace tools</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-iasl and acpixtract are part of Intel's ACPICA project:</div><div class='del'>-http://acpica.org/</div><div class='del'>-and should be packaged by distributions (for example in the acpica package</div><div class='del'>-on SUSE).</div><div class='del'>-</div><div class='del'>-acpidump can be found in Len Browns pmtools:</div><div class='del'>-ftp://kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools/acpidump</div><div class='del'>-This tool is also part of the acpica package on SUSE.</div><div class='del'>-Alternatively, used ACPI tables can be retrieved via sysfs in latest kernels:</div><div class='del'>-/sys/firmware/acpi/tables</div><div class='head'>diff --git a/Documentation/acpi/method-customizing.txt b/Documentation/acpi/method-customizing.txt<br/>deleted file mode 100644<br/>index 7235da975f23..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/method-customizing.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/method-customizing.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-Linux ACPI Custom Control Method How To</div><div class='del'>-=======================================</div><div class='del'>-</div><div class='del'>-Written by Zhang Rui &lt;rui.zhang@intel.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Linux supports customizing ACPI control methods at runtime.</div><div class='del'>-</div><div class='del'>-Users can use this to</div><div class='del'>-1. override an existing method which may not work correctly,</div><div class='del'>-   or just for debugging purposes.</div><div class='del'>-2. insert a completely new method in order to create a missing</div><div class='del'>-   method such as _OFF, _ON, _STA, _INI, etc.</div><div class='del'>-For these cases, it is far simpler to dynamically install a single</div><div class='del'>-control method rather than override the entire DSDT, because kernel</div><div class='del'>-rebuild/reboot is not needed and test result can be got in minutes.</div><div class='del'>-</div><div class='del'>-Note: Only ACPI METHOD can be overridden, any other object types like</div><div class='del'>-      "Device", "OperationRegion", are not recognized. Methods</div><div class='del'>-      declared inside scope operators are also not supported.</div><div class='del'>-Note: The same ACPI control method can be overridden for many times,</div><div class='del'>-      and it's always the latest one that used by Linux/kernel.</div><div class='del'>-Note: To get the ACPI debug object output (Store (AAAA, Debug)),</div><div class='del'>-      please run "echo 1 &gt; /sys/module/acpi/parameters/aml_debug_output".</div><div class='del'>-</div><div class='del'>-1. override an existing method</div><div class='del'>-   a) get the ACPI table via ACPI sysfs I/F. e.g. to get the DSDT,</div><div class='del'>-      just run "cat /sys/firmware/acpi/tables/DSDT &gt; /tmp/dsdt.dat"</div><div class='del'>-   b) disassemble the table by running "iasl -d dsdt.dat".</div><div class='del'>-   c) rewrite the ASL code of the method and save it in a new file,</div><div class='del'>-   d) package the new file (psr.asl) to an ACPI table format.</div><div class='del'>-      Here is an example of a customized \_SB._AC._PSR method,</div><div class='del'>-</div><div class='del'>-      DefinitionBlock ("", "SSDT", 1, "", "", 0x20080715)</div><div class='del'>-      {</div><div class='del'>-	Method (\_SB_.AC._PSR, 0, NotSerialized)</div><div class='del'>-	{</div><div class='del'>-		Store ("In AC _PSR", Debug)</div><div class='del'>-		Return (ACON)</div><div class='del'>-	}</div><div class='del'>-      }</div><div class='del'>-      Note that the full pathname of the method in ACPI namespace</div><div class='del'>-      should be used.</div><div class='del'>-   e) assemble the file to generate the AML code of the method.</div><div class='del'>-      e.g. "iasl -vw 6084 psr.asl" (psr.aml is generated as a result)</div><div class='del'>-      If parameter "-vw 6084" is not supported by your iASL compiler,</div><div class='del'>-      please try a newer version.</div><div class='del'>-   f) mount debugfs by "mount -t debugfs none /sys/kernel/debug"</div><div class='del'>-   g) override the old method via the debugfs by running</div><div class='del'>-      "cat /tmp/psr.aml &gt; /sys/kernel/debug/acpi/custom_method"</div><div class='del'>-</div><div class='del'>-2. insert a new method</div><div class='del'>-   This is easier than overriding an existing method.</div><div class='del'>-   We just need to create the ASL code of the method we want to</div><div class='del'>-   insert and then follow the step c) ~ g) in section 1.</div><div class='del'>-</div><div class='del'>-3. undo your changes</div><div class='del'>-   The "undo" operation is not supported for a new inserted method</div><div class='del'>-   right now, i.e. we can not remove a method currently.</div><div class='del'>-   For an overridden method, in order to undo your changes, please</div><div class='del'>-   save a copy of the method original ASL code in step c) section 1,</div><div class='del'>-   and redo step c) ~ g) to override the method with the original one.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Note: We can use a kernel with multiple custom ACPI method running,</div><div class='del'>-      But each individual write to debugfs can implement a SINGLE</div><div class='del'>-      method override. i.e. if we want to insert/override multiple</div><div class='del'>-      ACPI methods, we need to redo step c) ~ g) for multiple times.</div><div class='del'>-</div><div class='del'>-Note: Be aware that root can mis-use this driver to modify arbitrary</div><div class='del'>-      memory and gain additional rights, if root's privileges got</div><div class='del'>-      restricted (for example if root is not allowed to load additional</div><div class='del'>-      modules after boot).</div><div class='head'>diff --git a/Documentation/acpi/method-tracing.txt b/Documentation/acpi/method-tracing.txt<br/>deleted file mode 100644<br/>index 0aba14c8f459..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/method-tracing.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/method-tracing.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,192 +0,0 @@</div><div class='del'>-ACPICA Trace Facility</div><div class='del'>-</div><div class='del'>-Copyright (C) 2015, Intel Corporation</div><div class='del'>-Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Abstract:</div><div class='del'>-</div><div class='del'>-This document describes the functions and the interfaces of the method</div><div class='del'>-tracing facility.</div><div class='del'>-</div><div class='del'>-1. Functionalities and usage examples:</div><div class='del'>-</div><div class='del'>-   ACPICA provides method tracing capability. And two functions are</div><div class='del'>-   currently implemented using this capability.</div><div class='del'>-</div><div class='del'>-   A. Log reducer</div><div class='del'>-   ACPICA subsystem provides debugging outputs when CONFIG_ACPI_DEBUG is</div><div class='del'>-   enabled. The debugging messages which are deployed via</div><div class='del'>-   ACPI_DEBUG_PRINT() macro can be reduced at 2 levels - per-component</div><div class='del'>-   level (known as debug layer, configured via</div><div class='del'>-   /sys/module/acpi/parameters/debug_layer) and per-type level (known as</div><div class='del'>-   debug level, configured via /sys/module/acpi/parameters/debug_level).</div><div class='del'>-</div><div class='del'>-   But when the particular layer/level is applied to the control method</div><div class='del'>-   evaluations, the quantity of the debugging outputs may still be too</div><div class='del'>-   large to be put into the kernel log buffer. The idea thus is worked out</div><div class='del'>-   to only enable the particular debug layer/level (normally more detailed)</div><div class='del'>-   logs when the control method evaluation is started, and disable the</div><div class='del'>-   detailed logging when the control method evaluation is stopped.</div><div class='del'>-</div><div class='del'>-   The following command examples illustrate the usage of the "log reducer"</div><div class='del'>-   functionality:</div><div class='del'>-   a. Filter out the debug layer/level matched logs when control methods</div><div class='del'>-      are being evaluated:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0xXXXXXXXX" &gt; trace_debug_layer</div><div class='del'>-      # echo "0xYYYYYYYY" &gt; trace_debug_level</div><div class='del'>-      # echo "enable" &gt; trace_state</div><div class='del'>-   b. Filter out the debug layer/level matched logs when the specified</div><div class='del'>-      control method is being evaluated:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0xXXXXXXXX" &gt; trace_debug_layer</div><div class='del'>-      # echo "0xYYYYYYYY" &gt; trace_debug_level</div><div class='del'>-      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='del'>-      # echo "method" &gt; /sys/module/acpi/parameters/trace_state</div><div class='del'>-   c. Filter out the debug layer/level matched logs when the specified</div><div class='del'>-      control method is being evaluated for the first time:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0xXXXXXXXX" &gt; trace_debug_layer</div><div class='del'>-      # echo "0xYYYYYYYY" &gt; trace_debug_level</div><div class='del'>-      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='del'>-      # echo "method-once" &gt; /sys/module/acpi/parameters/trace_state</div><div class='del'>-   Where:</div><div class='del'>-      0xXXXXXXXX/0xYYYYYYYY: Refer to Documentation/acpi/debug.txt for</div><div class='del'>-			     possible debug layer/level masking values.</div><div class='del'>-      \PPPP.AAAA.TTTT.HHHH: Full path of a control method that can be found</div><div class='del'>-			    in the ACPI namespace. It needn't be an entry</div><div class='del'>-			    of a control method evaluation.</div><div class='del'>-</div><div class='del'>-   B. AML tracer</div><div class='del'>-</div><div class='del'>-   There are special log entries added by the method tracing facility at</div><div class='del'>-   the "trace points" the AML interpreter starts/stops to execute a control</div><div class='del'>-   method, or an AML opcode. Note that the format of the log entries are</div><div class='del'>-   subject to change:</div><div class='del'>-     [    0.186427]   exdebug-0398 ex_trace_point        : Method Begin [0xf58394d8:\_SB.PCI0.LPCB.ECOK] execution.</div><div class='del'>-     [    0.186630]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905c88:If] execution.</div><div class='del'>-     [    0.186820]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905cc0:LEqual] execution.</div><div class='del'>-     [    0.187010]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905a20:-NamePath-] execution.</div><div class='del'>-     [    0.187214]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905a20:-NamePath-] execution.</div><div class='del'>-     [    0.187407]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905f60:One] execution.</div><div class='del'>-     [    0.187594]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905f60:One] execution.</div><div class='del'>-     [    0.187789]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905cc0:LEqual] execution.</div><div class='del'>-     [    0.187980]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905cc0:Return] execution.</div><div class='del'>-     [    0.188146]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905f60:One] execution.</div><div class='del'>-     [    0.188334]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905f60:One] execution.</div><div class='del'>-     [    0.188524]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905cc0:Return] execution.</div><div class='del'>-     [    0.188712]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905c88:If] execution.</div><div class='del'>-     [    0.188903]   exdebug-0398 ex_trace_point        : Method End [0xf58394d8:\_SB.PCI0.LPCB.ECOK] execution.</div><div class='del'>-</div><div class='del'>-   Developers can utilize these special log entries to track the AML</div><div class='del'>-   interpretion, thus can aid issue debugging and performance tuning. Note</div><div class='del'>-   that, as the "AML tracer" logs are implemented via ACPI_DEBUG_PRINT()</div><div class='del'>-   macro, CONFIG_ACPI_DEBUG is also required to be enabled for enabling</div><div class='del'>-   "AML tracer" logs.</div><div class='del'>-</div><div class='del'>-   The following command examples illustrate the usage of the "AML tracer"</div><div class='del'>-   functionality:</div><div class='del'>-   a. Filter out the method start/stop "AML tracer" logs when control</div><div class='del'>-      methods are being evaluated:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0x80" &gt; trace_debug_layer</div><div class='del'>-      # echo "0x10" &gt; trace_debug_level</div><div class='del'>-      # echo "enable" &gt; trace_state</div><div class='del'>-   b. Filter out the method start/stop "AML tracer" when the specified</div><div class='del'>-      control method is being evaluated:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0x80" &gt; trace_debug_layer</div><div class='del'>-      # echo "0x10" &gt; trace_debug_level</div><div class='del'>-      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='del'>-      # echo "method" &gt; trace_state</div><div class='del'>-   c. Filter out the method start/stop "AML tracer" logs when the specified</div><div class='del'>-      control method is being evaluated for the first time:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0x80" &gt; trace_debug_layer</div><div class='del'>-      # echo "0x10" &gt; trace_debug_level</div><div class='del'>-      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='del'>-      # echo "method-once" &gt; trace_state</div><div class='del'>-   d. Filter out the method/opcode start/stop "AML tracer" when the</div><div class='del'>-      specified control method is being evaluated:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0x80" &gt; trace_debug_layer</div><div class='del'>-      # echo "0x10" &gt; trace_debug_level</div><div class='del'>-      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='del'>-      # echo "opcode" &gt; trace_state</div><div class='del'>-   e. Filter out the method/opcode start/stop "AML tracer" when the</div><div class='del'>-      specified control method is being evaluated for the first time:</div><div class='del'>-      # cd /sys/module/acpi/parameters</div><div class='del'>-      # echo "0x80" &gt; trace_debug_layer</div><div class='del'>-      # echo "0x10" &gt; trace_debug_level</div><div class='del'>-      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='del'>-      # echo "opcode-opcode" &gt; trace_state</div><div class='del'>-</div><div class='del'>-  Note that all above method tracing facility related module parameters can</div><div class='del'>-  be used as the boot parameters, for example:</div><div class='del'>-      acpi.trace_debug_layer=0x80 acpi.trace_debug_level=0x10 \</div><div class='del'>-      acpi.trace_method_name=\_SB.LID0._LID acpi.trace_state=opcode-once</div><div class='del'>-</div><div class='del'>-2. Interface descriptions:</div><div class='del'>-</div><div class='del'>-   All method tracing functions can be configured via ACPI module</div><div class='del'>-   parameters that are accessible at /sys/module/acpi/parameters/:</div><div class='del'>-</div><div class='del'>-   trace_method_name</div><div class='del'>-	The full path of the AML method that the user wants to trace.</div><div class='del'>-	Note that the full path shouldn't contain the trailing "_"s in its</div><div class='del'>-	name segments but may contain "\" to form an absolute path.</div><div class='del'>-</div><div class='del'>-   trace_debug_layer</div><div class='del'>-	The temporary debug_layer used when the tracing feature is enabled.</div><div class='del'>-	Using ACPI_EXECUTER (0x80) by default, which is the debug_layer</div><div class='del'>-	used to match all "AML tracer" logs.</div><div class='del'>-</div><div class='del'>-   trace_debug_level</div><div class='del'>-	The temporary debug_level used when the tracing feature is enabled.</div><div class='del'>-	Using ACPI_LV_TRACE_POINT (0x10) by default, which is the</div><div class='del'>-	debug_level used to match all "AML tracer" logs.</div><div class='del'>-</div><div class='del'>-   trace_state</div><div class='del'>-	The status of the tracing feature.</div><div class='del'>-	Users can enable/disable this debug tracing feature by executing</div><div class='del'>-	the following command:</div><div class='del'>-	    # echo string &gt; /sys/module/acpi/parameters/trace_state</div><div class='del'>-	Where "string" should be one of the following:</div><div class='del'>-	"disable"</div><div class='del'>-	    Disable the method tracing feature.</div><div class='del'>-	"enable"</div><div class='del'>-	    Enable the method tracing feature.</div><div class='del'>-	    ACPICA debugging messages matching</div><div class='del'>-	    "trace_debug_layer/trace_debug_level" during any method</div><div class='del'>-	    execution will be logged.</div><div class='del'>-	"method"</div><div class='del'>-	    Enable the method tracing feature.</div><div class='del'>-	    ACPICA debugging messages matching</div><div class='del'>-	    "trace_debug_layer/trace_debug_level" during method execution</div><div class='del'>-	    of "trace_method_name" will be logged.</div><div class='del'>-	"method-once"</div><div class='del'>-	    Enable the method tracing feature.</div><div class='del'>-	    ACPICA debugging messages matching</div><div class='del'>-	    "trace_debug_layer/trace_debug_level" during method execution</div><div class='del'>-	    of "trace_method_name" will be logged only once.</div><div class='del'>-	"opcode"</div><div class='del'>-	    Enable the method tracing feature.</div><div class='del'>-	    ACPICA debugging messages matching</div><div class='del'>-	    "trace_debug_layer/trace_debug_level" during method/opcode</div><div class='del'>-	    execution of "trace_method_name" will be logged.</div><div class='del'>-	"opcode-once"</div><div class='del'>-	    Enable the method tracing feature.</div><div class='del'>-	    ACPICA debugging messages matching</div><div class='del'>-	    "trace_debug_layer/trace_debug_level" during method/opcode</div><div class='del'>-	    execution of "trace_method_name" will be logged only once.</div><div class='del'>-	Note that, the difference between the "enable" and other feature</div><div class='del'>-        enabling options are:</div><div class='del'>-	1. When "enable" is specified, since</div><div class='del'>-	   "trace_debug_layer/trace_debug_level" shall apply to all control</div><div class='del'>-	   method evaluations, after configuring "trace_state" to "enable",</div><div class='del'>-	   "trace_method_name" will be reset to NULL.</div><div class='del'>-	2. When "method/opcode" is specified, if</div><div class='del'>-	   "trace_method_name" is NULL when "trace_state" is configured to</div><div class='del'>-	   these options, the "trace_debug_layer/trace_debug_level" will</div><div class='del'>-	   apply to all control method evaluations.</div><div class='head'>diff --git a/Documentation/acpi/ssdt-overlays.txt b/Documentation/acpi/ssdt-overlays.txt<br/>deleted file mode 100644<br/>index 5ae13f161ea2..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/ssdt-overlays.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/ssdt-overlays.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,172 +0,0 @@</div><div class='del'>-</div><div class='del'>-In order to support ACPI open-ended hardware configurations (e.g. development</div><div class='del'>-boards) we need a way to augment the ACPI configuration provided by the firmware</div><div class='del'>-image. A common example is connecting sensors on I2C / SPI buses on development</div><div class='del'>-boards.</div><div class='del'>-</div><div class='del'>-Although this can be accomplished by creating a kernel platform driver or</div><div class='del'>-recompiling the firmware image with updated ACPI tables, neither is practical:</div><div class='del'>-the former proliferates board specific kernel code while the latter requires</div><div class='del'>-access to firmware tools which are often not publicly available.</div><div class='del'>-</div><div class='del'>-Because ACPI supports external references in AML code a more practical</div><div class='del'>-way to augment firmware ACPI configuration is by dynamically loading</div><div class='del'>-user defined SSDT tables that contain the board specific information.</div><div class='del'>-</div><div class='del'>-For example, to enumerate a Bosch BMA222E accelerometer on the I2C bus of the</div><div class='del'>-Minnowboard MAX development board exposed via the LSE connector [1], the</div><div class='del'>-following ASL code can be used:</div><div class='del'>-</div><div class='del'>-DefinitionBlock ("minnowmax.aml", "SSDT", 1, "Vendor", "Accel", 0x00000003)</div><div class='del'>-{</div><div class='del'>-    External (\_SB.I2C6, DeviceObj)</div><div class='del'>-</div><div class='del'>-    Scope (\_SB.I2C6)</div><div class='del'>-    {</div><div class='del'>-        Device (STAC)</div><div class='del'>-        {</div><div class='del'>-            Name (_ADR, Zero)</div><div class='del'>-            Name (_HID, "BMA222E")</div><div class='del'>-</div><div class='del'>-            Method (_CRS, 0, Serialized)</div><div class='del'>-            {</div><div class='del'>-                Name (RBUF, ResourceTemplate ()</div><div class='del'>-                {</div><div class='del'>-                    I2cSerialBus (0x0018, ControllerInitiated, 0x00061A80,</div><div class='del'>-                                  AddressingMode7Bit, "\\_SB.I2C6", 0x00,</div><div class='del'>-                                  ResourceConsumer, ,)</div><div class='del'>-                    GpioInt (Edge, ActiveHigh, Exclusive, PullDown, 0x0000,</div><div class='del'>-                             "\\_SB.GPO2", 0x00, ResourceConsumer, , )</div><div class='del'>-                    { // Pin list</div><div class='del'>-                        0</div><div class='del'>-                    }</div><div class='del'>-                })</div><div class='del'>-                Return (RBUF)</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-which can then be compiled to AML binary format:</div><div class='del'>-</div><div class='del'>-$ iasl minnowmax.asl</div><div class='del'>-</div><div class='del'>-Intel ACPI Component Architecture</div><div class='del'>-ASL Optimizing Compiler version 20140214-64 [Mar 29 2014]</div><div class='del'>-Copyright (c) 2000 - 2014 Intel Corporation</div><div class='del'>-</div><div class='del'>-ASL Input:     minnomax.asl - 30 lines, 614 bytes, 7 keywords</div><div class='del'>-AML Output:    minnowmax.aml - 165 bytes, 6 named objects, 1 executable opcodes</div><div class='del'>-</div><div class='del'>-[1] http://wiki.minnowboard.org/MinnowBoard_MAX#Low_Speed_Expansion_Connector_.28Top.29</div><div class='del'>-</div><div class='del'>-The resulting AML code can then be loaded by the kernel using one of the methods</div><div class='del'>-below.</div><div class='del'>-</div><div class='del'>-== Loading ACPI SSDTs from initrd ==</div><div class='del'>-</div><div class='del'>-This option allows loading of user defined SSDTs from initrd and it is useful</div><div class='del'>-when the system does not support EFI or when there is not enough EFI storage.</div><div class='del'>-</div><div class='del'>-It works in a similar way with initrd based ACPI tables override/upgrade: SSDT</div><div class='del'>-aml code must be placed in the first, uncompressed, initrd under the</div><div class='del'>-"kernel/firmware/acpi" path. Multiple files can be used and this will translate</div><div class='del'>-in loading multiple tables. Only SSDT and OEM tables are allowed. See</div><div class='del'>-initrd_table_override.txt for more details.</div><div class='del'>-</div><div class='del'>-Here is an example:</div><div class='del'>-</div><div class='del'>-# Add the raw ACPI tables to an uncompressed cpio archive.</div><div class='del'>-# They must be put into a /kernel/firmware/acpi directory inside the</div><div class='del'>-# cpio archive.</div><div class='del'>-# The uncompressed cpio archive must be the first.</div><div class='del'>-# Other, typically compressed cpio archives, must be</div><div class='del'>-# concatenated on top of the uncompressed one.</div><div class='del'>-mkdir -p kernel/firmware/acpi</div><div class='del'>-cp ssdt.aml kernel/firmware/acpi</div><div class='del'>-</div><div class='del'>-# Create the uncompressed cpio archive and concatenate the original initrd</div><div class='del'>-# on top:</div><div class='del'>-find kernel | cpio -H newc --create &gt; /boot/instrumented_initrd</div><div class='del'>-cat /boot/initrd &gt;&gt;/boot/instrumented_initrd</div><div class='del'>-</div><div class='del'>-== Loading ACPI SSDTs from EFI variables ==</div><div class='del'>-</div><div class='del'>-This is the preferred method, when EFI is supported on the platform, because it</div><div class='del'>-allows a persistent, OS independent way of storing the user defined SSDTs. There</div><div class='del'>-is also work underway to implement EFI support for loading user defined SSDTs</div><div class='del'>-and using this method will make it easier to convert to the EFI loading</div><div class='del'>-mechanism when that will arrive.</div><div class='del'>-</div><div class='del'>-In order to load SSDTs from an EFI variable the efivar_ssdt kernel command line</div><div class='del'>-parameter can be used. The argument for the option is the variable name to</div><div class='del'>-use. If there are multiple variables with the same name but with different</div><div class='del'>-vendor GUIDs, all of them will be loaded.</div><div class='del'>-</div><div class='del'>-In order to store the AML code in an EFI variable the efivarfs filesystem can be</div><div class='del'>-used. It is enabled and mounted by default in /sys/firmware/efi/efivars in all</div><div class='del'>-recent distribution.</div><div class='del'>-</div><div class='del'>-Creating a new file in /sys/firmware/efi/efivars will automatically create a new</div><div class='del'>-EFI variable. Updating a file in /sys/firmware/efi/efivars will update the EFI</div><div class='del'>-variable. Please note that the file name needs to be specially formatted as</div><div class='del'>-"Name-GUID" and that the first 4 bytes in the file (little-endian format)</div><div class='del'>-represent the attributes of the EFI variable (see EFI_VARIABLE_MASK in</div><div class='del'>-include/linux/efi.h). Writing to the file must also be done with one write</div><div class='del'>-operation.</div><div class='del'>-</div><div class='del'>-For example, you can use the following bash script to create/update an EFI</div><div class='del'>-variable with the content from a given file:</div><div class='del'>-</div><div class='del'>-#!/bin/sh -e</div><div class='del'>-</div><div class='del'>-while ! [ -z "$1" ]; do</div><div class='del'>-        case "$1" in</div><div class='del'>-        "-f") filename="$2"; shift;;</div><div class='del'>-        "-g") guid="$2"; shift;;</div><div class='del'>-        *) name="$1";;</div><div class='del'>-        esac</div><div class='del'>-        shift</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-usage()</div><div class='del'>-{</div><div class='del'>-        echo "Syntax: ${0##*/} -f filename [ -g guid ] name"</div><div class='del'>-        exit 1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-[ -n "$name" -a -f "$filename" ] || usage</div><div class='del'>-</div><div class='del'>-EFIVARFS="/sys/firmware/efi/efivars"</div><div class='del'>-</div><div class='del'>-[ -d "$EFIVARFS" ] || exit 2</div><div class='del'>-</div><div class='del'>-if stat -tf $EFIVARFS | grep -q -v de5e81e4; then</div><div class='del'>-        mount -t efivarfs none $EFIVARFS</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# try to pick up an existing GUID</div><div class='del'>-[ -n "$guid" ] || guid=$(find "$EFIVARFS" -name "$name-*" | head -n1 | cut -f2- -d-)</div><div class='del'>-</div><div class='del'>-# use a randomly generated GUID</div><div class='del'>-[ -n "$guid" ] || guid="$(cat /proc/sys/kernel/random/uuid)"</div><div class='del'>-</div><div class='del'>-# efivarfs expects all of the data in one write</div><div class='del'>-tmp=$(mktemp)</div><div class='del'>-/bin/echo -ne "\007\000\000\000" | cat - $filename &gt; $tmp</div><div class='del'>-dd if=$tmp of="$EFIVARFS/$name-$guid" bs=$(stat -c %s $tmp)</div><div class='del'>-rm $tmp</div><div class='del'>-</div><div class='del'>-== Loading ACPI SSDTs from configfs ==</div><div class='del'>-</div><div class='del'>-This option allows loading of user defined SSDTs from userspace via the configfs</div><div class='del'>-interface. The CONFIG_ACPI_CONFIGFS option must be select and configfs must be</div><div class='del'>-mounted. In the following examples, we assume that configfs has been mounted in</div><div class='del'>-/config.</div><div class='del'>-</div><div class='del'>-New tables can be loading by creating new directories in /config/acpi/table/ and</div><div class='del'>-writing the SSDT aml code in the aml attribute:</div><div class='del'>-</div><div class='del'>-cd /config/acpi/table</div><div class='del'>-mkdir my_ssdt</div><div class='del'>-cat ~/ssdt.aml &gt; my_ssdt/aml</div><div class='head'>diff --git a/Documentation/acpi/cppc_sysfs.txt b/Documentation/admin-guide/acpi/cppc_sysfs.rst<br/>index f20fb445135d..a4b99afbe331 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/cppc_sysfs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/cppc_sysfs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/acpi/cppc_sysfs.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/acpi/cppc_sysfs.rst</a></div><div class='hunk'>@@ -1,5 +1,11 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='del'>-	Collaborative Processor Performance Control (CPPC)</div><div class='add'>+==================================================</div><div class='add'>+Collaborative Processor Performance Control (CPPC)</div><div class='add'>+==================================================</div><div class='add'>+</div><div class='add'>+CPPC</div><div class='add'>+====</div><div class='ctx'> </div><div class='ctx'> CPPC defined in the ACPI spec describes a mechanism for the OS to manage the</div><div class='ctx'> performance of a logical processor on a contigious and abstract performance</div><div class='hunk'>@@ -10,31 +16,28 @@ For more details on CPPC please refer to the ACPI specification at:</div><div class='ctx'> </div><div class='ctx'> http://uefi.org/specifications</div><div class='ctx'> </div><div class='del'>-Some of the CPPC registers are exposed via sysfs under:</div><div class='del'>-</div><div class='del'>-/sys/devices/system/cpu/cpuX/acpi_cppc/</div><div class='del'>-</div><div class='del'>-for each cpu X</div><div class='add'>+Some of the CPPC registers are exposed via sysfs under::</div><div class='ctx'> </div><div class='del'>---------------------------------------------------------------------------------</div><div class='add'>+  /sys/devices/system/cpu/cpuX/acpi_cppc/</div><div class='ctx'> </div><div class='del'>-$ ls -lR  /sys/devices/system/cpu/cpu0/acpi_cppc/</div><div class='del'>-/sys/devices/system/cpu/cpu0/acpi_cppc/:</div><div class='del'>-total 0</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 feedback_ctrs</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 highest_perf</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 lowest_freq</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 lowest_nonlinear_perf</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 lowest_perf</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 nominal_freq</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 nominal_perf</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 reference_perf</div><div class='del'>--r--r--r-- 1 root root 65536 Mar  5 19:38 wraparound_time</div><div class='add'>+for each cpu X::</div><div class='ctx'> </div><div class='del'>---------------------------------------------------------------------------------</div><div class='add'>+  $ ls -lR  /sys/devices/system/cpu/cpu0/acpi_cppc/</div><div class='add'>+  /sys/devices/system/cpu/cpu0/acpi_cppc/:</div><div class='add'>+  total 0</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 feedback_ctrs</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 highest_perf</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 lowest_freq</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 lowest_nonlinear_perf</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 lowest_perf</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 nominal_freq</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 nominal_perf</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 reference_perf</div><div class='add'>+  -r--r--r-- 1 root root 65536 Mar  5 19:38 wraparound_time</div><div class='ctx'> </div><div class='ctx'> * highest_perf : Highest performance of this processor (abstract scale).</div><div class='del'>-* nominal_perf : Highest sustained performance of this processor (abstract scale).</div><div class='add'>+* nominal_perf : Highest sustained performance of this processor</div><div class='add'>+  (abstract scale).</div><div class='ctx'> * lowest_nonlinear_perf : Lowest performance of this processor with nonlinear</div><div class='ctx'>   power savings (abstract scale).</div><div class='ctx'> * lowest_perf : Lowest performance of this processor (abstract scale).</div><div class='hunk'>@@ -48,22 +51,26 @@ total 0</div><div class='ctx'> * feedback_ctrs : Includes both Reference and delivered performance counter.</div><div class='ctx'>   Reference counter ticks up proportional to processor's reference performance.</div><div class='ctx'>   Delivered counter ticks up proportional to processor's delivered performance.</div><div class='del'>-* wraparound_time: Minimum time for the feedback counters to wraparound (seconds).</div><div class='add'>+* wraparound_time: Minimum time for the feedback counters to wraparound</div><div class='add'>+  (seconds).</div><div class='ctx'> * reference_perf : Performance level at which reference performance counter</div><div class='ctx'>   accumulates (abstract scale).</div><div class='ctx'> </div><div class='del'>---------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-		Computing Average Delivered Performance</div><div class='add'>+Computing Average Delivered Performance</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+Below describes the steps to compute the average performance delivered by</div><div class='add'>+taking two different snapshots of feedback counters at time T1 and T2.</div><div class='add'>+</div><div class='add'>+  T1: Read feedback_ctrs as fbc_t1</div><div class='add'>+      Wait or run some workload</div><div class='ctx'> </div><div class='del'>-Below describes the steps to compute the average performance delivered by taking</div><div class='del'>-two different snapshots of feedback counters at time T1 and T2.</div><div class='add'>+  T2: Read feedback_ctrs as fbc_t2</div><div class='ctx'> </div><div class='del'>-T1: Read feedback_ctrs as fbc_t1</div><div class='del'>-    Wait or run some workload</div><div class='del'>-T2: Read feedback_ctrs as fbc_t2</div><div class='add'>+::</div><div class='ctx'> </div><div class='del'>-delivered_counter_delta = fbc_t2[del] - fbc_t1[del]</div><div class='del'>-reference_counter_delta = fbc_t2[ref] - fbc_t1[ref]</div><div class='add'>+  delivered_counter_delta = fbc_t2[del] - fbc_t1[del]</div><div class='add'>+  reference_counter_delta = fbc_t2[ref] - fbc_t1[ref]</div><div class='ctx'> </div><div class='del'>-delivered_perf = (refernce_perf x delivered_counter_delta) / reference_counter_delta</div><div class='add'>+  delivered_perf = (refernce_perf x delivered_counter_delta) / reference_counter_delta</div><div class='head'>diff --git a/Documentation/acpi/dsdt-override.txt b/Documentation/admin-guide/acpi/dsdt-override.rst<br/>index 784841caa6e6..50bd7f194bf4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/dsdt-override.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/dsdt-override.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/acpi/dsdt-override.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/acpi/dsdt-override.rst</a></div><div class='hunk'>@@ -1,6 +1,12 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+===============</div><div class='add'>+Overriding DSDT</div><div class='add'>+===============</div><div class='add'>+</div><div class='ctx'> Linux supports a method of overriding the BIOS DSDT:</div><div class='ctx'> </div><div class='del'>-CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.</div><div class='add'>+CONFIG_ACPI_CUSTOM_DSDT - builds the image into the kernel.</div><div class='ctx'> </div><div class='ctx'> When to use this method is described in detail on the</div><div class='ctx'> Linux/ACPI home page:</div><div class='head'>diff --git a/Documentation/admin-guide/acpi/index.rst b/Documentation/admin-guide/acpi/index.rst<br/>new file mode 100644<br/>index 000000000000..4d13eeea1eca<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/acpi/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/acpi/index.rst</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+============</div><div class='add'>+ACPI Support</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Here we document in detail how to interact with various mechanisms in</div><div class='add'>+the Linux ACPI support.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   initrd_table_override</div><div class='add'>+   dsdt-override</div><div class='add'>+   ssdt-overlays</div><div class='add'>+   cppc_sysfs</div><div class='head'>diff --git a/Documentation/admin-guide/acpi/initrd_table_override.rst b/Documentation/admin-guide/acpi/initrd_table_override.rst<br/>new file mode 100644<br/>index 000000000000..cbd768207631<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/acpi/initrd_table_override.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/acpi/initrd_table_override.rst</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+================================</div><div class='add'>+Upgrading ACPI tables via initrd</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+What is this about</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+If the ACPI_TABLE_UPGRADE compile option is true, it is possible to</div><div class='add'>+upgrade the ACPI execution environment that is defined by the ACPI tables</div><div class='add'>+via upgrading the ACPI tables provided by the BIOS with an instrumented,</div><div class='add'>+modified, more recent version one, or installing brand new ACPI tables.</div><div class='add'>+</div><div class='add'>+When building initrd with kernel in a single image, option</div><div class='add'>+ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD should also be true for this</div><div class='add'>+feature to work.</div><div class='add'>+</div><div class='add'>+For a full list of ACPI tables that can be upgraded/installed, take a look</div><div class='add'>+at the char `*table_sigs[MAX_ACPI_SIGNATURE];` definition in</div><div class='add'>+drivers/acpi/tables.c.</div><div class='add'>+</div><div class='add'>+All ACPI tables iasl (Intel's ACPI compiler and disassembler) knows should</div><div class='add'>+be overridable, except:</div><div class='add'>+</div><div class='add'>+  - ACPI_SIG_RSDP (has a signature of 6 bytes)</div><div class='add'>+  - ACPI_SIG_FACS (does not have an ordinary ACPI table header)</div><div class='add'>+</div><div class='add'>+Both could get implemented as well.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What is this for</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+Complain to your platform/BIOS vendor if you find a bug which is so severe</div><div class='add'>+that a workaround is not accepted in the Linux kernel. And this facility</div><div class='add'>+allows you to upgrade the buggy tables before your platform/BIOS vendor</div><div class='add'>+releases an upgraded BIOS binary.</div><div class='add'>+</div><div class='add'>+This facility can be used by platform/BIOS vendors to provide a Linux</div><div class='add'>+compatible environment without modifying the underlying platform firmware.</div><div class='add'>+</div><div class='add'>+This facility also provides a powerful feature to easily debug and test</div><div class='add'>+ACPI BIOS table compatibility with the Linux kernel by modifying old</div><div class='add'>+platform provided ACPI tables or inserting new ACPI tables.</div><div class='add'>+</div><div class='add'>+It can and should be enabled in any kernel because there is no functional</div><div class='add'>+change with not instrumented initrds.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How does it work</div><div class='add'>+================</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  # Extract the machine's ACPI tables:</div><div class='add'>+  cd /tmp</div><div class='add'>+  acpidump &gt;acpidump</div><div class='add'>+  acpixtract -a acpidump</div><div class='add'>+  # Disassemble, modify and recompile them:</div><div class='add'>+  iasl -d *.dat</div><div class='add'>+  # For example add this statement into a _PRT (PCI Routing Table) function</div><div class='add'>+  # of the DSDT:</div><div class='add'>+  Store("HELLO WORLD", debug)</div><div class='add'>+  # And increase the OEM Revision. For example, before modification:</div><div class='add'>+  DefinitionBlock ("DSDT.aml", "DSDT", 2, "INTEL ", "TEMPLATE", 0x00000000)</div><div class='add'>+  # After modification:</div><div class='add'>+  DefinitionBlock ("DSDT.aml", "DSDT", 2, "INTEL ", "TEMPLATE", 0x00000001)</div><div class='add'>+  iasl -sa dsdt.dsl</div><div class='add'>+  # Add the raw ACPI tables to an uncompressed cpio archive.</div><div class='add'>+  # They must be put into a /kernel/firmware/acpi directory inside the cpio</div><div class='add'>+  # archive. Note that if the table put here matches a platform table</div><div class='add'>+  # (similar Table Signature, and similar OEMID, and similar OEM Table ID)</div><div class='add'>+  # with a more recent OEM Revision, the platform table will be upgraded by</div><div class='add'>+  # this table. If the table put here doesn't match a platform table</div><div class='add'>+  # (dissimilar Table Signature, or dissimilar OEMID, or dissimilar OEM Table</div><div class='add'>+  # ID), this table will be appended.</div><div class='add'>+  mkdir -p kernel/firmware/acpi</div><div class='add'>+  cp dsdt.aml kernel/firmware/acpi</div><div class='add'>+  # A maximum of "NR_ACPI_INITRD_TABLES (64)" tables are currently allowed</div><div class='add'>+  # (see osl.c):</div><div class='add'>+  iasl -sa facp.dsl</div><div class='add'>+  iasl -sa ssdt1.dsl</div><div class='add'>+  cp facp.aml kernel/firmware/acpi</div><div class='add'>+  cp ssdt1.aml kernel/firmware/acpi</div><div class='add'>+  # The uncompressed cpio archive must be the first. Other, typically</div><div class='add'>+  # compressed cpio archives, must be concatenated on top of the uncompressed</div><div class='add'>+  # one. Following command creates the uncompressed cpio archive and</div><div class='add'>+  # concatenates the original initrd on top:</div><div class='add'>+  find kernel | cpio -H newc --create &gt; /boot/instrumented_initrd</div><div class='add'>+  cat /boot/initrd &gt;&gt;/boot/instrumented_initrd</div><div class='add'>+  # reboot with increased acpi debug level, e.g. boot params:</div><div class='add'>+  acpi.debug_level=0x2 acpi.debug_layer=0xFFFFFFFF</div><div class='add'>+  # and check your syslog:</div><div class='add'>+  [    1.268089] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]</div><div class='add'>+  [    1.272091] [ACPI Debug]  String [0x0B] "HELLO WORLD"</div><div class='add'>+</div><div class='add'>+iasl is able to disassemble and recompile quite a lot different,</div><div class='add'>+also static ACPI tables.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Where to retrieve userspace tools</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+iasl and acpixtract are part of Intel's ACPICA project:</div><div class='add'>+http://acpica.org/</div><div class='add'>+</div><div class='add'>+and should be packaged by distributions (for example in the acpica package</div><div class='add'>+on SUSE).</div><div class='add'>+</div><div class='add'>+acpidump can be found in Len Browns pmtools:</div><div class='add'>+ftp://kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools/acpidump</div><div class='add'>+</div><div class='add'>+This tool is also part of the acpica package on SUSE.</div><div class='add'>+Alternatively, used ACPI tables can be retrieved via sysfs in latest kernels:</div><div class='add'>+/sys/firmware/acpi/tables</div><div class='head'>diff --git a/Documentation/admin-guide/acpi/ssdt-overlays.rst b/Documentation/admin-guide/acpi/ssdt-overlays.rst<br/>new file mode 100644<br/>index 000000000000..da37455f96c9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/acpi/ssdt-overlays.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/acpi/ssdt-overlays.rst</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'>+=============</div><div class='add'>+SSDT Overlays</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+In order to support ACPI open-ended hardware configurations (e.g. development</div><div class='add'>+boards) we need a way to augment the ACPI configuration provided by the firmware</div><div class='add'>+image. A common example is connecting sensors on I2C / SPI buses on development</div><div class='add'>+boards.</div><div class='add'>+</div><div class='add'>+Although this can be accomplished by creating a kernel platform driver or</div><div class='add'>+recompiling the firmware image with updated ACPI tables, neither is practical:</div><div class='add'>+the former proliferates board specific kernel code while the latter requires</div><div class='add'>+access to firmware tools which are often not publicly available.</div><div class='add'>+</div><div class='add'>+Because ACPI supports external references in AML code a more practical</div><div class='add'>+way to augment firmware ACPI configuration is by dynamically loading</div><div class='add'>+user defined SSDT tables that contain the board specific information.</div><div class='add'>+</div><div class='add'>+For example, to enumerate a Bosch BMA222E accelerometer on the I2C bus of the</div><div class='add'>+Minnowboard MAX development board exposed via the LSE connector [1], the</div><div class='add'>+following ASL code can be used::</div><div class='add'>+</div><div class='add'>+    DefinitionBlock ("minnowmax.aml", "SSDT", 1, "Vendor", "Accel", 0x00000003)</div><div class='add'>+    {</div><div class='add'>+        External (\_SB.I2C6, DeviceObj)</div><div class='add'>+</div><div class='add'>+        Scope (\_SB.I2C6)</div><div class='add'>+        {</div><div class='add'>+            Device (STAC)</div><div class='add'>+            {</div><div class='add'>+                Name (_ADR, Zero)</div><div class='add'>+                Name (_HID, "BMA222E")</div><div class='add'>+</div><div class='add'>+                Method (_CRS, 0, Serialized)</div><div class='add'>+                {</div><div class='add'>+                    Name (RBUF, ResourceTemplate ()</div><div class='add'>+                    {</div><div class='add'>+                        I2cSerialBus (0x0018, ControllerInitiated, 0x00061A80,</div><div class='add'>+                                    AddressingMode7Bit, "\\_SB.I2C6", 0x00,</div><div class='add'>+                                    ResourceConsumer, ,)</div><div class='add'>+                        GpioInt (Edge, ActiveHigh, Exclusive, PullDown, 0x0000,</div><div class='add'>+                                "\\_SB.GPO2", 0x00, ResourceConsumer, , )</div><div class='add'>+                        { // Pin list</div><div class='add'>+                            0</div><div class='add'>+                        }</div><div class='add'>+                    })</div><div class='add'>+                    Return (RBUF)</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+which can then be compiled to AML binary format::</div><div class='add'>+</div><div class='add'>+    $ iasl minnowmax.asl</div><div class='add'>+</div><div class='add'>+    Intel ACPI Component Architecture</div><div class='add'>+    ASL Optimizing Compiler version 20140214-64 [Mar 29 2014]</div><div class='add'>+    Copyright (c) 2000 - 2014 Intel Corporation</div><div class='add'>+</div><div class='add'>+    ASL Input:     minnomax.asl - 30 lines, 614 bytes, 7 keywords</div><div class='add'>+    AML Output:    minnowmax.aml - 165 bytes, 6 named objects, 1 executable opcodes</div><div class='add'>+</div><div class='add'>+[1] http://wiki.minnowboard.org/MinnowBoard_MAX#Low_Speed_Expansion_Connector_.28Top.29</div><div class='add'>+</div><div class='add'>+The resulting AML code can then be loaded by the kernel using one of the methods</div><div class='add'>+below.</div><div class='add'>+</div><div class='add'>+Loading ACPI SSDTs from initrd</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+This option allows loading of user defined SSDTs from initrd and it is useful</div><div class='add'>+when the system does not support EFI or when there is not enough EFI storage.</div><div class='add'>+</div><div class='add'>+It works in a similar way with initrd based ACPI tables override/upgrade: SSDT</div><div class='add'>+aml code must be placed in the first, uncompressed, initrd under the</div><div class='add'>+"kernel/firmware/acpi" path. Multiple files can be used and this will translate</div><div class='add'>+in loading multiple tables. Only SSDT and OEM tables are allowed. See</div><div class='add'>+initrd_table_override.txt for more details.</div><div class='add'>+</div><div class='add'>+Here is an example::</div><div class='add'>+</div><div class='add'>+    # Add the raw ACPI tables to an uncompressed cpio archive.</div><div class='add'>+    # They must be put into a /kernel/firmware/acpi directory inside the</div><div class='add'>+    # cpio archive.</div><div class='add'>+    # The uncompressed cpio archive must be the first.</div><div class='add'>+    # Other, typically compressed cpio archives, must be</div><div class='add'>+    # concatenated on top of the uncompressed one.</div><div class='add'>+    mkdir -p kernel/firmware/acpi</div><div class='add'>+    cp ssdt.aml kernel/firmware/acpi</div><div class='add'>+</div><div class='add'>+    # Create the uncompressed cpio archive and concatenate the original initrd</div><div class='add'>+    # on top:</div><div class='add'>+    find kernel | cpio -H newc --create &gt; /boot/instrumented_initrd</div><div class='add'>+    cat /boot/initrd &gt;&gt;/boot/instrumented_initrd</div><div class='add'>+</div><div class='add'>+Loading ACPI SSDTs from EFI variables</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+This is the preferred method, when EFI is supported on the platform, because it</div><div class='add'>+allows a persistent, OS independent way of storing the user defined SSDTs. There</div><div class='add'>+is also work underway to implement EFI support for loading user defined SSDTs</div><div class='add'>+and using this method will make it easier to convert to the EFI loading</div><div class='add'>+mechanism when that will arrive.</div><div class='add'>+</div><div class='add'>+In order to load SSDTs from an EFI variable the efivar_ssdt kernel command line</div><div class='add'>+parameter can be used. The argument for the option is the variable name to</div><div class='add'>+use. If there are multiple variables with the same name but with different</div><div class='add'>+vendor GUIDs, all of them will be loaded.</div><div class='add'>+</div><div class='add'>+In order to store the AML code in an EFI variable the efivarfs filesystem can be</div><div class='add'>+used. It is enabled and mounted by default in /sys/firmware/efi/efivars in all</div><div class='add'>+recent distribution.</div><div class='add'>+</div><div class='add'>+Creating a new file in /sys/firmware/efi/efivars will automatically create a new</div><div class='add'>+EFI variable. Updating a file in /sys/firmware/efi/efivars will update the EFI</div><div class='add'>+variable. Please note that the file name needs to be specially formatted as</div><div class='add'>+"Name-GUID" and that the first 4 bytes in the file (little-endian format)</div><div class='add'>+represent the attributes of the EFI variable (see EFI_VARIABLE_MASK in</div><div class='add'>+include/linux/efi.h). Writing to the file must also be done with one write</div><div class='add'>+operation.</div><div class='add'>+</div><div class='add'>+For example, you can use the following bash script to create/update an EFI</div><div class='add'>+variable with the content from a given file::</div><div class='add'>+</div><div class='add'>+    #!/bin/sh -e</div><div class='add'>+</div><div class='add'>+    while ! [ -z "$1" ]; do</div><div class='add'>+            case "$1" in</div><div class='add'>+            "-f") filename="$2"; shift;;</div><div class='add'>+            "-g") guid="$2"; shift;;</div><div class='add'>+            *) name="$1";;</div><div class='add'>+            esac</div><div class='add'>+            shift</div><div class='add'>+    done</div><div class='add'>+</div><div class='add'>+    usage()</div><div class='add'>+    {</div><div class='add'>+            echo "Syntax: ${0##*/} -f filename [ -g guid ] name"</div><div class='add'>+            exit 1</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    [ -n "$name" -a -f "$filename" ] || usage</div><div class='add'>+</div><div class='add'>+    EFIVARFS="/sys/firmware/efi/efivars"</div><div class='add'>+</div><div class='add'>+    [ -d "$EFIVARFS" ] || exit 2</div><div class='add'>+</div><div class='add'>+    if stat -tf $EFIVARFS | grep -q -v de5e81e4; then</div><div class='add'>+            mount -t efivarfs none $EFIVARFS</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    # try to pick up an existing GUID</div><div class='add'>+    [ -n "$guid" ] || guid=$(find "$EFIVARFS" -name "$name-*" | head -n1 | cut -f2- -d-)</div><div class='add'>+</div><div class='add'>+    # use a randomly generated GUID</div><div class='add'>+    [ -n "$guid" ] || guid="$(cat /proc/sys/kernel/random/uuid)"</div><div class='add'>+</div><div class='add'>+    # efivarfs expects all of the data in one write</div><div class='add'>+    tmp=$(mktemp)</div><div class='add'>+    /bin/echo -ne "\007\000\000\000" | cat - $filename &gt; $tmp</div><div class='add'>+    dd if=$tmp of="$EFIVARFS/$name-$guid" bs=$(stat -c %s $tmp)</div><div class='add'>+    rm $tmp</div><div class='add'>+</div><div class='add'>+Loading ACPI SSDTs from configfs</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+This option allows loading of user defined SSDTs from userspace via the configfs</div><div class='add'>+interface. The CONFIG_ACPI_CONFIGFS option must be select and configfs must be</div><div class='add'>+mounted. In the following examples, we assume that configfs has been mounted in</div><div class='add'>+/config.</div><div class='add'>+</div><div class='add'>+New tables can be loading by creating new directories in /config/acpi/table/ and</div><div class='add'>+writing the SSDT aml code in the aml attribute::</div><div class='add'>+</div><div class='add'>+    cd /config/acpi/table</div><div class='add'>+    mkdir my_ssdt</div><div class='add'>+    cat ~/ssdt.aml &gt; my_ssdt/aml</div><div class='head'>diff --git a/Documentation/admin-guide/ext4.rst b/Documentation/admin-guide/ext4.rst<br/>index e506d3dae510..059ddcbe769d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/ext4.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/ext4.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/ext4.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/ext4.rst</a></div><div class='hunk'>@@ -91,10 +91,48 @@ Currently Available</div><div class='ctx'> * large block (up to pagesize) support</div><div class='ctx'> * efficient new ordered mode in JBD2 and ext4 (avoid using buffer head to force</div><div class='ctx'>   the ordering)</div><div class='add'>+* Case-insensitive file name lookups</div><div class='ctx'> </div><div class='ctx'> [1] Filesystems with a block size of 1k may see a limit imposed by the</div><div class='ctx'> directory hash tree having a maximum depth of two.</div><div class='ctx'> </div><div class='add'>+case-insensitive file name lookups</div><div class='add'>+======================================================</div><div class='add'>+</div><div class='add'>+The case-insensitive file name lookup feature is supported on a</div><div class='add'>+per-directory basis, allowing the user to mix case-insensitive and</div><div class='add'>+case-sensitive directories in the same filesystem.  It is enabled by</div><div class='add'>+flipping the +F inode attribute of an empty directory.  The</div><div class='add'>+case-insensitive string match operation is only defined when we know how</div><div class='add'>+text in encoded in a byte sequence.  For that reason, in order to enable</div><div class='add'>+case-insensitive directories, the filesystem must have the</div><div class='add'>+casefold feature, which stores the filesystem-wide encoding</div><div class='add'>+model used.  By default, the charset adopted is the latest version of</div><div class='add'>+Unicode (12.1.0, by the time of this writing), encoded in the UTF-8</div><div class='add'>+form.  The comparison algorithm is implemented by normalizing the</div><div class='add'>+strings to the Canonical decomposition form, as defined by Unicode,</div><div class='add'>+followed by a byte per byte comparison.</div><div class='add'>+</div><div class='add'>+The case-awareness is name-preserving on the disk, meaning that the file</div><div class='add'>+name provided by userspace is a byte-per-byte match to what is actually</div><div class='add'>+written in the disk.  The Unicode normalization format used by the</div><div class='add'>+kernel is thus an internal representation, and not exposed to the</div><div class='add'>+userspace nor to the disk, with the important exception of disk hashes,</div><div class='add'>+used on large case-insensitive directories with DX feature.  On DX</div><div class='add'>+directories, the hash must be calculated using the casefolded version of</div><div class='add'>+the filename, meaning that the normalization format used actually has an</div><div class='add'>+impact on where the directory entry is stored.</div><div class='add'>+</div><div class='add'>+When we change from viewing filenames as opaque byte sequences to seeing</div><div class='add'>+them as encoded strings we need to address what happens when a program</div><div class='add'>+tries to create a file with an invalid name.  The Unicode subsystem</div><div class='add'>+within the kernel leaves the decision of what to do in this case to the</div><div class='add'>+filesystem, which select its preferred behavior by enabling/disabling</div><div class='add'>+the strict mode.  When Ext4 encounters one of those strings and the</div><div class='add'>+filesystem did not require strict mode, it falls back to considering the</div><div class='add'>+entire string as an opaque byte sequence, which still allows the user to</div><div class='add'>+operate on that file, but the case-insensitive lookups won't work.</div><div class='add'>+</div><div class='ctx'> Options</div><div class='ctx'> =======</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst<br/>index 0a491676685e..5b8286fdd91b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/index.rst</a></div><div class='hunk'>@@ -77,6 +77,7 @@ configure specific aspects of kernel behavior to your liking.</div><div class='ctx'>    LSM/index</div><div class='ctx'>    mm/index</div><div class='ctx'>    perf-security</div><div class='add'>+   acpi/index</div><div class='ctx'> </div><div class='ctx'> .. only::  subproject and html</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst<br/>index b8d0bc07ed0a..0124980dca2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/kernel-parameters.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/kernel-parameters.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/kernel-parameters.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/kernel-parameters.rst</a></div><div class='hunk'>@@ -88,6 +88,7 @@ parameter is applicable::</div><div class='ctx'> 	APIC	APIC support is enabled.</div><div class='ctx'> 	APM	Advanced Power Management support is enabled.</div><div class='ctx'> 	ARM	ARM architecture is enabled.</div><div class='add'>+	ARM64	ARM64 architecture is enabled.</div><div class='ctx'> 	AX25	Appropriate AX.25 support is enabled.</div><div class='ctx'> 	CLK	Common clock infrastructure is enabled.</div><div class='ctx'> 	CMA	Contiguous Memory Area support is enabled.</div><div class='head'>diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt<br/>index 2b8ee90bb644..fd03e2b629bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/kernel-parameters.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/kernel-parameters.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/kernel-parameters.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/kernel-parameters.txt</a></div><div class='hunk'>@@ -704,8 +704,11 @@</div><div class='ctx'> 			upon panic. This parameter reserves the physical</div><div class='ctx'> 			memory region [offset, offset + size] for that kernel</div><div class='ctx'> 			image. If '@offset' is omitted, then a suitable offset</div><div class='del'>-			is selected automatically. Check</div><div class='del'>-			Documentation/kdump/kdump.txt for further details.</div><div class='add'>+			is selected automatically.</div><div class='add'>+			[KNL, x86_64] select a region under 4G first, and</div><div class='add'>+			fall back to reserve region above 4G when '@offset'</div><div class='add'>+			hasn't been specified.</div><div class='add'>+			See Documentation/kdump/kdump.txt for further details.</div><div class='ctx'> </div><div class='ctx'> 	crashkernel=range1:size1[,range2:size2,...][@offset]</div><div class='ctx'> 			[KNL] Same as above, but depends on the memory</div><div class='hunk'>@@ -2544,6 +2547,40 @@</div><div class='ctx'> 			in the "bleeding edge" mini2440 support kernel at</div><div class='ctx'> 			http://repo.or.cz/w/linux-2.6/mini2440.git</div><div class='ctx'> </div><div class='add'>+	mitigations=</div><div class='add'>+			[X86,PPC,S390,ARM64] Control optional mitigations for</div><div class='add'>+			CPU vulnerabilities.  This is a set of curated,</div><div class='add'>+			arch-independent options, each of which is an</div><div class='add'>+			aggregation of existing arch-specific options.</div><div class='add'>+</div><div class='add'>+			off</div><div class='add'>+				Disable all optional CPU mitigations.  This</div><div class='add'>+				improves system performance, but it may also</div><div class='add'>+				expose users to several CPU vulnerabilities.</div><div class='add'>+				Equivalent to: nopti [X86,PPC]</div><div class='add'>+					       kpti=0 [ARM64]</div><div class='add'>+					       nospectre_v1 [PPC]</div><div class='add'>+					       nobp=0 [S390]</div><div class='add'>+					       nospectre_v2 [X86,PPC,S390,ARM64]</div><div class='add'>+					       spectre_v2_user=off [X86]</div><div class='add'>+					       spec_store_bypass_disable=off [X86,PPC]</div><div class='add'>+					       ssbd=force-off [ARM64]</div><div class='add'>+					       l1tf=off [X86]</div><div class='add'>+</div><div class='add'>+			auto (default)</div><div class='add'>+				Mitigate all CPU vulnerabilities, but leave SMT</div><div class='add'>+				enabled, even if it's vulnerable.  This is for</div><div class='add'>+				users who don't want to be surprised by SMT</div><div class='add'>+				getting disabled across kernel upgrades, or who</div><div class='add'>+				have other ways of avoiding SMT-based attacks.</div><div class='add'>+				Equivalent to: (default behavior)</div><div class='add'>+</div><div class='add'>+			auto,nosmt</div><div class='add'>+				Mitigate all CPU vulnerabilities, disabling SMT</div><div class='add'>+				if needed.  This is for users who always want to</div><div class='add'>+				be fully mitigated, even if it means losing SMT.</div><div class='add'>+				Equivalent to: l1tf=flush,nosmt [X86]</div><div class='add'>+</div><div class='ctx'> 	mminit_loglevel=</div><div class='ctx'> 			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this</div><div class='ctx'> 			parameter allows control of the logging verbosity for</div><div class='hunk'>@@ -2873,10 +2910,10 @@</div><div class='ctx'> 			check bypass). With this option data leaks are possible</div><div class='ctx'> 			in the system.</div><div class='ctx'> </div><div class='del'>-	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2</div><div class='del'>-			(indirect branch prediction) vulnerability. System may</div><div class='del'>-			allow data leaks with this option, which is equivalent</div><div class='del'>-			to spectre_v2=off.</div><div class='add'>+	nospectre_v2	[X86,PPC_FSL_BOOK3E,ARM64] Disable all mitigations for</div><div class='add'>+			the Spectre variant 2 (indirect branch prediction)</div><div class='add'>+			vulnerability. System may allow data leaks with this</div><div class='add'>+			option.</div><div class='ctx'> </div><div class='ctx'> 	nospec_store_bypass_disable</div><div class='ctx'> 			[HW] Disable all mitigations for the Speculative Store Bypass vulnerability</div><div class='hunk'>@@ -3394,6 +3431,8 @@</div><div class='ctx'> 				bridges without forcing it upstream. Note:</div><div class='ctx'> 				this removes isolation between devices and</div><div class='ctx'> 				may put more devices in an IOMMU group.</div><div class='add'>+		force_floating	[S390] Force usage of floating interrupts.</div><div class='add'>+		nomio		[S390] Do not use MIO instructions.</div><div class='ctx'> </div><div class='ctx'> 	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power</div><div class='ctx'> 			Management.</div><div class='hunk'>@@ -3623,7 +3662,9 @@</div><div class='ctx'> 				see CONFIG_RAS_CEC help text.</div><div class='ctx'> </div><div class='ctx'> 	rcu_nocbs=	[KNL]</div><div class='del'>-			The argument is a cpu list, as described above.</div><div class='add'>+			The argument is a cpu list, as described above,</div><div class='add'>+			except that the string "all" can be used to</div><div class='add'>+			specify every CPU on the system.</div><div class='ctx'> </div><div class='ctx'> 			In kernels built with CONFIG_RCU_NOCB_CPU=y, set</div><div class='ctx'> 			the specified list of CPUs to be no-callback CPUs.</div><div class='hunk'>@@ -4703,6 +4744,10 @@</div><div class='ctx'> 			[x86] unstable: mark the TSC clocksource as unstable, this</div><div class='ctx'> 			marks the TSC unconditionally unstable at bootup and</div><div class='ctx'> 			avoids any further wobbles once the TSC watchdog notices.</div><div class='add'>+			[x86] nowatchdog: disable clocksource watchdog. Used</div><div class='add'>+			in situations with strict latency requirements (where</div><div class='add'>+			interruptions from clocksource watchdog are not</div><div class='add'>+			acceptable).</div><div class='ctx'> </div><div class='ctx'> 	turbografx.map[2|3]=	[HW,JOY]</div><div class='ctx'> 			TurboGraFX parallel port interface</div><div class='head'>diff --git a/Documentation/admin-guide/mm/numaperf.rst b/Documentation/admin-guide/mm/numaperf.rst<br/>new file mode 100644<br/>index 000000000000..b79f70c04397<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/mm/numaperf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/mm/numaperf.rst</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+.. _numaperf:</div><div class='add'>+</div><div class='add'>+=============</div><div class='add'>+NUMA Locality</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+Some platforms may have multiple types of memory attached to a compute</div><div class='add'>+node. These disparate memory ranges may share some characteristics, such</div><div class='add'>+as CPU cache coherence, but may have different performance. For example,</div><div class='add'>+different media types and buses affect bandwidth and latency.</div><div class='add'>+</div><div class='add'>+A system supports such heterogeneous memory by grouping each memory type</div><div class='add'>+under different domains, or "nodes", based on locality and performance</div><div class='add'>+characteristics.  Some memory may share the same node as a CPU, and others</div><div class='add'>+are provided as memory only nodes. While memory only nodes do not provide</div><div class='add'>+CPUs, they may still be local to one or more compute nodes relative to</div><div class='add'>+other nodes. The following diagram shows one such example of two compute</div><div class='add'>+nodes with local memory and a memory only node for each of compute node:</div><div class='add'>+</div><div class='add'>+ +------------------+     +------------------+</div><div class='add'>+ | Compute Node 0   +-----+ Compute Node 1   |</div><div class='add'>+ | Local Node0 Mem  |     | Local Node1 Mem  |</div><div class='add'>+ +--------+---------+     +--------+---------+</div><div class='add'>+          |                        |</div><div class='add'>+ +--------+---------+     +--------+---------+</div><div class='add'>+ | Slower Node2 Mem |     | Slower Node3 Mem |</div><div class='add'>+ +------------------+     +--------+---------+</div><div class='add'>+</div><div class='add'>+A "memory initiator" is a node containing one or more devices such as</div><div class='add'>+CPUs or separate memory I/O devices that can initiate memory requests.</div><div class='add'>+A "memory target" is a node containing one or more physical address</div><div class='add'>+ranges accessible from one or more memory initiators.</div><div class='add'>+</div><div class='add'>+When multiple memory initiators exist, they may not all have the same</div><div class='add'>+performance when accessing a given memory target. Each initiator-target</div><div class='add'>+pair may be organized into different ranked access classes to represent</div><div class='add'>+this relationship. The highest performing initiator to a given target</div><div class='add'>+is considered to be one of that target's local initiators, and given</div><div class='add'>+the highest access class, 0. Any given target may have one or more</div><div class='add'>+local initiators, and any given initiator may have multiple local</div><div class='add'>+memory targets.</div><div class='add'>+</div><div class='add'>+To aid applications matching memory targets with their initiators, the</div><div class='add'>+kernel provides symlinks to each other. The following example lists the</div><div class='add'>+relationship for the access class "0" memory initiators and targets::</div><div class='add'>+</div><div class='add'>+	# symlinks -v /sys/devices/system/node/nodeX/access0/targets/</div><div class='add'>+	relative: /sys/devices/system/node/nodeX/access0/targets/nodeY -&gt; ../../nodeY</div><div class='add'>+</div><div class='add'>+	# symlinks -v /sys/devices/system/node/nodeY/access0/initiators/</div><div class='add'>+	relative: /sys/devices/system/node/nodeY/access0/initiators/nodeX -&gt; ../../nodeX</div><div class='add'>+</div><div class='add'>+A memory initiator may have multiple memory targets in the same access</div><div class='add'>+class. The target memory's initiators in a given class indicate the</div><div class='add'>+nodes' access characteristics share the same performance relative to other</div><div class='add'>+linked initiator nodes. Each target within an initiator's access class,</div><div class='add'>+though, do not necessarily perform the same as each other.</div><div class='add'>+</div><div class='add'>+================</div><div class='add'>+NUMA Performance</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+Applications may wish to consider which node they want their memory to</div><div class='add'>+be allocated from based on the node's performance characteristics. If</div><div class='add'>+the system provides these attributes, the kernel exports them under the</div><div class='add'>+node sysfs hierarchy by appending the attributes directory under the</div><div class='add'>+memory node's access class 0 initiators as follows::</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/node/nodeY/access0/initiators/</div><div class='add'>+</div><div class='add'>+These attributes apply only when accessed from nodes that have the</div><div class='add'>+are linked under the this access's inititiators.</div><div class='add'>+</div><div class='add'>+The performance characteristics the kernel provides for the local initiators</div><div class='add'>+are exported are as follows::</div><div class='add'>+</div><div class='add'>+	# tree -P "read*|write*" /sys/devices/system/node/nodeY/access0/initiators/</div><div class='add'>+	/sys/devices/system/node/nodeY/access0/initiators/</div><div class='add'>+	|-- read_bandwidth</div><div class='add'>+	|-- read_latency</div><div class='add'>+	|-- write_bandwidth</div><div class='add'>+	`-- write_latency</div><div class='add'>+</div><div class='add'>+The bandwidth attributes are provided in MiB/second.</div><div class='add'>+</div><div class='add'>+The latency attributes are provided in nanoseconds.</div><div class='add'>+</div><div class='add'>+The values reported here correspond to the rated latency and bandwidth</div><div class='add'>+for the platform.</div><div class='add'>+</div><div class='add'>+==========</div><div class='add'>+NUMA Cache</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+System memory may be constructed in a hierarchy of elements with various</div><div class='add'>+performance characteristics in order to provide large address space of</div><div class='add'>+slower performing memory cached by a smaller higher performing memory. The</div><div class='add'>+system physical addresses memory  initiators are aware of are provided</div><div class='add'>+by the last memory level in the hierarchy. The system meanwhile uses</div><div class='add'>+higher performing memory to transparently cache access to progressively</div><div class='add'>+slower levels.</div><div class='add'>+</div><div class='add'>+The term "far memory" is used to denote the last level memory in the</div><div class='add'>+hierarchy. Each increasing cache level provides higher performing</div><div class='add'>+initiator access, and the term "near memory" represents the fastest</div><div class='add'>+cache provided by the system.</div><div class='add'>+</div><div class='add'>+This numbering is different than CPU caches where the cache level (ex:</div><div class='add'>+L1, L2, L3) uses the CPU-side view where each increased level is lower</div><div class='add'>+performing. In contrast, the memory cache level is centric to the last</div><div class='add'>+level memory, so the higher numbered cache level corresponds to  memory</div><div class='add'>+nearer to the CPU, and further from far memory.</div><div class='add'>+</div><div class='add'>+The memory-side caches are not directly addressable by software. When</div><div class='add'>+software accesses a system address, the system will return it from the</div><div class='add'>+near memory cache if it is present. If it is not present, the system</div><div class='add'>+accesses the next level of memory until there is either a hit in that</div><div class='add'>+cache level, or it reaches far memory.</div><div class='add'>+</div><div class='add'>+An application does not need to know about caching attributes in order</div><div class='add'>+to use the system. Software may optionally query the memory cache</div><div class='add'>+attributes in order to maximize the performance out of such a setup.</div><div class='add'>+If the system provides a way for the kernel to discover this information,</div><div class='add'>+for example with ACPI HMAT (Heterogeneous Memory Attribute Table),</div><div class='add'>+the kernel will append these attributes to the NUMA node memory target.</div><div class='add'>+</div><div class='add'>+When the kernel first registers a memory cache with a node, the kernel</div><div class='add'>+will create the following directory::</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/node/nodeX/memory_side_cache/</div><div class='add'>+</div><div class='add'>+If that directory is not present, the system either does not not provide</div><div class='add'>+a memory-side cache, or that information is not accessible to the kernel.</div><div class='add'>+</div><div class='add'>+The attributes for each level of cache is provided under its cache</div><div class='add'>+level index::</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/node/nodeX/memory_side_cache/indexA/</div><div class='add'>+	/sys/devices/system/node/nodeX/memory_side_cache/indexB/</div><div class='add'>+	/sys/devices/system/node/nodeX/memory_side_cache/indexC/</div><div class='add'>+</div><div class='add'>+Each cache level's directory provides its attributes. For example, the</div><div class='add'>+following shows a single cache level and the attributes available for</div><div class='add'>+software to query::</div><div class='add'>+</div><div class='add'>+	# tree sys/devices/system/node/node0/memory_side_cache/</div><div class='add'>+	/sys/devices/system/node/node0/memory_side_cache/</div><div class='add'>+	|-- index1</div><div class='add'>+	|   |-- indexing</div><div class='add'>+	|   |-- line_size</div><div class='add'>+	|   |-- size</div><div class='add'>+	|   `-- write_policy</div><div class='add'>+</div><div class='add'>+The "indexing" will be 0 if it is a direct-mapped cache, and non-zero</div><div class='add'>+for any other indexed based, multi-way associativity.</div><div class='add'>+</div><div class='add'>+The "line_size" is the number of bytes accessed from the next cache</div><div class='add'>+level on a miss.</div><div class='add'>+</div><div class='add'>+The "size" is the number of bytes provided by this cache level.</div><div class='add'>+</div><div class='add'>+The "write_policy" will be 0 for write-back, and non-zero for</div><div class='add'>+write-through caching.</div><div class='add'>+</div><div class='add'>+========</div><div class='add'>+See Also</div><div class='add'>+========</div><div class='add'>+.. [1] https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf</div><div class='add'>+       Section 5.2.27</div><div class='head'>diff --git a/Documentation/admin-guide/pm/cpufreq.rst b/Documentation/admin-guide/pm/cpufreq.rst<br/>index 7eca9026a9ed..0c74a7784964 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/cpufreq.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/cpufreq.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/cpufreq.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/cpufreq.rst</a></div><div class='hunk'>@@ -1,3 +1,6 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> .. |struct cpufreq_policy| replace:: :c:type:`struct cpufreq_policy &lt;cpufreq_policy&gt;`</div><div class='ctx'> .. |intel_pstate| replace:: :doc:`intel_pstate &lt;intel_pstate&gt;`</div><div class='ctx'> </div><div class='hunk'>@@ -5,9 +8,10 @@</div><div class='ctx'> CPU Performance Scaling</div><div class='ctx'> =======================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2017 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2017 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> The Concept of CPU Performance Scaling</div><div class='ctx'> ======================================</div><div class='hunk'>@@ -396,8 +400,8 @@ RT or deadline scheduling classes, the governor will increase the frequency to</div><div class='ctx'> the allowed maximum (that is, the ``scaling_max_freq`` policy limit).  In turn,</div><div class='ctx'> if it is invoked by the CFS scheduling class, the governor will use the</div><div class='ctx'> Per-Entity Load Tracking (PELT) metric for the root control group of the</div><div class='del'>-given CPU as the CPU utilization estimate (see the `Per-entity load tracking`_</div><div class='del'>-LWN.net article for a description of the PELT mechanism).  Then, the new</div><div class='add'>+given CPU as the CPU utilization estimate (see the *Per-entity load tracking*</div><div class='add'>+LWN.net article [1]_ for a description of the PELT mechanism).  Then, the new</div><div class='ctx'> CPU frequency to apply is computed in accordance with the formula</div><div class='ctx'> </div><div class='ctx'> 	f = 1.25 * ``f_0`` * ``util`` / ``max``</div><div class='hunk'>@@ -698,4 +702,8 @@ hardware feature (e.g. all Intel ones), even if the</div><div class='ctx'> :c:macro:`CONFIG_X86_ACPI_CPUFREQ_CPB` configuration option is set.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. _Per-entity load tracking: https://lwn.net/Articles/531853/</div><div class='add'>+References</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+.. [1] Jonathan Corbet, *Per-entity load tracking*,</div><div class='add'>+       https://lwn.net/Articles/531853/</div><div class='head'>diff --git a/Documentation/admin-guide/pm/cpuidle.rst b/Documentation/admin-guide/pm/cpuidle.rst<br/>index 9c58b35a81cb..e70b365dbc60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/cpuidle.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/cpuidle.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/cpuidle.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/cpuidle.rst</a></div><div class='hunk'>@@ -1,3 +1,6 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> .. |struct cpuidle_state| replace:: :c:type:`struct cpuidle_state &lt;cpuidle_state&gt;`</div><div class='ctx'> .. |cpufreq| replace:: :doc:`CPU Performance Scaling &lt;cpufreq&gt;`</div><div class='ctx'> </div><div class='hunk'>@@ -5,9 +8,10 @@</div><div class='ctx'> CPU Idle Time Management</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2018 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2018 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> Concepts</div><div class='ctx'> ========</div><div class='head'>diff --git a/Documentation/admin-guide/pm/index.rst b/Documentation/admin-guide/pm/index.rst<br/>index 49237ac73442..39f8f9f81e7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/index.rst</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> ================</div><div class='ctx'> Power Management</div><div class='ctx'> ================</div><div class='head'>diff --git a/Documentation/admin-guide/pm/intel_epb.rst b/Documentation/admin-guide/pm/intel_epb.rst<br/>new file mode 100644<br/>index 000000000000..005121167af7<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/intel_epb.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/intel_epb.rst</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+======================================</div><div class='add'>+Intel Performance and Energy Bias Hint</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+:Copyright: |copy| 2019 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: arch/x86/kernel/cpu/intel_epb.c</div><div class='add'>+   :doc: overview</div><div class='add'>+</div><div class='add'>+Intel Performance and Energy Bias Attribute in ``sysfs``</div><div class='add'>+========================================================</div><div class='add'>+</div><div class='add'>+The Intel Performance and Energy Bias Hint (EPB) value for a given (logical) CPU</div><div class='add'>+can be checked or updated through a ``sysfs`` attribute (file) under</div><div class='add'>+:file:`/sys/devices/system/cpu/cpu&lt;N&gt;/power/`, where the CPU number ``&lt;N&gt;``</div><div class='add'>+is allocated at the system initialization time:</div><div class='add'>+</div><div class='add'>+``energy_perf_bias``</div><div class='add'>+	Shows the current EPB value for the CPU in a sliding scale 0 - 15, where</div><div class='add'>+	a value of 0 corresponds to a hint preference for highest performance</div><div class='add'>+	and a value of 15 corresponds to the maximum energy savings.</div><div class='add'>+</div><div class='add'>+	In order to update the EPB value for the CPU, this attribute can be</div><div class='add'>+	written to, either with a number in the 0 - 15 sliding scale above, or</div><div class='add'>+	with one of the strings: "performance", "balance-performance", "normal",</div><div class='add'>+	"balance-power", "power" that represent values reflected by their</div><div class='add'>+	meaning.</div><div class='add'>+</div><div class='add'>+	This attribute is present for all online CPUs supporting the EPB</div><div class='add'>+	feature.</div><div class='add'>+</div><div class='add'>+Note that while the EPB interface to the processor is defined at the logical CPU</div><div class='add'>+level, the physical register backing it may be shared by multiple CPUs (for</div><div class='add'>+example, SMT siblings or cores in one package).  For this reason, updating the</div><div class='add'>+EPB value for one CPU may cause the EPB values for other CPUs to change.</div><div class='head'>diff --git a/Documentation/admin-guide/pm/intel_pstate.rst b/Documentation/admin-guide/pm/intel_pstate.rst<br/>index ec0f7c111f65..67e414e34f37 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/intel_pstate.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/intel_pstate.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/intel_pstate.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/intel_pstate.rst</a></div><div class='hunk'>@@ -1,10 +1,13 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> ===============================================</div><div class='ctx'> ``intel_pstate`` CPU Performance Scaling Driver</div><div class='ctx'> ===============================================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2017 Intel Corporation</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2017 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> General Information</div><div class='hunk'>@@ -20,11 +23,10 @@ you have not done that yet.]</div><div class='ctx'> </div><div class='ctx'> For the processors supported by ``intel_pstate``, the P-state concept is broader</div><div class='ctx'> than just an operating frequency or an operating performance point (see the</div><div class='del'>-`LinuxCon Europe 2015 presentation by Kristen Accardi &lt;LCEU2015_&gt;`_ for more</div><div class='add'>+LinuxCon Europe 2015 presentation by Kristen Accardi [1]_ for more</div><div class='ctx'> information about that).  For this reason, the representation of P-states used</div><div class='ctx'> by ``intel_pstate`` internally follows the hardware specification (for details</div><div class='del'>-refer to `Intel® 64 and IA-32 Architectures Software Developer’s Manual</div><div class='del'>-Volume 3: System Programming Guide &lt;SDM_&gt;`_).  However, the ``CPUFreq`` core</div><div class='add'>+refer to Intel Software Developer’s Manual [2]_).  However, the ``CPUFreq`` core</div><div class='ctx'> uses frequencies for identifying operating performance points of CPUs and</div><div class='ctx'> frequencies are involved in the user space interface exposed by it, so</div><div class='ctx'> ``intel_pstate`` maps its internal representation of P-states to frequencies too</div><div class='hunk'>@@ -561,9 +563,9 @@ or to pin every task potentially sensitive to them to a specific CPU.]</div><div class='ctx'> </div><div class='ctx'> On the majority of systems supported by ``intel_pstate``, the ACPI tables</div><div class='ctx'> provided by the platform firmware contain ``_PSS`` objects returning information</div><div class='del'>-that can be used for CPU performance scaling (refer to the `ACPI specification`_</div><div class='del'>-for details on the ``_PSS`` objects and the format of the information returned</div><div class='del'>-by them).</div><div class='add'>+that can be used for CPU performance scaling (refer to the ACPI specification</div><div class='add'>+[3]_ for details on the ``_PSS`` objects and the format of the information</div><div class='add'>+returned by them).</div><div class='ctx'> </div><div class='ctx'> The information returned by the ACPI ``_PSS`` objects is used by the</div><div class='ctx'> ``acpi-cpufreq`` scaling driver.  On systems supported by ``intel_pstate``</div><div class='hunk'>@@ -728,6 +730,14 @@ P-state is called, the ``ftrace`` filter can be set to to</div><div class='ctx'>            &lt;idle&gt;-0     [000] ..s.  2537.654843: intel_pstate_set_pstate &lt;-intel_pstate_timer_func</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. _LCEU2015: http://events.linuxfoundation.org/sites/events/files/slides/LinuxConEurope_2015.pdf</div><div class='del'>-.. _SDM: http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-system-programming-manual-325384.html</div><div class='del'>-.. _ACPI specification: http://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf</div><div class='add'>+References</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+.. [1] Kristen Accardi, *Balancing Power and Performance in the Linux Kernel*,</div><div class='add'>+       http://events.linuxfoundation.org/sites/events/files/slides/LinuxConEurope_2015.pdf</div><div class='add'>+</div><div class='add'>+.. [2] *Intel® 64 and IA-32 Architectures Software Developer’s Manual Volume 3: System Programming Guide*,</div><div class='add'>+       http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-system-programming-manual-325384.html</div><div class='add'>+</div><div class='add'>+.. [3] *Advanced Configuration and Power Interface Specification*,</div><div class='add'>+       https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf</div><div class='head'>diff --git a/Documentation/admin-guide/pm/sleep-states.rst b/Documentation/admin-guide/pm/sleep-states.rst<br/>index dbf5acd49f35..cd3a28cb81f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/sleep-states.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/sleep-states.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/sleep-states.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/sleep-states.rst</a></div><div class='hunk'>@@ -1,10 +1,14 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> ===================</div><div class='ctx'> System Sleep States</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2017 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2017 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> Sleep states are global low-power states of the entire system in which user</div><div class='ctx'> space code cannot be executed and the overall system activity is significantly</div><div class='head'>diff --git a/Documentation/admin-guide/pm/strategies.rst b/Documentation/admin-guide/pm/strategies.rst<br/>index afe4d3f831fe..dd0362e32fa5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/strategies.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/strategies.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/strategies.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/strategies.rst</a></div><div class='hunk'>@@ -1,10 +1,14 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> ===========================</div><div class='ctx'> Power Management Strategies</div><div class='ctx'> ===========================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2017 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2017 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> The Linux kernel supports two major high-level power management strategies.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/admin-guide/pm/system-wide.rst b/Documentation/admin-guide/pm/system-wide.rst<br/>index 0c81e4c5de39..2b1f987b34f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/system-wide.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/system-wide.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/system-wide.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/system-wide.rst</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> ============================</div><div class='ctx'> System-Wide Power Management</div><div class='ctx'> ============================</div><div class='head'>diff --git a/Documentation/admin-guide/pm/working-state.rst b/Documentation/admin-guide/pm/working-state.rst<br/>index b6cef9b5e961..fc298eb1234b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/working-state.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/admin-guide/pm/working-state.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/admin-guide/pm/working-state.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/admin-guide/pm/working-state.rst</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> ==============================</div><div class='ctx'> Working-State Power Management</div><div class='ctx'> ==============================</div><div class='hunk'>@@ -8,3 +10,4 @@ Working-State Power Management</div><div class='ctx'>    cpuidle</div><div class='ctx'>    cpufreq</div><div class='ctx'>    intel_pstate</div><div class='add'>+   intel_epb</div><div class='head'>diff --git a/Documentation/arm64/cpu-feature-registers.txt b/Documentation/arm64/cpu-feature-registers.txt<br/>index d4b4dd1fe786..684a0da39378 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/cpu-feature-registers.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/cpu-feature-registers.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/cpu-feature-registers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/arm64/cpu-feature-registers.txt</a></div><div class='hunk'>@@ -209,6 +209,22 @@ infrastructure:</div><div class='ctx'>      | AT                           | [35-32] |    y    |</div><div class='ctx'>      x--------------------------------------------------x</div><div class='ctx'> </div><div class='add'>+  6) ID_AA64ZFR0_EL1 - SVE feature ID register 0</div><div class='add'>+</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+     | Name                         |  bits   | visible |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | SM4                          | [43-40] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | SHA3                         | [35-32] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | BitPerm                      | [19-16] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | AES                          | [7-4]   |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | SVEVer                       | [3-0]   |    y    |</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+</div><div class='ctx'> Appendix I: Example</div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/arm64/elf_hwcaps.txt b/Documentation/arm64/elf_hwcaps.txt<br/>index 13d6691b37be..b73a2519ecf2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/elf_hwcaps.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/elf_hwcaps.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/elf_hwcaps.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/arm64/elf_hwcaps.txt</a></div><div class='hunk'>@@ -13,9 +13,9 @@ architected discovery mechanism available to userspace code at EL0. The</div><div class='ctx'> kernel exposes the presence of these features to userspace through a set</div><div class='ctx'> of flags called hwcaps, exposed in the auxilliary vector.</div><div class='ctx'> </div><div class='del'>-Userspace software can test for features by acquiring the AT_HWCAP entry</div><div class='del'>-of the auxilliary vector, and testing whether the relevant flags are</div><div class='del'>-set, e.g.</div><div class='add'>+Userspace software can test for features by acquiring the AT_HWCAP or</div><div class='add'>+AT_HWCAP2 entry of the auxiliary vector, and testing whether the relevant</div><div class='add'>+flags are set, e.g.</div><div class='ctx'> </div><div class='ctx'> bool floating_point_is_present(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -135,6 +135,10 @@ HWCAP_DCPOP</div><div class='ctx'> </div><div class='ctx'>     Functionality implied by ID_AA64ISAR1_EL1.DPB == 0b0001.</div><div class='ctx'> </div><div class='add'>+HWCAP2_DCPODP</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ISAR1_EL1.DPB == 0b0010.</div><div class='add'>+</div><div class='ctx'> HWCAP_SHA3</div><div class='ctx'> </div><div class='ctx'>     Functionality implied by ID_AA64ISAR0_EL1.SHA3 == 0b0001.</div><div class='hunk'>@@ -159,6 +163,30 @@ HWCAP_SVE</div><div class='ctx'> </div><div class='ctx'>     Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001.</div><div class='ctx'> </div><div class='add'>+HWCAP2_SVE2</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ZFR0_EL1.SVEVer == 0b0001.</div><div class='add'>+</div><div class='add'>+HWCAP2_SVEAES</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ZFR0_EL1.AES == 0b0001.</div><div class='add'>+</div><div class='add'>+HWCAP2_SVEPMULL</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ZFR0_EL1.AES == 0b0010.</div><div class='add'>+</div><div class='add'>+HWCAP2_SVEBITPERM</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ZFR0_EL1.BitPerm == 0b0001.</div><div class='add'>+</div><div class='add'>+HWCAP2_SVESHA3</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ZFR0_EL1.SHA3 == 0b0001.</div><div class='add'>+</div><div class='add'>+HWCAP2_SVESM4</div><div class='add'>+</div><div class='add'>+    Functionality implied by ID_AA64ZFR0_EL1.SM4 == 0b0001.</div><div class='add'>+</div><div class='ctx'> HWCAP_ASIMDFHM</div><div class='ctx'> </div><div class='ctx'>    Functionality implied by ID_AA64ISAR0_EL1.FHM == 0b0001.</div><div class='hunk'>@@ -194,3 +222,10 @@ HWCAP_PACG</div><div class='ctx'>     Functionality implied by ID_AA64ISAR1_EL1.GPA == 0b0001 or</div><div class='ctx'>     ID_AA64ISAR1_EL1.GPI == 0b0001, as described by</div><div class='ctx'>     Documentation/arm64/pointer-authentication.txt.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Unused AT_HWCAP bits</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+For interoperation with userspace, the kernel guarantees that bits 62</div><div class='add'>+and 63 of AT_HWCAP will always be returned as 0.</div><div class='head'>diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt<br/>index d1e2bb801e1b..68d9b74fd751 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/silicon-errata.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/silicon-errata.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/silicon-errata.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/arm64/silicon-errata.txt</a></div><div class='hunk'>@@ -61,6 +61,7 @@ stable kernels.</div><div class='ctx'> | ARM            | Cortex-A76      | #1188873        | ARM64_ERRATUM_1188873       |</div><div class='ctx'> | ARM            | Cortex-A76      | #1165522        | ARM64_ERRATUM_1165522       |</div><div class='ctx'> | ARM            | Cortex-A76      | #1286807        | ARM64_ERRATUM_1286807       |</div><div class='add'>+| ARM            | Neoverse-N1     | #1188873        | ARM64_ERRATUM_1188873       |</div><div class='ctx'> | ARM            | MMU-500         | #841119,#826419 | N/A                         |</div><div class='ctx'> |                |                 |                 |                             |</div><div class='ctx'> | Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375        |</div><div class='hunk'>@@ -77,6 +78,7 @@ stable kernels.</div><div class='ctx'> | Hisilicon      | Hip0{5,6,7}     | #161010101      | HISILICON_ERRATUM_161010101 |</div><div class='ctx'> | Hisilicon      | Hip0{6,7}       | #161010701      | N/A                         |</div><div class='ctx'> | Hisilicon      | Hip07           | #161600802      | HISILICON_ERRATUM_161600802 |</div><div class='add'>+| Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |</div><div class='ctx'> |                |                 |                 |                             |</div><div class='ctx'> | Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |</div><div class='ctx'> | Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |</div><div class='head'>diff --git a/Documentation/arm64/sve.txt b/Documentation/arm64/sve.txt<br/>index 7169a0ec41d8..9940e924a47e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/sve.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/arm64/sve.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/arm64/sve.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/arm64/sve.txt</a></div><div class='hunk'>@@ -34,6 +34,23 @@ model features for SVE is included in Appendix A.</div><div class='ctx'>   following sections: software that needs to verify that those interfaces are</div><div class='ctx'>   present must check for HWCAP_SVE instead.</div><div class='ctx'> </div><div class='add'>+* On hardware that supports the SVE2 extensions, HWCAP2_SVE2 will also</div><div class='add'>+  be reported in the AT_HWCAP2 aux vector entry.  In addition to this,</div><div class='add'>+  optional extensions to SVE2 may be reported by the presence of:</div><div class='add'>+</div><div class='add'>+	HWCAP2_SVE2</div><div class='add'>+	HWCAP2_SVEAES</div><div class='add'>+	HWCAP2_SVEPMULL</div><div class='add'>+	HWCAP2_SVEBITPERM</div><div class='add'>+	HWCAP2_SVESHA3</div><div class='add'>+	HWCAP2_SVESM4</div><div class='add'>+</div><div class='add'>+  This list may be extended over time as the SVE architecture evolves.</div><div class='add'>+</div><div class='add'>+  These extensions are also reported via the CPU ID register ID_AA64ZFR0_EL1,</div><div class='add'>+  which userspace can read using an MRS instruction.  See elf_hwcaps.txt and</div><div class='add'>+  cpu-feature-registers.txt for details.</div><div class='add'>+</div><div class='ctx'> * Debuggers should restrict themselves to interacting with the target via the</div><div class='ctx'>   NT_ARM_SVE regset.  The recommended way of detecting support for this regset</div><div class='ctx'>   is to connect to a target process first and then attempt a</div><div class='head'>diff --git a/Documentation/atomic_bitops.txt b/Documentation/atomic_bitops.txt<br/>index be70b32c95d9..093cdaefdb37 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/atomic_bitops.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/atomic_bitops.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/atomic_bitops.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/atomic_bitops.txt</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-</div><div class='del'>-On atomic bitops.</div><div class='del'>-</div><div class='add'>+=============</div><div class='add'>+Atomic bitops</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'> While our bitmap_{}() functions are non-atomic, we have a number of operations</div><div class='ctx'> operating on single bits in a bitmap that are atomic.</div><div class='head'>diff --git a/Documentation/atomic_t.txt b/Documentation/atomic_t.txt<br/>index 913396ac5824..dca3fb0554db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/atomic_t.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/atomic_t.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/atomic_t.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/atomic_t.txt</a></div><div class='hunk'>@@ -56,6 +56,23 @@ Barriers:</div><div class='ctx'>   smp_mb__{before,after}_atomic()</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+TYPES (signed vs unsigned)</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+While atomic_t, atomic_long_t and atomic64_t use int, long and s64</div><div class='add'>+respectively (for hysterical raisins), the kernel uses -fno-strict-overflow</div><div class='add'>+(which implies -fwrapv) and defines signed overflow to behave like</div><div class='add'>+2s-complement.</div><div class='add'>+</div><div class='add'>+Therefore, an explicitly unsigned variant of the atomic ops is strictly</div><div class='add'>+unnecessary and we can simply cast, there is no UB.</div><div class='add'>+</div><div class='add'>+There was a bug in UBSAN prior to GCC-8 that would generate UB warnings for</div><div class='add'>+signed types.</div><div class='add'>+</div><div class='add'>+With this we also conform to the C/C++ _Atomic behaviour and things like</div><div class='add'>+P1236R1.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> SEMANTICS</div><div class='ctx'> ---------</div><div class='head'>diff --git a/Documentation/block/bfq-iosched.txt b/Documentation/block/bfq-iosched.txt<br/>index 98a8dd5ee385..1a0f2ac02eb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/block/bfq-iosched.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/block/bfq-iosched.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/block/bfq-iosched.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/block/bfq-iosched.txt</a></div><div class='hunk'>@@ -20,13 +20,26 @@ for that device, by setting low_latency to 0. See Section 3 for</div><div class='ctx'> details on how to configure BFQ for the desired tradeoff between</div><div class='ctx'> latency and throughput, or on how to maximize throughput.</div><div class='ctx'> </div><div class='del'>-BFQ has a non-null overhead, which limits the maximum IOPS that a CPU</div><div class='del'>-can process for a device scheduled with BFQ. To give an idea of the</div><div class='del'>-limits on slow or average CPUs, here are, first, the limits of BFQ for</div><div class='del'>-three different CPUs, on, respectively, an average laptop, an old</div><div class='del'>-desktop, and a cheap embedded system, in case full hierarchical</div><div class='del'>-support is enabled (i.e., CONFIG_BFQ_GROUP_IOSCHED is set), but</div><div class='del'>-CONFIG_DEBUG_BLK_CGROUP is not set (Section 4-2):</div><div class='add'>+As every I/O scheduler, BFQ adds some overhead to per-I/O-request</div><div class='add'>+processing. To give an idea of this overhead, the total,</div><div class='add'>+single-lock-protected, per-request processing time of BFQ---i.e., the</div><div class='add'>+sum of the execution times of the request insertion, dispatch and</div><div class='add'>+completion hooks---is, e.g., 1.9 us on an Intel Core i7-2760QM@2.40GHz</div><div class='add'>+(dated CPU for notebooks; time measured with simple code</div><div class='add'>+instrumentation, and using the throughput-sync.sh script of the S</div><div class='add'>+suite [1], in performance-profiling mode). To put this result into</div><div class='add'>+context, the total, single-lock-protected, per-request execution time</div><div class='add'>+of the lightest I/O scheduler available in blk-mq, mq-deadline, is 0.7</div><div class='add'>+us (mq-deadline is ~800 LOC, against ~10500 LOC for BFQ).</div><div class='add'>+</div><div class='add'>+Scheduling overhead further limits the maximum IOPS that a CPU can</div><div class='add'>+process (already limited by the execution of the rest of the I/O</div><div class='add'>+stack). To give an idea of the limits with BFQ, on slow or average</div><div class='add'>+CPUs, here are, first, the limits of BFQ for three different CPUs, on,</div><div class='add'>+respectively, an average laptop, an old desktop, and a cheap embedded</div><div class='add'>+system, in case full hierarchical support is enabled (i.e.,</div><div class='add'>+CONFIG_BFQ_GROUP_IOSCHED is set), but CONFIG_DEBUG_BLK_CGROUP is not</div><div class='add'>+set (Section 4-2):</div><div class='ctx'> - Intel i7-4850HQ: 400 KIOPS</div><div class='ctx'> - AMD A8-3850: 250 KIOPS</div><div class='ctx'> - ARM CortexTM-A53 Octa-core: 80 KIOPS</div><div class='hunk'>@@ -566,3 +579,5 @@ applications. Unset this tunable if you need/want to control weights.</div><div class='ctx'>     Slightly extended version:</div><div class='ctx'>     http://algogroup.unimore.it/people/paolo/disk_sched/bfq-v1-suite-</div><div class='ctx'> 							results.pdf</div><div class='add'>+</div><div class='add'>+[3] https://github.com/Algodev-github/S</div><div class='head'>diff --git a/Documentation/block/null_blk.txt b/Documentation/block/null_blk.txt<br/>index 4cad1024fff7..41f0a3d33bbd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/block/null_blk.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/block/null_blk.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/block/null_blk.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/block/null_blk.txt</a></div><div class='hunk'>@@ -93,3 +93,7 @@ zoned=[0/1]: Default: 0</div><div class='ctx'> </div><div class='ctx'> zone_size=[MB]: Default: 256</div><div class='ctx'>   Per zone size when exposed as a zoned block device. Must be a power of two.</div><div class='add'>+</div><div class='add'>+zone_nr_conv=[nr_conv]: Default: 0</div><div class='add'>+  The number of conventional zones to create when block device is zoned.  If</div><div class='add'>+  zone_nr_conv &gt;= nr_zones, it will be reduced to nr_zones - 1.</div><div class='head'>diff --git a/Documentation/bpf/bpf_design_QA.rst b/Documentation/bpf/bpf_design_QA.rst<br/>index 10453c627135..cb402c59eca5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/bpf_design_QA.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/bpf_design_QA.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/bpf_design_QA.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/bpf/bpf_design_QA.rst</a></div><div class='hunk'>@@ -85,8 +85,33 @@ Q: Can loops be supported in a safe way?</div><div class='ctx'> A: It's not clear yet.</div><div class='ctx'> </div><div class='ctx'> BPF developers are trying to find a way to</div><div class='del'>-support bounded loops where the verifier can guarantee that</div><div class='del'>-the program terminates in less than 4096 instructions.</div><div class='add'>+support bounded loops.</div><div class='add'>+</div><div class='add'>+Q: What are the verifier limits?</div><div class='add'>+--------------------------------</div><div class='add'>+A: The only limit known to the user space is BPF_MAXINSNS (4096).</div><div class='add'>+It's the maximum number of instructions that the unprivileged bpf</div><div class='add'>+program can have. The verifier has various internal limits.</div><div class='add'>+Like the maximum number of instructions that can be explored during</div><div class='add'>+program analysis. Currently, that limit is set to 1 million.</div><div class='add'>+Which essentially means that the largest program can consist</div><div class='add'>+of 1 million NOP instructions. There is a limit to the maximum number</div><div class='add'>+of subsequent branches, a limit to the number of nested bpf-to-bpf</div><div class='add'>+calls, a limit to the number of the verifier states per instruction,</div><div class='add'>+a limit to the number of maps used by the program.</div><div class='add'>+All these limits can be hit with a sufficiently complex program.</div><div class='add'>+There are also non-numerical limits that can cause the program</div><div class='add'>+to be rejected. The verifier used to recognize only pointer + constant</div><div class='add'>+expressions. Now it can recognize pointer + bounded_register.</div><div class='add'>+bpf_lookup_map_elem(key) had a requirement that 'key' must be</div><div class='add'>+a pointer to the stack. Now, 'key' can be a pointer to map value.</div><div class='add'>+The verifier is steadily getting 'smarter'. The limits are</div><div class='add'>+being removed. The only way to know that the program is going to</div><div class='add'>+be accepted by the verifier is to try to load it.</div><div class='add'>+The bpf development process guarantees that the future kernel</div><div class='add'>+versions will accept all bpf programs that were accepted by</div><div class='add'>+the earlier versions.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Instruction level questions</div><div class='ctx'> ---------------------------</div><div class='head'>diff --git a/Documentation/bpf/btf.rst b/Documentation/bpf/btf.rst<br/>index 9a60a5d60e38..29396e6943b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/btf.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/btf.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/btf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/bpf/btf.rst</a></div><div class='hunk'>@@ -82,6 +82,8 @@ sequentially and type id is assigned to each recognized type starting from id</div><div class='ctx'>     #define BTF_KIND_RESTRICT       11      /* Restrict     */</div><div class='ctx'>     #define BTF_KIND_FUNC           12      /* Function     */</div><div class='ctx'>     #define BTF_KIND_FUNC_PROTO     13      /* Function Proto       */</div><div class='add'>+    #define BTF_KIND_VAR            14      /* Variable     */</div><div class='add'>+    #define BTF_KIND_DATASEC        15      /* Section      */</div><div class='ctx'> </div><div class='ctx'> Note that the type section encodes debug info, not just pure types.</div><div class='ctx'> ``BTF_KIND_FUNC`` is not a type, and it represents a defined subprogram.</div><div class='hunk'>@@ -148,16 +150,16 @@ The ``btf_type.size * 8`` must be equal to or greater than ``BTF_INT_BITS()``</div><div class='ctx'> for the type. The maximum value of ``BTF_INT_BITS()`` is 128.</div><div class='ctx'> </div><div class='ctx'> The ``BTF_INT_OFFSET()`` specifies the starting bit offset to calculate values</div><div class='del'>-for this int. For example, a bitfield struct member has: * btf member bit</div><div class='del'>-offset 100 from the start of the structure, * btf member pointing to an int</div><div class='del'>-type, * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``</div><div class='add'>+for this int. For example, a bitfield struct member has:</div><div class='add'>+ * btf member bit offset 100 from the start of the structure,</div><div class='add'>+ * btf member pointing to an int type,</div><div class='add'>+ * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``</div><div class='ctx'> </div><div class='ctx'> Then in the struct memory layout, this member will occupy ``4`` bits starting</div><div class='ctx'> from bits ``100 + 2 = 102``.</div><div class='ctx'> </div><div class='ctx'> Alternatively, the bitfield struct member can be the following to access the</div><div class='ctx'> same bits as the above:</div><div class='del'>-</div><div class='ctx'>  * btf member bit offset 102,</div><div class='ctx'>  * btf member pointing to an int type,</div><div class='ctx'>  * the int type has ``BTF_INT_OFFSET() = 0`` and ``BTF_INT_BITS() = 4``</div><div class='hunk'>@@ -393,6 +395,61 @@ refers to parameter type.</div><div class='ctx'> If the function has variable arguments, the last parameter is encoded with</div><div class='ctx'> ``name_off = 0`` and ``type = 0``.</div><div class='ctx'> </div><div class='add'>+2.2.14 BTF_KIND_VAR</div><div class='add'>+~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+``struct btf_type`` encoding requirement:</div><div class='add'>+  * ``name_off``: offset to a valid C identifier</div><div class='add'>+  * ``info.kind_flag``: 0</div><div class='add'>+  * ``info.kind``: BTF_KIND_VAR</div><div class='add'>+  * ``info.vlen``: 0</div><div class='add'>+  * ``type``: the type of the variable</div><div class='add'>+</div><div class='add'>+``btf_type`` is followed by a single ``struct btf_variable`` with the</div><div class='add'>+following data::</div><div class='add'>+</div><div class='add'>+    struct btf_var {</div><div class='add'>+        __u32   linkage;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+``struct btf_var`` encoding:</div><div class='add'>+  * ``linkage``: currently only static variable 0, or globally allocated</div><div class='add'>+                 variable in ELF sections 1</div><div class='add'>+</div><div class='add'>+Not all type of global variables are supported by LLVM at this point.</div><div class='add'>+The following is currently available:</div><div class='add'>+</div><div class='add'>+  * static variables with or without section attributes</div><div class='add'>+  * global variables with section attributes</div><div class='add'>+</div><div class='add'>+The latter is for future extraction of map key/value type id's from a</div><div class='add'>+map definition.</div><div class='add'>+</div><div class='add'>+2.2.15 BTF_KIND_DATASEC</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+``struct btf_type`` encoding requirement:</div><div class='add'>+  * ``name_off``: offset to a valid name associated with a variable or</div><div class='add'>+                  one of .data/.bss/.rodata</div><div class='add'>+  * ``info.kind_flag``: 0</div><div class='add'>+  * ``info.kind``: BTF_KIND_DATASEC</div><div class='add'>+  * ``info.vlen``: # of variables</div><div class='add'>+  * ``size``: total section size in bytes (0 at compilation time, patched</div><div class='add'>+              to actual size by BPF loaders such as libbpf)</div><div class='add'>+</div><div class='add'>+``btf_type`` is followed by ``info.vlen`` number of ``struct btf_var_secinfo``.::</div><div class='add'>+</div><div class='add'>+    struct btf_var_secinfo {</div><div class='add'>+        __u32   type;</div><div class='add'>+        __u32   offset;</div><div class='add'>+        __u32   size;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+``struct btf_var_secinfo`` encoding:</div><div class='add'>+  * ``type``: the type of the BTF_KIND_VAR variable</div><div class='add'>+  * ``offset``: the in-section offset of the variable</div><div class='add'>+  * ``size``: the size of the variable in bytes</div><div class='add'>+</div><div class='ctx'> 3. BTF Kernel API</div><div class='ctx'> *****************</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/bpf/index.rst b/Documentation/bpf/index.rst<br/>index 4e77932959cc..d3fe4cac0c90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/bpf/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/bpf/index.rst</a></div><div class='hunk'>@@ -36,6 +36,16 @@ Two sets of Questions and Answers (Q&amp;A) are maintained.</div><div class='ctx'>    bpf_devel_QA</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Program types</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   prog_cgroup_sysctl</div><div class='add'>+   prog_flow_dissector</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> .. Links:</div><div class='ctx'> .. _Documentation/networking/filter.txt: ../networking/filter.txt</div><div class='ctx'> .. _man-pages: https://www.kernel.org/doc/man-pages/</div><div class='head'>diff --git a/Documentation/bpf/prog_cgroup_sysctl.rst b/Documentation/bpf/prog_cgroup_sysctl.rst<br/>new file mode 100644<br/>index 000000000000..677d6c637cf3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/prog_cgroup_sysctl.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/bpf/prog_cgroup_sysctl.rst</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+.. SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)</div><div class='add'>+</div><div class='add'>+===========================</div><div class='add'>+BPF_PROG_TYPE_CGROUP_SYSCTL</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+This document describes ``BPF_PROG_TYPE_CGROUP_SYSCTL`` program type that</div><div class='add'>+provides cgroup-bpf hook for sysctl.</div><div class='add'>+</div><div class='add'>+The hook has to be attached to a cgroup and will be called every time a</div><div class='add'>+process inside that cgroup tries to read from or write to sysctl knob in proc.</div><div class='add'>+</div><div class='add'>+1. Attach type</div><div class='add'>+**************</div><div class='add'>+</div><div class='add'>+``BPF_CGROUP_SYSCTL`` attach type has to be used to attach</div><div class='add'>+``BPF_PROG_TYPE_CGROUP_SYSCTL`` program to a cgroup.</div><div class='add'>+</div><div class='add'>+2. Context</div><div class='add'>+**********</div><div class='add'>+</div><div class='add'>+``BPF_PROG_TYPE_CGROUP_SYSCTL`` provides access to the following context from</div><div class='add'>+BPF program::</div><div class='add'>+</div><div class='add'>+    struct bpf_sysctl {</div><div class='add'>+        __u32 write;</div><div class='add'>+        __u32 file_pos;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+* ``write`` indicates whether sysctl value is being read (``0``) or written</div><div class='add'>+  (``1``). This field is read-only.</div><div class='add'>+</div><div class='add'>+* ``file_pos`` indicates file position sysctl is being accessed at, read</div><div class='add'>+  or written. This field is read-write. Writing to the field sets the starting</div><div class='add'>+  position in sysctl proc file ``read(2)`` will be reading from or ``write(2)``</div><div class='add'>+  will be writing to. Writing zero to the field can be used e.g. to override</div><div class='add'>+  whole sysctl value by ``bpf_sysctl_set_new_value()`` on ``write(2)`` even</div><div class='add'>+  when it's called by user space on ``file_pos &gt; 0``. Writing non-zero</div><div class='add'>+  value to the field can be used to access part of sysctl value starting from</div><div class='add'>+  specified ``file_pos``. Not all sysctl support access with ``file_pos !=</div><div class='add'>+  0``, e.g. writes to numeric sysctl entries must always be at file position</div><div class='add'>+  ``0``. See also ``kernel.sysctl_writes_strict`` sysctl.</div><div class='add'>+</div><div class='add'>+See `linux/bpf.h`_ for more details on how context field can be accessed.</div><div class='add'>+</div><div class='add'>+3. Return code</div><div class='add'>+**************</div><div class='add'>+</div><div class='add'>+``BPF_PROG_TYPE_CGROUP_SYSCTL`` program must return one of the following</div><div class='add'>+return codes:</div><div class='add'>+</div><div class='add'>+* ``0`` means "reject access to sysctl";</div><div class='add'>+* ``1`` means "proceed with access".</div><div class='add'>+</div><div class='add'>+If program returns ``0`` user space will get ``-1`` from ``read(2)`` or</div><div class='add'>+``write(2)`` and ``errno`` will be set to ``EPERM``.</div><div class='add'>+</div><div class='add'>+4. Helpers</div><div class='add'>+**********</div><div class='add'>+</div><div class='add'>+Since sysctl knob is represented by a name and a value, sysctl specific BPF</div><div class='add'>+helpers focus on providing access to these properties:</div><div class='add'>+</div><div class='add'>+* ``bpf_sysctl_get_name()`` to get sysctl name as it is visible in</div><div class='add'>+  ``/proc/sys`` into provided by BPF program buffer;</div><div class='add'>+</div><div class='add'>+* ``bpf_sysctl_get_current_value()`` to get string value currently held by</div><div class='add'>+  sysctl into provided by BPF program buffer. This helper is available on both</div><div class='add'>+  ``read(2)`` from and ``write(2)`` to sysctl;</div><div class='add'>+</div><div class='add'>+* ``bpf_sysctl_get_new_value()`` to get new string value currently being</div><div class='add'>+  written to sysctl before actual write happens. This helper can be used only</div><div class='add'>+  on ``ctx-&gt;write == 1``;</div><div class='add'>+</div><div class='add'>+* ``bpf_sysctl_set_new_value()`` to override new string value currently being</div><div class='add'>+  written to sysctl before actual write happens. Sysctl value will be</div><div class='add'>+  overridden starting from the current ``ctx-&gt;file_pos``. If the whole value</div><div class='add'>+  has to be overridden BPF program can set ``file_pos`` to zero before calling</div><div class='add'>+  to the helper. This helper can be used only on ``ctx-&gt;write == 1``. New</div><div class='add'>+  string value set by the helper is treated and verified by kernel same way as</div><div class='add'>+  an equivalent string passed by user space.</div><div class='add'>+</div><div class='add'>+BPF program sees sysctl value same way as user space does in proc filesystem,</div><div class='add'>+i.e. as a string. Since many sysctl values represent an integer or a vector</div><div class='add'>+of integers, the following helpers can be used to get numeric value from the</div><div class='add'>+string:</div><div class='add'>+</div><div class='add'>+* ``bpf_strtol()`` to convert initial part of the string to long integer</div><div class='add'>+  similar to user space `strtol(3)`_;</div><div class='add'>+* ``bpf_strtoul()`` to convert initial part of the string to unsigned long</div><div class='add'>+  integer similar to user space `strtoul(3)`_;</div><div class='add'>+</div><div class='add'>+See `linux/bpf.h`_ for more details on helpers described here.</div><div class='add'>+</div><div class='add'>+5. Examples</div><div class='add'>+***********</div><div class='add'>+</div><div class='add'>+See `test_sysctl_prog.c`_ for an example of BPF program in C that access</div><div class='add'>+sysctl name and value, parses string value to get vector of integers and uses</div><div class='add'>+the result to make decision whether to allow or deny access to sysctl.</div><div class='add'>+</div><div class='add'>+6. Notes</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+``BPF_PROG_TYPE_CGROUP_SYSCTL`` is intended to be used in **trusted** root</div><div class='add'>+environment, for example to monitor sysctl usage or catch unreasonable values</div><div class='add'>+an application, running as root in a separate cgroup, is trying to set.</div><div class='add'>+</div><div class='add'>+Since `task_dfl_cgroup(current)` is called at `sys_read` / `sys_write` time it</div><div class='add'>+may return results different from that at `sys_open` time, i.e. process that</div><div class='add'>+opened sysctl file in proc filesystem may differ from process that is trying</div><div class='add'>+to read from / write to it and two such processes may run in different</div><div class='add'>+cgroups, what means ``BPF_PROG_TYPE_CGROUP_SYSCTL`` should not be used as a</div><div class='add'>+security mechanism to limit sysctl usage.</div><div class='add'>+</div><div class='add'>+As with any cgroup-bpf program additional care should be taken if an</div><div class='add'>+application running as root in a cgroup should not be allowed to</div><div class='add'>+detach/replace BPF program attached by administrator.</div><div class='add'>+</div><div class='add'>+.. Links</div><div class='add'>+.. _linux/bpf.h: ../../include/uapi/linux/bpf.h</div><div class='add'>+.. _strtol(3): http://man7.org/linux/man-pages/man3/strtol.3p.html</div><div class='add'>+.. _strtoul(3): http://man7.org/linux/man-pages/man3/strtoul.3p.html</div><div class='add'>+.. _test_sysctl_prog.c:</div><div class='add'>+   ../../tools/testing/selftests/bpf/progs/test_sysctl_prog.c</div><div class='head'>diff --git a/Documentation/bpf/prog_flow_dissector.rst b/Documentation/bpf/prog_flow_dissector.rst<br/>new file mode 100644<br/>index 000000000000..ed343abe541e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/bpf/prog_flow_dissector.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/bpf/prog_flow_dissector.rst</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+============================</div><div class='add'>+BPF_PROG_TYPE_FLOW_DISSECTOR</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+Flow dissector is a routine that parses metadata out of the packets. It's</div><div class='add'>+used in the various places in the networking subsystem (RFS, flow hash, etc).</div><div class='add'>+</div><div class='add'>+BPF flow dissector is an attempt to reimplement C-based flow dissector logic</div><div class='add'>+in BPF to gain all the benefits of BPF verifier (namely, limits on the</div><div class='add'>+number of instructions and tail calls).</div><div class='add'>+</div><div class='add'>+API</div><div class='add'>+===</div><div class='add'>+</div><div class='add'>+BPF flow dissector programs operate on an ``__sk_buff``. However, only the</div><div class='add'>+limited set of fields is allowed: ``data``, ``data_end`` and ``flow_keys``.</div><div class='add'>+``flow_keys`` is ``struct bpf_flow_keys`` and contains flow dissector input</div><div class='add'>+and output arguments.</div><div class='add'>+</div><div class='add'>+The inputs are:</div><div class='add'>+  * ``nhoff`` - initial offset of the networking header</div><div class='add'>+  * ``thoff`` - initial offset of the transport header, initialized to nhoff</div><div class='add'>+  * ``n_proto`` - L3 protocol type, parsed out of L2 header</div><div class='add'>+</div><div class='add'>+Flow dissector BPF program should fill out the rest of the ``struct</div><div class='add'>+bpf_flow_keys`` fields. Input arguments ``nhoff/thoff/n_proto`` should be</div><div class='add'>+also adjusted accordingly.</div><div class='add'>+</div><div class='add'>+The return code of the BPF program is either BPF_OK to indicate successful</div><div class='add'>+dissection, or BPF_DROP to indicate parsing error.</div><div class='add'>+</div><div class='add'>+__sk_buff-&gt;data</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+In the VLAN-less case, this is what the initial state of the BPF flow</div><div class='add'>+dissector looks like::</div><div class='add'>+</div><div class='add'>+  +------+------+------------+-----------+</div><div class='add'>+  | DMAC | SMAC | ETHER_TYPE | L3_HEADER |</div><div class='add'>+  +------+------+------------+-----------+</div><div class='add'>+                              ^</div><div class='add'>+                              |</div><div class='add'>+                              +-- flow dissector starts here</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. code:: c</div><div class='add'>+</div><div class='add'>+  skb-&gt;data + flow_keys-&gt;nhoff point to the first byte of L3_HEADER</div><div class='add'>+  flow_keys-&gt;thoff = nhoff</div><div class='add'>+  flow_keys-&gt;n_proto = ETHER_TYPE</div><div class='add'>+</div><div class='add'>+In case of VLAN, flow dissector can be called with the two different states.</div><div class='add'>+</div><div class='add'>+Pre-VLAN parsing::</div><div class='add'>+</div><div class='add'>+  +------+------+------+-----+-----------+-----------+</div><div class='add'>+  | DMAC | SMAC | TPID | TCI |ETHER_TYPE | L3_HEADER |</div><div class='add'>+  +------+------+------+-----+-----------+-----------+</div><div class='add'>+                        ^</div><div class='add'>+                        |</div><div class='add'>+                        +-- flow dissector starts here</div><div class='add'>+</div><div class='add'>+.. code:: c</div><div class='add'>+</div><div class='add'>+  skb-&gt;data + flow_keys-&gt;nhoff point the to first byte of TCI</div><div class='add'>+  flow_keys-&gt;thoff = nhoff</div><div class='add'>+  flow_keys-&gt;n_proto = TPID</div><div class='add'>+</div><div class='add'>+Please note that TPID can be 802.1AD and, hence, BPF program would</div><div class='add'>+have to parse VLAN information twice for double tagged packets.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Post-VLAN parsing::</div><div class='add'>+</div><div class='add'>+  +------+------+------+-----+-----------+-----------+</div><div class='add'>+  | DMAC | SMAC | TPID | TCI |ETHER_TYPE | L3_HEADER |</div><div class='add'>+  +------+------+------+-----+-----------+-----------+</div><div class='add'>+                                          ^</div><div class='add'>+                                          |</div><div class='add'>+                                          +-- flow dissector starts here</div><div class='add'>+</div><div class='add'>+.. code:: c</div><div class='add'>+</div><div class='add'>+  skb-&gt;data + flow_keys-&gt;nhoff point the to first byte of L3_HEADER</div><div class='add'>+  flow_keys-&gt;thoff = nhoff</div><div class='add'>+  flow_keys-&gt;n_proto = ETHER_TYPE</div><div class='add'>+</div><div class='add'>+In this case VLAN information has been processed before the flow dissector</div><div class='add'>+and BPF flow dissector is not required to handle it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The takeaway here is as follows: BPF flow dissector program can be called with</div><div class='add'>+the optional VLAN header and should gracefully handle both cases: when single</div><div class='add'>+or double VLAN is present and when it is not present. The same program</div><div class='add'>+can be called for both cases and would have to be written carefully to</div><div class='add'>+handle both cases.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Reference Implementation</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+See ``tools/testing/selftests/bpf/progs/bpf_flow.c`` for the reference</div><div class='add'>+implementation and ``tools/testing/selftests/bpf/flow_dissector_load.[hc]``</div><div class='add'>+for the loader. bpftool can be used to load BPF flow dissector program as well.</div><div class='add'>+</div><div class='add'>+The reference implementation is organized as follows:</div><div class='add'>+  * ``jmp_table`` map that contains sub-programs for each supported L3 protocol</div><div class='add'>+  * ``_dissect`` routine - entry point; it does input ``n_proto`` parsing and</div><div class='add'>+    does ``bpf_tail_call`` to the appropriate L3 handler</div><div class='add'>+</div><div class='add'>+Since BPF at this point doesn't support looping (or any jumping back),</div><div class='add'>+jmp_table is used instead to handle multiple levels of encapsulation (and</div><div class='add'>+IPv6 options).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Current Limitations</div><div class='add'>+===================</div><div class='add'>+BPF flow dissector doesn't support exporting all the metadata that in-kernel</div><div class='add'>+C-based implementation can export. Notable example is single VLAN (802.1Q)</div><div class='add'>+and double VLAN (802.1AD) tags. Please refer to the ``struct bpf_flow_keys``</div><div class='add'>+for a set of information that's currently can be exported from the BPF context.</div><div class='head'>diff --git a/Documentation/clearing-warn-once.txt b/Documentation/clearing-warn-once.txt<br/>index 5b1f5d547be1..211fd926cf00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/clearing-warn-once.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/clearing-warn-once.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/clearing-warn-once.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/clearing-warn-once.txt</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='add'>+Clearing WARN_ONCE</div><div class='add'>+------------------</div><div class='ctx'> </div><div class='del'>-WARN_ONCE / WARN_ON_ONCE only print a warning once.</div><div class='add'>+WARN_ONCE / WARN_ON_ONCE / printk_once only emit a message once.</div><div class='ctx'> </div><div class='ctx'> echo 1 &gt; /sys/kernel/debug/clear_warn_once</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/core-api/cachetlb.rst b/Documentation/core-api/cachetlb.rst<br/>index 6eb9d3f090cd..93cb65d52720 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/core-api/cachetlb.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/core-api/cachetlb.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/core-api/cachetlb.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/core-api/cachetlb.rst</a></div><div class='hunk'>@@ -101,16 +101,6 @@ changes occur:</div><div class='ctx'> 	translations for software managed TLB configurations.</div><div class='ctx'> 	The sparc64 port currently does this.</div><div class='ctx'> </div><div class='del'>-6) ``void tlb_migrate_finish(struct mm_struct *mm)``</div><div class='del'>-</div><div class='del'>-	This interface is called at the end of an explicit</div><div class='del'>-	process migration. This interface provides a hook</div><div class='del'>-	to allow a platform to update TLB or context-specific</div><div class='del'>-	information for the address space.</div><div class='del'>-</div><div class='del'>-	The ia64 sn2 platform is one example of a platform</div><div class='del'>-	that uses this interface.</div><div class='del'>-</div><div class='ctx'> Next, we have the cache flushing interfaces.  In general, when Linux</div><div class='ctx'> is changing an existing virtual--&gt;physical mapping to a new value,</div><div class='ctx'> the sequence will be in one of the following forms::</div><div class='head'>diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst<br/>index 6870baffef82..ee1bb8983a88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/core-api/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/core-api/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/core-api/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/core-api/index.rst</a></div><div class='hunk'>@@ -22,7 +22,6 @@ Core utilities</div><div class='ctx'>    workqueue</div><div class='ctx'>    genericirq</div><div class='ctx'>    xarray</div><div class='del'>-   flexible-arrays</div><div class='ctx'>    librs</div><div class='ctx'>    genalloc</div><div class='ctx'>    errseq</div><div class='head'>diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst<br/>index c37ec7cd9c06..75d2bbe9813f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/core-api/printk-formats.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/core-api/printk-formats.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/core-api/printk-formats.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/core-api/printk-formats.rst</a></div><div class='hunk'>@@ -58,6 +58,14 @@ A raw pointer value may be printed with %p which will hash the address</div><div class='ctx'> before printing. The kernel also supports extended specifiers for printing</div><div class='ctx'> pointers of different types.</div><div class='ctx'> </div><div class='add'>+Some of the extended specifiers print the data on the given address instead</div><div class='add'>+of printing the address itself. In this case, the following error messages</div><div class='add'>+might be printed instead of the unreachable information::</div><div class='add'>+</div><div class='add'>+	(null)	 data on plain NULL address</div><div class='add'>+	(efault) data on invalid address</div><div class='add'>+	(einval) invalid data on a valid address</div><div class='add'>+</div><div class='ctx'> Plain Pointers</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt<br/>index c6e7e9196a8b..cb61277e2308 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/cputopology.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/cputopology.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/cputopology.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/cputopology.txt</a></div><div class='hunk'>@@ -3,79 +3,79 @@ How CPU topology info is exported via sysfs</div><div class='ctx'> ===========================================</div><div class='ctx'> </div><div class='ctx'> Export CPU topology info via sysfs. Items (attributes) are similar</div><div class='del'>-to /proc/cpuinfo output of some architectures:</div><div class='add'>+to /proc/cpuinfo output of some architectures.  They reside in</div><div class='add'>+/sys/devices/system/cpu/cpuX/topology/:</div><div class='ctx'> </div><div class='del'>-1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:</div><div class='add'>+physical_package_id:</div><div class='ctx'> </div><div class='ctx'> 	physical package id of cpuX. Typically corresponds to a physical</div><div class='ctx'> 	socket number, but the actual value is architecture and platform</div><div class='ctx'> 	dependent.</div><div class='ctx'> </div><div class='del'>-2) /sys/devices/system/cpu/cpuX/topology/core_id:</div><div class='add'>+core_id:</div><div class='ctx'> </div><div class='ctx'> 	the CPU core ID of cpuX. Typically it is the hardware platform's</div><div class='ctx'> 	identifier (rather than the kernel's).  The actual value is</div><div class='ctx'> 	architecture and platform dependent.</div><div class='ctx'> </div><div class='del'>-3) /sys/devices/system/cpu/cpuX/topology/book_id:</div><div class='add'>+book_id:</div><div class='ctx'> </div><div class='ctx'> 	the book ID of cpuX. Typically it is the hardware platform's</div><div class='ctx'> 	identifier (rather than the kernel's).	The actual value is</div><div class='ctx'> 	architecture and platform dependent.</div><div class='ctx'> </div><div class='del'>-4) /sys/devices/system/cpu/cpuX/topology/drawer_id:</div><div class='add'>+drawer_id:</div><div class='ctx'> </div><div class='ctx'> 	the drawer ID of cpuX. Typically it is the hardware platform's</div><div class='ctx'> 	identifier (rather than the kernel's).	The actual value is</div><div class='ctx'> 	architecture and platform dependent.</div><div class='ctx'> </div><div class='del'>-5) /sys/devices/system/cpu/cpuX/topology/thread_siblings:</div><div class='add'>+thread_siblings:</div><div class='ctx'> </div><div class='ctx'> 	internal kernel map of cpuX's hardware threads within the same</div><div class='ctx'> 	core as cpuX.</div><div class='ctx'> </div><div class='del'>-6) /sys/devices/system/cpu/cpuX/topology/thread_siblings_list:</div><div class='add'>+thread_siblings_list:</div><div class='ctx'> </div><div class='ctx'> 	human-readable list of cpuX's hardware threads within the same</div><div class='ctx'> 	core as cpuX.</div><div class='ctx'> </div><div class='del'>-7) /sys/devices/system/cpu/cpuX/topology/core_siblings:</div><div class='add'>+core_siblings:</div><div class='ctx'> </div><div class='ctx'> 	internal kernel map of cpuX's hardware threads within the same</div><div class='ctx'> 	physical_package_id.</div><div class='ctx'> </div><div class='del'>-8) /sys/devices/system/cpu/cpuX/topology/core_siblings_list:</div><div class='add'>+core_siblings_list:</div><div class='ctx'> </div><div class='ctx'> 	human-readable list of cpuX's hardware threads within the same</div><div class='ctx'> 	physical_package_id.</div><div class='ctx'> </div><div class='del'>-9) /sys/devices/system/cpu/cpuX/topology/book_siblings:</div><div class='add'>+book_siblings:</div><div class='ctx'> </div><div class='ctx'> 	internal kernel map of cpuX's hardware threads within the same</div><div class='ctx'> 	book_id.</div><div class='ctx'> </div><div class='del'>-10) /sys/devices/system/cpu/cpuX/topology/book_siblings_list:</div><div class='add'>+book_siblings_list:</div><div class='ctx'> </div><div class='ctx'> 	human-readable list of cpuX's hardware threads within the same</div><div class='ctx'> 	book_id.</div><div class='ctx'> </div><div class='del'>-11) /sys/devices/system/cpu/cpuX/topology/drawer_siblings:</div><div class='add'>+drawer_siblings:</div><div class='ctx'> </div><div class='ctx'> 	internal kernel map of cpuX's hardware threads within the same</div><div class='ctx'> 	drawer_id.</div><div class='ctx'> </div><div class='del'>-12) /sys/devices/system/cpu/cpuX/topology/drawer_siblings_list:</div><div class='add'>+drawer_siblings_list:</div><div class='ctx'> </div><div class='ctx'> 	human-readable list of cpuX's hardware threads within the same</div><div class='ctx'> 	drawer_id.</div><div class='ctx'> </div><div class='del'>-To implement it in an architecture-neutral way, a new source file,</div><div class='del'>-drivers/base/topology.c, is to export the 6 to 12 attributes. The book</div><div class='del'>-and drawer related sysfs files will only be created if CONFIG_SCHED_BOOK</div><div class='del'>-and CONFIG_SCHED_DRAWER are selected.</div><div class='add'>+Architecture-neutral, drivers/base/topology.c, exports these attributes.</div><div class='add'>+However, the book and drawer related sysfs files will only be created if</div><div class='add'>+CONFIG_SCHED_BOOK and CONFIG_SCHED_DRAWER are selected, respectively.</div><div class='ctx'> </div><div class='del'>-CONFIG_SCHED_BOOK and CONFIG_DRAWER are currently only used on s390, where</div><div class='del'>-they reflect the cpu and cache hierarchy.</div><div class='add'>+CONFIG_SCHED_BOOK and CONFIG_SCHED_DRAWER are currently only used on s390,</div><div class='add'>+where they reflect the cpu and cache hierarchy.</div><div class='ctx'> </div><div class='ctx'> For an architecture to support this feature, it must define some of</div><div class='ctx'> these macros in include/asm-XXX/topology.h::</div><div class='hunk'>@@ -98,10 +98,10 @@ To be consistent on all architectures, include/linux/topology.h</div><div class='ctx'> provides default definitions for any of the above macros that are</div><div class='ctx'> not defined by include/asm-XXX/topology.h:</div><div class='ctx'> </div><div class='del'>-1) physical_package_id: -1</div><div class='del'>-2) core_id: 0</div><div class='del'>-3) sibling_cpumask: just the given CPU</div><div class='del'>-4) core_cpumask: just the given CPU</div><div class='add'>+1) topology_physical_package_id: -1</div><div class='add'>+2) topology_core_id: 0</div><div class='add'>+3) topology_sibling_cpumask: just the given CPU</div><div class='add'>+4) topology_core_cpumask: just the given CPU</div><div class='ctx'> </div><div class='ctx'> For architectures that don't support books (CONFIG_SCHED_BOOK) there are no</div><div class='ctx'> default definitions for topology_book_id() and topology_book_cpumask().</div><div class='head'>diff --git a/Documentation/crypto/api-samples.rst b/Documentation/crypto/api-samples.rst<br/>index 0f6ca8b7261e..f14afaaf2f32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/crypto/api-samples.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/crypto/api-samples.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/crypto/api-samples.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/crypto/api-samples.rst</a></div><div class='hunk'>@@ -133,7 +133,6 @@ Code Example For Use of Operational State Memory With SHASH</div><div class='ctx'>         if (!sdesc)</div><div class='ctx'>             return ERR_PTR(-ENOMEM);</div><div class='ctx'>         sdesc-&gt;shash.tfm = alg;</div><div class='del'>-        sdesc-&gt;shash.flags = 0x0;</div><div class='ctx'>         return sdesc;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/dev-tools/kselftest.rst b/Documentation/dev-tools/kselftest.rst<br/>index 7756f7a7c23b..25604904fa6e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/dev-tools/kselftest.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/dev-tools/kselftest.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/dev-tools/kselftest.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/dev-tools/kselftest.rst</a></div><div class='hunk'>@@ -7,6 +7,11 @@ directory. These are intended to be small tests to exercise individual code</div><div class='ctx'> paths in the kernel. Tests are intended to be run after building, installing</div><div class='ctx'> and booting a kernel.</div><div class='ctx'> </div><div class='add'>+You can find additional information on Kselftest framework, how to</div><div class='add'>+write new tests using the framework on Kselftest wiki:</div><div class='add'>+</div><div class='add'>+https://kselftest.wiki.kernel.org/</div><div class='add'>+</div><div class='ctx'> On some systems, hot-plug tests could hang forever waiting for cpu and</div><div class='ctx'> memory to be ready to be offlined. A special hot-plug target is created</div><div class='ctx'> to run the full range of hot-plug tests. In default mode, hot-plug tests run</div><div class='hunk'>@@ -14,6 +19,10 @@ in safe mode with a limited scope. In limited mode, cpu-hotplug test is</div><div class='ctx'> run on a single cpu as opposed to all hotplug capable cpus, and memory</div><div class='ctx'> hotplug test is run on 2% of hotplug capable memory instead of 10%.</div><div class='ctx'> </div><div class='add'>+kselftest runs as a userspace process.  Tests that can be written/run in</div><div class='add'>+userspace may wish to use the `Test Harness`_.  Tests that need to be</div><div class='add'>+run in kernel space may wish to use a `Test Module`_.</div><div class='add'>+</div><div class='ctx'> Running the selftests (hotplug tests are run in limited mode)</div><div class='ctx'> =============================================================</div><div class='ctx'> </div><div class='hunk'>@@ -31,17 +40,32 @@ To build and run the tests with a single command, use::</div><div class='ctx'> </div><div class='ctx'> Note that some tests will require root privileges.</div><div class='ctx'> </div><div class='del'>-Build and run from user specific object directory (make O=dir)::</div><div class='add'>+Kselftest supports saving output files in a separate directory and then</div><div class='add'>+running tests. To locate output files in a separate directory two syntaxes</div><div class='add'>+are supported. In both cases the working directory must be the root of the</div><div class='add'>+kernel src. This is applicable to "Running a subset of selftests" section</div><div class='add'>+below.</div><div class='add'>+</div><div class='add'>+To build, save output files in a separate directory with O= ::</div><div class='ctx'> </div><div class='ctx'>   $ make O=/tmp/kselftest kselftest</div><div class='ctx'> </div><div class='del'>-Build and run KBUILD_OUTPUT directory (make KBUILD_OUTPUT=)::</div><div class='add'>+To build, save output files in a separate directory with KBUILD_OUTPUT ::</div><div class='add'>+</div><div class='add'>+  $ export KBUILD_OUTPUT=/tmp/kselftest; make kselftest</div><div class='ctx'> </div><div class='del'>-  $ make KBUILD_OUTPUT=/tmp/kselftest kselftest</div><div class='add'>+The O= assignment takes precedence over the KBUILD_OUTPUT environment</div><div class='add'>+variable.</div><div class='ctx'> </div><div class='del'>-The above commands run the tests and print pass/fail summary to make it</div><div class='del'>-easier to understand the test results. Please find the detailed individual</div><div class='del'>-test results for each test in /tmp/testname file(s).</div><div class='add'>+The above commands by default run the tests and print full pass/fail report.</div><div class='add'>+Kselftest supports "summary" option to make it easier to understand the test</div><div class='add'>+results. Please find the detailed individual test results for each test in</div><div class='add'>+/tmp/testname file(s) when summary option is specified. This is applicable</div><div class='add'>+to "Running a subset of selftests" section below.</div><div class='add'>+</div><div class='add'>+To run kselftest with summary option enabled ::</div><div class='add'>+</div><div class='add'>+  $ make summary=1 kselftest</div><div class='ctx'> </div><div class='ctx'> Running a subset of selftests</div><div class='ctx'> =============================</div><div class='hunk'>@@ -57,17 +81,13 @@ You can specify multiple tests to build and run::</div><div class='ctx'> </div><div class='ctx'>   $  make TARGETS="size timers" kselftest</div><div class='ctx'> </div><div class='del'>-Build and run from user specific object directory (make O=dir)::</div><div class='add'>+To build, save output files in a separate directory with O= ::</div><div class='ctx'> </div><div class='ctx'>   $ make O=/tmp/kselftest TARGETS="size timers" kselftest</div><div class='ctx'> </div><div class='del'>-Build and run KBUILD_OUTPUT directory (make KBUILD_OUTPUT=)::</div><div class='add'>+To build, save output files in a separate directory with KBUILD_OUTPUT ::</div><div class='ctx'> </div><div class='del'>-  $ make KBUILD_OUTPUT=/tmp/kselftest TARGETS="size timers" kselftest</div><div class='del'>-</div><div class='del'>-The above commands run the tests and print pass/fail summary to make it</div><div class='del'>-easier to understand the test results. Please find the detailed individual</div><div class='del'>-test results for each test in /tmp/testname file(s).</div><div class='add'>+  $ export KBUILD_OUTPUT=/tmp/kselftest; make TARGETS="size timers" kselftest</div><div class='ctx'> </div><div class='ctx'> See the top-level tools/testing/selftests/Makefile for the list of all</div><div class='ctx'> possible targets.</div><div class='hunk'>@@ -161,11 +181,97 @@ Contributing new tests (details)</div><div class='ctx'> </div><div class='ctx'>    e.g: tools/testing/selftests/android/config</div><div class='ctx'> </div><div class='add'>+Test Module</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Kselftest tests the kernel from userspace.  Sometimes things need</div><div class='add'>+testing from within the kernel, one method of doing this is to create a</div><div class='add'>+test module.  We can tie the module into the kselftest framework by</div><div class='add'>+using a shell script test runner.  ``kselftest_module.sh`` is designed</div><div class='add'>+to facilitate this process.  There is also a header file provided to</div><div class='add'>+assist writing kernel modules that are for use with kselftest:</div><div class='add'>+</div><div class='add'>+- ``tools/testing/kselftest/kselftest_module.h``</div><div class='add'>+- ``tools/testing/kselftest/kselftest_module.sh``</div><div class='add'>+</div><div class='add'>+How to use</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Here we show the typical steps to create a test module and tie it into</div><div class='add'>+kselftest.  We use kselftests for lib/ as an example.</div><div class='add'>+</div><div class='add'>+1. Create the test module</div><div class='add'>+</div><div class='add'>+2. Create the test script that will run (load/unload) the module</div><div class='add'>+   e.g. ``tools/testing/selftests/lib/printf.sh``</div><div class='add'>+</div><div class='add'>+3. Add line to config file e.g. ``tools/testing/selftests/lib/config``</div><div class='add'>+</div><div class='add'>+4. Add test script to makefile  e.g. ``tools/testing/selftests/lib/Makefile``</div><div class='add'>+</div><div class='add'>+5. Verify it works:</div><div class='add'>+</div><div class='add'>+.. code-block:: sh</div><div class='add'>+</div><div class='add'>+   # Assumes you have booted a fresh build of this kernel tree</div><div class='add'>+   cd /path/to/linux/tree</div><div class='add'>+   make kselftest-merge</div><div class='add'>+   make modules</div><div class='add'>+   sudo make modules_install</div><div class='add'>+   make TARGETS=lib kselftest</div><div class='add'>+</div><div class='add'>+Example Module</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+A bare bones test module might look like this:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+   // SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+</div><div class='add'>+   #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+   #include "../tools/testing/selftests/kselftest_module.h"</div><div class='add'>+</div><div class='add'>+   KSTM_MODULE_GLOBALS();</div><div class='add'>+</div><div class='add'>+   /*</div><div class='add'>+    * Kernel module for testing the foobinator</div><div class='add'>+    */</div><div class='add'>+</div><div class='add'>+   static int __init test_function()</div><div class='add'>+   {</div><div class='add'>+           ...</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   static void __init selftest(void)</div><div class='add'>+   {</div><div class='add'>+           KSTM_CHECK_ZERO(do_test_case("", 0));</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   KSTM_MODULE_LOADERS(test_foo);</div><div class='add'>+   MODULE_AUTHOR("John Developer &lt;jd@fooman.org&gt;");</div><div class='add'>+   MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+Example test script</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+.. code-block:: sh</div><div class='add'>+</div><div class='add'>+    #!/bin/bash</div><div class='add'>+    # SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+    $(dirname $0)/../kselftest_module.sh "foo" test_foo</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Test Harness</div><div class='ctx'> ============</div><div class='ctx'> </div><div class='del'>-The kselftest_harness.h file contains useful helpers to build tests.  The tests</div><div class='del'>-from tools/testing/selftests/seccomp/seccomp_bpf.c can be used as example.</div><div class='add'>+The kselftest_harness.h file contains useful helpers to build tests.  The</div><div class='add'>+test harness is for userspace testing, for kernel space testing see `Test</div><div class='add'>+Module`_ above.</div><div class='add'>+</div><div class='add'>+The tests from tools/testing/selftests/seccomp/seccomp_bpf.c can be used as</div><div class='add'>+example.</div><div class='ctx'> </div><div class='ctx'> Example</div><div class='ctx'> -------</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt<br/>index f8aff65ab921..8a88ddebc1a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/arm/coresight.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/arm/coresight.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/arm/coresight.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/arm/coresight.txt</a></div><div class='hunk'>@@ -8,7 +8,8 @@ through the intermediate links connecting the source to the currently selected</div><div class='ctx'> sink. Each CoreSight component device should use these properties to describe</div><div class='ctx'> its hardware characteristcs.</div><div class='ctx'> </div><div class='del'>-* Required properties for all components *except* non-configurable replicators:</div><div class='add'>+* Required properties for all components *except* non-configurable replicators</div><div class='add'>+  and non-configurable funnels:</div><div class='ctx'> </div><div class='ctx'> 	* compatible: These have to be supplemented with "arm,primecell" as</div><div class='ctx'> 	  drivers are using the AMBA bus interface.  Possible values include:</div><div class='hunk'>@@ -24,8 +25,10 @@ its hardware characteristcs.</div><div class='ctx'> 		  discovered at boot time when the device is probed.</div><div class='ctx'> 			"arm,coresight-tmc", "arm,primecell";</div><div class='ctx'> </div><div class='del'>-		- Trace Funnel:</div><div class='del'>-			"arm,coresight-funnel", "arm,primecell";</div><div class='add'>+		- Trace Programmable Funnel:</div><div class='add'>+			"arm,coresight-dynamic-funnel", "arm,primecell";</div><div class='add'>+			"arm,coresight-funnel", "arm,primecell"; (OBSOLETE. For</div><div class='add'>+				backward compatibility and will be removed)</div><div class='ctx'> </div><div class='ctx'> 		- Embedded Trace Macrocell (version 3.x) and</div><div class='ctx'> 					Program Flow Trace Macrocell:</div><div class='hunk'>@@ -65,11 +68,17 @@ its hardware characteristcs.</div><div class='ctx'> 	  "stm-stimulus-base", each corresponding to the areas defined in "reg".</div><div class='ctx'> </div><div class='ctx'> * Required properties for devices that don't show up on the AMBA bus, such as</div><div class='del'>-  non-configurable replicators:</div><div class='add'>+  non-configurable replicators and non-configurable funnels:</div><div class='ctx'> </div><div class='ctx'> 	* compatible: Currently supported value is (note the absence of the</div><div class='ctx'> 	  AMBA markee):</div><div class='del'>-		- "arm,coresight-replicator"</div><div class='add'>+		- Coresight Non-configurable Replicator:</div><div class='add'>+			"arm,coresight-static-replicator";</div><div class='add'>+			"arm,coresight-replicator"; (OBSOLETE. For backward</div><div class='add'>+				compatibility and will be removed)</div><div class='add'>+</div><div class='add'>+		- Coresight Non-configurable Funnel:</div><div class='add'>+			"arm,coresight-static-funnel";</div><div class='ctx'> </div><div class='ctx'> 	* port or ports: see "Graph bindings for Coresight" below.</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +178,7 @@ Example:</div><div class='ctx'> 		/* non-configurable replicators don't show up on the</div><div class='ctx'> 		 * AMBA bus.  As such no need to add "arm,primecell".</div><div class='ctx'> 		 */</div><div class='del'>-		compatible = "arm,coresight-replicator";</div><div class='add'>+		compatible = "arm,coresight-static-replicator";</div><div class='ctx'> </div><div class='ctx'> 		out-ports {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -200,8 +209,45 @@ Example:</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	funnel {</div><div class='add'>+		/*</div><div class='add'>+		 * non-configurable funnel don't show up on the AMBA</div><div class='add'>+		 * bus.  As such no need to add "arm,primecell".</div><div class='add'>+		 */</div><div class='add'>+		compatible = "arm,coresight-static-funnel";</div><div class='add'>+		clocks = &lt;&amp;crg_ctrl HI3660_PCLK&gt;;</div><div class='add'>+		clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+		out-ports {</div><div class='add'>+			port {</div><div class='add'>+				combo_funnel_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;top_funnel_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		in-ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				combo_funnel_in0: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;cluster0_etf_out&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				combo_funnel_in1: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;cluster1_etf_out&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	funnel@20040000 {</div><div class='del'>-		compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='add'>+		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x20040000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		clocks = &lt;&amp;oscclk6a&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml<br/>index 365dcf384d73..591bbd012d63 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/arm/cpus.yaml?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/arm/cpus.yaml</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/arm/cpus.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/arm/cpus.yaml</a></div><div class='hunk'>@@ -67,6 +67,7 @@ properties:</div><div class='ctx'> </div><div class='ctx'> patternProperties:</div><div class='ctx'>   '^cpu@[0-9a-f]+$':</div><div class='add'>+    type: object</div><div class='ctx'>     properties:</div><div class='ctx'>       device_type:</div><div class='ctx'>         const: cpu</div><div class='hunk'>@@ -228,7 +229,7 @@ patternProperties:</div><div class='ctx'>                 - renesas,r9a06g032-smp</div><div class='ctx'>                 - rockchip,rk3036-smp</div><div class='ctx'>                 - rockchip,rk3066-smp</div><div class='del'>-		- socionext,milbeaut-m10v-smp</div><div class='add'>+                - socionext,milbeaut-m10v-smp</div><div class='ctx'>                 - ste,dbx500-smp</div><div class='ctx'> </div><div class='ctx'>       cpu-release-addr:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt b/Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt<br/>new file mode 100644<br/>index 000000000000..1464a4713553<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Allwinner Memory Bus (MBUS) controller</div><div class='add'>+</div><div class='add'>+The MBUS controller drives the MBUS that other devices in the SoC will</div><div class='add'>+use to perform DMA. It also has a register interface that allows to</div><div class='add'>+monitor and control the bandwidth and priorities for masters on that</div><div class='add'>+bus.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: Must be one of:</div><div class='add'>+	- allwinner,sun5i-a13-mbus</div><div class='add'>+ - reg: Offset and length of the register set for the controller</div><div class='add'>+ - clocks: phandle to the clock driving the controller</div><div class='add'>+ - dma-ranges: See section 2.3.9 of the DeviceTree Specification</div><div class='add'>+ - #interconnect-cells: Must be one, with the argument being the MBUS</div><div class='add'>+   port ID</div><div class='add'>+</div><div class='add'>+Each device having to perform their DMA through the MBUS must have the</div><div class='add'>+interconnects and interconnect-names properties set to the MBUS</div><div class='add'>+controller and with "dma-mem" as the interconnect name.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+mbus: dram-controller@1c01000 {</div><div class='add'>+	compatible = "allwinner,sun5i-a13-mbus";</div><div class='add'>+	reg = &lt;0x01c01000 0x1000&gt;;</div><div class='add'>+	clocks = &lt;&amp;ccu CLK_MBUS&gt;;</div><div class='add'>+	dma-ranges = &lt;0x00000000 0x40000000 0x20000000&gt;;</div><div class='add'>+	#interconnect-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+fe0: display-frontend@1e00000 {</div><div class='add'>+	compatible = "allwinner,sun5i-a13-display-frontend";</div><div class='add'>+	...</div><div class='add'>+	interconnects = &lt;&amp;mbus 19&gt;;</div><div class='add'>+	interconnect-names = "dma-mem";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/connector/usb-connector.txt b/Documentation/devicetree/bindings/connector/usb-connector.txt<br/>index a9a2f2fc44f2..cef556d4e5ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/connector/usb-connector.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/connector/usb-connector.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/connector/usb-connector.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/connector/usb-connector.txt</a></div><div class='hunk'>@@ -47,7 +47,7 @@ Required properties for usb-c-connector with power delivery support:</div><div class='ctx'> Required nodes:</div><div class='ctx'> - any data bus to the connector should be modeled using the OF graph bindings</div><div class='ctx'>   specified in bindings/graph.txt, unless the bus is between parent node and</div><div class='del'>-  the connector. Since single connector can have multpile data buses every bus</div><div class='add'>+  the connector. Since single connector can have multiple data buses every bus</div><div class='ctx'>   has assigned OF graph port number as follows:</div><div class='ctx'>     0: High Speed (HS), present in all connectors,</div><div class='ctx'>     1: Super Speed (SS), present in SS capable connectors,</div><div class='head'>diff --git a/Documentation/devicetree/bindings/counter/ftm-quaddec.txt b/Documentation/devicetree/bindings/counter/ftm-quaddec.txt<br/>new file mode 100644<br/>index 000000000000..4d18cd722074<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/counter/ftm-quaddec.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/counter/ftm-quaddec.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+FlexTimer Quadrature decoder counter</div><div class='add'>+</div><div class='add'>+This driver exposes a simple counter for the quadrature decoder mode.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:		Must be "fsl,ftm-quaddec".</div><div class='add'>+- reg:			Must be set to the memory region of the flextimer.</div><div class='add'>+</div><div class='add'>+Optional property:</div><div class='add'>+- big-endian:		Access the device registers in big-endian mode.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+		counter0: counter@29d0000 {</div><div class='add'>+			compatible = "fsl,ftm-quaddec";</div><div class='add'>+			reg = &lt;0x0 0x29d0000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/counter/stm32-lptimer-cnt.txt b/Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt<br/>index a04aa5c04103..e90bc47f752a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/counter/stm32-lptimer-cnt.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/counter/stm32-lptimer-cnt.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt</a></div><div class='hunk'>@@ -10,8 +10,9 @@ See ../mfd/stm32-lptimer.txt for details about the parent node.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible:		Must be "st,stm32-lptimer-counter".</div><div class='del'>-- pinctrl-names: 	Set to "default".</div><div class='del'>-- pinctrl-0: 		List of phandles pointing to pin configuration nodes,</div><div class='add'>+- pinctrl-names: 	Set to "default". An additional "sleep" state can be</div><div class='add'>+			defined to set pins in sleep state.</div><div class='add'>+- pinctrl-n: 		List of phandles pointing to pin configuration nodes,</div><div class='ctx'> 			to set IN1/IN2 pins in mode of operation for Low-Power</div><div class='ctx'> 			Timer input on external pin.</div><div class='ctx'> </div><div class='hunk'>@@ -21,7 +22,8 @@ Example:</div><div class='ctx'> 		...</div><div class='ctx'> 		counter {</div><div class='ctx'> 			compatible = "st,stm32-lptimer-counter";</div><div class='del'>-			pinctrl-names = "default";</div><div class='add'>+			pinctrl-names = "default", "sleep";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;lptim1_in_pins&gt;;</div><div class='add'>+			pinctrl-1 = &lt;&amp;lptim1_sleep_in_pins&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt b/Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt<br/>new file mode 100644<br/>index 000000000000..c52fcdd4bf6c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+STMicroelectronics STM32 Timer quadrature encoder</div><div class='add'>+</div><div class='add'>+STM32 Timer provides quadrature encoder to detect</div><div class='add'>+angular position and direction of rotary elements,</div><div class='add'>+from IN1 and IN2 input signals.</div><div class='add'>+</div><div class='add'>+Must be a sub-node of an STM32 Timer device tree node.</div><div class='add'>+See ../mfd/stm32-timers.txt for details about the parent node.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:		Must be "st,stm32-timer-counter".</div><div class='add'>+- pinctrl-names: 	Set to "default".</div><div class='add'>+- pinctrl-0: 		List of phandles pointing to pin configuration nodes,</div><div class='add'>+			to set CH1/CH2 pins in mode of operation for STM32</div><div class='add'>+			Timer input on external pin.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	timers@40010000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "st,stm32-timers";</div><div class='add'>+		reg = &lt;0x40010000 0x400&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 160&gt;;</div><div class='add'>+		clock-names = "int";</div><div class='add'>+</div><div class='add'>+		counter {</div><div class='add'>+			compatible = "st,stm32-timer-counter";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;tim1_in_pins&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt b/Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt<br/>deleted file mode 100644<br/>index aaa6c24c8e70..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-Meson specific Simple Framebuffer bindings</div><div class='del'>-</div><div class='del'>-This binding documents meson specific extensions to the simple-framebuffer</div><div class='del'>-bindings. The meson simplefb u-boot code relies on the devicetree containing</div><div class='del'>-pre-populated simplefb nodes.</div><div class='del'>-</div><div class='del'>-These extensions are intended so that u-boot can select the right node based</div><div class='del'>-on which pipeline is being used. As such they are solely intended for</div><div class='del'>-firmware / bootloader use, and the OS should ignore them.</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: "amlogic,simple-framebuffer", "simple-framebuffer"</div><div class='del'>-- amlogic,pipeline, one of:</div><div class='del'>-  "vpu-cvbs"</div><div class='del'>-  "vpu-hdmi"</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-chosen {</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	ranges;</div><div class='del'>-</div><div class='del'>-	simplefb_hdmi: framebuffer-hdmi {</div><div class='del'>-		compatible = "amlogic,simple-framebuffer",</div><div class='del'>-			     "simple-framebuffer";</div><div class='del'>-		amlogic,pipeline = "vpu-hdmi";</div><div class='del'>-		clocks = &lt;&amp;clkc CLKID_HDMI_PCLK&gt;,</div><div class='del'>-			 &lt;&amp;clkc CLKID_CLK81&gt;,</div><div class='del'>-			 &lt;&amp;clkc CLKID_GCLK_VENCI_INT0&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pwrc_vpu&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt b/Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt<br/>deleted file mode 100644<br/>index d693b8dc9a62..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-Sunxi specific Simple Framebuffer bindings</div><div class='del'>-</div><div class='del'>-This binding documents sunxi specific extensions to the simple-framebuffer</div><div class='del'>-bindings. The sunxi simplefb u-boot code relies on the devicetree containing</div><div class='del'>-pre-populated simplefb nodes.</div><div class='del'>-</div><div class='del'>-These extensions are intended so that u-boot can select the right node based</div><div class='del'>-on which pipeline is being used. As such they are solely intended for</div><div class='del'>-firmware / bootloader use, and the OS should ignore them.</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: "allwinner,simple-framebuffer"</div><div class='del'>-- allwinner,pipeline, one of:</div><div class='del'>-  "de_be0-lcd0"</div><div class='del'>-  "de_be1-lcd1"</div><div class='del'>-  "de_be0-lcd0-hdmi"</div><div class='del'>-  "de_be1-lcd1-hdmi"</div><div class='del'>-  "mixer0-lcd0"</div><div class='del'>-  "mixer0-lcd0-hdmi"</div><div class='del'>-  "mixer1-lcd1-hdmi"</div><div class='del'>-  "mixer1-lcd1-tve"</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-chosen {</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-	ranges;</div><div class='del'>-</div><div class='del'>-	framebuffer@0 {</div><div class='del'>-		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";</div><div class='del'>-		allwinner,pipeline = "de_be0-lcd0-hdmi";</div><div class='del'>-		clocks = &lt;&amp;pll5 1&gt;, &lt;&amp;ahb_gates 36&gt;, &lt;&amp;ahb_gates 43&gt;,</div><div class='del'>-			 &lt;&amp;ahb_gates 44&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/simple-framebuffer.txt b/Documentation/devicetree/bindings/display/simple-framebuffer.txt<br/>deleted file mode 100644<br/>index 5a9ce511be88..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/display/simple-framebuffer.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/display/simple-framebuffer.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-Simple Framebuffer</div><div class='del'>-</div><div class='del'>-A simple frame-buffer describes a frame-buffer setup by firmware or</div><div class='del'>-the bootloader, with the assumption that the display hardware has already</div><div class='del'>-been set up to scan out from the memory pointed to by the reg property.</div><div class='del'>-</div><div class='del'>-Since simplefb nodes represent runtime information they must be sub-nodes of</div><div class='del'>-the chosen node (*). Simplefb nodes must be named "framebuffer@&lt;address&gt;".</div><div class='del'>-</div><div class='del'>-If the devicetree contains nodes for the display hardware used by a simplefb,</div><div class='del'>-then the simplefb node must contain a property called "display", which</div><div class='del'>-contains a phandle pointing to the primary display hw node, so that the OS</div><div class='del'>-knows which simplefb to disable when handing over control to a driver for the</div><div class='del'>-real hardware. The bindings for the hw nodes must specify which node is</div><div class='del'>-considered the primary node.</div><div class='del'>-</div><div class='del'>-It is advised to add display# aliases to help the OS determine how to number</div><div class='del'>-things. If display# aliases are used, then if the simplefb node contains a</div><div class='del'>-"display" property then the /aliases/display# path must point to the display</div><div class='del'>-hw node the "display" property points to, otherwise it must point directly</div><div class='del'>-to the simplefb node.</div><div class='del'>-</div><div class='del'>-If a simplefb node represents the preferred console for user interaction,</div><div class='del'>-then the chosen node's stdout-path property should point to it, or to the</div><div class='del'>-primary display hw node, as with display# aliases. If display aliases are</div><div class='del'>-used then it should be set to the alias instead.</div><div class='del'>-</div><div class='del'>-It is advised that devicetree files contain pre-filled, disabled framebuffer</div><div class='del'>-nodes, so that the firmware only needs to update the mode information and</div><div class='del'>-enable them. This way if e.g. later on support for more display clocks get</div><div class='del'>-added, the simplefb nodes will already contain this info and the firmware</div><div class='del'>-does not need to be updated.</div><div class='del'>-</div><div class='del'>-If pre-filled framebuffer nodes are used, the firmware may need extra</div><div class='del'>-information to find the right node. In that case an extra platform specific</div><div class='del'>-compatible and platform specific properties should be used and documented,</div><div class='del'>-see e.g. simple-framebuffer-sunxi.txt .</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: "simple-framebuffer"</div><div class='del'>-- reg: Should contain the location and size of the framebuffer memory.</div><div class='del'>-- width: The width of the framebuffer in pixels.</div><div class='del'>-- height: The height of the framebuffer in pixels.</div><div class='del'>-- stride: The number of bytes in each line of the framebuffer.</div><div class='del'>-- format: The format of the framebuffer surface. Valid values are:</div><div class='del'>-  - r5g6b5 (16-bit pixels, d[15:11]=r, d[10:5]=g, d[4:0]=b).</div><div class='del'>-  - a8b8g8r8 (32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r).</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- clocks : List of clocks used by the framebuffer.</div><div class='del'>-- *-supply : Any number of regulators used by the framebuffer. These should</div><div class='del'>-	     be named according to the names in the device's design.</div><div class='del'>-</div><div class='del'>-  The above resources are expected to already be configured correctly.</div><div class='del'>-  The OS must ensure they are not modified or disabled while the simple</div><div class='del'>-  framebuffer remains active.</div><div class='del'>-</div><div class='del'>-- display : phandle pointing to the primary display hardware node</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-aliases {</div><div class='del'>-	display0 = &amp;lcdc0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-chosen {</div><div class='del'>-	framebuffer0: framebuffer@1d385000 {</div><div class='del'>-		compatible = "simple-framebuffer";</div><div class='del'>-		reg = &lt;0x1d385000 (1600 * 1200 * 2)&gt;;</div><div class='del'>-		width = &lt;1600&gt;;</div><div class='del'>-		height = &lt;1200&gt;;</div><div class='del'>-		stride = &lt;(1600 * 2)&gt;;</div><div class='del'>-		format = "r5g6b5";</div><div class='del'>-		clocks = &lt;&amp;ahb_gates 36&gt;, &lt;&amp;ahb_gates 43&gt;, &lt;&amp;ahb_gates 44&gt;;</div><div class='del'>-		lcd-supply = &lt;&amp;reg_dc1sw&gt;;</div><div class='del'>-		display = &lt;&amp;lcdc0&gt;;</div><div class='del'>-	};</div><div class='del'>-	stdout-path = "display0";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-soc@1c00000 {</div><div class='del'>-	lcdc0: lcdc@1c0c000 {</div><div class='del'>-		compatible = "allwinner,sun4i-a10-lcdc";</div><div class='del'>-		...</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-*) Older devicetree files may have a compatible = "simple-framebuffer" node</div><div class='del'>-in a different place, operating systems must first enumerate any compatible</div><div class='del'>-nodes found under chosen and then check for other compatible nodes.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml<br/>new file mode 100644<br/>index 000000000000..b052d76cf8b6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/display/simple-framebuffer.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/display/simple-framebuffer.yaml</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: http://devicetree.org/schemas/display/simple-framebuffer.yaml#</div><div class='add'>+$schema: http://devicetree.org/meta-schemas/core.yaml#</div><div class='add'>+</div><div class='add'>+title: Simple Framebuffer Device Tree Bindings</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Bartlomiej Zolnierkiewicz &lt;b.zolnierkie@samsung.com&gt;</div><div class='add'>+  - Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='add'>+</div><div class='add'>+description: |+</div><div class='add'>+  A simple frame-buffer describes a frame-buffer setup by firmware or</div><div class='add'>+  the bootloader, with the assumption that the display hardware has</div><div class='add'>+  already been set up to scan out from the memory pointed to by the</div><div class='add'>+  reg property.</div><div class='add'>+</div><div class='add'>+  Since simplefb nodes represent runtime information they must be</div><div class='add'>+  sub-nodes of the chosen node (*). Simplefb nodes must be named</div><div class='add'>+  framebuffer@&lt;address&gt;.</div><div class='add'>+</div><div class='add'>+  If the devicetree contains nodes for the display hardware used by a</div><div class='add'>+  simplefb, then the simplefb node must contain a property called</div><div class='add'>+  display, which contains a phandle pointing to the primary display</div><div class='add'>+  hw node, so that the OS knows which simplefb to disable when handing</div><div class='add'>+  over control to a driver for the real hardware. The bindings for the</div><div class='add'>+  hw nodes must specify which node is considered the primary node.</div><div class='add'>+</div><div class='add'>+  It is advised to add display# aliases to help the OS determine how</div><div class='add'>+  to number things. If display# aliases are used, then if the simplefb</div><div class='add'>+  node contains a display property then the /aliases/display# path</div><div class='add'>+  must point to the display hw node the display property points to,</div><div class='add'>+  otherwise it must point directly to the simplefb node.</div><div class='add'>+</div><div class='add'>+  If a simplefb node represents the preferred console for user</div><div class='add'>+  interaction, then the chosen node stdout-path property should point</div><div class='add'>+  to it, or to the primary display hw node, as with display#</div><div class='add'>+  aliases. If display aliases are used then it should be set to the</div><div class='add'>+  alias instead.</div><div class='add'>+</div><div class='add'>+  It is advised that devicetree files contain pre-filled, disabled</div><div class='add'>+  framebuffer nodes, so that the firmware only needs to update the</div><div class='add'>+  mode information and enable them. This way if e.g. later on support</div><div class='add'>+  for more display clocks get added, the simplefb nodes will already</div><div class='add'>+  contain this info and the firmware does not need to be updated.</div><div class='add'>+</div><div class='add'>+  If pre-filled framebuffer nodes are used, the firmware may need</div><div class='add'>+  extra information to find the right node. In that case an extra</div><div class='add'>+  platform specific compatible and platform specific properties should</div><div class='add'>+  be used and documented.</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  compatible:</div><div class='add'>+    items:</div><div class='add'>+      - enum:</div><div class='add'>+          - allwinner,simple-framebuffer</div><div class='add'>+          - amlogic,simple-framebuffer</div><div class='add'>+      - const: simple-framebuffer</div><div class='add'>+</div><div class='add'>+  reg:</div><div class='add'>+    description: Location and size of the framebuffer memory</div><div class='add'>+</div><div class='add'>+  clocks:</div><div class='add'>+    description: List of clocks used by the framebuffer.</div><div class='add'>+</div><div class='add'>+  power-domains:</div><div class='add'>+    description: List of power domains used by the framebuffer.</div><div class='add'>+</div><div class='add'>+  width:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/uint32</div><div class='add'>+    description: Width of the framebuffer in pixels</div><div class='add'>+</div><div class='add'>+  height:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/uint32</div><div class='add'>+    description: Height of the framebuffer in pixels</div><div class='add'>+</div><div class='add'>+  stride:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/uint32</div><div class='add'>+    description: Number of bytes of a line in the framebuffer</div><div class='add'>+</div><div class='add'>+  format:</div><div class='add'>+    description: &gt;</div><div class='add'>+      Format of the framebuffer:</div><div class='add'>+        * `a8b8g8r8` - 32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r</div><div class='add'>+        * `r5g6b5` - 16-bit pixels, d[15:11]=r, d[10:5]=g, d[4:0]=b</div><div class='add'>+    enum:</div><div class='add'>+      - a8b8g8r8</div><div class='add'>+      - r5g6b5</div><div class='add'>+</div><div class='add'>+  display:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/phandle</div><div class='add'>+    description: Primary display hardware node</div><div class='add'>+</div><div class='add'>+  allwinner,pipeline:</div><div class='add'>+    description: Pipeline used by the framebuffer on Allwinner SoCs</div><div class='add'>+    enum:</div><div class='add'>+      - de_be0-lcd0</div><div class='add'>+      - de_be0-lcd0-hdmi</div><div class='add'>+      - de_be0-lcd0-tve0</div><div class='add'>+      - de_be1-lcd0</div><div class='add'>+      - de_be1-lcd1-hdmi</div><div class='add'>+      - de_fe0-de_be0-lcd0</div><div class='add'>+      - de_fe0-de_be0-lcd0-hdmi</div><div class='add'>+      - de_fe0-de_be0-lcd0-tve0</div><div class='add'>+      - mixer0-lcd0</div><div class='add'>+      - mixer0-lcd0-hdmi</div><div class='add'>+      - mixer1-lcd1-hdmi</div><div class='add'>+      - mixer1-lcd1-tve</div><div class='add'>+</div><div class='add'>+  amlogic,pipeline:</div><div class='add'>+    description: Pipeline used by the framebuffer on Amlogic SoCs</div><div class='add'>+    enum:</div><div class='add'>+      - vpu-cvbs</div><div class='add'>+      - vpu-hdmi</div><div class='add'>+</div><div class='add'>+patternProperties:</div><div class='add'>+  "^[a-zA-Z0-9-]+-supply$":</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/phandle</div><div class='add'>+    description:</div><div class='add'>+      Regulators used by the framebuffer. These should be named</div><div class='add'>+      according to the names in the device design.</div><div class='add'>+</div><div class='add'>+required:</div><div class='add'>+  # The binding requires also reg, width, height, stride and format,</div><div class='add'>+  # but usually they will be filled by the bootloader.</div><div class='add'>+  - compatible</div><div class='add'>+</div><div class='add'>+additionalProperties: false</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+    aliases {</div><div class='add'>+      display0 = &amp;lcdc0;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    chosen {</div><div class='add'>+      #address-cells = &lt;1&gt;;</div><div class='add'>+      #size-cells = &lt;1&gt;;</div><div class='add'>+      stdout-path = "display0";</div><div class='add'>+      framebuffer0: framebuffer@1d385000 {</div><div class='add'>+        compatible = "simple-framebuffer";</div><div class='add'>+        reg = &lt;0x1d385000 3840000&gt;;</div><div class='add'>+        width = &lt;1600&gt;;</div><div class='add'>+        height = &lt;1200&gt;;</div><div class='add'>+        stride = &lt;3200&gt;;</div><div class='add'>+        format = "r5g6b5";</div><div class='add'>+        clocks = &lt;&amp;ahb_gates 36&gt;, &lt;&amp;ahb_gates 43&gt;, &lt;&amp;ahb_gates 44&gt;;</div><div class='add'>+        lcd-supply = &lt;&amp;reg_dc1sw&gt;;</div><div class='add'>+        display = &lt;&amp;lcdc0&gt;;</div><div class='add'>+      };</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    soc@1c00000 {</div><div class='add'>+      lcdc0: lcdc@1c0c000 {</div><div class='add'>+        compatible = "allwinner,sun4i-a10-lcdc";</div><div class='add'>+      };</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+...</div><div class='head'>diff --git a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt<br/>index 5626560a6cfd..8f52206cfd2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt</a></div><div class='hunk'>@@ -232,37 +232,152 @@ Example:</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-Stratix10 SoCFPGA ECC Manager</div><div class='add'>+Stratix10 SoCFPGA ECC Manager (ARM64)</div><div class='ctx'> The Stratix10 SoC ECC Manager handles the IRQs for each peripheral</div><div class='del'>-in a shared register similar to the Arria10. However, ECC requires</div><div class='del'>-access to registers that can only be read from Secure Monitor with</div><div class='del'>-SMC calls. Therefore the device tree is slightly different.</div><div class='add'>+in a shared register similar to the Arria10. However, Stratix10 ECC</div><div class='add'>+requires access to registers that can only be read from Secure Monitor</div><div class='add'>+with SMC calls. Therefore the device tree is slightly different. Note</div><div class='add'>+that only 1 interrupt is sent in Stratix10 because the double bit errors</div><div class='add'>+are treated as SErrors in ARM64 instead of IRQs in ARM32.</div><div class='ctx'> </div><div class='ctx'> Required Properties:</div><div class='ctx'> - compatible : Should be "altr,socfpga-s10-ecc-manager"</div><div class='del'>-- interrupts : Should be single bit error interrupt, then double bit error</div><div class='del'>-	interrupt.</div><div class='add'>+- altr,sysgr-syscon : phandle to Stratix10 System Manager Block</div><div class='add'>+	              containing the ECC manager registers.</div><div class='add'>+- interrupts : Should be single bit error interrupt.</div><div class='ctx'> - interrupt-controller : boolean indicator that ECC Manager is an interrupt controller</div><div class='ctx'> - #interrupt-cells : must be set to 2.</div><div class='add'>+- #address-cells: must be 1</div><div class='add'>+- #size-cells: must be 1</div><div class='add'>+- ranges : standard definition, should translate from local addresses</div><div class='ctx'> </div><div class='ctx'> Subcomponents:</div><div class='ctx'> </div><div class='ctx'> SDRAM ECC</div><div class='ctx'> Required Properties:</div><div class='ctx'> - compatible : Should be "altr,sdram-edac-s10"</div><div class='del'>-- interrupts : Should be single bit error interrupt, then double bit error</div><div class='del'>-	interrupt, in this order.</div><div class='add'>+- interrupts : Should be single bit error interrupt.</div><div class='add'>+</div><div class='add'>+On-Chip RAM ECC</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible      : Should be "altr,socfpga-s10-ocram-ecc"</div><div class='add'>+- reg             : Address and size for ECC block registers.</div><div class='add'>+- altr,ecc-parent : phandle to parent OCRAM node.</div><div class='add'>+- interrupts      : Should be single bit error interrupt.</div><div class='add'>+</div><div class='add'>+Ethernet FIFO ECC</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible      : Should be "altr,socfpga-s10-eth-mac-ecc"</div><div class='add'>+- reg             : Address and size for ECC block registers.</div><div class='add'>+- altr,ecc-parent : phandle to parent Ethernet node.</div><div class='add'>+- interrupts      : Should be single bit error interrupt.</div><div class='add'>+</div><div class='add'>+NAND FIFO ECC</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible      : Should be "altr,socfpga-s10-nand-ecc"</div><div class='add'>+- reg             : Address and size for ECC block registers.</div><div class='add'>+- altr,ecc-parent : phandle to parent NAND node.</div><div class='add'>+- interrupts      : Should be single bit error interrupt.</div><div class='add'>+</div><div class='add'>+DMA FIFO ECC</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible      : Should be "altr,socfpga-s10-dma-ecc"</div><div class='add'>+- reg             : Address and size for ECC block registers.</div><div class='add'>+- altr,ecc-parent : phandle to parent DMA node.</div><div class='add'>+- interrupts      : Should be single bit error interrupt.</div><div class='add'>+</div><div class='add'>+USB FIFO ECC</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible      : Should be "altr,socfpga-s10-usb-ecc"</div><div class='add'>+- reg             : Address and size for ECC block registers.</div><div class='add'>+- altr,ecc-parent : phandle to parent USB node.</div><div class='add'>+- interrupts      : Should be single bit error interrupt.</div><div class='add'>+</div><div class='add'>+SDMMC FIFO ECC</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible      : Should be "altr,socfpga-s10-sdmmc-ecc"</div><div class='add'>+- reg             : Address and size for ECC block registers.</div><div class='add'>+- altr,ecc-parent : phandle to parent SD/MMC node.</div><div class='add'>+- interrupts      : Should be single bit error interrupt for port A</div><div class='add'>+		    and then single bit error interrupt for port B.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	eccmgr {</div><div class='ctx'> 		compatible = "altr,socfpga-s10-ecc-manager";</div><div class='del'>-		interrupts = &lt;0 15 4&gt;, &lt;0 95 4&gt;;</div><div class='add'>+		altr,sysmgr-syscon = &lt;&amp;sysmgr&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;0 15 4&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='ctx'> </div><div class='ctx'> 		sdramedac {</div><div class='ctx'> 			compatible = "altr,sdram-edac-s10";</div><div class='del'>-			interrupts = &lt;16 4&gt;, &lt;48 4&gt;;</div><div class='add'>+			interrupts = &lt;16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ocram-ecc@ff8cc000 {</div><div class='add'>+			compatible = "altr,socfpga-s10-ocram-ecc";</div><div class='add'>+			reg = &lt;ff8cc000 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;ocram&gt;;</div><div class='add'>+			interrupts = &lt;1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		emac0-rx-ecc@ff8c0000 {</div><div class='add'>+			compatible = "altr,socfpga-s10-eth-mac-ecc";</div><div class='add'>+			reg = &lt;0xff8c0000 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;gmac0&gt;;</div><div class='add'>+			interrupts = &lt;4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		emac0-tx-ecc@ff8c0400 {</div><div class='add'>+			compatible = "altr,socfpga-s10-eth-mac-ecc";</div><div class='add'>+			reg = &lt;0xff8c0400 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;gmac0&gt;;</div><div class='add'>+			interrupts = &lt;5 IRQ_TYPE_LEVEL_HIGH&gt;'</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nand-buf-ecc@ff8c8000 {</div><div class='add'>+			compatible = "altr,socfpga-s10-nand-ecc";</div><div class='add'>+			reg = &lt;0xff8c8000 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;nand&gt;;</div><div class='add'>+			interrupts = &lt;11 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nand-rd-ecc@ff8c8400 {</div><div class='add'>+			compatible = "altr,socfpga-s10-nand-ecc";</div><div class='add'>+			reg = &lt;0xff8c8400 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;nand&gt;;</div><div class='add'>+			interrupts = &lt;13 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nand-wr-ecc@ff8c8800 {</div><div class='add'>+			compatible = "altr,socfpga-s10-nand-ecc";</div><div class='add'>+			reg = &lt;0xff8c8800 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;nand&gt;;</div><div class='add'>+			interrupts = &lt;12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dma-ecc@ff8c9000 {</div><div class='add'>+			compatible = "altr,socfpga-s10-dma-ecc";</div><div class='add'>+			reg = &lt;0xff8c9000 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;pdma&gt;;</div><div class='add'>+			interrupts = &lt;10 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		usb0-ecc@ff8c4000 {</div><div class='add'>+			compatible = "altr,socfpga-s10-usb-ecc";</div><div class='add'>+			reg = &lt;0xff8c4000 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;usb0&gt;;</div><div class='add'>+			interrupts = &lt;2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdmmc-ecc@ff8c8c00 {</div><div class='add'>+			compatible = "altr,socfpga-s10-sdmmc-ecc";</div><div class='add'>+			reg = &lt;0xff8c8c00 0x100&gt;;</div><div class='add'>+			altr,ecc-parent = &lt;&amp;mmc&gt;;</div><div class='add'>+			interrupts = &lt;14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt b/Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt<br/>new file mode 100644<br/>index 000000000000..b1f9474f36d5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+* Arcx Anybus-S controller</div><div class='add'>+</div><div class='add'>+This chip communicates with the SoC over a parallel bus. It is</div><div class='add'>+expected that its Device Tree node is specified as the child of a node</div><div class='add'>+corresponding to the parallel bus used for communication.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+  - compatible : The following chip-specific string:</div><div class='add'>+        "arcx,anybus-controller"</div><div class='add'>+</div><div class='add'>+  - reg : three areas:</div><div class='add'>+	index 0: bus memory area where the cpld registers are located.</div><div class='add'>+	index 1: bus memory area of the first  host's dual-port ram.</div><div class='add'>+	index 2: bus memory area of the second host's dual-port ram.</div><div class='add'>+</div><div class='add'>+  - reset-gpios : the GPIO pin connected to the reset line of the controller.</div><div class='add'>+</div><div class='add'>+  - interrupts : two interrupts:</div><div class='add'>+		index 0: interrupt connected to the first  host</div><div class='add'>+		index 1: interrupt connected to the second host</div><div class='add'>+	Generic interrupt client node bindings are described in</div><div class='add'>+	interrupt-controller/interrupts.txt</div><div class='add'>+</div><div class='add'>+Optional: use of subnodes</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+The card connected to a host may need additional properties. These can be</div><div class='add'>+specified in subnodes to the controller node.</div><div class='add'>+</div><div class='add'>+The subnodes are identified by the standard 'reg' property. Which information</div><div class='add'>+exactly can be specified depends on the bindings for the function driver</div><div class='add'>+for the subnode.</div><div class='add'>+</div><div class='add'>+Required controller node properties when using subnodes:</div><div class='add'>+- #address-cells: should be one.</div><div class='add'>+- #size-cells: should be zero.</div><div class='add'>+</div><div class='add'>+Required subnode properties:</div><div class='add'>+- reg: Must contain the host index of the card this subnode describes:</div><div class='add'>+		&lt;0&gt;	for the first  host on the controller</div><div class='add'>+		&lt;1&gt;	for the second host on the controller</div><div class='add'>+	Note that only a single card can be plugged into a host, so the host</div><div class='add'>+	index uniquely describes the card location.</div><div class='add'>+</div><div class='add'>+Example of usage:</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+This example places the bridge on top of the i.MX WEIM parallel bus, see:</div><div class='add'>+Documentation/devicetree/bindings/bus/imx-weim.txt</div><div class='add'>+</div><div class='add'>+&amp;weim {</div><div class='add'>+	controller@0,0 {</div><div class='add'>+		compatible = "arcx,anybus-controller";</div><div class='add'>+		reg = &lt;0 0 0x100&gt;, &lt;0 0x400000 0x800&gt;, &lt;1 0x400000 0x800&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio5 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;1 IRQ_TYPE_LEVEL_LOW&gt;, &lt;5 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		/* fsl,weim-cs-timing is a i.MX WEIM bus specific property */</div><div class='add'>+		fsl,weim-cs-timing = &lt;0x024400b1 0x00001010 0x20081100</div><div class='add'>+				0x00000000 0xa0000240 0x00000000&gt;;</div><div class='add'>+		/* optional subnode for a card plugged into the first host */</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		card@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			/* card specific properties go here */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gnss/u-blox.txt b/Documentation/devicetree/bindings/gnss/u-blox.txt<br/>index e475659cb85f..7cdefd058fe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/gnss/u-blox.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/gnss/u-blox.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/gnss/u-blox.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/gnss/u-blox.txt</a></div><div class='hunk'>@@ -9,6 +9,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> - compatible	: Must be one of</div><div class='ctx'> </div><div class='add'>+			"u-blox,neo-6m"</div><div class='ctx'> 			"u-blox,neo-8"</div><div class='ctx'> 			"u-blox,neo-m8"</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/adc128d818.txt b/Documentation/devicetree/bindings/hwmon/adc128d818.txt<br/>index 08bab0e94d25..d0ae46d7bac3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/adc128d818.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/adc128d818.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/adc128d818.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/hwmon/adc128d818.txt</a></div><div class='hunk'>@@ -26,7 +26,7 @@ Required node properties:</div><div class='ctx'> </div><div class='ctx'> Optional node properties:</div><div class='ctx'> </div><div class='del'>- - ti,mode:     Operation mode (see above).</div><div class='add'>+ - ti,mode:     Operation mode (u8) (see above).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Example (operation mode 2):</div><div class='hunk'>@@ -34,5 +34,5 @@ Example (operation mode 2):</div><div class='ctx'> 	adc128d818@1d {</div><div class='ctx'> 		compatible = "ti,adc128d818";</div><div class='ctx'> 		reg = &lt;0x1d&gt;;</div><div class='del'>-		ti,mode = &lt;2&gt;;</div><div class='add'>+		ti,mode = /bits/ 8 &lt;2&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt b/Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt<br/>new file mode 100644<br/>index 000000000000..ffb79ccf51ee<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+Cirrus Logic Lochnagar Audio Development Board</div><div class='add'>+</div><div class='add'>+Lochnagar is an evaluation and development board for Cirrus Logic</div><div class='add'>+Smart CODEC and Amp devices. It allows the connection of most Cirrus</div><div class='add'>+Logic devices on mini-cards, as well as allowing connection of</div><div class='add'>+various application processor systems to provide a full evaluation</div><div class='add'>+platform.  Audio system topology, clocking and power can all be</div><div class='add'>+controlled through the Lochnagar, allowing the device under test</div><div class='add'>+to be used in a variety of possible use cases.</div><div class='add'>+</div><div class='add'>+This binding document describes the binding for the hardware monitor</div><div class='add'>+portion of the driver.</div><div class='add'>+</div><div class='add'>+This binding must be part of the Lochnagar MFD binding:</div><div class='add'>+  [4] ../mfd/cirrus,lochnagar.txt</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : One of the following strings:</div><div class='add'>+                 "cirrus,lochnagar2-hwmon"</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+lochnagar-hwmon {</div><div class='add'>+	compatible = "cirrus,lochnagar2-hwmon";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/g762.txt b/Documentation/devicetree/bindings/hwmon/g762.txt<br/>index 25cc6d8ee575..6d154c4923de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/g762.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/g762.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/g762.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/hwmon/g762.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@ If an optional property is not set in .dts file, then current value is kept</div><div class='ctx'> unmodified (e.g. u-boot installed value).</div><div class='ctx'> </div><div class='ctx'> Additional information on operational parameters for the device is available</div><div class='del'>-in Documentation/hwmon/g762. A detailed datasheet for the device is available</div><div class='add'>+in Documentation/hwmon/g762.rst. A detailed datasheet for the device is available</div><div class='ctx'> at http://natisbad.org/NAS/refs/GMT_EDS-762_763-080710-0.2.pdf.</div><div class='ctx'> </div><div class='ctx'> Example g762 node:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/lm75.txt b/Documentation/devicetree/bindings/hwmon/lm75.txt<br/>index 12d8cf7cf592..586b5ed70be7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/lm75.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/lm75.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/lm75.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/hwmon/lm75.txt</a></div><div class='hunk'>@@ -25,6 +25,7 @@ Required properties:</div><div class='ctx'> 		"ti,tmp175",</div><div class='ctx'> 		"ti,tmp275",</div><div class='ctx'> 		"ti,tmp75",</div><div class='add'>+		"ti,tmp75b",</div><div class='ctx'> 		"ti,tmp75c",</div><div class='ctx'> </div><div class='ctx'> - reg: I2C bus address of the device</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt<br/>index 49ca5d83ed13..6ced829b0e58 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/pwm-fan.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/hwmon/pwm-fan.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/hwmon/pwm-fan.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/hwmon/pwm-fan.txt</a></div><div class='hunk'>@@ -7,7 +7,16 @@ Required properties:</div><div class='ctx'> 			which correspond to thermal cooling states</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- fan-supply    : phandle to the regulator that provides power to the fan</div><div class='add'>+- fan-supply		: phandle to the regulator that provides power to the fan</div><div class='add'>+- interrupts		: This contains a single interrupt specifier which</div><div class='add'>+			  describes the tachometer output of the fan as an</div><div class='add'>+			  interrupt source. The output signal must generate a</div><div class='add'>+			  defined number of interrupts per fan revolution, which</div><div class='add'>+			  require that it must be self resetting edge interrupts.</div><div class='add'>+			  See interrupt-controller/interrupts.txt for the format.</div><div class='add'>+- pulses-per-revolution : define the tachometer pulses per fan revolution as</div><div class='add'>+			  an integer (default is 2 interrupts per revolution).</div><div class='add'>+			  The value must be greater than zero.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	fan0: pwm-fan {</div><div class='hunk'>@@ -38,3 +47,13 @@ Example:</div><div class='ctx'> 					};</div><div class='ctx'> 			     };</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+Example 2:</div><div class='add'>+	fan0: pwm-fan {</div><div class='add'>+		compatible = "pwm-fan";</div><div class='add'>+		pwms = &lt;&amp;pwm 0 40000 0&gt;;</div><div class='add'>+		fan-supply = &lt;&amp;reg_fan&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio5&gt;;</div><div class='add'>+		interrupts = &lt;1 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		pulses-per-revolution = &lt;2&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-xscale.txt b/Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt<br/>index dcc8390e0d24..dcc8390e0d24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-xscale.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-xscale.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-mtk.txt b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt<br/>index ee4c32454198..ee4c32454198 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-mtk.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-mtk.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt b/Documentation/devicetree/bindings/i2c/i2c-stu300.txt<br/>index bd81a482634f..bd81a482634f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-stu300.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/i2c/i2c-stu300.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt b/Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt<br/>index 49df0053347a..49df0053347a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-vt8500.txt b/Documentation/devicetree/bindings/i2c/i2c-wmt.txt<br/>index 94a425eaa6c7..94a425eaa6c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-vt8500.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/i2c/i2c-vt8500.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-wmt.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/i2c/i2c-wmt.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt b/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt<br/>new file mode 100644<br/>index 000000000000..eb76a02e2a82<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+Kionix KXCJK-1013 Accelerometer device tree bindings</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: Must be one of:</div><div class='add'>+    "kionix,kxcjk1013"</div><div class='add'>+    "kionix,kxcj91008"</div><div class='add'>+    "kionix,kxtj21009"</div><div class='add'>+    "kionix,kxtf9"</div><div class='add'>+ - reg: i2c slave address</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+kxtf9@f {</div><div class='add'>+	compatible = "kionix,kxtf9";</div><div class='add'>+	reg = &lt;0x0F&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt b/Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt<br/>index d7b6241ca881..d8652460198e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt</a></div><div class='hunk'>@@ -7,6 +7,7 @@ Required properties for the AD7606:</div><div class='ctx'> 	* "adi,ad7606-8"</div><div class='ctx'> 	* "adi,ad7606-6"</div><div class='ctx'> 	* "adi,ad7606-4"</div><div class='add'>+	* "adi,ad7616"</div><div class='ctx'> - reg: SPI chip select number for the device</div><div class='ctx'> - spi-max-frequency: Max SPI frequency to use</div><div class='ctx'> 	see: Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt b/Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt<br/>new file mode 100644<br/>index 000000000000..440e52555349<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+* Analog Devices AD7170/AD7171/AD7780/AD7781</div><div class='add'>+</div><div class='add'>+Data sheets:</div><div class='add'>+</div><div class='add'>+- AD7170:</div><div class='add'>+	* https://www.analog.com/media/en/technical-documentation/data-sheets/AD7170.pdf</div><div class='add'>+- AD7171:</div><div class='add'>+	* https://www.analog.com/media/en/technical-documentation/data-sheets/AD7171.pdf</div><div class='add'>+- AD7780:</div><div class='add'>+	* https://www.analog.com/media/en/technical-documentation/data-sheets/ad7780.pdf</div><div class='add'>+- AD7781:</div><div class='add'>+	* https://www.analog.com/media/en/technical-documentation/data-sheets/AD7781.pdf</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be one of</div><div class='add'>+	* "adi,ad7170"</div><div class='add'>+	* "adi,ad7171"</div><div class='add'>+	* "adi,ad7780"</div><div class='add'>+	* "adi,ad7781"</div><div class='add'>+- reg: spi chip select number for the device</div><div class='add'>+- vref-supply: the regulator supply for the ADC reference voltage</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- powerdown-gpios:  must be the device tree identifier of the PDRST pin. If</div><div class='add'>+		    specified, it will be asserted during driver probe. As the</div><div class='add'>+		    line is active high, it should be marked GPIO_ACTIVE_HIGH.</div><div class='add'>+- adi,gain-gpios:   must be the device tree identifier of the GAIN pin. Only for</div><div class='add'>+		    the ad778x chips. If specified, it will be asserted during</div><div class='add'>+		    driver probe. As the line is active low, it should be marked</div><div class='add'>+		    GPIO_ACTIVE_LOW.</div><div class='add'>+- adi,filter-gpios: must be the device tree identifier of the FILTER pin. Only</div><div class='add'>+		    for the ad778x chips. If specified, it will be asserted</div><div class='add'>+		    during driver probe. As the line is active low, it should be</div><div class='add'>+		    marked GPIO_ACTIVE_LOW.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+adc@0 {</div><div class='add'>+	compatible =  "adi,ad7780";</div><div class='add'>+	reg =	      &lt;0&gt;;</div><div class='add'>+	vref-supply = &lt;&amp;vdd_supply&gt;</div><div class='add'>+</div><div class='add'>+	powerdown-gpios  = &lt;&amp;gpio 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	adi,gain-gpios   = &lt;&amp;gpio  5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	adi,filter-gpios = &lt;&amp;gpio 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt b/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt<br/>index 75c775954102..d57e9df25f4f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt</a></div><div class='hunk'>@@ -9,6 +9,7 @@ Required properties:</div><div class='ctx'> 			- "amlogic,meson-gxl-saradc" for GXL</div><div class='ctx'> 			- "amlogic,meson-gxm-saradc" for GXM</div><div class='ctx'> 			- "amlogic,meson-axg-saradc" for AXG</div><div class='add'>+			- "amlogic,meson-g12a-saradc" for AXG</div><div class='ctx'> 		along with the generic "amlogic,meson-saradc"</div><div class='ctx'> - reg:		the physical base address and length of the registers</div><div class='ctx'> - interrupts:	the interrupt indicating end of sampling</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt b/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt<br/>deleted file mode 100644<br/>index 7222328a3d0d..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/avia-hx711.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-* AVIA HX711 ADC chip for weight cells</div><div class='del'>-  Bit-banging driver</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>- - compatible:	Should be "avia,hx711"</div><div class='del'>- - sck-gpios:	Definition of the GPIO for the clock</div><div class='del'>- - dout-gpios:	Definition of the GPIO for data-out</div><div class='del'>-		See Documentation/devicetree/bindings/gpio/gpio.txt</div><div class='del'>- - avdd-supply:	Definition of the regulator used as analog supply</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>- - clock-frequency:	Frequency of PD_SCK in Hz</div><div class='del'>-			Minimum value allowed is 10 kHz because of maximum</div><div class='del'>-			high time of 50 microseconds.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-weight {</div><div class='del'>-	compatible = "avia,hx711";</div><div class='del'>-	sck-gpios = &lt;&amp;gpio3 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-	dout-gpios = &lt;&amp;gpio0 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-	avdd-suppy = &lt;&amp;avdd&gt;;</div><div class='del'>-	clock-frequency = &lt;100000&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml b/Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml<br/>new file mode 100644<br/>index 000000000000..8a4100ceeaf2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: "http://devicetree.org/schemas/iio/adc/avia-hx711.yaml#"</div><div class='add'>+$schema: "http://devicetree.org/meta-schemas/core.yaml#"</div><div class='add'>+</div><div class='add'>+title: AVIA HX711 ADC chip for weight cells</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Andreas Klinger &lt;ak@it-klinger.de&gt;</div><div class='add'>+</div><div class='add'>+description: |</div><div class='add'>+  Bit-banging driver using two GPIOs:</div><div class='add'>+  - sck-gpio gives a clock to the sensor with 24 cycles for data retrieval</div><div class='add'>+    and up to 3 cycles for selection of the input channel and gain for the</div><div class='add'>+    next measurement</div><div class='add'>+  - dout-gpio is the sensor data the sensor responds to the clock</div><div class='add'>+</div><div class='add'>+  Specifications about the driver can be found at:</div><div class='add'>+  http://www.aviaic.com/ENProducts.aspx</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  compatible:</div><div class='add'>+    enum:</div><div class='add'>+      - avia,hx711</div><div class='add'>+</div><div class='add'>+  sck-gpios:</div><div class='add'>+    description:</div><div class='add'>+      Definition of the GPIO for the clock (output). In the datasheet it is</div><div class='add'>+      named PD_SCK</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  dout-gpios:</div><div class='add'>+    description:</div><div class='add'>+      Definition of the GPIO for the data-out sent by the sensor in</div><div class='add'>+      response to the clock (input).</div><div class='add'>+      See Documentation/devicetree/bindings/gpio/gpio.txt for information</div><div class='add'>+      on how to specify a consumer gpio.</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  avdd-supply:</div><div class='add'>+    description:</div><div class='add'>+      Definition of the regulator used as analog supply</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  clock-frequency:</div><div class='add'>+    minimum: 20000</div><div class='add'>+    maximum: 2500000</div><div class='add'>+    default: 400000</div><div class='add'>+</div><div class='add'>+required:</div><div class='add'>+  - compatible</div><div class='add'>+  - sck-gpios</div><div class='add'>+  - dout-gpios</div><div class='add'>+  - avdd-supply</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+    #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+    weight {</div><div class='add'>+        compatible = "avia,hx711";</div><div class='add'>+        sck-gpios = &lt;&amp;gpio3 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+        dout-gpios = &lt;&amp;gpio0 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+        avdd-suppy = &lt;&amp;avdd&gt;;</div><div class='add'>+        clock-frequency = &lt;100000&gt;;</div><div class='add'>+    };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt b/Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt<br/>index b3629d3a9adf..3a1bc669bd51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt</a></div><div class='hunk'>@@ -6,6 +6,10 @@ Required properties:</div><div class='ctx'>   region.</div><div class='ctx'> - interrupts: The ADC interrupt</div><div class='ctx'> </div><div class='add'>+Optional:</div><div class='add'>+ - vref-supply: The regulator supply ADC reference voltage, optional</div><div class='add'>+   for legacy reason, but highly encouraging to us in new device tree</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	adc@40048000 {</div><div class='hunk'>@@ -13,4 +17,5 @@ Example:</div><div class='ctx'> 		reg = &lt;0x40048000 0x1000&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;mic&gt;;</div><div class='ctx'> 		interrupts = &lt;39 0&gt;;</div><div class='add'>+		vref-supply = &lt;&amp;vcc&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt b/Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt<br/>new file mode 100644<br/>index 000000000000..e47c3759a82b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+* Texas Instruments ADS8344 A/DC chip</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: Must be "ti,ads8344"</div><div class='add'>+ - reg: SPI chip select number for the device</div><div class='add'>+ - vref-supply: phandle to a regulator node that supplies the</div><div class='add'>+   reference voltage</div><div class='add'>+</div><div class='add'>+Recommended properties:</div><div class='add'>+ - spi-max-frequency: Definition as per</div><div class='add'>+		Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+adc@0 {</div><div class='add'>+	compatible = "ti,ads8344";</div><div class='add'>+	reg = &lt;0&gt;;</div><div class='add'>+	vref-supply = &lt;&amp;refin_supply&gt;;</div><div class='add'>+	spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt b/Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt<br/>index 7b5f06f324c8..c52ea2126eaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt</a></div><div class='hunk'>@@ -1,7 +1,13 @@</div><div class='ctx'> * Plantower PMS7003 particulate matter sensor</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: must be "plantower,pms7003"</div><div class='add'>+- compatible: must one of:</div><div class='add'>+   "plantower,pms1003"</div><div class='add'>+   "plantower,pms3003"</div><div class='add'>+   "plantower,pms5003"</div><div class='add'>+   "plantower,pms6003"</div><div class='add'>+   "plantower,pms7003"</div><div class='add'>+   "plantower,pmsa003"</div><div class='ctx'> - vcc-supply: phandle to the regulator that provides power to the sensor</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt b/Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt<br/>new file mode 100644<br/>index 000000000000..78e18a1e9c1d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+* Bosch BMG160 triaxial rotation sensor (gyroscope)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : should be "bosch,bmg160" or "bosch,bmi055_gyro"</div><div class='add'>+  - reg : the I2C address of the sensor (0x69)</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - interrupts : interrupt mapping for GPIO IRQ, it should by configured with</div><div class='add'>+		flags IRQ_TYPE_EDGE_RISING</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+bmg160@69 {</div><div class='add'>+	compatible = "bosch,bmg160";</div><div class='add'>+	reg = &lt;0x69&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+	interrupts = &lt;18 (IRQ_TYPE_EDGE_RISING)&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt b/Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt<br/>new file mode 100644<br/>index 000000000000..465e104bbf14<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+* NXP FXAS21002C Gyroscope device tree bindings</div><div class='add'>+</div><div class='add'>+http://www.nxp.com/products/sensors/gyroscopes/3-axis-digital-gyroscope:FXAS21002C</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible : should be "nxp,fxas21002c"</div><div class='add'>+  - reg : the I2C address of the sensor or SPI chip select number for the</div><div class='add'>+          device.</div><div class='add'>+  - vdd-supply: phandle to the regulator that provides power to the sensor.</div><div class='add'>+  - vddio-supply: phandle to the regulator that provides power to the bus.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+  - reset-gpios : gpio used to reset the device, see gpio/gpio.txt</div><div class='add'>+  - interrupts : device support 2 interrupts, INT1 and INT2,</div><div class='add'>+                 the interrupts can be triggered on rising or falling edges.</div><div class='add'>+                 See interrupt-controller/interrupts.txt</div><div class='add'>+  - interrupt-names: should contain "INT1" or "INT2", the gyroscope interrupt</div><div class='add'>+                     line in use.</div><div class='add'>+  - drive-open-drain: the interrupt/data ready line will be configured</div><div class='add'>+                      as open drain, which is useful if several sensors share</div><div class='add'>+                      the same interrupt line. This is a boolean property.</div><div class='add'>+                      (This binding is taken from pinctrl/pinctrl-bindings.txt)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+gyroscope@20 {</div><div class='add'>+	compatible = "nxp,fxas21002c";</div><div class='add'>+	reg = &lt;0x20&gt;;</div><div class='add'>+	vdd-supply = &lt;&amp;reg_peri_3p15v&gt;;</div><div class='add'>+	vddio-supply = &lt;&amp;reg_peri_3p15v&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt b/Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt<br/>new file mode 100644<br/>index 000000000000..ed7783f45233<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+</div><div class='add'>+Analog Devices ADIS16480 and similar IMUs</div><div class='add'>+</div><div class='add'>+Required properties for the ADIS16480:</div><div class='add'>+</div><div class='add'>+- compatible: Must be one of</div><div class='add'>+	* "adi,adis16375"</div><div class='add'>+	* "adi,adis16480"</div><div class='add'>+	* "adi,adis16485"</div><div class='add'>+	* "adi,adis16488"</div><div class='add'>+	* "adi,adis16495-1"</div><div class='add'>+	* "adi,adis16495-2"</div><div class='add'>+	* "adi,adis16495-3"</div><div class='add'>+	* "adi,adis16497-1"</div><div class='add'>+	* "adi,adis16497-2"</div><div class='add'>+	* "adi,adis16497-3"</div><div class='add'>+- reg: SPI chip select number for the device</div><div class='add'>+- spi-max-frequency: Max SPI frequency to use</div><div class='add'>+	see: Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+- spi-cpha: See Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+- spi-cpol: See Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+- interrupts: interrupt mapping for IRQ, accepted values are:</div><div class='add'>+	* IRQF_TRIGGER_RISING</div><div class='add'>+	* IRQF_TRIGGER_FALLING</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- interrupt-names: Data ready line selection. Valid values are:</div><div class='add'>+	* DIO1</div><div class='add'>+	* DIO2</div><div class='add'>+	* DIO3</div><div class='add'>+	* DIO4</div><div class='add'>+	If this field is left empty, DIO1 is assigned as default data ready</div><div class='add'>+	signal.</div><div class='add'>+- reset-gpios: must be the device tree identifier of the RESET pin. As the line</div><div class='add'>+	is active low, it should be marked GPIO_ACTIVE_LOW.</div><div class='add'>+- clocks: phandle to the external clock. Should be set according to</div><div class='add'>+	"clock-names".</div><div class='add'>+	If this field is left empty together with the "clock-names" field, then</div><div class='add'>+	the internal clock is used.</div><div class='add'>+- clock-names: The name of the external clock to be used. Valid values are:</div><div class='add'>+	* sync: In sync mode, the internal clock is disabled and the frequency</div><div class='add'>+		of the external clock signal establishes therate of data</div><div class='add'>+		collection and processing. See Fig 14 and 15 in the datasheet.</div><div class='add'>+		The clock-frequency must be:</div><div class='add'>+		* 3000 to 4500 Hz for adis1649x devices.</div><div class='add'>+		* 700 to 2400 Hz for adis1648x devices.</div><div class='add'>+	* pps: In Pulse Per Second (PPS) Mode, the rate of data collection and</div><div class='add'>+	       production is equal to the product of the external clock</div><div class='add'>+	       frequency and the scale factor in the SYNC_SCALE register, see</div><div class='add'>+	       Table 154 in the datasheet.</div><div class='add'>+	       The clock-frequency must be:</div><div class='add'>+	       * 1 to 128 Hz for adis1649x devices.</div><div class='add'>+	       * This mode is not supported by adis1648x devices.</div><div class='add'>+	If this field is left empty together with the "clocks" field, then the</div><div class='add'>+	internal clock is used.</div><div class='add'>+- adi,ext-clk-pin: The DIOx line to be used as an external clock input.</div><div class='add'>+	Valid values are:</div><div class='add'>+	* DIO1</div><div class='add'>+	* DIO2</div><div class='add'>+	* DIO3</div><div class='add'>+	* DIO4</div><div class='add'>+	Each DIOx pin supports only one function at a time (data ready line</div><div class='add'>+	selection or external clock input). When a single pin has two</div><div class='add'>+	two assignments, the enable bit for the lower priority function</div><div class='add'>+	automatically resets to zero (disabling the lower priority function).</div><div class='add'>+	Data ready has highest priority.</div><div class='add'>+	If this field is left empty, DIO2 is assigned as default external clock</div><div class='add'>+	input pin.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	imu@0 {</div><div class='add'>+		compatible = "adi,adis16495-1";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;3200000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		interrupts = &lt;25 IRQF_TRIGGER_FALLING&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='add'>+		interrupt-names = "DIO2";</div><div class='add'>+		clocks = &lt;&amp;adis16495_sync&gt;;</div><div class='add'>+		clock-names = "sync";</div><div class='add'>+		adi,ext-clk-pin = "DIO1";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt b/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt<br/>index 69d53d98d0f0..efec9ece034a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt</a></div><div class='hunk'>@@ -8,6 +8,9 @@ Required properties:</div><div class='ctx'>   "st,lsm6dsm"</div><div class='ctx'>   "st,ism330dlc"</div><div class='ctx'>   "st,lsm6dso"</div><div class='add'>+  "st,asm330lhh"</div><div class='add'>+  "st,lsm6dsox"</div><div class='add'>+  "st,lsm6dsr"</div><div class='ctx'> - reg: i2c address of the sensor / spi cs line</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt<br/>new file mode 100644<br/>index 000000000000..955af4555c90<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/light/vcnl4000.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/light/vcnl4000.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+VISHAY VCNL4000 -  Ambient Light and proximity sensor</div><div class='add'>+</div><div class='add'>+This driver supports the VCNL4000/10/20/40 and VCNL4200 chips</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+	-compatible: must be one of :</div><div class='add'>+        vishay,vcnl4000</div><div class='add'>+        vishay,vcnl4010</div><div class='add'>+        vishay,vcnl4020</div><div class='add'>+        vishay,vcnl4040</div><div class='add'>+        vishay,vcnl4200</div><div class='add'>+</div><div class='add'>+	-reg: I2C address of the sensor, should be one from below based on the model:</div><div class='add'>+        0x13</div><div class='add'>+        0x51</div><div class='add'>+        0x60</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+light-sensor@51 {</div><div class='add'>+	compatible = "vishay,vcnl4200";</div><div class='add'>+	reg = &lt;0x51&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.txt b/Documentation/devicetree/bindings/iio/pressure/bmp085.txt<br/>deleted file mode 100644<br/>index 61c72e63c584..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/pressure/bmp085.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/pressure/bmp085.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-BMP085/BMP18x/BMP28x digital pressure sensors</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: must be one of:</div><div class='del'>-  "bosch,bmp085"</div><div class='del'>-  "bosch,bmp180"</div><div class='del'>-  "bosch,bmp280"</div><div class='del'>-  "bosch,bme280"</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- interrupts: interrupt mapping for IRQ</div><div class='del'>-- reset-gpios: a GPIO line handling reset of the sensor: as the line is</div><div class='del'>-  active low, it should be marked GPIO_ACTIVE_LOW (see gpio/gpio.txt)</div><div class='del'>-- vddd-supply: digital voltage regulator (see regulator/regulator.txt)</div><div class='del'>-- vdda-supply: analog voltage regulator (see regulator/regulator.txt)</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-pressure@77 {</div><div class='del'>-	compatible = "bosch,bmp085";</div><div class='del'>-	reg = &lt;0x77&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-	interrupts = &lt;25 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-	reset-gpios = &lt;&amp;gpio0 26 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-	vddd-supply = &lt;&amp;foo&gt;;</div><div class='del'>-	vdda-supply = &lt;&amp;bar&gt;;</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml<br/>new file mode 100644<br/>index 000000000000..c6721a7e8938<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/pressure/bmp085.yaml</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: http://devicetree.org/schemas/iio/pressure/bmp085.yaml#</div><div class='add'>+$schema: http://devicetree.org/meta-schemas/core.yaml#</div><div class='add'>+</div><div class='add'>+title: BMP085/BMP180/BMP280/BME280 pressure iio sensors</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Andreas Klinger &lt;ak@it-klinger.de&gt;</div><div class='add'>+</div><div class='add'>+description: |</div><div class='add'>+  Pressure, temperature and humidity iio sensors with i2c and spi interfaces</div><div class='add'>+</div><div class='add'>+  Specifications about the sensor can be found at:</div><div class='add'>+    https://www.bosch-sensortec.com/bst/products/all_products/bmp180</div><div class='add'>+    https://www.bosch-sensortec.com/bst/products/all_products/bmp280</div><div class='add'>+    https://www.bosch-sensortec.com/bst/products/all_products/bme280</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  compatible:</div><div class='add'>+    enum:</div><div class='add'>+      - bosch,bmp085</div><div class='add'>+      - bosch,bmp180</div><div class='add'>+      - bosch,bmp280</div><div class='add'>+      - bosch,bme280</div><div class='add'>+</div><div class='add'>+  vddd-supply:</div><div class='add'>+    description:</div><div class='add'>+      digital voltage regulator (see regulator/regulator.txt)</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  vdda-supply:</div><div class='add'>+    description:</div><div class='add'>+      analog voltage regulator (see regulator/regulator.txt)</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  reset-gpios:</div><div class='add'>+    description:</div><div class='add'>+      A GPIO line handling reset of the sensor. As the line is active low,</div><div class='add'>+      it should be marked GPIO_ACTIVE_LOW (see gpio/gpio.txt)</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  interrupts:</div><div class='add'>+    description:</div><div class='add'>+      interrupt mapping for IRQ (BMP085 only)</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+required:</div><div class='add'>+  - compatible</div><div class='add'>+  - vddd-supply</div><div class='add'>+  - vdda-supply</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+    #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+    #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+    i2c0 {</div><div class='add'>+      #address-cells = &lt;1&gt;;</div><div class='add'>+      #size-cells = &lt;0&gt;;</div><div class='add'>+      pressure@77 {</div><div class='add'>+          compatible = "bosch,bmp085";</div><div class='add'>+          reg = &lt;0x77&gt;;</div><div class='add'>+          interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+          interrupts = &lt;25 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+          reset-gpios = &lt;&amp;gpio0 26 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+          vddd-supply = &lt;&amp;foo&gt;;</div><div class='add'>+          vdda-supply = &lt;&amp;bar&gt;;</div><div class='add'>+      };</div><div class='add'>+    };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt b/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt<br/>deleted file mode 100644<br/>index d4dc7a227e2e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-* Devantech SRF04 ultrasonic range finder</div><div class='del'>-  Bit-banging driver using two GPIOs</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>- - compatible:	Should be "devantech,srf04"</div><div class='del'>-</div><div class='del'>- - trig-gpios:	Definition of the GPIO for the triggering (output)</div><div class='del'>-		This GPIO is set for about 10 us by the driver to tell the</div><div class='del'>-		device it should initiate the measurement cycle.</div><div class='del'>-</div><div class='del'>- - echo-gpios:	Definition of the GPIO for the echo (input)</div><div class='del'>-		This GPIO is set by the device as soon as an ultrasonic</div><div class='del'>-		burst is sent out and reset when the first echo is</div><div class='del'>-		received.</div><div class='del'>-		Thus this GPIO is set while the ultrasonic waves are doing</div><div class='del'>-		one round trip.</div><div class='del'>-		It needs to be an GPIO which is able to deliver an</div><div class='del'>-		interrupt because the time between two interrupts is</div><div class='del'>-		measured in the driver.</div><div class='del'>-		See Documentation/devicetree/bindings/gpio/gpio.txt for</div><div class='del'>-		information on how to specify a consumer gpio.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-srf04@0 {</div><div class='del'>-	compatible = "devantech,srf04";</div><div class='del'>-	trig-gpios = &lt;&amp;gpio1 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-	echo-gpios = &lt;&amp;gpio2  6 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml b/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml<br/>new file mode 100644<br/>index 000000000000..4e80ea7c1475<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: http://devicetree.org/schemas/iio/proximity/devantech-srf04.yaml#</div><div class='add'>+$schema: http://devicetree.org/meta-schemas/core.yaml#</div><div class='add'>+</div><div class='add'>+title: Devantech SRF04 and Maxbotix mb1000 ultrasonic range finder</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Andreas Klinger &lt;ak@it-klinger.de&gt;</div><div class='add'>+</div><div class='add'>+description: |</div><div class='add'>+  Bit-banging driver using two GPIOs:</div><div class='add'>+  - trigger-gpio is raised by the driver to start sending out an ultrasonic</div><div class='add'>+    burst</div><div class='add'>+  - echo-gpio is held high by the sensor after sending ultrasonic burst</div><div class='add'>+    until it is received once again</div><div class='add'>+</div><div class='add'>+  Specifications about the devices can be found at:</div><div class='add'>+  http://www.robot-electronics.co.uk/htm/srf04tech.htm</div><div class='add'>+</div><div class='add'>+  http://www.maxbotix.com/documents/LV-MaxSonar-EZ_Datasheet.pdf</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  compatible:</div><div class='add'>+    enum:</div><div class='add'>+      - devantech,srf04</div><div class='add'>+      - maxbotix,mb1000</div><div class='add'>+      - maxbotix,mb1010</div><div class='add'>+      - maxbotix,mb1020</div><div class='add'>+      - maxbotix,mb1030</div><div class='add'>+      - maxbotix,mb1040</div><div class='add'>+</div><div class='add'>+  trig-gpios:</div><div class='add'>+    description:</div><div class='add'>+      Definition of the GPIO for the triggering (output)</div><div class='add'>+      This GPIO is set for about 10 us by the driver to tell the device it</div><div class='add'>+      should initiate the measurement cycle.</div><div class='add'>+      See Documentation/devicetree/bindings/gpio/gpio.txt for information</div><div class='add'>+      on how to specify a consumer gpio.</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  echo-gpios:</div><div class='add'>+    description:</div><div class='add'>+      Definition of the GPIO for the echo (input)</div><div class='add'>+      This GPIO is set by the device as soon as an ultrasonic burst is sent</div><div class='add'>+      out and reset when the first echo is received.</div><div class='add'>+      Thus this GPIO is set while the ultrasonic waves are doing one round</div><div class='add'>+      trip.</div><div class='add'>+      It needs to be an GPIO which is able to deliver an interrupt because</div><div class='add'>+      the time between two interrupts is measured in the driver.</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+required:</div><div class='add'>+  - compatible</div><div class='add'>+  - trig-gpios</div><div class='add'>+  - echo-gpios</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+    #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+    proximity {</div><div class='add'>+        compatible = "devantech,srf04";</div><div class='add'>+        trig-gpios = &lt;&amp;gpio1 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+        echo-gpios = &lt;&amp;gpio2  6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+    };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt b/Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt<br/>new file mode 100644<br/>index 000000000000..dd1058fbe9c3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+* MaxBotix I2CXL-MaxSonar ultrasonic distance sensor of type  mb1202,</div><div class='add'>+  mb1212, mb1222, mb1232, mb1242, mb7040 or mb7137 using the i2c interface</div><div class='add'>+  for ranging</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible:		"maxbotix,mb1202",</div><div class='add'>+			"maxbotix,mb1212",</div><div class='add'>+			"maxbotix,mb1222",</div><div class='add'>+			"maxbotix,mb1232",</div><div class='add'>+			"maxbotix,mb1242",</div><div class='add'>+			"maxbotix,mb7040" or</div><div class='add'>+			"maxbotix,mb7137"</div><div class='add'>+</div><div class='add'>+ - reg:			i2c address of the device, see also i2c/i2c.txt</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+ - interrupts:		Interrupt used to announce the preceding reading</div><div class='add'>+			request has finished and that data is available.</div><div class='add'>+			If no interrupt is specified the device driver</div><div class='add'>+			falls back to wait a fixed amount of time until</div><div class='add'>+			data can be retrieved.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+proximity@70 {</div><div class='add'>+	compatible = "maxbotix,mb1232";</div><div class='add'>+	reg = &lt;0x70&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='add'>+	interrupts = &lt;2 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/st-sensors.txt b/Documentation/devicetree/bindings/iio/st-sensors.txt<br/>index 52ee4baec6f0..0ef64a444479 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/st-sensors.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/iio/st-sensors.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/st-sensors.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/st-sensors.txt</a></div><div class='hunk'>@@ -49,6 +49,7 @@ Accelerometers:</div><div class='ctx'> - st,lis2dw12</div><div class='ctx'> - st,lis3dhh</div><div class='ctx'> - st,lis3de</div><div class='add'>+- st,lis2de12</div><div class='ctx'> </div><div class='ctx'> Gyroscopes:</div><div class='ctx'> - st,l3g4200d-gyro</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/temperature/max31856.txt b/Documentation/devicetree/bindings/iio/temperature/max31856.txt<br/>new file mode 100644<br/>index 000000000000..06ab43bb4de8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/temperature/max31856.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/temperature/max31856.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+Maxim MAX31856 thermocouple support</div><div class='add'>+</div><div class='add'>+https://datasheets.maximintegrated.com/en/ds/MAX31856.pdf</div><div class='add'>+</div><div class='add'>+Optional property:</div><div class='add'>+	- thermocouple-type: Type of thermocouple (THERMOCOUPLE_TYPE_K if</div><div class='add'>+		omitted). Supported types are B, E, J, K, N, R, S, T.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+	- compatible: must be "maxim,max31856"</div><div class='add'>+	- reg: SPI chip select number for the device</div><div class='add'>+	- spi-max-frequency: As per datasheet max. supported freq is 5000000</div><div class='add'>+	- spi-cpha: must be defined for max31856 to enable SPI mode 1</div><div class='add'>+</div><div class='add'>+	Refer to spi/spi-bus.txt for generic SPI slave bindings.</div><div class='add'>+</div><div class='add'>+ Example:</div><div class='add'>+	temp-sensor@0 {</div><div class='add'>+		compatible = "maxim,max31856";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;5000000&gt;;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		thermocouple-type = &lt;THERMOCOUPLE_TYPE_K&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt b/Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt<br/>new file mode 100644<br/>index 000000000000..8f339cab74ae<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+If the temperature sensor device can be configured to use some specific</div><div class='add'>+thermocouple type, you can use the defined types provided in the file</div><div class='add'>+"include/dt-bindings/iio/temperature/thermocouple.h".</div><div class='add'>+</div><div class='add'>+Property:</div><div class='add'>+thermocouple-type:	A single cell representing the type of the thermocouple</div><div class='add'>+			used by the device.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/interconnect/interconnect.txt b/Documentation/devicetree/bindings/interconnect/interconnect.txt<br/>index 5a3c575b387a..6f5d23a605b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/interconnect/interconnect.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/interconnect/interconnect.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/interconnect/interconnect.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/interconnect/interconnect.txt</a></div><div class='hunk'>@@ -51,6 +51,10 @@ interconnect-names : List of interconnect path name strings sorted in the same</div><div class='ctx'> 		     interconnect-names to match interconnect paths with interconnect</div><div class='ctx'> 		     specifier pairs.</div><div class='ctx'> </div><div class='add'>+                     Reserved interconnect names:</div><div class='add'>+			 * dma-mem: Path from the device to the main memory of</div><div class='add'>+			            the system</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	sdhci@7864000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml<br/>index 758fbd7128e7..54838d4ea44c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml</a></div><div class='hunk'>@@ -129,6 +129,7 @@ required:</div><div class='ctx'> </div><div class='ctx'> patternProperties:</div><div class='ctx'>   "^v2m@[0-9a-f]+$":</div><div class='add'>+    type: object</div><div class='ctx'>     description: |</div><div class='ctx'>       * GICv2m extension for MSI/MSI-x support (Optional)</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt<br/>index 8de96a4fb2d5..f977ea7617f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt</a></div><div class='hunk'>@@ -16,6 +16,7 @@ Required properties:</div><div class='ctx'>     - "renesas,irqc-r8a7793" (R-Car M2-N)</div><div class='ctx'>     - "renesas,irqc-r8a7794" (R-Car E2)</div><div class='ctx'>     - "renesas,intc-ex-r8a774a1" (RZ/G2M)</div><div class='add'>+    - "renesas,intc-ex-r8a774c0" (RZ/G2E)</div><div class='ctx'>     - "renesas,intc-ex-r8a7795" (R-Car H3)</div><div class='ctx'>     - "renesas,intc-ex-r8a7796" (R-Car M3-W)</div><div class='ctx'>     - "renesas,intc-ex-r8a77965" (R-Car M3-N)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/leds/leds-lm3532.txt b/Documentation/devicetree/bindings/leds/leds-lm3532.txt<br/>new file mode 100644<br/>index 000000000000..c087f85ddddc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/leds/leds-lm3532.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/leds/leds-lm3532.txt</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+* Texas Instruments - lm3532 White LED driver with ambient light sensing</div><div class='add'>+capability.</div><div class='add'>+</div><div class='add'>+The LM3532 provides the 3 high-voltage, low-side current sinks. The device is</div><div class='add'>+programmable over an I2C-compatible interface and has independent</div><div class='add'>+current control for all three channels. The adaptive current regulation</div><div class='add'>+method allows for different LED currents in each current sink thus allowing</div><div class='add'>+for a wide variety of backlight and keypad applications.</div><div class='add'>+</div><div class='add'>+The main features of the LM3532 include dual ambient light sensor inputs</div><div class='add'>+each with 32 internal voltage setting resistors, 8-bit logarithmic and linear</div><div class='add'>+brightness control, dual external PWM brightness control inputs, and up to</div><div class='add'>+1000:1 dimming ratio with programmable fade in and fade out settings.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+	- compatible : "ti,lm3532"</div><div class='add'>+	- reg : I2C slave address</div><div class='add'>+	- #address-cells : 1</div><div class='add'>+	- #size-cells : 0</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+	- enable-gpios : gpio pin to enable (active high)/disable the device.</div><div class='add'>+	- ramp-up-us - The Run time ramp rates/step are from one current</div><div class='add'>+		       set-point to another after the device has reached its</div><div class='add'>+		       initial target set point from turn-on</div><div class='add'>+	- ramp-down-us - The Run time ramp rates/step are from one current</div><div class='add'>+			 set-point to another after the device has reached its</div><div class='add'>+			 initial target set point from turn-on</div><div class='add'>+	Range for ramp settings: 8us - 65536us</div><div class='add'>+</div><div class='add'>+Optional properties if ALS mode is used:</div><div class='add'>+	- ti,als-vmin - Minimum ALS voltage defined in Volts</div><div class='add'>+	- ti,als-vmax - Maximum ALS voltage defined in Volts</div><div class='add'>+	Per the data sheet the max ALS voltage is 2V and the min is 0V</div><div class='add'>+</div><div class='add'>+	- ti,als1-imp-sel - ALS1 impedance resistor selection in Ohms</div><div class='add'>+	- ti,als2-imp-sel - ALS2 impedance resistor selection in Ohms</div><div class='add'>+	Range for impedance select: 37000 Ohms - 1190 Ohms</div><div class='add'>+	Values above 37kohms will be set to the "High Impedance" setting</div><div class='add'>+</div><div class='add'>+	- ti,als-avrg-time-us - Determines the length of time the device needs to</div><div class='add'>+			  average the two ALS inputs.  This is only used if</div><div class='add'>+			  the input mode is LM3532_ALS_INPUT_AVRG.</div><div class='add'>+			     Range: 17920us - 2293760us</div><div class='add'>+	- ti,als-input-mode - Determines how the device uses the attached ALS</div><div class='add'>+			   devices.</div><div class='add'>+			   0x00 - ALS1 and ALS2 input average</div><div class='add'>+			   0x01 - ALS1 Input</div><div class='add'>+			   0x02 - ALS2 Input</div><div class='add'>+			   0x03 - Max of ALS1 and ALS2</div><div class='add'>+</div><div class='add'>+Required child properties:</div><div class='add'>+	- reg : Indicates control bank the LED string is controlled by</div><div class='add'>+	- led-sources : see Documentation/devicetree/bindings/leds/common.txt</div><div class='add'>+	- ti,led-mode : Defines if the LED strings are manually controlled or</div><div class='add'>+			if the LED strings are controlled by the ALS.</div><div class='add'>+			0x00 - LED strings are I2C controlled via full scale</div><div class='add'>+			       brightness control register</div><div class='add'>+			0x01 - LED strings are ALS controlled</div><div class='add'>+</div><div class='add'>+Optional LED child properties:</div><div class='add'>+	- label : see Documentation/devicetree/bindings/leds/common.txt</div><div class='add'>+	- linux,default-trigger :</div><div class='add'>+	   see Documentation/devicetree/bindings/leds/common.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+led-controller@38 {</div><div class='add'>+	compatible = "ti,lm3532";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	reg = &lt;0x38&gt;;</div><div class='add'>+</div><div class='add'>+	enable-gpios = &lt;&amp;gpio6 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	ramp-up-us = &lt;1024&gt;;</div><div class='add'>+	ramp-down-us = &lt;65536&gt;;</div><div class='add'>+</div><div class='add'>+	ti,als-vmin = &lt;0&gt;;</div><div class='add'>+	ti,als-vmax = &lt;2000&gt;;</div><div class='add'>+	ti,als1-imp-sel = &lt;4110&gt;;</div><div class='add'>+	ti,als2-imp-sel = &lt;2180&gt;;</div><div class='add'>+	ti,als-avrg-time-us = &lt;17920&gt;;</div><div class='add'>+	ti,als-input-mode = &lt;0x00&gt;;</div><div class='add'>+</div><div class='add'>+	led@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		led-sources = &lt;2&gt;;</div><div class='add'>+		ti,led-mode = &lt;1&gt;;</div><div class='add'>+		label = ":backlight";</div><div class='add'>+		linux,default-trigger = "backlight";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	led@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		led-sources = &lt;1&gt;;</div><div class='add'>+		ti,led-mode = &lt;0&gt;;</div><div class='add'>+		label = ":kbd_backlight";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+For more product information please see the links below:</div><div class='add'>+http://www.ti.com/product/LM3532</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/aspeed-video.txt b/Documentation/devicetree/bindings/media/aspeed-video.txt<br/>index 78b464ae2672..ce2894506e1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/aspeed-video.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/aspeed-video.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/aspeed-video.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/aspeed-video.txt</a></div><div class='hunk'>@@ -14,6 +14,11 @@ Required properties:</div><div class='ctx'> 			the VE</div><div class='ctx'>  - interrupts:		the interrupt associated with the VE on this platform</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+ - memory-region:</div><div class='add'>+	phandle to a memory region to allocate from, as defined in</div><div class='add'>+	Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> video-engine@1e700000 {</div><div class='hunk'>@@ -23,4 +28,5 @@ video-engine@1e700000 {</div><div class='ctx'>     clock-names = "vclk", "eclk";</div><div class='ctx'>     resets = &lt;&amp;syscon ASPEED_RESET_VIDEO&gt;;</div><div class='ctx'>     interrupts = &lt;7&gt;;</div><div class='add'>+    memory-region = &lt;&amp;video_engine_memory&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/cedrus.txt b/Documentation/devicetree/bindings/media/cedrus.txt<br/>index bce0705df953..20c82fb0c343 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/cedrus.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/cedrus.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/cedrus.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/cedrus.txt</a></div><div class='hunk'>@@ -13,6 +13,7 @@ Required properties:</div><div class='ctx'> 			- "allwinner,sun8i-h3-video-engine"</div><div class='ctx'> 			- "allwinner,sun50i-a64-video-engine"</div><div class='ctx'> 			- "allwinner,sun50i-h5-video-engine"</div><div class='add'>+			- "allwinner,sun50i-h6-video-engine"</div><div class='ctx'> - reg			: register base and length of VE;</div><div class='ctx'> - clocks		: list of clock specifiers, corresponding to entries in</div><div class='ctx'> 			  the clock-names property;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt b/Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt<br/>new file mode 100644<br/>index 000000000000..7976e6c40a80<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge</div><div class='add'>+</div><div class='add'>+MIPID02 has two CSI-2 input ports, only one of those ports can be active at a</div><div class='add'>+time. Active port input stream will be de-serialized and its content outputted</div><div class='add'>+through PARALLEL output port.</div><div class='add'>+CSI-2 first input port is a dual lane 800Mbps per lane whereas CSI-2 second</div><div class='add'>+input port is a single lane 800Mbps. Both ports support clock and data lane</div><div class='add'>+polarity swap. First port also supports data lane swap.</div><div class='add'>+PARALLEL output port has a maximum width of 12 bits.</div><div class='add'>+Supported formats are RAW6, RAW7, RAW8, RAW10, RAW12, RGB565, RGB888, RGB444,</div><div class='add'>+YUV420 8-bit, YUV422 8-bit and YUV420 10-bit.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible: shall be "st,st-mipid02"</div><div class='add'>+- clocks: reference to the xclk input clock.</div><div class='add'>+- clock-names: shall be "xclk".</div><div class='add'>+- VDDE-supply: sensor digital IO supply. Must be 1.8 volts.</div><div class='add'>+- VDDIN-supply: sensor internal regulator supply. Must be 1.8 volts.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+- reset-gpios: reference to the GPIO connected to the xsdn pin, if any.</div><div class='add'>+	       This is an active low signal to the mipid02.</div><div class='add'>+</div><div class='add'>+Required subnodes:</div><div class='add'>+  - ports: A ports node with one port child node per device input and output</div><div class='add'>+	   port, in accordance with the video interface bindings defined in</div><div class='add'>+	   Documentation/devicetree/bindings/media/video-interfaces.txt. The</div><div class='add'>+	   port nodes are numbered as follows:</div><div class='add'>+</div><div class='add'>+	   Port Description</div><div class='add'>+	   -----------------------------</div><div class='add'>+	   0    CSI-2 first input port</div><div class='add'>+	   1    CSI-2 second input port</div><div class='add'>+	   2    PARALLEL output</div><div class='add'>+</div><div class='add'>+Endpoint node required property for CSI-2 connection is:</div><div class='add'>+- data-lanes: shall be &lt;1&gt; for Port 1. for Port 0 dual-lane operation shall be</div><div class='add'>+&lt;1 2&gt; or &lt;2 1&gt;. For Port 0 single-lane operation shall be &lt;1&gt; or &lt;2&gt;.</div><div class='add'>+Endpoint node optional property for CSI-2 connection is:</div><div class='add'>+- lane-polarities: any lane can be inverted or not.</div><div class='add'>+</div><div class='add'>+Endpoint node required property for PARALLEL connection is:</div><div class='add'>+- bus-width: shall be set to &lt;6&gt;, &lt;7&gt;, &lt;8&gt;, &lt;10&gt; or &lt;12&gt;.</div><div class='add'>+Endpoint node optional properties for PARALLEL connection are:</div><div class='add'>+- hsync-active: active state of the HSYNC signal, 0/1 for LOW/HIGH respectively.</div><div class='add'>+LOW being the default.</div><div class='add'>+- vsync-active: active state of the VSYNC signal, 0/1 for LOW/HIGH respectively.</div><div class='add'>+LOW being the default.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+mipid02: csi2rx@14 {</div><div class='add'>+	compatible = "st,st-mipid02";</div><div class='add'>+	reg = &lt;0x14&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	clocks = &lt;&amp;clk_ext_camera_12&gt;;</div><div class='add'>+	clock-names = "xclk";</div><div class='add'>+	VDDE-supply = &lt;&amp;vdd&gt;;</div><div class='add'>+	VDDIN-supply = &lt;&amp;vdd&gt;;</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			ep0: endpoint {</div><div class='add'>+				data-lanes = &lt;1 2&gt;;</div><div class='add'>+				remote-endpoint = &lt;&amp;mipi_csi2_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		port@2 {</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			ep2: endpoint {</div><div class='add'>+				bus-width = &lt;8&gt;;</div><div class='add'>+				hsync-active = &lt;0&gt;;</div><div class='add'>+				vsync-active = &lt;0&gt;;</div><div class='add'>+				remote-endpoint = &lt;&amp;parallel_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/meson-ao-cec.txt b/Documentation/devicetree/bindings/media/meson-ao-cec.txt<br/>index 8671bdb08080..c67fc41d4aa2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/meson-ao-cec.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/meson-ao-cec.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/meson-ao-cec.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/meson-ao-cec.txt</a></div><div class='hunk'>@@ -4,16 +4,23 @@ The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is</div><div class='ctx'> to handle communication between HDMI connected devices over the CEC bus.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-  - compatible : value should be following</div><div class='add'>+  - compatible : value should be following depending on the SoC :</div><div class='add'>+	For GXBB, GXL, GXM and G12A (AO_CEC_A module) :</div><div class='ctx'> 	"amlogic,meson-gx-ao-cec"</div><div class='add'>+	For G12A (AO_CEC_B module) :</div><div class='add'>+	"amlogic,meson-g12a-ao-cec"</div><div class='ctx'> </div><div class='ctx'>   - reg : Physical base address of the IP registers and length of memory</div><div class='ctx'> 	  mapped region.</div><div class='ctx'> </div><div class='ctx'>   - interrupts : AO-CEC interrupt number to the CPU.</div><div class='ctx'>   - clocks : from common clock binding: handle to AO-CEC clock.</div><div class='del'>-  - clock-names : from common clock binding: must contain "core",</div><div class='del'>-		  corresponding to entry in the clocks property.</div><div class='add'>+  - clock-names : from common clock binding, must contain :</div><div class='add'>+		For GXBB, GXL, GXM and G12A (AO_CEC_A module) :</div><div class='add'>+		- "core"</div><div class='add'>+		For G12A (AO_CEC_B module) :</div><div class='add'>+		- "oscin"</div><div class='add'>+		corresponding to entry in the clocks property.</div><div class='ctx'>   - hdmi-phandle: phandle to the HDMI controller</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/rcar_imr.txt b/Documentation/devicetree/bindings/media/rcar_imr.txt<br/>new file mode 100644<br/>index 000000000000..b0614153ed36<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/rcar_imr.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/rcar_imr.txt</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+Renesas R-Car Image Renderer (Distortion Correction Engine)</div><div class='add'>+-----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+The image renderer, or the distortion correction engine, is a drawing processor</div><div class='add'>+with a simple instruction system capable of referencing video capture data or</div><div class='add'>+data in an external memory as 2D texture data and performing texture mapping</div><div class='add'>+and drawing with respect to any shape that is split into triangular objects.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: "renesas,&lt;soctype&gt;-imr-lx4", "renesas,imr-lx4" as a fallback for</div><div class='add'>+  the image renderer light extended 4 (IMR-LX4) found in the R-Car gen3 SoCs,</div><div class='add'>+  where the examples with &lt;soctype&gt; are:</div><div class='add'>+  - "renesas,r8a7795-imr-lx4" for R-Car H3,</div><div class='add'>+  - "renesas,r8a7796-imr-lx4" for R-Car M3-W.</div><div class='add'>+- reg: offset and length of the register block;</div><div class='add'>+- interrupts: single interrupt specifier;</div><div class='add'>+- clocks: single clock phandle/specifier pair;</div><div class='add'>+- power-domains: power domain phandle/specifier pair;</div><div class='add'>+- resets: reset phandle/specifier pair.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	imr-lx4@fe860000 {</div><div class='add'>+		compatible = "renesas,r8a7795-imr-lx4", "renesas,imr-lx4";</div><div class='add'>+		reg = &lt;0 0xfe860000 0 0x2000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;cpg CPG_MOD 823&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7795_PD_A3VC&gt;;</div><div class='add'>+		resets = &lt;&amp;cpg 823&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt<br/>index 224a4615b418..aa217b096279 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/rcar_vin.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/rcar_vin.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/rcar_vin.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/rcar_vin.txt</a></div><div class='hunk'>@@ -13,6 +13,7 @@ on Gen3 and RZ/G2 platforms to a CSI-2 receiver.</div><div class='ctx'>    - "renesas,vin-r8a7743" for the R8A7743 device</div><div class='ctx'>    - "renesas,vin-r8a7744" for the R8A7744 device</div><div class='ctx'>    - "renesas,vin-r8a7745" for the R8A7745 device</div><div class='add'>+   - "renesas,vin-r8a774a1" for the R8A774A1 device</div><div class='ctx'>    - "renesas,vin-r8a774c0" for the R8A774C0 device</div><div class='ctx'>    - "renesas,vin-r8a7778" for the R8A7778 device</div><div class='ctx'>    - "renesas,vin-r8a7779" for the R8A7779 device</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt b/Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt<br/>index d63275e17afd..331409259752 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt</a></div><div class='hunk'>@@ -8,6 +8,7 @@ R-Car VIN module, which provides the video capture capabilities.</div><div class='ctx'> Mandatory properties</div><div class='ctx'> --------------------</div><div class='ctx'>  - compatible: Must be one or more of the following</div><div class='add'>+   - "renesas,r8a774a1-csi2" for the R8A774A1 device.</div><div class='ctx'>    - "renesas,r8a774c0-csi2" for the R8A774C0 device.</div><div class='ctx'>    - "renesas,r8a7795-csi2" for the R8A7795 device.</div><div class='ctx'>    - "renesas,r8a7796-csi2" for the R8A7796 device.</div><div class='hunk'>@@ -18,7 +19,8 @@ Mandatory properties</div><div class='ctx'> </div><div class='ctx'>  - reg: the register base and size for the device registers</div><div class='ctx'>  - interrupts: the interrupt for the device</div><div class='del'>- - clocks: reference to the parent clock</div><div class='add'>+ - clocks: A phandle + clock specifier for the module clock</div><div class='add'>+ - resets: A phandle + reset specifier for the module reset</div><div class='ctx'> </div><div class='ctx'> The device node shall contain two 'port' child nodes according to the</div><div class='ctx'> bindings defined in Documentation/devicetree/bindings/media/</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt<br/>index 2af4ff95d6bc..4991a6415796 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/axp20x.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/axp20x.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/axp20x.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mfd/axp20x.txt</a></div><div class='hunk'>@@ -25,6 +25,7 @@ Required properties:</div><div class='ctx'>     * "x-powers,axp223"</div><div class='ctx'>     * "x-powers,axp803"</div><div class='ctx'>     * "x-powers,axp806"</div><div class='add'>+    * "x-powers,axp805", "x-powers,axp806"</div><div class='ctx'>     * "x-powers,axp809"</div><div class='ctx'>     * "x-powers,axp813"</div><div class='ctx'> - reg: The I2C slave address or RSB hardware address for the AXP chip</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/stm32-lptimer.txt b/Documentation/devicetree/bindings/mfd/stm32-lptimer.txt<br/>index 2a9ff29db9c9..fb54e4dad5b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/stm32-lptimer.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/stm32-lptimer.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/stm32-lptimer.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mfd/stm32-lptimer.txt</a></div><div class='hunk'>@@ -16,7 +16,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Optional subnodes:</div><div class='ctx'> - pwm:			See ../pwm/pwm-stm32-lp.txt</div><div class='del'>-- counter:		See ../iio/timer/stm32-lptimer-cnt.txt</div><div class='add'>+- counter:		See ../counter/stm32-lptimer-cnt.txt</div><div class='ctx'> - trigger:		See ../iio/timer/stm32-lptimer-trigger.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/stm32-timers.txt b/Documentation/devicetree/bindings/mfd/stm32-timers.txt<br/>index 0e900b52e895..15c3b87f51d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/stm32-timers.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/stm32-timers.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/stm32-timers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mfd/stm32-timers.txt</a></div><div class='hunk'>@@ -28,6 +28,7 @@ Optional parameters:</div><div class='ctx'> Optional subnodes:</div><div class='ctx'> - pwm:			See ../pwm/pwm-stm32.txt</div><div class='ctx'> - timer:		See ../iio/timer/stm32-timer-trigger.txt</div><div class='add'>+- counter:		See ../counter/stm32-timer-cnt.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	timers@40010000 {</div><div class='hunk'>@@ -48,6 +49,12 @@ Example:</div><div class='ctx'> 			compatible = "st,stm32-timer-trigger";</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		counter {</div><div class='add'>+			compatible = "st,stm32-timer-counter";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;tim1_in_pins&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> Example with all dmas:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/ti-lmu.txt b/Documentation/devicetree/bindings/mfd/ti-lmu.txt<br/>index c885cf89b8ce..980394d701a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/ti-lmu.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mfd/ti-lmu.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mfd/ti-lmu.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mfd/ti-lmu.txt</a></div><div class='hunk'>@@ -4,7 +4,6 @@ TI LMU driver supports lighting devices below.</div><div class='ctx'> </div><div class='ctx'>    Name                  Child nodes</div><div class='ctx'>   ------      ---------------------------------</div><div class='del'>-  LM3532       Backlight</div><div class='ctx'>   LM3631       Backlight and regulator</div><div class='ctx'>   LM3632       Backlight and regulator</div><div class='ctx'>   LM3633       Backlight, LED and fault monitor</div><div class='hunk'>@@ -13,7 +12,6 @@ TI LMU driver supports lighting devices below.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'>   - compatible: Should be one of:</div><div class='del'>-                "ti,lm3532"</div><div class='ctx'>                 "ti,lm3631"</div><div class='ctx'>                 "ti,lm3632"</div><div class='ctx'>                 "ti,lm3633"</div><div class='hunk'>@@ -23,7 +21,6 @@ Required properties:</div><div class='ctx'>          0x11 for LM3632</div><div class='ctx'>          0x29 for LM3631</div><div class='ctx'>          0x36 for LM3633, LM3697</div><div class='del'>-         0x38 for LM3532</div><div class='ctx'>          0x63 for LM3695</div><div class='ctx'> </div><div class='ctx'> Optional property:</div><div class='hunk'>@@ -47,23 +44,6 @@ Optional nodes:</div><div class='ctx'> [2] ../leds/leds-lm3633.txt</div><div class='ctx'> [3] ../regulator/lm363x-regulator.txt</div><div class='ctx'> </div><div class='del'>-lm3532@38 {</div><div class='del'>-	compatible = "ti,lm3532";</div><div class='del'>-	reg = &lt;0x38&gt;;</div><div class='del'>-</div><div class='del'>-	enable-gpios = &lt;&amp;pioC 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-</div><div class='del'>-	backlight {</div><div class='del'>-		compatible = "ti,lm3532-backlight";</div><div class='del'>-</div><div class='del'>-		lcd {</div><div class='del'>-			led-sources = &lt;0 1 2&gt;;</div><div class='del'>-			ramp-up-msec = &lt;30&gt;;</div><div class='del'>-			ramp-down-msec = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> lm3631@29 {</div><div class='ctx'> 	compatible = "ti,lm3631";</div><div class='ctx'> 	reg = &lt;0x29&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt<br/>new file mode 100644<br/>index 000000000000..854bd67ffec6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+======================================================================</div><div class='add'>+Device tree bindings for Aspeed AST2400/AST2500 PCI-to-AHB Bridge Control Driver</div><div class='add'>+======================================================================</div><div class='add'>+</div><div class='add'>+The bridge is available on platforms with the VGA enabled on the Aspeed device.</div><div class='add'>+In this case, the host has access to a 64KiB window into all of the BMC's</div><div class='add'>+memory.  The BMC can disable this bridge.  If the bridge is enabled, the host</div><div class='add'>+has read access to all the regions of memory, however the host only has read</div><div class='add'>+and write access depending on a register controlled by the BMC.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+ - compatible: must be one of:</div><div class='add'>+	- "aspeed,ast2400-p2a-ctrl"</div><div class='add'>+	- "aspeed,ast2500-p2a-ctrl"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+- memory-region: A phandle to a reserved_memory region to be used for the PCI</div><div class='add'>+		to AHB mapping</div><div class='add'>+</div><div class='add'>+The p2a-control node should be the child of a syscon node with the required</div><div class='add'>+property:</div><div class='add'>+</div><div class='add'>+- compatible : Should be one of the following:</div><div class='add'>+		"aspeed,ast2400-scu", "syscon", "simple-mfd"</div><div class='add'>+		"aspeed,g4-scu", "syscon", "simple-mfd"</div><div class='add'>+		"aspeed,ast2500-scu", "syscon", "simple-mfd"</div><div class='add'>+		"aspeed,g5-scu", "syscon", "simple-mfd"</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+g4 Example</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+syscon: scu@1e6e2000 {</div><div class='add'>+	compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd";</div><div class='add'>+	reg = &lt;0x1e6e2000 0x1a8&gt;;</div><div class='add'>+</div><div class='add'>+	p2a: p2a-control {</div><div class='add'>+		compatible = "aspeed,ast2400-p2a-ctrl";</div><div class='add'>+		memory-region = &lt;&amp;reserved_memory&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt<br/>index 99c5cf8507e8..edb8cadb9541 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/fsl-esdhc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mmc/fsl-esdhc.txt</a></div><div class='hunk'>@@ -17,6 +17,7 @@ Required properties:</div><div class='ctx'> 	"fsl,t4240-esdhc"</div><div class='ctx'>     Possible compatibles for ARM:</div><div class='ctx'> 	"fsl,ls1012a-esdhc"</div><div class='add'>+	"fsl,ls1028a-esdhc"</div><div class='ctx'> 	"fsl,ls1088a-esdhc"</div><div class='ctx'> 	"fsl,ls1043a-esdhc"</div><div class='ctx'> 	"fsl,ls1046a-esdhc"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt<br/>index 540c65ed9cba..f707b8bee304 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt</a></div><div class='hunk'>@@ -17,6 +17,7 @@ Required properties:</div><div class='ctx'> 	       "fsl,imx6sx-usdhc"</div><div class='ctx'> 	       "fsl,imx6ull-usdhc"</div><div class='ctx'> 	       "fsl,imx7d-usdhc"</div><div class='add'>+	       "fsl,imx7ulp-usdhc"</div><div class='ctx'> 	       "fsl,imx8qxp-usdhc"</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt<br/>index cdbcfd3a4ff2..c269dbe384fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/mmc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/mmc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/mmc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mmc/mmc.txt</a></div><div class='hunk'>@@ -64,6 +64,8 @@ Optional properties:</div><div class='ctx'>   whether pwrseq-simple is used. Default to 10ms if no available.</div><div class='ctx'> - supports-cqe : The presence of this property indicates that the corresponding</div><div class='ctx'>   MMC host controller supports HW command queue feature.</div><div class='add'>+- disable-cqe-dcmd: This property indicates that the MMC controller's command</div><div class='add'>+  queue engine (CQE) does not support direct commands (DCMDs).</div><div class='ctx'> </div><div class='ctx'> *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line</div><div class='ctx'> polarity properties, we have to fix the meaning of the "normal" and "inverted"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.txt b/Documentation/devicetree/bindings/mmc/mtk-sd.txt<br/>index f5bcda3980cc..8a532f4453f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/mtk-sd.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/mtk-sd.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/mtk-sd.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mmc/mtk-sd.txt</a></div><div class='hunk'>@@ -11,10 +11,12 @@ Required properties:</div><div class='ctx'> 	"mediatek,mt8135-mmc": for mmc host ip compatible with mt8135</div><div class='ctx'> 	"mediatek,mt8173-mmc": for mmc host ip compatible with mt8173</div><div class='ctx'> 	"mediatek,mt8183-mmc": for mmc host ip compatible with mt8183</div><div class='add'>+	"mediatek,mt8516-mmc": for mmc host ip compatible with mt8516</div><div class='ctx'> 	"mediatek,mt2701-mmc": for mmc host ip compatible with mt2701</div><div class='ctx'> 	"mediatek,mt2712-mmc": for mmc host ip compatible with mt2712</div><div class='ctx'> 	"mediatek,mt7622-mmc": for MT7622 SoC</div><div class='ctx'> 	"mediatek,mt7623-mmc", "mediatek,mt2701-mmc": for MT7623 SoC</div><div class='add'>+	"mediatek,mt7620-mmc", for MT7621 SoC (and others)</div><div class='ctx'> </div><div class='ctx'> - reg: physical base address of the controller and length</div><div class='ctx'> - interrupts: Should contain MSDC interrupt number</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt<br/>index 2cecdc71d94c..2cf3affa1be7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt</a></div><div class='hunk'>@@ -14,6 +14,7 @@ Required properties:</div><div class='ctx'>   - "nvidia,tegra124-sdhci": for Tegra124 and Tegra132</div><div class='ctx'>   - "nvidia,tegra210-sdhci": for Tegra210</div><div class='ctx'>   - "nvidia,tegra186-sdhci": for Tegra186</div><div class='add'>+  - "nvidia,tegra194-sdhci": for Tegra194</div><div class='ctx'> - clocks : Must contain one entry, for the module clock.</div><div class='ctx'>   See ../clocks/clock-bindings.txt for details.</div><div class='ctx'> - resets : Must contain an entry for each entry in reset-names.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/altera_tse.txt b/Documentation/devicetree/bindings/net/altera_tse.txt<br/>index 0e21df94a53f..0b7d4d3758ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/altera_tse.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/altera_tse.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/altera_tse.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/altera_tse.txt</a></div><div class='hunk'>@@ -46,9 +46,8 @@ Required properties:</div><div class='ctx'> 	- reg: phy id used to communicate to phy.</div><div class='ctx'> 	- device_type: Must be "ethernet-phy".</div><div class='ctx'> </div><div class='del'>-Optional properties:</div><div class='del'>-- local-mac-address: See ethernet.txt in the same directory.</div><div class='del'>-- max-frame-size: See ethernet.txt in the same directory.</div><div class='add'>+The MAC address will be determined using the optional properties defined in</div><div class='add'>+ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/amd-xgbe.txt b/Documentation/devicetree/bindings/net/amd-xgbe.txt<br/>index 93dcb79a5f16..9c27dfcd1133 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/amd-xgbe.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/amd-xgbe.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/amd-xgbe.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/amd-xgbe.txt</a></div><div class='hunk'>@@ -24,8 +24,6 @@ Required properties:</div><div class='ctx'> - phy-mode: See ethernet.txt file in the same directory</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- mac-address: mac address to be assigned to the device. Can be overridden</div><div class='del'>-  by UEFI.</div><div class='ctx'> - dma-coherent: Present if dma operations are coherent</div><div class='ctx'> - amd,per-channel-interrupt: Indicates that Rx and Tx complete will generate</div><div class='ctx'>   a unique interrupt for each DMA channel - this requires an additional</div><div class='hunk'>@@ -34,6 +32,9 @@ Optional properties:</div><div class='ctx'>     0 - 1GbE and 10GbE (default)</div><div class='ctx'>     1 - 2.5GbE and 10GbE</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties defined in</div><div class='add'>+ethernet.txt.</div><div class='add'>+</div><div class='ctx'> The following optional properties are represented by an array with each</div><div class='ctx'> value corresponding to a particular speed. The first array value represents</div><div class='ctx'> the setting for the 1GbE speed, the second value for the 2.5GbE speed and</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/brcm,amac.txt b/Documentation/devicetree/bindings/net/brcm,amac.txt<br/>index 0bfad656a9ff..0120ebe93262 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/brcm,amac.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/brcm,amac.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/brcm,amac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/brcm,amac.txt</a></div><div class='hunk'>@@ -16,8 +16,8 @@ Required properties:</div><div class='ctx'> 				registers (required for Northstar2)</div><div class='ctx'>  - interrupts:	Interrupt number</div><div class='ctx'> </div><div class='del'>-Optional properties:</div><div class='del'>-- mac-address:	See ethernet.txt file in the same directory</div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt<br/>index 3264e1978d25..7c7ac5eb0313 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/cpsw.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/cpsw.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/cpsw.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/cpsw.txt</a></div><div class='hunk'>@@ -49,10 +49,12 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - dual_emac_res_vlan	: Specifies VID to be used to segregate the ports</div><div class='del'>-- mac-address		: See ethernet.txt file in the same directory</div><div class='ctx'> - phy_id		: Specifies slave phy id (deprecated, use phy-handle)</div><div class='ctx'> - phy-handle		: See ethernet.txt file in the same directory</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Slave sub-nodes:</div><div class='ctx'> - fixed-link		: See fixed-link.txt file in the same directory</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/davinci_emac.txt b/Documentation/devicetree/bindings/net/davinci_emac.txt<br/>index 24c5cdaba8d2..5e3579e72e2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/davinci_emac.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/davinci_emac.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/davinci_emac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/davinci_emac.txt</a></div><div class='hunk'>@@ -23,6 +23,9 @@ Optional properties:</div><div class='ctx'> - ti,davinci-rmii-en: 1 byte, 1 means use RMII</div><div class='ctx'> - ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM?</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Example (enbw_cmc board):</div><div class='ctx'> 	eth0: emac@1e20000 {</div><div class='ctx'> 		compatible = "ti,davinci-dm6467-emac";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt b/Documentation/devicetree/bindings/net/dsa/dsa.txt<br/>index d66a5292b9d3..f66bb7ecdb82 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/dsa/dsa.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/dsa/dsa.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/dsa/dsa.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/dsa/dsa.txt</a></div><div class='hunk'>@@ -1,12 +1,6 @@</div><div class='ctx'> Distributed Switch Architecture Device Tree Bindings</div><div class='ctx'> ----------------------------------------------------</div><div class='ctx'> </div><div class='del'>-Two bindings exist, one of which has been deprecated due to</div><div class='del'>-limitations.</div><div class='del'>-</div><div class='del'>-Current Binding</div><div class='del'>----------------</div><div class='del'>-</div><div class='ctx'> Switches are true Linux devices and can be probed by any means. Once</div><div class='ctx'> probed, they register to the DSA framework, passing a node</div><div class='ctx'> pointer. This node is expected to fulfil the following binding, and</div><div class='hunk'>@@ -71,9 +65,8 @@ properties, described in binding documents:</div><div class='ctx'> 			  Documentation/devicetree/bindings/net/fixed-link.txt</div><div class='ctx'> 			  for details.</div><div class='ctx'> </div><div class='del'>-- local-mac-address	: See</div><div class='del'>-			  Documentation/devicetree/bindings/net/ethernet.txt</div><div class='del'>-			  for details.</div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Example</div><div class='ctx'> </div><div class='hunk'>@@ -262,152 +255,3 @@ linked into one DSA cluster.</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-Deprecated Binding</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-The deprecated binding makes use of a platform device to represent the</div><div class='del'>-switches. The switches themselves are not Linux devices, and make use</div><div class='del'>-of an MDIO bus for management.</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible		: Should be "marvell,dsa"</div><div class='del'>-- #address-cells	: Must be 2, first cell is the address on the MDIO bus</div><div class='del'>-			  and second cell is the address in the switch tree.</div><div class='del'>-			  Second cell is used only when cascading/chaining.</div><div class='del'>-- #size-cells		: Must be 0</div><div class='del'>-- dsa,ethernet		: Should be a phandle to a valid Ethernet device node</div><div class='del'>-- dsa,mii-bus		: Should be a phandle to a valid MDIO bus device node</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- interrupts		: property with a value describing the switch</div><div class='del'>-			  interrupt number (not supported by the driver)</div><div class='del'>-</div><div class='del'>-A DSA node can contain multiple switch chips which are therefore child nodes of</div><div class='del'>-the parent DSA node. The maximum number of allowed child nodes is 4</div><div class='del'>-(DSA_MAX_SWITCHES).</div><div class='del'>-Each of these switch child nodes should have the following required properties:</div><div class='del'>-</div><div class='del'>-- reg			: Contains two fields. The first one describes the</div><div class='del'>-			  address on the MII bus. The second is the switch</div><div class='del'>-			  number that must be unique in cascaded configurations</div><div class='del'>-- #address-cells	: Must be 1</div><div class='del'>-- #size-cells		: Must be 0</div><div class='del'>-</div><div class='del'>-A switch child node has the following optional property:</div><div class='del'>-</div><div class='del'>-- eeprom-length		: Set to the length of an EEPROM connected to the</div><div class='del'>-			  switch. Must be set if the switch can not detect</div><div class='del'>-			  the presence and/or size of a connected EEPROM,</div><div class='del'>-			  otherwise optional.</div><div class='del'>-</div><div class='del'>-A switch may have multiple "port" children nodes</div><div class='del'>-</div><div class='del'>-Each port children node must have the following mandatory properties:</div><div class='del'>-- reg			: Describes the port address in the switch</div><div class='del'>-- label			: Describes the label associated with this port, special</div><div class='del'>-			  labels are "cpu" to indicate a CPU port and "dsa" to</div><div class='del'>-			  indicate an uplink/downlink port.</div><div class='del'>-</div><div class='del'>-Note that a port labelled "dsa" will imply checking for the uplink phandle</div><div class='del'>-described below.</div><div class='del'>-</div><div class='del'>-Optional property:</div><div class='del'>-- link			: Should be a list of phandles to another switch's DSA port.</div><div class='del'>-			  This property is only used when switches are being</div><div class='del'>-			  chained/cascaded together. This port is used as outgoing port</div><div class='del'>-			  towards the phandle port, which can be more than one hop away.</div><div class='del'>-</div><div class='del'>-- phy-handle		: Phandle to a PHY on an external MDIO bus, not the</div><div class='del'>-			  switch internal one. See</div><div class='del'>-			  Documentation/devicetree/bindings/net/ethernet.txt</div><div class='del'>-			  for details.</div><div class='del'>-</div><div class='del'>-- phy-mode		: String representing the connection to the designated</div><div class='del'>-			  PHY node specified by the 'phy-handle' property. See</div><div class='del'>-			  Documentation/devicetree/bindings/net/ethernet.txt</div><div class='del'>-			  for details.</div><div class='del'>-</div><div class='del'>-- mii-bus		: Should be a phandle to a valid MDIO bus device node.</div><div class='del'>-			  This mii-bus will be used in preference to the</div><div class='del'>-			  global dsa,mii-bus defined above, for this switch.</div><div class='del'>-</div><div class='del'>-Optional subnodes:</div><div class='del'>-- fixed-link		: Fixed-link subnode describing a link to a non-MDIO</div><div class='del'>-			  managed entity. See</div><div class='del'>-			  Documentation/devicetree/bindings/net/fixed-link.txt</div><div class='del'>-			  for details.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-	dsa@0 {</div><div class='del'>-		compatible = "marvell,dsa";</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		interrupts = &lt;10&gt;;</div><div class='del'>-		dsa,ethernet = &lt;&amp;ethernet0&gt;;</div><div class='del'>-		dsa,mii-bus = &lt;&amp;mii_bus0&gt;;</div><div class='del'>-</div><div class='del'>-		switch@0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			reg = &lt;16 0&gt;;	/* MDIO address 16, switch 0 in tree */</div><div class='del'>-</div><div class='del'>-			port@0 {</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				label = "lan1";</div><div class='del'>-				phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			port@1 {</div><div class='del'>-				reg = &lt;1&gt;;</div><div class='del'>-				label = "lan2";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			port@5 {</div><div class='del'>-				reg = &lt;5&gt;;</div><div class='del'>-				label = "cpu";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			switch0port6: port@6 {</div><div class='del'>-				reg = &lt;6&gt;;</div><div class='del'>-				label = "dsa";</div><div class='del'>-				link = &lt;&amp;switch1port0</div><div class='del'>-				        &amp;switch2port0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		switch@1 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			reg = &lt;17 1&gt;;	/* MDIO address 17, switch 1 in tree */</div><div class='del'>-			mii-bus = &lt;&amp;mii_bus1&gt;;</div><div class='del'>-			reset-gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-</div><div class='del'>-			switch1port0: port@0 {</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				label = "dsa";</div><div class='del'>-				link = &lt;&amp;switch0port6&gt;;</div><div class='del'>-			};</div><div class='del'>-			switch1port1: port@1 {</div><div class='del'>-				reg = &lt;1&gt;;</div><div class='del'>-				label = "dsa";</div><div class='del'>-				link = &lt;&amp;switch2port1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		switch@2 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			reg = &lt;18 2&gt;;	/* MDIO address 18, switch 2 in tree */</div><div class='del'>-			mii-bus = &lt;&amp;mii_bus1&gt;;</div><div class='del'>-</div><div class='del'>-			switch2port0: port@0 {</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				label = "dsa";</div><div class='del'>-				link = &lt;&amp;switch1port1</div><div class='del'>-				        &amp;switch0port6&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/dsa/qca8k.txt b/Documentation/devicetree/bindings/net/dsa/qca8k.txt<br/>index bbcb255c3150..93a7469e70d4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/dsa/qca8k.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/dsa/qca8k.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/dsa/qca8k.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/dsa/qca8k.txt</a></div><div class='hunk'>@@ -12,10 +12,15 @@ Required properties:</div><div class='ctx'> Subnodes:</div><div class='ctx'> </div><div class='ctx'> The integrated switch subnode should be specified according to the binding</div><div class='del'>-described in dsa/dsa.txt. As the QCA8K switches do not have a N:N mapping of</div><div class='del'>-port and PHY id, each subnode describing a port needs to have a valid phandle</div><div class='del'>-referencing the internal PHY connected to it. The CPU port of this switch is</div><div class='del'>-always port 0.</div><div class='add'>+described in dsa/dsa.txt. If the QCA8K switch is connect to a SoC's external</div><div class='add'>+mdio-bus each subnode describing a port needs to have a valid phandle</div><div class='add'>+referencing the internal PHY it is connected to. This is because there's no</div><div class='add'>+N:N mapping of port and PHY id.</div><div class='add'>+</div><div class='add'>+Don't use mixed external and internal mdio-bus configurations, as this is</div><div class='add'>+not supported by the hardware.</div><div class='add'>+</div><div class='add'>+The CPU port of this switch is always port 0.</div><div class='ctx'> </div><div class='ctx'> A CPU port node has the following optional node:</div><div class='ctx'> </div><div class='hunk'>@@ -31,8 +36,9 @@ For QCA8K the 'fixed-link' sub-node supports only the following properties:</div><div class='ctx'> - 'full-duplex' (boolean, optional), to indicate that full duplex is</div><div class='ctx'>   used. When absent, half duplex is assumed.</div><div class='ctx'> </div><div class='del'>-Example:</div><div class='add'>+Examples:</div><div class='ctx'> </div><div class='add'>+for the external mdio-bus configuration:</div><div class='ctx'> </div><div class='ctx'> 	&amp;mdio0 {</div><div class='ctx'> 		phy_port1: phy@0 {</div><div class='hunk'>@@ -55,12 +61,12 @@ Example:</div><div class='ctx'> 			reg = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		switch0@0 {</div><div class='add'>+		switch@10 {</div><div class='ctx'> 			compatible = "qca,qca8337";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-			reg = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x10&gt;;</div><div class='ctx'> </div><div class='ctx'> 			ports {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -108,3 +114,56 @@ Example:</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+for the internal master mdio-bus configuration:</div><div class='add'>+</div><div class='add'>+	&amp;mdio0 {</div><div class='add'>+		switch@10 {</div><div class='add'>+			compatible = "qca,qca8337";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			reg = &lt;0x10&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					label = "cpu";</div><div class='add'>+					ethernet = &lt;&amp;gmac1&gt;;</div><div class='add'>+					phy-mode = "rgmii";</div><div class='add'>+					fixed-link {</div><div class='add'>+						speed = 1000;</div><div class='add'>+						full-duplex;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					label = "lan1";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@2 {</div><div class='add'>+					reg = &lt;2&gt;;</div><div class='add'>+					label = "lan2";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@3 {</div><div class='add'>+					reg = &lt;3&gt;;</div><div class='add'>+					label = "lan3";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@4 {</div><div class='add'>+					reg = &lt;4&gt;;</div><div class='add'>+					label = "lan4";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@5 {</div><div class='add'>+					reg = &lt;5&gt;;</div><div class='add'>+					label = "wan";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/dsa/sja1105.txt b/Documentation/devicetree/bindings/net/dsa/sja1105.txt<br/>new file mode 100644<br/>index 000000000000..13fd21074d48<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/dsa/sja1105.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/dsa/sja1105.txt</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+NXP SJA1105 switch driver</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible:</div><div class='add'>+	Must be one of:</div><div class='add'>+	- "nxp,sja1105e"</div><div class='add'>+	- "nxp,sja1105t"</div><div class='add'>+	- "nxp,sja1105p"</div><div class='add'>+	- "nxp,sja1105q"</div><div class='add'>+	- "nxp,sja1105r"</div><div class='add'>+	- "nxp,sja1105s"</div><div class='add'>+</div><div class='add'>+	Although the device ID could be detected at runtime, explicit bindings</div><div class='add'>+	are required in order to be able to statically check their validity.</div><div class='add'>+	For example, SGMII can only be specified on port 4 of R and S devices,</div><div class='add'>+	and the non-SGMII devices, while pin-compatible, are not equal in terms</div><div class='add'>+	of support for RGMII internal delays (supported on P/Q/R/S, but not on</div><div class='add'>+	E/T).</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- sja1105,role-mac:</div><div class='add'>+- sja1105,role-phy:</div><div class='add'>+	Boolean properties that can be assigned under each port node. By</div><div class='add'>+	default (unless otherwise specified) a port is configured as MAC if it</div><div class='add'>+	is driving a PHY (phy-handle is present) or as PHY if it is PHY-less</div><div class='add'>+	(fixed-link specified, presumably because it is connected to a MAC).</div><div class='add'>+	The effect of this property (in either its implicit or explicit form)</div><div class='add'>+	is:</div><div class='add'>+	- In the case of MII or RMII it specifies whether the SJA1105 port is a</div><div class='add'>+	  clock source or sink for this interface (not applicable for RGMII</div><div class='add'>+	  where there is a Tx and an Rx clock).</div><div class='add'>+	- In the case of RGMII it affects the behavior regarding internal</div><div class='add'>+	  delays:</div><div class='add'>+	  1. If sja1105,role-mac is specified, and the phy-mode property is one</div><div class='add'>+	     of "rgmii-id", "rgmii-txid" or "rgmii-rxid", then the entity</div><div class='add'>+	     designated to apply the delay/clock skew necessary for RGMII</div><div class='add'>+	     is the PHY. The SJA1105 MAC does not apply any internal delays.</div><div class='add'>+	  2. If sja1105,role-phy is specified, and the phy-mode property is one</div><div class='add'>+	     of the above, the designated entity to apply the internal delays</div><div class='add'>+	     is the SJA1105 MAC (if hardware-supported). This is only supported</div><div class='add'>+	     by the second-generation (P/Q/R/S) hardware. On a first-generation</div><div class='add'>+	     E or T device, it is an error to specify an RGMII phy-mode other</div><div class='add'>+	     than "rgmii" for a port that is in fixed-link mode. In that case,</div><div class='add'>+	     the clock skew must either be added by the MAC at the other end of</div><div class='add'>+	     the fixed-link, or by PCB serpentine traces on the board.</div><div class='add'>+	These properties are required, for example, in the case where SJA1105</div><div class='add'>+	ports are at both ends of a MII/RMII PHY-less setup. One end would need</div><div class='add'>+	to have sja1105,role-mac, while the other sja1105,role-phy.</div><div class='add'>+</div><div class='add'>+See Documentation/devicetree/bindings/net/dsa/dsa.txt for the list of standard</div><div class='add'>+DSA required and optional properties.</div><div class='add'>+</div><div class='add'>+Other observations</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The SJA1105 SPI interface requires a CS-to-CLK time (t2 in UM10944) of at least</div><div class='add'>+one half of t_CLK. At an SPI frequency of 1MHz, this means a minimum</div><div class='add'>+cs_sck_delay of 500ns. Ensuring that this SPI timing requirement is observed</div><div class='add'>+depends on the SPI bus master driver.</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+Ethernet switch connected via SPI to the host, CPU port wired to enet2:</div><div class='add'>+</div><div class='add'>+arch/arm/boot/dts/ls1021a-tsn.dts:</div><div class='add'>+</div><div class='add'>+/* SPI controller of the LS1021 */</div><div class='add'>+&amp;dspi0 {</div><div class='add'>+	sja1105@1 {</div><div class='add'>+		reg = &lt;0x1&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "nxp,sja1105t";</div><div class='add'>+		spi-max-frequency = &lt;4000000&gt;;</div><div class='add'>+		fsl,spi-cs-sck-delay = &lt;1000&gt;;</div><div class='add'>+		fsl,spi-sck-cs-delay = &lt;1000&gt;;</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			port@0 {</div><div class='add'>+				/* ETH5 written on chassis */</div><div class='add'>+				label = "swp5";</div><div class='add'>+				phy-handle = &lt;&amp;rgmii_phy6&gt;;</div><div class='add'>+				phy-mode = "rgmii-id";</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				/* Implicit "sja1105,role-mac;" */</div><div class='add'>+			};</div><div class='add'>+			port@1 {</div><div class='add'>+				/* ETH2 written on chassis */</div><div class='add'>+				label = "swp2";</div><div class='add'>+				phy-handle = &lt;&amp;rgmii_phy3&gt;;</div><div class='add'>+				phy-mode = "rgmii-id";</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				/* Implicit "sja1105,role-mac;" */</div><div class='add'>+			};</div><div class='add'>+			port@2 {</div><div class='add'>+				/* ETH3 written on chassis */</div><div class='add'>+				label = "swp3";</div><div class='add'>+				phy-handle = &lt;&amp;rgmii_phy4&gt;;</div><div class='add'>+				phy-mode = "rgmii-id";</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				/* Implicit "sja1105,role-mac;" */</div><div class='add'>+			};</div><div class='add'>+			port@3 {</div><div class='add'>+				/* ETH4 written on chassis */</div><div class='add'>+				phy-handle = &lt;&amp;rgmii_phy5&gt;;</div><div class='add'>+				label = "swp4";</div><div class='add'>+				phy-mode = "rgmii-id";</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				/* Implicit "sja1105,role-mac;" */</div><div class='add'>+			};</div><div class='add'>+			port@4 {</div><div class='add'>+				/* Internal port connected to eth2 */</div><div class='add'>+				ethernet = &lt;&amp;enet2&gt;;</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				/* Implicit "sja1105,role-phy;" */</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</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'>+/* MDIO controller of the LS1021 */</div><div class='add'>+&amp;mdio0 {</div><div class='add'>+	/* BCM5464 */</div><div class='add'>+	rgmii_phy3: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;0x3&gt;;</div><div class='add'>+	};</div><div class='add'>+	rgmii_phy4: ethernet-phy@4 {</div><div class='add'>+		reg = &lt;0x4&gt;;</div><div class='add'>+	};</div><div class='add'>+	rgmii_phy5: ethernet-phy@5 {</div><div class='add'>+		reg = &lt;0x5&gt;;</div><div class='add'>+	};</div><div class='add'>+	rgmii_phy6: ethernet-phy@6 {</div><div class='add'>+		reg = &lt;0x6&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ethernet master port of the LS1021 */</div><div class='add'>+&amp;enet2 {</div><div class='add'>+	phy-connection-type = "rgmii";</div><div class='add'>+	status = "ok";</div><div class='add'>+	fixed-link {</div><div class='add'>+		speed = &lt;1000&gt;;</div><div class='add'>+		full-duplex;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt<br/>index cfc376bc977a..e88c3641d613 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/ethernet.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/ethernet.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/ethernet.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/ethernet.txt</a></div><div class='hunk'>@@ -4,21 +4,22 @@ NOTE: All 'phy*' properties documented below are Ethernet specific. For the</div><div class='ctx'> generic PHY 'phys' property, see</div><div class='ctx'> Documentation/devicetree/bindings/phy/phy-bindings.txt.</div><div class='ctx'> </div><div class='del'>-- local-mac-address: array of 6 bytes, specifies the MAC address that was</div><div class='del'>-  assigned to the network device;</div><div class='ctx'> - mac-address: array of 6 bytes, specifies the MAC address that was last used by</div><div class='ctx'>   the boot program; should be used in cases where the MAC address assigned to</div><div class='ctx'>   the device by the boot program is different from the "local-mac-address"</div><div class='ctx'>   property;</div><div class='del'>-- nvmem-cells: phandle, reference to an nvmem node for the MAC address;</div><div class='del'>-- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used;</div><div class='add'>+- local-mac-address: array of 6 bytes, specifies the MAC address that was</div><div class='add'>+  assigned to the network device;</div><div class='add'>+- nvmem-cells: phandle, reference to an nvmem node for the MAC address</div><div class='add'>+- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used</div><div class='ctx'> - max-speed: number, specifies maximum speed in Mbit/s supported by the device;</div><div class='ctx'> - max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than</div><div class='ctx'>   the maximum frame size (there's contradiction in the Devicetree</div><div class='ctx'>   Specification).</div><div class='ctx'> - phy-mode: string, operation mode of the PHY interface. This is now a de-facto</div><div class='ctx'>   standard property; supported values are:</div><div class='del'>-  * "internal"</div><div class='add'>+  * "internal" (Internal means there is not a standard bus between the MAC and</div><div class='add'>+     the PHY, something proprietary is being used to embed the PHY in the MAC.)</div><div class='ctx'>   * "mii"</div><div class='ctx'>   * "gmii"</div><div class='ctx'>   * "sgmii"</div><div class='hunk'>@@ -37,7 +38,7 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt.</div><div class='ctx'>   * "smii"</div><div class='ctx'>   * "xgmii"</div><div class='ctx'>   * "trgmii"</div><div class='del'>-  * "2000base-x",</div><div class='add'>+  * "1000base-x",</div><div class='ctx'>   * "2500base-x",</div><div class='ctx'>   * "rxaui"</div><div class='ctx'>   * "xaui"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/hisilicon-femac.txt b/Documentation/devicetree/bindings/net/hisilicon-femac.txt<br/>index d11af5ecace8..5f96976f3cea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/hisilicon-femac.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/hisilicon-femac.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/hisilicon-femac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/hisilicon-femac.txt</a></div><div class='hunk'>@@ -14,7 +14,6 @@ Required properties:</div><div class='ctx'> 	the PHY reset signal(optional).</div><div class='ctx'> - reset-names: should contain the reset signal name "mac"(required)</div><div class='ctx'> 	and "phy"(optional).</div><div class='del'>-- mac-address: see ethernet.txt [1].</div><div class='ctx'> - phy-mode: see ethernet.txt [1].</div><div class='ctx'> - phy-handle: see ethernet.txt [1].</div><div class='ctx'> - hisilicon,phy-reset-delays-us: triplet of delays if PHY reset signal given.</div><div class='hunk'>@@ -22,6 +21,9 @@ Required properties:</div><div class='ctx'> 	The 2nd cell is reset pulse in micro seconds.</div><div class='ctx'> 	The 3rd cell is reset post-delay in micro seconds.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt[1].</div><div class='add'>+</div><div class='ctx'> [1] Documentation/devicetree/bindings/net/ethernet.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt<br/>index eea73adc678f..cddf46bf6b63 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt</a></div><div class='hunk'>@@ -18,7 +18,6 @@ Required properties:</div><div class='ctx'> - #size-cells: must be &lt;0&gt;.</div><div class='ctx'> - phy-mode: see ethernet.txt [1].</div><div class='ctx'> - phy-handle: see ethernet.txt [1].</div><div class='del'>-- mac-address: see ethernet.txt [1].</div><div class='ctx'> - clocks: clock phandle and specifier pair.</div><div class='ctx'> - clock-names: contain the clock name "mac_core"(required) and "mac_ifc"(optional).</div><div class='ctx'> - resets: should contain the phandle to the MAC core reset signal(optional),</div><div class='hunk'>@@ -31,6 +30,9 @@ Required properties:</div><div class='ctx'> 	The 2nd cell is reset pulse in micro seconds.</div><div class='ctx'> 	The 3rd cell is reset post-delay in micro seconds.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the properties defined in</div><div class='add'>+ethernet.txt[1].</div><div class='add'>+</div><div class='ctx'> - PHY subnode: inherits from phy binding [2]</div><div class='ctx'> </div><div class='ctx'> [1] Documentation/devicetree/bindings/net/ethernet.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/keystone-netcp.txt b/Documentation/devicetree/bindings/net/keystone-netcp.txt<br/>index 04ba1dc34fd6..3a65aabc76a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/keystone-netcp.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/keystone-netcp.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/keystone-netcp.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/keystone-netcp.txt</a></div><div class='hunk'>@@ -135,14 +135,14 @@ Optional properties:</div><div class='ctx'> 		are swapped.  The netcp driver will swap the two DWORDs</div><div class='ctx'> 		back to the proper order when this property is set to 2</div><div class='ctx'> 		when it obtains the mac address from efuse.</div><div class='del'>-- local-mac-address:	the driver is designed to use the of_get_mac_address api</div><div class='del'>-			only if efuse-mac is 0. When efuse-mac is 0, the MAC</div><div class='del'>-			address is obtained from local-mac-address. If this</div><div class='del'>-			attribute is not present, then the driver will use a</div><div class='del'>-			random MAC address.</div><div class='ctx'> - "netcp-device label":	phandle to the device specification for each of NetCP</div><div class='ctx'> 			sub-module attached to this interface.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties defined in</div><div class='add'>+ethernet.txt, as provided by the of_get_mac_address API and only if efuse-mac</div><div class='add'>+is set to 0. If any of the optional MAC address properties are not present,</div><div class='add'>+then the driver will use random MAC address.</div><div class='add'>+</div><div class='ctx'> Example binding:</div><div class='ctx'> </div><div class='ctx'> netcp: netcp@2000000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt<br/>index 174f292d8a3e..9c5e94482b5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/macb.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/macb.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/macb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/macb.txt</a></div><div class='hunk'>@@ -26,6 +26,9 @@ Required properties:</div><div class='ctx'> 	Optional elements: 'tsu_clk'</div><div class='ctx'> - clocks: Phandles to input clocks.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Optional properties for PHY child node:</div><div class='ctx'> - reset-gpios : Should specify the gpio for phy reset</div><div class='ctx'> - magic-packet : If present, indicates that the hardware supports waking</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/marvell-pxa168.txt b/Documentation/devicetree/bindings/net/marvell-pxa168.txt<br/>index 845a148a346e..5574af3554aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/marvell-pxa168.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/marvell-pxa168.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/marvell-pxa168.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/marvell-pxa168.txt</a></div><div class='hunk'>@@ -11,7 +11,9 @@ Optional properties:</div><div class='ctx'> - #address-cells: must be 1 when using sub-nodes.</div><div class='ctx'> - #size-cells: must be 0 when using sub-nodes.</div><div class='ctx'> - phy-handle: see ethernet.txt file in the same directory.</div><div class='del'>-- local-mac-address: see ethernet.txt file in the same directory.</div><div class='add'>+</div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Sub-nodes:</div><div class='ctx'> Each PHY can be represented as a sub-node. This is not mandatory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt b/Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt<br/>new file mode 100644<br/>index 000000000000..3a96cbed9294<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+Properties for the MDIO bus multiplexer/glue of Amlogic G12a SoC family.</div><div class='add'>+</div><div class='add'>+This is a special case of a MDIO bus multiplexer. It allows to choose between</div><div class='add'>+the internal mdio bus leading to the embedded 10/100 PHY or the external</div><div class='add'>+MDIO bus.</div><div class='add'>+</div><div class='add'>+Required properties in addition to the generic multiplexer properties:</div><div class='add'>+- compatible : amlogic,g12a-mdio-mux</div><div class='add'>+- reg: physical address and length of the multiplexer/glue registers</div><div class='add'>+- clocks: list of clock phandle, one for each entry clock-names.</div><div class='add'>+- clock-names: should contain the following:</div><div class='add'>+  * "pclk"   : peripheral clock.</div><div class='add'>+  * "clkin0" : platform crytal</div><div class='add'>+  * "clkin1" : SoC 50MHz MPLL</div><div class='add'>+</div><div class='add'>+Example :</div><div class='add'>+</div><div class='add'>+mdio_mux: mdio-multiplexer@4c000 {</div><div class='add'>+	compatible = "amlogic,g12a-mdio-mux";</div><div class='add'>+	reg = &lt;0x0 0x4c000 0x0 0xa4&gt;;</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_ETH_PHY&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_MPLL_5OM&gt;;</div><div class='add'>+	clock-names = "pclk", "clkin0", "clkin1";</div><div class='add'>+	mdio-parent-bus = &lt;&amp;mdio0&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	ext_mdio: mdio@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int_mdio: mdio@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		internal_ephy: ethernet-phy@8 {</div><div class='add'>+			compatible = "ethernet-phy-id0180.3301",</div><div class='add'>+				     "ethernet-phy-ieee802.3-c22";</div><div class='add'>+			interrupts = &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg = &lt;8&gt;;</div><div class='add'>+			max-speed = &lt;100&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/microchip,enc28j60.txt b/Documentation/devicetree/bindings/net/microchip,enc28j60.txt<br/>index 24626e082b83..a8275921a896 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/microchip,enc28j60.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/microchip,enc28j60.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/microchip,enc28j60.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/microchip,enc28j60.txt</a></div><div class='hunk'>@@ -21,8 +21,9 @@ Optional properties:</div><div class='ctx'> - spi-max-frequency: Maximum frequency of the SPI bus when accessing the ENC28J60.</div><div class='ctx'>   According to the ENC28J80 datasheet, the chip allows a maximum of 20 MHz, however,</div><div class='ctx'>   board designs may need to limit this value.</div><div class='del'>-- local-mac-address: See ethernet.txt in the same directory.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Example (for NXP i.MX28 with pin control stuff for GPIO irq):</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt<br/>index 76786a0f6d3d..11a679530ae6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/microchip,lan78xx.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/microchip,lan78xx.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/microchip,lan78xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/microchip,lan78xx.txt</a></div><div class='hunk'>@@ -7,9 +7,8 @@ The Device Tree properties, if present, override the OTP and EEPROM.</div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: Should be one of "usb424,7800", "usb424,7801" or "usb424,7850".</div><div class='ctx'> </div><div class='del'>-Optional properties:</div><div class='del'>-- local-mac-address:   see ethernet.txt</div><div class='del'>-- mac-address:         see ethernet.txt</div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Optional properties of the embedded PHY:</div><div class='ctx'> - microchip,led-modes: a 0..4 element vector, with each element configuring</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt<br/>index 17c1d2bd00f6..9b9e5b1765dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/phy.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/phy.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/phy.txt</a></div><div class='hunk'>@@ -51,6 +51,10 @@ Optional Properties:</div><div class='ctx'>   to ensure the integrated PHY is used. The absence of this property indicates</div><div class='ctx'>   the muxers should be configured so that the external PHY is used.</div><div class='ctx'> </div><div class='add'>+- resets: The reset-controller phandle and specifier for the PHY reset signal.</div><div class='add'>+</div><div class='add'>+- reset-names: Must be "phy" for the PHY reset signal.</div><div class='add'>+</div><div class='ctx'> - reset-gpios: The GPIO phandle and specifier for the PHY reset signal.</div><div class='ctx'> </div><div class='ctx'> - reset-assert-us: Delay after the reset was asserted in microseconds.</div><div class='hunk'>@@ -67,6 +71,8 @@ ethernet-phy@0 {</div><div class='ctx'> 	interrupts = &lt;35 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 	reg = &lt;0&gt;;</div><div class='ctx'> </div><div class='add'>+	resets = &lt;&amp;rst 8&gt;;</div><div class='add'>+	reset-names = "phy";</div><div class='ctx'> 	reset-gpios = &lt;&amp;gpio1 4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	reset-assert-us = &lt;1000&gt;;</div><div class='ctx'> 	reset-deassert-us = &lt;2000&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/qca,qca7000.txt b/Documentation/devicetree/bindings/net/qca,qca7000.txt<br/>index e4a8a51086df..21c36e524993 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/qca,qca7000.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/qca,qca7000.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/qca,qca7000.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/qca,qca7000.txt</a></div><div class='hunk'>@@ -23,7 +23,6 @@ Optional properties:</div><div class='ctx'> 		      Numbers smaller than 1000000 or greater than 16000000</div><div class='ctx'> 		      are invalid. Missing the property will set the SPI</div><div class='ctx'> 		      frequency to 8000000 Hertz.</div><div class='del'>-- local-mac-address : see ./ethernet.txt</div><div class='ctx'> - qca,legacy-mode   : Set the SPI data transfer of the QCA7000 to legacy mode.</div><div class='ctx'> 		      In this mode the SPI master must toggle the chip select</div><div class='ctx'> 		      between each data word. In burst mode these gaps aren't</div><div class='hunk'>@@ -31,6 +30,9 @@ Optional properties:</div><div class='ctx'> 		      the QCA7000 is setup via GPIO pin strapping. If the</div><div class='ctx'> 		      property is missing the driver defaults to burst mode.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> SPI Example:</div><div class='ctx'> </div><div class='ctx'> /* Freescale i.MX28 SPI master*/</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt<br/>index 824c0e23c544..7ef6118abd3d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt</a></div><div class='hunk'>@@ -11,20 +11,21 @@ Required properties:</div><div class='ctx'>  - compatible: should contain one of the following:</div><div class='ctx'>    * "qcom,qca6174-bt"</div><div class='ctx'>    * "qcom,wcn3990-bt"</div><div class='add'>+   * "qcom,wcn3998-bt"</div><div class='ctx'> </div><div class='ctx'> Optional properties for compatible string qcom,qca6174-bt:</div><div class='ctx'> </div><div class='ctx'>  - enable-gpios: gpio specifier used to enable chip</div><div class='ctx'>  - clocks: clock provided to the controller (SUSCLK_32KHZ)</div><div class='ctx'> </div><div class='del'>-Required properties for compatible string qcom,wcn3990-bt:</div><div class='add'>+Required properties for compatible string qcom,wcn399x-bt:</div><div class='ctx'> </div><div class='ctx'>  - vddio-supply: VDD_IO supply regulator handle.</div><div class='ctx'>  - vddxo-supply: VDD_XO supply regulator handle.</div><div class='ctx'>  - vddrf-supply: VDD_RF supply regulator handle.</div><div class='ctx'>  - vddch0-supply: VDD_CH0 supply regulator handle.</div><div class='ctx'> </div><div class='del'>-Optional properties for compatible string qcom,wcn3990-bt:</div><div class='add'>+Optional properties for compatible string qcom,wcn399x-bt:</div><div class='ctx'> </div><div class='ctx'>  - max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/samsung-sxgbe.txt b/Documentation/devicetree/bindings/net/samsung-sxgbe.txt<br/>index 46e591178911..2cff6d8a585a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/samsung-sxgbe.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/samsung-sxgbe.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/samsung-sxgbe.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/samsung-sxgbe.txt</a></div><div class='hunk'>@@ -21,10 +21,12 @@ Required properties:</div><div class='ctx'>   range.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- mac-address: 6 bytes, mac address</div><div class='ctx'> - max-frame-size: Maximum Transfer Unit (IEEE defined MTU), rather</div><div class='ctx'> 		  than the maximum frame size.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt b/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt<br/>index 36f1aef585f0..ad3c6e109ce1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</a></div><div class='hunk'>@@ -103,8 +103,6 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - dma-coherent: Present if dma operations are coherent</div><div class='del'>-- mac-address: See ethernet.txt in the same directory</div><div class='del'>-- local-mac-address: See ethernet.txt in the same directory</div><div class='ctx'> - phy-reset-gpios: Phandle and specifier for any GPIO used to reset the PHY.</div><div class='ctx'>   See ../gpio/gpio.txt.</div><div class='ctx'> - snps,en-lpi: If present it enables use of the AXI low-power interface</div><div class='hunk'>@@ -133,6 +131,9 @@ Optional properties:</div><div class='ctx'>     - device_type: Must be "ethernet-phy".</div><div class='ctx'>     - fixed-mode device tree subnode: see fixed-link.txt in the same directory</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Examples:</div><div class='ctx'> ethernet2@40010000 {</div><div class='ctx'> 	clock-names = "phy_ref_clk", "apb_pclk";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt<br/>index fc8f01718690..4e85fc495e87 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt</a></div><div class='hunk'>@@ -31,8 +31,8 @@ Required properties:</div><div class='ctx'>  - socionext,syscon-phy-mode: A phandle to syscon with one argument</div><div class='ctx'> 	that configures phy mode. The argument is the ID of MAC instance.</div><div class='ctx'> </div><div class='del'>-Optional properties:</div><div class='del'>- - local-mac-address: See ethernet.txt in the same directory.</div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> Required subnode:</div><div class='ctx'>  - mdio: A container for child nodes representing phy nodes.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/socionext-netsec.txt b/Documentation/devicetree/bindings/net/socionext-netsec.txt<br/>index 0cff94fb0433..9d6c9feb12ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/socionext-netsec.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/socionext-netsec.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/socionext-netsec.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/socionext-netsec.txt</a></div><div class='hunk'>@@ -26,11 +26,12 @@ Required properties:</div><div class='ctx'> Optional properties: (See ethernet.txt file in the same directory)</div><div class='ctx'> - dma-coherent: Boolean property, must only be present if memory</div><div class='ctx'> 	accesses performed by the device are cache coherent.</div><div class='del'>-- local-mac-address: See ethernet.txt in the same directory.</div><div class='del'>-- mac-address: See ethernet.txt in the same directory.</div><div class='ctx'> - max-speed: See ethernet.txt in the same directory.</div><div class='ctx'> - max-frame-size: See ethernet.txt in the same directory.</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties</div><div class='add'>+defined in ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> 	eth0: ethernet@522d0000 {</div><div class='ctx'> 		compatible = "socionext,synquacer-netsec";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt<br/>index 7b9a776230c0..74665502f4cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt</a></div><div class='hunk'>@@ -13,11 +13,12 @@ properties:</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> </div><div class='del'>-- mac-address: See ethernet.txt in the parent directory</div><div class='del'>-- local-mac-address: See ethernet.txt in the parent directory</div><div class='ctx'> - ieee80211-freq-limit: See ieee80211.txt</div><div class='ctx'> - mediatek,mtd-eeprom: Specify a MTD partition + offset containing EEPROM data</div><div class='ctx'> </div><div class='add'>+The driver is using of_get_mac_address API, so the MAC address can be as well</div><div class='add'>+be set with corresponding optional properties defined in net/ethernet.txt.</div><div class='add'>+</div><div class='ctx'> Optional nodes:</div><div class='ctx'> - led: Properties for a connected LED</div><div class='ctx'>   Optional properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt b/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt<br/>index b7396c8c271c..aaaeeb5f935b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt</a></div><div class='hunk'>@@ -34,9 +34,9 @@ Optional properties:</div><div class='ctx'> 			ath9k wireless chip (in this case the calibration /</div><div class='ctx'> 			EEPROM data will be loaded from userspace using the</div><div class='ctx'> 			kernel firmware loader).</div><div class='del'>-- mac-address: See ethernet.txt in the parent directory</div><div class='del'>-- local-mac-address: See ethernet.txt in the parent directory</div><div class='ctx'> </div><div class='add'>+The MAC address will be determined using the optional properties defined in</div><div class='add'>+net/ethernet.txt.</div><div class='ctx'> </div><div class='ctx'> In this example, the node is defined as child node of the PCI controller:</div><div class='ctx'> &amp;pci0 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt<br/>index 99c4ba6a3f61..cfb18b4ef8f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt</a></div><div class='hunk'>@@ -8,11 +8,12 @@ Required properties:</div><div class='ctx'>   "allwinner,sun8i-h3-sid"</div><div class='ctx'>   "allwinner,sun50i-a64-sid"</div><div class='ctx'>   "allwinner,sun50i-h5-sid"</div><div class='add'>+  "allwinner,sun50i-h6-sid"</div><div class='ctx'> </div><div class='ctx'> - reg: Should contain registers location and length</div><div class='ctx'> </div><div class='ctx'> = Data cells =</div><div class='del'>-Are child nodes of qfprom, bindings of which as described in</div><div class='add'>+Are child nodes of sunxi-sid, bindings of which as described in</div><div class='ctx'> bindings/nvmem/nvmem.txt</div><div class='ctx'> </div><div class='ctx'> Example for sun4i:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt<br/>index 7a999a135e56..68f7d6fdd140 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/nvmem/imx-ocotp.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/nvmem/imx-ocotp.txt</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings</div><div class='ctx'> </div><div class='ctx'> This binding represents the on-chip eFuse OTP controller found on</div><div class='del'>-i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX, i.MX6UL, i.MX6ULL/ULZ and i.MX6SLL SoCs.</div><div class='add'>+i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX, i.MX6UL, i.MX6ULL/ULZ, i.MX6SLL,</div><div class='add'>+i.MX7D/S, i.MX7ULP and i.MX8MQ SoCs.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be one of</div><div class='hunk'>@@ -13,6 +14,7 @@ Required properties:</div><div class='ctx'> 	"fsl,imx7d-ocotp" (i.MX7D/S),</div><div class='ctx'> 	"fsl,imx6sll-ocotp" (i.MX6SLL),</div><div class='ctx'> 	"fsl,imx7ulp-ocotp" (i.MX7ULP),</div><div class='add'>+	"fsl,imx8mq-ocotp" (i.MX8MQ),</div><div class='ctx'> 	followed by "syscon".</div><div class='ctx'> - #address-cells : Should be 1</div><div class='ctx'> - #size-cells : Should be 1</div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt b/Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt<br/>new file mode 100644<br/>index 000000000000..142a51d5a9be<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+STMicroelectronics STM32 Factory-programmed data device tree bindings</div><div class='add'>+</div><div class='add'>+This represents STM32 Factory-programmed read only non-volatile area: locked</div><div class='add'>+flash, OTP, read-only HW regs... This contains various information such as:</div><div class='add'>+analog calibration data for temperature sensor (e.g. TS_CAL1, TS_CAL2),</div><div class='add'>+internal vref (VREFIN_CAL), unique device ID...</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:		Should be one of:</div><div class='add'>+			"st,stm32f4-otp"</div><div class='add'>+			"st,stm32mp15-bsec"</div><div class='add'>+- reg:			Offset and length of factory-programmed area.</div><div class='add'>+- #address-cells:	Should be '&lt;1&gt;'.</div><div class='add'>+- #size-cells:		Should be '&lt;1&gt;'.</div><div class='add'>+</div><div class='add'>+Optional Data cells:</div><div class='add'>+- Must be child nodes as described in nvmem.txt.</div><div class='add'>+</div><div class='add'>+Example on stm32f4:</div><div class='add'>+	romem: nvmem@1fff7800 {</div><div class='add'>+		compatible = "st,stm32f4-otp";</div><div class='add'>+		reg = &lt;0x1fff7800 0x400&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* Data cells: ts_cal1 at 0x1fff7a2c */</div><div class='add'>+		ts_cal1: calib@22c {</div><div class='add'>+			reg = &lt;0x22c 0x2&gt;;</div><div class='add'>+		};</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt b/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt<br/>new file mode 100644<br/>index 000000000000..4ba298966af9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+Broadcom Stingray USB PHY</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible : should be one of the listed compatibles</div><div class='add'>+	- "brcm,sr-usb-combo-phy" is combo PHY has two PHYs, one SS and one HS.</div><div class='add'>+	- "brcm,sr-usb-hs-phy" is a single HS PHY.</div><div class='add'>+ - reg: offset and length of the PHY blocks registers</div><div class='add'>+ - #phy-cells:</div><div class='add'>+   - Must be 1 for brcm,sr-usb-combo-phy as it expects one argument to indicate</div><div class='add'>+     the PHY number of two PHYs. 0 for HS PHY and 1 for SS PHY.</div><div class='add'>+   - Must be 0 for brcm,sr-usb-hs-phy.</div><div class='add'>+</div><div class='add'>+Refer to phy/phy-bindings.txt for the generic PHY binding properties</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	usbphy0: usb-phy@0 {</div><div class='add'>+		compatible = "brcm,sr-usb-combo-phy";</div><div class='add'>+		reg = &lt;0x00000000 0x100&gt;;</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usbphy1: usb-phy@10000 {</div><div class='add'>+		compatible = "brcm,sr-usb-combo-phy";</div><div class='add'>+		reg = &lt;0x00010000 0x100&gt;,</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usbphy2: usb-phy@20000 {</div><div class='add'>+		compatible = "brcm,sr-usb-hs-phy";</div><div class='add'>+		reg = &lt;0x00020000 0x100&gt;,</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt<br/>index a22e853d710c..ed47e5cd067e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt</a></div><div class='hunk'>@@ -7,6 +7,9 @@ Required properties:</div><div class='ctx'> - clocks:	phandles to the clocks for each clock listed in clock-names</div><div class='ctx'> - clock-names:	must contain "phy"</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+- vbus-supply: A phandle to the regulator for USB VBUS.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> 	usb3_phy0: phy@381f0040 {</div><div class='ctx'> 		compatible = "fsl,imx8mq-usb-phy";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt<br/>new file mode 100644<br/>index 000000000000..a6ebc3dea159<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+* Amlogic G12A USB2 PHY binding</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	Should be "amlogic,meson-g12a-usb2-phy"</div><div class='add'>+- reg:		The base address and length of the registers</div><div class='add'>+- #phys-cells:	must be 0 (see phy-bindings.txt in this directory)</div><div class='add'>+- clocks:	a phandle to the clock of this PHY</div><div class='add'>+- clock-names:	must be "xtal"</div><div class='add'>+- resets:	a phandle to the reset line of this PHY</div><div class='add'>+- reset-names:	must be "phy"</div><div class='add'>+- phy-supply:	see phy-bindings.txt in this directory</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	usb2_phy0: phy@36000 {</div><div class='add'>+		compatible = "amlogic,g12a-usb2-phy";</div><div class='add'>+		reg = &lt;0x0 0x36000 0x0 0x2000&gt;;</div><div class='add'>+		clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+		clock-names = "xtal";</div><div class='add'>+		resets = &lt;&amp;reset RESET_USB_PHY21&gt;;</div><div class='add'>+		reset-names = "phy";</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt<br/>new file mode 100644<br/>index 000000000000..7cfc17e2df31<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+* Amlogic G12A USB3 + PCIE Combo PHY binding</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	Should be "amlogic,meson-g12a-usb3-pcie-phy"</div><div class='add'>+- #phys-cells:	must be 1. The cell number is used to select the phy mode</div><div class='add'>+  as defined in &lt;dt-bindings/phy/phy.h&gt; between PHY_TYPE_USB3 and PHY_TYPE_PCIE</div><div class='add'>+- reg:		The base address and length of the registers</div><div class='add'>+- clocks:	a phandle to the 100MHz reference clock of this PHY</div><div class='add'>+- clock-names:	must be "ref_clk"</div><div class='add'>+- resets:	phandle to the reset lines for the PHY control</div><div class='add'>+- reset-names:	must be "phy"</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	usb3_pcie_phy: phy@46000 {</div><div class='add'>+		compatible = "amlogic,g12a-usb3-pcie-phy";</div><div class='add'>+		reg = &lt;0x0 0x46000 0x0 0x2000&gt;;</div><div class='add'>+		clocks = &lt;&amp;clkc CLKID_PCIE_PLL&gt;;</div><div class='add'>+		clock-names = "ref_clk";</div><div class='add'>+		resets = &lt;&amp;reset RESET_PCIE_PHY&gt;;</div><div class='add'>+		reset-names = "phy";</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt b/Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt<br/>index 3742c152c467..daedb15f322e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt</a></div><div class='hunk'>@@ -36,11 +36,20 @@ Required properties:</div><div class='ctx'>   - Tegra124: "nvidia,tegra124-xusb-padctl"</div><div class='ctx'>   - Tegra132: "nvidia,tegra132-xusb-padctl", "nvidia,tegra124-xusb-padctl"</div><div class='ctx'>   - Tegra210: "nvidia,tegra210-xusb-padctl"</div><div class='add'>+  - Tegra186: "nvidia,tegra186-xusb-padctl"</div><div class='ctx'> - reg: Physical base address and length of the controller's registers.</div><div class='ctx'> - resets: Must contain an entry for each entry in reset-names.</div><div class='ctx'> - reset-names: Must include the following entries:</div><div class='ctx'>   - "padctl"</div><div class='ctx'> </div><div class='add'>+For Tegra186:</div><div class='add'>+- avdd-pll-erefeut-supply: UPHY brick and reference clock as well as UTMI PHY</div><div class='add'>+  power supply. Must supply 1.8 V.</div><div class='add'>+- avdd-usb-supply: USB I/Os, VBUS, ID, REXT, D+/D- power supply. Must supply</div><div class='add'>+  3.3 V.</div><div class='add'>+- vclamp-usb-supply: Bias rail for USB pad. Must supply 1.8 V.</div><div class='add'>+- vddio-hsic-supply: HSIC PHY power supply. Must supply 1.2 V.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Pad nodes:</div><div class='ctx'> ==========</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt b/Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt<br/>new file mode 100644<br/>index 000000000000..e88ba7d92dcb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+Hisilicon hi3660 USB PHY</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "hisilicon,hi3660-usb-phy"</div><div class='add'>+- #phy-cells: must be 0</div><div class='add'>+- hisilicon,pericrg-syscon: phandle of syscon used to control phy.</div><div class='add'>+- hisilicon,pctrl-syscon: phandle of syscon used to control phy.</div><div class='add'>+- hisilicon,eye-diagram-param: parameter set for phy</div><div class='add'>+Refer to phy/phy-bindings.txt for the generic PHY binding properties</div><div class='add'>+</div><div class='add'>+This is a subnode of usb3_otg_bc register node.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	usb3_otg_bc: usb3_otg_bc@ff200000 {</div><div class='add'>+		compatible = "syscon", "simple-mfd";</div><div class='add'>+		reg = &lt;0x0 0xff200000 0x0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		usb-phy {</div><div class='add'>+			compatible = "hisilicon,hi3660-usb-phy";</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			hisilicon,pericrg-syscon = &lt;&amp;crg_ctrl&gt;;</div><div class='add'>+			hisilicon,pctrl-syscon = &lt;&amp;pctrl&gt;;</div><div class='add'>+			hisilicon,eye-diagram-param = &lt;0x22466e4&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt b/Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt<br/>new file mode 100644<br/>index 000000000000..5789029a1d42<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+MediaTek Universal Flash Storage (UFS) M-PHY binding</div><div class='add'>+--------------------------------------------------------</div><div class='add'>+</div><div class='add'>+UFS M-PHY nodes are defined to describe on-chip UFS M-PHY hardware macro.</div><div class='add'>+Each UFS M-PHY node should have its own node.</div><div class='add'>+</div><div class='add'>+To bind UFS M-PHY with UFS host controller, the controller node should</div><div class='add'>+contain a phandle reference to UFS M-PHY node.</div><div class='add'>+</div><div class='add'>+Required properties for UFS M-PHY nodes:</div><div class='add'>+- compatible         : Compatible list, contains the following controller:</div><div class='add'>+                       "mediatek,mt8183-ufsphy" for ufs phy</div><div class='add'>+                       persent on MT81xx chipsets.</div><div class='add'>+- reg                : Address and length of the UFS M-PHY register set.</div><div class='add'>+- #phy-cells         : This property shall be set to 0.</div><div class='add'>+- clocks             : List of phandle and clock specifier pairs.</div><div class='add'>+- clock-names        : List of clock input name strings sorted in the same</div><div class='add'>+                       order as the clocks property. Following clocks are</div><div class='add'>+                       mandatory.</div><div class='add'>+                       "unipro": Unipro core control clock.</div><div class='add'>+                       "mp": M-PHY core control clock.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	ufsphy: phy@11fa0000 {</div><div class='add'>+		compatible = "mediatek,mt8183-ufsphy";</div><div class='add'>+		reg = &lt;0 0x11fa0000 0 0xc000&gt;;</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;infracfg_ao INFRACFG_AO_UNIPRO_SCK_CG&gt;,</div><div class='add'>+			 &lt;&amp;infracfg_ao INFRACFG_AO_UFS_MP_SAP_BCLK_CG&gt;;</div><div class='add'>+		clock-names = "unipro", "mp";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ufshci@11270000 {</div><div class='add'>+		...</div><div class='add'>+		phys = &lt;&amp;ufsphy&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt<br/>index 5d181fc3cc18..085fbd676cfc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt</a></div><div class='hunk'>@@ -11,6 +11,7 @@ Required properties:</div><div class='ctx'> 	       "qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,</div><div class='ctx'> 	       "qcom,msm8998-qmp-usb3-phy" for USB3 QMP V3 phy on msm8998,</div><div class='ctx'> 	       "qcom,msm8998-qmp-ufs-phy" for UFS QMP phy on msm8998,</div><div class='add'>+	       "qcom,msm8998-qmp-pcie-phy" for PCIe QMP phy on msm8998,</div><div class='ctx'> 	       "qcom,sdm845-qmp-usb3-phy" for USB3 QMP V3 phy on sdm845,</div><div class='ctx'> 	       "qcom,sdm845-qmp-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845,</div><div class='ctx'> 	       "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845.</div><div class='hunk'>@@ -48,6 +49,8 @@ Required properties:</div><div class='ctx'> 			"aux", "cfg_ahb", "ref".</div><div class='ctx'> 		For "qcom,msm8998-qmp-ufs-phy" must contain:</div><div class='ctx'> 			"ref", "ref_aux".</div><div class='add'>+		For "qcom,msm8998-qmp-pcie-phy" must contain:</div><div class='add'>+			"aux", "cfg_ahb", "ref".</div><div class='ctx'> 		For "qcom,sdm845-qmp-usb3-phy" must contain:</div><div class='ctx'> 			"aux", "cfg_ahb", "ref", "com_aux".</div><div class='ctx'> 		For "qcom,sdm845-qmp-usb3-uni-phy" must contain:</div><div class='hunk'>@@ -59,7 +62,8 @@ Required properties:</div><div class='ctx'> 	   one for each entry in reset-names.</div><div class='ctx'>  - reset-names: "phy" for reset of phy block,</div><div class='ctx'> 		"common" for phy common block reset,</div><div class='del'>-		"cfg" for phy's ahb cfg block reset.</div><div class='add'>+		"cfg" for phy's ahb cfg block reset,</div><div class='add'>+		"ufsphy" for the PHY reset in the UFS controller.</div><div class='ctx'> </div><div class='ctx'> 		For "qcom,ipq8074-qmp-pcie-phy" must contain:</div><div class='ctx'> 			"phy", "common".</div><div class='hunk'>@@ -69,12 +73,16 @@ Required properties:</div><div class='ctx'> 			"phy", "common".</div><div class='ctx'> 		For "qcom,msm8998-qmp-usb3-phy" must contain</div><div class='ctx'> 			"phy", "common".</div><div class='del'>-		For "qcom,msm8998-qmp-ufs-phy": no resets are listed.</div><div class='add'>+		For "qcom,msm8998-qmp-ufs-phy": must contain:</div><div class='add'>+			"ufsphy".</div><div class='add'>+		For "qcom,msm8998-qmp-pcie-phy" must contain:</div><div class='add'>+			"phy", "common".</div><div class='ctx'> 		For "qcom,sdm845-qmp-usb3-phy" must contain:</div><div class='ctx'> 			"phy", "common".</div><div class='ctx'> 		For "qcom,sdm845-qmp-usb3-uni-phy" must contain:</div><div class='ctx'> 			"phy", "common".</div><div class='del'>-		For "qcom,sdm845-qmp-ufs-phy": no resets are listed.</div><div class='add'>+		For "qcom,sdm845-qmp-ufs-phy": must contain:</div><div class='add'>+			"ufsphy".</div><div class='ctx'> </div><div class='ctx'>  - vdda-phy-supply: Phandle to a regulator supply to PHY core block.</div><div class='ctx'>  - vdda-pll-supply: Phandle to 1.8V regulator supply to PHY refclk pll block.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt b/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt<br/>index 4f0879a0ca12..ac96d6481bb8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt</a></div><div class='hunk'>@@ -7,6 +7,7 @@ Required properties:</div><div class='ctx'> - compatible: "renesas,usb-phy-r8a7743" if the device is a part of R8A7743 SoC.</div><div class='ctx'> 	      "renesas,usb-phy-r8a7744" if the device is a part of R8A7744 SoC.</div><div class='ctx'> 	      "renesas,usb-phy-r8a7745" if the device is a part of R8A7745 SoC.</div><div class='add'>+	      "renesas,usb-phy-r8a77470" if the device is a part of R8A77470 SoC.</div><div class='ctx'> 	      "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.</div><div class='ctx'> 	      "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.</div><div class='ctx'> 	      "renesas,usb-phy-r8a7794" if the device is a part of R8A7794 SoC.</div><div class='hunk'>@@ -30,7 +31,7 @@ channels. These subnodes must contain the following properties:</div><div class='ctx'> - #phy-cells: see phy-bindings.txt in the same directory, must be &lt;1&gt;.</div><div class='ctx'> </div><div class='ctx'> The phandle's argument in the PHY specifier is the USB controller selector for</div><div class='del'>-the USB channel; see the selector meanings below:</div><div class='add'>+the USB channel other than r8a77470 SoC; see the selector meanings below:</div><div class='ctx'> </div><div class='ctx'> +-----------+---------------+---------------+</div><div class='ctx'> |\ Selector |               |               |</div><div class='hunk'>@@ -41,6 +42,16 @@ the USB channel; see the selector meanings below:</div><div class='ctx'> | 2         | PCI EHCI/OHCI | xHCI          |</div><div class='ctx'> +-----------+---------------+---------------+</div><div class='ctx'> </div><div class='add'>+For r8a77470 SoC;see the selector meaning below:</div><div class='add'>+</div><div class='add'>++-----------+---------------+---------------+</div><div class='add'>+|\ Selector |               |               |</div><div class='add'>++ --------- +       0       |       1       |</div><div class='add'>+| Channel  \|               |               |</div><div class='add'>++-----------+---------------+---------------+</div><div class='add'>+| 0         | EHCI/OHCI     | HS-USB        |</div><div class='add'>++-----------+---------------+---------------+</div><div class='add'>+</div><div class='ctx'> Example (Lager board):</div><div class='ctx'> </div><div class='ctx'> 	usb-phy@e6590100 {</div><div class='hunk'>@@ -48,15 +59,53 @@ Example (Lager board):</div><div class='ctx'> 		reg = &lt;0 0xe6590100 0 0x100&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		clocks = &lt;&amp;mstp7_clks R8A7790_CLK_HSUSB&gt;;</div><div class='add'>+		clocks = &lt;&amp;cpg CPG_MOD 704&gt;;</div><div class='ctx'> 		clock-names = "usbhs";</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7790_PD_ALWAYS_ON&gt;;</div><div class='add'>+		resets = &lt;&amp;cpg 704&gt;;</div><div class='ctx'> </div><div class='del'>-		usb-channel@0 {</div><div class='add'>+		usb0: usb-channel@0 {</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='ctx'> 			#phy-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		usb-channel@2 {</div><div class='add'>+		usb2: usb-channel@2 {</div><div class='ctx'> 			reg = &lt;2&gt;;</div><div class='ctx'> 			#phy-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+Example (iWave RZ/G1C sbc):</div><div class='add'>+</div><div class='add'>+	usbphy0: usb-phy0@e6590100 {</div><div class='add'>+		compatible = "renesas,usb-phy-r8a77470",</div><div class='add'>+			     "renesas,rcar-gen2-usb-phy";</div><div class='add'>+		reg = &lt;0 0xe6590100 0 0x100&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;cpg CPG_MOD 704&gt;;</div><div class='add'>+		clock-names = "usbhs";</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A77470_PD_ALWAYS_ON&gt;;</div><div class='add'>+		resets = &lt;&amp;cpg 704&gt;;</div><div class='add'>+</div><div class='add'>+		usb0: usb-channel@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usbphy1: usb-phy@e6598100 {</div><div class='add'>+		compatible = "renesas,usb-phy-r8a77470",</div><div class='add'>+			     "renesas,rcar-gen2-usb-phy";</div><div class='add'>+		reg = &lt;0 0xe6598100 0 0x100&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;cpg CPG_MOD 706&gt;;</div><div class='add'>+		clock-names = "usbhs";</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A77470_PD_ALWAYS_ON&gt;;</div><div class='add'>+		resets = &lt;&amp;cpg 706&gt;;</div><div class='add'>+</div><div class='add'>+		usb1: usb-channel@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt<br/>index ad9c290d8f15..d46188f450bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='ctx'> * Renesas R-Car generation 3 USB 2.0 PHY</div><div class='ctx'> </div><div class='ctx'> This file provides information on what the device node for the R-Car generation</div><div class='del'>-3 and RZ/G2 USB 2.0 PHY contain.</div><div class='add'>+3, RZ/G1C and RZ/G2 USB 2.0 PHY contain.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: "renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1</div><div class='add'>+- compatible: "renesas,usb2-phy-r8a77470" if the device is a part of an R8A77470</div><div class='add'>+	      SoC.</div><div class='add'>+	      "renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1</div><div class='ctx'> 	      SoC.</div><div class='ctx'> 	      "renesas,usb2-phy-r8a774c0" if the device is a part of an R8A774C0</div><div class='ctx'> 	      SoC.</div><div class='hunk'>@@ -27,7 +29,13 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> - reg: offset and length of the partial USB 2.0 Host register block.</div><div class='ctx'> - clocks: clock phandle and specifier pair(s).</div><div class='del'>-- #phy-cells: see phy-bindings.txt in the same directory, must be &lt;0&gt;.</div><div class='add'>+- #phy-cells: see phy-bindings.txt in the same directory, must be &lt;1&gt; (and</div><div class='add'>+	      using &lt;0&gt; is deprecated).</div><div class='add'>+</div><div class='add'>+The phandle's argument in the PHY specifier is the INT_STATUS bit of controller:</div><div class='add'>+- 1 = USBH_INTA (OHCI)</div><div class='add'>+- 2 = USBH_INTB (EHCI)</div><div class='add'>+- 3 = UCOM_INT (OTG and BC)</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt<br/>index e3ea55763b0a..e728786f21e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt</a></div><div class='hunk'>@@ -7,12 +7,15 @@ Required properties:</div><div class='ctx'>  - reg: PHY register address offset and length in "general</div><div class='ctx'>    register files"</div><div class='ctx'> </div><div class='del'>-Optional clocks using the clock bindings (see ../clock/clock-bindings.txt),</div><div class='del'>-specified by name:</div><div class='add'>+Optional properties:</div><div class='ctx'>  - clock-names: Should contain "emmcclk".  Although this is listed as optional</div><div class='ctx'> 		(because most boards can get basic functionality without having</div><div class='ctx'> 		access to it), it is strongly suggested.</div><div class='add'>+		See ../clock/clock-bindings.txt for details.</div><div class='ctx'>  - clocks: Should have a phandle to the card clock exported by the SDHCI driver.</div><div class='add'>+ - drive-impedance-ohm: Specifies the drive impedance in Ohm.</div><div class='add'>+                        Possible values are 33, 40, 50, 66 and 100.</div><div class='add'>+                        If not set, the default value of 50 will be applied.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +32,7 @@ grf: syscon@ff770000 {</div><div class='ctx'> 		reg = &lt;0xf780 0x20&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;sdhci&gt;;</div><div class='ctx'> 		clock-names = "emmcclk";</div><div class='add'>+		drive-impedance-ohm = &lt;50&gt;;</div><div class='ctx'> 		#phy-cells = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt b/Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt<br/>new file mode 100644<br/>index 000000000000..64b286d2d398<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+TI AM654 SERDES</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: Should be "ti,phy-am654-serdes"</div><div class='add'>+ - reg : Address and length of the register set for the device.</div><div class='add'>+ - #phy-cells: determine the number of cells that should be given in the</div><div class='add'>+	phandle while referencing this phy. Should be "2". The 1st cell</div><div class='add'>+	corresponds to the phy type (should be one of the types specified in</div><div class='add'>+	include/dt-bindings/phy/phy.h) and the 2nd cell should be the serdes</div><div class='add'>+	lane function.</div><div class='add'>+	If SERDES0 is referenced 2nd cell should be:</div><div class='add'>+		0 - USB3</div><div class='add'>+		1 - PCIe0 Lane0</div><div class='add'>+		2 - ICSS2 SGMII Lane0</div><div class='add'>+	If SERDES1 is referenced 2nd cell should be:</div><div class='add'>+		0 - PCIe1 Lane0</div><div class='add'>+		1 - PCIe0 Lane1</div><div class='add'>+		2 - ICSS2 SGMII Lane1</div><div class='add'>+ - power-domains: As documented by the generic PM domain bindings in</div><div class='add'>+	Documentation/devicetree/bindings/power/power_domain.txt.</div><div class='add'>+ - clocks: List of clock-specifiers representing the input to the SERDES.</div><div class='add'>+	Should have 3 items representing the left input clock, external</div><div class='add'>+	reference clock and right input clock in that order.</div><div class='add'>+ - clock-output-names: List of clock names for each of the clock outputs of</div><div class='add'>+	SERDES. Should have 3 items for CMU reference clock,</div><div class='add'>+	left output clock and right output clock in that order.</div><div class='add'>+ - assigned-clocks: As defined in</div><div class='add'>+	Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='add'>+ - assigned-clock-parents: As defined in</div><div class='add'>+	Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='add'>+ - #clock-cells: Should be &lt;1&gt; to choose between the 3 output clocks.</div><div class='add'>+	Defined in Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='add'>+</div><div class='add'>+   The following macros are defined in dt-bindings/phy/phy-am654-serdes.h</div><div class='add'>+   for selecting the correct reference clock. This can be used while</div><div class='add'>+   specifying the clocks created by SERDES.</div><div class='add'>+	=&gt; AM654_SERDES_CMU_REFCLK</div><div class='add'>+	=&gt; AM654_SERDES_LO_REFCLK</div><div class='add'>+	=&gt; AM654_SERDES_RO_REFCLK</div><div class='add'>+</div><div class='add'>+ - mux-controls: Phandle to the multiplexer that is used to select the lane</div><div class='add'>+	function. See #phy-cells above to see the multiplex values.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+Example for SERDES0 is given below. It has 3 clock inputs;</div><div class='add'>+left input reference clock as indicated by &lt;&amp;k3_clks 153 4&gt;, external</div><div class='add'>+reference clock as indicated by &lt;&amp;k3_clks 153 1&gt; and right input</div><div class='add'>+reference clock as indicated by &lt;&amp;serdes1 AM654_SERDES_LO_REFCLK&gt;. (The</div><div class='add'>+right input of SERDES0 is connected to the left output of SERDES1).</div><div class='add'>+</div><div class='add'>+SERDES0 registers 3 clock outputs as indicated in clock-output-names. The</div><div class='add'>+first refers to the CMU reference clock, second refers to the left output</div><div class='add'>+reference clock and the third refers to the right output reference clock.</div><div class='add'>+</div><div class='add'>+The assigned-clocks and assigned-clock-parents is used here to set the</div><div class='add'>+parent of left input reference clock to MAINHSDIV_CLKOUT4 and parent of</div><div class='add'>+CMU reference clock to left input reference clock.</div><div class='add'>+</div><div class='add'>+serdes0: serdes@900000 {</div><div class='add'>+	compatible = "ti,phy-am654-serdes";</div><div class='add'>+	reg = &lt;0x0 0x900000 0x0 0x2000&gt;;</div><div class='add'>+	reg-names = "serdes";</div><div class='add'>+	#phy-cells = &lt;2&gt;;</div><div class='add'>+	power-domains = &lt;&amp;k3_pds 153&gt;;</div><div class='add'>+	clocks = &lt;&amp;k3_clks 153 4&gt;, &lt;&amp;k3_clks 153 1&gt;,</div><div class='add'>+			&lt;&amp;serdes1 AM654_SERDES_LO_REFCLK&gt;;</div><div class='add'>+	clock-output-names = "serdes0_cmu_refclk", "serdes0_lo_refclk",</div><div class='add'>+				"serdes0_ro_refclk";</div><div class='add'>+	assigned-clocks = &lt;&amp;k3_clks 153 4&gt;, &lt;&amp;serdes0 AM654_SERDES_CMU_REFCLK&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;k3_clks 153 8&gt;, &lt;&amp;k3_clks 153 4&gt;;</div><div class='add'>+	ti,serdes-clk = &lt;&amp;serdes0_clk&gt;;</div><div class='add'>+	mux-controls = &lt;&amp;serdes_mux 0&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Example for PCIe consumer node using the SERDES PHY specifier is given below.</div><div class='add'>+&amp;pcie0_rc {</div><div class='add'>+        num-lanes = &lt;2&gt;;</div><div class='add'>+        phys = &lt;&amp;serdes0 PHY_TYPE_PCIE 1&gt;, &lt;&amp;serdes1 PHY_TYPE_PCIE 1&gt;;</div><div class='add'>+        phy-names = "pcie-phy0", "pcie-phy1";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt<br/>new file mode 100644<br/>index 000000000000..ed34bb1ee81c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+Bitmain BM1880 Pin Controller</div><div class='add'>+</div><div class='add'>+This binding describes the pin controller found in the BM1880 SoC.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible:   Should be "bitmain,bm1880-pinctrl"</div><div class='add'>+- reg:          Offset and length of pinctrl space in SCTRL.</div><div class='add'>+</div><div class='add'>+Please refer to pinctrl-bindings.txt in this directory for details of the</div><div class='add'>+common pinctrl bindings used by client devices, including the meaning of the</div><div class='add'>+phrase "pin configuration node".</div><div class='add'>+</div><div class='add'>+The pin configuration nodes act as a container for an arbitrary number of</div><div class='add'>+subnodes. Each of these subnodes represents some desired configuration for a</div><div class='add'>+pin, a group, or a list of pins or groups. This configuration for BM1880 SoC</div><div class='add'>+includes only pinmux as there is no pinconf support available in SoC.</div><div class='add'>+</div><div class='add'>+Each configuration node can consist of multiple nodes describing the pinmux</div><div class='add'>+options. The name of each subnode is not important; all subnodes should be</div><div class='add'>+enumerated and processed purely based on their content.</div><div class='add'>+</div><div class='add'>+The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='add'>+to specify in a pinmux subnode:</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- pins:           An array of strings, each string containing the name of a pin.</div><div class='add'>+                  Valid values for pins are:</div><div class='add'>+</div><div class='add'>+                  MIO0 - MIO111</div><div class='add'>+</div><div class='add'>+- groups:         An array of strings, each string containing the name of a pin</div><div class='add'>+                  group. Valid values for groups are:</div><div class='add'>+</div><div class='add'>+                  nand_grp, spi_grp, emmc_grp, sdio_grp, eth0_grp, pwm0_grp,</div><div class='add'>+                  pwm1_grp, pwm2_grp, pwm3_grp, pwm4_grp, pwm5_grp, pwm6_grp,</div><div class='add'>+                  pwm7_grp, pwm8_grp, pwm9_grp, pwm10_grp, pwm11_grp, pwm12_grp,</div><div class='add'>+                  pwm13_grp, pwm14_grp, pwm15_grp, pwm16_grp, pwm17_grp,</div><div class='add'>+                  pwm18_grp, pwm19_grp, pwm20_grp, pwm21_grp, pwm22_grp,</div><div class='add'>+                  pwm23_grp, pwm24_grp, pwm25_grp, pwm26_grp, pwm27_grp,</div><div class='add'>+                  pwm28_grp, pwm29_grp, pwm30_grp, pwm31_grp, pwm32_grp,</div><div class='add'>+                  pwm33_grp, pwm34_grp, pwm35_grp, pwm36_grp, i2c0_grp,</div><div class='add'>+                  i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp, uart0_grp, uart1_grp,</div><div class='add'>+                  uart2_grp, uart3_grp, uart4_grp, uart5_grp, uart6_grp,</div><div class='add'>+                  uart7_grp, uart8_grp, uart9_grp, uart10_grp, uart11_grp,</div><div class='add'>+                  uart12_grp, uart13_grp, uart14_grp, uart15_grp, gpio0_grp,</div><div class='add'>+                  gpio1_grp, gpio2_grp, gpio3_grp, gpio4_grp, gpio5_grp,</div><div class='add'>+                  gpio6_grp, gpio7_grp, gpio8_grp, gpio9_grp, gpio10_grp,</div><div class='add'>+                  gpio11_grp, gpio12_grp, gpio13_grp, gpio14_grp, gpio15_grp,</div><div class='add'>+                  gpio16_grp, gpio17_grp, gpio18_grp, gpio19_grp, gpio20_grp,</div><div class='add'>+                  gpio21_grp, gpio22_grp, gpio23_grp, gpio24_grp, gpio25_grp,</div><div class='add'>+                  gpio26_grp, gpio27_grp, gpio28_grp, gpio29_grp, gpio30_grp,</div><div class='add'>+                  gpio31_grp, gpio32_grp, gpio33_grp, gpio34_grp, gpio35_grp,</div><div class='add'>+                  gpio36_grp, gpio37_grp, gpio38_grp, gpio39_grp, gpio40_grp,</div><div class='add'>+                  gpio41_grp, gpio42_grp, gpio43_grp, gpio44_grp, gpio45_grp,</div><div class='add'>+                  gpio46_grp, gpio47_grp, gpio48_grp, gpio49_grp, gpio50_grp,</div><div class='add'>+                  gpio51_grp, gpio52_grp, gpio53_grp, gpio54_grp, gpio55_grp,</div><div class='add'>+                  gpio56_grp, gpio57_grp, gpio58_grp, gpio59_grp, gpio60_grp,</div><div class='add'>+                  gpio61_grp, gpio62_grp, gpio63_grp, gpio64_grp, gpio65_grp,</div><div class='add'>+                  gpio66_grp, gpio67_grp, eth1_grp, i2s0_grp, i2s0_mclkin_grp,</div><div class='add'>+                  i2s1_grp, i2s1_mclkin_grp, spi0_grp</div><div class='add'>+</div><div class='add'>+- function:       An array of strings, each string containing the name of the</div><div class='add'>+                  pinmux functions. The following are the list of pinmux</div><div class='add'>+                  functions available:</div><div class='add'>+</div><div class='add'>+                  nand, spi, emmc, sdio, eth0, pwm0, pwm1, pwm2, pwm3, pwm4,</div><div class='add'>+                  pwm5, pwm6, pwm7, pwm8, pwm9, pwm10, pwm11, pwm12, pwm13,</div><div class='add'>+                  pwm14, pwm15, pwm16, pwm17, pwm18, pwm19, pwm20, pwm21, pwm22,</div><div class='add'>+                  pwm23, pwm24, pwm25, pwm26, pwm27, pwm28, pwm29, pwm30, pwm31,</div><div class='add'>+                  pwm32, pwm33, pwm34, pwm35, pwm36, i2c0, i2c1, i2c2, i2c3,</div><div class='add'>+                  i2c4, uart0, uart1, uart2, uart3, uart4, uart5, uart6, uart7,</div><div class='add'>+                  uart8, uart9, uart10, uart11, uart12, uart13, uart14, uart15,</div><div class='add'>+                  gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7, gpio8,</div><div class='add'>+                  gpio9, gpio10, gpio11, gpio12, gpio13, gpio14, gpio15, gpio16,</div><div class='add'>+                  gpio17, gpio18, gpio19, gpio20, gpio21, gpio22, gpio23,</div><div class='add'>+                  gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30,</div><div class='add'>+                  gpio31, gpio32, gpio33, gpio34, gpio35, gpio36, gpio37,</div><div class='add'>+                  gpio38, gpio39, gpio40, gpio41, gpio42, gpio43, gpio44,</div><div class='add'>+                  gpio45, gpio46, gpio47, gpio48, gpio49, gpio50, gpio51,</div><div class='add'>+                  gpio52, gpio53, gpio54, gpio55, gpio56, gpio57, gpio58,</div><div class='add'>+                  gpio59, gpio60, gpio61, gpio62, gpio63, gpio64, gpio65,</div><div class='add'>+                  gpio66, gpio67, eth1, i2s0, i2s0_mclkin, i2s1, i2s1_mclkin,</div><div class='add'>+                  spi0</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+        pinctrl: pinctrl@50 {</div><div class='add'>+                compatible = "bitmain,bm1880-pinctrl";</div><div class='add'>+                reg = &lt;0x50 0x4B0&gt;;</div><div class='add'>+</div><div class='add'>+                pinctrl_uart0_default: uart0-default {</div><div class='add'>+                        pinmux {</div><div class='add'>+                                groups = "uart0_grp";</div><div class='add'>+                                function = "uart0";</div><div class='add'>+                        };</div><div class='add'>+                };</div><div class='add'>+        };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt b/Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt<br/>new file mode 100644<br/>index 000000000000..a87447180e83<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt</a></div><div class='hunk'>@@ -0,0 +1,141 @@</div><div class='add'>+Cirrus Logic Lochnagar Audio Development Board</div><div class='add'>+</div><div class='add'>+Lochnagar is an evaluation and development board for Cirrus Logic</div><div class='add'>+Smart CODEC and Amp devices. It allows the connection of most Cirrus</div><div class='add'>+Logic devices on mini-cards, as well as allowing connection of</div><div class='add'>+various application processor systems to provide a full evaluation</div><div class='add'>+platform.  Audio system topology, clocking and power can all be</div><div class='add'>+controlled through the Lochnagar, allowing the device under test</div><div class='add'>+to be used in a variety of possible use cases.</div><div class='add'>+</div><div class='add'>+This binding document describes the binding for the pinctrl portion</div><div class='add'>+of the driver.</div><div class='add'>+</div><div class='add'>+Also see these documents for generic binding information:</div><div class='add'>+  [1] GPIO : ../gpio/gpio.txt</div><div class='add'>+  [2] Pinctrl: ../pinctrl/pinctrl-bindings.txt</div><div class='add'>+</div><div class='add'>+And these for relevant defines:</div><div class='add'>+  [3] include/dt-bindings/pinctrl/lochnagar.h</div><div class='add'>+</div><div class='add'>+This binding must be part of the Lochnagar MFD binding:</div><div class='add'>+  [4] ../mfd/cirrus,lochnagar.txt</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : One of the following strings:</div><div class='add'>+                 "cirrus,lochnagar-pinctrl"</div><div class='add'>+</div><div class='add'>+  - gpio-controller : Indicates this device is a GPIO controller.</div><div class='add'>+  - #gpio-cells : Must be 2. The first cell is the pin number, see</div><div class='add'>+    [3] for available pins and the second cell is used to specify</div><div class='add'>+    optional parameters, see [1].</div><div class='add'>+  - gpio-ranges : Range of pins managed by the GPIO controller, see</div><div class='add'>+    [1]. Both the GPIO and Pinctrl base should be set to zero and the</div><div class='add'>+    count to the appropriate of the LOCHNAGARx_PIN_NUM_GPIOS define,</div><div class='add'>+    see [3].</div><div class='add'>+</div><div class='add'>+  - pinctrl-names : A pinctrl state named "default" must be defined.</div><div class='add'>+  - pinctrl-0 : A phandle to the default pinctrl state.</div><div class='add'>+</div><div class='add'>+Required sub-nodes:</div><div class='add'>+</div><div class='add'>+The pin configurations are defined as a child of the pinctrl states</div><div class='add'>+node, see [2]. Each sub-node can have the following properties:</div><div class='add'>+  - groups : A list of groups to select (either this or "pins" must be</div><div class='add'>+    specified), available groups:</div><div class='add'>+      codec-aif1, codec-aif2, codec-aif3, dsp-aif1, dsp-aif2, psia1,</div><div class='add'>+      psia2, gf-aif1, gf-aif2, gf-aif3, gf-aif4, spdif-aif, usb-aif1,</div><div class='add'>+      usb-aif2, adat-aif, soundcard-aif</div><div class='add'>+  - pins : A list of pin names to select (either this or "groups" must</div><div class='add'>+    be specified), available pins:</div><div class='add'>+      fpga-gpio1, fpga-gpio2, fpga-gpio3, fpga-gpio4, fpga-gpio5,</div><div class='add'>+      fpga-gpio6, codec-gpio1, codec-gpio2, codec-gpio3, codec-gpio4,</div><div class='add'>+      codec-gpio5, codec-gpio6, codec-gpio7, codec-gpio8, dsp-gpio1,</div><div class='add'>+      dsp-gpio2, dsp-gpio3, dsp-gpio4, dsp-gpio5, dsp-gpio6, gf-gpio2,</div><div class='add'>+      gf-gpio3, gf-gpio7, codec-aif1-bclk, codec-aif1-rxdat,</div><div class='add'>+      codec-aif1-lrclk, codec-aif1-txdat, codec-aif2-bclk,</div><div class='add'>+      codec-aif2-rxdat, codec-aif2-lrclk, codec-aif2-txdat,</div><div class='add'>+      codec-aif3-bclk, codec-aif3-rxdat, codec-aif3-lrclk,</div><div class='add'>+      codec-aif3-txdat, dsp-aif1-bclk, dsp-aif1-rxdat, dsp-aif1-lrclk,</div><div class='add'>+      dsp-aif1-txdat, dsp-aif2-bclk, dsp-aif2-rxdat,</div><div class='add'>+      dsp-aif2-lrclk, dsp-aif2-txdat, psia1-bclk, psia1-rxdat,</div><div class='add'>+      psia1-lrclk, psia1-txdat, psia2-bclk, psia2-rxdat, psia2-lrclk,</div><div class='add'>+      psia2-txdat, gf-aif3-bclk, gf-aif3-rxdat, gf-aif3-lrclk,</div><div class='add'>+      gf-aif3-txdat, gf-aif4-bclk, gf-aif4-rxdat, gf-aif4-lrclk,</div><div class='add'>+      gf-aif4-txdat, gf-aif1-bclk, gf-aif1-rxdat, gf-aif1-lrclk,</div><div class='add'>+      gf-aif1-txdat, gf-aif2-bclk, gf-aif2-rxdat, gf-aif2-lrclk,</div><div class='add'>+      gf-aif2-txdat, dsp-uart1-rx, dsp-uart1-tx, dsp-uart2-rx,</div><div class='add'>+      dsp-uart2-tx, gf-uart2-rx, gf-uart2-tx, usb-uart-rx,</div><div class='add'>+      codec-pdmclk1, codec-pdmdat1, codec-pdmclk2, codec-pdmdat2,</div><div class='add'>+      codec-dmicclk1, codec-dmicdat1, codec-dmicclk2, codec-dmicdat2,</div><div class='add'>+      codec-dmicclk3, codec-dmicdat3, codec-dmicclk4, codec-dmicdat4,</div><div class='add'>+      dsp-dmicclk1, dsp-dmicdat1, dsp-dmicclk2, dsp-dmicdat2, i2c2-scl,</div><div class='add'>+      i2c2-sda, i2c3-scl, i2c3-sda, i2c4-scl, i2c4-sda, dsp-standby,</div><div class='add'>+      codec-mclk1, codec-mclk2, dsp-clkin, psia1-mclk, psia2-mclk,</div><div class='add'>+      gf-gpio1, gf-gpio5, dsp-gpio20, led1, led2</div><div class='add'>+  - function : The mux function to select, available functions:</div><div class='add'>+      aif, fpga-gpio1, fpga-gpio2, fpga-gpio3, fpga-gpio4, fpga-gpio5,</div><div class='add'>+      fpga-gpio6, codec-gpio1, codec-gpio2, codec-gpio3, codec-gpio4,</div><div class='add'>+      codec-gpio5, codec-gpio6, codec-gpio7, codec-gpio8, dsp-gpio1,</div><div class='add'>+      dsp-gpio2, dsp-gpio3, dsp-gpio4, dsp-gpio5, dsp-gpio6, gf-gpio2,</div><div class='add'>+      gf-gpio3, gf-gpio7, gf-gpio1, gf-gpio5, dsp-gpio20, codec-clkout,</div><div class='add'>+      dsp-clkout, pmic-32k, spdif-clkout, clk-12m288, clk-11m2986,</div><div class='add'>+      clk-24m576, clk-22m5792, xmos-mclk, gf-clkout1, gf-mclk1,</div><div class='add'>+      gf-mclk3, gf-mclk2, gf-clkout2, codec-mclk1, codec-mclk2,</div><div class='add'>+      dsp-clkin, psia1-mclk, psia2-mclk, spdif-mclk, codec-irq,</div><div class='add'>+      codec-reset, dsp-reset, dsp-irq, dsp-standby, codec-pdmclk1,</div><div class='add'>+      codec-pdmdat1, codec-pdmclk2, codec-pdmdat2, codec-dmicclk1,</div><div class='add'>+      codec-dmicdat1, codec-dmicclk2, codec-dmicdat2, codec-dmicclk3,</div><div class='add'>+      codec-dmicdat3, codec-dmicclk4, codec-dmicdat4, dsp-dmicclk1,</div><div class='add'>+      dsp-dmicdat1, dsp-dmicclk2, dsp-dmicdat2, dsp-uart1-rx,</div><div class='add'>+      dsp-uart1-tx, dsp-uart2-rx, dsp-uart2-tx, gf-uart2-rx,</div><div class='add'>+      gf-uart2-tx, usb-uart-rx, usb-uart-tx, i2c2-scl, i2c2-sda,</div><div class='add'>+      i2c3-scl, i2c3-sda, i2c4-scl, i2c4-sda, spdif-aif, psia1,</div><div class='add'>+      psia1-bclk, psia1-lrclk, psia1-rxdat, psia1-txdat, psia2,</div><div class='add'>+      psia2-bclk, psia2-lrclk, psia2-rxdat, psia2-txdat, codec-aif1,</div><div class='add'>+      codec-aif1-bclk, codec-aif1-lrclk, codec-aif1-rxdat,</div><div class='add'>+      codec-aif1-txdat, codec-aif2, codec-aif2-bclk, codec-aif2-lrclk,</div><div class='add'>+      codec-aif2-rxdat, codec-aif2-txdat, codec-aif3, codec-aif3-bclk,</div><div class='add'>+      codec-aif3-lrclk, codec-aif3-rxdat, codec-aif3-txdat, dsp-aif1,</div><div class='add'>+      dsp-aif1-bclk, dsp-aif1-lrclk, dsp-aif1-rxdat, dsp-aif1-txdat,</div><div class='add'>+      dsp-aif2, dsp-aif2-bclk, dsp-aif2-lrclk, dsp-aif2-rxdat,</div><div class='add'>+      dsp-aif2-txdat, gf-aif3, gf-aif3-bclk, gf-aif3-lrclk,</div><div class='add'>+      gf-aif3-rxdat, gf-aif3-txdat, gf-aif4, gf-aif4-bclk,</div><div class='add'>+      gf-aif4-lrclk, gf-aif4-rxdat, gf-aif4-txdat, gf-aif1,</div><div class='add'>+      gf-aif1-bclk, gf-aif1-lrclk, gf-aif1-rxdat, gf-aif1-txdat,</div><div class='add'>+      gf-aif2, gf-aif2-bclk, gf-aif2-lrclk, gf-aif2-rxdat,</div><div class='add'>+      gf-aif2-txdat, usb-aif1, usb-aif2, adat-aif, soundcard-aif,</div><div class='add'>+</div><div class='add'>+  - output-enable : Specifies that an AIF group will be used as a master</div><div class='add'>+    interface (either this or input-enable is required if a group is</div><div class='add'>+    being muxed to an AIF)</div><div class='add'>+  - input-enable : Specifies that an AIF group will be used as a slave</div><div class='add'>+    interface (either this or output-enable is required if a group is</div><div class='add'>+    being muxed to an AIF)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+lochnagar-pinctrl {</div><div class='add'>+	compatible = "cirrus,lochnagar-pinctrl";</div><div class='add'>+</div><div class='add'>+	gpio-controller;</div><div class='add'>+	#gpio-cells = &lt;2&gt;;</div><div class='add'>+	gpio-ranges = &lt;&amp;lochnagar 0 0 LOCHNAGAR2_PIN_NUM_GPIOS&gt;;</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pin-settings&gt;;</div><div class='add'>+</div><div class='add'>+	pin-settings: pin-settings {</div><div class='add'>+		ap-aif {</div><div class='add'>+			input-enable;</div><div class='add'>+			groups = "gf-aif1";</div><div class='add'>+			function = "codec-aif3";</div><div class='add'>+		};</div><div class='add'>+		codec-aif {</div><div class='add'>+			output-enable;</div><div class='add'>+			groups = "codec-aif3";</div><div class='add'>+			function = "gf-aif1";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt<br/>index 6666277c3acb..8ac1d0851a0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt</a></div><div class='hunk'>@@ -48,9 +48,9 @@ PAD_CTL_HYS                     (1 &lt;&lt; 3)</div><div class='ctx'> PAD_CTL_SRE_SLOW                (1 &lt;&lt; 2)</div><div class='ctx'> PAD_CTL_SRE_FAST                (0 &lt;&lt; 2)</div><div class='ctx'> PAD_CTL_DSE_X1                  (0 &lt;&lt; 0)</div><div class='del'>-PAD_CTL_DSE_X2                  (1 &lt;&lt; 0)</div><div class='del'>-PAD_CTL_DSE_X3                  (2 &lt;&lt; 0)</div><div class='del'>-PAD_CTL_DSE_X4                  (3 &lt;&lt; 0)</div><div class='add'>+PAD_CTL_DSE_X4                  (1 &lt;&lt; 0)</div><div class='add'>+PAD_CTL_DSE_X2                  (2 &lt;&lt; 0)</div><div class='add'>+PAD_CTL_DSE_X6                  (3 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> While iomuxc-lpsr is intended to be used by dedicated peripherals to take</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt<br/>index e7d6f81c227f..205be98ae078 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt</a></div><div class='hunk'>@@ -11,6 +11,7 @@ Required properties:</div><div class='ctx'> 	"mediatek,mt8127-pinctrl", compatible with mt8127 pinctrl.</div><div class='ctx'> 	"mediatek,mt8135-pinctrl", compatible with mt8135 pinctrl.</div><div class='ctx'> 	"mediatek,mt8173-pinctrl", compatible with mt8173 pinctrl.</div><div class='add'>+	"mediatek,mt8516-pinctrl", compatible with mt8516 pinctrl.</div><div class='ctx'> - pins-are-numbered: Specify the subnodes are using numbered pinmux to</div><div class='ctx'>   specify pins.</div><div class='ctx'> - gpio-controller : Marks the device node as a gpio controller.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt<br/>new file mode 100644<br/>index 000000000000..eccbe3f55d3f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+* Mediatek MT8183 Pin Controller</div><div class='add'>+</div><div class='add'>+The Mediatek's Pin controller is used to control SoC pins.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: value should be one of the following.</div><div class='add'>+	"mediatek,mt8183-pinctrl", compatible with mt8183 pinctrl.</div><div class='add'>+- gpio-controller : Marks the device node as a gpio controller.</div><div class='add'>+- #gpio-cells: number of cells in GPIO specifier. Since the generic GPIO</div><div class='add'>+  binding is used, the amount of cells must be specified as 2. See the below</div><div class='add'>+  mentioned gpio binding representation for description of particular cells.</div><div class='add'>+- gpio-ranges : gpio valid number range.</div><div class='add'>+- reg: physical address base for gpio base registers. There are 10 GPIO</div><div class='add'>+  physical address base in mt8183.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- reg-names: gpio base register names. There are 10 gpio base register</div><div class='add'>+  names in mt8183. They are "iocfg0", "iocfg1", "iocfg2", "iocfg3", "iocfg4",</div><div class='add'>+  "iocfg5", "iocfg6", "iocfg7", "iocfg8", "eint".</div><div class='add'>+- interrupt-controller: Marks the device node as an interrupt controller</div><div class='add'>+- #interrupt-cells: Should be two.</div><div class='add'>+- interrupts : The interrupt outputs to sysirq.</div><div class='add'>+</div><div class='add'>+Please refer to pinctrl-bindings.txt in this directory for details of the</div><div class='add'>+common pinctrl bindings used by client devices.</div><div class='add'>+</div><div class='add'>+Subnode format</div><div class='add'>+A pinctrl node should contain at least one subnodes representing the</div><div class='add'>+pinctrl groups available on the machine. Each subnode will list the</div><div class='add'>+pins it needs, and how they should be configured, with regard to muxer</div><div class='add'>+configuration, pullups, drive strength, input enable/disable and input schmitt.</div><div class='add'>+</div><div class='add'>+    node {</div><div class='add'>+	pinmux = &lt;PIN_NUMBER_PINMUX&gt;;</div><div class='add'>+	GENERIC_PINCONFIG;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- pinmux: integer array, represents gpio pin number and mux setting.</div><div class='add'>+    Supported pin number and mux varies for different SoCs, and are defined</div><div class='add'>+    as macros in boot/dts/&lt;soc&gt;-pinfunc.h directly.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- GENERIC_PINCONFIG: is the generic pinconfig options to use, bias-disable,</div><div class='add'>+    bias-pull-down, bias-pull-up, input-enable, input-disable, output-low,</div><div class='add'>+    output-high, input-schmitt-enable, input-schmitt-disable</div><div class='add'>+    and drive-strength are valid.</div><div class='add'>+</div><div class='add'>+    Some special pins have extra pull up strength, there are R0 and R1 pull-up</div><div class='add'>+    resistors available, but for user, it's only need to set R1R0 as 00, 01,</div><div class='add'>+    10 or 11. So It needs config "mediatek,pull-up-adv" or</div><div class='add'>+    "mediatek,pull-down-adv" to support arguments for those special pins.</div><div class='add'>+    Valid arguments are from 0 to 3.</div><div class='add'>+</div><div class='add'>+    mediatek,tdsel: An integer describing the steps for output level shifter</div><div class='add'>+      duty cycle when asserted (high pulse width adjustment). Valid arguments</div><div class='add'>+      are from 0 to 15.</div><div class='add'>+    mediatek,rdsel: An integer describing the steps for input level shifter</div><div class='add'>+      duty cycle when asserted (high pulse width adjustment). Valid arguments</div><div class='add'>+      are from 0 to 63.</div><div class='add'>+</div><div class='add'>+    When config drive-strength, it can support some arguments, such as</div><div class='add'>+    MTK_DRIVE_4mA, MTK_DRIVE_6mA, etc. See dt-bindings/pinctrl/mt65xx.h.</div><div class='add'>+    It can only support 2/4/6/8/10/12/14/16mA in mt8183.</div><div class='add'>+    For I2C pins, there are existing generic driving setup and the specific</div><div class='add'>+    driving setup. I2C pins can only support 2/4/6/8/10/12/14/16mA driving</div><div class='add'>+    adjustment in generic driving setup. But in specific driving setup,</div><div class='add'>+    they can support 0.125/0.25/0.5/1mA adjustment. If we enable specific</div><div class='add'>+    driving setup for I2C pins, the existing generic driving setup will be</div><div class='add'>+    disabled. For some special features, we need the I2C pins specific</div><div class='add'>+    driving setup. The specific driving setup is controlled by E1E0EN.</div><div class='add'>+    So we need add extra vendor driving preperty instead of</div><div class='add'>+    the generic driving property.</div><div class='add'>+    We can add "mediatek,drive-strength-adv = &lt;XXX&gt;;" to describe the specific</div><div class='add'>+    driving setup property. "XXX" means the value of E1E0EN. EN is 0 or 1.</div><div class='add'>+    It is used to enable or disable the specific driving setup.</div><div class='add'>+    E1E0 is used to describe the detail strength specification of the I2C pin.</div><div class='add'>+    When E1=0/E0=0, the strength is 0.125mA.</div><div class='add'>+    When E1=0/E0=1, the strength is 0.25mA.</div><div class='add'>+    When E1=1/E0=0, the strength is 0.5mA.</div><div class='add'>+    When E1=1/E0=1, the strength is 1mA.</div><div class='add'>+    So the valid arguments of "mediatek,drive-strength-adv" are from 0 to 7.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+#include "mt8183-pinfunc.h"</div><div class='add'>+</div><div class='add'>+...</div><div class='add'>+{</div><div class='add'>+	pio: pinctrl@10005000 {</div><div class='add'>+		compatible = "mediatek,mt8183-pinctrl";</div><div class='add'>+		reg = &lt;0 0x10005000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11f20000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11e80000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11e70000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11e90000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11d30000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11d20000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11c50000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x11f30000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x1000b000 0 0x1000&gt;;</div><div class='add'>+		reg-names = "iocfg0", "iocfg1", "iocfg2",</div><div class='add'>+			    "iocfg3", "iocfg4", "iocfg5",</div><div class='add'>+			    "iocfg6", "iocfg7", "iocfg8",</div><div class='add'>+			    "eint";</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		gpio-ranges = &lt;&amp;pio 0 0 192&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		interrupts = &lt;GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		i2c0_pins_a: i2c0 {</div><div class='add'>+			pins1 {</div><div class='add'>+				pinmux = &lt;PINMUX_GPIO48__FUNC_SCL5&gt;,</div><div class='add'>+					 &lt;PINMUX_GPIO49__FUNC_SDA5&gt;;</div><div class='add'>+				mediatek,pull-up-adv = &lt;3&gt;;</div><div class='add'>+				mediatek,drive-strength-adv = &lt;7&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1_pins_a: i2c1 {</div><div class='add'>+			pins {</div><div class='add'>+				pinmux = &lt;PINMUX_GPIO50__FUNC_SCL3&gt;,</div><div class='add'>+					 &lt;PINMUX_GPIO51__FUNC_SDA3&gt;;</div><div class='add'>+				mediatek,pull-down-adv = &lt;2&gt;;</div><div class='add'>+				mediatek,drive-strength-adv = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt<br/>index c2dbb3e8d840..4e90ddd77784 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt</a></div><div class='hunk'>@@ -42,7 +42,7 @@ information about e.g. the mux function.</div><div class='ctx'> The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='ctx'> to specify in a pin configuration subnode:</div><div class='ctx'> </div><div class='del'>- pins, function, bias-disable, bias-pull-down, bias-pull,up, drive-strength,</div><div class='add'>+ pins, function, bias-disable, bias-pull-down, bias-pull-up, drive-strength,</div><div class='ctx'>  output-low, output-high.</div><div class='ctx'> </div><div class='ctx'> Non-empty subnodes must specify the 'pins' property.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt<br/>index 991be0cd0948..84be0f2c6f3b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt</a></div><div class='hunk'>@@ -44,7 +44,7 @@ information about e.g. the mux function.</div><div class='ctx'> </div><div class='ctx'> The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='ctx'> to specify in a pin configuration subnode:</div><div class='del'>- pins, function, bias-disable, bias-pull-down, bias-pull,up, drive-strength.</div><div class='add'>+ pins, function, bias-disable, bias-pull-down, bias-pull-up, drive-strength.</div><div class='ctx'> </div><div class='ctx'> Non-empty subnodes must specify the 'pins' property.</div><div class='ctx'> Note that not all properties are valid for all pins.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt<br/>index 7ed56a1b70fc..a7aaaa7db83b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt</a></div><div class='hunk'>@@ -42,7 +42,7 @@ information about e.g. the mux function.</div><div class='ctx'> The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='ctx'> to specify in a pin configuration subnode:</div><div class='ctx'> </div><div class='del'>- pins, function, bias-disable, bias-pull-down, bias-pull,up, drive-strength,</div><div class='add'>+ pins, function, bias-disable, bias-pull-down, bias-pull-up, drive-strength,</div><div class='ctx'>  output-low, output-high.</div><div class='ctx'> </div><div class='ctx'> Non-empty subnodes must specify the 'pins' property.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt<br/>index cdc4787e59d2..f095209848c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt</a></div><div class='hunk'>@@ -42,7 +42,7 @@ information about e.g. the mux function.</div><div class='ctx'> The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='ctx'> to specify in a pin configuration subnode:</div><div class='ctx'> </div><div class='del'>- pins, function, bias-disable, bias-pull-down, bias-pull,up, drive-strength,</div><div class='add'>+ pins, function, bias-disable, bias-pull-down, bias-pull-up, drive-strength,</div><div class='ctx'>  output-low, output-high.</div><div class='ctx'> </div><div class='ctx'> Non-empty subnodes must specify the 'pins' property.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt<br/>index c22e6c425d0b..004056506679 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt</a></div><div class='hunk'>@@ -41,7 +41,7 @@ information about e.g. the mux function.</div><div class='ctx'> </div><div class='ctx'> The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='ctx'> to specify in a pin configuration subnode:</div><div class='del'>- pins, function, bias-disable, bias-pull-down, bias-pull,up, drive-strength.</div><div class='add'>+ pins, function, bias-disable, bias-pull-down, bias-pull-up, drive-strength.</div><div class='ctx'> </div><div class='ctx'> Non-empty subnodes must specify the 'pins' property.</div><div class='ctx'> Note that not all properties are valid for all pins.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt<br/>index 48df30a36b01..00169255e48c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt</a></div><div class='hunk'>@@ -57,6 +57,8 @@ Optional properties:</div><div class='ctx'>  - st,bank-ioport: should correspond to the EXTI IOport selection (EXTI line</div><div class='ctx'>    used to select GPIOs as interrupts).</div><div class='ctx'>  - hwlocks: reference to a phandle of a hardware spinlock provider node.</div><div class='add'>+ - st,package: Indicates the SOC package used.</div><div class='add'>+   More details in include/dt-bindings/pinctrl/stm32-pinfunc.h</div><div class='ctx'> </div><div class='ctx'> Example 1:</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/stm32f429-pinfunc.h&gt;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt<br/>index 1f496159e2bb..dd25e73b5d79 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/regulator/gpio-regulator.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/regulator/gpio-regulator.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/regulator/gpio-regulator.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/regulator/gpio-regulator.txt</a></div><div class='hunk'>@@ -4,16 +4,30 @@ Required properties:</div><div class='ctx'> - compatible		: Must be "regulator-gpio".</div><div class='ctx'> - regulator-name	: Defined in regulator.txt as optional, but required</div><div class='ctx'> 			  here.</div><div class='del'>-- states		: Selection of available voltages and GPIO configs.</div><div class='del'>-                          if there are no states, then use a fixed regulator</div><div class='add'>+- gpios			: Array of one or more GPIO pins used to select the</div><div class='add'>+			  regulator voltage/current listed in "states".</div><div class='add'>+- states		: Selection of available voltages/currents provided by</div><div class='add'>+			  this regulator and matching GPIO configurations to</div><div class='add'>+			  achieve them. If there are no states in the "states"</div><div class='add'>+			  array, use a fixed regulator instead.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- enable-gpio		: GPIO to use to enable/disable the regulator.</div><div class='del'>-- gpios			: GPIO group used to control voltage.</div><div class='del'>-- gpios-states		: gpios pin's initial states array. 0: LOW, 1: HIGH.</div><div class='del'>-			  defualt is LOW if nothing is specified.</div><div class='add'>+- enable-gpios		: GPIO used to enable/disable the regulator.</div><div class='add'>+			  Warning, the GPIO phandle flags are ignored and the</div><div class='add'>+			  GPIO polarity is controlled solely by the presence</div><div class='add'>+			  of "enable-active-high" DT property. This is due to</div><div class='add'>+			  compatibility with old DTs.</div><div class='add'>+- enable-active-high	: Polarity of "enable-gpio" GPIO is active HIGH.</div><div class='add'>+			  Default is active LOW.</div><div class='add'>+- gpios-states		: On operating systems, that don't support reading back</div><div class='add'>+			  gpio values in output mode (most notably linux), this</div><div class='add'>+			  array provides the state of GPIO pins set when</div><div class='add'>+			  requesting them from the gpio controller. Systems,</div><div class='add'>+			  that are capable of preserving state when requesting</div><div class='add'>+			  the lines, are free to ignore this property.</div><div class='add'>+			  0: LOW, 1: HIGH. Default is LOW if nothing else</div><div class='add'>+			  is specified.</div><div class='ctx'> - startup-delay-us	: Startup time in microseconds.</div><div class='del'>-- enable-active-high	: Polarity of GPIO is active high (default is low).</div><div class='ctx'> - regulator-type	: Specifies what is being regulated, must be either</div><div class='ctx'> 			  "voltage" or "current", defaults to voltage.</div><div class='ctx'> </div><div class='hunk'>@@ -30,7 +44,7 @@ Example:</div><div class='ctx'> 		regulator-max-microvolt = &lt;2600000&gt;;</div><div class='ctx'> 		regulator-boot-on;</div><div class='ctx'> </div><div class='del'>-		enable-gpio = &lt;&amp;gpio0 23 0x4&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio0 23 0x4&gt;;</div><div class='ctx'> 		gpios = &lt;&amp;gpio0 24 0x4</div><div class='ctx'> 			 &amp;gpio0 25 0x4&gt;;</div><div class='ctx'> 		states = &lt;1800000 0x3</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt b/Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt<br/>new file mode 100644<br/>index 000000000000..e372dd3f0c8a<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+STM32MP1 PWR Regulators</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Available Regulators in STM32MP1 PWR block are:</div><div class='add'>+  - reg11 for regulator 1V1</div><div class='add'>+  - reg18 for regulator 1V8</div><div class='add'>+  - usb33 for the swtich USB3V3</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Must be "st,stm32mp1,pwr-reg"</div><div class='add'>+- list of child nodes that specify the regulator reg11, reg18 or usb33</div><div class='add'>+  initialization data for defined regulators. The definition for each of</div><div class='add'>+  these nodes is defined using the standard binding for regulators found at</div><div class='add'>+  Documentation/devicetree/bindings/regulator/regulator.txt.</div><div class='add'>+- vdd-supply: phandle to the parent supply/regulator node for vdd input</div><div class='add'>+- vdd_3v3_usbfs-supply: phandle to the parent supply/regulator node for usb33</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+pwr_regulators: pwr@50001000 {</div><div class='add'>+	compatible = "st,stm32mp1,pwr-reg";</div><div class='add'>+	reg = &lt;0x50001000 0x10&gt;;</div><div class='add'>+	vdd-supply = &lt;&amp;vdd&gt;;</div><div class='add'>+	vdd_3v3_usbfs-supply = &lt;&amp;vdd_usb&gt;;</div><div class='add'>+</div><div class='add'>+	reg11: reg11 {</div><div class='add'>+		regulator-name = "reg11";</div><div class='add'>+		regulator-min-microvolt = &lt;1100000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg18: reg18 {</div><div class='add'>+		regulator-name = "reg18";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb33: usb33 {</div><div class='add'>+		regulator-name = "usb33";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/cdns,uart.txt b/Documentation/devicetree/bindings/serial/cdns,uart.txt<br/>index 227bb770b027..4efc560f90ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/cdns,uart.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/cdns,uart.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/cdns,uart.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/serial/cdns,uart.txt</a></div><div class='hunk'>@@ -12,6 +12,11 @@ Required properties:</div><div class='ctx'>   See ../clocks/clock-bindings.txt for details.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+- cts-override : Override the CTS modem status signal. This signal will</div><div class='add'>+  always be reported as active instead of being obtained from the modem status</div><div class='add'>+  register. Define this if your serial port does not use this pin</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> 	uart@e0000000 {</div><div class='ctx'> 		compatible = "cdns,uart-r1p8";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt<br/>index 742cb470595b..bcfb13194f16 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/mtk-uart.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/mtk-uart.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/mtk-uart.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/serial/mtk-uart.txt</a></div><div class='hunk'>@@ -16,6 +16,7 @@ Required properties:</div><div class='ctx'>   * "mediatek,mt8127-uart" for MT8127 compatible UARTS</div><div class='ctx'>   * "mediatek,mt8135-uart" for MT8135 compatible UARTS</div><div class='ctx'>   * "mediatek,mt8173-uart" for MT8173 compatible UARTS</div><div class='add'>+  * "mediatek,mt8183-uart", "mediatek,mt6577-uart" for MT8183 compatible UARTS</div><div class='ctx'>   * "mediatek,mt6577-uart" for MT6577 and all of the above</div><div class='ctx'> </div><div class='ctx'> - reg: The base address of the UART register bank.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt<br/>index e7921a8e276b..c1091a923a89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt</a></div><div class='hunk'>@@ -12,6 +12,8 @@ Required properties:</div><div class='ctx'> - reg: I2C address of the SC16IS7xx device.</div><div class='ctx'> - interrupts: Should contain the UART interrupt</div><div class='ctx'> - clocks: Reference to the IC source clock.</div><div class='add'>+	OR (when there is no clock provider visible to the platform)</div><div class='add'>+- clock-frequency: The source clock frequency for the IC.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - gpio-controller: Marks the device node as a GPIO controller.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/sifive-serial.txt b/Documentation/devicetree/bindings/serial/sifive-serial.txt<br/>new file mode 100644<br/>index 000000000000..c86b1e524159<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/sifive-serial.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/serial/sifive-serial.txt</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+SiFive asynchronous serial interface (UART)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be something similar to</div><div class='add'>+	      "sifive,&lt;chip&gt;-uart" for the UART as integrated</div><div class='add'>+	      on a particular chip, and "sifive,uart&lt;version&gt;" for the</div><div class='add'>+	      general UART IP block programming model.	Supported</div><div class='add'>+	      compatible strings as of the date of this writing are:</div><div class='add'>+	      "sifive,fu540-c000-uart" for the SiFive UART v0 as</div><div class='add'>+	      integrated onto the SiFive FU540 chip, or "sifive,uart0"</div><div class='add'>+	      for the SiFive UART v0 IP block with no chip integration</div><div class='add'>+	      tweaks (if any)</div><div class='add'>+- reg: address and length of the register space</div><div class='add'>+- interrupts: Should contain the UART interrupt identifier</div><div class='add'>+- clocks: Should contain a clock identifier for the UART's parent clock</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+UART HDL that corresponds to the IP block version numbers can be found</div><div class='add'>+here:</div><div class='add'>+</div><div class='add'>+https://github.com/sifive/sifive-blocks/tree/master/src/main/scala/devices/uart</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+uart0: serial@10010000 {</div><div class='add'>+	compatible = "sifive,fu540-c000-uart", "sifive,uart0";</div><div class='add'>+	interrupt-parent = &lt;&amp;plic0&gt;;</div><div class='add'>+	interrupts = &lt;80&gt;;</div><div class='add'>+	reg = &lt;0x0 0x10010000 0x0 0x1000&gt;;</div><div class='add'>+	clocks = &lt;&amp;prci PRCI_CLK_TLCLK&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/sprd-uart.txt b/Documentation/devicetree/bindings/serial/sprd-uart.txt<br/>index cab40f0f6f49..9607dc616205 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/sprd-uart.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/serial/sprd-uart.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/serial/sprd-uart.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/serial/sprd-uart.txt</a></div><div class='hunk'>@@ -7,7 +7,17 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> - reg: offset and length of the register set for the device</div><div class='ctx'> - interrupts: exactly one interrupt specifier</div><div class='del'>-- clocks: phandles to input clocks.</div><div class='add'>+- clock-names: Should contain following entries:</div><div class='add'>+  "enable" for UART module enable clock,</div><div class='add'>+  "uart" for UART clock,</div><div class='add'>+  "source" for UART source (parent) clock.</div><div class='add'>+- clocks: Should contain a clock specifier for each entry in clock-names.</div><div class='add'>+  UART clock and source clock are optional properties, but enable clock</div><div class='add'>+  is required.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- dma-names: Should contain "rx" for receive and "tx" for transmit channels.</div><div class='add'>+- dmas: A list of dma specifiers, one for each entry in dma-names.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	uart0: serial@0 {</div><div class='hunk'>@@ -15,5 +25,8 @@ Example:</div><div class='ctx'> 			     "sprd,sc9836-uart";</div><div class='ctx'> 		reg = &lt;0x0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-		clocks = &lt;&amp;ext_26m&gt;;</div><div class='add'>+		dma-names = "rx", "tx";</div><div class='add'>+		dmas = &lt;&amp;ap_dma 19&gt;, &lt;&amp;ap_dma 20&gt;;</div><div class='add'>+		clock-names = "enable", "uart", "source";</div><div class='add'>+		clocks = &lt;&amp;clk_ap_apb_gates 9&gt;, &lt;&amp;clk_uart0&gt;, &lt;&amp;ext_26m&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/fsl-spi.txt b/Documentation/devicetree/bindings/spi/fsl-spi.txt<br/>index 8854004a1d3a..411375eac54d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/fsl-spi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/fsl-spi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/fsl-spi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/fsl-spi.txt</a></div><div class='hunk'>@@ -18,6 +18,10 @@ Optional properties:</div><div class='ctx'> - gpios : specifies the gpio pins to be used for chipselects.</div><div class='ctx'>   The gpios will be referred to as reg = &lt;index&gt; in the SPI child nodes.</div><div class='ctx'>   If unspecified, a single SPI device without a chip select can be used.</div><div class='add'>+- fsl,spisel_boot : for the MPC8306 and MPC8309, specifies that the</div><div class='add'>+  SPISEL_BOOT signal is used as chip select for a slave device. Use</div><div class='add'>+  reg = &lt;number of gpios&gt; in the corresponding child node, i.e. 0 if</div><div class='add'>+  the gpios property is not present.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	spi@4c0 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt b/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt<br/>index 9ba7c5a273b4..db8e0d71c5bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt</a></div><div class='hunk'>@@ -23,6 +23,18 @@ Required properties:</div><div class='ctx'> Recommended properties:</div><div class='ctx'> - spi-max-frequency: Definition as per</div><div class='ctx'>                      Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+Optional properties:</div><div class='add'>+- nvidia,tx-clk-tap-delay: Delays the clock going out to the external device</div><div class='add'>+  with this tap value. This property is used to tune the outgoing data from</div><div class='add'>+  Tegra SPI master with respect to outgoing Tegra SPI master clock.</div><div class='add'>+  Tap values vary based on the platform design trace lengths from Tegra SPI</div><div class='add'>+  to corresponding slave devices. Valid tap values are from 0 thru 63.</div><div class='add'>+- nvidia,rx-clk-tap-delay: Delays the clock coming in from the external device</div><div class='add'>+  with this tap value. This property is used to adjust the Tegra SPI master</div><div class='add'>+  clock with respect to the data from the SPI slave device.</div><div class='add'>+  Tap values vary based on the platform design trace lengths from Tegra SPI</div><div class='add'>+  to corresponding slave devices. Valid tap values are from 0 thru 63.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> spi@7000d600 {</div><div class='hunk'>@@ -38,4 +50,12 @@ spi@7000d600 {</div><div class='ctx'> 	reset-names = "spi";</div><div class='ctx'> 	dmas = &lt;&amp;apbdma 16&gt;, &lt;&amp;apbdma 16&gt;;</div><div class='ctx'> 	dma-names = "rx", "tx";</div><div class='add'>+	&lt;spi-client&gt;@&lt;bus_num&gt; {</div><div class='add'>+		...</div><div class='add'>+		...</div><div class='add'>+		nvidia,rx-clk-tap-delay = &lt;0&gt;;</div><div class='add'>+		nvidia,tx-clk-tap-delay = &lt;16&gt;;</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt<br/>index 37cf69586d10..18e14ee257b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/sh-msiof.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/sh-msiof.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/sh-msiof.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/sh-msiof.txt</a></div><div class='hunk'>@@ -4,6 +4,7 @@ Required properties:</div><div class='ctx'> - compatible           : "renesas,msiof-r8a7743" (RZ/G1M)</div><div class='ctx'> 			 "renesas,msiof-r8a7744" (RZ/G1N)</div><div class='ctx'> 			 "renesas,msiof-r8a7745" (RZ/G1E)</div><div class='add'>+			 "renesas,msiof-r8a77470" (RZ/G1C)</div><div class='ctx'> 			 "renesas,msiof-r8a774a1" (RZ/G2M)</div><div class='ctx'> 			 "renesas,msiof-r8a774c0" (RZ/G2E)</div><div class='ctx'> 			 "renesas,msiof-r8a7790" (R-Car H2)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt<br/>index 2864bc6b659c..f54c8c36395e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt</a></div><div class='hunk'>@@ -8,9 +8,16 @@ Required properties:</div><div class='ctx'> - interrupts : One interrupt, used by the controller.</div><div class='ctx'> - #address-cells : &lt;1&gt;, as required by generic SPI binding.</div><div class='ctx'> - #size-cells : &lt;0&gt;, also as required by generic SPI binding.</div><div class='add'>+- clocks : phandles for the clocks, see the description of clock-names below.</div><div class='add'>+   The phandle for the "ssi_clk" is required. The phandle for the "pclk" clock</div><div class='add'>+   is optional. If a single clock is specified but no clock-name, it is the</div><div class='add'>+   "ssi_clk" clock. If both clocks are listed, the "ssi_clk" must be first.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- cs-gpios : Specifies the gpio pis to be used for chipselects.</div><div class='add'>+- clock-names : Contains the names of the clocks:</div><div class='add'>+    "ssi_clk", for the core clock used to generate the external SPI clock.</div><div class='add'>+    "pclk", the interface clock, required for register access.</div><div class='add'>+- cs-gpios : Specifies the gpio pins to be used for chipselects.</div><div class='ctx'> - num-cs : The number of chipselects. If omitted, this will default to 4.</div><div class='ctx'> - reg-io-width : The I/O register width (in bytes) implemented by this</div><div class='ctx'>   device.  Supported values are 2 or 4 (the default).</div><div class='hunk'>@@ -25,6 +32,7 @@ Example:</div><div class='ctx'> 		interrupts = &lt;0 154 4&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;spi_m_clk&gt;;</div><div class='ctx'> 		num-cs = &lt;2&gt;;</div><div class='ctx'> 		cs-gpios = &lt;&amp;gpio0 13 0&gt;,</div><div class='ctx'> 			   &lt;&amp;gpio0 14 0&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt b/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt<br/>index 6cc3c6fe25a3..e71b81a41ac0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt</a></div><div class='hunk'>@@ -7,7 +7,11 @@ Required properties:</div><div class='ctx'> - reg : address and length of the lpspi master registers</div><div class='ctx'> - interrupt-parent : core interrupt controller</div><div class='ctx'> - interrupts : lpspi interrupt</div><div class='del'>-- clocks : lpspi clock specifier</div><div class='add'>+- clocks : lpspi clock specifier. Its number and order need to correspond to the</div><div class='add'>+	   value in clock-names.</div><div class='add'>+- clock-names : Corresponding to per clock and ipg clock in "clocks"</div><div class='add'>+		respectively. In i.MX7ULP, it only has per clk, so use CLK_DUMMY</div><div class='add'>+		to fill the "ipg" blank.</div><div class='ctx'> - spi-slave : spi slave mode support. In slave mode, add this attribute without</div><div class='ctx'> 	      value. In master mode, remove it.</div><div class='ctx'> </div><div class='hunk'>@@ -18,6 +22,8 @@ lpspi2: lpspi@40290000 {</div><div class='ctx'> 	reg = &lt;0x40290000 0x10000&gt;;</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	interrupts = &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-	clocks = &lt;&amp;clks IMX7ULP_CLK_LPSPI2&gt;;</div><div class='add'>+	clocks = &lt;&amp;clks IMX7ULP_CLK_LPSPI2&gt;,</div><div class='add'>+		 &lt;&amp;clks IMX7ULP_CLK_DUMMY&gt;;</div><div class='add'>+	clock-names = "per", "ipg";</div><div class='ctx'> 	spi-slave;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-mt65xx.txt b/Documentation/devicetree/bindings/spi/spi-mt65xx.txt<br/>index 69c356767cf8..c0f6c8ecfa2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/spi-mt65xx.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/spi/spi-mt65xx.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/spi-mt65xx.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/spi-mt65xx.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ Required properties:</div><div class='ctx'>     - mediatek,mt8135-spi: for mt8135 platforms</div><div class='ctx'>     - mediatek,mt8173-spi: for mt8173 platforms</div><div class='ctx'>     - mediatek,mt8183-spi: for mt8183 platforms</div><div class='add'>+    - "mediatek,mt8516-spi", "mediatek,mt2712-spi": for mt8516 platforms</div><div class='ctx'> </div><div class='ctx'> - #address-cells: should be 1.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-mt7621.txt b/Documentation/devicetree/bindings/spi/spi-mt7621.txt<br/>new file mode 100644<br/>index 000000000000..d5baec0fa56e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/spi-mt7621.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/spi-mt7621.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+Binding for MTK SPI controller (MT7621 MIPS)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be one of the following:</div><div class='add'>+  - "ralink,mt7621-spi": for mt7621/mt7628/mt7688 platforms</div><div class='add'>+- #address-cells: should be 1.</div><div class='add'>+- #size-cells: should be 0.</div><div class='add'>+- reg: Address and length of the register set for the device</div><div class='add'>+- resets: phandle to the reset controller asserting this device in</div><div class='add'>+          reset</div><div class='add'>+  See ../reset/reset.txt for details.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- cs-gpios: see spi-bus.txt.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+- SoC Specific Portion:</div><div class='add'>+spi0: spi@b00 {</div><div class='add'>+	compatible = "ralink,mt7621-spi";</div><div class='add'>+	reg = &lt;0xb00 0x100&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	resets = &lt;&amp;rstctrl 18&gt;;</div><div class='add'>+	reset-names = "spi";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt b/Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt<br/>new file mode 100644<br/>index 000000000000..16b734ad3102<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+Xilinx Zynq QSPI controller Device Tree Bindings</div><div class='add'>+-------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible		: Should be "xlnx,zynq-qspi-1.0".</div><div class='add'>+- reg			: Physical base address and size of QSPI registers map.</div><div class='add'>+- interrupts		: Property with a value describing the interrupt</div><div class='add'>+			  number.</div><div class='add'>+- clock-names		: List of input clock names - "ref_clk", "pclk"</div><div class='add'>+			  (See clock bindings for details).</div><div class='add'>+- clocks		: Clock phandles (see clock bindings for details).</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- num-cs		: Number of chip selects used.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	qspi: spi@e000d000 {</div><div class='add'>+		compatible = "xlnx,zynq-qspi-1.0";</div><div class='add'>+		reg = &lt;0xe000d000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+		interrupts = &lt;0 19 4&gt;;</div><div class='add'>+		clock-names = "ref_clk", "pclk";</div><div class='add'>+		clocks = &lt;&amp;clkc 10&gt;, &lt;&amp;clkc 43&gt;;</div><div class='add'>+		num-cs = &lt;1&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml b/Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml<br/>index c4ab59550fc2..b3f0fe96ff0d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml</a></div><div class='hunk'>@@ -59,6 +59,7 @@ properties:</div><div class='ctx'> </div><div class='ctx'> patternProperties:</div><div class='ctx'>   '^frame@[0-9a-z]*$':</div><div class='add'>+    type: object</div><div class='ctx'>     description: A timer node has up to 8 frame sub-nodes, each with the following properties.</div><div class='ctx'>     properties:</div><div class='ctx'>       frame-number:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml<br/>index d79fb22bde39..747fd3f689dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/trivial-devices.yaml?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/trivial-devices.yaml</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/trivial-devices.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/trivial-devices.yaml</a></div><div class='hunk'>@@ -92,6 +92,8 @@ properties:</div><div class='ctx'>           - fsl,sgtl5000</div><div class='ctx'>             # G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface</div><div class='ctx'>           - gmt,g751</div><div class='add'>+            # Infineon IR38064 Voltage Regulator</div><div class='add'>+          - infineon,ir38064</div><div class='ctx'>             # Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)</div><div class='ctx'>           - infineon,slb9635tt</div><div class='ctx'>             # Infineon SLB9645 I2C TPM (new protocol, max 400khz)</div><div class='hunk'>@@ -102,6 +104,8 @@ properties:</div><div class='ctx'>           - isil,isl29028</div><div class='ctx'>             # Intersil ISL29030 Ambient Light and Proximity Sensor</div><div class='ctx'>           - isil,isl29030</div><div class='add'>+            # Intersil ISL68137 Digital Output Configurable PWM Controller</div><div class='add'>+          - isil,isl68137</div><div class='ctx'>             # 5 Bit Programmable, Pulse-Width Modulator</div><div class='ctx'>           - maxim,ds1050</div><div class='ctx'>             # Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs</div><div class='head'>diff --git a/Documentation/devicetree/bindings/ufs/cdns,ufshc.txt b/Documentation/devicetree/bindings/ufs/cdns,ufshc.txt<br/>index a04a4989ec7f..02347b017abd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/cdns,ufshc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/cdns,ufshc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/cdns,ufshc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/ufs/cdns,ufshc.txt</a></div><div class='hunk'>@@ -5,8 +5,9 @@ Each UFS controller instance should have its own node.</div><div class='ctx'> Please see the ufshcd-pltfrm.txt for a list of all available properties.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible	: Compatible list, contains the following controller:</div><div class='del'>-			"cdns,ufshc"</div><div class='add'>+- compatible	: Compatible list, contains one of the following controllers:</div><div class='add'>+			"cdns,ufshc" - Generic CDNS HCI,</div><div class='add'>+			"cdns,ufshc-m31-16nm" - CDNS UFS HC + M31 16nm PHY</div><div class='ctx'> 		  complemented with the JEDEC version:</div><div class='ctx'> 			"jedec,ufs-2.0"</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/ufs/ufs-mediatek.txt b/Documentation/devicetree/bindings/ufs/ufs-mediatek.txt<br/>new file mode 100644<br/>index 000000000000..72aab8547308<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/ufs-mediatek.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/ufs/ufs-mediatek.txt</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+* Mediatek Universal Flash Storage (UFS) Host Controller</div><div class='add'>+</div><div class='add'>+UFS nodes are defined to describe on-chip UFS hardware macro.</div><div class='add'>+Each UFS Host Controller should have its own node.</div><div class='add'>+</div><div class='add'>+To bind UFS PHY with UFS host controller, the controller node should</div><div class='add'>+contain a phandle reference to UFS M-PHY node.</div><div class='add'>+</div><div class='add'>+Required properties for UFS nodes:</div><div class='add'>+- compatible         : Compatible list, contains the following controller:</div><div class='add'>+                       "mediatek,mt8183-ufshci" for MediaTek UFS host controller</div><div class='add'>+                       present on MT81xx chipsets.</div><div class='add'>+- reg                : Address and length of the UFS register set.</div><div class='add'>+- phys               : phandle to m-phy.</div><div class='add'>+- clocks             : List of phandle and clock specifier pairs.</div><div class='add'>+- clock-names        : List of clock input name strings sorted in the same</div><div class='add'>+                       order as the clocks property. "ufs" is mandatory.</div><div class='add'>+                       "ufs": ufshci core control clock.</div><div class='add'>+- freq-table-hz      : Array of &lt;min max&gt; operating frequencies stored in the same</div><div class='add'>+                       order as the clocks property. If this property is not</div><div class='add'>+                       defined or a value in the array is "0" then it is assumed</div><div class='add'>+                       that the frequency is set by the parent clock or a</div><div class='add'>+                       fixed rate clock source.</div><div class='add'>+- vcc-supply         : phandle to VCC supply regulator node.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	ufsphy: phy@11fa0000 {</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ufshci@11270000 {</div><div class='add'>+		compatible = "mediatek,mt8183-ufshci";</div><div class='add'>+		reg = &lt;0 0x11270000 0 0x2300&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 104 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		phys = &lt;&amp;ufsphy&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;infracfg_ao INFRACFG_AO_UFS_CG&gt;;</div><div class='add'>+		clock-names = "ufs";</div><div class='add'>+		freq-table-hz = &lt;0 0&gt;;</div><div class='add'>+</div><div class='add'>+		vcc-supply = &lt;&amp;mt_pmic_vemc_ldo_reg&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/ufs/ufs-qcom.txt b/Documentation/devicetree/bindings/ufs/ufs-qcom.txt<br/>index 21d9a93db2e9..fd59f93e9556 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/ufs-qcom.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/ufs-qcom.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/ufs-qcom.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/ufs/ufs-qcom.txt</a></div><div class='hunk'>@@ -29,6 +29,7 @@ Optional properties:</div><div class='ctx'> - vdda-pll-max-microamp : specifies max. load that can be drawn from pll supply</div><div class='ctx'> - vddp-ref-clk-supply   : phandle to UFS device ref_clk pad power supply</div><div class='ctx'> - vddp-ref-clk-max-microamp : specifies max. load that can be drawn from this supply</div><div class='add'>+- resets : specifies the PHY reset in the UFS controller</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -51,9 +52,11 @@ Example:</div><div class='ctx'> 			&lt;&amp;clock_gcc clk_ufs_phy_ldo&gt;,</div><div class='ctx'> 			&lt;&amp;clock_gcc clk_gcc_ufs_tx_cfg_clk&gt;,</div><div class='ctx'> 			&lt;&amp;clock_gcc clk_gcc_ufs_rx_cfg_clk&gt;;</div><div class='add'>+		resets = &lt;&amp;ufshc 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ufshc@fc598000 {</div><div class='add'>+	ufshc: ufshc@fc598000 {</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 		...</div><div class='ctx'> 		phys = &lt;&amp;ufsphy1&gt;;</div><div class='ctx'> 		phy-names = "ufsphy";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt<br/>index 5111e9130bc3..56bccde9953a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt</a></div><div class='hunk'>@@ -31,7 +31,6 @@ Optional properties:</div><div class='ctx'> - vcc-max-microamp      : specifies max. load that can be drawn from vcc supply</div><div class='ctx'> - vccq-max-microamp     : specifies max. load that can be drawn from vccq supply</div><div class='ctx'> - vccq2-max-microamp    : specifies max. load that can be drawn from vccq2 supply</div><div class='del'>-- &lt;name&gt;-fixed-regulator : boolean property specifying that &lt;name&gt;-supply is a fixed regulator</div><div class='ctx'> </div><div class='ctx'> - clocks                : List of phandle and clock specifier pairs</div><div class='ctx'> - clock-names           : List of clock input name strings sorted in the same</div><div class='hunk'>@@ -50,6 +49,8 @@ Optional properties:</div><div class='ctx'> -lanes-per-direction	: number of lanes available per direction - either 1 or 2.</div><div class='ctx'> 			  Note that it is assume same number of lanes is used both</div><div class='ctx'> 			  directions at once. If not specified, default is 2 lanes per direction.</div><div class='add'>+- #reset-cells		: Must be &lt;1&gt; for Qualcomm UFS controllers that expose</div><div class='add'>+			  PHY reset from the UFS controller.</div><div class='ctx'> - resets            : reset node register</div><div class='ctx'> - reset-names       : describe reset node register, the "rst" corresponds to reset the whole UFS IP.</div><div class='ctx'> </div><div class='hunk'>@@ -63,7 +64,6 @@ Example:</div><div class='ctx'> 		interrupts = &lt;0 28 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		vdd-hba-supply = &lt;&amp;xxx_reg0&gt;;</div><div class='del'>-		vdd-hba-fixed-regulator;</div><div class='ctx'> 		vcc-supply = &lt;&amp;xxx_reg1&gt;;</div><div class='ctx'> 		vcc-supply-1p8;</div><div class='ctx'> 		vccq-supply = &lt;&amp;xxx_reg2&gt;;</div><div class='hunk'>@@ -79,4 +79,5 @@ Example:</div><div class='ctx'> 		reset-names = "rst";</div><div class='ctx'> 		phys = &lt;&amp;ufsphy1&gt;;</div><div class='ctx'> 		phy-names = "ufsphy";</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/amlogic,dwc3.txt b/Documentation/devicetree/bindings/usb/amlogic,dwc3.txt<br/>index 9a8b631904fd..b9f04e617eb7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/amlogic,dwc3.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/amlogic,dwc3.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/amlogic,dwc3.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/amlogic,dwc3.txt</a></div><div class='hunk'>@@ -40,3 +40,91 @@ Example device nodes:</div><div class='ctx'> 				phy-names = "usb2-phy", "usb3-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+Amlogic Meson G12A DWC3 USB SoC Controller Glue</div><div class='add'>+</div><div class='add'>+The Amlogic G12A embeds a DWC3 USB IP Core configured for USB2 and USB3</div><div class='add'>+in host-only mode, and a DWC2 IP Core configured for USB2 peripheral mode</div><div class='add'>+only.</div><div class='add'>+</div><div class='add'>+A glue connects the DWC3 core to USB2 PHYs and optionnaly to an USB3 PHY.</div><div class='add'>+</div><div class='add'>+One of the USB2 PHY can be re-routed in peripheral mode to a DWC2 USB IP.</div><div class='add'>+</div><div class='add'>+The DWC3 Glue controls the PHY routing and power, an interrupt line is</div><div class='add'>+connected to the Glue to serve as OTG ID change detection.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	Should be "amlogic,meson-g12a-usb-ctrl"</div><div class='add'>+- clocks:	a handle for the "USB" clock</div><div class='add'>+- resets:	a handle for the shared "USB" reset line</div><div class='add'>+- reg:		The base address and length of the registers</div><div class='add'>+- interrupts:	the interrupt specifier for the OTG detection</div><div class='add'>+- phys: 	handle to used PHYs on the system</div><div class='add'>+	- a &lt;0&gt; phandle can be used if a PHY is not used</div><div class='add'>+- phy-names:	names of the used PHYs on the system :</div><div class='add'>+	- "usb2-phy0" for USB2 PHY0 if USBHOST_A port is used</div><div class='add'>+	- "usb2-phy1" for USB2 PHY1 if USBOTG_B port is used</div><div class='add'>+	- "usb3-phy0" for USB3 PHY if USB3_0 is used</div><div class='add'>+- dr_mode:	should be "host", "peripheral", or "otg" depending on</div><div class='add'>+	the usage and configuration of the OTG Capable port.</div><div class='add'>+	- "host" and "peripheral" means a fixed Host or Device only connection</div><div class='add'>+	- "otg" means the port can be used as both Host or Device and</div><div class='add'>+	  be switched automatically using the OTG ID pin.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- vbus-supply:	should be a phandle to the regulator controlling the VBUS</div><div class='add'>+		power supply when used in OTG switchable mode</div><div class='add'>+</div><div class='add'>+Required child nodes:</div><div class='add'>+</div><div class='add'>+A child node must exist to represent the core DWC3 IP block. The name of</div><div class='add'>+the node is not important. The content of the node is defined in dwc3.txt.</div><div class='add'>+</div><div class='add'>+A child node must exist to represent the core DWC2 IP block. The name of</div><div class='add'>+the node is not important. The content of the node is defined in dwc2.txt.</div><div class='add'>+</div><div class='add'>+PHY documentation is provided in the following places:</div><div class='add'>+- Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt</div><div class='add'>+- Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt</div><div class='add'>+</div><div class='add'>+Example device nodes:</div><div class='add'>+	usb: usb@ffe09000 {</div><div class='add'>+			compatible = "amlogic,meson-g12a-usb-ctrl";</div><div class='add'>+			reg = &lt;0x0 0xffe09000 0x0 0xa0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;clkc CLKID_USB&gt;;</div><div class='add'>+			resets = &lt;&amp;reset RESET_USB&gt;;</div><div class='add'>+</div><div class='add'>+			dr_mode = "otg";</div><div class='add'>+</div><div class='add'>+			phys = &lt;&amp;usb2_phy0&gt;, &lt;&amp;usb2_phy1&gt;,</div><div class='add'>+			       &lt;&amp;usb3_pcie_phy PHY_TYPE_USB3&gt;;</div><div class='add'>+			phy-names = "usb2-phy0", "usb2-phy1", "usb3-phy0";</div><div class='add'>+</div><div class='add'>+			dwc2: usb@ff400000 {</div><div class='add'>+				compatible = "amlogic,meson-g12a-usb", "snps,dwc2";</div><div class='add'>+				reg = &lt;0x0 0xff400000 0x0 0x40000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;clkc CLKID_USB1_DDR_BRIDGE&gt;;</div><div class='add'>+				clock-names = "ddr";</div><div class='add'>+				phys = &lt;&amp;usb2_phy1&gt;;</div><div class='add'>+				dr_mode = "peripheral";</div><div class='add'>+				g-rx-fifo-size = &lt;192&gt;;</div><div class='add'>+				g-np-tx-fifo-size = &lt;128&gt;;</div><div class='add'>+				g-tx-fifo-size = &lt;128 128 16 16 16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			dwc3: usb@ff500000 {</div><div class='add'>+				compatible = "snps,dwc3";</div><div class='add'>+				reg = &lt;0x0 0xff500000 0x0 0x100000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				dr_mode = "host";</div><div class='add'>+				snps,dis_u2_susphy_quirk;</div><div class='add'>+				snps,quirk-frame-length-adjustment;</div><div class='add'>+			};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt<br/>index 6dc3c4a34483..49eac0dc86b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/dwc2.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/dwc2.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/dwc2.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/dwc2.txt</a></div><div class='hunk'>@@ -14,6 +14,7 @@ Required properties:</div><div class='ctx'>   - "amlogic,meson8-usb": The DWC2 USB controller instance in Amlogic Meson8 SoCs;</div><div class='ctx'>   - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;</div><div class='ctx'>   - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;</div><div class='add'>+  - "amlogic,meson-g12a-usb": The DWC2 USB controller instance in Amlogic G12A SoCs;</div><div class='ctx'>   - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;</div><div class='ctx'>   - snps,dwc2: A generic DWC2 USB controller with default parameters.</div><div class='ctx'>   - "st,stm32f4x9-fsotg": The DWC2 USB FS/HS controller instance in STM32F4x9 SoCs</div><div class='hunk'>@@ -31,12 +32,18 @@ Refer to clk/clock-bindings.txt for generic clock consumer properties</div><div class='ctx'> Optional properties:</div><div class='ctx'> - phys: phy provider specifier</div><div class='ctx'> - phy-names: shall be "usb2-phy"</div><div class='add'>+- vbus-supply: reference to the VBUS regulator. Depending on the current mode</div><div class='add'>+  this is enabled (in "host" mode") or disabled (in "peripheral" mode). The</div><div class='add'>+  regulator is updated if the controller is configured in "otg" mode and the</div><div class='add'>+  status changes between "host" and "peripheral".</div><div class='ctx'> Refer to phy/phy-bindings.txt for generic phy consumer properties</div><div class='ctx'> - dr_mode: shall be one of "host", "peripheral" and "otg"</div><div class='ctx'>   Refer to usb/generic.txt</div><div class='ctx'> - g-rx-fifo-size: size of rx fifo size in gadget mode.</div><div class='ctx'> - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.</div><div class='ctx'> - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.</div><div class='add'>+- snps,reset-phy-on-wake: If present indicates that we need to reset the PHY when</div><div class='add'>+                          we detect a wakeup.  This is due to a hardware errata.</div><div class='ctx'> </div><div class='ctx'> Deprecated properties:</div><div class='ctx'> - g-use-dma: gadget DMA mode is automatically detected</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml<br/>new file mode 100644<br/>index 000000000000..d3b4f6415920<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/generic-ehci.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/generic-ehci.yaml</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: http://devicetree.org/schemas/usb/generic-ehci.yaml#</div><div class='add'>+$schema: http://devicetree.org/meta-schemas/core.yaml#</div><div class='add'>+</div><div class='add'>+title: USB EHCI Controller Device Tree Bindings</div><div class='add'>+</div><div class='add'>+allOf:</div><div class='add'>+  - $ref: "usb-hcd.yaml"</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  compatible:</div><div class='add'>+    contains:</div><div class='add'>+      const: generic-ehci</div><div class='add'>+</div><div class='add'>+  reg:</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  interrupts:</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  resets:</div><div class='add'>+    minItems: 1</div><div class='add'>+    maxItems: 4</div><div class='add'>+</div><div class='add'>+  clocks:</div><div class='add'>+    minItems: 1</div><div class='add'>+    maxItems: 4</div><div class='add'>+    description: |</div><div class='add'>+      In case the Renesas R-Car Gen3 SoCs:</div><div class='add'>+        - if a host only channel: first clock should be host.</div><div class='add'>+        - if a USB DRD channel: first clock should be host and second</div><div class='add'>+          one should be peripheral</div><div class='add'>+</div><div class='add'>+  big-endian:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag for HCDs with big endian descriptors and big</div><div class='add'>+      endian registers.</div><div class='add'>+</div><div class='add'>+  big-endian-desc:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag for HCDs with big endian descriptors.</div><div class='add'>+</div><div class='add'>+  big-endian-regs:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag for HCDs with big endian registers.</div><div class='add'>+</div><div class='add'>+  has-transaction-translator:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag if EHCI has a Transaction Translator built into</div><div class='add'>+      the root hub.</div><div class='add'>+</div><div class='add'>+  needs-reset-on-resume:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag to force EHCI reset after resume.</div><div class='add'>+</div><div class='add'>+  phys: true</div><div class='add'>+</div><div class='add'>+required:</div><div class='add'>+  - compatible</div><div class='add'>+  - reg</div><div class='add'>+  - interrupts</div><div class='add'>+</div><div class='add'>+additionalProperties: false</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+    ehci@e0000300 {</div><div class='add'>+        compatible = "ibm,usb-ehci-440epx", "generic-ehci";</div><div class='add'>+        interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+        interrupts = &lt;0x1a 4&gt;;</div><div class='add'>+        reg = &lt;0 0xe0000300 90 0 0xe0000390 70&gt;;</div><div class='add'>+        big-endian;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+  - |</div><div class='add'>+    ehci0: usb@1c14000 {</div><div class='add'>+        compatible = "allwinner,sun4i-a10-ehci", "generic-ehci";</div><div class='add'>+        reg = &lt;0x01c14000 0x100&gt;;</div><div class='add'>+        interrupts = &lt;39&gt;;</div><div class='add'>+        clocks = &lt;&amp;ahb_gates 1&gt;;</div><div class='add'>+        phys = &lt;&amp;usbphy 1&gt;;</div><div class='add'>+        phy-names = "usb";</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+...</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml<br/>new file mode 100644<br/>index 000000000000..da5a14becbe5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/generic-ohci.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/generic-ohci.yaml</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: http://devicetree.org/schemas/usb/generic-ohci.yaml#</div><div class='add'>+$schema: http://devicetree.org/meta-schemas/core.yaml#</div><div class='add'>+</div><div class='add'>+title: USB OHCI Controller Device Tree Bindings</div><div class='add'>+</div><div class='add'>+allOf:</div><div class='add'>+  - $ref: "usb-hcd.yaml"</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  compatible:</div><div class='add'>+    contains:</div><div class='add'>+      const: generic-ohci</div><div class='add'>+</div><div class='add'>+  reg:</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  interrupts:</div><div class='add'>+    maxItems: 1</div><div class='add'>+</div><div class='add'>+  resets:</div><div class='add'>+    minItems: 1</div><div class='add'>+    maxItems: 2</div><div class='add'>+</div><div class='add'>+  clocks:</div><div class='add'>+    minItems: 1</div><div class='add'>+    maxItems: 3</div><div class='add'>+    description: |</div><div class='add'>+      In case the Renesas R-Car Gen3 SoCs:</div><div class='add'>+        - if a host only channel: first clock should be host.</div><div class='add'>+        - if a USB DRD channel: first clock should be host and second</div><div class='add'>+          one should be peripheral</div><div class='add'>+</div><div class='add'>+  big-endian:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag for HCDs with big endian descriptors and big</div><div class='add'>+      endian registers.</div><div class='add'>+</div><div class='add'>+  big-endian-desc:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag for HCDs with big endian descriptors.</div><div class='add'>+</div><div class='add'>+  big-endian-regs:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set this flag for HCDs with big endian registers.</div><div class='add'>+</div><div class='add'>+  remote-wakeup-connected:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Remote wakeup is wired on the platform.</div><div class='add'>+</div><div class='add'>+  no-big-frame-no:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/flag</div><div class='add'>+    description:</div><div class='add'>+      Set if frame_no lives in bits [15:0] of HCCA</div><div class='add'>+</div><div class='add'>+  num-ports:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/uint32</div><div class='add'>+    description:</div><div class='add'>+      Overrides the detected port count</div><div class='add'>+</div><div class='add'>+  phys: true</div><div class='add'>+</div><div class='add'>+required:</div><div class='add'>+  - compatible</div><div class='add'>+  - reg</div><div class='add'>+  - interrupts</div><div class='add'>+</div><div class='add'>+additionalProperties: false</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+      ohci0: usb@1c14400 {</div><div class='add'>+          compatible = "allwinner,sun4i-a10-ohci", "generic-ohci";</div><div class='add'>+          reg = &lt;0x01c14400 0x100&gt;;</div><div class='add'>+          interrupts = &lt;64&gt;;</div><div class='add'>+          clocks = &lt;&amp;usb_clk 6&gt;, &lt;&amp;ahb_gates 2&gt;;</div><div class='add'>+          phys = &lt;&amp;usbphy 1&gt;;</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+...</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt b/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt<br/>index 620355cee63f..16808721f3ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt</a></div><div class='hunk'>@@ -8,9 +8,15 @@ Required properties:</div><div class='ctx'> - interrupt-names: must be "mc"</div><div class='ctx'> - clocks: phandle to the "udc" clock</div><div class='ctx'> - clock-names: must be "udc"</div><div class='add'>+- phys: phandle to the USB PHY</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='add'>+usb_phy: usb-phy@0 {</div><div class='add'>+	compatible = "usb-nop-xceiv";</div><div class='add'>+	#phy-cells = &lt;0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> udc: usb@13040000 {</div><div class='ctx'> 	compatible = "ingenic,jz4740-musb";</div><div class='ctx'> 	reg = &lt;0x13040000 0x10000&gt;;</div><div class='hunk'>@@ -21,4 +27,6 @@ udc: usb@13040000 {</div><div class='ctx'> </div><div class='ctx'> 	clocks = &lt;&amp;cgu JZ4740_CLK_UDC&gt;;</div><div class='ctx'> 	clock-names = "udc";</div><div class='add'>+</div><div class='add'>+	phys = &lt;&amp;usb_phy&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt<br/>index 4156c3e181c5..5bfcc0b4d6b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ Required properties:</div><div class='ctx'>   - Tegra124: "nvidia,tegra124-xusb"</div><div class='ctx'>   - Tegra132: "nvidia,tegra132-xusb", "nvidia,tegra124-xusb"</div><div class='ctx'>   - Tegra210: "nvidia,tegra210-xusb"</div><div class='add'>+  - Tegra186: "nvidia,tegra186-xusb"</div><div class='ctx'> - reg: Must contain the base and length of the xHCI host registers, XUSB FPCI</div><div class='ctx'>   registers and XUSB IPFS registers.</div><div class='ctx'> - reg-names: Must contain the following entries:</div><div class='hunk'>@@ -59,6 +60,8 @@ For Tegra210:</div><div class='ctx'> - avdd-pll-uerefe-supply: PLLE reference PLL power supply. Must supply 1.05 V.</div><div class='ctx'> - dvdd-pex-pll-supply: PCIe/USB3 PLL power supply. Must supply 1.05 V.</div><div class='ctx'> - hvdd-pex-pll-e-supply: High-voltage PLLE power supply. Must supply 1.8 V.</div><div class='add'>+</div><div class='add'>+For Tegra210 and Tegra186:</div><div class='ctx'> - power-domains: A list of PM domain specifiers that reference each power-domain</div><div class='ctx'>   used by the xHCI controller. This list must comprise of a specifier for the</div><div class='ctx'>   XUSBA and XUSBC power-domains. See ../power/power_domain.txt and</div><div class='hunk'>@@ -78,6 +81,7 @@ Optional properties:</div><div class='ctx'>   - Tegra132: usb2-0, usb2-1, usb2-2, hsic-0, hsic-1, usb3-0, usb3-1</div><div class='ctx'>   - Tegra210: usb2-0, usb2-1, usb2-2, usb2-3, hsic-0, usb3-0, usb3-1, usb3-2,</div><div class='ctx'>               usb3-3</div><div class='add'>+  - Tegra186: usb2-0, usb2-1, usb2-2, hsic-0, usb3-0, usb3-1, usb3-2</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> --------</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt<br/>index d93b6a1504f2..b8acc2a994a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/renesas_usbhs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/renesas_usbhs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/renesas_usbhs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/renesas_usbhs.txt</a></div><div class='hunk'>@@ -6,6 +6,7 @@ Required properties:</div><div class='ctx'> 	- "renesas,usbhs-r8a7743" for r8a7743 (RZ/G1M) compatible device</div><div class='ctx'> 	- "renesas,usbhs-r8a7744" for r8a7744 (RZ/G1N) compatible device</div><div class='ctx'> 	- "renesas,usbhs-r8a7745" for r8a7745 (RZ/G1E) compatible device</div><div class='add'>+	- "renesas,usbhs-r8a77470" for r8a77470 (RZ/G1C) compatible device</div><div class='ctx'> 	- "renesas,usbhs-r8a774a1" for r8a774a1 (RZ/G2M) compatible device</div><div class='ctx'> 	- "renesas,usbhs-r8a774c0" for r8a774c0 (RZ/G2E) compatible device</div><div class='ctx'> 	- "renesas,usbhs-r8a7790" for r8a7790 (R-Car H2) compatible device</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt<br/>deleted file mode 100644<br/>index 406252d14c6b..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb-ehci.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-ehci.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-USB EHCI controllers</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-  - compatible : should be "generic-ehci".</div><div class='del'>-  - reg : should contain at least address and length of the standard EHCI</div><div class='del'>-    register set for the device. Optional platform-dependent registers</div><div class='del'>-    (debug-port or other) can be also specified here, but only after</div><div class='del'>-    definition of standard EHCI registers.</div><div class='del'>-  - interrupts : one EHCI interrupt should be described here.</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>- - big-endian-regs : boolean, set this for hcds with big-endian registers</div><div class='del'>- - big-endian-desc : boolean, set this for hcds with big-endian descriptors</div><div class='del'>- - big-endian : boolean, for hcds with big-endian-regs + big-endian-desc</div><div class='del'>- - needs-reset-on-resume : boolean, set this to force EHCI reset after resume</div><div class='del'>- - has-transaction-translator : boolean, set this if EHCI have a Transaction</div><div class='del'>-				Translator built into the root hub.</div><div class='del'>- - clocks : a list of phandle + clock specifier pairs. In case of Renesas</div><div class='del'>-	    R-Car Gen3 SoCs:</div><div class='del'>-	    - if a host only channel: first clock should be host.</div><div class='del'>-	    - if a USB DRD channel: first clock should be host and second one</div><div class='del'>-				    should be peripheral.</div><div class='del'>- - phys : see usb-hcd.txt in the current directory</div><div class='del'>- - resets : phandle + reset specifier pair</div><div class='del'>-</div><div class='del'>-additionally the properties from usb-hcd.txt (in the current directory) are</div><div class='del'>-supported.</div><div class='del'>-</div><div class='del'>-Example (Sequoia 440EPx):</div><div class='del'>-    ehci@e0000300 {</div><div class='del'>-	   compatible = "ibm,usb-ehci-440epx", "usb-ehci";</div><div class='del'>-	   interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='del'>-	   interrupts = &lt;1a 4&gt;;</div><div class='del'>-	   reg = &lt;0 e0000300 90 0 e0000390 70&gt;;</div><div class='del'>-	   big-endian;</div><div class='del'>-   };</div><div class='del'>-</div><div class='del'>-Example (Allwinner sun4i A10 SoC):</div><div class='del'>-   ehci0: usb@1c14000 {</div><div class='del'>-	   compatible = "allwinner,sun4i-a10-ehci", "generic-ehci";</div><div class='del'>-	   reg = &lt;0x01c14000 0x100&gt;;</div><div class='del'>-	   interrupts = &lt;39&gt;;</div><div class='del'>-	   clocks = &lt;&amp;ahb_gates 1&gt;;</div><div class='del'>-	   phys = &lt;&amp;usbphy 1&gt;;</div><div class='del'>-	   phy-names = "usb";</div><div class='del'>-   };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb-hcd.txt b/Documentation/devicetree/bindings/usb/usb-hcd.txt<br/>deleted file mode 100644<br/>index 50529b838c9c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb-hcd.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-hcd.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Generic USB HCD (Host Controller Device) Properties</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- phys: a list of all USB PHYs on this HCD</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-	&amp;usb1 {</div><div class='del'>-		phys = &lt;&amp;usb2_phy1&gt;, &lt;&amp;usb3_phy1&gt;;</div><div class='del'>-	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb-hcd.yaml b/Documentation/devicetree/bindings/usb/usb-hcd.yaml<br/>new file mode 100644<br/>index 000000000000..9c8c56d3a792<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb-hcd.yaml?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/usb-hcd.yaml</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+%YAML 1.2</div><div class='add'>+---</div><div class='add'>+$id: http://devicetree.org/schemas/usb/usb-hcd.yaml#</div><div class='add'>+$schema: http://devicetree.org/meta-schemas/core.yaml#</div><div class='add'>+</div><div class='add'>+title: Generic USB Host Controller Device Tree Bindings</div><div class='add'>+</div><div class='add'>+maintainers:</div><div class='add'>+  - Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='add'>+</div><div class='add'>+properties:</div><div class='add'>+  $nodename:</div><div class='add'>+    pattern: "^usb(@.*)?"</div><div class='add'>+</div><div class='add'>+  phys:</div><div class='add'>+    $ref: /schemas/types.yaml#/definitions/phandle-array</div><div class='add'>+    description:</div><div class='add'>+      List of all the USB PHYs on this HCD</div><div class='add'>+</div><div class='add'>+examples:</div><div class='add'>+  - |</div><div class='add'>+    usb {</div><div class='add'>+        phys = &lt;&amp;usb2_phy1&gt;, &lt;&amp;usb3_phy1&gt;;</div><div class='add'>+    };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt<br/>deleted file mode 100644<br/>index aaaa5255c972..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb-ohci.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-ohci.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-USB OHCI controllers</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible : "generic-ohci"</div><div class='del'>-- reg : ohci controller register range (address and length)</div><div class='del'>-- interrupts : ohci controller interrupt</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- big-endian-regs : boolean, set this for hcds with big-endian registers</div><div class='del'>-- big-endian-desc : boolean, set this for hcds with big-endian descriptors</div><div class='del'>-- big-endian : boolean, for hcds with big-endian-regs + big-endian-desc</div><div class='del'>-- no-big-frame-no : boolean, set if frame_no lives in bits [15:0] of HCCA</div><div class='del'>-- remote-wakeup-connected: remote wakeup is wired on the platform</div><div class='del'>-- num-ports : u32, to override the detected port count</div><div class='del'>-- clocks : a list of phandle + clock specifier pairs. In case of Renesas</div><div class='del'>-	   R-Car Gen3 SoCs:</div><div class='del'>-	   - if a host only channel: first clock should be host.</div><div class='del'>-	   - if a USB DRD channel: first clock should be host and second one</div><div class='del'>-				   should be peripheral.</div><div class='del'>-- phys : see usb-hcd.txt in the current directory</div><div class='del'>-- resets : a list of phandle + reset specifier pairs</div><div class='del'>-</div><div class='del'>-additionally the properties from usb-hcd.txt (in the current directory) are</div><div class='del'>-supported.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-	ohci0: usb@1c14400 {</div><div class='del'>-		compatible = "allwinner,sun4i-a10-ohci", "generic-ohci";</div><div class='del'>-		reg = &lt;0x01c14400 0x100&gt;;</div><div class='del'>-		interrupts = &lt;64&gt;;</div><div class='del'>-		clocks = &lt;&amp;usb_clk 6&gt;, &lt;&amp;ahb_gates 2&gt;;</div><div class='del'>-		phys = &lt;&amp;usbphy 1&gt;;</div><div class='del'>-		phy-names = "usb";</div><div class='del'>-	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt<br/>index fea8b1545751..97400e8f8605 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb-xhci.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb-xhci.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb-xhci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/usb-xhci.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ Required properties:</div><div class='ctx'>     - "renesas,xhci-r8a7743" for r8a7743 SoC</div><div class='ctx'>     - "renesas,xhci-r8a7744" for r8a7744 SoC</div><div class='ctx'>     - "renesas,xhci-r8a774a1" for r8a774a1 SoC</div><div class='add'>+    - "renesas,xhci-r8a774c0" for r8a774c0 SoC</div><div class='ctx'>     - "renesas,xhci-r8a7790" for r8a7790 SoC</div><div class='ctx'>     - "renesas,xhci-r8a7791" for r8a7791 SoC</div><div class='ctx'>     - "renesas,xhci-r8a7793" for r8a7793 SoC</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb251xb.txt b/Documentation/devicetree/bindings/usb/usb251xb.txt<br/>index 17915f64b8ee..bc7945e9dbfe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb251xb.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/usb/usb251xb.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/usb/usb251xb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/usb/usb251xb.txt</a></div><div class='hunk'>@@ -64,8 +64,10 @@ Optional properties :</div><div class='ctx'>  - power-on-time-ms : Specifies the time it takes from the time the host</div><div class='ctx'> 	initiates the power-on sequence to a port until the port has adequate</div><div class='ctx'> 	power. The value is given in ms in a 0 - 510 range (default is 100ms).</div><div class='del'>- - swap-dx-lanes : Specifies the ports which will swap the differential-pair</div><div class='del'>-	(D+/D-), default is not-swapped.</div><div class='add'>+ - swap-dx-lanes : Specifies the downstream ports which will swap the</div><div class='add'>+	differential-pair (D+/D-), default is not-swapped.</div><div class='add'>+ - swap-us-lanes : Selects the upstream port differential-pair (D+/D-)</div><div class='add'>+	swapping (boolean, default is not-swapped)</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> 	usb2512b@2c {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt<br/>index 8162b0eb4b50..686771d056c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/vendor-prefixes.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/bindings/vendor-prefixes.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/vendor-prefixes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/vendor-prefixes.txt</a></div><div class='hunk'>@@ -36,6 +36,7 @@ aptina	Aptina Imaging</div><div class='ctx'> arasan	Arasan Chip Systems</div><div class='ctx'> archermind ArcherMind Technology (Nanjing) Co., Ltd.</div><div class='ctx'> arctic	Arctic Sand</div><div class='add'>+arcx	arcx Inc. / Archronix Inc.</div><div class='ctx'> aries	Aries Embedded GmbH</div><div class='ctx'> arm	ARM Ltd.</div><div class='ctx'> armadeus	ARMadeus Systems SARL</div><div class='hunk'>@@ -210,6 +211,7 @@ kiebackpeter    Kieback &amp; Peter GmbH</div><div class='ctx'> kinetic Kinetic Technologies</div><div class='ctx'> kingdisplay	King &amp; Display Technology Co., Ltd.</div><div class='ctx'> kingnovel	Kingnovel Technology Co., Ltd.</div><div class='add'>+kionix	Kionix, Inc.</div><div class='ctx'> koe	Kaohsiung Opto-Electronics Inc.</div><div class='ctx'> kosagi	Sutajio Ko-Usagi PTE Ltd.</div><div class='ctx'> kyo	Kyocera Corporation</div><div class='hunk'>@@ -233,6 +235,7 @@ lsi	LSI Corp. (LSI Logic)</div><div class='ctx'> lwn	Liebherr-Werk Nenzing GmbH</div><div class='ctx'> macnica	Macnica Americas</div><div class='ctx'> marvell	Marvell Technology Group Ltd.</div><div class='add'>+maxbotix	MaxBotix Inc.</div><div class='ctx'> maxim	Maxim Integrated Products</div><div class='ctx'> mbvl	Mobiveil Inc.</div><div class='ctx'> mcube	mCube</div><div class='head'>diff --git a/Documentation/devicetree/bindings/writing-bindings.txt b/Documentation/devicetree/bindings/writing-bindings.txt<br/>new file mode 100644<br/>index 000000000000..27dfd2d8016e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/bindings/writing-bindings.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/bindings/writing-bindings.txt</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+DOs and DON'Ts for designing and writing Devicetree bindings</div><div class='add'>+</div><div class='add'>+This is a list of common review feedback items focused on binding design. With</div><div class='add'>+every rule, there are exceptions and bindings have many gray areas.</div><div class='add'>+</div><div class='add'>+For guidelines related to patches, see</div><div class='add'>+Documentation/devicetree/bindings/submitting-patches.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Overall design</div><div class='add'>+</div><div class='add'>+- DO attempt to make bindings complete even if a driver doesn't support some</div><div class='add'>+  features. For example, if a device has an interrupt, then include the</div><div class='add'>+  'interrupts' property even if the driver is only polled mode.</div><div class='add'>+</div><div class='add'>+- DON'T refer to Linux or "device driver" in bindings. Bindings should be</div><div class='add'>+  based on what the hardware has, not what an OS and driver currently support.</div><div class='add'>+</div><div class='add'>+- DO use node names matching the class of the device. Many standard names are</div><div class='add'>+  defined in the DT Spec. If there isn't one, consider adding it.</div><div class='add'>+</div><div class='add'>+- DO check that the example matches the documentation especially after making</div><div class='add'>+  review changes.</div><div class='add'>+</div><div class='add'>+- DON'T create nodes just for the sake of instantiating drivers. Multi-function</div><div class='add'>+  devices only need child nodes when the child nodes have their own DT</div><div class='add'>+  resources. A single node can be multiple providers (e.g. clocks and resets).</div><div class='add'>+</div><div class='add'>+- DON'T use 'syscon' alone without a specific compatible string. A 'syscon'</div><div class='add'>+  hardware block should have a compatible string unique enough to infer the</div><div class='add'>+  register layout of the entire block (at a minimum).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Properties</div><div class='add'>+</div><div class='add'>+- DO make 'compatible' properties specific. DON'T use wildcards in compatible</div><div class='add'>+  strings. DO use fallback compatibles when devices are the same as or a subset</div><div class='add'>+  of prior implementations. DO add new compatibles in case there are new</div><div class='add'>+  features or bugs.</div><div class='add'>+</div><div class='add'>+- DO use a vendor prefix on device specific property names. Consider if</div><div class='add'>+  properties could be common among devices of the same class. Check other</div><div class='add'>+  existing bindings for similar devices.</div><div class='add'>+</div><div class='add'>+- DON'T redefine common properties. Just reference the definition and define</div><div class='add'>+  constraints specific to the device.</div><div class='add'>+</div><div class='add'>+- DO use common property unit suffixes for properties with scientific units.</div><div class='add'>+  See property-units.txt.</div><div class='add'>+</div><div class='add'>+- DO define properties in terms of constraints. How many entries? What are</div><div class='add'>+  possible values? What is the order?</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Board/SoC .dts Files</div><div class='add'>+</div><div class='add'>+- DO put all MMIO devices under a bus node and not at the top-level.</div><div class='add'>+</div><div class='add'>+- DO use non-empty 'ranges' to limit the size of child buses/devices. 64-bit</div><div class='add'>+  platforms don't need all devices to have 64-bit address and size.</div><div class='head'>diff --git a/Documentation/devicetree/writing-schema.md b/Documentation/devicetree/writing-schema.md<br/>index a3652d33a48f..dc032db36262 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/writing-schema.md?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/devicetree/writing-schema.md</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/devicetree/writing-schema.md?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/devicetree/writing-schema.md</a></div><div class='hunk'>@@ -97,7 +97,7 @@ The DT schema project must be installed in order to validate the DT schema</div><div class='ctx'> binding documents and validate DTS files using the DT schema. The DT schema</div><div class='ctx'> project can be installed with pip:</div><div class='ctx'> </div><div class='del'>-`pip3 install git+https://github.com/robherring/yaml-bindings.git@master`</div><div class='add'>+`pip3 install git+https://github.com/devicetree-org/dt-schema.git@master`</div><div class='ctx'> </div><div class='ctx'> dtc must also be built with YAML output support enabled. This requires that</div><div class='ctx'> libyaml and its headers be installed on the host system.</div><div class='head'>diff --git a/Documentation/doc-guide/index.rst b/Documentation/doc-guide/index.rst<br/>index a7f95d7d3a63..603f3ff55d5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/doc-guide/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/doc-guide/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/doc-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/doc-guide/index.rst</a></div><div class='hunk'>@@ -7,9 +7,9 @@ How to write kernel documentation</div><div class='ctx'> .. toctree::</div><div class='ctx'>    :maxdepth: 1</div><div class='ctx'> </div><div class='del'>-   sphinx.rst</div><div class='del'>-   kernel-doc.rst</div><div class='del'>-   parse-headers.rst</div><div class='add'>+   sphinx</div><div class='add'>+   kernel-doc</div><div class='add'>+   parse-headers</div><div class='ctx'> </div><div class='ctx'> .. only::  subproject and html</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/dontdiff b/Documentation/dontdiff<br/>index ef25a066d952..5eba889ea84d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/dontdiff?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/dontdiff</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/dontdiff?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/dontdiff</a></div><div class='hunk'>@@ -127,7 +127,7 @@ flask.h</div><div class='ctx'> fore200e_mkfirm</div><div class='ctx'> fore200e_pca_fw.c*</div><div class='ctx'> gconf</div><div class='del'>-gconf.glade.h</div><div class='add'>+gconf-cfg</div><div class='ctx'> gen-devlist</div><div class='ctx'> gen_crc32table</div><div class='ctx'> gen_init_cpio</div><div class='hunk'>@@ -148,24 +148,22 @@ int32.c</div><div class='ctx'> int4.c</div><div class='ctx'> int8.c</div><div class='ctx'> kallsyms</div><div class='del'>-kconfig</div><div class='ctx'> keywords.c</div><div class='ctx'> ksym.c*</div><div class='ctx'> ksym.h*</div><div class='del'>-kxgettext</div><div class='ctx'> *lex.c</div><div class='ctx'> *lex.*.c</div><div class='ctx'> linux</div><div class='ctx'> logo_*.c</div><div class='ctx'> logo_*_clut224.c</div><div class='ctx'> logo_*_mono.c</div><div class='del'>-lxdialog</div><div class='ctx'> mach-types</div><div class='ctx'> mach-types.h</div><div class='ctx'> machtypes.h</div><div class='ctx'> map</div><div class='ctx'> map_hugetlb</div><div class='ctx'> mconf</div><div class='add'>+mconf-cfg</div><div class='ctx'> miboot*</div><div class='ctx'> mk_elfconfig</div><div class='ctx'> mkboot</div><div class='hunk'>@@ -176,11 +174,14 @@ mkprep</div><div class='ctx'> mkregtable</div><div class='ctx'> mktables</div><div class='ctx'> mktree</div><div class='add'>+mkutf8data</div><div class='ctx'> modpost</div><div class='ctx'> modules.builtin</div><div class='add'>+modules.builtin.modinfo</div><div class='ctx'> modules.order</div><div class='ctx'> modversions.h*</div><div class='ctx'> nconf</div><div class='add'>+nconf-cfg</div><div class='ctx'> ncscope.*</div><div class='ctx'> offset.h</div><div class='ctx'> oui.c*</div><div class='hunk'>@@ -200,6 +201,7 @@ pnmtologo</div><div class='ctx'> ppc_defs.h*</div><div class='ctx'> pss_boot.h</div><div class='ctx'> qconf</div><div class='add'>+qconf-cfg</div><div class='ctx'> r100_reg_safe.h</div><div class='ctx'> r200_reg_safe.h</div><div class='ctx'> r300_reg_safe.h</div><div class='hunk'>@@ -254,6 +256,7 @@ vsyscall_32.lds</div><div class='ctx'> wanxlfw.inc</div><div class='ctx'> uImage</div><div class='ctx'> unifdef</div><div class='add'>+utf8data.h</div><div class='ctx'> wakeup.bin</div><div class='ctx'> wakeup.elf</div><div class='ctx'> wakeup.lds</div><div class='head'>diff --git a/Documentation/driver-api/acpi/index.rst b/Documentation/driver-api/acpi/index.rst<br/>new file mode 100644<br/>index 000000000000..ace0008e54c2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/acpi/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/acpi/index.rst</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+============</div><div class='add'>+ACPI Support</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   linuxized-acpica</div><div class='add'>+   scan_handlers</div><div class='head'>diff --git a/Documentation/acpi/linuxized-acpica.txt b/Documentation/driver-api/acpi/linuxized-acpica.rst<br/>index 3ad7b0dfb083..0ca8f1538519 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/linuxized-acpica.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/linuxized-acpica.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/acpi/linuxized-acpica.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/acpi/linuxized-acpica.rst</a></div><div class='hunk'>@@ -1,31 +1,37 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+============================================================</div><div class='ctx'> Linuxized ACPICA - Introduction to ACPICA Release Automation</div><div class='add'>+============================================================</div><div class='ctx'> </div><div class='del'>-Copyright (C) 2013-2016, Intel Corporation</div><div class='del'>-Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='add'>+:Copyright: |copy| 2013-2016, Intel Corporation</div><div class='ctx'> </div><div class='add'>+:Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='ctx'> </div><div class='del'>-Abstract:</div><div class='ctx'> </div><div class='add'>+Abstract</div><div class='add'>+========</div><div class='ctx'> This document describes the ACPICA project and the relationship between</div><div class='ctx'> ACPICA and Linux.  It also describes how ACPICA code in drivers/acpi/acpica,</div><div class='ctx'> include/acpi and tools/power/acpi is automatically updated to follow the</div><div class='ctx'> upstream.</div><div class='ctx'> </div><div class='add'>+ACPICA Project</div><div class='add'>+==============</div><div class='ctx'> </div><div class='del'>-1. ACPICA Project</div><div class='del'>-</div><div class='del'>-   The ACPI Component Architecture (ACPICA) project provides an operating</div><div class='del'>-   system (OS)-independent reference implementation of the Advanced</div><div class='del'>-   Configuration and Power Interface Specification (ACPI).  It has been</div><div class='del'>-   adapted by various host OSes.  By directly integrating ACPICA, Linux can</div><div class='del'>-   also benefit from the application experiences of ACPICA from other host</div><div class='del'>-   OSes.</div><div class='add'>+The ACPI Component Architecture (ACPICA) project provides an operating</div><div class='add'>+system (OS)-independent reference implementation of the Advanced</div><div class='add'>+Configuration and Power Interface Specification (ACPI).  It has been</div><div class='add'>+adapted by various host OSes.  By directly integrating ACPICA, Linux can</div><div class='add'>+also benefit from the application experiences of ACPICA from other host</div><div class='add'>+OSes.</div><div class='ctx'> </div><div class='del'>-   The homepage of ACPICA project is: www.acpica.org, it is maintained and</div><div class='del'>-   supported by Intel Corporation.</div><div class='add'>+The homepage of ACPICA project is: www.acpica.org, it is maintained and</div><div class='add'>+supported by Intel Corporation.</div><div class='ctx'> </div><div class='del'>-   The following figure depicts the Linux ACPI subsystem where the ACPICA</div><div class='del'>-   adaptation is included:</div><div class='add'>+The following figure depicts the Linux ACPI subsystem where the ACPICA</div><div class='add'>+adaptation is included::</div><div class='ctx'> </div><div class='ctx'>       +---------------------------------------------------------+</div><div class='ctx'>       |                                                         |</div><div class='hunk'>@@ -71,21 +77,27 @@ upstream.</div><div class='ctx'> </div><div class='ctx'>                  Figure 1. Linux ACPI Software Components</div><div class='ctx'> </div><div class='del'>-   NOTE:</div><div class='add'>+.. note::</div><div class='ctx'>     A. OS Service Layer - Provided by Linux to offer OS dependent</div><div class='ctx'>        implementation of the predefined ACPICA interfaces (acpi_os_*).</div><div class='add'>+       ::</div><div class='add'>+</div><div class='ctx'>          include/acpi/acpiosxf.h</div><div class='ctx'>          drivers/acpi/osl.c</div><div class='ctx'>          include/acpi/platform</div><div class='ctx'>          include/asm/acenv.h</div><div class='ctx'>     B. ACPICA Functionality - Released from ACPICA code base to offer</div><div class='ctx'>        OS independent implementation of the ACPICA interfaces (acpi_*).</div><div class='add'>+       ::</div><div class='add'>+</div><div class='ctx'>          drivers/acpi/acpica</div><div class='ctx'>          include/acpi/ac*.h</div><div class='ctx'>          tools/power/acpi</div><div class='ctx'>     C. Linux/ACPI Functionality - Providing Linux specific ACPI</div><div class='ctx'>        functionality to the other Linux kernel subsystems and user space</div><div class='ctx'>        programs.</div><div class='add'>+       ::</div><div class='add'>+</div><div class='ctx'>          drivers/acpi</div><div class='ctx'>          include/linux/acpi.h</div><div class='ctx'>          include/linux/acpi*.h</div><div class='hunk'>@@ -95,24 +107,27 @@ upstream.</div><div class='ctx'>        ACPI subsystem to offer architecture specific implementation of the</div><div class='ctx'>        ACPI interfaces.  They are Linux specific components and are out of</div><div class='ctx'>        the scope of this document.</div><div class='add'>+       ::</div><div class='add'>+</div><div class='ctx'>          include/asm/acpi.h</div><div class='ctx'>          include/asm/acpi*.h</div><div class='ctx'>          arch/*/acpi</div><div class='ctx'> </div><div class='del'>-2. ACPICA Release</div><div class='add'>+ACPICA Release</div><div class='add'>+==============</div><div class='ctx'> </div><div class='del'>-   The ACPICA project maintains its code base at the following repository URL:</div><div class='del'>-   https://github.com/acpica/acpica.git. As a rule, a release is made every</div><div class='del'>-   month.</div><div class='add'>+The ACPICA project maintains its code base at the following repository URL:</div><div class='add'>+https://github.com/acpica/acpica.git. As a rule, a release is made every</div><div class='add'>+month.</div><div class='ctx'> </div><div class='del'>-   As the coding style adopted by the ACPICA project is not acceptable by</div><div class='del'>-   Linux, there is a release process to convert the ACPICA git commits into</div><div class='del'>-   Linux patches.  The patches generated by this process are referred to as</div><div class='del'>-   "linuxized ACPICA patches".  The release process is carried out on a local</div><div class='del'>-   copy the ACPICA git repository.  Each commit in the monthly release is</div><div class='del'>-   converted into a linuxized ACPICA patch.  Together, they form the monthly</div><div class='del'>-   ACPICA release patchset for the Linux ACPI community.  This process is</div><div class='del'>-   illustrated in the following figure:</div><div class='add'>+As the coding style adopted by the ACPICA project is not acceptable by</div><div class='add'>+Linux, there is a release process to convert the ACPICA git commits into</div><div class='add'>+Linux patches.  The patches generated by this process are referred to as</div><div class='add'>+"linuxized ACPICA patches".  The release process is carried out on a local</div><div class='add'>+copy the ACPICA git repository.  Each commit in the monthly release is</div><div class='add'>+converted into a linuxized ACPICA patch.  Together, they form the monthly</div><div class='add'>+ACPICA release patchset for the Linux ACPI community.  This process is</div><div class='add'>+illustrated in the following figure::</div><div class='ctx'> </div><div class='ctx'>     +-----------------------------+</div><div class='ctx'>     | acpica / master (-) commits |</div><div class='hunk'>@@ -153,7 +168,7 @@ upstream.</div><div class='ctx'> </div><div class='ctx'>                 Figure 2. ACPICA -&gt; Linux Upstream Process</div><div class='ctx'> </div><div class='del'>-   NOTE:</div><div class='add'>+.. note::</div><div class='ctx'>     A. Linuxize Utilities - Provided by the ACPICA repository, including a</div><div class='ctx'>        utility located in source/tools/acpisrc folder and a number of</div><div class='ctx'>        scripts located in generate/linux folder.</div><div class='hunk'>@@ -170,19 +185,20 @@ upstream.</div><div class='ctx'>    following kernel configuration options:</div><div class='ctx'>    CONFIG_ACPI/CONFIG_ACPI_DEBUG/CONFIG_ACPI_DEBUGGER</div><div class='ctx'> </div><div class='del'>-3. ACPICA Divergences</div><div class='add'>+ACPICA Divergences</div><div class='add'>+==================</div><div class='ctx'> </div><div class='del'>-   Ideally, all of the ACPICA commits should be converted into Linux patches</div><div class='del'>-   automatically without manual modifications, the "linux / master" tree should</div><div class='del'>-   contain the ACPICA code that exactly corresponds to the ACPICA code</div><div class='del'>-   contained in "new linuxized acpica" tree and it should be possible to run</div><div class='del'>-   the release process fully automatically.</div><div class='add'>+Ideally, all of the ACPICA commits should be converted into Linux patches</div><div class='add'>+automatically without manual modifications, the "linux / master" tree should</div><div class='add'>+contain the ACPICA code that exactly corresponds to the ACPICA code</div><div class='add'>+contained in "new linuxized acpica" tree and it should be possible to run</div><div class='add'>+the release process fully automatically.</div><div class='ctx'> </div><div class='del'>-   As a matter of fact, however, there are source code differences between</div><div class='del'>-   the ACPICA code in Linux and the upstream ACPICA code, referred to as</div><div class='del'>-   "ACPICA Divergences".</div><div class='add'>+As a matter of fact, however, there are source code differences between</div><div class='add'>+the ACPICA code in Linux and the upstream ACPICA code, referred to as</div><div class='add'>+"ACPICA Divergences".</div><div class='ctx'> </div><div class='del'>-   The various sources of ACPICA divergences include:</div><div class='add'>+The various sources of ACPICA divergences include:</div><div class='ctx'>    1. Legacy divergences - Before the current ACPICA release process was</div><div class='ctx'>       established, there already had been divergences between Linux and</div><div class='ctx'>       ACPICA. Over the past several years those divergences have been greatly</div><div class='hunk'>@@ -213,11 +229,12 @@ upstream.</div><div class='ctx'>       rebased on the ACPICA side in order to offer better solutions, new ACPICA</div><div class='ctx'>       divergences are generated.</div><div class='ctx'> </div><div class='del'>-4. ACPICA Development</div><div class='add'>+ACPICA Development</div><div class='add'>+==================</div><div class='ctx'> </div><div class='del'>-   This paragraph guides Linux developers to use the ACPICA upstream release</div><div class='del'>-   utilities to obtain Linux patches corresponding to upstream ACPICA commits</div><div class='del'>-   before they become available from the ACPICA release process.</div><div class='add'>+This paragraph guides Linux developers to use the ACPICA upstream release</div><div class='add'>+utilities to obtain Linux patches corresponding to upstream ACPICA commits</div><div class='add'>+before they become available from the ACPICA release process.</div><div class='ctx'> </div><div class='ctx'>    1. Cherry-pick an ACPICA commit</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +242,7 @@ upstream.</div><div class='ctx'>    you want to cherry pick must be committed into the local repository.</div><div class='ctx'> </div><div class='ctx'>    Then the gen-patch.sh command can help to cherry-pick an ACPICA commit</div><div class='del'>-   from the ACPICA local repository:</div><div class='add'>+   from the ACPICA local repository::</div><div class='ctx'> </div><div class='ctx'>    $ git clone https://github.com/acpica/acpica</div><div class='ctx'>    $ cd acpica</div><div class='hunk'>@@ -240,7 +257,7 @@ upstream.</div><div class='ctx'>    changes that haven't been applied to Linux yet.</div><div class='ctx'> </div><div class='ctx'>    You can generate the ACPICA release series yourself and rebase your code on</div><div class='del'>-   top of the generated ACPICA release patches:</div><div class='add'>+   top of the generated ACPICA release patches::</div><div class='ctx'> </div><div class='ctx'>    $ git clone https://github.com/acpica/acpica</div><div class='ctx'>    $ cd acpica</div><div class='hunk'>@@ -254,7 +271,7 @@ upstream.</div><div class='ctx'>    3. Inspect the current divergences</div><div class='ctx'> </div><div class='ctx'>    If you have local copies of both Linux and upstream ACPICA, you can generate</div><div class='del'>-   a diff file indicating the state of the current divergences:</div><div class='add'>+   a diff file indicating the state of the current divergences::</div><div class='ctx'> </div><div class='ctx'>    # git clone https://github.com/acpica/acpica</div><div class='ctx'>    # git clone http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git</div><div class='head'>diff --git a/Documentation/acpi/scan_handlers.txt b/Documentation/driver-api/acpi/scan_handlers.rst<br/>index 3246ccf15992..7a197b3a33fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/scan_handlers.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/scan_handlers.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/acpi/scan_handlers.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/acpi/scan_handlers.rst</a></div><div class='hunk'>@@ -1,7 +1,13 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+==================</div><div class='ctx'> ACPI Scan Handlers</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+:Copyright: |copy| 2012, Intel Corporation</div><div class='ctx'> </div><div class='del'>-Copyright (C) 2012, Intel Corporation</div><div class='del'>-Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> During system initialization and ACPI-based device hot-add, the ACPI namespace</div><div class='ctx'> is scanned in search of device objects that generally represent various pieces</div><div class='hunk'>@@ -30,14 +36,14 @@ to configure that link so that the kernel can use it.</div><div class='ctx'> Those additional configuration tasks usually depend on the type of the hardware</div><div class='ctx'> component represented by the given device node which can be determined on the</div><div class='ctx'> basis of the device node's hardware ID (HID).  They are performed by objects</div><div class='del'>-called ACPI scan handlers represented by the following structure:</div><div class='add'>+called ACPI scan handlers represented by the following structure::</div><div class='ctx'> </div><div class='del'>-struct acpi_scan_handler {</div><div class='del'>-	const struct acpi_device_id *ids;</div><div class='del'>-	struct list_head list_node;</div><div class='del'>-	int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);</div><div class='del'>-	void (*detach)(struct acpi_device *dev);</div><div class='del'>-};</div><div class='add'>+	struct acpi_scan_handler {</div><div class='add'>+		const struct acpi_device_id *ids;</div><div class='add'>+		struct list_head list_node;</div><div class='add'>+		int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);</div><div class='add'>+		void (*detach)(struct acpi_device *dev);</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> where ids is the list of IDs of device nodes the given handler is supposed to</div><div class='ctx'> take care of, list_node is the hook to the global list of ACPI scan handlers</div><div class='head'>diff --git a/Documentation/driver-api/device-io.rst b/Documentation/driver-api/device-io.rst<br/>index b00b23903078..0e389378f71d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/device-io.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/device-io.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/device-io.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/device-io.rst</a></div><div class='hunk'>@@ -103,51 +103,6 @@ continuing execution::</div><div class='ctx'>         ha-&gt;flags.ints_enabled = 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-In addition to write posting, on some large multiprocessing systems</div><div class='del'>-(e.g. SGI Challenge, Origin and Altix machines) posted writes won't be</div><div class='del'>-strongly ordered coming from different CPUs. Thus it's important to</div><div class='del'>-properly protect parts of your driver that do memory-mapped writes with</div><div class='del'>-locks and use the :c:func:`mmiowb()` to make sure they arrive in the</div><div class='del'>-order intended. Issuing a regular readX() will also ensure write ordering,</div><div class='del'>-but should only be used when the </div><div class='del'>-driver has to be sure that the write has actually arrived at the device</div><div class='del'>-(not that it's simply ordered with respect to other writes), since a</div><div class='del'>-full readX() is a relatively expensive operation.</div><div class='del'>-</div><div class='del'>-Generally, one should use :c:func:`mmiowb()` prior to releasing a spinlock</div><div class='del'>-that protects regions using :c:func:`writeb()` or similar functions that</div><div class='del'>-aren't surrounded by readb() calls, which will ensure ordering</div><div class='del'>-and flushing. The following pseudocode illustrates what might occur if</div><div class='del'>-write ordering isn't guaranteed via :c:func:`mmiowb()` or one of the</div><div class='del'>-readX() functions::</div><div class='del'>-</div><div class='del'>-    CPU A:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='del'>-    CPU A:  ...</div><div class='del'>-    CPU A:  writel(newval, ring_ptr);</div><div class='del'>-    CPU A:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='del'>-            ...</div><div class='del'>-    CPU B:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='del'>-    CPU B:  writel(newval2, ring_ptr);</div><div class='del'>-    CPU B:  ...</div><div class='del'>-    CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='del'>-</div><div class='del'>-In the case above, newval2 could be written to ring_ptr before newval.</div><div class='del'>-Fixing it is easy though::</div><div class='del'>-</div><div class='del'>-    CPU A:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='del'>-    CPU A:  ...</div><div class='del'>-    CPU A:  writel(newval, ring_ptr);</div><div class='del'>-    CPU A:  mmiowb(); /* ensure no other writes beat us to the device */</div><div class='del'>-    CPU A:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='del'>-            ...</div><div class='del'>-    CPU B:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='del'>-    CPU B:  writel(newval2, ring_ptr);</div><div class='del'>-    CPU B:  ...</div><div class='del'>-    CPU B:  mmiowb();</div><div class='del'>-    CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='del'>-</div><div class='del'>-See tg3.c for a real world example of how to use :c:func:`mmiowb()`</div><div class='del'>-</div><div class='ctx'> PCI ordering rules also guarantee that PIO read responses arrive after any</div><div class='ctx'> outstanding DMA writes from that bus, since for some devices the result of</div><div class='ctx'> a readb() call may signal to the driver that a DMA transaction is</div><div class='head'>diff --git a/Documentation/driver-api/generic-counter.rst b/Documentation/driver-api/generic-counter.rst<br/>new file mode 100644<br/>index 000000000000..f51db893f595<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/generic-counter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/generic-counter.rst</a></div><div class='hunk'>@@ -0,0 +1,342 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+=========================</div><div class='add'>+Generic Counter Interface</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Counter devices are prevalent within a diverse spectrum of industries.</div><div class='add'>+The ubiquitous presence of these devices necessitates a common interface</div><div class='add'>+and standard of interaction and exposure. This driver API attempts to</div><div class='add'>+resolve the issue of duplicate code found among existing counter device</div><div class='add'>+drivers by introducing a generic counter interface for consumption. The</div><div class='add'>+Generic Counter interface enables drivers to support and expose a common</div><div class='add'>+set of components and functionality present in counter devices.</div><div class='add'>+</div><div class='add'>+Theory</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+Counter devices can vary greatly in design, but regardless of whether</div><div class='add'>+some devices are quadrature encoder counters or tally counters, all</div><div class='add'>+counter devices consist of a core set of components. This core set of</div><div class='add'>+components, shared by all counter devices, is what forms the essence of</div><div class='add'>+the Generic Counter interface.</div><div class='add'>+</div><div class='add'>+There are three core components to a counter:</div><div class='add'>+</div><div class='add'>+* Count:</div><div class='add'>+  Count data for a set of Signals.</div><div class='add'>+</div><div class='add'>+* Signal:</div><div class='add'>+  Input data that is evaluated by the counter to determine the count</div><div class='add'>+  data.</div><div class='add'>+</div><div class='add'>+* Synapse:</div><div class='add'>+  The association of a Signal with a respective Count.</div><div class='add'>+</div><div class='add'>+COUNT</div><div class='add'>+-----</div><div class='add'>+A Count represents the count data for a set of Signals. The Generic</div><div class='add'>+Counter interface provides the following available count data types:</div><div class='add'>+</div><div class='add'>+* COUNT_POSITION:</div><div class='add'>+  Unsigned integer value representing position.</div><div class='add'>+</div><div class='add'>+A Count has a count function mode which represents the update behavior</div><div class='add'>+for the count data. The Generic Counter interface provides the following</div><div class='add'>+available count function modes:</div><div class='add'>+</div><div class='add'>+* Increase:</div><div class='add'>+  Accumulated count is incremented.</div><div class='add'>+</div><div class='add'>+* Decrease:</div><div class='add'>+  Accumulated count is decremented.</div><div class='add'>+</div><div class='add'>+* Pulse-Direction:</div><div class='add'>+  Rising edges on signal A updates the respective count. The input level</div><div class='add'>+  of signal B determines direction.</div><div class='add'>+</div><div class='add'>+* Quadrature:</div><div class='add'>+  A pair of quadrature encoding signals are evaluated to determine</div><div class='add'>+  position and direction. The following Quadrature modes are available:</div><div class='add'>+</div><div class='add'>+  - x1 A:</div><div class='add'>+    If direction is forward, rising edges on quadrature pair signal A</div><div class='add'>+    updates the respective count; if the direction is backward, falling</div><div class='add'>+    edges on quadrature pair signal A updates the respective count.</div><div class='add'>+    Quadrature encoding determines the direction.</div><div class='add'>+</div><div class='add'>+  - x1 B:</div><div class='add'>+    If direction is forward, rising edges on quadrature pair signal B</div><div class='add'>+    updates the respective count; if the direction is backward, falling</div><div class='add'>+    edges on quadrature pair signal B updates the respective count.</div><div class='add'>+    Quadrature encoding determines the direction.</div><div class='add'>+</div><div class='add'>+  - x2 A:</div><div class='add'>+    Any state transition on quadrature pair signal A updates the</div><div class='add'>+    respective count. Quadrature encoding determines the direction.</div><div class='add'>+</div><div class='add'>+  - x2 B:</div><div class='add'>+    Any state transition on quadrature pair signal B updates the</div><div class='add'>+    respective count. Quadrature encoding determines the direction.</div><div class='add'>+</div><div class='add'>+  - x4:</div><div class='add'>+    Any state transition on either quadrature pair signals updates the</div><div class='add'>+    respective count. Quadrature encoding determines the direction.</div><div class='add'>+</div><div class='add'>+A Count has a set of one or more associated Signals.</div><div class='add'>+</div><div class='add'>+SIGNAL</div><div class='add'>+------</div><div class='add'>+A Signal represents a counter input data; this is the input data that is</div><div class='add'>+evaluated by the counter to determine the count data; e.g. a quadrature</div><div class='add'>+signal output line of a rotary encoder. Not all counter devices provide</div><div class='add'>+user access to the Signal data.</div><div class='add'>+</div><div class='add'>+The Generic Counter interface provides the following available signal</div><div class='add'>+data types for when the Signal data is available for user access:</div><div class='add'>+</div><div class='add'>+* SIGNAL_LEVEL:</div><div class='add'>+  Signal line state level. The following states are possible:</div><div class='add'>+</div><div class='add'>+  - SIGNAL_LEVEL_LOW:</div><div class='add'>+    Signal line is in a low state.</div><div class='add'>+</div><div class='add'>+  - SIGNAL_LEVEL_HIGH:</div><div class='add'>+    Signal line is in a high state.</div><div class='add'>+</div><div class='add'>+A Signal may be associated with one or more Counts.</div><div class='add'>+</div><div class='add'>+SYNAPSE</div><div class='add'>+-------</div><div class='add'>+A Synapse represents the association of a Signal with a respective</div><div class='add'>+Count. Signal data affects respective Count data, and the Synapse</div><div class='add'>+represents this relationship.</div><div class='add'>+</div><div class='add'>+The Synapse action mode specifies the Signal data condition which</div><div class='add'>+triggers the respective Count's count function evaluation to update the</div><div class='add'>+count data. The Generic Counter interface provides the following</div><div class='add'>+available action modes:</div><div class='add'>+</div><div class='add'>+* None:</div><div class='add'>+  Signal does not trigger the count function. In Pulse-Direction count</div><div class='add'>+  function mode, this Signal is evaluated as Direction.</div><div class='add'>+</div><div class='add'>+* Rising Edge:</div><div class='add'>+  Low state transitions to high state.</div><div class='add'>+</div><div class='add'>+* Falling Edge:</div><div class='add'>+  High state transitions to low state.</div><div class='add'>+</div><div class='add'>+* Both Edges:</div><div class='add'>+  Any state transition.</div><div class='add'>+</div><div class='add'>+A counter is defined as a set of input signals associated with count</div><div class='add'>+data that are generated by the evaluation of the state of the associated</div><div class='add'>+input signals as defined by the respective count functions. Within the</div><div class='add'>+context of the Generic Counter interface, a counter consists of Counts</div><div class='add'>+each associated with a set of Signals, whose respective Synapse</div><div class='add'>+instances represent the count function update conditions for the</div><div class='add'>+associated Counts.</div><div class='add'>+</div><div class='add'>+Paradigm</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+The most basic counter device may be expressed as a single Count</div><div class='add'>+associated with a single Signal via a single Synapse. Take for example</div><div class='add'>+a counter device which simply accumulates a count of rising edges on a</div><div class='add'>+source input line::</div><div class='add'>+</div><div class='add'>+                Count                Synapse        Signal</div><div class='add'>+                -----                -------        ------</div><div class='add'>+        +---------------------+</div><div class='add'>+        | Data: Count         |    Rising Edge     ________</div><div class='add'>+        | Function: Increase  |  &lt;-------------   / Source \</div><div class='add'>+        |                     |                  ____________</div><div class='add'>+        +---------------------+</div><div class='add'>+</div><div class='add'>+In this example, the Signal is a source input line with a pulsing</div><div class='add'>+voltage, while the Count is a persistent count value which is repeatedly</div><div class='add'>+incremented. The Signal is associated with the respective Count via a</div><div class='add'>+Synapse. The increase function is triggered by the Signal data condition</div><div class='add'>+specified by the Synapse -- in this case a rising edge condition on the</div><div class='add'>+voltage input line. In summary, the counter device existence and</div><div class='add'>+behavior is aptly represented by respective Count, Signal, and Synapse</div><div class='add'>+components: a rising edge condition triggers an increase function on an</div><div class='add'>+accumulating count datum.</div><div class='add'>+</div><div class='add'>+A counter device is not limited to a single Signal; in fact, in theory</div><div class='add'>+many Signals may be associated with even a single Count. For example, a</div><div class='add'>+quadrature encoder counter device can keep track of position based on</div><div class='add'>+the states of two input lines::</div><div class='add'>+</div><div class='add'>+                   Count                 Synapse     Signal</div><div class='add'>+                   -----                 -------     ------</div><div class='add'>+        +-------------------------+</div><div class='add'>+        | Data: Position          |    Both Edges     ___</div><div class='add'>+        | Function: Quadrature x4 |  &lt;------------   / A \</div><div class='add'>+        |                         |                 _______</div><div class='add'>+        |                         |</div><div class='add'>+        |                         |    Both Edges     ___</div><div class='add'>+        |                         |  &lt;------------   / B \</div><div class='add'>+        |                         |                 _______</div><div class='add'>+        +-------------------------+</div><div class='add'>+</div><div class='add'>+In this example, two Signals (quadrature encoder lines A and B) are</div><div class='add'>+associated with a single Count: a rising or falling edge on either A or</div><div class='add'>+B triggers the "Quadrature x4" function which determines the direction</div><div class='add'>+of movement and updates the respective position data. The "Quadrature</div><div class='add'>+x4" function is likely implemented in the hardware of the quadrature</div><div class='add'>+encoder counter device; the Count, Signals, and Synapses simply</div><div class='add'>+represent this hardware behavior and functionality.</div><div class='add'>+</div><div class='add'>+Signals associated with the same Count can have differing Synapse action</div><div class='add'>+mode conditions. For example, a quadrature encoder counter device</div><div class='add'>+operating in a non-quadrature Pulse-Direction mode could have one input</div><div class='add'>+line dedicated for movement and a second input line dedicated for</div><div class='add'>+direction::</div><div class='add'>+</div><div class='add'>+                   Count                   Synapse      Signal</div><div class='add'>+                   -----                   -------      ------</div><div class='add'>+        +---------------------------+</div><div class='add'>+        | Data: Position            |    Rising Edge     ___</div><div class='add'>+        | Function: Pulse-Direction |  &lt;-------------   / A \ (Movement)</div><div class='add'>+        |                           |                  _______</div><div class='add'>+        |                           |</div><div class='add'>+        |                           |       None         ___</div><div class='add'>+        |                           |  &lt;-------------   / B \ (Direction)</div><div class='add'>+        |                           |                  _______</div><div class='add'>+        +---------------------------+</div><div class='add'>+</div><div class='add'>+Only Signal A triggers the "Pulse-Direction" update function, but the</div><div class='add'>+instantaneous state of Signal B is still required in order to know the</div><div class='add'>+direction so that the position data may be properly updated. Ultimately,</div><div class='add'>+both Signals are associated with the same Count via two respective</div><div class='add'>+Synapses, but only one Synapse has an active action mode condition which</div><div class='add'>+triggers the respective count function while the other is left with a</div><div class='add'>+"None" condition action mode to indicate its respective Signal's</div><div class='add'>+availability for state evaluation despite its non-triggering mode.</div><div class='add'>+</div><div class='add'>+Keep in mind that the Signal, Synapse, and Count are abstract</div><div class='add'>+representations which do not need to be closely married to their</div><div class='add'>+respective physical sources. This allows the user of a counter to</div><div class='add'>+divorce themselves from the nuances of physical components (such as</div><div class='add'>+whether an input line is differential or single-ended) and instead focus</div><div class='add'>+on the core idea of what the data and process represent (e.g. position</div><div class='add'>+as interpreted from quadrature encoding data).</div><div class='add'>+</div><div class='add'>+Userspace Interface</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Several sysfs attributes are generated by the Generic Counter interface,</div><div class='add'>+and reside under the /sys/bus/counter/devices/counterX directory, where</div><div class='add'>+counterX refers to the respective counter device. Please see</div><div class='add'>+Documentation/ABI/testing/sys-bus-counter-generic-sysfs for detailed</div><div class='add'>+information on each Generic Counter interface sysfs attribute.</div><div class='add'>+</div><div class='add'>+Through these sysfs attributes, programs and scripts may interact with</div><div class='add'>+the Generic Counter paradigm Counts, Signals, and Synapses of respective</div><div class='add'>+counter devices.</div><div class='add'>+</div><div class='add'>+Driver API</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+Driver authors may utilize the Generic Counter interface in their code</div><div class='add'>+by including the include/linux/counter.h header file. This header file</div><div class='add'>+provides several core data structures, function prototypes, and macros</div><div class='add'>+for defining a counter device.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/counter.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/counter/generic-counter.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+Implementation</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+To support a counter device, a driver must first allocate the available</div><div class='add'>+Counter Signals via counter_signal structures. These Signals should</div><div class='add'>+be stored as an array and set to the signals array member of an</div><div class='add'>+allocated counter_device structure before the Counter is registered to</div><div class='add'>+the system.</div><div class='add'>+</div><div class='add'>+Counter Counts may be allocated via counter_count structures, and</div><div class='add'>+respective Counter Signal associations (Synapses) made via</div><div class='add'>+counter_synapse structures. Associated counter_synapse structures are</div><div class='add'>+stored as an array and set to the the synapses array member of the</div><div class='add'>+respective counter_count structure. These counter_count structures are</div><div class='add'>+set to the counts array member of an allocated counter_device structure</div><div class='add'>+before the Counter is registered to the system.</div><div class='add'>+</div><div class='add'>+Driver callbacks should be provided to the counter_device structure via</div><div class='add'>+a constant counter_ops structure in order to communicate with the</div><div class='add'>+device: to read and write various Signals and Counts, and to set and get</div><div class='add'>+the "action mode" and "function mode" for various Synapses and Counts</div><div class='add'>+respectively.</div><div class='add'>+</div><div class='add'>+A defined counter_device structure may be registered to the system by</div><div class='add'>+passing it to the counter_register function, and unregistered by passing</div><div class='add'>+it to the counter_unregister function. Similarly, the</div><div class='add'>+devm_counter_register and devm_counter_unregister functions may be used</div><div class='add'>+if device memory-managed registration is desired.</div><div class='add'>+</div><div class='add'>+Extension sysfs attributes can be created for auxiliary functionality</div><div class='add'>+and data by passing in defined counter_device_ext, counter_count_ext,</div><div class='add'>+and counter_signal_ext structures. In these cases, the</div><div class='add'>+counter_device_ext structure is used for global configuration of the</div><div class='add'>+respective Counter device, while the counter_count_ext and</div><div class='add'>+counter_signal_ext structures allow for auxiliary exposure and</div><div class='add'>+configuration of a specific Count or Signal respectively.</div><div class='add'>+</div><div class='add'>+Architecture</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+When the Generic Counter interface counter module is loaded, the</div><div class='add'>+counter_init function is called which registers a bus_type named</div><div class='add'>+"counter" to the system. Subsequently, when the module is unloaded, the</div><div class='add'>+counter_exit function is called which unregisters the bus_type named</div><div class='add'>+"counter" from the system.</div><div class='add'>+</div><div class='add'>+Counter devices are registered to the system via the counter_register</div><div class='add'>+function, and later removed via the counter_unregister function. The</div><div class='add'>+counter_register function establishes a unique ID for the Counter</div><div class='add'>+device and creates a respective sysfs directory, where X is the</div><div class='add'>+mentioned unique ID:</div><div class='add'>+</div><div class='add'>+    /sys/bus/counter/devices/counterX</div><div class='add'>+</div><div class='add'>+Sysfs attributes are created within the counterX directory to expose</div><div class='add'>+functionality, configurations, and data relating to the Counts, Signals,</div><div class='add'>+and Synapses of the Counter device, as well as options and information</div><div class='add'>+for the Counter device itself.</div><div class='add'>+</div><div class='add'>+Each Signal has a directory created to house its relevant sysfs</div><div class='add'>+attributes, where Y is the unique ID of the respective Signal:</div><div class='add'>+</div><div class='add'>+    /sys/bus/counter/devices/counterX/signalY</div><div class='add'>+</div><div class='add'>+Similarly, each Count has a directory created to house its relevant</div><div class='add'>+sysfs attributes, where Y is the unique ID of the respective Count:</div><div class='add'>+</div><div class='add'>+    /sys/bus/counter/devices/counterX/countY</div><div class='add'>+</div><div class='add'>+For a more detailed breakdown of the available Generic Counter interface</div><div class='add'>+sysfs attributes, please refer to the</div><div class='add'>+Documentation/ABI/testing/sys-bus-counter file.</div><div class='add'>+</div><div class='add'>+The Signals and Counts associated with the Counter device are registered</div><div class='add'>+to the system as well by the counter_register function. The</div><div class='add'>+signal_read/signal_write driver callbacks are associated with their</div><div class='add'>+respective Signal attributes, while the count_read/count_write and</div><div class='add'>+function_get/function_set driver callbacks are associated with their</div><div class='add'>+respective Count attributes; similarly, the same is true for the</div><div class='add'>+action_get/action_set driver callbacks and their respective Synapse</div><div class='add'>+attributes. If a driver callback is left undefined, then the respective</div><div class='add'>+read/write permission is left disabled for the relevant attributes.</div><div class='add'>+</div><div class='add'>+Similarly, extension sysfs attributes are created for the defined</div><div class='add'>+counter_device_ext, counter_count_ext, and counter_signal_ext</div><div class='add'>+structures that are passed in.</div><div class='head'>diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst<br/>index c0b600ed9961..d26308af6036 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/index.rst</a></div><div class='hunk'>@@ -56,6 +56,8 @@ available subsections can be seen below.</div><div class='ctx'>    slimbus</div><div class='ctx'>    soundwire/index</div><div class='ctx'>    fpga/index</div><div class='add'>+   acpi/index</div><div class='add'>+   generic-counter</div><div class='ctx'> </div><div class='ctx'> .. only::  subproject and html</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/driver-api/pci/p2pdma.rst b/Documentation/driver-api/pci/p2pdma.rst<br/>index 6d85b5a2598d..44deb52beeb4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pci/p2pdma.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pci/p2pdma.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pci/p2pdma.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/pci/p2pdma.rst</a></div><div class='hunk'>@@ -132,10 +132,6 @@ precludes passing these pages to userspace.</div><div class='ctx'> P2P memory is also technically IO memory but should never have any side</div><div class='ctx'> effects behind it. Thus, the order of loads and stores should not be important</div><div class='ctx'> and ioreadX(), iowriteX() and friends should not be necessary.</div><div class='del'>-However, as the memory is not cache coherent, if access ever needs to</div><div class='del'>-be protected by a spinlock then :c:func:`mmiowb()` must be used before</div><div class='del'>-unlocking the lock. (See ACQUIRES VS I/O ACCESSES in</div><div class='del'>-Documentation/memory-barriers.txt)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> P2P DMA Support Library</div><div class='head'>diff --git a/Documentation/driver-api/pm/cpuidle.rst b/Documentation/driver-api/pm/cpuidle.rst<br/>index 5842ab621a58..006cf6db40c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/cpuidle.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/cpuidle.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/cpuidle.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/pm/cpuidle.rst</a></div><div class='hunk'>@@ -1,3 +1,6 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> .. |struct cpuidle_governor| replace:: :c:type:`struct cpuidle_governor &lt;cpuidle_governor&gt;`</div><div class='ctx'> .. |struct cpuidle_device| replace:: :c:type:`struct cpuidle_device &lt;cpuidle_device&gt;`</div><div class='ctx'> .. |struct cpuidle_driver| replace:: :c:type:`struct cpuidle_driver &lt;cpuidle_driver&gt;`</div><div class='hunk'>@@ -7,9 +10,9 @@</div><div class='ctx'> CPU Idle Time Management</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2019 Intel Corporation</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2019 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> CPU Idle Time Management Subsystem</div><div class='head'>diff --git a/Documentation/driver-api/pm/devices.rst b/Documentation/driver-api/pm/devices.rst<br/>index 090c151aa86b..30835683616a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/devices.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/devices.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/devices.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/pm/devices.rst</a></div><div class='hunk'>@@ -1,3 +1,6 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> .. |struct dev_pm_ops| replace:: :c:type:`struct dev_pm_ops &lt;dev_pm_ops&gt;`</div><div class='ctx'> .. |struct dev_pm_domain| replace:: :c:type:`struct dev_pm_domain &lt;dev_pm_domain&gt;`</div><div class='ctx'> .. |struct bus_type| replace:: :c:type:`struct bus_type &lt;bus_type&gt;`</div><div class='hunk'>@@ -12,11 +15,12 @@</div><div class='ctx'> Device Power Management Basics</div><div class='ctx'> ==============================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2010-2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='add'>+:Copyright: |copy| 2010 Alan Stern &lt;stern@rowland.harvard.edu&gt;</div><div class='add'>+:Copyright: |copy| 2016 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2010-2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='del'>- Copyright (c) 2010 Alan Stern &lt;stern@rowland.harvard.edu&gt;</div><div class='del'>- Copyright (c) 2016 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> Most of the code in Linux is device drivers, so most of the Linux power</div><div class='ctx'> management (PM) code is also driver-specific.  Most drivers will do very</div><div class='head'>diff --git a/Documentation/driver-api/pm/index.rst b/Documentation/driver-api/pm/index.rst<br/>index 56975c6bc789..c2a9ef8d115c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/pm/index.rst</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> ===============================</div><div class='ctx'> CPU and Device Power Management</div><div class='ctx'> ===============================</div><div class='head'>diff --git a/Documentation/driver-api/pm/notifiers.rst b/Documentation/driver-api/pm/notifiers.rst<br/>index 62f860026992..186435c43b77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/notifiers.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/notifiers.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/notifiers.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/pm/notifiers.rst</a></div><div class='hunk'>@@ -1,10 +1,14 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='ctx'> =============================</div><div class='ctx'> Suspend/Hibernation Notifiers</div><div class='ctx'> =============================</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+:Copyright: |copy| 2016 Intel Corporation</div><div class='add'>+</div><div class='add'>+:Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='del'>- Copyright (c) 2016 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> There are some operations that subsystems or drivers may want to carry out</div><div class='ctx'> before hibernation/suspend or after restore/resume, but they require the system</div><div class='head'>diff --git a/Documentation/driver-api/pm/types.rst b/Documentation/driver-api/pm/types.rst<br/>index 3ebdecc54104..73a231caf764 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/types.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/pm/types.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/pm/types.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/pm/types.rst</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> ==================================</div><div class='ctx'> Device Power Management Data Types</div><div class='ctx'> ==================================</div><div class='head'>diff --git a/Documentation/driver-api/soundwire/stream.rst b/Documentation/driver-api/soundwire/stream.rst<br/>index 26a6064503fd..5351bd2f34a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/soundwire/stream.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/soundwire/stream.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/soundwire/stream.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/soundwire/stream.rst</a></div><div class='hunk'>@@ -201,7 +201,7 @@ Bus implements below API for allocate a stream which needs to be called once</div><div class='ctx'> per stream. From ASoC DPCM framework, this stream state maybe linked to</div><div class='ctx'> .startup() operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_alloc_stream(char * stream_name);</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +228,7 @@ the respective Master(s) and Slave(s) associated with stream. These APIs can</div><div class='ctx'> only be invoked once by respective Master(s) and Slave(s). From ASoC DPCM</div><div class='ctx'> framework, this stream state is linked to .hw_params() operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_stream_add_master(struct sdw_bus * bus,</div><div class='ctx'> 		struct sdw_stream_config * stream_config,</div><div class='hunk'>@@ -274,7 +274,7 @@ Bus implements below API for PREPARE state which needs to be called once per</div><div class='ctx'> stream. From ASoC DPCM framework, this stream state is linked to</div><div class='ctx'> .prepare() operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_prepare_stream(struct sdw_stream_runtime * stream);</div><div class='ctx'> </div><div class='hunk'>@@ -304,7 +304,7 @@ Bus implements below API for ENABLE state which needs to be called once per</div><div class='ctx'> stream. From ASoC DPCM framework, this stream state is linked to</div><div class='ctx'> .trigger() start operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_enable_stream(struct sdw_stream_runtime * stream);</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +332,7 @@ Bus implements below API for DISABLED state which needs to be called once</div><div class='ctx'> per stream. From ASoC DPCM framework, this stream state is linked to</div><div class='ctx'> .trigger() stop operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_disable_stream(struct sdw_stream_runtime * stream);</div><div class='ctx'> </div><div class='hunk'>@@ -357,7 +357,7 @@ Bus implements below API for DEPREPARED state which needs to be called once</div><div class='ctx'> per stream. From ASoC DPCM framework, this stream state is linked to</div><div class='ctx'> .trigger() stop operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_deprepare_stream(struct sdw_stream_runtime * stream);</div><div class='ctx'> </div><div class='hunk'>@@ -382,7 +382,7 @@ Bus implements below APIs for RELEASE state which needs to be called by</div><div class='ctx'> all the Master(s) and Slave(s) associated with stream. From ASoC DPCM</div><div class='ctx'> framework, this stream state is linked to .hw_free() operation.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   int sdw_stream_remove_master(struct sdw_bus * bus,</div><div class='ctx'> 		struct sdw_stream_runtime * stream);</div><div class='hunk'>@@ -395,7 +395,7 @@ stream assigned as part of ALLOCATED state.</div><div class='ctx'> </div><div class='ctx'> In .shutdown() the data structure maintaining stream state are freed up.</div><div class='ctx'> </div><div class='del'>-  .. code-block:: c</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>   void sdw_release_stream(struct sdw_stream_runtime * stream);</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/driver-api/usb/power-management.rst b/Documentation/driver-api/usb/power-management.rst<br/>index 79beb807996b..4a74cf6f2797 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/usb/power-management.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/driver-api/usb/power-management.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/driver-api/usb/power-management.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/driver-api/usb/power-management.rst</a></div><div class='hunk'>@@ -370,11 +370,15 @@ autosuspend the interface's device.  When the usage counter is = 0</div><div class='ctx'> then the interface is considered to be idle, and the kernel may</div><div class='ctx'> autosuspend the device.</div><div class='ctx'> </div><div class='del'>-Drivers need not be concerned about balancing changes to the usage</div><div class='del'>-counter; the USB core will undo any remaining "get"s when a driver</div><div class='del'>-is unbound from its interface.  As a corollary, drivers must not call</div><div class='del'>-any of the ``usb_autopm_*`` functions after their ``disconnect``</div><div class='del'>-routine has returned.</div><div class='add'>+Drivers must be careful to balance their overall changes to the usage</div><div class='add'>+counter.  Unbalanced "get"s will remain in effect when a driver is</div><div class='add'>+unbound from its interface, preventing the device from going into</div><div class='add'>+runtime suspend should the interface be bound to a driver again.  On</div><div class='add'>+the other hand, drivers are allowed to achieve this balance by calling</div><div class='add'>+the ``usb_autopm_*`` functions even after their ``disconnect`` routine</div><div class='add'>+has returned -- say from within a work-queue routine -- provided they</div><div class='add'>+retain an active reference to the interface (via ``usb_get_intf`` and</div><div class='add'>+``usb_put_intf``).</div><div class='ctx'> </div><div class='ctx'> Drivers using the async routines are responsible for their own</div><div class='ctx'> synchronization and mutual exclusion.</div><div class='head'>diff --git a/Documentation/features/debug/kgdb/arch-support.txt b/Documentation/features/debug/kgdb/arch-support.txt<br/>index 3e6b8f07d5d0..38c40cfa0578 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/debug/kgdb/arch-support.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/debug/kgdb/arch-support.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/debug/kgdb/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/features/debug/kgdb/arch-support.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>     |       nds32: | TODO |</div><div class='ctx'>     |       nios2: |  ok  |</div><div class='ctx'>     |    openrisc: | TODO |</div><div class='del'>-    |      parisc: | TODO |</div><div class='add'>+    |      parisc: |  ok  |</div><div class='ctx'>     |     powerpc: |  ok  |</div><div class='ctx'>     |       riscv: | TODO |</div><div class='ctx'>     |        s390: | TODO |</div><div class='head'>diff --git a/Documentation/features/debug/kprobes/arch-support.txt b/Documentation/features/debug/kprobes/arch-support.txt<br/>index f4e45bd58fea..e68239b5d2f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/debug/kprobes/arch-support.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/debug/kprobes/arch-support.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/debug/kprobes/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/features/debug/kprobes/arch-support.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>     |       nds32: | TODO |</div><div class='ctx'>     |       nios2: | TODO |</div><div class='ctx'>     |    openrisc: | TODO |</div><div class='del'>-    |      parisc: | TODO |</div><div class='add'>+    |      parisc: |  ok  |</div><div class='ctx'>     |     powerpc: |  ok  |</div><div class='ctx'>     |       riscv: |  ok  |</div><div class='ctx'>     |        s390: |  ok  |</div><div class='head'>diff --git a/Documentation/features/debug/kretprobes/arch-support.txt b/Documentation/features/debug/kretprobes/arch-support.txt<br/>index 1d5651ef11f8..f17131b328e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/debug/kretprobes/arch-support.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/debug/kretprobes/arch-support.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/debug/kretprobes/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/features/debug/kretprobes/arch-support.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>     |       nds32: | TODO |</div><div class='ctx'>     |       nios2: | TODO |</div><div class='ctx'>     |    openrisc: | TODO |</div><div class='del'>-    |      parisc: | TODO |</div><div class='add'>+    |      parisc: |  ok  |</div><div class='ctx'>     |     powerpc: |  ok  |</div><div class='ctx'>     |       riscv: | TODO |</div><div class='ctx'>     |        s390: |  ok  |</div><div class='head'>diff --git a/Documentation/features/time/modern-timekeeping/arch-support.txt b/Documentation/features/time/modern-timekeeping/arch-support.txt<br/>index 2855dfe2464d..1d46da165b75 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/time/modern-timekeeping/arch-support.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/features/time/modern-timekeeping/arch-support.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/features/time/modern-timekeeping/arch-support.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/features/time/modern-timekeeping/arch-support.txt</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>     |       h8300: |  ok  |</div><div class='ctx'>     |     hexagon: |  ok  |</div><div class='ctx'>     |        ia64: |  ok  |</div><div class='del'>-    |        m68k: | TODO |</div><div class='add'>+    |        m68k: |  ok  |</div><div class='ctx'>     |  microblaze: |  ok  |</div><div class='ctx'>     |        mips: |  ok  |</div><div class='ctx'>     |       nds32: |  ok  |</div><div class='head'>diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking<br/>index efea228ccd8a..dac435575384 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/Locking?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/Locking</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/Locking?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/filesystems/Locking</a></div><div class='hunk'>@@ -52,7 +52,7 @@ prototypes:</div><div class='ctx'> 	int (*rename) (struct inode *, struct dentry *,</div><div class='ctx'> 			struct inode *, struct dentry *, unsigned int);</div><div class='ctx'> 	int (*readlink) (struct dentry *, char __user *,int);</div><div class='del'>-	const char *(*get_link) (struct dentry *, struct inode *, void **);</div><div class='add'>+	const char *(*get_link) (struct dentry *, struct inode *, struct delayed_call *);</div><div class='ctx'> 	void (*truncate) (struct inode *);</div><div class='ctx'> 	int (*permission) (struct inode *, int, unsigned int);</div><div class='ctx'> 	int (*get_acl)(struct inode *, int);</div><div class='hunk'>@@ -118,6 +118,7 @@ set:		exclusive</div><div class='ctx'> --------------------------- super_operations ---------------------------</div><div class='ctx'> prototypes:</div><div class='ctx'> 	struct inode *(*alloc_inode)(struct super_block *sb);</div><div class='add'>+	void (*free_inode)(struct inode *);</div><div class='ctx'> 	void (*destroy_inode)(struct inode *);</div><div class='ctx'> 	void (*dirty_inode) (struct inode *, int flags);</div><div class='ctx'> 	int (*write_inode) (struct inode *, struct writeback_control *wbc);</div><div class='hunk'>@@ -139,6 +140,7 @@ locking rules:</div><div class='ctx'> 	All may block [not true, see below]</div><div class='ctx'> 			s_umount</div><div class='ctx'> alloc_inode:</div><div class='add'>+free_inode:				called from RCU callback</div><div class='ctx'> destroy_inode:</div><div class='ctx'> dirty_inode:</div><div class='ctx'> write_inode:</div><div class='head'>diff --git a/Documentation/filesystems/debugfs.txt b/Documentation/filesystems/debugfs.txt<br/>index 4f45f71149cb..4a0a9c3f4af6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/debugfs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/debugfs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/debugfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/filesystems/debugfs.txt</a></div><div class='hunk'>@@ -31,10 +31,10 @@ This call, if successful, will make a directory called name underneath the</div><div class='ctx'> indicated parent directory.  If parent is NULL, the directory will be</div><div class='ctx'> created in the debugfs root.  On success, the return value is a struct</div><div class='ctx'> dentry pointer which can be used to create files in the directory (and to</div><div class='del'>-clean it up at the end).  A NULL return value indicates that something went</div><div class='del'>-wrong.  If ERR_PTR(-ENODEV) is returned, that is an indication that the</div><div class='del'>-kernel has been built without debugfs support and none of the functions</div><div class='del'>-described below will work.</div><div class='add'>+clean it up at the end).  An ERR_PTR(-ERROR) return value indicates that</div><div class='add'>+something went wrong.  If ERR_PTR(-ENODEV) is returned, that is an</div><div class='add'>+indication that the kernel has been built without debugfs support and none</div><div class='add'>+of the functions described below will work.</div><div class='ctx'> </div><div class='ctx'> The most general way to create a file within a debugfs directory is with:</div><div class='ctx'> </div><div class='hunk'>@@ -48,8 +48,9 @@ should hold the file, data will be stored in the i_private field of the</div><div class='ctx'> resulting inode structure, and fops is a set of file operations which</div><div class='ctx'> implement the file's behavior.  At a minimum, the read() and/or write()</div><div class='ctx'> operations should be provided; others can be included as needed.  Again,</div><div class='del'>-the return value will be a dentry pointer to the created file, NULL for</div><div class='del'>-error, or ERR_PTR(-ENODEV) if debugfs support is missing.</div><div class='add'>+the return value will be a dentry pointer to the created file,</div><div class='add'>+ERR_PTR(-ERROR) on error, or ERR_PTR(-ENODEV) if debugfs support is</div><div class='add'>+missing.</div><div class='ctx'> </div><div class='ctx'> Create a file with an initial size, the following function can be used</div><div class='ctx'> instead:</div><div class='hunk'>@@ -214,7 +215,8 @@ can be removed with:</div><div class='ctx'> </div><div class='ctx'>     void debugfs_remove(struct dentry *dentry);</div><div class='ctx'> </div><div class='del'>-The dentry value can be NULL, in which case nothing will be removed.</div><div class='add'>+The dentry value can be NULL or an error value, in which case nothing will</div><div class='add'>+be removed.</div><div class='ctx'> </div><div class='ctx'> Once upon a time, debugfs users were required to remember the dentry</div><div class='ctx'> pointer for every debugfs file they created so that all files could be</div><div class='head'>diff --git a/Documentation/filesystems/mount_api.txt b/Documentation/filesystems/mount_api.txt<br/>index 944d1965e917..00ff0cfccfa7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/mount_api.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/mount_api.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/mount_api.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/filesystems/mount_api.txt</a></div><div class='hunk'>@@ -12,11 +12,13 @@ CONTENTS</div><div class='ctx'> </div><div class='ctx'>  (4) Filesystem context security.</div><div class='ctx'> </div><div class='del'>- (5) VFS filesystem context operations.</div><div class='add'>+ (5) VFS filesystem context API.</div><div class='ctx'> </div><div class='del'>- (6) Parameter description.</div><div class='add'>+ (6) Superblock creation helpers.</div><div class='ctx'> </div><div class='del'>- (7) Parameter helper functions.</div><div class='add'>+ (7) Parameter description.</div><div class='add'>+</div><div class='add'>+ (8) Parameter helper functions.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ========</div><div class='hunk'>@@ -41,12 +43,15 @@ The creation of new mounts is now to be done in a multistep process:</div><div class='ctx'> </div><div class='ctx'>  (7) Destroy the context.</div><div class='ctx'> </div><div class='del'>-To support this, the file_system_type struct gains a new field:</div><div class='add'>+To support this, the file_system_type struct gains two new fields:</div><div class='ctx'> </div><div class='ctx'> 	int (*init_fs_context)(struct fs_context *fc);</div><div class='add'>+	const struct fs_parameter_description *parameters;</div><div class='ctx'> </div><div class='del'>-which is invoked to set up the filesystem-specific parts of a filesystem</div><div class='del'>-context, including the additional space.</div><div class='add'>+The first is invoked to set up the filesystem-specific parts of a filesystem</div><div class='add'>+context, including the additional space, and the second points to the</div><div class='add'>+parameter description for validation at registration time and querying by a</div><div class='add'>+future system call.</div><div class='ctx'> </div><div class='ctx'> Note that security initialisation is done *after* the filesystem is called so</div><div class='ctx'> that the namespaces may be adjusted first.</div><div class='hunk'>@@ -73,9 +78,9 @@ context.  This is represented by the fs_context structure:</div><div class='ctx'> 		void			*s_fs_info;</div><div class='ctx'> 		unsigned int		sb_flags;</div><div class='ctx'> 		unsigned int		sb_flags_mask;</div><div class='add'>+		unsigned int		s_iflags;</div><div class='add'>+		unsigned int		lsm_flags;</div><div class='ctx'> 		enum fs_context_purpose	purpose:8;</div><div class='del'>-		bool			sloppy:1;</div><div class='del'>-		bool			silent:1;</div><div class='ctx'> 		...</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -141,6 +146,10 @@ The fs_context fields are as follows:</div><div class='ctx'> </div><div class='ctx'>      Which bits SB_* flags are to be set/cleared in super_block::s_flags.</div><div class='ctx'> </div><div class='add'>+ (*) unsigned int s_iflags</div><div class='add'>+</div><div class='add'>+     These will be bitwise-OR'd with s-&gt;s_iflags when a superblock is created.</div><div class='add'>+</div><div class='ctx'>  (*) enum fs_context_purpose</div><div class='ctx'> </div><div class='ctx'>      This indicates the purpose for which the context is intended.  The</div><div class='hunk'>@@ -150,17 +159,6 @@ The fs_context fields are as follows:</div><div class='ctx'> 	FS_CONTEXT_FOR_SUBMOUNT		-- New automatic submount of extant mount</div><div class='ctx'> 	FS_CONTEXT_FOR_RECONFIGURE	-- Change an existing mount</div><div class='ctx'> </div><div class='del'>- (*) bool sloppy</div><div class='del'>- (*) bool silent</div><div class='del'>-</div><div class='del'>-     These are set if the sloppy or silent mount options are given.</div><div class='del'>-</div><div class='del'>-     [NOTE] sloppy is probably unnecessary when userspace passes over one</div><div class='del'>-     option at a time since the error can just be ignored if userspace deems it</div><div class='del'>-     to be unimportant.</div><div class='del'>-</div><div class='del'>-     [NOTE] silent is probably redundant with sb_flags &amp; SB_SILENT.</div><div class='del'>-</div><div class='ctx'> The mount context is created by calling vfs_new_fs_context() or</div><div class='ctx'> vfs_dup_fs_context() and is destroyed with put_fs_context().  Note that the</div><div class='ctx'> structure is not refcounted.</div><div class='hunk'>@@ -342,28 +340,47 @@ number of operations used by the new mount code for this purpose:</div><div class='ctx'>      It should return 0 on success or a negative error code on failure.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-=================================</div><div class='del'>-VFS FILESYSTEM CONTEXT OPERATIONS</div><div class='del'>-=================================</div><div class='add'>+==========================</div><div class='add'>+VFS FILESYSTEM CONTEXT API</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='del'>-There are four operations for creating a filesystem context and</div><div class='del'>-one for destroying a context:</div><div class='add'>+There are four operations for creating a filesystem context and one for</div><div class='add'>+destroying a context:</div><div class='ctx'> </div><div class='del'>- (*) struct fs_context *vfs_new_fs_context(struct file_system_type *fs_type,</div><div class='del'>-					   struct dentry *reference,</div><div class='del'>-					   unsigned int sb_flags,</div><div class='del'>-					   unsigned int sb_flags_mask,</div><div class='del'>-					   enum fs_context_purpose purpose);</div><div class='add'>+ (*) struct fs_context *fs_context_for_mount(</div><div class='add'>+		struct file_system_type *fs_type,</div><div class='add'>+		unsigned int sb_flags);</div><div class='ctx'> </div><div class='del'>-     Create a filesystem context for a given filesystem type and purpose.  This</div><div class='del'>-     allocates the filesystem context, sets the superblock flags, initialises</div><div class='del'>-     the security and calls fs_type-&gt;init_fs_context() to initialise the</div><div class='del'>-     filesystem private data.</div><div class='add'>+     Allocate a filesystem context for the purpose of setting up a new mount,</div><div class='add'>+     whether that be with a new superblock or sharing an existing one.  This</div><div class='add'>+     sets the superblock flags, initialises the security and calls</div><div class='add'>+     fs_type-&gt;init_fs_context() to initialise the filesystem private data.</div><div class='ctx'> </div><div class='del'>-     reference can be NULL or it may indicate the root dentry of a superblock</div><div class='del'>-     that is going to be reconfigured (FS_CONTEXT_FOR_RECONFIGURE) or</div><div class='del'>-     the automount point that triggered a submount (FS_CONTEXT_FOR_SUBMOUNT).</div><div class='del'>-     This is provided as a source of namespace information.</div><div class='add'>+     fs_type specifies the filesystem type that will manage the context and</div><div class='add'>+     sb_flags presets the superblock flags stored therein.</div><div class='add'>+</div><div class='add'>+ (*) struct fs_context *fs_context_for_reconfigure(</div><div class='add'>+		struct dentry *dentry,</div><div class='add'>+		unsigned int sb_flags,</div><div class='add'>+		unsigned int sb_flags_mask);</div><div class='add'>+</div><div class='add'>+     Allocate a filesystem context for the purpose of reconfiguring an</div><div class='add'>+     existing superblock.  dentry provides a reference to the superblock to be</div><div class='add'>+     configured.  sb_flags and sb_flags_mask indicate which superblock flags</div><div class='add'>+     need changing and to what.</div><div class='add'>+</div><div class='add'>+ (*) struct fs_context *fs_context_for_submount(</div><div class='add'>+		struct file_system_type *fs_type,</div><div class='add'>+		struct dentry *reference);</div><div class='add'>+</div><div class='add'>+     Allocate a filesystem context for the purpose of creating a new mount for</div><div class='add'>+     an automount point or other derived superblock.  fs_type specifies the</div><div class='add'>+     filesystem type that will manage the context and the reference dentry</div><div class='add'>+     supplies the parameters.  Namespaces are propagated from the reference</div><div class='add'>+     dentry's superblock also.</div><div class='add'>+</div><div class='add'>+     Note that it's not a requirement that the reference dentry be of the same</div><div class='add'>+     filesystem type as fs_type.</div><div class='ctx'> </div><div class='ctx'>  (*) struct fs_context *vfs_dup_fs_context(struct fs_context *src_fc);</div><div class='ctx'> </div><div class='hunk'>@@ -390,20 +407,6 @@ context pointer or a negative error code.</div><div class='ctx'> For the remaining operations, if an error occurs, a negative error code will be</div><div class='ctx'> returned.</div><div class='ctx'> </div><div class='del'>- (*) int vfs_get_tree(struct fs_context *fc);</div><div class='del'>-</div><div class='del'>-     Get or create the mountable root and superblock, using the parameters in</div><div class='del'>-     the filesystem context to select/configure the superblock.  This invokes</div><div class='del'>-     the -&gt;validate() op and then the -&gt;get_tree() op.</div><div class='del'>-</div><div class='del'>-     [NOTE] -&gt;validate() could perhaps be rolled into -&gt;get_tree() and</div><div class='del'>-     -&gt;reconfigure().</div><div class='del'>-</div><div class='del'>- (*) struct vfsmount *vfs_create_mount(struct fs_context *fc);</div><div class='del'>-</div><div class='del'>-     Create a mount given the parameters in the specified filesystem context.</div><div class='del'>-     Note that this does not attach the mount to anything.</div><div class='del'>-</div><div class='ctx'>  (*) int vfs_parse_fs_param(struct fs_context *fc,</div><div class='ctx'> 			    struct fs_parameter *param);</div><div class='ctx'> </div><div class='hunk'>@@ -432,17 +435,80 @@ returned.</div><div class='ctx'>      clear the pointer, but then becomes responsible for disposing of the</div><div class='ctx'>      object.</div><div class='ctx'> </div><div class='del'>- (*) int vfs_parse_fs_string(struct fs_context *fc, char *key,</div><div class='add'>+ (*) int vfs_parse_fs_string(struct fs_context *fc, const char *key,</div><div class='ctx'> 			     const char *value, size_t v_size);</div><div class='ctx'> </div><div class='del'>-     A wrapper around vfs_parse_fs_param() that just passes a constant string.</div><div class='add'>+     A wrapper around vfs_parse_fs_param() that copies the value string it is</div><div class='add'>+     passed.</div><div class='ctx'> </div><div class='ctx'>  (*) int generic_parse_monolithic(struct fs_context *fc, void *data);</div><div class='ctx'> </div><div class='ctx'>      Parse a sys_mount() data page, assuming the form to be a text list</div><div class='ctx'>      consisting of key[=val] options separated by commas.  Each item in the</div><div class='ctx'>      list is passed to vfs_mount_option().  This is the default when the</div><div class='del'>-     -&gt;parse_monolithic() operation is NULL.</div><div class='add'>+     -&gt;parse_monolithic() method is NULL.</div><div class='add'>+</div><div class='add'>+ (*) int vfs_get_tree(struct fs_context *fc);</div><div class='add'>+</div><div class='add'>+     Get or create the mountable root and superblock, using the parameters in</div><div class='add'>+     the filesystem context to select/configure the superblock.  This invokes</div><div class='add'>+     the -&gt;get_tree() method.</div><div class='add'>+</div><div class='add'>+ (*) struct vfsmount *vfs_create_mount(struct fs_context *fc);</div><div class='add'>+</div><div class='add'>+     Create a mount given the parameters in the specified filesystem context.</div><div class='add'>+     Note that this does not attach the mount to anything.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+===========================</div><div class='add'>+SUPERBLOCK CREATION HELPERS</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+A number of VFS helpers are available for use by filesystems for the creation</div><div class='add'>+or looking up of superblocks.</div><div class='add'>+</div><div class='add'>+ (*) struct super_block *</div><div class='add'>+     sget_fc(struct fs_context *fc,</div><div class='add'>+	     int (*test)(struct super_block *sb, struct fs_context *fc),</div><div class='add'>+	     int (*set)(struct super_block *sb, struct fs_context *fc));</div><div class='add'>+</div><div class='add'>+     This is the core routine.  If test is non-NULL, it searches for an</div><div class='add'>+     existing superblock matching the criteria held in the fs_context, using</div><div class='add'>+     the test function to match them.  If no match is found, a new superblock</div><div class='add'>+     is created and the set function is called to set it up.</div><div class='add'>+</div><div class='add'>+     Prior to the set function being called, fc-&gt;s_fs_info will be transferred</div><div class='add'>+     to sb-&gt;s_fs_info - and fc-&gt;s_fs_info will be cleared if set returns</div><div class='add'>+     success (ie. 0).</div><div class='add'>+</div><div class='add'>+The following helpers all wrap sget_fc():</div><div class='add'>+</div><div class='add'>+ (*) int vfs_get_super(struct fs_context *fc,</div><div class='add'>+		       enum vfs_get_super_keying keying,</div><div class='add'>+		       int (*fill_super)(struct super_block *sb,</div><div class='add'>+					 struct fs_context *fc))</div><div class='add'>+</div><div class='add'>+     This creates/looks up a deviceless superblock.  The keying indicates how</div><div class='add'>+     many superblocks of this type may exist and in what manner they may be</div><div class='add'>+     shared:</div><div class='add'>+</div><div class='add'>+	(1) vfs_get_single_super</div><div class='add'>+</div><div class='add'>+	    Only one such superblock may exist in the system.  Any further</div><div class='add'>+	    attempt to get a new superblock gets this one (and any parameter</div><div class='add'>+	    differences are ignored).</div><div class='add'>+</div><div class='add'>+	(2) vfs_get_keyed_super</div><div class='add'>+</div><div class='add'>+	    Multiple superblocks of this type may exist and they're keyed on</div><div class='add'>+	    their s_fs_info pointer (for example this may refer to a</div><div class='add'>+	    namespace).</div><div class='add'>+</div><div class='add'>+	(3) vfs_get_independent_super</div><div class='add'>+</div><div class='add'>+	    Multiple independent superblocks of this type may exist.  This</div><div class='add'>+	    function never matches an existing one and always creates a new</div><div class='add'>+	    one.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> =====================</div><div class='hunk'>@@ -454,35 +520,22 @@ There's a core description struct that links everything together:</div><div class='ctx'> </div><div class='ctx'> 	struct fs_parameter_description {</div><div class='ctx'> 		const char	name[16];</div><div class='del'>-		u8		nr_params;</div><div class='del'>-		u8		nr_alt_keys;</div><div class='del'>-		u8		nr_enums;</div><div class='del'>-		bool		ignore_unknown;</div><div class='del'>-		bool		no_source;</div><div class='del'>-		const char *const *keys;</div><div class='del'>-		const struct constant_table *alt_keys;</div><div class='ctx'> 		const struct fs_parameter_spec *specs;</div><div class='ctx'> 		const struct fs_parameter_enum *enums;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> For example:</div><div class='ctx'> </div><div class='del'>-	enum afs_param {</div><div class='add'>+	enum {</div><div class='ctx'> 		Opt_autocell,</div><div class='ctx'> 		Opt_bar,</div><div class='ctx'> 		Opt_dyn,</div><div class='ctx'> 		Opt_foo,</div><div class='ctx'> 		Opt_source,</div><div class='del'>-		nr__afs_params</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	static const struct fs_parameter_description afs_fs_parameters = {</div><div class='ctx'> 		.name		= "kAFS",</div><div class='del'>-		.nr_params	= nr__afs_params,</div><div class='del'>-		.nr_alt_keys	= ARRAY_SIZE(afs_param_alt_keys),</div><div class='del'>-		.nr_enums	= ARRAY_SIZE(afs_param_enums),</div><div class='del'>-		.keys		= afs_param_keys,</div><div class='del'>-		.alt_keys	= afs_param_alt_keys,</div><div class='ctx'> 		.specs		= afs_param_specs,</div><div class='ctx'> 		.enums		= afs_param_enums,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -494,28 +547,24 @@ The members are as follows:</div><div class='ctx'>      The name to be used in error messages generated by the parse helper</div><div class='ctx'>      functions.</div><div class='ctx'> </div><div class='del'>- (2) u8 nr_params;</div><div class='del'>-</div><div class='del'>-     The number of discrete parameter identifiers.  This indicates the number</div><div class='del'>-     of elements in the -&gt;types[] array and also limits the values that may be</div><div class='del'>-     used in the values that the -&gt;keys[] array maps to.</div><div class='del'>-</div><div class='del'>-     It is expected that, for example, two parameters that are related, say</div><div class='del'>-     "acl" and "noacl" with have the same ID, but will be flagged to indicate</div><div class='del'>-     that one is the inverse of the other.  The value can then be picked out</div><div class='del'>-     from the parse result.</div><div class='add'>+ (2) const struct fs_parameter_specification *specs;</div><div class='ctx'> </div><div class='del'>- (3) const struct fs_parameter_specification *specs;</div><div class='add'>+     Table of parameter specifications, terminated with a null entry, where the</div><div class='add'>+     entries are of type:</div><div class='ctx'> </div><div class='del'>-     Table of parameter specifications, where the entries are of type:</div><div class='del'>-</div><div class='del'>-	struct fs_parameter_type {</div><div class='del'>-		enum fs_parameter_spec	type:8;</div><div class='del'>-		u8			flags;</div><div class='add'>+	struct fs_parameter_spec {</div><div class='add'>+		const char		*name;</div><div class='add'>+		u8			opt;</div><div class='add'>+		enum fs_parameter_type	type:8;</div><div class='add'>+		unsigned short		flags;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-     and the parameter identifier is the index to the array.  'type' indicates</div><div class='del'>-     the desired value type and must be one of:</div><div class='add'>+     The 'name' field is a string to match exactly to the parameter key (no</div><div class='add'>+     wildcards, patterns and no case-independence) and 'opt' is the value that</div><div class='add'>+     will be returned by the fs_parser() function in the case of a successful</div><div class='add'>+     match.</div><div class='add'>+</div><div class='add'>+     The 'type' field indicates the desired value type and must be one of:</div><div class='ctx'> </div><div class='ctx'> 	TYPE NAME		EXPECTED VALUE		RESULT IN</div><div class='ctx'> 	=======================	=======================	=====================</div><div class='hunk'>@@ -525,85 +574,65 @@ The members are as follows:</div><div class='ctx'> 	fs_param_is_u32_octal	32-bit octal int	result-&gt;uint_32</div><div class='ctx'> 	fs_param_is_u32_hex	32-bit hex int		result-&gt;uint_32</div><div class='ctx'> 	fs_param_is_s32		32-bit signed int	result-&gt;int_32</div><div class='add'>+	fs_param_is_u64		64-bit unsigned int	result-&gt;uint_64</div><div class='ctx'> 	fs_param_is_enum	Enum value name 	result-&gt;uint_32</div><div class='ctx'> 	fs_param_is_string	Arbitrary string	param-&gt;string</div><div class='ctx'> 	fs_param_is_blob	Binary blob		param-&gt;blob</div><div class='ctx'> 	fs_param_is_blockdev	Blockdev path		* Needs lookup</div><div class='ctx'> 	fs_param_is_path	Path			* Needs lookup</div><div class='del'>-	fs_param_is_fd		File descriptor		param-&gt;file</div><div class='del'>-</div><div class='del'>-     And each parameter can be qualified with 'flags':</div><div class='del'>-</div><div class='del'>-     	fs_param_v_optional	The value is optional</div><div class='del'>-	fs_param_neg_with_no	If key name is prefixed with "no", it is false</div><div class='del'>-	fs_param_neg_with_empty	If value is "", it is false</div><div class='del'>-	fs_param_deprecated	The parameter is deprecated.</div><div class='del'>-</div><div class='del'>-     For example:</div><div class='del'>-</div><div class='del'>-	static const struct fs_parameter_spec afs_param_specs[nr__afs_params] = {</div><div class='del'>-		[Opt_autocell]	= { fs_param_is flag },</div><div class='del'>-		[Opt_bar]	= { fs_param_is_enum },</div><div class='del'>-		[Opt_dyn]	= { fs_param_is flag },</div><div class='del'>-		[Opt_foo]	= { fs_param_is_bool, fs_param_neg_with_no },</div><div class='del'>-		[Opt_source]	= { fs_param_is_string },</div><div class='del'>-	};</div><div class='add'>+	fs_param_is_fd		File descriptor		result-&gt;int_32</div><div class='ctx'> </div><div class='ctx'>      Note that if the value is of fs_param_is_bool type, fs_parse() will try</div><div class='ctx'>      to match any string value against "0", "1", "no", "yes", "false", "true".</div><div class='ctx'> </div><div class='del'>-     [!] NOTE that the table must be sorted according to primary key name so</div><div class='del'>-     	 that -&gt;keys[] is also sorted.</div><div class='del'>-</div><div class='del'>- (4) const char *const *keys;</div><div class='del'>-</div><div class='del'>-     Table of primary key names for the parameters.  There must be one entry</div><div class='del'>-     per defined parameter.  The table is optional if -&gt;nr_params is 0.  The</div><div class='del'>-     table is just an array of names e.g.:</div><div class='add'>+     Each parameter can also be qualified with 'flags':</div><div class='ctx'> </div><div class='del'>-	static const char *const afs_param_keys[nr__afs_params] = {</div><div class='del'>-		[Opt_autocell]	= "autocell",</div><div class='del'>-		[Opt_bar]	= "bar",</div><div class='del'>-		[Opt_dyn]	= "dyn",</div><div class='del'>-		[Opt_foo]	= "foo",</div><div class='del'>-		[Opt_source]	= "source",</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-     [!] NOTE that the table must be sorted such that the table can be searched</div><div class='del'>-     	 with bsearch() using strcmp().  This means that the Opt_* values must</div><div class='del'>-     	 correspond to the entries in this table.</div><div class='del'>-</div><div class='del'>- (5) const struct constant_table *alt_keys;</div><div class='del'>-     u8 nr_alt_keys;</div><div class='del'>-</div><div class='del'>-     Table of additional key names and their mappings to parameter ID plus the</div><div class='del'>-     number of elements in the table.  This is optional.  The table is just an</div><div class='del'>-     array of { name, integer } pairs, e.g.:</div><div class='add'>+	fs_param_v_optional	The value is optional</div><div class='add'>+	fs_param_neg_with_no	result-&gt;negated set if key is prefixed with "no"</div><div class='add'>+	fs_param_neg_with_empty	result-&gt;negated set if value is ""</div><div class='add'>+	fs_param_deprecated	The parameter is deprecated.</div><div class='ctx'> </div><div class='del'>-	static const struct constant_table afs_param_keys[] = {</div><div class='del'>-		{ "baz",	Opt_bar },</div><div class='del'>-		{ "dynamic",	Opt_dyn },</div><div class='add'>+     These are wrapped with a number of convenience wrappers:</div><div class='add'>+</div><div class='add'>+	MACRO			SPECIFIES</div><div class='add'>+	=======================	===============================================</div><div class='add'>+	fsparam_flag()		fs_param_is_flag</div><div class='add'>+	fsparam_flag_no()	fs_param_is_flag, fs_param_neg_with_no</div><div class='add'>+	fsparam_bool()		fs_param_is_bool</div><div class='add'>+	fsparam_u32()		fs_param_is_u32</div><div class='add'>+	fsparam_u32oct()	fs_param_is_u32_octal</div><div class='add'>+	fsparam_u32hex()	fs_param_is_u32_hex</div><div class='add'>+	fsparam_s32()		fs_param_is_s32</div><div class='add'>+	fsparam_u64()		fs_param_is_u64</div><div class='add'>+	fsparam_enum()		fs_param_is_enum</div><div class='add'>+	fsparam_string()	fs_param_is_string</div><div class='add'>+	fsparam_blob()		fs_param_is_blob</div><div class='add'>+	fsparam_bdev()		fs_param_is_blockdev</div><div class='add'>+	fsparam_path()		fs_param_is_path</div><div class='add'>+	fsparam_fd()		fs_param_is_fd</div><div class='add'>+</div><div class='add'>+     all of which take two arguments, name string and option number - for</div><div class='add'>+     example:</div><div class='add'>+</div><div class='add'>+	static const struct fs_parameter_spec afs_param_specs[] = {</div><div class='add'>+		fsparam_flag	("autocell",	Opt_autocell),</div><div class='add'>+		fsparam_flag	("dyn",		Opt_dyn),</div><div class='add'>+		fsparam_string	("source",	Opt_source),</div><div class='add'>+		fsparam_flag_no	("foo",		Opt_foo),</div><div class='add'>+		{}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-     [!] NOTE that the table must be sorted such that strcmp() can be used with</div><div class='del'>-     	 bsearch() to search the entries.</div><div class='del'>-</div><div class='del'>-     The parameter ID can also be fs_param_key_removed to indicate that a</div><div class='del'>-     deprecated parameter has been removed and that an error will be given.</div><div class='del'>-     This differs from fs_param_deprecated where the parameter may still have</div><div class='del'>-     an effect.</div><div class='del'>-</div><div class='del'>-     Further, the behaviour of the parameter may differ when an alternate name</div><div class='del'>-     is used (for instance with NFS, "v3", "v4.2", etc. are alternate names).</div><div class='add'>+     An addition macro, __fsparam() is provided that takes an additional pair</div><div class='add'>+     of arguments to specify the type and the flags for anything that doesn't</div><div class='add'>+     match one of the above macros.</div><div class='ctx'> </div><div class='ctx'>  (6) const struct fs_parameter_enum *enums;</div><div class='del'>-     u8 nr_enums;</div><div class='ctx'> </div><div class='del'>-     Table of enum value names to integer mappings and the number of elements</div><div class='del'>-     stored therein.  This is of type:</div><div class='add'>+     Table of enum value names to integer mappings, terminated with a null</div><div class='add'>+     entry.  This is of type:</div><div class='ctx'> </div><div class='ctx'> 	struct fs_parameter_enum {</div><div class='del'>-		u8		param_id;</div><div class='add'>+		u8		opt;</div><div class='ctx'> 		char		name[14];</div><div class='ctx'> 		u8		value;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -621,11 +650,6 @@ The members are as follows:</div><div class='ctx'>      try to look the value up in the enum table and the result will be stored</div><div class='ctx'>      in the parse result.</div><div class='ctx'> </div><div class='del'>- (7) bool no_source;</div><div class='del'>-</div><div class='del'>-     If this is set, fs_parse() will ignore any "source" parameter and not</div><div class='del'>-     pass it to the filesystem.</div><div class='del'>-</div><div class='ctx'> The parser should be pointed to by the parser pointer in the file_system_type</div><div class='ctx'> struct as this will provide validation on registration (if</div><div class='ctx'> CONFIG_VALIDATE_FS_PARSER=y) and will allow the description to be queried from</div><div class='hunk'>@@ -650,9 +674,8 @@ process the parameters it is given.</div><div class='ctx'> 		int		value;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-     and it must be sorted such that it can be searched using bsearch() using</div><div class='del'>-     strcmp().  If a match is found, the corresponding value is returned.  If a</div><div class='del'>-     match isn't found, the not_found value is returned instead.</div><div class='add'>+     If a match is found, the corresponding value is returned.  If a match</div><div class='add'>+     isn't found, the not_found value is returned instead.</div><div class='ctx'> </div><div class='ctx'>  (*) bool validate_constant_table(const struct constant_table *tbl,</div><div class='ctx'> 				  size_t tbl_size,</div><div class='hunk'>@@ -665,36 +688,36 @@ process the parameters it is given.</div><div class='ctx'>      should just be set to lie inside the low-to-high range.</div><div class='ctx'> </div><div class='ctx'>      If all is good, true is returned.  If the table is invalid, errors are</div><div class='del'>-     logged to dmesg, the stack is dumped and false is returned.</div><div class='add'>+     logged to dmesg and false is returned.</div><div class='add'>+</div><div class='add'>+ (*) bool fs_validate_description(const struct fs_parameter_description *desc);</div><div class='add'>+</div><div class='add'>+     This performs some validation checks on a parameter description.  It</div><div class='add'>+     returns true if the description is good and false if it is not.  It will</div><div class='add'>+     log errors to dmesg if validation fails.</div><div class='ctx'> </div><div class='ctx'>  (*) int fs_parse(struct fs_context *fc,</div><div class='del'>-		  const struct fs_param_parser *parser,</div><div class='add'>+		  const struct fs_parameter_description *desc,</div><div class='ctx'> 		  struct fs_parameter *param,</div><div class='del'>-		  struct fs_param_parse_result *result);</div><div class='add'>+		  struct fs_parse_result *result);</div><div class='ctx'> </div><div class='ctx'>      This is the main interpreter of parameters.  It uses the parameter</div><div class='del'>-     description (parser) to look up the name of the parameter to use and to</div><div class='del'>-     convert that to a parameter ID (stored in result-&gt;key).</div><div class='add'>+     description to look up a parameter by key name and to convert that to an</div><div class='add'>+     option number (which it returns).</div><div class='ctx'> </div><div class='ctx'>      If successful, and if the parameter type indicates the result is a</div><div class='ctx'>      boolean, integer or enum type, the value is converted by this function and</div><div class='del'>-     the result stored in result-&gt;{boolean,int_32,uint_32}.</div><div class='add'>+     the result stored in result-&gt;{boolean,int_32,uint_32,uint_64}.</div><div class='ctx'> </div><div class='ctx'>      If a match isn't initially made, the key is prefixed with "no" and no</div><div class='ctx'>      value is present then an attempt will be made to look up the key with the</div><div class='ctx'>      prefix removed.  If this matches a parameter for which the type has flag</div><div class='del'>-     fs_param_neg_with_no set, then a match will be made and the value will be</div><div class='del'>-     set to false/0/NULL.</div><div class='del'>-</div><div class='del'>-     If the parameter is successfully matched and, optionally, parsed</div><div class='del'>-     correctly, 1 is returned.  If the parameter isn't matched and</div><div class='del'>-     parser-&gt;ignore_unknown is set, then 0 is returned.  Otherwise -EINVAL is</div><div class='del'>-     returned.</div><div class='del'>-</div><div class='del'>- (*) bool fs_validate_description(const struct fs_parameter_description *desc);</div><div class='add'>+     fs_param_neg_with_no set, then a match will be made and result-&gt;negated</div><div class='add'>+     will be set to true.</div><div class='ctx'> </div><div class='del'>-     This is validates the parameter description.  It returns true if the</div><div class='del'>-     description is good and false if it is not.</div><div class='add'>+     If the parameter isn't matched, -ENOPARAM will be returned; if the</div><div class='add'>+     parameter is matched, but the value is erroneous, -EINVAL will be</div><div class='add'>+     returned; otherwise the parameter's option number will be returned.</div><div class='ctx'> </div><div class='ctx'>  (*) int fs_lookup_param(struct fs_context *fc,</div><div class='ctx'> 			 struct fs_parameter *value,</div><div class='head'>diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting<br/>index cf43bc4dbf31..3bd1148d8bb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/porting?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/porting</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/porting?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/filesystems/porting</a></div><div class='hunk'>@@ -638,3 +638,38 @@ in your dentry operations instead.</div><div class='ctx'> 	inode to d_splice_alias() will also do the right thing (equivalent of</div><div class='ctx'> 	d_add(dentry, NULL); return NULL;), so that kind of special cases</div><div class='ctx'> 	also doesn't need a separate treatment.</div><div class='add'>+--</div><div class='add'>+[strongly recommended]</div><div class='add'>+	take the RCU-delayed parts of -&gt;destroy_inode() into a new method -</div><div class='add'>+	-&gt;free_inode().  If -&gt;destroy_inode() becomes empty - all the better,</div><div class='add'>+	just get rid of it.  Synchronous work (e.g. the stuff that can't</div><div class='add'>+	be done from an RCU callback, or any WARN_ON() where we want the</div><div class='add'>+	stack trace) *might* be movable to -&gt;evict_inode(); however,</div><div class='add'>+	that goes only for the things that are not needed to balance something</div><div class='add'>+	done by -&gt;alloc_inode().  IOW, if it's cleaning up the stuff that</div><div class='add'>+	might have accumulated over the life of in-core inode, -&gt;evict_inode()</div><div class='add'>+	might be a fit.</div><div class='add'>+</div><div class='add'>+	Rules for inode destruction:</div><div class='add'>+		* if -&gt;destroy_inode() is non-NULL, it gets called</div><div class='add'>+		* if -&gt;free_inode() is non-NULL, it gets scheduled by call_rcu()</div><div class='add'>+		* combination of NULL -&gt;destroy_inode and NULL -&gt;free_inode is</div><div class='add'>+		  treated as NULL/free_inode_nonrcu, to preserve the compatibility.</div><div class='add'>+</div><div class='add'>+	Note that the callback (be it via -&gt;free_inode() or explicit call_rcu()</div><div class='add'>+	in -&gt;destroy_inode()) is *NOT* ordered wrt superblock destruction;</div><div class='add'>+	as the matter of fact, the superblock and all associated structures</div><div class='add'>+	might be already gone.  The filesystem driver is guaranteed to be still</div><div class='add'>+	there, but that's it.  Freeing memory in the callback is fine; doing</div><div class='add'>+	more than that is possible, but requires a lot of care and is best</div><div class='add'>+	avoided.</div><div class='add'>+--</div><div class='add'>+[mandatory]</div><div class='add'>+	DCACHE_RCUACCESS is gone; having an RCU delay on dentry freeing is the</div><div class='add'>+	default.  DCACHE_NORCU opts out, and only d_alloc_pseudo() has any</div><div class='add'>+	business doing so.</div><div class='add'>+--</div><div class='add'>+[mandatory]</div><div class='add'>+	d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are</div><div class='add'>+	very suspect (and won't work in modules).  Such uses are very likely to</div><div class='add'>+	be misspelled d_alloc_anon().</div><div class='head'>diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt<br/>index 761c6fd24a53..57fc576b1f3e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/vfs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/filesystems/vfs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/filesystems/vfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/filesystems/vfs.txt</a></div><div class='hunk'>@@ -3,8 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> 	Original author: Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='ctx'> </div><div class='del'>-		  Last updated on June 24, 2007.</div><div class='del'>-</div><div class='ctx'>   Copyright (C) 1999 Richard Gooch</div><div class='ctx'>   Copyright (C) 2005 Pekka Enberg</div><div class='ctx'> </div><div class='hunk'>@@ -465,6 +463,12 @@ otherwise noted.</div><div class='ctx'> 	argument.  If request can't be handled without leaving RCU mode,</div><div class='ctx'> 	have it return ERR_PTR(-ECHILD).</div><div class='ctx'> </div><div class='add'>+	If the filesystem stores the symlink target in -&gt;i_link, the</div><div class='add'>+	VFS may use it directly without calling -&gt;get_link(); however,</div><div class='add'>+	-&gt;get_link() must still be provided.  -&gt;i_link must not be</div><div class='add'>+	freed until after an RCU grace period.  Writing to -&gt;i_link</div><div class='add'>+	post-iget() time requires a 'release' memory barrier.</div><div class='add'>+</div><div class='ctx'>   readlink: this is now just an override for use by readlink(2) for the</div><div class='ctx'> 	cases when -&gt;get_link uses nd_jump_link() or object is not in</div><div class='ctx'> 	fact a symlink.  Normally filesystems should only implement</div><div class='head'>diff --git a/Documentation/acpi/DSD-properties-rules.txt b/Documentation/firmware-guide/acpi/DSD-properties-rules.rst<br/>index 3e4862bdad98..4306f29b6103 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/DSD-properties-rules.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/DSD-properties-rules.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/DSD-properties-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/DSD-properties-rules.rst</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+==================================</div><div class='ctx'> _DSD Device Properties Usage Rules</div><div class='del'>-----------------------------------</div><div class='add'>+==================================</div><div class='ctx'> </div><div class='ctx'> Properties, Property Sets and Property Subsets</div><div class='del'>-----------------------------------------------</div><div class='add'>+==============================================</div><div class='ctx'> </div><div class='ctx'> The _DSD (Device Specific Data) configuration object, introduced in ACPI 5.1,</div><div class='ctx'> allows any type of device configuration data to be provided via the ACPI</div><div class='hunk'>@@ -18,7 +21,7 @@ specific type) associated with it.</div><div class='ctx'> </div><div class='ctx'> In the ACPI _DSD context it is an element of the sub-package following the</div><div class='ctx'> generic Device Properties UUID in the _DSD return package as specified in the</div><div class='del'>-Device Properties UUID definition document [1].</div><div class='add'>+Device Properties UUID definition document [1]_.</div><div class='ctx'> </div><div class='ctx'> It also may be regarded as the definition of a key and the associated data type</div><div class='ctx'> that can be returned by _DSD in the Device Properties UUID sub-package for a</div><div class='hunk'>@@ -33,14 +36,14 @@ Property subsets are nested collections of properties.  Each of them is</div><div class='ctx'> associated with an additional key (name) allowing the subset to be referred</div><div class='ctx'> to as a whole (and to be treated as a separate entity).  The canonical</div><div class='ctx'> representation of property subsets is via the mechanism specified in the</div><div class='del'>-Hierarchical Properties Extension UUID definition document [2].</div><div class='add'>+Hierarchical Properties Extension UUID definition document [2]_.</div><div class='ctx'> </div><div class='ctx'> Property sets may be hierarchical.  That is, a property set may contain</div><div class='ctx'> multiple property subsets that each may contain property subsets of its</div><div class='ctx'> own and so on.</div><div class='ctx'> </div><div class='ctx'> General Validity Rule for Property Sets</div><div class='del'>----------------------------------------</div><div class='add'>+=======================================</div><div class='ctx'> </div><div class='ctx'> Valid property sets must follow the guidance given by the Device Properties UUID</div><div class='ctx'> definition document [1].</div><div class='hunk'>@@ -73,7 +76,7 @@ suitable for the ACPI environment and consequently they cannot belong to a valid</div><div class='ctx'> property set.</div><div class='ctx'> </div><div class='ctx'> Property Sets and Device Tree Bindings</div><div class='del'>---------------------------------------</div><div class='add'>+======================================</div><div class='ctx'> </div><div class='ctx'> It often is useful to make _DSD return property sets that follow Device Tree</div><div class='ctx'> bindings.</div><div class='hunk'>@@ -91,7 +94,7 @@ expected to automatically work in the ACPI environment regardless of their</div><div class='ctx'> contents.</div><div class='ctx'> </div><div class='ctx'> References</div><div class='del'>-----------</div><div class='add'>+==========</div><div class='ctx'> </div><div class='del'>-[1] http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf</div><div class='del'>-[2] http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf</div><div class='add'>+.. [1] http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf</div><div class='add'>+.. [2] http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf</div><div class='head'>diff --git a/Documentation/acpi/acpi-lid.txt b/Documentation/firmware-guide/acpi/acpi-lid.rst<br/>index effe7af3a5af..874ce0ed340d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/acpi-lid.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/acpi-lid.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/acpi-lid.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/acpi-lid.rst</a></div><div class='hunk'>@@ -1,13 +1,18 @@</div><div class='del'>-Special Usage Model of the ACPI Control Method Lid Device</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='ctx'> </div><div class='del'>-Copyright (C) 2016, Intel Corporation</div><div class='del'>-Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='add'>+=========================================================</div><div class='add'>+Special Usage Model of the ACPI Control Method Lid Device</div><div class='add'>+=========================================================</div><div class='ctx'> </div><div class='add'>+:Copyright: |copy| 2016, Intel Corporation</div><div class='ctx'> </div><div class='del'>-Abstract:</div><div class='add'>+:Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='ctx'> </div><div class='del'>-Platforms containing lids convey lid state (open/close) to OSPMs using a</div><div class='del'>-control method lid device. To implement this, the AML tables issue</div><div class='add'>+Abstract</div><div class='add'>+========</div><div class='add'>+Platforms containing lids convey lid state (open/close) to OSPMs</div><div class='add'>+using a control method lid device. To implement this, the AML tables issue</div><div class='ctx'> Notify(lid_device, 0x80) to notify the OSPMs whenever the lid state has</div><div class='ctx'> changed. The _LID control method for the lid device must be implemented to</div><div class='ctx'> report the "current" state of the lid as either "opened" or "closed".</div><div class='hunk'>@@ -19,7 +24,8 @@ taken into account. This document describes the restrictions and the</div><div class='ctx'> expections of the Linux ACPI lid device driver.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-1. Restrictions of the returning value of the _LID control method</div><div class='add'>+Restrictions of the returning value of the _LID control method</div><div class='add'>+==============================================================</div><div class='ctx'> </div><div class='ctx'> The _LID control method is described to return the "current" lid state.</div><div class='ctx'> However the word of "current" has ambiguity, some buggy AML tables return</div><div class='hunk'>@@ -30,7 +36,8 @@ initial returning value. When the AML tables implement this control method</div><div class='ctx'> with cached value, the initial returning value is likely not reliable.</div><div class='ctx'> There are platforms always retun "closed" as initial lid state.</div><div class='ctx'> </div><div class='del'>-2. Restrictions of the lid state change notifications</div><div class='add'>+Restrictions of the lid state change notifications</div><div class='add'>+==================================================</div><div class='ctx'> </div><div class='ctx'> There are buggy AML tables never notifying when the lid device state is</div><div class='ctx'> changed to "opened". Thus the "opened" notification is not guaranteed. But</div><div class='hunk'>@@ -39,18 +46,22 @@ state is changed to "closed". The "closed" notification is normally used to</div><div class='ctx'> trigger some system power saving operations on Windows. Since it is fully</div><div class='ctx'> tested, it is reliable from all AML tables.</div><div class='ctx'> </div><div class='del'>-3. Expections for the userspace users of the ACPI lid device driver</div><div class='add'>+Expections for the userspace users of the ACPI lid device driver</div><div class='add'>+================================================================</div><div class='ctx'> </div><div class='ctx'> The ACPI button driver exports the lid state to the userspace via the</div><div class='del'>-following file:</div><div class='add'>+following file::</div><div class='add'>+</div><div class='ctx'>   /proc/acpi/button/lid/LID0/state</div><div class='add'>+</div><div class='ctx'> This file actually calls the _LID control method described above. And given</div><div class='ctx'> the previous explanation, it is not reliable enough on some platforms. So</div><div class='ctx'> it is advised for the userspace program to not to solely rely on this file</div><div class='ctx'> to determine the actual lid state.</div><div class='ctx'> </div><div class='ctx'> The ACPI button driver emits the following input event to the userspace:</div><div class='del'>-  SW_LID</div><div class='add'>+  * SW_LID</div><div class='add'>+</div><div class='ctx'> The ACPI lid device driver is implemented to try to deliver the platform</div><div class='ctx'> triggered events to the userspace. However, given the fact that the buggy</div><div class='ctx'> firmware cannot make sure "opened"/"closed" events are paired, the ACPI</div><div class='hunk'>@@ -59,20 +70,25 @@ button driver uses the following 3 modes in order not to trigger issues.</div><div class='ctx'> If the userspace hasn't been prepared to ignore the unreliable "opened"</div><div class='ctx'> events and the unreliable initial state notification, Linux users can use</div><div class='ctx'> the following kernel parameters to handle the possible issues:</div><div class='add'>+</div><div class='ctx'> A. button.lid_init_state=method:</div><div class='ctx'>    When this option is specified, the ACPI button driver reports the</div><div class='ctx'>    initial lid state using the returning value of the _LID control method</div><div class='ctx'>    and whether the "opened"/"closed" events are paired fully relies on the</div><div class='ctx'>    firmware implementation.</div><div class='add'>+</div><div class='ctx'>    This option can be used to fix some platforms where the returning value</div><div class='ctx'>    of the _LID control method is reliable but the initial lid state</div><div class='ctx'>    notification is missing.</div><div class='add'>+</div><div class='ctx'>    This option is the default behavior during the period the userspace</div><div class='ctx'>    isn't ready to handle the buggy AML tables.</div><div class='add'>+</div><div class='ctx'> B. button.lid_init_state=open:</div><div class='ctx'>    When this option is specified, the ACPI button driver always reports the</div><div class='ctx'>    initial lid state as "opened" and whether the "opened"/"closed" events</div><div class='ctx'>    are paired fully relies on the firmware implementation.</div><div class='add'>+</div><div class='ctx'>    This may fix some platforms where the returning value of the _LID</div><div class='ctx'>    control method is not reliable and the initial lid state notification is</div><div class='ctx'>    missing.</div><div class='hunk'>@@ -80,6 +96,7 @@ B. button.lid_init_state=open:</div><div class='ctx'> If the userspace has been prepared to ignore the unreliable "opened" events</div><div class='ctx'> and the unreliable initial state notification, Linux users should always</div><div class='ctx'> use the following kernel parameter:</div><div class='add'>+</div><div class='ctx'> C. button.lid_init_state=ignore:</div><div class='ctx'>    When this option is specified, the ACPI button driver never reports the</div><div class='ctx'>    initial lid state and there is a compensation mechanism implemented to</div><div class='hunk'>@@ -89,6 +106,7 @@ C. button.lid_init_state=ignore:</div><div class='ctx'>    notifications can be delivered to the userspace when the lid is actually</div><div class='ctx'>    opens given that some AML tables do not send "opened" notifications</div><div class='ctx'>    reliably.</div><div class='add'>+</div><div class='ctx'>    In this mode, if everything is correctly implemented by the platform</div><div class='ctx'>    firmware, the old userspace programs should still work. Otherwise, the</div><div class='ctx'>    new userspace programs are required to work with the ACPI button driver.</div><div class='head'>diff --git a/Documentation/firmware-guide/acpi/aml-debugger.rst b/Documentation/firmware-guide/acpi/aml-debugger.rst<br/>new file mode 100644<br/>index 000000000000..a889d43bc6c5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/aml-debugger.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/aml-debugger.rst</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+================</div><div class='add'>+The AML Debugger</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+:Copyright: |copy| 2016, Intel Corporation</div><div class='add'>+:Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This document describes the usage of the AML debugger embedded in the Linux</div><div class='add'>+kernel.</div><div class='add'>+</div><div class='add'>+1. Build the debugger</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+The following kernel configuration items are required to enable the AML</div><div class='add'>+debugger interface from the Linux kernel::</div><div class='add'>+</div><div class='add'>+   CONFIG_ACPI_DEBUGGER=y</div><div class='add'>+   CONFIG_ACPI_DEBUGGER_USER=m</div><div class='add'>+</div><div class='add'>+The userspace utilities can be built from the kernel source tree using</div><div class='add'>+the following commands::</div><div class='add'>+</div><div class='add'>+   $ cd tools</div><div class='add'>+   $ make acpi</div><div class='add'>+</div><div class='add'>+The resultant userspace tool binary is then located at::</div><div class='add'>+</div><div class='add'>+   tools/power/acpi/acpidbg</div><div class='add'>+</div><div class='add'>+It can be installed to system directories by running "make install" (as a</div><div class='add'>+sufficiently privileged user).</div><div class='add'>+</div><div class='add'>+2. Start the userspace debugger interface</div><div class='add'>+=========================================</div><div class='add'>+</div><div class='add'>+After booting the kernel with the debugger built-in, the debugger can be</div><div class='add'>+started by using the following commands::</div><div class='add'>+</div><div class='add'>+   # mount -t debugfs none /sys/kernel/debug</div><div class='add'>+   # modprobe acpi_dbg</div><div class='add'>+   # tools/power/acpi/acpidbg</div><div class='add'>+</div><div class='add'>+That spawns the interactive AML debugger environment where you can execute</div><div class='add'>+debugger commands.</div><div class='add'>+</div><div class='add'>+The commands are documented in the "ACPICA Overview and Programmer Reference"</div><div class='add'>+that can be downloaded from</div><div class='add'>+</div><div class='add'>+https://acpica.org/documentation</div><div class='add'>+</div><div class='add'>+The detailed debugger commands reference is located in Chapter 12 "ACPICA</div><div class='add'>+Debugger Reference".  The "help" command can be used for a quick reference.</div><div class='add'>+</div><div class='add'>+3. Stop the userspace debugger interface</div><div class='add'>+========================================</div><div class='add'>+</div><div class='add'>+The interactive debugger interface can be closed by pressing Ctrl+C or using</div><div class='add'>+the "quit" or "exit" commands.  When finished, unload the module with::</div><div class='add'>+</div><div class='add'>+   # rmmod acpi_dbg</div><div class='add'>+</div><div class='add'>+The module unloading may fail if there is an acpidbg instance running.</div><div class='add'>+</div><div class='add'>+4. Run the debugger in a script</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+It may be useful to run the AML debugger in a test script. "acpidbg" supports</div><div class='add'>+this in a special "batch" mode.  For example, the following command outputs</div><div class='add'>+the entire ACPI namespace::</div><div class='add'>+</div><div class='add'>+   # acpidbg -b "namespace"</div><div class='head'>diff --git a/Documentation/acpi/apei/einj.txt b/Documentation/firmware-guide/acpi/apei/einj.rst<br/>index e550c8b98139..e588bccf5158 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/apei/einj.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/apei/einj.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/apei/einj.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/apei/einj.rst</a></div><div class='hunk'>@@ -1,13 +1,16 @@</div><div class='del'>-			APEI Error INJection</div><div class='del'>-			~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+====================</div><div class='add'>+APEI Error INJection</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> EINJ provides a hardware error injection mechanism. It is very useful</div><div class='ctx'> for debugging and testing APEI and RAS features in general.</div><div class='ctx'> </div><div class='ctx'> You need to check whether your BIOS supports EINJ first. For that, look</div><div class='del'>-for early boot messages similar to this one:</div><div class='add'>+for early boot messages similar to this one::</div><div class='ctx'> </div><div class='del'>-ACPI: EINJ 0x000000007370A000 000150 (v01 INTEL           00000001 INTL 00000001)</div><div class='add'>+  ACPI: EINJ 0x000000007370A000 000150 (v01 INTEL           00000001 INTL 00000001)</div><div class='ctx'> </div><div class='ctx'> which shows that the BIOS is exposing an EINJ table - it is the</div><div class='ctx'> mechanism through which the injection is done.</div><div class='hunk'>@@ -23,11 +26,11 @@ order to see the APEI,EINJ,... functionality supported and exposed by</div><div class='ctx'> the BIOS menu.</div><div class='ctx'> </div><div class='ctx'> To use EINJ, make sure the following are options enabled in your kernel</div><div class='del'>-configuration:</div><div class='add'>+configuration::</div><div class='ctx'> </div><div class='del'>-CONFIG_DEBUG_FS</div><div class='del'>-CONFIG_ACPI_APEI</div><div class='del'>-CONFIG_ACPI_APEI_EINJ</div><div class='add'>+  CONFIG_DEBUG_FS</div><div class='add'>+  CONFIG_ACPI_APEI</div><div class='add'>+  CONFIG_ACPI_APEI_EINJ</div><div class='ctx'> </div><div class='ctx'> The EINJ user interface is in &lt;debugfs mount point&gt;/apei/einj.</div><div class='ctx'> </div><div class='hunk'>@@ -37,20 +40,22 @@ The following files belong to it:</div><div class='ctx'> </div><div class='ctx'>   This file shows which error types are supported:</div><div class='ctx'> </div><div class='add'>+  ================  ===================================</div><div class='ctx'>   Error Type Value	Error Description</div><div class='del'>-  ================	=================</div><div class='del'>-  0x00000001		Processor Correctable</div><div class='del'>-  0x00000002		Processor Uncorrectable non-fatal</div><div class='del'>-  0x00000004		Processor Uncorrectable fatal</div><div class='del'>-  0x00000008		Memory Correctable</div><div class='del'>-  0x00000010		Memory Uncorrectable non-fatal</div><div class='del'>-  0x00000020		Memory Uncorrectable fatal</div><div class='del'>-  0x00000040		PCI Express Correctable</div><div class='del'>-  0x00000080		PCI Express Uncorrectable fatal</div><div class='del'>-  0x00000100		PCI Express Uncorrectable non-fatal</div><div class='del'>-  0x00000200		Platform Correctable</div><div class='del'>-  0x00000400		Platform Uncorrectable non-fatal</div><div class='del'>-  0x00000800		Platform Uncorrectable fatal</div><div class='add'>+  ================  ===================================</div><div class='add'>+  0x00000001        Processor Correctable</div><div class='add'>+  0x00000002        Processor Uncorrectable non-fatal</div><div class='add'>+  0x00000004        Processor Uncorrectable fatal</div><div class='add'>+  0x00000008        Memory Correctable</div><div class='add'>+  0x00000010        Memory Uncorrectable non-fatal</div><div class='add'>+  0x00000020        Memory Uncorrectable fatal</div><div class='add'>+  0x00000040        PCI Express Correctable</div><div class='add'>+  0x00000080        PCI Express Uncorrectable fatal</div><div class='add'>+  0x00000100        PCI Express Uncorrectable non-fatal</div><div class='add'>+  0x00000200        Platform Correctable</div><div class='add'>+  0x00000400        Platform Uncorrectable non-fatal</div><div class='add'>+  0x00000800        Platform Uncorrectable fatal</div><div class='add'>+  ================  ===================================</div><div class='ctx'> </div><div class='ctx'>   The format of the file contents are as above, except present are only</div><div class='ctx'>   the available error types.</div><div class='hunk'>@@ -73,9 +78,12 @@ The following files belong to it:</div><div class='ctx'>   injection. Value is a bitmask as specified in ACPI5.0 spec for the</div><div class='ctx'>   SET_ERROR_TYPE_WITH_ADDRESS data structure:</div><div class='ctx'> </div><div class='del'>-	Bit 0 - Processor APIC field valid (see param3 below).</div><div class='del'>-	Bit 1 - Memory address and mask valid (param1 and param2).</div><div class='del'>-	Bit 2 - PCIe (seg,bus,dev,fn) valid (see param4 below).</div><div class='add'>+    Bit 0</div><div class='add'>+      Processor APIC field valid (see param3 below).</div><div class='add'>+    Bit 1</div><div class='add'>+      Memory address and mask valid (param1 and param2).</div><div class='add'>+    Bit 2</div><div class='add'>+      PCIe (seg,bus,dev,fn) valid (see param4 below).</div><div class='ctx'> </div><div class='ctx'>   If set to zero, legacy behavior is mimicked where the type of</div><div class='ctx'>   injection specifies just one bit set, and param1 is multiplexed.</div><div class='hunk'>@@ -121,7 +129,7 @@ BIOS versions based on the ACPI 5.0 specification have more control over</div><div class='ctx'> the target of the injection. For processor-related errors (type 0x1, 0x2</div><div class='ctx'> and 0x4), you can set flags to 0x3 (param3 for bit 0, and param1 and</div><div class='ctx'> param2 for bit 1) so that you have more information added to the error</div><div class='del'>-signature being injected. The actual data passed is this:</div><div class='add'>+signature being injected. The actual data passed is this::</div><div class='ctx'> </div><div class='ctx'> 	memory_address = param1;</div><div class='ctx'> 	memory_address_range = param2;</div><div class='hunk'>@@ -131,7 +139,7 @@ signature being injected. The actual data passed is this:</div><div class='ctx'> For memory errors (type 0x8, 0x10 and 0x20) the address is set using</div><div class='ctx'> param1 with a mask in param2 (0x0 is equivalent to all ones). For PCI</div><div class='ctx'> express errors (type 0x40, 0x80 and 0x100) the segment, bus, device and</div><div class='del'>-function are specified using param1:</div><div class='add'>+function are specified using param1::</div><div class='ctx'> </div><div class='ctx'>          31     24 23    16 15    11 10      8  7        0</div><div class='ctx'> 	+-------------------------------------------------+</div><div class='hunk'>@@ -152,26 +160,26 @@ documentation for details (and expect changes to this API if vendors</div><div class='ctx'> creativity in using this feature expands beyond our expectations).</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-An error injection example:</div><div class='add'>+An error injection example::</div><div class='ctx'> </div><div class='del'>-# cd /sys/kernel/debug/apei/einj</div><div class='del'>-# cat available_error_type		# See which errors can be injected</div><div class='del'>-0x00000002	Processor Uncorrectable non-fatal</div><div class='del'>-0x00000008	Memory Correctable</div><div class='del'>-0x00000010	Memory Uncorrectable non-fatal</div><div class='del'>-# echo 0x12345000 &gt; param1		# Set memory address for injection</div><div class='del'>-# echo $((-1 &lt;&lt; 12)) &gt; param2		# Mask 0xfffffffffffff000 - anywhere in this page</div><div class='del'>-# echo 0x8 &gt; error_type			# Choose correctable memory error</div><div class='del'>-# echo 1 &gt; error_inject			# Inject now</div><div class='add'>+  # cd /sys/kernel/debug/apei/einj</div><div class='add'>+  # cat available_error_type		# See which errors can be injected</div><div class='add'>+  0x00000002	Processor Uncorrectable non-fatal</div><div class='add'>+  0x00000008	Memory Correctable</div><div class='add'>+  0x00000010	Memory Uncorrectable non-fatal</div><div class='add'>+  # echo 0x12345000 &gt; param1		# Set memory address for injection</div><div class='add'>+  # echo $((-1 &lt;&lt; 12)) &gt; param2		# Mask 0xfffffffffffff000 - anywhere in this page</div><div class='add'>+  # echo 0x8 &gt; error_type			# Choose correctable memory error</div><div class='add'>+  # echo 1 &gt; error_inject			# Inject now</div><div class='ctx'> </div><div class='del'>-You should see something like this in dmesg:</div><div class='add'>+You should see something like this in dmesg::</div><div class='ctx'> </div><div class='del'>-[22715.830801] EDAC sbridge MC3: HANDLING MCE MEMORY ERROR</div><div class='del'>-[22715.834759] EDAC sbridge MC3: CPU 0: Machine Check Event: 0 Bank 7: 8c00004000010090</div><div class='del'>-[22715.834759] EDAC sbridge MC3: TSC 0</div><div class='del'>-[22715.834759] EDAC sbridge MC3: ADDR 12345000 EDAC sbridge MC3: MISC 144780c86</div><div class='del'>-[22715.834759] EDAC sbridge MC3: PROCESSOR 0:306e7 TIME 1422553404 SOCKET 0 APIC 0</div><div class='del'>-[22716.616173] EDAC MC3: 1 CE memory read error on CPU_SrcID#0_Channel#0_DIMM#0 (channel:0 slot:0 page:0x12345 offset:0x0 grain:32 syndrome:0x0 -  area:DRAM err_code:0001:0090 socket:0 channel_mask:1 rank:0)</div><div class='add'>+  [22715.830801] EDAC sbridge MC3: HANDLING MCE MEMORY ERROR</div><div class='add'>+  [22715.834759] EDAC sbridge MC3: CPU 0: Machine Check Event: 0 Bank 7: 8c00004000010090</div><div class='add'>+  [22715.834759] EDAC sbridge MC3: TSC 0</div><div class='add'>+  [22715.834759] EDAC sbridge MC3: ADDR 12345000 EDAC sbridge MC3: MISC 144780c86</div><div class='add'>+  [22715.834759] EDAC sbridge MC3: PROCESSOR 0:306e7 TIME 1422553404 SOCKET 0 APIC 0</div><div class='add'>+  [22716.616173] EDAC MC3: 1 CE memory read error on CPU_SrcID#0_Channel#0_DIMM#0 (channel:0 slot:0 page:0x12345 offset:0x0 grain:32 syndrome:0x0 -  area:DRAM err_code:0001:0090 socket:0 channel_mask:1 rank:0)</div><div class='ctx'> </div><div class='ctx'> For more information about EINJ, please refer to ACPI specification</div><div class='ctx'> version 4.0, section 17.5 and ACPI 5.0, section 18.6.</div><div class='head'>diff --git a/Documentation/firmware-guide/acpi/apei/output_format.rst b/Documentation/firmware-guide/acpi/apei/output_format.rst<br/>new file mode 100644<br/>index 000000000000..c2e7ebddb529<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/apei/output_format.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/apei/output_format.rst</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+==================</div><div class='add'>+APEI output format</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+APEI uses printk as hardware error reporting interface, the output</div><div class='add'>+format is as follow::</div><div class='add'>+</div><div class='add'>+        &lt;error record&gt; :=</div><div class='add'>+        APEI generic hardware error status</div><div class='add'>+        severity: &lt;integer&gt;, &lt;severity string&gt;</div><div class='add'>+        section: &lt;integer&gt;, severity: &lt;integer&gt;, &lt;severity string&gt;</div><div class='add'>+        flags: &lt;integer&gt;</div><div class='add'>+        &lt;section flags strings&gt;</div><div class='add'>+        fru_id: &lt;uuid string&gt;</div><div class='add'>+        fru_text: &lt;string&gt;</div><div class='add'>+        section_type: &lt;section type string&gt;</div><div class='add'>+        &lt;section data&gt;</div><div class='add'>+</div><div class='add'>+        &lt;severity string&gt;* := recoverable | fatal | corrected | info</div><div class='add'>+</div><div class='add'>+        &lt;section flags strings&gt;# :=</div><div class='add'>+        [primary][, containment warning][, reset][, threshold exceeded]\</div><div class='add'>+        [, resource not accessible][, latent error]</div><div class='add'>+</div><div class='add'>+        &lt;section type string&gt; := generic processor error | memory error | \</div><div class='add'>+        PCIe error | unknown, &lt;uuid string&gt;</div><div class='add'>+</div><div class='add'>+        &lt;section data&gt; :=</div><div class='add'>+        &lt;generic processor section data&gt; | &lt;memory section data&gt; | \</div><div class='add'>+        &lt;pcie section data&gt; | &lt;null&gt;</div><div class='add'>+</div><div class='add'>+        &lt;generic processor section data&gt; :=</div><div class='add'>+        [processor_type: &lt;integer&gt;, &lt;proc type string&gt;]</div><div class='add'>+        [processor_isa: &lt;integer&gt;, &lt;proc isa string&gt;]</div><div class='add'>+        [error_type: &lt;integer&gt;</div><div class='add'>+        &lt;proc error type strings&gt;]</div><div class='add'>+        [operation: &lt;integer&gt;, &lt;proc operation string&gt;]</div><div class='add'>+        [flags: &lt;integer&gt;</div><div class='add'>+        &lt;proc flags strings&gt;]</div><div class='add'>+        [level: &lt;integer&gt;]</div><div class='add'>+        [version_info: &lt;integer&gt;]</div><div class='add'>+        [processor_id: &lt;integer&gt;]</div><div class='add'>+        [target_address: &lt;integer&gt;]</div><div class='add'>+        [requestor_id: &lt;integer&gt;]</div><div class='add'>+        [responder_id: &lt;integer&gt;]</div><div class='add'>+        [IP: &lt;integer&gt;]</div><div class='add'>+</div><div class='add'>+        &lt;proc type string&gt;* := IA32/X64 | IA64</div><div class='add'>+</div><div class='add'>+        &lt;proc isa string&gt;* := IA32 | IA64 | X64</div><div class='add'>+</div><div class='add'>+        &lt;processor error type strings&gt;# :=</div><div class='add'>+        [cache error][, TLB error][, bus error][, micro-architectural error]</div><div class='add'>+</div><div class='add'>+        &lt;proc operation string&gt;* := unknown or generic | data read | data write | \</div><div class='add'>+        instruction execution</div><div class='add'>+</div><div class='add'>+        &lt;proc flags strings&gt;# :=</div><div class='add'>+        [restartable][, precise IP][, overflow][, corrected]</div><div class='add'>+</div><div class='add'>+        &lt;memory section data&gt; :=</div><div class='add'>+        [error_status: &lt;integer&gt;]</div><div class='add'>+        [physical_address: &lt;integer&gt;]</div><div class='add'>+        [physical_address_mask: &lt;integer&gt;]</div><div class='add'>+        [node: &lt;integer&gt;]</div><div class='add'>+        [card: &lt;integer&gt;]</div><div class='add'>+        [module: &lt;integer&gt;]</div><div class='add'>+        [bank: &lt;integer&gt;]</div><div class='add'>+        [device: &lt;integer&gt;]</div><div class='add'>+        [row: &lt;integer&gt;]</div><div class='add'>+        [column: &lt;integer&gt;]</div><div class='add'>+        [bit_position: &lt;integer&gt;]</div><div class='add'>+        [requestor_id: &lt;integer&gt;]</div><div class='add'>+        [responder_id: &lt;integer&gt;]</div><div class='add'>+        [target_id: &lt;integer&gt;]</div><div class='add'>+        [error_type: &lt;integer&gt;, &lt;mem error type string&gt;]</div><div class='add'>+</div><div class='add'>+        &lt;mem error type string&gt;* :=</div><div class='add'>+        unknown | no error | single-bit ECC | multi-bit ECC | \</div><div class='add'>+        single-symbol chipkill ECC | multi-symbol chipkill ECC | master abort | \</div><div class='add'>+        target abort | parity error | watchdog timeout | invalid address | \</div><div class='add'>+        mirror Broken | memory sparing | scrub corrected error | \</div><div class='add'>+        scrub uncorrected error</div><div class='add'>+</div><div class='add'>+        &lt;pcie section data&gt; :=</div><div class='add'>+        [port_type: &lt;integer&gt;, &lt;pcie port type string&gt;]</div><div class='add'>+        [version: &lt;integer&gt;.&lt;integer&gt;]</div><div class='add'>+        [command: &lt;integer&gt;, status: &lt;integer&gt;]</div><div class='add'>+        [device_id: &lt;integer&gt;:&lt;integer&gt;:&lt;integer&gt;.&lt;integer&gt;</div><div class='add'>+        slot: &lt;integer&gt;</div><div class='add'>+        secondary_bus: &lt;integer&gt;</div><div class='add'>+        vendor_id: &lt;integer&gt;, device_id: &lt;integer&gt;</div><div class='add'>+        class_code: &lt;integer&gt;]</div><div class='add'>+        [serial number: &lt;integer&gt;, &lt;integer&gt;]</div><div class='add'>+        [bridge: secondary_status: &lt;integer&gt;, control: &lt;integer&gt;]</div><div class='add'>+        [aer_status: &lt;integer&gt;, aer_mask: &lt;integer&gt;</div><div class='add'>+        &lt;aer status string&gt;</div><div class='add'>+        [aer_uncor_severity: &lt;integer&gt;]</div><div class='add'>+        aer_layer=&lt;aer layer string&gt;, aer_agent=&lt;aer agent string&gt;</div><div class='add'>+        aer_tlp_header: &lt;integer&gt; &lt;integer&gt; &lt;integer&gt; &lt;integer&gt;]</div><div class='add'>+</div><div class='add'>+        &lt;pcie port type string&gt;* := PCIe end point | legacy PCI end point | \</div><div class='add'>+        unknown | unknown | root port | upstream switch port | \</div><div class='add'>+        downstream switch port | PCIe to PCI/PCI-X bridge | \</div><div class='add'>+        PCI/PCI-X to PCIe bridge | root complex integrated endpoint device | \</div><div class='add'>+        root complex event collector</div><div class='add'>+</div><div class='add'>+        if section severity is fatal or recoverable</div><div class='add'>+        &lt;aer status string&gt;# :=</div><div class='add'>+        unknown | unknown | unknown | unknown | Data Link Protocol | \</div><div class='add'>+        unknown | unknown | unknown | unknown | unknown | unknown | unknown | \</div><div class='add'>+        Poisoned TLP | Flow Control Protocol | Completion Timeout | \</div><div class='add'>+        Completer Abort | Unexpected Completion | Receiver Overflow | \</div><div class='add'>+        Malformed TLP | ECRC | Unsupported Request</div><div class='add'>+        else</div><div class='add'>+        &lt;aer status string&gt;# :=</div><div class='add'>+        Receiver Error | unknown | unknown | unknown | unknown | unknown | \</div><div class='add'>+        Bad TLP | Bad DLLP | RELAY_NUM Rollover | unknown | unknown | unknown | \</div><div class='add'>+        Replay Timer Timeout | Advisory Non-Fatal</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+        &lt;aer layer string&gt; :=</div><div class='add'>+        Physical Layer | Data Link Layer | Transaction Layer</div><div class='add'>+</div><div class='add'>+        &lt;aer agent string&gt; :=</div><div class='add'>+        Receiver ID | Requester ID | Completer ID | Transmitter ID</div><div class='add'>+</div><div class='add'>+Where, [] designate corresponding content is optional</div><div class='add'>+</div><div class='add'>+All &lt;field string&gt; description with * has the following format::</div><div class='add'>+</div><div class='add'>+        field: &lt;integer&gt;, &lt;field string&gt;</div><div class='add'>+</div><div class='add'>+Where value of &lt;integer&gt; should be the position of "string" in &lt;field</div><div class='add'>+string&gt; description. Otherwise, &lt;field string&gt; will be "unknown".</div><div class='add'>+</div><div class='add'>+All &lt;field strings&gt; description with # has the following format::</div><div class='add'>+</div><div class='add'>+        field: &lt;integer&gt;</div><div class='add'>+        &lt;field strings&gt;</div><div class='add'>+</div><div class='add'>+Where each string in &lt;fields strings&gt; corresponding to one set bit of</div><div class='add'>+&lt;integer&gt;. The bit position is the position of "string" in &lt;field</div><div class='add'>+strings&gt; description.</div><div class='add'>+</div><div class='add'>+For more detailed explanation of every field, please refer to UEFI</div><div class='add'>+specification version 2.3 or later, section Appendix N: Common</div><div class='add'>+Platform Error Record.</div><div class='head'>diff --git a/Documentation/acpi/debug.txt b/Documentation/firmware-guide/acpi/debug.rst<br/>index 65bf47c46b6d..1a152dd1d765 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/debug.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/debug.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/debug.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/debug.rst</a></div><div class='hunk'>@@ -1,18 +1,21 @@</div><div class='del'>-			ACPI Debug Output</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+=================</div><div class='add'>+ACPI Debug Output</div><div class='add'>+=================</div><div class='ctx'> </div><div class='ctx'> The ACPI CA, the Linux ACPI core, and some ACPI drivers can generate debug</div><div class='ctx'> output.  This document describes how to use this facility.</div><div class='ctx'> </div><div class='ctx'> Compile-time configuration</div><div class='del'>---------------------------</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> ACPI debug output is globally enabled by CONFIG_ACPI_DEBUG.  If this config</div><div class='ctx'> option is turned off, the debug messages are not even built into the</div><div class='ctx'> kernel.</div><div class='ctx'> </div><div class='ctx'> Boot- and run-time configuration</div><div class='del'>---------------------------------</div><div class='add'>+================================</div><div class='ctx'> </div><div class='ctx'> When CONFIG_ACPI_DEBUG=y, you can select the component and level of messages</div><div class='ctx'> you're interested in.  At boot-time, use the acpi.debug_layer and</div><div class='hunk'>@@ -21,7 +24,7 @@ debug_layer and debug_level files in /sys/module/acpi/parameters/ to control</div><div class='ctx'> the debug messages.</div><div class='ctx'> </div><div class='ctx'> debug_layer (component)</div><div class='del'>------------------------</div><div class='add'>+=======================</div><div class='ctx'> </div><div class='ctx'> The "debug_layer" is a mask that selects components of interest, e.g., a</div><div class='ctx'> specific driver or part of the ACPI interpreter.  To build the debug_layer</div><div class='hunk'>@@ -33,7 +36,7 @@ to /sys/module/acpi/parameters/debug_layer.</div><div class='ctx'> </div><div class='ctx'> The possible components are defined in include/acpi/acoutput.h and</div><div class='ctx'> include/acpi/acpi_drivers.h.  Reading /sys/module/acpi/parameters/debug_layer</div><div class='del'>-shows the supported mask values, currently these:</div><div class='add'>+shows the supported mask values, currently these::</div><div class='ctx'> </div><div class='ctx'>     ACPI_UTILITIES                  0x00000001</div><div class='ctx'>     ACPI_HARDWARE                   0x00000002</div><div class='hunk'>@@ -65,7 +68,7 @@ shows the supported mask values, currently these:</div><div class='ctx'>     ACPI_PROCESSOR_COMPONENT        0x20000000</div><div class='ctx'> </div><div class='ctx'> debug_level</div><div class='del'>------------</div><div class='add'>+===========</div><div class='ctx'> </div><div class='ctx'> The "debug_level" is a mask that selects different types of messages, e.g.,</div><div class='ctx'> those related to initialization, method execution, informational messages, etc.</div><div class='hunk'>@@ -81,7 +84,7 @@ to /sys/module/acpi/parameters/debug_level.</div><div class='ctx'> </div><div class='ctx'> The possible levels are defined in include/acpi/acoutput.h.  Reading</div><div class='ctx'> /sys/module/acpi/parameters/debug_level shows the supported mask values,</div><div class='del'>-currently these:</div><div class='add'>+currently these::</div><div class='ctx'> </div><div class='ctx'>     ACPI_LV_INIT                    0x00000001</div><div class='ctx'>     ACPI_LV_DEBUG_OBJECT            0x00000002</div><div class='hunk'>@@ -113,9 +116,9 @@ currently these:</div><div class='ctx'>     ACPI_LV_EVENTS                  0x80000000</div><div class='ctx'> </div><div class='ctx'> Examples</div><div class='del'>---------</div><div class='add'>+========</div><div class='ctx'> </div><div class='del'>-For example, drivers/acpi/bus.c contains this:</div><div class='add'>+For example, drivers/acpi/bus.c contains this::</div><div class='ctx'> </div><div class='ctx'>     #define _COMPONENT              ACPI_BUS_COMPONENT</div><div class='ctx'>     ...</div><div class='hunk'>@@ -127,22 +130,22 @@ statement uses ACPI_DB_INFO, which is macro based on the ACPI_LV_INFO</div><div class='ctx'> definition.)</div><div class='ctx'> </div><div class='ctx'> Enable all AML "Debug" output (stores to the Debug object while interpreting</div><div class='del'>-AML) during boot:</div><div class='add'>+AML) during boot::</div><div class='ctx'> </div><div class='ctx'>     acpi.debug_layer=0xffffffff acpi.debug_level=0x2</div><div class='ctx'> </div><div class='del'>-Enable PCI and PCI interrupt routing debug messages:</div><div class='add'>+Enable PCI and PCI interrupt routing debug messages::</div><div class='ctx'> </div><div class='ctx'>     acpi.debug_layer=0x400000 acpi.debug_level=0x4</div><div class='ctx'> </div><div class='del'>-Enable all ACPI hardware-related messages:</div><div class='add'>+Enable all ACPI hardware-related messages::</div><div class='ctx'> </div><div class='ctx'>     acpi.debug_layer=0x2 acpi.debug_level=0xffffffff</div><div class='ctx'> </div><div class='del'>-Enable all ACPI_DB_INFO messages after boot:</div><div class='add'>+Enable all ACPI_DB_INFO messages after boot::</div><div class='ctx'> </div><div class='ctx'>     # echo 0x4 &gt; /sys/module/acpi/parameters/debug_level</div><div class='ctx'> </div><div class='del'>-Show all valid component values:</div><div class='add'>+Show all valid component values::</div><div class='ctx'> </div><div class='ctx'>     # cat /sys/module/acpi/parameters/debug_layer</div><div class='head'>diff --git a/Documentation/acpi/dsd/data-node-references.txt b/Documentation/firmware-guide/acpi/dsd/data-node-references.rst<br/>index c3871565c8cf..1351984e767c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/dsd/data-node-references.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/dsd/data-node-references.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/dsd/data-node-references.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/dsd/data-node-references.rst</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='del'>-Copyright (C) 2018 Intel Corporation</div><div class='del'>-Author: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;</div><div class='del'>-</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='ctx'> </div><div class='add'>+===================================</div><div class='ctx'> Referencing hierarchical data nodes</div><div class='del'>------------------------------------</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+:Copyright: |copy| 2018 Intel Corporation</div><div class='add'>+:Author: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> ACPI in general allows referring to device objects in the tree only.</div><div class='ctx'> Hierarchical data extension nodes may not be referred to directly, hence this</div><div class='hunk'>@@ -28,13 +31,14 @@ extension key.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Example</div><div class='del'>--------</div><div class='add'>+=======</div><div class='ctx'> </div><div class='del'>-	In the ASL snippet below, the "reference" _DSD property [2] contains a</div><div class='del'>-	device object reference to DEV0 and under that device object, a</div><div class='del'>-	hierarchical data extension key "node@1" referring to the NOD1 object</div><div class='del'>-	and lastly, a hierarchical data extension key "anothernode" referring to</div><div class='del'>-	the ANOD object which is also the final target node of the reference.</div><div class='add'>+In the ASL snippet below, the "reference" _DSD property [2] contains a</div><div class='add'>+device object reference to DEV0 and under that device object, a</div><div class='add'>+hierarchical data extension key "node@1" referring to the NOD1 object</div><div class='add'>+and lastly, a hierarchical data extension key "anothernode" referring to</div><div class='add'>+the ANOD object which is also the final target node of the reference.</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'> 	Device (DEV0)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -75,15 +79,15 @@ Example</div><div class='ctx'> 	    })</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-Please also see a graph example in graph.txt .</div><div class='add'>+Please also see a graph example in :doc:`graph`.</div><div class='ctx'> </div><div class='ctx'> References</div><div class='del'>-----------</div><div class='add'>+==========</div><div class='ctx'> </div><div class='ctx'> [1] Hierarchical Data Extension UUID For _DSD.</div><div class='del'>-    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf&gt;,</div><div class='del'>-    referenced 2018-07-17.</div><div class='add'>+&lt;http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf&gt;,</div><div class='add'>+referenced 2018-07-17.</div><div class='ctx'> </div><div class='ctx'> [2] Device Properties UUID For _DSD.</div><div class='del'>-    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf&gt;,</div><div class='del'>-    referenced 2016-10-04.</div><div class='add'>+&lt;http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf&gt;,</div><div class='add'>+referenced 2016-10-04.</div><div class='head'>diff --git a/Documentation/acpi/dsd/graph.txt b/Documentation/firmware-guide/acpi/dsd/graph.rst<br/>index b9ce910781dc..e0baed35b037 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/dsd/graph.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/dsd/graph.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/dsd/graph.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/dsd/graph.rst</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='del'>-Graphs</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+======</div><div class='add'>+Graphs</div><div class='add'>+======</div><div class='ctx'> </div><div class='ctx'> _DSD</div><div class='del'>-----</div><div class='add'>+====</div><div class='ctx'> </div><div class='ctx'> _DSD (Device Specific Data) [7] is a predefined ACPI device</div><div class='ctx'> configuration object that can be used to convey information on</div><div class='hunk'>@@ -30,7 +33,7 @@ hierarchical data extension array on each depth.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Ports and endpoints</div><div class='del'>--------------------</div><div class='add'>+===================</div><div class='ctx'> </div><div class='ctx'> The port and endpoint concepts are very similar to those in Devicetree</div><div class='ctx'> [3]. A port represents an interface in a device, and an endpoint</div><div class='hunk'>@@ -38,9 +41,9 @@ represents a connection to that interface.</div><div class='ctx'> </div><div class='ctx'> All port nodes are located under the device's "_DSD" node in the hierarchical</div><div class='ctx'> data extension tree. The data extension related to each port node must begin</div><div class='del'>-with "port" and must be followed by the "@" character and the number of the port</div><div class='del'>-as its key. The target object it refers to should be called "PRTX", where "X" is</div><div class='del'>-the number of the port. An example of such a package would be:</div><div class='add'>+with "port" and must be followed by the "@" character and the number of the</div><div class='add'>+port as its key. The target object it refers to should be called "PRTX", where</div><div class='add'>+"X" is the number of the port. An example of such a package would be::</div><div class='ctx'> </div><div class='ctx'>     Package() { "port@4", PRT4 }</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +52,7 @@ data extension key of the endpoint nodes must begin with</div><div class='ctx'> "endpoint" and must be followed by the "@" character and the number of the</div><div class='ctx'> endpoint. The object it refers to should be called "EPXY", where "X" is the</div><div class='ctx'> number of the port and "Y" is the number of the endpoint. An example of such a</div><div class='del'>-package would be:</div><div class='add'>+package would be::</div><div class='ctx'> </div><div class='ctx'>     Package() { "endpoint@0", EP40 }</div><div class='ctx'> </div><div class='hunk'>@@ -62,85 +65,85 @@ of that port shall be zero. Similarly, if a port may only have a single</div><div class='ctx'> endpoint, the number of that endpoint shall be zero.</div><div class='ctx'> </div><div class='ctx'> The endpoint reference uses property extension with "remote-endpoint" property</div><div class='del'>-name followed by a reference in the same package. Such references consist of the</div><div class='add'>+name followed by a reference in the same package. Such references consist of</div><div class='ctx'> the remote device reference, the first package entry of the port data extension</div><div class='ctx'> reference under the device and finally the first package entry of the endpoint</div><div class='del'>-data extension reference under the port. Individual references thus appear as:</div><div class='add'>+data extension reference under the port. Individual references thus appear as::</div><div class='ctx'> </div><div class='ctx'>     Package() { device, "port@X", "endpoint@Y" }</div><div class='ctx'> </div><div class='del'>-In the above example, "X" is the number of the port and "Y" is the number of the</div><div class='del'>-endpoint.</div><div class='add'>+In the above example, "X" is the number of the port and "Y" is the number of</div><div class='add'>+the endpoint.</div><div class='ctx'> </div><div class='ctx'> The references to endpoints must be always done both ways, to the</div><div class='ctx'> remote endpoint and back from the referred remote endpoint node.</div><div class='ctx'> </div><div class='del'>-A simple example of this is show below:</div><div class='add'>+A simple example of this is show below::</div><div class='ctx'> </div><div class='ctx'>     Scope (\_SB.PCI0.I2C2)</div><div class='ctx'>     {</div><div class='del'>-	Device (CAM0)</div><div class='del'>-	{</div><div class='del'>-	    Name (_DSD, Package () {</div><div class='del'>-		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "compatible", Package () { "nokia,smia" } },</div><div class='del'>-		},</div><div class='del'>-		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "port@0", PRT0 },</div><div class='del'>-		}</div><div class='del'>-	    })</div><div class='del'>-	    Name (PRT0, Package() {</div><div class='del'>-		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "reg", 0 },</div><div class='del'>-		},</div><div class='del'>-		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "endpoint@0", EP00 },</div><div class='del'>-		}</div><div class='del'>-	    })</div><div class='del'>-	    Name (EP00, Package() {</div><div class='del'>-		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "reg", 0 },</div><div class='del'>-		    Package () { "remote-endpoint", Package() { \_SB.PCI0.ISP, "port@4", "endpoint@0" } },</div><div class='del'>-		}</div><div class='del'>-	    })</div><div class='del'>-	}</div><div class='add'>+        Device (CAM0)</div><div class='add'>+        {</div><div class='add'>+            Name (_DSD, Package () {</div><div class='add'>+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "compatible", Package () { "nokia,smia" } },</div><div class='add'>+                },</div><div class='add'>+                ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "port@0", PRT0 },</div><div class='add'>+                }</div><div class='add'>+            })</div><div class='add'>+            Name (PRT0, Package() {</div><div class='add'>+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "reg", 0 },</div><div class='add'>+                },</div><div class='add'>+                ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "endpoint@0", EP00 },</div><div class='add'>+                }</div><div class='add'>+            })</div><div class='add'>+            Name (EP00, Package() {</div><div class='add'>+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "reg", 0 },</div><div class='add'>+                    Package () { "remote-endpoint", Package() { \_SB.PCI0.ISP, "port@4", "endpoint@0" } },</div><div class='add'>+                }</div><div class='add'>+            })</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     Scope (\_SB.PCI0)</div><div class='ctx'>     {</div><div class='del'>-	Device (ISP)</div><div class='del'>-	{</div><div class='del'>-	    Name (_DSD, Package () {</div><div class='del'>-		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "port@4", PRT4 },</div><div class='del'>-		}</div><div class='del'>-	    })</div><div class='del'>-</div><div class='del'>-	    Name (PRT4, Package() {</div><div class='del'>-		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "reg", 4 }, /* CSI-2 port number */</div><div class='del'>-		},</div><div class='del'>-		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "endpoint@0", EP40 },</div><div class='del'>-		}</div><div class='del'>-	    })</div><div class='del'>-</div><div class='del'>-	    Name (EP40, Package() {</div><div class='del'>-		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='del'>-		Package () {</div><div class='del'>-		    Package () { "reg", 0 },</div><div class='del'>-		    Package () { "remote-endpoint", Package () { \_SB.PCI0.I2C2.CAM0, "port@0", "endpoint@0" } },</div><div class='del'>-		}</div><div class='del'>-	    })</div><div class='del'>-	}</div><div class='add'>+        Device (ISP)</div><div class='add'>+        {</div><div class='add'>+            Name (_DSD, Package () {</div><div class='add'>+                ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "port@4", PRT4 },</div><div class='add'>+                }</div><div class='add'>+            })</div><div class='add'>+</div><div class='add'>+            Name (PRT4, Package() {</div><div class='add'>+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "reg", 4 }, /* CSI-2 port number */</div><div class='add'>+                },</div><div class='add'>+                ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "endpoint@0", EP40 },</div><div class='add'>+                }</div><div class='add'>+            })</div><div class='add'>+</div><div class='add'>+            Name (EP40, Package() {</div><div class='add'>+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+                Package () {</div><div class='add'>+                    Package () { "reg", 0 },</div><div class='add'>+                    Package () { "remote-endpoint", Package () { \_SB.PCI0.I2C2.CAM0, "port@0", "endpoint@0" } },</div><div class='add'>+                }</div><div class='add'>+            })</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> Here, the port 0 of the "CAM0" device is connected to the port 4 of</div><div class='hunk'>@@ -148,27 +151,27 @@ the "ISP" device and vice versa.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> References</div><div class='del'>-----------</div><div class='add'>+==========</div><div class='ctx'> </div><div class='ctx'> [1] _DSD (Device Specific Data) Implementation Guide.</div><div class='del'>-    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-implementation-guide-toplevel-1_1.htm&gt;,</div><div class='add'>+    http://www.uefi.org/sites/default/files/resources/_DSD-implementation-guide-toplevel-1_1.htm,</div><div class='ctx'>     referenced 2016-10-03.</div><div class='ctx'> </div><div class='del'>-[2] Devicetree. &lt;URL:http://www.devicetree.org&gt;, referenced 2016-10-03.</div><div class='add'>+[2] Devicetree. http://www.devicetree.org, referenced 2016-10-03.</div><div class='ctx'> </div><div class='ctx'> [3] Documentation/devicetree/bindings/graph.txt</div><div class='ctx'> </div><div class='ctx'> [4] Device Properties UUID For _DSD.</div><div class='del'>-    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf&gt;,</div><div class='add'>+    http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf,</div><div class='ctx'>     referenced 2016-10-04.</div><div class='ctx'> </div><div class='ctx'> [5] Hierarchical Data Extension UUID For _DSD.</div><div class='del'>-    &lt;URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf&gt;,</div><div class='add'>+    http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf,</div><div class='ctx'>     referenced 2016-10-04.</div><div class='ctx'> </div><div class='ctx'> [6] Advanced Configuration and Power Interface Specification.</div><div class='del'>-    &lt;URL:http://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf&gt;,</div><div class='add'>+    http://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf,</div><div class='ctx'>     referenced 2016-10-04.</div><div class='ctx'> </div><div class='ctx'> [7] _DSD Device Properties Usage Rules.</div><div class='del'>-    Documentation/acpi/DSD-properties-rules.txt</div><div class='add'>+    :doc:`../DSD-properties-rules`</div><div class='head'>diff --git a/Documentation/acpi/enumeration.txt b/Documentation/firmware-guide/acpi/enumeration.rst<br/>index 7bcf9c3d9fbe..6b32b7be8c85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/enumeration.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/enumeration.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/enumeration.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/enumeration.rst</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='del'>-ACPI based device enumeration</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+=============================</div><div class='add'>+ACPI Based Device Enumeration</div><div class='add'>+=============================</div><div class='add'>+</div><div class='ctx'> ACPI 5 introduced a set of new resources (UartTSerialBus, I2cSerialBus,</div><div class='ctx'> SpiSerialBus, GpioIo and GpioInt) which can be used in enumerating slave</div><div class='ctx'> devices behind serial bus controllers.</div><div class='hunk'>@@ -11,12 +15,12 @@ that are accessed through memory-mapped registers.</div><div class='ctx'> In order to support this and re-use the existing drivers as much as</div><div class='ctx'> possible we decided to do following:</div><div class='ctx'> </div><div class='del'>-	o Devices that have no bus connector resource are represented as</div><div class='del'>-	  platform devices.</div><div class='add'>+  - Devices that have no bus connector resource are represented as</div><div class='add'>+    platform devices.</div><div class='ctx'> </div><div class='del'>-	o Devices behind real busses where there is a connector resource</div><div class='del'>-	  are represented as struct spi_device or struct i2c_device</div><div class='del'>-	  (standard UARTs are not busses so there is no struct uart_device).</div><div class='add'>+  - Devices behind real busses where there is a connector resource</div><div class='add'>+    are represented as struct spi_device or struct i2c_device</div><div class='add'>+    (standard UARTs are not busses so there is no struct uart_device).</div><div class='ctx'> </div><div class='ctx'> As both ACPI and Device Tree represent a tree of devices (and their</div><div class='ctx'> resources) this implementation follows the Device Tree way as much as</div><div class='hunk'>@@ -31,7 +35,8 @@ enumerated from ACPI namespace. This handle can be used to extract other</div><div class='ctx'> device-specific configuration. There is an example of this below.</div><div class='ctx'> </div><div class='ctx'> Platform bus support</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+====================</div><div class='add'>+</div><div class='ctx'> Since we are using platform devices to represent devices that are not</div><div class='ctx'> connected to any physical bus we only need to implement a platform driver</div><div class='ctx'> for the device and add supported ACPI IDs. If this same IP-block is used on</div><div class='hunk'>@@ -39,7 +44,7 @@ some other non-ACPI platform, the driver might work out of the box or needs</div><div class='ctx'> some minor changes.</div><div class='ctx'> </div><div class='ctx'> Adding ACPI support for an existing driver should be pretty</div><div class='del'>-straightforward. Here is the simplest example:</div><div class='add'>+straightforward. Here is the simplest example::</div><div class='ctx'> </div><div class='ctx'> 	#ifdef CONFIG_ACPI</div><div class='ctx'> 	static const struct acpi_device_id mydrv_acpi_match[] = {</div><div class='hunk'>@@ -61,12 +66,13 @@ configuring GPIOs it can get its ACPI handle and extract this information</div><div class='ctx'> from ACPI tables.</div><div class='ctx'> </div><div class='ctx'> DMA support</div><div class='del'>-~~~~~~~~~~~</div><div class='add'>+===========</div><div class='add'>+</div><div class='ctx'> DMA controllers enumerated via ACPI should be registered in the system to</div><div class='ctx'> provide generic access to their resources. For example, a driver that would</div><div class='ctx'> like to be accessible to slave devices via generic API call</div><div class='ctx'> dma_request_slave_channel() must register itself at the end of the probe</div><div class='del'>-function like this:</div><div class='add'>+function like this::</div><div class='ctx'> </div><div class='ctx'> 	err = devm_acpi_dma_controller_register(dev, xlate_func, dw);</div><div class='ctx'> 	/* Handle the error if it's not a case of !CONFIG_ACPI */</div><div class='hunk'>@@ -74,7 +80,7 @@ function like this:</div><div class='ctx'> and implement custom xlate function if needed (usually acpi_dma_simple_xlate()</div><div class='ctx'> is enough) which converts the FixedDMA resource provided by struct</div><div class='ctx'> acpi_dma_spec into the corresponding DMA channel. A piece of code for that case</div><div class='del'>-could look like:</div><div class='add'>+could look like::</div><div class='ctx'> </div><div class='ctx'> 	#ifdef CONFIG_ACPI</div><div class='ctx'> 	struct filter_args {</div><div class='hunk'>@@ -114,7 +120,7 @@ provided by struct acpi_dma.</div><div class='ctx'> Clients must call dma_request_slave_channel() with the string parameter that</div><div class='ctx'> corresponds to a specific FixedDMA resource. By default "tx" means the first</div><div class='ctx'> entry of the FixedDMA resource array, "rx" means the second entry. The table</div><div class='del'>-below shows a layout:</div><div class='add'>+below shows a layout::</div><div class='ctx'> </div><div class='ctx'> 	Device (I2C0)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -138,12 +144,13 @@ acpi_dma_request_slave_chan_by_index() directly and therefore choose the</div><div class='ctx'> specific FixedDMA resource by its index.</div><div class='ctx'> </div><div class='ctx'> SPI serial bus support</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+======================</div><div class='add'>+</div><div class='ctx'> Slave devices behind SPI bus have SpiSerialBus resource attached to them.</div><div class='ctx'> This is extracted automatically by the SPI core and the slave devices are</div><div class='ctx'> enumerated once spi_register_master() is called by the bus driver.</div><div class='ctx'> </div><div class='del'>-Here is what the ACPI namespace for a SPI slave might look like:</div><div class='add'>+Here is what the ACPI namespace for a SPI slave might look like::</div><div class='ctx'> </div><div class='ctx'> 	Device (EEP0)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -163,7 +170,7 @@ Here is what the ACPI namespace for a SPI slave might look like:</div><div class='ctx'> </div><div class='ctx'> The SPI device drivers only need to add ACPI IDs in a similar way than with</div><div class='ctx'> the platform device drivers. Below is an example where we add ACPI support</div><div class='del'>-to at25 SPI eeprom driver (this is meant for the above ACPI snippet):</div><div class='add'>+to at25 SPI eeprom driver (this is meant for the above ACPI snippet)::</div><div class='ctx'> </div><div class='ctx'> 	#ifdef CONFIG_ACPI</div><div class='ctx'> 	static const struct acpi_device_id at25_acpi_match[] = {</div><div class='hunk'>@@ -182,7 +189,7 @@ to at25 SPI eeprom driver (this is meant for the above ACPI snippet):</div><div class='ctx'> </div><div class='ctx'> Note that this driver actually needs more information like page size of the</div><div class='ctx'> eeprom etc. but at the time writing this there is no standard way of</div><div class='del'>-passing those. One idea is to return this in _DSM method like:</div><div class='add'>+passing those. One idea is to return this in _DSM method like::</div><div class='ctx'> </div><div class='ctx'> 	Device (EEP0)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -202,7 +209,7 @@ passing those. One idea is to return this in _DSM method like:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> Then the at25 SPI driver can get this configuration by calling _DSM on its</div><div class='del'>-ACPI handle like:</div><div class='add'>+ACPI handle like::</div><div class='ctx'> </div><div class='ctx'> 	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	struct acpi_object_list input;</div><div class='hunk'>@@ -220,14 +227,15 @@ ACPI handle like:</div><div class='ctx'> 	kfree(output.pointer);</div><div class='ctx'> </div><div class='ctx'> I2C serial bus support</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+======================</div><div class='add'>+</div><div class='ctx'> The slaves behind I2C bus controller only need to add the ACPI IDs like</div><div class='ctx'> with the platform and SPI drivers. The I2C core automatically enumerates</div><div class='ctx'> any slave devices behind the controller device once the adapter is</div><div class='ctx'> registered.</div><div class='ctx'> </div><div class='ctx'> Below is an example of how to add ACPI support to the existing mpu3050</div><div class='del'>-input driver:</div><div class='add'>+input driver::</div><div class='ctx'> </div><div class='ctx'> 	#ifdef CONFIG_ACPI</div><div class='ctx'> 	static const struct acpi_device_id mpu3050_acpi_match[] = {</div><div class='hunk'>@@ -251,56 +259,57 @@ input driver:</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> GPIO support</div><div class='del'>-~~~~~~~~~~~~</div><div class='add'>+============</div><div class='add'>+</div><div class='ctx'> ACPI 5 introduced two new resources to describe GPIO connections: GpioIo</div><div class='ctx'> and GpioInt. These resources can be used to pass GPIO numbers used by</div><div class='ctx'> the device to the driver. ACPI 5.1 extended this with _DSD (Device</div><div class='ctx'> Specific Data) which made it possible to name the GPIOs among other things.</div><div class='ctx'> </div><div class='del'>-For example:</div><div class='add'>+For example::</div><div class='ctx'> </div><div class='del'>-Device (DEV)</div><div class='del'>-{</div><div class='del'>-	Method (_CRS, 0, NotSerialized)</div><div class='add'>+	Device (DEV)</div><div class='ctx'> 	{</div><div class='del'>-		Name (SBUF, ResourceTemplate()</div><div class='add'>+		Method (_CRS, 0, NotSerialized)</div><div class='ctx'> 		{</div><div class='del'>-			...</div><div class='del'>-			// Used to power on/off the device</div><div class='del'>-			GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,</div><div class='del'>-				IoRestrictionOutputOnly, "\\_SB.PCI0.GPI0",</div><div class='del'>-				0x00, ResourceConsumer,,)</div><div class='add'>+			Name (SBUF, ResourceTemplate()</div><div class='ctx'> 			{</div><div class='del'>-				// Pin List</div><div class='del'>-				0x0055</div><div class='del'>-			}</div><div class='add'>+				...</div><div class='add'>+				// Used to power on/off the device</div><div class='add'>+				GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,</div><div class='add'>+					IoRestrictionOutputOnly, "\\_SB.PCI0.GPI0",</div><div class='add'>+					0x00, ResourceConsumer,,)</div><div class='add'>+				{</div><div class='add'>+					// Pin List</div><div class='add'>+					0x0055</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				// Interrupt for the device</div><div class='add'>+				GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullNone,</div><div class='add'>+					0x0000, "\\_SB.PCI0.GPI0", 0x00, ResourceConsumer,,)</div><div class='add'>+				{</div><div class='add'>+					// Pin list</div><div class='add'>+					0x0058</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				...</div><div class='ctx'> </div><div class='del'>-			// Interrupt for the device</div><div class='del'>-			GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullNone,</div><div class='del'>-				 0x0000, "\\_SB.PCI0.GPI0", 0x00, ResourceConsumer,,)</div><div class='del'>-			{</div><div class='del'>-				// Pin list</div><div class='del'>-				0x0058</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			...</div><div class='del'>-</div><div class='add'>+			Return (SBUF)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		Return (SBUF)</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	// ACPI 5.1 _DSD used for naming the GPIOs</div><div class='del'>-	Name (_DSD, Package ()</div><div class='del'>-	{</div><div class='del'>-		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='del'>-		Package ()</div><div class='add'>+		// ACPI 5.1 _DSD used for naming the GPIOs</div><div class='add'>+		Name (_DSD, Package ()</div><div class='ctx'> 		{</div><div class='del'>-			Package () {"power-gpios", Package() {^DEV, 0, 0, 0 }},</div><div class='del'>-			Package () {"irq-gpios", Package() {^DEV, 1, 0, 0 }},</div><div class='del'>-		}</div><div class='del'>-	})</div><div class='del'>-	...</div><div class='add'>+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+			Package ()</div><div class='add'>+			{</div><div class='add'>+				Package () {"power-gpios", Package() {^DEV, 0, 0, 0 }},</div><div class='add'>+				Package () {"irq-gpios", Package() {^DEV, 1, 0, 0 }},</div><div class='add'>+			}</div><div class='add'>+		})</div><div class='add'>+		...</div><div class='ctx'> </div><div class='ctx'> These GPIO numbers are controller relative and path "\\_SB.PCI0.GPI0"</div><div class='ctx'> specifies the path to the controller. In order to use these GPIOs in Linux</div><div class='hunk'>@@ -310,7 +319,7 @@ There is a standard GPIO API for that and is documented in</div><div class='ctx'> Documentation/gpio/.</div><div class='ctx'> </div><div class='ctx'> In the above example we can get the corresponding two GPIO descriptors with</div><div class='del'>-a code like this:</div><div class='add'>+a code like this::</div><div class='ctx'> </div><div class='ctx'> 	#include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> 	...</div><div class='hunk'>@@ -334,21 +343,22 @@ See Documentation/acpi/gpio-properties.txt for more information about the</div><div class='ctx'> _DSD binding related to GPIOs.</div><div class='ctx'> </div><div class='ctx'> MFD devices</div><div class='del'>-~~~~~~~~~~~</div><div class='add'>+===========</div><div class='add'>+</div><div class='ctx'> The MFD devices register their children as platform devices. For the child</div><div class='ctx'> devices there needs to be an ACPI handle that they can use to reference</div><div class='ctx'> parts of the ACPI namespace that relate to them. In the Linux MFD subsystem</div><div class='ctx'> we provide two ways:</div><div class='ctx'> </div><div class='del'>-	o The children share the parent ACPI handle.</div><div class='del'>-	o The MFD cell can specify the ACPI id of the device.</div><div class='add'>+  - The children share the parent ACPI handle.</div><div class='add'>+  - The MFD cell can specify the ACPI id of the device.</div><div class='ctx'> </div><div class='ctx'> For the first case, the MFD drivers do not need to do anything. The</div><div class='ctx'> resulting child platform device will have its ACPI_COMPANION() set to point</div><div class='ctx'> to the parent device.</div><div class='ctx'> </div><div class='ctx'> If the ACPI namespace has a device that we can match using an ACPI id or ACPI</div><div class='del'>-adr, the cell should be set like:</div><div class='add'>+adr, the cell should be set like::</div><div class='ctx'> </div><div class='ctx'> 	static struct mfd_cell_acpi_match my_subdevice_cell_acpi_match = {</div><div class='ctx'> 		.pnpid = "XYZ0001",</div><div class='hunk'>@@ -366,7 +376,8 @@ the MFD device and if found, that ACPI companion device is bound to the</div><div class='ctx'> resulting child platform device.</div><div class='ctx'> </div><div class='ctx'> Device Tree namespace link device ID</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+====================================</div><div class='add'>+</div><div class='ctx'> The Device Tree protocol uses device identification based on the "compatible"</div><div class='ctx'> property whose value is a string or an array of strings recognized as device</div><div class='ctx'> identifiers by drivers and the driver core.  The set of all those strings may be</div><div class='hunk'>@@ -410,6 +421,32 @@ Specifically, the device IDs returned by _HID and preceding PRP0001 in the _CID</div><div class='ctx'> return package will be checked first.  Also in that case the bus type the device</div><div class='ctx'> will be enumerated to depends on the device ID returned by _HID.</div><div class='ctx'> </div><div class='add'>+For example, the following ACPI sample might be used to enumerate an lm75-type</div><div class='add'>+I2C temperature sensor and match it to the driver using the Device Tree</div><div class='add'>+namespace link:</div><div class='add'>+</div><div class='add'>+	Device (TMP0)</div><div class='add'>+	{</div><div class='add'>+		Name (_HID, "PRP0001")</div><div class='add'>+		Name (_DSD, Package() {</div><div class='add'>+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+			Package () {</div><div class='add'>+				Package (2) { "compatible", "ti,tmp75" },</div><div class='add'>+			}</div><div class='add'>+		})</div><div class='add'>+		Method (_CRS, 0, Serialized)</div><div class='add'>+		{</div><div class='add'>+			Name (SBUF, ResourceTemplate ()</div><div class='add'>+			{</div><div class='add'>+				I2cSerialBusV2 (0x48, ControllerInitiated,</div><div class='add'>+					400000, AddressingMode7Bit,</div><div class='add'>+					"\\_SB.PCI0.I2C1", 0x00,</div><div class='add'>+					ResourceConsumer, , Exclusive,)</div><div class='add'>+			})</div><div class='add'>+			Return (SBUF)</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> It is valid to define device objects with a _HID returning PRP0001 and without</div><div class='ctx'> the "compatible" property in the _DSD or a _CID as long as one of their</div><div class='ctx'> ancestors provides a _DSD with a valid "compatible" property.  Such device</div><div class='hunk'>@@ -423,4 +460,4 @@ the _DSD of the device object itself or the _DSD of its ancestor in the</div><div class='ctx'> Otherwise, the _DSD itself is regarded as invalid and therefore the "compatible"</div><div class='ctx'> property returned by it is meaningless.</div><div class='ctx'> </div><div class='del'>-Refer to DSD-properties-rules.txt for more information.</div><div class='add'>+Refer to :doc:`DSD-properties-rules` for more information.</div><div class='head'>diff --git a/Documentation/acpi/gpio-properties.txt b/Documentation/firmware-guide/acpi/gpio-properties.rst<br/>index 88c65cb5bf0a..bb6d74f23ee0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/gpio-properties.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/gpio-properties.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/gpio-properties.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/gpio-properties.rst</a></div><div class='hunk'>@@ -1,5 +1,8 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+======================================</div><div class='ctx'> _DSD Device Properties Related to GPIO</div><div class='del'>---------------------------------------</div><div class='add'>+======================================</div><div class='ctx'> </div><div class='ctx'> With the release of ACPI 5.1, the _DSD configuration object finally</div><div class='ctx'> allows names to be given to GPIOs (and other things as well) returned</div><div class='hunk'>@@ -8,7 +11,7 @@ the corresponding GPIO, which is pretty error prone (it depends on</div><div class='ctx'> the _CRS output ordering, for example).</div><div class='ctx'> </div><div class='ctx'> With _DSD we can now query GPIOs using a name instead of an integer</div><div class='del'>-index, like the ASL example below shows:</div><div class='add'>+index, like the ASL example below shows::</div><div class='ctx'> </div><div class='ctx'>   // Bluetooth device with reset and shutdown GPIOs</div><div class='ctx'>   Device (BTH)</div><div class='hunk'>@@ -34,15 +37,19 @@ index, like the ASL example below shows:</div><div class='ctx'>       })</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='del'>-The format of the supported GPIO property is:</div><div class='add'>+The format of the supported GPIO property is::</div><div class='ctx'> </div><div class='ctx'>   Package () { "name", Package () { ref, index, pin, active_low }}</div><div class='ctx'> </div><div class='del'>-  ref - The device that has _CRS containing GpioIo()/GpioInt() resources,</div><div class='del'>-        typically this is the device itself (BTH in our case).</div><div class='del'>-  index - Index of the GpioIo()/GpioInt() resource in _CRS starting from zero.</div><div class='del'>-  pin - Pin in the GpioIo()/GpioInt() resource. Typically this is zero.</div><div class='del'>-  active_low - If 1 the GPIO is marked as active_low.</div><div class='add'>+ref</div><div class='add'>+  The device that has _CRS containing GpioIo()/GpioInt() resources,</div><div class='add'>+  typically this is the device itself (BTH in our case).</div><div class='add'>+index</div><div class='add'>+  Index of the GpioIo()/GpioInt() resource in _CRS starting from zero.</div><div class='add'>+pin</div><div class='add'>+  Pin in the GpioIo()/GpioInt() resource. Typically this is zero.</div><div class='add'>+active_low</div><div class='add'>+  If 1 the GPIO is marked as active_low.</div><div class='ctx'> </div><div class='ctx'> Since ACPI GpioIo() resource does not have a field saying whether it is</div><div class='ctx'> active low or high, the "active_low" argument can be used here.  Setting</div><div class='hunk'>@@ -55,7 +62,7 @@ It is possible to leave holes in the array of GPIOs. This is useful in</div><div class='ctx'> cases like with SPI host controllers where some chip selects may be</div><div class='ctx'> implemented as GPIOs and some as native signals. For example a SPI host</div><div class='ctx'> controller can have chip selects 0 and 2 implemented as GPIOs and 1 as</div><div class='del'>-native:</div><div class='add'>+native::</div><div class='ctx'> </div><div class='ctx'>   Package () {</div><div class='ctx'>       "cs-gpios",</div><div class='hunk'>@@ -67,7 +74,7 @@ native:</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='ctx'> Other supported properties</div><div class='del'>---------------------------</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> Following Device Tree compatible device properties are also supported by</div><div class='ctx'> _DSD device properties for GPIO controllers:</div><div class='hunk'>@@ -78,7 +85,7 @@ _DSD device properties for GPIO controllers:</div><div class='ctx'> - input</div><div class='ctx'> - line-name</div><div class='ctx'> </div><div class='del'>-Example:</div><div class='add'>+Example::</div><div class='ctx'> </div><div class='ctx'>   Name (_DSD, Package () {</div><div class='ctx'>       // _DSD Hierarchical Properties Extension UUID</div><div class='hunk'>@@ -100,7 +107,7 @@ Example:</div><div class='ctx'> </div><div class='ctx'> - gpio-line-names</div><div class='ctx'> </div><div class='del'>-Example:</div><div class='add'>+Example::</div><div class='ctx'> </div><div class='ctx'>   Package () {</div><div class='ctx'>       "gpio-line-names",</div><div class='hunk'>@@ -114,7 +121,7 @@ See Documentation/devicetree/bindings/gpio/gpio.txt for more information</div><div class='ctx'> about these properties.</div><div class='ctx'> </div><div class='ctx'> ACPI GPIO Mappings Provided by Drivers</div><div class='del'>---------------------------------------</div><div class='add'>+======================================</div><div class='ctx'> </div><div class='ctx'> There are systems in which the ACPI tables do not contain _DSD but provide _CRS</div><div class='ctx'> with GpioIo()/GpioInt() resources and device drivers still need to work with</div><div class='hunk'>@@ -139,16 +146,16 @@ line in that resource starting from zero, and the active-low flag for that line,</div><div class='ctx'> respectively, in analogy with the _DSD GPIO property format specified above.</div><div class='ctx'> </div><div class='ctx'> For the example Bluetooth device discussed previously the data structures in</div><div class='del'>-question would look like this:</div><div class='add'>+question would look like this::</div><div class='ctx'> </div><div class='del'>-static const struct acpi_gpio_params reset_gpio = { 1, 1, false };</div><div class='del'>-static const struct acpi_gpio_params shutdown_gpio = { 0, 0, false };</div><div class='add'>+  static const struct acpi_gpio_params reset_gpio = { 1, 1, false };</div><div class='add'>+  static const struct acpi_gpio_params shutdown_gpio = { 0, 0, false };</div><div class='ctx'> </div><div class='del'>-static const struct acpi_gpio_mapping bluetooth_acpi_gpios[] = {</div><div class='del'>-  { "reset-gpios", &amp;reset_gpio, 1 },</div><div class='del'>-  { "shutdown-gpios", &amp;shutdown_gpio, 1 },</div><div class='del'>-  { },</div><div class='del'>-};</div><div class='add'>+  static const struct acpi_gpio_mapping bluetooth_acpi_gpios[] = {</div><div class='add'>+    { "reset-gpios", &amp;reset_gpio, 1 },</div><div class='add'>+    { "shutdown-gpios", &amp;shutdown_gpio, 1 },</div><div class='add'>+    { },</div><div class='add'>+  };</div><div class='ctx'> </div><div class='ctx'> Next, the mapping table needs to be passed as the second argument to</div><div class='ctx'> acpi_dev_add_driver_gpios() that will register it with the ACPI device object</div><div class='hunk'>@@ -158,12 +165,12 @@ calling acpi_dev_remove_driver_gpios() on the ACPI device object where that</div><div class='ctx'> table was previously registered.</div><div class='ctx'> </div><div class='ctx'> Using the _CRS fallback</div><div class='del'>------------------------</div><div class='add'>+=======================</div><div class='ctx'> </div><div class='ctx'> If a device does not have _DSD or the driver does not create ACPI GPIO</div><div class='ctx'> mapping, the Linux GPIO framework refuses to return any GPIOs. This is</div><div class='ctx'> because the driver does not know what it actually gets. For example if we</div><div class='del'>-have a device like below:</div><div class='add'>+have a device like below::</div><div class='ctx'> </div><div class='ctx'>   Device (BTH)</div><div class='ctx'>   {</div><div class='hunk'>@@ -177,7 +184,7 @@ have a device like below:</div><div class='ctx'>       })</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='del'>-The driver might expect to get the right GPIO when it does:</div><div class='add'>+The driver might expect to get the right GPIO when it does::</div><div class='ctx'> </div><div class='ctx'>   desc = gpiod_get(dev, "reset", GPIOD_OUT_LOW);</div><div class='ctx'> </div><div class='hunk'>@@ -193,22 +200,25 @@ the ACPI GPIO mapping tables are hardly linked to ACPI ID and certain</div><div class='ctx'> objects, as listed in the above chapter, of the device in question.</div><div class='ctx'> </div><div class='ctx'> Getting GPIO descriptor</div><div class='del'>------------------------</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+There are two main approaches to get GPIO resource from ACPI::</div><div class='ctx'> </div><div class='del'>-There are two main approaches to get GPIO resource from ACPI:</div><div class='del'>-	desc = gpiod_get(dev, connection_id, flags);</div><div class='del'>-	desc = gpiod_get_index(dev, connection_id, index, flags);</div><div class='add'>+  desc = gpiod_get(dev, connection_id, flags);</div><div class='add'>+  desc = gpiod_get_index(dev, connection_id, index, flags);</div><div class='ctx'> </div><div class='ctx'> We may consider two different cases here, i.e. when connection ID is</div><div class='ctx'> provided and otherwise.</div><div class='ctx'> </div><div class='del'>-Case 1:</div><div class='del'>-	desc = gpiod_get(dev, "non-null-connection-id", flags);</div><div class='del'>-	desc = gpiod_get_index(dev, "non-null-connection-id", index, flags);</div><div class='add'>+Case 1::</div><div class='add'>+</div><div class='add'>+  desc = gpiod_get(dev, "non-null-connection-id", flags);</div><div class='add'>+  desc = gpiod_get_index(dev, "non-null-connection-id", index, flags);</div><div class='add'>+</div><div class='add'>+Case 2::</div><div class='ctx'> </div><div class='del'>-Case 2:</div><div class='del'>-	desc = gpiod_get(dev, NULL, flags);</div><div class='del'>-	desc = gpiod_get_index(dev, NULL, index, flags);</div><div class='add'>+  desc = gpiod_get(dev, NULL, flags);</div><div class='add'>+  desc = gpiod_get_index(dev, NULL, index, flags);</div><div class='ctx'> </div><div class='ctx'> Case 1 assumes that corresponding ACPI device description must have</div><div class='ctx'> defined device properties and will prevent to getting any GPIO resources</div><div class='head'>diff --git a/Documentation/firmware-guide/acpi/i2c-muxes.rst b/Documentation/firmware-guide/acpi/i2c-muxes.rst<br/>new file mode 100644<br/>index 000000000000..3a8997ccd7c4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/i2c-muxes.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/i2c-muxes.rst</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+==============</div><div class='add'>+ACPI I2C Muxes</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+Describing an I2C device hierarchy that includes I2C muxes requires an ACPI</div><div class='add'>+Device () scope per mux channel.</div><div class='add'>+</div><div class='add'>+Consider this topology::</div><div class='add'>+</div><div class='add'>+    +------+   +------+</div><div class='add'>+    | SMB1 |--&gt;| MUX0 |--CH00--&gt; i2c client A (0x50)</div><div class='add'>+    |      |   | 0x70 |--CH01--&gt; i2c client B (0x50)</div><div class='add'>+    +------+   +------+</div><div class='add'>+</div><div class='add'>+which corresponds to the following ASL::</div><div class='add'>+</div><div class='add'>+    Device (SMB1)</div><div class='add'>+    {</div><div class='add'>+        Name (_HID, ...)</div><div class='add'>+        Device (MUX0)</div><div class='add'>+        {</div><div class='add'>+            Name (_HID, ...)</div><div class='add'>+            Name (_CRS, ResourceTemplate () {</div><div class='add'>+                I2cSerialBus (0x70, ControllerInitiated, I2C_SPEED,</div><div class='add'>+                            AddressingMode7Bit, "^SMB1", 0x00,</div><div class='add'>+                            ResourceConsumer,,)</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            Device (CH00)</div><div class='add'>+            {</div><div class='add'>+                Name (_ADR, 0)</div><div class='add'>+</div><div class='add'>+                Device (CLIA)</div><div class='add'>+                {</div><div class='add'>+                    Name (_HID, ...)</div><div class='add'>+                    Name (_CRS, ResourceTemplate () {</div><div class='add'>+                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,</div><div class='add'>+                                    AddressingMode7Bit, "^CH00", 0x00,</div><div class='add'>+                                    ResourceConsumer,,)</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            Device (CH01)</div><div class='add'>+            {</div><div class='add'>+                Name (_ADR, 1)</div><div class='add'>+</div><div class='add'>+                Device (CLIB)</div><div class='add'>+                {</div><div class='add'>+                    Name (_HID, ...)</div><div class='add'>+                    Name (_CRS, ResourceTemplate () {</div><div class='add'>+                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,</div><div class='add'>+                                    AddressingMode7Bit, "^CH01", 0x00,</div><div class='add'>+                                    ResourceConsumer,,)</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='head'>diff --git a/Documentation/firmware-guide/acpi/index.rst b/Documentation/firmware-guide/acpi/index.rst<br/>new file mode 100644<br/>index 000000000000..ae609eec4679<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/index.rst</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+============</div><div class='add'>+ACPI Support</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   namespace</div><div class='add'>+   dsd/graph</div><div class='add'>+   dsd/data-node-references</div><div class='add'>+   enumeration</div><div class='add'>+   osi</div><div class='add'>+   method-customizing</div><div class='add'>+   method-tracing</div><div class='add'>+   DSD-properties-rules</div><div class='add'>+   debug</div><div class='add'>+   aml-debugger</div><div class='add'>+   apei/output_format</div><div class='add'>+   apei/einj</div><div class='add'>+   gpio-properties</div><div class='add'>+   i2c-muxes</div><div class='add'>+   acpi-lid</div><div class='add'>+   lpit</div><div class='add'>+   video_extension</div><div class='head'>diff --git a/Documentation/acpi/lpit.txt b/Documentation/firmware-guide/acpi/lpit.rst<br/>index b426398d2e97..aca928fab027 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/lpit.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/lpit.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/lpit.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/lpit.rst</a></div><div class='hunk'>@@ -1,3 +1,9 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+===========================</div><div class='add'>+Low Power Idle Table (LPIT)</div><div class='add'>+===========================</div><div class='add'>+</div><div class='ctx'> To enumerate platform Low Power Idle states, Intel platforms are using</div><div class='ctx'> “Low Power Idle Table� (LPIT). More details about this table can be</div><div class='ctx'> downloaded from:</div><div class='hunk'>@@ -8,13 +14,15 @@ Residencies for each low power state can be read via FFH</div><div class='ctx'> </div><div class='ctx'> On platforms supporting S0ix sleep states, there can be two types of</div><div class='ctx'> residencies:</div><div class='del'>-- CPU PKG C10 (Read via FFH interface)</div><div class='del'>-- Platform Controller Hub (PCH) SLP_S0 (Read via memory mapped interface)</div><div class='add'>+</div><div class='add'>+  - CPU PKG C10 (Read via FFH interface)</div><div class='add'>+  - Platform Controller Hub (PCH) SLP_S0 (Read via memory mapped interface)</div><div class='ctx'> </div><div class='ctx'> The following attributes are added dynamically to the cpuidle</div><div class='del'>-sysfs attribute group:</div><div class='del'>-	/sys/devices/system/cpu/cpuidle/low_power_idle_cpu_residency_us</div><div class='del'>-	/sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us</div><div class='add'>+sysfs attribute group::</div><div class='add'>+</div><div class='add'>+  /sys/devices/system/cpu/cpuidle/low_power_idle_cpu_residency_us</div><div class='add'>+  /sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us</div><div class='ctx'> </div><div class='ctx'> The "low_power_idle_cpu_residency_us" attribute shows time spent</div><div class='ctx'> by the CPU package in PKG C10</div><div class='head'>diff --git a/Documentation/firmware-guide/acpi/method-customizing.rst b/Documentation/firmware-guide/acpi/method-customizing.rst<br/>new file mode 100644<br/>index 000000000000..de3ebcaed4cf<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/method-customizing.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/method-customizing.rst</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'>+=======================================</div><div class='add'>+Linux ACPI Custom Control Method How To</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+:Author: Zhang Rui &lt;rui.zhang@intel.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Linux supports customizing ACPI control methods at runtime.</div><div class='add'>+</div><div class='add'>+Users can use this to:</div><div class='add'>+</div><div class='add'>+1. override an existing method which may not work correctly,</div><div class='add'>+   or just for debugging purposes.</div><div class='add'>+2. insert a completely new method in order to create a missing</div><div class='add'>+   method such as _OFF, _ON, _STA, _INI, etc.</div><div class='add'>+</div><div class='add'>+For these cases, it is far simpler to dynamically install a single</div><div class='add'>+control method rather than override the entire DSDT, because kernel</div><div class='add'>+rebuild/reboot is not needed and test result can be got in minutes.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+  - Only ACPI METHOD can be overridden, any other object types like</div><div class='add'>+    "Device", "OperationRegion", are not recognized. Methods</div><div class='add'>+    declared inside scope operators are also not supported.</div><div class='add'>+</div><div class='add'>+  - The same ACPI control method can be overridden for many times,</div><div class='add'>+    and it's always the latest one that used by Linux/kernel.</div><div class='add'>+</div><div class='add'>+  - To get the ACPI debug object output (Store (AAAA, Debug)),</div><div class='add'>+    please run::</div><div class='add'>+</div><div class='add'>+      echo 1 &gt; /sys/module/acpi/parameters/aml_debug_output</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. override an existing method</div><div class='add'>+==============================</div><div class='add'>+a) get the ACPI table via ACPI sysfs I/F. e.g. to get the DSDT,</div><div class='add'>+   just run "cat /sys/firmware/acpi/tables/DSDT &gt; /tmp/dsdt.dat"</div><div class='add'>+b) disassemble the table by running "iasl -d dsdt.dat".</div><div class='add'>+c) rewrite the ASL code of the method and save it in a new file,</div><div class='add'>+d) package the new file (psr.asl) to an ACPI table format.</div><div class='add'>+   Here is an example of a customized \_SB._AC._PSR method::</div><div class='add'>+</div><div class='add'>+      DefinitionBlock ("", "SSDT", 1, "", "", 0x20080715)</div><div class='add'>+      {</div><div class='add'>+         Method (\_SB_.AC._PSR, 0, NotSerialized)</div><div class='add'>+         {</div><div class='add'>+            Store ("In AC _PSR", Debug)</div><div class='add'>+            Return (ACON)</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+   Note that the full pathname of the method in ACPI namespace</div><div class='add'>+   should be used.</div><div class='add'>+e) assemble the file to generate the AML code of the method.</div><div class='add'>+   e.g. "iasl -vw 6084 psr.asl" (psr.aml is generated as a result)</div><div class='add'>+   If parameter "-vw 6084" is not supported by your iASL compiler,</div><div class='add'>+   please try a newer version.</div><div class='add'>+f) mount debugfs by "mount -t debugfs none /sys/kernel/debug"</div><div class='add'>+g) override the old method via the debugfs by running</div><div class='add'>+   "cat /tmp/psr.aml &gt; /sys/kernel/debug/acpi/custom_method"</div><div class='add'>+</div><div class='add'>+2. insert a new method</div><div class='add'>+======================</div><div class='add'>+This is easier than overriding an existing method.</div><div class='add'>+We just need to create the ASL code of the method we want to</div><div class='add'>+insert and then follow the step c) ~ g) in section 1.</div><div class='add'>+</div><div class='add'>+3. undo your changes</div><div class='add'>+====================</div><div class='add'>+The "undo" operation is not supported for a new inserted method</div><div class='add'>+right now, i.e. we can not remove a method currently.</div><div class='add'>+For an overridden method, in order to undo your changes, please</div><div class='add'>+save a copy of the method original ASL code in step c) section 1,</div><div class='add'>+and redo step c) ~ g) to override the method with the original one.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. note:: We can use a kernel with multiple custom ACPI method running,</div><div class='add'>+   But each individual write to debugfs can implement a SINGLE</div><div class='add'>+   method override. i.e. if we want to insert/override multiple</div><div class='add'>+   ACPI methods, we need to redo step c) ~ g) for multiple times.</div><div class='add'>+</div><div class='add'>+.. note:: Be aware that root can mis-use this driver to modify arbitrary</div><div class='add'>+   memory and gain additional rights, if root's privileges got</div><div class='add'>+   restricted (for example if root is not allowed to load additional</div><div class='add'>+   modules after boot).</div><div class='head'>diff --git a/Documentation/firmware-guide/acpi/method-tracing.rst b/Documentation/firmware-guide/acpi/method-tracing.rst<br/>new file mode 100644<br/>index 000000000000..d0b077b73f5f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/method-tracing.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/method-tracing.rst</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+=====================</div><div class='add'>+ACPICA Trace Facility</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+:Copyright: |copy| 2015, Intel Corporation</div><div class='add'>+:Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Abstract</div><div class='add'>+========</div><div class='add'>+This document describes the functions and the interfaces of the</div><div class='add'>+method tracing facility.</div><div class='add'>+</div><div class='add'>+Functionalities and usage examples</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+ACPICA provides method tracing capability. And two functions are</div><div class='add'>+currently implemented using this capability.</div><div class='add'>+</div><div class='add'>+Log reducer</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+ACPICA subsystem provides debugging outputs when CONFIG_ACPI_DEBUG is</div><div class='add'>+enabled. The debugging messages which are deployed via</div><div class='add'>+ACPI_DEBUG_PRINT() macro can be reduced at 2 levels - per-component</div><div class='add'>+level (known as debug layer, configured via</div><div class='add'>+/sys/module/acpi/parameters/debug_layer) and per-type level (known as</div><div class='add'>+debug level, configured via /sys/module/acpi/parameters/debug_level).</div><div class='add'>+</div><div class='add'>+But when the particular layer/level is applied to the control method</div><div class='add'>+evaluations, the quantity of the debugging outputs may still be too</div><div class='add'>+large to be put into the kernel log buffer. The idea thus is worked out</div><div class='add'>+to only enable the particular debug layer/level (normally more detailed)</div><div class='add'>+logs when the control method evaluation is started, and disable the</div><div class='add'>+detailed logging when the control method evaluation is stopped.</div><div class='add'>+</div><div class='add'>+The following command examples illustrate the usage of the "log reducer"</div><div class='add'>+functionality:</div><div class='add'>+</div><div class='add'>+a. Filter out the debug layer/level matched logs when control methods</div><div class='add'>+   are being evaluated::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0xXXXXXXXX" &gt; trace_debug_layer</div><div class='add'>+      # echo "0xYYYYYYYY" &gt; trace_debug_level</div><div class='add'>+      # echo "enable" &gt; trace_state</div><div class='add'>+</div><div class='add'>+b. Filter out the debug layer/level matched logs when the specified</div><div class='add'>+   control method is being evaluated::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0xXXXXXXXX" &gt; trace_debug_layer</div><div class='add'>+      # echo "0xYYYYYYYY" &gt; trace_debug_level</div><div class='add'>+      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='add'>+      # echo "method" &gt; /sys/module/acpi/parameters/trace_state</div><div class='add'>+</div><div class='add'>+c. Filter out the debug layer/level matched logs when the specified</div><div class='add'>+   control method is being evaluated for the first time::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0xXXXXXXXX" &gt; trace_debug_layer</div><div class='add'>+      # echo "0xYYYYYYYY" &gt; trace_debug_level</div><div class='add'>+      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='add'>+      # echo "method-once" &gt; /sys/module/acpi/parameters/trace_state</div><div class='add'>+</div><div class='add'>+Where:</div><div class='add'>+   0xXXXXXXXX/0xYYYYYYYY</div><div class='add'>+     Refer to Documentation/acpi/debug.txt for possible debug layer/level</div><div class='add'>+     masking values.</div><div class='add'>+   \PPPP.AAAA.TTTT.HHHH</div><div class='add'>+     Full path of a control method that can be found in the ACPI namespace.</div><div class='add'>+     It needn't be an entry of a control method evaluation.</div><div class='add'>+</div><div class='add'>+AML tracer</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+There are special log entries added by the method tracing facility at</div><div class='add'>+the "trace points" the AML interpreter starts/stops to execute a control</div><div class='add'>+method, or an AML opcode. Note that the format of the log entries are</div><div class='add'>+subject to change::</div><div class='add'>+</div><div class='add'>+   [    0.186427]   exdebug-0398 ex_trace_point        : Method Begin [0xf58394d8:\_SB.PCI0.LPCB.ECOK] execution.</div><div class='add'>+   [    0.186630]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905c88:If] execution.</div><div class='add'>+   [    0.186820]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905cc0:LEqual] execution.</div><div class='add'>+   [    0.187010]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905a20:-NamePath-] execution.</div><div class='add'>+   [    0.187214]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905a20:-NamePath-] execution.</div><div class='add'>+   [    0.187407]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905f60:One] execution.</div><div class='add'>+   [    0.187594]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905f60:One] execution.</div><div class='add'>+   [    0.187789]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905cc0:LEqual] execution.</div><div class='add'>+   [    0.187980]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905cc0:Return] execution.</div><div class='add'>+   [    0.188146]   exdebug-0398 ex_trace_point        : Opcode Begin [0xf5905f60:One] execution.</div><div class='add'>+   [    0.188334]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905f60:One] execution.</div><div class='add'>+   [    0.188524]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905cc0:Return] execution.</div><div class='add'>+   [    0.188712]   exdebug-0398 ex_trace_point        : Opcode End [0xf5905c88:If] execution.</div><div class='add'>+   [    0.188903]   exdebug-0398 ex_trace_point        : Method End [0xf58394d8:\_SB.PCI0.LPCB.ECOK] execution.</div><div class='add'>+</div><div class='add'>+Developers can utilize these special log entries to track the AML</div><div class='add'>+interpretion, thus can aid issue debugging and performance tuning. Note</div><div class='add'>+that, as the "AML tracer" logs are implemented via ACPI_DEBUG_PRINT()</div><div class='add'>+macro, CONFIG_ACPI_DEBUG is also required to be enabled for enabling</div><div class='add'>+"AML tracer" logs.</div><div class='add'>+</div><div class='add'>+The following command examples illustrate the usage of the "AML tracer"</div><div class='add'>+functionality:</div><div class='add'>+</div><div class='add'>+a. Filter out the method start/stop "AML tracer" logs when control</div><div class='add'>+   methods are being evaluated::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0x80" &gt; trace_debug_layer</div><div class='add'>+      # echo "0x10" &gt; trace_debug_level</div><div class='add'>+      # echo "enable" &gt; trace_state</div><div class='add'>+</div><div class='add'>+b. Filter out the method start/stop "AML tracer" when the specified</div><div class='add'>+   control method is being evaluated::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0x80" &gt; trace_debug_layer</div><div class='add'>+      # echo "0x10" &gt; trace_debug_level</div><div class='add'>+      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='add'>+      # echo "method" &gt; trace_state</div><div class='add'>+</div><div class='add'>+c. Filter out the method start/stop "AML tracer" logs when the specified</div><div class='add'>+   control method is being evaluated for the first time::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0x80" &gt; trace_debug_layer</div><div class='add'>+      # echo "0x10" &gt; trace_debug_level</div><div class='add'>+      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='add'>+      # echo "method-once" &gt; trace_state</div><div class='add'>+</div><div class='add'>+d. Filter out the method/opcode start/stop "AML tracer" when the</div><div class='add'>+   specified control method is being evaluated::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0x80" &gt; trace_debug_layer</div><div class='add'>+      # echo "0x10" &gt; trace_debug_level</div><div class='add'>+      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='add'>+      # echo "opcode" &gt; trace_state</div><div class='add'>+</div><div class='add'>+e. Filter out the method/opcode start/stop "AML tracer" when the</div><div class='add'>+   specified control method is being evaluated for the first time::</div><div class='add'>+</div><div class='add'>+      # cd /sys/module/acpi/parameters</div><div class='add'>+      # echo "0x80" &gt; trace_debug_layer</div><div class='add'>+      # echo "0x10" &gt; trace_debug_level</div><div class='add'>+      # echo "\PPPP.AAAA.TTTT.HHHH" &gt; trace_method_name</div><div class='add'>+      # echo "opcode-opcode" &gt; trace_state</div><div class='add'>+</div><div class='add'>+Note that all above method tracing facility related module parameters can</div><div class='add'>+be used as the boot parameters, for example::</div><div class='add'>+</div><div class='add'>+   acpi.trace_debug_layer=0x80 acpi.trace_debug_level=0x10 \</div><div class='add'>+   acpi.trace_method_name=\_SB.LID0._LID acpi.trace_state=opcode-once</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Interface descriptions</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+All method tracing functions can be configured via ACPI module</div><div class='add'>+parameters that are accessible at /sys/module/acpi/parameters/:</div><div class='add'>+</div><div class='add'>+trace_method_name</div><div class='add'>+  The full path of the AML method that the user wants to trace.</div><div class='add'>+</div><div class='add'>+  Note that the full path shouldn't contain the trailing "_"s in its</div><div class='add'>+  name segments but may contain "\" to form an absolute path.</div><div class='add'>+</div><div class='add'>+trace_debug_layer</div><div class='add'>+  The temporary debug_layer used when the tracing feature is enabled.</div><div class='add'>+</div><div class='add'>+  Using ACPI_EXECUTER (0x80) by default, which is the debug_layer</div><div class='add'>+  used to match all "AML tracer" logs.</div><div class='add'>+</div><div class='add'>+trace_debug_level</div><div class='add'>+  The temporary debug_level used when the tracing feature is enabled.</div><div class='add'>+</div><div class='add'>+  Using ACPI_LV_TRACE_POINT (0x10) by default, which is the</div><div class='add'>+  debug_level used to match all "AML tracer" logs.</div><div class='add'>+</div><div class='add'>+trace_state</div><div class='add'>+  The status of the tracing feature.</div><div class='add'>+</div><div class='add'>+  Users can enable/disable this debug tracing feature by executing</div><div class='add'>+  the following command::</div><div class='add'>+</div><div class='add'>+   # echo string &gt; /sys/module/acpi/parameters/trace_state</div><div class='add'>+</div><div class='add'>+Where "string" should be one of the following:</div><div class='add'>+</div><div class='add'>+"disable"</div><div class='add'>+  Disable the method tracing feature.</div><div class='add'>+</div><div class='add'>+"enable"</div><div class='add'>+  Enable the method tracing feature.</div><div class='add'>+  </div><div class='add'>+  ACPICA debugging messages matching "trace_debug_layer/trace_debug_level"</div><div class='add'>+  during any method execution will be logged.</div><div class='add'>+</div><div class='add'>+"method"</div><div class='add'>+  Enable the method tracing feature.</div><div class='add'>+</div><div class='add'>+  ACPICA debugging messages matching "trace_debug_layer/trace_debug_level"</div><div class='add'>+  during method execution of "trace_method_name" will be logged.</div><div class='add'>+</div><div class='add'>+"method-once"</div><div class='add'>+  Enable the method tracing feature.</div><div class='add'>+</div><div class='add'>+  ACPICA debugging messages matching "trace_debug_layer/trace_debug_level"</div><div class='add'>+  during method execution of "trace_method_name" will be logged only once.</div><div class='add'>+</div><div class='add'>+"opcode"</div><div class='add'>+  Enable the method tracing feature.</div><div class='add'>+</div><div class='add'>+  ACPICA debugging messages matching "trace_debug_layer/trace_debug_level"</div><div class='add'>+  during method/opcode execution of "trace_method_name" will be logged.</div><div class='add'>+</div><div class='add'>+"opcode-once"</div><div class='add'>+  Enable the method tracing feature.</div><div class='add'>+</div><div class='add'>+  ACPICA debugging messages matching "trace_debug_layer/trace_debug_level"</div><div class='add'>+  during method/opcode execution of "trace_method_name" will be logged only</div><div class='add'>+  once.</div><div class='add'>+</div><div class='add'>+Note that, the difference between the "enable" and other feature</div><div class='add'>+enabling options are:</div><div class='add'>+</div><div class='add'>+1. When "enable" is specified, since</div><div class='add'>+   "trace_debug_layer/trace_debug_level" shall apply to all control</div><div class='add'>+   method evaluations, after configuring "trace_state" to "enable",</div><div class='add'>+   "trace_method_name" will be reset to NULL.</div><div class='add'>+2. When "method/opcode" is specified, if</div><div class='add'>+   "trace_method_name" is NULL when "trace_state" is configured to</div><div class='add'>+   these options, the "trace_debug_layer/trace_debug_level" will</div><div class='add'>+   apply to all control method evaluations.</div><div class='head'>diff --git a/Documentation/acpi/namespace.txt b/Documentation/firmware-guide/acpi/namespace.rst<br/>index 1860cb3865c6..835521baeb89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/namespace.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/namespace.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/namespace.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/namespace.rst</a></div><div class='hunk'>@@ -1,85 +1,90 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+===================================================</div><div class='ctx'> ACPI Device Tree - Representation of ACPI Namespace</div><div class='add'>+===================================================</div><div class='ctx'> </div><div class='del'>-Copyright (C) 2013, Intel Corporation</div><div class='del'>-Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='add'>+:Copyright: |copy| 2013, Intel Corporation</div><div class='ctx'> </div><div class='add'>+:Author: Lv Zheng &lt;lv.zheng@intel.com&gt;</div><div class='ctx'> </div><div class='del'>-Abstract:</div><div class='add'>+:Credit:   Thanks for the help from Zhang Rui &lt;rui.zhang@intel.com&gt; and</div><div class='add'>+           Rafael J.Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'> </div><div class='add'>+Abstract</div><div class='add'>+========</div><div class='ctx'> The Linux ACPI subsystem converts ACPI namespace objects into a Linux</div><div class='ctx'> device tree under the /sys/devices/LNXSYSTEM:00 and updates it upon</div><div class='del'>-receiving ACPI hotplug notification events.  For each device object in this</div><div class='del'>-hierarchy there is a corresponding symbolic link in the</div><div class='add'>+receiving ACPI hotplug notification events.  For each device object</div><div class='add'>+in this hierarchy there is a corresponding symbolic link in the</div><div class='ctx'> /sys/bus/acpi/devices.</div><div class='add'>+</div><div class='ctx'> This document illustrates the structure of the ACPI device tree.</div><div class='ctx'> </div><div class='add'>+ACPI Definition Blocks</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+The ACPI firmware sets up RSDP (Root System Description Pointer) in the</div><div class='add'>+system memory address space pointing to the XSDT (Extended System</div><div class='add'>+Description Table).  The XSDT always points to the FADT (Fixed ACPI</div><div class='add'>+Description Table) using its first entry, the data within the FADT</div><div class='add'>+includes various fixed-length entries that describe fixed ACPI features</div><div class='add'>+of the hardware.  The FADT contains a pointer to the DSDT</div><div class='add'>+(Differentiated System Descripition Table).  The XSDT also contains</div><div class='add'>+entries pointing to possibly multiple SSDTs (Secondary System</div><div class='add'>+Description Table).</div><div class='add'>+</div><div class='add'>+The DSDT and SSDT data is organized in data structures called definition</div><div class='add'>+blocks that contain definitions of various objects, including ACPI</div><div class='add'>+control methods, encoded in AML (ACPI Machine Language).  The data block</div><div class='add'>+of the DSDT along with the contents of SSDTs represents a hierarchical</div><div class='add'>+data structure called the ACPI namespace whose topology reflects the</div><div class='add'>+structure of the underlying hardware platform.</div><div class='add'>+</div><div class='add'>+The relationships between ACPI System Definition Tables described above</div><div class='add'>+are illustrated in the following diagram::</div><div class='add'>+</div><div class='add'>+   +---------+    +-------+    +--------+    +------------------------+</div><div class='add'>+   |  RSDP   | +-&gt;| XSDT  | +-&gt;|  FADT  |    |  +-------------------+ |</div><div class='add'>+   +---------+ |  +-------+ |  +--------+  +-|-&gt;|       DSDT        | |</div><div class='add'>+   | Pointer | |  | Entry |-+  | ...... |  | |  +-------------------+ |</div><div class='add'>+   +---------+ |  +-------+    | X_DSDT |--+ |  | Definition Blocks | |</div><div class='add'>+   | Pointer |-+  | ..... |    | ...... |    |  +-------------------+ |</div><div class='add'>+   +---------+    +-------+    +--------+    |  +-------------------+ |</div><div class='add'>+                  | Entry |------------------|-&gt;|       SSDT        | |</div><div class='add'>+                  +- - - -+                  |  +-------------------| |</div><div class='add'>+                  | Entry | - - - - - - - -+ |  | Definition Blocks | |</div><div class='add'>+                  +- - - -+                | |  +-------------------+ |</div><div class='add'>+                                          | |  +- - - - - - - - - -+ |</div><div class='add'>+                                          +-|-&gt;|       SSDT        | |</div><div class='add'>+                                             |  +-------------------+ |</div><div class='add'>+                                             |  | Definition Blocks | |</div><div class='add'>+                                             |  +- - - - - - - - - -+ |</div><div class='add'>+                                             +------------------------+</div><div class='add'>+                                                         |</div><div class='add'>+                                             OSPM Loading |</div><div class='add'>+                                                         \|/</div><div class='add'>+                                                   +----------------+</div><div class='add'>+                                                   | ACPI Namespace |</div><div class='add'>+                                                   +----------------+</div><div class='add'>+</div><div class='add'>+                  Figure 1. ACPI Definition Blocks</div><div class='add'>+</div><div class='add'>+.. note:: RSDP can also contain a pointer to the RSDT (Root System</div><div class='add'>+   Description Table).  Platforms provide RSDT to enable</div><div class='add'>+   compatibility with ACPI 1.0 operating systems.  The OS is expected</div><div class='add'>+   to use XSDT, if present.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example ACPI Namespace</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+All definition blocks are loaded into a single namespace.  The namespace</div><div class='add'>+is a hierarchy of objects identified by names and paths.</div><div class='add'>+The following naming conventions apply to object names in the ACPI</div><div class='add'>+namespace:</div><div class='ctx'> </div><div class='del'>-Credit:</div><div class='del'>-</div><div class='del'>-Thanks for the help from Zhang Rui &lt;rui.zhang@intel.com&gt; and Rafael J.</div><div class='del'>-Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. ACPI Definition Blocks</div><div class='del'>-</div><div class='del'>-   The ACPI firmware sets up RSDP (Root System Description Pointer) in the</div><div class='del'>-   system memory address space pointing to the XSDT (Extended System</div><div class='del'>-   Description Table).  The XSDT always points to the FADT (Fixed ACPI</div><div class='del'>-   Description Table) using its first entry, the data within the FADT</div><div class='del'>-   includes various fixed-length entries that describe fixed ACPI features</div><div class='del'>-   of the hardware.  The FADT contains a pointer to the DSDT</div><div class='del'>-   (Differentiated System Descripition Table).  The XSDT also contains</div><div class='del'>-   entries pointing to possibly multiple SSDTs (Secondary System</div><div class='del'>-   Description Table).</div><div class='del'>-</div><div class='del'>-   The DSDT and SSDT data is organized in data structures called definition</div><div class='del'>-   blocks that contain definitions of various objects, including ACPI</div><div class='del'>-   control methods, encoded in AML (ACPI Machine Language).  The data block</div><div class='del'>-   of the DSDT along with the contents of SSDTs represents a hierarchical</div><div class='del'>-   data structure called the ACPI namespace whose topology reflects the</div><div class='del'>-   structure of the underlying hardware platform.</div><div class='del'>-</div><div class='del'>-   The relationships between ACPI System Definition Tables described above</div><div class='del'>-   are illustrated in the following diagram.</div><div class='del'>-</div><div class='del'>-     +---------+    +-------+    +--------+    +------------------------+</div><div class='del'>-     |  RSDP   | +-&gt;| XSDT  | +-&gt;|  FADT  |    |  +-------------------+ |</div><div class='del'>-     +---------+ |  +-------+ |  +--------+  +-|-&gt;|       DSDT        | |</div><div class='del'>-     | Pointer | |  | Entry |-+  | ...... |  | |  +-------------------+ |</div><div class='del'>-     +---------+ |  +-------+    | X_DSDT |--+ |  | Definition Blocks | |</div><div class='del'>-     | Pointer |-+  | ..... |    | ...... |    |  +-------------------+ |</div><div class='del'>-     +---------+    +-------+    +--------+    |  +-------------------+ |</div><div class='del'>-                    | Entry |------------------|-&gt;|       SSDT        | |</div><div class='del'>-                    +- - - -+                  |  +-------------------| |</div><div class='del'>-                    | Entry | - - - - - - - -+ |  | Definition Blocks | |</div><div class='del'>-                    +- - - -+                | |  +-------------------+ |</div><div class='del'>-                                             | |  +- - - - - - - - - -+ |</div><div class='del'>-                                             +-|-&gt;|       SSDT        | |</div><div class='del'>-                                               |  +-------------------+ |</div><div class='del'>-                                               |  | Definition Blocks | |</div><div class='del'>-                                               |  +- - - - - - - - - -+ |</div><div class='del'>-                                               +------------------------+</div><div class='del'>-                                                           |</div><div class='del'>-                                              OSPM Loading |</div><div class='del'>-                                                          \|/</div><div class='del'>-                                                    +----------------+</div><div class='del'>-                                                    | ACPI Namespace |</div><div class='del'>-                                                    +----------------+</div><div class='del'>-</div><div class='del'>-                     Figure 1. ACPI Definition Blocks</div><div class='del'>-</div><div class='del'>-   NOTE: RSDP can also contain a pointer to the RSDT (Root System</div><div class='del'>-         Description Table).  Platforms provide RSDT to enable</div><div class='del'>-         compatibility with ACPI 1.0 operating systems.  The OS is expected</div><div class='del'>-         to use XSDT, if present.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. Example ACPI Namespace</div><div class='del'>-</div><div class='del'>-   All definition blocks are loaded into a single namespace.  The namespace</div><div class='del'>-   is a hierarchy of objects identified by names and paths.</div><div class='del'>-   The following naming conventions apply to object names in the ACPI</div><div class='del'>-   namespace:</div><div class='ctx'>    1. All names are 32 bits long.</div><div class='ctx'>    2. The first byte of a name must be one of 'A' - 'Z', '_'.</div><div class='ctx'>    3. Each of the remaining bytes of a name must be one of 'A' - 'Z', '0'</div><div class='hunk'>@@ -91,7 +96,7 @@ Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'>       (i.e. names prepended with '^' are relative to the parent of the</div><div class='ctx'>       current namespace node).</div><div class='ctx'> </div><div class='del'>-   The figure below shows an example ACPI namespace.</div><div class='add'>+The figure below shows an example ACPI namespace::</div><div class='ctx'> </div><div class='ctx'>    +------+</div><div class='ctx'>    | \    |                     Root</div><div class='hunk'>@@ -184,19 +189,20 @@ Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'>                      Figure 2. Example ACPI Namespace</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-3. Linux ACPI Device Objects</div><div class='add'>+Linux ACPI Device Objects</div><div class='add'>+=========================</div><div class='ctx'> </div><div class='del'>-   The Linux kernel's core ACPI subsystem creates struct acpi_device</div><div class='del'>-   objects for ACPI namespace objects representing devices, power resources</div><div class='del'>-   processors, thermal zones.  Those objects are exported to user space via</div><div class='del'>-   sysfs as directories in the subtree under /sys/devices/LNXSYSTM:00.  The</div><div class='del'>-   format of their names is &lt;bus_id:instance&gt;, where 'bus_id' refers to the</div><div class='del'>-   ACPI namespace representation of the given object and 'instance' is used</div><div class='del'>-   for distinguishing different object of the same 'bus_id' (it is</div><div class='del'>-   two-digit decimal representation of an unsigned integer).</div><div class='add'>+The Linux kernel's core ACPI subsystem creates struct acpi_device</div><div class='add'>+objects for ACPI namespace objects representing devices, power resources</div><div class='add'>+processors, thermal zones.  Those objects are exported to user space via</div><div class='add'>+sysfs as directories in the subtree under /sys/devices/LNXSYSTM:00.  The</div><div class='add'>+format of their names is &lt;bus_id:instance&gt;, where 'bus_id' refers to the</div><div class='add'>+ACPI namespace representation of the given object and 'instance' is used</div><div class='add'>+for distinguishing different object of the same 'bus_id' (it is</div><div class='add'>+two-digit decimal representation of an unsigned integer).</div><div class='ctx'> </div><div class='del'>-   The value of 'bus_id' depends on the type of the object whose name it is</div><div class='del'>-   part of as listed in the table below.</div><div class='add'>+The value of 'bus_id' depends on the type of the object whose name it is</div><div class='add'>+part of as listed in the table below::</div><div class='ctx'> </div><div class='ctx'>                 +---+-----------------+-------+----------+</div><div class='ctx'>                 |   | Object/Feature  | Table | bus_id   |</div><div class='hunk'>@@ -226,10 +232,11 @@ Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'> </div><div class='ctx'>                  Table 1. ACPI Namespace Objects Mapping</div><div class='ctx'> </div><div class='del'>-   The following rules apply when creating struct acpi_device objects on</div><div class='del'>-   the basis of the contents of ACPI System Description Tables (as</div><div class='del'>-   indicated by the letter in the first column and the notation in the</div><div class='del'>-   second column of the table above):</div><div class='add'>+The following rules apply when creating struct acpi_device objects on</div><div class='add'>+the basis of the contents of ACPI System Description Tables (as</div><div class='add'>+indicated by the letter in the first column and the notation in the</div><div class='add'>+second column of the table above):</div><div class='add'>+</div><div class='ctx'>    N:</div><div class='ctx'>       The object's source is an ACPI namespace node (as indicated by the</div><div class='ctx'>       named object's type in the second column).  In that case the object's</div><div class='hunk'>@@ -249,13 +256,14 @@ Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'>       struct acpi_device object with LNXVIDEO 'bus_id' will be created for</div><div class='ctx'>       it.</div><div class='ctx'> </div><div class='del'>-   The third column of the above table indicates which ACPI System</div><div class='del'>-   Description Tables contain information used for the creation of the</div><div class='del'>-   struct acpi_device objects represented by the given row (xSDT means DSDT</div><div class='del'>-   or SSDT).</div><div class='add'>+The third column of the above table indicates which ACPI System</div><div class='add'>+Description Tables contain information used for the creation of the</div><div class='add'>+struct acpi_device objects represented by the given row (xSDT means DSDT</div><div class='add'>+or SSDT).</div><div class='add'>+</div><div class='add'>+The forth column of the above table indicates the 'bus_id' generation</div><div class='add'>+rule of the struct acpi_device object:</div><div class='ctx'> </div><div class='del'>-   The forth column of the above table indicates the 'bus_id' generation</div><div class='del'>-   rule of the struct acpi_device object:</div><div class='ctx'>    _HID:</div><div class='ctx'>       _HID in the last column of the table means that the object's bus_id</div><div class='ctx'>       is derived from the _HID/_CID identification objects present under</div><div class='hunk'>@@ -275,45 +283,47 @@ Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'>       object's bus_id.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-4. Linux ACPI Physical Device Glue</div><div class='del'>-</div><div class='del'>-   ACPI device (i.e. struct acpi_device) objects may be linked to other</div><div class='del'>-   objects in the Linux' device hierarchy that represent "physical" devices</div><div class='del'>-   (for example, devices on the PCI bus).  If that happens, it means that</div><div class='del'>-   the ACPI device object is a "companion" of a device otherwise</div><div class='del'>-   represented in a different way and is used (1) to provide configuration</div><div class='del'>-   information on that device which cannot be obtained by other means and</div><div class='del'>-   (2) to do specific things to the device with the help of its ACPI</div><div class='del'>-   control methods.  One ACPI device object may be linked this way to</div><div class='del'>-   multiple "physical" devices.</div><div class='del'>-</div><div class='del'>-   If an ACPI device object is linked to a "physical" device, its sysfs</div><div class='del'>-   directory contains the "physical_node" symbolic link to the sysfs</div><div class='del'>-   directory of the target device object.  In turn, the target device's</div><div class='del'>-   sysfs directory will then contain the "firmware_node" symbolic link to</div><div class='del'>-   the sysfs directory of the companion ACPI device object.</div><div class='del'>-   The linking mechanism relies on device identification provided by the</div><div class='del'>-   ACPI namespace.  For example, if there's an ACPI namespace object</div><div class='del'>-   representing a PCI device (i.e. a device object under an ACPI namespace</div><div class='del'>-   object representing a PCI bridge) whose _ADR returns 0x00020000 and the</div><div class='del'>-   bus number of the parent PCI bridge is 0, the sysfs directory</div><div class='del'>-   representing the struct acpi_device object created for that ACPI</div><div class='del'>-   namespace object will contain the 'physical_node' symbolic link to the</div><div class='del'>-   /sys/devices/pci0000:00/0000:00:02:0/ sysfs directory of the</div><div class='del'>-   corresponding PCI device.</div><div class='del'>-</div><div class='del'>-   The linking mechanism is generally bus-specific.  The core of its</div><div class='del'>-   implementation is located in the drivers/acpi/glue.c file, but there are</div><div class='del'>-   complementary parts depending on the bus types in question located</div><div class='del'>-   elsewhere.  For example, the PCI-specific part of it is located in</div><div class='del'>-   drivers/pci/pci-acpi.c.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5. Example Linux ACPI Device Tree</div><div class='del'>-</div><div class='del'>-   The sysfs hierarchy of struct acpi_device objects corresponding to the</div><div class='del'>-   example ACPI namespace illustrated in Figure 2 with the addition of</div><div class='del'>-   fixed PWR_BUTTON/SLP_BUTTON devices is shown below.</div><div class='add'>+Linux ACPI Physical Device Glue</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+ACPI device (i.e. struct acpi_device) objects may be linked to other</div><div class='add'>+objects in the Linux' device hierarchy that represent "physical" devices</div><div class='add'>+(for example, devices on the PCI bus).  If that happens, it means that</div><div class='add'>+the ACPI device object is a "companion" of a device otherwise</div><div class='add'>+represented in a different way and is used (1) to provide configuration</div><div class='add'>+information on that device which cannot be obtained by other means and</div><div class='add'>+(2) to do specific things to the device with the help of its ACPI</div><div class='add'>+control methods.  One ACPI device object may be linked this way to</div><div class='add'>+multiple "physical" devices.</div><div class='add'>+</div><div class='add'>+If an ACPI device object is linked to a "physical" device, its sysfs</div><div class='add'>+directory contains the "physical_node" symbolic link to the sysfs</div><div class='add'>+directory of the target device object.  In turn, the target device's</div><div class='add'>+sysfs directory will then contain the "firmware_node" symbolic link to</div><div class='add'>+the sysfs directory of the companion ACPI device object.</div><div class='add'>+The linking mechanism relies on device identification provided by the</div><div class='add'>+ACPI namespace.  For example, if there's an ACPI namespace object</div><div class='add'>+representing a PCI device (i.e. a device object under an ACPI namespace</div><div class='add'>+object representing a PCI bridge) whose _ADR returns 0x00020000 and the</div><div class='add'>+bus number of the parent PCI bridge is 0, the sysfs directory</div><div class='add'>+representing the struct acpi_device object created for that ACPI</div><div class='add'>+namespace object will contain the 'physical_node' symbolic link to the</div><div class='add'>+/sys/devices/pci0000:00/0000:00:02:0/ sysfs directory of the</div><div class='add'>+corresponding PCI device.</div><div class='add'>+</div><div class='add'>+The linking mechanism is generally bus-specific.  The core of its</div><div class='add'>+implementation is located in the drivers/acpi/glue.c file, but there are</div><div class='add'>+complementary parts depending on the bus types in question located</div><div class='add'>+elsewhere.  For example, the PCI-specific part of it is located in</div><div class='add'>+drivers/pci/pci-acpi.c.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example Linux ACPI Device Tree</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+The sysfs hierarchy of struct acpi_device objects corresponding to the</div><div class='add'>+example ACPI namespace illustrated in Figure 2 with the addition of</div><div class='add'>+fixed PWR_BUTTON/SLP_BUTTON devices is shown below::</div><div class='ctx'> </div><div class='ctx'>    +--------------+---+-----------------+</div><div class='ctx'>    | LNXSYSTEM:00 | \ | acpi:LNXSYSTEM: |</div><div class='hunk'>@@ -377,12 +387,14 @@ Wysocki &lt;rafael.j.wysocki@intel.com&gt;.</div><div class='ctx'> </div><div class='ctx'>                   Figure 3. Example Linux ACPI Device Tree</div><div class='ctx'> </div><div class='del'>-   NOTE: Each node is represented as "object/path/modalias", where:</div><div class='del'>-         1. 'object' is the name of the object's directory in sysfs.</div><div class='del'>-         2. 'path' is the ACPI namespace path of the corresponding</div><div class='del'>-            ACPI namespace object, as returned by the object's 'path'</div><div class='del'>-            sysfs attribute.</div><div class='del'>-         3. 'modalias' is the value of the object's 'modalias' sysfs</div><div class='del'>-            attribute (as described earlier in this document).</div><div class='del'>-   NOTE: N/A indicates the device object does not have the 'path' or the</div><div class='del'>-         'modalias' attribute.</div><div class='add'>+.. note:: Each node is represented as "object/path/modalias", where:</div><div class='add'>+</div><div class='add'>+   1. 'object' is the name of the object's directory in sysfs.</div><div class='add'>+   2. 'path' is the ACPI namespace path of the corresponding</div><div class='add'>+      ACPI namespace object, as returned by the object's 'path'</div><div class='add'>+      sysfs attribute.</div><div class='add'>+   3. 'modalias' is the value of the object's 'modalias' sysfs</div><div class='add'>+      attribute (as described earlier in this document).</div><div class='add'>+</div><div class='add'>+.. note:: N/A indicates the device object does not have the 'path' or the</div><div class='add'>+   'modalias' attribute.</div><div class='head'>diff --git a/Documentation/acpi/osi.txt b/Documentation/firmware-guide/acpi/osi.rst<br/>index 50cde0ceb9b0..29e9ef79ebc0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/osi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/osi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/osi.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/osi.rst</a></div><div class='hunk'>@@ -1,5 +1,8 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+==========================</div><div class='ctx'> ACPI _OSI and _REV methods</div><div class='del'>---------------------------</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> An ACPI BIOS can use the "Operating System Interfaces" method (_OSI)</div><div class='ctx'> to find out what the operating system supports. Eg. If BIOS</div><div class='hunk'>@@ -14,7 +17,7 @@ This document explains how and why the BIOS and Linux should use these methods.</div><div class='ctx'> It also explains how and why they are widely misused.</div><div class='ctx'> </div><div class='ctx'> How to use _OSI</div><div class='del'>----------------</div><div class='add'>+===============</div><div class='ctx'> </div><div class='ctx'> Linux runs on two groups of machines -- those that are tested by the OEM</div><div class='ctx'> to be compatible with Linux, and those that were never tested with Linux,</div><div class='hunk'>@@ -62,7 +65,7 @@ the string when that support is added to the kernel.</div><div class='ctx'> That was easy.  Read on, to find out how to do it wrong.</div><div class='ctx'> </div><div class='ctx'> Before _OSI, there was _OS</div><div class='del'>---------------------------</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> ACPI 1.0 specified "_OS" as an</div><div class='ctx'> "object that evaluates to a string that identifies the operating system."</div><div class='hunk'>@@ -96,7 +99,7 @@ That is the *only* viable strategy, as that is what modern Windows does,</div><div class='ctx'> and so doing otherwise could steer the BIOS down an untested path.</div><div class='ctx'> </div><div class='ctx'> _OSI is born, and immediately misused</div><div class='del'>---------------------------------------</div><div class='add'>+=====================================</div><div class='ctx'> </div><div class='ctx'> With _OSI, the *BIOS* provides the string describing an interface,</div><div class='ctx'> and asks the OS: "YES/NO, are you compatible with this interface?"</div><div class='hunk'>@@ -144,7 +147,7 @@ catastrophic failure resulting from the BIOS taking paths that</div><div class='ctx'> were never validated under *any* OS.</div><div class='ctx'> </div><div class='ctx'> Do not use _REV</div><div class='del'>----------------</div><div class='add'>+===============</div><div class='ctx'> </div><div class='ctx'> Since _OSI("Linux") went away, some BIOS writers used _REV</div><div class='ctx'> to support Linux and Windows differences in the same BIOS.</div><div class='hunk'>@@ -164,7 +167,7 @@ from mid-2015 onward.  The ACPI specification will also be updated</div><div class='ctx'> to reflect that _REV is deprecated, and always returns 2.</div><div class='ctx'> </div><div class='ctx'> Apple Mac and _OSI("Darwin")</div><div class='del'>-----------------------------</div><div class='add'>+============================</div><div class='ctx'> </div><div class='ctx'> On Apple's Mac platforms, the ACPI BIOS invokes _OSI("Darwin")</div><div class='ctx'> to determine if the machine is running Apple OSX.</div><div class='head'>diff --git a/Documentation/acpi/video_extension.txt b/Documentation/firmware-guide/acpi/video_extension.rst<br/>index 79bf6a4921be..099b8607e07b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/acpi/video_extension.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/acpi/video_extension.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/acpi/video_extension.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/acpi/video_extension.rst</a></div><div class='hunk'>@@ -1,5 +1,8 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+=====================</div><div class='ctx'> ACPI video extensions</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> This driver implement the ACPI Extensions For Display Adapters for</div><div class='ctx'> integrated graphics devices on motherboard, as specified in ACPI 2.0</div><div class='hunk'>@@ -8,9 +11,10 @@ defining the video POST device, retrieving EDID information or to</div><div class='ctx'> setup a video output, etc.  Note that this is an ref. implementation</div><div class='ctx'> only.  It may or may not work for your integrated video device.</div><div class='ctx'> </div><div class='del'>-The ACPI video driver does 3 things regarding backlight control:</div><div class='add'>+The ACPI video driver does 3 things regarding backlight control.</div><div class='ctx'> </div><div class='del'>-1 Export a sysfs interface for user space to control backlight level</div><div class='add'>+Export a sysfs interface for user space to control backlight level</div><div class='add'>+==================================================================</div><div class='ctx'> </div><div class='ctx'> If the ACPI table has a video device, and acpi_backlight=vendor kernel</div><div class='ctx'> command line is not present, the driver will register a backlight device</div><div class='hunk'>@@ -22,36 +26,41 @@ The backlight sysfs interface has a standard definition here:</div><div class='ctx'> Documentation/ABI/stable/sysfs-class-backlight.</div><div class='ctx'> </div><div class='ctx'> And what ACPI video driver does is:</div><div class='del'>-actual_brightness: on read, control method _BQC will be evaluated to</div><div class='del'>-get the brightness level the firmware thinks it is at;</div><div class='del'>-bl_power: not implemented, will set the current brightness instead;</div><div class='del'>-brightness: on write, control method _BCM will run to set the requested</div><div class='del'>-brightness level;</div><div class='del'>-max_brightness: Derived from the _BCL package(see below);</div><div class='del'>-type: firmware</div><div class='add'>+</div><div class='add'>+actual_brightness:</div><div class='add'>+  on read, control method _BQC will be evaluated to</div><div class='add'>+  get the brightness level the firmware thinks it is at;</div><div class='add'>+bl_power:</div><div class='add'>+  not implemented, will set the current brightness instead;</div><div class='add'>+brightness:</div><div class='add'>+  on write, control method _BCM will run to set the requested brightness level;</div><div class='add'>+max_brightness:</div><div class='add'>+  Derived from the _BCL package(see below);</div><div class='add'>+type:</div><div class='add'>+  firmware</div><div class='ctx'> </div><div class='ctx'> Note that ACPI video backlight driver will always use index for</div><div class='ctx'> brightness, actual_brightness and max_brightness. So if we have</div><div class='del'>-the following _BCL package:</div><div class='add'>+the following _BCL package::</div><div class='ctx'> </div><div class='del'>-Method (_BCL, 0, NotSerialized)</div><div class='del'>-{</div><div class='del'>-	Return (Package (0x0C)</div><div class='add'>+	Method (_BCL, 0, NotSerialized)</div><div class='ctx'> 	{</div><div class='del'>-		0x64,</div><div class='del'>-		0x32,</div><div class='del'>-		0x0A,</div><div class='del'>-		0x14,</div><div class='del'>-		0x1E,</div><div class='del'>-		0x28,</div><div class='del'>-		0x32,</div><div class='del'>-		0x3C,</div><div class='del'>-		0x46,</div><div class='del'>-		0x50,</div><div class='del'>-		0x5A,</div><div class='del'>-		0x64</div><div class='del'>-	})</div><div class='del'>-}</div><div class='add'>+		Return (Package (0x0C)</div><div class='add'>+		{</div><div class='add'>+			0x64,</div><div class='add'>+			0x32,</div><div class='add'>+			0x0A,</div><div class='add'>+			0x14,</div><div class='add'>+			0x1E,</div><div class='add'>+			0x28,</div><div class='add'>+			0x32,</div><div class='add'>+			0x3C,</div><div class='add'>+			0x46,</div><div class='add'>+			0x50,</div><div class='add'>+			0x5A,</div><div class='add'>+			0x64</div><div class='add'>+		})</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> The first two levels are for when laptop are on AC or on battery and are</div><div class='ctx'> not used by Linux currently. The remaining 10 levels are supported levels</div><div class='hunk'>@@ -62,13 +71,15 @@ as a "brightness level" indicator. Thus from the user space perspective</div><div class='ctx'> the range of available brightness levels is from 0 to 9 (max_brightness)</div><div class='ctx'> inclusive.</div><div class='ctx'> </div><div class='del'>-2 Notify user space about hotkey event</div><div class='add'>+Notify user space about hotkey event</div><div class='add'>+====================================</div><div class='ctx'> </div><div class='ctx'> There are generally two cases for hotkey event reporting:</div><div class='add'>+</div><div class='ctx'> i) For some laptops, when user presses the hotkey, a scancode will be</div><div class='ctx'>    generated and sent to user space through the input device created by</div><div class='ctx'>    the keyboard driver as a key type input event, with proper remap, the</div><div class='del'>-   following key code will appear to user space:</div><div class='add'>+   following key code will appear to user space::</div><div class='ctx'> </div><div class='ctx'> 	EV_KEY, KEY_BRIGHTNESSUP</div><div class='ctx'> 	EV_KEY, KEY_BRIGHTNESSDOWN</div><div class='hunk'>@@ -84,23 +95,27 @@ ii) For some laptops, the press of the hotkey will not generate the</div><div class='ctx'>     notify value it received and send the event to user space through the</div><div class='ctx'>     input device it created:</div><div class='ctx'> </div><div class='add'>+	=====		==================</div><div class='ctx'> 	event		keycode</div><div class='add'>+	=====		==================</div><div class='ctx'> 	0x86		KEY_BRIGHTNESSUP</div><div class='ctx'> 	0x87		KEY_BRIGHTNESSDOWN</div><div class='ctx'> 	etc.</div><div class='add'>+	=====		==================</div><div class='ctx'> </div><div class='ctx'> so this would lead to the same effect as case i) now.</div><div class='ctx'> </div><div class='ctx'> Once user space tool receives this event, it can modify the backlight</div><div class='ctx'> level through the sysfs interface.</div><div class='ctx'> </div><div class='del'>-3 Change backlight level in the kernel</div><div class='add'>+Change backlight level in the kernel</div><div class='add'>+====================================</div><div class='ctx'> </div><div class='ctx'> This works for machines covered by case ii) in Section 2. Once the driver</div><div class='ctx'> received a notification, it will set the backlight level accordingly. This does</div><div class='ctx'> not affect the sending of event to user space, they are always sent to user</div><div class='ctx'> space regardless of whether or not the video module controls the backlight level</div><div class='ctx'> directly. This behaviour can be controlled through the brightness_switch_enabled</div><div class='del'>-module parameter as documented in admin-guide/kernel-parameters.rst. It is recommended to</div><div class='del'>-disable this behaviour once a GUI environment starts up and wants to have full</div><div class='del'>-control of the backlight level.</div><div class='add'>+module parameter as documented in admin-guide/kernel-parameters.rst. It is</div><div class='add'>+recommended to disable this behaviour once a GUI environment starts up and</div><div class='add'>+wants to have full control of the backlight level.</div><div class='head'>diff --git a/Documentation/firmware-guide/index.rst b/Documentation/firmware-guide/index.rst<br/>new file mode 100644<br/>index 000000000000..5355784ca0a2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/firmware-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/firmware-guide/index.rst</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+===============================</div><div class='add'>+The Linux kernel firmware guide</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+This section describes the ACPI subsystem in Linux from firmware perspective.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   acpi/index</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/hwmon/ab8500 b/Documentation/hwmon/ab8500.rst<br/>index cf169c8ef4e3..33f93a9cec04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ab8500?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ab8500</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ab8500.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ab8500.rst</a></div><div class='hunk'>@@ -2,19 +2,23 @@ Kernel driver ab8500</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * ST-Ericsson AB8500</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ab8500'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.stericsson.com/developers/documentation.jsp</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Martin Persson &lt;martin.persson@stericsson.com&gt;</div><div class='del'>-        Hongbo Zhang &lt;hongbo.zhang@linaro.org&gt;</div><div class='add'>+	- Martin Persson &lt;martin.persson@stericsson.com&gt;</div><div class='add'>+	- Hongbo Zhang &lt;hongbo.zhang@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='del'>-See also Documentation/hwmon/abx500. This is the ST-Ericsson AB8500 specific</div><div class='add'>+See also Documentation/hwmon/abx500.rst. This is the ST-Ericsson AB8500 specific</div><div class='ctx'> driver.</div><div class='ctx'> </div><div class='ctx'> Currently only the AB8500 internal sensor and one external sensor for battery</div><div class='head'>diff --git a/Documentation/hwmon/abituguru b/Documentation/hwmon/abituguru<br/>deleted file mode 100644<br/>index 44013d23b3f0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abituguru?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-Kernel driver abituguru</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-Supported chips:</div><div class='del'>-  * Abit uGuru revision 1 &amp; 2 (Hardware Monitor part only)</div><div class='del'>-    Prefix: 'abituguru'</div><div class='del'>-    Addresses scanned: ISA 0x0E0</div><div class='del'>-    Datasheet: Not available, this driver is based on reverse engineering.</div><div class='del'>-	A "Datasheet" has been written based on the reverse engineering it</div><div class='del'>-	should be available in the same dir as this file under the name</div><div class='del'>-	abituguru-datasheet.</div><div class='del'>-    Note:</div><div class='del'>-	The uGuru is a microcontroller with onboard firmware which programs</div><div class='del'>-	it to behave as a hwmon IC. There are many different revisions of the</div><div class='del'>-	firmware and thus effectivly many different revisions of the uGuru.</div><div class='del'>-	Below is an incomplete list with which revisions are used for which</div><div class='del'>-	Motherboards:</div><div class='del'>-	uGuru 1.00    ~ 1.24    (AI7, KV8-MAX3, AN7) (1)</div><div class='del'>-	uGuru 2.0.0.0 ~ 2.0.4.2 (KV8-PRO)</div><div class='del'>-	uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8)</div><div class='del'>-	uGuru 2.2.0.0 ~ 2.2.0.6 (AA8 Fatal1ty)</div><div class='del'>-	uGuru 2.3.0.0 ~ 2.3.0.9 (AN8)</div><div class='del'>-	uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X,</div><div class='del'>-				 AW9D-MAX) (2)</div><div class='del'>-	1) For revisions 2 and 3 uGuru's the driver can autodetect the</div><div class='del'>-	   sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's</div><div class='del'>-	   this does not always work. For these uGuru's the autodetection can</div><div class='del'>-	   be overridden with the bank1_types module param. For all 3 known</div><div class='del'>-	   revison 1 motherboards the correct use of this param is:</div><div class='del'>-	   bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1</div><div class='del'>-	   You may also need to specify the fan_sensors option for these boards</div><div class='del'>-	   fan_sensors=5</div><div class='del'>-	2) There is a separate abituguru3 driver for these motherboards,</div><div class='del'>-	   the abituguru (without the 3 !) driver will not work on these</div><div class='del'>-	   motherboards (and visa versa)!</div><div class='del'>-</div><div class='del'>-Authors:</div><div class='del'>-	Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;,</div><div class='del'>-	(Initial reverse engineering done by Olle Sandberg</div><div class='del'>-	 &lt;ollebull@gmail.com&gt;)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Module Parameters</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-* force: bool		Force detection. Note this parameter only causes the</div><div class='del'>-			detection to be skipped, and thus the insmod to</div><div class='del'>-			succeed. If the uGuru can't be read the actual hwmon</div><div class='del'>-			driver will not load and thus no hwmon device will get</div><div class='del'>-			registered.</div><div class='del'>-* bank1_types: int[]	Bank1 sensortype autodetection override:</div><div class='del'>-			  -1 autodetect (default)</div><div class='del'>-			   0 volt sensor</div><div class='del'>-			   1 temp sensor</div><div class='del'>-			   2 not connected</div><div class='del'>-* fan_sensors: int	Tell the driver how many fan speed sensors there are</div><div class='del'>-			on your motherboard. Default: 0 (autodetect).</div><div class='del'>-* pwms: int		Tell the driver how many fan speed controls (fan</div><div class='del'>-			pwms) your motherboard has. Default: 0 (autodetect).</div><div class='del'>-* verbose: int		How verbose should the driver be? (0-3):</div><div class='del'>-			   0 normal output</div><div class='del'>-			   1 + verbose error reporting</div><div class='del'>-			   2 + sensors type probing info (default)</div><div class='del'>-			   3 + retryable error reporting</div><div class='del'>-			Default: 2 (the driver is still in the testing phase)</div><div class='del'>-</div><div class='del'>-Notice if you need any of the first three options above please insmod the</div><div class='del'>-driver with verbose set to 3 and mail me &lt;j.w.r.degoede@hhs.nl&gt; the output of:</div><div class='del'>-dmesg | grep abituguru</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Description</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-This driver supports the hardware monitoring features of the first and</div><div class='del'>-second revision of the Abit uGuru chip found on Abit uGuru featuring</div><div class='del'>-motherboards (most modern Abit motherboards).</div><div class='del'>-</div><div class='del'>-The first and second revision of the uGuru chip in reality is a Winbond</div><div class='del'>-W83L950D in disguise (despite Abit claiming it is "a new microprocessor</div><div class='del'>-designed by the ABIT Engineers"). Unfortunately this doesn't help since the</div><div class='del'>-W83L950D is a generic microcontroller with a custom Abit application running</div><div class='del'>-on it.</div><div class='del'>-</div><div class='del'>-Despite Abit not releasing any information regarding the uGuru, Olle</div><div class='del'>-Sandberg &lt;ollebull@gmail.com&gt; has managed to reverse engineer the sensor part</div><div class='del'>-of the uGuru. Without his work this driver would not have been possible.</div><div class='del'>-</div><div class='del'>-Known Issues</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-The voltage and frequency control parts of the Abit uGuru are not supported.</div><div class='head'>diff --git a/Documentation/hwmon/abituguru-datasheet b/Documentation/hwmon/abituguru-datasheet.rst<br/>index 86c0b1251c81..6d5253e2223b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abituguru-datasheet?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru-datasheet</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abituguru-datasheet.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/abituguru-datasheet.rst</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+===============</div><div class='ctx'> uGuru datasheet</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='hunk'>@@ -168,34 +169,35 @@ This bank contains 0 sensors, iow the sensor address is ignored (but must be</div><div class='ctx'> written) just use 0. Bank 0x20 contains 3 bytes:</div><div class='ctx'> </div><div class='ctx'> Byte 0:</div><div class='del'>-This byte holds the alarm flags for sensor 0-7 of Sensor Bank1, with bit 0</div><div class='del'>-corresponding to sensor 0, 1 to 1, etc.</div><div class='add'>+  This byte holds the alarm flags for sensor 0-7 of Sensor Bank1, with bit 0</div><div class='add'>+  corresponding to sensor 0, 1 to 1, etc.</div><div class='ctx'> </div><div class='ctx'> Byte 1:</div><div class='del'>-This byte holds the alarm flags for sensor 8-15 of Sensor Bank1, with bit 0</div><div class='del'>-corresponding to sensor 8, 1 to 9, etc.</div><div class='add'>+  This byte holds the alarm flags for sensor 8-15 of Sensor Bank1, with bit 0</div><div class='add'>+  corresponding to sensor 8, 1 to 9, etc.</div><div class='ctx'> </div><div class='ctx'> Byte 2:</div><div class='del'>-This byte holds the alarm flags for sensor 0-5 of Sensor Bank2, with bit 0</div><div class='del'>-corresponding to sensor 0, 1 to 1, etc.</div><div class='add'>+  This byte holds the alarm flags for sensor 0-5 of Sensor Bank2, with bit 0</div><div class='add'>+  corresponding to sensor 0, 1 to 1, etc.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Bank 0x21 Sensor Bank1 Values / Readings (R)</div><div class='ctx'> --------------------------------------------</div><div class='ctx'> This bank contains 16 sensors, for each sensor it contains 1 byte.</div><div class='ctx'> So far the following sensors are known to be available on all motherboards:</div><div class='del'>-Sensor  0 CPU temp</div><div class='del'>-Sensor  1 SYS temp</div><div class='del'>-Sensor  3 CPU core volt</div><div class='del'>-Sensor  4 DDR volt</div><div class='del'>-Sensor 10 DDR Vtt volt</div><div class='del'>-Sensor 15 PWM temp</div><div class='add'>+</div><div class='add'>+- Sensor  0 CPU temp</div><div class='add'>+- Sensor  1 SYS temp</div><div class='add'>+- Sensor  3 CPU core volt</div><div class='add'>+- Sensor  4 DDR volt</div><div class='add'>+- Sensor 10 DDR Vtt volt</div><div class='add'>+- Sensor 15 PWM temp</div><div class='ctx'> </div><div class='ctx'> Byte 0:</div><div class='del'>-This byte holds the reading from the sensor. Sensors in Bank1 can be both</div><div class='del'>-volt and temp sensors, this is motherboard specific. The uGuru however does</div><div class='del'>-seem to know (be programmed with) what kindoff sensor is attached see Sensor</div><div class='del'>-Bank1 Settings description.</div><div class='add'>+  This byte holds the reading from the sensor. Sensors in Bank1 can be both</div><div class='add'>+  volt and temp sensors, this is motherboard specific. The uGuru however does</div><div class='add'>+  seem to know (be programmed with) what kindoff sensor is attached see Sensor</div><div class='add'>+  Bank1 Settings description.</div><div class='ctx'> </div><div class='ctx'> Volt sensors use a linear scale, a reading 0 corresponds with 0 volt and a</div><div class='ctx'> reading of 255 with 3494 mV. The sensors for higher voltages however are</div><div class='hunk'>@@ -207,96 +209,118 @@ Temp sensors also use a linear scale, a reading of 0 corresponds with 0 degree</div><div class='ctx'> Celsius and a reading of 255 with a reading of 255 degrees Celsius.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Bank 0x22 Sensor Bank1 Settings (R)</div><div class='del'>-Bank 0x23 Sensor Bank1 Settings (W)</div><div class='del'>------------------------------------</div><div class='add'>+Bank 0x22 Sensor Bank1 Settings (R) and Bank 0x23 Sensor Bank1 Settings (W)</div><div class='add'>+---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-This bank contains 16 sensors, for each sensor it contains 3 bytes. Each</div><div class='add'>+Those banks contain 16 sensors, for each sensor it contains 3 bytes. Each</div><div class='ctx'> set of 3 bytes contains the settings for the sensor with the same sensor</div><div class='ctx'> address in Bank 0x21 .</div><div class='ctx'> </div><div class='ctx'> Byte 0:</div><div class='del'>-Alarm behaviour for the selected sensor. A 1 enables the described behaviour.</div><div class='del'>-Bit 0: Give an alarm if measured temp is over the warning threshold	(RW) *</div><div class='del'>-Bit 1: Give an alarm if measured volt is over the max threshold		(RW) **</div><div class='del'>-Bit 2: Give an alarm if measured volt is under the min threshold	(RW) **</div><div class='del'>-Bit 3: Beep if alarm							(RW)</div><div class='del'>-Bit 4: 1 if alarm cause measured temp is over the warning threshold	(R)</div><div class='del'>-Bit 5: 1 if alarm cause measured volt is over the max threshold		(R)</div><div class='del'>-Bit 6: 1 if alarm cause measured volt is under the min threshold	(R)</div><div class='del'>-Bit 7: Volt sensor: Shutdown if alarm persist for more than 4 seconds	(RW)</div><div class='del'>-       Temp sensor: Shutdown if temp is over the shutdown threshold	(RW)</div><div class='del'>-</div><div class='del'>-*  This bit is only honored/used by the uGuru if a temp sensor is connected</div><div class='del'>-** This bit is only honored/used by the uGuru if a volt sensor is connected</div><div class='del'>-Note with some trickery this can be used to find out what kinda sensor is</div><div class='del'>-detected see the Linux kernel driver for an example with many comments on</div><div class='del'>-how todo this.</div><div class='add'>+  Alarm behaviour for the selected sensor. A 1 enables the described</div><div class='add'>+  behaviour.</div><div class='add'>+</div><div class='add'>+Bit 0:</div><div class='add'>+  Give an alarm if measured temp is over the warning threshold		(RW) [1]_</div><div class='add'>+</div><div class='add'>+Bit 1:</div><div class='add'>+  Give an alarm if measured volt is over the max threshold		(RW) [2]_</div><div class='add'>+</div><div class='add'>+Bit 2:</div><div class='add'>+  Give an alarm if measured volt is under the min threshold		(RW) [2]_</div><div class='add'>+</div><div class='add'>+Bit 3:</div><div class='add'>+  Beep if alarm								(RW)</div><div class='add'>+</div><div class='add'>+Bit 4:</div><div class='add'>+  1 if alarm cause measured temp is over the warning threshold		(R)</div><div class='add'>+</div><div class='add'>+Bit 5:</div><div class='add'>+  1 if alarm cause measured volt is over the max threshold		(R)</div><div class='add'>+</div><div class='add'>+Bit 6:</div><div class='add'>+  1 if alarm cause measured volt is under the min threshold		(R)</div><div class='add'>+</div><div class='add'>+Bit 7:</div><div class='add'>+  - Volt sensor: Shutdown if alarm persist for more than 4 seconds	(RW)</div><div class='add'>+  - Temp sensor: Shutdown if temp is over the shutdown threshold	(RW)</div><div class='add'>+</div><div class='add'>+.. [1] This bit is only honored/used by the uGuru if a temp sensor is connected</div><div class='add'>+</div><div class='add'>+.. [2] This bit is only honored/used by the uGuru if a volt sensor is connected</div><div class='add'>+       Note with some trickery this can be used to find out what kinda sensor</div><div class='add'>+       is detected see the Linux kernel driver for an example with many</div><div class='add'>+       comments on how todo this.</div><div class='ctx'> </div><div class='ctx'> Byte 1:</div><div class='del'>-Temp sensor: warning threshold  (scale as bank 0x21)</div><div class='del'>-Volt sensor: min threshold      (scale as bank 0x21)</div><div class='add'>+  - Temp sensor: warning threshold  (scale as bank 0x21)</div><div class='add'>+  - Volt sensor: min threshold      (scale as bank 0x21)</div><div class='ctx'> </div><div class='ctx'> Byte 2:</div><div class='del'>-Temp sensor: shutdown threshold (scale as bank 0x21)</div><div class='del'>-Volt sensor: max threshold      (scale as bank 0x21)</div><div class='add'>+  - Temp sensor: shutdown threshold (scale as bank 0x21)</div><div class='add'>+  - Volt sensor: max threshold      (scale as bank 0x21)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Bank 0x24 PWM outputs for FAN's (R)</div><div class='del'>-Bank 0x25 PWM outputs for FAN's (W)</div><div class='del'>------------------------------------</div><div class='add'>+Bank 0x24 PWM outputs for FAN's (R) and Bank 0x25 PWM outputs for FAN's (W)</div><div class='add'>+---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-This bank contains 3 "sensors", for each sensor it contains 5 bytes.</div><div class='del'>-Sensor 0 usually controls the CPU fan</div><div class='del'>-Sensor 1 usually controls the NB (or chipset for single chip) fan</div><div class='del'>-Sensor 2 usually controls the System fan</div><div class='add'>+Those banks contain 3 "sensors", for each sensor it contains 5 bytes.</div><div class='add'>+  - Sensor 0 usually controls the CPU fan</div><div class='add'>+  - Sensor 1 usually controls the NB (or chipset for single chip) fan</div><div class='add'>+  - Sensor 2 usually controls the System fan</div><div class='ctx'> </div><div class='ctx'> Byte 0:</div><div class='del'>-Flag 0x80 to enable control, Fan runs at 100% when disabled.</div><div class='del'>-low nibble (temp)sensor address at bank 0x21 used for control.</div><div class='add'>+  Flag 0x80 to enable control, Fan runs at 100% when disabled.</div><div class='add'>+  low nibble (temp)sensor address at bank 0x21 used for control.</div><div class='ctx'> </div><div class='ctx'> Byte 1:</div><div class='del'>-0-255 = 0-12v (linear), specify voltage at which fan will rotate when under</div><div class='del'>-low threshold temp (specified in byte 3)</div><div class='add'>+  0-255 = 0-12v (linear), specify voltage at which fan will rotate when under</div><div class='add'>+  low threshold temp (specified in byte 3)</div><div class='ctx'> </div><div class='ctx'> Byte 2:</div><div class='del'>-0-255 = 0-12v (linear), specify voltage at which fan will rotate when above</div><div class='del'>-high threshold temp (specified in byte 4)</div><div class='add'>+  0-255 = 0-12v (linear), specify voltage at which fan will rotate when above</div><div class='add'>+  high threshold temp (specified in byte 4)</div><div class='ctx'> </div><div class='ctx'> Byte 3:</div><div class='del'>-Low threshold temp  (scale as bank 0x21)</div><div class='add'>+  Low threshold temp  (scale as bank 0x21)</div><div class='ctx'> </div><div class='ctx'> byte 4:</div><div class='del'>-High threshold temp (scale as bank 0x21)</div><div class='add'>+  High threshold temp (scale as bank 0x21)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Bank 0x26 Sensors Bank2 Values / Readings (R)</div><div class='ctx'> ---------------------------------------------</div><div class='ctx'> </div><div class='ctx'> This bank contains 6 sensors (AFAIK), for each sensor it contains 1 byte.</div><div class='add'>+</div><div class='ctx'> So far the following sensors are known to be available on all motherboards:</div><div class='del'>-Sensor 0: CPU fan speed</div><div class='del'>-Sensor 1: NB (or chipset for single chip) fan speed</div><div class='del'>-Sensor 2: SYS fan speed</div><div class='add'>+  - Sensor 0: CPU fan speed</div><div class='add'>+  - Sensor 1: NB (or chipset for single chip) fan speed</div><div class='add'>+  - Sensor 2: SYS fan speed</div><div class='ctx'> </div><div class='ctx'> Byte 0:</div><div class='del'>-This byte holds the reading from the sensor. 0-255 = 0-15300 (linear)</div><div class='add'>+  This byte holds the reading from the sensor. 0-255 = 0-15300 (linear)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Bank 0x27 Sensors Bank2 Settings (R)</div><div class='del'>-Bank 0x28 Sensors Bank2 Settings (W)</div><div class='del'>-------------------------------------</div><div class='add'>+Bank 0x27 Sensors Bank2 Settings (R) and Bank 0x28 Sensors Bank2 Settings (W)</div><div class='add'>+-----------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-This bank contains 6 sensors (AFAIK), for each sensor it contains 2 bytes.</div><div class='add'>+Those banks contain 6 sensors (AFAIK), for each sensor it contains 2 bytes.</div><div class='ctx'> </div><div class='ctx'> Byte 0:</div><div class='del'>-Alarm behaviour for the selected sensor. A 1 enables the described behaviour.</div><div class='del'>-Bit 0: Give an alarm if measured rpm is under the min threshold	(RW)</div><div class='del'>-Bit 3: Beep if alarm						(RW)</div><div class='del'>-Bit 7: Shutdown if alarm persist for more than 4 seconds	(RW)</div><div class='add'>+  Alarm behaviour for the selected sensor. A 1 enables the described behaviour.</div><div class='add'>+</div><div class='add'>+Bit 0:</div><div class='add'>+  Give an alarm if measured rpm is under the min threshold	(RW)</div><div class='add'>+</div><div class='add'>+Bit 3:</div><div class='add'>+  Beep if alarm							(RW)</div><div class='add'>+</div><div class='add'>+Bit 7:</div><div class='add'>+  Shutdown if alarm persist for more than 4 seconds		(RW)</div><div class='ctx'> </div><div class='ctx'> Byte 1:</div><div class='del'>-min threshold (scale as bank 0x26)</div><div class='add'>+  min threshold (scale as bank 0x26)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Warning for the adventurous</div><div class='head'>diff --git a/Documentation/hwmon/abituguru.rst b/Documentation/hwmon/abituguru.rst<br/>new file mode 100644<br/>index 000000000000..d8243c827de9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abituguru.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/abituguru.rst</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+Kernel driver abituguru</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+</div><div class='add'>+  * Abit uGuru revision 1 &amp; 2 (Hardware Monitor part only)</div><div class='add'>+</div><div class='add'>+    Prefix: 'abituguru'</div><div class='add'>+</div><div class='add'>+    Addresses scanned: ISA 0x0E0</div><div class='add'>+</div><div class='add'>+    Datasheet: Not available, this driver is based on reverse engineering.</div><div class='add'>+    A "Datasheet" has been written based on the reverse engineering it</div><div class='add'>+    should be available in the same dir as this file under the name</div><div class='add'>+    abituguru-datasheet.</div><div class='add'>+</div><div class='add'>+    Note:</div><div class='add'>+	The uGuru is a microcontroller with onboard firmware which programs</div><div class='add'>+	it to behave as a hwmon IC. There are many different revisions of the</div><div class='add'>+	firmware and thus effectivly many different revisions of the uGuru.</div><div class='add'>+	Below is an incomplete list with which revisions are used for which</div><div class='add'>+	Motherboards:</div><div class='add'>+</div><div class='add'>+	- uGuru 1.00    ~ 1.24    (AI7, KV8-MAX3, AN7) [1]_</div><div class='add'>+	- uGuru 2.0.0.0 ~ 2.0.4.2 (KV8-PRO)</div><div class='add'>+	- uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8)</div><div class='add'>+	- uGuru 2.2.0.0 ~ 2.2.0.6 (AA8 Fatal1ty)</div><div class='add'>+	- uGuru 2.3.0.0 ~ 2.3.0.9 (AN8)</div><div class='add'>+	- uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X,</div><div class='add'>+	  AW9D-MAX) [2]_</div><div class='add'>+</div><div class='add'>+.. [1]  For revisions 2 and 3 uGuru's the driver can autodetect the</div><div class='add'>+	sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's</div><div class='add'>+	this does not always work. For these uGuru's the autodetection can</div><div class='add'>+	be overridden with the bank1_types module param. For all 3 known</div><div class='add'>+	revison 1 motherboards the correct use of this param is:</div><div class='add'>+	bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1</div><div class='add'>+	You may also need to specify the fan_sensors option for these boards</div><div class='add'>+	fan_sensors=5</div><div class='add'>+</div><div class='add'>+.. [2]  There is a separate abituguru3 driver for these motherboards,</div><div class='add'>+	the abituguru (without the 3 !) driver will not work on these</div><div class='add'>+	motherboards (and visa versa)!</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+	- Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;,</div><div class='add'>+	- (Initial reverse engineering done by Olle Sandberg</div><div class='add'>+	  &lt;ollebull@gmail.com&gt;)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module Parameters</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+* force: bool</div><div class='add'>+			Force detection. Note this parameter only causes the</div><div class='add'>+			detection to be skipped, and thus the insmod to</div><div class='add'>+			succeed. If the uGuru can't be read the actual hwmon</div><div class='add'>+			driver will not load and thus no hwmon device will get</div><div class='add'>+			registered.</div><div class='add'>+* bank1_types: int[]</div><div class='add'>+			Bank1 sensortype autodetection override:</div><div class='add'>+</div><div class='add'>+			  * -1 autodetect (default)</div><div class='add'>+			  *  0 volt sensor</div><div class='add'>+			  *  1 temp sensor</div><div class='add'>+			  *  2 not connected</div><div class='add'>+* fan_sensors: int</div><div class='add'>+			Tell the driver how many fan speed sensors there are</div><div class='add'>+			on your motherboard. Default: 0 (autodetect).</div><div class='add'>+* pwms: int</div><div class='add'>+			Tell the driver how many fan speed controls (fan</div><div class='add'>+			pwms) your motherboard has. Default: 0 (autodetect).</div><div class='add'>+* verbose: int</div><div class='add'>+			How verbose should the driver be? (0-3):</div><div class='add'>+</div><div class='add'>+			   * 0 normal output</div><div class='add'>+			   * 1 + verbose error reporting</div><div class='add'>+			   * 2 + sensors type probing info (default)</div><div class='add'>+			   * 3 + retryable error reporting</div><div class='add'>+</div><div class='add'>+			Default: 2 (the driver is still in the testing phase)</div><div class='add'>+</div><div class='add'>+Notice: if you need any of the first three options above please insmod the</div><div class='add'>+driver with verbose set to 3 and mail me &lt;j.w.r.degoede@hhs.nl&gt; the output of:</div><div class='add'>+dmesg | grep abituguru</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver supports the hardware monitoring features of the first and</div><div class='add'>+second revision of the Abit uGuru chip found on Abit uGuru featuring</div><div class='add'>+motherboards (most modern Abit motherboards).</div><div class='add'>+</div><div class='add'>+The first and second revision of the uGuru chip in reality is a Winbond</div><div class='add'>+W83L950D in disguise (despite Abit claiming it is "a new microprocessor</div><div class='add'>+designed by the ABIT Engineers"). Unfortunately this doesn't help since the</div><div class='add'>+W83L950D is a generic microcontroller with a custom Abit application running</div><div class='add'>+on it.</div><div class='add'>+</div><div class='add'>+Despite Abit not releasing any information regarding the uGuru, Olle</div><div class='add'>+Sandberg &lt;ollebull@gmail.com&gt; has managed to reverse engineer the sensor part</div><div class='add'>+of the uGuru. Without his work this driver would not have been possible.</div><div class='add'>+</div><div class='add'>+Known Issues</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The voltage and frequency control parts of the Abit uGuru are not supported.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   abituguru-datasheet.rst</div><div class='head'>diff --git a/Documentation/hwmon/abituguru3 b/Documentation/hwmon/abituguru3.rst<br/>index a6ccfe4bb6aa..514f11f41e8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abituguru3?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abituguru3</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abituguru3.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/abituguru3.rst</a></div><div class='hunk'>@@ -3,41 +3,51 @@ Kernel driver abituguru3</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='ctx'>   * Abit uGuru revision 3 (Hardware Monitor part, reading only)</div><div class='add'>+</div><div class='ctx'>     Prefix: 'abituguru3'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA 0x0E0</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not available, this driver is based on reverse engineering.</div><div class='add'>+</div><div class='ctx'>     Note:</div><div class='ctx'> 	The uGuru is a microcontroller with onboard firmware which programs</div><div class='ctx'> 	it to behave as a hwmon IC. There are many different revisions of the</div><div class='ctx'> 	firmware and thus effectivly many different revisions of the uGuru.</div><div class='ctx'> 	Below is an incomplete list with which revisions are used for which</div><div class='ctx'> 	Motherboards:</div><div class='del'>-	uGuru 1.00    ~ 1.24    (AI7, KV8-MAX3, AN7)</div><div class='del'>-	uGuru 2.0.0.0 ~ 2.0.4.2 (KV8-PRO)</div><div class='del'>-	uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8)</div><div class='del'>-	uGuru 2.3.0.0 ~ 2.3.0.9 (AN8)</div><div class='del'>-	uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X,</div><div class='del'>-				 AW9D-MAX)</div><div class='add'>+</div><div class='add'>+	- uGuru 1.00    ~ 1.24    (AI7, KV8-MAX3, AN7)</div><div class='add'>+	- uGuru 2.0.0.0 ~ 2.0.4.2 (KV8-PRO)</div><div class='add'>+	- uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8)</div><div class='add'>+	- uGuru 2.3.0.0 ~ 2.3.0.9 (AN8)</div><div class='add'>+	- uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X,</div><div class='add'>+	  AW9D-MAX)</div><div class='add'>+</div><div class='ctx'> 	The abituguru3 driver is only for revison 3.0.x.x motherboards,</div><div class='ctx'> 	this driver will not work on older motherboards. For older</div><div class='ctx'> 	motherboards use the abituguru (without the 3 !) driver.</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-	Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;,</div><div class='del'>-	(Initial reverse engineering done by Louis Kruger)</div><div class='add'>+	- Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;,</div><div class='add'>+	- (Initial reverse engineering done by Louis Kruger)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='del'>-* force: bool		Force detection. Note this parameter only causes the</div><div class='add'>+* force: bool</div><div class='add'>+			Force detection. Note this parameter only causes the</div><div class='ctx'> 			detection to be skipped, and thus the insmod to</div><div class='ctx'> 			succeed. If the uGuru can't be read the actual hwmon</div><div class='ctx'> 			driver will not load and thus no hwmon device will get</div><div class='ctx'> 			registered.</div><div class='del'>-* verbose: bool		Should the driver be verbose?</div><div class='del'>-			0/off/false  normal output</div><div class='del'>-			1/on/true    + verbose error reporting (default)</div><div class='add'>+* verbose: bool</div><div class='add'>+			Should the driver be verbose?</div><div class='add'>+</div><div class='add'>+			* 0/off/false  normal output</div><div class='add'>+			* 1/on/true    + verbose error reporting (default)</div><div class='add'>+</div><div class='ctx'> 			Default: 1 (the driver is still in the testing phase)</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -62,4 +72,4 @@ neither is writing any of the sensor settings and writing / reading the</div><div class='ctx'> fanspeed control registers (FanEQ)</div><div class='ctx'> </div><div class='ctx'> If you encounter any problems please mail me &lt;j.w.r.degoede@hhs.nl&gt; and</div><div class='del'>-include the output of: "dmesg | grep abituguru"</div><div class='add'>+include the output of: `dmesg | grep abituguru`</div><div class='head'>diff --git a/Documentation/hwmon/abx500 b/Documentation/hwmon/abx500.rst<br/>index 319a058cec7c..3d88b2ce0f00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abx500?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/abx500</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/abx500.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/abx500.rst</a></div><div class='hunk'>@@ -2,14 +2,18 @@ Kernel driver abx500</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * ST-Ericsson ABx500 series</div><div class='add'>+</div><div class='ctx'>     Prefix: 'abx500'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.stericsson.com/developers/documentation.jsp</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Martin Persson &lt;martin.persson@stericsson.com&gt;</div><div class='del'>-        Hongbo Zhang &lt;hongbo.zhang@linaro.org&gt;</div><div class='add'>+	Martin Persson &lt;martin.persson@stericsson.com&gt;</div><div class='add'>+	Hongbo Zhang &lt;hongbo.zhang@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/acpi_power_meter b/Documentation/hwmon/acpi_power_meter.rst<br/>index c80399a00c50..4a0941ade0ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/acpi_power_meter?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/acpi_power_meter</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/acpi_power_meter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/acpi_power_meter.rst</a></div><div class='hunk'>@@ -4,8 +4,11 @@ Kernel driver power_meter</div><div class='ctx'> This driver talks to ACPI 4.0 power meters.</div><div class='ctx'> </div><div class='ctx'> Supported systems:</div><div class='add'>+</div><div class='ctx'>   * Any recent system with ACPI 4.0.</div><div class='add'>+</div><div class='ctx'>     Prefix: 'power_meter'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://acpi.info/, section 10.4.</div><div class='ctx'> </div><div class='ctx'> Author: Darrick J. Wong</div><div class='hunk'>@@ -18,26 +21,26 @@ the ACPI 4.0 spec (Chapter 10.4).  These devices have a simple set of</div><div class='ctx'> features--a power meter that returns average power use over a configurable</div><div class='ctx'> interval, an optional capping mechanism, and a couple of trip points.  The</div><div class='ctx'> sysfs interface conforms with the specification outlined in the "Power" section</div><div class='del'>-of Documentation/hwmon/sysfs-interface.</div><div class='add'>+of Documentation/hwmon/sysfs-interface.rst.</div><div class='ctx'> </div><div class='ctx'> Special Features</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='del'>-The power[1-*]_is_battery knob indicates if the power supply is a battery.</div><div class='del'>-Both power[1-*]_average_{min,max} must be set before the trip points will work.</div><div class='add'>+The `power[1-*]_is_battery` knob indicates if the power supply is a battery.</div><div class='add'>+Both `power[1-*]_average_{min,max}` must be set before the trip points will work.</div><div class='ctx'> When both of them are set, an ACPI event will be broadcast on the ACPI netlink</div><div class='ctx'> socket and a poll notification will be sent to the appropriate</div><div class='del'>-power[1-*]_average sysfs file.</div><div class='add'>+`power[1-*]_average` sysfs file.</div><div class='ctx'> </div><div class='del'>-The power[1-*]_{model_number, serial_number, oem_info} fields display arbitrary</div><div class='del'>-strings that ACPI provides with the meter.  The measures/ directory contains</div><div class='del'>-symlinks to the devices that this meter measures.</div><div class='add'>+The `power[1-*]_{model_number, serial_number, oem_info}` fields display</div><div class='add'>+arbitrary strings that ACPI provides with the meter.  The measures/ directory</div><div class='add'>+contains symlinks to the devices that this meter measures.</div><div class='ctx'> </div><div class='ctx'> Some computers have the ability to enforce a power cap in hardware.  If this is</div><div class='del'>-the case, the power[1-*]_cap and related sysfs files will appear.  When the</div><div class='add'>+the case, the `power[1-*]_cap` and related sysfs files will appear.  When the</div><div class='ctx'> average power consumption exceeds the cap, an ACPI event will be broadcast on</div><div class='ctx'> the netlink event socket and a poll notification will be sent to the</div><div class='del'>-appropriate power[1-*]_alarm file to indicate that capping has begun, and the</div><div class='add'>+appropriate `power[1-*]_alarm` file to indicate that capping has begun, and the</div><div class='ctx'> hardware has taken action to reduce power consumption.  Most likely this will</div><div class='ctx'> result in reduced performance.</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +49,6 @@ all cases the ACPI event will be broadcast on the ACPI netlink event socket as</div><div class='ctx'> well as sent as a poll notification to a sysfs file.  The events are as</div><div class='ctx'> follows:</div><div class='ctx'> </div><div class='del'>-power[1-*]_cap will be notified if the firmware changes the power cap.</div><div class='del'>-power[1-*]_interval will be notified if the firmware changes the averaging</div><div class='add'>+`power[1-*]_cap` will be notified if the firmware changes the power cap.</div><div class='add'>+`power[1-*]_interval` will be notified if the firmware changes the averaging</div><div class='ctx'> interval.</div><div class='head'>diff --git a/Documentation/hwmon/ad7314 b/Documentation/hwmon/ad7314.rst<br/>index 1912549c7467..bf389736bcd1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ad7314?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ad7314</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ad7314.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ad7314.rst</a></div><div class='hunk'>@@ -2,14 +2,23 @@ Kernel driver ad7314</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>    * Analog Devices AD7314</div><div class='add'>+</div><div class='ctx'>      Prefix: 'ad7314'</div><div class='add'>+</div><div class='ctx'>      Datasheet: Publicly available at Analog Devices website.</div><div class='add'>+</div><div class='ctx'>    * Analog Devices ADT7301</div><div class='add'>+</div><div class='ctx'>      Prefix: 'adt7301'</div><div class='add'>+</div><div class='ctx'>      Datasheet: Publicly available at Analog Devices website.</div><div class='add'>+</div><div class='ctx'>    * Analog Devices ADT7302</div><div class='add'>+</div><div class='ctx'>      Prefix: 'adt7302'</div><div class='add'>+</div><div class='ctx'>      Datasheet: Publicly available at Analog Devices website.</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='head'>diff --git a/Documentation/hwmon/adc128d818 b/Documentation/hwmon/adc128d818.rst<br/>index 39c95004dabc..6753468932ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adc128d818?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adc128d818</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adc128d818.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adc128d818.rst</a></div><div class='hunk'>@@ -2,11 +2,14 @@ Kernel driver adc128d818</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments ADC818D818</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adc818d818'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x1d, 0x1e, 0x1f, 0x2d, 0x2e, 0x2f</div><div class='del'>-    Datasheet: Publicly available at the TI website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+    Datasheet: Publicly available at the TI website http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/adm1021 b/Documentation/hwmon/adm1021.rst<br/>index 02ad96cf9b2b..6cbb0f75fe00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1021?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1021</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1021.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adm1021.rst</a></div><div class='hunk'>@@ -2,51 +2,91 @@ Kernel driver adm1021</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1021</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1021'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1021A/ADM1023</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1023'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='add'>+</div><div class='ctx'>   * Genesys Logic GL523SM</div><div class='add'>+</div><div class='ctx'>     Prefix: 'gl523sm'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX1617</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max1617'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX1617A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max1617a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM84</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm84'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='add'>+</div><div class='ctx'>   * Philips NE1617</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max1617' (probably detected as a max1617)</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Philips website</div><div class='add'>+</div><div class='ctx'>   * Philips NE1617A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max1617' (probably detected as a max1617)</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Philips website</div><div class='add'>+</div><div class='ctx'>   * TI THMC10</div><div class='add'>+</div><div class='ctx'>     Prefix: 'thmc10'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the TI website</div><div class='add'>+</div><div class='ctx'>   * Onsemi MC1066</div><div class='add'>+</div><div class='ctx'>     Prefix: 'mc1066'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Onsemi website</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Philip Edelbrock &lt;phil@netroedge.com&gt;</div><div class='add'>+	- Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+	- Philip Edelbrock &lt;phil@netroedge.com&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='head'>diff --git a/Documentation/hwmon/adm1025 b/Documentation/hwmon/adm1025.rst<br/>index 99f05049c68a..283e65e348a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1025?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1025</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1025.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adm1025.rst</a></div><div class='hunk'>@@ -2,23 +2,32 @@ Kernel driver adm1025</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1025, ADM1025A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1025'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='add'>+</div><div class='ctx'>   * Philips NE1619</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ne1619'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Philips website</div><div class='ctx'> </div><div class='ctx'> The NE1619 presents some differences with the original ADM1025:</div><div class='add'>+</div><div class='ctx'>   * Only two possible addresses (0x2c - 0x2d).</div><div class='ctx'>   * No temperature offset register, but we don't use it anyway.</div><div class='ctx'>   * No INT mode for pin 16. We don't play with it anyway.</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Chen-Yuan Wu &lt;gwu@esoft.com&gt;,</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+	- Chen-Yuan Wu &lt;gwu@esoft.com&gt;,</div><div class='add'>+	- Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/adm1026 b/Documentation/hwmon/adm1026.rst<br/>index d8fabe0c23ac..35d63e6498a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1026?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1026</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1026.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adm1026.rst</a></div><div class='hunk'>@@ -3,28 +3,36 @@ Kernel driver adm1026</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='ctx'>   * Analog Devices ADM1026</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1026'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026</div><div class='add'>+</div><div class='add'>+	       http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Philip Pokorny &lt;ppokorny@penguincomputing.com&gt; for Penguin Computing</div><div class='del'>-        Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;</div><div class='add'>+	- Philip Pokorny &lt;ppokorny@penguincomputing.com&gt; for Penguin Computing</div><div class='add'>+	- Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * gpio_input: int array (min = 1, max = 17)</div><div class='del'>-  List of GPIO pins (0-16) to program as inputs</div><div class='add'>+    List of GPIO pins (0-16) to program as inputs</div><div class='add'>+</div><div class='ctx'> * gpio_output: int array (min = 1, max = 17)</div><div class='del'>-  List of GPIO pins (0-16) to program as outputs</div><div class='add'>+    List of GPIO pins (0-16) to program as outputs</div><div class='add'>+</div><div class='ctx'> * gpio_inverted: int array (min = 1, max = 17)</div><div class='del'>-  List of GPIO pins (0-16) to program as inverted</div><div class='add'>+    List of GPIO pins (0-16) to program as inverted</div><div class='add'>+</div><div class='ctx'> * gpio_normal: int array (min = 1, max = 17)</div><div class='del'>-  List of GPIO pins (0-16) to program as normal/non-inverted</div><div class='add'>+    List of GPIO pins (0-16) to program as normal/non-inverted</div><div class='add'>+</div><div class='ctx'> * gpio_fan: int array (min = 1, max = 8)</div><div class='del'>-  List of GPIO pins (0-7) to program as fan tachs</div><div class='add'>+    List of GPIO pins (0-7) to program as fan tachs</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='head'>diff --git a/Documentation/hwmon/adm1031 b/Documentation/hwmon/adm1031.rst<br/>index a143117c99cb..a677c3ab5574 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1031?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1031</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1031.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adm1031.rst</a></div><div class='hunk'>@@ -3,20 +3,28 @@ Kernel driver adm1031</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='ctx'>   * Analog Devices ADM1030</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1030'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c to 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/en/prod/0%2C2877%2CADM1030%2C00.html</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/en/prod/0%2C2877%2CADM1030%2C00.html</div><div class='ctx'> </div><div class='ctx'>   * Analog Devices ADM1031</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1031'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c to 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/en/prod/0%2C2877%2CADM1031%2C00.html</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/en/prod/0%2C2877%2CADM1031%2C00.html</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Alexandre d'Alton &lt;alex@alexdalton.org&gt;</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+	- Alexandre d'Alton &lt;alex@alexdalton.org&gt;</div><div class='add'>+	- Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/adm1275 b/Documentation/hwmon/adm1275.rst<br/>index 5e277b0d91ce..9a1913e5b4d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1275?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm1275</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm1275.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adm1275.rst</a></div><div class='hunk'>@@ -2,29 +2,53 @@ Kernel driver adm1275</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1075</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1075'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1075.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1272</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1272'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1272.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1275</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1275'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1275.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1276</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1276'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1278</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1278'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1278.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1293/ADM1294</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1293', 'adm1294'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.analog.com/media/en/technical-documentation/data-sheets/ADM1293_1294.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -44,7 +68,7 @@ integrated 12 bit analog-to-digital converter (ADC), accessed using a</div><div class='ctx'> PMBus interface.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -66,7 +90,7 @@ Platform data support</div><div class='ctx'> ---------------------</div><div class='ctx'> </div><div class='ctx'> The driver supports standard PMBus driver platform data. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -75,6 +99,7 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write, history reset</div><div class='ctx'> attributes are write-only, all other attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> inX_label		"vin1" or "vout1" depending on chip variant and</div><div class='ctx'> 			configuration. On ADM1075, ADM1293, and ADM1294,</div><div class='ctx'> 			vout1 reports the voltage on the VAUX pin.</div><div class='hunk'>@@ -120,3 +145,4 @@ temp1_reset_history	Write any value to reset history.</div><div class='ctx'> </div><div class='ctx'> 			Temperature attributes are supported on ADM1272 and</div><div class='ctx'> 			ADM1278.</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/adm9240 b/Documentation/hwmon/adm9240.rst<br/>index 9b174fc700cc..91063b0f4c6f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm9240?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adm9240</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adm9240.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adm9240.rst</a></div><div class='hunk'>@@ -2,30 +2,43 @@ Kernel driver adm9240</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM9240</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm9240'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-    http://www.analog.com/UploadedFiles/Data_Sheets/79857778ADM9240_0.pdf</div><div class='add'>+</div><div class='add'>+	http://www.analog.com/UploadedFiles/Data_Sheets/79857778ADM9240_0.pdf</div><div class='ctx'> </div><div class='ctx'>   * Dallas Semiconductor DS1780</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds1780'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Dallas Semiconductor (Maxim) website</div><div class='del'>-    http://pdfserv.maxim-ic.com/en/ds/DS1780.pdf</div><div class='add'>+</div><div class='add'>+	http://pdfserv.maxim-ic.com/en/ds/DS1780.pdf</div><div class='ctx'> </div><div class='ctx'>   * National Semiconductor LM81</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm81'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-    http://www.national.com/ds.cgi/LM/LM81.pdf</div><div class='add'>+</div><div class='add'>+	http://www.national.com/ds.cgi/LM/LM81.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-    Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-    Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='del'>-    Michiel Rook &lt;michiel@grendelproject.nl&gt;,</div><div class='del'>-    Grant Coady &lt;gcoady.lk@gmail.com&gt; with guidance</div><div class='del'>-        from Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+    - Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+    - Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='add'>+    - Michiel Rook &lt;michiel@grendelproject.nl&gt;,</div><div class='add'>+    - Grant Coady &lt;gcoady.lk@gmail.com&gt; with guidance</div><div class='add'>+      from Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Interface</div><div class='ctx'> ---------</div><div class='hunk'>@@ -87,11 +100,13 @@ rpm = (22500 * 60) / (count * divider)</div><div class='ctx'> Automatic fan clock divider</div><div class='ctx'> </div><div class='ctx'>   * User sets 0 to fan_min limit</div><div class='add'>+</div><div class='ctx'>     - low speed alarm is disabled</div><div class='ctx'>     - fan clock divider not changed</div><div class='ctx'>     - auto fan clock adjuster enabled for valid fan speed reading</div><div class='ctx'> </div><div class='ctx'>   * User sets fan_min limit too low</div><div class='add'>+</div><div class='ctx'>     - low speed alarm is enabled</div><div class='ctx'>     - fan clock divider set to max</div><div class='ctx'>     - fan_min set to register value 254 which corresponds</div><div class='hunk'>@@ -101,18 +116,20 @@ Automatic fan clock divider</div><div class='ctx'>     - auto fan clock adjuster disabled</div><div class='ctx'> </div><div class='ctx'>   * User sets reasonable fan speed</div><div class='add'>+</div><div class='ctx'>     - low speed alarm is enabled</div><div class='ctx'>     - fan clock divider set to suit fan_min</div><div class='ctx'>     - auto fan clock adjuster enabled: adjusts fan_min</div><div class='ctx'> </div><div class='ctx'>   * User sets unreasonably high low fan speed limit</div><div class='add'>+</div><div class='ctx'>     - resolution of the low speed limit may be reduced</div><div class='ctx'>     - alarm will be asserted</div><div class='ctx'>     - auto fan clock adjuster enabled: adjusts fan_min</div><div class='ctx'> </div><div class='del'>-    * fan speed may be displayed as zero until the auto fan clock divider</div><div class='del'>-      adjuster brings fan speed clock divider back into chip measurement</div><div class='del'>-      range, this will occur within a few measurement cycles.</div><div class='add'>+  * fan speed may be displayed as zero until the auto fan clock divider</div><div class='add'>+    adjuster brings fan speed clock divider back into chip measurement</div><div class='add'>+    range, this will occur within a few measurement cycles.</div><div class='ctx'> </div><div class='ctx'> Analog Output</div><div class='ctx'> -------------</div><div class='hunk'>@@ -122,16 +139,21 @@ power up or reset. This doesn't do much on the test Intel SE440BX-2.</div><div class='ctx'> </div><div class='ctx'> Voltage Monitor</div><div class='ctx'> </div><div class='add'>+^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='ctx'> Voltage (IN) measurement is internally scaled:</div><div class='ctx'> </div><div class='add'>+    === =========== =========== ========= ==========</div><div class='ctx'>     nr  label       nominal     maximum   resolution</div><div class='del'>-                      mV          mV         mV</div><div class='add'>+		      mV          mV         mV</div><div class='add'>+    === =========== =========== ========= ==========</div><div class='ctx'>     0   +2.5V        2500        3320       13.0</div><div class='ctx'>     1   Vccp1        2700        3600       14.1</div><div class='ctx'>     2   +3.3V        3300        4380       17.2</div><div class='ctx'>     3     +5V        5000        6640       26.0</div><div class='ctx'>     4    +12V       12000       15940       62.5</div><div class='ctx'>     5   Vccp2        2700        3600       14.1</div><div class='add'>+    === =========== =========== ========= ==========</div><div class='ctx'> </div><div class='ctx'> The reading is an unsigned 8-bit value, nominal voltage measurement is</div><div class='ctx'> represented by a reading of 192, being 3/4 of the measurement range.</div><div class='hunk'>@@ -159,8 +181,9 @@ Clear the CI latch by writing value 0 to the sysfs intrusion0_alarm file.</div><div class='ctx'> </div><div class='ctx'> Alarm flags reported as 16-bit word</div><div class='ctx'> </div><div class='add'>+    ===     =============       ==========================</div><div class='ctx'>     bit     label               comment</div><div class='del'>-    ---     -------------       --------------------------</div><div class='add'>+    ===     =============       ==========================</div><div class='ctx'>      0      +2.5 V_Error        high or low limit exceeded</div><div class='ctx'>      1      VCCP_Error          high or low limit exceeded</div><div class='ctx'>      2      +3.3 V_Error        high or low limit exceeded</div><div class='hunk'>@@ -171,6 +194,7 @@ Alarm flags reported as 16-bit word</div><div class='ctx'>      8      +12 V_Error         high or low limit exceeded</div><div class='ctx'>      9      VCCP2_Error         high or low limit exceeded</div><div class='ctx'>     12      Chassis_Error       CI pin went high</div><div class='add'>+    ===     =============       ==========================</div><div class='ctx'> </div><div class='ctx'> Remaining bits are reserved and thus undefined. It is important to note</div><div class='ctx'> that alarm bits may be cleared on read, user-space may latch alarms and</div><div class='head'>diff --git a/Documentation/hwmon/ads1015 b/Documentation/hwmon/ads1015.rst<br/>index 02d2a459385f..e0951c4e57bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ads1015?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ads1015</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ads1015.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ads1015.rst</a></div><div class='hunk'>@@ -2,17 +2,25 @@ Kernel driver ads1015</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments ADS1015</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ads1015'</div><div class='del'>-    Datasheet: Publicly available at the Texas Instruments website :</div><div class='del'>-               http://focus.ti.com/lit/ds/symlink/ads1015.pdf</div><div class='add'>+</div><div class='add'>+    Datasheet: Publicly available at the Texas Instruments website:</div><div class='add'>+</div><div class='add'>+	       http://focus.ti.com/lit/ds/symlink/ads1015.pdf</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments ADS1115</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ads1115'</div><div class='del'>-    Datasheet: Publicly available at the Texas Instruments website :</div><div class='del'>-               http://focus.ti.com/lit/ds/symlink/ads1115.pdf</div><div class='add'>+</div><div class='add'>+    Datasheet: Publicly available at the Texas Instruments website:</div><div class='add'>+</div><div class='add'>+	       http://focus.ti.com/lit/ds/symlink/ads1115.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Dirk Eibach, Guntermann &amp; Drunck GmbH &lt;eibach@gdsys.de&gt;</div><div class='add'>+	Dirk Eibach, Guntermann &amp; Drunck GmbH &lt;eibach@gdsys.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -24,14 +32,15 @@ This device is a 12/16-bit A-D converter with 4 inputs.</div><div class='ctx'> The inputs can be used single ended or in certain differential combinations.</div><div class='ctx'> </div><div class='ctx'> The inputs can be made available by 8 sysfs input files in0_input - in7_input:</div><div class='del'>-in0: Voltage over AIN0 and AIN1.</div><div class='del'>-in1: Voltage over AIN0 and AIN3.</div><div class='del'>-in2: Voltage over AIN1 and AIN3.</div><div class='del'>-in3: Voltage over AIN2 and AIN3.</div><div class='del'>-in4: Voltage over AIN0 and GND.</div><div class='del'>-in5: Voltage over AIN1 and GND.</div><div class='del'>-in6: Voltage over AIN2 and GND.</div><div class='del'>-in7: Voltage over AIN3 and GND.</div><div class='add'>+</div><div class='add'>+  - in0: Voltage over AIN0 and AIN1.</div><div class='add'>+  - in1: Voltage over AIN0 and AIN3.</div><div class='add'>+  - in2: Voltage over AIN1 and AIN3.</div><div class='add'>+  - in3: Voltage over AIN2 and AIN3.</div><div class='add'>+  - in4: Voltage over AIN0 and GND.</div><div class='add'>+  - in5: Voltage over AIN1 and GND.</div><div class='add'>+  - in6: Voltage over AIN2 and GND.</div><div class='add'>+  - in7: Voltage over AIN3 and GND.</div><div class='ctx'> </div><div class='ctx'> Which inputs are available can be configured using platform data or devicetree.</div><div class='ctx'> </div><div class='hunk'>@@ -42,29 +51,34 @@ Platform Data</div><div class='ctx'> </div><div class='ctx'> In linux/platform_data/ads1015.h platform data is defined, channel_data contains</div><div class='ctx'> configuration data for the used input combinations:</div><div class='add'>+</div><div class='ctx'> - pga is the programmable gain amplifier (values are full scale)</div><div class='del'>-  0: +/- 6.144 V</div><div class='del'>-  1: +/- 4.096 V</div><div class='del'>-  2: +/- 2.048 V</div><div class='del'>-  3: +/- 1.024 V</div><div class='del'>-  4: +/- 0.512 V</div><div class='del'>-  5: +/- 0.256 V</div><div class='add'>+</div><div class='add'>+    - 0: +/- 6.144 V</div><div class='add'>+    - 1: +/- 4.096 V</div><div class='add'>+    - 2: +/- 2.048 V</div><div class='add'>+    - 3: +/- 1.024 V</div><div class='add'>+    - 4: +/- 0.512 V</div><div class='add'>+    - 5: +/- 0.256 V</div><div class='add'>+</div><div class='ctx'> - data_rate in samples per second</div><div class='del'>-  0: 128</div><div class='del'>-  1: 250</div><div class='del'>-  2: 490</div><div class='del'>-  3: 920</div><div class='del'>-  4: 1600</div><div class='del'>-  5: 2400</div><div class='del'>-  6: 3300</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-struct ads1015_platform_data data = {</div><div class='add'>+</div><div class='add'>+    - 0: 128</div><div class='add'>+    - 1: 250</div><div class='add'>+    - 2: 490</div><div class='add'>+    - 3: 920</div><div class='add'>+    - 4: 1600</div><div class='add'>+    - 5: 2400</div><div class='add'>+    - 6: 3300</div><div class='add'>+</div><div class='add'>+Example::</div><div class='add'>+</div><div class='add'>+  struct ads1015_platform_data data = {</div><div class='ctx'> 	.channel_data = {</div><div class='ctx'> 		[2] = { .enabled = true, .pga = 1, .data_rate = 0 },</div><div class='ctx'> 		[4] = { .enabled = true, .pga = 4, .data_rate = 5 },</div><div class='ctx'> 	}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='ctx'> In this case only in2_input (FS +/- 4.096 V, 128 SPS) and in4_input</div><div class='ctx'> (FS +/- 0.512 V, 2400 SPS) would be created.</div><div class='head'>diff --git a/Documentation/hwmon/ads7828 b/Documentation/hwmon/ads7828.rst<br/>index f6e263e0f607..b830b490cfe4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ads7828?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ads7828</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ads7828.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ads7828.rst</a></div><div class='hunk'>@@ -2,20 +2,27 @@ Kernel driver ads7828</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments/Burr-Brown ADS7828</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ads7828'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website:</div><div class='del'>-               http://focus.ti.com/lit/ds/symlink/ads7828.pdf</div><div class='add'>+</div><div class='add'>+	       http://focus.ti.com/lit/ds/symlink/ads7828.pdf</div><div class='ctx'> </div><div class='ctx'>   * Texas Instruments ADS7830</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ads7830'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website:</div><div class='del'>-               http://focus.ti.com/lit/ds/symlink/ads7830.pdf</div><div class='add'>+</div><div class='add'>+	       http://focus.ti.com/lit/ds/symlink/ads7830.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Steve Hardy &lt;shardy@redhat.com&gt;</div><div class='del'>-        Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='del'>-        Guillaume Roguez &lt;guillaume.roguez@savoirfairelinux.com&gt;</div><div class='add'>+	- Steve Hardy &lt;shardy@redhat.com&gt;</div><div class='add'>+	- Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='add'>+	- Guillaume Roguez &lt;guillaume.roguez@savoirfairelinux.com&gt;</div><div class='ctx'> </div><div class='ctx'> Platform data</div><div class='ctx'> -------------</div><div class='hunk'>@@ -24,16 +31,16 @@ The ads7828 driver accepts an optional ads7828_platform_data structure (defined</div><div class='ctx'> in include/linux/platform_data/ads7828.h). The structure fields are:</div><div class='ctx'> </div><div class='ctx'> * diff_input: (bool) Differential operation</div><div class='del'>-  set to true for differential mode, false for default single ended mode.</div><div class='add'>+    set to true for differential mode, false for default single ended mode.</div><div class='ctx'> </div><div class='ctx'> * ext_vref: (bool) External reference</div><div class='del'>-  set to true if it operates with an external reference, false for default</div><div class='del'>-  internal reference.</div><div class='add'>+    set to true if it operates with an external reference, false for default</div><div class='add'>+    internal reference.</div><div class='ctx'> </div><div class='ctx'> * vref_mv: (unsigned int) Voltage reference</div><div class='del'>-  if using an external reference, set this to the reference voltage in mV,</div><div class='del'>-  otherwise it will default to the internal value (2500mV). This value will be</div><div class='del'>-  bounded with limits accepted by the chip, described in the datasheet.</div><div class='add'>+    if using an external reference, set this to the reference voltage in mV,</div><div class='add'>+    otherwise it will default to the internal value (2500mV). This value will be</div><div class='add'>+    bounded with limits accepted by the chip, described in the datasheet.</div><div class='ctx'> </div><div class='ctx'>  If no structure is provided, the configuration defaults to single ended</div><div class='ctx'>  operation and internal voltage reference (2.5V).</div><div class='head'>diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410.rst<br/>index 9817941e5f19..24caaa83c8ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7410?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7410</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7410.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adt7410.rst</a></div><div class='hunk'>@@ -2,26 +2,45 @@ Kernel driver adt7410</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7410</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7410'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: None</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf</div><div class='ctx'>   * Analog Devices ADT7420</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7420'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: None</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7310</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7310'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: None</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7320</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7320'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: None</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Hartmut Knaack &lt;knaack.h@gmx.de&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -61,13 +80,15 @@ The device is set to 16 bit resolution and comparator mode.</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-temp#_input		- temperature input</div><div class='del'>-temp#_min		- temperature minimum setpoint</div><div class='del'>-temp#_max		- temperature maximum setpoint</div><div class='del'>-temp#_crit		- critical temperature setpoint</div><div class='del'>-temp#_min_hyst		- hysteresis for temperature minimum (read-only)</div><div class='del'>-temp#_max_hyst		- hysteresis for temperature maximum (read/write)</div><div class='del'>-temp#_crit_hyst		- hysteresis for critical temperature (read-only)</div><div class='del'>-temp#_min_alarm		- temperature minimum alarm flag</div><div class='del'>-temp#_max_alarm		- temperature maximum alarm flag</div><div class='del'>-temp#_crit_alarm	- critical temperature alarm flag</div><div class='add'>+======================== ====================================================</div><div class='add'>+temp#_input		 temperature input</div><div class='add'>+temp#_min		 temperature minimum setpoint</div><div class='add'>+temp#_max		 temperature maximum setpoint</div><div class='add'>+temp#_crit		 critical temperature setpoint</div><div class='add'>+temp#_min_hyst		 hysteresis for temperature minimum (read-only)</div><div class='add'>+temp#_max_hyst		 hysteresis for temperature maximum (read/write)</div><div class='add'>+temp#_crit_hyst		 hysteresis for critical temperature (read-only)</div><div class='add'>+temp#_min_alarm		 temperature minimum alarm flag</div><div class='add'>+temp#_max_alarm		 temperature maximum alarm flag</div><div class='add'>+temp#_crit_alarm	 critical temperature alarm flag</div><div class='add'>+======================== ====================================================</div><div class='head'>diff --git a/Documentation/hwmon/adt7411 b/Documentation/hwmon/adt7411.rst<br/>index 1632960f9745..57ad16fb216a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7411?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7411</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7411.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adt7411.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver adt7411</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7411</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7411'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: 0x48, 0x4a, 0x4b</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='ctx'> </div><div class='ctx'> Author: Wolfram Sang (based on adt7470 by Darrick J. Wong)</div><div class='hunk'>@@ -26,15 +30,19 @@ Check the datasheet for details.</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-in0_input	- vdd voltage input</div><div class='del'>-in[1-8]_input	- analog 1-8 input</div><div class='del'>-temp1_input	- temperature input</div><div class='add'>+================ =================</div><div class='add'>+in0_input	 vdd voltage input</div><div class='add'>+in[1-8]_input	 analog 1-8 input</div><div class='add'>+temp1_input	 temperature input</div><div class='add'>+================ =================</div><div class='ctx'> </div><div class='ctx'> Besides standard interfaces, this driver adds (0 = off, 1 = on):</div><div class='ctx'> </div><div class='del'>-  adc_ref_vdd	- Use vdd as reference instead of 2.25 V</div><div class='del'>-  fast_sampling	- Sample at 22.5 kHz instead of 1.4 kHz, but drop filters</div><div class='del'>-  no_average	- Turn off averaging over 16 samples</div><div class='add'>+  ============== =======================================================</div><div class='add'>+  adc_ref_vdd	 Use vdd as reference instead of 2.25 V</div><div class='add'>+  fast_sampling	 Sample at 22.5 kHz instead of 1.4 kHz, but drop filters</div><div class='add'>+  no_average	 Turn off averaging over 16 samples</div><div class='add'>+  ============== =======================================================</div><div class='ctx'> </div><div class='ctx'> Notes</div><div class='ctx'> -----</div><div class='head'>diff --git a/Documentation/hwmon/adt7462 b/Documentation/hwmon/adt7462.rst<br/>index ec660b328275..139e19696188 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7462?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7462</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7462.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adt7462.rst</a></div><div class='hunk'>@@ -1,10 +1,14 @@</div><div class='ctx'> Kernel driver adt7462</div><div class='del'>-======================</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7462</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7462'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x58, 0x5C</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='ctx'> </div><div class='ctx'> Author: Darrick J. Wong</div><div class='hunk'>@@ -57,11 +61,10 @@ Besides standard interfaces driver adds the following:</div><div class='ctx'> * pwm#_auto_point1_pwm and temp#_auto_point1_temp and</div><div class='ctx'> * pwm#_auto_point2_pwm and temp#_auto_point2_temp -</div><div class='ctx'> </div><div class='del'>-point1: Set the pwm speed at a lower temperature bound.</div><div class='del'>-point2: Set the pwm speed at a higher temperature bound.</div><div class='add'>+  - point1: Set the pwm speed at a lower temperature bound.</div><div class='add'>+  - point2: Set the pwm speed at a higher temperature bound.</div><div class='ctx'> </div><div class='ctx'> The ADT7462 will scale the pwm between the lower and higher pwm speed when</div><div class='ctx'> the temperature is between the two temperature boundaries.  PWM values range</div><div class='ctx'> from 0 (off) to 255 (full speed).  Fan speed will be set to maximum when the</div><div class='ctx'> temperature sensor associated with the PWM control exceeds temp#_max.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/hwmon/adt7470 b/Documentation/hwmon/adt7470.rst<br/>index fe68e18a0c8d..d225f816e992 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7470?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7470</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7470.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adt7470.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver adt7470</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7470</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7470'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2C, 0x2E, 0x2F</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='ctx'> </div><div class='ctx'> Author: Darrick J. Wong</div><div class='hunk'>@@ -56,8 +60,8 @@ Besides standard interfaces driver adds the following:</div><div class='ctx'> * pwm#_auto_point1_pwm and pwm#_auto_point1_temp and</div><div class='ctx'> * pwm#_auto_point2_pwm and pwm#_auto_point2_temp -</div><div class='ctx'> </div><div class='del'>-point1: Set the pwm speed at a lower temperature bound.</div><div class='del'>-point2: Set the pwm speed at a higher temperature bound.</div><div class='add'>+  - point1: Set the pwm speed at a lower temperature bound.</div><div class='add'>+  - point2: Set the pwm speed at a higher temperature bound.</div><div class='ctx'> </div><div class='ctx'> The ADT7470 will scale the pwm between the lower and higher pwm speed when</div><div class='ctx'> the temperature is between the two temperature boundaries.  PWM values range</div><div class='head'>diff --git a/Documentation/hwmon/adt7475 b/Documentation/hwmon/adt7475.rst<br/>index 01b46b290532..ef3ea1ea9bc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7475?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/adt7475</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/adt7475.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/adt7475.rst</a></div><div class='hunk'>@@ -2,28 +2,44 @@ Kernel driver adt7475</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7473</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7473'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2C, 0x2D, 0x2E</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the On Semiconductors website</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7475</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7475'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2E</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the On Semiconductors website</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7476</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7476'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2C, 0x2D, 0x2E</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the On Semiconductors website</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7490</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7490'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2C, 0x2D, 0x2E</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the On Semiconductors website</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-	Jordan Crouse</div><div class='del'>-	Hans de Goede</div><div class='del'>-	Darrick J. Wong (documentation)</div><div class='del'>-	Jean Delvare</div><div class='add'>+	- Jordan Crouse</div><div class='add'>+	- Hans de Goede</div><div class='add'>+	- Darrick J. Wong (documentation)</div><div class='add'>+	- Jean Delvare</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -82,14 +98,16 @@ ADT7490:</div><div class='ctx'> Sysfs Mapping</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='del'>-     ADT7490     ADT7476     ADT7475   ADT7473</div><div class='del'>-     -------     -------     -------   -------</div><div class='add'>+==== =========== =========== ========= ==========</div><div class='add'>+in   ADT7490     ADT7476     ADT7475   ADT7473</div><div class='add'>+==== =========== =========== ========= ==========</div><div class='ctx'> in0  2.5VIN (22) 2.5VIN (22) -         -</div><div class='ctx'> in1  VCCP   (23) VCCP   (23) VCCP (14) VCCP (14)</div><div class='ctx'> in2  VCC    (4)  VCC    (4)  VCC  (4)  VCC  (3)</div><div class='ctx'> in3  5VIN   (20) 5VIN   (20)</div><div class='ctx'> in4  12VIN  (21) 12VIN  (21)</div><div class='ctx'> in5  VTT    (8)</div><div class='add'>+==== =========== =========== ========= ==========</div><div class='ctx'> </div><div class='ctx'> Special Features</div><div class='ctx'> ----------------</div><div class='hunk'>@@ -107,8 +125,8 @@ Fan Speed Control</div><div class='ctx'> </div><div class='ctx'> The driver exposes two trip points per PWM channel.</div><div class='ctx'> </div><div class='del'>-point1: Set the PWM speed at the lower temperature bound</div><div class='del'>-point2: Set the PWM speed at the higher temperature bound</div><div class='add'>+- point1: Set the PWM speed at the lower temperature bound</div><div class='add'>+- point2: Set the PWM speed at the higher temperature bound</div><div class='ctx'> </div><div class='ctx'> The ADT747x will scale the PWM linearly between the lower and higher PWM</div><div class='ctx'> speed when the temperature is between the two temperature boundaries.</div><div class='hunk'>@@ -123,12 +141,12 @@ the PWM control exceeds temp#_max.</div><div class='ctx'> </div><div class='ctx'> At Tmin - hysteresis the PWM output can either be off (0% duty cycle) or at the</div><div class='ctx'> minimum (i.e. auto_point1_pwm). This behaviour can be configured using the</div><div class='del'>-pwm[1-*]_stall_disable sysfs attribute. A value of 0 means the fans will shut</div><div class='add'>+`pwm[1-*]_stall_disable sysfs attribute`. A value of 0 means the fans will shut</div><div class='ctx'> off. A value of 1 means the fans will run at auto_point1_pwm.</div><div class='ctx'> </div><div class='ctx'> The responsiveness of the ADT747x to temperature changes can be configured.</div><div class='ctx'> This allows smoothing of the fan speed transition. To set the transition time</div><div class='del'>-set the value in ms in the temp[1-*]_smoothing sysfs attribute.</div><div class='add'>+set the value in ms in the `temp[1-*]_smoothing` sysfs attribute.</div><div class='ctx'> </div><div class='ctx'> Notes</div><div class='ctx'> -----</div><div class='head'>diff --git a/Documentation/hwmon/amc6821 b/Documentation/hwmon/amc6821.rst<br/>index ced8359c50f8..5ddb2849da90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/amc6821?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/amc6821</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/amc6821.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/amc6821.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver amc6821</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'> 	Texas Instruments AMC6821</div><div class='add'>+</div><div class='ctx'> 	Prefix: 'amc6821'</div><div class='add'>+</div><div class='ctx'> 	Addresses scanned: 0x18, 0x19, 0x1a, 0x2c, 0x2d, 0x2e, 0x4c, 0x4d, 0x4e</div><div class='add'>+</div><div class='ctx'> 	Datasheet: http://focus.ti.com/docs/prod/folders/print/amc6821.html</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='hunk'>@@ -21,10 +25,11 @@ The pwm can be controlled either from software or automatically.</div><div class='ctx'> </div><div class='ctx'> The driver provides the following sensor accesses in sysfs:</div><div class='ctx'> </div><div class='add'>+======================= ==      ===============================================</div><div class='ctx'> temp1_input		ro	on-chip temperature</div><div class='ctx'> temp1_min		rw	"</div><div class='ctx'> temp1_max		rw	"</div><div class='del'>-temp1_crit	 	rw	"</div><div class='add'>+temp1_crit		rw	"</div><div class='ctx'> temp1_min_alarm		ro	"</div><div class='ctx'> temp1_max_alarm		ro	"</div><div class='ctx'> temp1_crit_alarm	ro	"</div><div class='hunk'>@@ -32,16 +37,16 @@ temp1_crit_alarm	ro	"</div><div class='ctx'> temp2_input		ro	remote temperature</div><div class='ctx'> temp2_min		rw	"</div><div class='ctx'> temp2_max		rw	"</div><div class='del'>-temp2_crit	 	rw	"</div><div class='add'>+temp2_crit		rw	"</div><div class='ctx'> temp2_min_alarm		ro	"</div><div class='ctx'> temp2_max_alarm		ro	"</div><div class='ctx'> temp2_crit_alarm	ro	"</div><div class='ctx'> temp2_fault		ro	"</div><div class='ctx'> </div><div class='del'>-fan1_input	 	ro	tachometer speed</div><div class='add'>+fan1_input		ro	tachometer speed</div><div class='ctx'> fan1_min		rw	"</div><div class='ctx'> fan1_max		rw	"</div><div class='del'>-fan1_fault	 	ro	"</div><div class='add'>+fan1_fault		ro	"</div><div class='ctx'> fan1_div		rw	Fan divisor can be either 2 or 4.</div><div class='ctx'> </div><div class='ctx'> pwm1			rw	pwm1</div><div class='hunk'>@@ -87,6 +92,7 @@ temp2_auto_point3_temp	rw	Above this temperature fan runs at maximum</div><div class='ctx'> 				values which depend on temp2_auto_point2_temp</div><div class='ctx'> 				and pwm1_auto_point2_pwm. Read it out after</div><div class='ctx'> 				writing to get actual value.</div><div class='add'>+======================= ==      ===============================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Module parameters</div><div class='hunk'>@@ -97,6 +103,6 @@ load the module with: init=0.</div><div class='ctx'> </div><div class='ctx'> If your board BIOS doesn't initialize the chip, or you want</div><div class='ctx'> different settings, you can set the following parameters:</div><div class='del'>-init=1,</div><div class='del'>-pwminv: 0 default pwm output, 1 inverts pwm output.</div><div class='ctx'> </div><div class='add'>+- init=1,</div><div class='add'>+- pwminv: 0 default pwm output, 1 inverts pwm output.</div><div class='head'>diff --git a/Documentation/hwmon/asb100 b/Documentation/hwmon/asb100.rst<br/>index ab7365e139be..c2d5f97085fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/asb100?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/asb100</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/asb100.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/asb100.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver asb100</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported Chips:</div><div class='add'>+</div><div class='ctx'>   * Asus ASB100 and ASB100-A "Bach"</div><div class='add'>+</div><div class='ctx'>     Prefix: 'asb100'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2d</div><div class='add'>+</div><div class='ctx'>     Datasheet: none released</div><div class='ctx'> </div><div class='ctx'> Author: Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;</div><div class='hunk'>@@ -41,32 +45,29 @@ processor itself. It is a value in volts.</div><div class='ctx'> </div><div class='ctx'> Alarms: (TODO question marks indicate may or may not work)</div><div class='ctx'> </div><div class='del'>-0x0001 =&gt; in0 (?)</div><div class='del'>-0x0002 =&gt; in1 (?)</div><div class='del'>-0x0004 =&gt; in2</div><div class='del'>-0x0008 =&gt; in3</div><div class='del'>-0x0010 =&gt; temp1 (1)</div><div class='del'>-0x0020 =&gt; temp2</div><div class='del'>-0x0040 =&gt; fan1</div><div class='del'>-0x0080 =&gt; fan2</div><div class='del'>-0x0100 =&gt; in4</div><div class='del'>-0x0200 =&gt; in5 (?) (2)</div><div class='del'>-0x0400 =&gt; in6 (?) (2)</div><div class='del'>-0x0800 =&gt; fan3</div><div class='del'>-0x1000 =&gt; chassis switch</div><div class='del'>-0x2000 =&gt; temp3</div><div class='del'>-</div><div class='del'>-Alarm Notes:</div><div class='del'>-</div><div class='del'>-(1) This alarm will only trigger if the hysteresis value is 127C.</div><div class='del'>-I.e. it behaves the same as w83781d.</div><div class='del'>-</div><div class='del'>-(2) The min and max registers for these values appear to</div><div class='del'>-be read-only or otherwise stuck at 0x00.</div><div class='add'>+- 0x0001 =&gt; in0 (?)</div><div class='add'>+- 0x0002 =&gt; in1 (?)</div><div class='add'>+- 0x0004 =&gt; in2</div><div class='add'>+- 0x0008 =&gt; in3</div><div class='add'>+- 0x0010 =&gt; temp1 [1]_</div><div class='add'>+- 0x0020 =&gt; temp2</div><div class='add'>+- 0x0040 =&gt; fan1</div><div class='add'>+- 0x0080 =&gt; fan2</div><div class='add'>+- 0x0100 =&gt; in4</div><div class='add'>+- 0x0200 =&gt; in5 (?) [2]_</div><div class='add'>+- 0x0400 =&gt; in6 (?) [2]_</div><div class='add'>+- 0x0800 =&gt; fan3</div><div class='add'>+- 0x1000 =&gt; chassis switch</div><div class='add'>+- 0x2000 =&gt; temp3</div><div class='add'>+</div><div class='add'>+.. [1]	This alarm will only trigger if the hysteresis value is 127C.</div><div class='add'>+	I.e. it behaves the same as w83781d.</div><div class='add'>+</div><div class='add'>+.. [2]	The min and max registers for these values appear to</div><div class='add'>+	be read-only or otherwise stuck at 0x00.</div><div class='ctx'> </div><div class='ctx'> TODO:</div><div class='del'>-* Experiment with fan divisors &gt; 8.</div><div class='del'>-* Experiment with temp. sensor types.</div><div class='del'>-* Are there really 13 voltage inputs? Probably not...</div><div class='del'>-* Cleanups, no doubt...</div><div class='del'>-</div><div class='add'>+  * Experiment with fan divisors &gt; 8.</div><div class='add'>+  * Experiment with temp. sensor types.</div><div class='add'>+  * Are there really 13 voltage inputs? Probably not...</div><div class='add'>+  * Cleanups, no doubt...</div><div class='head'>diff --git a/Documentation/hwmon/asc7621 b/Documentation/hwmon/asc7621.rst<br/>index 7287be7e1f21..b5a9fad0f172 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/asc7621?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/asc7621</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/asc7621.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/asc7621.rst</a></div><div class='hunk'>@@ -1,10 +1,15 @@</div><div class='add'>+=====================</div><div class='ctx'> Kernel driver asc7621</div><div class='del'>-==================</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>     Andigilog aSC7621 and aSC7621a</div><div class='add'>+</div><div class='ctx'>     Prefix: 'asc7621'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.fairview5.com/linux/asc7621/asc7621.pdf</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='hunk'>@@ -73,8 +78,10 @@ Finally, we have added a tach disable function that turns off the tach</div><div class='ctx'> measurement system for individual tachs in order to save power. That is</div><div class='ctx'> in register 75h.</div><div class='ctx'> </div><div class='del'>---</div><div class='add'>+--------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> aSC7621 Product Description</div><div class='add'>+===========================</div><div class='ctx'> </div><div class='ctx'> The aSC7621 has a two wire digital interface compatible with SMBus 2.0.</div><div class='ctx'> Using a 10-bit ADC, the aSC7621 measures the temperature of two remote diode</div><div class='hunk'>@@ -102,6 +109,8 @@ System voltages of VCCP, 2.5V, 3.3V, 5.0V, and 12V motherboard power are</div><div class='ctx'> monitored efficiently with internal scaling resistors.</div><div class='ctx'> </div><div class='ctx'> Features</div><div class='add'>+--------</div><div class='add'>+</div><div class='ctx'> - Supports PECI interface and monitors internal and remote thermal diodes</div><div class='ctx'> - 2-wire, SMBus 2.0 compliant, serial interface</div><div class='ctx'> - 10-bit ADC</div><div class='hunk'>@@ -110,7 +119,7 @@ Features</div><div class='ctx'> - Noise filtering of temperature reading for fan speed control</div><div class='ctx'> - 0.25C digital temperature sensor resolution</div><div class='ctx'> - 3 PWM fan speed control outputs for 2-, 3- or 4-wire fans and up to 4 fan</div><div class='del'>-	tachometer inputs</div><div class='add'>+  tachometer inputs</div><div class='ctx'> - Enhanced measured temperature to Temperature Zone assignment.</div><div class='ctx'> - Provides high and low PWM frequency ranges</div><div class='ctx'> - 3 GPIO pins for custom use</div><div class='hunk'>@@ -123,17 +132,20 @@ Except where noted below, the sysfs entries created by this driver follow</div><div class='ctx'> the standards defined in "sysfs-interface".</div><div class='ctx'> </div><div class='ctx'> temp1_source</div><div class='add'>+	=	===============================================</div><div class='ctx'> 	0 	(default) peci_legacy = 0, Remote 1 Temperature</div><div class='del'>-			peci_legacy = 1, PECI Processor Temperature 0</div><div class='add'>+		peci_legacy = 1, PECI Processor Temperature 0</div><div class='ctx'> 	1 	Remote 1 Temperature</div><div class='ctx'> 	2 	Remote 2 Temperature</div><div class='ctx'> 	3 	Internal Temperature</div><div class='ctx'> 	4 	PECI Processor Temperature 0</div><div class='ctx'> 	5 	PECI Processor Temperature 1</div><div class='ctx'> 	6 	PECI Processor Temperature 2</div><div class='del'>-	7  PECI Processor Temperature 3</div><div class='add'>+	7	PECI Processor Temperature 3</div><div class='add'>+	=	===============================================</div><div class='ctx'> </div><div class='ctx'> temp2_source</div><div class='add'>+	=	===============================================</div><div class='ctx'> 	0 	(default) Internal Temperature</div><div class='ctx'> 	1 	Remote 1 Temperature</div><div class='ctx'> 	2 	Remote 2 Temperature</div><div class='hunk'>@@ -142,8 +154,10 @@ temp2_source</div><div class='ctx'> 	5 	PECI Processor Temperature 1</div><div class='ctx'> 	6 	PECI Processor Temperature 2</div><div class='ctx'> 	7 	PECI Processor Temperature 3</div><div class='add'>+	=	===============================================</div><div class='ctx'> </div><div class='ctx'> temp3_source</div><div class='add'>+	=	===============================================</div><div class='ctx'> 	0 	(default) Remote 2 Temperature</div><div class='ctx'> 	1 	Remote 1 Temperature</div><div class='ctx'> 	2 	Remote 2 Temperature</div><div class='hunk'>@@ -152,10 +166,12 @@ temp3_source</div><div class='ctx'> 	5 	PECI Processor Temperature 1</div><div class='ctx'> 	6 	PECI Processor Temperature 2</div><div class='ctx'> 	7 	PECI Processor Temperature 3</div><div class='add'>+	=	===============================================</div><div class='ctx'> </div><div class='ctx'> temp4_source</div><div class='add'>+	=	===============================================</div><div class='ctx'> 	0 	(default) peci_legacy = 0, PECI Processor Temperature 0</div><div class='del'>-			peci_legacy = 1, Remote 1 Temperature</div><div class='add'>+		peci_legacy = 1, Remote 1 Temperature</div><div class='ctx'> 	1 	Remote 1 Temperature</div><div class='ctx'> 	2 	Remote 2 Temperature</div><div class='ctx'> 	3 	Internal Temperature</div><div class='hunk'>@@ -163,58 +179,65 @@ temp4_source</div><div class='ctx'> 	5 	PECI Processor Temperature 1</div><div class='ctx'> 	6 	PECI Processor Temperature 2</div><div class='ctx'> 	7 	PECI Processor Temperature 3</div><div class='add'>+	=	===============================================</div><div class='ctx'> </div><div class='del'>-temp[1-4]_smoothing_enable</div><div class='del'>-temp[1-4]_smoothing_time</div><div class='add'>+temp[1-4]_smoothing_enable / temp[1-4]_smoothing_time</div><div class='ctx'> 	Smooths spikes in temp readings caused by noise.</div><div class='ctx'> 	Valid values in milliseconds are:</div><div class='del'>-	35000</div><div class='del'>-	17600</div><div class='del'>-	11800</div><div class='del'>-	 7000</div><div class='del'>-	 4400</div><div class='del'>-	 3000</div><div class='del'>-	 1600</div><div class='del'>-	  800</div><div class='add'>+</div><div class='add'>+	* 35000</div><div class='add'>+	* 17600</div><div class='add'>+	* 11800</div><div class='add'>+	*  7000</div><div class='add'>+	*  4400</div><div class='add'>+	*  3000</div><div class='add'>+	*  1600</div><div class='add'>+	*   800</div><div class='ctx'> </div><div class='ctx'> temp[1-4]_crit</div><div class='ctx'> 	When the corresponding zone temperature reaches this value,</div><div class='ctx'> 	ALL pwm outputs will got to 100%.</div><div class='ctx'> </div><div class='del'>-temp[5-8]_input</div><div class='del'>-temp[5-8]_enable</div><div class='add'>+temp[5-8]_input / temp[5-8]_enable</div><div class='ctx'> 	The aSC7621 can also read temperatures provided by the processor</div><div class='ctx'> 	via the PECI bus.  Usually these are "core" temps and are relative</div><div class='ctx'> 	to the point where the automatic thermal control circuit starts</div><div class='ctx'> 	throttling.  This means that these are usually negative numbers.</div><div class='ctx'> </div><div class='ctx'> pwm[1-3]_enable</div><div class='add'>+	=============== ========================================================</div><div class='ctx'> 	0		Fan off.</div><div class='ctx'> 	1		Fan on manual control.</div><div class='ctx'> 	2		Fan on automatic control and will run at the minimum pwm</div><div class='del'>-				if the temperature for the zone is below the minimum.</div><div class='del'>-	3		Fan on automatic control but will be off if the temperature</div><div class='del'>-				for the zone is below the minimum.</div><div class='del'>-	4-254	Ignored.</div><div class='add'>+			if the temperature for the zone is below the minimum.</div><div class='add'>+	3		Fan on automatic control but will be off if the</div><div class='add'>+			temperature for the zone is below the minimum.</div><div class='add'>+	4-254		Ignored.</div><div class='ctx'> 	255		Fan on full.</div><div class='add'>+	=============== ========================================================</div><div class='ctx'> </div><div class='ctx'> pwm[1-3]_auto_channels</div><div class='ctx'> 	Bitmap as described in sysctl-interface with the following</div><div class='ctx'> 	exceptions...</div><div class='add'>+</div><div class='ctx'> 	Only the following combination of zones (and their corresponding masks)</div><div class='ctx'> 	are valid:</div><div class='del'>-	1</div><div class='del'>-	2</div><div class='del'>-	3</div><div class='del'>-	2,3</div><div class='del'>-	1,2,3</div><div class='del'>-	4</div><div class='del'>-	1,2,3,4</div><div class='ctx'> </div><div class='del'>-	Special values:</div><div class='del'>-	0			Disabled.</div><div class='del'>-	16		Fan on manual control.</div><div class='del'>-	31		Fan on full.</div><div class='add'>+	* 1</div><div class='add'>+	* 2</div><div class='add'>+	* 3</div><div class='add'>+	* 2,3</div><div class='add'>+	* 1,2,3</div><div class='add'>+	* 4</div><div class='add'>+	* 1,2,3,4</div><div class='add'>+</div><div class='add'>+	* Special values:</div><div class='add'>+</div><div class='add'>+	  ==		======================</div><div class='add'>+	  0		Disabled.</div><div class='add'>+	  16		Fan on manual control.</div><div class='add'>+	  31		Fan on full.</div><div class='add'>+	  ==		======================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> pwm[1-3]_invert</div><div class='hunk'>@@ -226,22 +249,22 @@ pwm[1-3]_freq</div><div class='ctx'> 	PWM frequency in Hz</div><div class='ctx'> 	Valid values in Hz are:</div><div class='ctx'> </div><div class='del'>-	10</div><div class='del'>-	15</div><div class='del'>-	23</div><div class='del'>-	30  (default)</div><div class='del'>-	38</div><div class='del'>-	47</div><div class='del'>-	62</div><div class='del'>-	94</div><div class='del'>-	23000</div><div class='del'>-	24000</div><div class='del'>-	25000</div><div class='del'>-	26000</div><div class='del'>-	27000</div><div class='del'>-	28000</div><div class='del'>-	29000</div><div class='del'>-	30000</div><div class='add'>+	* 10</div><div class='add'>+	* 15</div><div class='add'>+	* 23</div><div class='add'>+	* 30  (default)</div><div class='add'>+	* 38</div><div class='add'>+	* 47</div><div class='add'>+	* 62</div><div class='add'>+	* 94</div><div class='add'>+	* 23000</div><div class='add'>+	* 24000</div><div class='add'>+	* 25000</div><div class='add'>+	* 26000</div><div class='add'>+	* 27000</div><div class='add'>+	* 28000</div><div class='add'>+	* 29000</div><div class='add'>+	* 30000</div><div class='ctx'> </div><div class='ctx'> 	Setting any other value will be ignored.</div><div class='ctx'> </div><div class='hunk'>@@ -251,17 +274,17 @@ peci_enable</div><div class='ctx'> peci_avg</div><div class='ctx'> 	Input filter average time.</div><div class='ctx'> </div><div class='del'>-	0 	0 Sec. (no Smoothing) (default)</div><div class='del'>-	1 	0.25 Sec.</div><div class='del'>-	2 	0.5 Sec.</div><div class='del'>-	3 	1.0 Sec.</div><div class='del'>-	4 	2.0 Sec.</div><div class='del'>-	5 	4.0 Sec.</div><div class='del'>-	6 	8.0 Sec.</div><div class='del'>-	7 	0.0 Sec.</div><div class='add'>+	* 0 	0 Sec. (no Smoothing) (default)</div><div class='add'>+	* 1 	0.25 Sec.</div><div class='add'>+	* 2 	0.5 Sec.</div><div class='add'>+	* 3 	1.0 Sec.</div><div class='add'>+	* 4 	2.0 Sec.</div><div class='add'>+	* 5 	4.0 Sec.</div><div class='add'>+	* 6 	8.0 Sec.</div><div class='add'>+	* 7 	0.0 Sec.</div><div class='ctx'> </div><div class='ctx'> peci_legacy</div><div class='del'>-</div><div class='add'>+	=	============================================</div><div class='ctx'> 	0	Standard Mode (default)</div><div class='ctx'> 		Remote Diode 1 reading is associated with</div><div class='ctx'> 		Temperature Zone 1, PECI is associated with</div><div class='hunk'>@@ -270,10 +293,12 @@ peci_legacy</div><div class='ctx'> 	1	Legacy Mode</div><div class='ctx'> 		PECI is associated with Temperature Zone 1,</div><div class='ctx'> 		Remote Diode 1 is associated with Zone 4</div><div class='add'>+	=	============================================</div><div class='ctx'> </div><div class='ctx'> peci_diode</div><div class='ctx'> 	Diode filter</div><div class='ctx'> </div><div class='add'>+	=	====================</div><div class='ctx'> 	0	0.25 Sec.</div><div class='ctx'> 	1 	1.1 Sec.</div><div class='ctx'> 	2 	2.4 Sec.  (default)</div><div class='hunk'>@@ -282,15 +307,20 @@ peci_diode</div><div class='ctx'> 	5 	6.8 Sec.</div><div class='ctx'> 	6 	10.2 Sec.</div><div class='ctx'> 	7 	16.4 Sec.</div><div class='add'>+	=	====================</div><div class='ctx'> </div><div class='ctx'> peci_4domain</div><div class='ctx'> 	Four domain enable</div><div class='ctx'> </div><div class='add'>+	=	===============================================</div><div class='ctx'> 	0 	1 or 2 Domains for enabled processors (default)</div><div class='ctx'> 	1 	3 or 4 Domains for enabled processors</div><div class='add'>+	=	===============================================</div><div class='ctx'> </div><div class='ctx'> peci_domain</div><div class='ctx'> 	Domain</div><div class='ctx'> </div><div class='add'>+	=	==================================================</div><div class='ctx'> 	0 	Processor contains a single domain (0) 	 (default)</div><div class='ctx'> 	1 	Processor contains two domains (0,1)</div><div class='add'>+	=	==================================================</div><div class='head'>diff --git a/Documentation/hwmon/aspeed-pwm-tacho b/Documentation/hwmon/aspeed-pwm-tacho.rst<br/>index 7cfb34977460..6dcec845fbc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/aspeed-pwm-tacho?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/aspeed-pwm-tacho</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/aspeed-pwm-tacho.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/aspeed-pwm-tacho.rst</a></div><div class='hunk'>@@ -15,8 +15,10 @@ controller supports up to 16 tachometer inputs.</div><div class='ctx'> </div><div class='ctx'> The driver provides the following sensor accesses in sysfs:</div><div class='ctx'> </div><div class='add'>+=============== ======= =====================================================</div><div class='ctx'> fanX_input	ro	provide current fan rotation value in RPM as reported</div><div class='ctx'> 			by the fan to the device.</div><div class='ctx'> </div><div class='ctx'> pwmX		rw	get or set PWM fan control value. This is an integer</div><div class='ctx'> 			value between 0(off) and 255(full speed).</div><div class='add'>+=============== ======= =====================================================</div><div class='head'>diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp.rst<br/>index fec5a9bf755f..c609329e3bc4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/coretemp?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/coretemp</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/coretemp.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/coretemp.rst</a></div><div class='hunk'>@@ -3,20 +3,29 @@ Kernel driver coretemp</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='ctx'>   * All Intel Core family</div><div class='add'>+</div><div class='ctx'>     Prefix: 'coretemp'</div><div class='del'>-    CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),</div><div class='del'>-                              0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),</div><div class='del'>-                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),</div><div class='del'>-                              0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),</div><div class='del'>-                              0x36 (Cedar Trail Atom)</div><div class='del'>-    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual</div><div class='del'>-               Volume 3A: System Programming Guide</div><div class='del'>-               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm</div><div class='add'>+</div><div class='add'>+    CPUID: family 0x6, models</div><div class='add'>+</div><div class='add'>+			    - 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),</div><div class='add'>+			    - 0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),</div><div class='add'>+			    - 0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),</div><div class='add'>+			    - 0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),</div><div class='add'>+			    - 0x36 (Cedar Trail Atom)</div><div class='add'>+</div><div class='add'>+    Datasheet:</div><div class='add'>+</div><div class='add'>+	       Intel 64 and IA-32 Architectures Software Developer's Manual</div><div class='add'>+	       Volume 3A: System Programming Guide</div><div class='add'>+</div><div class='add'>+	       http://softwarecommunity.intel.com/Wiki/Mobility/720.htm</div><div class='ctx'> </div><div class='ctx'> Author: Rudolf Marek</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='add'>+</div><div class='ctx'> This driver permits reading the DTS (Digital Temperature Sensor) embedded</div><div class='ctx'> inside Intel CPUs. This driver can read both the per-core and per-package</div><div class='ctx'> temperature using the appropriate sensors. The per-package sensor is new;</div><div class='hunk'>@@ -35,14 +44,17 @@ may be raised, if the temperature grows enough (more than TjMax) to trigger</div><div class='ctx'> the Out-Of-Spec bit. Following table summarizes the exported sysfs files:</div><div class='ctx'> </div><div class='ctx'> All Sysfs entries are named with their core_id (represented here by 'X').</div><div class='del'>-tempX_input	 - Core temperature (in millidegrees Celsius).</div><div class='del'>-tempX_max	 - All cooling devices should be turned on (on Core2).</div><div class='del'>-tempX_crit	 - Maximum junction temperature (in millidegrees Celsius).</div><div class='del'>-tempX_crit_alarm - Set when Out-of-spec bit is set, never clears.</div><div class='del'>-		   Correct CPU operation is no longer guaranteed.</div><div class='del'>-tempX_label	 - Contains string "Core X", where X is processor</div><div class='del'>-		   number. For Package temp, this will be "Physical id Y",</div><div class='del'>-		   where Y is the package number.</div><div class='add'>+</div><div class='add'>+================= ========================================================</div><div class='add'>+tempX_input	  Core temperature (in millidegrees Celsius).</div><div class='add'>+tempX_max	  All cooling devices should be turned on (on Core2).</div><div class='add'>+tempX_crit	  Maximum junction temperature (in millidegrees Celsius).</div><div class='add'>+tempX_crit_alarm  Set when Out-of-spec bit is set, never clears.</div><div class='add'>+		  Correct CPU operation is no longer guaranteed.</div><div class='add'>+tempX_label	  Contains string "Core X", where X is processor</div><div class='add'>+		  number. For Package temp, this will be "Physical id Y",</div><div class='add'>+		  where Y is the package number.</div><div class='add'>+================= ========================================================</div><div class='ctx'> </div><div class='ctx'> On CPU models which support it, TjMax is read from a model-specific register.</div><div class='ctx'> On other models, it is set to an arbitrary value based on weak heuristics.</div><div class='hunk'>@@ -52,6 +64,7 @@ as a module parameter (tjmax).</div><div class='ctx'> Appendix A. Known TjMax lists (TBD):</div><div class='ctx'> Some information comes from ark.intel.com</div><div class='ctx'> </div><div class='add'>+=============== =============================================== ================</div><div class='ctx'> Process		Processor					TjMax(C)</div><div class='ctx'> </div><div class='ctx'> 22nm		Core i5/i7 Processors</div><div class='hunk'>@@ -179,3 +192,4 @@ Process		Processor					TjMax(C)</div><div class='ctx'> 65nm		Celeron Processors</div><div class='ctx'> 		T1700/1600					100</div><div class='ctx'> 		560/550/540/530					100</div><div class='add'>+=============== =============================================== ================</div><div class='head'>diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052.rst<br/>index 5bc51346b689..c1c0f1f08904 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/da9052?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/da9052</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/da9052.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/da9052.rst</a></div><div class='hunk'>@@ -1,6 +1,12 @@</div><div class='add'>+Kernel driver da9052</div><div class='add'>+====================</div><div class='add'>+</div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Dialog Semiconductors DA9052-BC and DA9053-AA/Bx PMICs</div><div class='add'>+</div><div class='ctx'>     Prefix: 'da9052'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Datasheet is not publicly available.</div><div class='ctx'> </div><div class='ctx'> Authors: David Dajun Chen &lt;dchen@diasemi.com&gt;</div><div class='hunk'>@@ -15,17 +21,20 @@ different inputs. The track and hold circuit ensures stable input voltages at</div><div class='ctx'> the input of the ADC during the conversion.</div><div class='ctx'> </div><div class='ctx'> The ADC is used to measure the following inputs:</div><div class='del'>-Channel 0: VDDOUT - measurement of the system voltage</div><div class='del'>-Channel 1: ICH - internal battery charger current measurement</div><div class='del'>-Channel 2: TBAT - output from the battery NTC</div><div class='del'>-Channel 3: VBAT - measurement of the battery voltage</div><div class='del'>-Channel 4: ADC_IN4 - high impedance input (0 - 2.5V)</div><div class='del'>-Channel 5: ADC_IN5 - high impedance input (0 - 2.5V)</div><div class='del'>-Channel 6: ADC_IN6 - high impedance input (0 - 2.5V)</div><div class='del'>-Channel 7: XY - TSI interface to measure the X and Y voltage of the touch</div><div class='del'>-	   screen resistive potentiometers</div><div class='del'>-Channel 8: Internal Tjunc. - sense (internal temp. sensor)</div><div class='del'>-Channel 9: VBBAT - measurement of the backup battery voltage</div><div class='add'>+</div><div class='add'>+========= ===================================================================</div><div class='add'>+Channel 0 VDDOUT - measurement of the system voltage</div><div class='add'>+Channel 1 ICH - internal battery charger current measurement</div><div class='add'>+Channel 2 TBAT - output from the battery NTC</div><div class='add'>+Channel 3 VBAT - measurement of the battery voltage</div><div class='add'>+Channel 4 ADC_IN4 - high impedance input (0 - 2.5V)</div><div class='add'>+Channel 5 ADC_IN5 - high impedance input (0 - 2.5V)</div><div class='add'>+Channel 6 ADC_IN6 - high impedance input (0 - 2.5V)</div><div class='add'>+Channel 7 XY - TSI interface to measure the X and Y voltage of the touch</div><div class='add'>+	  screen resistive potentiometers</div><div class='add'>+Channel 8 Internal Tjunc. - sense (internal temp. sensor)</div><div class='add'>+Channel 9 VBBAT - measurement of the backup battery voltage</div><div class='add'>+========= ===================================================================</div><div class='ctx'> </div><div class='ctx'> By using sysfs attributes we can measure the system voltage VDDOUT, the battery</div><div class='ctx'> charging current ICH, battery temperature TBAT, battery junction temperature</div><div class='hunk'>@@ -37,12 +46,15 @@ Voltage Monitoring</div><div class='ctx'> Voltages are sampled by a 10 bit ADC.</div><div class='ctx'> </div><div class='ctx'> The battery voltage is calculated as:</div><div class='add'>+</div><div class='ctx'> 	Milli volt = ((ADC value * 1000) / 512) + 2500</div><div class='ctx'> </div><div class='ctx'> The backup battery voltage is calculated as:</div><div class='add'>+</div><div class='ctx'> 	Milli volt = (ADC value * 2500) / 512;</div><div class='ctx'> </div><div class='ctx'> The voltages on ADC channels 4, 5 and 6 are calculated as:</div><div class='add'>+</div><div class='ctx'> 	Milli volt = (ADC value * 2500) / 1023</div><div class='ctx'> </div><div class='ctx'> Temperature Monitoring</div><div class='hunk'>@@ -52,10 +64,15 @@ Temperatures are sampled by a 10 bit ADC.  Junction and battery temperatures</div><div class='ctx'> are monitored by the ADC channels.</div><div class='ctx'> </div><div class='ctx'> The junction temperature is calculated:</div><div class='add'>+</div><div class='ctx'> 	Degrees celsius = 1.708 * (TJUNC_RES - T_OFFSET) - 108.8</div><div class='add'>+</div><div class='ctx'> The junction temperature attribute is supported by the driver.</div><div class='ctx'> </div><div class='ctx'> The battery temperature is calculated:</div><div class='del'>-	Degree Celsius = 1 / (t1 + 1/298)- 273</div><div class='add'>+</div><div class='add'>+	Degree Celsius = 1 / (t1 + 1/298) - 273</div><div class='add'>+</div><div class='ctx'> where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255))</div><div class='add'>+</div><div class='ctx'> Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively.</div><div class='head'>diff --git a/Documentation/hwmon/da9055 b/Documentation/hwmon/da9055.rst<br/>index 855c3f536e00..beae271a3312 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/da9055?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/da9055</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/da9055.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/da9055.rst</a></div><div class='hunk'>@@ -1,6 +1,11 @@</div><div class='add'>+Kernel driver da9055</div><div class='add'>+====================</div><div class='add'>+</div><div class='ctx'> Supported chips:</div><div class='ctx'>   * Dialog Semiconductors DA9055 PMIC</div><div class='add'>+</div><div class='ctx'>     Prefix: 'da9055'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Datasheet is not publicly available.</div><div class='ctx'> </div><div class='ctx'> Authors: David Dajun Chen &lt;dchen@diasemi.com&gt;</div><div class='hunk'>@@ -15,11 +20,12 @@ different inputs. The track and hold circuit ensures stable input voltages at</div><div class='ctx'> the input of the ADC during the conversion.</div><div class='ctx'> </div><div class='ctx'> The ADC is used to measure the following inputs:</div><div class='del'>-Channel 0: VDDOUT - measurement of the system voltage</div><div class='del'>-Channel 1: ADC_IN1 - high impedance input (0 - 2.5V)</div><div class='del'>-Channel 2: ADC_IN2 - high impedance input (0 - 2.5V)</div><div class='del'>-Channel 3: ADC_IN3 - high impedance input (0 - 2.5V)</div><div class='del'>-Channel 4: Internal Tjunc. - sense (internal temp. sensor)</div><div class='add'>+</div><div class='add'>+- Channel 0: VDDOUT - measurement of the system voltage</div><div class='add'>+- Channel 1: ADC_IN1 - high impedance input (0 - 2.5V)</div><div class='add'>+- Channel 2: ADC_IN2 - high impedance input (0 - 2.5V)</div><div class='add'>+- Channel 3: ADC_IN3 - high impedance input (0 - 2.5V)</div><div class='add'>+- Channel 4: Internal Tjunc. - sense (internal temp. sensor)</div><div class='ctx'> </div><div class='ctx'> By using sysfs attributes we can measure the system voltage VDDOUT,</div><div class='ctx'> chip junction temperature and auxiliary channels voltages.</div><div class='hunk'>@@ -31,9 +37,11 @@ Voltages are sampled in a AUTO mode it can be manually sampled too and results</div><div class='ctx'> are stored in a 10 bit ADC.</div><div class='ctx'> </div><div class='ctx'> The system voltage is calculated as:</div><div class='add'>+</div><div class='ctx'> 	Milli volt = ((ADC value * 1000) / 85) + 2500</div><div class='ctx'> </div><div class='ctx'> The voltages on ADC channels 1, 2 and 3 are calculated as:</div><div class='add'>+</div><div class='ctx'> 	Milli volt = (ADC value * 1000) / 102</div><div class='ctx'> </div><div class='ctx'> Temperature Monitoring</div><div class='hunk'>@@ -43,5 +51,7 @@ Temperatures are sampled by a 10 bit ADC.  Junction temperatures</div><div class='ctx'> are monitored by the ADC channels.</div><div class='ctx'> </div><div class='ctx'> The junction temperature is calculated:</div><div class='add'>+</div><div class='ctx'> 	Degrees celsius = -0.4084 * (ADC_RES - T_OFFSET) + 307.6332</div><div class='add'>+</div><div class='ctx'> The junction temperature attribute is supported by the driver.</div><div class='head'>diff --git a/Documentation/hwmon/dme1737 b/Documentation/hwmon/dme1737.rst<br/>index 4d2935145a1c..82fcbc6b2b43 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/dme1737?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/dme1737</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/dme1737.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/dme1737.rst</a></div><div class='hunk'>@@ -2,21 +2,37 @@ Kernel driver dme1737</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC DME1737 and compatibles (like Asus A8000)</div><div class='add'>+</div><div class='ctx'>     Prefix: 'dme1737'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Provided by SMSC upon request and under NDA</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH3112, SCH3114, SCH3116</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sch311x'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super-I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available on the Internet</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH5027</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sch5027'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Provided by SMSC upon request and under NDA</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH5127</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sch5127'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super-I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Provided by SMSC upon request and under NDA</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='hunk'>@@ -26,11 +42,14 @@ Authors:</div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='del'>-* force_start: bool	Enables the monitoring of voltage, fan and temp inputs</div><div class='add'>+* force_start: bool</div><div class='add'>+			Enables the monitoring of voltage, fan and temp inputs</div><div class='ctx'> 			and PWM output control functions. Using this parameter</div><div class='ctx'> 			shouldn't be required since the BIOS usually takes care</div><div class='ctx'> 			of this.</div><div class='del'>-* probe_all_addr: bool	Include non-standard LPC addresses 0x162e and 0x164e</div><div class='add'>+</div><div class='add'>+* probe_all_addr: bool</div><div class='add'>+			Include non-standard LPC addresses 0x162e and 0x164e</div><div class='ctx'> 			when probing for ISA devices. This is required for the</div><div class='ctx'> 			following boards:</div><div class='ctx'> 			- VIA EPIA SN18000</div><div class='hunk'>@@ -70,7 +89,8 @@ scaling resistors. The values returned by the driver therefore reflect true</div><div class='ctx'> millivolts and don't need scaling. The voltage inputs are mapped as follows</div><div class='ctx'> (the last column indicates the input ranges):</div><div class='ctx'> </div><div class='del'>-DME1737, A8000:</div><div class='add'>+DME1737, A8000::</div><div class='add'>+</div><div class='ctx'> 	in0: +5VTR	(+5V standby)		0V - 6.64V</div><div class='ctx'> 	in1: Vccp	(processor core)	0V - 3V</div><div class='ctx'> 	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='hunk'>@@ -79,7 +99,8 @@ DME1737, A8000:</div><div class='ctx'> 	in5: VTR	(+3.3V standby)		0V - 4.38V</div><div class='ctx'> 	in6: Vbat	(+3.0V)			0V - 4.38V</div><div class='ctx'> </div><div class='del'>-SCH311x:</div><div class='add'>+SCH311x::</div><div class='add'>+</div><div class='ctx'> 	in0: +2.5V				0V - 3.32V</div><div class='ctx'> 	in1: Vccp	(processor core)	0V - 2V</div><div class='ctx'> 	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='hunk'>@@ -88,7 +109,8 @@ SCH311x:</div><div class='ctx'> 	in5: VTR	(+3.3V standby)		0V - 4.38V</div><div class='ctx'> 	in6: Vbat	(+3.0V)			0V - 4.38V</div><div class='ctx'> </div><div class='del'>-SCH5027:</div><div class='add'>+SCH5027::</div><div class='add'>+</div><div class='ctx'> 	in0: +5VTR	(+5V standby)		0V - 6.64V</div><div class='ctx'> 	in1: Vccp	(processor core)	0V - 3V</div><div class='ctx'> 	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='hunk'>@@ -97,7 +119,8 @@ SCH5027:</div><div class='ctx'> 	in5: VTR	(+3.3V standby)		0V - 4.38V</div><div class='ctx'> 	in6: Vbat	(+3.0V)			0V - 4.38V</div><div class='ctx'> </div><div class='del'>-SCH5127:</div><div class='add'>+SCH5127::</div><div class='add'>+</div><div class='ctx'> 	in0: +2.5				0V - 3.32V</div><div class='ctx'> 	in1: Vccp	(processor core)	0V - 3V</div><div class='ctx'> 	in2: VCC	(internal +3.3V)	0V - 4.38V</div><div class='hunk'>@@ -119,7 +142,7 @@ Celsius. The chip also features offsets for all 3 temperature inputs which -</div><div class='ctx'> when programmed - get added to the input readings. The chip does all the</div><div class='ctx'> scaling by itself and the driver therefore reports true temperatures that don't</div><div class='ctx'> need any user-space adjustments. The temperature inputs are mapped as follows</div><div class='del'>-(the last column indicates the input ranges):</div><div class='add'>+(the last column indicates the input ranges)::</div><div class='ctx'> </div><div class='ctx'> 	temp1: Remote diode 1 (3904 type) temperature	-127C - +127C</div><div class='ctx'> 	temp2: DME1737 internal temperature		-127C - +127C</div><div class='hunk'>@@ -171,6 +194,7 @@ pwm[1-3]_auto_pwm_min, respectively. The thermal thresholds of the zones are</div><div class='ctx'> programmed via zone[1-3]_auto_point[1-3]_temp and</div><div class='ctx'> zone[1-3]_auto_point1_temp_hyst:</div><div class='ctx'> </div><div class='add'>+	=============================== =======================================</div><div class='ctx'> 	pwm[1-3]_auto_point2_pwm	full-speed duty-cycle (255, i.e., 100%)</div><div class='ctx'> 	pwm[1-3]_auto_point1_pwm	low-speed duty-cycle</div><div class='ctx'> 	pwm[1-3]_auto_pwm_min		min-speed duty-cycle</div><div class='hunk'>@@ -179,6 +203,7 @@ zone[1-3]_auto_point1_temp_hyst:</div><div class='ctx'> 	zone[1-3]_auto_point2_temp	full-speed temp</div><div class='ctx'> 	zone[1-3]_auto_point1_temp	low-speed temp</div><div class='ctx'> 	zone[1-3]_auto_point1_temp_hyst	min-speed temp</div><div class='add'>+	=============================== =======================================</div><div class='ctx'> </div><div class='ctx'> The chip adjusts the output duty-cycle linearly in the range of auto_point1_pwm</div><div class='ctx'> to auto_point2_pwm if the temperature of the associated zone is between</div><div class='hunk'>@@ -192,17 +217,21 @@ all PWM outputs are set to 100% duty-cycle.</div><div class='ctx'> Following is another representation of how the chip sets the output duty-cycle</div><div class='ctx'> based on the temperature of the associated thermal zone:</div><div class='ctx'> </div><div class='del'>-			Duty-Cycle	Duty-Cycle</div><div class='del'>-	Temperature	Rising Temp	Falling Temp</div><div class='del'>-	-----------	-----------	------------</div><div class='add'>+	=============== =============== =================</div><div class='add'>+	Temperature	Duty-Cycle	Duty-Cycle</div><div class='add'>+			Rising Temp	Falling Temp</div><div class='add'>+	=============== =============== =================</div><div class='ctx'> 	full-speed	full-speed	full-speed</div><div class='ctx'> </div><div class='del'>-			&lt; linearly adjusted duty-cycle &gt;</div><div class='add'>+	-		&lt; linearly	-</div><div class='add'>+			adjusted</div><div class='add'>+			duty-cycle &gt;</div><div class='ctx'> </div><div class='ctx'> 	low-speed	low-speed	low-speed</div><div class='del'>-			min-speed	low-speed</div><div class='add'>+	-		min-speed	low-speed</div><div class='ctx'> 	min-speed	min-speed	min-speed</div><div class='del'>-			min-speed	min-speed</div><div class='add'>+	-		min-speed	min-speed</div><div class='add'>+	=============== =============== =================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs Attributes</div><div class='hunk'>@@ -211,8 +240,9 @@ Sysfs Attributes</div><div class='ctx'> Following is a list of all sysfs attributes that the driver provides, their</div><div class='ctx'> permissions and a short description:</div><div class='ctx'> </div><div class='add'>+=============================== ======= =======================================</div><div class='ctx'> Name				Perm	Description</div><div class='del'>-----				----	-----------</div><div class='add'>+=============================== ======= =======================================</div><div class='ctx'> cpu0_vid			RO	CPU core reference voltage in</div><div class='ctx'> 					millivolts.</div><div class='ctx'> vrm				RW	Voltage regulator module version</div><div class='hunk'>@@ -242,9 +272,10 @@ temp[1-3]_fault			RO	Temp input fault. Returns 1 if the chip</div><div class='ctx'> zone[1-3]_auto_channels_temp	RO	Temperature zone to temperature input</div><div class='ctx'> 					mapping. This attribute is a bitfield</div><div class='ctx'> 					and supports the following values:</div><div class='del'>-						1: temp1</div><div class='del'>-						2: temp2</div><div class='del'>-						4: temp3</div><div class='add'>+</div><div class='add'>+						- 1: temp1</div><div class='add'>+						- 2: temp2</div><div class='add'>+						- 4: temp3</div><div class='ctx'> zone[1-3]_auto_point1_temp_hyst	RW	Auto PWM temp point1 hysteresis. The</div><div class='ctx'> 					output of the corresponding PWM is set</div><div class='ctx'> 					to the pwm_auto_min value if the temp</div><div class='hunk'>@@ -275,9 +306,10 @@ pmw[1-3,5-6]			RO/RW	Duty-cycle of PWM output. Supported</div><div class='ctx'> 					manual mode.</div><div class='ctx'> pwm[1-3]_enable			RW	Enable of PWM outputs 1-3. Supported</div><div class='ctx'> 					values are:</div><div class='del'>-						 0: turned off (output @ 100%)</div><div class='del'>-						 1: manual mode</div><div class='del'>-						 2: automatic mode</div><div class='add'>+</div><div class='add'>+						- 0: turned off (output @ 100%)</div><div class='add'>+						- 1: manual mode</div><div class='add'>+						- 2: automatic mode</div><div class='ctx'> pwm[5-6]_enable			RO	Enable of PWM outputs 5-6. Always</div><div class='ctx'> 					returns 1 since these 2 outputs are</div><div class='ctx'> 					hard-wired to manual mode.</div><div class='hunk'>@@ -294,11 +326,12 @@ pmw[1-3]_ramp_rate		RW	Ramp rate of PWM output. Determines how</div><div class='ctx'> pwm[1-3]_auto_channels_zone	RW	PWM output to temperature zone mapping.</div><div class='ctx'> 					This attribute is a bitfield and</div><div class='ctx'> 					supports the following values:</div><div class='del'>-						1: zone1</div><div class='del'>-						2: zone2</div><div class='del'>-						4: zone3</div><div class='del'>-						6: highest of zone[2-3]</div><div class='del'>-						7: highest of zone[1-3]</div><div class='add'>+</div><div class='add'>+						- 1: zone1</div><div class='add'>+						- 2: zone2</div><div class='add'>+						- 4: zone3</div><div class='add'>+						- 6: highest of zone[2-3]</div><div class='add'>+						- 7: highest of zone[1-3]</div><div class='ctx'> pwm[1-3]_auto_pwm_min		RW	Auto PWM min pwm. Minimum PWM duty-</div><div class='ctx'> 					cycle. Supported values are 0 or</div><div class='ctx'> 					auto_point1_pwm.</div><div class='hunk'>@@ -307,12 +340,14 @@ pwm[1-3]_auto_point1_pwm	RW	Auto PWM pwm point. Auto_point1 is the</div><div class='ctx'> pwm[1-3]_auto_point2_pwm	RO	Auto PWM pwm point. Auto_point2 is the</div><div class='ctx'> 					full-speed duty-cycle which is hard-</div><div class='ctx'> 					wired to 255 (100% duty-cycle).</div><div class='add'>+=============================== ======= =======================================</div><div class='ctx'> </div><div class='ctx'> Chip Differences</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+======================= ======= ======= ======= =======</div><div class='ctx'> Feature			dme1737	sch311x	sch5027	sch5127</div><div class='del'>--------------------------------------------------------</div><div class='add'>+======================= ======= ======= ======= =======</div><div class='ctx'> temp[1-3]_offset	yes	yes</div><div class='ctx'> vid			yes</div><div class='ctx'> zone3			yes	yes	yes</div><div class='hunk'>@@ -326,3 +361,4 @@ pwm5			opt		opt</div><div class='ctx'> fan6			opt		opt</div><div class='ctx'> pwm6			opt		opt</div><div class='ctx'> in7						yes</div><div class='add'>+======================= ======= ======= ======= =======</div><div class='head'>diff --git a/Documentation/hwmon/ds1621 b/Documentation/hwmon/ds1621.rst<br/>index fa3407997795..552b37e9dd34 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ds1621?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ds1621</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ds1621.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ds1621.rst</a></div><div class='hunk'>@@ -2,42 +2,61 @@ Kernel driver ds1621</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Dallas Semiconductor / Maxim Integrated DS1621</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds1621'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available from www.maximintegrated.com</div><div class='ctx'> </div><div class='ctx'>   * Dallas Semiconductor DS1625</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds1625'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available from www.datasheetarchive.com</div><div class='ctx'> </div><div class='ctx'>   * Maxim Integrated DS1631</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds1631'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available from www.maximintegrated.com</div><div class='ctx'> </div><div class='ctx'>   * Maxim Integrated DS1721</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds1721'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available from www.maximintegrated.com</div><div class='ctx'> </div><div class='ctx'>   * Maxim Integrated DS1731</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds1731'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available from www.maximintegrated.com</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Christian W. Zuckschwerdt &lt;zany@triq.net&gt;</div><div class='del'>-        valuable contributions by Jan M. Sendler &lt;sendler@sendler.de&gt;</div><div class='del'>-        ported to 2.6 by Aurelien Jarno &lt;aurelien@aurel32.net&gt;</div><div class='del'>-        with the help of Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+      - Christian W. Zuckschwerdt &lt;zany@triq.net&gt;</div><div class='add'>+      - valuable contributions by Jan M. Sendler &lt;sendler@sendler.de&gt;</div><div class='add'>+      - ported to 2.6 by Aurelien Jarno &lt;aurelien@aurel32.net&gt;</div><div class='add'>+	with the help of Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> ------------------</div><div class='ctx'> </div><div class='ctx'> * polarity int</div><div class='del'>-  Output's polarity: 0 = active high, 1 = active low</div><div class='add'>+  Output's polarity:</div><div class='add'>+</div><div class='add'>+  * 0 = active high,</div><div class='add'>+  * 1 = active low</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -87,28 +106,31 @@ are used internally, however, these flags do get set and cleared as the actual</div><div class='ctx'> temperature crosses the min or max settings (which by default are set to 75</div><div class='ctx'> and 80 degrees respectively).</div><div class='ctx'> </div><div class='del'>-Temperature Conversion:</div><div class='del'>------------------------</div><div class='del'>-DS1621 - 750ms (older devices may take up to 1000ms)</div><div class='del'>-DS1625 - 500ms</div><div class='del'>-DS1631 - 93ms..750ms for 9..12 bits resolution, respectively.</div><div class='del'>-DS1721 - 93ms..750ms for 9..12 bits resolution, respectively.</div><div class='del'>-DS1731 - 93ms..750ms for 9..12 bits resolution, respectively.</div><div class='add'>+Temperature Conversion</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+- DS1621 - 750ms (older devices may take up to 1000ms)</div><div class='add'>+- DS1625 - 500ms</div><div class='add'>+- DS1631 - 93ms..750ms for 9..12 bits resolution, respectively.</div><div class='add'>+- DS1721 - 93ms..750ms for 9..12 bits resolution, respectively.</div><div class='add'>+- DS1731 - 93ms..750ms for 9..12 bits resolution, respectively.</div><div class='ctx'> </div><div class='ctx'> Note:</div><div class='ctx'> On the DS1621, internal access to non-volatile registers may last for 10ms</div><div class='ctx'> or less (unverified on the other devices).</div><div class='ctx'> </div><div class='del'>-Temperature Accuracy:</div><div class='del'>----------------------</div><div class='del'>-DS1621: +/- 0.5 degree Celsius (from 0 to +70 degrees)</div><div class='del'>-DS1625: +/- 0.5 degree Celsius (from 0 to +70 degrees)</div><div class='del'>-DS1631: +/- 0.5 degree Celsius (from 0 to +70 degrees)</div><div class='del'>-DS1721: +/- 1.0 degree Celsius (from -10 to +85 degrees)</div><div class='del'>-DS1731: +/- 1.0 degree Celsius (from -10 to +85 degrees)</div><div class='add'>+Temperature Accuracy</div><div class='add'>+--------------------</div><div class='ctx'> </div><div class='del'>-Note:</div><div class='del'>-Please refer to the device datasheets for accuracy at other temperatures.</div><div class='add'>+- DS1621: +/- 0.5 degree Celsius (from 0 to +70 degrees)</div><div class='add'>+- DS1625: +/- 0.5 degree Celsius (from 0 to +70 degrees)</div><div class='add'>+- DS1631: +/- 0.5 degree Celsius (from 0 to +70 degrees)</div><div class='add'>+- DS1721: +/- 1.0 degree Celsius (from -10 to +85 degrees)</div><div class='add'>+- DS1731: +/- 1.0 degree Celsius (from -10 to +85 degrees)</div><div class='add'>+</div><div class='add'>+.. Note::</div><div class='add'>+</div><div class='add'>+   Please refer to the device datasheets for accuracy at other temperatures.</div><div class='ctx'> </div><div class='ctx'> Temperature Resolution:</div><div class='ctx'> -----------------------</div><div class='hunk'>@@ -117,60 +139,67 @@ support, which is achieved via the R0 and R1 config register bits, where:</div><div class='ctx'> </div><div class='ctx'> R0..R1</div><div class='ctx'> ------</div><div class='del'>- 0  0 =&gt; 9 bits, 0.5 degrees Celsius</div><div class='del'>- 1  0 =&gt; 10 bits, 0.25 degrees Celsius</div><div class='del'>- 0  1 =&gt; 11 bits, 0.125 degrees Celsius</div><div class='del'>- 1  1 =&gt; 12 bits, 0.0625 degrees Celsius</div><div class='ctx'> </div><div class='del'>-Note:</div><div class='del'>-At initial device power-on, the default resolution is set to 12-bits.</div><div class='add'>+== ==  ===============================</div><div class='add'>+R0 R1</div><div class='add'>+== ==  ===============================</div><div class='add'>+ 0  0  9 bits, 0.5 degrees Celsius</div><div class='add'>+ 1  0  10 bits, 0.25 degrees Celsius</div><div class='add'>+ 0  1  11 bits, 0.125 degrees Celsius</div><div class='add'>+ 1  1  12 bits, 0.0625 degrees Celsius</div><div class='add'>+== ==  ===============================</div><div class='add'>+</div><div class='add'>+.. Note::</div><div class='add'>+</div><div class='add'>+   At initial device power-on, the default resolution is set to 12-bits.</div><div class='ctx'> </div><div class='ctx'> The resolution mode for the DS1631, DS1721, or DS1731 can be changed from</div><div class='ctx'> userspace, via the device 'update_interval' sysfs attribute. This attribute</div><div class='ctx'> will normalize the range of input values to the device maximum resolution</div><div class='ctx'> values defined in the datasheet as follows:</div><div class='ctx'> </div><div class='add'>+============= ================== ===============</div><div class='ctx'> Resolution    Conversion Time    Input Range</div><div class='ctx'>  (C/LSB)       (msec)             (msec)</div><div class='del'>-------------------------------------------------</div><div class='add'>+============= ================== ===============</div><div class='ctx'> 0.5             93.75              0....94</div><div class='ctx'> 0.25            187.5              95...187</div><div class='ctx'> 0.125           375                188..375</div><div class='ctx'> 0.0625          750                376..infinity</div><div class='del'>-------------------------------------------------</div><div class='add'>+============= ================== ===============</div><div class='ctx'> </div><div class='ctx'> The following examples show how the 'update_interval' attribute can be</div><div class='del'>-used to change the conversion time:</div><div class='del'>-</div><div class='del'>-$ cat update_interval</div><div class='del'>-750</div><div class='del'>-$ cat temp1_input</div><div class='del'>-22062</div><div class='del'>-$</div><div class='del'>-$ echo 300 &gt; update_interval</div><div class='del'>-$ cat update_interval</div><div class='del'>-375</div><div class='del'>-$ cat temp1_input</div><div class='del'>-22125</div><div class='del'>-$</div><div class='del'>-$ echo 150 &gt; update_interval</div><div class='del'>-$ cat update_interval</div><div class='del'>-188</div><div class='del'>-$ cat temp1_input</div><div class='del'>-22250</div><div class='del'>-$</div><div class='del'>-$ echo 1 &gt; update_interval</div><div class='del'>-$ cat update_interval</div><div class='del'>-94</div><div class='del'>-$ cat temp1_input</div><div class='del'>-22000</div><div class='del'>-$</div><div class='del'>-$ echo 1000 &gt; update_interval</div><div class='del'>-$ cat update_interval</div><div class='del'>-750</div><div class='del'>-$ cat temp1_input</div><div class='del'>-22062</div><div class='del'>-$</div><div class='add'>+used to change the conversion time::</div><div class='add'>+</div><div class='add'>+  $ cat update_interval</div><div class='add'>+  750</div><div class='add'>+  $ cat temp1_input</div><div class='add'>+  22062</div><div class='add'>+  $</div><div class='add'>+  $ echo 300 &gt; update_interval</div><div class='add'>+  $ cat update_interval</div><div class='add'>+  375</div><div class='add'>+  $ cat temp1_input</div><div class='add'>+  22125</div><div class='add'>+  $</div><div class='add'>+  $ echo 150 &gt; update_interval</div><div class='add'>+  $ cat update_interval</div><div class='add'>+  188</div><div class='add'>+  $ cat temp1_input</div><div class='add'>+  22250</div><div class='add'>+  $</div><div class='add'>+  $ echo 1 &gt; update_interval</div><div class='add'>+  $ cat update_interval</div><div class='add'>+  94</div><div class='add'>+  $ cat temp1_input</div><div class='add'>+  22000</div><div class='add'>+  $</div><div class='add'>+  $ echo 1000 &gt; update_interval</div><div class='add'>+  $ cat update_interval</div><div class='add'>+  750</div><div class='add'>+  $ cat temp1_input</div><div class='add'>+  22062</div><div class='add'>+  $</div><div class='ctx'> </div><div class='ctx'> As shown, the ds1621 driver automatically adjusts the 'update_interval'</div><div class='ctx'> user input, via a step function. Reading back the 'update_interval' value</div><div class='hunk'>@@ -182,6 +211,7 @@ via the following function:</div><div class='ctx'>    g(x) = 0.5 * [minimum_conversion_time/x]</div><div class='ctx'> </div><div class='ctx'> where:</div><div class='del'>- -&gt; 'x' = the output from 'update_interval'</div><div class='del'>- -&gt; 'g(x)' = the resolution in degrees C per LSB.</div><div class='del'>- -&gt; 93.75ms = minimum conversion time</div><div class='add'>+</div><div class='add'>+ - 'x' = the output from 'update_interval'</div><div class='add'>+ - 'g(x)' = the resolution in degrees C per LSB.</div><div class='add'>+ - 93.75ms = minimum conversion time</div><div class='head'>diff --git a/Documentation/hwmon/ds620 b/Documentation/hwmon/ds620.rst<br/>index 1fbe3cd916cc..2d686b17b547 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ds620?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ds620</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ds620.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ds620.rst</a></div><div class='hunk'>@@ -2,15 +2,19 @@ Kernel driver ds620</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Dallas Semiconductor DS620</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ds620'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Dallas Semiconductor website</div><div class='del'>-               http://www.dalsemi.com/</div><div class='add'>+</div><div class='add'>+	       http://www.dalsemi.com/</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Roland Stigge &lt;stigge@antcom.de&gt;</div><div class='del'>-        based on ds1621.c by</div><div class='del'>-        Christian W. Zuckschwerdt &lt;zany@triq.net&gt;</div><div class='add'>+	Roland Stigge &lt;stigge@antcom.de&gt;</div><div class='add'>+	based on ds1621.c by</div><div class='add'>+	Christian W. Zuckschwerdt &lt;zany@triq.net&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/emc1403 b/Documentation/hwmon/emc1403.rst<br/>index a869b0ef6a9d..3a4913b63ef3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/emc1403?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/emc1403</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/emc1403.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/emc1403.rst</a></div><div class='hunk'>@@ -2,28 +2,48 @@ Kernel driver emc1403</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC / Microchip EMC1402, EMC1412</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x1c, 0x29, 0x4c, 0x4d, 0x5c</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc1402'</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='del'>-	http://ww1.microchip.com/downloads/en/DeviceDoc/1412.pdf</div><div class='del'>-	http://ww1.microchip.com/downloads/en/DeviceDoc/1402.pdf</div><div class='add'>+</div><div class='add'>+	- http://ww1.microchip.com/downloads/en/DeviceDoc/1412.pdf</div><div class='add'>+	- http://ww1.microchip.com/downloads/en/DeviceDoc/1402.pdf</div><div class='add'>+</div><div class='ctx'>   * SMSC / Microchip EMC1403, EMC1404, EMC1413, EMC1414</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x29, 0x4c, 0x4d</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc1403', 'emc1404'</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='del'>-	http://ww1.microchip.com/downloads/en/DeviceDoc/1403_1404.pdf</div><div class='del'>-	http://ww1.microchip.com/downloads/en/DeviceDoc/1413_1414.pdf</div><div class='add'>+</div><div class='add'>+	- http://ww1.microchip.com/downloads/en/DeviceDoc/1403_1404.pdf</div><div class='add'>+	- http://ww1.microchip.com/downloads/en/DeviceDoc/1413_1414.pdf</div><div class='add'>+</div><div class='ctx'>   * SMSC / Microchip EMC1422</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc1422'</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-	http://ww1.microchip.com/downloads/en/DeviceDoc/1422.pdf</div><div class='add'>+</div><div class='add'>+	- http://ww1.microchip.com/downloads/en/DeviceDoc/1422.pdf</div><div class='add'>+</div><div class='ctx'>   * SMSC / Microchip EMC1423, EMC1424</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc1423', 'emc1424'</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-	http://ww1.microchip.com/downloads/en/DeviceDoc/1423_1424.pdf</div><div class='add'>+</div><div class='add'>+	- http://ww1.microchip.com/downloads/en/DeviceDoc/1423_1424.pdf</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='ctx'>     Kalhan Trisal &lt;kalhan.trisal@intel.com</div><div class='hunk'>@@ -46,6 +66,7 @@ difference between the limit and its hysteresis is always the same for</div><div class='ctx'> all three limits.</div><div class='ctx'> </div><div class='ctx'> This implementation detail implies the following:</div><div class='add'>+</div><div class='ctx'> * When setting a limit, its hysteresis will automatically follow, the</div><div class='ctx'>   difference staying unchanged. For example, if the old critical limit</div><div class='ctx'>   was 80 degrees C, and the hysteresis was 75 degrees C, and you change</div><div class='head'>diff --git a/Documentation/hwmon/emc2103 b/Documentation/hwmon/emc2103.rst<br/>index a12b2c127140..6a6ca6d1b34e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/emc2103?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/emc2103</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/emc2103.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/emc2103.rst</a></div><div class='hunk'>@@ -2,13 +2,17 @@ Kernel driver emc2103</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC EMC2103</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2e</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc2103'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Steve Glendinning &lt;steve.glendinning@smsc.com&gt;</div><div class='add'>+	Steve Glendinning &lt;steve.glendinning@smsc.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/emc6w201 b/Documentation/hwmon/emc6w201.rst<br/>index 757629b12897..a8e1185b9bb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/emc6w201?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/emc6w201</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/emc6w201.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/emc6w201.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver emc6w201</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC EMC6W201</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc6w201'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='hunk'>@@ -38,5 +42,6 @@ Known Systems With EMC6W201</div><div class='ctx'> </div><div class='ctx'> The EMC6W201 is a rare device, only found on a few systems, made in</div><div class='ctx'> 2005 and 2006. Known systems with this device:</div><div class='add'>+</div><div class='ctx'> * Dell Precision 670 workstation</div><div class='ctx'> * Gigabyte 2CEWH mainboard</div><div class='head'>diff --git a/Documentation/hwmon/f71805f b/Documentation/hwmon/f71805f.rst<br/>index 48a356084bc6..1efe5e5d337c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/f71805f?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/f71805f</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/f71805f.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/f71805f.rst</a></div><div class='hunk'>@@ -2,17 +2,29 @@ Kernel driver f71805f</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Fintek F71805F/FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71805f'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71806F/FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71872f'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71872F/FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71872f'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='hunk'>@@ -64,24 +76,26 @@ you can only set the limits in steps of 32 mV (before scaling).</div><div class='ctx'> </div><div class='ctx'> The wirings and resistor values suggested by Fintek are as follow:</div><div class='ctx'> </div><div class='del'>-        pin                                           expected</div><div class='del'>-        name    use           R1      R2     divider  raw val.</div><div class='del'>-</div><div class='add'>+======= ======= =========== ==== ======= ============ ==============</div><div class='add'>+in      pin                                           expected</div><div class='add'>+	name    use           R1      R2     divider  raw val.</div><div class='add'>+======= ======= =========== ==== ======= ============ ==============</div><div class='ctx'> in0     VCC     VCC3.3V     int.    int.        2.00    1.65 V</div><div class='ctx'> in1     VIN1    VTT1.2V      10K       -        1.00    1.20 V</div><div class='del'>-in2     VIN2    VRAM        100K    100K        2.00   ~1.25 V (1)</div><div class='del'>-in3     VIN3    VCHIPSET     47K    100K        1.47    2.24 V (2)</div><div class='add'>+in2     VIN2    VRAM        100K    100K        2.00   ~1.25 V [1]_</div><div class='add'>+in3     VIN3    VCHIPSET     47K    100K        1.47    2.24 V [2]_</div><div class='ctx'> in4     VIN4    VCC5V       200K     47K        5.25    0.95 V</div><div class='ctx'> in5     VIN5    +12V        200K     20K       11.00    1.05 V</div><div class='ctx'> in6     VIN6    VCC1.5V      10K       -        1.00    1.50 V</div><div class='del'>-in7     VIN7    VCORE        10K       -        1.00   ~1.40 V (1)</div><div class='add'>+in7     VIN7    VCORE        10K       -        1.00   ~1.40 V [1]_</div><div class='ctx'> in8     VIN8    VSB5V       200K     47K        1.00    0.95 V</div><div class='del'>-in10    VSB     VSB3.3V     int.    int.        2.00    1.65 V (3)</div><div class='del'>-in9     VBAT    VBATTERY    int.    int.        2.00    1.50 V (3)</div><div class='add'>+in10    VSB     VSB3.3V     int.    int.        2.00    1.65 V [3]_</div><div class='add'>+in9     VBAT    VBATTERY    int.    int.        2.00    1.50 V [3]_</div><div class='add'>+======= ======= =========== ==== ======= ============ ==============</div><div class='ctx'> </div><div class='del'>-(1) Depends on your hardware setup.</div><div class='del'>-(2) Obviously not correct, swapping R1 and R2 would make more sense.</div><div class='del'>-(3) F71872F/FG only.</div><div class='add'>+.. [1] Depends on your hardware setup.</div><div class='add'>+.. [2] Obviously not correct, swapping R1 and R2 would make more sense.</div><div class='add'>+.. [3] F71872F/FG only.</div><div class='ctx'> </div><div class='ctx'> These values can be used as hints at best, as motherboard manufacturers</div><div class='ctx'> are free to use a completely different setup. As a matter of fact, the</div><div class='head'>diff --git a/Documentation/hwmon/f71882fg b/Documentation/hwmon/f71882fg.rst<br/>index 4c3cb8377d74..5c0b7b0db150 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/f71882fg?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/f71882fg</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/f71882fg.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/f71882fg.rst</a></div><div class='hunk'>@@ -2,60 +2,114 @@ Kernel driver f71882fg</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Fintek F71808E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71808e'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='add'>+</div><div class='ctx'>   * Fintek F71808A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71808a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='add'>+</div><div class='ctx'>   * Fintek F71858FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71858fg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71862FG and F71863FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71862fg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71869F and F71869E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71869'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71869A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71869a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='add'>+</div><div class='ctx'>   * Fintek F71882FG and F71883FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71882fg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71889FG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71889fg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='add'>+</div><div class='ctx'>   * Fintek F71889ED</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71889ed'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Should become available on the Fintek website soon</div><div class='add'>+</div><div class='ctx'>   * Fintek F71889A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71889a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Should become available on the Fintek website soon</div><div class='add'>+</div><div class='ctx'>   * Fintek F8000</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f8000'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='add'>+</div><div class='ctx'>   * Fintek F81801U</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f71889fg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='del'>-    Note: This is the 64-pin variant of the F71889FG, they have the</div><div class='add'>+</div><div class='add'>+    Note:</div><div class='add'>+	  This is the 64-pin variant of the F71889FG, they have the</div><div class='ctx'> 	  same device ID and are fully compatible as far as hardware</div><div class='ctx'> 	  monitoring is concerned.</div><div class='add'>+</div><div class='ctx'>   * Fintek F81865F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'f81865f'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Fintek website</div><div class='ctx'> </div><div class='ctx'> Author: Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='head'>diff --git a/Documentation/hwmon/fam15h_power b/Documentation/hwmon/fam15h_power.rst<br/>index fb594c281c46..fdde632c93a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/fam15h_power?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/fam15h_power</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/fam15h_power.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/fam15h_power.rst</a></div><div class='hunk'>@@ -2,15 +2,20 @@ Kernel driver fam15h_power</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'> * AMD Family 15h Processors</div><div class='add'>+</div><div class='ctx'> * AMD Family 16h Processors</div><div class='ctx'> </div><div class='ctx'>   Prefix: 'fam15h_power'</div><div class='add'>+</div><div class='ctx'>   Addresses scanned: PCI space</div><div class='add'>+</div><div class='ctx'>   Datasheets:</div><div class='del'>-  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors</div><div class='del'>-  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 16h Processors</div><div class='del'>-  AMD64 Architecture Programmer's Manual Volume 2: System Programming</div><div class='add'>+</div><div class='add'>+  - BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors</div><div class='add'>+  - BIOS and Kernel Developer's Guide (BKDG) For AMD Family 16h Processors</div><div class='add'>+  - AMD64 Architecture Programmer's Manual Volume 2: System Programming</div><div class='ctx'> </div><div class='ctx'> Author: Andreas Herrmann &lt;herrmann.der.user@googlemail.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,14 +36,19 @@ For AMD Family 15h and 16h processors the following power values can</div><div class='ctx'> be calculated using different processor northbridge function</div><div class='ctx'> registers:</div><div class='ctx'> </div><div class='del'>-* BasePwrWatts: Specifies in watts the maximum amount of power</div><div class='del'>-  consumed by the processor for NB and logic external to the core.</div><div class='del'>-* ProcessorPwrWatts: Specifies in watts the maximum amount of power</div><div class='del'>-  the processor can support.</div><div class='del'>-* CurrPwrWatts: Specifies in watts the current amount of power being</div><div class='del'>-  consumed by the processor.</div><div class='add'>+* BasePwrWatts:</div><div class='add'>+    Specifies in watts the maximum amount of power</div><div class='add'>+    consumed by the processor for NB and logic external to the core.</div><div class='add'>+</div><div class='add'>+* ProcessorPwrWatts:</div><div class='add'>+    Specifies in watts the maximum amount of power</div><div class='add'>+    the processor can support.</div><div class='add'>+* CurrPwrWatts:</div><div class='add'>+    Specifies in watts the current amount of power being</div><div class='add'>+    consumed by the processor.</div><div class='ctx'> </div><div class='ctx'> This driver provides ProcessorPwrWatts and CurrPwrWatts:</div><div class='add'>+</div><div class='ctx'> * power1_crit (ProcessorPwrWatts)</div><div class='ctx'> * power1_input (CurrPwrWatts)</div><div class='ctx'> </div><div class='hunk'>@@ -53,35 +63,53 @@ calculate the average power consumed by a processor during a</div><div class='ctx'> measurement interval Tm. The feature of accumulated power mechanism is</div><div class='ctx'> indicated by CPUID Fn8000_0007_EDX[12].</div><div class='ctx'> </div><div class='del'>-* Tsample: compute unit power accumulator sample period</div><div class='del'>-* Tref: the PTSC counter period</div><div class='del'>-* PTSC: performance timestamp counter</div><div class='del'>-* N: the ratio of compute unit power accumulator sample period to the</div><div class='del'>-  PTSC period</div><div class='del'>-* Jmax: max compute unit accumulated power which is indicated by</div><div class='del'>-  MaxCpuSwPwrAcc MSR C001007b</div><div class='del'>-* Jx/Jy: compute unit accumulated power which is indicated by</div><div class='del'>-  CpuSwPwrAcc MSR C001007a</div><div class='del'>-* Tx/Ty: the value of performance timestamp counter which is indicated</div><div class='del'>-  by CU_PTSC MSR C0010280</div><div class='del'>-* PwrCPUave: CPU average power</div><div class='add'>+* Tsample:</div><div class='add'>+	compute unit power accumulator sample period</div><div class='add'>+</div><div class='add'>+* Tref:</div><div class='add'>+	the PTSC counter period</div><div class='add'>+</div><div class='add'>+* PTSC:</div><div class='add'>+	performance timestamp counter</div><div class='add'>+</div><div class='add'>+* N:</div><div class='add'>+	the ratio of compute unit power accumulator sample period to the</div><div class='add'>+	PTSC period</div><div class='add'>+</div><div class='add'>+* Jmax:</div><div class='add'>+	max compute unit accumulated power which is indicated by</div><div class='add'>+	MaxCpuSwPwrAcc MSR C001007b</div><div class='add'>+</div><div class='add'>+* Jx/Jy:</div><div class='add'>+	compute unit accumulated power which is indicated by</div><div class='add'>+	CpuSwPwrAcc MSR C001007a</div><div class='add'>+* Tx/Ty:</div><div class='add'>+	the value of performance timestamp counter which is indicated</div><div class='add'>+	by CU_PTSC MSR C0010280</div><div class='add'>+</div><div class='add'>+* PwrCPUave:</div><div class='add'>+	CPU average power</div><div class='ctx'> </div><div class='ctx'> i. Determine the ratio of Tsample to Tref by executing CPUID Fn8000_0007.</div><div class='add'>+</div><div class='ctx'> 	N = value of CPUID Fn8000_0007_ECX[CpuPwrSampleTimeRatio[15:0]].</div><div class='ctx'> </div><div class='ctx'> ii. Read the full range of the cumulative energy value from the new</div><div class='del'>-MSR MaxCpuSwPwrAcc.</div><div class='add'>+    MSR MaxCpuSwPwrAcc.</div><div class='add'>+</div><div class='ctx'> 	Jmax = value returned.</div><div class='add'>+</div><div class='ctx'> iii. At time x, SW reads CpuSwPwrAcc MSR and samples the PTSC.</div><div class='del'>-	Jx = value read from CpuSwPwrAcc and Tx = value read from</div><div class='del'>-PTSC.</div><div class='add'>+</div><div class='add'>+	Jx = value read from CpuSwPwrAcc and Tx = value read from PTSC.</div><div class='ctx'> </div><div class='ctx'> iv. At time y, SW reads CpuSwPwrAcc MSR and samples the PTSC.</div><div class='del'>-	Jy = value read from CpuSwPwrAcc and Ty = value read from</div><div class='del'>-PTSC.</div><div class='add'>+</div><div class='add'>+	Jy = value read from CpuSwPwrAcc and Ty = value read from PTSC.</div><div class='ctx'> </div><div class='ctx'> v. Calculate the average power consumption for a compute unit over</div><div class='del'>-time period (y-x). Unit of result is uWatt.</div><div class='add'>+   time period (y-x). Unit of result is uWatt::</div><div class='add'>+</div><div class='ctx'> 	if (Jy &lt; Jx) // Rollover has occurred</div><div class='ctx'> 		Jdelta = (Jy + Jmax) - Jx</div><div class='ctx'> 	else</div><div class='hunk'>@@ -90,13 +118,14 @@ time period (y-x). Unit of result is uWatt.</div><div class='ctx'> </div><div class='ctx'> This driver provides PwrCPUave and interval(default is 10 millisecond</div><div class='ctx'> and maximum is 1 second):</div><div class='add'>+</div><div class='ctx'> * power1_average (PwrCPUave)</div><div class='ctx'> * power1_average_interval (Interval)</div><div class='ctx'> </div><div class='ctx'> The power1_average_interval can be updated at /etc/sensors3.conf file</div><div class='ctx'> as below:</div><div class='ctx'> </div><div class='del'>-chip "fam15h_power-*"</div><div class='add'>+chip `fam15h_power-*`</div><div class='ctx'> 	set power1_average_interval 0.01</div><div class='ctx'> </div><div class='ctx'> Then save it with "sensors -s".</div><div class='head'>diff --git a/Documentation/hwmon/ftsteutates b/Documentation/hwmon/ftsteutates.rst<br/>index af54db92391b..58a2483d8d0d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ftsteutates?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ftsteutates</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ftsteutates.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ftsteutates.rst</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='ctx'> Kernel driver ftsteutates</div><div class='del'>-=====================</div><div class='add'>+=========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * FTS Teutates</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ftsteutates'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x73 (7-Bit)</div><div class='ctx'> </div><div class='ctx'> Author: Thilo Cestonaro &lt;thilo.cestonaro@ts.fujitsu.com&gt;</div><div class='hunk'>@@ -11,6 +14,7 @@ Author: Thilo Cestonaro &lt;thilo.cestonaro@ts.fujitsu.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='add'>+</div><div class='ctx'> The BMC Teutates is the Eleventh generation of Superior System</div><div class='ctx'> monitoring and thermal management solution. It is builds on the basic</div><div class='ctx'> functionality of the BMC Theseus and contains several new features and</div><div class='hunk'>@@ -19,9 +23,11 @@ enhancements. It can monitor up to 4 voltages, 16 temperatures and</div><div class='ctx'> implemented in this driver.</div><div class='ctx'> </div><div class='ctx'> To clear a temperature or fan alarm, execute the following command with the</div><div class='del'>-correct path to the alarm file:</div><div class='add'>+correct path to the alarm file::</div><div class='add'>+</div><div class='ctx'> 	echo 0 &gt;XXXX_alarm</div><div class='ctx'> </div><div class='ctx'> Specification of the chip can be found here:</div><div class='del'>-ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&amp;Tools/Linux_SystemMonitoring&amp;Watchdog&amp;GPIO/BMC-Teutates_Specification_V1.21.pdf</div><div class='del'>-ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&amp;Tools/Linux_SystemMonitoring&amp;Watchdog&amp;GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf</div><div class='add'>+</div><div class='add'>+- ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&amp;Tools/Linux_SystemMonitoring&amp;Watchdog&amp;GPIO/BMC-Teutates_Specification_V1.21.pdf</div><div class='add'>+- ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&amp;Tools/Linux_SystemMonitoring&amp;Watchdog&amp;GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf</div><div class='head'>diff --git a/Documentation/hwmon/g760a b/Documentation/hwmon/g760a.rst<br/>index cfc894537061..d82952cc8319 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/g760a?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/g760a</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/g760a.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/g760a.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver g760a</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Global Mixed-mode Technology Inc. G760A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'g760a'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the GMT website</div><div class='add'>+</div><div class='ctx'>       http://www.gmt.com.tw/product/datasheet/EDS-760A.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='head'>diff --git a/Documentation/hwmon/g762 b/Documentation/hwmon/g762.rst<br/>index 923db9c5b5bc..0371b3365c48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/g762?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/g762</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/g762.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/g762.rst</a></div><div class='hunk'>@@ -7,7 +7,7 @@ modes - PWM or DC - are supported by the device.</div><div class='ctx'> </div><div class='ctx'> For additional information, a detailed datasheet is available at</div><div class='ctx'> http://natisbad.org/NAS/ref/GMT_EDS-762_763-080710-0.2.pdf. sysfs</div><div class='del'>-bindings are described in Documentation/hwmon/sysfs-interface.</div><div class='add'>+bindings are described in Documentation/hwmon/sysfs-interface.rst.</div><div class='ctx'> </div><div class='ctx'> The following entries are available to the user in a subdirectory of</div><div class='ctx'> /sys/bus/i2c/drivers/g762/ to control the operation of the device.</div><div class='hunk'>@@ -21,34 +21,43 @@ documented in Documentation/devicetree/bindings/hwmon/g762.txt or</div><div class='ctx'> using a specific platform_data structure in board initialization</div><div class='ctx'> file (see include/linux/platform_data/g762.h).</div><div class='ctx'> </div><div class='del'>-  fan1_target: set desired fan speed. This only makes sense in closed-loop</div><div class='del'>-            fan speed control (i.e. when pwm1_enable is set to 2).</div><div class='add'>+  fan1_target:</div><div class='add'>+	    set desired fan speed. This only makes sense in closed-loop</div><div class='add'>+	    fan speed control (i.e. when pwm1_enable is set to 2).</div><div class='ctx'> </div><div class='del'>-  fan1_input: provide current fan rotation value in RPM as reported by</div><div class='del'>-            the fan to the device.</div><div class='add'>+  fan1_input:</div><div class='add'>+	    provide current fan rotation value in RPM as reported by</div><div class='add'>+	    the fan to the device.</div><div class='ctx'> </div><div class='del'>-  fan1_div: fan clock divisor. Supported value are 1, 2, 4 and 8.</div><div class='add'>+  fan1_div:</div><div class='add'>+	    fan clock divisor. Supported value are 1, 2, 4 and 8.</div><div class='ctx'> </div><div class='del'>-  fan1_pulses: number of pulses per fan revolution. Supported values</div><div class='del'>-            are 2 and 4.</div><div class='add'>+  fan1_pulses:</div><div class='add'>+	    number of pulses per fan revolution. Supported values</div><div class='add'>+	    are 2 and 4.</div><div class='ctx'> </div><div class='del'>-  fan1_fault: reports fan failure, i.e. no transition on fan gear pin for</div><div class='del'>-            about 0.7s (if the fan is not voluntarily set off).</div><div class='add'>+  fan1_fault:</div><div class='add'>+	    reports fan failure, i.e. no transition on fan gear pin for</div><div class='add'>+	    about 0.7s (if the fan is not voluntarily set off).</div><div class='ctx'> </div><div class='del'>-  fan1_alarm: in closed-loop control mode, if fan RPM value is 25% out</div><div class='del'>-            of the programmed value for over 6 seconds 'fan1_alarm' is</div><div class='del'>-            set to 1.</div><div class='add'>+  fan1_alarm:</div><div class='add'>+	    in closed-loop control mode, if fan RPM value is 25% out</div><div class='add'>+	    of the programmed value for over 6 seconds 'fan1_alarm' is</div><div class='add'>+	    set to 1.</div><div class='ctx'> </div><div class='del'>-  pwm1_enable: set current fan speed control mode i.e. 1 for manual fan</div><div class='del'>-            speed control (open-loop) via pwm1 described below, 2 for</div><div class='del'>-            automatic fan speed control (closed-loop) via fan1_target</div><div class='del'>-            above.</div><div class='add'>+  pwm1_enable:</div><div class='add'>+	    set current fan speed control mode i.e. 1 for manual fan</div><div class='add'>+	    speed control (open-loop) via pwm1 described below, 2 for</div><div class='add'>+	    automatic fan speed control (closed-loop) via fan1_target</div><div class='add'>+	    above.</div><div class='ctx'> </div><div class='del'>-  pwm1_mode: set or get fan driving mode: 1 for PWM mode, 0 for DC mode.</div><div class='add'>+  pwm1_mode:</div><div class='add'>+	    set or get fan driving mode: 1 for PWM mode, 0 for DC mode.</div><div class='ctx'> </div><div class='del'>-  pwm1: get or set PWM fan control value in open-loop mode. This is an</div><div class='del'>-            integer value between 0 and 255. 0 stops the fan, 255 makes</div><div class='del'>-            it run at full speed.</div><div class='add'>+  pwm1:</div><div class='add'>+	    get or set PWM fan control value in open-loop mode. This is an</div><div class='add'>+	    integer value between 0 and 255. 0 stops the fan, 255 makes</div><div class='add'>+	    it run at full speed.</div><div class='ctx'> </div><div class='ctx'> Both in PWM mode ('pwm1_mode' set to 1) and DC mode ('pwm1_mode' set to 0),</div><div class='ctx'> when current fan speed control mode is open-loop ('pwm1_enable' set to 1),</div><div class='head'>diff --git a/Documentation/hwmon/gl518sm b/Documentation/hwmon/gl518sm.rst<br/>index 494bb55b6e72..bf1e0b5e824b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/gl518sm?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/gl518sm</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/gl518sm.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/gl518sm.rst</a></div><div class='hunk'>@@ -2,27 +2,34 @@ Kernel driver gl518sm</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Genesys Logic GL518SM release 0x00</div><div class='add'>+</div><div class='ctx'>     Prefix: 'gl518sm'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c and 0x2d</div><div class='add'>+</div><div class='ctx'>   * Genesys Logic GL518SM release 0x80</div><div class='add'>+</div><div class='ctx'>     Prefix: 'gl518sm'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c and 0x2d</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.genesyslogic.com/</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;</div><div class='del'>-        Hong-Gunn Chew &lt;hglinux@gunnet.org&gt;</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+       - Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+       - Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;</div><div class='add'>+       - Hong-Gunn Chew &lt;hglinux@gunnet.org&gt;</div><div class='add'>+       - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='del'>-IMPORTANT:</div><div class='add'>+.. important::</div><div class='ctx'> </div><div class='del'>-For the revision 0x00 chip, the in0, in1, and in2  values (+5V, +3V,</div><div class='del'>-and +12V) CANNOT be read. This is a limitation of the chip, not the driver.</div><div class='add'>+   For the revision 0x00 chip, the in0, in1, and in2  values (+5V, +3V,</div><div class='add'>+   and +12V) CANNOT be read. This is a limitation of the chip, not the driver.</div><div class='ctx'> </div><div class='ctx'> This driver supports the Genesys Logic GL518SM chip. There are at least</div><div class='ctx'> two revision of this chip, which we call revision 0x00 and 0x80. Revision</div><div class='head'>diff --git a/Documentation/hwmon/hih6130 b/Documentation/hwmon/hih6130.rst<br/>index 73dae918ea7b..649bd4be4fc2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/hih6130?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/hih6130</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/hih6130.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/hih6130.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver hih6130</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Honeywell HIH-6130 / HIH-6131</div><div class='add'>+</div><div class='ctx'>     Prefix: 'hih6130'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Honeywell website</div><div class='del'>-    http://sensing.honeywell.com/index.php?ci_id=3106&amp;la_id=1&amp;defId=44872</div><div class='add'>+</div><div class='add'>+	http://sensing.honeywell.com/index.php?ci_id=3106&amp;la_id=1&amp;defId=44872</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='ctx'>   Iain Paton &lt;ipaton0@gmail.com&gt;</div><div class='hunk'>@@ -28,8 +33,11 @@ instantiate I2C devices.</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-temp1_input - temperature input</div><div class='del'>-humidity1_input - humidity input</div><div class='add'>+temp1_input</div><div class='add'>+	temperature input</div><div class='add'>+</div><div class='add'>+humidity1_input</div><div class='add'>+	humidity input</div><div class='ctx'> </div><div class='ctx'> Notes</div><div class='ctx'> -----</div><div class='head'>diff --git a/Documentation/hwmon/hwmon-kernel-api.txt b/Documentation/hwmon/hwmon-kernel-api.rst<br/>index 8bdefb41be30..c41eb6108103 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/hwmon-kernel-api.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/hwmon-kernel-api.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/hwmon-kernel-api.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/hwmon-kernel-api.rst</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-The Linux Hardware Monitoring kernel API.</div><div class='del'>-=========================================</div><div class='add'>+The Linux Hardware Monitoring kernel API</div><div class='add'>+========================================</div><div class='ctx'> </div><div class='ctx'> Guenter Roeck</div><div class='ctx'> </div><div class='hunk'>@@ -12,42 +12,43 @@ drivers that want to use the hardware monitoring framework.</div><div class='ctx'> This document does not describe what a hardware monitoring (hwmon) Driver or</div><div class='ctx'> Device is. It also does not describe the API which can be used by user space</div><div class='ctx'> to communicate with a hardware monitoring device. If you want to know this</div><div class='del'>-then please read the following file: Documentation/hwmon/sysfs-interface.</div><div class='add'>+then please read the following file: Documentation/hwmon/sysfs-interface.rst.</div><div class='ctx'> </div><div class='ctx'> For additional guidelines on how to write and improve hwmon drivers, please</div><div class='del'>-also read Documentation/hwmon/submitting-patches.</div><div class='add'>+also read Documentation/hwmon/submitting-patches.rst.</div><div class='ctx'> </div><div class='ctx'> The API</div><div class='ctx'> -------</div><div class='ctx'> Each hardware monitoring driver must #include &lt;linux/hwmon.h&gt; and, in most</div><div class='ctx'> cases, &lt;linux/hwmon-sysfs.h&gt;. linux/hwmon.h declares the following</div><div class='del'>-register/unregister functions:</div><div class='del'>-</div><div class='del'>-struct device *</div><div class='del'>-hwmon_device_register_with_groups(struct device *dev, const char *name,</div><div class='del'>-				  void *drvdata,</div><div class='del'>-				  const struct attribute_group **groups);</div><div class='del'>-</div><div class='del'>-struct device *</div><div class='del'>-devm_hwmon_device_register_with_groups(struct device *dev,</div><div class='del'>-				       const char *name, void *drvdata,</div><div class='del'>-				       const struct attribute_group **groups);</div><div class='del'>-</div><div class='del'>-struct device *</div><div class='del'>-hwmon_device_register_with_info(struct device *dev,</div><div class='del'>-				const char *name, void *drvdata,</div><div class='del'>-				const struct hwmon_chip_info *info,</div><div class='del'>-				const struct attribute_group **extra_groups);</div><div class='del'>-</div><div class='del'>-struct device *</div><div class='del'>-devm_hwmon_device_register_with_info(struct device *dev,</div><div class='del'>-				const char *name,</div><div class='del'>-				void *drvdata,</div><div class='del'>-				const struct hwmon_chip_info *info,</div><div class='del'>-				const struct attribute_group **extra_groups);</div><div class='del'>-</div><div class='del'>-void hwmon_device_unregister(struct device *dev);</div><div class='del'>-void devm_hwmon_device_unregister(struct device *dev);</div><div class='add'>+register/unregister functions::</div><div class='add'>+</div><div class='add'>+  struct device *</div><div class='add'>+  hwmon_device_register_with_groups(struct device *dev, const char *name,</div><div class='add'>+				    void *drvdata,</div><div class='add'>+				    const struct attribute_group **groups);</div><div class='add'>+</div><div class='add'>+  struct device *</div><div class='add'>+  devm_hwmon_device_register_with_groups(struct device *dev,</div><div class='add'>+					 const char *name, void *drvdata,</div><div class='add'>+					 const struct attribute_group **groups);</div><div class='add'>+</div><div class='add'>+  struct device *</div><div class='add'>+  hwmon_device_register_with_info(struct device *dev,</div><div class='add'>+				  const char *name, void *drvdata,</div><div class='add'>+				  const struct hwmon_chip_info *info,</div><div class='add'>+				  const struct attribute_group **extra_groups);</div><div class='add'>+</div><div class='add'>+  struct device *</div><div class='add'>+  devm_hwmon_device_register_with_info(struct device *dev,</div><div class='add'>+				       const char *name,</div><div class='add'>+				       void *drvdata,</div><div class='add'>+				       const struct hwmon_chip_info *info,</div><div class='add'>+				       const struct attribute_group **extra_groups);</div><div class='add'>+</div><div class='add'>+  void hwmon_device_unregister(struct device *dev);</div><div class='add'>+</div><div class='add'>+  void devm_hwmon_device_unregister(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> hwmon_device_register_with_groups registers a hardware monitoring device.</div><div class='ctx'> The first parameter of this function is a pointer to the parent device.</div><div class='hunk'>@@ -100,78 +101,89 @@ Using devm_hwmon_device_register_with_info()</div><div class='ctx'> hwmon_device_register_with_info() registers a hardware monitoring device.</div><div class='ctx'> The parameters to this function are</div><div class='ctx'> </div><div class='del'>-struct device *dev	Pointer to parent device</div><div class='del'>-const char *name	Device name</div><div class='del'>-void *drvdata		Driver private data</div><div class='del'>-const struct hwmon_chip_info *info</div><div class='del'>-			Pointer to chip description.</div><div class='del'>-const struct attribute_group **extra_groups</div><div class='del'>-			Null-terminated list of additional non-standard</div><div class='del'>-			sysfs attribute groups.</div><div class='add'>+=============================================== ===============================================</div><div class='add'>+`struct device *dev`				Pointer to parent device</div><div class='add'>+`const char *name`				Device name</div><div class='add'>+`void *drvdata`					Driver private data</div><div class='add'>+`const struct hwmon_chip_info *info`		Pointer to chip description.</div><div class='add'>+`const struct attribute_group **extra_groups` 	Null-terminated list of additional non-standard</div><div class='add'>+						sysfs attribute groups.</div><div class='add'>+=============================================== ===============================================</div><div class='ctx'> </div><div class='ctx'> This function returns a pointer to the created hardware monitoring device</div><div class='ctx'> on success and a negative error code for failure.</div><div class='ctx'> </div><div class='del'>-The hwmon_chip_info structure looks as follows.</div><div class='add'>+The hwmon_chip_info structure looks as follows::</div><div class='ctx'> </div><div class='del'>-struct hwmon_chip_info {</div><div class='del'>-	const struct hwmon_ops *ops;</div><div class='del'>-	const struct hwmon_channel_info **info;</div><div class='del'>-};</div><div class='add'>+	struct hwmon_chip_info {</div><div class='add'>+		const struct hwmon_ops *ops;</div><div class='add'>+		const struct hwmon_channel_info **info;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> It contains the following fields:</div><div class='ctx'> </div><div class='del'>-* ops:	Pointer to device operations.</div><div class='del'>-* info: NULL-terminated list of device channel descriptors.</div><div class='add'>+* ops:</div><div class='add'>+	Pointer to device operations.</div><div class='add'>+* info:</div><div class='add'>+	NULL-terminated list of device channel descriptors.</div><div class='ctx'> </div><div class='del'>-The list of hwmon operations is defined as:</div><div class='add'>+The list of hwmon operations is defined as::</div><div class='ctx'> </div><div class='del'>-struct hwmon_ops {</div><div class='add'>+  struct hwmon_ops {</div><div class='ctx'> 	umode_t (*is_visible)(const void *, enum hwmon_sensor_types type,</div><div class='ctx'> 			      u32 attr, int);</div><div class='ctx'> 	int (*read)(struct device *, enum hwmon_sensor_types type,</div><div class='ctx'> 		    u32 attr, int, long *);</div><div class='ctx'> 	int (*write)(struct device *, enum hwmon_sensor_types type,</div><div class='ctx'> 		     u32 attr, int, long);</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='ctx'> It defines the following operations.</div><div class='ctx'> </div><div class='del'>-* is_visible: Pointer to a function to return the file mode for each supported</div><div class='del'>-  attribute. This function is mandatory.</div><div class='add'>+* is_visible:</div><div class='add'>+    Pointer to a function to return the file mode for each supported</div><div class='add'>+    attribute. This function is mandatory.</div><div class='ctx'> </div><div class='del'>-* read: Pointer to a function for reading a value from the chip. This function</div><div class='del'>-  is optional, but must be provided if any readable attributes exist.</div><div class='add'>+* read:</div><div class='add'>+    Pointer to a function for reading a value from the chip. This function</div><div class='add'>+    is optional, but must be provided if any readable attributes exist.</div><div class='ctx'> </div><div class='del'>-* write: Pointer to a function for writing a value to the chip. This function is</div><div class='del'>-  optional, but must be provided if any writeable attributes exist.</div><div class='add'>+* write:</div><div class='add'>+    Pointer to a function for writing a value to the chip. This function is</div><div class='add'>+    optional, but must be provided if any writeable attributes exist.</div><div class='ctx'> </div><div class='ctx'> Each sensor channel is described with struct hwmon_channel_info, which is</div><div class='del'>-defined as follows.</div><div class='add'>+defined as follows::</div><div class='ctx'> </div><div class='del'>-struct hwmon_channel_info {</div><div class='del'>-	enum hwmon_sensor_types type;</div><div class='del'>-	u32 *config;</div><div class='del'>-};</div><div class='add'>+	struct hwmon_channel_info {</div><div class='add'>+		enum hwmon_sensor_types type;</div><div class='add'>+		u32 *config;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> It contains following fields:</div><div class='ctx'> </div><div class='del'>-* type: The hardware monitoring sensor type.</div><div class='del'>-  Supported sensor types are</div><div class='del'>-  * hwmon_chip		A virtual sensor type, used to describe attributes</div><div class='del'>-  *			which are not bound to a specific input or output</div><div class='del'>-  * hwmon_temp		Temperature sensor</div><div class='del'>-  * hwmon_in		Voltage sensor</div><div class='del'>-  * hwmon_curr		Current sensor</div><div class='del'>-  * hwmon_power		Power sensor</div><div class='del'>-  * hwmon_energy	Energy sensor</div><div class='del'>-  * hwmon_humidity	Humidity sensor</div><div class='del'>-  * hwmon_fan		Fan speed sensor</div><div class='del'>-  * hwmon_pwm		PWM control</div><div class='del'>-</div><div class='del'>-* config: Pointer to a 0-terminated list of configuration values for each</div><div class='del'>-  sensor of the given type. Each value is a combination of bit values</div><div class='del'>-  describing the attributes supposed by a single sensor.</div><div class='add'>+* type:</div><div class='add'>+    The hardware monitoring sensor type.</div><div class='add'>+</div><div class='add'>+    Supported sensor types are</div><div class='add'>+</div><div class='add'>+     ================== ==================================================</div><div class='add'>+     hwmon_chip		A virtual sensor type, used to describe attributes</div><div class='add'>+			which are not bound to a specific input or output</div><div class='add'>+     hwmon_temp		Temperature sensor</div><div class='add'>+     hwmon_in		Voltage sensor</div><div class='add'>+     hwmon_curr		Current sensor</div><div class='add'>+     hwmon_power		Power sensor</div><div class='add'>+     hwmon_energy	Energy sensor</div><div class='add'>+     hwmon_humidity	Humidity sensor</div><div class='add'>+     hwmon_fan		Fan speed sensor</div><div class='add'>+     hwmon_pwm		PWM control</div><div class='add'>+     ================== ==================================================</div><div class='add'>+</div><div class='add'>+* config:</div><div class='add'>+    Pointer to a 0-terminated list of configuration values for each</div><div class='add'>+    sensor of the given type. Each value is a combination of bit values</div><div class='add'>+    describing the attributes supposed by a single sensor.</div><div class='ctx'> </div><div class='ctx'> As an example, here is the complete description file for a LM75 compatible</div><div class='ctx'> sensor chip. The chip has a single temperature sensor. The driver wants to</div><div class='hunk'>@@ -179,48 +191,62 @@ register with the thermal subsystem (HWMON_C_REGISTER_TZ), and it supports</div><div class='ctx'> the update_interval attribute (HWMON_C_UPDATE_INTERVAL). The chip supports</div><div class='ctx'> reading the temperature (HWMON_T_INPUT), it has a maximum temperature</div><div class='ctx'> register (HWMON_T_MAX) as well as a maximum temperature hysteresis register</div><div class='del'>-(HWMON_T_MAX_HYST).</div><div class='del'>-</div><div class='del'>-static const u32 lm75_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm75_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = lm75_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 lm75_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm75_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = lm75_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info *lm75_info[] = {</div><div class='del'>-	&amp;lm75_chip,</div><div class='del'>-	&amp;lm75_temp,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_ops lm75_hwmon_ops = {</div><div class='del'>-	.is_visible = lm75_is_visible,</div><div class='del'>-	.read = lm75_read,</div><div class='del'>-	.write = lm75_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_chip_info lm75_chip_info = {</div><div class='del'>-	.ops = &amp;lm75_hwmon_ops,</div><div class='del'>-	.info = lm75_info,</div><div class='del'>-};</div><div class='add'>+(HWMON_T_MAX_HYST)::</div><div class='add'>+</div><div class='add'>+	static const u32 lm75_chip_config[] = {</div><div class='add'>+		HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct hwmon_channel_info lm75_chip = {</div><div class='add'>+		.type = hwmon_chip,</div><div class='add'>+		.config = lm75_chip_config,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const u32 lm75_temp_config[] = {</div><div class='add'>+		HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct hwmon_channel_info lm75_temp = {</div><div class='add'>+		.type = hwmon_temp,</div><div class='add'>+		.config = lm75_temp_config,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct hwmon_channel_info *lm75_info[] = {</div><div class='add'>+		&amp;lm75_chip,</div><div class='add'>+		&amp;lm75_temp,</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	The HWMON_CHANNEL_INFO() macro can and should be used when possible.</div><div class='add'>+	With this macro, the above example can be simplified to</div><div class='add'>+</div><div class='add'>+	static const struct hwmon_channel_info *lm75_info[] = {</div><div class='add'>+		HWMON_CHANNEL_INFO(chip,</div><div class='add'>+				HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+		HWMON_CHANNEL_INFO(temp,</div><div class='add'>+				HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST),</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	The remaining declarations are as follows.</div><div class='add'>+</div><div class='add'>+	static const struct hwmon_ops lm75_hwmon_ops = {</div><div class='add'>+		.is_visible = lm75_is_visible,</div><div class='add'>+		.read = lm75_read,</div><div class='add'>+		.write = lm75_write,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct hwmon_chip_info lm75_chip_info = {</div><div class='add'>+		.ops = &amp;lm75_hwmon_ops,</div><div class='add'>+		.info = lm75_info,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> A complete list of bit values indicating individual attribute support</div><div class='ctx'> is defined in include/linux/hwmon.h. Definition prefixes are as follows.</div><div class='ctx'> </div><div class='add'>+=============== =================================================</div><div class='ctx'> HWMON_C_xxxx	Chip attributes, for use with hwmon_chip.</div><div class='ctx'> HWMON_T_xxxx	Temperature attributes, for use with hwmon_temp.</div><div class='ctx'> HWMON_I_xxxx	Voltage attributes, for use with hwmon_in.</div><div class='hunk'>@@ -231,57 +257,76 @@ HWMON_E_xxxx	Energy attributes, for use with hwmon_energy.</div><div class='ctx'> HWMON_H_xxxx	Humidity attributes, for use with hwmon_humidity.</div><div class='ctx'> HWMON_F_xxxx	Fan speed attributes, for use with hwmon_fan.</div><div class='ctx'> HWMON_PWM_xxxx	PWM control attributes, for use with hwmon_pwm.</div><div class='add'>+=============== =================================================</div><div class='ctx'> </div><div class='ctx'> Driver callback functions</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> Each driver provides is_visible, read, and write functions. Parameters</div><div class='del'>-and return values for those functions are as follows.</div><div class='add'>+and return values for those functions are as follows::</div><div class='ctx'> </div><div class='del'>-umode_t is_visible_func(const void *data, enum hwmon_sensor_types type,</div><div class='del'>-			u32 attr, int channel)</div><div class='add'>+  umode_t is_visible_func(const void *data, enum hwmon_sensor_types type,</div><div class='add'>+			  u32 attr, int channel)</div><div class='ctx'> </div><div class='ctx'> Parameters:</div><div class='del'>-	data:	Pointer to device private data structure.</div><div class='del'>-	type:	The sensor type.</div><div class='del'>-	attr:	Attribute identifier associated with a specific attribute.</div><div class='add'>+	data:</div><div class='add'>+		Pointer to device private data structure.</div><div class='add'>+	type:</div><div class='add'>+		The sensor type.</div><div class='add'>+	attr:</div><div class='add'>+		Attribute identifier associated with a specific attribute.</div><div class='ctx'> 		For example, the attribute value for HWMON_T_INPUT would be</div><div class='ctx'> 		hwmon_temp_input. For complete mappings of bit fields to</div><div class='ctx'> 		attribute values please see include/linux/hwmon.h.</div><div class='del'>-	channel:The sensor channel number.</div><div class='add'>+	channel:</div><div class='add'>+		The sensor channel number.</div><div class='ctx'> </div><div class='ctx'> Return value:</div><div class='ctx'> 	The file mode for this attribute. Typically, this will be 0 (the</div><div class='ctx'> 	attribute will not be created), S_IRUGO, or 'S_IRUGO | S_IWUSR'.</div><div class='ctx'> </div><div class='del'>-int read_func(struct device *dev, enum hwmon_sensor_types type,</div><div class='del'>-	      u32 attr, int channel, long *val)</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	int read_func(struct device *dev, enum hwmon_sensor_types type,</div><div class='add'>+		      u32 attr, int channel, long *val)</div><div class='ctx'> </div><div class='ctx'> Parameters:</div><div class='del'>-	dev:	Pointer to the hardware monitoring device.</div><div class='del'>-	type:	The sensor type.</div><div class='del'>-	attr:	Attribute identifier associated with a specific attribute.</div><div class='add'>+	dev:</div><div class='add'>+		Pointer to the hardware monitoring device.</div><div class='add'>+	type:</div><div class='add'>+		The sensor type.</div><div class='add'>+	attr:</div><div class='add'>+		Attribute identifier associated with a specific attribute.</div><div class='ctx'> 		For example, the attribute value for HWMON_T_INPUT would be</div><div class='ctx'> 		hwmon_temp_input. For complete mappings please see</div><div class='ctx'> 		include/linux/hwmon.h.</div><div class='del'>-	channel:The sensor channel number.</div><div class='del'>-	val:	Pointer to attribute value.</div><div class='add'>+	channel:</div><div class='add'>+		The sensor channel number.</div><div class='add'>+	val:</div><div class='add'>+		Pointer to attribute value.</div><div class='ctx'> </div><div class='ctx'> Return value:</div><div class='ctx'> 	0 on success, a negative error number otherwise.</div><div class='ctx'> </div><div class='del'>-int write_func(struct device *dev, enum hwmon_sensor_types type,</div><div class='del'>-	       u32 attr, int channel, long val)</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	int write_func(struct device *dev, enum hwmon_sensor_types type,</div><div class='add'>+		       u32 attr, int channel, long val)</div><div class='ctx'> </div><div class='ctx'> Parameters:</div><div class='del'>-	dev:	Pointer to the hardware monitoring device.</div><div class='del'>-	type:	The sensor type.</div><div class='del'>-	attr:	Attribute identifier associated with a specific attribute.</div><div class='add'>+	dev:</div><div class='add'>+		Pointer to the hardware monitoring device.</div><div class='add'>+	type:</div><div class='add'>+		The sensor type.</div><div class='add'>+	attr:</div><div class='add'>+		Attribute identifier associated with a specific attribute.</div><div class='ctx'> 		For example, the attribute value for HWMON_T_INPUT would be</div><div class='ctx'> 		hwmon_temp_input. For complete mappings please see</div><div class='ctx'> 		include/linux/hwmon.h.</div><div class='del'>-	channel:The sensor channel number.</div><div class='del'>-	val:	The value to write to the chip.</div><div class='add'>+	channel:</div><div class='add'>+		The sensor channel number.</div><div class='add'>+	val:</div><div class='add'>+		The value to write to the chip.</div><div class='ctx'> </div><div class='ctx'> Return value:</div><div class='ctx'> 	0 on success, a negative error number otherwise.</div><div class='hunk'>@@ -317,25 +362,25 @@ Standard functions, similar to DEVICE_ATTR_{RW,RO,WO}, have _show and _store</div><div class='ctx'> appended to the provided function name.</div><div class='ctx'> </div><div class='ctx'> SENSOR_DEVICE_ATTR and its variants define a struct sensor_device_attribute</div><div class='del'>-variable. This structure has the following fields.</div><div class='add'>+variable. This structure has the following fields::</div><div class='ctx'> </div><div class='del'>-struct sensor_device_attribute {</div><div class='del'>-	struct device_attribute dev_attr;</div><div class='del'>-	int index;</div><div class='del'>-};</div><div class='add'>+	struct sensor_device_attribute {</div><div class='add'>+		struct device_attribute dev_attr;</div><div class='add'>+		int index;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> You can use to_sensor_dev_attr to get the pointer to this structure from the</div><div class='ctx'> attribute read or write function. Its parameter is the device to which the</div><div class='ctx'> attribute is attached.</div><div class='ctx'> </div><div class='ctx'> SENSOR_DEVICE_ATTR_2 and its variants define a struct sensor_device_attribute_2</div><div class='del'>-variable, which is defined as follows.</div><div class='add'>+variable, which is defined as follows::</div><div class='ctx'> </div><div class='del'>-struct sensor_device_attribute_2 {</div><div class='del'>-	struct device_attribute dev_attr;</div><div class='del'>-	u8 index;</div><div class='del'>-	u8 nr;</div><div class='del'>-};</div><div class='add'>+	struct sensor_device_attribute_2 {</div><div class='add'>+		struct device_attribute dev_attr;</div><div class='add'>+		u8 index;</div><div class='add'>+		u8 nr;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> Use to_sensor_dev_attr_2 to get the pointer to this structure. Its parameter</div><div class='ctx'> is the device to which the attribute is attached.</div><div class='head'>diff --git a/Documentation/hwmon/ibm-cffps b/Documentation/hwmon/ibm-cffps.rst<br/>index e05ecd8ecfcf..52e74e39463a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ibm-cffps?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ibm-cffps</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ibm-cffps.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ibm-cffps.rst</a></div><div class='hunk'>@@ -2,6 +2,7 @@ Kernel driver ibm-cffps</div><div class='ctx'> =======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * IBM Common Form Factor power supply</div><div class='ctx'> </div><div class='ctx'> Author: Eddie James &lt;eajames@us.ibm.com&gt;</div><div class='hunk'>@@ -24,6 +25,7 @@ Sysfs entries</div><div class='ctx'> </div><div class='ctx'> The following attributes are supported:</div><div class='ctx'> </div><div class='add'>+======================= ======================================================</div><div class='ctx'> curr1_alarm		Output current over-current alarm.</div><div class='ctx'> curr1_input		Measured output current in mA.</div><div class='ctx'> curr1_label		"iout1"</div><div class='hunk'>@@ -52,3 +54,4 @@ temp2_alarm		Secondary rectifier temp over-temperature alarm.</div><div class='ctx'> temp2_input		Measured secondary rectifier temp in millidegrees C.</div><div class='ctx'> temp3_alarm		ORing FET temperature over-temperature alarm.</div><div class='ctx'> temp3_input		Measured ORing FET temperature in millidegrees C.</div><div class='add'>+======================= ======================================================</div><div class='head'>diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem.rst<br/>index 1e0d59e000b4..f07a14a1c2f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ibmaem?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ibmaem</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ibmaem.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ibmaem.rst</a></div><div class='hunk'>@@ -1,15 +1,21 @@</div><div class='ctx'> Kernel driver ibmaem</div><div class='del'>-======================</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> This driver talks to the IBM Systems Director Active Energy Manager, known</div><div class='ctx'> henceforth as AEM.</div><div class='ctx'> </div><div class='ctx'> Supported systems:</div><div class='add'>+</div><div class='ctx'>   * Any recent IBM System X server with AEM support.</div><div class='add'>+</div><div class='ctx'>     This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,</div><div class='del'>-    x3950 M2, and certain HC10/HS2x/LS2x/QS2x blades.  The IPMI host interface</div><div class='add'>+    x3950 M2, and certain HC10/HS2x/LS2x/QS2x blades.</div><div class='add'>+</div><div class='add'>+    The IPMI host interface</div><div class='ctx'>     driver ("ipmi-si") needs to be loaded for this driver to do anything.</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ibmaem'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not available</div><div class='ctx'> </div><div class='ctx'> Author: Darrick J. Wong</div><div class='head'>diff --git a/Documentation/hwmon/ibmpowernv b/Documentation/hwmon/ibmpowernv.rst<br/>index 56468258711f..5d642bc3dec0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ibmpowernv?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ibmpowernv</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ibmpowernv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ibmpowernv.rst</a></div><div class='hunk'>@@ -2,6 +2,7 @@ Kernel Driver IBMPOWERNV</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='ctx'> Supported systems:</div><div class='add'>+</div><div class='ctx'>   * Any recent IBM P servers based on POWERNV platform</div><div class='ctx'> </div><div class='ctx'> Author: Neelesh Gupta</div><div class='hunk'>@@ -29,10 +30,11 @@ CONFIG_SENSORS_IBMPOWERNV. It can also be built as module 'ibmpowernv'.</div><div class='ctx'> Sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> fanX_input		Measured RPM value.</div><div class='ctx'> fanX_min		Threshold RPM for alert generation.</div><div class='del'>-fanX_fault		0: No fail condition</div><div class='del'>-			1: Failing fan</div><div class='add'>+fanX_fault		- 0: No fail condition</div><div class='add'>+			- 1: Failing fan</div><div class='ctx'> </div><div class='ctx'> tempX_input		Measured ambient temperature.</div><div class='ctx'> tempX_max		Threshold ambient temperature for alert generation.</div><div class='hunk'>@@ -42,20 +44,22 @@ tempX_enable		Enable/disable all temperature sensors belonging to the</div><div class='ctx'> 			sub-group. In POWER9, this attribute corresponds to</div><div class='ctx'> 			each OCC. Using this attribute each OCC can be asked to</div><div class='ctx'> 			disable/enable all of its temperature sensors.</div><div class='del'>-			1: Enable</div><div class='del'>-			0: Disable</div><div class='add'>+</div><div class='add'>+			- 1: Enable</div><div class='add'>+			- 0: Disable</div><div class='ctx'> </div><div class='ctx'> inX_input		Measured power supply voltage (millivolt)</div><div class='del'>-inX_fault		0: No fail condition.</div><div class='del'>-			1: Failing power supply.</div><div class='add'>+inX_fault		- 0: No fail condition.</div><div class='add'>+			- 1: Failing power supply.</div><div class='ctx'> inX_highest		Historical maximum voltage</div><div class='ctx'> inX_lowest		Historical minimum voltage</div><div class='ctx'> inX_enable		Enable/disable all voltage sensors belonging to the</div><div class='ctx'> 			sub-group. In POWER9, this attribute corresponds to</div><div class='ctx'> 			each OCC. Using this attribute each OCC can be asked to</div><div class='ctx'> 			disable/enable all of its voltage sensors.</div><div class='del'>-			1: Enable</div><div class='del'>-			0: Disable</div><div class='add'>+</div><div class='add'>+			- 1: Enable</div><div class='add'>+			- 0: Disable</div><div class='ctx'> </div><div class='ctx'> powerX_input		Power consumption (microWatt)</div><div class='ctx'> powerX_input_highest	Historical maximum power</div><div class='hunk'>@@ -64,8 +68,9 @@ powerX_enable		Enable/disable all power sensors belonging to the</div><div class='ctx'> 			sub-group. In POWER9, this attribute corresponds to</div><div class='ctx'> 			each OCC. Using this attribute each OCC can be asked to</div><div class='ctx'> 			disable/enable all of its power sensors.</div><div class='del'>-			1: Enable</div><div class='del'>-			0: Disable</div><div class='add'>+</div><div class='add'>+			- 1: Enable</div><div class='add'>+			- 0: Disable</div><div class='ctx'> </div><div class='ctx'> currX_input		Measured current (milliampere)</div><div class='ctx'> currX_highest		Historical maximum current</div><div class='hunk'>@@ -74,7 +79,9 @@ currX_enable		Enable/disable all current sensors belonging to the</div><div class='ctx'> 			sub-group. In POWER9, this attribute corresponds to</div><div class='ctx'> 			each OCC. Using this attribute each OCC can be asked to</div><div class='ctx'> 			disable/enable all of its current sensors.</div><div class='del'>-			1: Enable</div><div class='del'>-			0: Disable</div><div class='add'>+</div><div class='add'>+			- 1: Enable</div><div class='add'>+			- 0: Disable</div><div class='ctx'> </div><div class='ctx'> energyX_input		Cumulative energy (microJoule)</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/ina209 b/Documentation/hwmon/ina209.rst<br/>index 672501de4509..64322075a145 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ina209?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ina209</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ina209.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ina209.rst</a></div><div class='hunk'>@@ -1,16 +1,21 @@</div><div class='ctx'> Kernel driver ina209</div><div class='del'>-=====================</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Burr-Brown / Texas Instruments INA209</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina209'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://www.ti.com/lit/gpn/ina209</div><div class='add'>+	http://www.ti.com/lit/gpn/ina209</div><div class='ctx'> </div><div class='del'>-Author: Paul Hays &lt;Paul.Hays@cattail.ca&gt;</div><div class='del'>-Author: Ira W. Snyder &lt;iws@ovro.caltech.edu&gt;</div><div class='del'>-Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='add'>+Author:</div><div class='add'>+	- Paul Hays &lt;Paul.Hays@cattail.ca&gt;</div><div class='add'>+	- Ira W. Snyder &lt;iws@ovro.caltech.edu&gt;</div><div class='add'>+	- Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -31,7 +36,7 @@ the I2C bus. See the datasheet for details.</div><div class='ctx'> This tries to expose most monitoring features of the hardware via</div><div class='ctx'> sysfs. It does not support every feature of this chip.</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+======================= =======================================================</div><div class='ctx'> in0_input		shunt voltage (mV)</div><div class='ctx'> in0_input_highest	shunt voltage historical maximum reading (mV)</div><div class='ctx'> in0_input_lowest	shunt voltage historical minimum reading (mV)</div><div class='hunk'>@@ -70,6 +75,7 @@ curr1_input		current measurement (mA)</div><div class='ctx'> </div><div class='ctx'> update_interval		data conversion time; affects number of samples used</div><div class='ctx'> 			to average results for shunt and bus voltages.</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> General Remarks</div><div class='ctx'> ---------------</div><div class='head'>diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx.rst<br/>index 0f36c021192d..94b9a260c518 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ina2xx?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ina2xx</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ina2xx.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ina2xx.rst</a></div><div class='hunk'>@@ -2,35 +2,56 @@ Kernel driver ina2xx</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments INA219</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina219'</div><div class='ctx'>     Addresses: I2C 0x40 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'>   * Texas Instruments INA220</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina220'</div><div class='add'>+</div><div class='ctx'>     Addresses: I2C 0x40 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'>   * Texas Instruments INA226</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina226'</div><div class='add'>+</div><div class='ctx'>     Addresses: I2C 0x40 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'>   * Texas Instruments INA230</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina230'</div><div class='add'>+</div><div class='ctx'>     Addresses: I2C 0x40 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'>   * Texas Instruments INA231</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina231'</div><div class='add'>+</div><div class='ctx'>     Addresses: I2C 0x40 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'> Author: Lothar Felten &lt;lothar.felten@gmail.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -57,23 +78,27 @@ refer to the Documentation/devicetree/bindings/hwmon/ina2xx.txt for bindings</div><div class='ctx'> if the device tree is used.</div><div class='ctx'> </div><div class='ctx'> Additionally ina226 supports update_interval attribute as described in</div><div class='del'>-Documentation/hwmon/sysfs-interface. Internally the interval is the sum of</div><div class='add'>+Documentation/hwmon/sysfs-interface.rst. Internally the interval is the sum of</div><div class='ctx'> bus and shunt voltage conversion times multiplied by the averaging rate. We</div><div class='ctx'> don't touch the conversion times and only modify the number of averages. The</div><div class='ctx'> lower limit of the update_interval is 2 ms, the upper limit is 2253 ms.</div><div class='ctx'> The actual programmed interval may vary from the desired value.</div><div class='ctx'> </div><div class='ctx'> General sysfs entries</div><div class='del'>--------------</div><div class='add'>+---------------------</div><div class='ctx'> </div><div class='add'>+======================= ===============================</div><div class='ctx'> in0_input		Shunt voltage(mV) channel</div><div class='ctx'> in1_input		Bus voltage(mV) channel</div><div class='ctx'> curr1_input		Current(mA) measurement channel</div><div class='ctx'> power1_input		Power(uW) measurement channel</div><div class='ctx'> shunt_resistor		Shunt resistance(uOhm) channel</div><div class='add'>+======================= ===============================</div><div class='ctx'> </div><div class='ctx'> Sysfs entries for ina226, ina230 and ina231 only</div><div class='del'>--------------</div><div class='add'>+------------------------------------------------</div><div class='ctx'> </div><div class='add'>+======================= ====================================================</div><div class='ctx'> update_interval		data conversion time; affects number of samples used</div><div class='ctx'> 			to average results for shunt and bus voltages.</div><div class='add'>+======================= ====================================================</div><div class='head'>diff --git a/Documentation/hwmon/ina3221 b/Documentation/hwmon/ina3221.rst<br/>index 4b82cbfb551c..f6007ae8f4e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ina3221?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ina3221</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ina3221.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ina3221.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ina3221</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments INA3221</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ina3221'</div><div class='add'>+</div><div class='ctx'>     Addresses: I2C 0x40 - 0x43</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/</div><div class='ctx'> </div><div class='ctx'> Author: Andrew F. Davis &lt;afd@ti.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -21,17 +26,37 @@ and power are calculated host-side from these.</div><div class='ctx'> Sysfs entries</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in[123]_label           Voltage channel labels</div><div class='ctx'> in[123]_enable          Voltage channel enable controls</div><div class='ctx'> in[123]_input           Bus voltage(mV) channels</div><div class='ctx'> curr[123]_input         Current(mA) measurement channels</div><div class='ctx'> shunt[123]_resistor     Shunt resistance(uOhm) channels</div><div class='ctx'> curr[123]_crit          Critical alert current(mA) setting, activates the</div><div class='del'>-                          corresponding alarm when the respective current</div><div class='del'>-                          is above this value</div><div class='add'>+			corresponding alarm when the respective current</div><div class='add'>+			is above this value</div><div class='ctx'> curr[123]_crit_alarm    Critical alert current limit exceeded</div><div class='ctx'> curr[123]_max           Warning alert current(mA) setting, activates the</div><div class='del'>-                          corresponding alarm when the respective current</div><div class='del'>-                          average is above this value.</div><div class='add'>+			corresponding alarm when the respective current</div><div class='add'>+			average is above this value.</div><div class='ctx'> curr[123]_max_alarm     Warning alert current limit exceeded</div><div class='ctx'> in[456]_input           Shunt voltage(uV) for channels 1, 2, and 3 respectively</div><div class='add'>+samples                 Number of samples using in the averaging mode.</div><div class='add'>+</div><div class='add'>+                        Supports the list of number of samples:</div><div class='add'>+</div><div class='add'>+                          1, 4, 16, 64, 128, 256, 512, 1024</div><div class='add'>+</div><div class='add'>+update_interval         Data conversion time in millisecond, following:</div><div class='add'>+</div><div class='add'>+                          update_interval = C x S x (BC + SC)</div><div class='add'>+</div><div class='add'>+                          * C:	number of enabled channels</div><div class='add'>+                          * S:	number of samples</div><div class='add'>+                          * BC:	bus-voltage conversion time in millisecond</div><div class='add'>+                          * SC:	shunt-voltage conversion time in millisecond</div><div class='add'>+</div><div class='add'>+                        Affects both Bus- and Shunt-voltage conversion time.</div><div class='add'>+                        Note that setting update_interval to 0ms sets both BC</div><div class='add'>+                        and SC to 140 us (minimum conversion time).</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst<br/>new file mode 100644<br/>index 000000000000..ee090e51653a<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/index.rst</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+=========================</div><div class='add'>+Linux Hardware Monitoring</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   hwmon-kernel-api</div><div class='add'>+   pmbus-core</div><div class='add'>+   submitting-patches</div><div class='add'>+   sysfs-interface</div><div class='add'>+   userspace-tools</div><div class='add'>+</div><div class='add'>+Hardware Monitoring Kernel Drivers</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   ab8500</div><div class='add'>+   abituguru</div><div class='add'>+   abituguru3</div><div class='add'>+   abx500</div><div class='add'>+   acpi_power_meter</div><div class='add'>+   ad7314</div><div class='add'>+   adc128d818</div><div class='add'>+   adm1021</div><div class='add'>+   adm1025</div><div class='add'>+   adm1026</div><div class='add'>+   adm1031</div><div class='add'>+   adm1275</div><div class='add'>+   adm9240</div><div class='add'>+   ads1015</div><div class='add'>+   ads7828</div><div class='add'>+   adt7410</div><div class='add'>+   adt7411</div><div class='add'>+   adt7462</div><div class='add'>+   adt7470</div><div class='add'>+   adt7475</div><div class='add'>+   amc6821</div><div class='add'>+   asb100</div><div class='add'>+   asc7621</div><div class='add'>+   aspeed-pwm-tacho</div><div class='add'>+   coretemp</div><div class='add'>+   da9052</div><div class='add'>+   da9055</div><div class='add'>+   dme1737</div><div class='add'>+   ds1621</div><div class='add'>+   ds620</div><div class='add'>+   emc1403</div><div class='add'>+   emc2103</div><div class='add'>+   emc6w201</div><div class='add'>+   f71805f</div><div class='add'>+   f71882fg</div><div class='add'>+   fam15h_power</div><div class='add'>+   ftsteutates</div><div class='add'>+   g760a</div><div class='add'>+   g762</div><div class='add'>+   gl518sm</div><div class='add'>+   hih6130</div><div class='add'>+   ibmaem</div><div class='add'>+   ibm-cffps</div><div class='add'>+   ibmpowernv</div><div class='add'>+   ina209</div><div class='add'>+   ina2xx</div><div class='add'>+   ina3221</div><div class='add'>+   ir35221</div><div class='add'>+   ir38064</div><div class='add'>+   isl68137</div><div class='add'>+   it87</div><div class='add'>+   jc42</div><div class='add'>+   k10temp</div><div class='add'>+   k8temp</div><div class='add'>+   lineage-pem</div><div class='add'>+   lm25066</div><div class='add'>+   lm63</div><div class='add'>+   lm70</div><div class='add'>+   lm73</div><div class='add'>+   lm75</div><div class='add'>+   lm77</div><div class='add'>+   lm78</div><div class='add'>+   lm80</div><div class='add'>+   lm83</div><div class='add'>+   lm85</div><div class='add'>+   lm87</div><div class='add'>+   lm90</div><div class='add'>+   lm92</div><div class='add'>+   lm93</div><div class='add'>+   lm95234</div><div class='add'>+   lm95245</div><div class='add'>+   lochnagar</div><div class='add'>+   ltc2945</div><div class='add'>+   ltc2978</div><div class='add'>+   ltc2990</div><div class='add'>+   ltc3815</div><div class='add'>+   ltc4151</div><div class='add'>+   ltc4215</div><div class='add'>+   ltc4245</div><div class='add'>+   ltc4260</div><div class='add'>+   ltc4261</div><div class='add'>+   max16064</div><div class='add'>+   max16065</div><div class='add'>+   max1619</div><div class='add'>+   max1668</div><div class='add'>+   max197</div><div class='add'>+   max20751</div><div class='add'>+   max31722</div><div class='add'>+   max31785</div><div class='add'>+   max31790</div><div class='add'>+   max34440</div><div class='add'>+   max6639</div><div class='add'>+   max6642</div><div class='add'>+   max6650</div><div class='add'>+   max6697</div><div class='add'>+   max8688</div><div class='add'>+   mc13783-adc</div><div class='add'>+   mcp3021</div><div class='add'>+   menf21bmc</div><div class='add'>+   mlxreg-fan</div><div class='add'>+   nct6683</div><div class='add'>+   nct6775</div><div class='add'>+   nct7802</div><div class='add'>+   nct7904</div><div class='add'>+   npcm750-pwm-fan</div><div class='add'>+   nsa320</div><div class='add'>+   ntc_thermistor</div><div class='add'>+   occ</div><div class='add'>+   pc87360</div><div class='add'>+   pc87427</div><div class='add'>+   pcf8591</div><div class='add'>+   pmbus</div><div class='add'>+   powr1220</div><div class='add'>+   pwm-fan</div><div class='add'>+   raspberrypi-hwmon</div><div class='add'>+   sch5627</div><div class='add'>+   sch5636</div><div class='add'>+   scpi-hwmon</div><div class='add'>+   sht15</div><div class='add'>+   sht21</div><div class='add'>+   sht3x</div><div class='add'>+   shtc1</div><div class='add'>+   sis5595</div><div class='add'>+   smm665</div><div class='add'>+   smsc47b397</div><div class='add'>+   smsc47m192</div><div class='add'>+   smsc47m1</div><div class='add'>+   tc654</div><div class='add'>+   tc74</div><div class='add'>+   thmc50</div><div class='add'>+   tmp102</div><div class='add'>+   tmp103</div><div class='add'>+   tmp108</div><div class='add'>+   tmp401</div><div class='add'>+   tmp421</div><div class='add'>+   tps40422</div><div class='add'>+   twl4030-madc-hwmon</div><div class='add'>+   ucd9000</div><div class='add'>+   ucd9200</div><div class='add'>+   vexpress</div><div class='add'>+   via686a</div><div class='add'>+   vt1211</div><div class='add'>+   w83627ehf</div><div class='add'>+   w83627hf</div><div class='add'>+   w83773g</div><div class='add'>+   w83781d</div><div class='add'>+   w83791d</div><div class='add'>+   w83792d</div><div class='add'>+   w83793</div><div class='add'>+   w83795</div><div class='add'>+   w83l785ts</div><div class='add'>+   w83l786ng</div><div class='add'>+   wm831x</div><div class='add'>+   wm8350</div><div class='add'>+   xgene-hwmon</div><div class='add'>+   zl6100</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/hwmon/ir35221 b/Documentation/hwmon/ir35221.rst<br/>index f7e112752c04..a83922e5ccb5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ir35221?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ir35221</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ir35221.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ir35221.rst</a></div><div class='hunk'>@@ -2,9 +2,12 @@ Kernel driver ir35221</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='del'>-  * Infinion IR35221</div><div class='add'>+  * Infineon IR35221</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ir35221'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: Datasheet is not publicly available.</div><div class='ctx'> </div><div class='ctx'> Author: Samuel Mendoza-Jonas &lt;sam@mendozajonas.com&gt;</div><div class='hunk'>@@ -23,15 +26,16 @@ This driver does not probe for PMBus devices. You will have to instantiate</div><div class='ctx'> devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following commands will load the driver for an IR35221</div><div class='del'>-at address 0x70 on I2C bus #4:</div><div class='add'>+at address 0x70 on I2C bus #4::</div><div class='ctx'> </div><div class='del'>-# modprobe ir35221</div><div class='del'>-# echo ir35221 0x70 &gt; /sys/bus/i2c/devices/i2c-4/new_device</div><div class='add'>+	# modprobe ir35221</div><div class='add'>+	# echo ir35221 0x70 &gt; /sys/bus/i2c/devices/i2c-4/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> curr1_label		"iin"</div><div class='ctx'> curr1_input		Measured input current</div><div class='ctx'> curr1_max		Maximum current</div><div class='hunk'>@@ -85,3 +89,4 @@ temp[1-2]_highest	Highest temperature</div><div class='ctx'> temp[1-2]_lowest	Lowest temperature</div><div class='ctx'> temp[1-2]_max		Maximum temperature</div><div class='ctx'> temp[1-2]_max_alarm	Chip temperature high alarm</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/ir38064.rst b/Documentation/hwmon/ir38064.rst<br/>new file mode 100644<br/>index 000000000000..c455d755a267<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ir38064.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ir38064.rst</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+Kernel driver ir38064</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+</div><div class='add'>+  * Infineon IR38064</div><div class='add'>+</div><div class='add'>+    Prefix: 'ir38064'</div><div class='add'>+    Addresses scanned: -</div><div class='add'>+</div><div class='add'>+    Datasheet: Publicly available at the Infineon webiste</div><div class='add'>+      https://www.infineon.com/dgdl/Infineon-IR38064MTRPBF-DS-v03_07-EN.pdf?fileId=5546d462584d1d4a0158db0d9efb67ca</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+      - Maxim Sloyko &lt;maxims@google.com&gt;</div><div class='add'>+      - Patrick Venture &lt;venture@google.com&gt;</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+IR38064 is a Single-input Voltage, Synchronous Buck Regulator, DC-DC Converter.</div><div class='add'>+</div><div class='add'>+Usage Notes</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver does not probe for PMBus devices. You will have to instantiate</div><div class='add'>+devices explicitly.</div><div class='add'>+</div><div class='add'>+Sysfs attributes</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+======================= ===========================</div><div class='add'>+curr1_label		"iout1"</div><div class='add'>+curr1_input		Measured output current</div><div class='add'>+curr1_crit		Critical maximum current</div><div class='add'>+curr1_crit_alarm	Current critical high alarm</div><div class='add'>+curr1_max		Maximum current</div><div class='add'>+curr1_max_alarm		Current high alarm</div><div class='add'>+</div><div class='add'>+in1_label		"vin"</div><div class='add'>+in1_input		Measured input voltage</div><div class='add'>+in1_crit		Critical maximum input voltage</div><div class='add'>+in1_crit_alarm		Input voltage critical high alarm</div><div class='add'>+in1_min			Minimum input voltage</div><div class='add'>+in1_min_alarm		Input voltage low alarm</div><div class='add'>+</div><div class='add'>+in2_label		"vout1"</div><div class='add'>+in2_input		Measured output voltage</div><div class='add'>+in2_lcrit		Critical minimum output voltage</div><div class='add'>+in2_lcrit_alarm		Output voltage critical low alarm</div><div class='add'>+in2_crit		Critical maximum output voltage</div><div class='add'>+in2_crit_alarm		Output voltage critical high alarm</div><div class='add'>+in2_max			Maximum output voltage</div><div class='add'>+in2_max_alarm		Output voltage high alarm</div><div class='add'>+in2_min			Minimum output voltage</div><div class='add'>+in2_min_alarm		Output voltage low alarm</div><div class='add'>+</div><div class='add'>+power1_label		"pout1"</div><div class='add'>+power1_input		Measured output power</div><div class='add'>+</div><div class='add'>+temp1_input		Measured temperature</div><div class='add'>+temp1_crit		Critical high temperature</div><div class='add'>+temp1_crit_alarm	Chip temperature critical high alarm</div><div class='add'>+temp1_max		Maximum temperature</div><div class='add'>+temp1_max_alarm		Chip temperature high alarm</div><div class='add'>+======================= ===========================</div><div class='head'>diff --git a/Documentation/hwmon/isl68137.rst b/Documentation/hwmon/isl68137.rst<br/>new file mode 100644<br/>index 000000000000..a5a7c8545c9e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/isl68137.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/isl68137.rst</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+Kernel driver isl68137</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+</div><div class='add'>+  * Intersil ISL68137</div><div class='add'>+</div><div class='add'>+    Prefix: 'isl68137'</div><div class='add'>+</div><div class='add'>+    Addresses scanned: -</div><div class='add'>+</div><div class='add'>+    Datasheet:</div><div class='add'>+</div><div class='add'>+      Publicly available at the Intersil website</div><div class='add'>+      https://www.intersil.com/content/dam/Intersil/documents/isl6/isl68137.pdf</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+      - Maxim Sloyko &lt;maxims@google.com&gt;</div><div class='add'>+      - Robert Lippert &lt;rlippert@google.com&gt;</div><div class='add'>+      - Patrick Venture &lt;venture@google.com&gt;</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Intersil ISL68137 is a digital output 7-phase configurable PWM</div><div class='add'>+controller with an AVSBus interface.</div><div class='add'>+</div><div class='add'>+Usage Notes</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver does not probe for PMBus devices. You will have to instantiate</div><div class='add'>+devices explicitly.</div><div class='add'>+</div><div class='add'>+The ISL68137 AVS operation mode must be enabled/disabled at runtime.</div><div class='add'>+</div><div class='add'>+Beyond the normal sysfs pmbus attributes, the driver exposes a control attribute.</div><div class='add'>+</div><div class='add'>+Additional Sysfs attributes</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+======================= ====================================</div><div class='add'>+avs(0|1)_enable		Controls the AVS state of each rail.</div><div class='add'>+</div><div class='add'>+curr1_label		"iin"</div><div class='add'>+curr1_input		Measured input current</div><div class='add'>+curr1_crit		Critical maximum current</div><div class='add'>+curr1_crit_alarm	Current critical high alarm</div><div class='add'>+</div><div class='add'>+curr[2-3]_label		"iout[1-2]"</div><div class='add'>+curr[2-3]_input		Measured output current</div><div class='add'>+curr[2-3]_crit		Critical maximum current</div><div class='add'>+curr[2-3]_crit_alarm	Current critical high alarm</div><div class='add'>+</div><div class='add'>+in1_label		"vin"</div><div class='add'>+in1_input		Measured input voltage</div><div class='add'>+in1_lcrit		Critical minimum input voltage</div><div class='add'>+in1_lcrit_alarm		Input voltage critical low alarm</div><div class='add'>+in1_crit		Critical maximum input voltage</div><div class='add'>+in1_crit_alarm		Input voltage critical high alarm</div><div class='add'>+</div><div class='add'>+in[2-3]_label		"vout[1-2]"</div><div class='add'>+in[2-3]_input		Measured output voltage</div><div class='add'>+in[2-3]_lcrit		Critical minimum output voltage</div><div class='add'>+in[2-3]_lcrit_alarm	Output voltage critical low alarm</div><div class='add'>+in[2-3]_crit		Critical maximum output voltage</div><div class='add'>+in[2-3]_crit_alarm	Output voltage critical high alarm</div><div class='add'>+</div><div class='add'>+power1_label		"pin"</div><div class='add'>+power1_input		Measured input power</div><div class='add'>+power1_alarm		Input power high alarm</div><div class='add'>+</div><div class='add'>+power[2-3]_label	"pout[1-2]"</div><div class='add'>+power[2-3]_input	Measured output power</div><div class='add'>+</div><div class='add'>+temp[1-3]_input		Measured temperature</div><div class='add'>+temp[1-3]_crit		Critical high temperature</div><div class='add'>+temp[1-3]_crit_alarm	Chip temperature critical high alarm</div><div class='add'>+temp[1-3]_max		Maximum temperature</div><div class='add'>+temp[1-3]_max_alarm	Chip temperature high alarm</div><div class='add'>+======================= ====================================</div><div class='head'>diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87.rst<br/>index fff6f6bf55bc..2d83f23bee93 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/it87?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/it87</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/it87.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/it87.rst</a></div><div class='hunk'>@@ -2,105 +2,179 @@ Kernel driver it87</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * IT8603E/IT8623E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8603'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8620E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8620'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>   * IT8628E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8628'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8705F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it87'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Once publicly available at the ITE website, but no longer</div><div class='add'>+</div><div class='ctx'>   * IT8712F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8712'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Once publicly available at the ITE website, but no longer</div><div class='add'>+</div><div class='ctx'>   * IT8716F/IT8726F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8716'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Once publicly available at the ITE website, but no longer</div><div class='add'>+</div><div class='ctx'>   * IT8718F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8718'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Once publicly available at the ITE website, but no longer</div><div class='add'>+</div><div class='ctx'>   * IT8720F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8720'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8721F/IT8758E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8721'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8728F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8728'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8732F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8732'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8771E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8771'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8772E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8772'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8781F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8781'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8782F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8782'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8783E/F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8783'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8786E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8786'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * IT8790E</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it8790'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+</div><div class='ctx'>   * SiS950   [clone of IT8705F]</div><div class='add'>+</div><div class='ctx'>     Prefix: 'it87'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: No longer be available</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-    Christophe Gauthron</div><div class='del'>-    Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+    - Christophe Gauthron</div><div class='add'>+    - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * update_vbat: int</div><div class='del'>-</div><div class='del'>-  0 if vbat should report power on value, 1 if vbat should be updated after</div><div class='del'>-  each read. Default is 0. On some boards the battery voltage is provided</div><div class='del'>-  by either the battery or the onboard power supply. Only the first reading</div><div class='del'>-  at power on will be the actual battery voltage (which the chip does</div><div class='del'>-  automatically). On other boards the battery voltage is always fed to</div><div class='del'>-  the chip so can be read at any time. Excessive reading may decrease</div><div class='del'>-  battery life but no information is given in the datasheet.</div><div class='add'>+    0 if vbat should report power on value, 1 if vbat should be updated after</div><div class='add'>+    each read. Default is 0. On some boards the battery voltage is provided</div><div class='add'>+    by either the battery or the onboard power supply. Only the first reading</div><div class='add'>+    at power on will be the actual battery voltage (which the chip does</div><div class='add'>+    automatically). On other boards the battery voltage is always fed to</div><div class='add'>+    the chip so can be read at any time. Excessive reading may decrease</div><div class='add'>+    battery life but no information is given in the datasheet.</div><div class='ctx'> </div><div class='ctx'> * fix_pwm_polarity int</div><div class='del'>-</div><div class='del'>-  Force PWM polarity to active high (DANGEROUS). Some chips are</div><div class='del'>-  misconfigured by BIOS - PWM values would be inverted. This option tries</div><div class='del'>-  to fix this. Please contact your BIOS manufacturer and ask him for fix.</div><div class='add'>+    Force PWM polarity to active high (DANGEROUS). Some chips are</div><div class='add'>+    misconfigured by BIOS - PWM values would be inverted. This option tries</div><div class='add'>+    to fix this. Please contact your BIOS manufacturer and ask him for fix.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Hardware Interfaces</div><div class='head'>diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42.rst<br/>index b4b671f22453..5b14b49bb6f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/jc42?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/jc42</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/jc42.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/jc42.rst</a></div><div class='hunk'>@@ -2,53 +2,100 @@ Kernel driver jc42</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7408</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf</div><div class='add'>+</div><div class='ctx'>   * Atmel AT30TS00, AT30TS002A/B, AT30TSE004A</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.atmel.com/Images/doc8585.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.atmel.com/Images/doc8711.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.atmel.com/Images/Atmel-8852-SEEPROM-AT30TSE002A-Datasheet.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.atmel.com/Images/Atmel-8868-DTS-AT30TSE004A-Datasheet.pdf</div><div class='add'>+</div><div class='ctx'>   * IDT TSE2002B3, TSE2002GB2, TSE2004GB2, TS3000B3, TS3000GB0, TS3000GB2,</div><div class='add'>+</div><div class='ctx'> 	TS3001GB2</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	Available from IDT web site</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6604</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf</div><div class='add'>+</div><div class='ctx'>   * Microchip MCP9804, MCP9805, MCP9808, MCP98242, MCP98243, MCP98244, MCP9843</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf</div><div class='add'>+</div><div class='ctx'> 	http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf</div><div class='add'>+</div><div class='ctx'> 	http://ww1.microchip.com/downloads/en/DeviceDoc/25095A.pdf</div><div class='add'>+</div><div class='ctx'> 	http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf</div><div class='add'>+</div><div class='ctx'> 	http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf</div><div class='add'>+</div><div class='ctx'> 	http://ww1.microchip.com/downloads/en/DeviceDoc/22327A.pdf</div><div class='add'>+</div><div class='ctx'>   * NXP Semiconductors SE97, SE97B, SE98, SE98A</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.nxp.com/documents/data_sheet/SE97.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.nxp.com/documents/data_sheet/SE97B.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.nxp.com/documents/data_sheet/SE98.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.nxp.com/documents/data_sheet/SE98A.pdf</div><div class='add'>+</div><div class='ctx'>   * ON Semiconductor CAT34TS02, CAT6095</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://www.onsemi.com/pub_link/Collateral/CAT34TS02-D.PDF</div><div class='add'>+</div><div class='ctx'> 	http://www.onsemi.com/pub/Collateral/CAT6095-D.PDF</div><div class='add'>+</div><div class='ctx'>   * ST Microelectronics STTS424, STTS424E02, STTS2002, STTS2004, STTS3000</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.st.com/web/en/resource/technical/document/datasheet/CD00157556.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.st.com/web/en/resource/technical/document/datasheet/CD00157558.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.st.com/web/en/resource/technical/document/datasheet/CD00266638.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.st.com/web/en/resource/technical/document/datasheet/CD00225278.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.st.com/web/en/resource/technical/document/datasheet/DM00076709.pdf</div><div class='add'>+</div><div class='ctx'>   * JEDEC JC 42.4 compliant temperature sensor chips</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://www.jedec.org/sites/default/files/docs/4_01_04R19.pdf</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'>   Common for all chips:</div><div class='add'>+</div><div class='ctx'>     Prefix: 'jc42'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1f</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='hunk'>@@ -67,10 +114,10 @@ The driver auto-detects the chips listed above, but can be manually instantiated</div><div class='ctx'> to support other JC 42.4 compliant chips.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for a generic JC 42.4 compliant</div><div class='del'>-temperature sensor at address 0x18 on I2C bus #1:</div><div class='add'>+temperature sensor at address 0x18 on I2C bus #1::</div><div class='ctx'> </div><div class='del'>-# modprobe jc42</div><div class='del'>-# echo jc42 0x18 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+	# modprobe jc42</div><div class='add'>+	# echo jc42 0x18 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> A JC 42.4 compliant chip supports a single temperature sensor. Minimum, maximum,</div><div class='ctx'> and critical temperature can be configured. There are alarms for high, low,</div><div class='hunk'>@@ -90,6 +137,7 @@ cannot be changed.</div><div class='ctx'> Sysfs entries</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='add'>+======================= ===========================================</div><div class='ctx'> temp1_input		Temperature (RO)</div><div class='ctx'> temp1_min		Minimum temperature (RO or RW)</div><div class='ctx'> temp1_max		Maximum temperature (RO or RW)</div><div class='hunk'>@@ -101,3 +149,4 @@ temp1_max_hyst		Maximum hysteresis temperature (RO)</div><div class='ctx'> temp1_min_alarm		Temperature low alarm</div><div class='ctx'> temp1_max_alarm		Temperature high alarm</div><div class='ctx'> temp1_crit_alarm	Temperature critical alarm</div><div class='add'>+======================= ===========================================</div><div class='head'>diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp.rst<br/>index 254d2f55345a..12a86ba17de9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/k10temp?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/k10temp</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/k10temp.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/k10temp.rst</a></div><div class='hunk'>@@ -2,42 +2,77 @@ Kernel driver k10temp</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'> * AMD Family 10h processors:</div><div class='add'>+</div><div class='ctx'>   Socket F: Quad-Core/Six-Core/Embedded Opteron (but see below)</div><div class='add'>+</div><div class='ctx'>   Socket AM2+: Quad-Core Opteron, Phenom (II) X3/X4, Athlon X2 (but see below)</div><div class='add'>+</div><div class='ctx'>   Socket AM3: Quad-Core Opteron, Athlon/Phenom II X2/X3/X4, Sempron II</div><div class='add'>+</div><div class='ctx'>   Socket S1G3: Athlon II, Sempron, Turion II</div><div class='add'>+</div><div class='ctx'> * AMD Family 11h processors:</div><div class='add'>+</div><div class='ctx'>   Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)</div><div class='add'>+</div><div class='ctx'> * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)</div><div class='add'>+</div><div class='ctx'> * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)</div><div class='add'>+</div><div class='ctx'> * AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri", "Carrizo"</div><div class='add'>+</div><div class='ctx'> * AMD Family 16h processors: "Kabini", "Mullins"</div><div class='ctx'> </div><div class='ctx'>   Prefix: 'k10temp'</div><div class='add'>+</div><div class='ctx'>   Addresses scanned: PCI space</div><div class='add'>+</div><div class='ctx'>   Datasheets:</div><div class='add'>+</div><div class='ctx'>   BIOS and Kernel Developer's Guide (BKDG) For AMD Family 10h Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/31116.pdf</div><div class='add'>+</div><div class='ctx'>   BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/41256.pdf</div><div class='add'>+</div><div class='ctx'>   BIOS and Kernel Developer's Guide (BKDG) for AMD Family 12h Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/41131.pdf</div><div class='add'>+</div><div class='ctx'>   BIOS and Kernel Developer's Guide (BKDG) for AMD Family 14h Models 00h-0Fh Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/43170.pdf</div><div class='add'>+</div><div class='ctx'>   Revision Guide for AMD Family 10h Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/41322.pdf</div><div class='add'>+</div><div class='ctx'>   Revision Guide for AMD Family 11h Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/41788.pdf</div><div class='add'>+</div><div class='ctx'>   Revision Guide for AMD Family 12h Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/44739.pdf</div><div class='add'>+</div><div class='ctx'>   Revision Guide for AMD Family 14h Models 00h-0Fh Processors:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/47534.pdf</div><div class='add'>+</div><div class='ctx'>   AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/43373.pdf</div><div class='add'>+</div><div class='ctx'>   AMD Family 10h Server and Workstation Processor Power and Thermal Data Sheet:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/43374.pdf</div><div class='add'>+</div><div class='ctx'>   AMD Family 10h Desktop Processor Power and Thermal Data Sheet:</div><div class='add'>+</div><div class='ctx'>     http://support.amd.com/us/Processor_TechDocs/43375.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='hunk'>@@ -60,7 +95,7 @@ are using an AM3 processor on an AM2+ mainboard, you can safely use the</div><div class='ctx'> </div><div class='ctx'> There is one temperature measurement value, available as temp1_input in</div><div class='ctx'> sysfs. It is measured in degrees Celsius with a resolution of 1/8th degree.</div><div class='del'>-Please note that it is defined as a relative value; to quote the AMD manual:</div><div class='add'>+Please note that it is defined as a relative value; to quote the AMD manual::</div><div class='ctx'> </div><div class='ctx'>   Tctl is the processor temperature control value, used by the platform to</div><div class='ctx'>   control cooling systems. Tctl is a non-physical temperature on an</div><div class='head'>diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp.rst<br/>index 716dc24c7237..72da12aa17e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/k8temp?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/k8temp</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/k8temp.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/k8temp.rst</a></div><div class='hunk'>@@ -2,12 +2,17 @@ Kernel driver k8temp</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * AMD Athlon64/FX or Opteron CPUs</div><div class='add'>+</div><div class='ctx'>     Prefix: 'k8temp'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: PCI space</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://support.amd.com/us/Processor_TechDocs/32559.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Rudolf Marek</div><div class='add'>+</div><div class='ctx'> Contact: Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -27,10 +32,12 @@ implemented sensors.</div><div class='ctx'> </div><div class='ctx'> Mapping of /sys files is as follows:</div><div class='ctx'> </div><div class='del'>-temp1_input - temperature of Core 0 and "place" 0</div><div class='del'>-temp2_input - temperature of Core 0 and "place" 1</div><div class='del'>-temp3_input - temperature of Core 1 and "place" 0</div><div class='del'>-temp4_input - temperature of Core 1 and "place" 1</div><div class='add'>+============= ===================================</div><div class='add'>+temp1_input   temperature of Core 0 and "place" 0</div><div class='add'>+temp2_input   temperature of Core 0 and "place" 1</div><div class='add'>+temp3_input   temperature of Core 1 and "place" 0</div><div class='add'>+temp4_input   temperature of Core 1 and "place" 1</div><div class='add'>+============= ===================================</div><div class='ctx'> </div><div class='ctx'> Temperatures are measured in degrees Celsius and measurement resolution is</div><div class='ctx'> 1 degree C. It is expected that future CPU will have better resolution. The</div><div class='hunk'>@@ -48,7 +55,7 @@ computed temperature called TControl, which must be lower than TControlMax.</div><div class='ctx'> </div><div class='ctx'> The relationship is following:</div><div class='ctx'> </div><div class='del'>-temp1_input - TjOffset*2 &lt; TControlMax,</div><div class='add'>+	temp1_input - TjOffset*2 &lt; TControlMax,</div><div class='ctx'> </div><div class='ctx'> TjOffset is not yet exported by the driver, TControlMax is usually</div><div class='ctx'> 70 degrees C. The rule of the thumb -&gt; CPU temperature should not cross</div><div class='head'>diff --git a/Documentation/hwmon/lineage-pem b/Documentation/hwmon/lineage-pem.rst<br/>index 83b2ddc160c8..10c271dc20e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lineage-pem?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lineage-pem</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lineage-pem.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lineage-pem.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver lineage-pem</div><div class='ctx'> =========================</div><div class='ctx'> </div><div class='ctx'> Supported devices:</div><div class='add'>+</div><div class='ctx'>   * Lineage Compact Power Line Power Entry Modules</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lineage-pem'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Documentation:</div><div class='del'>-        http://www.lineagepower.com/oem/pdf/CPLI2C.pdf</div><div class='add'>+</div><div class='add'>+	http://www.lineagepower.com/oem/pdf/CPLI2C.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,9 +36,10 @@ which can be safely used to identify the chip. You will have to instantiate</div><div class='ctx'> the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for a Lineage PEM at address 0x40</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe lineage-pem</div><div class='del'>-$ echo lineage-pem 0x40 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe lineage-pem</div><div class='add'>+	$ echo lineage-pem 0x40 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> All Lineage CPL power entry modules have a built-in I2C bus master selector</div><div class='ctx'> (PCA9541). To ensure device access, this driver should only be used as client</div><div class='hunk'>@@ -51,6 +57,7 @@ Input voltage, input current, input power, and fan speed measurement is only</div><div class='ctx'> supported on newer devices. The driver detects if those attributes are supported,</div><div class='ctx'> and only creates respective sysfs entries if they are.</div><div class='ctx'> </div><div class='add'>+======================= ===============================</div><div class='ctx'> in1_input		Output voltage (mV)</div><div class='ctx'> in1_min_alarm		Output undervoltage alarm</div><div class='ctx'> in1_max_alarm		Output overvoltage alarm</div><div class='hunk'>@@ -75,3 +82,4 @@ temp1_crit</div><div class='ctx'> temp1_alarm</div><div class='ctx'> temp1_crit_alarm</div><div class='ctx'> temp1_fault</div><div class='add'>+======================= ===============================</div><div class='head'>diff --git a/Documentation/hwmon/lm25066 b/Documentation/hwmon/lm25066.rst<br/>index 51b32aa203a8..da15e3094c8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm25066?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm25066</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm25066.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm25066.rst</a></div><div class='hunk'>@@ -2,34 +2,62 @@ Kernel driver lm25066</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * TI LM25056</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm25056'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/lm25056</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/lm25056a</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM25066</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm25066'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.national.com/pf/LM/LM25066.html</div><div class='add'>+</div><div class='ctx'> 	http://www.national.com/pf/LM/LM25066A.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM5064</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm5064'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://www.national.com/pf/LM/LM5064.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM5066</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm5066'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://www.national.com/pf/LM/LM5066.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments LM5066I</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm5066i'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'> 	Datasheet:</div><div class='add'>+</div><div class='ctx'>     http://www.ti.com/product/LM5066I</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +69,7 @@ LM25066, LM5064, and LM5066/LM5066I Power Management, Monitoring,</div><div class='ctx'> Control, and Protection ICs.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -64,6 +92,7 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in1_label		"vin"</div><div class='ctx'> in1_input		Measured input voltage.</div><div class='ctx'> in1_average		Average measured input voltage.</div><div class='hunk'>@@ -105,3 +134,4 @@ temp1_max		Maximum temperature.</div><div class='ctx'> temp1_crit		Critical high temperature.</div><div class='ctx'> temp1_max_alarm		Chip temperature high alarm.</div><div class='ctx'> temp1_crit_alarm	Chip temperature critical high alarm.</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/lm63 b/Documentation/hwmon/lm63.rst<br/>index 4a00461512a6..f478132b0408 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm63?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm63</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm63.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm63.rst</a></div><div class='hunk'>@@ -2,26 +2,43 @@ Kernel driver lm63</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM63</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm63'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM63.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/pf/LM/LM63.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM64</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm64'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 and 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM64.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/pf/LM/LM64.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM96163</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm96163'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM96163.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/pf/LM/LM96163.html</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Thanks go to Tyan and especially Alex Buckingham for setting up a remote</div><div class='ctx'> access to their S4882 test platform for this driver.</div><div class='add'>+</div><div class='ctx'>   http://www.tyan.com/</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -32,6 +49,7 @@ and control.</div><div class='ctx'> </div><div class='ctx'> The LM63 is basically an LM86 with fan speed monitoring and control</div><div class='ctx'> capabilities added. It misses some of the LM86 features though:</div><div class='add'>+</div><div class='ctx'>  - No low limit for local temperature.</div><div class='ctx'>  - No critical limit for local temperature.</div><div class='ctx'>  - Critical limit for remote temperature can be changed only once. We</div><div class='head'>diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70.rst<br/>index c3a1f2ea017d..f259bc1fcd91 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm70?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm70</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm70.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm70.rst</a></div><div class='hunk'>@@ -2,19 +2,30 @@ Kernel driver lm70</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM70</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/pf/LM/LM70.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP121/TMP123</div><div class='add'>+</div><div class='ctx'>     Information: http://focus.ti.com/docs/prod/folders/print/tmp121.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP122/TMP124</div><div class='add'>+</div><div class='ctx'>     Information: http://www.ti.com/product/tmp122</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM71</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/product/LM71</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM74</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/product/LM74</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Author:</div><div class='del'>-        Kaiwan N Billimoria &lt;kaiwan@designergraphix.com&gt;</div><div class='add'>+	Kaiwan N Billimoria &lt;kaiwan@designergraphix.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/lm73 b/Documentation/hwmon/lm73.rst<br/>index 8af059dcb642..1d6a46844e85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm73?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm73</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm73.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm73.rst</a></div><div class='hunk'>@@ -2,13 +2,20 @@ Kernel driver lm73</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments LM73</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm73'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48, 0x49, 0x4a, 0x4c, 0x4d, and 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/product/lm73</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/lm73</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Author: Guillaume Ligneul &lt;guillaume.ligneul@gmail.com&gt;</div><div class='add'>+</div><div class='ctx'> Documentation: Chris Verges &lt;kg4ysn@gmail.com&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -29,17 +36,18 @@ conversion time via the 'update_interval' sysfs attribute for the</div><div class='ctx'> device.  This attribute will normalize ranges of input values to the</div><div class='ctx'> maximum times defined for the resolution in the datasheet.</div><div class='ctx'> </div><div class='add'>+    ============= ============= ============</div><div class='ctx'>     Resolution    Conv. Time    Input Range</div><div class='ctx'>     (C/LSB)       (msec)        (msec)</div><div class='del'>-    --------------------------------------</div><div class='add'>+    ============= ============= ============</div><div class='ctx'>     0.25          14             0..14</div><div class='ctx'>     0.125         28            15..28</div><div class='ctx'>     0.0625        56            29..56</div><div class='ctx'>     0.03125       112           57..infinity</div><div class='del'>-    --------------------------------------</div><div class='add'>+    ============= ============= ============</div><div class='ctx'> </div><div class='ctx'> The following examples show how the 'update_interval' attribute can be</div><div class='del'>-used to change the conversion time:</div><div class='add'>+used to change the conversion time::</div><div class='ctx'> </div><div class='ctx'>     $ echo 0 &gt; update_interval</div><div class='ctx'>     $ cat update_interval</div><div class='head'>diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75.rst<br/>index 010583608f12..ba8acbd2a6cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm75?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm75</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm75.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm75.rst</a></div><div class='hunk'>@@ -2,68 +2,132 @@ Kernel driver lm75</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM75</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm75'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM75A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm75a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='ctx'>   * Dallas Semiconductor (now Maxim) DS75, DS1775, DS7505</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'ds75', 'ds1775', 'ds7505'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maximintegrated.com/</div><div class='add'>+</div><div class='add'>+	       http://www.maximintegrated.com/</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6625, MAX6626, MAX31725, MAX31726</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max6625', 'max6626', 'max31725', 'max31726'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/</div><div class='add'>+</div><div class='ctx'>   * Microchip (TelCom) TCN75</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tcn75'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Microchip website</div><div class='del'>-               http://www.microchip.com/</div><div class='add'>+</div><div class='add'>+	       http://www.microchip.com/</div><div class='add'>+</div><div class='ctx'>   * Microchip MCP9800, MCP9801, MCP9802, MCP9803</div><div class='add'>+</div><div class='ctx'>     Prefix: 'mcp980x'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Microchip website</div><div class='del'>-               http://www.microchip.com/</div><div class='add'>+</div><div class='add'>+	       http://www.microchip.com/</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT75</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt75'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Analog Devices website</div><div class='del'>-               http://www.analog.com/adt75</div><div class='add'>+</div><div class='add'>+	       http://www.analog.com/adt75</div><div class='add'>+</div><div class='ctx'>   * ST Microelectronics STDS75</div><div class='add'>+</div><div class='ctx'>     Prefix: 'stds75'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the ST website</div><div class='del'>-               http://www.st.com/internet/analog/product/121769.jsp</div><div class='add'>+</div><div class='add'>+	       http://www.st.com/internet/analog/product/121769.jsp</div><div class='add'>+</div><div class='ctx'>   * ST Microelectronics STLM75</div><div class='add'>+</div><div class='ctx'>     Prefix: 'stlm75'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the ST website</div><div class='add'>+</div><div class='ctx'> 	       https://www.st.com/resource/en/datasheet/stlm75.pdf</div><div class='del'>-  * Texas Instruments TMP100, TMP101, TMP105, TMP112, TMP75, TMP75C, TMP175, TMP275</div><div class='del'>-    Prefixes: 'tmp100', 'tmp101', 'tmp105', 'tmp112', 'tmp175', 'tmp75', 'tmp75c', 'tmp275'</div><div class='add'>+</div><div class='add'>+  * Texas Instruments TMP100, TMP101, TMP105, TMP112, TMP75, TMP75B, TMP75C, TMP175, TMP275</div><div class='add'>+</div><div class='add'>+    Prefixes: 'tmp100', 'tmp101', 'tmp105', 'tmp112', 'tmp175', 'tmp75', 'tmp75b', 'tmp75c', 'tmp275'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/product/tmp100</div><div class='del'>-               http://www.ti.com/product/tmp101</div><div class='del'>-               http://www.ti.com/product/tmp105</div><div class='del'>-               http://www.ti.com/product/tmp112</div><div class='del'>-               http://www.ti.com/product/tmp75</div><div class='del'>-               http://www.ti.com/product/tmp75c</div><div class='del'>-               http://www.ti.com/product/tmp175</div><div class='del'>-               http://www.ti.com/product/tmp275</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp100</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp101</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp105</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp112</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp75</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp75b</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp75c</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp175</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/tmp275</div><div class='add'>+</div><div class='ctx'>   * NXP LM75B</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm75b'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the NXP website</div><div class='del'>-               http://www.nxp.com/documents/data_sheet/LM75B.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.nxp.com/documents/data_sheet/LM75B.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Frodo Looijaard &lt;frodol@dds.nl&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/lm77 b/Documentation/hwmon/lm77.rst<br/>index bfc915fe3639..4ed3fe6b999a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm77?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm77</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm77.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm77.rst</a></div><div class='hunk'>@@ -2,11 +2,17 @@ Kernel driver lm77</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM77</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm77'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48 - 0x4b</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Author: Andras BALI &lt;drewie@freemail.hu&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,6 +31,7 @@ register on the chip, which means that the relative difference between</div><div class='ctx'> the limit and its hysteresis is always the same for all 3 limits.</div><div class='ctx'> </div><div class='ctx'> This implementation detail implies the following:</div><div class='add'>+</div><div class='ctx'> * When setting a limit, its hysteresis will automatically follow, the</div><div class='ctx'>   difference staying unchanged. For example, if the old critical limit</div><div class='ctx'>   was 80 degrees C, and the hysteresis was 75 degrees C, and you change</div><div class='head'>diff --git a/Documentation/hwmon/lm78 b/Documentation/hwmon/lm78.rst<br/>index 4dd47731789f..cb7a4832f35e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm78?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm78</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm78.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm78.rst</a></div><div class='hunk'>@@ -2,19 +2,31 @@ Kernel driver lm78</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM78 / LM78-J</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm78'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM79</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm79'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='ctx'> </div><div class='del'>-Authors: Frodo Looijaard &lt;frodol@dds.nl&gt;</div><div class='del'>-         Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+	- Frodo Looijaard &lt;frodol@dds.nl&gt;</div><div class='add'>+	- Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/lm80 b/Documentation/hwmon/lm80.rst<br/>index a60b43efc32b..c53186abd82e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm80?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm80</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm80.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm80.rst</a></div><div class='hunk'>@@ -2,20 +2,31 @@ Kernel driver lm80</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM80</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm80'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM96080</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm96080'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Philip Edelbrock &lt;phil@netroedge.com&gt;</div><div class='add'>+       - Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+       - Philip Edelbrock &lt;phil@netroedge.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/lm83 b/Documentation/hwmon/lm83.rst<br/>index 50be5cb26de9..ecf83819960e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm83?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm83</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm83.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm83.rst</a></div><div class='hunk'>@@ -2,16 +2,24 @@ Kernel driver lm83</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM83</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm83'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM83.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/pf/LM/LM83.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM82</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM82.html</div><div class='ctx'> </div><div class='add'>+	       http://www.national.com/pf/LM/LM82.html</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,13 +42,17 @@ fact that any of these motherboards do actually have an LM83, please</div><div class='ctx'> contact us. Note that the LM90 can easily be misdetected as a LM83.</div><div class='ctx'> </div><div class='ctx'> Confirmed motherboards:</div><div class='add'>+    ===		=====</div><div class='ctx'>     SBS         P014</div><div class='ctx'>     SBS         PSL09</div><div class='add'>+    ===		=====</div><div class='ctx'> </div><div class='ctx'> Unconfirmed motherboards:</div><div class='add'>+    =========== ==========</div><div class='ctx'>     Gigabyte    GA-8IK1100</div><div class='ctx'>     Iwill       MPX2</div><div class='ctx'>     Soltek      SL-75DRV5</div><div class='add'>+    =========== ==========</div><div class='ctx'> </div><div class='ctx'> The LM82 is confirmed to have been found on most AMD Geode reference</div><div class='ctx'> designs and test platforms.</div><div class='head'>diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85.rst<br/>index 2329c383efe4..faa92f54431c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm85?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm85</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm85.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm85.rst</a></div><div class='hunk'>@@ -2,49 +2,85 @@ Kernel driver lm85</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM85 (B and C versions)</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm85b' or 'lm85c'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/pf/LM/LM85.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments LM96000</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm9600'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/lit/ds/symlink/lm96000.pdf</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1027</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1027'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.onsemi.com/PowerSolutions/product.do?id=ADM1027</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7463</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7463'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.onsemi.com/PowerSolutions/product.do?id=ADT7463</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7468</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7468'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.onsemi.com/PowerSolutions/product.do?id=ADT7468</div><div class='add'>+</div><div class='ctx'>   * SMSC EMC6D100, SMSC EMC6D101</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc6d100'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='del'>-    Datasheet: http://www.smsc.com/media/Downloads_Public/discontinued/6d100.pdf </div><div class='add'>+</div><div class='add'>+    Datasheet: http://www.smsc.com/media/Downloads_Public/discontinued/6d100.pdf</div><div class='add'>+</div><div class='ctx'>   * SMSC EMC6D102</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc6d102'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.smsc.com/main/catalog/emc6d102.html</div><div class='add'>+</div><div class='ctx'>   * SMSC EMC6D103</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc6d103'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.smsc.com/main/catalog/emc6d103.html</div><div class='add'>+</div><div class='ctx'>   * SMSC EMC6D103S</div><div class='add'>+</div><div class='ctx'>     Prefix: 'emc6d103s'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.smsc.com/main/catalog/emc6d103s.html</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Philip Pokorny &lt;ppokorny@penguincomputing.com&gt;,</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Richard Barrington &lt;rich_b_nz@clear.net.nz&gt;,</div><div class='del'>-        Margit Schubert-While &lt;margitsw@t-online.de&gt;,</div><div class='del'>-        Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;</div><div class='add'>+       - Philip Pokorny &lt;ppokorny@penguincomputing.com&gt;,</div><div class='add'>+       - Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+       - Richard Barrington &lt;rich_b_nz@clear.net.nz&gt;,</div><div class='add'>+       - Margit Schubert-While &lt;margitsw@t-online.de&gt;,</div><div class='add'>+       - Justin Thiessen &lt;jthiessen@penguincomputing.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -177,38 +213,50 @@ Each temperature sensor is associated with a Zone. There are three</div><div class='ctx'> sensors and therefore three zones (# 1, 2 and 3). Each zone has the following</div><div class='ctx'> temperature configuration points:</div><div class='ctx'> </div><div class='del'>-* temp#_auto_temp_off - temperature below which fans should be off or spinning very low.</div><div class='del'>-* temp#_auto_temp_min - temperature over which fans start to spin.</div><div class='del'>-* temp#_auto_temp_max - temperature when fans spin at full speed.</div><div class='del'>-* temp#_auto_temp_crit - temperature when all fans will run full speed.</div><div class='add'>+* temp#_auto_temp_off</div><div class='add'>+	- temperature below which fans should be off or spinning very low.</div><div class='add'>+* temp#_auto_temp_min</div><div class='add'>+	- temperature over which fans start to spin.</div><div class='add'>+* temp#_auto_temp_max</div><div class='add'>+	- temperature when fans spin at full speed.</div><div class='add'>+* temp#_auto_temp_crit</div><div class='add'>+	- temperature when all fans will run full speed.</div><div class='ctx'> </div><div class='del'>-* PWM Control</div><div class='add'>+PWM Control</div><div class='add'>+^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> There are three PWM outputs. The LM85 datasheet suggests that the</div><div class='ctx'> pwm3 output control both fan3 and fan4. Each PWM can be individually</div><div class='ctx'> configured and assigned to a zone for its control value. Each PWM can be</div><div class='ctx'> configured individually according to the following options.</div><div class='ctx'> </div><div class='del'>-* pwm#_auto_pwm_min - this specifies the PWM value for temp#_auto_temp_off</div><div class='del'>-                      temperature. (PWM value from 0 to 255)</div><div class='add'>+* pwm#_auto_pwm_min</div><div class='add'>+	- this specifies the PWM value for temp#_auto_temp_off</div><div class='add'>+	  temperature. (PWM value from 0 to 255)</div><div class='add'>+</div><div class='add'>+* pwm#_auto_pwm_minctl</div><div class='add'>+	- this flags selects for temp#_auto_temp_off temperature</div><div class='add'>+	  the behaviour of fans. Write 1 to let fans spinning at</div><div class='add'>+	  pwm#_auto_pwm_min or write 0 to let them off.</div><div class='ctx'> </div><div class='del'>-* pwm#_auto_pwm_minctl - this flags selects for temp#_auto_temp_off temperature</div><div class='del'>-                         the behaviour of fans. Write 1 to let fans spinning at</div><div class='del'>-			 pwm#_auto_pwm_min or write 0 to let them off.</div><div class='add'>+.. note::</div><div class='ctx'> </div><div class='del'>-NOTE: It has been reported that there is a bug in the LM85 that causes the flag</div><div class='del'>-to be associated with the zones not the PWMs. This contradicts all the</div><div class='del'>-published documentation. Setting pwm#_min_ctl in this case actually affects all</div><div class='del'>-PWMs controlled by zone '#'.</div><div class='add'>+	It has been reported that there is a bug in the LM85 that causes</div><div class='add'>+	the flag to be associated with the zones not the PWMs. This</div><div class='add'>+	contradicts all the published documentation. Setting pwm#_min_ctl</div><div class='add'>+	in this case actually affects all PWMs controlled by zone '#'.</div><div class='ctx'> </div><div class='del'>-* PWM Controlling Zone selection</div><div class='add'>+PWM Controlling Zone selection</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='del'>-* pwm#_auto_channels - controls zone that is associated with PWM</div><div class='add'>+* pwm#_auto_channels</div><div class='add'>+	- controls zone that is associated with PWM</div><div class='ctx'> </div><div class='ctx'> Configuration choices:</div><div class='ctx'> </div><div class='del'>-   Value     Meaning</div><div class='del'>-  ------  ------------------------------------------------</div><div class='add'>+========== =============================================</div><div class='add'>+Value      Meaning</div><div class='add'>+========== =============================================</div><div class='ctx'>       1    Controlled by Zone 1</div><div class='ctx'>       2    Controlled by Zone 2</div><div class='ctx'>       3    Controlled by Zone 3</div><div class='hunk'>@@ -217,6 +265,7 @@ Configuration choices:</div><div class='ctx'>       0    PWM always 0%  (off)</div><div class='ctx'>      -1    PWM always 100%  (full on)</div><div class='ctx'>      -2    Manual control (write to 'pwm#' to set)</div><div class='add'>+========== =============================================</div><div class='ctx'> </div><div class='ctx'> The National LM85's have two vendor specific configuration</div><div class='ctx'> features. Tach. mode and Spinup Control. For more details on these,</div><div class='head'>diff --git a/Documentation/hwmon/lm87 b/Documentation/hwmon/lm87.rst<br/>index a2339fd9acb9..72fcb577ef2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm87?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm87</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm87.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm87.rst</a></div><div class='hunk'>@@ -2,23 +2,32 @@ Kernel driver lm87</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM87</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm87'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/pf/LM/LM87.html</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1024</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1024'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.analog.com/en/prod/0,2877,ADM1024,00.html</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='del'>-        Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='del'>-        Stephen Rousset &lt;stephen.rousset@rocketlogix.com&gt;,</div><div class='del'>-        Dan Eaton &lt;dan.eaton@rocketlogix.com&gt;,</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;,</div><div class='del'>-        Original 2.6 port Jeff Oliver</div><div class='add'>+	- Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+	- Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='add'>+	- Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='add'>+	- Stephen Rousset &lt;stephen.rousset@rocketlogix.com&gt;,</div><div class='add'>+	- Dan Eaton &lt;dan.eaton@rocketlogix.com&gt;,</div><div class='add'>+	- Jean Delvare &lt;jdelvare@suse.de&gt;,</div><div class='add'>+	- Original 2.6 port Jeff Oliver</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90.rst<br/>index 8122675d30f6..953315987c06 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm90?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm90</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm90.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm90.rst</a></div><div class='hunk'>@@ -2,132 +2,256 @@ Kernel driver lm90</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM90</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm90'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM90.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/pf/LM/LM90.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM89</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm89' (no auto-detection)</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/mpf/LM/LM89.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/mpf/LM/LM89.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM99</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm99'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/pf/LM/LM99.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/pf/LM/LM99.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM86</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm86'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='del'>-               http://www.national.com/mpf/LM/LM86.html</div><div class='add'>+</div><div class='add'>+	       http://www.national.com/mpf/LM/LM86.html</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1032</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1032'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the ON Semiconductor website</div><div class='del'>-               http://www.onsemi.com/PowerSolutions/product.do?id=ADM1032</div><div class='add'>+</div><div class='add'>+	       http://www.onsemi.com/PowerSolutions/product.do?id=ADM1032</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7461</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7461'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the ON Semiconductor website</div><div class='del'>-               http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461</div><div class='add'>+</div><div class='add'>+	       http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADT7461A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adt7461a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the ON Semiconductor website</div><div class='del'>-               http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461A</div><div class='add'>+</div><div class='add'>+	       http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461A</div><div class='add'>+</div><div class='ctx'>   * ON Semiconductor NCT1008</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct1008'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the ON Semiconductor website</div><div class='del'>-               http://www.onsemi.com/PowerSolutions/product.do?id=NCT1008</div><div class='add'>+</div><div class='add'>+	       http://www.onsemi.com/PowerSolutions/product.do?id=NCT1008</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6646</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6646'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6647</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6646'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6648</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6646'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6649</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6646'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6657</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6657'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6658</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6657'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6659</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6659'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c, 0x4d, 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6680</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6680'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b,</div><div class='del'>-                           0x4c, 0x4d and 0x4e</div><div class='add'>+</div><div class='add'>+			   0x4c, 0x4d and 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6681</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6680'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b,</div><div class='del'>-                           0x4c, 0x4d and 0x4e</div><div class='add'>+</div><div class='add'>+			   0x4c, 0x4d and 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6692</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6646'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6695</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6695'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/datasheet/index.mvp/id/4199</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/datasheet/index.mvp/id/4199</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6696</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6695'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b,</div><div class='del'>-                           0x4c, 0x4d and 0x4e</div><div class='add'>+</div><div class='add'>+			   0x4c, 0x4d and 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://www.maxim-ic.com/datasheet/index.mvp/id/4199</div><div class='add'>+</div><div class='add'>+	       http://www.maxim-ic.com/datasheet/index.mvp/id/4199</div><div class='add'>+</div><div class='ctx'>   * Winbond/Nuvoton W83L771W/G</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83l771'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: No longer available</div><div class='add'>+</div><div class='ctx'>   * Winbond/Nuvoton W83L771AWG/ASG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83l771'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available, can be requested from Nuvoton</div><div class='add'>+</div><div class='ctx'>   * Philips/NXP SA56004X</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sa56004'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48 through 0x4F</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at NXP website</div><div class='del'>-               http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf</div><div class='add'>+</div><div class='add'>+	       http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf</div><div class='add'>+</div><div class='ctx'>   * GMT G781</div><div class='add'>+</div><div class='ctx'>     Prefix: 'g781'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c, 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available from GMT</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP451</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp451'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at TI website</div><div class='del'>-               http://www.ti.com/litv/pdf/sbos686</div><div class='ctx'> </div><div class='add'>+	       http://www.ti.com/litv/pdf/sbos686</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/lm92 b/Documentation/hwmon/lm92.rst<br/>index cfa99a353b8c..c131b923ed36 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm92?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm92</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm92.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm92.rst</a></div><div class='hunk'>@@ -2,22 +2,35 @@ Kernel driver lm92</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM92</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm92'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48 - 0x4b</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/pf/LM/LM92.html</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM76</div><div class='add'>+</div><div class='ctx'>     Prefix: 'lm92'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, force parameter needed</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/pf/LM/LM76.html</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6633/MAX6634/MAX6635</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6635'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, force parameter needed</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3074</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Abraham van der Merwe &lt;abraham@2d3d.co.za&gt;</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+       - Abraham van der Merwe &lt;abraham@2d3d.co.za&gt;</div><div class='add'>+       - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='head'>diff --git a/Documentation/hwmon/lm93 b/Documentation/hwmon/lm93.rst<br/>index f3b2ad2ceb01..49d199b45b67 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm93?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm93</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm93.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm93.rst</a></div><div class='hunk'>@@ -2,20 +2,29 @@ Kernel driver lm93</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM93</div><div class='add'>+</div><div class='ctx'>     Prefix 'lm93'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c-0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/ds.cgi/LM/LM93.pdf</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor LM94</div><div class='add'>+</div><div class='ctx'>     Prefix 'lm94'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c-0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.national.com/ds.cgi/LM/LM94.pdf</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-	Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;</div><div class='del'>-	Ported to 2.6 by Eric J. Bowersox &lt;ericb@aspsys.com&gt;</div><div class='del'>-	Adapted to 2.6.20 by Carsten Emde &lt;ce@osadl.org&gt;</div><div class='del'>-	Modified for mainline integration by Hans J. Koch &lt;hjk@hansjkoch.de&gt;</div><div class='add'>+	- Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;</div><div class='add'>+	- Ported to 2.6 by Eric J. Bowersox &lt;ericb@aspsys.com&gt;</div><div class='add'>+	- Adapted to 2.6.20 by Carsten Emde &lt;ce@osadl.org&gt;</div><div class='add'>+	- Modified for mainline integration by Hans J. Koch &lt;hjk@hansjkoch.de&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='hunk'>@@ -67,7 +76,8 @@ LM94 are not supported.</div><div class='ctx'> User Interface</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='del'>-#PROCHOT:</div><div class='add'>+#PROCHOT</div><div class='add'>+^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The LM93 can monitor two #PROCHOT signals.  The results are found in the</div><div class='ctx'> sysfs files prochot1, prochot2, prochot1_avg, prochot2_avg, prochot1_max,</div><div class='hunk'>@@ -86,7 +96,8 @@ prochot2_interval.  The values in these files specify the intervals for</div><div class='ctx'> list will cause the driver to use the next largest interval.  The available</div><div class='ctx'> intervals are (in seconds):</div><div class='ctx'> </div><div class='del'>-#PROCHOT intervals: 0.73, 1.46, 2.9, 5.8, 11.7, 23.3, 46.6, 93.2, 186, 372</div><div class='add'>+#PROCHOT intervals:</div><div class='add'>+	0.73, 1.46, 2.9, 5.8, 11.7, 23.3, 46.6, 93.2, 186, 372</div><div class='ctx'> </div><div class='ctx'> It is possible to configure the LM93 to logically short the two #PROCHOT</div><div class='ctx'> signals.  I.e. when #P1_PROCHOT is asserted, the LM93 will automatically</div><div class='hunk'>@@ -105,16 +116,15 @@ contains a value controlling the duty cycle for the PWM signal used when</div><div class='ctx'> the override function is enabled.  This value ranges from 0 to 15, with 0</div><div class='ctx'> indicating minimum duty cycle and 15 indicating maximum.</div><div class='ctx'> </div><div class='del'>-#VRD_HOT:</div><div class='add'>+#VRD_HOT</div><div class='add'>+^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The LM93 can monitor two #VRD_HOT signals. The results are found in the</div><div class='ctx'> sysfs files vrdhot1 and vrdhot2. There is one value per file: a boolean for</div><div class='ctx'> which 1 indicates #VRD_HOT is asserted and 0 indicates it is negated. These</div><div class='ctx'> files are read-only.</div><div class='ctx'> </div><div class='del'>-Smart Tach Mode:</div><div class='del'>-</div><div class='del'>-(from the datasheet)</div><div class='add'>+Smart Tach Mode (from the datasheet)::</div><div class='ctx'> </div><div class='ctx'> 	If a fan is driven using a low-side drive PWM, the tachometer</div><div class='ctx'> 	output of the fan is corrupted. The LM93 includes smart tachometer</div><div class='hunk'>@@ -127,7 +137,8 @@ the fan tachometer with a pwm) to the sysfs file fan&lt;n&gt;_smart_tach.  A zero</div><div class='ctx'> will disable the function for that fan.  Note that Smart tach mode cannot be</div><div class='ctx'> enabled if the PWM output frequency is 22500 Hz (see below).</div><div class='ctx'> </div><div class='del'>-Manual PWM:</div><div class='add'>+Manual PWM</div><div class='add'>+^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The LM93 has a fixed or override mode for the two PWM outputs (although, there</div><div class='ctx'> are still some conditions that will override even this mode - see section</div><div class='hunk'>@@ -141,7 +152,8 @@ will cause the driver to use the next largest value.  Also note: when manual</div><div class='ctx'> PWM mode is disabled, the value of pwm1 and pwm2 indicates the current duty</div><div class='ctx'> cycle chosen by the h/w.</div><div class='ctx'> </div><div class='del'>-PWM Output Frequency:</div><div class='add'>+PWM Output Frequency</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The LM93 supports several different frequencies for the PWM output channels.</div><div class='ctx'> The sysfs files pwm1_freq and pwm2_freq are used to select the frequency. The</div><div class='hunk'>@@ -149,9 +161,11 @@ frequency values are constrained by the hardware.  Selecting a value which is</div><div class='ctx'> not available will cause the driver to use the next largest value.  Also note</div><div class='ctx'> that this parameter has implications for the Smart Tach Mode (see above).</div><div class='ctx'> </div><div class='del'>-PWM Output Frequencies (in Hz): 12, 36, 48, 60, 72, 84, 96, 22500 (default)</div><div class='add'>+PWM Output Frequencies (in Hz):</div><div class='add'>+	12, 36, 48, 60, 72, 84, 96, 22500 (default)</div><div class='ctx'> </div><div class='del'>-Automatic PWM:</div><div class='add'>+Automatic PWM</div><div class='add'>+^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The LM93 is capable of complex automatic fan control, with many different</div><div class='ctx'> points of configuration.  To start, each PWM output can be bound to any</div><div class='hunk'>@@ -163,14 +177,16 @@ The eight control sources are: temp1-temp4 (aka "zones" in the datasheet),</div><div class='ctx'> in the sysfs files pwm&lt;n&gt;_auto_channels, where a "1" enables the binding, and</div><div class='ctx'> a "0" disables it. The h/w default is 0x0f (all temperatures bound).</div><div class='ctx'> </div><div class='del'>-	0x01 - Temp 1</div><div class='del'>-	0x02 - Temp 2</div><div class='del'>-	0x04 - Temp 3</div><div class='del'>-	0x08 - Temp 4</div><div class='del'>-	0x10 - #PROCHOT 1</div><div class='del'>-	0x20 - #PROCHOT 2</div><div class='del'>-	0x40 - #VRDHOT 1</div><div class='del'>-	0x80 - #VRDHOT 2</div><div class='add'>+	====== ===========</div><div class='add'>+	0x01   Temp 1</div><div class='add'>+	0x02   Temp 2</div><div class='add'>+	0x04   Temp 3</div><div class='add'>+	0x08   Temp 4</div><div class='add'>+	0x10   #PROCHOT 1</div><div class='add'>+	0x20   #PROCHOT 2</div><div class='add'>+	0x40   #VRDHOT 1</div><div class='add'>+	0x80   #VRDHOT 2</div><div class='add'>+	====== ===========</div><div class='ctx'> </div><div class='ctx'> The function y = f(x) takes a source temperature x to a PWM output y.  This</div><div class='ctx'> function of the LM93 is derived from a base temperature and a table of 12</div><div class='hunk'>@@ -180,7 +196,9 @@ degrees C, with the value of offset &lt;i&gt; for temperature value &lt;n&gt; being</div><div class='ctx'> contained in the file temp&lt;n&gt;_auto_offset&lt;i&gt;.  E.g. if the base temperature</div><div class='ctx'> is 40C:</div><div class='ctx'> </div><div class='add'>+     ========== ======================= =============== =======</div><div class='ctx'>      offset #	temp&lt;n&gt;_auto_offset&lt;i&gt;	range		pwm</div><div class='add'>+     ========== ======================= =============== =======</div><div class='ctx'> 	 1		0		-		 25.00%</div><div class='ctx'> 	 2		0		-		 28.57%</div><div class='ctx'> 	 3		1		40C - 41C	 32.14%</div><div class='hunk'>@@ -193,7 +211,8 @@ is 40C:</div><div class='ctx'> 	10		2		54C - 56C	 57.14%</div><div class='ctx'> 	11		2		56C - 58C	 71.43%</div><div class='ctx'> 	12		2		58C - 60C	 85.71%</div><div class='del'>-					&gt; 60C		100.00%</div><div class='add'>+	-		-		&gt; 60C		100.00%</div><div class='add'>+     ========== ======================= =============== =======</div><div class='ctx'> </div><div class='ctx'> Valid offsets are in the range 0C &lt;= x &lt;= 7.5C in 0.5C increments.</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +232,8 @@ temp&lt;n&gt;_auto_pwm_min.  Note, there are only two minimums: one each for temp[12]</div><div class='ctx'> and temp[34].  Therefore, any change to e.g. temp1_auto_pwm_min will also</div><div class='ctx'> affect temp2_auto_pwm_min.</div><div class='ctx'> </div><div class='del'>-PWM Spin-Up Cycle:</div><div class='add'>+PWM Spin-Up Cycle</div><div class='add'>+^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> A spin-up cycle occurs when a PWM output is commanded from 0% duty cycle to</div><div class='ctx'> some value &gt; 0%.  The LM93 supports a minimum duty cycle during spin-up.  These</div><div class='hunk'>@@ -225,10 +245,11 @@ the spin-up time in seconds.  The available spin-up times are constrained by</div><div class='ctx'> the hardware.  Selecting a value which is not available will cause the driver</div><div class='ctx'> to use the next largest value.</div><div class='ctx'> </div><div class='del'>-Spin-up Durations: 0 (disabled, h/w default), 0.1, 0.25, 0.4, 0.7, 1.0,</div><div class='del'>-		   2.0, 4.0</div><div class='add'>+Spin-up Durations:</div><div class='add'>+	0 (disabled, h/w default), 0.1, 0.25, 0.4, 0.7, 1.0, 2.0, 4.0</div><div class='ctx'> </div><div class='del'>-#PROCHOT and #VRDHOT PWM Ramping:</div><div class='add'>+#PROCHOT and #VRDHOT PWM Ramping</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> If the #PROCHOT or #VRDHOT signals are asserted while bound to a PWM output</div><div class='ctx'> channel, the LM93 will ramp the PWM output up to 100% duty cycle in discrete</div><div class='hunk'>@@ -237,9 +258,11 @@ one value each in seconds: pwm_auto_prochot_ramp and pwm_auto_vrdhot_ramp.</div><div class='ctx'> The available ramp times are constrained by the hardware.  Selecting a value</div><div class='ctx'> which is not available will cause the driver to use the next largest value.</div><div class='ctx'> </div><div class='del'>-Ramp Times: 0 (disabled, h/w default) to 0.75 in 0.05 second intervals</div><div class='add'>+Ramp Times:</div><div class='add'>+	0 (disabled, h/w default) to 0.75 in 0.05 second intervals</div><div class='ctx'> </div><div class='del'>-Fan Boost:</div><div class='add'>+Fan Boost</div><div class='add'>+^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> For each temperature channel, there is a boost temperature: if the channel</div><div class='ctx'> exceeds this limit, the LM93 will immediately drive both PWM outputs to 100%.</div><div class='hunk'>@@ -249,7 +272,8 @@ limit is reached, the temperature channel must drop below this value before</div><div class='ctx'> the boost function is disabled.  This temperature is also expressed in degrees</div><div class='ctx'> C in the sysfs files temp&lt;n&gt;_auto_boost_hyst.</div><div class='ctx'> </div><div class='del'>-GPIO Pins:</div><div class='add'>+GPIO Pins</div><div class='add'>+^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The LM93 can monitor the logic level of four dedicated GPIO pins as well as the</div><div class='ctx'> four tach input pins.  GPIO0-GPIO3 correspond to (fan) tach 1-4, respectively.</div><div class='hunk'>@@ -260,50 +284,29 @@ LSB is GPIO0, and the MSB is GPIO7.</div><div class='ctx'> LM93 Unique sysfs Files</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='del'>-	file			description</div><div class='del'>-	-------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-	prochot&lt;n&gt;		current #PROCHOT %</div><div class='del'>-</div><div class='del'>-	prochot&lt;n&gt;_avg		moving average #PROCHOT %</div><div class='del'>-</div><div class='del'>-	prochot&lt;n&gt;_max		limit #PROCHOT %</div><div class='del'>-</div><div class='del'>-	prochot_short		enable or disable logical #PROCHOT pin short</div><div class='del'>-</div><div class='del'>-	prochot&lt;n&gt;_override	force #PROCHOT assertion as PWM</div><div class='del'>-</div><div class='del'>-	prochot_override_duty_cycle</div><div class='del'>-				duty cycle for the PWM signal used when</div><div class='del'>-				#PROCHOT is overridden</div><div class='del'>-</div><div class='del'>-	prochot&lt;n&gt;_interval	#PROCHOT PWM sampling interval</div><div class='del'>-</div><div class='del'>-	vrdhot&lt;n&gt;		0 means negated, 1 means asserted</div><div class='del'>-</div><div class='del'>-	fan&lt;n&gt;_smart_tach	enable or disable smart tach mode</div><div class='del'>-</div><div class='del'>-	pwm&lt;n&gt;_auto_channels	select control sources for PWM outputs</div><div class='del'>-</div><div class='del'>-	pwm&lt;n&gt;_auto_spinup_min	minimum duty cycle during spin-up</div><div class='del'>-</div><div class='del'>-	pwm&lt;n&gt;_auto_spinup_time	duration of spin-up</div><div class='del'>-</div><div class='del'>-	pwm_auto_prochot_ramp	ramp time per step when #PROCHOT asserted</div><div class='del'>-</div><div class='del'>-	pwm_auto_vrdhot_ramp	ramp time per step when #VRDHOT asserted</div><div class='del'>-</div><div class='del'>-	temp&lt;n&gt;_auto_base	temperature channel base</div><div class='del'>-</div><div class='del'>-	temp&lt;n&gt;_auto_offset[1-12]</div><div class='del'>-				temperature channel offsets</div><div class='del'>-</div><div class='del'>-	temp&lt;n&gt;_auto_offset_hyst</div><div class='del'>-				temperature channel offset hysteresis</div><div class='del'>-</div><div class='del'>-	temp&lt;n&gt;_auto_boost	temperature channel boost (PWMs to 100%) limit</div><div class='del'>-</div><div class='del'>-	temp&lt;n&gt;_auto_boost_hyst	temperature channel boost hysteresis</div><div class='del'>-</div><div class='del'>-	gpio			input state of 8 GPIO pins; read-only</div><div class='del'>-</div><div class='add'>+=========================== ===============================================</div><div class='add'>+file			    description</div><div class='add'>+=========================== ===============================================</div><div class='add'>+prochot&lt;n&gt;		    current #PROCHOT %</div><div class='add'>+prochot&lt;n&gt;_avg		    moving average #PROCHOT %</div><div class='add'>+prochot&lt;n&gt;_max		    limit #PROCHOT %</div><div class='add'>+prochot_short		    enable or disable logical #PROCHOT pin short</div><div class='add'>+prochot&lt;n&gt;_override	    force #PROCHOT assertion as PWM</div><div class='add'>+prochot_override_duty_cycle duty cycle for the PWM signal used when</div><div class='add'>+			    #PROCHOT is overridden</div><div class='add'>+prochot&lt;n&gt;_interval	    #PROCHOT PWM sampling interval</div><div class='add'>+vrdhot&lt;n&gt;		    0 means negated, 1 means asserted</div><div class='add'>+fan&lt;n&gt;_smart_tach	    enable or disable smart tach mode</div><div class='add'>+pwm&lt;n&gt;_auto_channels	    select control sources for PWM outputs</div><div class='add'>+pwm&lt;n&gt;_auto_spinup_min	    minimum duty cycle during spin-up</div><div class='add'>+pwm&lt;n&gt;_auto_spinup_time	    duration of spin-up</div><div class='add'>+pwm_auto_prochot_ramp	    ramp time per step when #PROCHOT asserted</div><div class='add'>+pwm_auto_vrdhot_ramp	    ramp time per step when #VRDHOT asserted</div><div class='add'>+temp&lt;n&gt;_auto_base	    temperature channel base</div><div class='add'>+temp&lt;n&gt;_auto_offset[1-12]   temperature channel offsets</div><div class='add'>+temp&lt;n&gt;_auto_offset_hyst    temperature channel offset hysteresis</div><div class='add'>+temp&lt;n&gt;_auto_boost	    temperature channel boost (PWMs to 100%)</div><div class='add'>+			    limit</div><div class='add'>+temp&lt;n&gt;_auto_boost_hyst     temperature channel boost hysteresis</div><div class='add'>+gpio			    input state of 8 GPIO pins; read-only</div><div class='add'>+=========================== ===============================================</div><div class='head'>diff --git a/Documentation/hwmon/lm95234 b/Documentation/hwmon/lm95234.rst<br/>index 32b777ef224c..e4c14bea5efd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm95234?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm95234</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm95234.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm95234.rst</a></div><div class='hunk'>@@ -2,15 +2,22 @@ Kernel driver lm95234</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor / Texas Instruments LM95233</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x2a, 0x2b</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/product/lm95233</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/product/lm95233</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor / Texas Instruments LM95234</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x4d, 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Texas Instruments website</div><div class='del'>-               http://www.ti.com/product/lm95234</div><div class='ctx'> </div><div class='add'>+	       http://www.ti.com/product/lm95234</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/lm95245 b/Documentation/hwmon/lm95245.rst<br/>index d755901f58c4..566d1dc8c5a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm95245?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/lm95245</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lm95245.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lm95245.rst</a></div><div class='hunk'>@@ -1,16 +1,23 @@</div><div class='ctx'> Kernel driver lm95245</div><div class='del'>-==================</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * TI LM95235</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x29, 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the TI website</div><div class='del'>-               http://www.ti.com/lit/ds/symlink/lm95235.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.ti.com/lit/ds/symlink/lm95235.pdf</div><div class='add'>+</div><div class='ctx'>   * TI / National Semiconductor LM95245</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x19, 0x29, 0x4c, 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the TI website</div><div class='del'>-               http://www.ti.com/lit/ds/symlink/lm95245.pdf</div><div class='ctx'> </div><div class='add'>+	       http://www.ti.com/lit/ds/symlink/lm95245.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Alexander Stein &lt;alexander.stein@systec-electronic.com&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/lochnagar.rst b/Documentation/hwmon/lochnagar.rst<br/>new file mode 100644<br/>index 000000000000..1d609c4d18c3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/lochnagar.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/lochnagar.rst</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+Kernel Driver Lochnagar</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Supported systems:</div><div class='add'>+  * Cirrus Logic : Lochnagar 2</div><div class='add'>+</div><div class='add'>+Author: Lucas A. Tanure Alves</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Lochnagar 2 features built-in Current Monitor circuitry that allows for the</div><div class='add'>+measurement of both voltage and current on up to eight of the supply voltage</div><div class='add'>+rails provided to the minicards. The Current Monitor does not require any</div><div class='add'>+hardware modifications or external circuitry to operate.</div><div class='add'>+</div><div class='add'>+The current and voltage measurements are obtained through the standard register</div><div class='add'>+map interface to the Lochnagar board controller, and can therefore be monitored</div><div class='add'>+by software.</div><div class='add'>+</div><div class='add'>+Sysfs attributes</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+======================= =======================================================</div><div class='add'>+temp1_input             The Lochnagar board temperature (milliCelsius)</div><div class='add'>+in0_input               Measured voltage for DBVDD1 (milliVolts)</div><div class='add'>+in0_label               "DBVDD1"</div><div class='add'>+curr1_input             Measured current for DBVDD1 (milliAmps)</div><div class='add'>+curr1_label             "DBVDD1"</div><div class='add'>+power1_average          Measured average power for DBVDD1 (microWatts)</div><div class='add'>+power1_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power1_label            "DBVDD1"</div><div class='add'>+in1_input               Measured voltage for 1V8 DSP (milliVolts)</div><div class='add'>+in1_label               "1V8 DSP"</div><div class='add'>+curr2_input             Measured current for 1V8 DSP (milliAmps)</div><div class='add'>+curr2_label             "1V8 DSP"</div><div class='add'>+power2_average          Measured average power for 1V8 DSP (microWatts)</div><div class='add'>+power2_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power2_label            "1V8 DSP"</div><div class='add'>+in2_input               Measured voltage for 1V8 CDC (milliVolts)</div><div class='add'>+in2_label               "1V8 CDC"</div><div class='add'>+curr3_input             Measured current for 1V8 CDC (milliAmps)</div><div class='add'>+curr3_label             "1V8 CDC"</div><div class='add'>+power3_average          Measured average power for 1V8 CDC (microWatts)</div><div class='add'>+power3_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power3_label            "1V8 CDC"</div><div class='add'>+in3_input               Measured voltage for VDDCORE DSP (milliVolts)</div><div class='add'>+in3_label               "VDDCORE DSP"</div><div class='add'>+curr4_input             Measured current for VDDCORE DSP (milliAmps)</div><div class='add'>+curr4_label             "VDDCORE DSP"</div><div class='add'>+power4_average          Measured average power for VDDCORE DSP (microWatts)</div><div class='add'>+power4_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power4_label            "VDDCORE DSP"</div><div class='add'>+in4_input               Measured voltage for AVDD 1V8 (milliVolts)</div><div class='add'>+in4_label               "AVDD 1V8"</div><div class='add'>+curr5_input             Measured current for AVDD 1V8 (milliAmps)</div><div class='add'>+curr5_label             "AVDD 1V8"</div><div class='add'>+power5_average          Measured average power for AVDD 1V8 (microWatts)</div><div class='add'>+power5_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power5_label            "AVDD 1V8"</div><div class='add'>+curr6_input             Measured current for SYSVDD (milliAmps)</div><div class='add'>+curr6_label             "SYSVDD"</div><div class='add'>+power6_average          Measured average power for SYSVDD (microWatts)</div><div class='add'>+power6_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power6_label            "SYSVDD"</div><div class='add'>+in6_input               Measured voltage for VDDCORE CDC (milliVolts)</div><div class='add'>+in6_label               "VDDCORE CDC"</div><div class='add'>+curr7_input             Measured current for VDDCORE CDC (milliAmps)</div><div class='add'>+curr7_label             "VDDCORE CDC"</div><div class='add'>+power7_average          Measured average power for VDDCORE CDC (microWatts)</div><div class='add'>+power7_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power7_label            "VDDCORE CDC"</div><div class='add'>+in7_input               Measured voltage for MICVDD (milliVolts)</div><div class='add'>+in7_label               "MICVDD"</div><div class='add'>+curr8_input             Measured current for MICVDD (milliAmps)</div><div class='add'>+curr8_label             "MICVDD"</div><div class='add'>+power8_average          Measured average power for MICVDD (microWatts)</div><div class='add'>+power8_average_interval Power averaging time input valid from 1 to 1708mS</div><div class='add'>+power8_label            "MICVDD"</div><div class='add'>+======================= =======================================================</div><div class='add'>+</div><div class='add'>+Note:</div><div class='add'>+    It is not possible to measure voltage on the SYSVDD rail.</div><div class='head'>diff --git a/Documentation/hwmon/ltc2945 b/Documentation/hwmon/ltc2945.rst<br/>index f8d0f7f19adb..20c884985367 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc2945?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc2945</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc2945.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc2945.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ltc2945</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2945</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2945'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://cds.linear.com/docs/en/datasheet/2945fa.pdf</div><div class='add'>+</div><div class='add'>+	http://cds.linear.com/docs/en/datasheet/2945fa.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,9 +31,10 @@ which can be safely used to identify the chip. You will have to instantiate</div><div class='ctx'> the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC2945 at address 0x10</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe ltc2945</div><div class='del'>-$ echo ltc2945 0x10 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe ltc2945</div><div class='add'>+	$ echo ltc2945 0x10 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -45,6 +51,7 @@ Current Sense register. The reported value assumes that a 1 mOhm sense resistor</div><div class='ctx'> is installed. If a different sense resistor is installed, calculate the real</div><div class='ctx'> current by dividing the reported value by the sense resistor value in mOhm.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in1_input		VIN voltage (mV). Voltage is measured either at</div><div class='ctx'> 			SENSE+ or VDD pin depending on chip configuration.</div><div class='ctx'> in1_min			Undervoltage threshold</div><div class='hunk'>@@ -82,3 +89,4 @@ power1_input_highest	Historical maximum power use</div><div class='ctx'> power1_reset_history	Write 1 to reset power1 history</div><div class='ctx'> power1_min_alarm	Low power alarm</div><div class='ctx'> power1_max_alarm	High power alarm</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/ltc2978 b/Documentation/hwmon/ltc2978.rst<br/>index dfb2caa401d9..01a24fd6d5fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc2978?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc2978</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc2978.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc2978.rst</a></div><div class='hunk'>@@ -2,85 +2,143 @@ Kernel driver ltc2978</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2974</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2974'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc2974</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2975</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2975'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc2975</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2977</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2977'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc2977</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2978, LTC2978A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2978'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc2978</div><div class='del'>-    	       http://www.linear.com/product/ltc2978a</div><div class='add'>+</div><div class='add'>+	       http://www.linear.com/product/ltc2978a</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2980</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2980'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc2980</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC3880</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc3880'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc3880</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC3882</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc3882'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc3882</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC3883</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc3883'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc3883</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC3886</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc3886'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc3886</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC3887</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc3887'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc3887</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTM2987</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltm2987'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltm2987</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTM4675</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltm4675'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltm4675</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTM4676</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltm4676'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltm4676</div><div class='add'>+</div><div class='ctx'>   * Analog Devices LTM4686</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltm4686'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.analog.com/ltm4686</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='del'>-LTC2974 and LTC2975 are quad digital power supply managers.</div><div class='del'>-LTC2978 is an octal power supply monitor.</div><div class='del'>-LTC2977 is a pin compatible replacement for LTC2978.</div><div class='del'>-LTC2980 is a 16-channel Power System Manager, consisting of two LTC2977</div><div class='del'>-in a single die. The chip is instantiated and reported as two separate chips</div><div class='del'>-on two different I2C bus addresses.</div><div class='del'>-LTC3880, LTC3882, LTC3886, and LTC3887 are dual output poly-phase step-down</div><div class='del'>-DC/DC controllers.</div><div class='del'>-LTC3883 is a single phase step-down DC/DC controller.</div><div class='del'>-LTM2987 is a 16-channel Power System Manager with two LTC2977 plus</div><div class='del'>-additional components on a single die. The chip is instantiated and reported</div><div class='del'>-as two separate chips on two different I2C bus addresses.</div><div class='del'>-LTM4675 is a dual 9A or single 18A μModule regulator</div><div class='del'>-LTM4676 is a dual 13A or single 26A uModule regulator.</div><div class='del'>-LTM4686 is a dual 10A or single 20A uModule regulator.</div><div class='add'>+- LTC2974 and LTC2975 are quad digital power supply managers.</div><div class='add'>+- LTC2978 is an octal power supply monitor.</div><div class='add'>+- LTC2977 is a pin compatible replacement for LTC2978.</div><div class='add'>+- LTC2980 is a 16-channel Power System Manager, consisting of two LTC2977</div><div class='add'>+- in a single die. The chip is instantiated and reported as two separate chips</div><div class='add'>+- on two different I2C bus addresses.</div><div class='add'>+- LTC3880, LTC3882, LTC3886, and LTC3887 are dual output poly-phase step-down</div><div class='add'>+- DC/DC controllers.</div><div class='add'>+- LTC3883 is a single phase step-down DC/DC controller.</div><div class='add'>+- LTM2987 is a 16-channel Power System Manager with two LTC2977 plus</div><div class='add'>+- additional components on a single die. The chip is instantiated and reported</div><div class='add'>+- as two separate chips on two different I2C bus addresses.</div><div class='add'>+- LTM4675 is a dual 9A or single 18A μModule regulator</div><div class='add'>+- LTM4676 is a dual 13A or single 26A uModule regulator.</div><div class='add'>+- LTM4686 is a dual 10A or single 20A uModule regulator.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -90,127 +148,208 @@ This driver does not probe for PMBus devices. You will have to instantiate</div><div class='ctx'> devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following commands will load the driver for an LTC2978 at address</div><div class='del'>-0x60 on I2C bus #1:</div><div class='add'>+0x60 on I2C bus #1::</div><div class='ctx'> </div><div class='del'>-# modprobe ltc2978</div><div class='del'>-# echo ltc2978 0x60 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+	# modprobe ltc2978</div><div class='add'>+	# echo ltc2978 0x60 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in1_label		"vin"</div><div class='add'>+</div><div class='ctx'> in1_input		Measured input voltage.</div><div class='add'>+</div><div class='ctx'> in1_min			Minimum input voltage.</div><div class='add'>+</div><div class='ctx'> in1_max			Maximum input voltage.</div><div class='add'>+</div><div class='ctx'> 			LTC2974, LTC2975, LTC2977, LTC2980, LTC2978, and</div><div class='ctx'> 			LTM2987 only.</div><div class='add'>+</div><div class='ctx'> in1_lcrit		Critical minimum input voltage.</div><div class='add'>+</div><div class='ctx'> 			LTC2974, LTC2975, LTC2977, LTC2980, LTC2978, and</div><div class='ctx'> 			LTM2987 only.</div><div class='add'>+</div><div class='ctx'> in1_crit		Critical maximum input voltage.</div><div class='add'>+</div><div class='ctx'> in1_min_alarm		Input voltage low alarm.</div><div class='add'>+</div><div class='ctx'> in1_max_alarm		Input voltage high alarm.</div><div class='add'>+</div><div class='ctx'> 			LTC2974, LTC2975, LTC2977, LTC2980, LTC2978, and</div><div class='ctx'> 			LTM2987 only.</div><div class='ctx'> in1_lcrit_alarm		Input voltage critical low alarm.</div><div class='add'>+</div><div class='ctx'> 			LTC2974, LTC2975, LTC2977, LTC2980, LTC2978, and</div><div class='ctx'> 			LTM2987 only.</div><div class='ctx'> in1_crit_alarm		Input voltage critical high alarm.</div><div class='add'>+</div><div class='ctx'> in1_lowest		Lowest input voltage.</div><div class='add'>+</div><div class='ctx'> 			LTC2974, LTC2975, LTC2977, LTC2980, LTC2978, and</div><div class='ctx'> 			LTM2987 only.</div><div class='ctx'> in1_highest		Highest input voltage.</div><div class='add'>+</div><div class='ctx'> in1_reset_history	Reset input voltage history.</div><div class='ctx'> </div><div class='ctx'> in[N]_label		"vout[1-8]".</div><div class='del'>-			LTC2974, LTC2975: N=2-5</div><div class='del'>-			LTC2977, LTC2980, LTM2987: N=2-9</div><div class='del'>-			LTC2978: N=2-9</div><div class='del'>-			LTC3880, LTC3882, LTC23886 LTC3887, LTM4675, LTM4676:</div><div class='del'>-				N=2-3</div><div class='del'>-			LTC3883: N=2</div><div class='add'>+</div><div class='add'>+			- LTC2974, LTC2975: N=2-5</div><div class='add'>+			- LTC2977, LTC2980, LTM2987: N=2-9</div><div class='add'>+			- LTC2978: N=2-9</div><div class='add'>+			- LTC3880, LTC3882, LTC23886 LTC3887, LTM4675, LTM4676:</div><div class='add'>+			  N=2-3</div><div class='add'>+			- LTC3883: N=2</div><div class='add'>+</div><div class='ctx'> in[N]_input		Measured output voltage.</div><div class='add'>+</div><div class='ctx'> in[N]_min		Minimum output voltage.</div><div class='add'>+</div><div class='ctx'> in[N]_max		Maximum output voltage.</div><div class='add'>+</div><div class='ctx'> in[N]_lcrit		Critical minimum output voltage.</div><div class='add'>+</div><div class='ctx'> in[N]_crit		Critical maximum output voltage.</div><div class='add'>+</div><div class='ctx'> in[N]_min_alarm		Output voltage low alarm.</div><div class='add'>+</div><div class='ctx'> in[N]_max_alarm		Output voltage high alarm.</div><div class='add'>+</div><div class='ctx'> in[N]_lcrit_alarm	Output voltage critical low alarm.</div><div class='add'>+</div><div class='ctx'> in[N]_crit_alarm	Output voltage critical high alarm.</div><div class='del'>-in[N]_lowest		Lowest output voltage. LTC2974, LTC2975,</div><div class='del'>-			and LTC2978 only.</div><div class='add'>+</div><div class='add'>+in[N]_lowest		Lowest output voltage.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			LTC2974, LTC2975,and LTC2978 only.</div><div class='add'>+</div><div class='ctx'> in[N]_highest		Highest output voltage.</div><div class='add'>+</div><div class='ctx'> in[N]_reset_history	Reset output voltage history.</div><div class='ctx'> </div><div class='ctx'> temp[N]_input		Measured temperature.</div><div class='del'>-			On LTC2974 and LTC2975, temp[1-4] report external</div><div class='del'>-			temperatures, and temp5 reports the chip temperature.</div><div class='del'>-			On LTC2977, LTC2980, LTC2978, and LTM2987, only one</div><div class='del'>-			temperature measurement is supported and reports</div><div class='del'>-			the chip temperature.</div><div class='del'>-			On LTC3880, LTC3882, LTC3887, LTM4675, and LTM4676,</div><div class='del'>-			temp1 and temp2 report external temperatures, and temp3</div><div class='del'>-			reports the chip temperature.</div><div class='del'>-			On LTC3883, temp1 reports an external temperature,</div><div class='del'>-			and temp2 reports the chip temperature.</div><div class='del'>-temp[N]_min		Mimimum temperature. LTC2974, LCT2977, LTM2980, LTC2978,</div><div class='del'>-			and LTM2987 only.</div><div class='add'>+</div><div class='add'>+			- On LTC2974 and LTC2975, temp[1-4] report external</div><div class='add'>+			  temperatures, and temp5 reports the chip temperature.</div><div class='add'>+			- On LTC2977, LTC2980, LTC2978, and LTM2987, only one</div><div class='add'>+			  temperature measurement is supported and reports</div><div class='add'>+			  the chip temperature.</div><div class='add'>+			- On LTC3880, LTC3882, LTC3887, LTM4675, and LTM4676,</div><div class='add'>+			  temp1 and temp2 report external temperatures, and</div><div class='add'>+			  temp3 reports the chip temperature.</div><div class='add'>+			- On LTC3883, temp1 reports an external temperature,</div><div class='add'>+			  and temp2 reports the chip temperature.</div><div class='add'>+</div><div class='add'>+temp[N]_min		Mimimum temperature.</div><div class='add'>+</div><div class='add'>+			LTC2974, LCT2977, LTM2980, LTC2978, and LTM2987 only.</div><div class='add'>+</div><div class='ctx'> temp[N]_max		Maximum temperature.</div><div class='add'>+</div><div class='ctx'> temp[N]_lcrit		Critical low temperature.</div><div class='add'>+</div><div class='ctx'> temp[N]_crit		Critical high temperature.</div><div class='add'>+</div><div class='ctx'> temp[N]_min_alarm	Temperature low alarm.</div><div class='add'>+</div><div class='ctx'> 			LTC2974, LTC2975, LTC2977, LTM2980, LTC2978, and</div><div class='ctx'> 			LTM2987 only.</div><div class='add'>+</div><div class='ctx'> temp[N]_max_alarm	Temperature high alarm.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> temp[N]_lcrit_alarm	Temperature critical low alarm.</div><div class='add'>+</div><div class='ctx'> temp[N]_crit_alarm	Temperature critical high alarm.</div><div class='add'>+</div><div class='ctx'> temp[N]_lowest		Lowest measured temperature.</div><div class='del'>-			LTC2974, LTC2975, LTC2977, LTM2980, LTC2978, and</div><div class='del'>-			LTM2987 only.</div><div class='del'>-			Not supported for chip temperature sensor on LTC2974 and</div><div class='del'>-			LTC2975.</div><div class='del'>-temp[N]_highest		Highest measured temperature. Not supported for chip</div><div class='del'>-			temperature sensor on LTC2974 and LTC2975.</div><div class='del'>-temp[N]_reset_history	Reset temperature history. Not supported for chip</div><div class='del'>-			temperature sensor on LTC2974 and LTC2975.</div><div class='add'>+</div><div class='add'>+			- LTC2974, LTC2975, LTC2977, LTM2980, LTC2978, and</div><div class='add'>+			  LTM2987 only.</div><div class='add'>+			- Not supported for chip temperature sensor on LTC2974</div><div class='add'>+			  and LTC2975.</div><div class='add'>+</div><div class='add'>+temp[N]_highest		Highest measured temperature.</div><div class='add'>+</div><div class='add'>+			Not supported for chip temperature sensor on</div><div class='add'>+			LTC2974 and LTC2975.</div><div class='add'>+</div><div class='add'>+temp[N]_reset_history	Reset temperature history.</div><div class='add'>+</div><div class='add'>+			Not supported for chip temperature sensor on</div><div class='add'>+			LTC2974 and LTC2975.</div><div class='ctx'> </div><div class='ctx'> power1_label		"pin". LTC3883 and LTC3886 only.</div><div class='add'>+</div><div class='ctx'> power1_input		Measured input power.</div><div class='ctx'> </div><div class='ctx'> power[N]_label		"pout[1-4]".</div><div class='del'>-			LTC2974, LTC2975: N=1-4</div><div class='del'>-			LTC2977, LTC2980, LTM2987: Not supported</div><div class='del'>-			LTC2978: Not supported</div><div class='del'>-			LTC3880, LTC3882, LTC3886, LTC3887, LTM4675, LTM4676:</div><div class='del'>-				N=1-2</div><div class='del'>-			LTC3883: N=2</div><div class='add'>+</div><div class='add'>+			- LTC2974, LTC2975: N=1-4</div><div class='add'>+			- LTC2977, LTC2980, LTM2987: Not supported</div><div class='add'>+			- LTC2978: Not supported</div><div class='add'>+			- LTC3880, LTC3882, LTC3886, LTC3887, LTM4675, LTM4676:</div><div class='add'>+			  N=1-2</div><div class='add'>+			- LTC3883: N=2</div><div class='add'>+</div><div class='ctx'> power[N]_input		Measured output power.</div><div class='ctx'> </div><div class='del'>-curr1_label		"iin". LTC3880, LTC3883, LTC3886, LTC3887, LTM4675,</div><div class='add'>+curr1_label		"iin".</div><div class='add'>+</div><div class='add'>+			LTC3880, LTC3883, LTC3886, LTC3887, LTM4675,</div><div class='ctx'> 			and LTM4676 only.</div><div class='add'>+</div><div class='ctx'> curr1_input		Measured input current.</div><div class='add'>+</div><div class='ctx'> curr1_max		Maximum input current.</div><div class='add'>+</div><div class='ctx'> curr1_max_alarm		Input current high alarm.</div><div class='del'>-curr1_highest		Highest input current. LTC3883 and LTC3886 only.</div><div class='del'>-curr1_reset_history	Reset input current history. LTC3883 and LTC3886 only.</div><div class='add'>+</div><div class='add'>+curr1_highest		Highest input current.</div><div class='add'>+</div><div class='add'>+			LTC3883 and LTC3886 only.</div><div class='add'>+</div><div class='add'>+curr1_reset_history	Reset input current history.</div><div class='add'>+</div><div class='add'>+			LTC3883 and LTC3886 only.</div><div class='ctx'> </div><div class='ctx'> curr[N]_label		"iout[1-4]".</div><div class='del'>-			LTC2974, LTC2975: N=1-4</div><div class='del'>-			LTC2977, LTC2980, LTM2987: not supported</div><div class='del'>-			LTC2978: not supported</div><div class='del'>-			LTC3880, LTC3882, LTC3886, LTC3887, LTM4675, LTM4676:</div><div class='del'>-				N=2-3</div><div class='del'>-			LTC3883: N=2</div><div class='add'>+</div><div class='add'>+			- LTC2974, LTC2975: N=1-4</div><div class='add'>+			- LTC2977, LTC2980, LTM2987: not supported</div><div class='add'>+			- LTC2978: not supported</div><div class='add'>+			- LTC3880, LTC3882, LTC3886, LTC3887, LTM4675, LTM4676:</div><div class='add'>+			  N=2-3</div><div class='add'>+			- LTC3883: N=2</div><div class='add'>+</div><div class='ctx'> curr[N]_input		Measured output current.</div><div class='add'>+</div><div class='ctx'> curr[N]_max		Maximum output current.</div><div class='add'>+</div><div class='ctx'> curr[N]_crit		Critical high output current.</div><div class='del'>-curr[N]_lcrit		Critical low output current. LTC2974 and LTC2975 only.</div><div class='add'>+</div><div class='add'>+curr[N]_lcrit		Critical low output current.</div><div class='add'>+</div><div class='add'>+			LTC2974 and LTC2975 only.</div><div class='add'>+</div><div class='ctx'> curr[N]_max_alarm	Output current high alarm.</div><div class='add'>+</div><div class='ctx'> curr[N]_crit_alarm	Output current critical high alarm.</div><div class='add'>+</div><div class='ctx'> curr[N]_lcrit_alarm	Output current critical low alarm.</div><div class='add'>+</div><div class='add'>+			LTC2974 and LTC2975 only.</div><div class='add'>+</div><div class='add'>+curr[N]_lowest		Lowest output current.</div><div class='add'>+</div><div class='ctx'> 			LTC2974 and LTC2975 only.</div><div class='del'>-curr[N]_lowest		Lowest output current. LTC2974 and LTC2975 only.</div><div class='add'>+</div><div class='ctx'> curr[N]_highest		Highest output current.</div><div class='add'>+</div><div class='ctx'> curr[N]_reset_history	Reset output current history.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/ltc2990 b/Documentation/hwmon/ltc2990.rst<br/>index 3ed68f676c0f..e0a369e679d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc2990?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc2990</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc2990.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc2990.rst</a></div><div class='hunk'>@@ -1,14 +1,23 @@</div><div class='ctx'> Kernel driver ltc2990</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC2990</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc2990'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc2990</div><div class='ctx'> </div><div class='del'>-Author: Mike Looijmans &lt;mike.looijmans@topic.nl&gt;</div><div class='del'>-        Tom Levens &lt;tom.levens@cern.ch&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Author:</div><div class='add'>+</div><div class='add'>+	- Mike Looijmans &lt;mike.looijmans@topic.nl&gt;</div><div class='add'>+	- Tom Levens &lt;tom.levens@cern.ch&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -31,17 +40,21 @@ devices explicitly.</div><div class='ctx'> Sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+============= ==================================================</div><div class='ctx'> in0_input     Voltage at Vcc pin in millivolt (range 2.5V to 5V)</div><div class='del'>-temp1_input   Internal chip temperature in millidegrees Celcius</div><div class='add'>+temp1_input   Internal chip temperature in millidegrees Celsius</div><div class='add'>+============= ==================================================</div><div class='ctx'> </div><div class='ctx'> A subset of the following attributes are visible, depending on the measurement</div><div class='ctx'> mode of the chip.</div><div class='ctx'> </div><div class='add'>+============= ==========================================================</div><div class='ctx'> in[1-4]_input Voltage at V[1-4] pin in millivolt</div><div class='del'>-temp2_input   External temperature sensor TR1 in millidegrees Celcius</div><div class='del'>-temp3_input   External temperature sensor TR2 in millidegrees Celcius</div><div class='add'>+temp2_input   External temperature sensor TR1 in millidegrees Celsius</div><div class='add'>+temp3_input   External temperature sensor TR2 in millidegrees Celsius</div><div class='ctx'> curr1_input   Current in mA across V1-V2 assuming a 1mOhm sense resistor</div><div class='ctx'> curr2_input   Current in mA across V3-V4 assuming a 1mOhm sense resistor</div><div class='add'>+============= ==========================================================</div><div class='ctx'> </div><div class='ctx'> The "curr*_input" measurements actually report the voltage drop across the</div><div class='ctx'> input pins in microvolts. This is equivalent to the current through a 1mOhm</div><div class='head'>diff --git a/Documentation/hwmon/ltc3815 b/Documentation/hwmon/ltc3815.rst<br/>index eb7db2d13587..fb0135fc1925 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc3815?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc3815</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc3815.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc3815.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver ltc3815</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC3815</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc3815'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.linear.com/product/ltc3815</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -23,15 +27,16 @@ This driver does not probe for PMBus devices. You will have to instantiate</div><div class='ctx'> devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following commands will load the driver for an LTC3815</div><div class='del'>-at address 0x20 on I2C bus #1:</div><div class='add'>+at address 0x20 on I2C bus #1::</div><div class='ctx'> </div><div class='del'>-# modprobe ltc3815</div><div class='del'>-# echo ltc3815 0x20 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+	# modprobe ltc3815</div><div class='add'>+	# echo ltc3815 0x20 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in1_label		"vin"</div><div class='ctx'> in1_input		Measured input voltage.</div><div class='ctx'> in1_alarm		Input voltage alarm.</div><div class='hunk'>@@ -59,3 +64,4 @@ curr2_input		Measured output current.</div><div class='ctx'> curr2_alarm		Output current alarm.</div><div class='ctx'> curr2_highest		Highest output current.</div><div class='ctx'> curr2_reset_history	Reset output current history.</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/ltc4151 b/Documentation/hwmon/ltc4151.rst<br/>index 43c667e6677a..c39229b19624 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4151?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4151</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4151.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc4151.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ltc4151</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC4151</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc4151'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://www.linear.com/docs/Datasheet/4151fc.pdf</div><div class='add'>+</div><div class='add'>+	http://www.linear.com/docs/Datasheet/4151fc.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Per Dalen &lt;per.dalen@appeartv.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,9 +30,10 @@ which can be safely used to identify the chip. You will have to instantiate</div><div class='ctx'> the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC4151 at address 0x6f</div><div class='del'>-on I2C bus #0:</div><div class='del'>-# modprobe ltc4151</div><div class='del'>-# echo ltc4151 0x6f &gt; /sys/bus/i2c/devices/i2c-0/new_device</div><div class='add'>+on I2C bus #0::</div><div class='add'>+</div><div class='add'>+	# modprobe ltc4151</div><div class='add'>+	# echo ltc4151 0x6f &gt; /sys/bus/i2c/devices/i2c-0/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -40,8 +46,10 @@ Current reading provided by this driver is reported as obtained from the Current</div><div class='ctx'> Sense register. The reported value assumes that a 1 mOhm sense resistor is</div><div class='ctx'> installed.</div><div class='ctx'> </div><div class='add'>+======================= ==================</div><div class='ctx'> in1_input		VDIN voltage (mV)</div><div class='ctx'> </div><div class='ctx'> in2_input		ADIN voltage (mV)</div><div class='ctx'> </div><div class='ctx'> curr1_input		SENSE current (mA)</div><div class='add'>+======================= ==================</div><div class='head'>diff --git a/Documentation/hwmon/ltc4215 b/Documentation/hwmon/ltc4215.rst<br/>index c196a1846259..8d5044d99bab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4215?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4215</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4215.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc4215.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ltc4215</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC4215</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc4215'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: 0x44</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1163,P17572,D12697</div><div class='add'>+</div><div class='add'>+	http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1163,P17572,D12697</div><div class='ctx'> </div><div class='ctx'> Author: Ira W. Snyder &lt;iws@ovro.caltech.edu&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,9 +31,10 @@ of the possible addresses are unfriendly to probing. You will have to</div><div class='ctx'> instantiate the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC4215 at address 0x44</div><div class='del'>-on I2C bus #0:</div><div class='del'>-$ modprobe ltc4215</div><div class='del'>-$ echo ltc4215 0x44 &gt; /sys/bus/i2c/devices/i2c-0/new_device</div><div class='add'>+on I2C bus #0::</div><div class='add'>+</div><div class='add'>+	$ modprobe ltc4215</div><div class='add'>+	$ echo ltc4215 0x44 &gt; /sys/bus/i2c/devices/i2c-0/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -38,6 +44,7 @@ The LTC4215 has built-in limits for overvoltage, undervoltage, and</div><div class='ctx'> undercurrent warnings. This makes it very likely that the reference</div><div class='ctx'> circuit will be used.</div><div class='ctx'> </div><div class='add'>+======================= =========================</div><div class='ctx'> in1_input		input voltage</div><div class='ctx'> in2_input		output voltage</div><div class='ctx'> </div><div class='hunk'>@@ -49,3 +56,4 @@ curr1_max_alarm		overcurrent alarm</div><div class='ctx'> </div><div class='ctx'> power1_input		power usage</div><div class='ctx'> power1_alarm		power bad alarm</div><div class='add'>+======================= =========================</div><div class='head'>diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245.rst<br/>index 4ca7a9da09f9..3dafd08a4e87 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4245?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4245</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4245.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc4245.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ltc4245</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC4245</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc4245'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: 0x20-0x3f</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1140,P19392,D13517</div><div class='add'>+</div><div class='add'>+	http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1140,P19392,D13517</div><div class='ctx'> </div><div class='ctx'> Author: Ira W. Snyder &lt;iws@ovro.caltech.edu&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,9 +32,10 @@ of the possible addresses are unfriendly to probing. You will have to</div><div class='ctx'> instantiate the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC4245 at address 0x23</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe ltc4245</div><div class='del'>-$ echo ltc4245 0x23 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe ltc4245</div><div class='add'>+	$ echo ltc4245 0x23 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -42,6 +48,7 @@ This driver uses the values in the datasheet to change the register values</div><div class='ctx'> into the values specified in the sysfs-interface document. The current readings</div><div class='ctx'> rely on the sense resistors listed in Table 2: "Sense Resistor Values".</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in1_input		12v input voltage (mV)</div><div class='ctx'> in2_input		5v  input voltage (mV)</div><div class='ctx'> in3_input		3v  input voltage (mV)</div><div class='hunk'>@@ -80,6 +87,7 @@ power1_input		12v power usage (mW)</div><div class='ctx'> power2_input		5v  power usage (mW)</div><div class='ctx'> power3_input		3v  power usage (mW)</div><div class='ctx'> power4_input		Vee (-12v) power usage (mW)</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Note 1</div><div class='hunk'>@@ -96,6 +104,7 @@ slowly, -EAGAIN will be returned when you read the sysfs attribute containing</div><div class='ctx'> the sensor reading.</div><div class='ctx'> </div><div class='ctx'> The LTC4245 chip can be configured to sample all GPIO pins with two methods:</div><div class='add'>+</div><div class='ctx'> 1) platform data -- see include/linux/platform_data/ltc4245.h</div><div class='ctx'> 2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/ltc4260 b/Documentation/hwmon/ltc4260.rst<br/>index c4ff4ad998b2..4c335b6a51d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4260?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4260</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4260.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc4260.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ltc4260</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC4260</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc4260'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://cds.linear.com/docs/en/datasheet/4260fc.pdf</div><div class='add'>+</div><div class='add'>+	http://cds.linear.com/docs/en/datasheet/4260fc.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,9 +31,10 @@ which can be safely used to identify the chip. You will have to instantiate</div><div class='ctx'> the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC4260 at address 0x10</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe ltc4260</div><div class='del'>-$ echo ltc4260 0x10 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe ltc4260</div><div class='add'>+	$ echo ltc4260 0x10 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -45,6 +51,7 @@ Current Sense register. The reported value assumes that a 1 mOhm sense resistor</div><div class='ctx'> is installed. If a different sense resistor is installed, calculate the real</div><div class='ctx'> current by dividing the reported value by the sense resistor value in mOhm.</div><div class='ctx'> </div><div class='add'>+======================= =======================</div><div class='ctx'> in1_input		SOURCE voltage (mV)</div><div class='ctx'> in1_min_alarm		Undervoltage alarm</div><div class='ctx'> in1_max_alarm		Overvoltage alarm</div><div class='hunk'>@@ -54,3 +61,4 @@ in2_alarm		Power bad alarm</div><div class='ctx'> </div><div class='ctx'> curr1_input		SENSE current (mA)</div><div class='ctx'> curr1_alarm		SENSE overcurrent alarm</div><div class='add'>+======================= =======================</div><div class='head'>diff --git a/Documentation/hwmon/ltc4261 b/Documentation/hwmon/ltc4261.rst<br/>index 9378a75c6134..c80233f8082e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4261?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ltc4261</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ltc4261.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ltc4261.rst</a></div><div class='hunk'>@@ -2,11 +2,16 @@ Kernel driver ltc4261</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Linear Technology LTC4261</div><div class='add'>+</div><div class='ctx'>     Prefix: 'ltc4261'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-        http://cds.linear.com/docs/Datasheet/42612fb.pdf</div><div class='add'>+</div><div class='add'>+	http://cds.linear.com/docs/Datasheet/42612fb.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,9 +31,10 @@ which can be safely used to identify the chip. You will have to instantiate</div><div class='ctx'> the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC4261 at address 0x10</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe ltc4261</div><div class='del'>-$ echo ltc4261 0x10 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe ltc4261</div><div class='add'>+	$ echo ltc4261 0x10 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -51,6 +57,7 @@ the proximity of the ADIN2 pin to the OV pin. ADIN2 is, however, not available</div><div class='ctx'> on all chip variants. To ensure that the alarm condition is reported to the user,</div><div class='ctx'> report it with both voltage sensors.</div><div class='ctx'> </div><div class='add'>+======================= =============================</div><div class='ctx'> in1_input		ADIN2 voltage (mV)</div><div class='ctx'> in1_min_alarm		ADIN/ADIN2 Undervoltage alarm</div><div class='ctx'> in1_max_alarm		ADIN/ADIN2 Overvoltage alarm</div><div class='hunk'>@@ -61,3 +68,4 @@ in2_max_alarm		ADIN/ADIN2 Overvoltage alarm</div><div class='ctx'> </div><div class='ctx'> curr1_input		SENSE current (mA)</div><div class='ctx'> curr1_alarm		SENSE overcurrent alarm</div><div class='add'>+======================= =============================</div><div class='head'>diff --git a/Documentation/hwmon/max16064 b/Documentation/hwmon/max16064.rst<br/>index 265370f5cb82..6d5e9538991f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max16064?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max16064</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max16064.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max16064.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver max16064</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX16064</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max16064'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -17,7 +21,7 @@ This driver supports hardware monitoring for Maxim MAX16064 Quad Power-Supply</div><div class='ctx'> Controller with Active-Voltage Output Control and PMBus Interface.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver.</div><div class='del'>-Please see Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -40,16 +44,20 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in[1-4]_label		"vout[1-4]"</div><div class='ctx'> in[1-4]_input		Measured voltage. From READ_VOUT register.</div><div class='ctx'> in[1-4]_min		Minimum Voltage. From VOUT_UV_WARN_LIMIT register.</div><div class='ctx'> in[1-4]_max		Maximum voltage. From VOUT_OV_WARN_LIMIT register.</div><div class='ctx'> in[1-4]_lcrit		Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.</div><div class='del'>-in[1-4]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.</div><div class='add'>+in[1-4]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> in[1-4]_min_alarm	Voltage low alarm. From VOLTAGE_UV_WARNING status.</div><div class='ctx'> in[1-4]_max_alarm	Voltage high alarm. From VOLTAGE_OV_WARNING status.</div><div class='del'>-in[1-4]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT status.</div><div class='del'>-in[1-4]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT status.</div><div class='add'>+in[1-4]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT</div><div class='add'>+			status.</div><div class='add'>+in[1-4]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT</div><div class='add'>+			status.</div><div class='ctx'> in[1-4]_highest		Historical maximum voltage.</div><div class='ctx'> in[1-4]_reset_history	Write any value to reset history.</div><div class='ctx'> </div><div class='hunk'>@@ -64,3 +72,4 @@ temp1_crit_alarm	Chip temperature critical high alarm. Set by comparing</div><div class='ctx'> 			status is set.</div><div class='ctx'> temp1_highest		Historical maximum temperature.</div><div class='ctx'> temp1_reset_history	Write any value to reset history.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/max16065 b/Documentation/hwmon/max16065.rst<br/>index 208a29e43010..fa5c852a178c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max16065?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max16065</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max16065.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max16065.rst</a></div><div class='hunk'>@@ -1,28 +1,48 @@</div><div class='ctx'> Kernel driver max16065</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX16065, MAX16066</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max16065', 'max16066'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://datasheets.maxim-ic.com/en/ds/MAX16065-MAX16066.pdf</div><div class='add'>+</div><div class='ctx'>  *  Maxim MAX16067</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max16067'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://datasheets.maxim-ic.com/en/ds/MAX16067.pdf</div><div class='add'>+</div><div class='ctx'>  *  Maxim MAX16068</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max16068'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> 	http://datasheets.maxim-ic.com/en/ds/MAX16068.pdf</div><div class='add'>+</div><div class='ctx'>  *  Maxim MAX16070/MAX16071</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max16070', 'max16071'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-	http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf</div><div class='ctx'> </div><div class='add'>+	http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -73,6 +93,7 @@ turn into a brick.</div><div class='ctx'> Sysfs entries</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in[0-11]_input		Input voltage measurements.</div><div class='ctx'> </div><div class='ctx'> in12_input		Voltage on CSP (Current Sense Positive) pin.</div><div class='hunk'>@@ -103,3 +124,4 @@ curr1_input		Current sense input; only if the chip supports current</div><div class='ctx'> </div><div class='ctx'> curr1_alarm		Overcurrent alarm; only if the chip supports current</div><div class='ctx'> 			sensing and if current sensing is enabled.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/max1619 b/Documentation/hwmon/max1619.rst<br/>index 518bae3a80c4..e25956e70f73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max1619?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max1619</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max1619.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max1619.rst</a></div><div class='hunk'>@@ -2,15 +2,20 @@ Kernel driver max1619</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX1619</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max1619'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18-0x1a, 0x29-0x2b, 0x4c-0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf</div><div class='add'>+</div><div class='add'>+	       http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Oleksij Rempel &lt;bug-track@fisher-privat.net&gt;,</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+       - Oleksij Rempel &lt;bug-track@fisher-privat.net&gt;,</div><div class='add'>+       - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -26,4 +31,3 @@ Only the external sensor has high and low limits.</div><div class='ctx'> The max1619 driver will not update its values more frequently than every</div><div class='ctx'> other second; reading them more often will do no harm, but will return</div><div class='ctx'> 'old' values.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/hwmon/max1668 b/Documentation/hwmon/max1668.rst<br/>index 8f9d570dbfec..417f17d750e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max1668?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max1668</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max1668.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max1668.rst</a></div><div class='hunk'>@@ -2,12 +2,17 @@ Kernel driver max1668</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX1668, MAX1805 and MAX1989</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max1668'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX1668-MAX1989.pdf</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'>     David George &lt;david.george@ska.ac.za&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -23,8 +28,9 @@ two ICs.</div><div class='ctx'> The driver is able to distinguish between the devices and creates sysfs</div><div class='ctx'> entries as follows:</div><div class='ctx'> </div><div class='del'>-MAX1805, MAX1668 and MAX1989:</div><div class='add'>+- MAX1805, MAX1668 and MAX1989:</div><div class='ctx'> </div><div class='add'>+=============== == ============================================================</div><div class='ctx'> temp1_input     ro local (ambient) temperature</div><div class='ctx'> temp1_max       rw local temperature maximum threshold for alarm</div><div class='ctx'> temp1_max_alarm ro local temperature maximum threshold alarm</div><div class='hunk'>@@ -40,8 +46,11 @@ temp3_max       rw remote temperature 2 maximum threshold for alarm</div><div class='ctx'> temp3_max_alarm ro remote temperature 2 maximum threshold alarm</div><div class='ctx'> temp3_min       rw remote temperature 2 minimum threshold for alarm</div><div class='ctx'> temp3_min_alarm ro remote temperature 2 minimum threshold alarm</div><div class='add'>+=============== == ============================================================</div><div class='add'>+</div><div class='add'>+- MAX1668 and MAX1989 only:</div><div class='ctx'> </div><div class='del'>-MAX1668 and MAX1989 only:</div><div class='add'>+=============== == ============================================================</div><div class='ctx'> temp4_input     ro remote temperature 3</div><div class='ctx'> temp4_max       rw remote temperature 3 maximum threshold for alarm</div><div class='ctx'> temp4_max_alarm ro remote temperature 3 maximum threshold alarm</div><div class='hunk'>@@ -52,6 +61,7 @@ temp5_max       rw remote temperature 4 maximum threshold for alarm</div><div class='ctx'> temp5_max_alarm ro remote temperature 4 maximum threshold alarm</div><div class='ctx'> temp5_min       rw remote temperature 4 minimum threshold for alarm</div><div class='ctx'> temp5_min_alarm ro remote temperature 4 minimum threshold alarm</div><div class='add'>+=============== == ============================================================</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='head'>diff --git a/Documentation/hwmon/max197 b/Documentation/hwmon/max197.rst<br/>index 8d89b9009df8..02fe19bc3428 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max197?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max197</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max197.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max197.rst</a></div><div class='hunk'>@@ -1,16 +1,22 @@</div><div class='del'>-Maxim MAX197 driver</div><div class='del'>-===================</div><div class='add'>+Kernel driver max197</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'>   * Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX197</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max197'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX197.pdf</div><div class='ctx'> </div><div class='ctx'>   * Maxim MAX199</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max199'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX199.pdf</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -26,7 +32,7 @@ Platform data</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='ctx'> The MAX197 platform data (defined in linux/platform_data/max197.h) should be</div><div class='del'>-filled with a pointer to a conversion function, defined like:</div><div class='add'>+filled with a pointer to a conversion function, defined like::</div><div class='ctx'> </div><div class='ctx'>     int convert(u8 ctrl);</div><div class='ctx'> </div><div class='hunk'>@@ -36,25 +42,29 @@ or a negative error code otherwise.</div><div class='ctx'> </div><div class='ctx'> Control byte format:</div><div class='ctx'> </div><div class='add'>+======= ========== ============================================</div><div class='ctx'> Bit     Name       Description</div><div class='ctx'> 7,6     PD1,PD0    Clock and Power-Down modes</div><div class='ctx'> 5       ACQMOD     Internal or External Controlled Acquisition</div><div class='ctx'> 4       RNG        Full-scale voltage magnitude at the input</div><div class='ctx'> 3       BIP        Unipolar or Bipolar conversion mode</div><div class='ctx'> 2,1,0   A2,A1,A0   Channel</div><div class='add'>+======= ========== ============================================</div><div class='ctx'> </div><div class='ctx'> Sysfs interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-* in[0-7]_input: The conversion value for the corresponding channel.</div><div class='del'>-                 RO</div><div class='add'>+  ============== ==============================================================</div><div class='add'>+  in[0-7]_input  The conversion value for the corresponding channel.</div><div class='add'>+		 RO</div><div class='ctx'> </div><div class='del'>-* in[0-7]_min:   The lower limit (in mV) for the corresponding channel.</div><div class='del'>-                 For the MAX197, it will be adjusted to -10000, -5000, or 0.</div><div class='del'>-                 For the MAX199, it will be adjusted to -4000, -2000, or 0.</div><div class='del'>-                 RW</div><div class='add'>+  in[0-7]_min    The lower limit (in mV) for the corresponding channel.</div><div class='add'>+		 For the MAX197, it will be adjusted to -10000, -5000, or 0.</div><div class='add'>+		 For the MAX199, it will be adjusted to -4000, -2000, or 0.</div><div class='add'>+		 RW</div><div class='ctx'> </div><div class='del'>-* in[0-7]_max:   The higher limit (in mV) for the corresponding channel.</div><div class='del'>-                 For the MAX197, it will be adjusted to 0, 5000, or 10000.</div><div class='del'>-                 For the MAX199, it will be adjusted to 0, 2000, or 4000.</div><div class='del'>-                 RW</div><div class='add'>+  in[0-7]_max    The higher limit (in mV) for the corresponding channel.</div><div class='add'>+		 For the MAX197, it will be adjusted to 0, 5000, or 10000.</div><div class='add'>+		 For the MAX199, it will be adjusted to 0, 2000, or 4000.</div><div class='add'>+		 RW</div><div class='add'>+  ============== ==============================================================</div><div class='head'>diff --git a/Documentation/hwmon/max20751 b/Documentation/hwmon/max20751.rst<br/>index f9fa25ebb521..aa4469be6674 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max20751?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max20751</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max20751.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max20751.rst</a></div><div class='hunk'>@@ -2,10 +2,15 @@ Kernel driver max20751</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * maxim MAX20751</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max20751'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX20751.pdf</div><div class='add'>+</div><div class='ctx'>     Application note: http://pdfserv.maximintegrated.com/en/an/AN5941.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -18,7 +23,7 @@ This driver supports MAX20751 Multiphase Master with PMBus Interface</div><div class='ctx'> and Internal Buck Converter.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver.</div><div class='del'>-Please see Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -40,6 +45,7 @@ Sysfs entries</div><div class='ctx'> </div><div class='ctx'> The following attributes are supported.</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in1_label		"vin1"</div><div class='ctx'> in1_input		Measured voltage.</div><div class='ctx'> in1_min			Minimum input voltage.</div><div class='hunk'>@@ -75,3 +81,4 @@ temp1_crit_alarm	Chip temperature critical high alarm.</div><div class='ctx'> </div><div class='ctx'> power1_input		Output power.</div><div class='ctx'> power1_label		"pout1"</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/max31722 b/Documentation/hwmon/max31722.rst<br/>index 090da84538c8..0ab15c00b226 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max31722?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max31722</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max31722.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max31722.rst</a></div><div class='hunk'>@@ -2,15 +2,25 @@ Kernel driver max31722</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim Integrated MAX31722</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max31722'</div><div class='add'>+</div><div class='ctx'>     ACPI ID: MAX31722</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31722-MAX31723.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim Integrated MAX31723</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max31723'</div><div class='add'>+</div><div class='ctx'>     ACPI ID: MAX31723</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31722-MAX31723.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Tiberiu Breana &lt;tiberiu.a.breana@intel.com&gt;</div><div class='hunk'>@@ -31,4 +41,6 @@ Sysfs entries</div><div class='ctx'> </div><div class='ctx'> The following attribute is supported:</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> temp1_input		Measured temperature. Read-only.</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/max31785 b/Documentation/hwmon/max31785.rst<br/>index 270c5f865261..c8c6756d0ee1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max31785?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max31785</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max31785.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max31785.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver max31785</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX31785, MAX31785A</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max31785' or 'max31785a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31785.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Andrew Jeffery &lt;andrew@aj.id.au&gt;</div><div class='hunk'>@@ -30,6 +34,7 @@ devices explicitly.</div><div class='ctx'> Sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> fan[1-4]_alarm		Fan alarm.</div><div class='ctx'> fan[1-4]_fault		Fan fault.</div><div class='ctx'> fan[1-8]_input		Fan RPM. On the MAX31785A, inputs 5-8 correspond to the</div><div class='hunk'>@@ -58,3 +63,4 @@ temp[1-11]_crit_alarm	Chip temperature critical high alarm</div><div class='ctx'> temp[1-11]_input	Measured temperature</div><div class='ctx'> temp[1-11]_max		Maximum temperature</div><div class='ctx'> temp[1-11]_max_alarm	Chip temperature high alarm</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/max31790 b/Documentation/hwmon/max31790.rst<br/>index 855e62430da9..84c62a12ef3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max31790?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max31790</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max31790.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max31790.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver max31790</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX31790</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max31790'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://pdfserv.maximintegrated.com/en/ds/MAX31790.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Il Han &lt;corone.il.han@gmail.com&gt;</div><div class='hunk'>@@ -30,8 +34,10 @@ also be configured to serve as tachometer inputs.</div><div class='ctx'> Sysfs entries</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='add'>+================== === =======================================================</div><div class='ctx'> fan[1-12]_input    RO  fan tachometer speed in RPM</div><div class='ctx'> fan[1-12]_fault    RO  fan experienced fault</div><div class='ctx'> fan[1-6]_target    RW  desired fan speed in RPM</div><div class='ctx'> pwm[1-6]_enable    RW  regulator mode, 0=disabled, 1=manual mode, 2=rpm mode</div><div class='ctx'> pwm[1-6]           RW  fan target duty cycle (0-255)</div><div class='add'>+================== === =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/max34440 b/Documentation/hwmon/max34440.rst<br/>index b2de8fa49273..939138e12b02 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max34440?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max34440</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max34440.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max34440.rst</a></div><div class='hunk'>@@ -2,34 +2,63 @@ Kernel driver max34440</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX34440</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max34440'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34440.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX34441</div><div class='add'>+</div><div class='ctx'>     PMBus 5-Channel Power-Supply Manager and Intelligent Fan Controller</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max34441'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34441.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX34446</div><div class='add'>+</div><div class='ctx'>     PMBus Power-Supply Data Logger</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max34446'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34446.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX34451</div><div class='add'>+</div><div class='ctx'>     PMBus 16-Channel V/I Monitor and 12-Channel Sequencer/Marginer</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'max34451'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34451.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX34460</div><div class='add'>+</div><div class='ctx'>     PMBus 12-Channel Voltage Monitor &amp; Sequencer</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max34460'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34460.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX34461</div><div class='add'>+</div><div class='ctx'>     PMBus 16-Channel Voltage Monitor &amp; Sequencer</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max34461'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -47,7 +76,7 @@ based on GIN pins. The MAX34460 supports 12 voltage channels, and the MAX34461</div><div class='ctx'> supports 16 voltage channels.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -77,42 +106,67 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+In</div><div class='add'>+~~</div><div class='add'>+</div><div class='add'>+======================= =======================================================</div><div class='ctx'> in[1-6]_label		"vout[1-6]".</div><div class='ctx'> in[1-6]_input		Measured voltage. From READ_VOUT register.</div><div class='ctx'> in[1-6]_min		Minimum Voltage. From VOUT_UV_WARN_LIMIT register.</div><div class='ctx'> in[1-6]_max		Maximum voltage. From VOUT_OV_WARN_LIMIT register.</div><div class='ctx'> in[1-6]_lcrit		Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.</div><div class='del'>-in[1-6]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.</div><div class='add'>+in[1-6]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> in[1-6]_min_alarm	Voltage low alarm. From VOLTAGE_UV_WARNING status.</div><div class='ctx'> in[1-6]_max_alarm	Voltage high alarm. From VOLTAGE_OV_WARNING status.</div><div class='del'>-in[1-6]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT status.</div><div class='del'>-in[1-6]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT status.</div><div class='add'>+in[1-6]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT</div><div class='add'>+			status.</div><div class='add'>+in[1-6]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT</div><div class='add'>+			status.</div><div class='ctx'> in[1-6]_lowest		Historical minimum voltage.</div><div class='ctx'> in[1-6]_highest		Historical maximum voltage.</div><div class='ctx'> in[1-6]_reset_history	Write any value to reset history.</div><div class='add'>+======================= =======================================================</div><div class='add'>+</div><div class='add'>+.. note:: MAX34446 only supports in[1-4].</div><div class='ctx'> </div><div class='del'>-			MAX34446 only supports in[1-4].</div><div class='add'>+Curr</div><div class='add'>+~~~~</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> curr[1-6]_label		"iout[1-6]".</div><div class='ctx'> curr[1-6]_input		Measured current. From READ_IOUT register.</div><div class='ctx'> curr[1-6]_max		Maximum current. From IOUT_OC_WARN_LIMIT register.</div><div class='del'>-curr[1-6]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT register.</div><div class='add'>+curr[1-6]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> curr[1-6]_max_alarm	Current high alarm. From IOUT_OC_WARNING status.</div><div class='ctx'> curr[1-6]_crit_alarm	Current critical high alarm. From IOUT_OC_FAULT status.</div><div class='ctx'> curr[1-4]_average	Historical average current (MAX34446/34451 only).</div><div class='ctx'> curr[1-6]_highest	Historical maximum current.</div><div class='ctx'> curr[1-6]_reset_history	Write any value to reset history.</div><div class='add'>+======================= ========================================================</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    - in6 and curr6 attributes only exist for MAX34440.</div><div class='add'>+    - MAX34446 only supports curr[1-4].</div><div class='ctx'> </div><div class='del'>-			in6 and curr6 attributes only exist for MAX34440.</div><div class='del'>-			MAX34446 only supports curr[1-4].</div><div class='add'>+Power</div><div class='add'>+~~~~~</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> power[1,3]_label	"pout[1,3]"</div><div class='ctx'> power[1,3]_input	Measured power.</div><div class='ctx'> power[1,3]_average	Historical average power.</div><div class='ctx'> power[1,3]_highest	Historical maximum power.</div><div class='add'>+======================= ========================================================</div><div class='ctx'> </div><div class='del'>-			Power attributes only exist for MAX34446.</div><div class='add'>+.. note:: Power attributes only exist for MAX34446.</div><div class='ctx'> </div><div class='add'>+Temp</div><div class='add'>+~~~~</div><div class='add'>+</div><div class='add'>+======================= ========================================================</div><div class='ctx'> temp[1-8]_input		Measured temperatures. From READ_TEMPERATURE_1 register.</div><div class='ctx'> 			temp1 is the chip's internal temperature. temp2..temp5</div><div class='ctx'> 			are remote I2C temperature sensors. For MAX34441, temp6</div><div class='hunk'>@@ -125,11 +179,17 @@ temp[1-8]_crit_alarm	Temperature critical high alarm.</div><div class='ctx'> temp[1-8]_average	Historical average temperature (MAX34446 only).</div><div class='ctx'> temp[1-8]_highest	Historical maximum temperature.</div><div class='ctx'> temp[1-8]_reset_history	Write any value to reset history.</div><div class='add'>+======================= ========================================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+   - temp7 and temp8 attributes only exist for MAX34440.</div><div class='add'>+   - MAX34446 only supports temp[1-3].</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-			temp7 and temp8 attributes only exist for MAX34440.</div><div class='del'>-			MAX34446 only supports temp[1-3].</div><div class='add'>+.. note::</div><div class='ctx'> </div><div class='del'>-MAX34451 supports attribute groups in[1-16] (or curr[1-16] based on input pins)</div><div class='del'>-and temp[1-5].</div><div class='del'>-MAX34460 supports attribute groups in[1-12] and temp[1-5].</div><div class='del'>-MAX34461 supports attribute groups in[1-16] and temp[1-5].</div><div class='add'>+   - MAX34451 supports attribute groups in[1-16] (or curr[1-16] based on</div><div class='add'>+     input pins) and temp[1-5].</div><div class='add'>+   - MAX34460 supports attribute groups in[1-12] and temp[1-5].</div><div class='add'>+   - MAX34461 supports attribute groups in[1-16] and temp[1-5].</div><div class='head'>diff --git a/Documentation/hwmon/max6639 b/Documentation/hwmon/max6639.rst<br/>index dc49f8be7167..3da54225f83c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6639?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6639</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6639.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max6639.rst</a></div><div class='hunk'>@@ -2,14 +2,18 @@ Kernel driver max6639</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6639</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6639'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c, 0x2e, 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6639.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-    He Changqing &lt;hechangqing@semptian.com&gt;</div><div class='del'>-    Roland Stigge &lt;stigge@antcom.de&gt;</div><div class='add'>+    - He Changqing &lt;hechangqing@semptian.com&gt;</div><div class='add'>+    - Roland Stigge &lt;stigge@antcom.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -21,19 +25,20 @@ diode-connected transistors.</div><div class='ctx'> </div><div class='ctx'> The following device attributes are implemented via sysfs:</div><div class='ctx'> </div><div class='add'>+====================== ==== ===================================================</div><div class='ctx'> Attribute              R/W  Contents</div><div class='del'>-----------------------------------------------------------------------------</div><div class='add'>+====================== ==== ===================================================</div><div class='ctx'> temp1_input            R    Temperature channel 1 input (0..150 C)</div><div class='ctx'> temp2_input            R    Temperature channel 2 input (0..150 C)</div><div class='ctx'> temp1_fault            R    Temperature channel 1 diode fault</div><div class='ctx'> temp2_fault            R    Temperature channel 2 diode fault</div><div class='ctx'> temp1_max              RW   Set THERM temperature for input 1</div><div class='del'>-                            (in C, see datasheet)</div><div class='add'>+			    (in C, see datasheet)</div><div class='ctx'> temp2_max              RW   Set THERM temperature for input 2</div><div class='ctx'> temp1_crit             RW   Set ALERT temperature for input 1</div><div class='ctx'> temp2_crit             RW   Set ALERT temperature for input 2</div><div class='ctx'> temp1_emergency        RW   Set OT temperature for input 1</div><div class='del'>-                            (in C, see datasheet)</div><div class='add'>+			    (in C, see datasheet)</div><div class='ctx'> temp2_emergency        RW   Set OT temperature for input 2</div><div class='ctx'> pwm1                   RW   Fan 1 target duty cycle (0..255)</div><div class='ctx'> pwm2                   RW   Fan 2 target duty cycle (0..255)</div><div class='hunk'>@@ -47,3 +52,4 @@ temp1_crit_alarm       R    Alarm on ALERT temperature on channel 1</div><div class='ctx'> temp2_crit_alarm       R    Alarm on ALERT temperature on channel 2</div><div class='ctx'> temp1_emergency_alarm  R    Alarm on OT temperature on channel 1</div><div class='ctx'> temp2_emergency_alarm  R    Alarm on OT temperature on channel 2</div><div class='add'>+====================== ==== ===================================================</div><div class='head'>diff --git a/Documentation/hwmon/max6642 b/Documentation/hwmon/max6642.rst<br/>index afbd3e4942e2..7e5b7d4f9492 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6642?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6642</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6642.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max6642.rst</a></div><div class='hunk'>@@ -2,14 +2,20 @@ Kernel driver max6642</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6642</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6642'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48-0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Maxim website</div><div class='del'>-               http://datasheets.maxim-ic.com/en/ds/MAX6642.pdf</div><div class='add'>+</div><div class='add'>+	       http://datasheets.maxim-ic.com/en/ds/MAX6642.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Per Dalen &lt;per.dalen@appeartv.com&gt;</div><div class='add'>+</div><div class='add'>+	Per Dalen &lt;per.dalen@appeartv.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/max6650 b/Documentation/hwmon/max6650.rst<br/>index dff1d296a48b..253482add082 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6650?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6650</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6650.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max6650.rst</a></div><div class='hunk'>@@ -2,19 +2,27 @@ Kernel driver max6650</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6650</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6650'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6651</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6651'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-    Hans J. Koch &lt;hjk@hansjkoch.de&gt;</div><div class='del'>-    John Morris &lt;john.morris@spirentcom.com&gt;</div><div class='del'>-    Claus Gindhart &lt;claus.gindhart@kontron.com&gt;</div><div class='add'>+    - Hans J. Koch &lt;hjk@hansjkoch.de&gt;</div><div class='add'>+    - John Morris &lt;john.morris@spirentcom.com&gt;</div><div class='add'>+    - Claus Gindhart &lt;claus.gindhart@kontron.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -28,6 +36,7 @@ The driver is not able to distinguish between the 2 devices.</div><div class='ctx'> </div><div class='ctx'> The driver provides the following sensor accesses in sysfs:</div><div class='ctx'> </div><div class='add'>+=============== ======= =======================================================</div><div class='ctx'> fan1_input	ro	fan tachometer speed in RPM</div><div class='ctx'> fan2_input	ro	"</div><div class='ctx'> fan3_input	ro	"</div><div class='hunk'>@@ -40,6 +49,7 @@ pwm1		rw	relative speed (0-255), 255=max. speed.</div><div class='ctx'> fan1_div	rw	sets the speed range the inputs can handle. Legal</div><div class='ctx'> 			values are 1, 2, 4, and 8. Use lower values for</div><div class='ctx'> 			faster fans.</div><div class='add'>+=============== ======= =======================================================</div><div class='ctx'> </div><div class='ctx'> Usage notes</div><div class='ctx'> -----------</div><div class='hunk'>@@ -62,4 +72,3 @@ clock: The clock frequency in Hz of the chip the driver should assume [254000]</div><div class='ctx'> </div><div class='ctx'> Please have a look at the MAX6650/6651 data sheet and make sure that you fully</div><div class='ctx'> understand the meaning of these parameters before you attempt to change them.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/hwmon/max6697 b/Documentation/hwmon/max6697.rst<br/>index 6594177ededa..ffc5a7d8d33b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6697?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max6697</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max6697.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max6697.rst</a></div><div class='hunk'>@@ -2,38 +2,69 @@ Kernel driver max6697</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6581</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6581'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6581.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6602</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6602'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6602.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6622</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6622'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6622.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6636</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6636'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6636.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6689</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6689'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6689.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6693</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6693'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6693.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6694</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6694'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6694.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6697</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6697'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6697.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6698</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6698'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6698.pdf</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX6699</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max6699'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX6699.pdf</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'>     Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -50,9 +81,11 @@ The driver provides the following sysfs attributes. temp1 is the local (chip)</div><div class='ctx'> temperature, temp[2..n] are remote temperatures. The actually supported</div><div class='ctx'> per-channel attributes are chip type and channel dependent.</div><div class='ctx'> </div><div class='add'>+================ == ==========================================================</div><div class='ctx'> tempX_input      RO temperature</div><div class='ctx'> tempX_max        RW temperature maximum threshold</div><div class='ctx'> tempX_max_alarm  RO temperature maximum threshold alarm</div><div class='ctx'> tempX_crit       RW temperature critical threshold</div><div class='ctx'> tempX_crit_alarm RO temperature critical threshold alarm</div><div class='ctx'> tempX_fault      RO temperature diode fault (remote sensors only)</div><div class='add'>+================ == ==========================================================</div><div class='head'>diff --git a/Documentation/hwmon/max8688 b/Documentation/hwmon/max8688.rst<br/>index ca233bec7a8a..009487759c61 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max8688?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/max8688</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/max8688.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/max8688.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver max8688</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Maxim MAX8688</div><div class='add'>+</div><div class='ctx'>     Prefix: 'max8688'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX8688.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -17,7 +21,7 @@ This driver supports hardware monitoring for Maxim MAX8688 Digital Power-Supply</div><div class='ctx'> Controller/Monitor with PMBus Interface.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -40,23 +44,28 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in1_label		"vout1"</div><div class='ctx'> in1_input		Measured voltage. From READ_VOUT register.</div><div class='ctx'> in1_min			Minimum Voltage. From VOUT_UV_WARN_LIMIT register.</div><div class='ctx'> in1_max			Maximum voltage. From VOUT_OV_WARN_LIMIT register.</div><div class='ctx'> in1_lcrit		Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.</div><div class='del'>-in1_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.</div><div class='add'>+in1_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> in1_min_alarm		Voltage low alarm. From VOLTAGE_UV_WARNING status.</div><div class='ctx'> in1_max_alarm		Voltage high alarm. From VOLTAGE_OV_WARNING status.</div><div class='del'>-in1_lcrit_alarm		Voltage critical low alarm. From VOLTAGE_UV_FAULT status.</div><div class='del'>-in1_crit_alarm		Voltage critical high alarm. From VOLTAGE_OV_FAULT status.</div><div class='add'>+in1_lcrit_alarm		Voltage critical low alarm. From VOLTAGE_UV_FAULT</div><div class='add'>+			status.</div><div class='add'>+in1_crit_alarm		Voltage critical high alarm. From VOLTAGE_OV_FAULT</div><div class='add'>+			status.</div><div class='ctx'> in1_highest		Historical maximum voltage.</div><div class='ctx'> in1_reset_history	Write any value to reset history.</div><div class='ctx'> </div><div class='ctx'> curr1_label		"iout1"</div><div class='ctx'> curr1_input		Measured current. From READ_IOUT register.</div><div class='ctx'> curr1_max		Maximum current. From IOUT_OC_WARN_LIMIT register.</div><div class='del'>-curr1_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT register.</div><div class='add'>+curr1_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> curr1_max_alarm		Current high alarm. From IOUT_OC_WARN_LIMIT register.</div><div class='ctx'> curr1_crit_alarm	Current critical high alarm. From IOUT_OC_FAULT status.</div><div class='ctx'> curr1_highest		Historical maximum current.</div><div class='hunk'>@@ -73,3 +82,4 @@ temp1_crit_alarm	Chip temperature critical high alarm. Set by comparing</div><div class='ctx'> 			status is set.</div><div class='ctx'> temp1_highest		Historical maximum temperature.</div><div class='ctx'> temp1_reset_history	Write any value to reset history.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/mc13783-adc b/Documentation/hwmon/mc13783-adc.rst<br/>index 05ccc9f159f1..cae70350ba2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/mc13783-adc?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/mc13783-adc</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/mc13783-adc.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/mc13783-adc.rst</a></div><div class='hunk'>@@ -2,16 +2,25 @@ Kernel driver mc13783-adc</div><div class='ctx'> =========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Freescale MC13783</div><div class='add'>+</div><div class='ctx'>     Prefix: 'mc13783'</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://www.nxp.com/docs/en/data-sheet/MC13783.pdf</div><div class='add'>+</div><div class='ctx'>   * Freescale MC13892</div><div class='add'>+</div><div class='ctx'>     Prefix: 'mc13892'</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://www.nxp.com/docs/en/data-sheet/MC13892.pdf</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-    Sascha Hauer &lt;s.hauer@pengutronix.de&gt;</div><div class='del'>-    Luotao Fu &lt;l.fu@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+   - Sascha Hauer &lt;s.hauer@pengutronix.de&gt;</div><div class='add'>+   - Luotao Fu &lt;l.fu@pengutronix.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -30,9 +39,11 @@ the General Purpose inputs and touchscreen.</div><div class='ctx'> See the following tables for the meaning of the different channels and their</div><div class='ctx'> chip internal scaling:</div><div class='ctx'> </div><div class='del'>-MC13783:</div><div class='add'>+- MC13783:</div><div class='add'>+</div><div class='add'>+======= =============================================== =============== =======</div><div class='ctx'> Channel	Signal						Input Range	Scaling</div><div class='del'>--------------------------------------------------------------------------------</div><div class='add'>+======= =============================================== =============== =======</div><div class='ctx'> 0	Battery Voltage (BATT)				2.50 - 4.65V	-2.40V</div><div class='ctx'> 1	Battery Current (BATT - BATTISNS)		-50 - 50 mV	x20</div><div class='ctx'> 2	Application Supply (BP)				2.50 - 4.65V	-2.40V</div><div class='hunk'>@@ -52,10 +63,13 @@ Channel	Signal						Input Range	Scaling</div><div class='ctx'> 13	General Purpose TSX2 / Touchscreen X-plate 2	0 - 2.30V	No</div><div class='ctx'> 14	General Purpose TSY1 / Touchscreen Y-plate 1	0 - 2.30V	No</div><div class='ctx'> 15	General Purpose TSY2 / Touchscreen Y-plate 2	0 - 2.30V	No</div><div class='add'>+======= =============================================== =============== =======</div><div class='add'>+</div><div class='add'>+- MC13892:</div><div class='ctx'> </div><div class='del'>-MC13892:</div><div class='add'>+======= =============================================== =============== =======</div><div class='ctx'> Channel	Signal						Input Range	Scaling</div><div class='del'>--------------------------------------------------------------------------------</div><div class='add'>+======= =============================================== =============== =======</div><div class='ctx'> 0	Battery Voltage (BATT)				0 - 4.8V	/2</div><div class='ctx'> 1	Battery Current (BATT - BATTISNSCC)		-60 - 60 mV	x20</div><div class='ctx'> 2	Application Supply (BPSNS)			0 - 4.8V	/2</div><div class='hunk'>@@ -72,3 +86,4 @@ Channel	Signal						Input Range	Scaling</div><div class='ctx'> 13	General Purpose TSX2 / Touchscreen X-plate 2	0 - 2.4V	No</div><div class='ctx'> 14	General Purpose TSY1 / Touchscreen Y-plate 1	0 - 2.4V	No</div><div class='ctx'> 15	General Purpose TSY2 / Touchscreen Y-plate 2	0 - 2.4V	No</div><div class='add'>+======= =============================================== =============== =======</div><div class='head'>diff --git a/Documentation/hwmon/mcp3021 b/Documentation/hwmon/mcp3021.rst<br/>index 74a6b72adf5f..83f4bda2f269 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/mcp3021?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/mcp3021</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/mcp3021.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/mcp3021.rst</a></div><div class='hunk'>@@ -1,17 +1,26 @@</div><div class='ctx'> Kernel driver MCP3021</div><div class='del'>-======================</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Microchip Technology MCP3021</div><div class='add'>+</div><div class='ctx'>     Prefix: 'mcp3021'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21805a.pdf</div><div class='add'>+</div><div class='ctx'>   * Microchip Technology MCP3221</div><div class='add'>+</div><div class='ctx'>     Prefix: 'mcp3221'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21732c.pdf</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-   Mingkai Hu</div><div class='del'>-   Sven Schuchmann &lt;schuchmann@schleissheimer.de&gt;</div><div class='add'>+</div><div class='add'>+   - Mingkai Hu</div><div class='add'>+   - Sven Schuchmann &lt;schuchmann@schleissheimer.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/menf21bmc b/Documentation/hwmon/menf21bmc.rst<br/>index 2a273a065c5e..1f0c6b2235ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/menf21bmc?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/menf21bmc</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/menf21bmc.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/menf21bmc.rst</a></div><div class='hunk'>@@ -2,8 +2,11 @@ Kernel driver menf21bmc_hwmon</div><div class='ctx'> =============================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'> 	* MEN 14F021P00</div><div class='add'>+</div><div class='ctx'> 	  Prefix: 'menf21bmc_hwmon'</div><div class='add'>+</div><div class='ctx'> 	  Adresses scanned: -</div><div class='ctx'> </div><div class='ctx'> Author: Andreas Werner &lt;andreas.werner@men.de&gt;</div><div class='hunk'>@@ -34,6 +37,7 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. All attributes are read only</div><div class='ctx'> The Limits are read once by the driver.</div><div class='ctx'> </div><div class='add'>+=============== ==========================</div><div class='ctx'> in0_input	+3.3V input voltage</div><div class='ctx'> in1_input	+5.0V input voltage</div><div class='ctx'> in2_input	+12.0V input voltage</div><div class='hunk'>@@ -48,3 +52,4 @@ in1_label	"MON_5V"</div><div class='ctx'> in2_label	"MON_12V"</div><div class='ctx'> in3_label	"5V_STANDBY"</div><div class='ctx'> in4_label	"VBAT"</div><div class='add'>+=============== ==========================</div><div class='head'>diff --git a/Documentation/hwmon/mlxreg-fan b/Documentation/hwmon/mlxreg-fan.rst<br/>index fc531c6978d4..c92b8e885f7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/mlxreg-fan?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/mlxreg-fan</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/mlxreg-fan.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/mlxreg-fan.rst</a></div><div class='hunk'>@@ -2,32 +2,38 @@ Kernel driver mlxreg-fan</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='ctx'> Provides FAN control for the next Mellanox systems:</div><div class='del'>-QMB700, equipped with 40x200GbE InfiniBand ports;</div><div class='del'>-MSN3700, equipped with 32x200GbE or 16x400GbE Ethernet ports;</div><div class='del'>-MSN3410, equipped with 6x400GbE plus 48x50GbE Ethernet ports;</div><div class='del'>-MSN3800, equipped with 64x1000GbE Ethernet ports;</div><div class='add'>+</div><div class='add'>+- QMB700, equipped with 40x200GbE InfiniBand ports;</div><div class='add'>+- MSN3700, equipped with 32x200GbE or 16x400GbE Ethernet ports;</div><div class='add'>+- MSN3410, equipped with 6x400GbE plus 48x50GbE Ethernet ports;</div><div class='add'>+- MSN3800, equipped with 64x1000GbE Ethernet ports;</div><div class='add'>+</div><div class='add'>+Author: Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='add'>+</div><div class='ctx'> These are the Top of the Rack systems, equipped with Mellanox switch</div><div class='ctx'> board with Mellanox Quantum or Spectrume-2 devices.</div><div class='ctx'> FAN controller is implemented by the programmable device logic.</div><div class='ctx'> </div><div class='ctx'> The default registers offsets set within the programmable device is as</div><div class='ctx'> following:</div><div class='del'>-- pwm1			0xe3</div><div class='del'>-- fan1 (tacho1)		0xe4</div><div class='del'>-- fan2 (tacho2)		0xe5</div><div class='del'>-- fan3 (tacho3)		0xe6</div><div class='del'>-- fan4 (tacho4)		0xe7</div><div class='del'>-- fan5 (tacho5)		0xe8</div><div class='del'>-- fan6 (tacho6)		0xe9</div><div class='del'>-- fan7 (tacho7)		0xea</div><div class='del'>-- fan8 (tacho8)		0xeb</div><div class='del'>-- fan9 (tacho9)		0xec</div><div class='del'>-- fan10 (tacho10)	0xed</div><div class='del'>-- fan11 (tacho11)	0xee</div><div class='del'>-- fan12 (tacho12)	0xef</div><div class='del'>-This setup can be re-programmed with other registers.</div><div class='ctx'> </div><div class='del'>-Author: Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='add'>+======================= ====</div><div class='add'>+pwm1			0xe3</div><div class='add'>+fan1 (tacho1)		0xe4</div><div class='add'>+fan2 (tacho2)		0xe5</div><div class='add'>+fan3 (tacho3)		0xe6</div><div class='add'>+fan4 (tacho4)		0xe7</div><div class='add'>+fan5 (tacho5)		0xe8</div><div class='add'>+fan6 (tacho6)		0xe9</div><div class='add'>+fan7 (tacho7)		0xea</div><div class='add'>+fan8 (tacho8)		0xeb</div><div class='add'>+fan9 (tacho9)		0xec</div><div class='add'>+fan10 (tacho10)		0xed</div><div class='add'>+fan11 (tacho11)		0xee</div><div class='add'>+fan12 (tacho12)		0xef</div><div class='add'>+======================= ====</div><div class='add'>+</div><div class='add'>+This setup can be re-programmed with other registers.</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -48,13 +54,17 @@ thermal's sysfs interfaces.</div><div class='ctx'> /sys files in hwmon subsystem</div><div class='ctx'> -----------------------------</div><div class='ctx'> </div><div class='del'>-fan[1-12]_fault - RO files for tachometers TACH1-TACH12 fault indication</div><div class='del'>-fan[1-12]_input - RO files for tachometers TACH1-TACH12 input (in RPM)</div><div class='del'>-pwm1		- RW file for fan[1-12] target duty cycle (0..255)</div><div class='add'>+================= == ===================================================</div><div class='add'>+fan[1-12]_fault   RO files for tachometers TACH1-TACH12 fault indication</div><div class='add'>+fan[1-12]_input   RO files for tachometers TACH1-TACH12 input (in RPM)</div><div class='add'>+pwm1		  RW file for fan[1-12] target duty cycle (0..255)</div><div class='add'>+================= == ===================================================</div><div class='ctx'> </div><div class='ctx'> /sys files in thermal subsystem</div><div class='ctx'> -------------------------------</div><div class='ctx'> </div><div class='del'>-cur_state	- RW file for current cooling state of the cooling device</div><div class='del'>-		  (0..max_state)</div><div class='del'>-max_state	- RO file for maximum cooling state of the cooling device</div><div class='add'>+================= == ====================================================</div><div class='add'>+cur_state	  RW file for current cooling state of the cooling device</div><div class='add'>+		     (0..max_state)</div><div class='add'>+max_state	  RO file for maximum cooling state of the cooling device</div><div class='add'>+================= == ====================================================</div><div class='head'>diff --git a/Documentation/hwmon/nct6683 b/Documentation/hwmon/nct6683.rst<br/>index c1301d4300cd..efbf7e9703ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct6683?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct6683</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct6683.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/nct6683.rst</a></div><div class='hunk'>@@ -2,13 +2,18 @@ Kernel driver nct6683</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6683D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6683'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='add'>+</div><div class='add'>+	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -50,8 +55,10 @@ Tested Boards and Firmware Versions</div><div class='ctx'> The driver has been reported to work with the following boards and</div><div class='ctx'> firmware versions.</div><div class='ctx'> </div><div class='add'>+=============== ===============================================</div><div class='ctx'> Board		Firmware version</div><div class='del'>----------------------------------------------------------------</div><div class='add'>+=============== ===============================================</div><div class='ctx'> Intel DH87RL	NCT6683D EC firmware version 1.0 build 04/03/13</div><div class='ctx'> Intel DH87MC	NCT6683D EC firmware version 1.0 build 04/03/13</div><div class='ctx'> Intel DB85FL	NCT6683D EC firmware version 1.0 build 04/03/13</div><div class='add'>+=============== ===============================================</div><div class='head'>diff --git a/Documentation/hwmon/nct6775 b/Documentation/hwmon/nct6775.rst<br/>index bd59834d310f..1d0315c40952 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct6775?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct6775</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct6775.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/nct6775.rst</a></div><div class='hunk'>@@ -1,52 +1,90 @@</div><div class='del'>-Note</div><div class='del'>-====</div><div class='del'>-</div><div class='del'>-This driver supersedes the NCT6775F and NCT6776F support in the W83627EHF</div><div class='del'>-driver.</div><div class='del'>-</div><div class='ctx'> Kernel driver NCT6775</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    This driver supersedes the NCT6775F and NCT6776F support in the W83627EHF</div><div class='add'>+    driver.</div><div class='add'>+</div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6102D/NCT6104D/NCT6106D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6106'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from the Nuvoton web site</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT5572D/NCT6771F/NCT6772F/NCT6775F/W83677HG-I</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6775'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT5573D/NCT5577D/NCT6776D/NCT6776F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6776'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT5532D/NCT6779D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6779'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6791D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6791'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6792D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6792'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6793D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6793'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6795D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6795'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6796D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6796'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='add'>+</div><div class='add'>+	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -96,10 +134,14 @@ The mode works for fan1-fan5.</div><div class='ctx'> sysfs attributes</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='del'>-pwm[1-7] - this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='add'>+pwm[1-7]</div><div class='add'>+    - this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='add'>+</div><div class='ctx'> 	   0 (lowest speed) to 255 (full)</div><div class='ctx'> </div><div class='del'>-pwm[1-7]_enable - this file controls mode of fan/temperature control:</div><div class='add'>+pwm[1-7]_enable</div><div class='add'>+    - this file controls mode of fan/temperature control:</div><div class='add'>+</div><div class='ctx'> 	* 0 Fan control disabled (fans set to maximum speed)</div><div class='ctx'> 	* 1 Manual mode, write to pwm[0-5] any value 0-255</div><div class='ctx'> 	* 2 "Thermal Cruise" mode</div><div class='hunk'>@@ -107,15 +149,19 @@ pwm[1-7]_enable - this file controls mode of fan/temperature control:</div><div class='ctx'> 	* 4 "Smart Fan III" mode (NCT6775F only)</div><div class='ctx'> 	* 5 "Smart Fan IV" mode</div><div class='ctx'> </div><div class='del'>-pwm[1-7]_mode - controls if output is PWM or DC level</div><div class='del'>-        * 0 DC output</div><div class='del'>-        * 1 PWM output</div><div class='add'>+pwm[1-7]_mode</div><div class='add'>+    - controls if output is PWM or DC level</div><div class='add'>+</div><div class='add'>+	* 0 DC output</div><div class='add'>+	* 1 PWM output</div><div class='ctx'> </div><div class='ctx'> Common fan control attributes</div><div class='ctx'> -----------------------------</div><div class='ctx'> </div><div class='del'>-pwm[1-7]_temp_sel	Temperature source. Value is temperature sensor index.</div><div class='add'>+pwm[1-7]_temp_sel</div><div class='add'>+			Temperature source. Value is temperature sensor index.</div><div class='ctx'> 			For example, select '1' for temp1_input.</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_weight_temp_sel</div><div class='ctx'> 			Secondary temperature source. Value is temperature</div><div class='ctx'> 			sensor index. For example, select '1' for temp1_input.</div><div class='hunk'>@@ -126,13 +172,16 @@ following attributes.</div><div class='ctx'> </div><div class='ctx'> pwm[1-7]_weight_duty_step</div><div class='ctx'> 			Duty step size.</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_weight_temp_step</div><div class='ctx'> 			Temperature step size. With each step over</div><div class='ctx'> 			temp_step_base, the value of weight_duty_step is added</div><div class='ctx'> 			to the current pwm value.</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_weight_temp_step_base</div><div class='ctx'> 			Temperature at which secondary temperature control kicks</div><div class='ctx'> 			in.</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_weight_temp_step_tol</div><div class='ctx'> 			Temperature step tolerance.</div><div class='ctx'> </div><div class='hunk'>@@ -141,24 +190,35 @@ Thermal Cruise mode (2)</div><div class='ctx'> </div><div class='ctx'> If the temperature is in the range defined by:</div><div class='ctx'> </div><div class='del'>-pwm[1-7]_target_temp	Target temperature, unit millidegree Celsius</div><div class='add'>+pwm[1-7]_target_temp</div><div class='add'>+			Target temperature, unit millidegree Celsius</div><div class='ctx'> 			(range 0 - 127000)</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_temp_tolerance</div><div class='ctx'> 			Target temperature tolerance, unit millidegree Celsius</div><div class='ctx'> </div><div class='del'>-there are no changes to fan speed. Once the temperature leaves the interval, fan</div><div class='add'>+There are no changes to fan speed. Once the temperature leaves the interval, fan</div><div class='ctx'> speed increases (if temperature is higher that desired) or decreases (if</div><div class='ctx'> temperature is lower than desired), using the following limits and time</div><div class='ctx'> intervals.</div><div class='ctx'> </div><div class='del'>-pwm[1-7]_start		fan pwm start value (range 1 - 255), to start fan</div><div class='add'>+pwm[1-7]_start</div><div class='add'>+			fan pwm start value (range 1 - 255), to start fan</div><div class='ctx'> 			when the temperature is above defined range.</div><div class='del'>-pwm[1-7]_floor		lowest fan pwm (range 0 - 255) if temperature is below</div><div class='add'>+</div><div class='add'>+pwm[1-7]_floor</div><div class='add'>+			lowest fan pwm (range 0 - 255) if temperature is below</div><div class='ctx'> 			the defined range. If set to 0, the fan is expected to</div><div class='ctx'> 			stop if the temperature is below the defined range.</div><div class='del'>-pwm[1-7]_step_up_time	milliseconds before fan speed is increased</div><div class='del'>-pwm[1-7]_step_down_time	milliseconds before fan speed is decreased</div><div class='del'>-pwm[1-7]_stop_time	how many milliseconds must elapse to switch</div><div class='add'>+</div><div class='add'>+pwm[1-7]_step_up_time</div><div class='add'>+			milliseconds before fan speed is increased</div><div class='add'>+</div><div class='add'>+pwm[1-7]_step_down_time</div><div class='add'>+			milliseconds before fan speed is decreased</div><div class='add'>+</div><div class='add'>+pwm[1-7]_stop_time</div><div class='add'>+			how many milliseconds must elapse to switch</div><div class='ctx'> 			corresponding fan off (when the temperature was below</div><div class='ctx'> 			defined range).</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +227,9 @@ Speed Cruise mode (3)</div><div class='ctx'> </div><div class='ctx'> This modes tries to keep the fan speed constant.</div><div class='ctx'> </div><div class='del'>-fan[1-7]_target		Target fan speed</div><div class='add'>+fan[1-7]_target</div><div class='add'>+			Target fan speed</div><div class='add'>+</div><div class='ctx'> fan[1-7]_tolerance</div><div class='ctx'> 			Target speed tolerance</div><div class='ctx'> </div><div class='hunk'>@@ -188,16 +250,22 @@ critical temperature mode, in which the fans should run at full speed.</div><div class='ctx'> pwm[1-7]_auto_point[1-7]_pwm</div><div class='ctx'> 			pwm value to be set if temperature reaches matching</div><div class='ctx'> 			temperature range.</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_auto_point[1-7]_temp</div><div class='ctx'> 			Temperature over which the matching pwm is enabled.</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_temp_tolerance</div><div class='ctx'> 			Temperature tolerance, unit millidegree Celsius</div><div class='add'>+</div><div class='ctx'> pwm[1-7]_crit_temp_tolerance</div><div class='ctx'> 			Temperature tolerance for critical temperature,</div><div class='ctx'> 			unit millidegree Celsius</div><div class='ctx'> </div><div class='del'>-pwm[1-7]_step_up_time	milliseconds before fan speed is increased</div><div class='del'>-pwm[1-7]_step_down_time	milliseconds before fan speed is decreased</div><div class='add'>+pwm[1-7]_step_up_time</div><div class='add'>+			milliseconds before fan speed is increased</div><div class='add'>+</div><div class='add'>+pwm[1-7]_step_down_time</div><div class='add'>+			milliseconds before fan speed is decreased</div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/nct7802 b/Documentation/hwmon/nct7802.rst<br/>index 5438deb6be02..8b7365a7cb32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct7802?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct7802</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct7802.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/nct7802.rst</a></div><div class='hunk'>@@ -2,13 +2,18 @@ Kernel driver nct7802</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT7802Y</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct7802'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28..0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton web site</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='add'>+</div><div class='add'>+	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -25,7 +30,9 @@ Tested Boards and BIOS Versions</div><div class='ctx'> The driver has been reported to work with the following boards and</div><div class='ctx'> BIOS versions.</div><div class='ctx'> </div><div class='add'>+======================= ===============================================</div><div class='ctx'> Board			BIOS version</div><div class='del'>----------------------------------------------------------------</div><div class='add'>+======================= ===============================================</div><div class='ctx'> Kontron COMe-bSC2	CHR2E934.001.GGO</div><div class='ctx'> Kontron COMe-bIP2	CCR2E212</div><div class='add'>+======================= ===============================================</div><div class='head'>diff --git a/Documentation/hwmon/nct7904 b/Documentation/hwmon/nct7904.rst<br/>index 57fffe33ebfc..5b2f111582ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct7904?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nct7904</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nct7904.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/nct7904.rst</a></div><div class='hunk'>@@ -1,11 +1,16 @@</div><div class='ctx'> Kernel driver nct7904</div><div class='del'>-====================</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> Supported chip:</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT7904D</div><div class='add'>+</div><div class='ctx'>     Prefix: nct7904</div><div class='add'>+</div><div class='ctx'>     Addresses: I2C 0x2d, 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at Nuvoton website</div><div class='add'>+</div><div class='ctx'> 	http://www.nuvoton.com/</div><div class='ctx'> </div><div class='ctx'> Author: Vadim V. Vlasov &lt;vvlasov@dev.rtsoft.ru&gt;</div><div class='hunk'>@@ -25,6 +30,7 @@ Sysfs entries</div><div class='ctx'> </div><div class='ctx'> Currently, the driver supports only the following features:</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in[1-20]_input		Input voltage measurements (mV)</div><div class='ctx'> </div><div class='ctx'> fan[1-12]_input		Fan tachometer measurements (rpm)</div><div class='hunk'>@@ -40,6 +46,7 @@ pwm[1-4]_enable		R/W, 1/2 for manual or SmartFan mode</div><div class='ctx'> 			previously configured by BIOS (or configuration EEPROM)</div><div class='ctx'> </div><div class='ctx'> pwm[1-4]		R/O in SmartFan mode, R/W in manual control mode</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> The driver checks sensor control registers and does not export the sensors</div><div class='ctx'> that are not enabled. Anyway, a sensor that is enabled may actually be not</div><div class='head'>diff --git a/Documentation/hwmon/npcm750-pwm-fan b/Documentation/hwmon/npcm750-pwm-fan.rst<br/>index 6156ef7398e6..c67af08b6773 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/npcm750-pwm-fan?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/npcm750-pwm-fan</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/npcm750-pwm-fan.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/npcm750-pwm-fan.rst</a></div><div class='hunk'>@@ -2,9 +2,11 @@ Kernel driver npcm750-pwm-fan</div><div class='ctx'> =============================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'> 	NUVOTON NPCM750/730/715/705</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='add'>+</div><div class='ctx'> 	&lt;tomer.maimon@nuvoton.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description:</div><div class='hunk'>@@ -15,8 +17,10 @@ controller supports up to 16 tachometer inputs.</div><div class='ctx'> </div><div class='ctx'> The driver provides the following sensor accesses in sysfs:</div><div class='ctx'> </div><div class='add'>+=============== ======= =====================================================</div><div class='ctx'> fanX_input	ro	provide current fan rotation value in RPM as reported</div><div class='ctx'> 			by the fan to the device.</div><div class='ctx'> </div><div class='ctx'> pwmX		rw	get or set PWM fan control value. This is an integer</div><div class='ctx'> 			value between 0(off) and 255(full speed).</div><div class='add'>+=============== ======= =====================================================</div><div class='head'>diff --git a/Documentation/hwmon/nsa320 b/Documentation/hwmon/nsa320.rst<br/>index fdbd6947799b..4fe75fd2f937 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nsa320?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/nsa320</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/nsa320.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/nsa320.rst</a></div><div class='hunk'>@@ -2,14 +2,23 @@ Kernel driver nsa320_hwmon</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Holtek HT46R065 microcontroller with onboard firmware that configures</div><div class='add'>+</div><div class='ctx'> 	it to act as a hardware monitor.</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nsa320'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not available, driver was reverse engineered based upon the</div><div class='add'>+</div><div class='ctx'> 	Zyxel kernel source</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'>   Adam Baker &lt;linux@baker-net.org.uk&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -31,8 +40,10 @@ tenths of a degree.</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-temp1_input - temperature input</div><div class='del'>-fan1_input - fan speed</div><div class='add'>+============= =================</div><div class='add'>+temp1_input   temperature input</div><div class='add'>+fan1_input    fan speed</div><div class='add'>+============= =================</div><div class='ctx'> </div><div class='ctx'> Notes</div><div class='ctx'> -----</div><div class='head'>diff --git a/Documentation/hwmon/ntc_thermistor b/Documentation/hwmon/ntc_thermistor.rst<br/>index 8b9ff23edc32..d0e7f91726b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ntc_thermistor?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ntc_thermistor</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ntc_thermistor.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ntc_thermistor.rst</a></div><div class='hunk'>@@ -1,22 +1,29 @@</div><div class='ctx'> Kernel driver ntc_thermistor</div><div class='del'>-=================</div><div class='add'>+============================</div><div class='ctx'> </div><div class='ctx'> Supported thermistors from Murata:</div><div class='add'>+</div><div class='ctx'> * Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473,</div><div class='ctx'>   NCP15WL333, NCP03WF104, NCP15XH103</div><div class='add'>+</div><div class='ctx'>   Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473',</div><div class='ctx'>   'ncp15wl333', 'ncp03wf104', 'ncp15xh103'</div><div class='add'>+</div><div class='ctx'>   Datasheet: Publicly available at Murata</div><div class='ctx'> </div><div class='ctx'> Supported thermistors from EPCOS:</div><div class='add'>+</div><div class='ctx'> * EPCOS NTC Thermistors B57330V2103</div><div class='add'>+</div><div class='ctx'>   Prefixes: b57330v2103</div><div class='add'>+</div><div class='ctx'>   Datasheet: Publicly available at EPCOS</div><div class='ctx'> </div><div class='ctx'> Other NTC thermistors can be supported simply by adding compensation</div><div class='ctx'> tables; e.g., NCP15WL333 support is added by the table ncpXXwl333.</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='add'>+</div><div class='ctx'> 	MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -29,57 +36,60 @@ compensation table to get the temperature input.</div><div class='ctx'> The NTC driver provides lookup tables with a linear approximation function</div><div class='ctx'> and four circuit models with an option not to use any of the four models.</div><div class='ctx'> </div><div class='add'>+Using the following convention::</div><div class='add'>+</div><div class='add'>+   $	resistor</div><div class='add'>+   [TH]	the thermistor</div><div class='add'>+</div><div class='ctx'> The four circuit models provided are:</div><div class='ctx'> </div><div class='del'>-	$: resister, [TH]: the thermistor</div><div class='del'>-</div><div class='del'>- 1. connect = NTC_CONNECTED_POSITIVE, pullup_ohm &gt; 0</div><div class='del'>-</div><div class='del'>-   [pullup_uV]</div><div class='del'>-       |    |</div><div class='del'>-      [TH]  $ (pullup_ohm)</div><div class='del'>-       |    |</div><div class='del'>-       +----+-----------------------[read_uV]</div><div class='del'>-       |</div><div class='del'>-       $ (pulldown_ohm)</div><div class='del'>-       |</div><div class='del'>-      --- (ground)</div><div class='del'>-</div><div class='del'>- 2. connect = NTC_CONNECTED_POSITIVE, pullup_ohm = 0 (not-connected)</div><div class='del'>-</div><div class='del'>-   [pullup_uV]</div><div class='del'>-       |</div><div class='del'>-      [TH]</div><div class='del'>-       |</div><div class='del'>-       +----------------------------[read_uV]</div><div class='del'>-       |</div><div class='del'>-       $ (pulldown_ohm)</div><div class='del'>-       |</div><div class='del'>-      --- (ground)</div><div class='del'>-</div><div class='del'>- 3. connect = NTC_CONNECTED_GROUND, pulldown_ohm &gt; 0</div><div class='del'>-</div><div class='del'>-   [pullup_uV]</div><div class='del'>-       |</div><div class='del'>-       $ (pullup_ohm)</div><div class='del'>-       |</div><div class='del'>-       +----+-----------------------[read_uV]</div><div class='del'>-       |    |</div><div class='del'>-      [TH]  $ (pulldown_ohm)</div><div class='del'>-       |    |</div><div class='del'>-      -------- (ground)</div><div class='del'>-</div><div class='del'>- 4. connect = NTC_CONNECTED_GROUND, pulldown_ohm = 0 (not-connected)</div><div class='del'>-</div><div class='del'>-   [pullup_uV]</div><div class='del'>-       |</div><div class='del'>-       $ (pullup_ohm)</div><div class='del'>-       |</div><div class='del'>-       +----------------------------[read_uV]</div><div class='del'>-       |</div><div class='del'>-      [TH]</div><div class='del'>-       |</div><div class='del'>-      --- (ground)</div><div class='add'>+1. connect = NTC_CONNECTED_POSITIVE, pullup_ohm &gt; 0::</div><div class='add'>+</div><div class='add'>+     [pullup_uV]</div><div class='add'>+	 |    |</div><div class='add'>+	[TH]  $ (pullup_ohm)</div><div class='add'>+	 |    |</div><div class='add'>+	 +----+-----------------------[read_uV]</div><div class='add'>+	 |</div><div class='add'>+	 $ (pulldown_ohm)</div><div class='add'>+	 |</div><div class='add'>+	-+- (ground)</div><div class='add'>+</div><div class='add'>+2. connect = NTC_CONNECTED_POSITIVE, pullup_ohm = 0 (not-connected)::</div><div class='add'>+</div><div class='add'>+     [pullup_uV]</div><div class='add'>+	 |</div><div class='add'>+	[TH]</div><div class='add'>+	 |</div><div class='add'>+	 +----------------------------[read_uV]</div><div class='add'>+	 |</div><div class='add'>+	 $ (pulldown_ohm)</div><div class='add'>+	 |</div><div class='add'>+	-+- (ground)</div><div class='add'>+</div><div class='add'>+3. connect = NTC_CONNECTED_GROUND, pulldown_ohm &gt; 0::</div><div class='add'>+</div><div class='add'>+     [pullup_uV]</div><div class='add'>+	 |</div><div class='add'>+	 $ (pullup_ohm)</div><div class='add'>+	 |</div><div class='add'>+	 +----+-----------------------[read_uV]</div><div class='add'>+	 |    |</div><div class='add'>+	[TH]  $ (pulldown_ohm)</div><div class='add'>+	 |    |</div><div class='add'>+	-+----+- (ground)</div><div class='add'>+</div><div class='add'>+4. connect = NTC_CONNECTED_GROUND, pulldown_ohm = 0 (not-connected)::</div><div class='add'>+</div><div class='add'>+     [pullup_uV]</div><div class='add'>+	 |</div><div class='add'>+	 $ (pullup_ohm)</div><div class='add'>+	 |</div><div class='add'>+	 +----------------------------[read_uV]</div><div class='add'>+	 |</div><div class='add'>+	[TH]</div><div class='add'>+	 |</div><div class='add'>+	-+- (ground)</div><div class='ctx'> </div><div class='ctx'> When one of the four circuit models is used, read_uV, pullup_uV, pullup_ohm,</div><div class='ctx'> pulldown_ohm, and connect should be provided. When none of the four models</div><div class='hunk'>@@ -88,13 +98,14 @@ provide read_ohm and _not_ provide the others.</div><div class='ctx'> </div><div class='ctx'> Sysfs Interface</div><div class='ctx'> ---------------</div><div class='del'>-name		the mandatory global attribute, the thermistor name.</div><div class='ctx'> </div><div class='del'>-temp1_type	always 4 (thermistor)</div><div class='del'>-		RO</div><div class='add'>+=============== == =============================================================</div><div class='add'>+name		   the mandatory global attribute, the thermistor name.</div><div class='add'>+=============== == =============================================================</div><div class='add'>+temp1_type	RO always 4 (thermistor)</div><div class='ctx'> </div><div class='del'>-temp1_input	measure the temperature and provide the measured value.</div><div class='del'>-		(reading this file initiates the reading procedure.)</div><div class='del'>-		RO</div><div class='add'>+temp1_input	RO measure the temperature and provide the measured value.</div><div class='add'>+		   (reading this file initiates the reading procedure.)</div><div class='add'>+=============== == =============================================================</div><div class='ctx'> </div><div class='ctx'> Note that each NTC thermistor has only _one_ thermistor; thus, only temp1 exists.</div><div class='head'>diff --git a/Documentation/hwmon/occ b/Documentation/hwmon/occ.rst<br/>index e787596e03fe..bf41c162d70e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/occ?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/occ</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/occ.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/occ.rst</a></div><div class='hunk'>@@ -2,6 +2,7 @@ Kernel driver occ-hwmon</div><div class='ctx'> =======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * POWER8</div><div class='ctx'>   * POWER9</div><div class='ctx'> </div><div class='hunk'>@@ -37,53 +38,87 @@ Some entries are only present with certain OCC sensor versions or only on</div><div class='ctx'> certain OCCs in the system. The version number is not exported to the user</div><div class='ctx'> but can be inferred.</div><div class='ctx'> </div><div class='del'>-temp[1-n]_label		OCC sensor ID.</div><div class='add'>+temp[1-n]_label</div><div class='add'>+	OCC sensor ID.</div><div class='add'>+</div><div class='ctx'> [with temperature sensor version 1]</div><div class='del'>-    temp[1-n]_input	Measured temperature of the component in millidegrees</div><div class='add'>+</div><div class='add'>+    temp[1-n]_input</div><div class='add'>+			Measured temperature of the component in millidegrees</div><div class='ctx'> 			Celsius.</div><div class='add'>+</div><div class='ctx'> [with temperature sensor version &gt;= 2]</div><div class='del'>-    temp[1-n]_type		The FRU (Field Replaceable Unit) type</div><div class='add'>+</div><div class='add'>+    temp[1-n]_type</div><div class='add'>+				The FRU (Field Replaceable Unit) type</div><div class='ctx'> 				(represented by an integer) for the component</div><div class='ctx'> 				that this sensor measures.</div><div class='del'>-    temp[1-n]_fault		Temperature sensor fault boolean; 1 to indicate</div><div class='add'>+    temp[1-n]_fault</div><div class='add'>+				Temperature sensor fault boolean; 1 to indicate</div><div class='ctx'> 				that a fault is present or 0 to indicate that</div><div class='ctx'> 				no fault is present.</div><div class='add'>+</div><div class='ctx'>     [with type == 3 (FRU type is VRM)]</div><div class='del'>-        temp[1-n]_alarm		VRM temperature alarm boolean; 1 to indicate</div><div class='add'>+</div><div class='add'>+	temp[1-n]_alarm</div><div class='add'>+				VRM temperature alarm boolean; 1 to indicate</div><div class='ctx'> 				alarm, 0 to indicate no alarm</div><div class='add'>+</div><div class='ctx'>     [else]</div><div class='del'>-        temp[1-n]_input		Measured temperature of the component in</div><div class='del'>-				millidegrees Celsius.</div><div class='ctx'> </div><div class='del'>-freq[1-n]_label		OCC sensor ID.</div><div class='del'>-freq[1-n]_input		Measured frequency of the component in MHz.</div><div class='add'>+	temp[1-n]_input</div><div class='add'>+				Measured temperature of the component in</div><div class='add'>+				millidegrees Celsius.</div><div class='ctx'> </div><div class='del'>-power[1-n]_input	Latest measured power reading of the component in</div><div class='add'>+freq[1-n]_label</div><div class='add'>+			OCC sensor ID.</div><div class='add'>+freq[1-n]_input</div><div class='add'>+			Measured frequency of the component in MHz.</div><div class='add'>+power[1-n]_input</div><div class='add'>+			Latest measured power reading of the component in</div><div class='ctx'> 			microwatts.</div><div class='del'>-power[1-n]_average	Average power of the component in microwatts.</div><div class='del'>-power[1-n]_average_interval	The amount of time over which the power average</div><div class='add'>+power[1-n]_average</div><div class='add'>+			Average power of the component in microwatts.</div><div class='add'>+power[1-n]_average_interval</div><div class='add'>+				The amount of time over which the power average</div><div class='ctx'> 				was taken in microseconds.</div><div class='add'>+</div><div class='ctx'> [with power sensor version &lt; 2]</div><div class='del'>-    power[1-n]_label	OCC sensor ID.</div><div class='add'>+</div><div class='add'>+    power[1-n]_label</div><div class='add'>+			OCC sensor ID.</div><div class='add'>+</div><div class='ctx'> [with power sensor version &gt;= 2]</div><div class='del'>-    power[1-n]_label	OCC sensor ID + function ID + channel in the form</div><div class='add'>+</div><div class='add'>+    power[1-n]_label</div><div class='add'>+			OCC sensor ID + function ID + channel in the form</div><div class='ctx'> 			of a string, delimited by underscores, i.e. "0_15_1".</div><div class='ctx'> 			Both the function ID and channel are integers that</div><div class='ctx'> 			further identify the power sensor.</div><div class='add'>+</div><div class='ctx'> [with power sensor version 0xa0]</div><div class='del'>-    power[1-n]_label	OCC sensor ID + sensor type in the form of a string,</div><div class='add'>+</div><div class='add'>+    power[1-n]_label</div><div class='add'>+			OCC sensor ID + sensor type in the form of a string,</div><div class='ctx'> 			delimited by an underscore, i.e. "0_system". Sensor</div><div class='ctx'> 			type will be one of "system", "proc", "vdd" or "vdn".</div><div class='ctx'> 			For this sensor version, OCC sensor ID will be the same</div><div class='ctx'> 			for all power sensors.</div><div class='add'>+</div><div class='ctx'> [present only on "master" OCC; represents the whole system power; only one of</div><div class='del'>- this type of power sensor will be present]</div><div class='del'>-    power[1-n]_label		"system"</div><div class='del'>-    power[1-n]_input		Latest system output power in microwatts.</div><div class='del'>-    power[1-n]_cap		Current system power cap in microwatts.</div><div class='del'>-    power[1-n]_cap_not_redundant	System power cap in microwatts when</div><div class='del'>-					there is not redundant power.</div><div class='del'>-    power[1-n]_cap_max		Maximum power cap that the OCC can enforce in</div><div class='add'>+this type of power sensor will be present]</div><div class='add'>+</div><div class='add'>+    power[1-n]_label</div><div class='add'>+				"system"</div><div class='add'>+    power[1-n]_input</div><div class='add'>+				Latest system output power in microwatts.</div><div class='add'>+    power[1-n]_cap</div><div class='add'>+				Current system power cap in microwatts.</div><div class='add'>+    power[1-n]_cap_not_redundant</div><div class='add'>+				System power cap in microwatts when</div><div class='add'>+				there is not redundant power.</div><div class='add'>+    power[1-n]_cap_max</div><div class='add'>+				Maximum power cap that the OCC can enforce in</div><div class='ctx'> 				microwatts.</div><div class='ctx'>     power[1-n]_cap_min		Minimum power cap that the OCC can enforce in</div><div class='ctx'> 				microwatts.</div><div class='hunk'>@@ -94,8 +129,11 @@ power[1-n]_average_interval	The amount of time over which the power average</div><div class='ctx'> 				ignored, i.e. requesting a power cap of</div><div class='ctx'> 				500900000 microwatts will result in a power cap</div><div class='ctx'> 				request of 500 watts.</div><div class='add'>+</div><div class='ctx'>     [with caps sensor version &gt; 1]</div><div class='del'>-        power[1-n]_cap_user_source	Indicates how the user power cap was</div><div class='add'>+</div><div class='add'>+	power[1-n]_cap_user_source</div><div class='add'>+					Indicates how the user power cap was</div><div class='ctx'> 					set. This is an integer that maps to</div><div class='ctx'> 					system or firmware components that can</div><div class='ctx'> 					set the user power cap.</div><div class='hunk'>@@ -104,9 +142,12 @@ The following "extn" sensors are exported as a way for the OCC to provide data</div><div class='ctx'> that doesn't fit anywhere else. The meaning of these sensors is entirely</div><div class='ctx'> dependent on their data, and cannot be statically defined.</div><div class='ctx'> </div><div class='del'>-extn[1-n]_label		ASCII ID or OCC sensor ID.</div><div class='del'>-extn[1-n]_flags		This is one byte hexadecimal value. Bit 7 indicates the</div><div class='add'>+extn[1-n]_label</div><div class='add'>+			ASCII ID or OCC sensor ID.</div><div class='add'>+extn[1-n]_flags</div><div class='add'>+			This is one byte hexadecimal value. Bit 7 indicates the</div><div class='ctx'> 			type of the label attribute; 1 for sensor ID, 0 for</div><div class='ctx'> 			ASCII ID. Other bits are reserved.</div><div class='del'>-extn[1-n]_input		6 bytes of hexadecimal data, with a meaning defined by</div><div class='add'>+extn[1-n]_input</div><div class='add'>+			6 bytes of hexadecimal data, with a meaning defined by</div><div class='ctx'> 			the sensor ID.</div><div class='head'>diff --git a/Documentation/hwmon/pc87360 b/Documentation/hwmon/pc87360.rst<br/>index d5f5cf16ce59..4bad07bce54b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pc87360?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pc87360</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pc87360.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/pc87360.rst</a></div><div class='hunk'>@@ -2,14 +2,19 @@ Kernel driver pc87360</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor PC87360, PC87363, PC87364, PC87365 and PC87366</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'pc87360', 'pc87363', 'pc87364', 'pc87365', 'pc87366'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheets: No longer available</div><div class='ctx'> </div><div class='ctx'> Authors: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Thanks to Sandeep Mehta, Tonko de Rooy and Daniel Ceregatti for testing.</div><div class='add'>+</div><div class='ctx'> Thanks to Rudolf Marek for helping me investigate conversion issues.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -17,11 +22,13 @@ Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * init int</div><div class='del'>-  Chip initialization level:</div><div class='del'>-   0: None</div><div class='del'>-  *1: Forcibly enable internal voltage and temperature channels, except in9</div><div class='del'>-   2: Forcibly enable all voltage and temperature channels, except in9</div><div class='del'>-   3: Forcibly enable all voltage and temperature channels, including in9</div><div class='add'>+    Chip initialization level:</div><div class='add'>+</div><div class='add'>+    - 0: None</div><div class='add'>+    - **1**: Forcibly enable internal voltage and temperature channels,</div><div class='add'>+      except in9</div><div class='add'>+    - 2: Forcibly enable all voltage and temperature channels, except in9</div><div class='add'>+    - 3: Forcibly enable all voltage and temperature channels, including in9</div><div class='ctx'> </div><div class='ctx'> Note that this parameter has no effect for the PC87360, PC87363 and PC87364</div><div class='ctx'> chips.</div><div class='hunk'>@@ -43,13 +50,15 @@ hardware monitoring chipsets, not only controlling and monitoring three fans,</div><div class='ctx'> but also monitoring eleven voltage inputs and two (PC87365) or up to four</div><div class='ctx'> (PC87366) temperatures.</div><div class='ctx'> </div><div class='add'>+  =========== ======= ======= ======= ======= =====</div><div class='ctx'>   Chip        #vin    #fan    #pwm    #temp   devid</div><div class='del'>-</div><div class='add'>+  =========== ======= ======= ======= ======= =====</div><div class='ctx'>   PC87360     -       2       2       -       0xE1</div><div class='ctx'>   PC87363     -       2       2       -       0xE8</div><div class='ctx'>   PC87364     -       3       3       -       0xE4</div><div class='ctx'>   PC87365     11      3       3       2       0xE5</div><div class='ctx'>   PC87366     11      3       3       3-4     0xE9</div><div class='add'>+  =========== ======= ======= ======= ======= =====</div><div class='ctx'> </div><div class='ctx'> The driver assumes that no more than one chip is present, and one of the</div><div class='ctx'> standard Super I/O addresses is used (0x2E/0x2F or 0x4E/0x4F)</div><div class='hunk'>@@ -68,18 +77,23 @@ have to care no more.</div><div class='ctx'> </div><div class='ctx'> For reference, here are a few values about clock dividers:</div><div class='ctx'> </div><div class='del'>-                slowest         accuracy        highest</div><div class='del'>-                measurable      around 3000     accurate</div><div class='add'>+    =========== =============== =============== ===========</div><div class='add'>+		slowest         accuracy        highest</div><div class='add'>+		measurable      around 3000     accurate</div><div class='ctx'>     divider     speed (RPM)     RPM (RPM)       speed (RPM)</div><div class='del'>-         1        1882              18           6928</div><div class='del'>-         2         941              37           4898</div><div class='del'>-         4         470              74           3464</div><div class='del'>-         8         235             150           2449</div><div class='add'>+    =========== =============== =============== ===========</div><div class='add'>+	 1        1882              18           6928</div><div class='add'>+	 2         941              37           4898</div><div class='add'>+	 4         470              74           3464</div><div class='add'>+	 8         235             150           2449</div><div class='add'>+    =========== =============== =============== ===========</div><div class='ctx'> </div><div class='ctx'> For the curious, here is how the values above were computed:</div><div class='add'>+</div><div class='ctx'>  * slowest measurable speed: clock/(255*divider)</div><div class='ctx'>  * accuracy around 3000 RPM: 3000^2/clock</div><div class='ctx'>  * highest accurate speed: sqrt(clock*100)</div><div class='add'>+</div><div class='ctx'> The clock speed for the PC87360 family is 480 kHz. I arbitrarily chose 100</div><div class='ctx'> RPM as the lowest acceptable accuracy.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427.rst<br/>index c313eb66e08a..22d8f62d851f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pc87427?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pc87427</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pc87427.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/pc87427.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver pc87427</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * National Semiconductor PC87427</div><div class='add'>+</div><div class='ctx'>     Prefix: 'pc87427'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: No longer available</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='head'>diff --git a/Documentation/hwmon/pcf8591 b/Documentation/hwmon/pcf8591.rst<br/>index 447c0702c0ec..e98bd542a441 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pcf8591?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pcf8591</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pcf8591.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/pcf8591.rst</a></div><div class='hunk'>@@ -2,16 +2,21 @@ Kernel driver pcf8591</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Philips/NXP PCF8591</div><div class='add'>+</div><div class='ctx'>     Prefix: 'pcf8591'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the NXP website</div><div class='del'>-               http://www.nxp.com/pip/PCF8591_6.html</div><div class='add'>+</div><div class='add'>+	       http://www.nxp.com/pip/PCF8591_6.html</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Aurelien Jarno &lt;aurelien@aurel32.net&gt;</div><div class='del'>-        valuable contributions by Jan M. Sendler &lt;sendler@sendler.de&gt;,</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+      - Aurelien Jarno &lt;aurelien@aurel32.net&gt;</div><div class='add'>+      - valuable contributions by Jan M. Sendler &lt;sendler@sendler.de&gt;,</div><div class='add'>+      - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -22,24 +27,25 @@ analog output) for the I2C bus produced by Philips Semiconductors (now NXP).</div><div class='ctx'> It is designed to provide a byte I2C interface to up to 4 separate devices.</div><div class='ctx'> </div><div class='ctx'> The PCF8591 has 4 analog inputs programmable as single-ended or</div><div class='del'>-differential inputs :</div><div class='add'>+differential inputs:</div><div class='add'>+</div><div class='ctx'> - mode 0 : four single ended inputs</div><div class='del'>-        Pins AIN0 to AIN3 are single ended inputs for channels 0 to 3</div><div class='add'>+	Pins AIN0 to AIN3 are single ended inputs for channels 0 to 3</div><div class='ctx'> </div><div class='ctx'> - mode 1 : three differential inputs</div><div class='del'>-        Pins AIN3 is the common negative differential input</div><div class='del'>-        Pins AIN0 to AIN2 are positive differential inputs for channels 0 to 2</div><div class='add'>+	Pins AIN3 is the common negative differential input</div><div class='add'>+	Pins AIN0 to AIN2 are positive differential inputs for channels 0 to 2</div><div class='ctx'> </div><div class='ctx'> - mode 2 : single ended and differential mixed</div><div class='del'>-        Pins AIN0 and AIN1 are single ended inputs for channels 0 and 1</div><div class='del'>-        Pins AIN2 is the positive differential input for channel 3</div><div class='del'>-        Pins AIN3 is the negative differential input for channel 3</div><div class='add'>+	Pins AIN0 and AIN1 are single ended inputs for channels 0 and 1</div><div class='add'>+	Pins AIN2 is the positive differential input for channel 3</div><div class='add'>+	Pins AIN3 is the negative differential input for channel 3</div><div class='ctx'> </div><div class='ctx'> - mode 3 : two differential inputs</div><div class='del'>-        Pins AIN0 is the positive differential input for channel 0</div><div class='del'>-        Pins AIN1 is the negative differential input for channel 0</div><div class='del'>-        Pins AIN2 is the positive differential input for channel 1</div><div class='del'>-        Pins AIN3 is the negative differential input for channel 1</div><div class='add'>+	Pins AIN0 is the positive differential input for channel 0</div><div class='add'>+	Pins AIN1 is the negative differential input for channel 0</div><div class='add'>+	Pins AIN2 is the positive differential input for channel 1</div><div class='add'>+	Pins AIN3 is the negative differential input for channel 1</div><div class='ctx'> </div><div class='ctx'> See the datasheet for details.</div><div class='ctx'> </div><div class='hunk'>@@ -49,10 +55,11 @@ Module parameters</div><div class='ctx'> * input_mode int</div><div class='ctx'> </div><div class='ctx'>     Analog input mode:</div><div class='del'>-         0 = four single ended inputs</div><div class='del'>-         1 = three differential inputs</div><div class='del'>-         2 = single ended and differential mixed</div><div class='del'>-         3 = two differential inputs</div><div class='add'>+</div><div class='add'>+	 - 0 = four single ended inputs</div><div class='add'>+	 - 1 = three differential inputs</div><div class='add'>+	 - 2 = single ended and differential mixed</div><div class='add'>+	 - 3 = two differential inputs</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Accessing PCF8591 via /sys interface</div><div class='hunk'>@@ -67,11 +74,12 @@ for details.</div><div class='ctx'> Directories are being created for each instantiated PCF8591:</div><div class='ctx'> </div><div class='ctx'> /sys/bus/i2c/devices/&lt;0&gt;-&lt;1&gt;/</div><div class='del'>-where &lt;0&gt; is the bus the chip is connected to (e. g. i2c-0)</div><div class='del'>-and &lt;1&gt; the chip address ([48..4f])</div><div class='add'>+   where &lt;0&gt; is the bus the chip is connected to (e. g. i2c-0)</div><div class='add'>+   and &lt;1&gt; the chip address ([48..4f])</div><div class='ctx'> </div><div class='ctx'> Inside these directories, there are such files:</div><div class='del'>-in0_input, in1_input, in2_input, in3_input, out0_enable, out0_output, name</div><div class='add'>+</div><div class='add'>+   in0_input, in1_input, in2_input, in3_input, out0_enable, out0_output, name</div><div class='ctx'> </div><div class='ctx'> Name contains chip name.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/pmbus-core b/Documentation/hwmon/pmbus-core.rst<br/>index 8ed10e9ddfb5..92515c446fe3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pmbus-core?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pmbus-core</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pmbus-core.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/pmbus-core.rst</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+==================================</div><div class='ctx'> PMBus core driver and internal API</div><div class='ctx'> ==================================</div><div class='ctx'> </div><div class='hunk'>@@ -120,24 +121,24 @@ Specifically, it provides the following information.</div><div class='ctx'>   non-standard PMBus commands to standard commands, or to augment standard</div><div class='ctx'>   command return values with device specific information.</div><div class='ctx'> </div><div class='del'>-  API functions</div><div class='del'>-  -------------</div><div class='add'>+API functions</div><div class='add'>+=============</div><div class='ctx'> </div><div class='del'>-  Functions provided by chip driver</div><div class='del'>-  ---------------------------------</div><div class='add'>+Functions provided by chip driver</div><div class='add'>+---------------------------------</div><div class='ctx'> </div><div class='del'>-  All functions return the command return value (read) or zero (write) if</div><div class='del'>-  successful. A return value of -ENODATA indicates that there is no manufacturer</div><div class='del'>-  specific command, but that a standard PMBus command may exist. Any other</div><div class='del'>-  negative return value indicates that the commands does not exist for this</div><div class='del'>-  chip, and that no attempt should be made to read or write the standard</div><div class='del'>-  command.</div><div class='add'>+All functions return the command return value (read) or zero (write) if</div><div class='add'>+successful. A return value of -ENODATA indicates that there is no manufacturer</div><div class='add'>+specific command, but that a standard PMBus command may exist. Any other</div><div class='add'>+negative return value indicates that the commands does not exist for this</div><div class='add'>+chip, and that no attempt should be made to read or write the standard</div><div class='add'>+command.</div><div class='ctx'> </div><div class='del'>-  As mentioned above, an exception to this rule applies to virtual commands,</div><div class='del'>-  which  _must_ be handled in driver specific code. See "Virtual PMBus Commands"</div><div class='del'>-  above for more details.</div><div class='add'>+As mentioned above, an exception to this rule applies to virtual commands,</div><div class='add'>+which *must* be handled in driver specific code. See "Virtual PMBus Commands"</div><div class='add'>+above for more details.</div><div class='ctx'> </div><div class='del'>-  Command execution in the core PMBus driver code is as follows.</div><div class='add'>+Command execution in the core PMBus driver code is as follows::</div><div class='ctx'> </div><div class='ctx'> 	if (chip_access_function) {</div><div class='ctx'> 		status = chip_access_function();</div><div class='hunk'>@@ -148,128 +149,160 @@ Specifically, it provides the following information.</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return generic_access();</div><div class='ctx'> </div><div class='del'>-  Chip drivers may provide pointers to the following functions in struct</div><div class='del'>-  pmbus_driver_info. All functions are optional.</div><div class='add'>+Chip drivers may provide pointers to the following functions in struct</div><div class='add'>+pmbus_driver_info. All functions are optional.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int (*read_byte_data)(struct i2c_client *client, int page, int reg);</div><div class='ctx'> </div><div class='del'>-  Read byte from page &lt;page&gt;, register &lt;reg&gt;.</div><div class='del'>-  &lt;page&gt; may be -1, which means "current page".</div><div class='add'>+Read byte from page &lt;page&gt;, register &lt;reg&gt;.</div><div class='add'>+&lt;page&gt; may be -1, which means "current page".</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int (*read_word_data)(struct i2c_client *client, int page, int reg);</div><div class='ctx'> </div><div class='del'>-  Read word from page &lt;page&gt;, register &lt;reg&gt;.</div><div class='add'>+Read word from page &lt;page&gt;, register &lt;reg&gt;.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int (*write_word_data)(struct i2c_client *client, int page, int reg,</div><div class='del'>-		         u16 word);</div><div class='add'>+			 u16 word);</div><div class='ctx'> </div><div class='del'>-  Write word to page &lt;page&gt;, register &lt;reg&gt;.</div><div class='add'>+Write word to page &lt;page&gt;, register &lt;reg&gt;.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int (*write_byte)(struct i2c_client *client, int page, u8 value);</div><div class='ctx'> </div><div class='del'>-  Write byte to page &lt;page&gt;, register &lt;reg&gt;.</div><div class='del'>-  &lt;page&gt; may be -1, which means "current page".</div><div class='add'>+Write byte to page &lt;page&gt;, register &lt;reg&gt;.</div><div class='add'>+&lt;page&gt; may be -1, which means "current page".</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int (*identify)(struct i2c_client *client, struct pmbus_driver_info *info);</div><div class='ctx'> </div><div class='del'>-  Determine supported PMBus functionality. This function is only necessary</div><div class='del'>-  if a chip driver supports multiple chips, and the chip functionality is not</div><div class='del'>-  pre-determined. It is currently only used by the generic pmbus driver</div><div class='del'>-  (pmbus.c).</div><div class='add'>+Determine supported PMBus functionality. This function is only necessary</div><div class='add'>+if a chip driver supports multiple chips, and the chip functionality is not</div><div class='add'>+pre-determined. It is currently only used by the generic pmbus driver</div><div class='add'>+(pmbus.c).</div><div class='add'>+</div><div class='add'>+Functions exported by core driver</div><div class='add'>+---------------------------------</div><div class='ctx'> </div><div class='del'>-  Functions exported by core driver</div><div class='del'>-  ---------------------------------</div><div class='add'>+Chip drivers are expected to use the following functions to read or write</div><div class='add'>+PMBus registers. Chip drivers may also use direct I2C commands. If direct I2C</div><div class='add'>+commands are used, the chip driver code must not directly modify the current</div><div class='add'>+page, since the selected page is cached in the core driver and the core driver</div><div class='add'>+will assume that it is selected. Using pmbus_set_page() to select a new page</div><div class='add'>+is mandatory.</div><div class='ctx'> </div><div class='del'>-  Chip drivers are expected to use the following functions to read or write</div><div class='del'>-  PMBus registers. Chip drivers may also use direct I2C commands. If direct I2C</div><div class='del'>-  commands are used, the chip driver code must not directly modify the current</div><div class='del'>-  page, since the selected page is cached in the core driver and the core driver</div><div class='del'>-  will assume that it is selected. Using pmbus_set_page() to select a new page</div><div class='del'>-  is mandatory.</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int pmbus_set_page(struct i2c_client *client, u8 page);</div><div class='ctx'> </div><div class='del'>-  Set PMBus page register to &lt;page&gt; for subsequent commands.</div><div class='add'>+Set PMBus page register to &lt;page&gt; for subsequent commands.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 reg);</div><div class='ctx'> </div><div class='del'>-  Read word data from &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_read_word_data(), but</div><div class='del'>-  selects page first.</div><div class='add'>+Read word data from &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_read_word_data(), but</div><div class='add'>+selects page first.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int pmbus_write_word_data(struct i2c_client *client, u8 page, u8 reg,</div><div class='ctx'> 			    u16 word);</div><div class='ctx'> </div><div class='del'>-  Write word data to &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_write_word_data(), but</div><div class='del'>-  selects page first.</div><div class='add'>+Write word data to &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_write_word_data(), but</div><div class='add'>+selects page first.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int pmbus_read_byte_data(struct i2c_client *client, int page, u8 reg);</div><div class='ctx'> </div><div class='del'>-  Read byte data from &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_read_byte_data(), but</div><div class='del'>-  selects page first. &lt;page&gt; may be -1, which means "current page".</div><div class='add'>+Read byte data from &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_read_byte_data(), but</div><div class='add'>+selects page first. &lt;page&gt; may be -1, which means "current page".</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int pmbus_write_byte(struct i2c_client *client, int page, u8 value);</div><div class='ctx'> </div><div class='del'>-  Write byte data to &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_write_byte(), but</div><div class='del'>-  selects page first. &lt;page&gt; may be -1, which means "current page".</div><div class='add'>+Write byte data to &lt;page&gt;, &lt;reg&gt;. Similar to i2c_smbus_write_byte(), but</div><div class='add'>+selects page first. &lt;page&gt; may be -1, which means "current page".</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   void pmbus_clear_faults(struct i2c_client *client);</div><div class='ctx'> </div><div class='del'>-  Execute PMBus "Clear Fault" command on all chip pages.</div><div class='del'>-  This function calls the device specific write_byte function if defined.</div><div class='del'>-  Therefore, it must _not_ be called from that function.</div><div class='add'>+Execute PMBus "Clear Fault" command on all chip pages.</div><div class='add'>+This function calls the device specific write_byte function if defined.</div><div class='add'>+Therefore, it must _not_ be called from that function.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg);</div><div class='ctx'> </div><div class='del'>-  Check if byte register exists. Return true if the register exists, false</div><div class='del'>-  otherwise.</div><div class='del'>-  This function calls the device specific write_byte function if defined to</div><div class='del'>-  obtain the chip status. Therefore, it must _not_ be called from that function.</div><div class='add'>+Check if byte register exists. Return true if the register exists, false</div><div class='add'>+otherwise.</div><div class='add'>+This function calls the device specific write_byte function if defined to</div><div class='add'>+obtain the chip status. Therefore, it must _not_ be called from that function.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   bool pmbus_check_word_register(struct i2c_client *client, int page, int reg);</div><div class='ctx'> </div><div class='del'>-  Check if word register exists. Return true if the register exists, false</div><div class='del'>-  otherwise.</div><div class='del'>-  This function calls the device specific write_byte function if defined to</div><div class='del'>-  obtain the chip status. Therefore, it must _not_ be called from that function.</div><div class='add'>+Check if word register exists. Return true if the register exists, false</div><div class='add'>+otherwise.</div><div class='add'>+This function calls the device specific write_byte function if defined to</div><div class='add'>+obtain the chip status. Therefore, it must _not_ be called from that function.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,</div><div class='del'>-                     struct pmbus_driver_info *info);</div><div class='add'>+		     struct pmbus_driver_info *info);</div><div class='add'>+</div><div class='add'>+Execute probe function. Similar to standard probe function for other drivers,</div><div class='add'>+with the pointer to struct pmbus_driver_info as additional argument. Calls</div><div class='add'>+identify function if supported. Must only be called from device probe</div><div class='add'>+function.</div><div class='ctx'> </div><div class='del'>-  Execute probe function. Similar to standard probe function for other drivers,</div><div class='del'>-  with the pointer to struct pmbus_driver_info as additional argument. Calls</div><div class='del'>-  identify function if supported. Must only be called from device probe</div><div class='del'>-  function.</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   void pmbus_do_remove(struct i2c_client *client);</div><div class='ctx'> </div><div class='del'>-  Execute driver remove function. Similar to standard driver remove function.</div><div class='add'>+Execute driver remove function. Similar to standard driver remove function.</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>   const struct pmbus_driver_info</div><div class='ctx'> 	*pmbus_get_driver_info(struct i2c_client *client);</div><div class='ctx'> </div><div class='del'>-  Return pointer to struct pmbus_driver_info as passed to pmbus_do_probe().</div><div class='add'>+Return pointer to struct pmbus_driver_info as passed to pmbus_do_probe().</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> PMBus driver platform data</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='ctx'> PMBus platform data is defined in include/linux/pmbus.h. Platform data</div><div class='del'>-currently only provides a flag field with a single bit used.</div><div class='add'>+currently only provides a flag field with a single bit used::</div><div class='ctx'> </div><div class='del'>-#define PMBUS_SKIP_STATUS_CHECK (1 &lt;&lt; 0)</div><div class='add'>+	#define PMBUS_SKIP_STATUS_CHECK (1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-struct pmbus_platform_data {</div><div class='del'>-        u32 flags;              /* Device specific flags */</div><div class='del'>-};</div><div class='add'>+	struct pmbus_platform_data {</div><div class='add'>+		u32 flags;              /* Device specific flags */</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Flags</div><div class='ctx'> -----</div><div class='ctx'> </div><div class='ctx'> PMBUS_SKIP_STATUS_CHECK</div><div class='del'>-</div><div class='del'>-During register detection, skip checking the status register for</div><div class='del'>-communication or command errors.</div><div class='add'>+	During register detection, skip checking the status register for</div><div class='add'>+	communication or command errors.</div><div class='ctx'> </div><div class='ctx'> Some PMBus chips respond with valid data when trying to read an unsupported</div><div class='ctx'> register. For such chips, checking the status register is mandatory when</div><div class='head'>diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus.rst<br/>index dfd9c65996c0..abfb9dd4857d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pmbus?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pmbus</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pmbus.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/pmbus.rst</a></div><div class='hunk'>@@ -1,42 +1,77 @@</div><div class='ctx'> Kernel driver pmbus</div><div class='del'>-====================</div><div class='add'>+===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Ericsson BMR453, BMR454</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'bmr453', 'bmr454'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'>  http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146395</div><div class='add'>+</div><div class='ctx'>   * ON Semiconductor ADP4000, NCP4200, NCP4208</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'adp4000', 'ncp4200', 'ncp4208'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.onsemi.com/pub_link/Collateral/ADP4000-D.PDF</div><div class='add'>+</div><div class='ctx'> 	http://www.onsemi.com/pub_link/Collateral/NCP4200-D.PDF</div><div class='add'>+</div><div class='ctx'> 	http://www.onsemi.com/pub_link/Collateral/JUNE%202009-%20REV.%200.PDF</div><div class='add'>+</div><div class='ctx'>   * Lineage Power</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'mdt040', 'pdt003', 'pdt006', 'pdt012', 'udt020'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.lineagepower.com/oem/pdf/PDT003A0X.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.lineagepower.com/oem/pdf/PDT006A0X.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.lineagepower.com/oem/pdf/PDT012A0X.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.lineagepower.com/oem/pdf/UDT020A0X.pdf</div><div class='add'>+</div><div class='ctx'> 	http://www.lineagepower.com/oem/pdf/MDT040A0X.pdf</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TPS40400, TPS544B20, TPS544B25, TPS544C20, TPS544C25</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'tps40400', 'tps544b20', 'tps544b25', 'tps544c20', 'tps544c25'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/tps40400</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/tps544b20</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/tps544b25</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/tps544c20</div><div class='add'>+</div><div class='ctx'> 	http://www.ti.com/lit/gpn/tps544c25</div><div class='add'>+</div><div class='ctx'>   * Generic PMBus devices</div><div class='add'>+</div><div class='ctx'>     Prefix: 'pmbus'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: n.a.</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -62,9 +97,10 @@ supported by all chips), and since there is no well defined address range for</div><div class='ctx'> PMBus devices. You will have to instantiate the devices explicitly.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an LTC2978 at address 0x60</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe pmbus</div><div class='del'>-$ echo ltc2978 0x60 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe pmbus</div><div class='add'>+	$ echo ltc2978 0x60 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Platform data support</div><div class='hunk'>@@ -72,9 +108,9 @@ Platform data support</div><div class='ctx'> </div><div class='ctx'> Support for additional PMBus chips can be added by defining chip parameters in</div><div class='ctx'> a new chip specific driver file. For example, (untested) code to add support for</div><div class='del'>-Emerson DS1200 power modules might look as follows.</div><div class='add'>+Emerson DS1200 power modules might look as follows::</div><div class='ctx'> </div><div class='del'>-static struct pmbus_driver_info ds1200_info = {</div><div class='add'>+  static struct pmbus_driver_info ds1200_info = {</div><div class='ctx'> 	.pages = 1,</div><div class='ctx'> 	/* Note: All other sensors are in linear mode */</div><div class='ctx'> 	.direct[PSC_VOLTAGE_OUT] = true,</div><div class='hunk'>@@ -95,45 +131,45 @@ static struct pmbus_driver_info ds1200_info = {</div><div class='ctx'> 		   | PMBUS_HAVE_PIN | PMBUS_HAVE_POUT</div><div class='ctx'> 		   | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP</div><div class='ctx'> 		   | PMBUS_HAVE_FAN12 | PMBUS_HAVE_STATUS_FAN12,</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-static int ds1200_probe(struct i2c_client *client,</div><div class='del'>-			const struct i2c_device_id *id)</div><div class='del'>-{</div><div class='add'>+  static int ds1200_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id)</div><div class='add'>+  {</div><div class='ctx'> 	return pmbus_do_probe(client, id, &amp;ds1200_info);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-static int ds1200_remove(struct i2c_client *client)</div><div class='del'>-{</div><div class='add'>+  static int ds1200_remove(struct i2c_client *client)</div><div class='add'>+  {</div><div class='ctx'> 	return pmbus_do_remove(client);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-static const struct i2c_device_id ds1200_id[] = {</div><div class='add'>+  static const struct i2c_device_id ds1200_id[] = {</div><div class='ctx'> 	{"ds1200", 0},</div><div class='ctx'> 	{}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(i2c, ds1200_id);</div><div class='add'>+  MODULE_DEVICE_TABLE(i2c, ds1200_id);</div><div class='ctx'> </div><div class='del'>-/* This is the driver that will be inserted */</div><div class='del'>-static struct i2c_driver ds1200_driver = {</div><div class='add'>+  /* This is the driver that will be inserted */</div><div class='add'>+  static struct i2c_driver ds1200_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		   .name = "ds1200",</div><div class='ctx'> 		   },</div><div class='ctx'> 	.probe = ds1200_probe,</div><div class='ctx'> 	.remove = ds1200_remove,</div><div class='ctx'> 	.id_table = ds1200_id,</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-static int __init ds1200_init(void)</div><div class='del'>-{</div><div class='add'>+  static int __init ds1200_init(void)</div><div class='add'>+  {</div><div class='ctx'> 	return i2c_add_driver(&amp;ds1200_driver);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-static void __exit ds1200_exit(void)</div><div class='del'>-{</div><div class='add'>+  static void __exit ds1200_exit(void)</div><div class='add'>+  {</div><div class='ctx'> 	i2c_del_driver(&amp;ds1200_driver);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -148,6 +184,7 @@ a given sysfs entry.</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> inX_input		Measured voltage. From READ_VIN or READ_VOUT register.</div><div class='ctx'> inX_min			Minimum Voltage.</div><div class='ctx'> 			From VIN_UV_WARN_LIMIT or VOUT_UV_WARN_LIMIT register.</div><div class='hunk'>@@ -214,3 +251,4 @@ tempX_lcrit_alarm	Chip temperature critical low alarm. Set by comparing</div><div class='ctx'> tempX_crit_alarm	Chip temperature critical high alarm. Set by comparing</div><div class='ctx'> 			READ_TEMPERATURE_X with OT_FAULT_LIMIT if</div><div class='ctx'> 			TEMP_OT_FAULT status is set.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/powr1220 b/Documentation/hwmon/powr1220.rst<br/>index 21e44f71ae6e..a7fc258da0a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/powr1220?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/powr1220</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/powr1220.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/powr1220.rst</a></div><div class='hunk'>@@ -1,12 +1,17 @@</div><div class='ctx'> Kernel driver powr1220</div><div class='del'>-==================</div><div class='add'>+======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Lattice POWR1220AT8</div><div class='add'>+</div><div class='ctx'>     Prefix: 'powr1220'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Lattice website</div><div class='del'>-               http://www.latticesemi.com/</div><div class='add'>+</div><div class='add'>+	       http://www.latticesemi.com/</div><div class='ctx'> </div><div class='ctx'> Author: Scott Kanowitz &lt;scott.kanowitz@gmail.com&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -26,7 +31,9 @@ value over the low measurement range maximum of 2 V.</div><div class='ctx'> </div><div class='ctx'> The input naming convention is as follows:</div><div class='ctx'> </div><div class='add'>+============== ========</div><div class='ctx'> driver name    pin name</div><div class='add'>+============== ========</div><div class='ctx'> in0            VMON1</div><div class='ctx'> in1            VMON2</div><div class='ctx'> in2            VMON3</div><div class='hunk'>@@ -41,5 +48,6 @@ in10           VMON11</div><div class='ctx'> in11           VMON12</div><div class='ctx'> in12           VCCA</div><div class='ctx'> in13           VCCINP</div><div class='add'>+============== ========</div><div class='ctx'> </div><div class='ctx'> The ADC readings are updated on request with a minimum period of 1s.</div><div class='head'>diff --git a/Documentation/hwmon/pwm-fan b/Documentation/hwmon/pwm-fan.rst<br/>index 18529d2e3bcf..82fe96742fee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pwm-fan?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/pwm-fan</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/pwm-fan.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/pwm-fan.rst</a></div><div class='hunk'>@@ -15,3 +15,6 @@ The driver implements a simple interface for driving a fan connected to</div><div class='ctx'> a PWM output. It uses the generic PWM interface, thus it can be used with</div><div class='ctx'> a range of SoCs. The driver exposes the fan to the user space through</div><div class='ctx'> the hwmon's sysfs interface.</div><div class='add'>+</div><div class='add'>+The fan rotation speed returned via the optional 'fan1_input' is extrapolated</div><div class='add'>+from the sampled interrupts from the tachometer signal within 1 second.</div><div class='head'>diff --git a/Documentation/hwmon/raspberrypi-hwmon b/Documentation/hwmon/raspberrypi-hwmon.rst<br/>index 3c92e2cb52d6..8038ade36490 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/raspberrypi-hwmon?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/raspberrypi-hwmon</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/raspberrypi-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/raspberrypi-hwmon.rst</a></div><div class='hunk'>@@ -2,6 +2,7 @@ Kernel driver raspberrypi-hwmon</div><div class='ctx'> ===============================</div><div class='ctx'> </div><div class='ctx'> Supported boards:</div><div class='add'>+</div><div class='ctx'>   * Raspberry Pi A+ (via GPIO on SoC)</div><div class='ctx'>   * Raspberry Pi B+ (via GPIO on SoC)</div><div class='ctx'>   * Raspberry Pi 2 B (via GPIO on SoC)</div><div class='hunk'>@@ -19,4 +20,6 @@ undervoltage conditions.</div><div class='ctx'> Sysfs entries</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='add'>+======================= ==================</div><div class='ctx'> in0_lcrit_alarm		Undervoltage alarm</div><div class='add'>+======================= ==================</div><div class='head'>diff --git a/Documentation/hwmon/sch5627 b/Documentation/hwmon/sch5627.rst<br/>index 0551d266c51c..187682e99114 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sch5627?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sch5627</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sch5627.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sch5627.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver sch5627</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH5627</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sch5627'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Application Note available upon request</div><div class='ctx'> </div><div class='ctx'> Author: Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='head'>diff --git a/Documentation/hwmon/sch5636 b/Documentation/hwmon/sch5636.rst<br/>index 7b0a01da0717..4aaee3672f13 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sch5636?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sch5636</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sch5636.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sch5636.rst</a></div><div class='hunk'>@@ -2,8 +2,11 @@ Kernel driver sch5636</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH5636</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sch5636'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='ctx'> </div><div class='ctx'> Author: Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='head'>diff --git a/Documentation/hwmon/scpi-hwmon b/Documentation/hwmon/scpi-hwmon.rst<br/>index 4cfcdf2d5eab..eee7022b44db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/scpi-hwmon?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/scpi-hwmon</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/scpi-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/scpi-hwmon.rst</a></div><div class='hunk'>@@ -2,8 +2,11 @@ Kernel driver scpi-hwmon</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>  * Chips based on ARM System Control Processor Interface</div><div class='add'>+</div><div class='ctx'>    Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>    Datasheet: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0922b/index.html</div><div class='ctx'> </div><div class='ctx'> Author: Punit Agrawal &lt;punit.agrawal@arm.com&gt;</div><div class='hunk'>@@ -14,7 +17,7 @@ Description</div><div class='ctx'> This driver supports hardware monitoring for SoC's based on the ARM</div><div class='ctx'> System Control Processor (SCP) implementing the System Control</div><div class='ctx'> Processor Interface (SCPI). The following sensor types are supported</div><div class='del'>-by the SCP -</div><div class='add'>+by the SCP:</div><div class='ctx'> </div><div class='ctx'>   * temperature</div><div class='ctx'>   * voltage</div><div class='hunk'>@@ -30,4 +33,4 @@ Usage Notes</div><div class='ctx'> The driver relies on device tree node to indicate the presence of SCPI</div><div class='ctx'> support in the kernel. See</div><div class='ctx'> Documentation/devicetree/bindings/arm/arm,scpi.txt for details of the</div><div class='del'>-devicetree node.
\ No newline at end of file</div><div class='add'>+devicetree node.</div><div class='head'>diff --git a/Documentation/hwmon/sht15 b/Documentation/hwmon/sht15.rst<br/>index 5e3207c3b177..485abe037f6c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sht15?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sht15</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sht15.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sht15.rst</a></div><div class='hunk'>@@ -2,29 +2,37 @@ Kernel driver sht15</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='add'>+</div><div class='ctx'>   * Wouter Horre</div><div class='ctx'>   * Jonathan Cameron</div><div class='ctx'>   * Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='ctx'>   * Jerome Oufella &lt;jerome.oufella@savoirfairelinux.com&gt;</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Sensirion SHT10</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht10'</div><div class='ctx'> </div><div class='ctx'>   * Sensirion SHT11</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht11'</div><div class='ctx'> </div><div class='ctx'>   * Sensirion SHT15</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht15'</div><div class='ctx'> </div><div class='ctx'>   * Sensirion SHT71</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht71'</div><div class='ctx'> </div><div class='ctx'>   * Sensirion SHT75</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht75'</div><div class='ctx'> </div><div class='ctx'> Datasheet: Publicly available at the Sensirion website</div><div class='del'>-http://www.sensirion.ch/en/pdf/product_information/Datasheet-humidity-sensor-SHT1x.pdf</div><div class='add'>+</div><div class='add'>+	http://www.sensirion.ch/en/pdf/product_information/Datasheet-humidity-sensor-SHT1x.pdf</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -63,11 +71,13 @@ Platform data</div><div class='ctx'> Sysfs interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-* temp1_input:     temperature input</div><div class='del'>-* humidity1_input: humidity input</div><div class='del'>-* heater_enable:   write 1 in this attribute to enable the on-chip heater,</div><div class='del'>-                   0 to disable it. Be careful not to enable the heater</div><div class='del'>-                   for too long.</div><div class='del'>-* temp1_fault:     if 1, this means that the voltage is low (below 2.47V) and</div><div class='del'>-                   measurement may be invalid.</div><div class='del'>-* humidity1_fault: same as temp1_fault.</div><div class='add'>+================== ==========================================================</div><div class='add'>+temp1_input        temperature input</div><div class='add'>+humidity1_input    humidity input</div><div class='add'>+heater_enable      write 1 in this attribute to enable the on-chip heater,</div><div class='add'>+		   0 to disable it. Be careful not to enable the heater</div><div class='add'>+		   for too long.</div><div class='add'>+temp1_fault        if 1, this means that the voltage is low (below 2.47V) and</div><div class='add'>+		   measurement may be invalid.</div><div class='add'>+humidity1_fault    same as temp1_fault.</div><div class='add'>+================== ==========================================================</div><div class='head'>diff --git a/Documentation/hwmon/sht21 b/Documentation/hwmon/sht21.rst<br/>index 8b3cdda541c1..f1f5da030108 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sht21?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sht21</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sht21.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sht21.rst</a></div><div class='hunk'>@@ -2,19 +2,33 @@ Kernel driver sht21</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Sensirion SHT21</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht21'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Sensirion website</div><div class='add'>+</div><div class='ctx'>     http://www.sensirion.com/file/datasheet_sht21</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>   * Sensirion SHT25</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht25'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Sensirion website</div><div class='add'>+</div><div class='ctx'>     http://www.sensirion.com/file/datasheet_sht25</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'>   Urs Fleisch &lt;urs.fleisch@sensirion.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -33,9 +47,13 @@ in the board setup code.</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-temp1_input - temperature input</div><div class='del'>-humidity1_input - humidity input</div><div class='del'>-eic - Electronic Identification Code</div><div class='add'>+temp1_input</div><div class='add'>+	- temperature input</div><div class='add'>+</div><div class='add'>+humidity1_input</div><div class='add'>+	- humidity input</div><div class='add'>+eic</div><div class='add'>+	- Electronic Identification Code</div><div class='ctx'> </div><div class='ctx'> Notes</div><div class='ctx'> -----</div><div class='head'>diff --git a/Documentation/hwmon/sht3x b/Documentation/hwmon/sht3x.rst<br/>index d9daa6ab1e8e..978a7117e4b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sht3x?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sht3x</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sht3x.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sht3x.rst</a></div><div class='hunk'>@@ -2,14 +2,19 @@ Kernel driver sht3x</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Sensirion SHT3x-DIS</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sht3x'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://www.sensirion.com/file/datasheet_sht3x_digital</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='del'>-  David Frey &lt;david.frey@sensirion.com&gt;</div><div class='del'>-  Pascal Sachs &lt;pascal.sachs@sensirion.com&gt;</div><div class='add'>+</div><div class='add'>+  - David Frey &lt;david.frey@sensirion.com&gt;</div><div class='add'>+  - Pascal Sachs &lt;pascal.sachs@sensirion.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -24,6 +29,7 @@ addresses 0x44 or 0x45, depending on the wiring. See</div><div class='ctx'> Documentation/i2c/instantiating-devices for methods to instantiate the device.</div><div class='ctx'> </div><div class='ctx'> There are two options configurable by means of sht3x_platform_data:</div><div class='add'>+</div><div class='ctx'> 1. blocking (pull the I2C clock line down while performing the measurement) or</div><div class='ctx'>    non-blocking mode. Blocking mode will guarantee the fastest result but</div><div class='ctx'>    the I2C bus will be busy during that time. By default, non-blocking mode</div><div class='hunk'>@@ -35,12 +41,15 @@ There are two options configurable by means of sht3x_platform_data:</div><div class='ctx'> The sht3x sensor supports a single shot mode as well as 5 periodic measure</div><div class='ctx'> modes, which can be controlled with the update_interval sysfs interface.</div><div class='ctx'> The allowed update_interval in milliseconds are as follows:</div><div class='del'>-  *     0   single shot mode</div><div class='del'>-  *  2000   0.5 Hz periodic measurement</div><div class='del'>-  *  1000   1   Hz periodic measurement</div><div class='del'>-  *   500   2   Hz periodic measurement</div><div class='del'>-  *   250   4   Hz periodic measurement</div><div class='del'>-  *   100  10   Hz periodic measurement</div><div class='add'>+</div><div class='add'>+    ===== ======= ====================</div><div class='add'>+       0          single shot mode</div><div class='add'>+    2000   0.5 Hz periodic measurement</div><div class='add'>+    1000   1   Hz periodic measurement</div><div class='add'>+     500   2   Hz periodic measurement</div><div class='add'>+     250   4   Hz periodic measurement</div><div class='add'>+     100  10   Hz periodic measurement</div><div class='add'>+    ===== ======= ====================</div><div class='ctx'> </div><div class='ctx'> In the periodic measure mode, the sensor automatically triggers a measurement</div><div class='ctx'> with the configured update interval on the chip. When a temperature or humidity</div><div class='hunk'>@@ -53,6 +62,7 @@ low.</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='add'>+=================== ============================================================</div><div class='ctx'> temp1_input:        temperature input</div><div class='ctx'> humidity1_input:    humidity input</div><div class='ctx'> temp1_max:          temperature max value</div><div class='hunk'>@@ -64,13 +74,15 @@ temp1_min_hyst:     temperature hysteresis value for min limit</div><div class='ctx'> humidity1_min:      humidity min value</div><div class='ctx'> humidity1_min_hyst: humidity hysteresis value for min limit</div><div class='ctx'> temp1_alarm:        alarm flag is set to 1 if the temperature is outside the</div><div class='del'>-                    configured limits. Alarm only works in periodic measure mode</div><div class='add'>+		    configured limits. Alarm only works in periodic measure mode</div><div class='ctx'> humidity1_alarm:    alarm flag is set to 1 if the humidity is outside the</div><div class='del'>-                    configured limits. Alarm only works in periodic measure mode</div><div class='add'>+		    configured limits. Alarm only works in periodic measure mode</div><div class='ctx'> heater_enable:      heater enable, heating element removes excess humidity from</div><div class='del'>-                    sensor</div><div class='del'>-                        0: turned off</div><div class='del'>-                        1: turned on</div><div class='add'>+		    sensor:</div><div class='add'>+</div><div class='add'>+			- 0: turned off</div><div class='add'>+			- 1: turned on</div><div class='ctx'> update_interval:    update interval, 0 for single shot, interval in msec</div><div class='del'>-                    for periodic measurement. If the interval is not supported</div><div class='del'>-                    by the sensor, the next faster interval is chosen</div><div class='add'>+		    for periodic measurement. If the interval is not supported</div><div class='add'>+		    by the sensor, the next faster interval is chosen</div><div class='add'>+=================== ============================================================</div><div class='head'>diff --git a/Documentation/hwmon/shtc1 b/Documentation/hwmon/shtc1.rst<br/>index 6b1e05458f0f..aa116332ba26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/shtc1?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/shtc1</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/shtc1.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/shtc1.rst</a></div><div class='hunk'>@@ -2,17 +2,29 @@ Kernel driver shtc1</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Sensirion SHTC1</div><div class='add'>+</div><div class='ctx'>     Prefix: 'shtc1'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.sensirion.com/file/datasheet_shtc1</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>   * Sensirion SHTW1</div><div class='add'>+</div><div class='ctx'>     Prefix: 'shtw1'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'>   Johannes Winkelmann &lt;johannes.winkelmann@sensirion.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -28,6 +40,7 @@ address 0x70. See Documentation/i2c/instantiating-devices for methods to</div><div class='ctx'> instantiate the device.</div><div class='ctx'> </div><div class='ctx'> There are two options configurable by means of shtc1_platform_data:</div><div class='add'>+</div><div class='ctx'> 1. blocking (pull the I2C clock line down while performing the measurement) or</div><div class='ctx'>    non-blocking mode. Blocking mode will guarantee the fastest result but</div><div class='ctx'>    the I2C bus will be busy during that time. By default, non-blocking mode</div><div class='hunk'>@@ -39,5 +52,7 @@ There are two options configurable by means of shtc1_platform_data:</div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-temp1_input - temperature input</div><div class='del'>-humidity1_input - humidity input</div><div class='add'>+temp1_input</div><div class='add'>+	- temperature input</div><div class='add'>+humidity1_input</div><div class='add'>+	- humidity input</div><div class='head'>diff --git a/Documentation/hwmon/sis5595 b/Documentation/hwmon/sis5595.rst<br/>index 4f8877a34f37..16123b3bfff9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sis5595?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sis5595</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sis5595.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sis5595.rst</a></div><div class='hunk'>@@ -2,49 +2,67 @@ Kernel driver sis5595</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Silicon Integrated Systems Corp. SiS5595 Southbridge Hardware Monitor</div><div class='add'>+</div><div class='ctx'>     Prefix: 'sis5595'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA in PCI-space encoded address</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Silicon Integrated Systems Corp. site.</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;,</div><div class='del'>-        Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='del'>-        Aurelien Jarno &lt;aurelien@aurel32.net&gt; 2.6 port</div><div class='add'>+</div><div class='add'>+      - Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;,</div><div class='add'>+      - Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='add'>+      - Aurelien Jarno &lt;aurelien@aurel32.net&gt; 2.6 port</div><div class='ctx'> </div><div class='ctx'>    SiS southbridge has a LM78-like chip integrated on the same IC.</div><div class='ctx'>    This driver is a customized copy of lm78.c</div><div class='ctx'> </div><div class='ctx'>    Supports following revisions:</div><div class='add'>+</div><div class='add'>+       =============== =============== ==============</div><div class='ctx'>        Version         PCI ID          PCI Revision</div><div class='add'>+       =============== =============== ==============</div><div class='ctx'>        1               1039/0008       AF or less</div><div class='ctx'>        2               1039/0008       B0 or greater</div><div class='add'>+       =============== =============== ==============</div><div class='ctx'> </div><div class='ctx'>    Note: these chips contain a 0008 device which is incompatible with the</div><div class='del'>-        5595. We recognize these by the presence of the listed</div><div class='del'>-        "blacklist" PCI ID and refuse to load.</div><div class='add'>+	5595. We recognize these by the presence of the listed</div><div class='add'>+	"blacklist" PCI ID and refuse to load.</div><div class='ctx'> </div><div class='add'>+   =================== =============== ================</div><div class='ctx'>    NOT SUPPORTED       PCI ID          BLACKLIST PCI ID</div><div class='del'>-        540            0008            0540</div><div class='del'>-        550            0008            0550</div><div class='add'>+   =================== =============== ================</div><div class='add'>+	540            0008            0540</div><div class='add'>+	550            0008            0550</div><div class='ctx'>        5513            0008            5511</div><div class='ctx'>        5581            0008            5597</div><div class='ctx'>        5582            0008            5597</div><div class='ctx'>        5597            0008            5597</div><div class='del'>-        630            0008            0630</div><div class='del'>-        645            0008            0645</div><div class='del'>-        730            0008            0730</div><div class='del'>-        735            0008            0735</div><div class='add'>+	630            0008            0630</div><div class='add'>+	645            0008            0645</div><div class='add'>+	730            0008            0730</div><div class='add'>+	735            0008            0735</div><div class='add'>+   =================== =============== ================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='add'>+</div><div class='add'>+======================= =====================================================</div><div class='ctx'> force_addr=0xaddr	Set the I/O base address. Useful for boards</div><div class='ctx'> 			that don't set the address in the BIOS. Does not do a</div><div class='ctx'> 			PCI force; the device must still be present in lspci.</div><div class='ctx'> 			Don't use this unless the driver complains that the</div><div class='ctx'> 			base address is not set.</div><div class='add'>+</div><div class='ctx'> 			Example: 'modprobe sis5595 force_addr=0x290'</div><div class='add'>+======================= =====================================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -103,4 +121,3 @@ Problems</div><div class='ctx'> --------</div><div class='ctx'> Some chips refuse to be enabled. We don't know why.</div><div class='ctx'> The driver will recognize this and print a message in dmesg.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/hwmon/smm665 b/Documentation/hwmon/smm665.rst<br/>index a341eeedab75..a0e27f62b57b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smm665?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smm665</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smm665.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/smm665.rst</a></div><div class='hunk'>@@ -2,31 +2,57 @@ Kernel driver smm665</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Summit Microelectronics SMM465</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smm465'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'>       http://www.summitmicro.com/prod_select/summary/SMM465/SMM465DS.pdf</div><div class='add'>+</div><div class='ctx'>   * Summit Microelectronics SMM665, SMM665B</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smm665'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'>       http://www.summitmicro.com/prod_select/summary/SMM665/SMM665B_2089_20.pdf</div><div class='add'>+</div><div class='ctx'>   * Summit Microelectronics SMM665C</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smm665c'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'>       http://www.summitmicro.com/prod_select/summary/SMM665C/SMM665C_2125.pdf</div><div class='add'>+</div><div class='ctx'>   * Summit Microelectronics SMM764</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smm764'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'>       http://www.summitmicro.com/prod_select/summary/SMM764/SMM764_2098.pdf</div><div class='add'>+</div><div class='ctx'>   * Summit Microelectronics SMM766, SMM766B</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smm766'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'>       http://www.summitmicro.com/prod_select/summary/SMM766/SMM766_2086.pdf</div><div class='add'>+</div><div class='ctx'>       http://www.summitmicro.com/prod_select/summary/SMM766B/SMM766B_2122.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -36,9 +62,10 @@ Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * vref: int</div><div class='del'>-  Default: 1250 (mV)</div><div class='del'>-  Reference voltage on VREF_ADC pin in mV. It should not be necessary to set</div><div class='del'>-  this parameter unless a non-default reference voltage is used.</div><div class='add'>+    Default: 1250 (mV)</div><div class='add'>+</div><div class='add'>+    Reference voltage on VREF_ADC pin in mV. It should not be necessary to set</div><div class='add'>+    this parameter unless a non-default reference voltage is used.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -64,9 +91,10 @@ the devices explicitly. When instantiating the device, you have to specify</div><div class='ctx'> its configuration register address.</div><div class='ctx'> </div><div class='ctx'> Example: the following will load the driver for an SMM665 at address 0x57</div><div class='del'>-on I2C bus #1:</div><div class='del'>-$ modprobe smm665</div><div class='del'>-$ echo smm665 0x57 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='add'>+on I2C bus #1::</div><div class='add'>+</div><div class='add'>+	$ modprobe smm665</div><div class='add'>+	$ echo smm665 0x57 &gt; /sys/bus/i2c/devices/i2c-1/new_device</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -84,6 +112,7 @@ max otherwise. For details please see the SMM665 datasheet.</div><div class='ctx'> </div><div class='ctx'> For SMM465 and SMM764, values for Channel E and F are reported but undefined.</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in1_input		12V input voltage (mV)</div><div class='ctx'> in2_input		3.3V (VDD) input voltage (mV)</div><div class='ctx'> in3_input		Channel A voltage (mV)</div><div class='hunk'>@@ -155,3 +184,4 @@ temp1_min		Mimimum chip temperature</div><div class='ctx'> temp1_max		Maximum chip temperature</div><div class='ctx'> temp1_crit		Critical chip temperature</div><div class='ctx'> temp1_crit_alarm	Temperature critical alarm</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/smsc47b397 b/Documentation/hwmon/smsc47b397.rst<br/>index 3a43b6948924..600194cf1804 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smsc47b397?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47b397</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smsc47b397.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/smsc47b397.rst</a></div><div class='hunk'>@@ -2,29 +2,38 @@ Kernel driver smsc47b397</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC LPC47B397-NC</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH5307-NS</div><div class='add'>+</div><div class='ctx'>   * SMSC SCH5317</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smsc47b397'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: In this file</div><div class='ctx'> </div><div class='del'>-Authors: Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;</div><div class='del'>-         Utilitek Systems, Inc.</div><div class='add'>+Authors:</div><div class='add'>+</div><div class='add'>+       - Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;</div><div class='add'>+       - Utilitek Systems, Inc.</div><div class='ctx'> </div><div class='ctx'> November 23, 2004</div><div class='ctx'> </div><div class='del'>-The following specification describes the SMSC LPC47B397-NC[1] sensor chip</div><div class='add'>+The following specification describes the SMSC LPC47B397-NC [1]_ sensor chip</div><div class='ctx'> (for which there is no public datasheet available). This document was</div><div class='ctx'> provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected</div><div class='ctx'> by Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;.</div><div class='ctx'> </div><div class='del'>-[1] And SMSC SCH5307-NS and SCH5317, which have different device IDs but are</div><div class='del'>-otherwise compatible.</div><div class='add'>+.. [1] And SMSC SCH5307-NS and SCH5317, which have different device IDs but are</div><div class='add'>+       otherwise compatible.</div><div class='ctx'> </div><div class='del'>-* * * * *</div><div class='add'>+-------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-Methods for detecting the HP SIO and reading the thermal data on a dc7100.</div><div class='add'>+Methods for detecting the HP SIO and reading the thermal data on a dc7100</div><div class='add'>+-------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> The thermal information on the dc7100 is contained in the SIO Hardware Monitor</div><div class='ctx'> (HWM). The information is accessed through an index/data pair. The index/data</div><div class='hunk'>@@ -35,18 +44,22 @@ and 0x61 (LSB). Currently we are using 0x480 for the HWM Base Address and</div><div class='ctx'> </div><div class='ctx'> Reading temperature information.</div><div class='ctx'> The temperature information is located in the following registers:</div><div class='add'>+</div><div class='add'>+=============== ======= =======================================================</div><div class='ctx'> Temp1		0x25	(Currently, this reflects the CPU temp on all systems).</div><div class='ctx'> Temp2		0x26</div><div class='ctx'> Temp3		0x27</div><div class='ctx'> Temp4		0x80</div><div class='add'>+=============== ======= =======================================================</div><div class='ctx'> </div><div class='ctx'> Programming Example</div><div class='del'>-The following is an example of how to read the HWM temperature registers:</div><div class='del'>-MOV	DX,480H</div><div class='del'>-MOV	AX,25H</div><div class='del'>-OUT	DX,AL</div><div class='del'>-MOV	DX,481H</div><div class='del'>-IN	AL,DX</div><div class='add'>+The following is an example of how to read the HWM temperature registers::</div><div class='add'>+</div><div class='add'>+	MOV	DX,480H</div><div class='add'>+	MOV	AX,25H</div><div class='add'>+	OUT	DX,AL</div><div class='add'>+	MOV	DX,481H</div><div class='add'>+	IN	AL,DX</div><div class='ctx'> </div><div class='ctx'> AL contains the data in hex, the temperature in Celsius is the decimal</div><div class='ctx'> equivalent.</div><div class='hunk'>@@ -55,25 +68,32 @@ Ex: If AL contains 0x2A, the temperature is 42 degrees C.</div><div class='ctx'> </div><div class='ctx'> Reading tach information.</div><div class='ctx'> The fan speed information is located in the following registers:</div><div class='add'>+</div><div class='add'>+=============== ======= ======= =================================</div><div class='ctx'> 		LSB	MSB</div><div class='ctx'> Tach1		0x28	0x29	(Currently, this reflects the CPU</div><div class='ctx'> 				fan speed on all systems).</div><div class='ctx'> Tach2		0x2A	0x2B</div><div class='ctx'> Tach3		0x2C	0x2D</div><div class='ctx'> Tach4		0x2E	0x2F</div><div class='add'>+=============== ======= ======= =================================</div><div class='ctx'> </div><div class='del'>-Important!!!</div><div class='del'>-Reading the tach LSB locks the tach MSB.</div><div class='del'>-The LSB Must be read first.</div><div class='add'>+.. Important::</div><div class='add'>+</div><div class='add'>+	Reading the tach LSB locks the tach MSB.</div><div class='add'>+	The LSB Must be read first.</div><div class='add'>+</div><div class='add'>+How to convert the tach reading to RPM</div><div class='add'>+--------------------------------------</div><div class='ctx'> </div><div class='del'>-How to convert the tach reading to RPM.</div><div class='ctx'> The tach reading (TCount) is given by: (Tach MSB * 256) + (Tach LSB)</div><div class='ctx'> The SIO counts the number of 90kHz (11.111us) pulses per revolution.</div><div class='ctx'> RPM = 60/(TCount * 11.111us)</div><div class='ctx'> </div><div class='del'>-Example:</div><div class='del'>-Reg 0x28 = 0x9B</div><div class='del'>-Reg 0x29 = 0x08</div><div class='add'>+Example::</div><div class='add'>+</div><div class='add'>+	Reg 0x28 = 0x9B</div><div class='add'>+	Reg 0x29 = 0x08</div><div class='ctx'> </div><div class='ctx'> TCount = 0x89B = 2203</div><div class='ctx'> </div><div class='hunk'>@@ -81,21 +101,28 @@ RPM = 60 / (2203 * 11.11111 E-6) = 2451 RPM</div><div class='ctx'> </div><div class='ctx'> Obtaining the SIO version.</div><div class='ctx'> </div><div class='del'>-CONFIGURATION SEQUENCE</div><div class='add'>+Configuration Sequence</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='ctx'> To program the configuration registers, the following sequence must be followed:</div><div class='ctx'> 1. Enter Configuration Mode</div><div class='ctx'> 2. Configure the Configuration Registers</div><div class='ctx'> 3. Exit Configuration Mode.</div><div class='ctx'> </div><div class='ctx'> Enter Configuration Mode</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='ctx'> To place the chip into the Configuration State The config key (0x55) is written</div><div class='ctx'> to the CONFIG PORT (0x2E).</div><div class='ctx'> </div><div class='ctx'> Configuration Mode</div><div class='add'>+^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='ctx'> In configuration mode, the INDEX PORT is located at the CONFIG PORT address and</div><div class='ctx'> the DATA PORT is at INDEX PORT address + 1.</div><div class='ctx'> </div><div class='ctx'> The desired configuration registers are accessed in two steps:</div><div class='add'>+</div><div class='ctx'> a.	Write the index of the Logical Device Number Configuration Register</div><div class='ctx'> 	(i.e., 0x07) to the INDEX PORT and then write the number of the</div><div class='ctx'> 	desired logical device to the DATA PORT.</div><div class='hunk'>@@ -104,30 +131,35 @@ b.	Write the address of the desired configuration register within the</div><div class='ctx'> 	logical device to the INDEX PORT and then write or read the config-</div><div class='ctx'> 	uration register through the DATA PORT.</div><div class='ctx'> </div><div class='del'>-Note: If accessing the Global Configuration Registers, step (a) is not required.</div><div class='add'>+Note:</div><div class='add'>+	If accessing the Global Configuration Registers, step (a) is not required.</div><div class='ctx'> </div><div class='ctx'> Exit Configuration Mode</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='ctx'> To exit the Configuration State the write 0xAA to the CONFIG PORT (0x2E).</div><div class='ctx'> The chip returns to the RUN State.  (This is important).</div><div class='ctx'> </div><div class='ctx'> Programming Example</div><div class='del'>-The following is an example of how to read the SIO Device ID located at 0x20</div><div class='del'>-</div><div class='del'>-; ENTER CONFIGURATION MODE</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AX,055H</div><div class='del'>-OUT	DX,AL</div><div class='del'>-; GLOBAL CONFIGURATION  REGISTER</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AL,20H</div><div class='del'>-OUT	DX,AL</div><div class='del'>-; READ THE DATA</div><div class='del'>-MOV	DX,02FH</div><div class='del'>-IN	AL,DX</div><div class='del'>-; EXIT CONFIGURATION MODE</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AX,0AAH</div><div class='del'>-OUT	DX,AL</div><div class='add'>+^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+The following is an example of how to read the SIO Device ID located at 0x20:</div><div class='add'>+</div><div class='add'>+	; ENTER CONFIGURATION MODE</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AX,055H</div><div class='add'>+	OUT	DX,AL</div><div class='add'>+	; GLOBAL CONFIGURATION  REGISTER</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AL,20H</div><div class='add'>+	OUT	DX,AL</div><div class='add'>+	; READ THE DATA</div><div class='add'>+	MOV	DX,02FH</div><div class='add'>+	IN	AL,DX</div><div class='add'>+	; EXIT CONFIGURATION MODE</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AX,0AAH</div><div class='add'>+	OUT	DX,AL</div><div class='ctx'> </div><div class='ctx'> The registers of interest for identifying the SIO on the dc7100 are Device ID</div><div class='ctx'> (0x20) and Device Rev  (0x21).</div><div class='hunk'>@@ -135,29 +167,31 @@ The registers of interest for identifying the SIO on the dc7100 are Device ID</div><div class='ctx'> The Device ID will read 0x6F (0x81 for SCH5307-NS, and 0x85 for SCH5317)</div><div class='ctx'> The Device Rev currently reads 0x01</div><div class='ctx'> </div><div class='del'>-Obtaining the HWM Base Address.</div><div class='add'>+Obtaining the HWM Base Address</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='ctx'> The following is an example of how to read the HWM Base Address located in</div><div class='del'>-Logical Device 8.</div><div class='del'>-</div><div class='del'>-; ENTER CONFIGURATION MODE</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AX,055H</div><div class='del'>-OUT	DX,AL</div><div class='del'>-; CONFIGURE REGISTER CRE0,</div><div class='del'>-; LOGICAL DEVICE 8</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AL,07H</div><div class='del'>-OUT	DX,AL ;Point to LD# Config Reg</div><div class='del'>-MOV	DX,02FH</div><div class='del'>-MOV	AL, 08H</div><div class='del'>-OUT	DX,AL;Point to Logical Device 8</div><div class='del'>-;</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AL,60H</div><div class='del'>-OUT	DX,AL	; Point to HWM Base Addr MSB</div><div class='del'>-MOV	DX,02FH</div><div class='del'>-IN	AL,DX	; Get MSB of HWM Base Addr</div><div class='del'>-; EXIT CONFIGURATION MODE</div><div class='del'>-MOV	DX,02EH</div><div class='del'>-MOV	AX,0AAH</div><div class='del'>-OUT	DX,AL</div><div class='add'>+Logical Device 8::</div><div class='add'>+</div><div class='add'>+	; ENTER CONFIGURATION MODE</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AX,055H</div><div class='add'>+	OUT	DX,AL</div><div class='add'>+	; CONFIGURE REGISTER CRE0,</div><div class='add'>+	; LOGICAL DEVICE 8</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AL,07H</div><div class='add'>+	OUT	DX,AL ;Point to LD# Config Reg</div><div class='add'>+	MOV	DX,02FH</div><div class='add'>+	MOV	AL, 08H</div><div class='add'>+	OUT	DX,AL;Point to Logical Device 8</div><div class='add'>+	;</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AL,60H</div><div class='add'>+	OUT	DX,AL	; Point to HWM Base Addr MSB</div><div class='add'>+	MOV	DX,02FH</div><div class='add'>+	IN	AL,DX	; Get MSB of HWM Base Addr</div><div class='add'>+	; EXIT CONFIGURATION MODE</div><div class='add'>+	MOV	DX,02EH</div><div class='add'>+	MOV	AX,0AAH</div><div class='add'>+	OUT	DX,AL</div><div class='head'>diff --git a/Documentation/hwmon/smsc47m1 b/Documentation/hwmon/smsc47m1.rst<br/>index 10a24b420686..c54eabd5eb57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smsc47m1?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47m1</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smsc47m1.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/smsc47m1.rst</a></div><div class='hunk'>@@ -2,30 +2,53 @@ Kernel driver smsc47m1</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * SMSC LPC47B27x, LPC47M112, LPC47M10x, LPC47M13x, LPC47M14x,</div><div class='add'>+</div><div class='ctx'>     LPC47M15x and LPC47M192</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smsc47m1'</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='del'>-        http://www.smsc.com/media/Downloads_Public/Data_Sheets/47b272.pdf</div><div class='del'>-        http://www.smsc.com/media/Downloads_Public/Data_Sheets/47m10x.pdf</div><div class='del'>-        http://www.smsc.com/media/Downloads_Public/Data_Sheets/47m112.pdf</div><div class='del'>-        http://www.smsc.com/</div><div class='add'>+</div><div class='add'>+	http://www.smsc.com/media/Downloads_Public/Data_Sheets/47b272.pdf</div><div class='add'>+</div><div class='add'>+	http://www.smsc.com/media/Downloads_Public/Data_Sheets/47m10x.pdf</div><div class='add'>+</div><div class='add'>+	http://www.smsc.com/media/Downloads_Public/Data_Sheets/47m112.pdf</div><div class='add'>+</div><div class='add'>+	http://www.smsc.com/</div><div class='add'>+</div><div class='ctx'>   * SMSC LPC47M292</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smsc47m2'</div><div class='add'>+</div><div class='ctx'>     Datasheet: Not public</div><div class='add'>+</div><div class='ctx'>   * SMSC LPC47M997</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super I/O config space</div><div class='add'>+</div><div class='ctx'>     Prefix: 'smsc47m1'</div><div class='add'>+</div><div class='ctx'>     Datasheet: none</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='del'>-        With assistance from Bruce Allen &lt;ballen@uwm.edu&gt;, and his</div><div class='del'>-        fan.c program: http://www.lsc-group.phys.uwm.edu/%7Eballen/driver/</div><div class='del'>-        Gabriele Gorla &lt;gorlik@yahoo.com&gt;,</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+</div><div class='add'>+     - Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='add'>+     - With assistance from Bruce Allen &lt;ballen@uwm.edu&gt;, and his</div><div class='add'>+       fan.c program:</div><div class='add'>+</div><div class='add'>+       - http://www.lsc-group.phys.uwm.edu/%7Eballen/driver/</div><div class='add'>+</div><div class='add'>+     - Gabriele Gorla &lt;gorlik@yahoo.com&gt;,</div><div class='add'>+     - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -57,7 +80,7 @@ hardware registers are read whenever any data is read (unless it is less</div><div class='ctx'> than 1.5 seconds since the last update). This means that you can easily</div><div class='ctx'> miss once-only alarms.</div><div class='ctx'> </div><div class='add'>+------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-**********************</div><div class='ctx'> The lm_sensors project gratefully acknowledges the support of</div><div class='ctx'> Intel in the development of this driver.</div><div class='head'>diff --git a/Documentation/hwmon/smsc47m192 b/Documentation/hwmon/smsc47m192<br/>deleted file mode 100644<br/>index 6d54ecb7b3f8..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smsc47m192?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/smsc47m192</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +0,0 @@</div><div class='del'>-Kernel driver smsc47m192</div><div class='del'>-========================</div><div class='del'>-</div><div class='del'>-Supported chips:</div><div class='del'>-  * SMSC LPC47M192, LPC47M15x, LPC47M292 and LPC47M997</div><div class='del'>-    Prefix: 'smsc47m192'</div><div class='del'>-    Addresses scanned: I2C 0x2c - 0x2d</div><div class='del'>-    Datasheet: The datasheet for LPC47M192 is publicly available from</div><div class='del'>-               http://www.smsc.com/</div><div class='del'>-               The LPC47M15x, LPC47M292 and LPC47M997 are compatible for</div><div class='del'>-               hardware monitoring.</div><div class='del'>-</div><div class='del'>-Author: Hartmut Rick &lt;linux@rick.claranet.de&gt;</div><div class='del'>-        Special thanks to Jean Delvare for careful checking</div><div class='del'>-        of the code and many helpful comments and suggestions.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Description</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-This driver implements support for the hardware sensor capabilities</div><div class='del'>-of the SMSC LPC47M192 and compatible Super-I/O chips.</div><div class='del'>-</div><div class='del'>-These chips support 3 temperature channels and 8 voltage inputs</div><div class='del'>-as well as CPU voltage VID input.</div><div class='del'>-</div><div class='del'>-They do also have fan monitoring and control capabilities, but the</div><div class='del'>-these features are accessed via ISA bus and are not supported by this</div><div class='del'>-driver. Use the 'smsc47m1' driver for fan monitoring and control.</div><div class='del'>-</div><div class='del'>-Voltages and temperatures are measured by an 8-bit ADC, the resolution</div><div class='del'>-of the temperatures is 1 bit per degree C.</div><div class='del'>-Voltages are scaled such that the nominal voltage corresponds to</div><div class='del'>-192 counts, i.e. 3/4 of the full range. Thus the available range for</div><div class='del'>-each voltage channel is 0V ... 255/192*(nominal voltage), the resolution</div><div class='del'>-is 1 bit per (nominal voltage)/192.</div><div class='del'>-Both voltage and temperature values are scaled by 1000, the sys files</div><div class='del'>-show voltages in mV and temperatures in units of 0.001 degC.</div><div class='del'>-</div><div class='del'>-The +12V analog voltage input channel (in4_input) is multiplexed with</div><div class='del'>-bit 4 of the encoded CPU voltage. This means that you either get</div><div class='del'>-a +12V voltage measurement or a 5 bit CPU VID, but not both.</div><div class='del'>-The default setting is to use the pin as 12V input, and use only 4 bit VID.</div><div class='del'>-This driver assumes that the information in the configuration register</div><div class='del'>-is correct, i.e. that the BIOS has updated the configuration if</div><div class='del'>-the motherboard has this input wired to VID4.</div><div class='del'>-</div><div class='del'>-The temperature and voltage readings are updated once every 1.5 seconds.</div><div class='del'>-Reading them more often repeats the same values.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-sysfs interface</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-in0_input	- +2.5V voltage input</div><div class='del'>-in1_input	- CPU voltage input (nominal 2.25V)</div><div class='del'>-in2_input	- +3.3V voltage input</div><div class='del'>-in3_input	- +5V voltage input</div><div class='del'>-in4_input	- +12V voltage input (may be missing if used as VID4)</div><div class='del'>-in5_input	- Vcc voltage input (nominal 3.3V)</div><div class='del'>-		  This is the supply voltage of the sensor chip itself.</div><div class='del'>-in6_input	- +1.5V voltage input</div><div class='del'>-in7_input	- +1.8V voltage input</div><div class='del'>-</div><div class='del'>-in[0-7]_min,</div><div class='del'>-in[0-7]_max	- lower and upper alarm thresholds for in[0-7]_input reading</div><div class='del'>-</div><div class='del'>-		  All voltages are read and written in mV.</div><div class='del'>-</div><div class='del'>-in[0-7]_alarm	- alarm flags for voltage inputs</div><div class='del'>-		  These files read '1' in case of alarm, '0' otherwise.</div><div class='del'>-</div><div class='del'>-temp1_input	- chip temperature measured by on-chip diode</div><div class='del'>-temp[2-3]_input	- temperature measured by external diodes (one of these would</div><div class='del'>-		  typically be wired to the diode inside the CPU)</div><div class='del'>-</div><div class='del'>-temp[1-3]_min,</div><div class='del'>-temp[1-3]_max	- lower and upper alarm thresholds for temperatures</div><div class='del'>-</div><div class='del'>-temp[1-3]_offset - temperature offset registers</div><div class='del'>-		  The chip adds the offsets stored in these registers to</div><div class='del'>-		  the corresponding temperature readings.</div><div class='del'>-		  Note that temp1 and temp2 offsets share the same register,</div><div class='del'>-		  they cannot both be different from zero at the same time.</div><div class='del'>-		  Writing a non-zero number to one of them will reset the other</div><div class='del'>-		  offset to zero.</div><div class='del'>-</div><div class='del'>-		  All temperatures and offsets are read and written in</div><div class='del'>-		  units of 0.001 degC.</div><div class='del'>-</div><div class='del'>-temp[1-3]_alarm - alarm flags for temperature inputs, '1' in case of alarm,</div><div class='del'>-		  '0' otherwise.</div><div class='del'>-temp[2-3]_input_fault - diode fault flags for temperature inputs 2 and 3.</div><div class='del'>-		  A fault is detected if the two pins for the corresponding</div><div class='del'>-		  sensor are open or shorted, or any of the two is shorted</div><div class='del'>-		  to ground or Vcc. '1' indicates a diode fault.</div><div class='del'>-</div><div class='del'>-cpu0_vid	- CPU voltage as received from the CPU</div><div class='del'>-</div><div class='del'>-vrm		- CPU VID standard used for decoding CPU voltage</div><div class='del'>-</div><div class='del'>-		  The *_min, *_max, *_offset and vrm files can be read and</div><div class='del'>-		  written, all others are read-only.</div><div class='head'>diff --git a/Documentation/hwmon/smsc47m192.rst b/Documentation/hwmon/smsc47m192.rst<br/>new file mode 100644<br/>index 000000000000..a2e86ab67918<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/smsc47m192.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/smsc47m192.rst</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+Kernel driver smsc47m192</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+</div><div class='add'>+  * SMSC LPC47M192, LPC47M15x, LPC47M292 and LPC47M997</div><div class='add'>+</div><div class='add'>+    Prefix: 'smsc47m192'</div><div class='add'>+</div><div class='add'>+    Addresses scanned: I2C 0x2c - 0x2d</div><div class='add'>+</div><div class='add'>+    Datasheet: The datasheet for LPC47M192 is publicly available from</div><div class='add'>+</div><div class='add'>+	       http://www.smsc.com/</div><div class='add'>+</div><div class='add'>+	       The LPC47M15x, LPC47M292 and LPC47M997 are compatible for</div><div class='add'>+</div><div class='add'>+	       hardware monitoring.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Author:</div><div class='add'>+      - Hartmut Rick &lt;linux@rick.claranet.de&gt;</div><div class='add'>+</div><div class='add'>+      - Special thanks to Jean Delvare for careful checking</div><div class='add'>+	of the code and many helpful comments and suggestions.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver implements support for the hardware sensor capabilities</div><div class='add'>+of the SMSC LPC47M192 and compatible Super-I/O chips.</div><div class='add'>+</div><div class='add'>+These chips support 3 temperature channels and 8 voltage inputs</div><div class='add'>+as well as CPU voltage VID input.</div><div class='add'>+</div><div class='add'>+They do also have fan monitoring and control capabilities, but the</div><div class='add'>+these features are accessed via ISA bus and are not supported by this</div><div class='add'>+driver. Use the 'smsc47m1' driver for fan monitoring and control.</div><div class='add'>+</div><div class='add'>+Voltages and temperatures are measured by an 8-bit ADC, the resolution</div><div class='add'>+of the temperatures is 1 bit per degree C.</div><div class='add'>+Voltages are scaled such that the nominal voltage corresponds to</div><div class='add'>+192 counts, i.e. 3/4 of the full range. Thus the available range for</div><div class='add'>+each voltage channel is 0V ... 255/192*(nominal voltage), the resolution</div><div class='add'>+is 1 bit per (nominal voltage)/192.</div><div class='add'>+Both voltage and temperature values are scaled by 1000, the sys files</div><div class='add'>+show voltages in mV and temperatures in units of 0.001 degC.</div><div class='add'>+</div><div class='add'>+The +12V analog voltage input channel (in4_input) is multiplexed with</div><div class='add'>+bit 4 of the encoded CPU voltage. This means that you either get</div><div class='add'>+a +12V voltage measurement or a 5 bit CPU VID, but not both.</div><div class='add'>+The default setting is to use the pin as 12V input, and use only 4 bit VID.</div><div class='add'>+This driver assumes that the information in the configuration register</div><div class='add'>+is correct, i.e. that the BIOS has updated the configuration if</div><div class='add'>+the motherboard has this input wired to VID4.</div><div class='add'>+</div><div class='add'>+The temperature and voltage readings are updated once every 1.5 seconds.</div><div class='add'>+Reading them more often repeats the same values.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+sysfs interface</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+===================== ==========================================================</div><div class='add'>+in0_input	      +2.5V voltage input</div><div class='add'>+in1_input	      CPU voltage input (nominal 2.25V)</div><div class='add'>+in2_input	      +3.3V voltage input</div><div class='add'>+in3_input	      +5V voltage input</div><div class='add'>+in4_input	      +12V voltage input (may be missing if used as VID4)</div><div class='add'>+in5_input	      Vcc voltage input (nominal 3.3V)</div><div class='add'>+		      This is the supply voltage of the sensor chip itself.</div><div class='add'>+in6_input	      +1.5V voltage input</div><div class='add'>+in7_input	      +1.8V voltage input</div><div class='add'>+</div><div class='add'>+in[0-7]_min,</div><div class='add'>+in[0-7]_max	      lower and upper alarm thresholds for in[0-7]_input reading</div><div class='add'>+</div><div class='add'>+		      All voltages are read and written in mV.</div><div class='add'>+</div><div class='add'>+in[0-7]_alarm	      alarm flags for voltage inputs</div><div class='add'>+		      These files read '1' in case of alarm, '0' otherwise.</div><div class='add'>+</div><div class='add'>+temp1_input	      chip temperature measured by on-chip diode</div><div class='add'>+temp[2-3]_input	      temperature measured by external diodes (one of these</div><div class='add'>+		      would typically be wired to the diode inside the CPU)</div><div class='add'>+</div><div class='add'>+temp[1-3]_min,</div><div class='add'>+temp[1-3]_max	      lower and upper alarm thresholds for temperatures</div><div class='add'>+</div><div class='add'>+temp[1-3]_offset      temperature offset registers</div><div class='add'>+		      The chip adds the offsets stored in these registers to</div><div class='add'>+		      the corresponding temperature readings.</div><div class='add'>+		      Note that temp1 and temp2 offsets share the same register,</div><div class='add'>+		      they cannot both be different from zero at the same time.</div><div class='add'>+		      Writing a non-zero number to one of them will reset the other</div><div class='add'>+		      offset to zero.</div><div class='add'>+</div><div class='add'>+		      All temperatures and offsets are read and written in</div><div class='add'>+		      units of 0.001 degC.</div><div class='add'>+</div><div class='add'>+temp[1-3]_alarm       alarm flags for temperature inputs, '1' in case of alarm,</div><div class='add'>+		      '0' otherwise.</div><div class='add'>+temp[2-3]_input_fault diode fault flags for temperature inputs 2 and 3.</div><div class='add'>+		      A fault is detected if the two pins for the corresponding</div><div class='add'>+		      sensor are open or shorted, or any of the two is shorted</div><div class='add'>+		      to ground or Vcc. '1' indicates a diode fault.</div><div class='add'>+</div><div class='add'>+cpu0_vid	      CPU voltage as received from the CPU</div><div class='add'>+</div><div class='add'>+vrm		      CPU VID standard used for decoding CPU voltage</div><div class='add'>+===================== ==========================================================</div><div class='add'>+</div><div class='add'>+The `*_min`, `*_max`, `*_offset` and `vrm` files can be read and written,</div><div class='add'>+all others are read-only.</div><div class='head'>diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches.rst<br/>index f88221b46153..f9796b9d9db6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/submitting-patches?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/submitting-patches</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/submitting-patches.rst</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-	How to Get Your Patch Accepted Into the Hwmon Subsystem</div><div class='del'>-	-------------------------------------------------------</div><div class='add'>+How to Get Your Patch Accepted Into the Hwmon Subsystem</div><div class='add'>+=======================================================</div><div class='ctx'> </div><div class='ctx'> This text is a collection of suggestions for people writing patches or</div><div class='ctx'> drivers for the hwmon subsystem. Following these suggestions will greatly</div><div class='hunk'>@@ -9,11 +9,12 @@ increase the chances of your change being accepted.</div><div class='ctx'> 1. General</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='del'>-* It should be unnecessary to mention, but please read and follow</div><div class='del'>-    Documentation/process/submit-checklist.rst</div><div class='del'>-    Documentation/process/submitting-drivers.rst</div><div class='del'>-    Documentation/process/submitting-patches.rst</div><div class='del'>-    Documentation/process/coding-style.rst</div><div class='add'>+* It should be unnecessary to mention, but please read and follow:</div><div class='add'>+</div><div class='add'>+    - Documentation/process/submit-checklist.rst</div><div class='add'>+    - Documentation/process/submitting-drivers.rst</div><div class='add'>+    - Documentation/process/submitting-patches.rst</div><div class='add'>+    - Documentation/process/coding-style.rst</div><div class='ctx'> </div><div class='ctx'> * Please run your patch through 'checkpatch --strict'. There should be no</div><div class='ctx'>   errors, no warnings, and few if any check messages. If there are any</div><div class='hunk'>@@ -38,7 +39,7 @@ increase the chances of your change being accepted.</div><div class='ctx'> 2. Adding functionality to existing drivers</div><div class='ctx'> -------------------------------------------</div><div class='ctx'> </div><div class='del'>-* Make sure the documentation in Documentation/hwmon/&lt;driver_name&gt; is up to</div><div class='add'>+* Make sure the documentation in Documentation/hwmon/&lt;driver_name&gt;.rst is up to</div><div class='ctx'>   date.</div><div class='ctx'> </div><div class='ctx'> * Make sure the information in Kconfig is up to date.</div><div class='hunk'>@@ -60,7 +61,7 @@ increase the chances of your change being accepted.</div><div class='ctx'> </div><div class='ctx'> * Consider adding yourself to MAINTAINERS.</div><div class='ctx'> </div><div class='del'>-* Document the driver in Documentation/hwmon/&lt;driver_name&gt;.</div><div class='add'>+* Document the driver in Documentation/hwmon/&lt;driver_name&gt;.rst.</div><div class='ctx'> </div><div class='ctx'> * Add the driver to Kconfig and Makefile in alphabetical order.</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +134,7 @@ increase the chances of your change being accepted.</div><div class='ctx'>   non-standard attributes, or you believe you do, discuss it on the mailing list</div><div class='ctx'>   first. Either case, provide a detailed explanation why you need the</div><div class='ctx'>   non-standard attribute(s).</div><div class='del'>-  Standard attributes are specified in Documentation/hwmon/sysfs-interface.</div><div class='add'>+  Standard attributes are specified in Documentation/hwmon/sysfs-interface.rst.</div><div class='ctx'> </div><div class='ctx'> * When deciding which sysfs attributes to support, look at the chip's</div><div class='ctx'>   capabilities. While we do not expect your driver to support everything the</div><div class='head'>diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface.rst<br/>index 2b9e1005d88b..fd590633bb14 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sysfs-interface?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/sysfs-interface</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/sysfs-interface.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/sysfs-interface.rst</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> Naming and data format standards for sysfs files</div><div class='del'>-------------------------------------------------</div><div class='add'>+================================================</div><div class='ctx'> </div><div class='ctx'> The libsensors library offers an interface to the raw sensors data</div><div class='ctx'> through the sysfs interface. Since lm-sensors 3.0.0, libsensors is</div><div class='hunk'>@@ -32,7 +32,7 @@ this reason, it is still not recommended to bypass the library.</div><div class='ctx'> </div><div class='ctx'> Each chip gets its own directory in the sysfs /sys/devices tree.  To</div><div class='ctx'> find all sensor chips, it is easier to follow the device symlinks from</div><div class='del'>-/sys/class/hwmon/hwmon*.</div><div class='add'>+`/sys/class/hwmon/hwmon*`.</div><div class='ctx'> </div><div class='ctx'> Up to lm-sensors 3.0.0, libsensors looks for hardware monitoring attributes</div><div class='ctx'> in the "physical" device directory. Since lm-sensors 3.0.1, attributes found</div><div class='hunk'>@@ -67,11 +67,13 @@ are interpreted as 0! For more on how written strings are interpreted see the</div><div class='ctx'> </div><div class='ctx'> -------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-[0-*]	denotes any positive number starting from 0</div><div class='del'>-[1-*]	denotes any positive number starting from 1</div><div class='add'>+======= ===========================================</div><div class='add'>+`[0-*]`	denotes any positive number starting from 0</div><div class='add'>+`[1-*]`	denotes any positive number starting from 1</div><div class='ctx'> RO	read only value</div><div class='ctx'> WO	write only value</div><div class='ctx'> RW	read/write value</div><div class='add'>+======= ===========================================</div><div class='ctx'> </div><div class='ctx'> Read/write values may be read-only for some chips, depending on the</div><div class='ctx'> hardware implementation.</div><div class='hunk'>@@ -80,57 +82,82 @@ All entries (except name) are optional, and should only be created in a</div><div class='ctx'> given driver if the chip has the feature.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-*********************</div><div class='del'>-* Global attributes *</div><div class='del'>-*********************</div><div class='add'>+*****************</div><div class='add'>+Global attributes</div><div class='add'>+*****************</div><div class='ctx'> </div><div class='del'>-name		The chip name.</div><div class='add'>+`name`</div><div class='add'>+		The chip name.</div><div class='ctx'> 		This should be a short, lowercase string, not containing</div><div class='ctx'> 		whitespace, dashes, or the wildcard character '*'.</div><div class='ctx'> 		This attribute represents the chip name. It is the only</div><div class='ctx'> 		mandatory attribute.</div><div class='ctx'> 		I2C devices get this attribute created automatically.</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-update_interval	The interval at which the chip will update readings.</div><div class='add'>+`update_interval`</div><div class='add'>+		The interval at which the chip will update readings.</div><div class='ctx'> 		Unit: millisecond</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		Some devices have a variable update rate or interval.</div><div class='ctx'> 		This attribute can be used to change it to the desired value.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-************</div><div class='del'>-* Voltages *</div><div class='del'>-************</div><div class='add'>+********</div><div class='add'>+Voltages</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+`in[0-*]_min`</div><div class='add'>+		Voltage min value.</div><div class='ctx'> </div><div class='del'>-in[0-*]_min	Voltage min value.</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='del'>-		</div><div class='del'>-in[0-*]_lcrit	Voltage critical min value.</div><div class='add'>+</div><div class='add'>+`in[0-*]_lcrit`</div><div class='add'>+		Voltage critical min value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		If voltage drops to or below this limit, the system may</div><div class='ctx'> 		take drastic action such as power down or reset. At the very</div><div class='ctx'> 		least, it should report a fault.</div><div class='ctx'> </div><div class='del'>-in[0-*]_max	Voltage max value.</div><div class='add'>+`in[0-*]_max`</div><div class='add'>+		Voltage max value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='del'>-		</div><div class='del'>-in[0-*]_crit	Voltage critical max value.</div><div class='add'>+</div><div class='add'>+`in[0-*]_crit`</div><div class='add'>+		Voltage critical max value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		If voltage reaches or exceeds this limit, the system may</div><div class='ctx'> 		take drastic action such as power down or reset. At the very</div><div class='ctx'> 		least, it should report a fault.</div><div class='ctx'> </div><div class='del'>-in[0-*]_input	Voltage input value.</div><div class='add'>+`in[0-*]_input`</div><div class='add'>+		Voltage input value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='add'>+</div><div class='ctx'> 		Voltage measured on the chip pin.</div><div class='add'>+</div><div class='ctx'> 		Actual voltage depends on the scaling resistors on the</div><div class='ctx'> 		motherboard, as recommended in the chip datasheet.</div><div class='add'>+</div><div class='ctx'> 		This varies by chip and by motherboard.</div><div class='ctx'> 		Because of this variation, values are generally NOT scaled</div><div class='ctx'> 		by the chip driver, and must be done by the application.</div><div class='hunk'>@@ -140,166 +167,232 @@ in[0-*]_input	Voltage input value.</div><div class='ctx'> 		thumb: drivers should report the voltage values at the</div><div class='ctx'> 		"pins" of the chip.</div><div class='ctx'> </div><div class='del'>-in[0-*]_average</div><div class='add'>+`in[0-*]_average`</div><div class='ctx'> 		Average voltage</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-in[0-*]_lowest</div><div class='add'>+`in[0-*]_lowest`</div><div class='ctx'> 		Historical minimum voltage</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-in[0-*]_highest</div><div class='add'>+`in[0-*]_highest`</div><div class='ctx'> 		Historical maximum voltage</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-in[0-*]_reset_history</div><div class='add'>+`in[0-*]_reset_history`</div><div class='ctx'> 		Reset inX_lowest and inX_highest</div><div class='add'>+</div><div class='ctx'> 		WO</div><div class='ctx'> </div><div class='del'>-in_reset_history</div><div class='add'>+`in_reset_history`</div><div class='ctx'> 		Reset inX_lowest and inX_highest for all sensors</div><div class='add'>+</div><div class='ctx'> 		WO</div><div class='ctx'> </div><div class='del'>-in[0-*]_label	Suggested voltage channel label.</div><div class='add'>+`in[0-*]_label`</div><div class='add'>+		Suggested voltage channel label.</div><div class='add'>+</div><div class='ctx'> 		Text string</div><div class='add'>+</div><div class='ctx'> 		Should only be created if the driver has hints about what</div><div class='ctx'> 		this voltage channel is being used for, and user-space</div><div class='ctx'> 		doesn't. In all other cases, the label is provided by</div><div class='ctx'> 		user-space.</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-in[0-*]_enable</div><div class='add'>+`in[0-*]_enable`</div><div class='ctx'> 		Enable or disable the sensors.</div><div class='add'>+</div><div class='ctx'> 		When disabled the sensor read will return -ENODATA.</div><div class='del'>-		1: Enable</div><div class='del'>-		0: Disable</div><div class='add'>+</div><div class='add'>+		- 1: Enable</div><div class='add'>+		- 0: Disable</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-cpu[0-*]_vid	CPU core reference voltage.</div><div class='add'>+`cpu[0-*]_vid`</div><div class='add'>+		CPU core reference voltage.</div><div class='add'>+</div><div class='ctx'> 		Unit: millivolt</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='add'>+</div><div class='ctx'> 		Not always correct.</div><div class='ctx'> </div><div class='del'>-vrm		Voltage Regulator Module version number. </div><div class='add'>+`vrm`</div><div class='add'>+		Voltage Regulator Module version number.</div><div class='add'>+</div><div class='ctx'> 		RW (but changing it should no more be necessary)</div><div class='add'>+</div><div class='ctx'> 		Originally the VRM standard version multiplied by 10, but now</div><div class='ctx'> 		an arbitrary number, as not all standards have a version</div><div class='ctx'> 		number.</div><div class='add'>+</div><div class='ctx'> 		Affects the way the driver calculates the CPU core reference</div><div class='ctx'> 		voltage from the vid pins.</div><div class='ctx'> </div><div class='ctx'> Also see the Alarms section for status flags associated with voltages.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-********</div><div class='del'>-* Fans *</div><div class='del'>-********</div><div class='add'>+****</div><div class='add'>+Fans</div><div class='add'>+****</div><div class='add'>+</div><div class='add'>+`fan[1-*]_min`</div><div class='add'>+		Fan minimum value</div><div class='ctx'> </div><div class='del'>-fan[1-*]_min	Fan minimum value</div><div class='ctx'> 		Unit: revolution/min (RPM)</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-fan[1-*]_max	Fan maximum value</div><div class='add'>+`fan[1-*]_max`</div><div class='add'>+		Fan maximum value</div><div class='add'>+</div><div class='ctx'> 		Unit: revolution/min (RPM)</div><div class='add'>+</div><div class='ctx'> 		Only rarely supported by the hardware.</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-fan[1-*]_input	Fan input value.</div><div class='add'>+`fan[1-*]_input`</div><div class='add'>+		Fan input value.</div><div class='add'>+</div><div class='ctx'> 		Unit: revolution/min (RPM)</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-fan[1-*]_div	Fan divisor.</div><div class='add'>+`fan[1-*]_div`</div><div class='add'>+		Fan divisor.</div><div class='add'>+</div><div class='ctx'> 		Integer value in powers of two (1, 2, 4, 8, 16, 32, 64, 128).</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		Some chips only support values 1, 2, 4 and 8.</div><div class='ctx'> 		Note that this is actually an internal clock divisor, which</div><div class='ctx'> 		affects the measurable speed range, not the read value.</div><div class='ctx'> </div><div class='del'>-fan[1-*]_pulses	Number of tachometer pulses per fan revolution.</div><div class='add'>+`fan[1-*]_pulses`</div><div class='add'>+		Number of tachometer pulses per fan revolution.</div><div class='add'>+</div><div class='ctx'> 		Integer value, typically between 1 and 4.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		This value is a characteristic of the fan connected to the</div><div class='ctx'> 		device's input, so it has to be set in accordance with the fan</div><div class='ctx'> 		model.</div><div class='add'>+</div><div class='ctx'> 		Should only be created if the chip has a register to configure</div><div class='ctx'> 		the number of pulses. In the absence of such a register (and</div><div class='ctx'> 		thus attribute) the value assumed by all devices is 2 pulses</div><div class='ctx'> 		per fan revolution.</div><div class='ctx'> </div><div class='del'>-fan[1-*]_target</div><div class='add'>+`fan[1-*]_target`</div><div class='ctx'> 		Desired fan speed</div><div class='add'>+</div><div class='ctx'> 		Unit: revolution/min (RPM)</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		Only makes sense if the chip supports closed-loop fan speed</div><div class='ctx'> 		control based on the measured fan speed.</div><div class='ctx'> </div><div class='del'>-fan[1-*]_label	Suggested fan channel label.</div><div class='add'>+`fan[1-*]_label`</div><div class='add'>+		Suggested fan channel label.</div><div class='add'>+</div><div class='ctx'> 		Text string</div><div class='add'>+</div><div class='ctx'> 		Should only be created if the driver has hints about what</div><div class='ctx'> 		this fan channel is being used for, and user-space doesn't.</div><div class='ctx'> 		In all other cases, the label is provided by user-space.</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-fan[1-*]_enable</div><div class='add'>+`fan[1-*]_enable`</div><div class='ctx'> 		Enable or disable the sensors.</div><div class='add'>+</div><div class='ctx'> 		When disabled the sensor read will return -ENODATA.</div><div class='del'>-		1: Enable</div><div class='del'>-		0: Disable</div><div class='add'>+</div><div class='add'>+		- 1: Enable</div><div class='add'>+		- 0: Disable</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='ctx'> Also see the Alarms section for status flags associated with fans.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-*******</div><div class='del'>-* PWM *</div><div class='del'>-*******</div><div class='add'>+***</div><div class='add'>+PWM</div><div class='add'>+***</div><div class='add'>+</div><div class='add'>+`pwm[1-*]`</div><div class='add'>+		Pulse width modulation fan control.</div><div class='ctx'> </div><div class='del'>-pwm[1-*]	Pulse width modulation fan control.</div><div class='ctx'> 		Integer value in the range 0 to 255</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		255 is max or 100%.</div><div class='ctx'> </div><div class='del'>-pwm[1-*]_enable</div><div class='add'>+`pwm[1-*]_enable`</div><div class='ctx'> 		Fan speed control method:</div><div class='del'>-		0: no fan speed control (i.e. fan at full speed)</div><div class='del'>-		1: manual fan speed control enabled (using pwm[1-*])</div><div class='del'>-		2+: automatic fan speed control enabled</div><div class='add'>+</div><div class='add'>+		- 0: no fan speed control (i.e. fan at full speed)</div><div class='add'>+		- 1: manual fan speed control enabled (using `pwm[1-*]`)</div><div class='add'>+		- 2+: automatic fan speed control enabled</div><div class='add'>+</div><div class='ctx'> 		Check individual chip documentation files for automatic mode</div><div class='ctx'> 		details.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-pwm[1-*]_mode	0: DC mode (direct current)</div><div class='del'>-		1: PWM mode (pulse-width modulation)</div><div class='add'>+`pwm[1-*]_mode`</div><div class='add'>+		- 0: DC mode (direct current)</div><div class='add'>+		- 1: PWM mode (pulse-width modulation)</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-pwm[1-*]_freq	Base PWM frequency in Hz.</div><div class='add'>+`pwm[1-*]_freq`</div><div class='add'>+		Base PWM frequency in Hz.</div><div class='add'>+</div><div class='ctx'> 		Only possibly available when pwmN_mode is PWM, but not always</div><div class='ctx'> 		present even then.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-pwm[1-*]_auto_channels_temp</div><div class='add'>+`pwm[1-*]_auto_channels_temp`</div><div class='ctx'> 		Select which temperature channels affect this PWM output in</div><div class='del'>-		auto mode. Bitfield, 1 is temp1, 2 is temp2, 4 is temp3 etc...</div><div class='add'>+		auto mode.</div><div class='add'>+</div><div class='add'>+		Bitfield, 1 is temp1, 2 is temp2, 4 is temp3 etc...</div><div class='ctx'> 		Which values are possible depend on the chip used.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-pwm[1-*]_auto_point[1-*]_pwm</div><div class='del'>-pwm[1-*]_auto_point[1-*]_temp</div><div class='del'>-pwm[1-*]_auto_point[1-*]_temp_hyst</div><div class='del'>-		Define the PWM vs temperature curve. Number of trip points is</div><div class='del'>-		chip-dependent. Use this for chips which associate trip points</div><div class='del'>-		to PWM output channels.</div><div class='add'>+`pwm[1-*]_auto_point[1-*]_pwm` / `pwm[1-*]_auto_point[1-*]_temp` / `pwm[1-*]_auto_point[1-*]_temp_hyst`</div><div class='add'>+		Define the PWM vs temperature curve.</div><div class='add'>+</div><div class='add'>+		Number of trip points is chip-dependent. Use this for chips</div><div class='add'>+		which associate trip points to PWM output channels.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_auto_point[1-*]_pwm</div><div class='del'>-temp[1-*]_auto_point[1-*]_temp</div><div class='del'>-temp[1-*]_auto_point[1-*]_temp_hyst</div><div class='del'>-		Define the PWM vs temperature curve. Number of trip points is</div><div class='del'>-		chip-dependent. Use this for chips which associate trip points</div><div class='del'>-		to temperature channels.</div><div class='add'>+`temp[1-*]_auto_point[1-*]_pwm` / `temp[1-*]_auto_point[1-*]_temp` / `temp[1-*]_auto_point[1-*]_temp_hyst`</div><div class='add'>+		Define the PWM vs temperature curve.</div><div class='add'>+</div><div class='add'>+		Number of trip points is chip-dependent. Use this for chips</div><div class='add'>+		which associate trip points to temperature channels.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='ctx'> There is a third case where trip points are associated to both PWM output</div><div class='hunk'>@@ -312,122 +405,173 @@ The actual result is up to the chip, but in general the highest candidate</div><div class='ctx'> value (fastest fan speed) wins.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-****************</div><div class='del'>-* Temperatures *</div><div class='del'>-****************</div><div class='add'>+************</div><div class='add'>+Temperatures</div><div class='add'>+************</div><div class='add'>+</div><div class='add'>+`temp[1-*]_type`</div><div class='add'>+		Sensor type selection.</div><div class='ctx'> </div><div class='del'>-temp[1-*]_type	Sensor type selection.</div><div class='ctx'> 		Integers 1 to 6</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='del'>-		1: CPU embedded diode</div><div class='del'>-		2: 3904 transistor</div><div class='del'>-		3: thermal diode</div><div class='del'>-		4: thermistor</div><div class='del'>-		5: AMD AMDSI</div><div class='del'>-		6: Intel PECI</div><div class='add'>+</div><div class='add'>+		- 1: CPU embedded diode</div><div class='add'>+		- 2: 3904 transistor</div><div class='add'>+		- 3: thermal diode</div><div class='add'>+		- 4: thermistor</div><div class='add'>+		- 5: AMD AMDSI</div><div class='add'>+		- 6: Intel PECI</div><div class='add'>+</div><div class='ctx'> 		Not all types are supported by all chips</div><div class='ctx'> </div><div class='del'>-temp[1-*]_max	Temperature max value.</div><div class='add'>+`temp[1-*]_max`</div><div class='add'>+		Temperature max value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius (or millivolt, see below)</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_min	Temperature min value.</div><div class='add'>+`temp[1-*]_min`</div><div class='add'>+		Temperature min value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_max_hyst</div><div class='add'>+`temp[1-*]_max_hyst`</div><div class='ctx'> 		Temperature hysteresis value for max limit.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the max value.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_min_hyst</div><div class='add'>+`temp[1-*]_min_hyst`</div><div class='ctx'> 		Temperature hysteresis value for min limit.</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the min value.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_input Temperature input value.</div><div class='add'>+`temp[1-*]_input`</div><div class='add'>+	 Temperature input value.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-temp[1-*]_crit	Temperature critical max value, typically greater than</div><div class='add'>+`temp[1-*]_crit`</div><div class='add'>+		Temperature critical max value, typically greater than</div><div class='ctx'> 		corresponding temp_max values.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_crit_hyst</div><div class='add'>+`temp[1-*]_crit_hyst`</div><div class='ctx'> 		Temperature hysteresis value for critical limit.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the critical value.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_emergency</div><div class='add'>+`temp[1-*]_emergency`</div><div class='ctx'> 		Temperature emergency max value, for chips supporting more than</div><div class='ctx'> 		two upper temperature limits. Must be equal or greater than</div><div class='ctx'> 		corresponding temp_crit values.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_emergency_hyst</div><div class='add'>+`temp[1-*]_emergency_hyst`</div><div class='ctx'> 		Temperature hysteresis value for emergency limit.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the emergency value.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_lcrit	Temperature critical min value, typically lower than</div><div class='add'>+`temp[1-*]_lcrit`</div><div class='add'>+		Temperature critical min value, typically lower than</div><div class='ctx'> 		corresponding temp_min values.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_lcrit_hyst</div><div class='add'>+`temp[1-*]_lcrit_hyst`</div><div class='ctx'> 		Temperature hysteresis value for critical min limit.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the critical min value.</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-temp[1-*]_offset</div><div class='add'>+`temp[1-*]_offset`</div><div class='ctx'> 		Temperature offset which is added to the temperature reading</div><div class='ctx'> 		by the chip.</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		Read/Write value.</div><div class='ctx'> </div><div class='del'>-temp[1-*]_label	Suggested temperature channel label.</div><div class='add'>+`temp[1-*]_label`</div><div class='add'>+		Suggested temperature channel label.</div><div class='add'>+</div><div class='ctx'> 		Text string</div><div class='add'>+</div><div class='ctx'> 		Should only be created if the driver has hints about what</div><div class='ctx'> 		this temperature channel is being used for, and user-space</div><div class='ctx'> 		doesn't. In all other cases, the label is provided by</div><div class='ctx'> 		user-space.</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-temp[1-*]_lowest</div><div class='add'>+`temp[1-*]_lowest`</div><div class='ctx'> 		Historical minimum temperature</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-temp[1-*]_highest</div><div class='add'>+`temp[1-*]_highest`</div><div class='ctx'> 		Historical maximum temperature</div><div class='add'>+</div><div class='ctx'> 		Unit: millidegree Celsius</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-temp[1-*]_reset_history</div><div class='add'>+`temp[1-*]_reset_history`</div><div class='ctx'> 		Reset temp_lowest and temp_highest</div><div class='add'>+</div><div class='ctx'> 		WO</div><div class='ctx'> </div><div class='del'>-temp_reset_history</div><div class='add'>+`temp_reset_history`</div><div class='ctx'> 		Reset temp_lowest and temp_highest for all sensors</div><div class='add'>+</div><div class='ctx'> 		WO</div><div class='ctx'> </div><div class='del'>-temp[1-*]_enable</div><div class='add'>+`temp[1-*]_enable`</div><div class='ctx'> 		Enable or disable the sensors.</div><div class='add'>+</div><div class='ctx'> 		When disabled the sensor read will return -ENODATA.</div><div class='del'>-		1: Enable</div><div class='del'>-		0: Disable</div><div class='add'>+</div><div class='add'>+		- 1: Enable</div><div class='add'>+		- 0: Disable</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='ctx'> Some chips measure temperature using external thermistors and an ADC, and</div><div class='hunk'>@@ -442,201 +586,300 @@ channels by the driver.</div><div class='ctx'> Also see the Alarms section for status flags associated with temperatures.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-************</div><div class='del'>-* Currents *</div><div class='del'>-************</div><div class='add'>+********</div><div class='add'>+Currents</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+`curr[1-*]_max`</div><div class='add'>+		Current max value</div><div class='ctx'> </div><div class='del'>-curr[1-*]_max	Current max value</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-curr[1-*]_min	Current min value.</div><div class='add'>+`curr[1-*]_min`</div><div class='add'>+		Current min value.</div><div class='add'>+</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-curr[1-*]_lcrit	Current critical low value</div><div class='add'>+`curr[1-*]_lcrit`</div><div class='add'>+		Current critical low value</div><div class='add'>+</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-curr[1-*]_crit	Current critical high value.</div><div class='add'>+`curr[1-*]_crit`</div><div class='add'>+		Current critical high value.</div><div class='add'>+</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-curr[1-*]_input	Current input value</div><div class='add'>+`curr[1-*]_input`</div><div class='add'>+		Current input value</div><div class='add'>+</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-curr[1-*]_average</div><div class='add'>+`curr[1-*]_average`</div><div class='ctx'> 		Average current use</div><div class='add'>+</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-curr[1-*]_lowest</div><div class='add'>+`curr[1-*]_lowest`</div><div class='ctx'> 		Historical minimum current</div><div class='add'>+</div><div class='ctx'> 		Unit: milliampere</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-curr[1-*]_highest</div><div class='add'>+`curr[1-*]_highest`</div><div class='ctx'> 		Historical maximum current</div><div class='ctx'> 		Unit: milliampere</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='del'>-curr[1-*]_reset_history</div><div class='add'>+`curr[1-*]_reset_history`</div><div class='ctx'> 		Reset currX_lowest and currX_highest</div><div class='add'>+</div><div class='ctx'> 		WO</div><div class='ctx'> </div><div class='del'>-curr_reset_history</div><div class='add'>+`curr_reset_history`</div><div class='ctx'> 		Reset currX_lowest and currX_highest for all sensors</div><div class='add'>+</div><div class='ctx'> 		WO</div><div class='ctx'> </div><div class='del'>-curr[1-*]_enable</div><div class='add'>+`curr[1-*]_enable`</div><div class='ctx'> 		Enable or disable the sensors.</div><div class='add'>+</div><div class='ctx'> 		When disabled the sensor read will return -ENODATA.</div><div class='del'>-		1: Enable</div><div class='del'>-		0: Disable</div><div class='add'>+</div><div class='add'>+		- 1: Enable</div><div class='add'>+		- 0: Disable</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='ctx'> Also see the Alarms section for status flags associated with currents.</div><div class='ctx'> </div><div class='del'>-*********</div><div class='del'>-* Power *</div><div class='del'>-*********</div><div class='add'>+*****</div><div class='add'>+Power</div><div class='add'>+*****</div><div class='add'>+</div><div class='add'>+`power[1-*]_average`</div><div class='add'>+				Average power use</div><div class='ctx'> </div><div class='del'>-power[1-*]_average		Average power use</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_interval	Power use averaging interval.  A poll</div><div class='add'>+`power[1-*]_average_interval`</div><div class='add'>+				Power use averaging interval.  A poll</div><div class='ctx'> 				notification is sent to this file if the</div><div class='ctx'> 				hardware changes the averaging interval.</div><div class='add'>+</div><div class='ctx'> 				Unit: milliseconds</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_interval_max	Maximum power use averaging interval</div><div class='add'>+`power[1-*]_average_interval_max`</div><div class='add'>+				Maximum power use averaging interval</div><div class='add'>+</div><div class='ctx'> 				Unit: milliseconds</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_interval_min	Minimum power use averaging interval</div><div class='add'>+`power[1-*]_average_interval_min`</div><div class='add'>+				Minimum power use averaging interval</div><div class='add'>+</div><div class='ctx'> 				Unit: milliseconds</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_highest	Historical average maximum power use</div><div class='add'>+`power[1-*]_average_highest`</div><div class='add'>+				Historical average maximum power use</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_lowest	Historical average minimum power use</div><div class='add'>+`power[1-*]_average_lowest`</div><div class='add'>+				Historical average minimum power use</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_max		A poll notification is sent to</div><div class='del'>-				power[1-*]_average when power use</div><div class='add'>+`power[1-*]_average_max`</div><div class='add'>+				A poll notification is sent to</div><div class='add'>+				`power[1-*]_average` when power use</div><div class='ctx'> 				rises above this value.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_average_min		A poll notification is sent to</div><div class='del'>-				power[1-*]_average when power use</div><div class='add'>+`power[1-*]_average_min`</div><div class='add'>+				A poll notification is sent to</div><div class='add'>+				`power[1-*]_average` when power use</div><div class='ctx'> 				sinks below this value.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_input		Instantaneous power use</div><div class='add'>+`power[1-*]_input`</div><div class='add'>+				Instantaneous power use</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_input_highest	Historical maximum power use</div><div class='add'>+`power[1-*]_input_highest`</div><div class='add'>+				Historical maximum power use</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_input_lowest		Historical minimum power use</div><div class='add'>+`power[1-*]_input_lowest`</div><div class='add'>+				Historical minimum power use</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_reset_history	Reset input_highest, input_lowest,</div><div class='add'>+`power[1-*]_reset_history`</div><div class='add'>+				Reset input_highest, input_lowest,</div><div class='ctx'> 				average_highest and average_lowest.</div><div class='add'>+</div><div class='ctx'> 				WO</div><div class='ctx'> </div><div class='del'>-power[1-*]_accuracy		Accuracy of the power meter.</div><div class='add'>+`power[1-*]_accuracy`</div><div class='add'>+				Accuracy of the power meter.</div><div class='add'>+</div><div class='ctx'> 				Unit: Percent</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_cap			If power use rises above this limit, the</div><div class='add'>+`power[1-*]_cap`</div><div class='add'>+				If power use rises above this limit, the</div><div class='ctx'> 				system should take action to reduce power use.</div><div class='ctx'> 				A poll notification is sent to this file if the</div><div class='del'>-				cap is changed by the hardware.  The *_cap</div><div class='add'>+				cap is changed by the hardware.  The `*_cap`</div><div class='ctx'> 				files only appear if the cap is known to be</div><div class='ctx'> 				enforced by hardware.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_cap_hyst		Margin of hysteresis built around capping and</div><div class='add'>+`power[1-*]_cap_hyst`</div><div class='add'>+				Margin of hysteresis built around capping and</div><div class='ctx'> 				notification.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_cap_max		Maximum cap that can be set.</div><div class='add'>+`power[1-*]_cap_max`</div><div class='add'>+				Maximum cap that can be set.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_cap_min		Minimum cap that can be set.</div><div class='add'>+`power[1-*]_cap_min`</div><div class='add'>+				Minimum cap that can be set.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-power[1-*]_max			Maximum power.</div><div class='add'>+`power[1-*]_max`</div><div class='add'>+				Maximum power.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_crit			Critical maximum power.</div><div class='add'>+`power[1-*]_crit`</div><div class='add'>+				Critical maximum power.</div><div class='add'>+</div><div class='ctx'> 				If power rises to or above this limit, the</div><div class='ctx'> 				system is expected take drastic action to reduce</div><div class='ctx'> 				power consumption, such as a system shutdown or</div><div class='ctx'> 				a forced powerdown of some devices.</div><div class='add'>+</div><div class='ctx'> 				Unit: microWatt</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-power[1-*]_enable		Enable or disable the sensors.</div><div class='add'>+`power[1-*]_enable`</div><div class='add'>+				Enable or disable the sensors.</div><div class='add'>+</div><div class='ctx'> 				When disabled the sensor read will return</div><div class='ctx'> 				-ENODATA.</div><div class='del'>-				1: Enable</div><div class='del'>-				0: Disable</div><div class='add'>+</div><div class='add'>+				- 1: Enable</div><div class='add'>+				- 0: Disable</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='ctx'> Also see the Alarms section for status flags associated with power readings.</div><div class='ctx'> </div><div class='del'>-**********</div><div class='del'>-* Energy *</div><div class='del'>-**********</div><div class='add'>+******</div><div class='add'>+Energy</div><div class='add'>+******</div><div class='add'>+</div><div class='add'>+`energy[1-*]_input`</div><div class='add'>+				Cumulative energy use</div><div class='ctx'> </div><div class='del'>-energy[1-*]_input		Cumulative energy use</div><div class='ctx'> 				Unit: microJoule</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='del'>-energy[1-*]_enable		Enable or disable the sensors.</div><div class='add'>+`energy[1-*]_enable`</div><div class='add'>+				Enable or disable the sensors.</div><div class='add'>+</div><div class='ctx'> 				When disabled the sensor read will return</div><div class='ctx'> 				-ENODATA.</div><div class='del'>-				1: Enable</div><div class='del'>-				0: Disable</div><div class='add'>+</div><div class='add'>+				- 1: Enable</div><div class='add'>+				- 0: Disable</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-************</div><div class='del'>-* Humidity *</div><div class='del'>-************</div><div class='add'>+********</div><div class='add'>+Humidity</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+`humidity[1-*]_input`</div><div class='add'>+				Humidity</div><div class='ctx'> </div><div class='del'>-humidity[1-*]_input		Humidity</div><div class='ctx'> 				Unit: milli-percent (per cent mille, pcm)</div><div class='add'>+</div><div class='ctx'> 				RO</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-humidity[1-*]_enable		Enable or disable the sensors</div><div class='add'>+`humidity[1-*]_enable`</div><div class='add'>+				Enable or disable the sensors</div><div class='add'>+</div><div class='ctx'> 				When disabled the sensor read will return</div><div class='ctx'> 				-ENODATA.</div><div class='del'>-				1: Enable</div><div class='del'>-				0: Disable</div><div class='add'>+</div><div class='add'>+				- 1: Enable</div><div class='add'>+				- 0: Disable</div><div class='add'>+</div><div class='ctx'> 				RW</div><div class='ctx'> </div><div class='del'>-**********</div><div class='del'>-* Alarms *</div><div class='del'>-**********</div><div class='add'>+******</div><div class='add'>+Alarms</div><div class='add'>+******</div><div class='ctx'> </div><div class='ctx'> Each channel or limit may have an associated alarm file, containing a</div><div class='ctx'> boolean value. 1 means than an alarm condition exists, 0 means no alarm.</div><div class='hunk'>@@ -645,67 +888,67 @@ Usually a given chip will either use channel-related alarms, or</div><div class='ctx'> limit-related alarms, not both. The driver should just reflect the hardware</div><div class='ctx'> implementation.</div><div class='ctx'> </div><div class='del'>-in[0-*]_alarm</div><div class='del'>-curr[1-*]_alarm</div><div class='del'>-power[1-*]_alarm</div><div class='del'>-fan[1-*]_alarm</div><div class='del'>-temp[1-*]_alarm</div><div class='del'>-		Channel alarm</div><div class='del'>-		0: no alarm</div><div class='del'>-		1: alarm</div><div class='del'>-		RO</div><div class='del'>-</div><div class='del'>-OR</div><div class='del'>-</div><div class='del'>-in[0-*]_min_alarm</div><div class='del'>-in[0-*]_max_alarm</div><div class='del'>-in[0-*]_lcrit_alarm</div><div class='del'>-in[0-*]_crit_alarm</div><div class='del'>-curr[1-*]_min_alarm</div><div class='del'>-curr[1-*]_max_alarm</div><div class='del'>-curr[1-*]_lcrit_alarm</div><div class='del'>-curr[1-*]_crit_alarm</div><div class='del'>-power[1-*]_cap_alarm</div><div class='del'>-power[1-*]_max_alarm</div><div class='del'>-power[1-*]_crit_alarm</div><div class='del'>-fan[1-*]_min_alarm</div><div class='del'>-fan[1-*]_max_alarm</div><div class='del'>-temp[1-*]_min_alarm</div><div class='del'>-temp[1-*]_max_alarm</div><div class='del'>-temp[1-*]_lcrit_alarm</div><div class='del'>-temp[1-*]_crit_alarm</div><div class='del'>-temp[1-*]_emergency_alarm</div><div class='del'>-		Limit alarm</div><div class='del'>-		0: no alarm</div><div class='del'>-		1: alarm</div><div class='del'>-		RO</div><div class='add'>++-------------------------------+-----------------------+</div><div class='add'>+| **`in[0-*]_alarm`,		| Channel alarm		|</div><div class='add'>+| `curr[1-*]_alarm`,		|			|</div><div class='add'>+| `power[1-*]_alarm`,		|   - 0: no alarm	|</div><div class='add'>+| `fan[1-*]_alarm`,		|   - 1: alarm		|</div><div class='add'>+| `temp[1-*]_alarm`**		|			|</div><div class='add'>+|				|   RO			|</div><div class='add'>++-------------------------------+-----------------------+</div><div class='add'>+</div><div class='add'>+**OR**</div><div class='add'>+</div><div class='add'>++-------------------------------+-----------------------+</div><div class='add'>+| **`in[0-*]_min_alarm`,	| Limit alarm		|</div><div class='add'>+| `in[0-*]_max_alarm`,		|			|</div><div class='add'>+| `in[0-*]_lcrit_alarm`,	|   - 0: no alarm	|</div><div class='add'>+| `in[0-*]_crit_alarm`,		|   - 1: alarm		|</div><div class='add'>+| `curr[1-*]_min_alarm`,	|			|</div><div class='add'>+| `curr[1-*]_max_alarm`,	| RO			|</div><div class='add'>+| `curr[1-*]_lcrit_alarm`,	|			|</div><div class='add'>+| `curr[1-*]_crit_alarm`,	|			|</div><div class='add'>+| `power[1-*]_cap_alarm`,	|			|</div><div class='add'>+| `power[1-*]_max_alarm`,	|			|</div><div class='add'>+| `power[1-*]_crit_alarm`,	|			|</div><div class='add'>+| `fan[1-*]_min_alarm`,		|			|</div><div class='add'>+| `fan[1-*]_max_alarm`,		|			|</div><div class='add'>+| `temp[1-*]_min_alarm`,	|			|</div><div class='add'>+| `temp[1-*]_max_alarm`,	|			|</div><div class='add'>+| `temp[1-*]_lcrit_alarm`,	|			|</div><div class='add'>+| `temp[1-*]_crit_alarm`,	|			|</div><div class='add'>+| `temp[1-*]_emergency_alarm`**	|			|</div><div class='add'>++-------------------------------+-----------------------+</div><div class='ctx'> </div><div class='ctx'> Each input channel may have an associated fault file. This can be used</div><div class='ctx'> to notify open diodes, unconnected fans etc. where the hardware</div><div class='ctx'> supports it. When this boolean has value 1, the measurement for that</div><div class='ctx'> channel should not be trusted.</div><div class='ctx'> </div><div class='del'>-fan[1-*]_fault</div><div class='del'>-temp[1-*]_fault</div><div class='add'>+`fan[1-*]_fault` / `temp[1-*]_fault`</div><div class='ctx'> 		Input fault condition</div><div class='del'>-		0: no fault occurred</div><div class='del'>-		1: fault condition</div><div class='add'>+</div><div class='add'>+		- 0: no fault occurred</div><div class='add'>+		- 1: fault condition</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='ctx'> Some chips also offer the possibility to get beeped when an alarm occurs:</div><div class='ctx'> </div><div class='del'>-beep_enable	Master beep enable</div><div class='del'>-		0: no beeps</div><div class='del'>-		1: beeps</div><div class='add'>+`beep_enable`</div><div class='add'>+		Master beep enable</div><div class='add'>+</div><div class='add'>+		- 0: no beeps</div><div class='add'>+		- 1: beeps</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='del'>-in[0-*]_beep</div><div class='del'>-curr[1-*]_beep</div><div class='del'>-fan[1-*]_beep</div><div class='del'>-temp[1-*]_beep</div><div class='add'>+`in[0-*]_beep`, `curr[1-*]_beep`, `fan[1-*]_beep`, `temp[1-*]_beep`,</div><div class='ctx'> 		Channel beep</div><div class='del'>-		0: disable</div><div class='del'>-		1: enable</div><div class='add'>+</div><div class='add'>+		- 0: disable</div><div class='add'>+		- 1: enable</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='ctx'> In theory, a chip could provide per-limit beep masking, but no such chip</div><div class='hunk'>@@ -715,56 +958,90 @@ Old drivers provided a different, non-standard interface to alarms and</div><div class='ctx'> beeps. These interface files are deprecated, but will be kept around</div><div class='ctx'> for compatibility reasons:</div><div class='ctx'> </div><div class='del'>-alarms		Alarm bitmask.</div><div class='add'>+`alarms`</div><div class='add'>+		Alarm bitmask.</div><div class='add'>+</div><div class='ctx'> 		RO</div><div class='add'>+</div><div class='ctx'> 		Integer representation of one to four bytes.</div><div class='add'>+</div><div class='ctx'> 		A '1' bit means an alarm.</div><div class='add'>+</div><div class='ctx'> 		Chips should be programmed for 'comparator' mode so that</div><div class='ctx'> 		the alarm will 'come back' after you read the register</div><div class='ctx'> 		if it is still valid.</div><div class='add'>+</div><div class='ctx'> 		Generally a direct representation of a chip's internal</div><div class='ctx'> 		alarm registers; there is no standard for the position</div><div class='ctx'> 		of individual bits. For this reason, the use of this</div><div class='ctx'> 		interface file for new drivers is discouraged. Use</div><div class='del'>-		individual *_alarm and *_fault files instead.</div><div class='add'>+		`individual *_alarm` and `*_fault` files instead.</div><div class='ctx'> 		Bits are defined in kernel/include/sensors.h.</div><div class='ctx'> </div><div class='del'>-beep_mask	Bitmask for beep.</div><div class='add'>+`beep_mask`</div><div class='add'>+		Bitmask for beep.</div><div class='ctx'> 		Same format as 'alarms' with the same bit locations,</div><div class='ctx'> 		use discouraged for the same reason. Use individual</div><div class='del'>-		*_beep files instead.</div><div class='add'>+		`*_beep` files instead.</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-***********************</div><div class='del'>-* Intrusion detection *</div><div class='del'>-***********************</div><div class='add'>+*******************</div><div class='add'>+Intrusion detection</div><div class='add'>+*******************</div><div class='ctx'> </div><div class='del'>-intrusion[0-*]_alarm</div><div class='add'>+`intrusion[0-*]_alarm`</div><div class='ctx'> 		Chassis intrusion detection</div><div class='del'>-		0: OK</div><div class='del'>-		1: intrusion detected</div><div class='add'>+</div><div class='add'>+		- 0: OK</div><div class='add'>+		- 1: intrusion detected</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='add'>+</div><div class='ctx'> 		Contrary to regular alarm flags which clear themselves</div><div class='ctx'> 		automatically when read, this one sticks until cleared by</div><div class='ctx'> 		the user. This is done by writing 0 to the file. Writing</div><div class='ctx'> 		other values is unsupported.</div><div class='ctx'> </div><div class='del'>-intrusion[0-*]_beep</div><div class='add'>+`intrusion[0-*]_beep`</div><div class='ctx'> 		Chassis intrusion beep</div><div class='add'>+</div><div class='ctx'> 		0: disable</div><div class='ctx'> 		1: enable</div><div class='add'>+</div><div class='ctx'> 		RW</div><div class='ctx'> </div><div class='add'>+****************************</div><div class='add'>+Average sample configuration</div><div class='add'>+****************************</div><div class='add'>+</div><div class='add'>+Devices allowing for reading {in,power,curr,temp}_average values may export</div><div class='add'>+attributes for controlling number of samples used to compute average.</div><div class='add'>+</div><div class='add'>++--------------+---------------------------------------------------------------+</div><div class='add'>+| samples      | Sets number of average samples for all types of measurements. |</div><div class='add'>+|	       |							       |</div><div class='add'>+|	       | RW							       |</div><div class='add'>++--------------+---------------------------------------------------------------+</div><div class='add'>+| in_samples   | Sets number of average samples for specific type of	       |</div><div class='add'>+| power_samples| measurements.						       |</div><div class='add'>+| curr_samples |							       |</div><div class='add'>+| temp_samples | Note that on some devices it won't be possible to set all of  |</div><div class='add'>+|	       | them to different values so changing one might also change    |</div><div class='add'>+|	       | some others.						       |</div><div class='add'>+|	       |							       |</div><div class='add'>+|	       | RW							       |</div><div class='add'>++--------------+---------------------------------------------------------------+</div><div class='ctx'> </div><div class='ctx'> sysfs attribute writes interpretation</div><div class='ctx'> -------------------------------------</div><div class='ctx'> </div><div class='ctx'> hwmon sysfs attributes always contain numbers, so the first thing to do is to</div><div class='ctx'> convert the input to a number, there are 2 ways todo this depending whether</div><div class='del'>-the number can be negative or not:</div><div class='del'>-unsigned long u = simple_strtoul(buf, NULL, 10);</div><div class='del'>-long s = simple_strtol(buf, NULL, 10);</div><div class='add'>+the number can be negative or not::</div><div class='add'>+</div><div class='add'>+	unsigned long u = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	long s = simple_strtol(buf, NULL, 10);</div><div class='ctx'> </div><div class='ctx'> With buf being the buffer with the user input being passed by the kernel.</div><div class='ctx'> Notice that we do not use the second argument of strto[u]l, and thus cannot</div><div class='hunk'>@@ -789,13 +1066,13 @@ limits using clamp_val(value, min_limit, max_limit). If it is not continuous</div><div class='ctx'> like for example a tempX_type, then when an invalid value is written,</div><div class='ctx'> -EINVAL should be returned.</div><div class='ctx'> </div><div class='del'>-Example1, temp1_max, register is a signed 8 bit value (-128 - 127 degrees):</div><div class='add'>+Example1, temp1_max, register is a signed 8 bit value (-128 - 127 degrees)::</div><div class='ctx'> </div><div class='ctx'> 	long v = simple_strtol(buf, NULL, 10) / 1000;</div><div class='ctx'> 	v = clamp_val(v, -128, 127);</div><div class='ctx'> 	/* write v to register */</div><div class='ctx'> </div><div class='del'>-Example2, fan divider setting, valid values 2, 4 and 8:</div><div class='add'>+Example2, fan divider setting, valid values 2, 4 and 8::</div><div class='ctx'> </div><div class='ctx'> 	unsigned long v = simple_strtoul(buf, NULL, 10);</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/tc654 b/Documentation/hwmon/tc654.rst<br/>index 47636a8077b4..ce546ee6dfed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tc654?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tc654</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tc654.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tc654.rst</a></div><div class='hunk'>@@ -2,13 +2,16 @@ Kernel driver tc654</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Microchip TC654 and TC655</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tc654'</div><div class='del'>-    Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/20001734C.pdf</div><div class='add'>+    Datasheet: http://ww1.m</div><div class='add'>+    icrochip.com/downloads/en/DeviceDoc/20001734C.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Chris Packham &lt;chris.packham@alliedtelesis.co.nz&gt;</div><div class='del'>-        Masahiko Iwamoto &lt;iwamoto@allied-telesis.co.jp&gt;</div><div class='add'>+      - Chris Packham &lt;chris.packham@alliedtelesis.co.nz&gt;</div><div class='add'>+      - Masahiko Iwamoto &lt;iwamoto@allied-telesis.co.jp&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/tc74 b/Documentation/hwmon/tc74.rst<br/>index 43027aad5f8e..f1764211c129 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tc74?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tc74</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tc74.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tc74.rst</a></div><div class='hunk'>@@ -2,8 +2,11 @@ Kernel driver tc74</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>    * Microchip TC74</div><div class='add'>+</div><div class='ctx'>      Prefix: 'tc74'</div><div class='add'>+</div><div class='ctx'>      Datasheet: Publicly available at Microchip website.</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='head'>diff --git a/Documentation/hwmon/thmc50 b/Documentation/hwmon/thmc50.rst<br/>index 8a7772ade8d0..cfff3885287d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/thmc50?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/thmc50</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/thmc50.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/thmc50.rst</a></div><div class='hunk'>@@ -2,30 +2,41 @@ Kernel driver thmc50</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Analog Devices ADM1022</div><div class='add'>+</div><div class='ctx'>     Prefix: 'adm1022'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.analog.com/en/prod/0,2877,ADM1022,00.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments THMC50</div><div class='add'>+</div><div class='ctx'>     Prefix: 'thmc50'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2e</div><div class='del'>-    Datasheet: http://www.ti.com/ </div><div class='add'>+</div><div class='add'>+    Datasheet: http://www.ti.com/</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Author: Krzysztof Helt &lt;krzysztof.h1@wp.pl&gt;</div><div class='ctx'> </div><div class='ctx'> This driver was derived from the 2.4 kernel thmc50.c source file.</div><div class='ctx'> </div><div class='ctx'> Credits:</div><div class='add'>+</div><div class='ctx'>   thmc50.c (2.4 kernel):</div><div class='del'>-	Frodo Looijaard &lt;frodol@dds.nl&gt;</div><div class='del'>-	Philip Edelbrock &lt;phil@netroedge.com&gt;</div><div class='add'>+</div><div class='add'>+	- Frodo Looijaard &lt;frodol@dds.nl&gt;</div><div class='add'>+	- Philip Edelbrock &lt;phil@netroedge.com&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * adm1022_temp3: short array</div><div class='del'>-  List of adapter,address pairs to force chips into ADM1022 mode with</div><div class='del'>-  second remote temperature. This does not work for original THMC50 chips.</div><div class='add'>+    List of adapter,address pairs to force chips into ADM1022 mode with</div><div class='add'>+    second remote temperature. This does not work for original THMC50 chips.</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -59,16 +70,20 @@ Driver Features</div><div class='ctx'> </div><div class='ctx'> The driver provides up to three temperatures:</div><div class='ctx'> </div><div class='del'>-temp1		-- internal</div><div class='del'>-temp2		-- remote</div><div class='del'>-temp3		-- 2nd remote only for ADM1022</div><div class='add'>+temp1</div><div class='add'>+	- internal</div><div class='add'>+temp2</div><div class='add'>+	- remote</div><div class='add'>+temp3</div><div class='add'>+	- 2nd remote only for ADM1022</div><div class='ctx'> </div><div class='del'>-pwm1		-- fan speed (0 = stop, 255 = full)</div><div class='del'>-pwm1_mode	-- always 0 (DC mode)</div><div class='add'>+pwm1</div><div class='add'>+	- fan speed (0 = stop, 255 = full)</div><div class='add'>+pwm1_mode</div><div class='add'>+	- always 0 (DC mode)</div><div class='ctx'> </div><div class='ctx'> The value of 0 for pwm1 also forces FAN_OFF signal from the chip,</div><div class='ctx'> so it stops fans even if the value 0 into the ANALOG_OUT register does not.</div><div class='ctx'> </div><div class='ctx'> The driver was tested on Compaq AP550 with two ADM1022 chips (one works</div><div class='ctx'> in the temp3 mode), five temperature readings and two fans.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/hwmon/tmp102 b/Documentation/hwmon/tmp102.rst<br/>index 8454a7763122..b1f585531a88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp102?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp102</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp102.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tmp102.rst</a></div><div class='hunk'>@@ -2,12 +2,17 @@ Kernel driver tmp102</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP102</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp102'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp102.html</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'> 	Steven King &lt;sfking@fdwdc.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -23,4 +28,4 @@ The TMP102 has a programmable update rate that can select between 8, 4, 1, and</div><div class='ctx'> 0.5 Hz. (Currently the driver only supports the default of 4 Hz).</div><div class='ctx'> </div><div class='ctx'> The driver provides the common sysfs-interface for temperatures (see</div><div class='del'>-Documentation/hwmon/sysfs-interface under Temperatures).</div><div class='add'>+Documentation/hwmon/sysfs-interface.rst under Temperatures).</div><div class='head'>diff --git a/Documentation/hwmon/tmp103 b/Documentation/hwmon/tmp103.rst<br/>index ec00a15645ba..15d25806d585 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp103?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp103</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp103.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tmp103.rst</a></div><div class='hunk'>@@ -2,12 +2,17 @@ Kernel driver tmp103</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP103</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp103'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Product info and datasheet: http://www.ti.com/product/tmp103</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'> 	Heiko Schocher &lt;hs@denx.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -22,7 +27,7 @@ Resolution: 8 Bits</div><div class='ctx'> Accuracy: ±1°C Typ (–10°C to +100°C)</div><div class='ctx'> </div><div class='ctx'> The driver provides the common sysfs-interface for temperatures (see</div><div class='del'>-Documentation/hwmon/sysfs-interface under Temperatures).</div><div class='add'>+Documentation/hwmon/sysfs-interface.rst under Temperatures).</div><div class='ctx'> </div><div class='ctx'> Please refer how to instantiate this driver:</div><div class='ctx'> Documentation/i2c/instantiating-devices</div><div class='head'>diff --git a/Documentation/hwmon/tmp108 b/Documentation/hwmon/tmp108.rst<br/>index 25802df23010..5f4266a16cb2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp108?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp108</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp108.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tmp108.rst</a></div><div class='hunk'>@@ -2,12 +2,17 @@ Kernel driver tmp108</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP108</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp108'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/product/tmp108</div><div class='ctx'> </div><div class='ctx'> Author:</div><div class='add'>+</div><div class='ctx'> 	John Muir &lt;john@jmuir.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -33,4 +38,4 @@ and then the device is shut down automatically. (This driver only supports</div><div class='ctx'> continuous mode.)</div><div class='ctx'> </div><div class='ctx'> The driver provides the common sysfs-interface for temperatures (see</div><div class='del'>-Documentation/hwmon/sysfs-interface under Temperatures).</div><div class='add'>+Documentation/hwmon/sysfs-interface.rst under Temperatures).</div><div class='head'>diff --git a/Documentation/hwmon/tmp401 b/Documentation/hwmon/tmp401.rst<br/>index 2d9ca42213cf..6a05a0719bc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp401?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp401</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp401.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tmp401.rst</a></div><div class='hunk'>@@ -2,33 +2,59 @@ Kernel driver tmp401</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP401</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp401'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp401.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP411</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp411'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c, 0x4d, 0x4e</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp411.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP431</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp431'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c, 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp431.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP432</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp432'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c, 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP435</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp435'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x48 - 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP461</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp461'</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/product/tmp461</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-         Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='del'>-	 Andre Prendel &lt;andre.prendel@gmx.de&gt;</div><div class='add'>+</div><div class='add'>+	- Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='add'>+	- Andre Prendel &lt;andre.prendel@gmx.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -42,7 +68,7 @@ supported by the driver so far, so using the default resolution of 0.5</div><div class='ctx'> degree).</div><div class='ctx'> </div><div class='ctx'> The driver provides the common sysfs-interface for temperatures (see</div><div class='del'>-Documentation/hwmon/sysfs-interface under Temperatures).</div><div class='add'>+Documentation/hwmon/sysfs-interface.rst under Temperatures).</div><div class='ctx'> </div><div class='ctx'> The TMP411 and TMP431 chips are compatible with TMP401. TMP411 provides</div><div class='ctx'> some additional features.</div><div class='head'>diff --git a/Documentation/hwmon/tmp421 b/Documentation/hwmon/tmp421.rst<br/>index 9e6fe5549ca1..1ba926a3605c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp421?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tmp421</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tmp421.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tmp421.rst</a></div><div class='hunk'>@@ -2,28 +2,49 @@ Kernel driver tmp421</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP421</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp421'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2a, 0x4c, 0x4d, 0x4e and 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp421.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP422</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp422'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c, 0x4d, 0x4e and 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp421.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP423</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp423'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp421.html</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP441</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp441'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2a, 0x4c, 0x4d, 0x4e and 0x4f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/product/tmp441</div><div class='add'>+</div><div class='ctx'>   * Texas Instruments TMP442</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tmp442'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/product/tmp442</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='add'>+</div><div class='ctx'> 	Andre Prendel &lt;andre.prendel@gmx.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -40,5 +61,6 @@ for both the local and remote channels is 0.0625 degree C.</div><div class='ctx'> The chips support only temperature measurement. The driver exports</div><div class='ctx'> the temperature values via the following sysfs files:</div><div class='ctx'> </div><div class='del'>-temp[1-4]_input</div><div class='del'>-temp[2-4]_fault</div><div class='add'>+**temp[1-4]_input**</div><div class='add'>+</div><div class='add'>+**temp[2-4]_fault**</div><div class='head'>diff --git a/Documentation/hwmon/tps40422 b/Documentation/hwmon/tps40422.rst<br/>index 24bb0688d515..b691e30479dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tps40422?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/tps40422</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/tps40422.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/tps40422.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver tps40422</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * TI TPS40422</div><div class='add'>+</div><div class='ctx'>     Prefix: 'tps40422'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.ti.com/lit/gpn/tps40422</div><div class='ctx'> </div><div class='ctx'> Author: Zhu Laiwen &lt;richard.zhu@nsn.com&gt;</div><div class='hunk'>@@ -17,7 +21,7 @@ This driver supports TI TPS40422 Dual-Output or Two-Phase Synchronous Buck</div><div class='ctx'> Controller with PMBus</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver.</div><div class='del'>-Please see Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -39,6 +43,7 @@ Sysfs entries</div><div class='ctx'> </div><div class='ctx'> The following attributes are supported.</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> in[1-2]_label		"vout[1-2]"</div><div class='ctx'> in[1-2]_input		Measured voltage. From READ_VOUT register.</div><div class='ctx'> in[1-2]_alarm		voltage alarm.</div><div class='hunk'>@@ -46,19 +51,23 @@ in[1-2]_alarm		voltage alarm.</div><div class='ctx'> curr[1-2]_input		Measured current. From READ_IOUT register.</div><div class='ctx'> curr[1-2]_label		"iout[1-2]"</div><div class='ctx'> curr1_max		Maximum current. From IOUT_OC_WARN_LIMIT register.</div><div class='del'>-curr1_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT register.</div><div class='add'>+curr1_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> curr1_max_alarm		Current high alarm. From IOUT_OC_WARN_LIMIT status.</div><div class='ctx'> curr1_crit_alarm	Current critical high alarm. From IOUT_OC_FAULT status.</div><div class='ctx'> curr2_alarm		Current high alarm. From IOUT_OC_WARNING status.</div><div class='ctx'> </div><div class='del'>-temp1_input		Measured temperature. From READ_TEMPERATURE_2 register on page 0.</div><div class='add'>+temp1_input		Measured temperature. From READ_TEMPERATURE_2 register</div><div class='add'>+			on page 0.</div><div class='ctx'> temp1_max		Maximum temperature. From OT_WARN_LIMIT register.</div><div class='ctx'> temp1_crit		Critical high temperature. From OT_FAULT_LIMIT register.</div><div class='ctx'> temp1_max_alarm		Chip temperature high alarm. Set by comparing</div><div class='del'>-			READ_TEMPERATURE_2 on page 0 with OT_WARN_LIMIT if TEMP_OT_WARNING</div><div class='del'>-			status is set.</div><div class='add'>+			READ_TEMPERATURE_2 on page 0 with OT_WARN_LIMIT if</div><div class='add'>+			TEMP_OT_WARNING status is set.</div><div class='ctx'> temp1_crit_alarm	Chip temperature critical high alarm. Set by comparing</div><div class='del'>-			READ_TEMPERATURE_2 on page 0 with OT_FAULT_LIMIT if TEMP_OT_FAULT</div><div class='del'>-			status is set.</div><div class='del'>-temp2_input		Measured temperature. From READ_TEMPERATURE_2 register on page 1.</div><div class='add'>+			READ_TEMPERATURE_2 on page 0 with OT_FAULT_LIMIT if</div><div class='add'>+			TEMP_OT_FAULT status is set.</div><div class='add'>+temp2_input		Measured temperature. From READ_TEMPERATURE_2 register</div><div class='add'>+			on page 1.</div><div class='ctx'> temp2_alarm		Chip temperature alarm on page 1.</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon.rst<br/>index c3a3a5be10ad..22c885383b11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/twl4030-madc-hwmon?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/twl4030-madc-hwmon</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/twl4030-madc-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/twl4030-madc-hwmon.rst</a></div><div class='hunk'>@@ -1,8 +1,10 @@</div><div class='ctx'> Kernel driver twl4030-madc</div><div class='del'>-=========================</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'> 	* Texas Instruments TWL4030</div><div class='add'>+</div><div class='ctx'> 	Prefix: 'twl4030-madc'</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -19,8 +21,9 @@ channels which can be used in different modes.</div><div class='ctx'> </div><div class='ctx'> See this table for the meaning of the different channels</div><div class='ctx'> </div><div class='add'>+======= ==========================================================</div><div class='ctx'> Channel Signal</div><div class='del'>-------------------------------------------</div><div class='add'>+======= ==========================================================</div><div class='ctx'> 0	Battery type(BTYPE)</div><div class='ctx'> 1	BCI: Battery temperature (BTEMP)</div><div class='ctx'> 2	GP analog input</div><div class='hunk'>@@ -37,6 +40,7 @@ Channel Signal</div><div class='ctx'> 13	Reserved</div><div class='ctx'> 14	Reserved</div><div class='ctx'> 15	VRUSB Supply/Speaker left/Speaker right polarization level</div><div class='add'>+======= ==========================================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> The Sysfs nodes will represent the voltage in the units of mV,</div><div class='head'>diff --git a/Documentation/hwmon/ucd9000 b/Documentation/hwmon/ucd9000.rst<br/>index 262e713e60ff..ebc4f2b3bfea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ucd9000?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ucd9000</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ucd9000.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ucd9000.rst</a></div><div class='hunk'>@@ -2,15 +2,20 @@ Kernel driver ucd9000</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * TI UCD90120, UCD90124, UCD90160, UCD9090, and UCD90910</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'ucd90120', 'ucd90124', 'ucd90160', 'ucd9090', 'ucd90910'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd90120.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd90124.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd90160.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9090.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd90910.pdf</div><div class='add'>+</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd90120.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd90124.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd90160.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9090.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd90910.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +57,7 @@ system-health monitor. The device integrates a 12-bit ADC for monitoring up to</div><div class='ctx'> 13 power-supply voltage, current, or temperature inputs.</div><div class='ctx'> </div><div class='ctx'> This driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -67,7 +72,7 @@ Platform data support</div><div class='ctx'> ---------------------</div><div class='ctx'> </div><div class='ctx'> The driver supports standard PMBus driver platform data. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -76,23 +81,28 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in[1-12]_label		"vout[1-12]".</div><div class='ctx'> in[1-12]_input		Measured voltage. From READ_VOUT register.</div><div class='ctx'> in[1-12]_min		Minimum Voltage. From VOUT_UV_WARN_LIMIT register.</div><div class='ctx'> in[1-12]_max		Maximum voltage. From VOUT_OV_WARN_LIMIT register.</div><div class='ctx'> in[1-12]_lcrit		Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.</div><div class='del'>-in[1-12]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.</div><div class='add'>+in[1-12]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> in[1-12]_min_alarm	Voltage low alarm. From VOLTAGE_UV_WARNING status.</div><div class='ctx'> in[1-12]_max_alarm	Voltage high alarm. From VOLTAGE_OV_WARNING status.</div><div class='del'>-in[1-12]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT status.</div><div class='del'>-in[1-12]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT status.</div><div class='add'>+in[1-12]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT</div><div class='add'>+			status.</div><div class='add'>+in[1-12]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT</div><div class='add'>+			status.</div><div class='ctx'> </div><div class='ctx'> curr[1-12]_label	"iout[1-12]".</div><div class='ctx'> curr[1-12]_input	Measured current. From READ_IOUT register.</div><div class='ctx'> curr[1-12]_max		Maximum current. From IOUT_OC_WARN_LIMIT register.</div><div class='del'>-curr[1-12]_lcrit	Critical minimum output current. From IOUT_UC_FAULT_LIMIT</div><div class='add'>+curr[1-12]_lcrit	Critical minimum output current. From</div><div class='add'>+			IOUT_UC_FAULT_LIMIT register.</div><div class='add'>+curr[1-12]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT</div><div class='ctx'> 			register.</div><div class='del'>-curr[1-12]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT register.</div><div class='ctx'> curr[1-12]_max_alarm	Current high alarm. From IOUT_OC_WARNING status.</div><div class='ctx'> curr[1-12]_crit_alarm	Current critical high alarm. From IOUT_OC_FAULT status.</div><div class='ctx'> </div><div class='hunk'>@@ -116,3 +126,4 @@ fan[1-4]_fault		Fan fault.</div><div class='ctx'> 			created only for enabled fans.</div><div class='ctx'> 			Note that even though UCD90910 supports up to 10 fans,</div><div class='ctx'> 			only up to four fans are currently supported.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/ucd9200 b/Documentation/hwmon/ucd9200.rst<br/>index 1e8060e631bd..b819dfd75f71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ucd9200?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/ucd9200</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/ucd9200.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/ucd9200.rst</a></div><div class='hunk'>@@ -2,18 +2,23 @@ Kernel driver ucd9200</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'ucd9220', 'ucd9222', 'ucd9224', 'ucd9240', 'ucd9244', 'ucd9246',</div><div class='del'>-	'ucd9248'</div><div class='add'>+    'ucd9248'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9220.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9222.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9224.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9240.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9244.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9246.pdf</div><div class='del'>-	http://focus.ti.com/lit/ds/symlink/ucd9248.pdf</div><div class='add'>+</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9220.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9222.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9224.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9240.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9244.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9246.pdf</div><div class='add'>+	- http://focus.ti.com/lit/ds/symlink/ucd9248.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -28,7 +33,7 @@ dedicated circuitry for DC/DC loop management with flash memory and a serial</div><div class='ctx'> interface to support configuration, monitoring and management.</div><div class='ctx'> </div><div class='ctx'> This driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details on PMBus client drivers.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage Notes</div><div class='hunk'>@@ -43,7 +48,7 @@ Platform data support</div><div class='ctx'> ---------------------</div><div class='ctx'> </div><div class='ctx'> The driver supports standard PMBus driver platform data. Please see</div><div class='del'>-Documentation/hwmon/pmbus for details.</div><div class='add'>+Documentation/hwmon/pmbus.rst for details.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Sysfs entries</div><div class='hunk'>@@ -52,12 +57,14 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in1_label		"vin".</div><div class='ctx'> in1_input		Measured voltage. From READ_VIN register.</div><div class='ctx'> in1_min			Minimum Voltage. From VIN_UV_WARN_LIMIT register.</div><div class='ctx'> in1_max			Maximum voltage. From VIN_OV_WARN_LIMIT register.</div><div class='ctx'> in1_lcrit		Critical minimum Voltage. VIN_UV_FAULT_LIMIT register.</div><div class='del'>-in1_crit		Critical maximum voltage. From VIN_OV_FAULT_LIMIT register.</div><div class='add'>+in1_crit		Critical maximum voltage. From VIN_OV_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> in1_min_alarm		Voltage low alarm. From VIN_UV_WARNING status.</div><div class='ctx'> in1_max_alarm		Voltage high alarm. From VIN_OV_WARNING status.</div><div class='ctx'> in1_lcrit_alarm		Voltage critical low alarm. From VIN_UV_FAULT status.</div><div class='hunk'>@@ -68,11 +75,14 @@ in[2-5]_input		Measured voltage. From READ_VOUT register.</div><div class='ctx'> in[2-5]_min		Minimum Voltage. From VOUT_UV_WARN_LIMIT register.</div><div class='ctx'> in[2-5]_max		Maximum voltage. From VOUT_OV_WARN_LIMIT register.</div><div class='ctx'> in[2-5]_lcrit		Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.</div><div class='del'>-in[2-5]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.</div><div class='add'>+in[2-5]_crit		Critical maximum voltage. From VOUT_OV_FAULT_LIMIT</div><div class='add'>+			register.</div><div class='ctx'> in[2-5]_min_alarm	Voltage low alarm. From VOLTAGE_UV_WARNING status.</div><div class='ctx'> in[2-5]_max_alarm	Voltage high alarm. From VOLTAGE_OV_WARNING status.</div><div class='del'>-in[2-5]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT status.</div><div class='del'>-in[2-5]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT status.</div><div class='add'>+in[2-5]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT</div><div class='add'>+			status.</div><div class='add'>+in[2-5]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT</div><div class='add'>+			status.</div><div class='ctx'> </div><div class='ctx'> curr1_label		"iin".</div><div class='ctx'> curr1_input		Measured current. From READ_IIN register.</div><div class='hunk'>@@ -80,9 +90,10 @@ curr1_input		Measured current. From READ_IIN register.</div><div class='ctx'> curr[2-5]_label		"iout[1-4]".</div><div class='ctx'> curr[2-5]_input		Measured current. From READ_IOUT register.</div><div class='ctx'> curr[2-5]_max		Maximum current. From IOUT_OC_WARN_LIMIT register.</div><div class='del'>-curr[2-5]_lcrit		Critical minimum output current. From IOUT_UC_FAULT_LIMIT</div><div class='add'>+curr[2-5]_lcrit		Critical minimum output current. From</div><div class='add'>+			IOUT_UC_FAULT_LIMIT register.</div><div class='add'>+curr[2-5]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT</div><div class='ctx'> 			register.</div><div class='del'>-curr[2-5]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT register.</div><div class='ctx'> curr[2-5]_max_alarm	Current high alarm. From IOUT_OC_WARNING status.</div><div class='ctx'> curr[2-5]_crit_alarm	Current critical high alarm. From IOUT_OC_FAULT status.</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +108,7 @@ power[2-5]_label	"pout[1-4]"</div><div class='ctx'> 			rails. See chip datasheets for details.</div><div class='ctx'> </div><div class='ctx'> temp[1-5]_input		Measured temperatures. From READ_TEMPERATURE_1 and</div><div class='del'>-		        READ_TEMPERATURE_2 registers.</div><div class='add'>+			READ_TEMPERATURE_2 registers.</div><div class='ctx'> 			temp1 is the chip internal temperature. temp[2-5] are</div><div class='ctx'> 			rail temperatures.  temp[2-5] attributes are only</div><div class='ctx'> 			created for enabled rails. See chip datasheets for</div><div class='hunk'>@@ -110,3 +121,4 @@ temp[1-5]_crit_alarm	Temperature critical high alarm.</div><div class='ctx'> fan1_input		Fan RPM. ucd9240 only.</div><div class='ctx'> fan1_alarm		Fan alarm. ucd9240 only.</div><div class='ctx'> fan1_fault		Fan fault. ucd9240 only.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/hwmon/userspace-tools b/Documentation/hwmon/userspace-tools.rst<br/>index 9865aeedc58f..bf3797c8e734 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/userspace-tools?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/userspace-tools</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/userspace-tools.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/userspace-tools.rst</a></div><div class='hunk'>@@ -1,3 +1,6 @@</div><div class='add'>+Userspace tools</div><div class='add'>+===============</div><div class='add'>+</div><div class='ctx'> Introduction</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/vexpress b/Documentation/hwmon/vexpress.rst<br/>index 557d6d5ad90d..8c861c8151ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/vexpress?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/vexpress</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/vexpress.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/vexpress.rst</a></div><div class='hunk'>@@ -2,14 +2,21 @@ Kernel driver vexpress</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> Supported systems:</div><div class='add'>+</div><div class='ctx'>   * ARM Ltd. Versatile Express platform</div><div class='add'>+</div><div class='ctx'>     Prefix: 'vexpress'</div><div class='add'>+</div><div class='ctx'>     Datasheets:</div><div class='add'>+</div><div class='ctx'>       * "Hardware Description" sections of the Technical Reference Manuals</div><div class='del'>-        for the Versatile Express boards:</div><div class='del'>-        http://infocenter.arm.com/help/topic/com.arm.doc.subset.boards.express/index.html</div><div class='add'>+	for the Versatile Express boards:</div><div class='add'>+</div><div class='add'>+	- http://infocenter.arm.com/help/topic/com.arm.doc.subset.boards.express/index.html</div><div class='add'>+</div><div class='ctx'>       * Section "4.4.14. System Configuration registers" of the V2M-P1 TRM:</div><div class='del'>-        http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0447-/index.html</div><div class='add'>+</div><div class='add'>+	- http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0447-/index.html</div><div class='ctx'> </div><div class='ctx'> Author: Pawel Moll</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/via686a b/Documentation/hwmon/via686a.rst<br/>index e5f90ab5c48d..a343c35df740 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/via686a?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/via686a</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/via686a.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/via686a.rst</a></div><div class='hunk'>@@ -2,29 +2,35 @@ Kernel driver via686a</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Via VT82C686A, VT82C686B  Southbridge Integrated Hardware Monitor</div><div class='add'>+</div><div class='ctx'>     Prefix: 'via686a'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA in PCI-space encoded address</div><div class='add'>+</div><div class='ctx'>     Datasheet: On request through web form (http://www.via.com.tw/en/resources/download-center/)</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;,</div><div class='del'>-        Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='del'>-        Bob Dougherty &lt;bobd@stanford.edu&gt;</div><div class='del'>-        (Some conversion-factor data were contributed by</div><div class='del'>-        Jonathan Teh Soon Yew &lt;j.teh@iname.com&gt;</div><div class='del'>-        and Alex van Kaam &lt;darkside@chello.nl&gt;.)</div><div class='add'>+	- Kyösti Mälkki &lt;kmalkki@cc.hut.fi&gt;,</div><div class='add'>+	- Mark D. Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+	- Bob Dougherty &lt;bobd@stanford.edu&gt;</div><div class='add'>+	- (Some conversion-factor data were contributed by</div><div class='add'>+	- Jonathan Teh Soon Yew &lt;j.teh@iname.com&gt;</div><div class='add'>+	- and Alex van Kaam &lt;darkside@chello.nl&gt;.)</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> force_addr=0xaddr       Set the I/O base address. Useful for boards that</div><div class='del'>-                        don't set the address in the BIOS. Look for a BIOS</div><div class='del'>-                        upgrade before resorting to this. Does not do a</div><div class='del'>-                        PCI force; the via686a must still be present in lspci.</div><div class='del'>-                        Don't use this unless the driver complains that the</div><div class='del'>-                        base address is not set.</div><div class='del'>-                        Example: 'modprobe via686a force_addr=0x6000'</div><div class='add'>+			don't set the address in the BIOS. Look for a BIOS</div><div class='add'>+			upgrade before resorting to this. Does not do a</div><div class='add'>+			PCI force; the via686a must still be present in lspci.</div><div class='add'>+			Don't use this unless the driver complains that the</div><div class='add'>+			base address is not set.</div><div class='add'>+			Example: 'modprobe via686a force_addr=0x6000'</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/vt1211 b/Documentation/hwmon/vt1211.rst<br/>index 77fa633b97a8..ddbcde7dd642 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/vt1211?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/vt1211</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/vt1211.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/vt1211.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver vt1211</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * VIA VT1211</div><div class='add'>+</div><div class='ctx'>     Prefix: 'vt1211'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: none, address read from Super-I/O config space</div><div class='add'>+</div><div class='ctx'>     Datasheet: Provided by VIA upon request and under NDA</div><div class='ctx'> </div><div class='ctx'> Authors: Juerg Haefliger &lt;juergh@gmail.com&gt;</div><div class='hunk'>@@ -19,14 +23,17 @@ technical support.</div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='del'>-* uch_config: int	Override the BIOS default universal channel (UCH)</div><div class='add'>+</div><div class='add'>+* uch_config: int</div><div class='add'>+			Override the BIOS default universal channel (UCH)</div><div class='ctx'> 			configuration for channels 1-5.</div><div class='ctx'> 			Legal values are in the range of 0-31. Bit 0 maps to</div><div class='ctx'> 			UCH1, bit 1 maps to UCH2 and so on. Setting a bit to 1</div><div class='ctx'> 			enables the thermal input of that particular UCH and</div><div class='ctx'> 			setting a bit to 0 enables the voltage input.</div><div class='ctx'> </div><div class='del'>-* int_mode: int		Override the BIOS default temperature interrupt mode.</div><div class='add'>+* int_mode: int</div><div class='add'>+			Override the BIOS default temperature interrupt mode.</div><div class='ctx'> 			The only possible value is 0 which forces interrupt</div><div class='ctx'> 			mode 0. In this mode, any pending interrupt is cleared</div><div class='ctx'> 			when the status register is read but is regenerated as</div><div class='hunk'>@@ -55,8 +62,9 @@ connected to the PWM outputs of the VT1211 :-().</div><div class='ctx'> The following table shows the relationship between the vt1211 inputs and the</div><div class='ctx'> sysfs nodes.</div><div class='ctx'> </div><div class='add'>+=============== ============== =========== ================================</div><div class='ctx'> Sensor          Voltage Mode   Temp Mode   Default Use (from the datasheet)</div><div class='del'>-------          ------------   ---------   --------------------------------</div><div class='add'>+=============== ============== =========== ================================</div><div class='ctx'> Reading 1                      temp1       Intel thermal diode</div><div class='ctx'> Reading 3                      temp2       Internal thermal diode</div><div class='ctx'> UCH1/Reading2   in0            temp3       NTC type thermistor</div><div class='hunk'>@@ -65,6 +73,7 @@ UCH3            in2            temp5       VccP (processor core)</div><div class='ctx'> UCH4            in3            temp6       +5V</div><div class='ctx'> UCH5            in4            temp7       +12V</div><div class='ctx'> +3.3V           in5                        Internal VCC (+3.3V)</div><div class='add'>+=============== ============== =========== ================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Voltage Monitoring</div><div class='hunk'>@@ -82,19 +91,22 @@ follows. And this is of course totally dependent on the actual board</div><div class='ctx'> implementation :-) You will have to find documentation for your own</div><div class='ctx'> motherboard and edit sensors.conf accordingly.</div><div class='ctx'> </div><div class='del'>-                                      Expected</div><div class='add'>+============= ====== ====== ========= ============</div><div class='add'>+				      Expected</div><div class='ctx'> Voltage       R1     R2     Divider   Raw Value</div><div class='del'>------------------------------------------------</div><div class='add'>+============= ====== ====== ========= ============</div><div class='ctx'> +2.5V         2K     10K    1.2       2083 mV</div><div class='del'>-VccP          ---    ---    1.0       1400 mV (1)</div><div class='add'>+VccP          ---    ---    1.0       1400 mV [1]_</div><div class='ctx'> +5V           14K    10K    2.4       2083 mV</div><div class='ctx'> +12V          47K    10K    5.7       2105 mV</div><div class='del'>-+3.3V (int)   2K     3.4K   1.588     3300 mV (2)</div><div class='add'>++3.3V (int)   2K     3.4K   1.588     3300 mV [2]_</div><div class='ctx'> +3.3V (ext)   6.8K   10K    1.68      1964 mV</div><div class='add'>+============= ====== ====== ========= ============</div><div class='add'>+</div><div class='add'>+.. [1] Depending on the CPU (1.4V is for a VIA C3 Nehemiah).</div><div class='ctx'> </div><div class='del'>-(1) Depending on the CPU (1.4V is for a VIA C3 Nehemiah).</div><div class='del'>-(2) R1 and R2 for 3.3V (int) are internal to the VT1211 chip and the driver</div><div class='del'>-    performs the scaling and returns the properly scaled voltage value.</div><div class='add'>+.. [2] R1 and R2 for 3.3V (int) are internal to the VT1211 chip and the driver</div><div class='add'>+       performs the scaling and returns the properly scaled voltage value.</div><div class='ctx'> </div><div class='ctx'> Each measured voltage has an associated low and high limit which triggers an</div><div class='ctx'> alarm when crossed.</div><div class='hunk'>@@ -124,35 +136,37 @@ compute temp1 (@-Offset)/Gain, (@*Gain)+Offset</div><div class='ctx'> According to the VIA VT1211 BIOS porting guide, the following gain and offset</div><div class='ctx'> values should be used:</div><div class='ctx'> </div><div class='add'>+=============== ======== ===========</div><div class='ctx'> Diode Type      Offset   Gain</div><div class='del'>-----------      ------   ----</div><div class='add'>+=============== ======== ===========</div><div class='ctx'> Intel CPU       88.638   0.9528</div><div class='del'>-                65.000   0.9686   *)</div><div class='add'>+		65.000   0.9686 [3]_</div><div class='ctx'> VIA C3 Ezra     83.869   0.9528</div><div class='ctx'> VIA C3 Ezra-T   73.869   0.9528</div><div class='add'>+=============== ======== ===========</div><div class='ctx'> </div><div class='del'>-*) This is the formula from the lm_sensors 2.10.0 sensors.conf file. I don't</div><div class='del'>-know where it comes from or how it was derived, it's just listed here for</div><div class='del'>-completeness.</div><div class='add'>+.. [3] This is the formula from the lm_sensors 2.10.0 sensors.conf file. I don't</div><div class='add'>+       know where it comes from or how it was derived, it's just listed here for</div><div class='add'>+       completeness.</div><div class='ctx'> </div><div class='ctx'> Temp3-temp7 support NTC thermistors. For these channels, the driver returns</div><div class='ctx'> the voltages as seen at the individual pins of UCH1-UCH5. The voltage at the</div><div class='ctx'> pin (Vpin) is formed by a voltage divider made of the thermistor (Rth) and a</div><div class='del'>-scaling resistor (Rs):</div><div class='add'>+scaling resistor (Rs)::</div><div class='ctx'> </div><div class='del'>-Vpin = 2200 * Rth / (Rs + Rth)   (2200 is the ADC max limit of 2200 mV)</div><div class='add'>+  Vpin = 2200 * Rth / (Rs + Rth)   (2200 is the ADC max limit of 2200 mV)</div><div class='ctx'> </div><div class='ctx'> The equation for the thermistor is as follows (google it if you want to know</div><div class='del'>-more about it):</div><div class='add'>+more about it)::</div><div class='ctx'> </div><div class='del'>-Rth = Ro * exp(B * (1 / T - 1 / To))   (To is 298.15K (25C) and Ro is the</div><div class='del'>-                                        nominal resistance at 25C)</div><div class='add'>+  Rth = Ro * exp(B * (1 / T - 1 / To))   (To is 298.15K (25C) and Ro is the</div><div class='add'>+					  nominal resistance at 25C)</div><div class='ctx'> </div><div class='ctx'> Mingling the above two equations and assuming Rs = Ro and B = 3435 yields the</div><div class='del'>-following formula for sensors.conf:</div><div class='add'>+following formula for sensors.conf::</div><div class='ctx'> </div><div class='del'>-compute tempx 1 / (1 / 298.15 - (` (2200 / @ - 1)) / 3435) - 273.15,</div><div class='del'>-              2200 / (1 + (^ (3435 / 298.15 - 3435 / (273.15 + @))))</div><div class='add'>+  compute tempx 1 / (1 / 298.15 - (` (2200 / @ - 1)) / 3435) - 273.15,</div><div class='add'>+		2200 / (1 + (^ (3435 / 298.15 - 3435 / (273.15 + @))))</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Fan Speed Control</div><div class='hunk'>@@ -176,31 +190,37 @@ registers in the VT1211 and programming one set is sufficient (actually only</div><div class='ctx'> the first set pwm1_auto_point[1-4]_temp is writable, the second set is</div><div class='ctx'> read-only).</div><div class='ctx'> </div><div class='add'>+========================== =========================================</div><div class='ctx'> PWM Auto Point             PWM Output Duty-Cycle</div><div class='del'>-------------------------------------------------</div><div class='add'>+========================== =========================================</div><div class='ctx'> pwm[1-2]_auto_point4_pwm   full speed duty-cycle (hard-wired to 255)</div><div class='ctx'> pwm[1-2]_auto_point3_pwm   high speed duty-cycle</div><div class='ctx'> pwm[1-2]_auto_point2_pwm   low speed duty-cycle</div><div class='ctx'> pwm[1-2]_auto_point1_pwm   off duty-cycle (hard-wired to 0)</div><div class='add'>+========================== =========================================</div><div class='ctx'> </div><div class='add'>+==========================  =================</div><div class='ctx'> Temp Auto Point             Thermal Threshold</div><div class='del'>----------------------------------------------</div><div class='add'>+==========================  =================</div><div class='ctx'> pwm[1-2]_auto_point4_temp   full speed temp</div><div class='ctx'> pwm[1-2]_auto_point3_temp   high speed temp</div><div class='ctx'> pwm[1-2]_auto_point2_temp   low speed temp</div><div class='ctx'> pwm[1-2]_auto_point1_temp   off temp</div><div class='add'>+==========================  =================</div><div class='ctx'> </div><div class='ctx'> Long story short, the controller implements the following algorithm to set the</div><div class='ctx'> PWM output duty-cycle based on the input temperature:</div><div class='ctx'> </div><div class='del'>-Thermal Threshold             Output Duty-Cycle</div><div class='del'>-                    (Rising Temp)           (Falling Temp)</div><div class='del'>-----------------------------------------------------------</div><div class='del'>-                    full speed duty-cycle   full speed duty-cycle</div><div class='add'>+=================== ======================= ========================</div><div class='add'>+Thermal Threshold   Output Duty-Cycle       Output Duty-Cycle</div><div class='add'>+		    (Rising Temp)           (Falling Temp)</div><div class='add'>+=================== ======================= ========================</div><div class='add'>+-                   full speed duty-cycle   full speed duty-cycle</div><div class='ctx'> full speed temp</div><div class='del'>-                    high speed duty-cycle   full speed duty-cycle</div><div class='add'>+-		    high speed duty-cycle   full speed duty-cycle</div><div class='ctx'> high speed temp</div><div class='del'>-                    low speed duty-cycle    high speed duty-cycle</div><div class='add'>+-		    low speed duty-cycle    high speed duty-cycle</div><div class='ctx'> low speed temp</div><div class='del'>-                    off duty-cycle          low speed duty-cycle</div><div class='add'>+-		    off duty-cycle          low speed duty-cycle</div><div class='ctx'> off temp</div><div class='add'>+=================== ======================= ========================</div><div class='head'>diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf.rst<br/>index 735c42a85ead..74d19ef11e1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83627ehf?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83627ehf</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83627ehf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83627ehf.rst</a></div><div class='hunk'>@@ -2,45 +2,79 @@ Kernel driver w83627ehf</div><div class='ctx'> =======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Winbond W83627EHF/EHG (ISA access ONLY)</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83627ehf'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: not available</div><div class='add'>+</div><div class='ctx'>   * Winbond W83627DHG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83627dhg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: not available</div><div class='add'>+</div><div class='ctx'>   * Winbond W83627DHG-P</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83627dhg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: not available</div><div class='add'>+</div><div class='ctx'>   * Winbond W83627UHG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83627uhg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: available from www.nuvoton.com</div><div class='add'>+</div><div class='ctx'>   * Winbond W83667HG</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83667hg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: not available</div><div class='add'>+</div><div class='ctx'>   * Winbond W83667HG-B</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83667hg'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6775F/W83667HG-I</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6775'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='add'>+</div><div class='ctx'>   * Nuvoton NCT6776F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'nct6776'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: ISA address retrieved from Super I/O registers</div><div class='add'>+</div><div class='ctx'>     Datasheet: Available from Nuvoton upon request</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='del'>-        Yuan Mu (Winbond)</div><div class='del'>-        Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='del'>-        David Hubbard &lt;david.c.hubbard@gmail.com&gt;</div><div class='del'>-        Gong Jun &lt;JGong@nuvoton.com&gt;</div><div class='add'>+</div><div class='add'>+	- Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+	- Yuan Mu (Winbond)</div><div class='add'>+	- Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='add'>+	- David Hubbard &lt;david.c.hubbard@gmail.com&gt;</div><div class='add'>+	- Gong Jun &lt;JGong@nuvoton.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='hunk'>@@ -85,25 +119,30 @@ predefined temperature range. If the temperature goes out of range, fan</div><div class='ctx'> is driven slower/faster to reach the predefined range again.</div><div class='ctx'> </div><div class='ctx'> The mode works for fan1-fan4. Mapping of temperatures to pwm outputs is as</div><div class='del'>-follows:</div><div class='add'>+follows::</div><div class='ctx'> </div><div class='del'>-temp1 -&gt; pwm1</div><div class='del'>-temp2 -&gt; pwm2</div><div class='del'>-temp3 -&gt; pwm3 (not on 627UHG)</div><div class='del'>-prog  -&gt; pwm4 (not on 667HG and 667HG-B; the programmable setting is not</div><div class='del'>-	       supported by the driver)</div><div class='add'>+  temp1 -&gt; pwm1</div><div class='add'>+  temp2 -&gt; pwm2</div><div class='add'>+  temp3 -&gt; pwm3 (not on 627UHG)</div><div class='add'>+  prog  -&gt; pwm4 (not on 667HG and 667HG-B; the programmable setting is not</div><div class='add'>+		 supported by the driver)</div><div class='ctx'> </div><div class='ctx'> /sys files</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='del'>-name - this is a standard hwmon device entry, it contains the name of</div><div class='del'>-       the device (see the prefix in the list of supported devices at</div><div class='del'>-       the top of this file)</div><div class='add'>+name</div><div class='add'>+	this is a standard hwmon device entry, it contains the name of</div><div class='add'>+	the device (see the prefix in the list of supported devices at</div><div class='add'>+	the top of this file)</div><div class='add'>+</div><div class='add'>+pwm[1-4]</div><div class='add'>+	this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='ctx'> </div><div class='del'>-pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='ctx'> 	   0 (stop) to 255 (full)</div><div class='ctx'> </div><div class='del'>-pwm[1-4]_enable - this file controls mode of fan/temperature control:</div><div class='add'>+pwm[1-4]_enable</div><div class='add'>+	this file controls mode of fan/temperature control:</div><div class='add'>+</div><div class='ctx'> 	* 1 Manual mode, write to pwm file any value 0-255 (full speed)</div><div class='ctx'> 	* 2 "Thermal Cruise" mode</div><div class='ctx'> 	* 3 "Fan Speed Cruise" mode</div><div class='hunk'>@@ -121,33 +160,43 @@ pwm[1-4]_enable - this file controls mode of fan/temperature control:</div><div class='ctx'> 	returned when reading pwm attributes is unrelated to SmartFan IV</div><div class='ctx'> 	operation.</div><div class='ctx'> </div><div class='del'>-pwm[1-4]_mode - controls if output is PWM or DC level</div><div class='del'>-        * 0 DC output (0 - 12v)</div><div class='del'>-        * 1 PWM output</div><div class='add'>+pwm[1-4]_mode</div><div class='add'>+	controls if output is PWM or DC level</div><div class='add'>+</div><div class='add'>+	* 0 DC output (0 - 12v)</div><div class='add'>+	* 1 PWM output</div><div class='ctx'> </div><div class='ctx'> Thermal Cruise mode</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='ctx'> If the temperature is in the range defined by:</div><div class='ctx'> </div><div class='del'>-pwm[1-4]_target    - set target temperature, unit millidegree Celsius</div><div class='del'>-		     (range 0 - 127000)</div><div class='del'>-pwm[1-4]_tolerance - tolerance, unit millidegree Celsius (range 0 - 15000)</div><div class='add'>+pwm[1-4]_target</div><div class='add'>+		   set target temperature, unit millidegree Celsius</div><div class='add'>+		   (range 0 - 127000)</div><div class='add'>+pwm[1-4]_tolerance</div><div class='add'>+		   tolerance, unit millidegree Celsius (range 0 - 15000)</div><div class='ctx'> </div><div class='ctx'> there are no changes to fan speed. Once the temperature leaves the interval,</div><div class='ctx'> fan speed increases (temp is higher) or decreases if lower than desired.</div><div class='ctx'> There are defined steps and times, but not exported by the driver yet.</div><div class='ctx'> </div><div class='del'>-pwm[1-4]_min_output - minimum fan speed (range 1 - 255), when the temperature</div><div class='del'>-                      is below defined range.</div><div class='del'>-pwm[1-4]_stop_time  - how many milliseconds [ms] must elapse to switch</div><div class='del'>-                      corresponding fan off. (when the temperature was below</div><div class='del'>-                      defined range).</div><div class='del'>-pwm[1-4]_start_output-minimum fan speed (range 1 - 255) when spinning up</div><div class='del'>-pwm[1-4]_step_output- rate of fan speed change (1 - 255)</div><div class='del'>-pwm[1-4]_stop_output- minimum fan speed (range 1 - 255) when spinning down</div><div class='del'>-pwm[1-4]_max_output - maximum fan speed (range 1 - 255), when the temperature</div><div class='del'>-                      is above defined range.</div><div class='add'>+pwm[1-4]_min_output</div><div class='add'>+		   minimum fan speed (range 1 - 255), when the temperature</div><div class='add'>+		   is below defined range.</div><div class='add'>+pwm[1-4]_stop_time</div><div class='add'>+		   how many milliseconds [ms] must elapse to switch</div><div class='add'>+		   corresponding fan off. (when the temperature was below</div><div class='add'>+		   defined range).</div><div class='add'>+pwm[1-4]_start_output</div><div class='add'>+		   minimum fan speed (range 1 - 255) when spinning up</div><div class='add'>+pwm[1-4]_step_output</div><div class='add'>+		   rate of fan speed change (1 - 255)</div><div class='add'>+pwm[1-4]_stop_output</div><div class='add'>+		   minimum fan speed (range 1 - 255) when spinning down</div><div class='add'>+pwm[1-4]_max_output</div><div class='add'>+		   maximum fan speed (range 1 - 255), when the temperature</div><div class='add'>+		   is above defined range.</div><div class='ctx'> </div><div class='ctx'> Note: last six functions are influenced by other control bits, not yet exported</div><div class='ctx'>       by the driver, so a change might not have any effect.</div><div class='hunk'>@@ -161,26 +210,35 @@ different power-on default values, but BIOS should already be loading</div><div class='ctx'> appropriate defaults. Note that bank selection must be performed as is currently</div><div class='ctx'> done in the driver for all register addresses.</div><div class='ctx'> </div><div class='del'>-0x49:  only on DHG, selects temperature source for AUX fan, CPU fan0</div><div class='del'>-0x4a:  not completely documented for the EHF and the DHG documentation assigns</div><div class='del'>-       different behavior to bits 7 and 6, including extending the temperature</div><div class='del'>-       input selection to SmartFan I, not just SmartFan III. Testing on the EHF</div><div class='del'>-       will reveal whether they are compatible or not.</div><div class='del'>-</div><div class='del'>-0x58:  Chip ID: 0xa1=EHF 0xc1=DHG</div><div class='del'>-0x5e:  only on DHG, has bits to enable "current mode" temperature detection and</div><div class='del'>-       critical temperature protection</div><div class='del'>-0x45b: only on EHF, bit 3, vin4 alarm (EHF supports 10 inputs, only 9 on DHG)</div><div class='del'>-0x552: only on EHF, vin4</div><div class='del'>-0x558: only on EHF, vin4 high limit</div><div class='del'>-0x559: only on EHF, vin4 low limit</div><div class='del'>-0x6b:  only on DHG, SYS fan critical temperature</div><div class='del'>-0x6c:  only on DHG, CPU fan0 critical temperature</div><div class='del'>-0x6d:  only on DHG, AUX fan critical temperature</div><div class='del'>-0x6e:  only on DHG, CPU fan1 critical temperature</div><div class='del'>-</div><div class='del'>-0x50-0x55 and 0x650-0x657 are marked "Test Register" for the EHF, but "Reserved</div><div class='del'>-       Register" for the DHG</div><div class='add'>+========================= =====================================================</div><div class='add'>+Register(s)		  Meaning</div><div class='add'>+========================= =====================================================</div><div class='add'>+0x49                      only on DHG, selects temperature source for AUX fan,</div><div class='add'>+			  CPU fan0</div><div class='add'>+0x4a                      not completely documented for the EHF and the DHG</div><div class='add'>+			  documentation assigns different behavior to bits 7</div><div class='add'>+			  and 6, including extending the temperature input</div><div class='add'>+			  selection to SmartFan I, not just SmartFan III.</div><div class='add'>+			  Testing on the EHF will reveal whether they are</div><div class='add'>+			  compatible or not.</div><div class='add'>+0x58                      Chip ID: 0xa1=EHF 0xc1=DHG</div><div class='add'>+0x5e                      only on DHG, has bits to enable "current mode"</div><div class='add'>+			  temperature detection and critical temperature</div><div class='add'>+			  protection</div><div class='add'>+0x45b                     only on EHF, bit 3, vin4 alarm (EHF supports 10</div><div class='add'>+			  inputs, only 9 on DHG)</div><div class='add'>+0x552                     only on EHF, vin4</div><div class='add'>+0x558                     only on EHF, vin4 high limit</div><div class='add'>+0x559                     only on EHF, vin4 low limit</div><div class='add'>+0x6b                      only on DHG, SYS fan critical temperature</div><div class='add'>+0x6c                      only on DHG, CPU fan0 critical temperature</div><div class='add'>+0x6d                      only on DHG, AUX fan critical temperature</div><div class='add'>+0x6e                      only on DHG, CPU fan1 critical temperature</div><div class='add'>+0x50-0x55 and 0x650-0x657 marked as:</div><div class='add'>+</div><div class='add'>+			    - "Test Register" for the EHF</div><div class='add'>+			    - "Reserved Register" for the DHG</div><div class='add'>+========================= =====================================================</div><div class='ctx'> </div><div class='ctx'> The DHG also supports PECI, where the DHG queries Intel CPU temperatures, and</div><div class='ctx'> the ICH8 southbridge gets that data via PECI from the DHG, so that the</div><div class='head'>diff --git a/Documentation/hwmon/w83627hf b/Documentation/hwmon/w83627hf.rst<br/>index 8432e1118173..d1406c28dee7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83627hf?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83627hf</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83627hf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83627hf.rst</a></div><div class='hunk'>@@ -20,10 +20,10 @@ Supported chips:</div><div class='ctx'>     Datasheet: Provided by Winbond on request(http://www.winbond.com/hq/enu)</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='del'>-        Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='del'>-        Bernhard C. Schrenk &lt;clemy@clemy.org&gt;</div><div class='add'>+	Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+	Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='add'>+	Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;,</div><div class='add'>+	Bernhard C. Schrenk &lt;clemy@clemy.org&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='hunk'>@@ -52,8 +52,8 @@ If you really want i2c accesses for these Super I/O chips,</div><div class='ctx'> use the w83781d driver. However this is not the preferred method</div><div class='ctx'> now that this ISA driver has been developed.</div><div class='ctx'> </div><div class='del'>-The w83627_HF_ uses pins 110-106 as VID0-VID4. The w83627_THF_ uses the</div><div class='del'>-same pins as GPIO[0:4]. Technically, the w83627_THF_ does not support a</div><div class='add'>+The `w83627_HF_` uses pins 110-106 as VID0-VID4. The `w83627_THF_` uses the</div><div class='add'>+same pins as GPIO[0:4]. Technically, the `w83627_THF_` does not support a</div><div class='ctx'> VID reading. However the two chips have the identical 128 pin package. So,</div><div class='ctx'> it is possible or even likely for a w83627thf to have the VID signals routed</div><div class='ctx'> to these pins despite their not being labeled for that purpose. Therefore,</div><div class='hunk'>@@ -75,19 +75,23 @@ module parameter is gone for technical reasons. If you need this feature,</div><div class='ctx'> you can obtain the same result by using the isaset tool (part of</div><div class='ctx'> lm-sensors) before loading the driver:</div><div class='ctx'> </div><div class='del'>-# Enter the Super I/O config space</div><div class='del'>-isaset -y -f 0x2e 0x87</div><div class='del'>-isaset -y -f 0x2e 0x87</div><div class='add'>+# Enter the Super I/O config space::</div><div class='ctx'> </div><div class='del'>-# Select the hwmon logical device</div><div class='del'>-isaset -y 0x2e 0x2f 0x07 0x0b</div><div class='add'>+	isaset -y -f 0x2e 0x87</div><div class='add'>+	isaset -y -f 0x2e 0x87</div><div class='ctx'> </div><div class='del'>-# Set the base I/O address (to 0x290 in this example)</div><div class='del'>-isaset -y 0x2e 0x2f 0x60 0x02</div><div class='del'>-isaset -y 0x2e 0x2f 0x61 0x90</div><div class='add'>+# Select the hwmon logical device::</div><div class='ctx'> </div><div class='del'>-# Exit the Super-I/O config space</div><div class='del'>-isaset -y -f 0x2e 0xaa</div><div class='add'>+	isaset -y 0x2e 0x2f 0x07 0x0b</div><div class='add'>+</div><div class='add'>+# Set the base I/O address (to 0x290 in this example)::</div><div class='add'>+</div><div class='add'>+	isaset -y 0x2e 0x2f 0x60 0x02</div><div class='add'>+	isaset -y 0x2e 0x2f 0x61 0x90</div><div class='add'>+</div><div class='add'>+# Exit the Super-I/O config space::</div><div class='add'>+</div><div class='add'>+	isaset -y -f 0x2e 0xaa</div><div class='ctx'> </div><div class='ctx'> The above sequence assumes a Super-I/O config space at 0x2e/0x2f, but</div><div class='ctx'> 0x4e/0x4f is also possible.</div><div class='hunk'>@@ -97,18 +101,23 @@ Voltage pin mapping</div><div class='ctx'> </div><div class='ctx'> Here is a summary of the voltage pin mapping for the W83627THF. This</div><div class='ctx'> can be useful to convert data provided by board manufacturers into</div><div class='del'>-working libsensors configuration statements.</div><div class='del'>-</div><div class='del'>-    W83627THF		|</div><div class='del'>-  Pin	| Name		| Register	| Sysfs attribute</div><div class='del'>------------------------------------------------------</div><div class='del'>-  100	| CPUVCORE	| 20h		| in0</div><div class='del'>-   99	| VIN0		| 21h		| in1</div><div class='del'>-   98	| VIN1		| 22h		| in2</div><div class='del'>-   97	| VIN2		| 24h		| in4</div><div class='del'>-  114	| AVCC		| 23h		| in3</div><div class='del'>-   61	| 5VSB		| 50h (bank 5)	| in7</div><div class='del'>-   74	| VBAT		| 51h (bank 5)	| in8</div><div class='add'>+working libsensors configuration statements:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- W83627THF</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  ======== =============== =============== ===============</div><div class='add'>+  Pin	   Name		   Register	   Sysfs attribute</div><div class='add'>+  ======== =============== =============== ===============</div><div class='add'>+    100	   CPUVCORE	   20h		   in0</div><div class='add'>+     99	   VIN0		   21h		   in1</div><div class='add'>+     98	   VIN1		   22h		   in2</div><div class='add'>+     97	   VIN2		   24h		   in4</div><div class='add'>+    114	   AVCC		   23h		   in3</div><div class='add'>+     61	   5VSB		   50h (bank 5)	   in7</div><div class='add'>+     74	   VBAT		   51h (bank 5)	   in8</div><div class='add'>+  ======== =============== =============== ===============</div><div class='ctx'> </div><div class='ctx'> For other supported devices, you'll have to take the hard path and</div><div class='ctx'> look up the information in the datasheet yourself (and then add it</div><div class='head'>diff --git a/Documentation/hwmon/w83773g b/Documentation/hwmon/w83773g.rst<br/>index 4cc6c0b8257f..cabaed391414 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83773g?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83773g</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83773g.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83773g.rst</a></div><div class='hunk'>@@ -1,13 +1,18 @@</div><div class='ctx'> Kernel driver w83773g</div><div class='del'>-====================</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Nuvoton W83773G</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83773g'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x4c and 0x4d</div><div class='add'>+</div><div class='ctx'>     Datasheet: https://www.nuvoton.com/resource-files/W83773G_SG_DatasheetV1_2.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='add'>+</div><div class='ctx'> 	Lei YU &lt;mine260309@gmail.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -27,7 +32,4 @@ Resolution for both the local and remote channels is 0.125 degree C.</div><div class='ctx'> The chip supports only temperature measurement. The driver exports</div><div class='ctx'> the temperature values via the following sysfs files:</div><div class='ctx'> </div><div class='del'>-temp[1-3]_input</div><div class='del'>-temp[2-3]_fault</div><div class='del'>-temp[2-3]_offset</div><div class='del'>-update_interval</div><div class='add'>+**temp[1-3]_input, temp[2-3]_fault, temp[2-3]_offset, update_interval**</div><div class='head'>diff --git a/Documentation/hwmon/w83781d b/Documentation/hwmon/w83781d.rst<br/>index 129b0a3b555b..f36d33dfb704 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83781d?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83781d</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83781d.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83781d.rst</a></div><div class='hunk'>@@ -2,44 +2,64 @@ Kernel driver w83781d</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Winbond W83781D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83781d'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/w83781d.pdf</div><div class='add'>+</div><div class='ctx'>   * Winbond W83782D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83782d'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.winbond.com</div><div class='add'>+</div><div class='ctx'>   * Winbond W83783S</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83783s'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2d</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/w83783s.pdf</div><div class='add'>+</div><div class='ctx'>   * Asus AS99127F</div><div class='add'>+</div><div class='ctx'>     Prefix: 'as99127f'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x28 - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: Unavailable from Asus</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Authors:</div><div class='del'>-        Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-        Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='del'>-        Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+</div><div class='add'>+      - Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+      - Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='add'>+      - Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='ctx'> </div><div class='ctx'> Module parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * init int</div><div class='del'>-  (default 1)</div><div class='del'>-  Use 'init=0' to bypass initializing the chip.</div><div class='del'>-  Try this if your computer crashes when you load the module.</div><div class='add'>+    (default 1)</div><div class='add'>+</div><div class='add'>+    Use 'init=0' to bypass initializing the chip.</div><div class='add'>+    Try this if your computer crashes when you load the module.</div><div class='ctx'> </div><div class='ctx'> * reset int</div><div class='del'>-  (default 0)</div><div class='del'>-  The driver used to reset the chip on load, but does no more. Use</div><div class='del'>-  'reset=1' to restore the old behavior. Report if you need to do this.</div><div class='add'>+    (default 0)</div><div class='add'>+    The driver used to reset the chip on load, but does no more. Use</div><div class='add'>+    'reset=1' to restore the old behavior. Report if you need to do this.</div><div class='ctx'> </div><div class='ctx'> force_subclients=bus,caddr,saddr,saddr</div><div class='ctx'>   This is used to force the i2c addresses for subclients of</div><div class='del'>-  a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'</div><div class='add'>+  a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b`</div><div class='ctx'>   to force the subclients of chip 0x2d on bus 0 to i2c addresses</div><div class='ctx'>   0x4a and 0x4b. This parameter is useful for certain Tyan boards.</div><div class='ctx'> </div><div class='hunk'>@@ -54,12 +74,19 @@ There is quite some difference between these chips, but they are similar</div><div class='ctx'> enough that it was sensible to put them together in one driver.</div><div class='ctx'> The Asus chips are similar to an I2C-only W83782D.</div><div class='ctx'> </div><div class='del'>-Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA</div><div class='del'>-as99127f    7       3       0       3       0x31    0x12c3  yes     no</div><div class='del'>-as99127f rev.2 (type_name = as99127f)       0x31    0x5ca3  yes     no</div><div class='del'>-w83781d     7       3       0       3       0x10-1  0x5ca3  yes     yes</div><div class='del'>-w83782d     9       3       2-4     3       0x30    0x5ca3  yes     yes</div><div class='del'>-w83783s     5-6     3       2       1-2     0x40    0x5ca3  yes     no</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='add'>+| Chip     | #vin    | #fanin | #pwm  | #temp | wchipid | vendid | i2c  | ISA |</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='add'>+| as99127f | 7       | 3      | 0     | 3     | 0x31    | 0x12c3 | yes  |  no |</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='add'>+| as99127f rev.2 (type_name = as99127f)       | 0x31    | 0x5ca3 | yes  |  no |</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='add'>+| w83781d  | 7       | 3      | 0     | 3     | 0x10-1  | 0x5ca3 | yes  | yes |</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='add'>+| w83782d  | 9       | 3      | 2-4   | 3     | 0x30    | 0x5ca3 | yes  | yes |</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='add'>+| w83783s  | 5-6     | 3      | 2     |  1-2  | 0x40    | 0x5ca3 | yes  |  no |</div><div class='add'>++----------+---------+--------+-------+-------+---------+--------+------+-----+</div><div class='ctx'> </div><div class='ctx'> Detection of these chips can sometimes be foiled because they can be in</div><div class='ctx'> an internal state that allows no clean access. If you know the address</div><div class='hunk'>@@ -124,22 +151,24 @@ or only the beeping for some alarms.</div><div class='ctx'> </div><div class='ctx'> Individual alarm and beep bits:</div><div class='ctx'> </div><div class='del'>-0x000001: in0</div><div class='del'>-0x000002: in1</div><div class='del'>-0x000004: in2</div><div class='del'>-0x000008: in3</div><div class='del'>-0x000010: temp1</div><div class='del'>-0x000020: temp2 (+temp3 on W83781D)</div><div class='del'>-0x000040: fan1</div><div class='del'>-0x000080: fan2</div><div class='del'>-0x000100: in4</div><div class='del'>-0x000200: in5</div><div class='del'>-0x000400: in6</div><div class='del'>-0x000800: fan3</div><div class='del'>-0x001000: chassis</div><div class='del'>-0x002000: temp3 (W83782D only)</div><div class='del'>-0x010000: in7 (W83782D only)</div><div class='del'>-0x020000: in8 (W83782D only)</div><div class='add'>+======== ==========================</div><div class='add'>+0x000001 in0</div><div class='add'>+0x000002 in1</div><div class='add'>+0x000004 in2</div><div class='add'>+0x000008 in3</div><div class='add'>+0x000010 temp1</div><div class='add'>+0x000020 temp2 (+temp3 on W83781D)</div><div class='add'>+0x000040 fan1</div><div class='add'>+0x000080 fan2</div><div class='add'>+0x000100 in4</div><div class='add'>+0x000200 in5</div><div class='add'>+0x000400 in6</div><div class='add'>+0x000800 fan3</div><div class='add'>+0x001000 chassis</div><div class='add'>+0x002000 temp3 (W83782D only)</div><div class='add'>+0x010000 in7 (W83782D only)</div><div class='add'>+0x020000 in8 (W83782D only)</div><div class='add'>+======== ==========================</div><div class='ctx'> </div><div class='ctx'> If an alarm triggers, it will remain triggered until the hardware register</div><div class='ctx'> is read at least once. This means that the cause for the alarm may</div><div class='hunk'>@@ -179,68 +208,74 @@ Please do not send mail to the author or the sensors group asking for</div><div class='ctx'> a datasheet or ideas on how to convince Asus. We can't help.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-NOTES:</div><div class='add'>+NOTES</div><div class='ctx'> -----</div><div class='ctx'>   783s has no in1 so that in[2-6] are compatible with the 781d/782d.</div><div class='ctx'> </div><div class='ctx'>   783s pin is programmable for -5V or temp1; defaults to -5V,</div><div class='del'>-       no control in driver so temp1 doesn't work.</div><div class='add'>+  no control in driver so temp1 doesn't work.</div><div class='ctx'> </div><div class='ctx'>   782d and 783s datasheets differ on which is pwm1 and which is pwm2.</div><div class='del'>-       We chose to follow 782d.</div><div class='add'>+  We chose to follow 782d.</div><div class='ctx'> </div><div class='ctx'>   782d and 783s pin is programmable for fan3 input or pwm2 output;</div><div class='del'>-       defaults to fan3 input.</div><div class='del'>-       If pwm2 is enabled (with echo 255 1 &gt; pwm2), then</div><div class='del'>-       fan3 will report 0.</div><div class='add'>+  defaults to fan3 input.</div><div class='add'>+  If pwm2 is enabled (with echo 255 1 &gt; pwm2), then</div><div class='add'>+  fan3 will report 0.</div><div class='ctx'> </div><div class='ctx'>   782d has pwm1-2 for ISA, pwm1-4 for i2c. (pwm3-4 share pins with</div><div class='del'>-       the ISA pins)</div><div class='add'>+  the ISA pins)</div><div class='ctx'> </div><div class='del'>-Data sheet updates:</div><div class='add'>+Data sheet updates</div><div class='ctx'> ------------------</div><div class='ctx'> 	- PWM clock registers:</div><div class='del'>-</div><div class='del'>-		000: master /  512</div><div class='del'>-		001: master / 1024</div><div class='del'>-		010: master / 2048</div><div class='del'>-		011: master / 4096</div><div class='del'>-		100: master / 8192</div><div class='add'>+		* 000: master /  512</div><div class='add'>+		* 001: master / 1024</div><div class='add'>+		* 010: master / 2048</div><div class='add'>+		* 011: master / 4096</div><div class='add'>+		* 100: master / 8192</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Answers from Winbond tech support</div><div class='ctx'> ---------------------------------</div><div class='del'>-&gt;</div><div class='del'>-&gt; 1) In the W83781D data sheet section 7.2 last paragraph, it talks about</div><div class='del'>-&gt;    reprogramming the R-T table if the Beta of the thermistor is not</div><div class='del'>-&gt;    3435K. The R-T table is described briefly in section 8.20.</div><div class='del'>-&gt;    What formulas do I use to program a new R-T table for a given Beta?</div><div class='del'>-&gt;</div><div class='del'>-	We are sorry that the calculation for R-T table value is</div><div class='del'>-confidential. If you have another Beta value of thermistor, we can help</div><div class='del'>-to calculate the R-T table for you. But you should give us real R-T</div><div class='del'>-Table which can be gotten by thermistor vendor. Therefore we will calculate</div><div class='del'>-them and obtain 32-byte data, and you can fill the 32-byte data to the</div><div class='del'>-register in Bank0.CR51 of W83781D.</div><div class='ctx'> </div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  &gt;</div><div class='add'>+  &gt; 1) In the W83781D data sheet section 7.2 last paragraph, it talks about</div><div class='add'>+  &gt;    reprogramming the R-T table if the Beta of the thermistor is not</div><div class='add'>+  &gt;    3435K. The R-T table is described briefly in section 8.20.</div><div class='add'>+  &gt;    What formulas do I use to program a new R-T table for a given Beta?</div><div class='add'>+  &gt;</div><div class='add'>+</div><div class='add'>+  We are sorry that the calculation for R-T table value is</div><div class='add'>+  confidential. If you have another Beta value of thermistor, we can help</div><div class='add'>+  to calculate the R-T table for you. But you should give us real R-T</div><div class='add'>+  Table which can be gotten by thermistor vendor. Therefore we will calculate</div><div class='add'>+  them and obtain 32-byte data, and you can fill the 32-byte data to the</div><div class='add'>+  register in Bank0.CR51 of W83781D.</div><div class='ctx'> </div><div class='del'>-&gt; 2) In the W83782D data sheet, it mentions that pins 38, 39, and 40 are</div><div class='del'>-&gt;    programmable to be either thermistor or Pentium II diode inputs.</div><div class='del'>-&gt;    How do I program them for diode inputs? I can't find any register</div><div class='del'>-&gt;    to program these to be diode inputs.</div><div class='del'>- --&gt; You may program Bank0 CR[5Dh] and CR[59h] registers.</div><div class='ctx'> </div><div class='del'>- 	CR[5Dh]    		bit 1(VTIN1)    bit 2(VTIN2)   bit 3(VTIN3)</div><div class='add'>+  &gt; 2) In the W83782D data sheet, it mentions that pins 38, 39, and 40 are</div><div class='add'>+  &gt;    programmable to be either thermistor or Pentium II diode inputs.</div><div class='add'>+  &gt;    How do I program them for diode inputs? I can't find any register</div><div class='add'>+  &gt;    to program these to be diode inputs.</div><div class='ctx'> </div><div class='del'>-      	thermistor                0		 0		0</div><div class='del'>- 	diode 		          1		 1		1</div><div class='add'>+  You may program Bank0 CR[5Dh] and CR[59h] registers.</div><div class='ctx'> </div><div class='add'>+  =============================== =============== ============== ============</div><div class='add'>+	CR[5Dh]    		bit 1(VTIN1)    bit 2(VTIN2)   bit 3(VTIN3)</div><div class='ctx'> </div><div class='del'>-(error) CR[59h] 		bit 4(VTIN1)	bit 2(VTIN2)   bit 3(VTIN3)</div><div class='del'>-(right) CR[59h] 		bit 4(VTIN1)	bit 5(VTIN2)   bit 6(VTIN3)</div><div class='add'>+		thermistor                0		 0		0</div><div class='add'>+	diode 			  1		 1		1</div><div class='ctx'> </div><div class='del'>- 	PII thermal diode         1		 1		1</div><div class='del'>- 	2N3904	diode	          0		 0		0</div><div class='add'>+</div><div class='add'>+  (error) CR[59h] 		bit 4(VTIN1)	bit 2(VTIN2)   bit 3(VTIN3)</div><div class='add'>+  (right) CR[59h] 		bit 4(VTIN1)	bit 5(VTIN2)   bit 6(VTIN3)</div><div class='add'>+</div><div class='add'>+	PII thermal diode         1		 1		1</div><div class='add'>+	2N3904	diode		  0		 0		0</div><div class='add'>+  =============================== =============== ============== ============</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Asus Clones</div><div class='hunk'>@@ -251,18 +286,21 @@ Here are some very useful information that were given to us by Alex Van</div><div class='ctx'> Kaam about how to detect these chips, and how to read their values. He</div><div class='ctx'> also gives advice for another Asus chipset, the Mozart-2 (which we</div><div class='ctx'> don't support yet). Thanks Alex!</div><div class='add'>+</div><div class='ctx'> I reworded some parts and added personal comments.</div><div class='ctx'> </div><div class='del'>-# Detection:</div><div class='add'>+Detection</div><div class='add'>+^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> AS99127F rev.1, AS99127F rev.2 and ASB100:</div><div class='ctx'> - I2C address range: 0x29 - 0x2F</div><div class='del'>-- If register 0x58 holds 0x31 then we have an Asus (either ASB100 or</div><div class='del'>-  AS99127F)</div><div class='add'>+- If register 0x58 holds 0x31 then we have an Asus (either ASB100 or AS99127F)</div><div class='ctx'> - Which one depends on register 0x4F (manufacturer ID):</div><div class='del'>-  0x06 or 0x94: ASB100</div><div class='del'>-  0x12 or 0xC3: AS99127F rev.1</div><div class='del'>-  0x5C or 0xA3: AS99127F rev.2</div><div class='add'>+</div><div class='add'>+  - 0x06 or 0x94: ASB100</div><div class='add'>+  - 0x12 or 0xC3: AS99127F rev.1</div><div class='add'>+  - 0x5C or 0xA3: AS99127F rev.2</div><div class='add'>+</div><div class='ctx'>   Note that 0x5CA3 is Winbond's ID (WEC), which let us think Asus get their</div><div class='ctx'>   AS99127F rev.2 direct from Winbond. The other codes mean ATT and DVC,</div><div class='ctx'>   respectively. ATT could stand for Asustek something (although it would be</div><div class='hunk'>@@ -273,88 +311,103 @@ Mozart-2:</div><div class='ctx'> - I2C address: 0x77</div><div class='ctx'> - If register 0x58 holds 0x56 or 0x10 then we have a Mozart-2</div><div class='ctx'> - Of the Mozart there are 3 types:</div><div class='del'>-  0x58=0x56, 0x4E=0x94, 0x4F=0x36: Asus ASM58 Mozart-2</div><div class='del'>-  0x58=0x56, 0x4E=0x94, 0x4F=0x06: Asus AS2K129R Mozart-2</div><div class='del'>-  0x58=0x10, 0x4E=0x5C, 0x4F=0xA3: Asus ??? Mozart-2</div><div class='add'>+</div><div class='add'>+  - 0x58=0x56, 0x4E=0x94, 0x4F=0x36: Asus ASM58 Mozart-2</div><div class='add'>+  - 0x58=0x56, 0x4E=0x94, 0x4F=0x06: Asus AS2K129R Mozart-2</div><div class='add'>+  - 0x58=0x10, 0x4E=0x5C, 0x4F=0xA3: Asus ??? Mozart-2</div><div class='add'>+</div><div class='ctx'>   You can handle all 3 the exact same way :)</div><div class='ctx'> </div><div class='del'>-# Temperature sensors:</div><div class='add'>+Temperature sensors</div><div class='add'>+^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> ASB100:</div><div class='del'>-- sensor 1: register 0x27</div><div class='del'>-- sensor 2 &amp; 3 are the 2 LM75's on the SMBus</div><div class='del'>-- sensor 4: register 0x17</div><div class='del'>-Remark: I noticed that on Intel boards sensor 2 is used for the CPU</div><div class='add'>+  - sensor 1: register 0x27</div><div class='add'>+  - sensor 2 &amp; 3 are the 2 LM75's on the SMBus</div><div class='add'>+  - sensor 4: register 0x17</div><div class='add'>+</div><div class='add'>+Remark:</div><div class='add'>+</div><div class='add'>+  I noticed that on Intel boards sensor 2 is used for the CPU</div><div class='ctx'>   and 4 is ignored/stuck, on AMD boards sensor 4 is the CPU and sensor 2 is</div><div class='ctx'>   either ignored or a socket temperature.</div><div class='ctx'> </div><div class='ctx'> AS99127F (rev.1 and 2 alike):</div><div class='del'>-- sensor 1: register 0x27</div><div class='del'>-- sensor 2 &amp; 3 are the 2 LM75's on the SMBus</div><div class='del'>-Remark: Register 0x5b is suspected to be temperature type selector. Bit 1</div><div class='add'>+  - sensor 1: register 0x27</div><div class='add'>+  - sensor 2 &amp; 3 are the 2 LM75's on the SMBus</div><div class='add'>+</div><div class='add'>+Remark:</div><div class='add'>+</div><div class='add'>+  Register 0x5b is suspected to be temperature type selector. Bit 1</div><div class='ctx'>   would control temp1, bit 3 temp2 and bit 5 temp3.</div><div class='ctx'> </div><div class='ctx'> Mozart-2:</div><div class='del'>-- sensor 1: register 0x27</div><div class='del'>-- sensor 2: register 0x13</div><div class='add'>+  - sensor 1: register 0x27</div><div class='add'>+  - sensor 2: register 0x13</div><div class='ctx'> </div><div class='del'>-# Fan sensors:</div><div class='add'>+Fan sensors</div><div class='add'>+^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> ASB100, AS99127F (rev.1 and 2 alike):</div><div class='del'>-- 3 fans, identical to the W83781D</div><div class='add'>+  - 3 fans, identical to the W83781D</div><div class='ctx'> </div><div class='ctx'> Mozart-2:</div><div class='del'>-- 2 fans only, 1350000/RPM/div</div><div class='del'>-- fan 1: register 0x28,  divisor on register 0xA1 (bits 4-5)</div><div class='del'>-- fan 2: register 0x29,  divisor on register 0xA1 (bits 6-7)</div><div class='add'>+  - 2 fans only, 1350000/RPM/div</div><div class='add'>+  - fan 1: register 0x28,  divisor on register 0xA1 (bits 4-5)</div><div class='add'>+  - fan 2: register 0x29,  divisor on register 0xA1 (bits 6-7)</div><div class='ctx'> </div><div class='del'>-# Voltages:</div><div class='add'>+Voltages</div><div class='add'>+^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> This is where there is a difference between AS99127F rev.1 and 2.</div><div class='del'>-Remark: The difference is similar to the difference between</div><div class='add'>+</div><div class='add'>+Remark:</div><div class='add'>+</div><div class='add'>+  The difference is similar to the difference between</div><div class='ctx'>   W83781D and W83782D.</div><div class='ctx'> </div><div class='ctx'> ASB100:</div><div class='del'>-in0=r(0x20)*0.016</div><div class='del'>-in1=r(0x21)*0.016</div><div class='del'>-in2=r(0x22)*0.016</div><div class='del'>-in3=r(0x23)*0.016*1.68</div><div class='del'>-in4=r(0x24)*0.016*3.8</div><div class='del'>-in5=r(0x25)*(-0.016)*3.97</div><div class='del'>-in6=r(0x26)*(-0.016)*1.666</div><div class='add'>+  - in0=r(0x20)*0.016</div><div class='add'>+  - in1=r(0x21)*0.016</div><div class='add'>+  - in2=r(0x22)*0.016</div><div class='add'>+  - in3=r(0x23)*0.016*1.68</div><div class='add'>+  - in4=r(0x24)*0.016*3.8</div><div class='add'>+  - in5=r(0x25)*(-0.016)*3.97</div><div class='add'>+  - in6=r(0x26)*(-0.016)*1.666</div><div class='ctx'> </div><div class='ctx'> AS99127F rev.1:</div><div class='del'>-in0=r(0x20)*0.016</div><div class='del'>-in1=r(0x21)*0.016</div><div class='del'>-in2=r(0x22)*0.016</div><div class='del'>-in3=r(0x23)*0.016*1.68</div><div class='del'>-in4=r(0x24)*0.016*3.8</div><div class='del'>-in5=r(0x25)*(-0.016)*3.97</div><div class='del'>-in6=r(0x26)*(-0.016)*1.503</div><div class='add'>+  - in0=r(0x20)*0.016</div><div class='add'>+  - in1=r(0x21)*0.016</div><div class='add'>+  - in2=r(0x22)*0.016</div><div class='add'>+  - in3=r(0x23)*0.016*1.68</div><div class='add'>+  - in4=r(0x24)*0.016*3.8</div><div class='add'>+  - in5=r(0x25)*(-0.016)*3.97</div><div class='add'>+  - in6=r(0x26)*(-0.016)*1.503</div><div class='ctx'> </div><div class='ctx'> AS99127F rev.2:</div><div class='del'>-in0=r(0x20)*0.016</div><div class='del'>-in1=r(0x21)*0.016</div><div class='del'>-in2=r(0x22)*0.016</div><div class='del'>-in3=r(0x23)*0.016*1.68</div><div class='del'>-in4=r(0x24)*0.016*3.8</div><div class='del'>-in5=(r(0x25)*0.016-3.6)*5.14+3.6</div><div class='del'>-in6=(r(0x26)*0.016-3.6)*3.14+3.6</div><div class='add'>+  - in0=r(0x20)*0.016</div><div class='add'>+  - in1=r(0x21)*0.016</div><div class='add'>+  - in2=r(0x22)*0.016</div><div class='add'>+  - in3=r(0x23)*0.016*1.68</div><div class='add'>+  - in4=r(0x24)*0.016*3.8</div><div class='add'>+  - in5=(r(0x25)*0.016-3.6)*5.14+3.6</div><div class='add'>+  - in6=(r(0x26)*0.016-3.6)*3.14+3.6</div><div class='ctx'> </div><div class='ctx'> Mozart-2:</div><div class='del'>-in0=r(0x20)*0.016</div><div class='del'>-in1=255</div><div class='del'>-in2=r(0x22)*0.016</div><div class='del'>-in3=r(0x23)*0.016*1.68</div><div class='del'>-in4=r(0x24)*0.016*4</div><div class='del'>-in5=255</div><div class='del'>-in6=255</div><div class='add'>+  - in0=r(0x20)*0.016</div><div class='add'>+  - in1=255</div><div class='add'>+  - in2=r(0x22)*0.016</div><div class='add'>+  - in3=r(0x23)*0.016*1.68</div><div class='add'>+  - in4=r(0x24)*0.016*4</div><div class='add'>+  - in5=255</div><div class='add'>+  - in6=255</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-# PWM</div><div class='add'>+PWM</div><div class='add'>+^^^</div><div class='ctx'> </div><div class='ctx'> * Additional info about PWM on the AS99127F (may apply to other Asus</div><div class='del'>-chips as well) by Jean Delvare as of 2004-04-09:</div><div class='add'>+  chips as well) by Jean Delvare as of 2004-04-09:</div><div class='ctx'> </div><div class='ctx'> AS99127F revision 2 seems to have two PWM registers at 0x59 and 0x5A,</div><div class='ctx'> and a temperature sensor type selector at 0x5B (which basically means</div><div class='hunk'>@@ -401,15 +454,20 @@ AS99127F chips at all.</div><div class='ctx'> I've been fiddling around with the (in)famous 0x59 register and</div><div class='ctx'> found out the following values do work as a form of coarse pwm:</div><div class='ctx'> </div><div class='del'>-0x80 - seems to turn fans off after some time(1-2 minutes)... might be</div><div class='del'>-some form of auto-fan-control based on temp? hmm (Qfan? this mobo is an</div><div class='del'>-old ASUS, it isn't marketed as Qfan. Maybe some beta pre-attempt at Qfan</div><div class='del'>-that was dropped at the BIOS)</div><div class='del'>-0x81 - off</div><div class='del'>-0x82 - slightly "on-ner" than off, but my fans do not get to move. I can</div><div class='del'>-hear the high-pitched PWM sound that motors give off at too-low-pwm.</div><div class='del'>-0x83 - now they do move. Estimate about 70% speed or so.</div><div class='del'>-0x84-0x8f - full on</div><div class='add'>+0x80</div><div class='add'>+ - seems to turn fans off after some time(1-2 minutes)... might be</div><div class='add'>+   some form of auto-fan-control based on temp? hmm (Qfan? this mobo is an</div><div class='add'>+   old ASUS, it isn't marketed as Qfan. Maybe some beta pre-attempt at Qfan</div><div class='add'>+   that was dropped at the BIOS)</div><div class='add'>+0x81</div><div class='add'>+ - off</div><div class='add'>+0x82</div><div class='add'>+ - slightly "on-ner" than off, but my fans do not get to move. I can</div><div class='add'>+   hear the high-pitched PWM sound that motors give off at too-low-pwm.</div><div class='add'>+0x83</div><div class='add'>+ - now they do move. Estimate about 70% speed or so.</div><div class='add'>+0x84-0x8f</div><div class='add'>+ - full on</div><div class='ctx'> </div><div class='ctx'> Changing the high nibble doesn't seem to do much except the high bit</div><div class='ctx'> (0x80) must be set for PWM to work, else the current pwm doesn't seem to</div><div class='hunk'>@@ -435,6 +493,7 @@ looks like PWM is filtered on this motherboard.</div><div class='ctx'> </div><div class='ctx'> Here are some of measurements:</div><div class='ctx'> </div><div class='add'>+==== =========</div><div class='ctx'> 0x80     20 mV</div><div class='ctx'> 0x81     20 mV</div><div class='ctx'> 0x82    232 mV</div><div class='hunk'>@@ -451,3 +510,4 @@ Here are some of measurements:</div><div class='ctx'> 0x8d  12.4  V</div><div class='ctx'> 0x8e  12.4  V</div><div class='ctx'> 0x8f  12.4  V</div><div class='add'>+==== =========</div><div class='head'>diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d.rst<br/>index f4021a285460..3adaed39b157 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83791d?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83791d</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83791d.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83791d.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver w83791d</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Winbond W83791D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83791d'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83791D_W83791Gb.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Charles Spirakis &lt;bezaur@gmail.com&gt;</div><div class='hunk'>@@ -12,39 +16,46 @@ Author: Charles Spirakis &lt;bezaur@gmail.com&gt;</div><div class='ctx'> This driver was derived from the w83781d.c and w83792d.c source files.</div><div class='ctx'> </div><div class='ctx'> Credits:</div><div class='add'>+</div><div class='ctx'>   w83781d.c:</div><div class='del'>-    Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='del'>-    Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='del'>-    and Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+</div><div class='add'>+    - Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+    - Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='add'>+    - Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+</div><div class='ctx'>   w83792d.c:</div><div class='del'>-    Shane Huang (Winbond),</div><div class='del'>-    Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='add'>+</div><div class='add'>+    - Shane Huang (Winbond),</div><div class='add'>+    - Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='ctx'> </div><div class='ctx'> Additional contributors:</div><div class='del'>-    Sven Anders &lt;anders@anduras.de&gt;</div><div class='del'>-    Marc Hulsman &lt;m.hulsman@tudelft.nl&gt;</div><div class='add'>+</div><div class='add'>+    - Sven Anders &lt;anders@anduras.de&gt;</div><div class='add'>+    - Marc Hulsman &lt;m.hulsman@tudelft.nl&gt;</div><div class='ctx'> </div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * init boolean</div><div class='del'>-  (default 0)</div><div class='del'>-  Use 'init=1' to have the driver do extra software initializations.</div><div class='del'>-  The default behavior is to do the minimum initialization possible</div><div class='del'>-  and depend on the BIOS to properly setup the chip. If you know you</div><div class='del'>-  have a w83791d and you're having problems, try init=1 before trying</div><div class='del'>-  reset=1.</div><div class='add'>+    (default 0)</div><div class='add'>+</div><div class='add'>+    Use 'init=1' to have the driver do extra software initializations.</div><div class='add'>+    The default behavior is to do the minimum initialization possible</div><div class='add'>+    and depend on the BIOS to properly setup the chip. If you know you</div><div class='add'>+    have a w83791d and you're having problems, try init=1 before trying</div><div class='add'>+    reset=1.</div><div class='ctx'> </div><div class='ctx'> * reset boolean</div><div class='del'>-  (default 0)</div><div class='del'>-  Use 'reset=1' to reset the chip (via index 0x40, bit 7). The default</div><div class='del'>-  behavior is no chip reset to preserve BIOS settings.</div><div class='add'>+    (default 0)</div><div class='add'>+</div><div class='add'>+    Use 'reset=1' to reset the chip (via index 0x40, bit 7). The default</div><div class='add'>+    behavior is no chip reset to preserve BIOS settings.</div><div class='ctx'> </div><div class='ctx'> * force_subclients=bus,caddr,saddr,saddr</div><div class='del'>-  This is used to force the i2c addresses for subclients of</div><div class='del'>-  a certain chip. Example usage is `force_subclients=0,0x2f,0x4a,0x4b'</div><div class='del'>-  to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='del'>-  0x4a and 0x4b.</div><div class='add'>+    This is used to force the i2c addresses for subclients of</div><div class='add'>+    a certain chip. Example usage is `force_subclients=0,0x2f,0x4a,0x4b`</div><div class='add'>+    to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='add'>+    0x4a and 0x4b.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -91,11 +102,11 @@ This file is used for both legacy and new code.</div><div class='ctx'> </div><div class='ctx'> The sysfs interface to the beep bitmask has migrated from the original legacy</div><div class='ctx'> method of a single sysfs beep_mask file to a newer method using multiple</div><div class='del'>-*_beep files as described in .../Documentation/hwmon/sysfs-interface.</div><div class='add'>+`*_beep` files as described in `Documentation/hwmon/sysfs-interface.rst`.</div><div class='ctx'> </div><div class='ctx'> A similar change has occurred for the bitmap corresponding to the alarms. The</div><div class='ctx'> original legacy method used a single sysfs alarms file containing a bitmap</div><div class='del'>-of triggered alarms. The newer method uses multiple sysfs *_alarm files</div><div class='add'>+of triggered alarms. The newer method uses multiple sysfs `*_alarm` files</div><div class='ctx'> (again following the pattern described in sysfs-interface).</div><div class='ctx'> </div><div class='ctx'> Since both methods read and write the underlying hardware, they can be used</div><div class='hunk'>@@ -116,46 +127,54 @@ User mode code requesting values more often will receive cached values.</div><div class='ctx'> The sysfs-interface is documented in the 'sysfs-interface' file. Only</div><div class='ctx'> chip-specific options are documented here.</div><div class='ctx'> </div><div class='del'>-pwm[1-3]_enable -	this file controls mode of fan/temperature control for</div><div class='add'>+======================= =======================================================</div><div class='add'>+pwm[1-3]_enable		this file controls mode of fan/temperature control for</div><div class='ctx'> 			fan 1-3. Fan/PWM 4-5 only support manual mode.</div><div class='del'>-		            * 1 Manual mode</div><div class='del'>-		            * 2 Thermal Cruise mode</div><div class='del'>-		            * 3 Fan Speed Cruise mode (no further support)</div><div class='ctx'> </div><div class='del'>-temp[1-3]_target -	defines the target temperature for Thermal Cruise mode.</div><div class='add'>+			    * 1 Manual mode</div><div class='add'>+			    * 2 Thermal Cruise mode</div><div class='add'>+			    * 3 Fan Speed Cruise mode (no further support)</div><div class='add'>+</div><div class='add'>+temp[1-3]_target	defines the target temperature for Thermal Cruise mode.</div><div class='ctx'> 			Unit: millidegree Celsius</div><div class='ctx'> 			RW</div><div class='ctx'> </div><div class='del'>-temp[1-3]_tolerance -	temperature tolerance for Thermal Cruise mode.</div><div class='add'>+temp[1-3]_tolerance	temperature tolerance for Thermal Cruise mode.</div><div class='ctx'> 			Specifies an interval around the target temperature</div><div class='ctx'> 			in which the fan speed is not changed.</div><div class='ctx'> 			Unit: millidegree Celsius</div><div class='ctx'> 			RW</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> Alarms bitmap vs. beep_mask bitmask</div><div class='del'>-------------------------------------</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='ctx'> For legacy code using the alarms and beep_mask files:</div><div class='ctx'> </div><div class='del'>-in0 (VCORE)  :  alarms: 0x000001 beep_mask: 0x000001</div><div class='del'>-in1 (VINR0)  :  alarms: 0x000002 beep_mask: 0x002000 &lt;== mismatch</div><div class='del'>-in2 (+3.3VIN):  alarms: 0x000004 beep_mask: 0x000004</div><div class='del'>-in3 (5VDD)   :  alarms: 0x000008 beep_mask: 0x000008</div><div class='del'>-in4 (+12VIN) :  alarms: 0x000100 beep_mask: 0x000100</div><div class='del'>-in5 (-12VIN) :  alarms: 0x000200 beep_mask: 0x000200</div><div class='del'>-in6 (-5VIN)  :  alarms: 0x000400 beep_mask: 0x000400</div><div class='del'>-in7 (VSB)    :  alarms: 0x080000 beep_mask: 0x010000 &lt;== mismatch</div><div class='del'>-in8 (VBAT)   :  alarms: 0x100000 beep_mask: 0x020000 &lt;== mismatch</div><div class='del'>-in9 (VINR1)  :  alarms: 0x004000 beep_mask: 0x004000</div><div class='del'>-temp1        :  alarms: 0x000010 beep_mask: 0x000010</div><div class='del'>-temp2        :  alarms: 0x000020 beep_mask: 0x000020</div><div class='del'>-temp3        :  alarms: 0x002000 beep_mask: 0x000002 &lt;== mismatch</div><div class='del'>-fan1         :  alarms: 0x000040 beep_mask: 0x000040</div><div class='del'>-fan2         :  alarms: 0x000080 beep_mask: 0x000080</div><div class='del'>-fan3         :  alarms: 0x000800 beep_mask: 0x000800</div><div class='del'>-fan4         :  alarms: 0x200000 beep_mask: 0x200000</div><div class='del'>-fan5         :  alarms: 0x400000 beep_mask: 0x400000</div><div class='del'>-tart1        :  alarms: 0x010000 beep_mask: 0x040000 &lt;== mismatch</div><div class='del'>-tart2        :  alarms: 0x020000 beep_mask: 0x080000 &lt;== mismatch</div><div class='del'>-tart3        :  alarms: 0x040000 beep_mask: 0x100000 &lt;== mismatch</div><div class='del'>-case_open    :  alarms: 0x001000 beep_mask: 0x001000</div><div class='del'>-global_enable:  alarms: -------- beep_mask: 0x800000 (modified via beep_enable)</div><div class='add'>+=============  ========  ========= ==========================</div><div class='add'>+Signal         Alarms    beep_mask Obs</div><div class='add'>+=============  ========  ========= ==========================</div><div class='add'>+in0 (VCORE)    0x000001  0x000001</div><div class='add'>+in1 (VINR0)    0x000002  0x002000  &lt;== mismatch</div><div class='add'>+in2 (+3.3VIN)  0x000004  0x000004</div><div class='add'>+in3 (5VDD)     0x000008  0x000008</div><div class='add'>+in4 (+12VIN)   0x000100  0x000100</div><div class='add'>+in5 (-12VIN)   0x000200  0x000200</div><div class='add'>+in6 (-5VIN)    0x000400  0x000400</div><div class='add'>+in7 (VSB)      0x080000  0x010000  &lt;== mismatch</div><div class='add'>+in8 (VBAT)     0x100000  0x020000  &lt;== mismatch</div><div class='add'>+in9 (VINR1)    0x004000  0x004000</div><div class='add'>+temp1          0x000010  0x000010</div><div class='add'>+temp2          0x000020  0x000020</div><div class='add'>+temp3          0x002000  0x000002  &lt;== mismatch</div><div class='add'>+fan1           0x000040  0x000040</div><div class='add'>+fan2           0x000080  0x000080</div><div class='add'>+fan3           0x000800  0x000800</div><div class='add'>+fan4           0x200000  0x200000</div><div class='add'>+fan5           0x400000  0x400000</div><div class='add'>+tart1          0x010000  0x040000  &lt;== mismatch</div><div class='add'>+tart2          0x020000  0x080000  &lt;== mismatch</div><div class='add'>+tart3          0x040000  0x100000  &lt;== mismatch</div><div class='add'>+case_open      0x001000  0x001000</div><div class='add'>+global_enable  -         0x800000  (modified via beep_enable)</div><div class='add'>+=============  ========  ========= ==========================</div><div class='head'>diff --git a/Documentation/hwmon/w83792d b/Documentation/hwmon/w83792d.rst<br/>index f2ffc402ea45..92c4bfe4968c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83792d?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83792d</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83792d.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83792d.rst</a></div><div class='hunk'>@@ -2,9 +2,13 @@ Kernel driver w83792d</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Winbond W83792D</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83792d'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.winbond.com.tw</div><div class='ctx'> </div><div class='ctx'> Author: Shane Huang (Winbond)</div><div class='hunk'>@@ -15,15 +19,16 @@ Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * init int</div><div class='del'>-  (default 1)</div><div class='del'>-  Use 'init=0' to bypass initializing the chip.</div><div class='del'>-  Try this if your computer crashes when you load the module.</div><div class='add'>+    (default 1)</div><div class='add'>+</div><div class='add'>+    Use 'init=0' to bypass initializing the chip.</div><div class='add'>+    Try this if your computer crashes when you load the module.</div><div class='ctx'> </div><div class='ctx'> * force_subclients=bus,caddr,saddr,saddr</div><div class='del'>-  This is used to force the i2c addresses for subclients of</div><div class='del'>-  a certain chip. Example usage is `force_subclients=0,0x2f,0x4a,0x4b'</div><div class='del'>-  to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='del'>-  0x4a and 0x4b.</div><div class='add'>+    This is used to force the i2c addresses for subclients of</div><div class='add'>+    a certain chip. Example usage is `force_subclients=0,0x2f,0x4a,0x4b`</div><div class='add'>+    to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='add'>+    0x4a and 0x4b.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -67,31 +72,34 @@ or maximum limit.</div><div class='ctx'> Alarms are provided as output from "realtime status register". Following bits</div><div class='ctx'> are defined:</div><div class='ctx'> </div><div class='del'>-bit - alarm on:</div><div class='del'>-0  - in0</div><div class='del'>-1  - in1</div><div class='del'>-2  - temp1</div><div class='del'>-3  - temp2</div><div class='del'>-4  - temp3</div><div class='del'>-5  - fan1</div><div class='del'>-6  - fan2</div><div class='del'>-7  - fan3</div><div class='del'>-8  - in2</div><div class='del'>-9  - in3</div><div class='del'>-10 - in4</div><div class='del'>-11 - in5</div><div class='del'>-12 - in6</div><div class='del'>-13 - VID change</div><div class='del'>-14 - chassis</div><div class='del'>-15 - fan7</div><div class='del'>-16 - tart1</div><div class='del'>-17 - tart2</div><div class='del'>-18 - tart3</div><div class='del'>-19 - in7</div><div class='del'>-20 - in8</div><div class='del'>-21 - fan4</div><div class='del'>-22 - fan5</div><div class='del'>-23 - fan6</div><div class='add'>+==== ==========</div><div class='add'>+bit   alarm on</div><div class='add'>+==== ==========</div><div class='add'>+0    in0</div><div class='add'>+1    in1</div><div class='add'>+2    temp1</div><div class='add'>+3    temp2</div><div class='add'>+4    temp3</div><div class='add'>+5    fan1</div><div class='add'>+6    fan2</div><div class='add'>+7    fan3</div><div class='add'>+8    in2</div><div class='add'>+9    in3</div><div class='add'>+10   in4</div><div class='add'>+11   in5</div><div class='add'>+12   in6</div><div class='add'>+13   VID change</div><div class='add'>+14   chassis</div><div class='add'>+15   fan7</div><div class='add'>+16   tart1</div><div class='add'>+17   tart2</div><div class='add'>+18   tart3</div><div class='add'>+19   in7</div><div class='add'>+20   in8</div><div class='add'>+21   fan4</div><div class='add'>+22   fan5</div><div class='add'>+23   fan6</div><div class='add'>+==== ==========</div><div class='ctx'> </div><div class='ctx'> Tart will be asserted while target temperature cannot be achieved after 3 minutes</div><div class='ctx'> of full speed rotation of corresponding fan.</div><div class='hunk'>@@ -114,7 +122,7 @@ Known problems:</div><div class='ctx'> 	  by CR[0x49h].</div><div class='ctx'> 	- The function of vid and vrm has not been finished, because I'm NOT</div><div class='ctx'> 	  very familiar with them. Adding support is welcome.</div><div class='del'>- 	- The function of chassis open detection needs more tests.</div><div class='add'>+	- The function of chassis open detection needs more tests.</div><div class='ctx'> 	- If you have ASUS server board and chip was not found: Then you will</div><div class='ctx'> 	  need to upgrade to latest (or beta) BIOS. If it does not help please</div><div class='ctx'> 	  contact us.</div><div class='hunk'>@@ -165,17 +173,27 @@ for each fan.</div><div class='ctx'> /sys files</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='del'>-pwm[1-7] - this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='del'>-	0 (stop) to 255 (full)</div><div class='del'>-pwm[1-3]_enable - this file controls mode of fan/temperature control:</div><div class='del'>-            * 0 Disabled</div><div class='del'>-            * 1 Manual mode</div><div class='del'>-            * 2 Smart Fan II</div><div class='del'>-            * 3 Thermal Cruise</div><div class='del'>-pwm[1-7]_mode - Select PWM or DC mode</div><div class='del'>-            * 0 DC</div><div class='del'>-            * 1 PWM</div><div class='del'>-thermal_cruise[1-3] - Selects the desired temperature for cruise (degC)</div><div class='del'>-tolerance[1-3] - Value in degrees of Celsius (degC) for +- T</div><div class='del'>-sf2_point[1-4]_fan[1-3] - four temperature points for each fan for Smart Fan II</div><div class='del'>-sf2_level[1-3]_fan[1-3] - three PWM/DC levels for each fan for Smart Fan II</div><div class='add'>+pwm[1-7]</div><div class='add'>+	- this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='add'>+</div><div class='add'>+	    0 (stop) to 255 (full)</div><div class='add'>+pwm[1-3]_enable</div><div class='add'>+	- this file controls mode of fan/temperature control:</div><div class='add'>+</div><div class='add'>+	    * 0 Disabled</div><div class='add'>+	    * 1 Manual mode</div><div class='add'>+	    * 2 Smart Fan II</div><div class='add'>+	    * 3 Thermal Cruise</div><div class='add'>+pwm[1-7]_mode</div><div class='add'>+	- Select PWM or DC mode</div><div class='add'>+</div><div class='add'>+	    * 0 DC</div><div class='add'>+	    * 1 PWM</div><div class='add'>+thermal_cruise[1-3]</div><div class='add'>+	- Selects the desired temperature for cruise (degC)</div><div class='add'>+tolerance[1-3]</div><div class='add'>+	- Value in degrees of Celsius (degC) for +- T</div><div class='add'>+sf2_point[1-4]_fan[1-3]</div><div class='add'>+	- four temperature points for each fan for Smart Fan II</div><div class='add'>+sf2_level[1-3]_fan[1-3]</div><div class='add'>+	- three PWM/DC levels for each fan for Smart Fan II</div><div class='head'>diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793<br/>deleted file mode 100644<br/>index 6cc5f639b721..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83793?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83793</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-Kernel driver w83793</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-Supported chips:</div><div class='del'>-  * Winbond W83793G/W83793R</div><div class='del'>-    Prefix: 'w83793'</div><div class='del'>-    Addresses scanned: I2C 0x2c - 0x2f</div><div class='del'>-    Datasheet: Still not published</div><div class='del'>-</div><div class='del'>-Authors:</div><div class='del'>-    Yuan Mu (Winbond Electronics)</div><div class='del'>-    Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Module parameters</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-* reset int</div><div class='del'>-  (default 0)</div><div class='del'>-  This parameter is not recommended, it will lose motherboard specific</div><div class='del'>-  settings. Use 'reset=1' to reset the chip when loading this module.</div><div class='del'>-</div><div class='del'>-* force_subclients=bus,caddr,saddr1,saddr2</div><div class='del'>-  This is used to force the i2c addresses for subclients of</div><div class='del'>-  a certain chip. Typical usage is `force_subclients=0,0x2f,0x4a,0x4b'</div><div class='del'>-  to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='del'>-  0x4a and 0x4b.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Description</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-This driver implements support for Winbond W83793G/W83793R chips.</div><div class='del'>-</div><div class='del'>-* Exported features</div><div class='del'>-  This driver exports 10 voltage sensors, up to 12 fan tachometer inputs,</div><div class='del'>-  6 remote temperatures, up to 8 sets of PWM fan controls, SmartFan</div><div class='del'>-  (automatic fan speed control) on all temperature/PWM combinations, 2</div><div class='del'>-  sets of 6-pin CPU VID input.</div><div class='del'>-</div><div class='del'>-* Sensor resolutions</div><div class='del'>-  If your motherboard maker used the reference design, the resolution of</div><div class='del'>-  voltage0-2 is 2mV, resolution of voltage3/4/5 is 16mV, 8mV for voltage6,</div><div class='del'>-  24mV for voltage7/8. Temp1-4 have a 0.25 degree Celsius resolution,</div><div class='del'>-  temp5-6 have a 1 degree Celsiis resolution.</div><div class='del'>-</div><div class='del'>-* Temperature sensor types</div><div class='del'>-  Temp1-4 have 2 possible types. It can be read from (and written to)</div><div class='del'>-  temp[1-4]_type.</div><div class='del'>-  - If the value is 3, it starts monitoring using a remote termal diode</div><div class='del'>-    (default).</div><div class='del'>-  - If the value is 6, it starts monitoring using the temperature sensor</div><div class='del'>-    in Intel CPU and get result by PECI.</div><div class='del'>-  Temp5-6 can be connected to external thermistors (value of</div><div class='del'>-  temp[5-6]_type is 4).</div><div class='del'>-</div><div class='del'>-* Alarm mechanism</div><div class='del'>-  For voltage sensors, an alarm triggers if the measured value is below</div><div class='del'>-  the low voltage limit or over the high voltage limit.</div><div class='del'>-  For temperature sensors, an alarm triggers if the measured value goes</div><div class='del'>-  above the high temperature limit, and wears off only after the measured</div><div class='del'>-  value drops below the hysteresis value.</div><div class='del'>-  For fan sensors, an alarm triggers if the measured value is below the</div><div class='del'>-  low speed limit.</div><div class='del'>-</div><div class='del'>-* SmartFan/PWM control</div><div class='del'>-  If you want to set a pwm fan to manual mode, you just need to make sure it</div><div class='del'>-  is not controlled by any temp channel, for example, you want to set fan1</div><div class='del'>-  to manual mode, you need to check the value of temp[1-6]_fan_map, make</div><div class='del'>-  sure bit 0 is cleared in the 6 values. And then set the pwm1 value to</div><div class='del'>-  control the fan.</div><div class='del'>-</div><div class='del'>-  Each temperature channel can control all the 8 PWM outputs (by setting the</div><div class='del'>-  corresponding bit in tempX_fan_map), you can set the temperature channel</div><div class='del'>-  mode using temp[1-6]_pwm_enable, 2 is Thermal Cruise mode and 3</div><div class='del'>-  is the SmartFanII mode. Temperature channels will try to speed up or</div><div class='del'>-  slow down all controlled fans, this means one fan can receive different</div><div class='del'>-  PWM value requests from different temperature channels, but the chip</div><div class='del'>-  will always pick the safest (max) PWM value for each fan.</div><div class='del'>-</div><div class='del'>-  In Thermal Cruise mode, the chip attempts to keep the temperature at a</div><div class='del'>-  predefined value, within a tolerance margin. So if tempX_input &gt;</div><div class='del'>-  thermal_cruiseX + toleranceX, the chip will increase the PWM value,</div><div class='del'>-  if tempX_input &lt; thermal_cruiseX - toleranceX, the chip will decrease</div><div class='del'>-  the PWM value. If the temperature is within the tolerance range, the PWM</div><div class='del'>-  value is left unchanged.</div><div class='del'>-</div><div class='del'>-  SmartFanII works differently, you have to define up to 7 PWM, temperature</div><div class='del'>-  trip points, defining a PWM/temperature curve which the chip will follow.</div><div class='del'>-  While not fundamentally different from the Thermal Cruise mode, the</div><div class='del'>-  implementation is quite different, giving you a finer-grained control.</div><div class='del'>-</div><div class='del'>-* Chassis</div><div class='del'>-  If the case open alarm triggers, it will stay in this state unless cleared</div><div class='del'>-  by writing 0 to the sysfs file "intrusion0_alarm".</div><div class='del'>-</div><div class='del'>-* VID and VRM</div><div class='del'>-  The VRM version is detected automatically, don't modify the it unless you</div><div class='del'>-  *do* know the cpu VRM version and it's not properly detected.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Notes</div><div class='del'>------</div><div class='del'>-</div><div class='del'>-  Only Fan1-5 and PWM1-3 are guaranteed to always exist, other fan inputs and</div><div class='del'>-  PWM outputs may or may not exist depending on the chip pin configuration.</div><div class='head'>diff --git a/Documentation/hwmon/w83793.rst b/Documentation/hwmon/w83793.rst<br/>new file mode 100644<br/>index 000000000000..83bb40c48645<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83793.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83793.rst</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+Kernel driver w83793</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+</div><div class='add'>+  * Winbond W83793G/W83793R</div><div class='add'>+</div><div class='add'>+    Prefix: 'w83793'</div><div class='add'>+</div><div class='add'>+    Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='add'>+    Datasheet: Still not published</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+    - Yuan Mu (Winbond Electronics)</div><div class='add'>+    - Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module parameters</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+* reset int</div><div class='add'>+    (default 0)</div><div class='add'>+</div><div class='add'>+    This parameter is not recommended, it will lose motherboard specific</div><div class='add'>+    settings. Use 'reset=1' to reset the chip when loading this module.</div><div class='add'>+</div><div class='add'>+* force_subclients=bus,caddr,saddr1,saddr2</div><div class='add'>+    This is used to force the i2c addresses for subclients of</div><div class='add'>+    a certain chip. Typical usage is `force_subclients=0,0x2f,0x4a,0x4b`</div><div class='add'>+    to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='add'>+    0x4a and 0x4b.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver implements support for Winbond W83793G/W83793R chips.</div><div class='add'>+</div><div class='add'>+* Exported features</div><div class='add'>+    This driver exports 10 voltage sensors, up to 12 fan tachometer inputs,</div><div class='add'>+    6 remote temperatures, up to 8 sets of PWM fan controls, SmartFan</div><div class='add'>+    (automatic fan speed control) on all temperature/PWM combinations, 2</div><div class='add'>+    sets of 6-pin CPU VID input.</div><div class='add'>+</div><div class='add'>+* Sensor resolutions</div><div class='add'>+    If your motherboard maker used the reference design, the resolution of</div><div class='add'>+    voltage0-2 is 2mV, resolution of voltage3/4/5 is 16mV, 8mV for voltage6,</div><div class='add'>+    24mV for voltage7/8. Temp1-4 have a 0.25 degree Celsius resolution,</div><div class='add'>+    temp5-6 have a 1 degree Celsiis resolution.</div><div class='add'>+</div><div class='add'>+* Temperature sensor types</div><div class='add'>+    Temp1-4 have 2 possible types. It can be read from (and written to)</div><div class='add'>+    temp[1-4]_type.</div><div class='add'>+</div><div class='add'>+    - If the value is 3, it starts monitoring using a remote termal diode</div><div class='add'>+      (default).</div><div class='add'>+    - If the value is 6, it starts monitoring using the temperature sensor</div><div class='add'>+      in Intel CPU and get result by PECI.</div><div class='add'>+</div><div class='add'>+    Temp5-6 can be connected to external thermistors (value of</div><div class='add'>+    temp[5-6]_type is 4).</div><div class='add'>+</div><div class='add'>+* Alarm mechanism</div><div class='add'>+    For voltage sensors, an alarm triggers if the measured value is below</div><div class='add'>+    the low voltage limit or over the high voltage limit.</div><div class='add'>+    For temperature sensors, an alarm triggers if the measured value goes</div><div class='add'>+    above the high temperature limit, and wears off only after the measured</div><div class='add'>+    value drops below the hysteresis value.</div><div class='add'>+    For fan sensors, an alarm triggers if the measured value is below the</div><div class='add'>+    low speed limit.</div><div class='add'>+</div><div class='add'>+* SmartFan/PWM control</div><div class='add'>+    If you want to set a pwm fan to manual mode, you just need to make sure it</div><div class='add'>+    is not controlled by any temp channel, for example, you want to set fan1</div><div class='add'>+    to manual mode, you need to check the value of temp[1-6]_fan_map, make</div><div class='add'>+    sure bit 0 is cleared in the 6 values. And then set the pwm1 value to</div><div class='add'>+    control the fan.</div><div class='add'>+</div><div class='add'>+    Each temperature channel can control all the 8 PWM outputs (by setting the</div><div class='add'>+    corresponding bit in tempX_fan_map), you can set the temperature channel</div><div class='add'>+    mode using temp[1-6]_pwm_enable, 2 is Thermal Cruise mode and 3</div><div class='add'>+    is the SmartFanII mode. Temperature channels will try to speed up or</div><div class='add'>+    slow down all controlled fans, this means one fan can receive different</div><div class='add'>+    PWM value requests from different temperature channels, but the chip</div><div class='add'>+    will always pick the safest (max) PWM value for each fan.</div><div class='add'>+</div><div class='add'>+    In Thermal Cruise mode, the chip attempts to keep the temperature at a</div><div class='add'>+    predefined value, within a tolerance margin. So if tempX_input &gt;</div><div class='add'>+    thermal_cruiseX + toleranceX, the chip will increase the PWM value,</div><div class='add'>+    if tempX_input &lt; thermal_cruiseX - toleranceX, the chip will decrease</div><div class='add'>+    the PWM value. If the temperature is within the tolerance range, the PWM</div><div class='add'>+    value is left unchanged.</div><div class='add'>+</div><div class='add'>+    SmartFanII works differently, you have to define up to 7 PWM, temperature</div><div class='add'>+    trip points, defining a PWM/temperature curve which the chip will follow.</div><div class='add'>+    While not fundamentally different from the Thermal Cruise mode, the</div><div class='add'>+    implementation is quite different, giving you a finer-grained control.</div><div class='add'>+</div><div class='add'>+* Chassis</div><div class='add'>+    If the case open alarm triggers, it will stay in this state unless cleared</div><div class='add'>+    by writing 0 to the sysfs file "intrusion0_alarm".</div><div class='add'>+</div><div class='add'>+* VID and VRM</div><div class='add'>+    The VRM version is detected automatically, don't modify the it unless you</div><div class='add'>+    *do* know the cpu VRM version and it's not properly detected.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Notes</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+  Only Fan1-5 and PWM1-3 are guaranteed to always exist, other fan inputs and</div><div class='add'>+  PWM outputs may or may not exist depending on the chip pin configuration.</div><div class='head'>diff --git a/Documentation/hwmon/w83795 b/Documentation/hwmon/w83795<br/>deleted file mode 100644<br/>index d3e678216b9a..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83795?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83795</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-Kernel driver w83795</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-Supported chips:</div><div class='del'>-  * Winbond/Nuvoton W83795G</div><div class='del'>-    Prefix: 'w83795g'</div><div class='del'>-    Addresses scanned: I2C 0x2c - 0x2f</div><div class='del'>-    Datasheet: Available for download on nuvoton.com</div><div class='del'>-  * Winbond/Nuvoton W83795ADG</div><div class='del'>-    Prefix: 'w83795adg'</div><div class='del'>-    Addresses scanned: I2C 0x2c - 0x2f</div><div class='del'>-    Datasheet: Available for download on nuvoton.com</div><div class='del'>-</div><div class='del'>-Authors:</div><div class='del'>-    Wei Song (Nuvoton)</div><div class='del'>-    Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Pin mapping</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-Here is a summary of the pin mapping for the W83795G and W83795ADG.</div><div class='del'>-This can be useful to convert data provided by board manufacturers</div><div class='del'>-into working libsensors configuration statements.</div><div class='del'>-</div><div class='del'>-    W83795G			|</div><div class='del'>-  Pin	| Name			| Register	| Sysfs attribute</div><div class='del'>-------------------------------------------------------------------</div><div class='del'>-   13	| VSEN1 (VCORE1)	| 10h		| in0</div><div class='del'>-   14	| VSEN2 (VCORE2)	| 11h		| in1</div><div class='del'>-   15	| VSEN3 (VCORE3)	| 12h		| in2</div><div class='del'>-   16	| VSEN4			| 13h		| in3</div><div class='del'>-   17	| VSEN5			| 14h		| in4</div><div class='del'>-   18	| VSEN6			| 15h		| in5</div><div class='del'>-   19	| VSEN7			| 16h		| in6</div><div class='del'>-   20	| VSEN8			| 17h		| in7</div><div class='del'>-   21	| VSEN9			| 18h		| in8</div><div class='del'>-   22	| VSEN10		| 19h		| in9</div><div class='del'>-   23	| VSEN11		| 1Ah		| in10</div><div class='del'>-   28	| VTT			| 1Bh		| in11</div><div class='del'>-   24	| 3VDD			| 1Ch		| in12</div><div class='del'>-   25	| 3VSB			| 1Dh		| in13</div><div class='del'>-   26	| VBAT			| 1Eh		| in14</div><div class='del'>-    3	| VSEN12/TR5		| 1Fh		| in15/temp5</div><div class='del'>-    4	| VSEN13/TR5		| 20h		| in16/temp6</div><div class='del'>-  5/  6	| VDSEN14/TR1/TD1	| 21h		| in17/temp1</div><div class='del'>-  7/  8	| VDSEN15/TR2/TD2	| 22h		| in18/temp2</div><div class='del'>-  9/ 10	| VDSEN16/TR3/TD3	| 23h		| in19/temp3</div><div class='del'>- 11/ 12	| VDSEN17/TR4/TD4	| 24h		| in20/temp4</div><div class='del'>-   40	| FANIN1		| 2Eh		| fan1</div><div class='del'>-   42	| FANIN2		| 2Fh		| fan2</div><div class='del'>-   44	| FANIN3		| 30h		| fan3</div><div class='del'>-   46	| FANIN4		| 31h		| fan4</div><div class='del'>-   48	| FANIN5		| 32h		| fan5</div><div class='del'>-   50	| FANIN6		| 33h		| fan6</div><div class='del'>-   52	| FANIN7		| 34h		| fan7</div><div class='del'>-   54	| FANIN8		| 35h		| fan8</div><div class='del'>-   57	| FANIN9		| 36h		| fan9</div><div class='del'>-   58	| FANIN10		| 37h		| fan10</div><div class='del'>-   59	| FANIN11		| 38h		| fan11</div><div class='del'>-   60	| FANIN12		| 39h		| fan12</div><div class='del'>-   31	| FANIN13		| 3Ah		| fan13</div><div class='del'>-   35	| FANIN14		| 3Bh		| fan14</div><div class='del'>-   41	| FANCTL1		| 10h (bank 2)	| pwm1</div><div class='del'>-   43	| FANCTL2		| 11h (bank 2)	| pwm2</div><div class='del'>-   45	| FANCTL3		| 12h (bank 2)	| pwm3</div><div class='del'>-   47	| FANCTL4		| 13h (bank 2)	| pwm4</div><div class='del'>-   49	| FANCTL5		| 14h (bank 2)	| pwm5</div><div class='del'>-   51	| FANCTL6		| 15h (bank 2)	| pwm6</div><div class='del'>-   53	| FANCTL7		| 16h (bank 2)	| pwm7</div><div class='del'>-   55	| FANCTL8		| 17h (bank 2)	| pwm8</div><div class='del'>- 29/ 30	| PECI/TSI (DTS1)	| 26h		| temp7</div><div class='del'>- 29/ 30	| PECI/TSI (DTS2)	| 27h		| temp8</div><div class='del'>- 29/ 30	| PECI/TSI (DTS3)	| 28h		| temp9</div><div class='del'>- 29/ 30	| PECI/TSI (DTS4)	| 29h		| temp10</div><div class='del'>- 29/ 30	| PECI/TSI (DTS5)	| 2Ah		| temp11</div><div class='del'>- 29/ 30	| PECI/TSI (DTS6)	| 2Bh		| temp12</div><div class='del'>- 29/ 30	| PECI/TSI (DTS7)	| 2Ch		| temp13</div><div class='del'>- 29/ 30	| PECI/TSI (DTS8)	| 2Dh		| temp14</div><div class='del'>-   27	| CASEOPEN#		| 46h		| intrusion0</div><div class='del'>-</div><div class='del'>-    W83795ADG			|</div><div class='del'>-  Pin	| Name			| Register	| Sysfs attribute</div><div class='del'>-------------------------------------------------------------------</div><div class='del'>-   10	| VSEN1 (VCORE1)	| 10h		| in0</div><div class='del'>-   11	| VSEN2 (VCORE2)	| 11h		| in1</div><div class='del'>-   12	| VSEN3 (VCORE3)	| 12h		| in2</div><div class='del'>-   13	| VSEN4			| 13h		| in3</div><div class='del'>-   14	| VSEN5			| 14h		| in4</div><div class='del'>-   15	| VSEN6			| 15h		| in5</div><div class='del'>-   16	| VSEN7			| 16h		| in6</div><div class='del'>-   17	| VSEN8			| 17h		| in7</div><div class='del'>-   22	| VTT			| 1Bh		| in11</div><div class='del'>-   18	| 3VDD			| 1Ch		| in12</div><div class='del'>-   19	| 3VSB			| 1Dh		| in13</div><div class='del'>-   20	| VBAT			| 1Eh		| in14</div><div class='del'>-   48	| VSEN12/TR5		| 1Fh		| in15/temp5</div><div class='del'>-    1	| VSEN13/TR5		| 20h		| in16/temp6</div><div class='del'>-  2/  3	| VDSEN14/TR1/TD1	| 21h		| in17/temp1</div><div class='del'>-  4/  5	| VDSEN15/TR2/TD2	| 22h		| in18/temp2</div><div class='del'>-  6/  7	| VDSEN16/TR3/TD3	| 23h		| in19/temp3</div><div class='del'>-  8/  9	| VDSEN17/TR4/TD4	| 24h		| in20/temp4</div><div class='del'>-   32	| FANIN1		| 2Eh		| fan1</div><div class='del'>-   34	| FANIN2		| 2Fh		| fan2</div><div class='del'>-   36	| FANIN3		| 30h		| fan3</div><div class='del'>-   37	| FANIN4		| 31h		| fan4</div><div class='del'>-   38	| FANIN5		| 32h		| fan5</div><div class='del'>-   39	| FANIN6		| 33h		| fan6</div><div class='del'>-   40	| FANIN7		| 34h		| fan7</div><div class='del'>-   41	| FANIN8		| 35h		| fan8</div><div class='del'>-   43	| FANIN9		| 36h		| fan9</div><div class='del'>-   44	| FANIN10		| 37h		| fan10</div><div class='del'>-   45	| FANIN11		| 38h		| fan11</div><div class='del'>-   46	| FANIN12		| 39h		| fan12</div><div class='del'>-   24	| FANIN13		| 3Ah		| fan13</div><div class='del'>-   28	| FANIN14		| 3Bh		| fan14</div><div class='del'>-   33	| FANCTL1		| 10h (bank 2)	| pwm1</div><div class='del'>-   35	| FANCTL2		| 11h (bank 2)	| pwm2</div><div class='del'>-   23	| PECI (DTS1)		| 26h		| temp7</div><div class='del'>-   23	| PECI (DTS2)		| 27h		| temp8</div><div class='del'>-   23	| PECI (DTS3)		| 28h		| temp9</div><div class='del'>-   23	| PECI (DTS4)		| 29h		| temp10</div><div class='del'>-   23	| PECI (DTS5)		| 2Ah		| temp11</div><div class='del'>-   23	| PECI (DTS6)		| 2Bh		| temp12</div><div class='del'>-   23	| PECI (DTS7)		| 2Ch		| temp13</div><div class='del'>-   23	| PECI (DTS8)		| 2Dh		| temp14</div><div class='del'>-   21	| CASEOPEN#		| 46h		| intrusion0</div><div class='head'>diff --git a/Documentation/hwmon/w83795.rst b/Documentation/hwmon/w83795.rst<br/>new file mode 100644<br/>index 000000000000..d0615e2fabb9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83795.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83795.rst</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+Kernel driver w83795</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+</div><div class='add'>+  * Winbond/Nuvoton W83795G</div><div class='add'>+</div><div class='add'>+    Prefix: 'w83795g'</div><div class='add'>+</div><div class='add'>+    Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='add'>+    Datasheet: Available for download on nuvoton.com</div><div class='add'>+</div><div class='add'>+  * Winbond/Nuvoton W83795ADG</div><div class='add'>+</div><div class='add'>+    Prefix: 'w83795adg'</div><div class='add'>+</div><div class='add'>+    Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+</div><div class='add'>+    Datasheet: Available for download on nuvoton.com</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+    - Wei Song (Nuvoton)</div><div class='add'>+    - Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Pin mapping</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Here is a summary of the pin mapping for the W83795G and W83795ADG.</div><div class='add'>+This can be useful to convert data provided by board manufacturers</div><div class='add'>+into working libsensors configuration statements.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- W83795G</div><div class='add'>+</div><div class='add'>+========= ======================= =============== ================</div><div class='add'>+Pin	  Name			  Register	  Sysfs attribute</div><div class='add'>+========= ======================= =============== ================</div><div class='add'>+   13	  VSEN1 (VCORE1)	  10h		  in0</div><div class='add'>+   14	  VSEN2 (VCORE2)	  11h		  in1</div><div class='add'>+   15	  VSEN3 (VCORE3)	  12h		  in2</div><div class='add'>+   16	  VSEN4			  13h		  in3</div><div class='add'>+   17	  VSEN5			  14h		  in4</div><div class='add'>+   18	  VSEN6			  15h		  in5</div><div class='add'>+   19	  VSEN7			  16h		  in6</div><div class='add'>+   20	  VSEN8			  17h		  in7</div><div class='add'>+   21	  VSEN9			  18h		  in8</div><div class='add'>+   22	  VSEN10		  19h		  in9</div><div class='add'>+   23	  VSEN11		  1Ah		  in10</div><div class='add'>+   28	  VTT			  1Bh		  in11</div><div class='add'>+   24	  3VDD			  1Ch		  in12</div><div class='add'>+   25	  3VSB			  1Dh		  in13</div><div class='add'>+   26	  VBAT			  1Eh		  in14</div><div class='add'>+    3	  VSEN12/TR5		  1Fh		  in15/temp5</div><div class='add'>+    4	  VSEN13/TR5		  20h		  in16/temp6</div><div class='add'>+  5/  6	  VDSEN14/TR1/TD1	  21h		  in17/temp1</div><div class='add'>+  7/  8	  VDSEN15/TR2/TD2	  22h		  in18/temp2</div><div class='add'>+  9/ 10	  VDSEN16/TR3/TD3	  23h		  in19/temp3</div><div class='add'>+ 11/ 12	  VDSEN17/TR4/TD4	  24h		  in20/temp4</div><div class='add'>+   40	  FANIN1		  2Eh		  fan1</div><div class='add'>+   42	  FANIN2		  2Fh		  fan2</div><div class='add'>+   44	  FANIN3		  30h		  fan3</div><div class='add'>+   46	  FANIN4		  31h		  fan4</div><div class='add'>+   48	  FANIN5		  32h		  fan5</div><div class='add'>+   50	  FANIN6		  33h		  fan6</div><div class='add'>+   52	  FANIN7		  34h		  fan7</div><div class='add'>+   54	  FANIN8		  35h		  fan8</div><div class='add'>+   57	  FANIN9		  36h		  fan9</div><div class='add'>+   58	  FANIN10		  37h		  fan10</div><div class='add'>+   59	  FANIN11		  38h		  fan11</div><div class='add'>+   60	  FANIN12		  39h		  fan12</div><div class='add'>+   31	  FANIN13		  3Ah		  fan13</div><div class='add'>+   35	  FANIN14		  3Bh		  fan14</div><div class='add'>+   41	  FANCTL1		  10h (bank 2)	  pwm1</div><div class='add'>+   43	  FANCTL2		  11h (bank 2)	  pwm2</div><div class='add'>+   45	  FANCTL3		  12h (bank 2)	  pwm3</div><div class='add'>+   47	  FANCTL4		  13h (bank 2)	  pwm4</div><div class='add'>+   49	  FANCTL5		  14h (bank 2)	  pwm5</div><div class='add'>+   51	  FANCTL6		  15h (bank 2)	  pwm6</div><div class='add'>+   53	  FANCTL7		  16h (bank 2)	  pwm7</div><div class='add'>+   55	  FANCTL8		  17h (bank 2)	  pwm8</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS1)	  26h		  temp7</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS2)	  27h		  temp8</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS3)	  28h		  temp9</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS4)	  29h		  temp10</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS5)	  2Ah		  temp11</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS6)	  2Bh		  temp12</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS7)	  2Ch		  temp13</div><div class='add'>+ 29/ 30	  PECI/TSI (DTS8)	  2Dh		  temp14</div><div class='add'>+   27	  CASEOPEN#		  46h		  intrusion0</div><div class='add'>+========= ======================= =============== ================</div><div class='add'>+</div><div class='add'>+- W83795ADG</div><div class='add'>+</div><div class='add'>+========= ======================= =============== ================</div><div class='add'>+Pin	  Name			  Register	  Sysfs attribute</div><div class='add'>+========= ======================= =============== ================</div><div class='add'>+   10	  VSEN1 (VCORE1)	  10h		  in0</div><div class='add'>+   11	  VSEN2 (VCORE2)	  11h		  in1</div><div class='add'>+   12	  VSEN3 (VCORE3)	  12h		  in2</div><div class='add'>+   13	  VSEN4			  13h		  in3</div><div class='add'>+   14	  VSEN5			  14h		  in4</div><div class='add'>+   15	  VSEN6			  15h		  in5</div><div class='add'>+   16	  VSEN7			  16h		  in6</div><div class='add'>+   17	  VSEN8			  17h		  in7</div><div class='add'>+   22	  VTT			  1Bh		  in11</div><div class='add'>+   18	  3VDD			  1Ch		  in12</div><div class='add'>+   19	  3VSB			  1Dh		  in13</div><div class='add'>+   20	  VBAT			  1Eh		  in14</div><div class='add'>+   48	  VSEN12/TR5		  1Fh		  in15/temp5</div><div class='add'>+    1	  VSEN13/TR5		  20h		  in16/temp6</div><div class='add'>+  2/  3	  VDSEN14/TR1/TD1	  21h		  in17/temp1</div><div class='add'>+  4/  5	  VDSEN15/TR2/TD2	  22h		  in18/temp2</div><div class='add'>+  6/  7	  VDSEN16/TR3/TD3	  23h		  in19/temp3</div><div class='add'>+  8/  9	  VDSEN17/TR4/TD4	  24h		  in20/temp4</div><div class='add'>+   32	  FANIN1		  2Eh		  fan1</div><div class='add'>+   34	  FANIN2		  2Fh		  fan2</div><div class='add'>+   36	  FANIN3		  30h		  fan3</div><div class='add'>+   37	  FANIN4		  31h		  fan4</div><div class='add'>+   38	  FANIN5		  32h		  fan5</div><div class='add'>+   39	  FANIN6		  33h		  fan6</div><div class='add'>+   40	  FANIN7		  34h		  fan7</div><div class='add'>+   41	  FANIN8		  35h		  fan8</div><div class='add'>+   43	  FANIN9		  36h		  fan9</div><div class='add'>+   44	  FANIN10		  37h		  fan10</div><div class='add'>+   45	  FANIN11		  38h		  fan11</div><div class='add'>+   46	  FANIN12		  39h		  fan12</div><div class='add'>+   24	  FANIN13		  3Ah		  fan13</div><div class='add'>+   28	  FANIN14		  3Bh		  fan14</div><div class='add'>+   33	  FANCTL1		  10h (bank 2)	  pwm1</div><div class='add'>+   35	  FANCTL2		  11h (bank 2)	  pwm2</div><div class='add'>+   23	  PECI (DTS1)		  26h		  temp7</div><div class='add'>+   23	  PECI (DTS2)		  27h		  temp8</div><div class='add'>+   23	  PECI (DTS3)		  28h		  temp9</div><div class='add'>+   23	  PECI (DTS4)		  29h		  temp10</div><div class='add'>+   23	  PECI (DTS5)		  2Ah		  temp11</div><div class='add'>+   23	  PECI (DTS6)		  2Bh		  temp12</div><div class='add'>+   23	  PECI (DTS7)		  2Ch		  temp13</div><div class='add'>+   23	  PECI (DTS8)		  2Dh		  temp14</div><div class='add'>+   21	  CASEOPEN#		  46h		  intrusion0</div><div class='add'>+========= ======================= =============== ================</div><div class='head'>diff --git a/Documentation/hwmon/w83l785ts b/Documentation/hwmon/w83l785ts.rst<br/>index c8978478871f..7fa5418fed11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83l785ts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83l785ts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83l785ts.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83l785ts.rst</a></div><div class='hunk'>@@ -2,14 +2,19 @@ Kernel driver w83l785ts</div><div class='ctx'> =======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Winbond W83L785TS-S</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83l785ts'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2e</div><div class='add'>+</div><div class='ctx'>     Datasheet: Publicly available at the Winbond USA website</div><div class='del'>-               http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf</div><div class='add'>+</div><div class='add'>+	       http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf</div><div class='ctx'> </div><div class='ctx'> Authors:</div><div class='del'>-        Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='add'>+	Jean Delvare &lt;jdelvare@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='head'>diff --git a/Documentation/hwmon/w83l786ng b/Documentation/hwmon/w83l786ng.rst<br/>index d8f55d7fff10..2b7776190de3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83l786ng?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/w83l786ng</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/w83l786ng.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/w83l786ng.rst</a></div><div class='hunk'>@@ -1,10 +1,14 @@</div><div class='ctx'> Kernel driver w83l786ng</div><div class='del'>-=====================</div><div class='add'>+=======================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Winbond W83L786NG/W83L786NR</div><div class='add'>+</div><div class='ctx'>     Prefix: 'w83l786ng'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: I2C 0x2e - 0x2f</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L786NRNG09.pdf</div><div class='ctx'> </div><div class='ctx'> Author: Kevin Lo &lt;kevlo@kevlo.org&gt;</div><div class='hunk'>@@ -14,9 +18,10 @@ Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='ctx'> * reset boolean</div><div class='del'>-  (default 0)</div><div class='del'>-  Use 'reset=1' to reset the chip (via index 0x40, bit 7). The default</div><div class='del'>-  behavior is no chip reset to preserve BIOS settings</div><div class='add'>+    (default 0)</div><div class='add'>+</div><div class='add'>+    Use 'reset=1' to reset the chip (via index 0x40, bit 7). The default</div><div class='add'>+    behavior is no chip reset to preserve BIOS settings</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -41,14 +46,21 @@ or maximum limit.</div><div class='ctx'> /sys files</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='del'>-pwm[1-2] - this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='del'>-	    0 (stop) to 255 (full)</div><div class='del'>-pwm[1-2]_enable - this file controls mode of fan/temperature control:</div><div class='del'>-            * 0 Manual Mode</div><div class='del'>-            * 1 Thermal Cruise</div><div class='del'>-            * 2 Smart Fan II</div><div class='del'>-            * 4 FAN_SET</div><div class='del'>-pwm[1-2]_mode - Select PWM of DC mode</div><div class='del'>-            * 0 DC</div><div class='del'>-            * 1 PWM</div><div class='del'>-tolerance[1-2] - Value in degrees of Celsius (degC) for +- T</div><div class='add'>+pwm[1-2]</div><div class='add'>+	    - this file stores PWM duty cycle or DC value (fan speed) in range:</div><div class='add'>+</div><div class='add'>+	      0 (stop) to 255 (full)</div><div class='add'>+pwm[1-2]_enable</div><div class='add'>+	    - this file controls mode of fan/temperature control:</div><div class='add'>+</div><div class='add'>+	    * 0 Manual Mode</div><div class='add'>+	    * 1 Thermal Cruise</div><div class='add'>+	    * 2 Smart Fan II</div><div class='add'>+	    * 4 FAN_SET</div><div class='add'>+pwm[1-2]_mode</div><div class='add'>+	    - Select PWM of DC mode</div><div class='add'>+</div><div class='add'>+	    * 0 DC</div><div class='add'>+	    * 1 PWM</div><div class='add'>+tolerance[1-2]</div><div class='add'>+	    - Value in degrees of Celsius (degC) for +- T</div><div class='head'>diff --git a/Documentation/hwmon/wm831x b/Documentation/hwmon/wm831x.rst<br/>index 11446757c8c8..c56fb35a2fb3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/wm831x?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/wm831x</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/wm831x.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/wm831x.rst</a></div><div class='hunk'>@@ -3,11 +3,14 @@ Kernel driver wm831x-hwmon</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='ctx'>   * Wolfson Microelectronics WM831x PMICs</div><div class='add'>+</div><div class='ctx'>     Prefix: 'wm831x'</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-	http://www.wolfsonmicro.com/products/WM8310</div><div class='del'>-	http://www.wolfsonmicro.com/products/WM8311</div><div class='del'>-	http://www.wolfsonmicro.com/products/WM8312</div><div class='add'>+</div><div class='add'>+	- http://www.wolfsonmicro.com/products/WM8310</div><div class='add'>+	- http://www.wolfsonmicro.com/products/WM8311</div><div class='add'>+	- http://www.wolfsonmicro.com/products/WM8312</div><div class='ctx'> </div><div class='ctx'> Authors: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/wm8350 b/Documentation/hwmon/wm8350.rst<br/>index 98f923bd2e92..cec044ca5900 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/wm8350?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/wm8350</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/wm8350.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/wm8350.rst</a></div><div class='hunk'>@@ -2,12 +2,16 @@ Kernel driver wm8350-hwmon</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Wolfson Microelectronics WM835x PMICs</div><div class='add'>+</div><div class='ctx'>     Prefix: 'wm8350'</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-	http://www.wolfsonmicro.com/products/WM8350</div><div class='del'>-	http://www.wolfsonmicro.com/products/WM8351</div><div class='del'>-	http://www.wolfsonmicro.com/products/WM8352</div><div class='add'>+</div><div class='add'>+	- http://www.wolfsonmicro.com/products/WM8350</div><div class='add'>+	- http://www.wolfsonmicro.com/products/WM8351</div><div class='add'>+	- http://www.wolfsonmicro.com/products/WM8352</div><div class='ctx'> </div><div class='ctx'> Authors: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/xgene-hwmon b/Documentation/hwmon/xgene-hwmon.rst<br/>index 6ec50ed7cc8f..439b30b881b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/xgene-hwmon?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/xgene-hwmon</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/xgene-hwmon.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/xgene-hwmon.rst</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> Kernel driver xgene-hwmon</div><div class='del'>-========================</div><div class='add'>+=========================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>  * APM X-Gene SoC</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -15,16 +16,21 @@ For ACPI, it is the PCC mailbox.</div><div class='ctx'> The following sensors are supported</div><div class='ctx'> </div><div class='ctx'>   * Temperature</div><div class='del'>-    - SoC on-die temperature in milli-degree C</div><div class='del'>-    - Alarm when high/over temperature occurs</div><div class='add'>+      - SoC on-die temperature in milli-degree C</div><div class='add'>+      - Alarm when high/over temperature occurs</div><div class='add'>+</div><div class='ctx'>   * Power</div><div class='del'>-    - CPU power in uW</div><div class='del'>-    - IO power in uW</div><div class='add'>+      - CPU power in uW</div><div class='add'>+      - IO power in uW</div><div class='ctx'> </div><div class='ctx'> sysfs-Interface</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-temp0_input - SoC on-die temperature (milli-degree C)</div><div class='del'>-temp0_critical_alarm - An 1 would indicates on-die temperature exceeded threshold</div><div class='del'>-power0_input - CPU power in (uW)</div><div class='del'>-power1_input - IO power in (uW)</div><div class='add'>+temp0_input</div><div class='add'>+	- SoC on-die temperature (milli-degree C)</div><div class='add'>+temp0_critical_alarm</div><div class='add'>+	- An 1 would indicates on-die temperature exceeded threshold</div><div class='add'>+power0_input</div><div class='add'>+	- CPU power in (uW)</div><div class='add'>+power1_input</div><div class='add'>+	- IO power in (uW)</div><div class='head'>diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100.rst<br/>index 477a94b131ae..41513bb7fe51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/zl6100?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/hwmon/zl6100</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/hwmon/zl6100.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/hwmon/zl6100.rst</a></div><div class='hunk'>@@ -2,57 +2,106 @@ Kernel driver zl6100</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL2004</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl2004'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6847.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL2005</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl2005'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6848.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL2006</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl2006'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6850.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL2008</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl2008'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6859.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL2105</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl2105'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6851.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL2106</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl2106'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6852.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL6100</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl6100'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6876.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL6105</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl6105'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6906.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL9101M</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl9101'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn7669.pdf</div><div class='add'>+</div><div class='ctx'>   * Intersil / Zilker Labs ZL9117M</div><div class='add'>+</div><div class='ctx'>     Prefix: 'zl9117'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn7914.pdf</div><div class='add'>+</div><div class='ctx'>   * Ericsson BMR450, BMR451</div><div class='add'>+</div><div class='ctx'>     Prefix: 'bmr450', 'bmr451'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='add'>+</div><div class='ctx'> http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146401</div><div class='add'>+</div><div class='ctx'>   * Ericsson BMR462, BMR463, BMR464</div><div class='add'>+</div><div class='ctx'>     Prefixes: 'bmr462', 'bmr463', 'bmr464'</div><div class='add'>+</div><div class='ctx'>     Addresses scanned: -</div><div class='add'>+</div><div class='ctx'>     Datasheet:</div><div class='del'>-http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256</div><div class='ctx'> </div><div class='add'>+	http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +113,7 @@ This driver supports hardware monitoring for Intersil / Zilker Labs ZL6100 and</div><div class='ctx'> compatible digital DC-DC controllers.</div><div class='ctx'> </div><div class='ctx'> The driver is a client driver to the core PMBus driver. Please see</div><div class='del'>-Documentation/hwmon/pmbus and Documentation.hwmon/pmbus-core for details</div><div class='add'>+Documentation/hwmon/pmbus.rst and Documentation.hwmon/pmbus-core for details</div><div class='ctx'> on PMBus client drivers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -75,13 +124,15 @@ This driver does not auto-detect devices. You will have to instantiate the</div><div class='ctx'> devices explicitly. Please see Documentation/i2c/instantiating-devices for</div><div class='ctx'> details.</div><div class='ctx'> </div><div class='del'>-WARNING: Do not access chip registers using the i2cdump command, and do not use</div><div class='del'>-any of the i2ctools commands on a command register used to save and restore</div><div class='del'>-configuration data (0x11, 0x12, 0x15, 0x16, and 0xf4). The chips supported by</div><div class='del'>-this driver interpret any access to those command registers (including read</div><div class='del'>-commands) as request to execute the command in question. Unless write accesses</div><div class='del'>-to those registers are protected, this may result in power loss, board resets,</div><div class='del'>-and/or Flash corruption. Worst case, your board may turn into a brick.</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+  Do not access chip registers using the i2cdump command, and do not use</div><div class='add'>+  any of the i2ctools commands on a command register used to save and restore</div><div class='add'>+  configuration data (0x11, 0x12, 0x15, 0x16, and 0xf4). The chips supported by</div><div class='add'>+  this driver interpret any access to those command registers (including read</div><div class='add'>+  commands) as request to execute the command in question. Unless write accesses</div><div class='add'>+  to those registers are protected, this may result in power loss, board resets,</div><div class='add'>+  and/or Flash corruption. Worst case, your board may turn into a brick.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Platform data support</div><div class='hunk'>@@ -110,6 +161,7 @@ Sysfs entries</div><div class='ctx'> The following attributes are supported. Limits are read-write; all other</div><div class='ctx'> attributes are read-only.</div><div class='ctx'> </div><div class='add'>+======================= ========================================================</div><div class='ctx'> in1_label		"vin"</div><div class='ctx'> in1_input		Measured input voltage.</div><div class='ctx'> in1_min			Minimum input voltage.</div><div class='hunk'>@@ -158,3 +210,4 @@ temp[12]_min_alarm	Chip temperature low alarm.</div><div class='ctx'> temp[12]_max_alarm	Chip temperature high alarm.</div><div class='ctx'> temp[12]_lcrit_alarm	Chip temperature critical low alarm.</div><div class='ctx'> temp[12]_crit_alarm	Chip temperature critical high alarm.</div><div class='add'>+======================= ========================================================</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801<br/>index d1ee484a787d..ee9984f35868 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/i2c/busses/i2c-i801?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/i2c/busses/i2c-i801</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/i2c/busses/i2c-i801?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/i2c/busses/i2c-i801</a></div><div class='hunk'>@@ -36,6 +36,7 @@ Supported adapters:</div><div class='ctx'>   * Intel Cannon Lake (PCH)</div><div class='ctx'>   * Intel Cedar Fork (PCH)</div><div class='ctx'>   * Intel Ice Lake (PCH)</div><div class='add'>+  * Intel Comet Lake (PCH)</div><div class='ctx'>    Datasheets: Publicly available at the Intel website</div><div class='ctx'> </div><div class='ctx'> On Intel Patsburg and later chipsets, both the normal host SMBus controller</div><div class='head'>diff --git a/Documentation/index.rst b/Documentation/index.rst<br/>index 80a421cb935e..fec80fee512a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/index.rst</a></div><div class='hunk'>@@ -35,6 +35,16 @@ trying to get it to work optimally on a given system.</div><div class='ctx'> </div><div class='ctx'>    admin-guide/index</div><div class='ctx'> </div><div class='add'>+Firmware-related documentation</div><div class='add'>+------------------------------</div><div class='add'>+The following holds information on the kernel's expectations regarding the</div><div class='add'>+platform firmwares.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   firmware-guide/index</div><div class='add'>+</div><div class='ctx'> Application-developer documentation</div><div class='ctx'> -----------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -83,6 +93,7 @@ needed).</div><div class='ctx'>    media/index</div><div class='ctx'>    networking/index</div><div class='ctx'>    input/index</div><div class='add'>+   hwmon/index</div><div class='ctx'>    gpu/index</div><div class='ctx'>    security/index</div><div class='ctx'>    sound/index</div><div class='head'>diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt<br/>index 8a3830b39c7d..9c230ea71963 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/kbuild/kbuild.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/kbuild/kbuild.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/kbuild/kbuild.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/kbuild/kbuild.txt</a></div><div class='hunk'>@@ -11,6 +11,11 @@ modules.builtin</div><div class='ctx'> This file lists all modules that are built into the kernel. This is used</div><div class='ctx'> by modprobe to not fail when trying to load something builtin.</div><div class='ctx'> </div><div class='add'>+modules.builtin.modinfo</div><div class='add'>+--------------------------------------------------</div><div class='add'>+This file contains modinfo from all modules that are built into the kernel.</div><div class='add'>+Unlike modinfo of a separate module, all fields are prefixed with module name.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Environment variables</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt<br/>index 10f4499e677c..8baab8832c5b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/kprobes.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/kprobes.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/kprobes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/kprobes.txt</a></div><div class='hunk'>@@ -243,10 +243,10 @@ Optimization</div><div class='ctx'> ^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The Kprobe-optimizer doesn't insert the jump instruction immediately;</div><div class='del'>-rather, it calls synchronize_sched() for safety first, because it's</div><div class='add'>+rather, it calls synchronize_rcu() for safety first, because it's</div><div class='ctx'> possible for a CPU to be interrupted in the middle of executing the</div><div class='del'>-optimized region [3]_.  As you know, synchronize_sched() can ensure</div><div class='del'>-that all interruptions that were active when synchronize_sched()</div><div class='add'>+optimized region [3]_.  As you know, synchronize_rcu() can ensure</div><div class='add'>+that all interruptions that were active when synchronize_rcu()</div><div class='ctx'> was called are done, but only if CONFIG_PREEMPT=n.  So, this version</div><div class='ctx'> of kprobe optimization supports only kernels with CONFIG_PREEMPT=n [4]_.</div><div class='ctx'> </div><div class='hunk'>@@ -321,6 +321,7 @@ architectures:</div><div class='ctx'> - ppc</div><div class='ctx'> - mips</div><div class='ctx'> - s390</div><div class='add'>+- parisc</div><div class='ctx'> </div><div class='ctx'> Configuring Kprobes</div><div class='ctx'> ===================</div><div class='head'>diff --git a/Documentation/livepatch/callbacks.txt b/Documentation/livepatch/callbacks.rst<br/>index 182e31d4abce..470944aa8658 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/callbacks.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/callbacks.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/callbacks.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/livepatch/callbacks.rst</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> Livepatch (un)patch-callbacks provide a mechanism for livepatch modules</div><div class='ctx'> to execute callback functions when a kernel object is (un)patched.  They</div><div class='del'>-can be considered a "power feature" that extends livepatching abilities</div><div class='add'>+can be considered a **power feature** that **extends livepatching abilities**</div><div class='ctx'> to include:</div><div class='ctx'> </div><div class='ctx'>   - Safe updates to global data</div><div class='hunk'>@@ -17,6 +17,9 @@ In most cases, (un)patch callbacks will need to be used in conjunction</div><div class='ctx'> with memory barriers and kernel synchronization primitives, like</div><div class='ctx'> mutexes/spinlocks, or even stop_machine(), to avoid concurrency issues.</div><div class='ctx'> </div><div class='add'>+1. Motivation</div><div class='add'>+=============</div><div class='add'>+</div><div class='ctx'> Callbacks differ from existing kernel facilities:</div><div class='ctx'> </div><div class='ctx'>   - Module init/exit code doesn't run when disabling and re-enabling a</div><div class='hunk'>@@ -28,21 +31,31 @@ Callbacks are part of the klp_object structure and their implementation</div><div class='ctx'> is specific to that klp_object.  Other livepatch objects may or may not</div><div class='ctx'> be patched, irrespective of the target klp_object's current state.</div><div class='ctx'> </div><div class='add'>+2. Callback types</div><div class='add'>+=================</div><div class='add'>+</div><div class='ctx'> Callbacks can be registered for the following livepatch actions:</div><div class='ctx'> </div><div class='del'>-  * Pre-patch    - before a klp_object is patched</div><div class='add'>+  * Pre-patch</div><div class='add'>+                 - before a klp_object is patched</div><div class='ctx'> </div><div class='del'>-  * Post-patch   - after a klp_object has been patched and is active</div><div class='add'>+  * Post-patch</div><div class='add'>+                 - after a klp_object has been patched and is active</div><div class='ctx'>                    across all tasks</div><div class='ctx'> </div><div class='del'>-  * Pre-unpatch  - before a klp_object is unpatched (ie, patched code is</div><div class='add'>+  * Pre-unpatch</div><div class='add'>+                 - before a klp_object is unpatched (ie, patched code is</div><div class='ctx'>                    active), used to clean up post-patch callback</div><div class='ctx'>                    resources</div><div class='ctx'> </div><div class='del'>-  * Post-unpatch - after a klp_object has been patched, all code has</div><div class='add'>+  * Post-unpatch</div><div class='add'>+                 - after a klp_object has been patched, all code has</div><div class='ctx'>                    been restored and no tasks are running patched code,</div><div class='ctx'>                    used to cleanup pre-patch callback resources</div><div class='ctx'> </div><div class='add'>+3. How it works</div><div class='add'>+===============</div><div class='add'>+</div><div class='ctx'> Each callback is optional, omitting one does not preclude specifying any</div><div class='ctx'> other.  However, the livepatching core executes the handlers in</div><div class='ctx'> symmetry: pre-patch callbacks have a post-unpatch counterpart and</div><div class='hunk'>@@ -86,11 +99,14 @@ If the object did successfully patch, but the patch transition never</div><div class='ctx'> started for some reason (e.g., if another object failed to patch),</div><div class='ctx'> only the post-unpatch callback will be called.</div><div class='ctx'> </div><div class='add'>+4. Use cases</div><div class='add'>+============</div><div class='ctx'> </div><div class='del'>-Example Use-cases</div><div class='del'>-=================</div><div class='add'>+Sample livepatch modules demonstrating the callback API can be found in</div><div class='add'>+samples/livepatch/ directory.  These samples were modified for use in</div><div class='add'>+kselftests and can be found in the lib/livepatch directory.</div><div class='ctx'> </div><div class='del'>-Update global data</div><div class='add'>+Global data update</div><div class='ctx'> ------------------</div><div class='ctx'> </div><div class='ctx'> A pre-patch callback can be useful to update a global variable.  For</div><div class='hunk'>@@ -103,24 +119,15 @@ patch the data *after* patching is complete with a post-patch callback,</div><div class='ctx'> so that tcp_send_challenge_ack() could first be changed to read</div><div class='ctx'> sysctl_tcp_challenge_ack_limit with READ_ONCE.</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-Support __init and probe function patches</div><div class='add'>+__init and probe function patches support</div><div class='ctx'> -----------------------------------------</div><div class='ctx'> </div><div class='ctx'> Although __init and probe functions are not directly livepatch-able, it</div><div class='ctx'> may be possible to implement similar updates via pre/post-patch</div><div class='ctx'> callbacks.</div><div class='ctx'> </div><div class='del'>-48900cb6af42 ("virtio-net: drop NETIF_F_FRAGLIST") change the way that</div><div class='add'>+The commit ``48900cb6af42 ("virtio-net: drop NETIF_F_FRAGLIST")`` change the way that</div><div class='ctx'> virtnet_probe() initialized its driver's net_device features.  A</div><div class='ctx'> pre/post-patch callback could iterate over all such devices, making a</div><div class='ctx'> similar change to their hw_features value.  (Client functions of the</div><div class='ctx'> value may need to be updated accordingly.)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Other Examples</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Sample livepatch modules demonstrating the callback API can be found in</div><div class='del'>-samples/livepatch/ directory.  These samples were modified for use in</div><div class='del'>-kselftests and can be found in the lib/livepatch directory.</div><div class='head'>diff --git a/Documentation/livepatch/cumulative-patches.txt b/Documentation/livepatch/cumulative-patches.rst<br/>index 0012808e8d44..1931f318976a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/cumulative-patches.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/cumulative-patches.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/cumulative-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/livepatch/cumulative-patches.rst</a></div><div class='hunk'>@@ -18,7 +18,7 @@ Usage</div><div class='ctx'> -----</div><div class='ctx'> </div><div class='ctx'> The atomic replace can be enabled by setting "replace" flag in struct klp_patch,</div><div class='del'>-for example:</div><div class='add'>+for example::</div><div class='ctx'> </div><div class='ctx'> 	static struct klp_patch patch = {</div><div class='ctx'> 		.mod = THIS_MODULE,</div><div class='hunk'>@@ -49,19 +49,19 @@ Features</div><div class='ctx'> </div><div class='ctx'> The atomic replace allows:</div><div class='ctx'> </div><div class='del'>-  + Atomically revert some functions in a previous patch while</div><div class='add'>+  - Atomically revert some functions in a previous patch while</div><div class='ctx'>     upgrading other functions.</div><div class='ctx'> </div><div class='del'>-  + Remove eventual performance impact caused by core redirection</div><div class='add'>+  - Remove eventual performance impact caused by core redirection</div><div class='ctx'>     for functions that are no longer patched.</div><div class='ctx'> </div><div class='del'>-  + Decrease user confusion about dependencies between livepatches.</div><div class='add'>+  - Decrease user confusion about dependencies between livepatches.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Limitations:</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='del'>-  + Once the operation finishes, there is no straightforward way</div><div class='add'>+  - Once the operation finishes, there is no straightforward way</div><div class='ctx'>     to reverse it and restore the replaced patches atomically.</div><div class='ctx'> </div><div class='ctx'>     A good practice is to set .replace flag in any released livepatch.</div><div class='hunk'>@@ -74,7 +74,7 @@ Limitations:</div><div class='ctx'>     only when the transition was not forced.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + Only the (un)patching callbacks from the _new_ cumulative livepatch are</div><div class='add'>+  - Only the (un)patching callbacks from the _new_ cumulative livepatch are</div><div class='ctx'>     executed. Any callbacks from the replaced patches are ignored.</div><div class='ctx'> </div><div class='ctx'>     In other words, the cumulative patch is responsible for doing any actions</div><div class='hunk'>@@ -93,7 +93,7 @@ Limitations:</div><div class='ctx'>     enabled patches were called.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + There is no special handling of shadow variables. Livepatch authors</div><div class='add'>+  - There is no special handling of shadow variables. Livepatch authors</div><div class='ctx'>     must create their own rules how to pass them from one cumulative</div><div class='ctx'>     patch to the other. Especially that they should not blindly remove</div><div class='ctx'>     them in module_exit() functions.</div><div class='head'>diff --git a/Documentation/livepatch/index.rst b/Documentation/livepatch/index.rst<br/>new file mode 100644<br/>index 000000000000..edd291d51847<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/livepatch/index.rst</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+:orphan:</div><div class='add'>+</div><div class='add'>+===================</div><div class='add'>+Kernel Livepatching</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+    :maxdepth: 1</div><div class='add'>+</div><div class='add'>+    livepatch</div><div class='add'>+    callbacks</div><div class='add'>+    cumulative-patches</div><div class='add'>+    module-elf-format</div><div class='add'>+    shadow-vars</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/livepatch/livepatch.txt b/Documentation/livepatch/livepatch.rst<br/>index 4627b41ff02e..c2c598c4ead8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/livepatch.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/livepatch.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/livepatch.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/livepatch/livepatch.rst</a></div><div class='hunk'>@@ -4,22 +4,22 @@ Livepatch</div><div class='ctx'> </div><div class='ctx'> This document outlines basic information about kernel livepatching.</div><div class='ctx'> </div><div class='del'>-Table of Contents:</div><div class='del'>-</div><div class='del'>-1. Motivation</div><div class='del'>-2. Kprobes, Ftrace, Livepatching</div><div class='del'>-3. Consistency model</div><div class='del'>-4. Livepatch module</div><div class='del'>-   4.1. New functions</div><div class='del'>-   4.2. Metadata</div><div class='del'>-5. Livepatch life-cycle</div><div class='del'>-   5.1. Loading</div><div class='del'>-   5.2. Enabling</div><div class='del'>-   5.3. Replacing</div><div class='del'>-   5.4. Disabling</div><div class='del'>-   5.5. Removing</div><div class='del'>-6. Sysfs</div><div class='del'>-7. Limitations</div><div class='add'>+.. Table of Contents:</div><div class='add'>+</div><div class='add'>+    1. Motivation</div><div class='add'>+    2. Kprobes, Ftrace, Livepatching</div><div class='add'>+    3. Consistency model</div><div class='add'>+    4. Livepatch module</div><div class='add'>+       4.1. New functions</div><div class='add'>+       4.2. Metadata</div><div class='add'>+    5. Livepatch life-cycle</div><div class='add'>+       5.1. Loading</div><div class='add'>+       5.2. Enabling</div><div class='add'>+       5.3. Replacing</div><div class='add'>+       5.4. Disabling</div><div class='add'>+       5.5. Removing</div><div class='add'>+    6. Sysfs</div><div class='add'>+    7. Limitations</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1. Motivation</div><div class='hunk'>@@ -40,14 +40,14 @@ There are multiple mechanisms in the Linux kernel that are directly related</div><div class='ctx'> to redirection of code execution; namely: kernel probes, function tracing,</div><div class='ctx'> and livepatching:</div><div class='ctx'> </div><div class='del'>-  + The kernel probes are the most generic. The code can be redirected by</div><div class='add'>+  - The kernel probes are the most generic. The code can be redirected by</div><div class='ctx'>     putting a breakpoint instruction instead of any instruction.</div><div class='ctx'> </div><div class='del'>-  + The function tracer calls the code from a predefined location that is</div><div class='add'>+  - The function tracer calls the code from a predefined location that is</div><div class='ctx'>     close to the function entry point. This location is generated by the</div><div class='ctx'>     compiler using the '-pg' gcc option.</div><div class='ctx'> </div><div class='del'>-  + Livepatching typically needs to redirect the code at the very beginning</div><div class='add'>+  - Livepatching typically needs to redirect the code at the very beginning</div><div class='ctx'>     of the function entry before the function parameters or the stack</div><div class='ctx'>     are in any way modified.</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +249,7 @@ The patch contains only functions that are really modified. But they</div><div class='ctx'> might want to access functions or data from the original source file</div><div class='ctx'> that may only be locally accessible. This can be solved by a special</div><div class='ctx'> relocation section in the generated livepatch module, see</div><div class='del'>-Documentation/livepatch/module-elf-format.txt for more details.</div><div class='add'>+Documentation/livepatch/module-elf-format.rst for more details.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 4.2. Metadata</div><div class='hunk'>@@ -258,7 +258,7 @@ Documentation/livepatch/module-elf-format.txt for more details.</div><div class='ctx'> The patch is described by several structures that split the information</div><div class='ctx'> into three levels:</div><div class='ctx'> </div><div class='del'>-  + struct klp_func is defined for each patched function. It describes</div><div class='add'>+  - struct klp_func is defined for each patched function. It describes</div><div class='ctx'>     the relation between the original and the new implementation of a</div><div class='ctx'>     particular function.</div><div class='ctx'> </div><div class='hunk'>@@ -275,7 +275,7 @@ into three levels:</div><div class='ctx'>     only for a particular object ( vmlinux or a kernel module ). Note that</div><div class='ctx'>     kallsyms allows for searching symbols according to the object name.</div><div class='ctx'> </div><div class='del'>-  + struct klp_object defines an array of patched functions (struct</div><div class='add'>+  - struct klp_object defines an array of patched functions (struct</div><div class='ctx'>     klp_func) in the same object. Where the object is either vmlinux</div><div class='ctx'>     (NULL) or a module name.</div><div class='ctx'> </div><div class='hunk'>@@ -285,7 +285,7 @@ into three levels:</div><div class='ctx'>     only when they are available.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + struct klp_patch defines an array of patched objects (struct</div><div class='add'>+  - struct klp_patch defines an array of patched objects (struct</div><div class='ctx'>     klp_object).</div><div class='ctx'> </div><div class='ctx'>     This structure handles all patched functions consistently and eventually,</div><div class='hunk'>@@ -337,14 +337,16 @@ operation fails.</div><div class='ctx'> Second, livepatch enters into a transition state where tasks are converging</div><div class='ctx'> to the patched state. If an original function is patched for the first</div><div class='ctx'> time, a function specific struct klp_ops is created and an universal</div><div class='del'>-ftrace handler is registered[*]. This stage is indicated by a value of '1'</div><div class='add'>+ftrace handler is registered\ [#]_. This stage is indicated by a value of '1'</div><div class='ctx'> in /sys/kernel/livepatch/&lt;name&gt;/transition. For more information about</div><div class='ctx'> this process, see the "Consistency model" section.</div><div class='ctx'> </div><div class='ctx'> Finally, once all tasks have been patched, the 'transition' value changes</div><div class='ctx'> to '0'.</div><div class='ctx'> </div><div class='del'>-[*] Note that functions might be patched multiple times. The ftrace handler</div><div class='add'>+.. [#]</div><div class='add'>+</div><div class='add'>+    Note that functions might be patched multiple times. The ftrace handler</div><div class='ctx'>     is registered only once for a given function. Further patches just add</div><div class='ctx'>     an entry to the list (see field `func_stack`) of the struct klp_ops.</div><div class='ctx'>     The right implementation is selected by the ftrace handler, see</div><div class='hunk'>@@ -368,7 +370,7 @@ the ftrace handler is unregistered and the struct klp_ops is</div><div class='ctx'> freed when the related function is not modified by the new patch</div><div class='ctx'> and func_stack list becomes empty.</div><div class='ctx'> </div><div class='del'>-See Documentation/livepatch/cumulative-patches.txt for more details.</div><div class='add'>+See Documentation/livepatch/cumulative-patches.rst for more details.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 5.4. Disabling</div><div class='hunk'>@@ -421,7 +423,7 @@ See Documentation/ABI/testing/sysfs-kernel-livepatch for more details.</div><div class='ctx'> </div><div class='ctx'> The current Livepatch implementation has several limitations:</div><div class='ctx'> </div><div class='del'>-  + Only functions that can be traced could be patched.</div><div class='add'>+  - Only functions that can be traced could be patched.</div><div class='ctx'> </div><div class='ctx'>     Livepatch is based on the dynamic ftrace. In particular, functions</div><div class='ctx'>     implementing ftrace or the livepatch ftrace handler could not be</div><div class='hunk'>@@ -431,7 +433,7 @@ The current Livepatch implementation has several limitations:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + Livepatch works reliably only when the dynamic ftrace is located at</div><div class='add'>+  - Livepatch works reliably only when the dynamic ftrace is located at</div><div class='ctx'>     the very beginning of the function.</div><div class='ctx'> </div><div class='ctx'>     The function need to be redirected before the stack or the function</div><div class='hunk'>@@ -445,7 +447,7 @@ The current Livepatch implementation has several limitations:</div><div class='ctx'>     this is handled on the ftrace level.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + Kretprobes using the ftrace framework conflict with the patched</div><div class='add'>+  - Kretprobes using the ftrace framework conflict with the patched</div><div class='ctx'>     functions.</div><div class='ctx'> </div><div class='ctx'>     Both kretprobes and livepatches use a ftrace handler that modifies</div><div class='hunk'>@@ -453,7 +455,7 @@ The current Livepatch implementation has several limitations:</div><div class='ctx'>     is rejected when the handler is already in use by the other.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + Kprobes in the original function are ignored when the code is</div><div class='add'>+  - Kprobes in the original function are ignored when the code is</div><div class='ctx'>     redirected to the new implementation.</div><div class='ctx'> </div><div class='ctx'>     There is a work in progress to add warnings about this situation.</div><div class='head'>diff --git a/Documentation/livepatch/module-elf-format.txt b/Documentation/livepatch/module-elf-format.rst<br/>index f21a5289a09c..2a591e6f8e6c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/module-elf-format.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/module-elf-format.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/module-elf-format.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/livepatch/module-elf-format.rst</a></div><div class='hunk'>@@ -4,33 +4,21 @@ Livepatch module Elf format</div><div class='ctx'> </div><div class='ctx'> This document outlines the Elf format requirements that livepatch modules must follow.</div><div class='ctx'> </div><div class='del'>------------------</div><div class='del'>-Table of Contents</div><div class='del'>------------------</div><div class='del'>-0. Background and motivation</div><div class='del'>-1. Livepatch modinfo field</div><div class='del'>-2. Livepatch relocation sections</div><div class='del'>-   2.1 What are livepatch relocation sections?</div><div class='del'>-   2.2 Livepatch relocation section format</div><div class='del'>-       2.2.1 Required flags</div><div class='del'>-       2.2.2 Required name format</div><div class='del'>-       2.2.3 Example livepatch relocation section names</div><div class='del'>-       2.2.4 Example `readelf --sections` output</div><div class='del'>-       2.2.5 Example `readelf --relocs` output</div><div class='del'>-3. Livepatch symbols</div><div class='del'>-   3.1 What are livepatch symbols?</div><div class='del'>-   3.2 A livepatch module's symbol table</div><div class='del'>-   3.3 Livepatch symbol format</div><div class='del'>-       3.3.1 Required flags</div><div class='del'>-       3.3.2 Required name format</div><div class='del'>-       3.3.3 Example livepatch symbol names</div><div class='del'>-       3.3.4 Example `readelf --symbols` output</div><div class='del'>-4. Architecture-specific sections</div><div class='del'>-5. Symbol table and Elf section access</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-0. Background and motivation</div><div class='del'>-----------------------------</div><div class='add'>+</div><div class='add'>+.. Table of Contents</div><div class='add'>+</div><div class='add'>+   1. Background and motivation</div><div class='add'>+   2. Livepatch modinfo field</div><div class='add'>+   3. Livepatch relocation sections</div><div class='add'>+      3.1 Livepatch relocation section format</div><div class='add'>+   4. Livepatch symbols</div><div class='add'>+      4.1 A livepatch module's symbol table</div><div class='add'>+      4.2 Livepatch symbol format</div><div class='add'>+   5. Architecture-specific sections</div><div class='add'>+   6. Symbol table and Elf section access</div><div class='add'>+</div><div class='add'>+1. Background and motivation</div><div class='add'>+============================</div><div class='ctx'> </div><div class='ctx'> Formerly, livepatch required separate architecture-specific code to write</div><div class='ctx'> relocations. However, arch-specific code to write relocations already</div><div class='hunk'>@@ -52,8 +40,8 @@ relocation sections and symbols, which are described in this document. The</div><div class='ctx'> Elf constants used to mark livepatch symbols and relocation sections were</div><div class='ctx'> selected from OS-specific ranges according to the definitions from glibc.</div><div class='ctx'> </div><div class='del'>-0.1 Why does livepatch need to write its own relocations?</div><div class='del'>----------------------------------------------------------</div><div class='add'>+Why does livepatch need to write its own relocations?</div><div class='add'>+-----------------------------------------------------</div><div class='ctx'> A typical livepatch module contains patched versions of functions that can</div><div class='ctx'> reference non-exported global symbols and non-included local symbols.</div><div class='ctx'> Relocations referencing these types of symbols cannot be left in as-is</div><div class='hunk'>@@ -72,13 +60,8 @@ relas reference are special livepatch symbols (see section 2 and 3). The</div><div class='ctx'> arch-specific livepatch relocation code is replaced by a call to</div><div class='ctx'> apply_relocate_add().</div><div class='ctx'> </div><div class='del'>-================================</div><div class='del'>-PATCH MODULE FORMAT REQUIREMENTS</div><div class='del'>-================================</div><div class='del'>-</div><div class='del'>---------------------------</div><div class='del'>-1. Livepatch modinfo field</div><div class='del'>---------------------------</div><div class='add'>+2. Livepatch modinfo field</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> Livepatch modules are required to have the "livepatch" modinfo attribute.</div><div class='ctx'> See the sample livepatch module in samples/livepatch/ for how this is done.</div><div class='hunk'>@@ -87,22 +70,23 @@ Livepatch modules can be identified by users by using the 'modinfo' command</div><div class='ctx'> and looking for the presence of the "livepatch" field. This field is also</div><div class='ctx'> used by the kernel module loader to identify livepatch modules.</div><div class='ctx'> </div><div class='del'>-Example modinfo output:</div><div class='del'>------------------------</div><div class='del'>-% modinfo livepatch-meminfo.ko</div><div class='del'>-filename:		livepatch-meminfo.ko</div><div class='del'>-livepatch:		Y</div><div class='del'>-license:		GPL</div><div class='del'>-depends:</div><div class='del'>-vermagic:		4.3.0+ SMP mod_unload</div><div class='del'>-</div><div class='del'>---------------------------------</div><div class='del'>-2. Livepatch relocation sections</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>--------------------------------------------</div><div class='del'>-2.1 What are livepatch relocation sections?</div><div class='del'>--------------------------------------------</div><div class='add'>+Example:</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+**Modinfo output:**</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% modinfo livepatch-meminfo.ko</div><div class='add'>+	filename:		livepatch-meminfo.ko</div><div class='add'>+	livepatch:		Y</div><div class='add'>+	license:		GPL</div><div class='add'>+	depends:</div><div class='add'>+	vermagic:		4.3.0+ SMP mod_unload</div><div class='add'>+</div><div class='add'>+3. Livepatch relocation sections</div><div class='add'>+================================</div><div class='add'>+</div><div class='ctx'> A livepatch module manages its own Elf relocation sections to apply</div><div class='ctx'> relocations to modules as well as to the kernel (vmlinux) at the</div><div class='ctx'> appropriate time. For example, if a patch module patches a driver that is</div><div class='hunk'>@@ -127,12 +111,9 @@ Every symbol referenced by a rela in a livepatch relocation section is a</div><div class='ctx'> livepatch symbol. These must be resolved before livepatch can call</div><div class='ctx'> apply_relocate_add(). See Section 3 for more information.</div><div class='ctx'> </div><div class='del'>----------------------------------------</div><div class='del'>-2.2 Livepatch relocation section format</div><div class='del'>----------------------------------------</div><div class='add'>+3.1 Livepatch relocation section format</div><div class='add'>+=======================================</div><div class='ctx'> </div><div class='del'>-2.2.1 Required flags</div><div class='del'>---------------------</div><div class='ctx'> Livepatch relocation sections must be marked with the SHF_RELA_LIVEPATCH</div><div class='ctx'> section flag. See include/uapi/linux/elf.h for the definition. The module</div><div class='ctx'> loader recognizes this flag and will avoid applying those relocation sections</div><div class='hunk'>@@ -140,28 +121,39 @@ at patch module load time. These sections must also be marked with SHF_ALLOC,</div><div class='ctx'> so that the module loader doesn't discard them on module load (i.e. they will</div><div class='ctx'> be copied into memory along with the other SHF_ALLOC sections).</div><div class='ctx'> </div><div class='del'>-2.2.2 Required name format</div><div class='del'>---------------------------</div><div class='del'>-The name of a livepatch relocation section must conform to the following format:</div><div class='add'>+The name of a livepatch relocation section must conform to the following</div><div class='add'>+format::</div><div class='ctx'> </div><div class='del'>-.klp.rela.objname.section_name</div><div class='del'>-^        ^^     ^ ^          ^</div><div class='del'>-|________||_____| |__________|</div><div class='del'>-   [A]      [B]        [C]</div><div class='add'>+  .klp.rela.objname.section_name</div><div class='add'>+  ^        ^^     ^ ^          ^</div><div class='add'>+  |________||_____| |__________|</div><div class='add'>+     [A]      [B]        [C]</div><div class='ctx'> </div><div class='del'>-[A] The relocation section name is prefixed with the string ".klp.rela."</div><div class='del'>-[B] The name of the object (i.e. "vmlinux" or name of module) to</div><div class='del'>-    which the relocation section belongs follows immediately after the prefix.</div><div class='del'>-[C] The actual name of the section to which this relocation section applies.</div><div class='add'>+[A]</div><div class='add'>+  The relocation section name is prefixed with the string ".klp.rela."</div><div class='ctx'> </div><div class='del'>-2.2.3 Example livepatch relocation section names:</div><div class='del'>--------------------------------------------------</div><div class='del'>-.klp.rela.ext4.text.ext4_attr_store</div><div class='del'>-.klp.rela.vmlinux.text.cmdline_proc_show</div><div class='add'>+[B]</div><div class='add'>+  The name of the object (i.e. "vmlinux" or name of module) to</div><div class='add'>+  which the relocation section belongs follows immediately after the prefix.</div><div class='add'>+</div><div class='add'>+[C]</div><div class='add'>+  The actual name of the section to which this relocation section applies.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+**Livepatch relocation section names:**</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  .klp.rela.ext4.text.ext4_attr_store</div><div class='add'>+  .klp.rela.vmlinux.text.cmdline_proc_show</div><div class='add'>+</div><div class='add'>+**`readelf --sections` output for a patch</div><div class='add'>+module that patches vmlinux and modules 9p, btrfs, ext4:**</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='del'>-2.2.4 Example `readelf --sections` output for a patch</div><div class='del'>-module that patches vmlinux and modules 9p, btrfs, ext4:</div><div class='del'>---------------------------------------------------------</div><div class='ctx'>   Section Headers:</div><div class='ctx'>   [Nr] Name                          Type                    Address          Off    Size   ES Flg Lk Inf Al</div><div class='ctx'>   [ snip ]</div><div class='hunk'>@@ -175,31 +167,33 @@ module that patches vmlinux and modules 9p, btrfs, ext4:</div><div class='ctx'>   [ snip ]                                       ^                                             ^</div><div class='ctx'>                                                  |                                             |</div><div class='ctx'>                                                 [*]                                           [*]</div><div class='del'>-[*] Livepatch relocation sections are SHT_RELA sections but with a few special</div><div class='del'>-characteristics. Notice that they are marked SHF_ALLOC ("A") so that they will</div><div class='del'>-not be discarded when the module is loaded into memory, as well as with the</div><div class='del'>-SHF_RELA_LIVEPATCH flag ("o" - for OS-specific).</div><div class='del'>-</div><div class='del'>-2.2.5 Example `readelf --relocs` output for a patch module:</div><div class='del'>------------------------------------------------------------</div><div class='del'>-Relocation section '.klp.rela.btrfs.text.btrfs_feature_attr_show' at offset 0x2ba0 contains 4 entries:</div><div class='del'>-    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend</div><div class='del'>-000000000000001f  0000005e00000002 R_X86_64_PC32          0000000000000000 .klp.sym.vmlinux.printk,0 - 4</div><div class='del'>-0000000000000028  0000003d0000000b R_X86_64_32S           0000000000000000 .klp.sym.btrfs.btrfs_ktype,0 + 0</div><div class='del'>-0000000000000036  0000003b00000002 R_X86_64_PC32          0000000000000000 .klp.sym.btrfs.can_modify_feature.isra.3,0 - 4</div><div class='del'>-000000000000004c  0000004900000002 R_X86_64_PC32          0000000000000000 .klp.sym.vmlinux.snprintf,0 - 4</div><div class='del'>-[ snip ]                                                                   ^</div><div class='del'>-                                                                           |</div><div class='del'>-                                                                          [*]</div><div class='del'>-[*] Every symbol referenced by a relocation is a livepatch symbol.</div><div class='del'>-</div><div class='del'>---------------------</div><div class='del'>-3. Livepatch symbols</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>--------------------------------</div><div class='del'>-3.1 What are livepatch symbols?</div><div class='del'>--------------------------------</div><div class='add'>+</div><div class='add'>+[*]</div><div class='add'>+  Livepatch relocation sections are SHT_RELA sections but with a few special</div><div class='add'>+  characteristics. Notice that they are marked SHF_ALLOC ("A") so that they will</div><div class='add'>+  not be discarded when the module is loaded into memory, as well as with the</div><div class='add'>+  SHF_RELA_LIVEPATCH flag ("o" - for OS-specific).</div><div class='add'>+</div><div class='add'>+**`readelf --relocs` output for a patch module:**</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  Relocation section '.klp.rela.btrfs.text.btrfs_feature_attr_show' at offset 0x2ba0 contains 4 entries:</div><div class='add'>+      Offset             Info             Type               Symbol's Value  Symbol's Name + Addend</div><div class='add'>+  000000000000001f  0000005e00000002 R_X86_64_PC32          0000000000000000 .klp.sym.vmlinux.printk,0 - 4</div><div class='add'>+  0000000000000028  0000003d0000000b R_X86_64_32S           0000000000000000 .klp.sym.btrfs.btrfs_ktype,0 + 0</div><div class='add'>+  0000000000000036  0000003b00000002 R_X86_64_PC32          0000000000000000 .klp.sym.btrfs.can_modify_feature.isra.3,0 - 4</div><div class='add'>+  000000000000004c  0000004900000002 R_X86_64_PC32          0000000000000000 .klp.sym.vmlinux.snprintf,0 - 4</div><div class='add'>+  [ snip ]                                                                   ^</div><div class='add'>+                                                                             |</div><div class='add'>+                                                                            [*]</div><div class='add'>+</div><div class='add'>+[*]</div><div class='add'>+  Every symbol referenced by a relocation is a livepatch symbol.</div><div class='add'>+</div><div class='add'>+4. Livepatch symbols</div><div class='add'>+====================</div><div class='add'>+</div><div class='ctx'> Livepatch symbols are symbols referred to by livepatch relocation sections.</div><div class='ctx'> These are symbols accessed from new versions of functions for patched</div><div class='ctx'> objects, whose addresses cannot be resolved by the module loader (because</div><div class='hunk'>@@ -219,9 +213,8 @@ loader can identify and ignore them. Livepatch modules keep these symbols</div><div class='ctx'> in their symbol tables, and the symbol table is made accessible through</div><div class='ctx'> module-&gt;symtab.</div><div class='ctx'> </div><div class='del'>--------------------------------------</div><div class='del'>-3.2 A livepatch module's symbol table</div><div class='del'>--------------------------------------</div><div class='add'>+4.1 A livepatch module's symbol table</div><div class='add'>+=====================================</div><div class='ctx'> Normally, a stripped down copy of a module's symbol table (containing only</div><div class='ctx'> "core" symbols) is made available through module-&gt;symtab (See layout_symtab()</div><div class='ctx'> in kernel/module.c). For livepatch modules, the symbol table copied into memory</div><div class='hunk'>@@ -231,71 +224,82 @@ relocation section refer to their respective symbols with their symbol indices,</div><div class='ctx'> and the original symbol indices (and thus the symtab ordering) must be</div><div class='ctx'> preserved in order for apply_relocate_add() to find the right symbol.</div><div class='ctx'> </div><div class='del'>-For example, take this particular rela from a livepatch module:</div><div class='del'>-Relocation section '.klp.rela.btrfs.text.btrfs_feature_attr_show' at offset 0x2ba0 contains 4 entries:</div><div class='del'>-    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend</div><div class='del'>-000000000000001f  0000005e00000002 R_X86_64_PC32          0000000000000000 .klp.sym.vmlinux.printk,0 - 4</div><div class='del'>-</div><div class='del'>-This rela refers to the symbol '.klp.sym.vmlinux.printk,0', and the symbol index is encoded</div><div class='del'>-in 'Info'. Here its symbol index is 0x5e, which is 94 in decimal, which refers to the</div><div class='del'>-symbol index 94.</div><div class='del'>-And in this patch module's corresponding symbol table, symbol index 94 refers to that very symbol:</div><div class='del'>-[ snip ]</div><div class='del'>-94: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.printk,0</div><div class='del'>-[ snip ]</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-3.3 Livepatch symbol format</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-3.3.1 Required flags</div><div class='del'>---------------------</div><div class='add'>+For example, take this particular rela from a livepatch module:::</div><div class='add'>+</div><div class='add'>+  Relocation section '.klp.rela.btrfs.text.btrfs_feature_attr_show' at offset 0x2ba0 contains 4 entries:</div><div class='add'>+      Offset             Info             Type               Symbol's Value  Symbol's Name + Addend</div><div class='add'>+  000000000000001f  0000005e00000002 R_X86_64_PC32          0000000000000000 .klp.sym.vmlinux.printk,0 - 4</div><div class='add'>+</div><div class='add'>+  This rela refers to the symbol '.klp.sym.vmlinux.printk,0', and the symbol index is encoded</div><div class='add'>+  in 'Info'. Here its symbol index is 0x5e, which is 94 in decimal, which refers to the</div><div class='add'>+  symbol index 94.</div><div class='add'>+  And in this patch module's corresponding symbol table, symbol index 94 refers to that very symbol:</div><div class='add'>+  [ snip ]</div><div class='add'>+  94: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.printk,0</div><div class='add'>+  [ snip ]</div><div class='add'>+</div><div class='add'>+4.2 Livepatch symbol format</div><div class='add'>+===========================</div><div class='add'>+</div><div class='ctx'> Livepatch symbols must have their section index marked as SHN_LIVEPATCH, so</div><div class='ctx'> that the module loader can identify them and not attempt to resolve them.</div><div class='ctx'> See include/uapi/linux/elf.h for the actual definitions.</div><div class='ctx'> </div><div class='del'>-3.3.2 Required name format</div><div class='del'>---------------------------</div><div class='del'>-Livepatch symbol names must conform to the following format:</div><div class='del'>-</div><div class='del'>-.klp.sym.objname.symbol_name,sympos</div><div class='del'>-^       ^^     ^ ^         ^ ^</div><div class='del'>-|_______||_____| |_________| |</div><div class='del'>-   [A]     [B]       [C]    [D]</div><div class='del'>-</div><div class='del'>-[A] The symbol name is prefixed with the string ".klp.sym."</div><div class='del'>-[B] The name of the object (i.e. "vmlinux" or name of module) to</div><div class='del'>-    which the symbol belongs follows immediately after the prefix.</div><div class='del'>-[C] The actual name of the symbol.</div><div class='del'>-[D] The position of the symbol in the object (as according to kallsyms)</div><div class='del'>-    This is used to differentiate duplicate symbols within the same</div><div class='del'>-    object. The symbol position is expressed numerically (0, 1, 2...).</div><div class='del'>-    The symbol position of a unique symbol is 0.</div><div class='del'>-</div><div class='del'>-3.3.3 Example livepatch symbol names:</div><div class='del'>--------------------------------------</div><div class='del'>-.klp.sym.vmlinux.snprintf,0</div><div class='del'>-.klp.sym.vmlinux.printk,0</div><div class='del'>-.klp.sym.btrfs.btrfs_ktype,0</div><div class='del'>-</div><div class='del'>-3.3.4 Example `readelf --symbols` output for a patch module:</div><div class='del'>-------------------------------------------------------------</div><div class='del'>-Symbol table '.symtab' contains 127 entries:</div><div class='del'>-   Num:    Value          Size Type    Bind   Vis     Ndx         Name</div><div class='del'>-   [ snip ]</div><div class='del'>-    73: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.snprintf,0</div><div class='del'>-    74: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.capable,0</div><div class='del'>-    75: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.find_next_bit,0</div><div class='del'>-    76: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.si_swapinfo,0</div><div class='del'>-  [ snip ]                                               ^</div><div class='del'>-                                                         |</div><div class='del'>-                                                        [*]</div><div class='del'>-[*] Note that the 'Ndx' (Section index) for these symbols is SHN_LIVEPATCH (0xff20).</div><div class='del'>-    "OS" means OS-specific.</div><div class='del'>-</div><div class='del'>----------------------------------</div><div class='del'>-4. Architecture-specific sections</div><div class='del'>----------------------------------</div><div class='add'>+Livepatch symbol names must conform to the following format::</div><div class='add'>+</div><div class='add'>+  .klp.sym.objname.symbol_name,sympos</div><div class='add'>+  ^       ^^     ^ ^         ^ ^</div><div class='add'>+  |_______||_____| |_________| |</div><div class='add'>+     [A]     [B]       [C]    [D]</div><div class='add'>+</div><div class='add'>+[A]</div><div class='add'>+  The symbol name is prefixed with the string ".klp.sym."</div><div class='add'>+</div><div class='add'>+[B]</div><div class='add'>+  The name of the object (i.e. "vmlinux" or name of module) to</div><div class='add'>+  which the symbol belongs follows immediately after the prefix.</div><div class='add'>+</div><div class='add'>+[C]</div><div class='add'>+  The actual name of the symbol.</div><div class='add'>+</div><div class='add'>+[D]</div><div class='add'>+  The position of the symbol in the object (as according to kallsyms)</div><div class='add'>+  This is used to differentiate duplicate symbols within the same</div><div class='add'>+  object. The symbol position is expressed numerically (0, 1, 2...).</div><div class='add'>+  The symbol position of a unique symbol is 0.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+**Livepatch symbol names:**</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	.klp.sym.vmlinux.snprintf,0</div><div class='add'>+	.klp.sym.vmlinux.printk,0</div><div class='add'>+	.klp.sym.btrfs.btrfs_ktype,0</div><div class='add'>+</div><div class='add'>+**`readelf --symbols` output for a patch module:**</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  Symbol table '.symtab' contains 127 entries:</div><div class='add'>+     Num:    Value          Size Type    Bind   Vis     Ndx         Name</div><div class='add'>+     [ snip ]</div><div class='add'>+      73: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.snprintf,0</div><div class='add'>+      74: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.capable,0</div><div class='add'>+      75: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.find_next_bit,0</div><div class='add'>+      76: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT OS [0xff20] .klp.sym.vmlinux.si_swapinfo,0</div><div class='add'>+    [ snip ]                                               ^</div><div class='add'>+                                                           |</div><div class='add'>+                                                          [*]</div><div class='add'>+</div><div class='add'>+[*]</div><div class='add'>+  Note that the 'Ndx' (Section index) for these symbols is SHN_LIVEPATCH (0xff20).</div><div class='add'>+  "OS" means OS-specific.</div><div class='add'>+</div><div class='add'>+5. Architecture-specific sections</div><div class='add'>+=================================</div><div class='ctx'> Architectures may override arch_klp_init_object_loaded() to perform</div><div class='ctx'> additional arch-specific tasks when a target module loads, such as applying</div><div class='ctx'> arch-specific sections. On x86 for example, we must apply per-object</div><div class='hunk'>@@ -304,20 +308,19 @@ These sections must be prefixed with ".klp.arch.$objname." so that they can</div><div class='ctx'> be easily identified when iterating through a patch module's Elf sections</div><div class='ctx'> (See arch/x86/kernel/livepatch.c for a complete example).</div><div class='ctx'> </div><div class='del'>---------------------------------------</div><div class='del'>-5. Symbol table and Elf section access</div><div class='del'>---------------------------------------</div><div class='add'>+6. Symbol table and Elf section access</div><div class='add'>+======================================</div><div class='ctx'> A livepatch module's symbol table is accessible through module-&gt;symtab.</div><div class='ctx'> </div><div class='ctx'> Since apply_relocate_add() requires access to a module's section headers,</div><div class='ctx'> symbol table, and relocation section indices, Elf information is preserved for</div><div class='ctx'> livepatch modules and is made accessible by the module loader through</div><div class='ctx'> module-&gt;klp_info, which is a klp_modinfo struct. When a livepatch module loads,</div><div class='del'>-this struct is filled in by the module loader. Its fields are documented below:</div><div class='del'>-</div><div class='del'>-struct klp_modinfo {</div><div class='del'>-	Elf_Ehdr hdr; /* Elf header */</div><div class='del'>-	Elf_Shdr *sechdrs; /* Section header table */</div><div class='del'>-	char *secstrings; /* String table for the section headers */</div><div class='del'>-	unsigned int symndx; /* The symbol table section index */</div><div class='del'>-};</div><div class='add'>+this struct is filled in by the module loader. Its fields are documented below::</div><div class='add'>+</div><div class='add'>+	struct klp_modinfo {</div><div class='add'>+		Elf_Ehdr hdr; /* Elf header */</div><div class='add'>+		Elf_Shdr *sechdrs; /* Section header table */</div><div class='add'>+		char *secstrings; /* String table for the section headers */</div><div class='add'>+		unsigned int symndx; /* The symbol table section index */</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/livepatch/shadow-vars.txt b/Documentation/livepatch/shadow-vars.rst<br/>index ecc09a7be5dd..c05715aeafa4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/shadow-vars.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/livepatch/shadow-vars.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/livepatch/shadow-vars.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/livepatch/shadow-vars.rst</a></div><div class='hunk'>@@ -27,10 +27,13 @@ A hashtable references all shadow variables.  These references are</div><div class='ctx'> stored and retrieved through a &lt;obj, id&gt; pair.</div><div class='ctx'> </div><div class='ctx'> * The klp_shadow variable data structure encapsulates both tracking</div><div class='del'>-meta-data and shadow-data:</div><div class='add'>+  meta-data and shadow-data:</div><div class='add'>+</div><div class='ctx'>   - meta-data</div><div class='add'>+</div><div class='ctx'>     - obj - pointer to parent object</div><div class='ctx'>     - id - data identifier</div><div class='add'>+</div><div class='ctx'>   - data[] - storage for shadow data</div><div class='ctx'> </div><div class='ctx'> It is important to note that the klp_shadow_alloc() and</div><div class='hunk'>@@ -47,31 +50,43 @@ to do actions that can be done only once when a new variable is allocated.</div><div class='ctx'> </div><div class='ctx'> * klp_shadow_alloc() - allocate and add a new shadow variable</div><div class='ctx'>   - search hashtable for &lt;obj, id&gt; pair</div><div class='add'>+</div><div class='ctx'>   - if exists</div><div class='add'>+</div><div class='ctx'>     - WARN and return NULL</div><div class='add'>+</div><div class='ctx'>   - if &lt;obj, id&gt; doesn't already exist</div><div class='add'>+</div><div class='ctx'>     - allocate a new shadow variable</div><div class='ctx'>     - initialize the variable using a custom constructor and data when provided</div><div class='ctx'>     - add &lt;obj, id&gt; to the global hashtable</div><div class='ctx'> </div><div class='ctx'> * klp_shadow_get_or_alloc() - get existing or alloc a new shadow variable</div><div class='ctx'>   - search hashtable for &lt;obj, id&gt; pair</div><div class='add'>+</div><div class='ctx'>   - if exists</div><div class='add'>+</div><div class='ctx'>     - return existing shadow variable</div><div class='add'>+</div><div class='ctx'>   - if &lt;obj, id&gt; doesn't already exist</div><div class='add'>+</div><div class='ctx'>     - allocate a new shadow variable</div><div class='ctx'>     - initialize the variable using a custom constructor and data when provided</div><div class='ctx'>     - add &lt;obj, id&gt; pair to the global hashtable</div><div class='ctx'> </div><div class='ctx'> * klp_shadow_free() - detach and free a &lt;obj, id&gt; shadow variable</div><div class='ctx'>   - find and remove a &lt;obj, id&gt; reference from global hashtable</div><div class='add'>+</div><div class='ctx'>     - if found</div><div class='add'>+</div><div class='ctx'>       - call destructor function if defined</div><div class='ctx'>       - free shadow variable</div><div class='ctx'> </div><div class='ctx'> * klp_shadow_free_all() - detach and free all &lt;*, id&gt; shadow variables</div><div class='ctx'>   - find and remove any &lt;*, id&gt; references from global hashtable</div><div class='add'>+</div><div class='ctx'>     - if found</div><div class='add'>+</div><div class='ctx'>       - call destructor function if defined</div><div class='ctx'>       - free shadow variable</div><div class='ctx'> </div><div class='hunk'>@@ -102,12 +117,12 @@ parent "goes live" (ie, any shadow variable get-API requests are made</div><div class='ctx'> for this &lt;obj, id&gt; pair.)</div><div class='ctx'> </div><div class='ctx'> For commit 1d147bfa6429, when a parent sta_info structure is allocated,</div><div class='del'>-allocate a shadow copy of the ps_lock pointer, then initialize it:</div><div class='add'>+allocate a shadow copy of the ps_lock pointer, then initialize it::</div><div class='ctx'> </div><div class='del'>-#define PS_LOCK 1</div><div class='del'>-struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,</div><div class='del'>-				const u8 *addr, gfp_t gfp)</div><div class='del'>-{</div><div class='add'>+  #define PS_LOCK 1</div><div class='add'>+  struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,</div><div class='add'>+				  const u8 *addr, gfp_t gfp)</div><div class='add'>+  {</div><div class='ctx'> 	struct sta_info *sta;</div><div class='ctx'> 	spinlock_t *ps_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -123,10 +138,10 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,</div><div class='ctx'> 	...</div><div class='ctx'> </div><div class='ctx'> When requiring a ps_lock, query the shadow variable API to retrieve one</div><div class='del'>-for a specific struct sta_info:</div><div class='add'>+for a specific struct sta_info:::</div><div class='ctx'> </div><div class='del'>-void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)</div><div class='del'>-{</div><div class='add'>+  void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)</div><div class='add'>+  {</div><div class='ctx'> 	spinlock_t *ps_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* sync with ieee80211_tx_h_unicast_ps_buf */</div><div class='hunk'>@@ -136,10 +151,10 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)</div><div class='ctx'> 	...</div><div class='ctx'> </div><div class='ctx'> When the parent sta_info structure is freed, first free the shadow</div><div class='del'>-variable:</div><div class='add'>+variable::</div><div class='ctx'> </div><div class='del'>-void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)</div><div class='del'>-{</div><div class='add'>+  void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)</div><div class='add'>+  {</div><div class='ctx'> 	klp_shadow_free(sta, PS_LOCK, NULL);</div><div class='ctx'> 	kfree(sta);</div><div class='ctx'> 	...</div><div class='hunk'>@@ -155,19 +170,19 @@ these cases, the klp_shadow_get_or_alloc() call can be used to attach</div><div class='ctx'> shadow variables to parents already in-flight.</div><div class='ctx'> </div><div class='ctx'> For commit 1d147bfa6429, a good spot to allocate a shadow spinlock is</div><div class='del'>-inside ieee80211_sta_ps_deliver_wakeup():</div><div class='add'>+inside ieee80211_sta_ps_deliver_wakeup()::</div><div class='ctx'> </div><div class='del'>-int ps_lock_shadow_ctor(void *obj, void *shadow_data, void *ctor_data)</div><div class='del'>-{</div><div class='add'>+  int ps_lock_shadow_ctor(void *obj, void *shadow_data, void *ctor_data)</div><div class='add'>+  {</div><div class='ctx'> 	spinlock_t *lock = shadow_data;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(lock);</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-#define PS_LOCK 1</div><div class='del'>-void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)</div><div class='del'>-{</div><div class='add'>+  #define PS_LOCK 1</div><div class='add'>+  void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)</div><div class='add'>+  {</div><div class='ctx'> 	spinlock_t *ps_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* sync with ieee80211_tx_h_unicast_ps_buf */</div><div class='hunk'>@@ -200,10 +215,12 @@ suggests how to handle the parent object.</div><div class='ctx'> =============</div><div class='ctx'> </div><div class='ctx'> * https://github.com/dynup/kpatch</div><div class='del'>-The livepatch implementation is based on the kpatch version of shadow</div><div class='del'>-variables.</div><div class='add'>+</div><div class='add'>+  The livepatch implementation is based on the kpatch version of shadow</div><div class='add'>+  variables.</div><div class='ctx'> </div><div class='ctx'> * http://files.mkgnu.net/files/dynamos/doc/papers/dynamos_eurosys_07.pdf</div><div class='del'>-Dynamic and Adaptive Updates of Non-Quiescent Subsystems in Commodity</div><div class='del'>-Operating System Kernels (Kritis Makris, Kyung Dong Ryu 2007) presented</div><div class='del'>-a datatype update technique called "shadow data structures".</div><div class='add'>+</div><div class='add'>+  Dynamic and Adaptive Updates of Non-Quiescent Subsystems in Commodity</div><div class='add'>+  Operating System Kernels (Kritis Makris, Kyung Dong Ryu 2007) presented</div><div class='add'>+  a datatype update technique called "shadow data structures".</div><div class='head'>diff --git a/Documentation/lzo.txt b/Documentation/lzo.txt<br/>index f79934225d8d..ca983328976b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/lzo.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/lzo.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/lzo.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/lzo.txt</a></div><div class='hunk'>@@ -102,9 +102,11 @@ Byte sequences</div><div class='ctx'>                 dictionary which is empty, and that it will always be</div><div class='ctx'>                 invalid at this place.</div><div class='ctx'> </div><div class='del'>-      17      : bitstream version. If the first byte is 17, the next byte</div><div class='del'>-                gives the bitstream version (version 1 only). If the first byte</div><div class='del'>-                is not 17, the bitstream version is 0.</div><div class='add'>+      17      : bitstream version. If the first byte is 17, and compressed</div><div class='add'>+                stream length is at least 5 bytes (length of shortest possible</div><div class='add'>+                versioned bitstream), the next byte gives the bitstream version</div><div class='add'>+                (version 1 only).</div><div class='add'>+                Otherwise, the bitstream version is 0.</div><div class='ctx'> </div><div class='ctx'>       18..21  : copy 0..3 literals</div><div class='ctx'>                 state = (byte - 17) = 0..3  [ copy &lt;state&gt; literals ]</div><div class='head'>diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst<br/>index 0a222fc1d7ca..0301c25ff887 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/index.rst</a></div><div class='hunk'>@@ -18,7 +18,7 @@ Linux Media Subsystem Documentation</div><div class='ctx'>    v4l-drivers/index</div><div class='ctx'>    cec-drivers/index</div><div class='ctx'> </div><div class='del'>-.. only::  subproject</div><div class='add'>+.. only:: html and subproject</div><div class='ctx'> </div><div class='ctx'>    Indices</div><div class='ctx'>    =======</div><div class='head'>diff --git a/Documentation/media/kapi/mc-core.rst b/Documentation/media/kapi/mc-core.rst<br/>index f930725e0d6b..05bba0b61748 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/kapi/mc-core.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/kapi/mc-core.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/kapi/mc-core.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/kapi/mc-core.rst</a></div><div class='hunk'>@@ -259,6 +259,45 @@ Subsystems should facilitate link validation by providing subsystem specific</div><div class='ctx'> helper functions to provide easy access for commonly needed information, and</div><div class='ctx'> in the end provide a way to use driver-specific callbacks.</div><div class='ctx'> </div><div class='add'>+Media Controller Device Allocator API</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+When the media device belongs to more than one driver, the shared media</div><div class='add'>+device is allocated with the shared struct device as the key for look ups.</div><div class='add'>+</div><div class='add'>+The shared media device should stay in registered state until the last</div><div class='add'>+driver unregisters it. In addition, the media device should be released when</div><div class='add'>+all the references are released. Each driver gets a reference to the media</div><div class='add'>+device during probe, when it allocates the media device. If media device is</div><div class='add'>+already allocated, the allocate API bumps up the refcount and returns the</div><div class='add'>+existing media device. The driver puts the reference back in its disconnect</div><div class='add'>+routine when it calls :c:func:`media_device_delete()`.</div><div class='add'>+</div><div class='add'>+The media device is unregistered and cleaned up from the kref put handler to</div><div class='add'>+ensure that the media device stays in registered state until the last driver</div><div class='add'>+unregisters the media device.</div><div class='add'>+</div><div class='add'>+**Driver Usage**</div><div class='add'>+</div><div class='add'>+Drivers should use the appropriate media-core routines to manage the shared</div><div class='add'>+media device life-time handling the two states:</div><div class='add'>+1. allocate -&gt; register -&gt; delete</div><div class='add'>+2. get reference to already registered device -&gt; delete</div><div class='add'>+</div><div class='add'>+call :c:func:`media_device_delete()` routine to make sure the shared media</div><div class='add'>+device delete is handled correctly.</div><div class='add'>+</div><div class='add'>+**driver probe:**</div><div class='add'>+Call :c:func:`media_device_usb_allocate()` to allocate or get a reference</div><div class='add'>+Call :c:func:`media_device_register()`, if media devnode isn't registered</div><div class='add'>+</div><div class='add'>+**driver disconnect:**</div><div class='add'>+Call :c:func:`media_device_delete()` to free the media_device. Freeing is</div><div class='add'>+handled by the kref put handler.</div><div class='add'>+</div><div class='add'>+API Definitions</div><div class='add'>+^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='ctx'> .. kernel-doc:: include/media/media-device.h</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: include/media/media-devnode.h</div><div class='hunk'>@@ -266,3 +305,5 @@ in the end provide a way to use driver-specific callbacks.</div><div class='ctx'> .. kernel-doc:: include/media/media-entity.h</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: include/media/media-request.h</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/media/media-dev-allocator.h</div><div class='head'>diff --git a/Documentation/media/lirc.h.rst.exceptions b/Documentation/media/lirc.h.rst.exceptions<br/>index 7a8b8ff4f076..ac768d769113 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/lirc.h.rst.exceptions?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/lirc.h.rst.exceptions</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/lirc.h.rst.exceptions?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/lirc.h.rst.exceptions</a></div><div class='hunk'>@@ -63,6 +63,7 @@ ignore symbol RC_PROTO_IMON</div><div class='ctx'> ignore symbol RC_PROTO_RCMM12</div><div class='ctx'> ignore symbol RC_PROTO_RCMM24</div><div class='ctx'> ignore symbol RC_PROTO_RCMM32</div><div class='add'>+ignore symbol RC_PROTO_XBOX_DVD</div><div class='ctx'> </div><div class='ctx'> # Undocumented macros</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/media/uapi/mediactl/request-api.rst<br/>index 1ad631e549fe..a74c82d95609 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/mediactl/request-api.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/mediactl/request-api.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/mediactl/request-api.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/mediactl/request-api.rst</a></div><div class='hunk'>@@ -93,7 +93,7 @@ A queued request cannot be modified anymore.</div><div class='ctx'> .. caution::</div><div class='ctx'>    For :ref:`memory-to-memory devices &lt;mem2mem&gt;` you can use requests only for</div><div class='ctx'>    output buffers, not for capture buffers. Attempting to add a capture buffer</div><div class='del'>-   to a request will result in an ``EACCES`` error.</div><div class='add'>+   to a request will result in an ``EBADR`` error.</div><div class='ctx'> </div><div class='ctx'> If the request contains configurations for multiple entities, individual drivers</div><div class='ctx'> may synchronize so the requested pipeline's topology is applied before the</div><div class='head'>diff --git a/Documentation/media/uapi/rc/rc-tables.rst b/Documentation/media/uapi/rc/rc-tables.rst<br/>index f460031d8531..177ac44fa0fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/rc/rc-tables.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/rc/rc-tables.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/rc/rc-tables.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/rc/rc-tables.rst</a></div><div class='hunk'>@@ -623,7 +623,7 @@ the remote via /dev/input/event devices.</div><div class='ctx'> </div><div class='ctx'>     -  .. row 78</div><div class='ctx'> </div><div class='del'>-       -  ``KEY_SCREEN``</div><div class='add'>+       -  ``KEY_ASPECT_RATIO``</div><div class='ctx'> </div><div class='ctx'>        -  Select screen aspect ratio</div><div class='ctx'> </div><div class='hunk'>@@ -631,7 +631,7 @@ the remote via /dev/input/event devices.</div><div class='ctx'> </div><div class='ctx'>     -  .. row 79</div><div class='ctx'> </div><div class='del'>-       -  ``KEY_ZOOM``</div><div class='add'>+       -  ``KEY_FULL_SCREEN``</div><div class='ctx'> </div><div class='ctx'>        -  Put device into zoom/full screen mode</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst<br/>index 81ffdcb89057..1cbd9cde57f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/buffer.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/buffer.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/buffer.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/buffer.rst</a></div><div class='hunk'>@@ -165,7 +165,7 @@ of appropriately sized buffers for each use case).</div><div class='ctx'> struct v4l2_buffer</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.8cm}|p{2.5cm}|p{1.3cm}|p{10.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.8cm}|p{2.5cm}|p{1.6cm}|p{10.2cm}|</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='hunk'>@@ -326,7 +326,7 @@ struct v4l2_buffer</div><div class='ctx'> 	Applications should not set ``V4L2_BUF_FLAG_REQUEST_FD`` for any ioctls</div><div class='ctx'> 	other than :ref:`VIDIOC_QBUF &lt;VIDIOC_QBUF&gt;`.</div><div class='ctx'> </div><div class='del'>-	If the device does not support requests, then ``EACCES`` will be returned.</div><div class='add'>+	If the device does not support requests, then ``EBADR`` will be returned.</div><div class='ctx'> 	If requests are supported but an invalid request file descriptor is</div><div class='ctx'> 	given, then ``EINVAL`` will be returned.</div><div class='ctx'> </div><div class='hunk'>@@ -420,7 +420,7 @@ enum v4l2_buf_type</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.2cm}|p{0.6cm}|p{9.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.8cm}|p{0.6cm}|p{9.1cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -482,7 +482,11 @@ enum v4l2_buf_type</div><div class='ctx'> Buffer Flags</div><div class='ctx'> ============</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.0cm}|p{2.2cm}|p{8.3cm}|</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{7.0cm}|p{2.1cm}|p{8.4cm}|</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='hunk'>@@ -681,6 +685,9 @@ Buffer Flags</div><div class='ctx'> 	exposure of the frame has begun. This is only valid for the</div><div class='ctx'> 	``V4L2_BUF_TYPE_VIDEO_CAPTURE`` buffer type.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_memory</div><div class='hunk'>@@ -688,7 +695,7 @@ Buffer Flags</div><div class='ctx'> enum v4l2_memory</div><div class='ctx'> ================</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{5.0cm}|p{0.8cm}|p{11.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -724,7 +731,7 @@ The :c:type:`v4l2_buffer_timecode` structure is designed to hold a</div><div class='ctx'> struct v4l2_timecode</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{1.4cm}|p{2.8cm}|p{12.3cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -761,7 +768,7 @@ struct v4l2_timecode</div><div class='ctx'> Timecode Types</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{5.6cm}|p{0.8cm}|p{11.1cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/colorspaces-defs.rst b/Documentation/media/uapi/v4l/colorspaces-defs.rst<br/>index c4e8fc620379..e122bbe3d799 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/colorspaces-defs.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/colorspaces-defs.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/colorspaces-defs.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/colorspaces-defs.rst</a></div><div class='hunk'>@@ -39,7 +39,7 @@ whole range, 0-255, dividing the angular value by 1.41. The enum</div><div class='ctx'>    colorspaces except for BT.2020 which uses limited range R'G'B'</div><div class='ctx'>    quantization.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{6.7cm}|p{10.8cm}|</div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_colorspace</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +112,7 @@ whole range, 0-255, dividing the angular value by 1.41. The enum</div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_ycbcr_encoding</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.2cm}|p{10.3cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table:: V4L2 Y'CbCr Encodings</div><div class='ctx'>     :header-rows:  1</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/colorspaces.rst b/Documentation/media/uapi/v4l/colorspaces.rst<br/>index c5a560f0c13d..4f6c82fa057f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/colorspaces.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/colorspaces.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/colorspaces.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/colorspaces.rst</a></div><div class='hunk'>@@ -56,9 +56,9 @@ The Y value in the CIE XYZ colorspace corresponds to luminance. Often</div><div class='ctx'> the CIE XYZ colorspace is transformed to the normalized CIE xyY</div><div class='ctx'> colorspace:</div><div class='ctx'> </div><div class='del'>-x = X / (X + Y + Z)</div><div class='add'>+	x = X / (X + Y + Z)</div><div class='ctx'> </div><div class='del'>-y = Y / (X + Y + Z)</div><div class='add'>+	y = Y / (X + Y + Z)</div><div class='ctx'> </div><div class='ctx'> The x and y values are the chromaticity coordinates and can be used to</div><div class='ctx'> define a color without the luminance component Y. It is very confusing</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst<br/>index d6a707f0b24f..e06b03ca2ab2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-raw-vbi.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-raw-vbi.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-raw-vbi.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/dev-raw-vbi.rst</a></div><div class='hunk'>@@ -106,7 +106,7 @@ VBI devices must implement both the :ref:`VIDIOC_G_FMT &lt;VIDIOC_G_FMT&gt;` and</div><div class='ctx'> and always returns default parameters as :ref:`VIDIOC_G_FMT &lt;VIDIOC_G_FMT&gt;` does.</div><div class='ctx'> :ref:`VIDIOC_TRY_FMT &lt;VIDIOC_G_FMT&gt;` is optional.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.4cm}|p{4.4cm}|p{10.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{1.6cm}|p{4.2cm}|p{11.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_vbi_format</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +190,7 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT &lt;VIDIOC_G_FMT&gt;` does</div><div class='ctx'> 	applications must set it to zero.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{4.0cm}|p{1.5cm}|p{12.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{4.4cm}|p{1.5cm}|p{11.6cm}|</div><div class='ctx'> </div><div class='ctx'> .. _vbifmt-flags:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-rds.rst b/Documentation/media/uapi/v4l/dev-rds.rst<br/>index 624d6f95b842..64a724ef58f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-rds.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-rds.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-rds.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/dev-rds.rst</a></div><div class='hunk'>@@ -146,7 +146,7 @@ RDS datastructures</div><div class='ctx'> </div><div class='ctx'> .. _v4l2-rds-block-codes:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{5.6cm}|p{2.0cm}|p{1.5cm}|p{7.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{6.4cm}|p{2.0cm}|p{1.2cm}|p{7.9cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table:: Block defines</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst<br/>index 0aa6cb8a272b..e86346f66017 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-sliced-vbi.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-sliced-vbi.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-sliced-vbi.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/dev-sliced-vbi.rst</a></div><div class='hunk'>@@ -118,7 +118,7 @@ struct v4l2_sliced_vbi_format</div><div class='ctx'>     \scriptsize</div><div class='ctx'>     \setlength{\tabcolsep}{2pt}</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{.75cm}|p{3.3cm}|p{3.4cm}|p{3.4cm}|p{3.4cm}|</div><div class='add'>+.. tabularcolumns:: |p{.85cm}|p{3.3cm}|p{4.4cm}|p{4.4cm}|p{4.4cm}|</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,7 @@ Sliced VBI services</div><div class='ctx'> </div><div class='ctx'> .. raw:: latex</div><div class='ctx'> </div><div class='del'>-    \footnotesize</div><div class='add'>+    \scriptsize</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{4.1cm}|p{1.1cm}|p{2.4cm}|p{2.0cm}|p{7.3cm}|</div><div class='ctx'> </div><div class='hunk'>@@ -541,7 +541,7 @@ Magic Constants for struct v4l2_mpeg_vbi_fmt_ivtv magic field</div><div class='ctx'> structs v4l2_mpeg_vbi_itv0 and v4l2_mpeg_vbi_ITV0</div><div class='ctx'> -------------------------------------------------</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{4.9cm}|p{2.4cm}|p{10.2cm}|</div><div class='add'>+.. tabularcolumns:: |p{5.2cm}|p{2.4cm}|p{9.9cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -561,12 +561,12 @@ structs v4l2_mpeg_vbi_itv0 and v4l2_mpeg_vbi_ITV0</div><div class='ctx'> </div><div class='ctx'> 	::</div><div class='ctx'> </div><div class='del'>-	    linemask[0] b0:     line  6     first field</div><div class='del'>-	    linemask[0] b17:    line 23     first field</div><div class='del'>-	    linemask[0] b18:    line  6     second field</div><div class='del'>-	    linemask[0] b31:    line 19     second field</div><div class='del'>-	    linemask[1] b0:     line 20     second field</div><div class='del'>-	    linemask[1] b3:     line 23     second field</div><div class='add'>+	    linemask[0] b0:     line  6  first field</div><div class='add'>+	    linemask[0] b17:    line 23  first field</div><div class='add'>+	    linemask[0] b18:    line  6  second field</div><div class='add'>+	    linemask[0] b31:    line 19  second field</div><div class='add'>+	    linemask[1] b0:     line 20  second field</div><div class='add'>+	    linemask[1] b3:     line 23  second field</div><div class='ctx'> 	    linemask[1] b4-b31: unused and set to 0</div><div class='ctx'>     * - struct</div><div class='ctx'> 	:c:type:`v4l2_mpeg_vbi_itv0_line`</div><div class='hunk'>@@ -590,7 +590,7 @@ structs v4l2_mpeg_vbi_itv0 and v4l2_mpeg_vbi_ITV0</div><div class='ctx'> struct v4l2_mpeg_vbi_ITV0</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{4.9cm}|p{4.4cm}|p{8.2cm}|</div><div class='add'>+.. tabularcolumns:: |p{5.2cm}|p{2.4cm}|p{9.9cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -635,7 +635,7 @@ struct v4l2_mpeg_vbi_itv0_line</div><div class='ctx'> Line Identifiers for struct v4l2_mpeg_vbi_itv0_line id field</div><div class='ctx'> ------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.0cm}|p{1.8cm}|p{8.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  1</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst<br/>index 2c2768c7343b..029bb2d9928a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-subdev.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/dev-subdev.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/dev-subdev.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/dev-subdev.rst</a></div><div class='hunk'>@@ -211,7 +211,7 @@ list entity names and pad numbers).</div><div class='ctx'> </div><div class='ctx'> .. raw:: latex</div><div class='ctx'> </div><div class='del'>-    \tiny</div><div class='add'>+    \scriptsize</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{2.0cm}|p{2.3cm}|p{2.3cm}|p{2.3cm}|p{2.3cm}|p{2.3cm}|p{2.3cm}|</div><div class='ctx'> </div><div class='hunk'>@@ -223,40 +223,80 @@ list entity names and pad numbers).</div><div class='ctx'>     :widths: 5 5 5 5 5 5 5</div><div class='ctx'> </div><div class='ctx'>     * -</div><div class='del'>-      - Sensor/0 format</div><div class='del'>-      - Frontend/0 format</div><div class='del'>-      - Frontend/1 format</div><div class='del'>-      - Scaler/0 format</div><div class='del'>-      - Scaler/0 compose selection rectangle</div><div class='del'>-      - Scaler/1 format</div><div class='add'>+      - Sensor/0</div><div class='add'>+</div><div class='add'>+        format</div><div class='add'>+      - Frontend/0</div><div class='add'>+</div><div class='add'>+        format</div><div class='add'>+      - Frontend/1</div><div class='add'>+</div><div class='add'>+        format</div><div class='add'>+      - Scaler/0</div><div class='add'>+</div><div class='add'>+        format</div><div class='add'>+      - Scaler/0</div><div class='add'>+</div><div class='add'>+        compose selection rectangle</div><div class='add'>+      - Scaler/1</div><div class='add'>+</div><div class='add'>+        format</div><div class='ctx'>     * - Initial state</div><div class='del'>-      - 2048x1536/SGRBG8_1X8</div><div class='add'>+      - 2048x1536</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='ctx'>       - (default)</div><div class='ctx'>       - (default)</div><div class='ctx'>       - (default)</div><div class='ctx'>       - (default)</div><div class='ctx'>       - (default)</div><div class='ctx'>     * - Configure frontend sink format</div><div class='del'>-      - 2048x1536/SGRBG8_1X8</div><div class='del'>-      - *2048x1536/SGRBG8_1X8*</div><div class='del'>-      - *2046x1534/SGRBG8_1X8*</div><div class='add'>+      - 2048x1536</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - *2048x1536*</div><div class='add'>+</div><div class='add'>+        *SGRBG8_1X8*</div><div class='add'>+      - *2046x1534*</div><div class='add'>+</div><div class='add'>+        *SGRBG8_1X8*</div><div class='ctx'>       - (default)</div><div class='ctx'>       - (default)</div><div class='ctx'>       - (default)</div><div class='ctx'>     * - Configure scaler sink format</div><div class='del'>-      - 2048x1536/SGRBG8_1X8</div><div class='del'>-      - 2048x1536/SGRBG8_1X8</div><div class='del'>-      - 2046x1534/SGRBG8_1X8</div><div class='del'>-      - *2046x1534/SGRBG8_1X8*</div><div class='add'>+      - 2048x1536</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - 2048x1536</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - 2046x1534</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - *2046x1534*</div><div class='add'>+</div><div class='add'>+        *SGRBG8_1X8*</div><div class='ctx'>       - *0,0/2046x1534*</div><div class='del'>-      - *2046x1534/SGRBG8_1X8*</div><div class='add'>+      - *2046x1534*</div><div class='add'>+</div><div class='add'>+        *SGRBG8_1X8*</div><div class='ctx'>     * - Configure scaler sink compose selection</div><div class='del'>-      - 2048x1536/SGRBG8_1X8</div><div class='del'>-      - 2048x1536/SGRBG8_1X8</div><div class='del'>-      - 2046x1534/SGRBG8_1X8</div><div class='del'>-      - 2046x1534/SGRBG8_1X8</div><div class='add'>+      - 2048x1536</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - 2048x1536</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - 2046x1534</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='add'>+      - 2046x1534</div><div class='add'>+</div><div class='add'>+        SGRBG8_1X8</div><div class='ctx'>       - *0,0/1280x960*</div><div class='del'>-      - *1280x960/SGRBG8_1X8*</div><div class='add'>+      - *1280x960*</div><div class='add'>+</div><div class='add'>+        *SGRBG8_1X8*</div><div class='ctx'> </div><div class='ctx'> .. raw:: latex</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst<br/>index d3a553cd86c9..51c1d5c9eb00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-camera.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-camera.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-camera.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/ext-ctrls-camera.rst</a></div><div class='hunk'>@@ -88,7 +88,7 @@ enum v4l2_exposure_metering -</div><div class='ctx'>     Determines how the camera measures the amount of light available for</div><div class='ctx'>     the frame exposure. Possible values are:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{8.5cm}|p{9.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{8.7cm}|p{8.8cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -180,7 +180,7 @@ enum v4l2_exposure_metering -</div><div class='ctx'>     control may stop updates of the ``V4L2_CID_AUTO_FOCUS_STATUS``</div><div class='ctx'>     control value.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{6.7cm}|p{10.8cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -206,7 +206,7 @@ enum v4l2_exposure_metering -</div><div class='ctx'> enum v4l2_auto_focus_range -</div><div class='ctx'>     Determines auto focus distance range for which lens may be adjusted.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{6.8cm}|p{10.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -281,7 +281,7 @@ enum v4l2_auto_n_preset_white_balance -</div><div class='ctx'>     representation. The following white balance presets are listed in</div><div class='ctx'>     order of increasing color temperature.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.0 cm}|p{10.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.2 cm}|p{10.3cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -387,7 +387,11 @@ enum v4l2_scene_mode -</div><div class='ctx'>     to ``V4L2_SCENE_MODE_NONE`` to make sure the other possibly related</div><div class='ctx'>     controls are accessible. The following scene programs are defined:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{5.9cm}|p{11.5cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -459,6 +463,9 @@ enum v4l2_scene_mode -</div><div class='ctx'> 	may be switched to close-up mode and this setting may also involve</div><div class='ctx'> 	some lens-distortion correction.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_3A_LOCK (bitmask)``</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst<br/>index c97fb7923be5..4a8446203085 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-codec.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-codec.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-codec.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/ext-ctrls-codec.rst</a></div><div class='hunk'>@@ -105,7 +105,7 @@ enum v4l2_mpeg_stream_vbi_fmt -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6 cm}|p{11.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{6.6 cm}|p{10.9cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -477,7 +477,7 @@ enum v4l2_mpeg_audio_dec_playback -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{9.0cm}|p{8.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{9.8cm}|p{7.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -888,7 +888,7 @@ enum v4l2_mpeg_video_multi_slice_mode -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{8.7cm}|p{8.8cm}|</div><div class='add'>+.. tabularcolumns:: |p{9.6cm}|p{7.9cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -923,9 +923,11 @@ enum v4l2_mpeg_video_multi_slice_mode -</div><div class='ctx'> enum v4l2_mpeg_video_h264_loop_filter_mode -</div><div class='ctx'>     Loop filter mode for H264 encoder. Possible values are:</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='ctx'> </div><div class='add'>+    \small</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{14.0cm}|p{3.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{13.6cm}|p{3.9cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -938,6 +940,9 @@ enum v4l2_mpeg_video_h264_loop_filter_mode -</div><div class='ctx'>     * - ``V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY``</div><div class='ctx'>       - Loop filter is disabled at the slice boundary.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA (integer)``</div><div class='hunk'>@@ -964,6 +969,8 @@ enum v4l2_mpeg_video_h264_entropy_mode -</div><div class='ctx'>     encoder. Possible values are:</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{9.0cm}|p{8.5cm}|</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -1048,6 +1055,30 @@ enum v4l2_mpeg_video_h264_entropy_mode -</div><div class='ctx'>     Quantization parameter for an B frame for H264. Valid range: from 0</div><div class='ctx'>     to 51.</div><div class='ctx'> </div><div class='add'>+``V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP (integer)``</div><div class='add'>+    Minimum quantization parameter for the H264 I frame to limit I frame</div><div class='add'>+    quality to a range. Valid range: from 0 to 51. If</div><div class='add'>+    V4L2_CID_MPEG_VIDEO_H264_MIN_QP is also set, the quantization parameter</div><div class='add'>+    should be chosen to meet both requirements.</div><div class='add'>+</div><div class='add'>+``V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP (integer)``</div><div class='add'>+    Maximum quantization parameter for the H264 I frame to limit I frame</div><div class='add'>+    quality to a range. Valid range: from 0 to 51. If</div><div class='add'>+    V4L2_CID_MPEG_VIDEO_H264_MAX_QP is also set, the quantization parameter</div><div class='add'>+    should be chosen to meet both requirements.</div><div class='add'>+</div><div class='add'>+``V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP (integer)``</div><div class='add'>+    Minimum quantization parameter for the H264 P frame to limit P frame</div><div class='add'>+    quality to a range. Valid range: from 0 to 51. If</div><div class='add'>+    V4L2_CID_MPEG_VIDEO_H264_MIN_QP is also set, the quantization parameter</div><div class='add'>+    should be chosen to meet both requirements.</div><div class='add'>+</div><div class='add'>+``V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (integer)``</div><div class='add'>+    Maximum quantization parameter for the H264 P frame to limit P frame</div><div class='add'>+    quality to a range. Valid range: from 0 to 51. If</div><div class='add'>+    V4L2_CID_MPEG_VIDEO_H264_MAX_QP is also set, the quantization parameter</div><div class='add'>+    should be chosen to meet both requirements.</div><div class='add'>+</div><div class='ctx'> ``V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (integer)``</div><div class='ctx'>     Quantization parameter for an I frame for MPEG4. Valid range: from 1</div><div class='ctx'>     to 31.</div><div class='hunk'>@@ -1129,7 +1160,9 @@ enum v4l2_mpeg_video_header_mode -</div><div class='ctx'>     it returned together with the first frame. Applicable to encoders.</div><div class='ctx'>     Possible values are:</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='ctx'> </div><div class='add'>+    \small</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{10.3cm}|p{7.2cm}|</div><div class='ctx'> </div><div class='hunk'>@@ -1143,6 +1176,9 @@ enum v4l2_mpeg_video_header_mode -</div><div class='ctx'>       - The stream header is returned together with the first encoded</div><div class='ctx'> 	frame.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER (boolean)``</div><div class='hunk'>@@ -1181,6 +1217,10 @@ enum v4l2_mpeg_video_h264_sei_fp_arrangement_type -</div><div class='ctx'>     Frame packing arrangement type for H264 SEI. Applicable to the H264</div><div class='ctx'>     encoder. Possible values are:</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='ctx'> .. tabularcolumns:: |p{12cm}|p{5.5cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='hunk'>@@ -1200,6 +1240,10 @@ enum v4l2_mpeg_video_h264_sei_fp_arrangement_type -</div><div class='ctx'>     * - ``V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TEMPORAL``</div><div class='ctx'>       - One view per frame.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_MPEG_VIDEO_H264_FMO (boolean)``</div><div class='hunk'>@@ -1217,6 +1261,10 @@ enum v4l2_mpeg_video_h264_fmo_map_type -</div><div class='ctx'>     patterns of macroblocks. Applicable to the H264 encoder. Possible</div><div class='ctx'>     values are:</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='ctx'> .. tabularcolumns:: |p{12.5cm}|p{5.0cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='hunk'>@@ -1240,6 +1288,10 @@ enum v4l2_mpeg_video_h264_fmo_map_type -</div><div class='ctx'>     * - ``V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_EXPLICIT``</div><div class='ctx'>       - User defined map type.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP (integer)``</div><div class='hunk'>@@ -1361,6 +1413,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{5.8cm}|p{4.8cm}|p{6.6cm}|</div><div class='add'>+</div><div class='ctx'> .. flat-table:: struct v4l2_ctrl_mpeg2_slice_params</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='hunk'>@@ -1402,6 +1456,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{1.5cm}|p{6.3cm}|p{9.4cm}|</div><div class='add'>+</div><div class='ctx'> .. flat-table:: struct v4l2_mpeg2_sequence</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='hunk'>@@ -1433,6 +1489,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{1.5cm}|p{6.3cm}|p{9.4cm}|</div><div class='add'>+</div><div class='ctx'> .. flat-table:: struct v4l2_mpeg2_picture</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='hunk'>@@ -1492,6 +1550,12 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -</div><div class='ctx'> </div><div class='ctx'> .. cssclass:: longtable</div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{1.2cm}|p{8.0cm}|p{7.4cm}|</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='ctx'> .. flat-table:: struct v4l2_ctrl_mpeg2_quantization</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='hunk'>@@ -1537,6 +1601,19 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -</div><div class='ctx'> 	non-intra-coded frames, in zigzag scanning order. Only relevant for</div><div class='ctx'> 	non-4:2:0 YUV formats.</div><div class='ctx'> </div><div class='add'>+``V4L2_CID_FWHT_I_FRAME_QP (integer)``</div><div class='add'>+    Quantization parameter for an I frame for FWHT. Valid range: from 1</div><div class='add'>+    to 31.</div><div class='add'>+</div><div class='add'>+``V4L2_CID_FWHT_P_FRAME_QP (integer)``</div><div class='add'>+    Quantization parameter for a P frame for FWHT. Valid range: from 1</div><div class='add'>+    to 31.</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> MFC 5.1 MPEG Controls</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='hunk'>@@ -1644,7 +1721,11 @@ enum v4l2_mpeg_mfc51_video_frame_skip_mode -</div><div class='ctx'>     are:</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{9.0cm}|p{8.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{9.2cm}|p{8.3cm}|</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -1659,7 +1740,9 @@ enum v4l2_mpeg_mfc51_video_frame_skip_mode -</div><div class='ctx'>       - Frame skip mode enabled and buffer limit is set by the VBV</div><div class='ctx'> 	(MPEG1/2/4) or CPB (H264) buffer size control.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='ctx'> </div><div class='add'>+    \normalsize</div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT (integer)``</div><div class='ctx'>     Enable rate-control with fixed target bit. If this setting is</div><div class='hunk'>@@ -1682,7 +1765,7 @@ enum v4l2_mpeg_mfc51_video_force_frame_type -</div><div class='ctx'>     Force a frame type for the next queued buffer. Applicable to</div><div class='ctx'>     encoders. Possible values are:</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+.. tabularcolumns:: |p{9.5cm}|p{8.0cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -1696,6 +1779,125 @@ enum v4l2_mpeg_mfc51_video_force_frame_type -</div><div class='ctx'>       - Force a non-coded frame.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.. _v4l2-mpeg-fwht:</div><div class='add'>+</div><div class='add'>+``V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (struct)``</div><div class='add'>+    Specifies the fwht parameters (as extracted from the bitstream) for the</div><div class='add'>+    associated FWHT data. This includes the necessary parameters for</div><div class='add'>+    configuring a stateless hardware decoding pipeline for FWHT.</div><div class='add'>+</div><div class='add'>+    .. note::</div><div class='add'>+</div><div class='add'>+       This compound control is not yet part of the public kernel API and</div><div class='add'>+       it is expected to change.</div><div class='add'>+</div><div class='add'>+.. c:type:: v4l2_ctrl_fwht_params</div><div class='add'>+</div><div class='add'>+.. cssclass:: longtable</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{1.4cm}|p{4.3cm}|p{11.8cm}|</div><div class='add'>+</div><div class='add'>+.. flat-table:: struct v4l2_ctrl_fwht_params</div><div class='add'>+    :header-rows:  0</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+    :widths:       1 1 2</div><div class='add'>+</div><div class='add'>+    * - __u64</div><div class='add'>+      - ``backward_ref_ts``</div><div class='add'>+      - Timestamp of the V4L2 capture buffer to use as backward reference, used</div><div class='add'>+        with P-coded frames. The timestamp refers to the</div><div class='add'>+	``timestamp`` field in struct :c:type:`v4l2_buffer`. Use the</div><div class='add'>+	:c:func:`v4l2_timeval_to_ns()` function to convert the struct</div><div class='add'>+	:c:type:`timeval` in struct :c:type:`v4l2_buffer` to a __u64.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``version``</div><div class='add'>+      - The version of the codec</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``width``</div><div class='add'>+      - The width of the frame</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``height``</div><div class='add'>+      - The height of the frame</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``flags``</div><div class='add'>+      - The flags of the frame, see :ref:`fwht-flags`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``colorspace``</div><div class='add'>+      - The colorspace of the frame, from enum :c:type:`v4l2_colorspace`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``xfer_func``</div><div class='add'>+      - The transfer function, from enum :c:type:`v4l2_xfer_func`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``ycbcr_enc``</div><div class='add'>+      - The Y'CbCr encoding, from enum :c:type:`v4l2_ycbcr_encoding`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``quantization``</div><div class='add'>+      - The quantization range, from enum :c:type:`v4l2_quantization`.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. _fwht-flags:</div><div class='add'>+</div><div class='add'>+FWHT Flags</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+.. cssclass:: longtable</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{6.8cm}|p{2.4cm}|p{8.3cm}|</div><div class='add'>+</div><div class='add'>+.. flat-table::</div><div class='add'>+    :header-rows:  0</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+    :widths:       3 1 4</div><div class='add'>+</div><div class='add'>+    * - ``FWHT_FL_IS_INTERLACED``</div><div class='add'>+      - 0x00000001</div><div class='add'>+      - Set if this is an interlaced format</div><div class='add'>+    * - ``FWHT_FL_IS_BOTTOM_FIRST``</div><div class='add'>+      - 0x00000002</div><div class='add'>+      - Set if this is a bottom-first (NTSC) interlaced format</div><div class='add'>+    * - ``FWHT_FL_IS_ALTERNATE``</div><div class='add'>+      - 0x00000004</div><div class='add'>+      - Set if each 'frame' contains just one field</div><div class='add'>+    * - ``FWHT_FL_IS_BOTTOM_FIELD``</div><div class='add'>+      - 0x00000008</div><div class='add'>+      - If FWHT_FL_IS_ALTERNATE was set, then this is set if this 'frame' is the</div><div class='add'>+	bottom field, else it is the top field.</div><div class='add'>+    * - ``FWHT_FL_LUMA_IS_UNCOMPRESSED``</div><div class='add'>+      - 0x00000010</div><div class='add'>+      - Set if the luma plane is uncompressed</div><div class='add'>+    * - ``FWHT_FL_CB_IS_UNCOMPRESSED``</div><div class='add'>+      - 0x00000020</div><div class='add'>+      - Set if the cb plane is uncompressed</div><div class='add'>+    * - ``FWHT_FL_CR_IS_UNCOMPRESSED``</div><div class='add'>+      - 0x00000040</div><div class='add'>+      - Set if the cr plane is uncompressed</div><div class='add'>+    * - ``FWHT_FL_CHROMA_FULL_HEIGHT``</div><div class='add'>+      - 0x00000080</div><div class='add'>+      - Set if the chroma plane has the same height as the luma plane,</div><div class='add'>+	else the chroma plane is half the height of the luma plane</div><div class='add'>+    * - ``FWHT_FL_CHROMA_FULL_WIDTH``</div><div class='add'>+      - 0x00000100</div><div class='add'>+      - Set if the chroma plane has the same width as the luma plane,</div><div class='add'>+	else the chroma plane is half the width of the luma plane</div><div class='add'>+    * - ``FWHT_FL_ALPHA_IS_UNCOMPRESSED``</div><div class='add'>+      - 0x00000200</div><div class='add'>+      - Set if the alpha plane is uncompressed</div><div class='add'>+    * - ``FWHT_FL_I_FRAME``</div><div class='add'>+      - 0x00000400</div><div class='add'>+      - Set if this is an I-frame</div><div class='add'>+    * - ``FWHT_FL_COMPONENTS_NUM_MSK``</div><div class='add'>+      - 0x00070000</div><div class='add'>+      - A 4-values flag - the number of components - 1</div><div class='add'>+    * - ``FWHT_FL_PIXENC_YUV``</div><div class='add'>+      - 0x00080000</div><div class='add'>+      - Set if the pixel encoding is YUV</div><div class='add'>+    * - ``FWHT_FL_PIXENC_RGB``</div><div class='add'>+      - 0x00100000</div><div class='add'>+      - Set if the pixel encoding is RGB</div><div class='add'>+    * - ``FWHT_FL_PIXENC_HSV``</div><div class='add'>+      - 0x00180000</div><div class='add'>+      - Set if the pixel encoding is HSV</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> CX2341x MPEG Controls</div><div class='hunk'>@@ -1745,9 +1947,11 @@ enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type -</div><div class='ctx'>     Select the algorithm to use for the Luma Spatial Filter (default</div><div class='ctx'>     ``1D_HOR``). Possible values:</div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{14.5cm}|p{3.0cm}|</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{14.5cm}|p{3.0cm}|</div><div class='add'>+    \small</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -1764,6 +1968,10 @@ enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type -</div><div class='ctx'>     * - ``V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE``</div><div class='ctx'>       - Two-dimensional symmetrical non-separable</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. _chroma-spatial-filter-type:</div><div class='hunk'>@@ -1776,6 +1984,7 @@ enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type -</div><div class='ctx'>     ``1D_HOR``). Possible values are:</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{14.0cm}|p{3.5cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -1918,6 +2127,10 @@ enum v4l2_vp8_num_ref_frames -</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{7.9cm}|p{9.6cm}|</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='hunk'>@@ -1932,6 +2145,10 @@ enum v4l2_vp8_num_ref_frames -</div><div class='ctx'>       - The last encoded frame, the golden frame and the altref frame will</div><div class='ctx'> 	be searched.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ``V4L2_CID_MPEG_VIDEO_VPX_FILTER_LEVEL (integer)``</div><div class='hunk'>@@ -1961,7 +2178,7 @@ enum v4l2_vp8_golden_frame_sel -</div><div class='ctx'> </div><div class='ctx'> .. raw:: latex</div><div class='ctx'> </div><div class='del'>-    \footnotesize</div><div class='add'>+    \scriptsize</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{9.0cm}|p{8.0cm}|</div><div class='ctx'> </div><div class='hunk'>@@ -2283,7 +2500,7 @@ enum v4l2_mpeg_video_hevc_loop_filter_mode -</div><div class='ctx'> </div><div class='ctx'>     \footnotesize</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{10.7cm}|p{6.3cm}|</div><div class='add'>+.. tabularcolumns:: |p{12.1cm}|p{5.4cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/ext-ctrls-detect.rst b/Documentation/media/uapi/v4l/ext-ctrls-detect.rst<br/>index 8a45ce642829..80981d0cff42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-detect.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-detect.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-detect.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/ext-ctrls-detect.rst</a></div><div class='hunk'>@@ -30,7 +30,7 @@ Detect Control IDs</div><div class='ctx'> ``V4L2_CID_DETECT_MD_MODE (menu)``</div><div class='ctx'>     Sets the motion detection mode.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.5cm}|p{10.0cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.7cm}|p{9.8cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/ext-ctrls-dv.rst b/Documentation/media/uapi/v4l/ext-ctrls-dv.rst<br/>index 57edf211875c..5c70ac98f710 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-dv.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-dv.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-dv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/ext-ctrls-dv.rst</a></div><div class='hunk'>@@ -106,7 +106,7 @@ enum v4l2_dv_it_content_type -</div><div class='ctx'>     or an analog source. The enum v4l2_dv_it_content_type defines</div><div class='ctx'>     the possible content types:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.0cm}|p{10.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.3cm}|p{10.4cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/ext-ctrls-flash.rst b/Documentation/media/uapi/v4l/ext-ctrls-flash.rst<br/>index 5f30791c35b5..eff056b17167 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-flash.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-flash.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-flash.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/ext-ctrls-flash.rst</a></div><div class='hunk'>@@ -87,7 +87,7 @@ Flash Control IDs</div><div class='ctx'> ``V4L2_CID_FLASH_STROBE_SOURCE (menu)``</div><div class='ctx'>     Defines the source of the flash LED strobe.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.0cm}|p{10.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.5cm}|p{10.0cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='hunk'>@@ -146,7 +146,7 @@ Flash Control IDs</div><div class='ctx'>     an effect is chip dependent. Reading the faults resets the control</div><div class='ctx'>     and returns the chip to a usable state if possible.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{8.0cm}|p{9.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{8.4cm}|p{9.1cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst<br/>index cf9cd8a9f9b4..60ce3f949319 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst</a></div><div class='hunk'>@@ -37,7 +37,7 @@ JPEG Control IDs</div><div class='ctx'>     how Cb and Cr components are downsampled after converting an input</div><div class='ctx'>     image from RGB to Y'CbCr color space.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.0cm}|p{10.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{7.5cm}|p{10.0cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/field-order.rst b/Documentation/media/uapi/v4l/field-order.rst<br/>index 8415268d439c..3fb473e3b8e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/field-order.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/field-order.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/field-order.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/field-order.rst</a></div><div class='hunk'>@@ -64,7 +64,9 @@ enum v4l2_field</div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_field</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{5.8cm}|p{0.6cm}|p{11.1cm}|</div><div class='add'>+</div><div class='add'>+.. cssclass:: longtable</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst<br/>index 2675bef3eefe..6c961cfb74da 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-compressed.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-compressed.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-compressed.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-compressed.rst</a></div><div class='hunk'>@@ -125,3 +125,9 @@ Compressed Formats</div><div class='ctx'>       - Video elementary stream using a codec based on the Fast Walsh Hadamard</div><div class='ctx'>         Transform. This codec is implemented by the vicodec ('Virtual Codec')</div><div class='ctx'> 	driver. See the codec-fwht.h header for more details.</div><div class='add'>+    * .. _V4L2-PIX-FMT-FWHT-STATELESS:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_FWHT_STATELESS``</div><div class='add'>+      - 'SFWH'</div><div class='add'>+      - Same format as V4L2_PIX_FMT_FWHT but requires stateless codec implementation.</div><div class='add'>+	See the :ref:`associated Codec Control IDs &lt;v4l2-mpeg-fwht&gt;`.</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst b/Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst<br/>index 862e1f327150..87e8fd7d5d02 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst</a></div><div class='hunk'>@@ -36,13 +36,16 @@ per frame, therefore their headers cannot be larger than 255 bytes.</div><div class='ctx'> Below are proprietary Microsoft style metadata types, used by D4xx cameras,</div><div class='ctx'> where all fields are in little endian order:</div><div class='ctx'> </div><div class='add'>+.. tabularcolumns:: |p{5.0cm}|p{12.5cm}|</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> .. flat-table:: D4xx metadata</div><div class='del'>-    :widths: 1 4</div><div class='add'>+    :widths: 1 2</div><div class='ctx'>     :header-rows:  1</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'> </div><div class='del'>-    * - Field</div><div class='del'>-      - Description</div><div class='add'>+    * - **Field**</div><div class='add'>+      - **Description**</div><div class='ctx'>     * - :cspan:`1` *Depth Control*</div><div class='ctx'>     * - __u32 ID</div><div class='ctx'>       - 0x80000000</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst<br/>index 2ebccdcca95d..d1a341af9c48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst</a></div><div class='hunk'>@@ -41,6 +41,10 @@ The Hue position **m** (0 - 5) of the bucket in the matrix depends on</div><div class='ctx'> how the HGT Hue areas are configured. There are 6 user configurable Hue</div><div class='ctx'> Areas which can be configured to cover overlapping Hue values:</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='ctx'> ::</div><div class='ctx'> </div><div class='ctx'>          Area 0       Area 1       Area 2       Area 3       Area 4       Area 5</div><div class='hunk'>@@ -53,6 +57,11 @@ Areas which can be configured to cover overlapping Hue values:</div><div class='ctx'>   5U   0L      0U   1L      1U   2L      2U   3L      3U   4L      4U   5L      5U   0L</div><div class='ctx'>         &lt;0..............................Hue Value............................255&gt;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='ctx'> When two consecutive areas don't overlap (n+1L is equal to nU) the boundary</div><div class='ctx'> value is considered as part of the lower area.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst b/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst<br/>index 38b1895a509f..dfc4a8367b3d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst</a></div><div class='hunk'>@@ -31,7 +31,7 @@ The values are packed in 24 or 32 bit formats.</div><div class='ctx'>     \tiny</div><div class='ctx'>     \setlength{\tabcolsep}{2pt}</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.0cm}|p{0.54cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.6cm}|p{0.8cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='ctx'> </div><div class='ctx'> .. _packed-hsv-formats:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst<br/>index 6b3781c04dd5..738bb14c0ee2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst</a></div><div class='hunk'>@@ -27,7 +27,7 @@ next to each other in memory.</div><div class='ctx'>     \tiny</div><div class='ctx'>     \setlength{\tabcolsep}{2pt}</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.3cm}|p{1.6cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.8cm}|p{2.0cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. _rgb-formats:</div><div class='hunk'>@@ -139,6 +139,144 @@ next to each other in memory.</div><div class='ctx'>       - r\ :sub:`1`</div><div class='ctx'>       - r\ :sub:`0`</div><div class='ctx'>       -</div><div class='add'>+    * .. _V4L2-PIX-FMT-RGBA444:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_RGBA444``</div><div class='add'>+      - 'RA12'</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - a\ :sub:`3`</div><div class='add'>+      - a\ :sub:`2`</div><div class='add'>+      - a\ :sub:`1`</div><div class='add'>+      - a\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-RGBX444:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_RGBX444``</div><div class='add'>+      - 'RX12'</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-ABGR444:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_ABGR444``</div><div class='add'>+      - 'AB12'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - a\ :sub:`3`</div><div class='add'>+      - a\ :sub:`2`</div><div class='add'>+      - a\ :sub:`1`</div><div class='add'>+      - a\ :sub:`0`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-XBGR444:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_XBGR444``</div><div class='add'>+      - 'XB12'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-BGRA444:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_BGRA444``</div><div class='add'>+      - 'BA12'</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      - a\ :sub:`3`</div><div class='add'>+      - a\ :sub:`2`</div><div class='add'>+      - a\ :sub:`1`</div><div class='add'>+      - a\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-BGRX444:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_BGRX444``</div><div class='add'>+      - 'BX12'</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      -</div><div class='ctx'>     * .. _V4L2-PIX-FMT-ARGB555:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_ARGB555``</div><div class='hunk'>@@ -185,6 +323,144 @@ next to each other in memory.</div><div class='ctx'>       - g\ :sub:`4`</div><div class='ctx'>       - g\ :sub:`3`</div><div class='ctx'>       -</div><div class='add'>+    * .. _V4L2-PIX-FMT-RGBA555:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_RGBA555``</div><div class='add'>+      - 'RA15'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - a</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-RGBX555:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_RGBX555``</div><div class='add'>+      - 'RX15'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-ABGR555:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_ABGR555``</div><div class='add'>+      - 'AB15'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - a</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-XBGR555:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_XBGR555``</div><div class='add'>+      - 'XB15'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      -</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-BGRA555:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_BGRA555``</div><div class='add'>+      - 'BA15'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      - a</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      -</div><div class='add'>+    * .. _V4L2-PIX-FMT-BGRX555:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_BGRX555``</div><div class='add'>+      - 'BX15'</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      -</div><div class='ctx'>     * .. _V4L2-PIX-FMT-RGB565:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_RGB565``</div><div class='hunk'>@@ -461,6 +737,166 @@ next to each other in memory.</div><div class='ctx'>       -</div><div class='ctx'>       -</div><div class='ctx'>       -</div><div class='add'>+    * .. _V4L2-PIX-FMT-BGRA32:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_BGRA32``</div><div class='add'>+      - 'RA24'</div><div class='add'>+</div><div class='add'>+      - a\ :sub:`7`</div><div class='add'>+      - a\ :sub:`6`</div><div class='add'>+      - a\ :sub:`5`</div><div class='add'>+      - a\ :sub:`4`</div><div class='add'>+      - a\ :sub:`3`</div><div class='add'>+      - a\ :sub:`2`</div><div class='add'>+      - a\ :sub:`1`</div><div class='add'>+      - a\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`7`</div><div class='add'>+      - b\ :sub:`6`</div><div class='add'>+      - b\ :sub:`5`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`7`</div><div class='add'>+      - g\ :sub:`6`</div><div class='add'>+      - g\ :sub:`5`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`7`</div><div class='add'>+      - r\ :sub:`6`</div><div class='add'>+      - r\ :sub:`5`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+    * .. _V4L2-PIX-FMT-BGRX32:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_BGRX32``</div><div class='add'>+      - 'RX24'</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'>+      -</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`7`</div><div class='add'>+      - b\ :sub:`6`</div><div class='add'>+      - b\ :sub:`5`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`7`</div><div class='add'>+      - g\ :sub:`6`</div><div class='add'>+      - g\ :sub:`5`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`7`</div><div class='add'>+      - r\ :sub:`6`</div><div class='add'>+      - r\ :sub:`5`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+    * .. _V4L2-PIX-FMT-RGBA32:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_RGBA32``</div><div class='add'>+      - 'AB24'</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`7`</div><div class='add'>+      - r\ :sub:`6`</div><div class='add'>+      - r\ :sub:`5`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`7`</div><div class='add'>+      - g\ :sub:`6`</div><div class='add'>+      - g\ :sub:`5`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`7`</div><div class='add'>+      - b\ :sub:`6`</div><div class='add'>+      - b\ :sub:`5`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - a\ :sub:`7`</div><div class='add'>+      - a\ :sub:`6`</div><div class='add'>+      - a\ :sub:`5`</div><div class='add'>+      - a\ :sub:`4`</div><div class='add'>+      - a\ :sub:`3`</div><div class='add'>+      - a\ :sub:`2`</div><div class='add'>+      - a\ :sub:`1`</div><div class='add'>+      - a\ :sub:`0`</div><div class='add'>+    * .. _V4L2-PIX-FMT-RGBX32:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_RGBX32``</div><div class='add'>+      - 'XB24'</div><div class='add'>+</div><div class='add'>+      - r\ :sub:`7`</div><div class='add'>+      - r\ :sub:`6`</div><div class='add'>+      - r\ :sub:`5`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - g\ :sub:`7`</div><div class='add'>+      - g\ :sub:`6`</div><div class='add'>+      - g\ :sub:`5`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</div><div class='add'>+</div><div class='add'>+      - b\ :sub:`7`</div><div class='add'>+      - b\ :sub:`6`</div><div class='add'>+      - b\ :sub:`5`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</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'>+      -</div><div class='ctx'>     * .. _V4L2-PIX-FMT-ARGB32:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_ARGB32``</div><div class='hunk'>@@ -656,7 +1092,7 @@ either the corresponding ARGB or XRGB format, depending on the driver.</div><div class='ctx'>     \tiny</div><div class='ctx'>     \setlength{\tabcolsep}{2pt}</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.2cm}|p{0.60cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.6cm}|p{0.70cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='ctx'> </div><div class='ctx'> .. _rgb-formats-deprecated:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst<br/>index 7fcee1c11ac4..41b60fae703a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst</a></div><div class='hunk'>@@ -28,7 +28,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'> </div><div class='ctx'> .. _packed-yuv-formats:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.0cm}|p{0.67cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|p{0.29cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.5cm}|p{0.69cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|p{0.31cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table:: Packed YUV Image Formats</div><div class='ctx'>     :header-rows:  2</div><div class='hunk'>@@ -44,6 +44,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - :cspan:`7` Byte 2</div><div class='ctx'> </div><div class='ctx'>       - :cspan:`7` Byte 3</div><div class='add'>+</div><div class='ctx'>     * -</div><div class='ctx'>       -</div><div class='ctx'>       - 7</div><div class='hunk'>@@ -81,6 +82,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - 2</div><div class='ctx'>       - 1</div><div class='ctx'>       - 0</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-YUV444:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_YUV444``</div><div class='hunk'>@@ -103,7 +105,9 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - Y'\ :sub:`2`</div><div class='ctx'>       - Y'\ :sub:`1`</div><div class='ctx'>       - Y'\ :sub:`0`</div><div class='del'>-      -</div><div class='add'>+</div><div class='add'>+      -  :cspan:`15`</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-YUV555:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_YUV555``</div><div class='hunk'>@@ -126,7 +130,8 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - Y'\ :sub:`0`</div><div class='ctx'>       - Cb\ :sub:`4`</div><div class='ctx'>       - Cb\ :sub:`3`</div><div class='del'>-      -</div><div class='add'>+</div><div class='add'>+      -  :cspan:`15`</div><div class='ctx'>     * .. _V4L2-PIX-FMT-YUV565:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_YUV565``</div><div class='hunk'>@@ -149,7 +154,9 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - Cb\ :sub:`5`</div><div class='ctx'>       - Cb\ :sub:`4`</div><div class='ctx'>       - Cb\ :sub:`3`</div><div class='del'>-      -</div><div class='add'>+</div><div class='add'>+      -  :cspan:`15`</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-YUV32:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_YUV32``</div><div class='hunk'>@@ -190,7 +197,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - Cr\ :sub:`2`</div><div class='ctx'>       - Cr\ :sub:`1`</div><div class='ctx'>       - Cr\ :sub:`0`</div><div class='del'>-      -</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-AYUV32:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_AYUV32``</div><div class='hunk'>@@ -231,7 +238,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - Cr\ :sub:`2`</div><div class='ctx'>       - Cr\ :sub:`1`</div><div class='ctx'>       - Cr\ :sub:`0`</div><div class='del'>-      -</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-XYUV32:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_XYUV32``</div><div class='hunk'>@@ -272,7 +279,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - Cr\ :sub:`2`</div><div class='ctx'>       - Cr\ :sub:`1`</div><div class='ctx'>       - Cr\ :sub:`0`</div><div class='del'>-      -</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-VUYA32:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_VUYA32``</div><div class='hunk'>@@ -313,7 +320,7 @@ component of each pixel in one 16 or 32 bit word.</div><div class='ctx'>       - a\ :sub:`2`</div><div class='ctx'>       - a\ :sub:`1`</div><div class='ctx'>       - a\ :sub:`0`</div><div class='del'>-      -</div><div class='add'>+</div><div class='ctx'>     * .. _V4L2-PIX-FMT-VUYX32:</div><div class='ctx'> </div><div class='ctx'>       - ``V4L2_PIX_FMT_VUYX32``</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst<br/>index cdb70ac26126..fd32660a3766 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-srggb10p.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-srggb10p.rst</a></div><div class='hunk'>@@ -40,7 +40,7 @@ of a small V4L2_PIX_FMT_SBGGR10P image:</div><div class='ctx'> **Byte Order.**</div><div class='ctx'> Each cell is one byte.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{5.4cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.4cm}|p{1.4cm}|p{1.2cm}|p{1.2cm}|p{1.2cm}|p{6.4cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst<br/>index 01413be12916..960851275f23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-srggb12p.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-srggb12p.rst</a></div><div class='hunk'>@@ -18,6 +18,7 @@ V4L2_PIX_FMT_SRGGB12P ('pRAA'), V4L2_PIX_FMT_SGRBG12P ('pgAA'), V4L2_PIX_FMT_SGB</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 12-bit packed Bayer formats</div><div class='add'>+---------------------------</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -37,7 +38,7 @@ Below is an example of a small V4L2_PIX_FMT_SBGGR12P image:</div><div class='ctx'> **Byte Order.**</div><div class='ctx'> Each cell is one byte.</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{2.0cm}|p{1.0cm}|p{1.0cm}|p{2.7cm}|p{1.0cm}|p{1.0cm}|p{2.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{2.2cm}|p{1.2cm}|p{1.2cm}|p{3.1cm}|p{1.2cm}|p{1.2cm}|p{3.1cm}|</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst<br/>index b583531c2853..1a988d7e7ff8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-srggb14p.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-srggb14p.rst</a></div><div class='hunk'>@@ -41,17 +41,21 @@ of one of these formats:</div><div class='ctx'> **Byte Order.**</div><div class='ctx'> Each cell is one byte.</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='ctx'> </div><div class='add'>+    \footnotesize</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{1.8cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.1cm}|p{3.3cm}|p{3.3cm}|p{3.3cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='del'>-    :widths:       2 1 1 1 1 1 1 1</div><div class='add'>+    :widths:       2 1 1 1 1 3 3 3</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>     -  .. row 1</div><div class='ctx'> </div><div class='del'>-       -  start + 0:</div><div class='add'>+       -  start + 0</div><div class='ctx'> </div><div class='ctx'>        -  B\ :sub:`00high`</div><div class='ctx'> </div><div class='hunk'>@@ -62,17 +66,20 @@ Each cell is one byte.</div><div class='ctx'>        -  G\ :sub:`03high`</div><div class='ctx'> </div><div class='ctx'>        -  G\ :sub:`01low bits 1--0`\ (bits 7--6)</div><div class='add'>+</div><div class='ctx'> 	  B\ :sub:`00low bits 5--0`\ (bits 5--0)</div><div class='ctx'> </div><div class='ctx'>        -  R\ :sub:`02low bits 3--0`\ (bits 7--4)</div><div class='add'>+</div><div class='ctx'> 	  G\ :sub:`01low bits 5--2`\ (bits 3--0)</div><div class='ctx'> </div><div class='ctx'>        -  G\ :sub:`03low bits 5--0`\ (bits 7--2)</div><div class='add'>+</div><div class='ctx'> 	  R\ :sub:`02low bits 5--4`\ (bits 1--0)</div><div class='ctx'> </div><div class='ctx'>     -  .. row 2</div><div class='ctx'> </div><div class='del'>-       -  start + 7:</div><div class='add'>+       -  start + 7</div><div class='ctx'> </div><div class='ctx'>        -  G\ :sub:`00high`</div><div class='ctx'> </div><div class='hunk'>@@ -83,12 +90,15 @@ Each cell is one byte.</div><div class='ctx'>        -  R\ :sub:`03high`</div><div class='ctx'> </div><div class='ctx'>        -  R\ :sub:`01low bits 1--0`\ (bits 7--6)</div><div class='add'>+</div><div class='ctx'> 	  G\ :sub:`00low bits 5--0`\ (bits 5--0)</div><div class='ctx'> </div><div class='ctx'>        -  G\ :sub:`02low bits 3--0`\ (bits 7--4)</div><div class='add'>+</div><div class='ctx'> 	  R\ :sub:`01low bits 5--2`\ (bits 3--0)</div><div class='ctx'> </div><div class='ctx'>        -  R\ :sub:`03low bits 5--0`\ (bits 7--2)</div><div class='add'>+</div><div class='ctx'> 	  G\ :sub:`02low bits 5--4`\ (bits 1--0)</div><div class='ctx'> </div><div class='ctx'>     -  .. row 3</div><div class='hunk'>@@ -104,12 +114,15 @@ Each cell is one byte.</div><div class='ctx'>        -  G\ :sub:`23high`</div><div class='ctx'> </div><div class='ctx'>        -  G\ :sub:`21low bits 1--0`\ (bits 7--6)</div><div class='add'>+</div><div class='ctx'> 	  B\ :sub:`20low bits 5--0`\ (bits 5--0)</div><div class='ctx'> </div><div class='ctx'>        -  R\ :sub:`22low bits 3--0`\ (bits 7--4)</div><div class='add'>+</div><div class='ctx'> 	  G\ :sub:`21low bits 5--2`\ (bits 3--0)</div><div class='ctx'> </div><div class='ctx'>        -  G\ :sub:`23low bits 5--0`\ (bits 7--2)</div><div class='add'>+</div><div class='ctx'> 	  R\ :sub:`22low bits 5--4`\ (bits 1--0)</div><div class='ctx'> </div><div class='ctx'>     -  .. row 4</div><div class='hunk'>@@ -132,3 +145,8 @@ Each cell is one byte.</div><div class='ctx'> </div><div class='ctx'>        -  R\ :sub:`33low bits 5--0`\ (bits 7--2)</div><div class='ctx'> 	  G\ :sub:`32low bits 5--4`\ (bits 1--0)</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst b/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst<br/>index 7f82dad9013a..5688c816e334 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst</a></div><div class='hunk'>@@ -19,6 +19,7 @@ array of struct :c:type:`v4l2_plane_pix_format` structures,</div><div class='ctx'> describing all planes of that format.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_plane_pix_format</div><div class='hunk'>@@ -41,6 +42,10 @@ describing all planes of that format.</div><div class='ctx'> 	applications.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='ctx'> .. tabularcolumns:: |p{4.4cm}|p{5.6cm}|p{7.5cm}|</div><div class='ctx'> </div><div class='ctx'> .. c:type:: v4l2_pix_format_mplane</div><div class='hunk'>@@ -82,9 +87,7 @@ describing all planes of that format.</div><div class='ctx'>     * - __u8</div><div class='ctx'>       - ``flags``</div><div class='ctx'>       - Flags set by the application or driver, see :ref:`format-flags`.</div><div class='del'>-    * - union {</div><div class='del'>-      - (anonymous)</div><div class='del'>-      -</div><div class='add'>+    * - :cspan:`2` union { (anonymous)</div><div class='ctx'>     * - __u8</div><div class='ctx'>       - ``ycbcr_enc``</div><div class='ctx'>       - Y'CbCr encoding, from enum :c:type:`v4l2_ycbcr_encoding`.</div><div class='hunk'>@@ -97,9 +100,7 @@ describing all planes of that format.</div><div class='ctx'>         This information supplements the ``colorspace`` and must be set by</div><div class='ctx'> 	the driver for capture streams and by the application for output</div><div class='ctx'> 	streams, see :ref:`colorspaces`.</div><div class='del'>-    * - }</div><div class='del'>-      -</div><div class='del'>-      -</div><div class='add'>+    * - :cspan:`2` }</div><div class='ctx'>     * - __u8</div><div class='ctx'>       - ``quantization``</div><div class='ctx'>       - Quantization range, from enum :c:type:`v4l2_quantization`.</div><div class='hunk'>@@ -116,3 +117,7 @@ describing all planes of that format.</div><div class='ctx'>       - ``reserved[7]``</div><div class='ctx'>       - Reserved for future extensions. Should be zeroed by drivers and</div><div class='ctx'> 	applications.</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-y10p.rst b/Documentation/media/uapi/v4l/pixfmt-y10p.rst<br/>index 7893642faee3..39cd789dcb59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-y10p.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/pixfmt-y10p.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/pixfmt-y10p.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/pixfmt-y10p.rst</a></div><div class='hunk'>@@ -27,6 +27,12 @@ in the same order.</div><div class='ctx'> </div><div class='ctx'> **Bit-packed representation.**</div><div class='ctx'> </div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \small</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{1.2cm}||p{1.2cm}||p{1.2cm}||p{1.2cm}|p{3.2cm}|p{3.2cm}|</div><div class='add'>+</div><div class='ctx'> .. flat-table::</div><div class='ctx'>     :header-rows:  0</div><div class='ctx'>     :stub-columns: 0</div><div class='hunk'>@@ -38,3 +44,7 @@ in the same order.</div><div class='ctx'>       - Y'\ :sub:`03[9:2]`</div><div class='ctx'>       - Y'\ :sub:`03[1:0]`\ (bits 7--6) Y'\ :sub:`02[1:0]`\ (bits 5--4)</div><div class='ctx'> 	Y'\ :sub:`01[1:0]`\ (bits 3--2) Y'\ :sub:`00[1:0]`\ (bits 1--0)</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \normalsize</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst<br/>index f5440d55d510..ab1a48a5ae80 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/subdev-formats.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/subdev-formats.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/subdev-formats.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/subdev-formats.rst</a></div><div class='hunk'>@@ -980,6 +980,113 @@ The following tables list existing packed RGB formats.</div><div class='ctx'>       - r\ :sub:`2`</div><div class='ctx'>       - r\ :sub:`1`</div><div class='ctx'>       - r\ :sub:`0`</div><div class='add'>+    * .. _MEDIA-BUS-FMT-BGR888-3X8:</div><div class='add'>+</div><div class='add'>+      - MEDIA_BUS_FMT_BGR888_3X8</div><div class='add'>+      - 0x101b</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'>+      -</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'>+      -</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'>+      - b\ :sub:`7`</div><div class='add'>+      - b\ :sub:`6`</div><div class='add'>+      - b\ :sub:`5`</div><div class='add'>+      - b\ :sub:`4`</div><div class='add'>+      - b\ :sub:`3`</div><div class='add'>+      - b\ :sub:`2`</div><div class='add'>+      - b\ :sub:`1`</div><div class='add'>+      - b\ :sub:`0`</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'>+      -</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'>+      -</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'>+      -</div><div class='add'>+      - g\ :sub:`7`</div><div class='add'>+      - g\ :sub:`6`</div><div class='add'>+      - g\ :sub:`5`</div><div class='add'>+      - g\ :sub:`4`</div><div class='add'>+      - g\ :sub:`3`</div><div class='add'>+      - g\ :sub:`2`</div><div class='add'>+      - g\ :sub:`1`</div><div class='add'>+      - g\ :sub:`0`</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'>+      -</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'>+      -</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'>+      -</div><div class='add'>+      - r\ :sub:`7`</div><div class='add'>+      - r\ :sub:`6`</div><div class='add'>+      - r\ :sub:`5`</div><div class='add'>+      - r\ :sub:`4`</div><div class='add'>+      - r\ :sub:`3`</div><div class='add'>+      - r\ :sub:`2`</div><div class='add'>+      - r\ :sub:`1`</div><div class='add'>+      - r\ :sub:`0`</div><div class='ctx'>     * .. _MEDIA-BUS-FMT-GBR888-1X24:</div><div class='ctx'> </div><div class='ctx'>       - MEDIA_BUS_FMT_GBR888_1X24</div><div class='hunk'>@@ -7414,7 +7521,7 @@ The following table lists existing HSV/HSL formats.</div><div class='ctx'>     \tiny</div><div class='ctx'>     \setlength{\tabcolsep}{2pt}</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{3.0cm}|p{0.60cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='add'>+.. tabularcolumns:: |p{3.9cm}|p{0.73cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='ctx'> </div><div class='ctx'> .. _v4l2-mbus-pixelcode-hsv:</div><div class='ctx'> </div><div class='hunk'>@@ -7524,7 +7631,7 @@ The following table lists existing JPEG compressed formats.</div><div class='ctx'> </div><div class='ctx'> .. _v4l2-mbus-pixelcode-jpeg:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{5.4cm}|p{1.4cm}|p{10.7cm}|</div><div class='add'>+.. tabularcolumns:: |p{6.0cm}|p{1.4cm}|p{10.1cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table:: JPEG Formats</div><div class='ctx'>     :header-rows:  1</div><div class='hunk'>@@ -7557,7 +7664,7 @@ formats.</div><div class='ctx'> </div><div class='ctx'> .. _v4l2-mbus-pixelcode-vendor-specific:</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{6.8cm}|p{1.4cm}|p{9.3cm}|</div><div class='add'>+.. tabularcolumns:: |p{8.0cm}|p{1.4cm}|p{7.7cm}|</div><div class='ctx'> </div><div class='ctx'> .. flat-table:: Vendor and device specific formats</div><div class='ctx'>     :header-rows:  1</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vidioc-qbuf.rst b/Documentation/media/uapi/v4l/vidioc-qbuf.rst<br/>index c138d149faea..dbf7b445a27b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/vidioc-qbuf.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/uapi/v4l/vidioc-qbuf.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/uapi/v4l/vidioc-qbuf.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/uapi/v4l/vidioc-qbuf.rst</a></div><div class='hunk'>@@ -111,7 +111,7 @@ in use. Setting it means that the buffer will not be passed to the driver</div><div class='ctx'> until the request itself is queued. Also, the driver will apply any</div><div class='ctx'> settings associated with the request for this buffer. This field will</div><div class='ctx'> be ignored unless the ``V4L2_BUF_FLAG_REQUEST_FD`` flag is set.</div><div class='del'>-If the device does not support requests, then ``EACCES`` will be returned.</div><div class='add'>+If the device does not support requests, then ``EBADR`` will be returned.</div><div class='ctx'> If requests are supported but an invalid request file descriptor is given,</div><div class='ctx'> then ``EINVAL`` will be returned.</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +125,7 @@ then ``EINVAL`` will be returned.</div><div class='ctx'> </div><div class='ctx'>    For :ref:`memory-to-memory devices &lt;mem2mem&gt;` you can specify the</div><div class='ctx'>    ``request_fd`` only for output buffers, not for capture buffers. Attempting</div><div class='del'>-   to specify this for a capture buffer will result in an ``EACCES`` error.</div><div class='add'>+   to specify this for a capture buffer will result in an ``EBADR`` error.</div><div class='ctx'> </div><div class='ctx'> Applications call the ``VIDIOC_DQBUF`` ioctl to dequeue a filled</div><div class='ctx'> (capturing) or displayed (output) buffer from the driver's outgoing</div><div class='hunk'>@@ -185,9 +185,11 @@ EPIPE</div><div class='ctx'>     codecs if a buffer with the ``V4L2_BUF_FLAG_LAST`` was already</div><div class='ctx'>     dequeued and no new buffers are expected to become available.</div><div class='ctx'> </div><div class='del'>-EACCES</div><div class='add'>+EBADR</div><div class='ctx'>     The ``V4L2_BUF_FLAG_REQUEST_FD`` flag was set but the device does not</div><div class='del'>-    support requests for the given buffer type.</div><div class='add'>+    support requests for the given buffer type, or</div><div class='add'>+    the ``V4L2_BUF_FLAG_REQUEST_FD`` flag was not set but the device requires</div><div class='add'>+    that the buffer is part of a request.</div><div class='ctx'> </div><div class='ctx'> EBUSY</div><div class='ctx'>     The first buffer was queued via a request, but the application now tries</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst<br/>index dfd4b205937c..33a055907258 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/v4l-drivers/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/v4l-drivers/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/v4l-drivers/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/media/v4l-drivers/index.rst</a></div><div class='hunk'>@@ -65,5 +65,4 @@ For more details see the file COPYING in the source distribution of Linux.</div><div class='ctx'> 	soc-camera</div><div class='ctx'> 	uvcvideo</div><div class='ctx'> 	vivid</div><div class='del'>-	zoran</div><div class='ctx'> 	zr364xx</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/zoran.rst b/Documentation/media/v4l-drivers/zoran.rst<br/>deleted file mode 100644<br/>index d2724a863d1d..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/media/v4l-drivers/zoran.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/media/v4l-drivers/zoran.rst</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,583 +0,0 @@</div><div class='del'>-.. SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-The Zoran driver</div><div class='del'>-================</div><div class='del'>-</div><div class='del'>-unified zoran driver (zr360x7, zoran, buz, dc10(+), dc30(+), lml33)</div><div class='del'>-</div><div class='del'>-website: http://mjpeg.sourceforge.net/driver-zoran/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Frequently Asked Questions</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-What cards are supported</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Iomega Buz, Linux Media Labs LML33/LML33R10, Pinnacle/Miro</div><div class='del'>-DC10/DC10+/DC30/DC30+ and related boards (available under various names).</div><div class='del'>-</div><div class='del'>-Iomega Buz</div><div class='del'>-~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36067 PCI controller</div><div class='del'>-* Zoran zr36060 MJPEG codec</div><div class='del'>-* Philips saa7111 TV decoder</div><div class='del'>-* Philips saa7185 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, saa7111, saa7185, zr36060, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite and S-video</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 7</div><div class='del'>-</div><div class='del'>-AverMedia 6 Eyes AVS6EYES</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36067 PCI controller</div><div class='del'>-* Zoran zr36060 MJPEG codec</div><div class='del'>-* Samsung ks0127 TV decoder</div><div class='del'>-* Conexant bt866  TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, ks0127, bt866, zr36060, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs:</div><div class='del'>-	Six physical inputs. 1-6 are composite,</div><div class='del'>-	1-2, 3-4, 5-6 doubles as S-video,</div><div class='del'>-	1-3 triples as component.</div><div class='del'>-	One composite output.</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 8</div><div class='del'>-</div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   Not autodetected, card=8 is necessary.</div><div class='del'>-</div><div class='del'>-Linux Media Labs LML33</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36067 PCI controller</div><div class='del'>-* Zoran zr36060 MJPEG codec</div><div class='del'>-* Brooktree bt819 TV decoder</div><div class='del'>-* Brooktree bt856 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, bt819, bt856, zr36060, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite and S-video</div><div class='del'>-</div><div class='del'>-Norms: PAL (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 5</div><div class='del'>-</div><div class='del'>-Linux Media Labs LML33R10</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36067 PCI controller</div><div class='del'>-* Zoran zr36060 MJPEG codec</div><div class='del'>-* Philips saa7114 TV decoder</div><div class='del'>-* Analog Devices adv7170 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, saa7114, adv7170, zr36060, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite and S-video</div><div class='del'>-</div><div class='del'>-Norms: PAL (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 6</div><div class='del'>-</div><div class='del'>-Pinnacle/Miro DC10(new)</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36057 PCI controller</div><div class='del'>-* Zoran zr36060 MJPEG codec</div><div class='del'>-* Philips saa7110a TV decoder</div><div class='del'>-* Analog Devices adv7176 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, saa7110, adv7175, zr36060, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite, S-video and Internal</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (768x576 @ 25 fps), NTSC (640x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 1</div><div class='del'>-</div><div class='del'>-Pinnacle/Miro DC10+</div><div class='del'>-~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36067 PCI controller</div><div class='del'>-* Zoran zr36060 MJPEG codec</div><div class='del'>-* Philips saa7110a TV decoder</div><div class='del'>-* Analog Devices adv7176 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, sa7110, adv7175, zr36060, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite, S-video and Internal</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (768x576 @ 25 fps), NTSC (640x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 2</div><div class='del'>-</div><div class='del'>-Pinnacle/Miro DC10(old)</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36057 PCI controller</div><div class='del'>-* Zoran zr36050 MJPEG codec</div><div class='del'>-* Zoran zr36016 Video Front End or Fuji md0211 Video Front End (clone?)</div><div class='del'>-* Micronas vpx3220a TV decoder</div><div class='del'>-* mse3000 TV encoder or Analog Devices adv7176 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, vpx3220, mse3000/adv7175, zr36050, zr36016, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite, S-video and Internal</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (768x576 @ 25 fps), NTSC (640x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 0</div><div class='del'>-</div><div class='del'>-Pinnacle/Miro DC30</div><div class='del'>-~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36057 PCI controller</div><div class='del'>-* Zoran zr36050 MJPEG codec</div><div class='del'>-* Zoran zr36016 Video Front End</div><div class='del'>-* Micronas vpx3225d/vpx3220a/vpx3216b TV decoder</div><div class='del'>-* Analog Devices adv7176 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, vpx3220/vpx3224, adv7175, zr36050, zr36016, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite, S-video and Internal</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (768x576 @ 25 fps), NTSC (640x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 3</div><div class='del'>-</div><div class='del'>-Pinnacle/Miro DC30+</div><div class='del'>-~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-* Zoran zr36067 PCI controller</div><div class='del'>-* Zoran zr36050 MJPEG codec</div><div class='del'>-* Zoran zr36016 Video Front End</div><div class='del'>-* Micronas vpx3225d/vpx3220a/vpx3216b TV decoder</div><div class='del'>-* Analog Devices adv7176 TV encoder</div><div class='del'>-</div><div class='del'>-Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='del'>-videocodec, vpx3220/vpx3224, adv7175, zr36050, zr36015, zr36067</div><div class='del'>-</div><div class='del'>-Inputs/outputs: Composite, S-video and Internal</div><div class='del'>-</div><div class='del'>-Norms: PAL, SECAM (768x576 @ 25 fps), NTSC (640x480 @ 29.97 fps)</div><div class='del'>-</div><div class='del'>-Card number: 4</div><div class='del'>-</div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   #) No module for the mse3000 is available yet</div><div class='del'>-   #) No module for the vpx3224 is available yet</div><div class='del'>-</div><div class='del'>-1.1 What the TV decoder can do an what not</div><div class='del'>-------------------------------------------</div><div class='del'>-</div><div class='del'>-The best know TV standards are NTSC/PAL/SECAM. but for decoding a frame that</div><div class='del'>-information is not enough. There are several formats of the TV standards.</div><div class='del'>-And not every TV decoder is able to handle every format. Also the every</div><div class='del'>-combination is supported by the driver. There are currently 11 different</div><div class='del'>-tv broadcast formats all aver the world.</div><div class='del'>-</div><div class='del'>-The CCIR defines parameters needed for broadcasting the signal.</div><div class='del'>-The CCIR has defined different standards: A,B,D,E,F,G,D,H,I,K,K1,L,M,N,...</div><div class='del'>-The CCIR says not much about the colorsystem used !!!</div><div class='del'>-And talking about a colorsystem says not to much about how it is broadcast.</div><div class='del'>-</div><div class='del'>-The CCIR standards A,E,F are not used any more.</div><div class='del'>-</div><div class='del'>-When you speak about NTSC, you usually mean the standard: CCIR - M using</div><div class='del'>-the NTSC colorsystem which is used in the USA, Japan, Mexico, Canada</div><div class='del'>-and a few others.</div><div class='del'>-</div><div class='del'>-When you talk about PAL, you usually mean: CCIR - B/G using the PAL</div><div class='del'>-colorsystem which is used in many Countries.</div><div class='del'>-</div><div class='del'>-When you talk about SECAM, you mean: CCIR - L using the SECAM Colorsystem</div><div class='del'>-which is used in France, and a few others.</div><div class='del'>-</div><div class='del'>-There the other version of SECAM, CCIR - D/K is used in Bulgaria, China,</div><div class='del'>-Slovakai, Hungary, Korea (Rep.), Poland, Rumania and a others.</div><div class='del'>-</div><div class='del'>-The CCIR - H uses the PAL colorsystem (sometimes SECAM) and is used in</div><div class='del'>-Egypt, Libya, Sri Lanka, Syrain Arab. Rep.</div><div class='del'>-</div><div class='del'>-The CCIR - I uses the PAL colorsystem, and is used in Great Britain, Hong Kong,</div><div class='del'>-Ireland, Nigeria, South Africa.</div><div class='del'>-</div><div class='del'>-The CCIR - N uses the PAL colorsystem and PAL frame size but the NTSC framerate,</div><div class='del'>-and is used in Argentinia, Uruguay, an a few others</div><div class='del'>-</div><div class='del'>-We do not talk about how the audio is broadcast !</div><div class='del'>-</div><div class='del'>-A rather good sites about the TV standards are:</div><div class='del'>-http://www.sony.jp/support/</div><div class='del'>-http://info.electronicwerkstatt.de/bereiche/fernsehtechnik/frequenzen_und_normen/Fernsehnormen/</div><div class='del'>-and http://www.cabl.com/restaurant/channel.html</div><div class='del'>-</div><div class='del'>-Other weird things around: NTSC 4.43 is a modificated NTSC, which is mainly</div><div class='del'>-used in PAL VCR's that are able to play back NTSC. PAL 60 seems to be the same</div><div class='del'>-as NTSC 4.43 . The Datasheets also talk about NTSC 44, It seems as if it would</div><div class='del'>-be the same as NTSC 4.43.</div><div class='del'>-NTSC Combs seems to be a decoder mode where the decoder uses a comb filter</div><div class='del'>-to split coma and luma instead of a Delay line.</div><div class='del'>-</div><div class='del'>-But I did not defiantly find out what NTSC Comb is.</div><div class='del'>-</div><div class='del'>-Philips saa7111 TV decoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1997, is used in the BUZ and</div><div class='del'>-- can handle: PAL B/G/H/I, PAL N, PAL M, NTSC M, NTSC N, NTSC 4.43 and SECAM</div><div class='del'>-</div><div class='del'>-Philips saa7110a TV decoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1995, is used in the Pinnacle/Miro DC10(new), DC10+ and</div><div class='del'>-- can handle: PAL B/G, NTSC M and SECAM</div><div class='del'>-</div><div class='del'>-Philips saa7114 TV decoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 2000, is used in the LML33R10 and</div><div class='del'>-- can handle: PAL B/G/D/H/I/N, PAL N, PAL M, NTSC M, NTSC 4.43 and SECAM</div><div class='del'>-</div><div class='del'>-Brooktree bt819 TV decoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1996, and is used in the LML33 and</div><div class='del'>-- can handle: PAL B/D/G/H/I, NTSC M</div><div class='del'>-</div><div class='del'>-Micronas vpx3220a TV decoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1996, is used in the DC30 and DC30+ and</div><div class='del'>-- can handle: PAL B/G/H/I, PAL N, PAL M, NTSC M, NTSC 44, PAL 60, SECAM,NTSC Comb</div><div class='del'>-</div><div class='del'>-Samsung ks0127 TV decoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- is used in the AVS6EYES card and</div><div class='del'>-- can handle: NTSC-M/N/44, PAL-M/N/B/G/H/I/D/K/L and SECAM</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-What the TV encoder can do an what not</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-The TV encoder are doing the "same" as the decoder, but in the oder direction.</div><div class='del'>-You feed them digital data and the generate a Composite or SVHS signal.</div><div class='del'>-For information about the colorsystems and TV norm take a look in the</div><div class='del'>-TV decoder section.</div><div class='del'>-</div><div class='del'>-Philips saa7185 TV Encoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1996, is used in the BUZ</div><div class='del'>-- can generate: PAL B/G, NTSC M</div><div class='del'>-</div><div class='del'>-Brooktree bt856 TV Encoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1994, is used in the LML33</div><div class='del'>-- can generate: PAL B/D/G/H/I/N, PAL M, NTSC M, PAL-N (Argentina)</div><div class='del'>-</div><div class='del'>-Analog Devices adv7170 TV Encoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 2000, is used in the LML300R10</div><div class='del'>-- can generate: PAL B/D/G/H/I/N, PAL M, NTSC M, PAL 60</div><div class='del'>-</div><div class='del'>-Analog Devices adv7175 TV Encoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1996, is used in the DC10, DC10+, DC10 old, DC30, DC30+</div><div class='del'>-- can generate: PAL B/D/G/H/I/N, PAL M, NTSC M</div><div class='del'>-</div><div class='del'>-ITT mse3000 TV encoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- was introduced in 1991, is used in the DC10 old</div><div class='del'>-- can generate: PAL , NTSC , SECAM</div><div class='del'>-</div><div class='del'>-Conexant bt866 TV encoder</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-- is used in AVS6EYES, and</div><div class='del'>-- can generate: NTSC/PAL, PAL­M, PAL­N</div><div class='del'>-</div><div class='del'>-The adv717x, should be able to produce PAL N. But you find nothing PAL N</div><div class='del'>-specific in the registers. Seem that you have to reuse a other standard</div><div class='del'>-to generate PAL N, maybe it would work if you use the PAL M settings.</div><div class='del'>-</div><div class='del'>-How do I get this damn thing to work</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Load zr36067.o. If it can't autodetect your card, use the card=X insmod</div><div class='del'>-option with X being the card number as given in the previous section.</div><div class='del'>-To have more than one card, use card=X1[,X2[,X3,[X4[..]]]]</div><div class='del'>-</div><div class='del'>-To automate this, add the following to your /etc/modprobe.d/zoran.conf:</div><div class='del'>-</div><div class='del'>-options zr36067 card=X1[,X2[,X3[,X4[..]]]]</div><div class='del'>-alias char-major-81-0 zr36067</div><div class='del'>-</div><div class='del'>-One thing to keep in mind is that this doesn't load zr36067.o itself yet. It</div><div class='del'>-just automates loading. If you start using xawtv, the device won't load on</div><div class='del'>-some systems, since you're trying to load modules as a user, which is not</div><div class='del'>-allowed ("permission denied"). A quick workaround is to add 'Load "v4l"' to</div><div class='del'>-XF86Config-4 when you use X by default, or to run 'v4l-conf -c &lt;device&gt;' in</div><div class='del'>-one of your startup scripts (normally rc.local) if you don't use X. Both</div><div class='del'>-make sure that the modules are loaded on startup, under the root account.</div><div class='del'>-</div><div class='del'>-What mainboard should I use (or why doesn't my card work)</div><div class='del'>----------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;insert lousy disclaimer here&gt;. In short: good=SiS/Intel, bad=VIA.</div><div class='del'>-</div><div class='del'>-Experience tells us that people with a Buz, on average, have more problems</div><div class='del'>-than users with a DC10+/LML33. Also, it tells us that people owning a VIA-</div><div class='del'>-based mainboard (ktXXX, MVP3) have more problems than users with a mainboard</div><div class='del'>-based on a different chipset. Here's some notes from Andrew Stevens:</div><div class='del'>-</div><div class='del'>-Here's my experience of using LML33 and Buz on various motherboards:</div><div class='del'>-</div><div class='del'>-- VIA MVP3</div><div class='del'>-	- Forget it. Pointless. Doesn't work.</div><div class='del'>-- Intel 430FX (Pentium 200)</div><div class='del'>-	- LML33 perfect, Buz tolerable (3 or 4 frames dropped per movie)</div><div class='del'>-- Intel 440BX (early stepping)</div><div class='del'>-	- LML33 tolerable. Buz starting to get annoying (6-10 frames/hour)</div><div class='del'>-- Intel 440BX (late stepping)</div><div class='del'>-	- Buz tolerable, LML3 almost perfect (occasional single frame drops)</div><div class='del'>-- SiS735</div><div class='del'>-	- LML33 perfect, Buz tolerable.</div><div class='del'>-- VIA KT133(*)</div><div class='del'>-	- LML33 starting to get annoying, Buz poor enough that I have up.</div><div class='del'>-</div><div class='del'>-- Both 440BX boards were dual CPU versions.</div><div class='del'>-</div><div class='del'>-Bernhard Praschinger later added:</div><div class='del'>-</div><div class='del'>-- AMD 751</div><div class='del'>-	- Buz perfect-tolerable</div><div class='del'>-- AMD 760</div><div class='del'>-	- Buz perfect-tolerable</div><div class='del'>-</div><div class='del'>-In general, people on the user mailinglist won't give you much of a chance</div><div class='del'>-if you have a VIA-based motherboard. They may be cheap, but sometimes, you'd</div><div class='del'>-rather want to spend some more money on better boards. In general, VIA</div><div class='del'>-mainboard's IDE/PCI performance will also suck badly compared to others.</div><div class='del'>-You'll noticed the DC10+/DC30+ aren't mentioned anywhere in the overview.</div><div class='del'>-Basically, you can assume that if the Buz works, the LML33 will work too. If</div><div class='del'>-the LML33 works, the DC10+/DC30+ will work too. They're most tolerant to</div><div class='del'>-different mainboard chipsets from all of the supported cards.</div><div class='del'>-</div><div class='del'>-If you experience timeouts during capture, buy a better mainboard or lower</div><div class='del'>-the quality/buffersize during capture (see 'Concerning buffer sizes, quality,</div><div class='del'>-output size etc.'). If it hangs, there's little we can do as of now. Check</div><div class='del'>-your IRQs and make sure the card has its own interrupts.</div><div class='del'>-</div><div class='del'>-Programming interface</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-This driver conforms to video4linux2. Support for V4L1 and for the custom</div><div class='del'>-zoran ioctls has been removed in kernel 2.6.38.</div><div class='del'>-</div><div class='del'>-For programming example, please, look at lavrec.c and lavplay.c code in</div><div class='del'>-the MJPEG-tools (http://mjpeg.sf.net/).</div><div class='del'>-</div><div class='del'>-Additional notes for software developers:</div><div class='del'>-</div><div class='del'>-   The driver returns maxwidth and maxheight parameters according to</div><div class='del'>-   the current TV standard (norm). Therefore, the software which</div><div class='del'>-   communicates with the driver and "asks" for these parameters should</div><div class='del'>-   first set the correct norm. Well, it seems logically correct: TV</div><div class='del'>-   standard is "more constant" for current country than geometry</div><div class='del'>-   settings of a variety of TV capture cards which may work in ITU or</div><div class='del'>-   square pixel format.</div><div class='del'>-</div><div class='del'>-Applications</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Applications known to work with this driver:</div><div class='del'>-</div><div class='del'>-TV viewing:</div><div class='del'>-</div><div class='del'>-* xawtv</div><div class='del'>-* kwintv</div><div class='del'>-* probably any TV application that supports video4linux or video4linux2.</div><div class='del'>-</div><div class='del'>-MJPEG capture/playback:</div><div class='del'>-</div><div class='del'>-* mjpegtools/lavtools (or Linux Video Studio)</div><div class='del'>-* gstreamer</div><div class='del'>-* mplayer</div><div class='del'>-</div><div class='del'>-General raw capture:</div><div class='del'>-</div><div class='del'>-* xawtv</div><div class='del'>-* gstreamer</div><div class='del'>-* probably any application that supports video4linux or video4linux2</div><div class='del'>-</div><div class='del'>-Video editing:</div><div class='del'>-</div><div class='del'>-* Cinelerra</div><div class='del'>-* MainActor</div><div class='del'>-* mjpegtools (or Linux Video Studio)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Concerning buffer sizes, quality, output size etc.</div><div class='del'>---------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The zr36060 can do 1:2 JPEG compression. This is really the theoretical</div><div class='del'>-maximum that the chipset can reach. The driver can, however, limit compression</div><div class='del'>-to a maximum (size) of 1:4. The reason for this is that some cards (e.g. Buz)</div><div class='del'>-can't handle 1:2 compression without stopping capture after only a few minutes.</div><div class='del'>-With 1:4, it'll mostly work. If you have a Buz, use 'low_bitrate=1' to go into</div><div class='del'>-1:4 max. compression mode.</div><div class='del'>-</div><div class='del'>-100% JPEG quality is thus 1:2 compression in practice. So for a full PAL frame</div><div class='del'>-(size 720x576). The JPEG fields are stored in YUY2 format, so the size of the</div><div class='del'>-fields are 720x288x16/2 bits/field (2 fields/frame) = 207360 bytes/field x 2 =</div><div class='del'>-414720 bytes/frame (add some more bytes for headers and DHT (huffman)/DQT</div><div class='del'>-(quantization) tables, and you'll get to something like 512kB per frame for</div><div class='del'>-1:2 compression. For 1:4 compression, you'd have frames of half this size.</div><div class='del'>-</div><div class='del'>-Some additional explanation by Martin Samuelsson, which also explains the</div><div class='del'>-importance of buffer sizes:</div><div class='del'>---</div><div class='del'>-&gt; Hmm, I do not think it is really that way. With the current (downloaded</div><div class='del'>-&gt; at 18:00 Monday) driver I get that output sizes for 10 sec:</div><div class='del'>-&gt; -q 50 -b 128 : 24.283.332 Bytes</div><div class='del'>-&gt; -q 50 -b 256 : 48.442.368</div><div class='del'>-&gt; -q 25 -b 128 : 24.655.992</div><div class='del'>-&gt; -q 25 -b 256 : 25.859.820</div><div class='del'>-</div><div class='del'>-I woke up, and can't go to sleep again. I'll kill some time explaining why</div><div class='del'>-this doesn't look strange to me.</div><div class='del'>-</div><div class='del'>-Let's do some math using a width of 704 pixels. I'm not sure whether the Buz</div><div class='del'>-actually use that number or not, but that's not too important right now.</div><div class='del'>-</div><div class='del'>-704x288 pixels, one field, is 202752 pixels. Divided by 64 pixels per block;</div><div class='del'>-3168 blocks per field. Each pixel consist of two bytes; 128 bytes per block;</div><div class='del'>-1024 bits per block. 100% in the new driver mean 1:2 compression; the maximum</div><div class='del'>-output becomes 512 bits per block. Actually 510, but 512 is simpler to use</div><div class='del'>-for calculations.</div><div class='del'>-</div><div class='del'>-Let's say that we specify d1q50. We thus want 256 bits per block; times 3168</div><div class='del'>-becomes 811008 bits; 101376 bytes per field. We're talking raw bits and bytes</div><div class='del'>-here, so we don't need to do any fancy corrections for bits-per-pixel or such</div><div class='del'>-things. 101376 bytes per field.</div><div class='del'>-</div><div class='del'>-d1 video contains two fields per frame. Those sum up to 202752 bytes per</div><div class='del'>-frame, and one of those frames goes into each buffer.</div><div class='del'>-</div><div class='del'>-But wait a second! -b128 gives 128kB buffers! It's not possible to cram</div><div class='del'>-202752 bytes of JPEG data into 128kB!</div><div class='del'>-</div><div class='del'>-This is what the driver notice and automatically compensate for in your</div><div class='del'>-examples. Let's do some math using this information:</div><div class='del'>-</div><div class='del'>-128kB is 131072 bytes. In this buffer, we want to store two fields, which</div><div class='del'>-leaves 65536 bytes for each field. Using 3168 blocks per field, we get</div><div class='del'>-20.68686868... available bytes per block; 165 bits. We can't allow the</div><div class='del'>-request for 256 bits per block when there's only 165 bits available! The -q50</div><div class='del'>-option is silently overridden, and the -b128 option takes precedence, leaving</div><div class='del'>-us with the equivalence of -q32.</div><div class='del'>-</div><div class='del'>-This gives us a data rate of 165 bits per block, which, times 3168, sums up</div><div class='del'>-to 65340 bytes per field, out of the allowed 65536. The current driver has</div><div class='del'>-another level of rate limiting; it won't accept -q values that fill more than</div><div class='del'>-6/8 of the specified buffers. (I'm not sure why. "Playing it safe" seem to be</div><div class='del'>-a safe bet. Personally, I think I would have lowered requested-bits-per-block</div><div class='del'>-by one, or something like that.) We can't use 165 bits per block, but have to</div><div class='del'>-lower it again, to 6/8 of the available buffer space: We end up with 124 bits</div><div class='del'>-per block, the equivalence of -q24. With 128kB buffers, you can't use greater</div><div class='del'>-than -q24 at -d1. (And PAL, and 704 pixels width...)</div><div class='del'>-</div><div class='del'>-The third example is limited to -q24 through the same process. The second</div><div class='del'>-example, using very similar calculations, is limited to -q48. The only</div><div class='del'>-example that actually grab at the specified -q value is the last one, which</div><div class='del'>-is clearly visible, looking at the file size.</div><div class='del'>---</div><div class='del'>-</div><div class='del'>-Conclusion: the quality of the resulting movie depends on buffer size, quality,</div><div class='del'>-whether or not you use 'low_bitrate=1' as insmod option for the zr36060.c</div><div class='del'>-module to do 1:4 instead of 1:2 compression, etc.</div><div class='del'>-</div><div class='del'>-If you experience timeouts, lowering the quality/buffersize or using</div><div class='del'>-'low_bitrate=1 as insmod option for zr36060.o might actually help, as is</div><div class='del'>-proven by the Buz.</div><div class='del'>-</div><div class='del'>-It hangs/crashes/fails/whatevers! Help!</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-Make sure that the card has its own interrupts (see /proc/interrupts), check</div><div class='del'>-the output of dmesg at high verbosity (load zr36067.o with debug=2,</div><div class='del'>-load all other modules with debug=1). Check that your mainboard is favorable</div><div class='del'>-(see question 2) and if not, test the card in another computer. Also see the</div><div class='del'>-notes given in question 3 and try lowering quality/buffersize/capturesize</div><div class='del'>-if recording fails after a period of time.</div><div class='del'>-</div><div class='del'>-If all this doesn't help, give a clear description of the problem including</div><div class='del'>-detailed hardware information (memory+brand, mainboard+chipset+brand, which</div><div class='del'>-MJPEG card, processor, other PCI cards that might be of interest), give the</div><div class='del'>-system PnP information (/proc/interrupts, /proc/dma, /proc/devices), and give</div><div class='del'>-the kernel version, driver version, glibc version, gcc version and any other</div><div class='del'>-information that might possibly be of interest. Also provide the dmesg output</div><div class='del'>-at high verbosity. See 'Contacting' on how to contact the developers.</div><div class='del'>-</div><div class='del'>-Maintainers/Contacting</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-The driver is currently maintained by Laurent Pinchart and Ronald Bultje</div><div class='del'>-(&lt;laurent.pinchart@skynet.be&gt; and &lt;rbultje@ronald.bitfreak.net&gt;). For bug</div><div class='del'>-reports or questions, please contact the mailinglist instead of the developers</div><div class='del'>-individually. For user questions (i.e. bug reports or how-to questions), send</div><div class='del'>-an email to &lt;mjpeg-users@lists.sf.net&gt;, for developers (i.e. if you want to</div><div class='del'>-help programming), send an email to &lt;mjpeg-developer@lists.sf.net&gt;. See</div><div class='del'>-http://www.sf.net/projects/mjpeg/ for subscription information.</div><div class='del'>-</div><div class='del'>-For bug reports, be sure to include all the information as described in</div><div class='del'>-the section 'It hangs/crashes/fails/whatevers! Help!'. Please make sure</div><div class='del'>-you're using the latest version (http://mjpeg.sf.net/driver-zoran/).</div><div class='del'>-</div><div class='del'>-Previous maintainers/developers of this driver include Serguei Miridonov</div><div class='del'>-&lt;mirsev@cicese.mx&gt;, Wolfgang Scherr &lt;scherr@net4you.net&gt;, Dave Perks</div><div class='del'>-&lt;dperks@ibm.net&gt; and Rainer Johanni &lt;Rainer@Johanni.de&gt;.</div><div class='del'>-</div><div class='del'>-Driver's License</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-    This driver is distributed under the terms of the General Public License.</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, or</div><div class='del'>-    (at your option) any later version.</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'>-See http://www.gnu.org/ for more information.</div><div class='head'>diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt<br/>index 1c22b21ae922..f70ebcdfe592 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/memory-barriers.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/memory-barriers.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/memory-barriers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/memory-barriers.txt</a></div><div class='hunk'>@@ -1937,21 +1937,6 @@ There are some more advanced barrier functions:</div><div class='ctx'>      information on consistent memory.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-MMIO WRITE BARRIER</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-The Linux kernel also has a special barrier for use with memory-mapped I/O</div><div class='del'>-writes:</div><div class='del'>-</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='del'>-This is a variation on the mandatory write barrier that causes writes to weakly</div><div class='del'>-ordered I/O regions to be partially ordered.  Its effects may go beyond the</div><div class='del'>-CPU-&gt;Hardware interface and actually affect the hardware at some level.</div><div class='del'>-</div><div class='del'>-See the subsection "Acquires vs I/O accesses" for more information.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> ===============================</div><div class='ctx'> IMPLICIT KERNEL MEMORY BARRIERS</div><div class='ctx'> ===============================</div><div class='hunk'>@@ -2317,75 +2302,6 @@ But it won't see any of:</div><div class='ctx'> 	*E, *F or *G following RELEASE Q</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-ACQUIRES VS I/O ACCESSES</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Under certain circumstances (especially involving NUMA), I/O accesses within</div><div class='del'>-two spinlocked sections on two different CPUs may be seen as interleaved by the</div><div class='del'>-PCI bridge, because the PCI bridge does not necessarily participate in the</div><div class='del'>-cache-coherence protocol, and is therefore incapable of issuing the required</div><div class='del'>-read memory barriers.</div><div class='del'>-</div><div class='del'>-For example:</div><div class='del'>-</div><div class='del'>-	CPU 1				CPU 2</div><div class='del'>-	===============================	===============================</div><div class='del'>-	spin_lock(Q)</div><div class='del'>-	writel(0, ADDR)</div><div class='del'>-	writel(1, DATA);</div><div class='del'>-	spin_unlock(Q);</div><div class='del'>-					spin_lock(Q);</div><div class='del'>-					writel(4, ADDR);</div><div class='del'>-					writel(5, DATA);</div><div class='del'>-					spin_unlock(Q);</div><div class='del'>-</div><div class='del'>-may be seen by the PCI bridge as follows:</div><div class='del'>-</div><div class='del'>-	STORE *ADDR = 0, STORE *ADDR = 4, STORE *DATA = 1, STORE *DATA = 5</div><div class='del'>-</div><div class='del'>-which would probably cause the hardware to malfunction.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-What is necessary here is to intervene with an mmiowb() before dropping the</div><div class='del'>-spinlock, for example:</div><div class='del'>-</div><div class='del'>-	CPU 1				CPU 2</div><div class='del'>-	===============================	===============================</div><div class='del'>-	spin_lock(Q)</div><div class='del'>-	writel(0, ADDR)</div><div class='del'>-	writel(1, DATA);</div><div class='del'>-	mmiowb();</div><div class='del'>-	spin_unlock(Q);</div><div class='del'>-					spin_lock(Q);</div><div class='del'>-					writel(4, ADDR);</div><div class='del'>-					writel(5, DATA);</div><div class='del'>-					mmiowb();</div><div class='del'>-					spin_unlock(Q);</div><div class='del'>-</div><div class='del'>-this will ensure that the two stores issued on CPU 1 appear at the PCI bridge</div><div class='del'>-before either of the stores issued on CPU 2.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Furthermore, following a store by a load from the same device obviates the need</div><div class='del'>-for the mmiowb(), because the load forces the store to complete before the load</div><div class='del'>-is performed:</div><div class='del'>-</div><div class='del'>-	CPU 1				CPU 2</div><div class='del'>-	===============================	===============================</div><div class='del'>-	spin_lock(Q)</div><div class='del'>-	writel(0, ADDR)</div><div class='del'>-	a = readl(DATA);</div><div class='del'>-	spin_unlock(Q);</div><div class='del'>-					spin_lock(Q);</div><div class='del'>-					writel(4, ADDR);</div><div class='del'>-					b = readl(DATA);</div><div class='del'>-					spin_unlock(Q);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-See Documentation/driver-api/device-io.rst for more information.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> =================================</div><div class='ctx'> WHERE ARE MEMORY BARRIERS NEEDED?</div><div class='ctx'> =================================</div><div class='hunk'>@@ -2532,16 +2448,9 @@ the device to malfunction.</div><div class='ctx'> Inside of the Linux kernel, I/O should be done through the appropriate accessor</div><div class='ctx'> routines - such as inb() or writel() - which know how to make such accesses</div><div class='ctx'> appropriately sequential.  While this, for the most part, renders the explicit</div><div class='del'>-use of memory barriers unnecessary, there are a couple of situations where they</div><div class='del'>-might be needed:</div><div class='del'>-</div><div class='del'>- (1) On some systems, I/O stores are not strongly ordered across all CPUs, and</div><div class='del'>-     so for _all_ general drivers locks should be used and mmiowb() must be</div><div class='del'>-     issued prior to unlocking the critical section.</div><div class='del'>-</div><div class='del'>- (2) If the accessor functions are used to refer to an I/O memory window with</div><div class='del'>-     relaxed memory access properties, then _mandatory_ memory barriers are</div><div class='del'>-     required to enforce ordering.</div><div class='add'>+use of memory barriers unnecessary, if the accessor functions are used to refer</div><div class='add'>+to an I/O memory window with relaxed memory access properties, then _mandatory_</div><div class='add'>+memory barriers are required to enforce ordering.</div><div class='ctx'> </div><div class='ctx'> See Documentation/driver-api/device-io.rst for more information.</div><div class='ctx'> </div><div class='hunk'>@@ -2586,8 +2495,7 @@ explicit barriers are used.</div><div class='ctx'> </div><div class='ctx'> Normally this won't be a problem because the I/O accesses done inside such</div><div class='ctx'> sections will include synchronous load operations on strictly ordered I/O</div><div class='del'>-registers that form implicit I/O barriers.  If this isn't sufficient then an</div><div class='del'>-mmiowb() may need to be used explicitly.</div><div class='add'>+registers that form implicit I/O barriers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> A similar situation may occur between an interrupt routine and two routines</div><div class='hunk'>@@ -2599,71 +2507,114 @@ likely, then interrupt-disabling locks should be used to guarantee ordering.</div><div class='ctx'> KERNEL I/O BARRIER EFFECTS</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='del'>-When accessing I/O memory, drivers should use the appropriate accessor</div><div class='del'>-functions:</div><div class='del'>-</div><div class='del'>- (*) inX(), outX():</div><div class='del'>-</div><div class='del'>-     These are intended to talk to I/O space rather than memory space, but</div><div class='del'>-     that's primarily a CPU-specific concept.  The i386 and x86_64 processors</div><div class='del'>-     do indeed have special I/O space access cycles and instructions, but many</div><div class='del'>-     CPUs don't have such a concept.</div><div class='del'>-</div><div class='del'>-     The PCI bus, amongst others, defines an I/O space concept which - on such</div><div class='del'>-     CPUs as i386 and x86_64 - readily maps to the CPU's concept of I/O</div><div class='del'>-     space.  However, it may also be mapped as a virtual I/O space in the CPU's</div><div class='del'>-     memory map, particularly on those CPUs that don't support alternate I/O</div><div class='del'>-     spaces.</div><div class='del'>-</div><div class='del'>-     Accesses to this space may be fully synchronous (as on i386), but</div><div class='del'>-     intermediary bridges (such as the PCI host bridge) may not fully honour</div><div class='del'>-     that.</div><div class='del'>-</div><div class='del'>-     They are guaranteed to be fully ordered with respect to each other.</div><div class='del'>-</div><div class='del'>-     They are not guaranteed to be fully ordered with respect to other types of</div><div class='del'>-     memory and I/O operation.</div><div class='add'>+Interfacing with peripherals via I/O accesses is deeply architecture and device</div><div class='add'>+specific. Therefore, drivers which are inherently non-portable may rely on</div><div class='add'>+specific behaviours of their target systems in order to achieve synchronization</div><div class='add'>+in the most lightweight manner possible. For drivers intending to be portable</div><div class='add'>+between multiple architectures and bus implementations, the kernel offers a</div><div class='add'>+series of accessor functions that provide various degrees of ordering</div><div class='add'>+guarantees:</div><div class='ctx'> </div><div class='ctx'>  (*) readX(), writeX():</div><div class='ctx'> </div><div class='del'>-     Whether these are guaranteed to be fully ordered and uncombined with</div><div class='del'>-     respect to each other on the issuing CPU depends on the characteristics</div><div class='del'>-     defined for the memory window through which they're accessing.  On later</div><div class='del'>-     i386 architecture machines, for example, this is controlled by way of the</div><div class='del'>-     MTRR registers.</div><div class='add'>+	The readX() and writeX() MMIO accessors take a pointer to the</div><div class='add'>+	peripheral being accessed as an __iomem * parameter. For pointers</div><div class='add'>+	mapped with the default I/O attributes (e.g. those returned by</div><div class='add'>+	ioremap()), the ordering guarantees are as follows:</div><div class='add'>+</div><div class='add'>+	1. All readX() and writeX() accesses to the same peripheral are ordered</div><div class='add'>+	   with respect to each other. This ensures that MMIO register accesses</div><div class='add'>+	   by the same CPU thread to a particular device will arrive in program</div><div class='add'>+	   order.</div><div class='add'>+</div><div class='add'>+	2. A writeX() issued by a CPU thread holding a spinlock is ordered</div><div class='add'>+	   before a writeX() to the same peripheral from another CPU thread</div><div class='add'>+	   issued after a later acquisition of the same spinlock. This ensures</div><div class='add'>+	   that MMIO register writes to a particular device issued while holding</div><div class='add'>+	   a spinlock will arrive in an order consistent with acquisitions of</div><div class='add'>+	   the lock.</div><div class='add'>+</div><div class='add'>+	3. A writeX() by a CPU thread to the peripheral will first wait for the</div><div class='add'>+	   completion of all prior writes to memory either issued by, or</div><div class='add'>+	   propagated to, the same thread. This ensures that writes by the CPU</div><div class='add'>+	   to an outbound DMA buffer allocated by dma_alloc_coherent() will be</div><div class='add'>+	   visible to a DMA engine when the CPU writes to its MMIO control</div><div class='add'>+	   register to trigger the transfer.</div><div class='add'>+</div><div class='add'>+	4. A readX() by a CPU thread from the peripheral will complete before</div><div class='add'>+	   any subsequent reads from memory by the same thread can begin. This</div><div class='add'>+	   ensures that reads by the CPU from an incoming DMA buffer allocated</div><div class='add'>+	   by dma_alloc_coherent() will not see stale data after reading from</div><div class='add'>+	   the DMA engine's MMIO status register to establish that the DMA</div><div class='add'>+	   transfer has completed.</div><div class='add'>+</div><div class='add'>+	5. A readX() by a CPU thread from the peripheral will complete before</div><div class='add'>+	   any subsequent delay() loop can begin execution on the same thread.</div><div class='add'>+	   This ensures that two MMIO register writes by the CPU to a peripheral</div><div class='add'>+	   will arrive at least 1us apart if the first write is immediately read</div><div class='add'>+	   back with readX() and udelay(1) is called prior to the second</div><div class='add'>+	   writeX():</div><div class='add'>+</div><div class='add'>+		writel(42, DEVICE_REGISTER_0); // Arrives at the device...</div><div class='add'>+		readl(DEVICE_REGISTER_0);</div><div class='add'>+		udelay(1);</div><div class='add'>+		writel(42, DEVICE_REGISTER_1); // ...at least 1us before this.</div><div class='add'>+</div><div class='add'>+	The ordering properties of __iomem pointers obtained with non-default</div><div class='add'>+	attributes (e.g. those returned by ioremap_wc()) are specific to the</div><div class='add'>+	underlying architecture and therefore the guarantees listed above cannot</div><div class='add'>+	generally be relied upon for accesses to these types of mappings.</div><div class='add'>+</div><div class='add'>+ (*) readX_relaxed(), writeX_relaxed():</div><div class='add'>+</div><div class='add'>+	These are similar to readX() and writeX(), but provide weaker memory</div><div class='add'>+	ordering guarantees. Specifically, they do not guarantee ordering with</div><div class='add'>+	respect to locking, normal memory accesses or delay() loops (i.e.</div><div class='add'>+	bullets 2-5 above) but they are still guaranteed to be ordered with</div><div class='add'>+	respect to other accesses from the same CPU thread to the same</div><div class='add'>+	peripheral when operating on __iomem pointers mapped with the default</div><div class='add'>+	I/O attributes.</div><div class='add'>+</div><div class='add'>+ (*) readsX(), writesX():</div><div class='add'>+</div><div class='add'>+	The readsX() and writesX() MMIO accessors are designed for accessing</div><div class='add'>+	register-based, memory-mapped FIFOs residing on peripherals that are not</div><div class='add'>+	capable of performing DMA. Consequently, they provide only the ordering</div><div class='add'>+	guarantees of readX_relaxed() and writeX_relaxed(), as documented above.</div><div class='ctx'> </div><div class='del'>-     Ordinarily, these will be guaranteed to be fully ordered and uncombined,</div><div class='del'>-     provided they're not accessing a prefetchable device.</div><div class='add'>+ (*) inX(), outX():</div><div class='ctx'> </div><div class='del'>-     However, intermediary hardware (such as a PCI bridge) may indulge in</div><div class='del'>-     deferral if it so wishes; to flush a store, a load from the same location</div><div class='del'>-     is preferred[*], but a load from the same device or from configuration</div><div class='del'>-     space should suffice for PCI.</div><div class='add'>+	The inX() and outX() accessors are intended to access legacy port-mapped</div><div class='add'>+	I/O peripherals, which may require special instructions on some</div><div class='add'>+	architectures (notably x86). The port number of the peripheral being</div><div class='add'>+	accessed is passed as an argument.</div><div class='ctx'> </div><div class='del'>-     [*] NOTE! attempting to load from the same location as was written to may</div><div class='del'>-	 cause a malfunction - consider the 16550 Rx/Tx serial registers for</div><div class='del'>-	 example.</div><div class='add'>+	Since many CPU architectures ultimately access these peripherals via an</div><div class='add'>+	internal virtual memory mapping, the portable ordering guarantees</div><div class='add'>+	provided by inX() and outX() are the same as those provided by readX()</div><div class='add'>+	and writeX() respectively when accessing a mapping with the default I/O</div><div class='add'>+	attributes.</div><div class='ctx'> </div><div class='del'>-     Used with prefetchable I/O memory, an mmiowb() barrier may be required to</div><div class='del'>-     force stores to be ordered.</div><div class='add'>+	Device drivers may expect outX() to emit a non-posted write transaction</div><div class='add'>+	that waits for a completion response from the I/O peripheral before</div><div class='add'>+	returning. This is not guaranteed by all architectures and is therefore</div><div class='add'>+	not part of the portable ordering semantics.</div><div class='ctx'> </div><div class='del'>-     Please refer to the PCI specification for more information on interactions</div><div class='del'>-     between PCI transactions.</div><div class='add'>+ (*) insX(), outsX():</div><div class='ctx'> </div><div class='del'>- (*) readX_relaxed(), writeX_relaxed()</div><div class='add'>+	As above, the insX() and outsX() accessors provide the same ordering</div><div class='add'>+	guarantees as readsX() and writesX() respectively when accessing a</div><div class='add'>+	mapping with the default I/O attributes.</div><div class='ctx'> </div><div class='del'>-     These are similar to readX() and writeX(), but provide weaker memory</div><div class='del'>-     ordering guarantees.  Specifically, they do not guarantee ordering with</div><div class='del'>-     respect to normal memory accesses (e.g. DMA buffers) nor do they guarantee</div><div class='del'>-     ordering with respect to LOCK or UNLOCK operations.  If the latter is</div><div class='del'>-     required, an mmiowb() barrier can be used.  Note that relaxed accesses to</div><div class='del'>-     the same peripheral are guaranteed to be ordered with respect to each</div><div class='del'>-     other.</div><div class='add'>+ (*) ioreadX(), iowriteX():</div><div class='ctx'> </div><div class='del'>- (*) ioreadX(), iowriteX()</div><div class='add'>+	These will perform appropriately for the type of access they're actually</div><div class='add'>+	doing, be it inX()/outX() or readX()/writeX().</div><div class='ctx'> </div><div class='del'>-     These will perform appropriately for the type of access they're actually</div><div class='del'>-     doing, be it inX()/outX() or readX()/writeX().</div><div class='add'>+With the exception of the string accessors (insX(), outsX(), readsX() and</div><div class='add'>+writesX()), all of the above assume that the underlying peripheral is</div><div class='add'>+little-endian and will therefore perform byte-swapping operations on big-endian</div><div class='add'>+architectures.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ========================================</div><div class='head'>diff --git a/Documentation/networking/batman-adv.rst b/Documentation/networking/batman-adv.rst<br/>index 245fb6c0ab6f..18020943ba25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/batman-adv.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/batman-adv.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/batman-adv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/batman-adv.rst</a></div><div class='hunk'>@@ -27,24 +27,8 @@ Load the batman-adv module into your kernel::</div><div class='ctx'>   $ insmod batman-adv.ko</div><div class='ctx'> </div><div class='ctx'> The module is now waiting for activation. You must add some interfaces on which</div><div class='del'>-batman can operate. After loading the module batman advanced will scan your</div><div class='del'>-systems interfaces to search for compatible interfaces. Once found, it will</div><div class='del'>-create subfolders in the ``/sys`` directories of each supported interface,</div><div class='del'>-e.g.::</div><div class='del'>-</div><div class='del'>-  $ ls /sys/class/net/eth0/batman_adv/</div><div class='del'>-  elp_interval iface_status mesh_iface throughput_override</div><div class='del'>-</div><div class='del'>-If an interface does not have the ``batman_adv`` subfolder, it probably is not</div><div class='del'>-supported. Not supported interfaces are: loopback, non-ethernet and batman's</div><div class='del'>-own interfaces.</div><div class='del'>-</div><div class='del'>-Note: After the module was loaded it will continuously watch for new</div><div class='del'>-interfaces to verify the compatibility. There is no need to reload the module</div><div class='del'>-if you plug your USB wifi adapter into your machine after batman advanced was</div><div class='del'>-initially loaded.</div><div class='del'>-</div><div class='del'>-The batman-adv soft-interface can be created using the iproute2 tool ``ip``::</div><div class='add'>+batman-adv can operate. The batman-adv soft-interface can be created using the</div><div class='add'>+iproute2 tool ``ip``::</div><div class='ctx'> </div><div class='ctx'>   $ ip link add name bat0 type batadv</div><div class='ctx'> </div><div class='hunk'>@@ -52,57 +36,46 @@ To activate a given interface simply attach it to the ``bat0`` interface::</div><div class='ctx'> </div><div class='ctx'>   $ ip link set dev eth0 master bat0</div><div class='ctx'> </div><div class='del'>-Repeat this step for all interfaces you wish to add. Now batman starts</div><div class='add'>+Repeat this step for all interfaces you wish to add. Now batman-adv starts</div><div class='ctx'> using/broadcasting on this/these interface(s).</div><div class='ctx'> </div><div class='del'>-By reading the "iface_status" file you can check its status::</div><div class='del'>-</div><div class='del'>-  $ cat /sys/class/net/eth0/batman_adv/iface_status</div><div class='del'>-  active</div><div class='del'>-</div><div class='ctx'> To deactivate an interface you have to detach it from the "bat0" interface::</div><div class='ctx'> </div><div class='ctx'>   $ ip link set dev eth0 nomaster</div><div class='ctx'> </div><div class='add'>+The same can also be done using the batctl interface subcommand::</div><div class='ctx'> </div><div class='del'>-All mesh wide settings can be found in batman's own interface folder::</div><div class='add'>+  batctl -m bat0 interface create</div><div class='add'>+  batctl -m bat0 interface add -M eth0</div><div class='ctx'> </div><div class='del'>-  $ ls /sys/class/net/bat0/mesh/</div><div class='del'>-  aggregated_ogms       fragmentation isolation_mark routing_algo</div><div class='del'>-  ap_isolation          gw_bandwidth  log_level      vlan0</div><div class='del'>-  bonding               gw_mode       multicast_mode</div><div class='del'>-  bridge_loop_avoidance gw_sel_class  network_coding</div><div class='del'>-  distributed_arp_table hop_penalty   orig_interval</div><div class='add'>+To detach eth0 and destroy bat0::</div><div class='ctx'> </div><div class='del'>-There is a special folder for debugging information::</div><div class='add'>+  batctl -m bat0 interface del -M eth0</div><div class='add'>+  batctl -m bat0 interface destroy</div><div class='ctx'> </div><div class='del'>-  $ ls /sys/kernel/debug/batman_adv/bat0/</div><div class='del'>-  bla_backbone_table log         neighbors         transtable_local</div><div class='del'>-  bla_claim_table    mcast_flags originators</div><div class='del'>-  dat_cache          nc          socket</div><div class='del'>-  gateways           nc_nodes    transtable_global</div><div class='add'>+There are additional settings for each batadv mesh interface, vlan and hardif</div><div class='add'>+which can be modified using batctl. Detailed information about this can be found</div><div class='add'>+in its manual.</div><div class='ctx'> </div><div class='del'>-Some of the files contain all sort of status information regarding the mesh</div><div class='del'>-network. For example, you can view the table of originators (mesh</div><div class='del'>-participants) with::</div><div class='add'>+For instance, you can check the current originator interval (value</div><div class='add'>+in milliseconds which determines how often batman-adv sends its broadcast</div><div class='add'>+packets)::</div><div class='ctx'> </div><div class='del'>-  $ cat /sys/kernel/debug/batman_adv/bat0/originators</div><div class='del'>-</div><div class='del'>-Other files allow to change batman's behaviour to better fit your requirements.</div><div class='del'>-For instance, you can check the current originator interval (value in</div><div class='del'>-milliseconds which determines how often batman sends its broadcast packets)::</div><div class='del'>-</div><div class='del'>-  $ cat /sys/class/net/bat0/mesh/orig_interval</div><div class='add'>+  $ batctl -M bat0 orig_interval</div><div class='ctx'>   1000</div><div class='ctx'> </div><div class='ctx'> and also change its value::</div><div class='ctx'> </div><div class='del'>-  $ echo 3000 &gt; /sys/class/net/bat0/mesh/orig_interval</div><div class='add'>+  $ batctl -M bat0 orig_interval 3000</div><div class='ctx'> </div><div class='ctx'> In very mobile scenarios, you might want to adjust the originator interval to a</div><div class='ctx'> lower value. This will make the mesh more responsive to topology changes, but</div><div class='ctx'> will also increase the overhead.</div><div class='ctx'> </div><div class='add'>+Information about the current state can be accessed via the batadv generic</div><div class='add'>+netlink family. batctl provides human readable version via its debug tables</div><div class='add'>+subcommands.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Usage</div><div class='ctx'> =====</div><div class='hunk'>@@ -147,43 +120,16 @@ batman-adv module. When building batman-adv as part of kernel, use "make</div><div class='ctx'> menuconfig" and enable the option ``B.A.T.M.A.N. debugging``</div><div class='ctx'> (``CONFIG_BATMAN_ADV_DEBUG=y``).</div><div class='ctx'> </div><div class='del'>-Those additional debug messages can be accessed using a special file in</div><div class='del'>-debugfs::</div><div class='add'>+Those additional debug messages can be accessed using the perf infrastructure::</div><div class='ctx'> </div><div class='del'>-  $ cat /sys/kernel/debug/batman_adv/bat0/log</div><div class='add'>+  $ trace-cmd stream -e batadv:batadv_dbg</div><div class='ctx'> </div><div class='ctx'> The additional debug output is by default disabled. It can be enabled during</div><div class='del'>-run time. Following log_levels are defined:</div><div class='del'>-</div><div class='del'>-.. flat-table::</div><div class='del'>-</div><div class='del'>-   * - 0</div><div class='del'>-     - All debug output disabled</div><div class='del'>-   * - 1</div><div class='del'>-     - Enable messages related to routing / flooding / broadcasting</div><div class='del'>-   * - 2</div><div class='del'>-     - Enable messages related to route added / changed / deleted</div><div class='del'>-   * - 4</div><div class='del'>-     - Enable messages related to translation table operations</div><div class='del'>-   * - 8</div><div class='del'>-     - Enable messages related to bridge loop avoidance</div><div class='del'>-   * - 16</div><div class='del'>-     - Enable messages related to DAT, ARP snooping and parsing</div><div class='del'>-   * - 32</div><div class='del'>-     - Enable messages related to network coding</div><div class='del'>-   * - 64</div><div class='del'>-     - Enable messages related to multicast</div><div class='del'>-   * - 128</div><div class='del'>-     - Enable messages related to throughput meter</div><div class='del'>-   * - 255</div><div class='del'>-     - Enable all messages</div><div class='del'>-</div><div class='del'>-The debug output can be changed at runtime using the file</div><div class='del'>-``/sys/class/net/bat0/mesh/log_level``. e.g.::</div><div class='del'>-</div><div class='del'>-  $ echo 6 &gt; /sys/class/net/bat0/mesh/log_level</div><div class='del'>-</div><div class='del'>-will enable debug messages for when routes change.</div><div class='add'>+run time::</div><div class='add'>+</div><div class='add'>+  $ batctl -m bat0 loglevel routes tt</div><div class='add'>+</div><div class='add'>+will enable debug messages for when routes and translation table entries change.</div><div class='ctx'> </div><div class='ctx'> Counters for different types of packets entering and leaving the batman-adv</div><div class='ctx'> module are available through ethtool::</div><div class='head'>diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt<br/>index e12a4900cf72..d192f8b9948b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/decnet.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/decnet.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/decnet.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/decnet.txt</a></div><div class='hunk'>@@ -22,8 +22,6 @@ you'll need the following options as well...</div><div class='ctx'>     CONFIG_DECNET_ROUTER (to be able to add/delete routes)</div><div class='ctx'>     CONFIG_NETFILTER (will be required for the DECnet routing daemon)</div><div class='ctx'> </div><div class='del'>-    CONFIG_DECNET_ROUTE_FWMARK is optional</div><div class='del'>-</div><div class='ctx'> Don't turn on SIOCGIFCONF support for DECnet unless you are really sure</div><div class='ctx'> that you need it, in general you won't and it can cause ifconfig to</div><div class='ctx'> malfunction.</div><div class='head'>diff --git a/Documentation/networking/devlink-info-versions.rst b/Documentation/networking/devlink-info-versions.rst<br/>index c79ad8593383..4316342b7746 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/devlink-info-versions.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/devlink-info-versions.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/devlink-info-versions.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/devlink-info-versions.rst</a></div><div class='hunk'>@@ -41,3 +41,8 @@ fw.ncsi</div><div class='ctx'> </div><div class='ctx'> Version of the software responsible for supporting/handling the</div><div class='ctx'> Network Controller Sideband Interface.</div><div class='add'>+</div><div class='add'>+fw.psid</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+Unique identifier of the firmware parameter set.</div><div class='head'>diff --git a/Documentation/networking/dsa/bcm_sf2.txt b/Documentation/networking/dsa/bcm_sf2.rst<br/>index eba3a2431e91..dee234039e1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/bcm_sf2.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/bcm_sf2.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/bcm_sf2.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/dsa/bcm_sf2.rst</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+=============================================</div><div class='ctx'> Broadcom Starfighter 2 Ethernet switch driver</div><div class='ctx'> =============================================</div><div class='ctx'> </div><div class='hunk'>@@ -25,27 +26,27 @@ are connected at a lower speed.</div><div class='ctx'> The switch hardware block is typically interfaced using MMIO accesses and</div><div class='ctx'> contains a bunch of sub-blocks/registers:</div><div class='ctx'> </div><div class='del'>-* SWITCH_CORE: common switch registers</div><div class='del'>-* SWITCH_REG: external interfaces switch register</div><div class='del'>-* SWITCH_MDIO: external MDIO bus controller (there is another one in SWITCH_CORE,</div><div class='add'>+- ``SWITCH_CORE``: common switch registers</div><div class='add'>+- ``SWITCH_REG``: external interfaces switch register</div><div class='add'>+- ``SWITCH_MDIO``: external MDIO bus controller (there is another one in SWITCH_CORE,</div><div class='ctx'>   which is used for indirect PHY accesses)</div><div class='del'>-* SWITCH_INDIR_RW: 64-bits wide register helper block</div><div class='del'>-* SWITCH_INTRL2_0/1: Level-2 interrupt controllers</div><div class='del'>-* SWITCH_ACB: Admission control block</div><div class='del'>-* SWITCH_FCB: Fail-over control block</div><div class='add'>+- ``SWITCH_INDIR_RW``: 64-bits wide register helper block</div><div class='add'>+- ``SWITCH_INTRL2_0/1``: Level-2 interrupt controllers</div><div class='add'>+- ``SWITCH_ACB``: Admission control block</div><div class='add'>+- ``SWITCH_FCB``: Fail-over control block</div><div class='ctx'> </div><div class='ctx'> Implementation details</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='del'>-The driver is located in drivers/net/dsa/bcm_sf2.c and is implemented as a DSA</div><div class='del'>-driver; see Documentation/networking/dsa/dsa.txt for details on the subsystem</div><div class='add'>+The driver is located in ``drivers/net/dsa/bcm_sf2.c`` and is implemented as a DSA</div><div class='add'>+driver; see ``Documentation/networking/dsa/dsa.rst`` for details on the subsystem</div><div class='ctx'> and what it provides.</div><div class='ctx'> </div><div class='ctx'> The SF2 switch is configured to enable a Broadcom specific 4-bytes switch tag</div><div class='ctx'> which gets inserted by the switch for every packet forwarded to the CPU</div><div class='ctx'> interface, conversely, the CPU network interface should insert a similar tag for</div><div class='ctx'> packets entering the CPU port. The tag format is described in</div><div class='del'>-net/dsa/tag_brcm.c.</div><div class='add'>+``net/dsa/tag_brcm.c``.</div><div class='ctx'> </div><div class='ctx'> Overall, the SF2 driver is a fairly regular DSA driver; there are a few</div><div class='ctx'> specifics covered below.</div><div class='hunk'>@@ -54,7 +55,7 @@ Device Tree probing</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='ctx'> The DSA platform device driver is probed using a specific compatible string</div><div class='del'>-provided in net/dsa/dsa.c. The reason for that is because the DSA subsystem gets</div><div class='add'>+provided in ``net/dsa/dsa.c``. The reason for that is because the DSA subsystem gets</div><div class='ctx'> registered as a platform device driver currently. DSA will provide the needed</div><div class='ctx'> device_node pointers which are then accessible by the switch driver setup</div><div class='ctx'> function to setup resources such as register ranges and interrupts. This</div><div class='hunk'>@@ -70,7 +71,7 @@ Broadcom switches connected to a SF2 require the use of the DSA slave MDIO bus</div><div class='ctx'> in order to properly configure them. By default, the SF2 pseudo-PHY address, and</div><div class='ctx'> an external switch pseudo-PHY address will both be snooping for incoming MDIO</div><div class='ctx'> transactions, since they are at the same address (30), resulting in some kind of</div><div class='del'>-"double" programming. Using DSA, and setting ds-&gt;phys_mii_mask accordingly, we</div><div class='add'>+"double" programming. Using DSA, and setting ``ds-&gt;phys_mii_mask`` accordingly, we</div><div class='ctx'> selectively divert reads and writes towards external Broadcom switches</div><div class='ctx'> pseudo-PHY addresses. Newer revisions of the SF2 hardware have introduced a</div><div class='ctx'> configurable pseudo-PHY address which circumvents the initial design limitation.</div><div class='hunk'>@@ -86,7 +87,7 @@ firmware gets reloaded. The SF2 driver relies on such events to properly set its</div><div class='ctx'> MoCA interface carrier state and properly report this to the networking stack.</div><div class='ctx'> </div><div class='ctx'> The MoCA interfaces are supported using the PHY library's fixed PHY/emulated PHY</div><div class='del'>-device and the switch driver registers a fixed_link_update callback for such</div><div class='add'>+device and the switch driver registers a ``fixed_link_update`` callback for such</div><div class='ctx'> PHYs which reflects the link state obtained from the interrupt handler.</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.rst<br/>index 43ef767bc440..ca87068b9ab9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/dsa.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/dsa.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/dsa.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/dsa/dsa.rst</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-Distributed Switch Architecture</div><div class='del'>-===============================</div><div class='del'>-</div><div class='del'>-Introduction</div><div class='add'>+============</div><div class='add'>+Architecture</div><div class='ctx'> ============</div><div class='ctx'> </div><div class='del'>-This document describes the Distributed Switch Architecture (DSA) subsystem</div><div class='add'>+This document describes the **Distributed Switch Architecture (DSA)** subsystem</div><div class='ctx'> design principles, limitations, interactions with other subsystems, and how to</div><div class='ctx'> develop drivers for this subsystem as well as a TODO for developers interested</div><div class='ctx'> in joining the effort.</div><div class='hunk'>@@ -70,11 +68,11 @@ Switch tagging protocols</div><div class='ctx'> DSA currently supports 5 different tagging protocols, and a tag-less mode as</div><div class='ctx'> well. The different protocols are implemented in:</div><div class='ctx'> </div><div class='del'>-net/dsa/tag_trailer.c: Marvell's 4 trailer tag mode (legacy)</div><div class='del'>-net/dsa/tag_dsa.c: Marvell's original DSA tag</div><div class='del'>-net/dsa/tag_edsa.c: Marvell's enhanced DSA tag</div><div class='del'>-net/dsa/tag_brcm.c: Broadcom's 4 bytes tag</div><div class='del'>-net/dsa/tag_qca.c: Qualcomm's 2 bytes tag</div><div class='add'>+- ``net/dsa/tag_trailer.c``: Marvell's 4 trailer tag mode (legacy)</div><div class='add'>+- ``net/dsa/tag_dsa.c``: Marvell's original DSA tag</div><div class='add'>+- ``net/dsa/tag_edsa.c``: Marvell's enhanced DSA tag</div><div class='add'>+- ``net/dsa/tag_brcm.c``: Broadcom's 4 bytes tag</div><div class='add'>+- ``net/dsa/tag_qca.c``: Qualcomm's 2 bytes tag</div><div class='ctx'> </div><div class='ctx'> The exact format of the tag protocol is vendor specific, but in general, they</div><div class='ctx'> all contain something which:</div><div class='hunk'>@@ -89,7 +87,7 @@ Master network devices are regular, unmodified Linux network device drivers for</div><div class='ctx'> the CPU/management Ethernet interface. Such a driver might occasionally need to</div><div class='ctx'> know whether DSA is enabled (e.g.: to enable/disable specific offload features),</div><div class='ctx'> but the DSA subsystem has been proven to work with industry standard drivers:</div><div class='del'>-e1000e, mv643xx_eth etc. without having to introduce modifications to these</div><div class='add'>+``e1000e,`` ``mv643xx_eth`` etc. without having to introduce modifications to these</div><div class='ctx'> drivers. Such network devices are also often referred to as conduit network</div><div class='ctx'> devices since they act as a pipe between the host processor and the hardware</div><div class='ctx'> Ethernet switch.</div><div class='hunk'>@@ -100,40 +98,42 @@ Networking stack hooks</div><div class='ctx'> When a master netdev is used with DSA, a small hook is placed in in the</div><div class='ctx'> networking stack is in order to have the DSA subsystem process the Ethernet</div><div class='ctx'> switch specific tagging protocol. DSA accomplishes this by registering a</div><div class='del'>-specific (and fake) Ethernet type (later becoming skb-&gt;protocol) with the</div><div class='del'>-networking stack, this is also known as a ptype or packet_type. A typical</div><div class='add'>+specific (and fake) Ethernet type (later becoming ``skb-&gt;protocol``) with the</div><div class='add'>+networking stack, this is also known as a ``ptype`` or ``packet_type``. A typical</div><div class='ctx'> Ethernet Frame receive sequence looks like this:</div><div class='ctx'> </div><div class='ctx'> Master network device (e.g.: e1000e):</div><div class='ctx'> </div><div class='del'>-Receive interrupt fires:</div><div class='del'>-- receive function is invoked</div><div class='del'>-- basic packet processing is done: getting length, status etc.</div><div class='del'>-- packet is prepared to be processed by the Ethernet layer by calling</div><div class='del'>-  eth_type_trans</div><div class='add'>+1. Receive interrupt fires:</div><div class='add'>+</div><div class='add'>+        - receive function is invoked</div><div class='add'>+        - basic packet processing is done: getting length, status etc.</div><div class='add'>+        - packet is prepared to be processed by the Ethernet layer by calling</div><div class='add'>+          ``eth_type_trans``</div><div class='add'>+</div><div class='add'>+2. net/ethernet/eth.c::</div><div class='add'>+</div><div class='add'>+          eth_type_trans(skb, dev)</div><div class='add'>+                  if (dev-&gt;dsa_ptr != NULL)</div><div class='add'>+                          -&gt; skb-&gt;protocol = ETH_P_XDSA</div><div class='ctx'> </div><div class='del'>-net/ethernet/eth.c:</div><div class='add'>+3. drivers/net/ethernet/\*::</div><div class='ctx'> </div><div class='del'>-eth_type_trans(skb, dev)</div><div class='del'>-	if (dev-&gt;dsa_ptr != NULL)</div><div class='del'>-		-&gt; skb-&gt;protocol = ETH_P_XDSA</div><div class='add'>+          netif_receive_skb(skb)</div><div class='add'>+                  -&gt; iterate over registered packet_type</div><div class='add'>+                          -&gt; invoke handler for ETH_P_XDSA, calls dsa_switch_rcv()</div><div class='ctx'> </div><div class='del'>-drivers/net/ethernet/*:</div><div class='add'>+4. net/dsa/dsa.c::</div><div class='ctx'> </div><div class='del'>-netif_receive_skb(skb)</div><div class='del'>-	-&gt; iterate over registered packet_type</div><div class='del'>-		-&gt; invoke handler for ETH_P_XDSA, calls dsa_switch_rcv()</div><div class='add'>+          -&gt; dsa_switch_rcv()</div><div class='add'>+                  -&gt; invoke switch tag specific protocol handler in 'net/dsa/tag_*.c'</div><div class='ctx'> </div><div class='del'>-net/dsa/dsa.c:</div><div class='del'>-	-&gt; dsa_switch_rcv()</div><div class='del'>-		-&gt; invoke switch tag specific protocol handler in</div><div class='del'>-		   net/dsa/tag_*.c</div><div class='add'>+5. net/dsa/tag_*.c:</div><div class='ctx'> </div><div class='del'>-net/dsa/tag_*.c:</div><div class='del'>-	-&gt; inspect and strip switch tag protocol to determine originating port</div><div class='del'>-	-&gt; locate per-port network device</div><div class='del'>-	-&gt; invoke eth_type_trans() with the DSA slave network device</div><div class='del'>-	-&gt; invoked netif_receive_skb()</div><div class='add'>+        - inspect and strip switch tag protocol to determine originating port</div><div class='add'>+        - locate per-port network device</div><div class='add'>+        - invoke ``eth_type_trans()`` with the DSA slave network device</div><div class='add'>+        - invoked ``netif_receive_skb()``</div><div class='ctx'> </div><div class='ctx'> Past this point, the DSA slave network devices get delivered regular Ethernet</div><div class='ctx'> frames that can be processed by the networking stack.</div><div class='hunk'>@@ -162,7 +162,7 @@ invoke a specific transmit routine which takes care of adding the relevant</div><div class='ctx'> switch tag in the Ethernet frames.</div><div class='ctx'> </div><div class='ctx'> These frames are then queued for transmission using the master network device</div><div class='del'>-ndo_start_xmit() function, since they contain the appropriate switch tag, the</div><div class='add'>+``ndo_start_xmit()`` function, since they contain the appropriate switch tag, the</div><div class='ctx'> Ethernet switch will be able to process these incoming frames from the</div><div class='ctx'> management interface and delivers these frames to the physical switch port.</div><div class='ctx'> </div><div class='hunk'>@@ -170,23 +170,25 @@ Graphical representation</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='ctx'> Summarized, this is basically how DSA looks like from a network device</div><div class='del'>-perspective:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-			|---------------------------</div><div class='del'>-			| CPU network device (eth0)|</div><div class='del'>-			----------------------------</div><div class='del'>-			| &lt;tag added by switch     |</div><div class='del'>-			|                          |</div><div class='del'>-			|                          |</div><div class='del'>-			|        tag added by CPU&gt; |</div><div class='del'>-		|--------------------------------------------|</div><div class='del'>-		| Switch driver				     |</div><div class='del'>-		|--------------------------------------------|</div><div class='del'>-                    ||        ||         ||</div><div class='del'>-		|-------|  |-------|  |-------|</div><div class='del'>-		| sw0p0 |  | sw0p1 |  | sw0p2 |</div><div class='del'>-		|-------|  |-------|  |-------|</div><div class='add'>+perspective::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+                |---------------------------</div><div class='add'>+                | CPU network device (eth0)|</div><div class='add'>+                ----------------------------</div><div class='add'>+                | &lt;tag added by switch     |</div><div class='add'>+                |                          |</div><div class='add'>+                |                          |</div><div class='add'>+                |        tag added by CPU&gt; |</div><div class='add'>+        |--------------------------------------------|</div><div class='add'>+        |            Switch driver                   |</div><div class='add'>+        |--------------------------------------------|</div><div class='add'>+                  ||        ||         ||</div><div class='add'>+              |-------|  |-------|  |-------|</div><div class='add'>+              | sw0p0 |  | sw0p1 |  | sw0p2 |</div><div class='add'>+              |-------|  |-------|  |-------|</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Slave MDIO bus</div><div class='ctx'> --------------</div><div class='hunk'>@@ -207,31 +209,32 @@ PHYs, external PHYs, or even external switches.</div><div class='ctx'> Data structures</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-DSA data structures are defined in include/net/dsa.h as well as</div><div class='del'>-net/dsa/dsa_priv.h.</div><div class='add'>+DSA data structures are defined in ``include/net/dsa.h`` as well as</div><div class='add'>+``net/dsa/dsa_priv.h``:</div><div class='ctx'> </div><div class='del'>-dsa_chip_data: platform data configuration for a given switch device, this</div><div class='del'>-structure describes a switch device's parent device, its address, as well as</div><div class='del'>-various properties of its ports: names/labels, and finally a routing table</div><div class='del'>-indication (when cascading switches)</div><div class='add'>+- ``dsa_chip_data``: platform data configuration for a given switch device,</div><div class='add'>+  this structure describes a switch device's parent device, its address, as</div><div class='add'>+  well as various properties of its ports: names/labels, and finally a routing</div><div class='add'>+  table indication (when cascading switches)</div><div class='ctx'> </div><div class='del'>-dsa_platform_data: platform device configuration data which can reference a</div><div class='del'>-collection of dsa_chip_data structure if multiples switches are cascaded, the</div><div class='del'>-master network device this switch tree is attached to needs to be referenced</div><div class='add'>+- ``dsa_platform_data``: platform device configuration data which can reference</div><div class='add'>+  a collection of dsa_chip_data structure if multiples switches are cascaded,</div><div class='add'>+  the master network device this switch tree is attached to needs to be</div><div class='add'>+  referenced</div><div class='ctx'> </div><div class='del'>-dsa_switch_tree: structure assigned to the master network device under</div><div class='del'>-"dsa_ptr", this structure references a dsa_platform_data structure as well as</div><div class='del'>-the tagging protocol supported by the switch tree, and which receive/transmit</div><div class='del'>-function hooks should be invoked, information about the directly attached switch</div><div class='del'>-is also provided: CPU port. Finally, a collection of dsa_switch are referenced</div><div class='del'>-to address individual switches in the tree.</div><div class='add'>+- ``dsa_switch_tree``: structure assigned to the master network device under</div><div class='add'>+  ``dsa_ptr``, this structure references a dsa_platform_data structure as well as</div><div class='add'>+  the tagging protocol supported by the switch tree, and which receive/transmit</div><div class='add'>+  function hooks should be invoked, information about the directly attached</div><div class='add'>+  switch is also provided: CPU port. Finally, a collection of dsa_switch are</div><div class='add'>+  referenced to address individual switches in the tree.</div><div class='ctx'> </div><div class='del'>-dsa_switch: structure describing a switch device in the tree, referencing a</div><div class='del'>-dsa_switch_tree as a backpointer, slave network devices, master network device,</div><div class='del'>-and a reference to the backing dsa_switch_ops</div><div class='add'>+- ``dsa_switch``: structure describing a switch device in the tree, referencing</div><div class='add'>+  a ``dsa_switch_tree`` as a backpointer, slave network devices, master network</div><div class='add'>+  device, and a reference to the backing``dsa_switch_ops``</div><div class='ctx'> </div><div class='del'>-dsa_switch_ops: structure referencing function pointers, see below for a full</div><div class='del'>-description.</div><div class='add'>+- ``dsa_switch_ops``: structure referencing function pointers, see below for a</div><div class='add'>+  full description.</div><div class='ctx'> </div><div class='ctx'> Design limitations</div><div class='ctx'> ==================</div><div class='hunk'>@@ -240,7 +243,7 @@ Limits on the number of devices and ports</div><div class='ctx'> -----------------------------------------</div><div class='ctx'> </div><div class='ctx'> DSA currently limits the number of maximum switches within a tree to 4</div><div class='del'>-(DSA_MAX_SWITCHES), and the number of ports per switch to 12 (DSA_MAX_PORTS).</div><div class='add'>+(``DSA_MAX_SWITCHES``), and the number of ports per switch to 12 (``DSA_MAX_PORTS``).</div><div class='ctx'> These limits could be extended to support larger configurations would this need</div><div class='ctx'> arise.</div><div class='ctx'> </div><div class='hunk'>@@ -279,15 +282,15 @@ Interactions with other subsystems</div><div class='ctx'> </div><div class='ctx'> DSA currently leverages the following subsystems:</div><div class='ctx'> </div><div class='del'>-- MDIO/PHY library: drivers/net/phy/phy.c, mdio_bus.c</div><div class='del'>-- Switchdev: net/switchdev/*</div><div class='add'>+- MDIO/PHY library: ``drivers/net/phy/phy.c``, ``mdio_bus.c``</div><div class='add'>+- Switchdev:``net/switchdev/*``</div><div class='ctx'> - Device Tree for various of_* functions</div><div class='ctx'> </div><div class='ctx'> MDIO/PHY library</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='ctx'> Slave network devices exposed by DSA may or may not be interfacing with PHY</div><div class='del'>-devices (struct phy_device as defined in include/linux/phy.h), but the DSA</div><div class='add'>+devices (``struct phy_device`` as defined in ``include/linux/phy.h)``, but the DSA</div><div class='ctx'> subsystem deals with all possible combinations:</div><div class='ctx'> </div><div class='ctx'> - internal PHY devices, built into the Ethernet switch hardware</div><div class='hunk'>@@ -296,16 +299,16 @@ subsystem deals with all possible combinations:</div><div class='ctx'> - special, non-autonegotiated or non MDIO-managed PHY devices: SFPs, MoCA; a.k.a</div><div class='ctx'>   fixed PHYs</div><div class='ctx'> </div><div class='del'>-The PHY configuration is done by the dsa_slave_phy_setup() function and the</div><div class='add'>+The PHY configuration is done by the ``dsa_slave_phy_setup()`` function and the</div><div class='ctx'> logic basically looks like this:</div><div class='ctx'> </div><div class='ctx'> - if Device Tree is used, the PHY device is looked up using the standard</div><div class='ctx'>   "phy-handle" property, if found, this PHY device is created and registered</div><div class='del'>-  using of_phy_connect()</div><div class='add'>+  using ``of_phy_connect()``</div><div class='ctx'> </div><div class='ctx'> - if Device Tree is used, and the PHY device is "fixed", that is, conforms to</div><div class='ctx'>   the definition of a non-MDIO managed PHY as defined in</div><div class='del'>-  Documentation/devicetree/bindings/net/fixed-link.txt, the PHY is registered</div><div class='add'>+  ``Documentation/devicetree/bindings/net/fixed-link.txt``, the PHY is registered</div><div class='ctx'>   and connected transparently using the special fixed MDIO bus driver</div><div class='ctx'> </div><div class='ctx'> - finally, if the PHY is built into the switch, as is very common with</div><div class='hunk'>@@ -331,8 +334,8 @@ Device Tree</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='ctx'> DSA features a standardized binding which is documented in</div><div class='del'>-Documentation/devicetree/bindings/net/dsa/dsa.txt. PHY/MDIO library helper</div><div class='del'>-functions such as of_get_phy_mode(), of_phy_connect() are also used to query</div><div class='add'>+``Documentation/devicetree/bindings/net/dsa/dsa.txt``. PHY/MDIO library helper</div><div class='add'>+functions such as ``of_get_phy_mode()``, ``of_phy_connect()`` are also used to query</div><div class='ctx'> per-port PHY specific details: interface connection, MDIO bus location etc..</div><div class='ctx'> </div><div class='ctx'> Driver development</div><div class='hunk'>@@ -341,8 +344,8 @@ Driver development</div><div class='ctx'> DSA switch drivers need to implement a dsa_switch_ops structure which will</div><div class='ctx'> contain the various members described below.</div><div class='ctx'> </div><div class='del'>-register_switch_driver() registers this dsa_switch_ops in its internal list</div><div class='del'>-of drivers to probe for. unregister_switch_driver() does the exact opposite.</div><div class='add'>+``register_switch_driver()`` registers this dsa_switch_ops in its internal list</div><div class='add'>+of drivers to probe for. ``unregister_switch_driver()`` does the exact opposite.</div><div class='ctx'> </div><div class='ctx'> Unless requested differently by setting the priv_size member accordingly, DSA</div><div class='ctx'> does not allocate any driver private context space.</div><div class='hunk'>@@ -350,17 +353,17 @@ does not allocate any driver private context space.</div><div class='ctx'> Switch configuration</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='del'>-- tag_protocol: this is to indicate what kind of tagging protocol is supported,</div><div class='del'>-  should be a valid value from the dsa_tag_protocol enum</div><div class='add'>+- ``tag_protocol``: this is to indicate what kind of tagging protocol is supported,</div><div class='add'>+  should be a valid value from the ``dsa_tag_protocol`` enum</div><div class='ctx'> </div><div class='del'>-- probe: probe routine which will be invoked by the DSA platform device upon</div><div class='add'>+- ``probe``: probe routine which will be invoked by the DSA platform device upon</div><div class='ctx'>   registration to test for the presence/absence of a switch device. For MDIO</div><div class='ctx'>   devices, it is recommended to issue a read towards internal registers using</div><div class='ctx'>   the switch pseudo-PHY and return whether this is a supported device. For other</div><div class='ctx'>   buses, return a non-NULL string</div><div class='ctx'> </div><div class='del'>-- setup: setup function for the switch, this function is responsible for setting</div><div class='del'>-  up the dsa_switch_ops private structure with all it needs: register maps,</div><div class='add'>+- ``setup``: setup function for the switch, this function is responsible for setting</div><div class='add'>+  up the ``dsa_switch_ops`` private structure with all it needs: register maps,</div><div class='ctx'>   interrupts, mutexes, locks etc.. This function is also expected to properly</div><div class='ctx'>   configure the switch to separate all network interfaces from each other, that</div><div class='ctx'>   is, they should be isolated by the switch hardware itself, typically by creating</div><div class='hunk'>@@ -375,27 +378,27 @@ Switch configuration</div><div class='ctx'> PHY devices and link management</div><div class='ctx'> -------------------------------</div><div class='ctx'> </div><div class='del'>-- get_phy_flags: Some switches are interfaced to various kinds of Ethernet PHYs,</div><div class='add'>+- ``get_phy_flags``: Some switches are interfaced to various kinds of Ethernet PHYs,</div><div class='ctx'>   if the PHY library PHY driver needs to know about information it cannot obtain</div><div class='ctx'>   on its own (e.g.: coming from switch memory mapped registers), this function</div><div class='ctx'>   should return a 32-bits bitmask of "flags", that is private between the switch</div><div class='del'>-  driver and the Ethernet PHY driver in drivers/net/phy/*.</div><div class='add'>+  driver and the Ethernet PHY driver in ``drivers/net/phy/\*``.</div><div class='ctx'> </div><div class='del'>-- phy_read: Function invoked by the DSA slave MDIO bus when attempting to read</div><div class='add'>+- ``phy_read``: Function invoked by the DSA slave MDIO bus when attempting to read</div><div class='ctx'>   the switch port MDIO registers. If unavailable, return 0xffff for each read.</div><div class='ctx'>   For builtin switch Ethernet PHYs, this function should allow reading the link</div><div class='ctx'>   status, auto-negotiation results, link partner pages etc..</div><div class='ctx'> </div><div class='del'>-- phy_write: Function invoked by the DSA slave MDIO bus when attempting to write</div><div class='add'>+- ``phy_write``: Function invoked by the DSA slave MDIO bus when attempting to write</div><div class='ctx'>   to the switch port MDIO registers. If unavailable return a negative error</div><div class='ctx'>   code.</div><div class='ctx'> </div><div class='del'>-- adjust_link: Function invoked by the PHY library when a slave network device</div><div class='add'>+- ``adjust_link``: Function invoked by the PHY library when a slave network device</div><div class='ctx'>   is attached to a PHY device. This function is responsible for appropriately</div><div class='ctx'>   configuring the switch port link parameters: speed, duplex, pause based on</div><div class='del'>-  what the phy_device is providing.</div><div class='add'>+  what the ``phy_device`` is providing.</div><div class='ctx'> </div><div class='del'>-- fixed_link_update: Function invoked by the PHY library, and specifically by</div><div class='add'>+- ``fixed_link_update``: Function invoked by the PHY library, and specifically by</div><div class='ctx'>   the fixed PHY driver asking the switch driver for link parameters that could</div><div class='ctx'>   not be auto-negotiated, or obtained by reading the PHY registers through MDIO.</div><div class='ctx'>   This is particularly useful for specific kinds of hardware such as QSGMII,</div><div class='hunk'>@@ -405,87 +408,87 @@ PHY devices and link management</div><div class='ctx'> Ethtool operations</div><div class='ctx'> ------------------</div><div class='ctx'> </div><div class='del'>-- get_strings: ethtool function used to query the driver's strings, will</div><div class='add'>+- ``get_strings``: ethtool function used to query the driver's strings, will</div><div class='ctx'>   typically return statistics strings, private flags strings etc.</div><div class='ctx'> </div><div class='del'>-- get_ethtool_stats: ethtool function used to query per-port statistics and</div><div class='add'>+- ``get_ethtool_stats``: ethtool function used to query per-port statistics and</div><div class='ctx'>   return their values. DSA overlays slave network devices general statistics:</div><div class='ctx'>   RX/TX counters from the network device, with switch driver specific statistics</div><div class='ctx'>   per port</div><div class='ctx'> </div><div class='del'>-- get_sset_count: ethtool function used to query the number of statistics items</div><div class='add'>+- ``get_sset_count``: ethtool function used to query the number of statistics items</div><div class='ctx'> </div><div class='del'>-- get_wol: ethtool function used to obtain Wake-on-LAN settings per-port, this</div><div class='add'>+- ``get_wol``: ethtool function used to obtain Wake-on-LAN settings per-port, this</div><div class='ctx'>   function may, for certain implementations also query the master network device</div><div class='ctx'>   Wake-on-LAN settings if this interface needs to participate in Wake-on-LAN</div><div class='ctx'> </div><div class='del'>-- set_wol: ethtool function used to configure Wake-on-LAN settings per-port,</div><div class='add'>+- ``set_wol``: ethtool function used to configure Wake-on-LAN settings per-port,</div><div class='ctx'>   direct counterpart to set_wol with similar restrictions</div><div class='ctx'> </div><div class='del'>-- set_eee: ethtool function which is used to configure a switch port EEE (Green</div><div class='add'>+- ``set_eee``: ethtool function which is used to configure a switch port EEE (Green</div><div class='ctx'>   Ethernet) settings, can optionally invoke the PHY library to enable EEE at the</div><div class='ctx'>   PHY level if relevant. This function should enable EEE at the switch port MAC</div><div class='ctx'>   controller and data-processing logic</div><div class='ctx'> </div><div class='del'>-- get_eee: ethtool function which is used to query a switch port EEE settings,</div><div class='add'>+- ``get_eee``: ethtool function which is used to query a switch port EEE settings,</div><div class='ctx'>   this function should return the EEE state of the switch port MAC controller</div><div class='ctx'>   and data-processing logic as well as query the PHY for its currently configured</div><div class='ctx'>   EEE settings</div><div class='ctx'> </div><div class='del'>-- get_eeprom_len: ethtool function returning for a given switch the EEPROM</div><div class='add'>+- ``get_eeprom_len``: ethtool function returning for a given switch the EEPROM</div><div class='ctx'>   length/size in bytes</div><div class='ctx'> </div><div class='del'>-- get_eeprom: ethtool function returning for a given switch the EEPROM contents</div><div class='add'>+- ``get_eeprom``: ethtool function returning for a given switch the EEPROM contents</div><div class='ctx'> </div><div class='del'>-- set_eeprom: ethtool function writing specified data to a given switch EEPROM</div><div class='add'>+- ``set_eeprom``: ethtool function writing specified data to a given switch EEPROM</div><div class='ctx'> </div><div class='del'>-- get_regs_len: ethtool function returning the register length for a given</div><div class='add'>+- ``get_regs_len``: ethtool function returning the register length for a given</div><div class='ctx'>   switch</div><div class='ctx'> </div><div class='del'>-- get_regs: ethtool function returning the Ethernet switch internal register</div><div class='add'>+- ``get_regs``: ethtool function returning the Ethernet switch internal register</div><div class='ctx'>   contents. This function might require user-land code in ethtool to</div><div class='ctx'>   pretty-print register values and registers</div><div class='ctx'> </div><div class='ctx'> Power management</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='del'>-- suspend: function invoked by the DSA platform device when the system goes to</div><div class='add'>+- ``suspend``: function invoked by the DSA platform device when the system goes to</div><div class='ctx'>   suspend, should quiesce all Ethernet switch activities, but keep ports</div><div class='ctx'>   participating in Wake-on-LAN active as well as additional wake-up logic if</div><div class='ctx'>   supported</div><div class='ctx'> </div><div class='del'>-- resume: function invoked by the DSA platform device when the system resumes,</div><div class='add'>+- ``resume``: function invoked by the DSA platform device when the system resumes,</div><div class='ctx'>   should resume all Ethernet switch activities and re-configure the switch to be</div><div class='ctx'>   in a fully active state</div><div class='ctx'> </div><div class='del'>-- port_enable: function invoked by the DSA slave network device ndo_open</div><div class='add'>+- ``port_enable``: function invoked by the DSA slave network device ndo_open</div><div class='ctx'>   function when a port is administratively brought up, this function should be</div><div class='ctx'>   fully enabling a given switch port. DSA takes care of marking the port with</div><div class='del'>-  BR_STATE_BLOCKING if the port is a bridge member, or BR_STATE_FORWARDING if it</div><div class='add'>+  ``BR_STATE_BLOCKING`` if the port is a bridge member, or ``BR_STATE_FORWARDING`` if it</div><div class='ctx'>   was not, and propagating these changes down to the hardware</div><div class='ctx'> </div><div class='del'>-- port_disable: function invoked by the DSA slave network device ndo_close</div><div class='add'>+- ``port_disable``: function invoked by the DSA slave network device ndo_close</div><div class='ctx'>   function when a port is administratively brought down, this function should be</div><div class='ctx'>   fully disabling a given switch port. DSA takes care of marking the port with</div><div class='del'>-  BR_STATE_DISABLED and propagating changes to the hardware if this port is</div><div class='add'>+  ``BR_STATE_DISABLED`` and propagating changes to the hardware if this port is</div><div class='ctx'>   disabled while being a bridge member</div><div class='ctx'> </div><div class='ctx'> Bridge layer</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='del'>-- port_bridge_join: bridge layer function invoked when a given switch port is</div><div class='add'>+- ``port_bridge_join``: bridge layer function invoked when a given switch port is</div><div class='ctx'>   added to a bridge, this function should be doing the necessary at the switch</div><div class='ctx'>   level to permit the joining port from being added to the relevant logical</div><div class='ctx'>   domain for it to ingress/egress traffic with other members of the bridge.</div><div class='ctx'> </div><div class='del'>-- port_bridge_leave: bridge layer function invoked when a given switch port is</div><div class='add'>+- ``port_bridge_leave``: bridge layer function invoked when a given switch port is</div><div class='ctx'>   removed from a bridge, this function should be doing the necessary at the</div><div class='ctx'>   switch level to deny the leaving port from ingress/egress traffic from the</div><div class='ctx'>   remaining bridge members. When the port leaves the bridge, it should be aged</div><div class='ctx'>   out at the switch hardware for the switch to (re) learn MAC addresses behind</div><div class='ctx'>   this port.</div><div class='ctx'> </div><div class='del'>-- port_stp_state_set: bridge layer function invoked when a given switch port STP</div><div class='add'>+- ``port_stp_state_set``: bridge layer function invoked when a given switch port STP</div><div class='ctx'>   state is computed by the bridge layer and should be propagated to switch</div><div class='ctx'>   hardware to forward/block/learn traffic. The switch driver is responsible for</div><div class='ctx'>   computing a STP state change based on current and asked parameters and perform</div><div class='hunk'>@@ -494,7 +497,7 @@ Bridge layer</div><div class='ctx'> Bridge VLAN filtering</div><div class='ctx'> ---------------------</div><div class='ctx'> </div><div class='del'>-- port_vlan_filtering: bridge layer function invoked when the bridge gets</div><div class='add'>+- ``port_vlan_filtering``: bridge layer function invoked when the bridge gets</div><div class='ctx'>   configured for turning on or off VLAN filtering. If nothing specific needs to</div><div class='ctx'>   be done at the hardware level, this callback does not need to be implemented.</div><div class='ctx'>   When VLAN filtering is turned on, the hardware must be programmed with</div><div class='hunk'>@@ -504,61 +507,61 @@ Bridge VLAN filtering</div><div class='ctx'>   accept any 802.1Q frames irrespective of their VLAN ID, and untagged frames are</div><div class='ctx'>   allowed.</div><div class='ctx'> </div><div class='del'>-- port_vlan_prepare: bridge layer function invoked when the bridge prepares the</div><div class='add'>+- ``port_vlan_prepare``: bridge layer function invoked when the bridge prepares the</div><div class='ctx'>   configuration of a VLAN on the given port. If the operation is not supported</div><div class='del'>-  by the hardware, this function should return -EOPNOTSUPP to inform the bridge</div><div class='add'>+  by the hardware, this function should return ``-EOPNOTSUPP`` to inform the bridge</div><div class='ctx'>   code to fallback to a software implementation. No hardware setup must be done</div><div class='ctx'>   in this function. See port_vlan_add for this and details.</div><div class='ctx'> </div><div class='del'>-- port_vlan_add: bridge layer function invoked when a VLAN is configured</div><div class='add'>+- ``port_vlan_add``: bridge layer function invoked when a VLAN is configured</div><div class='ctx'>   (tagged or untagged) for the given switch port</div><div class='ctx'> </div><div class='del'>-- port_vlan_del: bridge layer function invoked when a VLAN is removed from the</div><div class='add'>+- ``port_vlan_del``: bridge layer function invoked when a VLAN is removed from the</div><div class='ctx'>   given switch port</div><div class='ctx'> </div><div class='del'>-- port_vlan_dump: bridge layer function invoked with a switchdev callback</div><div class='add'>+- ``port_vlan_dump``: bridge layer function invoked with a switchdev callback</div><div class='ctx'>   function that the driver has to call for each VLAN the given port is a member</div><div class='ctx'>   of. A switchdev object is used to carry the VID and bridge flags.</div><div class='ctx'> </div><div class='del'>-- port_fdb_add: bridge layer function invoked when the bridge wants to install a</div><div class='add'>+- ``port_fdb_add``: bridge layer function invoked when the bridge wants to install a</div><div class='ctx'>   Forwarding Database entry, the switch hardware should be programmed with the</div><div class='ctx'>   specified address in the specified VLAN Id in the forwarding database</div><div class='ctx'>   associated with this VLAN ID. If the operation is not supported, this</div><div class='del'>-  function should return -EOPNOTSUPP to inform the bridge code to fallback to</div><div class='add'>+  function should return ``-EOPNOTSUPP`` to inform the bridge code to fallback to</div><div class='ctx'>   a software implementation.</div><div class='ctx'> </div><div class='del'>-Note: VLAN ID 0 corresponds to the port private database, which, in the context</div><div class='del'>-of DSA, would be the its port-based VLAN, used by the associated bridge device.</div><div class='add'>+.. note:: VLAN ID 0 corresponds to the port private database, which, in the context</div><div class='add'>+        of DSA, would be the its port-based VLAN, used by the associated bridge device.</div><div class='ctx'> </div><div class='del'>-- port_fdb_del: bridge layer function invoked when the bridge wants to remove a</div><div class='add'>+- ``port_fdb_del``: bridge layer function invoked when the bridge wants to remove a</div><div class='ctx'>   Forwarding Database entry, the switch hardware should be programmed to delete</div><div class='ctx'>   the specified MAC address from the specified VLAN ID if it was mapped into</div><div class='ctx'>   this port forwarding database</div><div class='ctx'> </div><div class='del'>-- port_fdb_dump: bridge layer function invoked with a switchdev callback</div><div class='add'>+- ``port_fdb_dump``: bridge layer function invoked with a switchdev callback</div><div class='ctx'>   function that the driver has to call for each MAC address known to be behind</div><div class='ctx'>   the given port. A switchdev object is used to carry the VID and FDB info.</div><div class='ctx'> </div><div class='del'>-- port_mdb_prepare: bridge layer function invoked when the bridge prepares the</div><div class='add'>+- ``port_mdb_prepare``: bridge layer function invoked when the bridge prepares the</div><div class='ctx'>   installation of a multicast database entry. If the operation is not supported,</div><div class='del'>-  this function should return -EOPNOTSUPP to inform the bridge code to fallback</div><div class='add'>+  this function should return ``-EOPNOTSUPP`` to inform the bridge code to fallback</div><div class='ctx'>   to a software implementation. No hardware setup must be done in this function.</div><div class='del'>-  See port_fdb_add for this and details.</div><div class='add'>+  See ``port_fdb_add`` for this and details.</div><div class='ctx'> </div><div class='del'>-- port_mdb_add: bridge layer function invoked when the bridge wants to install</div><div class='add'>+- ``port_mdb_add``: bridge layer function invoked when the bridge wants to install</div><div class='ctx'>   a multicast database entry, the switch hardware should be programmed with the</div><div class='ctx'>   specified address in the specified VLAN ID in the forwarding database</div><div class='ctx'>   associated with this VLAN ID.</div><div class='ctx'> </div><div class='del'>-Note: VLAN ID 0 corresponds to the port private database, which, in the context</div><div class='del'>-of DSA, would be the its port-based VLAN, used by the associated bridge device.</div><div class='add'>+.. note:: VLAN ID 0 corresponds to the port private database, which, in the context</div><div class='add'>+        of DSA, would be the its port-based VLAN, used by the associated bridge device.</div><div class='ctx'> </div><div class='del'>-- port_mdb_del: bridge layer function invoked when the bridge wants to remove a</div><div class='add'>+- ``port_mdb_del``: bridge layer function invoked when the bridge wants to remove a</div><div class='ctx'>   multicast database entry, the switch hardware should be programmed to delete</div><div class='ctx'>   the specified MAC address from the specified VLAN ID if it was mapped into</div><div class='ctx'>   this port forwarding database.</div><div class='ctx'> </div><div class='del'>-- port_mdb_dump: bridge layer function invoked with a switchdev callback</div><div class='add'>+- ``port_mdb_dump``: bridge layer function invoked with a switchdev callback</div><div class='ctx'>   function that the driver has to call for each MAC address known to be behind</div><div class='ctx'>   the given port. A switchdev object is used to carry the VID and MDB info.</div><div class='ctx'> </div><div class='hunk'>@@ -577,7 +580,7 @@ two subsystems and get the best of both worlds.</div><div class='ctx'> Other hanging fruits</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='del'>-- making the number of ports fully dynamic and not dependent on DSA_MAX_PORTS</div><div class='add'>+- making the number of ports fully dynamic and not dependent on ``DSA_MAX_PORTS``</div><div class='ctx'> - allowing more than one CPU/management interface:</div><div class='ctx'>   http://comments.gmane.org/gmane.linux.network/365657</div><div class='ctx'> - porting more drivers from other vendors:</div><div class='head'>diff --git a/Documentation/networking/dsa/index.rst b/Documentation/networking/dsa/index.rst<br/>new file mode 100644<br/>index 000000000000..0e5b7a9be406<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/dsa/index.rst</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+===============================</div><div class='add'>+Distributed Switch Architecture</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   dsa</div><div class='add'>+   bcm_sf2</div><div class='add'>+   lan9303</div><div class='add'>+   sja1105</div><div class='head'>diff --git a/Documentation/networking/dsa/lan9303.txt b/Documentation/networking/dsa/lan9303.rst<br/>index 144b02b95207..e3c820db28ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/lan9303.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/dsa/lan9303.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/lan9303.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/dsa/lan9303.rst</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+==============================</div><div class='ctx'> LAN9303 Ethernet switch driver</div><div class='ctx'> ==============================</div><div class='ctx'> </div><div class='hunk'>@@ -9,10 +10,9 @@ host master network interface (e.g. fixed link).</div><div class='ctx'> Driver details</div><div class='ctx'> ==============</div><div class='ctx'> </div><div class='del'>-The driver is implemented as a DSA driver, see</div><div class='del'>-Documentation/networking/dsa/dsa.txt.</div><div class='add'>+The driver is implemented as a DSA driver, see ``Documentation/networking/dsa/dsa.rst``.</div><div class='ctx'> </div><div class='del'>-See Documentation/devicetree/bindings/net/dsa/lan9303.txt for device tree</div><div class='add'>+See ``Documentation/devicetree/bindings/net/dsa/lan9303.txt`` for device tree</div><div class='ctx'> binding.</div><div class='ctx'> </div><div class='ctx'> The LAN9303 can be managed both via MDIO and I2C, both supported by this driver.</div><div class='head'>diff --git a/Documentation/networking/dsa/sja1105.rst b/Documentation/networking/dsa/sja1105.rst<br/>new file mode 100644<br/>index 000000000000..ea7bac438cfd<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/dsa/sja1105.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/dsa/sja1105.rst</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+=========================</div><div class='add'>+NXP SJA1105 switch driver</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+The NXP SJA1105 is a family of 6 devices:</div><div class='add'>+</div><div class='add'>+- SJA1105E: First generation, no TTEthernet</div><div class='add'>+- SJA1105T: First generation, TTEthernet</div><div class='add'>+- SJA1105P: Second generation, no TTEthernet, no SGMII</div><div class='add'>+- SJA1105Q: Second generation, TTEthernet, no SGMII</div><div class='add'>+- SJA1105R: Second generation, no TTEthernet, SGMII</div><div class='add'>+- SJA1105S: Second generation, TTEthernet, SGMII</div><div class='add'>+</div><div class='add'>+These are SPI-managed automotive switches, with all ports being gigabit</div><div class='add'>+capable, and supporting MII/RMII/RGMII and optionally SGMII on one port.</div><div class='add'>+</div><div class='add'>+Being automotive parts, their configuration interface is geared towards</div><div class='add'>+set-and-forget use, with minimal dynamic interaction at runtime. They</div><div class='add'>+require a static configuration to be composed by software and packed</div><div class='add'>+with CRC and table headers, and sent over SPI.</div><div class='add'>+</div><div class='add'>+The static configuration is composed of several configuration tables. Each</div><div class='add'>+table takes a number of entries. Some configuration tables can be (partially)</div><div class='add'>+reconfigured at runtime, some not. Some tables are mandatory, some not:</div><div class='add'>+</div><div class='add'>+============================= ================== =============================</div><div class='add'>+Table                          Mandatory          Reconfigurable</div><div class='add'>+============================= ================== =============================</div><div class='add'>+Schedule                       no                 no</div><div class='add'>+Schedule entry points          if Scheduling      no</div><div class='add'>+VL Lookup                      no                 no</div><div class='add'>+VL Policing                    if VL Lookup       no</div><div class='add'>+VL Forwarding                  if VL Lookup       no</div><div class='add'>+L2 Lookup                      no                 no</div><div class='add'>+L2 Policing                    yes                no</div><div class='add'>+VLAN Lookup                    yes                yes</div><div class='add'>+L2 Forwarding                  yes                partially (fully on P/Q/R/S)</div><div class='add'>+MAC Config                     yes                partially (fully on P/Q/R/S)</div><div class='add'>+Schedule Params                if Scheduling      no</div><div class='add'>+Schedule Entry Points Params   if Scheduling      no</div><div class='add'>+VL Forwarding Params           if VL Forwarding   no</div><div class='add'>+L2 Lookup Params               no                 partially (fully on P/Q/R/S)</div><div class='add'>+L2 Forwarding Params           yes                no</div><div class='add'>+Clock Sync Params              no                 no</div><div class='add'>+AVB Params                     no                 no</div><div class='add'>+General Params                 yes                partially</div><div class='add'>+Retagging                      no                 yes</div><div class='add'>+xMII Params                    yes                no</div><div class='add'>+SGMII                          no                 yes</div><div class='add'>+============================= ================== =============================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Also the configuration is write-only (software cannot read it back from the</div><div class='add'>+switch except for very few exceptions).</div><div class='add'>+</div><div class='add'>+The driver creates a static configuration at probe time, and keeps it at</div><div class='add'>+all times in memory, as a shadow for the hardware state. When required to</div><div class='add'>+change a hardware setting, the static configuration is also updated.</div><div class='add'>+If that changed setting can be transmitted to the switch through the dynamic</div><div class='add'>+reconfiguration interface, it is; otherwise the switch is reset and</div><div class='add'>+reprogrammed with the updated static configuration.</div><div class='add'>+</div><div class='add'>+Traffic support</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+The switches do not support switch tagging in hardware. But they do support</div><div class='add'>+customizing the TPID by which VLAN traffic is identified as such. The switch</div><div class='add'>+driver is leveraging ``CONFIG_NET_DSA_TAG_8021Q`` by requesting that special</div><div class='add'>+VLANs (with a custom TPID of ``ETH_P_EDSA`` instead of ``ETH_P_8021Q``) are</div><div class='add'>+installed on its ports when not in ``vlan_filtering`` mode. This does not</div><div class='add'>+interfere with the reception and transmission of real 802.1Q-tagged traffic,</div><div class='add'>+because the switch does no longer parse those packets as VLAN after the TPID</div><div class='add'>+change.</div><div class='add'>+The TPID is restored when ``vlan_filtering`` is requested by the user through</div><div class='add'>+the bridge layer, and general IP termination becomes no longer possible through</div><div class='add'>+the switch netdevices in this mode.</div><div class='add'>+</div><div class='add'>+The switches have two programmable filters for link-local destination MACs.</div><div class='add'>+These are used to trap BPDUs and PTP traffic to the master netdevice, and are</div><div class='add'>+further used to support STP and 1588 ordinary clock/boundary clock</div><div class='add'>+functionality.</div><div class='add'>+</div><div class='add'>+The following traffic modes are supported over the switch netdevices:</div><div class='add'>+</div><div class='add'>++--------------------+------------+------------------+------------------+</div><div class='add'>+|                    | Standalone |   Bridged with   |   Bridged with   |</div><div class='add'>+|                    |    ports   | vlan_filtering 0 | vlan_filtering 1 |</div><div class='add'>++====================+============+==================+==================+</div><div class='add'>+| Regular traffic    |     Yes    |       Yes        |  No (use master) |</div><div class='add'>++--------------------+------------+------------------+------------------+</div><div class='add'>+| Management traffic |     Yes    |       Yes        |       Yes        |</div><div class='add'>+|    (BPDU, PTP)     |            |                  |                  |</div><div class='add'>++--------------------+------------+------------------+------------------+</div><div class='add'>+</div><div class='add'>+Switching features</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+The driver supports the configuration of L2 forwarding rules in hardware for</div><div class='add'>+port bridging. The forwarding, broadcast and flooding domain between ports can</div><div class='add'>+be restricted through two methods: either at the L2 forwarding level (isolate</div><div class='add'>+one bridge's ports from another's) or at the VLAN port membership level</div><div class='add'>+(isolate ports within the same bridge). The final forwarding decision taken by</div><div class='add'>+the hardware is a logical AND of these two sets of rules.</div><div class='add'>+</div><div class='add'>+The hardware tags all traffic internally with a port-based VLAN (pvid), or it</div><div class='add'>+decodes the VLAN information from the 802.1Q tag. Advanced VLAN classification</div><div class='add'>+is not possible. Once attributed a VLAN tag, frames are checked against the</div><div class='add'>+port's membership rules and dropped at ingress if they don't match any VLAN.</div><div class='add'>+This behavior is available when switch ports are enslaved to a bridge with</div><div class='add'>+``vlan_filtering 1``.</div><div class='add'>+</div><div class='add'>+Normally the hardware is not configurable with respect to VLAN awareness, but</div><div class='add'>+by changing what TPID the switch searches 802.1Q tags for, the semantics of a</div><div class='add'>+bridge with ``vlan_filtering 0`` can be kept (accept all traffic, tagged or</div><div class='add'>+untagged), and therefore this mode is also supported.</div><div class='add'>+</div><div class='add'>+Segregating the switch ports in multiple bridges is supported (e.g. 2 + 2), but</div><div class='add'>+all bridges should have the same level of VLAN awareness (either both have</div><div class='add'>+``vlan_filtering`` 0, or both 1). Also an inevitable limitation of the fact</div><div class='add'>+that VLAN awareness is global at the switch level is that once a bridge with</div><div class='add'>+``vlan_filtering`` enslaves at least one switch port, the other un-bridged</div><div class='add'>+ports are no longer available for standalone traffic termination.</div><div class='add'>+</div><div class='add'>+Topology and loop detection through STP is supported.</div><div class='add'>+</div><div class='add'>+L2 FDB manipulation (add/delete/dump) is currently possible for the first</div><div class='add'>+generation devices. Aging time of FDB entries, as well as enabling fully static</div><div class='add'>+management (no address learning and no flooding of unknown traffic) is not yet</div><div class='add'>+configurable in the driver.</div><div class='add'>+</div><div class='add'>+A special comment about bridging with other netdevices (illustrated with an</div><div class='add'>+example):</div><div class='add'>+</div><div class='add'>+A board has eth0, eth1, swp0@eth1, swp1@eth1, swp2@eth1, swp3@eth1.</div><div class='add'>+The switch ports (swp0-3) are under br0.</div><div class='add'>+It is desired that eth0 is turned into another switched port that communicates</div><div class='add'>+with swp0-3.</div><div class='add'>+</div><div class='add'>+If br0 has vlan_filtering 0, then eth0 can simply be added to br0 with the</div><div class='add'>+intended results.</div><div class='add'>+If br0 has vlan_filtering 1, then a new br1 interface needs to be created that</div><div class='add'>+enslaves eth0 and eth1 (the DSA master of the switch ports). This is because in</div><div class='add'>+this mode, the switch ports beneath br0 are not capable of regular traffic, and</div><div class='add'>+are only used as a conduit for switchdev operations.</div><div class='add'>+</div><div class='add'>+Device Tree bindings and board design</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+This section references ``Documentation/devicetree/bindings/net/dsa/sja1105.txt``</div><div class='add'>+and aims to showcase some potential switch caveats.</div><div class='add'>+</div><div class='add'>+RMII PHY role and out-of-band signaling</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+In the RMII spec, the 50 MHz clock signals are either driven by the MAC or by</div><div class='add'>+an external oscillator (but not by the PHY).</div><div class='add'>+But the spec is rather loose and devices go outside it in several ways.</div><div class='add'>+Some PHYs go against the spec and may provide an output pin where they source</div><div class='add'>+the 50 MHz clock themselves, in an attempt to be helpful.</div><div class='add'>+On the other hand, the SJA1105 is only binary configurable - when in the RMII</div><div class='add'>+MAC role it will also attempt to drive the clock signal. To prevent this from</div><div class='add'>+happening it must be put in RMII PHY role.</div><div class='add'>+But doing so has some unintended consequences.</div><div class='add'>+In the RMII spec, the PHY can transmit extra out-of-band signals via RXD[1:0].</div><div class='add'>+These are practically some extra code words (/J/ and /K/) sent prior to the</div><div class='add'>+preamble of each frame. The MAC does not have this out-of-band signaling</div><div class='add'>+mechanism defined by the RMII spec.</div><div class='add'>+So when the SJA1105 port is put in PHY role to avoid having 2 drivers on the</div><div class='add'>+clock signal, inevitably an RMII PHY-to-PHY connection is created. The SJA1105</div><div class='add'>+emulates a PHY interface fully and generates the /J/ and /K/ symbols prior to</div><div class='add'>+frame preambles, which the real PHY is not expected to understand. So the PHY</div><div class='add'>+simply encodes the extra symbols received from the SJA1105-as-PHY onto the</div><div class='add'>+100Base-Tx wire.</div><div class='add'>+On the other side of the wire, some link partners might discard these extra</div><div class='add'>+symbols, while others might choke on them and discard the entire Ethernet</div><div class='add'>+frames that follow along. This looks like packet loss with some link partners</div><div class='add'>+but not with others.</div><div class='add'>+The take-away is that in RMII mode, the SJA1105 must be let to drive the</div><div class='add'>+reference clock if connected to a PHY.</div><div class='add'>+</div><div class='add'>+RGMII fixed-link and internal delays</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+As mentioned in the bindings document, the second generation of devices has</div><div class='add'>+tunable delay lines as part of the MAC, which can be used to establish the</div><div class='add'>+correct RGMII timing budget.</div><div class='add'>+When powered up, these can shift the Rx and Tx clocks with a phase difference</div><div class='add'>+between 73.8 and 101.7 degrees.</div><div class='add'>+The catch is that the delay lines need to lock onto a clock signal with a</div><div class='add'>+stable frequency. This means that there must be at least 2 microseconds of</div><div class='add'>+silence between the clock at the old vs at the new frequency. Otherwise the</div><div class='add'>+lock is lost and the delay lines must be reset (powered down and back up).</div><div class='add'>+In RGMII the clock frequency changes with link speed (125 MHz at 1000 Mbps, 25</div><div class='add'>+MHz at 100 Mbps and 2.5 MHz at 10 Mbps), and link speed might change during the</div><div class='add'>+AN process.</div><div class='add'>+In the situation where the switch port is connected through an RGMII fixed-link</div><div class='add'>+to a link partner whose link state life cycle is outside the control of Linux</div><div class='add'>+(such as a different SoC), then the delay lines would remain unlocked (and</div><div class='add'>+inactive) until there is manual intervention (ifdown/ifup on the switch port).</div><div class='add'>+The take-away is that in RGMII mode, the switch's internal delays are only</div><div class='add'>+reliable if the link partner never changes link speeds, or if it does, it does</div><div class='add'>+so in a way that is coordinated with the switch port (practically, both ends of</div><div class='add'>+the fixed-link are under control of the same Linux system).</div><div class='add'>+As to why would a fixed-link interface ever change link speeds: there are</div><div class='add'>+Ethernet controllers out there which come out of reset in 100 Mbps mode, and</div><div class='add'>+their driver inevitably needs to change the speed and clock frequency if it's</div><div class='add'>+required to work at gigabit.</div><div class='add'>+</div><div class='add'>+MDIO bus and PHY management</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+The SJA1105 does not have an MDIO bus and does not perform in-band AN either.</div><div class='add'>+Therefore there is no link state notification coming from the switch device.</div><div class='add'>+A board would need to hook up the PHYs connected to the switch to any other</div><div class='add'>+MDIO bus available to Linux within the system (e.g. to the DSA master's MDIO</div><div class='add'>+bus). Link state management then works by the driver manually keeping in sync</div><div class='add'>+(over SPI commands) the MAC link speed with the settings negotiated by the PHY.</div><div class='head'>diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst<br/>index 5449149be496..f390fe3cfdfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/index.rst</a></div><div class='hunk'>@@ -24,6 +24,7 @@ Contents:</div><div class='ctx'>    device_drivers/intel/i40e</div><div class='ctx'>    device_drivers/intel/iavf</div><div class='ctx'>    device_drivers/intel/ice</div><div class='add'>+   dsa/index</div><div class='ctx'>    devlink-info-versions</div><div class='ctx'>    ieee802154</div><div class='ctx'>    kapi</div><div class='head'>diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt<br/>index acdfb5d2bcaa..725b8bea58a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/ip-sysctl.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/ip-sysctl.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/ip-sysctl.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/ip-sysctl.txt</a></div><div class='hunk'>@@ -81,6 +81,11 @@ fib_multipath_hash_policy - INTEGER</div><div class='ctx'> 	0 - Layer 3</div><div class='ctx'> 	1 - Layer 4</div><div class='ctx'> </div><div class='add'>+fib_sync_mem - UNSIGNED INTEGER</div><div class='add'>+	Amount of dirty memory from fib entries that can be backlogged before</div><div class='add'>+	synchronize_rcu is forced.</div><div class='add'>+	  Default: 512kB   Minimum: 64kB   Maximum: 64MB</div><div class='add'>+</div><div class='ctx'> ip_forward_update_priority - INTEGER</div><div class='ctx'> 	Whether to update SKB priority from "TOS" field in IPv4 header after it</div><div class='ctx'> 	is forwarded. The new SKB priority is mapped from TOS field value</div><div class='hunk'>@@ -422,6 +427,7 @@ tcp_min_rtt_wlen - INTEGER</div><div class='ctx'> 	minimum RTT when it is moved to a longer path (e.g., due to traffic</div><div class='ctx'> 	engineering). A longer window makes the filter more resistant to RTT</div><div class='ctx'> 	inflations such as transient congestion. The unit is seconds.</div><div class='add'>+	Possible values: 0 - 86400 (1 day)</div><div class='ctx'> 	Default: 300</div><div class='ctx'> </div><div class='ctx'> tcp_moderate_rcvbuf - BOOLEAN</div><div class='hunk'>@@ -1336,6 +1342,7 @@ tag - INTEGER</div><div class='ctx'> 	Default value is 0.</div><div class='ctx'> </div><div class='ctx'> xfrm4_gc_thresh - INTEGER</div><div class='add'>+	(Obsolete since linux-4.14)</div><div class='ctx'> 	The threshold at which we will start garbage collecting for IPv4</div><div class='ctx'> 	destination cache entries.  At twice this value the system will</div><div class='ctx'> 	refuse new allocations.</div><div class='hunk'>@@ -1908,17 +1915,43 @@ enhanced_dad - BOOLEAN</div><div class='ctx'> </div><div class='ctx'> icmp/*:</div><div class='ctx'> ratelimit - INTEGER</div><div class='del'>-	Limit the maximal rates for sending ICMPv6 packets.</div><div class='add'>+	Limit the maximal rates for sending ICMPv6 messages.</div><div class='ctx'> 	0 to disable any limiting,</div><div class='ctx'> 	otherwise the minimal space between responses in milliseconds.</div><div class='ctx'> 	Default: 1000</div><div class='ctx'> </div><div class='add'>+ratemask - list of comma separated ranges</div><div class='add'>+	For ICMPv6 message types matching the ranges in the ratemask, limit</div><div class='add'>+	the sending of the message according to ratelimit parameter.</div><div class='add'>+</div><div class='add'>+	The format used for both input and output is a comma separated</div><div class='add'>+	list of ranges (e.g. "0-127,129" for ICMPv6 message type 0 to 127 and</div><div class='add'>+	129). Writing to the file will clear all previous ranges of ICMPv6</div><div class='add'>+	message types and update the current list with the input.</div><div class='add'>+</div><div class='add'>+	Refer to: https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml</div><div class='add'>+	for numerical values of ICMPv6 message types, e.g. echo request is 128</div><div class='add'>+	and echo reply is 129.</div><div class='add'>+</div><div class='add'>+	Default: 0-1,3-127 (rate limit ICMPv6 errors except Packet Too Big)</div><div class='add'>+</div><div class='ctx'> echo_ignore_all - BOOLEAN</div><div class='ctx'> 	If set non-zero, then the kernel will ignore all ICMP ECHO</div><div class='ctx'> 	requests sent to it over the IPv6 protocol.</div><div class='ctx'> 	Default: 0</div><div class='ctx'> </div><div class='add'>+echo_ignore_multicast - BOOLEAN</div><div class='add'>+	If set non-zero, then the kernel will ignore all ICMP ECHO</div><div class='add'>+	requests sent to it over the IPv6 protocol via multicast.</div><div class='add'>+	Default: 0</div><div class='add'>+</div><div class='add'>+echo_ignore_anycast - BOOLEAN</div><div class='add'>+	If set non-zero, then the kernel will ignore all ICMP ECHO</div><div class='add'>+	requests sent to it over the IPv6 protocol destined to anycast address.</div><div class='add'>+	Default: 0</div><div class='add'>+</div><div class='ctx'> xfrm6_gc_thresh - INTEGER</div><div class='add'>+	(Obsolete since linux-4.14)</div><div class='ctx'> 	The threshold at which we will start garbage collecting for IPv6</div><div class='ctx'> 	destination cache entries.  At twice this value the system will</div><div class='ctx'> 	refuse new allocations.</div><div class='head'>diff --git a/Documentation/networking/msg_zerocopy.rst b/Documentation/networking/msg_zerocopy.rst<br/>index 18c1415e7bfa..ace56204dd03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/msg_zerocopy.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/msg_zerocopy.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/msg_zerocopy.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/msg_zerocopy.rst</a></div><div class='hunk'>@@ -50,7 +50,7 @@ the excellent reporting over at LWN.net or read the original code.</div><div class='ctx'> </div><div class='ctx'>   patchset</div><div class='ctx'>     [PATCH net-next v4 0/9] socket sendmsg MSG_ZEROCOPY</div><div class='del'>-    http://lkml.kernel.org/r/20170803202945.70750-1-willemdebruijn.kernel@gmail.com</div><div class='add'>+    https://lkml.kernel.org/netdev/20170803202945.70750-1-willemdebruijn.kernel@gmail.com</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Interface</div><div class='head'>diff --git a/Documentation/networking/netdev-FAQ.rst b/Documentation/networking/netdev-FAQ.rst<br/>index 0ac5fa77f501..642fa963be3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/netdev-FAQ.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/netdev-FAQ.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/netdev-FAQ.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/netdev-FAQ.rst</a></div><div class='hunk'>@@ -131,6 +131,19 @@ it to the maintainer to figure out what is the most recent and current</div><div class='ctx'> version that should be applied. If there is any doubt, the maintainer</div><div class='ctx'> will reply and ask what should be done.</div><div class='ctx'> </div><div class='add'>+Q: I made changes to only a few patches in a patch series should I resend only those changed?</div><div class='add'>+---------------------------------------------------------------------------------------------</div><div class='add'>+A: No, please resend the entire patch series and make sure you do number your</div><div class='add'>+patches such that it is clear this is the latest and greatest set of patches</div><div class='add'>+that can be applied.</div><div class='add'>+</div><div class='add'>+Q: I submitted multiple versions of a patch series and it looks like a version other than the last one has been accepted, what should I do?</div><div class='add'>+-------------------------------------------------------------------------------------------------------------------------------------------</div><div class='add'>+A: There is no revert possible, once it is pushed out, it stays like that.</div><div class='add'>+Please send incremental versions on top of what has been merged in order to fix</div><div class='add'>+the patches the way they would look like if your latest patch series was to be</div><div class='add'>+merged.</div><div class='add'>+</div><div class='ctx'> Q: How can I tell what patches are queued up for backporting to the various stable releases?</div><div class='ctx'> --------------------------------------------------------------------------------------------</div><div class='ctx'> A: Normally Greg Kroah-Hartman collects stable commits himself, but for</div><div class='head'>diff --git a/Documentation/networking/nf_flowtable.txt b/Documentation/networking/nf_flowtable.txt<br/>index 54128c50d508..ca2136c76042 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/nf_flowtable.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/nf_flowtable.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/nf_flowtable.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/nf_flowtable.txt</a></div><div class='hunk'>@@ -44,10 +44,10 @@ including the Netfilter hooks and the flowtable fastpath bypass.</div><div class='ctx'>      /         \    /          \     |Routing |   /            \</div><div class='ctx'>   --&gt;  ingress  ---&gt; prerouting ---&gt; |decision|   | postrouting |--&gt; neigh_xmit</div><div class='ctx'>      \_________/    \__________/     ----------   \____________/          ^</div><div class='del'>-       |      ^          |               |               ^                |</div><div class='del'>-   flowtable  |          |          ____\/___            |                |</div><div class='del'>-       |      |          |         /         \           |                |</div><div class='del'>-    __\/___   |          ---------&gt;| forward |------------                |</div><div class='add'>+       |      ^                          |               ^                |</div><div class='add'>+   flowtable  |                     ____\/___            |                |</div><div class='add'>+       |      |                    /         \           |                |</div><div class='add'>+    __\/___   |                    | forward |------------                |</div><div class='ctx'>     |-----|   |                    \_________/                            |</div><div class='ctx'>     |-----|   |                 'flow offload' rule                       |</div><div class='ctx'>     |-----|   |                   adds entry to                           |</div><div class='head'>diff --git a/Documentation/networking/rxrpc.txt b/Documentation/networking/rxrpc.txt<br/>index 2df5894353d6..cd7303d7fa25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/rxrpc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/rxrpc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/rxrpc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/rxrpc.txt</a></div><div class='hunk'>@@ -1009,16 +1009,18 @@ The kernel interface functions are as follows:</div><div class='ctx'> </div><div class='ctx'>  (*) Check call still alive.</div><div class='ctx'> </div><div class='del'>-	u32 rxrpc_kernel_check_life(struct socket *sock,</div><div class='del'>-				    struct rxrpc_call *call);</div><div class='add'>+	bool rxrpc_kernel_check_life(struct socket *sock,</div><div class='add'>+				     struct rxrpc_call *call,</div><div class='add'>+				     u32 *_life);</div><div class='ctx'> 	void rxrpc_kernel_probe_life(struct socket *sock,</div><div class='ctx'> 				     struct rxrpc_call *call);</div><div class='ctx'> </div><div class='del'>-     The first function returns a number that is updated when ACKs are received</div><div class='del'>-     from the peer (notably including PING RESPONSE ACKs which we can elicit by</div><div class='del'>-     sending PING ACKs to see if the call still exists on the server).  The</div><div class='del'>-     caller should compare the numbers of two calls to see if the call is still</div><div class='del'>-     alive after waiting for a suitable interval.</div><div class='add'>+     The first function passes back in *_life a number that is updated when</div><div class='add'>+     ACKs are received from the peer (notably including PING RESPONSE ACKs</div><div class='add'>+     which we can elicit by sending PING ACKs to see if the call still exists</div><div class='add'>+     on the server).  The caller should compare the numbers of two calls to see</div><div class='add'>+     if the call is still alive after waiting for a suitable interval.  It also</div><div class='add'>+     returns true as long as the call hasn't yet reached the completed state.</div><div class='ctx'> </div><div class='ctx'>      This allows the caller to work out if the server is still contactable and</div><div class='ctx'>      if the call is still alive on the server while waiting for the server to</div><div class='head'>diff --git a/Documentation/networking/snmp_counter.rst b/Documentation/networking/snmp_counter.rst<br/>index 52b026be028f..38a4edc4522b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/snmp_counter.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/networking/snmp_counter.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/networking/snmp_counter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/networking/snmp_counter.rst</a></div><div class='hunk'>@@ -413,7 +413,7 @@ algorithm.</div><div class='ctx'> .. _F-RTO: https://tools.ietf.org/html/rfc5682</div><div class='ctx'> </div><div class='ctx'> TCP Fast Path</div><div class='del'>-============</div><div class='add'>+=============</div><div class='ctx'> When kernel receives a TCP packet, it has two paths to handler the</div><div class='ctx'> packet, one is fast path, another is slow path. The comment in kernel</div><div class='ctx'> code provides a good explanation of them, I pasted them below::</div><div class='hunk'>@@ -681,6 +681,7 @@ The TCP stack receives an out of order duplicate packet, so it sends a</div><div class='ctx'> DSACK to the sender.</div><div class='ctx'> </div><div class='ctx'> * TcpExtTCPDSACKRecv</div><div class='add'>+</div><div class='ctx'> The TCP stack receives a DSACK, which indicates an acknowledged</div><div class='ctx'> duplicate packet is received.</div><div class='ctx'> </div><div class='hunk'>@@ -690,7 +691,7 @@ The TCP stack receives a DSACK, which indicate an out of order</div><div class='ctx'> duplicate packet is received.</div><div class='ctx'> </div><div class='ctx'> invalid SACK and DSACK</div><div class='del'>-====================</div><div class='add'>+======================</div><div class='ctx'> When a SACK (or DSACK) block is invalid, a corresponding counter would</div><div class='ctx'> be updated. The validation method is base on the start/end sequence</div><div class='ctx'> number of the SACK block. For more details, please refer the comment</div><div class='hunk'>@@ -704,11 +705,13 @@ explaination:</div><div class='ctx'> .. _Add counters for discarded SACK blocks: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=18f02545a9a16c9a89778b91a162ad16d510bb32</div><div class='ctx'> </div><div class='ctx'> * TcpExtTCPSACKDiscard</div><div class='add'>+</div><div class='ctx'> This counter indicates how many SACK blocks are invalid. If the invalid</div><div class='ctx'> SACK block is caused by ACK recording, the TCP stack will only ignore</div><div class='ctx'> it and won't update this counter.</div><div class='ctx'> </div><div class='ctx'> * TcpExtTCPDSACKIgnoredOld and TcpExtTCPDSACKIgnoredNoUndo</div><div class='add'>+</div><div class='ctx'> When a DSACK block is invalid, one of these two counters would be</div><div class='ctx'> updated. Which counter will be updated depends on the undo_marker flag</div><div class='ctx'> of the TCP socket. If the undo_marker is not set, the TCP stack isn't</div><div class='hunk'>@@ -719,7 +722,7 @@ will be updated. If the undo_marker is set, TcpExtTCPDSACKIgnoredOld</div><div class='ctx'> will be updated. As implied in its name, it might be an old packet.</div><div class='ctx'> </div><div class='ctx'> SACK shift</div><div class='del'>-=========</div><div class='add'>+==========</div><div class='ctx'> The linux networking stack stores data in sk_buff struct (skb for</div><div class='ctx'> short). If a SACK block acrosses multiple skb, the TCP stack will try</div><div class='ctx'> to re-arrange data in these skb. E.g. if a SACK block acknowledges seq</div><div class='hunk'>@@ -730,12 +733,15 @@ seq 14 to 20. All data in skb2 will be moved to skb1, and skb2 will be</div><div class='ctx'> discard, this operation is 'merge'.</div><div class='ctx'> </div><div class='ctx'> * TcpExtTCPSackShifted</div><div class='add'>+</div><div class='ctx'> A skb is shifted</div><div class='ctx'> </div><div class='ctx'> * TcpExtTCPSackMerged</div><div class='add'>+</div><div class='ctx'> A skb is merged</div><div class='ctx'> </div><div class='ctx'> * TcpExtTCPSackShiftFallback</div><div class='add'>+</div><div class='ctx'> A skb should be shifted or merged, but the TCP stack doesn't do it for</div><div class='ctx'> some reasons.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ntb.txt b/Documentation/ntb.txt<br/>index a043854d28df..074a423c853c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ntb.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/ntb.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/ntb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/ntb.txt</a></div><div class='hunk'>@@ -41,9 +41,10 @@ mainly used to perform the proper memory window initialization. Typically</div><div class='ctx'> there are two types of memory window interfaces supported by the NTB API:</div><div class='ctx'> inbound translation configured on the local ntb port and outbound translation</div><div class='ctx'> configured by the peer, on the peer ntb port. The first type is</div><div class='del'>-depicted on the next figure</div><div class='add'>+depicted on the next figure::</div><div class='add'>+</div><div class='add'>+ Inbound translation:</div><div class='ctx'> </div><div class='del'>-Inbound translation:</div><div class='ctx'>  Memory:              Local NTB Port:      Peer NTB Port:      Peer MMIO:</div><div class='ctx'>   ____________</div><div class='ctx'>  | dma-mapped |-ntb_mw_set_trans(addr)  |</div><div class='hunk'>@@ -58,9 +59,10 @@ maps corresponding outbound memory window so to have access to the shared</div><div class='ctx'> memory region.</div><div class='ctx'> </div><div class='ctx'> The second type of interface, that implies the shared windows being</div><div class='del'>-initialized by a peer device, is depicted on the figure:</div><div class='add'>+initialized by a peer device, is depicted on the figure::</div><div class='add'>+</div><div class='add'>+ Outbound translation:</div><div class='ctx'> </div><div class='del'>-Outbound translation:</div><div class='ctx'>  Memory:        Local NTB Port:    Peer NTB Port:      Peer MMIO:</div><div class='ctx'>   ____________                      ______________</div><div class='ctx'>  | dma-mapped |                |   | MW base addr |&lt;== memory-mapped IO</div><div class='hunk'>@@ -75,11 +77,13 @@ outbound memory window so to have access to the shared memory region.</div><div class='ctx'> </div><div class='ctx'> As one can see the described scenarios can be combined in one portable</div><div class='ctx'> algorithm.</div><div class='add'>+</div><div class='ctx'>  Local device:</div><div class='ctx'>   1) Allocate memory for a shared window</div><div class='ctx'>   2) Initialize memory window by translated address of the allocated region</div><div class='ctx'>      (it may fail if local memory window initialization is unsupported)</div><div class='ctx'>   3) Send the translated address and memory window index to a peer device</div><div class='add'>+</div><div class='ctx'>  Peer device:</div><div class='ctx'>   1) Initialize memory window with retrieved address of the allocated</div><div class='ctx'>      by another device memory region (it may fail if peer memory window</div><div class='hunk'>@@ -88,6 +92,7 @@ algorithm.</div><div class='ctx'> </div><div class='ctx'> In accordance with this scenario, the NTB Memory Window API can be used as</div><div class='ctx'> follows:</div><div class='add'>+</div><div class='ctx'>  Local device:</div><div class='ctx'>   1) ntb_mw_count(pidx) - retrieve number of memory ranges, which can</div><div class='ctx'>      be allocated for memory windows between local device and peer device</div><div class='hunk'>@@ -103,6 +108,7 @@ follows:</div><div class='ctx'>   5) Send translated base address (usually together with memory window</div><div class='ctx'>      number) to the peer device using, for instance, scratchpad or message</div><div class='ctx'>      registers.</div><div class='add'>+</div><div class='ctx'>  Peer device:</div><div class='ctx'>   1) ntb_peer_mw_set_trans(pidx, midx) - try to set received from other</div><div class='ctx'>      device (related to pidx) translated address for specified memory</div><div class='head'>diff --git a/Documentation/packing.txt b/Documentation/packing.txt<br/>new file mode 100644<br/>index 000000000000..f830c98645f1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/packing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/packing.txt</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+================================================</div><div class='add'>+Generic bitfield packing and unpacking functions</div><div class='add'>+================================================</div><div class='add'>+</div><div class='add'>+Problem statement</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+When working with hardware, one has to choose between several approaches of</div><div class='add'>+interfacing with it.</div><div class='add'>+One can memory-map a pointer to a carefully crafted struct over the hardware</div><div class='add'>+device's memory region, and access its fields as struct members (potentially</div><div class='add'>+declared as bitfields). But writing code this way would make it less portable,</div><div class='add'>+due to potential endianness mismatches between the CPU and the hardware device.</div><div class='add'>+Additionally, one has to pay close attention when translating register</div><div class='add'>+definitions from the hardware documentation into bit field indices for the</div><div class='add'>+structs. Also, some hardware (typically networking equipment) tends to group</div><div class='add'>+its register fields in ways that violate any reasonable word boundaries</div><div class='add'>+(sometimes even 64 bit ones). This creates the inconvenience of having to</div><div class='add'>+define "high" and "low" portions of register fields within the struct.</div><div class='add'>+A more robust alternative to struct field definitions would be to extract the</div><div class='add'>+required fields by shifting the appropriate number of bits. But this would</div><div class='add'>+still not protect from endianness mismatches, except if all memory accesses</div><div class='add'>+were performed byte-by-byte. Also the code can easily get cluttered, and the</div><div class='add'>+high-level idea might get lost among the many bit shifts required.</div><div class='add'>+Many drivers take the bit-shifting approach and then attempt to reduce the</div><div class='add'>+clutter with tailored macros, but more often than not these macros take</div><div class='add'>+shortcuts that still prevent the code from being truly portable.</div><div class='add'>+</div><div class='add'>+The solution</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+This API deals with 2 basic operations:</div><div class='add'>+  - Packing a CPU-usable number into a memory buffer (with hardware</div><div class='add'>+    constraints/quirks)</div><div class='add'>+  - Unpacking a memory buffer (which has hardware constraints/quirks)</div><div class='add'>+    into a CPU-usable number.</div><div class='add'>+</div><div class='add'>+The API offers an abstraction over said hardware constraints and quirks,</div><div class='add'>+over CPU endianness and therefore between possible mismatches between</div><div class='add'>+the two.</div><div class='add'>+</div><div class='add'>+The basic unit of these API functions is the u64. From the CPU's</div><div class='add'>+perspective, bit 63 always means bit offset 7 of byte 7, albeit only</div><div class='add'>+logically. The question is: where do we lay this bit out in memory?</div><div class='add'>+</div><div class='add'>+The following examples cover the memory layout of a packed u64 field.</div><div class='add'>+The byte offsets in the packed buffer are always implicitly 0, 1, ... 7.</div><div class='add'>+What the examples show is where the logical bytes and bits sit.</div><div class='add'>+</div><div class='add'>+1. Normally (no quirks), we would do it like this:</div><div class='add'>+</div><div class='add'>+63 62 61 60 59 58 57 56 55 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40 39 38 37 36 35 34 33 32</div><div class='add'>+7                       6                       5                        4</div><div class='add'>+31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0</div><div class='add'>+3                       2                       1                        0</div><div class='add'>+</div><div class='add'>+That is, the MSByte (7) of the CPU-usable u64 sits at memory offset 0, and the</div><div class='add'>+LSByte (0) of the u64 sits at memory offset 7.</div><div class='add'>+This corresponds to what most folks would regard to as "big endian", where</div><div class='add'>+bit i corresponds to the number 2^i. This is also referred to in the code</div><div class='add'>+comments as "logical" notation.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. If QUIRK_MSB_ON_THE_RIGHT is set, we do it like this:</div><div class='add'>+</div><div class='add'>+56 57 58 59 60 61 62 63 48 49 50 51 52 53 54 55 40 41 42 43 44 45 46 47 32 33 34 35 36 37 38 39</div><div class='add'>+7                       6                        5                       4</div><div class='add'>+24 25 26 27 28 29 30 31 16 17 18 19 20 21 22 23  8  9 10 11 12 13 14 15  0  1  2  3  4  5  6  7</div><div class='add'>+3                       2                        1                       0</div><div class='add'>+</div><div class='add'>+That is, QUIRK_MSB_ON_THE_RIGHT does not affect byte positioning, but</div><div class='add'>+inverts bit offsets inside a byte.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. If QUIRK_LITTLE_ENDIAN is set, we do it like this:</div><div class='add'>+</div><div class='add'>+39 38 37 36 35 34 33 32 47 46 45 44 43 42 41 40 55 54 53 52 51 50 49 48 63 62 61 60 59 58 57 56</div><div class='add'>+4                       5                       6                       7</div><div class='add'>+7  6  5  4  3  2  1  0  15 14 13 12 11 10  9  8 23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24</div><div class='add'>+0                       1                       2                       3</div><div class='add'>+</div><div class='add'>+Therefore, QUIRK_LITTLE_ENDIAN means that inside the memory region, every</div><div class='add'>+byte from each 4-byte word is placed at its mirrored position compared to</div><div class='add'>+the boundary of that word.</div><div class='add'>+</div><div class='add'>+4. If QUIRK_MSB_ON_THE_RIGHT and QUIRK_LITTLE_ENDIAN are both set, we do it</div><div class='add'>+   like this:</div><div class='add'>+</div><div class='add'>+32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63</div><div class='add'>+4                       5                       6                       7</div><div class='add'>+0  1  2  3  4  5  6  7  8   9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31</div><div class='add'>+0                       1                       2                       3</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. If just QUIRK_LSW32_IS_FIRST is set, we do it like this:</div><div class='add'>+</div><div class='add'>+31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0</div><div class='add'>+3                       2                       1                        0</div><div class='add'>+63 62 61 60 59 58 57 56 55 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40 39 38 37 36 35 34 33 32</div><div class='add'>+7                       6                       5                        4</div><div class='add'>+</div><div class='add'>+In this case the 8 byte memory region is interpreted as follows: first</div><div class='add'>+4 bytes correspond to the least significant 4-byte word, next 4 bytes to</div><div class='add'>+the more significant 4-byte word.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6. If QUIRK_LSW32_IS_FIRST and QUIRK_MSB_ON_THE_RIGHT are set, we do it like</div><div class='add'>+   this:</div><div class='add'>+</div><div class='add'>+24 25 26 27 28 29 30 31 16 17 18 19 20 21 22 23  8  9 10 11 12 13 14 15  0  1  2  3  4  5  6  7</div><div class='add'>+3                       2                        1                       0</div><div class='add'>+56 57 58 59 60 61 62 63 48 49 50 51 52 53 54 55 40 41 42 43 44 45 46 47 32 33 34 35 36 37 38 39</div><div class='add'>+7                       6                        5                       4</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+7. If QUIRK_LSW32_IS_FIRST and QUIRK_LITTLE_ENDIAN are set, it looks like</div><div class='add'>+   this:</div><div class='add'>+</div><div class='add'>+7  6  5  4  3  2  1  0  15 14 13 12 11 10  9  8 23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24</div><div class='add'>+0                       1                       2                       3</div><div class='add'>+39 38 37 36 35 34 33 32 47 46 45 44 43 42 41 40 55 54 53 52 51 50 49 48 63 62 61 60 59 58 57 56</div><div class='add'>+4                       5                       6                       7</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+8. If QUIRK_LSW32_IS_FIRST, QUIRK_LITTLE_ENDIAN and QUIRK_MSB_ON_THE_RIGHT</div><div class='add'>+   are set, it looks like this:</div><div class='add'>+</div><div class='add'>+0  1  2  3  4  5  6  7  8   9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31</div><div class='add'>+0                       1                       2                       3</div><div class='add'>+32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63</div><div class='add'>+4                       5                       6                       7</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+We always think of our offsets as if there were no quirk, and we translate</div><div class='add'>+them afterwards, before accessing the memory region.</div><div class='add'>+</div><div class='add'>+Intended use</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Drivers that opt to use this API first need to identify which of the above 3</div><div class='add'>+quirk combinations (for a total of 8) match what the hardware documentation</div><div class='add'>+describes. Then they should wrap the packing() function, creating a new</div><div class='add'>+xxx_packing() that calls it using the proper QUIRK_* one-hot bits set.</div><div class='add'>+</div><div class='add'>+The packing() function returns an int-encoded error code, which protects the</div><div class='add'>+programmer against incorrect API use.  The errors are not expected to occur</div><div class='add'>+durring runtime, therefore it is reasonable for xxx_packing() to return void</div><div class='add'>+and simply swallow those errors. Optionally it can dump stack or print the</div><div class='add'>+error description.</div><div class='head'>diff --git a/Documentation/preempt-locking.txt b/Documentation/preempt-locking.txt<br/>index 509f5a422d57..dce336134e54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/preempt-locking.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/preempt-locking.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/preempt-locking.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/preempt-locking.txt</a></div><div class='hunk'>@@ -52,7 +52,6 @@ preemption must be disabled around such regions.</div><div class='ctx'> </div><div class='ctx'> Note, some FPU functions are already explicitly preempt safe.  For example,</div><div class='ctx'> kernel_fpu_begin and kernel_fpu_end will disable and enable preemption.</div><div class='del'>-However, fpu__restore() must be called with preemption disabled.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> RULE #3: Lock acquire and release must be performed by same task</div><div class='head'>diff --git a/Documentation/process/5.Posting.rst b/Documentation/process/5.Posting.rst<br/>index 4213e580f273..855a70b80269 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/5.Posting.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/5.Posting.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/5.Posting.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/5.Posting.rst</a></div><div class='hunk'>@@ -216,10 +216,12 @@ The tags in common use are:</div><div class='ctx'>    which can be found in :ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;`</div><div class='ctx'>    Code without a proper signoff cannot be merged into the mainline.</div><div class='ctx'> </div><div class='del'>- - Co-developed-by: states that the patch was also created by another developer</div><div class='del'>-   along with the original author.  This is useful at times when multiple</div><div class='del'>-   people work on a single patch.  Note, this person also needs to have a</div><div class='del'>-   Signed-off-by: line in the patch as well.</div><div class='add'>+ - Co-developed-by: states that the patch was co-created by several developers;</div><div class='add'>+   it is a used to give attribution to co-authors (in addition to the author</div><div class='add'>+   attributed by the From: tag) when multiple people work on a single patch.</div><div class='add'>+   Every Co-developed-by: must be immediately followed by a Signed-off-by: of</div><div class='add'>+   the associated co-author.  Details and examples can be found in</div><div class='add'>+   :ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;`.</div><div class='ctx'> </div><div class='ctx'>  - Acked-by: indicates an agreement by another developer (often a</div><div class='ctx'>    maintainer of the relevant code) that the patch is appropriate for</div><div class='head'>diff --git a/Documentation/process/coding-style.rst b/Documentation/process/coding-style.rst<br/>index 8ea913e99fa1..fa864a51e6ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/coding-style.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/coding-style.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/coding-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/coding-style.rst</a></div><div class='hunk'>@@ -843,7 +843,8 @@ used.</div><div class='ctx'> The kernel provides the following general purpose memory allocators:</div><div class='ctx'> kmalloc(), kzalloc(), kmalloc_array(), kcalloc(), vmalloc(), and</div><div class='ctx'> vzalloc().  Please refer to the API documentation for further information</div><div class='del'>-about them.</div><div class='add'>+about them.  :ref:`Documentation/core-api/memory-allocation.rst</div><div class='add'>+&lt;memory_allocation&gt;`</div><div class='ctx'> </div><div class='ctx'> The preferred form for passing a size of a struct is the following:</div><div class='ctx'> </div><div class='hunk'>@@ -874,6 +875,9 @@ The preferred form for allocating a zeroed array is the following:</div><div class='ctx'> Both forms check for overflow on the allocation size n * sizeof(...),</div><div class='ctx'> and return NULL if that occurred.</div><div class='ctx'> </div><div class='add'>+These generic allocation functions all emit a stack dump on failure when used</div><div class='add'>+without __GFP_NOWARN so there is no use in emitting an additional failure</div><div class='add'>+message when NULL is returned.</div><div class='ctx'> </div><div class='ctx'> 15) The inline disease</div><div class='ctx'> ----------------------</div><div class='head'>diff --git a/Documentation/process/deprecated.rst b/Documentation/process/deprecated.rst<br/>index 0ef5a63c06ba..49e0f64a3427 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/deprecated.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/deprecated.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/deprecated.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/deprecated.rst</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> .. SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+.. _deprecated:</div><div class='add'>+</div><div class='ctx'> =====================================================================</div><div class='ctx'> Deprecated Interfaces, Language Features, Attributes, and Conventions</div><div class='ctx'> =====================================================================</div><div class='head'>diff --git a/Documentation/process/howto.rst b/Documentation/process/howto.rst<br/>index ad2b6c852b95..6ab75c11d2c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/howto.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/howto.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/howto.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/howto.rst</a></div><div class='hunk'>@@ -62,7 +62,7 @@ Legal Issues</div><div class='ctx'> The Linux kernel source code is released under the GPL.  Please see the file</div><div class='ctx'> COPYING in the main directory of the source tree. The Linux kernel licensing</div><div class='ctx'> rules and how to use `SPDX &lt;https://spdx.org/&gt;`_ identifiers in source code are</div><div class='del'>-descibed in :ref:`Documentation/process/license-rules.rst &lt;kernel_licensing&gt;`.</div><div class='add'>+described in :ref:`Documentation/process/license-rules.rst &lt;kernel_licensing&gt;`.</div><div class='ctx'> If you have further questions about the license, please contact a lawyer, and do</div><div class='ctx'> not ask on the Linux kernel mailing list.  The people on the mailing lists are</div><div class='ctx'> not lawyers, and you should not rely on their statements on legal matters.</div><div class='head'>diff --git a/Documentation/process/kernel-docs.rst b/Documentation/process/kernel-docs.rst<br/>index ab12dddc773e..7a45a8e36ea7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/kernel-docs.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/kernel-docs.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/kernel-docs.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/kernel-docs.rst</a></div><div class='hunk'>@@ -95,18 +95,6 @@ On-line docs</div><div class='ctx'>         [...]. This paper examines some common problems for</div><div class='ctx'>         submitting larger changes and some strategies to avoid problems.</div><div class='ctx'> </div><div class='del'>-    * Title: **Overview of the Virtual File System**</div><div class='del'>-</div><div class='del'>-      :Author: Richard Gooch.</div><div class='del'>-      :URL: http://www.mjmwired.net/kernel/Documentation/filesystems/vfs.txt</div><div class='del'>-      :Date: 2007</div><div class='del'>-      :Keywords: VFS, File System, mounting filesystems, opening files,</div><div class='del'>-        dentries, dcache.</div><div class='del'>-      :Description: Brief introduction to the Linux Virtual File System.</div><div class='del'>-        What is it, how it works, operations taken when opening a file or</div><div class='del'>-        mounting a file system and description of important data</div><div class='del'>-        structures explaining the purpose of each of their entries.</div><div class='del'>-</div><div class='ctx'>     * Title: **Linux Device Drivers, Third Edition**</div><div class='ctx'> </div><div class='ctx'>       :Author: Jonathan Corbet, Alessandro Rubini, Greg Kroah-Hartman</div><div class='head'>diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst<br/>index 6b09033a8e9e..2ef44ada3f11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/license-rules.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/license-rules.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/license-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/license-rules.rst</a></div><div class='hunk'>@@ -234,13 +234,13 @@ kernel, can be broken down into:</div><div class='ctx'> </div><div class='ctx'> |</div><div class='ctx'> </div><div class='del'>-2. Not recommended licenses:</div><div class='add'>+2. Deprecated licenses:</div><div class='ctx'> </div><div class='ctx'>    These licenses should only be used for existing code or for importing</div><div class='ctx'>    code from a different project.  These licenses are available from the</div><div class='ctx'>    directory::</div><div class='ctx'> </div><div class='del'>-      LICENSES/other/</div><div class='add'>+      LICENSES/deprecated/</div><div class='ctx'> </div><div class='ctx'>    in the kernel source tree.</div><div class='ctx'> </div><div class='hunk'>@@ -250,14 +250,14 @@ kernel, can be broken down into:</div><div class='ctx'> </div><div class='ctx'>    Examples::</div><div class='ctx'> </div><div class='del'>-      LICENSES/other/ISC</div><div class='add'>+      LICENSES/deprecated/ISC</div><div class='ctx'> </div><div class='ctx'>    Contains the Internet Systems Consortium license text and the required</div><div class='ctx'>    metatags::</div><div class='ctx'> </div><div class='del'>-      LICENSES/other/ZLib</div><div class='add'>+      LICENSES/deprecated/GPL-1.0</div><div class='ctx'> </div><div class='del'>-   Contains the ZLIB license text and the required metatags.</div><div class='add'>+   Contains the GPL version 1 license text and the required metatags.</div><div class='ctx'> </div><div class='ctx'>    Metatags:</div><div class='ctx'> </div><div class='hunk'>@@ -281,7 +281,56 @@ kernel, can be broken down into:</div><div class='ctx'> </div><div class='ctx'> |</div><div class='ctx'> </div><div class='del'>-3. _`Exceptions`:</div><div class='add'>+3. Dual Licensing Only</div><div class='add'>+</div><div class='add'>+   These licenses should only be used to dual license code with another</div><div class='add'>+   license in addition to a preferred license.  These licenses are available</div><div class='add'>+   from the directory::</div><div class='add'>+</div><div class='add'>+      LICENSES/dual/</div><div class='add'>+</div><div class='add'>+   in the kernel source tree.</div><div class='add'>+</div><div class='add'>+   The files in this directory contain the full license text and</div><div class='add'>+   `Metatags`_.  The file names are identical to the SPDX license</div><div class='add'>+   identifier which shall be used for the license in source files.</div><div class='add'>+</div><div class='add'>+   Examples::</div><div class='add'>+</div><div class='add'>+      LICENSES/dual/MPL-1.1</div><div class='add'>+</div><div class='add'>+   Contains the Mozilla Public License version 1.1 license text and the</div><div class='add'>+   required metatags::</div><div class='add'>+</div><div class='add'>+      LICENSES/dual/Apache-2.0</div><div class='add'>+</div><div class='add'>+   Contains the Apache License version 2.0 license text and the required</div><div class='add'>+   metatags.</div><div class='add'>+</div><div class='add'>+   Metatags:</div><div class='add'>+</div><div class='add'>+   The metatag requirements for 'other' licenses are identical to the</div><div class='add'>+   requirements of the `Preferred licenses`_.</div><div class='add'>+</div><div class='add'>+   File format example::</div><div class='add'>+</div><div class='add'>+      Valid-License-Identifier: MPL-1.1</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/MPL-1.1.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+        Do NOT use. The MPL-1.1 is not GPL2 compatible. It may only be used for</div><div class='add'>+        dual-licensed files where the other license is GPL2 compatible.</div><div class='add'>+        If you end up using this it MUST be used together with a GPL2 compatible</div><div class='add'>+        license using "OR".</div><div class='add'>+        To use the Mozilla Public License version 1.1 put the following SPDX</div><div class='add'>+        tag/value pair into a comment according to the placement guidelines in</div><div class='add'>+        the licensing rules documentation:</div><div class='add'>+      SPDX-License-Identifier: MPL-1.1</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+4. _`Exceptions`:</div><div class='ctx'> </div><div class='ctx'>    Some licenses can be amended with exceptions which grant certain rights</div><div class='ctx'>    which the original license does not.  These exceptions are available</div><div class='head'>diff --git a/Documentation/process/maintainer-pgp-guide.rst b/Documentation/process/maintainer-pgp-guide.rst<br/>index aff9b1a4d77b..4bab7464ff8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/maintainer-pgp-guide.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/maintainer-pgp-guide.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/maintainer-pgp-guide.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/maintainer-pgp-guide.rst</a></div><div class='hunk'>@@ -943,7 +943,7 @@ have on your keyring::</div><div class='ctx'> </div><div class='ctx'> Next, open the `PGP pathfinder`_. In the "From" field, paste the key</div><div class='ctx'> fingerprint of Linus Torvalds from the output above. In the "To" field,</div><div class='del'>-paste they key-id you found via ``gpg --search`` of the unknown key, and</div><div class='add'>+paste the key-id you found via ``gpg --search`` of the unknown key, and</div><div class='ctx'> check the results:</div><div class='ctx'> </div><div class='ctx'> - `Finding paths to Linus`_</div><div class='head'>diff --git a/Documentation/process/submit-checklist.rst b/Documentation/process/submit-checklist.rst<br/>index 367353c54949..c88867b173d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/submit-checklist.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/submit-checklist.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/submit-checklist.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/submit-checklist.rst</a></div><div class='hunk'>@@ -72,47 +72,44 @@ and elsewhere regarding submitting Linux kernel patches.</div><div class='ctx'> 13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and</div><div class='ctx'>     ``CONFIG_PREEMPT.``</div><div class='ctx'> </div><div class='del'>-14) If the patch affects IO/Disk, etc: has been tested with and without</div><div class='del'>-    ``CONFIG_LBDAF.``</div><div class='add'>+16) All codepaths have been exercised with all lockdep features enabled.</div><div class='ctx'> </div><div class='del'>-15) All codepaths have been exercised with all lockdep features enabled.</div><div class='add'>+17) All new ``/proc`` entries are documented under ``Documentation/``</div><div class='ctx'> </div><div class='del'>-16) All new ``/proc`` entries are documented under ``Documentation/``</div><div class='del'>-</div><div class='del'>-17) All new kernel boot parameters are documented in</div><div class='add'>+18) All new kernel boot parameters are documented in</div><div class='ctx'>     ``Documentation/admin-guide/kernel-parameters.rst``.</div><div class='ctx'> </div><div class='del'>-18) All new module parameters are documented with ``MODULE_PARM_DESC()``</div><div class='add'>+19) All new module parameters are documented with ``MODULE_PARM_DESC()``</div><div class='ctx'> </div><div class='del'>-19) All new userspace interfaces are documented in ``Documentation/ABI/``.</div><div class='add'>+20) All new userspace interfaces are documented in ``Documentation/ABI/``.</div><div class='ctx'>     See ``Documentation/ABI/README`` for more information.</div><div class='ctx'>     Patches that change userspace interfaces should be CCed to</div><div class='ctx'>     linux-api@vger.kernel.org.</div><div class='ctx'> </div><div class='del'>-20) Check that it all passes ``make headers_check``.</div><div class='add'>+21) Check that it all passes ``make headers_check``.</div><div class='ctx'> </div><div class='del'>-21) Has been checked with injection of at least slab and page-allocation</div><div class='add'>+22) Has been checked with injection of at least slab and page-allocation</div><div class='ctx'>     failures.  See ``Documentation/fault-injection/``.</div><div class='ctx'> </div><div class='ctx'>     If the new code is substantial, addition of subsystem-specific fault</div><div class='ctx'>     injection might be appropriate.</div><div class='ctx'> </div><div class='del'>-22) Newly-added code has been compiled with ``gcc -W`` (use</div><div class='add'>+23) Newly-added code has been compiled with ``gcc -W`` (use</div><div class='ctx'>     ``make EXTRA_CFLAGS=-W``).  This will generate lots of noise, but is good</div><div class='ctx'>     for finding bugs like "warning: comparison between signed and unsigned".</div><div class='ctx'> </div><div class='del'>-23) Tested after it has been merged into the -mm patchset to make sure</div><div class='add'>+24) Tested after it has been merged into the -mm patchset to make sure</div><div class='ctx'>     that it still works with all of the other queued patches and various</div><div class='ctx'>     changes in the VM, VFS, and other subsystems.</div><div class='ctx'> </div><div class='del'>-24) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a</div><div class='add'>+25) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a</div><div class='ctx'>     comment in the source code that explains the logic of what they are doing</div><div class='ctx'>     and why.</div><div class='ctx'> </div><div class='del'>-25) If any ioctl's are added by the patch, then also update</div><div class='add'>+26) If any ioctl's are added by the patch, then also update</div><div class='ctx'>     ``Documentation/ioctl/ioctl-number.txt``.</div><div class='ctx'> </div><div class='del'>-26) If your modified source code depends on or uses any of the kernel</div><div class='add'>+27) If your modified source code depends on or uses any of the kernel</div><div class='ctx'>     APIs or features that are related to the following ``Kconfig`` symbols,</div><div class='ctx'>     then test multiple builds with the related ``Kconfig`` symbols disabled</div><div class='ctx'>     and/or ``=m`` (if that option is available) [not all of these at the</div><div class='head'>diff --git a/Documentation/process/submitting-patches.rst b/Documentation/process/submitting-patches.rst<br/>index be7d1829c3af..9c4299293c72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/submitting-patches.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/process/submitting-patches.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/process/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/process/submitting-patches.rst</a></div><div class='hunk'>@@ -60,8 +60,8 @@ not in any lower subdirectory.</div><div class='ctx'> </div><div class='ctx'> To create a patch for a single file, it is often sufficient to do::</div><div class='ctx'> </div><div class='del'>-	SRCTREE= linux</div><div class='del'>-	MYFILE=  drivers/net/mydriver.c</div><div class='add'>+	SRCTREE=linux</div><div class='add'>+	MYFILE=drivers/net/mydriver.c</div><div class='ctx'> </div><div class='ctx'> 	cd $SRCTREE</div><div class='ctx'> 	cp $MYFILE $MYFILE.orig</div><div class='hunk'>@@ -73,7 +73,7 @@ To create a patch for multiple files, you should unpack a "vanilla",</div><div class='ctx'> or unmodified kernel source tree, and generate a ``diff`` against your</div><div class='ctx'> own source tree.  For example::</div><div class='ctx'> </div><div class='del'>-	MYSRC= /devel/linux</div><div class='add'>+	MYSRC=/devel/linux</div><div class='ctx'> </div><div class='ctx'> 	tar xvfz linux-3.19.tar.gz</div><div class='ctx'> 	mv linux-3.19 linux-3.19-vanilla</div><div class='hunk'>@@ -545,10 +545,40 @@ person it names - but it should indicate that this person was copied on the</div><div class='ctx'> patch.  This tag documents that potentially interested parties</div><div class='ctx'> have been included in the discussion.</div><div class='ctx'> </div><div class='del'>-A Co-developed-by: states that the patch was also created by another developer</div><div class='del'>-along with the original author.  This is useful at times when multiple people</div><div class='del'>-work on a single patch.  Note, this person also needs to have a Signed-off-by:</div><div class='del'>-line in the patch as well.</div><div class='add'>+Co-developed-by: states that the patch was co-created by multiple developers;</div><div class='add'>+it is a used to give attribution to co-authors (in addition to the author</div><div class='add'>+attributed by the From: tag) when several people work on a single patch.  Since</div><div class='add'>+Co-developed-by: denotes authorship, every Co-developed-by: must be immediately</div><div class='add'>+followed by a Signed-off-by: of the associated co-author.  Standard sign-off</div><div class='add'>+procedure applies, i.e. the ordering of Signed-off-by: tags should reflect the</div><div class='add'>+chronological history of the patch insofar as possible, regardless of whether</div><div class='add'>+the author is attributed via From: or Co-developed-by:.  Notably, the last</div><div class='add'>+Signed-off-by: must always be that of the developer submitting the patch.</div><div class='add'>+</div><div class='add'>+Note, the From: tag is optional when the From: author is also the person (and</div><div class='add'>+email) listed in the From: line of the email header.</div><div class='add'>+</div><div class='add'>+Example of a patch submitted by the From: author::</div><div class='add'>+</div><div class='add'>+	&lt;changelog&gt;</div><div class='add'>+</div><div class='add'>+	Co-developed-by: First Co-Author &lt;first@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: First Co-Author &lt;first@coauthor.example.org&gt;</div><div class='add'>+	Co-developed-by: Second Co-Author &lt;second@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Second Co-Author &lt;second@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: From Author &lt;from@author.example.org&gt;</div><div class='add'>+</div><div class='add'>+Example of a patch submitted by a Co-developed-by: author::</div><div class='add'>+</div><div class='add'>+	From: From Author &lt;from@author.example.org&gt;</div><div class='add'>+</div><div class='add'>+	&lt;changelog&gt;</div><div class='add'>+</div><div class='add'>+	Co-developed-by: Random Co-Author &lt;random@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Random Co-Author &lt;random@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: From Author &lt;from@author.example.org&gt;</div><div class='add'>+	Co-developed-by: Submitting Co-Author &lt;sub@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Submitting Co-Author &lt;sub@coauthor.example.org&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 13) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:</div><div class='hunk'>@@ -696,7 +726,7 @@ A couple of example Subjects::</div><div class='ctx'> The ``from`` line must be the very first line in the message body,</div><div class='ctx'> and has the form:</div><div class='ctx'> </div><div class='del'>-        From: Original Author &lt;author@example.com&gt;</div><div class='add'>+        From: Patch Author &lt;author@example.com&gt;</div><div class='ctx'> </div><div class='ctx'> The ``from`` line specifies who will be credited as the author of the</div><div class='ctx'> patch in the permanent changelog.  If the ``from`` line is missing,</div><div class='head'>diff --git a/Documentation/robust-futexes.txt b/Documentation/robust-futexes.txt<br/>index 6c42c75103eb..6361fb01c9c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/robust-futexes.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/robust-futexes.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/robust-futexes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/robust-futexes.txt</a></div><div class='hunk'>@@ -218,5 +218,4 @@ All other architectures should build just fine too - but they won't have</div><div class='ctx'> the new syscalls yet.</div><div class='ctx'> </div><div class='ctx'> Architectures need to implement the new futex_atomic_cmpxchg_inatomic()</div><div class='del'>-inline function before writing up the syscalls (that function returns</div><div class='del'>--ENOSYS right now).</div><div class='add'>+inline function before writing up the syscalls.</div><div class='head'>diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt<br/>index a129acf38537..688c95b11919 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/rtc.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/rtc.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/rtc.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/rtc.txt</a></div><div class='hunk'>@@ -136,5 +136,5 @@ a high functionality RTC is integrated into the SOC.  That system might read</div><div class='ctx'> the system clock from the discrete RTC, but use the integrated one for all</div><div class='ctx'> other tasks, because of its greater functionality.</div><div class='ctx'> </div><div class='del'>-Check out tools/testing/selftests/timers/rtctest.c for an example usage of the</div><div class='add'>+Check out tools/testing/selftests/rtc/rtctest.c for an example usage of the</div><div class='ctx'> ioctl interface.</div><div class='head'>diff --git a/Documentation/serial/README.cycladesZ b/Documentation/serial/cyclades_z.rst<br/>index 024a69443cc2..532ff67e2f1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/README.cycladesZ?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/README.cycladesZ</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/cyclades_z.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/cyclades_z.rst</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='add'>+================</div><div class='add'>+Cyclades-Z notes</div><div class='add'>+================</div><div class='ctx'> </div><div class='ctx'> The Cyclades-Z must have firmware loaded onto the card before it will</div><div class='ctx'> operate.  This operation should be performed during system startup,</div><div class='ctx'> </div><div class='ctx'> The firmware, loader program and the latest device driver code are</div><div class='ctx'> available from Cyclades at</div><div class='del'>-    ftp://ftp.cyclades.com/pub/cyclades/cyclades-z/linux/</div><div class='ctx'> </div><div class='add'>+    ftp://ftp.cyclades.com/pub/cyclades/cyclades-z/linux/</div><div class='head'>diff --git a/Documentation/serial/driver b/Documentation/serial/driver.rst<br/>index 86e47c19a924..4537119bf624 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/driver?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/driver</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/driver.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/driver.rst</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-</div><div class='del'>-			Low Level Serial API</div><div class='del'>-			--------------------</div><div class='add'>+====================</div><div class='add'>+Low Level Serial API</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> This document is meant as a brief overview of some aspects of the new serial</div><div class='hunk'>@@ -44,7 +44,7 @@ are described in the uart_ops listing below.)</div><div class='ctx'> There are two locks.  A per-port spinlock, and an overall semaphore.</div><div class='ctx'> </div><div class='ctx'> From the core driver perspective, the port-&gt;lock locks the following</div><div class='del'>-data:</div><div class='add'>+data::</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;mctrl</div><div class='ctx'> 	port-&gt;icount</div><div class='hunk'>@@ -75,41 +75,51 @@ hardware.</div><div class='ctx'> 	return TIOCSER_TEMT.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   set_mctrl(port, mctrl)</div><div class='ctx'> 	This function sets the modem control lines for port described</div><div class='ctx'> 	by 'port' to the state described by mctrl.  The relevant bits</div><div class='ctx'> 	of mctrl are:</div><div class='add'>+</div><div class='ctx'> 		- TIOCM_RTS	RTS signal.</div><div class='ctx'> 		- TIOCM_DTR	DTR signal.</div><div class='ctx'> 		- TIOCM_OUT1	OUT1 signal.</div><div class='ctx'> 		- TIOCM_OUT2	OUT2 signal.</div><div class='ctx'> 		- TIOCM_LOOP	Set the port into loopback mode.</div><div class='add'>+</div><div class='ctx'> 	If the appropriate bit is set, the signal should be driven</div><div class='ctx'> 	active.  If the bit is clear, the signal should be driven</div><div class='ctx'> 	inactive.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   get_mctrl(port)</div><div class='ctx'> 	Returns the current state of modem control inputs.  The state</div><div class='ctx'> 	of the outputs should not be returned, since the core keeps</div><div class='ctx'> 	track of their state.  The state information should include:</div><div class='add'>+</div><div class='ctx'> 		- TIOCM_CAR	state of DCD signal</div><div class='ctx'> 		- TIOCM_CTS	state of CTS signal</div><div class='ctx'> 		- TIOCM_DSR	state of DSR signal</div><div class='ctx'> 		- TIOCM_RI	state of RI signal</div><div class='add'>+</div><div class='ctx'> 	The bit is set if the signal is currently driven active.  If</div><div class='ctx'> 	the port does not support CTS, DCD or DSR, the driver should</div><div class='ctx'> 	indicate that the signal is permanently active.  If RI is</div><div class='ctx'> 	not available, the signal should not be indicated as active.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   stop_tx(port)</div><div class='hunk'>@@ -121,14 +131,18 @@ hardware.</div><div class='ctx'> 	possible.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   start_tx(port)</div><div class='ctx'> 	Start transmitting characters.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   throttle(port)</div><div class='hunk'>@@ -138,16 +152,17 @@ hardware.</div><div class='ctx'> 	This will be called only if hardware assisted flow control is enabled.</div><div class='ctx'> </div><div class='ctx'> 	Locking: serialized with .unthrottle() and termios modification by the</div><div class='del'>-		 tty layer.</div><div class='add'>+	tty layer.</div><div class='ctx'> </div><div class='ctx'>   unthrottle(port)</div><div class='ctx'> 	Notify the serial driver that characters can now be sent to the serial</div><div class='ctx'> 	port without fear of overrunning the input buffers of the line</div><div class='ctx'> 	disciplines.</div><div class='add'>+</div><div class='ctx'> 	This will be called only if hardware assisted flow control is enabled.</div><div class='ctx'> </div><div class='ctx'> 	Locking: serialized with .throttle() and termios modification by the</div><div class='del'>-		 tty layer.</div><div class='add'>+	tty layer.</div><div class='ctx'> </div><div class='ctx'>   send_xchar(port,ch)</div><div class='ctx'> 	Transmit a high priority character, even if the port is stopped.</div><div class='hunk'>@@ -159,6 +174,7 @@ hardware.</div><div class='ctx'> 	Do not transmit if ch == '\0' (__DISABLED_CHAR).</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   stop_rx(port)</div><div class='hunk'>@@ -166,7 +182,9 @@ hardware.</div><div class='ctx'> 	being closed.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   enable_ms(port)</div><div class='hunk'>@@ -177,7 +195,9 @@ hardware.</div><div class='ctx'> 	called.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   break_ctl(port,ctl)</div><div class='hunk'>@@ -196,6 +216,7 @@ hardware.</div><div class='ctx'> 	This method will only be called when the port is initially opened.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port_sem taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: globally disabled.</div><div class='ctx'> </div><div class='ctx'>   shutdown(port)</div><div class='hunk'>@@ -210,6 +231,7 @@ hardware.</div><div class='ctx'> 	this port.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port_sem taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   flush_buffer(port)</div><div class='hunk'>@@ -220,7 +242,9 @@ hardware.</div><div class='ctx'> 	buffer is cleared.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: locally disabled.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   set_termios(port,termios,oldtermios)</div><div class='hunk'>@@ -228,29 +252,46 @@ hardware.</div><div class='ctx'> 	bits.  Update read_status_mask and ignore_status_mask to indicate</div><div class='ctx'> 	the types of events we are interested in receiving.  Relevant</div><div class='ctx'> 	termios-&gt;c_cflag bits are:</div><div class='del'>-		CSIZE	- word size</div><div class='del'>-		CSTOPB	- 2 stop bits</div><div class='del'>-		PARENB	- parity enable</div><div class='del'>-		PARODD	- odd parity (when PARENB is in force)</div><div class='del'>-		CREAD	- enable reception of characters (if not set,</div><div class='add'>+</div><div class='add'>+		CSIZE</div><div class='add'>+			- word size</div><div class='add'>+		CSTOPB</div><div class='add'>+			- 2 stop bits</div><div class='add'>+		PARENB</div><div class='add'>+			- parity enable</div><div class='add'>+		PARODD</div><div class='add'>+			- odd parity (when PARENB is in force)</div><div class='add'>+		CREAD</div><div class='add'>+			- enable reception of characters (if not set,</div><div class='ctx'> 			  still receive characters from the port, but</div><div class='ctx'> 			  throw them away.</div><div class='del'>-		CRTSCTS	- if set, enable CTS status change reporting</div><div class='del'>-		CLOCAL	- if not set, enable modem status change</div><div class='add'>+		CRTSCTS</div><div class='add'>+			- if set, enable CTS status change reporting</div><div class='add'>+		CLOCAL</div><div class='add'>+			- if not set, enable modem status change</div><div class='ctx'> 			  reporting.</div><div class='add'>+</div><div class='ctx'> 	Relevant termios-&gt;c_iflag bits are:</div><div class='del'>-		INPCK	- enable frame and parity error events to be</div><div class='add'>+</div><div class='add'>+		INPCK</div><div class='add'>+			- enable frame and parity error events to be</div><div class='ctx'> 			  passed to the TTY layer.</div><div class='del'>-		BRKINT</div><div class='del'>-		PARMRK	- both of these enable break events to be</div><div class='add'>+		BRKINT / PARMRK</div><div class='add'>+			- both of these enable break events to be</div><div class='ctx'> 			  passed to the TTY layer.</div><div class='ctx'> </div><div class='del'>-		IGNPAR	- ignore parity and framing errors</div><div class='del'>-		IGNBRK	- ignore break errors,  If IGNPAR is also</div><div class='add'>+		IGNPAR</div><div class='add'>+			- ignore parity and framing errors</div><div class='add'>+		IGNBRK</div><div class='add'>+			- ignore break errors,  If IGNPAR is also</div><div class='ctx'> 			  set, ignore overrun errors as well.</div><div class='add'>+</div><div class='ctx'> 	The interaction of the iflag bits is as follows (parity error</div><div class='ctx'> 	given as an example):</div><div class='add'>+</div><div class='add'>+	=============== ======= ======  =============================</div><div class='ctx'> 	Parity error	INPCK	IGNPAR</div><div class='add'>+	=============== ======= ======  =============================</div><div class='ctx'> 	n/a		0	n/a	character received, marked as</div><div class='ctx'> 					TTY_NORMAL</div><div class='ctx'> 	None		1	n/a	character received, marked as</div><div class='hunk'>@@ -258,16 +299,19 @@ hardware.</div><div class='ctx'> 	Yes		1	0	character received, marked as</div><div class='ctx'> 					TTY_PARITY</div><div class='ctx'> 	Yes		1	1	character discarded</div><div class='add'>+	=============== ======= ======  =============================</div><div class='ctx'> </div><div class='ctx'> 	Other flags may be used (eg, xon/xoff characters) if your</div><div class='ctx'> 	hardware supports hardware "soft" flow control.</div><div class='ctx'> </div><div class='ctx'> 	Locking: caller holds tty_port-&gt;mutex</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   set_ldisc(port,termios)</div><div class='del'>-	Notifier for discipline change. See Documentation/serial/tty.txt.</div><div class='add'>+	Notifier for discipline change. See Documentation/serial/tty.rst.</div><div class='ctx'> </div><div class='ctx'> 	Locking: caller holds tty_port-&gt;mutex</div><div class='ctx'> </div><div class='hunk'>@@ -283,6 +327,7 @@ hardware.</div><div class='ctx'> 	will occur even if CONFIG_PM is not set.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   type(port)</div><div class='hunk'>@@ -291,6 +336,7 @@ hardware.</div><div class='ctx'> 	substituted.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   release_port(port)</div><div class='hunk'>@@ -298,6 +344,7 @@ hardware.</div><div class='ctx'> 	the port.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   request_port(port)</div><div class='hunk'>@@ -306,6 +353,7 @@ hardware.</div><div class='ctx'> 	returns, and it should return -EBUSY on failure.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   config_port(port,type)</div><div class='hunk'>@@ -321,6 +369,7 @@ hardware.</div><div class='ctx'> 	internally hard wired (eg, system on a chip implementations).</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   verify_port(port,serinfo)</div><div class='hunk'>@@ -328,6 +377,7 @@ hardware.</div><div class='ctx'> 	suitable for this port type.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   ioctl(port,cmd,arg)</div><div class='hunk'>@@ -335,6 +385,7 @@ hardware.</div><div class='ctx'> 	using the standard numbering system found in &lt;asm/ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='ctx'> </div><div class='ctx'>   poll_init(port)</div><div class='hunk'>@@ -343,6 +394,7 @@ hardware.</div><div class='ctx'> 	this should not request interrupts.</div><div class='ctx'> </div><div class='ctx'> 	Locking: tty_mutex and tty_port-&gt;mutex taken.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: n/a.</div><div class='ctx'> </div><div class='ctx'>   poll_put_char(port,ch)</div><div class='hunk'>@@ -350,7 +402,9 @@ hardware.</div><div class='ctx'> 	port.  It can and should block until there is space in the TX FIFO.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'>   poll_get_char(port)</div><div class='hunk'>@@ -359,7 +413,9 @@ hardware.</div><div class='ctx'> 	the function should return NO_POLL_CHAR immediately.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: caller dependent.</div><div class='add'>+</div><div class='ctx'> 	This call must not sleep</div><div class='ctx'> </div><div class='ctx'> Other functions</div><div class='hunk'>@@ -370,6 +426,7 @@ uart_update_timeout(port,cflag,baud)</div><div class='ctx'> 	number of bits, parity, stop bits and baud rate.</div><div class='ctx'> </div><div class='ctx'> 	Locking: caller is expected to take port-&gt;lock</div><div class='add'>+</div><div class='ctx'> 	Interrupts: n/a</div><div class='ctx'> </div><div class='ctx'> uart_get_baud_rate(port,termios,old,min,max)</div><div class='hunk'>@@ -385,6 +442,7 @@ uart_get_baud_rate(port,termios,old,min,max)</div><div class='ctx'> 	Note: min..max must always allow 9600 baud to be selected.</div><div class='ctx'> </div><div class='ctx'> 	Locking: caller dependent.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: n/a</div><div class='ctx'> </div><div class='ctx'> uart_get_divisor(port,baud)</div><div class='hunk'>@@ -395,6 +453,7 @@ uart_get_divisor(port,baud)</div><div class='ctx'> 	custom divisor instead.</div><div class='ctx'> </div><div class='ctx'> 	Locking: caller dependent.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: n/a</div><div class='ctx'> </div><div class='ctx'> uart_match_port(port1,port2)</div><div class='hunk'>@@ -402,6 +461,7 @@ uart_match_port(port1,port2)</div><div class='ctx'> 	uart_port structures describe the same port.</div><div class='ctx'> </div><div class='ctx'> 	Locking: n/a</div><div class='add'>+</div><div class='ctx'> 	Interrupts: n/a</div><div class='ctx'> </div><div class='ctx'> uart_write_wakeup(port)</div><div class='hunk'>@@ -409,6 +469,7 @@ uart_write_wakeup(port)</div><div class='ctx'> 	characters in the transmit buffer have dropped below a threshold.</div><div class='ctx'> </div><div class='ctx'> 	Locking: port-&gt;lock should be held.</div><div class='add'>+</div><div class='ctx'> 	Interrupts: n/a</div><div class='ctx'> </div><div class='ctx'> uart_register_driver(drv)</div><div class='hunk'>@@ -419,6 +480,7 @@ uart_register_driver(drv)</div><div class='ctx'> 	registered using uart_add_one_port after this call has succeeded.</div><div class='ctx'> </div><div class='ctx'> 	Locking: none</div><div class='add'>+</div><div class='ctx'> 	Interrupts: enabled</div><div class='ctx'> </div><div class='ctx'> uart_unregister_driver()</div><div class='hunk'>@@ -427,15 +489,16 @@ uart_unregister_driver()</div><div class='ctx'> 	uart_remove_one_port() if it registered them with uart_add_one_port().</div><div class='ctx'> </div><div class='ctx'> 	Locking: none</div><div class='add'>+</div><div class='ctx'> 	Interrupts: enabled</div><div class='ctx'> </div><div class='del'>-uart_suspend_port()</div><div class='add'>+**uart_suspend_port()**</div><div class='ctx'> </div><div class='del'>-uart_resume_port()</div><div class='add'>+**uart_resume_port()**</div><div class='ctx'> </div><div class='del'>-uart_add_one_port()</div><div class='add'>+**uart_add_one_port()**</div><div class='ctx'> </div><div class='del'>-uart_remove_one_port()</div><div class='add'>+**uart_remove_one_port()**</div><div class='ctx'> </div><div class='ctx'> Other notes</div><div class='ctx'> -----------</div><div class='hunk'>@@ -444,7 +507,7 @@ It is intended some day to drop the 'unused' entries from uart_port, and</div><div class='ctx'> allow low level drivers to register their own individual uart_port's with</div><div class='ctx'> the core.  This will allow drivers to use uart_port as a pointer to a</div><div class='ctx'> structure containing both the uart_port entry with their own extensions,</div><div class='del'>-thus:</div><div class='add'>+thus::</div><div class='ctx'> </div><div class='ctx'> 	struct my_port {</div><div class='ctx'> 		struct uart_port	port;</div><div class='hunk'>@@ -459,14 +522,14 @@ Some helpers are provided in order to set/get modem control lines via GPIO.</div><div class='ctx'> mctrl_gpio_init(port, idx):</div><div class='ctx'> 	This will get the {cts,rts,...}-gpios from device tree if they are</div><div class='ctx'> 	present and request them, set direction etc, and return an</div><div class='del'>-	allocated structure. devm_* functions are used, so there's no need</div><div class='add'>+	allocated structure. `devm_*` functions are used, so there's no need</div><div class='ctx'> 	to call mctrl_gpio_free().</div><div class='ctx'> 	As this sets up the irq handling make sure to not handle changes to the</div><div class='ctx'> 	gpio input lines in your driver, too.</div><div class='ctx'> </div><div class='ctx'> mctrl_gpio_free(dev, gpios):</div><div class='ctx'> 	This will free the requested gpios in mctrl_gpio_init().</div><div class='del'>-	As devm_* functions are used, there's generally no need to call</div><div class='add'>+	As `devm_*` functions are used, there's generally no need to call</div><div class='ctx'> 	this function.</div><div class='ctx'> </div><div class='ctx'> mctrl_gpio_to_gpiod(gpios, gidx)</div><div class='head'>diff --git a/Documentation/serial/index.rst b/Documentation/serial/index.rst<br/>new file mode 100644<br/>index 000000000000..d0ba22ea23bf<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/index.rst</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+:orphan:</div><div class='add'>+</div><div class='add'>+==========================</div><div class='add'>+Support for Serial devices</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+    :maxdepth: 1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    driver</div><div class='add'>+    tty</div><div class='add'>+</div><div class='add'>+Serial drivers</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+    :maxdepth: 1</div><div class='add'>+</div><div class='add'>+    cyclades_z</div><div class='add'>+    moxa-smartio</div><div class='add'>+    n_gsm</div><div class='add'>+    rocket</div><div class='add'>+    serial-iso7816</div><div class='add'>+    serial-rs485</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/serial/moxa-smartio b/Documentation/serial/moxa-smartio<br/>deleted file mode 100644<br/>index 5d2a33be0bd8..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/moxa-smartio?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/moxa-smartio</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,523 +0,0 @@</div><div class='del'>-=============================================================================</div><div class='del'>-          MOXA Smartio/Industio Family Device Driver Installation Guide</div><div class='del'>-		    for Linux Kernel 2.4.x, 2.6.x</div><div class='del'>-	       Copyright (C) 2008, Moxa Inc.</div><div class='del'>-=============================================================================</div><div class='del'>-Date: 01/21/2008</div><div class='del'>-</div><div class='del'>-Content</div><div class='del'>-</div><div class='del'>-1. Introduction</div><div class='del'>-2. System Requirement</div><div class='del'>-3. Installation</div><div class='del'>-   3.1 Hardware installation</div><div class='del'>-   3.2 Driver files</div><div class='del'>-   3.3 Device naming convention</div><div class='del'>-   3.4 Module driver configuration</div><div class='del'>-   3.5 Static driver configuration for Linux kernel 2.4.x and 2.6.x.</div><div class='del'>-   3.6 Custom configuration</div><div class='del'>-   3.7 Verify driver installation</div><div class='del'>-4. Utilities</div><div class='del'>-5. Setserial</div><div class='del'>-6. Troubleshooting</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-1. Introduction</div><div class='del'>-</div><div class='del'>-   The Smartio/Industio/UPCI family Linux driver supports following multiport</div><div class='del'>-   boards.</div><div class='del'>-</div><div class='del'>-    - 2 ports multiport board</div><div class='del'>-	CP-102U, CP-102UL, CP-102UF</div><div class='del'>-	CP-132U-I, CP-132UL,</div><div class='del'>-	CP-132, CP-132I, CP132S, CP-132IS,</div><div class='del'>-	CI-132, CI-132I, CI-132IS,</div><div class='del'>-	(C102H, C102HI, C102HIS, C102P, CP-102, CP-102S)</div><div class='del'>-</div><div class='del'>-    - 4 ports multiport board</div><div class='del'>-	CP-104EL,</div><div class='del'>-	CP-104UL, CP-104JU,</div><div class='del'>-	CP-134U, CP-134U-I,</div><div class='del'>-	C104H/PCI, C104HS/PCI,</div><div class='del'>-	CP-114, CP-114I, CP-114S, CP-114IS, CP-114UL,</div><div class='del'>-	C104H, C104HS,</div><div class='del'>-	CI-104J, CI-104JS,</div><div class='del'>-	CI-134, CI-134I, CI-134IS,</div><div class='del'>-	(C114HI, CT-114I, C104P)</div><div class='del'>-	POS-104UL,</div><div class='del'>-	CB-114,</div><div class='del'>-	CB-134I</div><div class='del'>-</div><div class='del'>-    - 8 ports multiport board</div><div class='del'>-	CP-118EL, CP-168EL,</div><div class='del'>-	CP-118U, CP-168U,</div><div class='del'>-	C168H/PCI,</div><div class='del'>-	C168H, C168HS,</div><div class='del'>-	(C168P),</div><div class='del'>-	CB-108</div><div class='del'>-</div><div class='del'>-   This driver and installation procedure have been developed upon Linux Kernel</div><div class='del'>-   2.4.x and 2.6.x. This driver supports Intel x86 hardware platform. In order</div><div class='del'>-   to maintain compatibility, this version has also been properly tested with</div><div class='del'>-   RedHat, Mandrake, Fedora and S.u.S.E Linux. However, if compatibility problem</div><div class='del'>-   occurs, please contact Moxa at support@moxa.com.tw.</div><div class='del'>-</div><div class='del'>-   In addition to device driver, useful utilities are also provided in this</div><div class='del'>-   version. They are</div><div class='del'>-    - msdiag     Diagnostic program for displaying installed Moxa</div><div class='del'>-                 Smartio/Industio boards.</div><div class='del'>-    - msmon      Monitor program to observe data count and line status signals.</div><div class='del'>-    - msterm     A simple terminal program which is useful in testing serial</div><div class='del'>-	         ports.</div><div class='del'>-    - io-irq.exe Configuration program to setup ISA boards. Please note that</div><div class='del'>-                 this program can only be executed under DOS.</div><div class='del'>-</div><div class='del'>-   All the drivers and utilities are published in form of source code under</div><div class='del'>-   GNU General Public License in this version. Please refer to GNU General</div><div class='del'>-   Public License announcement in each source code file for more detail.</div><div class='del'>-</div><div class='del'>-   In Moxa's Web sites, you may always find latest driver at http://www.moxa.com/.</div><div class='del'>-</div><div class='del'>-   This version of driver can be installed as Loadable Module (Module driver)</div><div class='del'>-   or built-in into kernel (Static driver). You may refer to following</div><div class='del'>-   installation procedure for suitable one. Before you install the driver,</div><div class='del'>-   please refer to hardware installation procedure in the User's Manual.</div><div class='del'>-</div><div class='del'>-   We assume the user should be familiar with following documents.</div><div class='del'>-   - Serial-HOWTO</div><div class='del'>-   - Kernel-HOWTO</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-2. System Requirement</div><div class='del'>-   - Hardware platform: Intel x86 machine</div><div class='del'>-   - Kernel version: 2.4.x or 2.6.x</div><div class='del'>-   - gcc version 2.72 or later</div><div class='del'>-   - Maximum 4 boards can be installed in combination</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-3. Installation</div><div class='del'>-</div><div class='del'>-   3.1 Hardware installation</div><div class='del'>-   3.2 Driver files</div><div class='del'>-   3.3 Device naming convention</div><div class='del'>-   3.4 Module driver configuration</div><div class='del'>-   3.5 Static driver configuration for Linux kernel 2.4.x, 2.6.x.</div><div class='del'>-   3.6 Custom configuration</div><div class='del'>-   3.7 Verify driver installation</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   3.1 Hardware installation</div><div class='del'>-</div><div class='del'>-       There are two types of buses, ISA and PCI, for Smartio/Industio</div><div class='del'>-       family multiport board.</div><div class='del'>-</div><div class='del'>-       ISA board</div><div class='del'>-       ---------</div><div class='del'>-       You'll have to configure CAP address, I/O address, Interrupt Vector</div><div class='del'>-       as well as IRQ before installing this driver. Please refer to hardware</div><div class='del'>-       installation procedure in User's Manual before proceed any further.</div><div class='del'>-       Please make sure the JP1 is open after the ISA board is set properly.</div><div class='del'>-</div><div class='del'>-       PCI/UPCI board</div><div class='del'>-       --------------</div><div class='del'>-       You may need to adjust IRQ usage in BIOS to avoid from IRQ conflict</div><div class='del'>-       with other ISA devices. Please refer to hardware installation</div><div class='del'>-       procedure in User's Manual in advance.</div><div class='del'>-</div><div class='del'>-       PCI IRQ Sharing</div><div class='del'>-       -----------</div><div class='del'>-       Each port within the same multiport board shares the same IRQ. Up to</div><div class='del'>-       4 Moxa Smartio/Industio PCI Family multiport boards can be installed</div><div class='del'>-       together on one system and they can share the same IRQ.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   3.2 Driver files</div><div class='del'>-</div><div class='del'>-       The driver file may be obtained from ftp, CD-ROM or floppy disk. The</div><div class='del'>-       first step, anyway, is to copy driver file "mxser.tgz" into specified</div><div class='del'>-       directory. e.g. /moxa. The execute commands as below.</div><div class='del'>-</div><div class='del'>-       # cd /</div><div class='del'>-       # mkdir moxa</div><div class='del'>-       # cd /moxa</div><div class='del'>-       # tar xvf /dev/fd0</div><div class='del'>-</div><div class='del'>-       or</div><div class='del'>-</div><div class='del'>-       # cd /</div><div class='del'>-       # mkdir moxa</div><div class='del'>-       # cd /moxa</div><div class='del'>-       # cp /mnt/cdrom/&lt;driver directory&gt;/mxser.tgz .</div><div class='del'>-       # tar xvfz mxser.tgz</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   3.3 Device naming convention</div><div class='del'>-</div><div class='del'>-       You may find all the driver and utilities files in /moxa/mxser.</div><div class='del'>-       Following installation procedure depends on the model you'd like to</div><div class='del'>-       run the driver. If you prefer module driver, please refer to 3.4.</div><div class='del'>-       If static driver is required, please refer to 3.5.</div><div class='del'>-</div><div class='del'>-       Dialin and callout port</div><div class='del'>-       -----------------------</div><div class='del'>-       This driver remains traditional serial device properties. There are</div><div class='del'>-       two special file name for each serial port. One is dial-in port</div><div class='del'>-       which is named "ttyMxx". For callout port, the naming convention</div><div class='del'>-       is "cumxx".</div><div class='del'>-</div><div class='del'>-       Device naming when more than 2 boards installed</div><div class='del'>-       -----------------------------------------------</div><div class='del'>-       Naming convention for each Smartio/Industio multiport board is</div><div class='del'>-       pre-defined as below.</div><div class='del'>-</div><div class='del'>-       Board Num.	 Dial-in Port	      Callout port</div><div class='del'>-       1st board	ttyM0  - ttyM7	      cum0  - cum7</div><div class='del'>-       2nd board	ttyM8  - ttyM15       cum8  - cum15</div><div class='del'>-       3rd board	ttyM16 - ttyM23       cum16 - cum23</div><div class='del'>-       4th board	ttyM24 - ttym31       cum24 - cum31</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       !!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</div><div class='del'>-       Under Kernel 2.6 the cum Device is Obsolete. So use ttyM*</div><div class='del'>-       device instead.</div><div class='del'>-       !!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</div><div class='del'>-</div><div class='del'>-       Board sequence</div><div class='del'>-       --------------</div><div class='del'>-       This driver will activate ISA boards according to the parameter set</div><div class='del'>-       in the driver. After all specified ISA board activated, PCI board</div><div class='del'>-       will be installed in the system automatically driven.</div><div class='del'>-       Therefore the board number is sorted by the CAP address of ISA boards.</div><div class='del'>-       For PCI boards, their sequence will be after ISA boards and C168H/PCI</div><div class='del'>-       has higher priority than C104H/PCI boards.</div><div class='del'>-</div><div class='del'>-   3.4 Module driver configuration</div><div class='del'>-       Module driver is easiest way to install. If you prefer static driver</div><div class='del'>-       installation, please skip this paragraph.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       ------------- Prepare to use the MOXA driver--------------------</div><div class='del'>-       3.4.1 Create tty device with correct major number</div><div class='del'>-          Before using MOXA driver, your system must have the tty devices</div><div class='del'>-          which are created with driver's major number. We offer one shell</div><div class='del'>-          script "msmknod" to simplify the procedure.</div><div class='del'>-          This step is only needed to be executed once. But you still</div><div class='del'>-          need to do this procedure when:</div><div class='del'>-          a. You change the driver's major number. Please refer the "3.7"</div><div class='del'>-             section.</div><div class='del'>-          b. Your total installed MOXA boards number is changed. Maybe you</div><div class='del'>-             add/delete one MOXA board.</div><div class='del'>-          c. You want to change the tty name. This needs to modify the</div><div class='del'>-             shell script "msmknod"</div><div class='del'>-</div><div class='del'>-          The procedure is:</div><div class='del'>-	  # cd /moxa/mxser/driver</div><div class='del'>-	  # ./msmknod</div><div class='del'>-</div><div class='del'>-          This shell script will require the major number for dial-in</div><div class='del'>-          device and callout device to create tty device. You also need</div><div class='del'>-          to specify the total installed MOXA board number. Default major</div><div class='del'>-          numbers for dial-in device and callout device are 30, 35. If</div><div class='del'>-          you need to change to other number, please refer section "3.7"</div><div class='del'>-          for more detailed procedure.</div><div class='del'>-          Msmknod will delete any special files occupying the same device</div><div class='del'>-          naming.</div><div class='del'>-</div><div class='del'>-       3.4.2 Build the MOXA driver and utilities</div><div class='del'>-          Before using the MOXA driver and utilities, you need compile the</div><div class='del'>-          all the source code. This step is only need to be executed once.</div><div class='del'>-          But you still re-compile the source code if you modify the source</div><div class='del'>-          code. For example, if you change the driver's major number (see</div><div class='del'>-          "3.7" section), then you need to do this step again.</div><div class='del'>-</div><div class='del'>-          Find "Makefile" in /moxa/mxser, then run</div><div class='del'>-</div><div class='del'>-	  # make clean; make install</div><div class='del'>-</div><div class='del'>-          !!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!</div><div class='del'>-	  For Red Hat 9, Red Hat Enterprise Linux AS3/ES3/WS3 &amp; Fedora Core1:</div><div class='del'>-	  # make clean; make installsp1</div><div class='del'>-</div><div class='del'>-	  For Red Hat Enterprise Linux AS4/ES4/WS4:</div><div class='del'>-	  # make clean; make installsp2</div><div class='del'>-          !!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!</div><div class='del'>-</div><div class='del'>-	  The driver files "mxser.o" and utilities will be properly compiled</div><div class='del'>-	  and copied to system directories respectively.</div><div class='del'>-</div><div class='del'>-       ------------- Load MOXA driver--------------------</div><div class='del'>-       3.4.3 Load the MOXA driver</div><div class='del'>-</div><div class='del'>-	  # modprobe mxser &lt;argument&gt;</div><div class='del'>-</div><div class='del'>-	  will activate the module driver. You may run "lsmod" to check</div><div class='del'>-	  if "mxser" is activated. If the MOXA board is ISA board, the</div><div class='del'>-          &lt;argument&gt; is needed. Please refer to section "3.4.5" for more</div><div class='del'>-          information.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       ------------- Load MOXA driver on boot --------------------</div><div class='del'>-       3.4.4 For the above description, you may manually execute</div><div class='del'>-          "modprobe mxser" to activate this driver and run</div><div class='del'>-	  "rmmod mxser" to remove it.</div><div class='del'>-          However, it's better to have a boot time configuration to</div><div class='del'>-          eliminate manual operation. Boot time configuration can be</div><div class='del'>-          achieved by rc file. We offer one "rc.mxser" file to simplify</div><div class='del'>-          the procedure under "moxa/mxser/driver".</div><div class='del'>-</div><div class='del'>-          But if you use ISA board, please modify the "modprobe ..." command</div><div class='del'>-          to add the argument (see "3.4.5" section). After modifying the</div><div class='del'>-          rc.mxser, please try to execute "/moxa/mxser/driver/rc.mxser"</div><div class='del'>-          manually to make sure the modification is ok. If any error</div><div class='del'>-          encountered, please try to modify again. If the modification is</div><div class='del'>-          completed, follow the below step.</div><div class='del'>-</div><div class='del'>-	  Run following command for setting rc files.</div><div class='del'>-</div><div class='del'>-	  # cd /moxa/mxser/driver</div><div class='del'>-	  # cp ./rc.mxser /etc/rc.d</div><div class='del'>-	  # cd /etc/rc.d</div><div class='del'>-</div><div class='del'>-	  Check "rc.serial" is existed or not. If "rc.serial" doesn't exist,</div><div class='del'>-	  create it by vi, run "chmod 755 rc.serial" to change the permission.</div><div class='del'>-	  Add "/etc/rc.d/rc.mxser" in last line,</div><div class='del'>-</div><div class='del'>-          Reboot and check if moxa.o activated by "lsmod" command.</div><div class='del'>-</div><div class='del'>-       3.4.5. If you'd like to drive Smartio/Industio ISA boards in the system,</div><div class='del'>-          you'll have to add parameter to specify CAP address of given</div><div class='del'>-	  board while activating "mxser.o". The format for parameters are</div><div class='del'>-	  as follows.</div><div class='del'>-</div><div class='del'>-	  modprobe mxser ioaddr=0x???,0x???,0x???,0x???</div><div class='del'>-				|      |     |	  |</div><div class='del'>-				|      |     |	  +- 4th ISA board</div><div class='del'>-				|      |     +------ 3rd ISA board</div><div class='del'>-				|      +------------ 2nd ISA board</div><div class='del'>-				+------------------- 1st ISA board</div><div class='del'>-</div><div class='del'>-   3.5 Static driver configuration for Linux kernel 2.4.x and 2.6.x</div><div class='del'>-</div><div class='del'>-       Note: To use static driver, you must install the linux kernel</div><div class='del'>-             source package.</div><div class='del'>-</div><div class='del'>-       3.5.1 Backup the built-in driver in the kernel.</div><div class='del'>-          # cd /usr/src/linux/drivers/char</div><div class='del'>-          # mv mxser.c mxser.c.old</div><div class='del'>-</div><div class='del'>-          For Red Hat 7.x user, you need to create link:</div><div class='del'>-          # cd /usr/src</div><div class='del'>-          # ln -s linux-2.4 linux</div><div class='del'>-</div><div class='del'>-       3.5.2 Create link</div><div class='del'>-	  # cd /usr/src/linux/drivers/char</div><div class='del'>-	  # ln -s /moxa/mxser/driver/mxser.c mxser.c</div><div class='del'>-</div><div class='del'>-       3.5.3 Add CAP address list for ISA boards. For PCI boards user,</div><div class='del'>-          please skip this step.</div><div class='del'>-</div><div class='del'>-	  In module mode, the CAP address for ISA board is given by</div><div class='del'>-	  parameter. In static driver configuration, you'll have to</div><div class='del'>-	  assign it within driver's source code. If you will not</div><div class='del'>-	  install any ISA boards, you may skip to next portion.</div><div class='del'>-	  The instructions to modify driver source code are as</div><div class='del'>-	  below.</div><div class='del'>-	  a. # cd /moxa/mxser/driver</div><div class='del'>-	     # vi mxser.c</div><div class='del'>-	  b. Find the array mxserBoardCAP[] as below.</div><div class='del'>-</div><div class='del'>-	     static int mxserBoardCAP[]</div><div class='del'>-	     = {0x00, 0x00, 0x00, 0x00};</div><div class='del'>-</div><div class='del'>-	  c. Change the address within this array using vi. For</div><div class='del'>-	     example, to driver 2 ISA boards with CAP address</div><div class='del'>-	     0x280 and 0x180 as 1st and 2nd board. Just to change</div><div class='del'>-	     the source code as follows.</div><div class='del'>-</div><div class='del'>-	     static int mxserBoardCAP[]</div><div class='del'>-	     = {0x280, 0x180, 0x00, 0x00};</div><div class='del'>-</div><div class='del'>-       3.5.4 Setup kernel configuration</div><div class='del'>-</div><div class='del'>-          Configure the kernel:</div><div class='del'>-</div><div class='del'>-            # cd /usr/src/linux</div><div class='del'>-            # make menuconfig</div><div class='del'>-</div><div class='del'>-          You will go into a menu-driven system. Please select [Character</div><div class='del'>-          devices][Non-standard serial port support], enable the [Moxa</div><div class='del'>-          SmartIO support] driver with "[*]" for built-in (not "[M]"), then</div><div class='del'>-          select [Exit] to exit this program.</div><div class='del'>-</div><div class='del'>-       3.5.5 Rebuild kernel</div><div class='del'>-	  The following are for Linux kernel rebuilding, for your</div><div class='del'>-          reference only.</div><div class='del'>-	  For appropriate details, please refer to the Linux document.</div><div class='del'>-</div><div class='del'>-	   a. cd /usr/src/linux</div><div class='del'>-	   b. make clean	     /* take a few minutes */</div><div class='del'>-	   c. make dep		     /* take a few minutes */</div><div class='del'>-	   d. make bzImage	     /* take probably 10-20 minutes */</div><div class='del'>-	   e. make install	     /* copy boot image to correct position */</div><div class='del'>-	   f. Please make sure the boot kernel (vmlinuz) is in the</div><div class='del'>-	      correct position.</div><div class='del'>-	   g. If you use 'lilo' utility, you should check /etc/lilo.conf</div><div class='del'>-	      'image' item specified the path which is the 'vmlinuz' path,</div><div class='del'>-	      or you will load wrong (or old) boot kernel image (vmlinuz).</div><div class='del'>-	      After checking /etc/lilo.conf, please run "lilo".</div><div class='del'>-</div><div class='del'>-	  Note that if the result of "make bzImage" is ERROR, then you have to</div><div class='del'>-	  go back to Linux configuration Setup. Type "make menuconfig" in</div><div class='del'>-          directory /usr/src/linux.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       3.5.6 Make tty device and special file</div><div class='del'>-          # cd /moxa/mxser/driver</div><div class='del'>-          # ./msmknod</div><div class='del'>-</div><div class='del'>-       3.5.7 Make utility</div><div class='del'>-	  # cd /moxa/mxser/utility</div><div class='del'>-	  # make clean; make install</div><div class='del'>-</div><div class='del'>-       3.5.8 Reboot</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   3.6 Custom configuration</div><div class='del'>-       Although this driver already provides you default configuration, you</div><div class='del'>-       still can change the device name and major number. The instruction to</div><div class='del'>-       change these parameters are shown as below.</div><div class='del'>-</div><div class='del'>-       Change Device name</div><div class='del'>-       ------------------</div><div class='del'>-       If you'd like to use other device names instead of default naming</div><div class='del'>-       convention, all you have to do is to modify the internal code</div><div class='del'>-       within the shell script "msmknod". First, you have to open "msmknod"</div><div class='del'>-       by vi. Locate each line contains "ttyM" and "cum" and change them</div><div class='del'>-       to the device name you desired. "msmknod" creates the device names</div><div class='del'>-       you need next time executed.</div><div class='del'>-</div><div class='del'>-       Change Major number</div><div class='del'>-       -------------------</div><div class='del'>-       If major number 30 and 35 had been occupied, you may have to select</div><div class='del'>-       2 free major numbers for this driver. There are 3 steps to change</div><div class='del'>-       major numbers.</div><div class='del'>-</div><div class='del'>-       3.6.1 Find free major numbers</div><div class='del'>-	  In /proc/devices, you may find all the major numbers occupied</div><div class='del'>-	  in the system. Please select 2 major numbers that are available.</div><div class='del'>-	  e.g. 40, 45.</div><div class='del'>-       3.6.2 Create special files</div><div class='del'>-	  Run /moxa/mxser/driver/msmknod to create special files with</div><div class='del'>-	  specified major numbers.</div><div class='del'>-       3.6.3 Modify driver with new major number</div><div class='del'>-	  Run vi to open /moxa/mxser/driver/mxser.c. Locate the line</div><div class='del'>-	  contains "MXSERMAJOR". Change the content as below.</div><div class='del'>-	  #define	  MXSERMAJOR		  40</div><div class='del'>-	  #define	  MXSERCUMAJOR		  45</div><div class='del'>-       3.6.4 Run "make clean; make install" in /moxa/mxser/driver.</div><div class='del'>-</div><div class='del'>-   3.7 Verify driver installation</div><div class='del'>-       You may refer to /var/log/messages to check the latest status</div><div class='del'>-       log reported by this driver whenever it's activated.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-4. Utilities</div><div class='del'>-   There are 3 utilities contained in this driver. They are msdiag, msmon and</div><div class='del'>-   msterm. These 3 utilities are released in form of source code. They should</div><div class='del'>-   be compiled into executable file and copied into /usr/bin.</div><div class='del'>-</div><div class='del'>-   Before using these utilities, please load driver (refer 3.4 &amp; 3.5) and</div><div class='del'>-   make sure you had run the "msmknod" utility.</div><div class='del'>-</div><div class='del'>-   msdiag - Diagnostic</div><div class='del'>-   --------------------</div><div class='del'>-   This utility provides the function to display what Moxa Smartio/Industio</div><div class='del'>-   board found by driver in the system.</div><div class='del'>-</div><div class='del'>-   msmon - Port Monitoring</div><div class='del'>-   -----------------------</div><div class='del'>-   This utility gives the user a quick view about all the MOXA ports'</div><div class='del'>-   activities. One can easily learn each port's total received/transmitted</div><div class='del'>-   (Rx/Tx) character count since the time when the monitoring is started.</div><div class='del'>-   Rx/Tx throughputs per second are also reported in interval basis (e.g.</div><div class='del'>-   the last 5 seconds) and in average basis (since the time the monitoring</div><div class='del'>-   is started). You can reset all ports' count by &lt;HOME&gt; key. &lt;+&gt; &lt;-&gt;</div><div class='del'>-   (plus/minus) keys to change the displaying time interval. Press &lt;ENTER&gt;</div><div class='del'>-   on the port, that cursor stay, to view the port's communication</div><div class='del'>-   parameters, signal status, and input/output queue.</div><div class='del'>-</div><div class='del'>-   msterm - Terminal Emulation</div><div class='del'>-   ---------------------------</div><div class='del'>-   This utility provides data sending and receiving ability of all tty ports,</div><div class='del'>-   especially for MOXA ports. It is quite useful for testing simple</div><div class='del'>-   application, for example, sending AT command to a modem connected to the</div><div class='del'>-   port or used as a terminal for login purpose. Note that this is only a</div><div class='del'>-   dumb terminal emulation without handling full screen operation.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-5. Setserial</div><div class='del'>-</div><div class='del'>-   Supported Setserial parameters are listed as below.</div><div class='del'>-</div><div class='del'>-   uart		  set UART type(16450--&gt;disable FIFO, 16550A--&gt;enable FIFO)</div><div class='del'>-   close_delay	  set the amount of time(in 1/100 of a second) that DTR</div><div class='del'>-		  should be kept low while being closed.</div><div class='del'>-   closing_wait   set the amount of time(in 1/100 of a second) that the</div><div class='del'>-		  serial port should wait for data to be drained while</div><div class='del'>-		  being closed, before the receiver is disable.</div><div class='del'>-   spd_hi	  Use  57.6kb  when  the application requests 38.4kb.</div><div class='del'>-   spd_vhi	  Use  115.2kb	when  the application requests 38.4kb.</div><div class='del'>-   spd_shi	  Use  230.4kb	when  the application requests 38.4kb.</div><div class='del'>-   spd_warp	  Use  460.8kb	when  the application requests 38.4kb.</div><div class='del'>-   spd_normal	  Use  38.4kb  when  the application requests 38.4kb.</div><div class='del'>-   spd_cust	  Use  the custom divisor to set the speed when  the</div><div class='del'>-		  application requests 38.4kb.</div><div class='del'>-   divisor	  This option set the custom division.</div><div class='del'>-   baud_base	  This option set the base baud rate.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-6. Troubleshooting</div><div class='del'>-</div><div class='del'>-   The boot time error messages and solutions are stated as clearly as</div><div class='del'>-   possible. If all the possible solutions fail, please contact our technical</div><div class='del'>-   support team to get more help.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   Error msg: More than 4 Moxa Smartio/Industio family boards found. Fifth board</div><div class='del'>-              and after are ignored.</div><div class='del'>-   Solution:</div><div class='del'>-   To avoid this problem, please unplug fifth and after board, because Moxa</div><div class='del'>-   driver supports up to 4 boards.</div><div class='del'>-</div><div class='del'>-   Error msg: Request_irq fail, IRQ(?) may be conflict with another device.</div><div class='del'>-   Solution:</div><div class='del'>-   Other PCI or ISA devices occupy the assigned IRQ. If you are not sure</div><div class='del'>-   which device causes the situation, please check /proc/interrupts to find</div><div class='del'>-   free IRQ and simply change another free IRQ for Moxa board.</div><div class='del'>-</div><div class='del'>-   Error msg: Board #: C1xx Series(CAP=xxx) interrupt number invalid.</div><div class='del'>-   Solution:</div><div class='del'>-   Each port within the same multiport board shares the same IRQ. Please set</div><div class='del'>-   one IRQ (IRQ doesn't equal to zero) for one Moxa board.</div><div class='del'>-</div><div class='del'>-   Error msg: No interrupt vector be set for Moxa ISA board(CAP=xxx).</div><div class='del'>-   Solution:</div><div class='del'>-   Moxa ISA board needs an interrupt vector.Please refer to user's manual</div><div class='del'>-   "Hardware Installation" chapter to set interrupt vector.</div><div class='del'>-</div><div class='del'>-   Error msg: Couldn't install MOXA Smartio/Industio family driver!</div><div class='del'>-   Solution:</div><div class='del'>-   Load Moxa driver fail, the major number may conflict with other devices.</div><div class='del'>-   Please refer to previous section 3.7 to change a free major number for</div><div class='del'>-   Moxa driver.</div><div class='del'>-</div><div class='del'>-   Error msg: Couldn't install MOXA Smartio/Industio family callout driver!</div><div class='del'>-   Solution:</div><div class='del'>-   Load Moxa callout driver fail, the callout device major number may</div><div class='del'>-   conflict with other devices. Please refer to previous section 3.7 to</div><div class='del'>-   change a free callout device major number for Moxa driver.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/serial/moxa-smartio.rst b/Documentation/serial/moxa-smartio.rst<br/>new file mode 100644<br/>index 000000000000..156100f17c3f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/moxa-smartio.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/moxa-smartio.rst</a></div><div class='hunk'>@@ -0,0 +1,615 @@</div><div class='add'>+=============================================================</div><div class='add'>+MOXA Smartio/Industio Family Device Driver Installation Guide</div><div class='add'>+=============================================================</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   This file is outdated. It needs some care in order to make it</div><div class='add'>+   updated to Kernel 5.0 and upper</div><div class='add'>+</div><div class='add'>+Copyright (C) 2008, Moxa Inc.</div><div class='add'>+</div><div class='add'>+Date: 01/21/2008</div><div class='add'>+</div><div class='add'>+.. Content</div><div class='add'>+</div><div class='add'>+   1. Introduction</div><div class='add'>+   2. System Requirement</div><div class='add'>+   3. Installation</div><div class='add'>+      3.1 Hardware installation</div><div class='add'>+      3.2 Driver files</div><div class='add'>+      3.3 Device naming convention</div><div class='add'>+      3.4 Module driver configuration</div><div class='add'>+      3.5 Static driver configuration for Linux kernel 2.4.x and 2.6.x.</div><div class='add'>+      3.6 Custom configuration</div><div class='add'>+      3.7 Verify driver installation</div><div class='add'>+   4. Utilities</div><div class='add'>+   5. Setserial</div><div class='add'>+   6. Troubleshooting</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+   The Smartio/Industio/UPCI family Linux driver supports following multiport</div><div class='add'>+   boards.</div><div class='add'>+</div><div class='add'>+    - 2 ports multiport board</div><div class='add'>+	CP-102U, CP-102UL, CP-102UF</div><div class='add'>+	CP-132U-I, CP-132UL,</div><div class='add'>+	CP-132, CP-132I, CP132S, CP-132IS,</div><div class='add'>+	CI-132, CI-132I, CI-132IS,</div><div class='add'>+	(C102H, C102HI, C102HIS, C102P, CP-102, CP-102S)</div><div class='add'>+</div><div class='add'>+    - 4 ports multiport board</div><div class='add'>+	CP-104EL,</div><div class='add'>+	CP-104UL, CP-104JU,</div><div class='add'>+	CP-134U, CP-134U-I,</div><div class='add'>+	C104H/PCI, C104HS/PCI,</div><div class='add'>+	CP-114, CP-114I, CP-114S, CP-114IS, CP-114UL,</div><div class='add'>+	C104H, C104HS,</div><div class='add'>+	CI-104J, CI-104JS,</div><div class='add'>+	CI-134, CI-134I, CI-134IS,</div><div class='add'>+	(C114HI, CT-114I, C104P),</div><div class='add'>+	POS-104UL,</div><div class='add'>+	CB-114,</div><div class='add'>+	CB-134I</div><div class='add'>+</div><div class='add'>+    - 8 ports multiport board</div><div class='add'>+	CP-118EL, CP-168EL,</div><div class='add'>+	CP-118U, CP-168U,</div><div class='add'>+	C168H/PCI,</div><div class='add'>+	C168H, C168HS,</div><div class='add'>+	(C168P),</div><div class='add'>+	CB-108</div><div class='add'>+</div><div class='add'>+   This driver and installation procedure have been developed upon Linux Kernel</div><div class='add'>+   2.4.x and 2.6.x. This driver supports Intel x86 hardware platform. In order</div><div class='add'>+   to maintain compatibility, this version has also been properly tested with</div><div class='add'>+   RedHat, Mandrake, Fedora and S.u.S.E Linux. However, if compatibility problem</div><div class='add'>+   occurs, please contact Moxa at support@moxa.com.tw.</div><div class='add'>+</div><div class='add'>+   In addition to device driver, useful utilities are also provided in this</div><div class='add'>+   version. They are:</div><div class='add'>+</div><div class='add'>+    - msdiag</div><div class='add'>+		 Diagnostic program for displaying installed Moxa</div><div class='add'>+                 Smartio/Industio boards.</div><div class='add'>+    - msmon</div><div class='add'>+		 Monitor program to observe data count and line status signals.</div><div class='add'>+    - msterm     A simple terminal program which is useful in testing serial</div><div class='add'>+	         ports.</div><div class='add'>+    - io-irq.exe</div><div class='add'>+		 Configuration program to setup ISA boards. Please note that</div><div class='add'>+                 this program can only be executed under DOS.</div><div class='add'>+</div><div class='add'>+   All the drivers and utilities are published in form of source code under</div><div class='add'>+   GNU General Public License in this version. Please refer to GNU General</div><div class='add'>+   Public License announcement in each source code file for more detail.</div><div class='add'>+</div><div class='add'>+   In Moxa's Web sites, you may always find latest driver at http://www.moxa.com/.</div><div class='add'>+</div><div class='add'>+   This version of driver can be installed as Loadable Module (Module driver)</div><div class='add'>+   or built-in into kernel (Static driver). You may refer to following</div><div class='add'>+   installation procedure for suitable one. Before you install the driver,</div><div class='add'>+   please refer to hardware installation procedure in the User's Manual.</div><div class='add'>+</div><div class='add'>+   We assume the user should be familiar with following documents.</div><div class='add'>+</div><div class='add'>+   - Serial-HOWTO</div><div class='add'>+   - Kernel-HOWTO</div><div class='add'>+</div><div class='add'>+2. System Requirement</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+   - Hardware platform: Intel x86 machine</div><div class='add'>+   - Kernel version: 2.4.x or 2.6.x</div><div class='add'>+   - gcc version 2.72 or later</div><div class='add'>+   - Maximum 4 boards can be installed in combination</div><div class='add'>+</div><div class='add'>+3. Installation</div><div class='add'>+^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+3.1 Hardware installation</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+   There are two types of buses, ISA and PCI, for Smartio/Industio</div><div class='add'>+   family multiport board.</div><div class='add'>+</div><div class='add'>+ISA board</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+   You'll have to configure CAP address, I/O address, Interrupt Vector</div><div class='add'>+   as well as IRQ before installing this driver. Please refer to hardware</div><div class='add'>+   installation procedure in User's Manual before proceed any further.</div><div class='add'>+   Please make sure the JP1 is open after the ISA board is set properly.</div><div class='add'>+</div><div class='add'>+PCI/UPCI board</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+   You may need to adjust IRQ usage in BIOS to avoid from IRQ conflict</div><div class='add'>+   with other ISA devices. Please refer to hardware installation</div><div class='add'>+   procedure in User's Manual in advance.</div><div class='add'>+</div><div class='add'>+PCI IRQ Sharing</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+   Each port within the same multiport board shares the same IRQ. Up to</div><div class='add'>+   4 Moxa Smartio/Industio PCI Family multiport boards can be installed</div><div class='add'>+   together on one system and they can share the same IRQ.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.2 Driver files</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+   The driver file may be obtained from ftp, CD-ROM or floppy disk. The</div><div class='add'>+   first step, anyway, is to copy driver file "mxser.tgz" into specified</div><div class='add'>+   directory. e.g. /moxa. The execute commands as below::</div><div class='add'>+</div><div class='add'>+       # cd /</div><div class='add'>+       # mkdir moxa</div><div class='add'>+       # cd /moxa</div><div class='add'>+       # tar xvf /dev/fd0</div><div class='add'>+</div><div class='add'>+or::</div><div class='add'>+</div><div class='add'>+       # cd /</div><div class='add'>+       # mkdir moxa</div><div class='add'>+       # cd /moxa</div><div class='add'>+       # cp /mnt/cdrom/&lt;driver directory&gt;/mxser.tgz .</div><div class='add'>+       # tar xvfz mxser.tgz</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.3 Device naming convention</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+   You may find all the driver and utilities files in /moxa/mxser.</div><div class='add'>+   Following installation procedure depends on the model you'd like to</div><div class='add'>+   run the driver. If you prefer module driver, please refer to 3.4.</div><div class='add'>+   If static driver is required, please refer to 3.5.</div><div class='add'>+</div><div class='add'>+Dialin and callout port</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+   This driver remains traditional serial device properties. There are</div><div class='add'>+   two special file name for each serial port. One is dial-in port</div><div class='add'>+   which is named "ttyMxx". For callout port, the naming convention</div><div class='add'>+   is "cumxx".</div><div class='add'>+</div><div class='add'>+Device naming when more than 2 boards installed</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+   Naming convention for each Smartio/Industio multiport board is</div><div class='add'>+   pre-defined as below.</div><div class='add'>+</div><div class='add'>+   ============ ===============       ==============</div><div class='add'>+   Board Num.	 Dial-in Port	      Callout port</div><div class='add'>+   1st board	ttyM0  - ttyM7	      cum0  - cum7</div><div class='add'>+   2nd board	ttyM8  - ttyM15       cum8  - cum15</div><div class='add'>+   3rd board	ttyM16 - ttyM23       cum16 - cum23</div><div class='add'>+   4th board	ttyM24 - ttym31       cum24 - cum31</div><div class='add'>+   ============ ===============       ==============</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   Under Kernel 2.6 and upper, the cum Device is Obsolete. So use ttyM*</div><div class='add'>+   device instead.</div><div class='add'>+</div><div class='add'>+Board sequence</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+   This driver will activate ISA boards according to the parameter set</div><div class='add'>+   in the driver. After all specified ISA board activated, PCI board</div><div class='add'>+   will be installed in the system automatically driven.</div><div class='add'>+   Therefore the board number is sorted by the CAP address of ISA boards.</div><div class='add'>+   For PCI boards, their sequence will be after ISA boards and C168H/PCI</div><div class='add'>+   has higher priority than C104H/PCI boards.</div><div class='add'>+</div><div class='add'>+3.4 Module driver configuration</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+   Module driver is easiest way to install. If you prefer static driver</div><div class='add'>+   installation, please skip this paragraph.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   ------------- Prepare to use the MOXA driver --------------------</div><div class='add'>+</div><div class='add'>+3.4.1 Create tty device with correct major number</div><div class='add'>+-------------------------------------------------</div><div class='add'>+</div><div class='add'>+   Before using MOXA driver, your system must have the tty devices</div><div class='add'>+   which are created with driver's major number. We offer one shell</div><div class='add'>+   script "msmknod" to simplify the procedure.</div><div class='add'>+   This step is only needed to be executed once. But you still</div><div class='add'>+   need to do this procedure when:</div><div class='add'>+</div><div class='add'>+   a. You change the driver's major number. Please refer the "3.7"</div><div class='add'>+      section.</div><div class='add'>+   b. Your total installed MOXA boards number is changed. Maybe you</div><div class='add'>+      add/delete one MOXA board.</div><div class='add'>+   c. You want to change the tty name. This needs to modify the</div><div class='add'>+      shell script "msmknod"</div><div class='add'>+</div><div class='add'>+   The procedure is::</div><div class='add'>+</div><div class='add'>+	 # cd /moxa/mxser/driver</div><div class='add'>+	 # ./msmknod</div><div class='add'>+</div><div class='add'>+   This shell script will require the major number for dial-in</div><div class='add'>+   device and callout device to create tty device. You also need</div><div class='add'>+   to specify the total installed MOXA board number. Default major</div><div class='add'>+   numbers for dial-in device and callout device are 30, 35. If</div><div class='add'>+   you need to change to other number, please refer section "3.7"</div><div class='add'>+   for more detailed procedure.</div><div class='add'>+   Msmknod will delete any special files occupying the same device</div><div class='add'>+   naming.</div><div class='add'>+</div><div class='add'>+3.4.2 Build the MOXA driver and utilities</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+   Before using the MOXA driver and utilities, you need compile the</div><div class='add'>+   all the source code. This step is only need to be executed once.</div><div class='add'>+   But you still re-compile the source code if you modify the source</div><div class='add'>+   code. For example, if you change the driver's major number (see</div><div class='add'>+   "3.7" section), then you need to do this step again.</div><div class='add'>+</div><div class='add'>+   Find "Makefile" in /moxa/mxser, then run</div><div class='add'>+</div><div class='add'>+	 # make clean; make install</div><div class='add'>+</div><div class='add'>+   ..note::</div><div class='add'>+</div><div class='add'>+	 For Red Hat 9, Red Hat Enterprise Linux AS3/ES3/WS3 &amp; Fedora Core1:</div><div class='add'>+	 # make clean; make installsp1</div><div class='add'>+</div><div class='add'>+	 For Red Hat Enterprise Linux AS4/ES4/WS4:</div><div class='add'>+	 # make clean; make installsp2</div><div class='add'>+</div><div class='add'>+   The driver files "mxser.o" and utilities will be properly compiled</div><div class='add'>+   and copied to system directories respectively.</div><div class='add'>+</div><div class='add'>+------------- Load MOXA driver--------------------</div><div class='add'>+</div><div class='add'>+3.4.3 Load the MOXA driver</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+   ::</div><div class='add'>+</div><div class='add'>+	 # modprobe mxser &lt;argument&gt;</div><div class='add'>+</div><div class='add'>+   will activate the module driver. You may run "lsmod" to check</div><div class='add'>+   if "mxser" is activated. If the MOXA board is ISA board, the</div><div class='add'>+   &lt;argument&gt; is needed. Please refer to section "3.4.5" for more</div><div class='add'>+   information.</div><div class='add'>+</div><div class='add'>+------------- Load MOXA driver on boot --------------------</div><div class='add'>+</div><div class='add'>+3.4.4 Load the mxser driver</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   For the above description, you may manually execute</div><div class='add'>+   "modprobe mxser" to activate this driver and run</div><div class='add'>+   "rmmod mxser" to remove it.</div><div class='add'>+</div><div class='add'>+   However, it's better to have a boot time configuration to</div><div class='add'>+   eliminate manual operation. Boot time configuration can be</div><div class='add'>+   achieved by rc file. We offer one "rc.mxser" file to simplify</div><div class='add'>+   the procedure under "moxa/mxser/driver".</div><div class='add'>+</div><div class='add'>+   But if you use ISA board, please modify the "modprobe ..." command</div><div class='add'>+   to add the argument (see "3.4.5" section). After modifying the</div><div class='add'>+   rc.mxser, please try to execute "/moxa/mxser/driver/rc.mxser"</div><div class='add'>+   manually to make sure the modification is ok. If any error</div><div class='add'>+   encountered, please try to modify again. If the modification is</div><div class='add'>+   completed, follow the below step.</div><div class='add'>+</div><div class='add'>+   Run following command for setting rc files::</div><div class='add'>+</div><div class='add'>+	 # cd /moxa/mxser/driver</div><div class='add'>+	 # cp ./rc.mxser /etc/rc.d</div><div class='add'>+	 # cd /etc/rc.d</div><div class='add'>+</div><div class='add'>+   Check "rc.serial" is existed or not. If "rc.serial" doesn't exist,</div><div class='add'>+   create it by vi, run "chmod 755 rc.serial" to change the permission.</div><div class='add'>+</div><div class='add'>+   Add "/etc/rc.d/rc.mxser" in last line.</div><div class='add'>+</div><div class='add'>+   Reboot and check if moxa.o activated by "lsmod" command.</div><div class='add'>+</div><div class='add'>+3.4.5. specify CAP address</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+   If you'd like to drive Smartio/Industio ISA boards in the system,</div><div class='add'>+   you'll have to add parameter to specify CAP address of given</div><div class='add'>+   board while activating "mxser.o". The format for parameters are</div><div class='add'>+   as follows.::</div><div class='add'>+</div><div class='add'>+	   modprobe mxser ioaddr=0x???,0x???,0x???,0x???</div><div class='add'>+				  |  |  |    |</div><div class='add'>+				  |  |  |    +- 4th ISA board</div><div class='add'>+				  |  |  +------ 3rd ISA board</div><div class='add'>+				  |  +------------ 2nd ISA board</div><div class='add'>+				  +-------------------1st ISA board</div><div class='add'>+</div><div class='add'>+3.5 Static driver configuration for Linux kernel 2.4.x and 2.6.x</div><div class='add'>+================================================================</div><div class='add'>+</div><div class='add'>+    Note:</div><div class='add'>+          To use static driver, you must install the linux kernel</div><div class='add'>+          source package.</div><div class='add'>+</div><div class='add'>+3.5.1 Backup the built-in driver in the kernel</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+       # cd /usr/src/linux/drivers/char</div><div class='add'>+       # mv mxser.c mxser.c.old</div><div class='add'>+</div><div class='add'>+       For Red Hat 7.x user, you need to create link:</div><div class='add'>+       # cd /usr/src</div><div class='add'>+       # ln -s linux-2.4 linux</div><div class='add'>+</div><div class='add'>+3.5.2 Create link</div><div class='add'>+-----------------</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+	  # cd /usr/src/linux/drivers/char</div><div class='add'>+	  # ln -s /moxa/mxser/driver/mxser.c mxser.c</div><div class='add'>+</div><div class='add'>+3.5.3 Add CAP address list for ISA boards.</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+    For PCI boards user, please skip this step.</div><div class='add'>+</div><div class='add'>+    In module mode, the CAP address for ISA board is given by</div><div class='add'>+    parameter. In static driver configuration, you'll have to</div><div class='add'>+    assign it within driver's source code. If you will not</div><div class='add'>+    install any ISA boards, you may skip to next portion.</div><div class='add'>+    The instructions to modify driver source code are as</div><div class='add'>+    below.</div><div class='add'>+</div><div class='add'>+    a. run::</div><div class='add'>+</div><div class='add'>+	# cd /moxa/mxser/driver</div><div class='add'>+	# vi mxser.c</div><div class='add'>+</div><div class='add'>+    b. Find the array mxserBoardCAP[] as below::</div><div class='add'>+</div><div class='add'>+	  static int mxserBoardCAP[] = {0x00, 0x00, 0x00, 0x00};</div><div class='add'>+</div><div class='add'>+    c. Change the address within this array using vi. For</div><div class='add'>+       example, to driver 2 ISA boards with CAP address</div><div class='add'>+       0x280 and 0x180 as 1st and 2nd board. Just to change</div><div class='add'>+       the source code as follows::</div><div class='add'>+</div><div class='add'>+	  static int mxserBoardCAP[] = {0x280, 0x180, 0x00, 0x00};</div><div class='add'>+</div><div class='add'>+3.5.4 Setup kernel configuration</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+    Configure the kernel::</div><div class='add'>+</div><div class='add'>+      # cd /usr/src/linux</div><div class='add'>+      # make menuconfig</div><div class='add'>+</div><div class='add'>+    You will go into a menu-driven system. Please select [Character</div><div class='add'>+    devices][Non-standard serial port support], enable the [Moxa</div><div class='add'>+    SmartIO support] driver with "[*]" for built-in (not "[M]"), then</div><div class='add'>+    select [Exit] to exit this program.</div><div class='add'>+</div><div class='add'>+3.5.5 Rebuild kernel</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+    The following are for Linux kernel rebuilding, for your</div><div class='add'>+    reference only.</div><div class='add'>+</div><div class='add'>+    For appropriate details, please refer to the Linux document:</div><div class='add'>+</div><div class='add'>+        a. Run the following commands::</div><div class='add'>+</div><div class='add'>+	     cd /usr/src/linux</div><div class='add'>+	     make clean		     # take a few minutes</div><div class='add'>+	     make dep		     # take a few minutes</div><div class='add'>+	     make bzImage	     # take probably 10-20 minutes</div><div class='add'>+	     make install	     # copy boot image to correct position</div><div class='add'>+</div><div class='add'>+	f. Please make sure the boot kernel (vmlinuz) is in the</div><div class='add'>+	   correct position.</div><div class='add'>+	g. If you use 'lilo' utility, you should check /etc/lilo.conf</div><div class='add'>+	   'image' item specified the path which is the 'vmlinuz' path,</div><div class='add'>+	   or you will load wrong (or old) boot kernel image (vmlinuz).</div><div class='add'>+	   After checking /etc/lilo.conf, please run "lilo".</div><div class='add'>+</div><div class='add'>+	  Note that if the result of "make bzImage" is ERROR, then you have to</div><div class='add'>+	  go back to Linux configuration Setup. Type "make menuconfig" in</div><div class='add'>+          directory /usr/src/linux.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.5.6 Make tty device and special file</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+       # cd /moxa/mxser/driver</div><div class='add'>+       # ./msmknod</div><div class='add'>+</div><div class='add'>+3.5.7 Make utility</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+	  # cd /moxa/mxser/utility</div><div class='add'>+	  # make clean; make install</div><div class='add'>+</div><div class='add'>+3.5.8 Reboot</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3.6 Custom configuration</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+    Although this driver already provides you default configuration, you</div><div class='add'>+    still can change the device name and major number. The instruction to</div><div class='add'>+    change these parameters are shown as below.</div><div class='add'>+</div><div class='add'>+a. Change Device name</div><div class='add'>+</div><div class='add'>+    If you'd like to use other device names instead of default naming</div><div class='add'>+    convention, all you have to do is to modify the internal code</div><div class='add'>+    within the shell script "msmknod". First, you have to open "msmknod"</div><div class='add'>+    by vi. Locate each line contains "ttyM" and "cum" and change them</div><div class='add'>+    to the device name you desired. "msmknod" creates the device names</div><div class='add'>+    you need next time executed.</div><div class='add'>+</div><div class='add'>+b. Change Major number</div><div class='add'>+</div><div class='add'>+    If major number 30 and 35 had been occupied, you may have to select</div><div class='add'>+    2 free major numbers for this driver. There are 3 steps to change</div><div class='add'>+    major numbers.</div><div class='add'>+</div><div class='add'>+3.6.1 Find free major numbers</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+    In /proc/devices, you may find all the major numbers occupied</div><div class='add'>+    in the system. Please select 2 major numbers that are available.</div><div class='add'>+    e.g. 40, 45.</div><div class='add'>+</div><div class='add'>+3.6.2 Create special files</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+   Run /moxa/mxser/driver/msmknod to create special files with</div><div class='add'>+   specified major numbers.</div><div class='add'>+</div><div class='add'>+3.6.3 Modify driver with new major number</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+   Run vi to open /moxa/mxser/driver/mxser.c. Locate the line</div><div class='add'>+   contains "MXSERMAJOR". Change the content as below::</div><div class='add'>+</div><div class='add'>+	  #define	  MXSERMAJOR		  40</div><div class='add'>+	  #define	  MXSERCUMAJOR		  45</div><div class='add'>+</div><div class='add'>+    3.6.4 Run "make clean; make install" in /moxa/mxser/driver.</div><div class='add'>+</div><div class='add'>+3.7 Verify driver installation</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+    You may refer to /var/log/messages to check the latest status</div><div class='add'>+    log reported by this driver whenever it's activated.</div><div class='add'>+</div><div class='add'>+4. Utilities</div><div class='add'>+^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+   There are 3 utilities contained in this driver. They are msdiag, msmon and</div><div class='add'>+   msterm. These 3 utilities are released in form of source code. They should</div><div class='add'>+   be compiled into executable file and copied into /usr/bin.</div><div class='add'>+</div><div class='add'>+   Before using these utilities, please load driver (refer 3.4 &amp; 3.5) and</div><div class='add'>+   make sure you had run the "msmknod" utility.</div><div class='add'>+</div><div class='add'>+msdiag - Diagnostic</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+   This utility provides the function to display what Moxa Smartio/Industio</div><div class='add'>+   board found by driver in the system.</div><div class='add'>+</div><div class='add'>+msmon - Port Monitoring</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+   This utility gives the user a quick view about all the MOXA ports'</div><div class='add'>+   activities. One can easily learn each port's total received/transmitted</div><div class='add'>+   (Rx/Tx) character count since the time when the monitoring is started.</div><div class='add'>+</div><div class='add'>+   Rx/Tx throughputs per second are also reported in interval basis (e.g.</div><div class='add'>+   the last 5 seconds) and in average basis (since the time the monitoring</div><div class='add'>+   is started). You can reset all ports' count by &lt;HOME&gt; key. &lt;+&gt; &lt;-&gt;</div><div class='add'>+   (plus/minus) keys to change the displaying time interval. Press &lt;ENTER&gt;</div><div class='add'>+   on the port, that cursor stay, to view the port's communication</div><div class='add'>+   parameters, signal status, and input/output queue.</div><div class='add'>+</div><div class='add'>+msterm - Terminal Emulation</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+   This utility provides data sending and receiving ability of all tty ports,</div><div class='add'>+   especially for MOXA ports. It is quite useful for testing simple</div><div class='add'>+   application, for example, sending AT command to a modem connected to the</div><div class='add'>+   port or used as a terminal for login purpose. Note that this is only a</div><div class='add'>+   dumb terminal emulation without handling full screen operation.</div><div class='add'>+</div><div class='add'>+5. Setserial</div><div class='add'>+^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+   Supported Setserial parameters are listed as below.</div><div class='add'>+</div><div class='add'>+   ============== =========================================================</div><div class='add'>+   uart		  set UART type(16450--&gt;disable FIFO, 16550A--&gt;enable FIFO)</div><div class='add'>+   close_delay	  set the amount of time(in 1/100 of a second) that DTR</div><div class='add'>+		  should be kept low while being closed.</div><div class='add'>+   closing_wait   set the amount of time(in 1/100 of a second) that the</div><div class='add'>+		  serial port should wait for data to be drained while</div><div class='add'>+		  being closed, before the receiver is disable.</div><div class='add'>+   spd_hi	  Use  57.6kb  when  the application requests 38.4kb.</div><div class='add'>+   spd_vhi	  Use  115.2kb	when  the application requests 38.4kb.</div><div class='add'>+   spd_shi	  Use  230.4kb	when  the application requests 38.4kb.</div><div class='add'>+   spd_warp	  Use  460.8kb	when  the application requests 38.4kb.</div><div class='add'>+   spd_normal	  Use  38.4kb  when  the application requests 38.4kb.</div><div class='add'>+   spd_cust	  Use  the custom divisor to set the speed when  the</div><div class='add'>+		  application requests 38.4kb.</div><div class='add'>+   divisor	  This option set the custom division.</div><div class='add'>+   baud_base	  This option set the base baud rate.</div><div class='add'>+   ============== =========================================================</div><div class='add'>+</div><div class='add'>+6. Troubleshooting</div><div class='add'>+^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+   The boot time error messages and solutions are stated as clearly as</div><div class='add'>+   possible. If all the possible solutions fail, please contact our technical</div><div class='add'>+   support team to get more help.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   Error msg:</div><div class='add'>+	      More than 4 Moxa Smartio/Industio family boards found. Fifth board</div><div class='add'>+              and after are ignored.</div><div class='add'>+</div><div class='add'>+   Solution:</div><div class='add'>+   To avoid this problem, please unplug fifth and after board, because Moxa</div><div class='add'>+   driver supports up to 4 boards.</div><div class='add'>+</div><div class='add'>+   Error msg:</div><div class='add'>+	      Request_irq fail, IRQ(?) may be conflict with another device.</div><div class='add'>+</div><div class='add'>+   Solution:</div><div class='add'>+   Other PCI or ISA devices occupy the assigned IRQ. If you are not sure</div><div class='add'>+   which device causes the situation, please check /proc/interrupts to find</div><div class='add'>+   free IRQ and simply change another free IRQ for Moxa board.</div><div class='add'>+</div><div class='add'>+   Error msg:</div><div class='add'>+	      Board #: C1xx Series(CAP=xxx) interrupt number invalid.</div><div class='add'>+</div><div class='add'>+   Solution:</div><div class='add'>+   Each port within the same multiport board shares the same IRQ. Please set</div><div class='add'>+   one IRQ (IRQ doesn't equal to zero) for one Moxa board.</div><div class='add'>+</div><div class='add'>+   Error msg:</div><div class='add'>+	      No interrupt vector be set for Moxa ISA board(CAP=xxx).</div><div class='add'>+</div><div class='add'>+   Solution:</div><div class='add'>+   Moxa ISA board needs an interrupt vector.Please refer to user's manual</div><div class='add'>+   "Hardware Installation" chapter to set interrupt vector.</div><div class='add'>+</div><div class='add'>+   Error msg:</div><div class='add'>+              Couldn't install MOXA Smartio/Industio family driver!</div><div class='add'>+</div><div class='add'>+   Solution:</div><div class='add'>+   Load Moxa driver fail, the major number may conflict with other devices.</div><div class='add'>+   Please refer to previous section 3.7 to change a free major number for</div><div class='add'>+   Moxa driver.</div><div class='add'>+</div><div class='add'>+   Error msg:</div><div class='add'>+              Couldn't install MOXA Smartio/Industio family callout driver!</div><div class='add'>+</div><div class='add'>+   Solution:</div><div class='add'>+   Load Moxa callout driver fail, the callout device major number may</div><div class='add'>+   conflict with other devices. Please refer to previous section 3.7 to</div><div class='add'>+   change a free callout device major number for Moxa driver.</div><div class='head'>diff --git a/Documentation/serial/n_gsm.rst b/Documentation/serial/n_gsm.rst<br/>new file mode 100644<br/>index 000000000000..f3ad9fd26408<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/n_gsm.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/n_gsm.rst</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+==============================</div><div class='add'>+GSM 0710 tty multiplexor HOWTO</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+This line discipline implements the GSM 07.10 multiplexing protocol</div><div class='add'>+detailed in the following 3GPP document:</div><div class='add'>+</div><div class='add'>+	http://www.3gpp.org/ftp/Specs/archive/07_series/07.10/0710-720.zip</div><div class='add'>+</div><div class='add'>+This document give some hints on how to use this driver with GPRS and 3G</div><div class='add'>+modems connected to a physical serial port.</div><div class='add'>+</div><div class='add'>+How to use it</div><div class='add'>+-------------</div><div class='add'>+1. initialize the modem in 0710 mux mode (usually AT+CMUX= command) through</div><div class='add'>+   its serial port. Depending on the modem used, you can pass more or less</div><div class='add'>+   parameters to this command,</div><div class='add'>+2. switch the serial line to using the n_gsm line discipline by using</div><div class='add'>+   TIOCSETD ioctl,</div><div class='add'>+3. configure the mux using GSMIOC_GETCONF / GSMIOC_SETCONF ioctl,</div><div class='add'>+</div><div class='add'>+Major parts of the initialization program :</div><div class='add'>+(a good starting point is util-linux-ng/sys-utils/ldattach.c)::</div><div class='add'>+</div><div class='add'>+  #include &lt;linux/gsmmux.h&gt;</div><div class='add'>+  #define N_GSM0710	21	/* GSM 0710 Mux */</div><div class='add'>+  #define DEFAULT_SPEED	B115200</div><div class='add'>+  #define SERIAL_PORT	/dev/ttyS0</div><div class='add'>+</div><div class='add'>+	int ldisc = N_GSM0710;</div><div class='add'>+	struct gsm_config c;</div><div class='add'>+	struct termios configuration;</div><div class='add'>+</div><div class='add'>+	/* open the serial port connected to the modem */</div><div class='add'>+	fd = open(SERIAL_PORT, O_RDWR | O_NOCTTY | O_NDELAY);</div><div class='add'>+</div><div class='add'>+	/* configure the serial port : speed, flow control ... */</div><div class='add'>+</div><div class='add'>+	/* send the AT commands to switch the modem to CMUX mode</div><div class='add'>+	   and check that it's successful (should return OK) */</div><div class='add'>+	write(fd, "AT+CMUX=0\r", 10);</div><div class='add'>+</div><div class='add'>+	/* experience showed that some modems need some time before</div><div class='add'>+	   being able to answer to the first MUX packet so a delay</div><div class='add'>+	   may be needed here in some case */</div><div class='add'>+	sleep(3);</div><div class='add'>+</div><div class='add'>+	/* use n_gsm line discipline */</div><div class='add'>+	ioctl(fd, TIOCSETD, &amp;ldisc);</div><div class='add'>+</div><div class='add'>+	/* get n_gsm configuration */</div><div class='add'>+	ioctl(fd, GSMIOC_GETCONF, &amp;c);</div><div class='add'>+	/* we are initiator and need encoding 0 (basic) */</div><div class='add'>+	c.initiator = 1;</div><div class='add'>+	c.encapsulation = 0;</div><div class='add'>+	/* our modem defaults to a maximum size of 127 bytes */</div><div class='add'>+	c.mru = 127;</div><div class='add'>+	c.mtu = 127;</div><div class='add'>+	/* set the new configuration */</div><div class='add'>+	ioctl(fd, GSMIOC_SETCONF, &amp;c);</div><div class='add'>+</div><div class='add'>+	/* and wait for ever to keep the line discipline enabled */</div><div class='add'>+	daemon(0,0);</div><div class='add'>+	pause();</div><div class='add'>+</div><div class='add'>+4. create the devices corresponding to the "virtual" serial ports (take care,</div><div class='add'>+   each modem has its configuration and some DLC have dedicated functions,</div><div class='add'>+   for example GPS), starting with minor 1 (DLC0 is reserved for the management</div><div class='add'>+   of the mux)::</div><div class='add'>+</div><div class='add'>+     MAJOR=`cat /proc/devices |grep gsmtty | awk '{print $1}`</div><div class='add'>+     for i in `seq 1 4`; do</div><div class='add'>+	mknod /dev/ttygsm$i c $MAJOR $i</div><div class='add'>+     done</div><div class='add'>+</div><div class='add'>+5. use these devices as plain serial ports.</div><div class='add'>+</div><div class='add'>+   for example, it's possible:</div><div class='add'>+</div><div class='add'>+   - and to use gnokii to send / receive SMS on ttygsm1</div><div class='add'>+   - to use ppp to establish a datalink on ttygsm2</div><div class='add'>+</div><div class='add'>+6. first close all virtual ports before closing the physical port.</div><div class='add'>+</div><div class='add'>+   Note that after closing the physical port the modem is still in multiplexing</div><div class='add'>+   mode. This may prevent a successful re-opening of the port later. To avoid</div><div class='add'>+   this situation either reset the modem if your hardware allows that or send</div><div class='add'>+   a disconnect command frame manually before initializing the multiplexing mode</div><div class='add'>+   for the second time. The byte sequence for the disconnect command frame is::</div><div class='add'>+</div><div class='add'>+      0xf9, 0x03, 0xef, 0x03, 0xc3, 0x16, 0xf9.</div><div class='add'>+</div><div class='add'>+Additional Documentation</div><div class='add'>+------------------------</div><div class='add'>+More practical details on the protocol and how it's supported by industrial</div><div class='add'>+modems can be found in the following documents :</div><div class='add'>+</div><div class='add'>+- http://www.telit.com/module/infopool/download.php?id=616</div><div class='add'>+- http://www.u-blox.com/images/downloads/Product_Docs/LEON-G100-G200-MuxImplementation_ApplicationNote_%28GSM%20G1-CS-10002%29.pdf</div><div class='add'>+- http://www.sierrawireless.com/Support/Downloads/AirPrime/WMP_Series/~/media/Support_Downloads/AirPrime/Application_notes/CMUX_Feature_Application_Note-Rev004.ashx</div><div class='add'>+- http://wm.sim.com/sim/News/photo/2010721161442.pdf</div><div class='add'>+</div><div class='add'>+11-03-08 - Eric Bénard - &lt;eric@eukrea.com&gt;</div><div class='head'>diff --git a/Documentation/serial/n_gsm.txt b/Documentation/serial/n_gsm.txt<br/>deleted file mode 100644<br/>index 875361bb7cb4..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/n_gsm.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/n_gsm.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-n_gsm.c GSM 0710 tty multiplexor HOWTO</div><div class='del'>-===================================================</div><div class='del'>-</div><div class='del'>-This line discipline implements the GSM 07.10 multiplexing protocol</div><div class='del'>-detailed in the following 3GPP document :</div><div class='del'>-http://www.3gpp.org/ftp/Specs/archive/07_series/07.10/0710-720.zip</div><div class='del'>-</div><div class='del'>-This document give some hints on how to use this driver with GPRS and 3G</div><div class='del'>-modems connected to a physical serial port.</div><div class='del'>-</div><div class='del'>-How to use it</div><div class='del'>--------------</div><div class='del'>-1- initialize the modem in 0710 mux mode (usually AT+CMUX= command) through</div><div class='del'>-its serial port. Depending on the modem used, you can pass more or less</div><div class='del'>-parameters to this command,</div><div class='del'>-2- switch the serial line to using the n_gsm line discipline by using</div><div class='del'>-TIOCSETD ioctl,</div><div class='del'>-3- configure the mux using GSMIOC_GETCONF / GSMIOC_SETCONF ioctl,</div><div class='del'>-</div><div class='del'>-Major parts of the initialization program :</div><div class='del'>-(a good starting point is util-linux-ng/sys-utils/ldattach.c)</div><div class='del'>-#include &lt;linux/gsmmux.h&gt;</div><div class='del'>-#define N_GSM0710	21	/* GSM 0710 Mux */</div><div class='del'>-#define DEFAULT_SPEED	B115200</div><div class='del'>-#define SERIAL_PORT	/dev/ttyS0</div><div class='del'>-</div><div class='del'>-	int ldisc = N_GSM0710;</div><div class='del'>-	struct gsm_config c;</div><div class='del'>-	struct termios configuration;</div><div class='del'>-</div><div class='del'>-	/* open the serial port connected to the modem */</div><div class='del'>-	fd = open(SERIAL_PORT, O_RDWR | O_NOCTTY | O_NDELAY);</div><div class='del'>-</div><div class='del'>-	/* configure the serial port : speed, flow control ... */</div><div class='del'>-</div><div class='del'>-	/* send the AT commands to switch the modem to CMUX mode</div><div class='del'>-	   and check that it's successful (should return OK) */</div><div class='del'>-	write(fd, "AT+CMUX=0\r", 10);</div><div class='del'>-</div><div class='del'>-	/* experience showed that some modems need some time before</div><div class='del'>-	   being able to answer to the first MUX packet so a delay</div><div class='del'>-	   may be needed here in some case */</div><div class='del'>-	sleep(3);</div><div class='del'>-</div><div class='del'>-	/* use n_gsm line discipline */</div><div class='del'>-	ioctl(fd, TIOCSETD, &amp;ldisc);</div><div class='del'>-</div><div class='del'>-	/* get n_gsm configuration */</div><div class='del'>-	ioctl(fd, GSMIOC_GETCONF, &amp;c);</div><div class='del'>-	/* we are initiator and need encoding 0 (basic) */</div><div class='del'>-	c.initiator = 1;</div><div class='del'>-	c.encapsulation = 0;</div><div class='del'>-	/* our modem defaults to a maximum size of 127 bytes */</div><div class='del'>-	c.mru = 127;</div><div class='del'>-	c.mtu = 127;</div><div class='del'>-	/* set the new configuration */</div><div class='del'>-	ioctl(fd, GSMIOC_SETCONF, &amp;c);</div><div class='del'>-</div><div class='del'>-	/* and wait for ever to keep the line discipline enabled */</div><div class='del'>-	daemon(0,0);</div><div class='del'>-	pause();</div><div class='del'>-</div><div class='del'>-4- create the devices corresponding to the "virtual" serial ports (take care,</div><div class='del'>-each modem has its configuration and some DLC have dedicated functions,</div><div class='del'>-for example GPS), starting with minor 1 (DLC0 is reserved for the management</div><div class='del'>-of the mux)</div><div class='del'>-</div><div class='del'>-MAJOR=`cat /proc/devices |grep gsmtty | awk '{print $1}`</div><div class='del'>-for i in `seq 1 4`; do</div><div class='del'>-	mknod /dev/ttygsm$i c $MAJOR $i</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-5- use these devices as plain serial ports.</div><div class='del'>-for example, it's possible :</div><div class='del'>-- and to use gnokii to send / receive SMS on ttygsm1</div><div class='del'>-- to use ppp to establish a datalink on ttygsm2</div><div class='del'>-</div><div class='del'>-6- first close all virtual ports before closing the physical port.</div><div class='del'>-</div><div class='del'>-Note that after closing the physical port the modem is still in multiplexing</div><div class='del'>-mode. This may prevent a successful re-opening of the port later. To avoid</div><div class='del'>-this situation either reset the modem if your hardware allows that or send</div><div class='del'>-a disconnect command frame manually before initializing the multiplexing mode</div><div class='del'>-for the second time. The byte sequence for the disconnect command frame is:</div><div class='del'>-0xf9, 0x03, 0xef, 0x03, 0xc3, 0x16, 0xf9.</div><div class='del'>-</div><div class='del'>-Additional Documentation</div><div class='del'>-------------------------</div><div class='del'>-More practical details on the protocol and how it's supported by industrial</div><div class='del'>-modems can be found in the following documents :</div><div class='del'>-http://www.telit.com/module/infopool/download.php?id=616</div><div class='del'>-http://www.u-blox.com/images/downloads/Product_Docs/LEON-G100-G200-MuxImplementation_ApplicationNote_%28GSM%20G1-CS-10002%29.pdf</div><div class='del'>-http://www.sierrawireless.com/Support/Downloads/AirPrime/WMP_Series/~/media/Support_Downloads/AirPrime/Application_notes/CMUX_Feature_Application_Note-Rev004.ashx</div><div class='del'>-http://wm.sim.com/sim/News/photo/2010721161442.pdf</div><div class='del'>-</div><div class='del'>-11-03-08 - Eric Bénard - &lt;eric@eukrea.com&gt;</div><div class='head'>diff --git a/Documentation/serial/rocket.txt b/Documentation/serial/rocket.rst<br/>index 60b039891057..23761eae4282 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/rocket.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/rocket.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/rocket.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/rocket.rst</a></div><div class='hunk'>@@ -1,20 +1,22 @@</div><div class='del'>-Comtrol(tm) RocketPort(R)/RocketModem(TM) Series </div><div class='del'>-Device Driver for the Linux Operating System</div><div class='add'>+================================================</div><div class='add'>+Comtrol(tm) RocketPort(R)/RocketModem(TM) Series</div><div class='add'>+================================================</div><div class='ctx'> </div><div class='del'>-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</div><div class='add'>+Device Driver for the Linux Operating System</div><div class='add'>+============================================</div><div class='ctx'> </div><div class='del'>-PRODUCT OVERVIEW</div><div class='add'>+Product overview</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='ctx'> This driver provides a loadable kernel driver for the Comtrol RocketPort</div><div class='del'>-and RocketModem PCI boards. These boards provide, 2, 4, 8, 16, or 32 </div><div class='add'>+and RocketModem PCI boards. These boards provide, 2, 4, 8, 16, or 32</div><div class='ctx'> high-speed serial ports or modems.  This driver supports up to a combination</div><div class='ctx'> of four RocketPort or RocketModems boards in one machine simultaneously.</div><div class='ctx'> This file assumes that you are using the RocketPort driver which is</div><div class='del'>-integrated into the kernel sources.  </div><div class='add'>+integrated into the kernel sources.</div><div class='ctx'> </div><div class='del'>-The driver can also be installed as an external module using the usual </div><div class='del'>-"make;make install" routine.  This external module driver, obtainable </div><div class='add'>+The driver can also be installed as an external module using the usual</div><div class='add'>+"make;make install" routine.  This external module driver, obtainable</div><div class='ctx'> from the Comtrol website listed below, is useful for updating the driver</div><div class='ctx'> or installing it into kernels which do not have the driver configured</div><div class='ctx'> into them.  Installations instructions for the external module</div><div class='hunk'>@@ -29,57 +31,59 @@ information on how to set the DIP switches.</div><div class='ctx'> </div><div class='ctx'> You pass the I/O port to the driver using the following module parameters:</div><div class='ctx'> </div><div class='del'>-board1 :	I/O port for the first ISA board</div><div class='del'>-board2 :	I/O port for the second ISA board</div><div class='del'>-board3 :	I/O port for the third ISA board</div><div class='del'>-board4 :	I/O port for the fourth ISA board</div><div class='add'>+board1:</div><div class='add'>+	I/O port for the first ISA board</div><div class='add'>+board2:</div><div class='add'>+	I/O port for the second ISA board</div><div class='add'>+board3:</div><div class='add'>+	I/O port for the third ISA board</div><div class='add'>+board4:</div><div class='add'>+	I/O port for the fourth ISA board</div><div class='ctx'> </div><div class='ctx'> There is a set of utilities and scripts provided with the external driver</div><div class='del'>-( downloadable from http://www.comtrol.com ) that ease the configuration and</div><div class='add'>+(downloadable from http://www.comtrol.com) that ease the configuration and</div><div class='ctx'> setup of the ISA cards.</div><div class='ctx'> </div><div class='ctx'> The RocketModem II PCI boards require firmware to be loaded into the card</div><div class='ctx'> before it will function.  The driver has only been tested as a module for this</div><div class='ctx'> board.</div><div class='ctx'> </div><div class='del'>-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</div><div class='del'>-</div><div class='del'>-INSTALLATION PROCEDURES</div><div class='add'>+Installation Procedures</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='del'>-RocketPort/RocketModem PCI cards require no driver configuration, they are </div><div class='add'>+RocketPort/RocketModem PCI cards require no driver configuration, they are</div><div class='ctx'> automatically detected and configured.</div><div class='ctx'> </div><div class='del'>-The RocketPort driver can be installed as a module (recommended) or built </div><div class='add'>+The RocketPort driver can be installed as a module (recommended) or built</div><div class='ctx'> into the kernel. This is selected, as for other drivers, through the `make config`</div><div class='del'>-command from the root of the Linux source tree during the kernel build process. </div><div class='add'>+command from the root of the Linux source tree during the kernel build process.</div><div class='ctx'> </div><div class='ctx'> The RocketPort/RocketModem serial ports installed by this driver are assigned</div><div class='del'>-device major number 46, and will be named /dev/ttyRx, where x is the port number </div><div class='add'>+device major number 46, and will be named /dev/ttyRx, where x is the port number</div><div class='ctx'> starting at zero (ex. /dev/ttyR0, /devttyR1, ...).  If you have multiple cards</div><div class='ctx'> installed in the system, the mapping of port names to serial ports is displayed</div><div class='ctx'> in the system log at /var/log/messages.</div><div class='ctx'> </div><div class='ctx'> If installed as a module, the module must be loaded.  This can be done</div><div class='ctx'> manually by entering "modprobe rocket".  To have the module loaded automatically</div><div class='del'>-upon system boot, edit a /etc/modprobe.d/*.conf file and add the line</div><div class='add'>+upon system boot, edit a `/etc/modprobe.d/*.conf` file and add the line</div><div class='ctx'> "alias char-major-46 rocket".</div><div class='ctx'> </div><div class='ctx'> In order to use the ports, their device names (nodes) must be created with mknod.</div><div class='del'>-This is only required once, the system will retain the names once created.  To </div><div class='del'>-create the RocketPort/RocketModem device names, use the command </div><div class='del'>-"mknod /dev/ttyRx c 46 x" where x is the port number starting at zero.  For example:</div><div class='add'>+This is only required once, the system will retain the names once created.  To</div><div class='add'>+create the RocketPort/RocketModem device names, use the command</div><div class='add'>+"mknod /dev/ttyRx c 46 x" where x is the port number starting at zero.</div><div class='ctx'> </div><div class='del'>-&gt;mknod /dev/ttyR0 c 46 0</div><div class='del'>-&gt;mknod /dev/ttyR1 c 46 1</div><div class='del'>-&gt;mknod /dev/ttyR2 c 46 2  </div><div class='add'>+For example::</div><div class='ctx'> </div><div class='del'>-The Linux script MAKEDEV will create the first 16 ttyRx device names (nodes)</div><div class='del'>-for you:</div><div class='add'>+	&gt; mknod /dev/ttyR0 c 46 0</div><div class='add'>+	&gt; mknod /dev/ttyR1 c 46 1</div><div class='add'>+	&gt; mknod /dev/ttyR2 c 46 2</div><div class='ctx'> </div><div class='del'>-&gt;/dev/MAKEDEV ttyR</div><div class='add'>+The Linux script MAKEDEV will create the first 16 ttyRx device names (nodes)</div><div class='add'>+for you::</div><div class='ctx'> </div><div class='del'>-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</div><div class='add'>+	&gt;/dev/MAKEDEV ttyR</div><div class='ctx'> </div><div class='ctx'> ISA Rocketport Boards</div><div class='ctx'> ---------------------</div><div class='hunk'>@@ -89,7 +93,7 @@ card before installing and using it.  This is done by setting a set of DIP</div><div class='ctx'> switches on the Rocketport board.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-SETTING THE I/O ADDRESS</div><div class='add'>+Setting the I/O address</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='ctx'> Before installing RocketPort(R) or RocketPort RA boards, you must find</div><div class='hunk'>@@ -130,40 +134,36 @@ the first 4 bytes of that range are used by the first board.  You would</div><div class='ctx'> need to set the second, third, or fourth board to one of the next available</div><div class='ctx'> blocks such as 0x180.</div><div class='ctx'> </div><div class='del'>-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</div><div class='del'>-</div><div class='del'>-RocketPort and RocketPort RA SW1 Settings:</div><div class='del'>-</div><div class='del'>-          +-------------------------------+</div><div class='del'>-          | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 |</div><div class='del'>-          +-------+-------+---------------+</div><div class='del'>-          | Unused| Card  | I/O Port Block|</div><div class='del'>-          +-------------------------------+</div><div class='del'>-</div><div class='del'>-DIP Switches                             DIP Switches</div><div class='del'>-7    8                                   6    5</div><div class='del'>-===================                      ===================</div><div class='del'>-On   On   UNUSED, MUST BE ON.            On   On   First Card    &lt;==== Default</div><div class='del'>-                                         On   Off  Second Card</div><div class='del'>-                                         Off  On   Third Card</div><div class='del'>-                                         Off  Off  Fourth Card</div><div class='del'>-</div><div class='del'>-DIP Switches         I/O Address Range</div><div class='del'>-4    3    2    1     Used by the First Card</div><div class='del'>-=====================================</div><div class='del'>-On   Off  On   Off   100-143</div><div class='del'>-On   Off  Off  On    140-183</div><div class='del'>-On   Off  Off  Off   180-1C3       &lt;==== Default</div><div class='del'>-Off  On   On   Off   200-243</div><div class='del'>-Off  On   Off  On    240-283</div><div class='del'>-Off  On   Off  Off   280-2C3</div><div class='del'>-Off  Off  On   Off   300-343</div><div class='del'>-Off  Off  Off  On    340-383</div><div class='del'>-Off  Off  Off  Off   380-3C3</div><div class='del'>-</div><div class='del'>-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</div><div class='del'>-</div><div class='del'>-REPORTING BUGS</div><div class='add'>+RocketPort and RocketPort RA SW1 Settings::</div><div class='add'>+</div><div class='add'>+            +-------------------------------+</div><div class='add'>+            | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 |</div><div class='add'>+            +-------+-------+---------------+</div><div class='add'>+            | Unused| Card  | I/O Port Block|</div><div class='add'>+            +-------------------------------+</div><div class='add'>+</div><div class='add'>+  DIP Switches                             DIP Switches</div><div class='add'>+  7    8                                   6    5</div><div class='add'>+  ===================                      ===================</div><div class='add'>+  On   On   UNUSED, MUST BE ON.            On   On   First Card    &lt;==== Default</div><div class='add'>+                                           On   Off  Second Card</div><div class='add'>+                                           Off  On   Third Card</div><div class='add'>+                                           Off  Off  Fourth Card</div><div class='add'>+</div><div class='add'>+  DIP Switches         I/O Address Range</div><div class='add'>+  4    3    2    1     Used by the First Card</div><div class='add'>+  =====================================</div><div class='add'>+  On   Off  On   Off   100-143</div><div class='add'>+  On   Off  Off  On    140-183</div><div class='add'>+  On   Off  Off  Off   180-1C3       &lt;==== Default</div><div class='add'>+  Off  On   On   Off   200-243</div><div class='add'>+  Off  On   Off  On    240-283</div><div class='add'>+  Off  On   Off  Off   280-2C3</div><div class='add'>+  Off  Off  On   Off   300-343</div><div class='add'>+  Off  Off  Off  On    340-383</div><div class='add'>+  Off  Off  Off  Off   380-3C3</div><div class='add'>+</div><div class='add'>+Reporting Bugs</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='ctx'> For technical support, please provide the following</div><div class='hunk'>@@ -171,19 +171,15 @@ information: Driver version, kernel release, distribution of</div><div class='ctx'> kernel, and type of board you are using. Error messages and log</div><div class='ctx'> printouts port configuration details are especially helpful.</div><div class='ctx'> </div><div class='del'>-USA</div><div class='del'>-    Phone: (612) 494-4100</div><div class='del'>-      FAX: (612) 494-4199</div><div class='del'>-    email: support@comtrol.com</div><div class='add'>+USA:</div><div class='add'>+    :Phone: (612) 494-4100</div><div class='add'>+    :FAX: (612) 494-4199</div><div class='add'>+    :email: support@comtrol.com</div><div class='ctx'> </div><div class='del'>-Comtrol Europe</div><div class='del'>-    Phone: +44 (0) 1 869 323-220</div><div class='del'>-      FAX: +44 (0) 1 869 323-211</div><div class='del'>-    email: support@comtrol.co.uk</div><div class='add'>+Comtrol Europe:</div><div class='add'>+    :Phone: +44 (0) 1 869 323-220</div><div class='add'>+    :FAX: +44 (0) 1 869 323-211</div><div class='add'>+    :email: support@comtrol.co.uk</div><div class='ctx'> </div><div class='ctx'> Web:	http://www.comtrol.com</div><div class='ctx'> FTP:	ftp.comtrol.com</div><div class='del'>-</div><div class='del'>-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/serial/serial-iso7816.txt b/Documentation/serial/serial-iso7816.rst<br/>index 3193d24a2b0f..d990143de0c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/serial-iso7816.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/serial-iso7816.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/serial-iso7816.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/serial-iso7816.rst</a></div><div class='hunk'>@@ -1,11 +1,15 @@</div><div class='del'>-                        ISO7816 SERIAL COMMUNICATIONS</div><div class='add'>+=============================</div><div class='add'>+ISO7816 Serial Communications</div><div class='add'>+=============================</div><div class='ctx'> </div><div class='del'>-1. INTRODUCTION</div><div class='add'>+1. Introduction</div><div class='add'>+===============</div><div class='ctx'> </div><div class='ctx'>   ISO/IEC7816 is a series of standards specifying integrated circuit cards (ICC)</div><div class='ctx'>   also known as smart cards.</div><div class='ctx'> </div><div class='del'>-2. HARDWARE-RELATED CONSIDERATIONS</div><div class='add'>+2. Hardware-related considerations</div><div class='add'>+==================================</div><div class='ctx'> </div><div class='ctx'>   Some CPUs/UARTs (e.g., Microchip AT91) contain a built-in mode capable of</div><div class='ctx'>   handling communication with a smart card.</div><div class='hunk'>@@ -15,7 +19,8 @@</div><div class='ctx'>   available at user-level to allow switching from one mode to the other, and</div><div class='ctx'>   vice versa.</div><div class='ctx'> </div><div class='del'>-3. DATA STRUCTURES ALREADY AVAILABLE IN THE KERNEL</div><div class='add'>+3. Data Structures Already Available in the Kernel</div><div class='add'>+==================================================</div><div class='ctx'> </div><div class='ctx'>   The Linux kernel provides the serial_iso7816 structure (see [1]) to handle</div><div class='ctx'>   ISO7816 communications. This data structure is used to set and configure</div><div class='hunk'>@@ -27,10 +32,11 @@</div><div class='ctx'>   to TIOCGISO7816 and TIOCSISO7816 ioctls (see below). The iso7816_config</div><div class='ctx'>   callback receives a pointer to struct serial_iso7816.</div><div class='ctx'> </div><div class='del'>-4. USAGE FROM USER-LEVEL</div><div class='add'>+4. Usage from user-level</div><div class='add'>+========================</div><div class='ctx'> </div><div class='ctx'>   From user-level, ISO7816 configuration can be get/set using the previous</div><div class='del'>-  ioctls. For instance, to set ISO7816 you can use the following code:</div><div class='add'>+  ioctls. For instance, to set ISO7816 you can use the following code::</div><div class='ctx'> </div><div class='ctx'> 	#include &lt;linux/serial.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +84,7 @@</div><div class='ctx'> 		/* Error handling. See errno. */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-5. REFERENCES</div><div class='add'>+5. References</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'>  [1]    include/uapi/linux/serial.h</div><div class='head'>diff --git a/Documentation/serial/serial-rs485.txt b/Documentation/serial/serial-rs485.rst<br/>index ce0c1a9b8aab..6bc824f948f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/serial-rs485.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/serial-rs485.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/serial-rs485.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/serial-rs485.rst</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='del'>-                        RS485 SERIAL COMMUNICATIONS</div><div class='add'>+===========================</div><div class='add'>+RS485 Serial Communications</div><div class='add'>+===========================</div><div class='ctx'> </div><div class='del'>-1. INTRODUCTION</div><div class='add'>+1. Introduction</div><div class='add'>+===============</div><div class='ctx'> </div><div class='ctx'>    EIA-485, also known as TIA/EIA-485 or RS-485, is a standard defining the</div><div class='ctx'>    electrical characteristics of drivers and receivers for use in balanced</div><div class='hunk'>@@ -9,7 +12,8 @@</div><div class='ctx'>    because it can be used effectively over long distances and in electrically</div><div class='ctx'>    noisy environments.</div><div class='ctx'> </div><div class='del'>-2. HARDWARE-RELATED CONSIDERATIONS</div><div class='add'>+2. Hardware-related Considerations</div><div class='add'>+==================================</div><div class='ctx'> </div><div class='ctx'>    Some CPUs/UARTs (e.g., Atmel AT91 or 16C950 UART) contain a built-in</div><div class='ctx'>    half-duplex mode capable of automatically controlling line direction by</div><div class='hunk'>@@ -22,7 +26,8 @@</div><div class='ctx'>    available at user-level to allow switching from one mode to the other, and</div><div class='ctx'>    vice versa.</div><div class='ctx'> </div><div class='del'>-3. DATA STRUCTURES ALREADY AVAILABLE IN THE KERNEL</div><div class='add'>+3. Data Structures Already Available in the Kernel</div><div class='add'>+==================================================</div><div class='ctx'> </div><div class='ctx'>    The Linux kernel provides the serial_rs485 structure (see [1]) to handle</div><div class='ctx'>    RS485 communications. This data structure is used to set and configure RS485</div><div class='hunk'>@@ -38,10 +43,11 @@</div><div class='ctx'>    to TIOCSRS485 and TIOCGRS485 ioctls (see below). The rs485_config callback</div><div class='ctx'>    receives a pointer to struct serial_rs485.</div><div class='ctx'> </div><div class='del'>-4. USAGE FROM USER-LEVEL</div><div class='add'>+4. Usage from user-level</div><div class='add'>+========================</div><div class='ctx'> </div><div class='ctx'>    From user-level, RS485 configuration can be get/set using the previous</div><div class='del'>-   ioctls. For instance, to set RS485 you can use the following code:</div><div class='add'>+   ioctls. For instance, to set RS485 you can use the following code::</div><div class='ctx'> </div><div class='ctx'> 	#include &lt;linux/serial.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +95,9 @@</div><div class='ctx'> 		/* Error handling. See errno. */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-5. REFERENCES</div><div class='add'>+5. References</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'>  [1]	include/uapi/linux/serial.h</div><div class='add'>+</div><div class='ctx'>  [2]	Documentation/devicetree/bindings/serial/rs485.txt</div><div class='head'>diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.rst<br/>index b48780977a68..dd972caacf3e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/tty.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/serial/tty.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/serial/tty.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/serial/tty.rst</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='del'>-</div><div class='del'>-			The Lockronomicon</div><div class='add'>+=================</div><div class='add'>+The Lockronomicon</div><div class='add'>+=================</div><div class='ctx'> </div><div class='ctx'> Your guide to the ancient and twisted locking policies of the tty layer and</div><div class='ctx'> the warped logic behind them. Beware all ye who read on.</div><div class='hunk'>@@ -9,12 +10,12 @@ Line Discipline</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='ctx'> Line disciplines are registered with tty_register_ldisc() passing the</div><div class='del'>-discipline number and the ldisc structure. At the point of registration the </div><div class='add'>+discipline number and the ldisc structure. At the point of registration the</div><div class='ctx'> discipline must be ready to use and it is possible it will get used before</div><div class='ctx'> the call returns success. If the call returns an error then it won't get</div><div class='ctx'> called. Do not re-use ldisc numbers as they are part of the userspace ABI</div><div class='ctx'> and writing over an existing ldisc will cause demons to eat your computer.</div><div class='del'>-After the return the ldisc data has been copied so you may free your own </div><div class='add'>+After the return the ldisc data has been copied so you may free your own</div><div class='ctx'> copy of the structure. You must not re-register over the top of the line</div><div class='ctx'> discipline even with the same data or your computer again will be eaten by</div><div class='ctx'> demons.</div><div class='hunk'>@@ -26,7 +27,7 @@ code manages the module counts this should not usually be a concern.</div><div class='ctx'> </div><div class='ctx'> Heed this warning: the reference count field of the registered copies of the</div><div class='ctx'> tty_ldisc structure in the ldisc table counts the number of lines using this</div><div class='del'>-discipline. The reference count of the tty_ldisc structure within a tty </div><div class='add'>+discipline. The reference count of the tty_ldisc structure within a tty</div><div class='ctx'> counts the number of active users of the ldisc at this instant. In effect it</div><div class='ctx'> counts the number of threads of execution within an ldisc method (plus those</div><div class='ctx'> about to enter and exit although this detail matters not).</div><div class='hunk'>@@ -34,9 +35,11 @@ about to enter and exit although this detail matters not).</div><div class='ctx'> Line Discipline Methods</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='del'>-TTY side interfaces:</div><div class='add'>+TTY side interfaces</div><div class='add'>+^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='del'>-open()		-	Called when the line discipline is attached to</div><div class='add'>+======================= =======================================================</div><div class='add'>+open()			Called when the line discipline is attached to</div><div class='ctx'> 			the terminal. No other call into the line</div><div class='ctx'> 			discipline for this tty will occur until it</div><div class='ctx'> 			completes successfully. Should initialize any</div><div class='hunk'>@@ -47,66 +50,69 @@ open()		-	Called when the line discipline is attached to</div><div class='ctx'> 			Returning an error will prevent the ldisc from</div><div class='ctx'> 			being attached. Can sleep.</div><div class='ctx'> </div><div class='del'>-close()		-	This is called on a terminal when the line</div><div class='add'>+close()			This is called on a terminal when the line</div><div class='ctx'> 			discipline is being unplugged. At the point of</div><div class='ctx'> 			execution no further users will enter the</div><div class='ctx'> 			ldisc code for this tty. Can sleep.</div><div class='ctx'> </div><div class='del'>-hangup()	-	Called when the tty line is hung up.</div><div class='add'>+hangup()		Called when the tty line is hung up.</div><div class='ctx'> 			The line discipline should cease I/O to the tty.</div><div class='ctx'> 			No further calls into the ldisc code will occur.</div><div class='ctx'> 			The return value is ignored. Can sleep.</div><div class='ctx'> </div><div class='del'>-read()		-	(optional) A process requests reading data from</div><div class='add'>+read()			(optional) A process requests reading data from</div><div class='ctx'> 			the line. Multiple read calls may occur in parallel</div><div class='ctx'> 			and the ldisc must deal with serialization issues.</div><div class='ctx'> 			If not defined, the process will receive an EIO</div><div class='ctx'> 			error. May sleep.</div><div class='ctx'> </div><div class='del'>-write()		-	(optional) A process requests writing data to the</div><div class='add'>+write()			(optional) A process requests writing data to the</div><div class='ctx'> 			line. Multiple write calls are serialized by the</div><div class='ctx'> 			tty layer for the ldisc. If not defined, the</div><div class='ctx'> 			process will receive an EIO error. May sleep.</div><div class='ctx'> </div><div class='del'>-flush_buffer()	-	(optional) May be called at any point between</div><div class='add'>+flush_buffer()		(optional) May be called at any point between</div><div class='ctx'> 			open and close, and instructs the line discipline</div><div class='ctx'> 			to empty its input buffer.</div><div class='ctx'> </div><div class='del'>-set_termios()	-	(optional) Called on termios structure changes.</div><div class='add'>+set_termios()		(optional) Called on termios structure changes.</div><div class='ctx'> 			The caller passes the old termios data and the</div><div class='ctx'> 			current data is in the tty. Called under the</div><div class='ctx'> 			termios semaphore so allowed to sleep. Serialized</div><div class='ctx'> 			against itself only.</div><div class='ctx'> </div><div class='del'>-poll()		-	(optional) Check the status for the poll/select</div><div class='add'>+poll()			(optional) Check the status for the poll/select</div><div class='ctx'> 			calls. Multiple poll calls may occur in parallel.</div><div class='ctx'> 			May sleep.</div><div class='ctx'> </div><div class='del'>-ioctl()		-	(optional) Called when an ioctl is handed to the</div><div class='add'>+ioctl()			(optional) Called when an ioctl is handed to the</div><div class='ctx'> 			tty layer that might be for the ldisc. Multiple</div><div class='ctx'> 			ioctl calls may occur in parallel. May sleep.</div><div class='ctx'> </div><div class='del'>-compat_ioctl()	-	(optional) Called when a 32 bit ioctl is handed</div><div class='add'>+compat_ioctl()		(optional) Called when a 32 bit ioctl is handed</div><div class='ctx'> 			to the tty layer that might be for the ldisc.</div><div class='ctx'> 			Multiple ioctl calls may occur in parallel.</div><div class='ctx'> 			May sleep.</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='del'>-Driver Side Interfaces:</div><div class='add'>+Driver Side Interfaces</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='del'>-receive_buf()	-	(optional) Called by the low-level driver to hand</div><div class='add'>+======================= =======================================================</div><div class='add'>+receive_buf()		(optional) Called by the low-level driver to hand</div><div class='ctx'> 			a buffer of received bytes to the ldisc for</div><div class='ctx'> 			processing. The number of bytes is guaranteed not</div><div class='ctx'> 			to exceed the current value of tty-&gt;receive_room.</div><div class='ctx'> 			All bytes must be processed.</div><div class='ctx'> </div><div class='del'>-receive_buf2()	-	(optional) Called by the low-level driver to hand</div><div class='add'>+receive_buf2()		(optional) Called by the low-level driver to hand</div><div class='ctx'> 			a buffer of received bytes to the ldisc for</div><div class='ctx'> 			processing. Returns the number of bytes processed.</div><div class='ctx'> </div><div class='ctx'> 			If both receive_buf() and receive_buf2() are</div><div class='ctx'> 			defined, receive_buf2() should be preferred.</div><div class='ctx'> </div><div class='del'>-write_wakeup()	-	May be called at any point between open and close.</div><div class='add'>+write_wakeup()		May be called at any point between open and close.</div><div class='ctx'> 			The TTY_DO_WRITE_WAKEUP flag indicates if a call</div><div class='ctx'> 			is needed but always races versus calls. Thus the</div><div class='ctx'> 			ldisc must be careful about setting order and to</div><div class='hunk'>@@ -117,17 +123,20 @@ write_wakeup()	-	May be called at any point between open and close.</div><div class='ctx'> 			is permitted to call the driver write method from</div><div class='ctx'> 			this function. In such a situation defer it.</div><div class='ctx'> </div><div class='del'>-dcd_change()	-	Report to the tty line the current DCD pin status</div><div class='add'>+dcd_change()		Report to the tty line the current DCD pin status</div><div class='ctx'> 			changes and the relative timestamp. The timestamp</div><div class='ctx'> 			cannot be NULL.</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Driver Access</div><div class='add'>+^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> Line discipline methods can call the following methods of the underlying</div><div class='ctx'> hardware driver through the function pointers within the tty-&gt;driver</div><div class='ctx'> structure:</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> write()			Write a block of characters to the tty device.</div><div class='ctx'> 			Returns the number of characters accepted. The</div><div class='ctx'> 			character buffer passed to this method is already</div><div class='hunk'>@@ -189,13 +198,16 @@ wait_until_sent()	Waits until the device has written out all of the</div><div class='ctx'> 			characters in its transmitter FIFO.</div><div class='ctx'> </div><div class='ctx'> send_xchar()		Send a high-priority XON/XOFF character to the device.</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Flags</div><div class='add'>+^^^^^</div><div class='ctx'> </div><div class='ctx'> Line discipline methods have access to tty-&gt;flags field containing the</div><div class='ctx'> following interesting flags:</div><div class='ctx'> </div><div class='add'>+======================= =======================================================</div><div class='ctx'> TTY_THROTTLED		Driver input is throttled. The ldisc should call</div><div class='ctx'> 			tty-&gt;driver-&gt;unthrottle() in order to resume</div><div class='ctx'> 			reception when it is ready to process more data.</div><div class='hunk'>@@ -212,102 +224,105 @@ TTY_OTHER_CLOSED	Device is a pty and the other side has closed.</div><div class='ctx'> </div><div class='ctx'> TTY_NO_WRITE_SPLIT	Prevent driver from splitting up writes into</div><div class='ctx'> 			smaller chunks.</div><div class='add'>+======================= =======================================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Locking</div><div class='add'>+^^^^^^^</div><div class='ctx'> </div><div class='ctx'> Callers to the line discipline functions from the tty layer are required to</div><div class='ctx'> take line discipline locks. The same is true of calls from the driver side</div><div class='ctx'> but not yet enforced.</div><div class='ctx'> </div><div class='del'>-Three calls are now provided</div><div class='add'>+Three calls are now provided::</div><div class='ctx'> </div><div class='ctx'> 	ldisc = tty_ldisc_ref(tty);</div><div class='ctx'> </div><div class='ctx'> takes a handle to the line discipline in the tty and returns it. If no ldisc</div><div class='ctx'> is currently attached or the ldisc is being closed and re-opened at this</div><div class='ctx'> point then NULL is returned. While this handle is held the ldisc will not</div><div class='del'>-change or go away.</div><div class='add'>+change or go away::</div><div class='ctx'> </div><div class='ctx'> 	tty_ldisc_deref(ldisc)</div><div class='ctx'> </div><div class='ctx'> Returns the ldisc reference and allows the ldisc to be closed. Returning the</div><div class='ctx'> reference takes away your right to call the ldisc functions until you take</div><div class='del'>-a new reference.</div><div class='add'>+a new reference::</div><div class='ctx'> </div><div class='ctx'> 	ldisc = tty_ldisc_ref_wait(tty);</div><div class='ctx'> </div><div class='ctx'> Performs the same function as tty_ldisc_ref except that it will wait for an</div><div class='del'>-ldisc change to complete and then return a reference to the new ldisc. </div><div class='add'>+ldisc change to complete and then return a reference to the new ldisc.</div><div class='ctx'> </div><div class='ctx'> While these functions are slightly slower than the old code they should have</div><div class='ctx'> minimal impact as most receive logic uses the flip buffers and they only</div><div class='ctx'> need to take a reference when they push bits up through the driver.</div><div class='ctx'> </div><div class='del'>-A caution: The ldisc-&gt;open(), ldisc-&gt;close() and driver-&gt;set_ldisc </div><div class='add'>+A caution: The ldisc-&gt;open(), ldisc-&gt;close() and driver-&gt;set_ldisc</div><div class='ctx'> functions are called with the ldisc unavailable. Thus tty_ldisc_ref will</div><div class='ctx'> fail in this situation if used within these functions. Ldisc and driver</div><div class='del'>-code calling its own functions must be careful in this case. </div><div class='add'>+code calling its own functions must be careful in this case.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Driver Interface</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='del'>-open()		-	Called when a device is opened. May sleep</div><div class='add'>+======================= =======================================================</div><div class='add'>+open()			Called when a device is opened. May sleep</div><div class='ctx'> </div><div class='del'>-close()		-	Called when a device is closed. At the point of</div><div class='del'>-			return from this call the driver must make no </div><div class='add'>+close()			Called when a device is closed. At the point of</div><div class='add'>+			return from this call the driver must make no</div><div class='ctx'> 			further ldisc calls of any kind. May sleep</div><div class='ctx'> </div><div class='del'>-write()		-	Called to write bytes to the device. May not</div><div class='del'>-			sleep. May occur in parallel in special cases. </div><div class='add'>+write()			Called to write bytes to the device. May not</div><div class='add'>+			sleep. May occur in parallel in special cases.</div><div class='ctx'> 			Because this includes panic paths drivers generally</div><div class='ctx'> 			shouldn't try and do clever locking here.</div><div class='ctx'> </div><div class='del'>-put_char()	-	Stuff a single character onto the queue. The</div><div class='add'>+put_char()		Stuff a single character onto the queue. The</div><div class='ctx'> 			driver is guaranteed following up calls to</div><div class='ctx'> 			flush_chars.</div><div class='ctx'> </div><div class='del'>-flush_chars()	-	Ask the kernel to write put_char queue</div><div class='add'>+flush_chars()		Ask the kernel to write put_char queue</div><div class='ctx'> </div><div class='del'>-write_room()	-	Return the number of characters that can be stuffed</div><div class='add'>+write_room()		Return the number of characters that can be stuffed</div><div class='ctx'> 			into the port buffers without overflow (or less).</div><div class='ctx'> 			The ldisc is responsible for being intelligent</div><div class='del'>- 			about multi-threading of write_room/write calls</div><div class='add'>+			about multi-threading of write_room/write calls</div><div class='ctx'> </div><div class='del'>-ioctl()		-	Called when an ioctl may be for the driver</div><div class='add'>+ioctl()			Called when an ioctl may be for the driver</div><div class='ctx'> </div><div class='del'>-set_termios()	-	Called on termios change, serialized against</div><div class='add'>+set_termios()		Called on termios change, serialized against</div><div class='ctx'> 			itself by a semaphore. May sleep.</div><div class='ctx'> </div><div class='del'>-set_ldisc()	-	Notifier for discipline change. At the point this </div><div class='add'>+set_ldisc()		Notifier for discipline change. At the point this</div><div class='ctx'> 			is done the discipline is not yet usable. Can now</div><div class='ctx'> 			sleep (I think)</div><div class='ctx'> </div><div class='del'>-throttle()	-	Called by the ldisc to ask the driver to do flow</div><div class='add'>+throttle()		Called by the ldisc to ask the driver to do flow</div><div class='ctx'> 			control.  Serialization including with unthrottle</div><div class='ctx'> 			is the job of the ldisc layer.</div><div class='ctx'> </div><div class='del'>-unthrottle()	-	Called by the ldisc to ask the driver to stop flow</div><div class='add'>+unthrottle()		Called by the ldisc to ask the driver to stop flow</div><div class='ctx'> 			control.</div><div class='ctx'> </div><div class='del'>-stop()		-	Ldisc notifier to the driver to stop output. As with</div><div class='add'>+stop()			Ldisc notifier to the driver to stop output. As with</div><div class='ctx'> 			throttle the serializations with start() are down</div><div class='ctx'> 			to the ldisc layer.</div><div class='ctx'> </div><div class='del'>-start()		-	Ldisc notifier to the driver to start output.</div><div class='add'>+start()			Ldisc notifier to the driver to start output.</div><div class='ctx'> </div><div class='del'>-hangup()	-	Ask the tty driver to cause a hangup initiated</div><div class='add'>+hangup()		Ask the tty driver to cause a hangup initiated</div><div class='ctx'> 			from the host side. [Can sleep ??]</div><div class='ctx'> </div><div class='del'>-break_ctl()	-	Send RS232 break. Can sleep. Can get called in</div><div class='add'>+break_ctl()		Send RS232 break. Can sleep. Can get called in</div><div class='ctx'> 			parallel, driver must serialize (for now), and</div><div class='ctx'> 			with write calls.</div><div class='ctx'> </div><div class='del'>-wait_until_sent() -	Wait for characters to exit the hardware queue</div><div class='add'>+wait_until_sent()	Wait for characters to exit the hardware queue</div><div class='ctx'> 			of the driver. Can sleep</div><div class='ctx'> </div><div class='del'>-send_xchar()	  -	Send XON/XOFF and if possible jump the queue with</div><div class='add'>+send_xchar()	  	Send XON/XOFF and if possible jump the queue with</div><div class='ctx'> 			it in order to get fast flow control responses.</div><div class='ctx'> 			Cannot sleep ??</div><div class='del'>-</div><div class='add'>+======================= =======================================================</div><div class='head'>diff --git a/Documentation/speculation.txt b/Documentation/speculation.txt<br/>index e9e6cbae2841..50d7ea857cff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/speculation.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/speculation.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/speculation.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/speculation.txt</a></div><div class='hunk'>@@ -17,7 +17,7 @@ observed to extract secret information.</div><div class='ctx'> </div><div class='ctx'> For example, in the presence of branch prediction, it is possible for bounds</div><div class='ctx'> checks to be ignored by code which is speculatively executed. Consider the</div><div class='del'>-following code:</div><div class='add'>+following code::</div><div class='ctx'> </div><div class='ctx'> 	int load_array(int *array, unsigned int index)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -27,7 +27,7 @@ following code:</div><div class='ctx'> 			return array[index];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-Which, on arm64, may be compiled to an assembly sequence such as:</div><div class='add'>+Which, on arm64, may be compiled to an assembly sequence such as::</div><div class='ctx'> </div><div class='ctx'> 	CMP	&lt;index&gt;, #MAX_ARRAY_ELEMS</div><div class='ctx'> 	B.LT	less</div><div class='hunk'>@@ -44,7 +44,7 @@ microarchitectural state which can be subsequently measured.</div><div class='ctx'> </div><div class='ctx'> More complex sequences involving multiple dependent memory accesses may</div><div class='ctx'> result in sensitive information being leaked. Consider the following</div><div class='del'>-code, building on the prior example:</div><div class='add'>+code, building on the prior example::</div><div class='ctx'> </div><div class='ctx'> 	int load_dependent_arrays(int *arr1, int *arr2, int index)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -77,7 +77,7 @@ A call to array_index_nospec(index, size) returns a sanitized index</div><div class='ctx'> value that is bounded to [0, size) even under cpu speculation</div><div class='ctx'> conditions.</div><div class='ctx'> </div><div class='del'>-This can be used to protect the earlier load_array() example:</div><div class='add'>+This can be used to protect the earlier load_array() example::</div><div class='ctx'> </div><div class='ctx'> 	int load_array(int *array, unsigned int index)</div><div class='ctx'> 	{</div><div class='head'>diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary<br/>index 1721c1b570c3..1a63194b74d7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/spi/spi-summary?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/spi/spi-summary</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/spi/spi-summary?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/spi/spi-summary</a></div><div class='hunk'>@@ -572,6 +572,12 @@ SPI MASTER METHODS</div><div class='ctx'> 	0: transfer is finished</div><div class='ctx'> 	1: transfer is still in progress</div><div class='ctx'> </div><div class='add'>+    master-&gt;set_cs_timing(struct spi_device *spi, u8 setup_clk_cycles,</div><div class='add'>+			      u8 hold_clk_cycles, u8 inactive_clk_cycles)</div><div class='add'>+	This method allows SPI client drivers to request SPI master controller</div><div class='add'>+	for configuring device specific CS setup, hold and inactive timing</div><div class='add'>+	requirements.</div><div class='add'>+</div><div class='ctx'>     DEPRECATED METHODS</div><div class='ctx'> </div><div class='ctx'>     master-&gt;transfer(struct spi_device *spi, struct spi_message *message)</div><div class='head'>diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt<br/>index aa058aa7bf28..f0c86fbb3b48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/sysctl/kernel.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/sysctl/kernel.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/sysctl/kernel.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/sysctl/kernel.txt</a></div><div class='hunk'>@@ -196,7 +196,7 @@ CAP_LAST_CAP from the kernel.</div><div class='ctx'> core_pattern:</div><div class='ctx'> </div><div class='ctx'> core_pattern is used to specify a core dumpfile pattern name.</div><div class='del'>-. max length 128 characters; default value is "core"</div><div class='add'>+. max length 127 characters; default value is "core"</div><div class='ctx'> . core_pattern is used as a pattern template for the output filename;</div><div class='ctx'>   certain string patterns (beginning with '%') are substituted with</div><div class='ctx'>   their actual values.</div><div class='head'>diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt<br/>index 6af24cdb25cc..3f13d8599337 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/sysctl/vm.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/sysctl/vm.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/sysctl/vm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/sysctl/vm.txt</a></div><div class='hunk'>@@ -866,14 +866,14 @@ The intent is that compaction has less work to do in the future and to</div><div class='ctx'> increase the success rate of future high-order allocations such as SLUB</div><div class='ctx'> allocations, THP and hugetlbfs pages.</div><div class='ctx'> </div><div class='del'>-To make it sensible with respect to the watermark_scale_factor parameter,</div><div class='del'>-the unit is in fractions of 10,000. The default value of 15,000 means</div><div class='del'>-that up to 150% of the high watermark will be reclaimed in the event of</div><div class='del'>-a pageblock being mixed due to fragmentation. The level of reclaim is</div><div class='del'>-determined by the number of fragmentation events that occurred in the</div><div class='del'>-recent past. If this value is smaller than a pageblock then a pageblocks</div><div class='del'>-worth of pages will be reclaimed (e.g.  2MB on 64-bit x86). A boost factor</div><div class='del'>-of 0 will disable the feature.</div><div class='add'>+To make it sensible with respect to the watermark_scale_factor</div><div class='add'>+parameter, the unit is in fractions of 10,000. The default value of</div><div class='add'>+15,000 on !DISCONTIGMEM configurations means that up to 150% of the high</div><div class='add'>+watermark will be reclaimed in the event of a pageblock being mixed due</div><div class='add'>+to fragmentation. The level of reclaim is determined by the number of</div><div class='add'>+fragmentation events that occurred in the recent past. If this value is</div><div class='add'>+smaller than a pageblock then a pageblocks worth of pages will be reclaimed</div><div class='add'>+(e.g.  2MB on 64-bit x86). A boost factor of 0 will disable the feature.</div><div class='ctx'> </div><div class='ctx'> =============================================================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt<br/>index 911399730c1c..c3fa500df92c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/thermal/sysfs-api.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/thermal/sysfs-api.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/thermal/sysfs-api.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/thermal/sysfs-api.txt</a></div><div class='hunk'>@@ -316,7 +316,7 @@ ACPI thermal zones.</div><div class='ctx'>     |---temp[1-*]_input:	The current temperature of thermal zone [1-*]</div><div class='ctx'>     |---temp[1-*]_critical:	The critical trip point of thermal zone [1-*]</div><div class='ctx'> </div><div class='del'>-Please read Documentation/hwmon/sysfs-interface for additional information.</div><div class='add'>+Please read Documentation/hwmon/sysfs-interface.rst for additional information.</div><div class='ctx'> </div><div class='ctx'> ***************************</div><div class='ctx'> * Thermal zone attributes *</div><div class='head'>diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst<br/>index 7c5e6d6ab5d1..c3b9bd2fd512 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/trace/ftrace.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/trace/ftrace.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/trace/ftrace.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/trace/ftrace.rst</a></div><div class='hunk'>@@ -1404,6 +1404,7 @@ trace has provided some very helpful debugging information.</div><div class='ctx'> </div><div class='ctx'> If we prefer function graph output instead of function, we can set</div><div class='ctx'> display-graph option::</div><div class='add'>+</div><div class='ctx'>  with echo 1 &gt; options/display-graph</div><div class='ctx'> </div><div class='ctx'>   # tracer: irqsoff</div><div class='head'>diff --git a/Documentation/trace/histogram.rst b/Documentation/trace/histogram.rst<br/>index 0ea59d45aef1..f95d94d19c22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/trace/histogram.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/trace/histogram.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/trace/histogram.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/trace/histogram.rst</a></div><div class='hunk'>@@ -2133,33 +2133,33 @@ The following commonly-used handler.action pairs are available:</div><div class='ctx'>     the end the event that triggered the snapshot (in this case you</div><div class='ctx'>     can verify the timestamps between the sched_waking and</div><div class='ctx'>     sched_switch events, which should match the time displayed in the</div><div class='del'>-    global maximum):</div><div class='del'>-</div><div class='del'>-    # cat /sys/kernel/debug/tracing/snapshot</div><div class='del'>-</div><div class='del'>-     &lt;...&gt;-2103  [005] d..3   309.873125: sched_switch: prev_comm=cyclictest prev_pid=2103 prev_prio=19 prev_state=D ==&gt; next_comm=swapper/5 next_pid=0 next_prio=120</div><div class='del'>-     &lt;idle&gt;-0     [005] d.h3   309.873611: sched_waking: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='del'>-     &lt;idle&gt;-0     [005] dNh4   309.873613: sched_wakeup: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='del'>-     &lt;idle&gt;-0     [005] d..3   309.873616: sched_switch: prev_comm=swapper/5 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=cyclictest next_pid=2102 next_prio=19</div><div class='del'>-     &lt;...&gt;-2102  [005] d..3   309.873625: sched_switch: prev_comm=cyclictest prev_pid=2102 prev_prio=19 prev_state=D ==&gt; next_comm=swapper/5 next_pid=0 next_prio=120</div><div class='del'>-     &lt;idle&gt;-0     [005] d.h3   309.874624: sched_waking: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='del'>-     &lt;idle&gt;-0     [005] dNh4   309.874626: sched_wakeup: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='del'>-     &lt;idle&gt;-0     [005] dNh3   309.874628: sched_waking: comm=cyclictest pid=2103 prio=19 target_cpu=005</div><div class='del'>-     &lt;idle&gt;-0     [005] dNh4   309.874630: sched_wakeup: comm=cyclictest pid=2103 prio=19 target_cpu=005</div><div class='del'>-     &lt;idle&gt;-0     [005] d..3   309.874633: sched_switch: prev_comm=swapper/5 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=cyclictest next_pid=2102 next_prio=19</div><div class='del'>-     &lt;idle&gt;-0     [004] d.h3   309.874757: sched_waking: comm=gnome-terminal- pid=1699 prio=120 target_cpu=004</div><div class='del'>-     &lt;idle&gt;-0     [004] dNh4   309.874762: sched_wakeup: comm=gnome-terminal- pid=1699 prio=120 target_cpu=004</div><div class='del'>-     &lt;idle&gt;-0     [004] d..3   309.874766: sched_switch: prev_comm=swapper/4 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=gnome-terminal- next_pid=1699 next_prio=120</div><div class='del'>- gnome-terminal--1699  [004] d.h2   309.874941: sched_stat_runtime: comm=gnome-terminal- pid=1699 runtime=180706 [ns] vruntime=1126870572 [ns]</div><div class='del'>-     &lt;idle&gt;-0     [003] d.s4   309.874956: sched_waking: comm=rcu_sched pid=9 prio=120 target_cpu=007</div><div class='del'>-     &lt;idle&gt;-0     [003] d.s5   309.874960: sched_wake_idle_without_ipi: cpu=7</div><div class='del'>-     &lt;idle&gt;-0     [003] d.s5   309.874961: sched_wakeup: comm=rcu_sched pid=9 prio=120 target_cpu=007</div><div class='del'>-     &lt;idle&gt;-0     [007] d..3   309.874963: sched_switch: prev_comm=swapper/7 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=rcu_sched next_pid=9 next_prio=120</div><div class='del'>-  rcu_sched-9     [007] d..3   309.874973: sched_stat_runtime: comm=rcu_sched pid=9 runtime=13646 [ns] vruntime=22531430286 [ns]</div><div class='del'>-  rcu_sched-9     [007] d..3   309.874978: sched_switch: prev_comm=rcu_sched prev_pid=9 prev_prio=120 prev_state=R+ ==&gt; next_comm=swapper/7 next_pid=0 next_prio=120</div><div class='del'>-      &lt;...&gt;-2102  [005] d..4   309.874994: sched_migrate_task: comm=cyclictest pid=2103 prio=19 orig_cpu=5 dest_cpu=1</div><div class='del'>-      &lt;...&gt;-2102  [005] d..4   309.875185: sched_wake_idle_without_ipi: cpu=1</div><div class='del'>-     &lt;idle&gt;-0     [001] d..3   309.875200: sched_switch: prev_comm=swapper/1 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=cyclictest next_pid=2103 next_prio=19</div><div class='add'>+    global maximum)::</div><div class='add'>+</div><div class='add'>+     # cat /sys/kernel/debug/tracing/snapshot</div><div class='add'>+</div><div class='add'>+         &lt;...&gt;-2103  [005] d..3   309.873125: sched_switch: prev_comm=cyclictest prev_pid=2103 prev_prio=19 prev_state=D ==&gt; next_comm=swapper/5 next_pid=0 next_prio=120</div><div class='add'>+         &lt;idle&gt;-0     [005] d.h3   309.873611: sched_waking: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='add'>+         &lt;idle&gt;-0     [005] dNh4   309.873613: sched_wakeup: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='add'>+         &lt;idle&gt;-0     [005] d..3   309.873616: sched_switch: prev_comm=swapper/5 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=cyclictest next_pid=2102 next_prio=19</div><div class='add'>+         &lt;...&gt;-2102  [005] d..3   309.873625: sched_switch: prev_comm=cyclictest prev_pid=2102 prev_prio=19 prev_state=D ==&gt; next_comm=swapper/5 next_pid=0 next_prio=120</div><div class='add'>+         &lt;idle&gt;-0     [005] d.h3   309.874624: sched_waking: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='add'>+         &lt;idle&gt;-0     [005] dNh4   309.874626: sched_wakeup: comm=cyclictest pid=2102 prio=19 target_cpu=005</div><div class='add'>+         &lt;idle&gt;-0     [005] dNh3   309.874628: sched_waking: comm=cyclictest pid=2103 prio=19 target_cpu=005</div><div class='add'>+         &lt;idle&gt;-0     [005] dNh4   309.874630: sched_wakeup: comm=cyclictest pid=2103 prio=19 target_cpu=005</div><div class='add'>+         &lt;idle&gt;-0     [005] d..3   309.874633: sched_switch: prev_comm=swapper/5 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=cyclictest next_pid=2102 next_prio=19</div><div class='add'>+         &lt;idle&gt;-0     [004] d.h3   309.874757: sched_waking: comm=gnome-terminal- pid=1699 prio=120 target_cpu=004</div><div class='add'>+         &lt;idle&gt;-0     [004] dNh4   309.874762: sched_wakeup: comm=gnome-terminal- pid=1699 prio=120 target_cpu=004</div><div class='add'>+         &lt;idle&gt;-0     [004] d..3   309.874766: sched_switch: prev_comm=swapper/4 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=gnome-terminal- next_pid=1699 next_prio=120</div><div class='add'>+     gnome-terminal--1699  [004] d.h2   309.874941: sched_stat_runtime: comm=gnome-terminal- pid=1699 runtime=180706 [ns] vruntime=1126870572 [ns]</div><div class='add'>+         &lt;idle&gt;-0     [003] d.s4   309.874956: sched_waking: comm=rcu_sched pid=9 prio=120 target_cpu=007</div><div class='add'>+         &lt;idle&gt;-0     [003] d.s5   309.874960: sched_wake_idle_without_ipi: cpu=7</div><div class='add'>+         &lt;idle&gt;-0     [003] d.s5   309.874961: sched_wakeup: comm=rcu_sched pid=9 prio=120 target_cpu=007</div><div class='add'>+         &lt;idle&gt;-0     [007] d..3   309.874963: sched_switch: prev_comm=swapper/7 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=rcu_sched next_pid=9 next_prio=120</div><div class='add'>+      rcu_sched-9     [007] d..3   309.874973: sched_stat_runtime: comm=rcu_sched pid=9 runtime=13646 [ns] vruntime=22531430286 [ns]</div><div class='add'>+      rcu_sched-9     [007] d..3   309.874978: sched_switch: prev_comm=rcu_sched prev_pid=9 prev_prio=120 prev_state=R+ ==&gt; next_comm=swapper/7 next_pid=0 next_prio=120</div><div class='add'>+          &lt;...&gt;-2102  [005] d..4   309.874994: sched_migrate_task: comm=cyclictest pid=2103 prio=19 orig_cpu=5 dest_cpu=1</div><div class='add'>+          &lt;...&gt;-2102  [005] d..4   309.875185: sched_wake_idle_without_ipi: cpu=1</div><div class='add'>+         &lt;idle&gt;-0     [001] d..3   309.875200: sched_switch: prev_comm=swapper/1 prev_pid=0 prev_prio=120 prev_state=S ==&gt; next_comm=cyclictest next_pid=2103 next_prio=19</div><div class='ctx'> </div><div class='ctx'>   - onchange(var).save(field,..	.)</div><div class='ctx'> </div><div class='hunk'>@@ -2213,9 +2213,10 @@ The following commonly-used handler.action pairs are available:</div><div class='ctx'>     following the rest of the fields.</div><div class='ctx'> </div><div class='ctx'>     If a snaphot was taken, there is also a message indicating that,</div><div class='del'>-    along with the value and event that triggered the snapshot:</div><div class='add'>+    along with the value and event that triggered the snapshot::</div><div class='add'>+</div><div class='add'>+      # cat /sys/kernel/debug/tracing/events/tcp/tcp_probe/hist</div><div class='ctx'> </div><div class='del'>-    # cat /sys/kernel/debug/tracing/events/tcp/tcp_probe/hist</div><div class='ctx'>       { dport:       1521 } hitcount:          8</div><div class='ctx'> 	changed:         10  snd_wnd:      35456  srtt:     154262  rcv_wnd:      42112</div><div class='ctx'> </div><div class='hunk'>@@ -2228,14 +2229,15 @@ The following commonly-used handler.action pairs are available:</div><div class='ctx'>       { dport:        443 } hitcount:        211</div><div class='ctx'> 	changed:         10  snd_wnd:      26960  srtt:      17379  rcv_wnd:      28800</div><div class='ctx'> </div><div class='del'>-    Snapshot taken (see tracing/snapshot).  Details:</div><div class='add'>+    Snapshot taken (see tracing/snapshot).  Details::</div><div class='add'>+</div><div class='ctx'>         triggering value { onchange($cwnd) }:         10</div><div class='ctx'>         triggered by event with key: { dport:         80 }</div><div class='ctx'> </div><div class='del'>-    Totals:</div><div class='del'>-        Hits: 414</div><div class='del'>-        Entries: 4</div><div class='del'>-        Dropped: 0</div><div class='add'>+      Totals:</div><div class='add'>+          Hits: 414</div><div class='add'>+          Entries: 4</div><div class='add'>+          Dropped: 0</div><div class='ctx'> </div><div class='ctx'>     In the above case, the event that triggered the snapshot has the</div><div class='ctx'>     key with dport == 80.  If you look at the bucket that has 80 as</div><div class='hunk'>@@ -2245,18 +2247,18 @@ The following commonly-used handler.action pairs are available:</div><div class='ctx'>     the global snapshot).</div><div class='ctx'> </div><div class='ctx'>     And finally, looking at the snapshot data should show at or near</div><div class='del'>-    the end the event that triggered the snapshot:</div><div class='del'>-</div><div class='del'>-    # cat /sys/kernel/debug/tracing/snapshot</div><div class='del'>-</div><div class='del'>-       gnome-shell-1261  [006] dN.3    49.823113: sched_stat_runtime: comm=gnome-shell pid=1261 runtime=49347 [ns] vruntime=1835730389 [ns]</div><div class='del'>-     kworker/u16:4-773   [003] d..3    49.823114: sched_switch: prev_comm=kworker/u16:4 prev_pid=773 prev_prio=120 prev_state=R+ ==&gt; next_comm=kworker/3:2 next_pid=135 next_prio=120</div><div class='del'>-       gnome-shell-1261  [006] d..3    49.823114: sched_switch: prev_comm=gnome-shell prev_pid=1261 prev_prio=120 prev_state=R+ ==&gt; next_comm=kworker/6:2 next_pid=387 next_prio=120</div><div class='del'>-       kworker/3:2-135   [003] d..3    49.823118: sched_stat_runtime: comm=kworker/3:2 pid=135 runtime=5339 [ns] vruntime=17815800388 [ns]</div><div class='del'>-       kworker/6:2-387   [006] d..3    49.823120: sched_stat_runtime: comm=kworker/6:2 pid=387 runtime=9594 [ns] vruntime=14589605367 [ns]</div><div class='del'>-       kworker/6:2-387   [006] d..3    49.823122: sched_switch: prev_comm=kworker/6:2 prev_pid=387 prev_prio=120 prev_state=R+ ==&gt; next_comm=gnome-shell next_pid=1261 next_prio=120</div><div class='del'>-       kworker/3:2-135   [003] d..3    49.823123: sched_switch: prev_comm=kworker/3:2 prev_pid=135 prev_prio=120 prev_state=T ==&gt; next_comm=swapper/3 next_pid=0 next_prio=120</div><div class='del'>-            &lt;idle&gt;-0     [004] ..s7    49.823798: tcp_probe: src=10.0.0.10:54326 dest=23.215.104.193:80 mark=0x0 length=32 snd_nxt=0xe3ae2ff5 snd_una=0xe3ae2ecd snd_cwnd=10 ssthresh=2147483647 snd_wnd=28960 srtt=19604 rcv_wnd=29312</div><div class='add'>+    the end the event that triggered the snapshot::</div><div class='add'>+</div><div class='add'>+      # cat /sys/kernel/debug/tracing/snapshot</div><div class='add'>+</div><div class='add'>+         gnome-shell-1261  [006] dN.3    49.823113: sched_stat_runtime: comm=gnome-shell pid=1261 runtime=49347 [ns] vruntime=1835730389 [ns]</div><div class='add'>+       kworker/u16:4-773   [003] d..3    49.823114: sched_switch: prev_comm=kworker/u16:4 prev_pid=773 prev_prio=120 prev_state=R+ ==&gt; next_comm=kworker/3:2 next_pid=135 next_prio=120</div><div class='add'>+         gnome-shell-1261  [006] d..3    49.823114: sched_switch: prev_comm=gnome-shell prev_pid=1261 prev_prio=120 prev_state=R+ ==&gt; next_comm=kworker/6:2 next_pid=387 next_prio=120</div><div class='add'>+         kworker/3:2-135   [003] d..3    49.823118: sched_stat_runtime: comm=kworker/3:2 pid=135 runtime=5339 [ns] vruntime=17815800388 [ns]</div><div class='add'>+         kworker/6:2-387   [006] d..3    49.823120: sched_stat_runtime: comm=kworker/6:2 pid=387 runtime=9594 [ns] vruntime=14589605367 [ns]</div><div class='add'>+         kworker/6:2-387   [006] d..3    49.823122: sched_switch: prev_comm=kworker/6:2 prev_pid=387 prev_prio=120 prev_state=R+ ==&gt; next_comm=gnome-shell next_pid=1261 next_prio=120</div><div class='add'>+         kworker/3:2-135   [003] d..3    49.823123: sched_switch: prev_comm=kworker/3:2 prev_pid=135 prev_prio=120 prev_state=T ==&gt; next_comm=swapper/3 next_pid=0 next_prio=120</div><div class='add'>+              &lt;idle&gt;-0     [004] ..s7    49.823798: tcp_probe: src=10.0.0.10:54326 dest=23.215.104.193:80 mark=0x0 length=32 snd_nxt=0xe3ae2ff5 snd_una=0xe3ae2ecd snd_cwnd=10 ssthresh=2147483647 snd_wnd=28960 srtt=19604 rcv_wnd=29312</div><div class='ctx'> </div><div class='ctx'> 3. User space creating a trigger</div><div class='ctx'> --------------------------------</div><div class='head'>diff --git a/Documentation/trace/intel_th.rst b/Documentation/trace/intel_th.rst<br/>index 19e2d633f3c7..baa12eb09ef4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/trace/intel_th.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/trace/intel_th.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/trace/intel_th.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/trace/intel_th.rst</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> =======================</div><div class='ctx'> Intel(R) Trace Hub (TH)</div><div class='ctx'> =======================</div><div class='head'>diff --git a/Documentation/translations/index.rst b/Documentation/translations/index.rst<br/>index 7f77c52d33aa..e446e5ed00a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/index.rst</a></div><div class='hunk'>@@ -11,3 +11,43 @@ Translations</div><div class='ctx'>    it_IT/index</div><div class='ctx'>    ko_KR/index</div><div class='ctx'>    ja_JP/index</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. _translations_disclaimer:</div><div class='add'>+</div><div class='add'>+Disclaimer</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Translation's purpose is to ease reading and understanding in languages other</div><div class='add'>+than English. Its aim is to help people who do not understand English or have</div><div class='add'>+doubts about its interpretation. Additionally, some people prefer to read</div><div class='add'>+documentation in their native language, but please bear in mind that the</div><div class='add'>+*only* official documentation is the English one: :ref:`linux_doc`.</div><div class='add'>+</div><div class='add'>+It is very unlikely that an update to :ref:`linux_doc` will be propagated</div><div class='add'>+immediately to all translations.  Translations' maintainers - and</div><div class='add'>+contributors - follow the evolution of the official documentation and they</div><div class='add'>+maintain translations aligned as much as they can.  For this reason there is</div><div class='add'>+no guarantee that a translation is up to date.  If what you read in a</div><div class='add'>+translation does not sound right compared to what you read in the code, please</div><div class='add'>+inform the translation maintainer and - if you can - check also the English</div><div class='add'>+documentation.</div><div class='add'>+</div><div class='add'>+A translation is not a fork of the official documentation, therefore</div><div class='add'>+translations' users should not find information that differs from the official</div><div class='add'>+English documentation.  Any content addition, removal or update, must be</div><div class='add'>+applied to the English documents first.  Afterwards and when possible, the</div><div class='add'>+same change should be applied to translations.  Translations' maintainers</div><div class='add'>+accept only contributions that are merely translation related (e.g. new</div><div class='add'>+translations, updates, fixes).</div><div class='add'>+</div><div class='add'>+Translations try to be as accurate as possible but it is not possible to map</div><div class='add'>+one language directly to all other languages. Each language has its own</div><div class='add'>+grammar and culture, so the translation of an English statement may need to be</div><div class='add'>+adapted to fit a different language.  For this reason, when viewing</div><div class='add'>+translations, you may find slight differences that carry the same message but</div><div class='add'>+in a different form.</div><div class='add'>+</div><div class='add'>+If you need to communicate with the Linux community but you do not feel</div><div class='add'>+comfortable writing in English, you can ask the translation's maintainers</div><div class='add'>+for help.</div><div class='head'>diff --git a/Documentation/translations/it_IT/core-api/memory-allocation.rst b/Documentation/translations/it_IT/core-api/memory-allocation.rst<br/>new file mode 100644<br/>index 000000000000..11d5148f8d6b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/core-api/memory-allocation.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/core-api/memory-allocation.rst</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+.. include:: ../disclaimer-ita.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/core-api/memory-allocation.rst &lt;memory_allocation&gt;`</div><div class='add'>+</div><div class='add'>+.. _it_memory_allocation:</div><div class='add'>+</div><div class='add'>+================================</div><div class='add'>+Guida all'allocazione di memoria</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+    TODO ancora da tradurre</div><div class='head'>diff --git a/Documentation/translations/it_IT/disclaimer-ita.rst b/Documentation/translations/it_IT/disclaimer-ita.rst<br/>index d68e52de6a5d..bfe8a384baed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/disclaimer-ita.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/disclaimer-ita.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/disclaimer-ita.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/disclaimer-ita.rst</a></div><div class='hunk'>@@ -1,13 +1,6 @@</div><div class='ctx'> :orphan:</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-   This document is maintained by Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;.</div><div class='del'>-   If you find any difference between this document and the original file or a</div><div class='del'>-   problem with the translation, please contact the maintainer of this file.</div><div class='del'>-   Following people helped to translate or review:</div><div class='del'>-   Alessia Mantegazza &lt;amantegazza@vaga.pv.it&gt;</div><div class='del'>-</div><div class='ctx'> .. warning::</div><div class='del'>-   The purpose of this file is to be easier to read and understand for Italian</div><div class='del'>-   speakers and is not intended as a fork. So, if you have any comments or</div><div class='del'>-   updates for this file please try to update the original English file first.</div><div class='add'>+   In caso di dubbi sulla correttezza del contenuto di questa traduzione,</div><div class='add'>+   l'unico riferimento valido è la documentazione ufficiale in inglese.</div><div class='add'>+   Per maggiori informazioni consultate le :ref:`avvertenze &lt;it_disclaimer&gt;`.</div><div class='head'>diff --git a/Documentation/translations/it_IT/doc-guide/index.rst b/Documentation/translations/it_IT/doc-guide/index.rst<br/>index 7a6562b547ee..9fffff626711 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/doc-guide/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/doc-guide/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/doc-guide/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/doc-guide/index.rst</a></div><div class='hunk'>@@ -12,9 +12,9 @@ Come scrivere la documentazione del kernel</div><div class='ctx'> .. toctree::</div><div class='ctx'>    :maxdepth: 1</div><div class='ctx'> </div><div class='del'>-   sphinx.rst</div><div class='del'>-   kernel-doc.rst</div><div class='del'>-   parse-headers.rst</div><div class='add'>+   sphinx</div><div class='add'>+   kernel-doc</div><div class='add'>+   parse-headers</div><div class='ctx'> </div><div class='ctx'> .. only::  subproject and html</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/it_IT/index.rst b/Documentation/translations/it_IT/index.rst<br/>index ea9b2916b3e4..409eaac03e9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/index.rst</a></div><div class='hunk'>@@ -4,26 +4,49 @@</div><div class='ctx'> Traduzione italiana</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='del'>-L'obiettivo di questa traduzione è di rendere più facile la lettura e</div><div class='del'>-la comprensione per chi preferisce leggere in lingua italiana.</div><div class='del'>-Tenete presente che la documentazione di riferimento rimane comunque</div><div class='del'>-quella in lingua inglese: :ref:`linux_doc`</div><div class='del'>-</div><div class='del'>-Questa traduzione cerca di essere il più fedele possibile all'originale ma</div><div class='del'>-è ovvio che alcune frasi vadano trasformate: non aspettatevi una traduzione</div><div class='del'>-letterale. Quando possibile, si eviteranno gli inglesismi ed al loro posto</div><div class='del'>-verranno utilizzate le corrispettive parole italiane.</div><div class='add'>+:manutentore: Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;</div><div class='ctx'> </div><div class='del'>-Se notate che la traduzione non è più aggiornata potete contattare</div><div class='del'>-direttamente il manutentore della traduzione italiana.</div><div class='add'>+.. _it_disclaimer:</div><div class='ctx'> </div><div class='del'>-Se notate che la documentazione contiene errori o dimenticanze, allora</div><div class='del'>-verificate la documentazione di riferimento in lingua inglese. Se il problema</div><div class='del'>-è presente anche nella documentazione di riferimento, contattate il suo</div><div class='del'>-manutentore. Se avete problemi a scrivere in inglese, potete comunque</div><div class='del'>-riportare il problema al manutentore della traduzione italiana.</div><div class='add'>+Avvertenze</div><div class='add'>+==========</div><div class='ctx'> </div><div class='del'>-Manutentore della traduzione italiana: Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;</div><div class='add'>+L'obiettivo di questa traduzione è di rendere più facile la lettura e</div><div class='add'>+la comprensione per chi non capisce l'inglese o ha dubbi sulla sua</div><div class='add'>+interpretazione, oppure semplicemente per chi preferisce leggere in lingua</div><div class='add'>+italiana. Tuttavia, tenete ben presente che l'*unica* documentazione</div><div class='add'>+ufficiale è quella in lingua inglese: :ref:`linux_doc`</div><div class='add'>+</div><div class='add'>+La propagazione simultanea a tutte le traduzioni di una modifica in</div><div class='add'>+:ref:`linux_doc` è altamente improbabile. I manutentori delle traduzioni -</div><div class='add'>+e i contributori - seguono l'evolversi della documentazione ufficiale e</div><div class='add'>+cercano di mantenere le rispettive traduzioni allineate nel limite del</div><div class='add'>+possibile.  Per questo motivo non c'è garanzia che una traduzione sia</div><div class='add'>+aggiornata all'ultima modifica.  Se quello che leggete in una traduzione</div><div class='add'>+non corrisponde a quello che leggete nel codice, informate il manutentore</div><div class='add'>+della traduzione e - se potete - verificate anche la documentazione in</div><div class='add'>+inglese.</div><div class='add'>+</div><div class='add'>+Una traduzione non è un *fork* della documentazione ufficiale, perciò gli</div><div class='add'>+utenti non vi troveranno alcuna informazione diversa rispetto alla versione</div><div class='add'>+ufficiale.  Ogni aggiunta, rimozione o modifica dei contenuti deve essere</div><div class='add'>+fatta prima nei documenti in inglese. In seguito, e quando è possibile, la</div><div class='add'>+stessa modifica dovrebbe essere applicata anche alle traduzioni.  I manutentori</div><div class='add'>+delle traduzioni accettano contributi che interessano prettamente l'attività</div><div class='add'>+di traduzione (per esempio, nuove traduzioni, aggiornamenti, correzioni).</div><div class='add'>+</div><div class='add'>+Le traduzioni cercano di essere il più possibile accurate ma non è possibile</div><div class='add'>+mappare direttamente una lingua in un'altra. Ogni lingua ha la sua grammatica</div><div class='add'>+e una sua cultura alle spalle, quindi la traduzione di una frase in inglese</div><div class='add'>+potrebbe essere modificata per adattarla all'italiano. Per questo motivo,</div><div class='add'>+quando leggete questa traduzione, potreste trovare alcune differenze di forma</div><div class='add'>+ma che trasmettono comunque il messaggio originale.  Nonostante la grande</div><div class='add'>+diffusione di inglesismi nella lingua parlata, quando possibile, questi</div><div class='add'>+verranno sostituiti dalle corrispettive parole italiane</div><div class='add'>+</div><div class='add'>+Se avete bisogno d'aiuto per comunicare con la comunità Linux ma non vi sentite</div><div class='add'>+a vostro agio nello scrivere in inglese, potete chiedere aiuto al manutentore</div><div class='add'>+della traduzione.</div><div class='ctx'> </div><div class='ctx'> La documentazione del kernel Linux</div><div class='ctx'> ==================================</div><div class='hunk'>@@ -47,9 +70,7 @@ I seguenti documenti descrivono la licenza usata nei sorgenti del kernel Linux</div><div class='ctx'> (GPLv2), come licenziare i singoli file; inoltre troverete i riferimenti al</div><div class='ctx'> testo integrale della licenza.</div><div class='ctx'> </div><div class='del'>-.. warning::</div><div class='del'>-</div><div class='del'>-    TODO ancora da tradurre</div><div class='add'>+* :ref:`it_kernel_licensing`</div><div class='ctx'> </div><div class='ctx'> Documentazione per gli utenti</div><div class='ctx'> -----------------------------</div><div class='hunk'>@@ -90,10 +111,6 @@ vostre modifiche molto più semplice</div><div class='ctx'>    doc-guide/index</div><div class='ctx'>    kernel-hacking/index</div><div class='ctx'> </div><div class='del'>-.. warning::</div><div class='del'>-</div><div class='del'>-    TODO ancora da tradurre</div><div class='del'>-</div><div class='ctx'> Documentazione della API del kernel</div><div class='ctx'> -----------------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/it_IT/networking/netdev-FAQ.rst b/Documentation/translations/it_IT/networking/netdev-FAQ.rst<br/>new file mode 100644<br/>index 000000000000..8489ead7cff1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/networking/netdev-FAQ.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/networking/netdev-FAQ.rst</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+.. include:: ../disclaimer-ita.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='add'>+</div><div class='add'>+.. _it_netdev-FAQ:</div><div class='add'>+</div><div class='add'>+==========</div><div class='add'>+netdev FAQ</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+    TODO ancora da tradurre</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/5.Posting.rst b/Documentation/translations/it_IT/process/5.Posting.rst<br/>index b979266aa884..1476d51eb5e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/5.Posting.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/5.Posting.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/5.Posting.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/5.Posting.rst</a></div><div class='hunk'>@@ -233,10 +233,12 @@ Le etichette in uso più comuni sono:</div><div class='ctx'>    :ref:`Documentation/translations/it_IT/process/submitting-patches.rst &lt;it_submittingpatches&gt;`.</div><div class='ctx'>    Codice che non presenta una firma appropriata non potrà essere integrato.</div><div class='ctx'> </div><div class='del'>- - Co-developed-by: indica che la patch è stata sviluppata anche da un altro</div><div class='del'>-   sviluppatore assieme all'autore originale.  Questo è utile quando più</div><div class='del'>-   persone lavorano sulla stessa patch.  Da notare che questa persona deve</div><div class='del'>-   avere anche una riga "Signed-off-by:" nella patch.</div><div class='add'>+ - Co-developed-by: indica che la patch è stata cosviluppata da diversi</div><div class='add'>+   sviluppatori; viene usato per assegnare più autori (in aggiunta a quello</div><div class='add'>+   associato all'etichetta From:) quando più persone lavorano ad una patch.</div><div class='add'>+   Ogni Co-developed-by: dev'essere seguito immediatamente da un Signed-off-by:</div><div class='add'>+   del corrispondente coautore.  Maggiori dettagli ed esempi sono disponibili</div><div class='add'>+   in :ref:`Documentation/translations/it_IT/process/submitting-patches.rst &lt;it_submittingpatches&gt;`.</div><div class='ctx'> </div><div class='ctx'>  - Acked-by: indica il consenso di un altro sviluppatore (spesso il manutentore</div><div class='ctx'>    del codice in oggetto) all'integrazione della patch nel kernel.</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/coding-style.rst b/Documentation/translations/it_IT/process/coding-style.rst<br/>index 2fd0e7f79d55..5ef534c95e69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/coding-style.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/coding-style.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/coding-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/coding-style.rst</a></div><div class='hunk'>@@ -859,7 +859,8 @@ racchiusa in #ifdef, potete usare printk(KERN_DEBUG ...).</div><div class='ctx'> </div><div class='ctx'> Il kernel fornisce i seguenti assegnatori ad uso generico:</div><div class='ctx'> kmalloc(), kzalloc(), kmalloc_array(), kcalloc(), vmalloc(), e vzalloc().</div><div class='del'>-Per maggiori informazioni, consultate la documentazione dell'API.</div><div class='add'>+Per maggiori informazioni, consultate la documentazione dell'API:</div><div class='add'>+:ref:`Documentation/translations/it_IT/core-api/memory-allocation.rst &lt;it_memory_allocation&gt;`</div><div class='ctx'> </div><div class='ctx'> Il modo preferito per passare la dimensione di una struttura è il seguente:</div><div class='ctx'> </div><div class='hunk'>@@ -890,6 +891,11 @@ Il modo preferito per assegnare un vettore a zero è il seguente:</div><div class='ctx'> Entrambe verificano la condizione di overflow per la dimensione</div><div class='ctx'> d'assegnamento n * sizeof(...), se accade ritorneranno NULL.</div><div class='ctx'> </div><div class='add'>+Questi allocatori generici producono uno *stack dump* in caso di fallimento</div><div class='add'>+a meno che non venga esplicitamente specificato __GFP_NOWARN. Quindi, nella</div><div class='add'>+maggior parte dei casi, è inutile stampare messaggi aggiuntivi quando uno di</div><div class='add'>+questi allocatori ritornano un puntatore NULL.</div><div class='add'>+</div><div class='ctx'> 15) Il morbo inline</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/it_IT/process/deprecated.rst b/Documentation/translations/it_IT/process/deprecated.rst<br/>new file mode 100644<br/>index 000000000000..776f26732a94<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/deprecated.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/deprecated.rst</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+.. include:: ../disclaimer-ita.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/deprecated.rst &lt;deprecated&gt;`</div><div class='add'>+:Translator: Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;</div><div class='add'>+</div><div class='add'>+.. _it_deprecated:</div><div class='add'>+</div><div class='add'>+==============================================================================</div><div class='add'>+Interfacce deprecate, caratteristiche del linguaggio, attributi, e convenzioni</div><div class='add'>+==============================================================================</div><div class='add'>+</div><div class='add'>+In un mondo perfetto, sarebbe possibile prendere tutti gli usi di</div><div class='add'>+un'interfaccia deprecata e convertirli in quella nuova, e così sarebbe</div><div class='add'>+possibile rimuovere la vecchia interfaccia in un singolo ciclo di sviluppo.</div><div class='add'>+Tuttavia, per via delle dimensioni del kernel, la gerarchia dei manutentori e</div><div class='add'>+le tempistiche, non è sempre possibile fare questo tipo di conversione tutta</div><div class='add'>+in una volta. Questo significa che nuove istanze di una vecchia interfaccia</div><div class='add'>+potrebbero aggiungersi al kernel proprio quando si sta cercando di rimuoverle,</div><div class='add'>+aumentando così il carico di lavoro. Al fine di istruire gli sviluppatori su</div><div class='add'>+cosa è considerato deprecato (e perché), è stata create la seguente lista a cui</div><div class='add'>+fare riferimento quando qualcuno propone modifiche che usano cose deprecate.</div><div class='add'>+</div><div class='add'>+__deprecated</div><div class='add'>+------------</div><div class='add'>+Nonostante questo attributo marchi visibilmente un interfaccia come deprecata,</div><div class='add'>+`non produce più alcun avviso durante la compilazione</div><div class='add'>+&lt;https://git.kernel.org/linus/771c035372a036f83353eef46dbb829780330234&gt;`_</div><div class='add'>+perché uno degli obiettivi del kernel è quello di compilare senza avvisi;</div><div class='add'>+inoltre, nessuno stava agendo per rimuovere queste interfacce. Nonostante l'uso</div><div class='add'>+di `__deprecated` in un file d'intestazione sia opportuno per segnare una</div><div class='add'>+interfaccia come 'vecchia', questa non è una soluzione completa. L'interfaccia</div><div class='add'>+deve essere rimossa dal kernel, o aggiunta a questo documento per scoraggiarne</div><div class='add'>+l'uso.</div><div class='add'>+</div><div class='add'>+Calcoli codificati negli argomenti di un allocatore</div><div class='add'>+----------------------------------------------------</div><div class='add'>+Il calcolo dinamico delle dimensioni (specialmente le moltiplicazioni) non</div><div class='add'>+dovrebbero essere fatto negli argomenti di funzioni di allocazione di memoria</div><div class='add'>+(o simili) per via del rischio di overflow. Questo può portare a valori più</div><div class='add'>+piccoli di quelli che il chiamante si aspettava. L'uso di questo modo di</div><div class='add'>+allocare può portare ad un overflow della memoria di heap e altri</div><div class='add'>+malfunzionamenti. (Si fa eccezione per valori numerici per i quali il</div><div class='add'>+compilatore può generare avvisi circa un potenziale overflow. Tuttavia usare</div><div class='add'>+i valori numerici come suggerito di seguito è innocuo).</div><div class='add'>+</div><div class='add'>+Per esempio, non usate ``count * size`` come argomento::</div><div class='add'>+</div><div class='add'>+	foo = kmalloc(count * size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+Al suo posto, si dovrebbe usare l'allocatore a due argomenti::</div><div class='add'>+</div><div class='add'>+	foo = kmalloc_array(count, size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+Se questo tipo di allocatore non è disponibile, allora dovrebbero essere usate</div><div class='add'>+le funzioni del tipo *saturate-on-overflow*::</div><div class='add'>+</div><div class='add'>+	bar = vmalloc(array_size(count, size));</div><div class='add'>+</div><div class='add'>+Un altro tipico caso da evitare è quello di calcolare la dimensione di una</div><div class='add'>+struttura seguita da un vettore di altre strutture, come nel seguente caso::</div><div class='add'>+</div><div class='add'>+	header = kzalloc(sizeof(*header) + count * sizeof(*header-&gt;item),</div><div class='add'>+			 GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+Invece, usate la seguente funzione::</div><div class='add'>+</div><div class='add'>+	header = kzalloc(struct_size(header, item, count), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+Per maggiori dettagli fate riferimento a :c:func:`array_size`,</div><div class='add'>+:c:func:`array3_size`, e :c:func:`struct_size`, così come la famiglia di</div><div class='add'>+funzioni :c:func:`check_add_overflow` e :c:func:`check_mul_overflow`.</div><div class='add'>+</div><div class='add'>+simple_strtol(), simple_strtoll(), simple_strtoul(), simple_strtoull()</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+Le funzioni :c:func:`simple_strtol`, :c:func:`simple_strtoll`,</div><div class='add'>+:c:func:`simple_strtoul`, e :c:func:`simple_strtoull` ignorano volutamente</div><div class='add'>+i possibili overflow, e questo può portare il chiamante a generare risultati</div><div class='add'>+inaspettati. Le rispettive funzioni :c:func:`kstrtol`, :c:func:`kstrtoll`,</div><div class='add'>+:c:func:`kstrtoul`, e :c:func:`kstrtoull` sono da considerarsi le corrette</div><div class='add'>+sostitute; tuttavia va notato che queste richiedono che la stringa sia</div><div class='add'>+terminata con il carattere NUL o quello di nuova riga.</div><div class='add'>+</div><div class='add'>+strcpy()</div><div class='add'>+--------</div><div class='add'>+La funzione :c:func:`strcpy` non fa controlli agli estremi del buffer</div><div class='add'>+di destinazione. Questo può portare ad un overflow oltre i limiti del</div><div class='add'>+buffer e generare svariati tipi di malfunzionamenti. Nonostante l'opzione</div><div class='add'>+`CONFIG_FORTIFY_SOURCE=y` e svariate opzioni del compilatore aiutano</div><div class='add'>+a ridurne il rischio, non c'è alcuna buona ragione per continuare ad usare</div><div class='add'>+questa funzione. La versione sicura da usare è :c:func:`strscpy`.</div><div class='add'>+</div><div class='add'>+strncpy() su stringe terminate con NUL</div><div class='add'>+--------------------------------------</div><div class='add'>+L'utilizzo di :c:func:`strncpy` non fornisce alcuna garanzia sul fatto che</div><div class='add'>+il buffer di destinazione verrà terminato con il carattere NUL. Questo</div><div class='add'>+potrebbe portare a diversi overflow di lettura o altri malfunzionamenti</div><div class='add'>+causati, appunto, dalla mancanza del terminatore. Questa estende la</div><div class='add'>+terminazione nel buffer di destinazione quando la stringa d'origine è più</div><div class='add'>+corta; questo potrebbe portare ad una penalizzazione delle prestazioni per</div><div class='add'>+chi usa solo stringe terminate. La versione sicura da usare è</div><div class='add'>+:c:func:`strscpy`. (chi usa :c:func:`strscpy` e necessita di estendere la</div><div class='add'>+terminazione con NUL deve aggiungere una chiamata a :c:func:`memset`)</div><div class='add'>+</div><div class='add'>+Se il chiamate no usa stringhe terminate con NUL, allore :c:func:`strncpy()`</div><div class='add'>+può continuare ad essere usata, ma i buffer di destinazione devono essere</div><div class='add'>+marchiati con l'attributo `__nonstring &lt;https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html&gt;`_</div><div class='add'>+per evitare avvisi durante la compilazione.</div><div class='add'>+</div><div class='add'>+strlcpy()</div><div class='add'>+---------</div><div class='add'>+La funzione :c:func:`strlcpy`, per prima cosa, legge interamente il buffer di</div><div class='add'>+origine, magari leggendo più di quanto verrà effettivamente copiato. Questo</div><div class='add'>+è inefficiente e può portare a overflow di lettura quando la stringa non è</div><div class='add'>+terminata con NUL. La versione sicura da usare è :c:func:`strscpy`.</div><div class='add'>+</div><div class='add'>+Vettori a dimensione variabile (VLA)</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Usare VLA sullo stack produce codice molto peggiore rispetto a quando si usano</div><div class='add'>+vettori a dimensione fissa. Questi `problemi di prestazioni &lt;https://git.kernel.org/linus/02361bc77888&gt;`_,</div><div class='add'>+tutt'altro che banali, sono già un motivo valido per eliminare i VLA; in</div><div class='add'>+aggiunta sono anche un problema per la sicurezza. La crescita dinamica di un</div><div class='add'>+vettore nello stack potrebbe eccedere la memoria rimanente in tale segmento.</div><div class='add'>+Questo può portare a dei malfunzionamenti, potrebbe sovrascrivere</div><div class='add'>+dati importanti alla fine dello stack (quando il kernel è compilato senza</div><div class='add'>+`CONFIG_THREAD_INFO_IN_TASK=y`), o sovrascrivere un pezzo di memoria adiacente</div><div class='add'>+allo stack (quando il kernel è compilato senza `CONFIG_VMAP_STACK=y`).</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/kernel-enforcement-statement.rst b/Documentation/translations/it_IT/process/kernel-enforcement-statement.rst<br/>index 4ddf5a35b270..1f62da622e26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/kernel-enforcement-statement.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/kernel-enforcement-statement.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/kernel-enforcement-statement.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/kernel-enforcement-statement.rst</a></div><div class='hunk'>@@ -1,13 +1,175 @@</div><div class='ctx'> .. include:: ../disclaimer-ita.rst</div><div class='ctx'> </div><div class='ctx'> :Original: :ref:`Documentation/process/kernel-enforcement-statement.rst &lt;process_statement_kernel&gt;`</div><div class='del'>-</div><div class='add'>+:Translator: Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;</div><div class='ctx'> </div><div class='ctx'> .. _it_process_statement_kernel:</div><div class='ctx'> </div><div class='ctx'> Applicazione della licenza sul kernel Linux</div><div class='ctx'> ===========================================</div><div class='ctx'> </div><div class='del'>-.. warning::</div><div class='add'>+Come sviluppatori del kernel Linux, abbiamo un certo interessa su come il</div><div class='add'>+nostro software viene usato e su come la sua licenza viene fatta rispettare.</div><div class='add'>+Il rispetto reciproco degli obblighi di condivisione della GPL-2.0 è</div><div class='add'>+fondamentale per la sostenibilità di lungo periodo del nostro software e</div><div class='add'>+della nostra comunità.</div><div class='add'>+</div><div class='add'>+Benché ognuno abbia il diritto a far rispettare il diritto d'autore per i</div><div class='add'>+propri contributi alla nostra comunità, condividiamo l'interesse a far si che</div><div class='add'>+ogni azione individuale nel far rispettare i propri diritti sia condotta in</div><div class='add'>+modo da portare beneficio alla comunità e che non abbia, involontariamente,</div><div class='add'>+impatti negativi sulla salute e la crescita del nostro ecosistema software.</div><div class='add'>+Al fine di scoraggiare l'esecuzione di azioni inutili, concordiamo che è nel</div><div class='add'>+migliore interesse della nostra comunità di sviluppo di impegnarci nel</div><div class='add'>+rispettare i seguenti obblighi nei confronti degli utenti del kernel Linux</div><div class='add'>+per conto nostro e di qualsiasi successore ai nostri interessi sul diritto</div><div class='add'>+d'autore:</div><div class='add'>+</div><div class='add'>+    Malgrado le clausole di risoluzione della licenza GPL-2.0, abbiamo</div><div class='add'>+    concordato che è nel migliore interesse della nostra comunità di sviluppo</div><div class='add'>+    adottare le seguenti disposizioni della GPL-3.0 come permessi aggiuntivi</div><div class='add'>+    alla nostra licenza nei confronti di qualsiasi affermazione non difensiva</div><div class='add'>+    di diritti sulla licenza.</div><div class='add'>+</div><div class='add'>+	In ogni caso, se cessano tutte le violazioni di questa Licenza, allora</div><div class='add'>+	la tua licenza da parte di un dato detentore del copyright viene</div><div class='add'>+	ripristinata (a) in via cautelativa, a meno che e fino a quando il</div><div class='add'>+	detentore del copyright non cessa esplicitamente e definitivamente</div><div class='add'>+	la tua licenza, e (b) in via permanente se il detentore del copyright</div><div class='add'>+	non ti notifica in alcun modo la violazione entro 60 giorni dalla</div><div class='add'>+	cessazione della licenza.</div><div class='add'>+</div><div class='add'>+	Inoltre, la tua licenza da parte di un dato detentore del copyright</div><div class='add'>+	viene ripristinata in maniera permanente se il detentore del copyright</div><div class='add'>+	ti notifica la violazione in maniera adeguata, se questa è la prima</div><div class='add'>+	volta che ricevi una notifica di violazione di questa Licenza (per</div><div class='add'>+	qualunque Programma) dallo stesso detentore di copyright, e se rimedi</div><div class='add'>+	alla violazione entro 30 giorni dalla data di ricezione della notifica</div><div class='add'>+	di violazione.</div><div class='add'>+</div><div class='add'>+Fornendo queste garanzie, abbiamo l'intenzione di incoraggiare l'uso del</div><div class='add'>+software.  Vogliamo che le aziende e le persone usino, modifichino e</div><div class='add'>+distribuiscano a questo software.  Vogliamo lavorare con gli utenti in modo</div><div class='add'>+aperto e trasparente per eliminare ogni incertezza circa le nostre aspettative</div><div class='add'>+sul rispetto o l'ottemperanza alla licenza che possa limitare l'uso del nostro</div><div class='add'>+software.  Vediamo l'azione legale come ultima spiaggia, da avviare solo quando</div><div class='add'>+gli altri sforzi della comunità hanno fallito nel risolvere il problema.</div><div class='add'>+</div><div class='add'>+Per finire, una volta che un problema di non rispetto della licenza viene</div><div class='add'>+risolto, speriamo che gli utenti si sentano i benvenuti ad aggregarsi a noi</div><div class='add'>+nello sviluppo di questo progetto.  Lavorando assieme, saremo più forti.</div><div class='add'>+</div><div class='add'>+Ad eccezione deve specificato, parliamo per noi stessi, e non per una qualsiasi</div><div class='add'>+azienda per la quale lavoriamo oggi, o per cui abbiamo lavorato in passato, o</div><div class='add'>+lavoreremo in futuro.</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-    TODO ancora da tradurre</div><div class='add'>+  - Laura Abbott</div><div class='add'>+  - Bjorn Andersson (Linaro)</div><div class='add'>+  - Andrea Arcangeli</div><div class='add'>+  - Neil Armstrong</div><div class='add'>+  - Jens Axboe</div><div class='add'>+  - Pablo Neira Ayuso</div><div class='add'>+  - Khalid Aziz</div><div class='add'>+  - Ralf Baechle</div><div class='add'>+  - Felipe Balbi</div><div class='add'>+  - Arnd Bergmann</div><div class='add'>+  - Ard Biesheuvel</div><div class='add'>+  - Tim Bird</div><div class='add'>+  - Paolo Bonzini</div><div class='add'>+  - Christian Borntraeger</div><div class='add'>+  - Mark Brown (Linaro)</div><div class='add'>+  - Paul Burton</div><div class='add'>+  - Javier Martinez Canillas</div><div class='add'>+  - Rob Clark</div><div class='add'>+  - Kees Cook (Google)</div><div class='add'>+  - Jonathan Corbet</div><div class='add'>+  - Dennis Dalessandro</div><div class='add'>+  - Vivien Didelot (Savoir-faire Linux)</div><div class='add'>+  - Hans de Goede</div><div class='add'>+  - Mel Gorman (SUSE)</div><div class='add'>+  - Sven Eckelmann</div><div class='add'>+  - Alex Elder (Linaro)</div><div class='add'>+  - Fabio Estevam</div><div class='add'>+  - Larry Finger</div><div class='add'>+  - Bhumika Goyal</div><div class='add'>+  - Andy Gross</div><div class='add'>+  - Juergen Gross</div><div class='add'>+  - Shawn Guo</div><div class='add'>+  - Ulf Hansson</div><div class='add'>+  - Stephen Hemminger (Microsoft)</div><div class='add'>+  - Tejun Heo</div><div class='add'>+  - Rob Herring</div><div class='add'>+  - Masami Hiramatsu</div><div class='add'>+  - Michal Hocko</div><div class='add'>+  - Simon Horman</div><div class='add'>+  - Johan Hovold (Hovold Consulting AB)</div><div class='add'>+  - Christophe JAILLET</div><div class='add'>+  - Olof Johansson</div><div class='add'>+  - Lee Jones (Linaro)</div><div class='add'>+  - Heiner Kallweit</div><div class='add'>+  - Srinivas Kandagatla</div><div class='add'>+  - Jan Kara</div><div class='add'>+  - Shuah Khan (Samsung)</div><div class='add'>+  - David Kershner</div><div class='add'>+  - Jaegeuk Kim</div><div class='add'>+  - Namhyung Kim</div><div class='add'>+  - Colin Ian King</div><div class='add'>+  - Jeff Kirsher</div><div class='add'>+  - Greg Kroah-Hartman (Linux Foundation)</div><div class='add'>+  - Christian König</div><div class='add'>+  - Vinod Koul</div><div class='add'>+  - Krzysztof Kozlowski</div><div class='add'>+  - Viresh Kumar</div><div class='add'>+  - Aneesh Kumar K.V</div><div class='add'>+  - Julia Lawall</div><div class='add'>+  - Doug Ledford</div><div class='add'>+  - Chuck Lever (Oracle)</div><div class='add'>+  - Daniel Lezcano</div><div class='add'>+  - Shaohua Li</div><div class='add'>+  - Xin Long</div><div class='add'>+  - Tony Luck</div><div class='add'>+  - Catalin Marinas (Arm Ltd)</div><div class='add'>+  - Mike Marshall</div><div class='add'>+  - Chris Mason</div><div class='add'>+  - Paul E. McKenney</div><div class='add'>+  - Arnaldo Carvalho de Melo</div><div class='add'>+  - David S. Miller</div><div class='add'>+  - Ingo Molnar</div><div class='add'>+  - Kuninori Morimoto</div><div class='add'>+  - Trond Myklebust</div><div class='add'>+  - Martin K. Petersen (Oracle)</div><div class='add'>+  - Borislav Petkov</div><div class='add'>+  - Jiri Pirko</div><div class='add'>+  - Josh Poimboeuf</div><div class='add'>+  - Sebastian Reichel (Collabora)</div><div class='add'>+  - Guenter Roeck</div><div class='add'>+  - Joerg Roedel</div><div class='add'>+  - Leon Romanovsky</div><div class='add'>+  - Steven Rostedt (VMware)</div><div class='add'>+  - Frank Rowand</div><div class='add'>+  - Ivan Safonov</div><div class='add'>+  - Anna Schumaker</div><div class='add'>+  - Jes Sorensen</div><div class='add'>+  - K.Y. Srinivasan</div><div class='add'>+  - David Sterba (SUSE)</div><div class='add'>+  - Heiko Stuebner</div><div class='add'>+  - Jiri Kosina (SUSE)</div><div class='add'>+  - Willy Tarreau</div><div class='add'>+  - Dmitry Torokhov</div><div class='add'>+  - Linus Torvalds</div><div class='add'>+  - Thierry Reding</div><div class='add'>+  - Rik van Riel</div><div class='add'>+  - Luis R. Rodriguez</div><div class='add'>+  - Geert Uytterhoeven (Glider bvba)</div><div class='add'>+  - Eduardo Valentin (Amazon.com)</div><div class='add'>+  - Daniel Vetter</div><div class='add'>+  - Linus Walleij</div><div class='add'>+  - Richard Weinberger</div><div class='add'>+  - Dan Williams</div><div class='add'>+  - Rafael J. Wysocki</div><div class='add'>+  - Arvind Yadav</div><div class='add'>+  - Masahiro Yamada</div><div class='add'>+  - Wei Yongjun</div><div class='add'>+  - Lv Zheng</div><div class='add'>+  - Marc Zyngier (Arm Ltd)</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/license-rules.rst b/Documentation/translations/it_IT/process/license-rules.rst<br/>new file mode 100644<br/>index 000000000000..91a8794ffd79<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/license-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/license-rules.rst</a></div><div class='hunk'>@@ -0,0 +1,452 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+.. include:: ../disclaimer-ita.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/license-rules.rst &lt;kernel_licensing&gt;`</div><div class='add'>+:Translator: Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;</div><div class='add'>+</div><div class='add'>+.. _it_kernel_licensing:</div><div class='add'>+</div><div class='add'>+Regole per licenziare il kernel Linux</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+Il kernel Linux viene rilasciato sotto i termini definiti dalla seconda</div><div class='add'>+versione della licenza *GNU General Public License* (GPL-2.0), di cui una</div><div class='add'>+copia è disponibile nel file LICENSES/preferred/GPL-2.0; a questo si</div><div class='add'>+aggiunge eccezione per le chiamate di sistema come descritto in</div><div class='add'>+LICENSES/exceptions/Linux-syscall-note; tutto ciò è descritto nel file COPYING.</div><div class='add'>+</div><div class='add'>+Questo documento fornisce una descrizione su come ogni singolo file sorgente</div><div class='add'>+debba essere licenziato per far si che sia chiaro e non ambiguo. Questo non</div><div class='add'>+sostituisce la licenza del kernel.</div><div class='add'>+</div><div class='add'>+La licenza descritta nel file COPYING si applica ai sorgenti del kernel nella</div><div class='add'>+loro interezza, quindi i singoli file sorgenti possono avere diverse licenze ma</div><div class='add'>+devono essere compatibili con la GPL-2.0::</div><div class='add'>+</div><div class='add'>+    GPL-1.0+  :  GNU General Public License v1.0 o successiva</div><div class='add'>+    GPL-2.0+  :  GNU General Public License v2.0 o successiva</div><div class='add'>+    LGPL-2.0  :  GNU Library General Public License v2</div><div class='add'>+    LGPL-2.0+ :  GNU Library General Public License v2 o successiva</div><div class='add'>+    LGPL-2.1  :  GNU Lesser General Public License v2.1</div><div class='add'>+    LGPL-2.1+ :  GNU Lesser General Public License v2.1 o successiva</div><div class='add'>+</div><div class='add'>+A parte questo, i singolo file possono essere forniti con una doppia licenza,</div><div class='add'>+per esempio con una delle varianti compatibili della GPL e alternativamente con</div><div class='add'>+una licenza permissiva come BSD, MIT eccetera.</div><div class='add'>+</div><div class='add'>+I file d'intestazione per l'API verso lo spazio utente (UAPI) descrivono</div><div class='add'>+le interfacce usate dai programmi, e per questo sono un caso speciale.</div><div class='add'>+Secondo le note nel file COPYING, le chiamate di sistema sono un chiaro</div><div class='add'>+confine oltre il quale non si estendono i requisiti della GPL per quei</div><div class='add'>+programmi che le usano per comunicare con il kernel.  Dato che i file</div><div class='add'>+d'intestazione UAPI devono poter essere inclusi nei sorgenti di un</div><div class='add'>+qualsiasi programma eseguibile sul kernel Linux, questi meritano</div><div class='add'>+un'eccezione documentata da una clausola speciale.</div><div class='add'>+</div><div class='add'>+Il modo più comune per indicare la licenza dei file sorgenti è quello di</div><div class='add'>+aggiungere il corrispondente blocco di testo come commento in testa a detto</div><div class='add'>+file.  Per via della formattazione, dei refusi, eccetera, questi blocchi di</div><div class='add'>+testo sono difficili da identificare dagli strumenti usati per verificare il</div><div class='add'>+rispetto delle licenze.</div><div class='add'>+</div><div class='add'>+Un'alternativa ai blocchi di testo è data dall'uso degli identificatori</div><div class='add'>+*Software Package Data Exchange* (SPDX) in ogni file sorgente.  Gli</div><div class='add'>+identificatori di licenza SPDX sono analizzabili dalle macchine e sono precisi</div><div class='add'>+simboli stenografici che identificano la licenza sotto la quale viene</div><div class='add'>+licenziato il file che lo include.  Gli identificatori di licenza SPDX sono</div><div class='add'>+gestiti del gruppo di lavoro SPDX presso la Linux Foundation e sono stati</div><div class='add'>+concordati fra i soci nell'industria, gli sviluppatori di strumenti, e i</div><div class='add'>+rispettivi gruppi legali. Per maggiori informazioni, consultate</div><div class='add'>+https://spdx.org/</div><div class='add'>+</div><div class='add'>+Il kernel Linux richiede un preciso identificatore SPDX in tutti i file</div><div class='add'>+sorgenti.  Gli identificatori validi verranno spiegati nella sezione</div><div class='add'>+`Identificatori di licenza`_ e sono stati copiati dalla lista ufficiale di</div><div class='add'>+licenze SPDX assieme al rispettivo testo come mostrato in</div><div class='add'>+https://spdx.org/licenses/.</div><div class='add'>+</div><div class='add'>+Sintassi degli identificatori di licenza</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+1. Posizionamento:</div><div class='add'>+</div><div class='add'>+   L'identificativo di licenza SPDX dev'essere posizionato come prima riga</div><div class='add'>+   possibile di un file che possa contenere commenti.  Per la maggior parte</div><div class='add'>+   dei file questa è la prima riga, fanno eccezione gli script che richiedono</div><div class='add'>+   come prima riga '#!PATH_TO_INTERPRETER'.  Per questi script l'identificativo</div><div class='add'>+   SPDX finisce nella seconda riga.</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+2. Stile:</div><div class='add'>+</div><div class='add'>+   L'identificativo di licenza SPDX viene aggiunto sotto forma di commento.</div><div class='add'>+   Lo stile del commento dipende dal tipo di file::</div><div class='add'>+</div><div class='add'>+      sorgenti C:	// SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+      intestazioni C:	/* SPDX-License-Identifier: &lt;SPDX License Expression&gt; */</div><div class='add'>+      ASM:	/* SPDX-License-Identifier: &lt;SPDX License Expression&gt; */</div><div class='add'>+      scripts:	# SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+      .rst:	.. SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+      .dts{i}:	// SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+</div><div class='add'>+   Se un particolare programma non dovesse riuscire a gestire lo stile</div><div class='add'>+   principale per i commenti, allora dev'essere usato il meccanismo accettato</div><div class='add'>+   dal programma.  Questo è il motivo per cui si ha "/\* \*/" nei file</div><div class='add'>+   d'intestazione C.  Notammo che 'ld' falliva nell'analizzare i commenti del</div><div class='add'>+   C++ nei file .lds che venivano prodotti.  Oggi questo è stato corretto,</div><div class='add'>+   ma ci sono in giro ancora vecchi programmi che non sono in grado di</div><div class='add'>+   gestire lo stile dei commenti del C++.</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+3. Sintassi:</div><div class='add'>+</div><div class='add'>+   Una &lt;espressione di licenza SPDX&gt; può essere scritta usando l'identificatore</div><div class='add'>+   SPDX della licenza come indicato nella lista di licenze SPDX, oppure la</div><div class='add'>+   combinazione di due identificatori SPDX separati da "WITH" per i casi</div><div class='add'>+   eccezionali. Quando si usano più licenze l'espressione viene formata da</div><div class='add'>+   sottoespressioni separate dalle parole chiave "AND", "OR" e racchiuse fra</div><div class='add'>+   parentesi tonde "(", ")".</div><div class='add'>+</div><div class='add'>+   Gli identificativi di licenza per licenze come la [L]GPL che si avvalgono</div><div class='add'>+   dell'opzione 'o successive' si formano aggiungendo alla fine il simbolo "+"</div><div class='add'>+   per indicare l'opzione 'o successive'.::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+      // SPDX-License-Identifier: LGPL-2.1+</div><div class='add'>+</div><div class='add'>+   WITH dovrebbe essere usato quando sono necessarie delle modifiche alla</div><div class='add'>+   licenza.  Per esempio, la UAPI del kernel linux usa l'espressione::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note</div><div class='add'>+</div><div class='add'>+   Altri esempi di usi di WITH all'interno del kernel sono::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 WITH mif-exception</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0</div><div class='add'>+</div><div class='add'>+   Le eccezioni si possono usare solo in combinazione con identificatori di</div><div class='add'>+   licenza. Gli identificatori di licenza riconosciuti sono elencati nei</div><div class='add'>+   corrispondenti file d'eccezione. Per maggiori dettagli consultate</div><div class='add'>+   `Eccezioni`_ nel capitolo `Identificatori di licenza`_</div><div class='add'>+</div><div class='add'>+   La parola chiave OR dovrebbe essere usata solo quando si usa una doppia</div><div class='add'>+   licenza e solo una dev'essere scelta.  Per esempio, alcuni file dtsi sono</div><div class='add'>+   disponibili con doppia licenza::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+</div><div class='add'>+   Esempi dal kernel di espressioni per file licenziati con doppia licenza</div><div class='add'>+   sono::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR MIT</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR Apache-2.0</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR MPL-1.1</div><div class='add'>+      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT</div><div class='add'>+      // SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause OR OpenSSL</div><div class='add'>+</div><div class='add'>+   La parola chiave AND dovrebbe essere usata quando i termini di più licenze</div><div class='add'>+   si applicano ad un file. Per esempio, quando il codice viene preso da</div><div class='add'>+   un altro progetto il quale da i permessi per aggiungerlo nel kernel ma</div><div class='add'>+   richiede che i termini originali della licenza rimangano intatti::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) AND MIT</div><div class='add'>+</div><div class='add'>+   Di seguito, un altro esempio dove entrambe i termini di licenza devono</div><div class='add'>+   essere rispettati::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-1.0+ AND LGPL-2.1+</div><div class='add'>+</div><div class='add'>+Identificatori di licenza</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Le licenze attualmente in uso, così come le licenze aggiunte al kernel, possono</div><div class='add'>+essere categorizzate in:</div><div class='add'>+</div><div class='add'>+1. _`Licenze raccomandate`:</div><div class='add'>+</div><div class='add'>+   Ovunque possibile le licenze qui indicate dovrebbero essere usate perché</div><div class='add'>+   pienamente compatibili e molto usate.  Queste licenze sono disponibile nei</div><div class='add'>+   sorgenti del kernel, nella cartella::</div><div class='add'>+</div><div class='add'>+     LICENSES/preferred/</div><div class='add'>+</div><div class='add'>+   I file in questa cartella contengono il testo completo della licenza e i</div><div class='add'>+   `Metatag`_.  Il nome di questi file è lo stesso usato come identificatore</div><div class='add'>+   di licenza SPDX e che deve essere usato nei file sorgenti.</div><div class='add'>+</div><div class='add'>+   Esempi::</div><div class='add'>+</div><div class='add'>+     LICENSES/preferred/GPL-2.0</div><div class='add'>+</div><div class='add'>+   Contiene il testo della seconda versione della licenza GPL e i metatag</div><div class='add'>+   necessari::</div><div class='add'>+</div><div class='add'>+     LICENSES/preferred/MIT</div><div class='add'>+</div><div class='add'>+   Contiene il testo della licenza MIT e i metatag necessari.</div><div class='add'>+</div><div class='add'>+   _`Metatag`:</div><div class='add'>+</div><div class='add'>+   I seguenti metatag devono essere presenti in un file di licenza:</div><div class='add'>+</div><div class='add'>+   - Valid-License-Identifier:</div><div class='add'>+</div><div class='add'>+     Una o più righe che dichiarano quali identificatori di licenza sono validi</div><div class='add'>+     all'interno del progetto per far riferimento alla licenza in questione.</div><div class='add'>+     Solitamente, questo è un unico identificatore valido, ma per esempio le</div><div class='add'>+     licenze che permettono l'opzione 'o successive' hanno due identificatori</div><div class='add'>+     validi.</div><div class='add'>+</div><div class='add'>+   - SPDX-URL:</div><div class='add'>+</div><div class='add'>+     L'URL della pagina SPDX che contiene informazioni aggiuntive riguardanti</div><div class='add'>+     la licenza.</div><div class='add'>+</div><div class='add'>+   - Usage-Guidance:</div><div class='add'>+</div><div class='add'>+     Testo in formato libero per dare suggerimenti agli utenti. Il testo deve</div><div class='add'>+     includere degli esempi su come usare gli identificatori di licenza SPDX</div><div class='add'>+     in un file sorgente in conformità con le linea guida in</div><div class='add'>+     `Sintassi degli identificatori di licenza`_.</div><div class='add'>+</div><div class='add'>+   - License-Text:</div><div class='add'>+</div><div class='add'>+     Tutto il testo che compare dopo questa etichetta viene trattato</div><div class='add'>+     come se fosse parte del testo originale della licenza.</div><div class='add'>+</div><div class='add'>+   Esempi::</div><div class='add'>+</div><div class='add'>+      Valid-License-Identifier: GPL-2.0</div><div class='add'>+      Valid-License-Identifier: GPL-2.0+</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/GPL-2.0.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+        To use this license in source code, put one of the following SPDX</div><div class='add'>+	tag/value pairs into a comment according to the placement</div><div class='add'>+	guidelines in the licensing rules documentation.</div><div class='add'>+	For 'GNU General Public License (GPL) version 2 only' use:</div><div class='add'>+	  SPDX-License-Identifier: GPL-2.0</div><div class='add'>+	For 'GNU General Public License (GPL) version 2 or any later version' use:</div><div class='add'>+	  SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+   ::</div><div class='add'>+</div><div class='add'>+      SPDX-License-Identifier: MIT</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/MIT.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+	To use this license in source code, put the following SPDX</div><div class='add'>+	tag/value pair into a comment according to the placement</div><div class='add'>+	guidelines in the licensing rules documentation.</div><div class='add'>+	  SPDX-License-Identifier: MIT</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+2. Licenze non raccomandate:</div><div class='add'>+</div><div class='add'>+   Questo tipo di licenze dovrebbero essere usate solo per codice già esistente</div><div class='add'>+   o quando si prende codice da altri progetti.  Le licenze sono disponibili</div><div class='add'>+   nei sorgenti del kernel nella cartella::</div><div class='add'>+</div><div class='add'>+     LICENSES/other/</div><div class='add'>+</div><div class='add'>+   I file in questa cartella contengono il testo completo della licenza e i</div><div class='add'>+   `Metatag`_.  Il nome di questi file è lo stesso usato come identificatore</div><div class='add'>+   di licenza SPDX e che deve essere usato nei file sorgenti.</div><div class='add'>+</div><div class='add'>+   Esempi::</div><div class='add'>+</div><div class='add'>+     LICENSES/other/ISC</div><div class='add'>+</div><div class='add'>+   Contiene il testo della licenza Internet System Consortium e i suoi</div><div class='add'>+   metatag::</div><div class='add'>+</div><div class='add'>+     LICENSES/other/ZLib</div><div class='add'>+</div><div class='add'>+   Contiene il testo della licenza ZLIB e i suoi metatag.</div><div class='add'>+</div><div class='add'>+   Metatag:</div><div class='add'>+</div><div class='add'>+   I metatag necessari per le 'altre' ('other') licenze sono gli stessi</div><div class='add'>+   di usati per le `Licenze raccomandate`_.</div><div class='add'>+</div><div class='add'>+   Esempio del formato del file::</div><div class='add'>+</div><div class='add'>+      Valid-License-Identifier: ISC</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/ISC.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+        Usage of this license in the kernel for new code is discouraged</div><div class='add'>+        and it should solely be used for importing code from an already</div><div class='add'>+        existing project.</div><div class='add'>+        To use this license in source code, put the following SPDX</div><div class='add'>+        tag/value pair into a comment according to the placement</div><div class='add'>+        guidelines in the licensing rules documentation.</div><div class='add'>+          SPDX-License-Identifier: ISC</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+3. _`Eccezioni`:</div><div class='add'>+</div><div class='add'>+   Alcune licenze possono essere corrette con delle eccezioni che forniscono</div><div class='add'>+   diritti aggiuntivi.  Queste eccezioni sono disponibili nei sorgenti del</div><div class='add'>+   kernel nella cartella::</div><div class='add'>+</div><div class='add'>+     LICENSES/exceptions/</div><div class='add'>+</div><div class='add'>+   I file in questa cartella contengono il testo completo dell'eccezione e i</div><div class='add'>+   `Metatag per le eccezioni`_.</div><div class='add'>+</div><div class='add'>+   Esempi::</div><div class='add'>+</div><div class='add'>+      LICENSES/exceptions/Linux-syscall-note</div><div class='add'>+</div><div class='add'>+   Contiene la descrizione dell'eccezione per le chiamate di sistema Linux</div><div class='add'>+   così come documentato nel file COPYING del kernel Linux; questo viene usato</div><div class='add'>+   per i file d'intestazione per la UAPI.  Per esempio</div><div class='add'>+   /\* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note \*/::</div><div class='add'>+</div><div class='add'>+      LICENSES/exceptions/GCC-exception-2.0</div><div class='add'>+</div><div class='add'>+   Contiene la 'eccezione di linking' che permette di collegare qualsiasi</div><div class='add'>+   binario, indipendentemente dalla sua licenza, con un compilato il cui file</div><div class='add'>+   sorgente è marchiato con questa eccezione. Questo è necessario per creare</div><div class='add'>+   eseguibili dai sorgenti che non sono compatibili con la GPL.</div><div class='add'>+</div><div class='add'>+   _`Metatag per le eccezioni`:</div><div class='add'>+</div><div class='add'>+   Un file contenente un'eccezione deve avere i seguenti metatag:</div><div class='add'>+</div><div class='add'>+   - SPDX-Exception-Identifier:</div><div class='add'>+</div><div class='add'>+     Un identificatore d'eccezione che possa essere usato in combinazione con</div><div class='add'>+     un identificatore di licenza SPDX.</div><div class='add'>+</div><div class='add'>+   - SPDX-URL:</div><div class='add'>+</div><div class='add'>+     L'URL della pagina SPDX che contiene informazioni aggiuntive riguardanti</div><div class='add'>+     l'eccezione.</div><div class='add'>+</div><div class='add'>+   - SPDX-Licenses:</div><div class='add'>+</div><div class='add'>+     Una lista di licenze SPDX separate da virgola, che possono essere usate</div><div class='add'>+     con l'eccezione.</div><div class='add'>+</div><div class='add'>+   - Usage-Guidance:</div><div class='add'>+</div><div class='add'>+     Testo in formato libero per dare suggerimenti agli utenti. Il testo deve</div><div class='add'>+     includere degli esempi su come usare gli identificatori di licenza SPDX</div><div class='add'>+     in un file sorgente in conformità con le linea guida in</div><div class='add'>+     `Sintassi degli identificatori di licenza`_.</div><div class='add'>+</div><div class='add'>+   - Exception-Text:</div><div class='add'>+</div><div class='add'>+     Tutto il testo che compare dopo questa etichetta viene trattato</div><div class='add'>+     come se fosse parte del testo originale della licenza.</div><div class='add'>+</div><div class='add'>+   Esempi::</div><div class='add'>+</div><div class='add'>+      SPDX-Exception-Identifier: Linux-syscall-note</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/Linux-syscall-note.html</div><div class='add'>+      SPDX-Licenses: GPL-2.0, GPL-2.0+, GPL-1.0+, LGPL-2.0, LGPL-2.0+, LGPL-2.1, LGPL-2.1+</div><div class='add'>+      Usage-Guidance:</div><div class='add'>+        This exception is used together with one of the above SPDX-Licenses</div><div class='add'>+	to mark user-space API (uapi) header files so they can be included</div><div class='add'>+	into non GPL compliant user-space application code.</div><div class='add'>+        To use this exception add it with the keyword WITH to one of the</div><div class='add'>+	identifiers in the SPDX-Licenses tag:</div><div class='add'>+	  SPDX-License-Identifier: &lt;SPDX-License&gt; WITH Linux-syscall-note</div><div class='add'>+      Exception-Text:</div><div class='add'>+        Full exception text</div><div class='add'>+</div><div class='add'>+   ::</div><div class='add'>+</div><div class='add'>+      SPDX-Exception-Identifier: GCC-exception-2.0</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/GCC-exception-2.0.html</div><div class='add'>+      SPDX-Licenses: GPL-2.0, GPL-2.0+</div><div class='add'>+      Usage-Guidance:</div><div class='add'>+        The "GCC Runtime Library exception 2.0" is used together with one</div><div class='add'>+	of the above SPDX-Licenses for code imported from the GCC runtime</div><div class='add'>+	library.</div><div class='add'>+        To use this exception add it with the keyword WITH to one of the</div><div class='add'>+	identifiers in the SPDX-Licenses tag:</div><div class='add'>+	  SPDX-License-Identifier: &lt;SPDX-License&gt; WITH GCC-exception-2.0</div><div class='add'>+      Exception-Text:</div><div class='add'>+        Full exception text</div><div class='add'>+</div><div class='add'>+Per ogni identificatore di licenza SPDX e per le eccezioni dev'esserci un file</div><div class='add'>+nella sotto-cartella LICENSES.  Questo è necessario per permettere agli</div><div class='add'>+strumenti di effettuare verifiche (come checkpatch.pl), per avere le licenze</div><div class='add'>+disponibili per la lettura e per estrarre i diritti dai sorgenti, così come</div><div class='add'>+raccomandato da diverse organizzazioni FOSS, per esempio l'`iniziativa FSFE</div><div class='add'>+REUSE &lt;https://reuse.software/&gt;`_.</div><div class='add'>+</div><div class='add'>+_`MODULE_LICENSE`</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+   I moduli del kernel necessitano di un'etichetta MODULE_LICENSE(). Questa</div><div class='add'>+   etichetta non sostituisce le informazioni sulla licenza del codice sorgente</div><div class='add'>+   (SPDX-License-Identifier) né fornisce informazioni che esprimono o</div><div class='add'>+   determinano l'esatta licenza sotto la quale viene rilasciato.</div><div class='add'>+</div><div class='add'>+   Il solo scopo di questa etichetta è quello di fornire sufficienti</div><div class='add'>+   informazioni al caricatore di moduli del kernel, o agli strumenti in spazio</div><div class='add'>+   utente, per capire se il modulo è libero o proprietario.</div><div class='add'>+</div><div class='add'>+   Le stringe di licenza valide per MODULE_LICENSE() sono:</div><div class='add'>+</div><div class='add'>+    ============================= =============================================</div><div class='add'>+    "GPL"			  Il modulo è licenziato con la GPL versione 2.</div><div class='add'>+				  Questo non fa distinzione fra GPL'2.0-only o</div><div class='add'>+				  GPL-2.0-or-later. L'esatta licenza può essere</div><div class='add'>+				  determinata solo leggendo i corrispondenti</div><div class='add'>+				  file sorgenti.</div><div class='add'>+</div><div class='add'>+    "GPL v2"			  Stesso significato di "GPL". Esiste per</div><div class='add'>+				  motivi storici.</div><div class='add'>+</div><div class='add'>+    "GPL and additional rights"   Questa è una variante che esiste per motivi</div><div class='add'>+				  storici che indica che i sorgenti di un</div><div class='add'>+				  modulo sono rilasciati sotto una variante</div><div class='add'>+				  della licenza GPL v2 e quella MIT. Per favore</div><div class='add'>+				  non utilizzatela per codice nuovo.</div><div class='add'>+</div><div class='add'>+    "Dual MIT/GPL"		  Questo è il modo corretto per esprimere il</div><div class='add'>+				  il fatto che il modulo è rilasciato con</div><div class='add'>+				  doppia licenza a scelta fra: una variante</div><div class='add'>+				  della GPL v2 o la licenza MIT.</div><div class='add'>+</div><div class='add'>+    "Dual BSD/GPL"		  Questo modulo è rilasciato con doppia licenza</div><div class='add'>+				  a scelta fra: una variante della GPL v2 o la</div><div class='add'>+				  licenza BSD. La variante esatta della licenza</div><div class='add'>+				  BSD può essere determinata solo attraverso i</div><div class='add'>+				  corrispondenti file sorgenti.</div><div class='add'>+</div><div class='add'>+    "Dual MPL/GPL"		  Questo modulo è rilasciato con doppia licenza</div><div class='add'>+				  a scelta fra: una variante della GPL v2 o la</div><div class='add'>+				  Mozilla Public License (MPL). La variante</div><div class='add'>+				  esatta della licenza MPL può essere</div><div class='add'>+				  determinata solo attraverso i corrispondenti</div><div class='add'>+				  file sorgenti.</div><div class='add'>+</div><div class='add'>+    "Proprietary"		  Questo modulo è rilasciato con licenza</div><div class='add'>+				  proprietaria. Questa stringa è solo per i</div><div class='add'>+				  moduli proprietari di terze parti e non può</div><div class='add'>+				  essere usata per quelli che risiedono nei</div><div class='add'>+				  sorgenti del kernel. I moduli etichettati in</div><div class='add'>+				  questo modo stanno contaminando il kernel e</div><div class='add'>+				  gli viene assegnato un flag 'P'; quando</div><div class='add'>+				  vengono caricati, il caricatore di moduli del</div><div class='add'>+				  kernel si rifiuterà di collegare questi</div><div class='add'>+				  moduli ai simboli che sono stati esportati</div><div class='add'>+				  con EXPORT_SYMBOL_GPL().</div><div class='add'>+</div><div class='add'>+    ============================= =============================================</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/maintainer-pgp-guide.rst b/Documentation/translations/it_IT/process/maintainer-pgp-guide.rst<br/>index 24a133f0a51d..276db0e37f43 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/maintainer-pgp-guide.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/maintainer-pgp-guide.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/maintainer-pgp-guide.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/maintainer-pgp-guide.rst</a></div><div class='hunk'>@@ -1,13 +1,946 @@</div><div class='ctx'> .. include:: ../disclaimer-ita.rst</div><div class='ctx'> </div><div class='ctx'> :Original: :ref:`Documentation/process/maintainer-pgp-guide.rst &lt;pgpguide&gt;`</div><div class='add'>+:Translator: Alessia Mantegazza &lt;amantegazza@vaga.pv.it&gt;</div><div class='ctx'> </div><div class='ctx'> .. _it_pgpguide:</div><div class='ctx'> </div><div class='add'>+=========================================</div><div class='add'>+La guida a PGP per manutentori del kernel</div><div class='add'>+=========================================</div><div class='add'>+</div><div class='add'>+:Author: Konstantin Ryabitsev &lt;konstantin@linuxfoundation.org&gt;</div><div class='add'>+</div><div class='add'>+Questo documento è destinato agli sviluppatori del kernel Linux, in particolar</div><div class='add'>+modo ai manutentori. Contiene degli approfondimenti riguardo informazioni che</div><div class='add'>+sono state affrontate in maniera più generale nella sezione</div><div class='add'>+"`Protecting Code Integrity`_" pubblicata dalla Linux Foundation.</div><div class='add'>+Per approfondire alcuni argomenti trattati in questo documento è consigliato</div><div class='add'>+leggere il documento sopraindicato</div><div class='add'>+</div><div class='add'>+.. _`Protecting Code Integrity`: https://github.com/lfit/itpol/blob/master/protecting-code-integrity.md</div><div class='add'>+</div><div class='add'>+Il ruolo di PGP nello sviluppo del kernel Linux</div><div class='add'>+===============================================</div><div class='add'>+</div><div class='add'>+PGP aiuta ad assicurare l'integrità del codice prodotto dalla comunità</div><div class='add'>+di sviluppo del kernel e, in secondo luogo, stabilisce canali di comunicazione</div><div class='add'>+affidabili tra sviluppatori attraverso lo scambio di email firmate con PGP.</div><div class='add'>+</div><div class='add'>+Il codice sorgente del kernel Linux è disponibile principalmente in due</div><div class='add'>+formati:</div><div class='add'>+</div><div class='add'>+- repositori distribuiti di sorgenti (git)</div><div class='add'>+- rilasci periodici di istantanee (archivi tar)</div><div class='add'>+</div><div class='add'>+Sia i repositori git che gli archivi tar portano le firme PGP degli</div><div class='add'>+sviluppatori che hanno creato i rilasci ufficiali del kernel. Queste firme</div><div class='add'>+offrono una garanzia crittografica che le versioni scaricabili rese disponibili</div><div class='add'>+via kernel.org, o altri portali, siano identiche a quelle che gli sviluppatori</div><div class='add'>+hanno sul loro posto di lavoro. A tal scopo:</div><div class='add'>+</div><div class='add'>+- i repositori git forniscono firme PGP per ogni tag</div><div class='add'>+- gli archivi tar hanno firme separate per ogni archivio</div><div class='add'>+</div><div class='add'>+.. _it_devs_not_infra:</div><div class='add'>+</div><div class='add'>+Fidatevi degli sviluppatori e non dell'infrastruttura</div><div class='add'>+-----------------------------------------------------</div><div class='add'>+</div><div class='add'>+Fin dal 2011, quando i sistemi di kernel.org furono compromessi, il principio</div><div class='add'>+generale del progetto Kernel Archives è stato quello di assumere che qualsiasi</div><div class='add'>+parte dell'infrastruttura possa essere compromessa in ogni momento. Per questa</div><div class='add'>+ragione, gli amministratori hanno intrapreso deliberatemene dei passi per</div><div class='add'>+enfatizzare che la fiducia debba risiedere sempre negli sviluppatori e mai nel</div><div class='add'>+codice che gestisce l'infrastruttura, indipendentemente da quali che siano le</div><div class='add'>+pratiche di sicurezza messe in atto.</div><div class='add'>+</div><div class='add'>+Il principio sopra indicato è la ragione per la quale è necessaria questa</div><div class='add'>+guida. Vogliamo essere sicuri che il riporre la fiducia negli sviluppatori</div><div class='add'>+non sia fatto semplicemente per incolpare qualcun'altro per future falle di</div><div class='add'>+sicurezza. L'obiettivo è quello di fornire una serie di linee guida che gli</div><div class='add'>+sviluppatori possano seguire per creare un ambiente di lavoro sicuro e</div><div class='add'>+salvaguardare le chiavi PGP usate nello stabilire l'integrità del kernel Linux</div><div class='add'>+stesso.</div><div class='add'>+</div><div class='add'>+.. _it_pgp_tools:</div><div class='add'>+</div><div class='add'>+Strumenti PGP</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+Usare GnuPG v2</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+La vostra distribuzione potrebbe avere già installato GnuPG, dovete solo</div><div class='add'>+verificare che stia utilizzando la versione 2.x e non la serie 1.4 --</div><div class='add'>+molte distribuzioni forniscono entrambe, di base il comando ''gpg''</div><div class='add'>+invoca GnuPG v.1. Per controllate usate::</div><div class='add'>+</div><div class='add'>+    $ gpg --version | head -n1</div><div class='add'>+</div><div class='add'>+Se visualizzate ``gpg (GnuPG) 1.4.x``, allora state usando GnuPG v.1.</div><div class='add'>+Provate il comando ``gpg2`` (se non lo avete, potreste aver bisogno</div><div class='add'>+di installare il pacchetto gnupg2)::</div><div class='add'>+</div><div class='add'>+    $ gpg2 --version | head -n1</div><div class='add'>+</div><div class='add'>+Se visualizzate  ``gpg (GnuPG) 2.x.x``, allora siete pronti a partire.</div><div class='add'>+Questa guida assume che abbiate la versione 2.2.(o successiva) di GnuPG.</div><div class='add'>+Se state usando la versione 2.0, alcuni dei comandi indicati qui non</div><div class='add'>+funzioneranno, in questo caso considerate un aggiornamento all'ultima versione,</div><div class='add'>+la 2.2. Versioni di gnupg-2.1.11 e successive dovrebbero essere compatibili</div><div class='add'>+per gli obiettivi di questa guida.</div><div class='add'>+</div><div class='add'>+Se avete entrambi i comandi: ``gpg`` e ``gpg2``, assicuratevi di utilizzare</div><div class='add'>+sempre la versione V2, e non quella vecchia. Per evitare errori potreste creare</div><div class='add'>+un alias::</div><div class='add'>+</div><div class='add'>+    $ alias gpg=gpg2</div><div class='add'>+</div><div class='add'>+Potete mettere questa opzione nel vostro  ``.bashrc`` in modo da essere sicuri.</div><div class='add'>+</div><div class='add'>+Configurare le opzioni di gpg-agent</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+L'agente GnuPG è uno strumento di aiuto che partirà automaticamente ogni volta</div><div class='add'>+che userete il comando ``gpg`` e funzionerà in background con l'obiettivo di</div><div class='add'>+individuare la passphrase. Ci sono due opzioni che dovreste conoscere</div><div class='add'>+per personalizzare la scadenza della passphrase nella cache:</div><div class='add'>+</div><div class='add'>+- ``default-cache-ttl`` (secondi): Se usate ancora la stessa chiave prima</div><div class='add'>+  che il time-to-live termini, il conto alla rovescia si resetterà per un</div><div class='add'>+  altro periodo. Di base è di 600 (10 minuti).</div><div class='add'>+</div><div class='add'>+- ``max-cache-ttl`` (secondi): indipendentemente da quanto sia recente l'ultimo</div><div class='add'>+  uso della chiave da quando avete inserito la passphrase, se il massimo</div><div class='add'>+  time-to-live è scaduto, dovrete reinserire nuovamente la passphrase.</div><div class='add'>+  Di base è di 30 minuti.</div><div class='add'>+</div><div class='add'>+Se ritenete entrambe questi valori di base troppo corti (o troppo lunghi),</div><div class='add'>+potete creare il vostro file ``~/.gnupg/gpg-agent.conf`` ed impostare i vostri</div><div class='add'>+valori::</div><div class='add'>+</div><div class='add'>+    # set to 30 minutes for regular ttl, and 2 hours for max ttl</div><div class='add'>+    default-cache-ttl 1800</div><div class='add'>+    max-cache-ttl 7200</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    Non è più necessario far partire l'agente gpg manualmente all'inizio della</div><div class='add'>+    vostra sessione. Dovreste controllare i file rc per rimuovere tutto ciò che</div><div class='add'>+    riguarda vecchie le versioni di GnuPG, poiché potrebbero non svolgere più</div><div class='add'>+    bene il loro compito.</div><div class='add'>+</div><div class='add'>+Impostare un *refresh* con cronjob</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Potreste aver bisogno di rinfrescare regolarmente il vostro portachiavi in</div><div class='add'>+modo aggiornare le chiavi pubbliche di altre persone, lavoro che è svolto</div><div class='add'>+al meglio con un cronjob giornaliero::</div><div class='add'>+</div><div class='add'>+    @daily /usr/bin/gpg2 --refresh &gt;/dev/null 2&gt;&amp;1</div><div class='add'>+</div><div class='add'>+Controllate il percorso assoluto del vostro comando ``gpg`` o ``gpg2`` e usate</div><div class='add'>+il comando ``gpg2`` se per voi ``gpg`` corrisponde alla versione GnuPG v.1.</div><div class='add'>+</div><div class='add'>+.. _it_master_key:</div><div class='add'>+</div><div class='add'>+Proteggere la vostra chiave PGP primaria</div><div class='ctx'> ========================================</div><div class='del'>-Guida a PGP per i manutentori del kernel</div><div class='del'>-========================================</div><div class='add'>+</div><div class='add'>+Questa guida parte dal presupposto che abbiate già una chiave PGP che usate</div><div class='add'>+per lo sviluppo del kernel Linux. Se non ne avete ancora una, date uno sguardo</div><div class='add'>+al documento "`Protecting Code Integrity`_" che abbiamo menzionato prima.</div><div class='add'>+</div><div class='add'>+Dovreste inoltre creare una nuova chiave se quella attuale è inferiore a 2048</div><div class='add'>+bit (RSA).</div><div class='add'>+</div><div class='add'>+Chiave principale o sottochiavi</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+Le sottochiavi sono chiavi PGP totalmente indipendenti, e sono collegate alla</div><div class='add'>+chiave principale attraverso firme certificate. È quindi importante</div><div class='add'>+comprendere i seguenti punti:</div><div class='add'>+</div><div class='add'>+1. Non ci sono differenze tecniche tra la chiave principale e la sottochiave.</div><div class='add'>+2. In fesa di creazione, assegniamo limitazioni funzionali ad ogni chiave</div><div class='add'>+   assegnando capacità specifiche.</div><div class='add'>+3. Una chiave PGP può avere 4 capacità:</div><div class='add'>+</div><div class='add'>+   - **[S]** può essere usata per firmare</div><div class='add'>+   - **[E]** può essere usata per criptare</div><div class='add'>+   - **[A]** può essere usata per autenticare</div><div class='add'>+   - **[C]** può essere usata per certificare altre chiavi</div><div class='add'>+</div><div class='add'>+4. Una singola chiave può avere più capacità</div><div class='add'>+5. Una sottochiave è completamente indipendente dalla chiave principale.</div><div class='add'>+   Un messaggio criptato con la sottochiave non può essere decrittato con</div><div class='add'>+   quella principale. Se perdete la vostra sottochiave privata, non può</div><div class='add'>+   essere rigenerata in nessun modo da quella principale.</div><div class='add'>+</div><div class='add'>+La chiave con capacità **[C]** (certify) è identificata come la chiave</div><div class='add'>+principale perché è l'unica che può essere usata per indicare la relazione</div><div class='add'>+con altre chiavi. Solo la chiave **[C]** può essere usata per:</div><div class='add'>+</div><div class='add'>+- Aggiungere o revocare altre chiavi (sottochiavi) che hanno capacità S/E/A</div><div class='add'>+- Aggiungere, modificare o eliminare le identità (unids) associate alla chiave</div><div class='add'>+- Aggiungere o modificare la data di termine di sé stessa o di ogni sottochiave</div><div class='add'>+- Firmare le chiavi di altre persone a scopo di creare una rete di fiducia</div><div class='add'>+</div><div class='add'>+Di base, alla creazione di nuove chiavi, GnuPG genera quanto segue:</div><div class='add'>+</div><div class='add'>+- Una chiave madre che porta sia la capacità di certificazione che quella</div><div class='add'>+  di firma (**[SC]**)</div><div class='add'>+- Una sottochiave separata con capacità di criptaggio (**[E]**)</div><div class='add'>+</div><div class='add'>+Se avete usato i parametri di base per generare la vostra chiave, quello</div><div class='add'>+sarà il risultato. Potete verificarlo utilizzando ``gpg --list-secret-keys``,</div><div class='add'>+per esempio::</div><div class='add'>+</div><div class='add'>+    sec   rsa2048 2018-01-23 [SC] [expires: 2020-01-23]</div><div class='add'>+          000000000000000000000000AAAABBBBCCCCDDDD</div><div class='add'>+    uid           [ultimate] Alice Dev &lt;adev@kernel.org&gt;</div><div class='add'>+    ssb   rsa2048 2018-01-23 [E] [expires: 2020-01-23]</div><div class='add'>+</div><div class='add'>+Qualsiasi chiave che abbia la capacità **[C]** è la vostra chiave madre,</div><div class='add'>+indipendentemente da quali altre capacità potreste averle assegnato.</div><div class='add'>+</div><div class='add'>+La lunga riga sotto la voce ``sec`` è la vostra impronta digitale --</div><div class='add'>+negli esempi che seguono, quando vedere ``[fpr]`` ci si riferisce a questa</div><div class='add'>+stringa di 40 caratteri.</div><div class='add'>+</div><div class='add'>+Assicuratevi che la vostra passphrase sia forte</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+GnuPG utilizza le passphrases per criptare la vostra chiave privata prima</div><div class='add'>+di salvarla sul disco. In questo modo, anche se il contenuto della vostra</div><div class='add'>+cartella ``.gnupg`` venisse letto o trafugato nella sia interezza, gli</div><div class='add'>+attaccanti non potrebbero comunque utilizzare le vostre chiavi private senza</div><div class='add'>+aver prima ottenuto la passphrase per decriptarle.</div><div class='add'>+</div><div class='add'>+È assolutamente essenziale che le vostre chiavi private siano protette da</div><div class='add'>+una passphrase forte. Per impostarla o cambiarla, usate::</div><div class='add'>+</div><div class='add'>+    $ gpg --change-passphrase [fpr]</div><div class='add'>+</div><div class='add'>+Create una sottochiave di firma separata</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+Il nostro obiettivo è di proteggere la chiave primaria spostandola su un</div><div class='add'>+dispositivo sconnesso dalla rete, dunque se avete solo una chiave combinata</div><div class='add'>+**[SC]** allora dovreste creare una sottochiave di firma separata::</div><div class='add'>+</div><div class='add'>+    $ gpg --quick-add-key [fpr] ed25519 sign</div><div class='add'>+</div><div class='add'>+Ricordate di informare il keyserver del vostro cambiamento, cosicché altri</div><div class='add'>+possano ricevere la vostra nuova sottochiave::</div><div class='add'>+</div><div class='add'>+    $ gpg --send-key [fpr]</div><div class='add'>+</div><div class='add'>+.. note:: Supporto ECC in GnuPG</div><div class='add'>+    GnuPG 2.1 e successivi supportano pienamente *Elliptic Curve Cryptography*,</div><div class='add'>+    con la possibilità di combinare sottochiavi ECC con le tradizionali chiavi</div><div class='add'>+    primarie RSA. Il principale vantaggio della crittografia ECC è che è molto</div><div class='add'>+    più veloce da calcolare e crea firme più piccole se confrontate byte per</div><div class='add'>+    byte con le chiavi RSA a più di 2048 bit. A meno che non pensiate di</div><div class='add'>+    utilizzare un dispositivo smartcard che non supporta le operazioni ECC, vi</div><div class='add'>+    raccomandiamo ti creare sottochiavi di firma ECC per il vostro lavoro col</div><div class='add'>+    kernel.</div><div class='add'>+</div><div class='add'>+    Se per qualche ragione preferite rimanere con sottochiavi RSA, nel comando</div><div class='add'>+    precedente, sostituite "ed25519" con "rsa2048".</div><div class='add'>+</div><div class='add'>+Copia di riserva della chiave primaria per gestire il recupero da disastro</div><div class='add'>+--------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Maggiori sono le firme di altri sviluppatori che vengono applicate alla vostra,</div><div class='add'>+maggiori saranno i motivi per avere una copia di riserva che non sia digitale,</div><div class='add'>+al fine di effettuare un recupero da disastro.</div><div class='add'>+</div><div class='add'>+Il modo migliore per creare una copia fisica della vostra chiave privata è</div><div class='add'>+l'uso del programma ``paperkey``. Consultate ``man paperkey`` per maggiori</div><div class='add'>+dettagli sul formato dell'output ed i suoi punti di forza rispetto ad altre</div><div class='add'>+soluzioni. Paperkey dovrebbe essere già pacchettizzato per la maggior parte</div><div class='add'>+delle distribuzioni.</div><div class='add'>+</div><div class='add'>+Eseguite il seguente comando per creare una copia fisica di riserva della</div><div class='add'>+vostra chiave privata::</div><div class='add'>+</div><div class='add'>+    $ gpg --export-secret-key [fpr] | paperkey -o /tmp/key-backup.txt</div><div class='add'>+</div><div class='add'>+Stampate il file (o fate un pipe direttamente verso lpr), poi prendete</div><div class='add'>+una penna e scrivete la passphare sul margine del foglio.  **Questo è</div><div class='add'>+caldamente consigliato** perché la copia cartacea è comunque criptata con</div><div class='add'>+la passphrase, e se mai doveste cambiarla non vi ricorderete qual'era al</div><div class='add'>+momento della creazione di quella copia -- *garantito*.</div><div class='add'>+</div><div class='add'>+Mettete la copia cartacea e la passphrase scritta a mano in una busta e</div><div class='add'>+mettetela in un posto sicuro e ben protetto, preferibilmente fuori casa,</div><div class='add'>+magari in una cassetta di sicurezza in banca.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    Probabilmente la vostra stampante non è più quello stupido dispositivo</div><div class='add'>+    connesso alla porta parallela, ma dato che il suo output è comunque</div><div class='add'>+    criptato con la passphrase, eseguire la stampa in un sistema "cloud"</div><div class='add'>+    moderno dovrebbe essere comunque relativamente sicuro. Un'opzione potrebbe</div><div class='add'>+    essere quella di cambiare la passphrase della vostra chiave primaria</div><div class='add'>+    subito dopo aver finito con paperkey.</div><div class='add'>+</div><div class='add'>+Copia di riserva di tutta la cartella GnuPG</div><div class='add'>+-------------------------------------------</div><div class='ctx'> </div><div class='ctx'> .. warning::</div><div class='ctx'> </div><div class='del'>-    TODO ancora da tradurre</div><div class='add'>+    **!!!Non saltate questo passo!!!**</div><div class='add'>+</div><div class='add'>+Quando avete bisogno di recuperare le vostre chiavi PGP è importante avere</div><div class='add'>+una copia di riserva pronta all'uso. Questo sta su un diverso piano di</div><div class='add'>+prontezza rispetto al recupero da disastro che abbiamo risolto con</div><div class='add'>+``paperkey``. Vi affiderete a queste copie esterne quando dovreste usare la</div><div class='add'>+vostra chiave Certify -- ovvero quando fate modifiche alle vostre chiavi o</div><div class='add'>+firmate le chiavi di altre persone ad una conferenza o ad un gruppo d'incontro.</div><div class='add'>+</div><div class='add'>+Incominciate con una piccola chiavetta di memoria USB (preferibilmente due)</div><div class='add'>+che userete per le copie di riserva. Dovrete criptarle usando LUKS -- fate</div><div class='add'>+riferimento alla documentazione della vostra distribuzione per capire come</div><div class='add'>+fare.</div><div class='add'>+</div><div class='add'>+Per la passphrase di criptazione, potete usare la stessa della vostra chiave</div><div class='add'>+primaria.</div><div class='add'>+</div><div class='add'>+Una volta che il processo di criptazione è finito, reinserite il disco USB ed</div><div class='add'>+assicurativi che venga montato correttamente. Copiate interamente la cartella</div><div class='add'>+``.gnugp`` nel disco criptato::</div><div class='add'>+</div><div class='add'>+    $ cp -a ~/.gnupg /media/disk/foo/gnupg-backup</div><div class='add'>+</div><div class='add'>+Ora dovreste verificare che tutto continui a funzionare::</div><div class='add'>+</div><div class='add'>+    $ gpg --homedir=/media/disk/foo/gnupg-backup --list-key [fpr]</div><div class='add'>+</div><div class='add'>+Se non vedete errori, allora dovreste avere fatto tutto con successo.</div><div class='add'>+Smontate il disco USB, etichettatelo per bene di modo da evitare di</div><div class='add'>+distruggerne il contenuto non appena vi serve una chiavetta USB a caso, ed</div><div class='add'>+infine mettetelo in un posto sicuro -- ma non troppo lontano, perché vi servirà</div><div class='add'>+di tanto in tanto per modificare le identità, aggiungere o revocare</div><div class='add'>+sottochiavi, o firmare le chiavi di altre persone.</div><div class='add'>+</div><div class='add'>+Togliete la chiave primaria dalla vostra home</div><div class='add'>+---------------------------------------------</div><div class='add'>+</div><div class='add'>+I file che si trovano nella vostra cartella home non sono poi così ben protetti</div><div class='add'>+come potreste pensare. Potrebbero essere letti o trafugati in diversi modi:</div><div class='add'>+</div><div class='add'>+- accidentalmente quando fate una rapida copia della cartella home per</div><div class='add'>+  configurare una nuova postazione</div><div class='add'>+- da un amministratore di sistema negligente o malintenzionato</div><div class='add'>+- attraverso copie di riserva insicure</div><div class='add'>+- attraverso malware installato in alcune applicazioni (browser, lettori PDF,</div><div class='add'>+  eccetera)</div><div class='add'>+- attraverso coercizione quando attraversate confini internazionali</div><div class='add'>+</div><div class='add'>+Proteggere la vostra chiave con una buona passphare aiuta notevolmente a</div><div class='add'>+ridurre i rischi elencati qui sopra, ma le passphrase possono essere scoperte</div><div class='add'>+attraverso i keylogger, il shoulder-surfing, o altri modi. Per questi motivi,</div><div class='add'>+nella configurazione si raccomanda di rimuove la chiave primaria dalla vostra</div><div class='add'>+cartella home e la si archivia su un dispositivo disconnesso.</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+    Per favore, fate riferimento alla sezione precedente e assicuratevi</div><div class='add'>+    di aver fatto una copia di riserva totale della cartella GnuPG. Quello</div><div class='add'>+    che stiamo per fare renderà la vostra chiave inutile se non avete delle</div><div class='add'>+    copie di riserva utilizzabili!</div><div class='add'>+</div><div class='add'>+Per prima cosa, identificate il keygrip della vostra chiave primaria::</div><div class='add'>+</div><div class='add'>+    $ gpg --with-keygrip --list-key [fpr]</div><div class='add'>+</div><div class='add'>+L'output assomiglierà a questo::</div><div class='add'>+</div><div class='add'>+    pub   rsa2048 2018-01-24 [SC] [expires: 2020-01-24]</div><div class='add'>+          000000000000000000000000AAAABBBBCCCCDDDD</div><div class='add'>+          Keygrip = 1111000000000000000000000000000000000000</div><div class='add'>+    uid           [ultimate] Alice Dev &lt;adev@kernel.org&gt;</div><div class='add'>+    sub   rsa2048 2018-01-24 [E] [expires: 2020-01-24]</div><div class='add'>+          Keygrip = 2222000000000000000000000000000000000000</div><div class='add'>+    sub   ed25519 2018-01-24 [S]</div><div class='add'>+          Keygrip = 3333000000000000000000000000000000000000</div><div class='add'>+</div><div class='add'>+Trovate la voce keygrid che si trova sotto alla riga ``pub`` (appena sotto</div><div class='add'>+all'impronta digitale della chiave primaria). Questo corrisponderà direttamente</div><div class='add'>+ad un file nella cartella ``~/.gnupg``::</div><div class='add'>+</div><div class='add'>+    $ cd ~/.gnupg/private-keys-v1.d</div><div class='add'>+    $ ls</div><div class='add'>+    1111000000000000000000000000000000000000.key</div><div class='add'>+    2222000000000000000000000000000000000000.key</div><div class='add'>+    3333000000000000000000000000000000000000.key</div><div class='add'>+</div><div class='add'>+Quello che dovrete fare è rimuovere il file .key che corrisponde al keygrip</div><div class='add'>+della chiave primaria::</div><div class='add'>+</div><div class='add'>+    $ cd ~/.gnupg/private-keys-v1.d</div><div class='add'>+    $ rm 1111000000000000000000000000000000000000.key</div><div class='add'>+</div><div class='add'>+Ora, se eseguite il comando ``--list-secret-keys``, vedrete che la chiave</div><div class='add'>+primaria non compare più (il simbolo ``#`` indica che non è disponibile)::</div><div class='add'>+</div><div class='add'>+    $ gpg --list-secret-keys</div><div class='add'>+    sec#  rsa2048 2018-01-24 [SC] [expires: 2020-01-24]</div><div class='add'>+          000000000000000000000000AAAABBBBCCCCDDDD</div><div class='add'>+    uid           [ultimate] Alice Dev &lt;adev@kernel.org&gt;</div><div class='add'>+    ssb   rsa2048 2018-01-24 [E] [expires: 2020-01-24]</div><div class='add'>+    ssb   ed25519 2018-01-24 [S]</div><div class='add'>+</div><div class='add'>+Dovreste rimuovere anche i file ``secring.gpg`` che si trovano nella cartella</div><div class='add'>+``~/.gnupg``, in quanto rimasugli delle versioni precedenti di GnuPG.</div><div class='add'>+</div><div class='add'>+Se non avete la cartella "private-keys-v1.d"</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Se non avete la cartella ``~/.gnupg/private-keys-v1.d``, allora le vostre</div><div class='add'>+chiavi segrete sono ancora salvate nel vecchio file ``secring.gpg`` usato</div><div class='add'>+da GnuPG v1. Effettuare una qualsiasi modifica alla vostra chiave, come</div><div class='add'>+cambiare la passphare o aggiungere una sottochiave, dovrebbe convertire</div><div class='add'>+automaticamente il vecchio formato ``secring.gpg``nel nuovo</div><div class='add'>+``private-keys-v1.d``.</div><div class='add'>+</div><div class='add'>+Una volta che l'avete fatto, assicuratevi di rimuovere il file ``secring.gpg``,</div><div class='add'>+che continua a contenere la vostra chiave privata.</div><div class='add'>+</div><div class='add'>+.. _it_smartcards:</div><div class='add'>+</div><div class='add'>+Spostare le sottochiavi in un apposito dispositivo criptato</div><div class='add'>+===========================================================</div><div class='add'>+</div><div class='add'>+Nonostante la chiave primaria sia ora al riparo da occhi e mani indiscrete,</div><div class='add'>+le sottochiavi si trovano ancora nella vostra cartella home. Chiunque riesca</div><div class='add'>+a mettere le sue mani su quelle chiavi riuscirà a decriptare le vostre</div><div class='add'>+comunicazioni o a falsificare le vostre firme (se conoscono la passphrase).</div><div class='add'>+Inoltre, ogni volta che viene fatta un'operazione con GnuPG, le chiavi vengono</div><div class='add'>+caricate nella memoria di sistema e potrebbero essere rubate con l'uso di</div><div class='add'>+malware sofisticati (pensate a Meltdown e a Spectre).</div><div class='add'>+</div><div class='add'>+Il miglior modo per proteggere le proprie chiave è di spostarle su un</div><div class='add'>+dispositivo specializzato in grado di effettuare operazioni smartcard.</div><div class='add'>+</div><div class='add'>+I benefici di una smartcard</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Una smartcard contiene un chip crittografico che è capace di immagazzinare</div><div class='add'>+le chiavi private ed effettuare operazioni crittografiche direttamente sulla</div><div class='add'>+carta stessa. Dato che la chiave non lascia mai la smartcard, il sistema</div><div class='add'>+operativo usato sul computer non sarà in grado di accedere alle chiavi.</div><div class='add'>+Questo è molto diverso dai dischi USB criptati che abbiamo usato allo scopo di</div><div class='add'>+avere una copia di riserva sicura -- quando il dispositivo USB è connesso e</div><div class='add'>+montato, il sistema operativo potrà accedere al contenuto delle chiavi private.</div><div class='add'>+</div><div class='add'>+L'uso di un disco USB criptato non può sostituire le funzioni di un dispositivo</div><div class='add'>+capace di operazioni di tipo smartcard.</div><div class='add'>+</div><div class='add'>+Dispositivi smartcard disponibili</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+A meno che tutti i vostri computer dispongano di lettori smartcard, il modo</div><div class='add'>+più semplice è equipaggiarsi di un dispositivo USB specializzato che</div><div class='add'>+implementi le funzionalità delle smartcard.  Sul mercato ci sono diverse</div><div class='add'>+soluzioni disponibili:</div><div class='add'>+</div><div class='add'>+- `Nitrokey Start`_: è Open hardware e Free Software, è basata sul progetto</div><div class='add'>+  `GnuK`_ della FSIJ. Ha il supporto per chiavi ECC, ma meno funzionalità di</div><div class='add'>+  sicurezza (come la resistenza alla manomissione o alcuni attacchi ad un</div><div class='add'>+  canale laterale).</div><div class='add'>+- `Nitrokey Pro`_: è simile alla Nitrokey Start, ma è più resistente alla</div><div class='add'>+  manomissione e offre più funzionalità di sicurezza, ma l'ECC.</div><div class='add'>+- `Yubikey 4`_: l'hardware e il software sono proprietari, ma è più economica</div><div class='add'>+  della  Nitrokey Pro ed è venduta anche con porta USB-C il che è utile con i</div><div class='add'>+  computer portatili più recenti. In aggiunta, offre altre funzionalità di</div><div class='add'>+  sicurezza come FIDO, U2F, ma non l'ECC</div><div class='add'>+</div><div class='add'>+`Su LWN c'è una buona recensione`_ dei modelli elencati qui sopra e altri.</div><div class='add'>+Se volete usare chiavi ECC, la vostra migliore scelta sul mercato è la</div><div class='add'>+Nitrokey Start.</div><div class='add'>+</div><div class='add'>+.. _`Nitrokey Start`: https://shop.nitrokey.com/shop/product/nitrokey-start-6</div><div class='add'>+.. _`Nitrokey Pro`: https://shop.nitrokey.com/shop/product/nitrokey-pro-3</div><div class='add'>+.. _`Yubikey 4`: https://www.yubico.com/product/yubikey-4-series/</div><div class='add'>+.. _Gnuk: http://www.fsij.org/doc-gnuk/</div><div class='add'>+.. _`Su LWN c'è una buona recensione`: https://lwn.net/Articles/736231/</div><div class='add'>+</div><div class='add'>+Configurare il vostro dispositivo smartcard</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+Il vostro dispositivo smartcard dovrebbe iniziare a funzionare non appena</div><div class='add'>+lo collegate ad un qualsiasi computer Linux moderno. Potete verificarlo</div><div class='add'>+eseguendo::</div><div class='add'>+</div><div class='add'>+    $ gpg --card-status</div><div class='add'>+</div><div class='add'>+Se vedete tutti i dettagli della smartcard, allora ci siamo. Sfortunatamente,</div><div class='add'>+affrontare tutti i possibili motivi per cui le cose potrebbero non funzionare</div><div class='add'>+non è lo scopo di questa guida. Se avete problemi nel far funzionare la carta</div><div class='add'>+con GnuPG, cercate aiuto attraverso i soliti canali di supporto.</div><div class='add'>+</div><div class='add'>+Per configurare la vostra smartcard, dato che non c'è una via facile dalla</div><div class='add'>+riga di comando, dovrete usate il menu di GnuPG::</div><div class='add'>+</div><div class='add'>+    $ gpg --card-edit</div><div class='add'>+    [...omitted...]</div><div class='add'>+    gpg/card&gt; admin</div><div class='add'>+    Admin commands are allowed</div><div class='add'>+    gpg/card&gt; passwd</div><div class='add'>+</div><div class='add'>+Dovreste impostare il PIN dell'utente (1), quello dell'amministratore (3) e il</div><div class='add'>+codice di reset (4). Assicuratevi di annotare e salvare questi codici in un</div><div class='add'>+posto sicuro -- specialmente il PIN dell'amministratore e il codice di reset</div><div class='add'>+(che vi permetterà di azzerare completamente la smartcard).  Il PIN</div><div class='add'>+dell'amministratore viene usato così raramente che è inevitabile dimenticarselo</div><div class='add'>+se non lo si annota.</div><div class='add'>+</div><div class='add'>+Tornando al nostro menu, potete impostare anche altri valori (come il nome,</div><div class='add'>+il sesso, informazioni d'accesso, eccetera), ma non sono necessari e aggiunge</div><div class='add'>+altre informazioni sulla carta che potrebbero trapelare in caso di smarrimento.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    A dispetto del nome "PIN", né il PIN utente né quello dell'amministratore</div><div class='add'>+    devono essere esclusivamente numerici.</div><div class='add'>+</div><div class='add'>+Spostare le sottochiavi sulla smartcard</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Uscite dal menu (usando "q") e salverete tutte le modifiche. Poi, spostiamo</div><div class='add'>+tutte le sottochiavi sulla smartcard. Per la maggior parte delle operazioni</div><div class='add'>+vi serviranno sia la passphrase della chiave PGP che il PIN</div><div class='add'>+dell'amministratore::</div><div class='add'>+</div><div class='add'>+    $ gpg --edit-key [fpr]</div><div class='add'>+</div><div class='add'>+    Secret subkeys are available.</div><div class='add'>+</div><div class='add'>+    pub  rsa2048/AAAABBBBCCCCDDDD</div><div class='add'>+         created: 2018-01-23  expires: 2020-01-23  usage: SC</div><div class='add'>+         trust: ultimate      validity: ultimate</div><div class='add'>+    ssb  rsa2048/1111222233334444</div><div class='add'>+         created: 2018-01-23  expires: never       usage: E</div><div class='add'>+    ssb  ed25519/5555666677778888</div><div class='add'>+         created: 2017-12-07  expires: never       usage: S</div><div class='add'>+    [ultimate] (1). Alice Dev &lt;adev@kernel.org&gt;</div><div class='add'>+</div><div class='add'>+    gpg&gt;</div><div class='add'>+</div><div class='add'>+Usando ``--edit-key`` si tornerà alla modalità menu e noterete che</div><div class='add'>+la lista delle chiavi è leggermente diversa. Da questo momento in poi,</div><div class='add'>+tutti i comandi saranno eseguiti nella modalità menu, come indicato</div><div class='add'>+da ``gpg&gt;``.</div><div class='add'>+</div><div class='add'>+Per prima cosa, selezioniamo la chiave che verrà messa sulla carta --</div><div class='add'>+potete farlo digitando ``key 1`` (è la prima della lista, la sottochiave</div><div class='add'>+**[E]**)::</div><div class='add'>+</div><div class='add'>+    gpg&gt; key 1</div><div class='add'>+</div><div class='add'>+Nel'output dovreste vedere ``ssb*`` associato alla chiave **[E]**. Il simbolo</div><div class='add'>+``*`` indica che la chiave è stata "selezionata". Funziona come un</div><div class='add'>+interruttore, ovvero se scrivete nuovamente ``key 1``, il simbolo ``*`` sparirà</div><div class='add'>+e la chiave non sarà più selezionata.</div><div class='add'>+</div><div class='add'>+Ora, spostiamo la chiave sulla smartcard::</div><div class='add'>+</div><div class='add'>+    gpg&gt; keytocard</div><div class='add'>+    Please select where to store the key:</div><div class='add'>+       (2) Encryption key</div><div class='add'>+    Your selection? 2</div><div class='add'>+</div><div class='add'>+Dato che è la nostra chiave  **[E]**, ha senso metterla nella sezione criptata.</div><div class='add'>+Quando confermerete la selezione, vi verrà chiesta la passphrase della vostra</div><div class='add'>+chiave PGP, e poi il PIN dell'amministratore. Se il comando ritorna senza</div><div class='add'>+errori, allora la vostra chiave è stata spostata con successo.</div><div class='add'>+</div><div class='add'>+**Importante**: digitate nuovamente ``key 1`` per deselezionare la prima chiave</div><div class='add'>+e selezionate la seconda chiave **[S]** con ``key 2``::</div><div class='add'>+</div><div class='add'>+    gpg&gt; key 1</div><div class='add'>+    gpg&gt; key 2</div><div class='add'>+    gpg&gt; keytocard</div><div class='add'>+    Please select where to store the key:</div><div class='add'>+       (1) Signature key</div><div class='add'>+       (3) Authentication key</div><div class='add'>+    Your selection? 1</div><div class='add'>+</div><div class='add'>+Potete usare la chiave **[S]** sia per firmare che per autenticare, ma vogliamo</div><div class='add'>+che sia nella sezione di firma, quindi scegliete (1). Ancora una volta, se il</div><div class='add'>+comando ritorna senza errori, allora l'operazione è avvenuta con successo::</div><div class='add'>+</div><div class='add'>+    gpg&gt; q</div><div class='add'>+    Save changes? (y/N) y</div><div class='add'>+</div><div class='add'>+Salvando le modifiche cancellerete dalla vostra cartella home tutte le chiavi</div><div class='add'>+che avete spostato sulla carta (ma questo non è un problema, perché abbiamo</div><div class='add'>+fatto delle copie di sicurezza nel caso in cui dovessimo configurare una</div><div class='add'>+nuova smartcard).</div><div class='add'>+</div><div class='add'>+Verificare che le chiavi siano state spostate</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Ora, se doveste usare l'opzione ``--list-secret-keys``, vedrete una</div><div class='add'>+sottile differenza nell'output::</div><div class='add'>+</div><div class='add'>+    $ gpg --list-secret-keys</div><div class='add'>+    sec#  rsa2048 2018-01-24 [SC] [expires: 2020-01-24]</div><div class='add'>+          000000000000000000000000AAAABBBBCCCCDDDD</div><div class='add'>+    uid           [ultimate] Alice Dev &lt;adev@kernel.org&gt;</div><div class='add'>+    ssb&gt;  rsa2048 2018-01-24 [E] [expires: 2020-01-24]</div><div class='add'>+    ssb&gt;  ed25519 2018-01-24 [S]</div><div class='add'>+</div><div class='add'>+Il simbolo ``&gt;`` in ``ssb&gt;`` indica che la sottochiave è disponibile solo</div><div class='add'>+nella smartcard. Se tornate nella vostra cartella delle chiavi segrete e</div><div class='add'>+guardate al suo contenuto, noterete che i file ``.key`` sono stati sostituiti</div><div class='add'>+con degli stub::</div><div class='add'>+</div><div class='add'>+    $ cd ~/.gnupg/private-keys-v1.d</div><div class='add'>+    $ strings *.key | grep 'private-key'</div><div class='add'>+</div><div class='add'>+Per indicare che i file sono solo degli stub e che in realtà il contenuto è</div><div class='add'>+sulla smartcard, l'output dovrebbe mostrarvi ``shadowed-private-key``.</div><div class='add'>+</div><div class='add'>+Verificare che la smartcard funzioni</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Per verificare che la smartcard funzioni come dovuto, potete creare</div><div class='add'>+una firma::</div><div class='add'>+</div><div class='add'>+    $ echo "Hello world" | gpg --clearsign &gt; /tmp/test.asc</div><div class='add'>+    $ gpg --verify /tmp/test.asc</div><div class='add'>+</div><div class='add'>+Col primo comando dovrebbe chiedervi il PIN della smartcard, e poi dovrebbe</div><div class='add'>+mostrare "Good signature" dopo l'esecuzione di ``gpg --verify``.</div><div class='add'>+</div><div class='add'>+Complimenti, siete riusciti a rendere estremamente difficile il furto della</div><div class='add'>+vostra identità digitale di sviluppatore.</div><div class='add'>+</div><div class='add'>+Altre operazioni possibili con GnuPG</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Segue un breve accenno ad alcune delle operazioni più comuni che dovrete</div><div class='add'>+fare con le vostre chiavi PGP.</div><div class='add'>+</div><div class='add'>+Montare il disco con la chiave primaria</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Vi servirà la vostra chiave principale per tutte le operazioni che seguiranno,</div><div class='add'>+per cui per prima cosa dovrete accedere ai vostri backup e dire a GnuPG di</div><div class='add'>+usarli::</div><div class='add'>+</div><div class='add'>+    $ export GNUPGHOME=/media/disk/foo/gnupg-backup</div><div class='add'>+    $ gpg --list-secret-keys</div><div class='add'>+</div><div class='add'>+Dovete assicurarvi di vedere ``sec`` e non ``sec#`` nell'output del programma</div><div class='add'>+(il simbolo ``#`` significa che la chiave non è disponibile e che state ancora</div><div class='add'>+utilizzando la vostra solita cartella di lavoro).</div><div class='add'>+</div><div class='add'>+Estendere la data di scadenza di una chiave</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+La chiave principale ha una data di scadenza di 2 anni dal momento della sua</div><div class='add'>+creazione. Questo per motivi di sicurezza e per rendere obsolete le chiavi</div><div class='add'>+che, eventualmente, dovessero sparire dai keyserver.</div><div class='add'>+</div><div class='add'>+Per estendere di un anno, dalla data odierna, la scadenza di una vostra chiave,</div><div class='add'>+eseguite::</div><div class='add'>+</div><div class='add'>+    $ gpg --quick-set-expire [fpr] 1y</div><div class='add'>+</div><div class='add'>+Se per voi è più facile da memorizzare, potete anche utilizzare una data</div><div class='add'>+specifica (per esempio, il vostro compleanno o capodanno)::</div><div class='add'>+</div><div class='add'>+    $ gpg --quick-set-expire [fpr] 2020-07-01</div><div class='add'>+</div><div class='add'>+Ricordatevi di inviare l'aggiornamento ai keyserver::</div><div class='add'>+</div><div class='add'>+    $ gpg --send-key [fpr]</div><div class='add'>+</div><div class='add'>+Aggiornare la vostra cartella di lavoro dopo ogni modifica</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Dopo aver fatto delle modifiche alle vostre chiavi usando uno spazio a parte,</div><div class='add'>+dovreste importarle nella vostra cartella di lavoro abituale::</div><div class='add'>+</div><div class='add'>+    $ gpg --export | gpg --homedir ~/.gnupg --import</div><div class='add'>+    $ unset GNUPGHOME</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Usare PGP con Git</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Una delle caratteristiche fondanti di Git è la sua natura decentralizzata --</div><div class='add'>+una volta che il repositorio è stato clonato sul vostro sistema, avete la</div><div class='add'>+storia completa del progetto, inclusi i suoi tag, i commit ed i rami. Tuttavia,</div><div class='add'>+con i centinaia di repositori clonati che ci sono in giro, come si fa a</div><div class='add'>+verificare che la loro copia di linux.git non è stata manomessa da qualcuno?</div><div class='add'>+</div><div class='add'>+Oppure, cosa succede se viene scoperta una backdoor nel codice e la riga</div><div class='add'>+"Autore" dice che sei stato tu, mentre tu sei abbastanza sicuro di</div><div class='add'>+`non averci niente a che fare`_?</div><div class='add'>+</div><div class='add'>+Per risolvere entrambi i problemi, Git ha introdotto l'integrazione con PGP.</div><div class='add'>+I tag firmati dimostrano che il repositorio è integro assicurando che il suo</div><div class='add'>+contenuto è lo stesso che si trova sulle macchine degli sviluppatori che hanno</div><div class='add'>+creato il tag; mentre i commit firmati rendono praticamente impossibile</div><div class='add'>+ad un malintenzionato di impersonarvi senza avere accesso alle vostre chiavi</div><div class='add'>+PGP.</div><div class='add'>+</div><div class='add'>+.. _`non averci niente a che fare`: https://github.com/jayphelps/git-blame-someone-else</div><div class='add'>+</div><div class='add'>+Configurare git per usare la vostra chiave PGP</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+Se avete solo una chiave segreta nel vostro portachiavi, allora non avete nulla</div><div class='add'>+da fare in più dato che sarà la vostra chiave di base. Tuttavia, se doveste</div><div class='add'>+avere più chiavi segrete, potete dire a git quale dovrebbe usare (``[fpg]``</div><div class='add'>+è la vostra impronta digitale)::</div><div class='add'>+</div><div class='add'>+    $ git config --global user.signingKey [fpr]</div><div class='add'>+</div><div class='add'>+**IMPORTANTE**: se avete una comando dedicato per ``gpg2``, allora dovreste</div><div class='add'>+dire a git di usare sempre quello piuttosto che il vecchio comando ``gpg``::</div><div class='add'>+</div><div class='add'>+    $ git config --global gpg.program gpg2</div><div class='add'>+</div><div class='add'>+Come firmare i tag</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Per creare un tag firmato, passate l'opzione ``-s`` al comando tag::</div><div class='add'>+</div><div class='add'>+    $ git tag -s [tagname]</div><div class='add'>+</div><div class='add'>+La nostra raccomandazione è quella di firmare sempre i tag git, perché</div><div class='add'>+questo permette agli altri sviluppatori di verificare che il repositorio</div><div class='add'>+git dal quale stanno prendendo il codice non è stato alterato intenzionalmente.</div><div class='add'>+</div><div class='add'>+Come verificare i tag firmati</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Per verificare un tag firmato, potete usare il comando ``verify-tag``::</div><div class='add'>+</div><div class='add'>+    $ git verify-tag [tagname]</div><div class='add'>+</div><div class='add'>+Se state prendendo un tag da un fork del repositorio del progetto, git</div><div class='add'>+dovrebbe verificare automaticamente la firma di quello che state prendendo</div><div class='add'>+e vi mostrerà il risultato durante l'operazione di merge::</div><div class='add'>+</div><div class='add'>+    $ git pull [url] tags/sometag</div><div class='add'>+</div><div class='add'>+Il merge conterrà qualcosa di simile::</div><div class='add'>+</div><div class='add'>+    Merge tag 'sometag' of [url]</div><div class='add'>+</div><div class='add'>+    [Tag message]</div><div class='add'>+</div><div class='add'>+    # gpg: Signature made [...]</div><div class='add'>+    # gpg: Good signature from [...]</div><div class='add'>+</div><div class='add'>+Se state verificando il tag di qualcun altro, allora dovrete importare</div><div class='add'>+la loro chiave PGP. Fate riferimento alla sezione ":ref:`it_verify_identities`"</div><div class='add'>+che troverete più avanti.</div><div class='add'>+</div><div class='add'>+Configurare git per firmare sempre i tag con annotazione</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Se state creando un tag con annotazione è molto probabile che vogliate</div><div class='add'>+firmarlo. Per imporre a git di firmare sempre un tag con annotazione,</div><div class='add'>+dovete impostare la seguente opzione globale::</div><div class='add'>+</div><div class='add'>+    $ git config --global tag.forceSignAnnotated true</div><div class='add'>+</div><div class='add'>+Come usare commit firmati</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Creare dei commit firmati è facile, ma è molto più difficile utilizzarli</div><div class='add'>+nello sviluppo del kernel linux per via del fatto che ci si affida alle</div><div class='add'>+liste di discussione e questo modo di procedere non mantiene le firme PGP</div><div class='add'>+nei commit. In aggiunta, quando si usa *rebase* nel proprio repositorio</div><div class='add'>+locale per allinearsi al kernel anche le proprie firme PGP verranno scartate.</div><div class='add'>+Per questo motivo, la maggior parte degli sviluppatori del kernel non si</div><div class='add'>+preoccupano troppo di firmare i propri commit ed ignoreranno quelli firmati</div><div class='add'>+che si trovano in altri repositori usati per il proprio lavoro.</div><div class='add'>+</div><div class='add'>+Tuttavia, se avete il vostro repositorio di lavoro disponibile al pubblico</div><div class='add'>+su un qualche servizio di hosting git (kernel.org, infradead.org, ozlabs.org,</div><div class='add'>+o altri), allora la raccomandazione è di firmare tutti i vostri commit</div><div class='add'>+anche se gli sviluppatori non ne beneficeranno direttamente.</div><div class='add'>+</div><div class='add'>+Vi raccomandiamo di farlo per i seguenti motivi:</div><div class='add'>+</div><div class='add'>+1. Se dovesse mai esserci la necessità di fare delle analisi forensi o</div><div class='add'>+   tracciare la provenienza di un codice, anche sorgenti mantenuti</div><div class='add'>+   esternamente che hanno firme PGP sui commit avranno un certo valore a</div><div class='add'>+   questo scopo.</div><div class='add'>+2. Se dovesse mai capitarvi di clonare il vostro repositorio locale (per</div><div class='add'>+   esempio dopo un danneggiamento del disco), la firma vi permetterà di</div><div class='add'>+   verificare l'integrità del repositorio prima di riprendere il lavoro.</div><div class='add'>+3. Se qualcuno volesse usare *cherry-pick* sui vostri commit, allora la firma</div><div class='add'>+   permetterà di verificare l'integrità dei commit prima di applicarli.</div><div class='add'>+</div><div class='add'>+Creare commit firmati</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Per creare un commit firmato, dovete solamente aggiungere l'opzione ``-S``</div><div class='add'>+al comando ``git commit`` (si usa la lettera maiuscola per evitare</div><div class='add'>+conflitti con un'altra opzione)::</div><div class='add'>+</div><div class='add'>+    $ git commit -S</div><div class='add'>+</div><div class='add'>+Configurare git per firmare sempre i commit</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Potete dire a git di firmare sempre i commit::</div><div class='add'>+</div><div class='add'>+    git config --global commit.gpgSign true</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    Assicuratevi di aver configurato ``gpg-agent`` prima di abilitare</div><div class='add'>+    questa opzione.</div><div class='add'>+</div><div class='add'>+.. _it_verify_identities:</div><div class='add'>+</div><div class='add'>+Come verificare l'identità degli sviluppatori del kernel</div><div class='add'>+========================================================</div><div class='add'>+</div><div class='add'>+Firmare i tag e i commit è facile, ma come si fa a verificare che la chiave</div><div class='add'>+usata per firmare qualcosa appartenga davvero allo sviluppatore e non ad un</div><div class='add'>+impostore?</div><div class='add'>+</div><div class='add'>+Configurare l'auto-key-retrieval usando WKD e DANE</div><div class='add'>+--------------------------------------------------</div><div class='add'>+</div><div class='add'>+Se non siete ancora in possesso di una vasta collezione di chiavi pubbliche</div><div class='add'>+di altri sviluppatori, allora potreste iniziare il vostro portachiavi</div><div class='add'>+affidandovi ai servizi di auto-scoperta e auto-recupero. GnuPG può affidarsi</div><div class='add'>+ad altre tecnologie di delega della fiducia, come DNSSEC e TLS, per sostenervi</div><div class='add'>+nel caso in cui iniziare una propria rete di fiducia da zero sia troppo</div><div class='add'>+scoraggiante.</div><div class='add'>+</div><div class='add'>+Aggiungete il seguente testo al vostro file ``~/.gnupg/gpg.conf``::</div><div class='add'>+</div><div class='add'>+    auto-key-locate wkd,dane,local</div><div class='add'>+    auto-key-retrieve</div><div class='add'>+</div><div class='add'>+La *DNS-Based Authentication of Named Entities* ("DANE") è un metodo</div><div class='add'>+per la pubblicazione di chiavi pubbliche su DNS e per renderle sicure usando</div><div class='add'>+zone firmate con DNSSEC. Il *Web Key Directory* ("WKD") è un metodo</div><div class='add'>+alternativo che usa https a scopo di ricerca. Quando si usano DANE o WKD</div><div class='add'>+per la ricerca di chiavi pubbliche, GnuPG validerà i certificati DNSSEC o TLS</div><div class='add'>+prima di aggiungere al vostro portachiavi locale le eventuali chiavi trovate.</div><div class='add'>+</div><div class='add'>+Kernel.org pubblica la WKD per tutti gli sviluppatori che hanno un account</div><div class='add'>+kernel.org. Una volta che avete applicato le modifiche al file ``gpg.conf``,</div><div class='add'>+potrete auto-recuperare le chiavi di Linus Torvalds e Greg Kroah-Hartman</div><div class='add'>+(se non le avete già)::</div><div class='add'>+</div><div class='add'>+    $ gpg --locate-keys torvalds@kernel.org gregkh@kernel.org</div><div class='add'>+</div><div class='add'>+Se avete un account kernel.org, al fine di rendere più utile l'uso di WKD</div><div class='add'>+da parte di altri sviluppatori del kernel, dovreste `aggiungere alla vostra</div><div class='add'>+chiave lo UID di kernel.org`_.</div><div class='add'>+</div><div class='add'>+.. _`aggiungere alla vostra chiave lo UID di kernel.org`: https://korg.wiki.kernel.org/userdoc/mail#adding_a_kernelorg_uid_to_your_pgp_key</div><div class='add'>+</div><div class='add'>+Web of Trust (WOT) o Trust on First Use (TOFU)</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+PGP incorpora un meccanismo di delega della fiducia conosciuto come</div><div class='add'>+"Web of Trust". Di base, questo è un tentativo di sostituire la necessità</div><div class='add'>+di un'autorità certificativa centralizzata tipica del mondo HTTPS/TLS.</div><div class='add'>+Invece di avere svariati produttori software che decidono chi dovrebbero</div><div class='add'>+essere le entità di certificazione di cui dovreste fidarvi, PGP lascia</div><div class='add'>+la responsabilità ad ogni singolo utente.</div><div class='add'>+</div><div class='add'>+Sfortunatamente, solo poche persone capiscono come funziona la rete di fiducia.</div><div class='add'>+Nonostante sia un importante aspetto della specifica OpenPGP, recentemente</div><div class='add'>+le versioni di GnuPG (2.2 e successive) hanno implementato un meccanisco</div><div class='add'>+alternativo chiamato "Trust on First Use" (TOFU). Potete pensare a TOFU come</div><div class='add'>+"ad un approccio all fidicia simile ad SSH". In SSH, la prima volta che vi</div><div class='add'>+connettete ad un sistema remoto, l'impronta digitale della chiave viene</div><div class='add'>+registrata e ricordata. Se la chiave dovesse cambiare in futuro, il programma</div><div class='add'>+SSH vi avviserà e si rifiuterà di connettersi, obbligandovi a prendere una</div><div class='add'>+decisione circa la fiducia che riponete nella nuova chiave. In modo simile,</div><div class='add'>+la prima volta che importate la chiave PGP di qualcuno, si assume sia valida.</div><div class='add'>+Se ad un certo punto GnuPG trova un'altra chiave con la stessa identità,</div><div class='add'>+entrambe, la vecchia e la nuova, verranno segnate come invalide e dovrete</div><div class='add'>+verificare manualmente quale tenere.</div><div class='add'>+</div><div class='add'>+Vi raccomandiamo di usare il meccanisco TOFU+PGP (che è la nuova configurazione</div><div class='add'>+di base di GnuPG v2). Per farlo, aggiungete (o modificate) l'impostazione</div><div class='add'>+``trust-model`` in ``~/.gnupg/gpg.conf``::</div><div class='add'>+</div><div class='add'>+    trust-model tofu+pgp</div><div class='add'>+</div><div class='add'>+Come usare i keyserver in sicurezza</div><div class='add'>+-----------------------------------</div><div class='add'>+Se ottenete l'errore "No public key" quando cercate di validate il tag di</div><div class='add'>+qualcuno, allora dovreste cercare quella chiave usando un keyserver. È</div><div class='add'>+importante tenere bene a mente che non c'è alcuna garanzia che la chiave</div><div class='add'>+che avete recuperato da un keyserver PGP appartenga davvero alla persona</div><div class='add'>+reale -- è progettato così. Dovreste usare il Web of Trust per assicurarvi</div><div class='add'>+che la chiave sia valida.</div><div class='add'>+</div><div class='add'>+Come mantenere il Web of Trust va oltre gli scopi di questo documento,</div><div class='add'>+semplicemente perché farlo come si deve richiede sia sforzi che perseveranza</div><div class='add'>+che tendono ad andare oltre al livello di interesse della maggior parte degli</div><div class='add'>+esseri umani. Qui di seguito alcuni rapidi suggerimenti per aiutarvi a ridurre</div><div class='add'>+il rischio di importare chiavi maligne.</div><div class='add'>+</div><div class='add'>+Primo, diciamo che avete provato ad eseguire ``git verify-tag`` ma restituisce</div><div class='add'>+un errore dicendo che la chiave non è stata trovata::</div><div class='add'>+</div><div class='add'>+    $ git verify-tag sunxi-fixes-for-4.15-2</div><div class='add'>+    gpg: Signature made Sun 07 Jan 2018 10:51:55 PM EST</div><div class='add'>+    gpg:                using RSA key DA73759BF8619E484E5A3B47389A54219C0F2430</div><div class='add'>+    gpg:                issuer "wens@...org"</div><div class='add'>+    gpg: Can't check signature: No public key</div><div class='add'>+</div><div class='add'>+Cerchiamo nel keyserver per maggiori informazioni sull'impronta digitale</div><div class='add'>+della chiave (l'impronta digitale, probabilmente, appartiene ad una</div><div class='add'>+sottochiave, dunque non possiamo usarla direttamente senza trovare prima</div><div class='add'>+l'ID della chiave primaria associata ad essa)::</div><div class='add'>+</div><div class='add'>+    $ gpg --search DA73759BF8619E484E5A3B47389A54219C0F2430</div><div class='add'>+    gpg: data source: hkp://keys.gnupg.net</div><div class='add'>+    (1) Chen-Yu Tsai &lt;wens@...org&gt;</div><div class='add'>+          4096 bit RSA key C94035C21B4F2AEB, created: 2017-03-14, expires: 2019-03-15</div><div class='add'>+    Keys 1-1 of 1 for "DA73759BF8619E484E5A3B47389A54219C0F2430".  Enter number(s), N)ext, or Q)uit &gt; q</div><div class='add'>+</div><div class='add'>+Localizzate l'ID della chiave primaria, nel nostro esempio</div><div class='add'>+``C94035C21B4F2AEB``. Ora visualizzate le chiavi di Linus Torvalds</div><div class='add'>+che avete nel vostro portachiavi::</div><div class='add'>+</div><div class='add'>+    $ gpg --list-key torvalds@kernel.org</div><div class='add'>+    pub   rsa2048 2011-09-20 [SC]</div><div class='add'>+          ABAF11C65A2970B130ABE3C479BE3E4300411886</div><div class='add'>+    uid           [ unknown] Linus Torvalds &lt;torvalds@kernel.org&gt;</div><div class='add'>+    sub   rsa2048 2011-09-20 [E]</div><div class='add'>+</div><div class='add'>+Poi, aprite il `PGP pathfinder`_. Nel campo "From", incollate l'impronta</div><div class='add'>+digitale della chiave di Linus Torvalds che si vede nell'output qui sopra.</div><div class='add'>+Nel campo "to", incollate il key-id della chiave sconosciuta che avete</div><div class='add'>+trovato con ``gpg --search``, e poi verificare il risultato:</div><div class='add'>+</div><div class='add'>+- `Finding paths to Linus`_</div><div class='add'>+</div><div class='add'>+Se trovate un paio di percorsi affidabili è un buon segno circa la validità</div><div class='add'>+della chiave. Ora, potete aggiungerla al vostro portachiavi dal keyserver::</div><div class='add'>+</div><div class='add'>+    $ gpg --recv-key C94035C21B4F2AEB</div><div class='add'>+</div><div class='add'>+Questa procedura non è perfetta, e ovviamente state riponendo la vostra</div><div class='add'>+fiducia nell'amministratore del servizio *PGP Pathfinder* sperando che non</div><div class='add'>+sia malintenzionato (infatti, questo va contro :ref:`it_devs_not_infra`).</div><div class='add'>+Tuttavia, se mantenete con cura la vostra rete di fiducia sarà un deciso</div><div class='add'>+miglioramento rispetto alla cieca fiducia nei keyserver.</div><div class='add'>+</div><div class='add'>+.. _`PGP pathfinder`: https://pgp.cs.uu.nl/</div><div class='add'>+.. _`Finding paths to Linus`: https://pgp.cs.uu.nl/paths/79BE3E4300411886/to/C94035C21B4F2AEB.html</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/stable-kernel-rules.rst b/Documentation/translations/it_IT/process/stable-kernel-rules.rst<br/>index 6fa5ce9c3572..48e88e5ad2c5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/stable-kernel-rules.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/stable-kernel-rules.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/stable-kernel-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/stable-kernel-rules.rst</a></div><div class='hunk'>@@ -1,12 +1,202 @@</div><div class='ctx'> .. include:: ../disclaimer-ita.rst</div><div class='ctx'> </div><div class='ctx'> :Original: :ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='add'>+:Translator: Federico Vaga &lt;federico.vaga@vaga.pv.it&gt;</div><div class='ctx'> </div><div class='ctx'> .. _it_stable_kernel_rules:</div><div class='ctx'> </div><div class='ctx'> Tutto quello che volevate sapere sui rilasci -stable di Linux</div><div class='ctx'> ==============================================================</div><div class='ctx'> </div><div class='del'>-.. warning::</div><div class='add'>+Regole sul tipo di patch che vengono o non vengono accettate nei sorgenti</div><div class='add'>+"-stable":</div><div class='ctx'> </div><div class='del'>-    TODO ancora da tradurre</div><div class='add'>+ - Ovviamente dev'essere corretta e verificata.</div><div class='add'>+ - Non dev'essere più grande di 100 righe, incluso il contesto.</div><div class='add'>+ - Deve correggere una cosa sola.</div><div class='add'>+ - Deve correggere un baco vero che sta disturbando gli utenti (non cose del</div><div class='add'>+   tipo "Questo potrebbe essere un problema ...").</div><div class='add'>+ - Deve correggere un problema di compilazione (ma non per cose già segnate</div><div class='add'>+   con CONFIG_BROKEN), un kernel oops, un blocco, una corruzione di dati,</div><div class='add'>+   un vero problema di sicurezza, o problemi del tipo "oh, questo non va bene".</div><div class='add'>+   In pratica, qualcosa di critico.</div><div class='add'>+ - Problemi importanti riportati dagli utenti di una distribuzione potrebbero</div><div class='add'>+   essere considerati se correggono importanti problemi di prestazioni o di</div><div class='add'>+   interattività.  Dato che questi problemi non sono così ovvi e la loro</div><div class='add'>+   correzione ha un'alta probabilità d'introdurre una regressione, dovrebbero</div><div class='add'>+   essere sottomessi solo dal manutentore della distribuzione includendo un</div><div class='add'>+   link, se esiste, ad un rapporto su bugzilla, e informazioni aggiuntive</div><div class='add'>+   sull'impatto che ha sugli utenti.</div><div class='add'>+ - Non deve correggere problemi relativi a una "teorica sezione critica",</div><div class='add'>+   a meno che non venga fornita anche una spiegazione su come questa si</div><div class='add'>+   possa verificare.</div><div class='add'>+ - Non deve includere alcuna correzione "banale" (correzioni grammaticali,</div><div class='add'>+   pulizia dagli spazi bianchi, eccetera).</div><div class='add'>+ - Deve rispettare le regole scritte in</div><div class='add'>+   :ref:`Documentation/translation/it_IT/process/submitting-patches.rst &lt;it_submittingpatches&gt;`</div><div class='add'>+ - Questa patch o una equivalente deve esistere già nei sorgenti principali di</div><div class='add'>+   Linux</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Procedura per sottomettere patch per i sorgenti -stable</div><div class='add'>+-------------------------------------------------------</div><div class='add'>+</div><div class='add'>+ - Se la patch contiene modifiche a dei file nelle cartelle net/ o drivers/net,</div><div class='add'>+   allora seguite le linee guida descritte in</div><div class='add'>+   :ref:`Documentation/translation/it_IT/networking/netdev-FAQ.rst &lt;it_netdev-FAQ&gt;`;</div><div class='add'>+   ma solo dopo aver verificato al seguente indirizzo che la patch non sia</div><div class='add'>+   già in coda:</div><div class='add'>+   https://patchwork.ozlabs.org/bundle/davem/stable/?series=&amp;submitter=&amp;state=*&amp;q=&amp;archive=</div><div class='add'>+ - Una patch di sicurezza non dovrebbero essere gestite (solamente) dal processo</div><div class='add'>+   di revisione -stable, ma dovrebbe seguire le procedure descritte in</div><div class='add'>+   :ref:`Documentation/translations/it_IT/admin-guide/security-bugs.rst &lt;it_securitybugs&gt;`.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Per tutte le altre sottomissioni, scegliere una delle seguenti procedure</div><div class='add'>+------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. _it_option_1:</div><div class='add'>+</div><div class='add'>+Opzione 1</div><div class='add'>+*********</div><div class='add'>+</div><div class='add'>+Per far sì che una patch venga automaticamente inclusa nei sorgenti stabili,</div><div class='add'>+aggiungete l'etichetta</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     Cc: stable@vger.kernel.org</div><div class='add'>+</div><div class='add'>+nell'area dedicata alla firme. Una volta che la patch è stata inclusa, verrà</div><div class='add'>+applicata anche sui sorgenti stabili senza che l'autore o il manutentore</div><div class='add'>+del sottosistema debba fare qualcosa.</div><div class='add'>+</div><div class='add'>+.. _it_option_2:</div><div class='add'>+</div><div class='add'>+Opzione 2</div><div class='add'>+*********</div><div class='add'>+</div><div class='add'>+Dopo che la patch è stata inclusa nei sorgenti Linux, inviate una mail a</div><div class='add'>+stable@vger.kernel.org includendo: il titolo della patch, l'identificativo</div><div class='add'>+del commit, il perché pensate che debba essere applicata, e in quale versione</div><div class='add'>+del kernel la vorreste vedere.</div><div class='add'>+</div><div class='add'>+.. _it_option_3:</div><div class='add'>+</div><div class='add'>+Opzione 3</div><div class='add'>+*********</div><div class='add'>+</div><div class='add'>+Inviata la patch, dopo aver verificato che rispetta le regole descritte in</div><div class='add'>+precedenza, a stable@vger.kernel.org.  Dovete annotare nel changelog</div><div class='add'>+l'identificativo del commit nei sorgenti principali, così come la versione</div><div class='add'>+del kernel nel quale vorreste vedere la patch.</div><div class='add'>+</div><div class='add'>+L':ref:`it_option_1` è fortemente raccomandata; è il modo più facile e usato.</div><div class='add'>+L':ref:`it_option_2` e l':ref:`it_option_3` sono più utili quando, al momento</div><div class='add'>+dell'inclusione dei sorgenti principali, si ritiene che non debbano essere</div><div class='add'>+incluse anche in quelli stabili (per esempio, perché si crede che si dovrebbero</div><div class='add'>+fare più verifiche per eventuali regressioni). L':ref:`it_option_3` è</div><div class='add'>+particolarmente utile se la patch ha bisogno di qualche modifica per essere</div><div class='add'>+applicata ad un kernel più vecchio (per esempio, perché nel frattempo l'API è</div><div class='add'>+cambiata).</div><div class='add'>+</div><div class='add'>+Notate che per l':ref:`it_option_3`, se la patch è diversa da quella nei</div><div class='add'>+sorgenti principali (per esempio perché è stato necessario un lavoro di</div><div class='add'>+adattamento) allora dev'essere ben documentata e giustificata nella descrizione</div><div class='add'>+della patch.</div><div class='add'>+</div><div class='add'>+L'identificativo del commit nei sorgenti principali dev'essere indicato sopra</div><div class='add'>+al messaggio della patch, così:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+    commit &lt;sha1&gt; upstream.</div><div class='add'>+</div><div class='add'>+In aggiunta, alcune patch inviate attraverso l':ref:`it_option_1` potrebbero</div><div class='add'>+dipendere da altre che devo essere incluse. Questa situazione può essere</div><div class='add'>+indicata nel seguente modo nell'area dedicata alle firme:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: a1f84a3: sched: Check for idle</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: 1b9508f: sched: Rate-limit newidle</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: fd21073: sched: Fix affinity logic</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x</div><div class='add'>+     Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;</div><div class='add'>+</div><div class='add'>+La sequenza di etichette ha il seguente significato:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     git cherry-pick a1f84a3</div><div class='add'>+     git cherry-pick 1b9508f</div><div class='add'>+     git cherry-pick fd21073</div><div class='add'>+     git cherry-pick &lt;this commit&gt;</div><div class='add'>+</div><div class='add'>+Inoltre, alcune patch potrebbero avere dei requisiti circa la versione del</div><div class='add'>+kernel. Questo può essere indicato usando il seguente formato nell'area</div><div class='add'>+dedicata alle firme:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x</div><div class='add'>+</div><div class='add'>+L'etichetta ha il seguente significato:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     git cherry-pick &lt;this commit&gt;</div><div class='add'>+</div><div class='add'>+per ogni sorgente "-stable" che inizia con la versione indicata.</div><div class='add'>+</div><div class='add'>+Dopo la sottomissione:</div><div class='add'>+</div><div class='add'>+ - Il mittente riceverà un ACK quando la patch è stata accettata e messa in</div><div class='add'>+   coda, oppure un NAK se la patch è stata rigettata.  A seconda degli impegni</div><div class='add'>+   degli sviluppatori, questa risposta potrebbe richiedere alcuni giorni.</div><div class='add'>+ - Se accettata, la patch verrà aggiunta alla coda -stable per essere</div><div class='add'>+   revisionata dal altri sviluppatori e dal principale manutentore del</div><div class='add'>+   sottosistema.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Ciclo di una revisione</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+ - Quando i manutentori -stable decidono di fare un ciclo di revisione, le</div><div class='add'>+   patch vengono mandate al comitato per la revisione, ai manutentori soggetti</div><div class='add'>+   alle modifiche delle patch (a meno che il mittente non sia anche il</div><div class='add'>+   manutentore di quell'area del kernel) e in CC: alla lista di discussione</div><div class='add'>+   linux-kernel.</div><div class='add'>+ - La commissione per la revisione ha 48 ore per dare il proprio ACK o NACK</div><div class='add'>+   alle patch.</div><div class='add'>+ - Se una patch viene rigettata da un membro della commissione, o un membro</div><div class='add'>+   della lista linux-kernel obietta la bontà della patch, sollevando problemi</div><div class='add'>+   che i manutentori ed i membri non avevano compreso, allora la patch verrà</div><div class='add'>+   rimossa dalla coda.</div><div class='add'>+ - Alla fine del ciclo di revisione tutte le patch che hanno ricevuto l'ACK</div><div class='add'>+   verranno aggiunte per il prossimo rilascio -stable, e successivamente</div><div class='add'>+   questo nuovo rilascio verrà fatto.</div><div class='add'>+ - Le patch di sicurezza verranno accettate nei sorgenti -stable direttamente</div><div class='add'>+   dalla squadra per la sicurezza del kernel, e non passerà per il normale</div><div class='add'>+   ciclo di revisione. Contattate la suddetta squadra per maggiori dettagli</div><div class='add'>+   su questa procedura.</div><div class='add'>+</div><div class='add'>+Sorgenti</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+ - La coda delle patch, sia quelle già applicate che in fase di revisione,</div><div class='add'>+   possono essere trovate al seguente indirizzo:</div><div class='add'>+</div><div class='add'>+	https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git</div><div class='add'>+</div><div class='add'>+ - Il rilascio definitivo, e marchiato, di tutti i kernel stabili può essere</div><div class='add'>+   trovato in rami distinti per versione al seguente indirizzo:</div><div class='add'>+</div><div class='add'>+	https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Comitato per la revisione</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+ - Questo comitato è fatto di sviluppatori del kernel che si sono offerti</div><div class='add'>+   volontari per questo lavoro, e pochi altri che non sono proprio volontari.</div><div class='head'>diff --git a/Documentation/translations/it_IT/process/submitting-patches.rst b/Documentation/translations/it_IT/process/submitting-patches.rst<br/>index 2ab9c1401aa1..7d7ea92c5c5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/submitting-patches.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/it_IT/process/submitting-patches.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/it_IT/process/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/it_IT/process/submitting-patches.rst</a></div><div class='hunk'>@@ -67,8 +67,8 @@ sulla radice dei sorgenti del kernel, e non sulle sue sottocartelle.</div><div class='ctx'> </div><div class='ctx'> Per creare una patch per un singolo file, spesso è sufficiente fare::</div><div class='ctx'> </div><div class='del'>-	SRCTREE= linux</div><div class='del'>-	MYFILE=  drivers/net/mydriver.c</div><div class='add'>+	SRCTREE=linux</div><div class='add'>+	MYFILE=drivers/net/mydriver.c</div><div class='ctx'> </div><div class='ctx'> 	cd $SRCTREE</div><div class='ctx'> 	cp $MYFILE $MYFILE.orig</div><div class='hunk'>@@ -80,7 +80,7 @@ Per creare una patch per molteplici file, dovreste spacchettare i sorgenti</div><div class='ctx'> "vergini", o comunque non modificati, e fare un ``diff`` coi vostri.</div><div class='ctx'> Per esempio::</div><div class='ctx'> </div><div class='del'>-	MYSRC= /devel/linux</div><div class='add'>+	MYSRC=/devel/linux</div><div class='ctx'> </div><div class='ctx'> 	tar xvfz linux-3.19.tar.gz</div><div class='ctx'> 	mv linux-3.19 linux-3.19-vanilla</div><div class='hunk'>@@ -567,11 +567,42 @@ alcunché - ma dovrebbe indicare che la persona ha ricevuto una copia della</div><div class='ctx'> patch.  Questa etichetta documenta che terzi potenzialmente interessati sono</div><div class='ctx'> stati inclusi nella discussione.</div><div class='ctx'> </div><div class='del'>-L'etichetta Co-developed-by: indica che la patch è stata scritta dall'autore in</div><div class='del'>-collaborazione con un altro sviluppatore.  Qualche volta questo è utile quando</div><div class='del'>-più persone lavorano sulla stessa patch.  Notate, questa persona deve avere</div><div class='del'>-nella patch anche una riga Signed-off-by:.</div><div class='add'>+Co-developed-by: indica che la patch è stata cosviluppata da diversi</div><div class='add'>+sviluppatori; viene usato per assegnare più autori (in aggiunta a quello</div><div class='add'>+associato all'etichetta From:) quando più persone lavorano ad una patch.  Dato</div><div class='add'>+che Co-developed-by: implica la paternità della patch, ogni Co-developed-by:</div><div class='add'>+dev'essere seguito immediatamente dal Signed-off-by: del corrispondente</div><div class='add'>+coautore. Qui si applica la procedura di base per sign-off, in pratica</div><div class='add'>+l'ordine delle etichette Signed-off-by: dovrebbe riflettere il più possibile</div><div class='add'>+l'ordine cronologico della storia della patch, indipendentemente dal fatto che</div><div class='add'>+la paternità venga assegnata via From: o Co-developed-by:. Da notare che</div><div class='add'>+l'ultimo Signed-off-by: dev'essere quello di colui che ha sottomesso la patch.</div><div class='ctx'> </div><div class='add'>+Notate anche che l'etichetta From: è opzionale quando l'autore in From: è</div><div class='add'>+anche la persona (e indirizzo email) indicato nel From: dell'intestazione</div><div class='add'>+dell'email.</div><div class='add'>+</div><div class='add'>+Esempio di una patch sottomessa dall'autore in From:::</div><div class='add'>+</div><div class='add'>+	&lt;changelog&gt;</div><div class='add'>+</div><div class='add'>+	Co-developed-by: First Co-Author &lt;first@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: First Co-Author &lt;first@coauthor.example.org&gt;</div><div class='add'>+	Co-developed-by: Second Co-Author &lt;second@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Second Co-Author &lt;second@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: From Author &lt;from@author.example.org&gt;</div><div class='add'>+</div><div class='add'>+Esempio di una patch sottomessa dall'autore Co-developed-by:::</div><div class='add'>+</div><div class='add'>+	From: From Author &lt;from@author.example.org&gt;</div><div class='add'>+</div><div class='add'>+	&lt;changelog&gt;</div><div class='add'>+</div><div class='add'>+	Co-developed-by: Random Co-Author &lt;random@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Random Co-Author &lt;random@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: From Author &lt;from@author.example.org&gt;</div><div class='add'>+	Co-developed-by: Submitting Co-Author &lt;sub@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Submitting Co-Author &lt;sub@coauthor.example.org&gt;</div><div class='ctx'> </div><div class='ctx'> 13) Utilizzare Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: e Fixes:</div><div class='ctx'> -----------------------------------------------------------------------------</div><div class='hunk'>@@ -719,7 +750,7 @@ Un paio di esempi di oggetti::</div><div class='ctx'> La riga ``from`` dev'essere la prima nel corpo del messaggio ed è nel</div><div class='ctx'> formato:</div><div class='ctx'> </div><div class='del'>-        From: Original Author &lt;author@example.com&gt;</div><div class='add'>+        From: Patch Author &lt;author@example.com&gt;</div><div class='ctx'> </div><div class='ctx'> La riga ``from`` indica chi verrà accreditato nel changelog permanente come</div><div class='ctx'> l'autore della patch.  Se la riga ``from`` è mancante, allora per determinare</div><div class='head'>diff --git a/Documentation/translations/ja_JP/SubmitChecklist b/Documentation/translations/ja_JP/SubmitChecklist<br/>index 60c7c35ac517..b42220d3d46c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/ja_JP/SubmitChecklist?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/ja_JP/SubmitChecklist</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/ja_JP/SubmitChecklist?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/ja_JP/SubmitChecklist</a></div><div class='hunk'>@@ -74,38 +74,34 @@ Linux カーãƒ�ルパッãƒ�投稿者å�‘ã�‘ãƒ�ェックリスト</div><div class='ctx'> 13: CONFIG_SMP, CONFIG_PREEMPT を有効ã�«ã�—ã�Ÿå ´å�ˆã�¨ç„¡åŠ¹ã�«ã�—ã�Ÿå ´å�ˆã�®ä¸¡æ–¹ã�§</div><div class='ctx'>     ビルドã�—ã�Ÿä¸Šã€�動作確èª�ã‚’è¡Œã�£ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-14: ã‚‚ã�—パッãƒ�ã�Œãƒ‡ã‚£ã‚¹ã‚¯ã�®I/O性能ã�ªã�©ã�«å½±éŸ¿ã‚’与ã�ˆã‚‹ã‚ˆã�†ã�§ã�‚ã‚Œã�°ã€�</div><div class='del'>-    'CONFIG_LBDAF'オプションを有効ã�«ã�—ã�Ÿå ´å�ˆã�¨ç„¡åŠ¹ã�«ã�—ã�Ÿå ´å�ˆã�®ä¸¡æ–¹ã�§</div><div class='del'>-    テストを実施ã�—ã�¦ã�¿ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+14: lockdepã�®æ©Ÿèƒ½ã‚’å…¨ã�¦æœ‰åŠ¹ã�«ã�—ã�Ÿä¸Šã�§ã€�å…¨ã�¦ã�®ã‚³ãƒ¼ãƒ‰ãƒ‘スを評価ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-15: lockdepã�®æ©Ÿèƒ½ã‚’å…¨ã�¦æœ‰åŠ¹ã�«ã�—ã�Ÿä¸Šã�§ã€�å…¨ã�¦ã�®ã‚³ãƒ¼ãƒ‰ãƒ‘スを評価ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='del'>-</div><div class='del'>-16: /proc ã�«æ–°ã�—ã�„エントリを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�Documentation/ é…�下ã�«</div><div class='add'>+15: /proc ã�«æ–°ã�—ã�„エントリを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�Documentation/ é…�下ã�«</div><div class='ctx'>     å¿…ã�šãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’追加ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-17: æ–°ã�—ã�„ブートパラメータを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�</div><div class='add'>+16: æ–°ã�—ã�„ブートパラメータを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�</div><div class='ctx'>     å¿…ã�šDocumentation/admin-guide/kernel-parameters.rst ã�«èª¬æ˜Žã‚’追加ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-18: æ–°ã�—ã��moduleã�«ãƒ‘ラメータを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�MODULE_PARM_DESC()ã‚’</div><div class='add'>+17: æ–°ã�—ã��moduleã�«ãƒ‘ラメータを追加ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�MODULE_PARM_DESC()ã‚’</div><div class='ctx'>     利用ã�—ã�¦å¿…ã�šã��ã�®èª¬æ˜Žã‚’記述ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-19: æ–°ã�—ã�„userspaceインタフェースを作æˆ�ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�Documentation/ABI/ ã�«</div><div class='add'>+18: æ–°ã�—ã�„userspaceインタフェースを作æˆ�ã�—ã�Ÿå ´å�ˆã�«ã�¯ã€�Documentation/ABI/ ã�«</div><div class='ctx'>     Documentation/ABI/README ã‚’å�‚考ã�«ã�—ã�¦å¿…ã�šãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’追加ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-20: 'make headers_check'を実行ã�—ã�¦å…¨ã��å•�é¡Œã�Œã�ªã�„ã�“ã�¨ã‚’確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+19: 'make headers_check'を実行ã�—ã�¦å…¨ã��å•�é¡Œã�Œã�ªã�„ã�“ã�¨ã‚’確èª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='del'>-21: å°‘ã�ªã��ã�¨ã‚‚slabアロケーションã�¨pageアロケーションã�«å¤±æ•—ã�—ã�Ÿå ´å�ˆã�®</div><div class='add'>+20: å°‘ã�ªã��ã�¨ã‚‚slabアロケーションã�¨pageアロケーションã�«å¤±æ•—ã�—ã�Ÿå ´å�ˆã�®</div><div class='ctx'>     挙動ã�«ã�¤ã�„ã�¦ã€�fault-injectionを利用ã�—ã�¦ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'>     Documentation/fault-injection/ ã‚’å�‚ç…§ã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'> </div><div class='ctx'>     追加ã�—ã�Ÿã‚³ãƒ¼ãƒ‰ã�Œã�‹ã�ªã‚Šã�®é‡�ã�§ã�‚ã�£ã�Ÿã�ªã‚‰ã�°ã€�サブシステム特有ã�®</div><div class='ctx'>     fault-injectionを追加ã�—ã�Ÿã�»ã�†ã�Œè‰¯ã�„ã�‹ã‚‚ã�—ã‚Œã�¾ã�›ã‚“。</div><div class='ctx'> </div><div class='del'>-22: æ–°ã�Ÿã�«è¿½åŠ ã�—ã�Ÿã‚³ãƒ¼ãƒ‰ã�¯ã€�`gcc -W'ã�§ã‚³ãƒ³ãƒ‘イルã�—ã�¦ã��ã� ã�•ã�„。</div><div class='add'>+21: æ–°ã�Ÿã�«è¿½åŠ ã�—ã�Ÿã‚³ãƒ¼ãƒ‰ã�¯ã€�`gcc -W'ã�§ã‚³ãƒ³ãƒ‘イルã�—ã�¦ã��ã� ã�•ã�„。</div><div class='ctx'>     ã�“ã�®ã‚ªãƒ—ションã�¯å¤§é‡�ã�®ä¸�è¦�ã�ªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’出力ã�—ã�¾ã�™ã�Œã€�</div><div class='ctx'>     "warning: comparison between signed and unsigned" ã�®ã‚ˆã�†ã�ªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã�¯ã€�</div><div class='ctx'>     ãƒ�グを見ã�¤ã�‘ã‚‹ã�®ã�«å½¹ã�«ç«‹ã�¡ã�¾ã�™ã€‚</div><div class='ctx'> </div><div class='del'>-23: 投稿ã�—ã�Ÿãƒ‘ッãƒ�ã�Œ -mm パッãƒ�セットã�«ãƒžãƒ¼ã‚¸ã�•ã‚Œã�Ÿå¾Œã€�å…¨ã�¦ã�®æ—¢å­˜ã�®ãƒ‘ッãƒ�ã‚„</div><div class='add'>+22: 投稿ã�—ã�Ÿãƒ‘ッãƒ�ã�Œ -mm パッãƒ�セットã�«ãƒžãƒ¼ã‚¸ã�•ã‚Œã�Ÿå¾Œã€�å…¨ã�¦ã�®æ—¢å­˜ã�®ãƒ‘ッãƒ�ã‚„</div><div class='ctx'>     VM, VFS ã�Šã‚ˆã�³ã��ã�®ä»–ã�®ã‚µãƒ–システムã�«é–¢ã�™ã‚‹æ§˜ã€…ã�ªå¤‰æ›´ã�¨ã€�ç�¾æ™‚点ã�§ã‚‚共存</div><div class='ctx'>     ã�§ã��ã‚‹ã�“ã�¨ã‚’確èª�ã�™ã‚‹ãƒ†ã‚¹ãƒˆã‚’è¡Œã�£ã�¦ã��ã� ã�•ã�„。</div><div class='head'>diff --git a/Documentation/translations/ja_JP/SubmittingPatches b/Documentation/translations/ja_JP/SubmittingPatches<br/>index 02139656463e..ad979c3c06a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/ja_JP/SubmittingPatches?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/ja_JP/SubmittingPatches</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/ja_JP/SubmittingPatches?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/ja_JP/SubmittingPatches</a></div><div class='hunk'>@@ -58,8 +58,8 @@ Linux カーãƒ�ルã�«å¯¾ã�™ã‚‹å…¨ã�¦ã�®å¤‰æ›´ã�¯ diff(1) コマンドã�«ã‚ˆã‚‹ãƒ</div><div class='ctx'> 1個ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�«ã�¤ã�„ã�¦ã�®ãƒ‘ッãƒ�を作æˆ�ã�™ã‚‹ã�Ÿã‚�ã�«ã�¯ã€�ã�»ã�¨ã‚“ã�©ã�®å ´å�ˆã€�</div><div class='ctx'> 以下ã�®ä½œæ¥­ã‚’è¡Œã�ˆã�°å��分ã�§ã�™ã€‚</div><div class='ctx'> </div><div class='del'>-	SRCTREE= linux-2.6</div><div class='del'>-	MYFILE=  drivers/net/mydriver.c</div><div class='add'>+	SRCTREE=linux-2.6</div><div class='add'>+	MYFILE=drivers/net/mydriver.c</div><div class='ctx'> </div><div class='ctx'> 	cd $SRCTREE</div><div class='ctx'> 	cp $MYFILE $MYFILE.orig</div><div class='hunk'>@@ -71,7 +71,7 @@ Linux カーãƒ�ルã�«å¯¾ã�™ã‚‹å…¨ã�¦ã�®å¤‰æ›´ã�¯ diff(1) コマンドã�«ã‚ˆã‚‹ãƒ</div><div class='ctx'> ã�ªã‚�ã�¡å¤‰æ›´ã‚’加ã�ˆã�¦ã�ªã�„ Linux カーãƒ�ルを展開ã�—ã€�自分ã�® Linux カーãƒ�ル</div><div class='ctx'> ソースã�¨ã�®å·®åˆ†ã‚’生æˆ�ã�—ã�ªã�„ã�¨ã�„ã�‘ã�¾ã�›ã‚“。例ã�ˆã�°ã€�</div><div class='ctx'> </div><div class='del'>-	MYSRC= /devel/linux-2.6</div><div class='add'>+	MYSRC=/devel/linux-2.6</div><div class='ctx'> </div><div class='ctx'> 	tar xvfz linux-2.6.12.tar.gz</div><div class='ctx'> 	mv linux-2.6.12 linux-2.6.12-vanilla</div><div class='head'>diff --git a/Documentation/translations/ko_KR/memory-barriers.txt b/Documentation/translations/ko_KR/memory-barriers.txt<br/>index 7f01fb1c1084..db0b9d8619f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/ko_KR/memory-barriers.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/ko_KR/memory-barriers.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/ko_KR/memory-barriers.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/ko_KR/memory-barriers.txt</a></div><div class='hunk'>@@ -493,10 +493,8 @@ CPU ì—�게 기대할 수 있는 최소한ì�˜ 보장사항 몇가지가 있습니</div><div class='ctx'>      ì�´ 타입ì�˜ 오í�¼ë ˆì�´ì…˜ì�€ 단방향ì�˜ 투과성 배리어처럼 ë�™ìž‘합니다.  ACQUIRE</div><div class='ctx'>      오í�¼ë ˆì�´ì…˜ ë’¤ì�˜ 모든 메모리 오í�¼ë ˆì�´ì…˜ë“¤ì�´ ACQUIRE 오í�¼ë ˆì�´ì…˜ 후ì—�</div><div class='ctx'>      ì�¼ì–´ë‚œ 것으로 시스템ì�˜ 나머지 ì»´í�¬ë„ŒíŠ¸ë“¤ì—� ë³´ì�´ê²Œ ë�  것ì�´ 보장ë�©ë‹ˆë‹¤.</div><div class='del'>-     LOCK 오í�¼ë ˆì�´ì…˜ê³¼ smp_load_acquire(), smp_cond_acquire() 오í�¼ë ˆì�´ì…˜ë�„</div><div class='del'>-     ACQUIRE 오í�¼ë ˆì�´ì…˜ì—� í�¬í•¨ë�©ë‹ˆë‹¤.  smp_cond_acquire() 오í�¼ë ˆì�´ì…˜ì�€ 컨트롤</div><div class='del'>-     ì�˜ì¡´ì„±ê³¼ smp_rmb() 를 사용해서 ACQUIRE ì�˜ ì�˜ë¯¸ì � 요구사항(semantic)ì�„</div><div class='del'>-     충족시킵니다.</div><div class='add'>+     LOCK 오í�¼ë ˆì�´ì…˜ê³¼ smp_load_acquire(), smp_cond_load_acquire() 오í�¼ë ˆì�´ì…˜ë�„</div><div class='add'>+     ACQUIRE 오í�¼ë ˆì�´ì…˜ì—� í�¬í•¨ë�©ë‹ˆë‹¤.</div><div class='ctx'> </div><div class='ctx'>      ACQUIRE 오í�¼ë ˆì�´ì…˜ ì•žì�˜ 메모리 오í�¼ë ˆì�´ì…˜ë“¤ì�€ ACQUIRE 오í�¼ë ˆì�´ì…˜ 완료 후ì—�</div><div class='ctx'>      수행ë�œ 것처럼 ë³´ì�¼ 수 있습니다.</div><div class='hunk'>@@ -2146,33 +2144,40 @@ set_current_state() 는 다ì�Œì�˜ 것들로 ê°�싸질 수ë�„ 있습니다:</div><div class='ctx'> 	event_indicated = 1;</div><div class='ctx'> 	wake_up_process(event_daemon);</div><div class='ctx'> </div><div class='del'>-wake_up() 류ì—� ì�˜í•´ 쓰기 메모리 배리어가 ë‚´í�¬ë�©ë‹ˆë‹¤.  만약 그것들ì�´ 뭔가를</div><div class='del'>-깨운다면요.  ì�´ 배리어는 태스í�¬ ìƒ�태가 지워지기 ì „ì—� 수행ë�˜ë¯€ë¡œ, ì�´ë²¤íŠ¸ë¥¼</div><div class='del'>-알리기 위한 STORE 와 태스í�¬ ìƒ�태를 TASK_RUNNING 으로 설정하는 STORE 사ì�´ì—�</div><div class='del'>-위치하게 ë�©ë‹ˆë‹¤.</div><div class='add'>+wake_up() ì�´ 무언가를 깨우게 ë�˜ë©´, ì�´ 함수는 범용 메모리 배리어를 수행합니다.</div><div class='add'>+ì�´ 함수가 아무것ë�„ 깨우지 않는다면 메모리 배리어는 수행ë�  수ë�„, 수행ë�˜ì§€ ì•Šì�„</div><div class='add'>+수ë�„ 있습니다; ì�´ 경우ì—� 메모리 배리어를 수행할 ê±°ë�¼ 오해해선 안ë�©ë‹ˆë‹¤.  ì�´</div><div class='add'>+배리어는 태스í�¬ ìƒ�태가 ì ‘ê·¼ë�˜ê¸° ì „ì—� 수행ë�˜ëŠ”ë�°, ìž�세히 ë§�하면 ì�´ ì�´ë²¤íŠ¸ë¥¼</div><div class='add'>+알리기 위한 STORE 와 TASK_RUNNING 으로 ìƒ�태를 쓰는 STORE 사ì�´ì—� 수행ë�©ë‹ˆë‹¤:</div><div class='ctx'> </div><div class='del'>-	CPU 1				CPU 2</div><div class='add'>+	CPU 1 (Sleeper)			CPU 2 (Waker)</div><div class='ctx'> 	===============================	===============================</div><div class='ctx'> 	set_current_state();		STORE event_indicated</div><div class='ctx'> 	  smp_store_mb();		wake_up();</div><div class='del'>-	    STORE current-&gt;state	  &lt;쓰기 배리어&gt;</div><div class='del'>-	    &lt;범용 배리어&gt;		  STORE current-&gt;state</div><div class='del'>-	LOAD event_indicated</div><div class='add'>+	    STORE current-&gt;state	  ...</div><div class='add'>+	    &lt;범용 배리어&gt;		  &lt;범용 배리어&gt;</div><div class='add'>+	LOAD event_indicated		  if ((LOAD task-&gt;state) &amp; TASK_NORMAL)</div><div class='add'>+					    STORE task-&gt;state</div><div class='ctx'> </div><div class='del'>-한번ë�” ë§�합니다만, ì�´ 쓰기 메모리 배리어는 ì�´ 코드가 ì •ë§�ë¡œ 뭔가를 깨울 ë•Œì—�만</div><div class='del'>-실행ë�©ë‹ˆë‹¤.  ì�´ê±¸ 설명하기 위해, X 와 Y 는 모ë‘� 0 으로 초기화 ë�˜ì–´ 있다는 가정</div><div class='del'>-하ì—� 아래ì�˜ ì�´ë²¤íŠ¸ 시퀀스를 ìƒ�ê°�í•´ 봅시다:</div><div class='add'>+여기서 "task" 는 깨어나지는 쓰레드ì�´ê³  CPU 1 ì�˜ "current" 와 같습니다.</div><div class='add'>+</div><div class='add'>+반복하지만, wake_up() ì�´ 무언가를 ì •ë§� 깨운다면 범용 메모리 배리어가 수행ë� </div><div class='add'>+것ì�´ 보장ë�˜ì§€ë§Œ, 그렇지 않다면 그런 보장ì�´ 없습니다.  ì�´ê±¸ ì�´í•´í•˜ê¸° 위해, X 와</div><div class='add'>+Y 는 모ë‘� 0 으로 초기화 ë�˜ì–´ 있다는 가정 하ì—� 아래ì�˜ ì�´ë²¤íŠ¸ 시퀀스를 ìƒ�ê°�í•´</div><div class='add'>+봅시다:</div><div class='ctx'> </div><div class='ctx'> 	CPU 1				CPU 2</div><div class='ctx'> 	===============================	===============================</div><div class='del'>-	X = 1;				STORE event_indicated</div><div class='add'>+	X = 1;				Y = 1;</div><div class='ctx'> 	smp_mb();			wake_up();</div><div class='del'>-	Y = 1;				wait_event(wq, Y == 1);</div><div class='del'>-	wake_up();			  load from Y sees 1, no memory barrier</div><div class='del'>-					load from X might see 0</div><div class='add'>+	LOAD Y				LOAD X</div><div class='add'>+</div><div class='add'>+ì •ë§�ë¡œ 깨우기가 행해졌다면, ë‘� 로드 중 (최소한) 하나는 1 ì�„ 보게 ë�©ë‹ˆë‹¤.</div><div class='add'>+반면ì—�, 실제 깨우기가 행해지지 않았다면, ë‘� 로드 모ë‘� 0ì�„ ë³¼ 수ë�„ 있습니다.</div><div class='ctx'> </div><div class='del'>-위 예제ì—�ì„œì�˜ 경우와 달리 깨우기가 ì •ë§�ë¡œ 행해졌다면, CPU 2 ì�˜ X 로드는 1 ì�„</div><div class='del'>-본다고 보장ë�  수 있ì�„ ê²�니다.</div><div class='add'>+wake_up_process() 는 í•­ìƒ� 범용 메모리 배리어를 수행합니다.  ì�´ 배리어 ì—­ì‹œ</div><div class='add'>+태스í�¬ ìƒ�태가 ì ‘ê·¼ë�˜ê¸° ì „ì—� 수행ë�©ë‹ˆë‹¤.  특히, ì•žì�˜ 예제 코드ì—�ì„œ wake_up() ì�´</div><div class='add'>+wake_up_process() ë¡œ 대체ë�œë‹¤ë©´ ë‘� 로드 중 하나는 1ì�„ ë³¼ 것ì�´ 보장ë�©ë‹ˆë‹¤.</div><div class='ctx'> </div><div class='ctx'> 사용 가능한 깨우기류 함수들로 다ì�Œê³¼ ê°™ì�€ 것들ì�´ 있습니다:</div><div class='ctx'> </div><div class='hunk'>@@ -2192,6 +2197,8 @@ wake_up() 류ì—� ì�˜í•´ 쓰기 메모리 배리어가 ë‚´í�¬ë�©ë‹ˆë‹¤.  만약 ê</div><div class='ctx'> 	wake_up_poll();</div><div class='ctx'> 	wake_up_process();</div><div class='ctx'> </div><div class='add'>+메모리 순서규칙 ê´€ì �ì—�ì„œ, ì�´ 함수들ì�€ 모ë‘� wake_up() ê³¼ 같거나 보다 ê°•í•œ 순서</div><div class='add'>+보장ì�„ 제공합니다.</div><div class='ctx'> </div><div class='ctx'> [!] 잠재우는 코드와 깨우는 코드ì—� ë‚´í�¬ë�˜ëŠ” 메모리 배리어들ì�€ 깨우기 ì „ì—�</div><div class='ctx'> ì�´ë£¨ì–´ì§„ 스토어를 잠재우는 코드가 set_current_state() 를 호출한 후ì—� 행하는</div><div class='head'>diff --git a/Documentation/translations/zh_CN/SubmittingPatches b/Documentation/translations/zh_CN/SubmittingPatches<br/>deleted file mode 100644<br/>index e9098da8f1a4..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/SubmittingPatches?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/SubmittingPatches</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,412 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/process/submitting-patches.rst</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/submitting-patches.rst 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='del'>-交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： 钟宇 TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： 钟宇 TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版校译者： æ�Žé˜³ Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-               王è�ª Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</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'>-  获得亲爱的 Linus Torvalds 的关注和处ç�†</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-对于想è¦�将改动æ��交到 Linux 内核的个人或者公å�¸æ�¥è¯´ï¼Œå¦‚æžœä¸�熟悉“规矩â€�，</div><div class='del'>-æ��交的æµ�程会让人ç•�惧。本文档收集了一系列建议，这些建议å�¯ä»¥å¤§å¤§çš„æ��高你</div><div class='del'>-的改动被接å�—的机会。</div><div class='del'>-阅读 Documentation/process/submit-checklist.rst æ�¥èŽ·å¾—在æ��交代ç �å‰�需è¦�检查的项目的列</div><div class='del'>-表。如果你在æ��交一个驱动程åº�，那么å�Œæ—¶é˜…读一下</div><div class='del'>-Documentation/process/submitting-drivers.rst 。</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'>-1) "diff -up"</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-使用 "diff -up" 或者 "diff -uprN" æ�¥åˆ›å»ºè¡¥ä¸�。</div><div class='del'>-</div><div class='del'>-所有内核的改动，都是以补ä¸�çš„å½¢å¼�呈现的，补ä¸�ç”± diff(1) 生æˆ�。创建补ä¸�çš„</div><div class='del'>-时候，è¦�确认它是以 "unified diff" æ ¼å¼�创建的，这ç§�æ ¼å¼�ç”± diff(1) çš„ '-u'</div><div class='del'>-å�‚数生æˆ�。而且，请使用 '-p' å�‚数，那样会显示æ¯�个改动所在的C函数，使得</div><div class='del'>-产生的补ä¸�容易读得多。补ä¸�应该基于内核æº�代ç �树的根目录，而ä¸�是里边的任</div><div class='del'>-何å­�目录。</div><div class='del'>-为一个å�•ç‹¬çš„文件创建补ä¸�，一般æ�¥è¯´è¿™æ ·å�šå°±å¤Ÿäº†ï¼š</div><div class='del'>-</div><div class='del'>-        SRCTREE= linux-2.6</div><div class='del'>-        MYFILE=  drivers/net/mydriver.c</div><div class='del'>-</div><div class='del'>-        cd $SRCTREE</div><div class='del'>-        cp $MYFILE $MYFILE.orig</div><div class='del'>-        vi $MYFILE      # make your change</div><div class='del'>-        cd ..</div><div class='del'>-        diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-为多个文件创建补ä¸�，你å�¯ä»¥è§£å¼€ä¸€ä¸ªæ²¡æœ‰ä¿®æ”¹è¿‡çš„内核æº�代ç �树，然å�Žå’Œä½ è‡ª</div><div class='del'>-己的代ç �树之间å�š diff 。例如：</div><div class='del'>-</div><div class='del'>-        MYSRC= /devel/linux-2.6</div><div class='del'>-</div><div class='del'>-        tar xvfz linux-2.6.12.tar.gz</div><div class='del'>-        mv linux-2.6.12 linux-2.6.12-vanilla</div><div class='del'>-        diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \</div><div class='del'>-                linux-2.6.12-vanilla $MYSRC &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-"dontdiff" 是内核在编译的时候产生的文件的列表，列表中的文件在 diff(1)</div><div class='del'>-产生的补ä¸�里会被跳过。"dontdiff" 文件被包å�«åœ¨2.6.12和之å�Žç‰ˆæœ¬çš„内核æº�代</div><div class='del'>-ç �树中。对于更早的内核版本，你å�¯ä»¥ä»Ž</div><div class='del'>-&lt;http://www.xenotime.net/linux/doc/dontdiff&gt; 获å�–它。</div><div class='del'>-确定你的补ä¸�里没有包å�«ä»»ä½•ä¸�属于这次补ä¸�æ��交的é¢�外文件。记得在用diff(1)</div><div class='del'>-生æˆ�è¡¥ä¸�之å�Žï¼Œå®¡é˜…一次补ä¸�，以确ä¿�准确。</div><div class='del'>-如果你的改动很散乱，你应该研究一下如何将补ä¸�分割æˆ�独立的部分，将改动分</div><div class='del'>-割æˆ�一系列å�ˆä¹Žé€»è¾‘的步骤。这样更容易让其他内核开å�‘者审核，如果你想你的</div><div class='del'>-è¡¥ä¸�被接å�—，这是很é‡�è¦�的。下é�¢è¿™äº›è„šæœ¬èƒ½å¤Ÿå¸®åŠ©ä½ å�šè¿™ä»¶äº‹æƒ…：</div><div class='del'>-Quilt:</div><div class='del'>-http://savannah.nongnu.org/projects/quilt</div><div class='del'>-</div><div class='del'>-2)æ��述你的改动。</div><div class='del'>-æ��述你的改动包å�«çš„技术细节。</div><div class='del'>-</div><div class='del'>-è¦�多具体就写多具体。最糟糕的æ��è¿°å�¯èƒ½æ˜¯åƒ�下é�¢è¿™äº›è¯­å�¥ï¼šâ€œæ›´æ–°äº†æŸ�驱动程</div><div class='del'>-åº�â€�，“修正了æŸ�驱动程åº�çš„bugâ€�，或者“这个补ä¸�包å�«äº†æŸ�å­�系统的修改，请</div><div class='del'>-使用。â€�</div><div class='del'>-</div><div class='del'>-如果你的æ��述开始å�˜é•¿ï¼Œè¿™è¡¨ç¤ºä½ ä¹Ÿè®¸éœ€è¦�拆分你的补ä¸�了，请看第3å°�节，</div><div class='del'>-继续。</div><div class='del'>-</div><div class='del'>-3)拆分你的改动</div><div class='del'>-</div><div class='del'>-将改动拆分，逻辑类似的放到å�Œä¸€ä¸ªè¡¥ä¸�文件里。</div><div class='del'>-</div><div class='del'>-例如，如果你的改动里å�Œæ—¶æœ‰bug修正和性能优化，那么把这些改动拆分到两个或</div><div class='del'>-者更多的补ä¸�文件中。如果你的改动包å�«å¯¹API的修改，并且修改了驱动程åº�æ�¥é€‚</div><div class='del'>-应这些新的API，那么把这些修改分æˆ�两个补ä¸�。</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'>-</div><div class='del'>-如果你ä¸�能将补ä¸�浓缩æˆ�更少的文件，那么æ¯�次大约å�‘é€�出15个，然å�Žç­‰å¾…审查</div><div class='del'>-和整å�ˆã€‚</div><div class='del'>-</div><div class='del'>-4)选择 e-mail 的收件人</div><div class='del'>-</div><div class='del'>-看一é�� MAINTAINERS 文件和æº�代ç �，看看你所的改动所在的内核å­�系统有没有指</div><div class='del'>-定的维护者。如果有，给他们å�‘e-mail。</div><div class='del'>-</div><div class='del'>-如果没有找到维护者，或者维护者没有å��馈，将你的补ä¸�å�‘é€�到内核开å�‘者主邮</div><div class='del'>-件列表 linux-kernel@vger.kernel.org。大部分的内核开å�‘者都跟踪这个邮件列</div><div class='del'>-表，å�¯ä»¥è¯„价你的改动。</div><div class='del'>-</div><div class='del'>-æ¯�次ä¸�è¦�å�‘é€�超过15个补ä¸�到 vger 邮件列表ï¼�ï¼�ï¼�</div><div class='del'>-</div><div class='del'>-Linus Torvalds 是决定改动能å�¦è¿›å…¥ Linux 内核的最终è£�决者。他的 e-mail</div><div class='del'>-地å�€æ˜¯ &lt;torvalds@linux-foundation.org&gt; 。他收到的 e-mail 很多，所以一般</div><div class='del'>-的说，最好别给他å�‘ e-mail。</div><div class='del'>-</div><div class='del'>-那些修正bug，“显而易è§�â€�的修改或者是类似的å�ªéœ€è¦�很少讨论的补ä¸�å�¯ä»¥ç›´æŽ¥</div><div class='del'>-å�‘é€�或者CCç»™Linus。那些需è¦�讨论或者没有很清楚的好处的补ä¸�，一般先å�‘é€�到</div><div class='del'>-linux-kernel邮件列表。å�ªæœ‰å½“è¡¥ä¸�被讨论得差ä¸�多了，æ‰�æ��交给Linus。</div><div class='del'>-</div><div class='del'>-5)选择CC( e-mail 抄é€�)列表</div><div class='del'>-</div><div class='del'>-除é�žä½ æœ‰ç�†ç”±ä¸�这样å�šï¼Œå�¦åˆ™CC linux-kernel@vger.kernel.org。</div><div class='del'>-</div><div class='del'>-除了 Linus 之外，其他内核开å�‘者也需è¦�注æ„�到你的改动，这样他们æ‰�能评论你</div><div class='del'>-的改动并æ��供代ç �审查和建议。linux-kernel 是 Linux 内核开å�‘者主邮件列表</div><div class='del'>-。其它的邮件列表为特定的å­�系统æ��ä¾›æœ�务，比如 USB，framebuffer 设备，虚</div><div class='del'>-拟文件系统，SCSI å­�系统，等等。查看 MAINTAINERS 文件æ�¥èŽ·å¾—和你的改动有</div><div class='del'>-关的邮件列表。</div><div class='del'>-</div><div class='del'>-Majordomo lists of VGER.KERNEL.ORG at:</div><div class='del'>-        &lt;http://vger.kernel.org/vger-lists.html&gt;</div><div class='del'>-</div><div class='del'>-如果改动影å“�了用户空间和内核之间的接å�£ï¼Œè¯·ç»™ MAN-PAGES 的维护者（列在</div><div class='del'>-MAINTAINERS 文件里的）å�‘é€�一个手册页（man-pages）补ä¸�，或者至少通知一下改</div><div class='del'>-å�˜ï¼Œè®©ä¸€äº›ä¿¡æ�¯æœ‰é€”径进入手册页。</div><div class='del'>-</div><div class='del'>-å�³ä½¿åœ¨ç¬¬å››æ­¥çš„时候，维护者没有作出回应，也è¦�确认在修改他们的代ç �的时候</div><div class='del'>-，一直将维护者拷è´�到CC列表中。</div><div class='del'>-</div><div class='del'>-对于å°�çš„è¡¥ä¸�，你也许会CC到 Adrian Bunk 管ç�†çš„æ�œé›†ç��碎补ä¸�的邮件列表</div><div class='del'>-(Trivial Patch Monkey)trivial@kernel.org，那里专门收集ç��碎的补ä¸�。下é�¢è¿™æ ·</div><div class='del'>-çš„è¡¥ä¸�会被看作“ç��碎的â€�è¡¥ä¸�：</div><div class='del'>-  文档的拼写修正。</div><div class='del'>-  修正会影å“�到 grep(1) 的拼写。</div><div class='del'>-  警告信æ�¯ä¿®æ­£(频ç¹�的打å�°æ— ç”¨çš„警告是ä¸�好的。)</div><div class='del'>-  编译错误修正（代ç �逻辑的确是对的，å�ªæ˜¯ç¼–译有问题。）</div><div class='del'>-  è¿�行时修正（å�ªè¦�真的修正了错误。）</div><div class='del'>-  移除使用了被废弃的函数/å®�的代ç �(例如 check_region。)</div><div class='del'>-  è�”系方å¼�和文档修正。</div><div class='del'>-  用å�¯ç§»æ¤�的代ç �替æ�¢ä¸�å�¯ç§»æ¤�的代ç �（å�³ä½¿åœ¨ä½“系结构相关的代ç �中，既然有</div><div class='del'>-  人拷è´�，å�ªè¦�它是ç��碎的）</div><div class='del'>-  任何文件的作者/维护者对该文件的改动（例如 patch monkey 在é‡�传模å¼�下）</div><div class='del'>-</div><div class='del'>-EMAIL: trivial@kernel.org</div><div class='del'>-</div><div class='del'>-(译注，关于“ç��碎补ä¸�â€�的一些说明：因为原文的这一部分写得比较简å�•ï¼Œæ‰€ä»¥ä¸�å¾—ä¸�</div><div class='del'>-è¿�例写一下译注。"trivial"这个英文å�•è¯�的本æ„�是“ç��碎的，ä¸�é‡�è¦�的。â€�但是在这里</div><div class='del'>-有ç¨�微有一些å�˜åŒ–，例如对一些明显的NULL指针的修正，属于è¿�行时修正，会被归类</div><div class='del'>-到ç��碎补ä¸�里。虽然NULL指针的修正很é‡�è¦�，但是这样的修正往往很å°�而且很容易得到</div><div class='del'>-检验，所以也被归入ç��碎补ä¸�。ç��碎补ä¸�更精确的归类应该是</div><div class='del'>-“simple, localized &amp; easy to verifyâ€�，也就是说简å�•çš„，局部的和易于检验的。</div><div class='del'>-trivial@kernel.org邮件列表的目的是针对这样的补ä¸�，为æ��交者æ��供一个中心，æ�¥</div><div class='del'>-é™�低æ��交的门槛。)</div><div class='del'>-</div><div class='del'>-6)没有 MIME ç¼–ç �，没有链接，没有压缩，没有附件，å�ªæœ‰çº¯æ–‡æœ¬ã€‚</div><div class='del'>-</div><div class='del'>-Linus 和其他的内核开å�‘者需è¦�阅读和评论你æ��交的改动。对于内核开å�‘者æ�¥è¯´</div><div class='del'>-，å�¯ä»¥â€œå¼•ç”¨â€�你的改动很é‡�è¦�，使用一般的 e-mail 工具，他们就å�¯ä»¥åœ¨ä½ çš„</div><div class='del'>-代ç �的任何ä½�置添加评论。</div><div class='del'>-</div><div class='del'>-因为这个原因，所有的æ��交的补ä¸�都是 e-mail 中“内嵌â€�的。</div><div class='del'>-警告：如果你使用剪切-粘贴你的补ä¸�，å°�心你的编辑器的自动æ�¢è¡ŒåŠŸèƒ½ç ´å��ä½ çš„</div><div class='del'>-è¡¥ä¸�。</div><div class='del'>-</div><div class='del'>-ä¸�è¦�将补ä¸�作为 MIME ç¼–ç �的附件，ä¸�管是å�¦åŽ‹ç¼©ã€‚很多æµ�行的 e-mail 软件ä¸�</div><div class='del'>-是任何时候都将 MIME ç¼–ç �的附件当作纯文本å�‘é€�的，这会使得别人无法在你的</div><div class='del'>-代ç �中加评论。å�¦å¤–，MIME ç¼–ç �的附件会让 Linus 多花一点时间æ�¥å¤„ç�†ï¼Œè¿™å°±</div><div class='del'>-é™�低了你的改动被接å�—çš„å�¯èƒ½æ€§ã€‚</div><div class='del'>-</div><div class='del'>-警告：一些邮件软件，比如 Mozilla 会将你的信æ�¯ä»¥å¦‚下格å¼�å�‘é€�：</div><div class='del'>----- 邮件头 ----</div><div class='del'>-Content-Type: text/plain; charset=us-ascii; format=flowed</div><div class='del'>----- 邮件头 ----</div><div class='del'>-问题在于 “format=flowedâ€� 会让接收端的æŸ�些邮件软件将邮件中的制表符替æ�¢</div><div class='del'>-æˆ�空格以å�Šå�šä¸€äº›ç±»ä¼¼çš„替æ�¢ã€‚这样，你å�‘é€�的时候看起æ�¥æ²¡é—®é¢˜çš„è¡¥ä¸�就被破</div><div class='del'>-å��了。</div><div class='del'>-</div><div class='del'>-è¦�修正这个问题，å�ªéœ€è¦�将你的 mozilla çš„ defaults/pref/mailnews.js 文件</div><div class='del'>-里的</div><div class='del'>-pref("mailnews.send_plaintext_flowed", false); // RFC 2646=======</div><div class='del'>-修改æˆ�</div><div class='del'>-pref("mailnews.display.disable_format_flowed_support", true);</div><div class='del'>-å°±å�¯ä»¥äº†ã€‚</div><div class='del'>-</div><div class='del'>-7) e-mail 的大å°�</div><div class='del'>-</div><div class='del'>-ç»™ Linus å�‘é€�è¡¥ä¸�的时候，永远按照第6å°�节说的å�šã€‚</div><div class='del'>-</div><div class='del'>-大的改动对邮件列表ä¸�å�ˆé€‚，对æŸ�些维护者也ä¸�å�ˆé€‚。如果你的补ä¸�，在ä¸�压缩</div><div class='del'>-的情况下，超过了40kB，那么你最好将补ä¸�放在一个能通过 internet 访问的æœ�</div><div class='del'>-务器上，然å�Žç”¨æŒ‡å�‘ä½ çš„è¡¥ä¸�çš„ URL 替代。</div><div class='del'>-</div><div class='del'>-8) 指出你的内核版本</div><div class='del'>-</div><div class='del'>-在标题和在补ä¸�çš„æ��述中，指出补ä¸�对应的内核的版本，是很é‡�è¦�的。</div><div class='del'>-</div><div class='del'>-如果补ä¸�ä¸�能干净的在最新版本的内核上打上，Linus 是ä¸�会接å�—它的。</div><div class='del'>-</div><div class='del'>-9) ä¸�è¦�æ°”é¦�，继续æ��交。</div><div class='del'>-</div><div class='del'>-当你æ��交了改动以å�Žï¼Œè€�心地等待。如果 Linus 喜欢你的改动并且å�Œæ„�它，那么</div><div class='del'>-它将在下一个内核å�‘布版本中出现。</div><div class='del'>-</div><div class='del'>-然而，如果你的改动没有出现在下一个版本的内核中，å�¯èƒ½æœ‰è‹¥å¹²åŽŸå› ã€‚å‡�å°‘é‚£</div><div class='del'>-些原因，修正错误，é‡�æ–°æ��交更新å�Žçš„改动，是你自己的工作。</div><div class='del'>-</div><div class='del'>-Linusä¸�给出任何评论就“丢弃â€�ä½ çš„è¡¥ä¸�是常è§�的事情。在系统中这样的事情很</div><div class='del'>-平常。如果他没有接å�—ä½ çš„è¡¥ä¸�，也许是由于以下原因：</div><div class='del'>-* ä½ çš„è¡¥ä¸�ä¸�能在最新版本的内核上干净的打上。</div><div class='del'>-* ä½ çš„è¡¥ä¸�在 linux-kernel 邮件列表中没有得到充分的讨论。</div><div class='del'>-* 风格问题（å�‚照第2å°�节）</div><div class='del'>-* 邮件格å¼�问题（é‡�读本节）</div><div class='del'>-* 你的改动有技术问题。</div><div class='del'>-* 他收到了æˆ�å�¨çš„ e-mail，而你的在混乱中丢失了。</div><div class='del'>-* 你让人为难。</div><div class='del'>-</div><div class='del'>-有疑问的时候，在 linux-kernel 邮件列表上请求评论。</div><div class='del'>-</div><div class='del'>-10) 在标题上加上 PATCH çš„å­—æ ·</div><div class='del'>-</div><div class='del'>-Linus å’Œ linux-kernel 邮件列表的 e-mail æµ�é‡�都很高，一个通常的约定是标</div><div class='del'>-题行以 [PATCH] 开头。这样å�¯ä»¥è®© Linus 和其他内核开å�‘人员å�¯ä»¥ä»Ž e-mail</div><div class='del'>-的讨论中很轻易的将补ä¸�分辨出æ�¥ã€‚</div><div class='del'>-</div><div class='del'>-11）为你的工作签å��</div><div class='del'>-</div><div class='del'>-为了加强对è°�å�šäº†ä½•äº‹çš„追踪，尤其是对那些é€�过好几层的维护者的补ä¸�，我们</div><div class='del'>-建议在å�‘é€�出去的补ä¸�上加一个 “sign-offâ€� 的过程。</div><div class='del'>-</div><div class='del'>-"sign-off" 是在补ä¸�的注释的最å�Žçš„简å�•çš„一行文字，认è¯�你编写了它或者其他</div><div class='del'>-人有æ�ƒåŠ›å°†å®ƒä½œä¸ºå¼€æ”¾æº�代ç �çš„è¡¥ä¸�传递。规则很简å�•ï¼šå¦‚果你能认è¯�如下信æ�¯</div><div class='del'>-：</div><div class='del'>-      å¼€å�‘者æ�¥æº�è¯�书 1.1</div><div class='del'>-      对于本项目的贡献，我认è¯�如下信æ�¯ï¼š</div><div class='del'>-      （a）这些贡献是完全或者部分的由我创建，我有æ�ƒåˆ©ä»¥æ–‡ä»¶ä¸­æŒ‡å‡º</div><div class='del'>-       的开放æº�代ç �许å�¯è¯�æ��交它；或者</div><div class='del'>-      （b）这些贡献基于以å‰�的工作，æ�®æˆ‘所知，这些以å‰�的工作å�—æ�°å½“的开放</div><div class='del'>-       æº�代ç �许å�¯è¯�ä¿�护，而且，根æ�®è®¸å�¯è¯�，我有æ�ƒæ��交修改å�Žçš„贡献，</div><div class='del'>-       无论是完全还是部分由我创造，这些贡献都使用å�Œä¸€ä¸ªå¼€æ”¾æº�代ç �许å�¯è¯�</div><div class='del'>-       （除é�žæˆ‘被å…�许用其它的许å�¯è¯�），正如文件中指出的；或者</div><div class='del'>-      （c）这些贡献由认è¯�（a），（b）或者（c）的人直接æ��供给我，而</div><div class='del'>-       且我没有修改它。</div><div class='del'>-      （d）我ç�†è§£å¹¶å�Œæ„�这个项目和贡献是公开的，贡献的记录（包括我</div><div class='del'>-       一起æ��交的个人记录，包括 sign-off ）被永久维护并且å�¯ä»¥å’Œè¿™ä¸ªé¡¹ç›®</div><div class='del'>-       或者开放æº�代ç �的许å�¯è¯�å�Œæ­¥åœ°å†�å�‘行。</div><div class='del'>-       那么加入这样一行：</div><div class='del'>-       Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='del'>-</div><div class='del'>-使用你的真å��（抱歉，ä¸�能使用å�‡å��或者匿å��。）</div><div class='del'>-</div><div class='del'>-有人在最å�ŽåŠ ä¸Šæ ‡ç­¾ã€‚现在这些东西会被忽略，但是你å�¯ä»¥è¿™æ ·å�šï¼Œæ�¥æ ‡è®°å…¬å�¸</div><div class='del'>-内部的过程，或者å�ªæ˜¯æŒ‡å‡ºå…³äºŽ sign-off 的一些特殊细节。</div><div class='del'>-</div><div class='del'>-12）标准补ä¸�æ ¼å¼�</div><div class='del'>-</div><div class='del'>-标准的补ä¸�，标题行是：</div><div class='del'>-    Subject: [PATCH 001/123] å­�系统:一å�¥è¯�概述</div><div class='del'>-</div><div class='del'>-标准补ä¸�的信体存在如下部分：</div><div class='del'>-</div><div class='del'>-  - 一个 "from" 行指出补ä¸�作者。</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'>-</div><div class='del'>-  - ä¸�å�ˆé€‚放到改动记录里的é¢�外的注解。</div><div class='del'>-</div><div class='del'>-  - è¡¥ä¸�本身（diff 输出）</div><div class='del'>-</div><div class='del'>-标题行的格å¼�，使得对标题行按字æ¯�åº�排åº�é�žå¸¸çš„容易 - 很多 e-mail 客户端都</div><div class='del'>-å�¯ä»¥æ”¯æŒ� - 因为åº�列å�·æ˜¯ç”¨é›¶å¡«å……的，所以按数字排åº�和按字æ¯�排åº�是一样的。</div><div class='del'>-</div><div class='del'>-e-mail 标题中的“å­�系统â€�标识哪个内核å­�系统将被打补ä¸�。</div><div class='del'>-</div><div class='del'>-e-mail 标题中的“一å�¥è¯�概述â€�扼è¦�çš„æ��è¿° e-mail 中的补ä¸�。“一å�¥è¯�概述â€�</div><div class='del'>-ä¸�应该是一个文件å��。对于一个补ä¸�系列（“补ä¸�系列â€�指一系列的多个相关补</div><div class='del'>-ä¸�），ä¸�è¦�对æ¯�个补ä¸�都使用å�Œæ ·çš„“一å�¥è¯�概述â€�。</div><div class='del'>-</div><div class='del'>-è®°ä½� e-mail 的“一å�¥è¯�概述â€�会æˆ�为该补ä¸�的全局唯一标识。它会蔓延到 git</div><div class='del'>-的改动记录里。然å�Žâ€œä¸€å�¥è¯�概述â€�会被用在开å�‘者的讨论里，用æ�¥æŒ‡ä»£è¿™ä¸ªè¡¥</div><div class='del'>-ä¸�。用户将希望通过 google æ�¥æ�œç´¢"一å�¥è¯�概述"æ�¥æ‰¾åˆ°é‚£äº›è®¨è®ºè¿™ä¸ªè¡¥ä¸�çš„æ–‡</div><div class='del'>-章。</div><div class='del'>-</div><div class='del'>-一些标题的例å­�：</div><div class='del'>-</div><div class='del'>-    Subject: [patch 2/5] ext2: improve scalability of bitmap searching</div><div class='del'>-    Subject: [PATCHv2 001/207] x86: fix eflags tracking</div><div class='del'>-</div><div class='del'>-"from" 行是信体里的最上é�¢ä¸€è¡Œï¼Œå…·æœ‰å¦‚下格å¼�：</div><div class='del'>-        From: Original Author &lt;author@example.com&gt;</div><div class='del'>-</div><div class='del'>-"from" 行指明在永久改动日志里，è°�会被确认为作者。如果没有 "from" 行，那</div><div class='del'>-么邮件头里的 "From: " 行会被用æ�¥å†³å®šæ”¹åŠ¨æ—¥å¿—中的作者。</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'>-</div><div class='del'>-对于 "---" 标记之å�Žçš„é¢�外注解，一个好的用途就是用æ�¥å†™ diffstat，用æ�¥æ˜¾</div><div class='del'>-示修改了什么文件和æ¯�个文件都增加和删除了多少行。diffstat 对于比较大的补</div><div class='del'>-ä¸�特别有用。其余那些å�ªæ˜¯å’Œæ—¶åˆ»æˆ–者开å�‘者相关的注解，ä¸�å�ˆé€‚放到永久的改</div><div class='del'>-动日志里的，也应该放这里。</div><div class='del'>-使用 diffstat的选项 "-p 1 -w 70" 这样文件å��就会从内核æº�代ç �树的目录开始</div><div class='del'>-，ä¸�会å� ç”¨å¤ªå®½çš„空间（很容易适å�ˆ80列的宽度，也许会有一些缩进。）</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'>-</div><div class='del'>-本节包å�«å¾ˆå¤šå’Œæ��交到内核的代ç �有关的通常的"规则"。事情永远有例外...但是</div><div class='del'>-你必须真的有好的ç�†ç”±è¿™æ ·å�šã€‚ä½ å�¯ä»¥æŠŠæœ¬èŠ‚å�«å�šLinus的计算机科学入门课。</div><div class='del'>-</div><div class='del'>-1) 读 Document/process/coding-style.rst</div><div class='del'>-</div><div class='del'>-Nuff 说过，如果你的代ç �和这个å��离太多，那么它有å�¯èƒ½ä¼šè¢«æ‹’ç»�，没有更多的</div><div class='del'>-审查，没有更多的评价。</div><div class='del'>-</div><div class='del'>-2) #ifdef 是丑陋的</div><div class='del'>-æ··æ�‚了 ifdef 的代ç �难以阅读和维护。别这样å�šã€‚作为替代，将你的 ifdef 放</div><div class='del'>-在头文件里，有æ�¡ä»¶åœ°å®šä¹‰ "static inline" 函数，或者å®�，在代ç �里用这些东</div><div class='del'>-西。让编译器把那些"空æ“�作"优化掉。</div><div class='del'>-</div><div class='del'>-一个简å�•çš„例å­�，ä¸�好的代ç �：</div><div class='del'>-</div><div class='del'>-    dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='del'>-    if (!dev)</div><div class='del'>-        return -ENODEV;</div><div class='del'>-    #ifdef CONFIG_NET_FUNKINESS</div><div class='del'>-    init_funky_net(dev);</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-清ç�†å�Žçš„例å­�:</div><div class='del'>-</div><div class='del'>-(头文件里)</div><div class='del'>-    #ifndef CONFIG_NET_FUNKINESS</div><div class='del'>-    static inline void init_funky_net (struct net_device *d) {}</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-(代ç �文件里)</div><div class='del'>-    dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='del'>-    if (!dev)</div><div class='del'>-        return -ENODEV;</div><div class='del'>-    init_funky_net(dev);</div><div class='del'>-</div><div class='del'>-3) 'static inline' 比å®�好</div><div class='del'>-</div><div class='del'>-Static inline 函数相比å®�æ�¥è¯´ï¼Œæ˜¯å¥½å¾—多的选择。Static inline 函数æ��供了</div><div class='del'>-类型安全，没有长度é™�制，没有格å¼�é™�制，在 gcc 下开销和å®�一样å°�。</div><div class='del'>-</div><div class='del'>-å®�å�ªåœ¨ static inline 函数ä¸�是最优的时候[在 fast paths 里有很少的独立的</div><div class='del'>-案例]，或者ä¸�å�¯èƒ½ç”¨ static inline 函数的时候[例如字符串分é…�]。</div><div class='del'>-应该用 'static inline' 而ä¸�是 'static __inline__', 'extern inline' å’Œ</div><div class='del'>-'extern __inline__' 。</div><div class='del'>-</div><div class='del'>-4) ä¸�è¦�过度设计</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'>-----------------</div><div class='del'>-</div><div class='del'>-Andrew Morton, "The perfect patch" (tpp).</div><div class='del'>-  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='del'>-</div><div class='del'>-Jeff Garzik, "Linux kernel patch submission format".</div><div class='del'>-  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='del'>-</div><div class='del'>-Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/03/31/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/07/08/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/10/19/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2006/01/11/&gt;</div><div class='del'>-</div><div class='del'>-NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='del'>-  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='del'>-</div><div class='del'>-Kernel Documentation/process/coding-style.rst:</div><div class='del'>-  &lt;http://sosdg.org/~coywolf/lxr/source/Documentation/process/coding-style.rst&gt;</div><div class='del'>-</div><div class='del'>-Linus Torvalds's mail on the canonical patch format:</div><div class='del'>-  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='del'>---</div><div class='head'>diff --git a/Documentation/translations/zh_CN/disclaimer-zh_CN.rst b/Documentation/translations/zh_CN/disclaimer-zh_CN.rst<br/>new file mode 100644<br/>index 000000000000..dcf803ede85a<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/disclaimer-zh_CN.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/disclaimer-zh_CN.rst</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+:orphan:</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+     此文件的目的是为让中文读者更容易阅读和ç�†è§£ï¼Œè€Œä¸�是作为一个分支。 因此，</div><div class='add'>+     如果您对此文件有任何æ„�è§�或更新，请先å°�试更新原始英文文件。</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+     如果您å�‘现本文档与原始文件有任何ä¸�å�Œæˆ–者有翻译问题，请è�”系该文件的译者，</div><div class='add'>+     或者请求时奎亮的帮助：&lt;alex.shi@linux.alibaba.com&gt;。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst<br/>index 75956d669962..d3165535ec9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/index.rst</a></div><div class='hunk'>@@ -3,10 +3,19 @@</div><div class='ctx'> 	\renewcommand\thesection*</div><div class='ctx'> 	\renewcommand\thesubsection*</div><div class='ctx'> </div><div class='del'>-Chinese translations</div><div class='del'>-====================</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='ctx'> </div><div class='ctx'> .. toctree::</div><div class='del'>-   :maxdepth: 1</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   process/index</div><div class='add'>+</div><div class='add'>+目录和表格</div><div class='add'>+----------</div><div class='ctx'> </div><div class='del'>-   coding-style</div><div class='add'>+* :ref:`genindex`</div><div class='head'>diff --git a/Documentation/translations/zh_CN/magic-number.txt b/Documentation/translations/zh_CN/magic-number.txt<br/>deleted file mode 100644<br/>index 7159cec04090..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/magic-number.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/magic-number.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,153 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/process/magic-number.rst</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please post to LKML directly.</div><div class='del'>-However, if you have problem communicating in English you can also ask the</div><div class='del'>-Chinese maintainer for help.  Contact the Chinese maintainer, if this</div><div class='del'>-translation is outdated or there is problem with translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/magic-number.rst的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接å�‘信到LKML。如果你使用英文交æµ�有困难的è¯�，也å�¯</div><div class='del'>-以å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻译存在问题，请è�”系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： è´¾å¨�å¨� Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-中文版翻译者： è´¾å¨�å¨� Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-中文版校译者： è´¾å¨�å¨� Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</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)一个结构是å�¦å·²ç»�被攻击，或者(b)ä½ å·²ç»�给一个例行程åº�通过了一个错误的结构。å�Žä¸€ç§�情况特别地有用---特别是当你通过一个空指针指å�‘结构体的时候。ttyæº�ç �，例如，ç»�常通过特定驱动使用这ç§�方法并且å��å¤�地排列特定方é�¢çš„结构。</div><div class='del'>-</div><div class='del'>-使用魔术值的方法是在结构的开始处声明的，如下：</div><div class='del'>-</div><div class='del'>-struct tty_ldisc {</div><div class='del'>-	int	magic;</div><div class='del'>-	...</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-当你以å�Žç»™å†…核添加增强功能的时候，请é�µå®ˆè¿™æ�¡è§„则ï¼�这样就会节çœ�æ•°ä¸�清的调试时间，特别是一些å�¤æ€ªçš„情况，例如，数组超出范围并且é‡�新写了超出部分。é�µå®ˆè¿™ä¸ªè§„则，‪这些情况å�¯ä»¥è¢«å¿«é€Ÿåœ°ï¼Œå®‰å…¨åœ°é�¿å…�。</div><div class='del'>-</div><div class='del'>-		Theodore Ts'o</div><div class='del'>-		  31 Mar 94</div><div class='del'>-</div><div class='del'>-给当å‰�çš„Linux 2.1.55添加魔术表。</div><div class='del'>-</div><div class='del'>-		Michael Chastain</div><div class='del'>-		&lt;mailto:mec@shout.net&gt;</div><div class='del'>-		22 Sep 1997</div><div class='del'>-</div><div class='del'>-现在应该最新的Linux 2.1.112.因为在特性冻结期间，ä¸�能在2.2.xå‰�改å�˜ä»»ä½•ä¸œè¥¿ã€‚这些æ�¡ç›®è¢«æ•°åŸŸæ‰€æŽ’åº�。</div><div class='del'>-</div><div class='del'>-		Krzysztof G.Baranowski</div><div class='del'>-	        &lt;mailto: kgb@knm.org.pl&gt;</div><div class='del'>-		29 Jul 1998</div><div class='del'>-</div><div class='del'>-更新魔术表到Linux 2.5.45。刚好越过特性冻结，但是有å�¯èƒ½è¿˜ä¼šæœ‰ä¸€äº›æ–°çš„魔术值在2.6.x之å‰�èž�入到内核中。</div><div class='del'>-</div><div class='del'>-		Petr Baudis</div><div class='del'>-		&lt;pasky@ucw.cz&gt;</div><div class='del'>-		03 Nov 2002</div><div class='del'>-</div><div class='del'>-更新魔术表到Linux 2.5.74。</div><div class='del'>-</div><div class='del'>-		Fabian Frederick</div><div class='del'>-                &lt;ffrederick@users.sourceforge.net&gt;</div><div class='del'>-		09 Jul 2003</div><div class='del'>-</div><div class='del'>-魔术å��                 地å�€         结构               所在文件</div><div class='del'>-===========================================================================</div><div class='del'>-PG_MAGIC              'P'         pg_{read,write}_hdr include/linux/pg.h</div><div class='del'>-CMAGIC                0x0111      user              include/linux/a.out.h</div><div class='del'>-MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h</div><div class='del'>-HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c</div><div class='del'>-APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c</div><div class='del'>-CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h</div><div class='del'>-DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c</div><div class='del'>-DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c</div><div class='del'>-FASYNC_MAGIC          0x4601      fasync_struct     include/linux/fs.h</div><div class='del'>-FF_MAGIC              0x4646      fc_info           drivers/net/iph5526_novram.c</div><div class='del'>-ISICOM_MAGIC          0x4d54      isi_port          include/linux/isicom.h</div><div class='del'>-PTY_MAGIC             0x5001                        drivers/char/pty.c</div><div class='del'>-PPP_MAGIC             0x5002      ppp               include/linux/if_pppvar.h</div><div class='del'>-SERIAL_MAGIC          0x5301      async_struct      include/linux/serial.h</div><div class='del'>-SSTATE_MAGIC          0x5302      serial_state      include/linux/serial.h</div><div class='del'>-SLIP_MAGIC            0x5302      slip              drivers/net/slip.h</div><div class='del'>-STRIP_MAGIC           0x5303      strip             drivers/net/strip.c</div><div class='del'>-X25_ASY_MAGIC         0x5303      x25_asy           drivers/net/x25_asy.h</div><div class='del'>-SIXPACK_MAGIC         0x5304      sixpack           drivers/net/hamradio/6pack.h</div><div class='del'>-AX25_MAGIC            0x5316      ax_disp           drivers/net/mkiss.h</div><div class='del'>-TTY_MAGIC             0x5401      tty_struct        include/linux/tty.h</div><div class='del'>-MGSL_MAGIC            0x5401      mgsl_info         drivers/char/synclink.c</div><div class='del'>-TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h</div><div class='del'>-MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c</div><div class='del'>-TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h</div><div class='del'>-USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h</div><div class='del'>-FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c</div><div class='del'>-USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c</div><div class='del'>-RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c</div><div class='del'>-USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h</div><div class='del'>-CG_MAGIC              0x00090255  ufs_cylinder_group include/linux/ufs_fs.h</div><div class='del'>-RPORT_MAGIC           0x00525001  r_port            drivers/char/rocket_int.h</div><div class='del'>-LSEMAGIC              0x05091998  lse               drivers/fc4/fc.c</div><div class='del'>-GDTIOCTL_MAGIC        0x06030f07  gdth_iowr_str     drivers/scsi/gdth_ioctl.h</div><div class='del'>-RIEBL_MAGIC           0x09051990                    drivers/net/atarilance.c</div><div class='del'>-NBD_REQUEST_MAGIC     0x12560953  nbd_request       include/linux/nbd.h</div><div class='del'>-RED_MAGIC2            0x170fc2a5  (any)             mm/slab.c</div><div class='del'>-BAYCOM_MAGIC          0x19730510  baycom_state      drivers/net/baycom_epp.c</div><div class='del'>-ISDN_X25IFACE_MAGIC   0x1e75a2b9  isdn_x25iface_proto_data</div><div class='del'>-                                                    drivers/isdn/isdn_x25iface.h</div><div class='del'>-ECP_MAGIC             0x21504345  cdkecpsig         include/linux/cdk.h</div><div class='del'>-LSOMAGIC              0x27091997  lso               drivers/fc4/fc.c</div><div class='del'>-LSMAGIC               0x2a3b4d2a  ls                drivers/fc4/fc.c</div><div class='del'>-WANPIPE_MAGIC         0x414C4453  sdla_{dump,exec}  include/linux/wanpipe.h</div><div class='del'>-CS_CARD_MAGIC         0x43525553  cs_card           sound/oss/cs46xx.c</div><div class='del'>-LABELCL_MAGIC         0x4857434c  labelcl_info_s    include/asm/ia64/sn/labelcl.h</div><div class='del'>-ISDN_ASYNC_MAGIC      0x49344C01  modem_info        include/linux/isdn.h</div><div class='del'>-CTC_ASYNC_MAGIC       0x49344C01  ctc_tty_info      drivers/s390/net/ctctty.c</div><div class='del'>-ISDN_NET_MAGIC        0x49344C02  isdn_net_local_s  drivers/isdn/i4l/isdn_net_lib.h</div><div class='del'>-SAVEKMSG_MAGIC2       0x4B4D5347  savekmsg          arch/*/amiga/config.c</div><div class='del'>-CS_STATE_MAGIC        0x4c4f4749  cs_state          sound/oss/cs46xx.c</div><div class='del'>-SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c</div><div class='del'>-COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c</div><div class='del'>-I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c</div><div class='del'>-TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c</div><div class='del'>-ROUTER_MAGIC          0x524d4157  wan_device        [in wanrouter.h pre 3.9]</div><div class='del'>-SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c</div><div class='del'>-GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h</div><div class='del'>-RED_MAGIC1            0x5a2cf071  (any)             mm/slab.c</div><div class='del'>-EEPROM_MAGIC_VALUE    0x5ab478d2  lanai_dev         drivers/atm/lanai.c</div><div class='del'>-HDLCDRV_MAGIC         0x5ac6e778  hdlcdrv_state     include/linux/hdlcdrv.h</div><div class='del'>-PCXX_MAGIC            0x5c6df104  channel           drivers/char/pcxx.h</div><div class='del'>-KV_MAGIC              0x5f4b565f  kernel_vars_s     arch/mips/include/asm/sn/klkernvars.h</div><div class='del'>-I810_STATE_MAGIC      0x63657373  i810_state        sound/oss/i810_audio.c</div><div class='del'>-TRIDENT_STATE_MAGIC   0x63657373  trient_state      sound/oss/trident.c</div><div class='del'>-M3_CARD_MAGIC         0x646e6f50  m3_card           sound/oss/maestro3.c</div><div class='del'>-FW_HEADER_MAGIC       0x65726F66  fw_header         drivers/atm/fore200e.h</div><div class='del'>-SLOT_MAGIC            0x67267321  slot              drivers/hotplug/cpqphp.h</div><div class='del'>-SLOT_MAGIC            0x67267322  slot              drivers/hotplug/acpiphp.h</div><div class='del'>-LO_MAGIC              0x68797548  nbd_device        include/linux/nbd.h</div><div class='del'>-OPROFILE_MAGIC        0x6f70726f  super_block       drivers/oprofile/oprofilefs.h</div><div class='del'>-M3_STATE_MAGIC        0x734d724d  m3_state          sound/oss/maestro3.c</div><div class='del'>-VMALLOC_MAGIC         0x87654320  snd_alloc_track   sound/core/memory.c</div><div class='del'>-KMALLOC_MAGIC         0x87654321  snd_alloc_track   sound/core/memory.c</div><div class='del'>-PWC_MAGIC             0x89DC10AB  pwc_device        drivers/usb/media/pwc.h</div><div class='del'>-NBD_REPLY_MAGIC       0x96744668  nbd_reply         include/linux/nbd.h</div><div class='del'>-ENI155_MAGIC          0xa54b872d  midway_eprom	    drivers/atm/eni.h</div><div class='del'>-CODA_MAGIC            0xC0DAC0DA  coda_file_info    include/linux/coda_fs_i.h</div><div class='del'>-DPMEM_MAGIC           0xc0ffee11  gdt_pci_sram      drivers/scsi/gdth.h</div><div class='del'>-YAM_MAGIC             0xF10A7654  yam_port          drivers/net/hamradio/yam.c</div><div class='del'>-CCB_MAGIC             0xf2691ad2  ccb               drivers/scsi/ncr53c8xx.c</div><div class='del'>-QUEUE_MAGIC_FREE      0xf7e1c9a3  queue_entry       drivers/scsi/arm/queue.c</div><div class='del'>-QUEUE_MAGIC_USED      0xf7e1cc33  queue_entry       drivers/scsi/arm/queue.c</div><div class='del'>-HTB_CMAGIC            0xFEFAFEF1  htb_class         net/sched/sch_htb.c</div><div class='del'>-NMI_MAGIC             0x48414d4d455201 nmi_s        arch/mips/include/asm/sn/nmi.h</div><div class='del'>-</div><div class='del'>-请注æ„�，在声音记忆管ç�†ä¸­ä»�然有一些特殊的为æ¯�个驱动定义的魔术值。查看include/sound/sndmagic.hæ�¥èŽ·å�–他们完整的列表信æ�¯ã€‚很多OSS声音驱动拥有自己从声å�¡PCI ID构建的魔术值-他们也没有被列在这里。</div><div class='del'>-</div><div class='del'>-IrDAå­�系统也使用了大é‡�的自己的魔术值，查看include/net/irda/irda.hæ�¥èŽ·å�–他们完整的信æ�¯ã€‚</div><div class='del'>-</div><div class='del'>-HFS是å�¦å¤–一个比较大的使用魔术值的文件系统-ä½ å�¯ä»¥åœ¨fs/hfs/hfs.h中找到他们。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/oops-tracing.txt b/Documentation/translations/zh_CN/oops-tracing.txt<br/>index a893f04dfd5d..93fa061cf9e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/oops-tracing.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/oops-tracing.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/oops-tracing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/oops-tracing.txt</a></div><div class='hunk'>@@ -16,7 +16,7 @@ Documentation/admin-guide/bug-hunting.rst 的中文翻译</div><div class='ctx'> </div><div class='ctx'> 中文版维护者： æ�¨ç‘ž Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='ctx'> 中文版翻译者： æ�¨ç‘ž Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='del'>-中文版校译者： æ�Žé˜³ Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+中文版校译者： æ�Žé˜³ Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='ctx'>                王è�ª Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='ctx'> </div><div class='ctx'> 以下为正文</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/1.Intro.rst b/Documentation/translations/zh_CN/process/1.Intro.rst<br/>new file mode 100644<br/>index 000000000000..10a15f3dc282<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/1.Intro.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/1.Intro.rst</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/1.Intro.rst &lt;development_process_intro&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_process_intro:</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'>+到的å�„ç§�挫折。内核代ç �应该å�ˆå¹¶åˆ°æ­£å¼�的（“主线â€�）内核中有很多原因，包括对用</div><div class='add'>+户的自动å�¯ç”¨æ€§ã€�多ç§�å½¢å¼�的社区支æŒ�以å�Šå½±å“�内核开å�‘æ–¹å�‘的能力。æ��供给Linux</div><div class='add'>+内核的代ç �必须在与GPL兼容的许å�¯è¯�下å�¯ç”¨ã€‚</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_process` 介ç»�了开å�‘过程ã€�内核å�‘布周期和å�ˆå¹¶çª—å�£çš„机制。</div><div class='add'>+涵盖了补ä¸�å¼€å�‘ã€�审查和å�ˆå¹¶å‘¨æœŸä¸­çš„å�„个阶段。有一些关于工具和邮件列表的讨论。</div><div class='add'>+鼓励希望开始内核开å�‘çš„å¼€å�‘人员作为åˆ�始练习跟踪并修å¤�bug。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_early_stage` 包括早期项目规划，é‡�点是尽快让开å�‘社区å�‚与</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_coding` 是关于编ç �过程的；讨论了其他开å�‘人员é�‡åˆ°çš„几个</div><div class='add'>+陷阱。对补ä¸�的一些è¦�求已ç»�涵盖，并且介ç»�了一些工具，这些工具有助于确ä¿�内核</div><div class='add'>+è¡¥ä¸�是正确的。</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_posting` 讨论å�‘布补ä¸�以供评审的过程。为了让开å�‘社区</div><div class='add'>+认真对待，补ä¸�必须正确格å¼�化和æ��述，并且必须å�‘é€�到正确的地方。é�µå¾ªæœ¬èŠ‚中的</div><div class='add'>+建议有助于确ä¿�为您的工作æ��供最好的接纳。</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_followthrough` 介ç»�了å�‘布补ä¸�之å�Žå�‘生的事情；该工作</div><div class='add'>+在这一点上还远远没有完æˆ�。与审阅者一起工作是开å�‘过程中的一个é‡�è¦�部分；本节</div><div class='add'>+æ��供了一些关于如何在这个é‡�è¦�阶段é�¿å…�问题的æ��示。当补ä¸�被å�ˆå¹¶åˆ°ä¸»çº¿ä¸­æ—¶ï¼Œ</div><div class='add'>+å¼€å�‘人员è¦�注æ„�ä¸�è¦�å�‡å®šä»»åŠ¡å·²ç»�完æˆ�。</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_advancedtopics` 介ç»�了两个“高级â€�主题：</div><div class='add'>+使用Git管ç�†è¡¥ä¸�和查看其他人å�‘布的补ä¸�。</div><div class='add'>+</div><div class='add'>+:ref:`cn_development_conclusion` 总结了有关内核开å�‘的更多信æ�¯ï¼Œé™„带有带有</div><div class='add'>+指å�‘资æº�的链接.</div><div class='add'>+</div><div class='add'>+这个文件是关于什么的</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Linux内核有超过800万行代ç �，æ¯�个版本的贡献者超过1000人，是现存最大ã€�最活跃</div><div class='add'>+çš„å…�费软件项目之一。从1991年开始，这个内核已ç»�å�‘展æˆ�为一个最好的æ“�作系统</div><div class='add'>+组件，è¿�行在袖ç��数字音ä¹�播放器ã€�å�°å¼�PCã€�现存最大的超级计算机以å�Šæ‰€æœ‰ç±»åž‹çš„</div><div class='add'>+系统上。它是一ç§�适用于几乎任何情况的å�¥å£®ã€�高效和å�¯æ‰©å±•çš„解决方案。</div><div class='add'>+</div><div class='add'>+éš�ç�€Linuxçš„å�‘展，希望å�‚与其开å�‘çš„å¼€å�‘人员（和公å�¸ï¼‰çš„æ•°é‡�也在增加。硬件供应商</div><div class='add'>+希望确ä¿�Linux能够很好地支æŒ�他们的产å“�，使这些产å“�对Linux用户具有å�¸å¼•åŠ›ã€‚嵌入</div><div class='add'>+å¼�系统供应商使用Linux作为集æˆ�产å“�的组件，希望Linux能够尽å�¯èƒ½åœ°èƒœä»»æ‰‹å¤´çš„任务。</div><div class='add'>+分销商和其他基于Linux的软件供应商对Linux内核的功能ã€�性能和å�¯é� æ€§æœ‰ç�€æ˜Žç¡®çš„</div><div class='add'>+兴趣。最终用户也常常希望修改Linux，使之更好地满足他们的需求。</div><div class='add'>+</div><div class='add'>+Linux最引人注目的特性之一是这些开å�‘人员å�¯ä»¥è®¿é—®å®ƒï¼›ä»»ä½•å…·å¤‡å¿…è¦�技能的人都å�¯ä»¥</div><div class='add'>+改进Linux并影å“�其开å�‘æ–¹å�‘。专有产å“�ä¸�能æ��供这ç§�开放性，这是自由软件的一个特点。</div><div class='add'>+但是，如果有什么ä¸�å�Œçš„è¯�，内核比大多数其他自由软件项目更开放。一个典型的三个月</div><div class='add'>+内核开å�‘周期å�¯ä»¥æ¶‰å�Š1000多个开å�‘人员，他们为100多个ä¸�å�Œçš„å…¬å�¸</div><div class='add'>+（或者根本没有公å�¸ï¼‰å·¥ä½œã€‚</div><div class='add'>+</div><div class='add'>+与内核开å�‘社区å�ˆä½œå¹¶ä¸�是特别困难。但是，尽管如此，许多潜在的贡献者在å°�试å�š</div><div class='add'>+内核工作时é�‡åˆ°äº†å›°éš¾ã€‚内核社区已ç»�å�‘展了自己独特的æ“�作方å¼�，使其能够在æ¯�天</div><div class='add'>+都è¦�更改数å�ƒè¡Œä»£ç �的环境中顺利è¿�行（并生æˆ�高质é‡�的产å“�）。因此，Linux内核开å�‘</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'>+努力会在短时间内得到回报。开å�‘社区总是需è¦�能让内核å�˜æ›´å¥½çš„å¼€å�‘人员；下é�¢çš„</div><div class='add'>+文本应该帮助您或为您工作的人员加入我们的社区。</div><div class='add'>+</div><div class='add'>+致谢</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+本文件由Jonathan Corbet撰写，corbet@lwn.net。以下人员的建议使之更为完善：</div><div class='add'>+Johannes Berg, James Berry, Alex Chiang, Roland Dreier, Randy Dunlap,</div><div class='add'>+Jake Edge, Jiri Kosina, Matt Mackall, Arthur Marsh, Amanda McPherson,</div><div class='add'>+Andrew Morton, Andrew Price, Tsugikazu Shibata, å’Œ Jochen Voß.</div><div class='add'>+</div><div class='add'>+这项工作得到了Linux基金会的支æŒ�，特别感谢Amanda McPherson，他看到了这项工作</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'>+放入主线内核（“主线â€�是由Linus Torvalds维护的内核，Linuxå�‘行商将其用作基础）。</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'>+- 所有Linux用户都å�¯ä»¥ä½¿ç”¨å�ˆå¹¶åˆ°ä¸»çº¿å†…核中的代ç �。它将自动出现在所有å�¯ç”¨å®ƒçš„</div><div class='add'>+  å�‘行版上。ä¸�需è¦�驱动程åº�ç£�盘ã€�下载，也ä¸�需è¦�为多个å�‘行版的多个版本æ��供支æŒ�ï¼›</div><div class='add'>+  对于开å�‘人员和用户æ�¥è¯´ï¼Œè¿™ä¸€åˆ‡éƒ½æ˜¯å�¯è¡Œçš„。并入主线解决了大é‡�的分布和支æŒ�问题</div><div class='add'>+</div><div class='add'>+- 当内核开å�‘人员努力维护一个稳定的用户空间接å�£æ—¶ï¼Œå†…部内核API处于ä¸�æ–­å�˜åŒ–之中.</div><div class='add'>+  缺ä¹�一个稳定的内部接å�£æ˜¯ä¸€ä¸ªæ·±æ€�熟虑的设计决策；它å…�许在任何时候进行基本的改</div><div class='add'>+  进，并产生更高质é‡�的代ç �。但该策略的一个结果是，如果è¦�使用新的内核，任何树外</div><div class='add'>+  代ç �都需è¦�æŒ�续的维护。维护树外代ç �需è¦�大é‡�的工作æ‰�能使代ç �ä¿�æŒ�工作状æ€�。</div><div class='add'>+</div><div class='add'>+  相å��，ä½�于主线中的代ç �ä¸�需è¦�这样å�šï¼Œå› ä¸ºä¸€ä¸ªç®€å�•çš„规则è¦�求进行API更改的任何</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'>+  这对于在å°�闭环境中开å�‘的代ç �尤其如此；这ç§�代ç �从外部开å�‘人员的审查中获益</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'>+  令人ä¸�快的选择：（1）无é™�期地维护树外的é�žæ ‡å‡†ç‰¹æ€§ï¼Œæˆ–（2）放弃代ç �并将用户</div><div class='add'>+  è¿�移到树内版本。</div><div class='add'>+</div><div class='add'>+- 代ç �的贡献是使整个过程工作的根本。通过贡献代ç �，您å�¯ä»¥å�‘内核添加新功能，并</div><div class='add'>+  æ��供其他内核开å�‘人员使用的功能和示例。如果您已ç»�为Linuxå¼€å�‘了代ç �（或者</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'>+  大多数仅é™�二进制的模å�—是内核的派生产å“�，因此，它们的分å�‘è¿�å��了GNU通用公共</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'>+  çš„æ¯�个å�‘行版和æ¯�个内核版本æ��供一个版本的模å�—。为了æ��供相当全é�¢çš„覆盖范围，</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'>+这个论点忽略了广泛的代ç �审查的价值以å�Šå…�许用户å�‘产å“�添加功能的价值。但这些</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'>+代ç �是根æ�®ä¸€äº›è®¸å�¯è¯�æ��供给Linux内核的，但是所有代ç �都必须与GNU通用公共许å�¯</div><div class='add'>+è¯�（GPLV2）的版本2兼容，该版本是覆盖整个内核分å�‘的许å�¯è¯�。在实践中，这æ„�味</div><div class='add'>+ç�€æ‰€æœ‰ä»£ç �贡献都由GPLv2（å�¯é€‰åœ°ï¼Œè¯­è¨€å…�许在更高版本的GPL下分å�‘）或3å­�å�¥BSD</div><div class='add'>+许å�¯ï¼ˆNew BSD License, 译者注）覆盖。任何ä¸�包å�«åœ¨å…¼å®¹è®¸å�¯è¯�中的贡献都ä¸�会</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'>+别是，在å�¯é¢„è§�çš„å°†æ�¥ï¼Œä¸�å�¯èƒ½è¿�移到GPL的版本3。</div><div class='add'>+</div><div class='add'>+所有贡献给内核的代ç �都必须是å�ˆæ³•çš„å…�费软件。因此，ä¸�接å�—匿å��（或匿å��）贡献</div><div class='add'>+者的代ç �。所有贡献者都需è¦�在他们的代ç �上“sign offâ€�，声明代ç �å�¯ä»¥åœ¨GPL下与内</div><div class='add'>+核一起分å�‘。无法æ��供未被其所有者许å�¯ä¸ºå…�费软件的代ç �，或å�¯èƒ½ä¸ºå†…核造æˆ�版æ�ƒ</div><div class='add'>+相关问题的代ç �（例如，由缺ä¹�适当ä¿�护的å��å�‘工程工作派生的代ç �）ä¸�能被接å�—。</div><div class='add'>+</div><div class='add'>+有关版æ�ƒç›¸å…³é—®é¢˜çš„问题在Linuxå¼€å�‘邮件列表中很常è§�。这样的问题通常会得到ä¸�å°‘</div><div class='add'>+答案，但è¦�è®°ä½�，回答这些问题的人ä¸�是律师，ä¸�能æ��供法律咨询。如果您有关于</div><div class='add'>+Linuxæº�代ç �的法律问题，那么与了解该领域的律师交æµ�是无法替代的。ä¾�é� ä»ŽæŠ€æœ¯</div><div class='add'>+邮件列表中获得的答案是一件冒险的事情。</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/2.Process.rst b/Documentation/translations/zh_CN/process/2.Process.rst<br/>new file mode 100644<br/>index 000000000000..ceb733bb0294<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/2.Process.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/2.Process.rst</a></div><div class='hunk'>@@ -0,0 +1,360 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/2.Process.rst &lt;development_process&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_process:</div><div class='add'>+</div><div class='add'>+å¼€å�‘æµ�程如何工作</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+90年代早期的Linux内核开å�‘是一件相当æ�¾æ•£çš„事情，涉å�Šçš„用户和开å�‘人员相对较</div><div class='add'>+少。由于拥有数以百万计的用户群，并且在一年的时间里有大约2000å��å¼€å�‘人员å�‚与</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'>+</div><div class='add'>+	======  =================</div><div class='add'>+	4.11	四月 30, 2017</div><div class='add'>+	4.12	七月 2, 2017</div><div class='add'>+	4.13	ä¹�月 3, 2017</div><div class='add'>+	4.14	å��一月 12, 2017</div><div class='add'>+	4.15	一月 28, 2018</div><div class='add'>+	4.16	四月 1, 2018</div><div class='add'>+	======  =================</div><div class='add'>+</div><div class='add'>+æ¯�4.x版本都是一个主è¦�的内核版本，具有新特性ã€�内部API更改等等。一个典型的4.x</div><div class='add'>+版本包å�«å¤§çº¦13000个å�˜æ›´é›†ï¼Œå�˜æ›´äº†å‡ å��万行代ç �。因此，4.x是Linux内核开å�‘çš„å‰�</div><div class='add'>+沿；内核使用滚动开å�‘模型，ä¸�断集æˆ�é‡�大å�˜åŒ–。</div><div class='add'>+</div><div class='add'>+对于æ¯�个版本的补ä¸�å�ˆå¹¶ï¼Œé�µå¾ªä¸€ä¸ªç›¸å¯¹ç®€å�•çš„规则。在æ¯�个开å�‘周期的开始，“å�ˆå¹¶</div><div class='add'>+窗å�£â€�被打开。当时，被认为足够稳定（并且被开å�‘社区接å�—）的代ç �被å�ˆå¹¶åˆ°ä¸»çº¿å†…</div><div class='add'>+核中。在这段时间内，新开å�‘周期的大部分å�˜æ›´ï¼ˆä»¥å�Šæ‰€æœ‰ä¸»è¦�å�˜æ›´ï¼‰å°†ä»¥æŽ¥è¿‘æ¯�天</div><div class='add'>+1000次å�˜æ›´ï¼ˆâ€œè¡¥ä¸�â€�或“å�˜æ›´é›†â€�）的速度å�ˆå¹¶ã€‚</div><div class='add'>+</div><div class='add'>+（顺便说一å�¥ï¼Œå€¼å¾—注æ„�的是，å�ˆå¹¶çª—å�£æœŸé—´é›†æˆ�的更改并ä¸�是凭空产生的；它们是</div><div class='add'>+æ��å‰�收集ã€�测试和分级的。ç¨�å�Žå°†è¯¦ç»†æ��述该过程的工作方å¼�）。</div><div class='add'>+</div><div class='add'>+å�ˆå¹¶çª—å�£æŒ�续大约两周。在这段时间结æ�Ÿæ—¶ï¼ŒLinusTorvalds将声明窗å�£å·²å…³é—­ï¼Œå¹¶</div><div class='add'>+释放第一个“rcâ€�内核。例如，对于目标为4.14的内核，在å�ˆå¹¶çª—å�£ç»“æ�Ÿæ—¶å�‘生的释放</div><div class='add'>+将被称为4.14-rc1。RC1版本是一个信å�·ï¼Œè¡¨ç¤ºå�ˆå¹¶æ–°ç‰¹æ€§çš„时间已ç»�过去，稳定下一</div><div class='add'>+个内核的时间已ç»�开始。</div><div class='add'>+</div><div class='add'>+在接下æ�¥çš„6到10周内，å�ªæœ‰ä¿®å¤�问题的补ä¸�æ‰�应该æ��交给主线。有时会å…�许更大的</div><div class='add'>+更改，但这ç§�情况很少å�‘生；试图在å�ˆå¹¶çª—å�£å¤–å�ˆå¹¶æ–°åŠŸèƒ½çš„å¼€å�‘人员往往会å�—到ä¸�</div><div class='add'>+å�‹å¥½çš„接待。一般æ�¥è¯´ï¼Œå¦‚果您错过了给定特性的å�ˆå¹¶çª—å�£ï¼Œæœ€å¥½çš„å�šæ³•æ˜¯ç­‰å¾…下一</div><div class='add'>+个开å�‘周期。（对于以å‰�ä¸�支æŒ�的硬件，å�¶å°”会对驱动程åº�进行例外；如果它们ä¸�</div><div class='add'>+改å�˜å·²æœ‰ä»£ç �，则ä¸�会导致回归，并且应该å�¯ä»¥éš�时安全地添加）。</div><div class='add'>+</div><div class='add'>+éš�ç�€ä¿®å¤�程åº�进入主线，补ä¸�速度将éš�ç�€æ—¶é—´çš„推移而å�˜æ…¢ã€‚Linus大约æ¯�周å�‘布一次</div><div class='add'>+æ–°çš„-rc内核；一个正常的系列将在-rc6å’Œ-rc9之间，内核被认为足够稳定并最终å�‘布。</div><div class='add'>+然å�Žï¼Œæ•´ä¸ªè¿‡ç¨‹å�ˆé‡�新开始了。</div><div class='add'>+</div><div class='add'>+例如，这里是4.16çš„å¼€å�‘周期进行情况（2018年的所有日期）:</div><div class='add'>+</div><div class='add'>+	==============  ==============================</div><div class='add'>+	一月 28	        4.15 稳定版å�‘布</div><div class='add'>+	二月 11	        4.16-rc1, å�ˆå¹¶çª—å�£å…³é—­</div><div class='add'>+	二月 18	        4.16-rc2</div><div class='add'>+	二月 25	        4.16-rc3</div><div class='add'>+	三月 4		4.16-rc4</div><div class='add'>+	三月 11	        4.16-rc5</div><div class='add'>+	三月 18	        4.16-rc6</div><div class='add'>+	三月 25	        4.16-rc7</div><div class='add'>+	四月 1		4.16 稳定版å�‘布</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'>+å�˜å¾—更糟；等待下一个å�ˆå¹¶çª—å�£çš„一堆更改将å�˜å¤§ï¼Œä»Žè€Œåœ¨ä¸‹æ¬¡åˆ›å»ºæ›´å¤šçš„回归错误。</div><div class='add'>+因此，大多数4.x内核都有一些已知的回归错误，ä¸�过，希望没有一个是严é‡�的。</div><div class='add'>+</div><div class='add'>+一旦一个稳定的版本å�‘布，它正在进行的维护工作就被移交给“稳定团队â€�，目å‰�ç”±</div><div class='add'>+Greg Kroah-Hartman组æˆ�。稳定团队将使用4.x.yç¼–å�·æ–¹æ¡ˆä¸�定期的å�‘布稳定版本的更</div><div class='add'>+新。è¦�加入更新版本，补ä¸�程åº�必须（1）修å¤�一个é‡�è¦�çš„bug，（2）已ç»�å�ˆå¹¶åˆ°</div><div class='add'>+下一个开å�‘主线中。内核通常会在超过其åˆ�始版本的一个以上的开å�‘周期内接收稳定</div><div class='add'>+的更新。例如，4.13内核的历å�²å¦‚下</div><div class='add'>+</div><div class='add'>+	==============  ===============================</div><div class='add'>+        ä¹�月 3 	        4.13 稳定版å�‘布</div><div class='add'>+	ä¹�月 13	        4.13.1</div><div class='add'>+	ä¹�月 20	        4.13.2</div><div class='add'>+	ä¹�月 27	        4.13.3</div><div class='add'>+	å��月 5	        4.13.4</div><div class='add'>+	å��月 12         4.13.5</div><div class='add'>+	...	        ...</div><div class='add'>+	å��一月 24       4.13.16</div><div class='add'>+	==============  ===============================</div><div class='add'>+</div><div class='add'>+4.13.16是4.13版本的最终稳定更新。</div><div class='add'>+</div><div class='add'>+有些内核被指定为“长期â€�内核；它们将得到更长时间的支æŒ�。在本文中，当å‰�的长期</div><div class='add'>+内核å�Šå…¶ç»´æŠ¤è€…是：</div><div class='add'>+</div><div class='add'>+	======  ======================  ==============================</div><div class='add'>+	3.16	Ben Hutchings		(长期稳定内核)</div><div class='add'>+	4.1	Sasha Levin</div><div class='add'>+	4.4	Greg Kroah-Hartman	(长期稳定内核)</div><div class='add'>+	4.9	Greg Kroah-Hartman</div><div class='add'>+	4.14	Greg Kroah-Hartman</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'>+è¡¥ä¸�ä¸�会直接从开å�‘人员的键盘进入主线内核。相å��，有一个ç¨�å¾®å¤�æ�‚（如果有些é�ž</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'>+è¡¥ä¸�程åº�ç»�历的阶段通常是：</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'>+- 更广泛的评审。当补ä¸�接近准备好纳入主线时，它应该被相关的å­�系统维护人员</div><div class='add'>+  接å�———尽管这ç§�接å�—并ä¸�能ä¿�è¯�è¡¥ä¸�会一直延伸到主线。补ä¸�将出现在维护人员的</div><div class='add'>+  å­�系统树中，并进入 -next 树（如下所述）。当æµ�程工作时，此步骤将导致对补ä¸�</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'>+</div><div class='add'>+- å�ˆå¹¶åˆ°ä¸»çº¿ã€‚最终，一个æˆ�功的补ä¸�将被å�ˆå¹¶åˆ°ç”±LinusTorvalds管ç�†çš„主线存储库</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'>+  社区留下ä¸�良å�°è±¡ã€‚å�ˆå¹¶ä»£ç �消除了一些维护负担，因为其他代ç �将修å¤�ç”±API</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'>+</div><div class='add'>+å�ªæœ‰ä¸€ä¸ªäººå�¯ä»¥å°†è¡¥ä¸�å�ˆå¹¶åˆ°ä¸»çº¿å†…核存储库中：LinusTorvalds。但是，在进入</div><div class='add'>+2.6.38内核的9500多个补ä¸�中，å�ªæœ‰112个（大约1.3%）是由Linus自己直接选择的。</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'>+</div><div class='add'>+å­�系统维护人员æ¯�个人都使用gitæº�代ç �管ç�†å·¥å…·ç®¡ç�†è‡ªå·±ç‰ˆæœ¬çš„内核æº�代ç �树。Git</div><div class='add'>+等工具（以å�ŠQuilt或Mercurial等相关工具）å…�许维护人员跟踪补ä¸�列表，包括作者</div><div class='add'>+ä¿¡æ�¯å’Œå…¶ä»–元数æ�®ã€‚在任何给定的时间，维护人员都å�¯ä»¥ç¡®å®šä»–或她的存储库中的哪</div><div class='add'>+些补ä¸�在主线中找ä¸�到。</div><div class='add'>+</div><div class='add'>+当å�ˆå¹¶çª—å�£æ‰“开时，顶级维护人员将è¦�求Linus从其存储库中“拉出â€�他们为å�ˆå¹¶é€‰æ‹©</div><div class='add'>+çš„è¡¥ä¸�。如果Linuså�Œæ„�，补ä¸�æµ�å°†æµ�å�‘他的存储库，æˆ�为主线内核的一部分。</div><div class='add'>+Linus对拉æ“�作中接收到的特定补ä¸�的关注程度å�„ä¸�相å�Œã€‚很明显，有时他看起æ�¥å¾ˆ</div><div class='add'>+关注。但是，作为一般规则，Linus相信å­�系统维护人员ä¸�会å�‘上游å�‘é€�å��è¡¥ä¸�。</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'>+显然，在这样的系统中，获å�–内核补ä¸�å�–决于找到正确的维护者。直接å�‘Linuså�‘é€�</div><div class='add'>+è¡¥ä¸�通常ä¸�是正确的方法。</div><div class='add'>+</div><div class='add'>+Next æ ‘</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'>+</div><div class='add'>+答案以-nextæ ‘çš„å½¢å¼�出现，在这里å­�系统树被收集以供测试和审查。Andrew Morton</div><div class='add'>+维护的这些旧树被称为“-mmâ€�（用于内存管ç�†ï¼Œè¿™å°±æ˜¯å®ƒçš„å�¯åŠ¨å��字）。-mm 树集æˆ�了</div><div class='add'>+一长串å­�系统树中的补ä¸�；它还包å�«ä¸€äº›æ—¨åœ¨å¸®åŠ©è°ƒè¯•çš„è¡¥ä¸�。</div><div class='add'>+</div><div class='add'>+除此之外，-mm 还包å�«å¤§é‡�ç”±Andrew直接选择的补ä¸�。这些补ä¸�å�¯èƒ½å·²ç»�å�‘布在邮件</div><div class='add'>+列表上，或者它们å�¯èƒ½åº”用于内核中没有指定å­�系统树的部分。结果，-mm 作为一ç§�</div><div class='add'>+最å�Žæ‰‹æ®µçš„å­�系统树è¿�行；如果没有其他明显的路径å�¯ä»¥è®©è¡¥ä¸�进入主线，那么它很</div><div class='add'>+å�¯èƒ½ä»¥-mm 结æ�Ÿã€‚累积在-mm 中的å�„ç§�è¡¥ä¸�最终将被转å�‘到适当的å­�系统树，或者直接</div><div class='add'>+å�‘é€�到Linus。在典型的开å�‘周期中，大约5-10%çš„è¡¥ä¸�通过-mm 进入主线。</div><div class='add'>+</div><div class='add'>+当å‰�-mm è¡¥ä¸�å�¯åœ¨â€œmmotmâ€�（-mm of the moment）目录中找到，地å�€ï¼š</div><div class='add'>+</div><div class='add'>+        http://www.ozlabs.org/~akpm/mmotm/</div><div class='add'>+</div><div class='add'>+然而，使用mmotmæ ‘å�¯èƒ½æ˜¯ä¸€ç§�令人沮丧的体验；它甚至å�¯èƒ½æ— æ³•ç¼–译。</div><div class='add'>+</div><div class='add'>+下一个周期补ä¸�å�ˆå¹¶çš„主è¦�树是linux-next，由Stephen Rothwell 维护。根æ�®è®¾è®¡</div><div class='add'>+linux-next 是下一个å�ˆå¹¶çª—å�£å…³é—­å�Žä¸»çº¿çš„快照。linux-next树在Linux-kernel å’Œ</div><div class='add'>+Linux-next 邮件列表中å�‘布，å�¯ä»Žä»¥ä¸‹ä½�置下载：</div><div class='add'>+</div><div class='add'>+        http://www.kernel.org/pub/linux/kernel/next/</div><div class='add'>+</div><div class='add'>+Linux-next å·²ç»�æˆ�为内核开å�‘过程中ä¸�å�¯æˆ–缺的一部分；在一个给定的å�ˆå¹¶çª—å�£ä¸­å�ˆå¹¶</div><div class='add'>+的所有补ä¸�都应该在å�ˆå¹¶çª—å�£æ‰“开之å‰�的一段时间内找到进入Linux-next 的方法。</div><div class='add'>+</div><div class='add'>+Staging æ ‘</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+内核æº�代ç �树包å�«drivers/staging/directory，其中有许多驱动程åº�或文件系统的</div><div class='add'>+å­�目录正在被添加到内核树中。它们然需è¦�更多的工作的时候å�¯ä»¥ä¿�留在</div><div class='add'>+driver/staging目录中；一旦完æˆ�，就å�¯ä»¥å°†å®ƒä»¬ç§»åˆ°å†…核中。这是一ç§�跟踪ä¸�符å�ˆ</div><div class='add'>+Linux内核编ç �或质é‡�标准的驱动程åº�的方法，但人们å�¯èƒ½å¸Œæœ›ä½¿ç”¨å®ƒä»¬å¹¶è·Ÿè¸ªå¼€å�‘。</div><div class='add'>+</div><div class='add'>+Greg Kroah Hartman ç›®å‰�负责维护staging 树。ä»�需è¦�工作的驱动程åº�å°†å�‘é€�给他，</div><div class='add'>+æ¯�个驱动程åº�在drivers/staging/中都有自己的å­�目录。除了驱动程åº�æº�文件之外，</div><div class='add'>+目录中还应该有一个TODO文件。todo文件列出了驱动程åº�需è¦�接å�—的挂起的工作，</div><div class='add'>+以å�Šé©±åŠ¨ç¨‹åº�的任何补ä¸�都应该抄é€�的人员列表。当å‰�的规则è¦�求，staging的驱动</div><div class='add'>+程åº�必须至少正确编译。</div><div class='add'>+</div><div class='add'>+Staging 是一ç§�相对容易的方法，å�¯ä»¥è®©æ–°çš„驱动程åº�进入主线，幸è¿�的是，他们会</div><div class='add'>+引起其他开å�‘人员的注æ„�，并迅速改进。然而，进入staging并ä¸�是故事的结尾；</div><div class='add'>+staging中没有看到常规进展的代ç �最终将被删除。ç»�销商也倾å�‘于相对ä¸�æ„¿æ„�使用</div><div class='add'>+staging驱动程åº�。因此，在æˆ�为一å��å�ˆé€‚的主线驱动的路上，staging å……å…¶é‡�å�ªæ˜¯</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'>+</div><div class='add'>+到目å‰�为止，内核社区使用的主è¦�æº�代ç �管ç�†ç³»ç»Ÿæ˜¯git。Git是在自由软件社区中开å�‘</div><div class='add'>+的许多分布å¼�版本控制系统之一。它é�žå¸¸é€‚å�ˆå†…核开å�‘，因为它在处ç�†å¤§åž‹å­˜å‚¨åº“å’Œ</div><div class='add'>+大é‡�è¡¥ä¸�时性能é�žå¸¸å¥½ã€‚它还有一个难以学习和使用的å��声，尽管éš�ç�€æ—¶é—´çš„推移它</div><div class='add'>+å�˜å¾—更好了。对于内核开å�‘人员æ�¥è¯´ï¼Œå¯¹Gitçš„æŸ�ç§�熟悉几乎是一ç§�è¦�求；å�³ä½¿ä»–们ä¸�</div><div class='add'>+将它用于自己的工作，他们也需è¦�Gitæ�¥è·Ÿä¸Šå…¶ä»–å¼€å�‘人员（以å�Šä¸»çº¿ï¼‰æ­£åœ¨å�šçš„事情。</div><div class='add'>+</div><div class='add'>+现在几乎所有的Linuxå�‘行版都打包了Git。主页ä½�于：</div><div class='add'>+</div><div class='add'>+        http://git-scm.com/</div><div class='add'>+</div><div class='add'>+那个页é�¢æœ‰æŒ‡å�‘文档和教程的指针。</div><div class='add'>+</div><div class='add'>+在ä¸�使用git的内核开å�‘人员中，最æµ�行的选择几乎肯定是mercurial：</div><div class='add'>+</div><div class='add'>+        http://www.seleric.com/mercurial/</div><div class='add'>+</div><div class='add'>+Mercurial与Git共享许多特性，但它æ��供了一个界é�¢ï¼Œè®¸å¤šäººè§‰å¾—它更易于使用。</div><div class='add'>+</div><div class='add'>+å�¦ä¸€ä¸ªå€¼å¾—了解的工具是quilt:</div><div class='add'>+</div><div class='add'>+        http://savannah.nongnu.org/projects/quilt</div><div class='add'>+</div><div class='add'>+Quilt 是一个补ä¸�管ç�†ç³»ç»Ÿï¼Œè€Œä¸�是æº�代ç �管ç�†ç³»ç»Ÿã€‚它ä¸�会éš�ç�€æ—¶é—´çš„推移跟踪历å�²ï¼›</div><div class='add'>+相å��，它é�¢å�‘æ ¹æ�®ä¸�æ–­å�‘展的代ç �库跟踪一组特定的更改。一些主è¦�çš„å­�系统维护人员</div><div class='add'>+使用Quiltæ�¥ç®¡ç�†æ‰“ç®—å�‘上游移动的补ä¸�。对于æŸ�些树的管ç�†ï¼ˆä¾‹å¦‚-mm），quilt 是</div><div class='add'>+最好的工具。</div><div class='add'>+</div><div class='add'>+邮件列表</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+大é‡�çš„Linux内核开å�‘工作是通过邮件列表完æˆ�的。如果ä¸�在æŸ�个地方加入至少一个列表，</div><div class='add'>+就很难æˆ�为社区中一个功能完备的æˆ�员。但是，Linux邮件列表对开å�‘人员æ�¥è¯´ä¹Ÿæ˜¯ä¸€ä¸ª</div><div class='add'>+潜在的å�±é™©ï¼Œä»–们å�¯èƒ½ä¼šè¢«ä¸€å †ç”µå­�邮件淹没，è¿�å��Linux列表上使用的约定，或者</div><div class='add'>+两者兼而有之。</div><div class='add'>+</div><div class='add'>+大多数内核邮件列表都在vger.kernel.org上è¿�行；主列表ä½�于：</div><div class='add'>+</div><div class='add'>+        http://vger.kernel.org/vger-lists.html</div><div class='add'>+</div><div class='add'>+ä¸�过，也有一些列表托管在别处；其中一些列表ä½�于lists.redhat.com。</div><div class='add'>+</div><div class='add'>+当然，内核开å�‘的核心邮件列表是linux-kernel。这个å��å�•æ˜¯ä¸€ä¸ªä»¤äººç”Ÿç•�的地方；</div><div class='add'>+æ¯�天的信æ�¯é‡�å�¯ä»¥è¾¾åˆ°500æ�¡ï¼Œå™ªéŸ³å¾ˆé«˜ï¼Œè°ˆè¯�技术性很强，å�‚与者并ä¸�总是表现出</div><div class='add'>+高度的礼貌。但是，没有其他地方å�¯ä»¥è®©å†…核开å�‘社区作为一个整体è�šé›†åœ¨ä¸€èµ·ï¼›</div><div class='add'>+é�¿å…�使用此列表的开å�‘人员将错过é‡�è¦�ä¿¡æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+有一些æ��示å�¯ä»¥å¸®åŠ©åœ¨linux-kernel生存：</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'>+</div><div class='add'>+- 当å“�应Linux内核电å­�邮件（或其他列表上的电å­�邮件）时，请为所有相关人员ä¿�ç•™</div><div class='add'>+  cc:header。如果没有强有力的ç�†ç”±ï¼ˆå¦‚明确的请求），则ä¸�应删除收件人。一定è¦�</div><div class='add'>+  ç¡®ä¿�ä½ è¦�回å¤�的人在cc:list中。这个惯例也使你ä¸�必在回å¤�邮件时明确è¦�求被抄é€�。</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'>+- 询问正确的邮件列表。linux-kernel å�¯èƒ½æ˜¯é€šç”¨çš„讨论点，但它ä¸�是从所有å­�系统</div><div class='add'>+  中寻找开å�‘人员的最佳场所。</div><div class='add'>+</div><div class='add'>+最å�Žä¸€ç‚¹â€”—找到正确的邮件列表——是开å�‘人员出错的常è§�地方。在Linux内核上æ��出与</div><div class='add'>+网络相关的问题的人几乎肯定会收到一个礼貌的建议，转而在netdev列表上æ��出，</div><div class='add'>+因为这是大多数网络开å�‘人员ç»�常出现的列表。还有其他列表å�¯ç”¨äºŽscsiã€�</div><div class='add'>+video4linuxã€�ideã€�filesystemç­‰å­�系统。查找邮件列表的最佳ä½�置是与内核æº�代ç �</div><div class='add'>+一起打包的MAINTAINERS文件。</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'>+但它也往往是昂贵的，而且没有增长ç»�验丰富的内核开å�‘人员储备。考虑到时间的</div><div class='add'>+投入，å�¯ä»¥è®©å†…部开å�‘人员加快Linux内核的开å�‘速度。花这个时间å�¯ä»¥è®©é›‡ä¸»æ‹¥æœ‰</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'>+</div><div class='add'>+Andrew Morton 为有抱负的内核开å�‘人员æ��供了这个建议</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+        所有内核åˆ�学者的No.1项目肯定是“确ä¿�内核在所有的机器上，你å�¯ä»¥è§¦æ‘¸</div><div class='add'>+        到的，始终è¿�行良好" 通常这样å�šçš„方法是与其他人一起解决问题（这</div><div class='add'>+        å�¯èƒ½éœ€è¦�å�šæŒ�ï¼�）但这很好——这是内核开å�‘的一部分</div><div class='add'>+</div><div class='add'>+(http://lwn.net/articles/283982/)</div><div class='add'>+</div><div class='add'>+在没有明显问题需è¦�解决的情况下，建议开å�‘人员查看当å‰�的回归和开放å¼�错误列表.</div><div class='add'>+解决需è¦�ä¿®å¤�的问题没有任何缺点；通过解决这些问题，开å�‘人员将获得处ç�†è¿‡ç¨‹çš„</div><div class='add'>+ç»�验，å�Œæ—¶ä¸Žå¼€å�‘社区的其他人建立尊é‡�。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/3.Early-stage.rst b/Documentation/translations/zh_CN/process/3.Early-stage.rst<br/>new file mode 100644<br/>index 000000000000..b8676aec6005<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/3.Early-stage.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/3.Early-stage.rst</a></div><div class='hunk'>@@ -0,0 +1,161 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/3.Early-stage.rst &lt;development_early_stage&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_early_stage:</div><div class='add'>+</div><div class='add'>+早期规划</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+当考虑一个Linux内核开å�‘项目时，很å�¯èƒ½ä¼šç›´æŽ¥è·³è¿›åŽ»å¼€å§‹ç¼–ç �。然而，与任何é‡�è¦�</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'>+将实际问题与建议的解决方案混淆是很有诱惑力的，这å�¯èƒ½ä¼šå¯¼è‡´å›°éš¾ã€‚</div><div class='add'>+</div><div class='add'>+举个例å­�：几年å‰�，使用Linux音频的开å�‘人员寻求一ç§�方法æ�¥è¿�行应用程åº�，而ä¸�å› </div><div class='add'>+系统延迟过大而导致退出或其他工件。他们得到的解决方案是一个内核模å�—，旨在连</div><div class='add'>+接到Linux安全模å�—（LSM）框架中；这个模å�—å�¯ä»¥é…�置为å…�许特定的应用程åº�访问</div><div class='add'>+实时调度程åº�。这个模å�—被实现并å�‘é€�到Linux内核邮件列表，在那里它立å�³é�‡åˆ°é—®é¢˜ã€‚</div><div class='add'>+</div><div class='add'>+对于音频开å�‘人员æ�¥è¯´ï¼Œè¿™ä¸ªå®‰å…¨æ¨¡å�—足以解决他们当å‰�的问题。但是，对于更广泛的</div><div class='add'>+内核社区æ�¥è¯´ï¼Œè¿™è¢«è§†ä¸ºå¯¹LSM框架的滥用（LSM框架并ä¸�打算授予他们原本ä¸�具备的</div><div class='add'>+进程特æ�ƒï¼‰ï¼Œå¹¶å¯¹ç³»ç»Ÿç¨³å®šæ€§é€ æˆ�风险。他们首选的解决方案包括短期的通过rlimit</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'>+        有很多é�žå¸¸å¥½çš„Linux内核开å�‘人员，但他们往往会被一群傲慢的傻瓜所压倒。</div><div class='add'>+        试图å�‘这些人传达用户需求是浪费时间。他们太“è�ªæ˜Žâ€�了，根本å�¬ä¸�到少数人</div><div class='add'>+        çš„è¯�。</div><div class='add'>+</div><div class='add'>+（http://lwn.net/articles/131776/）</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'>+</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'>+--------</div><div class='add'>+</div><div class='add'>+在计划内核开å�‘项目时，在开始实施之å‰�与社区进行讨论是很有æ„�义的。早期沟通å�¯ä»¥</div><div class='add'>+通过多ç§�æ–¹å¼�节çœ�时间和麻烦：</div><div class='add'>+</div><div class='add'>+ - 很å�¯èƒ½é—®é¢˜æ˜¯ç”±å†…核以您ä¸�ç�†è§£çš„æ–¹å¼�解决的。Linux内核很大，具有许多ä¸�明显</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'>+ - 其他开å�‘人员完全有å�¯èƒ½è€ƒè™‘过这个问题；他们å�¯èƒ½æœ‰æ›´å¥½çš„解决方案的想法，并且</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'>+ - 设计并实现了å�•å¤„ç�†å™¨ç³»ç»Ÿçš„DeviceScape网络栈。å�ªæœ‰ä½¿å…¶é€‚å�ˆäºŽå¤šå¤„ç�†å™¨ç³»ç»Ÿï¼Œ</div><div class='add'>+   æ‰�能将其å�ˆå¹¶åˆ°ä¸»çº¿ä¸­ã€‚在代ç �中改装é”�等等是一项困难的任务；因此，这段代ç �</div><div class='add'>+   （现在称为mac80211）的å�ˆå¹¶è¢«æŽ¨è¿Ÿäº†ä¸€å¹´å¤šã€‚</div><div class='add'>+</div><div class='add'>+ - Reiser4文件系统包å�«è®¸å¤šåŠŸèƒ½ï¼Œæ ¸å¿ƒå†…核开å�‘人员认为这些功能应该在虚拟文件</div><div class='add'>+   系统层中实现。它还包括一些特性，这些特性在ä¸�将系统暴露于用户引起的死é”�çš„</div><div class='add'>+   情况下是ä¸�容易实现的。这些问题的最新å�‘现——以å�Šå¯¹å…¶ä¸­ä¸€äº›é—®é¢˜çš„æ‹’ç»�——已ç»�</div><div class='add'>+   导致Reiser4远离了主线内核。</div><div class='add'>+</div><div class='add'>+ - Apparmor安全模å�—以被认为ä¸�安全和ä¸�å�¯é� çš„æ–¹å¼�使用内部虚拟文件系统数æ�®ç»“构。</div><div class='add'>+   è¿™ç§�担心（包括其他）使Apparmor多年ä¸�在主线上。</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'>+的邮件列表和正确的维护者。对于邮件列表，最好的方法是在维护者(MAINTAINERS)文件</div><div class='add'>+中查找è¦�å�‘布的相关ä½�置。如果有一个å�ˆé€‚çš„å­�系统列表，那么å�‘布它通常比在Linux</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'>+git（尤其是“git-logâ€�）查看感兴趣的å­�系统中当å‰�活动的用户。看看è°�在写补ä¸�，</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'>+	.../scripts/get_maintainer.pl</div><div class='add'>+</div><div class='add'>+当给定“-fâ€�选项时，此脚本将返回给定文件或目录的当å‰�维护者。如果在命令行上传递</div><div class='add'>+了一个补ä¸�，它将列出å�¯èƒ½æŽ¥æ”¶è¡¥ä¸�副本的维护人员。有许多选项å�¯ä»¥è°ƒèŠ‚</div><div class='add'>+get_maintainer.plæ�œç´¢ç»´æŠ¤è€…的难易程度；请å°�心使用更具攻击性的选项，因为最终</div><div class='add'>+å�¯èƒ½ä¼šåŒ…括对您正在修改的代ç �没有真正兴趣的开å�‘人员。</div><div class='add'>+</div><div class='add'>+如果所有其他方法都失败了，那么与Andrew Morton交谈å�¯ä»¥æˆ�为一ç§�有效的方法æ�¥è·Ÿè¸ª</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'>+</div><div class='add'>+在这个阶段å�¯èƒ½å�‘生的一件令人沮丧的事情ä¸�是敌对的å��应，而是很少或根本没有</div><div class='add'>+å��应。å�¯æ‚²çš„事实是：（1）内核开å�‘人员往往很忙；（2）ä¸�缺少有å®�伟计划和很少</div><div class='add'>+代ç �（甚至代ç �å‰�景）支æŒ�他们的人；（3）没有人有义务审查或评论别人å�‘表的</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'>+-----------------------</div><div class='add'>+</div><div class='add'>+如果您的工作是在公å�¸çŽ¯å¢ƒä¸­å®Œæˆ�的，就åƒ�大多数Linux内核工作一样，显然，在您将</div><div class='add'>+å…¬å�¸çš„计划或代ç �å�‘布到公共邮件列表之å‰�，必须获得适当授æ�ƒçš„ç»�ç�†çš„许å�¯ã€‚å�‘布</div><div class='add'>+ä¸�确定是å�¦å…¼å®¹GPL的代ç �å�¯èƒ½æ˜¯æœ‰ç‰¹åˆ«é—®é¢˜çš„；公å�¸çš„管ç�†å±‚和法律人员越早能够就</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'>+严é‡�的集æˆ�问题。对于没有这ç§�内部专业知识的公å�¸ï¼Œæœ€å¥½çš„选择往往是è�˜è¯·å¤–部</div><div class='add'>+å¼€å�‘商根æ�®ä¿�密å��议审查计划。Linux基金会è¿�行了一个NDA程åº�，旨在帮助解决这ç§�</div><div class='add'>+情况；</div><div class='add'>+</div><div class='add'>+    http://www.linuxfoundation.org/en/NDA_program</div><div class='add'>+</div><div class='add'>+è¿™ç§�审查通常足以é�¿å…�以å�Žå‡ºçŽ°ä¸¥é‡�问题，而无需公开披露项目。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/4.Coding.rst b/Documentation/translations/zh_CN/process/4.Coding.rst<br/>new file mode 100644<br/>index 000000000000..5301e9d55255<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/4.Coding.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/4.Coding.rst</a></div><div class='hunk'>@@ -0,0 +1,290 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/4.Coding.rst &lt;development_coding&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_coding:</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'>+本节将检查编ç �过程。我们将从内核开å�‘人员出错的几ç§�æ–¹å¼�开始。然å�Žé‡�点将转移</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'>+内核长期以æ�¥éƒ½æœ‰ä¸€ç§�标准的编ç �风格，如</div><div class='add'>+:ref:`Documentation/translations/zh_CN/process/coding-style.rst &lt;cn_codingstyle&gt;`</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'>+</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'>+å�Œæ—¶ä¿®å¤�它的样å¼�是很自然的，但是编ç �æ ·å¼�的更改ä¸�应该仅为了更改而进行。</div><div class='add'>+</div><div class='add'>+ç¼–ç �风格的文档也ä¸�应该被视为ç»�对的法律，这是永远ä¸�会被è¿�å��的。如果有一个很好</div><div class='add'>+çš„ç�†ç”±å��对这ç§�æ ·å¼�（例如，如果拆分为适å�ˆ80列é™�制的行，那么它的å�¯è¯»æ€§å°±ä¼šå¤§å¤§</div><div class='add'>+é™�低），那么就这样å�šã€‚</div><div class='add'>+</div><div class='add'>+请注æ„�，您还å�¯ä»¥ä½¿ç”¨ ``clang-format`` 工具æ�¥å¸®åŠ©æ‚¨å¤„ç�†è¿™äº›è§„则，自动é‡�æ–°æ ¼å¼�</div><div class='add'>+化部分代ç �，并查看完整的文件，以å�‘现编ç �æ ·å¼�错误ã€�拼写错误和å�¯èƒ½çš„改进。它还</div><div class='add'>+å�¯ä»¥æ–¹ä¾¿åœ°è¿›è¡ŒæŽ’åº�，包括对é½�å�˜é‡�/å®�ã€�回æµ�文本和其他类似任务。有关详细信æ�¯ï¼Œè¯·</div><div class='add'>+å�‚阅文件 :ref:`Documentation/process/clang-format.rst &lt;clangformat&gt;`</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'>+</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'>+欢迎。这样的层使代ç �å�˜å¾—模糊，å�¯èƒ½ä¼šé€ æˆ�性能æ�Ÿå¤±ï¼›å®ƒä»¬ä¸�属于Linux内核。</div><div class='add'>+</div><div class='add'>+å�¦ä¸€æ–¹é�¢ï¼Œå¦‚果您å�‘现自己从å�¦ä¸€ä¸ªå†…æ ¸å­�系统å¤�制了大é‡�的代ç �，那么现在是时候</div><div class='add'>+问一下，事实上，将这些代ç �中的一些æ��å�–到å�•ç‹¬çš„库中，或者在更高的层次上实现</div><div class='add'>+这些功能是å�¦æœ‰æ„�义。在整个内核中å¤�制相å�Œçš„代ç �没有价值。</div><div class='add'>+</div><div class='add'>+#ifdef 和预处ç�†</div><div class='add'>+***************</div><div class='add'>+</div><div class='add'>+C预处ç�†å™¨ä¼¼ä¹Žç»™ä¸€äº›C程åº�员带æ�¥äº†å¼ºå¤§çš„诱惑，他们认为它是一ç§�有效地将大é‡�ç�µ</div><div class='add'>+活性编ç �到æº�文件中的方法。但是预处ç�†å™¨ä¸�是C，大é‡�使用它会导致代ç �对其他人æ�¥</div><div class='add'>+说更难读å�–，对编译器æ�¥è¯´æ›´éš¾æ£€æŸ¥æ­£ç¡®æ€§ã€‚大é‡�的预处ç�†å™¨å‡ ä¹Žæ€»æ˜¯ä»£ç �需è¦�一些</div><div class='add'>+清ç�†å·¥ä½œçš„标志。</div><div class='add'>+</div><div class='add'>+使用ifdefçš„æ�¡ä»¶ç¼–译实际上是一个强大的功能，它在内核中使用。但是很少有人希望</div><div class='add'>+看到代ç �被大é‡�地撒上ifdefå�—。作为一般规则，ifdef的使用应尽å�¯èƒ½é™�制在头文件</div><div class='add'>+中。有æ�¡ä»¶ç¼–译的代ç �å�¯ä»¥é™�制函数，如果代ç �ä¸�存在，这些函数就会å�˜æˆ�空的。然å�Ž</div><div class='add'>+编译器将悄悄地优化对空函数的调用。结果是代ç �更加清晰，更容易ç�†è§£ã€‚</div><div class='add'>+</div><div class='add'>+C预处ç�†å™¨å®�存在许多å�±é™©ï¼ŒåŒ…括å�¯èƒ½å¯¹å…·æœ‰å‰¯ä½œç”¨ä¸”没有类型安全性的表达å¼�进行多</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'>+点都被å¤�制，所以它们最终会增加编译内核的大å°�。å��过æ�¥ï¼Œè¿™ä¼šå¯¹å¤„ç�†å™¨çš„内存缓存</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'>+因此，“inlineâ€�关键字的自由放置å�¯èƒ½ä¸�仅仅是过度的，它也å�¯èƒ½æ˜¯æ— å…³çš„。</div><div class='add'>+</div><div class='add'>+é”�</div><div class='add'>+**</div><div class='add'>+</div><div class='add'>+2006å¹´5月，“deviceescapeâ€�网络堆栈在GPL下å�‘布，并被纳入主线内核。这是一个å�—</div><div class='add'>+欢迎的消æ�¯ï¼›å¯¹Linux中无线网络的支æŒ�å……å…¶é‡�被认为是ä¸�å�ˆæ ¼çš„，而deviceescape</div><div class='add'>+堆栈æ��供了修å¤�è¿™ç§�情况的承诺。然而，直到2007å¹´6月（2.6.22），这段代ç �æ‰�真</div><div class='add'>+正进入主线。å�‘生了什么？</div><div class='add'>+</div><div class='add'>+这段代ç �显示了许多闭门造车的迹象。但一个特别大的问题是，它并ä¸�是设计用于多</div><div class='add'>+处ç�†å™¨ç³»ç»Ÿã€‚在å�ˆå¹¶è¿™ä¸ªç½‘络堆栈（现在称为mac80211）之å‰�，需è¦�对其进行一个é”�</div><div class='add'>+方案的改造。</div><div class='add'>+</div><div class='add'>+曾ç»�，Linux内核代ç �å�¯ä»¥åœ¨ä¸�考虑多处ç�†å™¨ç³»ç»Ÿæ‰€å¸¦æ�¥çš„并å�‘性问题的情况下进行</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'>+</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'>+人们常常争论，如果回归让更多人å�¯ä»¥å·¥ä½œï¼Œè¿œè¶…过产生问题，那么回归是å�ˆç�†çš„。</div><div class='add'>+如果它破å��的一个系统å�´ä¸ºå��个系统带æ�¥æ–°çš„功能，为什么ä¸�进行更改呢？2007å¹´7月，</div><div class='add'>+Linus对这个问题给出了最佳答案:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+        所以我们ä¸�会通过引入新问题æ�¥ä¿®å¤�错误。那样的谎言很疯狂，没有人知é�“</div><div class='add'>+        你是å�¦çœŸçš„有进展。是å‰�进两步，å�Žé€€ä¸€æ­¥ï¼Œè¿˜æ˜¯å�‘å‰�一步，å�‘å�Žä¸¤æ­¥ï¼Ÿ</div><div class='add'>+</div><div class='add'>+（http://lwn.net/articles/243460/）</div><div class='add'>+</div><div class='add'>+一ç§�特别ä¸�å�—欢迎的回归类型是用户空间ABI的任何å�˜åŒ–。一旦接å�£è¢«å¯¼å‡ºåˆ°ç”¨æˆ·ç©ºé—´ï¼Œ</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'>+至少目å‰�，编写无错误代ç �ä»�然是我们中很少人能达到的ç�†æƒ³çŠ¶æ€�。ä¸�过，我们希望å�š</div><div class='add'>+的是，在代ç �进入主线内核之å‰�，尽å�¯èƒ½å¤šåœ°æ�•èŽ·å¹¶ä¿®å¤�这些错误。为此，内核开å�‘人</div><div class='add'>+员已ç»�组装了一系列令人å�°è±¡æ·±åˆ»çš„工具，å�¯ä»¥è‡ªåŠ¨æ�•èŽ·å�„ç§�å�„样的模糊问题。计算机</div><div class='add'>+å�‘现的任何问题都是一个以å�Žä¸�会困扰用户的问题，因此，å�ªè¦�有å�¯èƒ½ï¼Œå°±åº”该使用</div><div class='add'>+自动化工具。</div><div class='add'>+</div><div class='add'>+第一步å�ªæ˜¯æ³¨æ„�编译器产生的警告。当代版本的GCCå�¯ä»¥æ£€æµ‹ï¼ˆå¹¶è­¦å‘Šï¼‰å¤§é‡�潜在错误。</div><div class='add'>+通常，这些警告都指å�‘真正的问题。æ��交以供审阅的代ç �通常ä¸�会产生任何编译器警告。</div><div class='add'>+在消除警告时，注æ„�了解真正的原因，并尽é‡�é�¿å…�“修å¤�â€�，使警告消失而ä¸�解决其原因。</div><div class='add'>+</div><div class='add'>+请注æ„�，并é�žæ‰€æœ‰ç¼–译器警告都默认å�¯ç”¨ã€‚使用“make EXTRA_CFLAGS=-Wâ€�构建内核以</div><div class='add'>+获得完整集å�ˆã€‚</div><div class='add'>+</div><div class='add'>+内核æ��供了几个é…�置选项，å�¯ä»¥æ‰“开调试功能；大多数é…�置选项ä½�于“kernel hackingâ€�</div><div class='add'>+å­�è�œå�•ä¸­ã€‚对于任何用于开å�‘或测试目的的内核，都应该å�¯ç”¨å…¶ä¸­å‡ ä¸ªé€‰é¡¹ã€‚特别是，</div><div class='add'>+您应该打开：</div><div class='add'>+</div><div class='add'>+ - å�¯ç”¨ ENABLE_MUST_CHECK and FRAME_WARN 以获得一组é¢�外的警告，以解决使用ä¸�</div><div class='add'>+   推è��使用的接å�£æˆ–忽略函数的é‡�è¦�返回值等问题。这些警告生æˆ�的输出å�¯èƒ½æ˜¯å†—é•¿</div><div class='add'>+   的，但您ä¸�必担心æ�¥è‡ªå†…核其他部分的警告。</div><div class='add'>+</div><div class='add'>+ - DEBUG_OBJECTS 将添加代ç �，以跟踪内核创建的å�„ç§�对象的生存期，并在出现问题时</div><div class='add'>+   å�‘出警告。如果è¦�添加创建（和导出）自己的å¤�æ�‚对象的å­�系统，请考虑添加对对象</div><div class='add'>+   调试基础结构的支æŒ�。</div><div class='add'>+</div><div class='add'>+ - DEBUG_SLAB å�¯ä»¥å�‘现å�„ç§�内存分é…�和使用错误；它应该用于大多数开å�‘内核。</div><div class='add'>+</div><div class='add'>+ - DEBUG_SPINLOCK, DEBUG_ATOMIC_SLEEP and DEBUG_MUTEXES 会å�‘现许多常è§�çš„</div><div class='add'>+   é”�定错误.</div><div class='add'>+</div><div class='add'>+还有很多其他调试选项，其中一些将在下é�¢è®¨è®ºã€‚其中一些具有显著的性能影å“�，ä¸�应</div><div class='add'>+一直使用。但是，在学习å�¯ç”¨é€‰é¡¹ä¸ŠèŠ±è´¹çš„一些时间å�¯èƒ½ä¼šåœ¨çŸ­æœŸå†…得到多次回报。</div><div class='add'>+</div><div class='add'>+其中一个较é‡�的调试工具是é”�定检查器或“lockdepâ€�。该工具将跟踪系统中æ¯�个é”�</div><div class='add'>+（spinlock或mutex）的获å�–和释放ã€�获å�–é”�的相对顺åº�ã€�当å‰�中断环境等等。然å�Žï¼Œ</div><div class='add'>+它å�¯ä»¥ç¡®ä¿�总是以相å�Œçš„顺åº�获å�–é”�，相å�Œçš„中断å�‡è®¾é€‚用于所有情况，等等。æ�¢å�¥è¯�</div><div class='add'>+说，lockdepå�¯ä»¥æ‰¾åˆ°è®¸å¤šåœºæ™¯ï¼Œåœ¨è¿™äº›åœºæ™¯ä¸­ï¼Œç³»ç»Ÿå¾ˆå°‘会死é”�。在部署的系统中，</div><div class='add'>+è¿™ç§�问题å�¯èƒ½ä¼šå¾ˆç—›è‹¦ï¼ˆå¯¹äºŽå¼€å�‘人员和用户而言）；LockDepå…�许æ��å‰�以自动方å¼�</div><div class='add'>+å�‘现问题。具有任何类型的é�žæ™®é€šé”�定的代ç �在æ��交包å�«å‰�应在å�¯ç”¨lockdep的情况</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'>+å�¯ç”¨æ•…障注入å�Žï¼Œå†…存分é…�çš„å�¯é…�置百分比将失败；这些失败å�¯ä»¥é™�制在特定的代ç �</div><div class='add'>+范围内。在å�¯ç”¨äº†æ•…障注入的情况下è¿�行，程åº�员å�¯ä»¥çœ‹åˆ°å½“情况æ�¶åŒ–时代ç �如何å“�</div><div class='add'>+应。有关如何使用此工具的详细信æ�¯ï¼Œè¯·å�‚阅</div><div class='add'>+Documentation/fault-injection/fault-injection.txt。</div><div class='add'>+</div><div class='add'>+使用“sparseâ€�é�™æ€�分æž�工具å�¯ä»¥å�‘现其他类型的错误。对于sparse，å�¯ä»¥è­¦å‘Šç¨‹åº�员</div><div class='add'>+用户空间和内核空间地å�€ä¹‹é—´çš„æ··æ·†ã€�big endianå’Œsmall endianæ•°é‡�çš„æ··å�ˆã€�在需</div><div class='add'>+è¦�一组ä½�标志的地方传递整数值等等。sparseå¿…é¡»å�•ç‹¬å®‰è£…(如果您的分å�‘æœ�务器没</div><div class='add'>+有将其打包，å�¯ä»¥åœ¨ https://sparse.wiki.kernel.org/index.php/Main_page)找到,</div><div class='add'>+然å�Žå�¯ä»¥é€šè¿‡åœ¨make命令中添加“C=1â€�在代ç �上è¿�行它。</div><div class='add'>+</div><div class='add'>+“Coccinelleâ€�工具 :ref:`http://coccinelle.lip6.fr/ &lt;devtools_coccinelle&gt;`</div><div class='add'>+能够å�‘现å�„ç§�潜在的编ç �问题；它还å�¯ä»¥ä¸ºè¿™äº›é—®é¢˜æ��出修å¤�方案。在</div><div class='add'>+scripts/coccinelle目录下已ç»�打包了相当多的内核“语义补ä¸�â€�ï¼›è¿�è¡Œ</div><div class='add'>+“make coccicheckâ€�å°†è¿�行这些语义补ä¸�并报告å�‘现的任何问题。有关详细信æ�¯ï¼Œè¯·å�‚阅</div><div class='add'>+:ref:`Documentation/dev-tools/coccinelle.rst &lt;devtools_coccinelle&gt;`</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+其他类型的å�¯ç§»æ¤�性错误最好通过为其他体系结构编译代ç �æ�¥å�‘现。如果没有S/390系统</div><div class='add'>+或Blackfinå¼€å�‘æ�¿ï¼Œæ‚¨ä»�然å�¯ä»¥æ‰§è¡Œç¼–译步骤。å�¯ä»¥åœ¨ä»¥ä¸‹ä½�置找到一组用于x86系统的</div><div class='add'>+大型交å�‰ç¼–译器：</div><div class='add'>+</div><div class='add'>+        http://www.kernel.org/pub/tools/crosstool/</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'>+下，文件的添加已基本上æˆ�为强制性的。</div><div class='add'>+</div><div class='add'>+任何补ä¸�的第一个文档是其关è�”çš„å�˜æ›´æ—¥å¿—。日志æ�¡ç›®åº”该æ��述正在解决的问题ã€�解决</div><div class='add'>+方案的形å¼�ã€�处ç�†è¡¥ä¸�的人员ã€�对性能的任何相关影å“�，以å�Šç�†è§£è¡¥ä¸�å�¯èƒ½éœ€è¦�的任何</div><div class='add'>+其他内容。确ä¿�changelog说明了为什么补ä¸�值得应用；大é‡�å¼€å�‘人员未能æ��供这些信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+任何添加新用户空间界é�¢çš„代ç �（包括新的sysfs或/proc文件）都应该包å�«è¯¥ç•Œé�¢çš„</div><div class='add'>+文档，该文档使用户空间开å�‘人员能够知é�“他们在使用什么。请å�‚阅</div><div class='add'>+Documentation/abi/readme，了解如何格å¼�化此文档以å�Šéœ€è¦�æ��供哪些信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+文件 :ref:`Documentation/admin-guide/kernel-parameters.rst &lt;kernelparameters&gt;`</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'>+许多å­�系统的内部APIä¿¡æ�¯é€šè¿‡ä¸“门格å¼�化的注释进行记录；这些注释å�¯ä»¥é€šè¿‡</div><div class='add'>+“kernel-docâ€�脚本以多ç§�æ–¹å¼�æ��å�–和格å¼�化。如果您在具有kerneldoc注释的å­�系统中</div><div class='add'>+工作，则应该维护它们，并根æ�®éœ€è¦�为外部å�¯ç”¨çš„功能添加它们。å�³ä½¿åœ¨æ²¡æœ‰å¦‚此记录</div><div class='add'>+的领域中，为将æ�¥æ·»åŠ kerneldoc注释也没有å��处；实际上，这对于刚开始开å�‘内核的人</div><div class='add'>+æ�¥è¯´æ˜¯ä¸€ä¸ªæœ‰ç”¨çš„活动。这些注释的格å¼�以å�Šå¦‚何创建kerneldoc模æ�¿çš„一些信æ�¯å�¯ä»¥åœ¨</div><div class='add'>+:ref:`Documentation/doc-guide/ &lt;doc_guide&gt;` 上找到。</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'>+“清ç�†â€�的事情都需è¦�一个注释æ�¥è¯´æ˜Žä¸ºä»€ä¹ˆè¦�这样å�šã€‚等等。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+内部API更改</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+内核æ��供给用户空间的二进制接å�£ä¸�能被破å��，除é�žåœ¨æœ€ä¸¥é‡�的情况下。相å��，内核的</div><div class='add'>+内部编程接å�£æ˜¯é«˜åº¦æµ�动的，当需è¦�æ—¶å�¯ä»¥æ›´æ”¹ã€‚如果你å�‘现自己ä¸�å¾—ä¸�处ç�†ä¸€ä¸ªå†…æ ¸</div><div class='add'>+API，或者仅仅因为它ä¸�满足你的需求而ä¸�使用特定的功能，这å�¯èƒ½æ˜¯API需è¦�改å�˜çš„一</div><div class='add'>+个标志。作为内核开å�‘人员，您有æ�ƒè¿›è¡Œæ­¤ç±»æ›´æ”¹ã€‚</div><div class='add'>+</div><div class='add'>+当然, å�¯ä»¥è¿›è¡ŒAPI更改，但它们必须是å�ˆç�†çš„。因此，任何进行内部API更改的补ä¸�都</div><div class='add'>+应该附带一个关于更改内容和必è¦�原因的æ��述。这ç§�å�˜åŒ–也应该分解æˆ�一个å�•ç‹¬çš„è¡¥ä¸�，</div><div class='add'>+而ä¸�是埋在一个更大的补ä¸�中。</div><div class='add'>+</div><div class='add'>+å�¦ä¸€ä¸ªè¦�点是，更改内部APIçš„å¼€å�‘人员通常è¦�负责修å¤�内核树中被更改破å��的任何代ç �。</div><div class='add'>+对于一个广泛使用的函数，这个è�Œè´£å�¯ä»¥å¯¼è‡´æˆ�百上å�ƒçš„å�˜åŒ–，其中许多å�˜åŒ–å�¯èƒ½ä¸Žå…¶ä»–</div><div class='add'>+å¼€å�‘人员正在å�šçš„工作相冲çª�。ä¸�用说，这å�¯èƒ½æ˜¯ä¸€é¡¹å¤§å·¥ä½œï¼Œæ‰€ä»¥æœ€å¥½ç¡®ä¿�ç�†ç”±æ˜¯</div><div class='add'>+å�¯é� çš„。请注æ„�，coccinelle工具å�¯ä»¥å¸®åŠ©è¿›è¡Œå¹¿æ³›çš„API更改。</div><div class='add'>+</div><div class='add'>+在进行ä¸�兼容的API更改时，应尽å�¯èƒ½ç¡®ä¿�编译器æ�•èŽ·æœªæ›´æ–°çš„代ç �。这将帮助您确ä¿�找</div><div class='add'>+到该接å�£çš„树内用处。它还将警告开å�‘人员树外代ç �存在他们需è¦�å“�应的更改。支æŒ�树外</div><div class='add'>+代ç �ä¸�是内核开å�‘人员需è¦�担心的事情，但是我们也ä¸�必使树外开å�‘人员的生活有ä¸�å¿…è¦�</div><div class='add'>+的困难。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/5.Posting.rst b/Documentation/translations/zh_CN/process/5.Posting.rst<br/>new file mode 100644<br/>index 000000000000..41aba21ff050<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/5.Posting.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/5.Posting.rst</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/5.Posting.rst &lt;development_posting&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_posting:</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'>+:ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`,</div><div class='add'>+:ref:`Documentation/process/submitting-drivers.rst  &lt;submittingdrivers&gt;`</div><div class='add'>+å’Œ :ref:`Documentation/translations/zh_CN/process/submit-checklist.rst &lt;cn_submitchecklist&gt;`.</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'>+å��馈就å�¯ä»¥èŽ·å¾—很多好处。因此，您应该考虑å�‘布正在进行的工作，甚至使Gitæ ‘</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'>+</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'>+   å½±å“�（或好处）；结果的摘è¦�应该包å�«åœ¨è¡¥ä¸�中。</div><div class='add'>+</div><div class='add'>+ - ç¡®ä¿�您有æ�ƒå�‘布代ç �。如果这项工作是为雇主完æˆ�的，雇主对这项工作具有所有æ�ƒï¼Œ</div><div class='add'>+   并且必须å�Œæ„�æ ¹æ�®GPL对其进行放行。</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'>+</div><div class='add'>+必须针对内核的特定版本准备补ä¸�。作为一般规则，补ä¸�程åº�应该基于Linusçš„Git树中</div><div class='add'>+的当å‰�主线。当以主线为基础时，从一个众所周知的å�‘布点开始——一个稳定的或RCçš„</div><div class='add'>+å�‘布——而ä¸�是在一个主线分支任æ„�点。</div><div class='add'>+</div><div class='add'>+但是，å�¯èƒ½éœ€è¦�针对-mmã€�linux-next或å­�系统树生æˆ�版本，以便于更广泛的测试和审查。</div><div class='add'>+æ ¹æ�®è¡¥ä¸�的区域以å�Šå…¶ä»–地方的情况，针对这些其他树建立补ä¸�å�¯èƒ½éœ€è¦�大é‡�的工作æ�¥</div><div class='add'>+解决冲çª�和处ç�†API更改。</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'>+</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'>+</div><div class='add'>+ - æ¯�个补ä¸�都应该产生一个内核，它å�¯ä»¥æ­£ç¡®åœ°æž„建和è¿�行；如果补ä¸�系列在中间被</div><div class='add'>+   中断，那么结果应该ä»�然是一个工作的内核。补ä¸�系列的部分应用是使用</div><div class='add'>+   “git bisctâ€�工具查找回归的一个常è§�场景；如果结果是一个æ�Ÿå��的内核，那么对于</div><div class='add'>+   那些从事追踪问题的高尚工作的开å�‘人员和用户æ�¥è¯´ï¼Œå°†ä½¿ä»–们的生活更加艰难。</div><div class='add'>+</div><div class='add'>+ - ä¸�过，ä¸�è¦�过分。一ä½�å¼€å�‘人员曾ç»�将一组编辑内容作为500个å�•ç‹¬çš„è¡¥ä¸�å�‘布到一个</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'>+   è¡¥ä¸�，å�³ä½¿çœŸæ­£çš„bug在其他地方。å�ªè¦�有å�¯èƒ½ï¼Œæ·»åŠ æ–°ä»£ç �çš„è¡¥ä¸�程åº�应该立å�³</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'>+所以现在你有了一系列完美的补ä¸�å�¯ä»¥å�‘布，但是这项工作还没有完æˆ�。æ¯�个补ä¸�都</div><div class='add'>+需è¦�被格å¼�化æˆ�一æ�¡æ¶ˆæ�¯ï¼Œå®ƒå�¯ä»¥å¿«é€Ÿè€Œæ¸…晰地将其目的传达给世界其他地方。为此，</div><div class='add'>+æ¯�个补ä¸�将由以下部分组æˆ�：</div><div class='add'>+</div><div class='add'>+ - 命å��è¡¥ä¸�作者的å�¯é€‰â€œfromâ€�行。å�ªæœ‰å½“你通过电å­�邮件传递别人的补ä¸�时，这一行</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'>+	gpio: fix build on CONFIG_GPIO_SYSFS=n</div><div class='add'>+</div><div class='add'>+ - 一个空白行，å�Žé�¢æ˜¯è¡¥ä¸�内容的详细æ��述。这个æ��è¿°å�¯ä»¥æ˜¯å¿…需的；它应该说明补ä¸�</div><div class='add'>+   的作用以å�Šä¸ºä»€ä¹ˆå®ƒåº”该应用于内核。</div><div class='add'>+</div><div class='add'>+ - 一个或多个标记行，至少有一个由补ä¸�作者的：signed-off-by ç­¾å��。签å��将在下é�¢</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'>+bugæ�œå¯»äººå‘˜æƒ³çŸ¥é�“è¡¥ä¸�是å�¦è´Ÿè´£ä»–们正在追查的问题，想知é�“内核如何å�˜åŒ–的用户。</div><div class='add'>+等等。一个好的å�˜æ›´æ—¥å¿—以最直接和最简æ´�çš„æ–¹å¼�å�‘所有这些人传达所需的信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+为此，总结行应该æ��è¿°å�˜æ›´çš„å½±å“�和动机，以å�Šåœ¨ä¸€è¡Œçº¦æ�Ÿæ�¡ä»¶ä¸‹å�¯èƒ½å�‘生的å�˜åŒ–。</div><div class='add'>+然å�Žï¼Œè¯¦ç»†çš„æ��è¿°å�¯ä»¥è¯¦è¿°è¿™äº›ä¸»é¢˜ï¼Œå¹¶æ��供任何需è¦�的附加信æ�¯ã€‚如果补ä¸�ä¿®å¤�了</div><div class='add'>+一个bug，请引用引入该bugçš„commit（如果å�¯èƒ½ï¼Œè¯·åœ¨å¼•ç”¨commitsæ—¶å�Œæ—¶æ��ä¾›commit id</div><div class='add'>+和标题）。如果æŸ�个问题与特定的日志或编译器输出相关è�”，请包å�«è¯¥è¾“出以帮助其他</div><div class='add'>+人æ�œç´¢å�Œä¸€é—®é¢˜çš„解决方案。如果更改是为了支æŒ�以å�Žè¡¥ä¸�中的其他更改，那么就这么</div><div class='add'>+说。如果更改了内部API，请详细说明这些更改以å�Šå…¶ä»–å¼€å�‘人员应该如何å“�应。一般</div><div class='add'>+æ�¥è¯´ï¼Œä½ è¶Šèƒ½æŠŠè‡ªå·±æ”¾åœ¨æ¯�个阅读你的changelog的人的ä½�置上，changelog（和内核</div><div class='add'>+作为一个整体）就越好。</div><div class='add'>+</div><div class='add'>+ä¸�用说，å�˜æ›´æ—¥å¿—应该是将å�˜æ›´æ��交到修订控制系统时使用的文本。接下æ�¥æ˜¯ï¼š</div><div class='add'>+</div><div class='add'>+ - è¡¥ä¸�本身，采用统一的（“-uâ€�）补ä¸�æ ¼å¼�。将“-pâ€�选项用于diff将使函数å��与更改</div><div class='add'>+   相关è�”，从而使结果补ä¸�更容易被其他人读å�–。</div><div class='add'>+</div><div class='add'>+您应该é�¿å…�在补ä¸�中包括对ä¸�相关文件（例如，由构建过程生æˆ�的文件或编辑器</div><div class='add'>+备份文件）的更改。文档目录中的文件“dontdiffâ€�在这方é�¢æœ‰å¸®åŠ©ï¼›ä½¿ç”¨â€œ-Xâ€�选项将</div><div class='add'>+其传递给diff。</div><div class='add'>+</div><div class='add'>+上é�¢æ��到的标签用于æ��è¿°å�„ç§�å¼€å�‘人员如何与这个补ä¸�çš„å¼€å�‘相关è�”。</div><div class='add'>+:ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+文档中对它们进行了详细æ��述；下é�¢æ˜¯ä¸€ä¸ªç®€çŸ­çš„总结。æ¯�一行的格å¼�如下：</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	tag: Full Name &lt;email address&gt;  optional-other-stuff</div><div class='add'>+</div><div class='add'>+常用的标签有：</div><div class='add'>+</div><div class='add'>+ - Signed-off-by: 这是一个开å�‘人员的è¯�明，他或她有æ�ƒæ��交补ä¸�以包å�«åˆ°å†…核中。</div><div class='add'>+   这是开å�‘æ�¥æº�认è¯�å��议，其全文å�¯åœ¨</div><div class='add'>+   :ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+   中找到，如果没有适当的签字，则ä¸�能å�ˆå¹¶åˆ°ä¸»çº¿ä¸­ã€‚</div><div class='add'>+</div><div class='add'>+ - Co-developed-by: 声明补ä¸�是由多个开å�‘人员共å�Œåˆ›å»ºçš„；当几个人在一个补ä¸�上</div><div class='add'>+   工作时，它用于将属性赋予共å�Œä½œè€…（除了 From: 所赋予的作者之外）。因为</div><div class='add'>+   Co-developed-by: 表示作者身份，所以æ¯�个共å�Œå¼€å�‘人, 必须紧跟在相关å�ˆä½œä½œè€…</div><div class='add'>+   çš„ç­¾å��之å�Žã€‚具体内容和示例å�¯ä»¥åœ¨ä»¥ä¸‹æ–‡ä»¶ä¸­æ‰¾åˆ°</div><div class='add'>+   :ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+</div><div class='add'>+ - Acked-by: 表示å�¦ä¸€ä¸ªå¼€å�‘人员（通常是相关代ç �的维护人员）å�Œæ„�è¡¥ä¸�适å�ˆåŒ…å�«</div><div class='add'>+   在内核中。</div><div class='add'>+</div><div class='add'>+ - Tested-by: 声明指定的人已ç»�测试了补ä¸�并å�‘现它å�¯ä»¥å·¥ä½œã€‚</div><div class='add'>+</div><div class='add'>+ - Reviewed-by: 指定的开å�‘人员已ç»�审查了补ä¸�的正确性；有关详细信æ�¯ï¼Œè¯·å�‚阅</div><div class='add'>+   :ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+</div><div class='add'>+ - Reported-by: 指定报告此补ä¸�ä¿®å¤�的问题的用户；此标记用于æ��供感谢。</div><div class='add'>+</div><div class='add'>+ - Cc：指定的人收到了补ä¸�的副本，并有机会对此å�‘表评论。</div><div class='add'>+</div><div class='add'>+在补ä¸�中添加标签时è¦�å°�心：å�ªæœ‰cc:æ‰�适å�ˆåœ¨æ²¡æœ‰æŒ‡å®šäººå‘˜æ˜Žç¡®è®¸å�¯çš„情况下添加。</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'>+   任何疑问，把补ä¸�寄给你自己，让你自己相信它是完好无æ�Ÿçš„。</div><div class='add'>+</div><div class='add'>+   :ref:`Documentation/translations/zh_CN/process/email-clients.rst &lt;cn_email_clients&gt;`</div><div class='add'>+   æ��供了一些有用的æ��示，å�¯ä»¥è®©ç‰¹å®šçš„邮件客户机工作以å�‘é€�è¡¥ä¸�。</div><div class='add'>+</div><div class='add'>+ - 你确定你的补ä¸�没有愚蠢的错误å�—？您应该始终通过scripts/checkpatch.plè¿�è¡Œ</div><div class='add'>+   è¡¥ä¸�程åº�，并解决它æ��出的投诉。请记ä½�，checkpatch.pl虽然是大é‡�æ€�考内核</div><div class='add'>+   è¡¥ä¸�应该是什么样å­�的体现，但它并ä¸�比您è�ªæ˜Žã€‚如果修å¤�checkpatch.pl投诉会</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'>+</div><div class='add'>+ - å�—å½±å“�å­�系统的维护人员。如å‰�所述，维护人员文件是查找这些人员的第一个地方。</div><div class='add'>+</div><div class='add'>+ - 其他在å�Œä¸€é¢†åŸŸå·¥ä½œçš„å¼€å�‘人员，尤其是那些现在å�¯èƒ½åœ¨é‚£é‡Œå·¥ä½œçš„å¼€å�‘人员。使用</div><div class='add'>+   git查看还有è°�修改了您正在处ç�†çš„文件，这很有帮助。</div><div class='add'>+</div><div class='add'>+ - 如果您对错误报告或功能请求å�šå‡ºå“�应，也å�¯ä»¥æŠ„é€�原始å�‘é€�人。</div><div class='add'>+</div><div class='add'>+ - 将副本å�‘é€�到相关邮件列表，或者，如果没有其他应用，则å�‘é€�到Linux内核列表。</div><div class='add'>+</div><div class='add'>+ - 如果您正在修å¤�一个bug，请考虑该修å¤�是å�¦åº”进入下一个稳定更新。如果是这样，</div><div class='add'>+   stable@vger.kernel.org 应该得到补ä¸�的副本。å�¦å¤–，在补ä¸�本身的标签中添加</div><div class='add'>+   一个“cc:stable@vger.kernel.orgâ€�；这将使稳定团队在修å¤�进入主线时收到通知。</div><div class='add'>+</div><div class='add'>+当为一个补ä¸�选择接收者时，最好知é�“你认为è°�最终会接å�—这个补ä¸�并将其å�ˆå¹¶ã€‚虽然</div><div class='add'>+å�¯ä»¥å°†è¡¥ä¸�直接å�‘é€�ç»™LinusTorvalds并让他å�ˆå¹¶ï¼Œä½†é€šå¸¸æƒ…况下ä¸�会这样å�šã€‚Linus</div><div class='add'>+很忙，并且有å­�系统维护人员负责监视内核的特定部分。通常您会希望维护人员å�ˆå¹¶æ‚¨</div><div class='add'>+çš„è¡¥ä¸�。如果没有明显的维护人员，Andrew Morton通常是最å�Žçš„è¡¥ä¸�目标。</div><div class='add'>+</div><div class='add'>+è¡¥ä¸�需è¦�好的主题行。补ä¸�程åº�行的规范格å¼�如下：</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	[PATCH nn/mm] subsys: one-line description of the patch</div><div class='add'>+</div><div class='add'>+其中“nnâ€�是补ä¸�çš„åº�å�·ï¼Œâ€œmmâ€�是系列中补ä¸�的总数，“subsysâ€�是å�—å½±å“�å­�系统的å��称。</div><div class='add'>+显然，一个å�•ç‹¬çš„è¡¥ä¸�å�¯ä»¥çœ�ç•¥nn/mm。</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'>+在接收端都连接在一起。åƒ�gitå’Œcoilt这样的工具有命令，å�¯ä»¥é€šè¿‡é€‚当的线程å�‘é€�</div><div class='add'>+一组补ä¸�。但是，如果您有一个长系列，并且正在使用git，请远离–chain reply-to</div><div class='add'>+选项，以é�¿å…�创建异常深的嵌套。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/6.Followthrough.rst b/Documentation/translations/zh_CN/process/6.Followthrough.rst<br/>new file mode 100644<br/>index 000000000000..f509e077e1cb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/6.Followthrough.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/6.Followthrough.rst</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/6.Followthrough.rst &lt;development_followthrough&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_followthrough:</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'>+</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'>+任何æ„�义上的补ä¸�都会导致其他开å�‘人员在审查代ç �æ—¶å�‘表大é‡�评论。对于许多开å�‘</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'>+   的调整到大é‡�çš„é‡�写——都æ�¥è‡ªäºŽå¯¹Linuxçš„ç�†è§£ï¼Œå�³ä»ŽçŽ°åœ¨èµ·å��å¹´å�Žï¼ŒLinuxä»�将在</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'>+ - å�Œæ ·ï¼Œä»£ç �审查人员也ä¸�想以牺牲你雇主的利益为代价æ�¥å®£ä¼ ä»–们雇主的议程。</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'>+</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'>+Andrew Morton建议，æ¯�一æ�¡ä¸�会导致代ç �更改的评论都应该导致é¢�外的代ç �注释；</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'>+如果您帮助他们开始è¿�行，当他们é‡�新访问您的代ç �时，他们的心情会更好。</div><div class='add'>+</div><div class='add'>+如果你已ç»�试ç�€å�šæ­£ç¡®çš„事情，但事情ä»�然没有进展呢？大多数技术上的分歧都å�¯ä»¥</div><div class='add'>+通过讨论æ�¥è§£å†³ï¼Œä½†æœ‰æ—¶äººä»¬å�ªéœ€è¦�å�šå‡ºå†³å®šã€‚如果你真的认为这个决定对你ä¸�利，</div><div class='add'>+ä½ å�¯ä»¥è¯•ç�€å�‘更高的æ�ƒåŠ›ä¸Šè¯‰ã€‚在这篇文章中，更高的æ�ƒåŠ›å€¾å�‘于Andrew Morton。</div><div class='add'>+Andrew在内核开å�‘社区中å�—i很大的尊é‡�；他ç»�常为似乎被ç»�望地阻塞事情清障。</div><div class='add'>+尽管如此，对Andrew的呼å��ä¸�应轻而易举，也ä¸�应在所有其他替代方案都被探索之å‰�</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'>+个å�ˆå¹¶çª—å�£çš„è¡¥ä¸�，å�¦ä¸€æ£µæ ‘用于长期工作。</div><div class='add'>+</div><div class='add'>+对于应用于没有明显å­�系统树（例如内存管ç�†ä¿®è¡¥ç¨‹åº�）的区域的修补程åº�，默认树</div><div class='add'>+通常以-mm结尾。影å“�多个å­�系统的补ä¸�也å�¯ä»¥æœ€ç»ˆé€šè¿‡-mm树。</div><div class='add'>+</div><div class='add'>+包å�«åœ¨å­�系统树中å�¯ä»¥æ��高补ä¸�çš„å�¯è§�性。现在，使用该树的其他开å�‘人员将默认获</div><div class='add'>+å¾—è¡¥ä¸�。å­�系统树通常也为Linuxæ��供支æŒ�，使其内容对整个开å�‘社区å�¯è§�。在这一点</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'>+事情，但è¦�计算您的ç¦�祉：在Linux下一棵树出现之å‰�，这些冲çª�通常å�ªåœ¨å�ˆå¹¶çª—å�£</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'>+è¦�抵制这ç§�诱惑，您ä»�然需è¦�对有问题或建议的开å�‘人员作出å“�应。</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'>+所有工作之外，如果由于未能修å¤�回归而å�–消补ä¸�，很å�¯èƒ½ä¼šä½¿å°†æ�¥çš„工作更难å�ˆå¹¶ã€‚</div><div class='add'>+</div><div class='add'>+在处ç�†å®Œä»»ä½•å›žå½’之å�Žï¼Œå�¯èƒ½è¿˜æœ‰å…¶ä»–普通的bug需è¦�处ç�†ã€‚稳定期是修å¤�这些错误并</div><div class='add'>+ç¡®ä¿�代ç �在主线内核版本中的首次å�‘布尽å�¯èƒ½å�¯é� çš„最好机会。所以，请回答错误</div><div class='add'>+报告，并尽å�¯èƒ½è§£å†³é—®é¢˜ã€‚这就是稳定期的目的；一旦解决了旧补ä¸�的任何问题，就</div><div class='add'>+å�¯ä»¥å¼€å§‹åˆ›å»ºé…·çš„æ–°è¡¥ä¸�。</div><div class='add'>+</div><div class='add'>+别忘了，还有其他里程碑也å�¯èƒ½ä¼šåˆ›å»ºbug报告：下一个主线稳定版本，当著å��çš„å�‘è¡Œ</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'>+有一天，你å�¯ä»¥æ‰“开你的邮件客户端，看到有人给你寄了一个代ç �è¡¥ä¸�。毕竟，这是</div><div class='add'>+让您的代ç �公开存在的好处之一。如果您å�Œæ„�这个补ä¸�，您å�¯ä»¥å°†å®ƒè½¬å�‘ç»™å­�系统</div><div class='add'>+维护人员（确ä¿�包å�«ä¸€ä¸ªæ­£ç¡®çš„From:行，这样属性是正确的，并添加一个您自己</div><div class='add'>+的签准），或者回å¤�一个Acked-by，让原始å�‘é€�者å�‘上å�‘é€�它。</div><div class='add'>+</div><div class='add'>+如果您ä¸�å�Œæ„�è¡¥ä¸�，请å�‘é€�一个礼貌的回å¤�，解释原因。如果å�¯èƒ½çš„è¯�，告诉作者需è¦�</div><div class='add'>+å�šå“ªäº›æ›´æ”¹æ‰�能让您接å�—è¡¥ä¸�。对于代ç �的编写者和维护者所å��对的å�ˆå¹¶è¡¥ä¸�，存在ç�€</div><div class='add'>+一定的阻力，但仅此而已。如果你被认为ä¸�å¿…è¦�的阻ç¢�了好的工作，那么这些补ä¸�最</div><div class='add'>+终会ç»�过你身边并进入主线。在Linux内核中，没有人对任何代ç �拥有ç»�对的å�¦å†³æ�ƒã€‚</div><div class='add'>+除了Linus。</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='head'>diff --git a/Documentation/translations/zh_CN/process/7.AdvancedTopics.rst b/Documentation/translations/zh_CN/process/7.AdvancedTopics.rst<br/>new file mode 100644<br/>index 000000000000..956815edbd18<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/7.AdvancedTopics.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/7.AdvancedTopics.rst</a></div><div class='hunk'>@@ -0,0 +1,124 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/7.AdvancedTopics.rst &lt;development_advancedtopics&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_advancedtopics:</div><div class='add'>+</div><div class='add'>+高级主题</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+现在，希望您能够掌æ�¡å¼€å�‘æµ�程的工作方å¼�。然而，还有更多的东西è¦�å­¦ï¼�本节将介ç»�</div><div class='add'>+一些主题，这些主题对希望æˆ�为Linux内核开å�‘过程常规部分的开å�‘人员有帮助。</div><div class='add'>+</div><div class='add'>+使用Git管ç�†è¡¥ä¸�</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+内核使用分布å¼�版本控制始于2002å¹´åˆ�，当时Linus首次开始使用专有的Bitkeeper应用</div><div class='add'>+程åº�。虽然bitkeeper存在争议，但它所体现的软件版本管ç�†æ–¹æ³•å�´è‚¯å®šä¸�是。分布å¼�</div><div class='add'>+版本控制å�¯ä»¥ç«‹å�³åŠ é€Ÿå†…核开å�‘项目。在当å‰�的时代，有几ç§�å…�费的比特ä¿�æŒ�器替代å“�。</div><div class='add'>+无论好å��，内核项目都将Git作为其选择的工具。</div><div class='add'>+</div><div class='add'>+使用Git管ç�†è¡¥ä¸�å�¯ä»¥ä½¿å¼€å�‘人员的生活更加轻æ�¾ï¼Œå°¤å…¶æ˜¯éš�ç�€è¡¥ä¸�æ•°é‡�的增加。Git</div><div class='add'>+也有其粗糙的边缘和一定的å�±é™©ï¼Œå®ƒæ˜¯ä¸€ä¸ªå¹´è½»å’Œå¼ºå¤§çš„工具，ä»�然在其开å�‘人员完善</div><div class='add'>+中。本文档ä¸�会试图教会读者如何使用git；这会是个巨长的文档。相å��，这里的é‡�点</div><div class='add'>+将是Git如何特别适å�ˆå†…核开å�‘过程。想è¦�加快Gitçš„å¼€å�‘人员å�¯ä»¥åœ¨ä»¥ä¸‹ç½‘站上找到</div><div class='add'>+更多信æ�¯ï¼š</div><div class='add'>+</div><div class='add'>+	http://git-scm.com/</div><div class='add'>+</div><div class='add'>+	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html</div><div class='add'>+</div><div class='add'>+在å°�试使用它使补ä¸�å�¯ä¾›å…¶ä»–人使用之å‰�，第一è¦�务是阅读上述站点，对Git的工作</div><div class='add'>+æ–¹å¼�有一个扎实的了解。使用Gitçš„å¼€å�‘人员应该能够获得主线存储库的副本，探索</div><div class='add'>+修订历å�²ï¼Œæ��交对树的更改，使用分支等。了解Git用于é‡�写历å�²çš„工具（如Rebase）</div><div class='add'>+也很有用。Git有自己的术语和概念；Git的新用户应该了解refsã€�远程分支ã€�索引ã€�</div><div class='add'>+å¿«è¿›å�ˆå¹¶ã€�推拉ã€�分离头等。一开始å�¯èƒ½æœ‰ç‚¹å�“人，但这些概念ä¸�难通过一点学习æ�¥</div><div class='add'>+ç�†è§£ã€‚</div><div class='add'>+</div><div class='add'>+使用git生æˆ�通过电å­�邮件æ��交的补ä¸�是æ��高速度的一个很好的练习。</div><div class='add'>+</div><div class='add'>+当您准备好开始安装Git树供其他人查看时，您当然需è¦�一个å�¯ä»¥ä»Žä¸­æ��å�–çš„æœ�务器。</div><div class='add'>+如果您有一个å�¯ä»¥è®¿é—®Internet的系统，那么使用git守护进程设置这样的æœ�务器相</div><div class='add'>+对简å�•ã€‚å�¦åˆ™ï¼Œå…�费的公共托管网站（例如github）开始出现在网络上。æˆ�熟的开å�‘</div><div class='add'>+人员å�¯ä»¥åœ¨kernel.org上获得一个å¸�户，但这些å¸�户并ä¸�容易找到；有关更多信æ�¯ï¼Œ</div><div class='add'>+请å�‚阅 http://kernel.org/faq/</div><div class='add'>+</div><div class='add'>+正常的Git工作æµ�程涉å�Šåˆ°è®¸å¤šåˆ†æ”¯çš„使用。æ¯�一æ�¡å¼€å�‘线都å�¯ä»¥åˆ†ä¸ºå�•ç‹¬çš„“主题</div><div class='add'>+分支â€�，并独立维护。Git的分支机构很便宜，没有ç�†ç”±ä¸�å…�费使用它们。而且，在</div><div class='add'>+任何情况下，您都ä¸�应该在任何您打算让其他人从中å�—益的分支中进行开å�‘。应该</div><div class='add'>+å°�心地创建公开å�¯ç”¨çš„分支；当它们处于完整的形å¼�并准备好è¿�行时(而ä¸�是之å‰�），</div><div class='add'>+å�ˆå¹¶å¼€å�‘分支的补ä¸�。</div><div class='add'>+</div><div class='add'>+Gitæ��供了一些强大的工具，å�¯ä»¥è®©æ‚¨é‡�写开å�‘历å�²ã€‚一个ä¸�方便的补ä¸�（比如说，</div><div class='add'>+一个打破二分法的补ä¸�，或者有其他一些明显的缺陷）å�¯ä»¥åœ¨é€‚当的ä½�置修å¤�，或者</div><div class='add'>+完全从历å�²ä¸­æ¶ˆå¤±ã€‚一个补ä¸�系列å�¯ä»¥è¢«é‡�写，就好åƒ�它是在今天的主线之上写的</div><div class='add'>+一样，å�³ä½¿ä½ å·²ç»�花了几个月的时间在写它。å�¯ä»¥é€�明地将更改从一个分支转移到å�¦</div><div class='add'>+一个分支。等等。明智地使用git修改历å�²çš„能力å�¯ä»¥å¸®åŠ©åˆ›å»ºé—®é¢˜æ›´å°‘的干净补ä¸�集。</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'>+因此，一旦将一组更改推é€�到公开å�¯ç”¨çš„æœ�务器上，就ä¸�应该é‡�写这些更改。如果您</div><div class='add'>+å°�试强制进行ä¸�会导致快进å�ˆå¹¶ï¼ˆå�³ä¸�共享å�Œä¸€åŽ†å�²è®°å½•çš„更改）的更改，Gitå°†å°�</div><div class='add'>+试强制执行此规则。å�¯ä»¥é‡�写此检查，有时å�¯èƒ½éœ€è¦�é‡�写导出的树。在树之间移动å�˜</div><div class='add'>+更集以é�¿å…�Linux-next中的冲çª�就是一个例å­�。但这ç§�行为应该是罕è§�的。这就是为</div><div class='add'>+什么开å�‘应该在ç§�有分支中进行（必è¦�æ—¶å�¯ä»¥é‡�写）并且å�ªæœ‰åœ¨å…¬å…±åˆ†æ”¯å¤„于å�ˆç�†çš„</div><div class='add'>+高级状æ€�æ—¶æ‰�转移到公共分支中的原因之一。</div><div class='add'>+</div><div class='add'>+当主线（或其他一组å�˜æ›´æ‰€åŸºäºŽçš„树）å‰�进时，很容易与该树å�ˆå¹¶ä»¥ä¿�æŒ�领先地ä½�。</div><div class='add'>+对于一个ç§�有的分支，rebasing å�¯èƒ½æ˜¯ä¸€ä¸ªå¾ˆå®¹æ˜“跟上å�¦ä¸€æ£µæ ‘的方法，但是一旦</div><div class='add'>+一棵树被导出到全世界，rebasingå°±ä¸�是一个选项。一旦å�‘生这ç§�情况，就必须进行</div><div class='add'>+完全å�ˆå¹¶ï¼ˆmerge）。å�ˆå¹¶æœ‰æ—¶æ˜¯å¾ˆæœ‰æ„�义的，但是过于频ç¹�çš„å�ˆå¹¶ä¼šä¸�å¿…è¦�地扰乱</div><div class='add'>+历å�²ã€‚在这ç§�情况下，建议的技术是ä¸�ç»�常å�ˆå¹¶ï¼Œé€šå¸¸å�ªåœ¨ç‰¹å®šçš„å�‘布点（如主线-rc</div><div class='add'>+å�‘布）å�ˆå¹¶ã€‚如果您对特定的更改感到紧张，则å�¯ä»¥å§‹ç»ˆåœ¨ç§�有分支中执行测试å�ˆå¹¶ã€‚</div><div class='add'>+在这ç§�情况下，git rerere 工具很有用；它记ä½�å�ˆå¹¶å†²çª�是如何解决的，这样您就</div><div class='add'>+ä¸�å¿…é‡�å¤�相å�Œçš„工作。</div><div class='add'>+</div><div class='add'>+关于Git这样的工具的一个最大的å��å¤�抱怨是：补ä¸�从一个存储库到å�¦ä¸€ä¸ªå­˜å‚¨åº“çš„</div><div class='add'>+大é‡�移动使得很容易陷入错误建议的å�˜æ›´ä¸­ï¼Œè¿™äº›å�˜æ›´é�¿å¼€å®¡æŸ¥é›·è¾¾è¿›å…¥ä¸»çº¿ã€‚当内</div><div class='add'>+核开å�‘人员看到这ç§�情况å�‘生时，他们往往会感到ä¸�高兴；在Git树上放置未查看或</div><div class='add'>+主题外的补ä¸�å�¯èƒ½ä¼šå½±å“�您将æ�¥èŽ·å�–树的能力。引用Linus:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+        ä½ å�¯ä»¥ç»™æˆ‘å�‘è¡¥ä¸�，但è¦�我从你哪里å�–一个Gitè¡¥ä¸�，我需è¦�知é�“你知é�“</div><div class='add'>+        你在å�šä»€ä¹ˆï¼Œæˆ‘需è¦�能够相信事情而ä¸�去检查æ¯�个个人改å�˜ã€‚</div><div class='add'>+</div><div class='add'>+（http://lwn.net/articles/224135/）。</div><div class='add'>+</div><div class='add'>+为了é�¿å…�è¿™ç§�情况，请确ä¿�给定分支中的所有补ä¸�都与相关主题紧密相关；“驱动程åº�</div><div class='add'>+ä¿®å¤�â€�分支ä¸�应更改核心内存管ç�†ä»£ç �。而且，最é‡�è¦�的是，ä¸�è¦�使用Gitæ ‘æ�¥ç»•è¿‡</div><div class='add'>+审查过程。ä¸�时的将树的摘è¦�å�‘布到相关的列表中，当时间å�ˆé€‚时，请求</div><div class='add'>+Linux-next 中包å�«è¯¥æ ‘。</div><div class='add'>+</div><div class='add'>+如果其他人开始å�‘é€�è¡¥ä¸�以包å�«åˆ°æ‚¨çš„树中，ä¸�è¦�忘记查看它们。还è¦�ç¡®ä¿�您维护正确</div><div class='add'>+的作者信æ�¯ï¼› ``git am`` 工具在这方é�¢å�šå¾—最好，但是如果它通过第三方转å�‘给您，</div><div class='add'>+您å�¯èƒ½éœ€è¦�在补ä¸�中添加“From：â€�行。</div><div class='add'>+</div><div class='add'>+请求pullæ“�作时，请务必æ��供所有相关信æ�¯ï¼šæ ‘çš„ä½�ç½®ã€�è¦�拉的分支以å�Šæ‹‰æ“�作将导致</div><div class='add'>+的更改。在这方é�¢ï¼Œgit request pull 命令é�žå¸¸æœ‰ç”¨ï¼›å®ƒå°†æŒ‰ç…§å…¶ä»–å¼€å�‘人员的预期</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'>+</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'>+然而，其他人会检查是å�¦å­˜åœ¨é”�定问题ã€�堆栈使用过度ã€�å�¯èƒ½çš„安全问题ã€�在其他</div><div class='add'>+地方å�‘现的代ç �é‡�å¤�ã€�足够的文档ã€�对性能的ä¸�利影å“�ã€�用户空间ABI更改等。所有</div><div class='add'>+类型的检查，如果它们导致更好的代ç �进入内核，都是å�—欢迎和值得的。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/8.Conclusion.rst b/Documentation/translations/zh_CN/process/8.Conclusion.rst<br/>new file mode 100644<br/>index 000000000000..2bbd76161e10<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/8.Conclusion.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/8.Conclusion.rst</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/8.Conclusion.rst &lt;development_conclusion&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_conclusion:</div><div class='add'>+</div><div class='add'>+更多信æ�¯</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+关于Linux内核开å�‘和相关主题的信æ�¯æ�¥æº�很多。首先是在内核æº�代ç �分å�‘中找到的</div><div class='add'>+文档目录。顶级 :ref:`Documentation/translations/zh_CN/process/howto.rst &lt;cn_process_howto&gt;`</div><div class='add'>+文件是一个é‡�è¦�的起点</div><div class='add'>+:ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+å’Œ :ref:`process/submitting-drivers.rst &lt;submittingdrivers&gt;`</div><div class='add'>+也是所有内核开å�‘人员都应该阅读的内容。许多内部内核API都是使用kerneldoc机制</div><div class='add'>+记录的；“make htmldocsâ€�或“make pdfdocsâ€�å�¯ç”¨äºŽä»¥HTML或PDFæ ¼å¼�生æˆ�这些文档（</div><div class='add'>+尽管æŸ�些å�‘行版æ��供的tex版本会é�‡åˆ°å†…部é™�制，无法正确处ç�†æ–‡æ¡£ï¼‰ã€‚</div><div class='add'>+</div><div class='add'>+ä¸�å�Œçš„网站在å�„个细节层次上讨论内核开å�‘。您的作者想谦虚地建议用 http://lwn.net/</div><div class='add'>+作为æ�¥æº�；有关许多特定内核主题的信æ�¯å�¯ä»¥é€šè¿‡ä»¥ä¸‹ç½‘å�€çš„lwn内核索引找到：</div><div class='add'>+</div><div class='add'>+        http://lwn.net/kernel/index/</div><div class='add'>+</div><div class='add'>+除此之外，内核开å�‘人员的一个å®�贵资æº�是：</div><div class='add'>+</div><div class='add'>+        http://kernelnewbies.org/</div><div class='add'>+</div><div class='add'>+当然，我们ä¸�应该忘记 http://kernel.org/ 这是内核å�‘布信æ�¯çš„最终ä½�置。</div><div class='add'>+</div><div class='add'>+关于内核开å�‘有很多书：</div><div class='add'>+</div><div class='add'>+        Linux设备驱动程åº�，第三版（Jonathan Corbetã€�Alessandro Rubiniå’ŒGreg Kroah Hartman）。</div><div class='add'>+        在线：http://lwn.net/kernel/ldd3/</div><div class='add'>+</div><div class='add'>+        Linux内核开å�‘（Robert Love）。</div><div class='add'>+</div><div class='add'>+        了解Linux内核（Daniel Bovetå’ŒMarco Cesati）。</div><div class='add'>+</div><div class='add'>+然而，所有这些书都有一个共å�Œçš„缺点：当它们上架时，它们往往有些过时，而且它们</div><div class='add'>+å·²ç»�上架一段时间了。ä¸�过，在那里还å�¯ä»¥æ‰¾åˆ°ç›¸å½“多的好信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+有关git的文档，请访问：</div><div class='add'>+</div><div class='add'>+        http://www.kernel.org/pub/software/scm/git/docs/</div><div class='add'>+</div><div class='add'>+        http://www.kernel.org/pub/software/scm/git/docs/user-manual.html</div><div class='add'>+</div><div class='add'>+结论</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+ç¥�贺所有通过这篇冗长的文件的人。希望它能够帮助您ç�†è§£Linux内核是如何开å�‘的，</div><div class='add'>+以å�Šæ‚¨å¦‚何å�‚与这个过程。</div><div class='add'>+</div><div class='add'>+最å�Žï¼Œé‡�è¦�的是å�‚与。任何开æº�软件项目都ä¸�超过其贡献者投入其中的总和。Linux内核</div><div class='add'>+çš„å�‘展速度和以å‰�一样快，因为它得到了大é‡�å¼€å�‘人员的帮助，他们都在努力使它å�˜å¾—</div><div class='add'>+更好。内核是一个主è¦�的例å­�，说明当æˆ�å�ƒä¸Šä¸‡çš„人为了一个共å�Œçš„目标一起工作时，</div><div class='add'>+å�¯ä»¥å�šäº›ä»€ä¹ˆã€‚</div><div class='add'>+</div><div class='add'>+ä¸�过，内核总是å�¯ä»¥ä»Žæ›´å¤§çš„å¼€å�‘人员基础中获益。总有更多的工作è¦�å�šã€‚但是，å�Œæ ·</div><div class='add'>+é‡�è¦�的是，Linux生æ€�系统中的大多数其他å�‚与者å�¯ä»¥é€šè¿‡ä¸ºå†…æ ¸å�šå‡ºè´¡çŒ®è€Œå�—益。使</div><div class='add'>+代ç �进入主线是æ��高代ç �è´¨é‡�ã€�é™�低维护和分å�‘æˆ�本ã€�æ��高对内核开å�‘æ–¹å�‘çš„å½±å“�程度</div><div class='add'>+等的关键。这是一ç§�人人都赢的局é�¢ã€‚踢开你的编辑，æ�¥åŠ å…¥æˆ‘们å�§ï¼Œä½ ä¼šé�žå¸¸å�—</div><div class='add'>+欢迎的。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst b/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst<br/>new file mode 100644<br/>index 000000000000..c323ce76e0cb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/code-of-conduct-interpretation.rst &lt;code_of_conduct_interpretation&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_code_of_conduct_interpretation:</div><div class='add'>+</div><div class='add'>+Linux内核贡献者契约行为准则解释</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+:ref:`cn_code_of_conduct` 准则是一个通用文档，旨在为几乎所有开æº�社区æ��供一套规则。</div><div class='add'>+æ¯�个开æº�社区都是独一无二的，Linux内核也ä¸�例外。因此，本文æ��述了Linux内核社区中</div><div class='add'>+如何解释它。我们也ä¸�希望这ç§�解释éš�ç�€æ—¶é—´çš„推移是é�™æ€�的，并将根æ�®éœ€è¦�进行调整。</div><div class='add'>+</div><div class='add'>+与开å�‘软件的“传统â€�方法相比，Linux内核开å�‘工作是一个é�žå¸¸ä¸ªäººåŒ–的过程。你的贡献</div><div class='add'>+和背å�Žçš„想法将被仔细审查，往往导致批判和批评。审查将几乎总是需è¦�改进，æ��æ–™æ‰�</div><div class='add'>+能包括在内核中。è¦�知é�“这是因为所有相关人员都希望看到Linux整体æˆ�功的最佳解决方</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'>+</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'>+他们活跃的社区的行为。这一责任由我们所有人承担，最终《行为准则》记录了最终的</div><div class='add'>+上诉路径，以防有关行为问题的问题悬而未决。</div><div class='add'>+</div><div class='add'>+维护人员应该愿æ„�在出现问题时æ��供帮助，并在需è¦�时与社区中的其他人å�ˆä½œã€‚如果您</div><div class='add'>+ä¸�确定如何处ç�†å‡ºçŽ°çš„情况，请ä¸�è¦�害怕è�”系技术咨询委员会（TAB）或其他维护人员。</div><div class='add'>+除é�žæ‚¨æ„¿æ„�，å�¦åˆ™ä¸�会将其视为è¿�规报告。如果您ä¸�确定是å�¦è¯¥è�”ç³»TAB 或任何其他维</div><div class='add'>+护人员，请è�”系我们的冲çª�调解人 Mishi Choudhary &lt;mishi@linux.com&gt;。</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'>+维护者的期望决定。</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'>+以å�„ç§�å½¢å¼�æ��供入门级节目，如 kernelnewbies.org 。</div><div class='add'>+</div><div class='add'>+范围</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+Linux内核社区主è¦�在一组公共电å­�邮件列表上进行交互，这些列表分布在由多个ä¸�å�Œ</div><div class='add'>+å…¬å�¸æˆ–个人控制的多个ä¸�å�Œæœ�务器上。所有这些列表都在内核æº�代ç �树中的</div><div class='add'>+MAINTAINERS 文件中定义。å�‘é€�到这些邮件列表的任何电å­�邮件都被视为包å�«åœ¨è¡Œä¸º</div><div class='add'>+准则中。</div><div class='add'>+</div><div class='add'>+使用 kernel.org bugzilla和其他å­�系统bugzilla 或bug跟踪工具的开å�‘人员应该é�µå¾ª</div><div class='add'>+行为准则的指导原则。Linux内核社区没有“官方â€�项目电å­�邮件地å�€æˆ–“官方â€�社交媒体</div><div class='add'>+地å�€ã€‚使用kernel.org电å­�邮件å¸�户执行的任何活动必须é�µå¾ªä¸ºkernel.orgå�‘布的行为</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'>+æ��交给内核的贡献应该使用适当的语言。在行为准则之å‰�å·²ç»�存在的内容现在ä¸�会被</div><div class='add'>+视为è¿�å��。然而，ä¸�适当的语言å�¯ä»¥è¢«è§†ä¸ºä¸€ä¸ªbug；如果任何相关方æ��交补ä¸�，</div><div class='add'>+这样的bug将被更快地修å¤�。当å‰�属于用户/内核API的一部分的表达å¼�，或者å��映已</div><div class='add'>+å�‘布标准或规范中使用的术语的表达å¼�，ä¸�被视为bug。</div><div class='add'>+</div><div class='add'>+执行</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+行为准则中列出的地å�€å±žäºŽè¡Œä¸ºå‡†åˆ™å§”员会。https://kernel.org/code-of-conduct.html</div><div class='add'>+列出了在任何给定时间接收这些电å­�邮件的确切æˆ�员。æˆ�员ä¸�能访问在加入委员会之å‰�</div><div class='add'>+或离开委员会之å�Žæ‰€å�šçš„报告。</div><div class='add'>+</div><div class='add'>+最åˆ�的行为准则委员会由TAB的志愿者以å�Šä½œä¸ºä¸­ç«‹ç¬¬ä¸‰æ–¹çš„专业调解人组æˆ�。委员会</div><div class='add'>+的首è¦�任务是建立文件化的æµ�程，并将其公开。</div><div class='add'>+</div><div class='add'>+如果报告人ä¸�希望将整个委员会纳入投诉或关切，å�¯ç›´æŽ¥è�”系委员会的任何æˆ�员，包括</div><div class='add'>+调解人。</div><div class='add'>+</div><div class='add'>+行为准则委员会根æ�®æµ�程审查案例（è§�上文），并根æ�®éœ€è¦�和适当与TABå��商，例如请求</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'>+我们希望在å�¯åŠ¨æœŸä¹‹å�Žä¸ºè¡Œä¸ºå‡†åˆ™å§”员会人员é…�备建立一个ä¸�å�Œçš„æµ�程。å�‘生此情况时，</div><div class='add'>+将使用该信æ�¯æ›´æ–°æ­¤æ–‡æ¡£ã€‚</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/code-of-conduct.rst b/Documentation/translations/zh_CN/process/code-of-conduct.rst<br/>new file mode 100644<br/>index 000000000000..99024df058e9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/code-of-conduct.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/code-of-conduct.rst</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/code-of-conduct.rst &lt;code_of_conduct&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_code_of_conduct:</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'>+与者，拥有一个无骚扰的体验，无论年龄ã€�体型ã€�残疾ã€�ç§�æ—�ã€�性别特å¾�ã€�性别认å�Œ</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'>+* 使用欢迎和包容的语言</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'>+* 煽动ã€�侮辱/è´¬æ�Ÿè¯„论以å�Šä¸ªäººæˆ–政治攻击</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'>+纠正措施。</div><div class='add'>+</div><div class='add'>+维护人员有æ�ƒå’Œè´£ä»»åˆ é™¤ã€�编辑或拒ç»�与本行为准则ä¸�一致的评论ã€�承诺ã€�代ç �ã€�</div><div class='add'>+wiki编辑ã€�问题和其他贡献，或暂时或永久ç¦�止任何贡献者从事他们认为ä¸�适当ã€�</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'>+进一步定义和澄清项目的表示。</div><div class='add'>+</div><div class='add'>+执行</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+如有滥用ã€�骚扰或其他ä¸�å�¯æŽ¥å�—的行为，å�¯è�”系行为准则委员会&lt;conduct@kernel.org&gt;。</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'>+本行为准则改编自《贡献者契约》，版本1.4，å�¯ä»Ž</div><div class='add'>+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html 获å�–。</div><div class='add'>+</div><div class='add'>+解释</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+有关Linux内核社区如何解释此文档，请å�‚阅 :ref:`cn_code_of_conduct_interpretation`</div><div class='head'>diff --git a/Documentation/translations/zh_CN/coding-style.rst b/Documentation/translations/zh_CN/process/coding-style.rst<br/>index 3cb09803e084..5479c591c2f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/coding-style.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/coding-style.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/coding-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/coding-style.rst</a></div><div class='hunk'>@@ -1,19 +1,10 @@</div><div class='del'>-Chinese translated version of Documentation/process/coding-style.rst</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please post to LKML directly.</div><div class='del'>-However, if you have problem communicating in English you can also ask the</div><div class='del'>-Chinese maintainer for help.  Contact the Chinese maintainer, if this</div><div class='del'>-translation is outdated or there is problem with translation.</div><div class='add'>+:Original: :ref:`Documentation/process/coding-style.rst &lt;codingstyle&gt;`</div><div class='ctx'> </div><div class='del'>-Chinese maintainer: Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='add'>+.. _cn_codingstyle:</div><div class='ctx'> </div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Documentation/process/coding-style.rst 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接å�‘信到LKML。如果你使用英文交æµ�有困难的è¯�，</div><div class='del'>-也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻译存在问题，请è�”系中文版</div><div class='del'>-维护者::</div><div class='add'>+译者::</div><div class='ctx'> </div><div class='ctx'>   中文版维护者： å¼ ä¹� Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='ctx'>   中文版翻译者： å¼ ä¹� Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='hunk'>@@ -23,10 +14,6 @@ Documentation/process/coding-style.rst 的中文翻译</div><div class='ctx'>                  Li Zefan &lt;lizf@cn.fujitsu.com&gt;</div><div class='ctx'>                  Wang Chen &lt;wangchen@cn.fujitsu.com&gt;</div><div class='ctx'> </div><div class='del'>-以下为正文</div><div class='del'>-</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='ctx'> Linux 内核代ç �风格</div><div class='ctx'> =========================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/development-process.rst b/Documentation/translations/zh_CN/process/development-process.rst<br/>new file mode 100644<br/>index 000000000000..30cffe66c075<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/development-process.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/development-process.rst</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/development-process.rst &lt;development_process_main&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_development_process_main:</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'>+.. toctree::</div><div class='add'>+   :numbered:</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   1.Intro</div><div class='add'>+   2.Process</div><div class='add'>+   3.Early-stage</div><div class='add'>+   4.Coding</div><div class='add'>+   5.Posting</div><div class='add'>+   6.Followthrough</div><div class='add'>+   7.AdvancedTopics</div><div class='add'>+   8.Conclusion</div><div class='add'>+</div><div class='add'>+本文档的目的是帮助开å�‘人员（å�Šå…¶ç»�ç�†ï¼‰ä»¥æœ€å°�的挫折感与开å�‘社区å�ˆä½œã€‚它试图记录这个社区如何以一ç§�ä¸�熟悉Linux内核开å�‘（或者实际上是自由软件开å�‘）的人å�¯ä»¥è®¿é—®çš„æ–¹å¼�工作。虽然这里有一些技术资料，但这是一个é�¢å�‘过程的讨论，ä¸�需è¦�深入了解内核编程就å�¯ä»¥ç�†è§£ã€‚</div><div class='head'>diff --git a/Documentation/translations/zh_CN/email-clients.txt b/Documentation/translations/zh_CN/process/email-clients.rst<br/>index ec31d97e8d0e..102023651118 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/email-clients.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/email-clients.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/email-clients.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/email-clients.rst</a></div><div class='hunk'>@@ -1,33 +1,34 @@</div><div class='del'>-Chinese translated version of Documentation/process/email-clients.rst</div><div class='add'>+.. _cn_email_clients:</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-Chinese maintainer: Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/email-clients.rst 的中文翻译</div><div class='add'>+:Original: :ref:`Documentation/process/email-clients.rst &lt;email_clients&gt;`</div><div class='ctx'> </div><div class='del'>-如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='del'>-交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='add'>+译者::</div><div class='ctx'> </div><div class='del'>-中文版维护者： è´¾å¨�å¨�  Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-中文版翻译者： è´¾å¨�å¨�  Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-中文版校译者： Yinglin Luan &lt;synmyth@gmail.com&gt;</div><div class='del'>-		Xiaochen Wang &lt;wangxiaochen0@gmail.com&gt;</div><div class='del'>-		yaxinsn &lt;yaxinsn@163.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='add'>+        中文版维护者： è´¾å¨�å¨�  Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+        中文版翻译者： è´¾å¨�å¨�  Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+                       时奎亮  Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+        中文版校译者： Yinglin Luan &lt;synmyth@gmail.com&gt;</div><div class='add'>+        	       Xiaochen Wang &lt;wangxiaochen0@gmail.com&gt;</div><div class='add'>+                       yaxinsn &lt;yaxinsn@163.com&gt;</div><div class='ctx'> </div><div class='ctx'> Linux邮件客户端é…�置信æ�¯</div><div class='del'>-======================================================================</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Git</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+现在大多数开å�‘人员使用 ``git send-email`` 而ä¸�是常规的电å­�邮件客户端。这方é�¢</div><div class='add'>+的手册é�žå¸¸å¥½ã€‚在接收端，维护人员使用 ``git am`` 加载补ä¸�。</div><div class='add'>+</div><div class='add'>+如果你是 ``git`` 新手，那么把你的第一个补ä¸�å�‘é€�给你自己。将其ä¿�存为包å�«æ‰€æœ‰</div><div class='add'>+标题的原始文本。è¿�è¡Œ ``git am raw_email.txt`` ，然å�Žä½¿ç”¨ ``git log`` 查看更</div><div class='add'>+改日志。如果工作正常，å†�将补ä¸�å�‘é€�到相应的邮件列表。</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 普通é…�ç½®</div><div class='del'>-----------------------------------------------------------------------</div><div class='add'>+--------</div><div class='ctx'> Linux内核补ä¸�是通过邮件被æ��交的，最好把补ä¸�作为邮件体的内嵌文本。有些维护者</div><div class='ctx'> 接收附件，但是附件的内容格å¼�应该是"text/plain"。然而，附件一般是ä¸�赞æˆ�的，</div><div class='ctx'> 因为这会使补ä¸�的引用部分在评论过程中å�˜çš„很困难。</div><div class='hunk'>@@ -56,7 +57,7 @@ Linux内核补ä¸�是通过邮件被æ��交的，最好把补ä¸�作为邮件体的</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 一些邮件客户端æ��示</div><div class='del'>-----------------------------------------------------------------------</div><div class='add'>+------------------</div><div class='ctx'> 这里给出一些详细的MUAé…�ç½®æ��示，å�¯ä»¥ç”¨äºŽç»™Linux内核å�‘é€�è¡¥ä¸�。这些并ä¸�æ„�味是</div><div class='ctx'> 所有的软件包é…�置总结。</div><div class='ctx'> </div><div class='hunk'>@@ -64,8 +65,8 @@ Linux内核补ä¸�是通过邮件被æ��交的，最好把补ä¸�作为邮件体的</div><div class='ctx'> TUI = 以文本为基础的用户接å�£</div><div class='ctx'> GUI = 图形界é�¢ç”¨æˆ·æŽ¥å�£</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Alpine (TUI)</div><div class='add'>+~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> é…�置选项：</div><div class='ctx'> 在"Sending Preferences"部分：</div><div class='hunk'>@@ -76,8 +77,8 @@ Alpine (TUI)</div><div class='ctx'> 当写邮件时，光标应该放在补ä¸�会出现的地方，然å�ŽæŒ‰ä¸‹CTRL-R组å�ˆé”®ï¼Œä½¿æŒ‡å®šçš„</div><div class='ctx'> è¡¥ä¸�文件嵌入到邮件中。</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Evolution (GUI)</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> 一些开å�‘者æˆ�功的使用它å�‘é€�è¡¥ä¸�</div><div class='ctx'> </div><div class='hunk'>@@ -89,8 +90,8 @@ Evolution (GUI)</div><div class='ctx'> </div><div class='ctx'> 你还å�¯ä»¥"diff -Nru old.c new.c | xclip"，选择Preformat，然å�Žä½¿ç”¨ä¸­é—´é”®è¿›è¡Œç²˜å¸–。</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Kmail (GUI)</div><div class='add'>+~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> 一些开å�‘者æˆ�功的使用它å�‘é€�è¡¥ä¸�。</div><div class='ctx'> </div><div class='hunk'>@@ -118,13 +119,13 @@ display"，这样内嵌附件更容易让读者看到。</div><div class='ctx'> 并且希望这将会被处ç�†ã€‚邮件是以å�ªé’ˆå¯¹æŸ�个用户å�¯è¯»å†™çš„æ�ƒé™�被ä¿�存的，所以如果你想把邮件å¤�制到其他地方，</div><div class='ctx'> ä½ ä¸�å¾—ä¸�把他们的æ�ƒé™�改为组或者整体å�¯è¯»ã€‚</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Lotus Notes (GUI)</div><div class='add'>+~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> ä¸�è¦�使用它。</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Mutt (TUI)</div><div class='add'>+~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> 很多Linuxå¼€å�‘人员使用mutt客户端，所以è¯�明它肯定工作的é�žå¸¸æ¼‚亮。</div><div class='ctx'> </div><div class='hunk'>@@ -142,12 +143,49 @@ Muttä¸�自带编辑器，所以ä¸�管你使用什么编辑器都ä¸�应该带有è</div><div class='ctx'> 如果想è¦�把补ä¸�作为内嵌文本。</div><div class='ctx'> (a)ttach工作的很好，ä¸�带有"set paste"。</div><div class='ctx'> </div><div class='add'>+ä½ å�¯ä»¥é€šè¿‡ ``git format-patch`` 生æˆ�è¡¥ä¸�，然å�Žç”¨ Muttå�‘é€�它们::</div><div class='add'>+</div><div class='add'>+        $ mutt -H 0001-some-bug-fix.patch</div><div class='add'>+</div><div class='ctx'> é…�置选项：</div><div class='ctx'> 它应该以默认设置的形å¼�工作。</div><div class='ctx'> 然而，把"send_charset"设置为"us-ascii::utf-8"也是一个ä¸�错的主æ„�。</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+Mutt 是高度å�¯é…�置的。 这里是个使用mutt通过 Gmail å�‘é€�çš„è¡¥ä¸�的最å°�é…�ç½®::</div><div class='add'>+</div><div class='add'>+  # .muttrc</div><div class='add'>+  # ================  IMAP ====================</div><div class='add'>+  set imap_user = 'yourusername@gmail.com'</div><div class='add'>+  set imap_pass = 'yourpassword'</div><div class='add'>+  set spoolfile = imaps://imap.gmail.com/INBOX</div><div class='add'>+  set folder = imaps://imap.gmail.com/</div><div class='add'>+  set record="imaps://imap.gmail.com/[Gmail]/Sent Mail"</div><div class='add'>+  set postponed="imaps://imap.gmail.com/[Gmail]/Drafts"</div><div class='add'>+  set mbox="imaps://imap.gmail.com/[Gmail]/All Mail"</div><div class='add'>+</div><div class='add'>+  # ================  SMTP  ====================</div><div class='add'>+  set smtp_url = "smtp://username@smtp.gmail.com:587/"</div><div class='add'>+  set smtp_pass = $imap_pass</div><div class='add'>+  set ssl_force_tls = yes # Require encrypted connection</div><div class='add'>+</div><div class='add'>+  # ================  Composition  ====================</div><div class='add'>+  set editor = `echo \$EDITOR`</div><div class='add'>+  set edit_headers = yes  # See the headers when editing</div><div class='add'>+  set charset = UTF-8     # value of $LANG; also fallback for send_charset</div><div class='add'>+  # Sender, email address, and sign-off line must match</div><div class='add'>+  unset use_domain        # because joe@localhost is just embarrassing</div><div class='add'>+  set realname = "YOUR NAME"</div><div class='add'>+  set from = "username@gmail.com"</div><div class='add'>+  set use_from = yes</div><div class='add'>+</div><div class='add'>+Mutt文档å�«æœ‰æ›´å¤šä¿¡æ�¯:</div><div class='add'>+</div><div class='add'>+    http://dev.mutt.org/trac/wiki/UseCases/Gmail</div><div class='add'>+</div><div class='add'>+    http://dev.mutt.org/doc/manual.html</div><div class='add'>+</div><div class='ctx'> Pine (TUI)</div><div class='add'>+~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> Pine过去有一些空格删å‡�问题，但是这些现在应该都被修å¤�了。</div><div class='ctx'> </div><div class='hunk'>@@ -158,8 +196,8 @@ Pine过去有一些空格删å‡�问题，但是这些现在应该都被修å¤�了ã</div><div class='ctx'> - "no-strip-whitespace-before-send"选项也是需è¦�的。</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Sylpheed (GUI)</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> - 内嵌文本å�¯ä»¥å¾ˆå¥½çš„工作（或者使用附件）。</div><div class='ctx'> - å…�许使用外部的编辑器。</div><div class='hunk'>@@ -168,8 +206,8 @@ Sylpheed (GUI)</div><div class='ctx'> - 在组æˆ�窗å�£ä¸­æœ‰ä¸€ä¸ªå¾ˆæœ‰ç”¨çš„ruler bar。</div><div class='ctx'> - 给地å�€æœ¬ä¸­æ·»åŠ åœ°å�€å°±ä¸�会正确的了解显示å��。</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Thunderbird (GUI)</div><div class='add'>+~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> 默认情况下，thunderbird很容易æ�Ÿå��文本，但是还有一些方法å�¯ä»¥å¼ºåˆ¶å®ƒå�˜å¾—更好。</div><div class='ctx'> </div><div class='hunk'>@@ -191,13 +229,13 @@ Thunderbird (GUI)</div><div class='ctx'>   $EDITORæ�¥è¯»å�–或者å�ˆå¹¶è¡¥ä¸�到文本中。è¦�实现它，å�¯ä»¥ä¸‹è½½å¹¶ä¸”安装这个扩展，然å�Žæ·»åŠ ä¸€ä¸ªä½¿ç”¨å®ƒçš„</div><div class='ctx'>   按键View-&gt;Toolbars-&gt;Customize...最å�Žå½“你书写信æ�¯çš„时候仅仅点击它就å�¯ä»¥äº†ã€‚</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> TkRat (GUI)</div><div class='add'>+~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> å�¯ä»¥ä½¿ç”¨å®ƒã€‚使用"Insert file..."或者外部的编辑器。</div><div class='ctx'> </div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> Gmail (Web GUI)</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> ä¸�è¦�使用它å�‘é€�è¡¥ä¸�。</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/zh_CN/HOWTO b/Documentation/translations/zh_CN/process/howto.rst<br/>index 7a00a8a4eb15..5b671178b17b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/HOWTO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/HOWTO</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/howto.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/howto.rst</a></div><div class='hunk'>@@ -1,32 +1,22 @@</div><div class='del'>-Chinese translated version of Documentation/process/howto.rst</div><div class='add'>+.. _cn_process_howto:</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-Chinese maintainer: Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/howto.rst 的中文翻译</div><div class='add'>+:Original: :ref:`Documentation/process/howto.rst &lt;process_howto&gt;`</div><div class='ctx'> </div><div class='del'>-如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='del'>-交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='add'>+译者::</div><div class='ctx'> </div><div class='del'>-英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-中文版维护者： æ�Žé˜³  Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>-中文版翻译者： æ�Žé˜³  Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>-中文版校译者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='del'>-               陈ç�¦  Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='del'>-               王è�ª  Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='add'>+    英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='add'>+    中文版维护者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+    中文版翻译者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+                   时奎亮 Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+    中文版校译者:</div><div class='add'>+                   钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+                   陈ç�¦  Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='add'>+                   王è�ª  Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='ctx'> </div><div class='ctx'> 如何å�‚与Linux内核开å�‘</div><div class='del'>----------------------</div><div class='add'>+=====================</div><div class='ctx'> </div><div class='ctx'> 这是一篇将如何å�‚与Linux内核开å�‘的相关问题一网打尽的终æž�秘笈。它将指导你</div><div class='ctx'> æˆ�为一å��Linux内核开å�‘者，并且学会如何å�ŒLinux内核开å�‘社区å�ˆä½œã€‚它尽å�¯èƒ½ä¸�</div><div class='hunk'>@@ -47,6 +37,7 @@ Linux内核大部分是由C语言写æˆ�的，一些体系结构相关的代ç �ç”</div><div class='ctx'> å�‚与内核开å�‘，你必须精通C语言。除é�žä½ æƒ³ä¸ºæŸ�个架构开å�‘底层代ç �，å�¦åˆ™ä½ å¹¶</div><div class='ctx'> ä¸�需è¦�了解（任何体系结构的）汇编语言。下é�¢åˆ—举的书ç±�虽然ä¸�能替代扎实的C</div><div class='ctx'> 语言教育和多年的开å�‘ç»�验，但如果需è¦�çš„è¯�，å�šä¸ºå�‚考还是ä¸�错的：</div><div class='add'>+</div><div class='ctx'>  - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='ctx'>    《C程åº�设计语言（第2版·新版）》（å¾�å®�æ–‡ æ�Žå¿— 译）[机械工业出版社]</div><div class='ctx'>  - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='hunk'>@@ -71,9 +62,11 @@ Linux内核使用GNU Cå’ŒGNU工具链开å�‘。虽然它é�µå¾ªISO C89标准，但</div><div class='ctx'> --------</div><div class='ctx'> </div><div class='ctx'> Linux内核æº�代ç �都是在GPL（通用公共许å�¯è¯�）的ä¿�护下å�‘布的。è¦�了解这ç§�许å�¯</div><div class='del'>-的细节请查看æº�代ç �主目录下的COPYING文件。如果你对它还有更深入问题请è�”ç³»</div><div class='del'>-律师，而ä¸�è¦�在Linux内核邮件组上æ��问。因为邮件组里的人并ä¸�是律师，ä¸�è¦�期</div><div class='del'>-望他们的è¯�有法律效力。</div><div class='add'>+的细节请查看æº�代ç �主目录下的COPYING文件。Linux内核许å�¯å‡†åˆ™å’Œå¦‚何使用</div><div class='add'>+`SPDX &lt;https://spdx.org/&gt;` 标志符说明在这个文件中</div><div class='add'>+:ref:`Documentation/translations/zh_CN/process/license-rules.rst &lt;cn_kernel_licensing&gt;`</div><div class='add'>+如果你对它还有更深入问题请è�”系律师，而ä¸�è¦�在Linux内核邮件组上æ��问。因为</div><div class='add'>+邮件组里的人并ä¸�是律师，ä¸�è¦�期望他们的è¯�有法律效力。</div><div class='ctx'> </div><div class='ctx'> 对于GPL的常è§�问题和解答，请访问以下链接：</div><div class='ctx'> 	http://www.gnu.org/licenses/gpl-faq.html</div><div class='hunk'>@@ -89,65 +82,75 @@ Linux内核代ç �中包å�«æœ‰å¤§é‡�的文档。这些文档对于学习如何与</div><div class='ctx'> 的维护者解释这些å�˜åŒ–。</div><div class='ctx'> </div><div class='ctx'> 以下是内核代ç �中需è¦�阅读的文档：</div><div class='del'>-  README</div><div class='add'>+  :ref:`Documentation/admin-guide/README.rst &lt;readme&gt;`</div><div class='ctx'>     文件简è¦�介ç»�了Linux内核的背景，并且æ��述了如何é…�置和编译内核。内核的</div><div class='ctx'>     新用户应该从这里开始。</div><div class='ctx'> </div><div class='del'>-  Documentation/process/changes.rst</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/changes.rst &lt;changes&gt;`</div><div class='ctx'>     文件给出了用æ�¥ç¼–译和使用内核所需è¦�的最å°�软件包列表。</div><div class='ctx'> </div><div class='del'>-  Documentation/process/coding-style.rst</div><div class='add'>+  :ref:`Documentation/translations/zh_CN/process/coding-style.rst &lt;cn_codingstyle&gt;`</div><div class='ctx'>     æ��è¿°Linux内核的代ç �风格和ç�†ç”±ã€‚所有新代ç �需è¦�é�µå®ˆè¿™ç¯‡æ–‡æ¡£ä¸­å®šä¹‰çš„规</div><div class='ctx'>     范。大多数维护者å�ªä¼šæŽ¥æ”¶ç¬¦å�ˆè§„定的补ä¸�，很多人也å�ªä¼šå¸®å¿™æ£€æŸ¥ç¬¦å�ˆé£Žæ ¼</div><div class='ctx'>     的代ç �。</div><div class='ctx'> </div><div class='del'>-  Documentation/process/submitting-patches.rst</div><div class='del'>-  Documentation/process/submitting-drivers.rst</div><div class='add'>+  :ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+  :ref:`Documentation/process/submitting-drivers.rst &lt;submittingdrivers&gt;`</div><div class='add'>+</div><div class='ctx'>     这两份文档明确æ��述如何创建和å�‘é€�è¡¥ä¸�，其中包括（但ä¸�ä»…é™�于)：</div><div class='ctx'>        - 邮件内容</div><div class='ctx'>        - 邮件格å¼�</div><div class='ctx'>        - 选择收件人</div><div class='add'>+</div><div class='ctx'>     é�µå®ˆè¿™äº›è§„定并ä¸�能ä¿�è¯�æ��交æˆ�功（因为所有补ä¸�需è¦�通过严格的内容和风格</div><div class='ctx'>     审查），但是忽视他们几乎就æ„�味ç�€å¤±è´¥ã€‚</div><div class='ctx'> </div><div class='ctx'>     其他关于如何正确地生æˆ�è¡¥ä¸�的优秀文档包括：</div><div class='ctx'>     "The Perfect Patch"</div><div class='add'>+</div><div class='ctx'>         http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='ctx'>     "Linux kernel patch submission format"</div><div class='add'>+</div><div class='ctx'>         http://linux.yyz.us/patch-format.html</div><div class='ctx'> </div><div class='del'>-  Documentation/process/stable-api-nonsense.rst</div><div class='add'>+  :ref:`Documentation/translations/zh_CN/process/stable-api-nonsense.rst &lt;cn_stable_api_nonsense&gt;`</div><div class='ctx'>     论è¯�内核为什么特æ„�ä¸�包括稳定的内核内部API，也就是说ä¸�包括åƒ�这样的特</div><div class='ctx'>     性：</div><div class='add'>+</div><div class='ctx'>        - å­�系统中间层（为了兼容性？）</div><div class='ctx'>        - 在ä¸�å�Œæ“�作系统间易于移æ¤�的驱动程åº�</div><div class='ctx'>        - å‡�缓（甚至阻止）内核代ç �的快速å�˜åŒ–</div><div class='add'>+</div><div class='ctx'>     这篇文档对于ç�†è§£Linuxçš„å¼€å�‘哲学至关é‡�è¦�。对于将开å�‘å¹³å�°ä»Žå…¶ä»–æ“�作系</div><div class='ctx'>     统转移到Linux的人æ�¥è¯´ä¹Ÿå¾ˆé‡�è¦�。</div><div class='ctx'> </div><div class='del'>-  Documentation/admin-guide/security-bugs.rst</div><div class='add'>+  :ref:`Documentation/admin-guide/security-bugs.rst &lt;securitybugs&gt;`</div><div class='ctx'>     如果你认为自己å�‘现了Linux内核的安全性问题，请根æ�®è¿™ç¯‡æ–‡æ¡£ä¸­çš„步骤æ�¥</div><div class='ctx'>     æ��醒其他内核开å�‘者并帮助解决这个问题。</div><div class='ctx'> </div><div class='del'>-  Documentation/process/management-style.rst</div><div class='add'>+  :ref:`Documentation/translations/zh_CN/process/management-style.rst &lt;cn_managementstyle&gt;`</div><div class='add'>+</div><div class='ctx'>     æ��述内核维护者的工作方法å�Šå…¶å…±æœ‰ç‰¹ç‚¹ã€‚这对于刚刚接触内核开å�‘（或者对</div><div class='ctx'>     它感到好奇）的人æ�¥è¯´å¾ˆé‡�è¦�，因为它解释了很多对于内核维护者独特行为的</div><div class='ctx'>     æ™®é��误解与迷惑。</div><div class='ctx'> </div><div class='del'>-  Documentation/process/stable-kernel-rules.rst</div><div class='add'>+  :ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='ctx'>     解释了稳定版内核å�‘布的规则，以å�Šå¦‚何将改动放入这些版本的步骤。</div><div class='ctx'> </div><div class='del'>-  Documentation/process/kernel-docs.rst</div><div class='add'>+  :ref:`Documentation/process/kernel-docs.rst &lt;kernel_docs&gt;`</div><div class='ctx'>     有助于内核开å�‘的外部文档列表。如果你在内核自带的文档中没有找到你想找</div><div class='ctx'>     的内容，å�¯ä»¥æŸ¥çœ‹è¿™äº›æ–‡æ¡£ã€‚</div><div class='ctx'> </div><div class='del'>-  Documentation/process/applying-patches.rst</div><div class='add'>+  :ref:`Documentation/process/applying-patches.rst &lt;applying_patches&gt;`</div><div class='ctx'>     关于补ä¸�是什么以å�Šå¦‚何将它打在ä¸�å�Œå†…核开å�‘分支上的好介ç»�</div><div class='ctx'> </div><div class='ctx'> 内核还拥有大é‡�从代ç �自动生æˆ�的文档。它包å�«å†…核内部APIçš„å…¨é�¢ä»‹ç»�以å�Šå¦‚何</div><div class='ctx'> 妥善处ç�†åŠ é”�的规则。生æˆ�的文档会放在 Documentation/DocBook/目录下。在内</div><div class='ctx'> æ ¸æº�ç �的主目录中使用以下ä¸�å�Œå‘½ä»¤å°†ä¼šåˆ†åˆ«ç”Ÿæˆ�PDFã€�Postscriptã€�HTML和手册</div><div class='del'>-页等ä¸�å�Œæ ¼å¼�的文档：</div><div class='add'>+页等ä¸�å�Œæ ¼å¼�的文档::</div><div class='add'>+</div><div class='ctx'>     make pdfdocs</div><div class='ctx'>     make htmldocs</div><div class='ctx'> </div><div class='hunk'>@@ -155,7 +158,9 @@ Linux内核代ç �中包å�«æœ‰å¤§é‡�的文档。这些文档对于学习如何与</div><div class='ctx'> 如何æˆ�为内核开å�‘者</div><div class='ctx'> ------------------</div><div class='ctx'> 如果你对Linux内核开å�‘一无所知，你应该访问“Linux内核新手â€�计划：</div><div class='add'>+</div><div class='ctx'> 	http://kernelnewbies.org</div><div class='add'>+</div><div class='ctx'> 它拥有一个å�¯ä»¥é—®å�„ç§�最基本的内核开å�‘问题的邮件列表（在æ��问之å‰�一定è¦�è®°å¾—</div><div class='ctx'> 查找已往的邮件，确认是å�¦æœ‰äººå·²ç»�回答过相å�Œçš„问题）。它还拥有一个å�¯ä»¥èŽ·å¾—</div><div class='ctx'> 实时å��馈的IRCè�Šå¤©é¢‘é�“，以å�Šå¤§é‡�对于学习Linux内核开å�‘相当有帮助的文档。</div><div class='hunk'>@@ -166,23 +171,21 @@ Linux内核代ç �中包å�«æœ‰å¤§é‡�的文档。这些文档对于学习如何与</div><div class='ctx'> </div><div class='ctx'> 如果你想加入内核开å�‘社区并å��助完æˆ�一些任务，å�´æ‰¾ä¸�到从哪里开始，å�¯ä»¥è®¿é—®</div><div class='ctx'> “Linux内核房管员â€�计划：</div><div class='add'>+</div><div class='ctx'> 	http://kernelnewbies.org/KernelJanitors</div><div class='add'>+</div><div class='ctx'> 这是æž�佳的起点。它æ��供一个相对简å�•çš„任务列表，列出内核代ç �中需è¦�被é‡�æ–°</div><div class='ctx'> æ•´ç�†æˆ–者改正的地方。通过和负责这个计划的开å�‘者们一å�Œå·¥ä½œï¼Œä½ ä¼šå­¦åˆ°å°†è¡¥ä¸�</div><div class='ctx'> 集æˆ�进内核的基本原ç�†ã€‚如果还没有决定下一步è¦�å�šä»€ä¹ˆçš„è¯�，你还å�¯èƒ½ä¼šå¾—到方</div><div class='ctx'> å�‘性的指点。</div><div class='ctx'> </div><div class='del'>-如果你已ç»�有一些现æˆ�的代ç �想è¦�放到内核中，但是需è¦�一些帮助æ�¥ä½¿å®ƒä»¬æ‹¥æœ‰æ­£</div><div class='del'>-确的格å¼�。请访问“内核导师â€�计划。这个计划就是用æ�¥å¸®åŠ©ä½ å®Œæˆ�这个目标的。它</div><div class='del'>-是一个邮件列表，地å�€å¦‚下：</div><div class='del'>-	http://selenic.com/mailman/listinfo/kernel-mentors</div><div class='del'>-</div><div class='ctx'> 在真正动手修改内核代ç �之å‰�，ç�†è§£è¦�修改的代ç �如何è¿�作是必需的。è¦�达到这个</div><div class='ctx'> 目的，没什么办法比直接读代ç �更有效了（大多数花招都会有相应的注释），而且</div><div class='ctx'> 一些特制的工具还å�¯ä»¥æ��供帮助。例如，“Linux代ç �交å�‰å¼•ç”¨â€�项目就是一个值得</div><div class='ctx'> 特别推è��的帮助工具，它将æº�代ç �显示在有编目和索引的网页上。其中一个更新å�Š</div><div class='ctx'> 时的内核æº�ç �库，å�¯ä»¥é€šè¿‡ä»¥ä¸‹åœ°å�€è®¿é—®ï¼š</div><div class='del'>-	http://sosdg.org/~coywolf/lxr/</div><div class='add'>+</div><div class='add'>+        https://elixir.bootlin.com/</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> å¼€å�‘æµ�程</div><div class='hunk'>@@ -190,22 +193,23 @@ Linux内核代ç �中包å�«æœ‰å¤§é‡�的文档。这些文档对于学习如何与</div><div class='ctx'> </div><div class='ctx'> ç›®å‰�Linux内核开å�‘æµ�程包括几个“主内核分支â€�和很多å­�系统相关的内核分支。这</div><div class='ctx'> 些分支包括：</div><div class='del'>-  - 2.6.x主内核æº�ç �æ ‘</div><div class='del'>-  - 2.6.x.y -stable内核æº�ç �æ ‘</div><div class='del'>-  - 2.6.x -mm内核补ä¸�集</div><div class='del'>-  - å­�系统相关的内核æº�ç �树和补ä¸�集</div><div class='ctx'> </div><div class='add'>+  - Linus 的内核æº�ç �æ ‘</div><div class='add'>+  - 多个主è¦�版本的稳定版内核树</div><div class='add'>+  - å­�系统相关的内核树</div><div class='add'>+  - linux-next 集æˆ�测试树</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+主线树</div><div class='add'>+------</div><div class='add'>+主线树是由Linus Torvalds 维护的。你å�¯ä»¥åœ¨https://kernel.org 网站或者代ç �</div><div class='add'>+库中下找到它。它的开å�‘é�µå¾ªä»¥ä¸‹æ­¥éª¤ï¼š</div><div class='ctx'> </div><div class='del'>-2.6.x内核主æº�ç �æ ‘</div><div class='del'>------------------</div><div class='del'>-2.6.x内核是由Linus Torvalds（Linux的创造者）亲自维护的。你å�¯ä»¥åœ¨</div><div class='del'>-kernel.org网站的pub/linux/kernel/v2.6/目录下找到它。它的开å�‘é�µå¾ªä»¥ä¸‹æ­¥</div><div class='del'>-骤：</div><div class='ctx'>   - æ¯�当一个新版本的内核被å�‘布，为期两周的集æˆ�窗å�£å°†è¢«æ‰“开。在这段时间里</div><div class='ctx'>     维护者å�¯ä»¥å�‘Linusæ��交大段的修改，通常这些修改已ç»�被放到-mm内核中几个</div><div class='ctx'>     星期了。æ��交大é‡�修改的首选方å¼�是使用git工具（内核的代ç �版本管ç�†å·¥å…·</div><div class='del'>-    ，更多的信æ�¯å�¯ä»¥åœ¨http://git-scm.com/获å�–），ä¸�过使用普通补ä¸�也是å�¯ä»¥</div><div class='del'>-    的。</div><div class='add'>+    ，更多的信æ�¯å�¯ä»¥åœ¨ http://git-scm.com/ 获å�–），ä¸�过使用普通补ä¸�也是</div><div class='add'>+    å�¯ä»¥çš„。</div><div class='ctx'>   - 两个星期以å�Ž-rc1版本内核å�‘布。之å�Žå�ªæœ‰ä¸�包å�«å�¯èƒ½å½±å“�整个内核稳定性的</div><div class='ctx'>     新功能的补ä¸�æ‰�å�¯èƒ½è¢«æŽ¥å�—。请注æ„�一个全新的驱动程åº�（或者文件系统）有</div><div class='ctx'>     å�¯èƒ½åœ¨-rc1å�Žè¢«æŽ¥å�—是因为这样的修改完全独立，ä¸�会影å“�其他的代ç �，所以</div><div class='hunk'>@@ -220,106 +224,61 @@ kernel.org网站的pub/linux/kernel/v2.6/目录下找到它。它的开å�‘é�µå¾ª</div><div class='ctx'> 	“没有人知é�“新内核何时会被å�‘布，因为å�‘布是根æ�®å·²çŸ¥bug的情况æ�¥å†³å®š</div><div class='ctx'> 	的，而ä¸�是根æ�®ä¸€ä¸ªäº‹å…ˆåˆ¶å®šå¥½çš„时间表。â€�</div><div class='ctx'> </div><div class='add'>+å­�系统特定树</div><div class='add'>+------------</div><div class='ctx'> </div><div class='del'>-2.6.x.y -stable（稳定版）内核æº�ç �æ ‘</div><div class='del'>------------------------------------</div><div class='del'>-ç”±4个数字组æˆ�的内核版本å�·è¯´æ˜Žæ­¤å†…核是-stable版本。它们包å�«åŸºäºŽ2.6.x版本</div><div class='del'>-内核的相对较å°�且至关é‡�è¦�的修补，这些修补针对安全性问题或者严é‡�的内核退步。</div><div class='del'>-</div><div class='del'>-è¿™ç§�版本的内核适用于那些期望获得最新的稳定版内核并且ä¸�想å�‚与测试开å�‘版或</div><div class='del'>-者实验版的用户。</div><div class='del'>-</div><div class='del'>-如果没有2.6.x.y版本内核存在，那么最新的2.6.x版本内核就相当于是当å‰�的稳定</div><div class='del'>-版内核。</div><div class='del'>-</div><div class='del'>-2.6.x.y版本由“稳定版â€�å°�组（邮件地å�€&lt;stable@vger.kernel.org&gt;）维护，一般隔周å�‘</div><div class='del'>-布新版本。</div><div class='del'>-</div><div class='del'>-内核æº�ç �中的Documentation/process/stable-kernel-rules.rst文件具体æ��述了å�¯è¢«ç¨³å®š</div><div class='del'>-版内核接å�—的修改类型以å�Šå�‘布的æµ�程。</div><div class='add'>+å�„ç§�内核å­�系统的维护者——以å�Šè®¸å¤šå†…æ ¸å­�系统开å�‘人员——在æº�代ç �库中公开了他们</div><div class='add'>+当å‰�çš„å¼€å�‘状æ€�。这样，其他人就å�¯ä»¥çœ‹åˆ°å†…核的ä¸�å�ŒåŒºåŸŸå�‘生了什么。在开å�‘速度</div><div class='add'>+很快的领域，å�¯èƒ½ä¼šè¦�求开å�‘人员将æ��交的内容建立在这样的å­�系统内核树上，这样</div><div class='add'>+å°±é�¿å…�了æ��交与其他已ç»�进行的工作之间的冲çª�。</div><div class='ctx'> </div><div class='add'>+这些存储库中的大多数都是Git树，但是也有其他的scm在使用，或者补ä¸�队列被å�‘布</div><div class='add'>+为Quilt系列。这些å­�系统存储库的地å�€åˆ—在MAINTAINERS文件中。其中许多å�¯ä»¥åœ¨</div><div class='add'>+https://git.kernel.org/上æµ�览。</div><div class='ctx'> </div><div class='del'>-2.6.x -mmè¡¥ä¸�集</div><div class='del'>----------------</div><div class='del'>-这是由Andrew Morton维护的试验性内核补ä¸�集。Andrew将所有å­�系统的内核æº�ç �</div><div class='del'>-和补ä¸�拼凑到一起，并且加入了大é‡�从linux-kernel邮件列表中采集的补ä¸�。这个</div><div class='del'>-æº�ç �树是新功能和补ä¸�的试炼场。当补ä¸�在-mmè¡¥ä¸�集里è¯�明了其价值以å�ŽAndrew</div><div class='del'>-或者相应å­�系统的维护者会将补ä¸�å�‘ç»™Linus以便集æˆ�进主内核æº�ç �树。</div><div class='add'>+在将一个建议的补ä¸�æ��交到这样的å­�系统树之å‰�，需è¦�对它进行审查，审查主è¦�å�‘生</div><div class='add'>+在邮件列表上（请å�‚è§�下é�¢ç›¸åº”的部分）。对于几个内核å­�系统，这个审查过程是通</div><div class='add'>+过工具补ä¸�跟踪的。Patchworkæ��供了一个Webç•Œé�¢ï¼Œæ˜¾ç¤ºè¡¥ä¸�å�‘布ã€�对补ä¸�的任何评</div><div class='add'>+论或修订，维护人员å�¯ä»¥å°†è¡¥ä¸�标记为正在审查ã€�接å�—或拒ç»�。大多数补ä¸�网站都列</div><div class='add'>+在 https://patchwork.kernel.org/</div><div class='ctx'> </div><div class='del'>-在将所有新补ä¸�å�‘ç»™Linus以集æˆ�到主内核æº�ç �树之å‰�，我们é�žå¸¸é¼“励先把这些补</div><div class='del'>-ä¸�放在-mm版内核æº�ç �树中进行测试。</div><div class='del'>-</div><div class='del'>-这些内核版本ä¸�适å�ˆåœ¨éœ€è¦�稳定è¿�行的系统上è¿�行，因为è¿�行它们比è¿�行任何其他</div><div class='del'>-内核分支都更具有风险。</div><div class='del'>-</div><div class='del'>-如果你想为内核开å�‘进程æ��供帮助，请å°�试并使用这些内核版本，并在</div><div class='del'>-linux-kernel邮件列表中æ��ä¾›å��馈，告诉大家你é�‡åˆ°äº†é—®é¢˜è¿˜æ˜¯ä¸€åˆ‡æ­£å¸¸ã€‚</div><div class='del'>-</div><div class='del'>-通常-mm版补ä¸�集ä¸�光包括这些é¢�外的试验性补ä¸�，还包括å�‘布时-git版主æº�ç �æ ‘</div><div class='del'>-中的改动。</div><div class='del'>-</div><div class='del'>--mm版内核没有固定的å�‘布周期，但是通常在æ¯�两个-rc版内核å�‘布之间都会有若干</div><div class='del'>-个-mm版内核å�‘布（一般是1至3个）。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-å­�系统相关内核æº�ç �树和补ä¸�集</div><div class='del'>-----------------------------</div><div class='del'>-相当一部分内核å­�系统开å�‘者会公开他们自己的开å�‘æº�ç �树，以便其他人能了解内</div><div class='del'>-核的ä¸�å�Œé¢†åŸŸæ­£åœ¨å�‘生的事情。如上所述，这些æº�ç �树会被集æˆ�到-mm版本内核中。</div><div class='del'>-</div><div class='del'>-下é�¢æ˜¯ç›®å‰�å�¯ç”¨çš„一些内核æº�ç �树的列表：</div><div class='del'>-  通过git管ç�†çš„æº�ç �树：</div><div class='del'>-    - Kbuildå¼€å�‘æº�ç �树， Sam Ravnborg &lt;sam@ravnborg.org&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git</div><div class='del'>-</div><div class='del'>-    - ACPIå¼€å�‘æº�ç �æ ‘, Len Brown &lt;len.brown@intel.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git</div><div class='del'>-</div><div class='del'>-    - å�—设备开å�‘æº�ç �æ ‘, Jens Axboe &lt;axboe@suse.de&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git</div><div class='del'>-</div><div class='del'>-    - DRMå¼€å�‘æº�ç �æ ‘, Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git</div><div class='del'>-</div><div class='del'>-    - ia64å¼€å�‘æº�ç �æ ‘, Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git</div><div class='add'>+Linux-next 集æˆ�测试树</div><div class='add'>+---------------------</div><div class='ctx'> </div><div class='del'>-    - ieee1394å¼€å�‘æº�ç �æ ‘, Jody McIntyre &lt;scjody@modernduck.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git</div><div class='add'>+在将å­�系统树的更新å�ˆå¹¶åˆ°ä¸»çº¿æ ‘之å‰�，需è¦�对它们进行集æˆ�测试。为此，存在一个</div><div class='add'>+特殊的测试存储库，其中几乎æ¯�天都会æ��å�–所有å­�系统树：</div><div class='ctx'> </div><div class='del'>-    - infinibandå¼€å�‘æº�ç �æ ‘, Roland Dreier &lt;rolandd@cisco.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git</div><div class='add'>+        https://git.kernel.org/？p=linux/kernel/git/next/linux-next.git</div><div class='ctx'> </div><div class='del'>-    - libataå¼€å�‘æº�ç �æ ‘, Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git</div><div class='add'>+通过这ç§�æ–¹å¼�，Linux-next 对下一个å�ˆå¹¶é˜¶æ®µå°†è¿›å…¥ä¸»çº¿å†…核的内容给出了一个概è¦�</div><div class='add'>+展望。é�žå¸¸æ¬¢å†’险的测试者è¿�行测试Linux-next。</div><div class='ctx'> </div><div class='del'>-    - 网络驱动程åº�å¼€å�‘æº�ç �æ ‘, Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git</div><div class='add'>+多个主è¦�版本的稳定版内核树</div><div class='add'>+-----------------------------------</div><div class='add'>+ç”±3个数字组æˆ�的内核版本å�·è¯´æ˜Žæ­¤å†…核是-stable版本。它们包å�«å†…核的相对较å°�且</div><div class='add'>+至关é‡�è¦�的修补，这些修补针对安全性问题或者严é‡�的内核退步。</div><div class='ctx'> </div><div class='del'>-    - pcmciaå¼€å�‘æº�ç �æ ‘, Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git</div><div class='add'>+è¿™ç§�版本的内核适用于那些期望获得最新的稳定版内核并且ä¸�想å�‚与测试开å�‘版或</div><div class='add'>+者实验版的用户。</div><div class='ctx'> </div><div class='del'>-    - SCSIå¼€å�‘æº�ç �æ ‘, James Bottomley &lt;James.Bottomley@SteelEye.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git</div><div class='add'>+稳定版内核树版本由“稳定版â€�å°�组（邮件地å�€&lt;stable@vger.kernel.org&gt;）维护，一般</div><div class='add'>+隔周å�‘布新版本。</div><div class='ctx'> </div><div class='del'>-  使用quilt管ç�†çš„è¡¥ä¸�集：</div><div class='del'>-    - USB, PCI, 驱动程åº�核心和I2C, Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='del'>-	kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='del'>-    - x86-64, 部分i386, Andi Kleen &lt;ak@suse.de&gt;</div><div class='del'>-	ftp.firstfloor.org:/pub/ak/x86_64/quilt/</div><div class='add'>+内核æº�ç �中的 :ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='add'>+文件具体æ��述了å�¯è¢«ç¨³å®šç‰ˆå†…核接å�—的修改类型以å�Šå�‘布的æµ�程。</div><div class='ctx'> </div><div class='del'>-  其他内核æº�ç �æ ‘å�¯ä»¥åœ¨http://git.kernel.org的列表中和MAINTAINERS文件里</div><div class='del'>-  找到。</div><div class='ctx'> </div><div class='ctx'> 报告bug</div><div class='ctx'> -------</div><div class='ctx'> </div><div class='ctx'> bugzilla.kernel.org是Linux内核开å�‘者们用æ�¥è·Ÿè¸ªå†…æ ¸Bug的网站。我们鼓励用</div><div class='ctx'> 户在这个工具中报告找到的所有bug。如何使用内核bugzilla的细节请访问：</div><div class='add'>+</div><div class='ctx'> 	http://test.kernel.org/bugzilla/faq.html</div><div class='ctx'> </div><div class='del'>-内核æº�ç �主目录中的admin-guide/reporting-bugs.rst文件里有一个很好的模æ�¿ã€‚它指导用户如何报</div><div class='del'>-å‘Šå�¯èƒ½çš„内核bug以å�Šéœ€è¦�æ��供哪些信æ�¯æ�¥å¸®åŠ©å†…核开å�‘者们找到问题的根æº�。</div><div class='add'>+内核æº�ç �主目录中的:ref:`admin-guide/reporting-bugs.rst &lt;reportingbugs&gt;`</div><div class='add'>+文件里有一个很好的模æ�¿ã€‚它指导用户如何报告å�¯èƒ½çš„内核bug以å�Šéœ€è¦�æ��供哪些信æ�¯</div><div class='add'>+æ�¥å¸®åŠ©å†…核开å�‘者们找到问题的根æº�。</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 利用bug报告</div><div class='hunk'>@@ -330,12 +289,7 @@ bugzilla.kernel.org是Linux内核开å�‘者们用æ�¥è·Ÿè¸ªå†…æ ¸Bug的网站。æˆ</div><div class='ctx'> 者感å�—到你的存在。修改bug是赢得其他开å�‘者赞誉的最好办法，因为并ä¸�是很多</div><div class='ctx'> 人都喜欢浪费时间去修改别人报告的bug。</div><div class='ctx'> </div><div class='del'>-è¦�å°�试修改已知的bug，请访问http://bugzilla.kernel.org网å�€ã€‚如果你想获得</div><div class='del'>-最新bug的通知，å�¯ä»¥è®¢é˜…bugme-new邮件列表（å�ªæœ‰æ–°çš„bug报告会被寄到这里）</div><div class='del'>-或者订阅bugme-janitor邮件列表（所有bugzillaçš„å�˜åŠ¨éƒ½ä¼šè¢«å¯„到这里）。</div><div class='del'>-</div><div class='del'>-	https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='del'>-	https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='add'>+è¦�å°�试修改已知的bug，请访问 http://bugzilla.kernel.org 网å�€ã€‚</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 邮件列表</div><div class='hunk'>@@ -343,10 +297,14 @@ bugzilla.kernel.org是Linux内核开å�‘者们用æ�¥è·Ÿè¸ªå†…æ ¸Bug的网站。æˆ</div><div class='ctx'> </div><div class='ctx'> 正如上é�¢çš„文档所æ��述，大多数的骨干内核开å�‘者都加入了Linux Kernel邮件列</div><div class='ctx'> 表。如何订阅和退订列表的细节å�¯ä»¥åœ¨è¿™é‡Œæ‰¾åˆ°ï¼š</div><div class='add'>+</div><div class='ctx'> 	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='add'>+</div><div class='ctx'> 网上很多地方都有这个邮件列表的存档(archive)。å�¯ä»¥ä½¿ç”¨æ�œç´¢å¼•æ“Žæ�¥æ‰¾åˆ°è¿™äº›</div><div class='ctx'> 存档。比如：</div><div class='add'>+</div><div class='ctx'> 	http://dir.gmane.org/gmane.linux.kernel</div><div class='add'>+</div><div class='ctx'> 在å�‘信之å‰�，我们强烈建议你先在存档中æ�œç´¢ä½ æƒ³è¦�讨论的问题。很多已ç»�被详细</div><div class='ctx'> 讨论过的问题å�ªåœ¨é‚®ä»¶åˆ—表的存档中å�¯ä»¥æ‰¾åˆ°ã€‚</div><div class='ctx'> </div><div class='hunk'>@@ -354,10 +312,12 @@ bugzilla.kernel.org是Linux内核开å�‘者们用æ�¥è·Ÿè¸ªå†…æ ¸Bug的网站。æˆ</div><div class='ctx'> MAINTAINERS文件中å�¯ä»¥æ‰¾åˆ°ä¸�å�Œè¯�题对应的邮件列表。</div><div class='ctx'> </div><div class='ctx'> 很多邮件列表架设在kernel.orgæœ�务器上。这些列表的信æ�¯å�¯ä»¥åœ¨è¿™é‡Œæ‰¾åˆ°ï¼š</div><div class='add'>+</div><div class='ctx'> 	http://vger.kernel.org/vger-lists.html</div><div class='ctx'> </div><div class='ctx'> 在使用这些邮件列表时，请记ä½�ä¿�æŒ�良好的行为习惯。下é�¢çš„链接æ��供了与这些列</div><div class='ctx'> 表（或任何其它邮件列表）交æµ�的一些简å�•è§„则，虽然内容有点滥竽充数。</div><div class='add'>+</div><div class='ctx'> 	http://www.albion.com/netiquette/</div><div class='ctx'> </div><div class='ctx'> 当有很多人回å¤�你的邮件时，邮件的抄é€�列表会å�˜å¾—很长。请ä¸�è¦�将任何人从抄é€�</div><div class='hunk'>@@ -369,11 +329,12 @@ MAINTAINERS文件中å�¯ä»¥æ‰¾åˆ°ä¸�å�Œè¯�题对应的邮件列表。</div><div class='ctx'> 这几行。将你的评论加在被引用的段è�½ä¹‹é—´è€Œä¸�è¦�放在邮件的顶部。</div><div class='ctx'> </div><div class='ctx'> 如果你在邮件中附带补ä¸�，请确认它们是å�¯ä»¥ç›´æŽ¥é˜…读的纯文本（如</div><div class='del'>-Documentation/process/submitting-patches.rst文档中所述）。内核开å�‘者们ä¸�希望é�‡åˆ°é™„件</div><div class='del'>-或者被压缩了的补ä¸�。å�ªæœ‰è¿™æ ·æ‰�能ä¿�è¯�他们å�¯ä»¥ç›´æŽ¥è¯„论你的æ¯�行代ç �。请确ä¿�</div><div class='del'>-你使用的邮件å�‘é€�程åº�ä¸�会修改空格和制表符。一个防范性的测试方法是先将邮件</div><div class='del'>-å�‘é€�给自己，然å�Žè‡ªå·±å°�试是å�¦å�¯ä»¥é¡ºåˆ©åœ°æ‰“上收到的补ä¸�。如果测试ä¸�æˆ�功，请</div><div class='del'>-调整或者更æ�¢ä½ çš„邮件å�‘é€�程åº�直到它正确工作为止。</div><div class='add'>+:ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+文档中所述）。内核开å�‘者们ä¸�希望é�‡åˆ°é™„件或者被压缩了的补ä¸�。å�ªæœ‰è¿™æ ·æ‰�能</div><div class='add'>+ä¿�è¯�他们å�¯ä»¥ç›´æŽ¥è¯„论你的æ¯�行代ç �。请确ä¿�你使用的邮件å�‘é€�程åº�ä¸�会修改空格</div><div class='add'>+和制表符。一个防范性的测试方法是先将邮件å�‘é€�给自己，然å�Žè‡ªå·±å°�试是å�¦å�¯ä»¥</div><div class='add'>+顺利地打上收到的补ä¸�。如果测试ä¸�æˆ�功，请调整或者更æ�¢ä½ çš„邮件å�‘é€�程åº�直到</div><div class='add'>+它正确工作为止。</div><div class='ctx'> </div><div class='ctx'> 总而言之，请尊é‡�其他的邮件列表订阅者。</div><div class='ctx'> </div><div class='hunk'>@@ -383,6 +344,7 @@ Documentation/process/submitting-patches.rst文档中所述）。内核开å�‘者</div><div class='ctx'> </div><div class='ctx'> 内核社区的目标就是æ��供尽善尽美的内核。所以当你æ��交补ä¸�期望被接å�—进内核的</div><div class='ctx'> 时候，它的技术价值以å�Šå…¶ä»–æ–¹é�¢éƒ½å°†è¢«è¯„审。那么你å�¯èƒ½ä¼šå¾—到什么呢？</div><div class='add'>+</div><div class='ctx'>   - 批评</div><div class='ctx'>   - 评论</div><div class='ctx'>   - è¦�求修改</div><div class='hunk'>@@ -395,6 +357,7 @@ Documentation/process/submitting-patches.rst文档中所述）。内核开å�‘者</div><div class='ctx'> 没在茫茫信海中。</div><div class='ctx'> </div><div class='ctx'> ä½ ä¸�应该å�šçš„事情：</div><div class='add'>+</div><div class='ctx'>   - 期望自己的补ä¸�ä¸�å�—任何质疑就直接被接å�—</div><div class='ctx'>   - 翻脸</div><div class='ctx'>   - 忽略别人的评论</div><div class='hunk'>@@ -414,7 +377,8 @@ Documentation/process/submitting-patches.rst文档中所述）。内核开å�‘者</div><div class='ctx'> </div><div class='ctx'> 内核社区的工作模å¼�å�Œå¤§å¤šæ•°ä¼ ç»Ÿå…¬å�¸å¼€å�‘队ä¼�的工作模å¼�并ä¸�相å�Œã€‚下é�¢è¿™äº›ä¾‹</div><div class='ctx'> å­�，å�¯ä»¥å¸®åŠ©ä½ é�¿å…�æŸ�些å�¯èƒ½å�‘生问题：</div><div class='del'>-  用这些è¯�介ç»�你的修改æ��案会有好处：</div><div class='add'>+用这些è¯�介ç»�你的修改æ��案会有好处：</div><div class='add'>+</div><div class='ctx'>     - 它å�Œæ—¶è§£å†³äº†å¤šä¸ªé—®é¢˜</div><div class='ctx'>     - 它删除了2000行代ç �</div><div class='ctx'>     - 这是补ä¸�，它已ç»�解释了我想è¦�说明的</div><div class='hunk'>@@ -422,7 +386,8 @@ Documentation/process/submitting-patches.rst文档中所述）。内核开å�‘者</div><div class='ctx'>     - 这是一系列å°�è¡¥ä¸�用æ�¥â€¦â€¦</div><div class='ctx'>     - 这个修改æ��高了普通机器的性能……</div><div class='ctx'> </div><div class='del'>-  应该é�¿å…�如下的说法：</div><div class='add'>+应该é�¿å…�如下的说法：</div><div class='add'>+</div><div class='ctx'>     - 我们在AIX/ptx/Solaris就是这么å�šçš„，所以这么å�šè‚¯å®šæ˜¯å¥½çš„……</div><div class='ctx'>     - 我å�šè¿™è¡Œå·²ç»�20年了，所以……</div><div class='ctx'>     - 为了我们公å�¸èµšé’±è€ƒè™‘必须这么å�š</div><div class='hunk'>@@ -495,6 +460,7 @@ Linux内核社区并ä¸�喜欢一下接收大段的代ç �。修改需è¦�被æ�°å½“</div><div class='ctx'> 当你å�‘é€�è¡¥ä¸�的时候，需è¦�特别留æ„�邮件正文的内容。因为这里的信æ�¯å°†ä¼šå�šä¸ºè¡¥</div><div class='ctx'> ä¸�的修改记录(ChangeLog)，会被一直ä¿�留以备大家查阅。它需è¦�完全地æ��è¿°è¡¥ä¸�，</div><div class='ctx'> 包括：</div><div class='add'>+</div><div class='ctx'>   - 为什么需è¦�这个修改</div><div class='ctx'>   - è¡¥ä¸�的总体设计</div><div class='ctx'>   - 实现细节</div><div class='hunk'>@@ -510,7 +476,8 @@ Linux内核社区并ä¸�喜欢一下接收大段的代ç �。修改需è¦�被æ�°å½“</div><div class='ctx'> 很多人已ç»�å�šåˆ°äº†ï¼Œè€Œä»–们都曾ç»�和现在的你站在å�Œæ ·çš„起点上。</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>----------------</div><div class='add'>+æ„Ÿè°¢</div><div class='add'>+----</div><div class='ctx'> æ„Ÿè°¢Paolo Ciarrocchiå…�许“开å�‘æµ�程â€�部分基于他所写的文章</div><div class='ctx'> (http://www.kerneltravel.net/newbie/2.6-development_process)，感谢Randy</div><div class='ctx'> Dunlapå’ŒGerrit Huizenga完善了应该说和ä¸�该说的列表。感谢Pat Mochel, Hanna</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/index.rst b/Documentation/translations/zh_CN/process/index.rst<br/>new file mode 100644<br/>index 000000000000..be1e764a80d2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/index.rst</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+	\renewcommand\thesection*</div><div class='add'>+	\renewcommand\thesubsection*</div><div class='add'>+</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/index.rst &lt;process_index&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_process_index:</div><div class='add'>+</div><div class='add'>+与Linux 内核社区一起工作</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+那么你想æˆ�为Linux内核开å�‘人员？ 欢迎ï¼� ä¸�但从技术æ„�义上讲有很多关于内核的知识</div><div class='add'>+需è¦�学，而且了解我们社区的工作方å¼�也很é‡�è¦�。 阅读这些文章å�¯ä»¥è®©æ‚¨ä»¥æ›´è½»æ�¾åœ°,</div><div class='add'>+麻烦最少的方å¼�将更改å�ˆå¹¶åˆ°å†…核。</div><div class='add'>+</div><div class='add'>+以下是æ¯�ä½�å¼€å�‘人员应阅读的基本指å�—。</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   howto</div><div class='add'>+   code-of-conduct</div><div class='add'>+   code-of-conduct-interpretation</div><div class='add'>+   submitting-patches</div><div class='add'>+   programming-language</div><div class='add'>+   coding-style</div><div class='add'>+   development-process</div><div class='add'>+   email-clients</div><div class='add'>+   license-rules</div><div class='add'>+</div><div class='add'>+其它大多数开å�‘人员感兴趣的社区指å�—：</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   submitting-drivers</div><div class='add'>+   submit-checklist</div><div class='add'>+   stable-api-nonsense</div><div class='add'>+   stable-kernel-rules</div><div class='add'>+   management-style</div><div class='add'>+</div><div class='add'>+这些是一些总体技术指å�—，由于缺ä¹�更好的地方，现在已ç»�放在这里</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   magic-number</div><div class='add'>+   volatile-considered-harmful</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   目录</div><div class='add'>+   ====</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/license-rules.rst b/Documentation/translations/zh_CN/process/license-rules.rst<br/>new file mode 100644<br/>index 000000000000..30c272b2a292<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/license-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/license-rules.rst</a></div><div class='hunk'>@@ -0,0 +1,370 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/license-rules.rst &lt;kernel_licensing&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_kernel_licensing:</div><div class='add'>+</div><div class='add'>+Linux内核许å�¯è§„则</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Linux内核根æ�®LICENSES/preferred/GPL-2.0中æ��供的GNU通用公共许å�¯è¯�版本2</div><div class='add'>+（GPL-2.0）的æ�¡æ¬¾æ��供，并在LICENSES/exceptions/Linux-syscall-note中显å¼�</div><div class='add'>+æ��述了例外的系统调用，如COPYING文件中所述。</div><div class='add'>+</div><div class='add'>+此文档文件æ��供了如何对æ¯�个æº�文件进行注释以使其许å�¯è¯�清晰明确的说明。</div><div class='add'>+它ä¸�会å�–代内核的许å�¯è¯�。</div><div class='add'>+</div><div class='add'>+内核æº�代ç �作为一个整体适用于COPYING文件中æ��述的许å�¯è¯�，但是å�•ä¸ªæº�文件å�¯ä»¥</div><div class='add'>+具有ä¸�å�Œçš„与GPL-20兼容的许å�¯è¯�::</div><div class='add'>+</div><div class='add'>+    GPL-1.0+ : GNU通用公共许å�¯è¯�v1.0或更高版本</div><div class='add'>+    GPL-2.0+ : GNU通用公共许å�¯è¯�v2.0或更高版本</div><div class='add'>+    LGPL-2.0 : ä»…é™�GNU库通用公共许å�¯è¯�v2</div><div class='add'>+    LGPL-2.0+: GNU 库通用公共许å�¯è¯�v2或更高版本</div><div class='add'>+    LGPL-2.1 : ä»…é™�GNU宽通用公共许å�¯è¯�v2.1</div><div class='add'>+    LGPL-2.1+: GNU宽通用公共许å�¯è¯�v2.1或更高版本</div><div class='add'>+</div><div class='add'>+除此之外，个人文件å�¯ä»¥åœ¨å�Œé‡�许å�¯ä¸‹æ��供，例如一个兼容的GPLå�˜ä½“，或者BSD，</div><div class='add'>+MIT等许å�¯ã€‚</div><div class='add'>+</div><div class='add'>+用户空间API（UAPI）头文件æ��述了用户空间程åº�与内核的接å�£ï¼Œè¿™æ˜¯ä¸€ç§�特殊情况。</div><div class='add'>+æ ¹æ�®å†…æ ¸COPYING文件中的注释，syscall接å�£æ˜¯ä¸€ä¸ªæ˜Žç¡®çš„边界，它ä¸�会将GPLè¦�求</div><div class='add'>+扩展到任何使用它与内核通信的软件。由于UAPI头文件必须包å�«åœ¨åˆ›å»ºåœ¨Linux内核</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'>+æ ·æ�¿æ–‡æœ¬çš„替代方法是在æ¯�个æº�文件中使用软件包数æ�®äº¤æ�¢ï¼ˆSPDX）许å�¯è¯�标识符。</div><div class='add'>+SPDX许å�¯è¯�标识符是机器å�¯è§£æž�的，并且是用于æ��供文件内容的许å�¯è¯�的精确缩写。</div><div class='add'>+SPDX许å�¯è¯�标识符由Linux 基金会的SPDX 工作组管ç�†ï¼Œå¹¶å¾—到了整个行业，工具</div><div class='add'>+供应商和法律团队的å�ˆä½œä¼™ä¼´çš„一致å�Œæ„�。有关详细信æ�¯ï¼Œè¯·å�‚阅</div><div class='add'>+https://spdx.org/</div><div class='add'>+</div><div class='add'>+Linux内核需è¦�所有æº�文件中的精确SPDX标识符。内核中使用的有效标识符在</div><div class='add'>+`许å�¯æ ‡è¯†ç¬¦`_ 一节中进行了解释，并且已å�¯ä»¥åœ¨</div><div class='add'>+https://spdx.org/licenses/ 上的官方SPDX许å�¯è¯�列表中检索，并附带许å�¯è¯�</div><div class='add'>+文本。</div><div class='add'>+</div><div class='add'>+许å�¯æ ‡è¯†ç¬¦è¯­æ³•</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+1.安置:</div><div class='add'>+</div><div class='add'>+   内核文件中的SPDX许å�¯è¯�标识符应添加到å�¯åŒ…å�«æ³¨é‡Šçš„文件中的第一行。对于大多</div><div class='add'>+   数文件，这是第一行，除了那些在第一行中需è¦�'#!PATH_TO_INTERPRETER'的脚本。</div><div class='add'>+   对于这些脚本，SPDX标识符进入第二行。</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+2. 风格:</div><div class='add'>+</div><div class='add'>+   SPDX许å�¯è¯�标识符以注释的形å¼�添加。注释样å¼�å�–决于文件类型::</div><div class='add'>+</div><div class='add'>+      C source:	// SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+      C header:	/* SPDX-License-Identifier: &lt;SPDX License Expression&gt; */</div><div class='add'>+      ASM:	/* SPDX-License-Identifier: &lt;SPDX License Expression&gt; */</div><div class='add'>+      scripts:	# SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+      .rst:	.. SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+      .dts{i}:	// SPDX-License-Identifier: &lt;SPDX License Expression&gt;</div><div class='add'>+</div><div class='add'>+   如果特定工具无法处ç�†æ ‡å‡†æ³¨é‡Šæ ·å¼�，则应使用工具接å�—的相应注释机制。这是在</div><div class='add'>+   C 头文件中使用“/\*\*/â€�æ ·å¼�注释的原因。过去在使用生æˆ�çš„.lds文件中观察到</div><div class='add'>+   构建被破å��，其中'ld'无法解æž�C++注释。现在已ç»�解决了这个问题，但ä»�然有较</div><div class='add'>+   旧的汇编程åº�工具无法处ç�†C++æ ·å¼�的注释。</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+3. å�¥æ³•:</div><div class='add'>+</div><div class='add'>+   &lt;SPDX许å�¯è¯�表达å¼�&gt;是SPDX许å�¯è¯�列表中的SPDX短格å¼�许å�¯è¯�标识符，或者在许å�¯</div><div class='add'>+   è¯�例外适用时由“WITHâ€�分隔的两个SPDX短格å¼�许å�¯è¯�标识符的组å�ˆã€‚当应用多个许</div><div class='add'>+   å�¯è¯�时，表达å¼�由分隔å­�表达å¼�的关键字“ANDâ€�，“ORâ€�组æˆ�，并由“（â€�，“）â€�包围。</div><div class='add'>+</div><div class='add'>+   带有“或更高â€�选项的[L]GPL等许å�¯è¯�的许å�¯è¯�标识符通过使用“+â€�æ�¥è¡¨ç¤ºâ€œæˆ–更高â€�</div><div class='add'>+   选项æ�¥æž„建。::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+      // SPDX-License-Identifier: LGPL-2.1+</div><div class='add'>+</div><div class='add'>+   当需è¦�修正的许å�¯è¯�时，应使用WITH。 例如，linux内核UAPI文件使用表达å¼�::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note</div><div class='add'>+</div><div class='add'>+   其它在内核中使用WITH例外的事例如下::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 WITH mif-exception</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0</div><div class='add'>+</div><div class='add'>+   例外å�ªèƒ½ä¸Žç‰¹å®šçš„许å�¯è¯�标识符一起使用。有效的许å�¯è¯�标识符列在异常文本文件</div><div class='add'>+   的标记中。有关详细信æ�¯ï¼Œè¯·å�‚阅 `许å�¯æ ‡è¯†ç¬¦`_ 一章中的 `例外`_ 。</div><div class='add'>+</div><div class='add'>+   如果文件是å�Œé‡�许å�¯ä¸”å�ªé€‰æ‹©ä¸€ä¸ªè®¸å�¯è¯�，则应使用OR。例如，一些dtsi文件在å�Œ</div><div class='add'>+   许å�¯ä¸‹å�¯ç”¨::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+</div><div class='add'>+   内核中å�Œè®¸å�¯æ–‡ä»¶ä¸­è®¸å�¯è¡¨è¾¾å¼�的示例::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR MIT</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR Apache-2.0</div><div class='add'>+      // SPDX-License-Identifier: GPL-2.0 OR MPL-1.1</div><div class='add'>+      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT</div><div class='add'>+      // SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause OR OpenSSL</div><div class='add'>+</div><div class='add'>+   如果文件具有多个许å�¯è¯�，其æ�¡æ¬¾å…¨éƒ¨é€‚用于使用该文件，则应使用AND。例如，</div><div class='add'>+   如果代ç �是从å�¦ä¸€ä¸ªé¡¹ç›®ç»§æ‰¿çš„，并且已ç»�授予了将其放入内核的æ�ƒé™�，但原始</div><div class='add'>+   许å�¯æ�¡æ¬¾éœ€è¦�ä¿�æŒ�有效::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) AND MIT</div><div class='add'>+</div><div class='add'>+   å�¦ä¸€ä¸ªéœ€è¦�é�µå®ˆä¸¤å¥—许å�¯æ�¡æ¬¾çš„例å­�是::</div><div class='add'>+</div><div class='add'>+      // SPDX-License-Identifier: GPL-1.0+ AND LGPL-2.1+</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'>+1. _`优先许å�¯`:</div><div class='add'>+</div><div class='add'>+   应尽å�¯èƒ½ä½¿ç”¨è¿™äº›è®¸å�¯è¯�，因为它们已知完全兼容并广泛使用。这些许å�¯è¯�在内核</div><div class='add'>+   目录::</div><div class='add'>+</div><div class='add'>+      LICENSES/preferred/</div><div class='add'>+</div><div class='add'>+   此目录中的文件包å�«å®Œæ•´çš„许å�¯è¯�文本和 `元标记`_ 。文件å��与SPDX许å�¯è¯�标识</div><div class='add'>+   符相å�Œï¼Œå�Žè€…应用于æº�文件中的许å�¯è¯�。</div><div class='add'>+</div><div class='add'>+   例如::</div><div class='add'>+</div><div class='add'>+      LICENSES/preferred/GPL-2.0</div><div class='add'>+</div><div class='add'>+   包å�«GPLv2许å�¯è¯�文本和所需的元标签::</div><div class='add'>+</div><div class='add'>+      LICENSES/preferred/MIT</div><div class='add'>+</div><div class='add'>+   包å�«MIT许å�¯è¯�文本和所需的元标记</div><div class='add'>+</div><div class='add'>+   _`元标记`:</div><div class='add'>+</div><div class='add'>+   许å�¯è¯�文件中必须包å�«ä»¥ä¸‹å…ƒæ ‡è®°ï¼š</div><div class='add'>+</div><div class='add'>+   - Valid-License-Identifier:</div><div class='add'>+</div><div class='add'>+     一行或多行, 声明那些许å�¯æ ‡è¯†ç¬¦åœ¨é¡¹ç›®å†…有效, 以引用此特定许å�¯çš„文本。通</div><div class='add'>+     常这是一个有效的标识符，但是例如对于带有'或更高'选项的许å�¯è¯�，两个标识</div><div class='add'>+     符都有效。</div><div class='add'>+</div><div class='add'>+   - SPDX-URL:</div><div class='add'>+</div><div class='add'>+     SPDX页é�¢çš„URL，其中包å�«ä¸Žè®¸å�¯è¯�相关的其他信æ�¯.</div><div class='add'>+</div><div class='add'>+   - Usage-Guidance:</div><div class='add'>+</div><div class='add'>+     使用建议的自由格å¼�文本。该文本必须包å�«SPDX许å�¯è¯�标识符的正确示例，因为</div><div class='add'>+     它们应根æ�® `许å�¯æ ‡è¯†ç¬¦è¯­æ³•`_ 指å�—放入æº�文件中。</div><div class='add'>+</div><div class='add'>+   - License-Text:</div><div class='add'>+</div><div class='add'>+     此标记之å�Žçš„所有文本都被视为原始许å�¯æ–‡æœ¬</div><div class='add'>+</div><div class='add'>+   文件格å¼�示例::</div><div class='add'>+</div><div class='add'>+      Valid-License-Identifier: GPL-2.0</div><div class='add'>+      Valid-License-Identifier: GPL-2.0+</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/GPL-2.0.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+        To use this license in source code, put one of the following SPDX</div><div class='add'>+	tag/value pairs into a comment according to the placement</div><div class='add'>+	guidelines in the licensing rules documentation.</div><div class='add'>+	For 'GNU General Public License (GPL) version 2 only' use:</div><div class='add'>+	  SPDX-License-Identifier: GPL-2.0</div><div class='add'>+	For 'GNU General Public License (GPL) version 2 or any later version' use:</div><div class='add'>+	  SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+   ::</div><div class='add'>+</div><div class='add'>+      SPDX-License-Identifier: MIT</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/MIT.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+	To use this license in source code, put the following SPDX</div><div class='add'>+	tag/value pair into a comment according to the placement</div><div class='add'>+	guidelines in the licensing rules documentation.</div><div class='add'>+	  SPDX-License-Identifier: MIT</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+2. ä¸�推è��的许å�¯è¯�:</div><div class='add'>+</div><div class='add'>+   这些许å�¯è¯�å�ªåº”用于现有代ç �或从其他项目导入代ç �。这些许å�¯è¯�在内核目录::</div><div class='add'>+</div><div class='add'>+      LICENSES/other/</div><div class='add'>+</div><div class='add'>+   此目录中的文件包å�«å®Œæ•´çš„许å�¯è¯�文本和 `元标记`_ 。文件å��与SPDX许å�¯è¯�标识</div><div class='add'>+   符相å�Œï¼Œå�Žè€…应用于æº�文件中的许å�¯è¯�。</div><div class='add'>+</div><div class='add'>+   例如::</div><div class='add'>+</div><div class='add'>+      LICENSES/other/ISC</div><div class='add'>+</div><div class='add'>+   包å�«å›½é™…系统è�”å�ˆè®¸å�¯æ–‡æœ¬å’Œæ‰€éœ€çš„元标签::</div><div class='add'>+</div><div class='add'>+      LICENSES/other/ZLib</div><div class='add'>+</div><div class='add'>+   包å�«ZLIB许å�¯æ–‡æœ¬å’Œæ‰€éœ€çš„元标签.</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'>+      Valid-License-Identifier: ISC</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/ISC.html</div><div class='add'>+      Usage-Guide:</div><div class='add'>+        Usage of this license in the kernel for new code is discouraged</div><div class='add'>+	and it should solely be used for importing code from an already</div><div class='add'>+	existing project.</div><div class='add'>+        To use this license in source code, put the following SPDX</div><div class='add'>+	tag/value pair into a comment according to the placement</div><div class='add'>+	guidelines in the licensing rules documentation.</div><div class='add'>+	  SPDX-License-Identifier: ISC</div><div class='add'>+      License-Text:</div><div class='add'>+        Full license text</div><div class='add'>+</div><div class='add'>+|</div><div class='add'>+</div><div class='add'>+3. _`例外`:</div><div class='add'>+</div><div class='add'>+   æŸ�些许å�¯è¯�å�¯ä»¥ä¿®æ”¹ï¼Œå¹¶å…�许原始许å�¯è¯�ä¸�具有的æŸ�些例外æ�ƒåˆ©ã€‚这些例外在</div><div class='add'>+   内核目录::</div><div class='add'>+</div><div class='add'>+      LICENSES/exceptions/</div><div class='add'>+</div><div class='add'>+   此目录中的文件包å�«å®Œæ•´çš„例外文本和所需的 `例外元标记`_ 。</div><div class='add'>+</div><div class='add'>+   例如::</div><div class='add'>+</div><div class='add'>+      LICENSES/exceptions/Linux-syscall-note</div><div class='add'>+</div><div class='add'>+   包å�«Linux内核的COPYING文件中记录的Linux系统调用例外，该文件用于UAPI</div><div class='add'>+   头文件。例如::</div><div class='add'>+</div><div class='add'>+      LICENSES/exceptions/GCC-exception-2.0</div><div class='add'>+</div><div class='add'>+   包å�«GCC'链接例外'，它å…�许独立于其许å�¯è¯�的任何二进制文件与标记有此例外的</div><div class='add'>+   文件的编译版本链接。这是从GPLä¸�兼容æº�代ç �创建å�¯è¿�行的å�¯æ‰§è¡Œæ–‡ä»¶æ‰€å¿…需的。</div><div class='add'>+</div><div class='add'>+   _`例外元标记`:</div><div class='add'>+</div><div class='add'>+   以下元标记必须在例外文件中å�¯ç”¨ï¼š</div><div class='add'>+</div><div class='add'>+   - SPDX-Exception-Identifier:</div><div class='add'>+</div><div class='add'>+     一个å�¯ä¸ŽSPDX许å�¯è¯�标识符一起使用的例外标识符。</div><div class='add'>+</div><div class='add'>+   - SPDX-URL:</div><div class='add'>+</div><div class='add'>+     SPDX页é�¢çš„URL，其中包å�«ä¸Žä¾‹å¤–相关的其他信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+   - SPDX-Licenses:</div><div class='add'>+</div><div class='add'>+     以逗å�·åˆ†éš”的例外å�¯ç”¨çš„SPDX许å�¯è¯�标识符列表。</div><div class='add'>+</div><div class='add'>+   - Usage-Guidance:</div><div class='add'>+</div><div class='add'>+     使用建议的自由格å¼�文本。必须在文本å�Žé�¢åŠ ä¸ŠSPDX许å�¯è¯�标识符的正确示例，</div><div class='add'>+     因为它们应根æ�® `许å�¯æ ‡è¯†ç¬¦è¯­æ³•`_ 指å�—放入æº�文件中。</div><div class='add'>+</div><div class='add'>+   - Exception-Text:</div><div class='add'>+</div><div class='add'>+     此标记之å�Žçš„所有文本都被视为原始异常文本</div><div class='add'>+</div><div class='add'>+   文件格å¼�示例::</div><div class='add'>+</div><div class='add'>+      SPDX-Exception-Identifier: Linux-syscall-note</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/Linux-syscall-note.html</div><div class='add'>+      SPDX-Licenses: GPL-2.0, GPL-2.0+, GPL-1.0+, LGPL-2.0, LGPL-2.0+, LGPL-2.1, LGPL-2.1+</div><div class='add'>+      Usage-Guidance:</div><div class='add'>+        This exception is used together with one of the above SPDX-Licenses</div><div class='add'>+	to mark user-space API (uapi) header files so they can be included</div><div class='add'>+	into non GPL compliant user-space application code.</div><div class='add'>+        To use this exception add it with the keyword WITH to one of the</div><div class='add'>+	identifiers in the SPDX-Licenses tag:</div><div class='add'>+	  SPDX-License-Identifier: &lt;SPDX-License&gt; WITH Linux-syscall-note</div><div class='add'>+      Exception-Text:</div><div class='add'>+        Full exception text</div><div class='add'>+</div><div class='add'>+   ::</div><div class='add'>+</div><div class='add'>+      SPDX-Exception-Identifier: GCC-exception-2.0</div><div class='add'>+      SPDX-URL: https://spdx.org/licenses/GCC-exception-2.0.html</div><div class='add'>+      SPDX-Licenses: GPL-2.0, GPL-2.0+</div><div class='add'>+      Usage-Guidance:</div><div class='add'>+        The "GCC Runtime Library exception 2.0" is used together with one</div><div class='add'>+	of the above SPDX-Licenses for code imported from the GCC runtime</div><div class='add'>+	library.</div><div class='add'>+        To use this exception add it with the keyword WITH to one of the</div><div class='add'>+	identifiers in the SPDX-Licenses tag:</div><div class='add'>+	  SPDX-License-Identifier: &lt;SPDX-License&gt; WITH GCC-exception-2.0</div><div class='add'>+      Exception-Text:</div><div class='add'>+        Full exception text</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+所有SPDX许å�¯è¯�标识符和例外都必须在LICENSESå­�目录中具有相应的文件。这是å…�许</div><div class='add'>+工具验è¯�（例如checkpatch.pl）以å�Šå‡†å¤‡å¥½ä»Žæº�读å�–å’Œæ��å�–许å�¯è¯�所必需的, 这是</div><div class='add'>+å�„ç§�FOSS组织推è��的，例如 `FSFE REUSE initiative &lt;https://reuse.software/&gt;`_.</div><div class='add'>+</div><div class='add'>+_`模å�—许å�¯`</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+   å�¯åŠ è½½å†…核模å�—还需è¦�MODULE_LICENSE（）标记。此标记既ä¸�替代正确的æº�代ç �</div><div class='add'>+   许å�¯è¯�ä¿¡æ�¯ï¼ˆSPDX-License-Identifier），也ä¸�以任何方å¼�表示或确定æ��供模å�—</div><div class='add'>+   æº�代ç �的确切许å�¯è¯�。</div><div class='add'>+</div><div class='add'>+   此标记的唯一目的是æ��供足够的信æ�¯ï¼Œè¯¥æ¨¡å�—是å�¦æ˜¯è‡ªç”±è½¯ä»¶æˆ–者是内核模å�—加</div><div class='add'>+   载器和用户空间工具的专有模å�—。</div><div class='add'>+</div><div class='add'>+   MODULE_LICENSE（）的有效许å�¯è¯�字符串是:</div><div class='add'>+</div><div class='add'>+    ============================= =============================================</div><div class='add'>+    "GPL"			  模å�—是根æ�®GPL版本2许å�¯çš„。这并ä¸�表示仅é™�于</div><div class='add'>+                                  GPL-2.0或GPL-2.0或更高版本之间的任何区别。</div><div class='add'>+                                  最正确许å�¯è¯�ä¿¡æ�¯å�ªèƒ½é€šè¿‡ç›¸åº”æº�文件中的许å�¯è¯�</div><div class='add'>+                                  ä¿¡æ�¯æ�¥ç¡®å®š</div><div class='add'>+</div><div class='add'>+    "GPL v2"			  å’Œ"GPL"相å�Œï¼Œå®ƒçš„存在是因为历å�²åŽŸå› ã€‚</div><div class='add'>+</div><div class='add'>+    "GPL and additional rights"   表示模å�—æº�在GPL v2å�˜ä½“å’ŒMIT许å�¯ä¸‹å�Œé‡�许å�¯çš„</div><div class='add'>+                                  历å�²å�˜ä½“。请ä¸�è¦�在新代ç �中使用。</div><div class='add'>+</div><div class='add'>+    "Dual MIT/GPL"		  表达该模å�—在GPL v2å�˜ä½“或MIT许å�¯è¯�选择下å�Œé‡�</div><div class='add'>+                                  许å�¯çš„正确方å¼�。</div><div class='add'>+</div><div class='add'>+    "Dual BSD/GPL"		  该模å�—æ ¹æ�®GPL v2å�˜ä½“或BSD许å�¯è¯�选择进行å�Œé‡�</div><div class='add'>+                                  许å�¯ã€‚ BSD许å�¯è¯�的确切å�˜ä½“å�ªèƒ½é€šè¿‡ç›¸åº”æº�文件</div><div class='add'>+                                  中的许å�¯è¯�ä¿¡æ�¯æ�¥ç¡®å®šã€‚</div><div class='add'>+</div><div class='add'>+    "Dual MPL/GPL"		  该模å�—æ ¹æ�®GPL v2å�˜ä½“或Mozilla Public License</div><div class='add'>+                                  （MPL）选项进行å�Œé‡�许å�¯ã€‚ MPL许å�¯è¯�的确切å�˜ä½“</div><div class='add'>+                                  å�ªèƒ½é€šè¿‡ç›¸åº”çš„æº�文件中的许å�¯è¯�ä¿¡æ�¯æ�¥ç¡®å®šã€‚</div><div class='add'>+</div><div class='add'>+    "Proprietary"		  该模å�—属于专有许å�¯ã€‚此字符串仅用于专有的第三</div><div class='add'>+                                  方模å�—，ä¸�能用于在内核树中具有æº�代ç �的模å�—。</div><div class='add'>+                                  以这ç§�æ–¹å¼�标记的模å�—在加载时会使用'P'标记污</div><div class='add'>+                                  染内核，并且内核模å�—加载器拒ç»�将这些模å�—链接</div><div class='add'>+                                  到使用EXPORT_SYMBOL_GPL（）导出的符å�·ã€‚</div><div class='add'>+    ============================= =============================================</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/magic-number.rst b/Documentation/translations/zh_CN/process/magic-number.rst<br/>new file mode 100644<br/>index 000000000000..15c592518194<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/magic-number.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/magic-number.rst</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+.. _cn_magicnumbers:</div><div class='add'>+</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/magic-number.rst &lt;magicnumbers&gt;`</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接å�‘信到LKML。如果你使用英文交æµ�有困难的è¯�，也å�¯</div><div class='add'>+以å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻译存在问题，请è�”系中文版维护者::</div><div class='add'>+</div><div class='add'>+        中文版维护者： è´¾å¨�å¨� Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+        中文版翻译者： è´¾å¨�å¨� Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+        中文版校译者： è´¾å¨�å¨� Jia Wei Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+Linux 魔术数</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+这个文件是有关当å‰�使用的魔术值注册表。当你给一个结构添加了一个魔术值，你也应该把这个魔术值添加到这个文件，因为我们最好把用于å�„ç§�结构的魔术值统一起æ�¥ã€‚</div><div class='add'>+</div><div class='add'>+使用魔术值æ�¥ä¿�护内核数æ�®ç»“构是一个é�žå¸¸å¥½çš„主æ„�。这就å…�许你在è¿�行期检查(a)一个结构是å�¦å·²ç»�被攻击，或者(b)ä½ å·²ç»�给一个例行程åº�通过了一个错误的结构。å�Žä¸€ç§�情况特别地有用---特别是当你通过一个空指针指å�‘结构体的时候。ttyæº�ç �，例如，ç»�常通过特定驱动使用这ç§�方法并且å��å¤�地排列特定方é�¢çš„结构。</div><div class='add'>+</div><div class='add'>+使用魔术值的方法是在结构的开始处声明的，如下::</div><div class='add'>+</div><div class='add'>+        struct tty_ldisc {</div><div class='add'>+	        int	magic;</div><div class='add'>+        	...</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+当你以å�Žç»™å†…核添加增强功能的时候，请é�µå®ˆè¿™æ�¡è§„则ï¼�这样就会节çœ�æ•°ä¸�清的调试时间，特别是一些å�¤æ€ªçš„情况，例如，数组超出范围并且é‡�新写了超出部分。é�µå®ˆè¿™ä¸ªè§„则，‪这些情况å�¯ä»¥è¢«å¿«é€Ÿåœ°ï¼Œå®‰å…¨åœ°é�¿å…�。</div><div class='add'>+</div><div class='add'>+		Theodore Ts'o</div><div class='add'>+		  31 Mar 94</div><div class='add'>+</div><div class='add'>+给当å‰�çš„Linux 2.1.55添加魔术表。</div><div class='add'>+</div><div class='add'>+		Michael Chastain</div><div class='add'>+		&lt;mailto:mec@shout.net&gt;</div><div class='add'>+		22 Sep 1997</div><div class='add'>+</div><div class='add'>+现在应该最新的Linux 2.1.112.因为在特性冻结期间，ä¸�能在2.2.xå‰�改å�˜ä»»ä½•ä¸œè¥¿ã€‚这些æ�¡ç›®è¢«æ•°åŸŸæ‰€æŽ’åº�。</div><div class='add'>+</div><div class='add'>+		Krzysztof G.Baranowski</div><div class='add'>+	        &lt;mailto: kgb@knm.org.pl&gt;</div><div class='add'>+		29 Jul 1998</div><div class='add'>+</div><div class='add'>+更新魔术表到Linux 2.5.45。刚好越过特性冻结，但是有å�¯èƒ½è¿˜ä¼šæœ‰ä¸€äº›æ–°çš„魔术值在2.6.x之å‰�èž�入到内核中。</div><div class='add'>+</div><div class='add'>+		Petr Baudis</div><div class='add'>+		&lt;pasky@ucw.cz&gt;</div><div class='add'>+		03 Nov 2002</div><div class='add'>+</div><div class='add'>+更新魔术表到Linux 2.5.74。</div><div class='add'>+</div><div class='add'>+		Fabian Frederick</div><div class='add'>+                &lt;ffrederick@users.sourceforge.net&gt;</div><div class='add'>+		09 Jul 2003</div><div class='add'>+</div><div class='add'>+===================== ================ ======================== ==========================================</div><div class='add'>+魔术数å��              æ•°å­—             结构                     文件</div><div class='add'>+===================== ================ ======================== ==========================================</div><div class='add'>+PG_MAGIC              'P'              pg_{read,write}_hdr      ``include/linux/pg.h``</div><div class='add'>+CMAGIC                0x0111           user                     ``include/linux/a.out.h``</div><div class='add'>+MKISS_DRIVER_MAGIC    0x04bf           mkiss_channel            ``drivers/net/mkiss.h``</div><div class='add'>+HDLC_MAGIC            0x239e           n_hdlc                   ``drivers/char/n_hdlc.c``</div><div class='add'>+APM_BIOS_MAGIC        0x4101           apm_user                 ``arch/x86/kernel/apm_32.c``</div><div class='add'>+CYCLADES_MAGIC        0x4359           cyclades_port            ``include/linux/cyclades.h``</div><div class='add'>+DB_MAGIC              0x4442           fc_info                  ``drivers/net/iph5526_novram.c``</div><div class='add'>+DL_MAGIC              0x444d           fc_info                  ``drivers/net/iph5526_novram.c``</div><div class='add'>+FASYNC_MAGIC          0x4601           fasync_struct            ``include/linux/fs.h``</div><div class='add'>+FF_MAGIC              0x4646           fc_info                  ``drivers/net/iph5526_novram.c``</div><div class='add'>+ISICOM_MAGIC          0x4d54           isi_port                 ``include/linux/isicom.h``</div><div class='add'>+PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``</div><div class='add'>+PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``</div><div class='add'>+SERIAL_MAGIC          0x5301           async_struct             ``include/linux/serial.h``</div><div class='add'>+SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``</div><div class='add'>+SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``</div><div class='add'>+STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``</div><div class='add'>+X25_ASY_MAGIC         0x5303           x25_asy                  ``drivers/net/x25_asy.h``</div><div class='add'>+SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``</div><div class='add'>+AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``</div><div class='add'>+TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``</div><div class='add'>+MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``</div><div class='add'>+TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``</div><div class='add'>+MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``</div><div class='add'>+TTY_LDISC_MAGIC       0x5403           tty_ldisc                ``include/linux/tty_ldisc.h``</div><div class='add'>+USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``</div><div class='add'>+FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``</div><div class='add'>+USB_BLUETOOTH_MAGIC   0x6d02           usb_bluetooth            ``drivers/usb/class/bluetty.c``</div><div class='add'>+RFCOMM_TTY_MAGIC      0x6d02                                    ``net/bluetooth/rfcomm/tty.c``</div><div class='add'>+USB_SERIAL_PORT_MAGIC 0x7301           usb_serial_port          ``drivers/usb/serial/usb-serial.h``</div><div class='add'>+CG_MAGIC              0x00090255       ufs_cylinder_group       ``include/linux/ufs_fs.h``</div><div class='add'>+RPORT_MAGIC           0x00525001       r_port                   ``drivers/char/rocket_int.h``</div><div class='add'>+LSEMAGIC              0x05091998       lse                      ``drivers/fc4/fc.c``</div><div class='add'>+GDTIOCTL_MAGIC        0x06030f07       gdth_iowr_str            ``drivers/scsi/gdth_ioctl.h``</div><div class='add'>+RIEBL_MAGIC           0x09051990                                ``drivers/net/atarilance.c``</div><div class='add'>+NBD_REQUEST_MAGIC     0x12560953       nbd_request              ``include/linux/nbd.h``</div><div class='add'>+RED_MAGIC2            0x170fc2a5       (any)                    ``mm/slab.c``</div><div class='add'>+BAYCOM_MAGIC          0x19730510       baycom_state             ``drivers/net/baycom_epp.c``</div><div class='add'>+ISDN_X25IFACE_MAGIC   0x1e75a2b9       isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``</div><div class='add'>+ECP_MAGIC             0x21504345       cdkecpsig                ``include/linux/cdk.h``</div><div class='add'>+LSOMAGIC              0x27091997       lso                      ``drivers/fc4/fc.c``</div><div class='add'>+LSMAGIC               0x2a3b4d2a       ls                       ``drivers/fc4/fc.c``</div><div class='add'>+WANPIPE_MAGIC         0x414C4453       sdla_{dump,exec}         ``include/linux/wanpipe.h``</div><div class='add'>+CS_CARD_MAGIC         0x43525553       cs_card                  ``sound/oss/cs46xx.c``</div><div class='add'>+LABELCL_MAGIC         0x4857434c       labelcl_info_s           ``include/asm/ia64/sn/labelcl.h``</div><div class='add'>+ISDN_ASYNC_MAGIC      0x49344C01       modem_info               ``include/linux/isdn.h``</div><div class='add'>+CTC_ASYNC_MAGIC       0x49344C01       ctc_tty_info             ``drivers/s390/net/ctctty.c``</div><div class='add'>+ISDN_NET_MAGIC        0x49344C02       isdn_net_local_s         ``drivers/isdn/i4l/isdn_net_lib.h``</div><div class='add'>+SAVEKMSG_MAGIC2       0x4B4D5347       savekmsg                 ``arch/*/amiga/config.c``</div><div class='add'>+CS_STATE_MAGIC        0x4c4f4749       cs_state                 ``sound/oss/cs46xx.c``</div><div class='add'>+SLAB_C_MAGIC          0x4f17a36d       kmem_cache               ``mm/slab.c``</div><div class='add'>+COW_MAGIC             0x4f4f4f4d       cow_header_v1            ``arch/um/drivers/ubd_user.c``</div><div class='add'>+I810_CARD_MAGIC       0x5072696E       i810_card                ``sound/oss/i810_audio.c``</div><div class='add'>+TRIDENT_CARD_MAGIC    0x5072696E       trident_card             ``sound/oss/trident.c``</div><div class='add'>+ROUTER_MAGIC          0x524d4157       wan_device               [in ``wanrouter.h`` pre 3.9]</div><div class='add'>+SAVEKMSG_MAGIC1       0x53415645       savekmsg                 ``arch/*/amiga/config.c``</div><div class='add'>+GDA_MAGIC             0x58464552       gda                      ``arch/mips/include/asm/sn/gda.h``</div><div class='add'>+RED_MAGIC1            0x5a2cf071       (any)                    ``mm/slab.c``</div><div class='add'>+EEPROM_MAGIC_VALUE    0x5ab478d2       lanai_dev                ``drivers/atm/lanai.c``</div><div class='add'>+HDLCDRV_MAGIC         0x5ac6e778       hdlcdrv_state            ``include/linux/hdlcdrv.h``</div><div class='add'>+PCXX_MAGIC            0x5c6df104       channel                  ``drivers/char/pcxx.h``</div><div class='add'>+KV_MAGIC              0x5f4b565f       kernel_vars_s            ``arch/mips/include/asm/sn/klkernvars.h``</div><div class='add'>+I810_STATE_MAGIC      0x63657373       i810_state               ``sound/oss/i810_audio.c``</div><div class='add'>+TRIDENT_STATE_MAGIC   0x63657373       trient_state             ``sound/oss/trident.c``</div><div class='add'>+M3_CARD_MAGIC         0x646e6f50       m3_card                  ``sound/oss/maestro3.c``</div><div class='add'>+FW_HEADER_MAGIC       0x65726F66       fw_header                ``drivers/atm/fore200e.h``</div><div class='add'>+SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``</div><div class='add'>+SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``</div><div class='add'>+LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``</div><div class='add'>+OPROFILE_MAGIC        0x6f70726f       super_block              ``drivers/oprofile/oprofilefs.h``</div><div class='add'>+M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``</div><div class='add'>+VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``</div><div class='add'>+KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``</div><div class='add'>+PWC_MAGIC             0x89DC10AB       pwc_device               ``drivers/usb/media/pwc.h``</div><div class='add'>+NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``</div><div class='add'>+ENI155_MAGIC          0xa54b872d       midway_eprom	        ``drivers/atm/eni.h``</div><div class='add'>+CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``</div><div class='add'>+DPMEM_MAGIC           0xc0ffee11       gdt_pci_sram             ``drivers/scsi/gdth.h``</div><div class='add'>+YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``</div><div class='add'>+CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``</div><div class='add'>+QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``</div><div class='add'>+QUEUE_MAGIC_USED      0xf7e1cc33       queue_entry              ``drivers/scsi/arm/queue.c``</div><div class='add'>+HTB_CMAGIC            0xFEFAFEF1       htb_class                ``net/sched/sch_htb.c``</div><div class='add'>+NMI_MAGIC             0x48414d4d455201 nmi_s                    ``arch/mips/include/asm/sn/nmi.h``</div><div class='add'>+===================== ================ ======================== ==========================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+请注æ„�，在声音记忆管ç�†ä¸­ä»�然有一些特殊的为æ¯�个驱动定义的魔术值。查看include/sound/sndmagic.hæ�¥èŽ·å�–他们完整的列表信æ�¯ã€‚很多OSS声音驱动拥有自己从声å�¡PCI ID构建的魔术值-他们也没有被列在这里。</div><div class='add'>+</div><div class='add'>+IrDAå­�系统也使用了大é‡�的自己的魔术值，查看include/net/irda/irda.hæ�¥èŽ·å�–他们完整的信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+HFS是å�¦å¤–一个比较大的使用魔术值的文件系统-ä½ å�¯ä»¥åœ¨fs/hfs/hfs.h中找到他们。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/management-style.rst b/Documentation/translations/zh_CN/process/management-style.rst<br/>new file mode 100644<br/>index 000000000000..a181fa56d19e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/management-style.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/management-style.rst</a></div><div class='hunk'>@@ -0,0 +1,207 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/management-style.rst &lt;managementstyle&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_managementstyle:</div><div class='add'>+</div><div class='add'>+Linux内核管ç�†é£Žæ ¼</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+这是一个简短的文档，æ��述了Linux内核首选的（或胡编的，å�–决于您问è°�）管ç�†é£Žæ ¼ã€‚</div><div class='add'>+它的目的是在æŸ�ç§�程度上å�‚ç…§ :ref:`process/coding-style.rst &lt;codingstyle&gt;`</div><div class='add'>+主è¦�是为了é�¿å…�å��å¤�回答 [#cnf1]_ 相å�Œï¼ˆæˆ–类似）的问题。</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'>+</div><div class='add'>+首先，我建议你购买“高效人的七个习惯â€�，而ä¸�是阅读它。烧了它，这是一个伟大的</div><div class='add'>+象å¾�性姿æ€�。</div><div class='add'>+</div><div class='add'>+.. [#cnf1] 本文件并ä¸�是通过回答问题，而是通过让æ��问者痛苦地明白，我们ä¸�知é�“</div><div class='add'>+   答案是什么。</div><div class='add'>+</div><div class='add'>+ä¸�管怎样，这里是：</div><div class='add'>+</div><div class='add'>+.. _decisions:</div><div class='add'>+</div><div class='add'>+1）决策</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+æ¯�个人都认为管ç�†è€…å�šå†³å®šï¼Œè€Œä¸”决策很é‡�è¦�。决定越大越痛苦，管ç�†è€…就必须越高级。</div><div class='add'>+这很明显，但事实并é�žå¦‚此。</div><div class='add'>+</div><div class='add'>+游æˆ�çš„å��字是 **é�¿å…�** å�šå‡ºå†³å®šã€‚尤其是，如果有人告诉你“选择（a）或（b），</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'>+需è¦�å�šçš„是将那些大的和痛苦的决定å�˜æˆ�那些没有人真正关心的å°�事情。</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'>+因此，é�¿å…�é‡�大决策的关键在于é�¿å…�å�šé‚£äº›æ— æ³•æŒ½å›žçš„事情。ä¸�è¦�被引导到一个你无法</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'>+事实è¯�明，有些人对接å�—è¿™ç§�方法有困难，原因有两个：</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'>+令人欣慰的是，这两个原因都å�¯ä»¥é€šè¿‡é¢„先承认你没有任何线索，æ��å‰�告诉人们你的</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'>+的工作将会进入（内核）鼓励他们。在他们开始一项巨大的努力之å‰�，至少让他们三</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'>+最终的答案å�¯èƒ½æ˜¯ä¸¤ä¸ªå›¢é˜Ÿéƒ½ä¼šå› ä¸ºè¿™ç§�情况而感到沮丧，以至于他们放弃了。</div><div class='add'>+</div><div class='add'>+è¿™å�¬èµ·æ�¥åƒ�是一个失败，但这通常是一个迹象，表明两个项目都有问题，而å�‚与其中</div><div class='add'>+的人ä¸�能å�šå†³å®šçš„原因是他们都是错误的。你最终会闻到玫瑰的味é�“，你é�¿å…�了å�¦ä¸€</div><div class='add'>+个你本å�¯ä»¥æ�žç ¸çš„决定。</div><div class='add'>+</div><div class='add'>+2）人</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'>+但是，为了å�šå¥½ä½œä¸ºå†…核管ç�†è€…的准备，最好记ä½�ä¸�è¦�烧掉任何桥æ¢�，ä¸�è¦�轰炸任何</div><div class='add'>+无辜的æ�‘民，也ä¸�è¦�ç–�远太多的内核开å�‘人员。事实è¯�明，ç–�远人是相当容易的，而</div><div class='add'>+亲近一个ç–�远的人是很难的。因此，“ç–�è¿œâ€�ç«‹å�³å±žäºŽâ€œä¸�å�¯é€†â€�的范畴，并根æ�®</div><div class='add'>+:ref:`decisions` æˆ�为ç»�ä¸�å�¯ä»¥å�šçš„事情。</div><div class='add'>+</div><div class='add'>+这里å�ªæœ‰å‡ ä¸ªç®€å�•çš„规则：</div><div class='add'>+</div><div class='add'>+ (1) ä¸�è¦�å�«äººç¬¨è›‹ï¼ˆè‡³å°‘ä¸�è¦�在公共场å�ˆï¼‰</div><div class='add'>+ (2) 学习如何在忘记规则(1)æ—¶é�“æ­‰</div><div class='add'>+</div><div class='add'>+问题在于 #1 很容易去å�šï¼Œå› ä¸ºä½ å�¯ä»¥ç”¨æ•°ç™¾ä¸‡ç§�ä¸�å�Œçš„æ–¹å¼�说“你是一个笨蛋â€� [#cnf2]_</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'>+ - 把“爱â€�å�‡åŒ€åœ°æ•£å¼€ï¼Œæ²¡æœ‰äººä¼šçœŸæ­£æ„Ÿè§‰åˆ°è‡ªå·±è¢«ä¸�公平地瞄准了。让它有足够的</div><div class='add'>+   创造性，他们甚至å�¯èƒ½ä¼šè§‰å¾—好笑。</div><div class='add'>+</div><div class='add'>+选择永远ä¿�æŒ�礼貌是ä¸�存在的。没有人会相信一个如此明显地éš�è—�了他们真实性格的人。</div><div class='add'>+</div><div class='add'>+.. [#cnf2] ä¿�罗·西蒙演唱了“离开爱人的50ç§�方法â€�，因为å�¦çŽ‡åœ°è¯´ï¼Œâ€œå‘Šè¯‰å¼€å�‘者</div><div class='add'>+   他们是D*CKHEAD" çš„100万ç§�方法都无法确认。但我确信他已ç»�这么想了。</div><div class='add'>+</div><div class='add'>+3）人2 - 好人</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'>+作为内核维护人员，确ä¿�您在第二组中。接å�—他们，因为他们会让你的工作更容易。</div><div class='add'>+特别是，他们能够为你å�šå†³å®šï¼Œè¿™å°±æ˜¯æ¸¸æˆ�的全部内容。</div><div class='add'>+</div><div class='add'>+所以当你å�‘现一个比你è�ªæ˜Žçš„人时，就顺其自然å�§ã€‚你的管ç�†è�Œè´£åœ¨å¾ˆå¤§ç¨‹åº¦ä¸Šå�˜æˆ�</div><div class='add'>+了“å�¬èµ·æ�¥åƒ�是个好主æ„�——去å°�试å�§â€�，或者“å�¬èµ·æ�¥ä¸�错，但是XXX呢？â€�“。第二个版</div><div class='add'>+本尤其是一个很好的方法，è¦�么学习一些关于“XXXâ€�的新东西，è¦�么通过指出一些è�ªæ˜Ž</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'>+4）责备</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'>+没有å�—到指责. é‚£è°�，失去了他们的全部36GB色情收è—�的人，因为你的无能将勉强承</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'>+在已ç»�很擅长说了。</div><div class='add'>+</div><div class='add'>+5）应é�¿å…�的事情</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'>+æŸ�人 [#cnf3]_</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'>+</div><div class='add'>+.. [#cnf3] æ��示：与你的工作没有直接关系的网络新闻组是消除你对他人ä¸�满的好</div><div class='add'>+   方法。å�¶å°”写些侮辱性的帖å­�，打个喷åš�，让你的情绪得到净化。别把牢骚带回家</div><div class='add'>+</div><div class='add'>+6）为什么是我？</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'>+</div><div class='add'>+如果你å�¯ä»¥å�šåˆ°è¿™ä¸ªï¼Œ 这是个伟大的工作ï¼�</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/programming-language.rst b/Documentation/translations/zh_CN/process/programming-language.rst<br/>new file mode 100644<br/>index 000000000000..51fd4ef48ea1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/programming-language.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/programming-language.rst</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/programming-language.rst &lt;programming_language&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_programming_language:</div><div class='add'>+</div><div class='add'>+程åº�设计语言</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+内核是用C语言 [c-language]_ 编写的。更准确地说，内核通常是用 ``gcc`` [gcc]_</div><div class='add'>+在 ``-std=gnu89`` [gcc-c-dialect-options]_ 下编译的：ISO C90çš„ GNU 方言（</div><div class='add'>+包括一些C99特性）</div><div class='add'>+</div><div class='add'>+è¿™ç§�方言包å�«å¯¹è¯­è¨€ [gnu-extensions]_ 的许多扩展，当然，它们许多都在内核中使用。</div><div class='add'>+</div><div class='add'>+对于一些体系结构，有一些使用 ``clang`` [clang]_ å’Œ ``icc`` [icc]_ 编译内核</div><div class='add'>+的支æŒ�，尽管在编写此文档时还没有完æˆ�，ä»�需è¦�第三方补ä¸�。</div><div class='add'>+</div><div class='add'>+属性</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+在整个内核中使用的一个常è§�扩展是属性（attributes） [gcc-attribute-syntax]_</div><div class='add'>+属性å…�许将实现定义的语义引入语言实体（如å�˜é‡�ã€�函数或类型），而无需对语言进行</div><div class='add'>+é‡�大的语法更改（例如添加新关键字） [n2049]_</div><div class='add'>+</div><div class='add'>+在æŸ�些情况下，属性是å�¯é€‰çš„（å�³ä¸�支æŒ�这些属性的编译器ä»�然应该生æˆ�正确的代ç �，</div><div class='add'>+å�³ä½¿å…¶é€Ÿåº¦è¾ƒæ…¢æˆ–执行的编译时检查/诊断次数ä¸�够）</div><div class='add'>+</div><div class='add'>+内核定义了伪关键字（例如， ``pure`` ），而ä¸�是直接使用GNU属性语法（例如,</div><div class='add'>+``__attribute__((__pure__))`` ），以检测å�¯ä»¥ä½¿ç”¨å“ªäº›å…³é”®å­—å’Œ/或缩短代ç �, 具体</div><div class='add'>+请å�‚阅 ``include/linux/compiler_attributes.h``</div><div class='add'>+</div><div class='add'>+.. [c-language] http://www.open-std.org/jtc1/sc22/wg14/www/standards</div><div class='add'>+.. [gcc] https://gcc.gnu.org</div><div class='add'>+.. [clang] https://clang.llvm.org</div><div class='add'>+.. [icc] https://software.intel.com/en-us/c-compilers</div><div class='add'>+.. [gcc-c-dialect-options] https://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html</div><div class='add'>+.. [gnu-extensions] https://gcc.gnu.org/onlinedocs/gcc/C-Extensions.html</div><div class='add'>+.. [gcc-attribute-syntax] https://gcc.gnu.org/onlinedocs/gcc/Attribute-Syntax.html</div><div class='add'>+.. [n2049] http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2049.pdf</div><div class='head'>diff --git a/Documentation/translations/zh_CN/stable_api_nonsense.txt b/Documentation/translations/zh_CN/process/stable-api-nonsense.rst<br/>index a2b27fab382c..b4ddb6e88d9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/stable_api_nonsense.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/stable_api_nonsense.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/stable-api-nonsense.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/stable-api-nonsense.rst</a></div><div class='hunk'>@@ -1,26 +1,18 @@</div><div class='del'>-Chinese translated version of Documentation/process/stable-api-nonsense.rst</div><div class='add'>+.. _cn_stable_api_nonsense:</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for help.</div><div class='del'>-Contact the Chinese maintainer, if this translation is outdated or there</div><div class='del'>-is problem with translation.</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-Chinese maintainer: TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/stable-api-nonsense.rst 的中文翻译</div><div class='add'>+:Original: :ref:`Documentation/process/stable-api-nonsense.rst</div><div class='add'>+           &lt;stable_api_nonsense&gt;`</div><div class='ctx'> </div><div class='del'>-如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='del'>-交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='add'>+译者::</div><div class='ctx'> </div><div class='del'>-英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-中文版维护者： 钟宇  TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='del'>-中文版翻译者： 钟宇  TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='del'>-中文版校译者： æ�Žé˜³  Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='add'>+        中文版维护者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+        中文版翻译者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+        中文版校译者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+</div><div class='add'>+Linux 内核驱动接å�£</div><div class='add'>+==================</div><div class='ctx'> </div><div class='ctx'> 写作本文档的目的，是为了解释为什么Linux既没有二进制内核接å�£ï¼Œä¹Ÿæ²¡æœ‰ç¨³å®š</div><div class='ctx'> 的内核接å�£ã€‚这里所说的内核接å�£ï¼Œæ˜¯æŒ‡å†…核里的接å�£ï¼Œè€Œä¸�是内核和用户空间</div><div class='hunk'>@@ -59,18 +51,22 @@ Linux能æˆ�为强壮，稳定，æˆ�熟的æ“�作系统，这也是你最开始选</div><div class='ctx'> --------------</div><div class='ctx'> å�‡å¦‚我们有一个稳定的内核æº�代ç �接å�£ï¼Œé‚£ä¹ˆè‡ªç„¶è€Œç„¶çš„，我们就拥有了稳定的</div><div class='ctx'> 二进制接å�£ï¼Œæ˜¯è¿™æ ·çš„å�—？错。让我们看看关于Linux内核的几点事实：</div><div class='add'>+</div><div class='ctx'>     - å�–决于所用的C编译器的版本，ä¸�å�Œçš„内核数æ�®ç»“构里的结构体的对é½�æ–¹</div><div class='del'>-å¼�会有差别，代ç �中ä¸�å�Œå‡½æ•°çš„表现形å¼�也ä¸�一样（函数是ä¸�是被inline编译å�–</div><div class='del'>-决于编译器行为）。ä¸�å�Œçš„函数的表现形å¼�并ä¸�é‡�è¦�，但是数æ�®ç»“构内部的对é½�</div><div class='del'>-æ–¹å¼�很关键。</div><div class='add'>+      å¼�会有差别，代ç �中ä¸�å�Œå‡½æ•°çš„表现形å¼�也ä¸�一样（函数是ä¸�是被inline</div><div class='add'>+      编译å�–决于编译器行为）。ä¸�å�Œçš„函数的表现形å¼�并ä¸�é‡�è¦�，但是数æ�®</div><div class='add'>+      结构内部的对é½�æ–¹å¼�很关键。</div><div class='add'>+</div><div class='ctx'>     - å�–决于内核的é…�置选项，ä¸�å�Œçš„选项会让内核的很多东西å�‘生改å�˜ï¼š</div><div class='add'>+</div><div class='ctx'>       - å�Œä¸€ä¸ªç»“构体å�¯èƒ½åŒ…å�«ä¸�å�Œçš„æˆ�员å�˜é‡�</div><div class='ctx'>       - 有的函数å�¯èƒ½æ ¹æœ¬ä¸�会被实现（比如编译的时候没有选择SMP支æŒ�</div><div class='del'>-，一些é”�函数就会被定义æˆ�空函数）。</div><div class='add'>+        一些é”�函数就会被定义æˆ�空函数）。</div><div class='ctx'>       - 内核使用的内存会以ä¸�å�Œçš„æ–¹å¼�对é½�，这å�–决于ä¸�å�Œçš„内核é…�置选</div><div class='del'>-项。</div><div class='add'>+        项。</div><div class='add'>+</div><div class='ctx'>     - Linuxå�¯ä»¥åœ¨å¾ˆå¤šçš„ä¸�å�Œä½“系结构的处ç�†å™¨ä¸Šè¿�行。在æŸ�个体系结构上编</div><div class='del'>-译好的二进制驱动程åº�，ä¸�å�¯èƒ½åœ¨å�¦å¤–一个体系结构上正确的è¿�行。</div><div class='add'>+      译好的二进制驱动程åº�，ä¸�å�¯èƒ½åœ¨å�¦å¤–一个体系结构上正确的è¿�行。</div><div class='ctx'> </div><div class='ctx'> 对于一个特定的内核，满足这些æ�¡ä»¶å¹¶ä¸�难，使用å�Œä¸€ä¸ªC编译器和å�Œæ ·çš„内核é…�</div><div class='ctx'> 置选项æ�¥ç¼–译驱动程åº�模å�—å°±å�¯ä»¥äº†ã€‚这对于给一个特定Linuxå�‘布的特定版本æ��</div><div class='hunk'>@@ -90,7 +86,7 @@ Linux能æˆ�为强壮，稳定，æˆ�熟的æ“�作系统，这也是你最开始选</div><div class='ctx'> </div><div class='ctx'> 如果有人ä¸�将他的内核驱动程åº�，放入公版内核的æº�代ç �树，而å�ˆæƒ³è®©é©±åŠ¨ç¨‹åº�</div><div class='ctx'> 一直ä¿�æŒ�在最新的内核中å�¯ç”¨ï¼Œé‚£ä¹ˆè¿™ä¸ªè¯�题将会å�˜å¾—没完没了。</div><div class='del'>- 内核开å�‘是æŒ�续而且快节å¥�的，从æ�¥éƒ½ä¸�会慢下æ�¥ã€‚内核开å�‘人员在当å‰�接å�£ä¸­</div><div class='add'>+内核开å�‘是æŒ�续而且快节å¥�的，从æ�¥éƒ½ä¸�会慢下æ�¥ã€‚内核开å�‘人员在当å‰�接å�£ä¸­</div><div class='ctx'> 找到bug，或者找到更好的实现方å¼�。一旦å�‘现这些，他们就很快会去修改当å‰�çš„</div><div class='ctx'> 接å�£ã€‚修改接å�£æ„�味ç�€ï¼Œå‡½æ•°å��å�¯èƒ½ä¼šæ”¹å�˜ï¼Œç»“构体å�¯èƒ½è¢«æ‰©å……或者删å‡�，函数</div><div class='ctx'> çš„å�‚数也å�¯èƒ½å�‘生改å�˜ã€‚一旦接å�£è¢«ä¿®æ”¹ï¼Œå†…核中使用这些接å�£çš„地方需è¦�å�Œæ—¶</div><div class='hunk'>@@ -98,21 +94,22 @@ Linux能æˆ�为强壮，稳定，æˆ�熟的æ“�作系统，这也是你最开始选</div><div class='ctx'> </div><div class='ctx'> 举一个例å­�，内核的USB驱动程åº�接å�£åœ¨USBå­�系统的整个生命周期中，至少ç»�历</div><div class='ctx'> 了三次é‡�写。这些é‡�写解决以下问题：</div><div class='add'>+</div><div class='ctx'>     - 把数æ�®æµ�从å�Œæ­¥æ¨¡å¼�改æˆ�é�žå�Œæ­¥æ¨¡å¼�，这个改动å‡�少了一些驱动程åº�çš„</div><div class='del'>-å¤�æ�‚度，æ��高了所有USB驱动程åº�çš„å�žå��率，这样几乎所有的USB设备都能以最大</div><div class='del'>-速率工作了。</div><div class='add'>+      å¤�æ�‚度，æ��高了所有USB驱动程åº�çš„å�žå��率，这样几乎所有的USB设备都</div><div class='add'>+      能以最大速率工作了。</div><div class='ctx'>     - 修改了USB核心代ç �中为USB驱动分é…�æ•°æ�®åŒ…内存的方å¼�，所有的驱动都</div><div class='del'>-需è¦�æ��供更多的å�‚æ•°ç»™USB核心，以修正了很多已ç»�被记录在案的死é”�。</div><div class='add'>+      需è¦�æ��供更多的å�‚æ•°ç»™USB核心，以修正了很多已ç»�被记录在案的死é”�。</div><div class='ctx'> </div><div class='ctx'> 这和一些å°�é—­æº�代ç �çš„æ“�作系统形æˆ�鲜明的对比，在那些æ“�作系统上，ä¸�å¾—ä¸�é¢�</div><div class='ctx'> 外的维护旧的USB接å�£ã€‚这导致了一个å�¯èƒ½æ€§ï¼Œæ–°çš„å¼€å�‘者ä¾�然会ä¸�å°�心使用旧的</div><div class='ctx'> 接å�£ï¼Œä»¥ä¸�æ�°å½“çš„æ–¹å¼�编写代ç �，进而影å“�到æ“�作系统的稳定性。</div><div class='del'>- 在上é�¢çš„例å­�中，所有的开å�‘者都å�Œæ„�这些é‡�è¦�的改动，在这样的情况下修改代</div><div class='add'>+在上é�¢çš„例å­�中，所有的开å�‘者都å�Œæ„�这些é‡�è¦�的改动，在这样的情况下修改代</div><div class='ctx'> 价很低。如果Linuxä¿�æŒ�一个稳定的内核æº�代ç �接å�£ï¼Œé‚£ä¹ˆå°±å¾—创建一个新的接å�£</div><div class='ctx'> ；旧的，有问题的接å�£å¿…须一直维护，给Linux USBå¼€å�‘者带æ�¥é¢�外的工作。既然</div><div class='ctx'> 所有的Linux USB驱动的作者都是利用自己的时间工作，那么è¦�求他们去å�šæ¯«æ— æ„�</div><div class='ctx'> 义的å…�è´¹é¢�外工作，是ä¸�å�¯èƒ½çš„。</div><div class='del'>- 安全问题对Linuxæ�¥è¯´å��分é‡�è¦�。一个安全问题被å�‘现，就会在短时间内得到修</div><div class='add'>+安全问题对Linuxæ�¥è¯´å��分é‡�è¦�。一个安全问题被å�‘现，就会在短时间内得到修</div><div class='ctx'> 正。在很多情况下，这将导致Linux内核中的一些接å�£è¢«é‡�写，以从根本上é�¿å…�安</div><div class='ctx'> 全问题。一旦接å�£è¢«é‡�写，所有使用这些接å�£çš„驱动程åº�，必须å�Œæ—¶å¾—到修正，</div><div class='ctx'> 以确定安全问题已ç»�得到修å¤�并且ä¸�å�¯èƒ½åœ¨æœªæ�¥è¿˜æœ‰å�Œæ ·çš„安全问题。如果内核</div><div class='hunk'>@@ -124,7 +121,7 @@ Linux能æˆ�为强壮，稳定，æˆ�熟的æ“�作系统，这也是你最开始选</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> è¦�å�šä»€ä¹ˆ</div><div class='del'>--------</div><div class='add'>+--------</div><div class='ctx'> </div><div class='ctx'> 如果你写了一个Linux内核驱动，但是它还ä¸�在Linuxæº�代ç �树里，作为一个开å�‘</div><div class='ctx'> 者，你应该怎么å�šï¼Ÿä¸ºæ¯�个å�‘布的æ¯�个版本æ��供一个二进制驱动，那简直是一个</div><div class='hunk'>@@ -137,20 +134,21 @@ Linux能æˆ�为强壮，稳定，æˆ�熟的æ“�作系统，这也是你最开始选</div><div class='ctx'> å�šä»€ä¹ˆäº‹æƒ…。</div><div class='ctx'> </div><div class='ctx'> 把驱动放到内核æº�代ç �树里会有很多的好处：</div><div class='add'>+</div><div class='ctx'>     - 驱动的质é‡�会æ��å�‡ï¼Œè€Œç»´æŠ¤æˆ�本（对原始作者æ�¥è¯´ï¼‰ä¼šä¸‹é™�。</div><div class='ctx'>     - 其他人会给驱动添加新特性。</div><div class='ctx'>     - 其他人会找到驱动中的bug并修å¤�。</div><div class='ctx'>     - 其他人会在驱动中找到性能优化的机会。</div><div class='ctx'>     - 当外部的接å�£çš„改å�˜éœ€è¦�修改驱动程åº�的时候，其他人会修改驱动程åº�</div><div class='del'>-。</div><div class='ctx'>     - ä¸�需è¦�è�”系任何å�‘行商，这个驱动会自动的éš�ç�€æ‰€æœ‰çš„Linuxå�‘布一起å�‘</div><div class='del'>-布。</div><div class='add'>+      布。</div><div class='ctx'> </div><div class='ctx'> 和别的æ“�作系统相比，Linux为更多ä¸�å�Œçš„设备æ��供现æˆ�的驱动，而且能在更多ä¸�</div><div class='ctx'> å�Œä½“系结构的处ç�†å™¨ä¸Šæ”¯æŒ�这些设备。这个ç»�过考验的开å�‘模å¼�，必然是错ä¸�了</div><div class='ctx'> çš„ :)</div><div class='ctx'> </div><div class='del'>--------------</div><div class='add'>+æ„Ÿè°¢</div><div class='add'>+----</div><div class='ctx'> æ„Ÿè°¢ Randy Dunlap, Andrew Morton, David Brownell, Hanna Linder,</div><div class='ctx'> Robert Love, and Nishanth Aravamudan 对于本文档早期版本的评审和建议。</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/zh_CN/stable_kernel_rules.txt b/Documentation/translations/zh_CN/process/stable-kernel-rules.rst<br/>index db4ba5a0c39a..fba361f2ddfd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/stable_kernel_rules.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/stable_kernel_rules.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/stable-kernel-rules.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/stable-kernel-rules.rst</a></div><div class='hunk'>@@ -1,31 +1,26 @@</div><div class='del'>-Chinese translated version of Documentation/process/stable-kernel-rules.rst</div><div class='add'>+.. _cn_stable_kernel_rules:</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-Chinese maintainer: TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/stable-kernel-rules.rst 的中文翻译</div><div class='add'>+:Original: :ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='ctx'> </div><div class='ctx'> 如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='ctx'> 交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='add'>+译存在问题，请è�”系中文版维护者::</div><div class='ctx'> </div><div class='add'>+        中文版维护者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+        中文版翻译者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+        中文版校译者：</div><div class='add'>+            - æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+            - Kangkai Yin &lt;e12051@motorola.com&gt;</div><div class='ctx'> </div><div class='del'>-中文版维护者： 钟宇  TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： 钟宇  TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版校译者： æ�Žé˜³  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-               Kangkai Yin &lt;e12051@motorola.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='add'>+所有你想知é�“的事情 - 关于linux稳定版å�‘布</div><div class='add'>+========================================</div><div class='ctx'> </div><div class='ctx'> 关于Linux 2.6稳定版å�‘布，所有你想知é�“的事情。</div><div class='ctx'> </div><div class='ctx'> 关于哪些类型的补ä¸�å�¯ä»¥è¢«æŽ¥æ”¶è¿›å…¥ç¨³å®šç‰ˆä»£ç �树，哪些ä¸�å�¯ä»¥çš„规则：</div><div class='add'>+----------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'>   - 必须是显而易è§�的正确，并且ç»�过测试的。</div><div class='ctx'>   - è¿žå�Œä¸Šä¸‹æ–‡ï¼Œä¸�能大于100行。</div><div class='hunk'>@@ -38,9 +33,10 @@ Documentation/process/stable-kernel-rules.rst 的中文翻译</div><div class='ctx'>   - 没有“ç�†è®ºä¸Šçš„竞争æ�¡ä»¶â€�，除é�žèƒ½ç»™å‡ºç«žäº‰æ�¡ä»¶å¦‚何被利用的解释。</div><div class='ctx'>   - ä¸�能存在任何的“ç��碎的â€�修正（拼写修正，去掉多余空格之类的）。</div><div class='ctx'>   - 必须被相关å­�系统的维护者接å�—。</div><div class='del'>-  - å¿…é¡»é�µå¾ªDocumentation/process/submitting-patches.rst里的规则。</div><div class='add'>+  - å¿…é¡»é�µå¾ªDocumentation/translations/zh_CN/process/submitting-patches.rst里的规则。</div><div class='ctx'> </div><div class='ctx'> å�‘稳定版代ç �æ ‘æ��交补ä¸�的过程：</div><div class='add'>+------------------------------</div><div class='ctx'> </div><div class='ctx'>   - 在确认了补ä¸�符å�ˆä»¥ä¸Šçš„规则å�Žï¼Œå°†è¡¥ä¸�å�‘é€�到stable@vger.kernel.org。</div><div class='ctx'>   - 如果补ä¸�被接å�—到队列里，å�‘é€�者会收到一个ACK回å¤�，如果没有被接å�—，收</div><div class='hunk'>@@ -49,6 +45,7 @@ Documentation/process/stable-kernel-rules.rst 的中文翻译</div><div class='ctx'>   - 安全方é�¢çš„è¡¥ä¸�ä¸�è¦�å�‘到这个列表，应该å�‘é€�到security@kernel.org。</div><div class='ctx'> </div><div class='ctx'> 审查周期：</div><div class='add'>+----------</div><div class='ctx'> </div><div class='ctx'>   - 当稳定版的维护者决定开始一个审查周期，补ä¸�将被å�‘é€�到审查委员会，以</div><div class='ctx'>     å�Šè¢«è¡¥ä¸�å½±å“�的领域的维护者（除é�žæ��交者就是该领域的维护者）并且抄é€�</div><div class='hunk'>@@ -63,4 +60,5 @@ Documentation/process/stable-kernel-rules.rst 的中文翻译</div><div class='ctx'>     通常的审查周期。请è�”系内核安全å°�组以获得关于这个过程的更多细节。</div><div class='ctx'> </div><div class='ctx'> 审查委员会：</div><div class='add'>+------------</div><div class='ctx'>   - 由一些自愿承担这项任务的内核开å�‘者，和几个é�žå¿—愿的组æˆ�。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/submit-checklist.rst b/Documentation/translations/zh_CN/process/submit-checklist.rst<br/>new file mode 100644<br/>index 000000000000..89061aa8fdbe<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/submit-checklist.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/submit-checklist.rst</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/submit-checklist.rst &lt;submitchecklist&gt;`</div><div class='add'>+:Translator: Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+</div><div class='add'>+.. _cn_submitchecklist:</div><div class='add'>+</div><div class='add'>+Linux内核补ä¸�æ��交清å�•</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'>+:ref:`Documentation/translations/zh_CN/process/submitting-patches.rst &lt;cn_submittingpatches&gt;`</div><div class='add'>+和其他有关æ��交Linux内核补ä¸�的文档中æ��供的。</div><div class='add'>+</div><div class='add'>+1) 如果使用工具，则包括定义/声明该工具的文件。ä¸�è¦�ä¾�赖于其他头文件拉入您使用</div><div class='add'>+   的头文件。</div><div class='add'>+</div><div class='add'>+2) 干净的编译：</div><div class='add'>+</div><div class='add'>+   a) 使用适用或修改的 ``CONFIG`` 选项 ``=y``ã€�``=m`` å’Œ ``=n`` 。没有GCC</div><div class='add'>+      警告/错误，没有链接器警告/错误。</div><div class='add'>+</div><div class='add'>+   b) 通过allnoconfigã€�allmodconfig</div><div class='add'>+</div><div class='add'>+   c) 使用 ``O=builddir`` æ—¶å�¯ä»¥æˆ�功编译</div><div class='add'>+</div><div class='add'>+3) 通过使用本地交å�‰ç¼–译工具或其他一些构建场在多个CPU体系结构上构建。</div><div class='add'>+</div><div class='add'>+4) PPC64是一ç§�很好的交å�‰ç¼–译检查体系结构，因为它倾å�‘于对64ä½�的数使用无符å�·</div><div class='add'>+   长整型。</div><div class='add'>+</div><div class='add'>+5) 如下所述 :ref:`Documentation/translations/zh_CN/process/coding-style.rst &lt;cn_codingstyle&gt;`.</div><div class='add'>+   检查您的补ä¸�是å�¦ä¸ºå¸¸è§„æ ·å¼�。在æ��交（ ``scripts/check patch.pl`` ）之å‰�，</div><div class='add'>+   使用补ä¸�æ ·å¼�检查器检查是å�¦æœ‰è½»å¾®çš„冲çª�。您应该能够处ç�†æ‚¨çš„è¡¥ä¸�中存在的所有</div><div class='add'>+   è¿�规行为。</div><div class='add'>+</div><div class='add'>+6) 任何新的或修改过的 ``CONFIG`` 选项都ä¸�会弄è„�é…�ç½®è�œå�•ï¼Œå¹¶é»˜è®¤ä¸ºå…³é—­ï¼Œé™¤é�ž</div><div class='add'>+   它们符å�ˆ ``Documentation/kbuild/kconfig-language.txt`` 中记录的异常æ�¡ä»¶,</div><div class='add'>+   è�œå�•å±žæ€§ï¼šé»˜è®¤å€¼.</div><div class='add'>+</div><div class='add'>+7) 所有新的 ``kconfig`` 选项都有帮助文本。</div><div class='add'>+</div><div class='add'>+8) 已仔细审查了相关的 ``Kconfig`` 组å�ˆã€‚这很难用测试æ�¥çº æ­£â€”—脑力在这里是有</div><div class='add'>+   回报的。</div><div class='add'>+</div><div class='add'>+9) 用 sparse 检查干净。</div><div class='add'>+</div><div class='add'>+10) 使用 ``make checkstack`` å’Œ ``make namespacecheck`` 并修å¤�他们å�‘现的任何</div><div class='add'>+    问题。</div><div class='add'>+</div><div class='add'>+    .. note::</div><div class='add'>+</div><div class='add'>+        ``checkstack`` 并没有明确指出问题，但是任何一个在堆栈上使用超过512</div><div class='add'>+        字节的函数都å�¯ä»¥è¿›è¡Œæ›´æ”¹ã€‚</div><div class='add'>+</div><div class='add'>+11) 包括 :ref:`kernel-doc &lt;kernel_doc&gt;` 内核文档以记录全局内核API。（é�™æ€�函数</div><div class='add'>+    ä¸�需è¦�，但也å�¯ä»¥ã€‚）使用 ``make htmldocs`` 或 ``make pdfdocs`` 检查</div><div class='add'>+    :ref:`kernel-doc &lt;kernel_doc&gt;` 并修å¤�任何问题。</div><div class='add'>+</div><div class='add'>+12) 通过以下选项å�Œæ—¶å�¯ç”¨çš„测试 ``CONFIG_PREEMPT``, ``CONFIG_DEBUG_PREEMPT``,</div><div class='add'>+    ``CONFIG_DEBUG_SLAB``, ``CONFIG_DEBUG_PAGEALLOC``, ``CONFIG_DEBUG_MUTEXES``,</div><div class='add'>+    ``CONFIG_DEBUG_SPINLOCK``, ``CONFIG_DEBUG_ATOMIC_SLEEP``,</div><div class='add'>+    ``CONFIG_PROVE_RCU`` and ``CONFIG_DEBUG_OBJECTS_RCU_HEAD``</div><div class='add'>+</div><div class='add'>+13) å·²ç»�过构建和è¿�行时测试，包括有或没有 ``CONFIG_SMP``, ``CONFIG_PREEMPT``.</div><div class='add'>+</div><div class='add'>+14) 如果补ä¸�程åº�å½±å“�IO/ç£�盘等：使用或ä¸�使用 ``CONFIG_LBDAF`` 进行测试。</div><div class='add'>+</div><div class='add'>+15) 所有代ç �路径都已在å�¯ç”¨æ‰€æœ‰lockdep功能的情况下è¿�行。</div><div class='add'>+</div><div class='add'>+16) 所有新的/procæ�¡ç›®éƒ½è®°å½•åœ¨ ``Documentation/``</div><div class='add'>+</div><div class='add'>+17) 所有新的内核引导å�‚数都记录在</div><div class='add'>+    Documentation/admin-guide/kernel-parameters.rst 中。</div><div class='add'>+</div><div class='add'>+18) 所有新的模å�—å�‚数都记录在 ``MODULE_PARM_DESC()``</div><div class='add'>+</div><div class='add'>+19) 所有新的用户空间接å�£éƒ½è®°å½•åœ¨ ``Documentation/ABI/`` 中。有关详细信æ�¯ï¼Œ</div><div class='add'>+    请å�‚阅 ``Documentation/ABI/README`` 。更改用户空间接å�£çš„è¡¥ä¸�应该抄é€�</div><div class='add'>+    linux-api@vger.kernel.org。</div><div class='add'>+</div><div class='add'>+20) 检查是å�¦å…¨éƒ¨é€šè¿‡ ``make headers_check`` 。</div><div class='add'>+</div><div class='add'>+21) 已通过至少注入slabå’Œpage分é…�失败进行检查。请å�‚阅 ``Documentation/fault-injection/``</div><div class='add'>+    如果新代ç �是实质性的，那么添加å­�系统特定的故障注入å�¯èƒ½æ˜¯å�ˆé€‚的。</div><div class='add'>+</div><div class='add'>+22) 新添加的代ç �å·²ç»�用 ``gcc -W`` 编译（使用 ``make EXTRA-CFLAGS=-W`` ）。这</div><div class='add'>+    将产生大é‡�噪声，但对于查找诸如“警告：有符å�·å’Œæ— ç¬¦å�·ä¹‹é—´çš„比较â€�之类的错误</div><div class='add'>+    很有用。</div><div class='add'>+</div><div class='add'>+23) 在它被å�ˆå¹¶åˆ°-mmè¡¥ä¸�集中之å�Žè¿›è¡Œæµ‹è¯•ï¼Œä»¥ç¡®ä¿�它ä»�然与所有其他排队的补ä¸�以</div><div class='add'>+    å�ŠVMã€�VFS和其他å­�系统中的å�„ç§�更改一起工作。</div><div class='add'>+</div><div class='add'>+24) 所有内存å±�障例如 ``barrier()``, ``rmb()``, ``wmb()`` 都需è¦�æº�代ç �中的注</div><div class='add'>+    释æ�¥è§£é‡Šå®ƒä»¬æ­£åœ¨æ‰§è¡Œçš„æ“�作å�Šå…¶åŽŸå› çš„逻辑。</div><div class='add'>+</div><div class='add'>+25) 如果补ä¸�添加了任何ioctl，那么也è¦�æ›´æ–° ``Documentation/ioctl/ioctl-number.txt``</div><div class='add'>+</div><div class='add'>+26) 如果修改å�Žçš„æº�代ç �ä¾�赖或使用与以下 ``Kconfig`` 符å�·ç›¸å…³çš„任何内核API或</div><div class='add'>+    功能，则在ç¦�用相关 ``Kconfig`` 符å�·å’Œ/或 ``=m`` （如果该选项å�¯ç”¨ï¼‰çš„情况</div><div class='add'>+    下测试以下多个构建[并é�žæ‰€æœ‰è¿™äº›éƒ½å�Œæ—¶å­˜åœ¨ï¼Œå�ªæ˜¯å®ƒä»¬çš„å�„ç§�/éš�机组å�ˆ]：</div><div class='add'>+</div><div class='add'>+    ``CONFIG_SMP``, ``CONFIG_SYSFS``, ``CONFIG_PROC_FS``, ``CONFIG_INPUT``, ``CONFIG_PCI``, ``CONFIG_BLOCK``, ``CONFIG_PM``, ``CONFIG_MAGIC_SYSRQ``,</div><div class='add'>+    ``CONFIG_NET``, ``CONFIG_INET=n`` (但是å�Žè€…ä¼´éš� ``CONFIG_NET=y``).</div><div class='head'>diff --git a/Documentation/translations/zh_CN/SubmittingDrivers b/Documentation/translations/zh_CN/process/submitting-drivers.rst<br/>index 15e73562f710..72c6cd935821 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/SubmittingDrivers?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/SubmittingDrivers</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/submitting-drivers.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/submitting-drivers.rst</a></div><div class='hunk'>@@ -1,36 +1,28 @@</div><div class='del'>-Chinese translated version of Documentation/process/submitting-drivers.rst</div><div class='add'>+.. _cn_submittingdrivers:</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-Chinese maintainer: Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/submitting-drivers.rst 的中文翻译</div><div class='add'>+:Original: :ref:`Documentation/process/submitting-drivers.rst</div><div class='add'>+           &lt;submittingdrivers&gt;`</div><div class='ctx'> </div><div class='ctx'> 如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='ctx'> 交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='add'>+译存在问题，请è�”系中文版维护者::</div><div class='ctx'> </div><div class='del'>-中文版维护者： æ�Žé˜³  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： æ�Žé˜³  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-中文版校译者： 陈ç�¦ Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='del'>-               王è�ª Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-               å¼ å·� Zhang Wei &lt;Wei.Zhang@freescale.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='add'>+        中文版维护者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+        中文版翻译者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+        中文版校译者： 陈ç�¦ Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='add'>+                       王è�ª Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+                       å¼ å·� Zhang Wei &lt;wezhang@outlook.com&gt;</div><div class='ctx'> </div><div class='ctx'> 如何å�‘ Linux 内核æ��交驱动程åº�</div><div class='del'>------------------------------</div><div class='add'>+=============================</div><div class='ctx'> </div><div class='ctx'> 这篇文档将会解释如何å�‘ä¸�å�Œçš„内核æº�ç �æ ‘æ��交设备驱动程åº�。请注æ„�，如果你感</div><div class='ctx'> 兴趣的是显å�¡é©±åŠ¨ç¨‹åº�，你也许应该访问 XFree86 项目(http://www.xfree86.org/)</div><div class='ctx'> å’Œï¼�或 X.org 项目 (http://x.org)。</div><div class='ctx'> </div><div class='del'>-å�¦è¯·å�‚阅 Documentation/process/submitting-patches.rst 文档。</div><div class='add'>+å�¦è¯·å�‚阅 Documentation/Documentation/translations/zh_CN/process/submitting-patches.rst 文档。</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 分é…�设备å�·</div><div class='hunk'>@@ -145,9 +137,13 @@ Linux 设备驱动程åº�，第三版（探讨 2.6.10 版内核）：</div><div class='ctx'> </div><div class='ctx'> LWN.net:</div><div class='ctx'> 	æ¯�周内核开å�‘活动摘è¦� - http://lwn.net/</div><div class='add'>+</div><div class='ctx'> 	2.6 版中 API çš„å�˜æ›´ï¼š</div><div class='add'>+</div><div class='ctx'> 		http://lwn.net/Articles/2.6-kernel-api/</div><div class='add'>+</div><div class='ctx'> 	将旧版内核的驱动程åº�移æ¤�到 2.6 版：</div><div class='add'>+</div><div class='ctx'> 		http://lwn.net/Articles/driver-porting/</div><div class='ctx'> </div><div class='ctx'> 内核新手(KernelNewbies):</div><div class='head'>diff --git a/Documentation/translations/zh_CN/process/submitting-patches.rst b/Documentation/translations/zh_CN/process/submitting-patches.rst<br/>new file mode 100644<br/>index 000000000000..437c23b367bb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/submitting-patches.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/submitting-patches.rst</a></div><div class='hunk'>@@ -0,0 +1,682 @@</div><div class='add'>+.. _cn_submittingpatches:</div><div class='add'>+</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='add'>+</div><div class='add'>+:Original: :ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;`</div><div class='add'>+</div><div class='add'>+译者::</div><div class='add'>+</div><div class='add'>+        中文版维护者： 钟宇 TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+        中文版翻译者： 钟宇 TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+                       时奎亮 Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='add'>+        中文版校译者： æ�Žé˜³ Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+                       王è�ª Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+如何让你的改动进入内核</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+对于想è¦�将改动æ��交到 Linux 内核的个人或者公å�¸æ�¥è¯´ï¼Œå¦‚æžœä¸�熟悉“规矩â€�，</div><div class='add'>+æ��交的æµ�程会让人ç•�惧。本文档收集了一系列建议，这些建议å�¯ä»¥å¤§å¤§çš„æ��高你</div><div class='add'>+的改动被接å�—的机会.</div><div class='add'>+</div><div class='add'>+以下文档å�«æœ‰å¤§é‡�简æ´�的建议， 具体请è§�：</div><div class='add'>+:ref:`Documentation/process &lt;development_process_main&gt;`</div><div class='add'>+å�Œæ ·ï¼Œ:ref:`Documentation/translations/zh_CN/process/submit-checklist.rst &lt;cn_submitchecklist&gt;`</div><div class='add'>+给出在æ��交代ç �å‰�需è¦�检查的项目的列表。如果你在æ��交一个驱动程åº�，那么</div><div class='add'>+å�Œæ—¶é˜…读一下:</div><div class='add'>+:ref:`Documentation/process/submitting-drivers.rst &lt;submittingdrivers&gt;`</div><div class='add'>+</div><div class='add'>+其中许多步骤æ��述了Git版本控制系统的默认行为；如果您使用Gitæ�¥å‡†å¤‡è¡¥ä¸�，</div><div class='add'>+您将å�‘现它为您完æˆ�的大部分机械工作，尽管您ä»�然需è¦�准备和记录一组å�ˆç�†çš„</div><div class='add'>+è¡¥ä¸�。一般æ�¥è¯´ï¼Œä½¿ç”¨git将使您作为内核开å�‘人员的生活更轻æ�¾ã€‚</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'>+如果您没有一个å�¯ä»¥ä½¿ç”¨å½“å‰�内核æº�代ç �的存储库，请使用git获å�–一个。您将è¦�</div><div class='add'>+从主线存储库开始，它å�¯ä»¥é€šè¿‡ä»¥ä¸‹æ–¹å¼�获å�–::</div><div class='add'>+</div><div class='add'>+        git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git</div><div class='add'>+</div><div class='add'>+但是，请注æ„�，您å�¯èƒ½ä¸�希望直接针对主线树进行开å�‘。大多数å­�系统维护人员è¿�</div><div class='add'>+行自己的树，并希望看到针对这些树准备的补ä¸�。请å�‚è§�MAINTAINERS文件中å­�ç³»</div><div class='add'>+统的 **T:** 项以查找该树，或者简å�•åœ°è¯¢é—®ç»´æŠ¤è€…该树是å�¦æœªåœ¨å…¶ä¸­åˆ—出。</div><div class='add'>+</div><div class='add'>+ä»�然å�¯ä»¥é€šè¿‡tarballs下载内核版本（如下一节所述），但这是进行内核开å�‘çš„</div><div class='add'>+一ç§�困难的方å¼�。</div><div class='add'>+</div><div class='add'>+1) "diff -up"</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+使用 "diff -up" 或者 "diff -uprN" æ�¥åˆ›å»ºè¡¥ä¸�。</div><div class='add'>+</div><div class='add'>+所有内核的改动，都是以补ä¸�çš„å½¢å¼�呈现的，补ä¸�ç”± diff(1) 生æˆ�。创建补ä¸�çš„</div><div class='add'>+时候，è¦�确认它是以 "unified diff" æ ¼å¼�创建的，这ç§�æ ¼å¼�ç”± diff(1) çš„ '-u'</div><div class='add'>+å�‚数生æˆ�。而且，请使用 '-p' å�‚数，那样会显示æ¯�个改动所在的C函数，使得</div><div class='add'>+产生的补ä¸�容易读得多。补ä¸�应该基于内核æº�代ç �树的根目录，而ä¸�是里边的任</div><div class='add'>+何å­�目录。</div><div class='add'>+</div><div class='add'>+为一个å�•ç‹¬çš„文件创建补ä¸�，一般æ�¥è¯´è¿™æ ·å�šå°±å¤Ÿäº†::</div><div class='add'>+</div><div class='add'>+        SRCTREE=linux</div><div class='add'>+        MYFILE=drivers/net/mydriver.c</div><div class='add'>+</div><div class='add'>+        cd $SRCTREE</div><div class='add'>+        cp $MYFILE $MYFILE.orig</div><div class='add'>+        vi $MYFILE      # make your change</div><div class='add'>+        cd ..</div><div class='add'>+        diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+为多个文件创建补ä¸�，你å�¯ä»¥è§£å¼€ä¸€ä¸ªæ²¡æœ‰ä¿®æ”¹è¿‡çš„内核æº�代ç �树，然å�Žå’Œä½ è‡ª</div><div class='add'>+己的代ç �树之间å�š diff 。例如::</div><div class='add'>+</div><div class='add'>+        MYSRC=/devel/linux</div><div class='add'>+</div><div class='add'>+        tar xvfz linux-3.19.tar.gz</div><div class='add'>+        mv linux-3.19 linux-3.19-vanilla</div><div class='add'>+        diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \</div><div class='add'>+                linux-3.19-vanilla $MYSRC &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+"dontdiff" 是内核在编译的时候产生的文件的列表，列表中的文件在 diff(1)</div><div class='add'>+产生的补ä¸�里会被跳过。</div><div class='add'>+</div><div class='add'>+确定你的补ä¸�里没有包å�«ä»»ä½•ä¸�属于这次补ä¸�æ��交的é¢�外文件。记得在用diff(1)</div><div class='add'>+生æˆ�è¡¥ä¸�之å�Žï¼Œå®¡é˜…一次补ä¸�，以确ä¿�准确。</div><div class='add'>+</div><div class='add'>+如果你的改动很散乱，你应该研究一下如何将补ä¸�分割æˆ�独立的部分，将改动分</div><div class='add'>+割æˆ�一系列å�ˆä¹Žé€»è¾‘的步骤。这样更容易让其他内核开å�‘者审核，如果你想你的</div><div class='add'>+è¡¥ä¸�被接å�—，这是很é‡�è¦�的。请å�‚阅：</div><div class='add'>+:ref:`cn_split_changes`</div><div class='add'>+</div><div class='add'>+如果你用 ``git`` , ``git rebase -i`` å�¯ä»¥å¸®åŠ©ä½ è¿™ä¸€ç‚¹ã€‚如果你ä¸�用 ``git``,</div><div class='add'>+``quilt`` &lt;http://savannah.nongnu.org/projects/quilt&gt; å�¦å¤–一个æµ�行的选择。</div><div class='add'>+</div><div class='add'>+.. _cn_describe_changes:</div><div class='add'>+</div><div class='add'>+2) æ��述你的改动</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+æ��述你的问题。无论您的补ä¸�是一行错误修å¤�还是5000行新功能，都必须有一个潜在</div><div class='add'>+的问题激励您完æˆ�这项工作。让审稿人相信有一个问题值得解决，让他们读完第一段</div><div class='add'>+是有æ„�义的。</div><div class='add'>+</div><div class='add'>+æ��述用户å�¯è§�çš„å½±å“�。直接崩溃和é”�定是相当有说æœ�力的，但并ä¸�是所有的错误都那么</div><div class='add'>+明目张胆。å�³ä½¿åœ¨ä»£ç �审查期间å�‘现了这个问题，也è¦�æ��述一下您认为它å�¯èƒ½å¯¹ç”¨æˆ·äº§</div><div class='add'>+生的影å“�。请记ä½�，大多数Linux安装è¿�行的内核æ�¥è‡ªäºŒçº§ç¨³å®šæ ‘或特定于供应商/产å“�</div><div class='add'>+的树，å�ªä»Žä¸Šæ¸¸ç²¾é€‰ç‰¹å®šçš„è¡¥ä¸�，因此请包å�«ä»»ä½•å�¯ä»¥å¸®åŠ©æ‚¨å°†æ›´æ”¹å®šä½�到下游的内容：</div><div class='add'>+触å�‘的场景ã€�DMESG的摘录ã€�崩溃æ��è¿°ã€�性能回归ã€�延迟尖峰ã€�é”�定等。</div><div class='add'>+</div><div class='add'>+é‡�化优化和æ�ƒè¡¡ã€‚如果您声称在性能ã€�内存消耗ã€�堆栈å� ç”¨ç©ºé—´æˆ–二进制大å°�æ–¹é�¢æœ‰æ‰€</div><div class='add'>+改进，请包括支æŒ�它们的数字。但也è¦�æ��è¿°ä¸�明显的æˆ�本。优化通常ä¸�是å…�费的，而是</div><div class='add'>+在CPUã€�内存和å�¯è¯»æ€§ä¹‹é—´è¿›è¡Œæ�ƒè¡¡ï¼›æˆ–者，探索性的工作，在ä¸�å�Œçš„工作负载之间进</div><div class='add'>+è¡Œæ�ƒè¡¡ã€‚请æ��述优化的预期缺点，以便审阅者å�¯ä»¥æ�ƒè¡¡æˆ�本和收益。</div><div class='add'>+</div><div class='add'>+一旦问题建立起æ�¥ï¼Œå°±è¦�详细地æ��述一下您实际在å�šä»€ä¹ˆã€‚对于审阅者æ�¥è¯´ï¼Œç”¨ç®€å�•çš„</div><div class='add'>+英语æ��述代ç �çš„å�˜åŒ–是很é‡�è¦�的，以验è¯�代ç �的行为是å�¦ç¬¦å�ˆæ‚¨çš„æ„�愿。</div><div class='add'>+</div><div class='add'>+如果您将补ä¸�æ��述写在一个表å�•ä¸­ï¼Œè¿™ä¸ªè¡¨å�•å�¯ä»¥å¾ˆå®¹æ˜“地作为“æ��交日志â€�放入Linux</div><div class='add'>+çš„æº�代ç �管ç�†ç³»ç»Ÿgit中，那么维护人员将é�žå¸¸æ„Ÿè°¢æ‚¨ã€‚è§� :ref:`cn_explicit_in_reply_to`.</div><div class='add'>+</div><div class='add'>+æ¯�个补ä¸�å�ªè§£å†³ä¸€ä¸ªé—®é¢˜ã€‚如果你的æ��述开始å�˜é•¿ï¼Œè¿™å°±è¡¨æ˜Žä½ å�¯èƒ½éœ€è¦�拆分你的补ä¸�。</div><div class='add'>+请è§� :ref:`cn_split_changes`</div><div class='add'>+</div><div class='add'>+æ��交或é‡�æ–°æ��交修补程åº�或修补程åº�系列时，请包括完整的修补程åº�说明和ç�†ç”±ã€‚ä¸�è¦�</div><div class='add'>+å�ªè¯´è¿™æ˜¯è¡¥ä¸�（系列）的第几版。ä¸�è¦�期望å­�系统维护人员引用更早的补ä¸�版本或引用</div><div class='add'>+URLæ�¥æŸ¥æ‰¾è¡¥ä¸�æ��述并将其放入补ä¸�中。也就是说，补ä¸�（系列）å�Šå…¶æ��述应该是独立的。</div><div class='add'>+这对维护人员和审查人员都有好处。一些评审者å�¯èƒ½ç”šè‡³æ²¡æœ‰æ”¶åˆ°è¡¥ä¸�的早期版本。</div><div class='add'>+</div><div class='add'>+æ��述你在命令语气中的å�˜åŒ–，例如“make xyzzy do frotzâ€�而ä¸�是“[这个补ä¸�]make</div><div class='add'>+xyzzy do frotzâ€�或“[我]changed xyzzy to do frotzâ€�，就好åƒ�你在命令代ç �库改å�˜</div><div class='add'>+它的行为一样。</div><div class='add'>+</div><div class='add'>+如果修补程åº�ä¿®å¤�了一个记录的bugæ�¡ç›®ï¼Œè¯·æŒ‰ç¼–å�·å’ŒURL引用该bugæ�¡ç›®ã€‚如果补ä¸�æ�¥</div><div class='add'>+自邮件列表讨论，请给出邮件列表存档的URL；使用带有 ``Message-ID`` çš„</div><div class='add'>+https://lkml.kernel.org/ é‡�定å�‘，以确ä¿�链接ä¸�会过时。</div><div class='add'>+</div><div class='add'>+但是，在没有外部资æº�的情况下，尽é‡�让你的解释å�¯ç�†è§£ã€‚除了æ��供邮件列表存档或</div><div class='add'>+bugçš„URL之外，还è¦�总结需è¦�æ��交补ä¸�的相关讨论è¦�点。</div><div class='add'>+</div><div class='add'>+如果您想è¦�引用一个特定的æ��交，ä¸�è¦�å�ªå¼•ç”¨æ��交的 SHA-1 ID。还请包括æ��交的一行</div><div class='add'>+摘è¦�，以便于审阅者了解它是关于什么的。例如::</div><div class='add'>+</div><div class='add'>+        Commit e21d2170f36602ae2708 ("video: remove unnecessary</div><div class='add'>+        platform_set_drvdata()") removed the unnecessary</div><div class='add'>+        platform_set_drvdata(), but left the variable "dev" unused,</div><div class='add'>+        delete it.</div><div class='add'>+</div><div class='add'>+您还应该确ä¿�至少使用å‰�12ä½� SHA-1 ID. 内核存储库包å�«*许多*对象，使与较短的ID</div><div class='add'>+å�‘生冲çª�çš„å�¯èƒ½æ€§å¾ˆå¤§ã€‚è®°ä½�，å�³ä½¿çŽ°åœ¨ä¸�会与您的六个字符IDå�‘生冲çª�，这ç§�情况</div><div class='add'>+å�¯èƒ½äº”å¹´å�Žæ”¹å�˜ã€‚</div><div class='add'>+</div><div class='add'>+如果修补程åº�ä¿®å¤�了特定æ��交中的错误，例如，使用 ``git bisct`` ，请使用带有å‰�</div><div class='add'>+12个字符SHA-1 ID çš„"Fixes:"标记和å�•è¡Œæ‘˜è¦�。为了简化ä¸�è¦�将标记拆分为多个，</div><div class='add'>+è¡Œã€�标记ä¸�å�—分æž�脚本“75列æ�¢è¡Œâ€�规则的é™�制。例如::</div><div class='add'>+</div><div class='add'>+        Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")</div><div class='add'>+</div><div class='add'>+下列 ``git config`` 设置å�¯ä»¥æ·»åŠ è®© ``git log``, ``git show`` 漂亮的显示格å¼�::</div><div class='add'>+</div><div class='add'>+	[core]</div><div class='add'>+		abbrev = 12</div><div class='add'>+	[pretty]</div><div class='add'>+		fixes = Fixes: %h (\"%s\")</div><div class='add'>+</div><div class='add'>+.. _cn_split_changes:</div><div class='add'>+</div><div class='add'>+3) 拆分你的改动</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+å°†æ¯�个逻辑更改分隔æˆ�一个å�•ç‹¬çš„è¡¥ä¸�。</div><div class='add'>+</div><div class='add'>+例如，如果你的改动里å�Œæ—¶æœ‰bug修正和性能优化，那么把这些改动拆分到两个或</div><div class='add'>+者更多的补ä¸�文件中。如果你的改动包å�«å¯¹API的修改，并且修改了驱动程åº�æ�¥é€‚</div><div class='add'>+应这些新的API，那么把这些修改分æˆ�两个补ä¸�。</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'>+都能正常构建和è¿�行。使用 ``git bisect`` æ�¥è¿½è¸ªé—®é¢˜çš„å¼€å�‘者å�¯èƒ½ä¼šåœ¨ä»»ä½•æ—¶</div><div class='add'>+候分割你的补ä¸�系列；如果你在中间引入错误，他们ä¸�会感谢你。</div><div class='add'>+</div><div class='add'>+如果你ä¸�能将补ä¸�浓缩æˆ�更少的文件，那么æ¯�次大约å�‘é€�出15个，然å�Žç­‰å¾…审查</div><div class='add'>+和集æˆ�。</div><div class='add'>+</div><div class='add'>+4) 检查你的更改风格</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+检查您的补ä¸�是å�¦å­˜åœ¨åŸºæœ¬æ ·å¼�冲çª�，详细信æ�¯å�¯åœ¨</div><div class='add'>+:ref:`Documentation/translations/zh_CN/process/coding-style.rst &lt;cn_codingstyle&gt;`</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'>+在æ��交之å‰�，使用补ä¸�æ ·å¼�检查程åº�检查补ä¸�（scripts/check patch.pl）。ä¸�过，</div><div class='add'>+请注æ„�，样å¼�检查程åº�应该被视为一个指å�—，而ä¸�是作为人类判断的替代å“�。如果您</div><div class='add'>+的代ç �看起æ�¥æ›´å¥½ï¼Œä½†æœ‰è¿�规行为，那么最好ä¸�è¦�使用它。</div><div class='add'>+</div><div class='add'>+检查者报告三个级别：</div><div class='add'>+</div><div class='add'>+ - ERROR：很å�¯èƒ½å‡ºé”™çš„事情</div><div class='add'>+ - WARNING：需è¦�仔细审查的事项</div><div class='add'>+ - CHECK：需è¦�æ€�考的事情</div><div class='add'>+</div><div class='add'>+您应该能够判断您的补ä¸�中存在的所有è¿�规行为。</div><div class='add'>+</div><div class='add'>+5) 选择补ä¸�收件人</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+您应该总是在任何补ä¸�上å¤�制相应的å­�系统维护人员，以获得他们维护的代ç �；查看</div><div class='add'>+维护人员文件和æº�代ç �修订历å�²è®°å½•ï¼Œä»¥äº†è§£è¿™äº›ç»´æŠ¤äººå‘˜æ˜¯è°�。脚本</div><div class='add'>+scripts/get_Maintainer.pl在这个步骤中é�žå¸¸æœ‰ç”¨ã€‚如果您找ä¸�到正在工作的å­�系统</div><div class='add'>+的维护人员，那么Andrew Morton（akpm@linux-foundation.org）将充当最å�Žçš„维护</div><div class='add'>+人员。</div><div class='add'>+</div><div class='add'>+您通常还应该选择至少一个邮件列表æ�¥æŽ¥æ”¶è¡¥ä¸�集的。linux-kernel@vger.kernel.org</div><div class='add'>+作为最å�Žä¸€ä¸ªè§£å†³åŠžæ³•çš„列表，但是这个列表上的体积已ç»�引起了许多开å�‘人员的拒ç»�。</div><div class='add'>+在MAINTAINERS文件中查找å­�系统特定的列表；您的补ä¸�å�¯èƒ½ä¼šåœ¨é‚£é‡Œå¾—到更多的关注。</div><div class='add'>+ä¸�过，请ä¸�è¦�å�‘é€�垃圾邮件到无关的列表。</div><div class='add'>+</div><div class='add'>+许多与内核相关的列表托管在vger.kernel.org上；您å�¯ä»¥åœ¨</div><div class='add'>+http://vger.kernel.org/vger-lists.html 上找到它们的列表。ä¸�过，也有与内核相关</div><div class='add'>+的列表托管在其他地方。</div><div class='add'>+</div><div class='add'>+ä¸�è¦�一次å�‘é€�超过15个补ä¸�到vger邮件列表ï¼�ï¼�ï¼�ï¼�</div><div class='add'>+</div><div class='add'>+Linus Torvalds 是决定改动能å�¦è¿›å…¥ Linux 内核的最终è£�决者。他的 e-mail</div><div class='add'>+地å�€æ˜¯ &lt;torvalds@linux-foundation.org&gt; 。他收到的 e-mail 很多，所以一般</div><div class='add'>+的说，最好别给他å�‘ e-mail。</div><div class='add'>+</div><div class='add'>+如果您有修å¤�å�¯åˆ©ç”¨å®‰å…¨æ¼�æ´žçš„è¡¥ä¸�，请将该补ä¸�å�‘é€�到 security@kernel.org。对于</div><div class='add'>+严é‡�çš„bug，å�¯ä»¥è€ƒè™‘短期暂å�œä»¥å…�许分销商å�‘用户å�‘布补ä¸�；在这ç§�情况下，显然ä¸�应</div><div class='add'>+将补ä¸�å�‘é€�到任何公共列表。</div><div class='add'>+</div><div class='add'>+ä¿®å¤�å·²å�‘布内核中严é‡�错误的补ä¸�程åº�应该指å�‘稳定版维护人员，方法是放这样的一行::</div><div class='add'>+</div><div class='add'>+        Cc: stable@vger.kernel.org</div><div class='add'>+</div><div class='add'>+进入补ä¸�的签准区（注æ„�，ä¸�是电å­�邮件收件人）。除了这个文件之外，您还应该阅读</div><div class='add'>+:ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</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'>+手册页补ä¸�，或至少å�‘é€�更改通知，以便一些信æ�¯è¿›å…¥æ‰‹å†Œé¡µã€‚还应将用户空间API</div><div class='add'>+更改å¤�制到 linux-api@vger.kernel.org。</div><div class='add'>+</div><div class='add'>+对于å°�çš„è¡¥ä¸�，你也许会CC到æ�œé›†ç��碎补ä¸�的邮件列表(Trivial Patch Monkey)</div><div class='add'>+trivial@kernel.org，那里专门收集ç��碎的补ä¸�。下é�¢è¿™æ ·çš„è¡¥ä¸�会被看作“ç��碎的â€�</div><div class='add'>+è¡¥ä¸�：</div><div class='add'>+</div><div class='add'>+ - 文档的拼写修正。</div><div class='add'>+ - 修正会影å“�到 grep(1) 的拼写。</div><div class='add'>+ - 警告信æ�¯ä¿®æ­£(频ç¹�的打å�°æ— ç”¨çš„警告是ä¸�好的。)</div><div class='add'>+ - 编译错误修正（代ç �逻辑的确是对的，å�ªæ˜¯ç¼–译有问题。）</div><div class='add'>+ - è¿�行时修正（å�ªè¦�真的修正了错误。）</div><div class='add'>+ - 移除使用了被废弃的函数/å®�的代ç �(例如 check_region。)</div><div class='add'>+ - è�”系方å¼�和文档修正。</div><div class='add'>+ - 用å�¯ç§»æ¤�的代ç �替æ�¢ä¸�å�¯ç§»æ¤�的代ç �（å�³ä½¿åœ¨ä½“系结构相关的代ç �中，既然有</div><div class='add'>+ - 人拷è´�，å�ªè¦�它是ç��碎的）</div><div class='add'>+ - 任何文件的作者/维护者对该文件的改动（例如 patch monkey 在é‡�传模å¼�下）</div><div class='add'>+</div><div class='add'>+(译注，关于“ç��碎补ä¸�â€�的一些说明：因为原文的这一部分写得比较简å�•ï¼Œæ‰€ä»¥ä¸�å¾—ä¸�</div><div class='add'>+è¿�例写一下译注。"trivial"这个英文å�•è¯�的本æ„�是“ç��碎的，ä¸�é‡�è¦�的。â€�但是在这里</div><div class='add'>+有ç¨�微有一些å�˜åŒ–，例如对一些明显的NULL指针的修正，属于è¿�行时修正，会被归类</div><div class='add'>+到ç��碎补ä¸�里。虽然NULL指针的修正很é‡�è¦�，但是这样的修正往往很å°�而且很容易得到</div><div class='add'>+检验，所以也被归入ç��碎补ä¸�。ç��碎补ä¸�更精确的归类应该是</div><div class='add'>+“simple, localized &amp; easy to verifyâ€�，也就是说简å�•çš„，局部的和易于检验的。</div><div class='add'>+trivial@kernel.org邮件列表的目的是针对这样的补ä¸�，为æ��交者æ��供一个中心，æ�¥</div><div class='add'>+é™�低æ��交的门槛。)</div><div class='add'>+</div><div class='add'>+6) 没有 MIME ç¼–ç �，没有链接，没有压缩，没有附件，å�ªæœ‰çº¯æ–‡æœ¬</div><div class='add'>+-----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Linus 和其他的内核开å�‘者需è¦�阅读和评论你æ��交的改动。对于内核开å�‘者æ�¥è¯´</div><div class='add'>+，å�¯ä»¥â€œå¼•ç”¨â€�你的改动很é‡�è¦�，使用一般的 e-mail 工具，他们就å�¯ä»¥åœ¨ä½ çš„</div><div class='add'>+代ç �的任何ä½�置添加评论。</div><div class='add'>+</div><div class='add'>+因为这个原因，所有的æ��交的补ä¸�都是 e-mail 中“内嵌â€�的。</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+   如果你使用剪切-粘贴你的补ä¸�，å°�心你的编辑器的自动æ�¢è¡ŒåŠŸèƒ½ç ´å��ä½ çš„è¡¥ä¸�</div><div class='add'>+</div><div class='add'>+ä¸�è¦�将补ä¸�作为 MIME ç¼–ç �的附件，ä¸�管是å�¦åŽ‹ç¼©ã€‚很多æµ�行的 e-mail 软件ä¸�</div><div class='add'>+是任何时候都将 MIME ç¼–ç �的附件当作纯文本å�‘é€�的，这会使得别人无法在你的</div><div class='add'>+代ç �中加评论。å�¦å¤–，MIME ç¼–ç �的附件会让 Linus 多花一点时间æ�¥å¤„ç�†ï¼Œè¿™å°±</div><div class='add'>+é™�低了你的改动被接å�—çš„å�¯èƒ½æ€§ã€‚</div><div class='add'>+</div><div class='add'>+例外：如果你的邮递员弄å��了补ä¸�，那么有人å�¯èƒ½ä¼šè¦�求你使用mimeé‡�æ–°å�‘é€�è¡¥ä¸�</div><div class='add'>+</div><div class='add'>+请å�‚阅 :ref:`Documentation/translations/zh_CN/process/email-clients.rst &lt;cn_email_clients&gt;`</div><div class='add'>+以获å�–有关é…�置电å­�邮件客户端以使其ä¸�å�—å½±å“�地å�‘é€�修补程åº�çš„æ��示。</div><div class='add'>+</div><div class='add'>+7) e-mail 的大å°�</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+大的改动对邮件列表ä¸�å�ˆé€‚，对æŸ�些维护者也ä¸�å�ˆé€‚。如果你的补ä¸�，在ä¸�压缩</div><div class='add'>+的情况下，超过了300kB，那么你最好将补ä¸�放在一个能通过 internet 访问的æœ�</div><div class='add'>+务器上，然å�Žç”¨æŒ‡å�‘ä½ çš„è¡¥ä¸�çš„ URL 替代。但是请注æ„�，如果您的补ä¸�超过了</div><div class='add'>+300kb，那么它几乎肯定需è¦�被破å��。</div><div class='add'>+</div><div class='add'>+8）回å¤�评审æ„�è§�</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'>+耗时的过程，审查人员有时会å�˜å¾—æš´èº�。å�³ä½¿åœ¨è¿™ç§�情况下，也è¦�礼貌地回应并</div><div class='add'>+解决他们指出的问题。</div><div class='add'>+</div><div class='add'>+9）ä¸�è¦�泄气或ä¸�è€�烦</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'>+</div><div class='add'>+10）主题中包å�« PATCH</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+由于到linuså’Œlinux内核的电å­�邮件æµ�é‡�很高，通常会在主题行å‰�é�¢åŠ ä¸Š[PATCH]</div><div class='add'>+å‰�ç¼€. 这使Linus和其他内核开å�‘人员更容易将补ä¸�与其他电å­�邮件讨论区分开。</div><div class='add'>+</div><div class='add'>+11）签署你的作å“�-å¼€å�‘者原始认è¯�</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+为了加强对è°�å�šäº†ä½•äº‹çš„追踪，尤其是对那些é€�过好几层的维护者的补ä¸�，我们</div><div class='add'>+建议在å�‘é€�出去的补ä¸�上加一个 “sign-offâ€� 的过程。</div><div class='add'>+</div><div class='add'>+"sign-off" 是在补ä¸�的注释的最å�Žçš„简å�•çš„一行文字，认è¯�你编写了它或者其他</div><div class='add'>+人有æ�ƒåŠ›å°†å®ƒä½œä¸ºå¼€æ”¾æº�代ç �çš„è¡¥ä¸�传递。规则很简å�•ï¼šå¦‚果你能认è¯�如下信æ�¯:</div><div class='add'>+</div><div class='add'>+å¼€å�‘者æ�¥æº�è¯�书 1.1</div><div class='add'>+^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+对于本项目的贡献，我认è¯�如下信æ�¯ï¼š</div><div class='add'>+</div><div class='add'>+      （a）这些贡献是完全或者部分的由我创建，我有æ�ƒåˆ©ä»¥æ–‡ä»¶ä¸­æŒ‡å‡º</div><div class='add'>+           的开放æº�代ç �许å�¯è¯�æ��交它；或者</div><div class='add'>+      （b）这些贡献基于以å‰�的工作，æ�®æˆ‘所知，这些以å‰�的工作å�—æ�°å½“的开放</div><div class='add'>+           æº�代ç �许å�¯è¯�ä¿�护，而且，根æ�®è®¸å�¯è¯�，我有æ�ƒæ��交修改å�Žçš„贡献，</div><div class='add'>+           无论是完全还是部分由我创造，这些贡献都使用å�Œä¸€ä¸ªå¼€æ”¾æº�代ç �许å�¯è¯�</div><div class='add'>+           （除é�žæˆ‘被å…�许用其它的许å�¯è¯�），正如文件中指出的；或者</div><div class='add'>+      （c）这些贡献由认è¯�（a），（b）或者（c）的人直接æ��供给我，而</div><div class='add'>+           且我没有修改它。</div><div class='add'>+      （d）我ç�†è§£å¹¶å�Œæ„�这个项目和贡献是公开的，贡献的记录（包括我</div><div class='add'>+           一起æ��交的个人记录，包括 sign-off ）被永久维护并且å�¯ä»¥å’Œè¿™ä¸ªé¡¹ç›®</div><div class='add'>+           或者开放æº�代ç �的许å�¯è¯�å�Œæ­¥åœ°å†�å�‘行。</div><div class='add'>+</div><div class='add'>+那么加入这样一行::</div><div class='add'>+</div><div class='add'>+       Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+</div><div class='add'>+使用你的真å��（抱歉，ä¸�能使用å�‡å��或者匿å��。）</div><div class='add'>+</div><div class='add'>+有人在最å�ŽåŠ ä¸Šæ ‡ç­¾ã€‚现在这些东西会被忽略，但是你å�¯ä»¥è¿™æ ·å�šï¼Œæ�¥æ ‡è®°å…¬å�¸</div><div class='add'>+内部的过程，或者å�ªæ˜¯æŒ‡å‡ºå…³äºŽ sign-off 的一些特殊细节。</div><div class='add'>+</div><div class='add'>+如果您是å­�系统或分支维护人员，有时需è¦�ç¨�微修改收到的补ä¸�，以便å�ˆå¹¶å®ƒä»¬ï¼Œ</div><div class='add'>+因为树和æ��交者中的代ç �ä¸�完全相å�Œã€‚如果你严格é�µå®ˆè§„则（c），你应该è¦�求æ��交者</div><div class='add'>+é‡�æ–°å�‘布，但这完全是在浪费时间和精力。规则（b）å…�许您调整代ç �，但是更改一个</div><div class='add'>+æ��交者的代ç �并让他认å�¯æ‚¨çš„错误是é�žå¸¸ä¸�礼貌的。è¦�解决此问题，建议在最å�Žä¸€ä¸ª</div><div class='add'>+由签å��行和您的行之间添加一行，指示更改的性质。虽然这并ä¸�是强制性的，但似乎</div><div class='add'>+在æ��è¿°å‰�加上您的邮件和/或姓å��（全部用方括å�·æ‹¬èµ·æ�¥ï¼‰ï¼Œè¿™è¶³ä»¥è®©äººæ³¨æ„�到您对最</div><div class='add'>+å�Žä¸€åˆ†é’Ÿçš„更改负有责任。例如::</div><div class='add'>+</div><div class='add'>+	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]</div><div class='add'>+	Signed-off-by: Lucky K Maintainer &lt;lucky@maintainer.example.org&gt;</div><div class='add'>+</div><div class='add'>+如果您维护一个稳定的分支机构，å�Œæ—¶å¸Œæœ›å¯¹ä½œè€…进行致谢ã€�跟踪更改ã€�å�ˆå¹¶ä¿®å¤�并</div><div class='add'>+ä¿�护æ��交者ä¸�å�—投诉，那么这ç§�å�šæ³•å°¤å…¶æœ‰ç”¨ã€‚请注æ„�，在任何情况下都ä¸�能更改作者</div><div class='add'>+çš„ID（From 头），因为它是出现在更改日志中的标识。</div><div class='add'>+</div><div class='add'>+对回å�ˆï¼ˆback-porters）的特别说明：在æ��交消æ�¯çš„顶部（主题行之å�Žï¼‰æ�’入一个补ä¸�</div><div class='add'>+çš„èµ·æº�指示似乎是一ç§�常è§�且有用的实践，以便于跟踪。例如，下é�¢æ˜¯æˆ‘们在3.x稳定</div><div class='add'>+版本中看到的内容::</div><div class='add'>+</div><div class='add'>+  Date:   Tue Oct 7 07:26:38 2014 -0400</div><div class='add'>+</div><div class='add'>+    libata: Un-break ATA blacklist</div><div class='add'>+</div><div class='add'>+    commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.</div><div class='add'>+</div><div class='add'>+还有， 这里是一个旧版内核中的一个回å�ˆè¡¥ä¸�::</div><div class='add'>+</div><div class='add'>+    Date:   Tue May 13 22:12:27 2008 +0200</div><div class='add'>+</div><div class='add'>+        wireless, airo: waitbusy() won't delay</div><div class='add'>+</div><div class='add'>+        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]</div><div class='add'>+</div><div class='add'>+12）何时使用Acked-by:，CC:，和Co-Developed by:</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+Singed-off-by: 标记表示签å��者å�‚与了补ä¸�çš„å¼€å�‘，或者他/她在补ä¸�的传递路径中。</div><div class='add'>+</div><div class='add'>+如果一个人没有直接å�‚与补ä¸�的准备或处ç�†ï¼Œä½†å¸Œæœ›è¡¨ç¤ºå¹¶è®°å½•ä»–们对补ä¸�的批准，</div><div class='add'>+那么他们å�¯ä»¥è¦�求在补ä¸�çš„å�˜æ›´æ—¥å¿—中添加一个 Acked-by:</div><div class='add'>+</div><div class='add'>+Acked-by：通常由å�—å½±å“�代ç �的维护者使用，当该维护者既没有贡献也没有转å�‘è¡¥ä¸�时。</div><div class='add'>+</div><div class='add'>+Acked-by: ä¸�åƒ�签字人那样正å¼�。这是一个记录，确认人至少审查了补ä¸�，并表示接å�—。</div><div class='add'>+因此，补ä¸�å�ˆå¹¶æœ‰æ—¶ä¼šæ‰‹åŠ¨å°†Acker的“Yep，looks good to meâ€�转æ�¢ä¸º Acked-By：（但</div><div class='add'>+请注æ„�，通常最好è¦�求一个明确的Ack）。</div><div class='add'>+</div><div class='add'>+Acked-by：ä¸�一定表示对整个补ä¸�的确认。例如，如果一个补ä¸�å½±å“�多个å­�系统，并且</div><div class='add'>+有一个：æ�¥è‡ªä¸€ä¸ªå­�系统维护者，那么这通常表示å�ªç¡®è®¤å½±å“�维护者代ç �的部分。这里</div><div class='add'>+应该仔细判断。如有疑问，应å�‚考邮件列表档案中的原始讨论。</div><div class='add'>+</div><div class='add'>+如果æŸ�人有机会对补ä¸�进行评论，但没有æ��供此类评论，您å�¯ä»¥é€‰æ‹©åœ¨è¡¥ä¸�中添加 ``Cc:``</div><div class='add'>+这是唯一一个标签，它å�¯ä»¥åœ¨æ²¡æœ‰è¢«å®ƒå‘½å��的人显å¼�æ“�作的情况下添加，但它应该表明</div><div class='add'>+这个人是在补ä¸�上抄é€�的。讨论中包å�«äº†æ½œåœ¨åˆ©ç›Šç›¸å…³æ–¹ã€‚</div><div class='add'>+</div><div class='add'>+Co-developed-by: 声明补ä¸�是由多个开å�‘人员共å�Œåˆ›å»ºçš„；当几个人在一个补ä¸�上工</div><div class='add'>+作时，它用于将属性赋予共å�Œä½œè€…（除了 From: 所赋予的作者之外）。因为</div><div class='add'>+Co-developed-by: 表示作者身份，所以æ¯�个共å�Œå¼€å�‘人：必须紧跟在相关å�ˆä½œä½œè€…çš„</div><div class='add'>+ç­¾å��之å�Žã€‚标准的签核程åº�è¦�求：标记的签核顺åº�应尽å�¯èƒ½å��映补ä¸�的时间历å�²ï¼Œè€Œä¸�</div><div class='add'>+管作者是通过 From ：还是由 Co-developed-by: å…±å�Œå¼€å�‘的。值得注æ„�的是，最å�Žä¸€</div><div class='add'>+个签字人：必须始终是æ��交补ä¸�çš„å¼€å�‘人员。</div><div class='add'>+</div><div class='add'>+注æ„�，当作者也是电å­�邮件标题“å�‘件人：â€�行中列出的人时，“From: â€� 标记是å�¯é€‰çš„。</div><div class='add'>+</div><div class='add'>+作者æ��交的补ä¸�程åº�示例::</div><div class='add'>+</div><div class='add'>+	&lt;changelog&gt;</div><div class='add'>+</div><div class='add'>+	Co-developed-by: First Co-Author &lt;first@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: First Co-Author &lt;first@coauthor.example.org&gt;</div><div class='add'>+	Co-developed-by: Second Co-Author &lt;second@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Second Co-Author &lt;second@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: From Author &lt;from@author.example.org&gt;</div><div class='add'>+</div><div class='add'>+å�ˆä½œå¼€å�‘者æ��交的补ä¸�示例::</div><div class='add'>+</div><div class='add'>+	From: From Author &lt;from@author.example.org&gt;</div><div class='add'>+</div><div class='add'>+	&lt;changelog&gt;</div><div class='add'>+</div><div class='add'>+	Co-developed-by: Random Co-Author &lt;random@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Random Co-Author &lt;random@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: From Author &lt;from@author.example.org&gt;</div><div class='add'>+	Co-developed-by: Submitting Co-Author &lt;sub@coauthor.example.org&gt;</div><div class='add'>+	Signed-off-by: Submitting Co-Author &lt;sub@coauthor.example.org&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+13）使用报告人：ã€�测试人：ã€�审核人：ã€�建议人：ã€�ä¿®å¤�人：</div><div class='add'>+--------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Reported-by: 给那些å�‘现错误并报告错误的人致谢，它希望激励他们在将æ�¥å†�次帮助</div><div class='add'>+我们。请注æ„�，如果bug是以ç§�有方å¼�报告的，那么在使用Reported-by标记之å‰�，请</div><div class='add'>+先请求æ�ƒé™�。</div><div class='add'>+</div><div class='add'>+Tested-by: 标记表示补ä¸�已由指定的人（在æŸ�些环境中）æˆ�功测试。这个标签通知</div><div class='add'>+维护人员已ç»�执行了一些测试，为将æ�¥çš„è¡¥ä¸�æ��供了一ç§�定ä½�测试人员的方法，并确</div><div class='add'>+ä¿�测试人员的信誉。</div><div class='add'>+</div><div class='add'>+Reviewed-by：相å��，根æ�®å®¡æŸ¥äººçš„声明，表明该补ä¸�已被审查并被认为是å�¯æŽ¥å�—的：</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+审查人的监ç�£å£°æ˜Ž</div><div class='add'>+^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+通过æ��供我的 Reviewed-by，我声明：</div><div class='add'>+</div><div class='add'>+        (a) 我已ç»�对这个补ä¸�进行了一次技术审查，以评估它是å�¦é€‚å�ˆè¢«åŒ…å�«åˆ°</div><div class='add'>+            主线内核中。</div><div class='add'>+</div><div class='add'>+        (b) 与补ä¸�相关的任何问题ã€�顾虑或问题都已å��馈给æ��交者。我对æ��交者对</div><div class='add'>+            我的评论的回应感到满æ„�。</div><div class='add'>+</div><div class='add'>+        (c) 虽然这一æ��交å�¯èƒ½ä¼šæ”¹è¿›ä¸€äº›ä¸œè¥¿ï¼Œä½†æˆ‘相信，此时，（1）对内核</div><div class='add'>+            进行了有价值的修改，（2）没有包å�«äº‰è®ºä¸­æ¶‰å�Šçš„已知问题。</div><div class='add'>+</div><div class='add'>+        (d) 虽然我已ç»�审查了补ä¸�并认为它是å�¥å…¨çš„，但我ä¸�会（除é�žå�¦æœ‰æ˜Žç¡®</div><div class='add'>+            说明）作出任何ä¿�è¯�或ä¿�è¯�它将在任何给定情况下实现其规定的目的</div><div class='add'>+            或正常è¿�行。</div><div class='add'>+</div><div class='add'>+Reviewed-by 是一ç§�观点声明，å�³è¡¥ä¸�是对内核的适当修改，没有任何é�—留的严é‡�技术</div><div class='add'>+问题。任何感兴趣的审阅者（完æˆ�工作的人）都å�¯ä»¥ä¸ºä¸€ä¸ªè¡¥ä¸�æ��供一个 Review-by</div><div class='add'>+标签。此标签用于å�‘审阅者æ��供致谢，并通知维护者已在修补程åº�上完æˆ�的审阅程度。</div><div class='add'>+Reviewed-by: 当由已知了解主题区域并执行彻底检查的审阅者æ��供时，通常会增加</div><div class='add'>+è¡¥ä¸�进入内核的å�¯èƒ½æ€§ã€‚</div><div class='add'>+</div><div class='add'>+Suggested-by: 表示补ä¸�的想法是由指定的人æ��出的，并确ä¿�将此想法归功于指定的</div><div class='add'>+人。请注æ„�，未ç»�许å�¯ï¼Œä¸�得添加此标签，特别是如果该想法未在公共论å�›ä¸Šå�‘布。</div><div class='add'>+这就是说，如果我们勤快地致谢我们的创æ„�者，他们很有希望在未æ�¥å¾—到鼓舞，å†�次</div><div class='add'>+帮助我们。</div><div class='add'>+</div><div class='add'>+Fixes: 指示补ä¸�在以å‰�çš„æ��交中修å¤�了一个问题。它å�¯ä»¥å¾ˆå®¹æ˜“地确定错误的æ�¥æº�，</div><div class='add'>+这有助于检查错误修å¤�。这个标记还帮助稳定内核团队确定应该接收修å¤�的稳定内核</div><div class='add'>+版本。这是指示补ä¸�ä¿®å¤�的错误的首选方法。请å�‚阅 :ref:`cn_describe_changes`</div><div class='add'>+æ��述您的更改以了解更多详细信æ�¯ã€‚</div><div class='add'>+</div><div class='add'>+.. _cn_the_canonical_patch_format:</div><div class='add'>+</div><div class='add'>+12）标准补ä¸�æ ¼å¼�</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+本节æ��述如何格å¼�化补ä¸�本身。请注æ„�，如果您的补ä¸�存储在 ``Git`` 存储库中，则</div><div class='add'>+å�¯ä»¥ä½¿ç”¨ ``git format-patch`` 进行正确的补ä¸�æ ¼å¼�设置。但是，这些工具无法创建</div><div class='add'>+å¿…è¦�的文本，因此请务必阅读下é�¢çš„说明。</div><div class='add'>+</div><div class='add'>+标准的补ä¸�，标题行是::</div><div class='add'>+</div><div class='add'>+    Subject: [PATCH 001/123] å­�系统:一å�¥è¯�概述</div><div class='add'>+</div><div class='add'>+标准补ä¸�的信体存在如下部分：</div><div class='add'>+</div><div class='add'>+  - 一个 "from" 行指出补ä¸�作者。å�Žè·Ÿç©ºè¡Œï¼ˆä»…当å�‘é€�修补程åº�的人ä¸�是作者时æ‰�需è¦�）。</div><div class='add'>+</div><div class='add'>+  - 解释的正文，行以75列包装，这将被å¤�制到永久å�˜æ›´æ—¥å¿—æ�¥æ��述这个补ä¸�。</div><div class='add'>+</div><div class='add'>+  - 一个空行</div><div class='add'>+</div><div class='add'>+  - 上é�¢æ��述的“Signed-off-byâ€� 行，也将出现在更改日志中。</div><div class='add'>+</div><div class='add'>+  - å�ªåŒ…å�« ``---`` 的标记线。</div><div class='add'>+</div><div class='add'>+  - 任何其他ä¸�适å�ˆæ”¾åœ¨å�˜æ›´æ—¥å¿—的注释。</div><div class='add'>+</div><div class='add'>+  - 实际补ä¸�（ ``diff`` 输出）。</div><div class='add'>+</div><div class='add'>+标题行的格å¼�，使得对标题行按字æ¯�åº�排åº�é�žå¸¸çš„容易 - 很多 e-mail 客户端都</div><div class='add'>+å�¯ä»¥æ”¯æŒ� - 因为åº�列å�·æ˜¯ç”¨é›¶å¡«å……的，所以按数字排åº�和按字æ¯�排åº�是一样的。</div><div class='add'>+</div><div class='add'>+e-mail 标题中的“å­�系统â€�标识哪个内核å­�系统将被打补ä¸�。</div><div class='add'>+</div><div class='add'>+e-mail 标题中的“一å�¥è¯�概述â€�扼è¦�çš„æ��è¿° e-mail 中的补ä¸�。“一å�¥è¯�概述â€�</div><div class='add'>+ä¸�应该是一个文件å��。对于一个补ä¸�系列（“补ä¸�系列â€�指一系列的多个相关补</div><div class='add'>+ä¸�），ä¸�è¦�对æ¯�个补ä¸�都使用å�Œæ ·çš„“一å�¥è¯�概述â€�。</div><div class='add'>+</div><div class='add'>+è®°ä½� e-mail 的“一å�¥è¯�概述â€�会æˆ�为该补ä¸�的全局唯一标识。它会蔓延到 git</div><div class='add'>+的改动记录里。然å�Žâ€œä¸€å�¥è¯�概述â€�会被用在开å�‘者的讨论里，用æ�¥æŒ‡ä»£è¿™ä¸ªè¡¥</div><div class='add'>+ä¸�。用户将希望通过 google æ�¥æ�œç´¢"一å�¥è¯�概述"æ�¥æ‰¾åˆ°é‚£äº›è®¨è®ºè¿™ä¸ªè¡¥ä¸�çš„æ–‡</div><div class='add'>+章。当人们在两三个月å�Žä½¿ç”¨è¯¸å¦‚ ``gitk`` 或 ``git log --oneline`` 之类</div><div class='add'>+的工具查看数å�ƒä¸ªè¡¥ä¸�时，也会很快看到它。</div><div class='add'>+</div><div class='add'>+出于这些原因，概述必须ä¸�超过70-75个字符，并且必须æ��è¿°è¡¥ä¸�的更改以å�Šä¸º</div><div class='add'>+什么需è¦�è¡¥ä¸�。既è¦�简æ´�å�ˆè¦�æ��述性很有挑战性，但写得好的概述应该这样å�šã€‚</div><div class='add'>+</div><div class='add'>+概述的å‰�ç¼€å�¯ä»¥ç”¨æ–¹æ‹¬å�·æ‹¬èµ·æ�¥ï¼šâ€œSubject: [PATCH &lt;tag&gt;...] &lt;概述&gt;â€�。标记</div><div class='add'>+ä¸�被视为概述的一部分，而是æ��述应该如何处ç�†è¡¥ä¸�。如果补ä¸�的多个版本已å�‘</div><div class='add'>+é€�出æ�¥ä»¥å“�应评审（å�³â€œv1，v2，v3â€�）或“rfcâ€�，以指示评审请求，那么通用标记</div><div class='add'>+å�¯èƒ½åŒ…括版本æ��述符。如果一个补ä¸�系列中有四个补ä¸�，那么å�„个补ä¸�å�¯ä»¥è¿™æ ·</div><div class='add'>+ç¼–å�·ï¼š1/4ã€�2/4ã€�3/4ã€�4/4。这å�¯ä»¥ç¡®ä¿�å¼€å�‘人员了解补ä¸�应用的顺åº�，并且他们</div><div class='add'>+å·²ç»�查看或应用了补ä¸�系列中的所有补ä¸�。</div><div class='add'>+</div><div class='add'>+一些标题的例å­�::</div><div class='add'>+</div><div class='add'>+    Subject: [patch 2/5] ext2: improve scalability of bitmap searching</div><div class='add'>+    Subject: [PATCHv2 001/207] x86: fix eflags tracking</div><div class='add'>+</div><div class='add'>+"From" 行是信体里的最上é�¢ä¸€è¡Œï¼Œå…·æœ‰å¦‚下格å¼�：</div><div class='add'>+        From: Patch Author &lt;author@example.com&gt;</div><div class='add'>+</div><div class='add'>+"From" 行指明在永久改动日志里，è°�会被确认为作者。如果没有 "From" 行，那</div><div class='add'>+么邮件头里的 "From: " 行会被用æ�¥å†³å®šæ”¹åŠ¨æ—¥å¿—中的作者。</div><div class='add'>+</div><div class='add'>+说明的主题将会被æ��交到永久的æº�代ç �改动日志里，因此对那些早已ç»�ä¸�è®°å¾—å’Œ</div><div class='add'>+这个补ä¸�相关的讨论细节的有能力的读者æ�¥è¯´ï¼Œæ˜¯æœ‰æ„�义的。包括补ä¸�程åº�定ä½�</div><div class='add'>+错误的（内核日志消æ�¯ã€�OOPS消æ�¯ç­‰ï¼‰ç—‡çŠ¶ï¼Œå¯¹äºŽæ�œç´¢æ��交日志以寻找适用补ä¸�的人</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'>+对于 "---" 标记之å�Žçš„é¢�外注解，一个好的用途就是用æ�¥å†™ diffstat，用æ�¥æ˜¾</div><div class='add'>+示修改了什么文件和æ¯�个文件都增加和删除了多少行。diffstat 对于比较大的补</div><div class='add'>+ä¸�特别有用。其余那些å�ªæ˜¯å’Œæ—¶åˆ»æˆ–者开å�‘者相关的注解，ä¸�å�ˆé€‚放到永久的改</div><div class='add'>+动日志里的，也应该放这里。</div><div class='add'>+使用 diffstat的选项 "-p 1 -w 70" 这样文件å��就会从内核æº�代ç �树的目录开始</div><div class='add'>+，ä¸�会å� ç”¨å¤ªå®½çš„空间（很容易适å�ˆ80列的宽度，也许会有一些缩进。）</div><div class='add'>+</div><div class='add'>+在å�Žé�¢çš„å�‚考资料中能看到适当的补ä¸�æ ¼å¼�的更多细节。</div><div class='add'>+</div><div class='add'>+.. _cn_explicit_in_reply_to:</div><div class='add'>+</div><div class='add'>+15) 明确回å¤�邮件头(In-Reply-To)</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+手动添加回å¤�è¡¥ä¸�的的标题头(In-Reply_To:) 是有帮助的（例如，使用 ``git send-email`` ）</div><div class='add'>+将补ä¸�与以å‰�的相关讨论关è�”èµ·æ�¥ï¼Œä¾‹å¦‚，将bugä¿®å¤�程åº�链接到电å­�邮件和bug报告。</div><div class='add'>+但是，对于多补ä¸�系列，最好é�¿å…�在回å¤�时使用链接到该系列的旧版本。这样，</div><div class='add'>+è¡¥ä¸�的多个版本就ä¸�会æˆ�为电å­�邮件客户端中无法管ç�†çš„引用åº�列。如果链接有用，</div><div class='add'>+å�¯ä»¥ä½¿ç”¨ https://lkml.kernel.org/ é‡�定å�‘器（例如，在å°�é�¢ç”µå­�邮件文本中）</div><div class='add'>+链接到补ä¸�系列的早期版本。</div><div class='add'>+</div><div class='add'>+16) å�‘é€�git pull请求</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+如果您有一系列补ä¸�，那么让维护人员通过git pullæ“�作将它们直接拉入å­�系统存储</div><div class='add'>+库å�¯èƒ½æ˜¯æœ€æ–¹ä¾¿çš„。但是，请注æ„�，从开å�‘人员那里获å�–è¡¥ä¸�比从邮件列表中获å�–è¡¥</div><div class='add'>+ä¸�需è¦�更高的信任度。因此，许多å­�系统维护人员ä¸�æ„¿æ„�接å�—请求，特别是æ�¥è‡ªæ–°çš„</div><div class='add'>+未知开å�‘人员的请求。如果有疑问，您å�¯ä»¥åœ¨å°�é�¢é‚®ä»¶ä¸­ä½¿ç”¨pull 请求作为补ä¸�系列</div><div class='add'>+正常å�‘布的一个选项，让维护人员å�¯ä»¥é€‰æ‹©ä½¿ç”¨å…¶ä¸­ä¹‹ä¸€ã€‚</div><div class='add'>+</div><div class='add'>+pull 请求的主题行中应该有[Git Pull]。请求本身应该在一行中包å�«å­˜å‚¨åº“å��称和</div><div class='add'>+感兴趣的分支；它应该看起æ�¥åƒ�::</div><div class='add'>+</div><div class='add'>+  Please pull from</div><div class='add'>+</div><div class='add'>+      git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus</div><div class='add'>+</div><div class='add'>+  to get these changes:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+pull 请求还应该包å�«ä¸€æ�¡æ•´ä½“消æ�¯ï¼Œè¯´æ˜Žè¯·æ±‚中将包å�«ä»€ä¹ˆï¼Œä¸€ä¸ªè¡¥ä¸�本身的 ``Git shortlog``</div><div class='add'>+以å�Šä¸€ä¸ªæ˜¾ç¤ºè¡¥ä¸�系列整体效果的 ``diffstat`` 。当然，将所有这些信æ�¯æ”¶é›†åœ¨ä¸€èµ·</div><div class='add'>+的最简å�•æ–¹æ³•æ˜¯è®© ``git`` 使用 ``git request-pull`` 命令为您完æˆ�这些工作。</div><div class='add'>+</div><div class='add'>+一些维护人员（包括Linus）希望看到æ�¥è‡ªå·²ç­¾å��æ��交的请求；这增加了他们对你的</div><div class='add'>+请求信心。特别是，在没有签å��标签的情况下，Linus ä¸�会从åƒ� Github 这样的公共</div><div class='add'>+托管站点拉请求。</div><div class='add'>+</div><div class='add'>+创建此类签å��的第一步是生æˆ�一个 GNRPG 密钥，并由一个或多个核心内核开å�‘人员对</div><div class='add'>+其进行签å��。这一步对新开å�‘人员æ�¥è¯´å�¯èƒ½å¾ˆå›°éš¾ï¼Œä½†æ²¡æœ‰åŠžæ³•ç»•è¿‡å®ƒã€‚å�‚加会议是</div><div class='add'>+找到å�¯ä»¥ç­¾ç½²æ‚¨çš„密钥的开å�‘人员的好方法。</div><div class='add'>+</div><div class='add'>+一旦您在Git 中准备了一个您希望有人拉的补ä¸�系列，就用 ``git tag -s`` 创建一</div><div class='add'>+个签å��标记。这将创建一个新标记，标识该系列中的最å�Žä¸€æ¬¡æ��交，并包å�«ç”¨æ‚¨çš„ç§�</div><div class='add'>+钥创建的签å��。您还å�¯ä»¥å°†changelogæ ·å¼�的消æ�¯æ·»åŠ åˆ°æ ‡è®°ä¸­ï¼›è¿™æ˜¯ä¸€ä¸ªæ��述拉请求</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'>+  git request-pull master git://my.public.tree/linux.git my-signed-tag</div><div class='add'>+</div><div class='add'>+å�‚考文献</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Andrew Morton, "The perfect patch" (tpp).</div><div class='add'>+  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='add'>+</div><div class='add'>+Jeff Garzik, "Linux kernel patch submission format".</div><div class='add'>+  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='add'>+</div><div class='add'>+Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-02.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-03.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-04.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-05.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-06.html&gt;</div><div class='add'>+</div><div class='add'>+NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='add'>+  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='add'>+</div><div class='add'>+Kernel Documentation/process/coding-style.rst:</div><div class='add'>+  :ref:`Documentation/translations/zh_CN/process/coding-style.rst &lt;cn_codingstyle&gt;`</div><div class='add'>+</div><div class='add'>+Linus Torvalds's mail on the canonical patch format:</div><div class='add'>+  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='add'>+</div><div class='add'>+Andi Kleen, "On submitting kernel patches"</div><div class='add'>+  Some strategies to get difficult or controversial changes in.</div><div class='add'>+</div><div class='add'>+  http://halobates.de/on-submitting-patches.pdf</div><div class='head'>diff --git a/Documentation/translations/zh_CN/volatile-considered-harmful.txt b/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst<br/>index 475125967197..48b32ce58ef1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/volatile-considered-harmful.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/volatile-considered-harmful.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/process/volatile-considered-harmful.rst</a></div><div class='hunk'>@@ -1,30 +1,23 @@</div><div class='del'>-Chinese translated version of Documentation/process/volatile-considered-harmful.rst</div><div class='add'>+.. _cn_volatile_considered_harmful:</div><div class='ctx'> </div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='add'>+.. include:: ../disclaimer-zh_CN.rst</div><div class='ctx'> </div><div class='del'>-Maintainer: Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='del'>-Chinese maintainer: Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/process/volatile-considered-harmful.rst 的中文翻译</div><div class='add'>+:Original: :ref:`Documentation/process/volatile-considered-harmful.rst</div><div class='add'>+           &lt;volatile_considered_harmful&gt;`</div><div class='ctx'> </div><div class='ctx'> 如果想评论或更新本文的内容，请直接è�”系原文档的维护者。如果你使用英文</div><div class='ctx'> 交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='del'>-译存在问题，请è�”系中文版维护者。</div><div class='add'>+译存在问题，请è�”系中文版维护者::</div><div class='ctx'> </div><div class='del'>-英文版维护者： Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='del'>-中文版维护者： ä¼�é¹�  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='del'>-中文版翻译者： ä¼�é¹�  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='del'>-中文版校译者： 张汉辉  Eugene Teo &lt;eugeneteo@kernel.sg&gt;</div><div class='del'>-               æ�¨ç‘ž  Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='add'>+        英文版维护者： Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='add'>+        中文版维护者： ä¼�é¹�  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='add'>+        中文版翻译者： ä¼�é¹�  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='add'>+        中文版校译者： 张汉辉  Eugene Teo &lt;eugeneteo@kernel.sg&gt;</div><div class='add'>+                       æ�¨ç‘ž  Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='add'>+                       时奎亮 Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='ctx'> </div><div class='ctx'> 为什么ä¸�应该使用“volatileâ€�类型</div><div class='del'>-------------------------------</div><div class='add'>+==============================</div><div class='ctx'> </div><div class='ctx'> C程åº�员通常认为volatile表示æŸ�个å�˜é‡�å�¯ä»¥åœ¨å½“å‰�执行的线程之外被改å�˜ï¼›å› æ­¤ï¼Œåœ¨å†…æ ¸</div><div class='ctx'> 中用到共享数æ�®ç»“构时，常常会有C程åº�员喜欢使用volatile这类å�˜é‡�。æ�¢å�¥è¯�说，他们ç»�</div><div class='hunk'>@@ -41,7 +34,7 @@ C程åº�员通常认为volatile表示æŸ�个å�˜é‡�å�¯ä»¥åœ¨å½“å‰�执行的线程ä¹</div><div class='ctx'> å¿…è¦�å†�使用volatile。如果ä»�然必须使用volatile，那么几乎å�¯ä»¥è‚¯å®šåœ¨ä»£ç �çš„æŸ�处有一</div><div class='ctx'> 个bug。在正确设计的内核代ç �中，volatile能带æ�¥çš„仅仅是使事情å�˜æ…¢ã€‚</div><div class='ctx'> </div><div class='del'>-æ€�考一下这段典型的内核代ç �：</div><div class='add'>+æ€�考一下这段典型的内核代ç �::</div><div class='ctx'> </div><div class='ctx'>     spin_lock(&amp;the_lock);</div><div class='ctx'>     do_something_on(&amp;shared_data);</div><div class='hunk'>@@ -66,7 +59,7 @@ volatile的存储类型最åˆ�是为那些内存映射的I/O寄存器而定义。</div><div class='ctx'> 是必需的。</div><div class='ctx'> </div><div class='ctx'> å�¦ä¸€ç§�引起用户å�¯èƒ½ä½¿ç”¨volatile的情况是当处ç�†å™¨æ­£å¿™ç�€ç­‰å¾…一个å�˜é‡�的值。正确执行一</div><div class='del'>-个忙等待的方法是：</div><div class='add'>+个忙等待的方法是::</div><div class='ctx'> </div><div class='ctx'>     while (my_variable != what_i_want)</div><div class='ctx'>         cpu_relax();</div><div class='head'>diff --git a/Documentation/translations/zh_CN/sparse.txt b/Documentation/translations/zh_CN/sparse.txt<br/>index 2f728962a8e2..47fc4a06ebe8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/sparse.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/translations/zh_CN/sparse.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/translations/zh_CN/sparse.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/translations/zh_CN/sparse.txt</a></div><div class='hunk'>@@ -6,7 +6,7 @@ communicating in English you can also ask the Chinese maintainer for</div><div class='ctx'> help.  Contact the Chinese maintainer if this translation is outdated</div><div class='ctx'> or if there is a problem with the translation.</div><div class='ctx'> </div><div class='del'>-Chinese maintainer: Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+Chinese maintainer: Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='ctx'> ---------------------------------------------------------------------</div><div class='ctx'> Documentation/dev-tools/sparse.rst 的中文翻译</div><div class='ctx'> </div><div class='hunk'>@@ -14,8 +14,8 @@ Documentation/dev-tools/sparse.rst 的中文翻译</div><div class='ctx'> 交æµ�有困难的è¯�，也å�¯ä»¥å�‘中文版维护者求助。如果本翻译更新ä¸�å�Šæ—¶æˆ–者翻</div><div class='ctx'> 译存在问题，请è�”系中文版维护者。</div><div class='ctx'> </div><div class='del'>-中文版维护者： æ�Žé˜³  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： æ�Žé˜³  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+中文版维护者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='add'>+中文版翻译者： æ�Žé˜³  Li Yang &lt;leoyang.li@nxp.com&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 以下为正文</div><div class='head'>diff --git a/Documentation/unaligned-memory-access.txt b/Documentation/unaligned-memory-access.txt<br/>index 51b4ff031586..1ee82419d8aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/unaligned-memory-access.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/unaligned-memory-access.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/unaligned-memory-access.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/unaligned-memory-access.txt</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> =========================</div><div class='del'>-UNALIGNED MEMORY ACCESSES</div><div class='add'>+Unaligned Memory Accesses</div><div class='ctx'> =========================</div><div class='ctx'> </div><div class='ctx'> :Author: Daniel Drake &lt;dsd@gentoo.org&gt;,</div><div class='head'>diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/usb/WUSB-Design-overview.txt<br/>index fdb47637720e..dc5e21609bb5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/WUSB-Design-overview.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/WUSB-Design-overview.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/WUSB-Design-overview.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/WUSB-Design-overview.txt</a></div><div class='hunk'>@@ -1,7 +1,9 @@</div><div class='del'>-</div><div class='add'>+================================</div><div class='ctx'> Linux UWB + Wireless USB + WiNET</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+   Copyright (C) 2005-2006 Intel Corporation</div><div class='ctx'> </div><div class='del'>-   (C) 2005-2006 Intel Corporation</div><div class='ctx'>    Inaky Perez-Gonzalez &lt;inaky.perez-gonzalez@intel.com&gt;</div><div class='ctx'> </div><div class='ctx'>    This program is free software; you can redistribute it and/or</div><div class='hunk'>@@ -29,6 +31,7 @@ drivers for the USB based UWB radio controllers defined in the</div><div class='ctx'> Wireless USB 1.0 specification (including Wireless USB host controller</div><div class='ctx'> and an Intel WiNET controller).</div><div class='ctx'> </div><div class='add'>+.. Contents</div><div class='ctx'>    1. Introduction</div><div class='ctx'>          1. HWA: Host Wire adapters, your Wireless USB dongle</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +54,8 @@ and an Intel WiNET controller).</div><div class='ctx'>    4. Glossary</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-    Introduction</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'> UWB is a wide-band communication protocol that is to serve also as the</div><div class='ctx'> low-level protocol for others (much like TCP sits on IP). Currently</div><div class='hunk'>@@ -93,7 +97,8 @@ The different logical parts of this driver are:</div><div class='ctx'>       do the actual WUSB.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      HWA: Host Wire adapters, your Wireless USB dongle</div><div class='add'>+HWA: Host Wire adapters, your Wireless USB dongle</div><div class='add'>+-------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> WUSB also defines a device called a Host Wire Adaptor (HWA), which in</div><div class='ctx'> mere terms is a USB dongle that enables your PC to have UWB and Wireless</div><div class='hunk'>@@ -125,7 +130,8 @@ The HWA itself is broken in two or three main interfaces:</div><div class='ctx'>       their type and kick into gear.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      DWA: Device Wired Adaptor, a Wireless USB hub for wired devices</div><div class='add'>+DWA: Device Wired Adaptor, a Wireless USB hub for wired devices</div><div class='add'>+---------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> These are the complement to HWAs. They are a USB host for connecting</div><div class='ctx'> wired devices, but it is connected to your PC connected via Wireless</div><div class='hunk'>@@ -137,7 +143,8 @@ code with the HWA-RC driver; there is a bunch of factorization work that</div><div class='ctx'> has been done to support that in upcoming releases.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      WHCI: Wireless Host Controller Interface, the PCI WUSB host adapter</div><div class='add'>+WHCI: Wireless Host Controller Interface, the PCI WUSB host adapter</div><div class='add'>+-------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> This is your usual PCI device that implements WHCI. Similar in concept</div><div class='ctx'> to EHCI, it allows your wireless USB devices (including DWAs) to connect</div><div class='hunk'>@@ -148,7 +155,8 @@ There is still no driver support for this, but will be in upcoming</div><div class='ctx'> releases.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-    The UWB stack</div><div class='add'>+The UWB stack</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'> The main mission of the UWB stack is to keep a tally of which devices</div><div class='ctx'> are in radio proximity to allow drivers to connect to them. As well, it</div><div class='hunk'>@@ -156,7 +164,8 @@ provides an API for controlling the local radio controllers (RCs from</div><div class='ctx'> now on), such as to start/stop beaconing, scan, allocate bandwidth, etc.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      Devices and hosts: the basic structure</div><div class='add'>+Devices and hosts: the basic structure</div><div class='add'>+--------------------------------------</div><div class='ctx'> </div><div class='ctx'> The main building block here is the UWB device (struct uwb_dev). For</div><div class='ctx'> each device that pops up in radio presence (ie: the UWB host receives a</div><div class='hunk'>@@ -187,7 +196,8 @@ the USB connected HWA. Eventually, drivers/whci-rc.c will do the same</div><div class='ctx'> for the PCI connected WHCI controller.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      Host Controller life cycle</div><div class='add'>+Host Controller life cycle</div><div class='add'>+--------------------------</div><div class='ctx'> </div><div class='ctx'> So let's say we connect a dongle to the system: it is detected and</div><div class='ctx'> firmware uploaded if needed [for Intel's i1480</div><div class='hunk'>@@ -209,7 +219,8 @@ When a dongle is disconnected, /drivers/uwb/hwa-rc.c:hwarc_disconnect()/</div><div class='ctx'> takes time of tearing everything down safely (or not...).</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      On the air: beacons and enumerating the radio neighborhood</div><div class='add'>+On the air: beacons and enumerating the radio neighborhood</div><div class='add'>+----------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> So assuming we have devices and we have agreed for a channel to connect</div><div class='ctx'> on (let's say 9), we put the new RC to beacon:</div><div class='hunk'>@@ -235,12 +246,14 @@ are received in some time, the device is considered gone and wiped out</div><div class='ctx'> the beacon cache of dead devices].</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      Device lists</div><div class='add'>+Device lists</div><div class='add'>+------------</div><div class='ctx'> </div><div class='ctx'> All UWB devices are kept in the list of the struct bus_type uwb_bus_type.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-      Bandwidth allocation</div><div class='add'>+Bandwidth allocation</div><div class='add'>+--------------------</div><div class='ctx'> </div><div class='ctx'> The UWB stack maintains a local copy of DRP availability through</div><div class='ctx'> processing of incoming *DRP Availability Change* notifications. This</div><div class='hunk'>@@ -260,7 +273,8 @@ completion. [Note: The bandwidth reservation work is in progress and</div><div class='ctx'> subject to change.]</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-    Wireless USB Host Controller drivers</div><div class='add'>+Wireless USB Host Controller drivers</div><div class='add'>+====================================</div><div class='ctx'> </div><div class='ctx'> *WARNING* This section needs a lot of work!</div><div class='ctx'> </div><div class='hunk'>@@ -296,7 +310,8 @@ starts sending MMCs.</div><div class='ctx'> </div><div class='ctx'> Now it all depends on external stimuli.</div><div class='ctx'> </div><div class='del'>-*New device connection*</div><div class='add'>+New device connection</div><div class='add'>+---------------------</div><div class='ctx'> </div><div class='ctx'> A new device pops up, it scans the radio looking for MMCs that give out</div><div class='ctx'> the existence of Wireless USB channels. Once one (or more) are found,</div><div class='hunk'>@@ -322,7 +337,8 @@ has seen the port status changes, as we have been toggling them. It will</div><div class='ctx'> start enumerating and doing transfers through usb_hcd-&gt;urb_enqueue() to</div><div class='ctx'> read descriptors and move our data.</div><div class='ctx'> </div><div class='del'>-*Device life cycle and keep alives*</div><div class='add'>+Device life cycle and keep alives</div><div class='add'>+---------------------------------</div><div class='ctx'> </div><div class='ctx'> Every time there is a successful transfer to/from a device, we update a</div><div class='ctx'> per-device activity timestamp. If not, every now and then we check and</div><div class='hunk'>@@ -340,7 +356,8 @@ device list looking for whom needs refreshing.</div><div class='ctx'> If the device wants to disconnect, it will either die (ugly) or send a</div><div class='ctx'> /DN_Disconnect/ that will prompt a disconnection from the system.</div><div class='ctx'> </div><div class='del'>-*Sending and receiving data*</div><div class='add'>+Sending and receiving data</div><div class='add'>+--------------------------</div><div class='ctx'> </div><div class='ctx'> Data is sent and received through /Remote Pipes/ (rpipes). An rpipe is</div><div class='ctx'> /aimed/ at an endpoint in a WUSB device. This is the same for HWAs and</div><div class='hunk'>@@ -394,7 +411,8 @@ finalize the transfer.</div><div class='ctx'> For IN xfers, we only issue URBs for the segments we want to read and</div><div class='ctx'> then wait for the xfer result data.</div><div class='ctx'> </div><div class='del'>-*URB mapping into xfers*</div><div class='add'>+URB mapping into xfers</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> This is done by hwahc_op_urb_[en|de]queue(). In enqueue() we aim an</div><div class='ctx'> rpipe to the endpoint where we have to transmit, create a transfer</div><div class='hunk'>@@ -407,7 +425,8 @@ and not yet done and when all that is done, the xfer callback will be</div><div class='ctx'> called--this will call the URB callback.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-    Glossary</div><div class='add'>+Glossary</div><div class='add'>+========</div><div class='ctx'> </div><div class='ctx'> *DWA* -- Device Wire Adapter</div><div class='ctx'> </div><div class='hunk'>@@ -436,4 +455,3 @@ the host.</div><div class='ctx'> </div><div class='ctx'> Design-overview.txt-1.8 (last edited 2006-11-04 12:22:24 by</div><div class='ctx'> InakyPerezGonzalez)</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/usb/acm.txt b/Documentation/usb/acm.txt<br/>index 903abca10517..e8bda98e9b51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/acm.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/acm.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/acm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/acm.txt</a></div><div class='hunk'>@@ -1,127 +1,131 @@</div><div class='del'>-			  Linux ACM driver v0.16</div><div class='del'>-		 (c) 1999 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='del'>-			     Sponsored by SuSE</div><div class='del'>-----------------------------------------------------------------------------</div><div class='add'>+======================</div><div class='add'>+Linux ACM driver v0.16</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+Copyright (c) 1999 Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='add'>+</div><div class='add'>+Sponsored by SuSE</div><div class='ctx'> </div><div class='ctx'> 0. Disclaimer</div><div class='ctx'> ~~~~~~~~~~~~~</div><div class='del'>-  This program is free software; you can redistribute it and/or modify it</div><div class='add'>+This program is free software; you can redistribute it and/or modify it</div><div class='ctx'> under the terms of the GNU General Public License as published by the Free</div><div class='ctx'> Software Foundation; either version 2 of the License, or (at your option)</div><div class='ctx'> any later version.</div><div class='ctx'> </div><div class='del'>-  This program is distributed in the hope that it will be useful, but</div><div class='add'>+This program is distributed in the hope that it will be useful, but</div><div class='ctx'> WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY</div><div class='ctx'> or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='ctx'> more details.</div><div class='ctx'> </div><div class='del'>-  You should have received a copy of the GNU General Public License along</div><div class='add'>+You should have received a copy of the GNU General Public License along</div><div class='ctx'> with this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='ctx'> Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'> </div><div class='del'>-  Should you need to contact me, the author, you can do so either by e-mail</div><div class='del'>-- mail your message to &lt;vojtech@suse.cz&gt;, or by paper mail: Vojtech Pavlik,</div><div class='add'>+Should you need to contact me, the author, you can do so either by e-mail -</div><div class='add'>+mail your message to &lt;vojtech@suse.cz&gt;, or by paper mail: Vojtech Pavlik,</div><div class='ctx'> Ucitelska 1576, Prague 8, 182 00 Czech Republic</div><div class='ctx'> </div><div class='del'>-  For your convenience, the GNU General Public License version 2 is included</div><div class='add'>+For your convenience, the GNU General Public License version 2 is included</div><div class='ctx'> in the package: See the file COPYING.</div><div class='ctx'> </div><div class='ctx'> 1. Usage</div><div class='ctx'> ~~~~~~~~</div><div class='del'>-  The drivers/usb/class/cdc-acm.c drivers works with USB modems and USB ISDN terminal</div><div class='add'>+The drivers/usb/class/cdc-acm.c drivers works with USB modems and USB ISDN terminal</div><div class='ctx'> adapters that conform to the Universal Serial Bus Communication Device Class</div><div class='ctx'> Abstract Control Model (USB CDC ACM) specification.</div><div class='ctx'> </div><div class='del'>-  Many modems do, here is a list of those I know of:</div><div class='add'>+Many modems do, here is a list of those I know of:</div><div class='ctx'> </div><div class='del'>-	3Com OfficeConnect 56k</div><div class='del'>-	3Com Voice FaxModem Pro</div><div class='del'>-	3Com Sportster</div><div class='del'>-	MultiTech MultiModem 56k</div><div class='del'>-	Zoom 2986L FaxModem</div><div class='del'>-	Compaq 56k FaxModem</div><div class='del'>-	ELSA Microlink 56k</div><div class='add'>+	- 3Com OfficeConnect 56k</div><div class='add'>+	- 3Com Voice FaxModem Pro</div><div class='add'>+	- 3Com Sportster</div><div class='add'>+	- MultiTech MultiModem 56k</div><div class='add'>+	- Zoom 2986L FaxModem</div><div class='add'>+	- Compaq 56k FaxModem</div><div class='add'>+	- ELSA Microlink 56k</div><div class='ctx'> </div><div class='del'>-  I know of one ISDN TA that does work with the acm driver:</div><div class='add'>+I know of one ISDN TA that does work with the acm driver:</div><div class='ctx'> </div><div class='del'>-	3Com USR ISDN Pro TA</div><div class='add'>+	- 3Com USR ISDN Pro TA</div><div class='ctx'> </div><div class='del'>-  Some cell phones also connect via USB. I know the following phones work:</div><div class='add'>+Some cell phones also connect via USB. I know the following phones work:</div><div class='ctx'> </div><div class='del'>-	SonyEricsson K800i</div><div class='add'>+	- SonyEricsson K800i</div><div class='ctx'> </div><div class='del'>-  Unfortunately many modems and most ISDN TAs use proprietary interfaces and</div><div class='add'>+Unfortunately many modems and most ISDN TAs use proprietary interfaces and</div><div class='ctx'> thus won't work with this drivers. Check for ACM compliance before buying.</div><div class='ctx'> </div><div class='del'>-  To use the modems you need these modules loaded:</div><div class='add'>+To use the modems you need these modules loaded::</div><div class='ctx'> </div><div class='ctx'> 	usbcore.ko</div><div class='ctx'> 	uhci-hcd.ko ohci-hcd.ko or ehci-hcd.ko</div><div class='ctx'> 	cdc-acm.ko</div><div class='ctx'> </div><div class='del'>-  After that, the modem[s] should be accessible. You should be able to use</div><div class='add'>+After that, the modem[s] should be accessible. You should be able to use</div><div class='ctx'> minicom, ppp and mgetty with them.</div><div class='ctx'> </div><div class='ctx'> 2. Verifying that it works</div><div class='ctx'> ~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-  The first step would be to check /sys/kernel/debug/usb/devices, it should look</div><div class='del'>-like this:</div><div class='del'>-</div><div class='del'>-T:  Bus=01 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#=  1 Spd=12  MxCh= 2</div><div class='del'>-B:  Alloc=  0/900 us ( 0%), #Int=  0, #Iso=  0</div><div class='del'>-D:  Ver= 1.00 Cls=09(hub  ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1</div><div class='del'>-P:  Vendor=0000 ProdID=0000 Rev= 0.00</div><div class='del'>-S:  Product=USB UHCI Root Hub</div><div class='del'>-S:  SerialNumber=6800</div><div class='del'>-C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr=  0mA</div><div class='del'>-I:  If#= 0 Alt= 0 #EPs= 1 Cls=09(hub  ) Sub=00 Prot=00 Driver=hub</div><div class='del'>-E:  Ad=81(I) Atr=03(Int.) MxPS=   8 Ivl=255ms</div><div class='del'>-T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#=  2 Spd=12  MxCh= 0</div><div class='del'>-D:  Ver= 1.00 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  2</div><div class='del'>-P:  Vendor=04c1 ProdID=008f Rev= 2.07</div><div class='del'>-S:  Manufacturer=3Com Inc.</div><div class='del'>-S:  Product=3Com U.S. Robotics Pro ISDN TA</div><div class='del'>-S:  SerialNumber=UFT53A49BVT7</div><div class='del'>-C:  #Ifs= 1 Cfg#= 1 Atr=60 MxPwr=  0mA</div><div class='del'>-I:  If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=acm</div><div class='del'>-E:  Ad=85(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='del'>-E:  Ad=04(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='del'>-E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=128ms</div><div class='del'>-C:* #Ifs= 2 Cfg#= 2 Atr=60 MxPwr=  0mA</div><div class='del'>-I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm</div><div class='del'>-E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=128ms</div><div class='del'>-I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm</div><div class='del'>-E:  Ad=85(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='del'>-E:  Ad=04(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='add'>+</div><div class='add'>+The first step would be to check /sys/kernel/debug/usb/devices, it should look</div><div class='add'>+like this::</div><div class='add'>+</div><div class='add'>+  T:  Bus=01 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#=  1 Spd=12  MxCh= 2</div><div class='add'>+  B:  Alloc=  0/900 us ( 0%), #Int=  0, #Iso=  0</div><div class='add'>+  D:  Ver= 1.00 Cls=09(hub  ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1</div><div class='add'>+  P:  Vendor=0000 ProdID=0000 Rev= 0.00</div><div class='add'>+  S:  Product=USB UHCI Root Hub</div><div class='add'>+  S:  SerialNumber=6800</div><div class='add'>+  C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr=  0mA</div><div class='add'>+  I:  If#= 0 Alt= 0 #EPs= 1 Cls=09(hub  ) Sub=00 Prot=00 Driver=hub</div><div class='add'>+  E:  Ad=81(I) Atr=03(Int.) MxPS=   8 Ivl=255ms</div><div class='add'>+  T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#=  2 Spd=12  MxCh= 0</div><div class='add'>+  D:  Ver= 1.00 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  2</div><div class='add'>+  P:  Vendor=04c1 ProdID=008f Rev= 2.07</div><div class='add'>+  S:  Manufacturer=3Com Inc.</div><div class='add'>+  S:  Product=3Com U.S. Robotics Pro ISDN TA</div><div class='add'>+  S:  SerialNumber=UFT53A49BVT7</div><div class='add'>+  C:  #Ifs= 1 Cfg#= 1 Atr=60 MxPwr=  0mA</div><div class='add'>+  I:  If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=acm</div><div class='add'>+  E:  Ad=85(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='add'>+  E:  Ad=04(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='add'>+  E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=128ms</div><div class='add'>+  C:* #Ifs= 2 Cfg#= 2 Atr=60 MxPwr=  0mA</div><div class='add'>+  I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm</div><div class='add'>+  E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=128ms</div><div class='add'>+  I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm</div><div class='add'>+  E:  Ad=85(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='add'>+  E:  Ad=04(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms</div><div class='ctx'> </div><div class='ctx'> The presence of these three lines (and the Cls= 'comm' and 'data' classes)</div><div class='ctx'> is important, it means it's an ACM device. The Driver=acm means the acm</div><div class='ctx'> driver is used for the device. If you see only Cls=ff(vend.) then you're out</div><div class='del'>-of luck, you have a device with vendor specific-interface.</div><div class='del'>-</div><div class='del'>-D:  Ver= 1.00 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  2</div><div class='del'>-I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm</div><div class='del'>-I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm</div><div class='del'>-</div><div class='del'>-In the system log you should see:</div><div class='del'>-</div><div class='del'>-usb.c: USB new device connect, assigned device number 2</div><div class='del'>-usb.c: kmalloc IF c7691fa0, numif 1</div><div class='del'>-usb.c: kmalloc IF c7b5f3e0, numif 2</div><div class='del'>-usb.c: skipped 4 class/vendor specific interface descriptors</div><div class='del'>-usb.c: new device strings: Mfr=1, Product=2, SerialNumber=3</div><div class='del'>-usb.c: USB device number 2 default language ID 0x409</div><div class='del'>-Manufacturer: 3Com Inc.</div><div class='del'>-Product: 3Com U.S. Robotics Pro ISDN TA</div><div class='del'>-SerialNumber: UFT53A49BVT7</div><div class='del'>-acm.c: probing config 1</div><div class='del'>-acm.c: probing config 2</div><div class='del'>-ttyACM0: USB ACM device</div><div class='del'>-acm.c: acm_control_msg: rq: 0x22 val: 0x0 len: 0x0 result: 0</div><div class='del'>-acm.c: acm_control_msg: rq: 0x20 val: 0x0 len: 0x7 result: 7</div><div class='del'>-usb.c: acm driver claimed interface c7b5f3e0</div><div class='del'>-usb.c: acm driver claimed interface c7b5f3f8</div><div class='del'>-usb.c: acm driver claimed interface c7691fa0</div><div class='add'>+of luck, you have a device with vendor specific-interface::</div><div class='add'>+</div><div class='add'>+  D:  Ver= 1.00 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  2</div><div class='add'>+  I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm</div><div class='add'>+  I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm</div><div class='add'>+</div><div class='add'>+In the system log you should see::</div><div class='add'>+</div><div class='add'>+  usb.c: USB new device connect, assigned device number 2</div><div class='add'>+  usb.c: kmalloc IF c7691fa0, numif 1</div><div class='add'>+  usb.c: kmalloc IF c7b5f3e0, numif 2</div><div class='add'>+  usb.c: skipped 4 class/vendor specific interface descriptors</div><div class='add'>+  usb.c: new device strings: Mfr=1, Product=2, SerialNumber=3</div><div class='add'>+  usb.c: USB device number 2 default language ID 0x409</div><div class='add'>+  Manufacturer: 3Com Inc.</div><div class='add'>+  Product: 3Com U.S. Robotics Pro ISDN TA</div><div class='add'>+  SerialNumber: UFT53A49BVT7</div><div class='add'>+  acm.c: probing config 1</div><div class='add'>+  acm.c: probing config 2</div><div class='add'>+  ttyACM0: USB ACM device</div><div class='add'>+  acm.c: acm_control_msg: rq: 0x22 val: 0x0 len: 0x0 result: 0</div><div class='add'>+  acm.c: acm_control_msg: rq: 0x20 val: 0x0 len: 0x7 result: 7</div><div class='add'>+  usb.c: acm driver claimed interface c7b5f3e0</div><div class='add'>+  usb.c: acm driver claimed interface c7b5f3f8</div><div class='add'>+  usb.c: acm driver claimed interface c7691fa0</div><div class='ctx'> </div><div class='ctx'> If all this seems to be OK, fire up minicom and set it to talk to the ttyACM</div><div class='ctx'> device and try typing 'at'. If it responds with 'OK', then everything is</div><div class='head'>diff --git a/Documentation/usb/authorization.txt b/Documentation/usb/authorization.txt<br/>index 9dd1dc7b1009..9e53909d04c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/authorization.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/authorization.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/authorization.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/authorization.txt</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='del'>-</div><div class='add'>+==============================================================</div><div class='ctx'> Authorizing (or not) your USB devices to connect to the system</div><div class='add'>+==============================================================</div><div class='ctx'> </div><div class='del'>-(C) 2007 Inaky Perez-Gonzalez &lt;inaky@linux.intel.com&gt; Intel Corporation</div><div class='add'>+Copyright (C) 2007 Inaky Perez-Gonzalez &lt;inaky@linux.intel.com&gt; Intel Corporation</div><div class='ctx'> </div><div class='ctx'> This feature allows you to control if a USB device can be used (or</div><div class='ctx'> not) in a system. This feature will allow you to implement a lock-down</div><div class='hunk'>@@ -12,24 +13,25 @@ its interfaces are immediately made available to the users.  With this</div><div class='ctx'> modification, only if root authorizes the device to be configured will</div><div class='ctx'> then it be possible to use it.</div><div class='ctx'> </div><div class='del'>-Usage:</div><div class='add'>+Usage</div><div class='add'>+=====</div><div class='ctx'> </div><div class='del'>-Authorize a device to connect:</div><div class='add'>+Authorize a device to connect::</div><div class='ctx'> </div><div class='del'>-$ echo 1 &gt; /sys/bus/usb/devices/DEVICE/authorized</div><div class='add'>+	$ echo 1 &gt; /sys/bus/usb/devices/DEVICE/authorized</div><div class='ctx'> </div><div class='del'>-Deauthorize a device:</div><div class='add'>+De-authorize a device::</div><div class='ctx'> </div><div class='del'>-$ echo 0 &gt; /sys/bus/usb/devices/DEVICE/authorized</div><div class='add'>+	$ echo 0 &gt; /sys/bus/usb/devices/DEVICE/authorized</div><div class='ctx'> </div><div class='ctx'> Set new devices connected to hostX to be deauthorized by default (ie:</div><div class='del'>-lock down):</div><div class='add'>+lock down)::</div><div class='ctx'> </div><div class='del'>-$ echo 0 &gt; /sys/bus/usb/devices/usbX/authorized_default</div><div class='add'>+	$ echo 0 &gt; /sys/bus/usb/devices/usbX/authorized_default</div><div class='ctx'> </div><div class='del'>-Remove the lock down:</div><div class='add'>+Remove the lock down::</div><div class='ctx'> </div><div class='del'>-$ echo 1 &gt; /sys/bus/usb/devices/usbX/authorized_default</div><div class='add'>+	$ echo 1 &gt; /sys/bus/usb/devices/usbX/authorized_default</div><div class='ctx'> </div><div class='ctx'> By default, Wired USB devices are authorized by default to</div><div class='ctx'> connect. Wireless USB hosts deauthorize by default all new connected</div><div class='hunk'>@@ -40,21 +42,21 @@ USB ports.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Example system lockdown (lame)</div><div class='del'>------------------------</div><div class='add'>+------------------------------</div><div class='ctx'> </div><div class='ctx'> Imagine you want to implement a lockdown so only devices of type XYZ</div><div class='ctx'> can be connected (for example, it is a kiosk machine with a visible</div><div class='del'>-USB port):</div><div class='add'>+USB port)::</div><div class='ctx'> </div><div class='del'>-boot up</div><div class='del'>-rc.local -&gt;</div><div class='add'>+  boot up</div><div class='add'>+  rc.local -&gt;</div><div class='ctx'> </div><div class='del'>- for host in /sys/bus/usb/devices/usb*</div><div class='del'>- do</div><div class='del'>-    echo 0 &gt; $host/authorized_default</div><div class='del'>- done</div><div class='add'>+   for host in /sys/bus/usb/devices/usb*</div><div class='add'>+   do</div><div class='add'>+      echo 0 &gt; $host/authorized_default</div><div class='add'>+   done</div><div class='ctx'> </div><div class='del'>-Hookup an script to udev, for new USB devices</div><div class='add'>+Hookup an script to udev, for new USB devices::</div><div class='ctx'> </div><div class='ctx'>  if device_is_my_type $DEV</div><div class='ctx'>  then</div><div class='hunk'>@@ -67,10 +69,10 @@ checking if the class, type and protocol match something is the worse</div><div class='ctx'> security verification you can make (or the best, for someone willing</div><div class='ctx'> to break it). If you need something secure, use crypto and Certificate</div><div class='ctx'> Authentication or stuff like that. Something simple for an storage key</div><div class='del'>-could be:</div><div class='add'>+could be::</div><div class='ctx'> </div><div class='del'>-function device_is_my_type()</div><div class='del'>-{</div><div class='add'>+ function device_is_my_type()</div><div class='add'>+ {</div><div class='ctx'>    echo 1 &gt; authorized		# temporarily authorize it</div><div class='ctx'>                                 # FIXME: make sure none can mount it</div><div class='ctx'>    mount DEVICENODE /mntpoint</div><div class='hunk'>@@ -83,7 +85,7 @@ function device_is_my_type()</div><div class='ctx'>    else</div><div class='ctx'>         echo 0 &gt; authorized</div><div class='ctx'>    fi</div><div class='del'>-}</div><div class='add'>+ }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Of course, this is lame, you'd want to do a real certificate</div><div class='hunk'>@@ -95,30 +97,35 @@ welcome.</div><div class='ctx'> </div><div class='ctx'> Interface authorization</div><div class='ctx'> -----------------------</div><div class='add'>+</div><div class='ctx'> There is a similar approach to allow or deny specific USB interfaces.</div><div class='ctx'> That allows to block only a subset of an USB device.</div><div class='ctx'> </div><div class='del'>-Authorize an interface:</div><div class='del'>-$ echo 1 &gt; /sys/bus/usb/devices/INTERFACE/authorized</div><div class='add'>+Authorize an interface::</div><div class='ctx'> </div><div class='del'>-Deauthorize an interface:</div><div class='del'>-$ echo 0 &gt; /sys/bus/usb/devices/INTERFACE/authorized</div><div class='add'>+	$ echo 1 &gt; /sys/bus/usb/devices/INTERFACE/authorized</div><div class='add'>+</div><div class='add'>+Deauthorize an interface::</div><div class='add'>+</div><div class='add'>+	$ echo 0 &gt; /sys/bus/usb/devices/INTERFACE/authorized</div><div class='ctx'> </div><div class='ctx'> The default value for new interfaces</div><div class='ctx'> on a particular USB bus can be changed, too.</div><div class='ctx'> </div><div class='del'>-Allow interfaces per default:</div><div class='del'>-$ echo 1 &gt; /sys/bus/usb/devices/usbX/interface_authorized_default</div><div class='add'>+Allow interfaces per default::</div><div class='add'>+</div><div class='add'>+	$ echo 1 &gt; /sys/bus/usb/devices/usbX/interface_authorized_default</div><div class='add'>+</div><div class='add'>+Deny interfaces per default::</div><div class='ctx'> </div><div class='del'>-Deny interfaces per default:</div><div class='del'>-$ echo 0 &gt; /sys/bus/usb/devices/usbX/interface_authorized_default</div><div class='add'>+	$ echo 0 &gt; /sys/bus/usb/devices/usbX/interface_authorized_default</div><div class='ctx'> </div><div class='ctx'> Per default the interface_authorized_default bit is 1.</div><div class='ctx'> So all interfaces would authorized per default.</div><div class='ctx'> </div><div class='ctx'> Note:</div><div class='del'>-If a deauthorized interface will be authorized so the driver probing must</div><div class='del'>-be triggered manually by writing INTERFACE to /sys/bus/usb/drivers_probe</div><div class='add'>+  If a deauthorized interface will be authorized so the driver probing must</div><div class='add'>+  be triggered manually by writing INTERFACE to /sys/bus/usb/drivers_probe</div><div class='ctx'> </div><div class='ctx'> For drivers that need multiple interfaces all needed interfaces should be</div><div class='ctx'> authorized first. After that the drivers should be probed.</div><div class='head'>diff --git a/Documentation/usb/chipidea.txt b/Documentation/usb/chipidea.txt<br/>index d1eedc01b00a..68473abe2823 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/chipidea.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/chipidea.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/chipidea.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/chipidea.txt</a></div><div class='hunk'>@@ -1,22 +1,37 @@</div><div class='add'>+==============================================</div><div class='add'>+ChipIdea Highspeed Dual Role Controller Driver</div><div class='add'>+==============================================</div><div class='add'>+</div><div class='ctx'> 1. How to test OTG FSM(HNP and SRP)</div><div class='ctx'> -----------------------------------</div><div class='add'>+</div><div class='ctx'> To show how to demo OTG HNP and SRP functions via sys input files</div><div class='ctx'> with 2 Freescale i.MX6Q sabre SD boards.</div><div class='ctx'> </div><div class='ctx'> 1.1 How to enable OTG FSM</div><div class='del'>----------------------------------------</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='ctx'> 1.1.1 Select CONFIG_USB_OTG_FSM in menuconfig, rebuild kernel</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='ctx'> Image and modules. If you want to check some internal</div><div class='ctx'> variables for otg fsm, mount debugfs, there are 2 files</div><div class='del'>-which can show otg fsm variables and some controller registers value:</div><div class='del'>-cat /sys/kernel/debug/ci_hdrc.0/otg</div><div class='del'>-cat /sys/kernel/debug/ci_hdrc.0/registers</div><div class='add'>+which can show otg fsm variables and some controller registers value::</div><div class='add'>+</div><div class='add'>+	cat /sys/kernel/debug/ci_hdrc.0/otg</div><div class='add'>+	cat /sys/kernel/debug/ci_hdrc.0/registers</div><div class='add'>+</div><div class='ctx'> 1.1.2 Add below entries in your dts file for your controller node</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='ctx'> 	otg-rev = &lt;0x0200&gt;;</div><div class='ctx'> 	adp-disable;</div><div class='ctx'> </div><div class='ctx'> 1.2 Test operations</div><div class='ctx'> -------------------</div><div class='add'>+</div><div class='ctx'> 1) Power up 2 Freescale i.MX6Q sabre SD boards with gadget class driver loaded</div><div class='ctx'>    (e.g. g_mass_storage).</div><div class='ctx'> </div><div class='hunk'>@@ -26,19 +41,24 @@ cat /sys/kernel/debug/ci_hdrc.0/registers</div><div class='ctx'>    The A-device(with micro A plug inserted) should enumerate B-device.</div><div class='ctx'> </div><div class='ctx'> 3) Role switch</div><div class='del'>-   On B-device:</div><div class='del'>-   echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='add'>+</div><div class='add'>+   On B-device::</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='ctx'> </div><div class='ctx'>    B-device should take host role and enumerate A-device.</div><div class='ctx'> </div><div class='ctx'> 4) A-device switch back to host.</div><div class='del'>-   On B-device:</div><div class='del'>-   echo 0 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='add'>+</div><div class='add'>+   On B-device::</div><div class='add'>+</div><div class='add'>+	echo 0 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='ctx'> </div><div class='ctx'>    or, by introducing HNP polling, B-Host can know when A-peripheral wish</div><div class='ctx'>    to be host role, so this role switch also can be trigged in A-peripheral</div><div class='del'>-   side by answering the polling from B-Host, this can be done on A-device:</div><div class='del'>-   echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req</div><div class='add'>+   side by answering the polling from B-Host, this can be done on A-device::</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req</div><div class='ctx'> </div><div class='ctx'>    A-device should switch back to host and enumerate B-device.</div><div class='ctx'> </div><div class='hunk'>@@ -49,23 +69,31 @@ cat /sys/kernel/debug/ci_hdrc.0/registers</div><div class='ctx'>    A-device should NOT enumerate B-device.</div><div class='ctx'> </div><div class='ctx'>    if A-device wants to use bus:</div><div class='del'>-   On A-device:</div><div class='del'>-   echo 0 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop</div><div class='del'>-   echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req</div><div class='add'>+</div><div class='add'>+   On A-device::</div><div class='add'>+</div><div class='add'>+	echo 0 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop</div><div class='add'>+	echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req</div><div class='ctx'> </div><div class='ctx'>    if B-device wants to use bus:</div><div class='del'>-   On B-device:</div><div class='del'>-   echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='add'>+</div><div class='add'>+   On B-device::</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='ctx'> </div><div class='ctx'> 7) A-device power down the bus.</div><div class='del'>-   On A-device:</div><div class='del'>-   echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop</div><div class='add'>+</div><div class='add'>+   On A-device::</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop</div><div class='ctx'> </div><div class='ctx'>    A-device should disconnect with B-device and power down the bus.</div><div class='ctx'> </div><div class='ctx'> 8) B-device does data pulse for SRP.</div><div class='del'>-   On B-device:</div><div class='del'>-   echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='add'>+</div><div class='add'>+   On B-device::</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req</div><div class='ctx'> </div><div class='ctx'>    A-device should resume usb bus and enumerate B-device.</div><div class='ctx'> </div><div class='hunk'>@@ -75,22 +103,31 @@ cat /sys/kernel/debug/ci_hdrc.0/registers</div><div class='ctx'> July 27, 2012 Revision 2.0 version 1.1a"</div><div class='ctx'> </div><div class='ctx'> 2. How to enable USB as system wakeup source</div><div class='del'>------------------------------------</div><div class='add'>+--------------------------------------------</div><div class='ctx'> Below is the example for how to enable USB as system wakeup source</div><div class='ctx'> at imx6 platform.</div><div class='ctx'> </div><div class='del'>-2.1 Enable core's wakeup</div><div class='del'>-echo enabled &gt; /sys/bus/platform/devices/ci_hdrc.0/power/wakeup</div><div class='del'>-2.2 Enable glue layer's wakeup</div><div class='del'>-echo enabled &gt; /sys/bus/platform/devices/2184000.usb/power/wakeup</div><div class='del'>-2.3 Enable PHY's wakeup (optional)</div><div class='del'>-echo enabled &gt; /sys/bus/platform/devices/20c9000.usbphy/power/wakeup</div><div class='del'>-2.4 Enable roothub's wakeup</div><div class='del'>-echo enabled &gt; /sys/bus/usb/devices/usb1/power/wakeup</div><div class='del'>-2.5 Enable related device's wakeup</div><div class='del'>-echo enabled &gt; /sys/bus/usb/devices/1-1/power/wakeup</div><div class='add'>+2.1 Enable core's wakeup::</div><div class='add'>+</div><div class='add'>+	echo enabled &gt; /sys/bus/platform/devices/ci_hdrc.0/power/wakeup</div><div class='add'>+</div><div class='add'>+2.2 Enable glue layer's wakeup::</div><div class='add'>+</div><div class='add'>+	echo enabled &gt; /sys/bus/platform/devices/2184000.usb/power/wakeup</div><div class='add'>+</div><div class='add'>+2.3 Enable PHY's wakeup (optional)::</div><div class='add'>+</div><div class='add'>+	echo enabled &gt; /sys/bus/platform/devices/20c9000.usbphy/power/wakeup</div><div class='add'>+</div><div class='add'>+2.4 Enable roothub's wakeup::</div><div class='add'>+</div><div class='add'>+	echo enabled &gt; /sys/bus/usb/devices/usb1/power/wakeup</div><div class='add'>+</div><div class='add'>+2.5 Enable related device's wakeup::</div><div class='add'>+</div><div class='add'>+	echo enabled &gt; /sys/bus/usb/devices/1-1/power/wakeup</div><div class='ctx'> </div><div class='ctx'> If the system has only one usb port, and you want usb wakeup at this port, you</div><div class='del'>-can use below script to enable usb wakeup.</div><div class='del'>-for i in $(find /sys -name wakeup | grep usb);do echo enabled &gt; $i;done;</div><div class='add'>+can use below script to enable usb wakeup::</div><div class='ctx'> </div><div class='add'>+	for i in $(find /sys -name wakeup | grep usb);do echo enabled &gt; $i;done;</div><div class='head'>diff --git a/Documentation/usb/dwc3.txt b/Documentation/usb/dwc3.txt<br/>index 1d02c01d1c7c..f94a7ba16573 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/dwc3.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/dwc3.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/dwc3.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/dwc3.txt</a></div><div class='hunk'>@@ -1,6 +1,11 @@</div><div class='add'>+===========</div><div class='add'>+DWC3 driver</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+TODO</div><div class='add'>+~~~~</div><div class='ctx'> </div><div class='del'>- TODO</div><div class='del'>-~~~~~~</div><div class='ctx'> Please pick something while reading :)</div><div class='ctx'> </div><div class='ctx'> - Convert interrupt handler to per-ep-thread-irq</div><div class='hunk'>@@ -9,6 +14,7 @@ Please pick something while reading :)</div><div class='ctx'>   until the command completes which is bad.</div><div class='ctx'> </div><div class='ctx'>   Implementation idea:</div><div class='add'>+</div><div class='ctx'>   - dwc core implements a demultiplexing irq chip for interrupts per</div><div class='ctx'>     endpoint. The interrupt numbers are allocated during probe and belong</div><div class='ctx'>     to the device. If MSI provides per-endpoint interrupt this dummy</div><div class='hunk'>@@ -19,6 +25,7 @@ Please pick something while reading :)</div><div class='ctx'>   - dwc3_send_gadget_ep_cmd() will sleep in wait_for_completion_timeout()</div><div class='ctx'>     until the command completes.</div><div class='ctx'>   - the interrupt handler is split into the following pieces:</div><div class='add'>+</div><div class='ctx'>     - primary handler of the device</div><div class='ctx'>       goes through every event and calls generic_handle_irq() for event</div><div class='ctx'>       it. On return from generic_handle_irq() in acknowledges the event</div><div class='hunk'>@@ -40,6 +47,7 @@ Please pick something while reading :)</div><div class='ctx'>       for command completion.</div><div class='ctx'> </div><div class='ctx'>   Latency:</div><div class='add'>+</div><div class='ctx'>    There should be no increase in latency since the interrupt-thread has a</div><div class='ctx'>    high priority and will be run before an average task in user land</div><div class='ctx'>    (except the user changed priorities).</div><div class='head'>diff --git a/Documentation/usb/ehci.txt b/Documentation/usb/ehci.txt<br/>index 160bd6c3ab7b..31f650e7c1b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/ehci.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/ehci.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/ehci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/ehci.txt</a></div><div class='hunk'>@@ -1,3 +1,7 @@</div><div class='add'>+===========</div><div class='add'>+EHCI driver</div><div class='add'>+===========</div><div class='add'>+</div><div class='ctx'> 27-Dec-2002</div><div class='ctx'> </div><div class='ctx'> The EHCI driver is used to talk to high speed USB 2.0 devices using</div><div class='hunk'>@@ -40,7 +44,8 @@ APIs exposed to USB device drivers.</div><div class='ctx'>   &lt;dbrownell@users.sourceforge.net&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-FUNCTIONALITY</div><div class='add'>+Functionality</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'> This driver is regularly tested on x86 hardware, and has also been</div><div class='ctx'> used on PPC hardware so big/little endianness issues should be gone.</div><div class='hunk'>@@ -48,6 +53,7 @@ It's believed to do all the right PCI magic so that I/O works even on</div><div class='ctx'> systems with interesting DMA mapping issues.</div><div class='ctx'> </div><div class='ctx'> Transfer Types</div><div class='add'>+--------------</div><div class='ctx'> </div><div class='ctx'> At this writing the driver should comfortably handle all control, bulk,</div><div class='ctx'> and interrupt transfers, including requests to USB 1.1 devices through</div><div class='hunk'>@@ -63,6 +69,7 @@ since EHCI represents these with a different data structure.  So for now,</div><div class='ctx'> most USB audio and video devices can't be connected to high speed buses.</div><div class='ctx'> </div><div class='ctx'> Driver Behavior</div><div class='add'>+---------------</div><div class='ctx'> </div><div class='ctx'> Transfers of all types can be queued.  This means that control transfers</div><div class='ctx'> from a driver on one interface (or through usbfs) won't interfere with</div><div class='hunk'>@@ -83,14 +90,15 @@ limits on the number of periodic transactions that can be scheduled,</div><div class='ctx'> and prevent use of polling intervals of less than one frame.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-USE BY</div><div class='add'>+Use by</div><div class='add'>+======</div><div class='ctx'> </div><div class='ctx'> Assuming you have an EHCI controller (on a PCI card or motherboard)</div><div class='del'>-and have compiled this driver as a module, load this like:</div><div class='add'>+and have compiled this driver as a module, load this like::</div><div class='ctx'> </div><div class='ctx'>     # modprobe ehci-hcd</div><div class='ctx'> </div><div class='del'>-and remove it by:</div><div class='add'>+and remove it by::</div><div class='ctx'> </div><div class='ctx'>     # rmmod ehci-hcd</div><div class='ctx'> </div><div class='hunk'>@@ -112,13 +120,16 @@ If you're using this driver on a 2.5 kernel, and you've enabled USB</div><div class='ctx'> debugging support, you'll see three files in the "sysfs" directory for</div><div class='ctx'> any EHCI controller:</div><div class='ctx'> </div><div class='del'>-	"async" dumps the asynchronous schedule, used for control</div><div class='add'>+	"async"</div><div class='add'>+		dumps the asynchronous schedule, used for control</div><div class='ctx'> 		and bulk transfers.  Shows each active qh and the qtds</div><div class='ctx'> 		pending, usually one qtd per urb.  (Look at it with</div><div class='ctx'> 		usb-storage doing disk I/O; watch the request queues!)</div><div class='del'>-	"periodic" dumps the periodic schedule, used for interrupt</div><div class='add'>+	"periodic"</div><div class='add'>+		dumps the periodic schedule, used for interrupt</div><div class='ctx'> 		and isochronous transfers.  Doesn't show qtds.</div><div class='del'>-	"registers" show controller register state, and</div><div class='add'>+	"registers"</div><div class='add'>+		show controller register state, and</div><div class='ctx'> </div><div class='ctx'> The contents of those files can help identify driver problems.</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +147,8 @@ transaction translators are in use; some drivers have been seen to behave</div><div class='ctx'> badly when they see different faults than OHCI or UHCI report.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-PERFORMANCE</div><div class='add'>+Performance</div><div class='add'>+===========</div><div class='ctx'> </div><div class='ctx'> USB 2.0 throughput is gated by two main factors:  how fast the host</div><div class='ctx'> controller can process requests, and how fast devices can respond to</div><div class='hunk'>@@ -156,6 +168,7 @@ hardware and device driver software allow it.  Periodic transfer modes</div><div class='ctx'> approach the quoted 480 MBit/sec transfer rate.</div><div class='ctx'> </div><div class='ctx'> Hardware Performance</div><div class='add'>+--------------------</div><div class='ctx'> </div><div class='ctx'> At this writing, individual USB 2.0 devices tend to max out at around</div><div class='ctx'> 20 MByte/sec transfer rates.  This is of course subject to change;</div><div class='hunk'>@@ -183,6 +196,7 @@ you issue a control or bulk request you can often expect to learn that</div><div class='ctx'> it completed in less than 250 usec (depending on transfer size).</div><div class='ctx'> </div><div class='ctx'> Software Performance</div><div class='add'>+--------------------</div><div class='ctx'> </div><div class='ctx'> To get even 20 MByte/sec transfer rates, Linux-USB device drivers will</div><div class='ctx'> need to keep the EHCI queue full.  That means issuing large requests,</div><div class='hunk'>@@ -206,9 +220,11 @@ mapping (which might apply an IOMMU) and IRQ reduction, all of which will</div><div class='ctx'> help make high speed transfers run as fast as they can.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-TBD:  Interrupt and ISO transfer performance issues.  Those periodic</div><div class='del'>-transfers are fully scheduled, so the main issue is likely to be how</div><div class='del'>-to trigger "high bandwidth" modes.</div><div class='add'>+TBD:</div><div class='add'>+   Interrupt and ISO transfer performance issues.  Those periodic</div><div class='add'>+   transfers are fully scheduled, so the main issue is likely to be how</div><div class='add'>+   to trigger "high bandwidth" modes.</div><div class='ctx'> </div><div class='del'>-TBD:  More than standard 80% periodic bandwidth allocation is possible</div><div class='del'>-through sysfs uframe_periodic_max parameter. Describe that.</div><div class='add'>+TBD:</div><div class='add'>+   More than standard 80% periodic bandwidth allocation is possible</div><div class='add'>+   through sysfs uframe_periodic_max parameter. Describe that.</div><div class='head'>diff --git a/Documentation/usb/functionfs.txt b/Documentation/usb/functionfs.txt<br/>index eaaaea019fc7..7fdc6d840ac5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/functionfs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/functionfs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/functionfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/functionfs.txt</a></div><div class='hunk'>@@ -1,4 +1,6 @@</div><div class='del'>-*How FunctionFS works*</div><div class='add'>+====================</div><div class='add'>+How FunctionFS works</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> From kernel point of view it is just a composite function with some</div><div class='ctx'> unique behaviour.  It may be added to an USB configuration only after</div><div class='hunk'>@@ -38,13 +40,13 @@ when mounting.</div><div class='ctx'> </div><div class='ctx'> One can imagine a gadget that has an Ethernet, MTP and HID interfaces</div><div class='ctx'> where the last two are implemented via FunctionFS.  On user space</div><div class='del'>-level it would look like this:</div><div class='add'>+level it would look like this::</div><div class='ctx'> </div><div class='del'>-$ insmod g_ffs.ko idVendor=&lt;ID&gt; iSerialNumber=&lt;string&gt; functions=mtp,hid</div><div class='del'>-$ mkdir /dev/ffs-mtp &amp;&amp; mount -t functionfs mtp /dev/ffs-mtp</div><div class='del'>-$ ( cd /dev/ffs-mtp &amp;&amp; mtp-daemon ) &amp;</div><div class='del'>-$ mkdir /dev/ffs-hid &amp;&amp; mount -t functionfs hid /dev/ffs-hid</div><div class='del'>-$ ( cd /dev/ffs-hid &amp;&amp; hid-daemon ) &amp;</div><div class='add'>+  $ insmod g_ffs.ko idVendor=&lt;ID&gt; iSerialNumber=&lt;string&gt; functions=mtp,hid</div><div class='add'>+  $ mkdir /dev/ffs-mtp &amp;&amp; mount -t functionfs mtp /dev/ffs-mtp</div><div class='add'>+  $ ( cd /dev/ffs-mtp &amp;&amp; mtp-daemon ) &amp;</div><div class='add'>+  $ mkdir /dev/ffs-hid &amp;&amp; mount -t functionfs hid /dev/ffs-hid</div><div class='add'>+  $ ( cd /dev/ffs-hid &amp;&amp; hid-daemon ) &amp;</div><div class='ctx'> </div><div class='ctx'> On kernel level the gadget checks ffs_data-&gt;dev_name to identify</div><div class='ctx'> whether it's FunctionFS designed for MTP ("mtp") or HID ("hid").</div><div class='hunk'>@@ -64,4 +66,3 @@ have been written to their ep0's.</div><div class='ctx'> </div><div class='ctx'> Conversely, the gadget is unregistered after the first USB function</div><div class='ctx'> closes its endpoints.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/usb/gadget-testing.txt b/Documentation/usb/gadget-testing.txt<br/>index 5908a21fddb6..7d7f2340af42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget-testing.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget-testing.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget-testing.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/gadget-testing.txt</a></div><div class='hunk'>@@ -1,26 +1,32 @@</div><div class='add'>+==============</div><div class='add'>+Gadget Testing</div><div class='add'>+==============</div><div class='add'>+</div><div class='ctx'> This file summarizes information on basic testing of USB functions</div><div class='ctx'> provided by gadgets.</div><div class='ctx'> </div><div class='del'>-1. ACM function</div><div class='del'>-2. ECM function</div><div class='del'>-3. ECM subset function</div><div class='del'>-4. EEM function</div><div class='del'>-5. FFS function</div><div class='del'>-6. HID function</div><div class='del'>-7. LOOPBACK function</div><div class='del'>-8. MASS STORAGE function</div><div class='del'>-9. MIDI function</div><div class='del'>-10. NCM function</div><div class='del'>-11. OBEX function</div><div class='del'>-12. PHONET function</div><div class='del'>-13. RNDIS function</div><div class='del'>-14. SERIAL function</div><div class='del'>-15. SOURCESINK function</div><div class='del'>-16. UAC1 function (legacy implementation)</div><div class='del'>-17. UAC2 function</div><div class='del'>-18. UVC function</div><div class='del'>-19. PRINTER function</div><div class='del'>-20. UAC1 function (new API)</div><div class='add'>+.. contents</div><div class='add'>+</div><div class='add'>+   1. ACM function</div><div class='add'>+   2. ECM function</div><div class='add'>+   3. ECM subset function</div><div class='add'>+   4. EEM function</div><div class='add'>+   5. FFS function</div><div class='add'>+   6. HID function</div><div class='add'>+   7. LOOPBACK function</div><div class='add'>+   8. MASS STORAGE function</div><div class='add'>+   9. MIDI function</div><div class='add'>+   10. NCM function</div><div class='add'>+   11. OBEX function</div><div class='add'>+   12. PHONET function</div><div class='add'>+   13. RNDIS function</div><div class='add'>+   14. SERIAL function</div><div class='add'>+   15. SOURCESINK function</div><div class='add'>+   16. UAC1 function (legacy implementation)</div><div class='add'>+   17. UAC2 function</div><div class='add'>+   18. UVC function</div><div class='add'>+   19. PRINTER function</div><div class='add'>+   20. UAC1 function (new API)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1. ACM function</div><div class='hunk'>@@ -44,13 +50,23 @@ There can be at most 4 ACM/generic serial/OBEX ports in the system.</div><div class='ctx'> Testing the ACM function</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='del'>-On the host: cat &gt; /dev/ttyACM&lt;X&gt;</div><div class='del'>-On the device : cat /dev/ttyGS&lt;Y&gt;</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	cat &gt; /dev/ttyACM&lt;X&gt;</div><div class='add'>+</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	cat /dev/ttyGS&lt;Y&gt;</div><div class='ctx'> </div><div class='ctx'> then the other way round</div><div class='ctx'> </div><div class='del'>-On the device: cat &gt; /dev/ttyGS&lt;Y&gt;</div><div class='del'>-On the host: cat /dev/ttyACM&lt;X&gt;</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	cat &gt; /dev/ttyGS&lt;Y&gt;</div><div class='add'>+</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	cat /dev/ttyACM&lt;X&gt;</div><div class='ctx'> </div><div class='ctx'> 2. ECM function</div><div class='ctx'> ===============</div><div class='hunk'>@@ -63,13 +79,15 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "ecm".</div><div class='ctx'> The ECM function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	ifname		- network device interface name associated with this</div><div class='add'>+	=============== ==================================================</div><div class='add'>+	ifname		network device interface name associated with this</div><div class='ctx'> 			function instance</div><div class='del'>-	qmult		- queue length multiplier for high and super speed</div><div class='del'>-	host_addr	- MAC address of host's end of this</div><div class='add'>+	qmult		queue length multiplier for high and super speed</div><div class='add'>+	host_addr	MAC address of host's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='del'>-	dev_addr	- MAC address of device's end of this</div><div class='add'>+	dev_addr	MAC address of device's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='add'>+	=============== ==================================================</div><div class='ctx'> </div><div class='ctx'> and after creating the functions/ecm.&lt;instance name&gt; they contain default</div><div class='ctx'> values: qmult is 5, dev_addr and host_addr are randomly selected.</div><div class='hunk'>@@ -82,8 +100,13 @@ Testing the ECM function</div><div class='ctx'> </div><div class='ctx'> Configure IP addresses of the device and the host. Then:</div><div class='ctx'> </div><div class='del'>-On the device: ping &lt;host's IP&gt;</div><div class='del'>-On the host: ping &lt;device's IP&gt;</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	ping &lt;host's IP&gt;</div><div class='add'>+</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	ping &lt;device's IP&gt;</div><div class='ctx'> </div><div class='ctx'> 3. ECM subset function</div><div class='ctx'> ======================</div><div class='hunk'>@@ -96,13 +119,15 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "geth".</div><div class='ctx'> The ECM subset function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	ifname		- network device interface name associated with this</div><div class='add'>+	=============== ==================================================</div><div class='add'>+	ifname		network device interface name associated with this</div><div class='ctx'> 			function instance</div><div class='del'>-	qmult		- queue length multiplier for high and super speed</div><div class='del'>-	host_addr	- MAC address of host's end of this</div><div class='add'>+	qmult		queue length multiplier for high and super speed</div><div class='add'>+	host_addr	MAC address of host's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='del'>-	dev_addr	- MAC address of device's end of this</div><div class='add'>+	dev_addr	MAC address of device's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='add'>+	=============== ==================================================</div><div class='ctx'> </div><div class='ctx'> and after creating the functions/ecm.&lt;instance name&gt; they contain default</div><div class='ctx'> values: qmult is 5, dev_addr and host_addr are randomly selected.</div><div class='hunk'>@@ -115,8 +140,13 @@ Testing the ECM subset function</div><div class='ctx'> </div><div class='ctx'> Configure IP addresses of the device and the host. Then:</div><div class='ctx'> </div><div class='del'>-On the device: ping &lt;host's IP&gt;</div><div class='del'>-On the host: ping &lt;device's IP&gt;</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	ping &lt;host's IP&gt;</div><div class='add'>+</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	ping &lt;device's IP&gt;</div><div class='ctx'> </div><div class='ctx'> 4. EEM function</div><div class='ctx'> ===============</div><div class='hunk'>@@ -129,13 +159,15 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "eem".</div><div class='ctx'> The EEM function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	ifname		- network device interface name associated with this</div><div class='add'>+	=============== ==================================================</div><div class='add'>+	ifname		network device interface name associated with this</div><div class='ctx'> 			function instance</div><div class='del'>-	qmult		- queue length multiplier for high and super speed</div><div class='del'>-	host_addr	- MAC address of host's end of this</div><div class='add'>+	qmult		queue length multiplier for high and super speed</div><div class='add'>+	host_addr	MAC address of host's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='del'>-	dev_addr	- MAC address of device's end of this</div><div class='add'>+	dev_addr	MAC address of device's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='add'>+	=============== ==================================================</div><div class='ctx'> </div><div class='ctx'> and after creating the functions/eem.&lt;instance name&gt; they contain default</div><div class='ctx'> values: qmult is 5, dev_addr and host_addr are randomly selected.</div><div class='hunk'>@@ -148,8 +180,13 @@ Testing the EEM function</div><div class='ctx'> </div><div class='ctx'> Configure IP addresses of the device and the host. Then:</div><div class='ctx'> </div><div class='del'>-On the device: ping &lt;host's IP&gt;</div><div class='del'>-On the host: ping &lt;device's IP&gt;</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	ping &lt;host's IP&gt;</div><div class='add'>+</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	ping &lt;device's IP&gt;</div><div class='ctx'> </div><div class='ctx'> 5. FFS function</div><div class='ctx'> ===============</div><div class='hunk'>@@ -172,6 +209,7 @@ Testing the FFS function</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='ctx'> On the device: start the function's userspace daemon, enable the gadget</div><div class='add'>+</div><div class='ctx'> On the host: use the USB function provided by the device</div><div class='ctx'> </div><div class='ctx'> 6. HID function</div><div class='hunk'>@@ -185,39 +223,43 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "hid".</div><div class='ctx'> The HID function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	protocol	- HID protocol to use</div><div class='del'>-	report_desc	- data to be used in HID reports, except data</div><div class='add'>+	=============== ===========================================</div><div class='add'>+	protocol	HID protocol to use</div><div class='add'>+	report_desc	data to be used in HID reports, except data</div><div class='ctx'> 			passed with /dev/hidg&lt;X&gt;</div><div class='del'>-	report_length	- HID report length</div><div class='del'>-	subclass	- HID subclass to use</div><div class='add'>+	report_length	HID report length</div><div class='add'>+	subclass	HID subclass to use</div><div class='add'>+	=============== ===========================================</div><div class='ctx'> </div><div class='ctx'> For a keyboard the protocol and the subclass are 1, the report_length is 8,</div><div class='del'>-while the report_desc is:</div><div class='add'>+while the report_desc is::</div><div class='ctx'> </div><div class='del'>-$ hd my_report_desc</div><div class='del'>-00000000  05 01 09 06 a1 01 05 07  19 e0 29 e7 15 00 25 01  |..........)...%.|</div><div class='del'>-00000010  75 01 95 08 81 02 95 01  75 08 81 03 95 05 75 01  |u.......u.....u.|</div><div class='del'>-00000020  05 08 19 01 29 05 91 02  95 01 75 03 91 03 95 06  |....).....u.....|</div><div class='del'>-00000030  75 08 15 00 25 65 05 07  19 00 29 65 81 00 c0     |u...%e....)e...|</div><div class='del'>-0000003f</div><div class='add'>+  $ hd my_report_desc</div><div class='add'>+  00000000  05 01 09 06 a1 01 05 07  19 e0 29 e7 15 00 25 01  |..........)...%.|</div><div class='add'>+  00000010  75 01 95 08 81 02 95 01  75 08 81 03 95 05 75 01  |u.......u.....u.|</div><div class='add'>+  00000020  05 08 19 01 29 05 91 02  95 01 75 03 91 03 95 06  |....).....u.....|</div><div class='add'>+  00000030  75 08 15 00 25 65 05 07  19 00 29 65 81 00 c0     |u...%e....)e...|</div><div class='add'>+  0000003f</div><div class='ctx'> </div><div class='del'>-Such a sequence of bytes can be stored to the attribute with echo:</div><div class='add'>+Such a sequence of bytes can be stored to the attribute with echo::</div><div class='ctx'> </div><div class='del'>-$ echo -ne \\x05\\x01\\x09\\x06\\xa1.....</div><div class='add'>+  $ echo -ne \\x05\\x01\\x09\\x06\\xa1.....</div><div class='ctx'> </div><div class='ctx'> Testing the HID function</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='ctx'> Device:</div><div class='add'>+</div><div class='ctx'> - create the gadget</div><div class='ctx'> - connect the gadget to a host, preferably not the one used</div><div class='del'>-to control the gadget</div><div class='add'>+  to control the gadget</div><div class='ctx'> - run a program which writes to /dev/hidg&lt;N&gt;, e.g.</div><div class='del'>-a userspace program found in Documentation/usb/gadget_hid.txt:</div><div class='add'>+  a userspace program found in Documentation/usb/gadget_hid.txt::</div><div class='ctx'> </div><div class='del'>-$ ./hid_gadget_test /dev/hidg0 keyboard</div><div class='add'>+	$ ./hid_gadget_test /dev/hidg0 keyboard</div><div class='ctx'> </div><div class='ctx'> Host:</div><div class='add'>+</div><div class='ctx'> - observe the keystrokes from the gadget</div><div class='ctx'> </div><div class='ctx'> 7. LOOPBACK function</div><div class='hunk'>@@ -231,13 +273,16 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "Loopback".</div><div class='ctx'> The LOOPBACK function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	qlen		- depth of loopback queue</div><div class='del'>-	bulk_buflen	- buffer length</div><div class='add'>+	=============== =======================</div><div class='add'>+	qlen		depth of loopback queue</div><div class='add'>+	bulk_buflen	buffer length</div><div class='add'>+	=============== =======================</div><div class='ctx'> </div><div class='ctx'> Testing the LOOPBACK function</div><div class='ctx'> -----------------------------</div><div class='ctx'> </div><div class='ctx'> device: run the gadget</div><div class='add'>+</div><div class='ctx'> host: test-usb (tools/usb/testusb.c)</div><div class='ctx'> </div><div class='ctx'> 8. MASS STORAGE function</div><div class='hunk'>@@ -252,18 +297,20 @@ The function name to use when creating the function directory is "mass_storage".</div><div class='ctx'> The MASS STORAGE function provides these attributes in its directory:</div><div class='ctx'> files:</div><div class='ctx'> </div><div class='del'>-	stall		- Set to permit function to halt bulk endpoints.</div><div class='add'>+	=============== ==============================================</div><div class='add'>+	stall		Set to permit function to halt bulk endpoints.</div><div class='ctx'> 			Disabled on some USB devices known not to work</div><div class='ctx'> 			correctly. You should set it to true.</div><div class='del'>-	num_buffers	- Number of pipeline buffers. Valid numbers</div><div class='add'>+	num_buffers	Number of pipeline buffers. Valid numbers</div><div class='ctx'> 			are 2..4. Available only if</div><div class='ctx'> 			CONFIG_USB_GADGET_DEBUG_FILES is set.</div><div class='add'>+	=============== ==============================================</div><div class='ctx'> </div><div class='ctx'> and a default lun.0 directory corresponding to SCSI LUN #0.</div><div class='ctx'> </div><div class='del'>-A new lun can be added with mkdir:</div><div class='add'>+A new lun can be added with mkdir::</div><div class='ctx'> </div><div class='del'>-$ mkdir functions/mass_storage.0/partition.5</div><div class='add'>+	$ mkdir functions/mass_storage.0/partition.5</div><div class='ctx'> </div><div class='ctx'> Lun numbering does not have to be continuous, except for lun #0 which is</div><div class='ctx'> created by default. A maximum of 8 luns can be specified and they all must be</div><div class='hunk'>@@ -273,18 +320,20 @@ although it is not mandatory.</div><div class='ctx'> </div><div class='ctx'> In each lun directory there are the following attribute files:</div><div class='ctx'> </div><div class='del'>-	file		- The path to the backing file for the LUN.</div><div class='add'>+	=============== ==============================================</div><div class='add'>+	file		The path to the backing file for the LUN.</div><div class='ctx'> 			Required if LUN is not marked as removable.</div><div class='del'>-	ro		- Flag specifying access to the LUN shall be</div><div class='add'>+	ro		Flag specifying access to the LUN shall be</div><div class='ctx'> 			read-only. This is implied if CD-ROM emulation</div><div class='ctx'> 			is enabled as well as when it was impossible</div><div class='ctx'> 			to open "filename" in R/W mode.</div><div class='del'>-	removable	- Flag specifying that LUN shall be indicated as</div><div class='add'>+	removable	Flag specifying that LUN shall be indicated as</div><div class='ctx'> 			being removable.</div><div class='del'>-	cdrom		- Flag specifying that LUN shall be reported as</div><div class='add'>+	cdrom		Flag specifying that LUN shall be reported as</div><div class='ctx'> 			being a CD-ROM.</div><div class='del'>-	nofua		- Flag specifying that FUA flag</div><div class='add'>+	nofua		Flag specifying that FUA flag</div><div class='ctx'> 			in SCSI WRITE(10,12)</div><div class='add'>+	=============== ==============================================</div><div class='ctx'> </div><div class='ctx'> Testing the MASS STORAGE function</div><div class='ctx'> ---------------------------------</div><div class='hunk'>@@ -304,12 +353,14 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "midi".</div><div class='ctx'> The MIDI function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	buflen		- MIDI buffer length</div><div class='del'>-	id		- ID string for the USB MIDI adapter</div><div class='del'>-	in_ports	- number of MIDI input ports</div><div class='del'>-	index		- index value for the USB MIDI adapter</div><div class='del'>-	out_ports	- number of MIDI output ports</div><div class='del'>-	qlen		- USB read request queue length</div><div class='add'>+	=============== ====================================</div><div class='add'>+	buflen		MIDI buffer length</div><div class='add'>+	id		ID string for the USB MIDI adapter</div><div class='add'>+	in_ports	number of MIDI input ports</div><div class='add'>+	index		index value for the USB MIDI adapter</div><div class='add'>+	out_ports	number of MIDI output ports</div><div class='add'>+	qlen		USB read request queue length</div><div class='add'>+	=============== ====================================</div><div class='ctx'> </div><div class='ctx'> Testing the MIDI function</div><div class='ctx'> -------------------------</div><div class='hunk'>@@ -317,60 +368,63 @@ Testing the MIDI function</div><div class='ctx'> There are two cases: playing a mid from the gadget to</div><div class='ctx'> the host and playing a mid from the host to the gadget.</div><div class='ctx'> </div><div class='del'>-1) Playing a mid from the gadget to the host</div><div class='del'>-host)</div><div class='add'>+1) Playing a mid from the gadget to the host:</div><div class='add'>+</div><div class='add'>+host::</div><div class='ctx'> </div><div class='del'>-$ arecordmidi -l</div><div class='del'>- Port    Client name                      Port name</div><div class='del'>- 14:0    Midi Through                     Midi Through Port-0</div><div class='del'>- 24:0    MIDI Gadget                      MIDI Gadget MIDI 1</div><div class='del'>-$ arecordmidi -p 24:0 from_gadget.mid</div><div class='add'>+  $ arecordmidi -l</div><div class='add'>+   Port    Client name                      Port name</div><div class='add'>+   14:0    Midi Through                     Midi Through Port-0</div><div class='add'>+   24:0    MIDI Gadget                      MIDI Gadget MIDI 1</div><div class='add'>+  $ arecordmidi -p 24:0 from_gadget.mid</div><div class='ctx'> </div><div class='del'>-gadget)</div><div class='add'>+gadget::</div><div class='ctx'> </div><div class='del'>-$ aplaymidi -l</div><div class='del'>- Port    Client name                      Port name</div><div class='del'>- 20:0    f_midi                           f_midi</div><div class='add'>+  $ aplaymidi -l</div><div class='add'>+   Port    Client name                      Port name</div><div class='add'>+   20:0    f_midi                           f_midi</div><div class='ctx'> </div><div class='del'>-$ aplaymidi -p 20:0 to_host.mid</div><div class='add'>+  $ aplaymidi -p 20:0 to_host.mid</div><div class='ctx'> </div><div class='ctx'> 2) Playing a mid from the host to the gadget</div><div class='del'>-gadget)</div><div class='ctx'> </div><div class='del'>-$ arecordmidi -l</div><div class='del'>- Port    Client name                      Port name</div><div class='del'>- 20:0    f_midi                           f_midi</div><div class='add'>+gadget::</div><div class='add'>+</div><div class='add'>+  $ arecordmidi -l</div><div class='add'>+   Port    Client name                      Port name</div><div class='add'>+   20:0    f_midi                           f_midi</div><div class='ctx'> </div><div class='del'>-$ arecordmidi -p 20:0 from_host.mid</div><div class='add'>+  $ arecordmidi -p 20:0 from_host.mid</div><div class='ctx'> </div><div class='del'>-host)</div><div class='add'>+host::</div><div class='ctx'> </div><div class='del'>-$ aplaymidi -l</div><div class='del'>- Port    Client name                      Port name</div><div class='del'>- 14:0    Midi Through                     Midi Through Port-0</div><div class='del'>- 24:0    MIDI Gadget                      MIDI Gadget MIDI 1</div><div class='add'>+  $ aplaymidi -l</div><div class='add'>+   Port    Client name                      Port name</div><div class='add'>+   14:0    Midi Through                     Midi Through Port-0</div><div class='add'>+   24:0    MIDI Gadget                      MIDI Gadget MIDI 1</div><div class='ctx'> </div><div class='del'>-$ aplaymidi -p24:0 to_gadget.mid</div><div class='add'>+  $ aplaymidi -p24:0 to_gadget.mid</div><div class='ctx'> </div><div class='ctx'> The from_gadget.mid should sound identical to the to_host.mid.</div><div class='add'>+</div><div class='ctx'> The from_host.id should sound identical to the to_gadget.mid.</div><div class='ctx'> </div><div class='del'>-MIDI files can be played to speakers/headphones with e.g. timidity installed</div><div class='add'>+MIDI files can be played to speakers/headphones with e.g. timidity installed::</div><div class='ctx'> </div><div class='del'>-$ aplaymidi -l</div><div class='del'>- Port    Client name                      Port name</div><div class='del'>- 14:0    Midi Through                     Midi Through Port-0</div><div class='del'>- 24:0    MIDI Gadget                      MIDI Gadget MIDI 1</div><div class='del'>-128:0    TiMidity                         TiMidity port 0</div><div class='del'>-128:1    TiMidity                         TiMidity port 1</div><div class='del'>-128:2    TiMidity                         TiMidity port 2</div><div class='del'>-128:3    TiMidity                         TiMidity port 3</div><div class='add'>+  $ aplaymidi -l</div><div class='add'>+   Port    Client name                      Port name</div><div class='add'>+   14:0    Midi Through                     Midi Through Port-0</div><div class='add'>+   24:0    MIDI Gadget                      MIDI Gadget MIDI 1</div><div class='add'>+  128:0    TiMidity                         TiMidity port 0</div><div class='add'>+  128:1    TiMidity                         TiMidity port 1</div><div class='add'>+  128:2    TiMidity                         TiMidity port 2</div><div class='add'>+  128:3    TiMidity                         TiMidity port 3</div><div class='ctx'> </div><div class='del'>-$ aplaymidi -p 128:0 file.mid</div><div class='add'>+  $ aplaymidi -p 128:0 file.mid</div><div class='ctx'> </div><div class='del'>-MIDI ports can be logically connected using the aconnect utility, e.g.:</div><div class='add'>+MIDI ports can be logically connected using the aconnect utility, e.g.::</div><div class='ctx'> </div><div class='del'>-$ aconnect 24:0 128:0 # try it on the host</div><div class='add'>+  $ aconnect 24:0 128:0 # try it on the host</div><div class='ctx'> </div><div class='ctx'> After the gadget's MIDI port is connected to timidity's MIDI port,</div><div class='ctx'> whatever is played at the gadget side with aplaymidi -l is audible</div><div class='hunk'>@@ -387,13 +441,15 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "ncm".</div><div class='ctx'> The NCM function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	ifname		- network device interface name associated with this</div><div class='add'>+	=============== ==================================================</div><div class='add'>+	ifname		network device interface name associated with this</div><div class='ctx'> 			function instance</div><div class='del'>-	qmult		- queue length multiplier for high and super speed</div><div class='del'>-	host_addr	- MAC address of host's end of this</div><div class='add'>+	qmult		queue length multiplier for high and super speed</div><div class='add'>+	host_addr	MAC address of host's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='del'>-	dev_addr	- MAC address of device's end of this</div><div class='add'>+	dev_addr	MAC address of device's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='add'>+	=============== ==================================================</div><div class='ctx'> </div><div class='ctx'> and after creating the functions/ncm.&lt;instance name&gt; they contain default</div><div class='ctx'> values: qmult is 5, dev_addr and host_addr are randomly selected.</div><div class='hunk'>@@ -406,8 +462,13 @@ Testing the NCM function</div><div class='ctx'> </div><div class='ctx'> Configure IP addresses of the device and the host. Then:</div><div class='ctx'> </div><div class='del'>-On the device: ping &lt;host's IP&gt;</div><div class='del'>-On the host: ping &lt;device's IP&gt;</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	ping &lt;host's IP&gt;</div><div class='add'>+</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	ping &lt;device's IP&gt;</div><div class='ctx'> </div><div class='ctx'> 11. OBEX function</div><div class='ctx'> =================</div><div class='hunk'>@@ -429,13 +490,18 @@ There can be at most 4 ACM/generic serial/OBEX ports in the system.</div><div class='ctx'> Testing the OBEX function</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='del'>-On device: seriald -f /dev/ttyGS&lt;Y&gt; -s 1024</div><div class='del'>-On host: serialc -v &lt;vendorID&gt; -p &lt;productID&gt; -i&lt;interface#&gt; -a1 -s1024 \</div><div class='del'>-             -t&lt;out endpoint addr&gt; -r&lt;in endpoint addr&gt;</div><div class='add'>+On device::</div><div class='add'>+</div><div class='add'>+	seriald -f /dev/ttyGS&lt;Y&gt; -s 1024</div><div class='add'>+</div><div class='add'>+On host::</div><div class='add'>+</div><div class='add'>+	serialc -v &lt;vendorID&gt; -p &lt;productID&gt; -i&lt;interface#&gt; -a1 -s1024 \</div><div class='add'>+                -t&lt;out endpoint addr&gt; -r&lt;in endpoint addr&gt;</div><div class='ctx'> </div><div class='ctx'> where seriald and serialc are Felipe's utilities found here:</div><div class='ctx'> </div><div class='del'>-https://github.com/felipebalbi/usb-tools.git master</div><div class='add'>+	https://github.com/felipebalbi/usb-tools.git master</div><div class='ctx'> </div><div class='ctx'> 12. PHONET function</div><div class='ctx'> ===================</div><div class='hunk'>@@ -448,8 +514,10 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "phonet".</div><div class='ctx'> The PHONET function provides just one attribute in its function directory:</div><div class='ctx'> </div><div class='del'>-	ifname		- network device interface name associated with this</div><div class='add'>+	=============== ==================================================</div><div class='add'>+	ifname		network device interface name associated with this</div><div class='ctx'> 			function instance</div><div class='add'>+	=============== ==================================================</div><div class='ctx'> </div><div class='ctx'> Testing the PHONET function</div><div class='ctx'> ---------------------------</div><div class='hunk'>@@ -464,41 +532,41 @@ These tools are required:</div><div class='ctx'> </div><div class='ctx'> git://git.gitorious.org/meego-cellular/phonet-utils.git</div><div class='ctx'> </div><div class='del'>-On the host:</div><div class='add'>+On the host::</div><div class='ctx'> </div><div class='del'>-$ ./phonet -a 0x10 -i usbpn0</div><div class='del'>-$ ./pnroute add 0x6c usbpn0</div><div class='del'>-$./pnroute add 0x10 usbpn0</div><div class='del'>-$ ifconfig usbpn0 up</div><div class='add'>+	$ ./phonet -a 0x10 -i usbpn0</div><div class='add'>+	$ ./pnroute add 0x6c usbpn0</div><div class='add'>+	$./pnroute add 0x10 usbpn0</div><div class='add'>+	$ ifconfig usbpn0 up</div><div class='ctx'> </div><div class='del'>-On the device:</div><div class='add'>+On the device::</div><div class='ctx'> </div><div class='del'>-$ ./phonet -a 0x6c -i upnlink0</div><div class='del'>-$ ./pnroute add 0x10 upnlink0</div><div class='del'>-$ ifconfig upnlink0 up</div><div class='add'>+	$ ./phonet -a 0x6c -i upnlink0</div><div class='add'>+	$ ./pnroute add 0x10 upnlink0</div><div class='add'>+	$ ifconfig upnlink0 up</div><div class='ctx'> </div><div class='del'>-Then a test program can be used:</div><div class='add'>+Then a test program can be used::</div><div class='ctx'> </div><div class='del'>-http://www.spinics.net/lists/linux-usb/msg85690.html</div><div class='add'>+	http://www.spinics.net/lists/linux-usb/msg85690.html</div><div class='ctx'> </div><div class='del'>-On the device:</div><div class='add'>+On the device::</div><div class='ctx'> </div><div class='del'>-$ ./pnxmit -a 0x6c -r</div><div class='add'>+	$ ./pnxmit -a 0x6c -r</div><div class='ctx'> </div><div class='del'>-On the host:</div><div class='add'>+On the host::</div><div class='ctx'> </div><div class='del'>-$ ./pnxmit -a 0x10 -s 0x6c</div><div class='add'>+	$ ./pnxmit -a 0x10 -s 0x6c</div><div class='ctx'> </div><div class='ctx'> As a result some data should be sent from host to device.</div><div class='ctx'> Then the other way round:</div><div class='ctx'> </div><div class='del'>-On the host:</div><div class='add'>+On the host::</div><div class='ctx'> </div><div class='del'>-$ ./pnxmit -a 0x10 -r</div><div class='add'>+	$ ./pnxmit -a 0x10 -r</div><div class='ctx'> </div><div class='del'>-On the device:</div><div class='add'>+On the device::</div><div class='ctx'> </div><div class='del'>-$ ./pnxmit -a 0x6c -s 0x10</div><div class='add'>+	$ ./pnxmit -a 0x6c -s 0x10</div><div class='ctx'> </div><div class='ctx'> 13. RNDIS function</div><div class='ctx'> ==================</div><div class='hunk'>@@ -511,13 +579,15 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "rndis".</div><div class='ctx'> The RNDIS function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	ifname		- network device interface name associated with this</div><div class='add'>+	=============== ==================================================</div><div class='add'>+	ifname		network device interface name associated with this</div><div class='ctx'> 			function instance</div><div class='del'>-	qmult		- queue length multiplier for high and super speed</div><div class='del'>-	host_addr	- MAC address of host's end of this</div><div class='add'>+	qmult		queue length multiplier for high and super speed</div><div class='add'>+	host_addr	MAC address of host's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='del'>-	dev_addr	- MAC address of device's end of this</div><div class='add'>+	dev_addr	MAC address of device's end of this</div><div class='ctx'> 			Ethernet over USB link</div><div class='add'>+	=============== ==================================================</div><div class='ctx'> </div><div class='ctx'> and after creating the functions/rndis.&lt;instance name&gt; they contain default</div><div class='ctx'> values: qmult is 5, dev_addr and host_addr are randomly selected.</div><div class='hunk'>@@ -530,8 +600,13 @@ Testing the RNDIS function</div><div class='ctx'> </div><div class='ctx'> Configure IP addresses of the device and the host. Then:</div><div class='ctx'> </div><div class='del'>-On the device: ping &lt;host's IP&gt;</div><div class='del'>-On the host: ping &lt;device's IP&gt;</div><div class='add'>+On the device::</div><div class='add'>+</div><div class='add'>+	ping &lt;host's IP&gt;</div><div class='add'>+</div><div class='add'>+On the host::</div><div class='add'>+</div><div class='add'>+	ping &lt;device's IP&gt;</div><div class='ctx'> </div><div class='ctx'> 14. SERIAL function</div><div class='ctx'> ===================</div><div class='hunk'>@@ -553,15 +628,28 @@ There can be at most 4 ACM/generic serial/OBEX ports in the system.</div><div class='ctx'> Testing the SERIAL function</div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-On host: insmod usbserial</div><div class='del'>-	 echo VID PID &gt;/sys/bus/usb-serial/drivers/generic/new_id</div><div class='del'>-On host: cat &gt; /dev/ttyUSB&lt;X&gt;</div><div class='del'>-On target: cat /dev/ttyGS&lt;Y&gt;</div><div class='add'>+On host::</div><div class='add'>+</div><div class='add'>+	insmod usbserial</div><div class='add'>+	echo VID PID &gt;/sys/bus/usb-serial/drivers/generic/new_id</div><div class='add'>+</div><div class='add'>+On host::</div><div class='add'>+</div><div class='add'>+	cat &gt; /dev/ttyUSB&lt;X&gt;</div><div class='add'>+</div><div class='add'>+On target::</div><div class='add'>+</div><div class='add'>+	cat /dev/ttyGS&lt;Y&gt;</div><div class='ctx'> </div><div class='ctx'> then the other way round</div><div class='ctx'> </div><div class='del'>-On target: cat &gt; /dev/ttyGS&lt;Y&gt;</div><div class='del'>-On host: cat /dev/ttyUSB&lt;X&gt;</div><div class='add'>+On target::</div><div class='add'>+</div><div class='add'>+	cat &gt; /dev/ttyGS&lt;Y&gt;</div><div class='add'>+</div><div class='add'>+On host::</div><div class='add'>+</div><div class='add'>+	cat /dev/ttyUSB&lt;X&gt;</div><div class='ctx'> </div><div class='ctx'> 15. SOURCESINK function</div><div class='ctx'> =======================</div><div class='hunk'>@@ -574,24 +662,27 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "SourceSink".</div><div class='ctx'> The SOURCESINK function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	pattern		- 0 (all zeros), 1 (mod63), 2 (none)</div><div class='del'>-	isoc_interval	- 1..16</div><div class='del'>-	isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)</div><div class='del'>-	isoc_mult	- 0..2 (hs/ss only)</div><div class='del'>-	isoc_maxburst	- 0..15 (ss only)</div><div class='del'>-	bulk_buflen	- buffer length</div><div class='del'>-	bulk_qlen	- depth of queue for bulk</div><div class='del'>-	iso_qlen	- depth of queue for iso</div><div class='add'>+	=============== ==================================</div><div class='add'>+	pattern		0 (all zeros), 1 (mod63), 2 (none)</div><div class='add'>+	isoc_interval	1..16</div><div class='add'>+	isoc_maxpacket	0 - 1023 (fs), 0 - 1024 (hs/ss)</div><div class='add'>+	isoc_mult	0..2 (hs/ss only)</div><div class='add'>+	isoc_maxburst	0..15 (ss only)</div><div class='add'>+	bulk_buflen	buffer length</div><div class='add'>+	bulk_qlen	depth of queue for bulk</div><div class='add'>+	iso_qlen	depth of queue for iso</div><div class='add'>+	=============== ==================================</div><div class='ctx'> </div><div class='ctx'> Testing the SOURCESINK function</div><div class='ctx'> -------------------------------</div><div class='ctx'> </div><div class='ctx'> device: run the gadget</div><div class='add'>+</div><div class='ctx'> host: test-usb (tools/usb/testusb.c)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 16. UAC1 function (legacy implementation)</div><div class='del'>-=================</div><div class='add'>+=========================================</div><div class='ctx'> </div><div class='ctx'> The function is provided by usb_f_uac1_legacy.ko module.</div><div class='ctx'> </div><div class='hunk'>@@ -602,12 +693,14 @@ The function name to use when creating the function directory</div><div class='ctx'> is "uac1_legacy".</div><div class='ctx'> The uac1 function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	audio_buf_size - audio buffer size</div><div class='del'>-	fn_cap - capture pcm device file name</div><div class='del'>-	fn_cntl - control device file name</div><div class='del'>-	fn_play - playback pcm device file name</div><div class='del'>-	req_buf_size - ISO OUT endpoint request buffer size</div><div class='del'>-	req_count - ISO OUT endpoint request count</div><div class='add'>+	=============== ====================================</div><div class='add'>+	audio_buf_size	audio buffer size</div><div class='add'>+	fn_cap		capture pcm device file name</div><div class='add'>+	fn_cntl		control device file name</div><div class='add'>+	fn_play		playback pcm device file name</div><div class='add'>+	req_buf_size	ISO OUT endpoint request buffer size</div><div class='add'>+	req_count	ISO OUT endpoint request count</div><div class='add'>+	=============== ====================================</div><div class='ctx'> </div><div class='ctx'> The attributes have sane default values.</div><div class='ctx'> </div><div class='hunk'>@@ -615,7 +708,10 @@ Testing the UAC1 function</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> device: run the gadget</div><div class='del'>-host: aplay -l # should list our USB Audio Gadget</div><div class='add'>+</div><div class='add'>+host::</div><div class='add'>+</div><div class='add'>+	aplay -l # should list our USB Audio Gadget</div><div class='ctx'> </div><div class='ctx'> 17. UAC2 function</div><div class='ctx'> =================</div><div class='hunk'>@@ -628,14 +724,16 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "uac2".</div><div class='ctx'> The uac2 function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	c_chmask - capture channel mask</div><div class='del'>-	c_srate - capture sampling rate</div><div class='del'>-	c_ssize - capture sample size (bytes)</div><div class='del'>-	p_chmask - playback channel mask</div><div class='del'>-	p_srate - playback sampling rate</div><div class='del'>-	p_ssize - playback sample size (bytes)</div><div class='del'>-	req_number - the number of pre-allocated request for both capture</div><div class='del'>-		     and playback</div><div class='add'>+	=============== ====================================================</div><div class='add'>+	c_chmask	capture channel mask</div><div class='add'>+	c_srate		capture sampling rate</div><div class='add'>+	c_ssize		capture sample size (bytes)</div><div class='add'>+	p_chmask	playback channel mask</div><div class='add'>+	p_srate		playback sampling rate</div><div class='add'>+	p_ssize		playback sample size (bytes)</div><div class='add'>+	req_number	the number of pre-allocated request for both capture</div><div class='add'>+			and playback</div><div class='add'>+	=============== ====================================================</div><div class='ctx'> </div><div class='ctx'> The attributes have sane default values.</div><div class='ctx'> </div><div class='hunk'>@@ -648,14 +746,14 @@ host: aplay -l # should list our USB Audio Gadget</div><div class='ctx'> This function does not require real hardware support, it just</div><div class='ctx'> sends a stream of audio data to/from the host. In order to</div><div class='ctx'> actually hear something at the device side, a command similar</div><div class='del'>-to this must be used at the device side:</div><div class='add'>+to this must be used at the device side::</div><div class='ctx'> </div><div class='del'>-$ arecord -f dat -t wav -D hw:2,0 | aplay -D hw:0,0 &amp;</div><div class='add'>+	$ arecord -f dat -t wav -D hw:2,0 | aplay -D hw:0,0 &amp;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ arecord -f dat -t wav -D hw:CARD=UAC2Gadget,DEV=0 | \</div><div class='del'>-aplay -D default:CARD=OdroidU3</div><div class='add'>+	$ arecord -f dat -t wav -D hw:CARD=UAC2Gadget,DEV=0 | \</div><div class='add'>+	  aplay -D default:CARD=OdroidU3</div><div class='ctx'> </div><div class='ctx'> 18. UVC function</div><div class='ctx'> ================</div><div class='hunk'>@@ -668,66 +766,73 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "uvc".</div><div class='ctx'> The uvc function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	streaming_interval - interval for polling endpoint for data transfers</div><div class='del'>-	streaming_maxburst - bMaxBurst for super speed companion descriptor</div><div class='del'>-	streaming_maxpacket - maximum packet size this endpoint is capable of</div><div class='del'>-			      sending or receiving when this configuration is</div><div class='del'>-			      selected</div><div class='add'>+	=================== ================================================</div><div class='add'>+	streaming_interval  interval for polling endpoint for data transfers</div><div class='add'>+	streaming_maxburst  bMaxBurst for super speed companion descriptor</div><div class='add'>+	streaming_maxpacket maximum packet size this endpoint is capable of</div><div class='add'>+			    sending or receiving when this configuration is</div><div class='add'>+			    selected</div><div class='add'>+	=================== ================================================</div><div class='ctx'> </div><div class='ctx'> There are also "control" and "streaming" subdirectories, each of which contain</div><div class='ctx'> a number of their subdirectories. There are some sane defaults provided, but</div><div class='ctx'> the user must provide the following:</div><div class='ctx'> </div><div class='del'>-	control header - create in control/header, link from control/class/fs</div><div class='del'>-			and/or control/class/ss</div><div class='del'>-	streaming header - create in streaming/header, link from</div><div class='del'>-			streaming/class/fs and/or streaming/class/hs and/or</div><div class='del'>-			streaming/class/ss</div><div class='del'>-	format description - create in streaming/mjpeg and/or</div><div class='del'>-			streaming/uncompressed</div><div class='del'>-	frame description - create in streaming/mjpeg/&lt;format&gt; and/or in</div><div class='del'>-			streaming/uncompressed/&lt;format&gt;</div><div class='add'>+	================== ====================================================</div><div class='add'>+	control header     create in control/header, link from control/class/fs</div><div class='add'>+			   and/or control/class/ss</div><div class='add'>+	streaming header   create in streaming/header, link from</div><div class='add'>+			   streaming/class/fs and/or streaming/class/hs and/or</div><div class='add'>+			   streaming/class/ss</div><div class='add'>+	format description create in streaming/mjpeg and/or</div><div class='add'>+			   streaming/uncompressed</div><div class='add'>+	frame description  create in streaming/mjpeg/&lt;format&gt; and/or in</div><div class='add'>+			   streaming/uncompressed/&lt;format&gt;</div><div class='add'>+	================== ====================================================</div><div class='ctx'> </div><div class='ctx'> Each frame description contains frame interval specification, and each</div><div class='ctx'> such specification consists of a number of lines with an inverval value</div><div class='del'>-in each line. The rules stated above are best illustrated with an example:</div><div class='del'>-</div><div class='del'>-# mkdir functions/uvc.usb0/control/header/h</div><div class='del'>-# cd functions/uvc.usb0/control/</div><div class='del'>-# ln -s header/h class/fs</div><div class='del'>-# ln -s header/h class/ss</div><div class='del'>-# mkdir -p functions/uvc.usb0/streaming/uncompressed/u/360p</div><div class='del'>-# cat &lt;&lt;EOF &gt; functions/uvc.usb0/streaming/uncompressed/u/360p/dwFrameInterval</div><div class='del'>-666666</div><div class='del'>-1000000</div><div class='del'>-5000000</div><div class='del'>-EOF</div><div class='del'>-# cd $GADGET_CONFIGFS_ROOT</div><div class='del'>-# mkdir functions/uvc.usb0/streaming/header/h</div><div class='del'>-# cd functions/uvc.usb0/streaming/header/h</div><div class='del'>-# ln -s ../../uncompressed/u</div><div class='del'>-# cd ../../class/fs</div><div class='del'>-# ln -s ../../header/h</div><div class='del'>-# cd ../../class/hs</div><div class='del'>-# ln -s ../../header/h</div><div class='del'>-# cd ../../class/ss</div><div class='del'>-# ln -s ../../header/h</div><div class='add'>+in each line. The rules stated above are best illustrated with an example::</div><div class='add'>+</div><div class='add'>+  # mkdir functions/uvc.usb0/control/header/h</div><div class='add'>+  # cd functions/uvc.usb0/control/</div><div class='add'>+  # ln -s header/h class/fs</div><div class='add'>+  # ln -s header/h class/ss</div><div class='add'>+  # mkdir -p functions/uvc.usb0/streaming/uncompressed/u/360p</div><div class='add'>+  # cat &lt;&lt;EOF &gt; functions/uvc.usb0/streaming/uncompressed/u/360p/dwFrameInterval</div><div class='add'>+  666666</div><div class='add'>+  1000000</div><div class='add'>+  5000000</div><div class='add'>+  EOF</div><div class='add'>+  # cd $GADGET_CONFIGFS_ROOT</div><div class='add'>+  # mkdir functions/uvc.usb0/streaming/header/h</div><div class='add'>+  # cd functions/uvc.usb0/streaming/header/h</div><div class='add'>+  # ln -s ../../uncompressed/u</div><div class='add'>+  # cd ../../class/fs</div><div class='add'>+  # ln -s ../../header/h</div><div class='add'>+  # cd ../../class/hs</div><div class='add'>+  # ln -s ../../header/h</div><div class='add'>+  # cd ../../class/ss</div><div class='add'>+  # ln -s ../../header/h</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Testing the UVC function</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='del'>-device: run the gadget, modprobe vivid</div><div class='add'>+device: run the gadget, modprobe vivid::</div><div class='ctx'> </div><div class='del'>-# uvc-gadget -u /dev/video&lt;uvc video node #&gt; -v /dev/video&lt;vivid video node #&gt;</div><div class='add'>+  # uvc-gadget -u /dev/video&lt;uvc video node #&gt; -v /dev/video&lt;vivid video node #&gt;</div><div class='ctx'> </div><div class='ctx'> where uvc-gadget is this program:</div><div class='del'>-http://git.ideasonboard.org/uvc-gadget.git</div><div class='add'>+	http://git.ideasonboard.org/uvc-gadget.git</div><div class='ctx'> </div><div class='ctx'> with these patches:</div><div class='del'>-http://www.spinics.net/lists/linux-usb/msg99220.html</div><div class='ctx'> </div><div class='del'>-host: luvcview -f yuv</div><div class='add'>+	http://www.spinics.net/lists/linux-usb/msg99220.html</div><div class='add'>+</div><div class='add'>+host::</div><div class='add'>+</div><div class='add'>+	luvcview -f yuv</div><div class='ctx'> </div><div class='ctx'> 19. PRINTER function</div><div class='ctx'> ====================</div><div class='hunk'>@@ -740,16 +845,19 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "printer".</div><div class='ctx'> The printer function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	pnp_string	- Data to be passed to the host in pnp string</div><div class='del'>-	q_len		- Number of requests per endpoint</div><div class='add'>+	==========	===========================================</div><div class='add'>+	pnp_string	Data to be passed to the host in pnp string</div><div class='add'>+	q_len		Number of requests per endpoint</div><div class='add'>+	==========	===========================================</div><div class='ctx'> </div><div class='ctx'> Testing the PRINTER function</div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='ctx'> The most basic testing:</div><div class='ctx'> </div><div class='del'>-device: run the gadget</div><div class='del'>-# ls -l /devices/virtual/usb_printer_gadget/</div><div class='add'>+device: run the gadget::</div><div class='add'>+</div><div class='add'>+	# ls -l /devices/virtual/usb_printer_gadget/</div><div class='ctx'> </div><div class='ctx'> should show g_printer&lt;number&gt;.</div><div class='ctx'> </div><div class='hunk'>@@ -761,23 +869,28 @@ If udev is active, then e.g. /dev/usb/lp0 should appear.</div><div class='ctx'> </div><div class='ctx'> host-&gt;device transmission:</div><div class='ctx'> </div><div class='del'>-device:</div><div class='del'>-# cat /dev/g_printer&lt;number&gt;</div><div class='del'>-host:</div><div class='del'>-# cat &gt; /dev/usb/lp0</div><div class='add'>+device::</div><div class='ctx'> </div><div class='del'>-device-&gt;host transmission:</div><div class='add'>+	# cat /dev/g_printer&lt;number&gt;</div><div class='ctx'> </div><div class='del'>-# cat &gt; /dev/g_printer&lt;number&gt;</div><div class='del'>-host:</div><div class='del'>-# cat /dev/usb/lp0</div><div class='add'>+host::</div><div class='add'>+</div><div class='add'>+	# cat &gt; /dev/usb/lp0</div><div class='add'>+</div><div class='add'>+device-&gt;host transmission::</div><div class='add'>+</div><div class='add'>+	# cat &gt; /dev/g_printer&lt;number&gt;</div><div class='add'>+</div><div class='add'>+host::</div><div class='add'>+</div><div class='add'>+	# cat /dev/usb/lp0</div><div class='ctx'> </div><div class='ctx'> More advanced testing can be done with the prn_example</div><div class='ctx'> described in Documentation/usb/gadget_printer.txt.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 20. UAC1 function (virtual ALSA card, using u_audio API)</div><div class='del'>-=================</div><div class='add'>+========================================================</div><div class='ctx'> </div><div class='ctx'> The function is provided by usb_f_uac1.ko module.</div><div class='ctx'> It will create a virtual ALSA card and the audio streams are simply</div><div class='hunk'>@@ -789,14 +902,16 @@ Function-specific configfs interface</div><div class='ctx'> The function name to use when creating the function directory is "uac1".</div><div class='ctx'> The uac1 function provides these attributes in its function directory:</div><div class='ctx'> </div><div class='del'>-	c_chmask - capture channel mask</div><div class='del'>-	c_srate - capture sampling rate</div><div class='del'>-	c_ssize - capture sample size (bytes)</div><div class='del'>-	p_chmask - playback channel mask</div><div class='del'>-	p_srate - playback sampling rate</div><div class='del'>-	p_ssize - playback sample size (bytes)</div><div class='del'>-	req_number - the number of pre-allocated request for both capture</div><div class='del'>-		     and playback</div><div class='add'>+	========== ====================================================</div><div class='add'>+	c_chmask   capture channel mask</div><div class='add'>+	c_srate    capture sampling rate</div><div class='add'>+	c_ssize    capture sample size (bytes)</div><div class='add'>+	p_chmask   playback channel mask</div><div class='add'>+	p_srate    playback sampling rate</div><div class='add'>+	p_ssize    playback sample size (bytes)</div><div class='add'>+	req_number the number of pre-allocated request for both capture</div><div class='add'>+		   and playback</div><div class='add'>+	========== ====================================================</div><div class='ctx'> </div><div class='ctx'> The attributes have sane default values.</div><div class='ctx'> </div><div class='hunk'>@@ -809,11 +924,11 @@ host: aplay -l # should list our USB Audio Gadget</div><div class='ctx'> This function does not require real hardware support, it just</div><div class='ctx'> sends a stream of audio data to/from the host. In order to</div><div class='ctx'> actually hear something at the device side, a command similar</div><div class='del'>-to this must be used at the device side:</div><div class='add'>+to this must be used at the device side::</div><div class='ctx'> </div><div class='del'>-$ arecord -f dat -t wav -D hw:2,0 | aplay -D hw:0,0 &amp;</div><div class='add'>+	$ arecord -f dat -t wav -D hw:2,0 | aplay -D hw:0,0 &amp;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ arecord -f dat -t wav -D hw:CARD=UAC1Gadget,DEV=0 | \</div><div class='del'>-aplay -D default:CARD=OdroidU3</div><div class='add'>+	$ arecord -f dat -t wav -D hw:CARD=UAC1Gadget,DEV=0 | \</div><div class='add'>+	  aplay -D default:CARD=OdroidU3</div><div class='head'>diff --git a/Documentation/usb/gadget_configfs.txt b/Documentation/usb/gadget_configfs.txt<br/>index b8cb38a98c19..54fb08baae22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_configfs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_configfs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_configfs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/gadget_configfs.txt</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+============================================</div><div class='add'>+Linux USB gadget configured through configfs</div><div class='add'>+============================================</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		Linux USB gadget configured through configfs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-			     25th April 2013</div><div class='add'>+25th April 2013</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -26,7 +24,7 @@ Linux provides a number of functions for gadgets to use.</div><div class='ctx'> Creating a gadget means deciding what configurations there will be</div><div class='ctx'> and which functions each configuration will provide.</div><div class='ctx'> </div><div class='del'>-Configfs (please see Documentation/filesystems/configfs/*) lends itself nicely</div><div class='add'>+Configfs (please see `Documentation/filesystems/configfs/*`) lends itself nicely</div><div class='ctx'> for the purpose of telling the kernel about the above mentioned decision.</div><div class='ctx'> This document is about how to do it.</div><div class='ctx'> </div><div class='hunk'>@@ -51,44 +49,46 @@ Usage</div><div class='ctx'> made available through configfs can be seen here:</div><div class='ctx'> http://www.spinics.net/lists/linux-usb/msg76388.html)</div><div class='ctx'> </div><div class='del'>-$ modprobe libcomposite</div><div class='del'>-$ mount none $CONFIGFS_HOME -t configfs</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	$ modprobe libcomposite</div><div class='add'>+	$ mount none $CONFIGFS_HOME -t configfs</div><div class='ctx'> </div><div class='ctx'> where CONFIGFS_HOME is the mount point for configfs</div><div class='ctx'> </div><div class='ctx'> 1. Creating the gadgets</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='del'>-For each gadget to be created its corresponding directory must be created:</div><div class='add'>+For each gadget to be created its corresponding directory must be created::</div><div class='ctx'> </div><div class='del'>-$ mkdir $CONFIGFS_HOME/usb_gadget/&lt;gadget name&gt;</div><div class='add'>+	$ mkdir $CONFIGFS_HOME/usb_gadget/&lt;gadget name&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ mkdir $CONFIGFS_HOME/usb_gadget/g1</div><div class='add'>+	$ mkdir $CONFIGFS_HOME/usb_gadget/g1</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='del'>-$ cd $CONFIGFS_HOME/usb_gadget/g1</div><div class='add'>+	$ cd $CONFIGFS_HOME/usb_gadget/g1</div><div class='ctx'> </div><div class='del'>-Each gadget needs to have its vendor id &lt;VID&gt; and product id &lt;PID&gt; specified:</div><div class='add'>+Each gadget needs to have its vendor id &lt;VID&gt; and product id &lt;PID&gt; specified::</div><div class='ctx'> </div><div class='del'>-$ echo &lt;VID&gt; &gt; idVendor</div><div class='del'>-$ echo &lt;PID&gt; &gt; idProduct</div><div class='add'>+	$ echo &lt;VID&gt; &gt; idVendor</div><div class='add'>+	$ echo &lt;PID&gt; &gt; idProduct</div><div class='ctx'> </div><div class='ctx'> A gadget also needs its serial number, manufacturer and product strings.</div><div class='ctx'> In order to have a place to store them, a strings subdirectory must be created</div><div class='del'>-for each language, e.g.:</div><div class='add'>+for each language, e.g.::</div><div class='ctx'> </div><div class='del'>-$ mkdir strings/0x409</div><div class='add'>+	$ mkdir strings/0x409</div><div class='ctx'> </div><div class='del'>-Then the strings can be specified:</div><div class='add'>+Then the strings can be specified::</div><div class='ctx'> </div><div class='del'>-$ echo &lt;serial number&gt; &gt; strings/0x409/serialnumber</div><div class='del'>-$ echo &lt;manufacturer&gt; &gt; strings/0x409/manufacturer</div><div class='del'>-$ echo &lt;product&gt; &gt; strings/0x409/product</div><div class='add'>+	$ echo &lt;serial number&gt; &gt; strings/0x409/serialnumber</div><div class='add'>+	$ echo &lt;manufacturer&gt; &gt; strings/0x409/manufacturer</div><div class='add'>+	$ echo &lt;product&gt; &gt; strings/0x409/product</div><div class='ctx'> </div><div class='ctx'> 2. Creating the configurations</div><div class='ctx'> ------------------------------</div><div class='hunk'>@@ -99,43 +99,43 @@ directories must be created:</div><div class='ctx'> $ mkdir configs/&lt;name&gt;.&lt;number&gt;</div><div class='ctx'> </div><div class='ctx'> where &lt;name&gt; can be any string which is legal in a filesystem and the</div><div class='del'>-&lt;number&gt; is the configuration's number, e.g.:</div><div class='add'>+&lt;number&gt; is the configuration's number, e.g.::</div><div class='ctx'> </div><div class='del'>-$ mkdir configs/c.1</div><div class='add'>+	$ mkdir configs/c.1</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='ctx'> Each configuration also needs its strings, so a subdirectory must be created</div><div class='del'>-for each language, e.g.:</div><div class='add'>+for each language, e.g.::</div><div class='ctx'> </div><div class='del'>-$ mkdir configs/c.1/strings/0x409</div><div class='add'>+	$ mkdir configs/c.1/strings/0x409</div><div class='ctx'> </div><div class='del'>-Then the configuration string can be specified:</div><div class='add'>+Then the configuration string can be specified::</div><div class='ctx'> </div><div class='del'>-$ echo &lt;configuration&gt; &gt; configs/c.1/strings/0x409/configuration</div><div class='add'>+	$ echo &lt;configuration&gt; &gt; configs/c.1/strings/0x409/configuration</div><div class='ctx'> </div><div class='del'>-Some attributes can also be set for a configuration, e.g.:</div><div class='add'>+Some attributes can also be set for a configuration, e.g.::</div><div class='ctx'> </div><div class='del'>-$ echo 120 &gt; configs/c.1/MaxPower</div><div class='add'>+	$ echo 120 &gt; configs/c.1/MaxPower</div><div class='ctx'> </div><div class='ctx'> 3. Creating the functions</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> The gadget will provide some functions, for each function its corresponding</div><div class='del'>-directory must be created:</div><div class='add'>+directory must be created::</div><div class='ctx'> </div><div class='del'>-$ mkdir functions/&lt;name&gt;.&lt;instance name&gt;</div><div class='add'>+	$ mkdir functions/&lt;name&gt;.&lt;instance name&gt;</div><div class='ctx'> </div><div class='ctx'> where &lt;name&gt; corresponds to one of allowed function names and instance name</div><div class='del'>-is an arbitrary string allowed in a filesystem, e.g.:</div><div class='add'>+is an arbitrary string allowed in a filesystem, e.g.::</div><div class='ctx'> </div><div class='del'>-$ mkdir functions/ncm.usb0 # usb_f_ncm.ko gets loaded with request_module()</div><div class='add'>+  $ mkdir functions/ncm.usb0 # usb_f_ncm.ko gets loaded with request_module()</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+  ...</div><div class='add'>+  ...</div><div class='add'>+  ...</div><div class='ctx'> </div><div class='ctx'> Each function provides its specific set of attributes, with either read-only</div><div class='ctx'> or read-write access. Where applicable they need to be written to as</div><div class='hunk'>@@ -149,17 +149,17 @@ At this moment a number of gadgets is created, each of which has a number of</div><div class='ctx'> configurations specified and a number of functions available. What remains</div><div class='ctx'> is specifying which function is available in which configuration (the same</div><div class='ctx'> function can be used in multiple configurations). This is achieved with</div><div class='del'>-creating symbolic links:</div><div class='add'>+creating symbolic links::</div><div class='ctx'> </div><div class='del'>-$ ln -s functions/&lt;name&gt;.&lt;instance name&gt; configs/&lt;name&gt;.&lt;number&gt;</div><div class='add'>+	$ ln -s functions/&lt;name&gt;.&lt;instance name&gt; configs/&lt;name&gt;.&lt;number&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ ln -s functions/ncm.usb0 configs/c.1</div><div class='add'>+	$ ln -s functions/ncm.usb0 configs/c.1</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='ctx'> 5. Enabling the gadget</div><div class='ctx'> ----------------------</div><div class='hunk'>@@ -167,123 +167,127 @@ $ ln -s functions/ncm.usb0 configs/c.1</div><div class='ctx'> All the above steps serve the purpose of composing the gadget of</div><div class='ctx'> configurations and functions.</div><div class='ctx'> </div><div class='del'>-An example directory structure might look like this:</div><div class='del'>-</div><div class='del'>-.</div><div class='del'>-./strings</div><div class='del'>-./strings/0x409</div><div class='del'>-./strings/0x409/serialnumber</div><div class='del'>-./strings/0x409/product</div><div class='del'>-./strings/0x409/manufacturer</div><div class='del'>-./configs</div><div class='del'>-./configs/c.1</div><div class='del'>-./configs/c.1/ncm.usb0 -&gt; ../../../../usb_gadget/g1/functions/ncm.usb0</div><div class='del'>-./configs/c.1/strings</div><div class='del'>-./configs/c.1/strings/0x409</div><div class='del'>-./configs/c.1/strings/0x409/configuration</div><div class='del'>-./configs/c.1/bmAttributes</div><div class='del'>-./configs/c.1/MaxPower</div><div class='del'>-./functions</div><div class='del'>-./functions/ncm.usb0</div><div class='del'>-./functions/ncm.usb0/ifname</div><div class='del'>-./functions/ncm.usb0/qmult</div><div class='del'>-./functions/ncm.usb0/host_addr</div><div class='del'>-./functions/ncm.usb0/dev_addr</div><div class='del'>-./UDC</div><div class='del'>-./bcdUSB</div><div class='del'>-./bcdDevice</div><div class='del'>-./idProduct</div><div class='del'>-./idVendor</div><div class='del'>-./bMaxPacketSize0</div><div class='del'>-./bDeviceProtocol</div><div class='del'>-./bDeviceSubClass</div><div class='del'>-./bDeviceClass</div><div class='add'>+An example directory structure might look like this::</div><div class='add'>+</div><div class='add'>+  .</div><div class='add'>+  ./strings</div><div class='add'>+  ./strings/0x409</div><div class='add'>+  ./strings/0x409/serialnumber</div><div class='add'>+  ./strings/0x409/product</div><div class='add'>+  ./strings/0x409/manufacturer</div><div class='add'>+  ./configs</div><div class='add'>+  ./configs/c.1</div><div class='add'>+  ./configs/c.1/ncm.usb0 -&gt; ../../../../usb_gadget/g1/functions/ncm.usb0</div><div class='add'>+  ./configs/c.1/strings</div><div class='add'>+  ./configs/c.1/strings/0x409</div><div class='add'>+  ./configs/c.1/strings/0x409/configuration</div><div class='add'>+  ./configs/c.1/bmAttributes</div><div class='add'>+  ./configs/c.1/MaxPower</div><div class='add'>+  ./functions</div><div class='add'>+  ./functions/ncm.usb0</div><div class='add'>+  ./functions/ncm.usb0/ifname</div><div class='add'>+  ./functions/ncm.usb0/qmult</div><div class='add'>+  ./functions/ncm.usb0/host_addr</div><div class='add'>+  ./functions/ncm.usb0/dev_addr</div><div class='add'>+  ./UDC</div><div class='add'>+  ./bcdUSB</div><div class='add'>+  ./bcdDevice</div><div class='add'>+  ./idProduct</div><div class='add'>+  ./idVendor</div><div class='add'>+  ./bMaxPacketSize0</div><div class='add'>+  ./bDeviceProtocol</div><div class='add'>+  ./bDeviceSubClass</div><div class='add'>+  ./bDeviceClass</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Such a gadget must be finally enabled so that the USB host can enumerate it.</div><div class='del'>-In order to enable the gadget it must be bound to a UDC (USB Device Controller).</div><div class='ctx'> </div><div class='del'>-$ echo &lt;udc name&gt; &gt; UDC</div><div class='add'>+In order to enable the gadget it must be bound to a UDC (USB Device</div><div class='add'>+Controller)::</div><div class='add'>+</div><div class='add'>+	$ echo &lt;udc name&gt; &gt; UDC</div><div class='ctx'> </div><div class='ctx'> where &lt;udc name&gt; is one of those found in /sys/class/udc/*</div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ echo s3c-hsotg &gt; UDC</div><div class='add'>+	$ echo s3c-hsotg &gt; UDC</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 6. Disabling the gadget</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='del'>-$ echo "" &gt; UDC</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	$ echo "" &gt; UDC</div><div class='ctx'> </div><div class='ctx'> 7. Cleaning up</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='del'>-Remove functions from configurations:</div><div class='add'>+Remove functions from configurations::</div><div class='ctx'> </div><div class='del'>-$ rm configs/&lt;config name&gt;.&lt;number&gt;/&lt;function&gt;</div><div class='add'>+	$ rm configs/&lt;config name&gt;.&lt;number&gt;/&lt;function&gt;</div><div class='ctx'> </div><div class='ctx'> where &lt;config name&gt;.&lt;number&gt; specify the configuration and &lt;function&gt; is</div><div class='del'>-a symlink to a function being removed from the configuration, e.g.:</div><div class='add'>+a symlink to a function being removed from the configuration, e.g.::</div><div class='ctx'> </div><div class='del'>-$ rm configs/c.1/ncm.usb0</div><div class='add'>+	$ rm configs/c.1/ncm.usb0</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='del'>-Remove strings directories in configurations</div><div class='add'>+Remove strings directories in configurations:</div><div class='ctx'> </div><div class='del'>-$ rmdir configs/&lt;config name&gt;.&lt;number&gt;/strings/&lt;lang&gt;</div><div class='add'>+	$ rmdir configs/&lt;config name&gt;.&lt;number&gt;/strings/&lt;lang&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ rmdir configs/c.1/strings/0x409</div><div class='add'>+	$ rmdir configs/c.1/strings/0x409</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='del'>-and remove the configurations</div><div class='add'>+and remove the configurations::</div><div class='ctx'> </div><div class='del'>-$ rmdir configs/&lt;config name&gt;.&lt;number&gt;</div><div class='add'>+	$ rmdir configs/&lt;config name&gt;.&lt;number&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-rmdir configs/c.1</div><div class='add'>+	rmdir configs/c.1</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='del'>-Remove functions (function modules are not unloaded, though)</div><div class='add'>+Remove functions (function modules are not unloaded, though):</div><div class='ctx'> </div><div class='del'>-$ rmdir functions/&lt;name&gt;.&lt;instance name&gt;</div><div class='add'>+	$ rmdir functions/&lt;name&gt;.&lt;instance name&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ rmdir functions/ncm.usb0</div><div class='add'>+	$ rmdir functions/ncm.usb0</div><div class='ctx'> </div><div class='del'>-...</div><div class='del'>-...</div><div class='del'>-...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='add'>+	...</div><div class='ctx'> </div><div class='del'>-Remove strings directories in the gadget</div><div class='add'>+Remove strings directories in the gadget::</div><div class='ctx'> </div><div class='del'>-$ rmdir strings/&lt;lang&gt;</div><div class='add'>+	$ rmdir strings/&lt;lang&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ rmdir strings/0x409</div><div class='add'>+	$ rmdir strings/0x409</div><div class='ctx'> </div><div class='del'>-and finally remove the gadget:</div><div class='add'>+and finally remove the gadget::</div><div class='ctx'> </div><div class='del'>-$ cd ..</div><div class='del'>-$ rmdir &lt;gadget name&gt;</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ rmdir &lt;gadget name&gt;</div><div class='ctx'> </div><div class='del'>-e.g.:</div><div class='add'>+e.g.::</div><div class='ctx'> </div><div class='del'>-$ rmdir g1</div><div class='add'>+	$ rmdir g1</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -305,16 +309,16 @@ configured elements. However, they are embedded in usage-specific</div><div class='ctx'> larger structures. In the picture below there is a "cs" which contains</div><div class='ctx'> a config_item and an "sa" which contains a configfs_attribute.</div><div class='ctx'> </div><div class='del'>-The filesystem view would be like this:</div><div class='add'>+The filesystem view would be like this::</div><div class='ctx'> </div><div class='del'>-./</div><div class='del'>-./cs        (directory)</div><div class='del'>-   |</div><div class='del'>-   +--sa    (file)</div><div class='del'>-   |</div><div class='del'>-   .</div><div class='del'>-   .</div><div class='del'>-   .</div><div class='add'>+  ./</div><div class='add'>+  ./cs        (directory)</div><div class='add'>+     |</div><div class='add'>+     +--sa    (file)</div><div class='add'>+     |</div><div class='add'>+     .</div><div class='add'>+     .</div><div class='add'>+     .</div><div class='ctx'> </div><div class='ctx'> Whenever a user reads/writes the "sa" file, a function is called</div><div class='ctx'> which accepts a struct config_item and a struct configfs_attribute.</div><div class='hunk'>@@ -326,29 +330,31 @@ buffer), while the "store" is for modifying the file's contents (copy data</div><div class='ctx'> from the buffer to the cs), but it is up to the implementer of the</div><div class='ctx'> two functions to decide what they actually do.</div><div class='ctx'> </div><div class='del'>-typedef struct configured_structure cs;</div><div class='del'>-typedef struct specific_attribute sa;</div><div class='del'>-</div><div class='del'>-                                       sa</div><div class='del'>-                       +----------------------------------+</div><div class='del'>-        cs             |  (*show)(cs *, buffer);          |</div><div class='del'>-+-----------------+    |  (*store)(cs *, buffer, length); |</div><div class='del'>-|                 |    |                                  |</div><div class='del'>-| +-------------+ |    |       +------------------+       |</div><div class='del'>-| | struct      |-|----|------&gt;|struct            |       |</div><div class='del'>-| | config_item | |    |       |configfs_attribute|       |</div><div class='del'>-| +-------------+ |    |       +------------------+       |</div><div class='del'>-|                 |    +----------------------------------+</div><div class='del'>-| data to be set  |                .</div><div class='del'>-|                 |                .</div><div class='del'>-+-----------------+                .</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  typedef struct configured_structure cs;</div><div class='add'>+  typedef struct specific_attribute sa;</div><div class='add'>+</div><div class='add'>+                                         sa</div><div class='add'>+                         +----------------------------------+</div><div class='add'>+          cs             |  (*show)(cs *, buffer);          |</div><div class='add'>+  +-----------------+    |  (*store)(cs *, buffer, length); |</div><div class='add'>+  |                 |    |                                  |</div><div class='add'>+  | +-------------+ |    |       +------------------+       |</div><div class='add'>+  | | struct      |-|----|------&gt;|struct            |       |</div><div class='add'>+  | | config_item | |    |       |configfs_attribute|       |</div><div class='add'>+  | +-------------+ |    |       +------------------+       |</div><div class='add'>+  |                 |    +----------------------------------+</div><div class='add'>+  | data to be set  |                .</div><div class='add'>+  |                 |                .</div><div class='add'>+  +-----------------+                .</div><div class='ctx'> </div><div class='ctx'> The file names are decided by the config item/group designer, while</div><div class='ctx'> the directories in general can be named at will. A group can have</div><div class='ctx'> a number of its default sub-groups created automatically.</div><div class='ctx'> </div><div class='ctx'> For more information on configfs please see</div><div class='del'>-Documentation/filesystems/configfs/*.</div><div class='add'>+`Documentation/filesystems/configfs/*`.</div><div class='ctx'> </div><div class='ctx'> The concepts described above translate to USB gadgets like this:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/usb/gadget_hid.txt b/Documentation/usb/gadget_hid.txt<br/>index 7a0fb8e16e27..098d563040cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_hid.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_hid.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_hid.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/gadget_hid.txt</a></div><div class='hunk'>@@ -1,28 +1,31 @@</div><div class='del'>-</div><div class='del'>-		     Linux USB HID gadget driver</div><div class='add'>+===========================</div><div class='add'>+Linux USB HID gadget driver</div><div class='add'>+===========================</div><div class='ctx'> </div><div class='ctx'> Introduction</div><div class='add'>+============</div><div class='ctx'> </div><div class='del'>-	The HID Gadget driver provides emulation of USB Human Interface</div><div class='del'>-	Devices (HID). The basic HID handling is done in the kernel,</div><div class='del'>-	and HID reports can be sent/received through I/O on the</div><div class='del'>-	/dev/hidgX character devices.</div><div class='add'>+The HID Gadget driver provides emulation of USB Human Interface</div><div class='add'>+Devices (HID). The basic HID handling is done in the kernel,</div><div class='add'>+and HID reports can be sent/received through I/O on the</div><div class='add'>+/dev/hidgX character devices.</div><div class='ctx'> </div><div class='del'>-	For more details about HID, see the developer page on</div><div class='del'>-	http://www.usb.org/developers/hidpage/</div><div class='add'>+For more details about HID, see the developer page on</div><div class='add'>+http://www.usb.org/developers/hidpage/</div><div class='ctx'> </div><div class='ctx'> Configuration</div><div class='add'>+=============</div><div class='ctx'> </div><div class='del'>-	g_hid is a platform driver, so to use it you need to add</div><div class='del'>-	struct platform_device(s) to your platform code defining the</div><div class='del'>-	HID function descriptors you want to use - E.G. something</div><div class='del'>-	like:</div><div class='add'>+g_hid is a platform driver, so to use it you need to add</div><div class='add'>+struct platform_device(s) to your platform code defining the</div><div class='add'>+HID function descriptors you want to use - E.G. something</div><div class='add'>+like::</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/usb/g_hid.h&gt;</div><div class='add'>+  #include &lt;linux/platform_device.h&gt;</div><div class='add'>+  #include &lt;linux/usb/g_hid.h&gt;</div><div class='ctx'> </div><div class='del'>-/* hid descriptor for a keyboard */</div><div class='del'>-static struct hidg_func_descriptor my_hid_data = {</div><div class='add'>+  /* hid descriptor for a keyboard */</div><div class='add'>+  static struct hidg_func_descriptor my_hid_data = {</div><div class='ctx'> 	.subclass		= 0, /* No subclass */</div><div class='ctx'> 	.protocol		= 1, /* Keyboard */</div><div class='ctx'> 	.report_length		= 8,</div><div class='hunk'>@@ -61,85 +64,87 @@ static struct hidg_func_descriptor my_hid_data = {</div><div class='ctx'> 		0x81, 0x00,	/*   INPUT (Data,Ary,Abs)                 */</div><div class='ctx'> 		0xc0		/* END_COLLECTION                         */</div><div class='ctx'> 	}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-static struct platform_device my_hid = {</div><div class='add'>+  static struct platform_device my_hid = {</div><div class='ctx'> 	.name			= "hidg",</div><div class='ctx'> 	.id			= 0,</div><div class='ctx'> 	.num_resources		= 0,</div><div class='ctx'> 	.resource		= 0,</div><div class='ctx'> 	.dev.platform_data	= &amp;my_hid_data,</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-	You can add as many HID functions as you want, only limited by</div><div class='del'>-	the amount of interrupt endpoints your gadget driver supports.</div><div class='add'>+You can add as many HID functions as you want, only limited by</div><div class='add'>+the amount of interrupt endpoints your gadget driver supports.</div><div class='ctx'> </div><div class='ctx'> Configuration with configfs</div><div class='add'>+===========================</div><div class='ctx'> </div><div class='del'>-	Instead of adding fake platform devices and drivers in order to pass</div><div class='del'>-	some data to the kernel, if HID is a part of a gadget composed with</div><div class='del'>-	configfs the hidg_func_descriptor.report_desc is passed to the kernel</div><div class='del'>-	by writing the appropriate stream of bytes to a configfs attribute.</div><div class='add'>+Instead of adding fake platform devices and drivers in order to pass</div><div class='add'>+some data to the kernel, if HID is a part of a gadget composed with</div><div class='add'>+configfs the hidg_func_descriptor.report_desc is passed to the kernel</div><div class='add'>+by writing the appropriate stream of bytes to a configfs attribute.</div><div class='ctx'> </div><div class='ctx'> Send and receive HID reports</div><div class='add'>+============================</div><div class='ctx'> </div><div class='del'>-	HID reports can be sent/received using read/write on the</div><div class='del'>-	/dev/hidgX character devices. See below for an example program</div><div class='del'>-	to do this.</div><div class='add'>+HID reports can be sent/received using read/write on the</div><div class='add'>+/dev/hidgX character devices. See below for an example program</div><div class='add'>+to do this.</div><div class='ctx'> </div><div class='del'>-	hid_gadget_test is a small interactive program to test the HID</div><div class='del'>-	gadget driver. To use, point it at a hidg device and set the</div><div class='del'>-	device type (keyboard / mouse / joystick) - E.G.:</div><div class='add'>+hid_gadget_test is a small interactive program to test the HID</div><div class='add'>+gadget driver. To use, point it at a hidg device and set the</div><div class='add'>+device type (keyboard / mouse / joystick) - E.G.::</div><div class='ctx'> </div><div class='del'>-		# hid_gadget_test /dev/hidg0 keyboard</div><div class='add'>+	# hid_gadget_test /dev/hidg0 keyboard</div><div class='ctx'> </div><div class='del'>-	You are now in the prompt of hid_gadget_test. You can type any</div><div class='del'>-	combination of options and values. Available options and</div><div class='del'>-	values are listed at program start. In keyboard mode you can</div><div class='del'>-	send up to six values.</div><div class='add'>+You are now in the prompt of hid_gadget_test. You can type any</div><div class='add'>+combination of options and values. Available options and</div><div class='add'>+values are listed at program start. In keyboard mode you can</div><div class='add'>+send up to six values.</div><div class='ctx'> </div><div class='del'>-	For example type: g i s t r --left-shift</div><div class='add'>+For example type: g i s t r --left-shift</div><div class='ctx'> </div><div class='del'>-	Hit return and the corresponding report will be sent by the</div><div class='del'>-	HID gadget.</div><div class='add'>+Hit return and the corresponding report will be sent by the</div><div class='add'>+HID gadget.</div><div class='ctx'> </div><div class='del'>-	Another interesting example is the caps lock test. Type</div><div class='del'>-	--caps-lock and hit return. A report is then sent by the</div><div class='del'>-	gadget and you should receive the host answer, corresponding</div><div class='del'>-	to the caps lock LED status.</div><div class='add'>+Another interesting example is the caps lock test. Type</div><div class='add'>+--caps-lock and hit return. A report is then sent by the</div><div class='add'>+gadget and you should receive the host answer, corresponding</div><div class='add'>+to the caps lock LED status::</div><div class='ctx'> </div><div class='del'>-		--caps-lock</div><div class='del'>-		recv report:2</div><div class='add'>+	--caps-lock</div><div class='add'>+	recv report:2</div><div class='ctx'> </div><div class='del'>-	With this command:</div><div class='add'>+With this command::</div><div class='ctx'> </div><div class='del'>-		# hid_gadget_test /dev/hidg1 mouse</div><div class='add'>+	# hid_gadget_test /dev/hidg1 mouse</div><div class='ctx'> </div><div class='del'>-	You can test the mouse emulation. Values are two signed numbers.</div><div class='add'>+You can test the mouse emulation. Values are two signed numbers.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Sample code</div><div class='add'>+Sample code::</div><div class='ctx'> </div><div class='del'>-/* hid_gadget_test */</div><div class='add'>+    /* hid_gadget_test */</div><div class='ctx'> </div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='add'>+    #include &lt;pthread.h&gt;</div><div class='add'>+    #include &lt;string.h&gt;</div><div class='add'>+    #include &lt;stdio.h&gt;</div><div class='add'>+    #include &lt;ctype.h&gt;</div><div class='add'>+    #include &lt;fcntl.h&gt;</div><div class='add'>+    #include &lt;errno.h&gt;</div><div class='add'>+    #include &lt;stdio.h&gt;</div><div class='add'>+    #include &lt;stdlib.h&gt;</div><div class='add'>+    #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#define BUF_LEN 512</div><div class='add'>+    #define BUF_LEN 512</div><div class='ctx'> </div><div class='del'>-struct options {</div><div class='add'>+    struct options {</div><div class='ctx'> 	const char    *opt;</div><div class='ctx'> 	unsigned char val;</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-static struct options kmod[] = {</div><div class='add'>+  static struct options kmod[] = {</div><div class='ctx'> 	{.opt = "--left-ctrl",		.val = 0x01},</div><div class='ctx'> 	{.opt = "--right-ctrl",		.val = 0x10},</div><div class='ctx'> 	{.opt = "--left-shift",		.val = 0x02},</div><div class='hunk'>@@ -149,9 +154,9 @@ static struct options kmod[] = {</div><div class='ctx'> 	{.opt = "--left-meta",		.val = 0x08},</div><div class='ctx'> 	{.opt = "--right-meta",		.val = 0x80},</div><div class='ctx'> 	{.opt = NULL}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-static struct options kval[] = {</div><div class='add'>+  static struct options kval[] = {</div><div class='ctx'> 	{.opt = "--return",	.val = 0x28},</div><div class='ctx'> 	{.opt = "--esc",	.val = 0x29},</div><div class='ctx'> 	{.opt = "--bckspc",	.val = 0x2a},</div><div class='hunk'>@@ -183,10 +188,10 @@ static struct options kval[] = {</div><div class='ctx'> 	{.opt = "--up",		.val = 0x52},</div><div class='ctx'> 	{.opt = "--num-lock",	.val = 0x53},</div><div class='ctx'> 	{.opt = NULL}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-int keyboard_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='del'>-{</div><div class='add'>+  int keyboard_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='add'>+  {</div><div class='ctx'> 	char *tok = strtok(buf, " ");</div><div class='ctx'> 	int key = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -229,17 +234,17 @@ int keyboard_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='ctx'> 			fprintf(stderr, "unknown option: %s\n", tok);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 8;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-static struct options mmod[] = {</div><div class='add'>+  static struct options mmod[] = {</div><div class='ctx'> 	{.opt = "--b1", .val = 0x01},</div><div class='ctx'> 	{.opt = "--b2", .val = 0x02},</div><div class='ctx'> 	{.opt = "--b3", .val = 0x04},</div><div class='ctx'> 	{.opt = NULL}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-int mouse_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='del'>-{</div><div class='add'>+  int mouse_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='add'>+  {</div><div class='ctx'> 	char *tok = strtok(buf, " ");</div><div class='ctx'> 	int mvt = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -274,9 +279,9 @@ int mouse_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='ctx'> 		fprintf(stderr, "unknown option: %s\n", tok);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 3;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-static struct options jmod[] = {</div><div class='add'>+  static struct options jmod[] = {</div><div class='ctx'> 	{.opt = "--b1",		.val = 0x10},</div><div class='ctx'> 	{.opt = "--b2",		.val = 0x20},</div><div class='ctx'> 	{.opt = "--b3",		.val = 0x40},</div><div class='hunk'>@@ -287,10 +292,10 @@ static struct options jmod[] = {</div><div class='ctx'> 	{.opt = "--hat4",	.val = 0x03},</div><div class='ctx'> 	{.opt = "--hatneutral",	.val = 0x04},</div><div class='ctx'> 	{.opt = NULL}</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='del'>-int joystick_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='del'>-{</div><div class='add'>+  int joystick_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='add'>+  {</div><div class='ctx'> 	char *tok = strtok(buf, " ");</div><div class='ctx'> 	int mvt = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -326,10 +331,10 @@ int joystick_fill_report(char report[8], char buf[BUF_LEN], int *hold)</div><div class='ctx'> 		fprintf(stderr, "unknown option: %s\n", tok);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 4;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-void print_options(char c)</div><div class='del'>-{</div><div class='add'>+  void print_options(char c)</div><div class='add'>+  {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (c == 'k') {</div><div class='hunk'>@@ -358,10 +363,10 @@ void print_options(char c)</div><div class='ctx'> 		       "		three signed numbers\n"</div><div class='ctx'> 		       "--quit to close\n");</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='del'>-int main(int argc, const char *argv[])</div><div class='del'>-{</div><div class='add'>+  int main(int argc, const char *argv[])</div><div class='add'>+  {</div><div class='ctx'> 	const char *filename = NULL;</div><div class='ctx'> 	int fd = 0;</div><div class='ctx'> 	char buf[BUF_LEN];</div><div class='hunk'>@@ -449,4 +454,4 @@ int main(int argc, const char *argv[])</div><div class='ctx'> </div><div class='ctx'> 	close(fd);</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='head'>diff --git a/Documentation/usb/gadget_multi.txt b/Documentation/usb/gadget_multi.txt<br/>index b3146dd7aa43..9806b55af301 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_multi.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_multi.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_multi.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/gadget_multi.txt</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='del'>-                                                             -*- org -*-</div><div class='add'>+==============================</div><div class='add'>+Multifunction Composite Gadget</div><div class='add'>+==============================</div><div class='ctx'> </div><div class='del'>-* Overview</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='ctx'> </div><div class='ctx'> The Multifunction Composite Gadget (or g_multi) is a composite gadget</div><div class='ctx'> that makes extensive use of the composite framework to provide</div><div class='hunk'>@@ -17,13 +20,15 @@ have two configurations -- one with RNDIS and another with CDC ECM[3].</div><div class='ctx'> Please note that if you use non-standard configuration (that is enable</div><div class='ctx'> CDC ECM) you may need to change vendor and/or product ID.</div><div class='ctx'> </div><div class='del'>-* Host drivers</div><div class='add'>+Host drivers</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'> To make use of the gadget one needs to make it work on host side --</div><div class='ctx'> without that there's no hope of achieving anything with the gadget.</div><div class='ctx'> As one might expect, things one need to do very from system to system.</div><div class='ctx'> </div><div class='del'>-** Linux host drivers</div><div class='add'>+Linux host drivers</div><div class='add'>+------------------</div><div class='ctx'> </div><div class='ctx'> Since the gadget uses standard composite framework and appears as such</div><div class='ctx'> to Linux host it does not need any additional drivers on Linux host</div><div class='hunk'>@@ -34,11 +39,13 @@ This is also true for two configuration set-up with RNDIS</div><div class='ctx'> configuration being the first one.  Linux host will use the second</div><div class='ctx'> configuration with CDC ECM which should work better under Linux.</div><div class='ctx'> </div><div class='del'>-** Windows host drivers</div><div class='add'>+Windows host drivers</div><div class='add'>+--------------------</div><div class='ctx'> </div><div class='ctx'> For the gadget to work under Windows two conditions have to be met:</div><div class='ctx'> </div><div class='del'>-*** Detecting as composite gadget</div><div class='add'>+Detecting as composite gadget</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> First of all, Windows need to detect the gadget as an USB composite</div><div class='ctx'> gadget which on its own have some conditions[4].  If they are met,</div><div class='hunk'>@@ -53,7 +60,8 @@ The only thing to worry is that the gadget has to have a single</div><div class='ctx'> configuration so a dual RNDIS and CDC ECM gadget won't work unless you</div><div class='ctx'> create a proper INF -- and of course, if you do submit it!</div><div class='ctx'> </div><div class='del'>-*** Installing drivers for each function</div><div class='add'>+Installing drivers for each function</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='ctx'> The other, trickier thing is making Windows install drivers for each</div><div class='ctx'> individual function.</div><div class='hunk'>@@ -63,7 +71,8 @@ implementing USB Mass Storage class and selects appropriate driver.</div><div class='ctx'> </div><div class='ctx'> Things are harder with RDNIS and CDC ACM.</div><div class='ctx'> </div><div class='del'>-**** RNDIS</div><div class='add'>+RNDIS</div><div class='add'>+.....</div><div class='ctx'> </div><div class='ctx'> To make Windows select RNDIS drivers for the first function in the</div><div class='ctx'> gadget, one needs to use the [[file:linux.inf]] file provided with this</div><div class='hunk'>@@ -75,11 +84,13 @@ RNDIS was not the first interface.  You do not need to worry abut it</div><div class='ctx'> unless you are trying to develop your own gadget in which case watch</div><div class='ctx'> out for this bug.</div><div class='ctx'> </div><div class='del'>-**** CDC ACM</div><div class='add'>+CDC ACM</div><div class='add'>+.......</div><div class='ctx'> </div><div class='ctx'> Similarly, [[file:linux-cdc-acm.inf]] is provided for CDC ACM.</div><div class='ctx'> </div><div class='del'>-**** Customising the gadget</div><div class='add'>+Customising the gadget</div><div class='add'>+......................</div><div class='ctx'> </div><div class='ctx'> If you intend to hack the g_multi gadget be advised that rearranging</div><div class='ctx'> functions will obviously change interface numbers for each of the</div><div class='hunk'>@@ -97,14 +108,16 @@ things don't work as intended before realising Windows have cached</div><div class='ctx'> some drivers information (changing USB port may sometimes help plus</div><div class='ctx'> you might try using USBDeview[8] to remove the phantom device).</div><div class='ctx'> </div><div class='del'>-**** INF testing</div><div class='add'>+INF testing</div><div class='add'>+...........</div><div class='ctx'> </div><div class='ctx'> Provided INF files have been tested on Windows XP SP3, Windows Vista</div><div class='ctx'> and Windows 7, all 32-bit versions.  It should work on 64-bit versions</div><div class='ctx'> as well.  It most likely won't work on Windows prior to Windows XP</div><div class='ctx'> SP2.</div><div class='ctx'> </div><div class='del'>-** Other systems</div><div class='add'>+Other systems</div><div class='add'>+-------------</div><div class='ctx'> </div><div class='ctx'> At this moment, drivers for any other systems have not been tested.</div><div class='ctx'> Knowing how MacOS is based on BSD and BSD is an Open Source it is</div><div class='hunk'>@@ -115,7 +128,8 @@ For more exotic systems I have even less to say...</div><div class='ctx'> </div><div class='ctx'> Any testing and drivers *are* *welcome*!</div><div class='ctx'> </div><div class='del'>-* Authors</div><div class='add'>+Authors</div><div class='add'>+=======</div><div class='ctx'> </div><div class='ctx'> This document has been written by Michal Nazarewicz</div><div class='ctx'> ([[mailto:mina86@mina86.com]]).  INF files have been hacked with</div><div class='hunk'>@@ -124,7 +138,8 @@ Xiaofan Chen ([[mailto:xiaofanc@gmail.com]]) basing on the MS RNDIS</div><div class='ctx'> template[9], Microchip's CDC ACM INF file and David Brownell's</div><div class='ctx'> ([[mailto:dbrownell@users.sourceforge.net]]) original INF files.</div><div class='ctx'> </div><div class='del'>-* Footnotes</div><div class='add'>+Footnotes</div><div class='add'>+=========</div><div class='ctx'> </div><div class='ctx'> [1] Remote Network Driver Interface Specification,</div><div class='ctx'> [[http://msdn.microsoft.com/en-us/library/ee484414.aspx]].</div><div class='head'>diff --git a/Documentation/usb/gadget_printer.txt b/Documentation/usb/gadget_printer.txt<br/>index ad995bf0db41..5e5516c69075 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_printer.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_printer.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_printer.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/gadget_printer.txt</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='add'>+===============================</div><div class='add'>+Linux USB Printer Gadget Driver</div><div class='add'>+===============================</div><div class='ctx'> </div><div class='del'>-                       Linux USB Printer Gadget Driver</div><div class='del'>-                                 06/04/2007</div><div class='add'>+06/04/2007</div><div class='ctx'> </div><div class='del'>-              Copyright (C) 2007 Craig W. Nadler &lt;craig@nadler.us&gt;</div><div class='add'>+Copyright (C) 2007 Craig W. Nadler &lt;craig@nadler.us&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-GENERAL</div><div class='add'>+General</div><div class='ctx'> =======</div><div class='ctx'> </div><div class='ctx'> This driver may be used if you are writing printer firmware using Linux as</div><div class='hunk'>@@ -29,52 +31,60 @@ user space firmware can read or write this status byte using a device file</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-HOWTO USE THIS DRIVER</div><div class='add'>+Howto Use This Driver</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='ctx'> To load the USB device controller driver and the printer gadget driver. The</div><div class='del'>-following example uses the Netchip 2280 USB device controller driver:</div><div class='add'>+following example uses the Netchip 2280 USB device controller driver::</div><div class='ctx'> </div><div class='del'>-modprobe net2280</div><div class='del'>-modprobe g_printer</div><div class='add'>+	modprobe net2280</div><div class='add'>+	modprobe g_printer</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> The follow command line parameter can be used when loading the printer gadget</div><div class='ctx'> (ex: modprobe g_printer idVendor=0x0525 idProduct=0xa4a8 ):</div><div class='ctx'> </div><div class='del'>-idVendor - This is the Vendor ID used in the device descriptor. The default is</div><div class='add'>+idVendor</div><div class='add'>+	This is the Vendor ID used in the device descriptor. The default is</div><div class='ctx'> 	the Netchip vendor id 0x0525. YOU MUST CHANGE TO YOUR OWN VENDOR ID</div><div class='ctx'> 	BEFORE RELEASING A PRODUCT. If you plan to release a product and don't</div><div class='ctx'> 	already have a Vendor ID please see www.usb.org for details on how to</div><div class='ctx'> 	get one.</div><div class='ctx'> </div><div class='del'>-idProduct - This is the Product ID used in the device descriptor. The default</div><div class='add'>+idProduct</div><div class='add'>+	This is the Product ID used in the device descriptor. The default</div><div class='ctx'> 	is 0xa4a8, you should change this to an ID that's not used by any of</div><div class='ctx'> 	your other USB products if you have any. It would be a good idea to</div><div class='ctx'> 	start numbering your products starting with say 0x0001.</div><div class='ctx'> </div><div class='del'>-bcdDevice - This is the version number of your product. It would be a good idea</div><div class='add'>+bcdDevice</div><div class='add'>+	This is the version number of your product. It would be a good idea</div><div class='ctx'> 	to put your firmware version here.</div><div class='ctx'> </div><div class='del'>-iManufacturer - A string containing the name of the Vendor.</div><div class='add'>+iManufacturer</div><div class='add'>+	A string containing the name of the Vendor.</div><div class='ctx'> </div><div class='del'>-iProduct - A string containing the Product Name.</div><div class='add'>+iProduct</div><div class='add'>+	A string containing the Product Name.</div><div class='ctx'> </div><div class='del'>-iSerialNum - A string containing the Serial Number. This should be changed for</div><div class='add'>+iSerialNum</div><div class='add'>+	A string containing the Serial Number. This should be changed for</div><div class='ctx'> 	each unit of your product.</div><div class='ctx'> </div><div class='del'>-iPNPstring -  The PNP ID string used for this printer. You will want to set</div><div class='add'>+iPNPstring</div><div class='add'>+	The PNP ID string used for this printer. You will want to set</div><div class='ctx'> 	either on the command line or hard code the PNP ID string used for</div><div class='ctx'> 	your printer product.</div><div class='ctx'> </div><div class='del'>-qlen - The number of 8k buffers to use per endpoint. The default is 10, you</div><div class='add'>+qlen</div><div class='add'>+	The number of 8k buffers to use per endpoint. The default is 10, you</div><div class='ctx'> 	should tune this for your product. You may also want to tune the</div><div class='ctx'> 	size of each buffer for your product.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-USING THE EXAMPLE CODE</div><div class='add'>+Using The Example Code</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> This example code talks to stdout, instead of a print engine.</div><div class='hunk'>@@ -82,22 +92,23 @@ This example code talks to stdout, instead of a print engine.</div><div class='ctx'> To compile the test code below:</div><div class='ctx'> </div><div class='ctx'> 1) save it to a file called prn_example.c</div><div class='del'>-2) compile the code with the follow command:</div><div class='add'>+2) compile the code with the follow command::</div><div class='add'>+</div><div class='ctx'> 	 gcc prn_example.c -o prn_example</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To read printer data from the host to stdout:</div><div class='add'>+To read printer data from the host to stdout::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -read_data</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To write printer data from a file (data_file) to the host:</div><div class='add'>+To write printer data from a file (data_file) to the host::</div><div class='ctx'> </div><div class='ctx'> 	# cat data_file | prn_example -write_data</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To get the current printer status for the gadget driver:</div><div class='add'>+To get the current printer status for the gadget driver:::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -get_status</div><div class='ctx'> </div><div class='hunk'>@@ -107,60 +118,62 @@ To get the current printer status for the gadget driver:</div><div class='ctx'> 	     Printer OK</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To set printer to Selected/On-line:</div><div class='add'>+To set printer to Selected/On-line::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -selected</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To set printer to Not Selected/Off-line:</div><div class='add'>+To set printer to Not Selected/Off-line::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -not_selected</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To set paper status to paper out:</div><div class='add'>+To set paper status to paper out::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -paper_out</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To set paper status to paper loaded:</div><div class='add'>+To set paper status to paper loaded::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -paper_loaded</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To set error status to printer OK:</div><div class='add'>+To set error status to printer OK::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -no_error</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-To set error status to ERROR:</div><div class='add'>+To set error status to ERROR::</div><div class='ctx'> </div><div class='ctx'> 	# prn_example -error</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXAMPLE CODE</div><div class='add'>+Example Code</div><div class='ctx'> ============</div><div class='ctx'> </div><div class='add'>+::</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;linux/usb/g_printer.h&gt;</div><div class='add'>+  #include &lt;stdio.h&gt;</div><div class='add'>+  #include &lt;stdlib.h&gt;</div><div class='add'>+  #include &lt;fcntl.h&gt;</div><div class='add'>+  #include &lt;linux/poll.h&gt;</div><div class='add'>+  #include &lt;sys/ioctl.h&gt;</div><div class='add'>+  #include &lt;linux/usb/g_printer.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PRINTER_FILE			"/dev/g_printer"</div><div class='del'>-#define BUF_SIZE			512</div><div class='add'>+  #define PRINTER_FILE			"/dev/g_printer"</div><div class='add'>+  #define BUF_SIZE			512</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 'usage()' - Show program usage.</div><div class='del'>- */</div><div class='add'>+  /*</div><div class='add'>+   * 'usage()' - Show program usage.</div><div class='add'>+   */</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-usage(const char *option)		/* I - Option string or NULL */</div><div class='del'>-{</div><div class='add'>+  static void</div><div class='add'>+  usage(const char *option)		/* I - Option string or NULL */</div><div class='add'>+  {</div><div class='ctx'> 	if (option) {</div><div class='ctx'> 		fprintf(stderr,"prn_example: Unknown option \"%s\"!\n",</div><div class='ctx'> 				option);</div><div class='hunk'>@@ -186,12 +199,12 @@ usage(const char *option)		/* I - Option string or NULL */</div><div class='ctx'> 	fputs("\n\n", stderr);</div><div class='ctx'> </div><div class='ctx'> 	exit(1);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-read_printer_data()</div><div class='del'>-{</div><div class='add'>+  static int</div><div class='add'>+  read_printer_data()</div><div class='add'>+  {</div><div class='ctx'> 	struct pollfd	fd[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Open device file for printer gadget. */</div><div class='hunk'>@@ -236,12 +249,12 @@ read_printer_data()</div><div class='ctx'> 	close(fd[0].fd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-write_printer_data()</div><div class='del'>-{</div><div class='add'>+  static int</div><div class='add'>+  write_printer_data()</div><div class='add'>+  {</div><div class='ctx'> 	struct pollfd	fd[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Open device file for printer gadget. */</div><div class='hunk'>@@ -295,12 +308,12 @@ write_printer_data()</div><div class='ctx'> 	close(fd[0].fd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-read_NB_printer_data()</div><div class='del'>-{</div><div class='add'>+  static int</div><div class='add'>+  read_NB_printer_data()</div><div class='add'>+  {</div><div class='ctx'> 	int		fd;</div><div class='ctx'> 	static char	buf[BUF_SIZE];</div><div class='ctx'> 	int		bytes_read;</div><div class='hunk'>@@ -329,12 +342,12 @@ read_NB_printer_data()</div><div class='ctx'> 	close(fd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-get_printer_status()</div><div class='del'>-{</div><div class='add'>+  static int</div><div class='add'>+  get_printer_status()</div><div class='add'>+  {</div><div class='ctx'> 	int	retval;</div><div class='ctx'> 	int	fd;</div><div class='ctx'> </div><div class='hunk'>@@ -357,12 +370,12 @@ get_printer_status()</div><div class='ctx'> 	close(fd);</div><div class='ctx'> </div><div class='ctx'> 	return(retval);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-set_printer_status(unsigned char buf, int clear_printer_status_bit)</div><div class='del'>-{</div><div class='add'>+  static int</div><div class='add'>+  set_printer_status(unsigned char buf, int clear_printer_status_bit)</div><div class='add'>+  {</div><div class='ctx'> 	int	retval;</div><div class='ctx'> 	int	fd;</div><div class='ctx'> </div><div class='hunk'>@@ -397,12 +410,12 @@ set_printer_status(unsigned char buf, int clear_printer_status_bit)</div><div class='ctx'> 	close(fd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-display_printer_status()</div><div class='del'>-{</div><div class='add'>+  static int</div><div class='add'>+  display_printer_status()</div><div class='add'>+  {</div><div class='ctx'> 	char	printer_status;</div><div class='ctx'> </div><div class='ctx'> 	printer_status = get_printer_status();</div><div class='hunk'>@@ -429,12 +442,12 @@ display_printer_status()</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return(0);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-main(int  argc, char *argv[])</div><div class='del'>-{</div><div class='add'>+  int</div><div class='add'>+  main(int  argc, char *argv[])</div><div class='add'>+  {</div><div class='ctx'> 	int	i;		/* Looping var */</div><div class='ctx'> 	int	retval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -507,4 +520,4 @@ main(int  argc, char *argv[])</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	exit(retval);</div><div class='del'>-}</div><div class='add'>+  }</div><div class='head'>diff --git a/Documentation/usb/gadget_serial.txt b/Documentation/usb/gadget_serial.txt<br/>index d1def3186782..dce8bc1fb1f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_serial.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/gadget_serial.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/gadget_serial.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/gadget_serial.txt</a></div><div class='hunk'>@@ -1,7 +1,10 @@</div><div class='add'>+===============================</div><div class='add'>+Linux Gadget Serial Driver v2.0</div><div class='add'>+===============================</div><div class='ctx'> </div><div class='del'>-                 Linux Gadget Serial Driver v2.0</div><div class='del'>-                           11/20/2004</div><div class='del'>-                  (updated 8-May-2008 for v2.3)</div><div class='add'>+11/20/2004</div><div class='add'>+</div><div class='add'>+(updated 8-May-2008 for v2.3)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> License and Disclaimer</div><div class='hunk'>@@ -56,7 +59,7 @@ hardware; for example, a PDA, an embedded Linux system, or a PC</div><div class='ctx'> with a USB development card.</div><div class='ctx'> </div><div class='ctx'> The gadget serial driver talks over USB to either a CDC ACM driver</div><div class='del'>-or a generic USB serial driver running on a host PC.</div><div class='add'>+or a generic USB serial driver running on a host PC::</div><div class='ctx'> </div><div class='ctx'>    Host</div><div class='ctx'>    --------------------------------------</div><div class='hunk'>@@ -112,11 +115,11 @@ configuring the kernel.  Then rebuild and install the kernel or</div><div class='ctx'> modules.</div><div class='ctx'> </div><div class='ctx'> Then you must load the gadget serial driver.  To load it as an</div><div class='del'>-ACM device (recommended for interoperability), do this:</div><div class='add'>+ACM device (recommended for interoperability), do this::</div><div class='ctx'> </div><div class='ctx'>   modprobe g_serial</div><div class='ctx'> </div><div class='del'>-To load it as a vendor specific bulk in/out device, do this:</div><div class='add'>+To load it as a vendor specific bulk in/out device, do this::</div><div class='ctx'> </div><div class='ctx'>   modprobe g_serial use_acm=0</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +130,7 @@ desired.</div><div class='ctx'> </div><div class='ctx'> Your system should use mdev (from busybox) or udev to make the</div><div class='ctx'> device nodes.  After this gadget driver has been set up you should</div><div class='del'>-then see a /dev/ttyGS0 node:</div><div class='add'>+then see a /dev/ttyGS0 node::</div><div class='ctx'> </div><div class='ctx'>   # ls -l /dev/ttyGS0 | cat</div><div class='ctx'>   crw-rw----    1 root     root     253,   0 May  8 14:10 /dev/ttyGS0</div><div class='hunk'>@@ -187,24 +190,24 @@ support".</div><div class='ctx'> </div><div class='ctx'> Once the gadget serial driver is loaded and the USB device connected</div><div class='ctx'> to the Linux host with a USB cable, the host system should recognize</div><div class='del'>-the gadget serial device.  For example, the command</div><div class='add'>+the gadget serial device.  For example, the command::</div><div class='ctx'> </div><div class='ctx'>   cat /sys/kernel/debug/usb/devices</div><div class='ctx'> </div><div class='del'>-should show something like this:</div><div class='del'>-</div><div class='del'>-T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  5 Spd=480 MxCh= 0</div><div class='del'>-D:  Ver= 2.00 Cls=02(comm.) Sub=00 Prot=00 MxPS=64 #Cfgs=  1</div><div class='del'>-P:  Vendor=0525 ProdID=a4a7 Rev= 2.01</div><div class='del'>-S:  Manufacturer=Linux 2.6.8.1 with net2280</div><div class='del'>-S:  Product=Gadget Serial</div><div class='del'>-S:  SerialNumber=0</div><div class='del'>-C:* #Ifs= 2 Cfg#= 2 Atr=c0 MxPwr=  2mA</div><div class='del'>-I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm</div><div class='del'>-E:  Ad=83(I) Atr=03(Int.) MxPS=   8 Ivl=32ms</div><div class='del'>-I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm</div><div class='del'>-E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='del'>-E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='add'>+should show something like this:::</div><div class='add'>+</div><div class='add'>+  T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  5 Spd=480 MxCh= 0</div><div class='add'>+  D:  Ver= 2.00 Cls=02(comm.) Sub=00 Prot=00 MxPS=64 #Cfgs=  1</div><div class='add'>+  P:  Vendor=0525 ProdID=a4a7 Rev= 2.01</div><div class='add'>+  S:  Manufacturer=Linux 2.6.8.1 with net2280</div><div class='add'>+  S:  Product=Gadget Serial</div><div class='add'>+  S:  SerialNumber=0</div><div class='add'>+  C:* #Ifs= 2 Cfg#= 2 Atr=c0 MxPwr=  2mA</div><div class='add'>+  I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm</div><div class='add'>+  E:  Ad=83(I) Atr=03(Int.) MxPS=   8 Ivl=32ms</div><div class='add'>+  I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm</div><div class='add'>+  E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='add'>+  E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='ctx'> </div><div class='ctx'> If the host side Linux system is configured properly, the ACM driver</div><div class='ctx'> should be loaded automatically.  The command "lsmod" should show the</div><div class='hunk'>@@ -219,29 +222,29 @@ Serial Converter support", and for the "USB Generic Serial Driver".</div><div class='ctx'> </div><div class='ctx'> Once the gadget serial driver is loaded and the USB device connected</div><div class='ctx'> to the Linux host with a USB cable, the host system should recognize</div><div class='del'>-the gadget serial device.  For example, the command</div><div class='add'>+the gadget serial device.  For example, the command::</div><div class='ctx'> </div><div class='ctx'>   cat /sys/kernel/debug/usb/devices</div><div class='ctx'> </div><div class='del'>-should show something like this:</div><div class='add'>+should show something like this:::</div><div class='ctx'> </div><div class='del'>-T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  6 Spd=480 MxCh= 0</div><div class='del'>-D:  Ver= 2.00 Cls=ff(vend.) Sub=00 Prot=00 MxPS=64 #Cfgs=  1</div><div class='del'>-P:  Vendor=0525 ProdID=a4a6 Rev= 2.01</div><div class='del'>-S:  Manufacturer=Linux 2.6.8.1 with net2280</div><div class='del'>-S:  Product=Gadget Serial</div><div class='del'>-S:  SerialNumber=0</div><div class='del'>-C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=  2mA</div><div class='del'>-I:  If#= 0 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=serial</div><div class='del'>-E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='del'>-E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='add'>+  T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  6 Spd=480 MxCh= 0</div><div class='add'>+  D:  Ver= 2.00 Cls=ff(vend.) Sub=00 Prot=00 MxPS=64 #Cfgs=  1</div><div class='add'>+  P:  Vendor=0525 ProdID=a4a6 Rev= 2.01</div><div class='add'>+  S:  Manufacturer=Linux 2.6.8.1 with net2280</div><div class='add'>+  S:  Product=Gadget Serial</div><div class='add'>+  S:  SerialNumber=0</div><div class='add'>+  C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=  2mA</div><div class='add'>+  I:  If#= 0 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=serial</div><div class='add'>+  E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='add'>+  E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms</div><div class='ctx'> </div><div class='ctx'> You must load the usbserial driver and explicitly set its parameters</div><div class='del'>-to configure it to recognize the gadget serial device, like this:</div><div class='add'>+to configure it to recognize the gadget serial device, like this::</div><div class='ctx'> </div><div class='ctx'>   echo 0x0525 0xA4A6 &gt;/sys/bus/usb-serial/drivers/generic/new_id</div><div class='ctx'> </div><div class='del'>-The legacy way is to use module parameters:</div><div class='add'>+The legacy way is to use module parameters::</div><div class='ctx'> </div><div class='ctx'>   modprobe usbserial vendor=0x0525 product=0xA4A6</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/usb/iuu_phoenix.txt b/Documentation/usb/iuu_phoenix.txt<br/>index e5f048067da4..b76268728450 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/iuu_phoenix.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/iuu_phoenix.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/iuu_phoenix.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/iuu_phoenix.txt</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='add'>+=============================</div><div class='ctx'> Infinity Usb Unlimited Readme</div><div class='del'>------------------------------</div><div class='add'>+=============================</div><div class='ctx'> </div><div class='ctx'> Hi all,</div><div class='ctx'> </div><div class='hunk'>@@ -19,7 +20,8 @@ have his own device file(/dev/ttyUSB0,/dev/ttyUSB1,...)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-How to tune the reader speed ?</div><div class='add'>+How to tune the reader speed?</div><div class='add'>+=============================</div><div class='ctx'> </div><div class='ctx'>  A few parameters can be used at load time</div><div class='ctx'>  To use parameters, just unload the module if it is</div><div class='hunk'>@@ -27,26 +29,33 @@ How to tune the reader speed ?</div><div class='ctx'>  In case of prebuilt module, use the command</div><div class='ctx'>  insmod iuu_phoenix param=value.</div><div class='ctx'> </div><div class='del'>- Example:</div><div class='add'>+ Example::</div><div class='ctx'> </div><div class='del'>- modprobe iuu_phoenix clockmode=3</div><div class='add'>+	modprobe iuu_phoenix clockmode=3</div><div class='ctx'> </div><div class='ctx'>  The parameters are:</div><div class='ctx'> </div><div class='del'>- parm:           clockmode:1=3Mhz579,2=3Mhz680,3=6Mhz (int)</div><div class='del'>- parm:           boost:overclock boost percent 100 to 500 (int)</div><div class='del'>- parm:           cdmode:Card detect mode 0=none, 1=CD, 2=!CD, 3=DSR, 4=!DSR, 5=CTS, 6=!CTS, 7=RING, 8=!RING (int)</div><div class='del'>- parm:           xmas:xmas color enabled or not (bool)</div><div class='del'>- parm:           debug:Debug enabled or not (bool)</div><div class='add'>+clockmode:</div><div class='add'>+	1=3Mhz579,2=3Mhz680,3=6Mhz (int)</div><div class='add'>+boost:</div><div class='add'>+	overclock boost percent 100 to 500 (int)</div><div class='add'>+cdmode:</div><div class='add'>+	Card detect mode</div><div class='add'>+	0=none, 1=CD, 2=!CD, 3=DSR, 4=!DSR, 5=CTS, 6=!CTS, 7=RING, 8=!RING (int)</div><div class='add'>+xmas:</div><div class='add'>+	xmas color enabled or not (bool)</div><div class='add'>+debug:</div><div class='add'>+	Debug enabled or not (bool)</div><div class='ctx'> </div><div class='ctx'> -  clockmode will provide 3 different base settings commonly adopted by</div><div class='ctx'>    different software:</div><div class='del'>- 	1. 3Mhz579</div><div class='add'>+</div><div class='add'>+	1. 3Mhz579</div><div class='ctx'> 	2. 3Mhz680</div><div class='ctx'> 	3. 6Mhz</div><div class='ctx'> </div><div class='ctx'> -  boost provide a way to overclock the reader ( my favorite :-)  )</div><div class='del'>-   For example to have best performance than a simple clockmode=3, try this:</div><div class='add'>+   For example to have best performance than a simple clockmode=3, try this::</div><div class='ctx'> </div><div class='ctx'>       modprobe boost=195</div><div class='ctx'> </div><div class='hunk'>@@ -66,7 +75,8 @@ How to tune the reader speed ?</div><div class='ctx'> -  debug will produce a lot of debugging messages...</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>- Last notes:</div><div class='add'>+Last notes</div><div class='add'>+==========</div><div class='ctx'> </div><div class='ctx'>  Don't worry about the serial settings, the serial emulation</div><div class='ctx'>  is an abstraction, so use any speed or parity setting will</div><div class='head'>diff --git a/Documentation/usb/mass-storage.txt b/Documentation/usb/mass-storage.txt<br/>index e89803a5a960..d181b47c3cb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/mass-storage.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/mass-storage.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/mass-storage.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/mass-storage.txt</a></div><div class='hunk'>@@ -1,4 +1,9 @@</div><div class='del'>-* Overview</div><div class='add'>+=========================</div><div class='add'>+Mass Storage Gadget (MSG)</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='ctx'> </div><div class='ctx'>   Mass Storage Gadget (or MSG) acts as a USB Mass Storage device,</div><div class='ctx'>   appearing to the host as a disk or a CD-ROM drive.  It supports</div><div class='hunk'>@@ -24,7 +29,8 @@</div><div class='ctx'>   (which is no longer included in Linux).  It will talk only briefly</div><div class='ctx'>   about how to use MSF within composite gadgets.</div><div class='ctx'> </div><div class='del'>-* Module parameters</div><div class='add'>+Module parameters</div><div class='add'>+=================</div><div class='ctx'> </div><div class='ctx'>   The mass storage gadget accepts the following mass storage specific</div><div class='ctx'>   module parameters:</div><div class='hunk'>@@ -146,7 +152,8 @@</div><div class='ctx'>   - iProduct      -- USB Product string (string)</div><div class='ctx'>   - iSerialNumber -- SerialNumber string (sting)</div><div class='ctx'> </div><div class='del'>-* sysfs entries</div><div class='add'>+sysfs entries</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'>   For each logical unit, the gadget creates a directory in the sysfs</div><div class='ctx'>   hierarchy.  Inside of it the following three files are created:</div><div class='hunk'>@@ -177,7 +184,8 @@</div><div class='ctx'>   Other then those, as usual, the values of module parameters can be</div><div class='ctx'>   read from /sys/module/g_mass_storage/parameters/* files.</div><div class='ctx'> </div><div class='del'>-* Other gadgets using mass storage function</div><div class='add'>+Other gadgets using mass storage function</div><div class='add'>+=========================================</div><div class='ctx'> </div><div class='ctx'>   The Mass Storage Gadget uses the Mass Storage Function to handle</div><div class='ctx'>   mass storage protocol.  As a composite function, MSF may be used by</div><div class='hunk'>@@ -193,7 +201,8 @@</div><div class='ctx'>   may take a look at mass_storage.c, acm_ms.c and multi.c (sorted by</div><div class='ctx'>   complexity).</div><div class='ctx'> </div><div class='del'>-* Relation to file storage gadget</div><div class='add'>+Relation to file storage gadget</div><div class='add'>+===============================</div><div class='ctx'> </div><div class='ctx'>   The Mass Storage Function and thus the Mass Storage Gadget has been</div><div class='ctx'>   based on the File Storage Gadget.  The difference between the two is</div><div class='head'>diff --git a/Documentation/usb/misc_usbsevseg.txt b/Documentation/usb/misc_usbsevseg.txt<br/>index 0f6be4f9930b..6274aee083ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/misc_usbsevseg.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/misc_usbsevseg.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/misc_usbsevseg.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/misc_usbsevseg.txt</a></div><div class='hunk'>@@ -1,4 +1,7 @@</div><div class='add'>+=============================</div><div class='ctx'> USB 7-Segment Numeric Display</div><div class='add'>+=============================</div><div class='add'>+</div><div class='ctx'> Manufactured by Delcom Engineering</div><div class='ctx'> </div><div class='ctx'> Device Information</div><div class='hunk'>@@ -13,9 +16,13 @@ Device Modes</div><div class='ctx'> ------------</div><div class='ctx'> By default, the driver assumes the display is only 6 characters</div><div class='ctx'> The mode for 6 characters is:</div><div class='add'>+</div><div class='ctx'> 	MSB 0x06; LSB 0x3f</div><div class='add'>+</div><div class='ctx'> For the 8 character display:</div><div class='add'>+</div><div class='ctx'> 	MSB 0x08; LSB 0xff</div><div class='add'>+</div><div class='ctx'> The device can accept "text" either in raw, hex, or ascii textmode.</div><div class='ctx'> raw controls each segment manually,</div><div class='ctx'> hex expects a value between 0-15 per character,</div><div class='hunk'>@@ -42,5 +49,3 @@ Device Operation</div><div class='ctx'> 	To set multiple decimals points sum up each power.</div><div class='ctx'> 	For example, to set the 0th and 3rd decimal place</div><div class='ctx'> 	echo 1001 &gt; /sys/bus/usb/.../decimals</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/usb/mtouchusb.txt b/Documentation/usb/mtouchusb.txt<br/>index a91adb26ea7b..d1111b74bf75 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/mtouchusb.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/mtouchusb.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/mtouchusb.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/mtouchusb.txt</a></div><div class='hunk'>@@ -1,19 +1,27 @@</div><div class='del'>-CHANGES</div><div class='add'>+================</div><div class='add'>+mtouchusb driver</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+Changes</div><div class='add'>+=======</div><div class='ctx'> </div><div class='ctx'> - 0.3 - Created based off of scanner &amp; INSTALL from the original touchscreen</div><div class='ctx'>   driver on freecode (http://freecode.com/projects/3mtouchscreendriver)</div><div class='ctx'> - Amended for linux-2.4.18, then 2.4.19</div><div class='ctx'> </div><div class='ctx'> - 0.5 - Complete rewrite using Linux Input in 2.6.3</div><div class='del'>-   Unfortunately no calibration support at this time</div><div class='add'>+  Unfortunately no calibration support at this time</div><div class='ctx'> </div><div class='ctx'> - 1.4 - Multiple changes to support the EXII 5000UC and house cleaning</div><div class='del'>-   Changed reset from standard USB dev reset to vendor reset</div><div class='del'>-   Changed data sent to host from compensated to raw coordinates</div><div class='del'>-   Eliminated vendor/product module params</div><div class='del'>-   Performed multiple successful tests with an EXII-5010UC</div><div class='add'>+  Changed reset from standard USB dev reset to vendor reset</div><div class='add'>+  Changed data sent to host from compensated to raw coordinates</div><div class='add'>+  Eliminated vendor/product module params</div><div class='add'>+  Performed multiple successful tests with an EXII-5010UC</div><div class='add'>+</div><div class='add'>+Supported Hardware</div><div class='add'>+==================</div><div class='ctx'> </div><div class='del'>-SUPPORTED HARDWARE:</div><div class='add'>+::</div><div class='ctx'> </div><div class='ctx'>         All controllers have the Vendor: 0x0596 &amp; Product: 0x0001</div><div class='ctx'> </div><div class='hunk'>@@ -29,9 +37,10 @@ SUPPORTED HARDWARE:</div><div class='ctx'>         USB Capacitive - Black Case     EXII-5030UC</div><div class='ctx'>         USB Capacitive - No Case        EXII-5050UC</div><div class='ctx'> </div><div class='del'>-DRIVER NOTES:</div><div class='add'>+Driver Notes</div><div class='add'>+============</div><div class='ctx'> </div><div class='del'>-Installation is simple, you only need to add Linux Input, Linux USB, and the </div><div class='add'>+Installation is simple, you only need to add Linux Input, Linux USB, and the</div><div class='ctx'> driver to the kernel.  The driver can also be optionally built as a module.</div><div class='ctx'> </div><div class='ctx'> This driver appears to be one of possible 2 Linux USB Input Touchscreen</div><div class='hunk'>@@ -49,24 +58,27 @@ The controller screen resolution is now 0 to 16384 for both X and Y reporting</div><div class='ctx'> the raw touch data.  This is the same for the old and new capacitive USB</div><div class='ctx'> controllers.</div><div class='ctx'> </div><div class='del'>-Perhaps at some point an abstract function will be placed into evdev so </div><div class='del'>-generic functions like calibrations, resets, and vendor information can be </div><div class='add'>+Perhaps at some point an abstract function will be placed into evdev so</div><div class='add'>+generic functions like calibrations, resets, and vendor information can be</div><div class='ctx'> requested from the userspace (And the drivers would handle the vendor specific</div><div class='ctx'> tasks).</div><div class='ctx'> </div><div class='del'>-TODO:</div><div class='add'>+TODO</div><div class='add'>+====</div><div class='ctx'> </div><div class='ctx'> Implement a control urb again to handle requests to and from the device</div><div class='ctx'> such as calibration, etc once/if it becomes available.</div><div class='ctx'> </div><div class='del'>-DISCLAIMER:</div><div class='add'>+Disclaimer</div><div class='add'>+==========</div><div class='ctx'> </div><div class='del'>-I am not a MicroTouch/3M employee, nor have I ever been.  3M does not support </div><div class='add'>+I am not a MicroTouch/3M employee, nor have I ever been.  3M does not support</div><div class='ctx'> this driver!  If you want touch drivers only supported within X, please go to:</div><div class='ctx'> </div><div class='ctx'> http://www.3m.com/3MTouchSystems/</div><div class='ctx'> </div><div class='del'>-THANKS:</div><div class='add'>+Thanks</div><div class='add'>+======</div><div class='ctx'> </div><div class='ctx'> A huge thank you to 3M Touch Systems for the EXII-5010UC controllers for</div><div class='ctx'> testing!</div><div class='head'>diff --git a/Documentation/usb/ohci.txt b/Documentation/usb/ohci.txt<br/>index 99320d9fa523..bb3c49719e6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/ohci.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/ohci.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/ohci.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/ohci.txt</a></div><div class='hunk'>@@ -1,3 +1,7 @@</div><div class='add'>+====</div><div class='add'>+OHCI</div><div class='add'>+====</div><div class='add'>+</div><div class='ctx'> 23-Aug-2002</div><div class='ctx'> </div><div class='ctx'> The "ohci-hcd" driver is a USB Host Controller Driver (HCD) that is derived</div><div class='hunk'>@@ -29,4 +33,3 @@ work on while the OS is getting around to the relevant IRQ processing.</div><div class='ctx'> </div><div class='ctx'> - David Brownell</div><div class='ctx'>   &lt;dbrownell@users.sourceforge.net&gt;</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/usb/rio.txt b/Documentation/usb/rio.txt<br/>index aee715af7db7..ca9adcf56355 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/rio.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/rio.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/rio.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/rio.txt</a></div><div class='hunk'>@@ -1,72 +1,80 @@</div><div class='add'>+============</div><div class='add'>+Diamonds Rio</div><div class='add'>+============</div><div class='add'>+</div><div class='ctx'> Copyright (C) 1999, 2000 Bruce Tenison</div><div class='add'>+</div><div class='ctx'> Portions Copyright (C) 1999, 2000 David Nelson</div><div class='add'>+</div><div class='ctx'> Thanks to David Nelson for guidance and the usage of the scanner.txt</div><div class='ctx'> and scanner.c files to model our driver and this informative file.</div><div class='ctx'> </div><div class='ctx'> Mar. 2, 2000</div><div class='ctx'> </div><div class='del'>-CHANGES</div><div class='add'>+Changes</div><div class='add'>+=======</div><div class='ctx'> </div><div class='ctx'> - Initial Revision</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-OVERVIEW</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='ctx'> </div><div class='ctx'> This README will address issues regarding how to configure the kernel</div><div class='del'>-to access a RIO 500 mp3 player.  </div><div class='add'>+to access a RIO 500 mp3 player.</div><div class='ctx'> Before I explain how to use this to access the Rio500 please be warned:</div><div class='ctx'> </div><div class='del'>-W A R N I N G:</div><div class='del'>---------------</div><div class='add'>+.. warning::</div><div class='ctx'> </div><div class='del'>-Please note that this software is still under development.  The authors</div><div class='del'>-are in no way responsible for any damage that may occur, no matter how</div><div class='del'>-inconsequential.</div><div class='add'>+   Please note that this software is still under development.  The authors</div><div class='add'>+   are in no way responsible for any damage that may occur, no matter how</div><div class='add'>+   inconsequential.</div><div class='ctx'> </div><div class='ctx'> It seems that the Rio has a problem when sending .mp3 with low batteries.</div><div class='ctx'> I suggest when the batteries are low and you want to transfer stuff that you</div><div class='ctx'> replace it with a fresh one. In my case, what happened is I lost two 16kb</div><div class='ctx'> blocks (they are no longer usable to store information to it). But I don't</div><div class='del'>-know if that's normal or not; it could simply be a problem with the flash </div><div class='add'>+know if that's normal or not; it could simply be a problem with the flash</div><div class='ctx'> memory.</div><div class='ctx'> </div><div class='del'>-In an extreme case, I left my Rio playing overnight and the batteries wore </div><div class='del'>-down to nothing and appear to have corrupted the flash memory. My RIO </div><div class='del'>-needed to be replaced as a result.  Diamond tech support is aware of the </div><div class='del'>-problem.  Do NOT allow your batteries to wear down to nothing before </div><div class='del'>-changing them.  It appears RIO 500 firmware does not handle low battery </div><div class='del'>-power well at all. </div><div class='add'>+In an extreme case, I left my Rio playing overnight and the batteries wore</div><div class='add'>+down to nothing and appear to have corrupted the flash memory. My RIO</div><div class='add'>+needed to be replaced as a result.  Diamond tech support is aware of the</div><div class='add'>+problem.  Do NOT allow your batteries to wear down to nothing before</div><div class='add'>+changing them.  It appears RIO 500 firmware does not handle low battery</div><div class='add'>+power well at all.</div><div class='ctx'> </div><div class='del'>-On systems with OHCI controllers, the kernel OHCI code appears to have </div><div class='del'>-power on problems with some chipsets.  If you are having problems </div><div class='del'>-connecting to your RIO 500, try turning it on first and then plugging it </div><div class='del'>-into the USB cable.  </div><div class='add'>+On systems with OHCI controllers, the kernel OHCI code appears to have</div><div class='add'>+power on problems with some chipsets.  If you are having problems</div><div class='add'>+connecting to your RIO 500, try turning it on first and then plugging it</div><div class='add'>+into the USB cable.</div><div class='ctx'> </div><div class='del'>-Contact information:</div><div class='del'>---------------------</div><div class='add'>+Contact Information</div><div class='add'>+-------------------</div><div class='ctx'> </div><div class='ctx'>    The main page for the project is hosted at sourceforge.net in the following</div><div class='ctx'>    URL: &lt;http://rio500.sourceforge.net&gt;. You can also go to the project's</div><div class='ctx'>    sourceforge home page at: &lt;http://sourceforge.net/projects/rio500/&gt;.</div><div class='ctx'>    There is also a mailing list: rio500-users@lists.sourceforge.net</div><div class='ctx'> </div><div class='del'>-Authors:</div><div class='add'>+Authors</div><div class='ctx'> -------</div><div class='ctx'> </div><div class='del'>-Most of the code was written by Cesar Miquel &lt;miquel@df.uba.ar&gt;. Keith </div><div class='add'>+Most of the code was written by Cesar Miquel &lt;miquel@df.uba.ar&gt;. Keith</div><div class='ctx'> Clayton &lt;kclayton@jps.net&gt; is incharge of the PPC port and making sure</div><div class='ctx'> things work there. Bruce Tenison &lt;btenison@dibbs.net&gt; is adding support</div><div class='ctx'> for .fon files and also does testing. The program will mostly sure be</div><div class='ctx'> re-written and Pete Ikusz along with the rest will re-design it. I would</div><div class='del'>-also like to thank Tri Nguyen &lt;tmn_3022000@hotmail.com&gt; who provided use </div><div class='add'>+also like to thank Tri Nguyen &lt;tmn_3022000@hotmail.com&gt; who provided use</div><div class='ctx'> with some important information regarding the communication with the Rio.</div><div class='ctx'> </div><div class='del'>-ADDITIONAL INFORMATION and Userspace tools</div><div class='add'>+Additional Information and userspace tools</div><div class='ctx'> </div><div class='del'>-http://rio500.sourceforge.net/</div><div class='add'>+	http://rio500.sourceforge.net/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-REQUIREMENTS</div><div class='add'>+Requirements</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'> A host with a USB port.  Ideally, either a UHCI (Intel) or OHCI</div><div class='ctx'> (Compaq and others) hardware port should work.</div><div class='hunk'>@@ -80,11 +88,11 @@ A Linux kernel with RIO 500 support enabled.</div><div class='ctx'> 'lspci' which is only needed to determine the type of USB hardware</div><div class='ctx'> available in your machine.</div><div class='ctx'> </div><div class='del'>-CONFIGURATION</div><div class='add'>+Configuration</div><div class='ctx'> </div><div class='ctx'> Using `lspci -v`, determine the type of USB hardware available.</div><div class='ctx'> </div><div class='del'>-  If you see something like:</div><div class='add'>+  If you see something like::</div><div class='ctx'> </div><div class='ctx'>     USB Controller: ......</div><div class='ctx'>     Flags: .....</div><div class='hunk'>@@ -92,7 +100,7 @@ Using `lspci -v`, determine the type of USB hardware available.</div><div class='ctx'> </div><div class='ctx'>   Then you have a UHCI based controller.</div><div class='ctx'> </div><div class='del'>-  If you see something like:</div><div class='add'>+  If you see something like::</div><div class='ctx'> </div><div class='ctx'>      USB Controller: .....</div><div class='ctx'>      Flags: ....</div><div class='hunk'>@@ -107,8 +115,9 @@ hardware (determined from the steps above), 'USB Diamond Rio500 support', and</div><div class='ctx'> (you may need to execute `depmod -a` to update the module</div><div class='ctx'> dependencies).</div><div class='ctx'> </div><div class='del'>-Add a device for the USB rio500:</div><div class='del'>-  `mknod /dev/usb/rio500 c 180 64`</div><div class='add'>+Add a device for the USB rio500::</div><div class='add'>+</div><div class='add'>+  mknod /dev/usb/rio500 c 180 64</div><div class='ctx'> </div><div class='ctx'> Set appropriate permissions for /dev/usb/rio500 (don't forget about</div><div class='ctx'> group and world permissions).  Both read and write permissions are</div><div class='hunk'>@@ -116,12 +125,14 @@ required for proper operation.</div><div class='ctx'> </div><div class='ctx'> Load the appropriate modules (if compiled as modules):</div><div class='ctx'> </div><div class='del'>-  OHCI:</div><div class='add'>+  OHCI::</div><div class='add'>+</div><div class='ctx'>     modprobe usbcore</div><div class='ctx'>     modprobe usb-ohci</div><div class='ctx'>     modprobe rio500</div><div class='ctx'> </div><div class='del'>-  UHCI:</div><div class='add'>+  UHCI::</div><div class='add'>+</div><div class='ctx'>     modprobe usbcore</div><div class='ctx'>     modprobe usb-uhci  (or uhci)</div><div class='ctx'>     modprobe rio500</div><div class='hunk'>@@ -129,10 +140,10 @@ Load the appropriate modules (if compiled as modules):</div><div class='ctx'> That's it.  The Rio500 Utils at: http://rio500.sourceforge.net should</div><div class='ctx'> be able to access the rio500.</div><div class='ctx'> </div><div class='del'>-BUGS</div><div class='add'>+Bugs</div><div class='add'>+====</div><div class='ctx'> </div><div class='ctx'> If you encounter any problems feel free to drop me an email.</div><div class='ctx'> </div><div class='ctx'> Bruce Tenison</div><div class='ctx'> btenison@dibbs.net</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/usb/usb-help.txt b/Documentation/usb/usb-help.txt<br/>index 4273ca2b86ba..dc23ecd4d802 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usb-help.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usb-help.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usb-help.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/usb-help.txt</a></div><div class='hunk'>@@ -1,16 +1,17 @@</div><div class='del'>-usb-help.txt</div><div class='add'>+==============</div><div class='add'>+USB references</div><div class='add'>+==============</div><div class='add'>+</div><div class='ctx'> 2008-Mar-7</div><div class='ctx'> </div><div class='ctx'> For USB help other than the readme files that are located in</div><div class='del'>-Documentation/usb/*, see the following:</div><div class='add'>+`Documentation/usb/*`, see the following:</div><div class='ctx'> </div><div class='del'>-Linux-USB project:  http://www.linux-usb.org</div><div class='del'>-  mirrors at        http://usb.in.tum.de/linux-usb/</div><div class='del'>-         and        http://it.linux-usb.org</div><div class='del'>-Linux USB Guide:    http://linux-usb.sourceforge.net</div><div class='del'>-Linux-USB device overview (working devices and drivers):</div><div class='del'>-                    http://www.qbik.ch/usb/devices/</div><div class='add'>+- Linux-USB project:  http://www.linux-usb.org</div><div class='add'>+  mirrors at          http://usb.in.tum.de/linux-usb/</div><div class='add'>+  and                 http://it.linux-usb.org</div><div class='add'>+- Linux USB Guide:    http://linux-usb.sourceforge.net</div><div class='add'>+- Linux-USB device overview (working devices and drivers):</div><div class='add'>+  http://www.qbik.ch/usb/devices/</div><div class='ctx'> </div><div class='ctx'> The Linux-USB mailing list is at linux-usb@vger.kernel.org</div><div class='del'>-</div><div class='del'>-###</div><div class='head'>diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt<br/>index ab100d6ee436..8fa7dbd3da9a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usb-serial.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usb-serial.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usb-serial.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/usb-serial.txt</a></div><div class='hunk'>@@ -1,4 +1,9 @@</div><div class='del'>-INTRODUCTION</div><div class='add'>+==========</div><div class='add'>+USB serial</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'>   The USB serial driver currently supports a number of different USB to</div><div class='ctx'>   serial converter products, as well as some devices that use a serial</div><div class='hunk'>@@ -8,13 +13,15 @@ INTRODUCTION</div><div class='ctx'>   the different devices.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-CONFIGURATION</div><div class='add'>+Configuration</div><div class='add'>+=============</div><div class='ctx'> </div><div class='ctx'>   Currently the driver can handle up to 256 different serial interfaces at</div><div class='del'>-  one time. </div><div class='add'>+  one time.</div><div class='ctx'> </div><div class='ctx'>     The major number that the driver uses is 188 so to use the driver,</div><div class='del'>-    create the following nodes:</div><div class='add'>+    create the following nodes::</div><div class='add'>+</div><div class='ctx'> 	mknod /dev/ttyUSB0 c 188 0</div><div class='ctx'> 	mknod /dev/ttyUSB1 c 188 1</div><div class='ctx'> 	mknod /dev/ttyUSB2 c 188 2</div><div class='hunk'>@@ -28,12 +35,14 @@ CONFIGURATION</div><div class='ctx'>   When the device is connected and recognized by the driver, the driver</div><div class='ctx'>   will print to the system log, which node(s) the device has been bound</div><div class='ctx'>   to.</div><div class='del'>-  </div><div class='ctx'> </div><div class='del'>-SPECIFIC DEVICES SUPPORTED</div><div class='add'>+</div><div class='add'>+Specific Devices Supported</div><div class='add'>+==========================</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ConnectTech WhiteHEAT 4 port converter</div><div class='add'>+--------------------------------------</div><div class='ctx'> </div><div class='ctx'>   ConnectTech has been very forthcoming with information about their</div><div class='ctx'>   device, including providing a unit to test with.</div><div class='hunk'>@@ -46,6 +55,7 @@ ConnectTech WhiteHEAT 4 port converter</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> HandSpring Visor, Palm USB, and Clié USB driver</div><div class='add'>+-----------------------------------------------</div><div class='ctx'> </div><div class='ctx'>   This driver works with all HandSpring USB, Palm USB, and Sony Clié USB</div><div class='ctx'>   devices.</div><div class='hunk'>@@ -62,7 +72,7 @@ HandSpring Visor, Palm USB, and Clié USB driver</div><div class='ctx'>     This goes against the current documentation for pilot-xfer and other</div><div class='ctx'>     packages, but is the only way that it will work due to the hardware</div><div class='ctx'>     in the device.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   When the device is connected, try talking to it on the second port</div><div class='ctx'>   (this is usually /dev/ttyUSB1 if you do not have any other usb-serial</div><div class='ctx'>   devices in the system.) The system log should tell you which port is</div><div class='hunk'>@@ -78,10 +88,10 @@ HandSpring Visor, Palm USB, and Clié USB driver</div><div class='ctx'>   try resetting the device, first a hot reset, and then a cold reset if</div><div class='ctx'>   necessary.  Some devices need this before they can talk to the USB port</div><div class='ctx'>   properly.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   Devices that are not compiled into the kernel can be specified with module</div><div class='ctx'>   parameters.  e.g. modprobe visor vendor=0x54c product=0x66</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   There is a webpage and mailing lists for this portion of the driver at:</div><div class='ctx'>   http://sourceforge.net/projects/usbvisor/</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +100,7 @@ HandSpring Visor, Palm USB, and Clié USB driver</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> PocketPC PDA Driver</div><div class='add'>+-------------------</div><div class='ctx'> </div><div class='ctx'>   This driver can be used to connect to Compaq iPAQ, HP Jornada, Casio EM500</div><div class='ctx'>   and other PDAs running Windows CE 3.0 or PocketPC 2002 using a USB</div><div class='hunk'>@@ -135,12 +146,13 @@ PocketPC PDA Driver</div><div class='ctx'>   be used to flash the ROM, as well as the microP code..  so much for needing</div><div class='ctx'>   Toshiba's $350 serial cable for flashing!! :D</div><div class='ctx'>   NOTE: This has NOT been tested. Use at your own risk.</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>   For any questions or problems with the driver, please contact Ganesh</div><div class='ctx'>   Varadarajan &lt;ganesh@veritas.com&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Keyspan PDA Serial Adapter</div><div class='add'>+--------------------------</div><div class='ctx'> </div><div class='ctx'>   Single port DB-9 serial adapter, pushed as a PDA adapter for iMacs (mostly</div><div class='ctx'>   sold in Macintosh catalogs, comes in a translucent white/green dongle).</div><div class='hunk'>@@ -148,32 +160,37 @@ Keyspan PDA Serial Adapter</div><div class='ctx'>   This driver also works for the Xircom/Entrega single port serial adapter.</div><div class='ctx'> </div><div class='ctx'>   Current status:</div><div class='add'>+</div><div class='ctx'>    Things that work:</div><div class='del'>-     basic input/output (tested with 'cu')</div><div class='del'>-     blocking write when serial line can't keep up</div><div class='del'>-     changing baud rates (up to 115200)</div><div class='del'>-     getting/setting modem control pins (TIOCM{GET,SET,BIS,BIC})</div><div class='del'>-     sending break (although duration looks suspect)</div><div class='add'>+     - basic input/output (tested with 'cu')</div><div class='add'>+     - blocking write when serial line can't keep up</div><div class='add'>+     - changing baud rates (up to 115200)</div><div class='add'>+     - getting/setting modem control pins (TIOCM{GET,SET,BIS,BIC})</div><div class='add'>+     - sending break (although duration looks suspect)</div><div class='add'>+</div><div class='ctx'>    Things that don't:</div><div class='del'>-     device strings (as logged by kernel) have trailing binary garbage</div><div class='del'>-     device ID isn't right, might collide with other Keyspan products</div><div class='del'>-     changing baud rates ought to flush tx/rx to avoid mangled half characters</div><div class='add'>+     - device strings (as logged by kernel) have trailing binary garbage</div><div class='add'>+     - device ID isn't right, might collide with other Keyspan products</div><div class='add'>+     - changing baud rates ought to flush tx/rx to avoid mangled half characters</div><div class='add'>+</div><div class='ctx'>    Big Things on the todo list:</div><div class='del'>-     parity, 7 vs 8 bits per char, 1 or 2 stop bits</div><div class='del'>-     HW flow control</div><div class='del'>-     not all of the standard USB descriptors are handled: Get_Status, Set_Feature</div><div class='del'>-     O_NONBLOCK, select()</div><div class='add'>+     - parity, 7 vs 8 bits per char, 1 or 2 stop bits</div><div class='add'>+     - HW flow control</div><div class='add'>+     - not all of the standard USB descriptors are handled:</div><div class='add'>+       Get_Status, Set_Feature, O_NONBLOCK, select()</div><div class='ctx'> </div><div class='ctx'>   For any questions or problems with this driver, please contact Brian</div><div class='del'>-  Warner at warner@lothar.com </div><div class='add'>+  Warner at warner@lothar.com</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Keyspan USA-series Serial Adapters</div><div class='add'>+----------------------------------</div><div class='ctx'> </div><div class='del'>-  Single, Dual and Quad port adapters - driver uses Keyspan supplied </div><div class='add'>+  Single, Dual and Quad port adapters - driver uses Keyspan supplied</div><div class='ctx'>   firmware and is being developed with their support.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   Current status:</div><div class='add'>+</div><div class='ctx'>     The USA-18X, USA-28X, USA-19, USA-19W and USA-49W are supported and</div><div class='ctx'>     have been pretty thoroughly tested at various baud rates with 8-N-1</div><div class='ctx'>     character settings.  Other character lengths and parity setups are</div><div class='hunk'>@@ -182,32 +199,37 @@ Keyspan USA-series Serial Adapters</div><div class='ctx'>     The USA-28 isn't yet supported though doing so should be pretty</div><div class='ctx'>     straightforward.  Contact the maintainer if you require this</div><div class='ctx'>     functionality.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   More information is available at:</div><div class='add'>+</div><div class='ctx'>         http://www.carnationsoftware.com/carnation/Keyspan.html</div><div class='del'>-   </div><div class='add'>+</div><div class='ctx'>   For any questions or problems with this driver, please contact Hugh</div><div class='ctx'>   Blemings at hugh@misc.nu</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> FTDI Single Port Serial Driver</div><div class='add'>+------------------------------</div><div class='ctx'> </div><div class='ctx'>   This is a single port DB-25 serial adapter.</div><div class='ctx'> </div><div class='ctx'>   Devices supported include:</div><div class='del'>-                -TripNav TN-200 USB GPS</div><div class='del'>-                -Navis Engineering Bureau CH-4711 USB GPS</div><div class='add'>+</div><div class='add'>+                - TripNav TN-200 USB GPS</div><div class='add'>+                - Navis Engineering Bureau CH-4711 USB GPS</div><div class='ctx'> </div><div class='ctx'>   For any questions or problems with this driver, please contact Bill Ryder.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ZyXEL omni.net lcd plus ISDN TA</div><div class='add'>+-------------------------------</div><div class='ctx'> </div><div class='ctx'>   This is an ISDN TA. Please report both successes and troubles to</div><div class='ctx'>   azummo@towertech.it</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Cypress M8 CY4601 Family Serial Driver</div><div class='add'>+--------------------------------------</div><div class='ctx'> </div><div class='ctx'>   This driver was in most part developed by Neil "koyama" Whelchel.  It</div><div class='ctx'>   has been improved since that previous form to support dynamic serial</div><div class='hunk'>@@ -215,18 +237,19 @@ Cypress M8 CY4601 Family Serial Driver</div><div class='ctx'>   part stable and has been tested on an smp machine. (dual p2)</div><div class='ctx'> </div><div class='ctx'>     Chipsets supported under CY4601 family:</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 		CY7C63723, CY7C63742, CY7C63743, CY7C64013</div><div class='ctx'> </div><div class='ctx'>     Devices supported:</div><div class='ctx'> </div><div class='del'>-		-DeLorme's USB Earthmate GPS (SiRF Star II lp arch)</div><div class='del'>-		-Cypress HID-&gt;COM RS232 adapter</div><div class='del'>-	</div><div class='del'>-		Note: Cypress Semiconductor claims no affiliation with the</div><div class='add'>+		- DeLorme's USB Earthmate GPS (SiRF Star II lp arch)</div><div class='add'>+		- Cypress HID-&gt;COM RS232 adapter</div><div class='add'>+</div><div class='add'>+		Note:</div><div class='add'>+			Cypress Semiconductor claims no affiliation with the</div><div class='ctx'> 			hid-&gt;com device.</div><div class='ctx'> </div><div class='del'>-	Most devices using chipsets under the CY4601 family should</div><div class='add'>+     Most devices using chipsets under the CY4601 family should</div><div class='ctx'>      work with the driver.  As long as they stay true to the CY4601</div><div class='ctx'>      usbserial specification.</div><div class='ctx'> </div><div class='hunk'>@@ -236,8 +259,9 @@ Cypress M8 CY4601 Family Serial Driver</div><div class='ctx'> 	upon start init to this setting.  usbserial core provides the rest</div><div class='ctx'> 	of the termios settings, along with some custom termios so that the</div><div class='ctx'> 	output is in proper format and parsable.</div><div class='del'>-	</div><div class='del'>-	The device can be put into sirf mode by issuing NMEA command:</div><div class='add'>+</div><div class='add'>+	The device can be put into sirf mode by issuing NMEA command::</div><div class='add'>+</div><div class='ctx'> 		$PSRF100,&lt;protocol&gt;,&lt;baud&gt;,&lt;databits&gt;,&lt;stopbits&gt;,&lt;parity&gt;*CHECKSUM</div><div class='ctx'> 		$PSRF100,0,9600,8,1,0*0C</div><div class='ctx'> </div><div class='hunk'>@@ -259,11 +283,14 @@ Cypress M8 CY4601 Family Serial Driver</div><div class='ctx'> </div><div class='ctx'> 	If you have any questions, problems, patches, feature requests, etc. you can</div><div class='ctx'> 	contact me here via email:</div><div class='add'>+</div><div class='ctx'> 					dignome@gmail.com</div><div class='add'>+</div><div class='ctx'> 		(your problems/patches can alternately be submitted to usb-devel)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Digi AccelePort Driver</div><div class='add'>+----------------------</div><div class='ctx'> </div><div class='ctx'>   This driver supports the Digi AccelePort USB 2 and 4 devices, 2 port</div><div class='ctx'>   (plus a parallel port) and 4 port USB serial converters.  The driver</div><div class='hunk'>@@ -285,42 +312,49 @@ Digi AccelePort Driver</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Belkin USB Serial Adapter F5U103</div><div class='add'>+--------------------------------</div><div class='ctx'> </div><div class='ctx'>   Single port DB-9/PS-2 serial adapter from Belkin with firmware by eTEK Labs.</div><div class='ctx'>   The Peracom single port serial adapter also works with this driver, as</div><div class='ctx'>   well as the GoHubs adapter.</div><div class='ctx'> </div><div class='ctx'>   Current status:</div><div class='add'>+</div><div class='ctx'>     The following have been tested and work:</div><div class='del'>-      Baud rate    300-230400               </div><div class='del'>-      Data bits    5-8</div><div class='del'>-      Stop bits    1-2</div><div class='del'>-      Parity       N,E,O,M,S</div><div class='del'>-      Handshake    None, Software (XON/XOFF), Hardware (CTSRTS,CTSDTR)*</div><div class='del'>-      Break        Set and clear</div><div class='del'>-      Line control Input/Output query and control **</div><div class='del'>-</div><div class='del'>-      *  Hardware input flow control is only enabled for firmware</div><div class='add'>+</div><div class='add'>+      - Baud rate    300-230400</div><div class='add'>+      - Data bits    5-8</div><div class='add'>+      - Stop bits    1-2</div><div class='add'>+      - Parity       N,E,O,M,S</div><div class='add'>+      - Handshake    None, Software (XON/XOFF), Hardware (CTSRTS,CTSDTR) [1]_</div><div class='add'>+      - Break        Set and clear</div><div class='add'>+      - Line control Input/Output query and control [2]_</div><div class='add'>+</div><div class='add'>+  .. [1]</div><div class='add'>+         Hardware input flow control is only enabled for firmware</div><div class='ctx'>          levels above 2.06.  Read source code comments describing Belkin</div><div class='ctx'>          firmware errata.  Hardware output flow control is working for all</div><div class='ctx'>          firmware versions.</div><div class='del'>-      ** Queries of inputs (CTS,DSR,CD,RI) show the last</div><div class='add'>+</div><div class='add'>+  .. [2]</div><div class='add'>+         Queries of inputs (CTS,DSR,CD,RI) show the last</div><div class='ctx'>          reported state.  Queries of outputs (DTR,RTS) show the last</div><div class='ctx'>          requested state and may not reflect current state as set by</div><div class='ctx'>          automatic hardware flow control.</div><div class='ctx'> </div><div class='ctx'>   TO DO List:</div><div class='del'>-    -- Add true modem control line query capability.  Currently tracks the</div><div class='del'>-       states reported by the interrupt and the states requested.</div><div class='del'>-    -- Add error reporting back to application for UART error conditions.</div><div class='del'>-    -- Add support for flush ioctls.</div><div class='del'>-    -- Add everything else that is missing :)</div><div class='add'>+    - Add true modem control line query capability.  Currently tracks the</div><div class='add'>+      states reported by the interrupt and the states requested.</div><div class='add'>+    - Add error reporting back to application for UART error conditions.</div><div class='add'>+    - Add support for flush ioctls.</div><div class='add'>+    - Add everything else that is missing :)</div><div class='ctx'> </div><div class='ctx'>   For any questions or problems with this driver, please contact William</div><div class='ctx'>   Greathouse at wgreathouse@smva.com</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Empeg empeg-car Mark I/II Driver</div><div class='add'>+--------------------------------</div><div class='ctx'> </div><div class='ctx'>   This is an experimental driver to provide connectivity support for the</div><div class='ctx'>   client synchronization tools for an Empeg empeg-car mp3 player.</div><div class='hunk'>@@ -335,6 +369,7 @@ Empeg empeg-car Mark I/II Driver</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> MCT USB Single Port Serial Adapter U232</div><div class='add'>+---------------------------------------</div><div class='ctx'> </div><div class='ctx'>   This driver is for the MCT USB-RS232 Converter (25 pin, Model No.</div><div class='ctx'>   U232-P25) from Magic Control Technology Corp. (there is also a 9 pin</div><div class='hunk'>@@ -355,35 +390,39 @@ MCT USB Single Port Serial Adapter U232</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Inside Out Networks Edgeport Driver</div><div class='add'>+-----------------------------------</div><div class='ctx'> </div><div class='ctx'>   This driver supports all devices made by Inside Out Networks, specifically</div><div class='ctx'>   the following models:</div><div class='del'>-       Edgeport/4</div><div class='del'>-       Rapidport/4</div><div class='del'>-       Edgeport/4t</div><div class='del'>-       Edgeport/2</div><div class='del'>-       Edgeport/4i</div><div class='del'>-       Edgeport/2i</div><div class='del'>-       Edgeport/421</div><div class='del'>-       Edgeport/21</div><div class='del'>-       Edgeport/8</div><div class='del'>-       Edgeport/8 Dual</div><div class='del'>-       Edgeport/2D8</div><div class='del'>-       Edgeport/4D8</div><div class='del'>-       Edgeport/8i</div><div class='del'>-       Edgeport/2 DIN</div><div class='del'>-       Edgeport/4 DIN</div><div class='del'>-       Edgeport/16 Dual</div><div class='add'>+</div><div class='add'>+       - Edgeport/4</div><div class='add'>+       - Rapidport/4</div><div class='add'>+       - Edgeport/4t</div><div class='add'>+       - Edgeport/2</div><div class='add'>+       - Edgeport/4i</div><div class='add'>+       - Edgeport/2i</div><div class='add'>+       - Edgeport/421</div><div class='add'>+       - Edgeport/21</div><div class='add'>+       - Edgeport/8</div><div class='add'>+       - Edgeport/8 Dual</div><div class='add'>+       - Edgeport/2D8</div><div class='add'>+       - Edgeport/4D8</div><div class='add'>+       - Edgeport/8i</div><div class='add'>+       - Edgeport/2 DIN</div><div class='add'>+       - Edgeport/4 DIN</div><div class='add'>+       - Edgeport/16 Dual</div><div class='ctx'> </div><div class='ctx'>   For any questions or problems with this driver, please contact Greg</div><div class='ctx'>   Kroah-Hartman at greg@kroah.com</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> REINER SCT cyberJack pinpad/e-com USB chipcard reader</div><div class='del'>-   </div><div class='add'>+-----------------------------------------------------</div><div class='add'>+</div><div class='ctx'>   Interface to ISO 7816 compatible contactbased chipcards, e.g. GSM SIMs.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   Current status:</div><div class='add'>+</div><div class='ctx'>     This is the kernel part of the driver for this USB card reader.</div><div class='ctx'>     There is also a user part for a CT-API driver available. A site</div><div class='ctx'>     for downloading is TBA. For now, you can request it from the</div><div class='hunk'>@@ -394,6 +433,7 @@ REINER SCT cyberJack pinpad/e-com USB chipcard reader</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Prolific PL2303 Driver</div><div class='add'>+----------------------</div><div class='ctx'> </div><div class='ctx'>   This driver supports any device that has the PL2303 chip from Prolific</div><div class='ctx'>   in it.  This includes a number of single port USB to serial converters,</div><div class='hunk'>@@ -403,11 +443,13 @@ Prolific PL2303 Driver</div><div class='ctx'> </div><div class='ctx'>   For any questions or problems with this driver, please contact Greg</div><div class='ctx'>   Kroah-Hartman at greg@kroah.com</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> KL5KUSB105 chipset / PalmConnect USB single-port adapter</div><div class='del'>-  </div><div class='add'>+--------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Current status:</div><div class='add'>+</div><div class='ctx'>   The driver was put together by looking at the usb bus transactions</div><div class='ctx'>   done by Palm's driver under Windows, so a lot of functionality is</div><div class='ctx'>   still missing.  Notably, serial ioctls are sometimes faked or not yet</div><div class='hunk'>@@ -417,21 +459,25 @@ Current status:</div><div class='ctx'>   are supported, but handshaking (software or hardware) is not, which is</div><div class='ctx'>   why it is wise to cut down on the rate used is wise for large</div><div class='ctx'>   transfers until this is settled.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   See http://www.uuhaus.de/linux/palmconnect.html for up-to-date</div><div class='ctx'>   information on this driver.</div><div class='ctx'> </div><div class='ctx'> Winchiphead CH341 Driver</div><div class='add'>+------------------------</div><div class='ctx'> </div><div class='ctx'>   This driver is for the Winchiphead CH341 USB-RS232 Converter. This chip</div><div class='ctx'>   also implements an IEEE 1284 parallel port, I2C and SPI, but that is not</div><div class='ctx'>   supported by the driver. The protocol was analyzed from the behaviour</div><div class='ctx'>   of the Windows driver, no datasheet is available at present.</div><div class='add'>+</div><div class='ctx'>   The manufacturer's website: http://www.winchiphead.com/.</div><div class='add'>+</div><div class='ctx'>   For any questions or problems with this driver, please contact</div><div class='ctx'>   frank@kingswood-consulting.co.uk.</div><div class='ctx'> </div><div class='ctx'> Moschip MCS7720, MCS7715 driver</div><div class='add'>+-------------------------------</div><div class='ctx'> </div><div class='ctx'>   These chips are present in devices sold by various manufacturers, such as Syba</div><div class='ctx'>   and Cables Unlimited.  There may be others.  The 7720 provides two serial</div><div class='hunk'>@@ -449,20 +495,24 @@ Moschip MCS7720, MCS7715 driver</div><div class='ctx'>       don't have one of these devices, so I can't say for sure.</div><div class='ctx'> </div><div class='ctx'> Generic Serial driver</div><div class='add'>+---------------------</div><div class='ctx'> </div><div class='ctx'>   If your device is not one of the above listed devices, compatible with</div><div class='ctx'>   the above models, you can try out the "generic" interface. This</div><div class='ctx'>   interface does not provide any type of control messages sent to the</div><div class='ctx'>   device, and does not support any kind of device flow control. All that</div><div class='ctx'>   is required of your device is that it has at least one bulk in endpoint,</div><div class='del'>-  or one bulk out endpoint. </div><div class='add'>+  or one bulk out endpoint.</div><div class='add'>+</div><div class='add'>+  To enable the generic driver to recognize your device, provide::</div><div class='ctx'> </div><div class='del'>-  To enable the generic driver to recognize your device, provide</div><div class='ctx'> 	echo &lt;vid&gt; &lt;pid&gt; &gt;/sys/bus/usb-serial/drivers/generic/new_id</div><div class='add'>+</div><div class='ctx'>   where the &lt;vid&gt; and &lt;pid&gt; is replaced with the hex representation of your</div><div class='ctx'>   device's vendor id and product id.</div><div class='ctx'>   If the driver is compiled as a module you can also provide one id when</div><div class='del'>-  loading the module</div><div class='add'>+  loading the module::</div><div class='add'>+</div><div class='ctx'> 	insmod usbserial vendor=0x#### product=0x####</div><div class='ctx'> </div><div class='ctx'>   This driver has been successfully used to connect to the NetChip USB</div><div class='hunk'>@@ -473,7 +523,8 @@ Generic Serial driver</div><div class='ctx'>   Kroah-Hartman at greg@kroah.com</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-CONTACT:</div><div class='add'>+Contact</div><div class='add'>+=======</div><div class='ctx'> </div><div class='ctx'>   If anyone has any problems using these drivers, with any of the above</div><div class='ctx'>   specified products, please contact the specific driver's author listed</div><div class='head'>diff --git a/Documentation/usb/usbip_protocol.txt b/Documentation/usb/usbip_protocol.txt<br/>index c7a0f4c7e7f1..988c832166cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usbip_protocol.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usbip_protocol.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usbip_protocol.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/usbip_protocol.txt</a></div><div class='hunk'>@@ -1,3 +1,7 @@</div><div class='add'>+===============</div><div class='add'>+USB/IP protocol</div><div class='add'>+===============</div><div class='add'>+</div><div class='ctx'> PRELIMINARY DRAFT, MAY CONTAIN MISTAKES!</div><div class='ctx'> 28 Jun 2011</div><div class='ctx'> </div><div class='hunk'>@@ -12,6 +16,8 @@ in one or more pieces at the low level transport layer). The server sends back</div><div class='ctx'> the OP_REP_DEVLIST packet which lists the exported USB devices. Finally the</div><div class='ctx'> TCP/IP connection is closed.</div><div class='ctx'> </div><div class='add'>+::</div><div class='add'>+</div><div class='ctx'>  virtual host controller                                 usb host</div><div class='ctx'>       "client"                                           "server"</div><div class='ctx'>   (imports USB devices)                             (exports USB devices)</div><div class='hunk'>@@ -32,6 +38,8 @@ send two types of packets: the USBIP_CMD_SUBMIT to submit an URB, and</div><div class='ctx'> USBIP_CMD_UNLINK to unlink a previously submitted URB. The answers of the</div><div class='ctx'> server may be USBIP_RET_SUBMIT and USBIP_RET_UNLINK respectively.</div><div class='ctx'> </div><div class='add'>+::</div><div class='add'>+</div><div class='ctx'>  virtual host controller                                 usb host</div><div class='ctx'>       "client"                                           "server"</div><div class='ctx'>   (imports USB devices)                             (exports USB devices)</div><div class='hunk'>@@ -88,270 +96,316 @@ The fields are in network (big endian) byte order meaning that the most signific</div><div class='ctx'> byte (MSB) is stored at the lowest address.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-OP_REQ_DEVLIST: Retrieve the list of exported USB devices.</div><div class='add'>+OP_REQ_DEVLIST:</div><div class='add'>+	Retrieve the list of exported USB devices.</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 2         | 2      | 0x8005     | Command code: Retrieve the list of exported USB</div><div class='del'>-           |        |            |   devices.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      | 0x00000000 | Status: unused, shall be set to 0</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 2         | 2      | 0x8005     | Command code: Retrieve the list of exported USB   |</div><div class='add'>+|           |        |            | devices.                                          |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      | 0x00000000 | Status: unused, shall be set to 0                 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='del'>-OP_REP_DEVLIST: Reply with the list of exported USB devices.</div><div class='add'>+OP_REP_DEVLIST:</div><div class='add'>+	Reply with the list of exported USB devices.</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 2         | 2      | 0x0005     | Reply code: The list of exported USB devices.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      | 0x00000000 | Status: 0 for OK</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         | 4      | n          | Number of exported devices: 0 means no exported</div><div class='del'>-           |        |            |   devices.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x0C      |        |            | From now on the exported n devices are described,</div><div class='del'>-           |        |            |   if any. If no devices are exported the message</div><div class='del'>-           |        |            |   ends with the previous "number of exported</div><div class='del'>-           |        |            |   devices" field.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>-           | 256    |            | path: Path of the device on the host exporting the</div><div class='del'>-           |        |            |   USB device, string closed with zero byte, e.g.</div><div class='del'>-           |        |            |   "/sys/devices/pci0000:00/0000:00:1d.1/usb3/3-2"</div><div class='del'>-           |        |            |   The unused bytes shall be filled with zero</div><div class='del'>-           |        |            |   bytes.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x10C     | 32     |            | busid: Bus ID of the exported device, string</div><div class='del'>-           |        |            |   closed with zero byte, e.g. "3-2". The unused</div><div class='del'>-           |        |            |   bytes shall be filled with zero bytes.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x12C     | 4      |            | busnum</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x130     | 4      |            | devnum</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x134     | 4      |            | speed</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x138     | 2      |            | idVendor</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13A     | 2      |            | idProduct</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13C     | 2      |            | bcdDevice</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13E     | 1      |            | bDeviceClass</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13F     | 1      |            | bDeviceSubClass</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x140     | 1      |            | bDeviceProtocol</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x141     | 1      |            | bConfigurationValue</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x142     | 1      |            | bNumConfigurations</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x143     | 1      |            | bNumInterfaces</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x144     |        | m_0        | From now on each interface is described, all</div><div class='del'>-           |        |            |   together bNumInterfaces times, with the</div><div class='del'>-           |        |            |   the following 4 fields:</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>-           | 1      |            | bInterfaceClass</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x145     | 1      |            | bInterfaceSubClass</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x146     | 1      |            | bInterfaceProtocol</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x147     | 1      |            | padding byte for alignment, shall be set to zero</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0xC +     |        |            | The second exported USB device starts at i=1</div><div class='del'>- i*0x138 + |        |            | with the busid field.</div><div class='del'>- m_(i-1)*4 |        |            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0.|</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 2         | 2      | 0x0005     | Reply code: The list of exported USB devices.     |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      | 0x00000000 | Status: 0 for OK                                  |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         | 4      | n          | Number of exported devices: 0 means no exported   |</div><div class='add'>+|           |        |            | devices.                                          |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x0C      |        |            | From now on the exported n devices are described, |</div><div class='add'>+|           |        |            | if any. If no devices are exported the message    |</div><div class='add'>+|           |        |            | ends with the previous "number of exported        |</div><div class='add'>+|           |        |            | devices" field.                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+|           | 256    |            | path: Path of the device on the host exporting the|</div><div class='add'>+|           |        |            | USB device, string closed with zero byte, e.g.    |</div><div class='add'>+|           |        |            | "/sys/devices/pci0000:00/0000:00:1d.1/usb3/3-2"   |</div><div class='add'>+|           |        |            | The unused bytes shall be filled with zero        |</div><div class='add'>+|           |        |            | bytes.                                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x10C     | 32     |            | busid: Bus ID of the exported device, string      |</div><div class='add'>+|           |        |            | closed with zero byte, e.g. "3-2". The unused     |</div><div class='add'>+|           |        |            | bytes shall be filled with zero bytes.            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x12C     | 4      |            | busnum                                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x130     | 4      |            | devnum                                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x134     | 4      |            | speed                                             |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x138     | 2      |            | idVendor                                          |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13A     | 2      |            | idProduct                                         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13C     | 2      |            | bcdDevice                                         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13E     | 1      |            | bDeviceClass                                      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13F     | 1      |            | bDeviceSubClass                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x140     | 1      |            | bDeviceProtocol                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x141     | 1      |            | bConfigurationValue                               |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x142     | 1      |            | bNumConfigurations                                |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x143     | 1      |            | bNumInterfaces                                    |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x144     |        | m_0        | From now on each interface is described, all      |</div><div class='add'>+|           |        |            | together bNumInterfaces times, with the           |</div><div class='add'>+|           |        |            | the following 4 fields:                           |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+|           | 1      |            | bInterfaceClass                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x145     | 1      |            | bInterfaceSubClass                                |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x146     | 1      |            | bInterfaceProtocol                                |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x147     | 1      |            | padding byte for alignment, shall be set to zero  |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0xC +     |        |            | The second exported USB device starts at i=1      |</div><div class='add'>+| i*0x138 + |        |            | with the busid field.                             |</div><div class='add'>+| m_(i-1)*4 |        |            |                                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='del'>-OP_REQ_IMPORT: Request to import (attach) a remote USB device.</div><div class='add'>+OP_REQ_IMPORT:</div><div class='add'>+	Request to import (attach) a remote USB device.</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 2         | 2      | 0x8003     | Command code: import a remote USB device.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      | 0x00000000 | Status: unused, shall be set to 0</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         | 32     |            | busid: the busid of the exported device on the</div><div class='del'>-           |        |            |   remote host. The possible values are taken</div><div class='del'>-           |        |            |   from the message field OP_REP_DEVLIST.busid.</div><div class='del'>-           |        |            |   A string closed with zero, the unused bytes</div><div class='del'>-           |        |            |   shall be filled with zeros.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 2         | 2      | 0x8003     | Command code: import a remote USB device.         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      | 0x00000000 | Status: unused, shall be set to 0                 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         | 32     |            | busid: the busid of the exported device on the    |</div><div class='add'>+|           |        |            | remote host. The possible values are taken        |</div><div class='add'>+|           |        |            | from the message field OP_REP_DEVLIST.busid.      |</div><div class='add'>+|           |        |            | A string closed with zero, the unused bytes       |</div><div class='add'>+|           |        |            | shall be filled with zeros.                       |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='del'>-OP_REP_IMPORT: Reply to import (attach) a remote USB device.</div><div class='add'>+OP_REP_IMPORT:</div><div class='add'>+	Reply to import (attach) a remote USB device.</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 2         | 2      | 0x0003     | Reply code: Reply to import.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      | 0x00000000 | Status: 0 for OK</div><div class='del'>-           |        |            |         1 for error</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         |        |            | From now on comes the details of the imported</div><div class='del'>-           |        |            |   device, if the previous status field was OK (0),</div><div class='del'>-           |        |            |   otherwise the reply ends with the status field.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>-           | 256    |            | path: Path of the device on the host exporting the</div><div class='del'>-           |        |            |   USB device, string closed with zero byte, e.g.</div><div class='del'>-           |        |            |   "/sys/devices/pci0000:00/0000:00:1d.1/usb3/3-2"</div><div class='del'>-           |        |            |   The unused bytes shall be filled with zero</div><div class='del'>-           |        |            |   bytes.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x108     | 32     |            | busid: Bus ID of the exported device, string</div><div class='del'>-           |        |            |   closed with zero byte, e.g. "3-2". The unused</div><div class='del'>-           |        |            |   bytes shall be filled with zero bytes.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x128     | 4      |            | busnum</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x12C     | 4      |            | devnum</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x130     | 4      |            | speed</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x134     | 2      |            | idVendor</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x136     | 2      |            | idProduct</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x138     | 2      |            | bcdDevice</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x139     | 1      |            | bDeviceClass</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13A     | 1      |            | bDeviceSubClass</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13B     | 1      |            | bDeviceProtocol</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13C     | 1      |            | bConfigurationValue</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13D     | 1      |            | bNumConfigurations</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x13E     | 1      |            | bNumInterfaces</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 2      | 0x0100     | Binary-coded decimal USBIP version number: v1.0.0 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 2         | 2      | 0x0003     | Reply code: Reply to import.                      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      | 0x00000000 | Status:                                           |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            |   - 0 for OK                                      |</div><div class='add'>+|           |        |            |   - 1 for error                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         |        |            | From now on comes the details of the imported     |</div><div class='add'>+|           |        |            | device, if the previous status field was OK (0),  |</div><div class='add'>+|           |        |            | otherwise the reply ends with the status field.   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+|           | 256    |            | path: Path of the device on the host exporting the|</div><div class='add'>+|           |        |            | USB device, string closed with zero byte, e.g.    |</div><div class='add'>+|           |        |            | "/sys/devices/pci0000:00/0000:00:1d.1/usb3/3-2"   |</div><div class='add'>+|           |        |            | The unused bytes shall be filled with zero        |</div><div class='add'>+|           |        |            | bytes.                                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x108     | 32     |            | busid: Bus ID of the exported device, string      |</div><div class='add'>+|           |        |            | closed with zero byte, e.g. "3-2". The unused     |</div><div class='add'>+|           |        |            | bytes shall be filled with zero bytes.            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x128     | 4      |            | busnum                                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x12C     | 4      |            | devnum                                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x130     | 4      |            | speed                                             |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x134     | 2      |            | idVendor                                          |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x136     | 2      |            | idProduct                                         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x138     | 2      |            | bcdDevice                                         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x139     | 1      |            | bDeviceClass                                      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13A     | 1      |            | bDeviceSubClass                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13B     | 1      |            | bDeviceProtocol                                   |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13C     | 1      |            | bConfigurationValue                               |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13D     | 1      |            | bNumConfigurations                                |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x13E     | 1      |            | bNumInterfaces                                    |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='del'>-USBIP_CMD_SUBMIT: Submit an URB</div><div class='add'>+USBIP_CMD_SUBMIT:</div><div class='add'>+	Submit an URB</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 4      | 0x00000001 | command: Submit an URB</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      |            | seqnum: the sequence number of the URB to submit</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         | 4      |            | devid</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT</div><div class='del'>-           |        |            |            1: USBIP_DIR_IN</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x10      | 4      |            | ep: endpoint number, possible values are: 0...15</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x14      | 4      |            | transfer_flags: possible values depend on the</div><div class='del'>-           |        |            |   URB transfer type, see below</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x18      | 4      |            | transfer_buffer_length</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x1C      | 4      |            | start_frame: specify the selected frame to</div><div class='del'>-           |        |            |   transmit an ISO frame, ignored if URB_ISO_ASAP</div><div class='del'>-           |        |            |   is specified at transfer_flags</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x20      | 4      |            | number_of_packets: number of ISO packets</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x24      | 4      |            | interval: maximum time for the request on the</div><div class='del'>-           |        |            |   server-side host controller</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x28      | 8      |            | setup: data bytes for USB setup, filled with</div><div class='del'>-           |        |            |   zeros if not used</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x30      |        |            | URB data. For ISO transfers the padding between</div><div class='del'>-           |        |            |   each ISO packets is not transmitted.</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 4      | 0x00000001 | command: Submit an URB                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      |            | seqnum: the sequence number of the URB to submit  |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         | 4      |            | devid                                             |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0xC       | 4      |            | direction:                                        |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            |    - 0: USBIP_DIR_OUT                             |</div><div class='add'>+|           |        |            |    - 1: USBIP_DIR_IN                              |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x10      | 4      |            | ep: endpoint number, possible values are: 0...15  |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x14      | 4      |            | transfer_flags: possible values depend on the     |</div><div class='add'>+|           |        |            | URB transfer type, see below                      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x18      | 4      |            | transfer_buffer_length                            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x1C      | 4      |            | start_frame: specify the selected frame to        |</div><div class='add'>+|           |        |            | transmit an ISO frame, ignored if URB_ISO_ASAP    |</div><div class='add'>+|           |        |            | is specified at transfer_flags                    |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x20      | 4      |            | number_of_packets: number of ISO packets          |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x24      | 4      |            | interval: maximum time for the request on the     |</div><div class='add'>+|           |        |            | server-side host controller                       |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x28      | 8      |            | setup: data bytes for USB setup, filled with      |</div><div class='add'>+|           |        |            | zeros if not used                                 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x30      |        |            | URB data. For ISO transfers the padding between   |</div><div class='add'>+|           |        |            | each ISO packets is not transmitted.              |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  Allowed transfer_flags  | value      | control | interrupt | bulk     | isochronous</div><div class='del'>- -------------------------+------------+---------+-----------+----------+-------------</div><div class='del'>-  URB_SHORT_NOT_OK        | 0x00000001 | only in | only in   | only in  | no</div><div class='del'>-  URB_ISO_ASAP            | 0x00000002 | no      | no        | no       | yes</div><div class='del'>-  URB_NO_TRANSFER_DMA_MAP | 0x00000004 | yes     | yes       | yes      | yes</div><div class='del'>-  URB_ZERO_PACKET         | 0x00000040 | no      | no        | only out | no</div><div class='del'>-  URB_NO_INTERRUPT        | 0x00000080 | yes     | yes       | yes      | yes</div><div class='del'>-  URB_FREE_BUFFER         | 0x00000100 | yes     | yes       | yes      | yes</div><div class='del'>-  URB_DIR_MASK            | 0x00000200 | yes     | yes       | yes      | yes</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | Allowed transfer_flags  | value      | control | interrupt | bulk     | isochronous |</div><div class='add'>+ +=========================+============+=========+===========+==========+=============+</div><div class='add'>+ | URB_SHORT_NOT_OK        | 0x00000001 | only in | only in   | only in  | no          |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | URB_ISO_ASAP            | 0x00000002 | no      | no        | no       | yes         |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | URB_NO_TRANSFER_DMA_MAP | 0x00000004 | yes     | yes       | yes      | yes         |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | URB_ZERO_PACKET         | 0x00000040 | no      | no        | only out | no          |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | URB_NO_INTERRUPT        | 0x00000080 | yes     | yes       | yes      | yes         |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | URB_FREE_BUFFER         | 0x00000100 | yes     | yes       | yes      | yes         |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='add'>+ | URB_DIR_MASK            | 0x00000200 | yes     | yes       | yes      | yes         |</div><div class='add'>+ +-------------------------+------------+---------+-----------+----------+-------------+</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-USBIP_RET_SUBMIT: Reply for submitting an URB</div><div class='add'>+USBIP_RET_SUBMIT:</div><div class='add'>+	Reply for submitting an URB</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 4      | 0x00000003 | command</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      |            | seqnum: URB sequence number</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         | 4      |            | devid</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT</div><div class='del'>-           |        |            |            1: USBIP_DIR_IN</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x10      | 4      |            | ep: endpoint number</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x14      | 4      |            | status: zero for successful URB transaction,</div><div class='del'>-           |        |            |   otherwise some kind of error happened.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x18      | 4      | n          | actual_length: number of URB data bytes</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x1C      | 4      |            | start_frame: for an ISO frame the actually</div><div class='del'>-           |        |            |   selected frame for transmit.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x20      | 4      |            | number_of_packets</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x24      | 4      |            | error_count</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x28      | 8      |            | setup: data bytes for USB setup, filled with</div><div class='del'>-           |        |            |   zeros if not used</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x30      | n      |            | URB data bytes. For ISO transfers the padding</div><div class='del'>-           |        |            |   between each ISO packets is not transmitted.</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 4      | 0x00000003 | command                                           |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      |            | seqnum: URB sequence number                       |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         | 4      |            | devid                                             |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0xC       | 4      |            | direction:                                        |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            |    - 0: USBIP_DIR_OUT                             |</div><div class='add'>+|           |        |            |    - 1: USBIP_DIR_IN                              |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x10      | 4      |            | ep: endpoint number                               |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x14      | 4      |            | status: zero for successful URB transaction,      |</div><div class='add'>+|           |        |            | otherwise some kind of error happened.            |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x18      | 4      | n          | actual_length: number of URB data bytes           |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x1C      | 4      |            | start_frame: for an ISO frame the actually        |</div><div class='add'>+|           |        |            | selected frame for transmit.                      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x20      | 4      |            | number_of_packets                                 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x24      | 4      |            | error_count                                       |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x28      | 8      |            | setup: data bytes for USB setup, filled with      |</div><div class='add'>+|           |        |            | zeros if not used                                 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x30      | n      |            | URB data bytes. For ISO transfers the padding     |</div><div class='add'>+|           |        |            | between each ISO packets is not transmitted.      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='del'>-USBIP_CMD_UNLINK: Unlink an URB</div><div class='add'>+USBIP_CMD_UNLINK:</div><div class='add'>+	Unlink an URB</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 4      | 0x00000002 | command: URB unlink command</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      |            | seqnum: URB sequence number to unlink: FIXME: is this so?</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         | 4      |            | devid</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT</div><div class='del'>-           |        |            |            1: USBIP_DIR_IN</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x10      | 4      |            | ep: endpoint number: zero</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x14      | 4      |            | seqnum: the URB sequence number given previously</div><div class='del'>-           |        |            |   at USBIP_CMD_SUBMIT.seqnum field</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x30      | n      |            | URB data bytes. For ISO transfers the padding</div><div class='del'>-           |        |            |   between each ISO packets is not transmitted.</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 4      | 0x00000002 | command: URB unlink command                       |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      |            | seqnum: URB sequence number to unlink:            |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            | FIXME:                                            |</div><div class='add'>+|           |        |            |    is this so?                                    |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         | 4      |            | devid                                             |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0xC       | 4      |            | direction:                                        |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            |    - 0: USBIP_DIR_OUT                             |</div><div class='add'>+|           |        |            |    - 1: USBIP_DIR_IN                              |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x10      | 4      |            | ep: endpoint number: zero                         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x14      | 4      |            | seqnum: the URB sequence number given previously  |</div><div class='add'>+|           |        |            | at USBIP_CMD_SUBMIT.seqnum field                  |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x30      | n      |            | URB data bytes. For ISO transfers the padding     |</div><div class='add'>+|           |        |            | between each ISO packets is not transmitted.      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='ctx'> </div><div class='del'>-USBIP_RET_UNLINK: Reply for URB unlink</div><div class='add'>+USBIP_RET_UNLINK:</div><div class='add'>+	Reply for URB unlink</div><div class='ctx'> </div><div class='del'>- Offset    | Length | Value      | Description</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0         | 4      | 0x00000004 | command: reply for the URB unlink command</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 4         | 4      |            | seqnum: the unlinked URB sequence number</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 8         | 4      |            | devid</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT</div><div class='del'>-           |        |            |            1: USBIP_DIR_IN</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x10      | 4      |            | ep: endpoint number</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x14      | 4      |            | status: This is the value contained in the</div><div class='del'>-           |        |            |   urb-&gt;status in the URB completition handler.</div><div class='del'>-           |        |            |   FIXME: a better explanation needed.</div><div class='del'>------------+--------+------------+---------------------------------------------------</div><div class='del'>- 0x30      | n      |            | URB data bytes. For ISO transfers the padding</div><div class='del'>-           |        |            |   between each ISO packets is not transmitted.</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| Offset    | Length | Value      | Description                                       |</div><div class='add'>++===========+========+============+===================================================+</div><div class='add'>+| 0         | 4      | 0x00000004 | command: reply for the URB unlink command         |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 4         | 4      |            | seqnum: the unlinked URB sequence number          |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 8         | 4      |            | devid                                             |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0xC       | 4      |            | direction:                                        |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            |    - 0: USBIP_DIR_OUT                             |</div><div class='add'>+|           |        |            |    - 1: USBIP_DIR_IN                              |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x10      | 4      |            | ep: endpoint number                               |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x14      | 4      |            | status: This is the value contained in the        |</div><div class='add'>+|           |        |            | urb-&gt;status in the URB completition handler.      |</div><div class='add'>+|           |        |            |                                                   |</div><div class='add'>+|           |        |            | FIXME:                                            |</div><div class='add'>+|           |        |            |      a better explanation needed.                 |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='add'>+| 0x30      | n      |            | URB data bytes. For ISO transfers the padding     |</div><div class='add'>+|           |        |            | between each ISO packets is not transmitted.      |</div><div class='add'>++-----------+--------+------------+---------------------------------------------------+</div><div class='head'>diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt<br/>index 28425f736756..b0bd51080799 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usbmon.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/usb/usbmon.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/usb/usbmon.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/usb/usbmon.txt</a></div><div class='hunk'>@@ -1,4 +1,9 @@</div><div class='del'>-* Introduction</div><div class='add'>+======</div><div class='add'>+usbmon</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'> The name "usbmon" in lowercase refers to a facility in kernel which is</div><div class='ctx'> used to collect traces of I/O on the USB bus. This function is analogous</div><div class='hunk'>@@ -16,7 +21,8 @@ Two APIs are currently implemented: "text" and "binary". The binary API</div><div class='ctx'> is available through a character device in /dev namespace and is an ABI.</div><div class='ctx'> The text API is deprecated since 2.6.35, but available for convenience.</div><div class='ctx'> </div><div class='del'>-* How to use usbmon to collect raw text traces</div><div class='add'>+How to use usbmon to collect raw text traces</div><div class='add'>+============================================</div><div class='ctx'> </div><div class='ctx'> Unlike the packet socket, usbmon has an interface which provides traces</div><div class='ctx'> in a text format. This is used for two purposes. First, it serves as a</div><div class='hunk'>@@ -26,38 +32,41 @@ are finalized. Second, humans can read it in case tools are not available.</div><div class='ctx'> To collect a raw text trace, execute following steps.</div><div class='ctx'> </div><div class='ctx'> 1. Prepare</div><div class='add'>+----------</div><div class='ctx'> </div><div class='ctx'> Mount debugfs (it has to be enabled in your kernel configuration), and</div><div class='ctx'> load the usbmon module (if built as module). The second step is skipped</div><div class='del'>-if usbmon is built into the kernel.</div><div class='add'>+if usbmon is built into the kernel::</div><div class='ctx'> </div><div class='del'>-# mount -t debugfs none_debugs /sys/kernel/debug</div><div class='del'>-# modprobe usbmon</div><div class='del'>-#</div><div class='add'>+	# mount -t debugfs none_debugs /sys/kernel/debug</div><div class='add'>+	# modprobe usbmon</div><div class='add'>+	#</div><div class='ctx'> </div><div class='del'>-Verify that bus sockets are present.</div><div class='add'>+Verify that bus sockets are present:</div><div class='ctx'> </div><div class='del'>-# ls /sys/kernel/debug/usb/usbmon</div><div class='del'>-0s  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u</div><div class='del'>-#</div><div class='add'>+	# ls /sys/kernel/debug/usb/usbmon</div><div class='add'>+	0s  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u</div><div class='add'>+	#</div><div class='ctx'> </div><div class='ctx'> Now you can choose to either use the socket '0u' (to capture packets on all</div><div class='ctx'> buses), and skip to step #3, or find the bus used by your device with step #2.</div><div class='ctx'> This allows to filter away annoying devices that talk continuously.</div><div class='ctx'> </div><div class='ctx'> 2. Find which bus connects to the desired device</div><div class='add'>+------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> Run "cat /sys/kernel/debug/usb/devices", and find the T-line which corresponds</div><div class='ctx'> to the device. Usually you do it by looking for the vendor string. If you have</div><div class='ctx'> many similar devices, unplug one and compare the two</div><div class='ctx'> /sys/kernel/debug/usb/devices outputs. The T-line will have a bus number.</div><div class='del'>-Example:</div><div class='ctx'> </div><div class='del'>-T:  Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 0</div><div class='del'>-D:  Ver= 1.10 Cls=00(&gt;ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1</div><div class='del'>-P:  Vendor=0557 ProdID=2004 Rev= 1.00</div><div class='del'>-S:  Manufacturer=ATEN</div><div class='del'>-S:  Product=UC100KM V2.00</div><div class='add'>+Example::</div><div class='add'>+</div><div class='add'>+  T:  Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 0</div><div class='add'>+  D:  Ver= 1.10 Cls=00(&gt;ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1</div><div class='add'>+  P:  Vendor=0557 ProdID=2004 Rev= 1.00</div><div class='add'>+  S:  Manufacturer=ATEN</div><div class='add'>+  S:  Product=UC100KM V2.00</div><div class='ctx'> </div><div class='ctx'> "Bus=03" means it's bus 3. Alternatively, you can look at the output from</div><div class='ctx'> "lsusb" and get the bus number from the appropriate line. Example:</div><div class='hunk'>@@ -65,23 +74,28 @@ S:  Product=UC100KM V2.00</div><div class='ctx'> Bus 003 Device 002: ID 0557:2004 ATEN UC100KM V2.00</div><div class='ctx'> </div><div class='ctx'> 3. Start 'cat'</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+::</div><div class='ctx'> </div><div class='del'>-# cat /sys/kernel/debug/usb/usbmon/3u &gt; /tmp/1.mon.out</div><div class='add'>+	# cat /sys/kernel/debug/usb/usbmon/3u &gt; /tmp/1.mon.out</div><div class='ctx'> </div><div class='del'>-to listen on a single bus, otherwise, to listen on all buses, type:</div><div class='add'>+to listen on a single bus, otherwise, to listen on all buses, type::</div><div class='ctx'> </div><div class='del'>-# cat /sys/kernel/debug/usb/usbmon/0u &gt; /tmp/1.mon.out</div><div class='add'>+	# cat /sys/kernel/debug/usb/usbmon/0u &gt; /tmp/1.mon.out</div><div class='ctx'> </div><div class='ctx'> This process will read until it is killed. Naturally, the output can be</div><div class='ctx'> redirected to a desirable location. This is preferred, because it is going</div><div class='ctx'> to be quite long.</div><div class='ctx'> </div><div class='ctx'> 4. Perform the desired operation on the USB bus</div><div class='add'>+-----------------------------------------------</div><div class='ctx'> </div><div class='ctx'> This is where you do something that creates the traffic: plug in a flash key,</div><div class='ctx'> copy files, control a webcam, etc.</div><div class='ctx'> </div><div class='ctx'> 5. Kill cat</div><div class='add'>+-----------</div><div class='ctx'> </div><div class='ctx'> Usually it's done with a keyboard interrupt (Control-C).</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +103,8 @@ At this point the output file (/tmp/1.mon.out in this example) can be saved,</div><div class='ctx'> sent by e-mail, or inspected with a text editor. In the last case make sure</div><div class='ctx'> that the file size is not excessive for your favourite editor.</div><div class='ctx'> </div><div class='del'>-* Raw text data format</div><div class='add'>+Raw text data format</div><div class='add'>+====================</div><div class='ctx'> </div><div class='ctx'> Two formats are supported currently: the original, or '1t' format, and</div><div class='ctx'> the '1u' format. The '1t' format is deprecated in kernel 2.6.21. The '1u'</div><div class='hunk'>@@ -122,10 +137,14 @@ Here is the list of words, from left to right:</div><div class='ctx'> - "Address" word (formerly a "pipe"). It consists of four fields, separated by</div><div class='ctx'>   colons: URB type and direction, Bus number, Device address, Endpoint number.</div><div class='ctx'>   Type and direction are encoded with two bytes in the following manner:</div><div class='add'>+</div><div class='add'>+    == ==   =============================</div><div class='ctx'>     Ci Co   Control input and output</div><div class='ctx'>     Zi Zo   Isochronous input and output</div><div class='ctx'>     Ii Io   Interrupt input and output</div><div class='ctx'>     Bi Bo   Bulk input and output</div><div class='add'>+    == ==   =============================</div><div class='add'>+</div><div class='ctx'>   Bus number, Device address, and Endpoint are decimal numbers, but they may</div><div class='ctx'>   have leading zeros, for the sake of human readers.</div><div class='ctx'> </div><div class='hunk'>@@ -178,24 +197,25 @@ Here is the list of words, from left to right:</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> </div><div class='del'>-An input control transfer to get a port status.</div><div class='add'>+An input control transfer to get a port status::</div><div class='ctx'> </div><div class='del'>-d5ea89a0 3575914555 S Ci:1:001:0 s a3 00 0000 0003 0004 4 &lt;</div><div class='del'>-d5ea89a0 3575914560 C Ci:1:001:0 0 4 = 01050000</div><div class='add'>+  d5ea89a0 3575914555 S Ci:1:001:0 s a3 00 0000 0003 0004 4 &lt;</div><div class='add'>+  d5ea89a0 3575914560 C Ci:1:001:0 0 4 = 01050000</div><div class='ctx'> </div><div class='ctx'> An output bulk transfer to send a SCSI command 0x28 (READ_10) in a 31-byte</div><div class='del'>-Bulk wrapper to a storage device at address 5:</div><div class='add'>+Bulk wrapper to a storage device at address 5::</div><div class='ctx'> </div><div class='del'>-dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 ad000000 00800000 80010a28 20000000 20000040 00000000 000000</div><div class='del'>-dd65f0e8 4128379808 C Bo:1:005:2 0 31 &gt;</div><div class='add'>+  dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 ad000000 00800000 80010a28 20000000 20000040 00000000 000000</div><div class='add'>+  dd65f0e8 4128379808 C Bo:1:005:2 0 31 &gt;</div><div class='ctx'> </div><div class='del'>-* Raw binary format and API</div><div class='add'>+Raw binary format and API</div><div class='add'>+=========================</div><div class='ctx'> </div><div class='ctx'> The overall architecture of the API is about the same as the one above,</div><div class='ctx'> only the events are delivered in binary format. Each event is sent in</div><div class='del'>-the following structure (its name is made up, so that we can refer to it):</div><div class='add'>+the following structure (its name is made up, so that we can refer to it)::</div><div class='ctx'> </div><div class='del'>-struct usbmon_packet {</div><div class='add'>+  struct usbmon_packet {</div><div class='ctx'> 	u64 id;			/*  0: URB ID - from submission to callback */</div><div class='ctx'> 	unsigned char type;	/*  8: Same as text; extensible. */</div><div class='ctx'> 	unsigned char xfer_type; /*    ISO (0), Intr, Control, Bulk (3) */</div><div class='hunk'>@@ -220,7 +240,7 @@ struct usbmon_packet {</div><div class='ctx'> 	int start_frame;	/* 52: For ISO */</div><div class='ctx'> 	unsigned int xfer_flags; /* 56: copy of URB's transfer_flags */</div><div class='ctx'> 	unsigned int ndesc;	/* 60: Actual number of ISO descriptors */</div><div class='del'>-};				/* 64 total length */</div><div class='add'>+  };				/* 64 total length */</div><div class='ctx'> </div><div class='ctx'> These events can be received from a character device by reading with read(2),</div><div class='ctx'> with an ioctl(2), or by accessing the buffer with mmap. However, read(2)</div><div class='hunk'>@@ -244,12 +264,12 @@ no events are available.</div><div class='ctx'> </div><div class='ctx'>  MON_IOCG_STATS, defined as _IOR(MON_IOC_MAGIC, 3, struct mon_bin_stats)</div><div class='ctx'> </div><div class='del'>-The argument is a pointer to the following structure:</div><div class='add'>+The argument is a pointer to the following structure::</div><div class='ctx'> </div><div class='del'>-struct mon_bin_stats {</div><div class='add'>+  struct mon_bin_stats {</div><div class='ctx'> 	u32 queued;</div><div class='ctx'> 	u32 dropped;</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='ctx'> The member "queued" refers to the number of events currently queued in the</div><div class='ctx'> buffer (and not to the number of events processed since the last reset).</div><div class='hunk'>@@ -273,13 +293,13 @@ This call returns the current size of the buffer in bytes.</div><div class='ctx'> </div><div class='ctx'> These calls wait for events to arrive if none were in the kernel buffer,</div><div class='ctx'> then return the first event. The argument is a pointer to the following</div><div class='del'>-structure:</div><div class='add'>+structure::</div><div class='ctx'> </div><div class='del'>-struct mon_get_arg {</div><div class='add'>+  struct mon_get_arg {</div><div class='ctx'> 	struct usbmon_packet *hdr;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	size_t alloc;		/* Length of data (can be zero) */</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='ctx'> Before the call, hdr, data, and alloc should be filled. Upon return, the area</div><div class='ctx'> pointed by hdr contains the next event structure, and the data buffer contains</div><div class='hunk'>@@ -290,13 +310,13 @@ The MON_IOCX_GET copies 48 bytes to hdr area, MON_IOCX_GETX copies 64 bytes.</div><div class='ctx'>  MON_IOCX_MFETCH, defined as _IOWR(MON_IOC_MAGIC, 7, struct mon_mfetch_arg)</div><div class='ctx'> </div><div class='ctx'> This ioctl is primarily used when the application accesses the buffer</div><div class='del'>-with mmap(2). Its argument is a pointer to the following structure:</div><div class='add'>+with mmap(2). Its argument is a pointer to the following structure::</div><div class='ctx'> </div><div class='del'>-struct mon_mfetch_arg {</div><div class='add'>+  struct mon_mfetch_arg {</div><div class='ctx'> 	uint32_t *offvec;	/* Vector of events fetched */</div><div class='ctx'> 	uint32_t nfetch;	/* Number of events to fetch (out: fetched) */</div><div class='ctx'> 	uint32_t nflush;	/* Number of events to flush */</div><div class='del'>-};</div><div class='add'>+  };</div><div class='ctx'> </div><div class='ctx'> The ioctl operates in 3 stages.</div><div class='ctx'> </div><div class='hunk'>@@ -329,7 +349,7 @@ be polled with select(2) and poll(2). But lseek(2) does not work.</div><div class='ctx'> The basic idea is simple:</div><div class='ctx'> </div><div class='ctx'> To prepare, map the buffer by getting the current size, then using mmap(2).</div><div class='del'>-Then, execute a loop similar to the one written in pseudo-code below:</div><div class='add'>+Then, execute a loop similar to the one written in pseudo-code below::</div><div class='ctx'> </div><div class='ctx'>    struct mon_mfetch_arg fetch;</div><div class='ctx'>    struct usbmon_packet *hdr;</div><div class='head'>diff --git a/Documentation/userspace-api/seccomp_filter.rst b/Documentation/userspace-api/seccomp_filter.rst<br/>index b1b846d8a094..bd9165241b6c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/userspace-api/seccomp_filter.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/userspace-api/seccomp_filter.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/userspace-api/seccomp_filter.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/userspace-api/seccomp_filter.rst</a></div><div class='hunk'>@@ -123,9 +123,9 @@ In precedence order, they are:</div><div class='ctx'> 	to userland as the errno without executing the system call.</div><div class='ctx'> </div><div class='ctx'> ``SECCOMP_RET_USER_NOTIF``:</div><div class='del'>-    Results in a ``struct seccomp_notif`` message sent on the userspace</div><div class='del'>-    notification fd, if it is attached, or ``-ENOSYS`` if it is not. See below</div><div class='del'>-    on discussion of how to handle user notifications.</div><div class='add'>+	Results in a ``struct seccomp_notif`` message sent on the userspace</div><div class='add'>+	notification fd, if it is attached, or ``-ENOSYS`` if it is not. See</div><div class='add'>+	below on discussion of how to handle user notifications.</div><div class='ctx'> </div><div class='ctx'> ``SECCOMP_RET_TRACE``:</div><div class='ctx'> 	When returned, this value will cause the kernel to attempt to</div><div class='hunk'>@@ -133,7 +133,7 @@ In precedence order, they are:</div><div class='ctx'> 	call.  If there is no tracer present, ``-ENOSYS`` is returned to</div><div class='ctx'> 	userland and the system call is not executed.</div><div class='ctx'> </div><div class='del'>-	A tracer will be notified if it requests ``PTRACE_O_TRACESECCOM``P</div><div class='add'>+	A tracer will be notified if it requests ``PTRACE_O_TRACESECCOMP``</div><div class='ctx'> 	using ``ptrace(PTRACE_SETOPTIONS)``.  The tracer will be notified</div><div class='ctx'> 	of a ``PTRACE_EVENT_SECCOMP`` and the ``SECCOMP_RET_DATA`` portion of</div><div class='ctx'> 	the BPF program return value will be available to the tracer</div><div class='head'>diff --git a/Documentation/video-output.txt b/Documentation/video-output.txt<br/>index e517011be4f9..56d6fa2e2368 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/video-output.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/video-output.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/video-output.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/video-output.txt</a></div><div class='hunk'>@@ -1,34 +1,34 @@</div><div class='add'>+Video Output Switcher Control</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='del'>-		Video Output Switcher Control</div><div class='del'>-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-		2006 luming.yu@intel.com</div><div class='add'>+2006 luming.yu@intel.com</div><div class='ctx'> </div><div class='ctx'> The output sysfs class driver provides an abstract video output layer that</div><div class='ctx'> can be used to hook platform specific methods to enable/disable video output</div><div class='ctx'> device through common sysfs interface. For example, on my IBM ThinkPad T42</div><div class='ctx'> laptop, The ACPI video driver registered its output devices and read/write</div><div class='del'>-method for 'state' with output sysfs class. The user interface under sysfs is:</div><div class='add'>+method for 'state' with output sysfs class. The user interface under sysfs is::</div><div class='ctx'> </div><div class='del'>-linux:/sys/class/video_output # tree .</div><div class='del'>-.</div><div class='del'>-|-- CRT0</div><div class='del'>-|   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='del'>-|   |-- state</div><div class='del'>-|   |-- subsystem -&gt; ../../../class/video_output</div><div class='del'>-|   `-- uevent</div><div class='del'>-|-- DVI0</div><div class='del'>-|   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='del'>-|   |-- state</div><div class='del'>-|   |-- subsystem -&gt; ../../../class/video_output</div><div class='del'>-|   `-- uevent</div><div class='del'>-|-- LCD0</div><div class='del'>-|   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='del'>-|   |-- state</div><div class='del'>-|   |-- subsystem -&gt; ../../../class/video_output</div><div class='del'>-|   `-- uevent</div><div class='del'>-`-- TV0</div><div class='del'>-   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='del'>-   |-- state</div><div class='del'>-   |-- subsystem -&gt; ../../../class/video_output</div><div class='del'>-   `-- uevent</div><div class='add'>+  linux:/sys/class/video_output # tree .</div><div class='add'>+  .</div><div class='add'>+  |-- CRT0</div><div class='add'>+  |   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='add'>+  |   |-- state</div><div class='add'>+  |   |-- subsystem -&gt; ../../../class/video_output</div><div class='add'>+  |   `-- uevent</div><div class='add'>+  |-- DVI0</div><div class='add'>+  |   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='add'>+  |   |-- state</div><div class='add'>+  |   |-- subsystem -&gt; ../../../class/video_output</div><div class='add'>+  |   `-- uevent</div><div class='add'>+  |-- LCD0</div><div class='add'>+  |   |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='add'>+  |   |-- state</div><div class='add'>+  |   |-- subsystem -&gt; ../../../class/video_output</div><div class='add'>+  |   `-- uevent</div><div class='add'>+  `-- TV0</div><div class='add'>+     |-- device -&gt; ../../../devices/pci0000:00/0000:00:01.0</div><div class='add'>+     |-- state</div><div class='add'>+     |-- subsystem -&gt; ../../../class/video_output</div><div class='add'>+     `-- uevent</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt<br/>index 7de9eee73fcd..64b38dfcc243 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/virtual/kvm/api.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/virtual/kvm/api.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/virtual/kvm/api.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/virtual/kvm/api.txt</a></div><div class='hunk'>@@ -5,25 +5,32 @@ The Definitive KVM (Kernel-based Virtual Machine) API Documentation</div><div class='ctx'> ----------------------</div><div class='ctx'> </div><div class='ctx'> The kvm API is a set of ioctls that are issued to control various aspects</div><div class='del'>-of a virtual machine.  The ioctls belong to three classes</div><div class='add'>+of a virtual machine.  The ioctls belong to three classes:</div><div class='ctx'> </div><div class='ctx'>  - System ioctls: These query and set global attributes which affect the</div><div class='ctx'>    whole kvm subsystem.  In addition a system ioctl is used to create</div><div class='del'>-   virtual machines</div><div class='add'>+   virtual machines.</div><div class='ctx'> </div><div class='ctx'>  - VM ioctls: These query and set attributes that affect an entire virtual</div><div class='ctx'>    machine, for example memory layout.  In addition a VM ioctl is used to</div><div class='del'>-   create virtual cpus (vcpus).</div><div class='add'>+   create virtual cpus (vcpus) and devices.</div><div class='ctx'> </div><div class='del'>-   Only run VM ioctls from the same process (address space) that was used</div><div class='del'>-   to create the VM.</div><div class='add'>+   VM ioctls must be issued from the same process (address space) that was</div><div class='add'>+   used to create the VM.</div><div class='ctx'> </div><div class='ctx'>  - vcpu ioctls: These query and set attributes that control the operation</div><div class='ctx'>    of a single virtual cpu.</div><div class='ctx'> </div><div class='del'>-   Only run vcpu ioctls from the same thread that was used to create the</div><div class='del'>-   vcpu.</div><div class='add'>+   vcpu ioctls should be issued from the same thread that was used to create</div><div class='add'>+   the vcpu, except for asynchronous vcpu ioctl that are marked as such in</div><div class='add'>+   the documentation.  Otherwise, the first ioctl after switching threads</div><div class='add'>+   could see a performance impact.</div><div class='ctx'> </div><div class='add'>+ - device ioctls: These query and set attributes that control the operation</div><div class='add'>+   of a single device.</div><div class='add'>+</div><div class='add'>+   device ioctls must be issued from the same process (address space) that</div><div class='add'>+   was used to create the VM.</div><div class='ctx'> </div><div class='ctx'> 2. File descriptors</div><div class='ctx'> -------------------</div><div class='hunk'>@@ -32,17 +39,34 @@ The kvm API is centered around file descriptors.  An initial</div><div class='ctx'> open("/dev/kvm") obtains a handle to the kvm subsystem; this handle</div><div class='ctx'> can be used to issue system ioctls.  A KVM_CREATE_VM ioctl on this</div><div class='ctx'> handle will create a VM file descriptor which can be used to issue VM</div><div class='del'>-ioctls.  A KVM_CREATE_VCPU ioctl on a VM fd will create a virtual cpu</div><div class='del'>-and return a file descriptor pointing to it.  Finally, ioctls on a vcpu</div><div class='del'>-fd can be used to control the vcpu, including the important task of</div><div class='del'>-actually running guest code.</div><div class='add'>+ioctls.  A KVM_CREATE_VCPU or KVM_CREATE_DEVICE ioctl on a VM fd will</div><div class='add'>+create a virtual cpu or device and return a file descriptor pointing to</div><div class='add'>+the new resource.  Finally, ioctls on a vcpu or device fd can be used</div><div class='add'>+to control the vcpu or device.  For vcpus, this includes the important</div><div class='add'>+task of actually running guest code.</div><div class='ctx'> </div><div class='ctx'> In general file descriptors can be migrated among processes by means</div><div class='ctx'> of fork() and the SCM_RIGHTS facility of unix domain socket.  These</div><div class='ctx'> kinds of tricks are explicitly not supported by kvm.  While they will</div><div class='ctx'> not cause harm to the host, their actual behavior is not guaranteed by</div><div class='del'>-the API.  The only supported use is one virtual machine per process,</div><div class='del'>-and one vcpu per thread.</div><div class='add'>+the API.  See "General description" for details on the ioctl usage</div><div class='add'>+model that is supported by KVM.</div><div class='add'>+</div><div class='add'>+It is important to note that althought VM ioctls may only be issued from</div><div class='add'>+the process that created the VM, a VM's lifecycle is associated with its</div><div class='add'>+file descriptor, not its creator (process).  In other words, the VM and</div><div class='add'>+its resources, *including the associated address space*, are not freed</div><div class='add'>+until the last reference to the VM's file descriptor has been released.</div><div class='add'>+For example, if fork() is issued after ioctl(KVM_CREATE_VM), the VM will</div><div class='add'>+not be freed until both the parent (original) process and its child have</div><div class='add'>+put their references to the VM's file descriptor.</div><div class='add'>+</div><div class='add'>+Because a VM's resources are not freed until the last reference to its</div><div class='add'>+file descriptor is released, creating additional references to a VM via</div><div class='add'>+via fork(), dup(), etc... without careful consideration is strongly</div><div class='add'>+discouraged and may have unwanted side effects, e.g. memory allocated</div><div class='add'>+by and on behalf of the VM's process may not be freed/unaccounted when</div><div class='add'>+the VM is shut down.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> It is important to note that althought VM ioctls may only be issued from</div><div class='hunk'>@@ -297,7 +321,7 @@ cpu's hardware control block.</div><div class='ctx'> 4.8 KVM_GET_DIRTY_LOG (vm ioctl)</div><div class='ctx'> </div><div class='ctx'> Capability: basic</div><div class='del'>-Architectures: x86</div><div class='add'>+Architectures: all</div><div class='ctx'> Type: vm ioctl</div><div class='ctx'> Parameters: struct kvm_dirty_log (in/out)</div><div class='ctx'> Returns: 0 on success, -1 on error</div><div class='hunk'>@@ -515,11 +539,15 @@ c) KVM_INTERRUPT_SET_LEVEL</div><div class='ctx'> Note that any value for 'irq' other than the ones stated above is invalid</div><div class='ctx'> and incurs unexpected behavior.</div><div class='ctx'> </div><div class='add'>+This is an asynchronous vcpu ioctl and can be invoked from any thread.</div><div class='add'>+</div><div class='ctx'> MIPS:</div><div class='ctx'> </div><div class='ctx'> Queues an external interrupt to be injected into the virtual CPU. A negative</div><div class='ctx'> interrupt number dequeues the interrupt.</div><div class='ctx'> </div><div class='add'>+This is an asynchronous vcpu ioctl and can be invoked from any thread.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 4.17 KVM_DEBUG_GUEST</div><div class='ctx'> </div><div class='hunk'>@@ -1086,14 +1114,12 @@ struct kvm_userspace_memory_region {</div><div class='ctx'> #define KVM_MEM_LOG_DIRTY_PAGES	(1UL &lt;&lt; 0)</div><div class='ctx'> #define KVM_MEM_READONLY	(1UL &lt;&lt; 1)</div><div class='ctx'> </div><div class='del'>-This ioctl allows the user to create or modify a guest physical memory</div><div class='del'>-slot.  When changing an existing slot, it may be moved in the guest</div><div class='del'>-physical memory space, or its flags may be modified.  It may not be</div><div class='del'>-resized.  Slots may not overlap in guest physical address space.</div><div class='del'>-Bits 0-15 of "slot" specifies the slot id and this value should be</div><div class='del'>-less than the maximum number of user memory slots supported per VM.</div><div class='del'>-The maximum allowed slots can be queried using KVM_CAP_NR_MEMSLOTS,</div><div class='del'>-if this capability is supported by the architecture.</div><div class='add'>+This ioctl allows the user to create, modify or delete a guest physical</div><div class='add'>+memory slot.  Bits 0-15 of "slot" specify the slot id and this value</div><div class='add'>+should be less than the maximum number of user memory slots supported per</div><div class='add'>+VM.  The maximum allowed slots can be queried using KVM_CAP_NR_MEMSLOTS,</div><div class='add'>+if this capability is supported by the architecture.  Slots may not</div><div class='add'>+overlap in guest physical address space.</div><div class='ctx'> </div><div class='ctx'> If KVM_CAP_MULTI_ADDRESS_SPACE is available, bits 16-31 of "slot"</div><div class='ctx'> specifies the address space which is being modified.  They must be</div><div class='hunk'>@@ -1102,6 +1128,10 @@ KVM_CAP_MULTI_ADDRESS_SPACE capability.  Slots in separate address spaces</div><div class='ctx'> are unrelated; the restriction on overlapping slots only applies within</div><div class='ctx'> each address space.</div><div class='ctx'> </div><div class='add'>+Deleting a slot is done by passing zero for memory_size.  When changing</div><div class='add'>+an existing slot, it may be moved in the guest physical memory space,</div><div class='add'>+or its flags may be modified, but it may not be resized.</div><div class='add'>+</div><div class='ctx'> Memory for the region is taken starting at the address denoted by the</div><div class='ctx'> field userspace_addr, which must point at user addressable memory for</div><div class='ctx'> the entire memory slot size.  Any object may back this memory, including</div><div class='hunk'>@@ -2493,7 +2523,7 @@ KVM_S390_MCHK (vm, vcpu) - machine check interrupt; cr 14 bits in parm,</div><div class='ctx'>                            machine checks needing further payload are not</div><div class='ctx'>                            supported by this ioctl)</div><div class='ctx'> </div><div class='del'>-Note that the vcpu ioctl is asynchronous to vcpu execution.</div><div class='add'>+This is an asynchronous vcpu ioctl and can be invoked from any thread.</div><div class='ctx'> </div><div class='ctx'> 4.78 KVM_PPC_GET_HTAB_FD</div><div class='ctx'> </div><div class='hunk'>@@ -3042,8 +3072,7 @@ KVM_S390_INT_EMERGENCY - sigp emergency; parameters in .emerg</div><div class='ctx'> KVM_S390_INT_EXTERNAL_CALL - sigp external call; parameters in .extcall</div><div class='ctx'> KVM_S390_MCHK - machine check interrupt; parameters in .mchk</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-Note that the vcpu ioctl is asynchronous to vcpu execution.</div><div class='add'>+This is an asynchronous vcpu ioctl and can be invoked from any thread.</div><div class='ctx'> </div><div class='ctx'> 4.94 KVM_S390_GET_IRQ_STATE</div><div class='ctx'> </div><div class='hunk'>@@ -3781,7 +3810,7 @@ to I/O ports.</div><div class='ctx'> 4.117 KVM_CLEAR_DIRTY_LOG (vm ioctl)</div><div class='ctx'> </div><div class='ctx'> Capability: KVM_CAP_MANUAL_DIRTY_LOG_PROTECT</div><div class='del'>-Architectures: x86</div><div class='add'>+Architectures: x86, arm, arm64, mips</div><div class='ctx'> Type: vm ioctl</div><div class='ctx'> Parameters: struct kvm_dirty_log (in)</div><div class='ctx'> Returns: 0 on success, -1 on error</div><div class='hunk'>@@ -3801,8 +3830,9 @@ The ioctl clears the dirty status of pages in a memory slot, according to</div><div class='ctx'> the bitmap that is passed in struct kvm_clear_dirty_log's dirty_bitmap</div><div class='ctx'> field.  Bit 0 of the bitmap corresponds to page "first_page" in the</div><div class='ctx'> memory slot, and num_pages is the size in bits of the input bitmap.</div><div class='del'>-Both first_page and num_pages must be a multiple of 64.  For each bit</div><div class='del'>-that is set in the input bitmap, the corresponding page is marked "clean"</div><div class='add'>+first_page must be a multiple of 64; num_pages must also be a multiple of</div><div class='add'>+64 unless first_page + num_pages is the size of the memory slot.  For each</div><div class='add'>+bit that is set in the input bitmap, the corresponding page is marked "clean"</div><div class='ctx'> in KVM's dirty bitmap, and dirty tracking is re-enabled for that page</div><div class='ctx'> (for example via write-protection, or by clearing the dirty bit in</div><div class='ctx'> a page table entry).</div><div class='hunk'>@@ -4770,7 +4800,7 @@ and injected exceptions.</div><div class='ctx'> </div><div class='ctx'> 7.18 KVM_CAP_MANUAL_DIRTY_LOG_PROTECT</div><div class='ctx'> </div><div class='del'>-Architectures: all</div><div class='add'>+Architectures: x86, arm, arm64, mips</div><div class='ctx'> Parameters: args[0] whether feature should be enabled or not</div><div class='ctx'> </div><div class='ctx'> With this capability enabled, KVM_GET_DIRTY_LOG will not automatically</div><div class='head'>diff --git a/Documentation/virtual/kvm/mmu.txt b/Documentation/virtual/kvm/mmu.txt<br/>index f365102c80f5..2efe0efc516e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/virtual/kvm/mmu.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/virtual/kvm/mmu.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/virtual/kvm/mmu.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/virtual/kvm/mmu.txt</a></div><div class='hunk'>@@ -142,7 +142,7 @@ Shadow pages contain the following information:</div><div class='ctx'>     If clear, this page corresponds to a guest page table denoted by the gfn</div><div class='ctx'>     field.</div><div class='ctx'>   role.quadrant:</div><div class='del'>-    When role.cr4_pae=0, the guest uses 32-bit gptes while the host uses 64-bit</div><div class='add'>+    When role.gpte_is_8_bytes=0, the guest uses 32-bit gptes while the host uses 64-bit</div><div class='ctx'>     sptes.  That means a guest page table contains more ptes than the host,</div><div class='ctx'>     so multiple shadow pages are needed to shadow one guest page.</div><div class='ctx'>     For first-level shadow pages, role.quadrant can be 0 or 1 and denotes the</div><div class='hunk'>@@ -158,9 +158,9 @@ Shadow pages contain the following information:</div><div class='ctx'>     The page is invalid and should not be used.  It is a root page that is</div><div class='ctx'>     currently pinned (by a cpu hardware register pointing to it); once it is</div><div class='ctx'>     unpinned it will be destroyed.</div><div class='del'>-  role.cr4_pae:</div><div class='del'>-    Contains the value of cr4.pae for which the page is valid (e.g. whether</div><div class='del'>-    32-bit or 64-bit gptes are in use).</div><div class='add'>+  role.gpte_is_8_bytes:</div><div class='add'>+    Reflects the size of the guest PTE for which the page is valid, i.e. '1'</div><div class='add'>+    if 64-bit gptes are in use, '0' if 32-bit gptes are in use.</div><div class='ctx'>   role.nxe:</div><div class='ctx'>     Contains the value of efer.nxe for which the page is valid.</div><div class='ctx'>   role.cr0_wp:</div><div class='hunk'>@@ -173,6 +173,9 @@ Shadow pages contain the following information:</div><div class='ctx'>     Contains the value of cr4.smap &amp;&amp; !cr0.wp for which the page is valid</div><div class='ctx'>     (pages for which this is true are different from other pages; see the</div><div class='ctx'>     treatment of cr0.wp=0 below).</div><div class='add'>+  role.ept_sp:</div><div class='add'>+    This is a virtual flag to denote a shadowed nested EPT page.  ept_sp</div><div class='add'>+    is true if "cr0_wp &amp;&amp; smap_andnot_wp", an otherwise invalid combination.</div><div class='ctx'>   role.smm:</div><div class='ctx'>     Is 1 if the page is valid in system management mode.  This field</div><div class='ctx'>     determines which of the kvm_memslots array was used to build this</div><div class='head'>diff --git a/Documentation/vm/hugetlbfs_reserv.rst b/Documentation/vm/hugetlbfs_reserv.rst<br/>index 9d200762114f..f143954e0d05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/hugetlbfs_reserv.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/hugetlbfs_reserv.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/hugetlbfs_reserv.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/vm/hugetlbfs_reserv.rst</a></div><div class='hunk'>@@ -85,10 +85,10 @@ Reservation Map Location (Private or Shared)</div><div class='ctx'> A huge page mapping or segment is either private or shared.  If private,</div><div class='ctx'> it is typically only available to a single address space (task).  If shared,</div><div class='ctx'> it can be mapped into multiple address spaces (tasks).  The location and</div><div class='del'>-semantics of the reservation map is significantly different for two types</div><div class='add'>+semantics of the reservation map is significantly different for the two types</div><div class='ctx'> of mappings.  Location differences are:</div><div class='ctx'> </div><div class='del'>-- For private mappings, the reservation map hangs off the the VMA structure.</div><div class='add'>+- For private mappings, the reservation map hangs off the VMA structure.</div><div class='ctx'>   Specifically, vma-&gt;vm_private_data.  This reserve map is created at the</div><div class='ctx'>   time the mapping (mmap(MAP_PRIVATE)) is created.</div><div class='ctx'> - For shared mappings, the reservation map hangs off the inode.  Specifically,</div><div class='hunk'>@@ -109,15 +109,15 @@ These operations result in a call to the routine hugetlb_reserve_pages()::</div><div class='ctx'> 				  struct vm_area_struct *vma,</div><div class='ctx'> 				  vm_flags_t vm_flags)</div><div class='ctx'> </div><div class='del'>-The first thing hugetlb_reserve_pages() does is check for the NORESERVE</div><div class='add'>+The first thing hugetlb_reserve_pages() does is check if the NORESERVE</div><div class='ctx'> flag was specified in either the shmget() or mmap() call.  If NORESERVE</div><div class='del'>-was specified, then this routine returns immediately as no reservation</div><div class='add'>+was specified, then this routine returns immediately as no reservations</div><div class='ctx'> are desired.</div><div class='ctx'> </div><div class='ctx'> The arguments 'from' and 'to' are huge page indices into the mapping or</div><div class='ctx'> underlying file.  For shmget(), 'from' is always 0 and 'to' corresponds to</div><div class='ctx'> the length of the segment/mapping.  For mmap(), the offset argument could</div><div class='del'>-be used to specify the offset into the underlying file.  In such a case</div><div class='add'>+be used to specify the offset into the underlying file.  In such a case,</div><div class='ctx'> the 'from' and 'to' arguments have been adjusted by this offset.</div><div class='ctx'> </div><div class='ctx'> One of the big differences between PRIVATE and SHARED mappings is the way</div><div class='hunk'>@@ -138,7 +138,8 @@ to indicate this VMA owns the reservations.</div><div class='ctx'> </div><div class='ctx'> The reservation map is consulted to determine how many huge page reservations</div><div class='ctx'> are needed for the current mapping/segment.  For private mappings, this is</div><div class='del'>-always the value (to - from).  However, for shared mappings it is possible that some reservations may already exist within the range (to - from).  See the</div><div class='add'>+always the value (to - from).  However, for shared mappings it is possible that</div><div class='add'>+some reservations may already exist within the range (to - from).  See the</div><div class='ctx'> section :ref:`Reservation Map Modifications &lt;resv_map_modifications&gt;`</div><div class='ctx'> for details on how this is accomplished.</div><div class='ctx'> </div><div class='hunk'>@@ -165,7 +166,7 @@ these counters.</div><div class='ctx'> If there were enough free huge pages and the global count resv_huge_pages</div><div class='ctx'> was adjusted, then the reservation map associated with the mapping is</div><div class='ctx'> modified to reflect the reservations.  In the case of a shared mapping, a</div><div class='del'>-file_region will exist that includes the range 'from' 'to'.  For private</div><div class='add'>+file_region will exist that includes the range 'from' - 'to'.  For private</div><div class='ctx'> mappings, no modifications are made to the reservation map as lack of an</div><div class='ctx'> entry indicates a reservation exists.</div><div class='ctx'> </div><div class='hunk'>@@ -239,7 +240,7 @@ subpool accounting when the page is freed.</div><div class='ctx'> The routine vma_commit_reservation() is then called to adjust the reserve</div><div class='ctx'> map based on the consumption of the reservation.  In general, this involves</div><div class='ctx'> ensuring the page is represented within a file_region structure of the region</div><div class='del'>-map.  For shared mappings where the the reservation was present, an entry</div><div class='add'>+map.  For shared mappings where the reservation was present, an entry</div><div class='ctx'> in the reserve map already existed so no change is made.  However, if there</div><div class='ctx'> was no reservation in a shared mapping or this was a private mapping a new</div><div class='ctx'> entry must be created.</div><div class='head'>diff --git a/Documentation/vm/index.rst b/Documentation/vm/index.rst<br/>index b58cc3bfe777..e8d943b21cf9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/index.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/index.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/index.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/vm/index.rst</a></div><div class='hunk'>@@ -37,6 +37,7 @@ descriptions of data structures and algorithms.</div><div class='ctx'>    hwpoison</div><div class='ctx'>    hugetlbfs_reserv</div><div class='ctx'>    ksm</div><div class='add'>+   memory-model</div><div class='ctx'>    mmu_notifier</div><div class='ctx'>    numa</div><div class='ctx'>    overcommit-accounting</div><div class='head'>diff --git a/Documentation/vm/memory-model.rst b/Documentation/vm/memory-model.rst<br/>new file mode 100644<br/>index 000000000000..382f72ace1fc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/memory-model.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/vm/memory-model.rst</a></div><div class='hunk'>@@ -0,0 +1,183 @@</div><div class='add'>+.. SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+.. _physical_memory_model:</div><div class='add'>+</div><div class='add'>+=====================</div><div class='add'>+Physical Memory Model</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Physical memory in a system may be addressed in different ways. The</div><div class='add'>+simplest case is when the physical memory starts at address 0 and</div><div class='add'>+spans a contiguous range up to the maximal address. It could be,</div><div class='add'>+however, that this range contains small holes that are not accessible</div><div class='add'>+for the CPU. Then there could be several contiguous ranges at</div><div class='add'>+completely distinct addresses. And, don't forget about NUMA, where</div><div class='add'>+different memory banks are attached to different CPUs.</div><div class='add'>+</div><div class='add'>+Linux abstracts this diversity using one of the three memory models:</div><div class='add'>+FLATMEM, DISCONTIGMEM and SPARSEMEM. Each architecture defines what</div><div class='add'>+memory models it supports, what the default memory model is and</div><div class='add'>+whether it is possible to manually override that default.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+   At time of this writing, DISCONTIGMEM is considered deprecated,</div><div class='add'>+   although it is still in use by several architectures.</div><div class='add'>+</div><div class='add'>+All the memory models track the status of physical page frames using</div><div class='add'>+:c:type:`struct page` arranged in one or more arrays.</div><div class='add'>+</div><div class='add'>+Regardless of the selected memory model, there exists one-to-one</div><div class='add'>+mapping between the physical page frame number (PFN) and the</div><div class='add'>+corresponding `struct page`.</div><div class='add'>+</div><div class='add'>+Each memory model defines :c:func:`pfn_to_page` and :c:func:`page_to_pfn`</div><div class='add'>+helpers that allow the conversion from PFN to `struct page` and vice</div><div class='add'>+versa.</div><div class='add'>+</div><div class='add'>+FLATMEM</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+The simplest memory model is FLATMEM. This model is suitable for</div><div class='add'>+non-NUMA systems with contiguous, or mostly contiguous, physical</div><div class='add'>+memory.</div><div class='add'>+</div><div class='add'>+In the FLATMEM memory model, there is a global `mem_map` array that</div><div class='add'>+maps the entire physical memory. For most architectures, the holes</div><div class='add'>+have entries in the `mem_map` array. The `struct page` objects</div><div class='add'>+corresponding to the holes are never fully initialized.</div><div class='add'>+</div><div class='add'>+To allocate the `mem_map` array, architecture specific setup code</div><div class='add'>+should call :c:func:`free_area_init_node` function or its convenience</div><div class='add'>+wrapper :c:func:`free_area_init`. Yet, the mappings array is not</div><div class='add'>+usable until the call to :c:func:`memblock_free_all` that hands all</div><div class='add'>+the memory to the page allocator.</div><div class='add'>+</div><div class='add'>+If an architecture enables `CONFIG_ARCH_HAS_HOLES_MEMORYMODEL` option,</div><div class='add'>+it may free parts of the `mem_map` array that do not cover the</div><div class='add'>+actual physical pages. In such case, the architecture specific</div><div class='add'>+:c:func:`pfn_valid` implementation should take the holes in the</div><div class='add'>+`mem_map` into account.</div><div class='add'>+</div><div class='add'>+With FLATMEM, the conversion between a PFN and the `struct page` is</div><div class='add'>+straightforward: `PFN - ARCH_PFN_OFFSET` is an index to the</div><div class='add'>+`mem_map` array.</div><div class='add'>+</div><div class='add'>+The `ARCH_PFN_OFFSET` defines the first page frame number for</div><div class='add'>+systems with physical memory starting at address different from 0.</div><div class='add'>+</div><div class='add'>+DISCONTIGMEM</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The DISCONTIGMEM model treats the physical memory as a collection of</div><div class='add'>+`nodes` similarly to how Linux NUMA support does. For each node Linux</div><div class='add'>+constructs an independent memory management subsystem represented by</div><div class='add'>+`struct pglist_data` (or `pg_data_t` for short). Among other</div><div class='add'>+things, `pg_data_t` holds the `node_mem_map` array that maps</div><div class='add'>+physical pages belonging to that node. The `node_start_pfn` field of</div><div class='add'>+`pg_data_t` is the number of the first page frame belonging to that</div><div class='add'>+node.</div><div class='add'>+</div><div class='add'>+The architecture setup code should call :c:func:`free_area_init_node` for</div><div class='add'>+each node in the system to initialize the `pg_data_t` object and its</div><div class='add'>+`node_mem_map`.</div><div class='add'>+</div><div class='add'>+Every `node_mem_map` behaves exactly as FLATMEM's `mem_map` -</div><div class='add'>+every physical page frame in a node has a `struct page` entry in the</div><div class='add'>+`node_mem_map` array. When DISCONTIGMEM is enabled, a portion of the</div><div class='add'>+`flags` field of the `struct page` encodes the node number of the</div><div class='add'>+node hosting that page.</div><div class='add'>+</div><div class='add'>+The conversion between a PFN and the `struct page` in the</div><div class='add'>+DISCONTIGMEM model became slightly more complex as it has to determine</div><div class='add'>+which node hosts the physical page and which `pg_data_t` object</div><div class='add'>+holds the `struct page`.</div><div class='add'>+</div><div class='add'>+Architectures that support DISCONTIGMEM provide :c:func:`pfn_to_nid`</div><div class='add'>+to convert PFN to the node number. The opposite conversion helper</div><div class='add'>+:c:func:`page_to_nid` is generic as it uses the node number encoded in</div><div class='add'>+page-&gt;flags.</div><div class='add'>+</div><div class='add'>+Once the node number is known, the PFN can be used to index</div><div class='add'>+appropriate `node_mem_map` array to access the `struct page` and</div><div class='add'>+the offset of the `struct page` from the `node_mem_map` plus</div><div class='add'>+`node_start_pfn` is the PFN of that page.</div><div class='add'>+</div><div class='add'>+SPARSEMEM</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+SPARSEMEM is the most versatile memory model available in Linux and it</div><div class='add'>+is the only memory model that supports several advanced features such</div><div class='add'>+as hot-plug and hot-remove of the physical memory, alternative memory</div><div class='add'>+maps for non-volatile memory devices and deferred initialization of</div><div class='add'>+the memory map for larger systems.</div><div class='add'>+</div><div class='add'>+The SPARSEMEM model presents the physical memory as a collection of</div><div class='add'>+sections. A section is represented with :c:type:`struct mem_section`</div><div class='add'>+that contains `section_mem_map` that is, logically, a pointer to an</div><div class='add'>+array of struct pages. However, it is stored with some other magic</div><div class='add'>+that aids the sections management. The section size and maximal number</div><div class='add'>+of section is specified using `SECTION_SIZE_BITS` and</div><div class='add'>+`MAX_PHYSMEM_BITS` constants defined by each architecture that</div><div class='add'>+supports SPARSEMEM. While `MAX_PHYSMEM_BITS` is an actual width of a</div><div class='add'>+physical address that an architecture supports, the</div><div class='add'>+`SECTION_SIZE_BITS` is an arbitrary value.</div><div class='add'>+</div><div class='add'>+The maximal number of sections is denoted `NR_MEM_SECTIONS` and</div><div class='add'>+defined as</div><div class='add'>+</div><div class='add'>+.. math::</div><div class='add'>+</div><div class='add'>+   NR\_MEM\_SECTIONS = 2 ^ {(MAX\_PHYSMEM\_BITS - SECTION\_SIZE\_BITS)}</div><div class='add'>+</div><div class='add'>+The `mem_section` objects are arranged in a two-dimensional array</div><div class='add'>+called `mem_sections`. The size and placement of this array depend</div><div class='add'>+on `CONFIG_SPARSEMEM_EXTREME` and the maximal possible number of</div><div class='add'>+sections:</div><div class='add'>+</div><div class='add'>+* When `CONFIG_SPARSEMEM_EXTREME` is disabled, the `mem_sections`</div><div class='add'>+  array is static and has `NR_MEM_SECTIONS` rows. Each row holds a</div><div class='add'>+  single `mem_section` object.</div><div class='add'>+* When `CONFIG_SPARSEMEM_EXTREME` is enabled, the `mem_sections`</div><div class='add'>+  array is dynamically allocated. Each row contains PAGE_SIZE worth of</div><div class='add'>+  `mem_section` objects and the number of rows is calculated to fit</div><div class='add'>+  all the memory sections.</div><div class='add'>+</div><div class='add'>+The architecture setup code should call :c:func:`memory_present` for</div><div class='add'>+each active memory range or use :c:func:`memblocks_present` or</div><div class='add'>+:c:func:`sparse_memory_present_with_active_regions` wrappers to</div><div class='add'>+initialize the memory sections. Next, the actual memory maps should be</div><div class='add'>+set up using :c:func:`sparse_init`.</div><div class='add'>+</div><div class='add'>+With SPARSEMEM there are two possible ways to convert a PFN to the</div><div class='add'>+corresponding `struct page` - a "classic sparse" and "sparse</div><div class='add'>+vmemmap". The selection is made at build time and it is determined by</div><div class='add'>+the value of `CONFIG_SPARSEMEM_VMEMMAP`.</div><div class='add'>+</div><div class='add'>+The classic sparse encodes the section number of a page in page-&gt;flags</div><div class='add'>+and uses high bits of a PFN to access the section that maps that page</div><div class='add'>+frame. Inside a section, the PFN is the index to the array of pages.</div><div class='add'>+</div><div class='add'>+The sparse vmemmap uses a virtually mapped memory map to optimize</div><div class='add'>+pfn_to_page and page_to_pfn operations. There is a global `struct</div><div class='add'>+page *vmemmap` pointer that points to a virtually contiguous array of</div><div class='add'>+`struct page` objects. A PFN is an index to that array and the the</div><div class='add'>+offset of the `struct page` from `vmemmap` is the PFN of that</div><div class='add'>+page.</div><div class='add'>+</div><div class='add'>+To use vmemmap, an architecture has to reserve a range of virtual</div><div class='add'>+addresses that will map the physical pages containing the memory</div><div class='add'>+map and make sure that `vmemmap` points to that range. In addition,</div><div class='add'>+the architecture should implement :c:func:`vmemmap_populate` method</div><div class='add'>+that will allocate the physical memory and create page tables for the</div><div class='add'>+virtual memory map. If an architecture does not have any special</div><div class='add'>+requirements for the vmemmap mappings, it can use default</div><div class='add'>+:c:func:`vmemmap_populate_basepages` provided by the generic memory</div><div class='add'>+management.</div><div class='add'>+</div><div class='add'>+The virtually mapped memory map allows storing `struct page` objects</div><div class='add'>+for persistent memory devices in pre-allocated storage on those</div><div class='add'>+devices. This storage is represented with :c:type:`struct vmem_altmap`</div><div class='add'>+that is eventually passed to vmemmap_populate() through a long chain</div><div class='add'>+of function calls. The vmemmap_populate() implementation may use the</div><div class='add'>+`vmem_altmap` along with :c:func:`altmap_alloc_block_buf` helper to</div><div class='add'>+allocate memory map on the persistent memory device.</div><div class='head'>diff --git a/Documentation/vm/numa.rst b/Documentation/vm/numa.rst<br/>index 185d8a568168..5cae13e9a08b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/numa.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/numa.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/numa.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/vm/numa.rst</a></div><div class='hunk'>@@ -109,8 +109,8 @@ System administrators and application designers can restrict a task's migration</div><div class='ctx'> to improve NUMA locality using various CPU affinity command line interfaces,</div><div class='ctx'> such as taskset(1) and numactl(1), and program interfaces such as</div><div class='ctx'> sched_setaffinity(2).  Further, one can modify the kernel's default local</div><div class='del'>-allocation behavior using Linux NUMA memory policy.</div><div class='del'>-[see Documentation/admin-guide/mm/numa_memory_policy.rst.]</div><div class='add'>+allocation behavior using Linux NUMA memory policy. [see</div><div class='add'>+:ref:`Documentation/admin-guide/mm/numa_memory_policy.rst &lt;numa_memory_policy&gt;`].</div><div class='ctx'> </div><div class='ctx'> System administrators can restrict the CPUs and nodes' memories that a non-</div><div class='ctx'> privileged user can specify in the scheduling or NUMA commands and functions</div><div class='head'>diff --git a/Documentation/vm/transhuge.rst b/Documentation/vm/transhuge.rst<br/>index a8cf6809e36e..37c57ca32629 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/transhuge.rst?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/vm/transhuge.rst</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/vm/transhuge.rst?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/vm/transhuge.rst</a></div><div class='hunk'>@@ -4,8 +4,9 @@</div><div class='ctx'> Transparent Hugepage Support</div><div class='ctx'> ============================</div><div class='ctx'> </div><div class='del'>-This document describes design principles Transparent Hugepage (THP)</div><div class='del'>-Support and its interaction with other parts of the memory management.</div><div class='add'>+This document describes design principles for Transparent Hugepage (THP)</div><div class='add'>+support and its interaction with other parts of the memory management</div><div class='add'>+system.</div><div class='ctx'> </div><div class='ctx'> Design principles</div><div class='ctx'> =================</div><div class='hunk'>@@ -37,31 +38,25 @@ get_user_pages and follow_page</div><div class='ctx'> </div><div class='ctx'> get_user_pages and follow_page if run on a hugepage, will return the</div><div class='ctx'> head or tail pages as usual (exactly as they would do on</div><div class='del'>-hugetlbfs). Most gup users will only care about the actual physical</div><div class='add'>+hugetlbfs). Most GUP users will only care about the actual physical</div><div class='ctx'> address of the page and its temporary pinning to release after the I/O</div><div class='ctx'> is complete, so they won't ever notice the fact the page is huge. But</div><div class='ctx'> if any driver is going to mangle over the page structure of the tail</div><div class='ctx'> page (like for checking page-&gt;mapping or other bits that are relevant</div><div class='ctx'> for the head page and not the tail page), it should be updated to jump</div><div class='del'>-to check head page instead. Taking reference on any head/tail page would</div><div class='del'>-prevent page from being split by anyone.</div><div class='add'>+to check head page instead. Taking a reference on any head/tail page would</div><div class='add'>+prevent the page from being split by anyone.</div><div class='ctx'> </div><div class='ctx'> .. note::</div><div class='ctx'>    these aren't new constraints to the GUP API, and they match the</div><div class='del'>-   same constrains that applies to hugetlbfs too, so any driver capable</div><div class='add'>+   same constraints that apply to hugetlbfs too, so any driver capable</div><div class='ctx'>    of handling GUP on hugetlbfs will also work fine on transparent</div><div class='ctx'>    hugepage backed mappings.</div><div class='ctx'> </div><div class='ctx'> In case you can't handle compound pages if they're returned by</div><div class='del'>-follow_page, the FOLL_SPLIT bit can be specified as parameter to</div><div class='add'>+follow_page, the FOLL_SPLIT bit can be specified as a parameter to</div><div class='ctx'> follow_page, so that it will split the hugepages before returning</div><div class='del'>-them. Migration for example passes FOLL_SPLIT as parameter to</div><div class='del'>-follow_page because it's not hugepage aware and in fact it can't work</div><div class='del'>-at all on hugetlbfs (but it instead works fine on transparent</div><div class='del'>-hugepages thanks to FOLL_SPLIT). migration simply can't deal with</div><div class='del'>-hugepages being returned (as it's not only checking the pfn of the</div><div class='del'>-page and pinning it during the copy but it pretends to migrate the</div><div class='del'>-memory in regular page sizes and with regular pte/pmd mappings).</div><div class='add'>+them.</div><div class='ctx'> </div><div class='ctx'> Graceful fallback</div><div class='ctx'> =================</div><div class='hunk'>@@ -72,11 +67,11 @@ pmd_offset. It's trivial to make the code transparent hugepage aware</div><div class='ctx'> by just grepping for "pmd_offset" and adding split_huge_pmd where</div><div class='ctx'> missing after pmd_offset returns the pmd. Thanks to the graceful</div><div class='ctx'> fallback design, with a one liner change, you can avoid to write</div><div class='del'>-hundred if not thousand of lines of complex code to make your code</div><div class='add'>+hundreds if not thousands of lines of complex code to make your code</div><div class='ctx'> hugepage aware.</div><div class='ctx'> </div><div class='ctx'> If you're not walking pagetables but you run into a physical hugepage</div><div class='del'>-but you can't handle it natively in your code, you can split it by</div><div class='add'>+that you can't handle natively in your code, you can split it by</div><div class='ctx'> calling split_huge_page(page). This is what the Linux VM does before</div><div class='ctx'> it tries to swapout the hugepage for example. split_huge_page() can fail</div><div class='ctx'> if the page is pinned and you must handle this correctly.</div><div class='hunk'>@@ -103,18 +98,18 @@ split_huge_page() or split_huge_pmd() has a cost.</div><div class='ctx'> </div><div class='ctx'> To make pagetable walks huge pmd aware, all you need to do is to call</div><div class='ctx'> pmd_trans_huge() on the pmd returned by pmd_offset. You must hold the</div><div class='del'>-mmap_sem in read (or write) mode to be sure an huge pmd cannot be</div><div class='add'>+mmap_sem in read (or write) mode to be sure a huge pmd cannot be</div><div class='ctx'> created from under you by khugepaged (khugepaged collapse_huge_page</div><div class='ctx'> takes the mmap_sem in write mode in addition to the anon_vma lock). If</div><div class='ctx'> pmd_trans_huge returns false, you just fallback in the old code</div><div class='ctx'> paths. If instead pmd_trans_huge returns true, you have to take the</div><div class='ctx'> page table lock (pmd_lock()) and re-run pmd_trans_huge. Taking the</div><div class='del'>-page table lock will prevent the huge pmd to be converted into a</div><div class='add'>+page table lock will prevent the huge pmd being converted into a</div><div class='ctx'> regular pmd from under you (split_huge_pmd can run in parallel to the</div><div class='ctx'> pagetable walk). If the second pmd_trans_huge returns false, you</div><div class='ctx'> should just drop the page table lock and fallback to the old code as</div><div class='del'>-before. Otherwise you can proceed to process the huge pmd and the</div><div class='del'>-hugepage natively. Once finished you can drop the page table lock.</div><div class='add'>+before. Otherwise, you can proceed to process the huge pmd and the</div><div class='add'>+hugepage natively. Once finished, you can drop the page table lock.</div><div class='ctx'> </div><div class='ctx'> Refcounts and transparent huge pages</div><div class='ctx'> ====================================</div><div class='hunk'>@@ -122,61 +117,61 @@ Refcounts and transparent huge pages</div><div class='ctx'> Refcounting on THP is mostly consistent with refcounting on other compound</div><div class='ctx'> pages:</div><div class='ctx'> </div><div class='del'>-  - get_page()/put_page() and GUP operate in head page's -&gt;_refcount.</div><div class='add'>+  - get_page()/put_page() and GUP operate on head page's -&gt;_refcount.</div><div class='ctx'> </div><div class='ctx'>   - -&gt;_refcount in tail pages is always zero: get_page_unless_zero() never</div><div class='del'>-    succeed on tail pages.</div><div class='add'>+    succeeds on tail pages.</div><div class='ctx'> </div><div class='ctx'>   - map/unmap of the pages with PTE entry increment/decrement -&gt;_mapcount</div><div class='ctx'>     on relevant sub-page of the compound page.</div><div class='ctx'> </div><div class='del'>-  - map/unmap of the whole compound page accounted in compound_mapcount</div><div class='add'>+  - map/unmap of the whole compound page is accounted for in compound_mapcount</div><div class='ctx'>     (stored in first tail page). For file huge pages, we also increment</div><div class='ctx'>     -&gt;_mapcount of all sub-pages in order to have race-free detection of</div><div class='ctx'>     last unmap of subpages.</div><div class='ctx'> </div><div class='ctx'> PageDoubleMap() indicates that the page is *possibly* mapped with PTEs.</div><div class='ctx'> </div><div class='del'>-For anonymous pages PageDoubleMap() also indicates -&gt;_mapcount in all</div><div class='add'>+For anonymous pages, PageDoubleMap() also indicates -&gt;_mapcount in all</div><div class='ctx'> subpages is offset up by one. This additional reference is required to</div><div class='ctx'> get race-free detection of unmap of subpages when we have them mapped with</div><div class='ctx'> both PMDs and PTEs.</div><div class='ctx'> </div><div class='del'>-This is optimization required to lower overhead of per-subpage mapcount</div><div class='del'>-tracking. The alternative is alter -&gt;_mapcount in all subpages on each</div><div class='add'>+This optimization is required to lower the overhead of per-subpage mapcount</div><div class='add'>+tracking. The alternative is to alter -&gt;_mapcount in all subpages on each</div><div class='ctx'> map/unmap of the whole compound page.</div><div class='ctx'> </div><div class='del'>-For anonymous pages, we set PG_double_map when a PMD of the page got split</div><div class='del'>-for the first time, but still have PMD mapping. The additional references</div><div class='del'>-go away with last compound_mapcount.</div><div class='add'>+For anonymous pages, we set PG_double_map when a PMD of the page is split</div><div class='add'>+for the first time, but still have a PMD mapping. The additional references</div><div class='add'>+go away with the last compound_mapcount.</div><div class='ctx'> </div><div class='del'>-File pages get PG_double_map set on first map of the page with PTE and</div><div class='del'>-goes away when the page gets evicted from page cache.</div><div class='add'>+File pages get PG_double_map set on the first map of the page with PTE and</div><div class='add'>+goes away when the page gets evicted from the page cache.</div><div class='ctx'> </div><div class='ctx'> split_huge_page internally has to distribute the refcounts in the head</div><div class='ctx'> page to the tail pages before clearing all PG_head/tail bits from the page</div><div class='ctx'> structures. It can be done easily for refcounts taken by page table</div><div class='del'>-entries. But we don't have enough information on how to distribute any</div><div class='add'>+entries, but we don't have enough information on how to distribute any</div><div class='ctx'> additional pins (i.e. from get_user_pages). split_huge_page() fails any</div><div class='del'>-requests to split pinned huge page: it expects page count to be equal to</div><div class='del'>-sum of mapcount of all sub-pages plus one (split_huge_page caller must</div><div class='del'>-have reference for head page).</div><div class='add'>+requests to split pinned huge pages: it expects page count to be equal to</div><div class='add'>+the sum of mapcount of all sub-pages plus one (split_huge_page caller must</div><div class='add'>+have a reference to the head page).</div><div class='ctx'> </div><div class='ctx'> split_huge_page uses migration entries to stabilize page-&gt;_refcount and</div><div class='del'>-page-&gt;_mapcount of anonymous pages. File pages just got unmapped.</div><div class='add'>+page-&gt;_mapcount of anonymous pages. File pages just get unmapped.</div><div class='ctx'> </div><div class='del'>-We safe against physical memory scanners too: the only legitimate way</div><div class='del'>-scanner can get reference to a page is get_page_unless_zero().</div><div class='add'>+We are safe against physical memory scanners too: the only legitimate way</div><div class='add'>+a scanner can get a reference to a page is get_page_unless_zero().</div><div class='ctx'> </div><div class='ctx'> All tail pages have zero -&gt;_refcount until atomic_add(). This prevents the</div><div class='ctx'> scanner from getting a reference to the tail page up to that point. After the</div><div class='del'>-atomic_add() we don't care about the -&gt;_refcount value. We already known how</div><div class='add'>+atomic_add() we don't care about the -&gt;_refcount value. We already know how</div><div class='ctx'> many references should be uncharged from the head page.</div><div class='ctx'> </div><div class='ctx'> For head page get_page_unless_zero() will succeed and we don't mind. It's</div><div class='del'>-clear where reference should go after split: it will stay on head page.</div><div class='add'>+clear where references should go after split: it will stay on the head page.</div><div class='ctx'> </div><div class='del'>-Note that split_huge_pmd() doesn't have any limitation on refcounting:</div><div class='add'>+Note that split_huge_pmd() doesn't have any limitations on refcounting:</div><div class='ctx'> pmd can be split at any point and never fails.</div><div class='ctx'> </div><div class='ctx'> Partial unmap and deferred_split_huge_page()</div><div class='hunk'>@@ -188,10 +183,10 @@ in page_remove_rmap() and queue the THP for splitting if memory pressure</div><div class='ctx'> comes. Splitting will free up unused subpages.</div><div class='ctx'> </div><div class='ctx'> Splitting the page right away is not an option due to locking context in</div><div class='del'>-the place where we can detect partial unmap. It's also might be</div><div class='add'>+the place where we can detect partial unmap. It also might be</div><div class='ctx'> counterproductive since in many cases partial unmap happens during exit(2) if</div><div class='ctx'> a THP crosses a VMA boundary.</div><div class='ctx'> </div><div class='del'>-Function deferred_split_huge_page() is used to queue page for splitting.</div><div class='add'>+The function deferred_split_huge_page() is used to queue a page for splitting.</div><div class='ctx'> The splitting itself will happen when we get memory pressure via shrinker</div><div class='ctx'> interface.</div><div class='head'>diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt<br/>index f4c2a97bfdbd..223e484a1304 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/boot.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/boot.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/boot.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/x86/boot.txt</a></div><div class='hunk'>@@ -61,6 +61,10 @@ Protocol 2.12:	(Kernel 3.8) Added the xloadflags field and extension fields</div><div class='ctx'> 		to struct boot_params for loading bzImage and ramdisk</div><div class='ctx'> 		above 4G in 64bit.</div><div class='ctx'> </div><div class='add'>+Protocol 2.13:	(Kernel 3.14) Support 32- and 64-bit flags being set in</div><div class='add'>+		xloadflags to support booting a 64-bit kernel from 32-bit</div><div class='add'>+		EFI</div><div class='add'>+</div><div class='ctx'> **** MEMORY LAYOUT</div><div class='ctx'> </div><div class='ctx'> The traditional memory map for the kernel loader, used for Image or</div><div class='head'>diff --git a/Documentation/x86/kernel-stacks b/Documentation/x86/kernel-stacks<br/>index 9a0aa4d3a866..d1bfb0b95ee0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/kernel-stacks?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/kernel-stacks</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/kernel-stacks?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/x86/kernel-stacks</a></div><div class='hunk'>@@ -59,7 +59,7 @@ If that assumption is ever broken then the stacks will become corrupt.</div><div class='ctx'> </div><div class='ctx'> The currently assigned IST stacks are :-</div><div class='ctx'> </div><div class='del'>-* DOUBLEFAULT_STACK.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='add'>+* ESTACK_DF.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='ctx'> </div><div class='ctx'>   Used for interrupt 8 - Double Fault Exception (#DF).</div><div class='ctx'> </div><div class='hunk'>@@ -68,7 +68,7 @@ The currently assigned IST stacks are :-</div><div class='ctx'>   Using a separate stack allows the kernel to recover from it well enough</div><div class='ctx'>   in many cases to still output an oops.</div><div class='ctx'> </div><div class='del'>-* NMI_STACK.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='add'>+* ESTACK_NMI.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='ctx'> </div><div class='ctx'>   Used for non-maskable interrupts (NMI).</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +76,7 @@ The currently assigned IST stacks are :-</div><div class='ctx'>   middle of switching stacks.  Using IST for NMI events avoids making</div><div class='ctx'>   assumptions about the previous state of the kernel stack.</div><div class='ctx'> </div><div class='del'>-* DEBUG_STACK.  DEBUG_STKSZ</div><div class='add'>+* ESTACK_DB.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='ctx'> </div><div class='ctx'>   Used for hardware debug interrupts (interrupt 1) and for software</div><div class='ctx'>   debug interrupts (INT3).</div><div class='hunk'>@@ -86,7 +86,12 @@ The currently assigned IST stacks are :-</div><div class='ctx'>   avoids making assumptions about the previous state of the kernel</div><div class='ctx'>   stack.</div><div class='ctx'> </div><div class='del'>-* MCE_STACK.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='add'>+  To handle nested #DB correctly there exist two instances of DB stacks. On</div><div class='add'>+  #DB entry the IST stackpointer for #DB is switched to the second instance</div><div class='add'>+  so a nested #DB starts from a clean stack. The nested #DB switches</div><div class='add'>+  the IST stackpointer to a guard hole to catch triple nesting.</div><div class='add'>+</div><div class='add'>+* ESTACK_MCE.  EXCEPTION_STKSZ (PAGE_SIZE).</div><div class='ctx'> </div><div class='ctx'>   Used for interrupt 18 - Machine Check Exception (#MC).</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/x86/topology.txt b/Documentation/x86/topology.txt<br/>index 2953e3ec9a02..06b3cdbc4048 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/topology.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/topology.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/topology.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/x86/topology.txt</a></div><div class='hunk'>@@ -51,7 +51,7 @@ The topology of a system is described in the units of:</div><div class='ctx'>     The physical ID of the package. This information is retrieved via CPUID</div><div class='ctx'>     and deduced from the APIC IDs of the cores in the package.</div><div class='ctx'> </div><div class='del'>-  - cpuinfo_x86.logical_id:</div><div class='add'>+  - cpuinfo_x86.logical_proc_id:</div><div class='ctx'> </div><div class='ctx'>     The logical ID of the package. As we do not trust BIOSes to enumerate the</div><div class='ctx'>     packages in a consistent way, we introduced the concept of logical package</div><div class='head'>diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt<br/>index 804f9426ed17..6cbe652d7a49 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/x86_64/mm.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Documentation/x86/x86_64/mm.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Documentation/x86/x86_64/mm.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Documentation/x86/x86_64/mm.txt</a></div><div class='hunk'>@@ -72,7 +72,7 @@ Complete virtual memory map with 5-level page tables</div><div class='ctx'> Notes:</div><div class='ctx'> </div><div class='ctx'>  - With 56-bit addresses, user-space memory gets expanded by a factor of 512x,</div><div class='del'>-   from 0.125 PB to 64 PB. All kernel mappings shift down to the -64 PT starting</div><div class='add'>+   from 0.125 PB to 64 PB. All kernel mappings shift down to the -64 PB starting</div><div class='ctx'>    offset and many of the regions expand to support the much larger physical</div><div class='ctx'>    memory supported.</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +83,7 @@ Notes:</div><div class='ctx'>  0000000000000000 |    0       | 00ffffffffffffff |   64 PB | user-space virtual memory, different per mm</div><div class='ctx'> __________________|____________|__________________|_________|___________________________________________________________</div><div class='ctx'>                   |            |                  |         |</div><div class='del'>- 0000800000000000 |  +64    PB | ffff7fffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical</div><div class='add'>+ 0100000000000000 |  +64    PB | feffffffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical</div><div class='ctx'>                   |            |                  |         |     virtual memory addresses up to the -64 PB</div><div class='ctx'>                   |            |                  |         |     starting offset of kernel mappings.</div><div class='ctx'> __________________|____________|__________________|_________|___________________________________________________________</div><div class='hunk'>@@ -99,7 +99,7 @@ ____________________________________________________________|___________________</div><div class='ctx'>  ffd2000000000000 |  -11.5  PB | ffd3ffffffffffff |  0.5 PB | ... unused hole</div><div class='ctx'>  ffd4000000000000 |  -11    PB | ffd5ffffffffffff |  0.5 PB | virtual memory map (vmemmap_base)</div><div class='ctx'>  ffd6000000000000 |  -10.5  PB | ffdeffffffffffff | 2.25 PB | ... unused hole</div><div class='del'>- ffdf000000000000 |   -8.25 PB | fffffdffffffffff |   ~8 PB | KASAN shadow memory</div><div class='add'>+ ffdf000000000000 |   -8.25 PB | fffffbffffffffff |   ~8 PB | KASAN shadow memory</div><div class='ctx'> __________________|____________|__________________|_________|____________________________________________________________</div><div class='ctx'>                                                             |</div><div class='ctx'>                                                             | Identical layout to the 47-bit one from here on:</div><div class='head'>diff --git a/LICENSES/other/GPL-1.0 b/LICENSES/deprecated/GPL-1.0<br/>index 3a4fa969e4c2..3a4fa969e4c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/GPL-1.0?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/GPL-1.0</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/deprecated/GPL-1.0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/deprecated/GPL-1.0</a></div><div class='head'>diff --git a/LICENSES/other/ISC b/LICENSES/deprecated/ISC<br/>index 8953c3142079..8953c3142079 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/ISC?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/ISC</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/deprecated/ISC?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/deprecated/ISC</a></div><div class='head'>diff --git a/LICENSES/other/Linux-OpenIB b/LICENSES/deprecated/Linux-OpenIB<br/>index 1ad85f6b3a89..1ad85f6b3a89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/Linux-OpenIB?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/Linux-OpenIB</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/deprecated/Linux-OpenIB?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/deprecated/Linux-OpenIB</a></div><div class='head'>diff --git a/LICENSES/other/X11 b/LICENSES/deprecated/X11<br/>index fe4353fd0000..fe4353fd0000 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/X11?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/X11</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/deprecated/X11?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/deprecated/X11</a></div><div class='head'>diff --git a/LICENSES/other/Apache-2.0 b/LICENSES/dual/Apache-2.0<br/>index 7cd903f573e5..6e89ddeab187 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/Apache-2.0?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/Apache-2.0</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/dual/Apache-2.0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/dual/Apache-2.0</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> Valid-License-Identifier: Apache-2.0</div><div class='ctx'> SPDX-URL: https://spdx.org/licenses/Apache-2.0.html</div><div class='ctx'> Usage-Guide:</div><div class='add'>+  Do NOT use. The Apache-2.0 is not GPL2 compatible. It may only be used</div><div class='add'>+  for dual-licensed files where the other license is GPL2 compatible.</div><div class='add'>+  If you end up using this it MUST be used together with a GPL2 compatible</div><div class='add'>+  license using "OR".</div><div class='ctx'>   To use the Apache License version 2.0 put the following SPDX tag/value</div><div class='ctx'>   pair into a comment according to the placement guidelines in the</div><div class='ctx'>   licensing rules documentation:</div><div class='head'>diff --git a/LICENSES/other/CDDL-1.0 b/LICENSES/dual/CDDL-1.0<br/>index 25f614276ddd..b0ca1016db79 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/CDDL-1.0?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/CDDL-1.0</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/dual/CDDL-1.0?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/dual/CDDL-1.0</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> Valid-License-Identifier: CDDL-1.0</div><div class='ctx'> SPDX-URL: https://spdx.org/licenses/CDDL-1.0.html</div><div class='ctx'> Usage-Guide:</div><div class='del'>-  Do NOT use. The CDDL-1.0 is not GPL compatible. It may only be used for</div><div class='del'>-  dual-licensed files where the other license is GPL compatible.</div><div class='add'>+  Do NOT use. The CDDL-1.0 is not GPL2 compatible. It may only be used for</div><div class='add'>+  dual-licensed files where the other license is GPL2 compatible.</div><div class='ctx'>   If you end up using this it MUST be used together with a GPL2 compatible</div><div class='ctx'>   license using "OR".</div><div class='ctx'>   To use the Common Development and Distribution License 1.0 put the</div><div class='head'>diff --git a/LICENSES/other/MPL-1.1 b/LICENSES/dual/MPL-1.1<br/>index 568b6049efe6..61706859e1b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/other/MPL-1.1?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>LICENSES/other/MPL-1.1</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/LICENSES/dual/MPL-1.1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>LICENSES/dual/MPL-1.1</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> Valid-License-Identifier: MPL-1.1</div><div class='ctx'> SPDX-URL: https://spdx.org/licenses/MPL-1.1.html</div><div class='ctx'> Usage-Guide:</div><div class='add'>+  Do NOT use. The MPL-1.1 is not GPL2 compatible. It may only be used for</div><div class='add'>+  dual-licensed files where the other license is GPL2 compatible.</div><div class='add'>+  If you end up using this it MUST be used together with a GPL2 compatible</div><div class='add'>+  license using "OR".</div><div class='ctx'>   To use the Mozilla Public License version 1.1 put the following SPDX</div><div class='ctx'>   tag/value pair into a comment according to the placement guidelines in</div><div class='ctx'>   the licensing rules documentation:</div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>index e17ebf70b548..4244dd341eb7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/MAINTAINERS?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>MAINTAINERS</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/MAINTAINERS?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>MAINTAINERS</a></div><div class='hunk'>@@ -268,12 +268,13 @@ L:	linux-gpio@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/gpio/gpio-104-idio-16.c</div><div class='ctx'> </div><div class='del'>-ACCES 104-QUAD-8 IIO DRIVER</div><div class='add'>+ACCES 104-QUAD-8 DRIVER</div><div class='ctx'> M:	William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;</div><div class='ctx'> L:	linux-iio@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='add'>+F:	Documentation/ABI/testing/sysfs-bus-counter-104-quad-8</div><div class='ctx'> F:	Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8</div><div class='del'>-F:	drivers/iio/counter/104-quad-8.c</div><div class='add'>+F:	drivers/counter/104-quad-8.c</div><div class='ctx'> </div><div class='ctx'> ACCES PCI-IDIO-16 GPIO DRIVER</div><div class='ctx'> M:	William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;</div><div class='hunk'>@@ -468,7 +469,7 @@ ADM1025 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/adm1025</div><div class='add'>+F:	Documentation/hwmon/adm1025.rst</div><div class='ctx'> F:	drivers/hwmon/adm1025.c</div><div class='ctx'> </div><div class='ctx'> ADM1029 HARDWARE MONITOR DRIVER</div><div class='hunk'>@@ -520,7 +521,7 @@ ADS1015 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Dirk Eibach &lt;eibach@gdsys.de&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/ads1015</div><div class='add'>+F:	Documentation/hwmon/ads1015.rst</div><div class='ctx'> F:	drivers/hwmon/ads1015.c</div><div class='ctx'> F:	include/linux/platform_data/ads1015.h</div><div class='ctx'> </div><div class='hunk'>@@ -533,7 +534,7 @@ ADT7475 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/adt7475</div><div class='add'>+F:	Documentation/hwmon/adt7475.rst</div><div class='ctx'> F:	drivers/hwmon/adt7475.c</div><div class='ctx'> </div><div class='ctx'> ADVANSYS SCSI DRIVER</div><div class='hunk'>@@ -764,7 +765,7 @@ AMD FAM15H PROCESSOR POWER MONITORING DRIVER</div><div class='ctx'> M:	Huang Rui &lt;ray.huang@amd.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/hwmon/fam15h_power</div><div class='add'>+F:	Documentation/hwmon/fam15h_power.rst</div><div class='ctx'> F:	drivers/hwmon/fam15h_power.c</div><div class='ctx'> </div><div class='ctx'> AMD FCH GPIO DRIVER</div><div class='hunk'>@@ -868,7 +869,7 @@ L:	linux-iio@vger.kernel.org</div><div class='ctx'> W:	http://ez.analog.com/community/linux-device-drivers</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/iio/adc/ad7606.c</div><div class='del'>-F:	Documentation/devicetree/bindings/iio/adc/ad7606.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt</div><div class='ctx'> </div><div class='ctx'> ANALOG DEVICES INC AD7768-1 DRIVER</div><div class='ctx'> M:	Stefan Popa &lt;stefan.popa@analog.com&gt;</div><div class='hunk'>@@ -950,6 +951,7 @@ F:	drivers/dma/dma-axi-dmac.c</div><div class='ctx'> ANALOG DEVICES INC IIO DRIVERS</div><div class='ctx'> M:	Lars-Peter Clausen &lt;lars@metafoo.de&gt;</div><div class='ctx'> M:	Michael Hennerich &lt;Michael.Hennerich@analog.com&gt;</div><div class='add'>+M:	Stefan Popa &lt;stefan.popa@analog.com&gt;</div><div class='ctx'> W:	http://wiki.analog.com/</div><div class='ctx'> W:	http://ez.analog.com/community/linux-device-drivers</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -1416,7 +1418,9 @@ M:	Manivannan Sadhasivam &lt;manivannan.sadhasivam@linaro.org&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm64/boot/dts/bitmain/</div><div class='add'>+F:	drivers/pinctrl/pinctrl-bm1880.c</div><div class='ctx'> F:	Documentation/devicetree/bindings/arm/bitmain.yaml</div><div class='add'>+F:	Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt</div><div class='ctx'> </div><div class='ctx'> ARM/CALXEDA HIGHBANK ARCHITECTURE</div><div class='ctx'> M:	Rob Herring &lt;robh@kernel.org&gt;</div><div class='hunk'>@@ -1893,14 +1897,15 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git</div><div class='ctx'> ARM/NUVOTON NPCM ARCHITECTURE</div><div class='ctx'> M:	Avi Fishman &lt;avifishman70@gmail.com&gt;</div><div class='ctx'> M:	Tomer Maimon &lt;tmaimon77@gmail.com&gt;</div><div class='add'>+M:	Tali Perry &lt;tali.perry1@gmail.com&gt;</div><div class='ctx'> R:	Patrick Venture &lt;venture@google.com&gt;</div><div class='ctx'> R:	Nancy Yuen &lt;yuenn@google.com&gt;</div><div class='del'>-R:	Brendan Higgins &lt;brendanhiggins@google.com&gt;</div><div class='add'>+R:	Benjamin Fair &lt;benjaminfair@google.com&gt;</div><div class='ctx'> L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	arch/arm/mach-npcm/</div><div class='ctx'> F:	arch/arm/boot/dts/nuvoton-npcm*</div><div class='del'>-F:	include/dt-bindings/clock/nuvoton,npcm7xx-clks.h</div><div class='add'>+F:	include/dt-bindings/clock/nuvoton,npcm7xx-clock.h</div><div class='ctx'> F:	drivers/*/*npcm*</div><div class='ctx'> F:	Documentation/devicetree/bindings/*/*npcm*</div><div class='ctx'> F:	Documentation/devicetree/bindings/*/*/*npcm*</div><div class='hunk'>@@ -2356,7 +2361,7 @@ F:	arch/arm/mm/cache-uniphier.c</div><div class='ctx'> F:	arch/arm64/boot/dts/socionext/uniphier*</div><div class='ctx'> F:	drivers/bus/uniphier-system-bus.c</div><div class='ctx'> F:	drivers/clk/uniphier/</div><div class='del'>-F:	drivers/dmaengine/uniphier-mdmac.c</div><div class='add'>+F:	drivers/dma/uniphier-mdmac.c</div><div class='ctx'> F:	drivers/gpio/gpio-uniphier.c</div><div class='ctx'> F:	drivers/i2c/busses/i2c-uniphier*</div><div class='ctx'> F:	drivers/irqchip/irq-uniphier-aidet.c</div><div class='hunk'>@@ -2512,7 +2517,7 @@ ASC7621 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	George Joseph &lt;george.joseph@fairview5.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/asc7621</div><div class='add'>+F:	Documentation/hwmon/asc7621.rst</div><div class='ctx'> F:	drivers/hwmon/asc7621.c</div><div class='ctx'> </div><div class='ctx'> ASPEED VIDEO ENGINE DRIVER</div><div class='hunk'>@@ -2793,10 +2798,13 @@ M:	Simon Wunderlich &lt;sw@simonwunderlich.de&gt;</div><div class='ctx'> M:	Antonio Quartulli &lt;a@unstable.cc&gt;</div><div class='ctx'> L:	b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)</div><div class='ctx'> W:	https://www.open-mesh.org/</div><div class='add'>+B:	https://www.open-mesh.org/projects/batman-adv/issues</div><div class='add'>+C:	irc://chat.freenode.net/batman</div><div class='ctx'> Q:	https://patchwork.open-mesh.org/project/batman/list/</div><div class='add'>+T:	git https://git.open-mesh.org/linux-merge.git</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/ABI/testing/sysfs-class-net-batman-adv</div><div class='del'>-F:	Documentation/ABI/testing/sysfs-class-net-mesh</div><div class='add'>+F:	Documentation/ABI/obsolete/sysfs-class-net-batman-adv</div><div class='add'>+F:	Documentation/ABI/obsolete/sysfs-class-net-mesh</div><div class='ctx'> F:	Documentation/networking/batman-adv.rst</div><div class='ctx'> F:	include/uapi/linux/batadv_packet.h</div><div class='ctx'> F:	include/uapi/linux/batman_adv.h</div><div class='hunk'>@@ -3120,6 +3128,7 @@ F:	drivers/cpufreq/bmips-cpufreq.c</div><div class='ctx'> BROADCOM BMIPS MIPS ARCHITECTURE</div><div class='ctx'> M:	Kevin Cernekee &lt;cernekee@gmail.com&gt;</div><div class='ctx'> M:	Florian Fainelli &lt;f.fainelli@gmail.com&gt;</div><div class='add'>+L:	bcm-kernel-feedback-list@broadcom.com</div><div class='ctx'> L:	linux-mips@vger.kernel.org</div><div class='ctx'> T:	git git://github.com/broadcom/stblinux.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -3728,8 +3737,8 @@ F:	scripts/checkpatch.pl</div><div class='ctx'> </div><div class='ctx'> CHINESE DOCUMENTATION</div><div class='ctx'> M:	Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+M:	Alex Shi &lt;alex.shi@linux.alibaba.com&gt;</div><div class='ctx'> L:	xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)</div><div class='del'>-L:	linux-kernel@zh-kernel.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/translations/zh_CN/</div><div class='ctx'> </div><div class='hunk'>@@ -3796,6 +3805,7 @@ M:	Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;</div><div class='ctx'> L:	patches@opensource.cirrus.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/clk/clk-lochnagar.c</div><div class='add'>+F:	drivers/hwmon/lochnagar-hwmon.c</div><div class='ctx'> F:	drivers/mfd/lochnagar-i2c.c</div><div class='ctx'> F:	drivers/pinctrl/cirrus/pinctrl-lochnagar.c</div><div class='ctx'> F:	drivers/regulator/lochnagar-regulator.c</div><div class='hunk'>@@ -3804,8 +3814,10 @@ F:	include/dt-bindings/pinctrl/lochnagar.h</div><div class='ctx'> F:	include/linux/mfd/lochnagar*</div><div class='ctx'> F:	Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt</div><div class='add'>+F:	Documentation/hwmon/lochnagar</div><div class='ctx'> </div><div class='ctx'> CISCO FCOE HBA DRIVER</div><div class='ctx'> M:	Satish Kharat &lt;satishkh@cisco.com&gt;</div><div class='hunk'>@@ -4043,7 +4055,7 @@ CORETEMP HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/coretemp</div><div class='add'>+F:	Documentation/hwmon/coretemp.rst</div><div class='ctx'> F:	drivers/hwmon/coretemp.c</div><div class='ctx'> </div><div class='ctx'> COSA/SRP SYNC SERIAL DRIVER</div><div class='hunk'>@@ -4052,6 +4064,16 @@ W:	http://www.fi.muni.cz/~kas/cosa/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/wan/cosa*</div><div class='ctx'> </div><div class='add'>+COUNTER SUBSYSTEM</div><div class='add'>+M:	William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/ABI/testing/sysfs-bus-counter*</div><div class='add'>+F:	Documentation/driver-api/generic-counter.rst</div><div class='add'>+F:	drivers/counter/</div><div class='add'>+F:	include/linux/counter.h</div><div class='add'>+F:	include/linux/counter_enum.h</div><div class='add'>+</div><div class='ctx'> CPMAC ETHERNET DRIVER</div><div class='ctx'> M:	Florian Fainelli &lt;f.fainelli@gmail.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='hunk'>@@ -4129,7 +4151,7 @@ F:	drivers/cpuidle/*</div><div class='ctx'> F:	include/linux/cpuidle.h</div><div class='ctx'> </div><div class='ctx'> CRAMFS FILESYSTEM</div><div class='del'>-M:	Nicolas Pitre &lt;nico@linaro.org&gt;</div><div class='add'>+M:	Nicolas Pitre &lt;nico@fluxnic.net&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/filesystems/cramfs.txt</div><div class='ctx'> F:	fs/cramfs/</div><div class='hunk'>@@ -4551,6 +4573,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/devfreq/</div><div class='ctx'> F:	include/linux/devfreq.h</div><div class='ctx'> F:	Documentation/devicetree/bindings/devfreq/</div><div class='add'>+F:	include/trace/events/devfreq.h</div><div class='ctx'> </div><div class='ctx'> DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)</div><div class='ctx'> M:	Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='hunk'>@@ -4598,7 +4621,7 @@ DIALOG SEMICONDUCTOR DRIVERS</div><div class='ctx'> M:	Support Opensource &lt;support.opensource@diasemi.com&gt;</div><div class='ctx'> W:	http://www.dialog-semiconductor.com/products</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/hwmon/da90??</div><div class='add'>+F:	Documentation/hwmon/da90??.rst</div><div class='ctx'> F:	Documentation/devicetree/bindings/mfd/da90*.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/input/da90??-onkey.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/thermal/da90??-thermal.txt</div><div class='hunk'>@@ -4749,7 +4772,7 @@ DME1737 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Juerg Haefliger &lt;juergh@gmail.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/dme1737</div><div class='add'>+F:	Documentation/hwmon/dme1737.rst</div><div class='ctx'> F:	drivers/hwmon/dme1737.c</div><div class='ctx'> </div><div class='ctx'> DMI/SMBIOS SUPPORT</div><div class='hunk'>@@ -5596,6 +5619,12 @@ L:	linux-edac@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/edac/ghes_edac.c</div><div class='ctx'> </div><div class='add'>+EDAC-I10NM</div><div class='add'>+M:	Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+L:	linux-edac@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/edac/i10nm_base.c</div><div class='add'>+</div><div class='ctx'> EDAC-I3000</div><div class='ctx'> L:	linux-edac@vger.kernel.org</div><div class='ctx'> S:	Orphan</div><div class='hunk'>@@ -5677,7 +5706,7 @@ EDAC-SKYLAKE</div><div class='ctx'> M:	Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='ctx'> L:	linux-edac@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/edac/skx_edac.c</div><div class='add'>+F:	drivers/edac/skx_*.c</div><div class='ctx'> </div><div class='ctx'> EDAC-TI</div><div class='ctx'> M:	Tero Kristo &lt;t-kristo@ti.com&gt;</div><div class='hunk'>@@ -5833,7 +5862,7 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/ABI/testing/sysfs-bus-mdio</div><div class='ctx'> F:	Documentation/devicetree/bindings/net/mdio*</div><div class='del'>-F:	Documentation/networking/phy.txt</div><div class='add'>+F:	Documentation/networking/phy.rst</div><div class='ctx'> F:	drivers/net/phy/</div><div class='ctx'> F:	drivers/of/of_mdio.c</div><div class='ctx'> F:	drivers/of/of_net.c</div><div class='hunk'>@@ -5935,7 +5964,7 @@ F71805F HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/f71805f</div><div class='add'>+F:	Documentation/hwmon/f71805f.rst</div><div class='ctx'> F:	drivers/hwmon/f71805f.c</div><div class='ctx'> </div><div class='ctx'> FADDR2LINE</div><div class='hunk'>@@ -6408,7 +6437,6 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	kernel/futex.c</div><div class='del'>-F:	kernel/futex_compat.c</div><div class='ctx'> F:	include/asm-generic/futex.h</div><div class='ctx'> F:	include/linux/futex.h</div><div class='ctx'> F:	include/uapi/linux/futex.h</div><div class='hunk'>@@ -6461,7 +6489,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/media/radio/radio-gemtek*</div><div class='ctx'> </div><div class='ctx'> GENERIC GPIO I2C DRIVER</div><div class='del'>-M:	Haavard Skinnemoen &lt;hskinnemoen@gmail.com&gt;</div><div class='add'>+M:	Wolfram Sang &lt;wsa+renesas@sang-engineering.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/i2c/busses/i2c-gpio.c</div><div class='ctx'> F:	include/linux/platform_data/i2c-gpio.h</div><div class='hunk'>@@ -6593,7 +6621,7 @@ M:	Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='ctx'> L:	linux-gpio@vger.kernel.org</div><div class='ctx'> L:	linux-acpi@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/acpi/gpio-properties.txt</div><div class='add'>+F:	Documentation/firmware-guide/acpi/gpio-properties.rst</div><div class='ctx'> F:	drivers/gpio/gpiolib-acpi.c</div><div class='ctx'> </div><div class='ctx'> GPIO IR Transmitter</div><div class='hunk'>@@ -7333,7 +7361,6 @@ F:	Documentation/devicetree/bindings/i3c/</div><div class='ctx'> F:	Documentation/driver-api/i3c</div><div class='ctx'> F:	drivers/i3c/</div><div class='ctx'> F:	include/linux/i3c/</div><div class='del'>-F:	include/dt-bindings/i3c/</div><div class='ctx'> </div><div class='ctx'> I3C DRIVER FOR SYNOPSYS DESIGNWARE</div><div class='ctx'> M:	Vitor Soares &lt;vitor.soares@synopsys.com&gt;</div><div class='hunk'>@@ -7516,7 +7543,7 @@ F:	include/net/mac802154.h</div><div class='ctx'> F:	include/net/af_ieee802154.h</div><div class='ctx'> F:	include/net/cfg802154.h</div><div class='ctx'> F:	include/net/ieee802154_netdev.h</div><div class='del'>-F:	Documentation/networking/ieee802154.txt</div><div class='add'>+F:	Documentation/networking/ieee802154.rst</div><div class='ctx'> </div><div class='ctx'> IFE PROTOCOL</div><div class='ctx'> M:	Yotam Gigi &lt;yotam.gi@gmail.com&gt;</div><div class='hunk'>@@ -7618,7 +7645,7 @@ INA209 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/ina209</div><div class='add'>+F:	Documentation/hwmon/ina209.rst</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/ina2xx.txt</div><div class='ctx'> F:	drivers/hwmon/ina209.c</div><div class='ctx'> </div><div class='hunk'>@@ -7626,7 +7653,7 @@ INA2XX HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/ina2xx</div><div class='add'>+F:	Documentation/hwmon/ina2xx.rst</div><div class='ctx'> F:	drivers/hwmon/ina2xx.c</div><div class='ctx'> F:	include/linux/platform_data/ina2xx.h</div><div class='ctx'> </div><div class='hunk'>@@ -8046,6 +8073,7 @@ F:	drivers/gpio/gpio-intel-mid.c</div><div class='ctx'> </div><div class='ctx'> INTERCONNECT API</div><div class='ctx'> M:	Georgi Djakov &lt;georgi.djakov@linaro.org&gt;</div><div class='add'>+L:	linux-pm@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/interconnect/</div><div class='ctx'> F:	Documentation/devicetree/bindings/interconnect/</div><div class='hunk'>@@ -8096,6 +8124,16 @@ F:	include/linux/iommu.h</div><div class='ctx'> F:	include/linux/of_iommu.h</div><div class='ctx'> F:	include/linux/iova.h</div><div class='ctx'> </div><div class='add'>+IO_URING</div><div class='add'>+M:	Jens Axboe &lt;axboe@kernel.dk&gt;</div><div class='add'>+L:	linux-block@vger.kernel.org</div><div class='add'>+L:	linux-fsdevel@vger.kernel.org</div><div class='add'>+T:	git git://git.kernel.dk/linux-block</div><div class='add'>+T:	git git://git.kernel.dk/liburing</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	fs/io_uring.c</div><div class='add'>+F:	include/uapi/linux/io_uring.h</div><div class='add'>+</div><div class='ctx'> IP MASQUERADING</div><div class='ctx'> M:	Juanjo Ciarlante &lt;jjciarla@raiz.uncu.edu.ar&gt;</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -8244,7 +8282,7 @@ IT87 HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/it87</div><div class='add'>+F:	Documentation/hwmon/it87.rst</div><div class='ctx'> F:	drivers/hwmon/it87.c</div><div class='ctx'> </div><div class='ctx'> IT913X MEDIA DRIVER</div><div class='hunk'>@@ -8288,7 +8326,7 @@ M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/hwmon/jc42.c</div><div class='del'>-F:	Documentation/hwmon/jc42</div><div class='add'>+F:	Documentation/hwmon/jc42.rst</div><div class='ctx'> </div><div class='ctx'> JFS FILESYSTEM</div><div class='ctx'> M:	Dave Kleikamp &lt;shaggy@kernel.org&gt;</div><div class='hunk'>@@ -8336,14 +8374,14 @@ K10TEMP HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/k10temp</div><div class='add'>+F:	Documentation/hwmon/k10temp.rst</div><div class='ctx'> F:	drivers/hwmon/k10temp.c</div><div class='ctx'> </div><div class='ctx'> K8TEMP HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/k8temp</div><div class='add'>+F:	Documentation/hwmon/k8temp.rst</div><div class='ctx'> F:	drivers/hwmon/k8temp.c</div><div class='ctx'> </div><div class='ctx'> KASAN</div><div class='hunk'>@@ -8698,6 +8736,7 @@ F:	scripts/leaking_addresses.pl</div><div class='ctx'> LED SUBSYSTEM</div><div class='ctx'> M:	Jacek Anaszewski &lt;jacek.anaszewski@gmail.com&gt;</div><div class='ctx'> M:	Pavel Machek &lt;pavel@ucw.cz&gt;</div><div class='add'>+R:	Dan Murphy &lt;dmurphy@ti.com&gt;</div><div class='ctx'> L:	linux-leds@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -8983,7 +9022,7 @@ R:	Daniel Lustig &lt;dlustig@nvidia.com&gt;</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> L:	linux-arch@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev</div><div class='ctx'> F:	tools/memory-model/</div><div class='ctx'> F:	Documentation/atomic_bitops.txt</div><div class='ctx'> F:	Documentation/atomic_t.txt</div><div class='hunk'>@@ -9034,21 +9073,21 @@ LM78 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/lm78</div><div class='add'>+F:	Documentation/hwmon/lm78.rst</div><div class='ctx'> F:	drivers/hwmon/lm78.c</div><div class='ctx'> </div><div class='ctx'> LM83 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/lm83</div><div class='add'>+F:	Documentation/hwmon/lm83.rst</div><div class='ctx'> F:	drivers/hwmon/lm83.c</div><div class='ctx'> </div><div class='ctx'> LM90 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/lm90</div><div class='add'>+F:	Documentation/hwmon/lm90.rst</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/lm90.txt</div><div class='ctx'> F:	drivers/hwmon/lm90.c</div><div class='ctx'> F:	include/dt-bindings/thermal/lm90.h</div><div class='hunk'>@@ -9057,7 +9096,7 @@ LM95234 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/lm95234</div><div class='add'>+F:	Documentation/hwmon/lm95234.rst</div><div class='ctx'> F:	drivers/hwmon/lm95234.c</div><div class='ctx'> </div><div class='ctx'> LME2510 MEDIA DRIVER</div><div class='hunk'>@@ -9089,7 +9128,6 @@ F:	arch/*/include/asm/spinlock*.h</div><div class='ctx'> F:	include/linux/rwlock*.h</div><div class='ctx'> F:	include/linux/mutex*.h</div><div class='ctx'> F:	include/linux/rwsem*.h</div><div class='del'>-F:	arch/*/include/asm/rwsem.h</div><div class='ctx'> F:	include/linux/seqlock.h</div><div class='ctx'> F:	lib/locking*.[ch]</div><div class='ctx'> F:	kernel/locking/</div><div class='hunk'>@@ -9131,7 +9169,7 @@ LTC4261 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/ltc4261</div><div class='add'>+F:	Documentation/hwmon/ltc4261.rst</div><div class='ctx'> F:	drivers/hwmon/ltc4261.c</div><div class='ctx'> </div><div class='ctx'> LTC4306 I2C MULTIPLEXER DRIVER</div><div class='hunk'>@@ -9362,7 +9400,7 @@ MAX16065 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/max16065</div><div class='add'>+F:	Documentation/hwmon/max16065.rst</div><div class='ctx'> F:	drivers/hwmon/max16065.c</div><div class='ctx'> </div><div class='ctx'> MAX2175 SDR TUNER DRIVER</div><div class='hunk'>@@ -9378,14 +9416,14 @@ F:	include/uapi/linux/max2175.h</div><div class='ctx'> MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Orphan</div><div class='del'>-F:	Documentation/hwmon/max6650</div><div class='add'>+F:	Documentation/hwmon/max6650.rst</div><div class='ctx'> F:	drivers/hwmon/max6650.c</div><div class='ctx'> </div><div class='ctx'> MAX6697 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/max6697</div><div class='add'>+F:	Documentation/hwmon/max6697.rst</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/max6697.txt</div><div class='ctx'> F:	drivers/hwmon/max6697.c</div><div class='ctx'> F:	include/linux/platform_data/max6697.h</div><div class='hunk'>@@ -9397,6 +9435,13 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/sound/max9860.txt</div><div class='ctx'> F:	sound/soc/codecs/max9860.*</div><div class='ctx'> </div><div class='add'>+MAXBOTIX ULTRASONIC RANGER IIO DRIVER</div><div class='add'>+M:	Andreas Klinger &lt;ak@it-klinger.de&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt</div><div class='add'>+F:	drivers/iio/proximity/mb1232.c</div><div class='add'>+</div><div class='ctx'> MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER</div><div class='ctx'> M:	Javier Martinez Canillas &lt;javier@dowhile0.org&gt;</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='hunk'>@@ -9765,9 +9810,17 @@ F:	drivers/media/platform/mtk-vpu/</div><div class='ctx'> F:	Documentation/devicetree/bindings/media/mediatek-vcodec.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/media/mediatek-vpu.txt</div><div class='ctx'> </div><div class='add'>+MEDIATEK MMC/SD/SDIO DRIVER</div><div class='add'>+M:	Chaotian Jing &lt;chaotian.jing@mediatek.com&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/mmc/host/mtk-sd.c</div><div class='add'>+F:	Documentation/devicetree/bindings/mmc/mtk-sd.txt</div><div class='add'>+</div><div class='ctx'> MEDIATEK MT76 WIRELESS LAN DRIVER</div><div class='ctx'> M:	Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'> M:	Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='add'>+R:	Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+R:	Roy Luo &lt;royluo@google.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/wireless/mediatek/mt76/</div><div class='hunk'>@@ -9866,15 +9919,6 @@ F:	drivers/net/ethernet/mellanox/mlx5/core/accel/*</div><div class='ctx'> F:	drivers/net/ethernet/mellanox/mlx5/core/fpga/*</div><div class='ctx'> F:	include/linux/mlx5/mlx5_ifc_fpga.h</div><div class='ctx'> </div><div class='del'>-MELLANOX ETHERNET INNOVA IPSEC DRIVER</div><div class='del'>-R:	Boris Pismenny &lt;borisp@mellanox.com&gt;</div><div class='del'>-L:	netdev@vger.kernel.org</div><div class='del'>-S:	Supported</div><div class='del'>-W:	http://www.mellanox.com</div><div class='del'>-Q:	http://patchwork.ozlabs.org/project/netdev/list/</div><div class='del'>-F:	drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*</div><div class='del'>-F:	drivers/net/ethernet/mellanox/mlx5/core/ipsec*</div><div class='del'>-</div><div class='ctx'> MELLANOX ETHERNET SWITCH DRIVERS</div><div class='ctx'> M:	Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='ctx'> M:	Ido Schimmel &lt;idosch@mellanox.com&gt;</div><div class='hunk'>@@ -10031,7 +10075,7 @@ F:	drivers/mfd/menf21bmc.c</div><div class='ctx'> F:	drivers/watchdog/menf21bmc_wdt.c</div><div class='ctx'> F:	drivers/leds/leds-menf21bmc.c</div><div class='ctx'> F:	drivers/hwmon/menf21bmc_hwmon.c</div><div class='del'>-F:	Documentation/hwmon/menf21bmc</div><div class='add'>+F:	Documentation/hwmon/menf21bmc.rst</div><div class='ctx'> </div><div class='ctx'> MEN Z069 WATCHDOG DRIVER</div><div class='ctx'> M:	Johannes Thumshirn &lt;jth@kernel.org&gt;</div><div class='hunk'>@@ -10046,6 +10090,7 @@ L:	linux-amlogic@lists.infradead.org</div><div class='ctx'> W:	http://linux-meson.com/</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/media/platform/meson/ao-cec.c</div><div class='add'>+F:	drivers/media/platform/meson/ao-cec-g12a.c</div><div class='ctx'> F:	Documentation/devicetree/bindings/media/meson-ao-cec.txt</div><div class='ctx'> T:	git git://linuxtv.org/media_tree.git</div><div class='ctx'> </div><div class='hunk'>@@ -10135,7 +10180,7 @@ F:	drivers/spi/spi-at91-usart.c</div><div class='ctx'> F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt</div><div class='ctx'> </div><div class='ctx'> MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER</div><div class='del'>-M:	Woojung Huh &lt;Woojung.Huh@microchip.com&gt;</div><div class='add'>+M:	Woojung Huh &lt;woojung.huh@microchip.com&gt;</div><div class='ctx'> M:	Microchip Linux Driver Support &lt;UNGLinuxDriver@microchip.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -10424,7 +10469,7 @@ F:	include/uapi/linux/meye.h</div><div class='ctx'> MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD</div><div class='ctx'> M:	Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/serial/moxa-smartio</div><div class='add'>+F:	Documentation/serial/moxa-smartio.rst</div><div class='ctx'> F:	drivers/tty/mxser.*</div><div class='ctx'> </div><div class='ctx'> MR800 AVERMEDIA USB FM RADIO DRIVER</div><div class='hunk'>@@ -10659,7 +10704,7 @@ NCT6775 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/nct6775</div><div class='add'>+F:	Documentation/hwmon/nct6775.rst</div><div class='ctx'> F:	drivers/hwmon/nct6775.c</div><div class='ctx'> </div><div class='ctx'> NET_FAILOVER MODULE</div><div class='hunk'>@@ -10737,6 +10782,7 @@ L:	linux-block@vger.kernel.org</div><div class='ctx'> L:	nbd@other.debian.org</div><div class='ctx'> F:	Documentation/blockdev/nbd.txt</div><div class='ctx'> F:	drivers/block/nbd.c</div><div class='add'>+F:	include/trace/events/nbd.h</div><div class='ctx'> F:	include/uapi/linux/nbd.h</div><div class='ctx'> </div><div class='ctx'> NETWORK DROP MONITOR</div><div class='hunk'>@@ -11107,6 +11153,16 @@ F:	Documentation/ABI/stable/sysfs-bus-nvmem</div><div class='ctx'> F:	include/linux/nvmem-consumer.h</div><div class='ctx'> F:	include/linux/nvmem-provider.h</div><div class='ctx'> </div><div class='add'>+NXP FXAS21002C DRIVER</div><div class='add'>+M:	Rui Miguel Silva &lt;rmfrfs@gmail.com&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt</div><div class='add'>+F:	drivers/iio/gyro/fxas21002c_core.c</div><div class='add'>+F:	drivers/iio/gyro/fxas21002c.h</div><div class='add'>+F:	drivers/iio/gyro/fxas21002c_i2c.c</div><div class='add'>+F:	drivers/iio/gyro/fxas21002c_spi.c</div><div class='add'>+</div><div class='ctx'> NXP SGTL5000 DRIVER</div><div class='ctx'> M:	Fabio Estevam &lt;festevam@gmail.com&gt;</div><div class='ctx'> L:	alsa-devel@alsa-project.org (moderated for non-subscribers)</div><div class='hunk'>@@ -11114,6 +11170,12 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/sound/sgtl5000.txt</div><div class='ctx'> F:	sound/soc/codecs/sgtl5000*</div><div class='ctx'> </div><div class='add'>+NXP SJA1105 ETHERNET SWITCH DRIVER</div><div class='add'>+M:	Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/net/dsa/sja1105</div><div class='add'>+</div><div class='ctx'> NXP TDA998X DRM DRIVER</div><div class='ctx'> M:	Russell King &lt;linux@armlinux.org.uk&gt;</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -11667,6 +11729,14 @@ L:	linux-i2c@vger.kernel.org</div><div class='ctx'> S:	Orphan</div><div class='ctx'> F:	drivers/i2c/busses/i2c-pasemi.c</div><div class='ctx'> </div><div class='add'>+PACKING</div><div class='add'>+M:	Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	lib/packing.c</div><div class='add'>+F:	include/linux/packing.h</div><div class='add'>+F:	Documentation/packing.txt</div><div class='add'>+</div><div class='ctx'> PADATA PARALLEL EXECUTION MECHANISM</div><div class='ctx'> M:	Steffen Klassert &lt;steffen.klassert@secunet.com&gt;</div><div class='ctx'> L:	linux-crypto@vger.kernel.org</div><div class='hunk'>@@ -11753,7 +11823,7 @@ PC87360 HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Jim Cromie &lt;jim.cromie@gmail.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/pc87360</div><div class='add'>+F:	Documentation/hwmon/pc87360.rst</div><div class='ctx'> F:	drivers/hwmon/pc87360.c</div><div class='ctx'> </div><div class='ctx'> PC8736x GPIO DRIVER</div><div class='hunk'>@@ -11765,7 +11835,7 @@ PC87427 HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/pc87427</div><div class='add'>+F:	Documentation/hwmon/pc87427.rst</div><div class='ctx'> F:	drivers/hwmon/pc87427.c</div><div class='ctx'> </div><div class='ctx'> PCA9532 LED DRIVER</div><div class='hunk'>@@ -12165,6 +12235,7 @@ F:	arch/*/kernel/*/*/perf_event*.c</div><div class='ctx'> F:	arch/*/include/asm/perf_event.h</div><div class='ctx'> F:	arch/*/kernel/perf_callchain.c</div><div class='ctx'> F:	arch/*/events/*</div><div class='add'>+F:	arch/*/events/*/*</div><div class='ctx'> F:	tools/perf/</div><div class='ctx'> </div><div class='ctx'> PERSONALITY HANDLING</div><div class='hunk'>@@ -12333,23 +12404,23 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/max31785.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/ltc2978.txt</div><div class='del'>-F:	Documentation/hwmon/adm1275</div><div class='del'>-F:	Documentation/hwmon/ibm-cffps</div><div class='del'>-F:	Documentation/hwmon/ir35221</div><div class='del'>-F:	Documentation/hwmon/lm25066</div><div class='del'>-F:	Documentation/hwmon/ltc2978</div><div class='del'>-F:	Documentation/hwmon/ltc3815</div><div class='del'>-F:	Documentation/hwmon/max16064</div><div class='del'>-F:	Documentation/hwmon/max20751</div><div class='del'>-F:	Documentation/hwmon/max31785</div><div class='del'>-F:	Documentation/hwmon/max34440</div><div class='del'>-F:	Documentation/hwmon/max8688</div><div class='del'>-F:	Documentation/hwmon/pmbus</div><div class='del'>-F:	Documentation/hwmon/pmbus-core</div><div class='del'>-F:	Documentation/hwmon/tps40422</div><div class='del'>-F:	Documentation/hwmon/ucd9000</div><div class='del'>-F:	Documentation/hwmon/ucd9200</div><div class='del'>-F:	Documentation/hwmon/zl6100</div><div class='add'>+F:	Documentation/hwmon/adm1275.rst</div><div class='add'>+F:	Documentation/hwmon/ibm-cffps.rst</div><div class='add'>+F:	Documentation/hwmon/ir35221.rst</div><div class='add'>+F:	Documentation/hwmon/lm25066.rst</div><div class='add'>+F:	Documentation/hwmon/ltc2978.rst</div><div class='add'>+F:	Documentation/hwmon/ltc3815.rst</div><div class='add'>+F:	Documentation/hwmon/max16064.rst</div><div class='add'>+F:	Documentation/hwmon/max20751.rst</div><div class='add'>+F:	Documentation/hwmon/max31785.rst</div><div class='add'>+F:	Documentation/hwmon/max34440.rst</div><div class='add'>+F:	Documentation/hwmon/max8688.rst</div><div class='add'>+F:	Documentation/hwmon/pmbus.rst</div><div class='add'>+F:	Documentation/hwmon/pmbus-core.rst</div><div class='add'>+F:	Documentation/hwmon/tps40422.rst</div><div class='add'>+F:	Documentation/hwmon/ucd9000.rst</div><div class='add'>+F:	Documentation/hwmon/ucd9200.rst</div><div class='add'>+F:	Documentation/hwmon/zl6100.rst</div><div class='ctx'> F:	drivers/hwmon/pmbus/</div><div class='ctx'> F:	include/linux/pmbus.h</div><div class='ctx'> </div><div class='hunk'>@@ -12405,7 +12476,7 @@ M:	Mark Rutland &lt;mark.rutland@arm.com&gt;</div><div class='ctx'> M:	Lorenzo Pieralisi &lt;lorenzo.pieralisi@arm.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/firmware/psci*.c</div><div class='add'>+F:	drivers/firmware/psci/</div><div class='ctx'> F:	include/linux/psci.h</div><div class='ctx'> F:	include/uapi/linux/psci.h</div><div class='ctx'> </div><div class='hunk'>@@ -12613,7 +12684,7 @@ M:	Bartlomiej Zolnierkiewicz &lt;b.zolnierkie@samsung.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/pwm-fan.txt</div><div class='del'>-F:	Documentation/hwmon/pwm-fan</div><div class='add'>+F:	Documentation/hwmon/pwm-fan.rst</div><div class='ctx'> F:	drivers/hwmon/pwm-fan.c</div><div class='ctx'> </div><div class='ctx'> PWM IR Transmitter</div><div class='hunk'>@@ -13031,9 +13102,9 @@ M:	Josh Triplett &lt;josh@joshtriplett.org&gt;</div><div class='ctx'> R:	Steven Rostedt &lt;rostedt@goodmis.org&gt;</div><div class='ctx'> R:	Mathieu Desnoyers &lt;mathieu.desnoyers@efficios.com&gt;</div><div class='ctx'> R:	Lai Jiangshan &lt;jiangshanlai@gmail.com&gt;</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='add'>+L:	rcu@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev</div><div class='ctx'> F:	tools/testing/selftests/rcutorture</div><div class='ctx'> </div><div class='ctx'> RDC R-321X SoC</div><div class='hunk'>@@ -13079,10 +13150,10 @@ R:	Steven Rostedt &lt;rostedt@goodmis.org&gt;</div><div class='ctx'> R:	Mathieu Desnoyers &lt;mathieu.desnoyers@efficios.com&gt;</div><div class='ctx'> R:	Lai Jiangshan &lt;jiangshanlai@gmail.com&gt;</div><div class='ctx'> R:	Joel Fernandes &lt;joel@joelfernandes.org&gt;</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='add'>+L:	rcu@vger.kernel.org</div><div class='ctx'> W:	http://www.rdrop.com/users/paulmck/RCU/</div><div class='ctx'> S:	Supported</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev</div><div class='ctx'> F:	Documentation/RCU/</div><div class='ctx'> X:	Documentation/RCU/torture.txt</div><div class='ctx'> F:	include/linux/rcu*</div><div class='hunk'>@@ -13308,7 +13379,7 @@ ROCKETPORT DRIVER</div><div class='ctx'> P:	Comtrol Corp.</div><div class='ctx'> W:	http://www.comtrol.com</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/serial/rocket.txt</div><div class='add'>+F:	Documentation/serial/rocket.rst</div><div class='ctx'> F:	drivers/tty/rocket*</div><div class='ctx'> </div><div class='ctx'> ROCKETPORT EXPRESS/INFINITY DRIVER</div><div class='hunk'>@@ -13392,6 +13463,12 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/wireless/realtek/rtlwifi/</div><div class='ctx'> </div><div class='add'>+REALTEK WIRELESS DRIVER (rtw88)</div><div class='add'>+M:	Yan-Hsuan Chuang &lt;yhchuang@realtek.com&gt;</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/net/wireless/realtek/rtw88/</div><div class='add'>+</div><div class='ctx'> RTL8XXXU WIRELESS DRIVER (rtl8xxxu)</div><div class='ctx'> M:	Jes Sorensen &lt;Jes.Sorensen@gmail.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='hunk'>@@ -13937,7 +14014,7 @@ W:	https://selinuxproject.org</div><div class='ctx'> W:	https://github.com/SELinuxProject</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	include/linux/selinux*</div><div class='add'>+F:	include/uapi/linux/selinux_netlink.h</div><div class='ctx'> F:	security/selinux/</div><div class='ctx'> F:	scripts/selinux/</div><div class='ctx'> F:	Documentation/admin-guide/LSM/SELinux.rst</div><div class='hunk'>@@ -13972,7 +14049,7 @@ F:	drivers/media/rc/serial_ir.c</div><div class='ctx'> SFC NETWORK DRIVER</div><div class='ctx'> M:	Solarflare linux maintainers &lt;linux-net-drivers@solarflare.com&gt;</div><div class='ctx'> M:	Edward Cree &lt;ecree@solarflare.com&gt;</div><div class='del'>-M:	Bert Kenward &lt;bkenward@solarflare.com&gt;</div><div class='add'>+M:	Martin Habets &lt;mhabets@solarflare.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/net/ethernet/sfc/</div><div class='hunk'>@@ -14234,10 +14311,10 @@ M:	"Paul E. McKenney" &lt;paulmck@linux.ibm.com&gt;</div><div class='ctx'> M:	Josh Triplett &lt;josh@joshtriplett.org&gt;</div><div class='ctx'> R:	Steven Rostedt &lt;rostedt@goodmis.org&gt;</div><div class='ctx'> R:	Mathieu Desnoyers &lt;mathieu.desnoyers@efficios.com&gt;</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='add'>+L:	rcu@vger.kernel.org</div><div class='ctx'> W:	http://www.rdrop.com/users/paulmck/RCU/</div><div class='ctx'> S:	Supported</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev</div><div class='ctx'> F:	include/linux/srcu*.h</div><div class='ctx'> F:	kernel/rcu/srcu*.c</div><div class='ctx'> </div><div class='hunk'>@@ -14278,21 +14355,21 @@ SMM665 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/smm665</div><div class='add'>+F:	Documentation/hwmon/smm665.rst</div><div class='ctx'> F:	drivers/hwmon/smm665.c</div><div class='ctx'> </div><div class='ctx'> SMSC EMC2103 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Steve Glendinning &lt;steve.glendinning@shawell.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/emc2103</div><div class='add'>+F:	Documentation/hwmon/emc2103.rst</div><div class='ctx'> F:	drivers/hwmon/emc2103.c</div><div class='ctx'> </div><div class='ctx'> SMSC SCH5627 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/hwmon/sch5627</div><div class='add'>+F:	Documentation/hwmon/sch5627.rst</div><div class='ctx'> F:	drivers/hwmon/sch5627.c</div><div class='ctx'> </div><div class='ctx'> SMSC UFX6000 and UFX7000 USB to VGA DRIVER</div><div class='hunk'>@@ -14305,7 +14382,7 @@ SMSC47B397 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Jean Delvare &lt;jdelvare@suse.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/smsc47b397</div><div class='add'>+F:	Documentation/hwmon/smsc47b397.rst</div><div class='ctx'> F:	drivers/hwmon/smsc47b397.c</div><div class='ctx'> </div><div class='ctx'> SMSC911x ETHERNET DRIVER</div><div class='hunk'>@@ -14325,9 +14402,8 @@ SOC-CAMERA V4L2 SUBSYSTEM</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='ctx'> T:	git git://linuxtv.org/media_tree.git</div><div class='ctx'> S:	Orphan</div><div class='del'>-F:	include/media/soc*</div><div class='del'>-F:	drivers/media/i2c/soc_camera/</div><div class='del'>-F:	drivers/media/platform/soc_camera/</div><div class='add'>+F:	include/media/soc_camera.h</div><div class='add'>+F:	drivers/staging/media/soc_camera/</div><div class='ctx'> </div><div class='ctx'> SOCIONEXT SYNQUACER I2C DRIVER</div><div class='ctx'> M:	Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;</div><div class='hunk'>@@ -14463,16 +14539,15 @@ T:	git git://linuxtv.org/media_tree.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/media/i2c/imx355.c</div><div class='ctx'> </div><div class='del'>-SONY MEMORYSTICK CARD SUPPORT</div><div class='del'>-M:	Alex Dubov &lt;oakad@yahoo.com&gt;</div><div class='del'>-W:	http://tifmxx.berlios.de/</div><div class='del'>-S:	Maintained</div><div class='del'>-F:	drivers/memstick/host/tifm_ms.c</div><div class='del'>-</div><div class='del'>-SONY MEMORYSTICK STANDARD SUPPORT</div><div class='add'>+SONY MEMORYSTICK SUBSYSTEM</div><div class='ctx'> M:	Maxim Levitsky &lt;maximlevitsky@gmail.com&gt;</div><div class='add'>+M:	Alex Dubov &lt;oakad@yahoo.com&gt;</div><div class='add'>+M:	Ulf Hansson &lt;ulf.hansson@linaro.org&gt;</div><div class='add'>+L:	linux-mmc@vger.kernel.org</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/memstick/core/ms_block.*</div><div class='add'>+F:	drivers/memstick/</div><div class='add'>+F:	include/linux/memstick.h</div><div class='ctx'> </div><div class='ctx'> SONY VAIO CONTROL DEVICE DRIVER</div><div class='ctx'> M:	Mattia Dongili &lt;malattia@linux.it&gt;</div><div class='hunk'>@@ -14668,6 +14743,14 @@ S:	Maintained</div><div class='ctx'> F:	drivers/iio/imu/st_lsm6dsx/</div><div class='ctx'> F:	Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt</div><div class='ctx'> </div><div class='add'>+ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER</div><div class='add'>+M:	Mickael Guene &lt;mickael.guene@st.com&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+T:	git git://linuxtv.org/media_tree.git</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/i2c/st-mipid02.c</div><div class='add'>+F:	Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt</div><div class='add'>+</div><div class='ctx'> ST STM32 I2C/SMBUS DRIVER</div><div class='ctx'> M:	Pierre-Yves MORDRET &lt;pierre-yves.mordret@st.com&gt;</div><div class='ctx'> L:	linux-i2c@vger.kernel.org</div><div class='hunk'>@@ -15304,6 +15387,11 @@ M:	Laxman Dewangan &lt;ldewangan@nvidia.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/spi/spi-tegra*</div><div class='ctx'> </div><div class='add'>+TEGRA XUSB PADCTL DRIVER</div><div class='add'>+M:	JC Kuo &lt;jckuo@nvidia.com&gt;</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/phy/tegra/xusb*</div><div class='add'>+</div><div class='ctx'> TEHUTI ETHERNET DRIVER</div><div class='ctx'> M:	Andy Gospodarek &lt;andy@greyhouse.net&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='hunk'>@@ -15497,9 +15585,11 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/ethernet/ti/cpsw*</div><div class='ctx'> F:	drivers/net/ethernet/ti/davinci*</div><div class='ctx'> </div><div class='del'>-TI FLASH MEDIA INTERFACE DRIVER</div><div class='add'>+TI FLASH MEDIA MEMORYSTICK/MMC DRIVERS</div><div class='ctx'> M:	Alex Dubov &lt;oakad@yahoo.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='add'>+W:	http://tifmxx.berlios.de/</div><div class='add'>+F:	drivers/memstick/host/tifm_ms.c</div><div class='ctx'> F:	drivers/misc/tifm*</div><div class='ctx'> F:	drivers/mmc/host/tifm_sd.c</div><div class='ctx'> F:	include/linux/tifm.h</div><div class='hunk'>@@ -15651,7 +15741,7 @@ TMP401 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/tmp401</div><div class='add'>+F:	Documentation/hwmon/tmp401.rst</div><div class='ctx'> F:	drivers/hwmon/tmp401.c</div><div class='ctx'> </div><div class='ctx'> TMPFS (SHMEM FILESYSTEM)</div><div class='hunk'>@@ -15684,7 +15774,7 @@ M:	"Paul E. McKenney" &lt;paulmck@linux.ibm.com&gt;</div><div class='ctx'> M:	Josh Triplett &lt;josh@joshtriplett.org&gt;</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev</div><div class='ctx'> F:	Documentation/RCU/torture.txt</div><div class='ctx'> F:	kernel/torture.c</div><div class='ctx'> F:	kernel/rcu/rcutorture.c</div><div class='hunk'>@@ -15926,6 +16016,12 @@ F:	drivers/uwb/</div><div class='ctx'> F:	include/linux/uwb.h</div><div class='ctx'> F:	include/linux/uwb/</div><div class='ctx'> </div><div class='add'>+UNICODE SUBSYSTEM:</div><div class='add'>+M:	Gabriel Krisman Bertazi &lt;krisman@collabora.com&gt;</div><div class='add'>+L:	linux-fsdevel@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	fs/unicode/</div><div class='add'>+</div><div class='ctx'> UNICORE32 ARCHITECTURE:</div><div class='ctx'> M:	Guan Xuetao &lt;gxt@pku.edu.cn&gt;</div><div class='ctx'> W:	http://mprc.pku.edu.cn/~guanxuetao/linux</div><div class='hunk'>@@ -15971,6 +16067,13 @@ L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/scsi/ufs/*dwc*</div><div class='ctx'> </div><div class='add'>+UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS</div><div class='add'>+M:	Stanley Chu &lt;stanley.chu@mediatek.com&gt;</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='add'>+L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/scsi/ufs/ufs-mediatek*</div><div class='add'>+</div><div class='ctx'> UNSORTED BLOCK IMAGES (UBI)</div><div class='ctx'> M:	Artem Bityutskiy &lt;dedekind1@gmail.com&gt;</div><div class='ctx'> M:	Richard Weinberger &lt;richard@nod.at&gt;</div><div class='hunk'>@@ -16074,6 +16177,14 @@ L:	linux-usb@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/usb/roles/intel-xhci-usb-role-switch.c</div><div class='ctx'> </div><div class='add'>+USB IP DRIVER FOR HISILICON KIRIN</div><div class='add'>+M:	Yu Chen &lt;chenyu56@huawei.com&gt;</div><div class='add'>+M:	Binghui Wang &lt;wangbinghui@hisilicon.com&gt;</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt</div><div class='add'>+F:	drivers/phy/hisilicon/phy-hi3660-usb3.c</div><div class='add'>+</div><div class='ctx'> USB ISP116X DRIVER</div><div class='ctx'> M:	Olav Kongas &lt;ok@artecdesign.ee&gt;</div><div class='ctx'> L:	linux-usb@vger.kernel.org</div><div class='hunk'>@@ -16499,7 +16610,7 @@ F:	drivers/char/virtio_console.c</div><div class='ctx'> F:	include/linux/virtio_console.h</div><div class='ctx'> F:	include/uapi/linux/virtio_console.h</div><div class='ctx'> </div><div class='del'>-VIRTIO CORE, NET AND BLOCK DRIVERS</div><div class='add'>+VIRTIO CORE AND NET DRIVERS</div><div class='ctx'> M:	"Michael S. Tsirkin" &lt;mst@redhat.com&gt;</div><div class='ctx'> M:	Jason Wang &lt;jasowang@redhat.com&gt;</div><div class='ctx'> L:	virtualization@lists.linux-foundation.org</div><div class='hunk'>@@ -16514,6 +16625,19 @@ F:	include/uapi/linux/virtio_*.h</div><div class='ctx'> F:	drivers/crypto/virtio/</div><div class='ctx'> F:	mm/balloon_compaction.c</div><div class='ctx'> </div><div class='add'>+VIRTIO BLOCK AND SCSI DRIVERS</div><div class='add'>+M:	"Michael S. Tsirkin" &lt;mst@redhat.com&gt;</div><div class='add'>+M:	Jason Wang &lt;jasowang@redhat.com&gt;</div><div class='add'>+R:	Paolo Bonzini &lt;pbonzini@redhat.com&gt;</div><div class='add'>+R:	Stefan Hajnoczi &lt;stefanha@redhat.com&gt;</div><div class='add'>+L:	virtualization@lists.linux-foundation.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/block/virtio_blk.c</div><div class='add'>+F:	drivers/scsi/virtio_scsi.c</div><div class='add'>+F:	include/uapi/linux/virtio_blk.h</div><div class='add'>+F:	include/uapi/linux/virtio_scsi.h</div><div class='add'>+F:	drivers/vhost/scsi.c</div><div class='add'>+</div><div class='ctx'> VIRTIO CRYPTO DRIVER</div><div class='ctx'> M:	Gonglei &lt;arei.gonglei@huawei.com&gt;</div><div class='ctx'> L:	virtualization@lists.linux-foundation.org</div><div class='hunk'>@@ -16676,7 +16800,7 @@ VT1211 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Juerg Haefliger &lt;juergh@gmail.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/vt1211</div><div class='add'>+F:	Documentation/hwmon/vt1211.rst</div><div class='ctx'> F:	drivers/hwmon/vt1211.c</div><div class='ctx'> </div><div class='ctx'> VT8231 HARDWARE MONITOR DRIVER</div><div class='hunk'>@@ -16704,14 +16828,14 @@ W83791D HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Marc Hulsman &lt;m.hulsman@tudelft.nl&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/w83791d</div><div class='add'>+F:	Documentation/hwmon/w83791d.rst</div><div class='ctx'> F:	drivers/hwmon/w83791d.c</div><div class='ctx'> </div><div class='ctx'> W83793 HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Rudolf Marek &lt;r.marek@assembler.cz&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/hwmon/w83793</div><div class='add'>+F:	Documentation/hwmon/w83793.rst</div><div class='ctx'> F:	drivers/hwmon/w83793.c</div><div class='ctx'> </div><div class='ctx'> W83795 HARDWARE MONITORING DRIVER</div><div class='hunk'>@@ -16820,7 +16944,7 @@ L:	patches@opensource.cirrus.com</div><div class='ctx'> T:	git https://github.com/CirrusLogic/linux-drivers.git</div><div class='ctx'> W:	https://github.com/CirrusLogic/linux-drivers/wiki</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/hwmon/wm83??</div><div class='add'>+F:	Documentation/hwmon/wm83??.rst</div><div class='ctx'> F:	Documentation/devicetree/bindings/extcon/extcon-arizona.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/regulator/arizona-regulator.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/mfd/arizona.txt</div><div class='hunk'>@@ -16910,7 +17034,7 @@ M:	Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='ctx'> M:	Borislav Petkov &lt;bp@alien8.de&gt;</div><div class='ctx'> L:	linux-edac@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	arch/x86/kernel/cpu/mcheck/*</div><div class='add'>+F:	arch/x86/kernel/cpu/mce/*</div><div class='ctx'> </div><div class='ctx'> X86 MICROCODE UPDATE SUPPORT</div><div class='ctx'> M:	Borislav Petkov &lt;bp@alien8.de&gt;</div><div class='head'>diff --git a/Makefile b/Makefile<br/>index 99c0530489ef..a61a95b6b38f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> VERSION = 5</div><div class='ctx'> PATCHLEVEL = 1</div><div class='ctx'> SUBLEVEL = 0</div><div class='del'>-EXTRAVERSION = -rc1</div><div class='add'>+EXTRAVERSION =</div><div class='ctx'> NAME = Shy Crocodile</div><div class='ctx'> </div><div class='ctx'> # *DOCUMENTATION*</div><div class='hunk'>@@ -31,26 +31,12 @@ _all:</div><div class='ctx'> # descending is started. They are now explicitly listed as the</div><div class='ctx'> # prepare rule.</div><div class='ctx'> </div><div class='del'>-# Ugly workaround for Debian make-kpkg:</div><div class='del'>-# make-kpkg directly includes the top Makefile of Linux kernel. In such a case,</div><div class='del'>-# skip sub-make to support debian_* targets in ruleset/kernel_version.mk, but</div><div class='del'>-# displays warning to discourage such abusage.</div><div class='del'>-ifneq ($(word 2, $(MAKEFILE_LIST)),)</div><div class='del'>-$(warning Do not include top Makefile of Linux Kernel)</div><div class='del'>-sub-make-done := 1</div><div class='del'>-MAKEFLAGS += -rR</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-ifneq ($(sub-make-done),1)</div><div class='add'>+ifneq ($(sub_make_done),1)</div><div class='ctx'> </div><div class='ctx'> # Do not use make's built-in rules and variables</div><div class='ctx'> # (this increases performance and avoids hard-to-debug behaviour)</div><div class='ctx'> MAKEFLAGS += -rR</div><div class='ctx'> </div><div class='del'>-# 'MAKEFLAGS += -rR' does not become immediately effective for old</div><div class='del'>-# GNU Make versions. Cancel implicit rules for this Makefile.</div><div class='del'>-$(lastword $(MAKEFILE_LIST)): ;</div><div class='del'>-</div><div class='ctx'> # Avoid funny character set dependencies</div><div class='ctx'> unexport LC_ALL</div><div class='ctx'> LC_COLLATE=C</div><div class='hunk'>@@ -110,69 +96,93 @@ endif</div><div class='ctx'> </div><div class='ctx'> export quiet Q KBUILD_VERBOSE</div><div class='ctx'> </div><div class='del'>-# kbuild supports saving output files in a separate directory.</div><div class='del'>-# To locate output files in a separate directory two syntaxes are supported.</div><div class='del'>-# In both cases the working directory must be the root of the kernel src.</div><div class='add'>+# Kbuild will save output files in the current working directory.</div><div class='add'>+# This does not need to match to the root of the kernel source tree.</div><div class='add'>+#</div><div class='add'>+# For example, you can do this:</div><div class='add'>+#</div><div class='add'>+#  cd /dir/to/store/output/files; make -f /dir/to/kernel/source/Makefile</div><div class='add'>+#</div><div class='add'>+# If you want to save output files in a different location, there are</div><div class='add'>+# two syntaxes to specify it.</div><div class='add'>+#</div><div class='ctx'> # 1) O=</div><div class='ctx'> # Use "make O=dir/to/store/output/files/"</div><div class='ctx'> #</div><div class='ctx'> # 2) Set KBUILD_OUTPUT</div><div class='del'>-# Set the environment variable KBUILD_OUTPUT to point to the directory</div><div class='del'>-# where the output files shall be placed.</div><div class='del'>-# export KBUILD_OUTPUT=dir/to/store/output/files/</div><div class='del'>-# make</div><div class='add'>+# Set the environment variable KBUILD_OUTPUT to point to the output directory.</div><div class='add'>+# export KBUILD_OUTPUT=dir/to/store/output/files/; make</div><div class='ctx'> #</div><div class='ctx'> # The O= assignment takes precedence over the KBUILD_OUTPUT environment</div><div class='ctx'> # variable.</div><div class='ctx'> </div><div class='del'>-# KBUILD_SRC is not intended to be used by the regular user (for now),</div><div class='del'>-# it is set on invocation of make with KBUILD_OUTPUT or O= specified.</div><div class='del'>-</div><div class='del'>-# OK, Make called in directory where kernel src resides</div><div class='del'>-# Do we want to locate output files in a separate directory?</div><div class='add'>+# Do we want to change the working directory?</div><div class='ctx'> ifeq ("$(origin O)", "command line")</div><div class='ctx'>   KBUILD_OUTPUT := $(O)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-ifneq ($(words $(subst :, ,$(CURDIR))), 1)</div><div class='del'>-  $(error main directory cannot contain spaces nor colons)</div><div class='add'>+ifneq ($(KBUILD_OUTPUT),)</div><div class='add'>+# Make's built-in functions such as $(abspath ...), $(realpath ...) cannot</div><div class='add'>+# expand a shell special character '~'. We use a somewhat tedious way here.</div><div class='add'>+abs_objtree := $(shell mkdir -p $(KBUILD_OUTPUT) &amp;&amp; cd $(KBUILD_OUTPUT) &amp;&amp; pwd)</div><div class='add'>+$(if $(abs_objtree),, \</div><div class='add'>+     $(error failed to create output directory "$(KBUILD_OUTPUT)"))</div><div class='add'>+</div><div class='add'>+# $(realpath ...) resolves symlinks</div><div class='add'>+abs_objtree := $(realpath $(abs_objtree))</div><div class='add'>+else</div><div class='add'>+abs_objtree := $(CURDIR)</div><div class='add'>+endif # ifneq ($(KBUILD_OUTPUT),)</div><div class='add'>+</div><div class='add'>+ifeq ($(abs_objtree),$(CURDIR))</div><div class='add'>+# Suppress "Entering directory ..." unless we are changing the work directory.</div><div class='add'>+MAKEFLAGS += --no-print-directory</div><div class='add'>+else</div><div class='add'>+need-sub-make := 1</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-ifneq ($(KBUILD_OUTPUT),)</div><div class='del'>-# check that the output directory actually exists</div><div class='del'>-saved-output := $(KBUILD_OUTPUT)</div><div class='del'>-KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) &amp;&amp; cd $(KBUILD_OUTPUT) \</div><div class='del'>-								&amp;&amp; pwd)</div><div class='del'>-$(if $(KBUILD_OUTPUT),, \</div><div class='del'>-     $(error failed to create output directory "$(saved-output)"))</div><div class='add'>+abs_srctree := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))</div><div class='add'>+</div><div class='add'>+ifneq ($(words $(subst :, ,$(abs_srctree))), 1)</div><div class='add'>+$(error source directory cannot contain spaces or colons)</div><div class='add'>+endif</div><div class='ctx'> </div><div class='add'>+ifneq ($(abs_srctree),$(abs_objtree))</div><div class='ctx'> # Look for make include files relative to root of kernel src</div><div class='ctx'> #</div><div class='ctx'> # This does not become effective immediately because MAKEFLAGS is re-parsed</div><div class='del'>-# once after the Makefile is read.  It is OK since we are going to invoke</div><div class='del'>-# 'sub-make' below.</div><div class='del'>-MAKEFLAGS += --include-dir=$(CURDIR)</div><div class='add'>+# once after the Makefile is read. We need to invoke sub-make.</div><div class='add'>+MAKEFLAGS += --include-dir=$(abs_srctree)</div><div class='add'>+need-sub-make := 1</div><div class='add'>+endif</div><div class='ctx'> </div><div class='del'>-else</div><div class='add'>+ifneq ($(filter 3.%,$(MAKE_VERSION)),)</div><div class='add'>+# 'MAKEFLAGS += -rR' does not immediately become effective for GNU Make 3.x</div><div class='add'>+# We need to invoke sub-make to avoid implicit rules in the top Makefile.</div><div class='add'>+need-sub-make := 1</div><div class='add'>+# Cancel implicit rules for this Makefile.</div><div class='add'>+$(lastword $(MAKEFILE_LIST)): ;</div><div class='add'>+endif</div><div class='ctx'> </div><div class='del'>-# Do not print "Entering directory ..." at all for in-tree build.</div><div class='del'>-MAKEFLAGS += --no-print-directory</div><div class='add'>+export abs_srctree abs_objtree</div><div class='add'>+export sub_make_done := 1</div><div class='ctx'> </div><div class='del'>-endif # ifneq ($(KBUILD_OUTPUT),)</div><div class='add'>+ifeq ($(need-sub-make),1)</div><div class='ctx'> </div><div class='ctx'> PHONY += $(MAKECMDGOALS) sub-make</div><div class='ctx'> </div><div class='del'>-$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make</div><div class='add'>+$(filter-out _all sub-make $(lastword $(MAKEFILE_LIST)), $(MAKECMDGOALS)) _all: sub-make</div><div class='ctx'> 	@:</div><div class='ctx'> </div><div class='ctx'> # Invoke a second make in the output directory, passing relevant variables</div><div class='ctx'> sub-make:</div><div class='del'>-	$(Q)$(MAKE) sub-make-done=1 \</div><div class='del'>-	$(if $(KBUILD_OUTPUT),-C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR)) \</div><div class='del'>-	-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))</div><div class='add'>+	$(Q)$(MAKE) -C $(abs_objtree) -f $(abs_srctree)/Makefile $(MAKECMDGOALS)</div><div class='add'>+</div><div class='add'>+endif # need-sub-make</div><div class='add'>+endif # sub_make_done</div><div class='ctx'> </div><div class='del'>-else # sub-make-done</div><div class='ctx'> # We process the rest of the Makefile if this is the final invocation of make</div><div class='add'>+ifeq ($(need-sub-make),)</div><div class='ctx'> </div><div class='ctx'> # Do not print "Entering directory ...",</div><div class='ctx'> # but we want to display it when entering to the output directory</div><div class='hunk'>@@ -211,16 +221,21 @@ ifeq ("$(origin M)", "command line")</div><div class='ctx'>   KBUILD_EXTMOD := $(M)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-ifeq ($(KBUILD_SRC),)</div><div class='add'>+ifeq ($(abs_srctree),$(abs_objtree))</div><div class='ctx'>         # building in the source tree</div><div class='ctx'>         srctree := .</div><div class='ctx'> else</div><div class='del'>-        ifeq ($(KBUILD_SRC)/,$(dir $(CURDIR)))</div><div class='add'>+        ifeq ($(abs_srctree)/,$(dir $(abs_objtree)))</div><div class='ctx'>                 # building in a subdirectory of the source tree</div><div class='ctx'>                 srctree := ..</div><div class='ctx'>         else</div><div class='del'>-                srctree := $(KBUILD_SRC)</div><div class='add'>+                srctree := $(abs_srctree)</div><div class='ctx'>         endif</div><div class='add'>+</div><div class='add'>+	# TODO:</div><div class='add'>+	# KBUILD_SRC is only used to distinguish in-tree/out-of-tree build.</div><div class='add'>+	# Replace it with $(srctree) or something.</div><div class='add'>+	KBUILD_SRC := $(abs_srctree)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> export KBUILD_CHECKSRC KBUILD_EXTMOD KBUILD_SRC</div><div class='hunk'>@@ -399,6 +414,7 @@ NM		= $(CROSS_COMPILE)nm</div><div class='ctx'> STRIP		= $(CROSS_COMPILE)strip</div><div class='ctx'> OBJCOPY		= $(CROSS_COMPILE)objcopy</div><div class='ctx'> OBJDUMP		= $(CROSS_COMPILE)objdump</div><div class='add'>+PAHOLE		= pahole</div><div class='ctx'> LEX		= flex</div><div class='ctx'> YACC		= bison</div><div class='ctx'> AWK		= awk</div><div class='hunk'>@@ -433,7 +449,7 @@ USERINCLUDE    := \</div><div class='ctx'> LINUXINCLUDE    := \</div><div class='ctx'> 		-I$(srctree)/arch/$(SRCARCH)/include \</div><div class='ctx'> 		-I$(objtree)/arch/$(SRCARCH)/include/generated \</div><div class='del'>-		$(if $(KBUILD_SRC), -I$(srctree)/include) \</div><div class='add'>+		$(if $(filter .,$(srctree)),,-I$(srctree)/include) \</div><div class='ctx'> 		-I$(objtree)/include \</div><div class='ctx'> 		$(USERINCLUDE)</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +469,7 @@ KBUILD_LDFLAGS :=</div><div class='ctx'> GCC_PLUGINS_CFLAGS :=</div><div class='ctx'> </div><div class='ctx'> export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC</div><div class='del'>-export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS</div><div class='add'>+export CPP AR NM STRIP OBJCOPY OBJDUMP PAHOLE KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS</div><div class='ctx'> export MAKE LEX YACC AWK INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE</div><div class='ctx'> export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS</div><div class='ctx'> </div><div class='hunk'>@@ -494,10 +510,11 @@ PHONY += outputmakefile</div><div class='ctx'> # At the same time when output Makefile generated, generate .gitignore to</div><div class='ctx'> # ignore whole output directory</div><div class='ctx'> outputmakefile:</div><div class='del'>-ifneq ($(KBUILD_SRC),)</div><div class='add'>+ifneq ($(srctree),.)</div><div class='ctx'> 	$(Q)ln -fsn $(srctree) source</div><div class='ctx'> 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)</div><div class='del'>-	$(Q){ echo "# this is build directory, ignore it"; echo "*"; } &gt; .gitignore</div><div class='add'>+	$(Q)test -e .gitignore || \</div><div class='add'>+	{ echo "# this is build directory, ignore it"; echo "*"; } &gt; .gitignore</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> ifneq ($(shell $(CC) --version 2&gt;&amp;1 | head -n 1 | grep clang),)</div><div class='hunk'>@@ -516,15 +533,6 @@ KBUILD_AFLAGS	+= $(CLANG_FLAGS)</div><div class='ctx'> export CLANG_FLAGS</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register</div><div class='del'>-RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register</div><div class='del'>-RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk</div><div class='del'>-RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline</div><div class='del'>-RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))</div><div class='del'>-RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))</div><div class='del'>-export RETPOLINE_CFLAGS</div><div class='del'>-export RETPOLINE_VDSO_CFLAGS</div><div class='del'>-</div><div class='ctx'> # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.</div><div class='ctx'> # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.</div><div class='ctx'> # CC_VERSION_TEXT is referenced from Kconfig (so it needs export),</div><div class='hunk'>@@ -591,20 +599,21 @@ endif</div><div class='ctx'> </div><div class='ctx'> export KBUILD_MODULES KBUILD_BUILTIN</div><div class='ctx'> </div><div class='add'>+ifeq ($(dot-config),1)</div><div class='add'>+include include/config/auto.conf</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> ifeq ($(KBUILD_EXTMOD),)</div><div class='ctx'> # Objects we will link into vmlinux / subdirs we need to visit</div><div class='ctx'> init-y		:= init/</div><div class='ctx'> drivers-y	:= drivers/ sound/</div><div class='add'>+drivers-$(CONFIG_SAMPLES) += samples/</div><div class='ctx'> net-y		:= net/</div><div class='ctx'> libs-y		:= lib/</div><div class='ctx'> core-y		:= usr/</div><div class='ctx'> virt-y		:= virt/</div><div class='ctx'> endif # KBUILD_EXTMOD</div><div class='ctx'> </div><div class='del'>-ifeq ($(dot-config),1)</div><div class='del'>-include include/config/auto.conf</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> # The all: target is the default when no target is given on the</div><div class='ctx'> # command line.</div><div class='ctx'> # This allow a user to issue only 'make' to build a kernel including modules</div><div class='hunk'>@@ -621,6 +630,15 @@ ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'>   CC_FLAGS_FTRACE := -pg</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register</div><div class='add'>+RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register</div><div class='add'>+RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk</div><div class='add'>+RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline</div><div class='add'>+RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))</div><div class='add'>+RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))</div><div class='add'>+export RETPOLINE_CFLAGS</div><div class='add'>+export RETPOLINE_VDSO_CFLAGS</div><div class='add'>+</div><div class='ctx'> # The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default</div><div class='ctx'> # values of the respective KBUILD_* variables</div><div class='ctx'> ARCH_CPPFLAGS :=</div><div class='hunk'>@@ -675,9 +693,10 @@ KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)</div><div class='ctx'> KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)</div><div class='ctx'> KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)</div><div class='ctx'> KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)</div><div class='add'>+KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE</div><div class='del'>-KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)</div><div class='add'>+KBUILD_CFLAGS	+= -Os</div><div class='ctx'> else</div><div class='ctx'> KBUILD_CFLAGS   += -O2</div><div class='ctx'> endif</div><div class='hunk'>@@ -716,7 +735,6 @@ ifdef CONFIG_CC_IS_CLANG</div><div class='ctx'> KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-disable-warning, gnu)</div><div class='del'>-KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)</div><div class='ctx'> # Quiet clang warning: comparison of unsigned expression &lt; 0 is always false</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)</div><div class='ctx'> # CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the</div><div class='hunk'>@@ -745,6 +763,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer</div><div class='ctx'> endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+# Initialize all stack variables with a pattern, if desired.</div><div class='add'>+ifdef CONFIG_INIT_STACK_ALL</div><div class='add'>+KBUILD_CFLAGS	+= -ftrivial-auto-var-init=pattern</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> DEBUG_CFLAGS	:= $(call cc-option, -fno-var-tracking-assignments)</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_DEBUG_INFO</div><div class='hunk'>@@ -808,6 +831,10 @@ KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections</div><div class='ctx'> LDFLAGS_vmlinux += --gc-sections</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+ifdef CONFIG_LIVEPATCH</div><div class='add'>+KBUILD_CFLAGS += $(call cc-option, -flive-patching=inline-clone)</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> # arch Makefile may override CC so keep this after arch Makefile is included</div><div class='ctx'> NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)</div><div class='ctx'> </div><div class='hunk'>@@ -950,9 +977,11 @@ mod_sign_cmd = true</div><div class='ctx'> endif</div><div class='ctx'> export mod_sign_cmd</div><div class='ctx'> </div><div class='add'>+HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2&gt;/dev/null || echo -lelf)</div><div class='add'>+</div><div class='ctx'> ifdef CONFIG_STACK_VALIDATION</div><div class='ctx'>   has_libelf := $(call try-run,\</div><div class='del'>-		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)</div><div class='add'>+		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)</div><div class='ctx'>   ifeq ($(has_libelf),1)</div><div class='ctx'>     objtool_target := tools/objtool FORCE</div><div class='ctx'>   else</div><div class='hunk'>@@ -970,8 +999,9 @@ vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \</div><div class='ctx'> 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \</div><div class='ctx'> 		     $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))</div><div class='ctx'> </div><div class='del'>-vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \</div><div class='del'>-		     $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-))))</div><div class='add'>+vmlinux-alldirs	:= $(sort $(vmlinux-dirs) Documentation \</div><div class='add'>+		     $(patsubst %/,%,$(filter %/, $(init-) $(core-) \</div><div class='add'>+			$(drivers-) $(net-) $(libs-) $(virt-))))</div><div class='ctx'> </div><div class='ctx'> init-y		:= $(patsubst %/, %/built-in.a, $(init-y))</div><div class='ctx'> core-y		:= $(patsubst %/, %/built-in.a, $(core-y))</div><div class='hunk'>@@ -988,7 +1018,7 @@ export KBUILD_VMLINUX_LIBS := $(libs-y1)</div><div class='ctx'> export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds</div><div class='ctx'> export LDFLAGS_vmlinux</div><div class='ctx'> # used by scripts/package/Makefile</div><div class='del'>-export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)</div><div class='add'>+export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch include scripts tools)</div><div class='ctx'> </div><div class='ctx'> vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)</div><div class='ctx'> </div><div class='hunk'>@@ -1025,11 +1055,8 @@ vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE</div><div class='ctx'> </div><div class='ctx'> targets := vmlinux</div><div class='ctx'> </div><div class='del'>-# Build samples along the rest of the kernel. This needs headers_install.</div><div class='del'>-ifdef CONFIG_SAMPLES</div><div class='del'>-vmlinux-dirs += samples</div><div class='add'>+# Some samples need headers_install.</div><div class='ctx'> samples: headers_install</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> # The actual objects are generated when descending,</div><div class='ctx'> # make sure no implicit rule kicks in</div><div class='hunk'>@@ -1049,7 +1076,7 @@ filechk_kernel.release = \</div><div class='ctx'> 	echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"</div><div class='ctx'> </div><div class='ctx'> # Store (new) KERNELRELEASE string in include/config/kernel.release</div><div class='del'>-include/config/kernel.release: $(srctree)/Makefile FORCE</div><div class='add'>+include/config/kernel.release: FORCE</div><div class='ctx'> 	$(call filechk,kernel.release)</div><div class='ctx'> </div><div class='ctx'> # Additional helpers built in scripts/</div><div class='hunk'>@@ -1071,9 +1098,11 @@ PHONY += prepare archprepare prepare1 prepare3</div><div class='ctx'> # and if so do:</div><div class='ctx'> # 1) Check that make has not been executed in the kernel src $(srctree)</div><div class='ctx'> prepare3: include/config/kernel.release</div><div class='del'>-ifneq ($(KBUILD_SRC),)</div><div class='add'>+ifneq ($(srctree),.)</div><div class='ctx'> 	@$(kecho) '  Using $(srctree) as source for kernel'</div><div class='del'>-	$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \</div><div class='add'>+	$(Q)if [ -f $(srctree)/.config -o \</div><div class='add'>+		 -d $(srctree)/include/config -o \</div><div class='add'>+		 -d $(srctree)/arch/$(SRCARCH)/include/generated ]; then \</div><div class='ctx'> 		echo &gt;&amp;2 "  $(srctree) is not clean, please run 'make mrproper'"; \</div><div class='ctx'> 		echo &gt;&amp;2 "  in the '$(srctree)' directory.";\</div><div class='ctx'> 		/bin/false; \</div><div class='hunk'>@@ -1289,6 +1318,7 @@ _modinst_:</div><div class='ctx'> 	fi</div><div class='ctx'> 	@cp -f $(objtree)/modules.order $(MODLIB)/</div><div class='ctx'> 	@cp -f $(objtree)/modules.builtin $(MODLIB)/</div><div class='add'>+	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/</div><div class='ctx'> 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst</div><div class='ctx'> </div><div class='ctx'> # This depmod is only for convenience to give the initial</div><div class='hunk'>@@ -1329,10 +1359,11 @@ endif # CONFIG_MODULES</div><div class='ctx'> </div><div class='ctx'> # Directories &amp; files removed with 'make clean'</div><div class='ctx'> CLEAN_DIRS  += $(MODVERDIR) include/ksym</div><div class='add'>+CLEAN_FILES += modules.builtin.modinfo</div><div class='ctx'> </div><div class='ctx'> # Directories &amp; files removed with 'make mrproper'</div><div class='ctx'> MRPROPER_DIRS  += include/config usr/include include/generated          \</div><div class='del'>-		  arch/*/include/generated .tmp_objdiff</div><div class='add'>+		  arch/$(SRCARCH)/include/generated .tmp_objdiff</div><div class='ctx'> MRPROPER_FILES += .config .config.old .version \</div><div class='ctx'> 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \</div><div class='ctx'> 		  signing_key.pem signing_key.priv signing_key.x509	\</div><div class='hunk'>@@ -1343,7 +1374,7 @@ MRPROPER_FILES += .config .config.old .version \</div><div class='ctx'> #</div><div class='ctx'> clean: rm-dirs  := $(CLEAN_DIRS)</div><div class='ctx'> clean: rm-files := $(CLEAN_FILES)</div><div class='del'>-clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples)</div><div class='add'>+clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs))</div><div class='ctx'> </div><div class='ctx'> PHONY += $(clean-dirs) clean archclean vmlinuxclean</div><div class='ctx'> $(clean-dirs):</div><div class='hunk'>@@ -1757,7 +1788,7 @@ existing-targets := $(wildcard $(sort $(targets)))</div><div class='ctx'> </div><div class='ctx'> endif   # ifeq ($(config-targets),1)</div><div class='ctx'> endif   # ifeq ($(mixed-targets),1)</div><div class='del'>-endif   # sub-make-done</div><div class='add'>+endif   # need-sub-make</div><div class='ctx'> </div><div class='ctx'> PHONY += FORCE</div><div class='ctx'> FORCE:</div><div class='head'>diff --git a/arch/Kconfig b/arch/Kconfig<br/>index 33687dddd86a..5e43fcbad4ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/Kconfig</a></div><div class='hunk'>@@ -249,6 +249,10 @@ config ARCH_HAS_FORTIFY_SOURCE</div><div class='ctx'> config ARCH_HAS_SET_MEMORY</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+# Select if arch has all set_direct_map_invalid/default() functions</div><div class='add'>+config ARCH_HAS_SET_DIRECT_MAP</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> # Select if arch init_task must go in the __init_task_data section</div><div class='ctx'> config ARCH_TASK_STRUCT_ON_STACK</div><div class='ctx'>        bool</div><div class='hunk'>@@ -383,7 +387,13 @@ config HAVE_ARCH_JUMP_LABEL_RELATIVE</div><div class='ctx'> config HAVE_RCU_TABLE_FREE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config HAVE_RCU_TABLE_INVALIDATE</div><div class='add'>+config HAVE_RCU_TABLE_NO_INVALIDATE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config HAVE_MMU_GATHER_PAGE_SIZE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config HAVE_MMU_GATHER_NO_GATHER</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='hunk'>@@ -901,6 +911,15 @@ config HAVE_ARCH_PREL32_RELOCATIONS</div><div class='ctx'> config ARCH_USE_MEMREMAP_PROT</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config LOCK_EVENT_COUNTS</div><div class='add'>+	bool "Locking event counts collection"</div><div class='add'>+	depends on DEBUG_FS</div><div class='add'>+	---help---</div><div class='add'>+	  Enable light-weight counting of various locking related events</div><div class='add'>+	  in the system with minimal performance impact. This reduces</div><div class='add'>+	  the chance of application behavior change because of timing</div><div class='add'>+	  differences. The counts are reported via debugfs.</div><div class='add'>+</div><div class='ctx'> source "kernel/gcov/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "scripts/gcc-plugins/Kconfig"</div><div class='head'>diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig<br/>index 584a6e114853..f7b19b813a70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/Kconfig</a></div><div class='hunk'>@@ -36,6 +36,7 @@ config ALPHA</div><div class='ctx'> 	select ODD_RT_SIGACTION</div><div class='ctx'> 	select OLD_SIGSUSPEND</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67</div><div class='add'>+	select MMU_GATHER_NO_RANGE</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Alpha is a 64-bit general-purpose processor designed and</div><div class='ctx'> 	  marketed by the Digital Equipment Corporation of blessed memory,</div><div class='hunk'>@@ -49,13 +50,6 @@ config MMU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='head'>diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild<br/>index dc0ab28baca1..89e87bbc987f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/include/asm/Kbuild</a></div><div class='hunk'>@@ -6,8 +6,10 @@ generic-y += exec.h</div><div class='ctx'> generic-y += export.h</div><div class='ctx'> generic-y += fb.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += sections.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='head'>diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h<br/>index 4c533fc94d62..ccf9d65166bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/include/asm/io.h</a></div><div class='hunk'>@@ -513,8 +513,6 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)</div><div class='ctx'> #define writel_relaxed(b, addr)	__raw_writel(b, addr)</div><div class='ctx'> #define writeq_relaxed(b, addr)	__raw_writeq(b, addr)</div><div class='ctx'> </div><div class='del'>-#define mmiowb()</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * String version of IO memory access ops:</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/alpha/include/asm/rwsem.h b/arch/alpha/include/asm/rwsem.h<br/>deleted file mode 100644<br/>index cf8fc8f9a2ed..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/rwsem.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/rwsem.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,211 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _ALPHA_RWSEM_H</div><div class='del'>-#define _ALPHA_RWSEM_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Written by Ivan Kokshaysky &lt;ink@jurassic.park.msu.ru&gt;, 2001.</div><div class='del'>- * Based on asm-alpha/semaphore.h and asm-i386/rwsem.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_RWSEM_H</div><div class='del'>-#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-</div><div class='del'>-#define RWSEM_UNLOCKED_VALUE		0x0000000000000000L</div><div class='del'>-#define RWSEM_ACTIVE_BIAS		0x0000000000000001L</div><div class='del'>-#define RWSEM_ACTIVE_MASK		0x00000000ffffffffL</div><div class='del'>-#define RWSEM_WAITING_BIAS		(-0x0000000100000000L)</div><div class='del'>-#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS</div><div class='del'>-#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)</div><div class='del'>-</div><div class='del'>-static inline int ___down_read(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long oldcount;</div><div class='del'>-#ifndef	CONFIG_SMP</div><div class='del'>-	oldcount = sem-&gt;count.counter;</div><div class='del'>-	sem-&gt;count.counter += RWSEM_ACTIVE_READ_BIAS;</div><div class='del'>-#else</div><div class='del'>-	long temp;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"1:	ldq_l	%0,%1\n"</div><div class='del'>-	"	addq	%0,%3,%2\n"</div><div class='del'>-	"	stq_c	%2,%1\n"</div><div class='del'>-	"	beq	%2,2f\n"</div><div class='del'>-	"	mb\n"</div><div class='del'>-	".subsection 2\n"</div><div class='del'>-	"2:	br	1b\n"</div><div class='del'>-	".previous"</div><div class='del'>-	:"=&amp;r" (oldcount), "=m" (sem-&gt;count), "=&amp;r" (temp)</div><div class='del'>-	:"Ir" (RWSEM_ACTIVE_READ_BIAS), "m" (sem-&gt;count) : "memory");</div><div class='del'>-#endif</div><div class='del'>-	return (oldcount &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __down_read(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(___down_read(sem)))</div><div class='del'>-		rwsem_down_read_failed(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __down_read_killable(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(___down_read(sem)))</div><div class='del'>-		if (IS_ERR(rwsem_down_read_failed_killable(sem)))</div><div class='del'>-			return -EINTR;</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'>- * trylock for reading -- returns 1 if successful, 0 if contention</div><div class='del'>- */</div><div class='del'>-static inline int __down_read_trylock(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long old, new, res;</div><div class='del'>-</div><div class='del'>-	res = atomic_long_read(&amp;sem-&gt;count);</div><div class='del'>-	do {</div><div class='del'>-		new = res + RWSEM_ACTIVE_READ_BIAS;</div><div class='del'>-		if (new &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		old = res;</div><div class='del'>-		res = atomic_long_cmpxchg(&amp;sem-&gt;count, old, new);</div><div class='del'>-	} while (res != old);</div><div class='del'>-	return res &gt;= 0 ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long ___down_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long oldcount;</div><div class='del'>-#ifndef	CONFIG_SMP</div><div class='del'>-	oldcount = sem-&gt;count.counter;</div><div class='del'>-	sem-&gt;count.counter += RWSEM_ACTIVE_WRITE_BIAS;</div><div class='del'>-#else</div><div class='del'>-	long temp;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"1:	ldq_l	%0,%1\n"</div><div class='del'>-	"	addq	%0,%3,%2\n"</div><div class='del'>-	"	stq_c	%2,%1\n"</div><div class='del'>-	"	beq	%2,2f\n"</div><div class='del'>-	"	mb\n"</div><div class='del'>-	".subsection 2\n"</div><div class='del'>-	"2:	br	1b\n"</div><div class='del'>-	".previous"</div><div class='del'>-	:"=&amp;r" (oldcount), "=m" (sem-&gt;count), "=&amp;r" (temp)</div><div class='del'>-	:"Ir" (RWSEM_ACTIVE_WRITE_BIAS), "m" (sem-&gt;count) : "memory");</div><div class='del'>-#endif</div><div class='del'>-	return oldcount;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __down_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(___down_write(sem)))</div><div class='del'>-		rwsem_down_write_failed(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __down_write_killable(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(___down_write(sem))) {</div><div class='del'>-		if (IS_ERR(rwsem_down_write_failed_killable(sem)))</div><div class='del'>-			return -EINTR;</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'>- * trylock for writing -- returns 1 if successful, 0 if contention</div><div class='del'>- */</div><div class='del'>-static inline int __down_write_trylock(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long ret = atomic_long_cmpxchg(&amp;sem-&gt;count, RWSEM_UNLOCKED_VALUE,</div><div class='del'>-			   RWSEM_ACTIVE_WRITE_BIAS);</div><div class='del'>-	if (ret == RWSEM_UNLOCKED_VALUE)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __up_read(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long oldcount;</div><div class='del'>-#ifndef	CONFIG_SMP</div><div class='del'>-	oldcount = sem-&gt;count.counter;</div><div class='del'>-	sem-&gt;count.counter -= RWSEM_ACTIVE_READ_BIAS;</div><div class='del'>-#else</div><div class='del'>-	long temp;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"	mb\n"</div><div class='del'>-	"1:	ldq_l	%0,%1\n"</div><div class='del'>-	"	subq	%0,%3,%2\n"</div><div class='del'>-	"	stq_c	%2,%1\n"</div><div class='del'>-	"	beq	%2,2f\n"</div><div class='del'>-	".subsection 2\n"</div><div class='del'>-	"2:	br	1b\n"</div><div class='del'>-	".previous"</div><div class='del'>-	:"=&amp;r" (oldcount), "=m" (sem-&gt;count), "=&amp;r" (temp)</div><div class='del'>-	:"Ir" (RWSEM_ACTIVE_READ_BIAS), "m" (sem-&gt;count) : "memory");</div><div class='del'>-#endif</div><div class='del'>-	if (unlikely(oldcount &lt; 0))</div><div class='del'>-		if ((int)oldcount - RWSEM_ACTIVE_READ_BIAS == 0)</div><div class='del'>-			rwsem_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __up_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long count;</div><div class='del'>-#ifndef	CONFIG_SMP</div><div class='del'>-	sem-&gt;count.counter -= RWSEM_ACTIVE_WRITE_BIAS;</div><div class='del'>-	count = sem-&gt;count.counter;</div><div class='del'>-#else</div><div class='del'>-	long temp;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"	mb\n"</div><div class='del'>-	"1:	ldq_l	%0,%1\n"</div><div class='del'>-	"	subq	%0,%3,%2\n"</div><div class='del'>-	"	stq_c	%2,%1\n"</div><div class='del'>-	"	beq	%2,2f\n"</div><div class='del'>-	"	subq	%0,%3,%0\n"</div><div class='del'>-	".subsection 2\n"</div><div class='del'>-	"2:	br	1b\n"</div><div class='del'>-	".previous"</div><div class='del'>-	:"=&amp;r" (count), "=m" (sem-&gt;count), "=&amp;r" (temp)</div><div class='del'>-	:"Ir" (RWSEM_ACTIVE_WRITE_BIAS), "m" (sem-&gt;count) : "memory");</div><div class='del'>-#endif</div><div class='del'>-	if (unlikely(count))</div><div class='del'>-		if ((int)count == 0)</div><div class='del'>-			rwsem_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * downgrade write lock to read lock</div><div class='del'>- */</div><div class='del'>-static inline void __downgrade_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long oldcount;</div><div class='del'>-#ifndef	CONFIG_SMP</div><div class='del'>-	oldcount = sem-&gt;count.counter;</div><div class='del'>-	sem-&gt;count.counter -= RWSEM_WAITING_BIAS;</div><div class='del'>-#else</div><div class='del'>-	long temp;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"1:	ldq_l	%0,%1\n"</div><div class='del'>-	"	addq	%0,%3,%2\n"</div><div class='del'>-	"	stq_c	%2,%1\n"</div><div class='del'>-	"	beq	%2,2f\n"</div><div class='del'>-	"	mb\n"</div><div class='del'>-	".subsection 2\n"</div><div class='del'>-	"2:	br	1b\n"</div><div class='del'>-	".previous"</div><div class='del'>-	:"=&amp;r" (oldcount), "=m" (sem-&gt;count), "=&amp;r" (temp)</div><div class='del'>-	:"Ir" (-RWSEM_WAITING_BIAS), "m" (sem-&gt;count) : "memory");</div><div class='del'>-#endif</div><div class='del'>-	if (unlikely(oldcount &lt; 0))</div><div class='del'>-		rwsem_downgrade_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='del'>-#endif /* _ALPHA_RWSEM_H */</div><div class='head'>diff --git a/arch/alpha/include/asm/syscall.h b/arch/alpha/include/asm/syscall.h<br/>index d73a6fcb519c..11c688c1d7ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/include/asm/syscall.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_ALPHA;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/alpha/include/asm/tlb.h b/arch/alpha/include/asm/tlb.h<br/>index 8f5042b61875..4f79e331af5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/include/asm/tlb.h</a></div><div class='hunk'>@@ -2,12 +2,6 @@</div><div class='ctx'> #ifndef _ALPHA_TLB_H</div><div class='ctx'> #define _ALPHA_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_start_vma(tlb, vma)			do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)			do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, pte, addr)	do { } while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_flush(tlb)				flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __pte_free_tlb(tlb, pte, address)		pte_free((tlb)-&gt;mm, pte)</div><div class='head'>diff --git a/arch/alpha/include/uapi/asm/kvm_para.h b/arch/alpha/include/uapi/asm/kvm_para.h<br/>deleted file mode 100644<br/>index baacc4996d18..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/uapi/asm/kvm_para.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/uapi/asm/kvm_para.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#include &lt;asm-generic/kvm_para.h&gt;</div><div class='head'>diff --git a/arch/alpha/include/uapi/asm/sockios.h b/arch/alpha/include/uapi/asm/sockios.h<br/>index ba287e4b01bf..af92bc27c3be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/include/uapi/asm/sockios.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/include/uapi/asm/sockios.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #define SIOCSPGRP	_IOW('s', 8, pid_t)</div><div class='ctx'> #define SIOCGPGRP	_IOR('s', 9, pid_t)</div><div class='ctx'> </div><div class='del'>-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */</div><div class='add'>+#define SIOCGSTAMP_OLD	0x8906		/* Get stamp (timeval) */</div><div class='add'>+#define SIOCGSTAMPNS_OLD 0x8907		/* Get stamp (timespec) */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_ALPHA_SOCKIOS_H */</div><div class='head'>diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c<br/>index 3034d6d936d2..242108439f42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/kernel/pci_iommu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/kernel/pci_iommu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/kernel/pci_iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/kernel/pci_iommu.c</a></div><div class='hunk'>@@ -249,7 +249,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask)</div><div class='ctx'> 		ok = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If both conditions above are met, we are fine. */</div><div class='del'>-	DBGA("pci_dac_dma_supported %s from %pf\n",</div><div class='add'>+	DBGA("pci_dac_dma_supported %s from %ps\n",</div><div class='ctx'> 	     ok ? "yes" : "no", __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 	return ok;</div><div class='hunk'>@@ -281,7 +281,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,</div><div class='ctx'> 	    &amp;&amp; paddr + size &lt;= __direct_map_size) {</div><div class='ctx'> 		ret = paddr + __direct_map_base;</div><div class='ctx'> </div><div class='del'>-		DBGA2("pci_map_single: [%p,%zx] -&gt; direct %llx from %pf\n",</div><div class='add'>+		DBGA2("pci_map_single: [%p,%zx] -&gt; direct %llx from %ps\n",</div><div class='ctx'> 		      cpu_addr, size, ret, __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -292,7 +292,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,</div><div class='ctx'> 	if (dac_allowed) {</div><div class='ctx'> 		ret = paddr + alpha_mv.pci_dac_offset;</div><div class='ctx'> </div><div class='del'>-		DBGA2("pci_map_single: [%p,%zx] -&gt; DAC %llx from %pf\n",</div><div class='add'>+		DBGA2("pci_map_single: [%p,%zx] -&gt; DAC %llx from %ps\n",</div><div class='ctx'> 		      cpu_addr, size, ret, __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -329,7 +329,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,</div><div class='ctx'> 	ret = arena-&gt;dma_base + dma_ofs * PAGE_SIZE;</div><div class='ctx'> 	ret += (unsigned long)cpu_addr &amp; ~PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-	DBGA2("pci_map_single: [%p,%zx] np %ld -&gt; sg %llx from %pf\n",</div><div class='add'>+	DBGA2("pci_map_single: [%p,%zx] np %ld -&gt; sg %llx from %ps\n",</div><div class='ctx'> 	      cpu_addr, size, npages, ret, __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -396,14 +396,14 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,</div><div class='ctx'> 	    &amp;&amp; dma_addr &lt; __direct_map_base + __direct_map_size) {</div><div class='ctx'> 		/* Nothing to do.  */</div><div class='ctx'> </div><div class='del'>-		DBGA2("pci_unmap_single: direct [%llx,%zx] from %pf\n",</div><div class='add'>+		DBGA2("pci_unmap_single: direct [%llx,%zx] from %ps\n",</div><div class='ctx'> 		      dma_addr, size, __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dma_addr &gt; 0xffffffff) {</div><div class='del'>-		DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %pf\n",</div><div class='add'>+		DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %ps\n",</div><div class='ctx'> 		      dma_addr, size, __builtin_return_address(0));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -435,7 +435,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;arena-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %pf\n",</div><div class='add'>+	DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %ps\n",</div><div class='ctx'> 	      dma_addr, size, npages, __builtin_return_address(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -458,7 +458,7 @@ try_again:</div><div class='ctx'> 	cpu_addr = (void *)__get_free_pages(gfp | __GFP_ZERO, order);</div><div class='ctx'> 	if (! cpu_addr) {</div><div class='ctx'> 		printk(KERN_INFO "pci_alloc_consistent: "</div><div class='del'>-		       "get_free_pages failed from %pf\n",</div><div class='add'>+		       "get_free_pages failed from %ps\n",</div><div class='ctx'> 			__builtin_return_address(0));</div><div class='ctx'> 		/* ??? Really atomic allocation?  Otherwise we could play</div><div class='ctx'> 		   with vmalloc and sg if we can't find contiguous memory.  */</div><div class='hunk'>@@ -477,7 +477,7 @@ try_again:</div><div class='ctx'> 		goto try_again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DBGA2("pci_alloc_consistent: %zx -&gt; [%p,%llx] from %pf\n",</div><div class='add'>+	DBGA2("pci_alloc_consistent: %zx -&gt; [%p,%llx] from %ps\n",</div><div class='ctx'> 	      size, cpu_addr, *dma_addrp, __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 	return cpu_addr;</div><div class='hunk'>@@ -497,7 +497,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);</div><div class='ctx'> 	free_pages((unsigned long)cpu_addr, get_order(size));</div><div class='ctx'> </div><div class='del'>-	DBGA2("pci_free_consistent: [%llx,%zx] from %pf\n",</div><div class='add'>+	DBGA2("pci_free_consistent: [%llx,%zx] from %ps\n",</div><div class='ctx'> 	      dma_addr, size, __builtin_return_address(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl<br/>index 63ed39cbd3bd..165f268beafc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/alpha/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/alpha/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/alpha/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -463,3 +463,7 @@</div><div class='ctx'> 532	common	getppid				sys_getppid</div><div class='ctx'> # all other architectures have common numbers for new syscall, alpha</div><div class='ctx'> # is the exception.</div><div class='add'>+534	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+535	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+536	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+537	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig<br/>index df55672c59e6..23e063df5d2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/Kconfig</a></div><div class='hunk'>@@ -63,9 +63,6 @@ config SCHED_OMIT_FRAME_POINTER</div><div class='ctx'> config GENERIC_CSUM</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config ARCH_DISCONTIGMEM_ENABLE</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='hunk'>@@ -144,11 +141,11 @@ config ARC_CPU_770</div><div class='ctx'> 	  Support for ARC770 core introduced with Rel 4.10 (Summer 2011)</div><div class='ctx'> 	  This core has a bunch of cool new features:</div><div class='ctx'> 	  -MMU-v3: Variable Page Sz (4k, 8k, 16k), bigger J-TLB (128x4)</div><div class='del'>-                   Shared Address Spaces (for sharing TLB entries in MMU)</div><div class='add'>+	           Shared Address Spaces (for sharing TLB entries in MMU)</div><div class='ctx'> 	  -Caches: New Prog Model, Region Flush</div><div class='ctx'> 	  -Insns: endian swap, load-locked/store-conditional, time-stamp-ctr</div><div class='ctx'> </div><div class='del'>-endif	#ISA_ARCOMPACT</div><div class='add'>+endif #ISA_ARCOMPACT</div><div class='ctx'> </div><div class='ctx'> config ARC_CPU_HS</div><div class='ctx'> 	bool "ARC-HS"</div><div class='hunk'>@@ -198,7 +195,7 @@ config ARC_SMP_HALT_ON_RESET</div><div class='ctx'> 	  at designated entry point. For other case, all jump to common</div><div class='ctx'> 	  entry point and spin wait for Master's signal.</div><div class='ctx'> </div><div class='del'>-endif	#SMP</div><div class='add'>+endif #SMP</div><div class='ctx'> </div><div class='ctx'> config ARC_MCIP</div><div class='ctx'> 	bool "ARConnect Multicore IP (MCIP) Support "</div><div class='hunk'>@@ -249,7 +246,7 @@ config ARC_CACHE_VIPT_ALIASING</div><div class='ctx'> 	bool "Support VIPT Aliasing D$"</div><div class='ctx'> 	depends on ARC_HAS_DCACHE &amp;&amp; ISA_ARCOMPACT</div><div class='ctx'> </div><div class='del'>-endif	#ARC_CACHE</div><div class='add'>+endif #ARC_CACHE</div><div class='ctx'> </div><div class='ctx'> config ARC_HAS_ICCM</div><div class='ctx'> 	bool "Use ICCM"</div><div class='hunk'>@@ -370,7 +367,7 @@ config ARC_FPU_SAVE_RESTORE</div><div class='ctx'> 	  based on actual usage of FPU by a task. Thus our implemn does</div><div class='ctx'> 	  this for all tasks in system.</div><div class='ctx'> </div><div class='del'>-endif	#ISA_ARCOMPACT</div><div class='add'>+endif #ISA_ARCOMPACT</div><div class='ctx'> </div><div class='ctx'> config ARC_CANT_LLSC</div><div class='ctx'> 	def_bool n</div><div class='hunk'>@@ -386,6 +383,15 @@ config ARC_HAS_SWAPE</div><div class='ctx'> </div><div class='ctx'> if ISA_ARCV2</div><div class='ctx'> </div><div class='add'>+config ARC_USE_UNALIGNED_MEM_ACCESS</div><div class='add'>+	bool "Enable unaligned access in HW"</div><div class='add'>+	default y</div><div class='add'>+	select HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='add'>+	help</div><div class='add'>+	  The ARC HS architecture supports unaligned memory access</div><div class='add'>+	  which is disabled by default. Enable unaligned access in</div><div class='add'>+	  hardware and use software to use it</div><div class='add'>+</div><div class='ctx'> config ARC_HAS_LL64</div><div class='ctx'> 	bool "Insn: 64bit LDD/STD"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -414,7 +420,7 @@ config ARC_IRQ_NO_AUTOSAVE</div><div class='ctx'> 	  This is programmable and can be optionally disabled in which case</div><div class='ctx'> 	  software INTERRUPT_PROLOGUE/EPILGUE do the needed work</div><div class='ctx'> </div><div class='del'>-endif	# ISA_ARCV2</div><div class='add'>+endif # ISA_ARCV2</div><div class='ctx'> </div><div class='ctx'> endmenu   # "ARC CPU Configuration"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/Makefile b/arch/arc/Makefile<br/>index df00578c279d..e2b991f75bc5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/Makefile</a></div><div class='hunk'>@@ -28,6 +28,12 @@ cflags-$(CONFIG_ARC_HAS_SWAPE)		+= -mswape</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_ISA_ARCV2</div><div class='ctx'> </div><div class='add'>+ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS</div><div class='add'>+cflags-y				+= -munaligned-access</div><div class='add'>+else</div><div class='add'>+cflags-y				+= -mno-unaligned-access</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> ifndef CONFIG_ARC_HAS_LL64</div><div class='ctx'> cflags-y				+= -mno-ll64</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arc/boot/dts/abilis_tb100.dtsi b/arch/arc/boot/dts/abilis_tb100.dtsi<br/>index 02410b211433..c0bcd97522bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb100.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb100.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb100.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/abilis_tb100.dtsi</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> 			clock-div = &lt;6&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		iomux: iomux@FF10601c {</div><div class='add'>+		iomux: iomux@ff10601c {</div><div class='ctx'> 			/* Port 1 */</div><div class='ctx'> 			pctl_tsin_s0: pctl-tsin-s0 {   /* Serial TS-in 0 */</div><div class='ctx'> 				abilis,function = "mis0";</div><div class='hunk'>@@ -162,182 +162,182 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		gpioa: gpio@FF140000 {</div><div class='add'>+		gpioa: gpio@ff140000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF140000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff140000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioa";</div><div class='ctx'> 		};</div><div class='del'>-		gpiob: gpio@FF141000 {</div><div class='add'>+		gpiob: gpio@ff141000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF141000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff141000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiob";</div><div class='ctx'> 		};</div><div class='del'>-		gpioc: gpio@FF142000 {</div><div class='add'>+		gpioc: gpio@ff142000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF142000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff142000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioc";</div><div class='ctx'> 		};</div><div class='del'>-		gpiod: gpio@FF143000 {</div><div class='add'>+		gpiod: gpio@ff143000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF143000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff143000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiod";</div><div class='ctx'> 		};</div><div class='del'>-		gpioe: gpio@FF144000 {</div><div class='add'>+		gpioe: gpio@ff144000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF144000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff144000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioe";</div><div class='ctx'> 		};</div><div class='del'>-		gpiof: gpio@FF145000 {</div><div class='add'>+		gpiof: gpio@ff145000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF145000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff145000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiof";</div><div class='ctx'> 		};</div><div class='del'>-		gpiog: gpio@FF146000 {</div><div class='add'>+		gpiog: gpio@ff146000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF146000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff146000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiog";</div><div class='ctx'> 		};</div><div class='del'>-		gpioh: gpio@FF147000 {</div><div class='add'>+		gpioh: gpio@ff147000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF147000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff147000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioh";</div><div class='ctx'> 		};</div><div class='del'>-		gpioi: gpio@FF148000 {</div><div class='add'>+		gpioi: gpio@ff148000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF148000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff148000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;12&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioi";</div><div class='ctx'> 		};</div><div class='del'>-		gpioj: gpio@FF149000 {</div><div class='add'>+		gpioj: gpio@ff149000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF149000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff149000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;32&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioj";</div><div class='ctx'> 		};</div><div class='del'>-		gpiok: gpio@FF14a000 {</div><div class='add'>+		gpiok: gpio@ff14a000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14A000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14a000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;22&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiok";</div><div class='ctx'> 		};</div><div class='del'>-		gpiol: gpio@FF14b000 {</div><div class='add'>+		gpiol: gpio@ff14b000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14B000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14b000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;4&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiol";</div><div class='ctx'> 		};</div><div class='del'>-		gpiom: gpio@FF14c000 {</div><div class='add'>+		gpiom: gpio@ff14c000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14C000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14c000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;4&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiom";</div><div class='ctx'> 		};</div><div class='del'>-		gpion: gpio@FF14d000 {</div><div class='add'>+		gpion: gpio@ff14d000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14D000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14d000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;5&gt;;</div><div class='head'>diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts<br/>index 3acf04db8030..c968e677db46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb100_dvk.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb100_dvk.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb100_dvk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/abilis_tb100_dvk.dts</a></div><div class='hunk'>@@ -37,27 +37,27 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc100 {</div><div class='del'>-		uart@FF100000 {</div><div class='add'>+		uart@ff100000 {</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;pctl_uart0&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		ethernet@FE100000 {</div><div class='add'>+		ethernet@fe100000 {</div><div class='ctx'> 			phy-mode = "rgmii";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c0: i2c@FF120000 {</div><div class='add'>+		i2c0: i2c@ff120000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c1: i2c@FF121000 {</div><div class='add'>+		i2c1: i2c@ff121000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c2: i2c@FF122000 {</div><div class='add'>+		i2c2: i2c@ff122000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c3: i2c@FF123000 {</div><div class='add'>+		i2c3: i2c@ff123000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c4: i2c@FF124000 {</div><div class='add'>+		i2c4: i2c@ff124000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/boot/dts/abilis_tb101.dtsi b/arch/arc/boot/dts/abilis_tb101.dtsi<br/>index f9e7686044eb..6a1615f58f05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb101.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb101.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb101.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/abilis_tb101.dtsi</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> 			clock-div = &lt;6&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		iomux: iomux@FF10601c {</div><div class='add'>+		iomux: iomux@ff10601c {</div><div class='ctx'> 			/* Port 1 */</div><div class='ctx'> 			pctl_tsin_s0: pctl-tsin-s0 {   /* Serial TS-in 0 */</div><div class='ctx'> 				abilis,function = "mis0";</div><div class='hunk'>@@ -171,182 +171,182 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		gpioa: gpio@FF140000 {</div><div class='add'>+		gpioa: gpio@ff140000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF140000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff140000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioa";</div><div class='ctx'> 		};</div><div class='del'>-		gpiob: gpio@FF141000 {</div><div class='add'>+		gpiob: gpio@ff141000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF141000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff141000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiob";</div><div class='ctx'> 		};</div><div class='del'>-		gpioc: gpio@FF142000 {</div><div class='add'>+		gpioc: gpio@ff142000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF142000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff142000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioc";</div><div class='ctx'> 		};</div><div class='del'>-		gpiod: gpio@FF143000 {</div><div class='add'>+		gpiod: gpio@ff143000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF143000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff143000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiod";</div><div class='ctx'> 		};</div><div class='del'>-		gpioe: gpio@FF144000 {</div><div class='add'>+		gpioe: gpio@ff144000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF144000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff144000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioe";</div><div class='ctx'> 		};</div><div class='del'>-		gpiof: gpio@FF145000 {</div><div class='add'>+		gpiof: gpio@ff145000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF145000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff145000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiof";</div><div class='ctx'> 		};</div><div class='del'>-		gpiog: gpio@FF146000 {</div><div class='add'>+		gpiog: gpio@ff146000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF146000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff146000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;3&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiog";</div><div class='ctx'> 		};</div><div class='del'>-		gpioh: gpio@FF147000 {</div><div class='add'>+		gpioh: gpio@ff147000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF147000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff147000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;2&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioh";</div><div class='ctx'> 		};</div><div class='del'>-		gpioi: gpio@FF148000 {</div><div class='add'>+		gpioi: gpio@ff148000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF148000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff148000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;12&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioi";</div><div class='ctx'> 		};</div><div class='del'>-		gpioj: gpio@FF149000 {</div><div class='add'>+		gpioj: gpio@ff149000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF149000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff149000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;32&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpioj";</div><div class='ctx'> 		};</div><div class='del'>-		gpiok: gpio@FF14a000 {</div><div class='add'>+		gpiok: gpio@ff14a000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14A000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14a000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;22&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiok";</div><div class='ctx'> 		};</div><div class='del'>-		gpiol: gpio@FF14b000 {</div><div class='add'>+		gpiol: gpio@ff14b000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14B000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14b000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;4&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiol";</div><div class='ctx'> 		};</div><div class='del'>-		gpiom: gpio@FF14c000 {</div><div class='add'>+		gpiom: gpio@ff14c000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14C000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14c000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;4&gt;;</div><div class='ctx'> 			gpio-ranges = &lt;&amp;iomux 0 0 0&gt;;</div><div class='ctx'> 			gpio-ranges-group-names = "gpiom";</div><div class='ctx'> 		};</div><div class='del'>-		gpion: gpio@FF14d000 {</div><div class='add'>+		gpion: gpio@ff14d000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-gpio";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;27 2&gt;;</div><div class='del'>-			reg = &lt;0xFF14D000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff14d000 0x1000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			abilis,ngpio = &lt;5&gt;;</div><div class='head'>diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts<br/>index 37d88c5dd181..05143ce9c120 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb101_dvk.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb101_dvk.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb101_dvk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/abilis_tb101_dvk.dts</a></div><div class='hunk'>@@ -37,27 +37,27 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc100 {</div><div class='del'>-		uart@FF100000 {</div><div class='add'>+		uart@ff100000 {</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;pctl_uart0&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		ethernet@FE100000 {</div><div class='add'>+		ethernet@fe100000 {</div><div class='ctx'> 			phy-mode = "rgmii";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c0: i2c@FF120000 {</div><div class='add'>+		i2c0: i2c@ff120000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c1: i2c@FF121000 {</div><div class='add'>+		i2c1: i2c@ff121000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c2: i2c@FF122000 {</div><div class='add'>+		i2c2: i2c@ff122000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c3: i2c@FF123000 {</div><div class='add'>+		i2c3: i2c@ff123000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c4: i2c@FF124000 {</div><div class='add'>+		i2c4: i2c@ff124000 {</div><div class='ctx'> 			i2c-sda-hold-time-ns = &lt;432&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi<br/>index 3121536b25a3..2fbf1bdfe6de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb10x.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/abilis_tb10x.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/abilis_tb10x.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/abilis_tb10x.dtsi</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> 		#size-cells	= &lt;1&gt;;</div><div class='ctx'> 		device_type	= "soc";</div><div class='ctx'> 		ranges		= &lt;0xfe000000 0xfe000000 0x02000000</div><div class='del'>-				0x000F0000 0x000F0000 0x00010000&gt;;</div><div class='add'>+				0x000f0000 0x000f0000 0x00010000&gt;;</div><div class='ctx'> 		compatible	= "abilis,tb10x", "simple-bus";</div><div class='ctx'> </div><div class='ctx'> 		pll0: oscillator {</div><div class='hunk'>@@ -75,10 +75,10 @@</div><div class='ctx'> 			clock-output-names = "ahb_clk";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		iomux: iomux@FF10601c {</div><div class='add'>+		iomux: iomux@ff10601c {</div><div class='ctx'> 			compatible = "abilis,tb10x-iomux";</div><div class='ctx'> 			#gpio-range-cells = &lt;3&gt;;</div><div class='del'>-			reg = &lt;0xFF10601c 0x4&gt;;</div><div class='add'>+			reg = &lt;0xff10601c 0x4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		intc: interrupt-controller {</div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 		tb10x_ictl: pic@fe002000 {</div><div class='ctx'> 			compatible = "abilis,tb10x-ictl";</div><div class='del'>-			reg = &lt;0xFE002000 0x20&gt;;</div><div class='add'>+			reg = &lt;0xfe002000 0x20&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;intc&gt;;</div><div class='hunk'>@@ -96,27 +96,27 @@</div><div class='ctx'> 					20 21 22 23 24 25 26 27 28 29 30 31&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		uart@FF100000 {</div><div class='add'>+		uart@ff100000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='del'>-			reg = &lt;0xFF100000 0x100&gt;;</div><div class='add'>+			reg = &lt;0xff100000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;166666666&gt;;</div><div class='ctx'> 			interrupts = &lt;25 8&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		ethernet@FE100000 {</div><div class='add'>+		ethernet@fe100000 {</div><div class='ctx'> 			compatible = "snps,dwmac-3.70a","snps,dwmac";</div><div class='del'>-			reg = &lt;0xFE100000 0x1058&gt;;</div><div class='add'>+			reg = &lt;0xfe100000 0x1058&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;6 8&gt;;</div><div class='ctx'> 			interrupt-names = "macirq";</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 			clock-names = "stmmaceth";</div><div class='ctx'> 		};</div><div class='del'>-		dma@FE000000 {</div><div class='add'>+		dma@fe000000 {</div><div class='ctx'> 			compatible = "snps,dma-spear1340";</div><div class='del'>-			reg = &lt;0xFE000000 0x400&gt;;</div><div class='add'>+			reg = &lt;0xfe000000 0x400&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;14 8&gt;;</div><div class='ctx'> 			dma-channels = &lt;6&gt;;</div><div class='hunk'>@@ -132,70 +132,70 @@</div><div class='ctx'> 			multi-block = &lt;1 1 1 1 1 1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c0: i2c@FF120000 {</div><div class='add'>+		i2c0: i2c@ff120000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='del'>-			reg = &lt;0xFF120000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff120000 0x1000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;12 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c1: i2c@FF121000 {</div><div class='add'>+		i2c1: i2c@ff121000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='del'>-			reg = &lt;0xFF121000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff121000 0x1000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;12 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c2: i2c@FF122000 {</div><div class='add'>+		i2c2: i2c@ff122000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='del'>-			reg = &lt;0xFF122000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff122000 0x1000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;12 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c3: i2c@FF123000 {</div><div class='add'>+		i2c3: i2c@ff123000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='del'>-			reg = &lt;0xFF123000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff123000 0x1000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;12 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		i2c4: i2c@FF124000 {</div><div class='add'>+		i2c4: i2c@ff124000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='del'>-			reg = &lt;0xFF124000 0x1000&gt;;</div><div class='add'>+			reg = &lt;0xff124000 0x1000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;12 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		spi0: spi@0xFE010000 {</div><div class='add'>+		spi0: spi@fe010000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			compatible = "abilis,tb100-spi";</div><div class='ctx'> 			num-cs = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0xFE010000 0x20&gt;;</div><div class='add'>+			reg = &lt;0xfe010000 0x20&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;26 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		spi1: spi@0xFE011000 {</div><div class='add'>+		spi1: spi@fe011000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			compatible = "abilis,tb100-spi";</div><div class='ctx'> 			num-cs = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0xFE011000 0x20&gt;;</div><div class='add'>+			reg = &lt;0xfe011000 0x20&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;tb10x_ictl&gt;;</div><div class='ctx'> 			interrupts = &lt;10 8&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='hunk'>@@ -226,23 +226,23 @@</div><div class='ctx'> 			interrupts = &lt;20 2&gt;, &lt;19 2&gt;;</div><div class='ctx'> 			interrupt-names = "cmd_irq", "event_irq";</div><div class='ctx'> 		};</div><div class='del'>-		tb10x_mdsc0: tb10x-mdscr@FF300000 {</div><div class='add'>+		tb10x_mdsc0: tb10x-mdscr@ff300000 {</div><div class='ctx'> 			compatible = "abilis,tb100-mdscr";</div><div class='del'>-			reg = &lt;0xFF300000 0x7000&gt;;</div><div class='add'>+			reg = &lt;0xff300000 0x7000&gt;;</div><div class='ctx'> 			tb100-mdscr-manage-tsin;</div><div class='ctx'> 		};</div><div class='del'>-		tb10x_mscr0: tb10x-mdscr@FF307000 {</div><div class='add'>+		tb10x_mscr0: tb10x-mdscr@ff307000 {</div><div class='ctx'> 			compatible = "abilis,tb100-mdscr";</div><div class='del'>-			reg = &lt;0xFF307000 0x7000&gt;;</div><div class='add'>+			reg = &lt;0xff307000 0x7000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 		tb10x_scr0: tb10x-mdscr@ff30e000 {</div><div class='ctx'> 			compatible = "abilis,tb100-mdscr";</div><div class='del'>-			reg = &lt;0xFF30e000 0x4000&gt;;</div><div class='add'>+			reg = &lt;0xff30e000 0x4000&gt;;</div><div class='ctx'> 			tb100-mdscr-manage-tsin;</div><div class='ctx'> 		};</div><div class='ctx'> 		tb10x_scr1: tb10x-mdscr@ff312000 {</div><div class='ctx'> 			compatible = "abilis,tb100-mdscr";</div><div class='del'>-			reg = &lt;0xFF312000 0x4000&gt;;</div><div class='add'>+			reg = &lt;0xff312000 0x4000&gt;;</div><div class='ctx'> 			tb100-mdscr-manage-tsin;</div><div class='ctx'> 		};</div><div class='ctx'> 		tb10x_wfb: tb10x-wfb@ff319000 {</div><div class='head'>diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi<br/>index fdc266504ada..37be3bf03ad6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axc001.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axc001.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axc001.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/axc001.dtsi</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> 		 * this GPIO block ORs all interrupts on CPU card (creg,..)</div><div class='ctx'> 		 * to uplink only 1 IRQ to ARC core intc</div><div class='ctx'> 		 */</div><div class='del'>-		dw-apb-gpio@0x2000 {</div><div class='add'>+		dw-apb-gpio@2000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-gpio";</div><div class='ctx'> 			reg = &lt; 0x2000 0x80 &gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -60,7 +60,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		debug_uart: dw-apb-uart@0x5000 {</div><div class='add'>+		debug_uart: dw-apb-uart@5000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x5000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;33333000&gt;;</div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> 	 * avoid duplicating the MB dtsi file given that IRQ from</div><div class='ctx'> 	 * this intc to cpu intc are different for axs101 and axs103</div><div class='ctx'> 	 */</div><div class='del'>-	mb_intc: dw-apb-ictl@0xe0012000 {</div><div class='add'>+	mb_intc: dw-apb-ictl@e0012000 {</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "snps,dw-apb-ictl";</div><div class='ctx'> 		reg = &lt; 0x0 0xe0012000 0x0 0x200 &gt;;</div><div class='head'>diff --git a/arch/arc/boot/dts/axc003.dtsi b/arch/arc/boot/dts/axc003.dtsi<br/>index d75d65ddf8e3..effa37536d7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axc003.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axc003.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axc003.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/axc003.dtsi</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 		 * this GPIO block ORs all interrupts on CPU card (creg,..)</div><div class='ctx'> 		 * to uplink only 1 IRQ to ARC core intc</div><div class='ctx'> 		 */</div><div class='del'>-		dw-apb-gpio@0x2000 {</div><div class='add'>+		dw-apb-gpio@2000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-gpio";</div><div class='ctx'> 			reg = &lt; 0x2000 0x80 &gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -74,7 +74,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		debug_uart: dw-apb-uart@0x5000 {</div><div class='add'>+		debug_uart: dw-apb-uart@5000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x5000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;33333000&gt;;</div><div class='hunk'>@@ -102,19 +102,19 @@</div><div class='ctx'> 	 * external DMA buffer located outside of IOC aperture.</div><div class='ctx'> 	 */</div><div class='ctx'> 	axs10x_mb {</div><div class='del'>-		ethernet@0x18000 {</div><div class='add'>+		ethernet@18000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ehci@0x40000 {</div><div class='add'>+		ehci@40000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ohci@0x60000 {</div><div class='add'>+		ohci@60000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mmc@0x15000 {</div><div class='add'>+		mmc@15000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -132,7 +132,7 @@</div><div class='ctx'> 	 * avoid duplicating the MB dtsi file given that IRQ from</div><div class='ctx'> 	 * this intc to cpu intc are different for axs101 and axs103</div><div class='ctx'> 	 */</div><div class='del'>-	mb_intc: dw-apb-ictl@0xe0012000 {</div><div class='add'>+	mb_intc: dw-apb-ictl@e0012000 {</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "snps,dw-apb-ictl";</div><div class='ctx'> 		reg = &lt; 0x0 0xe0012000 0x0 0x200 &gt;;</div><div class='hunk'>@@ -153,7 +153,7 @@</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> 		/*</div><div class='del'>-		 * Move frame buffer out of IOC aperture (0x8z-0xAz).</div><div class='add'>+		 * Move frame buffer out of IOC aperture (0x8z-0xaz).</div><div class='ctx'> 		 */</div><div class='ctx'> 		frame_buffer: frame_buffer@be000000 {</div><div class='ctx'> 			compatible = "shared-dma-pool";</div><div class='head'>diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi<br/>index a05bb737ea63..e401e59f6180 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axc003_idu.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axc003_idu.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axc003_idu.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/axc003_idu.dtsi</a></div><div class='hunk'>@@ -62,7 +62,7 @@</div><div class='ctx'> 		 * this GPIO block ORs all interrupts on CPU card (creg,..)</div><div class='ctx'> 		 * to uplink only 1 IRQ to ARC core intc</div><div class='ctx'> 		 */</div><div class='del'>-		dw-apb-gpio@0x2000 {</div><div class='add'>+		dw-apb-gpio@2000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-gpio";</div><div class='ctx'> 			reg = &lt; 0x2000 0x80 &gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -81,7 +81,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		debug_uart: dw-apb-uart@0x5000 {</div><div class='add'>+		debug_uart: dw-apb-uart@5000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x5000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;33333000&gt;;</div><div class='hunk'>@@ -109,19 +109,19 @@</div><div class='ctx'> 	 * external DMA buffer located outside of IOC aperture.</div><div class='ctx'> 	 */</div><div class='ctx'> 	axs10x_mb {</div><div class='del'>-		ethernet@0x18000 {</div><div class='add'>+		ethernet@18000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ehci@0x40000 {</div><div class='add'>+		ehci@40000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ohci@0x60000 {</div><div class='add'>+		ohci@60000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mmc@0x15000 {</div><div class='add'>+		mmc@15000 {</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -138,7 +138,7 @@</div><div class='ctx'> 	 * avoid duplicating the MB dtsi file given that IRQ from</div><div class='ctx'> 	 * this intc to cpu intc are different for axs101 and axs103</div><div class='ctx'> 	 */</div><div class='del'>-	mb_intc: dw-apb-ictl@0xe0012000 {</div><div class='add'>+	mb_intc: dw-apb-ictl@e0012000 {</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "snps,dw-apb-ictl";</div><div class='ctx'> 		reg = &lt; 0x0 0xe0012000 0x0 0x200 &gt;;</div><div class='hunk'>@@ -159,7 +159,7 @@</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> 		/*</div><div class='del'>-		 * Move frame buffer out of IOC aperture (0x8z-0xAz).</div><div class='add'>+		 * Move frame buffer out of IOC aperture (0x8z-0xaz).</div><div class='ctx'> 		 */</div><div class='ctx'> 		frame_buffer: frame_buffer@be000000 {</div><div class='ctx'> 			compatible = "shared-dma-pool";</div><div class='head'>diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi<br/>index 37bafd44e36d..4ead6dc9af2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axs10x_mb.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/axs10x_mb.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/axs10x_mb.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/axs10x_mb.dtsi</a></div><div class='hunk'>@@ -72,7 +72,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		gmac: ethernet@0x18000 {</div><div class='add'>+		gmac: ethernet@18000 {</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "snps,dwmac";</div><div class='ctx'> 			reg = &lt; 0x18000 0x2000 &gt;;</div><div class='hunk'>@@ -88,13 +88,13 @@</div><div class='ctx'> 			mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ehci@0x40000 {</div><div class='add'>+		ehci@40000 {</div><div class='ctx'> 			compatible = "generic-ehci";</div><div class='ctx'> 			reg = &lt; 0x40000 0x100 &gt;;</div><div class='ctx'> 			interrupts = &lt; 8 &gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ohci@0x60000 {</div><div class='add'>+		ohci@60000 {</div><div class='ctx'> 			compatible = "generic-ohci";</div><div class='ctx'> 			reg = &lt; 0x60000 0x100 &gt;;</div><div class='ctx'> 			interrupts = &lt; 8 &gt;;</div><div class='hunk'>@@ -118,7 +118,7 @@</div><div class='ctx'> 		 * dw_mci_pltfm_prepare_command() is used in generic platform</div><div class='ctx'> 		 * code.</div><div class='ctx'> 		 */</div><div class='del'>-		mmc@0x15000 {</div><div class='add'>+		mmc@15000 {</div><div class='ctx'> 			compatible = "altr,socfpga-dw-mshc";</div><div class='ctx'> 			reg = &lt; 0x15000 0x400 &gt;;</div><div class='ctx'> 			fifo-depth = &lt; 16 &gt;;</div><div class='hunk'>@@ -129,7 +129,7 @@</div><div class='ctx'> 			bus-width = &lt; 4 &gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		uart@0x20000 {</div><div class='add'>+		uart@20000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x20000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;33333333&gt;;</div><div class='hunk'>@@ -139,7 +139,7 @@</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		uart@0x21000 {</div><div class='add'>+		uart@21000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x21000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;33333333&gt;;</div><div class='hunk'>@@ -150,7 +150,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* UART muxed with USB data port (ttyS3) */</div><div class='del'>-		uart@0x22000 {</div><div class='add'>+		uart@22000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x22000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;33333333&gt;;</div><div class='hunk'>@@ -160,7 +160,7 @@</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c@0x1d000 {</div><div class='add'>+		i2c@1d000 {</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='ctx'> 			reg = &lt;0x1d000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;400000&gt;;</div><div class='hunk'>@@ -177,7 +177,7 @@</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c@0x1f000 {</div><div class='add'>+		i2c@1f000 {</div><div class='ctx'> 			compatible = "snps,designware-i2c";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -218,13 +218,13 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			eeprom@0x54{</div><div class='add'>+			eeprom@54{</div><div class='ctx'> 				compatible = "atmel,24c01";</div><div class='ctx'> 				reg = &lt;0x54&gt;;</div><div class='ctx'> 				pagesize = &lt;0x8&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			eeprom@0x57{</div><div class='add'>+			eeprom@57{</div><div class='ctx'> 				compatible = "atmel,24c04";</div><div class='ctx'> 				reg = &lt;0x57&gt;;</div><div class='ctx'> 				pagesize = &lt;0x8&gt;;</div><div class='head'>diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts<br/>index 43f17b51ee89..7425bb0f2d1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/hsdk.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/hsdk.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/hsdk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/hsdk.dts</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> 	model = "snps,hsdk";</div><div class='ctx'> 	compatible = "snps,hsdk";</div><div class='ctx'> </div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		bootargs = "earlycon=uart8250,mmio32,0xf0005000,115200n8 console=ttyS0,115200n8 debug print-fatal-signals=1";</div><div class='hunk'>@@ -105,17 +105,17 @@</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='ctx'> </div><div class='del'>-		ranges = &lt;0x00000000 0xf0000000 0x10000000&gt;;</div><div class='add'>+		ranges = &lt;0x00000000 0x0 0xf0000000 0x10000000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		cgu_rst: reset-controller@8a0 {</div><div class='ctx'> 			compatible = "snps,hsdk-reset";</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x8A0 0x4&gt;, &lt;0xFF0 0x4&gt;;</div><div class='add'>+			reg = &lt;0x8a0 0x4&gt;, &lt;0xff0 0x4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		core_clk: core-clk@0 {</div><div class='ctx'> 			compatible = "snps,hsdk-core-pll-clock";</div><div class='del'>-			reg = &lt;0x00 0x10&gt;, &lt;0x14B8 0x4&gt;;</div><div class='add'>+			reg = &lt;0x00 0x10&gt;, &lt;0x14b8 0x4&gt;;</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;input_clk&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +167,18 @@</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		dmac_core_clk: dmac-core-clk {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;400000000&gt;;</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac_cfg_clk: dmac-gpu-cfg-clk {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;200000000&gt;;</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gmac: ethernet@8000 {</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "snps,dwmac";</div><div class='hunk'>@@ -200,6 +212,7 @@</div><div class='ctx'> 			compatible = "snps,hsdk-v1.0-ohci", "generic-ohci";</div><div class='ctx'> 			reg = &lt;0x60000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;15&gt;;</div><div class='add'>+			resets = &lt;&amp;cgu_rst HSDK_USB_RESET&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -207,6 +220,7 @@</div><div class='ctx'> 			compatible = "snps,hsdk-v1.0-ehci", "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x40000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;15&gt;;</div><div class='add'>+			resets = &lt;&amp;cgu_rst HSDK_USB_RESET&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -237,12 +251,28 @@</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		dmac: dmac@80000 {</div><div class='add'>+			compatible = "snps,axi-dma-1.01a";</div><div class='add'>+			reg = &lt;0x80000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;27&gt;;</div><div class='add'>+			clocks = &lt;&amp;dmac_core_clk&gt;, &lt;&amp;dmac_cfg_clk&gt;;</div><div class='add'>+			clock-names = "core-clk", "cfgr-clk";</div><div class='add'>+</div><div class='add'>+			dma-channels = &lt;4&gt;;</div><div class='add'>+			snps,dma-masters = &lt;2&gt;;</div><div class='add'>+			snps,data-width = &lt;3&gt;;</div><div class='add'>+			snps,block-size = &lt;4096 4096 4096 4096&gt;;</div><div class='add'>+			snps,priority = &lt;0 1 2 3&gt;;</div><div class='add'>+			snps,axi-max-burst-len = &lt;16&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory@80000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		device_type = "memory";</div><div class='del'>-		reg = &lt;0x80000000 0x40000000&gt;;  /* 1 GiB */</div><div class='add'>+		reg = &lt;0x0 0x80000000 0x0 0x40000000&gt;;  /* 1 GB lowmem */</div><div class='add'>+		/*     0x1 0x00000000 0x0 0x40000000&gt;;     1 GB highmem */</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arc/boot/dts/vdk_axc003.dtsi b/arch/arc/boot/dts/vdk_axc003.dtsi<br/>index 0fd6ba985b16..84e8766c8ca2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/vdk_axc003.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/vdk_axc003.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/vdk_axc003.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/vdk_axc003.dtsi</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		debug_uart: dw-apb-uart@0x5000 {</div><div class='add'>+		debug_uart: dw-apb-uart@5000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x5000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;2403200&gt;;</div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> </div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	mb_intc: dw-apb-ictl@0xe0012000 {</div><div class='add'>+	mb_intc: dw-apb-ictl@e0012000 {</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "snps,dw-apb-ictl";</div><div class='ctx'> 		reg = &lt; 0xe0012000 0x200 &gt;;</div><div class='head'>diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi<br/>index 28956f9a9f3d..eb7e705e8a27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/vdk_axc003_idu.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/vdk_axc003_idu.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/vdk_axc003_idu.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/vdk_axc003_idu.dtsi</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		debug_uart: dw-apb-uart@0x5000 {</div><div class='add'>+		debug_uart: dw-apb-uart@5000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x5000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;2403200&gt;;</div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> </div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	mb_intc: dw-apb-ictl@0xe0012000 {</div><div class='add'>+	mb_intc: dw-apb-ictl@e0012000 {</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "snps,dw-apb-ictl";</div><div class='ctx'> 		reg = &lt; 0xe0012000 0x200 &gt;;</div><div class='head'>diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi<br/>index 48bb4b4cd234..925d5cc95dbb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/vdk_axs10x_mb.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/boot/dts/vdk_axs10x_mb.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/boot/dts/vdk_axs10x_mb.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/boot/dts/vdk_axs10x_mb.dtsi</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ethernet@0x18000 {</div><div class='add'>+		ethernet@18000 {</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "snps,dwmac";</div><div class='ctx'> 			reg = &lt; 0x18000 0x2000 &gt;;</div><div class='hunk'>@@ -49,13 +49,13 @@</div><div class='ctx'> 			clock-names = "stmmaceth";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ehci@0x40000 {</div><div class='add'>+		ehci@40000 {</div><div class='ctx'> 			compatible = "generic-ehci";</div><div class='ctx'> 			reg = &lt; 0x40000 0x100 &gt;;</div><div class='ctx'> 			interrupts = &lt; 8 &gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		uart@0x20000 {</div><div class='add'>+		uart@20000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x20000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;2403200&gt;;</div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		uart@0x21000 {</div><div class='add'>+		uart@21000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x21000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;2403200&gt;;</div><div class='hunk'>@@ -75,7 +75,7 @@</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		uart@0x22000 {</div><div class='add'>+		uart@22000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x22000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;2403200&gt;;</div><div class='hunk'>@@ -101,7 +101,7 @@</div><div class='ctx'> 			interrupt-names = "arc_ps2_irq";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mmc@0x15000 {</div><div class='add'>+		mmc@15000 {</div><div class='ctx'> 			compatible = "snps,dw-mshc";</div><div class='ctx'> 			reg = &lt;0x15000 0x400&gt;;</div><div class='ctx'> 			fifo-depth = &lt;1024&gt;;</div><div class='hunk'>@@ -117,11 +117,11 @@</div><div class='ctx'> 	 * Embedded Vision subsystem UIO mappings; only relevant for EV VDK</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This node is intentionally put outside of MB above becase</div><div class='del'>-	 * it maps areas outside of MB's 0xEz-0xFz.</div><div class='add'>+	 * it maps areas outside of MB's 0xez-0xfz.</div><div class='ctx'> 	 */</div><div class='del'>-	uio_ev: uio@0xD0000000 {</div><div class='add'>+	uio_ev: uio@d0000000 {</div><div class='ctx'> 		compatible = "generic-uio";</div><div class='del'>-		reg = &lt;0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000&gt;;</div><div class='add'>+		reg = &lt;0xd0000000 0x2000 0xd1000000 0x2000 0x90000000 0x10000000 0xc0000000 0x10000000&gt;;</div><div class='ctx'> 		reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;mb_intc&gt;;</div><div class='ctx'> 		interrupts = &lt;23&gt;;</div><div class='head'>diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig<br/>index f56cc2070c11..b117e6c16d41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/haps_hs_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/haps_hs_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/haps_hs_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/haps_hs_defconfig</a></div><div class='hunk'>@@ -15,7 +15,6 @@ CONFIG_PERF_EVENTS=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig<br/>index b6f2482c7e74..33a787c375e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/haps_hs_smp_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/haps_hs_smp_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/haps_hs_smp_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/haps_hs_smp_defconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig<br/>index 6fd3d29546af..0e5fd29ed238 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/hsdk_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/hsdk_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/hsdk_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/hsdk_defconfig</a></div><div class='hunk'>@@ -8,6 +8,7 @@ CONFIG_NAMESPACES=y</div><div class='ctx'> # CONFIG_UTS_NS is not set</div><div class='ctx'> # CONFIG_PID_NS is not set</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_PERF_EVENTS=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='head'>diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig<br/>index 318e4cd29629..de398c7b10b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsim_700_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsim_700_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsim_700_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/nsim_700_defconfig</a></div><div class='hunk'>@@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y</div><div class='ctx'> CONFIG_ISA_ARCOMPACT=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig<br/>index c15807b0e0c1..2dbd34a9ff07 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsim_hs_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsim_hs_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsim_hs_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/nsim_hs_defconfig</a></div><div class='hunk'>@@ -20,7 +20,6 @@ CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_FORCE_LOAD=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig<br/>index 65e983fd942b..c7135f1e2583 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsim_hs_smp_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsim_hs_smp_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsim_hs_smp_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/nsim_hs_smp_defconfig</a></div><div class='hunk'>@@ -18,7 +18,6 @@ CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_FORCE_LOAD=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig<br/>index 08c5b99ac341..385a71d3c478 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsimosci_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsimosci_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsimosci_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/nsimosci_defconfig</a></div><div class='hunk'>@@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y</div><div class='ctx'> CONFIG_ISA_ARCOMPACT=y</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig<br/>index 5b5e26d67955..248a2c3bdc12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsimosci_hs_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsimosci_hs_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsimosci_hs_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/nsimosci_hs_defconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig<br/>index 26af9b2f7fcb..1a4bc7b660fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsimosci_hs_smp_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/configs/nsimosci_hs_smp_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/configs/nsimosci_hs_smp_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/configs/nsimosci_hs_smp_defconfig</a></div><div class='hunk'>@@ -12,7 +12,6 @@ CONFIG_PERF_EVENTS=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_KPROBES=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild<br/>index b41f8881ecc8..393d4f5e1450 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/Kbuild</a></div><div class='hunk'>@@ -11,10 +11,12 @@ generic-y += hardirq.h</div><div class='ctx'> generic-y += hw_irq.h</div><div class='ctx'> generic-y += irq_regs.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += msi.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += percpu.h</div><div class='head'>diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h<br/>index a27eafdc8260..a7d4be87b2f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/arcregs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/arcregs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/arcregs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/arcregs.h</a></div><div class='hunk'>@@ -82,6 +82,7 @@</div><div class='ctx'> #define ECR_V_DTLB_MISS			0x05</div><div class='ctx'> #define ECR_V_PROTV			0x06</div><div class='ctx'> #define ECR_V_TRAP			0x09</div><div class='add'>+#define ECR_V_MISALIGN			0x0d</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* DTLB Miss and Protection Violation Cause Codes */</div><div class='hunk'>@@ -167,14 +168,6 @@ struct bcr_mpy {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bcr_extn_xymem {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-	unsigned int ram_org:2, num_banks:4, bank_sz:4, ver:8;</div><div class='del'>-#else</div><div class='del'>-	unsigned int ver:8, bank_sz:4, num_banks:4, ram_org:2;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct bcr_iccm_arcompact {</div><div class='ctx'> #ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='ctx'> 	unsigned int base:16, pad:5, sz:3, ver:8;</div><div class='hunk'>@@ -312,7 +305,7 @@ struct cpuinfo_arc {</div><div class='ctx'> 	struct cpuinfo_arc_bpu bpu;</div><div class='ctx'> 	struct bcr_identity core;</div><div class='ctx'> 	struct bcr_isa_arcv2 isa;</div><div class='del'>-	const char *details, *name;</div><div class='add'>+	const char *release, *name;</div><div class='ctx'> 	unsigned int vec_base;</div><div class='ctx'> 	struct cpuinfo_arc_ccm iccm, dccm;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -322,7 +315,6 @@ struct cpuinfo_arc {</div><div class='ctx'> 			     timer0:1, timer1:1, rtc:1, gfrc:1, pad4:4;</div><div class='ctx'> 	} extn;</div><div class='ctx'> 	struct bcr_mpy extn_mpy;</div><div class='del'>-	struct bcr_extn_xymem extn_xymem;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct cpuinfo_arc cpuinfo_arc700[];</div><div class='head'>diff --git a/arch/arc/include/asm/elf.h b/arch/arc/include/asm/elf.h<br/>index aa2d6da9d187..2b80c184c9c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/elf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/elf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/elf.h</a></div><div class='hunk'>@@ -10,13 +10,9 @@</div><div class='ctx'> #define __ASM_ARC_ELF_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/elf-em.h&gt;</div><div class='ctx'> #include &lt;uapi/asm/elf.h&gt;</div><div class='ctx'> </div><div class='del'>-/* These ELF defines belong to uapi but libc elf.h already defines them */</div><div class='del'>-#define EM_ARCOMPACT		93</div><div class='del'>-</div><div class='del'>-#define EM_ARCV2		195	/* ARCv2 Cores */</div><div class='del'>-</div><div class='ctx'> #define EM_ARC_INUSE		(IS_ENABLED(CONFIG_ISA_ARCOMPACT) ? \</div><div class='ctx'> 					EM_ARCOMPACT : EM_ARCV2)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h<br/>index 8a4f77ea3238..e66d0339e1d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/irqflags-arcv2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/irqflags-arcv2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/irqflags-arcv2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/irqflags-arcv2.h</a></div><div class='hunk'>@@ -44,7 +44,13 @@</div><div class='ctx'> #define ARCV2_IRQ_DEF_PRIO	1</div><div class='ctx'> </div><div class='ctx'> /* seed value for status register */</div><div class='del'>-#define ISA_INIT_STATUS_BITS	(STATUS_IE_MASK | STATUS_AD_MASK | \</div><div class='add'>+#ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS</div><div class='add'>+#define __AD_ENB	STATUS_AD_MASK</div><div class='add'>+#else</div><div class='add'>+#define __AD_ENB	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ISA_INIT_STATUS_BITS	(STATUS_IE_MASK | __AD_ENB | \</div><div class='ctx'> 					(ARCV2_IRQ_DEF_PRIO &lt;&lt; 1))</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/arch/arc/include/asm/perf_event.h b/arch/arc/include/asm/perf_event.h<br/>index 6958545390f0..9cd7ee4fad39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/perf_event.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/perf_event.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/perf_event.h</a></div><div class='hunk'>@@ -105,10 +105,10 @@ static const char * const arc_pmu_ev_hw_map[] = {</div><div class='ctx'> 	[PERF_COUNT_HW_INSTRUCTIONS] = "iall",</div><div class='ctx'> 	/* All jump instructions that are taken */</div><div class='ctx'> 	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak",</div><div class='del'>-	[PERF_COUNT_ARC_BPOK]         = "bpok",	  /* NP-NT, PT-T, PNT-NT */</div><div class='ctx'> #ifdef CONFIG_ISA_ARCV2</div><div class='ctx'> 	[PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",</div><div class='ctx'> #else</div><div class='add'>+	[PERF_COUNT_ARC_BPOK]         = "bpok",	  /* NP-NT, PT-T, PNT-NT */</div><div class='ctx'> 	[PERF_COUNT_HW_BRANCH_MISSES] = "bpfail", /* NP-T, PT-NT, PNT-T */</div><div class='ctx'> #endif</div><div class='ctx'> 	[PERF_COUNT_ARC_LDC] = "imemrdc",	/* Instr: mem read cached */</div><div class='head'>diff --git a/arch/arc/include/asm/spinlock.h b/arch/arc/include/asm/spinlock.h<br/>index 2ba04a7db621..daa914da7968 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/spinlock.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/spinlock.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/spinlock.h</a></div><div class='hunk'>@@ -21,8 +21,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='ctx'> 	__asm__ __volatile__(</div><div class='ctx'> 	"1:	llock	%[val], [%[slock]]	\n"</div><div class='ctx'> 	"	breq	%[val], %[LOCKED], 1b	\n"	/* spin while LOCKED */</div><div class='hunk'>@@ -34,6 +32,14 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)</div><div class='ctx'> 	  [LOCKED]	"r"	(__ARCH_SPIN_LOCK_LOCKED__)</div><div class='ctx'> 	: "memory", "cc");</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * ACQUIRE barrier to ensure load/store after taking the lock</div><div class='add'>+	 * don't "bleed-up" out of the critical section (leak-in is allowed)</div><div class='add'>+	 * http://www.spinics.net/lists/kernel/msg2010409.html</div><div class='add'>+	 *</div><div class='add'>+	 * ARCv2 only has load-load, store-store and all-all barrier</div><div class='add'>+	 * thus need the full all-all barrier</div><div class='add'>+	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -42,8 +48,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val, got_it = 0;</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='ctx'> 	__asm__ __volatile__(</div><div class='ctx'> 	"1:	llock	%[val], [%[slock]]	\n"</div><div class='ctx'> 	"	breq	%[val], %[LOCKED], 4f	\n"	/* already LOCKED, just bail */</div><div class='hunk'>@@ -67,9 +71,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='del'>-	lock-&gt;slock = __ARCH_SPIN_LOCK_UNLOCKED__;</div><div class='del'>-</div><div class='del'>-	smp_mb();</div><div class='add'>+	WRITE_ONCE(lock-&gt;slock, __ARCH_SPIN_LOCK_UNLOCKED__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -81,8 +83,6 @@ static inline void arch_read_lock(arch_rwlock_t *rw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * zero means writer holds the lock exclusively, deny Reader.</div><div class='ctx'> 	 * Otherwise grant lock to first/subseq reader</div><div class='hunk'>@@ -113,8 +113,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val, got_it = 0;</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='ctx'> 	__asm__ __volatile__(</div><div class='ctx'> 	"1:	llock	%[val], [%[rwlock]]	\n"</div><div class='ctx'> 	"	brls	%[val], %[WR_LOCKED], 4f\n"	/* &lt;= 0: already write locked, bail */</div><div class='hunk'>@@ -140,8 +138,6 @@ static inline void arch_write_lock(arch_rwlock_t *rw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If reader(s) hold lock (lock &lt; __ARCH_RW_LOCK_UNLOCKED__),</div><div class='ctx'> 	 * deny writer. Otherwise if unlocked grant to writer</div><div class='hunk'>@@ -175,8 +171,6 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val, got_it = 0;</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='ctx'> 	__asm__ __volatile__(</div><div class='ctx'> 	"1:	llock	%[val], [%[rwlock]]	\n"</div><div class='ctx'> 	"	brne	%[val], %[UNLOCKED], 4f	\n"	/* !UNLOCKED, bail */</div><div class='hunk'>@@ -217,17 +211,13 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)</div><div class='ctx'> 	: [val]		"=&amp;r"	(val)</div><div class='ctx'> 	: [rwlock]	"r"	(&amp;(rw-&gt;counter))</div><div class='ctx'> 	: "memory", "cc");</div><div class='del'>-</div><div class='del'>-	smp_mb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void arch_write_unlock(arch_rwlock_t *rw)</div><div class='ctx'> {</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='del'>-	rw-&gt;counter = __ARCH_RW_LOCK_UNLOCKED__;</div><div class='del'>-</div><div class='del'>-	smp_mb();</div><div class='add'>+	WRITE_ONCE(rw-&gt;counter, __ARCH_RW_LOCK_UNLOCKED__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else	/* !CONFIG_ARC_HAS_LLSC */</div><div class='hunk'>@@ -237,10 +227,9 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)</div><div class='ctx'> 	unsigned int val = __ARCH_SPIN_LOCK_LOCKED__;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * This smp_mb() is technically superfluous, we only need the one</div><div class='del'>-	 * after the lock for providing the ACQUIRE semantics.</div><div class='del'>-	 * However doing the "right" thing was regressing hackbench</div><div class='del'>-	 * so keeping this, pending further investigation</div><div class='add'>+	 * Per lkmm, smp_mb() is only required after _lock (and before_unlock)</div><div class='add'>+	 * for ACQ and REL semantics respectively. However EX based spinlocks</div><div class='add'>+	 * need the extra smp_mb to workaround a hardware quirk.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='hunk'>@@ -257,14 +246,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)</div><div class='ctx'> #endif</div><div class='ctx'> 	: "memory");</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * ACQUIRE barrier to ensure load/store after taking the lock</div><div class='del'>-	 * don't "bleed-up" out of the critical section (leak-in is allowed)</div><div class='del'>-	 * http://www.spinics.net/lists/kernel/msg2010409.html</div><div class='del'>-	 *</div><div class='del'>-	 * ARCv2 only has load-load, store-store and all-all barrier</div><div class='del'>-	 * thus need the full all-all barrier</div><div class='del'>-	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -309,8 +290,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)</div><div class='ctx'> 	: "memory");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * superfluous, but keeping for now - see pairing version in</div><div class='del'>-	 * arch_spin_lock above</div><div class='add'>+	 * see pairing version/comment in arch_spin_lock above</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> }</div><div class='hunk'>@@ -344,7 +324,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)</div><div class='ctx'> 	arch_spin_unlock(&amp;(rw-&gt;lock_mutex));</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-	smp_mb();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/asm/syscall.h b/arch/arc/include/asm/syscall.h<br/>index 29de09804306..9cac959ca4e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/syscall.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #ifndef _ASM_ARC_SYSCALL_H</div><div class='ctx'> #define _ASM_ARC_SYSCALL_H  1</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='hunk'>@@ -55,12 +56,11 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'>  */</div><div class='ctx'> static inline void</div><div class='ctx'> syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		      unsigned int i, unsigned int n, unsigned long *args)</div><div class='add'>+		      unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *inside_ptregs = &amp;(regs-&gt;r0);</div><div class='del'>-	inside_ptregs -= i;</div><div class='del'>-</div><div class='del'>-	BUG_ON((i + n) &gt; 6);</div><div class='add'>+	unsigned int n = 6;</div><div class='add'>+	unsigned int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (n--) {</div><div class='ctx'> 		args[i++] = (*inside_ptregs);</div><div class='hunk'>@@ -68,4 +68,14 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_ISA_ARCOMPACT)</div><div class='add'>+		? (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)</div><div class='add'>+			? AUDIT_ARCH_ARCOMPACTBE : AUDIT_ARCH_ARCOMPACT)</div><div class='add'>+		: (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)</div><div class='add'>+			? AUDIT_ARCH_ARCV2BE : AUDIT_ARCH_ARCV2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arc/include/asm/tlb.h b/arch/arc/include/asm/tlb.h<br/>index a9db5f62aaf3..90cac97643a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/asm/tlb.h</a></div><div class='hunk'>@@ -9,38 +9,6 @@</div><div class='ctx'> #ifndef _ASM_ARC_TLB_H</div><div class='ctx'> #define _ASM_ARC_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb)				\</div><div class='del'>-do {						\</div><div class='del'>-	if (tlb-&gt;fullmm)			\</div><div class='del'>-		flush_tlb_mm((tlb)-&gt;mm);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This pair is called at time of munmap/exit to flush cache and TLB entries</div><div class='del'>- * for mappings being torn down.</div><div class='del'>- * 1) cache-flush part -implemented via tlb_start_vma( ) for VIPT aliasing D$</div><div class='del'>- * 2) tlb-flush part - implemted via tlb_end_vma( ) flushes the TLB range</div><div class='del'>- *</div><div class='del'>- * Note, read http://lkml.org/lkml/2004/1/15/6</div><div class='del'>- */</div><div class='del'>-#ifndef CONFIG_ARC_CACHE_VIPT_ALIASING</div><div class='del'>-#define tlb_start_vma(tlb, vma)</div><div class='del'>-#else</div><div class='del'>-#define tlb_start_vma(tlb, vma)						\</div><div class='del'>-do {									\</div><div class='del'>-	if (!tlb-&gt;fullmm)						\</div><div class='del'>-		flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);	\</div><div class='del'>-} while(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define tlb_end_vma(tlb, vma)						\</div><div class='del'>-do {									\</div><div class='del'>-	if (!tlb-&gt;fullmm)						\</div><div class='del'>-		flush_tlb_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild<br/>index 755bb11323d8..1c72f04ff75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S<br/>index 30e090625916..8f6e0447dd17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/kernel/head.S</a></div><div class='hunk'>@@ -54,7 +54,12 @@</div><div class='ctx'> 	; gcc 7.3.1 (ARC GNU 2018.03) onwards generates unaligned access</div><div class='ctx'> 	; by default</div><div class='ctx'> 	lr	r5, [status32]</div><div class='add'>+#ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS</div><div class='ctx'> 	bset	r5, r5, STATUS_AD_BIT</div><div class='add'>+#else</div><div class='add'>+	; Although disabled at reset, bootloader might have enabled it</div><div class='add'>+	bclr	r5, r5, STATUS_AD_BIT</div><div class='add'>+#endif</div><div class='ctx'> 	kflag	r5</div><div class='ctx'> #endif</div><div class='ctx'> .endm</div><div class='hunk'>@@ -106,6 +111,7 @@ ENTRY(stext)</div><div class='ctx'> 	;    r2 = pointer to uboot provided cmdline or external DTB in mem</div><div class='ctx'> 	; These are handled later in handle_uboot_args()</div><div class='ctx'> 	st	r0, [@uboot_tag]</div><div class='add'>+	st      r1, [@uboot_magic]</div><div class='ctx'> 	st	r2, [@uboot_arg]</div><div class='ctx'> </div><div class='ctx'> 	; setup "current" tsk and optionally cache it in dedicated r25</div><div class='head'>diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c<br/>index cf18b3e5a934..c0d0124de089 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/intc-arcv2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/intc-arcv2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/intc-arcv2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/kernel/intc-arcv2.c</a></div><div class='hunk'>@@ -95,7 +95,7 @@ void arc_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* setup status32, don't enable intr yet as kernel doesn't want */</div><div class='ctx'> 	tmp = read_aux_reg(ARC_REG_STATUS32);</div><div class='del'>-	tmp |= STATUS_AD_MASK | (ARCV2_IRQ_DEF_PRIO &lt;&lt; 1);</div><div class='add'>+	tmp |= ARCV2_IRQ_DEF_PRIO &lt;&lt; 1;</div><div class='ctx'> 	tmp &amp;= ~STATUS_IE_MASK;</div><div class='ctx'> 	asm volatile("kflag %0	\n"::"r"(tmp));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c<br/>index 7b2340996cf8..a9c88b7e9182 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/kernel/setup.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@ unsigned int intr_to_DE_cnt;</div><div class='ctx'> </div><div class='ctx'> /* Part of U-boot ABI: see head.S */</div><div class='ctx'> int __initdata uboot_tag;</div><div class='add'>+int __initdata uboot_magic;</div><div class='ctx'> char __initdata *uboot_arg;</div><div class='ctx'> </div><div class='ctx'> const struct machine_desc *machine_desc;</div><div class='hunk'>@@ -44,29 +45,24 @@ struct task_struct *_current_task[NR_CPUS];	/* For stack switching */</div><div class='ctx'> </div><div class='ctx'> struct cpuinfo_arc cpuinfo_arc700[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-static const struct id_to_str arc_cpu_rel[] = {</div><div class='add'>+static const struct id_to_str arc_legacy_rel[] = {</div><div class='add'>+	/* ID.ARCVER,	Release */</div><div class='ctx'> #ifdef CONFIG_ISA_ARCOMPACT</div><div class='del'>-	{ 0x34, "R4.10"},</div><div class='del'>-	{ 0x35, "R4.11"},</div><div class='add'>+	{ 0x34, 	"R4.10"},</div><div class='add'>+	{ 0x35, 	"R4.11"},</div><div class='ctx'> #else</div><div class='del'>-	{ 0x51, "R2.0" },</div><div class='del'>-	{ 0x52, "R2.1" },</div><div class='del'>-	{ 0x53, "R3.0" },</div><div class='del'>-	{ 0x54, "R3.10a" },</div><div class='add'>+	{ 0x51, 	"R2.0" },</div><div class='add'>+	{ 0x52, 	"R2.1" },</div><div class='add'>+	{ 0x53,		"R3.0" },</div><div class='ctx'> #endif</div><div class='del'>-	{ 0x00, NULL   }</div><div class='add'>+	{ 0x00,		NULL   }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct id_to_str arc_cpu_nm[] = {</div><div class='del'>-#ifdef CONFIG_ISA_ARCOMPACT</div><div class='del'>-	{ 0x20, "ARC 600"   },</div><div class='del'>-	{ 0x30, "ARC 770"   },  /* 750 identified seperately */</div><div class='del'>-#else</div><div class='del'>-	{ 0x40, "ARC EM"  },</div><div class='del'>-	{ 0x50, "ARC HS38"  },</div><div class='del'>-	{ 0x54, "ARC HS48"  },</div><div class='del'>-#endif</div><div class='del'>-	{ 0x00, "Unknown"   }</div><div class='add'>+static const struct id_to_str arc_cpu_rel[] = {</div><div class='add'>+	/* UARCH.MAJOR,	Release */</div><div class='add'>+	{  0,		"R3.10a"},</div><div class='add'>+	{  1,		"R3.50a"},</div><div class='add'>+	{  0xFF,	NULL   }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void read_decode_ccm_bcr(struct cpuinfo_arc *cpu)</div><div class='hunk'>@@ -116,31 +112,72 @@ static void read_decode_ccm_bcr(struct cpuinfo_arc *cpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void decode_arc_core(struct cpuinfo_arc *cpu)</div><div class='add'>+{</div><div class='add'>+	struct bcr_uarch_build_arcv2 uarch;</div><div class='add'>+	const struct id_to_str *tbl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Up until (including) the first core4 release (0x54) things were</div><div class='add'>+	 * simple: AUX IDENTITY.ARCVER was sufficient to identify arc family</div><div class='add'>+	 * and release: 0x50 to 0x53 was HS38, 0x54 was HS48 (dual issue)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (cpu-&gt;core.family &lt; 0x54) { /* includes arc700 */</div><div class='add'>+</div><div class='add'>+		for (tbl = &amp;arc_legacy_rel[0]; tbl-&gt;id != 0; tbl++) {</div><div class='add'>+			if (cpu-&gt;core.family == tbl-&gt;id) {</div><div class='add'>+				cpu-&gt;release = tbl-&gt;str;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_isa_arcompact())</div><div class='add'>+			cpu-&gt;name = "ARC700";</div><div class='add'>+		else if (tbl-&gt;str)</div><div class='add'>+			cpu-&gt;name = "HS38";</div><div class='add'>+		else</div><div class='add'>+			cpu-&gt;name = cpu-&gt;release = "Unknown";</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'>+	 * However the subsequent HS release (same 0x54) allow HS38 or HS48</div><div class='add'>+	 * configurations and encode this info in a different BCR.</div><div class='add'>+	 * The BCR was introduced in 0x54 so can't be read unconditionally.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	READ_BCR(ARC_REG_MICRO_ARCH_BCR, uarch);</div><div class='add'>+</div><div class='add'>+	if (uarch.prod == 4) {</div><div class='add'>+		cpu-&gt;name = "HS48";</div><div class='add'>+		cpu-&gt;extn.dual = 1;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		cpu-&gt;name = "HS38";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tbl = &amp;arc_cpu_rel[0]; tbl-&gt;id != 0xFF; tbl++) {</div><div class='add'>+		if (uarch.maj == tbl-&gt;id) {</div><div class='add'>+			cpu-&gt;release = tbl-&gt;str;</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 void read_arc_build_cfg_regs(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcr_timer timer;</div><div class='ctx'> 	struct bcr_generic bcr;</div><div class='ctx'> 	struct cpuinfo_arc *cpu = &amp;cpuinfo_arc700[smp_processor_id()];</div><div class='del'>-	const struct id_to_str *tbl;</div><div class='ctx'> 	struct bcr_isa_arcv2 isa;</div><div class='ctx'> 	struct bcr_actionpoint ap;</div><div class='ctx'> </div><div class='ctx'> 	FIX_PTR(cpu);</div><div class='ctx'> </div><div class='ctx'> 	READ_BCR(AUX_IDENTITY, cpu-&gt;core);</div><div class='del'>-</div><div class='del'>-	for (tbl = &amp;arc_cpu_rel[0]; tbl-&gt;id != 0; tbl++) {</div><div class='del'>-		if (cpu-&gt;core.family == tbl-&gt;id) {</div><div class='del'>-			cpu-&gt;details = tbl-&gt;str;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (tbl = &amp;arc_cpu_nm[0]; tbl-&gt;id != 0; tbl++) {</div><div class='del'>-		if ((cpu-&gt;core.family &amp; 0xF4) == tbl-&gt;id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	cpu-&gt;name = tbl-&gt;str;</div><div class='add'>+	decode_arc_core(cpu);</div><div class='ctx'> </div><div class='ctx'> 	READ_BCR(ARC_REG_TIMERS_BCR, timer);</div><div class='ctx'> 	cpu-&gt;extn.timer0 = timer.t0;</div><div class='hunk'>@@ -151,16 +188,6 @@ static void read_arc_build_cfg_regs(void)</div><div class='ctx'> </div><div class='ctx'> 	READ_BCR(ARC_REG_MUL_BCR, cpu-&gt;extn_mpy);</div><div class='ctx'> </div><div class='del'>-	cpu-&gt;extn.norm = read_aux_reg(ARC_REG_NORM_BCR) &gt; 1 ? 1 : 0; /* 2,3 */</div><div class='del'>-	cpu-&gt;extn.barrel = read_aux_reg(ARC_REG_BARREL_BCR) &gt; 1 ? 1 : 0; /* 2,3 */</div><div class='del'>-	cpu-&gt;extn.swap = read_aux_reg(ARC_REG_SWAP_BCR) ? 1 : 0;        /* 1,3 */</div><div class='del'>-	cpu-&gt;extn.crc = read_aux_reg(ARC_REG_CRC_BCR) ? 1 : 0;</div><div class='del'>-	cpu-&gt;extn.minmax = read_aux_reg(ARC_REG_MIXMAX_BCR) &gt; 1 ? 1 : 0; /* 2 */</div><div class='del'>-	cpu-&gt;extn.swape = (cpu-&gt;core.family &gt;= 0x34) ? 1 :</div><div class='del'>-				IS_ENABLED(CONFIG_ARC_HAS_SWAPE);</div><div class='del'>-</div><div class='del'>-	READ_BCR(ARC_REG_XY_MEM_BCR, cpu-&gt;extn_xymem);</div><div class='del'>-</div><div class='ctx'> 	/* Read CCM BCRs for boot reporting even if not enabled in Kconfig */</div><div class='ctx'> 	read_decode_ccm_bcr(cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -198,30 +225,12 @@ static void read_arc_build_cfg_regs(void)</div><div class='ctx'> 		cpu-&gt;bpu.num_pred = 2048 &lt;&lt; bpu.pte;</div><div class='ctx'> 		cpu-&gt;bpu.ret_stk = 4 &lt;&lt; bpu.rse;</div><div class='ctx'> </div><div class='del'>-		if (cpu-&gt;core.family &gt;= 0x54) {</div><div class='del'>-</div><div class='del'>-			struct bcr_uarch_build_arcv2 uarch;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The first 0x54 core (uarch maj:min 0:1 or 0:2) was</div><div class='del'>-			 * dual issue only (HS4x). But next uarch rev (1:0)</div><div class='del'>-			 * allows it be configured for single issue (HS3x)</div><div class='del'>-			 * Ensure we fiddle with dual issue only on HS4x</div><div class='del'>-			 */</div><div class='del'>-			READ_BCR(ARC_REG_MICRO_ARCH_BCR, uarch);</div><div class='del'>-</div><div class='del'>-			if (uarch.prod == 4) {</div><div class='del'>-				unsigned int exec_ctrl;</div><div class='del'>-</div><div class='del'>-				/* dual issue hardware always present */</div><div class='del'>-				cpu-&gt;extn.dual = 1;</div><div class='del'>-</div><div class='del'>-				READ_BCR(AUX_EXEC_CTRL, exec_ctrl);</div><div class='add'>+		/* if dual issue hardware, is it enabled ? */</div><div class='add'>+		if (cpu-&gt;extn.dual) {</div><div class='add'>+			unsigned int exec_ctrl;</div><div class='ctx'> </div><div class='del'>-				/* dual issue hardware enabled ? */</div><div class='del'>-				cpu-&gt;extn.dual_enb = !(exec_ctrl &amp; 1);</div><div class='del'>-</div><div class='del'>-			}</div><div class='add'>+			READ_BCR(AUX_EXEC_CTRL, exec_ctrl);</div><div class='add'>+			cpu-&gt;extn.dual_enb = !(exec_ctrl &amp; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -263,7 +272,8 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_arc *cpu = &amp;cpuinfo_arc700[cpu_id];</div><div class='ctx'> 	struct bcr_identity *core = &amp;cpu-&gt;core;</div><div class='del'>-	int i, n = 0, ua = 0;</div><div class='add'>+	char mpy_opt[16];</div><div class='add'>+	int n = 0;</div><div class='ctx'> </div><div class='ctx'> 	FIX_PTR(cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -272,7 +282,7 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)</div><div class='ctx'> 		       core-&gt;family, core-&gt;cpu_id, core-&gt;chip_id);</div><div class='ctx'> </div><div class='ctx'> 	n += scnprintf(buf + n, len - n, "processor [%d]\t: %s %s (%s ISA) %s%s%s\n",</div><div class='del'>-		       cpu_id, cpu-&gt;name, cpu-&gt;details,</div><div class='add'>+		       cpu_id, cpu-&gt;name, cpu-&gt;release,</div><div class='ctx'> 		       is_isa_arcompact() ? "ARCompact" : "ARCv2",</div><div class='ctx'> 		       IS_AVAIL1(cpu-&gt;isa.be, "[Big-Endian]"),</div><div class='ctx'> 		       IS_AVAIL3(cpu-&gt;extn.dual, cpu-&gt;extn.dual_enb, " Dual-Issue "));</div><div class='hunk'>@@ -283,61 +293,50 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)</div><div class='ctx'> 		       IS_AVAIL2(cpu-&gt;extn.rtc, "RTC [UP 64-bit] ", CONFIG_ARC_TIMERS_64BIT),</div><div class='ctx'> 		       IS_AVAIL2(cpu-&gt;extn.gfrc, "GFRC [SMP 64-bit] ", CONFIG_ARC_TIMERS_64BIT));</div><div class='ctx'> </div><div class='del'>-#ifdef __ARC_UNALIGNED__</div><div class='del'>-	ua = 1;</div><div class='del'>-#endif</div><div class='del'>-	n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s%s",</div><div class='del'>-			   IS_AVAIL2(cpu-&gt;isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),</div><div class='del'>-			   IS_AVAIL2(cpu-&gt;isa.ldd, "ll64 ", CONFIG_ARC_HAS_LL64),</div><div class='del'>-			   IS_AVAIL1(cpu-&gt;isa.unalign, "unalign "), IS_USED_RUN(ua));</div><div class='del'>-</div><div class='del'>-	if (i)</div><div class='del'>-		n += scnprintf(buf + n, len - n, "\n\t\t: ");</div><div class='del'>-</div><div class='ctx'> 	if (cpu-&gt;extn_mpy.ver) {</div><div class='del'>-		if (cpu-&gt;extn_mpy.ver &lt;= 0x2) {	/* ARCompact */</div><div class='del'>-			n += scnprintf(buf + n, len - n, "mpy ");</div><div class='add'>+		if (is_isa_arcompact()) {</div><div class='add'>+			scnprintf(mpy_opt, 16, "mpy");</div><div class='ctx'> 		} else {</div><div class='add'>+</div><div class='ctx'> 			int opt = 2;	/* stock MPY/MPYH */</div><div class='ctx'> </div><div class='ctx'> 			if (cpu-&gt;extn_mpy.dsp)	/* OPT 7-9 */</div><div class='ctx'> 				opt = cpu-&gt;extn_mpy.dsp + 6;</div><div class='ctx'> </div><div class='del'>-			n += scnprintf(buf + n, len - n, "mpy[opt %d] ", opt);</div><div class='add'>+			scnprintf(mpy_opt, 16, "mpy[opt %d] ", opt);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	n += scnprintf(buf + n, len - n, "%s%s%s%s%s%s%s%s\n",</div><div class='del'>-		       IS_AVAIL1(cpu-&gt;isa.div_rem, "div_rem "),</div><div class='del'>-		       IS_AVAIL1(cpu-&gt;extn.norm, "norm "),</div><div class='del'>-		       IS_AVAIL1(cpu-&gt;extn.barrel, "barrel-shift "),</div><div class='del'>-		       IS_AVAIL1(cpu-&gt;extn.swap, "swap "),</div><div class='del'>-		       IS_AVAIL1(cpu-&gt;extn.minmax, "minmax "),</div><div class='del'>-		       IS_AVAIL1(cpu-&gt;extn.crc, "crc "),</div><div class='del'>-		       IS_AVAIL2(cpu-&gt;extn.swape, "swape", CONFIG_ARC_HAS_SWAPE));</div><div class='del'>-</div><div class='del'>-	if (cpu-&gt;bpu.ver)</div><div class='add'>+		       IS_AVAIL2(cpu-&gt;isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),</div><div class='add'>+		       IS_AVAIL2(cpu-&gt;isa.ldd, "ll64 ", CONFIG_ARC_HAS_LL64),</div><div class='add'>+		       IS_AVAIL2(cpu-&gt;isa.unalign, "unalign ", CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS),</div><div class='add'>+		       IS_AVAIL1(cpu-&gt;extn_mpy.ver, mpy_opt),</div><div class='add'>+		       IS_AVAIL1(cpu-&gt;isa.div_rem, "div_rem "));</div><div class='add'>+</div><div class='add'>+	if (cpu-&gt;bpu.ver) {</div><div class='ctx'> 		n += scnprintf(buf + n, len - n,</div><div class='ctx'> 			      "BPU\t\t: %s%s match, cache:%d, Predict Table:%d Return stk: %d",</div><div class='ctx'> 			      IS_AVAIL1(cpu-&gt;bpu.full, "full"),</div><div class='ctx'> 			      IS_AVAIL1(!cpu-&gt;bpu.full, "partial"),</div><div class='ctx'> 			      cpu-&gt;bpu.num_cache, cpu-&gt;bpu.num_pred, cpu-&gt;bpu.ret_stk);</div><div class='ctx'> </div><div class='del'>-	if (is_isa_arcv2()) {</div><div class='del'>-		struct bcr_lpb lpb;</div><div class='add'>+		if (is_isa_arcv2()) {</div><div class='add'>+			struct bcr_lpb lpb;</div><div class='ctx'> </div><div class='del'>-		READ_BCR(ARC_REG_LPB_BUILD, lpb);</div><div class='del'>-		if (lpb.ver) {</div><div class='del'>-			unsigned int ctl;</div><div class='del'>-			ctl = read_aux_reg(ARC_REG_LPB_CTRL);</div><div class='add'>+			READ_BCR(ARC_REG_LPB_BUILD, lpb);</div><div class='add'>+			if (lpb.ver) {</div><div class='add'>+				unsigned int ctl;</div><div class='add'>+				ctl = read_aux_reg(ARC_REG_LPB_CTRL);</div><div class='ctx'> </div><div class='del'>-			n += scnprintf(buf + n, len - n, " Loop Buffer:%d %s",</div><div class='del'>-				lpb.entries,</div><div class='del'>-				IS_DISABLED_RUN(!ctl));</div><div class='add'>+				n += scnprintf(buf + n, len - n, " Loop Buffer:%d %s",</div><div class='add'>+					       lpb.entries,</div><div class='add'>+					       IS_DISABLED_RUN(!ctl));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		n += scnprintf(buf + n, len - n, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	n += scnprintf(buf + n, len - n, "\n");</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -390,11 +389,6 @@ static char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	n += scnprintf(buf + n, len - n, "OS ABI [v%d]\t: %s\n",</div><div class='del'>-			EF_ARC_OSABI_CURRENT &gt;&gt; 8,</div><div class='del'>-			EF_ARC_OSABI_CURRENT == EF_ARC_OSABI_V3 ?</div><div class='del'>-			"no-legacy-syscalls" : "64-bit data any register aligned");</div><div class='del'>-</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -497,6 +491,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)</div><div class='ctx'> #define UBOOT_TAG_NONE		0</div><div class='ctx'> #define UBOOT_TAG_CMDLINE	1</div><div class='ctx'> #define UBOOT_TAG_DTB		2</div><div class='add'>+/* We always pass 0 as magic from U-boot */</div><div class='add'>+#define UBOOT_MAGIC_VALUE	0</div><div class='ctx'> </div><div class='ctx'> void __init handle_uboot_args(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -511,6 +507,11 @@ void __init handle_uboot_args(void)</div><div class='ctx'> 		goto ignore_uboot_args;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (uboot_magic != UBOOT_MAGIC_VALUE) {</div><div class='add'>+		pr_warn(IGNORE_ARGS "non zero uboot magic\n");</div><div class='add'>+		goto ignore_uboot_args;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (uboot_tag != UBOOT_TAG_NONE &amp;&amp;</div><div class='ctx'>             uboot_arg_invalid((unsigned long)uboot_arg)) {</div><div class='ctx'> 		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);</div><div class='head'>diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c<br/>index 215f515442e0..b0aa8c028331 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/troubleshoot.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/kernel/troubleshoot.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/kernel/troubleshoot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/kernel/troubleshoot.c</a></div><div class='hunk'>@@ -145,7 +145,8 @@ static void show_ecr_verbose(struct pt_regs *regs)</div><div class='ctx'> 	} else if (vec == ECR_V_PROTV) {</div><div class='ctx'> 		if (cause_code == ECR_C_PROTV_INST_FETCH)</div><div class='ctx'> 			pr_cont("Execute from Non-exec Page\n");</div><div class='del'>-		else if (cause_code == ECR_C_PROTV_MISALIG_DATA)</div><div class='add'>+		else if (cause_code == ECR_C_PROTV_MISALIG_DATA &amp;&amp;</div><div class='add'>+		         IS_ENABLED(CONFIG_ISA_ARCOMPACT))</div><div class='ctx'> 			pr_cont("Misaligned r/w from 0x%08lx\n", address);</div><div class='ctx'> 		else</div><div class='ctx'> 			pr_cont("%s access not allowed on page\n",</div><div class='hunk'>@@ -161,6 +162,8 @@ static void show_ecr_verbose(struct pt_regs *regs)</div><div class='ctx'> 			pr_cont("Bus Error from Data Mem\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			pr_cont("Bus Error, check PRM\n");</div><div class='add'>+	} else if (vec == ECR_V_MISALIGN) {</div><div class='add'>+		pr_cont("Misaligned r/w from 0x%08lx\n", address);</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (vec == ECR_V_TRAP) {</div><div class='ctx'> 		if (regs-&gt;ecr_param == 5)</div><div class='head'>diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile<br/>index b1656d156097..f7537b466b23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/lib/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/lib/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/lib/Makefile</a></div><div class='hunk'>@@ -8,4 +8,10 @@</div><div class='ctx'> lib-y	:= strchr-700.o strcpy-700.o strlen.o memcmp.o</div><div class='ctx'> </div><div class='ctx'> lib-$(CONFIG_ISA_ARCOMPACT)	+= memcpy-700.o memset.o strcmp.o</div><div class='del'>-lib-$(CONFIG_ISA_ARCV2)		+= memcpy-archs.o memset-archs.o strcmp-archs.o</div><div class='add'>+lib-$(CONFIG_ISA_ARCV2)		+= memset-archs.o strcmp-archs.o</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS</div><div class='add'>+lib-$(CONFIG_ISA_ARCV2)		+=memcpy-archs-unaligned.o</div><div class='add'>+else</div><div class='add'>+lib-$(CONFIG_ISA_ARCV2)		+=memcpy-archs.o</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/arc/lib/memcpy-archs-unaligned.S b/arch/arc/lib/memcpy-archs-unaligned.S<br/>new file mode 100644<br/>index 000000000000..28993a73fdde<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/lib/memcpy-archs-unaligned.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/lib/memcpy-archs-unaligned.S</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * ARCv2 memcpy implementation optimized for unaligned memory access using.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Synopsys</div><div class='add'>+ * Author: Eugeniy Paltsev &lt;Eugeniy.Paltsev@synopsys.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARC_HAS_LL64</div><div class='add'>+# define LOADX(DST,RX)		ldd.ab	DST, [RX, 8]</div><div class='add'>+# define STOREX(SRC,RX)		std.ab	SRC, [RX, 8]</div><div class='add'>+# define ZOLSHFT		5</div><div class='add'>+# define ZOLAND			0x1F</div><div class='add'>+#else</div><div class='add'>+# define LOADX(DST,RX)		ld.ab	DST, [RX, 4]</div><div class='add'>+# define STOREX(SRC,RX)		st.ab	SRC, [RX, 4]</div><div class='add'>+# define ZOLSHFT		4</div><div class='add'>+# define ZOLAND			0xF</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ENTRY_CFI(memcpy)</div><div class='add'>+	mov	r3, r0		; don;t clobber ret val</div><div class='add'>+</div><div class='add'>+	lsr.f	lp_count, r2, ZOLSHFT</div><div class='add'>+	lpnz	@.Lcopy32_64bytes</div><div class='add'>+	;; LOOP START</div><div class='add'>+	LOADX	(r6, r1)</div><div class='add'>+	LOADX	(r8, r1)</div><div class='add'>+	LOADX	(r10, r1)</div><div class='add'>+	LOADX	(r4, r1)</div><div class='add'>+	STOREX	(r6, r3)</div><div class='add'>+	STOREX	(r8, r3)</div><div class='add'>+	STOREX	(r10, r3)</div><div class='add'>+	STOREX	(r4, r3)</div><div class='add'>+.Lcopy32_64bytes:</div><div class='add'>+</div><div class='add'>+	and.f	lp_count, r2, ZOLAND ;Last remaining 31 bytes</div><div class='add'>+	lpnz	@.Lcopyremainingbytes</div><div class='add'>+	;; LOOP START</div><div class='add'>+	ldb.ab	r5, [r1, 1]</div><div class='add'>+	stb.ab	r5, [r3, 1]</div><div class='add'>+.Lcopyremainingbytes:</div><div class='add'>+</div><div class='add'>+	j	[blink]</div><div class='add'>+END_CFI(memcpy)</div><div class='head'>diff --git a/arch/arc/lib/memset-archs.S b/arch/arc/lib/memset-archs.S<br/>index f230bb7092fd..b3373f5c88e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/lib/memset-archs.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/lib/memset-archs.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/lib/memset-archs.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/lib/memset-archs.S</a></div><div class='hunk'>@@ -30,10 +30,10 @@</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-.macro PREALLOC_INSTR</div><div class='add'>+.macro PREALLOC_INSTR	reg, off</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='del'>-.macro PREFETCHW_INSTR</div><div class='add'>+.macro PREFETCHW_INSTR	reg, off</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c<br/>index 4135abec3fb0..63e6e6504699 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/mm/cache.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/mm/cache.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/mm/cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/mm/cache.c</a></div><div class='hunk'>@@ -113,10 +113,24 @@ static void read_decode_cache_bcr_arcv2(int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	READ_BCR(ARC_REG_CLUSTER_BCR, cbcr);</div><div class='del'>-	if (cbcr.c)</div><div class='add'>+	if (cbcr.c) {</div><div class='ctx'> 		ioc_exists = 1;</div><div class='del'>-	else</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * As for today we don't support both IOC and ZONE_HIGHMEM enabled</div><div class='add'>+		 * simultaneously. This happens because as of today IOC aperture covers</div><div class='add'>+		 * only ZONE_NORMAL (low mem) and any dma transactions outside this</div><div class='add'>+		 * region won't be HW coherent.</div><div class='add'>+		 * If we want to use both IOC and ZONE_HIGHMEM we can use</div><div class='add'>+		 * bounce_buffer to handle dma transactions to HIGHMEM.</div><div class='add'>+		 * Also it is possible to modify dma_direct cache ops or increase IOC</div><div class='add'>+		 * aperture size if we are planning to use HIGHMEM without PAE.</div><div class='add'>+		 */</div><div class='add'>+		if (IS_ENABLED(CONFIG_HIGHMEM) || is_pae40_enabled())</div><div class='add'>+			ioc_enable = 0;</div><div class='add'>+	} else {</div><div class='ctx'> 		ioc_enable = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* HS 2.0 didn't have AUX_VOL */</div><div class='ctx'> 	if (cpuinfo_arc700[cpu].core.family &gt; 0x51) {</div><div class='hunk'>@@ -1158,19 +1172,6 @@ noinline void __init arc_ioc_setup(void)</div><div class='ctx'> 	if (!ioc_enable)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * As for today we don't support both IOC and ZONE_HIGHMEM enabled</div><div class='del'>-	 * simultaneously. This happens because as of today IOC aperture covers</div><div class='del'>-	 * only ZONE_NORMAL (low mem) and any dma transactions outside this</div><div class='del'>-	 * region won't be HW coherent.</div><div class='del'>-	 * If we want to use both IOC and ZONE_HIGHMEM we can use</div><div class='del'>-	 * bounce_buffer to handle dma transactions to HIGHMEM.</div><div class='del'>-	 * Also it is possible to modify dma_direct cache ops or increase IOC</div><div class='del'>-	 * aperture size if we are planning to use HIGHMEM without PAE.</div><div class='del'>-	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_HIGHMEM))</div><div class='del'>-		panic("IOC and HIGHMEM can't be used simultaneously");</div><div class='del'>-</div><div class='ctx'> 	/* Flush + invalidate + disable L1 dcache */</div><div class='ctx'> 	__dc_disable();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/plat-eznps/Kconfig b/arch/arc/plat-eznps/Kconfig<br/>index 8eff057efcae..2eaecfb063a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/plat-eznps/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arc/plat-eznps/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arc/plat-eznps/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arc/plat-eznps/Kconfig</a></div><div class='hunk'>@@ -26,8 +26,8 @@ config EZNPS_MTM_EXT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Here we add new hierarchy for CPUs topology.</div><div class='ctx'> 	  We got:</div><div class='del'>-		Core</div><div class='del'>-		Thread</div><div class='add'>+	    Core</div><div class='add'>+	    Thread</div><div class='ctx'> 	  At the new thread level each CPU represent one HW thread.</div><div class='ctx'> 	  At highest hierarchy each core contain 16 threads,</div><div class='ctx'> 	  any of them seem like CPU from Linux point of view.</div><div class='hunk'>@@ -35,10 +35,10 @@ config EZNPS_MTM_EXT</div><div class='ctx'> 	  core and HW scheduler round robin between them.</div><div class='ctx'> </div><div class='ctx'> config EZNPS_MEM_ERROR_ALIGN</div><div class='del'>-       bool "ARC-EZchip Memory error as an exception"</div><div class='del'>-       depends on EZNPS_MTM_EXT</div><div class='del'>-       default n</div><div class='del'>-       help</div><div class='add'>+	bool "ARC-EZchip Memory error as an exception"</div><div class='add'>+	depends on EZNPS_MTM_EXT</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='ctx'> 	  On the real chip of the NPS, user memory errors are handled</div><div class='ctx'> 	  as a machine check exception, which is fatal, whereas on</div><div class='ctx'> 	  simulator platform for NPS, is handled as a Level 2 interrupt</div><div class='head'>diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig<br/>index 054ead960f98..dc9855c4a3b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/Kconfig</a></div><div class='hunk'>@@ -73,7 +73,7 @@ config ARM</div><div class='ctx'> 	select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) &amp;&amp; MMU</div><div class='ctx'> 	select HAVE_EXIT_THREAD</div><div class='ctx'> 	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL</div><div class='del'>-	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL</div><div class='add'>+	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL &amp;&amp; !CC_IS_CLANG</div><div class='ctx'> 	select HAVE_FUNCTION_TRACER if !XIP_KERNEL</div><div class='ctx'> 	select HAVE_GCC_PLUGINS</div><div class='ctx'> 	select HAVE_HW_BREAKPOINT if PERF_EVENTS &amp;&amp; (CPU_V6 || CPU_V6K || CPU_V7)</div><div class='hunk'>@@ -178,10 +178,6 @@ config TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default !CPU_V7M</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -596,6 +592,7 @@ config ARCH_DAVINCI</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select PM_GENERIC_DOMAINS if PM</div><div class='ctx'> 	select PM_GENERIC_DOMAINS_OF if PM &amp;&amp; OF</div><div class='add'>+	select REGMAP_MMIO</div><div class='ctx'> 	select RESET_CONTROLLER</div><div class='ctx'> 	select SPARSE_IRQ</div><div class='ctx'> 	select USE_OF</div><div class='head'>diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug<br/>index 6d6e0330930b..e388af4594a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/Kconfig.debug?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/Kconfig.debug</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/Kconfig.debug?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/Kconfig.debug</a></div><div class='hunk'>@@ -47,8 +47,8 @@ config DEBUG_WX</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Choose kernel unwinder"</div><div class='del'>-	default UNWINDER_ARM if AEABI &amp;&amp; !FUNCTION_GRAPH_TRACER</div><div class='del'>-	default UNWINDER_FRAME_POINTER if !AEABI || FUNCTION_GRAPH_TRACER</div><div class='add'>+	default UNWINDER_ARM if AEABI</div><div class='add'>+	default UNWINDER_FRAME_POINTER if !AEABI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This determines which method will be used for unwinding kernel stack</div><div class='ctx'> 	  traces for panics, oopses, bugs, warnings, perf, /proc/&lt;pid&gt;/stack,</div><div class='hunk'>@@ -65,7 +65,7 @@ config UNWINDER_FRAME_POINTER</div><div class='ctx'> </div><div class='ctx'> config UNWINDER_ARM</div><div class='ctx'> 	bool "ARM EABI stack unwinder"</div><div class='del'>-	depends on AEABI</div><div class='add'>+	depends on AEABI &amp;&amp; !FUNCTION_GRAPH_TRACER</div><div class='ctx'> 	select ARM_UNWIND</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables stack unwinding support in the kernel</div><div class='head'>diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S<br/>index 6c7ccb428c07..7135820f76d4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/compressed/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/compressed/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/compressed/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/compressed/head.S</a></div><div class='hunk'>@@ -1438,7 +1438,21 @@ ENTRY(efi_stub_entry)</div><div class='ctx'> </div><div class='ctx'> 		@ Preserve return value of efi_entry() in r4</div><div class='ctx'> 		mov	r4, r0</div><div class='del'>-		bl	cache_clean_flush</div><div class='add'>+</div><div class='add'>+		@ our cache maintenance code relies on CP15 barrier instructions</div><div class='add'>+		@ but since we arrived here with the MMU and caches configured</div><div class='add'>+		@ by UEFI, we must check that the CP15BEN bit is set in SCTLR.</div><div class='add'>+		@ Note that this bit is RAO/WI on v6 and earlier, so the ISB in</div><div class='add'>+		@ the enable path will be executed on v7+ only.</div><div class='add'>+		mrc	p15, 0, r1, c1, c0, 0	@ read SCTLR</div><div class='add'>+		tst	r1, #(1 &lt;&lt; 5)		@ CP15BEN bit set?</div><div class='add'>+		bne	0f</div><div class='add'>+		orr	r1, r1, #(1 &lt;&lt; 5)	@ CP15 barrier instructions</div><div class='add'>+		mcr	p15, 0, r1, c1, c0, 0	@ write SCTLR</div><div class='add'>+ ARM(		.inst	0xf57ff06f		@ v7+ isb	)</div><div class='add'>+ THUMB(		isb						)</div><div class='add'>+</div><div class='add'>+0:		bl	cache_clean_flush</div><div class='ctx'> 		bl	cache_off</div><div class='ctx'> </div><div class='ctx'> 		@ Set parameters for booting zImage according to boot protocol</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts<br/>index dce5be5df97b..edcff79879e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/am335x-evm.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/am335x-evm.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/am335x-evm.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/am335x-evm.dts</a></div><div class='hunk'>@@ -57,6 +57,24 @@</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* TPS79501 */</div><div class='add'>+	v1_8d_reg: fixedregulator-v1_8d {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v1_8d";</div><div class='add'>+		vin-supply = &lt;&amp;vbat&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* TPS79501 */</div><div class='add'>+	v3_3d_reg: fixedregulator-v3_3d {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v3_3d";</div><div class='add'>+		vin-supply = &lt;&amp;vbat&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	matrix_keypad: matrix_keypad0 {</div><div class='ctx'> 		compatible = "gpio-matrix-keypad";</div><div class='ctx'> 		debounce-delay-ms = &lt;5&gt;;</div><div class='hunk'>@@ -499,10 +517,10 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		/* Regulators */</div><div class='del'>-		AVDD-supply = &lt;&amp;vaux2_reg&gt;;</div><div class='del'>-		IOVDD-supply = &lt;&amp;vaux2_reg&gt;;</div><div class='del'>-		DRVDD-supply = &lt;&amp;vaux2_reg&gt;;</div><div class='del'>-		DVDD-supply = &lt;&amp;vbat&gt;;</div><div class='add'>+		AVDD-supply = &lt;&amp;v3_3d_reg&gt;;</div><div class='add'>+		IOVDD-supply = &lt;&amp;v3_3d_reg&gt;;</div><div class='add'>+		DRVDD-supply = &lt;&amp;v3_3d_reg&gt;;</div><div class='add'>+		DVDD-supply = &lt;&amp;v1_8d_reg&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts<br/>index b128998097ce..2c2d8b5b8cf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/am335x-evmsk.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/am335x-evmsk.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/am335x-evmsk.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/am335x-evmsk.dts</a></div><div class='hunk'>@@ -73,6 +73,24 @@</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* TPS79518 */</div><div class='add'>+	v1_8d_reg: fixedregulator-v1_8d {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v1_8d";</div><div class='add'>+		vin-supply = &lt;&amp;vbat&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* TPS78633 */</div><div class='add'>+	v3_3d_reg: fixedregulator-v3_3d {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v3_3d";</div><div class='add'>+		vin-supply = &lt;&amp;vbat&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	leds {</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;user_leds_s0&gt;;</div><div class='hunk'>@@ -501,10 +519,10 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		/* Regulators */</div><div class='del'>-		AVDD-supply = &lt;&amp;vaux2_reg&gt;;</div><div class='del'>-		IOVDD-supply = &lt;&amp;vaux2_reg&gt;;</div><div class='del'>-		DRVDD-supply = &lt;&amp;vaux2_reg&gt;;</div><div class='del'>-		DVDD-supply = &lt;&amp;vbat&gt;;</div><div class='add'>+		AVDD-supply = &lt;&amp;v3_3d_reg&gt;;</div><div class='add'>+		IOVDD-supply = &lt;&amp;v3_3d_reg&gt;;</div><div class='add'>+		DRVDD-supply = &lt;&amp;v3_3d_reg&gt;;</div><div class='add'>+		DVDD-supply = &lt;&amp;v1_8d_reg&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi<br/>index f459ec316a22..ca6d9f02a800 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/am33xx-l4.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/am33xx-l4.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/am33xx-l4.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/am33xx-l4.dtsi</a></div><div class='hunk'>@@ -1762,7 +1762,7 @@</div><div class='ctx'> 			reg = &lt;0xcc000 0x4&gt;;</div><div class='ctx'> 			reg-names = "rev";</div><div class='ctx'> 			/* Domains (P, C): per_pwrdm, l4ls_clkdm */</div><div class='del'>-			clocks = &lt;&amp;l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0&gt;;</div><div class='ctx'> 			clock-names = "fck";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -1785,7 +1785,7 @@</div><div class='ctx'> 			reg = &lt;0xd0000 0x4&gt;;</div><div class='ctx'> 			reg-names = "rev";</div><div class='ctx'> 			/* Domains (P, C): per_pwrdm, l4ls_clkdm */</div><div class='del'>-			clocks = &lt;&amp;l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0&gt;;</div><div class='ctx'> 			clock-names = "fck";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts<br/>index 5641d162dfdb..28e7513ce617 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts</a></div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;hdmi {</div><div class='del'>-	hpd-gpios = &lt;&amp;gpio 46 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	hpd-gpios = &lt;&amp;gpio 46 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pwm {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi<br/>index b715ab0fa1ff..e8d800fec637 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6dl-yapp4-common.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/imx6dl-yapp4-common.dtsi</a></div><div class='hunk'>@@ -114,9 +114,9 @@</div><div class='ctx'> 			reg = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		switch@0 {</div><div class='add'>+		switch@10 {</div><div class='ctx'> 			compatible = "qca,qca8334";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='add'>+			reg = &lt;10&gt;;</div><div class='ctx'> </div><div class='ctx'> 			switch_ports: ports {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -125,7 +125,7 @@</div><div class='ctx'> 				ethphy0: port@0 {</div><div class='ctx'> 					reg = &lt;0&gt;;</div><div class='ctx'> 					label = "cpu";</div><div class='del'>-					phy-mode = "rgmii";</div><div class='add'>+					phy-mode = "rgmii-id";</div><div class='ctx'> 					ethernet = &lt;&amp;fec&gt;;</div><div class='ctx'> </div><div class='ctx'> 					fixed-link {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi<br/>index 1d1b4bd0670f..a4217f564a53 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi</a></div><div class='hunk'>@@ -264,7 +264,7 @@</div><div class='ctx'> 	pinctrl-2 = &lt;&amp;pinctrl_usdhc3_200mhz&gt;;</div><div class='ctx'> 	vmcc-supply = &lt;&amp;reg_sd3_vmmc&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio1 1 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-	bus-witdh = &lt;4&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='ctx'> 	no-1-8-v;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -275,7 +275,7 @@</div><div class='ctx'> 	pinctrl-1 = &lt;&amp;pinctrl_usdhc4_100mhz&gt;;</div><div class='ctx'> 	pinctrl-2 = &lt;&amp;pinctrl_usdhc4_200mhz&gt;;</div><div class='ctx'> 	vmcc-supply = &lt;&amp;reg_sd4_vmmc&gt;;</div><div class='del'>-	bus-witdh = &lt;8&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='ctx'> 	no-1-8-v;</div><div class='ctx'> 	non-removable;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi<br/>index 433bf09a1954..027df06c5dc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi</a></div><div class='hunk'>@@ -91,6 +91,7 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_enet&gt;;</div><div class='ctx'> 	phy-handle = &lt;&amp;ethphy&gt;;</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='add'>+	phy-reset-duration = &lt;10&gt;; /* in msecs */</div><div class='ctx'> 	phy-reset-gpios = &lt;&amp;gpio3 23 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	phy-supply = &lt;&amp;vdd_eth_io_reg&gt;;</div><div class='ctx'> 	status = "disabled";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h<br/>index f6fb6783c193..54cfe72295aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/imx6ull-pinfunc-snvs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/imx6ull-pinfunc-snvs.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 (C) 2016 Freescale Semiconductor, Inc.</div><div class='ctx'>  * Copyright (C) 2017 NXP</div><div class='head'>diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi<br/>index b4f2723ecd86..b10ff5877b4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/ls1021a.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/ls1021a.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/ls1021a.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/ls1021a.dtsi</a></div><div class='hunk'>@@ -446,6 +446,34 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		counter0: counter@29d0000 {</div><div class='add'>+			compatible = "fsl,ftm-quaddec";</div><div class='add'>+			reg = &lt;0x0 0x29d0000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		counter1: counter@29e0000 {</div><div class='add'>+			compatible = "fsl,ftm-quaddec";</div><div class='add'>+			reg = &lt;0x0 0x29e0000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		counter2: counter@29f0000 {</div><div class='add'>+			compatible = "fsl,ftm-quaddec";</div><div class='add'>+			reg = &lt;0x0 0x29f0000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		counter3: counter@2a00000 {</div><div class='add'>+			compatible = "fsl,ftm-quaddec";</div><div class='add'>+			reg = &lt;0x0 0x2a00000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gpio0: gpio@2300000 {</div><div class='ctx'> 			compatible = "fsl,ls1021a-gpio", "fsl,qoriq-gpio";</div><div class='ctx'> 			reg = &lt;0x0 0x2300000 0x0 0x10000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts<br/>index e21ec929f096..714863f8f261 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/omap4-droid4-xt894.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/omap4-droid4-xt894.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/omap4-droid4-xt894.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/omap4-droid4-xt894.dts</a></div><div class='hunk'>@@ -214,7 +214,6 @@</div><div class='ctx'> </div><div class='ctx'> 		width-mm = &lt;50&gt;;</div><div class='ctx'> 		height-mm = &lt;89&gt;;</div><div class='del'>-		backlight = &lt;&amp;lcd_backlight&gt;;</div><div class='ctx'> </div><div class='ctx'> 		panel-timing {</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;		/* Calculated by dsi */</div><div class='hunk'>@@ -383,20 +382,30 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c1 {</div><div class='del'>-	lm3532@38 {</div><div class='add'>+	led-controller@38 {</div><div class='ctx'> 		compatible = "ti,lm3532";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		reg = &lt;0x38&gt;;</div><div class='ctx'> </div><div class='ctx'> 		enable-gpios = &lt;&amp;gpio6 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> </div><div class='del'>-		lcd_backlight: backlight {</div><div class='del'>-			compatible = "ti,lm3532-backlight";</div><div class='add'>+		ramp-up-us = &lt;1024&gt;;</div><div class='add'>+		ramp-down-us = &lt;8193&gt;;</div><div class='ctx'> </div><div class='del'>-			lcd {</div><div class='del'>-				led-sources = &lt;0 1 2&gt;;</div><div class='del'>-				ramp-up-msec = &lt;1&gt;;</div><div class='del'>-				ramp-down-msec = &lt;0&gt;;</div><div class='del'>-			};</div><div class='add'>+		led@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			led-sources = &lt;2&gt;;</div><div class='add'>+			ti,led-mode = &lt;0&gt;;</div><div class='add'>+			label = ":backlight";</div><div class='add'>+			linux,default-trigger = "backlight";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			led-sources = &lt;1&gt;;</div><div class='add'>+			ti,led-mode = &lt;0&gt;;</div><div class='add'>+			label = ":kbd_backlight";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi<br/>index aa107ee41b8b..ef653c3209bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/rk3288-tinker.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/rk3288-tinker.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/rk3288-tinker.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/rk3288-tinker.dtsi</a></div><div class='hunk'>@@ -254,6 +254,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			vccio_sd: LDO_REG5 {</div><div class='add'>+				regulator-boot-on;</div><div class='ctx'> 				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 				regulator-name = "vccio_sd";</div><div class='hunk'>@@ -430,7 +431,7 @@</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	cap-mmc-highspeed;</div><div class='ctx'> 	cap-sd-highspeed;</div><div class='del'>-	card-detect-delay = &lt;200&gt;;</div><div class='add'>+	broken-cd;</div><div class='ctx'> 	disable-wp;			/* wp not hooked up */</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdmmc_clk &amp;sdmmc_cmd &amp;sdmmc_cd &amp;sdmmc_bus4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi<br/>index 0bc2409f6903..192dbc089ade 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/rk3288-veyron.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/rk3288-veyron.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/rk3288-veyron.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/rk3288-veyron.dtsi</a></div><div class='hunk'>@@ -25,8 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> 	gpio_keys: gpio-keys {</div><div class='ctx'> 		compatible = "gpio-keys";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pwr_key_l&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi<br/>index ca7d52daa8fb..8ce3dd2264b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/rk3288.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/rk3288.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/rk3288.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/rk3288.dtsi</a></div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> 			compatible = "arm,cortex-a12";</div><div class='ctx'> 			reg = &lt;0x501&gt;;</div><div class='ctx'> 			resets = &lt;&amp;cru SRST_CORE1&gt;;</div><div class='del'>-			operating-points = &lt;&amp;cpu_opp_table&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp_table&gt;;</div><div class='ctx'> 			#cooling-cells = &lt;2&gt;; /* min followed by max */</div><div class='ctx'> 			clock-latency = &lt;40000&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cru ARMCLK&gt;;</div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> 			compatible = "arm,cortex-a12";</div><div class='ctx'> 			reg = &lt;0x502&gt;;</div><div class='ctx'> 			resets = &lt;&amp;cru SRST_CORE2&gt;;</div><div class='del'>-			operating-points = &lt;&amp;cpu_opp_table&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp_table&gt;;</div><div class='ctx'> 			#cooling-cells = &lt;2&gt;; /* min followed by max */</div><div class='ctx'> 			clock-latency = &lt;40000&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cru ARMCLK&gt;;</div><div class='hunk'>@@ -90,7 +90,7 @@</div><div class='ctx'> 			compatible = "arm,cortex-a12";</div><div class='ctx'> 			reg = &lt;0x503&gt;;</div><div class='ctx'> 			resets = &lt;&amp;cru SRST_CORE3&gt;;</div><div class='del'>-			operating-points = &lt;&amp;cpu_opp_table&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp_table&gt;;</div><div class='ctx'> 			#cooling-cells = &lt;2&gt;; /* min followed by max */</div><div class='ctx'> 			clock-latency = &lt;40000&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cru ARMCLK&gt;;</div><div class='hunk'>@@ -616,6 +616,7 @@</div><div class='ctx'> 		dr_mode = "host";</div><div class='ctx'> 		phys = &lt;&amp;usbphy2&gt;;</div><div class='ctx'> 		phy-names = "usb2-phy";</div><div class='add'>+		snps,reset-phy-on-wake;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -904,6 +905,8 @@</div><div class='ctx'> 				clocks = &lt;&amp;cru SCLK_OTGPHY0&gt;;</div><div class='ctx'> 				clock-names = "phyclk";</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='add'>+				resets = &lt;&amp;cru SRST_USBOTG_PHY&gt;;</div><div class='add'>+				reset-names = "phy-reset";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			usbphy1: usb-phy@334 {</div><div class='hunk'>@@ -912,6 +915,8 @@</div><div class='ctx'> 				clocks = &lt;&amp;cru SCLK_OTGPHY1&gt;;</div><div class='ctx'> 				clock-names = "phyclk";</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='add'>+				resets = &lt;&amp;cru SRST_USBHOST0_PHY&gt;;</div><div class='add'>+				reset-names = "phy-reset";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			usbphy2: usb-phy@348 {</div><div class='hunk'>@@ -920,6 +925,8 @@</div><div class='ctx'> 				clocks = &lt;&amp;cru SCLK_OTGPHY2&gt;;</div><div class='ctx'> 				clock-names = "phyclk";</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='add'>+				resets = &lt;&amp;cru SRST_USBHOST1_PHY&gt;;</div><div class='add'>+				reset-names = "phy-reset";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1119,8 +1126,6 @@</div><div class='ctx'> 		clock-names = "ref", "pclk";</div><div class='ctx'> 		power-domains = &lt;&amp;power RK3288_PD_VIO&gt;;</div><div class='ctx'> 		rockchip,grf = &lt;&amp;grf&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> </div><div class='ctx'> 		ports {</div><div class='hunk'>@@ -1282,27 +1287,27 @@</div><div class='ctx'> 	gpu_opp_table: gpu-opp-table {</div><div class='ctx'> 		compatible = "operating-points-v2";</div><div class='ctx'> </div><div class='del'>-		opp@100000000 {</div><div class='add'>+		opp-100000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;950000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		opp@200000000 {</div><div class='add'>+		opp-200000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;950000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		opp@300000000 {</div><div class='add'>+		opp-300000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;300000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;1000000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		opp@400000000 {</div><div class='add'>+		opp-400000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;1100000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		opp@500000000 {</div><div class='add'>+		opp-500000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;1200000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		opp@600000000 {</div><div class='add'>+		opp-600000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;1250000&gt;;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d2-pinfunc.h b/arch/arm/boot/dts/sama5d2-pinfunc.h<br/>index 1c01a6f843d8..28a2e45752fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/sama5d2-pinfunc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/boot/dts/sama5d2-pinfunc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/boot/dts/sama5d2-pinfunc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/boot/dts/sama5d2-pinfunc.h</a></div><div class='hunk'>@@ -518,7 +518,7 @@</div><div class='ctx'> #define PIN_PC9__GPIO			PINMUX_PIN(PIN_PC9, 0, 0)</div><div class='ctx'> #define PIN_PC9__FIQ			PINMUX_PIN(PIN_PC9, 1, 3)</div><div class='ctx'> #define PIN_PC9__GTSUCOMP		PINMUX_PIN(PIN_PC9, 2, 1)</div><div class='del'>-#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 2, 1)</div><div class='add'>+#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 3, 1)</div><div class='ctx'> #define PIN_PC9__TIOA4			PINMUX_PIN(PIN_PC9, 4, 2)</div><div class='ctx'> #define PIN_PC10			74</div><div class='ctx'> #define PIN_PC10__GPIO			PINMUX_PIN(PIN_PC10, 0, 0)</div><div class='head'>diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig<br/>index 1446262921b4..bdbade6af9c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/aspeed_g4_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/aspeed_g4_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/aspeed_g4_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/aspeed_g4_defconfig</a></div><div class='hunk'>@@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y</div><div class='ctx'> CONFIG_JUMP_LABEL=y</div><div class='ctx'> CONFIG_STRICT_KERNEL_RWX=y</div><div class='ctx'> CONFIG_GCC_PLUGINS=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_BLK_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='head'>diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig<br/>index 02fa3a41add5..4bde84eae4eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/aspeed_g5_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/aspeed_g5_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/aspeed_g5_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/aspeed_g5_defconfig</a></div><div class='hunk'>@@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y</div><div class='ctx'> CONFIG_JUMP_LABEL=y</div><div class='ctx'> CONFIG_STRICT_KERNEL_RWX=y</div><div class='ctx'> CONFIG_GCC_PLUGINS=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_BLK_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='head'>diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig<br/>index e4b1be66b3f5..b7752929975c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/at91_dt_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/at91_dt_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/at91_dt_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/at91_dt_defconfig</a></div><div class='hunk'>@@ -9,7 +9,6 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig<br/>index fc105c9178cc..09ae750164e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/clps711x_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/clps711x_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/clps711x_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/clps711x_defconfig</a></div><div class='hunk'>@@ -6,7 +6,6 @@ CONFIG_RD_LZMA=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SLOB=y</div><div class='ctx'> CONFIG_JUMP_LABEL=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> CONFIG_ARCH_CLPS711X=y</div><div class='head'>diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig<br/>index ee42158f41ec..10ea92513a69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/efm32_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/efm32_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/efm32_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/efm32_defconfig</a></div><div class='hunk'>@@ -11,7 +11,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG is not set</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig<br/>index 484e51fbd4a6..e3afca5bd9d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/ezx_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/ezx_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/ezx_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/ezx_defconfig</a></div><div class='hunk'>@@ -13,7 +13,6 @@ CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> CONFIG_ARCH_PXA=y</div><div class='head'>diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig<br/>index ebeca11faa48..175881b7da7c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/h3600_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/h3600_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/h3600_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/h3600_defconfig</a></div><div class='hunk'>@@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig<br/>index f204017c26b9..9b779e13e05d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/imote2_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/imote2_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/imote2_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/imote2_defconfig</a></div><div class='hunk'>@@ -12,7 +12,6 @@ CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> CONFIG_ARCH_PXA=y</div><div class='head'>diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig<br/>index 8661dd9b064a..b37f8e675e40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/imx_v4_v5_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/imx_v4_v5_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/imx_v4_v5_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/imx_v4_v5_defconfig</a></div><div class='hunk'>@@ -170,6 +170,9 @@ CONFIG_IMX_SDMA=y</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_IIO=y</div><div class='ctx'> CONFIG_FSL_MX25_ADC=y</div><div class='add'>+CONFIG_PWM=y</div><div class='add'>+CONFIG_PWM_IMX1=y</div><div class='add'>+CONFIG_PWM_IMX27=y</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='ctx'> CONFIG_VFAT_FS=y</div><div class='head'>diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig<br/>index 5586a5074a96..50fb01d70b10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/imx_v6_v7_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/imx_v6_v7_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/imx_v6_v7_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/imx_v6_v7_defconfig</a></div><div class='hunk'>@@ -398,7 +398,7 @@ CONFIG_MAG3110=y</div><div class='ctx'> CONFIG_MPL3115=y</div><div class='ctx'> CONFIG_PWM=y</div><div class='ctx'> CONFIG_PWM_FSL_FTM=y</div><div class='del'>-CONFIG_PWM_IMX=y</div><div class='add'>+CONFIG_PWM_IMX27=y</div><div class='ctx'> CONFIG_NVMEM_IMX_OCOTP=y</div><div class='ctx'> CONFIG_NVMEM_VF610_OCOTP=y</div><div class='ctx'> CONFIG_TEE=y</div><div class='head'>diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig<br/>index 078228a19339..6a11669fa536 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/moxart_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/moxart_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/moxart_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/moxart_defconfig</a></div><div class='hunk'>@@ -15,7 +15,6 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG is not set</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> CONFIG_ARCH_MULTI_V4=y</div><div class='head'>diff --git a/arch/arm/configs/multi_v4t_defconfig b/arch/arm/configs/multi_v4t_defconfig<br/>index 9a6390c172d6..eeea0c41138b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/multi_v4t_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/multi_v4t_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/multi_v4t_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/multi_v4t_defconfig</a></div><div class='hunk'>@@ -5,7 +5,6 @@ CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SLOB=y</div><div class='ctx'> CONFIG_JUMP_LABEL=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> CONFIG_ARCH_MULTI_V4T=y</div><div class='head'>diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig<br/>index cfc00b0961ec..8448a7f407a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/omap1_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/omap1_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/omap1_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/omap1_defconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig<br/>index 0258ba891376..152321d2893e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/stm32_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/stm32_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/stm32_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/stm32_defconfig</a></div><div class='hunk'>@@ -13,7 +13,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG is not set</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig<br/>index 36d77406e31b..831ba6a9ee8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/u300_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/u300_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/u300_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/u300_defconfig</a></div><div class='hunk'>@@ -9,7 +9,6 @@ CONFIG_EXPERT=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig<br/>index 392ed3b3613c..484d77a7f589 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/vexpress_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/configs/vexpress_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/configs/vexpress_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/configs/vexpress_defconfig</a></div><div class='hunk'>@@ -14,7 +14,6 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c<br/>index 07e31941dc67..617c2c99ebfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/aes-neonbs-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/aes-neonbs-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/aes-neonbs-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/aes-neonbs-glue.c</a></div><div class='hunk'>@@ -278,6 +278,8 @@ static int __xts_crypt(struct skcipher_request *req,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	crypto_cipher_encrypt_one(ctx-&gt;tweak_tfm, walk.iv, walk.iv);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/crypto/chacha-neon-glue.c b/arch/arm/crypto/chacha-neon-glue.c<br/>index 9d6fda81986d..48a89537b828 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/chacha-neon-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/chacha-neon-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/chacha-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/chacha-neon-glue.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/chacha.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.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='hunk'>@@ -93,7 +94,7 @@ static int chacha_neon(struct skcipher_request *req)</div><div class='ctx'> 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='ctx'> 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !may_use_simd())</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_chacha_crypt(req);</div><div class='ctx'> </div><div class='ctx'> 	return chacha_neon_stream_xor(req, ctx, req-&gt;iv);</div><div class='hunk'>@@ -107,7 +108,7 @@ static int xchacha_neon(struct skcipher_request *req)</div><div class='ctx'> 	u32 state[16];</div><div class='ctx'> 	u8 real_iv[16];</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !may_use_simd())</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_xchacha_crypt(req);</div><div class='ctx'> </div><div class='ctx'> 	crypto_chacha_init(state, ctx, req-&gt;iv);</div><div class='head'>diff --git a/arch/arm/crypto/crc32-ce-glue.c b/arch/arm/crypto/crc32-ce-glue.c<br/>index cd9e93b46c2d..e712c2a7d387 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/crc32-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/crc32-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/crc32-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/crc32-ce-glue.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='hunk'>@@ -113,7 +114,7 @@ static int crc32_pmull_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	u32 *crc = shash_desc_ctx(desc);</div><div class='ctx'> 	unsigned int l;</div><div class='ctx'> </div><div class='del'>-	if (may_use_simd()) {</div><div class='add'>+	if (crypto_simd_usable()) {</div><div class='ctx'> 		if ((u32)data % SCALE_F) {</div><div class='ctx'> 			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +148,7 @@ static int crc32c_pmull_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	u32 *crc = shash_desc_ctx(desc);</div><div class='ctx'> 	unsigned int l;</div><div class='ctx'> </div><div class='del'>-	if (may_use_simd()) {</div><div class='add'>+	if (crypto_simd_usable()) {</div><div class='ctx'> 		if ((u32)data % SCALE_F) {</div><div class='ctx'> 			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/crypto/crct10dif-ce-glue.c b/arch/arm/crypto/crct10dif-ce-glue.c<br/>index 3d6b800b8396..3b24f2872592 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/crct10dif-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/crct10dif-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/crct10dif-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/crct10dif-ce-glue.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='hunk'>@@ -36,7 +37,7 @@ static int crct10dif_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	u16 *crc = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (length &gt;= CRC_T10DIF_PMULL_CHUNK_SIZE &amp;&amp; may_use_simd()) {</div><div class='add'>+	if (length &gt;= CRC_T10DIF_PMULL_CHUNK_SIZE &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='ctx'> 		*crc = crc_t10dif_pmull(*crc, data, length);</div><div class='ctx'> 		kernel_neon_end();</div><div class='head'>diff --git a/arch/arm/crypto/ghash-ce-glue.c b/arch/arm/crypto/ghash-ce-glue.c<br/>index b7d30b6cf49c..39d1ccec1aab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/ghash-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/ghash-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/ghash-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/ghash-ce-glue.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='hunk'>@@ -185,7 +186,6 @@ static int ghash_async_init(struct ahash_request *req)</div><div class='ctx'> 	struct crypto_shash *child = cryptd_ahash_child(cryptd_tfm);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = child;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> 	return crypto_shash_init(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +196,7 @@ static int ghash_async_update(struct ahash_request *req)</div><div class='ctx'> 	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);</div><div class='ctx'> 	struct cryptd_ahash *cryptd_tfm = ctx-&gt;cryptd_tfm;</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_ahash_queued(cryptd_tfm))) {</div><div class='ctx'> 		memcpy(cryptd_req, req, sizeof(*req));</div><div class='ctx'> 		ahash_request_set_tfm(cryptd_req, &amp;cryptd_tfm-&gt;base);</div><div class='hunk'>@@ -214,7 +214,7 @@ static int ghash_async_final(struct ahash_request *req)</div><div class='ctx'> 	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);</div><div class='ctx'> 	struct cryptd_ahash *cryptd_tfm = ctx-&gt;cryptd_tfm;</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_ahash_queued(cryptd_tfm))) {</div><div class='ctx'> 		memcpy(cryptd_req, req, sizeof(*req));</div><div class='ctx'> 		ahash_request_set_tfm(cryptd_req, &amp;cryptd_tfm-&gt;base);</div><div class='hunk'>@@ -232,7 +232,7 @@ static int ghash_async_digest(struct ahash_request *req)</div><div class='ctx'> 	struct ahash_request *cryptd_req = ahash_request_ctx(req);</div><div class='ctx'> 	struct cryptd_ahash *cryptd_tfm = ctx-&gt;cryptd_tfm;</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_ahash_queued(cryptd_tfm))) {</div><div class='ctx'> 		memcpy(cryptd_req, req, sizeof(*req));</div><div class='ctx'> 		ahash_request_set_tfm(cryptd_req, &amp;cryptd_tfm-&gt;base);</div><div class='hunk'>@@ -242,7 +242,6 @@ static int ghash_async_digest(struct ahash_request *req)</div><div class='ctx'> 		struct crypto_shash *child = cryptd_ahash_child(cryptd_tfm);</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;tfm = child;</div><div class='del'>-		desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> 		return shash_ahash_digest(req, desc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -255,7 +254,6 @@ static int ghash_async_import(struct ahash_request *req, const void *in)</div><div class='ctx'> 	struct shash_desc *desc = cryptd_shash_desc(cryptd_req);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = cryptd_ahash_child(ctx-&gt;cryptd_tfm);</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_import(desc, in);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/crypto/nhpoly1305-neon-glue.c b/arch/arm/crypto/nhpoly1305-neon-glue.c<br/>index 49aae87cb2bc..ae5aefc44a4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/nhpoly1305-neon-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/nhpoly1305-neon-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/nhpoly1305-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/nhpoly1305-neon-glue.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/nhpoly1305.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,7 +26,7 @@ static void _nh_neon(const u32 *key, const u8 *message, size_t message_len,</div><div class='ctx'> static int nhpoly1305_neon_update(struct shash_desc *desc,</div><div class='ctx'> 				  const u8 *src, unsigned int srclen)</div><div class='ctx'> {</div><div class='del'>-	if (srclen &lt; 64 || !may_use_simd())</div><div class='add'>+	if (srclen &lt; 64 || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_nhpoly1305_update(desc, src, srclen);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='head'>diff --git a/arch/arm/crypto/sha1-ce-glue.c b/arch/arm/crypto/sha1-ce-glue.c<br/>index b732522e20f8..4c6c6900853c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha1-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha1-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha1-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/sha1-ce-glue.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha1_base.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -33,7 +34,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count % SHA1_BLOCK_SIZE) + len &lt; SHA1_BLOCK_SIZE)</div><div class='ctx'> 		return sha1_update_arm(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +48,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha1_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			 unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return sha1_finup_arm(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm/crypto/sha1_neon_glue.c b/arch/arm/crypto/sha1_neon_glue.c<br/>index d15e0ea2c95e..d6c95c213d42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha1_neon_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha1_neon_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha1_neon_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/sha1_neon_glue.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -39,7 +40,7 @@ static int sha1_neon_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count % SHA1_BLOCK_SIZE) + len &lt; SHA1_BLOCK_SIZE)</div><div class='ctx'> 		return sha1_update_arm(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +55,7 @@ static int sha1_neon_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha1_neon_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			   unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return sha1_finup_arm(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm/crypto/sha2-ce-glue.c b/arch/arm/crypto/sha2-ce-glue.c<br/>index 1211a5c129fc..a47a9d4b663e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha2-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha2-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha2-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/sha2-ce-glue.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha256_base.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -34,7 +35,7 @@ static int sha2_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count % SHA256_BLOCK_SIZE) + len &lt; SHA256_BLOCK_SIZE)</div><div class='ctx'> 		return crypto_sha256_arm_update(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +50,7 @@ static int sha2_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha2_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			 unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha256_arm_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm/crypto/sha256_neon_glue.c b/arch/arm/crypto/sha256_neon_glue.c<br/>index 1d82c6cd31a4..f3f6b1624fc3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha256_neon_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha256_neon_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha256_neon_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/sha256_neon_glue.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/cryptohash.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -34,7 +35,7 @@ static int sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count % SHA256_BLOCK_SIZE) + len &lt; SHA256_BLOCK_SIZE)</div><div class='ctx'> 		return crypto_sha256_arm_update(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +50,7 @@ static int sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha256_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha256_arm_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm/crypto/sha512-neon-glue.c b/arch/arm/crypto/sha512-neon-glue.c<br/>index 8a5642b41fd6..d33ab59c26c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha512-neon-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/crypto/sha512-neon-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/crypto/sha512-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/crypto/sha512-neon-glue.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha512_base.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='hunk'>@@ -30,7 +31,7 @@ static int sha512_neon_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count[0] % SHA512_BLOCK_SIZE) + len &lt; SHA512_BLOCK_SIZE)</div><div class='ctx'> 		return sha512_arm_update(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +46,7 @@ static int sha512_neon_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha512_neon_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			     unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return sha512_arm_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild<br/>index a8a4eb7f6dae..41deac2451af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/Kbuild</a></div><div class='hunk'>@@ -9,10 +9,10 @@ generic-y += kdebug.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += msi.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += preempt.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += seccomp.h</div><div class='ctx'> generic-y += segment.h</div><div class='ctx'> generic-y += serial.h</div><div class='head'>diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h<br/>index 0a8d7bba2cb0..4b66ecd6be99 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/arch_timer.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/arch_timer.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/arch_timer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/arch_timer.h</a></div><div class='hunk'>@@ -11,6 +11,10 @@</div><div class='ctx'> #include &lt;clocksource/arm_arch_timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM_ARCH_TIMER</div><div class='add'>+/* 32bit ARM doesn't know anything about timer errata... */</div><div class='add'>+#define has_erratum_handler(h)		(false)</div><div class='add'>+#define erratum_handler(h)		(arch_timer_##h)</div><div class='add'>+</div><div class='ctx'> int arch_timer_arch_init(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -79,7 +83,7 @@ static inline u32 arch_timer_get_cntfrq(void)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 arch_counter_get_cntpct(void)</div><div class='add'>+static inline u64 __arch_counter_get_cntpct(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cval;</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +92,12 @@ static inline u64 arch_counter_get_cntpct(void)</div><div class='ctx'> 	return cval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 arch_counter_get_cntvct(void)</div><div class='add'>+static inline u64 __arch_counter_get_cntpct_stable(void)</div><div class='add'>+{</div><div class='add'>+	return __arch_counter_get_cntpct();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 __arch_counter_get_cntvct(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cval;</div><div class='ctx'> </div><div class='hunk'>@@ -97,6 +106,11 @@ static inline u64 arch_counter_get_cntvct(void)</div><div class='ctx'> 	return cval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 __arch_counter_get_cntvct_stable(void)</div><div class='add'>+{</div><div class='add'>+	return __arch_counter_get_cntvct();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 arch_timer_get_cntkctl(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cntkctl;</div><div class='head'>diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h<br/>index 07e27f212dc7..d2453e2d3f1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/cp15.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/cp15.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/cp15.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/cp15.h</a></div><div class='hunk'>@@ -68,6 +68,8 @@</div><div class='ctx'> #define BPIALL				__ACCESS_CP15(c7, 0, c5, 6)</div><div class='ctx'> #define ICIALLU				__ACCESS_CP15(c7, 0, c5, 0)</div><div class='ctx'> </div><div class='add'>+#define CNTVCT				__ACCESS_CP15_64(1, c14)</div><div class='add'>+</div><div class='ctx'> extern unsigned long cr_alignment;	/* defined in entry-armv.S */</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long get_cr(void)</div><div class='head'>diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h<br/>index 6b51826ab3d1..7e22c81398c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/io.h</a></div><div class='hunk'>@@ -281,8 +281,6 @@ extern void _memcpy_fromio(void *, const volatile void __iomem *, size_t);</div><div class='ctx'> extern void _memcpy_toio(volatile void __iomem *, const void *, size_t);</div><div class='ctx'> extern void _memset_io(volatile void __iomem *, int, size_t);</div><div class='ctx'> </div><div class='del'>-#define mmiowb()</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  Memory access primitives</div><div class='ctx'>  *  ------------------------</div><div class='head'>diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h<br/>index 2de96a180166..31de4ab93005 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/kvm_mmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/kvm_mmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/kvm_mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/kvm_mmu.h</a></div><div class='hunk'>@@ -381,6 +381,17 @@ static inline int kvm_read_guest_lock(struct kvm *kvm,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int kvm_write_guest_lock(struct kvm *kvm, gpa_t gpa,</div><div class='add'>+				       const void *data, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	int srcu_idx = srcu_read_lock(&amp;kvm-&gt;srcu);</div><div class='add'>+	int ret = kvm_write_guest(kvm, gpa, data, len);</div><div class='add'>+</div><div class='add'>+	srcu_read_unlock(&amp;kvm-&gt;srcu, srcu_idx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void *kvm_get_hyp_vector(void)</div><div class='ctx'> {</div><div class='ctx'> 	switch(read_cpuid_part()) {</div><div class='head'>diff --git a/arch/arm/include/asm/stage2_pgtable.h b/arch/arm/include/asm/stage2_pgtable.h<br/>index de2089501b8b..9587517649bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/stage2_pgtable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/stage2_pgtable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/stage2_pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/stage2_pgtable.h</a></div><div class='hunk'>@@ -32,14 +32,14 @@</div><div class='ctx'> #define stage2_pgd_present(kvm, pgd)		pgd_present(pgd)</div><div class='ctx'> #define stage2_pgd_populate(kvm, pgd, pud)	pgd_populate(NULL, pgd, pud)</div><div class='ctx'> #define stage2_pud_offset(kvm, pgd, address)	pud_offset(pgd, address)</div><div class='del'>-#define stage2_pud_free(kvm, pud)		pud_free(NULL, pud)</div><div class='add'>+#define stage2_pud_free(kvm, pud)		do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #define stage2_pud_none(kvm, pud)		pud_none(pud)</div><div class='ctx'> #define stage2_pud_clear(kvm, pud)		pud_clear(pud)</div><div class='ctx'> #define stage2_pud_present(kvm, pud)		pud_present(pud)</div><div class='ctx'> #define stage2_pud_populate(kvm, pud, pmd)	pud_populate(NULL, pud, pmd)</div><div class='ctx'> #define stage2_pmd_offset(kvm, pud, address)	pmd_offset(pud, address)</div><div class='del'>-#define stage2_pmd_free(kvm, pmd)		pmd_free(NULL, pmd)</div><div class='add'>+#define stage2_pmd_free(kvm, pmd)		free_page((unsigned long)pmd)</div><div class='ctx'> </div><div class='ctx'> #define stage2_pud_huge(kvm, pud)		pud_huge(pud)</div><div class='ctx'> </div><div class='hunk'>@@ -75,6 +75,8 @@ static inline bool kvm_stage2_has_pud(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> #define S2_PMD_MASK				PMD_MASK</div><div class='ctx'> #define S2_PMD_SIZE				PMD_SIZE</div><div class='add'>+#define S2_PUD_MASK				PUD_MASK</div><div class='add'>+#define S2_PUD_SIZE				PUD_SIZE</div><div class='ctx'> </div><div class='ctx'> static inline bool kvm_stage2_has_pmd(struct kvm *kvm)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h<br/>index 06dea6bce293..fd02761ba06c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/syscall.h</a></div><div class='hunk'>@@ -55,56 +55,25 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (i + n &gt; SYSCALL_MAX_ARGS) {</div><div class='del'>-		unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;</div><div class='del'>-		unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;</div><div class='del'>-		pr_warn("%s called with max args %d, handling only %d\n",</div><div class='del'>-			__func__, i + n, SYSCALL_MAX_ARGS);</div><div class='del'>-		memset(args_bad, 0, n_bad * sizeof(args[0]));</div><div class='del'>-		n = SYSCALL_MAX_ARGS - i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		args[0] = regs-&gt;ARM_ORIG_r0;</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(args, &amp;regs-&gt;ARM_r0 + i, n * sizeof(args[0]));</div><div class='add'>+	args[0] = regs-&gt;ARM_ORIG_r0;</div><div class='add'>+	args++;</div><div class='add'>+</div><div class='add'>+	memcpy(args, &amp;regs-&gt;ARM_r0 + 1, 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (i + n &gt; SYSCALL_MAX_ARGS) {</div><div class='del'>-		pr_warn("%s called with max args %d, handling only %d\n",</div><div class='del'>-			__func__, i + n, SYSCALL_MAX_ARGS);</div><div class='del'>-		n = SYSCALL_MAX_ARGS - i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		regs-&gt;ARM_ORIG_r0 = args[0];</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;regs-&gt;ARM_r0 + i, args, n * sizeof(args[0]));</div><div class='add'>+	regs-&gt;ARM_ORIG_r0 = args[0];</div><div class='add'>+	args++;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;regs-&gt;ARM_r0 + 1, args, 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	/* ARM tasks don't change audit architectures on the fly. */</div><div class='ctx'> 	return AUDIT_ARCH_ARM;</div><div class='head'>diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h<br/>index f854148c8d7c..bc6d04a09899 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/asm/tlb.h</a></div><div class='hunk'>@@ -33,271 +33,42 @@</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MMU_GATHER_BUNDLE	8</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_RCU_TABLE_FREE</div><div class='ctx'> static inline void __tlb_remove_table(void *_table)</div><div class='ctx'> {</div><div class='ctx'> 	free_page_and_swap_cache((struct page *)_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mmu_table_batch {</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	unsigned int		nr;</div><div class='del'>-	void			*tables[0];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MAX_TABLE_BATCH		\</div><div class='del'>-	((PAGE_SIZE - sizeof(struct mmu_table_batch)) / sizeof(void *))</div><div class='del'>-</div><div class='del'>-extern void tlb_table_flush(struct mmu_gather *tlb);</div><div class='del'>-extern void tlb_remove_table(struct mmu_gather *tlb, void *table);</div><div class='del'>-</div><div class='del'>-#define tlb_remove_entry(tlb, entry)	tlb_remove_table(tlb, entry)</div><div class='del'>-#else</div><div class='del'>-#define tlb_remove_entry(tlb, entry)	tlb_remove_page(tlb, entry)</div><div class='del'>-#endif /* CONFIG_HAVE_RCU_TABLE_FREE */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TLB handling.  This allows us to remove pages from the page</div><div class='del'>- * tables, and efficiently handle the TLB issues.</div><div class='del'>- */</div><div class='del'>-struct mmu_gather {</div><div class='del'>-	struct mm_struct	*mm;</div><div class='del'>-#ifdef CONFIG_HAVE_RCU_TABLE_FREE</div><div class='del'>-	struct mmu_table_batch	*batch;</div><div class='del'>-	unsigned int		need_flush;</div><div class='del'>-#endif</div><div class='del'>-	unsigned int		fullmm;</div><div class='del'>-	struct vm_area_struct	*vma;</div><div class='del'>-	unsigned long		start, end;</div><div class='del'>-	unsigned long		range_start;</div><div class='del'>-	unsigned long		range_end;</div><div class='del'>-	unsigned int		nr;</div><div class='del'>-	unsigned int		max;</div><div class='del'>-	struct page		**pages;</div><div class='del'>-	struct page		*local[MMU_GATHER_BUNDLE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is unnecessarily complex.  There's three ways the TLB shootdown</div><div class='del'>- * code is used:</div><div class='del'>- *  1. Unmapping a range of vmas.  See zap_page_range(), unmap_region().</div><div class='del'>- *     tlb-&gt;fullmm = 0, and tlb_start_vma/tlb_end_vma will be called.</div><div class='del'>- *     tlb-&gt;vma will be non-NULL.</div><div class='del'>- *  2. Unmapping all vmas.  See exit_mmap().</div><div class='del'>- *     tlb-&gt;fullmm = 1, and tlb_start_vma/tlb_end_vma will be called.</div><div class='del'>- *     tlb-&gt;vma will be non-NULL.  Additionally, page tables will be freed.</div><div class='del'>- *  3. Unmapping argument pages.  See shift_arg_pages().</div><div class='del'>- *     tlb-&gt;fullmm = 0, but tlb_start_vma/tlb_end_vma will not be called.</div><div class='del'>- *     tlb-&gt;vma will be NULL.</div><div class='del'>- */</div><div class='del'>-static inline void tlb_flush(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	if (tlb-&gt;fullmm || !tlb-&gt;vma)</div><div class='del'>-		flush_tlb_mm(tlb-&gt;mm);</div><div class='del'>-	else if (tlb-&gt;range_end &gt; 0) {</div><div class='del'>-		flush_tlb_range(tlb-&gt;vma, tlb-&gt;range_start, tlb-&gt;range_end);</div><div class='del'>-		tlb-&gt;range_start = TASK_SIZE;</div><div class='del'>-		tlb-&gt;range_end = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_add_flush(struct mmu_gather *tlb, unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;fullmm) {</div><div class='del'>-		if (addr &lt; tlb-&gt;range_start)</div><div class='del'>-			tlb-&gt;range_start = addr;</div><div class='del'>-		if (addr + PAGE_SIZE &gt; tlb-&gt;range_end)</div><div class='del'>-			tlb-&gt;range_end = addr + PAGE_SIZE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __tlb_alloc_page(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	unsigned long addr = __get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);</div><div class='del'>-</div><div class='del'>-	if (addr) {</div><div class='del'>-		tlb-&gt;pages = (void *)addr;</div><div class='del'>-		tlb-&gt;max = PAGE_SIZE / sizeof(struct page *);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	tlb_flush(tlb);</div><div class='del'>-#ifdef CONFIG_HAVE_RCU_TABLE_FREE</div><div class='del'>-	tlb_table_flush(tlb);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_free(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	free_pages_and_swap_cache(tlb-&gt;pages, tlb-&gt;nr);</div><div class='del'>-	tlb-&gt;nr = 0;</div><div class='del'>-	if (tlb-&gt;pages == tlb-&gt;local)</div><div class='del'>-		__tlb_alloc_page(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	tlb_flush_mmu_tlbonly(tlb);</div><div class='del'>-	tlb_flush_mmu_free(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,</div><div class='del'>-			unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;mm = mm;</div><div class='del'>-	tlb-&gt;fullmm = !(start | (end+1));</div><div class='del'>-	tlb-&gt;start = start;</div><div class='del'>-	tlb-&gt;end = end;</div><div class='del'>-	tlb-&gt;vma = NULL;</div><div class='del'>-	tlb-&gt;max = ARRAY_SIZE(tlb-&gt;local);</div><div class='del'>-	tlb-&gt;pages = tlb-&gt;local;</div><div class='del'>-	tlb-&gt;nr = 0;</div><div class='del'>-	__tlb_alloc_page(tlb);</div><div class='add'>+#include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HAVE_RCU_TABLE_FREE</div><div class='del'>-	tlb-&gt;batch = NULL;</div><div class='add'>+#ifndef CONFIG_HAVE_RCU_TABLE_FREE</div><div class='add'>+#define tlb_remove_table(tlb, entry) tlb_remove_page(tlb, entry)</div><div class='ctx'> #endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_finish_mmu(struct mmu_gather *tlb,</div><div class='del'>-			unsigned long start, unsigned long end, bool force)</div><div class='del'>-{</div><div class='del'>-	if (force) {</div><div class='del'>-		tlb-&gt;range_start = start;</div><div class='del'>-		tlb-&gt;range_end = end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tlb_flush_mmu(tlb);</div><div class='del'>-</div><div class='del'>-	/* keep the page table cache within bounds */</div><div class='del'>-	check_pgt_cache();</div><div class='del'>-</div><div class='del'>-	if (tlb-&gt;pages != tlb-&gt;local)</div><div class='del'>-		free_pages((unsigned long)tlb-&gt;pages, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Memorize the range for the TLB flush.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	tlb_add_flush(tlb, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='del'>-	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='del'>-/*</div><div class='del'>- * In the case of tlb vma handling, we can optimise these away in the</div><div class='del'>- * case where we're doing a full MM flush.  When we're doing a munmap,</div><div class='del'>- * the vmas are adjusted to only cover the region to be torn down.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;fullmm) {</div><div class='del'>-		flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);</div><div class='del'>-		tlb-&gt;vma = vma;</div><div class='del'>-		tlb-&gt;range_start = TASK_SIZE;</div><div class='del'>-		tlb-&gt;range_end = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;fullmm)</div><div class='del'>-		tlb_flush(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;pages[tlb-&gt;nr++] = page;</div><div class='del'>-	VM_WARN_ON(tlb-&gt;nr &gt; tlb-&gt;max);</div><div class='del'>-	if (tlb-&gt;nr == tlb-&gt;max)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	if (__tlb_remove_page(tlb, page))</div><div class='del'>-		tlb_flush_mmu(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					  struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,</div><div class='del'>-	unsigned long addr)</div><div class='add'>+__pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	pgtable_page_dtor(pte);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM_LPAE</div><div class='del'>-	tlb_add_flush(tlb, addr);</div><div class='del'>-#else</div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With the classic ARM MMU, a pte page has two corresponding pmd</div><div class='ctx'> 	 * entries, each covering 1MB.</div><div class='ctx'> 	 */</div><div class='del'>-	addr &amp;= PMD_MASK;</div><div class='del'>-	tlb_add_flush(tlb, addr + SZ_1M - PAGE_SIZE);</div><div class='del'>-	tlb_add_flush(tlb, addr + SZ_1M);</div><div class='add'>+	addr = (addr &amp; PMD_MASK) + SZ_1M;</div><div class='add'>+	__tlb_adjust_range(tlb, addr - PAGE_SIZE, 2 * PAGE_SIZE);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	tlb_remove_entry(tlb, pte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,</div><div class='del'>-				  unsigned long addr)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_ARM_LPAE</div><div class='del'>-	tlb_add_flush(tlb, addr);</div><div class='del'>-	tlb_remove_entry(tlb, virt_to_page(pmdp));</div><div class='del'>-#endif</div><div class='add'>+	tlb_remove_table(tlb, pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	tlb_add_flush(tlb, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define pte_free_tlb(tlb, ptep, addr)	__pte_free_tlb(tlb, ptep, addr)</div><div class='del'>-#define pmd_free_tlb(tlb, pmdp, addr)	__pmd_free_tlb(tlb, pmdp, addr)</div><div class='del'>-#define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)-&gt;mm, pudp)</div><div class='del'>-</div><div class='del'>-#define tlb_migrate_finish(mm)		do { } while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='del'>-static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='del'>-						     unsigned int page_size)</div><div class='add'>+__pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_remove_tables(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	struct page *page = virt_to_page(pmdp);</div><div class='ctx'> </div><div class='del'>-static inline void tlb_flush_remove_tables_local(void *arg)</div><div class='del'>-{</div><div class='add'>+	tlb_remove_table(tlb, page);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='head'>diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild<br/>index 23b4464c0995..ce8573157774 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -3,3 +3,4 @@</div><div class='ctx'> generated-y += unistd-common.h</div><div class='ctx'> generated-y += unistd-oabi.h</div><div class='ctx'> generated-y += unistd-eabi.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='head'>diff --git a/arch/arm/include/uapi/asm/kvm_para.h b/arch/arm/include/uapi/asm/kvm_para.h<br/>deleted file mode 100644<br/>index baacc4996d18..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/include/uapi/asm/kvm_para.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/include/uapi/asm/kvm_para.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#include &lt;asm-generic/kvm_para.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S<br/>index c08d2d890f7b..b38bbd011b35 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kernel/head-nommu.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kernel/head-nommu.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kernel/head-nommu.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/kernel/head-nommu.S</a></div><div class='hunk'>@@ -133,9 +133,9 @@ __secondary_data:</div><div class='ctx'>  */</div><div class='ctx'> 	.text</div><div class='ctx'> __after_proc_init:</div><div class='del'>-#ifdef CONFIG_ARM_MPU</div><div class='ctx'> M_CLASS(movw	r12, #:lower16:BASEADDR_V7M_SCB)</div><div class='ctx'> M_CLASS(movt	r12, #:upper16:BASEADDR_V7M_SCB)</div><div class='add'>+#ifdef CONFIG_ARM_MPU</div><div class='ctx'> M_CLASS(ldr	r3, [r12, 0x50])</div><div class='ctx'> AR_CLASS(mrc	p15, 0, r3, c0, c1, 4)          @ Read ID_MMFR0</div><div class='ctx'> 	and	r3, r3, #(MMFR0_PMSA)           @ PMSA field</div><div class='head'>diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c<br/>index 76bb8de6bf6b..be5edfdde558 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kernel/signal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kernel/signal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/kernel/signal.c</a></div><div class='hunk'>@@ -549,8 +549,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Increment event counter and perform fixup for the pre-signal</div><div class='del'>-	 * frame.</div><div class='add'>+	 * Perform fixup for the pre-signal frame.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rseq_signal_deliver(ksig, regs);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c<br/>index a56e7c856ab5..86870f40f9a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/kernel/stacktrace.c</a></div><div class='hunk'>@@ -115,8 +115,6 @@ static noinline void __save_stack_trace(struct task_struct *tsk,</div><div class='ctx'> 		 * running on another CPU?  For now, ignore it as we</div><div class='ctx'> 		 * can't guarantee we won't explode.</div><div class='ctx'> 		 */</div><div class='del'>-		if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-			trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> 		return;</div><div class='ctx'> #else</div><div class='ctx'> 		frame.fp = thread_saved_fp(tsk);</div><div class='hunk'>@@ -134,8 +132,6 @@ static noinline void __save_stack_trace(struct task_struct *tsk,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	walk_stackframe(&amp;frame, save_trace, &amp;data);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)</div><div class='hunk'>@@ -153,8 +149,6 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)</div><div class='ctx'> 	frame.pc = regs-&gt;ARM_pc;</div><div class='ctx'> </div><div class='ctx'> 	walk_stackframe(&amp;frame, save_trace, &amp;data);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='head'>diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig<br/>index 3f5320f46de2..f591026347a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kvm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/kvm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/kvm/Kconfig</a></div><div class='hunk'>@@ -22,7 +22,6 @@ config KVM</div><div class='ctx'> 	bool "Kernel-based Virtual Machine (KVM) support"</div><div class='ctx'> 	depends on MMU &amp;&amp; OF</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select ARM_GIC_V3</div><div class='ctx'> 	select ARM_GIC_V3_ITS</div><div class='head'>diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c<br/>index 51e808adb00c..2a757dcaa1a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-at91/pm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-at91/pm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-at91/pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-at91/pm.c</a></div><div class='hunk'>@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");</div><div class='ctx'> 	if (!np)</div><div class='del'>-		goto securam_fail;</div><div class='add'>+		goto securam_fail_no_ref_dev;</div><div class='ctx'> </div><div class='ctx'> 	pdev = of_find_device_by_node(np);</div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> 	if (!pdev) {</div><div class='ctx'> 		pr_warn("%s: failed to find securam device!\n", __func__);</div><div class='del'>-		goto securam_fail;</div><div class='add'>+		goto securam_fail_no_ref_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sram_pool = gen_pool_get(&amp;pdev-&gt;dev, NULL);</div><div class='hunk'>@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> securam_fail:</div><div class='add'>+	put_device(&amp;pdev-&gt;dev);</div><div class='add'>+securam_fail_no_ref_dev:</div><div class='ctx'> 	iounmap(pm_data.sfrbu);</div><div class='ctx'> 	pm_data.sfrbu = NULL;</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c<br/>index 7d5a44a06648..f676592d8402 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-cns3xxx/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-cns3xxx/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-cns3xxx/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-cns3xxx/core.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ void __init cns3xxx_map_io(void)</div><div class='ctx'> /* used by entry-macro.S */</div><div class='ctx'> void __init cns3xxx_init_irq(void)</div><div class='ctx'> {</div><div class='del'>-	gic_init(0, 29, IOMEM(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),</div><div class='add'>+	gic_init(IOMEM(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),</div><div class='ctx'> 		 IOMEM(CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c<br/>index 8e89ec8b6f0f..34e18e9556d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/edb93xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/edb93xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/edb93xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-ep93xx/edb93xx.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/cs4271.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -105,13 +106,16 @@ static struct spi_board_info edb93xx_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int edb93xx_spi_chipselects[] __initdata = {</div><div class='del'>-	EP93XX_GPIO_LINE_EGPIO6,</div><div class='add'>+static struct gpiod_lookup_table edb93xx_spi_cs_gpio_table = {</div><div class='add'>+	.dev_id = "ep93xx-spi.0",</div><div class='add'>+	.table = {</div><div class='add'>+		GPIO_LOOKUP("A", 6, "cs", GPIO_ACTIVE_LOW),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ep93xx_spi_info edb93xx_spi_info __initdata = {</div><div class='del'>-	.chipselect	= edb93xx_spi_chipselects,</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(edb93xx_spi_chipselects),</div><div class='add'>+	/* Intentionally left blank */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init edb93xx_register_spi(void)</div><div class='hunk'>@@ -123,6 +127,7 @@ static void __init edb93xx_register_spi(void)</div><div class='ctx'> 	else if (machine_is_edb9315a())</div><div class='ctx'> 		edb93xx_cs4271_data.gpio_nreset = EP93XX_GPIO_LINE_EGPIO14;</div><div class='ctx'> </div><div class='add'>+	gpiod_add_lookup_table(&amp;edb93xx_spi_cs_gpio_table);</div><div class='ctx'> 	ep93xx_register_spi(&amp;edb93xx_spi_info, edb93xx_spi_board_info,</div><div class='ctx'> 			    ARRAY_SIZE(edb93xx_spi_board_info));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c<br/>index 80ccb984d521..f0f38c0dba52 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/simone.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/simone.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/simone.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-ep93xx/simone.c</a></div><div class='hunk'>@@ -77,13 +77,15 @@ static struct spi_board_info simone_spi_devices[] __initdata = {</div><div class='ctx'>  * low between multi-message command blocks. From v1.4, it uses a GPIO instead.</div><div class='ctx'>  * v1.3 parts will still work, since the signal on SFRMOUT is automatic.</div><div class='ctx'>  */</div><div class='del'>-static int simone_spi_chipselects[] __initdata = {</div><div class='del'>-	EP93XX_GPIO_LINE_EGPIO1,</div><div class='add'>+static struct gpiod_lookup_table simone_spi_cs_gpio_table = {</div><div class='add'>+	.dev_id = "ep93xx-spi.0",</div><div class='add'>+	.table = {</div><div class='add'>+		GPIO_LOOKUP("A", 1, "cs", GPIO_ACTIVE_LOW),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ep93xx_spi_info simone_spi_info __initdata = {</div><div class='del'>-	.chipselect	= simone_spi_chipselects,</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(simone_spi_chipselects),</div><div class='ctx'> 	.use_dma = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +115,7 @@ static void __init simone_init_machine(void)</div><div class='ctx'> 	ep93xx_register_i2c(simone_i2c_board_info,</div><div class='ctx'> 			    ARRAY_SIZE(simone_i2c_board_info));</div><div class='ctx'> 	gpiod_add_lookup_table(&amp;simone_mmc_spi_gpio_table);</div><div class='add'>+	gpiod_add_lookup_table(&amp;simone_spi_cs_gpio_table);</div><div class='ctx'> 	ep93xx_register_spi(&amp;simone_spi_info, simone_spi_devices,</div><div class='ctx'> 			    ARRAY_SIZE(simone_spi_devices));</div><div class='ctx'> 	simone_register_audio();</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c<br/>index 85b74ac943f0..a3a20c83c6b8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/ts72xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-ep93xx/ts72xx.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/spi/mmc_spi.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/spi-ep93xx.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/gpio-ep93xx.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -269,13 +270,15 @@ static struct spi_board_info bk3_spi_board_info[] __initdata = {</div><div class='ctx'>  * The all work is performed automatically by !SPI_FRAME (SFRM1) and</div><div class='ctx'>  * goes through CPLD</div><div class='ctx'>  */</div><div class='del'>-static int bk3_spi_chipselects[] __initdata = {</div><div class='del'>-	EP93XX_GPIO_LINE_F(3),</div><div class='add'>+static struct gpiod_lookup_table bk3_spi_cs_gpio_table = {</div><div class='add'>+	.dev_id = "ep93xx-spi.0",</div><div class='add'>+	.table = {</div><div class='add'>+		GPIO_LOOKUP("F", 3, "cs", GPIO_ACTIVE_LOW),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ep93xx_spi_info bk3_spi_master __initdata = {</div><div class='del'>-	.chipselect	= bk3_spi_chipselects,</div><div class='del'>-	.num_chipselect = ARRAY_SIZE(bk3_spi_chipselects),</div><div class='ctx'> 	.use_dma	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -316,13 +319,17 @@ static struct spi_board_info ts72xx_spi_devices[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ts72xx_spi_chipselects[] __initdata = {</div><div class='del'>-	EP93XX_GPIO_LINE_F(2),		/* DIO_17 */</div><div class='add'>+static struct gpiod_lookup_table ts72xx_spi_cs_gpio_table = {</div><div class='add'>+	.dev_id = "ep93xx-spi.0",</div><div class='add'>+	.table = {</div><div class='add'>+		/* DIO_17 */</div><div class='add'>+		GPIO_LOOKUP("F", 2, "cs", GPIO_ACTIVE_LOW),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ep93xx_spi_info ts72xx_spi_info __initdata = {</div><div class='del'>-	.chipselect	= ts72xx_spi_chipselects,</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_chipselects),</div><div class='add'>+	/* Intentionally left blank */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init ts72xx_init_machine(void)</div><div class='hunk'>@@ -339,6 +346,7 @@ static void __init ts72xx_init_machine(void)</div><div class='ctx'> 	if (board_is_ts7300())</div><div class='ctx'> 		platform_device_register(&amp;ts73xx_fpga_device);</div><div class='ctx'> #endif</div><div class='add'>+	gpiod_add_lookup_table(&amp;ts72xx_spi_cs_gpio_table);</div><div class='ctx'> 	ep93xx_register_spi(&amp;ts72xx_spi_info, ts72xx_spi_devices,</div><div class='ctx'> 			    ARRAY_SIZE(ts72xx_spi_devices));</div><div class='ctx'> }</div><div class='hunk'>@@ -398,6 +406,7 @@ static void __init bk3_init_machine(void)</div><div class='ctx'> </div><div class='ctx'> 	ep93xx_register_eth(&amp;ts72xx_eth_data, 1);</div><div class='ctx'> </div><div class='add'>+	gpiod_add_lookup_table(&amp;bk3_spi_cs_gpio_table);</div><div class='ctx'> 	ep93xx_register_spi(&amp;bk3_spi_master, bk3_spi_board_info,</div><div class='ctx'> 			    ARRAY_SIZE(bk3_spi_board_info));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c<br/>index 767ee64628dc..f95a644769e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/vision_ep9307.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-ep93xx/vision_ep9307.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-ep93xx/vision_ep9307.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-ep93xx/vision_ep9307.c</a></div><div class='hunk'>@@ -245,15 +245,17 @@ static struct spi_board_info vision_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vision_spi_chipselects[] __initdata = {</div><div class='del'>-	EP93XX_GPIO_LINE_EGPIO6,</div><div class='del'>-	EP93XX_GPIO_LINE_EGPIO7,</div><div class='del'>-	EP93XX_GPIO_LINE_G(2),</div><div class='add'>+static struct gpiod_lookup_table vision_spi_cs_gpio_table = {</div><div class='add'>+	.dev_id = "ep93xx-spi.0",</div><div class='add'>+	.table = {</div><div class='add'>+		GPIO_LOOKUP_IDX("A", 6, "cs", 0, GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP_IDX("A", 7, "cs", 1, GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP_IDX("G", 2, "cs", 2, GPIO_ACTIVE_LOW),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ep93xx_spi_info vision_spi_master __initdata = {</div><div class='del'>-	.chipselect	= vision_spi_chipselects,</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(vision_spi_chipselects),</div><div class='ctx'> 	.use_dma	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -295,6 +297,7 @@ static void __init vision_init_machine(void)</div><div class='ctx'> 	ep93xx_register_i2c(vision_i2c_info,</div><div class='ctx'> 				ARRAY_SIZE(vision_i2c_info));</div><div class='ctx'> 	gpiod_add_lookup_table(&amp;vision_spi_mmc_gpio_table);</div><div class='add'>+	gpiod_add_lookup_table(&amp;vision_spi_cs_gpio_table);</div><div class='ctx'> 	ep93xx_register_spi(&amp;vision_spi_master, vision_spi_board_info,</div><div class='ctx'> 				ARRAY_SIZE(vision_spi_board_info));</div><div class='ctx'> 	vision_register_i2s();</div><div class='head'>diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c<br/>index bfeb25aaf9a2..326e870d7123 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-imx/cpuidle-imx6q.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-imx/cpuidle-imx6q.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-imx/cpuidle-imx6q.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-imx/cpuidle-imx6q.c</a></div><div class='hunk'>@@ -16,30 +16,23 @@</div><div class='ctx'> #include "cpuidle.h"</div><div class='ctx'> #include "hardware.h"</div><div class='ctx'> </div><div class='del'>-static atomic_t master = ATOMIC_INIT(0);</div><div class='del'>-static DEFINE_SPINLOCK(master_lock);</div><div class='add'>+static int num_idle_cpus = 0;</div><div class='add'>+static DEFINE_SPINLOCK(cpuidle_lock);</div><div class='ctx'> </div><div class='ctx'> static int imx6q_enter_wait(struct cpuidle_device *dev,</div><div class='ctx'> 			    struct cpuidle_driver *drv, int index)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_inc_return(&amp;master) == num_online_cpus()) {</div><div class='del'>-		/*</div><div class='del'>-		 * With this lock, we prevent other cpu to exit and enter</div><div class='del'>-		 * this function again and become the master.</div><div class='del'>-		 */</div><div class='del'>-		if (!spin_trylock(&amp;master_lock))</div><div class='del'>-			goto idle;</div><div class='add'>+	spin_lock(&amp;cpuidle_lock);</div><div class='add'>+	if (++num_idle_cpus == num_online_cpus())</div><div class='ctx'> 		imx6_set_lpm(WAIT_UNCLOCKED);</div><div class='del'>-		cpu_do_idle();</div><div class='del'>-		imx6_set_lpm(WAIT_CLOCKED);</div><div class='del'>-		spin_unlock(&amp;master_lock);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='add'>+	spin_unlock(&amp;cpuidle_lock);</div><div class='ctx'> </div><div class='del'>-idle:</div><div class='ctx'> 	cpu_do_idle();</div><div class='del'>-done:</div><div class='del'>-	atomic_dec(&amp;master);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cpuidle_lock);</div><div class='add'>+	if (num_idle_cpus-- == num_online_cpus())</div><div class='add'>+		imx6_set_lpm(WAIT_CLOCKED);</div><div class='add'>+	spin_unlock(&amp;cpuidle_lock);</div><div class='ctx'> </div><div class='ctx'> 	return index;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c<br/>index c7169c2f94c4..08c7892866c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-imx/mach-imx51.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-imx/mach-imx51.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-imx/mach-imx51.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-imx/mach-imx51.c</a></div><div class='hunk'>@@ -59,6 +59,7 @@ static void __init imx51_m4if_setup(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	m4if_base = of_iomap(np, 0);</div><div class='add'>+	of_node_put(np);</div><div class='ctx'> 	if (!m4if_base) {</div><div class='ctx'> 		pr_err("Unable to map M4IF registers\n");</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c<br/>index 87f45b926c78..e67e0b2d4ce0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-imx/pm-imx6.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-imx/pm-imx6.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-imx/pm-imx6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-imx/pm-imx6.c</a></div><div class='hunk'>@@ -631,7 +631,7 @@ static void imx6_pm_stby_poweroff(void)</div><div class='ctx'> static int imx6_pm_stby_poweroff_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (pm_power_off) {</div><div class='del'>-		pr_warn("%s: pm_power_off already claimed  %p %pf!\n",</div><div class='add'>+		pr_warn("%s: pm_power_off already claimed  %p %ps!\n",</div><div class='ctx'> 			__func__, pm_power_off, pm_power_off);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c<br/>index 53c316f7301e..fe4932fda01d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-iop13xx/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-iop13xx/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-iop13xx/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-iop13xx/setup.c</a></div><div class='hunk'>@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);</div><div class='add'>+static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> static struct iop_adma_platform_data iop13xx_adma_0_data = {</div><div class='ctx'> 	.hw_id = 0,</div><div class='ctx'> 	.pool_size = PAGE_SIZE,</div><div class='hunk'>@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = {</div><div class='ctx'> 	.resource = iop13xx_adma_0_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask = &amp;iop13xx_adma_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data = (void *) &amp;iop13xx_adma_0_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = {</div><div class='ctx'> 	.resource = iop13xx_adma_1_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask = &amp;iop13xx_adma_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data = (void *) &amp;iop13xx_adma_1_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = {</div><div class='ctx'> 	.resource = iop13xx_adma_2_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask = &amp;iop13xx_adma_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data = (void *) &amp;iop13xx_adma_2_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c<br/>index db511ec2b1df..116feb6b261e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-iop13xx/tpmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-iop13xx/tpmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-iop13xx/tpmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-iop13xx/tpmi.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);</div><div class='add'>+u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);</div><div class='ctx'> static struct platform_device iop13xx_tpmi_0_device = {</div><div class='ctx'> 	.name = "iop-tpmi",</div><div class='ctx'> 	.id = 0,</div><div class='hunk'>@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = {</div><div class='ctx'> 	.resource = iop13xx_tpmi_0_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask          = &amp;iop13xx_tpmi_mask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = {</div><div class='ctx'> 	.resource = iop13xx_tpmi_1_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask          = &amp;iop13xx_tpmi_mask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = {</div><div class='ctx'> 	.resource = iop13xx_tpmi_2_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask          = &amp;iop13xx_tpmi_mask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = {</div><div class='ctx'> 	.resource = iop13xx_tpmi_3_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask          = &amp;iop13xx_tpmi_mask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-milbeaut/platsmp.c b/arch/arm/mach-milbeaut/platsmp.c<br/>index 591543c81399..3ea880f5fcb7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-milbeaut/platsmp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-milbeaut/platsmp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-milbeaut/platsmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-milbeaut/platsmp.c</a></div><div class='hunk'>@@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus)</div><div class='ctx'> 		writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> static void m10v_cpu_die(unsigned int l_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	gic_cpu_if_down(0);</div><div class='hunk'>@@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu)</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct smp_operations m10v_smp_ops __initdata = {</div><div class='ctx'> 	.smp_prepare_cpus	= m10v_smp_init,</div><div class='ctx'> 	.smp_boot_secondary	= m10v_boot_secondary,</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	.cpu_die		= m10v_cpu_die,</div><div class='ctx'> 	.cpu_kill		= m10v_cpu_kill,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &amp;m10v_smp_ops);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c<br/>index 0aa88105d46e..9b5f4d665374 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-mvebu/kirkwood.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-mvebu/kirkwood.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-mvebu/kirkwood.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-mvebu/kirkwood.c</a></div><div class='hunk'>@@ -92,7 +92,8 @@ static void __init kirkwood_dt_eth_fixup(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* skip disabled nodes or nodes with valid MAC address*/</div><div class='del'>-		if (!of_device_is_available(pnp) || of_get_mac_address(np))</div><div class='add'>+		if (!of_device_is_available(pnp) ||</div><div class='add'>+		    !IS_ERR(of_get_mac_address(np)))</div><div class='ctx'> 			goto eth_fixup_skip;</div><div class='ctx'> </div><div class='ctx'> 		clk = of_clk_get(pnp, 0);</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c<br/>index be30c3c061b4..1b15d593837e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-omap1/board-ams-delta.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-omap1/board-ams-delta.c</a></div><div class='hunk'>@@ -182,6 +182,7 @@ static struct resource latch1_resources[] = {</div><div class='ctx'> </div><div class='ctx'> static struct bgpio_pdata latch1_pdata = {</div><div class='ctx'> 	.label	= LATCH1_LABEL,</div><div class='add'>+	.base	= -1,</div><div class='ctx'> 	.ngpio	= LATCH1_NGPIO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -219,6 +220,7 @@ static struct resource latch2_resources[] = {</div><div class='ctx'> </div><div class='ctx'> static struct bgpio_pdata latch2_pdata = {</div><div class='ctx'> 	.label	= LATCH2_LABEL,</div><div class='add'>+	.base	= -1,</div><div class='ctx'> 	.ngpio	= LATCH2_NGPIO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c<br/>index 1444b4b4bd9f..439e143cad7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-omap2/display.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mach-omap2/display.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mach-omap2/display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mach-omap2/display.c</a></div><div class='hunk'>@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void)</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!of_device_is_available(node))</div><div class='add'>+	if (!of_device_is_available(node)) {</div><div class='add'>+		of_node_put(node);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pdev = of_find_device_by_node(node);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c<br/>index b54f8f8def36..e376883ab35b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mm/alignment.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/mm/alignment.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/mm/alignment.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/mm/alignment.c</a></div><div class='hunk'>@@ -133,7 +133,7 @@ static const char *usermode_action[] = {</div><div class='ctx'> static int alignment_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m, "User:\t\t%lu\n", ai_user);</div><div class='del'>-	seq_printf(m, "System:\t\t%lu (%pF)\n", ai_sys, ai_sys_last_pc);</div><div class='add'>+	seq_printf(m, "System:\t\t%lu (%pS)\n", ai_sys, ai_sys_last_pc);</div><div class='ctx'> 	seq_printf(m, "Skipped:\t%lu\n", ai_skipped);</div><div class='ctx'> 	seq_printf(m, "Half:\t\t%lu\n", ai_half);</div><div class='ctx'> 	seq_printf(m, "Word:\t\t%lu\n", ai_word);</div><div class='head'>diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c<br/>index 1365e8650843..ee34c76e6624 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/nwfpe/fpmodule.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/nwfpe/fpmodule.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/nwfpe/fpmodule.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/nwfpe/fpmodule.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ void float_raise(signed char flags)</div><div class='ctx'> #ifdef CONFIG_DEBUG_USER</div><div class='ctx'> 	if (flags &amp; debug)</div><div class='ctx'>  		printk(KERN_DEBUG</div><div class='del'>-		       "NWFPE: %s[%d] takes exception %08x at %pf from %08lx\n",</div><div class='add'>+		       "NWFPE: %s[%d] takes exception %08x at %ps from %08lx\n",</div><div class='ctx'> 		       current-&gt;comm, current-&gt;pid, flags,</div><div class='ctx'> 		       __builtin_return_address(0), GET_USERREG()-&gt;ARM_pc);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c<br/>index a4d1f8de3b5b..d9612221e484 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/plat-iop/adma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/plat-iop/adma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/plat-iop/adma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/plat-iop/adma.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = {</div><div class='ctx'> 	.resource = iop3xx_dma_0_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask = &amp;iop3xx_adma_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data = (void *) &amp;iop3xx_dma_0_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = {</div><div class='ctx'> 	.resource = iop3xx_dma_1_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask = &amp;iop3xx_adma_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data = (void *) &amp;iop3xx_dma_1_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = {</div><div class='ctx'> 	.resource = iop3xx_aau_resources,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask = &amp;iop3xx_adma_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data = (void *) &amp;iop3xx_aau_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c<br/>index d4012d6c0dcb..5ca4c5fd627a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/plat-omap/dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/plat-omap/dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/plat-omap/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/plat-omap/dma.c</a></div><div class='hunk'>@@ -1449,7 +1449,6 @@ static void __exit omap_system_dma_exit(void)</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("OMAP SYSTEM DMA DRIVER");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='ctx'> MODULE_AUTHOR("Texas Instruments Inc");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c<br/>index a6c81ce00f52..8647cb80a93b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/plat-orion/common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/plat-orion/common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/plat-orion/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/plat-orion/common.c</a></div><div class='hunk'>@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = {</div><div class='ctx'> 	.resource	= orion_xor0_shared_resources,</div><div class='ctx'> 	.dev            = {</div><div class='ctx'> 		.dma_mask               = &amp;orion_xor_dmamask,</div><div class='del'>-		.coherent_dma_mask      = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask      = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data          = &amp;orion_xor0_pdata,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = {</div><div class='ctx'> 	.resource	= orion_xor1_shared_resources,</div><div class='ctx'> 	.dev            = {</div><div class='ctx'> 		.dma_mask               = &amp;orion_xor_dmamask,</div><div class='del'>-		.coherent_dma_mask      = DMA_BIT_MASK(64),</div><div class='add'>+		.coherent_dma_mask      = DMA_BIT_MASK(32),</div><div class='ctx'> 		.platform_data          = &amp;orion_xor1_pdata,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl<br/>index 9016f4081bb9..0393917eaa57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/tools/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/tools/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/tools/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/tools/syscall.tbl</a></div><div class='hunk'>@@ -437,3 +437,7 @@</div><div class='ctx'> 421	common	rt_sigtimedwait_time64		sys_rt_sigtimedwait</div><div class='ctx'> 422	common	futex_time64			sys_futex</div><div class='ctx'> 423	common	sched_rr_get_interval_time64	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c<br/>index a9dd619c6c29..7bdbf5d5c47d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/vdso/vgettimeofday.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm/vdso/vgettimeofday.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm/vdso/vgettimeofday.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm/vdso/vgettimeofday.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;asm/arch_timer.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='add'>+#include &lt;asm/cp15.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/vdso_datapage.h&gt;</div><div class='hunk'>@@ -123,7 +123,8 @@ static notrace u64 get_ns(struct vdso_data *vdata)</div><div class='ctx'> 	u64 cycle_now;</div><div class='ctx'> 	u64 nsec;</div><div class='ctx'> </div><div class='del'>-	cycle_now = arch_counter_get_cntvct();</div><div class='add'>+	isb();</div><div class='add'>+	cycle_now = read_sysreg(CNTVCT);</div><div class='ctx'> </div><div class='ctx'> 	cycle_delta = (cycle_now - vdata-&gt;cs_cycle_last) &amp; vdata-&gt;cs_mask;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig<br/>index 117b2541ef3d..df350f4e1e7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/Kconfig</a></div><div class='hunk'>@@ -90,6 +90,7 @@ config ARM64</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS_BROADCAST</div><div class='ctx'> 	select GENERIC_CPU_AUTOPROBE</div><div class='add'>+	select GENERIC_CPU_VULNERABILITIES</div><div class='ctx'> 	select GENERIC_EARLY_IOREMAP</div><div class='ctx'> 	select GENERIC_IDLE_POLL_SETUP</div><div class='ctx'> 	select GENERIC_IRQ_MULTI_HANDLER</div><div class='hunk'>@@ -148,8 +149,8 @@ config ARM64</div><div class='ctx'> 	select HAVE_PERF_REGS</div><div class='ctx'> 	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='add'>+	select HAVE_FUNCTION_ARG_ACCESS_API</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE</div><div class='del'>-	select HAVE_RCU_TABLE_INVALIDATE</div><div class='ctx'> 	select HAVE_RSEQ</div><div class='ctx'> 	select HAVE_STACKPROTECTOR</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='hunk'>@@ -159,7 +160,6 @@ config ARM64</div><div class='ctx'> 	select IRQ_DOMAIN</div><div class='ctx'> 	select IRQ_FORCED_THREADING</div><div class='ctx'> 	select MODULES_USE_ELF_RELA</div><div class='del'>-	select MULTI_IRQ_HANDLER</div><div class='ctx'> 	select NEED_DMA_MAP_STATE</div><div class='ctx'> 	select NEED_SG_DMA_LENGTH</div><div class='ctx'> 	select OF</div><div class='hunk'>@@ -238,9 +238,6 @@ config LOCKDEP_SUPPORT</div><div class='ctx'> config TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_BUG</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on BUG</div><div class='hunk'>@@ -298,7 +295,7 @@ menu "Kernel Features"</div><div class='ctx'> menu "ARM errata workarounds via the alternatives framework"</div><div class='ctx'> </div><div class='ctx'> config ARM64_WORKAROUND_CLEAN_CACHE</div><div class='del'>-	def_bool n</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config ARM64_ERRATUM_826319</div><div class='ctx'> 	bool "Cortex-A53: 826319: System might deadlock if a write cannot complete until read data is accepted"</div><div class='hunk'>@@ -465,26 +462,28 @@ config ARM64_ERRATUM_1024718</div><div class='ctx'> 	bool "Cortex-A55: 1024718: Update of DBM/AP bits without break before make might result in incorrect update"</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  This option adds work around for Arm Cortex-A55 Erratum 1024718.</div><div class='add'>+	  This option adds a workaround for ARM Cortex-A55 Erratum 1024718.</div><div class='ctx'> </div><div class='ctx'> 	  Affected Cortex-A55 cores (r0p0, r0p1, r1p0) could cause incorrect</div><div class='ctx'> 	  update of the hardware dirty bit when the DBM/AP bits are updated</div><div class='del'>-	  without a break-before-make. The work around is to disable the usage</div><div class='add'>+	  without a break-before-make. The workaround is to disable the usage</div><div class='ctx'> 	  of hardware DBM locally on the affected cores. CPUs not affected by</div><div class='del'>-	  erratum will continue to use the feature.</div><div class='add'>+	  this erratum will continue to use the feature.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config ARM64_ERRATUM_1188873</div><div class='del'>-	bool "Cortex-A76: MRC read following MRRC read of specific Generic Timer in AArch32 might give incorrect result"</div><div class='add'>+	bool "Cortex-A76/Neoverse-N1: MRC read following MRRC read of specific Generic Timer in AArch32 might give incorrect result"</div><div class='ctx'> 	default y</div><div class='add'>+	depends on COMPAT</div><div class='ctx'> 	select ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='ctx'> 	help</div><div class='del'>-	  This option adds work arounds for ARM Cortex-A76 erratum 1188873</div><div class='add'>+	  This option adds a workaround for ARM Cortex-A76/Neoverse-N1</div><div class='add'>+	  erratum 1188873.</div><div class='ctx'> </div><div class='del'>-	  Affected Cortex-A76 cores (r0p0, r1p0, r2p0) could cause</div><div class='del'>-	  register corruption when accessing the timer registers from</div><div class='del'>-	  AArch32 userspace.</div><div class='add'>+	  Affected Cortex-A76/Neoverse-N1 cores (r0p0, r1p0, r2p0) could</div><div class='add'>+	  cause register corruption when accessing the timer registers</div><div class='add'>+	  from AArch32 userspace.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -492,7 +491,7 @@ config ARM64_ERRATUM_1165522</div><div class='ctx'> 	bool "Cortex-A76: Speculative AT instruction using out-of-context translation regime could cause subsequent request to generate an incorrect translation"</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  This option adds work arounds for ARM Cortex-A76 erratum 1165522</div><div class='add'>+	  This option adds a workaround for ARM Cortex-A76 erratum 1165522.</div><div class='ctx'> </div><div class='ctx'> 	  Affected Cortex-A76 cores (r0p0, r1p0, r2p0) could end-up with</div><div class='ctx'> 	  corrupted TLBs by speculating an AT instruction during a guest</div><div class='hunk'>@@ -505,7 +504,7 @@ config ARM64_ERRATUM_1286807</div><div class='ctx'> 	default y</div><div class='ctx'> 	select ARM64_WORKAROUND_REPEAT_TLBI</div><div class='ctx'> 	help</div><div class='del'>-	  This option adds workaround for ARM Cortex-A76 erratum 1286807</div><div class='add'>+	  This option adds a workaround for ARM Cortex-A76 erratum 1286807.</div><div class='ctx'> </div><div class='ctx'> 	  On the affected Cortex-A76 cores (r0p0 to r3p0), if a virtual</div><div class='ctx'> 	  address for a cacheable mapping of a location is being</div><div class='hunk'>@@ -522,10 +521,10 @@ config CAVIUM_ERRATUM_22375</div><div class='ctx'> 	bool "Cavium erratum 22375, 24313"</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Enable workaround for erratum 22375, 24313.</div><div class='add'>+	  Enable workaround for errata 22375 and 24313.</div><div class='ctx'> </div><div class='ctx'> 	  This implements two gicv3-its errata workarounds for ThunderX. Both</div><div class='del'>-	  with small impact affecting only ITS table allocation.</div><div class='add'>+	  with a small impact affecting only ITS table allocation.</div><div class='ctx'> </div><div class='ctx'> 	    erratum 22375: only alloc 8MB table size</div><div class='ctx'> 	    erratum 24313: ignore memory access type</div><div class='hunk'>@@ -589,9 +588,6 @@ config QCOM_FALKOR_ERRATUM_1003</div><div class='ctx'> </div><div class='ctx'> config ARM64_WORKAROUND_REPEAT_TLBI</div><div class='ctx'> 	bool</div><div class='del'>-	help</div><div class='del'>-	  Enable the repeat TLBI workaround for Falkor erratum 1009 and</div><div class='del'>-	  Cortex-A76 erratum 1286807.</div><div class='ctx'> </div><div class='ctx'> config QCOM_FALKOR_ERRATUM_1009</div><div class='ctx'> 	bool "Falkor E1009: Prematurely complete a DSB after a TLBI"</div><div class='hunk'>@@ -627,7 +623,7 @@ config HISILICON_ERRATUM_161600802</div><div class='ctx'> 	bool "Hip07 161600802: Erroneous redistributor VLPI base"</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  The HiSilicon Hip07 SoC usees the wrong redistributor base</div><div class='add'>+	  The HiSilicon Hip07 SoC uses the wrong redistributor base</div><div class='ctx'> 	  when issued ITS commands such as VMOVP and VMAPP, and requires</div><div class='ctx'> 	  a 128kB offset to be applied to the target address in this commands.</div><div class='ctx'> </div><div class='hunk'>@@ -647,7 +643,7 @@ config FUJITSU_ERRATUM_010001</div><div class='ctx'> 	bool "Fujitsu-A64FX erratum E#010001: Undefined fault may occur wrongly"</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  This option adds workaround for Fujitsu-A64FX erratum E#010001.</div><div class='add'>+	  This option adds a workaround for Fujitsu-A64FX erratum E#010001.</div><div class='ctx'> 	  On some variants of the Fujitsu-A64FX cores ver(1.0, 1.1), memory</div><div class='ctx'> 	  accesses may cause undefined fault (Data abort, DFSC=0b111111).</div><div class='ctx'> 	  This fault occurs under a specific hardware condition when a</div><div class='hunk'>@@ -658,7 +654,7 @@ config FUJITSU_ERRATUM_010001</div><div class='ctx'> 	  case-4  TTBR1_EL2 with TCR_EL2.NFD1 == 1.</div><div class='ctx'> </div><div class='ctx'> 	  The workaround is to ensure these bits are clear in TCR_ELx.</div><div class='del'>-	  The workaround only affect the Fujitsu-A64FX.</div><div class='add'>+	  The workaround only affects the Fujitsu-A64FX.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -890,6 +886,9 @@ config ARCH_WANT_HUGE_PMD_SHARE</div><div class='ctx'> config ARCH_HAS_CACHE_LINE_SIZE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='add'>+config ARCH_ENABLE_SPLIT_PMD_PTLOCK</div><div class='add'>+	def_bool y if PGTABLE_LEVELS &gt; 2</div><div class='add'>+</div><div class='ctx'> config SECCOMP</div><div class='ctx'> 	bool "Enable seccomp to safely compute untrusted bytecode"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -1079,9 +1078,65 @@ config RODATA_FULL_DEFAULT_ENABLED</div><div class='ctx'> 	  This requires the linear region to be mapped down to pages,</div><div class='ctx'> 	  which may adversely affect performance in some cases.</div><div class='ctx'> </div><div class='add'>+config ARM64_SW_TTBR0_PAN</div><div class='add'>+	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"</div><div class='add'>+	help</div><div class='add'>+	  Enabling this option prevents the kernel from accessing</div><div class='add'>+	  user-space memory directly by pointing TTBR0_EL1 to a reserved</div><div class='add'>+	  zeroed area and reserved ASID. The user access routines</div><div class='add'>+	  restore the valid TTBR0_EL1 temporarily.</div><div class='add'>+</div><div class='add'>+menuconfig COMPAT</div><div class='add'>+	bool "Kernel support for 32-bit EL0"</div><div class='add'>+	depends on ARM64_4K_PAGES || EXPERT</div><div class='add'>+	select COMPAT_BINFMT_ELF if BINFMT_ELF</div><div class='add'>+	select HAVE_UID16</div><div class='add'>+	select OLD_SIGSUSPEND3</div><div class='add'>+	select COMPAT_OLD_SIGACTION</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for a 32-bit EL0 running under a 64-bit</div><div class='add'>+	  kernel at EL1. AArch32-specific components such as system calls,</div><div class='add'>+	  the user helper functions, VFP support and the ptrace interface are</div><div class='add'>+	  handled appropriately by the kernel.</div><div class='add'>+</div><div class='add'>+	  If you use a page size other than 4KB (i.e, 16KB or 64KB), please be aware</div><div class='add'>+	  that you will only be able to execute AArch32 binaries that were compiled</div><div class='add'>+	  with page size aligned segments.</div><div class='add'>+</div><div class='add'>+	  If you want to execute 32-bit userspace applications, say Y.</div><div class='add'>+</div><div class='add'>+if COMPAT</div><div class='add'>+</div><div class='add'>+config KUSER_HELPERS</div><div class='add'>+	bool "Enable kuser helpers page for 32 bit applications"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Warning: disabling this option may break 32-bit user programs.</div><div class='add'>+</div><div class='add'>+	  Provide kuser helpers to compat tasks. The kernel provides</div><div class='add'>+	  helper code to userspace in read only form at a fixed location</div><div class='add'>+	  to allow userspace to be independent of the CPU type fitted to</div><div class='add'>+	  the system. This permits binaries to be run on ARMv4 through</div><div class='add'>+	  to ARMv8 without modification.</div><div class='add'>+</div><div class='add'>+	  See Documentation/arm/kernel_user_helpers.txt for details.</div><div class='add'>+</div><div class='add'>+	  However, the fixed address nature of these helpers can be used</div><div class='add'>+	  by ROP (return orientated programming) authors when creating</div><div class='add'>+	  exploits.</div><div class='add'>+</div><div class='add'>+	  If all of the binaries and libraries which run on your platform</div><div class='add'>+	  are built specifically for your platform, and make no use of</div><div class='add'>+	  these helpers, then you can turn this option off to hinder</div><div class='add'>+	  such exploits. However, in that case, if a binary or library</div><div class='add'>+	  relying on those helpers is run, it will not function correctly.</div><div class='add'>+</div><div class='add'>+	  Say N here only if you are absolutely certain that you do not</div><div class='add'>+	  need these helpers; otherwise, the safe option is to say Y.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> menuconfig ARMV8_DEPRECATED</div><div class='ctx'> 	bool "Emulate deprecated/obsolete ARMv8 instructions"</div><div class='del'>-	depends on COMPAT</div><div class='ctx'> 	depends on SYSCTL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Legacy software support may require certain instructions</div><div class='hunk'>@@ -1147,13 +1202,7 @@ config SETEND_EMULATION</div><div class='ctx'> 	  If unsure, say Y</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-config ARM64_SW_TTBR0_PAN</div><div class='del'>-	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"</div><div class='del'>-	help</div><div class='del'>-	  Enabling this option prevents the kernel from accessing</div><div class='del'>-	  user-space memory directly by pointing TTBR0_EL1 to a reserved</div><div class='del'>-	  zeroed area and reserved ASID. The user access routines</div><div class='del'>-	  restore the valid TTBR0_EL1 temporarily.</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> menu "ARMv8.1 architectural features"</div><div class='ctx'> </div><div class='hunk'>@@ -1319,6 +1368,9 @@ config ARM64_SVE</div><div class='ctx'> </div><div class='ctx'> 	  To enable use of this extension on CPUs that implement it, say Y.</div><div class='ctx'> </div><div class='add'>+	  On CPUs that support the SVE2 extensions, this option will enable</div><div class='add'>+	  those too.</div><div class='add'>+</div><div class='ctx'> 	  Note that for architectural reasons, firmware _must_ implement SVE</div><div class='ctx'> 	  support when running on SVE capable hardware.  The required support</div><div class='ctx'> 	  is present in:</div><div class='hunk'>@@ -1352,7 +1404,7 @@ config ARM64_PSEUDO_NMI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Adds support for mimicking Non-Maskable Interrupts through the use of</div><div class='ctx'> 	  GIC interrupt priority. This support requires version 3 or later of</div><div class='del'>-	  Arm GIC.</div><div class='add'>+	  ARM GIC.</div><div class='ctx'> </div><div class='ctx'> 	  This high priority configuration for interrupts needs to be</div><div class='ctx'> 	  explicitly enabled by setting the kernel parameter</div><div class='hunk'>@@ -1476,25 +1528,6 @@ config DMI</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-config COMPAT</div><div class='del'>-	bool "Kernel support for 32-bit EL0"</div><div class='del'>-	depends on ARM64_4K_PAGES || EXPERT</div><div class='del'>-	select COMPAT_BINFMT_ELF if BINFMT_ELF</div><div class='del'>-	select HAVE_UID16</div><div class='del'>-	select OLD_SIGSUSPEND3</div><div class='del'>-	select COMPAT_OLD_SIGACTION</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for a 32-bit EL0 running under a 64-bit</div><div class='del'>-	  kernel at EL1. AArch32-specific components such as system calls,</div><div class='del'>-	  the user helper functions, VFP support and the ptrace interface are</div><div class='del'>-	  handled appropriately by the kernel.</div><div class='del'>-</div><div class='del'>-	  If you use a page size other than 4KB (i.e, 16KB or 64KB), please be aware</div><div class='del'>-	  that you will only be able to execute AArch32 binaries that were compiled</div><div class='del'>-	  with page size aligned segments.</div><div class='del'>-</div><div class='del'>-	  If you want to execute 32-bit userspace applications, say Y.</div><div class='del'>-</div><div class='ctx'> config SYSVIPC_COMPAT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on COMPAT &amp;&amp; SYSVIPC</div><div class='head'>diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms<br/>index 70498a033cf5..b5ca9c50876d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/Kconfig.platforms?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/Kconfig.platforms</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/Kconfig.platforms?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/Kconfig.platforms</a></div><div class='hunk'>@@ -27,6 +27,7 @@ config ARCH_BCM2835</div><div class='ctx'> 	bool "Broadcom BCM2835 family"</div><div class='ctx'> 	select TIMER_OF</div><div class='ctx'> 	select GPIOLIB</div><div class='add'>+	select MFD_CORE</div><div class='ctx'> 	select PINCTRL</div><div class='ctx'> 	select PINCTRL_BCM2835</div><div class='ctx'> 	select ARM_AMBA</div><div class='head'>diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi<br/>index 7c649f6b14cb..a2cec6218211 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi</a></div><div class='hunk'>@@ -162,6 +162,7 @@</div><div class='ctx'> 			rx-fifo-depth = &lt;16384&gt;;</div><div class='ctx'> 			snps,multicast-filter-bins = &lt;256&gt;;</div><div class='ctx'> 			iommus = &lt;&amp;smmu 1&gt;;</div><div class='add'>+			altr,sysmgr-syscon = &lt;&amp;sysmgr 0x44 0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -179,6 +180,7 @@</div><div class='ctx'> 			rx-fifo-depth = &lt;16384&gt;;</div><div class='ctx'> 			snps,multicast-filter-bins = &lt;256&gt;;</div><div class='ctx'> 			iommus = &lt;&amp;smmu 2&gt;;</div><div class='add'>+			altr,sysmgr-syscon = &lt;&amp;sysmgr 0x48 0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -196,6 +198,7 @@</div><div class='ctx'> 			rx-fifo-depth = &lt;16384&gt;;</div><div class='ctx'> 			snps,multicast-filter-bins = &lt;256&gt;;</div><div class='ctx'> 			iommus = &lt;&amp;smmu 3&gt;;</div><div class='add'>+			altr,sysmgr-syscon = &lt;&amp;sysmgr 0x4c 0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -531,11 +534,12 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		eccmgr {</div><div class='del'>-			compatible = "altr,socfpga-a10-ecc-manager";</div><div class='add'>+			compatible = "altr,socfpga-s10-ecc-manager",</div><div class='add'>+				     "altr,socfpga-a10-ecc-manager";</div><div class='ctx'> 			altr,sysmgr-syscon = &lt;&amp;sysmgr&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='del'>-			interrupts = &lt;0 15 4&gt;, &lt;0 95 4&gt;;</div><div class='add'>+			interrupts = &lt;0 15 4&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 			ranges;</div><div class='hunk'>@@ -543,31 +547,31 @@</div><div class='ctx'> 			sdramedac {</div><div class='ctx'> 				compatible = "altr,sdram-edac-s10";</div><div class='ctx'> 				altr,sdr-syscon = &lt;&amp;sdr&gt;;</div><div class='del'>-				interrupts = &lt;16 4&gt;, &lt;48 4&gt;;</div><div class='add'>+				interrupts = &lt;16 4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			usb0-ecc@ff8c4000 {</div><div class='del'>-				compatible = "altr,socfpga-usb-ecc";</div><div class='add'>+				compatible = "altr,socfpga-s10-usb-ecc",</div><div class='add'>+					     "altr,socfpga-usb-ecc";</div><div class='ctx'> 				reg = &lt;0xff8c4000 0x100&gt;;</div><div class='ctx'> 				altr,ecc-parent = &lt;&amp;usb0&gt;;</div><div class='del'>-				interrupts = &lt;2 4&gt;,</div><div class='del'>-					     &lt;34 4&gt;;</div><div class='add'>+				interrupts = &lt;2 4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			emac0-rx-ecc@ff8c0000 {</div><div class='del'>-				compatible = "altr,socfpga-eth-mac-ecc";</div><div class='add'>+				compatible = "altr,socfpga-s10-eth-mac-ecc",</div><div class='add'>+					     "altr,socfpga-eth-mac-ecc";</div><div class='ctx'> 				reg = &lt;0xff8c0000 0x100&gt;;</div><div class='ctx'> 				altr,ecc-parent = &lt;&amp;gmac0&gt;;</div><div class='del'>-				interrupts = &lt;4 4&gt;,</div><div class='del'>-					     &lt;36 4&gt;;</div><div class='add'>+				interrupts = &lt;4 4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			emac0-tx-ecc@ff8c0400 {</div><div class='del'>-				compatible = "altr,socfpga-eth-mac-ecc";</div><div class='add'>+				compatible = "altr,socfpga-s10-eth-mac-ecc",</div><div class='add'>+					     "altr,socfpga-eth-mac-ecc";</div><div class='ctx'> 				reg = &lt;0xff8c0400 0x100&gt;;</div><div class='ctx'> 				altr,ecc-parent = &lt;&amp;gmac0&gt;;</div><div class='del'>-				interrupts = &lt;5 4&gt;,</div><div class='del'>-					     &lt;37 4&gt;;</div><div class='add'>+				interrupts = &lt;5 4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h b/arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h<br/>index 1b4cb0c55744..385c455a7c98 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/mediatek/mt2712-pinfunc.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 (C) 2018 MediaTek Inc.</div><div class='ctx'>  * Author: Zhiyong Tao &lt;zhiyong.tao@mediatek.com&gt;</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi<br/>index bb2045be8814..97aeb946ed5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/nvidia/tegra186.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/nvidia/tegra186.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/nvidia/tegra186.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/nvidia/tegra186.dtsi</a></div><div class='hunk'>@@ -321,7 +321,6 @@</div><div class='ctx'> 		nvidia,default-trim = &lt;0x9&gt;;</div><div class='ctx'> 		nvidia,dqs-trim = &lt;63&gt;;</div><div class='ctx'> 		mmc-hs400-1_8v;</div><div class='del'>-		supports-cqe;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi<br/>index 61a0afb74e63..1ea684af99c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/renesas/r8a774c0.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/renesas/r8a774c0.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/renesas/r8a774c0.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/renesas/r8a774c0.dtsi</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Device Tree Source for the RZ/G2E (R8A774C0) SoC</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2018 Renesas Electronics Corp.</div><div class='add'>+ * Copyright (C) 2018-2019 Renesas Electronics Corp.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/r8a774c0-cpg-mssr.h&gt;</div><div class='hunk'>@@ -1150,9 +1150,8 @@</div><div class='ctx'> 				 &lt;&amp;cpg CPG_CORE R8A774C0_CLK_S3D1C&gt;,</div><div class='ctx'> 				 &lt;&amp;scif_clk&gt;;</div><div class='ctx'> 			clock-names = "fck", "brg_int", "scif_clk";</div><div class='del'>-			dmas = &lt;&amp;dmac1 0x5b&gt;, &lt;&amp;dmac1 0x5a&gt;,</div><div class='del'>-			       &lt;&amp;dmac2 0x5b&gt;, &lt;&amp;dmac2 0x5a&gt;;</div><div class='del'>-			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x5b&gt;, &lt;&amp;dmac0 0x5a&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A774C0_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 			resets = &lt;&amp;cpg 202&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi<br/>index a69faa60ea4d..d2ad665fe2d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/renesas/r8a77990.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/renesas/r8a77990.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/renesas/r8a77990.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/renesas/r8a77990.dtsi</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Device Tree Source for the R-Car E3 (R8A77990) SoC</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2018 Renesas Electronics Corp.</div><div class='add'>+ * Copyright (C) 2018-2019 Renesas Electronics Corp.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/r8a77990-cpg-mssr.h&gt;</div><div class='hunk'>@@ -1067,9 +1067,8 @@</div><div class='ctx'> 				 &lt;&amp;cpg CPG_CORE R8A77990_CLK_S3D1C&gt;,</div><div class='ctx'> 				 &lt;&amp;scif_clk&gt;;</div><div class='ctx'> 			clock-names = "fck", "brg_int", "scif_clk";</div><div class='del'>-			dmas = &lt;&amp;dmac1 0x5b&gt;, &lt;&amp;dmac1 0x5a&gt;,</div><div class='del'>-			       &lt;&amp;dmac2 0x5b&gt;, &lt;&amp;dmac2 0x5a&gt;;</div><div class='del'>-			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x5b&gt;, &lt;&amp;dmac0 0x5a&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A77990_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 			resets = &lt;&amp;cpg 202&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts<br/>index 33c44e857247..0e34354b2092 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts</a></div><div class='hunk'>@@ -108,8 +108,8 @@</div><div class='ctx'> 	snps,reset-gpio = &lt;&amp;gpio1 RK_PC2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 50000&gt;;</div><div class='del'>-	tx_delay = &lt;0x25&gt;;</div><div class='del'>-	rx_delay = &lt;0x11&gt;;</div><div class='add'>+	tx_delay = &lt;0x24&gt;;</div><div class='add'>+	rx_delay = &lt;0x18&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts<br/>index 2157a528276b..79b4d1d4b5d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3328-rock64.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/rockchip/rk3328-rock64.dts</a></div><div class='hunk'>@@ -46,8 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 RK_PA2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;usb20_host_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host1_5v";</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi<br/>index 84f14b132e8f..dabef1a21649 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3328.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3328.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3328.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/rockchip/rk3328.dtsi</a></div><div class='hunk'>@@ -1445,11 +1445,11 @@</div><div class='ctx'> </div><div class='ctx'> 		sdmmc0 {</div><div class='ctx'> 			sdmmc0_clk: sdmmc0-clk {</div><div class='del'>-				rockchip,pins = &lt;1 RK_PA6 1 &amp;pcfg_pull_none_4ma&gt;;</div><div class='add'>+				rockchip,pins = &lt;1 RK_PA6 1 &amp;pcfg_pull_none_8ma&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			sdmmc0_cmd: sdmmc0-cmd {</div><div class='del'>-				rockchip,pins = &lt;1 RK_PA4 1 &amp;pcfg_pull_up_4ma&gt;;</div><div class='add'>+				rockchip,pins = &lt;1 RK_PA4 1 &amp;pcfg_pull_up_8ma&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			sdmmc0_dectn: sdmmc0-dectn {</div><div class='hunk'>@@ -1461,14 +1461,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			sdmmc0_bus1: sdmmc0-bus1 {</div><div class='del'>-				rockchip,pins = &lt;1 RK_PA0 1 &amp;pcfg_pull_up_4ma&gt;;</div><div class='add'>+				rockchip,pins = &lt;1 RK_PA0 1 &amp;pcfg_pull_up_8ma&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			sdmmc0_bus4: sdmmc0-bus4 {</div><div class='del'>-				rockchip,pins = &lt;1 RK_PA0 1 &amp;pcfg_pull_up_4ma&gt;,</div><div class='del'>-						&lt;1 RK_PA1 1 &amp;pcfg_pull_up_4ma&gt;,</div><div class='del'>-						&lt;1 RK_PA2 1 &amp;pcfg_pull_up_4ma&gt;,</div><div class='del'>-						&lt;1 RK_PA3 1 &amp;pcfg_pull_up_4ma&gt;;</div><div class='add'>+				rockchip,pins = &lt;1 RK_PA0 1 &amp;pcfg_pull_up_8ma&gt;,</div><div class='add'>+						&lt;1 RK_PA1 1 &amp;pcfg_pull_up_8ma&gt;,</div><div class='add'>+						&lt;1 RK_PA2 1 &amp;pcfg_pull_up_8ma&gt;,</div><div class='add'>+						&lt;1 RK_PA3 1 &amp;pcfg_pull_up_8ma&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			sdmmc0_gpio: sdmmc0-gpio {</div><div class='hunk'>@@ -1642,50 +1642,50 @@</div><div class='ctx'> 			rgmiim1_pins: rgmiim1-pins {</div><div class='ctx'> 				rockchip,pins =</div><div class='ctx'> 					/* mac_txclk */</div><div class='del'>-					&lt;1 RK_PB4 2 &amp;pcfg_pull_none_12ma&gt;,</div><div class='add'>+					&lt;1 RK_PB4 2 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_rxclk */</div><div class='del'>-					&lt;1 RK_PB5 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PB5 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_mdio */</div><div class='del'>-					&lt;1 RK_PC3 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PC3 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_txen */</div><div class='del'>-					&lt;1 RK_PD1 2 &amp;pcfg_pull_none_12ma&gt;,</div><div class='add'>+					&lt;1 RK_PD1 2 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_clk */</div><div class='del'>-					&lt;1 RK_PC5 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PC5 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_rxdv */</div><div class='del'>-					&lt;1 RK_PC6 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PC6 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_mdc */</div><div class='del'>-					&lt;1 RK_PC7 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PC7 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_rxd1 */</div><div class='del'>-					&lt;1 RK_PB2 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PB2 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_rxd0 */</div><div class='del'>-					&lt;1 RK_PB3 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PB3 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_txd1 */</div><div class='del'>-					&lt;1 RK_PB0 2 &amp;pcfg_pull_none_12ma&gt;,</div><div class='add'>+					&lt;1 RK_PB0 2 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_txd0 */</div><div class='del'>-					&lt;1 RK_PB1 2 &amp;pcfg_pull_none_12ma&gt;,</div><div class='add'>+					&lt;1 RK_PB1 2 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_rxd3 */</div><div class='del'>-					&lt;1 RK_PB6 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PB6 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_rxd2 */</div><div class='del'>-					&lt;1 RK_PB7 2 &amp;pcfg_pull_none_2ma&gt;,</div><div class='add'>+					&lt;1 RK_PB7 2 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_txd3 */</div><div class='del'>-					&lt;1 RK_PC0 2 &amp;pcfg_pull_none_12ma&gt;,</div><div class='add'>+					&lt;1 RK_PC0 2 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_txd2 */</div><div class='del'>-					&lt;1 RK_PC1 2 &amp;pcfg_pull_none_12ma&gt;,</div><div class='add'>+					&lt;1 RK_PC1 2 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> </div><div class='ctx'> 					/* mac_txclk */</div><div class='del'>-					&lt;0 RK_PB0 1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+					&lt;0 RK_PB0 1 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_txen */</div><div class='del'>-					&lt;0 RK_PB4 1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+					&lt;0 RK_PB4 1 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_clk */</div><div class='del'>-					&lt;0 RK_PD0 1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+					&lt;0 RK_PD0 1 &amp;pcfg_pull_none_4ma&gt;,</div><div class='ctx'> 					/* mac_txd1 */</div><div class='del'>-					&lt;0 RK_PC0 1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+					&lt;0 RK_PC0 1 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_txd0 */</div><div class='del'>-					&lt;0 RK_PC1 1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+					&lt;0 RK_PC1 1 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_txd3 */</div><div class='del'>-					&lt;0 RK_PC7 1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+					&lt;0 RK_PC7 1 &amp;pcfg_pull_none_8ma&gt;,</div><div class='ctx'> 					/* mac_txd2 */</div><div class='del'>-					&lt;0 RK_PC6 1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+					&lt;0 RK_PC6 1 &amp;pcfg_pull_none_8ma&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			rmiim1_pins: rmiim1-pins {</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts<br/>index 4a543f2117d4..844eac939a97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts</a></div><div class='hunk'>@@ -158,6 +158,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;hdmi {</div><div class='add'>+	ddc-i2c-bus = &lt;&amp;i2c3&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;hdmi_cec&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm64/crypto/aes-ce-ccm-glue.c b/arch/arm64/crypto/aes-ce-ccm-glue.c<br/>index 5fc6f51908fd..cb89c80800b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-ce-ccm-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-ce-ccm-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-ce-ccm-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/aes-ce-ccm-glue.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +110,7 @@ static int ccm_init_mac(struct aead_request *req, u8 maciv[], u32 msglen)</div><div class='ctx'> static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[],</div><div class='ctx'> 			   u32 abytes, u32 *macp)</div><div class='ctx'> {</div><div class='del'>-	if (may_use_simd()) {</div><div class='add'>+	if (crypto_simd_usable()) {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='ctx'> 		ce_aes_ccm_auth_data(mac, in, abytes, macp, key-&gt;key_enc,</div><div class='ctx'> 				     num_rounds(key));</div><div class='hunk'>@@ -255,7 +256,7 @@ static int ccm_encrypt(struct aead_request *req)</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_aead_encrypt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='del'>-	if (may_use_simd()) {</div><div class='add'>+	if (crypto_simd_usable()) {</div><div class='ctx'> 		while (walk.nbytes) {</div><div class='ctx'> 			u32 tail = walk.nbytes % AES_BLOCK_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +314,7 @@ static int ccm_decrypt(struct aead_request *req)</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_aead_decrypt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='del'>-	if (may_use_simd()) {</div><div class='add'>+	if (crypto_simd_usable()) {</div><div class='ctx'> 		while (walk.nbytes) {</div><div class='ctx'> 			u32 tail = walk.nbytes % AES_BLOCK_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -372,7 +373,7 @@ static struct aead_alg ccm_aes_alg = {</div><div class='ctx'> </div><div class='ctx'> static int __init aes_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!(elf_hwcap &amp; HWCAP_AES))</div><div class='add'>+	if (!cpu_have_named_feature(AES))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	return crypto_register_aead(&amp;ccm_aes_alg);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/crypto/aes-ce-glue.c b/arch/arm64/crypto/aes-ce-glue.c<br/>index e6b3227bbf57..3213843fcb46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/aes-ce-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -52,7 +53,7 @@ static void aes_cipher_encrypt(struct crypto_tfm *tfm, u8 dst[], u8 const src[])</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		__aes_arm64_encrypt(ctx-&gt;key_enc, dst, src, num_rounds(ctx));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -66,7 +67,7 @@ static void aes_cipher_decrypt(struct crypto_tfm *tfm, u8 dst[], u8 const src[])</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		__aes_arm64_decrypt(ctx-&gt;key_dec, dst, src, num_rounds(ctx));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c<br/>index 1e676625ef33..f0ceb545bd1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/aes-glue.c</a></div><div class='hunk'>@@ -405,7 +405,7 @@ static int ctr_encrypt_sync(struct skcipher_request *req)</div><div class='ctx'> 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return aes_ctr_encrypt_fallback(ctx, req);</div><div class='ctx'> </div><div class='ctx'> 	return ctr_encrypt(req);</div><div class='hunk'>@@ -642,7 +642,7 @@ static void mac_do_update(struct crypto_aes_ctx *ctx, u8 const in[], int blocks,</div><div class='ctx'> {</div><div class='ctx'> 	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='ctx'> </div><div class='del'>-	if (may_use_simd()) {</div><div class='add'>+	if (crypto_simd_usable()) {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='ctx'> 		aes_mac_update(in, ctx-&gt;key_enc, rounds, blocks, dg, enc_before,</div><div class='ctx'> 			       enc_after);</div><div class='hunk'>@@ -707,7 +707,7 @@ static int cbcmac_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	struct mac_tfm_ctx *tctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='ctx'> 	struct mac_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	mac_do_update(&amp;tctx-&gt;key, NULL, 0, ctx-&gt;dg, 1, 0);</div><div class='add'>+	mac_do_update(&amp;tctx-&gt;key, NULL, 0, ctx-&gt;dg, (ctx-&gt;len != 0), 0);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(out, ctx-&gt;dg, AES_BLOCK_SIZE);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c<br/>index e7a95a566462..02b65d9eb947 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-neonbs-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/aes-neonbs-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/aes-neonbs-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/aes-neonbs-glue.c</a></div><div class='hunk'>@@ -288,7 +288,7 @@ static int ctr_encrypt_sync(struct skcipher_request *req)</div><div class='ctx'> 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='ctx'> 	struct aesbs_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return aes_ctr_encrypt_fallback(&amp;ctx-&gt;fallback, req);</div><div class='ctx'> </div><div class='ctx'> 	return ctr_encrypt(req);</div><div class='hunk'>@@ -304,6 +304,8 @@ static int __xts_crypt(struct skcipher_request *req,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	neon_aes_ecb_encrypt(walk.iv, walk.iv, ctx-&gt;twkey, ctx-&gt;key.rounds, 1);</div><div class='hunk'>@@ -440,7 +442,7 @@ static int __init aes_init(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+	if (!cpu_have_named_feature(ASIMD))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='head'>diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c<br/>index bece1d85bd81..82029cda2e77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/chacha-neon-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/chacha-neon-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/chacha-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/chacha-neon-glue.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/chacha.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.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='hunk'>@@ -90,7 +91,7 @@ static int chacha_neon(struct skcipher_request *req)</div><div class='ctx'> 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='ctx'> 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !may_use_simd())</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_chacha_crypt(req);</div><div class='ctx'> </div><div class='ctx'> 	return chacha_neon_stream_xor(req, ctx, req-&gt;iv);</div><div class='hunk'>@@ -104,7 +105,7 @@ static int xchacha_neon(struct skcipher_request *req)</div><div class='ctx'> 	u32 state[16];</div><div class='ctx'> 	u8 real_iv[16];</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !may_use_simd())</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_xchacha_crypt(req);</div><div class='ctx'> </div><div class='ctx'> 	crypto_chacha_init(state, ctx, req-&gt;iv);</div><div class='hunk'>@@ -173,7 +174,7 @@ static struct skcipher_alg algs[] = {</div><div class='ctx'> </div><div class='ctx'> static int __init chacha_simd_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+	if (!cpu_have_named_feature(ASIMD))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_register_skciphers(algs, ARRAY_SIZE(algs));</div><div class='head'>diff --git a/arch/arm64/crypto/crct10dif-ce-glue.c b/arch/arm64/crypto/crct10dif-ce-glue.c<br/>index dd325829ee44..2e0a7d2eee24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/crct10dif-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/crct10dif-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/crct10dif-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/crct10dif-ce-glue.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='hunk'>@@ -38,7 +39,7 @@ static int crct10dif_update_pmull_p8(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	u16 *crc = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (length &gt;= CRC_T10DIF_PMULL_CHUNK_SIZE &amp;&amp; may_use_simd()) {</div><div class='add'>+	if (length &gt;= CRC_T10DIF_PMULL_CHUNK_SIZE &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='ctx'> 		*crc = crc_t10dif_pmull_p8(*crc, data, length);</div><div class='ctx'> 		kernel_neon_end();</div><div class='hunk'>@@ -54,7 +55,7 @@ static int crct10dif_update_pmull_p64(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	u16 *crc = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (length &gt;= CRC_T10DIF_PMULL_CHUNK_SIZE &amp;&amp; may_use_simd()) {</div><div class='add'>+	if (length &gt;= CRC_T10DIF_PMULL_CHUNK_SIZE &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='ctx'> 		*crc = crc_t10dif_pmull_p64(*crc, data, length);</div><div class='ctx'> 		kernel_neon_end();</div><div class='hunk'>@@ -101,7 +102,7 @@ static struct shash_alg crc_t10dif_alg[] = {{</div><div class='ctx'> </div><div class='ctx'> static int __init crc_t10dif_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (elf_hwcap &amp; HWCAP_PMULL)</div><div class='add'>+	if (cpu_have_named_feature(PMULL))</div><div class='ctx'> 		return crypto_register_shashes(crc_t10dif_alg,</div><div class='ctx'> 					       ARRAY_SIZE(crc_t10dif_alg));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -111,7 +112,7 @@ static int __init crc_t10dif_mod_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit crc_t10dif_mod_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (elf_hwcap &amp; HWCAP_PMULL)</div><div class='add'>+	if (cpu_have_named_feature(PMULL))</div><div class='ctx'> 		crypto_unregister_shashes(crc_t10dif_alg,</div><div class='ctx'> 					  ARRAY_SIZE(crc_t10dif_alg));</div><div class='ctx'> 	else</div><div class='head'>diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c<br/>index 791ad422c427..b39ed99b06fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/ghash-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/ghash-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/ghash-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/ghash-ce-glue.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -89,7 +90,7 @@ static void ghash_do_update(int blocks, u64 dg[], const char *src,</div><div class='ctx'> 						struct ghash_key const *k,</div><div class='ctx'> 						const char *head))</div><div class='ctx'> {</div><div class='del'>-	if (likely(may_use_simd())) {</div><div class='add'>+	if (likely(crypto_simd_usable())) {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='ctx'> 		simd_update(blocks, dg, src, key, head);</div><div class='ctx'> 		kernel_neon_end();</div><div class='hunk'>@@ -441,7 +442,7 @@ static int gcm_encrypt(struct aead_request *req)</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_aead_encrypt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='del'>-	if (likely(may_use_simd() &amp;&amp; walk.total &gt;= 2 * AES_BLOCK_SIZE)) {</div><div class='add'>+	if (likely(crypto_simd_usable() &amp;&amp; walk.total &gt;= 2 * AES_BLOCK_SIZE)) {</div><div class='ctx'> 		u32 const *rk = NULL;</div><div class='ctx'> </div><div class='ctx'> 		kernel_neon_begin();</div><div class='hunk'>@@ -473,9 +474,11 @@ static int gcm_encrypt(struct aead_request *req)</div><div class='ctx'> 		put_unaligned_be32(2, iv + GCM_IV_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		while (walk.nbytes &gt;= (2 * AES_BLOCK_SIZE)) {</div><div class='del'>-			int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+			const int blocks =</div><div class='add'>+				walk.nbytes / (2 * AES_BLOCK_SIZE) * 2;</div><div class='ctx'> 			u8 *dst = walk.dst.virt.addr;</div><div class='ctx'> 			u8 *src = walk.src.virt.addr;</div><div class='add'>+			int remaining = blocks;</div><div class='ctx'> </div><div class='ctx'> 			do {</div><div class='ctx'> 				__aes_arm64_encrypt(ctx-&gt;aes_key.key_enc,</div><div class='hunk'>@@ -485,9 +488,9 @@ static int gcm_encrypt(struct aead_request *req)</div><div class='ctx'> </div><div class='ctx'> 				dst += AES_BLOCK_SIZE;</div><div class='ctx'> 				src += AES_BLOCK_SIZE;</div><div class='del'>-			} while (--blocks &gt; 0);</div><div class='add'>+			} while (--remaining &gt; 0);</div><div class='ctx'> </div><div class='del'>-			ghash_do_update(walk.nbytes / AES_BLOCK_SIZE, dg,</div><div class='add'>+			ghash_do_update(blocks, dg,</div><div class='ctx'> 					walk.dst.virt.addr, &amp;ctx-&gt;ghash_key,</div><div class='ctx'> 					NULL, pmull_ghash_update_p64);</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +566,7 @@ static int gcm_decrypt(struct aead_request *req)</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_aead_decrypt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='del'>-	if (likely(may_use_simd() &amp;&amp; walk.total &gt;= 2 * AES_BLOCK_SIZE)) {</div><div class='add'>+	if (likely(crypto_simd_usable() &amp;&amp; walk.total &gt;= 2 * AES_BLOCK_SIZE)) {</div><div class='ctx'> 		u32 const *rk = NULL;</div><div class='ctx'> </div><div class='ctx'> 		kernel_neon_begin();</div><div class='hunk'>@@ -609,7 +612,7 @@ static int gcm_decrypt(struct aead_request *req)</div><div class='ctx'> 		put_unaligned_be32(2, iv + GCM_IV_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		while (walk.nbytes &gt;= (2 * AES_BLOCK_SIZE)) {</div><div class='del'>-			int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+			int blocks = walk.nbytes / (2 * AES_BLOCK_SIZE) * 2;</div><div class='ctx'> 			u8 *dst = walk.dst.virt.addr;</div><div class='ctx'> 			u8 *src = walk.src.virt.addr;</div><div class='ctx'> </div><div class='hunk'>@@ -704,10 +707,10 @@ static int __init ghash_ce_mod_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+	if (!cpu_have_named_feature(ASIMD))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (elf_hwcap &amp; HWCAP_PMULL)</div><div class='add'>+	if (cpu_have_named_feature(PMULL))</div><div class='ctx'> 		ret = crypto_register_shashes(ghash_alg,</div><div class='ctx'> 					      ARRAY_SIZE(ghash_alg));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -717,7 +720,7 @@ static int __init ghash_ce_mod_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (elf_hwcap &amp; HWCAP_PMULL) {</div><div class='add'>+	if (cpu_have_named_feature(PMULL)) {</div><div class='ctx'> 		ret = crypto_register_aead(&amp;gcm_aes_alg);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			crypto_unregister_shashes(ghash_alg,</div><div class='hunk'>@@ -728,7 +731,7 @@ static int __init ghash_ce_mod_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit ghash_ce_mod_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (elf_hwcap &amp; HWCAP_PMULL)</div><div class='add'>+	if (cpu_have_named_feature(PMULL))</div><div class='ctx'> 		crypto_unregister_shashes(ghash_alg, ARRAY_SIZE(ghash_alg));</div><div class='ctx'> 	else</div><div class='ctx'> 		crypto_unregister_shash(ghash_alg);</div><div class='head'>diff --git a/arch/arm64/crypto/nhpoly1305-neon-glue.c b/arch/arm64/crypto/nhpoly1305-neon-glue.c<br/>index 22cc32ac9448..895d3727c1fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/nhpoly1305-neon-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/nhpoly1305-neon-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/nhpoly1305-neon-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/nhpoly1305-neon-glue.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/nhpoly1305.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -25,7 +26,7 @@ static void _nh_neon(const u32 *key, const u8 *message, size_t message_len,</div><div class='ctx'> static int nhpoly1305_neon_update(struct shash_desc *desc,</div><div class='ctx'> 				  const u8 *src, unsigned int srclen)</div><div class='ctx'> {</div><div class='del'>-	if (srclen &lt; 64 || !may_use_simd())</div><div class='add'>+	if (srclen &lt; 64 || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_nhpoly1305_update(desc, src, srclen);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='hunk'>@@ -56,7 +57,7 @@ static struct shash_alg nhpoly1305_alg = {</div><div class='ctx'> </div><div class='ctx'> static int __init nhpoly1305_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+	if (!cpu_have_named_feature(ASIMD))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_register_shash(&amp;nhpoly1305_alg);</div><div class='head'>diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c<br/>index 17fac2889f56..eaa7a8258f1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha1-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha1-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha1-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sha1-ce-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha1_base.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -38,7 +39,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha1_ce_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha1_update(desc, data, len);</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;finalize = 0;</div><div class='hunk'>@@ -56,7 +57,7 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	struct sha1_ce_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> 	bool finalize = !sctx-&gt;sst.count &amp;&amp; !(len % SHA1_BLOCK_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha1_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -78,7 +79,7 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> {</div><div class='ctx'> 	struct sha1_ce_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha1_finup(desc, NULL, 0, out);</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;finalize = 0;</div><div class='head'>diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c<br/>index 261f5195cab7..a725997e55f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha2-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha2-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha2-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sha2-ce-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha256_base.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -42,7 +43,7 @@ static int sha256_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha256_ce_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return sha256_base_do_update(desc, data, len,</div><div class='ctx'> 				(sha256_block_fn *)sha256_block_data_order);</div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +62,7 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	struct sha256_ce_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> 	bool finalize = !sctx-&gt;sst.count &amp;&amp; !(len % SHA256_BLOCK_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		if (len)</div><div class='ctx'> 			sha256_base_do_update(desc, data, len,</div><div class='ctx'> 				(sha256_block_fn *)sha256_block_data_order);</div><div class='hunk'>@@ -90,7 +91,7 @@ static int sha256_ce_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> {</div><div class='ctx'> 	struct sha256_ce_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		sha256_base_do_finalize(desc,</div><div class='ctx'> 				(sha256_block_fn *)sha256_block_data_order);</div><div class='ctx'> 		return sha256_base_finish(desc, out);</div><div class='head'>diff --git a/arch/arm64/crypto/sha256-glue.c b/arch/arm64/crypto/sha256-glue.c<br/>index 4aedeaefd61f..e62298740e31 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha256-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha256-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha256-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sha256-glue.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha256_base.h&gt;</div><div class='ctx'> #include &lt;linux/cryptohash.h&gt;</div><div class='hunk'>@@ -89,7 +90,7 @@ static int sha256_update_neon(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return sha256_base_do_update(desc, data, len,</div><div class='ctx'> 				(sha256_block_fn *)sha256_block_data_order);</div><div class='ctx'> </div><div class='hunk'>@@ -119,7 +120,7 @@ static int sha256_update_neon(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha256_finup_neon(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			     unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		if (len)</div><div class='ctx'> 			sha256_base_do_update(desc, data, len,</div><div class='ctx'> 				(sha256_block_fn *)sha256_block_data_order);</div><div class='hunk'>@@ -173,7 +174,7 @@ static int __init sha256_mod_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (elf_hwcap &amp; HWCAP_ASIMD) {</div><div class='add'>+	if (cpu_have_named_feature(ASIMD)) {</div><div class='ctx'> 		ret = crypto_register_shashes(neon_algs, ARRAY_SIZE(neon_algs));</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='hunk'>@@ -183,7 +184,7 @@ static int __init sha256_mod_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit sha256_mod_fini(void)</div><div class='ctx'> {</div><div class='del'>-	if (elf_hwcap &amp; HWCAP_ASIMD)</div><div class='add'>+	if (cpu_have_named_feature(ASIMD))</div><div class='ctx'> 		crypto_unregister_shashes(neon_algs, ARRAY_SIZE(neon_algs));</div><div class='ctx'> 	crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/crypto/sha3-ce-glue.c b/arch/arm64/crypto/sha3-ce-glue.c<br/>index a336feac0f59..9a4bbfc45f40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha3-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha3-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha3-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sha3-ce-glue.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha3.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='hunk'>@@ -32,7 +33,7 @@ static int sha3_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	struct sha3_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> 	unsigned int digest_size = crypto_shash_digestsize(desc-&gt;tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha3_update(desc, data, len);</div><div class='ctx'> </div><div class='ctx'> 	if ((sctx-&gt;partial + len) &gt;= sctx-&gt;rsiz) {</div><div class='hunk'>@@ -76,7 +77,7 @@ static int sha3_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	__le64 *digest = (__le64 *)out;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha3_final(desc, out);</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;buf[sctx-&gt;partial++] = 0x06;</div><div class='head'>diff --git a/arch/arm64/crypto/sha512-ce-glue.c b/arch/arm64/crypto/sha512-ce-glue.c<br/>index f2c5f28c622a..2369540040aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha512-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sha512-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sha512-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sha512-ce-glue.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha512_base.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -31,7 +32,7 @@ asmlinkage void sha512_block_data_order(u64 *digest, u8 const *src, int blocks);</div><div class='ctx'> static int sha512_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			    unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return sha512_base_do_update(desc, data, len,</div><div class='ctx'> 				(sha512_block_fn *)sha512_block_data_order);</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +47,7 @@ static int sha512_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha512_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			   unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		if (len)</div><div class='ctx'> 			sha512_base_do_update(desc, data, len,</div><div class='ctx'> 				(sha512_block_fn *)sha512_block_data_order);</div><div class='hunk'>@@ -65,7 +66,7 @@ static int sha512_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> </div><div class='ctx'> static int sha512_ce_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		sha512_base_do_finalize(desc,</div><div class='ctx'> 				(sha512_block_fn *)sha512_block_data_order);</div><div class='ctx'> 		return sha512_base_finish(desc, out);</div><div class='head'>diff --git a/arch/arm64/crypto/sm3-ce-glue.c b/arch/arm64/crypto/sm3-ce-glue.c<br/>index 88938a20d9b2..5d15533799a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sm3-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sm3-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sm3-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sm3-ce-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sm3.h&gt;</div><div class='ctx'> #include &lt;crypto/sm3_base.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='hunk'>@@ -28,7 +29,7 @@ asmlinkage void sm3_ce_transform(struct sm3_state *sst, u8 const *src,</div><div class='ctx'> static int sm3_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			 unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sm3_update(desc, data, len);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='hunk'>@@ -40,7 +41,7 @@ static int sm3_ce_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> </div><div class='ctx'> static int sm3_ce_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sm3_finup(desc, NULL, 0, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='hunk'>@@ -53,7 +54,7 @@ static int sm3_ce_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> static int sm3_ce_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (!may_use_simd())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sm3_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm64/crypto/sm4-ce-glue.c b/arch/arm64/crypto/sm4-ce-glue.c<br/>index 0c4fc223f225..2754c875d39c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sm4-ce-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/crypto/sm4-ce-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/crypto/sm4-ce-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/crypto/sm4-ce-glue.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/sm4.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='hunk'>@@ -20,7 +21,7 @@ static void sm4_ce_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='ctx'> 	const struct crypto_sm4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		crypto_sm4_encrypt(tfm, out, in);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='hunk'>@@ -33,7 +34,7 @@ static void sm4_ce_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='ctx'> 	const struct crypto_sm4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		crypto_sm4_decrypt(tfm, out, in);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kernel_neon_begin();</div><div class='head'>diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild<br/>index 1e17ea5c372b..eb0df239a759 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/Kbuild</a></div><div class='hunk'>@@ -13,10 +13,10 @@ generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += msi.h</div><div class='ctx'> generic-y += qrwlock.h</div><div class='ctx'> generic-y += qspinlock.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += segment.h</div><div class='ctx'> generic-y += serial.h</div><div class='ctx'> generic-y += set_memory.h</div><div class='head'>diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h<br/>index f2a234d6516c..b7bca1ae09e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/arch_timer.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/arch_timer.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/arch_timer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/arch_timer.h</a></div><div class='hunk'>@@ -31,11 +31,23 @@</div><div class='ctx'> #include &lt;clocksource/arm_arch_timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND)</div><div class='del'>-extern struct static_key_false arch_timer_read_ool_enabled;</div><div class='del'>-#define needs_unstable_timer_counter_workaround() \</div><div class='del'>-	static_branch_unlikely(&amp;arch_timer_read_ool_enabled)</div><div class='add'>+#define has_erratum_handler(h)						\</div><div class='add'>+	({								\</div><div class='add'>+		const struct arch_timer_erratum_workaround *__wa;	\</div><div class='add'>+		__wa = __this_cpu_read(timer_unstable_counter_workaround); \</div><div class='add'>+		(__wa &amp;&amp; __wa-&gt;h);					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define erratum_handler(h)						\</div><div class='add'>+	({								\</div><div class='add'>+		const struct arch_timer_erratum_workaround *__wa;	\</div><div class='add'>+		__wa = __this_cpu_read(timer_unstable_counter_workaround); \</div><div class='add'>+		(__wa &amp;&amp; __wa-&gt;h) ? __wa-&gt;h : arch_timer_##h;		\</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-#define needs_unstable_timer_counter_workaround()  false</div><div class='add'>+#define has_erratum_handler(h)			   false</div><div class='add'>+#define erratum_handler(h)			   (arch_timer_##h)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> enum arch_timer_erratum_match_type {</div><div class='hunk'>@@ -61,23 +73,37 @@ struct arch_timer_erratum_workaround {</div><div class='ctx'> DECLARE_PER_CPU(const struct arch_timer_erratum_workaround *,</div><div class='ctx'> 		timer_unstable_counter_workaround);</div><div class='ctx'> </div><div class='add'>+/* inline sysreg accessors that make erratum_handler() work */</div><div class='add'>+static inline notrace u32 arch_timer_read_cntp_tval_el0(void)</div><div class='add'>+{</div><div class='add'>+	return read_sysreg(cntp_tval_el0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline notrace u32 arch_timer_read_cntv_tval_el0(void)</div><div class='add'>+{</div><div class='add'>+	return read_sysreg(cntv_tval_el0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline notrace u64 arch_timer_read_cntpct_el0(void)</div><div class='add'>+{</div><div class='add'>+	return read_sysreg(cntpct_el0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline notrace u64 arch_timer_read_cntvct_el0(void)</div><div class='add'>+{</div><div class='add'>+	return read_sysreg(cntvct_el0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define arch_timer_reg_read_stable(reg)					\</div><div class='del'>-({									\</div><div class='del'>-	u64 _val;							\</div><div class='del'>-	if (needs_unstable_timer_counter_workaround()) {		\</div><div class='del'>-		const struct arch_timer_erratum_workaround *wa;		\</div><div class='add'>+	({								\</div><div class='add'>+		u64 _val;						\</div><div class='add'>+									\</div><div class='ctx'> 		preempt_disable_notrace();				\</div><div class='del'>-		wa = __this_cpu_read(timer_unstable_counter_workaround); \</div><div class='del'>-		if (wa &amp;&amp; wa-&gt;read_##reg)				\</div><div class='del'>-			_val = wa-&gt;read_##reg();			\</div><div class='del'>-		else							\</div><div class='del'>-			_val = read_sysreg(reg);			\</div><div class='add'>+		_val = erratum_handler(read_ ## reg)();			\</div><div class='ctx'> 		preempt_enable_notrace();				\</div><div class='del'>-	} else {							\</div><div class='del'>-		_val = read_sysreg(reg);				\</div><div class='del'>-	}								\</div><div class='del'>-	_val;								\</div><div class='del'>-})</div><div class='add'>+									\</div><div class='add'>+		_val;							\</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * These register accessors are marked inline so the compiler can</div><div class='hunk'>@@ -148,18 +174,67 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 arch_counter_get_cntpct(void)</div><div class='add'>+/*</div><div class='add'>+ * Ensure that reads of the counter are treated the same as memory reads</div><div class='add'>+ * for the purposes of ordering by subsequent memory barriers.</div><div class='add'>+ *</div><div class='add'>+ * This insanity brought to you by speculative system register reads,</div><div class='add'>+ * out-of-order memory accesses, sequence locks and Thomas Gleixner.</div><div class='add'>+ *</div><div class='add'>+ * http://lists.infradead.org/pipermail/linux-arm-kernel/2019-February/631195.html</div><div class='add'>+ */</div><div class='add'>+#define arch_counter_enforce_ordering(val) do {				\</div><div class='add'>+	u64 tmp, _val = (val);						\</div><div class='add'>+									\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+	"	eor	%0, %1, %1\n"					\</div><div class='add'>+	"	add	%0, sp, %0\n"					\</div><div class='add'>+	"	ldr	xzr, [%0]"					\</div><div class='add'>+	: "=r" (tmp) : "r" (_val));					\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static inline u64 __arch_counter_get_cntpct_stable(void)</div><div class='add'>+{</div><div class='add'>+	u64 cnt;</div><div class='add'>+</div><div class='add'>+	isb();</div><div class='add'>+	cnt = arch_timer_reg_read_stable(cntpct_el0);</div><div class='add'>+	arch_counter_enforce_ordering(cnt);</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 __arch_counter_get_cntpct(void)</div><div class='ctx'> {</div><div class='add'>+	u64 cnt;</div><div class='add'>+</div><div class='ctx'> 	isb();</div><div class='del'>-	return arch_timer_reg_read_stable(cntpct_el0);</div><div class='add'>+	cnt = read_sysreg(cntpct_el0);</div><div class='add'>+	arch_counter_enforce_ordering(cnt);</div><div class='add'>+	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 arch_counter_get_cntvct(void)</div><div class='add'>+static inline u64 __arch_counter_get_cntvct_stable(void)</div><div class='ctx'> {</div><div class='add'>+	u64 cnt;</div><div class='add'>+</div><div class='ctx'> 	isb();</div><div class='del'>-	return arch_timer_reg_read_stable(cntvct_el0);</div><div class='add'>+	cnt = arch_timer_reg_read_stable(cntvct_el0);</div><div class='add'>+	arch_counter_enforce_ordering(cnt);</div><div class='add'>+	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 __arch_counter_get_cntvct(void)</div><div class='add'>+{</div><div class='add'>+	u64 cnt;</div><div class='add'>+</div><div class='add'>+	isb();</div><div class='add'>+	cnt = read_sysreg(cntvct_el0);</div><div class='add'>+	arch_counter_enforce_ordering(cnt);</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef arch_counter_enforce_ordering</div><div class='add'>+</div><div class='ctx'> static inline int arch_timer_arch_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h<br/>index c5308d01e228..039fbd822ec6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/assembler.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/assembler.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/assembler.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/assembler.h</a></div><div class='hunk'>@@ -407,10 +407,14 @@ alternative_endif</div><div class='ctx'> 	.ifc	\op, cvap</div><div class='ctx'> 	sys	3, c7, c12, 1, \kaddr	// dc cvap</div><div class='ctx'> 	.else</div><div class='add'>+	.ifc	\op, cvadp</div><div class='add'>+	sys	3, c7, c13, 1, \kaddr	// dc cvadp</div><div class='add'>+	.else</div><div class='ctx'> 	dc	\op, \kaddr</div><div class='ctx'> 	.endif</div><div class='ctx'> 	.endif</div><div class='ctx'> 	.endif</div><div class='add'>+	.endif</div><div class='ctx'> 	add	\kaddr, \kaddr, \tmp1</div><div class='ctx'> 	cmp	\kaddr, \size</div><div class='ctx'> 	b.lo	9998b</div><div class='hunk'>@@ -442,8 +446,8 @@ USER(\label, ic	ivau, \tmp2)			// invalidate I line PoU</div><div class='ctx'>  * reset_pmuserenr_el0 - reset PMUSERENR_EL0 if PMUv3 present</div><div class='ctx'>  */</div><div class='ctx'> 	.macro	reset_pmuserenr_el0, tmpreg</div><div class='del'>-	mrs	\tmpreg, id_aa64dfr0_el1	// Check ID_AA64DFR0_EL1 PMUVer</div><div class='del'>-	sbfx	\tmpreg, \tmpreg, #8, #4</div><div class='add'>+	mrs	\tmpreg, id_aa64dfr0_el1</div><div class='add'>+	sbfx	\tmpreg, \tmpreg, #ID_AA64DFR0_PMUVER_SHIFT, #4</div><div class='ctx'> 	cmp	\tmpreg, #1			// Skip if no PMU present</div><div class='ctx'> 	b.lt	9000f</div><div class='ctx'> 	msr	pmuserenr_el0, xzr		// Disable PMU access from EL0</div><div class='head'>diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h<br/>index f66bb04fdf2d..85b6bedbcc68 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/barrier.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/barrier.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/barrier.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/barrier.h</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kasan-checks.h&gt;</div><div class='add'>+</div><div class='ctx'> #define __nops(n)	".rept	" #n "\nnop\n.endr\n"</div><div class='ctx'> #define nops(n)		asm volatile(__nops(n))</div><div class='ctx'> </div><div class='hunk'>@@ -72,31 +74,33 @@ static inline unsigned long array_index_mask_nospec(unsigned long idx,</div><div class='ctx'> </div><div class='ctx'> #define __smp_store_release(p, v)					\</div><div class='ctx'> do {									\</div><div class='add'>+	typeof(p) __p = (p);						\</div><div class='ctx'> 	union { typeof(*p) __val; char __c[1]; } __u =			\</div><div class='del'>-		{ .__val = (__force typeof(*p)) (v) }; 			\</div><div class='add'>+		{ .__val = (__force typeof(*p)) (v) };			\</div><div class='ctx'> 	compiletime_assert_atomic_type(*p);				\</div><div class='add'>+	kasan_check_write(__p, sizeof(*p));				\</div><div class='ctx'> 	switch (sizeof(*p)) {						\</div><div class='ctx'> 	case 1:								\</div><div class='ctx'> 		asm volatile ("stlrb %w1, %0"				\</div><div class='del'>-				: "=Q" (*p)				\</div><div class='add'>+				: "=Q" (*__p)				\</div><div class='ctx'> 				: "r" (*(__u8 *)__u.__c)		\</div><div class='ctx'> 				: "memory");				\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	case 2:								\</div><div class='ctx'> 		asm volatile ("stlrh %w1, %0"				\</div><div class='del'>-				: "=Q" (*p)				\</div><div class='add'>+				: "=Q" (*__p)				\</div><div class='ctx'> 				: "r" (*(__u16 *)__u.__c)		\</div><div class='ctx'> 				: "memory");				\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	case 4:								\</div><div class='ctx'> 		asm volatile ("stlr %w1, %0"				\</div><div class='del'>-				: "=Q" (*p)				\</div><div class='add'>+				: "=Q" (*__p)				\</div><div class='ctx'> 				: "r" (*(__u32 *)__u.__c)		\</div><div class='ctx'> 				: "memory");				\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	case 8:								\</div><div class='ctx'> 		asm volatile ("stlr %1, %0"				\</div><div class='del'>-				: "=Q" (*p)				\</div><div class='add'>+				: "=Q" (*__p)				\</div><div class='ctx'> 				: "r" (*(__u64 *)__u.__c)		\</div><div class='ctx'> 				: "memory");				\</div><div class='ctx'> 		break;							\</div><div class='hunk'>@@ -106,27 +110,29 @@ do {									\</div><div class='ctx'> #define __smp_load_acquire(p)						\</div><div class='ctx'> ({									\</div><div class='ctx'> 	union { typeof(*p) __val; char __c[1]; } __u;			\</div><div class='add'>+	typeof(p) __p = (p);						\</div><div class='ctx'> 	compiletime_assert_atomic_type(*p);				\</div><div class='add'>+	kasan_check_read(__p, sizeof(*p));				\</div><div class='ctx'> 	switch (sizeof(*p)) {						\</div><div class='ctx'> 	case 1:								\</div><div class='ctx'> 		asm volatile ("ldarb %w0, %1"				\</div><div class='ctx'> 			: "=r" (*(__u8 *)__u.__c)			\</div><div class='del'>-			: "Q" (*p) : "memory");				\</div><div class='add'>+			: "Q" (*__p) : "memory");			\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	case 2:								\</div><div class='ctx'> 		asm volatile ("ldarh %w0, %1"				\</div><div class='ctx'> 			: "=r" (*(__u16 *)__u.__c)			\</div><div class='del'>-			: "Q" (*p) : "memory");				\</div><div class='add'>+			: "Q" (*__p) : "memory");			\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	case 4:								\</div><div class='ctx'> 		asm volatile ("ldar %w0, %1"				\</div><div class='ctx'> 			: "=r" (*(__u32 *)__u.__c)			\</div><div class='del'>-			: "Q" (*p) : "memory");				\</div><div class='add'>+			: "Q" (*__p) : "memory");			\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	case 8:								\</div><div class='ctx'> 		asm volatile ("ldar %0, %1"				\</div><div class='ctx'> 			: "=r" (*(__u64 *)__u.__c)			\</div><div class='del'>-			: "Q" (*p) : "memory");				\</div><div class='add'>+			: "Q" (*__p) : "memory");			\</div><div class='ctx'> 		break;							\</div><div class='ctx'> 	}								\</div><div class='ctx'> 	__u.__val;							\</div><div class='head'>diff --git a/arch/arm64/include/asm/brk-imm.h b/arch/arm64/include/asm/brk-imm.h<br/>index 2945fe6cd863..d84294064e6a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/brk-imm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/brk-imm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/brk-imm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/brk-imm.h</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * #imm16 values used for BRK instruction generation</div><div class='add'>+ * 0x004: for installing kprobes</div><div class='add'>+ * 0x005: for installing uprobes</div><div class='ctx'>  * Allowed values for kgdb are 0x400 - 0x7ff</div><div class='ctx'>  * 0x100: for triggering a fault on purpose (reserved)</div><div class='ctx'>  * 0x400: for dynamic BRK instruction</div><div class='hunk'>@@ -18,10 +20,13 @@</div><div class='ctx'>  * 0x800: kernel-mode BUG() and WARN() traps</div><div class='ctx'>  * 0x9xx: tag-based KASAN trap (allowed values 0x900 - 0x9ff)</div><div class='ctx'>  */</div><div class='add'>+#define KPROBES_BRK_IMM			0x004</div><div class='add'>+#define UPROBES_BRK_IMM			0x005</div><div class='ctx'> #define FAULT_BRK_IMM			0x100</div><div class='ctx'> #define KGDB_DYN_DBG_BRK_IMM		0x400</div><div class='ctx'> #define KGDB_COMPILED_DBG_BRK_IMM	0x401</div><div class='ctx'> #define BUG_BRK_IMM			0x800</div><div class='ctx'> #define KASAN_BRK_IMM			0x900</div><div class='add'>+#define KASAN_BRK_MASK			0x0ff</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h<br/>index f6a76e43f39e..defdc67d9ab4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/cpucaps.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/cpucaps.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/cpucaps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/cpucaps.h</a></div><div class='hunk'>@@ -61,7 +61,8 @@</div><div class='ctx'> #define ARM64_HAS_GENERIC_AUTH_ARCH		40</div><div class='ctx'> #define ARM64_HAS_GENERIC_AUTH_IMP_DEF		41</div><div class='ctx'> #define ARM64_HAS_IRQ_PRIO_MASKING		42</div><div class='add'>+#define ARM64_HAS_DCPODP			43</div><div class='ctx'> </div><div class='del'>-#define ARM64_NCAPS				43</div><div class='add'>+#define ARM64_NCAPS				44</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_CPUCAPS_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h<br/>index e505e1fbd2b9..f210bcf096f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/cpufeature.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/cpufeature.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/cpufeature.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/cpufeature.h</a></div><div class='hunk'>@@ -14,15 +14,8 @@</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * In the arm64 world (as in the ARM world), elf_hwcap is used both internally</div><div class='del'>- * in the kernel and for user space to keep track of which optional features</div><div class='del'>- * are supported by the current system. So let's map feature 'x' to HWCAP_x.</div><div class='del'>- * Note that HWCAP_x constants are bit fields so we need to take the log.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define MAX_CPU_FEATURES	(8 * sizeof(elf_hwcap))</div><div class='del'>-#define cpu_feature(x)		ilog2(HWCAP_ ## x)</div><div class='add'>+#define MAX_CPU_FEATURES	64</div><div class='add'>+#define cpu_feature(x)		KERNEL_HWCAP_ ## x</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -399,11 +392,13 @@ extern DECLARE_BITMAP(boot_capabilities, ARM64_NPATCHABLE);</div><div class='ctx'> 	for_each_set_bit(cap, cpu_hwcaps, ARM64_NCAPS)</div><div class='ctx'> </div><div class='ctx'> bool this_cpu_has_cap(unsigned int cap);</div><div class='add'>+void cpu_set_feature(unsigned int num);</div><div class='add'>+bool cpu_have_feature(unsigned int num);</div><div class='add'>+unsigned long cpu_get_elf_hwcap(void);</div><div class='add'>+unsigned long cpu_get_elf_hwcap2(void);</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_have_feature(unsigned int num)</div><div class='del'>-{</div><div class='del'>-	return elf_hwcap &amp; (1UL &lt;&lt; num);</div><div class='del'>-}</div><div class='add'>+#define cpu_set_named_feature(name) cpu_set_feature(cpu_feature(name))</div><div class='add'>+#define cpu_have_named_feature(name) cpu_have_feature(cpu_feature(name))</div><div class='ctx'> </div><div class='ctx'> /* System capability check for constant caps */</div><div class='ctx'> static inline bool __cpus_have_const_cap(int num)</div><div class='hunk'>@@ -638,11 +633,7 @@ static inline int arm64_get_ssbd_state(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM64_SSBD</div><div class='ctx'> void arm64_set_ssbd_mitigation(bool state);</div><div class='del'>-#else</div><div class='del'>-static inline void arm64_set_ssbd_mitigation(bool state) {}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> extern int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h<br/>index 2afb1338b48a..2602bae334fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/cputype.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/cputype.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/cputype.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/cputype.h</a></div><div class='hunk'>@@ -77,6 +77,7 @@</div><div class='ctx'> #define ARM_CPU_IMP_QCOM		0x51</div><div class='ctx'> #define ARM_CPU_IMP_NVIDIA		0x4E</div><div class='ctx'> #define ARM_CPU_IMP_FUJITSU		0x46</div><div class='add'>+#define ARM_CPU_IMP_HISI		0x48</div><div class='ctx'> </div><div class='ctx'> #define ARM_CPU_PART_AEM_V8		0xD0F</div><div class='ctx'> #define ARM_CPU_PART_FOUNDATION		0xD00</div><div class='hunk'>@@ -88,6 +89,7 @@</div><div class='ctx'> #define ARM_CPU_PART_CORTEX_A35		0xD04</div><div class='ctx'> #define ARM_CPU_PART_CORTEX_A55		0xD05</div><div class='ctx'> #define ARM_CPU_PART_CORTEX_A76		0xD0B</div><div class='add'>+#define ARM_CPU_PART_NEOVERSE_N1	0xD0C</div><div class='ctx'> </div><div class='ctx'> #define APM_CPU_PART_POTENZA		0x000</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +109,8 @@</div><div class='ctx'> </div><div class='ctx'> #define FUJITSU_CPU_PART_A64FX		0x001</div><div class='ctx'> </div><div class='add'>+#define HISI_CPU_PART_TSV110		0xD01</div><div class='add'>+</div><div class='ctx'> #define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)</div><div class='ctx'> #define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)</div><div class='ctx'> #define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)</div><div class='hunk'>@@ -115,6 +119,7 @@</div><div class='ctx'> #define MIDR_CORTEX_A35 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A35)</div><div class='ctx'> #define MIDR_CORTEX_A55 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A55)</div><div class='ctx'> #define MIDR_CORTEX_A76	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76)</div><div class='add'>+#define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1)</div><div class='ctx'> #define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)</div><div class='ctx'> #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)</div><div class='ctx'> #define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)</div><div class='hunk'>@@ -126,10 +131,11 @@</div><div class='ctx'> #define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER)</div><div class='ctx'> #define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)</div><div class='ctx'> #define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX)</div><div class='add'>+#define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110)</div><div class='ctx'> </div><div class='ctx'> /* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */</div><div class='ctx'> #define MIDR_FUJITSU_ERRATUM_010001		MIDR_FUJITSU_A64FX</div><div class='del'>-#define MIDR_FUJITSU_ERRATUM_010001_MASK	(~MIDR_VARIANT(1))</div><div class='add'>+#define MIDR_FUJITSU_ERRATUM_010001_MASK	(~MIDR_CPU_VAR_REV(1, 0))</div><div class='ctx'> #define TCR_CLEAR_FUJITSU_ERRATUM_010001	(TCR_NFD1 | TCR_NFD0)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h<br/>index a44cf5225429..0679f781696d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/debug-monitors.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/debug-monitors.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/debug-monitors.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/debug-monitors.h</a></div><div class='hunk'>@@ -65,12 +65,9 @@</div><div class='ctx'> #define CACHE_FLUSH_IS_SAFE		1</div><div class='ctx'> </div><div class='ctx'> /* kprobes BRK opcodes with ESR encoding  */</div><div class='del'>-#define BRK64_ESR_MASK		0xFFFF</div><div class='del'>-#define BRK64_ESR_KPROBES	0x0004</div><div class='del'>-#define BRK64_OPCODE_KPROBES	(AARCH64_BREAK_MON | (BRK64_ESR_KPROBES &lt;&lt; 5))</div><div class='add'>+#define BRK64_OPCODE_KPROBES	(AARCH64_BREAK_MON | (KPROBES_BRK_IMM &lt;&lt; 5))</div><div class='ctx'> /* uprobes BRK opcodes with ESR encoding  */</div><div class='del'>-#define BRK64_ESR_UPROBES	0x0005</div><div class='del'>-#define BRK64_OPCODE_UPROBES	(AARCH64_BREAK_MON | (BRK64_ESR_UPROBES &lt;&lt; 5))</div><div class='add'>+#define BRK64_OPCODE_UPROBES	(AARCH64_BREAK_MON | (UPROBES_BRK_IMM &lt;&lt; 5))</div><div class='ctx'> </div><div class='ctx'> /* AArch32 */</div><div class='ctx'> #define DBG_ESR_EVT_BKPT	0x4</div><div class='hunk'>@@ -94,18 +91,24 @@ struct step_hook {</div><div class='ctx'> 	int (*fn)(struct pt_regs *regs, unsigned int esr);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void register_step_hook(struct step_hook *hook);</div><div class='del'>-void unregister_step_hook(struct step_hook *hook);</div><div class='add'>+void register_user_step_hook(struct step_hook *hook);</div><div class='add'>+void unregister_user_step_hook(struct step_hook *hook);</div><div class='add'>+</div><div class='add'>+void register_kernel_step_hook(struct step_hook *hook);</div><div class='add'>+void unregister_kernel_step_hook(struct step_hook *hook);</div><div class='ctx'> </div><div class='ctx'> struct break_hook {</div><div class='ctx'> 	struct list_head node;</div><div class='del'>-	u32 esr_val;</div><div class='del'>-	u32 esr_mask;</div><div class='ctx'> 	int (*fn)(struct pt_regs *regs, unsigned int esr);</div><div class='add'>+	u16 imm;</div><div class='add'>+	u16 mask; /* These bits are ignored when comparing with imm */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void register_break_hook(struct break_hook *hook);</div><div class='del'>-void unregister_break_hook(struct break_hook *hook);</div><div class='add'>+void register_user_break_hook(struct break_hook *hook);</div><div class='add'>+void unregister_user_break_hook(struct break_hook *hook);</div><div class='add'>+</div><div class='add'>+void register_kernel_break_hook(struct break_hook *hook);</div><div class='add'>+void unregister_kernel_break_hook(struct break_hook *hook);</div><div class='ctx'> </div><div class='ctx'> u8 debug_monitors_arch(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h<br/>index 6adc1a90e7e6..355d120b78cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/elf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/elf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/elf.h</a></div><div class='hunk'>@@ -214,10 +214,10 @@ typedef compat_elf_greg_t		compat_elf_gregset_t[COMPAT_ELF_NGREG];</div><div class='ctx'> 	set_thread_flag(TIF_32BIT);					\</div><div class='ctx'>  })</div><div class='ctx'> #define COMPAT_ARCH_DLINFO</div><div class='del'>-extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,</div><div class='del'>-				      int uses_interp);</div><div class='add'>+extern int aarch32_setup_additional_pages(struct linux_binprm *bprm,</div><div class='add'>+					  int uses_interp);</div><div class='ctx'> #define compat_arch_setup_additional_pages \</div><div class='del'>-					aarch32_setup_vectors_page</div><div class='add'>+					aarch32_setup_additional_pages</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_COMPAT */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h<br/>index 52233f00d53d..0e27fe91d5ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/esr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/esr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/esr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/esr.h</a></div><div class='hunk'>@@ -156,9 +156,7 @@</div><div class='ctx'> 				 ESR_ELx_WFx_ISS_WFI)</div><div class='ctx'> </div><div class='ctx'> /* BRK instruction trap from AArch64 state */</div><div class='del'>-#define ESR_ELx_VAL_BRK64(imm)					\</div><div class='del'>-	((ESR_ELx_EC_BRK64 &lt;&lt; ESR_ELx_EC_SHIFT) | ESR_ELx_IL |	\</div><div class='del'>-	 ((imm) &amp; 0xffff))</div><div class='add'>+#define ESR_ELx_BRK64_ISS_COMMENT_MASK	0xffff</div><div class='ctx'> </div><div class='ctx'> /* ISS field definitions for System instruction traps */</div><div class='ctx'> #define ESR_ELx_SYS64_ISS_RES0_SHIFT	22</div><div class='hunk'>@@ -198,9 +196,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * User space cache operations have the following sysreg encoding</div><div class='ctx'>  * in System instructions.</div><div class='del'>- * op0=1, op1=3, op2=1, crn=7, crm={ 5, 10, 11, 12, 14 }, WRITE (L=0)</div><div class='add'>+ * op0=1, op1=3, op2=1, crn=7, crm={ 5, 10, 11, 12, 13, 14 }, WRITE (L=0)</div><div class='ctx'>  */</div><div class='ctx'> #define ESR_ELx_SYS64_ISS_CRM_DC_CIVAC	14</div><div class='add'>+#define ESR_ELx_SYS64_ISS_CRM_DC_CVADP	13</div><div class='ctx'> #define ESR_ELx_SYS64_ISS_CRM_DC_CVAP	12</div><div class='ctx'> #define ESR_ELx_SYS64_ISS_CRM_DC_CVAU	11</div><div class='ctx'> #define ESR_ELx_SYS64_ISS_CRM_DC_CVAC	10</div><div class='head'>diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h<br/>index cccb83ad7fa8..a56efb5626fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/futex.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/futex.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/futex.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/futex.h</a></div><div class='hunk'>@@ -23,26 +23,34 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='add'>+#define FUTEX_MAX_LOOPS	128 /* What's the largest number you can think of? */</div><div class='add'>+</div><div class='ctx'> #define __futex_atomic_op(insn, ret, oldval, uaddr, tmp, oparg)		\</div><div class='ctx'> do {									\</div><div class='add'>+	unsigned int loops = FUTEX_MAX_LOOPS;				\</div><div class='add'>+									\</div><div class='ctx'> 	uaccess_enable();						\</div><div class='ctx'> 	asm volatile(							\</div><div class='ctx'> "	prfm	pstl1strm, %2\n"					\</div><div class='ctx'> "1:	ldxr	%w1, %2\n"						\</div><div class='ctx'> 	insn "\n"							\</div><div class='del'>-"2:	stlxr	%w3, %w0, %2\n"						\</div><div class='del'>-"	cbnz	%w3, 1b\n"						\</div><div class='del'>-"	dmb	ish\n"							\</div><div class='add'>+"2:	stlxr	%w0, %w3, %2\n"						\</div><div class='add'>+"	cbz	%w0, 3f\n"						\</div><div class='add'>+"	sub	%w4, %w4, %w0\n"					\</div><div class='add'>+"	cbnz	%w4, 1b\n"						\</div><div class='add'>+"	mov	%w0, %w7\n"						\</div><div class='ctx'> "3:\n"									\</div><div class='add'>+"	dmb	ish\n"							\</div><div class='ctx'> "	.pushsection .fixup,\"ax\"\n"					\</div><div class='ctx'> "	.align	2\n"							\</div><div class='del'>-"4:	mov	%w0, %w5\n"						\</div><div class='add'>+"4:	mov	%w0, %w6\n"						\</div><div class='ctx'> "	b	3b\n"							\</div><div class='ctx'> "	.popsection\n"							\</div><div class='ctx'> 	_ASM_EXTABLE(1b, 4b)						\</div><div class='ctx'> 	_ASM_EXTABLE(2b, 4b)						\</div><div class='del'>-	: "=&amp;r" (ret), "=&amp;r" (oldval), "+Q" (*uaddr), "=&amp;r" (tmp)	\</div><div class='del'>-	: "r" (oparg), "Ir" (-EFAULT)					\</div><div class='add'>+	: "=&amp;r" (ret), "=&amp;r" (oldval), "+Q" (*uaddr), "=&amp;r" (tmp),	\</div><div class='add'>+	  "+r" (loops)							\</div><div class='add'>+	: "r" (oparg), "Ir" (-EFAULT), "Ir" (-EAGAIN)			\</div><div class='ctx'> 	: "memory");							\</div><div class='ctx'> 	uaccess_disable();						\</div><div class='ctx'> } while (0)</div><div class='hunk'>@@ -57,23 +65,23 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)</div><div class='ctx'> </div><div class='ctx'> 	switch (op) {</div><div class='ctx'> 	case FUTEX_OP_SET:</div><div class='del'>-		__futex_atomic_op("mov	%w0, %w4",</div><div class='add'>+		__futex_atomic_op("mov	%w3, %w5",</div><div class='ctx'> 				  ret, oldval, uaddr, tmp, oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FUTEX_OP_ADD:</div><div class='del'>-		__futex_atomic_op("add	%w0, %w1, %w4",</div><div class='add'>+		__futex_atomic_op("add	%w3, %w1, %w5",</div><div class='ctx'> 				  ret, oldval, uaddr, tmp, oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FUTEX_OP_OR:</div><div class='del'>-		__futex_atomic_op("orr	%w0, %w1, %w4",</div><div class='add'>+		__futex_atomic_op("orr	%w3, %w1, %w5",</div><div class='ctx'> 				  ret, oldval, uaddr, tmp, oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FUTEX_OP_ANDN:</div><div class='del'>-		__futex_atomic_op("and	%w0, %w1, %w4",</div><div class='add'>+		__futex_atomic_op("and	%w3, %w1, %w5",</div><div class='ctx'> 				  ret, oldval, uaddr, tmp, ~oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FUTEX_OP_XOR:</div><div class='del'>-		__futex_atomic_op("eor	%w0, %w1, %w4",</div><div class='add'>+		__futex_atomic_op("eor	%w3, %w1, %w5",</div><div class='ctx'> 				  ret, oldval, uaddr, tmp, oparg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -93,6 +101,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr,</div><div class='ctx'> 			      u32 oldval, u32 newval)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned int loops = FUTEX_MAX_LOOPS;</div><div class='ctx'> 	u32 val, tmp;</div><div class='ctx'> 	u32 __user *uaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -104,24 +113,30 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr,</div><div class='ctx'> 	asm volatile("// futex_atomic_cmpxchg_inatomic\n"</div><div class='ctx'> "	prfm	pstl1strm, %2\n"</div><div class='ctx'> "1:	ldxr	%w1, %2\n"</div><div class='del'>-"	sub	%w3, %w1, %w4\n"</div><div class='del'>-"	cbnz	%w3, 3f\n"</div><div class='del'>-"2:	stlxr	%w3, %w5, %2\n"</div><div class='del'>-"	cbnz	%w3, 1b\n"</div><div class='del'>-"	dmb	ish\n"</div><div class='add'>+"	sub	%w3, %w1, %w5\n"</div><div class='add'>+"	cbnz	%w3, 4f\n"</div><div class='add'>+"2:	stlxr	%w3, %w6, %2\n"</div><div class='add'>+"	cbz	%w3, 3f\n"</div><div class='add'>+"	sub	%w4, %w4, %w3\n"</div><div class='add'>+"	cbnz	%w4, 1b\n"</div><div class='add'>+"	mov	%w0, %w8\n"</div><div class='ctx'> "3:\n"</div><div class='add'>+"	dmb	ish\n"</div><div class='add'>+"4:\n"</div><div class='ctx'> "	.pushsection .fixup,\"ax\"\n"</div><div class='del'>-"4:	mov	%w0, %w6\n"</div><div class='del'>-"	b	3b\n"</div><div class='add'>+"5:	mov	%w0, %w7\n"</div><div class='add'>+"	b	4b\n"</div><div class='ctx'> "	.popsection\n"</div><div class='del'>-	_ASM_EXTABLE(1b, 4b)</div><div class='del'>-	_ASM_EXTABLE(2b, 4b)</div><div class='del'>-	: "+r" (ret), "=&amp;r" (val), "+Q" (*uaddr), "=&amp;r" (tmp)</div><div class='del'>-	: "r" (oldval), "r" (newval), "Ir" (-EFAULT)</div><div class='add'>+	_ASM_EXTABLE(1b, 5b)</div><div class='add'>+	_ASM_EXTABLE(2b, 5b)</div><div class='add'>+	: "+r" (ret), "=&amp;r" (val), "+Q" (*uaddr), "=&amp;r" (tmp), "+r" (loops)</div><div class='add'>+	: "r" (oldval), "r" (newval), "Ir" (-EFAULT), "Ir" (-EAGAIN)</div><div class='ctx'> 	: "memory");</div><div class='ctx'> 	uaccess_disable();</div><div class='ctx'> </div><div class='del'>-	*uval = val;</div><div class='add'>+	if (!ret)</div><div class='add'>+		*uval = val;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h<br/>index 400b80b49595..b4bfb6672168 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/hwcap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/hwcap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/hwcap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/hwcap.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #define __ASM_HWCAP_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/asm/hwcap.h&gt;</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COMPAT_HWCAP_HALF	(1 &lt;&lt; 1)</div><div class='ctx'> #define COMPAT_HWCAP_THUMB	(1 &lt;&lt; 2)</div><div class='hunk'>@@ -40,11 +41,67 @@</div><div class='ctx'> #define COMPAT_HWCAP2_CRC32	(1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For userspace we represent hwcaps as a collection of HWCAP{,2}_x bitfields</div><div class='add'>+ * as described in uapi/asm/hwcap.h. For the kernel we represent hwcaps as</div><div class='add'>+ * natural numbers (in a single range of size MAX_CPU_FEATURES) defined here</div><div class='add'>+ * with prefix KERNEL_HWCAP_ mapped to their HWCAP{,2}_x counterpart.</div><div class='add'>+ *</div><div class='add'>+ * Hwcaps should be set and tested within the kernel via the</div><div class='add'>+ * cpu_{set,have}_named_feature(feature) where feature is the unique suffix</div><div class='add'>+ * of KERNEL_HWCAP_{feature}.</div><div class='add'>+ */</div><div class='add'>+#define __khwcap_feature(x)		const_ilog2(HWCAP_ ## x)</div><div class='add'>+#define KERNEL_HWCAP_FP			__khwcap_feature(FP)</div><div class='add'>+#define KERNEL_HWCAP_ASIMD		__khwcap_feature(ASIMD)</div><div class='add'>+#define KERNEL_HWCAP_EVTSTRM		__khwcap_feature(EVTSTRM)</div><div class='add'>+#define KERNEL_HWCAP_AES		__khwcap_feature(AES)</div><div class='add'>+#define KERNEL_HWCAP_PMULL		__khwcap_feature(PMULL)</div><div class='add'>+#define KERNEL_HWCAP_SHA1		__khwcap_feature(SHA1)</div><div class='add'>+#define KERNEL_HWCAP_SHA2		__khwcap_feature(SHA2)</div><div class='add'>+#define KERNEL_HWCAP_CRC32		__khwcap_feature(CRC32)</div><div class='add'>+#define KERNEL_HWCAP_ATOMICS		__khwcap_feature(ATOMICS)</div><div class='add'>+#define KERNEL_HWCAP_FPHP		__khwcap_feature(FPHP)</div><div class='add'>+#define KERNEL_HWCAP_ASIMDHP		__khwcap_feature(ASIMDHP)</div><div class='add'>+#define KERNEL_HWCAP_CPUID		__khwcap_feature(CPUID)</div><div class='add'>+#define KERNEL_HWCAP_ASIMDRDM		__khwcap_feature(ASIMDRDM)</div><div class='add'>+#define KERNEL_HWCAP_JSCVT		__khwcap_feature(JSCVT)</div><div class='add'>+#define KERNEL_HWCAP_FCMA		__khwcap_feature(FCMA)</div><div class='add'>+#define KERNEL_HWCAP_LRCPC		__khwcap_feature(LRCPC)</div><div class='add'>+#define KERNEL_HWCAP_DCPOP		__khwcap_feature(DCPOP)</div><div class='add'>+#define KERNEL_HWCAP_SHA3		__khwcap_feature(SHA3)</div><div class='add'>+#define KERNEL_HWCAP_SM3		__khwcap_feature(SM3)</div><div class='add'>+#define KERNEL_HWCAP_SM4		__khwcap_feature(SM4)</div><div class='add'>+#define KERNEL_HWCAP_ASIMDDP		__khwcap_feature(ASIMDDP)</div><div class='add'>+#define KERNEL_HWCAP_SHA512		__khwcap_feature(SHA512)</div><div class='add'>+#define KERNEL_HWCAP_SVE		__khwcap_feature(SVE)</div><div class='add'>+#define KERNEL_HWCAP_ASIMDFHM		__khwcap_feature(ASIMDFHM)</div><div class='add'>+#define KERNEL_HWCAP_DIT		__khwcap_feature(DIT)</div><div class='add'>+#define KERNEL_HWCAP_USCAT		__khwcap_feature(USCAT)</div><div class='add'>+#define KERNEL_HWCAP_ILRCPC		__khwcap_feature(ILRCPC)</div><div class='add'>+#define KERNEL_HWCAP_FLAGM		__khwcap_feature(FLAGM)</div><div class='add'>+#define KERNEL_HWCAP_SSBS		__khwcap_feature(SSBS)</div><div class='add'>+#define KERNEL_HWCAP_SB			__khwcap_feature(SB)</div><div class='add'>+#define KERNEL_HWCAP_PACA		__khwcap_feature(PACA)</div><div class='add'>+#define KERNEL_HWCAP_PACG		__khwcap_feature(PACG)</div><div class='add'>+</div><div class='add'>+#define __khwcap2_feature(x)		(const_ilog2(HWCAP2_ ## x) + 32)</div><div class='add'>+#define KERNEL_HWCAP_DCPODP		__khwcap2_feature(DCPODP)</div><div class='add'>+#define KERNEL_HWCAP_SVE2		__khwcap2_feature(SVE2)</div><div class='add'>+#define KERNEL_HWCAP_SVEAES		__khwcap2_feature(SVEAES)</div><div class='add'>+#define KERNEL_HWCAP_SVEPMULL		__khwcap2_feature(SVEPMULL)</div><div class='add'>+#define KERNEL_HWCAP_SVEBITPERM		__khwcap2_feature(SVEBITPERM)</div><div class='add'>+#define KERNEL_HWCAP_SVESHA3		__khwcap2_feature(SVESHA3)</div><div class='add'>+#define KERNEL_HWCAP_SVESM4		__khwcap2_feature(SVESM4)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This yields a mask that user programs can use to figure out what</div><div class='ctx'>  * instruction set this cpu supports.</div><div class='ctx'>  */</div><div class='del'>-#define ELF_HWCAP		(elf_hwcap)</div><div class='add'>+#define ELF_HWCAP		cpu_get_elf_hwcap()</div><div class='add'>+#define ELF_HWCAP2		cpu_get_elf_hwcap2()</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> #define COMPAT_ELF_HWCAP	(compat_elf_hwcap)</div><div class='hunk'>@@ -60,6 +117,5 @@ enum {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern unsigned long elf_hwcap;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h<br/>index 9c01f04db64d..ec894de0ed4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/insn.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/insn.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/insn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/insn.h</a></div><div class='hunk'>@@ -277,6 +277,7 @@ __AARCH64_INSN_FUNCS(adrp,	0x9F000000, 0x90000000)</div><div class='ctx'> __AARCH64_INSN_FUNCS(prfm,	0x3FC00000, 0x39800000)</div><div class='ctx'> __AARCH64_INSN_FUNCS(prfm_lit,	0xFF000000, 0xD8000000)</div><div class='ctx'> __AARCH64_INSN_FUNCS(str_reg,	0x3FE0EC00, 0x38206800)</div><div class='add'>+__AARCH64_INSN_FUNCS(ldadd,	0x3F20FC00, 0xB8200000)</div><div class='ctx'> __AARCH64_INSN_FUNCS(ldr_reg,	0x3FE0EC00, 0x38606800)</div><div class='ctx'> __AARCH64_INSN_FUNCS(ldr_lit,	0xBF000000, 0x18000000)</div><div class='ctx'> __AARCH64_INSN_FUNCS(ldrsw_lit,	0xFF000000, 0x98000000)</div><div class='hunk'>@@ -394,6 +395,13 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg,</div><div class='ctx'> 				   enum aarch64_insn_register state,</div><div class='ctx'> 				   enum aarch64_insn_size_type size,</div><div class='ctx'> 				   enum aarch64_insn_ldst_type type);</div><div class='add'>+u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result,</div><div class='add'>+			   enum aarch64_insn_register address,</div><div class='add'>+			   enum aarch64_insn_register value,</div><div class='add'>+			   enum aarch64_insn_size_type size);</div><div class='add'>+u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address,</div><div class='add'>+			   enum aarch64_insn_register value,</div><div class='add'>+			   enum aarch64_insn_size_type size);</div><div class='ctx'> u32 aarch64_insn_gen_add_sub_imm(enum aarch64_insn_register dst,</div><div class='ctx'> 				 enum aarch64_insn_register src,</div><div class='ctx'> 				 int imm, enum aarch64_insn_variant variant,</div><div class='head'>diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h<br/>index 8bb7210ac286..b807cb9b517d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/io.h</a></div><div class='hunk'>@@ -124,8 +124,6 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)</div><div class='ctx'> #define __io_par(v)		__iormb(v)</div><div class='ctx'> #define __iowmb()		wmb()</div><div class='ctx'> </div><div class='del'>-#define mmiowb()		do { } while (0)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Relaxed I/O memory access primitives. These follow the Device memory</div><div class='ctx'>  * ordering rules but do not guarantee any ordering relative to Normal memory</div><div class='head'>diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h<br/>index 43d8366c1e87..629963189085 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/irqflags.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/irqflags.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/irqflags.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/irqflags.h</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static inline void arch_local_irq_enable(void)</div><div class='ctx'> 	asm volatile(ALTERNATIVE(</div><div class='ctx'> 		"msr	daifclr, #2		// arch_local_irq_enable\n"</div><div class='ctx'> 		"nop",</div><div class='del'>-		"msr_s  " __stringify(SYS_ICC_PMR_EL1) ",%0\n"</div><div class='add'>+		__msr_s(SYS_ICC_PMR_EL1, "%0")</div><div class='ctx'> 		"dsb	sy",</div><div class='ctx'> 		ARM64_HAS_IRQ_PRIO_MASKING)</div><div class='ctx'> 		:</div><div class='hunk'>@@ -55,7 +55,7 @@ static inline void arch_local_irq_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile(ALTERNATIVE(</div><div class='ctx'> 		"msr	daifset, #2		// arch_local_irq_disable",</div><div class='del'>-		"msr_s  " __stringify(SYS_ICC_PMR_EL1) ", %0",</div><div class='add'>+		__msr_s(SYS_ICC_PMR_EL1, "%0"),</div><div class='ctx'> 		ARM64_HAS_IRQ_PRIO_MASKING)</div><div class='ctx'> 		:</div><div class='ctx'> 		: "r" ((unsigned long) GIC_PRIO_IRQOFF)</div><div class='hunk'>@@ -86,7 +86,7 @@ static inline unsigned long arch_local_save_flags(void)</div><div class='ctx'> 			"mov	%0, %1\n"</div><div class='ctx'> 			"nop\n"</div><div class='ctx'> 			"nop",</div><div class='del'>-			"mrs_s	%0, " __stringify(SYS_ICC_PMR_EL1) "\n"</div><div class='add'>+			__mrs_s("%0", SYS_ICC_PMR_EL1)</div><div class='ctx'> 			"ands	%1, %1, " __stringify(PSR_I_BIT) "\n"</div><div class='ctx'> 			"csel	%0, %0, %2, eq",</div><div class='ctx'> 			ARM64_HAS_IRQ_PRIO_MASKING)</div><div class='hunk'>@@ -116,7 +116,7 @@ static inline void arch_local_irq_restore(unsigned long flags)</div><div class='ctx'> 	asm volatile(ALTERNATIVE(</div><div class='ctx'> 			"msr	daif, %0\n"</div><div class='ctx'> 			"nop",</div><div class='del'>-			"msr_s	" __stringify(SYS_ICC_PMR_EL1) ", %0\n"</div><div class='add'>+			__msr_s(SYS_ICC_PMR_EL1, "%0")</div><div class='ctx'> 			"dsb	sy",</div><div class='ctx'> 			ARM64_HAS_IRQ_PRIO_MASKING)</div><div class='ctx'> 		: "+r" (flags)</div><div class='head'>diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h<br/>index d5a44cf859e9..21721fbf44e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/kprobes.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/kprobes.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/kprobes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/kprobes.h</a></div><div class='hunk'>@@ -54,8 +54,6 @@ void arch_remove_kprobe(struct kprobe *);</div><div class='ctx'> int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);</div><div class='ctx'> int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 			     unsigned long val, void *data);</div><div class='del'>-int kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr);</div><div class='del'>-int kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr);</div><div class='ctx'> void kretprobe_trampoline(void);</div><div class='ctx'> void __kprobes *trampoline_probe_handler(struct pt_regs *regs);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h<br/>index 4da765f2cca5..c3060833b7a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/kvm_hyp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/kvm_hyp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/kvm_hyp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/kvm_hyp.h</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> 	({								\</div><div class='ctx'> 		u64 reg;						\</div><div class='ctx'> 		asm volatile(ALTERNATIVE("mrs %0, " __stringify(r##nvh),\</div><div class='del'>-					 "mrs_s %0, " __stringify(r##vh),\</div><div class='add'>+					 __mrs_s("%0", r##vh),		\</div><div class='ctx'> 					 ARM64_HAS_VIRT_HOST_EXTN)	\</div><div class='ctx'> 			     : "=r" (reg));				\</div><div class='ctx'> 		reg;							\</div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		u64 __val = (u64)(v);					\</div><div class='ctx'> 		asm volatile(ALTERNATIVE("msr " __stringify(r##nvh) ", %x0",\</div><div class='del'>-					 "msr_s " __stringify(r##vh) ", %x0",\</div><div class='add'>+					 __msr_s(r##vh, "%x0"),		\</div><div class='ctx'> 					 ARM64_HAS_VIRT_HOST_EXTN)	\</div><div class='ctx'> 					 : : "rZ" (__val));		\</div><div class='ctx'> 	} while (0)</div><div class='head'>diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h<br/>index b0742a16c6c9..ebeefcf835e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/kvm_mmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/kvm_mmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/kvm_mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/kvm_mmu.h</a></div><div class='hunk'>@@ -445,6 +445,17 @@ static inline int kvm_read_guest_lock(struct kvm *kvm,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int kvm_write_guest_lock(struct kvm *kvm, gpa_t gpa,</div><div class='add'>+				       const void *data, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	int srcu_idx = srcu_read_lock(&amp;kvm-&gt;srcu);</div><div class='add'>+	int ret = kvm_write_guest(kvm, gpa, data, len);</div><div class='add'>+</div><div class='add'>+	srcu_read_unlock(&amp;kvm-&gt;srcu, srcu_idx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KVM_INDIRECT_VECTORS</div><div class='ctx'> /*</div><div class='ctx'>  * EL2 vectors can be mapped and rerouted in a number of ways,</div><div class='head'>diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h<br/>index 290195168bb3..2cb8248fa2c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/memory.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/memory.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/memory.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/memory.h</a></div><div class='hunk'>@@ -302,7 +302,7 @@ static inline void *phys_to_virt(phys_addr_t x)</div><div class='ctx'>  */</div><div class='ctx'> #define ARCH_PFN_OFFSET		((unsigned long)PHYS_PFN_OFFSET)</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SPARSEMEM_VMEMMAP</div><div class='add'>+#if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL)</div><div class='ctx'> #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> #define _virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h<br/>index 905e1bb0e7bd..cd9f4e9d04d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/module.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/module.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/module.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/module.h</a></div><div class='hunk'>@@ -73,4 +73,9 @@ static inline bool is_forbidden_offset_for_adrp(void *place)</div><div class='ctx'> struct plt_entry get_plt_entry(u64 dst, void *pc);</div><div class='ctx'> bool plt_entries_equal(const struct plt_entry *a, const struct plt_entry *b);</div><div class='ctx'> </div><div class='add'>+static inline bool plt_entry_is_initialized(const struct plt_entry *e)</div><div class='add'>+{</div><div class='add'>+	return e-&gt;adrp || e-&gt;add || e-&gt;br;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_MODULE_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h<br/>index 52fa47c73bf0..dabba4b2c61f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/pgalloc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/pgalloc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/pgalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -33,12 +33,22 @@</div><div class='ctx'> </div><div class='ctx'> static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	return (pmd_t *)__get_free_page(PGALLOC_GFP);</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	page = alloc_page(PGALLOC_GFP);</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (!pgtable_pmd_page_ctor(page)) {</div><div class='add'>+		__free_page(page);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return page_address(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pmd_free(struct mm_struct *mm, pmd_t *pmdp)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON((unsigned long)pmdp &amp; (PAGE_SIZE-1));</div><div class='add'>+	pgtable_pmd_page_dtor(virt_to_page(pmdp));</div><div class='ctx'> 	free_page((unsigned long)pmdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h<br/>index de70c1eabf33..2c41b04708fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/pgtable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/pgtable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/pgtable.h</a></div><div class='hunk'>@@ -478,6 +478,8 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)</div><div class='ctx'> 	return __pmd_to_phys(pmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void pte_unmap(pte_t *pte) { }</div><div class='add'>+</div><div class='ctx'> /* Find an entry in the third-level page table. */</div><div class='ctx'> #define pte_index(addr)		(((addr) &gt;&gt; PAGE_SHIFT) &amp; (PTRS_PER_PTE - 1))</div><div class='ctx'> </div><div class='hunk'>@@ -485,9 +487,6 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)</div><div class='ctx'> #define pte_offset_kernel(dir,addr)	((pte_t *)__va(pte_offset_phys((dir), (addr))))</div><div class='ctx'> </div><div class='ctx'> #define pte_offset_map(dir,addr)	pte_offset_kernel((dir), (addr))</div><div class='del'>-#define pte_offset_map_nested(dir,addr)	pte_offset_kernel((dir), (addr))</div><div class='del'>-#define pte_unmap(pte)			do { } while (0)</div><div class='del'>-#define pte_unmap_nested(pte)		do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #define pte_set_fixmap(addr)		((pte_t *)set_fixmap_offset(FIX_PTE, addr))</div><div class='ctx'> #define pte_set_fixmap_offset(pmd, addr)	pte_set_fixmap(pte_offset_phys(pmd, addr))</div><div class='head'>diff --git a/arch/arm64/include/asm/pointer_auth.h b/arch/arm64/include/asm/pointer_auth.h<br/>index 15d49515efdd..d328540cb85e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/pointer_auth.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/pointer_auth.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/pointer_auth.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/pointer_auth.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'> #ifndef __ASM_POINTER_AUTH_H</div><div class='ctx'> #define __ASM_POINTER_AUTH_H</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h<br/>index 5d9ce62bdebd..fcd0e691b1ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/processor.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/processor.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/processor.h</a></div><div class='hunk'>@@ -57,7 +57,15 @@</div><div class='ctx'> #define TASK_SIZE_64		(UL(1) &lt;&lt; vabits_user)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='add'>+#if defined(CONFIG_ARM64_64K_PAGES) &amp;&amp; defined(CONFIG_KUSER_HELPERS)</div><div class='add'>+/*</div><div class='add'>+ * With CONFIG_ARM64_64K_PAGES enabled, the last page is occupied</div><div class='add'>+ * by the compat vectors page.</div><div class='add'>+ */</div><div class='ctx'> #define TASK_SIZE_32		UL(0x100000000)</div><div class='add'>+#else</div><div class='add'>+#define TASK_SIZE_32		(UL(0x100000000) - PAGE_SIZE)</div><div class='add'>+#endif /* CONFIG_ARM64_64K_PAGES */</div><div class='ctx'> #define TASK_SIZE		(test_thread_flag(TIF_32BIT) ? \</div><div class='ctx'> 				TASK_SIZE_32 : TASK_SIZE_64)</div><div class='ctx'> #define TASK_SIZE_OF(tsk)	(test_tsk_thread_flag(tsk, TIF_32BIT) ? \</div><div class='head'>diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h<br/>index ec60174c8c18..b2de32939ada 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/ptrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/ptrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/ptrace.h</a></div><div class='hunk'>@@ -305,6 +305,28 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)</div><div class='ctx'> 	return regs-&gt;regs[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * regs_get_kernel_argument() - get Nth function argument in kernel</div><div class='add'>+ * @regs:	pt_regs of that context</div><div class='add'>+ * @n:		function argument number (start from 0)</div><div class='add'>+ *</div><div class='add'>+ * regs_get_argument() returns @n th argument of the function call.</div><div class='add'>+ *</div><div class='add'>+ * Note that this chooses the most likely register mapping. In very rare</div><div class='add'>+ * cases this may not return correct data, for example, if one of the</div><div class='add'>+ * function parameters is 16 bytes or bigger. In such cases, we cannot</div><div class='add'>+ * get access the parameter correctly and the register assignment of</div><div class='add'>+ * subsequent parameters will be shifted.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long regs_get_kernel_argument(struct pt_regs *regs,</div><div class='add'>+						     unsigned int n)</div><div class='add'>+{</div><div class='add'>+#define NR_REG_ARGUMENTS 8</div><div class='add'>+	if (n &lt; NR_REG_ARGUMENTS)</div><div class='add'>+		return pt_regs_read_reg(regs, n);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* We must avoid circular header include via sched.h */</div><div class='ctx'> struct task_struct;</div><div class='ctx'> int valid_user_regs(struct user_pt_regs *regs, struct task_struct *task);</div><div class='head'>diff --git a/arch/arm64/include/asm/sdei.h b/arch/arm64/include/asm/sdei.h<br/>index ffe47d766c25..63e0b92a5fbb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/sdei.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/sdei.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/sdei.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/sdei.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'> // Copyright (C) 2017 Arm Ltd.</div><div class='ctx'> #ifndef __ASM_SDEI_H</div><div class='ctx'> #define __ASM_SDEI_H</div><div class='head'>diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h<br/>index 81abea0b7650..58e288aaf0ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/signal32.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/signal32.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/signal32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/signal32.h</a></div><div class='hunk'>@@ -20,8 +20,6 @@</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> </div><div class='del'>-#define AARCH32_KERN_SIGRET_CODE_OFFSET	0x500</div><div class='del'>-</div><div class='ctx'> int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 		       struct pt_regs *regs);</div><div class='ctx'> int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,</div><div class='head'>diff --git a/arch/arm64/include/asm/stage2_pgtable.h b/arch/arm64/include/asm/stage2_pgtable.h<br/>index 5412fa40825e..915809e4ac32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/stage2_pgtable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/stage2_pgtable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/stage2_pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/stage2_pgtable.h</a></div><div class='hunk'>@@ -119,7 +119,7 @@ static inline pud_t *stage2_pud_offset(struct kvm *kvm,</div><div class='ctx'> static inline void stage2_pud_free(struct kvm *kvm, pud_t *pud)</div><div class='ctx'> {</div><div class='ctx'> 	if (kvm_stage2_has_pud(kvm))</div><div class='del'>-		pud_free(NULL, pud);</div><div class='add'>+		free_page((unsigned long)pud);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool stage2_pud_table_empty(struct kvm *kvm, pud_t *pudp)</div><div class='hunk'>@@ -192,7 +192,7 @@ static inline pmd_t *stage2_pmd_offset(struct kvm *kvm,</div><div class='ctx'> static inline void stage2_pmd_free(struct kvm *kvm, pmd_t *pmd)</div><div class='ctx'> {</div><div class='ctx'> 	if (kvm_stage2_has_pmd(kvm))</div><div class='del'>-		pmd_free(NULL, pmd);</div><div class='add'>+		free_page((unsigned long)pmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool stage2_pud_huge(struct kvm *kvm, pud_t pud)</div><div class='head'>diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h<br/>index ad8be16a39c9..a65167f5cded 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/syscall.h</a></div><div class='hunk'>@@ -65,61 +65,31 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (i + n &gt; SYSCALL_MAX_ARGS) {</div><div class='del'>-		unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;</div><div class='del'>-		unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;</div><div class='del'>-		pr_warning("%s called with max args %d, handling only %d\n",</div><div class='del'>-			   __func__, i + n, SYSCALL_MAX_ARGS);</div><div class='del'>-		memset(args_bad, 0, n_bad * sizeof(args[0]));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		args[0] = regs-&gt;orig_x0;</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(args, &amp;regs-&gt;regs[i], n * sizeof(args[0]));</div><div class='add'>+	args[0] = regs-&gt;orig_x0;</div><div class='add'>+	args++;</div><div class='add'>+</div><div class='add'>+	memcpy(args, &amp;regs-&gt;regs[1], 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (i + n &gt; SYSCALL_MAX_ARGS) {</div><div class='del'>-		pr_warning("%s called with max args %d, handling only %d\n",</div><div class='del'>-			   __func__, i + n, SYSCALL_MAX_ARGS);</div><div class='del'>-		n = SYSCALL_MAX_ARGS - i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		regs-&gt;orig_x0 = args[0];</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;regs-&gt;regs[i], args, n * sizeof(args[0]));</div><div class='add'>+	regs-&gt;orig_x0 = args[0];</div><div class='add'>+	args++;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;regs-&gt;regs[1], args, 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We don't care about endianness (__AUDIT_ARCH_LE bit) here because</div><div class='ctx'>  * AArch64 has the same system calls both on little- and big- endian.</div><div class='ctx'>  */</div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	if (is_compat_task())</div><div class='add'>+	if (is_compat_thread(task_thread_info(task)))</div><div class='ctx'> 		return AUDIT_ARCH_ARM;</div><div class='ctx'> </div><div class='ctx'> 	return AUDIT_ARCH_AARCH64;</div><div class='head'>diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h<br/>index 5b267dec6194..3f7b917e8f3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/sysreg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/sysreg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/sysreg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/sysreg.h</a></div><div class='hunk'>@@ -606,6 +606,20 @@</div><div class='ctx'> #define ID_AA64PFR1_SSBS_PSTATE_ONLY	1</div><div class='ctx'> #define ID_AA64PFR1_SSBS_PSTATE_INSNS	2</div><div class='ctx'> </div><div class='add'>+/* id_aa64zfr0 */</div><div class='add'>+#define ID_AA64ZFR0_SM4_SHIFT		40</div><div class='add'>+#define ID_AA64ZFR0_SHA3_SHIFT		32</div><div class='add'>+#define ID_AA64ZFR0_BITPERM_SHIFT	16</div><div class='add'>+#define ID_AA64ZFR0_AES_SHIFT		4</div><div class='add'>+#define ID_AA64ZFR0_SVEVER_SHIFT	0</div><div class='add'>+</div><div class='add'>+#define ID_AA64ZFR0_SM4			0x1</div><div class='add'>+#define ID_AA64ZFR0_SHA3		0x1</div><div class='add'>+#define ID_AA64ZFR0_BITPERM		0x1</div><div class='add'>+#define ID_AA64ZFR0_AES			0x1</div><div class='add'>+#define ID_AA64ZFR0_AES_PMULL		0x2</div><div class='add'>+#define ID_AA64ZFR0_SVEVER_SVE2		0x1</div><div class='add'>+</div><div class='ctx'> /* id_aa64mmfr0 */</div><div class='ctx'> #define ID_AA64MMFR0_TGRAN4_SHIFT	28</div><div class='ctx'> #define ID_AA64MMFR0_TGRAN64_SHIFT	24</div><div class='hunk'>@@ -746,20 +760,39 @@</div><div class='ctx'> #include &lt;linux/build_bug.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-asm(</div><div class='del'>-"	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n"</div><div class='del'>-"	.equ	.L__reg_num_x\\num, \\num\n"</div><div class='del'>-"	.endr\n"</div><div class='add'>+#define __DEFINE_MRS_MSR_S_REGNUM				\</div><div class='add'>+"	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" \</div><div class='add'>+"	.equ	.L__reg_num_x\\num, \\num\n"			\</div><div class='add'>+"	.endr\n"						\</div><div class='ctx'> "	.equ	.L__reg_num_xzr, 31\n"</div><div class='del'>-"\n"</div><div class='del'>-"	.macro	mrs_s, rt, sreg\n"</div><div class='del'>-	__emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt))</div><div class='add'>+</div><div class='add'>+#define DEFINE_MRS_S						\</div><div class='add'>+	__DEFINE_MRS_MSR_S_REGNUM				\</div><div class='add'>+"	.macro	mrs_s, rt, sreg\n"				\</div><div class='add'>+	__emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt))	\</div><div class='ctx'> "	.endm\n"</div><div class='del'>-"\n"</div><div class='del'>-"	.macro	msr_s, sreg, rt\n"</div><div class='del'>-	__emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt))</div><div class='add'>+</div><div class='add'>+#define DEFINE_MSR_S						\</div><div class='add'>+	__DEFINE_MRS_MSR_S_REGNUM				\</div><div class='add'>+"	.macro	msr_s, sreg, rt\n"				\</div><div class='add'>+	__emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt))	\</div><div class='ctx'> "	.endm\n"</div><div class='del'>-);</div><div class='add'>+</div><div class='add'>+#define UNDEFINE_MRS_S						\</div><div class='add'>+"	.purgem	mrs_s\n"</div><div class='add'>+</div><div class='add'>+#define UNDEFINE_MSR_S						\</div><div class='add'>+"	.purgem	msr_s\n"</div><div class='add'>+</div><div class='add'>+#define __mrs_s(v, r)						\</div><div class='add'>+	DEFINE_MRS_S						\</div><div class='add'>+"	mrs_s " v ", " __stringify(r) "\n"			\</div><div class='add'>+	UNDEFINE_MRS_S</div><div class='add'>+</div><div class='add'>+#define __msr_s(r, v)						\</div><div class='add'>+	DEFINE_MSR_S						\</div><div class='add'>+"	msr_s " __stringify(r) ", " v "\n"			\</div><div class='add'>+	UNDEFINE_MSR_S</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Unlike read_cpuid, calls to read_sysreg are never expected to be</div><div class='hunk'>@@ -787,13 +820,13 @@ asm(</div><div class='ctx'>  */</div><div class='ctx'> #define read_sysreg_s(r) ({						\</div><div class='ctx'> 	u64 __val;							\</div><div class='del'>-	asm volatile("mrs_s %0, " __stringify(r) : "=r" (__val));	\</div><div class='add'>+	asm volatile(__mrs_s("%0", r) : "=r" (__val));			\</div><div class='ctx'> 	__val;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> #define write_sysreg_s(v, r) do {					\</div><div class='ctx'> 	u64 __val = (u64)(v);						\</div><div class='del'>-	asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val));	\</div><div class='add'>+	asm volatile(__msr_s(r, "%x0") : : "rZ" (__val));		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h<br/>index 32693f34f431..fca95424e873 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/system_misc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/system_misc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/system_misc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/system_misc.h</a></div><div class='hunk'>@@ -41,7 +41,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int,</div><div class='ctx'> 			   int sig, int code, const char *name);</div><div class='ctx'> </div><div class='ctx'> struct mm_struct;</div><div class='del'>-extern void show_pte(unsigned long addr);</div><div class='ctx'> extern void __show_regs(struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);</div><div class='head'>diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h<br/>index 106fdc951b6e..a287189ca8b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/tlb.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@ static inline void __tlb_remove_table(void *_table)</div><div class='ctx'> 	free_page_and_swap_cache((struct page *)_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define tlb_flush tlb_flush</div><div class='ctx'> static void tlb_flush(struct mmu_gather *tlb);</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='hunk'>@@ -62,7 +63,10 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,</div><div class='ctx'> static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,</div><div class='ctx'> 				  unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	tlb_remove_table(tlb, virt_to_page(pmdp));</div><div class='add'>+	struct page *page = virt_to_page(pmdp);</div><div class='add'>+</div><div class='add'>+	pgtable_pmd_page_dtor(page);</div><div class='add'>+	tlb_remove_table(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h<br/>index d1dd93436e1e..f2a83ff6b73c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/unistd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/unistd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/unistd.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)</div><div class='ctx'> #define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)</div><div class='ctx'> </div><div class='del'>-#define __NR_compat_syscalls		424</div><div class='add'>+#define __NR_compat_syscalls		428</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_SYS_CLONE</div><div class='head'>diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h<br/>index 5590f2623690..23f1a44acada 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/unistd32.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/unistd32.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/unistd32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/unistd32.h</a></div><div class='hunk'>@@ -866,6 +866,14 @@ __SYSCALL(__NR_rt_sigtimedwait_time64, compat_sys_rt_sigtimedwait_time64)</div><div class='ctx'> __SYSCALL(__NR_futex_time64, sys_futex)</div><div class='ctx'> #define __NR_sched_rr_get_interval_time64 423</div><div class='ctx'> __SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval)</div><div class='add'>+#define __NR_pidfd_send_signal 424</div><div class='add'>+__SYSCALL(__NR_pidfd_send_signal, sys_pidfd_send_signal)</div><div class='add'>+#define __NR_io_uring_setup 425</div><div class='add'>+__SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)</div><div class='add'>+#define __NR_io_uring_enter 426</div><div class='add'>+__SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)</div><div class='add'>+#define __NR_io_uring_register 427</div><div class='add'>+__SYSCALL(__NR_io_uring_register, sys_io_uring_register)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Please add new compat syscalls above this comment and update</div><div class='head'>diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h<br/>index 2b9a63771eda..f89263c8e11a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/vdso_datapage.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/vdso_datapage.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/vdso_datapage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/vdso_datapage.h</a></div><div class='hunk'>@@ -38,6 +38,7 @@ struct vdso_data {</div><div class='ctx'> 	__u32 tz_minuteswest;	/* Whacky timezone stuff */</div><div class='ctx'> 	__u32 tz_dsttime;</div><div class='ctx'> 	__u32 use_syscall;</div><div class='add'>+	__u32 hrtimer_res;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='head'>diff --git a/arch/arm64/include/asm/vmap_stack.h b/arch/arm64/include/asm/vmap_stack.h<br/>index 0b5ec6e08c10..0a12115d9638 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/vmap_stack.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/asm/vmap_stack.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/asm/vmap_stack.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/asm/vmap_stack.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'> // Copyright (C) 2017 Arm Ltd.</div><div class='ctx'> #ifndef __ASM_VMAP_STACK_H</div><div class='ctx'> #define __ASM_VMAP_STACK_H</div><div class='head'>diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h<br/>index 5f0750c2199c..1a772b162191 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/uapi/asm/hwcap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/include/uapi/asm/hwcap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/include/uapi/asm/hwcap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/include/uapi/asm/hwcap.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #define _UAPI__ASM_HWCAP_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP</div><div class='add'>+ * HWCAP flags - for AT_HWCAP</div><div class='ctx'>  */</div><div class='ctx'> #define HWCAP_FP		(1 &lt;&lt; 0)</div><div class='ctx'> #define HWCAP_ASIMD		(1 &lt;&lt; 1)</div><div class='hunk'>@@ -53,4 +53,15 @@</div><div class='ctx'> #define HWCAP_PACA		(1 &lt;&lt; 30)</div><div class='ctx'> #define HWCAP_PACG		(1UL &lt;&lt; 31)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * HWCAP2 flags - for AT_HWCAP2</div><div class='add'>+ */</div><div class='add'>+#define HWCAP2_DCPODP		(1 &lt;&lt; 0)</div><div class='add'>+#define HWCAP2_SVE2		(1 &lt;&lt; 1)</div><div class='add'>+#define HWCAP2_SVEAES		(1 &lt;&lt; 2)</div><div class='add'>+#define HWCAP2_SVEPMULL		(1 &lt;&lt; 3)</div><div class='add'>+#define HWCAP2_SVEBITPERM	(1 &lt;&lt; 4)</div><div class='add'>+#define HWCAP2_SVESHA3		(1 &lt;&lt; 5)</div><div class='add'>+#define HWCAP2_SVESM4		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='ctx'> #endif /* _UAPI__ASM_HWCAP_H */</div><div class='head'>diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile<br/>index cd434d0719c1..9e7dcb2c31c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/Makefile</a></div><div class='hunk'>@@ -7,9 +7,9 @@ CPPFLAGS_vmlinux.lds	:= -DTEXT_OFFSET=$(TEXT_OFFSET)</div><div class='ctx'> AFLAGS_head.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)</div><div class='ctx'> CFLAGS_armv8_deprecated.o := -I$(src)</div><div class='ctx'> </div><div class='del'>-CFLAGS_REMOVE_ftrace.o = -pg</div><div class='del'>-CFLAGS_REMOVE_insn.o = -pg</div><div class='del'>-CFLAGS_REMOVE_return_address.o = -pg</div><div class='add'>+CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)</div><div class='add'>+CFLAGS_REMOVE_insn.o = $(CC_FLAGS_FTRACE)</div><div class='add'>+CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE)</div><div class='ctx'> </div><div class='ctx'> # Object file lists.</div><div class='ctx'> obj-y			:= debug-monitors.o entry.o irq.o fpsimd.o		\</div><div class='hunk'>@@ -27,8 +27,9 @@ OBJCOPYFLAGS := --prefix-symbols=__efistub_</div><div class='ctx'> $(obj)/%.stub.o: $(obj)/%.o FORCE</div><div class='ctx'> 	$(call if_changed,objcopy)</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_COMPAT)			+= sys32.o kuser32.o signal32.o 	\</div><div class='del'>-					   sys_compat.o</div><div class='add'>+obj-$(CONFIG_COMPAT)			+= sys32.o signal32.o			\</div><div class='add'>+					   sigreturn32.o sys_compat.o</div><div class='add'>+obj-$(CONFIG_KUSER_HELPERS)		+= kuser32.o</div><div class='ctx'> obj-$(CONFIG_FUNCTION_TRACER)		+= ftrace.o entry-ftrace.o</div><div class='ctx'> obj-$(CONFIG_MODULES)			+= module.o</div><div class='ctx'> obj-$(CONFIG_ARM64_MODULE_PLTS)		+= module-plts.o</div><div class='head'>diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c<br/>index eac1d0cc595c..7ff800045434 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/acpi_numa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/acpi_numa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/acpi_numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/acpi_numa.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ static inline int get_cpu_for_acpi_id(u32 uid)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init acpi_parse_gicc_pxm(struct acpi_subtable_header *header,</div><div class='add'>+static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header,</div><div class='ctx'> 				      const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_srat_gicc_affinity *pa;</div><div class='head'>diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c<br/>index 7f40dcbdd51d..e10e2a5d9ddc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/asm-offsets.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/asm-offsets.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/asm-offsets.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ int main(void)</div><div class='ctx'>   DEFINE(CLOCK_REALTIME,	CLOCK_REALTIME);</div><div class='ctx'>   DEFINE(CLOCK_MONOTONIC,	CLOCK_MONOTONIC);</div><div class='ctx'>   DEFINE(CLOCK_MONOTONIC_RAW,	CLOCK_MONOTONIC_RAW);</div><div class='del'>-  DEFINE(CLOCK_REALTIME_RES,	MONOTONIC_RES_NSEC);</div><div class='add'>+  DEFINE(CLOCK_REALTIME_RES,	offsetof(struct vdso_data, hrtimer_res));</div><div class='ctx'>   DEFINE(CLOCK_REALTIME_COARSE,	CLOCK_REALTIME_COARSE);</div><div class='ctx'>   DEFINE(CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE);</div><div class='ctx'>   DEFINE(CLOCK_COARSE_RES,	LOW_RES_NSEC);</div><div class='head'>diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c<br/>index 9950bb0cbd52..e88d4e7bdfc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpu_errata.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpu_errata.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpu_errata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/cpu_errata.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/arm-smccc.h&gt;</div><div class='ctx'> #include &lt;linux/psci.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='hunk'>@@ -109,7 +110,6 @@ cpu_enable_trap_ctr_access(const struct arm64_cpu_capabilities *__unused)</div><div class='ctx'> </div><div class='ctx'> atomic_t arm64_el2_vector_last_slot = ATOMIC_INIT(-1);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -131,9 +131,9 @@ static void __copy_hyp_vect_bpi(int slot, const char *hyp_vecs_start,</div><div class='ctx'> 	__flush_icache_range((uintptr_t)dst, (uintptr_t)dst + SZ_2K);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __install_bp_hardening_cb(bp_hardening_cb_t fn,</div><div class='del'>-				      const char *hyp_vecs_start,</div><div class='del'>-				      const char *hyp_vecs_end)</div><div class='add'>+static void install_bp_hardening_cb(bp_hardening_cb_t fn,</div><div class='add'>+				    const char *hyp_vecs_start,</div><div class='add'>+				    const char *hyp_vecs_end)</div><div class='ctx'> {</div><div class='ctx'> 	static DEFINE_RAW_SPINLOCK(bp_lock);</div><div class='ctx'> 	int cpu, slot = -1;</div><div class='hunk'>@@ -169,7 +169,7 @@ static void __install_bp_hardening_cb(bp_hardening_cb_t fn,</div><div class='ctx'> #define __smccc_workaround_1_smc_start		NULL</div><div class='ctx'> #define __smccc_workaround_1_smc_end		NULL</div><div class='ctx'> </div><div class='del'>-static void __install_bp_hardening_cb(bp_hardening_cb_t fn,</div><div class='add'>+static void install_bp_hardening_cb(bp_hardening_cb_t fn,</div><div class='ctx'> 				      const char *hyp_vecs_start,</div><div class='ctx'> 				      const char *hyp_vecs_end)</div><div class='ctx'> {</div><div class='hunk'>@@ -177,23 +177,6 @@ static void __install_bp_hardening_cb(bp_hardening_cb_t fn,</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_KVM_INDIRECT_VECTORS */</div><div class='ctx'> </div><div class='del'>-static void  install_bp_hardening_cb(const struct arm64_cpu_capabilities *entry,</div><div class='del'>-				     bp_hardening_cb_t fn,</div><div class='del'>-				     const char *hyp_vecs_start,</div><div class='del'>-				     const char *hyp_vecs_end)</div><div class='del'>-{</div><div class='del'>-	u64 pfr0;</div><div class='del'>-</div><div class='del'>-	if (!entry-&gt;matches(entry, SCOPE_LOCAL_CPU))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pfr0 = read_cpuid(ID_AA64PFR0_EL1);</div><div class='del'>-	if (cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_CSV2_SHIFT))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__install_bp_hardening_cb(fn, hyp_vecs_start, hyp_vecs_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #include &lt;uapi/linux/psci.h&gt;</div><div class='ctx'> #include &lt;linux/arm-smccc.h&gt;</div><div class='ctx'> #include &lt;linux/psci.h&gt;</div><div class='hunk'>@@ -220,60 +203,83 @@ static void qcom_link_stack_sanitization(void)</div><div class='ctx'> 		     : "=&amp;r" (tmp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-enable_smccc_arch_workaround_1(const struct arm64_cpu_capabilities *entry)</div><div class='add'>+static bool __nospectre_v2;</div><div class='add'>+static int __init parse_nospectre_v2(char *str)</div><div class='add'>+{</div><div class='add'>+	__nospectre_v2 = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("nospectre_v2", parse_nospectre_v2);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * -1: No workaround</div><div class='add'>+ *  0: No workaround required</div><div class='add'>+ *  1: Workaround installed</div><div class='add'>+ */</div><div class='add'>+static int detect_harden_bp_fw(void)</div><div class='ctx'> {</div><div class='ctx'> 	bp_hardening_cb_t cb;</div><div class='ctx'> 	void *smccc_start, *smccc_end;</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> 	u32 midr = read_cpuid_id();</div><div class='ctx'> </div><div class='del'>-	if (!entry-&gt;matches(entry, SCOPE_LOCAL_CPU))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (psci_ops.smccc_version == SMCCC_VERSION_1_0)</div><div class='del'>-		return;</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	switch (psci_ops.conduit) {</div><div class='ctx'> 	case PSCI_CONDUIT_HVC:</div><div class='ctx'> 		arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,</div><div class='ctx'> 				  ARM_SMCCC_ARCH_WORKAROUND_1, &amp;res);</div><div class='del'>-		if ((int)res.a0 &lt; 0)</div><div class='del'>-			return;</div><div class='del'>-		cb = call_hvc_arch_workaround_1;</div><div class='del'>-		/* This is a guest, no need to patch KVM vectors */</div><div class='del'>-		smccc_start = NULL;</div><div class='del'>-		smccc_end = NULL;</div><div class='add'>+		switch ((int)res.a0) {</div><div class='add'>+		case 1:</div><div class='add'>+			/* Firmware says we're just fine */</div><div class='add'>+			return 0;</div><div class='add'>+		case 0:</div><div class='add'>+			cb = call_hvc_arch_workaround_1;</div><div class='add'>+			/* This is a guest, no need to patch KVM vectors */</div><div class='add'>+			smccc_start = NULL;</div><div class='add'>+			smccc_end = NULL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PSCI_CONDUIT_SMC:</div><div class='ctx'> 		arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,</div><div class='ctx'> 				  ARM_SMCCC_ARCH_WORKAROUND_1, &amp;res);</div><div class='del'>-		if ((int)res.a0 &lt; 0)</div><div class='del'>-			return;</div><div class='del'>-		cb = call_smc_arch_workaround_1;</div><div class='del'>-		smccc_start = __smccc_workaround_1_smc_start;</div><div class='del'>-		smccc_end = __smccc_workaround_1_smc_end;</div><div class='add'>+		switch ((int)res.a0) {</div><div class='add'>+		case 1:</div><div class='add'>+			/* Firmware says we're just fine */</div><div class='add'>+			return 0;</div><div class='add'>+		case 0:</div><div class='add'>+			cb = call_smc_arch_workaround_1;</div><div class='add'>+			smccc_start = __smccc_workaround_1_smc_start;</div><div class='add'>+			smccc_end = __smccc_workaround_1_smc_end;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		return;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (((midr &amp; MIDR_CPU_MODEL_MASK) == MIDR_QCOM_FALKOR) ||</div><div class='ctx'> 	    ((midr &amp; MIDR_CPU_MODEL_MASK) == MIDR_QCOM_FALKOR_V1))</div><div class='ctx'> 		cb = qcom_link_stack_sanitization;</div><div class='ctx'> </div><div class='del'>-	install_bp_hardening_cb(entry, cb, smccc_start, smccc_end);</div><div class='add'>+	if (IS_ENABLED(CONFIG_HARDEN_BRANCH_PREDICTOR))</div><div class='add'>+		install_bp_hardening_cb(cb, smccc_start, smccc_end);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='del'>-#endif	/* CONFIG_HARDEN_BRANCH_PREDICTOR */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM64_SSBD</div><div class='ctx'> DEFINE_PER_CPU_READ_MOSTLY(u64, arm64_ssbd_callback_required);</div><div class='ctx'> </div><div class='ctx'> int ssbd_state __read_mostly = ARM64_SSBD_KERNEL;</div><div class='add'>+static bool __ssb_safe = true;</div><div class='ctx'> </div><div class='ctx'> static const struct ssbd_options {</div><div class='ctx'> 	const char	*str;</div><div class='hunk'>@@ -343,6 +349,11 @@ void __init arm64_enable_wa2_handling(struct alt_instr *alt,</div><div class='ctx'> </div><div class='ctx'> void arm64_set_ssbd_mitigation(bool state)</div><div class='ctx'> {</div><div class='add'>+	if (!IS_ENABLED(CONFIG_ARM64_SSBD)) {</div><div class='add'>+		pr_info_once("SSBD disabled by kernel configuration\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (this_cpu_has_cap(ARM64_SSBS)) {</div><div class='ctx'> 		if (state)</div><div class='ctx'> 			asm volatile(SET_PSTATE_SSBS(0));</div><div class='hunk'>@@ -372,16 +383,28 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> 	bool required = true;</div><div class='ctx'> 	s32 val;</div><div class='add'>+	bool this_cpu_safe = false;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());</div><div class='ctx'> </div><div class='add'>+	if (cpu_mitigations_off())</div><div class='add'>+		ssbd_state = ARM64_SSBD_FORCE_DISABLE;</div><div class='add'>+</div><div class='add'>+	/* delay setting __ssb_safe until we get a firmware response */</div><div class='add'>+	if (is_midr_in_range_list(read_cpuid_id(), entry-&gt;midr_range_list))</div><div class='add'>+		this_cpu_safe = true;</div><div class='add'>+</div><div class='ctx'> 	if (this_cpu_has_cap(ARM64_SSBS)) {</div><div class='add'>+		if (!this_cpu_safe)</div><div class='add'>+			__ssb_safe = false;</div><div class='ctx'> 		required = false;</div><div class='ctx'> 		goto out_printmsg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (psci_ops.smccc_version == SMCCC_VERSION_1_0) {</div><div class='ctx'> 		ssbd_state = ARM64_SSBD_UNKNOWN;</div><div class='add'>+		if (!this_cpu_safe)</div><div class='add'>+			__ssb_safe = false;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -398,6 +421,8 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		ssbd_state = ARM64_SSBD_UNKNOWN;</div><div class='add'>+		if (!this_cpu_safe)</div><div class='add'>+			__ssb_safe = false;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -406,14 +431,18 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case SMCCC_RET_NOT_SUPPORTED:</div><div class='ctx'> 		ssbd_state = ARM64_SSBD_UNKNOWN;</div><div class='add'>+		if (!this_cpu_safe)</div><div class='add'>+			__ssb_safe = false;</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	/* machines with mixed mitigation requirements must not return this */</div><div class='ctx'> 	case SMCCC_RET_NOT_REQUIRED:</div><div class='ctx'> 		pr_info_once("%s mitigation not required\n", entry-&gt;desc);</div><div class='ctx'> 		ssbd_state = ARM64_SSBD_MITIGATED;</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	case SMCCC_RET_SUCCESS:</div><div class='add'>+		__ssb_safe = false;</div><div class='ctx'> 		required = true;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -423,6 +452,8 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='add'>+		if (!this_cpu_safe)</div><div class='add'>+			__ssb_safe = false;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -462,7 +493,14 @@ out_printmsg:</div><div class='ctx'> </div><div class='ctx'> 	return required;</div><div class='ctx'> }</div><div class='del'>-#endif	/* CONFIG_ARM64_SSBD */</div><div class='add'>+</div><div class='add'>+/* known invulnerable cores */</div><div class='add'>+static const struct midr_range arm64_ssb_cpus[] = {</div><div class='add'>+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A35),</div><div class='add'>+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A53),</div><div class='add'>+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __maybe_unused</div><div class='ctx'> cpu_enable_cache_maint_trap(const struct arm64_cpu_capabilities *__unused)</div><div class='hunk'>@@ -507,26 +545,67 @@ cpu_enable_cache_maint_trap(const struct arm64_cpu_capabilities *__unused)</div><div class='ctx'> 	.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,			\</div><div class='ctx'> 	CAP_MIDR_RANGE_LIST(midr_list)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR</div><div class='add'>+/* Track overall mitigation state. We are only mitigated if all cores are ok */</div><div class='add'>+static bool __hardenbp_enab = true;</div><div class='add'>+static bool __spectrev2_safe = true;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * List of CPUs where we need to issue a psci call to</div><div class='del'>- * harden the branch predictor.</div><div class='add'>+ * List of CPUs that do not need any Spectre-v2 mitigation at all.</div><div class='ctx'>  */</div><div class='del'>-static const struct midr_range arm64_bp_harden_smccc_cpus[] = {</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_CORTEX_A75),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR_V1),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR),</div><div class='del'>-	MIDR_ALL_VERSIONS(MIDR_NVIDIA_DENVER),</div><div class='del'>-	{},</div><div class='add'>+static const struct midr_range spectre_v2_safe_list[] = {</div><div class='add'>+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A35),</div><div class='add'>+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A53),</div><div class='add'>+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),</div><div class='add'>+	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+/*</div><div class='add'>+ * Track overall bp hardening for all heterogeneous cores in the machine.</div><div class='add'>+ * We are only considered "safe" if all booted cores are known safe.</div><div class='add'>+ */</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+check_branch_predictor(const struct arm64_cpu_capabilities *entry, int scope)</div><div class='add'>+{</div><div class='add'>+	int need_wa;</div><div class='add'>+</div><div class='add'>+	WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible());</div><div class='add'>+</div><div class='add'>+	/* If the CPU has CSV2 set, we're safe */</div><div class='add'>+	if (cpuid_feature_extract_unsigned_field(read_cpuid(ID_AA64PFR0_EL1),</div><div class='add'>+						 ID_AA64PFR0_CSV2_SHIFT))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Alternatively, we have a list of unaffected CPUs */</div><div class='add'>+	if (is_midr_in_range_list(read_cpuid_id(), spectre_v2_safe_list))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Fallback to firmware detection */</div><div class='add'>+	need_wa = detect_harden_bp_fw();</div><div class='add'>+	if (!need_wa)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	__spectrev2_safe = false;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_HARDEN_BRANCH_PREDICTOR)) {</div><div class='add'>+		pr_warn_once("spectrev2 mitigation disabled by kernel configuration\n");</div><div class='add'>+		__hardenbp_enab = false;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* forced off */</div><div class='add'>+	if (__nospectre_v2 || cpu_mitigations_off()) {</div><div class='add'>+		pr_info_once("spectrev2 mitigation disabled by command line option\n");</div><div class='add'>+		__hardenbp_enab = false;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_wa &lt; 0) {</div><div class='add'>+		pr_warn_once("ARM_SMCCC_ARCH_WORKAROUND_1 missing from firmware\n");</div><div class='add'>+		__hardenbp_enab = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (need_wa &gt; 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HARDEN_EL2_VECTORS</div><div class='ctx'> </div><div class='hunk'>@@ -603,6 +682,16 @@ static const struct midr_range workaround_clean_cache[] = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM64_ERRATUM_1188873</div><div class='add'>+static const struct midr_range erratum_1188873_list[] = {</div><div class='add'>+	/* Cortex-A76 r0p0 to r2p0 */</div><div class='add'>+	MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0),</div><div class='add'>+	/* Neoverse-N1 r0p0 to r2p0 */</div><div class='add'>+	MIDR_RANGE(MIDR_NEOVERSE_N1, 0, 0, 2, 0),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> #ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE</div><div class='ctx'> 	{</div><div class='hunk'>@@ -701,13 +790,11 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 		ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR</div><div class='ctx'> 	{</div><div class='ctx'> 		.capability = ARM64_HARDEN_BRANCH_PREDICTOR,</div><div class='del'>-		.cpu_enable = enable_smccc_arch_workaround_1,</div><div class='del'>-		ERRATA_MIDR_RANGE_LIST(arm64_bp_harden_smccc_cpus),</div><div class='add'>+		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,</div><div class='add'>+		.matches = check_branch_predictor,</div><div class='ctx'> 	},</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_HARDEN_EL2_VECTORS</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc = "EL2 vector hardening",</div><div class='hunk'>@@ -715,20 +802,18 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 		ERRATA_MIDR_RANGE_LIST(arm64_harden_el2_vectors),</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_ARM64_SSBD</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc = "Speculative Store Bypass Disable",</div><div class='ctx'> 		.capability = ARM64_SSBD,</div><div class='ctx'> 		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,</div><div class='ctx'> 		.matches = has_ssbd_mitigation,</div><div class='add'>+		.midr_range_list = arm64_ssb_cpus,</div><div class='ctx'> 	},</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_ARM64_ERRATUM_1188873</div><div class='ctx'> 	{</div><div class='del'>-		/* Cortex-A76 r0p0 to r2p0 */</div><div class='ctx'> 		.desc = "ARM erratum 1188873",</div><div class='ctx'> 		.capability = ARM64_WORKAROUND_1188873,</div><div class='del'>-		ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0),</div><div class='add'>+		ERRATA_MIDR_RANGE_LIST(erratum_1188873_list),</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ARM64_ERRATUM_1165522</div><div class='hunk'>@@ -742,3 +827,38 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "Mitigation: __user pointer sanitization\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	if (__spectrev2_safe)</div><div class='add'>+		return sprintf(buf, "Not affected\n");</div><div class='add'>+</div><div class='add'>+	if (__hardenbp_enab)</div><div class='add'>+		return sprintf(buf, "Mitigation: Branch predictor hardening\n");</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "Vulnerable\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t cpu_show_spec_store_bypass(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (__ssb_safe)</div><div class='add'>+		return sprintf(buf, "Not affected\n");</div><div class='add'>+</div><div class='add'>+	switch (ssbd_state) {</div><div class='add'>+	case ARM64_SSBD_KERNEL:</div><div class='add'>+	case ARM64_SSBD_FORCE_ENABLE:</div><div class='add'>+		if (IS_ENABLED(CONFIG_ARM64_SSBD))</div><div class='add'>+			return sprintf(buf,</div><div class='add'>+			    "Mitigation: Speculative Store Bypass disabled via prctl\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "Vulnerable\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c<br/>index ea001241bdd4..00f8b8612b69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpu_ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpu_ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpu_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/cpu_ops.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static const char *__init cpu_read_enable_method(int cpu)</div><div class='ctx'> 				pr_err("%pOF: missing enable-method property\n",</div><div class='ctx'> 					dn);</div><div class='ctx'> 		}</div><div class='add'>+		of_node_put(dn);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		enable_method = acpi_get_enable_method(cpu);</div><div class='ctx'> 		if (!enable_method) {</div><div class='head'>diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c<br/>index e24e94d28767..2b807f129e60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpufeature.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpufeature.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpufeature.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/cpufeature.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/stop_machine.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_ops.h&gt;</div><div class='hunk'>@@ -35,8 +36,8 @@</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/virt.h&gt;</div><div class='ctx'> </div><div class='del'>-unsigned long elf_hwcap __read_mostly;</div><div class='del'>-EXPORT_SYMBOL_GPL(elf_hwcap);</div><div class='add'>+/* Kernel representation of AT_HWCAP and AT_HWCAP2 */</div><div class='add'>+static unsigned long elf_hwcap __read_mostly;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> #define COMPAT_ELF_HWCAP_DEFAULT	\</div><div class='hunk'>@@ -184,6 +185,15 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = {</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = {</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_SM4_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_SHA3_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_BITPERM_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_AES_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_SVEVER_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {</div><div class='ctx'> 	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),</div><div class='ctx'> 	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),</div><div class='hunk'>@@ -392,7 +402,7 @@ static const struct __ftr_reg_entry {</div><div class='ctx'> 	/* Op1 = 0, CRn = 0, CRm = 4 */</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0),</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64PFR1_EL1, ftr_id_aa64pfr1),</div><div class='del'>-	ARM64_FTR_REG(SYS_ID_AA64ZFR0_EL1, ftr_raz),</div><div class='add'>+	ARM64_FTR_REG(SYS_ID_AA64ZFR0_EL1, ftr_id_aa64zfr0),</div><div class='ctx'> </div><div class='ctx'> 	/* Op1 = 0, CRn = 0, CRm = 5 */</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64DFR0_EL1, ftr_id_aa64dfr0),</div><div class='hunk'>@@ -947,7 +957,7 @@ has_useable_cnp(const struct arm64_cpu_capabilities *entry, int scope)</div><div class='ctx'> 	return has_cpuid_feature(entry, scope);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_UNMAP_KERNEL_AT_EL0</div><div class='add'>+static bool __meltdown_safe = true;</div><div class='ctx'> static int __kpti_forced; /* 0: not forced, &gt;0: forced on, &lt;0: forced off */</div><div class='ctx'> </div><div class='ctx'> static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,</div><div class='hunk'>@@ -963,9 +973,20 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),</div><div class='ctx'> 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),</div><div class='ctx'> 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),</div><div class='add'>+		MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),</div><div class='ctx'> 		{ /* sentinel */ }</div><div class='ctx'> 	};</div><div class='del'>-	char const *str = "command line option";</div><div class='add'>+	char const *str = "kpti command line option";</div><div class='add'>+	bool meltdown_safe;</div><div class='add'>+</div><div class='add'>+	meltdown_safe = is_midr_in_range_list(read_cpuid_id(), kpti_safe_list);</div><div class='add'>+</div><div class='add'>+	/* Defer to CPU feature registers */</div><div class='add'>+	if (has_cpuid_feature(entry, scope))</div><div class='add'>+		meltdown_safe = true;</div><div class='add'>+</div><div class='add'>+	if (!meltdown_safe)</div><div class='add'>+		__meltdown_safe = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For reasons that aren't entirely clear, enabling KPTI on Cavium</div><div class='hunk'>@@ -977,6 +998,24 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 		__kpti_forced = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Useful for KASLR robustness */</div><div class='add'>+	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) &amp;&amp; kaslr_offset() &gt; 0) {</div><div class='add'>+		if (!__kpti_forced) {</div><div class='add'>+			str = "KASLR";</div><div class='add'>+			__kpti_forced = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpu_mitigations_off() &amp;&amp; !__kpti_forced) {</div><div class='add'>+		str = "mitigations=off";</div><div class='add'>+		__kpti_forced = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_UNMAP_KERNEL_AT_EL0)) {</div><div class='add'>+		pr_info_once("kernel page table isolation disabled by kernel configuration\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Forced? */</div><div class='ctx'> 	if (__kpti_forced) {</div><div class='ctx'> 		pr_info_once("kernel page table isolation forced %s by %s\n",</div><div class='hunk'>@@ -984,18 +1023,10 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 		return __kpti_forced &gt; 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Useful for KASLR robustness */</div><div class='del'>-	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))</div><div class='del'>-		return kaslr_offset() &gt; 0;</div><div class='del'>-</div><div class='del'>-	/* Don't force KPTI for CPUs that are not vulnerable */</div><div class='del'>-	if (is_midr_in_range_list(read_cpuid_id(), kpti_safe_list))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Defer to CPU feature registers */</div><div class='del'>-	return !has_cpuid_feature(entry, scope);</div><div class='add'>+	return !meltdown_safe;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_UNMAP_KERNEL_AT_EL0</div><div class='ctx'> static void</div><div class='ctx'> kpti_install_ng_mappings(const struct arm64_cpu_capabilities *__unused)</div><div class='ctx'> {</div><div class='hunk'>@@ -1025,6 +1056,12 @@ kpti_install_ng_mappings(const struct arm64_cpu_capabilities *__unused)</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static void</div><div class='add'>+kpti_install_ng_mappings(const struct arm64_cpu_capabilities *__unused)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_UNMAP_KERNEL_AT_EL0 */</div><div class='ctx'> </div><div class='ctx'> static int __init parse_kpti(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -1038,7 +1075,6 @@ static int __init parse_kpti(char *str)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> early_param("kpti", parse_kpti);</div><div class='del'>-#endif	/* CONFIG_UNMAP_KERNEL_AT_EL0 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM64_HW_AFDBM</div><div class='ctx'> static inline void __cpu_enable_hw_dbm(void)</div><div class='hunk'>@@ -1305,7 +1341,6 @@ static const struct arm64_cpu_capabilities arm64_features[] = {</div><div class='ctx'> 		.field_pos = ID_AA64PFR0_EL0_SHIFT,</div><div class='ctx'> 		.min_field_value = ID_AA64PFR0_EL0_32BIT_64BIT,</div><div class='ctx'> 	},</div><div class='del'>-#ifdef CONFIG_UNMAP_KERNEL_AT_EL0</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc = "Kernel page table isolation (KPTI)",</div><div class='ctx'> 		.capability = ARM64_UNMAP_KERNEL_AT_EL0,</div><div class='hunk'>@@ -1321,7 +1356,6 @@ static const struct arm64_cpu_capabilities arm64_features[] = {</div><div class='ctx'> 		.matches = unmap_kernel_at_el0,</div><div class='ctx'> 		.cpu_enable = kpti_install_ng_mappings,</div><div class='ctx'> 	},</div><div class='del'>-#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		/* FP/SIMD is not implemented */</div><div class='ctx'> 		.capability = ARM64_HAS_NO_FPSIMD,</div><div class='hunk'>@@ -1339,6 +1373,16 @@ static const struct arm64_cpu_capabilities arm64_features[] = {</div><div class='ctx'> 		.field_pos = ID_AA64ISAR1_DPB_SHIFT,</div><div class='ctx'> 		.min_field_value = 1,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Data cache clean to Point of Deep Persistence",</div><div class='add'>+		.capability = ARM64_HAS_DCPODP,</div><div class='add'>+		.type = ARM64_CPUCAP_SYSTEM_FEATURE,</div><div class='add'>+		.matches = has_cpuid_feature,</div><div class='add'>+		.sys_reg = SYS_ID_AA64ISAR1_EL1,</div><div class='add'>+		.sign = FTR_UNSIGNED,</div><div class='add'>+		.field_pos = ID_AA64ISAR1_DPB_SHIFT,</div><div class='add'>+		.min_field_value = 2,</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ARM64_SVE</div><div class='ctx'> 	{</div><div class='hunk'>@@ -1570,39 +1614,46 @@ static const struct arm64_cpu_capabilities ptr_auth_hwcap_gen_matches[] = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = {</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_AES_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_PMULL),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_AES_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_AES),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA1_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA1),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA2),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_SHA512),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_CRC32_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_CRC32),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_ATOMICS_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_ATOMICS),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_RDM_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_ASIMDRDM),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA3_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA3),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SM3_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SM3),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SM4_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SM4),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_DP_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_ASIMDDP),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_FHM_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_ASIMDFHM),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_TS_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_FLAGM),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, HWCAP_FP),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, HWCAP_FPHP),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, HWCAP_ASIMD),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, HWCAP_ASIMDHP),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_DIT_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, HWCAP_DIT),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_DPB_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_DCPOP),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_JSCVT_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_JSCVT),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_FCMA_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_FCMA),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_LRCPC_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_LRCPC),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_LRCPC_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_ILRCPC),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_SB_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SB),</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64MMFR2_EL1, ID_AA64MMFR2_AT_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_USCAT),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_AES_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_PMULL),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_AES_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_AES),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA1_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_SHA1),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_SHA2),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_SHA512),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_CRC32_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_CRC32),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_ATOMICS_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_ATOMICS),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_RDM_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ASIMDRDM),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA3_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_SHA3),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SM3_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_SM3),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SM4_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_SM4),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_DP_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ASIMDDP),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_FHM_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ASIMDFHM),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_TS_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_FLAGM),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_FP),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_FPHP),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_ASIMD),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ASIMDHP),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_DIT_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_DIT),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_DPB_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_DCPOP),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_DPB_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_DCPODP),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_JSCVT_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_JSCVT),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_FCMA_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_FCMA),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_LRCPC_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_LRCPC),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_LRCPC_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_ILRCPC),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_SB_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_SB),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64MMFR2_EL1, ID_AA64MMFR2_AT_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_USCAT),</div><div class='ctx'> #ifdef CONFIG_ARM64_SVE</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_SVE_SHIFT, FTR_UNSIGNED, ID_AA64PFR0_SVE, CAP_HWCAP, HWCAP_SVE),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_SVE_SHIFT, FTR_UNSIGNED, ID_AA64PFR0_SVE, CAP_HWCAP, KERNEL_HWCAP_SVE),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_SVEVER_SHIFT, FTR_UNSIGNED, ID_AA64ZFR0_SVEVER_SVE2, CAP_HWCAP, KERNEL_HWCAP_SVE2),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_AES_SHIFT, FTR_UNSIGNED, ID_AA64ZFR0_AES, CAP_HWCAP, KERNEL_HWCAP_SVEAES),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_AES_SHIFT, FTR_UNSIGNED, ID_AA64ZFR0_AES_PMULL, CAP_HWCAP, KERNEL_HWCAP_SVEPMULL),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_BITPERM_SHIFT, FTR_UNSIGNED, ID_AA64ZFR0_BITPERM, CAP_HWCAP, KERNEL_HWCAP_SVEBITPERM),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_SHA3_SHIFT, FTR_UNSIGNED, ID_AA64ZFR0_SHA3, CAP_HWCAP, KERNEL_HWCAP_SVESHA3),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_SM4_SHIFT, FTR_UNSIGNED, ID_AA64ZFR0_SM4, CAP_HWCAP, KERNEL_HWCAP_SVESM4),</div><div class='ctx'> #endif</div><div class='del'>-	HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_SSBS_SHIFT, FTR_UNSIGNED, ID_AA64PFR1_SSBS_PSTATE_INSNS, CAP_HWCAP, HWCAP_SSBS),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_SSBS_SHIFT, FTR_UNSIGNED, ID_AA64PFR1_SSBS_PSTATE_INSNS, CAP_HWCAP, KERNEL_HWCAP_SSBS),</div><div class='ctx'> #ifdef CONFIG_ARM64_PTR_AUTH</div><div class='del'>-	HWCAP_MULTI_CAP(ptr_auth_hwcap_addr_matches, CAP_HWCAP, HWCAP_PACA),</div><div class='del'>-	HWCAP_MULTI_CAP(ptr_auth_hwcap_gen_matches, CAP_HWCAP, HWCAP_PACG),</div><div class='add'>+	HWCAP_MULTI_CAP(ptr_auth_hwcap_addr_matches, CAP_HWCAP, KERNEL_HWCAP_PACA),</div><div class='add'>+	HWCAP_MULTI_CAP(ptr_auth_hwcap_gen_matches, CAP_HWCAP, KERNEL_HWCAP_PACG),</div><div class='ctx'> #endif</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='hunk'>@@ -1622,7 +1673,7 @@ static void __init cap_set_elf_hwcap(const struct arm64_cpu_capabilities *cap)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cap-&gt;hwcap_type) {</div><div class='ctx'> 	case CAP_HWCAP:</div><div class='del'>-		elf_hwcap |= cap-&gt;hwcap;</div><div class='add'>+		cpu_set_feature(cap-&gt;hwcap);</div><div class='ctx'> 		break;</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	case CAP_COMPAT_HWCAP:</div><div class='hunk'>@@ -1645,7 +1696,7 @@ static bool cpus_have_elf_hwcap(const struct arm64_cpu_capabilities *cap)</div><div class='ctx'> </div><div class='ctx'> 	switch (cap-&gt;hwcap_type) {</div><div class='ctx'> 	case CAP_HWCAP:</div><div class='del'>-		rc = (elf_hwcap &amp; cap-&gt;hwcap) != 0;</div><div class='add'>+		rc = cpu_have_feature(cap-&gt;hwcap);</div><div class='ctx'> 		break;</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	case CAP_COMPAT_HWCAP:</div><div class='hunk'>@@ -1666,7 +1717,7 @@ static bool cpus_have_elf_hwcap(const struct arm64_cpu_capabilities *cap)</div><div class='ctx'> static void __init setup_elf_hwcaps(const struct arm64_cpu_capabilities *hwcaps)</div><div class='ctx'> {</div><div class='ctx'> 	/* We support emulation of accesses to CPU ID feature registers */</div><div class='del'>-	elf_hwcap |= HWCAP_CPUID;</div><div class='add'>+	cpu_set_named_feature(CPUID);</div><div class='ctx'> 	for (; hwcaps-&gt;matches; hwcaps++)</div><div class='ctx'> 		if (hwcaps-&gt;matches(hwcaps, cpucap_default_scope(hwcaps)))</div><div class='ctx'> 			cap_set_elf_hwcap(hwcaps);</div><div class='hunk'>@@ -1946,6 +1997,35 @@ bool this_cpu_has_cap(unsigned int n)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void cpu_set_feature(unsigned int num)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(num &gt;= MAX_CPU_FEATURES);</div><div class='add'>+	elf_hwcap |= BIT(num);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_set_feature);</div><div class='add'>+</div><div class='add'>+bool cpu_have_feature(unsigned int num)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(num &gt;= MAX_CPU_FEATURES);</div><div class='add'>+	return elf_hwcap &amp; BIT(num);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_have_feature);</div><div class='add'>+</div><div class='add'>+unsigned long cpu_get_elf_hwcap(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We currently only populate the first 32 bits of AT_HWCAP. Please</div><div class='add'>+	 * note that for userspace compatibility we guarantee that bits 62</div><div class='add'>+	 * and 63 will always be returned as 0.</div><div class='add'>+	 */</div><div class='add'>+	return lower_32_bits(elf_hwcap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long cpu_get_elf_hwcap2(void)</div><div class='add'>+{</div><div class='add'>+	return upper_32_bits(elf_hwcap);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init setup_system_capabilities(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2100,3 +2180,15 @@ static int __init enable_mrs_emulation(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(enable_mrs_emulation);</div><div class='add'>+</div><div class='add'>+ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	if (__meltdown_safe)</div><div class='add'>+		return sprintf(buf, "Not affected\n");</div><div class='add'>+</div><div class='add'>+	if (arm64_kernel_unmapped_at_el0())</div><div class='add'>+		return sprintf(buf, "Mitigation: PTI\n");</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "Vulnerable\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c<br/>index ca0685f33900..f6f7936be6e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpuinfo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/cpuinfo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/cpuinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/cpuinfo.c</a></div><div class='hunk'>@@ -85,6 +85,13 @@ static const char *const hwcap_str[] = {</div><div class='ctx'> 	"sb",</div><div class='ctx'> 	"paca",</div><div class='ctx'> 	"pacg",</div><div class='add'>+	"dcpodp",</div><div class='add'>+	"sve2",</div><div class='add'>+	"sveaes",</div><div class='add'>+	"svepmull",</div><div class='add'>+	"svebitperm",</div><div class='add'>+	"svesha3",</div><div class='add'>+	"svesm4",</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +174,7 @@ static int c_show(struct seq_file *m, void *v)</div><div class='ctx'> #endif /* CONFIG_COMPAT */</div><div class='ctx'> 		} else {</div><div class='ctx'> 			for (j = 0; hwcap_str[j]; j++)</div><div class='del'>-				if (elf_hwcap &amp; (1 &lt;&lt; j))</div><div class='add'>+				if (cpu_have_feature(j))</div><div class='ctx'> 					seq_printf(m, " %s", hwcap_str[j]);</div><div class='ctx'> 		}</div><div class='ctx'> 		seq_puts(m, "\n");</div><div class='head'>diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c<br/>index d7bb6aefae0a..555b6bd2f3d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/debug-monitors.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/debug-monitors.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/debug-monitors.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/debug-monitors.c</a></div><div class='hunk'>@@ -135,6 +135,7 @@ NOKPROBE_SYMBOL(disable_debug_monitors);</div><div class='ctx'>  */</div><div class='ctx'> static int clear_os_lock(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	write_sysreg(0, osdlr_el1);</div><div class='ctx'> 	write_sysreg(0, oslar_el1);</div><div class='ctx'> 	isb();</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -163,25 +164,46 @@ static void clear_regs_spsr_ss(struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(clear_regs_spsr_ss);</div><div class='ctx'> </div><div class='del'>-/* EL1 Single Step Handler hooks */</div><div class='del'>-static LIST_HEAD(step_hook);</div><div class='del'>-static DEFINE_SPINLOCK(step_hook_lock);</div><div class='add'>+static DEFINE_SPINLOCK(debug_hook_lock);</div><div class='add'>+static LIST_HEAD(user_step_hook);</div><div class='add'>+static LIST_HEAD(kernel_step_hook);</div><div class='ctx'> </div><div class='del'>-void register_step_hook(struct step_hook *hook)</div><div class='add'>+static void register_debug_hook(struct list_head *node, struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;step_hook_lock);</div><div class='del'>-	list_add_rcu(&amp;hook-&gt;node, &amp;step_hook);</div><div class='del'>-	spin_unlock(&amp;step_hook_lock);</div><div class='add'>+	spin_lock(&amp;debug_hook_lock);</div><div class='add'>+	list_add_rcu(node, list);</div><div class='add'>+	spin_unlock(&amp;debug_hook_lock);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void unregister_step_hook(struct step_hook *hook)</div><div class='add'>+static void unregister_debug_hook(struct list_head *node)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;step_hook_lock);</div><div class='del'>-	list_del_rcu(&amp;hook-&gt;node);</div><div class='del'>-	spin_unlock(&amp;step_hook_lock);</div><div class='add'>+	spin_lock(&amp;debug_hook_lock);</div><div class='add'>+	list_del_rcu(node);</div><div class='add'>+	spin_unlock(&amp;debug_hook_lock);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void register_user_step_hook(struct step_hook *hook)</div><div class='add'>+{</div><div class='add'>+	register_debug_hook(&amp;hook-&gt;node, &amp;user_step_hook);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unregister_user_step_hook(struct step_hook *hook)</div><div class='add'>+{</div><div class='add'>+	unregister_debug_hook(&amp;hook-&gt;node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void register_kernel_step_hook(struct step_hook *hook)</div><div class='add'>+{</div><div class='add'>+	register_debug_hook(&amp;hook-&gt;node, &amp;kernel_step_hook);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unregister_kernel_step_hook(struct step_hook *hook)</div><div class='add'>+{</div><div class='add'>+	unregister_debug_hook(&amp;hook-&gt;node);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Call registered single step handlers</div><div class='ctx'>  * There is no Syndrome info to check for determining the handler.</div><div class='hunk'>@@ -191,11 +213,14 @@ void unregister_step_hook(struct step_hook *hook)</div><div class='ctx'> static int call_step_hook(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='ctx'> 	struct step_hook *hook;</div><div class='add'>+	struct list_head *list;</div><div class='ctx'> 	int retval = DBG_HOOK_ERROR;</div><div class='ctx'> </div><div class='add'>+	list = user_mode(regs) ? &amp;user_step_hook : &amp;kernel_step_hook;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(hook, &amp;step_hook, node)	{</div><div class='add'>+	list_for_each_entry_rcu(hook, list, node)	{</div><div class='ctx'> 		retval = hook-&gt;fn(regs, esr);</div><div class='ctx'> 		if (retval == DBG_HOOK_HANDLED)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -222,7 +247,7 @@ static void send_user_sigtrap(int si_code)</div><div class='ctx'> 			     "User debug trap");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int single_step_handler(unsigned long addr, unsigned int esr,</div><div class='add'>+static int single_step_handler(unsigned long unused, unsigned int esr,</div><div class='ctx'> 			       struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	bool handler_found = false;</div><div class='hunk'>@@ -234,10 +259,6 @@ static int single_step_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 	if (!reinstall_suspended_bps(regs))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-#ifdef	CONFIG_KPROBES</div><div class='del'>-	if (kprobe_single_step_handler(regs, esr) == DBG_HOOK_HANDLED)</div><div class='del'>-		handler_found = true;</div><div class='del'>-#endif</div><div class='ctx'> 	if (!handler_found &amp;&amp; call_step_hook(regs, esr) == DBG_HOOK_HANDLED)</div><div class='ctx'> 		handler_found = true;</div><div class='ctx'> </div><div class='hunk'>@@ -264,61 +285,59 @@ static int single_step_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(single_step_handler);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Breakpoint handler is re-entrant as another breakpoint can</div><div class='del'>- * hit within breakpoint handler, especically in kprobes.</div><div class='del'>- * Use reader/writer locks instead of plain spinlock.</div><div class='del'>- */</div><div class='del'>-static LIST_HEAD(break_hook);</div><div class='del'>-static DEFINE_SPINLOCK(break_hook_lock);</div><div class='add'>+static LIST_HEAD(user_break_hook);</div><div class='add'>+static LIST_HEAD(kernel_break_hook);</div><div class='ctx'> </div><div class='del'>-void register_break_hook(struct break_hook *hook)</div><div class='add'>+void register_user_break_hook(struct break_hook *hook)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;break_hook_lock);</div><div class='del'>-	list_add_rcu(&amp;hook-&gt;node, &amp;break_hook);</div><div class='del'>-	spin_unlock(&amp;break_hook_lock);</div><div class='add'>+	register_debug_hook(&amp;hook-&gt;node, &amp;user_break_hook);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void unregister_break_hook(struct break_hook *hook)</div><div class='add'>+void unregister_user_break_hook(struct break_hook *hook)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;break_hook_lock);</div><div class='del'>-	list_del_rcu(&amp;hook-&gt;node);</div><div class='del'>-	spin_unlock(&amp;break_hook_lock);</div><div class='del'>-	synchronize_rcu();</div><div class='add'>+	unregister_debug_hook(&amp;hook-&gt;node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void register_kernel_break_hook(struct break_hook *hook)</div><div class='add'>+{</div><div class='add'>+	register_debug_hook(&amp;hook-&gt;node, &amp;kernel_break_hook);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unregister_kernel_break_hook(struct break_hook *hook)</div><div class='add'>+{</div><div class='add'>+	unregister_debug_hook(&amp;hook-&gt;node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int call_break_hook(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='ctx'> 	struct break_hook *hook;</div><div class='add'>+	struct list_head *list;</div><div class='ctx'> 	int (*fn)(struct pt_regs *regs, unsigned int esr) = NULL;</div><div class='ctx'> </div><div class='add'>+	list = user_mode(regs) ? &amp;user_break_hook : &amp;kernel_break_hook;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	list_for_each_entry_rcu(hook, &amp;break_hook, node)</div><div class='del'>-		if ((esr &amp; hook-&gt;esr_mask) == hook-&gt;esr_val)</div><div class='add'>+	list_for_each_entry_rcu(hook, list, node) {</div><div class='add'>+		unsigned int comment = esr &amp; ESR_ELx_BRK64_ISS_COMMENT_MASK;</div><div class='add'>+</div><div class='add'>+		if ((comment &amp; ~hook-&gt;mask) == hook-&gt;imm)</div><div class='ctx'> 			fn = hook-&gt;fn;</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return fn ? fn(regs, esr) : DBG_HOOK_ERROR;</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(call_break_hook);</div><div class='ctx'> </div><div class='del'>-static int brk_handler(unsigned long addr, unsigned int esr,</div><div class='add'>+static int brk_handler(unsigned long unused, unsigned int esr,</div><div class='ctx'> 		       struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	bool handler_found = false;</div><div class='del'>-</div><div class='del'>-#ifdef	CONFIG_KPROBES</div><div class='del'>-	if ((esr &amp; BRK64_ESR_MASK) == BRK64_ESR_KPROBES) {</div><div class='del'>-		if (kprobe_breakpoint_handler(regs, esr) == DBG_HOOK_HANDLED)</div><div class='del'>-			handler_found = true;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if (!handler_found &amp;&amp; call_break_hook(regs, esr) == DBG_HOOK_HANDLED)</div><div class='del'>-		handler_found = true;</div><div class='add'>+	if (call_break_hook(regs, esr) == DBG_HOOK_HANDLED)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!handler_found &amp;&amp; user_mode(regs)) {</div><div class='add'>+	if (user_mode(regs)) {</div><div class='ctx'> 		send_user_sigtrap(TRAP_BRKPT);</div><div class='del'>-	} else if (!handler_found) {</div><div class='add'>+	} else {</div><div class='ctx'> 		pr_warn("Unexpected kernel BRK exception at EL1\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S<br/>index c50a7a75f2e0..1a7811b7e3c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/entry.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/entry.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/entry.S</a></div><div class='hunk'>@@ -336,6 +336,21 @@ alternative_if ARM64_WORKAROUND_845719</div><div class='ctx'> alternative_else_nop_endif</div><div class='ctx'> #endif</div><div class='ctx'> 3:</div><div class='add'>+#ifdef CONFIG_ARM64_ERRATUM_1188873</div><div class='add'>+alternative_if_not ARM64_WORKAROUND_1188873</div><div class='add'>+	b	4f</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+	/*</div><div class='add'>+	 * if (x22.mode32 == cntkctl_el1.el0vcten)</div><div class='add'>+	 *     cntkctl_el1.el0vcten = ~cntkctl_el1.el0vcten</div><div class='add'>+	 */</div><div class='add'>+	mrs	x1, cntkctl_el1</div><div class='add'>+	eon	x0, x1, x22, lsr #3</div><div class='add'>+	tbz	x0, #1, 4f</div><div class='add'>+	eor	x1, x1, #2	// ARCH_TIMER_USR_VCT_ACCESS_EN</div><div class='add'>+	msr	cntkctl_el1, x1</div><div class='add'>+4:</div><div class='add'>+#endif</div><div class='ctx'> 	apply_ssbd 0, x0, x1</div><div class='ctx'> 	.endif</div><div class='ctx'> </div><div class='hunk'>@@ -362,11 +377,11 @@ alternative_else_nop_endif</div><div class='ctx'> 	.if	\el == 0</div><div class='ctx'> alternative_insn eret, nop, ARM64_UNMAP_KERNEL_AT_EL0</div><div class='ctx'> #ifdef CONFIG_UNMAP_KERNEL_AT_EL0</div><div class='del'>-	bne	4f</div><div class='add'>+	bne	5f</div><div class='ctx'> 	msr	far_el1, x30</div><div class='ctx'> 	tramp_alias	x30, tramp_exit_native</div><div class='ctx'> 	br	x30</div><div class='del'>-4:</div><div class='add'>+5:</div><div class='ctx'> 	tramp_alias	x30, tramp_exit_compat</div><div class='ctx'> 	br	x30</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c<br/>index 5ebe73b69961..735cf1f8b109 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/fpsimd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/fpsimd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/fpsimd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/fpsimd.c</a></div><div class='hunk'>@@ -1258,14 +1258,14 @@ static inline void fpsimd_hotplug_init(void) { }</div><div class='ctx'>  */</div><div class='ctx'> static int __init fpsimd_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (elf_hwcap &amp; HWCAP_FP) {</div><div class='add'>+	if (cpu_have_named_feature(FP)) {</div><div class='ctx'> 		fpsimd_pm_init();</div><div class='ctx'> 		fpsimd_hotplug_init();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_notice("Floating-point is not implemented\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+	if (!cpu_have_named_feature(ASIMD))</div><div class='ctx'> 		pr_notice("Advanced SIMD is not implemented\n");</div><div class='ctx'> </div><div class='ctx'> 	return sve_sysctl_init();</div><div class='head'>diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c<br/>index 8e4431a8821f..65a51331088e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/ftrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/ftrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/ftrace.c</a></div><div class='hunk'>@@ -103,12 +103,16 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)</div><div class='ctx'> 		 * to be revisited if support for multiple ftrace entry points</div><div class='ctx'> 		 * is added in the future, but for now, the pr_err() below</div><div class='ctx'> 		 * deals with a theoretical issue only.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that PLTs are place relative, and plt_entries_equal()</div><div class='add'>+		 * checks whether they point to the same target. Here, we need</div><div class='add'>+		 * to check if the actual opcodes are in fact identical,</div><div class='add'>+		 * regardless of the offset in memory so use memcmp() instead.</div><div class='ctx'> 		 */</div><div class='ctx'> 		trampoline = get_plt_entry(addr, mod-&gt;arch.ftrace_trampoline);</div><div class='del'>-		if (!plt_entries_equal(mod-&gt;arch.ftrace_trampoline,</div><div class='del'>-				       &amp;trampoline)) {</div><div class='del'>-			if (!plt_entries_equal(mod-&gt;arch.ftrace_trampoline,</div><div class='del'>-					       &amp;(struct plt_entry){})) {</div><div class='add'>+		if (memcmp(mod-&gt;arch.ftrace_trampoline, &amp;trampoline,</div><div class='add'>+			   sizeof(trampoline))) {</div><div class='add'>+			if (plt_entry_is_initialized(mod-&gt;arch.ftrace_trampoline)) {</div><div class='ctx'> 				pr_err("ftrace: far branches to multiple entry points unsupported inside a single module\n");</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S<br/>index eecf7927dab0..fcae3f85c6cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/head.S</a></div><div class='hunk'>@@ -505,7 +505,7 @@ ENTRY(el2_setup)</div><div class='ctx'> 	 * kernel is intended to run at EL2.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mrs	x2, id_aa64mmfr1_el1</div><div class='del'>-	ubfx	x2, x2, #8, #4</div><div class='add'>+	ubfx	x2, x2, #ID_AA64MMFR1_VHE_SHIFT, #4</div><div class='ctx'> #else</div><div class='ctx'> 	mov	x2, xzr</div><div class='ctx'> #endif</div><div class='hunk'>@@ -538,7 +538,7 @@ set_hcr:</div><div class='ctx'> #ifdef CONFIG_ARM_GIC_V3</div><div class='ctx'> 	/* GICv3 system register access */</div><div class='ctx'> 	mrs	x0, id_aa64pfr0_el1</div><div class='del'>-	ubfx	x0, x0, #24, #4</div><div class='add'>+	ubfx	x0, x0, #ID_AA64PFR0_GIC_SHIFT, #4</div><div class='ctx'> 	cbz	x0, 3f</div><div class='ctx'> </div><div class='ctx'> 	mrs_s	x0, SYS_ICC_SRE_EL2</div><div class='hunk'>@@ -564,8 +564,8 @@ set_hcr:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* EL2 debug */</div><div class='del'>-	mrs	x1, id_aa64dfr0_el1		// Check ID_AA64DFR0_EL1 PMUVer</div><div class='del'>-	sbfx	x0, x1, #8, #4</div><div class='add'>+	mrs	x1, id_aa64dfr0_el1</div><div class='add'>+	sbfx	x0, x1, #ID_AA64DFR0_PMUVER_SHIFT, #4</div><div class='ctx'> 	cmp	x0, #1</div><div class='ctx'> 	b.lt	4f				// Skip if no PMU present</div><div class='ctx'> 	mrs	x0, pmcr_el0			// Disable debug access traps</div><div class='hunk'>@@ -574,7 +574,7 @@ set_hcr:</div><div class='ctx'> 	csel	x3, xzr, x0, lt			// all PMU counters from EL1</div><div class='ctx'> </div><div class='ctx'> 	/* Statistical profiling */</div><div class='del'>-	ubfx	x0, x1, #32, #4			// Check ID_AA64DFR0_EL1 PMSVer</div><div class='add'>+	ubfx	x0, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4</div><div class='ctx'> 	cbz	x0, 7f				// Skip if SPE not present</div><div class='ctx'> 	cbnz	x2, 6f				// VHE?</div><div class='ctx'> 	mrs_s	x4, SYS_PMBIDR_EL1		// If SPE available at EL2,</div><div class='hunk'>@@ -684,7 +684,7 @@ ENTRY(__boot_cpu_mode)</div><div class='ctx'>  * with MMU turned off.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(__early_cpu_boot_status)</div><div class='del'>-	.long 	0</div><div class='add'>+	.quad 	0</div><div class='ctx'> </div><div class='ctx'> 	.popsection</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c<br/>index 7820a4a688fa..9e2b5882cdeb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/insn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/insn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/insn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/insn.c</a></div><div class='hunk'>@@ -734,6 +734,46 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg,</div><div class='ctx'> 					    state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result,</div><div class='add'>+			   enum aarch64_insn_register address,</div><div class='add'>+			   enum aarch64_insn_register value,</div><div class='add'>+			   enum aarch64_insn_size_type size)</div><div class='add'>+{</div><div class='add'>+	u32 insn = aarch64_insn_get_ldadd_value();</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case AARCH64_INSN_SIZE_32:</div><div class='add'>+	case AARCH64_INSN_SIZE_64:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s: unimplemented size encoding %d\n", __func__, size);</div><div class='add'>+		return AARCH64_BREAK_FAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	insn = aarch64_insn_encode_ldst_size(size, insn);</div><div class='add'>+</div><div class='add'>+	insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RT, insn,</div><div class='add'>+					    result);</div><div class='add'>+</div><div class='add'>+	insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RN, insn,</div><div class='add'>+					    address);</div><div class='add'>+</div><div class='add'>+	return aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RS, insn,</div><div class='add'>+					    value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address,</div><div class='add'>+			   enum aarch64_insn_register value,</div><div class='add'>+			   enum aarch64_insn_size_type size)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * STADD is simply encoded as an alias for LDADD with XZR as</div><div class='add'>+	 * the destination register.</div><div class='add'>+	 */</div><div class='add'>+	return aarch64_insn_gen_ldadd(AARCH64_INSN_REG_ZR, address,</div><div class='add'>+				      value, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 aarch64_insn_encode_prfm_imm(enum aarch64_insn_prfm_type type,</div><div class='ctx'> 					enum aarch64_insn_prfm_target target,</div><div class='ctx'> 					enum aarch64_insn_prfm_policy policy,</div><div class='head'>diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c<br/>index 691854b77c7f..30853d5b7859 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/kgdb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/kgdb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/kgdb.c</a></div><div class='hunk'>@@ -244,9 +244,6 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,</div><div class='ctx'> </div><div class='ctx'> static int kgdb_brk_fn(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return DBG_HOOK_ERROR;</div><div class='del'>-</div><div class='ctx'> 	kgdb_handle_exception(1, SIGTRAP, 0, regs);</div><div class='ctx'> 	return DBG_HOOK_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -254,9 +251,6 @@ NOKPROBE_SYMBOL(kgdb_brk_fn)</div><div class='ctx'> </div><div class='ctx'> static int kgdb_compiled_brk_fn(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return DBG_HOOK_ERROR;</div><div class='del'>-</div><div class='ctx'> 	compiled_break = 1;</div><div class='ctx'> 	kgdb_handle_exception(1, SIGTRAP, 0, regs);</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +260,7 @@ NOKPROBE_SYMBOL(kgdb_compiled_brk_fn);</div><div class='ctx'> </div><div class='ctx'> static int kgdb_step_brk_fn(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs) || !kgdb_single_step)</div><div class='add'>+	if (!kgdb_single_step)</div><div class='ctx'> 		return DBG_HOOK_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	kgdb_handle_exception(1, SIGTRAP, 0, regs);</div><div class='hunk'>@@ -275,15 +269,13 @@ static int kgdb_step_brk_fn(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> NOKPROBE_SYMBOL(kgdb_step_brk_fn);</div><div class='ctx'> </div><div class='ctx'> static struct break_hook kgdb_brkpt_hook = {</div><div class='del'>-	.esr_mask	= 0xffffffff,</div><div class='del'>-	.esr_val	= (u32)ESR_ELx_VAL_BRK64(KGDB_DYN_DBG_BRK_IMM),</div><div class='del'>-	.fn		= kgdb_brk_fn</div><div class='add'>+	.fn		= kgdb_brk_fn,</div><div class='add'>+	.imm		= KGDB_DYN_DBG_BRK_IMM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct break_hook kgdb_compiled_brkpt_hook = {</div><div class='del'>-	.esr_mask	= 0xffffffff,</div><div class='del'>-	.esr_val	= (u32)ESR_ELx_VAL_BRK64(KGDB_COMPILED_DBG_BRK_IMM),</div><div class='del'>-	.fn		= kgdb_compiled_brk_fn</div><div class='add'>+	.fn		= kgdb_compiled_brk_fn,</div><div class='add'>+	.imm		= KGDB_COMPILED_DBG_BRK_IMM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct step_hook kgdb_step_hook = {</div><div class='hunk'>@@ -332,9 +324,9 @@ int kgdb_arch_init(void)</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	register_break_hook(&amp;kgdb_brkpt_hook);</div><div class='del'>-	register_break_hook(&amp;kgdb_compiled_brkpt_hook);</div><div class='del'>-	register_step_hook(&amp;kgdb_step_hook);</div><div class='add'>+	register_kernel_break_hook(&amp;kgdb_brkpt_hook);</div><div class='add'>+	register_kernel_break_hook(&amp;kgdb_compiled_brkpt_hook);</div><div class='add'>+	register_kernel_step_hook(&amp;kgdb_step_hook);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,9 +337,9 @@ int kgdb_arch_init(void)</div><div class='ctx'>  */</div><div class='ctx'> void kgdb_arch_exit(void)</div><div class='ctx'> {</div><div class='del'>-	unregister_break_hook(&amp;kgdb_brkpt_hook);</div><div class='del'>-	unregister_break_hook(&amp;kgdb_compiled_brkpt_hook);</div><div class='del'>-	unregister_step_hook(&amp;kgdb_step_hook);</div><div class='add'>+	unregister_kernel_break_hook(&amp;kgdb_brkpt_hook);</div><div class='add'>+	unregister_kernel_break_hook(&amp;kgdb_compiled_brkpt_hook);</div><div class='add'>+	unregister_kernel_step_hook(&amp;kgdb_step_hook);</div><div class='ctx'> 	unregister_die_notifier(&amp;kgdb_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/kuser32.S b/arch/arm64/kernel/kuser32.S<br/>index 997e6b27ff6a..49825e9e421e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/kuser32.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/kuser32.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/kuser32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/kuser32.S</a></div><div class='hunk'>@@ -1,29 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- * Low-level user helpers placed in the vectors page for AArch32.</div><div class='add'>+ * AArch32 user helpers.</div><div class='ctx'>  * Based on the kuser helpers in arch/arm/kernel/entry-armv.S.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005-2011 Nicolas Pitre &lt;nico@fluxnic.net&gt;</div><div class='del'>- * Copyright (C) 2012 ARM 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 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 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) 2012-2018 ARM Ltd.</div><div class='ctx'>  *</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'>- * AArch32 user helpers.</div><div class='del'>- *</div><div class='del'>- * Each segment is 32-byte aligned and will be moved to the top of the high</div><div class='del'>- * vector page.  New segments (if ever needed) must be added in front of</div><div class='del'>- * existing ones.  This mechanism should be used only for things that are</div><div class='del'>- * really small and justified, and not be abused freely.</div><div class='add'>+ * The kuser helpers below are mapped at a fixed address by</div><div class='add'>+ * aarch32_setup_additional_pages() and are provided for compatibility</div><div class='add'>+ * reasons with 32 bit (aarch32) applications that need them.</div><div class='ctx'>  *</div><div class='ctx'>  * See Documentation/arm/kernel_user_helpers.txt for formal definitions.</div><div class='ctx'>  */</div><div class='hunk'>@@ -77,42 +62,3 @@ __kuser_helper_version:			// 0xffff0ffc</div><div class='ctx'> 	.word	((__kuser_helper_end - __kuser_helper_start) &gt;&gt; 5)</div><div class='ctx'> 	.globl	__kuser_helper_end</div><div class='ctx'> __kuser_helper_end:</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AArch32 sigreturn code</div><div class='del'>- *</div><div class='del'>- * For ARM syscalls, the syscall number has to be loaded into r7.</div><div class='del'>- * We do not support an OABI userspace.</div><div class='del'>- *</div><div class='del'>- * For Thumb syscalls, we also pass the syscall number via r7. We therefore</div><div class='del'>- * need two 16-bit instructions.</div><div class='del'>- */</div><div class='del'>-	.globl __aarch32_sigret_code_start</div><div class='del'>-__aarch32_sigret_code_start:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ARM Code</div><div class='del'>-	 */</div><div class='del'>-	.byte	__NR_compat_sigreturn, 0x70, 0xa0, 0xe3	// mov	r7, #__NR_compat_sigreturn</div><div class='del'>-	.byte	__NR_compat_sigreturn, 0x00, 0x00, 0xef	// svc	#__NR_compat_sigreturn</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Thumb code</div><div class='del'>-	 */</div><div class='del'>-	.byte	__NR_compat_sigreturn, 0x27			// svc	#__NR_compat_sigreturn</div><div class='del'>-	.byte	__NR_compat_sigreturn, 0xdf			// mov	r7, #__NR_compat_sigreturn</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ARM code</div><div class='del'>-	 */</div><div class='del'>-	.byte	__NR_compat_rt_sigreturn, 0x70, 0xa0, 0xe3	// mov	r7, #__NR_compat_rt_sigreturn</div><div class='del'>-	.byte	__NR_compat_rt_sigreturn, 0x00, 0x00, 0xef	// svc	#__NR_compat_rt_sigreturn</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Thumb code</div><div class='del'>-	 */</div><div class='del'>-	.byte	__NR_compat_rt_sigreturn, 0x27			// svc	#__NR_compat_rt_sigreturn</div><div class='del'>-	.byte	__NR_compat_rt_sigreturn, 0xdf			// mov	r7, #__NR_compat_rt_sigreturn</div><div class='del'>-</div><div class='del'>-        .globl __aarch32_sigret_code_end</div><div class='del'>-__aarch32_sigret_code_end:</div><div class='head'>diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c<br/>index 4addb38bc250..6164d389eed6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/perf_event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/perf_event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/perf_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/perf_event.c</a></div><div class='hunk'>@@ -431,7 +431,7 @@ static inline u64 armv8pmu_read_hw_counter(struct perf_event *event)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 armv8pmu_read_counter(struct perf_event *event)</div><div class='add'>+static u64 armv8pmu_read_counter(struct perf_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_pmu *cpu_pmu = to_arm_pmu(event-&gt;pmu);</div><div class='ctx'> 	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='hunk'>@@ -468,7 +468,7 @@ static inline void armv8pmu_write_hw_counter(struct perf_event *event,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void armv8pmu_write_counter(struct perf_event *event, u64 value)</div><div class='add'>+static void armv8pmu_write_counter(struct perf_event *event, u64 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_pmu *cpu_pmu = to_arm_pmu(event-&gt;pmu);</div><div class='ctx'> 	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='head'>diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c<br/>index 7fb6f3aa5ceb..2509fcb6d404 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/probes/kprobes.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/probes/kprobes.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/probes/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/probes/kprobes.c</a></div><div class='hunk'>@@ -91,8 +91,6 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs)</div><div class='ctx'> int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long probe_addr = (unsigned long)p-&gt;addr;</div><div class='del'>-	extern char __start_rodata[];</div><div class='del'>-	extern char __end_rodata[];</div><div class='ctx'> </div><div class='ctx'> 	if (probe_addr &amp; 0x3)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -100,10 +98,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='ctx'> 	/* copy instruction */</div><div class='ctx'> 	p-&gt;opcode = le32_to_cpu(*p-&gt;addr);</div><div class='ctx'> </div><div class='del'>-	if (in_exception_text(probe_addr))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (probe_addr &gt;= (unsigned long) __start_rodata &amp;&amp;</div><div class='del'>-	    probe_addr &lt;= (unsigned long) __end_rodata)</div><div class='add'>+	if (search_exception_tables(probe_addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* decode instruction */</div><div class='hunk'>@@ -444,15 +439,12 @@ kprobe_ss_hit(struct kprobe_ctlblk *kcb, unsigned long addr)</div><div class='ctx'> 	return DBG_HOOK_ERROR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __kprobes</div><div class='add'>+static int __kprobes</div><div class='ctx'> kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='ctx'> 	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return DBG_HOOK_ERROR;</div><div class='del'>-</div><div class='ctx'> 	/* return error if this is not our step */</div><div class='ctx'> 	retval = kprobe_ss_hit(kcb, instruction_pointer(regs));</div><div class='ctx'> </div><div class='hunk'>@@ -466,36 +458,53 @@ kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __kprobes</div><div class='add'>+static struct step_hook kprobes_step_hook = {</div><div class='add'>+	.fn = kprobe_single_step_handler,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __kprobes</div><div class='ctx'> kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return DBG_HOOK_ERROR;</div><div class='del'>-</div><div class='ctx'> 	kprobe_handler(regs);</div><div class='ctx'> 	return DBG_HOOK_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool arch_within_kprobe_blacklist(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	if ((addr &gt;= (unsigned long)__kprobes_text_start &amp;&amp;</div><div class='del'>-	    addr &lt; (unsigned long)__kprobes_text_end) ||</div><div class='del'>-	    (addr &gt;= (unsigned long)__entry_text_start &amp;&amp;</div><div class='del'>-	    addr &lt; (unsigned long)__entry_text_end) ||</div><div class='del'>-	    (addr &gt;= (unsigned long)__idmap_text_start &amp;&amp;</div><div class='del'>-	    addr &lt; (unsigned long)__idmap_text_end) ||</div><div class='del'>-	    (addr &gt;= (unsigned long)__hyp_text_start &amp;&amp;</div><div class='del'>-	    addr &lt; (unsigned long)__hyp_text_end) ||</div><div class='del'>-	    !!search_exception_tables(addr))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (!is_kernel_in_hyp_mode()) {</div><div class='del'>-		if ((addr &gt;= (unsigned long)__hyp_idmap_text_start &amp;&amp;</div><div class='del'>-		    addr &lt; (unsigned long)__hyp_idmap_text_end))</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='add'>+static struct break_hook kprobes_break_hook = {</div><div class='add'>+	.imm = KPROBES_BRK_IMM,</div><div class='add'>+	.fn = kprobe_breakpoint_handler,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+/*</div><div class='add'>+ * Provide a blacklist of symbols identifying ranges which cannot be kprobed.</div><div class='add'>+ * This blacklist is exposed to userspace via debugfs (kprobes/blacklist).</div><div class='add'>+ */</div><div class='add'>+int __init arch_populate_kprobe_blacklist(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kprobe_add_area_blacklist((unsigned long)__entry_text_start,</div><div class='add'>+					(unsigned long)__entry_text_end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = kprobe_add_area_blacklist((unsigned long)__irqentry_text_start,</div><div class='add'>+					(unsigned long)__irqentry_text_end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = kprobe_add_area_blacklist((unsigned long)__exception_text_start,</div><div class='add'>+					(unsigned long)__exception_text_end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = kprobe_add_area_blacklist((unsigned long)__idmap_text_start,</div><div class='add'>+					(unsigned long)__idmap_text_end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = kprobe_add_area_blacklist((unsigned long)__hyp_text_start,</div><div class='add'>+					(unsigned long)__hyp_text_end);</div><div class='add'>+	if (ret || is_kernel_in_hyp_mode())</div><div class='add'>+		return ret;</div><div class='add'>+	ret = kprobe_add_area_blacklist((unsigned long)__hyp_idmap_text_start,</div><div class='add'>+					(unsigned long)__hyp_idmap_text_end);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)</div><div class='hunk'>@@ -593,5 +602,8 @@ int __kprobes arch_trampoline_kprobe(struct kprobe *p)</div><div class='ctx'> </div><div class='ctx'> int __init arch_init_kprobes(void)</div><div class='ctx'> {</div><div class='add'>+	register_kernel_break_hook(&amp;kprobes_break_hook);</div><div class='add'>+	register_kernel_step_hook(&amp;kprobes_step_hook);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c<br/>index 636ca0119c0e..605945eac1f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/probes/uprobes.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/probes/uprobes.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/probes/uprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/probes/uprobes.c</a></div><div class='hunk'>@@ -171,7 +171,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self,</div><div class='ctx'> static int uprobe_breakpoint_handler(struct pt_regs *regs,</div><div class='ctx'> 		unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs) &amp;&amp; uprobe_pre_sstep_notifier(regs))</div><div class='add'>+	if (uprobe_pre_sstep_notifier(regs))</div><div class='ctx'> 		return DBG_HOOK_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	return DBG_HOOK_ERROR;</div><div class='hunk'>@@ -182,21 +182,16 @@ static int uprobe_single_step_handler(struct pt_regs *regs,</div><div class='ctx'> {</div><div class='ctx'> 	struct uprobe_task *utask = current-&gt;utask;</div><div class='ctx'> </div><div class='del'>-	if (user_mode(regs)) {</div><div class='del'>-		WARN_ON(utask &amp;&amp;</div><div class='del'>-			(instruction_pointer(regs) != utask-&gt;xol_vaddr + 4));</div><div class='del'>-</div><div class='del'>-		if (uprobe_post_sstep_notifier(regs))</div><div class='del'>-			return DBG_HOOK_HANDLED;</div><div class='del'>-	}</div><div class='add'>+	WARN_ON(utask &amp;&amp; (instruction_pointer(regs) != utask-&gt;xol_vaddr + 4));</div><div class='add'>+	if (uprobe_post_sstep_notifier(regs))</div><div class='add'>+		return DBG_HOOK_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	return DBG_HOOK_ERROR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* uprobe breakpoint handler hook */</div><div class='ctx'> static struct break_hook uprobes_break_hook = {</div><div class='del'>-	.esr_mask = BRK64_ESR_MASK,</div><div class='del'>-	.esr_val = BRK64_ESR_UPROBES,</div><div class='add'>+	.imm = UPROBES_BRK_IMM,</div><div class='ctx'> 	.fn = uprobe_breakpoint_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -207,8 +202,8 @@ static struct step_hook uprobes_step_hook = {</div><div class='ctx'> </div><div class='ctx'> static int __init arch_init_uprobes(void)</div><div class='ctx'> {</div><div class='del'>-	register_break_hook(&amp;uprobes_break_hook);</div><div class='del'>-	register_step_hook(&amp;uprobes_step_hook);</div><div class='add'>+	register_user_break_hook(&amp;uprobes_break_hook);</div><div class='add'>+	register_user_step_hook(&amp;uprobes_step_hook);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c<br/>index 5ba4465e44f0..ea94cf8f9dc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/sdei.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/sdei.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/sdei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/sdei.c</a></div><div class='hunk'>@@ -94,6 +94,9 @@ static bool on_sdei_normal_stack(unsigned long sp, struct stack_info *info)</div><div class='ctx'> 	unsigned long low = (unsigned long)raw_cpu_read(sdei_stack_normal_ptr);</div><div class='ctx'> 	unsigned long high = low + SDEI_STACK_SIZE;</div><div class='ctx'> </div><div class='add'>+	if (!low)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (sp &lt; low || sp &gt;= high)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -111,6 +114,9 @@ static bool on_sdei_critical_stack(unsigned long sp, struct stack_info *info)</div><div class='ctx'> 	unsigned long low = (unsigned long)raw_cpu_read(sdei_stack_critical_ptr);</div><div class='ctx'> 	unsigned long high = low + SDEI_STACK_SIZE;</div><div class='ctx'> </div><div class='add'>+	if (!low)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (sp &lt; low || sp &gt;= high)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c<br/>index f8482fe5a190..413d566405d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/setup.c</a></div><div class='hunk'>@@ -217,7 +217,7 @@ static void __init request_standard_resources(void)</div><div class='ctx'> </div><div class='ctx'> 	num_standard_resources = memblock.memory.cnt;</div><div class='ctx'> 	res_size = num_standard_resources * sizeof(*standard_resources);</div><div class='del'>-	standard_resources = memblock_alloc_low(res_size, SMP_CACHE_BYTES);</div><div class='add'>+	standard_resources = memblock_alloc(res_size, SMP_CACHE_BYTES);</div><div class='ctx'> 	if (!standard_resources)</div><div class='ctx'> 		panic("%s: Failed to allocate %zu bytes\n", __func__, res_size);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c<br/>index cb7800acd19f..caea6e25db2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/signal32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/signal32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/signal32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/signal32.c</a></div><div class='hunk'>@@ -403,8 +403,7 @@ static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka,</div><div class='ctx'> 		if (ka-&gt;sa.sa_flags &amp; SA_SIGINFO)</div><div class='ctx'> 			idx += 3;</div><div class='ctx'> </div><div class='del'>-		retcode = AARCH32_VECTORS_BASE +</div><div class='del'>-			  AARCH32_KERN_SIGRET_CODE_OFFSET +</div><div class='add'>+		retcode = (unsigned long)current-&gt;mm-&gt;context.vdso +</div><div class='ctx'> 			  (idx &lt;&lt; 2) + thumb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/sigreturn32.S b/arch/arm64/kernel/sigreturn32.S<br/>new file mode 100644<br/>index 000000000000..475d30d471ac<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/sigreturn32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/sigreturn32.S</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * AArch32 sigreturn code.</div><div class='add'>+ * Based on the kuser helpers in arch/arm/kernel/entry-armv.S.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005-2011 Nicolas Pitre &lt;nico@fluxnic.net&gt;</div><div class='add'>+ * Copyright (C) 2012-2018 ARM Ltd.</div><div class='add'>+ *</div><div class='add'>+ * For ARM syscalls, the syscall number has to be loaded into r7.</div><div class='add'>+ * We do not support an OABI userspace.</div><div class='add'>+ *</div><div class='add'>+ * For Thumb syscalls, we also pass the syscall number via r7. We therefore</div><div class='add'>+ * need two 16-bit instructions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+	.globl __aarch32_sigret_code_start</div><div class='add'>+__aarch32_sigret_code_start:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARM Code</div><div class='add'>+	 */</div><div class='add'>+	.byte	__NR_compat_sigreturn, 0x70, 0xa0, 0xe3		// mov	r7, #__NR_compat_sigreturn</div><div class='add'>+	.byte	__NR_compat_sigreturn, 0x00, 0x00, 0xef		// svc	#__NR_compat_sigreturn</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Thumb code</div><div class='add'>+	 */</div><div class='add'>+	.byte	__NR_compat_sigreturn, 0x27			// svc	#__NR_compat_sigreturn</div><div class='add'>+	.byte	__NR_compat_sigreturn, 0xdf			// mov	r7, #__NR_compat_sigreturn</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARM code</div><div class='add'>+	 */</div><div class='add'>+	.byte	__NR_compat_rt_sigreturn, 0x70, 0xa0, 0xe3	// mov	r7, #__NR_compat_rt_sigreturn</div><div class='add'>+	.byte	__NR_compat_rt_sigreturn, 0x00, 0x00, 0xef	// svc	#__NR_compat_rt_sigreturn</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Thumb code</div><div class='add'>+	 */</div><div class='add'>+	.byte	__NR_compat_rt_sigreturn, 0x27			// svc	#__NR_compat_rt_sigreturn</div><div class='add'>+	.byte	__NR_compat_rt_sigreturn, 0xdf			// mov	r7, #__NR_compat_rt_sigreturn</div><div class='add'>+</div><div class='add'>+        .globl __aarch32_sigret_code_end</div><div class='add'>+__aarch32_sigret_code_end:</div><div class='head'>diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c<br/>index 824de7038967..bb4b3f07761a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/smp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/smp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/smp.c</a></div><div class='hunk'>@@ -586,7 +586,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,</div><div class='add'>+acpi_parse_gic_cpu_interface(union acpi_subtable_headers *header,</div><div class='ctx'> 			     const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_interrupt *processor;</div><div class='hunk'>@@ -595,7 +595,7 @@ acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,</div><div class='ctx'> 	if (BAD_MADT_GICC_ENTRY(processor, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	acpi_map_gic_cpu_interface(processor);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c<br/>index 1a29f2695ff2..b00ec7d483d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/stacktrace.c</a></div><div class='hunk'>@@ -140,9 +140,8 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	walk_stackframe(current, &amp;frame, save_trace, &amp;data);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(save_stack_trace_regs);</div><div class='ctx'> </div><div class='ctx'> static noinline void __save_stack_trace(struct task_struct *tsk,</div><div class='ctx'> 	struct stack_trace *trace, unsigned int nosched)</div><div class='hunk'>@@ -171,8 +170,6 @@ static noinline void __save_stack_trace(struct task_struct *tsk,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	walk_stackframe(tsk, &amp;frame, save_trace, &amp;data);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> </div><div class='ctx'> 	put_task_stack(tsk);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c<br/>index b44065fb1616..6f91e8116514 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/sys.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/sys.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/sys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/sys.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,</div><div class='ctx'> 		unsigned long, prot, unsigned long, flags,</div><div class='del'>-		unsigned long, fd, off_t, off)</div><div class='add'>+		unsigned long, fd, unsigned long, off)</div><div class='ctx'> {</div><div class='ctx'> 	if (offset_in_page(off) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c<br/>index 8ad119c3f665..ade32046f3fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/traps.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/traps.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/traps.c</a></div><div class='hunk'>@@ -102,10 +102,16 @@ static void dump_instr(const char *lvl, struct pt_regs *regs)</div><div class='ctx'> void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	struct stackframe frame;</div><div class='del'>-	int skip;</div><div class='add'>+	int skip = 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk);</div><div class='ctx'> </div><div class='add'>+	if (regs) {</div><div class='add'>+		if (user_mode(regs))</div><div class='add'>+			return;</div><div class='add'>+		skip = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!tsk)</div><div class='ctx'> 		tsk = current;</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +132,6 @@ void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)</div><div class='ctx'> 	frame.graph = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	skip = !!regs;</div><div class='ctx'> 	printk("Call trace:\n");</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* skip until specified stack frame */</div><div class='hunk'>@@ -176,15 +181,13 @@ static int __die(const char *str, int err, struct pt_regs *regs)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	print_modules();</div><div class='del'>-	__show_regs(regs);</div><div class='ctx'> 	pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",</div><div class='ctx'> 		 TASK_COMM_LEN, tsk-&gt;comm, task_pid_nr(tsk),</div><div class='ctx'> 		 end_of_stack(tsk));</div><div class='add'>+	show_regs(regs);</div><div class='ctx'> </div><div class='del'>-	if (!user_mode(regs)) {</div><div class='del'>-		dump_backtrace(regs, tsk);</div><div class='add'>+	if (!user_mode(regs))</div><div class='ctx'> 		dump_instr(KERN_EMERG, regs);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -459,6 +462,9 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> 	case ESR_ELx_SYS64_ISS_CRM_DC_CVAC:	/* DC CVAC, gets promoted */</div><div class='ctx'> 		__user_cache_maint("dc civac", address, ret);</div><div class='ctx'> 		break;</div><div class='add'>+	case ESR_ELx_SYS64_ISS_CRM_DC_CVADP:	/* DC CVADP */</div><div class='add'>+		__user_cache_maint("sys 3, c7, c13, 1", address, ret);</div><div class='add'>+		break;</div><div class='ctx'> 	case ESR_ELx_SYS64_ISS_CRM_DC_CVAP:	/* DC CVAP */</div><div class='ctx'> 		__user_cache_maint("sys 3, c7, c12, 1", address, ret);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -493,7 +499,7 @@ static void cntvct_read_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int rt = ESR_ELx_SYS64_ISS_RT(esr);</div><div class='ctx'> </div><div class='del'>-	pt_regs_write_reg(regs, rt, arch_counter_get_cntvct());</div><div class='add'>+	pt_regs_write_reg(regs, rt, arch_timer_read_counter());</div><div class='ctx'> 	arm64_skip_faulting_instruction(regs, AARCH64_INSN_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -665,7 +671,7 @@ static void compat_cntvct_read_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int rt = (esr &amp; ESR_ELx_CP15_64_ISS_RT_MASK) &gt;&gt; ESR_ELx_CP15_64_ISS_RT_SHIFT;</div><div class='ctx'> 	int rt2 = (esr &amp; ESR_ELx_CP15_64_ISS_RT2_MASK) &gt;&gt; ESR_ELx_CP15_64_ISS_RT2_SHIFT;</div><div class='del'>-	u64 val = arch_counter_get_cntvct();</div><div class='add'>+	u64 val = arch_timer_read_counter();</div><div class='ctx'> </div><div class='ctx'> 	pt_regs_write_reg(regs, rt, lower_32_bits(val));</div><div class='ctx'> 	pt_regs_write_reg(regs, rt2, upper_32_bits(val));</div><div class='hunk'>@@ -947,9 +953,6 @@ int is_valid_bugaddr(unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> static int bug_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return DBG_HOOK_ERROR;</div><div class='del'>-</div><div class='ctx'> 	switch (report_bug(regs-&gt;pc, regs)) {</div><div class='ctx'> 	case BUG_TRAP_TYPE_BUG:</div><div class='ctx'> 		die("Oops - BUG", regs, 0);</div><div class='hunk'>@@ -969,9 +972,8 @@ static int bug_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct break_hook bug_break_hook = {</div><div class='del'>-	.esr_val = 0xf2000000 | BUG_BRK_IMM,</div><div class='del'>-	.esr_mask = 0xffffffff,</div><div class='ctx'> 	.fn = bug_handler,</div><div class='add'>+	.imm = BUG_BRK_IMM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KASAN_SW_TAGS</div><div class='hunk'>@@ -989,9 +991,6 @@ static int kasan_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> 	u64 addr = regs-&gt;regs[0];</div><div class='ctx'> 	u64 pc = regs-&gt;pc;</div><div class='ctx'> </div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return DBG_HOOK_ERROR;</div><div class='del'>-</div><div class='ctx'> 	kasan_report(addr, size, write, pc);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1016,13 +1015,10 @@ static int kasan_handler(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> 	return DBG_HOOK_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define KASAN_ESR_VAL (0xf2000000 | KASAN_BRK_IMM)</div><div class='del'>-#define KASAN_ESR_MASK 0xffffff00</div><div class='del'>-</div><div class='ctx'> static struct break_hook kasan_break_hook = {</div><div class='del'>-	.esr_val = KASAN_ESR_VAL,</div><div class='del'>-	.esr_mask = KASAN_ESR_MASK,</div><div class='del'>-	.fn = kasan_handler,</div><div class='add'>+	.fn	= kasan_handler,</div><div class='add'>+	.imm	= KASAN_BRK_IMM,</div><div class='add'>+	.mask	= KASAN_BRK_MASK,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1034,7 +1030,9 @@ int __init early_brk64(unsigned long addr, unsigned int esr,</div><div class='ctx'> 		struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_KASAN_SW_TAGS</div><div class='del'>-	if ((esr &amp; KASAN_ESR_MASK) == KASAN_ESR_VAL)</div><div class='add'>+	unsigned int comment = esr &amp; ESR_ELx_BRK64_ISS_COMMENT_MASK;</div><div class='add'>+</div><div class='add'>+	if ((comment &amp; ~KASAN_BRK_MASK) == KASAN_BRK_IMM)</div><div class='ctx'> 		return kasan_handler(regs, esr) != DBG_HOOK_HANDLED;</div><div class='ctx'> #endif</div><div class='ctx'> 	return bug_handler(regs, esr) != DBG_HOOK_HANDLED;</div><div class='hunk'>@@ -1043,8 +1041,8 @@ int __init early_brk64(unsigned long addr, unsigned int esr,</div><div class='ctx'> /* This registration must happen early, before debug_traps_init(). */</div><div class='ctx'> void __init trap_init(void)</div><div class='ctx'> {</div><div class='del'>-	register_break_hook(&amp;bug_break_hook);</div><div class='add'>+	register_kernel_break_hook(&amp;bug_break_hook);</div><div class='ctx'> #ifdef CONFIG_KASAN_SW_TAGS</div><div class='del'>-	register_break_hook(&amp;kasan_break_hook);</div><div class='add'>+	register_kernel_break_hook(&amp;kasan_break_hook);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c<br/>index 2d419006ad43..8074cbd3a3a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/vdso.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/vdso.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/vdso.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/vdso.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * VDSO implementation for AArch64 and vector page setup for AArch32.</div><div class='add'>+ * VDSO implementations.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 ARM Limited</div><div class='ctx'>  *</div><div class='hunk'>@@ -53,61 +53,129 @@ struct vdso_data *vdso_data = &amp;vdso_data_store.data;</div><div class='ctx'> /*</div><div class='ctx'>  * Create and map the vectors page for AArch32 tasks.</div><div class='ctx'>  */</div><div class='del'>-static struct page *vectors_page[1] __ro_after_init;</div><div class='add'>+#define C_VECTORS	0</div><div class='add'>+#define C_SIGPAGE	1</div><div class='add'>+#define C_PAGES		(C_SIGPAGE + 1)</div><div class='add'>+static struct page *aarch32_vdso_pages[C_PAGES] __ro_after_init;</div><div class='add'>+static const struct vm_special_mapping aarch32_vdso_spec[C_PAGES] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "[vectors]", /* ABI */</div><div class='add'>+		.pages	= &amp;aarch32_vdso_pages[C_VECTORS],</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "[sigpage]", /* ABI */</div><div class='add'>+		.pages	= &amp;aarch32_vdso_pages[C_SIGPAGE],</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __init alloc_vectors_page(void)</div><div class='add'>+static int aarch32_alloc_kuser_vdso_page(void)</div><div class='ctx'> {</div><div class='ctx'> 	extern char __kuser_helper_start[], __kuser_helper_end[];</div><div class='del'>-	extern char __aarch32_sigret_code_start[], __aarch32_sigret_code_end[];</div><div class='del'>-</div><div class='ctx'> 	int kuser_sz = __kuser_helper_end - __kuser_helper_start;</div><div class='del'>-	int sigret_sz = __aarch32_sigret_code_end - __aarch32_sigret_code_start;</div><div class='del'>-	unsigned long vpage;</div><div class='add'>+	unsigned long vdso_page;</div><div class='ctx'> </div><div class='del'>-	vpage = get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_KUSER_HELPERS))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!vpage)</div><div class='add'>+	vdso_page = get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+	if (!vdso_page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* kuser helpers */</div><div class='del'>-	memcpy((void *)vpage + 0x1000 - kuser_sz, __kuser_helper_start,</div><div class='del'>-		kuser_sz);</div><div class='add'>+	memcpy((void *)(vdso_page + 0x1000 - kuser_sz), __kuser_helper_start,</div><div class='add'>+	       kuser_sz);</div><div class='add'>+	aarch32_vdso_pages[C_VECTORS] = virt_to_page(vdso_page);</div><div class='add'>+	flush_dcache_page(aarch32_vdso_pages[C_VECTORS]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* sigreturn code */</div><div class='del'>-	memcpy((void *)vpage + AARCH32_KERN_SIGRET_CODE_OFFSET,</div><div class='del'>-               __aarch32_sigret_code_start, sigret_sz);</div><div class='add'>+static int __init aarch32_alloc_vdso_pages(void)</div><div class='add'>+{</div><div class='add'>+	extern char __aarch32_sigret_code_start[], __aarch32_sigret_code_end[];</div><div class='add'>+	int sigret_sz = __aarch32_sigret_code_end - __aarch32_sigret_code_start;</div><div class='add'>+	unsigned long sigpage;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	flush_icache_range(vpage, vpage + PAGE_SIZE);</div><div class='del'>-	vectors_page[0] = virt_to_page(vpage);</div><div class='add'>+	sigpage = get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+	if (!sigpage)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	memcpy((void *)sigpage, __aarch32_sigret_code_start, sigret_sz);</div><div class='add'>+	aarch32_vdso_pages[C_SIGPAGE] = virt_to_page(sigpage);</div><div class='add'>+	flush_dcache_page(aarch32_vdso_pages[C_SIGPAGE]);</div><div class='add'>+</div><div class='add'>+	ret = aarch32_alloc_kuser_vdso_page();</div><div class='add'>+	if (ret)</div><div class='add'>+		free_page(sigpage);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-arch_initcall(alloc_vectors_page);</div><div class='add'>+arch_initcall(aarch32_alloc_vdso_pages);</div><div class='ctx'> </div><div class='del'>-int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp)</div><div class='add'>+static int aarch32_kuser_helpers_setup(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	struct mm_struct *mm = current-&gt;mm;</div><div class='del'>-	unsigned long addr = AARCH32_VECTORS_BASE;</div><div class='del'>-	static const struct vm_special_mapping spec = {</div><div class='del'>-		.name	= "[vectors]",</div><div class='del'>-		.pages	= vectors_page,</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_KUSER_HELPERS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid VM_MAYWRITE for compatibility with arch/arm/, where it's</div><div class='add'>+	 * not safe to CoW the page containing the CPU exception vectors.</div><div class='add'>+	 */</div><div class='add'>+	ret = _install_special_mapping(mm, AARCH32_VECTORS_BASE, PAGE_SIZE,</div><div class='add'>+				       VM_READ | VM_EXEC |</div><div class='add'>+				       VM_MAYREAD | VM_MAYEXEC,</div><div class='add'>+				       &amp;aarch32_vdso_spec[C_VECTORS]);</div><div class='ctx'> </div><div class='del'>-	};</div><div class='add'>+	return PTR_ERR_OR_ZERO(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aarch32_sigreturn_setup(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='ctx'> 	void *ret;</div><div class='ctx'> </div><div class='del'>-	if (down_write_killable(&amp;mm-&gt;mmap_sem))</div><div class='del'>-		return -EINTR;</div><div class='del'>-	current-&gt;mm-&gt;context.vdso = (void *)addr;</div><div class='add'>+	addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);</div><div class='add'>+	if (IS_ERR_VALUE(addr)) {</div><div class='add'>+		ret = ERR_PTR(addr);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Map vectors page at the high address. */</div><div class='add'>+	/*</div><div class='add'>+	 * VM_MAYWRITE is required to allow gdb to Copy-on-Write and</div><div class='add'>+	 * set breakpoints.</div><div class='add'>+	 */</div><div class='ctx'> 	ret = _install_special_mapping(mm, addr, PAGE_SIZE,</div><div class='del'>-				       VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC,</div><div class='del'>-				       &amp;spec);</div><div class='add'>+				       VM_READ | VM_EXEC | VM_MAYREAD |</div><div class='add'>+				       VM_MAYWRITE | VM_MAYEXEC,</div><div class='add'>+				       &amp;aarch32_vdso_spec[C_SIGPAGE]);</div><div class='add'>+	if (IS_ERR(ret))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	mm-&gt;context.vdso = (void *)addr;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(ret);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (down_write_killable(&amp;mm-&gt;mmap_sem))</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='add'>+	ret = aarch32_kuser_helpers_setup(mm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = aarch32_sigreturn_setup(mm);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_COMPAT */</div><div class='ctx'> </div><div class='ctx'> static int vdso_mremap(const struct vm_special_mapping *sm,</div><div class='hunk'>@@ -146,8 +214,6 @@ static int __init vdso_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vdso_pages = (vdso_end - vdso_start) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",</div><div class='del'>-		vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the vDSO pagelist, plus a page for the data. */</div><div class='ctx'> 	vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),</div><div class='hunk'>@@ -232,6 +298,9 @@ void update_vsyscall(struct timekeeper *tk)</div><div class='ctx'> 	vdso_data-&gt;wtm_clock_sec		= tk-&gt;wall_to_monotonic.tv_sec;</div><div class='ctx'> 	vdso_data-&gt;wtm_clock_nsec		= tk-&gt;wall_to_monotonic.tv_nsec;</div><div class='ctx'> </div><div class='add'>+	/* Read without the seqlock held by clock_getres() */</div><div class='add'>+	WRITE_ONCE(vdso_data-&gt;hrtimer_res, hrtimer_resolution);</div><div class='add'>+</div><div class='ctx'> 	if (!use_syscall) {</div><div class='ctx'> 		/* tkr_mono.cycle_last == tkr_raw.cycle_last */</div><div class='ctx'> 		vdso_data-&gt;cs_cycle_last	= tk-&gt;tkr_mono.cycle_last;</div><div class='head'>diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile<br/>index b215c712d897..744b9dbaba03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/vdso/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/vdso/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/vdso/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/vdso/Makefile</a></div><div class='hunk'>@@ -12,17 +12,12 @@ obj-vdso := gettimeofday.o note.o sigreturn.o</div><div class='ctx'> targets := $(obj-vdso) vdso.so vdso.so.dbg</div><div class='ctx'> obj-vdso := $(addprefix $(obj)/, $(obj-vdso))</div><div class='ctx'> </div><div class='del'>-ccflags-y := -shared -fno-common -fno-builtin</div><div class='del'>-ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 \</div><div class='del'>-		$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)</div><div class='add'>+ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 \</div><div class='add'>+		$(call ld-option, --hash-style=sysv) -n -T</div><div class='ctx'> </div><div class='ctx'> # Disable gcov profiling for VDSO code</div><div class='ctx'> GCOV_PROFILE := n</div><div class='ctx'> </div><div class='del'>-# Workaround for bare-metal (ELF) toolchains that neglect to pass -shared</div><div class='del'>-# down to collect2, resulting in silent corruption of the vDSO image.</div><div class='del'>-ccflags-y += -Wl,-shared</div><div class='del'>-</div><div class='ctx'> obj-y += vdso.o</div><div class='ctx'> extra-y += vdso.lds</div><div class='ctx'> CPPFLAGS_vdso.lds += -P -C -U$(ARCH)</div><div class='hunk'>@@ -31,8 +26,8 @@ CPPFLAGS_vdso.lds += -P -C -U$(ARCH)</div><div class='ctx'> $(obj)/vdso.o : $(obj)/vdso.so</div><div class='ctx'> </div><div class='ctx'> # Link rule for the .so file, .lds has to be first</div><div class='del'>-$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso)</div><div class='del'>-	$(call if_changed,vdsold)</div><div class='add'>+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE</div><div class='add'>+	$(call if_changed,ld)</div><div class='ctx'> </div><div class='ctx'> # Strip rule for the .so file</div><div class='ctx'> $(obj)/%.so: OBJCOPYFLAGS := -S</div><div class='hunk'>@@ -42,9 +37,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE</div><div class='ctx'> # Generate VDSO offsets using helper script</div><div class='ctx'> gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh</div><div class='ctx'> quiet_cmd_vdsosym = VDSOSYM $@</div><div class='del'>-define cmd_vdsosym</div><div class='del'>-	$(NM) $&lt; | $(gen-vdsosym) | LC_ALL=C sort &gt; $@</div><div class='del'>-endef</div><div class='add'>+      cmd_vdsosym = $(NM) $&lt; | $(gen-vdsosym) | LC_ALL=C sort &gt; $@</div><div class='ctx'> </div><div class='ctx'> include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE</div><div class='ctx'> 	$(call if_changed,vdsosym)</div><div class='hunk'>@@ -54,8 +47,6 @@ $(obj-vdso): %.o: %.S FORCE</div><div class='ctx'> 	$(call if_changed_dep,vdsoas)</div><div class='ctx'> </div><div class='ctx'> # Actual build commands</div><div class='del'>-quiet_cmd_vdsold = VDSOL   $@</div><div class='del'>-      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@</div><div class='ctx'> quiet_cmd_vdsoas = VDSOA   $@</div><div class='ctx'>       cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $&lt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S<br/>index c39872a7b03c..856fee6d3512 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/vdso/gettimeofday.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kernel/vdso/gettimeofday.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kernel/vdso/gettimeofday.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kernel/vdso/gettimeofday.S</a></div><div class='hunk'>@@ -73,6 +73,13 @@ x_tmp		.req	x8</div><div class='ctx'> 	movn	x_tmp, #0xff00, lsl #48</div><div class='ctx'> 	and	\res, x_tmp, \res</div><div class='ctx'> 	mul	\res, \res, \mult</div><div class='add'>+	/*</div><div class='add'>+	 * Fake address dependency from the value computed from the counter</div><div class='add'>+	 * register to subsequent data page accesses so that the sequence</div><div class='add'>+	 * locking also orders the read of the counter.</div><div class='add'>+	 */</div><div class='add'>+	and	x_tmp, \res, xzr</div><div class='add'>+	add	vdso_data, vdso_data, x_tmp</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -147,12 +154,12 @@ ENTRY(__kernel_gettimeofday)</div><div class='ctx'> 	/* w11 = cs_mono_mult, w12 = cs_shift */</div><div class='ctx'> 	ldp	w11, w12, [vdso_data, #VDSO_CS_MONO_MULT]</div><div class='ctx'> 	ldp	x13, x14, [vdso_data, #VDSO_XTIME_CLK_SEC]</div><div class='del'>-	seqcnt_check fail=1b</div><div class='ctx'> </div><div class='ctx'> 	get_nsec_per_sec res=x9</div><div class='ctx'> 	lsl	x9, x9, x12</div><div class='ctx'> </div><div class='ctx'> 	get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11</div><div class='add'>+	seqcnt_check fail=1b</div><div class='ctx'> 	get_ts_realtime res_sec=x10, res_nsec=x11, \</div><div class='ctx'> 		clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9</div><div class='ctx'> </div><div class='hunk'>@@ -211,13 +218,13 @@ realtime:</div><div class='ctx'> 	/* w11 = cs_mono_mult, w12 = cs_shift */</div><div class='ctx'> 	ldp	w11, w12, [vdso_data, #VDSO_CS_MONO_MULT]</div><div class='ctx'> 	ldp	x13, x14, [vdso_data, #VDSO_XTIME_CLK_SEC]</div><div class='del'>-	seqcnt_check fail=realtime</div><div class='ctx'> </div><div class='ctx'> 	/* All computations are done with left-shifted nsecs. */</div><div class='ctx'> 	get_nsec_per_sec res=x9</div><div class='ctx'> 	lsl	x9, x9, x12</div><div class='ctx'> </div><div class='ctx'> 	get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11</div><div class='add'>+	seqcnt_check fail=realtime</div><div class='ctx'> 	get_ts_realtime res_sec=x10, res_nsec=x11, \</div><div class='ctx'> 		clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9</div><div class='ctx'> 	clock_gettime_return, shift=1</div><div class='hunk'>@@ -231,7 +238,6 @@ monotonic:</div><div class='ctx'> 	ldp	w11, w12, [vdso_data, #VDSO_CS_MONO_MULT]</div><div class='ctx'> 	ldp	x13, x14, [vdso_data, #VDSO_XTIME_CLK_SEC]</div><div class='ctx'> 	ldp	x3, x4, [vdso_data, #VDSO_WTM_CLK_SEC]</div><div class='del'>-	seqcnt_check fail=monotonic</div><div class='ctx'> </div><div class='ctx'> 	/* All computations are done with left-shifted nsecs. */</div><div class='ctx'> 	lsl	x4, x4, x12</div><div class='hunk'>@@ -239,6 +245,7 @@ monotonic:</div><div class='ctx'> 	lsl	x9, x9, x12</div><div class='ctx'> </div><div class='ctx'> 	get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11</div><div class='add'>+	seqcnt_check fail=monotonic</div><div class='ctx'> 	get_ts_realtime res_sec=x10, res_nsec=x11, \</div><div class='ctx'> 		clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9</div><div class='ctx'> </div><div class='hunk'>@@ -253,13 +260,13 @@ monotonic_raw:</div><div class='ctx'> 	/* w11 = cs_raw_mult, w12 = cs_shift */</div><div class='ctx'> 	ldp	w12, w11, [vdso_data, #VDSO_CS_SHIFT]</div><div class='ctx'> 	ldp	x13, x14, [vdso_data, #VDSO_RAW_TIME_SEC]</div><div class='del'>-	seqcnt_check fail=monotonic_raw</div><div class='ctx'> </div><div class='ctx'> 	/* All computations are done with left-shifted nsecs. */</div><div class='ctx'> 	get_nsec_per_sec res=x9</div><div class='ctx'> 	lsl	x9, x9, x12</div><div class='ctx'> </div><div class='ctx'> 	get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11</div><div class='add'>+	seqcnt_check fail=monotonic_raw</div><div class='ctx'> 	get_ts_clock_raw res_sec=x10, res_nsec=x11, \</div><div class='ctx'> 		clock_nsec=x15, nsec_to_sec=x9</div><div class='ctx'> </div><div class='hunk'>@@ -301,13 +308,14 @@ ENTRY(__kernel_clock_getres)</div><div class='ctx'> 	ccmp	w0, #CLOCK_MONOTONIC_RAW, #0x4, ne</div><div class='ctx'> 	b.ne	1f</div><div class='ctx'> </div><div class='del'>-	ldr	x2, 5f</div><div class='add'>+	adr	vdso_data, _vdso_data</div><div class='add'>+	ldr	w2, [vdso_data, #CLOCK_REALTIME_RES]</div><div class='ctx'> 	b	2f</div><div class='ctx'> 1:</div><div class='ctx'> 	cmp	w0, #CLOCK_REALTIME_COARSE</div><div class='ctx'> 	ccmp	w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne</div><div class='ctx'> 	b.ne	4f</div><div class='del'>-	ldr	x2, 6f</div><div class='add'>+	ldr	x2, 5f</div><div class='ctx'> 2:</div><div class='ctx'> 	cbz	x1, 3f</div><div class='ctx'> 	stp	xzr, x2, [x1]</div><div class='hunk'>@@ -321,8 +329,6 @@ ENTRY(__kernel_clock_getres)</div><div class='ctx'> 	svc	#0</div><div class='ctx'> 	ret</div><div class='ctx'> 5:</div><div class='del'>-	.quad	CLOCK_REALTIME_RES</div><div class='del'>-6:</div><div class='ctx'> 	.quad	CLOCK_COARSE_RES</div><div class='ctx'> 	.cfi_endproc</div><div class='ctx'> ENDPROC(__kernel_clock_getres)</div><div class='head'>diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig<br/>index a3f85624313e..a67121d419a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kvm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kvm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kvm/Kconfig</a></div><div class='hunk'>@@ -23,7 +23,6 @@ config KVM</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	select MMU_NOTIFIER</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select HAVE_KVM_CPU_RELAX_INTERCEPT</div><div class='ctx'> 	select HAVE_KVM_ARCH_TLB_FLUSH_ALL</div><div class='ctx'> 	select KVM_MMIO</div><div class='head'>diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c<br/>index f16a5f8ff2b4..e2a0500cd7a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kvm/reset.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/kvm/reset.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/kvm/reset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/kvm/reset.c</a></div><div class='hunk'>@@ -123,6 +123,9 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> 	bool loaded;</div><div class='ctx'> </div><div class='add'>+	/* Reset PMU outside of the non-preemptible section */</div><div class='add'>+	kvm_pmu_vcpu_reset(vcpu);</div><div class='add'>+</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	loaded = (vcpu-&gt;cpu != -1);</div><div class='ctx'> 	if (loaded)</div><div class='hunk'>@@ -170,9 +173,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		vcpu-&gt;arch.reset_state.reset = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Reset PMU */</div><div class='del'>-	kvm_pmu_vcpu_reset(vcpu);</div><div class='del'>-</div><div class='ctx'> 	/* Default workaround setup is enabled (if supported) */</div><div class='ctx'> 	if (kvm_arm_have_ssbd() == KVM_SSBD_KERNEL)</div><div class='ctx'> 		vcpu-&gt;arch.workaround_flags |= VCPU_WORKAROUND_2_FLAG;</div><div class='head'>diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile<br/>index 5540a1638baf..33c2a4abda04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/lib/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/lib/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/lib/Makefile</a></div><div class='hunk'>@@ -24,7 +24,7 @@ CFLAGS_atomic_ll_sc.o	:= -ffixed-x1 -ffixed-x2        		\</div><div class='ctx'> 		   -fcall-saved-x10 -fcall-saved-x11 -fcall-saved-x12	\</div><div class='ctx'> 		   -fcall-saved-x13 -fcall-saved-x14 -fcall-saved-x15	\</div><div class='ctx'> 		   -fcall-saved-x18 -fomit-frame-pointer</div><div class='del'>-CFLAGS_REMOVE_atomic_ll_sc.o := -pg</div><div class='add'>+CFLAGS_REMOVE_atomic_ll_sc.o := $(CC_FLAGS_FTRACE)</div><div class='ctx'> GCOV_PROFILE_atomic_ll_sc.o	:= n</div><div class='ctx'> KASAN_SANITIZE_atomic_ll_sc.o	:= n</div><div class='ctx'> KCOV_INSTRUMENT_atomic_ll_sc.o	:= n</div><div class='head'>diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c<br/>index 1a7e92ab69eb..0cb0e09995e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/fault.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/fault.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/mm/fault.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ static inline bool is_ttbr1_addr(unsigned long addr)</div><div class='ctx'> /*</div><div class='ctx'>  * Dump out the page tables associated with 'addr' in the currently active mm.</div><div class='ctx'>  */</div><div class='del'>-void show_pte(unsigned long addr)</div><div class='add'>+static void show_pte(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> 	pgd_t *pgdp;</div><div class='hunk'>@@ -810,13 +810,12 @@ void __init hook_debug_fault_code(int nr,</div><div class='ctx'> 	debug_fault_info[nr].name	= name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint,</div><div class='del'>-					      unsigned int esr,</div><div class='del'>-					      struct pt_regs *regs)</div><div class='add'>+asmlinkage void __exception do_debug_exception(unsigned long addr_if_watchpoint,</div><div class='add'>+					       unsigned int esr,</div><div class='add'>+					       struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	const struct fault_info *inf = esr_to_debug_fault_info(esr);</div><div class='ctx'> 	unsigned long pc = instruction_pointer(regs);</div><div class='del'>-	int rv;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tell lockdep we disabled irqs in entry.S. Do nothing if they were</div><div class='hunk'>@@ -828,17 +827,12 @@ asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint,</div><div class='ctx'> 	if (user_mode(regs) &amp;&amp; !is_ttbr0_addr(pc))</div><div class='ctx'> 		arm64_apply_bp_hardening();</div><div class='ctx'> </div><div class='del'>-	if (!inf-&gt;fn(addr_if_watchpoint, esr, regs)) {</div><div class='del'>-		rv = 1;</div><div class='del'>-	} else {</div><div class='add'>+	if (inf-&gt;fn(addr_if_watchpoint, esr, regs)) {</div><div class='ctx'> 		arm64_notify_die(inf-&gt;name, regs,</div><div class='ctx'> 				 inf-&gt;sig, inf-&gt;code, (void __user *)pc, esr);</div><div class='del'>-		rv = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (interrupts_enabled(regs))</div><div class='ctx'> 		trace_hardirqs_on();</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(do_debug_exception);</div><div class='head'>diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c<br/>index 6bc135042f5e..40e2d7e5efcb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/mm/init.c</a></div><div class='hunk'>@@ -363,7 +363,7 @@ void __init arm64_memblock_init(void)</div><div class='ctx'> 		 * Otherwise, this is a no-op</div><div class='ctx'> 		 */</div><div class='ctx'> 		u64 base = phys_initrd_start &amp; PAGE_MASK;</div><div class='del'>-		u64 size = PAGE_ALIGN(phys_initrd_size);</div><div class='add'>+		u64 size = PAGE_ALIGN(phys_initrd_start + phys_initrd_size) - base;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can only add back the initrd memory if we don't end up</div><div class='hunk'>@@ -377,7 +377,7 @@ void __init arm64_memblock_init(void)</div><div class='ctx'> 			 base + size &gt; memblock_start_of_DRAM() +</div><div class='ctx'> 				       linear_region_size,</div><div class='ctx'> 			"initrd not fully accessible via the linear mapping -- please check your bootloader ...\n")) {</div><div class='del'>-			initrd_start = 0;</div><div class='add'>+			phys_initrd_size = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memblock_remove(base, size); /* clear MEMBLOCK_ flags */</div><div class='ctx'> 			memblock_add(base, size);</div><div class='hunk'>@@ -440,6 +440,7 @@ void __init bootmem_init(void)</div><div class='ctx'> 	early_memtest(min &lt;&lt; PAGE_SHIFT, max &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	max_pfn = max_low_pfn = max;</div><div class='add'>+	min_low_pfn = min;</div><div class='ctx'> </div><div class='ctx'> 	arm64_numa_init();</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -535,7 +536,7 @@ void __init mem_init(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		swiotlb_force = SWIOTLB_NO_FORCE;</div><div class='ctx'> </div><div class='del'>-	set_max_mapnr(pfn_to_page(max_pfn) - mem_map);</div><div class='add'>+	set_max_mapnr(max_pfn - PHYS_PFN_OFFSET);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SPARSEMEM_VMEMMAP</div><div class='ctx'> 	free_unused_memmap();</div><div class='head'>diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c<br/>index e97f018ff740..ef82312860ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/mmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/mmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/mm/mmu.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(phys_mem_access_prot);</div><div class='ctx'> </div><div class='del'>-static phys_addr_t __init early_pgtable_alloc(void)</div><div class='add'>+static phys_addr_t __init early_pgtable_alloc(int shift)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t phys;</div><div class='ctx'> 	void *ptr;</div><div class='hunk'>@@ -174,7 +174,7 @@ static void init_pte(pmd_t *pmdp, unsigned long addr, unsigned long end,</div><div class='ctx'> static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr,</div><div class='ctx'> 				unsigned long end, phys_addr_t phys,</div><div class='ctx'> 				pgprot_t prot,</div><div class='del'>-				phys_addr_t (*pgtable_alloc)(void),</div><div class='add'>+				phys_addr_t (*pgtable_alloc)(int),</div><div class='ctx'> 				int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='hunk'>@@ -184,7 +184,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr,</div><div class='ctx'> 	if (pmd_none(pmd)) {</div><div class='ctx'> 		phys_addr_t pte_phys;</div><div class='ctx'> 		BUG_ON(!pgtable_alloc);</div><div class='del'>-		pte_phys = pgtable_alloc();</div><div class='add'>+		pte_phys = pgtable_alloc(PAGE_SHIFT);</div><div class='ctx'> 		__pmd_populate(pmdp, pte_phys, PMD_TYPE_TABLE);</div><div class='ctx'> 		pmd = READ_ONCE(*pmdp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -208,7 +208,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> static void init_pmd(pud_t *pudp, unsigned long addr, unsigned long end,</div><div class='ctx'> 		     phys_addr_t phys, pgprot_t prot,</div><div class='del'>-		     phys_addr_t (*pgtable_alloc)(void), int flags)</div><div class='add'>+		     phys_addr_t (*pgtable_alloc)(int), int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> 	pmd_t *pmdp;</div><div class='hunk'>@@ -246,7 +246,7 @@ static void init_pmd(pud_t *pudp, unsigned long addr, unsigned long end,</div><div class='ctx'> static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr,</div><div class='ctx'> 				unsigned long end, phys_addr_t phys,</div><div class='ctx'> 				pgprot_t prot,</div><div class='del'>-				phys_addr_t (*pgtable_alloc)(void), int flags)</div><div class='add'>+				phys_addr_t (*pgtable_alloc)(int), int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> 	pud_t pud = READ_ONCE(*pudp);</div><div class='hunk'>@@ -258,7 +258,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr,</div><div class='ctx'> 	if (pud_none(pud)) {</div><div class='ctx'> 		phys_addr_t pmd_phys;</div><div class='ctx'> 		BUG_ON(!pgtable_alloc);</div><div class='del'>-		pmd_phys = pgtable_alloc();</div><div class='add'>+		pmd_phys = pgtable_alloc(PMD_SHIFT);</div><div class='ctx'> 		__pud_populate(pudp, pmd_phys, PUD_TYPE_TABLE);</div><div class='ctx'> 		pud = READ_ONCE(*pudp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -294,7 +294,7 @@ static inline bool use_1G_block(unsigned long addr, unsigned long next,</div><div class='ctx'> </div><div class='ctx'> static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end,</div><div class='ctx'> 			   phys_addr_t phys, pgprot_t prot,</div><div class='del'>-			   phys_addr_t (*pgtable_alloc)(void),</div><div class='add'>+			   phys_addr_t (*pgtable_alloc)(int),</div><div class='ctx'> 			   int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='hunk'>@@ -304,7 +304,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end,</div><div class='ctx'> 	if (pgd_none(pgd)) {</div><div class='ctx'> 		phys_addr_t pud_phys;</div><div class='ctx'> 		BUG_ON(!pgtable_alloc);</div><div class='del'>-		pud_phys = pgtable_alloc();</div><div class='add'>+		pud_phys = pgtable_alloc(PUD_SHIFT);</div><div class='ctx'> 		__pgd_populate(pgdp, pud_phys, PUD_TYPE_TABLE);</div><div class='ctx'> 		pgd = READ_ONCE(*pgdp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -345,7 +345,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end,</div><div class='ctx'> static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,</div><div class='ctx'> 				 unsigned long virt, phys_addr_t size,</div><div class='ctx'> 				 pgprot_t prot,</div><div class='del'>-				 phys_addr_t (*pgtable_alloc)(void),</div><div class='add'>+				 phys_addr_t (*pgtable_alloc)(int),</div><div class='ctx'> 				 int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr, length, end, next;</div><div class='hunk'>@@ -371,17 +371,36 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,</div><div class='ctx'> 	} while (pgdp++, addr = next, addr != end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static phys_addr_t pgd_pgtable_alloc(void)</div><div class='add'>+static phys_addr_t __pgd_pgtable_alloc(int shift)</div><div class='ctx'> {</div><div class='ctx'> 	void *ptr = (void *)__get_free_page(PGALLOC_GFP);</div><div class='del'>-	if (!ptr || !pgtable_page_ctor(virt_to_page(ptr)))</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(!ptr);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure the zeroed page is visible to the page table walker */</div><div class='ctx'> 	dsb(ishst);</div><div class='ctx'> 	return __pa(ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static phys_addr_t pgd_pgtable_alloc(int shift)</div><div class='add'>+{</div><div class='add'>+	phys_addr_t pa = __pgd_pgtable_alloc(shift);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call proper page table ctor in case later we need to</div><div class='add'>+	 * call core mm functions like apply_to_page_range() on</div><div class='add'>+	 * this pre-allocated page table.</div><div class='add'>+	 *</div><div class='add'>+	 * We don't select ARCH_ENABLE_SPLIT_PMD_PTLOCK if pmd is</div><div class='add'>+	 * folded, and if so pgtable_pmd_page_ctor() becomes nop.</div><div class='add'>+	 */</div><div class='add'>+	if (shift == PAGE_SHIFT)</div><div class='add'>+		BUG_ON(!pgtable_page_ctor(phys_to_page(pa)));</div><div class='add'>+	else if (shift == PMD_SHIFT)</div><div class='add'>+		BUG_ON(!pgtable_pmd_page_ctor(phys_to_page(pa)));</div><div class='add'>+</div><div class='add'>+	return pa;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function can only be used to modify existing table entries,</div><div class='ctx'>  * without allocating new levels of table. Note that this permits the</div><div class='hunk'>@@ -583,7 +602,7 @@ static int __init map_entry_trampoline(void)</div><div class='ctx'> 	/* Map only the text into the trampoline page table */</div><div class='ctx'> 	memset(tramp_pg_dir, 0, PGD_SIZE);</div><div class='ctx'> 	__create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE,</div><div class='del'>-			     prot, pgd_pgtable_alloc, 0);</div><div class='add'>+			     prot, __pgd_pgtable_alloc, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Map both the text and data into the kernel page table */</div><div class='ctx'> 	__set_fixmap(FIX_ENTRY_TRAMP_TEXT, pa_start, prot);</div><div class='hunk'>@@ -1055,7 +1074,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,</div><div class='ctx'> 		flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;</div><div class='ctx'> </div><div class='ctx'> 	__create_pgd_mapping(swapper_pg_dir, start, __phys_to_virt(start),</div><div class='del'>-			     size, PAGE_KERNEL, pgd_pgtable_alloc, flags);</div><div class='add'>+			     size, PAGE_KERNEL, __pgd_pgtable_alloc, flags);</div><div class='ctx'> </div><div class='ctx'> 	return __add_pages(nid, start &gt;&gt; PAGE_SHIFT, size &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 			   altmap, want_memblock);</div><div class='head'>diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c<br/>index 06a6f264f2dd..5202f63c29c9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/numa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/numa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/mm/numa.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ static void __init setup_node_to_cpumask_map(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  Set the cpu to node and mem mapping</div><div class='add'>+ * Set the cpu to node and mem mapping</div><div class='ctx'>  */</div><div class='ctx'> void numa_store_cpu_info(unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -200,7 +200,7 @@ void __init setup_per_cpu_areas(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * numa_add_memblk - Set node id to memblk</div><div class='add'>+ * numa_add_memblk() - Set node id to memblk</div><div class='ctx'>  * @nid: NUMA node ID of the new memblk</div><div class='ctx'>  * @start: Start address of the new memblk</div><div class='ctx'>  * @end:  End address of the new memblk</div><div class='hunk'>@@ -223,7 +223,7 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)</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'>  * Initialize NODE_DATA for a node on the local memory</div><div class='ctx'>  */</div><div class='ctx'> static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)</div><div class='hunk'>@@ -257,7 +257,7 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)</div><div class='ctx'> 	NODE_DATA(nid)-&gt;node_spanned_pages = end_pfn - start_pfn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * numa_free_distance</div><div class='ctx'>  *</div><div class='ctx'>  * The current table is freed.</div><div class='hunk'>@@ -277,10 +277,8 @@ void __init numa_free_distance(void)</div><div class='ctx'> 	numa_distance = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *</div><div class='add'>+/*</div><div class='ctx'>  * Create a new NUMA distance table.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> static int __init numa_alloc_distance(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -311,7 +309,7 @@ static int __init numa_alloc_distance(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * numa_set_distance - Set inter node NUMA distance from node to node.</div><div class='add'>+ * numa_set_distance() - Set inter node NUMA distance from node to node.</div><div class='ctx'>  * @from: the 'from' node to set distance</div><div class='ctx'>  * @to: the 'to'  node to set distance</div><div class='ctx'>  * @distance: NUMA distance</div><div class='hunk'>@@ -321,7 +319,6 @@ static int __init numa_alloc_distance(void)</div><div class='ctx'>  *</div><div class='ctx'>  * If @from or @to is higher than the highest known node or lower than zero</div><div class='ctx'>  * or @distance doesn't make sense, the call is ignored.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> void __init numa_set_distance(int from, int to, int distance)</div><div class='ctx'> {</div><div class='hunk'>@@ -347,7 +344,7 @@ void __init numa_set_distance(int from, int to, int distance)</div><div class='ctx'> 	numa_distance[from * numa_distance_cnt + to] = distance;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Return NUMA distance @from to @to</div><div class='ctx'>  */</div><div class='ctx'> int __node_distance(int from, int to)</div><div class='hunk'>@@ -422,13 +419,15 @@ out_free_distance:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dummy_numa_init - Fallback dummy NUMA init</div><div class='add'>+ * dummy_numa_init() - Fallback dummy NUMA init</div><div class='ctx'>  *</div><div class='ctx'>  * Used if there's no underlying NUMA architecture, NUMA initialization</div><div class='ctx'>  * fails, or NUMA is disabled on the command line.</div><div class='ctx'>  *</div><div class='ctx'>  * Must online at least one node (node 0) and add memory blocks that cover all</div><div class='ctx'>  * allowed memory. It is unlikely that this function fails.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int __init dummy_numa_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -454,9 +453,9 @@ static int __init dummy_numa_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * arm64_numa_init - Initialize NUMA</div><div class='add'>+ * arm64_numa_init() - Initialize NUMA</div><div class='ctx'>  *</div><div class='del'>- * Try each configured NUMA initialization method until one succeeds.  The</div><div class='add'>+ * Try each configured NUMA initialization method until one succeeds. The</div><div class='ctx'>  * last fallback is dummy single node config encomapssing whole memory.</div><div class='ctx'>  */</div><div class='ctx'> void __init arm64_numa_init(void)</div><div class='head'>diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S<br/>index aa0817c9c4c3..fdd626d34274 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/proc.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/mm/proc.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/mm/proc.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/mm/proc.S</a></div><div class='hunk'>@@ -65,24 +65,25 @@ ENTRY(cpu_do_suspend)</div><div class='ctx'> 	mrs	x2, tpidr_el0</div><div class='ctx'> 	mrs	x3, tpidrro_el0</div><div class='ctx'> 	mrs	x4, contextidr_el1</div><div class='del'>-	mrs	x5, cpacr_el1</div><div class='del'>-	mrs	x6, tcr_el1</div><div class='del'>-	mrs	x7, vbar_el1</div><div class='del'>-	mrs	x8, mdscr_el1</div><div class='del'>-	mrs	x9, oslsr_el1</div><div class='del'>-	mrs	x10, sctlr_el1</div><div class='add'>+	mrs	x5, osdlr_el1</div><div class='add'>+	mrs	x6, cpacr_el1</div><div class='add'>+	mrs	x7, tcr_el1</div><div class='add'>+	mrs	x8, vbar_el1</div><div class='add'>+	mrs	x9, mdscr_el1</div><div class='add'>+	mrs	x10, oslsr_el1</div><div class='add'>+	mrs	x11, sctlr_el1</div><div class='ctx'> alternative_if_not ARM64_HAS_VIRT_HOST_EXTN</div><div class='del'>-	mrs	x11, tpidr_el1</div><div class='add'>+	mrs	x12, tpidr_el1</div><div class='ctx'> alternative_else</div><div class='del'>-	mrs	x11, tpidr_el2</div><div class='add'>+	mrs	x12, tpidr_el2</div><div class='ctx'> alternative_endif</div><div class='del'>-	mrs	x12, sp_el0</div><div class='add'>+	mrs	x13, sp_el0</div><div class='ctx'> 	stp	x2, x3, [x0]</div><div class='del'>-	stp	x4, xzr, [x0, #16]</div><div class='del'>-	stp	x5, x6, [x0, #32]</div><div class='del'>-	stp	x7, x8, [x0, #48]</div><div class='del'>-	stp	x9, x10, [x0, #64]</div><div class='del'>-	stp	x11, x12, [x0, #80]</div><div class='add'>+	stp	x4, x5, [x0, #16]</div><div class='add'>+	stp	x6, x7, [x0, #32]</div><div class='add'>+	stp	x8, x9, [x0, #48]</div><div class='add'>+	stp	x10, x11, [x0, #64]</div><div class='add'>+	stp	x12, x13, [x0, #80]</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(cpu_do_suspend)</div><div class='ctx'> </div><div class='hunk'>@@ -105,8 +106,8 @@ ENTRY(cpu_do_resume)</div><div class='ctx'> 	msr	cpacr_el1, x6</div><div class='ctx'> </div><div class='ctx'> 	/* Don't change t0sz here, mask those bits when restoring */</div><div class='del'>-	mrs	x5, tcr_el1</div><div class='del'>-	bfi	x8, x5, TCR_T0SZ_OFFSET, TCR_TxSZ_WIDTH</div><div class='add'>+	mrs	x7, tcr_el1</div><div class='add'>+	bfi	x8, x7, TCR_T0SZ_OFFSET, TCR_TxSZ_WIDTH</div><div class='ctx'> </div><div class='ctx'> 	msr	tcr_el1, x8</div><div class='ctx'> 	msr	vbar_el1, x9</div><div class='hunk'>@@ -130,6 +131,7 @@ alternative_endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Restore oslsr_el1 by writing oslar_el1</div><div class='ctx'> 	 */</div><div class='add'>+	msr	osdlr_el1, x5</div><div class='ctx'> 	ubfx	x11, x11, #1, #1</div><div class='ctx'> 	msr	oslar_el1, x11</div><div class='ctx'> 	reset_pmuserenr_el0 x0			// Disable PMU access from EL0</div><div class='head'>diff --git a/arch/arm64/net/bpf_jit.h b/arch/arm64/net/bpf_jit.h<br/>index 783de51a6c4e..76606e87233f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/net/bpf_jit.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/net/bpf_jit.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/net/bpf_jit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/net/bpf_jit.h</a></div><div class='hunk'>@@ -100,11 +100,9 @@</div><div class='ctx'> #define A64_STXR(sf, Rt, Rn, Rs) \</div><div class='ctx'> 	A64_LSX(sf, Rt, Rn, Rs, STORE_EX)</div><div class='ctx'> </div><div class='del'>-/* Prefetch */</div><div class='del'>-#define A64_PRFM(Rn, type, target, policy) \</div><div class='del'>-	aarch64_insn_gen_prefetch(Rn, AARCH64_INSN_PRFM_TYPE_##type, \</div><div class='del'>-				  AARCH64_INSN_PRFM_TARGET_##target, \</div><div class='del'>-				  AARCH64_INSN_PRFM_POLICY_##policy)</div><div class='add'>+/* LSE atomics */</div><div class='add'>+#define A64_STADD(sf, Rn, Rs) \</div><div class='add'>+	aarch64_insn_gen_stadd(Rn, Rs, A64_SIZE(sf))</div><div class='ctx'> </div><div class='ctx'> /* Add/subtract (immediate) */</div><div class='ctx'> #define A64_ADDSUB_IMM(sf, Rd, Rn, imm12, type) \</div><div class='head'>diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c<br/>index aaddc0217e73..df845cee438e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/net/bpf_jit_comp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/arm64/net/bpf_jit_comp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/arm64/net/bpf_jit_comp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/arm64/net/bpf_jit_comp.c</a></div><div class='hunk'>@@ -365,7 +365,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,</div><div class='ctx'> 	const bool is64 = BPF_CLASS(code) == BPF_ALU64 ||</div><div class='ctx'> 			  BPF_CLASS(code) == BPF_JMP;</div><div class='ctx'> 	const bool isdw = BPF_SIZE(code) == BPF_DW;</div><div class='del'>-	u8 jmp_cond;</div><div class='add'>+	u8 jmp_cond, reg;</div><div class='ctx'> 	s32 jmp_offset;</div><div class='ctx'> </div><div class='ctx'> #define check_imm(bits, imm) do {				\</div><div class='hunk'>@@ -756,19 +756,28 @@ emit_cond_jmp:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	/* STX XADD: lock *(u32 *)(dst + off) += src */</div><div class='ctx'> 	case BPF_STX | BPF_XADD | BPF_W:</div><div class='ctx'> 	/* STX XADD: lock *(u64 *)(dst + off) += src */</div><div class='ctx'> 	case BPF_STX | BPF_XADD | BPF_DW:</div><div class='del'>-		emit_a64_mov_i(1, tmp, off, ctx);</div><div class='del'>-		emit(A64_ADD(1, tmp, tmp, dst), ctx);</div><div class='del'>-		emit(A64_PRFM(tmp, PST, L1, STRM), ctx);</div><div class='del'>-		emit(A64_LDXR(isdw, tmp2, tmp), ctx);</div><div class='del'>-		emit(A64_ADD(isdw, tmp2, tmp2, src), ctx);</div><div class='del'>-		emit(A64_STXR(isdw, tmp2, tmp, tmp3), ctx);</div><div class='del'>-		jmp_offset = -3;</div><div class='del'>-		check_imm19(jmp_offset);</div><div class='del'>-		emit(A64_CBNZ(0, tmp3, jmp_offset), ctx);</div><div class='add'>+		if (!off) {</div><div class='add'>+			reg = dst;</div><div class='add'>+		} else {</div><div class='add'>+			emit_a64_mov_i(1, tmp, off, ctx);</div><div class='add'>+			emit(A64_ADD(1, tmp, tmp, dst), ctx);</div><div class='add'>+			reg = tmp;</div><div class='add'>+		}</div><div class='add'>+		if (cpus_have_cap(ARM64_HAS_LSE_ATOMICS)) {</div><div class='add'>+			emit(A64_STADD(isdw, reg, src), ctx);</div><div class='add'>+		} else {</div><div class='add'>+			emit(A64_LDXR(isdw, tmp2, reg), ctx);</div><div class='add'>+			emit(A64_ADD(isdw, tmp2, tmp2, src), ctx);</div><div class='add'>+			emit(A64_STXR(isdw, tmp2, reg, tmp3), ctx);</div><div class='add'>+			jmp_offset = -3;</div><div class='add'>+			check_imm19(jmp_offset);</div><div class='add'>+			emit(A64_CBNZ(0, tmp3, jmp_offset), ctx);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='head'>diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig<br/>index e5cd3c5f8399..eeb0471268a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/c6x/Kconfig</a></div><div class='hunk'>@@ -20,6 +20,7 @@ config C6X</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select MODULES_USE_ELF_RELA</div><div class='ctx'> 	select ARCH_NO_COHERENT_DMA_MMAP</div><div class='add'>+	select MMU_GATHER_NO_RANGE if MMU</div><div class='ctx'> </div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool n</div><div class='hunk'>@@ -27,9 +28,6 @@ config MMU</div><div class='ctx'> config FPU</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild<br/>index 63b4a1705182..6b168d32fbff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/c6x/include/asm/Kbuild</a></div><div class='hunk'>@@ -19,9 +19,11 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += mmu.h</div><div class='ctx'> generic-y += mmu_context.h</div><div class='ctx'> generic-y += pci.h</div><div class='head'>diff --git a/arch/c6x/include/asm/syscall.h b/arch/c6x/include/asm/syscall.h<br/>index ae2be315ee9c..5bcdcb651b19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/c6x/include/asm/syscall.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #ifndef __ASM_C6X_SYSCALL_H</div><div class='ctx'> #define __ASM_C6X_SYSCALL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -46,78 +47,33 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='del'>-					 struct pt_regs *regs, unsigned int i,</div><div class='del'>-					 unsigned int n, unsigned long *args)</div><div class='add'>+					 struct pt_regs *regs,</div><div class='add'>+					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	switch (i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;a4;</div><div class='del'>-	case 1:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;b4;</div><div class='del'>-	case 2:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;a6;</div><div class='del'>-	case 3:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;b6;</div><div class='del'>-	case 4:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;a8;</div><div class='del'>-	case 5:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;b8;</div><div class='del'>-	case 6:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	*args++ = regs-&gt;a4;</div><div class='add'>+	*args++ = regs-&gt;b4;</div><div class='add'>+	*args++ = regs-&gt;a6;</div><div class='add'>+	*args++ = regs-&gt;b6;</div><div class='add'>+	*args++ = regs-&gt;a8;</div><div class='add'>+	*args   = regs-&gt;b8;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	switch (i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;a4 = *args++;</div><div class='del'>-	case 1:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;b4 = *args++;</div><div class='del'>-	case 2:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;a6 = *args++;</div><div class='del'>-	case 3:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;b6 = *args++;</div><div class='del'>-	case 4:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;a8 = *args++;</div><div class='del'>-	case 5:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;a9 = *args++;</div><div class='del'>-	case 6:</div><div class='del'>-		if (!n)</div><div class='del'>-			break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	regs-&gt;a4 = *args++;</div><div class='add'>+	regs-&gt;b4 = *args++;</div><div class='add'>+	regs-&gt;a6 = *args++;</div><div class='add'>+	regs-&gt;b6 = *args++;</div><div class='add'>+	regs-&gt;a8 = *args++;</div><div class='add'>+	regs-&gt;a9 = *args;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)</div><div class='add'>+		? AUDIT_ARCH_C6XBE : AUDIT_ARCH_C6X;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_C6X_SYSCALLS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/tlb.h b/arch/c6x/include/asm/tlb.h<br/>index 34525dea1356..240ba0febb57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/c6x/include/asm/tlb.h</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> #ifndef _ASM_C6X_TLB_H</div><div class='ctx'> #define _ASM_C6X_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb) flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_C6X_TLB_H */</div><div class='head'>diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild<br/>index 755bb11323d8..1c72f04ff75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/c6x/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/c6x/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/c6x/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig<br/>index 725a115759c9..941e3e2adf41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/Kconfig</a></div><div class='hunk'>@@ -29,15 +29,20 @@ config CSKY</div><div class='ctx'> 	select GENERIC_SCHED_CLOCK</div><div class='ctx'> 	select GENERIC_SMP_IDLE_THREAD</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='add'>+	select HAVE_ARCH_AUDITSYSCALL</div><div class='add'>+	select HAVE_DYNAMIC_FTRACE</div><div class='ctx'> 	select HAVE_FUNCTION_TRACER</div><div class='ctx'> 	select HAVE_FUNCTION_GRAPH_TRACER</div><div class='add'>+	select HAVE_FTRACE_MCOUNT_RECORD</div><div class='ctx'> 	select HAVE_KERNEL_GZIP</div><div class='ctx'> 	select HAVE_KERNEL_LZO</div><div class='ctx'> 	select HAVE_KERNEL_LZMA</div><div class='ctx'> 	select HAVE_PERF_EVENTS</div><div class='del'>-	select HAVE_C_RECORDMCOUNT</div><div class='add'>+	select HAVE_PERF_REGS</div><div class='add'>+	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_DMA_API_DEBUG</div><div class='ctx'> 	select HAVE_DMA_CONTIGUOUS</div><div class='add'>+	select HAVE_SYSCALL_TRACEPOINTS</div><div class='ctx'> 	select MAY_HAVE_SPARSE_IRQ</div><div class='ctx'> 	select MODULES_USE_ELF_RELA if MODULES</div><div class='ctx'> 	select OF</div><div class='hunk'>@@ -92,9 +97,6 @@ config GENERIC_HWEIGHT</div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config STACKTRACE_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/csky/Makefile b/arch/csky/Makefile<br/>index 3607a6e8f66c..6b87f6c22ad6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/Makefile</a></div><div class='hunk'>@@ -36,7 +36,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> ifneq ($(CSKYABI),)</div><div class='ctx'> MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT)</div><div class='del'>-KBUILD_CFLAGS += -mcpu=$(MCPU_STR)</div><div class='add'>+KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR)</div><div class='ctx'> KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\"</div><div class='ctx'> KBUILD_CFLAGS += -msoft-float -mdiv</div><div class='ctx'> KBUILD_CFLAGS += -fno-tree-vectorize</div><div class='head'>diff --git a/arch/csky/abiv1/inc/abi/ckmmu.h b/arch/csky/abiv1/inc/abi/ckmmu.h<br/>index 3a002017bebe..81f37715c0d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv1/inc/abi/ckmmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv1/inc/abi/ckmmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv1/inc/abi/ckmmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv1/inc/abi/ckmmu.h</a></div><div class='hunk'>@@ -40,6 +40,26 @@ static inline void write_mmu_entryhi(int value)</div><div class='ctx'> 	cpwcr("cpcr4", value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long read_mmu_msa0(void)</div><div class='add'>+{</div><div class='add'>+	return cprcr("cpcr30");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void write_mmu_msa0(unsigned long value)</div><div class='add'>+{</div><div class='add'>+	cpwcr("cpcr30", value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long read_mmu_msa1(void)</div><div class='add'>+{</div><div class='add'>+	return cprcr("cpcr31");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void write_mmu_msa1(unsigned long value)</div><div class='add'>+{</div><div class='add'>+	cpwcr("cpcr31", value);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * TLB operations.</div><div class='ctx'>  */</div><div class='hunk'>@@ -65,11 +85,11 @@ static inline void tlb_invalid_indexed(void)</div><div class='ctx'> </div><div class='ctx'> static inline void setup_pgd(unsigned long pgd, bool kernel)</div><div class='ctx'> {</div><div class='del'>-	cpwcr("cpcr29", pgd);</div><div class='add'>+	cpwcr("cpcr29", pgd | BIT(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long get_pgd(void)</div><div class='ctx'> {</div><div class='del'>-	return cprcr("cpcr29");</div><div class='add'>+	return cprcr("cpcr29") &amp; ~BIT(0);</div><div class='ctx'> }</div><div class='ctx'> #endif /* __ASM_CSKY_CKMMUV1_H */</div><div class='head'>diff --git a/arch/csky/abiv1/inc/abi/entry.h b/arch/csky/abiv1/inc/abi/entry.h<br/>index 3f3faab3d747..7ab78bd0f3b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv1/inc/abi/entry.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv1/inc/abi/entry.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv1/inc/abi/entry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv1/inc/abi/entry.h</a></div><div class='hunk'>@@ -16,9 +16,6 @@</div><div class='ctx'> #define LSAVE_A4	40</div><div class='ctx'> #define LSAVE_A5	44</div><div class='ctx'> </div><div class='del'>-#define EPC_INCREASE	2</div><div class='del'>-#define EPC_KEEP	0</div><div class='del'>-</div><div class='ctx'> .macro USPTOKSP</div><div class='ctx'> 	mtcr	sp, ss1</div><div class='ctx'> 	mfcr	sp, ss0</div><div class='hunk'>@@ -29,10 +26,6 @@</div><div class='ctx'> 	mfcr	sp, ss1</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='del'>-.macro INCTRAP	rx</div><div class='del'>-	addi	\rx, EPC_INCREASE</div><div class='del'>-.endm</div><div class='del'>-</div><div class='ctx'> .macro	SAVE_ALL epc_inc</div><div class='ctx'> 	mtcr    r13, ss2</div><div class='ctx'> 	mfcr    r13, epsr</div><div class='hunk'>@@ -150,11 +143,35 @@</div><div class='ctx'> 	cpwcr   \rx, cpcr8</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='del'>-.macro SETUP_MMU rx</div><div class='del'>-	lrw	\rx, PHYS_OFFSET | 0xe</div><div class='del'>-	cpwcr	\rx, cpcr30</div><div class='del'>-	lrw	\rx, (PHYS_OFFSET + 0x20000000) | 0xe</div><div class='del'>-	cpwcr	\rx, cpcr31</div><div class='add'>+.macro SETUP_MMU</div><div class='add'>+	/* Init psr and enable ee */</div><div class='add'>+	lrw	r6, DEFAULT_PSR_VALUE</div><div class='add'>+	mtcr    r6, psr</div><div class='add'>+	psrset  ee</div><div class='add'>+</div><div class='add'>+	/* Select MMU as co-processor */</div><div class='add'>+	cpseti	cp15</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * cpcr30 format:</div><div class='add'>+	 * 31 - 29 | 28 - 4 | 3 | 2 | 1 | 0</div><div class='add'>+	 *   BA     Reserved  C   D   V</div><div class='add'>+	 */</div><div class='add'>+	cprcr	r6, cpcr30</div><div class='add'>+	lsri	r6, 28</div><div class='add'>+	lsli	r6, 28</div><div class='add'>+	addi	r6, 0xe</div><div class='add'>+	cpwcr	r6, cpcr30</div><div class='add'>+</div><div class='add'>+	lsri	r6, 28</div><div class='add'>+	addi	r6, 2</div><div class='add'>+	lsli	r6, 28</div><div class='add'>+	addi	r6, 0xe</div><div class='add'>+	cpwcr	r6, cpcr31</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='add'>+.macro ANDI_R3 rx, imm</div><div class='add'>+	lsri	\rx, 3</div><div class='add'>+	andi	\rx, (\imm &gt;&gt; 3)</div><div class='add'>+.endm</div><div class='ctx'> #endif /* __ASM_CSKY_ENTRY_H */</div><div class='head'>diff --git a/arch/csky/abiv1/inc/abi/regdef.h b/arch/csky/abiv1/inc/abi/regdef.h<br/>index 876689291b71..104707fbdcc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv1/inc/abi/regdef.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv1/inc/abi/regdef.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv1/inc/abi/regdef.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv1/inc/abi/regdef.h</a></div><div class='hunk'>@@ -5,9 +5,8 @@</div><div class='ctx'> #define __ASM_CSKY_REGDEF_H</div><div class='ctx'> </div><div class='ctx'> #define syscallid	r1</div><div class='del'>-#define r11_sig		r11</div><div class='del'>-</div><div class='ctx'> #define regs_syscallid(regs) regs-&gt;regs[9]</div><div class='add'>+#define regs_fp(regs) regs-&gt;regs[2]</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PSR format:</div><div class='hunk'>@@ -23,4 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SYSTRACE_SAVENUM	2</div><div class='ctx'> </div><div class='add'>+#define TRAP0_SIZE		2</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_CSKY_REGDEF_H */</div><div class='head'>diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c<br/>index d22c95ffc74d..5bb887b275e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/cacheflush.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/cacheflush.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/cacheflush.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv2/cacheflush.c</a></div><div class='hunk'>@@ -34,10 +34,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr, pfn;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	void *va;</div><div class='del'>-</div><div class='del'>-	if (!(vma-&gt;vm_flags &amp; VM_EXEC))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	pfn = pte_pfn(*pte);</div><div class='ctx'> 	if (unlikely(!pfn_valid(pfn)))</div><div class='hunk'>@@ -47,14 +43,9 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> 	if (page == ZERO_PAGE(0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	va = page_address(page);</div><div class='del'>-	addr = (unsigned long) va;</div><div class='del'>-</div><div class='del'>-	if (va == NULL &amp;&amp; PageHighMem(page))</div><div class='del'>-		addr = (unsigned long) kmap_atomic(page);</div><div class='add'>+	addr = (unsigned long) kmap_atomic(page);</div><div class='ctx'> </div><div class='ctx'> 	cache_wbinv_range(addr, addr + PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (va == NULL &amp;&amp; PageHighMem(page))</div><div class='del'>-		kunmap_atomic((void *) addr);</div><div class='add'>+	kunmap_atomic((void *) addr);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/csky/abiv2/inc/abi/ckmmu.h b/arch/csky/abiv2/inc/abi/ckmmu.h<br/>index 97230ad9427c..e4480e6bc3b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/inc/abi/ckmmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/inc/abi/ckmmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/inc/abi/ckmmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv2/inc/abi/ckmmu.h</a></div><div class='hunk'>@@ -42,6 +42,26 @@ static inline void write_mmu_entryhi(int value)</div><div class='ctx'> 	mtcr("cr&lt;4, 15&gt;", value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long read_mmu_msa0(void)</div><div class='add'>+{</div><div class='add'>+	return mfcr("cr&lt;30, 15&gt;");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void write_mmu_msa0(unsigned long value)</div><div class='add'>+{</div><div class='add'>+	mtcr("cr&lt;30, 15&gt;", value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long read_mmu_msa1(void)</div><div class='add'>+{</div><div class='add'>+	return mfcr("cr&lt;31, 15&gt;");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void write_mmu_msa1(unsigned long value)</div><div class='add'>+{</div><div class='add'>+	mtcr("cr&lt;31, 15&gt;", value);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * TLB operations.</div><div class='ctx'>  */</div><div class='hunk'>@@ -70,18 +90,16 @@ static inline void tlb_invalid_indexed(void)</div><div class='ctx'> 	mtcr("cr&lt;8, 15&gt;", 0x02000000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* setup hardrefil pgd */</div><div class='del'>-static inline unsigned long get_pgd(void)</div><div class='del'>-{</div><div class='del'>-	return mfcr("cr&lt;29, 15&gt;");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void setup_pgd(unsigned long pgd, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	if (kernel)</div><div class='del'>-		mtcr("cr&lt;28, 15&gt;", pgd);</div><div class='add'>+		mtcr("cr&lt;28, 15&gt;", pgd | BIT(0));</div><div class='ctx'> 	else</div><div class='del'>-		mtcr("cr&lt;29, 15&gt;", pgd);</div><div class='add'>+		mtcr("cr&lt;29, 15&gt;", pgd | BIT(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long get_pgd(void)</div><div class='add'>+{</div><div class='add'>+	return mfcr("cr&lt;29, 15&gt;") &amp; ~BIT(0);</div><div class='add'>+}</div><div class='ctx'> #endif /* __ASM_CSKY_CKMMUV2_H */</div><div class='head'>diff --git a/arch/csky/abiv2/inc/abi/entry.h b/arch/csky/abiv2/inc/abi/entry.h<br/>index edc5cc04c4de..9897a16b45e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/inc/abi/entry.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/inc/abi/entry.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/inc/abi/entry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv2/inc/abi/entry.h</a></div><div class='hunk'>@@ -14,18 +14,11 @@</div><div class='ctx'> #define LSAVE_A2	32</div><div class='ctx'> #define LSAVE_A3	36</div><div class='ctx'> </div><div class='del'>-#define EPC_INCREASE	4</div><div class='del'>-#define EPC_KEEP	0</div><div class='del'>-</div><div class='ctx'> #define KSPTOUSP</div><div class='ctx'> #define USPTOKSP</div><div class='ctx'> </div><div class='ctx'> #define usp cr&lt;14, 1&gt;</div><div class='ctx'> </div><div class='del'>-.macro INCTRAP	rx</div><div class='del'>-	addi	\rx, EPC_INCREASE</div><div class='del'>-.endm</div><div class='del'>-</div><div class='ctx'> .macro SAVE_ALL epc_inc</div><div class='ctx'> 	subi    sp, 152</div><div class='ctx'> 	stw	tls, (sp, 0)</div><div class='hunk'>@@ -169,10 +162,80 @@</div><div class='ctx'> 	mtcr	\rx, cr&lt;8, 15&gt;</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='del'>-.macro SETUP_MMU rx</div><div class='del'>-	lrw	\rx, PHYS_OFFSET | 0xe</div><div class='del'>-	mtcr	\rx, cr&lt;30, 15&gt;</div><div class='del'>-	lrw	\rx, (PHYS_OFFSET + 0x20000000) | 0xe</div><div class='del'>-	mtcr	\rx, cr&lt;31, 15&gt;</div><div class='add'>+.macro SETUP_MMU</div><div class='add'>+	/* Init psr and enable ee */</div><div class='add'>+	lrw	r6, DEFAULT_PSR_VALUE</div><div class='add'>+	mtcr    r6, psr</div><div class='add'>+	psrset  ee</div><div class='add'>+</div><div class='add'>+	/* Invalid I/Dcache BTB BHT */</div><div class='add'>+	movi	r6, 7</div><div class='add'>+	lsli	r6, 16</div><div class='add'>+	addi	r6, (1&lt;&lt;4) | 3</div><div class='add'>+	mtcr	r6, cr17</div><div class='add'>+</div><div class='add'>+	/* Invalid all TLB */</div><div class='add'>+	bgeni   r6, 26</div><div class='add'>+	mtcr	r6, cr&lt;8, 15&gt; /* Set MCIR */</div><div class='add'>+</div><div class='add'>+	/* Check MMU on/off */</div><div class='add'>+	mfcr	r6, cr18</div><div class='add'>+	btsti	r6, 0</div><div class='add'>+	bt	1f</div><div class='add'>+</div><div class='add'>+	/* MMU off: setup mapping tlb entry */</div><div class='add'>+	movi	r6, 0</div><div class='add'>+	mtcr	r6, cr&lt;6, 15&gt; /* Set MPR with 4K page size */</div><div class='add'>+</div><div class='add'>+	grs	r6, 1f /* Get current pa by PC */</div><div class='add'>+	bmaski  r7, (PAGE_SHIFT + 1) /* r7 = 0x1fff */</div><div class='add'>+	andn    r6, r7</div><div class='add'>+	mtcr	r6, cr&lt;4, 15&gt; /* Set MEH */</div><div class='add'>+</div><div class='add'>+	mov	r8, r6</div><div class='add'>+	movi    r7, 0x00000006</div><div class='add'>+	or      r8, r7</div><div class='add'>+	mtcr	r8, cr&lt;2, 15&gt; /* Set MEL0 */</div><div class='add'>+	movi    r7, 0x00001006</div><div class='add'>+	or      r8, r7</div><div class='add'>+	mtcr	r8, cr&lt;3, 15&gt; /* Set MEL1 */</div><div class='add'>+</div><div class='add'>+	bgeni   r8, 28</div><div class='add'>+	mtcr	r8, cr&lt;8, 15&gt; /* Set MCIR to write TLB */</div><div class='add'>+</div><div class='add'>+	br	2f</div><div class='add'>+1:</div><div class='add'>+	/*</div><div class='add'>+	 * MMU on: use origin MSA value from bootloader</div><div class='add'>+	 *</div><div class='add'>+	 * cr&lt;30/31, 15&gt; MSA register format:</div><div class='add'>+	 * 31 - 29 | 28 - 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0</div><div class='add'>+	 *   BA     Reserved  SH  WA  B   SO SEC  C   D   V</div><div class='add'>+	 */</div><div class='add'>+	mfcr	r6, cr&lt;30, 15&gt; /* Get MSA0 */</div><div class='add'>+2:</div><div class='add'>+	lsri	r6, 28</div><div class='add'>+	lsli	r6, 28</div><div class='add'>+	addi	r6, 0x1ce</div><div class='add'>+	mtcr	r6, cr&lt;30, 15&gt; /* Set MSA0 */</div><div class='add'>+</div><div class='add'>+	lsri	r6, 28</div><div class='add'>+	addi	r6, 2</div><div class='add'>+	lsli	r6, 28</div><div class='add'>+	addi	r6, 0x1ce</div><div class='add'>+	mtcr	r6, cr&lt;31, 15&gt; /* Set MSA1 */</div><div class='add'>+</div><div class='add'>+	/* enable MMU */</div><div class='add'>+	mfcr    r6, cr18</div><div class='add'>+	bseti	r6, 0</div><div class='add'>+	mtcr    r6, cr18</div><div class='add'>+</div><div class='add'>+	jmpi	3f /* jump to va */</div><div class='add'>+3:</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+.macro ANDI_R3 rx, imm</div><div class='add'>+	lsri	\rx, 3</div><div class='add'>+	andi	\rx, (\imm &gt;&gt; 3)</div><div class='ctx'> .endm</div><div class='ctx'> #endif /* __ASM_CSKY_ENTRY_H */</div><div class='head'>diff --git a/arch/csky/abiv2/inc/abi/regdef.h b/arch/csky/abiv2/inc/abi/regdef.h<br/>index c72abb781bdc..d7328bbc1ce7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/inc/abi/regdef.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/inc/abi/regdef.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/inc/abi/regdef.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv2/inc/abi/regdef.h</a></div><div class='hunk'>@@ -5,9 +5,8 @@</div><div class='ctx'> #define __ASM_CSKY_REGDEF_H</div><div class='ctx'> </div><div class='ctx'> #define syscallid	r7</div><div class='del'>-#define r11_sig		r11</div><div class='del'>-</div><div class='ctx'> #define regs_syscallid(regs) regs-&gt;regs[3]</div><div class='add'>+#define regs_fp(regs) regs-&gt;regs[4]</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PSR format:</div><div class='hunk'>@@ -23,4 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SYSTRACE_SAVENUM	5</div><div class='ctx'> </div><div class='add'>+#define TRAP0_SIZE		4</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_CSKY_REGDEF_H */</div><div class='head'>diff --git a/arch/csky/abiv2/mcount.S b/arch/csky/abiv2/mcount.S<br/>index c633379956f5..326402e65f9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/mcount.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/mcount.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/mcount.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv2/mcount.S</a></div><div class='hunk'>@@ -61,10 +61,17 @@</div><div class='ctx'> 	addi	sp, 16</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='add'>+.macro nop32_stub</div><div class='add'>+	nop32</div><div class='add'>+	nop32</div><div class='add'>+	nop32</div><div class='add'>+.endm</div><div class='add'>+</div><div class='ctx'> ENTRY(ftrace_stub)</div><div class='ctx'> 	jmp	lr</div><div class='ctx'> END(ftrace_stub)</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_DYNAMIC_FTRACE</div><div class='ctx'> ENTRY(_mcount)</div><div class='ctx'> 	mcount_enter</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +83,7 @@ ENTRY(_mcount)</div><div class='ctx'> 	bf	skip_ftrace</div><div class='ctx'> </div><div class='ctx'> 	mov	a0, lr</div><div class='del'>-	subi	a0, MCOUNT_INSN_SIZE</div><div class='add'>+	subi	a0, 4</div><div class='ctx'> 	ldw	a1, (sp, 24)</div><div class='ctx'> </div><div class='ctx'> 	jsr	r26</div><div class='hunk'>@@ -101,13 +108,41 @@ skip_ftrace:</div><div class='ctx'> 	mcount_exit</div><div class='ctx'> #endif</div><div class='ctx'> END(_mcount)</div><div class='add'>+#else /* CONFIG_DYNAMIC_FTRACE */</div><div class='add'>+ENTRY(_mcount)</div><div class='add'>+	mov	t1, lr</div><div class='add'>+	ldw	lr, (sp, 0)</div><div class='add'>+	addi	sp, 4</div><div class='add'>+	jmp	t1</div><div class='add'>+ENDPROC(_mcount)</div><div class='add'>+</div><div class='add'>+ENTRY(ftrace_caller)</div><div class='add'>+	mcount_enter</div><div class='add'>+</div><div class='add'>+	ldw	a0, (sp, 16)</div><div class='add'>+	subi	a0, 4</div><div class='add'>+	ldw	a1, (sp, 24)</div><div class='add'>+</div><div class='add'>+	nop</div><div class='add'>+GLOBAL(ftrace_call)</div><div class='add'>+	nop32_stub</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='add'>+	nop</div><div class='add'>+GLOBAL(ftrace_graph_call)</div><div class='add'>+	nop32_stub</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mcount_exit</div><div class='add'>+ENDPROC(ftrace_caller)</div><div class='add'>+#endif /* CONFIG_DYNAMIC_FTRACE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> ENTRY(ftrace_graph_caller)</div><div class='ctx'> 	mov	a0, sp</div><div class='ctx'> 	addi	a0, 24</div><div class='ctx'> 	ldw	a1, (sp, 16)</div><div class='del'>-	subi	a1, MCOUNT_INSN_SIZE</div><div class='add'>+	subi	a1, 4</div><div class='ctx'> 	mov	a2, r8</div><div class='ctx'> 	lrw	r26, prepare_ftrace_return</div><div class='ctx'> 	jsr	r26</div><div class='head'>diff --git a/arch/csky/abiv2/memmove.S b/arch/csky/abiv2/memmove.S<br/>index b0c42ecf1889..5721e73ad3d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/memmove.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/abiv2/memmove.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/abiv2/memmove.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/abiv2/memmove.S</a></div><div class='hunk'>@@ -35,11 +35,7 @@ ENTRY(memmove)</div><div class='ctx'> .L_len_larger_16bytes:</div><div class='ctx'> 	subi	r1, 16</div><div class='ctx'> 	subi	r0, 16</div><div class='del'>-#if defined(__CSKY_VDSPV2__)</div><div class='del'>-	vldx.8	vr0, (r1), r19</div><div class='del'>-	PRE_BNEZAD (r18)</div><div class='del'>-	vstx.8	vr0, (r0), r19</div><div class='del'>-#elif defined(__CK860__)</div><div class='add'>+#if defined(__CK860__)</div><div class='ctx'> 	ldw	r3, (r1, 12)</div><div class='ctx'> 	stw	r3, (r0, 12)</div><div class='ctx'> 	ldw	r3, (r1, 8)</div><div class='head'>diff --git a/arch/csky/include/asm/Kbuild b/arch/csky/include/asm/Kbuild<br/>index 2a0abe8f2a35..a9b63efef416 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/Kbuild</a></div><div class='hunk'>@@ -12,7 +12,6 @@ generic-y += dma-mapping.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += fb.h</div><div class='del'>-generic-y += ftrace.h</div><div class='ctx'> generic-y += futex.h</div><div class='ctx'> generic-y += gpio.h</div><div class='ctx'> generic-y += hardirq.h</div><div class='hunk'>@@ -28,6 +27,7 @@ generic-y += linkage.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += module.h</div><div class='ctx'> generic-y += mutex.h</div><div class='ctx'> generic-y += pci.h</div><div class='head'>diff --git a/arch/csky/include/asm/ftrace.h b/arch/csky/include/asm/ftrace.h<br/>index 7547c45312a8..ba35d93ecda2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/ftrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/ftrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/ftrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/ftrace.h</a></div><div class='hunk'>@@ -4,10 +4,26 @@</div><div class='ctx'> #ifndef __ASM_CSKY_FTRACE_H</div><div class='ctx'> #define __ASM_CSKY_FTRACE_H</div><div class='ctx'> </div><div class='del'>-#define MCOUNT_INSN_SIZE 4</div><div class='add'>+#define MCOUNT_INSN_SIZE	14</div><div class='ctx'> </div><div class='ctx'> #define HAVE_FUNCTION_GRAPH_FP_TEST</div><div class='ctx'> </div><div class='ctx'> #define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR</div><div class='ctx'> </div><div class='add'>+#define MCOUNT_ADDR	((unsigned long)_mcount)</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+extern void _mcount(unsigned long);</div><div class='add'>+</div><div class='add'>+extern void ftrace_graph_call(void);</div><div class='add'>+</div><div class='add'>+static inline unsigned long ftrace_call_adjust(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dyn_arch_ftrace {</div><div class='add'>+};</div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASM_CSKY_FTRACE_H */</div><div class='head'>diff --git a/arch/csky/include/asm/mmu_context.h b/arch/csky/include/asm/mmu_context.h<br/>index b2905c0485a7..734db3a122e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/mmu_context.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/mmu_context.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/mmu_context.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -14,23 +14,10 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;abi/ckmmu.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel)</div><div class='del'>-{</div><div class='del'>-	pgd -= PAGE_OFFSET;</div><div class='del'>-	pgd += PHYS_OFFSET;</div><div class='del'>-	pgd |= 1;</div><div class='del'>-	setup_pgd(pgd, kernel);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define TLBMISS_HANDLER_SETUP_PGD(pgd) \</div><div class='del'>-	tlbmiss_handler_setup_pgd((unsigned long)pgd, 0)</div><div class='add'>+	setup_pgd(__pa(pgd), false)</div><div class='ctx'> #define TLBMISS_HANDLER_SETUP_PGD_KERNEL(pgd) \</div><div class='del'>-	tlbmiss_handler_setup_pgd((unsigned long)pgd, 1)</div><div class='del'>-</div><div class='del'>-static inline unsigned long tlb_get_pgd(void)</div><div class='del'>-{</div><div class='del'>-	return ((get_pgd() - PHYS_OFFSET) &amp; ~1) + PAGE_OFFSET;</div><div class='del'>-}</div><div class='add'>+	setup_pgd(__pa(pgd), true)</div><div class='ctx'> </div><div class='ctx'> #define cpu_context(cpu, mm)	((mm)-&gt;context.asid[cpu])</div><div class='ctx'> #define cpu_asid(cpu, mm)	(cpu_context((cpu), (mm)) &amp; ASID_MASK)</div><div class='head'>diff --git a/arch/csky/include/asm/page.h b/arch/csky/include/asm/page.h<br/>index 73cf2bd66a13..9738eacefdc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/page.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/page.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/page.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/page.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/const.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PAGE_SHIFT determines the page size</div><div class='add'>+ * PAGE_SHIFT determines the page size: 4KB</div><div class='ctx'>  */</div><div class='ctx'> #define PAGE_SHIFT	12</div><div class='ctx'> #define PAGE_SIZE	(_AC(1, UL) &lt;&lt; PAGE_SHIFT)</div><div class='hunk'>@@ -17,12 +17,18 @@</div><div class='ctx'> #define THREAD_MASK	(~(THREAD_SIZE - 1))</div><div class='ctx'> #define THREAD_SHIFT	(PAGE_SHIFT + 1)</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * NOTE: virtual isn't really correct, actually it should be the offset into the</div><div class='del'>- * memory node, but we have no highmem, so that works for now.</div><div class='del'>- * TODO: implement (fast) pfn&lt;-&gt;pgdat_idx conversion functions, this makes lots</div><div class='del'>- * of the shifts unnecessary.</div><div class='add'>+ * For C-SKY "User-space:Kernel-space" is "2GB:2GB" fixed by hardware and there</div><div class='add'>+ * are two segment registers (MSA0 + MSA1) to mapping 512MB + 512MB physical</div><div class='add'>+ * address region. We use them mapping kernel 1GB direct-map address area and</div><div class='add'>+ * for more than 1GB of memory we use highmem.</div><div class='ctx'>  */</div><div class='add'>+#define PAGE_OFFSET	0x80000000</div><div class='add'>+#define SSEG_SIZE	0x20000000</div><div class='add'>+#define LOWMEM_LIMIT	(SSEG_SIZE * 2)</div><div class='add'>+</div><div class='add'>+#define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE &amp; (SSEG_SIZE - 1))</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -50,9 +56,6 @@ struct page;</div><div class='ctx'> </div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * These are used to make use of C type-checking..</div><div class='del'>- */</div><div class='ctx'> typedef struct { unsigned long pte_low; } pte_t;</div><div class='ctx'> #define pte_val(x)	((x).pte_low)</div><div class='ctx'> </div><div class='hunk'>@@ -69,18 +72,13 @@ typedef struct page *pgtable_t;</div><div class='ctx'> #define __pgd(x)	((pgd_t) { (x) })</div><div class='ctx'> #define __pgprot(x)	((pgprot_t) { (x) })</div><div class='ctx'> </div><div class='del'>-#endif /* !__ASSEMBLY__ */</div><div class='add'>+extern unsigned long va_pa_offset;</div><div class='ctx'> </div><div class='del'>-#define PHYS_OFFSET		(CONFIG_RAM_BASE &amp; ~(LOWMEM_LIMIT - 1))</div><div class='del'>-#define PHYS_OFFSET_OFFSET	(CONFIG_RAM_BASE &amp; (LOWMEM_LIMIT - 1))</div><div class='del'>-#define ARCH_PFN_OFFSET		PFN_DOWN(CONFIG_RAM_BASE)</div><div class='add'>+#define ARCH_PFN_OFFSET	PFN_DOWN(va_pa_offset + PHYS_OFFSET_OFFSET)</div><div class='ctx'> </div><div class='del'>-#define	PAGE_OFFSET	0x80000000</div><div class='del'>-#define LOWMEM_LIMIT	0x40000000</div><div class='add'>+#define __pa(x)		 ((unsigned long)(x) - PAGE_OFFSET + va_pa_offset)</div><div class='add'>+#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - va_pa_offset))</div><div class='ctx'> </div><div class='del'>-#define __pa(x)		((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)</div><div class='del'>-#define __va(x)		((void *)((unsigned long)(x) + PAGE_OFFSET - \</div><div class='del'>-				  PHYS_OFFSET))</div><div class='ctx'> #define __pa_symbol(x)	__pa(RELOC_HIDE((unsigned long)(x), 0))</div><div class='ctx'> </div><div class='ctx'> #define MAP_NR(x)	PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \</div><div class='hunk'>@@ -90,15 +88,10 @@ typedef struct page *pgtable_t;</div><div class='ctx'> #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \</div><div class='ctx'> 				VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * main RAM and kernel working space are coincident at 0x80000000, but to make</div><div class='del'>- * life more interesting, there's also an uncached virtual shadow at 0xb0000000</div><div class='del'>- * - these mappings are fixed in the MMU</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #define pfn_to_kaddr(x)	__va(PFN_PHYS(x))</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/memory_model.h&gt;</div><div class='ctx'> #include &lt;asm-generic/getorder.h&gt;</div><div class='ctx'> </div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASM_CSKY_PAGE_H */</div><div class='head'>diff --git a/arch/csky/include/asm/perf_event.h b/arch/csky/include/asm/perf_event.h<br/>index ea8193122294..572093e11001 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/perf_event.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/perf_event.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/perf_event.h</a></div><div class='hunk'>@@ -4,4 +4,12 @@</div><div class='ctx'> #ifndef __ASM_CSKY_PERF_EVENT_H</div><div class='ctx'> #define __ASM_CSKY_PERF_EVENT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;abi/regdef.h&gt;</div><div class='add'>+</div><div class='add'>+#define perf_arch_fetch_caller_regs(regs, __ip) { \</div><div class='add'>+	(regs)-&gt;pc = (__ip); \</div><div class='add'>+	regs_fp(regs) = (unsigned long) __builtin_frame_address(0); \</div><div class='add'>+	asm volatile("mov %0, sp\n":"=r"((regs)-&gt;usp)); \</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_PERF_EVENT_ELF_H */</div><div class='head'>diff --git a/arch/csky/include/asm/ptrace.h b/arch/csky/include/asm/ptrace.h<br/>new file mode 100644<br/>index 000000000000..d0aba7b32417<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/ptrace.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_CSKY_PTRACE_H</div><div class='add'>+#define __ASM_CSKY_PTRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#define PS_S	0x80000000 /* Supervisor Mode */</div><div class='add'>+</div><div class='add'>+#define arch_has_single_step() (1)</div><div class='add'>+#define current_pt_regs() \</div><div class='add'>+({ (struct pt_regs *)((char *)current_thread_info() + THREAD_SIZE) - 1; })</div><div class='add'>+</div><div class='add'>+#define user_stack_pointer(regs) ((regs)-&gt;usp)</div><div class='add'>+</div><div class='add'>+#define user_mode(regs) (!((regs)-&gt;sr &amp; PS_S))</div><div class='add'>+#define instruction_pointer(regs) ((regs)-&gt;pc)</div><div class='add'>+#define profile_pc(regs) instruction_pointer(regs)</div><div class='add'>+</div><div class='add'>+static inline bool in_syscall(struct pt_regs const *regs)</div><div class='add'>+{</div><div class='add'>+	return ((regs-&gt;sr &gt;&gt; 16) &amp; 0xff) == VEC_TRAP0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void forget_syscall(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;sr &amp;= ~(0xff &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;a0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+#endif /* __ASM_CSKY_PTRACE_H */</div><div class='head'>diff --git a/arch/csky/include/asm/syscall.h b/arch/csky/include/asm/syscall.h<br/>index d637445737b7..f624fa3bbc22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/syscall.h</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> #include &lt;abi/regdef.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> </div><div class='add'>+extern void *sys_call_table[];</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> syscall_get_nr(struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -15,6 +17,13 @@ syscall_get_nr(struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='add'>+syscall_set_nr(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+	       int sysno)</div><div class='add'>+{</div><div class='add'>+	regs_syscallid(regs) = sysno;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='ctx'> syscall_rollback(struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	regs-&gt;a0 = regs-&gt;orig_a0;</div><div class='hunk'>@@ -43,34 +52,24 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		      unsigned int i, unsigned int n, unsigned long *args)</div><div class='add'>+		      unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		args[0] = regs-&gt;orig_a0;</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-	memcpy(args, &amp;regs-&gt;a1 + i * sizeof(regs-&gt;a1), n * sizeof(args[0]));</div><div class='add'>+	args[0] = regs-&gt;orig_a0;</div><div class='add'>+	args++;</div><div class='add'>+	memcpy(args, &amp;regs-&gt;a1, 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		      unsigned int i, unsigned int n, const unsigned long *args)</div><div class='add'>+		      const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		regs-&gt;orig_a0 = args[0];</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-	memcpy(&amp;regs-&gt;a1 + i * sizeof(regs-&gt;a1), args, n * sizeof(regs-&gt;a0));</div><div class='add'>+	regs-&gt;orig_a0 = args[0];</div><div class='add'>+	args++;</div><div class='add'>+	memcpy(&amp;regs-&gt;a1, args, 5 * sizeof(regs-&gt;a1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-syscall_get_arch(void)</div><div class='add'>+syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_CSKY;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/csky/include/asm/thread_info.h b/arch/csky/include/asm/thread_info.h<br/>index 0e9d035d712b..0b546a55a8bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/thread_info.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/thread_info.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/thread_info.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/thread_info.h</a></div><div class='hunk'>@@ -51,29 +51,26 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='del'>-/* entry.S relies on these definitions!</div><div class='del'>- * bits 0-5 are tested at every exception exit</div><div class='del'>- */</div><div class='ctx'> #define TIF_SIGPENDING		0	/* signal pending */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	1       /* callback before returning to user */</div><div class='ctx'> #define TIF_NEED_RESCHED	2	/* rescheduling necessary */</div><div class='del'>-#define TIF_SYSCALL_TRACE	5	/* syscall trace active */</div><div class='del'>-#define TIF_DELAYED_TRACE	14	/* single step a syscall */</div><div class='add'>+#define TIF_SYSCALL_TRACE	3	/* syscall trace active */</div><div class='add'>+#define TIF_SYSCALL_TRACEPOINT	4       /* syscall tracepoint instrumentation */</div><div class='add'>+#define TIF_SYSCALL_AUDIT	5	/* syscall auditing */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16	/* poll_idle() is TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		18      /* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		19	/* thread is freezing for suspend */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	20	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_SECCOMP		21	/* secure computing */</div><div class='ctx'> </div><div class='del'>-#define _TIF_SIGPENDING         (1 &lt;&lt; TIF_SIGPENDING)</div><div class='del'>-#define _TIF_NOTIFY_RESUME      (1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='del'>-#define _TIF_NEED_RESCHED       (1 &lt;&lt; TIF_NEED_RESCHED)</div><div class='del'>-#define _TIF_SYSCALL_TRACE      (1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='del'>-#define _TIF_DELAYED_TRACE	(1 &lt;&lt; TIF_DELAYED_TRACE)</div><div class='del'>-#define _TIF_POLLING_NRFLAG     (1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='add'>+#define _TIF_SIGPENDING		(1 &lt;&lt; TIF_SIGPENDING)</div><div class='add'>+#define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='add'>+#define _TIF_NEED_RESCHED	(1 &lt;&lt; TIF_NEED_RESCHED)</div><div class='add'>+#define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='add'>+#define _TIF_SYSCALL_TRACEPOINT	(1 &lt;&lt; TIF_SYSCALL_TRACEPOINT)</div><div class='add'>+#define _TIF_SYSCALL_AUDIT	(1 &lt;&lt; TIF_SYSCALL_AUDIT)</div><div class='add'>+#define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_MEMDIE		(1 &lt;&lt; TIF_MEMDIE)</div><div class='del'>-#define _TIF_FREEZE             (1 &lt;&lt; TIF_FREEZE)</div><div class='del'>-#define _TIF_RESTORE_SIGMASK    (1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_SECCOMP            (1 &lt;&lt; TIF_SECCOMP)</div><div class='add'>+#define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='add'>+#define _TIF_SECCOMP		(1 &lt;&lt; TIF_SECCOMP)</div><div class='ctx'> </div><div class='ctx'> #endif	/* _ASM_CSKY_THREAD_INFO_H */</div><div class='head'>diff --git a/arch/csky/include/asm/unistd.h b/arch/csky/include/asm/unistd.h<br/>index 284487477a61..da7a18295615 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/unistd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/asm/unistd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/asm/unistd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/asm/unistd.h</a></div><div class='hunk'>@@ -2,3 +2,5 @@</div><div class='ctx'> // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/asm/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#define NR_syscalls (__NR_syscalls)</div><div class='head'>diff --git a/arch/csky/include/uapi/asm/perf_regs.h b/arch/csky/include/uapi/asm/perf_regs.h<br/>new file mode 100644<br/>index 000000000000..ee323d818592<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/uapi/asm/perf_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/uapi/asm/perf_regs.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_CSKY_PERF_REGS_H</div><div class='add'>+#define _ASM_CSKY_PERF_REGS_H</div><div class='add'>+</div><div class='add'>+/* Index of struct pt_regs */</div><div class='add'>+enum perf_event_csky_regs {</div><div class='add'>+	PERF_REG_CSKY_TLS,</div><div class='add'>+	PERF_REG_CSKY_LR,</div><div class='add'>+	PERF_REG_CSKY_PC,</div><div class='add'>+	PERF_REG_CSKY_SR,</div><div class='add'>+	PERF_REG_CSKY_SP,</div><div class='add'>+	PERF_REG_CSKY_ORIG_A0,</div><div class='add'>+	PERF_REG_CSKY_A0,</div><div class='add'>+	PERF_REG_CSKY_A1,</div><div class='add'>+	PERF_REG_CSKY_A2,</div><div class='add'>+	PERF_REG_CSKY_A3,</div><div class='add'>+	PERF_REG_CSKY_REGS0,</div><div class='add'>+	PERF_REG_CSKY_REGS1,</div><div class='add'>+	PERF_REG_CSKY_REGS2,</div><div class='add'>+	PERF_REG_CSKY_REGS3,</div><div class='add'>+	PERF_REG_CSKY_REGS4,</div><div class='add'>+	PERF_REG_CSKY_REGS5,</div><div class='add'>+	PERF_REG_CSKY_REGS6,</div><div class='add'>+	PERF_REG_CSKY_REGS7,</div><div class='add'>+	PERF_REG_CSKY_REGS8,</div><div class='add'>+	PERF_REG_CSKY_REGS9,</div><div class='add'>+#if defined(__CSKYABIV2__)</div><div class='add'>+	PERF_REG_CSKY_EXREGS0,</div><div class='add'>+	PERF_REG_CSKY_EXREGS1,</div><div class='add'>+	PERF_REG_CSKY_EXREGS2,</div><div class='add'>+	PERF_REG_CSKY_EXREGS3,</div><div class='add'>+	PERF_REG_CSKY_EXREGS4,</div><div class='add'>+	PERF_REG_CSKY_EXREGS5,</div><div class='add'>+	PERF_REG_CSKY_EXREGS6,</div><div class='add'>+	PERF_REG_CSKY_EXREGS7,</div><div class='add'>+	PERF_REG_CSKY_EXREGS8,</div><div class='add'>+	PERF_REG_CSKY_EXREGS9,</div><div class='add'>+	PERF_REG_CSKY_EXREGS10,</div><div class='add'>+	PERF_REG_CSKY_EXREGS11,</div><div class='add'>+	PERF_REG_CSKY_EXREGS12,</div><div class='add'>+	PERF_REG_CSKY_EXREGS13,</div><div class='add'>+	PERF_REG_CSKY_EXREGS14,</div><div class='add'>+	PERF_REG_CSKY_HI,</div><div class='add'>+	PERF_REG_CSKY_LO,</div><div class='add'>+	PERF_REG_CSKY_DCSR,</div><div class='add'>+#endif</div><div class='add'>+	PERF_REG_CSKY_MAX,</div><div class='add'>+};</div><div class='add'>+#endif /* _ASM_CSKY_PERF_REGS_H */</div><div class='head'>diff --git a/arch/csky/include/uapi/asm/ptrace.h b/arch/csky/include/uapi/asm/ptrace.h<br/>index a4eaa8ddf0b1..4e248d5b86ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/uapi/asm/ptrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/include/uapi/asm/ptrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/include/uapi/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/include/uapi/asm/ptrace.h</a></div><div class='hunk'>@@ -48,20 +48,5 @@ struct user_fp {</div><div class='ctx'> 	unsigned long	reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#define PS_S	0x80000000 /* Supervisor Mode */</div><div class='del'>-</div><div class='del'>-#define arch_has_single_step() (1)</div><div class='del'>-#define current_pt_regs() \</div><div class='del'>-({ (struct pt_regs *)((char *)current_thread_info() + THREAD_SIZE) - 1; })</div><div class='del'>-</div><div class='del'>-#define user_stack_pointer(regs) ((regs)-&gt;usp)</div><div class='del'>-</div><div class='del'>-#define user_mode(regs) (!((regs)-&gt;sr &amp; PS_S))</div><div class='del'>-#define instruction_pointer(regs) ((regs)-&gt;pc)</div><div class='del'>-#define profile_pc(regs) instruction_pointer(regs)</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _CSKY_PTRACE_H */</div><div class='head'>diff --git a/arch/csky/kernel/Makefile b/arch/csky/kernel/Makefile<br/>index 484e6d3a3647..1624b04bffb5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/Makefile</a></div><div class='hunk'>@@ -9,6 +9,8 @@ obj-$(CONFIG_SMP)			+= smp.o</div><div class='ctx'> obj-$(CONFIG_FUNCTION_TRACER)		+= ftrace.o</div><div class='ctx'> obj-$(CONFIG_STACKTRACE)		+= stacktrace.o</div><div class='ctx'> obj-$(CONFIG_CSKY_PMU_V1)		+= perf_event.o</div><div class='add'>+obj-$(CONFIG_PERF_EVENTS)		+= perf_callchain.o</div><div class='add'>+obj-$(CONFIG_HAVE_PERF_REGS)            += perf_regs.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'> CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)</div><div class='head'>diff --git a/arch/csky/kernel/atomic.S b/arch/csky/kernel/atomic.S<br/>index d2357c8f85bd..5b84f11485ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/atomic.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/atomic.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/atomic.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/atomic.S</a></div><div class='hunk'>@@ -12,11 +12,10 @@</div><div class='ctx'>  * If *ptr != oldval &amp;&amp; return 1,</div><div class='ctx'>  * else *ptr = newval return 0.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_CPU_HAS_LDSTEX</div><div class='ctx'> ENTRY(csky_cmpxchg)</div><div class='ctx'> 	USPTOKSP</div><div class='ctx'> 	mfcr	a3, epc</div><div class='del'>-	INCTRAP	a3</div><div class='add'>+	addi	a3, TRAP0_SIZE</div><div class='ctx'> </div><div class='ctx'> 	subi    sp, 8</div><div class='ctx'> 	stw     a3, (sp, 0)</div><div class='hunk'>@@ -24,6 +23,7 @@ ENTRY(csky_cmpxchg)</div><div class='ctx'> 	stw     a3, (sp, 4)</div><div class='ctx'> </div><div class='ctx'> 	psrset	ee</div><div class='add'>+#ifdef CONFIG_CPU_HAS_LDSTEX</div><div class='ctx'> 1:</div><div class='ctx'> 	ldex	a3, (a2)</div><div class='ctx'> 	cmpne	a0, a3</div><div class='hunk'>@@ -33,27 +33,7 @@ ENTRY(csky_cmpxchg)</div><div class='ctx'> 	bez	a3, 1b</div><div class='ctx'> 2:</div><div class='ctx'> 	sync.is</div><div class='del'>-	mvc	a0</div><div class='del'>-	ldw	a3, (sp, 0)</div><div class='del'>-	mtcr	a3, epc</div><div class='del'>-	ldw     a3, (sp, 4)</div><div class='del'>-	mtcr	a3, epsr</div><div class='del'>-	addi	sp, 8</div><div class='del'>-	KSPTOUSP</div><div class='del'>-	rte</div><div class='del'>-END(csky_cmpxchg)</div><div class='ctx'> #else</div><div class='del'>-ENTRY(csky_cmpxchg)</div><div class='del'>-	USPTOKSP</div><div class='del'>-	mfcr	a3, epc</div><div class='del'>-	INCTRAP	a3</div><div class='del'>-</div><div class='del'>-	subi    sp, 8</div><div class='del'>-	stw     a3, (sp, 0)</div><div class='del'>-	mfcr    a3, epsr</div><div class='del'>-	stw     a3, (sp, 4)</div><div class='del'>-</div><div class='del'>-	psrset	ee</div><div class='ctx'> 1:</div><div class='ctx'> 	ldw	a3, (a2)</div><div class='ctx'> 	cmpne	a0, a3</div><div class='hunk'>@@ -61,6 +41,7 @@ ENTRY(csky_cmpxchg)</div><div class='ctx'> 2:</div><div class='ctx'> 	stw	a1, (a2)</div><div class='ctx'> 3:</div><div class='add'>+#endif</div><div class='ctx'> 	mvc	a0</div><div class='ctx'> 	ldw	a3, (sp, 0)</div><div class='ctx'> 	mtcr	a3, epc</div><div class='hunk'>@@ -71,6 +52,7 @@ ENTRY(csky_cmpxchg)</div><div class='ctx'> 	rte</div><div class='ctx'> END(csky_cmpxchg)</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_HAS_LDSTEX</div><div class='ctx'> /*</div><div class='ctx'>  * Called from tlbmodified exception</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S<br/>index 5137ed9062bd..a7e84ccccbd8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/entry.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/entry.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/entry.S</a></div><div class='hunk'>@@ -40,7 +40,8 @@ ENTRY(csky_\name)</div><div class='ctx'> 	WR_MCIR	a2</div><div class='ctx'> #endif</div><div class='ctx'> 	bclri   r6, 0</div><div class='del'>-	lrw	a2, PHYS_OFFSET</div><div class='add'>+	lrw	a2, va_pa_offset</div><div class='add'>+	ld.w	a2, (a2, 0)</div><div class='ctx'> 	subu	r6, a2</div><div class='ctx'> 	bseti	r6, 31</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +51,8 @@ ENTRY(csky_\name)</div><div class='ctx'> 	addu    r6, a2</div><div class='ctx'> 	ldw     r6, (r6)</div><div class='ctx'> </div><div class='del'>-	lrw	a2, PHYS_OFFSET</div><div class='add'>+	lrw	a2, va_pa_offset</div><div class='add'>+	ld.w	a2, (a2, 0)</div><div class='ctx'> 	subu	r6, a2</div><div class='ctx'> 	bseti	r6, 31</div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +93,7 @@ ENTRY(csky_\name)</div><div class='ctx'> 	mfcr    a3, ss2</div><div class='ctx'> 	mfcr    r6, ss3</div><div class='ctx'> 	mfcr    a2, ss4</div><div class='del'>-	SAVE_ALL EPC_KEEP</div><div class='add'>+	SAVE_ALL 0</div><div class='ctx'> .endm</div><div class='ctx'> .macro tlbop_end is_write</div><div class='ctx'> 	RD_MEH	a2</div><div class='hunk'>@@ -99,7 +101,6 @@ ENTRY(csky_\name)</div><div class='ctx'> 	mov     a0, sp</div><div class='ctx'> 	movi    a1, \is_write</div><div class='ctx'> 	jbsr    do_page_fault</div><div class='del'>-	movi    r11_sig, 0             /* r11 = 0, Not a syscall. */</div><div class='ctx'> 	jmpi    ret_from_exception</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='hunk'>@@ -118,7 +119,7 @@ jbsr csky_cmpxchg_fixup</div><div class='ctx'> tlbop_end 1</div><div class='ctx'> </div><div class='ctx'> ENTRY(csky_systemcall)</div><div class='del'>-	SAVE_ALL EPC_INCREASE</div><div class='add'>+	SAVE_ALL TRAP0_SIZE</div><div class='ctx'> </div><div class='ctx'> 	psrset  ee, ie</div><div class='ctx'> </div><div class='hunk'>@@ -136,8 +137,9 @@ ENTRY(csky_systemcall)</div><div class='ctx'> 	bmaski  r10, THREAD_SHIFT</div><div class='ctx'> 	andn    r9, r10</div><div class='ctx'> 	ldw     r8, (r9, TINFO_FLAGS)</div><div class='del'>-	btsti   r8, TIF_SYSCALL_TRACE</div><div class='del'>-	bt      1f</div><div class='add'>+	ANDI_R3	r8, (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT)</div><div class='add'>+	cmpnei	r8, 0</div><div class='add'>+	bt      csky_syscall_trace</div><div class='ctx'> #if defined(__CSKYABIV2__)</div><div class='ctx'> 	subi    sp, 8</div><div class='ctx'> 	stw  	r5, (sp, 0x4)</div><div class='hunk'>@@ -150,10 +152,9 @@ ENTRY(csky_systemcall)</div><div class='ctx'> 	stw     a0, (sp, LSAVE_A0)      /* Save return value */</div><div class='ctx'> 	jmpi    ret_from_exception</div><div class='ctx'> </div><div class='del'>-1:</div><div class='del'>-	movi	a0, 0                   /* enter system call */</div><div class='del'>-	mov	a1, sp                  /* sp = pt_regs pointer */</div><div class='del'>-	jbsr	syscall_trace</div><div class='add'>+csky_syscall_trace:</div><div class='add'>+	mov	a0, sp                  /* sp = pt_regs pointer */</div><div class='add'>+	jbsr	syscall_trace_enter</div><div class='ctx'> 	/* Prepare args before do system call */</div><div class='ctx'> 	ldw	a0, (sp, LSAVE_A0)</div><div class='ctx'> 	ldw	a1, (sp, LSAVE_A1)</div><div class='hunk'>@@ -173,9 +174,8 @@ ENTRY(csky_systemcall)</div><div class='ctx'> #endif</div><div class='ctx'> 	stw	a0, (sp, LSAVE_A0)	/* Save return value */</div><div class='ctx'> </div><div class='del'>-	movi    a0, 1                   /* leave system call */</div><div class='del'>-	mov     a1, sp                  /* right now, sp --&gt; pt_regs */</div><div class='del'>-	jbsr    syscall_trace</div><div class='add'>+	mov     a0, sp                  /* right now, sp --&gt; pt_regs */</div><div class='add'>+	jbsr    syscall_trace_exit</div><div class='ctx'> 	br	ret_from_exception</div><div class='ctx'> </div><div class='ctx'> ENTRY(ret_from_kernel_thread)</div><div class='hunk'>@@ -190,14 +190,11 @@ ENTRY(ret_from_fork)</div><div class='ctx'> 	bmaski	r10, THREAD_SHIFT</div><div class='ctx'> 	andn	r9, r10</div><div class='ctx'> 	ldw	r8, (r9, TINFO_FLAGS)</div><div class='del'>-	movi	r11_sig, 1</div><div class='del'>-	btsti	r8, TIF_SYSCALL_TRACE</div><div class='del'>-	bf	3f</div><div class='del'>-	movi	a0, 1</div><div class='del'>-	mov	a1, sp			/* sp = pt_regs pointer */</div><div class='del'>-	jbsr	syscall_trace</div><div class='del'>-3:</div><div class='del'>-	jbsr	ret_from_exception</div><div class='add'>+	ANDI_R3	r8, (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT)</div><div class='add'>+	cmpnei	r8, 0</div><div class='add'>+	bf	ret_from_exception</div><div class='add'>+	mov	a0, sp			/* sp = pt_regs pointer */</div><div class='add'>+	jbsr	syscall_trace_exit</div><div class='ctx'> </div><div class='ctx'> ret_from_exception:</div><div class='ctx'> 	ld	syscallid, (sp, LSAVE_PSR)</div><div class='hunk'>@@ -212,41 +209,30 @@ ret_from_exception:</div><div class='ctx'> 	bmaski	r10, THREAD_SHIFT</div><div class='ctx'> 	andn	r9, r10</div><div class='ctx'> </div><div class='del'>-resume_userspace:</div><div class='ctx'> 	ldw	r8, (r9, TINFO_FLAGS)</div><div class='ctx'> 	andi	r8, (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED)</div><div class='ctx'> 	cmpnei	r8, 0</div><div class='ctx'> 	bt	exit_work</div><div class='del'>-1:  RESTORE_ALL</div><div class='add'>+1:</div><div class='add'>+	RESTORE_ALL</div><div class='ctx'> </div><div class='ctx'> exit_work:</div><div class='add'>+	lrw	syscallid, ret_from_exception</div><div class='add'>+	mov	lr, syscallid</div><div class='add'>+</div><div class='ctx'> 	btsti	r8, TIF_NEED_RESCHED</div><div class='ctx'> 	bt	work_resched</div><div class='del'>-	/* If thread_info-&gt;flag is empty, RESTORE_ALL */</div><div class='del'>-	cmpnei	r8, 0</div><div class='del'>-	bf	1b</div><div class='del'>-	mov	a1, sp</div><div class='del'>-	mov	a0, r8</div><div class='del'>-	mov	a2, r11_sig		/* syscall? */</div><div class='del'>-	btsti	r8, TIF_SIGPENDING	/* delivering a signal? */</div><div class='del'>-	/* prevent further restarts(set r11 = 0) */</div><div class='del'>-	clrt	r11_sig</div><div class='del'>-	jbsr	do_notify_resume	/* do signals */</div><div class='del'>-	br	resume_userspace</div><div class='add'>+</div><div class='add'>+	mov	a0, sp</div><div class='add'>+	mov	a1, r8</div><div class='add'>+	jmpi	do_notify_resume</div><div class='ctx'> </div><div class='ctx'> work_resched:</div><div class='del'>-	lrw	syscallid, ret_from_exception</div><div class='del'>-	mov	r15, syscallid		/* Return address in link */</div><div class='ctx'> 	jmpi	schedule</div><div class='ctx'> </div><div class='del'>-ENTRY(sys_rt_sigreturn)</div><div class='del'>-	movi	r11_sig, 0</div><div class='del'>-	jmpi	do_rt_sigreturn</div><div class='del'>-</div><div class='ctx'> ENTRY(csky_trap)</div><div class='del'>-	SAVE_ALL EPC_KEEP</div><div class='add'>+	SAVE_ALL 0</div><div class='ctx'> 	psrset	ee</div><div class='del'>-	movi	r11_sig, 0             /* r11 = 0, Not a syscall. */</div><div class='ctx'> 	mov	a0, sp                 /* Push Stack pointer arg */</div><div class='ctx'> 	jbsr	trap_c                 /* Call C-level trap handler */</div><div class='ctx'> 	jmpi	ret_from_exception</div><div class='hunk'>@@ -261,7 +247,7 @@ ENTRY(csky_get_tls)</div><div class='ctx'> </div><div class='ctx'> 	/* increase epc for continue */</div><div class='ctx'> 	mfcr	a0, epc</div><div class='del'>-	INCTRAP	a0</div><div class='add'>+	addi	a0, TRAP0_SIZE</div><div class='ctx'> 	mtcr	a0, epc</div><div class='ctx'> </div><div class='ctx'> 	/* get current task thread_info with kernel 8K stack */</div><div class='hunk'>@@ -278,9 +264,8 @@ ENTRY(csky_get_tls)</div><div class='ctx'> 	rte</div><div class='ctx'> </div><div class='ctx'> ENTRY(csky_irq)</div><div class='del'>-	SAVE_ALL EPC_KEEP</div><div class='add'>+	SAVE_ALL 0</div><div class='ctx'> 	psrset	ee</div><div class='del'>-	movi	r11_sig, 0		/* r11 = 0, Not a syscall. */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	mov	r9, sp			/* Get current stack  pointer */</div><div class='head'>diff --git a/arch/csky/kernel/ftrace.c b/arch/csky/kernel/ftrace.c<br/>index 274c431f1810..44f4880179b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/ftrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/ftrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/ftrace.c</a></div><div class='hunk'>@@ -3,6 +3,137 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE</div><div class='add'>+</div><div class='add'>+#define NOP		0x4000</div><div class='add'>+#define NOP32_HI	0xc400</div><div class='add'>+#define NOP32_LO	0x4820</div><div class='add'>+#define PUSH_LR		0x14d0</div><div class='add'>+#define MOVIH_LINK	0xea3a</div><div class='add'>+#define ORI_LINK	0xef5a</div><div class='add'>+#define JSR_LINK	0xe8fa</div><div class='add'>+#define BSR_LINK	0xe000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Gcc-csky with -pg will insert stub in function prologue:</div><div class='add'>+ *	push	lr</div><div class='add'>+ *	jbsr	_mcount</div><div class='add'>+ *	nop32</div><div class='add'>+ *	nop32</div><div class='add'>+ *</div><div class='add'>+ * If the (callee - current_pc) is less then 64MB, we'll use bsr:</div><div class='add'>+ *	push	lr</div><div class='add'>+ *	bsr	_mcount</div><div class='add'>+ *	nop32</div><div class='add'>+ *	nop32</div><div class='add'>+ * else we'll use (movih + ori + jsr):</div><div class='add'>+ *	push	lr</div><div class='add'>+ *	movih	r26, ...</div><div class='add'>+ *	ori	r26, ...</div><div class='add'>+ *	jsr	r26</div><div class='add'>+ *</div><div class='add'>+ * (r26 is our reserved link-reg)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline void make_jbsr(unsigned long callee, unsigned long pc,</div><div class='add'>+			     uint16_t *call, bool nolr)</div><div class='add'>+{</div><div class='add'>+	long offset;</div><div class='add'>+</div><div class='add'>+	call[0]	= nolr ? NOP : PUSH_LR;</div><div class='add'>+</div><div class='add'>+	offset = (long) callee - (long) pc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset &lt; -67108864 || offset &gt; 67108864)) {</div><div class='add'>+		call[1] = MOVIH_LINK;</div><div class='add'>+		call[2] = callee &gt;&gt; 16;</div><div class='add'>+		call[3] = ORI_LINK;</div><div class='add'>+		call[4] = callee &amp; 0xffff;</div><div class='add'>+		call[5] = JSR_LINK;</div><div class='add'>+		call[6] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		offset = offset &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+		call[1] = BSR_LINK |</div><div class='add'>+			 ((uint16_t)((unsigned long) offset &gt;&gt; 16) &amp; 0x3ff);</div><div class='add'>+		call[2] = (uint16_t)((unsigned long) offset &amp; 0xffff);</div><div class='add'>+		call[3] = call[5] = NOP32_HI;</div><div class='add'>+		call[4] = call[6] = NOP32_LO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint16_t nops[7] = {NOP, NOP32_HI, NOP32_LO, NOP32_HI, NOP32_LO,</div><div class='add'>+				NOP32_HI, NOP32_LO};</div><div class='add'>+static int ftrace_check_current_nop(unsigned long hook)</div><div class='add'>+{</div><div class='add'>+	uint16_t olds[7];</div><div class='add'>+	unsigned long hook_pos = hook - 2;</div><div class='add'>+</div><div class='add'>+	if (probe_kernel_read((void *)olds, (void *)hook_pos, sizeof(nops)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (memcmp((void *)nops, (void *)olds, sizeof(nops))) {</div><div class='add'>+		pr_err("%p: nop but get (%04x %04x %04x %04x %04x %04x %04x)\n",</div><div class='add'>+			(void *)hook_pos,</div><div class='add'>+			olds[0], olds[1], olds[2], olds[3], olds[4], olds[5],</div><div class='add'>+			olds[6]);</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 ftrace_modify_code(unsigned long hook, unsigned long target,</div><div class='add'>+			      bool enable, bool nolr)</div><div class='add'>+{</div><div class='add'>+	uint16_t call[7];</div><div class='add'>+</div><div class='add'>+	unsigned long hook_pos = hook - 2;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	make_jbsr(target, hook, call, nolr);</div><div class='add'>+</div><div class='add'>+	ret = probe_kernel_write((void *)hook_pos, enable ? call : nops,</div><div class='add'>+				 sizeof(nops));</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	flush_icache_range(hook_pos, hook_pos + MCOUNT_INSN_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	int ret = ftrace_check_current_nop(rec-&gt;ip);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ftrace_modify_code(rec-&gt;ip, addr, true, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,</div><div class='add'>+		    unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return ftrace_modify_code(rec-&gt;ip, addr, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ftrace_update_ftrace_func(ftrace_func_t func)</div><div class='add'>+{</div><div class='add'>+	int ret = ftrace_modify_code((unsigned long)&amp;ftrace_call,</div><div class='add'>+				(unsigned long)func, true, true);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init ftrace_dyn_arch_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DYNAMIC_FTRACE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,</div><div class='hunk'>@@ -43,8 +174,21 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,</div><div class='ctx'> 			*(unsigned long *)frame_pointer = return_hooker;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE</div><div class='add'>+int ftrace_enable_ftrace_graph_caller(void)</div><div class='add'>+{</div><div class='add'>+	return ftrace_modify_code((unsigned long)&amp;ftrace_graph_call,</div><div class='add'>+			(unsigned long)&amp;ftrace_graph_caller, true, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ftrace_disable_ftrace_graph_caller(void)</div><div class='add'>+{</div><div class='add'>+	return ftrace_modify_code((unsigned long)&amp;ftrace_graph_call,</div><div class='add'>+			(unsigned long)&amp;ftrace_graph_caller, false, true);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DYNAMIC_FTRACE */</div><div class='add'>+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */</div><div class='ctx'> </div><div class='ctx'> /* _mcount is defined in abi's mcount.S */</div><div class='del'>-extern void _mcount(void);</div><div class='ctx'> EXPORT_SYMBOL(_mcount);</div><div class='head'>diff --git a/arch/csky/kernel/head.S b/arch/csky/kernel/head.S<br/>index 9c4ec473b76b..61989f9241c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/head.S</a></div><div class='hunk'>@@ -7,16 +7,11 @@</div><div class='ctx'> </div><div class='ctx'> __HEAD</div><div class='ctx'> ENTRY(_start)</div><div class='del'>-	/* set super user mode */</div><div class='del'>-	lrw	a3, DEFAULT_PSR_VALUE</div><div class='del'>-	mtcr    a3, psr</div><div class='del'>-	psrset  ee</div><div class='del'>-</div><div class='del'>-	SETUP_MMU a3</div><div class='add'>+	SETUP_MMU</div><div class='ctx'> </div><div class='ctx'> 	/* set stack point */</div><div class='del'>-	lrw     a3, init_thread_union + THREAD_SIZE</div><div class='del'>-	mov	sp, a3</div><div class='add'>+	lrw     r6, init_thread_union + THREAD_SIZE</div><div class='add'>+	mov	sp, r6</div><div class='ctx'> </div><div class='ctx'> 	jmpi	csky_start</div><div class='ctx'> END(_start)</div><div class='hunk'>@@ -24,53 +19,12 @@ END(_start)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> .align 10</div><div class='ctx'> ENTRY(_start_smp_secondary)</div><div class='del'>-	/* Invalid I/Dcache BTB BHT */</div><div class='del'>-	movi	a3, 7</div><div class='del'>-	lsli	a3, 16</div><div class='del'>-	addi	a3, (1&lt;&lt;4) | 3</div><div class='del'>-	mtcr	a3, cr17</div><div class='del'>-</div><div class='del'>-	tlbi.alls</div><div class='del'>-</div><div class='del'>-	/* setup PAGEMASK */</div><div class='del'>-	movi	a3, 0</div><div class='del'>-	mtcr	a3, cr&lt;6, 15&gt;</div><div class='del'>-</div><div class='del'>-	/* setup MEL0/MEL1 */</div><div class='del'>-	grs	a0, _start_smp_pc</div><div class='del'>-_start_smp_pc:</div><div class='del'>-	bmaski  a1, 13</div><div class='del'>-	andn    a0, a1</div><div class='del'>-	movi    a1, 0x00000006</div><div class='del'>-	movi    a2, 0x00001006</div><div class='del'>-	or      a1, a0</div><div class='del'>-	or      a2, a0</div><div class='del'>-	mtcr	a1, cr&lt;2, 15&gt;</div><div class='del'>-	mtcr	a2, cr&lt;3, 15&gt;</div><div class='del'>-</div><div class='del'>-	/* setup MEH */</div><div class='del'>-	mtcr	a0, cr&lt;4, 15&gt;</div><div class='del'>-</div><div class='del'>-	/* write TLB */</div><div class='del'>-	bgeni   a3, 28</div><div class='del'>-	mtcr	a3, cr&lt;8, 15&gt;</div><div class='del'>-</div><div class='del'>-	SETUP_MMU a3</div><div class='del'>-</div><div class='del'>-	/* enable MMU */</div><div class='del'>-	movi	a3, 1</div><div class='del'>-	mtcr    a3, cr18</div><div class='del'>-</div><div class='del'>-	jmpi	_goto_mmu_on</div><div class='del'>-_goto_mmu_on:</div><div class='del'>-	lrw	a3, DEFAULT_PSR_VALUE</div><div class='del'>-	mtcr    a3, psr</div><div class='del'>-	psrset  ee</div><div class='add'>+	SETUP_MMU</div><div class='ctx'> </div><div class='ctx'> 	/* set stack point */</div><div class='del'>-	lrw     a3, secondary_stack</div><div class='del'>-	ld.w	a3, (a3, 0)</div><div class='del'>-	mov	sp, a3</div><div class='add'>+	lrw     r6, secondary_stack</div><div class='add'>+	ld.w	r6, (r6, 0)</div><div class='add'>+	mov	sp, r6</div><div class='ctx'> </div><div class='ctx'> 	jmpi	csky_start_secondary</div><div class='ctx'> END(_start_smp_secondary)</div><div class='head'>diff --git a/arch/csky/kernel/perf_callchain.c b/arch/csky/kernel/perf_callchain.c<br/>new file mode 100644<br/>index 000000000000..e68ff375c8f8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/perf_callchain.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/perf_callchain.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+/* Kernel callchain */</div><div class='add'>+struct stackframe {</div><div class='add'>+	unsigned long fp;</div><div class='add'>+	unsigned long lr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int unwind_frame_kernel(struct stackframe *frame)</div><div class='add'>+{</div><div class='add'>+	if (kstack_end((void *)frame-&gt;fp))</div><div class='add'>+		return -EPERM;</div><div class='add'>+	if (frame-&gt;fp &amp; 0x3 || frame-&gt;fp &lt; TASK_SIZE)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	*frame = *(struct stackframe *)frame-&gt;fp;</div><div class='add'>+	if (__kernel_text_address(frame-&gt;lr)) {</div><div class='add'>+		int graph = 0;</div><div class='add'>+</div><div class='add'>+		frame-&gt;lr = ftrace_graph_ret_addr(NULL, &amp;graph, frame-&gt;lr,</div><div class='add'>+				NULL);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void notrace walk_stackframe(struct stackframe *fr,</div><div class='add'>+			struct perf_callchain_entry_ctx *entry)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		perf_callchain_store(entry, fr-&gt;lr);</div><div class='add'>+	} while (unwind_frame_kernel(fr) &gt;= 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the return address for a single stackframe and return a pointer to the</div><div class='add'>+ * next frame tail.</div><div class='add'>+ */</div><div class='add'>+static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry,</div><div class='add'>+			unsigned long fp, unsigned long reg_lr)</div><div class='add'>+{</div><div class='add'>+	struct stackframe buftail;</div><div class='add'>+	unsigned long lr = 0;</div><div class='add'>+	unsigned long *user_frame_tail = (unsigned long *)fp;</div><div class='add'>+</div><div class='add'>+	/* Check accessibility of one struct frame_tail beyond */</div><div class='add'>+	if (!access_ok(user_frame_tail, sizeof(buftail)))</div><div class='add'>+		return 0;</div><div class='add'>+	if (__copy_from_user_inatomic(&amp;buftail, user_frame_tail,</div><div class='add'>+				      sizeof(buftail)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (reg_lr != 0)</div><div class='add'>+		lr = reg_lr;</div><div class='add'>+	else</div><div class='add'>+		lr = buftail.lr;</div><div class='add'>+</div><div class='add'>+	fp = buftail.fp;</div><div class='add'>+	perf_callchain_store(entry, lr);</div><div class='add'>+</div><div class='add'>+	return fp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This will be called when the target is in user mode</div><div class='add'>+ * This function will only be called when we use</div><div class='add'>+ * "PERF_SAMPLE_CALLCHAIN" in</div><div class='add'>+ * kernel/events/core.c:perf_prepare_sample()</div><div class='add'>+ *</div><div class='add'>+ * How to trigger perf_callchain_[user/kernel] :</div><div class='add'>+ * $ perf record -e cpu-clock --call-graph fp ./program</div><div class='add'>+ * $ perf report --call-graph</div><div class='add'>+ *</div><div class='add'>+ * On C-SKY platform, the program being sampled and the C library</div><div class='add'>+ * need to be compiled with * -mbacktrace, otherwise the user</div><div class='add'>+ * stack will not contain function frame.</div><div class='add'>+ */</div><div class='add'>+void perf_callchain_user(struct perf_callchain_entry_ctx *entry,</div><div class='add'>+			 struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long fp = 0;</div><div class='add'>+</div><div class='add'>+	/* C-SKY does not support virtualization. */</div><div class='add'>+	if (perf_guest_cbs &amp;&amp; perf_guest_cbs-&gt;is_in_guest())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fp = regs-&gt;regs[4];</div><div class='add'>+	perf_callchain_store(entry, regs-&gt;pc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * While backtrace from leaf function, lr is normally</div><div class='add'>+	 * not saved inside frame on C-SKY, so get lr from pt_regs</div><div class='add'>+	 * at the sample point. However, lr value can be incorrect if</div><div class='add'>+	 * lr is used as temp register</div><div class='add'>+	 */</div><div class='add'>+	fp = user_backtrace(entry, fp, regs-&gt;lr);</div><div class='add'>+</div><div class='add'>+	while (fp &amp;&amp; !(fp &amp; 0x3) &amp;&amp; entry-&gt;nr &lt; entry-&gt;max_stack)</div><div class='add'>+		fp = user_backtrace(entry, fp, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,</div><div class='add'>+			   struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct stackframe fr;</div><div class='add'>+</div><div class='add'>+	/* C-SKY does not support virtualization. */</div><div class='add'>+	if (perf_guest_cbs &amp;&amp; perf_guest_cbs-&gt;is_in_guest()) {</div><div class='add'>+		pr_warn("C-SKY does not support perf in guest mode!");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fr.fp = regs-&gt;regs[4];</div><div class='add'>+	fr.lr = regs-&gt;lr;</div><div class='add'>+	walk_stackframe(&amp;fr, entry);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/csky/kernel/perf_regs.c b/arch/csky/kernel/perf_regs.c<br/>new file mode 100644<br/>index 000000000000..eb32838b8210<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/perf_regs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/perf_regs.c</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.</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/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;asm/perf_regs.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+u64 perf_reg_value(struct pt_regs *regs, int idx)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE((u32)idx &gt;= PERF_REG_CSKY_MAX))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return (u64)*((u32 *)regs + idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define REG_RESERVED (~((1ULL &lt;&lt; PERF_REG_CSKY_MAX) - 1))</div><div class='add'>+</div><div class='add'>+int perf_reg_validate(u64 mask)</div><div class='add'>+{</div><div class='add'>+	if (!mask || mask &amp; REG_RESERVED)</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'>+u64 perf_reg_abi(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return PERF_SAMPLE_REGS_ABI_32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void perf_get_regs_user(struct perf_regs *regs_user,</div><div class='add'>+			struct pt_regs *regs,</div><div class='add'>+			struct pt_regs *regs_user_copy)</div><div class='add'>+{</div><div class='add'>+	regs_user-&gt;regs = task_pt_regs(current);</div><div class='add'>+	regs_user-&gt;abi = perf_reg_abi(current);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/csky/kernel/ptrace.c b/arch/csky/kernel/ptrace.c<br/>index f2f12fff36f7..313623a19ecb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/ptrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/ptrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/ptrace.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -11,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,6 +24,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;abi/regdef.h&gt;</div><div class='ctx'> </div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/syscalls.h&gt;</div><div class='add'>+</div><div class='ctx'> /* sets the trace bits. */</div><div class='ctx'> #define TRACE_MODE_SI      (1 &lt;&lt; 14)</div><div class='ctx'> #define TRACE_MODE_RUN     0</div><div class='hunk'>@@ -207,35 +212,27 @@ long arch_ptrace(struct task_struct *child, long request,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If process's system calls is traces, do some corresponding handles in this</div><div class='del'>- * function before entering system call function and after exiting system call</div><div class='del'>- * function.</div><div class='del'>- */</div><div class='del'>-asmlinkage void syscall_trace(int why, struct pt_regs *regs)</div><div class='add'>+asmlinkage void syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	long saved_why;</div><div class='del'>-	/*</div><div class='del'>-	 * Save saved_why, why is used to denote syscall entry/exit;</div><div class='del'>-	 * why = 0:entry, why = 1: exit</div><div class='del'>-	 */</div><div class='del'>-	saved_why = regs-&gt;regs[SYSTRACE_SAVENUM];</div><div class='del'>-	regs-&gt;regs[SYSTRACE_SAVENUM] = why;</div><div class='del'>-</div><div class='del'>-	ptrace_notify(SIGTRAP | ((current-&gt;ptrace &amp; PT_TRACESYSGOOD)</div><div class='del'>-					? 0x80 : 0));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this isn't the same as continuing with a signal, but it will do</div><div class='del'>-	 * for normal use.  strace only continues with a signal if the</div><div class='del'>-	 * stopping signal is not SIGTRAP.  -brl</div><div class='del'>-	 */</div><div class='del'>-	if (current-&gt;exit_code) {</div><div class='del'>-		send_sig(current-&gt;exit_code, current, 1);</div><div class='del'>-		current-&gt;exit_code = 0;</div><div class='del'>-	}</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		if (tracehook_report_syscall_entry(regs))</div><div class='add'>+			syscall_set_nr(current, regs, -1);</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))</div><div class='add'>+		trace_sys_enter(regs, syscall_get_nr(current, regs));</div><div class='add'>+</div><div class='add'>+	audit_syscall_entry(regs_syscallid(regs), regs-&gt;a0, regs-&gt;a1, regs-&gt;a2, regs-&gt;a3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void syscall_trace_exit(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		tracehook_report_syscall_exit(regs, 0);</div><div class='ctx'> </div><div class='del'>-	regs-&gt;regs[SYSTRACE_SAVENUM] = saved_why;</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))</div><div class='add'>+		trace_sys_exit(regs, syscall_get_return_value(current, regs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void show_stack(struct task_struct *task, unsigned long *stack);</div><div class='head'>diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c<br/>index dff8b89444ec..23ee604aafdb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/setup.c</a></div><div class='hunk'>@@ -142,18 +142,24 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void __init csky_start(unsigned int unused, void *param)</div><div class='add'>+unsigned long va_pa_offset;</div><div class='add'>+EXPORT_SYMBOL(va_pa_offset);</div><div class='add'>+</div><div class='add'>+asmlinkage __visible void __init csky_start(unsigned int unused,</div><div class='add'>+					    void *dtb_start)</div><div class='ctx'> {</div><div class='ctx'> 	/* Clean up bss section */</div><div class='ctx'> 	memset(__bss_start, 0, __bss_stop - __bss_start);</div><div class='ctx'> </div><div class='add'>+	va_pa_offset = read_mmu_msa0() &amp; ~(SSEG_SIZE - 1);</div><div class='add'>+</div><div class='ctx'> 	pre_trap_init();</div><div class='ctx'> 	pre_mmu_init();</div><div class='ctx'> </div><div class='del'>-	if (param == NULL)</div><div class='add'>+	if (dtb_start == NULL)</div><div class='ctx'> 		early_init_dt_scan(__dtb_start);</div><div class='ctx'> 	else</div><div class='del'>-		early_init_dt_scan(param);</div><div class='add'>+		early_init_dt_scan(dtb_start);</div><div class='ctx'> </div><div class='ctx'> 	start_kernel();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/csky/kernel/signal.c b/arch/csky/kernel/signal.c<br/>index 207a891479d2..04a43cfd4e09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/signal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/kernel/signal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/kernel/signal.c</a></div><div class='hunk'>@@ -1,26 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/unistd.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/highuid.h&gt;</div><div class='del'>-#include &lt;linux/personality.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='hunk'>@@ -29,110 +13,117 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_HAS_FPU</div><div class='ctx'> #include &lt;abi/fpu.h&gt;</div><div class='del'>-</div><div class='del'>-static int restore_fpu_state(struct sigcontext *sc)</div><div class='add'>+static int restore_fpu_state(struct sigcontext __user *sc)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct user_fp user_fp;</div><div class='ctx'> </div><div class='del'>-	err = copy_from_user(&amp;user_fp, &amp;sc-&gt;sc_user_fp, sizeof(user_fp));</div><div class='add'>+	err = __copy_from_user(&amp;user_fp, &amp;sc-&gt;sc_user_fp, sizeof(user_fp));</div><div class='ctx'> </div><div class='ctx'> 	restore_from_user_fp(&amp;user_fp);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int save_fpu_state(struct sigcontext *sc)</div><div class='add'>+static int save_fpu_state(struct sigcontext __user *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_fp user_fp;</div><div class='ctx'> </div><div class='ctx'> 	save_to_user_fp(&amp;user_fp);</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(&amp;sc-&gt;sc_user_fp, &amp;user_fp, sizeof(user_fp));</div><div class='add'>+	return __copy_to_user(&amp;sc-&gt;sc_user_fp, &amp;user_fp, sizeof(user_fp));</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline int restore_fpu_state(struct sigcontext *sc) { return 0; }</div><div class='del'>-static inline int save_fpu_state(struct sigcontext *sc) { return 0; }</div><div class='add'>+#define restore_fpu_state(sigcontext)	(0)</div><div class='add'>+#define save_fpu_state(sigcontext)	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe {</div><div class='del'>-	int sig;</div><div class='del'>-	struct siginfo *pinfo;</div><div class='del'>-	void *puc;</div><div class='ctx'> 	struct siginfo info;</div><div class='ctx'> 	struct ucontext uc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-restore_sigframe(struct pt_regs *regs,</div><div class='del'>-		 struct sigcontext *sc, int *pr2)</div><div class='add'>+static long restore_sigcontext(struct pt_regs *regs,</div><div class='add'>+	struct sigcontext __user *sc)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	/* Always make any pending restarted system calls return -EINTR */</div><div class='del'>-	current_thread_info()-&gt;task-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='del'>-</div><div class='del'>-	err |= copy_from_user(regs, &amp;sc-&gt;sc_pt_regs, sizeof(struct pt_regs));</div><div class='add'>+	/* sc_pt_regs is structured the same as the start of pt_regs */</div><div class='add'>+	err |= __copy_from_user(regs, &amp;sc-&gt;sc_pt_regs, sizeof(struct pt_regs));</div><div class='ctx'> </div><div class='add'>+	/* Restore the floating-point state. */</div><div class='ctx'> 	err |= restore_fpu_state(sc);</div><div class='ctx'> </div><div class='del'>-	*pr2 = regs-&gt;a0;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage int</div><div class='del'>-do_rt_sigreturn(void)</div><div class='add'>+SYSCALL_DEFINE0(rt_sigreturn)</div><div class='ctx'> {</div><div class='del'>-	sigset_t set;</div><div class='del'>-	int a0;</div><div class='ctx'> 	struct pt_regs *regs = current_pt_regs();</div><div class='del'>-	struct rt_sigframe *frame = (struct rt_sigframe *)(regs-&gt;usp);</div><div class='add'>+	struct rt_sigframe __user *frame;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	sigset_t set;</div><div class='add'>+</div><div class='add'>+	/* Always make any pending restarted system calls return -EINTR */</div><div class='add'>+	current-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='add'>+</div><div class='add'>+	frame = (struct rt_sigframe __user *)regs-&gt;usp;</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(frame, sizeof(*frame)))</div><div class='ctx'> 		goto badframe;</div><div class='add'>+</div><div class='ctx'> 	if (__copy_from_user(&amp;set, &amp;frame-&gt;uc.uc_sigmask, sizeof(set)))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='del'>-	sigdelsetmask(&amp;set, (sigmask(SIGKILL) | sigmask(SIGSTOP)));</div><div class='del'>-	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	current-&gt;blocked = set;</div><div class='del'>-	recalc_sigpending();</div><div class='del'>-	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+	set_current_blocked(&amp;set);</div><div class='ctx'> </div><div class='del'>-	if (restore_sigframe(regs, &amp;frame-&gt;uc.uc_mcontext, &amp;a0))</div><div class='add'>+	if (restore_sigcontext(regs, &amp;frame-&gt;uc.uc_mcontext))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='del'>-	return a0;</div><div class='add'>+	if (restore_altstack(&amp;frame-&gt;uc.uc_stack))</div><div class='add'>+		goto badframe;</div><div class='add'>+</div><div class='add'>+	return regs-&gt;a0;</div><div class='ctx'> </div><div class='ctx'> badframe:</div><div class='del'>-	force_sig(SIGSEGV, current);</div><div class='add'>+	task = current;</div><div class='add'>+	force_sig(SIGSEGV, task);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_sigframe(struct sigcontext *sc, struct pt_regs *regs)</div><div class='add'>+static int setup_sigcontext(struct rt_sigframe __user *frame,</div><div class='add'>+	struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	struct sigcontext __user *sc = &amp;frame-&gt;uc.uc_mcontext;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	err |= copy_to_user(&amp;sc-&gt;sc_pt_regs, regs, sizeof(struct pt_regs));</div><div class='add'>+	err |= __copy_to_user(&amp;sc-&gt;sc_pt_regs, regs, sizeof(struct pt_regs));</div><div class='ctx'> 	err |= save_fpu_state(sc);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *</div><div class='del'>-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='add'>+static inline void __user *get_sigframe(struct ksignal *ksig,</div><div class='add'>+	struct pt_regs *regs, size_t framesize)</div><div class='ctx'> {</div><div class='del'>-	unsigned long usp;</div><div class='add'>+	unsigned long sp;</div><div class='add'>+	/* Default to using normal stack */</div><div class='add'>+	sp = regs-&gt;usp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are on the alternate signal stack and would overflow it, don't.</div><div class='add'>+	 * Return an always-bogus address instead so we will die with SIGSEGV.</div><div class='add'>+	 */</div><div class='add'>+	if (on_sig_stack(sp) &amp;&amp; !likely(on_sig_stack(sp - framesize)))</div><div class='add'>+		return (void __user __force *)(-1UL);</div><div class='ctx'> </div><div class='del'>-	/* Default to using normal stack.  */</div><div class='del'>-	usp = regs-&gt;usp;</div><div class='add'>+	/* This is the X/Open sanctioned signal stack switching. */</div><div class='add'>+	sp = sigsp(sp, ksig) - framesize;</div><div class='ctx'> </div><div class='del'>-	/* This is the X/Open sanctioned signal stack switching.  */</div><div class='del'>-	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) &amp;&amp; !sas_ss_flags(usp)) {</div><div class='del'>-		if (!on_sig_stack(usp))</div><div class='del'>-			usp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='del'>-	}</div><div class='del'>-	return (void *)((usp - frame_size) &amp; -8UL);</div><div class='add'>+	/* Align the stack frame. */</div><div class='add'>+	sp &amp;= -8UL;</div><div class='add'>+</div><div class='add'>+	return (void __user *)sp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -140,205 +131,128 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt_sigframe *frame;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-</div><div class='ctx'> 	struct csky_vdso *vdso = current-&gt;mm-&gt;context.vdso;</div><div class='ctx'> </div><div class='del'>-	frame = get_sigframe(&amp;ksig-&gt;ka, regs, sizeof(*frame));</div><div class='del'>-	if (!frame)</div><div class='del'>-		return 1;</div><div class='add'>+	frame = get_sigframe(ksig, regs, sizeof(*frame));</div><div class='add'>+	if (!access_ok(frame, sizeof(*frame)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	err |= __put_user(ksig-&gt;sig, &amp;frame-&gt;sig);</div><div class='del'>-	err |= __put_user(&amp;frame-&gt;info, &amp;frame-&gt;pinfo);</div><div class='del'>-	err |= __put_user(&amp;frame-&gt;uc, &amp;frame-&gt;puc);</div><div class='ctx'> 	err |= copy_siginfo_to_user(&amp;frame-&gt;info, &amp;ksig-&gt;info);</div><div class='ctx'> </div><div class='del'>-	/* Create the ucontext.  */</div><div class='add'>+	/* Create the ucontext. */</div><div class='ctx'> 	err |= __put_user(0, &amp;frame-&gt;uc.uc_flags);</div><div class='del'>-	err |= __put_user(0, &amp;frame-&gt;uc.uc_link);</div><div class='del'>-	err |= __put_user((void *)current-&gt;sas_ss_sp,</div><div class='del'>-			&amp;frame-&gt;uc.uc_stack.ss_sp);</div><div class='del'>-	err |= __put_user(sas_ss_flags(regs-&gt;usp),</div><div class='del'>-			&amp;frame-&gt;uc.uc_stack.ss_flags);</div><div class='del'>-	err |= __put_user(current-&gt;sas_ss_size, &amp;frame-&gt;uc.uc_stack.ss_size);</div><div class='del'>-	err |= setup_sigframe(&amp;frame-&gt;uc.uc_mcontext, regs);</div><div class='del'>-	err |= copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='del'>-</div><div class='add'>+	err |= __put_user(NULL, &amp;frame-&gt;uc.uc_link);</div><div class='add'>+	err |= __save_altstack(&amp;frame-&gt;uc.uc_stack, regs-&gt;usp);</div><div class='add'>+	err |= setup_sigcontext(frame, regs);</div><div class='add'>+	err |= __copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto give_sigsegv;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	/* Set up registers for signal handler */</div><div class='del'>-	regs-&gt;usp = (unsigned long)frame;</div><div class='del'>-	regs-&gt;pc = (unsigned long)ksig-&gt;ka.sa.sa_handler;</div><div class='del'>-	regs-&gt;lr = (unsigned long)vdso-&gt;rt_signal_retcode;</div><div class='add'>+	/* Set up to return from userspace. */</div><div class='add'>+	regs-&gt;lr = (unsigned long)(vdso-&gt;rt_signal_retcode);</div><div class='ctx'> </div><div class='del'>-adjust_stack:</div><div class='del'>-	regs-&gt;a0 = ksig-&gt;sig; /* first arg is signo */</div><div class='del'>-	regs-&gt;a1 = (unsigned long)(&amp;(frame-&gt;info));</div><div class='del'>-	regs-&gt;a2 = (unsigned long)(&amp;(frame-&gt;uc));</div><div class='del'>-	return err;</div><div class='add'>+	/*</div><div class='add'>+	 * Set up registers for signal handler.</div><div class='add'>+	 * Registers that we don't modify keep the value they had from</div><div class='add'>+	 * user-space at the time we took the signal.</div><div class='add'>+	 * We always pass siginfo and mcontext, regardless of SA_SIGINFO,</div><div class='add'>+	 * since some things rely on this (e.g. glibc's debug/segfault.c).</div><div class='add'>+	 */</div><div class='add'>+	regs-&gt;pc  = (unsigned long)ksig-&gt;ka.sa.sa_handler;</div><div class='add'>+	regs-&gt;usp = (unsigned long)frame;</div><div class='add'>+	regs-&gt;a0  = ksig-&gt;sig;				/* a0: signal number */</div><div class='add'>+	regs-&gt;a1  = (unsigned long)(&amp;(frame-&gt;info));	/* a1: siginfo pointer */</div><div class='add'>+	regs-&gt;a2  = (unsigned long)(&amp;(frame-&gt;uc));	/* a2: ucontext pointer */</div><div class='ctx'> </div><div class='del'>-give_sigsegv:</div><div class='del'>-	if (ksig-&gt;sig == SIGSEGV)</div><div class='del'>-		ksig-&gt;ka.sa.sa_handler = SIG_DFL;</div><div class='del'>-	force_sig(SIGSEGV, current);</div><div class='del'>-	goto adjust_stack;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * OK, we're invoking a handler</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-handle_signal(struct ksignal *ksig, struct pt_regs *regs)</div><div class='add'>+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	sigset_t *oldset = sigmask_to_save();</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * set up the stack frame, regardless of SA_SIGINFO,</div><div class='del'>-	 * and pass info anyway.</div><div class='del'>-	 */</div><div class='del'>-	ret = setup_rt_frame(ksig, oldset, regs);</div><div class='add'>+	/* Are we from a system call? */</div><div class='add'>+	if (in_syscall(regs)) {</div><div class='add'>+		/* Avoid additional syscall restarting via ret_from_exception */</div><div class='add'>+		forget_syscall(regs);</div><div class='add'>+</div><div class='add'>+		/* If so, check system call restarting.. */</div><div class='add'>+		switch (regs-&gt;a0) {</div><div class='add'>+		case -ERESTART_RESTARTBLOCK:</div><div class='add'>+		case -ERESTARTNOHAND:</div><div class='add'>+			regs-&gt;a0 = -EINTR;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		force_sigsegv(ksig-&gt;sig, current);</div><div class='del'>-		return ret;</div><div class='add'>+		case -ERESTARTSYS:</div><div class='add'>+			if (!(ksig-&gt;ka.sa.sa_flags &amp; SA_RESTART)) {</div><div class='add'>+				regs-&gt;a0 = -EINTR;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* fallthrough */</div><div class='add'>+		case -ERESTARTNOINTR:</div><div class='add'>+			regs-&gt;a0 = regs-&gt;orig_a0;</div><div class='add'>+			regs-&gt;pc -= TRAP0_SIZE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Block the signal if we were successful. */</div><div class='del'>-	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	sigorsets(&amp;current-&gt;blocked, &amp;current-&gt;blocked, &amp;ksig-&gt;ka.sa.sa_mask);</div><div class='del'>-	if (!(ksig-&gt;ka.sa.sa_flags &amp; SA_NODEFER))</div><div class='del'>-		sigaddset(&amp;current-&gt;blocked, ksig-&gt;sig);</div><div class='del'>-	recalc_sigpending();</div><div class='del'>-	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+	/* Set up the stack frame */</div><div class='add'>+	ret = setup_rt_frame(ksig, oldset, regs);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	signal_setup_done(ret, ksig, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note that 'init' is a special process: it doesn't get signals it doesn't</div><div class='del'>- * want to handle. Thus you cannot kill init even with a SIGKILL even by</div><div class='del'>- * mistake.</div><div class='del'>- *</div><div class='del'>- * Note that we go through the signals twice: once to check the signals</div><div class='del'>- * that the kernel can handle, and then we build all the user-level signal</div><div class='del'>- * handling stack-frames in one go after that.</div><div class='del'>- */</div><div class='del'>-static void do_signal(struct pt_regs *regs, int syscall)</div><div class='add'>+static void do_signal(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	unsigned int retval = 0, continue_addr = 0, restart_addr = 0;</div><div class='ctx'> 	struct ksignal ksig;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We want the common case to go fast, which</div><div class='del'>-	 * is why we may in certain cases get here from</div><div class='del'>-	 * kernel mode. Just return without doing anything</div><div class='del'>-	 * if so.</div><div class='del'>-	 */</div><div class='del'>-	if (!user_mode(regs))</div><div class='add'>+	if (get_signal(&amp;ksig)) {</div><div class='add'>+		/* Actually deliver the signal */</div><div class='add'>+		handle_signal(&amp;ksig, regs);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If we were from a system call, check for system call restarting...</div><div class='del'>-	 */</div><div class='del'>-	if (syscall) {</div><div class='del'>-		continue_addr = regs-&gt;pc;</div><div class='del'>-#if defined(__CSKYABIV2__)</div><div class='del'>-		restart_addr = continue_addr - 4;</div><div class='del'>-#else</div><div class='del'>-		restart_addr = continue_addr - 2;</div><div class='del'>-#endif</div><div class='del'>-		retval = regs-&gt;a0;</div><div class='add'>+	/* Did we come from a system call? */</div><div class='add'>+	if (in_syscall(regs)) {</div><div class='add'>+		/* Avoid additional syscall restarting via ret_from_exception */</div><div class='add'>+		forget_syscall(regs);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Prepare for system call restart.  We do this here so that a</div><div class='del'>-		 * debugger will see the already changed.</div><div class='del'>-		 */</div><div class='del'>-		switch (retval) {</div><div class='add'>+		/* Restart the system call - no handlers present */</div><div class='add'>+		switch (regs-&gt;a0) {</div><div class='ctx'> 		case -ERESTARTNOHAND:</div><div class='ctx'> 		case -ERESTARTSYS:</div><div class='ctx'> 		case -ERESTARTNOINTR:</div><div class='ctx'> 			regs-&gt;a0 = regs-&gt;orig_a0;</div><div class='del'>-			regs-&gt;pc = restart_addr;</div><div class='add'>+			regs-&gt;pc -= TRAP0_SIZE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='del'>-			regs-&gt;a0 = -EINTR;</div><div class='add'>+			regs-&gt;a0 = regs-&gt;orig_a0;</div><div class='add'>+			regs_syscallid(regs) = __NR_restart_syscall;</div><div class='add'>+			regs-&gt;pc -= TRAP0_SIZE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (try_to_freeze())</div><div class='del'>-		goto no_signal;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Get the signal to deliver.  When running under ptrace, at this</div><div class='del'>-	 * point the debugger may change all our registers ...</div><div class='add'>+	 * If there is no signal to deliver, we just put the saved</div><div class='add'>+	 * sigmask back.</div><div class='ctx'> 	 */</div><div class='del'>-	if (get_signal(&amp;ksig)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Depending on the signal settings we may need to revert the</div><div class='del'>-		 * decision to restart the system call.  But skip this if a</div><div class='del'>-		 * debugger has chosen to restart at a different PC.</div><div class='del'>-		 */</div><div class='del'>-		if (regs-&gt;pc == restart_addr) {</div><div class='del'>-			if (retval == -ERESTARTNOHAND ||</div><div class='del'>-			    (retval == -ERESTARTSYS &amp;&amp;</div><div class='del'>-			     !(ksig.ka.sa.sa_flags &amp; SA_RESTART))) {</div><div class='del'>-				regs-&gt;a0 = -EINTR;</div><div class='del'>-				regs-&gt;pc = continue_addr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Whee!  Actually deliver the signal.  */</div><div class='del'>-		if (handle_signal(&amp;ksig, regs) == 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * A signal was successfully delivered; the saved</div><div class='del'>-			 * sigmask will have been stored in the signal frame,</div><div class='del'>-			 * and will be restored by sigreturn, so we can simply</div><div class='del'>-			 * clear the TIF_RESTORE_SIGMASK flag.</div><div class='del'>-			 */</div><div class='del'>-			if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='del'>-				clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-no_signal:</div><div class='del'>-	if (syscall) {</div><div class='del'>-		/*</div><div class='del'>-		 * Handle restarting a different system call.  As above,</div><div class='del'>-		 * if a debugger has chosen to restart at a different PC,</div><div class='del'>-		 * ignore the restart.</div><div class='del'>-		 */</div><div class='del'>-		if (retval == -ERESTART_RESTARTBLOCK</div><div class='del'>-				&amp;&amp; regs-&gt;pc == continue_addr) {</div><div class='del'>-#if defined(__CSKYABIV2__)</div><div class='del'>-			regs-&gt;regs[3] = __NR_restart_syscall;</div><div class='del'>-			regs-&gt;pc -= 4;</div><div class='del'>-#else</div><div class='del'>-			regs-&gt;regs[9] = __NR_restart_syscall;</div><div class='del'>-			regs-&gt;pc -= 2;</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If there's no signal to deliver, we just put the saved</div><div class='del'>-		 * sigmask back.</div><div class='del'>-		 */</div><div class='del'>-		if (test_thread_flag(TIF_RESTORE_SIGMASK)) {</div><div class='del'>-			clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='del'>-			sigprocmask(SIG_SETMASK, &amp;current-&gt;saved_sigmask, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	restore_saved_sigmask();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage void</div><div class='del'>-do_notify_resume(unsigned int thread_flags, struct pt_regs *regs, int syscall)</div><div class='add'>+/*</div><div class='add'>+ * notification of userspace execution resumption</div><div class='add'>+ * - triggered by the _TIF_WORK_MASK flags</div><div class='add'>+ */</div><div class='add'>+asmlinkage void do_notify_resume(struct pt_regs *regs,</div><div class='add'>+	unsigned long thread_info_flags)</div><div class='ctx'> {</div><div class='del'>-	if (thread_flags &amp; _TIF_SIGPENDING)</div><div class='del'>-		do_signal(regs, syscall);</div><div class='add'>+	/* Handle pending signal delivery */</div><div class='add'>+	if (thread_info_flags &amp; _TIF_SIGPENDING)</div><div class='add'>+		do_signal(regs);</div><div class='ctx'> </div><div class='del'>-	if (thread_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='add'>+	if (thread_info_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='ctx'> 		clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='ctx'> 		tracehook_notify_resume(regs);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c<br/>index d6f4b66b93e2..18041f46ded1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/mm/fault.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/csky/mm/fault.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/csky/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/csky/mm/fault.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardirq.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -82,7 +82,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,</div><div class='ctx'> </div><div class='ctx'> 		unsigned long pgd_base;</div><div class='ctx'> </div><div class='del'>-		pgd_base = tlb_get_pgd();</div><div class='add'>+		pgd_base = (unsigned long)__va(get_pgd());</div><div class='ctx'> 		pgd = (pgd_t *)pgd_base + offset;</div><div class='ctx'> 		pgd_k = init_mm.pgd + offset;</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +107,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we're in an interrupt or have no user</div><div class='ctx'> 	 * context, we must not take the fault..</div><div class='hunk'>@@ -154,10 +156,15 @@ good_area:</div><div class='ctx'> 			goto bad_area;</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='del'>-	if (fault &amp; VM_FAULT_MAJOR)</div><div class='add'>+	if (fault &amp; VM_FAULT_MAJOR) {</div><div class='ctx'> 		tsk-&gt;maj_flt++;</div><div class='del'>-	else</div><div class='add'>+		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs,</div><div class='add'>+			      address);</div><div class='add'>+	} else {</div><div class='ctx'> 		tsk-&gt;min_flt++;</div><div class='add'>+		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs,</div><div class='add'>+			      address);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	up_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	return;</div><div class='head'>diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig<br/>index c071da34e081..61c01db6c292 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/h8300/Kconfig</a></div><div class='hunk'>@@ -27,9 +27,6 @@ config H8300</div><div class='ctx'> config CPU_BIG_ENDIAN</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild<br/>index 3e7c8ecf151e..123d8f54be4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/h8300/include/asm/Kbuild</a></div><div class='hunk'>@@ -23,11 +23,13 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += linkage.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += mmu.h</div><div class='ctx'> generic-y += mmu_context.h</div><div class='ctx'> generic-y += module.h</div><div class='head'>diff --git a/arch/h8300/include/asm/syscall.h b/arch/h8300/include/asm/syscall.h<br/>index 924990401237..01666b8bb263 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/h8300/include/asm/syscall.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> syscall_get_nr(struct task_struct *task, struct pt_regs *regs)</div><div class='hunk'>@@ -17,36 +18,21 @@ syscall_get_nr(struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		      unsigned int i, unsigned int n, unsigned long *args)</div><div class='add'>+		      unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-</div><div class='del'>-	while (n &gt; 0) {</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:</div><div class='del'>-			*args++ = regs-&gt;er1;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			*args++ = regs-&gt;er2;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			*args++ = regs-&gt;er3;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			*args++ = regs-&gt;er4;</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			*args++ = regs-&gt;er5;</div><div class='del'>-			break;</div><div class='del'>-		case 5:</div><div class='del'>-			*args++ = regs-&gt;er6;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='add'>+	*args++ = regs-&gt;er1;</div><div class='add'>+	*args++ = regs-&gt;er2;</div><div class='add'>+	*args++ = regs-&gt;er3;</div><div class='add'>+	*args++ = regs-&gt;er4;</div><div class='add'>+	*args++ = regs-&gt;er5;</div><div class='add'>+	*args   = regs-&gt;er6;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return AUDIT_ARCH_H8300;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Misc syscall related bits */</div><div class='head'>diff --git a/arch/h8300/include/asm/tlb.h b/arch/h8300/include/asm/tlb.h<br/>index 98f344279904..d8201ca31206 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/h8300/include/asm/tlb.h</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> #ifndef __H8300_TLB_H__</div><div class='ctx'> #define __H8300_TLB_H__</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb)	do { } while (0)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild<br/>index 755bb11323d8..1c72f04ff75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/h8300/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/h8300/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/h8300/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig<br/>index ac441680dcc0..3e54a53208d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/hexagon/Kconfig</a></div><div class='hunk'>@@ -65,12 +65,6 @@ config GENERIC_CSUM</div><div class='ctx'> config GENERIC_IRQ_PROBE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild<br/>index b25fd42aa0f4..6234a303d2a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/hexagon/include/asm/Kbuild</a></div><div class='hunk'>@@ -19,14 +19,15 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += sections.h</div><div class='ctx'> generic-y += segment.h</div><div class='ctx'> generic-y += serial.h</div><div class='head'>diff --git a/arch/hexagon/include/asm/elf.h b/arch/hexagon/include/asm/elf.h<br/>index 80311e7b8ca6..d10fbd54ae51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/elf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/elf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/hexagon/include/asm/elf.h</a></div><div class='hunk'>@@ -23,11 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/user.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This should really be in linux/elf-em.h.</div><div class='del'>- */</div><div class='del'>-#define EM_HEXAGON	164   /* QUALCOMM Hexagon */</div><div class='add'>+#include &lt;linux/elf-em.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct elf32_hdr;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h<br/>index e17262ad125e..3d0ae09c2b8e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/hexagon/include/asm/io.h</a></div><div class='hunk'>@@ -184,8 +184,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)</div><div class='ctx'> #define writew_relaxed __raw_writew</div><div class='ctx'> #define writel_relaxed __raw_writel</div><div class='ctx'> </div><div class='del'>-#define mmiowb()</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Need an mtype somewhere in here, for cache type deals?</div><div class='ctx'>  * This is probably too long for an inline.</div><div class='head'>diff --git a/arch/hexagon/include/asm/syscall.h b/arch/hexagon/include/asm/syscall.h<br/>index 4af9c7b6f13a..dab26a71f577 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/hexagon/include/asm/syscall.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> #ifndef _ASM_HEXAGON_SYSCALL_H</div><div class='ctx'> #define _ASM_HEXAGON_SYSCALL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='add'>+</div><div class='ctx'> typedef long (*syscall_fn)(unsigned long, unsigned long,</div><div class='ctx'> 	unsigned long, unsigned long,</div><div class='ctx'> 	unsigned long, unsigned long);</div><div class='hunk'>@@ -37,10 +39,14 @@ static inline long syscall_get_nr(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	memcpy(args, &amp;(&amp;regs-&gt;r00)[i], n * sizeof(args[0]));</div><div class='add'>+	memcpy(args, &amp;(&amp;regs-&gt;r00)[0], 6 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return AUDIT_ARCH_HEXAGON;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/hexagon/include/asm/tlb.h b/arch/hexagon/include/asm/tlb.h<br/>index 2f00772cc08a..f71c4ba83614 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/hexagon/include/asm/tlb.h</a></div><div class='hunk'>@@ -22,18 +22,6 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We don't need any special per-pte or per-vma handling...</div><div class='del'>- */</div><div class='del'>-#define tlb_start_vma(tlb, vma)				do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)				do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * .. because we flush the whole mm when it fills up</div><div class='del'>- */</div><div class='del'>-#define tlb_flush(tlb)		flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/hexagon/include/uapi/asm/kvm_para.h b/arch/hexagon/include/uapi/asm/kvm_para.h<br/>deleted file mode 100644<br/>index baacc4996d18..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/hexagon/include/uapi/asm/kvm_para.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/hexagon/include/uapi/asm/kvm_para.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#include &lt;asm-generic/kvm_para.h&gt;</div><div class='head'>diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig<br/>index 8d7396bd1790..73a26f04644e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/Kconfig</a></div><div class='hunk'>@@ -83,10 +83,6 @@ config STACKTRACE_SUPPORT</div><div class='ctx'> config GENERIC_LOCKBREAK</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config HUGETLB_PAGE_SIZE_VARIABLE</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on HUGETLB_PAGE</div><div class='head'>diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild<br/>index 43e21fe3499c..11f191689c9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,6 +2,7 @@ generated-y += syscall_table.h</div><div class='ctx'> generic-y += compat.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += preempt.h</div><div class='head'>diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h<br/>index 1e6fef69bb01..a511d62d447a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/io.h</a></div><div class='hunk'>@@ -113,20 +113,6 @@ extern int valid_mmap_phys_addr_range (unsigned long pfn, size_t count);</div><div class='ctx'>  */</div><div class='ctx'> #define __ia64_mf_a()	ia64_mfa()</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * ___ia64_mmiowb - I/O write barrier</div><div class='del'>- *</div><div class='del'>- * Ensure ordering of I/O space writes.  This will make sure that writes</div><div class='del'>- * following the barrier will arrive after all previous writes.  For most</div><div class='del'>- * ia64 platforms, this is a simple 'mf.a' instruction.</div><div class='del'>- *</div><div class='del'>- * See Documentation/driver-api/device-io.rst for more information.</div><div class='del'>- */</div><div class='del'>-static inline void ___ia64_mmiowb(void)</div><div class='del'>-{</div><div class='del'>-	ia64_mfa();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void*</div><div class='ctx'> __ia64_mk_io_addr (unsigned long port)</div><div class='ctx'> {</div><div class='hunk'>@@ -161,7 +147,6 @@ __ia64_mk_io_addr (unsigned long port)</div><div class='ctx'> #define __ia64_writew	___ia64_writew</div><div class='ctx'> #define __ia64_writel	___ia64_writel</div><div class='ctx'> #define __ia64_writeq	___ia64_writeq</div><div class='del'>-#define __ia64_mmiowb	___ia64_mmiowb</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For the in/out routines, we need to do "mf.a" _after_ doing the I/O access to ensure</div><div class='hunk'>@@ -296,7 +281,6 @@ __outsl (unsigned long port, const void *src, unsigned long count)</div><div class='ctx'> #define __outb		platform_outb</div><div class='ctx'> #define __outw		platform_outw</div><div class='ctx'> #define __outl		platform_outl</div><div class='del'>-#define __mmiowb	platform_mmiowb</div><div class='ctx'> </div><div class='ctx'> #define inb(p)		__inb(p)</div><div class='ctx'> #define inw(p)		__inw(p)</div><div class='hunk'>@@ -310,7 +294,6 @@ __outsl (unsigned long port, const void *src, unsigned long count)</div><div class='ctx'> #define outsb(p,s,c)	__outsb(p,s,c)</div><div class='ctx'> #define outsw(p,s,c)	__outsw(p,s,c)</div><div class='ctx'> #define outsl(p,s,c)	__outsl(p,s,c)</div><div class='del'>-#define mmiowb()	__mmiowb()</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The address passed to these functions are ioremap()ped already.</div><div class='head'>diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h<br/>index 5133739966bc..beae261fbcb4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/machvec.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/machvec.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/machvec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/machvec.h</a></div><div class='hunk'>@@ -30,7 +30,6 @@ typedef void ia64_mv_irq_init_t (void);</div><div class='ctx'> typedef void ia64_mv_send_ipi_t (int, int, int, int);</div><div class='ctx'> typedef void ia64_mv_timer_interrupt_t (int, void *);</div><div class='ctx'> typedef void ia64_mv_global_tlb_purge_t (struct mm_struct *, unsigned long, unsigned long, unsigned long);</div><div class='del'>-typedef void ia64_mv_tlb_migrate_finish_t (struct mm_struct *);</div><div class='ctx'> typedef u8 ia64_mv_irq_to_vector (int);</div><div class='ctx'> typedef unsigned int ia64_mv_local_vector_to_irq (u8);</div><div class='ctx'> typedef char *ia64_mv_pci_get_legacy_mem_t (struct pci_bus *);</div><div class='hunk'>@@ -80,11 +79,6 @@ machvec_noop (void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-machvec_noop_mm (struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='ctx'> machvec_noop_task (struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -96,7 +90,6 @@ machvec_noop_bus (struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> extern void machvec_setup (char **);</div><div class='ctx'> extern void machvec_timer_interrupt (int, void *);</div><div class='del'>-extern void machvec_tlb_migrate_finish (struct mm_struct *);</div><div class='ctx'> </div><div class='ctx'> # if defined (CONFIG_IA64_HP_SIM)</div><div class='ctx'> #  include &lt;asm/machvec_hpsim.h&gt;</div><div class='hunk'>@@ -124,7 +117,6 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);</div><div class='ctx'> #  define platform_send_ipi	ia64_mv.send_ipi</div><div class='ctx'> #  define platform_timer_interrupt	ia64_mv.timer_interrupt</div><div class='ctx'> #  define platform_global_tlb_purge	ia64_mv.global_tlb_purge</div><div class='del'>-#  define platform_tlb_migrate_finish	ia64_mv.tlb_migrate_finish</div><div class='ctx'> #  define platform_dma_init		ia64_mv.dma_init</div><div class='ctx'> #  define platform_dma_get_ops		ia64_mv.dma_get_ops</div><div class='ctx'> #  define platform_irq_to_vector	ia64_mv.irq_to_vector</div><div class='hunk'>@@ -167,7 +159,6 @@ struct ia64_machine_vector {</div><div class='ctx'> 	ia64_mv_send_ipi_t *send_ipi;</div><div class='ctx'> 	ia64_mv_timer_interrupt_t *timer_interrupt;</div><div class='ctx'> 	ia64_mv_global_tlb_purge_t *global_tlb_purge;</div><div class='del'>-	ia64_mv_tlb_migrate_finish_t *tlb_migrate_finish;</div><div class='ctx'> 	ia64_mv_dma_init *dma_init;</div><div class='ctx'> 	ia64_mv_dma_get_ops *dma_get_ops;</div><div class='ctx'> 	ia64_mv_irq_to_vector *irq_to_vector;</div><div class='hunk'>@@ -206,7 +197,6 @@ struct ia64_machine_vector {</div><div class='ctx'> 	platform_send_ipi,			\</div><div class='ctx'> 	platform_timer_interrupt,		\</div><div class='ctx'> 	platform_global_tlb_purge,		\</div><div class='del'>-	platform_tlb_migrate_finish,		\</div><div class='ctx'> 	platform_dma_init,			\</div><div class='ctx'> 	platform_dma_get_ops,			\</div><div class='ctx'> 	platform_irq_to_vector,			\</div><div class='hunk'>@@ -270,9 +260,6 @@ extern const struct dma_map_ops *dma_get_ops(struct device *);</div><div class='ctx'> #ifndef platform_global_tlb_purge</div><div class='ctx'> # define platform_global_tlb_purge	ia64_global_tlb_purge /* default to architected version */</div><div class='ctx'> #endif</div><div class='del'>-#ifndef platform_tlb_migrate_finish</div><div class='del'>-# define platform_tlb_migrate_finish	machvec_noop_mm</div><div class='del'>-#endif</div><div class='ctx'> #ifndef platform_kernel_launch_event</div><div class='ctx'> # define platform_kernel_launch_event	machvec_noop</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/ia64/include/asm/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h<br/>index b5153d300289..a243e4fb4877 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/machvec_sn2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/machvec_sn2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/machvec_sn2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/machvec_sn2.h</a></div><div class='hunk'>@@ -34,7 +34,6 @@ extern ia64_mv_irq_init_t sn_irq_init;</div><div class='ctx'> extern ia64_mv_send_ipi_t sn2_send_IPI;</div><div class='ctx'> extern ia64_mv_timer_interrupt_t sn_timer_interrupt;</div><div class='ctx'> extern ia64_mv_global_tlb_purge_t sn2_global_tlb_purge;</div><div class='del'>-extern ia64_mv_tlb_migrate_finish_t	sn_tlb_migrate_finish;</div><div class='ctx'> extern ia64_mv_irq_to_vector sn_irq_to_vector;</div><div class='ctx'> extern ia64_mv_local_vector_to_irq sn_local_vector_to_irq;</div><div class='ctx'> extern ia64_mv_pci_get_legacy_mem_t sn_pci_get_legacy_mem;</div><div class='hunk'>@@ -77,7 +76,6 @@ extern ia64_mv_pci_fixup_bus_t		sn_pci_fixup_bus;</div><div class='ctx'> #define platform_send_ipi		sn2_send_IPI</div><div class='ctx'> #define platform_timer_interrupt	sn_timer_interrupt</div><div class='ctx'> #define platform_global_tlb_purge       sn2_global_tlb_purge</div><div class='del'>-#define platform_tlb_migrate_finish	sn_tlb_migrate_finish</div><div class='ctx'> #define platform_pci_fixup		sn_pci_fixup</div><div class='ctx'> #define platform_inb			__sn_inb</div><div class='ctx'> #define platform_inw			__sn_inw</div><div class='head'>diff --git a/arch/ia64/include/asm/mmiowb.h b/arch/ia64/include/asm/mmiowb.h<br/>new file mode 100644<br/>index 000000000000..297b85ac84a0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/mmiowb.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_IA64_MMIOWB_H</div><div class='add'>+#define _ASM_IA64_MMIOWB_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/machvec.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ___ia64_mmiowb - I/O write barrier</div><div class='add'>+ *</div><div class='add'>+ * Ensure ordering of I/O space writes.  This will make sure that writes</div><div class='add'>+ * following the barrier will arrive after all previous writes.  For most</div><div class='add'>+ * ia64 platforms, this is a simple 'mf.a' instruction.</div><div class='add'>+ */</div><div class='add'>+static inline void ___ia64_mmiowb(void)</div><div class='add'>+{</div><div class='add'>+	ia64_mfa();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __ia64_mmiowb	___ia64_mmiowb</div><div class='add'>+#define mmiowb()	platform_mmiowb()</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/mmiowb.h&gt;</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_IA64_MMIOWB_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h<br/>deleted file mode 100644<br/>index 917910607e0e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/rwsem.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/rwsem.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'>- * R/W semaphores for ia64</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2003 Ken Chen &lt;kenneth.w.chen@intel.com&gt;</div><div class='del'>- * Copyright (C) 2003 Asit Mallick &lt;asit.k.mallick@intel.com&gt;</div><div class='del'>- * Copyright (C) 2005 Christoph Lameter &lt;cl@linux.com&gt;</div><div class='del'>- *</div><div class='del'>- * Based on asm-i386/rwsem.h and other architecture implementation.</div><div class='del'>- *</div><div class='del'>- * The MSW of the count is the negated number of active writers and</div><div class='del'>- * waiting lockers, and the LSW is the total number of active locks.</div><div class='del'>- *</div><div class='del'>- * The lock count is initialized to 0 (no active and no waiting lockers).</div><div class='del'>- *</div><div class='del'>- * When a writer subtracts WRITE_BIAS, it'll get 0xffffffff00000001 for</div><div class='del'>- * the case of an uncontended lock. Readers increment by 1 and see a positive</div><div class='del'>- * value when uncontended, negative if there are writers (and maybe) readers</div><div class='del'>- * waiting (in which case it goes to sleep).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_IA64_RWSEM_H</div><div class='del'>-#define _ASM_IA64_RWSEM_H</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_RWSEM_H</div><div class='del'>-#error "Please don't include &lt;asm/rwsem.h&gt; directly, use &lt;linux/rwsem.h&gt; instead."</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;asm/intrinsics.h&gt;</div><div class='del'>-</div><div class='del'>-#define RWSEM_UNLOCKED_VALUE		__IA64_UL_CONST(0x0000000000000000)</div><div class='del'>-#define RWSEM_ACTIVE_BIAS		(1L)</div><div class='del'>-#define RWSEM_ACTIVE_MASK		(0xffffffffL)</div><div class='del'>-#define RWSEM_WAITING_BIAS		(-0x100000000L)</div><div class='del'>-#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS</div><div class='del'>-#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * lock for reading</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-___down_read (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long result = ia64_fetchadd8_acq((unsigned long *)&amp;sem-&gt;count.counter, 1);</div><div class='del'>-</div><div class='del'>-	return (result &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__down_read (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (___down_read(sem))</div><div class='del'>-		rwsem_down_read_failed(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-__down_read_killable (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (___down_read(sem))</div><div class='del'>-		if (IS_ERR(rwsem_down_read_failed_killable(sem)))</div><div class='del'>-			return -EINTR;</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'>- * lock for writing</div><div class='del'>- */</div><div class='del'>-static inline long</div><div class='del'>-___down_write (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long old, new;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = atomic_long_read(&amp;sem-&gt;count);</div><div class='del'>-		new = old + RWSEM_ACTIVE_WRITE_BIAS;</div><div class='del'>-	} while (atomic_long_cmpxchg_acquire(&amp;sem-&gt;count, old, new) != old);</div><div class='del'>-</div><div class='del'>-	return old;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__down_write (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (___down_write(sem))</div><div class='del'>-		rwsem_down_write_failed(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-__down_write_killable (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (___down_write(sem)) {</div><div class='del'>-		if (IS_ERR(rwsem_down_write_failed_killable(sem)))</div><div class='del'>-			return -EINTR;</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'>- * unlock after reading</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__up_read (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long result = ia64_fetchadd8_rel((unsigned long *)&amp;sem-&gt;count.counter, -1);</div><div class='del'>-</div><div class='del'>-	if (result &lt; 0 &amp;&amp; (--result &amp; RWSEM_ACTIVE_MASK) == 0)</div><div class='del'>-		rwsem_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unlock after writing</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__up_write (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long old, new;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = atomic_long_read(&amp;sem-&gt;count);</div><div class='del'>-		new = old - RWSEM_ACTIVE_WRITE_BIAS;</div><div class='del'>-	} while (atomic_long_cmpxchg_release(&amp;sem-&gt;count, old, new) != old);</div><div class='del'>-</div><div class='del'>-	if (new &lt; 0 &amp;&amp; (new &amp; RWSEM_ACTIVE_MASK) == 0)</div><div class='del'>-		rwsem_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * trylock for reading -- returns 1 if successful, 0 if contention</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__down_read_trylock (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long tmp;</div><div class='del'>-	while ((tmp = atomic_long_read(&amp;sem-&gt;count)) &gt;= 0) {</div><div class='del'>-		if (tmp == atomic_long_cmpxchg_acquire(&amp;sem-&gt;count, tmp, tmp+1)) {</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'>- * trylock for writing -- returns 1 if successful, 0 if contention</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__down_write_trylock (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long tmp = atomic_long_cmpxchg_acquire(&amp;sem-&gt;count,</div><div class='del'>-			RWSEM_UNLOCKED_VALUE, RWSEM_ACTIVE_WRITE_BIAS);</div><div class='del'>-	return tmp == RWSEM_UNLOCKED_VALUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * downgrade write lock to read lock</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__downgrade_write (struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long old, new;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = atomic_long_read(&amp;sem-&gt;count);</div><div class='del'>-		new = old - RWSEM_WAITING_BIAS;</div><div class='del'>-	} while (atomic_long_cmpxchg_release(&amp;sem-&gt;count, old, new) != old);</div><div class='del'>-</div><div class='del'>-	if (old &lt; 0)</div><div class='del'>-		rwsem_downgrade_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_IA64_RWSEM_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h<br/>index afd0b3121b4c..5f620e66384e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/spinlock.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/spinlock.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/spinlock.h</a></div><div class='hunk'>@@ -73,6 +73,8 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short	*p = (unsigned short *)&amp;lock-&gt;lock + 1, tmp;</div><div class='ctx'> </div><div class='add'>+	/* This could be optimised with ARCH_HAS_MMIOWB */</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));</div><div class='ctx'> 	WRITE_ONCE(*p, (tmp + 2) &amp; ~1);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/include/asm/syscall.h b/arch/ia64/include/asm/syscall.h<br/>index 1d0b875fec44..da108cd45174 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/syscall.h</a></div><div class='hunk'>@@ -59,29 +59,22 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void ia64_syscall_get_set_arguments(struct task_struct *task,</div><div class='del'>-	struct pt_regs *regs, unsigned int i, unsigned int n,</div><div class='del'>-	unsigned long *args, int rw);</div><div class='add'>+	struct pt_regs *regs, unsigned long *args, int rw);</div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-</div><div class='del'>-	ia64_syscall_get_set_arguments(task, regs, i, n, args, 0);</div><div class='add'>+	ia64_syscall_get_set_arguments(task, regs, args, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-</div><div class='del'>-	ia64_syscall_get_set_arguments(task, regs, i, n, args, 1);</div><div class='add'>+	ia64_syscall_get_set_arguments(task, regs, args, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_IA64;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h<br/>index 516355a774bf..86ec034ba499 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/tlb.h</a></div><div class='hunk'>@@ -47,263 +47,6 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If we can't allocate a page to make a big batch of page pointers</div><div class='del'>- * to work on, then just handle a few from the on-stack structure.</div><div class='del'>- */</div><div class='del'>-#define	IA64_GATHER_BUNDLE	8</div><div class='del'>-</div><div class='del'>-struct mmu_gather {</div><div class='del'>-	struct mm_struct	*mm;</div><div class='del'>-	unsigned int		nr;</div><div class='del'>-	unsigned int		max;</div><div class='del'>-	unsigned char		fullmm;		/* non-zero means full mm flush */</div><div class='del'>-	unsigned char		need_flush;	/* really unmapped some PTEs? */</div><div class='del'>-	unsigned long		start, end;</div><div class='del'>-	unsigned long		start_addr;</div><div class='del'>-	unsigned long		end_addr;</div><div class='del'>-	struct page		**pages;</div><div class='del'>-	struct page		*local[IA64_GATHER_BUNDLE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ia64_tr_entry {</div><div class='del'>-	u64 ifa;</div><div class='del'>-	u64 itir;</div><div class='del'>-	u64 pte;</div><div class='del'>-	u64 rr;</div><div class='del'>-}; /*Record for tr entry!*/</div><div class='del'>-</div><div class='del'>-extern int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size);</div><div class='del'>-extern void ia64_ptr_entry(u64 target_mask, int slot);</div><div class='del'>-</div><div class='del'>-extern struct ia64_tr_entry *ia64_idtrs[NR_CPUS];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- region register macros</div><div class='del'>-*/</div><div class='del'>-#define RR_TO_VE(val)   (((val) &gt;&gt; 0) &amp; 0x0000000000000001)</div><div class='del'>-#define RR_VE(val)	(((val) &amp; 0x0000000000000001) &lt;&lt; 0)</div><div class='del'>-#define RR_VE_MASK	0x0000000000000001L</div><div class='del'>-#define RR_VE_SHIFT	0</div><div class='del'>-#define RR_TO_PS(val)	(((val) &gt;&gt; 2) &amp; 0x000000000000003f)</div><div class='del'>-#define RR_PS(val)	(((val) &amp; 0x000000000000003f) &lt;&lt; 2)</div><div class='del'>-#define RR_PS_MASK	0x00000000000000fcL</div><div class='del'>-#define RR_PS_SHIFT	2</div><div class='del'>-#define RR_RID_MASK	0x00000000ffffff00L</div><div class='del'>-#define RR_TO_RID(val) 	((val &gt;&gt; 8) &amp; 0xffffff)</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-ia64_tlb_flush_mmu_tlbonly(struct mmu_gather *tlb, unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;need_flush = 0;</div><div class='del'>-</div><div class='del'>-	if (tlb-&gt;fullmm) {</div><div class='del'>-		/*</div><div class='del'>-		 * Tearing down the entire address space.  This happens both as a result</div><div class='del'>-		 * of exit() and execve().  The latter case necessitates the call to</div><div class='del'>-		 * flush_tlb_mm() here.</div><div class='del'>-		 */</div><div class='del'>-		flush_tlb_mm(tlb-&gt;mm);</div><div class='del'>-	} else if (unlikely (end - start &gt;= 1024*1024*1024*1024UL</div><div class='del'>-			     || REGION_NUMBER(start) != REGION_NUMBER(end - 1)))</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * If we flush more than a tera-byte or across regions, we're probably</div><div class='del'>-		 * better off just flushing the entire TLB(s).  This should be very rare</div><div class='del'>-		 * and is not worth optimizing for.</div><div class='del'>-		 */</div><div class='del'>-		flush_tlb_all();</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * flush_tlb_range() takes a vma instead of a mm pointer because</div><div class='del'>-		 * some architectures want the vm_flags for ITLB/DTLB flush.</div><div class='del'>-		 */</div><div class='del'>-		struct vm_area_struct vma = TLB_FLUSH_VMA(tlb-&gt;mm, 0);</div><div class='del'>-</div><div class='del'>-		/* flush the address range from the tlb: */</div><div class='del'>-		flush_tlb_range(&amp;vma, start, end);</div><div class='del'>-		/* now flush the virt. page-table area mapping the address range: */</div><div class='del'>-		flush_tlb_range(&amp;vma, ia64_thash(start), ia64_thash(end));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-ia64_tlb_flush_mmu_free(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	unsigned long i;</div><div class='del'>-	unsigned int nr;</div><div class='del'>-</div><div class='del'>-	/* lastly, release the freed pages */</div><div class='del'>-	nr = tlb-&gt;nr;</div><div class='del'>-</div><div class='del'>-	tlb-&gt;nr = 0;</div><div class='del'>-	tlb-&gt;start_addr = ~0UL;</div><div class='del'>-	for (i = 0; i &lt; nr; ++i)</div><div class='del'>-		free_page_and_swap_cache(tlb-&gt;pages[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flush the TLB for address range START to END and, if not in fast mode, release the</div><div class='del'>- * freed pages that where gathered up to this point.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-ia64_tlb_flush_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;need_flush)</div><div class='del'>-		return;</div><div class='del'>-	ia64_tlb_flush_mmu_tlbonly(tlb, start, end);</div><div class='del'>-	ia64_tlb_flush_mmu_free(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __tlb_alloc_page(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	unsigned long addr = __get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);</div><div class='del'>-</div><div class='del'>-	if (addr) {</div><div class='del'>-		tlb-&gt;pages = (void *)addr;</div><div class='del'>-		tlb-&gt;max = PAGE_SIZE / sizeof(void *);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,</div><div class='del'>-			unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;mm = mm;</div><div class='del'>-	tlb-&gt;max = ARRAY_SIZE(tlb-&gt;local);</div><div class='del'>-	tlb-&gt;pages = tlb-&gt;local;</div><div class='del'>-	tlb-&gt;nr = 0;</div><div class='del'>-	tlb-&gt;fullmm = !(start | (end+1));</div><div class='del'>-	tlb-&gt;start = start;</div><div class='del'>-	tlb-&gt;end = end;</div><div class='del'>-	tlb-&gt;start_addr = ~0UL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called at the end of the shootdown operation to free up any resources that were</div><div class='del'>- * collected.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_finish_mmu(struct mmu_gather *tlb,</div><div class='del'>-			unsigned long start, unsigned long end, bool force)</div><div class='del'>-{</div><div class='del'>-	if (force)</div><div class='del'>-		tlb-&gt;need_flush = 1;</div><div class='del'>-	/*</div><div class='del'>-	 * Note: tlb-&gt;nr may be 0 at this point, so we can't rely on tlb-&gt;start_addr and</div><div class='del'>-	 * tlb-&gt;end_addr.</div><div class='del'>-	 */</div><div class='del'>-	ia64_tlb_flush_mmu(tlb, start, end);</div><div class='del'>-</div><div class='del'>-	/* keep the page table cache within bounds */</div><div class='del'>-	check_pgt_cache();</div><div class='del'>-</div><div class='del'>-	if (tlb-&gt;pages != tlb-&gt;local)</div><div class='del'>-		free_pages((unsigned long)tlb-&gt;pages, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Logically, this routine frees PAGE.  On MP machines, the actual freeing of the page</div><div class='del'>- * must be delayed until after the TLB has been flushed (see comments at the beginning of</div><div class='del'>- * this file).</div><div class='del'>- */</div><div class='del'>-static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;need_flush = 1;</div><div class='del'>-</div><div class='del'>-	if (!tlb-&gt;nr &amp;&amp; tlb-&gt;pages == tlb-&gt;local)</div><div class='del'>-		__tlb_alloc_page(tlb);</div><div class='del'>-</div><div class='del'>-	tlb-&gt;pages[tlb-&gt;nr++] = page;</div><div class='del'>-	VM_WARN_ON(tlb-&gt;nr &gt; tlb-&gt;max);</div><div class='del'>-	if (tlb-&gt;nr == tlb-&gt;max)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	ia64_tlb_flush_mmu_tlbonly(tlb, tlb-&gt;start_addr, tlb-&gt;end_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_free(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	ia64_tlb_flush_mmu_free(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	ia64_tlb_flush_mmu(tlb, tlb-&gt;start_addr, tlb-&gt;end_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	if (__tlb_remove_page(tlb, page))</div><div class='del'>-		tlb_flush_mmu(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					  struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Remove TLB entry for PTE mapped at virtual address ADDRESS.  This is called for any</div><div class='del'>- * PTE, not just those pointing to (normal) physical memory.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__tlb_remove_tlb_entry (struct mmu_gather *tlb, pte_t *ptep, unsigned long address)</div><div class='del'>-{</div><div class='del'>-	if (tlb-&gt;start_addr == ~0UL)</div><div class='del'>-		tlb-&gt;start_addr = address;</div><div class='del'>-	tlb-&gt;end_addr = address + PAGE_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define tlb_migrate_finish(mm)	platform_tlb_migrate_finish(mm)</div><div class='del'>-</div><div class='del'>-#define tlb_start_vma(tlb, vma)			do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)			do { } while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_tlb_entry(tlb, ptep, addr)		\</div><div class='del'>-do {							\</div><div class='del'>-	tlb-&gt;need_flush = 1;				\</div><div class='del'>-	__tlb_remove_tlb_entry(tlb, ptep, addr);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='del'>-	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='del'>-static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='del'>-						     unsigned int page_size)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define pte_free_tlb(tlb, ptep, address)		\</div><div class='del'>-do {							\</div><div class='del'>-	tlb-&gt;need_flush = 1;				\</div><div class='del'>-	__pte_free_tlb(tlb, ptep, address);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define pmd_free_tlb(tlb, ptep, address)		\</div><div class='del'>-do {							\</div><div class='del'>-	tlb-&gt;need_flush = 1;				\</div><div class='del'>-	__pmd_free_tlb(tlb, ptep, address);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define pud_free_tlb(tlb, pudp, address)		\</div><div class='del'>-do {							\</div><div class='del'>-	tlb-&gt;need_flush = 1;				\</div><div class='del'>-	__pud_free_tlb(tlb, pudp, address);		\</div><div class='del'>-} while (0)</div><div class='add'>+#include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_IA64_TLB_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/tlbflush.h b/arch/ia64/include/asm/tlbflush.h<br/>index 25e280810f6c..ceac10c4d6e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/tlbflush.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/asm/tlbflush.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -14,6 +14,31 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='add'>+struct ia64_tr_entry {</div><div class='add'>+	u64 ifa;</div><div class='add'>+	u64 itir;</div><div class='add'>+	u64 pte;</div><div class='add'>+	u64 rr;</div><div class='add'>+}; /*Record for tr entry!*/</div><div class='add'>+</div><div class='add'>+extern int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size);</div><div class='add'>+extern void ia64_ptr_entry(u64 target_mask, int slot);</div><div class='add'>+extern struct ia64_tr_entry *ia64_idtrs[NR_CPUS];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ region register macros</div><div class='add'>+*/</div><div class='add'>+#define RR_TO_VE(val)   (((val) &gt;&gt; 0) &amp; 0x0000000000000001)</div><div class='add'>+#define RR_VE(val)     (((val) &amp; 0x0000000000000001) &lt;&lt; 0)</div><div class='add'>+#define RR_VE_MASK     0x0000000000000001L</div><div class='add'>+#define RR_VE_SHIFT    0</div><div class='add'>+#define RR_TO_PS(val)  (((val) &gt;&gt; 2) &amp; 0x000000000000003f)</div><div class='add'>+#define RR_PS(val)     (((val) &amp; 0x000000000000003f) &lt;&lt; 2)</div><div class='add'>+#define RR_PS_MASK     0x00000000000000fcL</div><div class='add'>+#define RR_PS_SHIFT    2</div><div class='add'>+#define RR_RID_MASK    0x00000000ffffff00L</div><div class='add'>+#define RR_TO_RID(val)         ((val &gt;&gt; 8) &amp; 0xffffff)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Now for some TLB flushing routines.  This is the kind of stuff that</div><div class='ctx'>  * can be very expensive, so try to avoid them whenever possible.</div><div class='head'>diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild<br/>index 20018cb883a9..62a9522af51e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='ctx'> generated-y += unistd_64.h</div><div class='del'>-generic-y += kvm_para.h</div><div class='head'>diff --git a/arch/ia64/include/uapi/asm/sockios.h b/arch/ia64/include/uapi/asm/sockios.h<br/>deleted file mode 100644<br/>index f27a12f95d20..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/include/uapi/asm/sockios.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#ifndef _ASM_IA64_SOCKIOS_H</div><div class='del'>-#define _ASM_IA64_SOCKIOS_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Socket-level I/O control calls.</div><div class='del'>- *</div><div class='del'>- * Based on &lt;asm-i386/sockios.h&gt;.</div><div class='del'>- *</div><div class='del'>- * Modified 1998, 1999</div><div class='del'>- *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;, Hewlett-Packard Co</div><div class='del'>- */</div><div class='del'>-#define FIOSETOWN 	0x8901</div><div class='del'>-#define SIOCSPGRP	0x8902</div><div class='del'>-#define FIOGETOWN	0x8903</div><div class='del'>-#define SIOCGPGRP	0x8904</div><div class='del'>-#define SIOCATMARK	0x8905</div><div class='del'>-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_IA64_SOCKIOS_H */</div><div class='head'>diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c<br/>index 41eb281709da..1435e7a1a8cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/acpi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/acpi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/kernel/acpi.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ struct acpi_table_madt *acpi_madt __initdata;</div><div class='ctx'> static u8 has_8259;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,</div><div class='add'>+acpi_parse_lapic_addr_ovr(union acpi_subtable_headers * header,</div><div class='ctx'> 			  const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_apic_override *lapic;</div><div class='hunk'>@@ -195,7 +195,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_lsapic(union acpi_subtable_headers *header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_sapic *lsapic;</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +216,7 @@ acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_lapic_nmi(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_apic_nmi *lacpi_nmi;</div><div class='ctx'> </div><div class='hunk'>@@ -230,7 +230,7 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_iosapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_iosapic(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_io_sapic *iosapic;</div><div class='ctx'> </div><div class='hunk'>@@ -245,7 +245,7 @@ acpi_parse_iosapic(struct acpi_subtable_header * header, const unsigned long end</div><div class='ctx'> static unsigned int __initdata acpi_madt_rev;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_plat_int_src(struct acpi_subtable_header * header,</div><div class='add'>+acpi_parse_plat_int_src(union acpi_subtable_headers * header,</div><div class='ctx'> 			const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_interrupt_source *plintsrc;</div><div class='hunk'>@@ -329,7 +329,7 @@ unsigned int get_cpei_target_cpu(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_int_src_ovr(struct acpi_subtable_header * header,</div><div class='add'>+acpi_parse_int_src_ovr(union acpi_subtable_headers * header,</div><div class='ctx'> 		       const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_interrupt_override *p;</div><div class='hunk'>@@ -350,7 +350,7 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_nmi_src(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_nmi_source *nmi_src;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c<br/>index 6d50ede0ed69..bf9c24d9ce84 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/ptrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/ptrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/kernel/ptrace.c</a></div><div class='hunk'>@@ -2179,12 +2179,11 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ia64_syscall_get_set_arguments(struct task_struct *task,</div><div class='del'>-	struct pt_regs *regs, unsigned int i, unsigned int n,</div><div class='del'>-	unsigned long *args, int rw)</div><div class='add'>+	struct pt_regs *regs, unsigned long *args, int rw)</div><div class='ctx'> {</div><div class='ctx'> 	struct syscall_get_set_args data = {</div><div class='del'>-		.i = i,</div><div class='del'>-		.n = n,</div><div class='add'>+		.i = 0,</div><div class='add'>+		.n = 6,</div><div class='ctx'> 		.args = args,</div><div class='ctx'> 		.regs = regs,</div><div class='ctx'> 		.rw = rw,</div><div class='head'>diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c<br/>index 583a3746d70b..c9cfa760cd57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/kernel/setup.c</a></div><div class='hunk'>@@ -1058,9 +1058,7 @@ check_bugs (void)</div><div class='ctx'> </div><div class='ctx'> static int __init run_dmi_scan(void)</div><div class='ctx'> {</div><div class='del'>-	dmi_scan_machine();</div><div class='del'>-	dmi_memdev_walk();</div><div class='del'>-	dmi_set_dump_stack_arch_desc();</div><div class='add'>+	dmi_setup();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> core_initcall(run_dmi_scan);</div><div class='head'>diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl<br/>index ab9cda5f6136..56e3d0b685e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -344,3 +344,7 @@</div><div class='ctx'> 332	common	pkey_free			sys_pkey_free</div><div class='ctx'> 333	common	rseq				sys_rseq</div><div class='ctx'> # 334 through 423 are reserved to sync up with other architectures</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c<br/>index 5fc89aabdce1..5158bd28de05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/mm/tlb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/mm/tlb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/mm/tlb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/mm/tlb.c</a></div><div class='hunk'>@@ -305,8 +305,8 @@ local_flush_tlb_all (void)</div><div class='ctx'> 	ia64_srlz_i();			/* srlz.i implies srlz.d */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-flush_tlb_range (struct vm_area_struct *vma, unsigned long start,</div><div class='add'>+static void</div><div class='add'>+__flush_tlb_range (struct vm_area_struct *vma, unsigned long start,</div><div class='ctx'> 		 unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = vma-&gt;vm_mm;</div><div class='hunk'>@@ -343,6 +343,25 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start,</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> 	ia64_srlz_i();			/* srlz.i implies srlz.d */</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void flush_tlb_range(struct vm_area_struct *vma,</div><div class='add'>+		unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(end - start &gt;= 1024*1024*1024*1024UL</div><div class='add'>+			|| REGION_NUMBER(start) != REGION_NUMBER(end - 1))) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we flush more than a tera-byte or across regions, we're</div><div class='add'>+		 * probably better off just flushing the entire TLB(s).  This</div><div class='add'>+		 * should be very rare and is not worth optimizing for.</div><div class='add'>+		 */</div><div class='add'>+		flush_tlb_all();</div><div class='add'>+	} else {</div><div class='add'>+		/* flush the address range from the tlb */</div><div class='add'>+		__flush_tlb_range(vma, start, end);</div><div class='add'>+		/* flush the virt. page-table area mapping the addr range */</div><div class='add'>+		__flush_tlb_range(vma, ia64_thash(start), ia64_thash(end));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(flush_tlb_range);</div><div class='ctx'> </div><div class='ctx'> void ia64_tlb_init(void)</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c<br/>index b73b0ebf8214..b510f4f17fd4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/sn/kernel/sn2/sn2_smp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/ia64/sn/kernel/sn2/sn2_smp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/ia64/sn/kernel/sn2/sn2_smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/ia64/sn/kernel/sn2/sn2_smp.c</a></div><div class='hunk'>@@ -120,13 +120,6 @@ void sn_migrate(struct task_struct *task)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sn_tlb_migrate_finish(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	/* flush_tlb_mm is inefficient if more than 1 users of mm */</div><div class='del'>-	if (mm == current-&gt;mm &amp;&amp; mm &amp;&amp; atomic_read(&amp;mm-&gt;mm_users) == 1)</div><div class='del'>-		flush_tlb_mm(mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> sn2_ipi_flush_all_tlb(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig<br/>index b54206408f91..fe5cc2da6d10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/Kconfig</a></div><div class='hunk'>@@ -20,7 +20,6 @@ config M68K</div><div class='ctx'> 	select GENERIC_STRNCPY_FROM_USER if MMU</div><div class='ctx'> 	select GENERIC_STRNLEN_USER if MMU</div><div class='ctx'> 	select ARCH_WANT_IPC_PARSE_VERSION</div><div class='del'>-	select ARCH_USES_GETTIMEOFFSET if MMU &amp;&amp; !COLDFIRE</div><div class='ctx'> 	select HAVE_FUTEX_CMPXCHG if MMU &amp;&amp; FUTEX</div><div class='ctx'> 	select HAVE_MOD_ARCH_SPECIFIC</div><div class='ctx'> 	select MODULES_USE_ELF_REL</div><div class='hunk'>@@ -28,17 +27,11 @@ config M68K</div><div class='ctx'> 	select OLD_SIGSUSPEND3</div><div class='ctx'> 	select OLD_SIGACTION</div><div class='ctx'> 	select ARCH_DISCARD_MEMBLOCK</div><div class='add'>+	select MMU_GATHER_NO_RANGE if MMU</div><div class='ctx'> </div><div class='ctx'> config CPU_BIG_ENDIAN</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c<br/>index 2081b8cd5591..b9aee983e6f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/amiga/cia.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/amiga/cia.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/amiga/cia.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/amiga/cia.c</a></div><div class='hunk'>@@ -88,10 +88,19 @@ static irqreturn_t cia_handler(int irq, void *dev_id)</div><div class='ctx'> 	struct ciabase *base = dev_id;</div><div class='ctx'> 	int mach_irq;</div><div class='ctx'> 	unsigned char ints;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/* Interrupts get disabled while the timer irq flag is cleared and</div><div class='add'>+	 * the timer interrupt serviced.</div><div class='add'>+	 */</div><div class='ctx'> 	mach_irq = base-&gt;cia_irq;</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	ints = cia_set_irq(base, CIA_ICR_ALL);</div><div class='ctx'> 	amiga_custom.intreq = base-&gt;int_mask;</div><div class='add'>+	if (ints &amp; 1)</div><div class='add'>+		generic_handle_irq(mach_irq);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	mach_irq++, ints &gt;&gt;= 1;</div><div class='ctx'> 	for (; ints; mach_irq++, ints &gt;&gt;= 1) {</div><div class='ctx'> 		if (ints &amp; 1)</div><div class='ctx'> 			generic_handle_irq(mach_irq);</div><div class='head'>diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c<br/>index 65f63a457130..c32ab8041cf6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/amiga/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/amiga/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/amiga/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/amiga/config.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -95,8 +96,6 @@ static char amiga_model_name[13] = "Amiga ";</div><div class='ctx'> static void amiga_sched_init(irq_handler_t handler);</div><div class='ctx'> static void amiga_get_model(char *model);</div><div class='ctx'> static void amiga_get_hardware_list(struct seq_file *m);</div><div class='del'>-/* amiga specific timer functions */</div><div class='del'>-static u32 amiga_gettimeoffset(void);</div><div class='ctx'> extern void amiga_mksound(unsigned int count, unsigned int ticks);</div><div class='ctx'> static void amiga_reset(void);</div><div class='ctx'> extern void amiga_init_sound(void);</div><div class='hunk'>@@ -386,7 +385,6 @@ void __init config_amiga(void)</div><div class='ctx'> 	mach_init_IRQ        = amiga_init_IRQ;</div><div class='ctx'> 	mach_get_model       = amiga_get_model;</div><div class='ctx'> 	mach_get_hardware_list = amiga_get_hardware_list;</div><div class='del'>-	arch_gettimeoffset   = amiga_gettimeoffset;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * default MAX_DMA=0xffffffff on all machines. If we don't do so, the SCSI</div><div class='hunk'>@@ -464,7 +462,29 @@ void __init config_amiga(void)</div><div class='ctx'> 		*(unsigned char *)ZTWO_VADDR(0xde0002) |= 0x80;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 amiga_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource amiga_clk = {</div><div class='add'>+	.name   = "ciab",</div><div class='add'>+	.rating = 250,</div><div class='add'>+	.read   = amiga_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static unsigned short jiffy_ticks;</div><div class='add'>+static u32 clk_total, clk_offset;</div><div class='add'>+</div><div class='add'>+static irqreturn_t ciab_timer_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+</div><div class='add'>+	clk_total += jiffy_ticks;</div><div class='add'>+	clk_offset = 0;</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void __init amiga_sched_init(irq_handler_t timer_routine)</div><div class='ctx'> {</div><div class='hunk'>@@ -484,19 +504,22 @@ static void __init amiga_sched_init(irq_handler_t timer_routine)</div><div class='ctx'> 	 * Please don't change this to use ciaa, as it interferes with the</div><div class='ctx'> 	 * SCSI code. We'll have to take a look at this later</div><div class='ctx'> 	 */</div><div class='del'>-	if (request_irq(IRQ_AMIGA_CIAB_TA, timer_routine, 0, "timer", NULL))</div><div class='add'>+	if (request_irq(IRQ_AMIGA_CIAB_TA, ciab_timer_handler, IRQF_TIMER,</div><div class='add'>+			"timer", timer_routine))</div><div class='ctx'> 		pr_err("Couldn't register timer interrupt\n");</div><div class='ctx'> 	/* start timer */</div><div class='ctx'> 	ciab.cra |= 0x11;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-#define TICK_SIZE 10000</div><div class='add'>+	clocksource_register_hz(&amp;amiga_clk, amiga_eclock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/* This is always executed with interrupts disabled.  */</div><div class='del'>-static u32 amiga_gettimeoffset(void)</div><div class='add'>+static u64 amiga_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short hi, lo, hi2;</div><div class='del'>-	u32 ticks, offset = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 ticks;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	/* read CIA B timer A current value */</div><div class='ctx'> 	hi  = ciab.tahi;</div><div class='hunk'>@@ -513,12 +536,14 @@ static u32 amiga_gettimeoffset(void)</div><div class='ctx'> 	if (ticks &gt; jiffy_ticks / 2)</div><div class='ctx'> 		/* check for pending interrupt */</div><div class='ctx'> 		if (cia_set_irq(&amp;ciab_base, 0) &amp; CIA_ICR_TA)</div><div class='del'>-			offset = 10000;</div><div class='add'>+			clk_offset = jiffy_ticks;</div><div class='ctx'> </div><div class='ctx'> 	ticks = jiffy_ticks - ticks;</div><div class='del'>-	ticks = (10000 * ticks) / jiffy_ticks;</div><div class='add'>+	ticks += clk_offset + clk_total;</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-	return (ticks + offset) * 1000;</div><div class='add'>+	return ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void amiga_reset(void)  __noreturn;</div><div class='head'>diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c<br/>index aef8d42e078d..7d168e6dfb01 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/apollo/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/apollo/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/apollo/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/apollo/config.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@ u_long apollo_model;</div><div class='ctx'> </div><div class='ctx'> extern void dn_sched_init(irq_handler_t handler);</div><div class='ctx'> extern void dn_init_IRQ(void);</div><div class='del'>-extern u32 dn_gettimeoffset(void);</div><div class='ctx'> extern int dn_dummy_hwclk(int, struct rtc_time *);</div><div class='ctx'> extern void dn_dummy_reset(void);</div><div class='ctx'> #ifdef CONFIG_HEARTBEAT</div><div class='hunk'>@@ -152,7 +151,6 @@ void __init config_apollo(void)</div><div class='ctx'> </div><div class='ctx'> 	mach_sched_init=dn_sched_init; /* */</div><div class='ctx'> 	mach_init_IRQ=dn_init_IRQ;</div><div class='del'>-	arch_gettimeoffset   = dn_gettimeoffset;</div><div class='ctx'> 	mach_max_dma_address = 0xffffffff;</div><div class='ctx'> 	mach_hwclk           = dn_dummy_hwclk; /* */</div><div class='ctx'> 	mach_reset	     = dn_dummy_reset;  /* */</div><div class='hunk'>@@ -205,11 +203,6 @@ void dn_sched_init(irq_handler_t timer_routine)</div><div class='ctx'> 		pr_err("Couldn't register timer interrupt\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 dn_gettimeoffset(void)</div><div class='del'>-{</div><div class='del'>-	return 0xdeadbeef;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int dn_dummy_hwclk(int op, struct rtc_time *t) {</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c<br/>index 3d2b63bedf05..56f02ea2c248 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/atari/ataints.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/atari/ataints.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/atari/ataints.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/atari/ataints.c</a></div><div class='hunk'>@@ -142,7 +142,7 @@ struct mfptimerbase {</div><div class='ctx'> 	.name		= "MFP Timer D"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static irqreturn_t mfptimer_handler(int irq, void *dev_id)</div><div class='add'>+static irqreturn_t mfp_timer_d_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mfptimerbase *base = dev_id;</div><div class='ctx'> 	int mach_irq;</div><div class='hunk'>@@ -344,7 +344,7 @@ void __init atari_init_IRQ(void)</div><div class='ctx'> 	st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &amp; 0xf0) | 0x6;</div><div class='ctx'> </div><div class='ctx'> 	/* request timer D dispatch handler */</div><div class='del'>-	if (request_irq(IRQ_MFP_TIMD, mfptimer_handler, IRQF_SHARED,</div><div class='add'>+	if (request_irq(IRQ_MFP_TIMD, mfp_timer_d_handler, IRQF_SHARED,</div><div class='ctx'> 			stmfp_base.name, &amp;stmfp_base))</div><div class='ctx'> 		pr_err("Couldn't register %s interrupt\n", stmfp_base.name);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c<br/>index 4fcc4b1df1c0..902255e7b5b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/atari/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/atari/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/atari/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/atari/config.c</a></div><div class='hunk'>@@ -78,7 +78,6 @@ static void atari_heartbeat(int on);</div><div class='ctx'> </div><div class='ctx'> /* atari specific timer functions (in time.c) */</div><div class='ctx'> extern void atari_sched_init(irq_handler_t);</div><div class='del'>-extern u32 atari_gettimeoffset(void);</div><div class='ctx'> extern int atari_mste_hwclk (int, struct rtc_time *);</div><div class='ctx'> extern int atari_tt_hwclk (int, struct rtc_time *);</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +204,6 @@ void __init config_atari(void)</div><div class='ctx'> 	mach_init_IRQ        = atari_init_IRQ;</div><div class='ctx'> 	mach_get_model	 = atari_get_model;</div><div class='ctx'> 	mach_get_hardware_list = atari_get_hardware_list;</div><div class='del'>-	arch_gettimeoffset   = atari_gettimeoffset;</div><div class='ctx'> 	mach_reset           = atari_reset;</div><div class='ctx'> 	mach_max_dma_address = 0xffffff;</div><div class='ctx'> #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)</div><div class='head'>diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c<br/>index 9cca64286464..ce923a523695 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/atari/time.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/atari/time.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/atari/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/atari/time.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/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -24,6 +25,35 @@</div><div class='ctx'> DEFINE_SPINLOCK(rtc_lock);</div><div class='ctx'> EXPORT_SYMBOL_GPL(rtc_lock);</div><div class='ctx'> </div><div class='add'>+static u64 atari_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource atari_clk = {</div><div class='add'>+	.name   = "mfp",</div><div class='add'>+	.rating = 100,</div><div class='add'>+	.read   = atari_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 clk_total;</div><div class='add'>+static u8 last_timer_count;</div><div class='add'>+</div><div class='add'>+static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	do {</div><div class='add'>+		last_timer_count = st_mfp.tim_dt_c;</div><div class='add'>+	} while (last_timer_count == 1);</div><div class='add'>+	clk_total += INT_TICKS;</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init</div><div class='ctx'> atari_sched_init(irq_handler_t timer_routine)</div><div class='ctx'> {</div><div class='hunk'>@@ -32,31 +62,33 @@ atari_sched_init(irq_handler_t timer_routine)</div><div class='ctx'>     /* start timer C, div = 1:100 */</div><div class='ctx'>     st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &amp; 15) | 0x60;</div><div class='ctx'>     /* install interrupt service routine for MFP Timer C */</div><div class='del'>-    if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine))</div><div class='add'>+    if (request_irq(IRQ_MFP_TIMC, mfp_timer_c_handler, IRQF_TIMER, "timer",</div><div class='add'>+                    timer_routine))</div><div class='ctx'> 	pr_err("Couldn't register timer interrupt\n");</div><div class='add'>+</div><div class='add'>+    clocksource_register_hz(&amp;atari_clk, INT_CLK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ++andreas: gettimeoffset fixed to check for pending interrupt */</div><div class='ctx'> </div><div class='del'>-#define TICK_SIZE 10000</div><div class='del'>-</div><div class='del'>-/* This is always executed with interrupts disabled.  */</div><div class='del'>-u32 atari_gettimeoffset(void)</div><div class='add'>+static u64 atari_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-  u32 ticks, offset = 0;</div><div class='del'>-</div><div class='del'>-  /* read MFP timer C current value */</div><div class='del'>-  ticks = st_mfp.tim_dt_c;</div><div class='del'>-  /* The probability of underflow is less than 2% */</div><div class='del'>-  if (ticks &gt; INT_TICKS - INT_TICKS / 50)</div><div class='del'>-    /* Check for pending timer interrupt */</div><div class='del'>-    if (st_mfp.int_pn_b &amp; (1 &lt;&lt; 5))</div><div class='del'>-      offset = TICK_SIZE;</div><div class='del'>-</div><div class='del'>-  ticks = INT_TICKS - ticks;</div><div class='del'>-  ticks = ticks * 10000L / INT_TICKS;</div><div class='del'>-</div><div class='del'>-  return (ticks + offset) * 1000;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 count;</div><div class='add'>+	u32 ticks;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	/* Ensure that the count is monotonically decreasing, even though</div><div class='add'>+	 * the result may briefly stop changing after counter wrap-around.</div><div class='add'>+	 */</div><div class='add'>+	count = min(st_mfp.tim_dt_c, last_timer_count);</div><div class='add'>+	last_timer_count = count;</div><div class='add'>+</div><div class='add'>+	ticks = INT_TICKS - count;</div><div class='add'>+	ticks += clk_total;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c<br/>index 143ee9fa3893..8ebaabc931cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/bvme6000/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/bvme6000/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/bvme6000/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/bvme6000/config.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -39,16 +40,10 @@</div><div class='ctx'> </div><div class='ctx'> static void bvme6000_get_model(char *model);</div><div class='ctx'> extern void bvme6000_sched_init(irq_handler_t handler);</div><div class='del'>-extern u32 bvme6000_gettimeoffset(void);</div><div class='ctx'> extern int bvme6000_hwclk (int, struct rtc_time *);</div><div class='ctx'> extern void bvme6000_reset (void);</div><div class='ctx'> void bvme6000_set_vectors (void);</div><div class='ctx'> </div><div class='del'>-/* Save tick handler routine pointer, will point to xtime_update() in</div><div class='del'>- * kernel/timer/timekeeping.c, called via bvme6000_process_int() */</div><div class='del'>-</div><div class='del'>-static irq_handler_t tick_handler;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> int __init bvme6000_parse_bootinfo(const struct bi_record *bi)</div><div class='ctx'> {</div><div class='hunk'>@@ -110,7 +105,6 @@ void __init config_bvme6000(void)</div><div class='ctx'>     mach_max_dma_address = 0xffffffff;</div><div class='ctx'>     mach_sched_init      = bvme6000_sched_init;</div><div class='ctx'>     mach_init_IRQ        = bvme6000_init_IRQ;</div><div class='del'>-    arch_gettimeoffset   = bvme6000_gettimeoffset;</div><div class='ctx'>     mach_hwclk           = bvme6000_hwclk;</div><div class='ctx'>     mach_reset		 = bvme6000_reset;</div><div class='ctx'>     mach_get_model       = bvme6000_get_model;</div><div class='hunk'>@@ -154,15 +148,38 @@ irqreturn_t bvme6000_abort_int (int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 bvme6000_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource bvme6000_clk = {</div><div class='add'>+	.name   = "rtc",</div><div class='add'>+	.rating = 250,</div><div class='add'>+	.read   = bvme6000_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 clk_total, clk_offset;</div><div class='add'>+</div><div class='add'>+#define RTC_TIMER_CLOCK_FREQ 8000000</div><div class='add'>+#define RTC_TIMER_CYCLES     (RTC_TIMER_CLOCK_FREQ / HZ)</div><div class='add'>+#define RTC_TIMER_COUNT      ((RTC_TIMER_CYCLES / 2) - 1)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t bvme6000_timer_int (int irq, void *dev_id)</div><div class='ctx'> {</div><div class='add'>+    irq_handler_t timer_routine = dev_id;</div><div class='add'>+    unsigned long flags;</div><div class='ctx'>     volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;</div><div class='del'>-    unsigned char msr = rtc-&gt;msr &amp; 0xc0;</div><div class='add'>+    unsigned char msr;</div><div class='ctx'> </div><div class='add'>+    local_irq_save(flags);</div><div class='add'>+    msr = rtc-&gt;msr &amp; 0xc0;</div><div class='ctx'>     rtc-&gt;msr = msr | 0x20;		/* Ack the interrupt */</div><div class='add'>+    clk_total += RTC_TIMER_CYCLES;</div><div class='add'>+    clk_offset = 0;</div><div class='add'>+    timer_routine(0, NULL);</div><div class='add'>+    local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-    return tick_handler(irq, dev_id);</div><div class='add'>+    return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -181,14 +198,13 @@ void bvme6000_sched_init (irq_handler_t timer_routine)</div><div class='ctx'> </div><div class='ctx'>     rtc-&gt;msr = 0;	/* Ensure timer registers accessible */</div><div class='ctx'> </div><div class='del'>-    tick_handler = timer_routine;</div><div class='del'>-    if (request_irq(BVME_IRQ_RTC, bvme6000_timer_int, 0,</div><div class='del'>-				"timer", bvme6000_timer_int))</div><div class='add'>+    if (request_irq(BVME_IRQ_RTC, bvme6000_timer_int, IRQF_TIMER, "timer",</div><div class='add'>+                    timer_routine))</div><div class='ctx'> 	panic ("Couldn't register timer int");</div><div class='ctx'> </div><div class='ctx'>     rtc-&gt;t1cr_omr = 0x04;	/* Mode 2, ext clk */</div><div class='del'>-    rtc-&gt;t1msb = 39999 &gt;&gt; 8;</div><div class='del'>-    rtc-&gt;t1lsb = 39999 &amp; 0xff;</div><div class='add'>+    rtc-&gt;t1msb = RTC_TIMER_COUNT &gt;&gt; 8;</div><div class='add'>+    rtc-&gt;t1lsb = RTC_TIMER_COUNT &amp; 0xff;</div><div class='ctx'>     rtc-&gt;irr_icr1 &amp;= 0xef;	/* Route timer 1 to INTR pin */</div><div class='ctx'>     rtc-&gt;msr = 0x40;		/* Access int.cntrl, etc */</div><div class='ctx'>     rtc-&gt;pfr_icr0 = 0x80;	/* Just timer 1 ints enabled */</div><div class='hunk'>@@ -200,14 +216,14 @@ void bvme6000_sched_init (irq_handler_t timer_routine)</div><div class='ctx'> </div><div class='ctx'>     rtc-&gt;msr = msr;</div><div class='ctx'> </div><div class='add'>+    clocksource_register_hz(&amp;bvme6000_clk, RTC_TIMER_CLOCK_FREQ);</div><div class='add'>+</div><div class='ctx'>     if (request_irq(BVME_IRQ_ABORT, bvme6000_abort_int, 0,</div><div class='ctx'> 				"abort", bvme6000_abort_int))</div><div class='ctx'> 	panic ("Couldn't register abort int");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* This is always executed with interrupts disabled.  */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * NOTE:  Don't accept any readings within 5us of rollover, as</div><div class='ctx'>  * the T1INT bit may be a little slow getting set.  There is also</div><div class='hunk'>@@ -215,14 +231,18 @@ void bvme6000_sched_init (irq_handler_t timer_routine)</div><div class='ctx'>  * results...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-u32 bvme6000_gettimeoffset(void)</div><div class='add'>+static u64 bvme6000_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='add'>+    unsigned long flags;</div><div class='ctx'>     volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;</div><div class='ctx'>     volatile PitRegsPtr pit = (PitRegsPtr)BVME_PIT_BASE;</div><div class='del'>-    unsigned char msr = rtc-&gt;msr &amp; 0xc0;</div><div class='add'>+    unsigned char msr, msb;</div><div class='ctx'>     unsigned char t1int, t1op;</div><div class='ctx'>     u32 v = 800000, ov;</div><div class='ctx'> </div><div class='add'>+    local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+    msr = rtc-&gt;msr &amp; 0xc0;</div><div class='ctx'>     rtc-&gt;msr = 0;	/* Ensure timer registers accessible */</div><div class='ctx'> </div><div class='ctx'>     do {</div><div class='hunk'>@@ -230,22 +250,25 @@ u32 bvme6000_gettimeoffset(void)</div><div class='ctx'> 	t1int = rtc-&gt;msr &amp; 0x20;</div><div class='ctx'> 	t1op  = pit-&gt;pcdr &amp; 0x04;</div><div class='ctx'> 	rtc-&gt;t1cr_omr |= 0x40;		/* Latch timer1 */</div><div class='del'>-	v = rtc-&gt;t1msb &lt;&lt; 8;		/* Read timer1 */</div><div class='del'>-	v |= rtc-&gt;t1lsb;		/* Read timer1 */</div><div class='add'>+	msb = rtc-&gt;t1msb;		/* Read timer1 */</div><div class='add'>+	v = (msb &lt;&lt; 8) | rtc-&gt;t1lsb;	/* Read timer1 */</div><div class='ctx'>     } while (t1int != (rtc-&gt;msr &amp; 0x20) ||</div><div class='ctx'> 		t1op != (pit-&gt;pcdr &amp; 0x04) ||</div><div class='ctx'> 			abs(ov-v) &gt; 80 ||</div><div class='del'>-				v &gt; 39960);</div><div class='add'>+				v &gt; RTC_TIMER_COUNT - (RTC_TIMER_COUNT / 100));</div><div class='ctx'> </div><div class='del'>-    v = 39999 - v;</div><div class='add'>+    v = RTC_TIMER_COUNT - v;</div><div class='ctx'>     if (!t1op)				/* If in second half cycle.. */</div><div class='del'>-	v += 40000;</div><div class='del'>-    v /= 8;				/* Convert ticks to microseconds */</div><div class='del'>-    if (t1int)</div><div class='del'>-	v += 10000;			/* Int pending, + 10ms */</div><div class='add'>+	v += RTC_TIMER_CYCLES / 2;</div><div class='add'>+    if (msb &gt; 0 &amp;&amp; t1int)</div><div class='add'>+	clk_offset = RTC_TIMER_CYCLES;</div><div class='ctx'>     rtc-&gt;msr = msr;</div><div class='ctx'> </div><div class='del'>-    return v * 1000;</div><div class='add'>+    v += clk_offset + clk_total;</div><div class='add'>+</div><div class='add'>+    local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+    return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/m68k/configs/amcore_defconfig b/arch/m68k/configs/amcore_defconfig<br/>index 0857cdbfde0c..d5e683dd885d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/amcore_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/amcore_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/amcore_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/amcore_defconfig</a></div><div class='hunk'>@@ -12,7 +12,6 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG is not set</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> # CONFIG_MMU is not set</div><div class='head'>diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig<br/>index 525421ae277d..fea392cfcf1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/amiga_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/amiga_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/amiga_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/amiga_defconfig</a></div><div class='hunk'>@@ -56,6 +56,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -210,9 +211,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -234,9 +232,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -313,7 +308,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -460,12 +454,12 @@ CONFIG_RTC_DRV_RP5C01=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -573,9 +567,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -640,6 +636,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -649,4 +646,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig<br/>index db0e654a88d5..2474d267460e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/apollo_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/apollo_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/apollo_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/apollo_defconfig</a></div><div class='hunk'>@@ -52,6 +52,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -206,9 +207,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -230,9 +228,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -309,7 +304,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -420,12 +414,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -533,9 +527,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -600,6 +596,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -609,4 +606,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig<br/>index 1451168eb789..0fc7d2992fe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/atari_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/atari_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/atari_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/atari_defconfig</a></div><div class='hunk'>@@ -59,6 +59,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -213,9 +214,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -237,9 +235,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -316,7 +311,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -442,12 +436,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -555,9 +549,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -622,6 +618,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -631,4 +628,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig<br/>index b0d3609f5bb3..699df9fdf866 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/bvme6000_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/bvme6000_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/bvme6000_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/bvme6000_defconfig</a></div><div class='hunk'>@@ -49,6 +49,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -203,9 +204,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -227,9 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -306,7 +301,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -413,12 +407,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -526,9 +520,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -593,6 +589,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -602,4 +599,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig<br/>index 4ed7c151347c..b50802255324 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/hp300_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/hp300_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/hp300_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/hp300_defconfig</a></div><div class='hunk'>@@ -51,6 +51,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -205,9 +206,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -229,9 +227,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -308,7 +303,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -422,12 +416,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -535,9 +529,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -602,6 +598,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -611,4 +608,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/m5475evb_defconfig b/arch/m68k/configs/m5475evb_defconfig<br/>index 4f4ccd13c11b..434bd3750966 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/m5475evb_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/m5475evb_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/m5475evb_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/m5475evb_defconfig</a></div><div class='hunk'>@@ -11,7 +11,6 @@ CONFIG_SYSCTL_SYSCALL=y</div><div class='ctx'> # CONFIG_AIO is not set</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig<br/>index 0dc544e1ce1f..04e7d70f6030 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/mac_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/mac_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/mac_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/mac_defconfig</a></div><div class='hunk'>@@ -50,6 +50,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -204,9 +205,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -228,9 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -310,7 +305,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -444,12 +438,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -557,9 +551,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -624,6 +620,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -633,4 +630,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig<br/>index 5a7b7b0d6e72..5e1cc4c17852 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/multi_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/multi_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/multi_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/multi_defconfig</a></div><div class='hunk'>@@ -70,6 +70,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -224,9 +225,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -248,9 +246,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -330,7 +325,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -526,12 +520,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -639,9 +633,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -706,6 +702,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -715,4 +712,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig<br/>index 71eb9be1803b..170ac8792c2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/mvme147_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/mvme147_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/mvme147_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/mvme147_defconfig</a></div><div class='hunk'>@@ -48,6 +48,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -202,9 +203,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -226,9 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -305,7 +300,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -412,12 +406,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -525,9 +519,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -592,6 +588,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -601,4 +598,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig<br/>index ea2ebd4241c0..d865592a423e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/mvme16x_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/mvme16x_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/mvme16x_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/mvme16x_defconfig</a></div><div class='hunk'>@@ -49,6 +49,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -203,9 +204,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -227,9 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -306,7 +301,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -413,12 +407,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -526,9 +520,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -593,6 +589,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -602,4 +599,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig<br/>index cef6dc47c725..034a9de90484 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/q40_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/q40_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/q40_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/q40_defconfig</a></div><div class='hunk'>@@ -50,6 +50,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -204,9 +205,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -228,9 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -307,7 +302,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -431,12 +425,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -544,9 +538,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -611,6 +607,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -620,4 +617,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/configs/stmark2_defconfig b/arch/m68k/configs/stmark2_defconfig<br/>index 69f23c7b0497..27fa9465d19d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/stmark2_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/stmark2_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/stmark2_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/stmark2_defconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_BLK_CMDLINE_PARSER=y</div><div class='ctx'> # CONFIG_MMU is not set</div><div class='head'>diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig<br/>index 69f2282dc4e9..49be0f9fcd8d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/sun3_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/sun3_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/sun3_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/sun3_defconfig</a></div><div class='hunk'>@@ -46,6 +46,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -200,9 +201,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -224,9 +222,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -303,7 +298,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -415,12 +409,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -528,9 +522,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -595,6 +591,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -604,3 +601,4 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='head'>diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig<br/>index e91267e868b2..a71acf4a6004 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/sun3x_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/configs/sun3x_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/configs/sun3x_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/configs/sun3x_defconfig</a></div><div class='hunk'>@@ -46,6 +46,7 @@ CONFIG_TLS=m</div><div class='ctx'> CONFIG_XFRM_MIGRATE=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_XDP_SOCKETS=y</div><div class='add'>+CONFIG_XDP_SOCKETS_DIAG=m</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='hunk'>@@ -200,9 +201,6 @@ CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV4=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV4=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV4=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='hunk'>@@ -224,9 +222,6 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='del'>-CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='del'>-CONFIG_NFT_MASQ_IPV6=m</div><div class='del'>-CONFIG_NFT_REDIR_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='ctx'> CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_IPV6=m</div><div class='hunk'>@@ -303,7 +298,6 @@ CONFIG_AF_KCM=m</div><div class='ctx'> # CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_PSAMPLE=m</div><div class='ctx'> CONFIG_NET_IFE=m</div><div class='del'>-CONFIG_NET_DEVLINK=m</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -414,12 +408,12 @@ CONFIG_RTC_DRV_GENERIC=m</div><div class='ctx'> # CONFIG_VIRTIO_MENU is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_DAX=m</div><div class='add'>+# CONFIG_VALIDATE_FS_PARSER is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_REISERFS_FS=m</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_OCFS2_DEBUG_MASKLOG is not set</div><div class='del'>-CONFIG_FS_ENCRYPTION=m</div><div class='ctx'> CONFIG_FANOTIFY=y</div><div class='ctx'> CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='ctx'> # CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='hunk'>@@ -527,9 +521,11 @@ CONFIG_CRYPTO_AEGIS256=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS640=m</div><div class='ctx'> CONFIG_CRYPTO_MORUS1280=m</div><div class='ctx'> CONFIG_CRYPTO_CFB=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_OFB=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='ctx'> CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_ADIANTUM=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='hunk'>@@ -594,6 +590,7 @@ CONFIG_TEST_OVERFLOW=m</div><div class='ctx'> CONFIG_TEST_RHASHTABLE=m</div><div class='ctx'> CONFIG_TEST_HASH=m</div><div class='ctx'> CONFIG_TEST_IDA=m</div><div class='add'>+CONFIG_TEST_VMALLOC=m</div><div class='ctx'> CONFIG_TEST_USER_COPY=m</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_FIND_BIT_BENCHMARK=m</div><div class='hunk'>@@ -603,4 +600,5 @@ CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_MEMCAT_P=m</div><div class='add'>+CONFIG_TEST_STACKINIT=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='head'>diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c<br/>index a19bcd23f80b..a161d44fd20b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/hp300/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/hp300/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/hp300/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/hp300/config.c</a></div><div class='hunk'>@@ -254,7 +254,6 @@ void __init config_hp300(void)</div><div class='ctx'> 	mach_sched_init      = hp300_sched_init;</div><div class='ctx'> 	mach_init_IRQ        = hp300_init_IRQ;</div><div class='ctx'> 	mach_get_model       = hp300_get_model;</div><div class='del'>-	arch_gettimeoffset   = hp300_gettimeoffset;</div><div class='ctx'> 	mach_hwclk	     = hp300_hwclk;</div><div class='ctx'> 	mach_get_ss	     = hp300_get_ss;</div><div class='ctx'> 	mach_reset           = hp300_reset;</div><div class='head'>diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c<br/>index 289d928a46cb..bfee13e1d0fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/hp300/time.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/hp300/time.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/hp300/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/hp300/time.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -19,6 +20,18 @@</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/blinken.h&gt;</div><div class='ctx'> </div><div class='add'>+static u64 hp300_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource hp300_clk = {</div><div class='add'>+	.name   = "timer",</div><div class='add'>+	.rating = 250,</div><div class='add'>+	.read   = hp300_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 clk_total, clk_offset;</div><div class='add'>+</div><div class='ctx'> /* Clock hardware definitions */</div><div class='ctx'> </div><div class='ctx'> #define CLOCKBASE	0xf05f8000</div><div class='hunk'>@@ -28,39 +41,61 @@</div><div class='ctx'> #define	CLKCR3		CLKCR1</div><div class='ctx'> #define	CLKSR		CLKCR2</div><div class='ctx'> #define	CLKMSB1		0x5</div><div class='add'>+#define	CLKLSB1		0x7</div><div class='ctx'> #define	CLKMSB2		0x9</div><div class='ctx'> #define	CLKMSB3		0xD</div><div class='ctx'> </div><div class='add'>+#define	CLKSR_INT1	BIT(0)</div><div class='add'>+</div><div class='ctx'> /* This is for machines which generate the exact clock. */</div><div class='del'>-#define USECS_PER_JIFFY (1000000/HZ)</div><div class='ctx'> </div><div class='del'>-#define INTVAL ((10000 / 4) - 1)</div><div class='add'>+#define HP300_TIMER_CLOCK_FREQ 250000</div><div class='add'>+#define HP300_TIMER_CYCLES     (HP300_TIMER_CLOCK_FREQ / HZ)</div><div class='add'>+#define INTVAL                 (HP300_TIMER_CYCLES - 1)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t hp300_tick(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned long tmp;</div><div class='del'>-	irq_handler_t vector = dev_id;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	in_8(CLOCKBASE + CLKSR);</div><div class='ctx'> 	asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE));</div><div class='add'>+	clk_total += INTVAL;</div><div class='add'>+	clk_offset = 0;</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='ctx'> 	/* Turn off the network and SCSI leds */</div><div class='ctx'> 	blinken_leds(0, 0xe0);</div><div class='del'>-	return vector(irq, NULL);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 hp300_gettimeoffset(void)</div><div class='add'>+static u64 hp300_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-  /* Read current timer 1 value */</div><div class='del'>-  unsigned char lsb, msb1, msb2;</div><div class='del'>-  unsigned short ticks;</div><div class='del'>-</div><div class='del'>-  msb1 = in_8(CLOCKBASE + 5);</div><div class='del'>-  lsb = in_8(CLOCKBASE + 7);</div><div class='del'>-  msb2 = in_8(CLOCKBASE + 5);</div><div class='del'>-  if (msb1 != msb2)</div><div class='del'>-    /* A carry happened while we were reading.  Read it again */</div><div class='del'>-    lsb = in_8(CLOCKBASE + 7);</div><div class='del'>-  ticks = INTVAL - ((msb2 &lt;&lt; 8) | lsb);</div><div class='del'>-  return ((USECS_PER_JIFFY * ticks) / INTVAL) * 1000;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned char lsb, msb, msb_new;</div><div class='add'>+	u32 ticks;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	/* Read current timer 1 value */</div><div class='add'>+	msb = in_8(CLOCKBASE + CLKMSB1);</div><div class='add'>+again:</div><div class='add'>+	if ((in_8(CLOCKBASE + CLKSR) &amp; CLKSR_INT1) &amp;&amp; msb &gt; 0)</div><div class='add'>+		clk_offset = INTVAL;</div><div class='add'>+	lsb = in_8(CLOCKBASE + CLKLSB1);</div><div class='add'>+	msb_new = in_8(CLOCKBASE + CLKMSB1);</div><div class='add'>+	if (msb_new != msb) {</div><div class='add'>+		msb = msb_new;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ticks = INTVAL - ((msb &lt;&lt; 8) | lsb);</div><div class='add'>+	ticks += clk_offset + clk_total;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init hp300_sched_init(irq_handler_t vector)</div><div class='hunk'>@@ -70,9 +105,11 @@ void __init hp300_sched_init(irq_handler_t vector)</div><div class='ctx'> </div><div class='ctx'>   asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));</div><div class='ctx'> </div><div class='del'>-  if (request_irq(IRQ_AUTO_6, hp300_tick, 0, "timer tick", vector))</div><div class='add'>+  if (request_irq(IRQ_AUTO_6, hp300_tick, IRQF_TIMER, "timer tick", vector))</div><div class='ctx'>     pr_err("Couldn't register timer interrupt\n");</div><div class='ctx'> </div><div class='ctx'>   out_8(CLOCKBASE + CLKCR2, 0x1);		/* select CR1 */</div><div class='ctx'>   out_8(CLOCKBASE + CLKCR1, 0x40);		/* enable irq */</div><div class='add'>+</div><div class='add'>+  clocksource_register_hz(&amp;hp300_clk, HP300_TIMER_CLOCK_FREQ);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/hp300/time.h b/arch/m68k/hp300/time.h<br/>index f5583ec4033d..1d77b55cc72a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/hp300/time.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/hp300/time.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/hp300/time.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/hp300/time.h</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='ctx'> extern void hp300_sched_init(irq_handler_t vector);</div><div class='del'>-extern u32 hp300_gettimeoffset(void);</div><div class='head'>diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild<br/>index 95f8f631c4df..0ddae4a74adb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/include/asm/Kbuild</a></div><div class='hunk'>@@ -13,10 +13,12 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += sections.h</div><div class='head'>diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h<br/>index 782b78f8a048..6c03ca5bc436 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/io_mm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/io_mm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/io_mm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/include/asm/io_mm.h</a></div><div class='hunk'>@@ -377,8 +377,6 @@ static inline void isa_delay(void)</div><div class='ctx'> #define writesw(port, buf, nr)    raw_outsw((port), (u16 *)(buf), (nr))</div><div class='ctx'> #define writesl(port, buf, nr)    raw_outsl((port), (u32 *)(buf), (nr))</div><div class='ctx'> </div><div class='del'>-#define mmiowb()</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_SUN3</div><div class='ctx'> #define IO_SPACE_LIMIT 0xffff</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/m68k/include/asm/mvme147hw.h b/arch/m68k/include/asm/mvme147hw.h<br/>index 9c7ff67c5ffd..257b29184af9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/mvme147hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/mvme147hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/mvme147hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/include/asm/mvme147hw.h</a></div><div class='hunk'>@@ -66,7 +66,7 @@ struct pcc_regs {</div><div class='ctx'> #define PCC_INT_ENAB		0x08</div><div class='ctx'> </div><div class='ctx'> #define PCC_TIMER_INT_CLR	0x80</div><div class='del'>-#define PCC_TIMER_PRELOAD	63936l</div><div class='add'>+#define PCC_TIMER_CLR_OVF	0x04</div><div class='ctx'> </div><div class='ctx'> #define PCC_LEVEL_ABORT		0x07</div><div class='ctx'> #define PCC_LEVEL_SERIAL	0x04</div><div class='head'>diff --git a/arch/m68k/include/asm/syscall.h b/arch/m68k/include/asm/syscall.h<br/>new file mode 100644<br/>index 000000000000..465ac039be09<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/include/asm/syscall.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_M68K_SYSCALL_H</div><div class='add'>+#define _ASM_M68K_SYSCALL_H</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return AUDIT_ARCH_M68K;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_M68K_SYSCALL_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/tlb.h b/arch/m68k/include/asm/tlb.h<br/>index b4b9efb6f963..3c81f6adfc8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/include/asm/tlb.h</a></div><div class='hunk'>@@ -2,20 +2,6 @@</div><div class='ctx'> #ifndef _M68K_TLB_H</div><div class='ctx'> #define _M68K_TLB_H</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * m68k doesn't need any special per-pte or</div><div class='del'>- * per-vma handling..</div><div class='del'>- */</div><div class='del'>-#define tlb_start_vma(tlb, vma)	do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)	do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * .. because we flush the whole mm when it</div><div class='del'>- * fills up.</div><div class='del'>- */</div><div class='del'>-#define tlb_flush(tlb)		flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _M68K_TLB_H */</div><div class='head'>diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild<br/>index 8a7ad40be463..7417847dc438 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='ctx'> generated-y += unistd_32.h</div><div class='del'>-generic-y += kvm_para.h</div><div class='head'>diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl<br/>index 125c14178979..df4ec3ec71d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -423,3 +423,7 @@</div><div class='ctx'> 421	common	rt_sigtimedwait_time64		sys_rt_sigtimedwait</div><div class='ctx'> 422	common	futex_time64			sys_futex</div><div class='ctx'> 423	common	sched_rr_get_interval_time64	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c<br/>index cd9317d53276..11be08f4f750 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mac/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mac/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mac/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/mac/config.c</a></div><div class='hunk'>@@ -54,8 +54,6 @@ struct mac_booter_data mac_bi_data;</div><div class='ctx'> /* The phys. video addr. - might be bogus on some machines */</div><div class='ctx'> static unsigned long mac_orig_videoaddr;</div><div class='ctx'> </div><div class='del'>-/* Mac specific timer functions */</div><div class='del'>-extern u32 mac_gettimeoffset(void);</div><div class='ctx'> extern int mac_hwclk(int, struct rtc_time *);</div><div class='ctx'> extern void iop_preinit(void);</div><div class='ctx'> extern void iop_init(void);</div><div class='hunk'>@@ -155,7 +153,6 @@ void __init config_mac(void)</div><div class='ctx'> 	mach_sched_init = mac_sched_init;</div><div class='ctx'> 	mach_init_IRQ = mac_init_IRQ;</div><div class='ctx'> 	mach_get_model = mac_get_model;</div><div class='del'>-	arch_gettimeoffset = mac_gettimeoffset;</div><div class='ctx'> 	mach_hwclk = mac_hwclk;</div><div class='ctx'> 	mach_reset = mac_reset;</div><div class='ctx'> 	mach_halt = mac_poweroff;</div><div class='head'>diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c<br/>index 0b0289459173..3c2cfcb74982 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mac/via.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mac/via.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mac/via.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/mac/via.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -55,16 +56,6 @@ static __u8 rbv_clear;</div><div class='ctx'> static int gIER,gIFR,gBufA,gBufB;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Timer defs.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define TICK_SIZE		10000</div><div class='del'>-#define MAC_CLOCK_TICK		(783300/HZ)		/* ticks per HZ */</div><div class='del'>-#define MAC_CLOCK_LOW		(MAC_CLOCK_TICK&amp;0xFF)</div><div class='del'>-#define MAC_CLOCK_HIGH		(MAC_CLOCK_TICK&gt;&gt;8)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * On Macs with a genuine VIA chip there is no way to mask an individual slot</div><div class='ctx'>  * interrupt. This limitation also seems to apply to VIA clone logic cores in</div><div class='ctx'>  * Quadra-like ASICs. (RBV and OSS machines don't have this limitation.)</div><div class='hunk'>@@ -272,22 +263,6 @@ void __init via_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Start the 100 Hz clock</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init via_init_clock(irq_handler_t func)</div><div class='del'>-{</div><div class='del'>-	via1[vACR] |= 0x40;</div><div class='del'>-	via1[vT1LL] = MAC_CLOCK_LOW;</div><div class='del'>-	via1[vT1LH] = MAC_CLOCK_HIGH;</div><div class='del'>-	via1[vT1CL] = MAC_CLOCK_LOW;</div><div class='del'>-	via1[vT1CH] = MAC_CLOCK_HIGH;</div><div class='del'>-</div><div class='del'>-	if (request_irq(IRQ_MAC_TIMER_1, func, 0, "timer", func))</div><div class='del'>-		pr_err("Couldn't register %s interrupt\n", "timer");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Debugging dump, used in various places to see what's going on.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -315,29 +290,6 @@ void via_debug_dump(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This is always executed with interrupts disabled.</div><div class='del'>- *</div><div class='del'>- * TBI: get time offset between scheduling timer ticks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-u32 mac_gettimeoffset(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long ticks, offset = 0;</div><div class='del'>-</div><div class='del'>-	/* read VIA1 timer 2 current value */</div><div class='del'>-	ticks = via1[vT1CL] | (via1[vT1CH] &lt;&lt; 8);</div><div class='del'>-	/* The probability of underflow is less than 2% */</div><div class='del'>-	if (ticks &gt; MAC_CLOCK_TICK - MAC_CLOCK_TICK / 50)</div><div class='del'>-		/* Check for pending timer interrupt in VIA1 IFR */</div><div class='del'>-		if (via1[vIFR] &amp; 0x40) offset = TICK_SIZE;</div><div class='del'>-</div><div class='del'>-	ticks = MAC_CLOCK_TICK - ticks;</div><div class='del'>-	ticks = ticks * 10000L / MAC_CLOCK_TICK;</div><div class='del'>-</div><div class='del'>-	return (ticks + offset) * 1000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Flush the L2 cache on Macs that have it by flipping</div><div class='ctx'>  * the system into 24-bit mode for an instant.</div><div class='ctx'>  */</div><div class='hunk'>@@ -440,6 +392,8 @@ void via_nubus_irq_shutdown(int irq)</div><div class='ctx'>  * via6522.c :-), disable/pending masks added.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define VIA_TIMER_1_INT BIT(6)</div><div class='add'>+</div><div class='ctx'> void via1_irq(struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	int irq_num;</div><div class='hunk'>@@ -449,6 +403,21 @@ void via1_irq(struct irq_desc *desc)</div><div class='ctx'> 	if (!events)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	irq_num = IRQ_MAC_TIMER_1;</div><div class='add'>+	irq_bit = VIA_TIMER_1_INT;</div><div class='add'>+	if (events &amp; irq_bit) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		via1[vIFR] = irq_bit;</div><div class='add'>+		generic_handle_irq(irq_num);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+		events &amp;= ~irq_bit;</div><div class='add'>+		if (!events)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	irq_num = VIA1_SOURCE_BASE;</div><div class='ctx'> 	irq_bit = 1;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -605,3 +574,82 @@ int via2_scsi_drq_pending(void)</div><div class='ctx'> 	return via2[gIFR] &amp; (1 &lt;&lt; IRQ_IDX(IRQ_MAC_SCSIDRQ));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(via2_scsi_drq_pending);</div><div class='add'>+</div><div class='add'>+/* timer and clock source */</div><div class='add'>+</div><div class='add'>+#define VIA_CLOCK_FREQ     783360                /* VIA "phase 2" clock in Hz */</div><div class='add'>+#define VIA_TIMER_CYCLES   (VIA_CLOCK_FREQ / HZ) /* clock cycles per jiffy */</div><div class='add'>+</div><div class='add'>+#define VIA_TC             (VIA_TIMER_CYCLES - 2) /* including 0 and -1 */</div><div class='add'>+#define VIA_TC_LOW         (VIA_TC &amp; 0xFF)</div><div class='add'>+#define VIA_TC_HIGH        (VIA_TC &gt;&gt; 8)</div><div class='add'>+</div><div class='add'>+static u64 mac_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource mac_clk = {</div><div class='add'>+	.name   = "via1",</div><div class='add'>+	.rating = 250,</div><div class='add'>+	.read   = mac_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 clk_total, clk_offset;</div><div class='add'>+</div><div class='add'>+static irqreturn_t via_timer_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+</div><div class='add'>+	clk_total += VIA_TIMER_CYCLES;</div><div class='add'>+	clk_offset = 0;</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init via_init_clock(irq_handler_t timer_routine)</div><div class='add'>+{</div><div class='add'>+	if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, IRQF_TIMER, "timer",</div><div class='add'>+			timer_routine)) {</div><div class='add'>+		pr_err("Couldn't register %s interrupt\n", "timer");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	via1[vT1LL] = VIA_TC_LOW;</div><div class='add'>+	via1[vT1LH] = VIA_TC_HIGH;</div><div class='add'>+	via1[vT1CL] = VIA_TC_LOW;</div><div class='add'>+	via1[vT1CH] = VIA_TC_HIGH;</div><div class='add'>+	via1[vACR] |= 0x40;</div><div class='add'>+</div><div class='add'>+	clocksource_register_hz(&amp;mac_clk, VIA_CLOCK_FREQ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mac_read_clk(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 count_high;</div><div class='add'>+	u16 count;</div><div class='add'>+	u32 ticks;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Timer counter wrap-around is detected with the timer interrupt flag</div><div class='add'>+	 * but reading the counter low byte (vT1CL) would reset the flag.</div><div class='add'>+	 * Also, accessing both counter registers is essentially a data race.</div><div class='add'>+	 * These problems are avoided by ignoring the low byte. Clock accuracy</div><div class='add'>+	 * is 256 times worse (error can reach 0.327 ms) but CPU overhead is</div><div class='add'>+	 * reduced by avoiding slow VIA register accesses.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	count_high = via1[vT1CH];</div><div class='add'>+	if (count_high == 0xFF)</div><div class='add'>+		count_high = 0;</div><div class='add'>+	if (count_high &gt; 0 &amp;&amp; (via1[vIFR] &amp; VIA_TIMER_1_INT))</div><div class='add'>+		clk_offset = VIA_TIMER_CYCLES;</div><div class='add'>+	count = count_high &lt;&lt; 8;</div><div class='add'>+	ticks = VIA_TIMER_CYCLES - count;</div><div class='add'>+	ticks += clk_offset + clk_total;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return ticks;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c<br/>index adea549d240e..545a1fe0e119 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mvme147/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mvme147/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mvme147/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/mvme147/config.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -38,18 +39,12 @@</div><div class='ctx'> </div><div class='ctx'> static void mvme147_get_model(char *model);</div><div class='ctx'> extern void mvme147_sched_init(irq_handler_t handler);</div><div class='del'>-extern u32 mvme147_gettimeoffset(void);</div><div class='ctx'> extern int mvme147_hwclk (int, struct rtc_time *);</div><div class='ctx'> extern void mvme147_reset (void);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int bcd2int (unsigned char b);</div><div class='ctx'> </div><div class='del'>-/* Save tick handler routine pointer, will point to xtime_update() in</div><div class='del'>- * kernel/time/timekeeping.c, called via mvme147_process_int() */</div><div class='del'>-</div><div class='del'>-irq_handler_t tick_handler;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> int __init mvme147_parse_bootinfo(const struct bi_record *bi)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,7 +84,6 @@ void __init config_mvme147(void)</div><div class='ctx'> 	mach_max_dma_address	= 0x01000000;</div><div class='ctx'> 	mach_sched_init		= mvme147_sched_init;</div><div class='ctx'> 	mach_init_IRQ		= mvme147_init_IRQ;</div><div class='del'>-	arch_gettimeoffset	= mvme147_gettimeoffset;</div><div class='ctx'> 	mach_hwclk		= mvme147_hwclk;</div><div class='ctx'> 	mach_reset		= mvme147_reset;</div><div class='ctx'> 	mach_get_model		= mvme147_get_model;</div><div class='hunk'>@@ -99,45 +93,76 @@ void __init config_mvme147(void)</div><div class='ctx'> 		vme_brdtype = VME_TYPE_MVME147;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 mvme147_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource mvme147_clk = {</div><div class='add'>+	.name   = "pcc",</div><div class='add'>+	.rating = 250,</div><div class='add'>+	.read   = mvme147_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 clk_total;</div><div class='add'>+</div><div class='add'>+#define PCC_TIMER_CLOCK_FREQ 160000</div><div class='add'>+#define PCC_TIMER_CYCLES     (PCC_TIMER_CLOCK_FREQ / HZ)</div><div class='add'>+#define PCC_TIMER_PRELOAD    (0x10000 - PCC_TIMER_CYCLES)</div><div class='ctx'> </div><div class='ctx'> /* Using pcc tick timer 1 */</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t mvme147_timer_int (int irq, void *dev_id)</div><div class='ctx'> {</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	m147_pcc-&gt;t1_int_cntrl = PCC_TIMER_INT_CLR;</div><div class='del'>-	m147_pcc-&gt;t1_int_cntrl = PCC_INT_ENAB|PCC_LEVEL_TIMER1;</div><div class='del'>-	return tick_handler(irq, dev_id);</div><div class='add'>+	m147_pcc-&gt;t1_cntrl = PCC_TIMER_CLR_OVF;</div><div class='add'>+	clk_total += PCC_TIMER_CYCLES;</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void mvme147_sched_init (irq_handler_t timer_routine)</div><div class='ctx'> {</div><div class='del'>-	tick_handler = timer_routine;</div><div class='del'>-	if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, 0, "timer 1", NULL))</div><div class='add'>+	if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQF_TIMER,</div><div class='add'>+			"timer 1", timer_routine))</div><div class='ctx'> 		pr_err("Couldn't register timer interrupt\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Init the clock with a value */</div><div class='del'>-	/* our clock goes off every 6.25us */</div><div class='add'>+	/* The clock counter increments until 0xFFFF then reloads */</div><div class='ctx'> 	m147_pcc-&gt;t1_preload = PCC_TIMER_PRELOAD;</div><div class='ctx'> 	m147_pcc-&gt;t1_cntrl = 0x0;	/* clear timer */</div><div class='ctx'> 	m147_pcc-&gt;t1_cntrl = 0x3;	/* start timer */</div><div class='ctx'> 	m147_pcc-&gt;t1_int_cntrl = PCC_TIMER_INT_CLR;  /* clear pending ints */</div><div class='ctx'> 	m147_pcc-&gt;t1_int_cntrl = PCC_INT_ENAB|PCC_LEVEL_TIMER1;</div><div class='add'>+</div><div class='add'>+	clocksource_register_hz(&amp;mvme147_clk, PCC_TIMER_CLOCK_FREQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This is always executed with interrupts disabled.  */</div><div class='del'>-/* XXX There are race hazards in this code XXX */</div><div class='del'>-u32 mvme147_gettimeoffset(void)</div><div class='add'>+static u64 mvme147_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned short *cp = (volatile unsigned short *)0xfffe1012;</div><div class='del'>-	unsigned short n;</div><div class='del'>-</div><div class='del'>-	n = *cp;</div><div class='del'>-	while (n != *cp)</div><div class='del'>-		n = *cp;</div><div class='del'>-</div><div class='del'>-	n -= PCC_TIMER_PRELOAD;</div><div class='del'>-	return ((unsigned long)n * 25 / 4) * 1000;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 overflow, tmp;</div><div class='add'>+	u16 count;</div><div class='add'>+	u32 ticks;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tmp = m147_pcc-&gt;t1_cntrl &gt;&gt; 4;</div><div class='add'>+	count = m147_pcc-&gt;t1_count;</div><div class='add'>+	overflow = m147_pcc-&gt;t1_cntrl &gt;&gt; 4;</div><div class='add'>+	if (overflow != tmp)</div><div class='add'>+		count = m147_pcc-&gt;t1_count;</div><div class='add'>+	count -= PCC_TIMER_PRELOAD;</div><div class='add'>+	ticks = count + overflow * PCC_TIMER_CYCLES;</div><div class='add'>+	ticks += clk_total;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcd2int (unsigned char b)</div><div class='head'>diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c<br/>index 6ee36a5b528d..9bc2da69f80c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mvme16x/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/mvme16x/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/mvme16x/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/mvme16x/config.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -44,17 +45,11 @@ static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;</div><div class='ctx'> </div><div class='ctx'> static void mvme16x_get_model(char *model);</div><div class='ctx'> extern void mvme16x_sched_init(irq_handler_t handler);</div><div class='del'>-extern u32 mvme16x_gettimeoffset(void);</div><div class='ctx'> extern int mvme16x_hwclk (int, struct rtc_time *);</div><div class='ctx'> extern void mvme16x_reset (void);</div><div class='ctx'> </div><div class='ctx'> int bcd2int (unsigned char b);</div><div class='ctx'> </div><div class='del'>-/* Save tick handler routine pointer, will point to xtime_update() in</div><div class='del'>- * kernel/time/timekeeping.c, called via mvme16x_process_int() */</div><div class='del'>-</div><div class='del'>-static irq_handler_t tick_handler;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> unsigned short mvme16x_config;</div><div class='ctx'> EXPORT_SYMBOL(mvme16x_config);</div><div class='hunk'>@@ -120,11 +115,11 @@ static void __init mvme16x_init_IRQ (void)</div><div class='ctx'> 	m68k_setup_user_interrupt(VEC_USER, 192);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define pcc2chip	((volatile u_char *)0xfff42000)</div><div class='del'>-#define PccSCCMICR	0x1d</div><div class='del'>-#define PccSCCTICR	0x1e</div><div class='del'>-#define PccSCCRICR	0x1f</div><div class='del'>-#define PccTPIACKR	0x25</div><div class='add'>+#define PCC2CHIP   (0xfff42000)</div><div class='add'>+#define PCCSCCMICR (PCC2CHIP + 0x1d)</div><div class='add'>+#define PCCSCCTICR (PCC2CHIP + 0x1e)</div><div class='add'>+#define PCCSCCRICR (PCC2CHIP + 0x1f)</div><div class='add'>+#define PCCTPIACKR (PCC2CHIP + 0x25)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EARLY_PRINTK</div><div class='ctx'> </div><div class='hunk'>@@ -232,10 +227,10 @@ void mvme16x_cons_write(struct console *co, const char *str, unsigned count)</div><div class='ctx'> 	base_addr[CyIER] = CyTxMpty;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (pcc2chip[PccSCCTICR] &amp; 0x20)</div><div class='add'>+		if (in_8(PCCSCCTICR) &amp; 0x20)</div><div class='ctx'> 		{</div><div class='ctx'> 			/* We have a Tx int. Acknowledge it */</div><div class='del'>-			sink = pcc2chip[PccTPIACKR];</div><div class='add'>+			sink = in_8(PCCTPIACKR);</div><div class='ctx'> 			if ((base_addr[CyLICR] &gt;&gt; 2) == port) {</div><div class='ctx'> 				if (i == count) {</div><div class='ctx'> 					/* Last char of string is now output */</div><div class='hunk'>@@ -277,7 +272,6 @@ void __init config_mvme16x(void)</div><div class='ctx'>     mach_max_dma_address = 0xffffffff;</div><div class='ctx'>     mach_sched_init      = mvme16x_sched_init;</div><div class='ctx'>     mach_init_IRQ        = mvme16x_init_IRQ;</div><div class='del'>-    arch_gettimeoffset   = mvme16x_gettimeoffset;</div><div class='ctx'>     mach_hwclk           = mvme16x_hwclk;</div><div class='ctx'>     mach_reset		 = mvme16x_reset;</div><div class='ctx'>     mach_get_model       = mvme16x_get_model;</div><div class='hunk'>@@ -350,10 +344,46 @@ static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 mvme16x_read_clk(struct clocksource *cs);</div><div class='add'>+</div><div class='add'>+static struct clocksource mvme16x_clk = {</div><div class='add'>+	.name   = "pcc",</div><div class='add'>+	.rating = 250,</div><div class='add'>+	.read   = mvme16x_read_clk,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 clk_total;</div><div class='add'>+</div><div class='add'>+#define PCC_TIMER_CLOCK_FREQ 1000000</div><div class='add'>+#define PCC_TIMER_CYCLES     (PCC_TIMER_CLOCK_FREQ / HZ)</div><div class='add'>+</div><div class='add'>+#define PCCTCMP1             (PCC2CHIP + 0x04)</div><div class='add'>+#define PCCTCNT1             (PCC2CHIP + 0x08)</div><div class='add'>+#define PCCTOVR1             (PCC2CHIP + 0x17)</div><div class='add'>+#define PCCTIC1              (PCC2CHIP + 0x1b)</div><div class='add'>+</div><div class='add'>+#define PCCTOVR1_TIC_EN      0x01</div><div class='add'>+#define PCCTOVR1_COC_EN      0x02</div><div class='add'>+#define PCCTOVR1_OVR_CLR     0x04</div><div class='add'>+</div><div class='add'>+#define PCCTIC1_INT_CLR      0x08</div><div class='add'>+#define PCCTIC1_INT_EN       0x10</div><div class='add'>+</div><div class='ctx'> static irqreturn_t mvme16x_timer_int (int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-    *(volatile unsigned char *)0xfff4201b |= 8;</div><div class='del'>-    return tick_handler(irq, dev_id);</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	out_8(PCCTIC1, in_8(PCCTIC1) | PCCTIC1_INT_CLR);</div><div class='add'>+	out_8(PCCTOVR1, PCCTOVR1_OVR_CLR);</div><div class='add'>+	clk_total += PCC_TIMER_CYCLES;</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mvme16x_sched_init (irq_handler_t timer_routine)</div><div class='hunk'>@@ -361,16 +391,17 @@ void mvme16x_sched_init (irq_handler_t timer_routine)</div><div class='ctx'>     uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);</div><div class='ctx'>     int irq;</div><div class='ctx'> </div><div class='del'>-    tick_handler = timer_routine;</div><div class='ctx'>     /* Using PCCchip2 or MC2 chip tick timer 1 */</div><div class='del'>-    *(volatile unsigned long *)0xfff42008 = 0;</div><div class='del'>-    *(volatile unsigned long *)0xfff42004 = 10000;	/* 10ms */</div><div class='del'>-    *(volatile unsigned char *)0xfff42017 |= 3;</div><div class='del'>-    *(volatile unsigned char *)0xfff4201b = 0x16;</div><div class='del'>-    if (request_irq(MVME16x_IRQ_TIMER, mvme16x_timer_int, 0,</div><div class='del'>-				"timer", mvme16x_timer_int))</div><div class='add'>+    out_be32(PCCTCNT1, 0);</div><div class='add'>+    out_be32(PCCTCMP1, PCC_TIMER_CYCLES);</div><div class='add'>+    out_8(PCCTOVR1, in_8(PCCTOVR1) | PCCTOVR1_TIC_EN | PCCTOVR1_COC_EN);</div><div class='add'>+    out_8(PCCTIC1, PCCTIC1_INT_EN | 6);</div><div class='add'>+    if (request_irq(MVME16x_IRQ_TIMER, mvme16x_timer_int, IRQF_TIMER, "timer",</div><div class='add'>+                    timer_routine))</div><div class='ctx'> 	panic ("Couldn't register timer int");</div><div class='ctx'> </div><div class='add'>+    clocksource_register_hz(&amp;mvme16x_clk, PCC_TIMER_CLOCK_FREQ);</div><div class='add'>+</div><div class='ctx'>     if (brdno == 0x0162 || brdno == 0x172)</div><div class='ctx'> 	irq = MVME162_IRQ_ABORT;</div><div class='ctx'>     else</div><div class='hunk'>@@ -380,11 +411,23 @@ void mvme16x_sched_init (irq_handler_t timer_routine)</div><div class='ctx'> 	panic ("Couldn't register abort int");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* This is always executed with interrupts disabled.  */</div><div class='del'>-u32 mvme16x_gettimeoffset(void)</div><div class='add'>+static u64 mvme16x_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-    return (*(volatile u32 *)0xfff42008) * 1000;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 overflow, tmp;</div><div class='add'>+	u32 ticks;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	tmp = in_8(PCCTOVR1) &gt;&gt; 4;</div><div class='add'>+	ticks = in_be32(PCCTCNT1);</div><div class='add'>+	overflow = in_8(PCCTOVR1) &gt;&gt; 4;</div><div class='add'>+	if (overflow != tmp)</div><div class='add'>+		ticks = in_be32(PCCTCNT1);</div><div class='add'>+	ticks += overflow * PCC_TIMER_CYCLES;</div><div class='add'>+	ticks += clk_total;</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bcd2int (unsigned char b)</div><div class='head'>diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c<br/>index 96810d91da2b..e63eb5f06999 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/q40/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/q40/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/q40/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/q40/config.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@ extern void q40_init_IRQ(void);</div><div class='ctx'> static void q40_get_model(char *model);</div><div class='ctx'> extern void q40_sched_init(irq_handler_t handler);</div><div class='ctx'> </div><div class='del'>-static u32 q40_gettimeoffset(void);</div><div class='ctx'> static int q40_hwclk(int, struct rtc_time *);</div><div class='ctx'> static unsigned int q40_get_ss(void);</div><div class='ctx'> static int q40_get_rtc_pll(struct rtc_pll_info *pll);</div><div class='hunk'>@@ -169,7 +168,6 @@ void __init config_q40(void)</div><div class='ctx'> 	mach_sched_init = q40_sched_init;</div><div class='ctx'> </div><div class='ctx'> 	mach_init_IRQ = q40_init_IRQ;</div><div class='del'>-	arch_gettimeoffset = q40_gettimeoffset;</div><div class='ctx'> 	mach_hwclk = q40_hwclk;</div><div class='ctx'> 	mach_get_ss = q40_get_ss;</div><div class='ctx'> 	mach_get_rtc_pll = q40_get_rtc_pll;</div><div class='hunk'>@@ -201,13 +199,6 @@ int __init q40_parse_bootinfo(const struct bi_record *rec)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static u32 q40_gettimeoffset(void)</div><div class='del'>-{</div><div class='del'>-	return 5000 * (ql_ticks != 0) * 1000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Looks like op is non-zero for setting the clock, and zero for</div><div class='ctx'>  * reading the clock.</div><div class='head'>diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c<br/>index 3e7603202977..1c696906c159 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/q40/q40ints.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/q40/q40ints.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/q40/q40ints.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/q40/q40ints.c</a></div><div class='hunk'>@@ -127,10 +127,10 @@ void q40_mksound(unsigned int hz, unsigned int ticks)</div><div class='ctx'> 	sound_ticks = ticks &lt;&lt; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irq_handler_t q40_timer_routine;</div><div class='del'>-</div><div class='del'>-static irqreturn_t q40_timer_int (int irq, void * dev)</div><div class='add'>+static irqreturn_t q40_timer_int(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+</div><div class='ctx'> 	ql_ticks = ql_ticks ? 0 : 1;</div><div class='ctx'> 	if (sound_ticks) {</div><div class='ctx'> 		unsigned char sval=(sound_ticks &amp; 1) ? 128-SVOL : 128+SVOL;</div><div class='hunk'>@@ -139,8 +139,13 @@ static irqreturn_t q40_timer_int (int irq, void * dev)</div><div class='ctx'> 		*DAC_RIGHT=sval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ql_ticks)</div><div class='del'>-		q40_timer_routine(irq, dev);</div><div class='add'>+	if (!ql_ticks) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		timer_routine(0, NULL);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -148,11 +153,9 @@ void q40_sched_init (irq_handler_t timer_routine)</div><div class='ctx'> {</div><div class='ctx'> 	int timer_irq;</div><div class='ctx'> </div><div class='del'>-	q40_timer_routine = timer_routine;</div><div class='ctx'> 	timer_irq = Q40_IRQ_FRAME;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(timer_irq, q40_timer_int, 0,</div><div class='del'>-				"timer", q40_timer_int))</div><div class='add'>+	if (request_irq(timer_irq, q40_timer_int, 0, "timer", timer_routine))</div><div class='ctx'> 		panic("Couldn't register timer int");</div><div class='ctx'> </div><div class='ctx'> 	master_outb(-1, FRAME_CLEAR_REG);</div><div class='head'>diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c<br/>index 542c4404861c..229ea37dfe1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/sun3/config.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> char sun3_reserved_pmeg[SUN3_PMEGS_NUM];</div><div class='ctx'> </div><div class='del'>-extern u32 sun3_gettimeoffset(void);</div><div class='ctx'> static void sun3_sched_init(irq_handler_t handler);</div><div class='ctx'> extern void sun3_get_model (char* model);</div><div class='ctx'> extern int sun3_hwclk(int set, struct rtc_time *t);</div><div class='hunk'>@@ -138,7 +137,6 @@ void __init config_sun3(void)</div><div class='ctx'>         mach_sched_init      =  sun3_sched_init;</div><div class='ctx'>         mach_init_IRQ        =  sun3_init_IRQ;</div><div class='ctx'>         mach_reset           =  sun3_reboot;</div><div class='del'>-	arch_gettimeoffset   =  sun3_gettimeoffset;</div><div class='ctx'> 	mach_get_model	     =  sun3_get_model;</div><div class='ctx'> 	mach_hwclk           =  sun3_hwclk;</div><div class='ctx'> 	mach_halt	     =  sun3_halt;</div><div class='head'>diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c<br/>index d911070af02a..8fc74864de81 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3/intersil.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3/intersil.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3/intersil.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/sun3/intersil.c</a></div><div class='hunk'>@@ -22,13 +22,6 @@</div><div class='ctx'> #define STOP_VAL (INTERSIL_STOP | INTERSIL_INT_ENABLE | INTERSIL_24H_MODE)</div><div class='ctx'> #define START_VAL (INTERSIL_RUN | INTERSIL_INT_ENABLE | INTERSIL_24H_MODE)</div><div class='ctx'> </div><div class='del'>-/* does this need to be implemented? */</div><div class='del'>-u32 sun3_gettimeoffset(void)</div><div class='del'>-{</div><div class='del'>-  return 1000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* get/set hwclock */</div><div class='ctx'> </div><div class='ctx'> int sun3_hwclk(int set, struct rtc_time *t)</div><div class='head'>diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c<br/>index 6bbca30c9188..a5824abb4a39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3/sun3ints.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3/sun3ints.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3/sun3ints.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/sun3/sun3ints.c</a></div><div class='hunk'>@@ -61,8 +61,10 @@ static irqreturn_t sun3_int7(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t sun3_int5(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned int cnt;</div><div class='ctx'> </div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> 	intersil_clear();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -76,6 +78,7 @@ static irqreturn_t sun3_int5(int irq, void *dev_id)</div><div class='ctx'> 	cnt = kstat_irqs_cpu(irq, 0);</div><div class='ctx'> 	if (!(cnt % 20))</div><div class='ctx'> 		sun3_leds(led_pattern[cnt % 160 / 20]);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c<br/>index 33d3a1c6fba0..03ce7f9facfe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3x/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3x/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3x/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/sun3x/config.c</a></div><div class='hunk'>@@ -49,7 +49,6 @@ void __init config_sun3x(void)</div><div class='ctx'> 	mach_sched_init      = sun3x_sched_init;</div><div class='ctx'> 	mach_init_IRQ        = sun3_init_IRQ;</div><div class='ctx'> </div><div class='del'>-	arch_gettimeoffset   = sun3x_gettimeoffset;</div><div class='ctx'> 	mach_reset           = sun3x_reboot;</div><div class='ctx'> </div><div class='ctx'> 	mach_hwclk           = sun3x_hwclk;</div><div class='head'>diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c<br/>index 047e2bcee3d7..9163294b0fb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3x/time.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3x/time.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3x/time.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/sun3x/time.c</a></div><div class='hunk'>@@ -73,22 +73,21 @@ int sun3x_hwclk(int set, struct rtc_time *t)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-/* Not much we can do here */</div><div class='del'>-u32 sun3x_gettimeoffset(void)</div><div class='del'>-{</div><div class='del'>-    return 0L;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+static irqreturn_t sun3x_timer_tick(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-    void (*vector)(int, void *, struct pt_regs *) = dev_id;</div><div class='add'>+	irq_handler_t timer_routine = dev_id;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-    /* Clear the pending interrupt - pulse the enable line low */</div><div class='del'>-    disable_irq(5);</div><div class='del'>-    enable_irq(5);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	/* Clear the pending interrupt - pulse the enable line low */</div><div class='add'>+	disable_irq(5);</div><div class='add'>+	enable_irq(5);</div><div class='add'>+	timer_routine(0, NULL);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-    vector(irq, NULL, regs);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/sun3x/time.h b/arch/m68k/sun3x/time.h<br/>index 496f406412ad..86ce78bb3c28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3x/time.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/m68k/sun3x/time.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/m68k/sun3x/time.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/m68k/sun3x/time.h</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> #define SUN3X_TIME_H</div><div class='ctx'> </div><div class='ctx'> extern int sun3x_hwclk(int set, struct rtc_time *t);</div><div class='del'>-u32 sun3x_gettimeoffset(void);</div><div class='ctx'> void sun3x_sched_init(irq_handler_t vector);</div><div class='ctx'> </div><div class='ctx'> struct mostek_dt {</div><div class='head'>diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig<br/>index a51b965b3b82..adb179f519f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/Kconfig</a></div><div class='hunk'>@@ -41,6 +41,7 @@ config MICROBLAZE</div><div class='ctx'> 	select TRACING_SUPPORT</div><div class='ctx'> 	select VIRT_TO_BUS</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS</div><div class='add'>+	select MMU_GATHER_NO_RANGE if MMU</div><div class='ctx'> </div><div class='ctx'> # Endianness selection</div><div class='ctx'> choice</div><div class='hunk'>@@ -58,15 +59,9 @@ config CPU_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config ZONE_DMA</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild<br/>index 791cc8d54d0a..17a8d0a62038 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/include/asm/Kbuild</a></div><div class='hunk'>@@ -17,11 +17,13 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += linkage.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='head'>diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/include/asm/syscall.h<br/>index 220decd605a4..3a6924f3cbde 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/include/asm/syscall.h</a></div><div class='hunk'>@@ -82,18 +82,22 @@ static inline void microblaze_set_syscall_arg(struct pt_regs *regs,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+	unsigned int n = 6;</div><div class='add'>+</div><div class='ctx'> 	while (n--)</div><div class='ctx'> 		*args++ = microblaze_get_syscall_arg(regs, i++);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+	unsigned int n = 6;</div><div class='add'>+</div><div class='ctx'> 	while (n--)</div><div class='ctx'> 		microblaze_set_syscall_arg(regs, i++, *args++);</div><div class='ctx'> }</div><div class='hunk'>@@ -101,7 +105,7 @@ static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> asmlinkage unsigned long do_syscall_trace_enter(struct pt_regs *regs);</div><div class='ctx'> asmlinkage void do_syscall_trace_leave(struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_MICROBLAZE;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/microblaze/include/asm/tlb.h b/arch/microblaze/include/asm/tlb.h<br/>index 99b6ded54849..628a78ee0a72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/include/asm/tlb.h</a></div><div class='hunk'>@@ -11,16 +11,7 @@</div><div class='ctx'> #ifndef _ASM_MICROBLAZE_TLB_H</div><div class='ctx'> #define _ASM_MICROBLAZE_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb)	flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-#define tlb_start_vma(tlb, vma)		do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)		do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_MICROBLAZE_TLB_H */</div><div class='head'>diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild<br/>index 3ce84fbb2678..13f59631c576 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,3 +1,2 @@</div><div class='ctx'> generated-y += unistd_32.h</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl<br/>index 8ee3a8c18498..4964947732af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -429,3 +429,7 @@</div><div class='ctx'> 421	common	rt_sigtimedwait_time64		sys_rt_sigtimedwait</div><div class='ctx'> 422	common	futex_time64			sys_futex</div><div class='ctx'> 423	common	sched_rr_get_interval_time64	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c<br/>index c2ce1e42b888..8fe54fda31dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/mm/pgtable.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/microblaze/mm/pgtable.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/microblaze/mm/pgtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/microblaze/mm/pgtable.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size,</div><div class='ctx'> 		p &gt;= memory_start &amp;&amp; p &lt; virt_to_phys(high_memory) &amp;&amp;</div><div class='ctx'> 		!(p &gt;= __virt_to_phys((phys_addr_t)__bss_stop) &amp;&amp;</div><div class='ctx'> 		p &lt; __virt_to_phys((phys_addr_t)__bss_stop))) {</div><div class='del'>-		pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n",</div><div class='add'>+		pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %ps\n",</div><div class='ctx'> 			(unsigned long)p, __builtin_return_address(0));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig<br/>index fb8a39d53168..ff8cff9fcf54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/Kconfig</a></div><div class='hunk'>@@ -1036,13 +1036,6 @@ source "arch/mips/paravirt/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c<br/>index 4a70c5de8c92..25a57895a3a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/ath79/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/ath79/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/ath79/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/ath79/setup.c</a></div><div class='hunk'>@@ -210,12 +210,6 @@ const char *get_system_type(void)</div><div class='ctx'> 	return ath79_sys_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int get_c0_perfcount_int(void)</div><div class='del'>-{</div><div class='del'>-	return ATH79_MISC_IRQ(5);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(get_c0_perfcount_int);</div><div class='del'>-</div><div class='ctx'> unsigned int get_c0_compare_int(void)</div><div class='ctx'> {</div><div class='ctx'> 	return CP0_LEGACY_COMPARE_IRQ;</div><div class='head'>diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig<br/>index 9fbfb6e5c7d2..c83fdf649327 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/ar7_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/ar7_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/ar7_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/ar7_defconfig</a></div><div class='hunk'>@@ -18,7 +18,6 @@ CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_BSD_DISKLABEL=y</div><div class='head'>diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig<br/>index 0c86ed86266a..30a6eafdb1d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/decstation_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/decstation_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/decstation_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/decstation_defconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ CONFIG_TC=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_OSF_PARTITION=y</div><div class='ctx'> # CONFIG_EFI_PARTITION is not set</div><div class='head'>diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig<br/>index 0e54ab2680ce..e2b58dbf4aa9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/decstation_r4k_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/decstation_r4k_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/decstation_r4k_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/decstation_r4k_defconfig</a></div><div class='hunk'>@@ -16,7 +16,6 @@ CONFIG_TC=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_OSF_PARTITION=y</div><div class='ctx'> # CONFIG_EFI_PARTITION is not set</div><div class='head'>diff --git a/arch/mips/configs/generic/board-ocelot.config b/arch/mips/configs/generic/board-ocelot.config<br/>index f607888d2483..184eb65a6ba7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/generic/board-ocelot.config?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/generic/board-ocelot.config</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/generic/board-ocelot.config?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/generic/board-ocelot.config</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> # require CONFIG_CPU_MIPS32_R2=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_LEGACY_BOARD_OCELOT=y</div><div class='add'>+CONFIG_FIT_IMAGE_FDT_OCELOT=y</div><div class='add'>+</div><div class='add'>+CONFIG_BRIDGE=y</div><div class='add'>+CONFIG_GENERIC_PHY=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='hunk'>@@ -19,6 +23,8 @@ CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_NET_SWITCHDEV=y</div><div class='add'>+CONFIG_NET_DSA=y</div><div class='ctx'> CONFIG_MSCC_OCELOT_SWITCH=y</div><div class='ctx'> CONFIG_MSCC_OCELOT_SWITCH_OCELOT=y</div><div class='ctx'> CONFIG_MDIO_MSCC_MIIM=y</div><div class='hunk'>@@ -35,6 +41,8 @@ CONFIG_SPI_DESIGNWARE=y</div><div class='ctx'> CONFIG_SPI_DW_MMIO=y</div><div class='ctx'> CONFIG_SPI_SPIDEV=y</div><div class='ctx'> </div><div class='add'>+CONFIG_PINCTRL_OCELOT=y</div><div class='add'>+</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='head'>diff --git a/arch/mips/configs/loongson1b_defconfig b/arch/mips/configs/loongson1b_defconfig<br/>index b064d68a5424..aa7e98c5f5fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/loongson1b_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/loongson1b_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/loongson1b_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/loongson1b_defconfig</a></div><div class='hunk'>@@ -19,7 +19,6 @@ CONFIG_MACH_LOONGSON32=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='ctx'> CONFIG_NET=y</div><div class='head'>diff --git a/arch/mips/configs/loongson1c_defconfig b/arch/mips/configs/loongson1c_defconfig<br/>index 5d76559b56cd..520e7ef35383 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/loongson1c_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/loongson1c_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/loongson1c_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/loongson1c_defconfig</a></div><div class='hunk'>@@ -20,7 +20,6 @@ CONFIG_LOONGSON1_LS1C=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='ctx'> CONFIG_NET=y</div><div class='head'>diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_defconfig<br/>index 7befe05fd813..ed1038f62a2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/rb532_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/rb532_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/rb532_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/rb532_defconfig</a></div><div class='hunk'>@@ -19,7 +19,6 @@ CONFIG_PCI=y</div><div class='ctx'> # CONFIG_PCI_QUIRKS is not set</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_MAC_PARTITION=y</div><div class='head'>diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig<br/>index 50a2c9ad583f..b0f0c5f9ad9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/rbtx49xx_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/configs/rbtx49xx_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/configs/rbtx49xx_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/configs/rbtx49xx_defconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='head'>diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h<br/>index 845fbbc7a2e3..29997e42480e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/include/asm/io.h</a></div><div class='hunk'>@@ -102,9 +102,6 @@ static inline void set_io_port_base(unsigned long base)</div><div class='ctx'> #define iobarrier_w() wmb()</div><div class='ctx'> #define iobarrier_sync() iob()</div><div class='ctx'> </div><div class='del'>-/* Some callers use this older API instead.  */</div><div class='del'>-#define mmiowb() iobarrier_w()</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *     virt_to_phys    -       map virtual addresses to physical</div><div class='ctx'>  *     @address: address to remap</div><div class='head'>diff --git a/arch/mips/include/asm/mmiowb.h b/arch/mips/include/asm/mmiowb.h<br/>new file mode 100644<br/>index 000000000000..a40824e3ef8e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/include/asm/mmiowb.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_MMIOWB_H</div><div class='add'>+#define _ASM_MMIOWB_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define mmiowb()	iobarrier_w()</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/mmiowb.h&gt;</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_MMIOWB_H */</div><div class='head'>diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h<br/>index ee81297d9117..8a88eb265516 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/spinlock.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/spinlock.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/include/asm/spinlock.h</a></div><div class='hunk'>@@ -11,6 +11,21 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/qrwlock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/qspinlock_types.h&gt;</div><div class='add'>+</div><div class='add'>+#define	queued_spin_unlock queued_spin_unlock</div><div class='add'>+/**</div><div class='add'>+ * queued_spin_unlock - release a queued spinlock</div><div class='add'>+ * @lock : Pointer to queued spinlock structure</div><div class='add'>+ */</div><div class='add'>+static inline void queued_spin_unlock(struct qspinlock *lock)</div><div class='add'>+{</div><div class='add'>+	/* This could be optimised with ARCH_HAS_MMIOWB */</div><div class='add'>+	mmiowb();</div><div class='add'>+	smp_store_release(&amp;lock-&gt;locked, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/qspinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_SPINLOCK_H */</div><div class='head'>diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h<br/>index 6cf8ffb5367e..acf80ae0a430 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/include/asm/syscall.h</a></div><div class='hunk'>@@ -116,9 +116,10 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+	unsigned int n = 6;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* O32 ABI syscall() */</div><div class='hunk'>@@ -140,14 +141,14 @@ extern const unsigned long sys_call_table[];</div><div class='ctx'> extern const unsigned long sys32_call_table[];</div><div class='ctx'> extern const unsigned long sysn32_call_table[];</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	int arch = AUDIT_ARCH_MIPS;</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-	if (!test_thread_flag(TIF_32BIT_REGS)) {</div><div class='add'>+	if (!test_tsk_thread_flag(task, TIF_32BIT_REGS)) {</div><div class='ctx'> 		arch |= __AUDIT_ARCH_64BIT;</div><div class='ctx'> 		/* N32 sets only TIF_32BIT_ADDR */</div><div class='del'>-		if (test_thread_flag(TIF_32BIT_ADDR))</div><div class='add'>+		if (test_tsk_thread_flag(task, TIF_32BIT_ADDR))</div><div class='ctx'> 			arch |= __AUDIT_ARCH_CONVENTION_MIPS64_N32;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/include/asm/tlb.h b/arch/mips/include/asm/tlb.h<br/>index b6823b9e94da..90f3ad76d9e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/include/asm/tlb.h</a></div><div class='hunk'>@@ -5,23 +5,6 @@</div><div class='ctx'> #include &lt;asm/cpu-features.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * MIPS doesn't need any special per-pte or per-vma handling, except</div><div class='del'>- * we need to flush cache for area to be unmapped.</div><div class='del'>- */</div><div class='del'>-#define tlb_start_vma(tlb, vma)					\</div><div class='del'>-	do {							\</div><div class='del'>-		if (!tlb-&gt;fullmm)				\</div><div class='del'>-			flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end); \</div><div class='del'>-	}  while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma) do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * .. because we flush the whole mm when it fills up.</div><div class='del'>- */</div><div class='del'>-#define tlb_flush(tlb) flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #define _UNIQUE_ENTRYHI(base, idx)					\</div><div class='ctx'> 		(((base) + ((idx) &lt;&lt; (PAGE_SHIFT + 1))) |		\</div><div class='ctx'> 		 (cpu_has_tlbinv ? MIPS_ENTRYHI_EHINV : 0))</div><div class='head'>diff --git a/arch/mips/include/uapi/asm/sockios.h b/arch/mips/include/uapi/asm/sockios.h<br/>index 5b40a88593fa..66f60234f290 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/include/uapi/asm/sockios.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/include/uapi/asm/sockios.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #define SIOCSPGRP	_IOW('s', 8, pid_t)</div><div class='ctx'> #define SIOCGPGRP	_IOR('s', 9, pid_t)</div><div class='ctx'> </div><div class='del'>-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */</div><div class='add'>+#define SIOCGSTAMP_OLD	0x8906		/* Get stamp (timeval) */</div><div class='add'>+#define SIOCGSTAMPNS_OLD 0x8907		/* Get stamp (timespec) */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_SOCKIOS_H */</div><div class='head'>diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c<br/>index 6e574c02e4c3..ea781b29f7f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/kgdb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/kgdb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kernel/kgdb.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct hard_trap_info {</div><div class='ctx'> 	unsigned char tt;	/* Trap type code for MIPS R3xxx and R4xxx */</div><div class='hunk'>@@ -214,7 +215,7 @@ void kgdb_call_nmi_hook(void *ignored)</div><div class='ctx'> 	old_fs = get_fs();</div><div class='ctx'> 	set_fs(KERNEL_DS);</div><div class='ctx'> </div><div class='del'>-	kgdb_nmicallback(raw_smp_processor_id(), NULL);</div><div class='add'>+	kgdb_nmicallback(raw_smp_processor_id(), get_irq_regs());</div><div class='ctx'> </div><div class='ctx'> 	set_fs(old_fs);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c<br/>index 0057c910bc2f..414b6e9c900b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/ptrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/ptrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kernel/ptrace.c</a></div><div class='hunk'>@@ -1418,8 +1418,8 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)</div><div class='ctx'> 		unsigned long args[6];</div><div class='ctx'> </div><div class='ctx'> 		sd.nr = syscall;</div><div class='del'>-		sd.arch = syscall_get_arch();</div><div class='del'>-		syscall_get_arguments(current, regs, 0, 6, args);</div><div class='add'>+		sd.arch = syscall_get_arch(current);</div><div class='add'>+		syscall_get_arguments(current, regs, args);</div><div class='ctx'> 		for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 			sd.args[i] = args[i];</div><div class='ctx'> 		sd.instruction_pointer = KSTK_EIP(current);</div><div class='head'>diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S<br/>index f158c5894a9a..feb2653490df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/scall64-o32.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/scall64-o32.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/scall64-o32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kernel/scall64-o32.S</a></div><div class='hunk'>@@ -125,7 +125,7 @@ trace_a_syscall:</div><div class='ctx'> 	subu	t1, v0,  __NR_O32_Linux</div><div class='ctx'> 	move	a1, v0</div><div class='ctx'> 	bnez	t1, 1f /* __NR_syscall at offset 0 */</div><div class='del'>-	lw	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */</div><div class='add'>+	ld	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */</div><div class='ctx'> 	.set	pop</div><div class='ctx'> </div><div class='ctx'> 1:	jal	syscall_trace_enter</div><div class='head'>diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl<br/>index 15f4117900ee..9392dfe33f97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/syscalls/syscall_n32.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/syscalls/syscall_n32.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/syscalls/syscall_n32.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kernel/syscalls/syscall_n32.tbl</a></div><div class='hunk'>@@ -362,3 +362,7 @@</div><div class='ctx'> 421	n32	rt_sigtimedwait_time64		compat_sys_rt_sigtimedwait_time64</div><div class='ctx'> 422	n32	futex_time64			sys_futex</div><div class='ctx'> 423	n32	sched_rr_get_interval_time64	sys_sched_rr_get_interval</div><div class='add'>+424	n32	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	n32	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	n32	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	n32	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl<br/>index c85502e67b44..cd0c8aa21fba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/syscalls/syscall_n64.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/syscalls/syscall_n64.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/syscalls/syscall_n64.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kernel/syscalls/syscall_n64.tbl</a></div><div class='hunk'>@@ -338,3 +338,7 @@</div><div class='ctx'> 327	n64	rseq				sys_rseq</div><div class='ctx'> 328	n64	io_pgetevents			sys_io_pgetevents</div><div class='ctx'> # 329 through 423 are reserved to sync up with other architectures</div><div class='add'>+424	n64	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	n64	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	n64	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	n64	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl<br/>index 2e063d0f837e..e849e8ffe4a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/syscalls/syscall_o32.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kernel/syscalls/syscall_o32.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kernel/syscalls/syscall_o32.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kernel/syscalls/syscall_o32.tbl</a></div><div class='hunk'>@@ -411,3 +411,7 @@</div><div class='ctx'> 421	o32	rt_sigtimedwait_time64		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait_time64</div><div class='ctx'> 422	o32	futex_time64			sys_futex			sys_futex</div><div class='ctx'> 423	o32	sched_rr_get_interval_time64	sys_sched_rr_get_interval	sys_sched_rr_get_interval</div><div class='add'>+424	o32	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	o32	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	o32	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	o32	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig<br/>index 4528bc9c3cb1..eac25aef21e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kvm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/kvm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/kvm/Kconfig</a></div><div class='hunk'>@@ -21,7 +21,6 @@ config KVM</div><div class='ctx'> 	depends on MIPS_FP_SUPPORT</div><div class='ctx'> 	select EXPORT_UASM</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT</div><div class='ctx'> 	select HAVE_KVM_VCPU_ASYNC_IOCTL</div><div class='ctx'> 	select KVM_MMIO</div><div class='head'>diff --git a/arch/mips/net/ebpf_jit.c b/arch/mips/net/ebpf_jit.c<br/>index 3548a69c82f7..dfd5a4b1b779 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/net/ebpf_jit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/net/ebpf_jit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/net/ebpf_jit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/net/ebpf_jit.c</a></div><div class='hunk'>@@ -193,8 +193,9 @@ enum which_ebpf_reg {</div><div class='ctx'>  * separate frame pointer, so BPF_REG_10 relative accesses are</div><div class='ctx'>  * adjusted to be $sp relative.</div><div class='ctx'>  */</div><div class='del'>-int ebpf_to_mips_reg(struct jit_ctx *ctx, const struct bpf_insn *insn,</div><div class='del'>-		     enum which_ebpf_reg w)</div><div class='add'>+static int ebpf_to_mips_reg(struct jit_ctx *ctx,</div><div class='add'>+			    const struct bpf_insn *insn,</div><div class='add'>+			    enum which_ebpf_reg w)</div><div class='ctx'> {</div><div class='ctx'> 	int ebpf_reg = (w == src_reg || w == src_reg_no_fp) ?</div><div class='ctx'> 		insn-&gt;src_reg : insn-&gt;dst_reg;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c<br/>index 710a59764b01..a32f843cdbe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/sgi-ip27/ip27-irq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/mips/sgi-ip27/ip27-irq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/mips/sgi-ip27/ip27-irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/mips/sgi-ip27/ip27-irq.c</a></div><div class='hunk'>@@ -118,7 +118,6 @@ static void shutdown_bridge_irq(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct hub_irq_data *hd = irq_data_get_irq_chip_data(d);</div><div class='ctx'> 	struct bridge_controller *bc;</div><div class='del'>-	int pin = hd-&gt;pin;</div><div class='ctx'> </div><div class='ctx'> 	if (!hd)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -126,7 +125,7 @@ static void shutdown_bridge_irq(struct irq_data *d)</div><div class='ctx'> 	disable_hub_irq(d);</div><div class='ctx'> </div><div class='ctx'> 	bc = hd-&gt;bc;</div><div class='del'>-	bridge_clr(bc, b_int_enable, (1 &lt;&lt; pin));</div><div class='add'>+	bridge_clr(bc, b_int_enable, (1 &lt;&lt; hd-&gt;pin));</div><div class='ctx'> 	bridge_read(bc, b_wid_tflush);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig<br/>index addb7f5f5264..55559ca0efe4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/Kconfig</a></div><div class='hunk'>@@ -60,9 +60,6 @@ config GENERIC_LOCKBREAK</div><div class='ctx'>         def_bool y</div><div class='ctx'> 	depends on PREEMPT</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/nds32/include/asm/Kbuild b/arch/nds32/include/asm/Kbuild<br/>index 64ceff7ab99b..688b6ed26227 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/include/asm/Kbuild</a></div><div class='hunk'>@@ -31,6 +31,7 @@ generic-y += limits.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='head'>diff --git a/arch/nds32/include/asm/elf.h b/arch/nds32/include/asm/elf.h<br/>index 95f3ea253e4c..02250626b9f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/elf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/elf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/include/asm/elf.h</a></div><div class='hunk'>@@ -10,14 +10,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='add'>+#include &lt;linux/elf-em.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long elf_greg_t;</div><div class='ctx'> typedef unsigned long elf_freg_t[3];</div><div class='ctx'> </div><div class='ctx'> extern unsigned int elf_hwcap;</div><div class='ctx'> </div><div class='del'>-#define EM_NDS32			167</div><div class='del'>-</div><div class='ctx'> #define R_NDS32_NONE			0</div><div class='ctx'> #define R_NDS32_16_RELA			19</div><div class='ctx'> #define R_NDS32_32_RELA			20</div><div class='head'>diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h<br/>index 71cd226d6863..5ef8ae5ba833 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/include/asm/io.h</a></div><div class='hunk'>@@ -55,8 +55,6 @@ static inline u32 __raw_readl(const volatile void __iomem *addr)</div><div class='ctx'> #define __iormb()               rmb()</div><div class='ctx'> #define __iowmb()               wmb()</div><div class='ctx'> </div><div class='del'>-#define mmiowb()        __asm__ __volatile__ ("msync all" : : : "memory");</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * {read,write}{b,w,l,q}_relaxed() are like the regular version, but</div><div class='ctx'>  * are not guaranteed to provide ordering against spinlocks or memory</div><div class='head'>diff --git a/arch/nds32/include/asm/syscall.h b/arch/nds32/include/asm/syscall.h<br/>index f7e5e86765fe..174b8571d362 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/include/asm/syscall.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #ifndef _ASM_NDS32_SYSCALL_H</div><div class='ctx'> #define _ASM_NDS32_SYSCALL_H	1</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> struct task_struct;</div><div class='ctx'> struct pt_regs;</div><div class='hunk'>@@ -108,81 +109,49 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'>  * syscall_get_arguments - extract system call parameter values</div><div class='ctx'>  * @task:	task of interest, must be blocked</div><div class='ctx'>  * @regs:	task_pt_regs() of @task</div><div class='del'>- * @i:		argument index [0,5]</div><div class='del'>- * @n:		number of arguments; n+i must be [1,6].</div><div class='ctx'>  * @args:	array filled with argument values</div><div class='ctx'>  *</div><div class='del'>- * Fetches @n arguments to the system call starting with the @i'th argument</div><div class='del'>- * (from 0 through 5).  Argument @i is stored in @args[0], and so on.</div><div class='del'>- * An arch inline version is probably optimal when @i and @n are constants.</div><div class='add'>+ * Fetches 6 arguments to the system call (from 0 through 5). The first</div><div class='add'>+ * argument is stored in @args[0], and so on.</div><div class='ctx'>  *</div><div class='ctx'>  * It's only valid to call this when @task is stopped for tracing on</div><div class='ctx'>  * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.</div><div class='del'>- * It's invalid to call this with @i + @n &gt; 6; we only support system calls</div><div class='del'>- * taking up to 6 arguments.</div><div class='ctx'>  */</div><div class='ctx'> #define SYSCALL_MAX_ARGS 6</div><div class='ctx'> void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-			   unsigned int i, unsigned int n, unsigned long *args)</div><div class='add'>+			   unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-	if (i + n &gt; SYSCALL_MAX_ARGS) {</div><div class='del'>-		unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;</div><div class='del'>-		unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;</div><div class='del'>-		pr_warning("%s called with max args %d, handling only %d\n",</div><div class='del'>-			   __func__, i + n, SYSCALL_MAX_ARGS);</div><div class='del'>-		memset(args_bad, 0, n_bad * sizeof(args[0]));</div><div class='del'>-		memset(args_bad, 0, n_bad * sizeof(args[0]));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		args[0] = regs-&gt;orig_r0;</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(args, &amp;regs-&gt;uregs[0] + i, n * sizeof(args[0]));</div><div class='add'>+	args[0] = regs-&gt;orig_r0;</div><div class='add'>+	args++;</div><div class='add'>+	memcpy(args, &amp;regs-&gt;uregs[0] + 1, 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * syscall_set_arguments - change system call parameter value</div><div class='ctx'>  * @task:	task of interest, must be in system call entry tracing</div><div class='ctx'>  * @regs:	task_pt_regs() of @task</div><div class='del'>- * @i:		argument index [0,5]</div><div class='del'>- * @n:		number of arguments; n+i must be [1,6].</div><div class='ctx'>  * @args:	array of argument values to store</div><div class='ctx'>  *</div><div class='del'>- * Changes @n arguments to the system call starting with the @i'th argument.</div><div class='del'>- * Argument @i gets value @args[0], and so on.</div><div class='del'>- * An arch inline version is probably optimal when @i and @n are constants.</div><div class='add'>+ * Changes 6 arguments to the system call. The first argument gets value</div><div class='add'>+ * @args[0], and so on.</div><div class='ctx'>  *</div><div class='ctx'>  * It's only valid to call this when @task is stopped for tracing on</div><div class='ctx'>  * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.</div><div class='del'>- * It's invalid to call this with @i + @n &gt; 6; we only support system calls</div><div class='del'>- * taking up to 6 arguments.</div><div class='ctx'>  */</div><div class='ctx'> void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-			   unsigned int i, unsigned int n,</div><div class='ctx'> 			   const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (i + n &gt; SYSCALL_MAX_ARGS) {</div><div class='del'>-		pr_warn("%s called with max args %d, handling only %d\n",</div><div class='del'>-			__func__, i + n, SYSCALL_MAX_ARGS);</div><div class='del'>-		n = SYSCALL_MAX_ARGS - i;</div><div class='del'>-	}</div><div class='add'>+	regs-&gt;orig_r0 = args[0];</div><div class='add'>+	args++;</div><div class='ctx'> </div><div class='del'>-	if (i == 0) {</div><div class='del'>-		regs-&gt;orig_r0 = args[0];</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='add'>+	memcpy(&amp;regs-&gt;uregs[0] + 1, args, 5 * sizeof(args[0]));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;regs-&gt;uregs[0] + i, args, n * sizeof(args[0]));</div><div class='add'>+static inline int</div><div class='add'>+syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)</div><div class='add'>+		? AUDIT_ARCH_NDS32BE : AUDIT_ARCH_NDS32;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_NDS32_SYSCALL_H */</div><div class='head'>diff --git a/arch/nds32/include/asm/tlb.h b/arch/nds32/include/asm/tlb.h<br/>index b35ae5eae3ab..d5ae571c8d30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/include/asm/tlb.h</a></div><div class='hunk'>@@ -4,22 +4,6 @@</div><div class='ctx'> #ifndef __ASMNDS32_TLB_H</div><div class='ctx'> #define __ASMNDS32_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_start_vma(tlb,vma)						\</div><div class='del'>-	do {								\</div><div class='del'>-		if (!tlb-&gt;fullmm)					\</div><div class='del'>-			flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_end_vma(tlb,vma)				\</div><div class='del'>-	do { 						\</div><div class='del'>-		if(!tlb-&gt;fullmm)			\</div><div class='del'>-			flush_tlb_range(vma, vma-&gt;vm_start, vma-&gt;vm_end); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, pte, addr) do { } while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_flush(tlb)	flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __pte_free_tlb(tlb, pte, addr)	pte_free((tlb)-&gt;mm, pte)</div><div class='head'>diff --git a/arch/nds32/include/asm/tlbflush.h b/arch/nds32/include/asm/tlbflush.h<br/>index 9b411f401903..38ee769b18d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/tlbflush.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nds32/include/asm/tlbflush.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nds32/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nds32/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -42,6 +42,5 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long addr);</div><div class='ctx'> </div><div class='ctx'> void update_mmu_cache(struct vm_area_struct *vma,</div><div class='ctx'> 		      unsigned long address, pte_t * pte);</div><div class='del'>-void tlb_migrate_finish(struct mm_struct *mm);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig<br/>index 4ef15a61b7bc..ea37394ff3ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nios2/Kconfig</a></div><div class='hunk'>@@ -24,6 +24,7 @@ config NIOS2</div><div class='ctx'> 	select USB_ARCH_HAS_HCD if USB_SUPPORT</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS</div><div class='ctx'> 	select ARCH_DISCARD_MEMBLOCK</div><div class='add'>+	select MMU_GATHER_NO_RANGE if MMU</div><div class='ctx'> </div><div class='ctx'> config GENERIC_CSUM</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -40,9 +41,6 @@ config NO_IOPORT_MAP</div><div class='ctx'> config FPU</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='head'>diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild<br/>index 8fde4fa2c34f..d7ef3512504a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nios2/include/asm/Kbuild</a></div><div class='hunk'>@@ -23,9 +23,11 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += module.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='head'>diff --git a/arch/nios2/include/asm/syscall.h b/arch/nios2/include/asm/syscall.h<br/>index 9de220854c4a..c4f3f8b86f28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nios2/include/asm/syscall.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #ifndef __ASM_NIOS2_SYSCALL_H__</div><div class='ctx'> #define __ASM_NIOS2_SYSCALL_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -58,81 +59,30 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='del'>-	struct pt_regs *regs, unsigned int i, unsigned int n,</div><div class='del'>-	unsigned long *args)</div><div class='add'>+	struct pt_regs *regs, unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-</div><div class='del'>-	switch (i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;r4;</div><div class='del'>-	case 1:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;r5;</div><div class='del'>-	case 2:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;r6;</div><div class='del'>-	case 3:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;r7;</div><div class='del'>-	case 4:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;r8;</div><div class='del'>-	case 5:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = regs-&gt;r9;</div><div class='del'>-	case 6:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	*args++ = regs-&gt;r4;</div><div class='add'>+	*args++ = regs-&gt;r5;</div><div class='add'>+	*args++ = regs-&gt;r6;</div><div class='add'>+	*args++ = regs-&gt;r7;</div><div class='add'>+	*args++ = regs-&gt;r8;</div><div class='add'>+	*args   = regs-&gt;r9;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='del'>-	struct pt_regs *regs, unsigned int i, unsigned int n,</div><div class='del'>-	const unsigned long *args)</div><div class='add'>+	struct pt_regs *regs, const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='add'>+	regs-&gt;r4 = *args++;</div><div class='add'>+	regs-&gt;r5 = *args++;</div><div class='add'>+	regs-&gt;r6 = *args++;</div><div class='add'>+	regs-&gt;r7 = *args++;</div><div class='add'>+	regs-&gt;r8 = *args++;</div><div class='add'>+	regs-&gt;r9 = *args;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	switch (i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;r4 = *args++;</div><div class='del'>-	case 1:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;r5 = *args++;</div><div class='del'>-	case 2:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;r6 = *args++;</div><div class='del'>-	case 3:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;r7 = *args++;</div><div class='del'>-	case 4:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;r8 = *args++;</div><div class='del'>-	case 5:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		regs-&gt;r9 = *args++;</div><div class='del'>-	case 6:</div><div class='del'>-		if (!n)</div><div class='del'>-			break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return AUDIT_ARCH_NIOS2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/nios2/include/asm/tlb.h b/arch/nios2/include/asm/tlb.h<br/>index d3bc648e08b5..f9f2e27e32dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nios2/include/asm/tlb.h</a></div><div class='hunk'>@@ -11,22 +11,12 @@</div><div class='ctx'> #ifndef _ASM_NIOS2_TLB_H</div><div class='ctx'> #define _ASM_NIOS2_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb)	flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> extern void set_mmu_pid(unsigned long pid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * NiosII doesn't need any special per-pte or per-vma handling, except</div><div class='del'>- * we need to flush cache for the area to be unmapped.</div><div class='add'>+ * NIOS32 does have flush_tlb_range(), but it lacks a limit and fallback to</div><div class='add'>+ * full mm invalidation. So use flush_tlb_mm() for everything.</div><div class='ctx'>  */</div><div class='del'>-#define tlb_start_vma(tlb, vma)					\</div><div class='del'>-	do {							\</div><div class='del'>-		if (!tlb-&gt;fullmm)				\</div><div class='del'>-			flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end); \</div><div class='del'>-	}  while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_end_vma(tlb, vma)	do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='head'>diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild<br/>index 755bb11323d8..1c72f04ff75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/nios2/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/nios2/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/nios2/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig<br/>index a5e361fbb75a..7cfb20555b10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/openrisc/Kconfig</a></div><div class='hunk'>@@ -36,6 +36,7 @@ config OPENRISC</div><div class='ctx'> 	select OMPIC if SMP</div><div class='ctx'> 	select ARCH_WANT_FRAME_POINTERS</div><div class='ctx'> 	select GENERIC_IRQ_MULTI_HANDLER</div><div class='add'>+	select MMU_GATHER_NO_RANGE if MMU</div><div class='ctx'> </div><div class='ctx'> config CPU_BIG_ENDIAN</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -43,12 +44,6 @@ config CPU_BIG_ENDIAN</div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild<br/>index 5a73e2956ac4..1919cc5e0f11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/openrisc/include/asm/Kbuild</a></div><div class='hunk'>@@ -20,9 +20,11 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += module.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='head'>diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/asm/syscall.h<br/>index 2db9f1cf0694..61de227f53a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/openrisc/include/asm/syscall.h</a></div><div class='hunk'>@@ -56,23 +56,19 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		      unsigned int i, unsigned int n, unsigned long *args)</div><div class='add'>+		      unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-</div><div class='del'>-	memcpy(args, &amp;regs-&gt;gpr[3 + i], n * sizeof(args[0]));</div><div class='add'>+	memcpy(args, &amp;regs-&gt;gpr[3], 6 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-		      unsigned int i, unsigned int n, const unsigned long *args)</div><div class='add'>+		      const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;regs-&gt;gpr[3 + i], args, n * sizeof(args[0]));</div><div class='add'>+	memcpy(&amp;regs-&gt;gpr[3], args, 6 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_OPENRISC;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/openrisc/include/asm/tlb.h b/arch/openrisc/include/asm/tlb.h<br/>index fa4376a4515d..92d8a4209884 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/openrisc/include/asm/tlb.h</a></div><div class='hunk'>@@ -20,14 +20,10 @@</div><div class='ctx'> #define __ASM_OPENRISC_TLB_H__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * or32 doesn't need any special per-pte or</div><div class='del'>- * per-vma handling..</div><div class='add'>+ * OpenRISC doesn't have an efficient flush_tlb_range() so use flush_tlb_mm()</div><div class='add'>+ * for everything.</div><div class='ctx'>  */</div><div class='del'>-#define tlb_start_vma(tlb, vma) do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma) do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb) flush_tlb_mm((tlb)-&gt;mm)</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild<br/>index 755bb11323d8..1c72f04ff75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/openrisc/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/openrisc/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/openrisc/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig<br/>index c8e621296092..09407ed1aacd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/Kconfig</a></div><div class='hunk'>@@ -36,6 +36,7 @@ config PARISC</div><div class='ctx'> 	select GENERIC_STRNCPY_FROM_USER</div><div class='ctx'> 	select SYSCTL_ARCH_UNALIGN_ALLOW</div><div class='ctx'> 	select SYSCTL_EXCEPTION_TRACE</div><div class='add'>+	select ARCH_DISCARD_MEMBLOCK</div><div class='ctx'> 	select HAVE_MOD_ARCH_SPECIFIC</div><div class='ctx'> 	select VIRT_TO_BUS</div><div class='ctx'> 	select MODULES_USE_ELF_RELA</div><div class='hunk'>@@ -44,6 +45,8 @@ config PARISC</div><div class='ctx'> 	select HAVE_DEBUG_STACKOVERFLOW</div><div class='ctx'> 	select HAVE_ARCH_AUDITSYSCALL</div><div class='ctx'> 	select HAVE_ARCH_HASH</div><div class='add'>+	select HAVE_ARCH_JUMP_LABEL</div><div class='add'>+	select HAVE_ARCH_JUMP_LABEL_RELATIVE</div><div class='ctx'> 	select HAVE_ARCH_SECCOMP_FILTER</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='hunk'>@@ -54,6 +57,9 @@ config PARISC</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS</div><div class='ctx'> 	select NEED_DMA_MAP_STATE</div><div class='ctx'> 	select NEED_SG_DMA_LENGTH</div><div class='add'>+	select HAVE_ARCH_KGDB</div><div class='add'>+	select HAVE_KPROBES</div><div class='add'>+	select HAVE_KRETPROBES</div><div class='ctx'> </div><div class='ctx'> 	help</div><div class='ctx'> 	  The PA-RISC microprocessor is designed by Hewlett-Packard and used</div><div class='hunk'>@@ -75,12 +81,6 @@ config GENERIC_LOCKBREAK</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on SMP &amp;&amp; PREEMPT</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='hunk'>@@ -311,21 +311,16 @@ config ARCH_SELECT_MEMORY_MODEL</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on 64BIT</div><div class='ctx'> </div><div class='del'>-config ARCH_DISCONTIGMEM_ENABLE</div><div class='add'>+config ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on 64BIT</div><div class='ctx'> </div><div class='ctx'> config ARCH_FLATMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config ARCH_DISCONTIGMEM_DEFAULT</div><div class='add'>+config ARCH_SPARSEMEM_DEFAULT</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on ARCH_DISCONTIGMEM_ENABLE</div><div class='del'>-</div><div class='del'>-config NODES_SHIFT</div><div class='del'>-	int</div><div class='del'>-	default "3"</div><div class='del'>-	depends on NEED_MULTIPLE_NODES</div><div class='add'>+	depends on ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> </div><div class='ctx'> source "kernel/Kconfig.hz"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/boot/compressed/head.S b/arch/parisc/boot/compressed/head.S<br/>index 5aba20fa48aa..e8b798fd0cf0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/boot/compressed/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/boot/compressed/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/boot/compressed/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/boot/compressed/head.S</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> 	__HEAD</div><div class='ctx'> </div><div class='ctx'> ENTRY(startup)</div><div class='del'>-	 .level LEVEL</div><div class='add'>+	 .level PA_ASM_LEVEL</div><div class='ctx'> </div><div class='ctx'> #define PSW_W_SM	0x200</div><div class='ctx'> #define PSW_W_BIT       36</div><div class='hunk'>@@ -63,7 +63,7 @@ $bss_loop:</div><div class='ctx'> 	load32	BOOTADDR(decompress_kernel),%r3</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-	.level LEVEL</div><div class='add'>+	.level PA_ASM_LEVEL</div><div class='ctx'> 	ssm	PSW_W_SM, %r0		/* set W-bit */</div><div class='ctx'> 	depdi	0, 31, 32, %r3</div><div class='ctx'> #endif</div><div class='hunk'>@@ -72,7 +72,7 @@ $bss_loop:</div><div class='ctx'> </div><div class='ctx'> startup_continue:</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-	.level LEVEL</div><div class='add'>+	.level PA_ASM_LEVEL</div><div class='ctx'> 	rsm	PSW_W_SM, %r0		/* clear W-bit */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/boot/compressed/misc.c b/arch/parisc/boot/compressed/misc.c<br/>index 2556bb181813..2d395998f524 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/boot/compressed/misc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/boot/compressed/misc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/boot/compressed/misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/boot/compressed/misc.c</a></div><div class='hunk'>@@ -145,14 +145,13 @@ static int putchar(int c)</div><div class='ctx'> </div><div class='ctx'> void __noreturn error(char *x)</div><div class='ctx'> {</div><div class='del'>-	puts("\n\n");</div><div class='del'>-	puts(x);</div><div class='del'>-	puts("\n\n -- System halted");</div><div class='add'>+	if (x) puts(x);</div><div class='add'>+	puts("\n -- System halted\n");</div><div class='ctx'> 	while (1)	/* wait forever */</div><div class='ctx'> 		;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int print_hex(unsigned long num)</div><div class='add'>+static int print_num(unsigned long num, int base)</div><div class='ctx'> {</div><div class='ctx'> 	const char hex[] = "0123456789abcdef";</div><div class='ctx'> 	char str[40];</div><div class='hunk'>@@ -160,12 +159,14 @@ static int print_hex(unsigned long num)</div><div class='ctx'> </div><div class='ctx'> 	str[i--] = '\0';</div><div class='ctx'> 	do {</div><div class='del'>-		str[i--] = hex[num &amp; 0x0f];</div><div class='del'>-		num &gt;&gt;= 4;</div><div class='add'>+		str[i--] = hex[num % base];</div><div class='add'>+		num = num / base;</div><div class='ctx'> 	} while (num);</div><div class='ctx'> </div><div class='del'>-	str[i--] = 'x';</div><div class='del'>-	str[i] = '0';</div><div class='add'>+	if (base == 16) {</div><div class='add'>+		str[i--] = 'x';</div><div class='add'>+		str[i] = '0';</div><div class='add'>+	} else i++;</div><div class='ctx'> 	puts(&amp;str[i]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -187,8 +188,9 @@ put:</div><div class='ctx'> </div><div class='ctx'> 		if (fmt[++i] == '%')</div><div class='ctx'> 			goto put;</div><div class='add'>+		print_num(va_arg(args, unsigned long),</div><div class='add'>+			fmt[i] == 'x' ? 16:10);</div><div class='ctx'> 		++i;</div><div class='del'>-		print_hex(va_arg(args, unsigned long));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	va_end(args);</div><div class='hunk'>@@ -327,8 +329,15 @@ unsigned long decompress_kernel(unsigned int started_wide,</div><div class='ctx'> 		free_mem_end_ptr = rd_start;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (free_mem_ptr &gt;= free_mem_end_ptr)</div><div class='del'>-		error("Kernel too big for machine.");</div><div class='add'>+	if (free_mem_ptr &gt;= free_mem_end_ptr) {</div><div class='add'>+		int free_ram;</div><div class='add'>+		free_ram = (free_mem_ptr &gt;&gt; 20) + 1;</div><div class='add'>+		if (free_ram &lt; 32)</div><div class='add'>+			free_ram = 32;</div><div class='add'>+		printf("\nKernel requires at least %d MB RAM.\n",</div><div class='add'>+			free_ram);</div><div class='add'>+		error(NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printf("\n");</div><div class='head'>diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig<br/>index 37ae4b57c001..a8f9bbef0975 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/configs/generic-32bit_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/configs/generic-32bit_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/configs/generic-32bit_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/configs/generic-32bit_defconfig</a></div><div class='hunk'>@@ -14,7 +14,6 @@ CONFIG_SLAB=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PA7100LC=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='head'>diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild<br/>index 6f49e77d82a2..ed2d8cc94909 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/Kbuild</a></div><div class='hunk'>@@ -10,11 +10,12 @@ generic-y += hw_irq.h</div><div class='ctx'> generic-y += irq_regs.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='del'>-generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += seccomp.h</div><div class='head'>diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h<br/>index c17ec0ee6e7c..d85738a7bbe6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/assembly.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/assembly.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/assembly.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/assembly.h</a></div><div class='hunk'>@@ -61,14 +61,14 @@</div><div class='ctx'> #define LDCW		ldcw,co</div><div class='ctx'> #define BL		b,l</div><div class='ctx'> # ifdef CONFIG_64BIT</div><div class='del'>-#  define LEVEL		2.0w</div><div class='add'>+#  define PA_ASM_LEVEL	2.0w</div><div class='ctx'> # else</div><div class='del'>-#  define LEVEL		2.0</div><div class='add'>+#  define PA_ASM_LEVEL	2.0</div><div class='ctx'> # endif</div><div class='ctx'> #else</div><div class='ctx'> #define LDCW		ldcw</div><div class='ctx'> #define BL		bl</div><div class='del'>-#define LEVEL		1.1</div><div class='add'>+#define PA_ASM_LEVEL	1.1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='head'>diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h<br/>index 006fb939cac8..4016fe1c65a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/cache.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/cache.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/cache.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/cache.h</a></div><div class='hunk'>@@ -44,22 +44,22 @@ void parisc_setup_cache_timing(void);</div><div class='ctx'> </div><div class='ctx'> #define pdtlb(addr)	asm volatile("pdtlb 0(%%sr1,%0)" \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \</div><div class='del'>-			: : "r" (addr))</div><div class='add'>+			: : "r" (addr) : "memory")</div><div class='ctx'> #define pitlb(addr)	asm volatile("pitlb 0(%%sr1,%0)" \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_SPLIT_TLB, INSN_NOP) \</div><div class='del'>-			: : "r" (addr))</div><div class='add'>+			: : "r" (addr) : "memory")</div><div class='ctx'> #define pdtlb_kernel(addr)  asm volatile("pdtlb 0(%0)"   \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \</div><div class='del'>-			: : "r" (addr))</div><div class='add'>+			: : "r" (addr) : "memory")</div><div class='ctx'> </div><div class='ctx'> #define asm_io_fdc(addr) asm volatile("fdc %%r0(%0)" \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) \</div><div class='del'>-			: : "r" (addr))</div><div class='add'>+			: : "r" (addr) : "memory")</div><div class='ctx'> #define asm_io_sync()	asm volatile("sync" \</div><div class='ctx'> 			ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \</div><div class='del'>-			ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :: )</div><div class='add'>+			ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory")</div><div class='ctx'> </div><div class='ctx'> #endif /* ! __ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/fixmap.h b/arch/parisc/include/asm/fixmap.h<br/>index f7c3a0905de4..288da73d4cc0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/fixmap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/fixmap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/fixmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/fixmap.h</a></div><div class='hunk'>@@ -15,17 +15,34 @@</div><div class='ctx'>  * from areas congruently mapped with user space.  It is 8MB large</div><div class='ctx'>  * and must be 16MB aligned */</div><div class='ctx'> #define TMPALIAS_MAP_START	((__PAGE_OFFSET) - 16*1024*1024)</div><div class='add'>+</div><div class='add'>+#define FIXMAP_SIZE		(FIX_BITMAP_COUNT &lt;&lt; PAGE_SHIFT)</div><div class='add'>+#define FIXMAP_START		(TMPALIAS_MAP_START - FIXMAP_SIZE)</div><div class='ctx'> /* This is the kernel area for all maps (vmalloc, dma etc.)  most</div><div class='ctx'>  * usually, it extends up to TMPALIAS_MAP_START.  Virtual addresses</div><div class='ctx'>  * 0..GATEWAY_PAGE_SIZE are reserved for the gateway page */</div><div class='ctx'> #define KERNEL_MAP_START	(GATEWAY_PAGE_SIZE)</div><div class='del'>-#define KERNEL_MAP_END		(TMPALIAS_MAP_START)</div><div class='add'>+#define KERNEL_MAP_END		(FIXMAP_START)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum fixed_addresses {</div><div class='add'>+	/* Support writing RO kernel text via kprobes, jump labels, etc. */</div><div class='add'>+	FIX_TEXT_POKE0,</div><div class='add'>+	FIX_BITMAP_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern void *parisc_vmalloc_start;</div><div class='ctx'> #define PCXL_DMA_MAP_SIZE	(8*1024*1024)</div><div class='ctx'> #define VMALLOC_START		((unsigned long)parisc_vmalloc_start)</div><div class='ctx'> #define VMALLOC_END		(KERNEL_MAP_END)</div><div class='add'>+</div><div class='add'>+#define __fix_to_virt(_x) (FIXMAP_START + ((_x) &lt;&lt; PAGE_SHIFT))</div><div class='add'>+</div><div class='add'>+void set_fixmap(enum fixed_addresses idx, phys_addr_t phys);</div><div class='add'>+void clear_fixmap(enum fixed_addresses idx);</div><div class='add'>+</div><div class='ctx'> #endif /*__ASSEMBLY__*/</div><div class='ctx'> </div><div class='ctx'> #endif /*_ASM_FIXMAP_H*/</div><div class='head'>diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/asm/hardware.h<br/>index d6e1ed145031..9d3d7737c58b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/hardware.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/hardware.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/hardware.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/hardware.h</a></div><div class='hunk'>@@ -120,7 +120,7 @@ extern void get_pci_node_path(struct pci_dev *dev, struct hardware_path *path);</div><div class='ctx'> extern void init_parisc_bus(void);</div><div class='ctx'> extern struct device *hwpath_to_device(struct hardware_path *modpath);</div><div class='ctx'> extern void device_to_hwpath(struct device *dev, struct hardware_path *path);</div><div class='del'>-</div><div class='add'>+extern int machine_has_merced_bus(void);</div><div class='ctx'> </div><div class='ctx'> /* inventory.c: */</div><div class='ctx'> extern void do_memory_inventory(void);</div><div class='head'>diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h<br/>index 30a8315d5c07..93d37010b375 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/io.h</a></div><div class='hunk'>@@ -229,8 +229,6 @@ static inline void writeq(unsigned long long q, volatile void __iomem *addr)</div><div class='ctx'> #define writel_relaxed(l, addr)	writel(l, addr)</div><div class='ctx'> #define writeq_relaxed(q, addr)	writeq(q, addr)</div><div class='ctx'> </div><div class='del'>-#define mmiowb() do { } while (0)</div><div class='del'>-</div><div class='ctx'> void memset_io(volatile void __iomem *addr, unsigned char val, int count);</div><div class='ctx'> void memcpy_fromio(void *dst, const volatile void __iomem *src, int count);</div><div class='ctx'> void memcpy_toio(volatile void __iomem *dst, const void *src, int count);</div><div class='head'>diff --git a/arch/parisc/include/asm/jump_label.h b/arch/parisc/include/asm/jump_label.h<br/>new file mode 100644<br/>index 000000000000..7efb1aa2f7f8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/jump_label.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/jump_label.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_PARISC_JUMP_LABEL_H</div><div class='add'>+#define _ASM_PARISC_JUMP_LABEL_H</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/assembly.h&gt;</div><div class='add'>+</div><div class='add'>+#define JUMP_LABEL_NOP_SIZE 4</div><div class='add'>+</div><div class='add'>+static __always_inline bool arch_static_branch(struct static_key *key, bool branch)</div><div class='add'>+{</div><div class='add'>+	asm_volatile_goto("1:\n\t"</div><div class='add'>+		 "nop\n\t"</div><div class='add'>+		 ".pushsection __jump_table,  \"aw\"\n\t"</div><div class='add'>+		 ".word 1b - ., %l[l_yes] - .\n\t"</div><div class='add'>+		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"</div><div class='add'>+		 ".popsection\n\t"</div><div class='add'>+		 : :  "i" (&amp;((char *)key)[branch]) :  : l_yes);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+l_yes:</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)</div><div class='add'>+{</div><div class='add'>+	asm_volatile_goto("1:\n\t"</div><div class='add'>+		 "b,n %l[l_yes]\n\t"</div><div class='add'>+		 ".pushsection __jump_table,  \"aw\"\n\t"</div><div class='add'>+		 ".word 1b - ., %l[l_yes] - .\n\t"</div><div class='add'>+		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"</div><div class='add'>+		 ".popsection\n\t"</div><div class='add'>+		 : :  "i" (&amp;((char *)key)[branch]) :  : l_yes);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+l_yes:</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* __ASSEMBLY__ */</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/parisc/include/asm/kgdb.h b/arch/parisc/include/asm/kgdb.h<br/>new file mode 100644<br/>index 000000000000..f23e7f8f13a5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/kgdb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/kgdb.h</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * PA-RISC KGDB support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Sven Schnelle &lt;svens@stackframe.org&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PARISC_KGDB_H__</div><div class='add'>+#define __PARISC_KGDB_H__</div><div class='add'>+</div><div class='add'>+#define BREAK_INSTR_SIZE		4</div><div class='add'>+#define PARISC_KGDB_COMPILED_BREAK_INSN	0x3ffc01f</div><div class='add'>+#define PARISC_KGDB_BREAK_INSN		0x3ffa01f</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define NUMREGBYTES			sizeof(struct parisc_gdb_regs)</div><div class='add'>+#define BUFMAX				4096</div><div class='add'>+</div><div class='add'>+#define CACHE_FLUSH_IS_SAFE		1</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+static inline void arch_kgdb_breakpoint(void)</div><div class='add'>+{</div><div class='add'>+	asm(".word %0" : : "i"(PARISC_KGDB_COMPILED_BREAK_INSN) : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct parisc_gdb_regs {</div><div class='add'>+	unsigned long gpr[32];</div><div class='add'>+	unsigned long sar;</div><div class='add'>+	unsigned long iaoq_f;</div><div class='add'>+	unsigned long iasq_f;</div><div class='add'>+	unsigned long iaoq_b;</div><div class='add'>+	unsigned long iasq_b;</div><div class='add'>+	unsigned long eiem;</div><div class='add'>+	unsigned long iir;</div><div class='add'>+	unsigned long isr;</div><div class='add'>+	unsigned long ior;</div><div class='add'>+	unsigned long ipsw;</div><div class='add'>+	unsigned long __unused0;</div><div class='add'>+	unsigned long sr4;</div><div class='add'>+	unsigned long sr0;</div><div class='add'>+	unsigned long sr1;</div><div class='add'>+	unsigned long sr2;</div><div class='add'>+	unsigned long sr3;</div><div class='add'>+	unsigned long sr5;</div><div class='add'>+	unsigned long sr6;</div><div class='add'>+	unsigned long sr7;</div><div class='add'>+	unsigned long cr0;</div><div class='add'>+	unsigned long pid1;</div><div class='add'>+	unsigned long pid2;</div><div class='add'>+	unsigned long scrccr;</div><div class='add'>+	unsigned long pid3;</div><div class='add'>+	unsigned long pid4;</div><div class='add'>+	unsigned long cr24;</div><div class='add'>+	unsigned long cr25;</div><div class='add'>+	unsigned long cr26;</div><div class='add'>+	unsigned long cr27;</div><div class='add'>+	unsigned long cr28;</div><div class='add'>+	unsigned long cr29;</div><div class='add'>+	unsigned long cr30;</div><div class='add'>+</div><div class='add'>+	u64 fr[32];</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/arch/parisc/include/asm/kprobes.h b/arch/parisc/include/asm/kprobes.h<br/>new file mode 100644<br/>index 000000000000..e09cf2deeafe<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/kprobes.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/kprobes.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * arch/parisc/include/asm/kprobes.h</div><div class='add'>+ *</div><div class='add'>+ * PA-RISC kprobes implementation</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Sven Schnelle &lt;svens@stackframe.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _PARISC_KPROBES_H</div><div class='add'>+#define _PARISC_KPROBES_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+</div><div class='add'>+#define PARISC_KPROBES_BREAK_INSN	0x3ff801f</div><div class='add'>+#define  __ARCH_WANT_KPROBES_INSN_SLOT</div><div class='add'>+#define MAX_INSN_SIZE 1</div><div class='add'>+</div><div class='add'>+typedef u32 kprobe_opcode_t;</div><div class='add'>+struct kprobe;</div><div class='add'>+</div><div class='add'>+void arch_remove_kprobe(struct kprobe *p);</div><div class='add'>+</div><div class='add'>+#define flush_insn_slot(p) \</div><div class='add'>+	flush_icache_range((unsigned long)&amp;(p)-&gt;ainsn.insn[0], \</div><div class='add'>+			   (unsigned long)&amp;(p)-&gt;ainsn.insn[0] + \</div><div class='add'>+			   sizeof(kprobe_opcode_t))</div><div class='add'>+</div><div class='add'>+#define kretprobe_blacklist_size    0</div><div class='add'>+</div><div class='add'>+struct arch_specific_insn {</div><div class='add'>+	kprobe_opcode_t *insn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct prev_kprobe {</div><div class='add'>+	struct kprobe *kp;</div><div class='add'>+	unsigned long status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kprobe_ctlblk {</div><div class='add'>+	unsigned int kprobe_status;</div><div class='add'>+	struct prev_kprobe prev_kprobe;</div><div class='add'>+	unsigned long iaoq[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __kprobes parisc_kprobe_break_handler(struct pt_regs *regs);</div><div class='add'>+int __kprobes parisc_kprobe_ss_handler(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='add'>+#endif /* _PARISC_KPROBES_H */</div><div class='head'>diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h<br/>index fafa3893fd70..8d390406d862 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/mmzone.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/mmzone.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/mmzone.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/mmzone.h</a></div><div class='hunk'>@@ -2,62 +2,6 @@</div><div class='ctx'> #ifndef _PARISC_MMZONE_H</div><div class='ctx'> #define _PARISC_MMZONE_H</div><div class='ctx'> </div><div class='del'>-#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */</div><div class='add'>+#define MAX_PHYSMEM_RANGES 4 /* Fix the size for now (current known max is 3) */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DISCONTIGMEM</div><div class='del'>-</div><div class='del'>-extern int npmem_ranges;</div><div class='del'>-</div><div class='del'>-struct node_map_data {</div><div class='del'>-    pg_data_t pg_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct node_map_data node_data[];</div><div class='del'>-</div><div class='del'>-#define NODE_DATA(nid)          (&amp;node_data[nid].pg_data)</div><div class='del'>-</div><div class='del'>-/* We have these possible memory map layouts:</div><div class='del'>- * Astro: 0-3.75, 67.75-68, 4-64</div><div class='del'>- * zx1: 0-1, 257-260, 4-256</div><div class='del'>- * Stretch (N-class): 0-2, 4-32, 34-xxx</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Since each 1GB can only belong to one region (node), we can create</div><div class='del'>- * an index table for pfn to nid lookup; each entry in pfnnid_map </div><div class='del'>- * represents 1GB, and contains the node that the memory belongs to. */</div><div class='del'>-</div><div class='del'>-#define PFNNID_SHIFT (30 - PAGE_SHIFT)</div><div class='del'>-#define PFNNID_MAP_MAX  512     /* support 512GB */</div><div class='del'>-extern signed char pfnnid_map[PFNNID_MAP_MAX];</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_64BIT</div><div class='del'>-#define pfn_is_io(pfn) ((pfn &amp; (0xf0000000UL &gt;&gt; PAGE_SHIFT)) == (0xf0000000UL &gt;&gt; PAGE_SHIFT))</div><div class='del'>-#else</div><div class='del'>-/* io can be 0xf0f0f0f0f0xxxxxx or 0xfffffffff0000000 */</div><div class='del'>-#define pfn_is_io(pfn) ((pfn &amp; (0xf000000000000000UL &gt;&gt; PAGE_SHIFT)) == (0xf000000000000000UL &gt;&gt; PAGE_SHIFT))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int pfn_to_nid(unsigned long pfn)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (unlikely(pfn_is_io(pfn)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	i = pfn &gt;&gt; PFNNID_SHIFT;</div><div class='del'>-	BUG_ON(i &gt;= ARRAY_SIZE(pfnnid_map));</div><div class='del'>-</div><div class='del'>-	return pfnnid_map[i];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int pfn_valid(int pfn)</div><div class='del'>-{</div><div class='del'>-	int nid = pfn_to_nid(pfn);</div><div class='del'>-</div><div class='del'>-	if (nid &gt;= 0)</div><div class='del'>-		return (pfn &lt; node_end_pfn(nid));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='ctx'> #endif /* _PARISC_MMZONE_H */</div><div class='head'>diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h<br/>index b77f49ce6220..93caf17ac5e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/page.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/page.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/page.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/page.h</a></div><div class='hunk'>@@ -147,9 +147,9 @@ extern int npmem_ranges;</div><div class='ctx'> #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)</div><div class='ctx'> #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_DISCONTIGMEM</div><div class='add'>+#ifndef CONFIG_SPARSEMEM</div><div class='ctx'> #define pfn_valid(pfn)		((pfn) &lt; max_mapnr)</div><div class='del'>-#endif /* CONFIG_DISCONTIGMEM */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> #define HPAGE_SHIFT		PMD_SHIFT /* fixed for transparent huge pages */</div><div class='head'>diff --git a/arch/parisc/include/asm/patch.h b/arch/parisc/include/asm/patch.h<br/>new file mode 100644<br/>index 000000000000..685b58a13968<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/patch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/patch.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _PARISC_KERNEL_PATCH_H</div><div class='add'>+#define _PARISC_KERNEL_PATCH_H</div><div class='add'>+</div><div class='add'>+/* stop machine and patch kernel text */</div><div class='add'>+void patch_text(void *addr, unsigned int insn);</div><div class='add'>+</div><div class='add'>+/* patch kernel text with machine already stopped (e.g. in kgdb) */</div><div class='add'>+void __patch_text(void *addr, unsigned int insn);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h<br/>index d05c678c77c4..ea75cc966dae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/pgalloc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/pgalloc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/pgalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -41,6 +41,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='ctx'> 		__pgd_val_set(*pgd, PxD_FLAG_ATTACHED);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='add'>+	spin_lock_init(pgd_spinlock(actual_pgd));</div><div class='ctx'> 	return actual_pgd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h<br/>index c7bb74e22436..a39b079e73f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/pgtable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/pgtable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/pgtable.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> </div><div class='del'>-extern spinlock_t pa_tlb_lock;</div><div class='add'>+static inline spinlock_t *pgd_spinlock(pgd_t *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel</div><div class='hunk'>@@ -34,16 +34,46 @@ extern spinlock_t pa_tlb_lock;</div><div class='ctx'>  */</div><div class='ctx'> #define kern_addr_valid(addr)	(1)</div><div class='ctx'> </div><div class='del'>-/* Purge data and instruction TLB entries.  Must be called holding</div><div class='del'>- * the pa_tlb_lock.  The TLB purge instructions are slow on SMP</div><div class='del'>- * machines since the purge must be broadcast to all CPUs.</div><div class='add'>+/* This is for the serialization of PxTLB broadcasts. At least on the N class</div><div class='add'>+ * systems, only one PxTLB inter processor broadcast can be active at any one</div><div class='add'>+ * time on the Merced bus.</div><div class='add'>+</div><div class='add'>+ * PTE updates are protected by locks in the PMD.</div><div class='add'>+ */</div><div class='add'>+extern spinlock_t pa_tlb_flush_lock;</div><div class='add'>+extern spinlock_t pa_swapper_pg_lock;</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+extern int pa_serialize_tlb_flushes;</div><div class='add'>+#else</div><div class='add'>+#define pa_serialize_tlb_flushes        (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define purge_tlb_start(flags)  do { \</div><div class='add'>+	if (pa_serialize_tlb_flushes)	\</div><div class='add'>+		spin_lock_irqsave(&amp;pa_tlb_flush_lock, flags); \</div><div class='add'>+	else \</div><div class='add'>+		local_irq_save(flags);	\</div><div class='add'>+	} while (0)</div><div class='add'>+#define purge_tlb_end(flags)	do { \</div><div class='add'>+	if (pa_serialize_tlb_flushes)	\</div><div class='add'>+		spin_unlock_irqrestore(&amp;pa_tlb_flush_lock, flags); \</div><div class='add'>+	else \</div><div class='add'>+		local_irq_restore(flags); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* Purge data and instruction TLB entries. The TLB purge instructions</div><div class='add'>+ * are slow on SMP machines since the purge must be broadcast to all CPUs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	purge_tlb_start(flags);</div><div class='ctx'> 	mtsp(mm-&gt;context, 1);</div><div class='ctx'> 	pdtlb(addr);</div><div class='ctx'> 	pitlb(addr);</div><div class='add'>+	purge_tlb_end(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Certain architectures need to do special things when PTEs</div><div class='hunk'>@@ -59,11 +89,11 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		pte_t old_pte;					\</div><div class='ctx'> 		unsigned long flags;				\</div><div class='del'>-		spin_lock_irqsave(&amp;pa_tlb_lock, flags);		\</div><div class='add'>+		spin_lock_irqsave(pgd_spinlock((mm)-&gt;pgd), flags);\</div><div class='ctx'> 		old_pte = *ptep;				\</div><div class='ctx'> 		set_pte(ptep, pteval);				\</div><div class='ctx'> 		purge_tlb_entries(mm, addr);			\</div><div class='del'>-		spin_unlock_irqrestore(&amp;pa_tlb_lock, flags);	\</div><div class='add'>+		spin_unlock_irqrestore(pgd_spinlock((mm)-&gt;pgd), flags);\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='hunk'>@@ -88,10 +118,10 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> #if CONFIG_PGTABLE_LEVELS == 3</div><div class='ctx'> #define PGD_ORDER	1 /* Number of pages per pgd */</div><div class='ctx'> #define PMD_ORDER	1 /* Number of pages per pmd */</div><div class='del'>-#define PGD_ALLOC_ORDER	2 /* first pgd contains pmd */</div><div class='add'>+#define PGD_ALLOC_ORDER	(2 + 1) /* first pgd contains pmd */</div><div class='ctx'> #else</div><div class='ctx'> #define PGD_ORDER	1 /* Number of pages per pgd */</div><div class='del'>-#define PGD_ALLOC_ORDER	PGD_ORDER</div><div class='add'>+#define PGD_ALLOC_ORDER	(PGD_ORDER + 1)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Definitions for 3rd level (we use PLD here for Page Lower directory</div><div class='hunk'>@@ -459,6 +489,15 @@ extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);</div><div class='ctx'> #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) })</div><div class='ctx'> #define __swp_entry_to_pte(x)		((pte_t) { (x).val })</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static inline spinlock_t *pgd_spinlock(pgd_t *pgd)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(pgd == swapper_pg_dir))</div><div class='add'>+		return &amp;pa_swapper_pg_lock;</div><div class='add'>+	return (spinlock_t *)((char *)pgd + (PAGE_SIZE &lt;&lt; (PGD_ALLOC_ORDER - 1)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)</div><div class='ctx'> {</div><div class='ctx'> 	pte_t pte;</div><div class='hunk'>@@ -467,15 +506,15 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned</div><div class='ctx'> 	if (!pte_young(*ptep))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pa_tlb_lock, flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock(vma-&gt;vm_mm-&gt;pgd), flags);</div><div class='ctx'> 	pte = *ptep;</div><div class='ctx'> 	if (!pte_young(pte)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;pa_tlb_lock, flags);</div><div class='add'>+		spin_unlock_irqrestore(pgd_spinlock(vma-&gt;vm_mm-&gt;pgd), flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_pte(ptep, pte_mkold(pte));</div><div class='ctx'> 	purge_tlb_entries(vma-&gt;vm_mm, addr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pa_tlb_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock(vma-&gt;vm_mm-&gt;pgd), flags);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -485,11 +524,11 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	pte_t old_pte;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pa_tlb_lock, flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock(mm-&gt;pgd), flags);</div><div class='ctx'> 	old_pte = *ptep;</div><div class='ctx'> 	set_pte(ptep, __pte(0));</div><div class='ctx'> 	purge_tlb_entries(mm, addr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pa_tlb_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock(mm-&gt;pgd), flags);</div><div class='ctx'> </div><div class='ctx'> 	return old_pte;</div><div class='ctx'> }</div><div class='hunk'>@@ -497,10 +536,10 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;pa_tlb_lock, flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock(mm-&gt;pgd), flags);</div><div class='ctx'> 	set_pte(ptep, pte_wrprotect(*ptep));</div><div class='ctx'> 	purge_tlb_entries(mm, addr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pa_tlb_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock(mm-&gt;pgd), flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define pte_same(A,B)	(pte_val(A) == pte_val(B))</div><div class='head'>diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h<br/>index 2a27b275ab09..143fb2a89dd8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/ptrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/ptrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/ptrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/ptrace.h</a></div><div class='hunk'>@@ -22,13 +22,14 @@ unsigned long profile_pc(struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long regs_return_value(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	return regs-&gt;gr[20];</div><div class='add'>+	return regs-&gt;gr[28];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void instruction_pointer_set(struct pt_regs *regs,</div><div class='ctx'> 						unsigned long val)</div><div class='ctx'> {</div><div class='del'>-        regs-&gt;iaoq[0] = val;</div><div class='add'>+	regs-&gt;iaoq[0] = val;</div><div class='add'>+	regs-&gt;iaoq[1] = val + 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Query offset/name of register from its name/offset */</div><div class='hunk'>@@ -36,4 +37,17 @@ extern int regs_query_register_offset(const char *name);</div><div class='ctx'> extern const char *regs_query_register_name(unsigned int offset);</div><div class='ctx'> #define MAX_REG_OFFSET (offsetof(struct pt_regs, ipsw))</div><div class='ctx'> </div><div class='add'>+#define kernel_stack_pointer(regs) ((regs)-&gt;gr[30])</div><div class='add'>+</div><div class='add'>+static inline unsigned long regs_get_register(struct pt_regs *regs,</div><div class='add'>+					      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(offset &gt; MAX_REG_OFFSET))</div><div class='add'>+		return 0;</div><div class='add'>+	return *(unsigned long *)((unsigned long)regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);</div><div class='add'>+int regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/parisc/include/asm/sparsemem.h b/arch/parisc/include/asm/sparsemem.h<br/>new file mode 100644<br/>index 000000000000..b5c3a79045b4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/sparsemem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/sparsemem.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef ASM_PARISC_SPARSEMEM_H</div><div class='add'>+#define ASM_PARISC_SPARSEMEM_H</div><div class='add'>+</div><div class='add'>+/* We have these possible memory map layouts:</div><div class='add'>+ * Astro: 0-3.75, 67.75-68, 4-64</div><div class='add'>+ * zx1: 0-1, 257-260, 4-256</div><div class='add'>+ * Stretch (N-class): 0-2, 4-32, 34-xxx</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MAX_PHYSMEM_BITS	39	/* 512 GB */</div><div class='add'>+#define SECTION_SIZE_BITS	27	/* 128 MB */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h<br/>index 8a63515f03bf..197d2247e4db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/spinlock.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/spinlock.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/spinlock.h</a></div><div class='hunk'>@@ -37,7 +37,11 @@ static inline void arch_spin_unlock(arch_spinlock_t *x)</div><div class='ctx'> 	volatile unsigned int *a;</div><div class='ctx'> </div><div class='ctx'> 	a = __ldcw_align(x);</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	(void) __ldcw(a);</div><div class='add'>+#else</div><div class='ctx'> 	mb();</div><div class='add'>+#endif</div><div class='ctx'> 	*a = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/syscall.h<br/>index 8bff1a58c97f..80757e43cf2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/syscall.h</a></div><div class='hunk'>@@ -18,29 +18,15 @@ static inline long syscall_get_nr(struct task_struct *tsk,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *tsk,</div><div class='del'>-					 struct pt_regs *regs, unsigned int i,</div><div class='del'>-					 unsigned int n, unsigned long *args)</div><div class='add'>+					 struct pt_regs *regs,</div><div class='add'>+					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i);</div><div class='del'>-</div><div class='del'>-	switch (n) {</div><div class='del'>-	case 6:</div><div class='del'>-		args[5] = regs-&gt;gr[21];</div><div class='del'>-	case 5:</div><div class='del'>-		args[4] = regs-&gt;gr[22];</div><div class='del'>-	case 4:</div><div class='del'>-		args[3] = regs-&gt;gr[23];</div><div class='del'>-	case 3:</div><div class='del'>-		args[2] = regs-&gt;gr[24];</div><div class='del'>-	case 2:</div><div class='del'>-		args[1] = regs-&gt;gr[25];</div><div class='del'>-	case 1:</div><div class='del'>-		args[0] = regs-&gt;gr[26];</div><div class='del'>-	case 0:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	args[5] = regs-&gt;gr[21];</div><div class='add'>+	args[4] = regs-&gt;gr[22];</div><div class='add'>+	args[3] = regs-&gt;gr[23];</div><div class='add'>+	args[2] = regs-&gt;gr[24];</div><div class='add'>+	args[1] = regs-&gt;gr[25];</div><div class='add'>+	args[0] = regs-&gt;gr[26];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline long syscall_get_return_value(struct task_struct *task,</div><div class='hunk'>@@ -62,11 +48,11 @@ static inline void syscall_rollback(struct task_struct *task,</div><div class='ctx'> 	/* do nothing */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	int arch = AUDIT_ARCH_PARISC;</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-	if (!is_compat_task())</div><div class='add'>+	if (!__is_compat_task(task))</div><div class='ctx'> 		arch = AUDIT_ARCH_PARISC64;</div><div class='ctx'> #endif</div><div class='ctx'> 	return arch;</div><div class='head'>diff --git a/arch/parisc/include/asm/tlb.h b/arch/parisc/include/asm/tlb.h<br/>index 0c881e74d8a6..8c0446b04c9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/tlb.h</a></div><div class='hunk'>@@ -2,24 +2,6 @@</div><div class='ctx'> #ifndef _PARISC_TLB_H</div><div class='ctx'> #define _PARISC_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_flush(tlb)			\</div><div class='del'>-do {	if ((tlb)-&gt;fullmm)		\</div><div class='del'>-		flush_tlb_mm((tlb)-&gt;mm);\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_start_vma(tlb, vma) \</div><div class='del'>-do {	if (!(tlb)-&gt;fullmm)	\</div><div class='del'>-		flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_end_vma(tlb, vma)	\</div><div class='del'>-do {	if (!(tlb)-&gt;fullmm)	\</div><div class='del'>-		flush_tlb_range(vma, vma-&gt;vm_start, vma-&gt;vm_end); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, pte, address) \</div><div class='del'>-	do { } while (0)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __pmd_free_tlb(tlb, pmd, addr)	pmd_free((tlb)-&gt;mm, pmd)</div><div class='head'>diff --git a/arch/parisc/include/asm/tlbflush.h b/arch/parisc/include/asm/tlbflush.h<br/>index 6804374efa66..c5ded01d45be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/tlbflush.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/asm/tlbflush.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -8,21 +8,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* This is for the serialisation of PxTLB broadcasts.  At least on the</div><div class='del'>- * N class systems, only one PxTLB inter processor broadcast can be</div><div class='del'>- * active at any one time on the Merced bus.  This tlb purge</div><div class='del'>- * synchronisation is fairly lightweight and harmless so we activate</div><div class='del'>- * it on all systems not just the N class.</div><div class='del'>-</div><div class='del'>- * It is also used to ensure PTE updates are atomic and consistent</div><div class='del'>- * with the TLB.</div><div class='del'>- */</div><div class='del'>-extern spinlock_t pa_tlb_lock;</div><div class='del'>-</div><div class='del'>-#define purge_tlb_start(flags)	spin_lock_irqsave(&amp;pa_tlb_lock, flags)</div><div class='del'>-#define purge_tlb_end(flags)	spin_unlock_irqrestore(&amp;pa_tlb_lock, flags)</div><div class='del'>-</div><div class='ctx'> extern void flush_tlb_all(void);</div><div class='ctx'> extern void flush_tlb_all_local(void *);</div><div class='ctx'> </div><div class='hunk'>@@ -79,13 +64,6 @@ static inline void flush_tlb_mm(struct mm_struct *mm)</div><div class='ctx'> static inline void flush_tlb_page(struct vm_area_struct *vma,</div><div class='ctx'> 	unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags, sid;</div><div class='del'>-</div><div class='del'>-	sid = vma-&gt;vm_mm-&gt;context;</div><div class='del'>-	purge_tlb_start(flags);</div><div class='del'>-	mtsp(sid, 1);</div><div class='del'>-	pdtlb(addr);</div><div class='del'>-	pitlb(addr);</div><div class='del'>-	purge_tlb_end(flags);</div><div class='add'>+	purge_tlb_entries(vma-&gt;vm_mm, addr);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild<br/>index 22fdbd08cdc8..2bd5b392277c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,3 +1,2 @@</div><div class='ctx'> generated-y += unistd_32.h</div><div class='ctx'> generated-y += unistd_64.h</div><div class='del'>-generic-y += kvm_para.h</div><div class='head'>diff --git a/arch/parisc/include/uapi/asm/sockios.h b/arch/parisc/include/uapi/asm/sockios.h<br/>deleted file mode 100644<br/>index 66a3ba64d53f..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/include/uapi/asm/sockios.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#ifndef __ARCH_PARISC_SOCKIOS__</div><div class='del'>-#define __ARCH_PARISC_SOCKIOS__</div><div class='del'>-</div><div class='del'>-/* Socket-level I/O control calls. */</div><div class='del'>-#define FIOSETOWN 	0x8901</div><div class='del'>-#define SIOCSPGRP	0x8902</div><div class='del'>-#define FIOGETOWN	0x8903</div><div class='del'>-#define SIOCGPGRP	0x8904</div><div class='del'>-#define SIOCATMARK	0x8905</div><div class='del'>-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile<br/>index 8e5f1ab65c68..fc0df5c44468 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/Makefile</a></div><div class='hunk'>@@ -9,7 +9,8 @@ obj-y	     	:= cache.o pacache.o setup.o pdt.o traps.o time.o irq.o \</div><div class='ctx'> 		   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \</div><div class='ctx'> 		   ptrace.o hardware.o inventory.o drivers.o alternative.o \</div><div class='ctx'> 		   signal.o hpmc.o real2.o parisc_ksyms.o unaligned.o \</div><div class='del'>-		   process.o processor.o pdc_cons.o pdc_chassis.o unwind.o</div><div class='add'>+		   process.o processor.o pdc_cons.o pdc_chassis.o unwind.o \</div><div class='add'>+		   patch.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'> # Do not profile debug and lowlevel utilities</div><div class='hunk'>@@ -32,3 +33,6 @@ obj-$(CONFIG_64BIT)	+= perf.o perf_asm.o $(obj64-y)</div><div class='ctx'> obj-$(CONFIG_PARISC_CPU_TOPOLOGY)	+= topology.o</div><div class='ctx'> obj-$(CONFIG_FUNCTION_TRACER)		+= ftrace.o</div><div class='ctx'> obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o</div><div class='add'>+obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o</div><div class='add'>+obj-$(CONFIG_KGDB)			+= kgdb.o</div><div class='add'>+obj-$(CONFIG_KPROBES)			+= kprobes.o</div><div class='head'>diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c<br/>index 804880efa11e..0338561968a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/cache.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/cache.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/cache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/cache.c</a></div><div class='hunk'>@@ -40,12 +40,19 @@ void purge_dcache_page_asm(unsigned long phys_addr, unsigned long vaddr);</div><div class='ctx'> void flush_icache_page_asm(unsigned long phys_addr, unsigned long vaddr);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* On some machines (e.g. ones with the Merced bus), there can be</div><div class='add'>+/* On some machines (i.e., ones with the Merced bus), there can be</div><div class='ctx'>  * only a single PxTLB broadcast at a time; this must be guaranteed</div><div class='del'>- * by software.  We put a spinlock around all TLB flushes  to</div><div class='del'>- * ensure this.</div><div class='add'>+ * by software. We need a spinlock around all TLB flushes to ensure</div><div class='add'>+ * this.</div><div class='ctx'>  */</div><div class='del'>-DEFINE_SPINLOCK(pa_tlb_lock);</div><div class='add'>+DEFINE_SPINLOCK(pa_tlb_flush_lock);</div><div class='add'>+</div><div class='add'>+/* Swapper page setup lock. */</div><div class='add'>+DEFINE_SPINLOCK(pa_swapper_pg_lock);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+int pa_serialize_tlb_flushes __read_mostly;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct pdc_cache_info cache_info __read_mostly;</div><div class='ctx'> #ifndef CONFIG_PA20</div><div class='head'>diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c<br/>index 5eb979d04b90..15e7b3be7b6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/drivers.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/drivers.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/drivers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/drivers.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pdc.h&gt;</div><div class='ctx'> #include &lt;asm/parisc-device.h&gt;</div><div class='add'>+#include &lt;asm/ropes.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* See comments in include/asm-parisc/pci.h */</div><div class='ctx'> const struct dma_map_ops *hppa_dma_ops __read_mostly;</div><div class='hunk'>@@ -257,6 +258,30 @@ static struct parisc_device *find_device_by_addr(unsigned long hpa)</div><div class='ctx'> 	return ret ? d.dev : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init is_IKE_device(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct parisc_device *pdev = to_parisc_device(dev);</div><div class='add'>+</div><div class='add'>+	if (!check_dev(dev))</div><div class='add'>+		return 0;</div><div class='add'>+	if (pdev-&gt;id.hw_type != HPHW_BCPORT)</div><div class='add'>+		return 0;</div><div class='add'>+	if (IS_IKE(pdev) ||</div><div class='add'>+		(pdev-&gt;id.hversion == REO_MERCED_PORT) ||</div><div class='add'>+		(pdev-&gt;id.hversion == REOG_MERCED_PORT)) {</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'>+int __init machine_has_merced_bus(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = for_each_padev(is_IKE_device, NULL);</div><div class='add'>+	return ret ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * find_pa_parent_type - Find a parent of a specific type</div><div class='ctx'>  * @dev: The device to start searching from</div><div class='head'>diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S<br/>index d5eb19efa65b..a1fc04570ade 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/entry.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/entry.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/entry.S</a></div><div class='hunk'>@@ -50,12 +50,8 @@</div><div class='ctx'> </div><div class='ctx'> 	.import		pa_tlb_lock,data</div><div class='ctx'> 	.macro  load_pa_tlb_lock reg</div><div class='del'>-#if __PA_LDCW_ALIGNMENT &gt; 4</div><div class='del'>-	load32	PA(pa_tlb_lock) + __PA_LDCW_ALIGNMENT-1, \reg</div><div class='del'>-	depi	0,31,__PA_LDCW_ALIGN_ORDER, \reg</div><div class='del'>-#else</div><div class='del'>-	load32	PA(pa_tlb_lock), \reg</div><div class='del'>-#endif</div><div class='add'>+	mfctl		%cr25,\reg</div><div class='add'>+	addil		L%(PAGE_SIZE &lt;&lt; (PGD_ALLOC_ORDER - 1)),\reg</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* space_to_prot macro creates a prot id from a space id */</div><div class='hunk'>@@ -471,8 +467,9 @@</div><div class='ctx'> 	nop</div><div class='ctx'> 	LDREG		0(\ptp),\pte</div><div class='ctx'> 	bb,&lt;,n		\pte,_PAGE_PRESENT_BIT,3f</div><div class='add'>+	LDCW		0(\tmp),\tmp1</div><div class='ctx'> 	b		\fault</div><div class='del'>-	stw,ma		\spc,0(\tmp)</div><div class='add'>+	stw		\spc,0(\tmp)</div><div class='ctx'> 99:	ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP)</div><div class='ctx'> #endif</div><div class='ctx'> 2:	LDREG		0(\ptp),\pte</div><div class='hunk'>@@ -481,20 +478,22 @@</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* Release pa_tlb_lock lock without reloading lock address. */</div><div class='del'>-	.macro		tlb_unlock0	spc,tmp</div><div class='add'>+	.macro		tlb_unlock0	spc,tmp,tmp1</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 98:	or,COND(=)	%r0,\spc,%r0</div><div class='del'>-	stw,ma		\spc,0(\tmp)</div><div class='add'>+	LDCW		0(\tmp),\tmp1</div><div class='add'>+	or,COND(=)	%r0,\spc,%r0</div><div class='add'>+	stw		\spc,0(\tmp)</div><div class='ctx'> 99:	ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP)</div><div class='ctx'> #endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* Release pa_tlb_lock lock. */</div><div class='del'>-	.macro		tlb_unlock1	spc,tmp</div><div class='add'>+	.macro		tlb_unlock1	spc,tmp,tmp1</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 98:	load_pa_tlb_lock \tmp</div><div class='ctx'> 99:	ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP)</div><div class='del'>-	tlb_unlock0	\spc,\tmp</div><div class='add'>+	tlb_unlock0	\spc,\tmp,\tmp1</div><div class='ctx'> #endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='hunk'>@@ -1177,7 +1176,7 @@ dtlb_miss_20w:</div><div class='ctx'> 	</div><div class='ctx'> 	idtlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1203,7 +1202,7 @@ nadtlb_miss_20w:</div><div class='ctx'> </div><div class='ctx'> 	idtlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1237,7 +1236,7 @@ dtlb_miss_11:</div><div class='ctx'> </div><div class='ctx'> 	mtsp		t1, %sr1	/* Restore sr1 */</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1270,7 +1269,7 @@ nadtlb_miss_11:</div><div class='ctx'> </div><div class='ctx'> 	mtsp		t1, %sr1	/* Restore sr1 */</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1299,7 +1298,7 @@ dtlb_miss_20:</div><div class='ctx'> </div><div class='ctx'> 	idtlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1327,7 +1326,7 @@ nadtlb_miss_20:</div><div class='ctx'> 	</div><div class='ctx'> 	idtlbt		pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1434,7 +1433,7 @@ itlb_miss_20w:</div><div class='ctx'> 	</div><div class='ctx'> 	iitlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1458,7 +1457,7 @@ naitlb_miss_20w:</div><div class='ctx'> </div><div class='ctx'> 	iitlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1492,7 +1491,7 @@ itlb_miss_11:</div><div class='ctx'> </div><div class='ctx'> 	mtsp		t1, %sr1	/* Restore sr1 */</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1516,7 +1515,7 @@ naitlb_miss_11:</div><div class='ctx'> </div><div class='ctx'> 	mtsp		t1, %sr1	/* Restore sr1 */</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1546,7 +1545,7 @@ itlb_miss_20:</div><div class='ctx'> </div><div class='ctx'> 	iitlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1566,7 +1565,7 @@ naitlb_miss_20:</div><div class='ctx'> </div><div class='ctx'> 	iitlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock1	spc,t0</div><div class='add'>+	tlb_unlock1	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1596,7 +1595,7 @@ dbit_trap_20w:</div><div class='ctx'> 		</div><div class='ctx'> 	idtlbt          pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock0	spc,t0</div><div class='add'>+	tlb_unlock0	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> #else</div><div class='hunk'>@@ -1622,7 +1621,7 @@ dbit_trap_11:</div><div class='ctx'> </div><div class='ctx'> 	mtsp            t1, %sr1     /* Restore sr1 */</div><div class='ctx'> </div><div class='del'>-	tlb_unlock0	spc,t0</div><div class='add'>+	tlb_unlock0	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1642,7 +1641,7 @@ dbit_trap_20:</div><div class='ctx'> 	</div><div class='ctx'> 	idtlbt		pte,prot</div><div class='ctx'> </div><div class='del'>-	tlb_unlock0	spc,t0</div><div class='add'>+	tlb_unlock0	spc,t0,t1</div><div class='ctx'> 	rfir</div><div class='ctx'> 	nop</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S<br/>index fbb4e43fda05..d12de2a13753 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/head.S</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-	.level	LEVEL</div><div class='add'>+	.level	PA_ASM_LEVEL</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> ENTRY(boot_args)</div><div class='hunk'>@@ -258,7 +258,7 @@ stext_pdc_ret:</div><div class='ctx'> 	ldo		R%PA(fault_vector_11)(%r10),%r10</div><div class='ctx'> </div><div class='ctx'> $is_pa20:</div><div class='del'>-	.level		LEVEL /* restore 1.1 || 2.0w */</div><div class='add'>+	.level		PA_ASM_LEVEL /* restore 1.1 || 2.0w */</div><div class='ctx'> #endif /*!CONFIG_64BIT*/</div><div class='ctx'> 	load32		PA(fault_vector_20),%r10</div><div class='ctx'> </div><div class='hunk'>@@ -329,6 +329,19 @@ smp_slave_stext:</div><div class='ctx'> 	mtsp	   %r0,%sr6</div><div class='ctx'> 	mtsp	   %r0,%sr7</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	/*</div><div class='add'>+	 *  Enable Wide mode early, in case the task_struct for the idle</div><div class='add'>+	 *  task in smp_init_current_idle_task was allocated above 4GB.</div><div class='add'>+	 */</div><div class='add'>+1:	mfia            %rp             /* clear upper part of pcoq */</div><div class='add'>+	ldo             2f-1b(%rp),%rp</div><div class='add'>+	depdi           0,31,32,%rp</div><div class='add'>+	bv              (%rp)</div><div class='add'>+	ssm             PSW_SM_W,%r0</div><div class='add'>+2:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*  Initialize the SP - monarch sets up smp_init_current_idle_task */</div><div class='ctx'> 	load32		PA(smp_init_current_idle_task),%sp</div><div class='ctx'> 	LDREG		0(%sp),%sp	/* load task address */</div><div class='head'>diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c<br/>index 35d05fdd7483..6f2d611347a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/inventory.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/inventory.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/inventory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/inventory.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/parisc-device.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> ** Debug options</div><div class='hunk'>@@ -638,4 +639,10 @@ void __init do_device_inventory(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "Found devices:\n");</div><div class='ctx'> 	print_parisc_devices();</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+	pa_serialize_tlb_flushes = machine_has_merced_bus();</div><div class='add'>+	if (pa_serialize_tlb_flushes)</div><div class='add'>+		pr_info("Merced bus found: Enable PxTLB serialization.\n");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/parisc/kernel/jump_label.c b/arch/parisc/kernel/jump_label.c<br/>new file mode 100644<br/>index 000000000000..d2f3cb12e282<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/jump_label.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/jump_label.c</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 Helge Deller &lt;deller@gmx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on arch/arm64/kernel/jump_label.c</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;asm/alternative.h&gt;</div><div class='add'>+#include &lt;asm/patch.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int reassemble_17(int as17)</div><div class='add'>+{</div><div class='add'>+	return (((as17 &amp; 0x10000) &gt;&gt; 16) |</div><div class='add'>+		((as17 &amp; 0x0f800) &lt;&lt; 5) |</div><div class='add'>+		((as17 &amp; 0x00400) &gt;&gt; 8) |</div><div class='add'>+		((as17 &amp; 0x003ff) &lt;&lt; 3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_jump_label_transform(struct jump_entry *entry,</div><div class='add'>+			       enum jump_label_type type)</div><div class='add'>+{</div><div class='add'>+	void *addr = (void *)jump_entry_code(entry);</div><div class='add'>+	u32 insn;</div><div class='add'>+</div><div class='add'>+	if (type == JUMP_LABEL_JMP) {</div><div class='add'>+		void *target = (void *)jump_entry_target(entry);</div><div class='add'>+		int distance = target - addr;</div><div class='add'>+		/*</div><div class='add'>+		 * Encode the PA1.1 "b,n" instruction with a 17-bit</div><div class='add'>+		 * displacement.  In case we hit the BUG(), we could use</div><div class='add'>+		 * another branch instruction with a 22-bit displacement on</div><div class='add'>+		 * 64-bit CPUs instead. But this seems sufficient for now.</div><div class='add'>+		 */</div><div class='add'>+		distance -= 8;</div><div class='add'>+		BUG_ON(distance &gt; 262143 || distance &lt; -262144);</div><div class='add'>+		insn = 0xe8000002 | reassemble_17(distance &gt;&gt; 2);</div><div class='add'>+	} else {</div><div class='add'>+		insn = INSN_NOP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	patch_text(addr, insn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_jump_label_transform_static(struct jump_entry *entry,</div><div class='add'>+				      enum jump_label_type type)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We use the architected NOP in arch_static_branch, so there's no</div><div class='add'>+	 * need to patch an identical NOP over the top of it here. The core</div><div class='add'>+	 * will call arch_jump_label_transform from a module notifier if the</div><div class='add'>+	 * NOP needs to be replaced by a branch.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='head'>diff --git a/arch/parisc/kernel/kgdb.c b/arch/parisc/kernel/kgdb.c<br/>new file mode 100644<br/>index 000000000000..664278db9b97<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/kgdb.c</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * PA-RISC KGDB support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Sven Schnelle &lt;svens@stackframe.org&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kgdb.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/patch.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+const struct kgdb_arch arch_kgdb_ops = {</div><div class='add'>+	.gdb_bpt_instr = { 0x03, 0xff, 0xa0, 0x1f }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __kgdb_notify(struct die_args *args, unsigned long cmd)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = args-&gt;regs;</div><div class='add'>+</div><div class='add'>+	if (kgdb_handle_exception(1, args-&gt;signr, cmd, regs))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	return NOTIFY_STOP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kgdb_notify(struct notifier_block *self,</div><div class='add'>+		       unsigned long cmd, void *ptr)</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'>+	local_irq_save(flags);</div><div class='add'>+	ret = __kgdb_notify(ptr, cmd);</div><div class='add'>+	local_irq_restore(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 notifier_block kgdb_notifier = {</div><div class='add'>+	.notifier_call	= kgdb_notify,</div><div class='add'>+	.priority	= -INT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int kgdb_arch_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_die_notifier(&amp;kgdb_notifier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kgdb_arch_exit(void)</div><div class='add'>+{</div><div class='add'>+	unregister_die_notifier(&amp;kgdb_notifier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct parisc_gdb_regs *gr = (struct parisc_gdb_regs *)gdb_regs;</div><div class='add'>+</div><div class='add'>+	memset(gr, 0, sizeof(struct parisc_gdb_regs));</div><div class='add'>+</div><div class='add'>+	memcpy(gr-&gt;gpr, regs-&gt;gr, sizeof(gr-&gt;gpr));</div><div class='add'>+	memcpy(gr-&gt;fr, regs-&gt;fr, sizeof(gr-&gt;fr));</div><div class='add'>+</div><div class='add'>+	gr-&gt;sr0 = regs-&gt;sr[0];</div><div class='add'>+	gr-&gt;sr1 = regs-&gt;sr[1];</div><div class='add'>+	gr-&gt;sr2 = regs-&gt;sr[2];</div><div class='add'>+	gr-&gt;sr3 = regs-&gt;sr[3];</div><div class='add'>+	gr-&gt;sr4 = regs-&gt;sr[4];</div><div class='add'>+	gr-&gt;sr5 = regs-&gt;sr[5];</div><div class='add'>+	gr-&gt;sr6 = regs-&gt;sr[6];</div><div class='add'>+	gr-&gt;sr7 = regs-&gt;sr[7];</div><div class='add'>+</div><div class='add'>+	gr-&gt;sar = regs-&gt;sar;</div><div class='add'>+	gr-&gt;iir = regs-&gt;iir;</div><div class='add'>+	gr-&gt;isr = regs-&gt;isr;</div><div class='add'>+	gr-&gt;ior = regs-&gt;ior;</div><div class='add'>+	gr-&gt;ipsw = regs-&gt;ipsw;</div><div class='add'>+	gr-&gt;cr27 = regs-&gt;cr27;</div><div class='add'>+</div><div class='add'>+	gr-&gt;iaoq_f = regs-&gt;iaoq[0];</div><div class='add'>+	gr-&gt;iasq_f = regs-&gt;iasq[0];</div><div class='add'>+</div><div class='add'>+	gr-&gt;iaoq_b = regs-&gt;iaoq[1];</div><div class='add'>+	gr-&gt;iasq_b = regs-&gt;iasq[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct parisc_gdb_regs *gr = (struct parisc_gdb_regs *)gdb_regs;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	memcpy(regs-&gt;gr, gr-&gt;gpr, sizeof(regs-&gt;gr));</div><div class='add'>+	memcpy(regs-&gt;fr, gr-&gt;fr, sizeof(regs-&gt;fr));</div><div class='add'>+</div><div class='add'>+	regs-&gt;sr[0] = gr-&gt;sr0;</div><div class='add'>+	regs-&gt;sr[1] = gr-&gt;sr1;</div><div class='add'>+	regs-&gt;sr[2] = gr-&gt;sr2;</div><div class='add'>+	regs-&gt;sr[3] = gr-&gt;sr3;</div><div class='add'>+	regs-&gt;sr[4] = gr-&gt;sr4;</div><div class='add'>+	regs-&gt;sr[5] = gr-&gt;sr5;</div><div class='add'>+	regs-&gt;sr[6] = gr-&gt;sr6;</div><div class='add'>+	regs-&gt;sr[7] = gr-&gt;sr7;</div><div class='add'>+</div><div class='add'>+	regs-&gt;sar = gr-&gt;sar;</div><div class='add'>+	regs-&gt;iir = gr-&gt;iir;</div><div class='add'>+	regs-&gt;isr = gr-&gt;isr;</div><div class='add'>+	regs-&gt;ior = gr-&gt;ior;</div><div class='add'>+	regs-&gt;ipsw = gr-&gt;ipsw;</div><div class='add'>+	regs-&gt;cr27 = gr-&gt;cr27;</div><div class='add'>+</div><div class='add'>+	regs-&gt;iaoq[0] = gr-&gt;iaoq_f;</div><div class='add'>+	regs-&gt;iasq[0] = gr-&gt;iasq_f;</div><div class='add'>+</div><div class='add'>+	regs-&gt;iaoq[1] = gr-&gt;iaoq_b;</div><div class='add'>+	regs-&gt;iasq[1] = gr-&gt;iasq_b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs,</div><div class='add'>+				struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = task_pt_regs(task);</div><div class='add'>+	unsigned long gr30, iaoq;</div><div class='add'>+</div><div class='add'>+	gr30 = regs-&gt;gr[30];</div><div class='add'>+	iaoq = regs-&gt;iaoq[0];</div><div class='add'>+</div><div class='add'>+	regs-&gt;gr[30] = regs-&gt;ksp;</div><div class='add'>+	regs-&gt;iaoq[0] = regs-&gt;kpc;</div><div class='add'>+	pt_regs_to_gdb_regs(gdb_regs, regs);</div><div class='add'>+</div><div class='add'>+	regs-&gt;gr[30] = gr30;</div><div class='add'>+	regs-&gt;iaoq[0] = iaoq;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void step_instruction_queue(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;iaoq[0] = regs-&gt;iaoq[1];</div><div class='add'>+	regs-&gt;iaoq[1] += 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;iaoq[0] = ip;</div><div class='add'>+	regs-&gt;iaoq[1] = ip + 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)</div><div class='add'>+{</div><div class='add'>+	int ret = probe_kernel_read(bpt-&gt;saved_instr, (char *)bpt-&gt;bpt_addr,</div><div class='add'>+				BREAK_INSTR_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	__patch_text((void *)bpt-&gt;bpt_addr,</div><div class='add'>+			*(unsigned int *)&amp;arch_kgdb_ops.gdb_bpt_instr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)</div><div class='add'>+{</div><div class='add'>+	__patch_text((void *)bpt-&gt;bpt_addr, *(unsigned int *)&amp;bpt-&gt;saved_instr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kgdb_arch_handle_exception(int trap, int signo,</div><div class='add'>+		int err_code, char *inbuf, char *outbuf,</div><div class='add'>+		struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	char *p = inbuf + 1;</div><div class='add'>+</div><div class='add'>+	switch (inbuf[0]) {</div><div class='add'>+	case 'D':</div><div class='add'>+	case 'c':</div><div class='add'>+	case 'k':</div><div class='add'>+		kgdb_contthread = NULL;</div><div class='add'>+		kgdb_single_step = 0;</div><div class='add'>+</div><div class='add'>+		if (kgdb_hex2long(&amp;p, &amp;addr))</div><div class='add'>+			kgdb_arch_set_pc(regs, addr);</div><div class='add'>+		else if (trap == 9 &amp;&amp; regs-&gt;iir ==</div><div class='add'>+				PARISC_KGDB_COMPILED_BREAK_INSN)</div><div class='add'>+			step_instruction_queue(regs);</div><div class='add'>+		return 0;</div><div class='add'>+	case 's':</div><div class='add'>+		kgdb_single_step = 1;</div><div class='add'>+		if (kgdb_hex2long(&amp;p, &amp;addr)) {</div><div class='add'>+			kgdb_arch_set_pc(regs, addr);</div><div class='add'>+		} else if (trap == 9 &amp;&amp; regs-&gt;iir ==</div><div class='add'>+				PARISC_KGDB_COMPILED_BREAK_INSN) {</div><div class='add'>+			step_instruction_queue(regs);</div><div class='add'>+			mtctl(-1, 0);</div><div class='add'>+		} else {</div><div class='add'>+			mtctl(0, 0);</div><div class='add'>+		}</div><div class='add'>+		regs-&gt;gr[0] |= PSW_R;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/parisc/kernel/kprobes.c b/arch/parisc/kernel/kprobes.c<br/>new file mode 100644<br/>index 000000000000..d58960b33bda<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/kprobes.c</a></div><div class='hunk'>@@ -0,0 +1,291 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * arch/parisc/kernel/kprobes.c</div><div class='add'>+ *</div><div class='add'>+ * PA-RISC kprobes implementation</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Sven Schnelle &lt;svens@stackframe.org&gt;</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/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/patch.h&gt;</div><div class='add'>+</div><div class='add'>+DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;</div><div class='add'>+DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);</div><div class='add'>+</div><div class='add'>+int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	if ((unsigned long)p-&gt;addr &amp; 3UL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p-&gt;ainsn.insn = get_insn_slot();</div><div class='add'>+	if (!p-&gt;ainsn.insn)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(p-&gt;ainsn.insn, p-&gt;addr,</div><div class='add'>+		MAX_INSN_SIZE * sizeof(kprobe_opcode_t));</div><div class='add'>+	p-&gt;opcode = *p-&gt;addr;</div><div class='add'>+	flush_insn_slot(p);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes arch_remove_kprobe(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	if (!p-&gt;ainsn.insn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	free_insn_slot(p-&gt;ainsn.insn, 0);</div><div class='add'>+	p-&gt;ainsn.insn = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes arch_arm_kprobe(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	patch_text(p-&gt;addr, PARISC_KPROBES_BREAK_INSN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes arch_disarm_kprobe(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	patch_text(p-&gt;addr, p-&gt;opcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)</div><div class='add'>+{</div><div class='add'>+	kcb-&gt;prev_kprobe.kp = kprobe_running();</div><div class='add'>+	kcb-&gt;prev_kprobe.status = kcb-&gt;kprobe_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)</div><div class='add'>+{</div><div class='add'>+	__this_cpu_write(current_kprobe, kcb-&gt;prev_kprobe.kp);</div><div class='add'>+	kcb-&gt;kprobe_status = kcb-&gt;prev_kprobe.status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __kprobes set_current_kprobe(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	__this_cpu_write(current_kprobe, p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __kprobes setup_singlestep(struct kprobe *p,</div><div class='add'>+		struct kprobe_ctlblk *kcb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	kcb-&gt;iaoq[0] = regs-&gt;iaoq[0];</div><div class='add'>+	kcb-&gt;iaoq[1] = regs-&gt;iaoq[1];</div><div class='add'>+	regs-&gt;iaoq[0] = (unsigned long)p-&gt;ainsn.insn;</div><div class='add'>+	mtctl(0, 0);</div><div class='add'>+	regs-&gt;gr[0] |= PSW_R;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __kprobes parisc_kprobe_break_handler(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct kprobe *p;</div><div class='add'>+	struct kprobe_ctlblk *kcb;</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='add'>+	kcb = get_kprobe_ctlblk();</div><div class='add'>+	p = get_kprobe((unsigned long *)regs-&gt;iaoq[0]);</div><div class='add'>+</div><div class='add'>+	if (!p) {</div><div class='add'>+		preempt_enable_no_resched();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (kprobe_running()) {</div><div class='add'>+		/*</div><div class='add'>+		 * We have reentered the kprobe_handler, since another kprobe</div><div class='add'>+		 * was hit while within the handler, we save the original</div><div class='add'>+		 * kprobes and single step on the instruction of the new probe</div><div class='add'>+		 * without calling any user handlers to avoid recursive</div><div class='add'>+		 * kprobes.</div><div class='add'>+		 */</div><div class='add'>+		save_previous_kprobe(kcb);</div><div class='add'>+		set_current_kprobe(p);</div><div class='add'>+		kprobes_inc_nmissed_count(p);</div><div class='add'>+		setup_singlestep(p, kcb, regs);</div><div class='add'>+		kcb-&gt;kprobe_status = KPROBE_REENTER;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_current_kprobe(p);</div><div class='add'>+	kcb-&gt;kprobe_status = KPROBE_HIT_ACTIVE;</div><div class='add'>+</div><div class='add'>+	/* If we have no pre-handler or it returned 0, we continue with</div><div class='add'>+	 * normal processing. If we have a pre-handler and it returned</div><div class='add'>+	 * non-zero - which means user handler setup registers to exit</div><div class='add'>+	 * to another instruction, we must skip the single stepping.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!p-&gt;pre_handler || !p-&gt;pre_handler(p, regs)) {</div><div class='add'>+		setup_singlestep(p, kcb, regs);</div><div class='add'>+		kcb-&gt;kprobe_status = KPROBE_HIT_SS;</div><div class='add'>+	} else {</div><div class='add'>+		reset_current_kprobe();</div><div class='add'>+		preempt_enable_no_resched();</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __kprobes parisc_kprobe_ss_handler(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();</div><div class='add'>+	struct kprobe *p = kprobe_running();</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;iaoq[0] != (unsigned long)p-&gt;ainsn.insn+4)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* restore back original saved kprobe variables and continue */</div><div class='add'>+	if (kcb-&gt;kprobe_status == KPROBE_REENTER) {</div><div class='add'>+		restore_previous_kprobe(kcb);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for absolute branch instructions we can copy iaoq_b. for relative</div><div class='add'>+	 * branch instructions we need to calculate the new address based on the</div><div class='add'>+	 * difference between iaoq_f and iaoq_b. We cannot use iaoq_b without</div><div class='add'>+	 * modificationt because it's based on our ainsn.insn address.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (p-&gt;post_handler)</div><div class='add'>+		p-&gt;post_handler(p, regs, 0);</div><div class='add'>+</div><div class='add'>+	switch (regs-&gt;iir &gt;&gt; 26) {</div><div class='add'>+	case 0x38: /* BE */</div><div class='add'>+	case 0x39: /* BE,L */</div><div class='add'>+	case 0x3a: /* BV */</div><div class='add'>+	case 0x3b: /* BVE */</div><div class='add'>+		/* for absolute branches, regs-&gt;iaoq[1] has already the right</div><div class='add'>+		 * address</div><div class='add'>+		 */</div><div class='add'>+		regs-&gt;iaoq[0] = kcb-&gt;iaoq[1];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		regs-&gt;iaoq[1] = kcb-&gt;iaoq[0];</div><div class='add'>+		regs-&gt;iaoq[1] += (regs-&gt;iaoq[1] - regs-&gt;iaoq[0]) + 4;</div><div class='add'>+		regs-&gt;iaoq[0] = kcb-&gt;iaoq[1];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	kcb-&gt;kprobe_status = KPROBE_HIT_SSDONE;</div><div class='add'>+	reset_current_kprobe();</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kretprobe_trampoline(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("nop");</div><div class='add'>+	asm volatile("nop");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __kprobes trampoline_probe_handler(struct kprobe *p,</div><div class='add'>+					      struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+static struct kprobe trampoline_p = {</div><div class='add'>+	.pre_handler = trampoline_probe_handler</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __kprobes trampoline_probe_handler(struct kprobe *p,</div><div class='add'>+					      struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct kretprobe_instance *ri = NULL;</div><div class='add'>+	struct hlist_head *head, empty_rp;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+	unsigned long flags, orig_ret_address = 0;</div><div class='add'>+	unsigned long trampoline_address = (unsigned long)trampoline_p.addr;</div><div class='add'>+	kprobe_opcode_t *correct_ret_addr = NULL;</div><div class='add'>+</div><div class='add'>+	INIT_HLIST_HEAD(&amp;empty_rp);</div><div class='add'>+	kretprobe_hash_lock(current, &amp;head, &amp;flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It is possible to have multiple instances associated with a given</div><div class='add'>+	 * task either because multiple functions in the call path have</div><div class='add'>+	 * a return probe installed on them, and/or more than one return</div><div class='add'>+	 * probe was registered for a target function.</div><div class='add'>+	 *</div><div class='add'>+	 * We can handle this because:</div><div class='add'>+	 *     - instances are always inserted at the head of the list</div><div class='add'>+	 *     - when multiple return probes are registered for the same</div><div class='add'>+	 *       function, the first instance's ret_addr will point to the</div><div class='add'>+	 *       real return address, and all the rest will point to</div><div class='add'>+	 *       kretprobe_trampoline</div><div class='add'>+	 */</div><div class='add'>+	hlist_for_each_entry_safe(ri, tmp, head, hlist) {</div><div class='add'>+		if (ri-&gt;task != current)</div><div class='add'>+			/* another task is sharing our hash bucket */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		orig_ret_address = (unsigned long)ri-&gt;ret_addr;</div><div class='add'>+</div><div class='add'>+		if (orig_ret_address != trampoline_address)</div><div class='add'>+			/*</div><div class='add'>+			 * This is the real return address. Any other</div><div class='add'>+			 * instances associated with this task are for</div><div class='add'>+			 * other calls deeper on the call stack</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kretprobe_assert(ri, orig_ret_address, trampoline_address);</div><div class='add'>+</div><div class='add'>+	correct_ret_addr = ri-&gt;ret_addr;</div><div class='add'>+	hlist_for_each_entry_safe(ri, tmp, head, hlist) {</div><div class='add'>+		if (ri-&gt;task != current)</div><div class='add'>+			/* another task is sharing our hash bucket */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		orig_ret_address = (unsigned long)ri-&gt;ret_addr;</div><div class='add'>+		if (ri-&gt;rp &amp;&amp; ri-&gt;rp-&gt;handler) {</div><div class='add'>+			__this_cpu_write(current_kprobe, &amp;ri-&gt;rp-&gt;kp);</div><div class='add'>+			get_kprobe_ctlblk()-&gt;kprobe_status = KPROBE_HIT_ACTIVE;</div><div class='add'>+			ri-&gt;ret_addr = correct_ret_addr;</div><div class='add'>+			ri-&gt;rp-&gt;handler(ri, regs);</div><div class='add'>+			__this_cpu_write(current_kprobe, NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		recycle_rp_inst(ri, &amp;empty_rp);</div><div class='add'>+</div><div class='add'>+		if (orig_ret_address != trampoline_address)</div><div class='add'>+			/*</div><div class='add'>+			 * This is the real return address. Any other</div><div class='add'>+			 * instances associated with this task are for</div><div class='add'>+			 * other calls deeper on the call stack</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kretprobe_hash_unlock(current, &amp;flags);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(ri, tmp, &amp;empty_rp, hlist) {</div><div class='add'>+		hlist_del(&amp;ri-&gt;hlist);</div><div class='add'>+		kfree(ri);</div><div class='add'>+	}</div><div class='add'>+	instruction_pointer_set(regs, orig_ret_address);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,</div><div class='add'>+				      struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	ri-&gt;ret_addr = (kprobe_opcode_t *)regs-&gt;gr[2];</div><div class='add'>+</div><div class='add'>+	/* Replace the return addr with trampoline addr. */</div><div class='add'>+	regs-&gt;gr[2] = (unsigned long)trampoline_p.addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __kprobes arch_trampoline_kprobe(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;addr == trampoline_p.addr;</div><div class='add'>+}</div><div class='add'>+bool arch_kprobe_on_func_entry(unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	return !offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init arch_init_kprobes(void)</div><div class='add'>+{</div><div class='add'>+	trampoline_p.addr = (kprobe_opcode_t *)</div><div class='add'>+		dereference_function_descriptor(kretprobe_trampoline);</div><div class='add'>+	return register_kprobe(&amp;trampoline_p);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S<br/>index 187f032c9dd8..4e4e8eb25874 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/pacache.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/pacache.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/pacache.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/pacache.S</a></div><div class='hunk'>@@ -311,39 +311,6 @@ fdsync:</div><div class='ctx'> 	nop</div><div class='ctx'> ENDPROC_CFI(flush_data_cache_local)</div><div class='ctx'> </div><div class='del'>-/* Macros to serialize TLB purge operations on SMP.  */</div><div class='del'>-</div><div class='del'>-	.macro	tlb_lock	la,flags,tmp</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-98:</div><div class='del'>-#if __PA_LDCW_ALIGNMENT &gt; 4</div><div class='del'>-	load32		pa_tlb_lock + __PA_LDCW_ALIGNMENT-1, \la</div><div class='del'>-	depi		0,31,__PA_LDCW_ALIGN_ORDER, \la</div><div class='del'>-#else</div><div class='del'>-	load32		pa_tlb_lock, \la</div><div class='del'>-#endif</div><div class='del'>-	rsm		PSW_SM_I,\flags</div><div class='del'>-1:	LDCW		0(\la),\tmp</div><div class='del'>-	cmpib,&lt;&gt;,n	0,\tmp,3f</div><div class='del'>-2:	ldw		0(\la),\tmp</div><div class='del'>-	cmpb,&lt;&gt;		%r0,\tmp,1b</div><div class='del'>-	nop</div><div class='del'>-	b,n		2b</div><div class='del'>-3:</div><div class='del'>-99:	ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP)</div><div class='del'>-#endif</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	tlb_unlock	la,flags,tmp</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-98:	ldi		1,\tmp</div><div class='del'>-	sync</div><div class='del'>-	stw		\tmp,0(\la)</div><div class='del'>-	mtsm		\flags</div><div class='del'>-99:	ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP)</div><div class='del'>-#endif</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> /* Clear page using kernel mapping.  */</div><div class='ctx'> </div><div class='ctx'> ENTRY_CFI(clear_page_asm)</div><div class='hunk'>@@ -601,10 +568,8 @@ ENTRY_CFI(copy_user_page_asm)</div><div class='ctx'> 	pdtlb,l		%r0(%r28)</div><div class='ctx'> 	pdtlb,l		%r0(%r29)</div><div class='ctx'> #else</div><div class='del'>-	tlb_lock	%r20,%r21,%r22</div><div class='ctx'> 0:	pdtlb		%r0(%r28)</div><div class='ctx'> 1:	pdtlb		%r0(%r29)</div><div class='del'>-	tlb_unlock	%r20,%r21,%r22</div><div class='ctx'> 	ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> 	ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -743,9 +708,7 @@ ENTRY_CFI(clear_user_page_asm)</div><div class='ctx'> #ifdef CONFIG_PA20</div><div class='ctx'> 	pdtlb,l		%r0(%r28)</div><div class='ctx'> #else</div><div class='del'>-	tlb_lock	%r20,%r21,%r22</div><div class='ctx'> 0:	pdtlb		%r0(%r28)</div><div class='del'>-	tlb_unlock	%r20,%r21,%r22</div><div class='ctx'> 	ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -821,9 +784,7 @@ ENTRY_CFI(flush_dcache_page_asm)</div><div class='ctx'> #ifdef CONFIG_PA20</div><div class='ctx'> 	pdtlb,l		%r0(%r28)</div><div class='ctx'> #else</div><div class='del'>-	tlb_lock	%r20,%r21,%r22</div><div class='ctx'> 0:	pdtlb		%r0(%r28)</div><div class='del'>-	tlb_unlock	%r20,%r21,%r22</div><div class='ctx'> 	ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -882,9 +843,7 @@ ENTRY_CFI(purge_dcache_page_asm)</div><div class='ctx'> #ifdef CONFIG_PA20</div><div class='ctx'> 	pdtlb,l		%r0(%r28)</div><div class='ctx'> #else</div><div class='del'>-	tlb_lock	%r20,%r21,%r22</div><div class='ctx'> 0:	pdtlb		%r0(%r28)</div><div class='del'>-	tlb_unlock	%r20,%r21,%r22</div><div class='ctx'> 	ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -948,10 +907,8 @@ ENTRY_CFI(flush_icache_page_asm)</div><div class='ctx'> 1:	pitlb,l         %r0(%sr4,%r28)</div><div class='ctx'> 	ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SPLIT_TLB, INSN_NOP)</div><div class='ctx'> #else</div><div class='del'>-	tlb_lock        %r20,%r21,%r22</div><div class='ctx'> 0:	pdtlb		%r0(%r28)</div><div class='ctx'> 1:	pitlb           %r0(%sr4,%r28)</div><div class='del'>-	tlb_unlock      %r20,%r21,%r22</div><div class='ctx'> 	ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> 	ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SMP, INSN_PxTLB)</div><div class='ctx'> 	ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SPLIT_TLB, INSN_NOP)</div><div class='head'>diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c<br/>index 7baa2265d439..174213b1716e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/parisc_ksyms.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/parisc_ksyms.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/parisc_ksyms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/parisc_ksyms.c</a></div><div class='hunk'>@@ -138,12 +138,6 @@ extern void $$dyncall(void);</div><div class='ctx'> EXPORT_SYMBOL($$dyncall);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DISCONTIGMEM</div><div class='del'>-#include &lt;asm/mmzone.h&gt;</div><div class='del'>-EXPORT_SYMBOL(node_data);</div><div class='del'>-EXPORT_SYMBOL(pfnnid_map);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'> extern void _mcount(void);</div><div class='ctx'> EXPORT_SYMBOL(_mcount);</div><div class='head'>diff --git a/arch/parisc/kernel/patch.c b/arch/parisc/kernel/patch.c<br/>new file mode 100644<br/>index 000000000000..cdcd981278b3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/patch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/patch.c</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ /*</div><div class='add'>+  * functions to patch RO kernel text during runtime</div><div class='add'>+  *</div><div class='add'>+  * Copyright (c) 2019 Sven Schnelle &lt;svens@stackframe.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/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/stop_machine.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/fixmap.h&gt;</div><div class='add'>+#include &lt;asm/patch.h&gt;</div><div class='add'>+</div><div class='add'>+struct patch {</div><div class='add'>+	void *addr;</div><div class='add'>+	unsigned int insn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __kprobes *patch_map(void *addr, int fixmap)</div><div class='add'>+{</div><div class='add'>+	unsigned long uintaddr = (uintptr_t) addr;</div><div class='add'>+	bool module = !core_kernel_text(uintaddr);</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (module &amp;&amp; IS_ENABLED(CONFIG_STRICT_MODULE_RWX))</div><div class='add'>+		page = vmalloc_to_page(addr);</div><div class='add'>+	else if (!module &amp;&amp; IS_ENABLED(CONFIG_STRICT_KERNEL_RWX))</div><div class='add'>+		page = virt_to_page(addr);</div><div class='add'>+	else</div><div class='add'>+		return addr;</div><div class='add'>+</div><div class='add'>+	set_fixmap(fixmap, page_to_phys(page));</div><div class='add'>+</div><div class='add'>+	return (void *) (__fix_to_virt(fixmap) + (uintaddr &amp; ~PAGE_MASK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __kprobes patch_unmap(int fixmap)</div><div class='add'>+{</div><div class='add'>+	clear_fixmap(fixmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes __patch_text(void *addr, unsigned int insn)</div><div class='add'>+{</div><div class='add'>+	void *waddr = addr;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	waddr = patch_map(addr, FIX_TEXT_POKE0);</div><div class='add'>+	*(u32 *)waddr = insn;</div><div class='add'>+	size = sizeof(u32);</div><div class='add'>+	flush_kernel_vmap_range(waddr, size);</div><div class='add'>+	patch_unmap(FIX_TEXT_POKE0);</div><div class='add'>+	flush_icache_range((uintptr_t)(addr),</div><div class='add'>+			   (uintptr_t)(addr) + size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __kprobes patch_text_stop_machine(void *data)</div><div class='add'>+{</div><div class='add'>+	struct patch *patch = data;</div><div class='add'>+</div><div class='add'>+	__patch_text(patch-&gt;addr, patch-&gt;insn);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __kprobes patch_text(void *addr, unsigned int insn)</div><div class='add'>+{</div><div class='add'>+	struct patch patch = {</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.insn = insn,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	stop_machine_cpuslocked(patch_text_stop_machine, &amp;patch, NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c<br/>index eb39e7e380d7..97c206734e24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/process.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/process.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/process.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/process.c</a></div><div class='hunk'>@@ -193,6 +193,7 @@ int dump_task_fpu (struct task_struct *tsk, elf_fpregset_t *r)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int running_on_qemu __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(running_on_qemu);</div><div class='ctx'> </div><div class='ctx'> void __cpuidle arch_cpu_idle_dead(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,12 +211,6 @@ void __cpuidle arch_cpu_idle(void)</div><div class='ctx'> </div><div class='ctx'> static int __init parisc_idle_init(void)</div><div class='ctx'> {</div><div class='del'>-	const char *marker;</div><div class='del'>-</div><div class='del'>-	/* check QEMU/SeaBIOS marker in PAGE0 */</div><div class='del'>-	marker = (char *) &amp;PAGE0-&gt;pad0;</div><div class='del'>-	running_on_qemu = (memcmp(marker, "SeaBIOS", 8) == 0);</div><div class='del'>-</div><div class='ctx'> 	if (!running_on_qemu)</div><div class='ctx'> 		cpu_idle_poll_ctrl(1);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c<br/>index 7f4d042856b5..e0a81dedc366 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/processor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/processor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/processor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/processor.c</a></div><div class='hunk'>@@ -305,7 +305,8 @@ void __init collect_boot_cpu_data(void)</div><div class='ctx'> </div><div class='ctx'> 	if (pdc_model_platform_info(orig_prod_num, current_prod_num, serial_no) == PDC_OK) {</div><div class='ctx'> 		printk(KERN_INFO "product %s, original product %s, S/N: %s\n",</div><div class='del'>-			current_prod_num, orig_prod_num, serial_no);</div><div class='add'>+			current_prod_num[0] ? current_prod_num : "n/a",</div><div class='add'>+			orig_prod_num, serial_no);</div><div class='ctx'> 		add_device_randomness(orig_prod_num, strlen(orig_prod_num));</div><div class='ctx'> 		add_device_randomness(current_prod_num, strlen(current_prod_num));</div><div class='ctx'> 		add_device_randomness(serial_no, strlen(serial_no));</div><div class='head'>diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c<br/>index 0964c236e3e5..a3d2fb4e6dd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/ptrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/ptrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/ptrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/ptrace.c</a></div><div class='hunk'>@@ -789,3 +789,38 @@ const char *regs_query_register_name(unsigned int offset)</div><div class='ctx'> 			return roff-&gt;name;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regs_within_kernel_stack() - check the address in the stack</div><div class='add'>+ * @regs:      pt_regs which contains kernel stack pointer.</div><div class='add'>+ * @addr:      address which is checked.</div><div class='add'>+ *</div><div class='add'>+ * regs_within_kernel_stack() checks @addr is within the kernel stack page(s).</div><div class='add'>+ * If @addr is within the kernel stack, it returns true. If not, returns false.</div><div class='add'>+ */</div><div class='add'>+int regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return ((addr &amp; ~(THREAD_SIZE - 1))  ==</div><div class='add'>+		(kernel_stack_pointer(regs) &amp; ~(THREAD_SIZE - 1)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regs_get_kernel_stack_nth() - get Nth entry of the stack</div><div class='add'>+ * @regs:	pt_regs which contains kernel stack pointer.</div><div class='add'>+ * @n:		stack entry number.</div><div class='add'>+ *</div><div class='add'>+ * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which</div><div class='add'>+ * is specified by @regs. If the @n th entry is NOT in the kernel stack,</div><div class='add'>+ * this returns 0.</div><div class='add'>+ */</div><div class='add'>+unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	unsigned long *addr = (unsigned long *)kernel_stack_pointer(regs);</div><div class='add'>+</div><div class='add'>+	addr -= n;</div><div class='add'>+</div><div class='add'>+	if (!regs_within_kernel_stack(regs, (unsigned long)addr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return *addr;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c<br/>index 15dd9e21be7e..e05cb2a5c16d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/setup.c</a></div><div class='hunk'>@@ -343,6 +343,12 @@ static int __init parisc_init(void)</div><div class='ctx'> 			boot_cpu_data.cpu_hz / 1000000,</div><div class='ctx'> 			boot_cpu_data.cpu_hz % 1000000	);</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+	/* Don't serialize TLB flushes if we run on one CPU only. */</div><div class='add'>+	if (num_online_cpus() == 1)</div><div class='add'>+		pa_serialize_tlb_flushes = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	apply_alternatives_all();</div><div class='ctx'> 	parisc_setup_cache_timing();</div><div class='ctx'> </div><div class='hunk'>@@ -397,6 +403,9 @@ void __init start_parisc(void)</div><div class='ctx'> 	int ret, cpunum;</div><div class='ctx'> 	struct pdc_coproc_cfg coproc_cfg;</div><div class='ctx'> </div><div class='add'>+	/* check QEMU/SeaBIOS marker in PAGE0 */</div><div class='add'>+	running_on_qemu = (memcmp(&amp;PAGE0-&gt;pad0, "SeaBIOS", 8) == 0);</div><div class='add'>+</div><div class='ctx'> 	cpunum = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	init_cpu_topology();</div><div class='head'>diff --git a/arch/parisc/kernel/stacktrace.c b/arch/parisc/kernel/stacktrace.c<br/>index ec5835e83a7a..6f0b9c8d8052 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/stacktrace.c</a></div><div class='hunk'>@@ -29,22 +29,17 @@ static void dump_trace(struct task_struct *task, struct stack_trace *trace)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Save stack-backtrace addresses into a stack_trace buffer.</div><div class='ctx'>  */</div><div class='ctx'> void save_stack_trace(struct stack_trace *trace)</div><div class='ctx'> {</div><div class='ctx'> 	dump_trace(current, trace);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace);</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> {</div><div class='ctx'> 	dump_trace(tsk, trace);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace_tsk);</div><div class='head'>diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c<br/>index 376ea0d1b275..4407ac4c1d84 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/sys_parisc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/sys_parisc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/sys_parisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/sys_parisc.c</a></div><div class='hunk'>@@ -86,7 +86,8 @@ static unsigned long mmap_upper_limit(struct rlimit *rlim_stack)</div><div class='ctx'> 		stack_base = STACK_SIZE_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* Add space for stack randomization. */</div><div class='del'>-	stack_base += (STACK_RND_MASK &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	if (current-&gt;flags &amp; PF_RANDOMIZE)</div><div class='add'>+		stack_base += (STACK_RND_MASK &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	return PAGE_ALIGN(STACK_TOP - stack_base);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S<br/>index 4f77bd9be66b..e54d5e4d3489 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/syscall.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/syscall.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/syscall.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/syscall.S</a></div><div class='hunk'>@@ -48,7 +48,7 @@ registers).</div><div class='ctx'> 	 */</div><div class='ctx'> #define KILL_INSN	break	0,0</div><div class='ctx'> </div><div class='del'>-	.level          LEVEL</div><div class='add'>+	.level          PA_ASM_LEVEL</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='hunk'>@@ -640,7 +640,9 @@ cas_action:</div><div class='ctx'> 	sub,&lt;&gt;	%r28, %r25, %r0</div><div class='ctx'> 2:	stw	%r24, 0(%r26)</div><div class='ctx'> 	/* Free lock */</div><div class='del'>-	sync</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	LDCW	0(%sr2,%r20), %r1			/* Barrier */</div><div class='add'>+#endif</div><div class='ctx'> 	stw	%r20, 0(%sr2,%r20)</div><div class='ctx'> #if ENABLE_LWS_DEBUG</div><div class='ctx'> 	/* Clear thread register indicator */</div><div class='hunk'>@@ -655,7 +657,9 @@ cas_action:</div><div class='ctx'> 3:		</div><div class='ctx'> 	/* Error occurred on load or store */</div><div class='ctx'> 	/* Free lock */</div><div class='del'>-	sync</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	LDCW	0(%sr2,%r20), %r1			/* Barrier */</div><div class='add'>+#endif</div><div class='ctx'> 	stw	%r20, 0(%sr2,%r20)</div><div class='ctx'> #if ENABLE_LWS_DEBUG</div><div class='ctx'> 	stw	%r0, 4(%sr2,%r20)</div><div class='hunk'>@@ -857,7 +861,9 @@ cas2_action:</div><div class='ctx'> </div><div class='ctx'> cas2_end:</div><div class='ctx'> 	/* Free lock */</div><div class='del'>-	sync</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	LDCW	0(%sr2,%r20), %r1			/* Barrier */</div><div class='add'>+#endif</div><div class='ctx'> 	stw	%r20, 0(%sr2,%r20)</div><div class='ctx'> 	/* Enable interrupts */</div><div class='ctx'> 	ssm	PSW_SM_I, %r0</div><div class='hunk'>@@ -868,7 +874,9 @@ cas2_end:</div><div class='ctx'> 22:</div><div class='ctx'> 	/* Error occurred on load or store */</div><div class='ctx'> 	/* Free lock */</div><div class='del'>-	sync</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	LDCW	0(%sr2,%r20), %r1			/* Barrier */</div><div class='add'>+#endif</div><div class='ctx'> 	stw	%r20, 0(%sr2,%r20)</div><div class='ctx'> 	ssm	PSW_SM_I, %r0</div><div class='ctx'> 	ldo	1(%r0),%r28</div><div class='head'>diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl<br/>index b26766c6647d..fe8ca623add8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -420,3 +420,7 @@</div><div class='ctx'> 421	32	rt_sigtimedwait_time64		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait_time64</div><div class='ctx'> 422	32	futex_time64			sys_futex			sys_futex</div><div class='ctx'> 423	32	sched_rr_get_interval_time64	sys_sched_rr_get_interval	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c<br/>index 7e1ccafadf57..096e319adeb3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/traps.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/traps.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/traps.c</a></div><div class='hunk'>@@ -42,6 +42,8 @@</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;linux/kgdb.h&gt;</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../math-emu/math-emu.h"	/* for handle_fpe() */</div><div class='ctx'> </div><div class='hunk'>@@ -293,6 +295,22 @@ static void handle_break(struct pt_regs *regs)</div><div class='ctx'> 			(tt == BUG_TRAP_TYPE_NONE) ? 9 : 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+	if (unlikely(iir == PARISC_KPROBES_BREAK_INSN)) {</div><div class='add'>+		parisc_kprobe_break_handler(regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+	if (unlikely(iir == PARISC_KGDB_COMPILED_BREAK_INSN ||</div><div class='add'>+		iir == PARISC_KGDB_BREAK_INSN)) {</div><div class='add'>+		kgdb_handle_exception(9, SIGTRAP, 0, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(iir != GDB_BREAK_INSN))</div><div class='ctx'> 		parisc_printk_ratelimited(0, regs,</div><div class='ctx'> 			KERN_DEBUG "break %d,%d: pid=%d command='%s'\n",</div><div class='hunk'>@@ -518,6 +536,19 @@ void notrace handle_interruption(int code, struct pt_regs *regs)</div><div class='ctx'> 	case  3:</div><div class='ctx'> 		/* Recovery counter trap */</div><div class='ctx'> 		regs-&gt;gr[0] &amp;= ~PSW_R;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+		if (parisc_kprobe_ss_handler(regs))</div><div class='add'>+			return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+		if (kgdb_single_step) {</div><div class='add'>+			kgdb_handle_exception(0, SIGTRAP, 0, regs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 		if (user_space(regs))</div><div class='ctx'> 			handle_gdb_break(regs, TRAP_TRACE);</div><div class='ctx'> 		/* else this must be the start of a syscall - just let it run */</div><div class='head'>diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S<br/>index c3b1b9c24ede..a8be7a47fcc0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/vmlinux.lds.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/kernel/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -18,6 +18,9 @@</div><div class='ctx'> 				*(.data..vm0.pgd) \</div><div class='ctx'> 				*(.data..vm0.pte)</div><div class='ctx'> </div><div class='add'>+/* No __ro_after_init data in the .rodata section - which will always be ro */</div><div class='add'>+#define RO_AFTER_INIT_DATA</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* needed for the processor specific cache alignment size */	</div><div class='head'>diff --git a/arch/parisc/mm/Makefile b/arch/parisc/mm/Makefile<br/>index 134393de69d2..20e39b043a60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/mm/Makefile</a></div><div class='hunk'>@@ -2,5 +2,5 @@</div><div class='ctx'> # Makefile for arch/parisc/mm</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y	 := init.o fault.o ioremap.o</div><div class='add'>+obj-y	 := init.o fault.o ioremap.o fixmap.o</div><div class='ctx'> obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o</div><div class='head'>diff --git a/arch/parisc/mm/fixmap.c b/arch/parisc/mm/fixmap.c<br/>new file mode 100644<br/>index 000000000000..c8d41b54fb19<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/fixmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/mm/fixmap.c</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * fixmaps for parisc</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Sven Schnelle &lt;svens@stackframe.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/fixmap.h&gt;</div><div class='add'>+</div><div class='add'>+void set_fixmap(enum fixed_addresses idx, phys_addr_t phys)</div><div class='add'>+{</div><div class='add'>+	unsigned long vaddr = __fix_to_virt(idx);</div><div class='add'>+	pgd_t *pgd = pgd_offset_k(vaddr);</div><div class='add'>+	pmd_t *pmd = pmd_offset(pgd, vaddr);</div><div class='add'>+	pte_t *pte;</div><div class='add'>+</div><div class='add'>+	if (pmd_none(*pmd))</div><div class='add'>+		pmd = pmd_alloc(NULL, pgd, vaddr);</div><div class='add'>+</div><div class='add'>+	pte = pte_offset_kernel(pmd, vaddr);</div><div class='add'>+	if (pte_none(*pte))</div><div class='add'>+		pte = pte_alloc_kernel(pmd, vaddr);</div><div class='add'>+</div><div class='add'>+	set_pte_at(&amp;init_mm, vaddr, pte, __mk_pte(phys, PAGE_KERNEL_RWX));</div><div class='add'>+	flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void clear_fixmap(enum fixed_addresses idx)</div><div class='add'>+{</div><div class='add'>+	unsigned long vaddr = __fix_to_virt(idx);</div><div class='add'>+	pgd_t *pgd = pgd_offset_k(vaddr);</div><div class='add'>+	pmd_t *pmd = pmd_offset(pgd, vaddr);</div><div class='add'>+	pte_t *pte = pte_offset_kernel(pmd, vaddr);</div><div class='add'>+</div><div class='add'>+	pte_clear(&amp;init_mm, vaddr, pte);</div><div class='add'>+</div><div class='add'>+	flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c<br/>index d77479ae3af2..d578809e55cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/hugetlbpage.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/hugetlbpage.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/hugetlbpage.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -139,9 +139,9 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	purge_tlb_start(flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> 	__set_huge_pte_at(mm, addr, ptep, entry);</div><div class='del'>-	purge_tlb_end(flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -151,10 +151,10 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	pte_t entry;</div><div class='ctx'> </div><div class='del'>-	purge_tlb_start(flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> 	entry = *ptep;</div><div class='ctx'> 	__set_huge_pte_at(mm, addr, ptep, __pte(0));</div><div class='del'>-	purge_tlb_end(flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> </div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='hunk'>@@ -166,10 +166,10 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	pte_t old_pte;</div><div class='ctx'> </div><div class='del'>-	purge_tlb_start(flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> 	old_pte = *ptep;</div><div class='ctx'> 	__set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));</div><div class='del'>-	purge_tlb_end(flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int huge_ptep_set_access_flags(struct vm_area_struct *vma,</div><div class='hunk'>@@ -178,13 +178,14 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int changed;</div><div class='add'>+	struct mm_struct *mm = vma-&gt;vm_mm;</div><div class='ctx'> </div><div class='del'>-	purge_tlb_start(flags);</div><div class='add'>+	spin_lock_irqsave(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> 	changed = !pte_same(*ptep, pte);</div><div class='ctx'> 	if (changed) {</div><div class='del'>-		__set_huge_pte_at(vma-&gt;vm_mm, addr, ptep, pte);</div><div class='add'>+		__set_huge_pte_at(mm, addr, ptep, pte);</div><div class='ctx'> 	}</div><div class='del'>-	purge_tlb_end(flags);</div><div class='add'>+	spin_unlock_irqrestore(pgd_spinlock((mm)-&gt;pgd), flags);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c<br/>index d0b166256f1a..3b0f9eab7f2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/parisc/mm/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/parisc/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/parisc/mm/init.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;asm/mmzone.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/msgbuf.h&gt;</div><div class='add'>+#include &lt;asm/sparsemem.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int  data_start;</div><div class='ctx'> extern void parisc_kernel_start(void);	/* Kernel entry point in head.S */</div><div class='hunk'>@@ -48,11 +49,6 @@ pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((__section__ (".data..vm0.pmd"), aligned</div><div class='ctx'> pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((__section__ (".data..vm0.pgd"), aligned(PAGE_SIZE)));</div><div class='ctx'> pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((__section__ (".data..vm0.pte"), aligned(PAGE_SIZE)));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DISCONTIGMEM</div><div class='del'>-struct node_map_data node_data[MAX_NUMNODES] __read_mostly;</div><div class='del'>-signed char pfnnid_map[PFNNID_MAP_MAX] __read_mostly;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct resource data_resource = {</div><div class='ctx'> 	.name	= "Kernel data",</div><div class='ctx'> 	.flags	= IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,</div><div class='hunk'>@@ -76,11 +72,11 @@ static struct resource sysram_resources[MAX_PHYSMEM_RANGES] __read_mostly;</div><div class='ctx'>  * information retrieved in kernel/inventory.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES] __read_mostly;</div><div class='del'>-int npmem_ranges __read_mostly;</div><div class='add'>+physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES] __initdata;</div><div class='add'>+int npmem_ranges __initdata;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-#define MAX_MEM         (~0UL)</div><div class='add'>+#define MAX_MEM         (1UL &lt;&lt; MAX_PHYSMEM_BITS)</div><div class='ctx'> #else /* !CONFIG_64BIT */</div><div class='ctx'> #define MAX_MEM         (3584U*1024U*1024U)</div><div class='ctx'> #endif /* !CONFIG_64BIT */</div><div class='hunk'>@@ -119,7 +115,7 @@ static void __init mem_limit_func(void)</div><div class='ctx'> static void __init setup_bootmem(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mem_max;</div><div class='del'>-#ifndef CONFIG_DISCONTIGMEM</div><div class='add'>+#ifndef CONFIG_SPARSEMEM</div><div class='ctx'> 	physmem_range_t pmem_holes[MAX_PHYSMEM_RANGES - 1];</div><div class='ctx'> 	int npmem_holes;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -137,23 +133,20 @@ static void __init setup_bootmem(void)</div><div class='ctx'> 		int j;</div><div class='ctx'> </div><div class='ctx'> 		for (j = i; j &gt; 0; j--) {</div><div class='del'>-			unsigned long tmp;</div><div class='add'>+			physmem_range_t tmp;</div><div class='ctx'> </div><div class='ctx'> 			if (pmem_ranges[j-1].start_pfn &lt;</div><div class='ctx'> 			    pmem_ranges[j].start_pfn) {</div><div class='ctx'> </div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			tmp = pmem_ranges[j-1].start_pfn;</div><div class='del'>-			pmem_ranges[j-1].start_pfn = pmem_ranges[j].start_pfn;</div><div class='del'>-			pmem_ranges[j].start_pfn = tmp;</div><div class='del'>-			tmp = pmem_ranges[j-1].pages;</div><div class='del'>-			pmem_ranges[j-1].pages = pmem_ranges[j].pages;</div><div class='del'>-			pmem_ranges[j].pages = tmp;</div><div class='add'>+			tmp = pmem_ranges[j-1];</div><div class='add'>+			pmem_ranges[j-1] = pmem_ranges[j];</div><div class='add'>+			pmem_ranges[j] = tmp;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_DISCONTIGMEM</div><div class='add'>+#ifndef CONFIG_SPARSEMEM</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Throw out ranges that are too far apart (controlled by</div><div class='ctx'> 	 * MAX_GAP).</div><div class='hunk'>@@ -165,7 +158,7 @@ static void __init setup_bootmem(void)</div><div class='ctx'> 			 pmem_ranges[i-1].pages) &gt; MAX_GAP) {</div><div class='ctx'> 			npmem_ranges = i;</div><div class='ctx'> 			printk("Large gap in memory detected (%ld pages). "</div><div class='del'>-			       "Consider turning on CONFIG_DISCONTIGMEM\n",</div><div class='add'>+			       "Consider turning on CONFIG_SPARSEMEM\n",</div><div class='ctx'> 			       pmem_ranges[i].start_pfn -</div><div class='ctx'> 			       (pmem_ranges[i-1].start_pfn +</div><div class='ctx'> 			        pmem_ranges[i-1].pages));</div><div class='hunk'>@@ -230,9 +223,8 @@ static void __init setup_bootmem(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Total Memory: %ld MB\n",mem_max &gt;&gt; 20);</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_DISCONTIGMEM</div><div class='add'>+#ifndef CONFIG_SPARSEMEM</div><div class='ctx'> 	/* Merge the ranges, keeping track of the holes */</div><div class='del'>-</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned long end_pfn;</div><div class='ctx'> 		unsigned long hole_pages;</div><div class='hunk'>@@ -255,18 +247,6 @@ static void __init setup_bootmem(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DISCONTIGMEM</div><div class='del'>-	for (i = 0; i &lt; MAX_PHYSMEM_RANGES; i++) {</div><div class='del'>-		memset(NODE_DATA(i), 0, sizeof(pg_data_t));</div><div class='del'>-	}</div><div class='del'>-	memset(pfnnid_map, 0xff, sizeof(pfnnid_map));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; npmem_ranges; i++) {</div><div class='del'>-		node_set_state(i, N_NORMAL_MEMORY);</div><div class='del'>-		node_set_online(i);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize and free the full range of memory in each range.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -314,7 +294,7 @@ static void __init setup_bootmem(void)</div><div class='ctx'> 	memblock_reserve(__pa(KERNEL_BINARY_TEXT_START),</div><div class='ctx'> 			(unsigned long)(_end - KERNEL_BINARY_TEXT_START));</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_DISCONTIGMEM</div><div class='add'>+#ifndef CONFIG_SPARSEMEM</div><div class='ctx'> </div><div class='ctx'> 	/* reserve the holes */</div><div class='ctx'> </div><div class='hunk'>@@ -360,6 +340,9 @@ static void __init setup_bootmem(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Page Deallocation Table (PDT) and check for bad memory. */</div><div class='ctx'> 	pdc_pdt_init();</div><div class='add'>+</div><div class='add'>+	memblock_allow_resize();</div><div class='add'>+	memblock_dump_all();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init parisc_text_address(unsigned long vaddr)</div><div class='hunk'>@@ -495,7 +478,7 @@ static void __init map_pages(unsigned long start_vaddr,</div><div class='ctx'> </div><div class='ctx'> void __init set_kernel_text_rw(int enable_read_write)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start = (unsigned long) _text;</div><div class='add'>+	unsigned long start = (unsigned long) __init_begin;</div><div class='ctx'> 	unsigned long end   = (unsigned long) &amp;data_start;</div><div class='ctx'> </div><div class='ctx'> 	map_pages(start, __pa(start), end-start,</div><div class='hunk'>@@ -622,15 +605,19 @@ void __init mem_init(void)</div><div class='ctx'> 	 * But keep code for debugging purposes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	printk("virtual kernel memory layout:\n"</div><div class='del'>-	       "    vmalloc : 0x%px - 0x%px   (%4ld MB)\n"</div><div class='del'>-	       "    memory  : 0x%px - 0x%px   (%4ld MB)\n"</div><div class='del'>-	       "      .init : 0x%px - 0x%px   (%4ld kB)\n"</div><div class='del'>-	       "      .data : 0x%px - 0x%px   (%4ld kB)\n"</div><div class='del'>-	       "      .text : 0x%px - 0x%px   (%4ld kB)\n",</div><div class='add'>+	       "     vmalloc : 0x%px - 0x%px   (%4ld MB)\n"</div><div class='add'>+	       "     fixmap  : 0x%px - 0x%px   (%4ld kB)\n"</div><div class='add'>+	       "     memory  : 0x%px - 0x%px   (%4ld MB)\n"</div><div class='add'>+	       "       .init : 0x%px - 0x%px   (%4ld kB)\n"</div><div class='add'>+	       "       .data : 0x%px - 0x%px   (%4ld kB)\n"</div><div class='add'>+	       "       .text : 0x%px - 0x%px   (%4ld kB)\n",</div><div class='ctx'> </div><div class='ctx'> 	       (void*)VMALLOC_START, (void*)VMALLOC_END,</div><div class='ctx'> 	       (VMALLOC_END - VMALLOC_START) &gt;&gt; 20,</div><div class='ctx'> </div><div class='add'>+	       (void *)FIXMAP_START, (void *)(FIXMAP_START + FIXMAP_SIZE),</div><div class='add'>+	       (unsigned long)(FIXMAP_SIZE / 1024),</div><div class='add'>+</div><div class='ctx'> 	       __va(0), high_memory,</div><div class='ctx'> 	       ((unsigned long)high_memory - (unsigned long)__va(0)) &gt;&gt; 20,</div><div class='ctx'> </div><div class='hunk'>@@ -709,37 +696,46 @@ static void __init gateway_init(void)</div><div class='ctx'> 		  PAGE_SIZE, PAGE_GATEWAY, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init paging_init(void)</div><div class='add'>+static void __init parisc_bootmem_free(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long zones_size[MAX_NR_ZONES] = { 0, };</div><div class='add'>+	unsigned long holes_size[MAX_NR_ZONES] = { 0, };</div><div class='add'>+	unsigned long mem_start_pfn = ~0UL, mem_end_pfn = 0, mem_size_pfn = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; npmem_ranges; i++) {</div><div class='add'>+		unsigned long start = pmem_ranges[i].start_pfn;</div><div class='add'>+		unsigned long size = pmem_ranges[i].pages;</div><div class='add'>+		unsigned long end = start + size;</div><div class='add'>+</div><div class='add'>+		if (mem_start_pfn &gt; start)</div><div class='add'>+			mem_start_pfn = start;</div><div class='add'>+		if (mem_end_pfn &lt; end)</div><div class='add'>+			mem_end_pfn = end;</div><div class='add'>+		mem_size_pfn += size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	zones_size[0] = mem_end_pfn - mem_start_pfn;</div><div class='add'>+	holes_size[0] = zones_size[0] - mem_size_pfn;</div><div class='add'>+</div><div class='add'>+	free_area_init_node(0, zones_size, mem_start_pfn, holes_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init paging_init(void)</div><div class='add'>+{</div><div class='ctx'> 	setup_bootmem();</div><div class='ctx'> 	pagetable_init();</div><div class='ctx'> 	gateway_init();</div><div class='ctx'> 	flush_cache_all_local(); /* start with known state */</div><div class='ctx'> 	flush_tlb_all_local(NULL);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; npmem_ranges; i++) {</div><div class='del'>-		unsigned long zones_size[MAX_NR_ZONES] = { 0, };</div><div class='del'>-</div><div class='del'>-		zones_size[ZONE_NORMAL] = pmem_ranges[i].pages;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DISCONTIGMEM</div><div class='del'>-		/* Need to initialize the pfnnid_map before we can initialize</div><div class='del'>-		   the zone */</div><div class='del'>-		{</div><div class='del'>-		    int j;</div><div class='del'>-		    for (j = (pmem_ranges[i].start_pfn &gt;&gt; PFNNID_SHIFT);</div><div class='del'>-			 j &lt;= ((pmem_ranges[i].start_pfn + pmem_ranges[i].pages) &gt;&gt; PFNNID_SHIFT);</div><div class='del'>-			 j++) {</div><div class='del'>-			pfnnid_map[j] = i;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		free_area_init_node(i, zones_size,</div><div class='del'>-				pmem_ranges[i].start_pfn, NULL);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Mark all memblocks as present for sparsemem using</div><div class='add'>+	 * memory_present() and then initialize sparsemem.</div><div class='add'>+	 */</div><div class='add'>+	memblocks_present();</div><div class='add'>+	sparse_init();</div><div class='add'>+	parisc_bootmem_free();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PA20</div><div class='head'>diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig<br/>index 2d0be82c3061..fa7219ffeadc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/Kconfig</a></div><div class='hunk'>@@ -103,13 +103,6 @@ config LOCKDEP_SUPPORT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config GENERIC_LOCKBREAK</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -132,6 +125,7 @@ config PPC</div><div class='ctx'> 	select ARCH_HAS_FORTIFY_SOURCE</div><div class='ctx'> 	select ARCH_HAS_GCOV_PROFILE_ALL</div><div class='ctx'> 	select ARCH_HAS_KCOV</div><div class='add'>+	select ARCH_HAS_MMIOWB			if PPC64</div><div class='ctx'> 	select ARCH_HAS_PHYS_TO_DMA</div><div class='ctx'> 	select ARCH_HAS_PMEM_API                if PPC64</div><div class='ctx'> 	select ARCH_HAS_PTE_SPECIAL</div><div class='hunk'>@@ -218,6 +212,8 @@ config PPC</div><div class='ctx'> 	select HAVE_PERF_REGS</div><div class='ctx'> 	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE		if SMP</div><div class='add'>+	select HAVE_RCU_TABLE_NO_INVALIDATE	if HAVE_RCU_TABLE_FREE</div><div class='add'>+	select HAVE_MMU_GATHER_PAGE_SIZE</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='ctx'> 	select HAVE_RELIABLE_STACKTRACE		if PPC_BOOK3S_64 &amp;&amp; CPU_LITTLE_ENDIAN</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='hunk'>@@ -318,6 +314,10 @@ config ARCH_SUSPEND_POSSIBLE</div><div class='ctx'> 		   (PPC_85xx &amp;&amp; !PPC_E500MC) || PPC_86xx || PPC_PSERIES \</div><div class='ctx'> 		   || 44x || 40x</div><div class='ctx'> </div><div class='add'>+config ARCH_SUSPEND_NONZERO_CPU</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on PPC_POWERNV || PPC_PSERIES</div><div class='add'>+</div><div class='ctx'> config PPC_DCR_NATIVE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig<br/>index 5ba131c30f6b..1bcd468ab422 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/configs/skiroot_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/configs/skiroot_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/configs/skiroot_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/configs/skiroot_defconfig</a></div><div class='hunk'>@@ -266,6 +266,7 @@ CONFIG_UDF_FS=m</div><div class='ctx'> CONFIG_MSDOS_FS=m</div><div class='ctx'> CONFIG_VFAT_FS=m</div><div class='ctx'> CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_HUGETLBFS=y</div><div class='ctx'> # CONFIG_MISC_FILESYSTEMS is not set</div><div class='ctx'> # CONFIG_NETWORK_FILESYSTEMS is not set</div><div class='ctx'> CONFIG_NLS=y</div><div class='head'>diff --git a/arch/powerpc/crypto/crc32c-vpmsum_glue.c b/arch/powerpc/crypto/crc32c-vpmsum_glue.c<br/>index fd1d6c83f0c0..c4fa242dd652 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/crypto/crc32c-vpmsum_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/crypto/crc32c-vpmsum_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/crypto/crc32c-vpmsum_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/crypto/crc32c-vpmsum_glue.c</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CHKSUM_BLOCK_SIZE	1</div><div class='hunk'>@@ -22,7 +24,7 @@ static u32 crc32c_vpmsum(u32 crc, unsigned char const *p, size_t len)</div><div class='ctx'> 	unsigned int prealign;</div><div class='ctx'> 	unsigned int tail;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; (VECTOR_BREAKPOINT + VMX_ALIGN) || in_interrupt())</div><div class='add'>+	if (len &lt; (VECTOR_BREAKPOINT + VMX_ALIGN) || !crypto_simd_usable())</div><div class='ctx'> 		return __crc32c_le(crc, p, len);</div><div class='ctx'> </div><div class='ctx'> 	if ((unsigned long)p &amp; VMX_ALIGN_MASK) {</div><div class='head'>diff --git a/arch/powerpc/crypto/crct10dif-vpmsum_glue.c b/arch/powerpc/crypto/crct10dif-vpmsum_glue.c<br/>index 02ea277863d1..e27ff16573b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/crypto/crct10dif-vpmsum_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/crypto/crct10dif-vpmsum_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/crypto/crct10dif-vpmsum_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/crypto/crct10dif-vpmsum_glue.c</a></div><div class='hunk'>@@ -12,11 +12,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/crc-t10dif.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VMX_ALIGN		16</div><div class='hunk'>@@ -32,7 +34,7 @@ static u16 crct10dif_vpmsum(u16 crci, unsigned char const *p, size_t len)</div><div class='ctx'> 	unsigned int tail;</div><div class='ctx'> 	u32 crc = crci;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; (VECTOR_BREAKPOINT + VMX_ALIGN) || in_interrupt())</div><div class='add'>+	if (len &lt; (VECTOR_BREAKPOINT + VMX_ALIGN) || !crypto_simd_usable())</div><div class='ctx'> 		return crc_t10dif_generic(crc, p, len);</div><div class='ctx'> </div><div class='ctx'> 	if ((unsigned long)p &amp; VMX_ALIGN_MASK) {</div><div class='head'>diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild<br/>index a0c132bedfae..b9f6e72bf4e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/Kbuild</a></div><div class='hunk'>@@ -8,6 +8,6 @@ generic-y += irq_regs.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += preempt.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += vtime.h</div><div class='ctx'> generic-y += msi.h</div><div class='add'>+generic-y += simd.h</div><div class='head'>diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h<br/>index 4b73847e9b95..1fad67b46409 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/io.h</a></div><div class='hunk'>@@ -34,14 +34,11 @@ extern struct pci_dev *isa_bridge_pcidev;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/synch.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='add'>+#include &lt;asm/mmiowb.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-#include &lt;asm/paca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define SIO_CONFIG_RA	0x398</div><div class='ctx'> #define SIO_CONFIG_RD	0x399</div><div class='ctx'> </div><div class='hunk'>@@ -107,12 +104,6 @@ extern bool isa_io_special;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-#define IO_SET_SYNC_FLAG()	do { local_paca-&gt;io_sync = 1; } while(0)</div><div class='del'>-#else</div><div class='del'>-#define IO_SET_SYNC_FLAG()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define DEF_MMIO_IN_X(name, size, insn)				\</div><div class='ctx'> static inline u##size name(const volatile u##size __iomem *addr)	\</div><div class='ctx'> {									\</div><div class='hunk'>@@ -127,7 +118,7 @@ static inline void name(volatile u##size __iomem *addr, u##size val)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	__asm__ __volatile__("sync;"#insn" %1,%y0"			\</div><div class='ctx'> 		: "=Z" (*addr) : "r" (val) : "memory");			\</div><div class='del'>-	IO_SET_SYNC_FLAG();						\</div><div class='add'>+	mmiowb_set_pending();						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEF_MMIO_IN_D(name, size, insn)				\</div><div class='hunk'>@@ -144,7 +135,7 @@ static inline void name(volatile u##size __iomem *addr, u##size val)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	__asm__ __volatile__("sync;"#insn"%U0%X0 %1,%0"			\</div><div class='ctx'> 		: "=m" (*addr) : "r" (val) : "memory");			\</div><div class='del'>-	IO_SET_SYNC_FLAG();						\</div><div class='add'>+	mmiowb_set_pending();						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEF_MMIO_IN_D(in_8,     8, lbz);</div><div class='hunk'>@@ -652,24 +643,6 @@ static inline void name at					\</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/iomap.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='del'>-#define mmiowb()</div><div class='del'>-#else</div><div class='del'>-/*</div><div class='del'>- * Enforce synchronisation of stores vs. spin_unlock</div><div class='del'>- * (this does it explicitly, though our implementation of spin_unlock</div><div class='del'>- * does it implicitely too)</div><div class='del'>- */</div><div class='del'>-static inline void mmiowb(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__("sync; li %0,0; stb %0,%1(13)"</div><div class='del'>-	: "=&amp;r" (tmp) : "i" (offsetof(struct paca_struct, io_sync))</div><div class='del'>-	: "memory");</div><div class='del'>-}</div><div class='del'>-#endif /* !CONFIG_PPC32 */</div><div class='del'>-</div><div class='ctx'> static inline void iosync(void)</div><div class='ctx'> {</div><div class='ctx'>         __asm__ __volatile__ ("sync" : : : "memory");</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmiowb.h b/arch/powerpc/include/asm/mmiowb.h<br/>new file mode 100644<br/>index 000000000000..74a00127eb20<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/mmiowb.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_POWERPC_MMIOWB_H</div><div class='add'>+#define _ASM_POWERPC_MMIOWB_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMIOWB</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;asm/barrier.h&gt;</div><div class='add'>+#include &lt;asm/paca.h&gt;</div><div class='add'>+</div><div class='add'>+#define arch_mmiowb_state()	(&amp;local_paca-&gt;mmiowb_state)</div><div class='add'>+#define mmiowb()		mb()</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MMIOWB */</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/mmiowb.h&gt;</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_POWERPC_MMIOWB_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h<br/>index d34ad1657d7b..8ddd4a91bdc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/mmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/mmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/mmu.h</a></div><div class='hunk'>@@ -352,7 +352,7 @@ static inline bool strict_kernel_rwx_enabled(void)</div><div class='ctx'> #if defined(CONFIG_SPARSEMEM_VMEMMAP) &amp;&amp; defined(CONFIG_SPARSEMEM_EXTREME) &amp;&amp;	\</div><div class='ctx'> 	defined (CONFIG_PPC_64K_PAGES)</div><div class='ctx'> #define MAX_PHYSMEM_BITS        51</div><div class='del'>-#else</div><div class='add'>+#elif defined(CONFIG_PPC64)</div><div class='ctx'> #define MAX_PHYSMEM_BITS        46</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h<br/>index e843bc5d1a0f..134e912d403f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/paca.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/paca.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/paca.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/paca.h</a></div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> #include &lt;asm/cpuidle.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/mmiowb_types.h&gt;</div><div class='add'>+</div><div class='ctx'> register struct paca_struct *local_paca asm("r13");</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DEBUG_PREEMPT) &amp;&amp; defined(CONFIG_SMP)</div><div class='hunk'>@@ -171,7 +173,6 @@ struct paca_struct {</div><div class='ctx'> 	u16 trap_save;			/* Used when bad stack is encountered */</div><div class='ctx'> 	u8 irq_soft_mask;		/* mask for irq soft masking */</div><div class='ctx'> 	u8 irq_happened;		/* irq happened while soft-disabled */</div><div class='del'>-	u8 io_sync;			/* writel() needs spin_unlock sync */</div><div class='ctx'> 	u8 irq_work_pending;		/* IRQ_WORK interrupt while soft-disable */</div><div class='ctx'> 	u8 nap_state_lost;		/* NV GPR values lost in power7_idle */</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='hunk'>@@ -264,6 +265,9 @@ struct paca_struct {</div><div class='ctx'> #ifdef CONFIG_STACKPROTECTOR</div><div class='ctx'> 	unsigned long canary;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_MMIOWB</div><div class='add'>+	struct mmiowb_state mmiowb_state;</div><div class='add'>+#endif</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> extern void copy_mm_to_paca(struct mm_struct *mm);</div><div class='head'>diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h<br/>index c5698a523bb1..23f7ed796f38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/ppc-opcode.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/ppc-opcode.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/ppc-opcode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/ppc-opcode.h</a></div><div class='hunk'>@@ -302,6 +302,7 @@</div><div class='ctx'> /* Misc instructions for BPF compiler */</div><div class='ctx'> #define PPC_INST_LBZ			0x88000000</div><div class='ctx'> #define PPC_INST_LD			0xe8000000</div><div class='add'>+#define PPC_INST_LDX			0x7c00002a</div><div class='ctx'> #define PPC_INST_LHZ			0xa0000000</div><div class='ctx'> #define PPC_INST_LWZ			0x80000000</div><div class='ctx'> #define PPC_INST_LHBRX			0x7c00062c</div><div class='hunk'>@@ -309,6 +310,7 @@</div><div class='ctx'> #define PPC_INST_STB			0x98000000</div><div class='ctx'> #define PPC_INST_STH			0xb0000000</div><div class='ctx'> #define PPC_INST_STD			0xf8000000</div><div class='add'>+#define PPC_INST_STDX			0x7c00012a</div><div class='ctx'> #define PPC_INST_STDU			0xf8000001</div><div class='ctx'> #define PPC_INST_STW			0x90000000</div><div class='ctx'> #define PPC_INST_STWU			0x94000000</div><div class='head'>diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h<br/>index 685c72310f5d..15b39c407c4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/spinlock.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/spinlock.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/spinlock.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/spinlock.h</a></div><div class='hunk'>@@ -39,19 +39,6 @@</div><div class='ctx'> #define LOCK_TOKEN	1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC64) &amp;&amp; defined(CONFIG_SMP)</div><div class='del'>-#define CLEAR_IO_SYNC	(get_paca()-&gt;io_sync = 0)</div><div class='del'>-#define SYNC_IO		do {						\</div><div class='del'>-				if (unlikely(get_paca()-&gt;io_sync)) {	\</div><div class='del'>-					mb();				\</div><div class='del'>-					get_paca()-&gt;io_sync = 0;	\</div><div class='del'>-				}					\</div><div class='del'>-			} while (0)</div><div class='del'>-#else</div><div class='del'>-#define CLEAR_IO_SYNC</div><div class='del'>-#define SYNC_IO</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PPC_PSERIES</div><div class='ctx'> #define vcpu_is_preempted vcpu_is_preempted</div><div class='ctx'> static inline bool vcpu_is_preempted(int cpu)</div><div class='hunk'>@@ -99,7 +86,6 @@ static inline unsigned long __arch_spin_trylock(arch_spinlock_t *lock)</div><div class='ctx'> </div><div class='ctx'> static inline int arch_spin_trylock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-	CLEAR_IO_SYNC;</div><div class='ctx'> 	return __arch_spin_trylock(lock) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -130,7 +116,6 @@ extern void __rw_yield(arch_rwlock_t *lock);</div><div class='ctx'> </div><div class='ctx'> static inline void arch_spin_lock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-	CLEAR_IO_SYNC;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (likely(__arch_spin_trylock(lock) == 0))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -148,7 +133,6 @@ void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags_dis;</div><div class='ctx'> </div><div class='del'>-	CLEAR_IO_SYNC;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (likely(__arch_spin_trylock(lock) == 0))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -167,7 +151,6 @@ void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)</div><div class='ctx'> </div><div class='ctx'> static inline void arch_spin_unlock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-	SYNC_IO;</div><div class='ctx'> 	__asm__ __volatile__("# arch_spin_unlock\n\t"</div><div class='ctx'> 				PPC_RELEASE_BARRIER: : :"memory");</div><div class='ctx'> 	lock-&gt;slock = 0;</div><div class='head'>diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h<br/>index 1a0e7a8b1c81..a048fed0722f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/syscall.h</a></div><div class='hunk'>@@ -65,22 +65,20 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val, mask = -1UL;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='add'>+	unsigned int n = 6;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	if (test_tsk_thread_flag(task, TIF_32BIT))</div><div class='ctx'> 		mask = 0xffffffff;</div><div class='ctx'> #endif</div><div class='ctx'> 	while (n--) {</div><div class='del'>-		if (n == 0 &amp;&amp; i == 0)</div><div class='add'>+		if (n == 0)</div><div class='ctx'> 			val = regs-&gt;orig_gpr3;</div><div class='ctx'> 		else</div><div class='del'>-			val = regs-&gt;gpr[3 + i + n];</div><div class='add'>+			val = regs-&gt;gpr[3 + n];</div><div class='ctx'> </div><div class='ctx'> 		args[n] = val &amp; mask;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -88,20 +86,23 @@ static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	memcpy(&amp;regs-&gt;gpr[3 + i], args, n * sizeof(args[0]));</div><div class='add'>+	memcpy(&amp;regs-&gt;gpr[3], args, 6 * sizeof(args[0]));</div><div class='ctx'> </div><div class='ctx'> 	/* Also copy the first argument into orig_gpr3 */</div><div class='del'>-	if (i == 0 &amp;&amp; n &gt; 0)</div><div class='del'>-		regs-&gt;orig_gpr3 = args[0];</div><div class='add'>+	regs-&gt;orig_gpr3 = args[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='del'>-	int arch = is_32bit_task() ? AUDIT_ARCH_PPC : AUDIT_ARCH_PPC64;</div><div class='add'>+	int arch;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_PPC64) &amp;&amp; !test_tsk_thread_flag(task, TIF_32BIT))</div><div class='add'>+		arch = AUDIT_ARCH_PPC64;</div><div class='add'>+	else</div><div class='add'>+		arch = AUDIT_ARCH_PPC;</div><div class='add'>+</div><div class='ctx'> #ifdef __LITTLE_ENDIAN__</div><div class='ctx'> 	arch |= __AUDIT_ARCH_LE;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h<br/>index e24c67d5ba75..34fba1ce27f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/tlb.h</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #define tlb_start_vma(tlb, vma)	do { } while (0)</div><div class='ctx'> #define tlb_end_vma(tlb, vma)	do { } while (0)</div><div class='ctx'> #define __tlb_remove_tlb_entry	__tlb_remove_tlb_entry</div><div class='del'>-#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='ctx'> </div><div class='add'>+#define tlb_flush tlb_flush</div><div class='ctx'> extern void tlb_flush(struct mmu_gather *tlb);</div><div class='ctx'> </div><div class='ctx'> /* Get the generic bits... */</div><div class='hunk'>@@ -46,22 +46,6 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='del'>-						     unsigned int page_size)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;page_size)</div><div class='del'>-		tlb-&gt;page_size = page_size;</div><div class='del'>-	else if (tlb-&gt;page_size != page_size) {</div><div class='del'>-		if (!tlb-&gt;fullmm)</div><div class='del'>-			tlb_flush_mmu(tlb);</div><div class='del'>-		/*</div><div class='del'>-		 * update the page size after flush for the new</div><div class='del'>-		 * mmu_gather.</div><div class='del'>-		 */</div><div class='del'>-		tlb-&gt;page_size = page_size;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static inline int mm_is_core_local(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h<br/>index 1afe90ade595..bbc06bd72b1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/vdso_datapage.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/include/asm/vdso_datapage.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/include/asm/vdso_datapage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/include/asm/vdso_datapage.h</a></div><div class='hunk'>@@ -82,10 +82,10 @@ struct vdso_data {</div><div class='ctx'> 	__u32 icache_block_size;		/* L1 i-cache block size     */</div><div class='ctx'> 	__u32 dcache_log_block_size;		/* L1 d-cache log block size */</div><div class='ctx'> 	__u32 icache_log_block_size;		/* L1 i-cache log block size */</div><div class='del'>-	__s32 wtom_clock_sec;			/* Wall to monotonic clock */</div><div class='del'>-	__s32 wtom_clock_nsec;</div><div class='del'>-	struct timespec stamp_xtime;	/* xtime as at tb_orig_stamp */</div><div class='del'>-	__u32 stamp_sec_fraction;	/* fractional seconds of stamp_xtime */</div><div class='add'>+	__u32 stamp_sec_fraction;		/* fractional seconds of stamp_xtime */</div><div class='add'>+	__s32 wtom_clock_nsec;			/* Wall to monotonic clock nsec */</div><div class='add'>+	__s64 wtom_clock_sec;			/* Wall to monotonic clock sec */</div><div class='add'>+	struct timespec stamp_xtime;		/* xtime as at tb_orig_stamp */</div><div class='ctx'>    	__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls  */</div><div class='ctx'>    	__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S<br/>index 6f1c11e0691f..7534ecff5e92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/cpu_setup_6xx.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/cpu_setup_6xx.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/cpu_setup_6xx.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/cpu_setup_6xx.S</a></div><div class='hunk'>@@ -24,9 +24,6 @@ BEGIN_MMU_FTR_SECTION</div><div class='ctx'> 	li	r10,0</div><div class='ctx'> 	mtspr	SPRN_SPRG_603_LRU,r10		/* init SW LRU tracking */</div><div class='ctx'> END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)</div><div class='del'>-	lis	r10, (swapper_pg_dir - PAGE_OFFSET)@h</div><div class='del'>-	ori	r10, r10, (swapper_pg_dir - PAGE_OFFSET)@l</div><div class='del'>-	mtspr	SPRN_SPRG_PGDIR, r10</div><div class='ctx'> </div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	bl	__init_fpu_registers</div><div class='head'>diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S<br/>index a5b8fbae56a0..9481a117e242 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/exceptions-64s.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/exceptions-64s.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/exceptions-64s.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/exceptions-64s.S</a></div><div class='hunk'>@@ -656,11 +656,17 @@ EXC_COMMON_BEGIN(data_access_slb_common)</div><div class='ctx'> 	ld	r4,PACA_EXSLB+EX_DAR(r13)</div><div class='ctx'> 	std	r4,_DAR(r1)</div><div class='ctx'> 	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+BEGIN_MMU_FTR_SECTION</div><div class='add'>+	/* HPT case, do SLB fault */</div><div class='ctx'> 	bl	do_slb_fault</div><div class='ctx'> 	cmpdi	r3,0</div><div class='ctx'> 	bne-	1f</div><div class='ctx'> 	b	fast_exception_return</div><div class='ctx'> 1:	/* Error case */</div><div class='add'>+MMU_FTR_SECTION_ELSE</div><div class='add'>+	/* Radix case, access is outside page table range */</div><div class='add'>+	li	r3,-EFAULT</div><div class='add'>+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)</div><div class='ctx'> 	std	r3,RESULT(r1)</div><div class='ctx'> 	bl	save_nvgprs</div><div class='ctx'> 	RECONCILE_IRQ_STATE(r10, r11)</div><div class='hunk'>@@ -705,11 +711,17 @@ EXC_COMMON_BEGIN(instruction_access_slb_common)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON(0x480, PACA_EXSLB)</div><div class='ctx'> 	ld	r4,_NIP(r1)</div><div class='ctx'> 	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+BEGIN_MMU_FTR_SECTION</div><div class='add'>+	/* HPT case, do SLB fault */</div><div class='ctx'> 	bl	do_slb_fault</div><div class='ctx'> 	cmpdi	r3,0</div><div class='ctx'> 	bne-	1f</div><div class='ctx'> 	b	fast_exception_return</div><div class='ctx'> 1:	/* Error case */</div><div class='add'>+MMU_FTR_SECTION_ELSE</div><div class='add'>+	/* Radix case, access is outside page table range */</div><div class='add'>+	li	r3,-EFAULT</div><div class='add'>+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)</div><div class='ctx'> 	std	r3,RESULT(r1)</div><div class='ctx'> 	bl	save_nvgprs</div><div class='ctx'> 	RECONCILE_IRQ_STATE(r10, r11)</div><div class='head'>diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S<br/>index ce6a972f2584..e25b615e9f9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/head_32.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/head_32.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/head_32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/head_32.S</a></div><div class='hunk'>@@ -851,10 +851,9 @@ __secondary_start:</div><div class='ctx'> 	tophys(r4,r2)</div><div class='ctx'> 	addi	r4,r4,THREAD	/* phys address of our thread_struct */</div><div class='ctx'> 	mtspr	SPRN_SPRG_THREAD,r4</div><div class='del'>-#ifdef CONFIG_PPC_RTAS</div><div class='del'>-	li	r3,0</div><div class='del'>-	stw	r3, RTAS_SP(r4)		/* 0 =&gt; not in RTAS */</div><div class='del'>-#endif</div><div class='add'>+	lis	r4, (swapper_pg_dir - PAGE_OFFSET)@h</div><div class='add'>+	ori	r4, r4, (swapper_pg_dir - PAGE_OFFSET)@l</div><div class='add'>+	mtspr	SPRN_SPRG_PGDIR, r4</div><div class='ctx'> </div><div class='ctx'> 	/* enable MMU and jump to start_secondary */</div><div class='ctx'> 	li	r4,MSR_KERNEL</div><div class='hunk'>@@ -938,10 +937,9 @@ start_here:</div><div class='ctx'> 	tophys(r4,r2)</div><div class='ctx'> 	addi	r4,r4,THREAD	/* init task's THREAD */</div><div class='ctx'> 	mtspr	SPRN_SPRG_THREAD,r4</div><div class='del'>-#ifdef CONFIG_PPC_RTAS</div><div class='del'>-	li	r3,0</div><div class='del'>-	stw	r3, RTAS_SP(r4)		/* 0 =&gt; not in RTAS */</div><div class='del'>-#endif</div><div class='add'>+	lis	r4, (swapper_pg_dir - PAGE_OFFSET)@h</div><div class='add'>+	ori	r4, r4, (swapper_pg_dir - PAGE_OFFSET)@l</div><div class='add'>+	mtspr	SPRN_SPRG_PGDIR, r4</div><div class='ctx'> </div><div class='ctx'> 	/* stack */</div><div class='ctx'> 	lis	r1,init_thread_union@ha</div><div class='head'>diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c<br/>index 683b5b3805bd..cd381e2291df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/kvm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/kvm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/kvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/kvm.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/kmemleak.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_para.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -712,6 +713,12 @@ static void kvm_use_magic_page(void)</div><div class='ctx'> </div><div class='ctx'> static __init void kvm_free_tmp(void)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * Inform kmemleak about the hole in the .bss section since the</div><div class='add'>+	 * corresponding pages will be unmapped with DEBUG_PAGEALLOC=y.</div><div class='add'>+	 */</div><div class='add'>+	kmemleak_free_part(&amp;kvm_tmp[kvm_tmp_index],</div><div class='add'>+			   ARRAY_SIZE(kvm_tmp) - kvm_tmp_index);</div><div class='ctx'> 	free_reserved_area(&amp;kvm_tmp[kvm_tmp_index],</div><div class='ctx'> 			   &amp;kvm_tmp[ARRAY_SIZE(kvm_tmp)], -1, NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c<br/>index 9b8631533e02..70568ccbd9fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/security.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/security.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/security.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ void setup_barrier_nospec(void)</div><div class='ctx'> 	enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) &amp;&amp;</div><div class='ctx'> 		 security_ftr_enabled(SEC_FTR_BNDS_CHK_SPEC_BAR);</div><div class='ctx'> </div><div class='del'>-	if (!no_nospec)</div><div class='add'>+	if (!no_nospec &amp;&amp; !cpu_mitigations_off())</div><div class='ctx'> 		enable_barrier_nospec(enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +116,7 @@ static int __init handle_nospectre_v2(char *p)</div><div class='ctx'> early_param("nospectre_v2", handle_nospectre_v2);</div><div class='ctx'> void setup_spectre_v2(void)</div><div class='ctx'> {</div><div class='del'>-	if (no_spectrev2)</div><div class='add'>+	if (no_spectrev2 || cpu_mitigations_off())</div><div class='ctx'> 		do_btb_flush_fixups();</div><div class='ctx'> 	else</div><div class='ctx'> 		btb_flush_enabled = true;</div><div class='hunk'>@@ -190,29 +190,22 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, c</div><div class='ctx'> 	bcs = security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED);</div><div class='ctx'> 	ccd = security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED);</div><div class='ctx'> </div><div class='del'>-	if (bcs || ccd || count_cache_flush_type != COUNT_CACHE_FLUSH_NONE) {</div><div class='del'>-		bool comma = false;</div><div class='add'>+	if (bcs || ccd) {</div><div class='ctx'> 		seq_buf_printf(&amp;s, "Mitigation: ");</div><div class='ctx'> </div><div class='del'>-		if (bcs) {</div><div class='add'>+		if (bcs)</div><div class='ctx'> 			seq_buf_printf(&amp;s, "Indirect branch serialisation (kernel only)");</div><div class='del'>-			comma = true;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (ccd) {</div><div class='del'>-			if (comma)</div><div class='del'>-				seq_buf_printf(&amp;s, ", ");</div><div class='del'>-			seq_buf_printf(&amp;s, "Indirect branch cache disabled");</div><div class='del'>-			comma = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (comma)</div><div class='add'>+		if (bcs &amp;&amp; ccd)</div><div class='ctx'> 			seq_buf_printf(&amp;s, ", ");</div><div class='ctx'> </div><div class='del'>-		seq_buf_printf(&amp;s, "Software count cache flush");</div><div class='add'>+		if (ccd)</div><div class='add'>+			seq_buf_printf(&amp;s, "Indirect branch cache disabled");</div><div class='add'>+	} else if (count_cache_flush_type != COUNT_CACHE_FLUSH_NONE) {</div><div class='add'>+		seq_buf_printf(&amp;s, "Mitigation: Software count cache flush");</div><div class='ctx'> </div><div class='ctx'> 		if (count_cache_flush_type == COUNT_CACHE_FLUSH_HW)</div><div class='del'>-			seq_buf_printf(&amp;s, "(hardware accelerated)");</div><div class='add'>+			seq_buf_printf(&amp;s, " (hardware accelerated)");</div><div class='ctx'> 	} else if (btb_flush_enabled) {</div><div class='ctx'> 		seq_buf_printf(&amp;s, "Mitigation: Branch predictor state flush");</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -307,7 +300,7 @@ void setup_stf_barrier(void)</div><div class='ctx'> </div><div class='ctx'> 	stf_enabled_flush_types = type;</div><div class='ctx'> </div><div class='del'>-	if (!no_stf_barrier)</div><div class='add'>+	if (!no_stf_barrier &amp;&amp; !cpu_mitigations_off())</div><div class='ctx'> 		stf_barrier_enable(enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c<br/>index ba404dd9ce1d..4f49e1a3594c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/setup_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/setup_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/setup_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/setup_64.c</a></div><div class='hunk'>@@ -932,7 +932,7 @@ void setup_rfi_flush(enum l1d_flush_type types, bool enable)</div><div class='ctx'> </div><div class='ctx'> 	enabled_flush_types = types;</div><div class='ctx'> </div><div class='del'>-	if (!no_rfi_flush)</div><div class='add'>+	if (!no_rfi_flush &amp;&amp; !cpu_mitigations_off())</div><div class='ctx'> 		rfi_flush_enable(enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl<br/>index b18abb0c3dae..00f5a63c8d9a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -505,3 +505,7 @@</div><div class='ctx'> 421	32	rt_sigtimedwait_time64		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait_time64</div><div class='ctx'> 422	32	futex_time64			sys_futex			sys_futex</div><div class='ctx'> 423	32	sched_rr_get_interval_time64	sys_sched_rr_get_interval	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S<br/>index 1e0bc5955a40..afd516b572f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/vdso32/gettimeofday.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/vdso32/gettimeofday.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/vdso32/gettimeofday.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/vdso32/gettimeofday.S</a></div><div class='hunk'>@@ -98,7 +98,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)</div><div class='ctx'> 	 * can be used, r7 contains NSEC_PER_SEC.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	lwz	r5,WTOM_CLOCK_SEC(r9)</div><div class='add'>+	lwz	r5,(WTOM_CLOCK_SEC+LOPART)(r9)</div><div class='ctx'> 	lwz	r6,WTOM_CLOCK_NSEC(r9)</div><div class='ctx'> </div><div class='ctx'> 	/* We now have our offset in r5,r6. We create a fake dependency</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S<br/>index a4ed9edfd5f0..1f324c28705b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/vdso64/gettimeofday.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kernel/vdso64/gettimeofday.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kernel/vdso64/gettimeofday.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kernel/vdso64/gettimeofday.S</a></div><div class='hunk'>@@ -92,7 +92,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)</div><div class='ctx'> 	 * At this point, r4,r5 contain our sec/nsec values.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	lwa	r6,WTOM_CLOCK_SEC(r3)</div><div class='add'>+	ld	r6,WTOM_CLOCK_SEC(r3)</div><div class='ctx'> 	lwa	r9,WTOM_CLOCK_NSEC(r3)</div><div class='ctx'> </div><div class='ctx'> 	/* We now have our result in r6,r9. We create a fake dependency</div><div class='hunk'>@@ -125,7 +125,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)</div><div class='ctx'> 	bne     cr6,75f</div><div class='ctx'> </div><div class='ctx'> 	/* CLOCK_MONOTONIC_COARSE */</div><div class='del'>-	lwa     r6,WTOM_CLOCK_SEC(r3)</div><div class='add'>+	ld	r6,WTOM_CLOCK_SEC(r3)</div><div class='ctx'> 	lwa     r9,WTOM_CLOCK_NSEC(r3)</div><div class='ctx'> </div><div class='ctx'> 	/* check if counter has updated */</div><div class='head'>diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig<br/>index bfdde04e4905..f53997a8ca62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kvm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kvm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kvm/Kconfig</a></div><div class='hunk'>@@ -20,7 +20,6 @@ if VIRTUALIZATION</div><div class='ctx'> config KVM</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select HAVE_KVM_EVENTFD</div><div class='ctx'> 	select HAVE_KVM_VCPU_ASYNC_IOCTL</div><div class='ctx'> 	select SRCU</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c<br/>index f02b04973710..f100e331e69b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kvm/book3s_64_vio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kvm/book3s_64_vio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kvm/book3s_64_vio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kvm/book3s_64_vio.c</a></div><div class='hunk'>@@ -543,14 +543,14 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,</div><div class='ctx'> 	if (ret != H_SUCCESS)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	idx = srcu_read_lock(&amp;vcpu-&gt;kvm-&gt;srcu);</div><div class='add'>+</div><div class='ctx'> 	ret = kvmppc_tce_validate(stt, tce);</div><div class='ctx'> 	if (ret != H_SUCCESS)</div><div class='del'>-		return ret;</div><div class='add'>+		goto unlock_exit;</div><div class='ctx'> </div><div class='ctx'> 	dir = iommu_tce_direction(tce);</div><div class='ctx'> </div><div class='del'>-	idx = srcu_read_lock(&amp;vcpu-&gt;kvm-&gt;srcu);</div><div class='del'>-</div><div class='ctx'> 	if ((dir != DMA_NONE) &amp;&amp; kvmppc_tce_to_ua(vcpu-&gt;kvm, tce, &amp;ua, NULL)) {</div><div class='ctx'> 		ret = H_PARAMETER;</div><div class='ctx'> 		goto unlock_exit;</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c<br/>index 06964350b97a..b2b29d4f9842 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kvm/book3s_hv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/kvm/book3s_hv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/kvm/book3s_hv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/kvm/book3s_hv.c</a></div><div class='hunk'>@@ -3423,7 +3423,9 @@ static int kvmhv_load_hv_regs_and_go(struct kvm_vcpu *vcpu, u64 time_limit,</div><div class='ctx'> 	vcpu-&gt;arch.shregs.sprg2 = mfspr(SPRN_SPRG2);</div><div class='ctx'> 	vcpu-&gt;arch.shregs.sprg3 = mfspr(SPRN_SPRG3);</div><div class='ctx'> </div><div class='del'>-	mtspr(SPRN_PSSCR, host_psscr);</div><div class='add'>+	/* Preserve PSSCR[FAKE_SUSPEND] until we've called kvmppc_save_tm_hv */</div><div class='add'>+	mtspr(SPRN_PSSCR, host_psscr |</div><div class='add'>+	      (local_paca-&gt;kvm_hstate.fake_suspend &lt;&lt; PSSCR_FAKE_SUSPEND_LG));</div><div class='ctx'> 	mtspr(SPRN_HFSCR, host_hfscr);</div><div class='ctx'> 	mtspr(SPRN_CIABR, host_ciabr);</div><div class='ctx'> 	mtspr(SPRN_DAWR, host_dawr);</div><div class='head'>diff --git a/arch/powerpc/lib/memcmp_64.S b/arch/powerpc/lib/memcmp_64.S<br/>index 844d8e774492..b7f6f6e0b6e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/lib/memcmp_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/lib/memcmp_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/lib/memcmp_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/lib/memcmp_64.S</a></div><div class='hunk'>@@ -215,11 +215,20 @@ _GLOBAL_TOC(memcmp)</div><div class='ctx'> 	beq	.Lzero</div><div class='ctx'> </div><div class='ctx'> .Lcmp_rest_lt8bytes:</div><div class='del'>-	/* Here we have only less than 8 bytes to compare with. at least s1</div><div class='del'>-	 * Address is aligned with 8 bytes.</div><div class='del'>-	 * The next double words are load and shift right with appropriate</div><div class='del'>-	 * bits.</div><div class='add'>+	/*</div><div class='add'>+	 * Here we have less than 8 bytes to compare. At least s1 is aligned to</div><div class='add'>+	 * 8 bytes, but s2 may not be. We must make sure s2 + 7 doesn't cross a</div><div class='add'>+	 * page boundary, otherwise we might read past the end of the buffer and</div><div class='add'>+	 * trigger a page fault. We use 4K as the conservative minimum page</div><div class='add'>+	 * size. If we detect that case we go to the byte-by-byte loop.</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise the next double word is loaded from s1 and s2, and shifted</div><div class='add'>+	 * right to compare the appropriate bits.</div><div class='ctx'> 	 */</div><div class='add'>+	clrldi	r6,r4,(64-12)	// r6 = r4 &amp; 0xfff</div><div class='add'>+	cmpdi	r6,0xff8</div><div class='add'>+	bgt	.Lshort</div><div class='add'>+</div><div class='ctx'> 	subfic  r6,r5,8</div><div class='ctx'> 	slwi	r6,r6,3</div><div class='ctx'> 	LD	rA,0,r3</div><div class='head'>diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S<br/>index 1f13494efb2b..a6c491f18a04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/mm/hash_low_32.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/mm/hash_low_32.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/mm/hash_low_32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/mm/hash_low_32.S</a></div><div class='hunk'>@@ -70,12 +70,12 @@ _GLOBAL(hash_page)</div><div class='ctx'> 	lis	r0,KERNELBASE@h		/* check if kernel address */</div><div class='ctx'> 	cmplw	0,r4,r0</div><div class='ctx'> 	ori	r3,r3,_PAGE_USER|_PAGE_PRESENT /* test low addresses as user */</div><div class='del'>-	mfspr	r5, SPRN_SPRG_PGDIR	/* virt page-table root */</div><div class='add'>+	mfspr	r5, SPRN_SPRG_PGDIR	/* phys page-table root */</div><div class='ctx'> 	blt+	112f			/* assume user more likely */</div><div class='del'>-	lis	r5,swapper_pg_dir@ha	/* if kernel address, use */</div><div class='del'>-	addi	r5,r5,swapper_pg_dir@l	/* kernel page table */</div><div class='add'>+	lis	r5, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */</div><div class='add'>+	addi	r5 ,r5 ,(swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */</div><div class='ctx'> 	rlwimi	r3,r9,32-12,29,29	/* MSR_PR -&gt; _PAGE_USER */</div><div class='del'>-112:	tophys(r5, r5)</div><div class='add'>+112:</div><div class='ctx'> #ifndef CONFIG_PTE_64BIT</div><div class='ctx'> 	rlwimi	r5,r4,12,20,29		/* insert top 10 bits of address */</div><div class='ctx'> 	lwz	r8,0(r5)		/* get pmd entry */</div><div class='head'>diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c<br/>index e7a9c4f6bfca..8330f135294f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/mm/mmu_context_iommu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/mm/mmu_context_iommu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/mm/mmu_context_iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/mm/mmu_context_iommu.c</a></div><div class='hunk'>@@ -95,28 +95,15 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,</div><div class='ctx'> 			      unsigned long entries, unsigned long dev_hpa,</div><div class='ctx'> 			      struct mm_iommu_table_group_mem_t **pmem)</div><div class='ctx'> {</div><div class='del'>-	struct mm_iommu_table_group_mem_t *mem;</div><div class='del'>-	long i, ret, locked_entries = 0;</div><div class='add'>+	struct mm_iommu_table_group_mem_t *mem, *mem2;</div><div class='add'>+	long i, ret, locked_entries = 0, pinned = 0;</div><div class='ctx'> 	unsigned int pageshift;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mem_list_mutex);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_rcu(mem, &amp;mm-&gt;context.iommu_group_mem_list,</div><div class='del'>-			next) {</div><div class='del'>-		/* Overlap? */</div><div class='del'>-		if ((mem-&gt;ua &lt; (ua + (entries &lt;&lt; PAGE_SHIFT))) &amp;&amp;</div><div class='del'>-				(ua &lt; (mem-&gt;ua +</div><div class='del'>-				       (mem-&gt;entries &lt;&lt; PAGE_SHIFT)))) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto unlock_exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='add'>+	unsigned long entry, chunk;</div><div class='ctx'> </div><div class='ctx'> 	if (dev_hpa == MM_IOMMU_TABLE_INVALID_HPA) {</div><div class='ctx'> 		ret = mm_iommu_adjust_locked_vm(mm, entries, true);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto unlock_exit;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		locked_entries = entries;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -148,17 +135,27 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	ret = get_user_pages_longterm(ua, entries, FOLL_WRITE, mem-&gt;hpages, NULL);</div><div class='add'>+	chunk = (1UL &lt;&lt; (PAGE_SHIFT + MAX_ORDER - 1)) /</div><div class='add'>+			sizeof(struct vm_area_struct *);</div><div class='add'>+	chunk = min(chunk, entries);</div><div class='add'>+	for (entry = 0; entry &lt; entries; entry += chunk) {</div><div class='add'>+		unsigned long n = min(entries - entry, chunk);</div><div class='add'>+</div><div class='add'>+		ret = get_user_pages_longterm(ua + (entry &lt;&lt; PAGE_SHIFT), n,</div><div class='add'>+				FOLL_WRITE, mem-&gt;hpages + entry, NULL);</div><div class='add'>+		if (ret == n) {</div><div class='add'>+			pinned += n;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			pinned += ret;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	up_read(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	if (ret != entries) {</div><div class='del'>-		/* free the reference taken */</div><div class='del'>-		for (i = 0; i &lt; ret; i++)</div><div class='del'>-			put_page(mem-&gt;hpages[i]);</div><div class='del'>-</div><div class='del'>-		vfree(mem-&gt;hpas);</div><div class='del'>-		kfree(mem);</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto unlock_exit;</div><div class='add'>+	if (pinned != entries) {</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		goto free_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pageshift = PAGE_SHIFT;</div><div class='hunk'>@@ -183,21 +180,43 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> good_exit:</div><div class='del'>-	ret = 0;</div><div class='ctx'> 	atomic64_set(&amp;mem-&gt;mapped, 1);</div><div class='ctx'> 	mem-&gt;used = 1;</div><div class='ctx'> 	mem-&gt;ua = ua;</div><div class='ctx'> 	mem-&gt;entries = entries;</div><div class='del'>-	*pmem = mem;</div><div class='ctx'> </div><div class='del'>-	list_add_rcu(&amp;mem-&gt;next, &amp;mm-&gt;context.iommu_group_mem_list);</div><div class='add'>+	mutex_lock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='del'>-unlock_exit:</div><div class='del'>-	if (locked_entries &amp;&amp; ret)</div><div class='del'>-		mm_iommu_adjust_locked_vm(mm, locked_entries, false);</div><div class='add'>+	list_for_each_entry_rcu(mem2, &amp;mm-&gt;context.iommu_group_mem_list, next) {</div><div class='add'>+		/* Overlap? */</div><div class='add'>+		if ((mem2-&gt;ua &lt; (ua + (entries &lt;&lt; PAGE_SHIFT))) &amp;&amp;</div><div class='add'>+				(ua &lt; (mem2-&gt;ua +</div><div class='add'>+				       (mem2-&gt;entries &lt;&lt; PAGE_SHIFT)))) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			mutex_unlock(&amp;mem_list_mutex);</div><div class='add'>+			goto free_exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_rcu(&amp;mem-&gt;next, &amp;mm-&gt;context.iommu_group_mem_list);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='add'>+	*pmem = mem;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_exit:</div><div class='add'>+	/* free the reference taken */</div><div class='add'>+	for (i = 0; i &lt; pinned; i++)</div><div class='add'>+		put_page(mem-&gt;hpages[i]);</div><div class='add'>+</div><div class='add'>+	vfree(mem-&gt;hpas);</div><div class='add'>+	kfree(mem);</div><div class='add'>+</div><div class='add'>+unlock_exit:</div><div class='add'>+	mm_iommu_adjust_locked_vm(mm, locked_entries, false);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +285,7 @@ static void mm_iommu_release(struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> long mm_iommu_put(struct mm_struct *mm, struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> {</div><div class='ctx'> 	long ret = 0;</div><div class='del'>-	unsigned long entries, dev_hpa;</div><div class='add'>+	unsigned long unlock_entries = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -287,17 +306,17 @@ long mm_iommu_put(struct mm_struct *mm, struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> 		goto unlock_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mem-&gt;dev_hpa == MM_IOMMU_TABLE_INVALID_HPA)</div><div class='add'>+		unlock_entries = mem-&gt;entries;</div><div class='add'>+</div><div class='ctx'> 	/* @mapped became 0 so now mappings are disabled, release the region */</div><div class='del'>-	entries = mem-&gt;entries;</div><div class='del'>-	dev_hpa = mem-&gt;dev_hpa;</div><div class='ctx'> 	mm_iommu_release(mem);</div><div class='ctx'> </div><div class='del'>-	if (dev_hpa == MM_IOMMU_TABLE_INVALID_HPA)</div><div class='del'>-		mm_iommu_adjust_locked_vm(mm, entries, false);</div><div class='del'>-</div><div class='ctx'> unlock_exit:</div><div class='ctx'> 	mutex_unlock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='add'>+	mm_iommu_adjust_locked_vm(mm, unlock_entries, false);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mm_iommu_put);</div><div class='head'>diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c<br/>index f29d2f118b44..5d9c3ff728c9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/mm/ppc_mmu_32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/mm/ppc_mmu_32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/mm/ppc_mmu_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/mm/ppc_mmu_32.c</a></div><div class='hunk'>@@ -98,10 +98,20 @@ static int find_free_bat(void)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function calculates the size of the larger block usable to map the</div><div class='add'>+ * beginning of an area based on the start address and size of that area:</div><div class='add'>+ * - max block size is 8M on 601 and 256 on other 6xx.</div><div class='add'>+ * - base address must be aligned to the block size. So the maximum block size</div><div class='add'>+ *   is identified by the lowest bit set to 1 in the base address (for instance</div><div class='add'>+ *   if base is 0x16000000, max size is 0x02000000).</div><div class='add'>+ * - block size has to be a power of two. This is calculated by finding the</div><div class='add'>+ *   highest bit set to 1.</div><div class='add'>+ */</div><div class='ctx'> static unsigned int block_size(unsigned long base, unsigned long top)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int max_size = (cpu_has_feature(CPU_FTR_601) ? 8 : 256) &lt;&lt; 20;</div><div class='del'>-	unsigned int base_shift = (fls(base) - 1) &amp; 31;</div><div class='add'>+	unsigned int base_shift = (ffs(base) - 1) &amp; 31;</div><div class='ctx'> 	unsigned int block_shift = (fls(top - base) - 1) &amp; 31;</div><div class='ctx'> </div><div class='ctx'> 	return min3(max_size, 1U &lt;&lt; base_shift, 1U &lt;&lt; block_shift);</div><div class='hunk'>@@ -157,7 +167,7 @@ static unsigned long __init __mmu_mapin_ram(unsigned long base, unsigned long to</div><div class='ctx'> </div><div class='ctx'> unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)</div><div class='ctx'> {</div><div class='del'>-	int done;</div><div class='add'>+	unsigned long done;</div><div class='ctx'> 	unsigned long border = (unsigned long)__init_begin - PAGE_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	if (__map_without_bats) {</div><div class='hunk'>@@ -169,10 +179,10 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)</div><div class='ctx'> 		return __mmu_mapin_ram(base, top);</div><div class='ctx'> </div><div class='ctx'> 	done = __mmu_mapin_ram(base, border);</div><div class='del'>-	if (done != border - base)</div><div class='add'>+	if (done != border)</div><div class='ctx'> 		return done;</div><div class='ctx'> </div><div class='del'>-	return done + __mmu_mapin_ram(border, top);</div><div class='add'>+	return __mmu_mapin_ram(border, top);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mmu_mark_initmem_nx(void)</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h<br/>index 549e9490ff2a..dcac37745b05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/net/bpf_jit.h</a></div><div class='hunk'>@@ -51,6 +51,8 @@</div><div class='ctx'> #define PPC_LIS(r, i)		PPC_ADDIS(r, 0, i)</div><div class='ctx'> #define PPC_STD(r, base, i)	EMIT(PPC_INST_STD | ___PPC_RS(r) |	      \</div><div class='ctx'> 				     ___PPC_RA(base) | ((i) &amp; 0xfffc))</div><div class='add'>+#define PPC_STDX(r, base, b)	EMIT(PPC_INST_STDX | ___PPC_RS(r) |	      \</div><div class='add'>+				     ___PPC_RA(base) | ___PPC_RB(b))</div><div class='ctx'> #define PPC_STDU(r, base, i)	EMIT(PPC_INST_STDU | ___PPC_RS(r) |	      \</div><div class='ctx'> 				     ___PPC_RA(base) | ((i) &amp; 0xfffc))</div><div class='ctx'> #define PPC_STW(r, base, i)	EMIT(PPC_INST_STW | ___PPC_RS(r) |	      \</div><div class='hunk'>@@ -65,7 +67,9 @@</div><div class='ctx'> #define PPC_LBZ(r, base, i)	EMIT(PPC_INST_LBZ | ___PPC_RT(r) |	      \</div><div class='ctx'> 				     ___PPC_RA(base) | IMM_L(i))</div><div class='ctx'> #define PPC_LD(r, base, i)	EMIT(PPC_INST_LD | ___PPC_RT(r) |	      \</div><div class='del'>-				     ___PPC_RA(base) | IMM_L(i))</div><div class='add'>+				     ___PPC_RA(base) | ((i) &amp; 0xfffc))</div><div class='add'>+#define PPC_LDX(r, base, b)	EMIT(PPC_INST_LDX | ___PPC_RT(r) |	      \</div><div class='add'>+				     ___PPC_RA(base) | ___PPC_RB(b))</div><div class='ctx'> #define PPC_LWZ(r, base, i)	EMIT(PPC_INST_LWZ | ___PPC_RT(r) |	      \</div><div class='ctx'> 				     ___PPC_RA(base) | IMM_L(i))</div><div class='ctx'> #define PPC_LHZ(r, base, i)	EMIT(PPC_INST_LHZ | ___PPC_RT(r) |	      \</div><div class='hunk'>@@ -85,17 +89,6 @@</div><div class='ctx'> 					___PPC_RA(a) | ___PPC_RB(b))</div><div class='ctx'> #define PPC_BPF_STDCX(s, a, b)	EMIT(PPC_INST_STDCX | ___PPC_RS(s) |	      \</div><div class='ctx'> 					___PPC_RA(a) | ___PPC_RB(b))</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-#define PPC_BPF_LL(r, base, i) do { PPC_LD(r, base, i); } while(0)</div><div class='del'>-#define PPC_BPF_STL(r, base, i) do { PPC_STD(r, base, i); } while(0)</div><div class='del'>-#define PPC_BPF_STLU(r, base, i) do { PPC_STDU(r, base, i); } while(0)</div><div class='del'>-#else</div><div class='del'>-#define PPC_BPF_LL(r, base, i) do { PPC_LWZ(r, base, i); } while(0)</div><div class='del'>-#define PPC_BPF_STL(r, base, i) do { PPC_STW(r, base, i); } while(0)</div><div class='del'>-#define PPC_BPF_STLU(r, base, i) do { PPC_STWU(r, base, i); } while(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define PPC_CMPWI(a, i)		EMIT(PPC_INST_CMPWI | ___PPC_RA(a) | IMM_L(i))</div><div class='ctx'> #define PPC_CMPDI(a, i)		EMIT(PPC_INST_CMPDI | ___PPC_RA(a) | IMM_L(i))</div><div class='ctx'> #define PPC_CMPW(a, b)		EMIT(PPC_INST_CMPW | ___PPC_RA(a) |	      \</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit32.h b/arch/powerpc/net/bpf_jit32.h<br/>index dc50a8d4b3b9..21744d8aa053 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit32.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit32.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/net/bpf_jit32.h</a></div><div class='hunk'>@@ -122,6 +122,10 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);</div><div class='ctx'> #define PPC_NTOHS_OFFS(r, base, i)	PPC_LHZ_OFFS(r, base, i)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define PPC_BPF_LL(r, base, i) do { PPC_LWZ(r, base, i); } while(0)</div><div class='add'>+#define PPC_BPF_STL(r, base, i) do { PPC_STW(r, base, i); } while(0)</div><div class='add'>+#define PPC_BPF_STLU(r, base, i) do { PPC_STWU(r, base, i); } while(0)</div><div class='add'>+</div><div class='ctx'> #define SEEN_DATAREF 0x10000 /* might call external helpers */</div><div class='ctx'> #define SEEN_XREG    0x20000 /* X reg is used */</div><div class='ctx'> #define SEEN_MEM     0x40000 /* SEEN_MEM+(1&lt;&lt;n) = use mem[n] for temporary</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit64.h b/arch/powerpc/net/bpf_jit64.h<br/>index 3609be4692b3..47f441f351a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit64.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit64.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/net/bpf_jit64.h</a></div><div class='hunk'>@@ -68,6 +68,26 @@ static const int b2p[] = {</div><div class='ctx'> /* PPC NVR range -- update this if we ever use NVRs below r27 */</div><div class='ctx'> #define BPF_PPC_NVR_MIN		27</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * WARNING: These can use TMP_REG_2 if the offset is not at word boundary,</div><div class='add'>+ * so ensure that it isn't in use already.</div><div class='add'>+ */</div><div class='add'>+#define PPC_BPF_LL(r, base, i) do {					      \</div><div class='add'>+				if ((i) % 4) {				      \</div><div class='add'>+					PPC_LI(b2p[TMP_REG_2], (i));	      \</div><div class='add'>+					PPC_LDX(r, base, b2p[TMP_REG_2]);     \</div><div class='add'>+				} else					      \</div><div class='add'>+					PPC_LD(r, base, i);		      \</div><div class='add'>+				} while(0)</div><div class='add'>+#define PPC_BPF_STL(r, base, i) do {					      \</div><div class='add'>+				if ((i) % 4) {				      \</div><div class='add'>+					PPC_LI(b2p[TMP_REG_2], (i));	      \</div><div class='add'>+					PPC_STDX(r, base, b2p[TMP_REG_2]);    \</div><div class='add'>+				} else					      \</div><div class='add'>+					PPC_STD(r, base, i);		      \</div><div class='add'>+				} while(0)</div><div class='add'>+#define PPC_BPF_STLU(r, base, i) do { PPC_STDU(r, base, i); } while(0)</div><div class='add'>+</div><div class='ctx'> #define SEEN_FUNC	0x1000 /* might call external helpers */</div><div class='ctx'> #define SEEN_STACK	0x2000 /* uses BPF stack */</div><div class='ctx'> #define SEEN_TAILCALL	0x4000 /* uses tail calls */</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c<br/>index 4194d3cfb60c..21a1dcd4b156 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit_comp64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/net/bpf_jit_comp64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/net/bpf_jit_comp64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/net/bpf_jit_comp64.c</a></div><div class='hunk'>@@ -252,7 +252,7 @@ static void bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32</div><div class='ctx'> 	 * if (tail_call_cnt &gt; MAX_TAIL_CALL_CNT)</div><div class='ctx'> 	 *   goto out;</div><div class='ctx'> 	 */</div><div class='del'>-	PPC_LD(b2p[TMP_REG_1], 1, bpf_jit_stack_tailcallcnt(ctx));</div><div class='add'>+	PPC_BPF_LL(b2p[TMP_REG_1], 1, bpf_jit_stack_tailcallcnt(ctx));</div><div class='ctx'> 	PPC_CMPLWI(b2p[TMP_REG_1], MAX_TAIL_CALL_CNT);</div><div class='ctx'> 	PPC_BCC(COND_GT, out);</div><div class='ctx'> </div><div class='hunk'>@@ -265,7 +265,7 @@ static void bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32</div><div class='ctx'> 	/* prog = array-&gt;ptrs[index]; */</div><div class='ctx'> 	PPC_MULI(b2p[TMP_REG_1], b2p_index, 8);</div><div class='ctx'> 	PPC_ADD(b2p[TMP_REG_1], b2p[TMP_REG_1], b2p_bpf_array);</div><div class='del'>-	PPC_LD(b2p[TMP_REG_1], b2p[TMP_REG_1], offsetof(struct bpf_array, ptrs));</div><div class='add'>+	PPC_BPF_LL(b2p[TMP_REG_1], b2p[TMP_REG_1], offsetof(struct bpf_array, ptrs));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if (prog == NULL)</div><div class='hunk'>@@ -275,7 +275,7 @@ static void bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32</div><div class='ctx'> 	PPC_BCC(COND_EQ, out);</div><div class='ctx'> </div><div class='ctx'> 	/* goto *(prog-&gt;bpf_func + prologue_size); */</div><div class='del'>-	PPC_LD(b2p[TMP_REG_1], b2p[TMP_REG_1], offsetof(struct bpf_prog, bpf_func));</div><div class='add'>+	PPC_BPF_LL(b2p[TMP_REG_1], b2p[TMP_REG_1], offsetof(struct bpf_prog, bpf_func));</div><div class='ctx'> #ifdef PPC64_ELF_ABI_v1</div><div class='ctx'> 	/* skip past the function descriptor */</div><div class='ctx'> 	PPC_ADDI(b2p[TMP_REG_1], b2p[TMP_REG_1],</div><div class='hunk'>@@ -606,7 +606,7 @@ bpf_alu32_trunc:</div><div class='ctx'> 				 * the instructions generated will remain the</div><div class='ctx'> 				 * same across all passes</div><div class='ctx'> 				 */</div><div class='del'>-				PPC_STD(dst_reg, 1, bpf_jit_stack_local(ctx));</div><div class='add'>+				PPC_BPF_STL(dst_reg, 1, bpf_jit_stack_local(ctx));</div><div class='ctx'> 				PPC_ADDI(b2p[TMP_REG_1], 1, bpf_jit_stack_local(ctx));</div><div class='ctx'> 				PPC_LDBRX(dst_reg, 0, b2p[TMP_REG_1]);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -662,7 +662,7 @@ emit_clear:</div><div class='ctx'> 				PPC_LI32(b2p[TMP_REG_1], imm);</div><div class='ctx'> 				src_reg = b2p[TMP_REG_1];</div><div class='ctx'> 			}</div><div class='del'>-			PPC_STD(src_reg, dst_reg, off);</div><div class='add'>+			PPC_BPF_STL(src_reg, dst_reg, off);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -709,7 +709,7 @@ emit_clear:</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* dst = *(u64 *)(ul) (src + off) */</div><div class='ctx'> 		case BPF_LDX | BPF_MEM | BPF_DW:</div><div class='del'>-			PPC_LD(dst_reg, src_reg, off);</div><div class='add'>+			PPC_BPF_LL(dst_reg, src_reg, off);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='head'>diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c<br/>index 17cf249b18ee..3cb2f07ce8eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/52xx/mpc52xx_gpt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/52xx/mpc52xx_gpt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/52xx/mpc52xx_gpt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/platforms/52xx/mpc52xx_gpt.c</a></div><div class='hunk'>@@ -628,7 +628,7 @@ static int mpc52xx_wdt_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = mpc52xx_gpt_wdt;</div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mpc52xx_wdt_release(struct inode *inode, struct file *file)</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype<br/>index 842b2c7e156a..50cd09b4e05d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/Kconfig.cputype?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/Kconfig.cputype</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/Kconfig.cputype?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/platforms/Kconfig.cputype</a></div><div class='hunk'>@@ -324,7 +324,7 @@ config ARCH_ENABLE_SPLIT_PMD_PTLOCK</div><div class='ctx'> </div><div class='ctx'> config PPC_RADIX_MMU</div><div class='ctx'> 	bool "Radix MMU Support"</div><div class='del'>-	depends on PPC_BOOK3S_64</div><div class='add'>+	depends on PPC_BOOK3S_64 &amp;&amp; HUGETLB_PAGE</div><div class='ctx'> 	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION &amp;&amp; COMPACTION) || CMA</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c<br/>index 48c2477e7e2a..bfb9ca99ac05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/cell/spufs/file.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/cell/spufs/file.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/cell/spufs/file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/platforms/cell/spufs/file.c</a></div><div class='hunk'>@@ -588,7 +588,7 @@ static int spufs_pipe_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct spufs_inode_info *i = SPUFS_I(inode);</div><div class='ctx'> 	file-&gt;private_data = i-&gt;i_ctx;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c<br/>index db329d4bf1c3..c1a75216050a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/cell/spufs/inode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/platforms/cell/spufs/inode.c</a></div><div class='hunk'>@@ -71,17 +71,11 @@ spufs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	return &amp;ei-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spufs_i_callback(struct rcu_head *head)</div><div class='add'>+static void spufs_free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = container_of(head, struct inode, i_rcu);</div><div class='ctx'> 	kmem_cache_free(spufs_inode_cache, SPUFS_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spufs_destroy_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	call_rcu(&amp;inode-&gt;i_rcu, spufs_i_callback);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> spufs_init_once(void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -739,7 +733,7 @@ spufs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	struct spufs_sb_info *info;</div><div class='ctx'> 	static const struct super_operations s_ops = {</div><div class='ctx'> 		.alloc_inode = spufs_alloc_inode,</div><div class='del'>-		.destroy_inode = spufs_destroy_inode,</div><div class='add'>+		.free_inode = spufs_free_inode,</div><div class='ctx'> 		.statfs = simple_statfs,</div><div class='ctx'> 		.evict_inode = spufs_evict_inode,</div><div class='ctx'> 		.show_options = spufs_show_options,</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c<br/>index 6ed22127391b..921f12182f3e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/pseries/pseries_energy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/pseries/pseries_energy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/pseries/pseries_energy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/platforms/pseries/pseries_energy.c</a></div><div class='hunk'>@@ -77,18 +77,27 @@ static u32 cpu_to_drc_index(int cpu)</div><div class='ctx'> </div><div class='ctx'> 		ret = drc.drc_index_start + (thread_index * drc.sequential_inc);</div><div class='ctx'> 	} else {</div><div class='del'>-		const __be32 *indexes;</div><div class='del'>-</div><div class='del'>-		indexes = of_get_property(dn, "ibm,drc-indexes", NULL);</div><div class='del'>-		if (indexes == NULL)</div><div class='del'>-			goto err_of_node_put;</div><div class='add'>+		u32 nr_drc_indexes, thread_drc_index;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * The first element indexes[0] is the number of drc_indexes</div><div class='del'>-		 * returned in the list.  Hence thread_index+1 will get the</div><div class='del'>-		 * drc_index corresponding to core number thread_index.</div><div class='add'>+		 * The first element of ibm,drc-indexes array is the</div><div class='add'>+		 * number of drc_indexes returned in the list.  Hence</div><div class='add'>+		 * thread_index+1 will get the drc_index corresponding</div><div class='add'>+		 * to core number thread_index.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = indexes[thread_index + 1];</div><div class='add'>+		rc = of_property_read_u32_index(dn, "ibm,drc-indexes",</div><div class='add'>+						0, &amp;nr_drc_indexes);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_of_node_put;</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(thread_index &gt; nr_drc_indexes);</div><div class='add'>+		rc = of_property_read_u32_index(dn, "ibm,drc-indexes",</div><div class='add'>+						thread_index + 1,</div><div class='add'>+						&amp;thread_drc_index);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_of_node_put;</div><div class='add'>+</div><div class='add'>+		ret = thread_drc_index;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c<br/>index d97d52772789..452dcfd7e5dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/pseries/ras.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/platforms/pseries/ras.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/platforms/pseries/ras.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/platforms/pseries/ras.c</a></div><div class='hunk'>@@ -550,6 +550,7 @@ static void pseries_print_mce_info(struct pt_regs *regs,</div><div class='ctx'> 		"UE",</div><div class='ctx'> 		"SLB",</div><div class='ctx'> 		"ERAT",</div><div class='add'>+		"Unknown",</div><div class='ctx'> 		"TLB",</div><div class='ctx'> 		"D-Cache",</div><div class='ctx'> 		"Unknown",</div><div class='head'>diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c<br/>index 1f1af12f23e2..c92dcac85231 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/sysdev/tsi108_dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/sysdev/tsi108_dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/sysdev/tsi108_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/sysdev/tsi108_dev.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static int __init tsi108_eth_of_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mac_addr = of_get_mac_address(np);</div><div class='del'>-		if (mac_addr)</div><div class='add'>+		if (!IS_ERR(mac_addr))</div><div class='ctx'> 			memcpy(tsi_eth_data.mac_addr, mac_addr, 6);</div><div class='ctx'> </div><div class='ctx'> 		ph = of_get_property(np, "mdio-handle", NULL);</div><div class='head'>diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c<br/>index a0f44f992360..13c6a47e6150 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/xmon/xmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/powerpc/xmon/xmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/powerpc/xmon/xmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/powerpc/xmon/xmon.c</a></div><div class='hunk'>@@ -2429,7 +2429,10 @@ static void dump_one_paca(int cpu)</div><div class='ctx'> 	DUMP(p, trap_save, "%#-*x");</div><div class='ctx'> 	DUMP(p, irq_soft_mask, "%#-*x");</div><div class='ctx'> 	DUMP(p, irq_happened, "%#-*x");</div><div class='del'>-	DUMP(p, io_sync, "%#-*x");</div><div class='add'>+#ifdef CONFIG_MMIOWB</div><div class='add'>+	DUMP(p, mmiowb_state.nesting_count, "%#-*x");</div><div class='add'>+	DUMP(p, mmiowb_state.mmiowb_pending, "%#-*x");</div><div class='add'>+#endif</div><div class='ctx'> 	DUMP(p, irq_work_pending, "%#-*x");</div><div class='ctx'> 	DUMP(p, nap_state_lost, "%#-*x");</div><div class='ctx'> 	DUMP(p, sprg_vdso, "%#-*llx");</div><div class='head'>diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig<br/>index eb56c82d8aa1..e66745decea1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/Kconfig</a></div><div class='hunk'>@@ -48,6 +48,7 @@ config RISCV</div><div class='ctx'> 	select RISCV_TIMER</div><div class='ctx'> 	select GENERIC_IRQ_MULTI_HANDLER</div><div class='ctx'> 	select ARCH_HAS_PTE_SPECIAL</div><div class='add'>+	select ARCH_HAS_MMIOWB</div><div class='ctx'> 	select HAVE_EBPF_JIT if 64BIT</div><div class='ctx'> </div><div class='ctx'> config MMU</div><div class='hunk'>@@ -69,9 +70,6 @@ config STACKTRACE_SUPPORT</div><div class='ctx'> config TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_BUG</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on BUG</div><div class='head'>diff --git a/arch/riscv/configs/rv32_defconfig b/arch/riscv/configs/rv32_defconfig<br/>new file mode 100644<br/>index 000000000000..1a911ed8e772<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/configs/rv32_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/configs/rv32_defconfig</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='add'>+CONFIG_CGROUP_SCHED=y</div><div class='add'>+CONFIG_CFS_BANDWIDTH=y</div><div class='add'>+CONFIG_CGROUP_BPF=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_USER_NS=y</div><div class='add'>+CONFIG_CHECKPOINT_RESTORE=y</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+CONFIG_BPF_SYSCALL=y</div><div class='add'>+CONFIG_ARCH_RV32I=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_ADVANCED_ROUTER=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+CONFIG_NETLINK_DIAG=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCIEPORTBUS=y</div><div class='add'>+CONFIG_PCI_HOST_GENERIC=y</div><div class='add'>+CONFIG_PCIE_XILINX=y</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_VIRTIO_BLK=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_SATA_AHCI=y</div><div class='add'>+CONFIG_SATA_AHCI_PLATFORM=y</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_VIRTIO_NET=y</div><div class='add'>+CONFIG_MACB=y</div><div class='add'>+CONFIG_E1000E=y</div><div class='add'>+CONFIG_R8169=y</div><div class='add'>+CONFIG_MICROSEMI_PHY=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_SERIAL_EARLYCON_RISCV_SBI=y</div><div class='add'>+CONFIG_HVC_RISCV_SBI=y</div><div class='add'>+# CONFIG_PTP_1588_CLOCK is not set</div><div class='add'>+CONFIG_DRM=y</div><div class='add'>+CONFIG_DRM_RADEON=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_XHCI_HCD=y</div><div class='add'>+CONFIG_USB_XHCI_PLATFORM=y</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+CONFIG_USB_EHCI_HCD_PLATFORM=y</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+CONFIG_USB_OHCI_HCD_PLATFORM=y</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_USB_UAS=y</div><div class='add'>+CONFIG_VIRTIO_MMIO=y</div><div class='add'>+CONFIG_SIFIVE_PLIC=y</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_TMPFS_POSIX_ACL=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_V4_1=y</div><div class='add'>+CONFIG_NFS_V4_2=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_CRYPTO_USER_API_HASH=y</div><div class='add'>+CONFIG_CRYPTO_DEV_VIRTIO=y</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+# CONFIG_RCU_TRACE is not set</div><div class='head'>diff --git a/arch/riscv/include/asm/fixmap.h b/arch/riscv/include/asm/fixmap.h<br/>index 57afe604b495..c207f6634b91 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/fixmap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/fixmap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/fixmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/include/asm/fixmap.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@ enum fixed_addresses {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FIXADDR_SIZE		(__end_of_fixed_addresses * PAGE_SIZE)</div><div class='del'>-#define FIXADDR_TOP		(PAGE_OFFSET)</div><div class='add'>+#define FIXADDR_TOP		(VMALLOC_START)</div><div class='ctx'> #define FIXADDR_START		(FIXADDR_TOP - FIXADDR_SIZE)</div><div class='ctx'> </div><div class='ctx'> #define FIXMAP_PAGE_IO		PAGE_KERNEL</div><div class='head'>diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h<br/>index 1d9c1376dc64..744fd92e77bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/include/asm/io.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #define _ASM_RISCV_IO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/mmiowb.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);</div><div class='ctx'> </div><div class='hunk'>@@ -100,18 +101,6 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * FIXME: I'm flip-flopping on whether or not we should keep this or enforce</div><div class='del'>- * the ordering with I/O on spinlocks like PowerPC does.  The worry is that</div><div class='del'>- * drivers won't get this correct, but I also don't want to introduce a fence</div><div class='del'>- * into the lock code that otherwise only uses AMOs (and is essentially defined</div><div class='del'>- * by the ISA to be correct).   For now I'm leaving this here: "o,w" is</div><div class='del'>- * sufficient to ensure that all writes to the device have completed before the</div><div class='del'>- * write to the spinlock is allowed to commit.  I surmised this from reading</div><div class='del'>- * "ACQUIRES VS I/O ACCESSES" in memory-barriers.txt.</div><div class='del'>- */</div><div class='del'>-#define mmiowb()	__asm__ __volatile__ ("fence o,w" : : : "memory");</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Unordered I/O memory access primitives.  These are even more relaxed than</div><div class='ctx'>  * the relaxed versions, as they don't even order accesses between successive</div><div class='ctx'>  * operations to the I/O regions.</div><div class='hunk'>@@ -165,7 +154,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)</div><div class='ctx'> #define __io_br()	do {} while (0)</div><div class='ctx'> #define __io_ar(v)	__asm__ __volatile__ ("fence i,r" : : : "memory");</div><div class='ctx'> #define __io_bw()	__asm__ __volatile__ ("fence w,o" : : : "memory");</div><div class='del'>-#define __io_aw()	do {} while (0)</div><div class='add'>+#define __io_aw()	mmiowb_set_pending()</div><div class='ctx'> </div><div class='ctx'> #define readb(c)	({ u8  __v; __io_br(); __v = readb_cpu(c); __io_ar(__v); __v; })</div><div class='ctx'> #define readw(c)	({ u16 __v; __io_br(); __v = readw_cpu(c); __io_ar(__v); __v; })</div><div class='head'>diff --git a/arch/riscv/include/asm/mmiowb.h b/arch/riscv/include/asm/mmiowb.h<br/>new file mode 100644<br/>index 000000000000..5d7e3a2b4e3b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/include/asm/mmiowb.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_RISCV_MMIOWB_H</div><div class='add'>+#define _ASM_RISCV_MMIOWB_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * "o,w" is sufficient to ensure that all writes to the device have completed</div><div class='add'>+ * before the write to the spinlock is allowed to commit.</div><div class='add'>+ */</div><div class='add'>+#define mmiowb()	__asm__ __volatile__ ("fence o,w" : : : "memory");</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/mmiowb.h&gt;</div><div class='add'>+</div><div class='add'>+#endif	/* ASM_RISCV_MMIOWB_H */</div><div class='head'>diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/syscall.h<br/>index bba3da6ef157..0f2fe1794c8f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/include/asm/syscall.h</a></div><div class='hunk'>@@ -72,35 +72,23 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		args[0] = regs-&gt;orig_a0;</div><div class='del'>-		args++;</div><div class='del'>-		i++;</div><div class='del'>-		n--;</div><div class='del'>-	}</div><div class='del'>-	memcpy(args, &amp;regs-&gt;a1 + i * sizeof(regs-&gt;a1), n * sizeof(args[0]));</div><div class='add'>+	args[0] = regs-&gt;orig_a0;</div><div class='add'>+	args++;</div><div class='add'>+	memcpy(args, &amp;regs-&gt;a1, 5 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-        if (i == 0) {</div><div class='del'>-                regs-&gt;orig_a0 = args[0];</div><div class='del'>-                args++;</div><div class='del'>-                i++;</div><div class='del'>-                n--;</div><div class='del'>-        }</div><div class='del'>-	memcpy(&amp;regs-&gt;a1 + i * sizeof(regs-&gt;a1), args, n * sizeof(regs-&gt;a0));</div><div class='add'>+	regs-&gt;orig_a0 = args[0];</div><div class='add'>+	args++;</div><div class='add'>+	memcpy(&amp;regs-&gt;a1, args, 5 * sizeof(regs-&gt;a1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> 	return AUDIT_ARCH_RISCV64;</div><div class='head'>diff --git a/arch/riscv/include/asm/tlb.h b/arch/riscv/include/asm/tlb.h<br/>index 439dc7072e05..1ad8d093c58b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/include/asm/tlb.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@ struct mmu_gather;</div><div class='ctx'> </div><div class='ctx'> static void tlb_flush(struct mmu_gather *tlb);</div><div class='ctx'> </div><div class='add'>+#define tlb_flush tlb_flush</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void tlb_flush(struct mmu_gather *tlb)</div><div class='head'>diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h<br/>index a00168b980d2..fb53a8089e76 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/uaccess.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/include/asm/uaccess.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/include/asm/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/include/asm/uaccess.h</a></div><div class='hunk'>@@ -300,7 +300,7 @@ do {								\</div><div class='ctx'> 		"	.balign 4\n"				\</div><div class='ctx'> 		"4:\n"						\</div><div class='ctx'> 		"	li %0, %6\n"				\</div><div class='del'>-		"	jump 2b, %1\n"				\</div><div class='add'>+		"	jump 3b, %1\n"				\</div><div class='ctx'> 		"	.previous\n"				\</div><div class='ctx'> 		"	.section __ex_table,\"a\"\n"		\</div><div class='ctx'> 		"	.balign " RISCV_SZPTR "\n"			\</div><div class='head'>diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile<br/>index f13f7f276639..598568168d35 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/kernel/Makefile</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FTRACE</div><div class='ctx'> CFLAGS_REMOVE_ftrace.o = -pg</div><div class='del'>-CFLAGS_REMOVE_setup.o = -pg</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> extra-y += head.o</div><div class='hunk'>@@ -29,8 +28,6 @@ obj-y	+= vdso.o</div><div class='ctx'> obj-y	+= cacheinfo.o</div><div class='ctx'> obj-y	+= vdso/</div><div class='ctx'> </div><div class='del'>-CFLAGS_setup.o := -mcmodel=medany</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_FPU)		+= fpu.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smpboot.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='head'>diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c<br/>index 7dd308129b40..2872edce894d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/module.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/module.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/kernel/module.c</a></div><div class='hunk'>@@ -141,7 +141,7 @@ static int apply_r_riscv_hi20_rela(struct module *me, u32 *location,</div><div class='ctx'> {</div><div class='ctx'> 	s32 hi20;</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CMODEL_MEDLOW)) {</div><div class='add'>+	if (IS_ENABLED(CONFIG_CMODEL_MEDLOW)) {</div><div class='ctx'> 		pr_err(</div><div class='ctx'> 		  "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",</div><div class='ctx'> 		  me-&gt;name, (long long)v, location);</div><div class='head'>diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c<br/>index ecb654f6a79e..540a331d1376 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/kernel/setup.c</a></div><div class='hunk'>@@ -48,14 +48,6 @@ struct screen_info screen_info = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-unsigned long va_pa_offset;</div><div class='del'>-EXPORT_SYMBOL(va_pa_offset);</div><div class='del'>-unsigned long pfn_base;</div><div class='del'>-EXPORT_SYMBOL(pfn_base);</div><div class='del'>-</div><div class='del'>-unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;</div><div class='del'>-EXPORT_SYMBOL(empty_zero_page);</div><div class='del'>-</div><div class='ctx'> /* The lucky hart to first increment this variable will boot the other cores */</div><div class='ctx'> atomic_t hart_lottery;</div><div class='ctx'> unsigned long boot_cpu_hartid;</div><div class='head'>diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c<br/>index a4b1d94371a0..4d403274c2e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/kernel/stacktrace.c</a></div><div class='hunk'>@@ -169,8 +169,6 @@ static bool save_trace(unsigned long pc, void *arg)</div><div class='ctx'> void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> {</div><div class='ctx'> 	walk_stackframe(tsk, NULL, save_trace, trace);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace_tsk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile<br/>index eb22ab49b3e0..b68aac701803 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/mm/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/mm/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/mm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/mm/Makefile</a></div><div class='hunk'>@@ -1,3 +1,9 @@</div><div class='add'>+</div><div class='add'>+CFLAGS_init.o := -mcmodel=medany</div><div class='add'>+ifdef CONFIG_FTRACE</div><div class='add'>+CFLAGS_REMOVE_init.o = -pg</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-y += init.o</div><div class='ctx'> obj-y += fault.o</div><div class='ctx'> obj-y += extable.o</div><div class='head'>diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c<br/>index b379a75ac6a6..bc7b77e34d09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/mm/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/riscv/mm/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/riscv/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/riscv/mm/init.c</a></div><div class='hunk'>@@ -25,6 +25,10 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]</div><div class='add'>+							__page_aligned_bss;</div><div class='add'>+EXPORT_SYMBOL(empty_zero_page);</div><div class='add'>+</div><div class='ctx'> static void __init zone_sizes_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, };</div><div class='hunk'>@@ -117,6 +121,14 @@ void __init setup_bootmem(void)</div><div class='ctx'> 			 */</div><div class='ctx'> 			memblock_reserve(reg-&gt;base, vmlinux_end - reg-&gt;base);</div><div class='ctx'> 			mem_size = min(reg-&gt;size, (phys_addr_t)-PAGE_OFFSET);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Remove memblock from the end of usable area to the</div><div class='add'>+			 * end of region</div><div class='add'>+			 */</div><div class='add'>+			if (reg-&gt;base + mem_size &lt; end)</div><div class='add'>+				memblock_remove(reg-&gt;base + mem_size,</div><div class='add'>+						end - reg-&gt;base - mem_size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(mem_size == 0);</div><div class='hunk'>@@ -143,6 +155,11 @@ void __init setup_bootmem(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned long va_pa_offset;</div><div class='add'>+EXPORT_SYMBOL(va_pa_offset);</div><div class='add'>+unsigned long pfn_base;</div><div class='add'>+EXPORT_SYMBOL(pfn_base);</div><div class='add'>+</div><div class='ctx'> pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;</div><div class='ctx'> pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -172,6 +189,25 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * setup_vm() is called from head.S with MMU-off.</div><div class='add'>+ *</div><div class='add'>+ * Following requirements should be honoured for setup_vm() to work</div><div class='add'>+ * correctly:</div><div class='add'>+ * 1) It should use PC-relative addressing for accessing kernel symbols.</div><div class='add'>+ *    To achieve this we always use GCC cmodel=medany.</div><div class='add'>+ * 2) The compiler instrumentation for FTRACE will not work for setup_vm()</div><div class='add'>+ *    so disable compiler instrumentation when FTRACE is enabled.</div><div class='add'>+ *</div><div class='add'>+ * Currently, the above requirements are honoured by using custom CFLAGS</div><div class='add'>+ * for init.o in mm/Makefile.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __riscv_cmodel_medany</div><div class='add'>+#error "setup_vm() is called from head.S before relocate so it should "</div><div class='add'>+	"not use absolute addressing."</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> asmlinkage void __init setup_vm(void)</div><div class='ctx'> {</div><div class='ctx'> 	extern char _start;</div><div class='head'>diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig<br/>index b6e3d0653002..07485582d027 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/Kconfig</a></div><div class='hunk'>@@ -14,12 +14,6 @@ config LOCKDEP_SUPPORT</div><div class='ctx'> config STACKTRACE_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='hunk'>@@ -149,6 +143,7 @@ config S390</div><div class='ctx'> 	select HAVE_FUNCTION_TRACER</div><div class='ctx'> 	select HAVE_FUTEX_CMPXCHG if FUTEX</div><div class='ctx'> 	select HAVE_GCC_PLUGINS</div><div class='add'>+	select HAVE_GENERIC_GUP</div><div class='ctx'> 	select HAVE_KERNEL_BZIP2</div><div class='ctx'> 	select HAVE_KERNEL_GZIP</div><div class='ctx'> 	select HAVE_KERNEL_LZ4</div><div class='hunk'>@@ -164,11 +159,13 @@ config S390</div><div class='ctx'> 	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_MEMBLOCK_NODE_MAP</div><div class='ctx'> 	select HAVE_MEMBLOCK_PHYS_MAP</div><div class='add'>+	select HAVE_MMU_GATHER_NO_GATHER</div><div class='ctx'> 	select HAVE_MOD_ARCH_SPECIFIC</div><div class='ctx'> 	select HAVE_NOP_MCOUNT</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	select HAVE_PCI</div><div class='ctx'> 	select HAVE_PERF_EVENTS</div><div class='add'>+	select HAVE_RCU_TABLE_FREE</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='ctx'> 	select HAVE_RSEQ</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='hunk'>@@ -188,7 +185,6 @@ config S390</div><div class='ctx'> 	select TTY</div><div class='ctx'> 	select VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	select ARCH_HAS_SCALED_CPUTIME</div><div class='del'>-	select VIRT_TO_BUS</div><div class='ctx'> 	select HAVE_NMI</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -240,6 +236,7 @@ choice</div><div class='ctx'> </div><div class='ctx'> config MARCH_Z900</div><div class='ctx'> 	bool "IBM zSeries model z800 and z900"</div><div class='add'>+	depends on !CC_IS_CLANG</div><div class='ctx'> 	select HAVE_MARCH_Z900_FEATURES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this to enable optimizations for model z800/z900 (2064 and</div><div class='hunk'>@@ -248,6 +245,7 @@ config MARCH_Z900</div><div class='ctx'> </div><div class='ctx'> config MARCH_Z990</div><div class='ctx'> 	bool "IBM zSeries model z890 and z990"</div><div class='add'>+	depends on !CC_IS_CLANG</div><div class='ctx'> 	select HAVE_MARCH_Z990_FEATURES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this to enable optimizations for model z890/z990 (2084 and</div><div class='hunk'>@@ -256,6 +254,7 @@ config MARCH_Z990</div><div class='ctx'> </div><div class='ctx'> config MARCH_Z9_109</div><div class='ctx'> 	bool "IBM System z9"</div><div class='add'>+	depends on !CC_IS_CLANG</div><div class='ctx'> 	select HAVE_MARCH_Z9_109_FEATURES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this to enable optimizations for IBM System z9 (2094 and</div><div class='hunk'>@@ -347,12 +346,15 @@ config TUNE_DEFAULT</div><div class='ctx'> </div><div class='ctx'> config TUNE_Z900</div><div class='ctx'> 	bool "IBM zSeries model z800 and z900"</div><div class='add'>+	depends on !CC_IS_CLANG</div><div class='ctx'> </div><div class='ctx'> config TUNE_Z990</div><div class='ctx'> 	bool "IBM zSeries model z890 and z990"</div><div class='add'>+	depends on !CC_IS_CLANG</div><div class='ctx'> </div><div class='ctx'> config TUNE_Z9_109</div><div class='ctx'> 	bool "IBM System z9"</div><div class='add'>+	depends on !CC_IS_CLANG</div><div class='ctx'> </div><div class='ctx'> config TUNE_Z10</div><div class='ctx'> 	bool "IBM System z10"</div><div class='hunk'>@@ -388,6 +390,9 @@ config COMPAT</div><div class='ctx'> 	  (and some other stuff like libraries and such) is needed for</div><div class='ctx'> 	  executing 31 bit applications.  It is safe to say "Y".</div><div class='ctx'> </div><div class='add'>+config COMPAT_VDSO</div><div class='add'>+	def_bool COMPAT &amp;&amp; !CC_IS_CLANG</div><div class='add'>+</div><div class='ctx'> config SYSVIPC_COMPAT</div><div class='ctx'> 	def_bool y if COMPAT &amp;&amp; SYSVIPC</div><div class='ctx'> </div><div class='hunk'>@@ -549,6 +554,17 @@ config ARCH_HAS_KEXEC_PURGATORY</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on KEXEC_FILE</div><div class='ctx'> </div><div class='add'>+config KEXEC_VERIFY_SIG</div><div class='add'>+	bool "Verify kernel signature during kexec_file_load() syscall"</div><div class='add'>+	depends on KEXEC_FILE &amp;&amp; SYSTEM_DATA_VERIFICATION</div><div class='add'>+	help</div><div class='add'>+	  This option makes kernel signature verification mandatory for</div><div class='add'>+	  the kexec_file_load() syscall.</div><div class='add'>+</div><div class='add'>+	  In addition to that option, you need to enable signature</div><div class='add'>+	  verification for the corresponding kernel image type being</div><div class='add'>+	  loaded in order for this to work.</div><div class='add'>+</div><div class='ctx'> config ARCH_RANDOM</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	prompt "s390 architectural random number generation API"</div><div class='hunk'>@@ -609,6 +625,29 @@ config EXPOLINE_FULL</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config RELOCATABLE</div><div class='add'>+	bool "Build a relocatable kernel"</div><div class='add'>+	select MODULE_REL_CRCS if MODVERSIONS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This builds a kernel image that retains relocation information</div><div class='add'>+	  so it can be loaded at an arbitrary address.</div><div class='add'>+	  The kernel is linked as a position-independent executable (PIE)</div><div class='add'>+	  and contains dynamic relocations which are processed early in the</div><div class='add'>+	  bootup process.</div><div class='add'>+	  The relocations make the kernel image about 15% larger (compressed</div><div class='add'>+	  10%), but are discarded at runtime.</div><div class='add'>+</div><div class='add'>+config RANDOMIZE_BASE</div><div class='add'>+	bool "Randomize the address of the kernel image (KASLR)"</div><div class='add'>+	depends on RELOCATABLE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  In support of Kernel Address Space Layout Randomization (KASLR),</div><div class='add'>+	  this randomizes the address at which the kernel image is loaded,</div><div class='add'>+	  as a security feature that deters exploit attempts relying on</div><div class='add'>+	  knowledge of the location of kernel internals.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> menu "Memory setup"</div><div class='hunk'>@@ -837,6 +876,17 @@ config HAVE_PNETID</div><div class='ctx'> </div><div class='ctx'> menu "Virtualization"</div><div class='ctx'> </div><div class='add'>+config PROTECTED_VIRTUALIZATION_GUEST</div><div class='add'>+	def_bool n</div><div class='add'>+	prompt "Protected virtualization guest support"</div><div class='add'>+	help</div><div class='add'>+	  Select this option, if you want to be able to run this</div><div class='add'>+	  kernel as a protected virtualization KVM guest.</div><div class='add'>+	  Protected virtualization capable machines have a mini hypervisor</div><div class='add'>+	  located at machine level (an ultravisor). With help of the</div><div class='add'>+	  Ultravisor, KVM will be able to run "protected" VMs, special</div><div class='add'>+	  VMs whose memory and management data are unavailable to KVM.</div><div class='add'>+</div><div class='ctx'> config PFAULT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	prompt "Pseudo page fault support"</div><div class='head'>diff --git a/arch/s390/Makefile b/arch/s390/Makefile<br/>index e21053e5e0da..df1d6a150f30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/Makefile</a></div><div class='hunk'>@@ -16,10 +16,14 @@ KBUILD_AFLAGS_MODULE += -fPIC</div><div class='ctx'> KBUILD_CFLAGS_MODULE += -fPIC</div><div class='ctx'> KBUILD_AFLAGS	+= -m64</div><div class='ctx'> KBUILD_CFLAGS	+= -m64</div><div class='add'>+ifeq ($(CONFIG_RELOCATABLE),y)</div><div class='add'>+KBUILD_CFLAGS	+= -fPIE</div><div class='add'>+LDFLAGS_vmlinux	:= -pie</div><div class='add'>+endif</div><div class='ctx'> aflags_dwarf	:= -Wa,-gdwarf-2</div><div class='del'>-KBUILD_AFLAGS_DECOMPRESSOR := -m64 -D__ASSEMBLY__</div><div class='add'>+KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__</div><div class='ctx'> KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))</div><div class='del'>-KBUILD_CFLAGS_DECOMPRESSOR := -m64 -O2</div><div class='add'>+KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2</div><div class='ctx'> KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY</div><div class='ctx'> KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float</div><div class='ctx'> KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables</div><div class='hunk'>@@ -111,7 +115,7 @@ endif</div><div class='ctx'> cfi := $(call as-instr,.cfi_startproc\n.cfi_val_offset 15$(comma)-160\n.cfi_endproc,-DCONFIG_AS_CFI_VAL_OFFSET=1)</div><div class='ctx'> </div><div class='ctx'> KBUILD_CFLAGS	+= -mbackchain -msoft-float $(cflags-y)</div><div class='del'>-KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare</div><div class='add'>+KBUILD_CFLAGS	+= -pipe -Wno-sign-compare</div><div class='ctx'> KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables $(cfi)</div><div class='ctx'> KBUILD_AFLAGS	+= $(aflags-y) $(cfi)</div><div class='ctx'> export KBUILD_AFLAGS_DECOMPRESSOR</div><div class='head'>diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile<br/>index c844eaf24ed7..c51496bbac19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/Makefile</a></div><div class='hunk'>@@ -12,25 +12,35 @@ KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)</div><div class='ctx'> KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Use -march=z900 for als.c to be able to print an error</div><div class='add'>+# Use minimum architecture for als.c to be able to print an error</div><div class='ctx'> # message if the kernel is started on a machine which is too old</div><div class='ctx'> #</div><div class='del'>-ifneq ($(CC_FLAGS_MARCH),-march=z900)</div><div class='add'>+ifndef CONFIG_CC_IS_CLANG</div><div class='add'>+CC_FLAGS_MARCH_MINIMUM := -march=z900</div><div class='add'>+else</div><div class='add'>+CC_FLAGS_MARCH_MINIMUM := -march=z10</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM))</div><div class='ctx'> AFLAGS_REMOVE_head.o		+= $(CC_FLAGS_MARCH)</div><div class='del'>-AFLAGS_head.o			+= -march=z900</div><div class='add'>+AFLAGS_head.o			+= $(CC_FLAGS_MARCH_MINIMUM)</div><div class='ctx'> AFLAGS_REMOVE_mem.o		+= $(CC_FLAGS_MARCH)</div><div class='del'>-AFLAGS_mem.o			+= -march=z900</div><div class='add'>+AFLAGS_mem.o			+= $(CC_FLAGS_MARCH_MINIMUM)</div><div class='ctx'> CFLAGS_REMOVE_als.o		+= $(CC_FLAGS_MARCH)</div><div class='del'>-CFLAGS_als.o			+= -march=z900</div><div class='add'>+CFLAGS_als.o			+= $(CC_FLAGS_MARCH_MINIMUM)</div><div class='ctx'> CFLAGS_REMOVE_sclp_early_core.o	+= $(CC_FLAGS_MARCH)</div><div class='del'>-CFLAGS_sclp_early_core.o	+= -march=z900</div><div class='add'>+CFLAGS_sclp_early_core.o	+= $(CC_FLAGS_MARCH_MINIMUM)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char</div><div class='ctx'> </div><div class='del'>-obj-y	:= head.o als.o startup.o mem_detect.o ipl_parm.o string.o ebcdic.o</div><div class='del'>-obj-y	+= sclp_early_core.o mem.o ipl_vmparm.o cmdline.o ctype.o</div><div class='del'>-targets	:= bzImage startup.a section_cmp.boot.data $(obj-y)</div><div class='add'>+obj-y	:= head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.o</div><div class='add'>+obj-y	+= string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o</div><div class='add'>+obj-y	+= ctype.o text_dma.o</div><div class='add'>+obj-$(CONFIG_PROTECTED_VIRTUALIZATION_GUEST)	+= uv.o</div><div class='add'>+obj-$(CONFIG_RELOCATABLE)	+= machine_kexec_reloc.o</div><div class='add'>+obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o</div><div class='add'>+targets	:= bzImage startup.a section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)</div><div class='ctx'> subdir-	:= compressed</div><div class='ctx'> </div><div class='ctx'> OBJECTS := $(addprefix $(obj)/,$(obj-y))</div><div class='hunk'>@@ -48,7 +58,8 @@ define cmd_section_cmp</div><div class='ctx'> 	touch $@</div><div class='ctx'> endef</div><div class='ctx'> </div><div class='del'>-$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data FORCE</div><div class='add'>+OBJCOPYFLAGS_bzImage := --pad-to $$(readelf -s $(obj)/compressed/vmlinux | awk '/\&lt;_end\&gt;/ {print or(strtonum("0x"$$2),4095)+1}')</div><div class='add'>+$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE</div><div class='ctx'> 	$(call if_changed,objcopy)</div><div class='ctx'> </div><div class='ctx'> $(obj)/section_cmp%: vmlinux $(obj)/compressed/vmlinux FORCE</div><div class='head'>diff --git a/arch/s390/boot/als.c b/arch/s390/boot/als.c<br/>index f902215e9cd9..ff6801d401c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/als.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/als.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/als.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/als.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static void facility_mismatch(void)</div><div class='ctx'> 	print_machine_type();</div><div class='ctx'> 	print_missing_facilities();</div><div class='ctx'> 	sclp_early_printk("See Principles of Operations for facility bits\n");</div><div class='del'>-	disabled_wait(0x8badcccc);</div><div class='add'>+	disabled_wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void verify_facilities(void)</div><div class='head'>diff --git a/arch/s390/boot/boot.h b/arch/s390/boot/boot.h<br/>index 82bc06346e05..ad57c2205a71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/boot.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/boot.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/boot.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/boot.h</a></div><div class='hunk'>@@ -9,5 +9,10 @@ void setup_boot_command_line(void);</div><div class='ctx'> void parse_boot_command_line(void);</div><div class='ctx'> void setup_memory_end(void);</div><div class='ctx'> void print_missing_facilities(void);</div><div class='add'>+unsigned long get_random_base(unsigned long safe_addr);</div><div class='add'>+</div><div class='add'>+extern int kaslr_enabled;</div><div class='add'>+</div><div class='add'>+unsigned long read_ipl_report(unsigned long safe_offset);</div><div class='ctx'> </div><div class='ctx'> #endif /* BOOT_BOOT_H */</div><div class='head'>diff --git a/arch/s390/boot/compressed/decompressor.h b/arch/s390/boot/compressed/decompressor.h<br/>index e1c1f2ec60f4..c15eb7114d83 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/compressed/decompressor.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/compressed/decompressor.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/compressed/decompressor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/compressed/decompressor.h</a></div><div class='hunk'>@@ -17,6 +17,11 @@ struct vmlinux_info {</div><div class='ctx'> 	unsigned long bss_size;		/* uncompressed image .bss size */</div><div class='ctx'> 	unsigned long bootdata_off;</div><div class='ctx'> 	unsigned long bootdata_size;</div><div class='add'>+	unsigned long bootdata_preserved_off;</div><div class='add'>+	unsigned long bootdata_preserved_size;</div><div class='add'>+	unsigned long dynsym_start;</div><div class='add'>+	unsigned long rela_dyn_start;</div><div class='add'>+	unsigned long rela_dyn_end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern char _vmlinux_info[];</div><div class='head'>diff --git a/arch/s390/boot/compressed/vmlinux.lds.S b/arch/s390/boot/compressed/vmlinux.lds.S<br/>index 7efc3938f595..112b8d9f1e4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/compressed/vmlinux.lds.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/compressed/vmlinux.lds.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/compressed/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/compressed/vmlinux.lds.S</a></div><div class='hunk'>@@ -33,7 +33,29 @@ SECTIONS</div><div class='ctx'> 		*(.data.*)</div><div class='ctx'> 		_edata = . ;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	* .dma section for code, data, ex_table that need to stay below 2 GB,</div><div class='add'>+	* even when the kernel is relocate: above 2 GB.</div><div class='add'>+	*/</div><div class='add'>+	_sdma = .;</div><div class='add'>+	.dma.text : {</div><div class='add'>+		. = ALIGN(PAGE_SIZE);</div><div class='add'>+		_stext_dma = .;</div><div class='add'>+		*(.dma.text)</div><div class='add'>+		. = ALIGN(PAGE_SIZE);</div><div class='add'>+		_etext_dma = .;</div><div class='add'>+	}</div><div class='add'>+	. = ALIGN(16);</div><div class='add'>+	.dma.ex_table : {</div><div class='add'>+		_start_dma_ex_table = .;</div><div class='add'>+		KEEP(*(.dma.ex_table))</div><div class='add'>+		_stop_dma_ex_table = .;</div><div class='add'>+	}</div><div class='add'>+	.dma.data : { *(.dma.data) }</div><div class='add'>+	_edma = .;</div><div class='add'>+</div><div class='ctx'> 	BOOT_DATA</div><div class='add'>+	BOOT_DATA_PRESERVED</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * uncompressed image info used by the decompressor it should match</div><div class='head'>diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S<br/>index ce2cbbc41742..028aab03a9e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/head.S</a></div><div class='hunk'>@@ -305,7 +305,7 @@ ENTRY(startup_kdump)</div><div class='ctx'> 	xc	0x300(256),0x300</div><div class='ctx'> 	xc	0xe00(256),0xe00</div><div class='ctx'> 	xc	0xf00(256),0xf00</div><div class='del'>-	lctlg	%c0,%c15,0x200(%r0)	# initialize control registers</div><div class='add'>+	lctlg	%c0,%c15,.Lctl-.LPG0(%r13)	# load control registers</div><div class='ctx'> 	stcke	__LC_BOOT_CLOCK</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_CLOCK(8),__LC_BOOT_CLOCK+1</div><div class='ctx'> 	spt	6f-.LPG0(%r13)</div><div class='hunk'>@@ -319,20 +319,54 @@ ENTRY(startup_kdump)</div><div class='ctx'> 	.align	8</div><div class='ctx'> 6:	.long	0x7fffffff,0xffffffff</div><div class='ctx'> </div><div class='add'>+.Lctl:	.quad	0x04040000		# cr0: AFP registers &amp; secondary space</div><div class='add'>+	.quad	0			# cr1: primary space segment table</div><div class='add'>+	.quad	.Lduct			# cr2: dispatchable unit control table</div><div class='add'>+	.quad	0			# cr3: instruction authorization</div><div class='add'>+	.quad	0xffff			# cr4: instruction authorization</div><div class='add'>+	.quad	.Lduct			# cr5: primary-aste origin</div><div class='add'>+	.quad	0			# cr6:	I/O interrupts</div><div class='add'>+	.quad	0			# cr7:	secondary space segment table</div><div class='add'>+	.quad	0			# cr8:	access registers translation</div><div class='add'>+	.quad	0			# cr9:	tracing off</div><div class='add'>+	.quad	0			# cr10: tracing off</div><div class='add'>+	.quad	0			# cr11: tracing off</div><div class='add'>+	.quad	0			# cr12: tracing off</div><div class='add'>+	.quad	0			# cr13: home space segment table</div><div class='add'>+	.quad	0xc0000000		# cr14: machine check handling off</div><div class='add'>+	.quad	.Llinkage_stack		# cr15: linkage stack operations</div><div class='add'>+</div><div class='add'>+	.section .dma.data,"aw",@progbits</div><div class='add'>+.Lduct: .long	0,.Laste,.Laste,0,.Lduald,0,0,0</div><div class='add'>+	.long	0,0,0,0,0,0,0,0</div><div class='add'>+.Llinkage_stack:</div><div class='add'>+	.long	0,0,0x89000000,0,0,0,0x8a000000,0</div><div class='add'>+	.align 64</div><div class='add'>+.Laste:	.quad	0,0xffffffffffffffff,0,0,0,0,0,0</div><div class='add'>+	.align	128</div><div class='add'>+.Lduald:.rept	8</div><div class='add'>+	.long	0x80000000,0,0,0	# invalid access-list entries</div><div class='add'>+	.endr</div><div class='add'>+	.previous</div><div class='add'>+</div><div class='ctx'> #include "head_kdump.S"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # params at 10400 (setup.h)</div><div class='add'>+# Must be keept in sync with struct parmarea in setup.h</div><div class='ctx'> #</div><div class='ctx'> 	.org	PARMAREA</div><div class='del'>-	.long	0,0			# IPL_DEVICE</div><div class='del'>-	.long	0,0			# INITRD_START</div><div class='del'>-	.long	0,0			# INITRD_SIZE</div><div class='del'>-	.long	0,0			# OLDMEM_BASE</div><div class='del'>-	.long	0,0			# OLDMEM_SIZE</div><div class='add'>+	.quad	0			# IPL_DEVICE</div><div class='add'>+	.quad	0			# INITRD_START</div><div class='add'>+	.quad	0			# INITRD_SIZE</div><div class='add'>+	.quad	0			# OLDMEM_BASE</div><div class='add'>+	.quad	0			# OLDMEM_SIZE</div><div class='ctx'> </div><div class='ctx'> 	.org	COMMAND_LINE</div><div class='ctx'> 	.byte	"root=/dev/ram0 ro"</div><div class='ctx'> 	.byte	0</div><div class='ctx'> </div><div class='del'>-	.org	0x11000</div><div class='add'>+	.org	EARLY_SCCB_OFFSET</div><div class='add'>+	.fill	4096</div><div class='add'>+</div><div class='add'>+	.org	HEAD_END</div><div class='head'>diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c<br/>index 36beb56de021..3c49bde8aa5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/ipl_parm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/ipl_parm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/ipl_parm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/ipl_parm.c</a></div><div class='hunk'>@@ -7,16 +7,19 @@</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/boot_data.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='add'>+#include &lt;asm/uv.h&gt;</div><div class='ctx'> #include "boot.h"</div><div class='ctx'> </div><div class='ctx'> char __bootdata(early_command_line)[COMMAND_LINE_SIZE];</div><div class='del'>-struct ipl_parameter_block __bootdata(early_ipl_block);</div><div class='del'>-int __bootdata(early_ipl_block_valid);</div><div class='add'>+struct ipl_parameter_block __bootdata_preserved(ipl_block);</div><div class='add'>+int __bootdata_preserved(ipl_block_valid);</div><div class='ctx'> </div><div class='ctx'> unsigned long __bootdata(memory_end);</div><div class='ctx'> int __bootdata(memory_end_set);</div><div class='ctx'> int __bootdata(noexec_disabled);</div><div class='ctx'> </div><div class='add'>+int kaslr_enabled __section(.data);</div><div class='add'>+</div><div class='ctx'> static inline int __diag308(unsigned long subcode, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	register unsigned long _addr asm("0") = (unsigned long)addr;</div><div class='hunk'>@@ -45,13 +48,15 @@ void store_ipl_parmblock(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = __diag308(DIAG308_STORE, &amp;early_ipl_block);</div><div class='add'>+	uv_set_shared(__pa(&amp;ipl_block));</div><div class='add'>+	rc = __diag308(DIAG308_STORE, &amp;ipl_block);</div><div class='add'>+	uv_remove_shared(__pa(&amp;ipl_block));</div><div class='ctx'> 	if (rc == DIAG308_RC_OK &amp;&amp;</div><div class='del'>-	    early_ipl_block.hdr.version &lt;= IPL_MAX_SUPPORTED_VERSION)</div><div class='del'>-		early_ipl_block_valid = 1;</div><div class='add'>+	    ipl_block.hdr.version &lt;= IPL_MAX_SUPPORTED_VERSION)</div><div class='add'>+		ipl_block_valid = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t scpdata_length(const char *buf, size_t count)</div><div class='add'>+static size_t scpdata_length(const u8 *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		if (buf[count - 1] != '\0' &amp;&amp; buf[count - 1] != ' ')</div><div class='hunk'>@@ -68,26 +73,26 @@ static size_t ipl_block_get_ascii_scpdata(char *dest, size_t size,</div><div class='ctx'> 	size_t i;</div><div class='ctx'> 	int has_lowercase;</div><div class='ctx'> </div><div class='del'>-	count = min(size - 1, scpdata_length(ipb-&gt;ipl_info.fcp.scp_data,</div><div class='del'>-					     ipb-&gt;ipl_info.fcp.scp_data_len));</div><div class='add'>+	count = min(size - 1, scpdata_length(ipb-&gt;fcp.scp_data,</div><div class='add'>+					     ipb-&gt;fcp.scp_data_len));</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	has_lowercase = 0;</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		if (!isascii(ipb-&gt;ipl_info.fcp.scp_data[i])) {</div><div class='add'>+		if (!isascii(ipb-&gt;fcp.scp_data[i])) {</div><div class='ctx'> 			count = 0;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (!has_lowercase &amp;&amp; islower(ipb-&gt;ipl_info.fcp.scp_data[i]))</div><div class='add'>+		if (!has_lowercase &amp;&amp; islower(ipb-&gt;fcp.scp_data[i]))</div><div class='ctx'> 			has_lowercase = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (has_lowercase)</div><div class='del'>-		memcpy(dest, ipb-&gt;ipl_info.fcp.scp_data, count);</div><div class='add'>+		memcpy(dest, ipb-&gt;fcp.scp_data, count);</div><div class='ctx'> 	else</div><div class='ctx'> 		for (i = 0; i &lt; count; i++)</div><div class='del'>-			dest[i] = tolower(ipb-&gt;ipl_info.fcp.scp_data[i]);</div><div class='add'>+			dest[i] = tolower(ipb-&gt;fcp.scp_data[i]);</div><div class='ctx'> out:</div><div class='ctx'> 	dest[count] = '\0';</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -103,14 +108,14 @@ static void append_ipl_block_parm(void)</div><div class='ctx'> 	delim = early_command_line + len;    /* '\0' character position */</div><div class='ctx'> 	parm = early_command_line + len + 1; /* append right after '\0' */</div><div class='ctx'> </div><div class='del'>-	switch (early_ipl_block.hdr.pbt) {</div><div class='del'>-	case DIAG308_IPL_TYPE_CCW:</div><div class='add'>+	switch (ipl_block.pb0_hdr.pbt) {</div><div class='add'>+	case IPL_PBT_CCW:</div><div class='ctx'> 		rc = ipl_block_get_ascii_vmparm(</div><div class='del'>-			parm, COMMAND_LINE_SIZE - len - 1, &amp;early_ipl_block);</div><div class='add'>+			parm, COMMAND_LINE_SIZE - len - 1, &amp;ipl_block);</div><div class='ctx'> 		break;</div><div class='del'>-	case DIAG308_IPL_TYPE_FCP:</div><div class='add'>+	case IPL_PBT_FCP:</div><div class='ctx'> 		rc = ipl_block_get_ascii_scpdata(</div><div class='del'>-			parm, COMMAND_LINE_SIZE - len - 1, &amp;early_ipl_block);</div><div class='add'>+			parm, COMMAND_LINE_SIZE - len - 1, &amp;ipl_block);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -141,7 +146,7 @@ void setup_boot_command_line(void)</div><div class='ctx'> 	strcpy(early_command_line, strim(COMMAND_LINE));</div><div class='ctx'> </div><div class='ctx'> 	/* append IPL PARM data to the boot command line */</div><div class='del'>-	if (early_ipl_block_valid)</div><div class='add'>+	if (!is_prot_virt_guest() &amp;&amp; ipl_block_valid)</div><div class='ctx'> 		append_ipl_block_parm();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -211,6 +216,7 @@ void parse_boot_command_line(void)</div><div class='ctx'> 	char *args;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	kaslr_enabled = IS_ENABLED(CONFIG_RANDOMIZE_BASE);</div><div class='ctx'> 	args = strcpy(command_line_buf, early_command_line);</div><div class='ctx'> 	while (*args) {</div><div class='ctx'> 		args = next_arg(args, &amp;param, &amp;val);</div><div class='hunk'>@@ -228,15 +234,21 @@ void parse_boot_command_line(void)</div><div class='ctx'> </div><div class='ctx'> 		if (!strcmp(param, "facilities"))</div><div class='ctx'> 			modify_fac_list(val);</div><div class='add'>+</div><div class='add'>+		if (!strcmp(param, "nokaslr"))</div><div class='add'>+			kaslr_enabled = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void setup_memory_end(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CRASH_DUMP</div><div class='del'>-	if (!OLDMEM_BASE &amp;&amp; early_ipl_block_valid &amp;&amp;</div><div class='del'>-	    early_ipl_block.hdr.pbt == DIAG308_IPL_TYPE_FCP &amp;&amp;</div><div class='del'>-	    early_ipl_block.ipl_info.fcp.opt == DIAG308_IPL_OPT_DUMP) {</div><div class='add'>+	if (OLDMEM_BASE) {</div><div class='add'>+		kaslr_enabled = 0;</div><div class='add'>+	} else if (ipl_block_valid &amp;&amp;</div><div class='add'>+		   ipl_block.pb0_hdr.pbt == IPL_PBT_FCP &amp;&amp;</div><div class='add'>+		   ipl_block.fcp.opt == IPL_PB0_FCP_OPT_DUMP) {</div><div class='add'>+		kaslr_enabled = 0;</div><div class='ctx'> 		if (!sclp_early_get_hsa_size(&amp;memory_end) &amp;&amp; memory_end)</div><div class='ctx'> 			memory_end_set = 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/s390/boot/ipl_report.c b/arch/s390/boot/ipl_report.c<br/>new file mode 100644<br/>index 000000000000..0b4965573656<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/ipl_report.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/ipl_report.c</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;asm/ebcdic.h&gt;</div><div class='add'>+#include &lt;asm/sclp.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/boot_data.h&gt;</div><div class='add'>+#include &lt;uapi/asm/ipl.h&gt;</div><div class='add'>+#include "boot.h"</div><div class='add'>+</div><div class='add'>+int __bootdata_preserved(ipl_secure_flag);</div><div class='add'>+</div><div class='add'>+unsigned long __bootdata_preserved(ipl_cert_list_addr);</div><div class='add'>+unsigned long __bootdata_preserved(ipl_cert_list_size);</div><div class='add'>+</div><div class='add'>+unsigned long __bootdata(early_ipl_comp_list_addr);</div><div class='add'>+unsigned long __bootdata(early_ipl_comp_list_size);</div><div class='add'>+</div><div class='add'>+#define for_each_rb_entry(entry, rb) \</div><div class='add'>+	for (entry = rb-&gt;entries; \</div><div class='add'>+	     (void *) entry + sizeof(*entry) &lt;= (void *) rb + rb-&gt;len; \</div><div class='add'>+	     entry++)</div><div class='add'>+</div><div class='add'>+static inline bool intersects(unsigned long addr0, unsigned long size0,</div><div class='add'>+			      unsigned long addr1, unsigned long size1)</div><div class='add'>+{</div><div class='add'>+	return addr0 + size0 &gt; addr1 &amp;&amp; addr1 + size1 &gt; addr0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long find_bootdata_space(struct ipl_rb_components *comps,</div><div class='add'>+					 struct ipl_rb_certificates *certs,</div><div class='add'>+					 unsigned long safe_addr)</div><div class='add'>+{</div><div class='add'>+	struct ipl_rb_certificate_entry *cert;</div><div class='add'>+	struct ipl_rb_component_entry *comp;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find the length for the IPL report boot data</div><div class='add'>+	 */</div><div class='add'>+	early_ipl_comp_list_size = 0;</div><div class='add'>+	for_each_rb_entry(comp, comps)</div><div class='add'>+		early_ipl_comp_list_size += sizeof(*comp);</div><div class='add'>+	ipl_cert_list_size = 0;</div><div class='add'>+	for_each_rb_entry(cert, certs)</div><div class='add'>+		ipl_cert_list_size += sizeof(unsigned int) + cert-&gt;len;</div><div class='add'>+	size = ipl_cert_list_size + early_ipl_comp_list_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start from safe_addr to find a free memory area large</div><div class='add'>+	 * enough for the IPL report boot data. This area is used</div><div class='add'>+	 * for ipl_cert_list_addr/ipl_cert_list_size and</div><div class='add'>+	 * early_ipl_comp_list_addr/early_ipl_comp_list_size. It must</div><div class='add'>+	 * not overlap with any component or any certificate.</div><div class='add'>+	 */</div><div class='add'>+repeat:</div><div class='add'>+	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) &amp;&amp; INITRD_START &amp;&amp; INITRD_SIZE &amp;&amp;</div><div class='add'>+	    intersects(INITRD_START, INITRD_SIZE, safe_addr, size))</div><div class='add'>+		safe_addr = INITRD_START + INITRD_SIZE;</div><div class='add'>+	for_each_rb_entry(comp, comps)</div><div class='add'>+		if (intersects(safe_addr, size, comp-&gt;addr, comp-&gt;len)) {</div><div class='add'>+			safe_addr = comp-&gt;addr + comp-&gt;len;</div><div class='add'>+			goto repeat;</div><div class='add'>+		}</div><div class='add'>+	for_each_rb_entry(cert, certs)</div><div class='add'>+		if (intersects(safe_addr, size, cert-&gt;addr, cert-&gt;len)) {</div><div class='add'>+			safe_addr = cert-&gt;addr + cert-&gt;len;</div><div class='add'>+			goto repeat;</div><div class='add'>+		}</div><div class='add'>+	early_ipl_comp_list_addr = safe_addr;</div><div class='add'>+	ipl_cert_list_addr = safe_addr + early_ipl_comp_list_size;</div><div class='add'>+</div><div class='add'>+	return safe_addr + size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void copy_components_bootdata(struct ipl_rb_components *comps)</div><div class='add'>+{</div><div class='add'>+	struct ipl_rb_component_entry *comp, *ptr;</div><div class='add'>+</div><div class='add'>+	ptr = (struct ipl_rb_component_entry *) early_ipl_comp_list_addr;</div><div class='add'>+	for_each_rb_entry(comp, comps)</div><div class='add'>+		memcpy(ptr++, comp, sizeof(*ptr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void copy_certificates_bootdata(struct ipl_rb_certificates *certs)</div><div class='add'>+{</div><div class='add'>+	struct ipl_rb_certificate_entry *cert;</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	ptr = (void *) ipl_cert_list_addr;</div><div class='add'>+	for_each_rb_entry(cert, certs) {</div><div class='add'>+		*(unsigned int *) ptr = cert-&gt;len;</div><div class='add'>+		ptr += sizeof(unsigned int);</div><div class='add'>+		memcpy(ptr, (void *) cert-&gt;addr, cert-&gt;len);</div><div class='add'>+		ptr += cert-&gt;len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long read_ipl_report(unsigned long safe_addr)</div><div class='add'>+{</div><div class='add'>+	struct ipl_rb_certificates *certs;</div><div class='add'>+	struct ipl_rb_components *comps;</div><div class='add'>+	struct ipl_pl_hdr *pl_hdr;</div><div class='add'>+	struct ipl_rl_hdr *rl_hdr;</div><div class='add'>+	struct ipl_rb_hdr *rb_hdr;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	void *rl_end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if there is a IPL report by looking at the copy</div><div class='add'>+	 * of the IPL parameter information block.</div><div class='add'>+	 */</div><div class='add'>+	if (!ipl_block_valid ||</div><div class='add'>+	    !(ipl_block.hdr.flags &amp; IPL_PL_FLAG_IPLSR))</div><div class='add'>+		return safe_addr;</div><div class='add'>+	ipl_secure_flag = !!(ipl_block.hdr.flags &amp; IPL_PL_FLAG_SIPL);</div><div class='add'>+	/*</div><div class='add'>+	 * There is an IPL report, to find it load the pointer to the</div><div class='add'>+	 * IPL parameter information block from lowcore and skip past</div><div class='add'>+	 * the IPL parameter list, then align the address to a double</div><div class='add'>+	 * word boundary.</div><div class='add'>+	 */</div><div class='add'>+	tmp = (unsigned long) S390_lowcore.ipl_parmblock_ptr;</div><div class='add'>+	pl_hdr = (struct ipl_pl_hdr *) tmp;</div><div class='add'>+	tmp = (tmp + pl_hdr-&gt;len + 7) &amp; -8UL;</div><div class='add'>+	rl_hdr = (struct ipl_rl_hdr *) tmp;</div><div class='add'>+	/* Walk through the IPL report blocks in the IPL Report list */</div><div class='add'>+	certs = NULL;</div><div class='add'>+	comps = NULL;</div><div class='add'>+	rl_end = (void *) rl_hdr + rl_hdr-&gt;len;</div><div class='add'>+	rb_hdr = (void *) rl_hdr + sizeof(*rl_hdr);</div><div class='add'>+	while ((void *) rb_hdr + sizeof(*rb_hdr) &lt; rl_end &amp;&amp;</div><div class='add'>+	       (void *) rb_hdr + rb_hdr-&gt;len &lt;= rl_end) {</div><div class='add'>+</div><div class='add'>+		switch (rb_hdr-&gt;rbt) {</div><div class='add'>+		case IPL_RBT_CERTIFICATES:</div><div class='add'>+			certs = (struct ipl_rb_certificates *) rb_hdr;</div><div class='add'>+			break;</div><div class='add'>+		case IPL_RBT_COMPONENTS:</div><div class='add'>+			comps = (struct ipl_rb_components *) rb_hdr;</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'>+		rb_hdr = (void *) rb_hdr + rb_hdr-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * With either the component list or the certificate list</div><div class='add'>+	 * missing the kernel will stay ignorant of secure IPL.</div><div class='add'>+	 */</div><div class='add'>+	if (!comps || !certs)</div><div class='add'>+		return safe_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Copy component and certificate list to a safe area</div><div class='add'>+	 * where the decompressed kernel can find them.</div><div class='add'>+	 */</div><div class='add'>+	safe_addr = find_bootdata_space(comps, certs, safe_addr);</div><div class='add'>+	copy_components_bootdata(comps);</div><div class='add'>+	copy_certificates_bootdata(certs);</div><div class='add'>+</div><div class='add'>+	return safe_addr;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/boot/kaslr.c b/arch/s390/boot/kaslr.c<br/>new file mode 100644<br/>index 000000000000..3bdd8132e56b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/kaslr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/kaslr.c</a></div><div class='hunk'>@@ -0,0 +1,144 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright IBM Corp. 2019</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm/mem_detect.h&gt;</div><div class='add'>+#include &lt;asm/cpacf.h&gt;</div><div class='add'>+#include &lt;asm/timex.h&gt;</div><div class='add'>+#include &lt;asm/sclp.h&gt;</div><div class='add'>+#include "compressed/decompressor.h"</div><div class='add'>+</div><div class='add'>+#define PRNG_MODE_TDES	 1</div><div class='add'>+#define PRNG_MODE_SHA512 2</div><div class='add'>+#define PRNG_MODE_TRNG	 3</div><div class='add'>+</div><div class='add'>+struct prno_parm {</div><div class='add'>+	u32 res;</div><div class='add'>+	u32 reseed_counter;</div><div class='add'>+	u64 stream_bytes;</div><div class='add'>+	u8  V[112];</div><div class='add'>+	u8  C[112];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct prng_parm {</div><div class='add'>+	u8  parm_block[32];</div><div class='add'>+	u32 reseed_counter;</div><div class='add'>+	u64 byte_counter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int check_prng(void)</div><div class='add'>+{</div><div class='add'>+	if (!cpacf_query_func(CPACF_KMC, CPACF_KMC_PRNG)) {</div><div class='add'>+		sclp_early_printk("KASLR disabled: CPU has no PRNG\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (cpacf_query_func(CPACF_PRNO, CPACF_PRNO_TRNG))</div><div class='add'>+		return PRNG_MODE_TRNG;</div><div class='add'>+	if (cpacf_query_func(CPACF_PRNO, CPACF_PRNO_SHA512_DRNG_GEN))</div><div class='add'>+		return PRNG_MODE_SHA512;</div><div class='add'>+	else</div><div class='add'>+		return PRNG_MODE_TDES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long get_random(unsigned long limit)</div><div class='add'>+{</div><div class='add'>+	struct prng_parm prng = {</div><div class='add'>+		/* initial parameter block for tdes mode, copied from libica */</div><div class='add'>+		.parm_block = {</div><div class='add'>+			0x0F, 0x2B, 0x8E, 0x63, 0x8C, 0x8E, 0xD2, 0x52,</div><div class='add'>+			0x64, 0xB7, 0xA0, 0x7B, 0x75, 0x28, 0xB8, 0xF4,</div><div class='add'>+			0x75, 0x5F, 0xD2, 0xA6, 0x8D, 0x97, 0x11, 0xFF,</div><div class='add'>+			0x49, 0xD8, 0x23, 0xF3, 0x7E, 0x21, 0xEC, 0xA0</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	unsigned long seed, random;</div><div class='add'>+	struct prno_parm prno;</div><div class='add'>+	__u64 entropy[4];</div><div class='add'>+	int mode, i;</div><div class='add'>+</div><div class='add'>+	mode = check_prng();</div><div class='add'>+	seed = get_tod_clock_fast();</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case PRNG_MODE_TRNG:</div><div class='add'>+		cpacf_trng(NULL, 0, (u8 *) &amp;random, sizeof(random));</div><div class='add'>+		break;</div><div class='add'>+	case PRNG_MODE_SHA512:</div><div class='add'>+		cpacf_prno(CPACF_PRNO_SHA512_DRNG_SEED, &amp;prno, NULL, 0,</div><div class='add'>+			   (u8 *) &amp;seed, sizeof(seed));</div><div class='add'>+		cpacf_prno(CPACF_PRNO_SHA512_DRNG_GEN, &amp;prno, (u8 *) &amp;random,</div><div class='add'>+			   sizeof(random), NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case PRNG_MODE_TDES:</div><div class='add'>+		/* add entropy */</div><div class='add'>+		*(unsigned long *) prng.parm_block ^= seed;</div><div class='add'>+		for (i = 0; i &lt; 16; i++) {</div><div class='add'>+			cpacf_kmc(CPACF_KMC_PRNG, prng.parm_block,</div><div class='add'>+				  (char *) entropy, (char *) entropy,</div><div class='add'>+				  sizeof(entropy));</div><div class='add'>+			memcpy(prng.parm_block, entropy, sizeof(entropy));</div><div class='add'>+		}</div><div class='add'>+		random = seed;</div><div class='add'>+		cpacf_kmc(CPACF_KMC_PRNG, prng.parm_block, (u8 *) &amp;random,</div><div class='add'>+			  (u8 *) &amp;random, sizeof(random));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		random = 0;</div><div class='add'>+	}</div><div class='add'>+	return random % limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long get_random_base(unsigned long safe_addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long base, start, end, kernel_size;</div><div class='add'>+	unsigned long block_sum, offset;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) &amp;&amp; INITRD_START &amp;&amp; INITRD_SIZE) {</div><div class='add'>+		if (safe_addr &lt; INITRD_START + INITRD_SIZE)</div><div class='add'>+			safe_addr = INITRD_START + INITRD_SIZE;</div><div class='add'>+	}</div><div class='add'>+	safe_addr = ALIGN(safe_addr, THREAD_SIZE);</div><div class='add'>+</div><div class='add'>+	kernel_size = vmlinux.image_size + vmlinux.bss_size;</div><div class='add'>+	block_sum = 0;</div><div class='add'>+	for_each_mem_detect_block(i, &amp;start, &amp;end) {</div><div class='add'>+		if (memory_end_set) {</div><div class='add'>+			if (start &gt;= memory_end)</div><div class='add'>+				break;</div><div class='add'>+			if (end &gt; memory_end)</div><div class='add'>+				end = memory_end;</div><div class='add'>+		}</div><div class='add'>+		if (end - start &lt; kernel_size)</div><div class='add'>+			continue;</div><div class='add'>+		block_sum += end - start - kernel_size;</div><div class='add'>+	}</div><div class='add'>+	if (!block_sum) {</div><div class='add'>+		sclp_early_printk("KASLR disabled: not enough memory\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base = get_random(block_sum);</div><div class='add'>+	if (base == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (base &lt; safe_addr)</div><div class='add'>+		base = safe_addr;</div><div class='add'>+	block_sum = offset = 0;</div><div class='add'>+	for_each_mem_detect_block(i, &amp;start, &amp;end) {</div><div class='add'>+		if (memory_end_set) {</div><div class='add'>+			if (start &gt;= memory_end)</div><div class='add'>+				break;</div><div class='add'>+			if (end &gt; memory_end)</div><div class='add'>+				end = memory_end;</div><div class='add'>+		}</div><div class='add'>+		if (end - start &lt; kernel_size)</div><div class='add'>+			continue;</div><div class='add'>+		block_sum += end - start - kernel_size;</div><div class='add'>+		if (base &lt;= block_sum) {</div><div class='add'>+			base = start + base - offset;</div><div class='add'>+			base = ALIGN_DOWN(base, THREAD_SIZE);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		offset = block_sum;</div><div class='add'>+	}</div><div class='add'>+	return base;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/boot/machine_kexec_reloc.c b/arch/s390/boot/machine_kexec_reloc.c<br/>new file mode 100644<br/>index 000000000000..b7a5d0f72097<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/machine_kexec_reloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/machine_kexec_reloc.c</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include "../kernel/machine_kexec_reloc.c"</div><div class='head'>diff --git a/arch/s390/boot/mem_detect.c b/arch/s390/boot/mem_detect.c<br/>index 4cb771ba13fa..5d316fe40480 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/mem_detect.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/mem_detect.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/mem_detect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/mem_detect.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ static void *mem_detect_alloc_extended(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offset = ALIGN(mem_safe_offset(), sizeof(u64));</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(BLK_DEV_INITRD) &amp;&amp; INITRD_START &amp;&amp; INITRD_SIZE &amp;&amp;</div><div class='add'>+	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) &amp;&amp; INITRD_START &amp;&amp; INITRD_SIZE &amp;&amp;</div><div class='ctx'> 	    INITRD_START &lt; offset + ENTRIES_EXTENDED_MAX)</div><div class='ctx'> 		offset = ALIGN(INITRD_START + INITRD_SIZE, sizeof(u64));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c<br/>index bdfc5549a299..7b0d05414618 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/startup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/boot/startup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/startup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/startup.c</a></div><div class='hunk'>@@ -1,11 +1,55 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/kexec.h&gt;</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='add'>+#include &lt;asm/diag.h&gt;</div><div class='add'>+#include &lt;asm/uv.h&gt;</div><div class='ctx'> #include "compressed/decompressor.h"</div><div class='ctx'> #include "boot.h"</div><div class='ctx'> </div><div class='ctx'> extern char __boot_data_start[], __boot_data_end[];</div><div class='add'>+extern char __boot_data_preserved_start[], __boot_data_preserved_end[];</div><div class='add'>+unsigned long __bootdata_preserved(__kaslr_offset);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some code and data needs to stay below 2 GB, even when the kernel would be</div><div class='add'>+ * relocated above 2 GB, because it has to use 31 bit addresses.</div><div class='add'>+ * Such code and data is part of the .dma section, and its location is passed</div><div class='add'>+ * over to the decompressed / relocated kernel via the .boot.preserved.data</div><div class='add'>+ * section.</div><div class='add'>+ */</div><div class='add'>+extern char _sdma[], _edma[];</div><div class='add'>+extern char _stext_dma[], _etext_dma[];</div><div class='add'>+extern struct exception_table_entry _start_dma_ex_table[];</div><div class='add'>+extern struct exception_table_entry _stop_dma_ex_table[];</div><div class='add'>+unsigned long __bootdata_preserved(__sdma) = __pa(&amp;_sdma);</div><div class='add'>+unsigned long __bootdata_preserved(__edma) = __pa(&amp;_edma);</div><div class='add'>+unsigned long __bootdata_preserved(__stext_dma) = __pa(&amp;_stext_dma);</div><div class='add'>+unsigned long __bootdata_preserved(__etext_dma) = __pa(&amp;_etext_dma);</div><div class='add'>+struct exception_table_entry *</div><div class='add'>+	__bootdata_preserved(__start_dma_ex_table) = _start_dma_ex_table;</div><div class='add'>+struct exception_table_entry *</div><div class='add'>+	__bootdata_preserved(__stop_dma_ex_table) = _stop_dma_ex_table;</div><div class='add'>+</div><div class='add'>+int _diag210_dma(struct diag210 *addr);</div><div class='add'>+int _diag26c_dma(void *req, void *resp, enum diag26c_sc subcode);</div><div class='add'>+int _diag14_dma(unsigned long rx, unsigned long ry1, unsigned long subcode);</div><div class='add'>+void _diag0c_dma(struct hypfs_diag0c_entry *entry);</div><div class='add'>+void _diag308_reset_dma(void);</div><div class='add'>+struct diag_ops __bootdata_preserved(diag_dma_ops) = {</div><div class='add'>+	.diag210 = _diag210_dma,</div><div class='add'>+	.diag26c = _diag26c_dma,</div><div class='add'>+	.diag14 = _diag14_dma,</div><div class='add'>+	.diag0c = _diag0c_dma,</div><div class='add'>+	.diag308_reset = _diag308_reset_dma</div><div class='add'>+};</div><div class='add'>+static struct diag210 _diag210_tmp_dma __section(".dma.data");</div><div class='add'>+struct diag210 *__bootdata_preserved(__diag210_tmp_dma) = &amp;_diag210_tmp_dma;</div><div class='add'>+void _swsusp_reset_dma(void);</div><div class='add'>+unsigned long __bootdata_preserved(__swsusp_reset_dma) = __pa(_swsusp_reset_dma);</div><div class='ctx'> </div><div class='ctx'> void error(char *x)</div><div class='ctx'> {</div><div class='hunk'>@@ -13,7 +57,7 @@ void error(char *x)</div><div class='ctx'> 	sclp_early_printk(x);</div><div class='ctx'> 	sclp_early_printk("\n\n -- System halted");</div><div class='ctx'> </div><div class='del'>-	disabled_wait(0xdeadbeef);</div><div class='add'>+	disabled_wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KERNEL_UNCOMPRESSED</div><div class='hunk'>@@ -23,19 +67,16 @@ unsigned long mem_safe_offset(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void rescue_initrd(void)</div><div class='add'>+static void rescue_initrd(unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long min_initrd_addr;</div><div class='del'>-</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_BLK_DEV_INITRD))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!INITRD_START || !INITRD_SIZE)</div><div class='ctx'> 		return;</div><div class='del'>-	min_initrd_addr = mem_safe_offset();</div><div class='del'>-	if (min_initrd_addr &lt;= INITRD_START)</div><div class='add'>+	if (addr &lt;= INITRD_START)</div><div class='ctx'> 		return;</div><div class='del'>-	memmove((void *)min_initrd_addr, (void *)INITRD_START, INITRD_SIZE);</div><div class='del'>-	INITRD_START = min_initrd_addr;</div><div class='add'>+	memmove((void *)addr, (void *)INITRD_START, INITRD_SIZE);</div><div class='add'>+	INITRD_START = addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void copy_bootdata(void)</div><div class='hunk'>@@ -43,23 +84,81 @@ static void copy_bootdata(void)</div><div class='ctx'> 	if (__boot_data_end - __boot_data_start != vmlinux.bootdata_size)</div><div class='ctx'> 		error(".boot.data section size mismatch");</div><div class='ctx'> 	memcpy((void *)vmlinux.bootdata_off, __boot_data_start, vmlinux.bootdata_size);</div><div class='add'>+	if (__boot_data_preserved_end - __boot_data_preserved_start != vmlinux.bootdata_preserved_size)</div><div class='add'>+		error(".boot.preserved.data section size mismatch");</div><div class='add'>+	memcpy((void *)vmlinux.bootdata_preserved_off, __boot_data_preserved_start, vmlinux.bootdata_preserved_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_relocs(unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	Elf64_Rela *rela_start, *rela_end, *rela;</div><div class='add'>+	int r_type, r_sym, rc;</div><div class='add'>+	Elf64_Addr loc, val;</div><div class='add'>+	Elf64_Sym *dynsym;</div><div class='add'>+</div><div class='add'>+	rela_start = (Elf64_Rela *) vmlinux.rela_dyn_start;</div><div class='add'>+	rela_end = (Elf64_Rela *) vmlinux.rela_dyn_end;</div><div class='add'>+	dynsym = (Elf64_Sym *) vmlinux.dynsym_start;</div><div class='add'>+	for (rela = rela_start; rela &lt; rela_end; rela++) {</div><div class='add'>+		loc = rela-&gt;r_offset + offset;</div><div class='add'>+		val = rela-&gt;r_addend + offset;</div><div class='add'>+		r_sym = ELF64_R_SYM(rela-&gt;r_info);</div><div class='add'>+		if (r_sym)</div><div class='add'>+			val += dynsym[r_sym].st_value;</div><div class='add'>+		r_type = ELF64_R_TYPE(rela-&gt;r_info);</div><div class='add'>+		rc = arch_kexec_do_relocs(r_type, (void *) loc, val, 0);</div><div class='add'>+		if (rc)</div><div class='add'>+			error("Unknown relocation type");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void startup_kernel(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long random_lma;</div><div class='add'>+	unsigned long safe_addr;</div><div class='ctx'> 	void *img;</div><div class='ctx'> </div><div class='del'>-	rescue_initrd();</div><div class='del'>-	sclp_early_read_info();</div><div class='ctx'> 	store_ipl_parmblock();</div><div class='add'>+	safe_addr = mem_safe_offset();</div><div class='add'>+	safe_addr = read_ipl_report(safe_addr);</div><div class='add'>+	uv_query_info();</div><div class='add'>+	rescue_initrd(safe_addr);</div><div class='add'>+	sclp_early_read_info();</div><div class='ctx'> 	setup_boot_command_line();</div><div class='ctx'> 	parse_boot_command_line();</div><div class='ctx'> 	setup_memory_end();</div><div class='ctx'> 	detect_memory();</div><div class='add'>+</div><div class='add'>+	random_lma = __kaslr_offset = 0;</div><div class='add'>+	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) &amp;&amp; kaslr_enabled) {</div><div class='add'>+		random_lma = get_random_base(safe_addr);</div><div class='add'>+		if (random_lma) {</div><div class='add'>+			__kaslr_offset = random_lma - vmlinux.default_lma;</div><div class='add'>+			img = (void *)vmlinux.default_lma;</div><div class='add'>+			vmlinux.default_lma += __kaslr_offset;</div><div class='add'>+			vmlinux.entry += __kaslr_offset;</div><div class='add'>+			vmlinux.bootdata_off += __kaslr_offset;</div><div class='add'>+			vmlinux.bootdata_preserved_off += __kaslr_offset;</div><div class='add'>+			vmlinux.rela_dyn_start += __kaslr_offset;</div><div class='add'>+			vmlinux.rela_dyn_end += __kaslr_offset;</div><div class='add'>+			vmlinux.dynsym_start += __kaslr_offset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_KERNEL_UNCOMPRESSED)) {</div><div class='ctx'> 		img = decompress_kernel();</div><div class='ctx'> 		memmove((void *)vmlinux.default_lma, img, vmlinux.image_size);</div><div class='del'>-	}</div><div class='add'>+	} else if (__kaslr_offset)</div><div class='add'>+		memcpy((void *)vmlinux.default_lma, img, vmlinux.image_size);</div><div class='add'>+</div><div class='ctx'> 	copy_bootdata();</div><div class='add'>+	if (IS_ENABLED(CONFIG_RELOCATABLE))</div><div class='add'>+		handle_relocs(__kaslr_offset);</div><div class='add'>+</div><div class='add'>+	if (__kaslr_offset) {</div><div class='add'>+		/* Clear non-relocated kernel */</div><div class='add'>+		if (IS_ENABLED(CONFIG_KERNEL_UNCOMPRESSED))</div><div class='add'>+			memset(img, 0, vmlinux.image_size);</div><div class='add'>+	}</div><div class='ctx'> 	vmlinux.entry();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/boot/text_dma.S b/arch/s390/boot/text_dma.S<br/>new file mode 100644<br/>index 000000000000..9715715c4c28<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/text_dma.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/text_dma.S</a></div><div class='hunk'>@@ -0,0 +1,184 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Code that needs to run below 2 GB.</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 2019</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;asm/sigp.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CC_USING_EXPOLINE</div><div class='add'>+	.pushsection .dma.text.__s390_indirect_jump_r14,"axG"</div><div class='add'>+__dma__s390_indirect_jump_r14:</div><div class='add'>+	larl	%r1,0f</div><div class='add'>+	ex	0,0(%r1)</div><div class='add'>+	j	.</div><div class='add'>+0:	br	%r14</div><div class='add'>+	.popsection</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.section .dma.text,"ax"</div><div class='add'>+/*</div><div class='add'>+ * Simplified version of expoline thunk. The normal thunks can not be used here,</div><div class='add'>+ * because they might be more than 2 GB away, and not reachable by the relative</div><div class='add'>+ * branch. No comdat, exrl, etc. optimizations used here, because it only</div><div class='add'>+ * affects a few functions that are not performance-relevant.</div><div class='add'>+ */</div><div class='add'>+	.macro BR_EX_DMA_r14</div><div class='add'>+#ifdef CC_USING_EXPOLINE</div><div class='add'>+	jg	__dma__s390_indirect_jump_r14</div><div class='add'>+#else</div><div class='add'>+	br	%r14</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * int _diag14_dma(unsigned long rx, unsigned long ry1, unsigned long subcode)</div><div class='add'>+ */</div><div class='add'>+ENTRY(_diag14_dma)</div><div class='add'>+	lgr	%r1,%r2</div><div class='add'>+	lgr	%r2,%r3</div><div class='add'>+	lgr	%r3,%r4</div><div class='add'>+	lhi	%r5,-EIO</div><div class='add'>+	sam31</div><div class='add'>+	diag	%r1,%r2,0x14</div><div class='add'>+.Ldiag14_ex:</div><div class='add'>+	ipm	%r5</div><div class='add'>+	srl	%r5,28</div><div class='add'>+.Ldiag14_fault:</div><div class='add'>+	sam64</div><div class='add'>+	lgfr	%r2,%r5</div><div class='add'>+	BR_EX_DMA_r14</div><div class='add'>+	EX_TABLE_DMA(.Ldiag14_ex, .Ldiag14_fault)</div><div class='add'>+ENDPROC(_diag14_dma)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * int _diag210_dma(struct diag210 *addr)</div><div class='add'>+ */</div><div class='add'>+ENTRY(_diag210_dma)</div><div class='add'>+	lgr	%r1,%r2</div><div class='add'>+	lhi	%r2,-1</div><div class='add'>+	sam31</div><div class='add'>+	diag	%r1,%r0,0x210</div><div class='add'>+.Ldiag210_ex:</div><div class='add'>+	ipm	%r2</div><div class='add'>+	srl	%r2,28</div><div class='add'>+.Ldiag210_fault:</div><div class='add'>+	sam64</div><div class='add'>+	lgfr	%r2,%r2</div><div class='add'>+	BR_EX_DMA_r14</div><div class='add'>+	EX_TABLE_DMA(.Ldiag210_ex, .Ldiag210_fault)</div><div class='add'>+ENDPROC(_diag210_dma)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * int _diag26c_dma(void *req, void *resp, enum diag26c_sc subcode)</div><div class='add'>+ */</div><div class='add'>+ENTRY(_diag26c_dma)</div><div class='add'>+	lghi	%r5,-EOPNOTSUPP</div><div class='add'>+	sam31</div><div class='add'>+	diag	%r2,%r4,0x26c</div><div class='add'>+.Ldiag26c_ex:</div><div class='add'>+	sam64</div><div class='add'>+	lgfr	%r2,%r5</div><div class='add'>+	BR_EX_DMA_r14</div><div class='add'>+	EX_TABLE_DMA(.Ldiag26c_ex, .Ldiag26c_ex)</div><div class='add'>+ENDPROC(_diag26c_dma)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * void _diag0c_dma(struct hypfs_diag0c_entry *entry)</div><div class='add'>+ */</div><div class='add'>+ENTRY(_diag0c_dma)</div><div class='add'>+	sam31</div><div class='add'>+	diag	%r2,%r2,0x0c</div><div class='add'>+	sam64</div><div class='add'>+	BR_EX_DMA_r14</div><div class='add'>+ENDPROC(_diag0c_dma)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * void _swsusp_reset_dma(void)</div><div class='add'>+ */</div><div class='add'>+ENTRY(_swsusp_reset_dma)</div><div class='add'>+	larl	%r1,restart_entry</div><div class='add'>+	larl	%r2,.Lrestart_diag308_psw</div><div class='add'>+	og	%r1,0(%r2)</div><div class='add'>+	stg	%r1,0(%r0)</div><div class='add'>+	lghi	%r0,0</div><div class='add'>+	diag	%r0,%r0,0x308</div><div class='add'>+restart_entry:</div><div class='add'>+	lhi	%r1,1</div><div class='add'>+	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE</div><div class='add'>+	sam64</div><div class='add'>+	BR_EX_DMA_r14</div><div class='add'>+ENDPROC(_swsusp_reset_dma)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * void _diag308_reset_dma(void)</div><div class='add'>+ *</div><div class='add'>+ * Calls diag 308 subcode 1 and continues execution</div><div class='add'>+ */</div><div class='add'>+ENTRY(_diag308_reset_dma)</div><div class='add'>+	larl	%r4,.Lctlregs		# Save control registers</div><div class='add'>+	stctg	%c0,%c15,0(%r4)</div><div class='add'>+	lg	%r2,0(%r4)		# Disable lowcore protection</div><div class='add'>+	nilh	%r2,0xefff</div><div class='add'>+	larl	%r4,.Lctlreg0</div><div class='add'>+	stg	%r2,0(%r4)</div><div class='add'>+	lctlg	%c0,%c0,0(%r4)</div><div class='add'>+	larl	%r4,.Lfpctl		# Floating point control register</div><div class='add'>+	stfpc	0(%r4)</div><div class='add'>+	larl	%r4,.Lprefix		# Save prefix register</div><div class='add'>+	stpx	0(%r4)</div><div class='add'>+	larl	%r4,.Lprefix_zero	# Set prefix register to 0</div><div class='add'>+	spx	0(%r4)</div><div class='add'>+	larl	%r4,.Lcontinue_psw	# Save PSW flags</div><div class='add'>+	epsw	%r2,%r3</div><div class='add'>+	stm	%r2,%r3,0(%r4)</div><div class='add'>+	larl	%r4,restart_part2	# Setup restart PSW at absolute 0</div><div class='add'>+	larl	%r3,.Lrestart_diag308_psw</div><div class='add'>+	og	%r4,0(%r3)		# Save PSW</div><div class='add'>+	lghi	%r3,0</div><div class='add'>+	sturg	%r4,%r3			# Use sturg, because of large pages</div><div class='add'>+	lghi	%r1,1</div><div class='add'>+	lghi	%r0,0</div><div class='add'>+	diag	%r0,%r1,0x308</div><div class='add'>+restart_part2:</div><div class='add'>+	lhi	%r0,0			# Load r0 with zero</div><div class='add'>+	lhi	%r1,2			# Use mode 2 = ESAME (dump)</div><div class='add'>+	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE	# Switch to ESAME mode</div><div class='add'>+	sam64				# Switch to 64 bit addressing mode</div><div class='add'>+	larl	%r4,.Lctlregs		# Restore control registers</div><div class='add'>+	lctlg	%c0,%c15,0(%r4)</div><div class='add'>+	larl	%r4,.Lfpctl		# Restore floating point ctl register</div><div class='add'>+	lfpc	0(%r4)</div><div class='add'>+	larl	%r4,.Lprefix		# Restore prefix register</div><div class='add'>+	spx	0(%r4)</div><div class='add'>+	larl	%r4,.Lcontinue_psw	# Restore PSW flags</div><div class='add'>+	lpswe	0(%r4)</div><div class='add'>+.Lcontinue:</div><div class='add'>+	BR_EX_DMA_r14</div><div class='add'>+ENDPROC(_diag308_reset_dma)</div><div class='add'>+</div><div class='add'>+	.section .dma.data,"aw",@progbits</div><div class='add'>+.align	8</div><div class='add'>+.Lrestart_diag308_psw:</div><div class='add'>+	.long	0x00080000,0x80000000</div><div class='add'>+</div><div class='add'>+.align 8</div><div class='add'>+.Lcontinue_psw:</div><div class='add'>+	.quad	0,.Lcontinue</div><div class='add'>+</div><div class='add'>+.align 8</div><div class='add'>+.Lctlreg0:</div><div class='add'>+	.quad	0</div><div class='add'>+.Lctlregs:</div><div class='add'>+	.rept	16</div><div class='add'>+	.quad	0</div><div class='add'>+	.endr</div><div class='add'>+.Lfpctl:</div><div class='add'>+	.long	0</div><div class='add'>+.Lprefix:</div><div class='add'>+	.long	0</div><div class='add'>+.Lprefix_zero:</div><div class='add'>+	.long	0</div><div class='head'>diff --git a/arch/s390/boot/uv.c b/arch/s390/boot/uv.c<br/>new file mode 100644<br/>index 000000000000..ed007f4a6444<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/boot/uv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/boot/uv.c</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;asm/uv.h&gt;</div><div class='add'>+#include &lt;asm/facility.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+</div><div class='add'>+int __bootdata_preserved(prot_virt_guest);</div><div class='add'>+</div><div class='add'>+void uv_query_info(void)</div><div class='add'>+{</div><div class='add'>+	struct uv_cb_qui uvcb = {</div><div class='add'>+		.header.cmd = UVC_CMD_QUI,</div><div class='add'>+		.header.len = sizeof(uvcb)</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!test_facility(158))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (uv_call(0, (uint64_t)&amp;uvcb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_bit_inv(BIT_UVC_CMD_SET_SHARED_ACCESS, (unsigned long *)uvcb.inst_calls_list) &amp;&amp;</div><div class='add'>+	    test_bit_inv(BIT_UVC_CMD_REMOVE_SHARED_ACCESS, (unsigned long *)uvcb.inst_calls_list))</div><div class='add'>+		prot_virt_guest = 1;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig<br/>index 9824c7bad9d4..b0920b35f87b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/configs/debug_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/configs/debug_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/configs/debug_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/configs/debug_defconfig</a></div><div class='hunk'>@@ -64,6 +64,7 @@ CONFIG_NUMA=y</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_KEXEC_FILE=y</div><div class='add'>+CONFIG_KEXEC_VERIFY_SIG=y</div><div class='ctx'> CONFIG_EXPOLINE=y</div><div class='ctx'> CONFIG_EXPOLINE_AUTO=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='head'>diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig<br/>index 4fcbe5792744..09aa5cb14873 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/configs/performance_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/configs/performance_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/configs/performance_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/configs/performance_defconfig</a></div><div class='hunk'>@@ -65,6 +65,7 @@ CONFIG_NR_CPUS=512</div><div class='ctx'> CONFIG_NUMA=y</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_KEXEC_FILE=y</div><div class='add'>+CONFIG_KEXEC_VERIFY_SIG=y</div><div class='ctx'> CONFIG_EXPOLINE=y</div><div class='ctx'> CONFIG_EXPOLINE_AUTO=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='head'>diff --git a/arch/s390/crypto/crc32be-vx.S b/arch/s390/crypto/crc32be-vx.S<br/>index 2bf01ba44107..0099044e2c86 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/crc32be-vx.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/crc32be-vx.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/crc32be-vx.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/crypto/crc32be-vx.S</a></div><div class='hunk'>@@ -207,5 +207,6 @@ ENTRY(crc32_be_vgfm_16)</div><div class='ctx'> .Ldone:</div><div class='ctx'> 	VLGVF	%r2,%v2,3</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(crc32_be_vgfm_16)</div><div class='ctx'> </div><div class='ctx'> .previous</div><div class='head'>diff --git a/arch/s390/crypto/crc32le-vx.S b/arch/s390/crypto/crc32le-vx.S<br/>index 7d6f568bd3ad..71caf0f4ec08 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/crc32le-vx.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/crc32le-vx.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/crc32le-vx.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/crypto/crc32le-vx.S</a></div><div class='hunk'>@@ -105,13 +105,14 @@</div><div class='ctx'> ENTRY(crc32_le_vgfm_16)</div><div class='ctx'> 	larl	%r5,.Lconstants_CRC_32_LE</div><div class='ctx'> 	j	crc32_le_vgfm_generic</div><div class='add'>+ENDPROC(crc32_le_vgfm_16)</div><div class='ctx'> </div><div class='ctx'> ENTRY(crc32c_le_vgfm_16)</div><div class='ctx'> 	larl	%r5,.Lconstants_CRC_32C_LE</div><div class='ctx'> 	j	crc32_le_vgfm_generic</div><div class='add'>+ENDPROC(crc32c_le_vgfm_16)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-crc32_le_vgfm_generic:</div><div class='add'>+ENTRY(crc32_le_vgfm_generic)</div><div class='ctx'> 	/* Load CRC-32 constants */</div><div class='ctx'> 	VLM	CONST_PERM_LE2BE,CONST_CRC_POLY,0,%r5</div><div class='ctx'> </div><div class='hunk'>@@ -267,5 +268,6 @@ crc32_le_vgfm_generic:</div><div class='ctx'> .Ldone:</div><div class='ctx'> 	VLGVF	%r2,%v2,2</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(crc32_le_vgfm_generic)</div><div class='ctx'> </div><div class='ctx'> .previous</div><div class='head'>diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c<br/>index 0d15383d0ff1..1f9ab24dc048 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/des_s390.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/des_s390.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/des_s390.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/crypto/des_s390.c</a></div><div class='hunk'>@@ -224,24 +224,11 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 		       unsigned int key_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (!(crypto_memneq(key, &amp;key[DES_KEY_SIZE], DES_KEY_SIZE) &amp;&amp;</div><div class='del'>-	    crypto_memneq(&amp;key[DES_KEY_SIZE], &amp;key[DES_KEY_SIZE * 2],</div><div class='del'>-			  DES_KEY_SIZE)) &amp;&amp;</div><div class='del'>-	    (tfm-&gt;crt_flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* in fips mode, ensure k1 != k2 and k2 != k3 and k1 != k3 */</div><div class='del'>-	if (fips_enabled &amp;&amp;</div><div class='del'>-	    !(crypto_memneq(key, &amp;key[DES_KEY_SIZE], DES_KEY_SIZE) &amp;&amp;</div><div class='del'>-	      crypto_memneq(&amp;key[DES_KEY_SIZE], &amp;key[DES_KEY_SIZE * 2],</div><div class='del'>-			    DES_KEY_SIZE) &amp;&amp;</div><div class='del'>-	      crypto_memneq(key, &amp;key[DES_KEY_SIZE * 2], DES_KEY_SIZE))) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = __des3_verify_key(&amp;tfm-&gt;crt_flags, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ctx-&gt;key, key, key_len);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c<br/>index a97a1802cfb4..12cca467af7d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/prng.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/crypto/prng.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/crypto/prng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/crypto/prng.c</a></div><div class='hunk'>@@ -61,6 +61,7 @@ static unsigned int prng_reseed_limit;</div><div class='ctx'> module_param_named(reseed_limit, prng_reseed_limit, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(prng_reseed_limit, "PRNG reseed limit");</div><div class='ctx'> </div><div class='add'>+static bool trng_available;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Any one who considers arithmetical methods of producing random digits is,</div><div class='hunk'>@@ -115,46 +116,68 @@ static const u8 initial_parm_block[32] __initconst = {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * generate_entropy:</div><div class='del'>- * This algorithm produces 64 bytes of entropy data based on 1024</div><div class='del'>- * individual stckf() invocations assuming that each stckf() value</div><div class='del'>- * contributes 0.25 bits of entropy. So the caller gets 256 bit</div><div class='del'>- * entropy per 64 byte or 4 bits entropy per byte.</div><div class='add'>+ * This function fills a given buffer with random bytes. The entropy within</div><div class='add'>+ * the random bytes given back is assumed to have at least 50% - meaning</div><div class='add'>+ * a 64 bytes buffer has at least 64 * 8 / 2 = 256 bits of entropy.</div><div class='add'>+ * Within the function the entropy generation is done in junks of 64 bytes.</div><div class='add'>+ * So the caller should also ask for buffer fill in multiples of 64 bytes.</div><div class='add'>+ * The generation of the entropy is based on the assumption that every stckf()</div><div class='add'>+ * invocation produces 0.5 bits of entropy. To accumulate 256 bits of entropy</div><div class='add'>+ * at least 512 stckf() values are needed. The entropy relevant part of the</div><div class='add'>+ * stckf value is bit 51 (counting starts at the left with bit nr 0) so</div><div class='add'>+ * here we use the lower 4 bytes and exor the values into 2k of bufferspace.</div><div class='add'>+ * To be on the save side, if there is ever a problem with stckf() the</div><div class='add'>+ * other half of the page buffer is filled with bytes from urandom via</div><div class='add'>+ * get_random_bytes(), so this function consumes 2k of urandom for each</div><div class='add'>+ * requested 64 bytes output data. Finally the buffer page is condensed into</div><div class='add'>+ * a 64 byte value by hashing with a SHA512 hash.</div><div class='ctx'>  */</div><div class='ctx'> static int generate_entropy(u8 *ebuf, size_t nbytes)</div><div class='ctx'> {</div><div class='ctx'> 	int n, ret = 0;</div><div class='del'>-	u8 *pg, *h, hash[64];</div><div class='del'>-</div><div class='del'>-	/* allocate 2 pages */</div><div class='del'>-	pg = (u8 *) __get_free_pages(GFP_KERNEL, 1);</div><div class='add'>+	u8 *pg, pblock[80] = {</div><div class='add'>+		/* 8 x 64 bit init values */</div><div class='add'>+		0x6A, 0x09, 0xE6, 0x67, 0xF3, 0xBC, 0xC9, 0x08,</div><div class='add'>+		0xBB, 0x67, 0xAE, 0x85, 0x84, 0xCA, 0xA7, 0x3B,</div><div class='add'>+		0x3C, 0x6E, 0xF3, 0x72, 0xFE, 0x94, 0xF8, 0x2B,</div><div class='add'>+		0xA5, 0x4F, 0xF5, 0x3A, 0x5F, 0x1D, 0x36, 0xF1,</div><div class='add'>+		0x51, 0x0E, 0x52, 0x7F, 0xAD, 0xE6, 0x82, 0xD1,</div><div class='add'>+		0x9B, 0x05, 0x68, 0x8C, 0x2B, 0x3E, 0x6C, 0x1F,</div><div class='add'>+		0x1F, 0x83, 0xD9, 0xAB, 0xFB, 0x41, 0xBD, 0x6B,</div><div class='add'>+		0x5B, 0xE0, 0xCD, 0x19, 0x13, 0x7E, 0x21, 0x79,</div><div class='add'>+		/* 128 bit counter total message bit length */</div><div class='add'>+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 };</div><div class='add'>+</div><div class='add'>+	/* allocate one page stckf buffer */</div><div class='add'>+	pg = (u8 *) __get_free_page(GFP_KERNEL);</div><div class='ctx'> 	if (!pg) {</div><div class='ctx'> 		prng_errorflag = PRNG_GEN_ENTROPY_FAILED;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* fill the ebuf in chunks of 64 byte each */</div><div class='ctx'> 	while (nbytes) {</div><div class='del'>-		/* fill pages with urandom bytes */</div><div class='del'>-		get_random_bytes(pg, 2*PAGE_SIZE);</div><div class='del'>-		/* exor pages with 1024 stckf values */</div><div class='del'>-		for (n = 0; n &lt; 2 * PAGE_SIZE / sizeof(u64); n++) {</div><div class='del'>-			u64 *p = ((u64 *)pg) + n;</div><div class='add'>+		/* fill lower 2k with urandom bytes */</div><div class='add'>+		get_random_bytes(pg, PAGE_SIZE / 2);</div><div class='add'>+		/* exor upper 2k with 512 stckf values, offset 4 bytes each */</div><div class='add'>+		for (n = 0; n &lt; 512; n++) {</div><div class='add'>+			int offset = (PAGE_SIZE / 2) + (n * 4) - 4;</div><div class='add'>+			u64 *p = (u64 *)(pg + offset);</div><div class='ctx'> 			*p ^= get_tod_clock_fast();</div><div class='ctx'> 		}</div><div class='del'>-		n = (nbytes &lt; sizeof(hash)) ? nbytes : sizeof(hash);</div><div class='del'>-		if (n &lt; sizeof(hash))</div><div class='del'>-			h = hash;</div><div class='del'>-		else</div><div class='del'>-			h = ebuf;</div><div class='del'>-		/* hash over the filled pages */</div><div class='del'>-		cpacf_kimd(CPACF_KIMD_SHA_512, h, pg, 2*PAGE_SIZE);</div><div class='del'>-		if (n &lt; sizeof(hash))</div><div class='del'>-			memcpy(ebuf, hash, n);</div><div class='add'>+		/* hash over the filled page */</div><div class='add'>+		cpacf_klmd(CPACF_KLMD_SHA_512, pblock, pg, PAGE_SIZE);</div><div class='add'>+		n = (nbytes &lt; 64) ? nbytes : 64;</div><div class='add'>+		memcpy(ebuf, pblock, n);</div><div class='ctx'> 		ret += n;</div><div class='ctx'> 		ebuf += n;</div><div class='ctx'> 		nbytes -= n;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	free_pages((unsigned long)pg, 1);</div><div class='add'>+	memzero_explicit(pblock, sizeof(pblock));</div><div class='add'>+	memzero_explicit(pg, PAGE_SIZE);</div><div class='add'>+	free_page((unsigned long)pg);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -344,8 +367,8 @@ static int __init prng_sha512_selftest(void)</div><div class='ctx'> </div><div class='ctx'> static int __init prng_sha512_instantiate(void)</div><div class='ctx'> {</div><div class='del'>-	int ret, datalen;</div><div class='del'>-	u8 seed[64 + 32 + 16];</div><div class='add'>+	int ret, datalen, seedlen;</div><div class='add'>+	u8 seed[128 + 16];</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("prng runs in SHA-512 mode "</div><div class='ctx'> 		 "with chunksize=%d and reseed_limit=%u\n",</div><div class='hunk'>@@ -368,16 +391,36 @@ static int __init prng_sha512_instantiate(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto outfree;</div><div class='ctx'> </div><div class='del'>-	/* generate initial seed bytestring, with 256 + 128 bits entropy */</div><div class='del'>-	ret = generate_entropy(seed, 64 + 32);</div><div class='del'>-	if (ret != 64 + 32)</div><div class='del'>-		goto outfree;</div><div class='del'>-	/* followed by 16 bytes of unique nonce */</div><div class='del'>-	get_tod_clock_ext(seed + 64 + 32);</div><div class='add'>+	/* generate initial seed, we need at least  256 + 128 bits entropy. */</div><div class='add'>+	if (trng_available) {</div><div class='add'>+		/*</div><div class='add'>+		 * Trng available, so use it. The trng works in chunks of</div><div class='add'>+		 * 32 bytes and produces 100% entropy. So we pull 64 bytes</div><div class='add'>+		 * which gives us 512 bits entropy.</div><div class='add'>+		 */</div><div class='add'>+		seedlen = 2 * 32;</div><div class='add'>+		cpacf_trng(NULL, 0, seed, seedlen);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * No trng available, so use the generate_entropy() function.</div><div class='add'>+		 * This function works in 64 byte junks and produces</div><div class='add'>+		 * 50% entropy. So we pull 2*64 bytes which gives us 512 bits</div><div class='add'>+		 * of entropy.</div><div class='add'>+		 */</div><div class='add'>+		seedlen = 2 * 64;</div><div class='add'>+		ret = generate_entropy(seed, seedlen);</div><div class='add'>+		if (ret != seedlen)</div><div class='add'>+			goto outfree;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* append the seed by 16 bytes of unique nonce */</div><div class='add'>+	get_tod_clock_ext(seed + seedlen);</div><div class='add'>+	seedlen += 16;</div><div class='ctx'> </div><div class='del'>-	/* initial seed of the prno drng */</div><div class='add'>+	/* now initial seed of the prno drng */</div><div class='ctx'> 	cpacf_prno(CPACF_PRNO_SHA512_DRNG_SEED,</div><div class='del'>-		   &amp;prng_data-&gt;prnows, NULL, 0, seed, sizeof(seed));</div><div class='add'>+		   &amp;prng_data-&gt;prnows, NULL, 0, seed, seedlen);</div><div class='add'>+	memzero_explicit(seed, sizeof(seed));</div><div class='ctx'> </div><div class='ctx'> 	/* if fips mode is enabled, generate a first block of random</div><div class='ctx'> 	   bytes for the FIPS 140-2 Conditional Self Test */</div><div class='hunk'>@@ -405,17 +448,26 @@ static void prng_sha512_deinstantiate(void)</div><div class='ctx'> </div><div class='ctx'> static int prng_sha512_reseed(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, seedlen;</div><div class='ctx'> 	u8 seed[64];</div><div class='ctx'> </div><div class='del'>-	/* fetch 256 bits of fresh entropy */</div><div class='del'>-	ret = generate_entropy(seed, sizeof(seed));</div><div class='del'>-	if (ret != sizeof(seed))</div><div class='del'>-		return ret;</div><div class='add'>+	/* We need at least 256 bits of fresh entropy for reseeding */</div><div class='add'>+	if (trng_available) {</div><div class='add'>+		/* trng produces 256 bits entropy in 32 bytes */</div><div class='add'>+		seedlen = 32;</div><div class='add'>+		cpacf_trng(NULL, 0, seed, seedlen);</div><div class='add'>+	} else {</div><div class='add'>+		/* generate_entropy() produces 256 bits entropy in 64 bytes */</div><div class='add'>+		seedlen = 64;</div><div class='add'>+		ret = generate_entropy(seed, seedlen);</div><div class='add'>+		if (ret != sizeof(seed))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* do a reseed of the prno drng with this bytestring */</div><div class='ctx'> 	cpacf_prno(CPACF_PRNO_SHA512_DRNG_SEED,</div><div class='del'>-		   &amp;prng_data-&gt;prnows, NULL, 0, seed, sizeof(seed));</div><div class='add'>+		   &amp;prng_data-&gt;prnows, NULL, 0, seed, seedlen);</div><div class='add'>+	memzero_explicit(seed, sizeof(seed));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -592,6 +644,7 @@ static ssize_t prng_sha512_read(struct file *file, char __user *ubuf,</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		memzero_explicit(p, n);</div><div class='ctx'> 		ubuf += n;</div><div class='ctx'> 		nbytes -= n;</div><div class='ctx'> 		ret += n;</div><div class='hunk'>@@ -773,6 +826,10 @@ static int __init prng_init(void)</div><div class='ctx'> 	if (!cpacf_query_func(CPACF_KMC, CPACF_KMC_PRNG))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	/* check if TRNG subfunction is available */</div><div class='add'>+	if (cpacf_query_func(CPACF_PRNO, CPACF_PRNO_TRNG))</div><div class='add'>+		trng_available = true;</div><div class='add'>+</div><div class='ctx'> 	/* choose prng mode */</div><div class='ctx'> 	if (prng_mode != PRNG_MODE_TDES) {</div><div class='ctx'> 		/* check for MSA5 support for PRNO operations */</div><div class='head'>diff --git a/arch/s390/defconfig b/arch/s390/defconfig<br/>index 4d58a92b5d97..c59b922cb6c5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/defconfig</a></div><div class='hunk'>@@ -39,6 +39,7 @@ CONFIG_NR_CPUS=256</div><div class='ctx'> CONFIG_NUMA=y</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_KEXEC_FILE=y</div><div class='add'>+CONFIG_KEXEC_VERIFY_SIG=y</div><div class='ctx'> CONFIG_CRASH_DUMP=y</div><div class='ctx'> CONFIG_HIBERNATION=y</div><div class='ctx'> CONFIG_PM_DEBUG=y</div><div class='head'>diff --git a/arch/s390/hypfs/hypfs_diag0c.c b/arch/s390/hypfs/hypfs_diag0c.c<br/>index 72e3140fafb5..3235e4d82f2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/hypfs/hypfs_diag0c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/hypfs/hypfs_diag0c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/hypfs/hypfs_diag0c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/hypfs/hypfs_diag0c.c</a></div><div class='hunk'>@@ -16,26 +16,12 @@</div><div class='ctx'> #define DBFS_D0C_HDR_VERSION 0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Execute diagnose 0c in 31 bit mode</div><div class='del'>- */</div><div class='del'>-static void diag0c(struct hypfs_diag0c_entry *entry)</div><div class='del'>-{</div><div class='del'>-	diag_stat_inc(DIAG_STAT_X00C);</div><div class='del'>-	asm volatile (</div><div class='del'>-		"	sam31\n"</div><div class='del'>-		"	diag	%0,%0,0x0c\n"</div><div class='del'>-		"	sam64\n"</div><div class='del'>-		: /* no output register */</div><div class='del'>-		: "a" (entry)</div><div class='del'>-		: "memory");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Get hypfs_diag0c_entry from CPU vector and store diag0c data</div><div class='ctx'>  */</div><div class='ctx'> static void diag0c_fn(void *data)</div><div class='ctx'> {</div><div class='del'>-	diag0c(((void **) data)[smp_processor_id()]);</div><div class='add'>+	diag_stat_inc(DIAG_STAT_X00C);</div><div class='add'>+	diag_dma_ops.diag0c(((void **) data)[smp_processor_id()]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild<br/>index 12d77cb11fe5..2531f673f099 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/Kbuild</a></div><div class='hunk'>@@ -20,7 +20,7 @@ generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='del'>-generic-y += rwsem.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += unaligned.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='head'>diff --git a/arch/s390/include/asm/airq.h b/arch/s390/include/asm/airq.h<br/>index fcf539efb32f..c10d2ee2dfda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/airq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/airq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/airq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/airq.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> struct airq_struct {</div><div class='ctx'> 	struct hlist_node list;		/* Handler queueing. */</div><div class='del'>-	void (*handler)(struct airq_struct *);	/* Thin-interrupt handler */</div><div class='add'>+	void (*handler)(struct airq_struct *airq, bool floating);</div><div class='ctx'> 	u8 *lsi_ptr;			/* Local-Summary-Indicator pointer */</div><div class='ctx'> 	u8 lsi_mask;			/* Local-Summary-Indicator mask */</div><div class='ctx'> 	u8 isc;				/* Interrupt-subclass */</div><div class='hunk'>@@ -35,13 +35,15 @@ struct airq_iv {</div><div class='ctx'> 	unsigned int *data;	/* 32 bit value associated with each bit */</div><div class='ctx'> 	unsigned long bits;	/* Number of bits in the vector */</div><div class='ctx'> 	unsigned long end;	/* Number of highest allocated bit + 1 */</div><div class='add'>+	unsigned long flags;	/* Allocation flags */</div><div class='ctx'> 	spinlock_t lock;	/* Lock to protect alloc &amp; free */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define AIRQ_IV_ALLOC	1	/* Use an allocation bit mask */</div><div class='del'>-#define AIRQ_IV_BITLOCK	2	/* Allocate the lock bit mask */</div><div class='del'>-#define AIRQ_IV_PTR	4	/* Allocate the ptr array */</div><div class='del'>-#define AIRQ_IV_DATA	8	/* Allocate the data array */</div><div class='add'>+#define AIRQ_IV_ALLOC		1	/* Use an allocation bit mask */</div><div class='add'>+#define AIRQ_IV_BITLOCK		2	/* Allocate the lock bit mask */</div><div class='add'>+#define AIRQ_IV_PTR		4	/* Allocate the ptr array */</div><div class='add'>+#define AIRQ_IV_DATA		8	/* Allocate the data array */</div><div class='add'>+#define AIRQ_IV_CACHELINE	16	/* Cacheline alignment for the vector */</div><div class='ctx'> </div><div class='ctx'> struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags);</div><div class='ctx'> void airq_iv_release(struct airq_iv *iv);</div><div class='head'>diff --git a/arch/s390/include/asm/ap.h b/arch/s390/include/asm/ap.h<br/>index 1a6a7092d942..e94a0a28b5eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/ap.h</a></div><div class='hunk'>@@ -360,4 +360,15 @@ static inline struct ap_queue_status ap_dqap(ap_qid_t qid,</div><div class='ctx'> 	return reg1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Interface to tell the AP bus code that a configuration</div><div class='add'>+ * change has happened. The bus code should at least do</div><div class='add'>+ * an ap bus resource rescan.</div><div class='add'>+ */</div><div class='add'>+#if IS_ENABLED(CONFIG_ZCRYPT)</div><div class='add'>+void ap_bus_cfg_chg(void);</div><div class='add'>+#else</div><div class='add'>+static inline void ap_bus_cfg_chg(void){};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_S390_AP_H_ */</div><div class='head'>diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h<br/>index d1f8a4d94cca..9900d655014c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/bitops.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/bitops.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/bitops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/bitops.h</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	__atomic64_or(mask, addr);</div><div class='add'>+	__atomic64_or(mask, (long *)addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void clear_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='hunk'>@@ -94,7 +94,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mask = ~(1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1)));</div><div class='del'>-	__atomic64_and(mask, addr);</div><div class='add'>+	__atomic64_and(mask, (long *)addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void change_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='hunk'>@@ -115,7 +115,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	__atomic64_xor(mask, addr);</div><div class='add'>+	__atomic64_xor(mask, (long *)addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -125,7 +125,7 @@ test_and_set_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	unsigned long old, mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	old = __atomic64_or_barrier(mask, addr);</div><div class='add'>+	old = __atomic64_or_barrier(mask, (long *)addr);</div><div class='ctx'> 	return (old &amp; mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +136,7 @@ test_and_clear_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	unsigned long old, mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = ~(1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1)));</div><div class='del'>-	old = __atomic64_and_barrier(mask, addr);</div><div class='add'>+	old = __atomic64_and_barrier(mask, (long *)addr);</div><div class='ctx'> 	return (old &amp; ~mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +147,7 @@ test_and_change_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	unsigned long old, mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	old = __atomic64_xor_barrier(mask, addr);</div><div class='add'>+	old = __atomic64_xor_barrier(mask, (long *)addr);</div><div class='ctx'> 	return (old &amp; mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/boot_data.h b/arch/s390/include/asm/boot_data.h<br/>index 2d999ccb977a..f7eed27b3220 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/boot_data.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/boot_data.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/boot_data.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/boot_data.h</a></div><div class='hunk'>@@ -5,7 +5,14 @@</div><div class='ctx'> #include &lt;asm/ipl.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char early_command_line[COMMAND_LINE_SIZE];</div><div class='del'>-extern struct ipl_parameter_block early_ipl_block;</div><div class='del'>-extern int early_ipl_block_valid;</div><div class='add'>+extern struct ipl_parameter_block ipl_block;</div><div class='add'>+extern int ipl_block_valid;</div><div class='add'>+extern int ipl_secure_flag;</div><div class='add'>+</div><div class='add'>+extern unsigned long ipl_cert_list_addr;</div><div class='add'>+extern unsigned long ipl_cert_list_size;</div><div class='add'>+</div><div class='add'>+extern unsigned long early_ipl_comp_list_addr;</div><div class='add'>+extern unsigned long early_ipl_comp_list_size;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_S390_BOOT_DATA_H */</div><div class='head'>diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h<br/>index 429f43a8a8e8..713fc9735ffb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/bug.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/bug.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/bug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/bug.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> 		".section .rodata.str,\"aMS\",@progbits,1\n"	\</div><div class='ctx'> 		"2:	.asciz	\""__FILE__"\"\n"		\</div><div class='ctx'> 		".previous\n"					\</div><div class='del'>-		".section __bug_table,\"aw\"\n"			\</div><div class='add'>+		".section __bug_table,\"awM\",@progbits,%2\n"	\</div><div class='ctx'> 		"3:	.long	1b-3b,2b-3b\n"			\</div><div class='ctx'> 		"	.short	%0,%1\n"			\</div><div class='ctx'> 		"	.org	3b+%2\n"			\</div><div class='hunk'>@@ -27,17 +27,17 @@</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_DEBUG_BUGVERBOSE */</div><div class='ctx'> </div><div class='del'>-#define __EMIT_BUG(x) do {				\</div><div class='del'>-	asm volatile(					\</div><div class='del'>-		"0:	j	0b+2\n"			\</div><div class='del'>-		"1:\n"					\</div><div class='del'>-		".section __bug_table,\"aw\"\n"		\</div><div class='del'>-		"2:	.long	1b-2b\n"		\</div><div class='del'>-		"	.short	%0\n"			\</div><div class='del'>-		"	.org	2b+%1\n"		\</div><div class='del'>-		".previous\n"				\</div><div class='del'>-		: : "i" (x),				\</div><div class='del'>-		    "i" (sizeof(struct bug_entry)));	\</div><div class='add'>+#define __EMIT_BUG(x) do {					\</div><div class='add'>+	asm volatile(						\</div><div class='add'>+		"0:	j	0b+2\n"				\</div><div class='add'>+		"1:\n"						\</div><div class='add'>+		".section __bug_table,\"awM\",@progbits,%1\n"	\</div><div class='add'>+		"2:	.long	1b-2b\n"			\</div><div class='add'>+		"	.short	%0\n"				\</div><div class='add'>+		"	.org	2b+%1\n"			\</div><div class='add'>+		".previous\n"					\</div><div class='add'>+		: : "i" (x),					\</div><div class='add'>+		    "i" (sizeof(struct bug_entry)));		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_DEBUG_BUGVERBOSE */</div><div class='head'>diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h<br/>index 19562be22b7e..0036eab14391 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/diag.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/diag.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/diag.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/diag.h</a></div><div class='hunk'>@@ -308,4 +308,17 @@ union diag318_info {</div><div class='ctx'> int diag204(unsigned long subcode, unsigned long size, void *addr);</div><div class='ctx'> int diag224(void *ptr);</div><div class='ctx'> int diag26c(void *req, void *resp, enum diag26c_sc subcode);</div><div class='add'>+</div><div class='add'>+struct hypfs_diag0c_entry;</div><div class='add'>+</div><div class='add'>+struct diag_ops {</div><div class='add'>+	int (*diag210)(struct diag210 *addr);</div><div class='add'>+	int (*diag26c)(void *req, void *resp, enum diag26c_sc subcode);</div><div class='add'>+	int (*diag14)(unsigned long rx, unsigned long ry1, unsigned long subcode);</div><div class='add'>+	void (*diag0c)(struct hypfs_diag0c_entry *entry);</div><div class='add'>+	void (*diag308_reset)(void);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct diag_ops diag_dma_ops;</div><div class='add'>+extern struct diag210 *__diag210_tmp_dma;</div><div class='ctx'> #endif /* _ASM_S390_DIAG_H */</div><div class='head'>diff --git a/arch/s390/include/asm/ebcdic.h b/arch/s390/include/asm/ebcdic.h<br/>index 29441beb92e6..efb50fc6866c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ebcdic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ebcdic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ebcdic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/ebcdic.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@ extern __u8 _ebc_tolower[256]; /* EBCDIC -&gt; lowercase */</div><div class='ctx'> extern __u8 _ebc_toupper[256]; /* EBCDIC -&gt; uppercase */</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)</div><div class='add'>+codepage_convert(const __u8 *codepage, volatile char *addr, unsigned long nr)</div><div class='ctx'> {</div><div class='ctx'> 	if (nr-- &lt;= 0)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h<br/>index 7d22a474a040..5775fc22f410 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/elf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/elf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/elf.h</a></div><div class='hunk'>@@ -107,6 +107,10 @@</div><div class='ctx'> #define HWCAP_S390_VXRS_BCD	4096</div><div class='ctx'> #define HWCAP_S390_VXRS_EXT	8192</div><div class='ctx'> #define HWCAP_S390_GS		16384</div><div class='add'>+#define HWCAP_S390_VXRS_EXT2	32768</div><div class='add'>+#define HWCAP_S390_VXRS_PDE	65536</div><div class='add'>+#define HWCAP_S390_SORT		131072</div><div class='add'>+#define HWCAP_S390_DFLT		262144</div><div class='ctx'> </div><div class='ctx'> /* Internal bits, not exposed via elf */</div><div class='ctx'> #define HWCAP_INT_SIE		1UL</div><div class='hunk'>@@ -252,11 +256,14 @@ do {								\</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Cache aliasing on the latest machines calls for a mapping granularity</div><div class='del'>- * of 512KB. For 64-bit processes use a 512KB alignment and a randomization</div><div class='del'>- * of up to 1GB. For 31-bit processes the virtual address space is limited,</div><div class='del'>- * use no alignment and limit the randomization to 8MB.</div><div class='add'>+ * of 512KB for the anonymous mapping base. For 64-bit processes use a</div><div class='add'>+ * 512KB alignment and a randomization of up to 1GB. For 31-bit processes</div><div class='add'>+ * the virtual address space is limited, use no alignment and limit the</div><div class='add'>+ * randomization to 8MB.</div><div class='add'>+ * For the additional randomization of the program break use 32MB for</div><div class='add'>+ * 64-bit and 8MB for 31-bit.</div><div class='ctx'>  */</div><div class='del'>-#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ffffUL)</div><div class='add'>+#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x1fffUL)</div><div class='ctx'> #define MMAP_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ff80UL)</div><div class='ctx'> #define MMAP_ALIGN_MASK	(is_compat_task() ? 0 : 0x7fUL)</div><div class='ctx'> #define STACK_RND_MASK	MMAP_RND_MASK</div><div class='head'>diff --git a/arch/s390/include/asm/extable.h b/arch/s390/include/asm/extable.h<br/>index 80a4e5a9cb46..ae27f756b409 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/extable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/extable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/extable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/extable.h</a></div><div class='hunk'>@@ -19,6 +19,11 @@ struct exception_table_entry</div><div class='ctx'> 	int insn, fixup;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern struct exception_table_entry *__start_dma_ex_table;</div><div class='add'>+extern struct exception_table_entry *__stop_dma_ex_table;</div><div class='add'>+</div><div class='add'>+const struct exception_table_entry *s390_search_extables(unsigned long addr);</div><div class='add'>+</div><div class='ctx'> static inline unsigned long extable_fixup(const struct exception_table_entry *x)</div><div class='ctx'> {</div><div class='ctx'> 	return (unsigned long)&amp;x-&gt;fixup + x-&gt;fixup;</div><div class='head'>diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h<br/>index 5a3c95b11952..68d362f8d6c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ftrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ftrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ftrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/ftrace.h</a></div><div class='hunk'>@@ -11,9 +11,16 @@</div><div class='ctx'> #define MCOUNT_RETURN_FIXUP	18</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CC_IS_CLANG</div><div class='add'>+/* https://bugs.llvm.org/show_bug.cgi?id=41424 */</div><div class='add'>+#define ftrace_return_address(n) 0UL</div><div class='add'>+#else</div><div class='ctx'> #define ftrace_return_address(n) __builtin_return_address(n)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void _mcount(void);</div><div class='ctx'> void ftrace_caller(void);</div><div class='head'>diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h<br/>index f34d729347e4..ca421614722f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/io.h</a></div><div class='hunk'>@@ -30,14 +30,8 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);</div><div class='ctx'> #define ioremap_wc			ioremap_nocache</div><div class='ctx'> #define ioremap_wt			ioremap_nocache</div><div class='ctx'> </div><div class='del'>-static inline void __iomem *ioremap(unsigned long offset, unsigned long size)</div><div class='del'>-{</div><div class='del'>-	return (void __iomem *) offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iounmap(volatile void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+void __iomem *ioremap(unsigned long offset, unsigned long size);</div><div class='add'>+void iounmap(volatile void __iomem *addr);</div><div class='ctx'> </div><div class='ctx'> static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -57,14 +51,17 @@ static inline void ioport_unmap(void __iomem *p)</div><div class='ctx'>  * the corresponding device and create the mapping cookie.</div><div class='ctx'>  */</div><div class='ctx'> #define pci_iomap pci_iomap</div><div class='add'>+#define pci_iomap_range pci_iomap_range</div><div class='ctx'> #define pci_iounmap pci_iounmap</div><div class='del'>-#define pci_iomap_wc pci_iomap</div><div class='del'>-#define pci_iomap_wc_range pci_iomap_range</div><div class='add'>+#define pci_iomap_wc pci_iomap_wc</div><div class='add'>+#define pci_iomap_wc_range pci_iomap_wc_range</div><div class='ctx'> </div><div class='ctx'> #define memcpy_fromio(dst, src, count)	zpci_memcpy_fromio(dst, src, count)</div><div class='ctx'> #define memcpy_toio(dst, src, count)	zpci_memcpy_toio(dst, src, count)</div><div class='ctx'> #define memset_io(dst, val, count)	zpci_memset_io(dst, val, count)</div><div class='ctx'> </div><div class='add'>+#define mmiowb()	zpci_barrier()</div><div class='add'>+</div><div class='ctx'> #define __raw_readb	zpci_read_u8</div><div class='ctx'> #define __raw_readw	zpci_read_u16</div><div class='ctx'> #define __raw_readl	zpci_read_u32</div><div class='head'>diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h<br/>index a8389e2d2f03..084e71b7272a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ipl.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/ipl.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/ipl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/ipl.h</a></div><div class='hunk'>@@ -12,74 +12,36 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/cio.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;uapi/asm/ipl.h&gt;</div><div class='ctx'> </div><div class='del'>-#define NSS_NAME_SIZE	8</div><div class='del'>-</div><div class='del'>-#define IPL_PARM_BLK_FCP_LEN (sizeof(struct ipl_list_hdr) + \</div><div class='del'>-			      sizeof(struct ipl_block_fcp))</div><div class='del'>-</div><div class='del'>-#define IPL_PARM_BLK0_FCP_LEN (sizeof(struct ipl_block_fcp) + 16)</div><div class='add'>+struct ipl_parameter_block {</div><div class='add'>+	struct ipl_pl_hdr hdr;</div><div class='add'>+	union {</div><div class='add'>+		struct ipl_pb_hdr pb0_hdr;</div><div class='add'>+		struct ipl_pb0_common common;</div><div class='add'>+		struct ipl_pb0_fcp fcp;</div><div class='add'>+		struct ipl_pb0_ccw ccw;</div><div class='add'>+		char raw[PAGE_SIZE - sizeof(struct ipl_pl_hdr)];</div><div class='add'>+	};</div><div class='add'>+} __packed __aligned(PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-#define IPL_PARM_BLK_CCW_LEN (sizeof(struct ipl_list_hdr) + \</div><div class='del'>-			      sizeof(struct ipl_block_ccw))</div><div class='add'>+#define NSS_NAME_SIZE 8</div><div class='ctx'> </div><div class='del'>-#define IPL_PARM_BLK0_CCW_LEN (sizeof(struct ipl_block_ccw) + 16)</div><div class='add'>+#define IPL_BP_FCP_LEN (sizeof(struct ipl_pl_hdr) + \</div><div class='add'>+			      sizeof(struct ipl_pb0_fcp))</div><div class='add'>+#define IPL_BP0_FCP_LEN (sizeof(struct ipl_pb0_fcp))</div><div class='add'>+#define IPL_BP_CCW_LEN (sizeof(struct ipl_pl_hdr) + \</div><div class='add'>+			      sizeof(struct ipl_pb0_ccw))</div><div class='add'>+#define IPL_BP0_CCW_LEN (sizeof(struct ipl_pb0_ccw))</div><div class='ctx'> </div><div class='ctx'> #define IPL_MAX_SUPPORTED_VERSION (0)</div><div class='ctx'> </div><div class='del'>-struct ipl_list_hdr {</div><div class='del'>-	u32 len;</div><div class='del'>-	u8  reserved1[3];</div><div class='del'>-	u8  version;</div><div class='del'>-	u32 blk0_len;</div><div class='del'>-	u8  pbt;</div><div class='del'>-	u8  flags;</div><div class='del'>-	u16 reserved2;</div><div class='del'>-	u8  loadparm[8];</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-struct ipl_block_fcp {</div><div class='del'>-	u8  reserved1[305-1];</div><div class='del'>-	u8  opt;</div><div class='del'>-	u8  reserved2[3];</div><div class='del'>-	u16 reserved3;</div><div class='del'>-	u16 devno;</div><div class='del'>-	u8  reserved4[4];</div><div class='del'>-	u64 wwpn;</div><div class='del'>-	u64 lun;</div><div class='del'>-	u32 bootprog;</div><div class='del'>-	u8  reserved5[12];</div><div class='del'>-	u64 br_lba;</div><div class='del'>-	u32 scp_data_len;</div><div class='del'>-	u8  reserved6[260];</div><div class='del'>-	u8  scp_data[];</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-#define DIAG308_VMPARM_SIZE	64</div><div class='del'>-#define DIAG308_SCPDATA_SIZE	(PAGE_SIZE - (sizeof(struct ipl_list_hdr) + \</div><div class='del'>-				 offsetof(struct ipl_block_fcp, scp_data)))</div><div class='del'>-</div><div class='del'>-struct ipl_block_ccw {</div><div class='del'>-	u8  reserved1[84];</div><div class='del'>-	u16 reserved2 : 13;</div><div class='del'>-	u8  ssid : 3;</div><div class='del'>-	u16 devno;</div><div class='del'>-	u8  vm_flags;</div><div class='del'>-	u8  reserved3[3];</div><div class='del'>-	u32 vm_parm_len;</div><div class='del'>-	u8  nss_name[8];</div><div class='del'>-	u8  vm_parm[DIAG308_VMPARM_SIZE];</div><div class='del'>-	u8  reserved4[8];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+#define IPL_RB_CERT_UNKNOWN ((unsigned short)-1)</div><div class='ctx'> </div><div class='del'>-struct ipl_parameter_block {</div><div class='del'>-	struct ipl_list_hdr hdr;</div><div class='del'>-	union {</div><div class='del'>-		struct ipl_block_fcp fcp;</div><div class='del'>-		struct ipl_block_ccw ccw;</div><div class='del'>-		char raw[PAGE_SIZE - sizeof(struct ipl_list_hdr)];</div><div class='del'>-	} ipl_info;</div><div class='del'>-} __packed __aligned(PAGE_SIZE);</div><div class='add'>+#define DIAG308_VMPARM_SIZE (64)</div><div class='add'>+#define DIAG308_SCPDATA_OFFSET offsetof(struct ipl_parameter_block, \</div><div class='add'>+					fcp.scp_data)</div><div class='add'>+#define DIAG308_SCPDATA_SIZE (PAGE_SIZE - DIAG308_SCPDATA_OFFSET)</div><div class='ctx'> </div><div class='ctx'> struct save_area;</div><div class='ctx'> struct save_area * __init save_area_alloc(bool is_boot_cpu);</div><div class='hunk'>@@ -88,7 +50,6 @@ void __init save_area_add_regs(struct save_area *, void *regs);</div><div class='ctx'> void __init save_area_add_vxrs(struct save_area *, __vector128 *vxrs);</div><div class='ctx'> </div><div class='ctx'> extern void s390_reset_system(void);</div><div class='del'>-extern void ipl_store_parameters(void);</div><div class='ctx'> extern size_t ipl_block_get_ascii_vmparm(char *dest, size_t size,</div><div class='ctx'> 					 const struct ipl_parameter_block *ipb);</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +83,33 @@ extern struct ipl_info ipl_info;</div><div class='ctx'> extern void setup_ipl(void);</div><div class='ctx'> extern void set_os_info_reipl_block(void);</div><div class='ctx'> </div><div class='add'>+struct ipl_report {</div><div class='add'>+	struct ipl_parameter_block *ipib;</div><div class='add'>+	struct list_head components;</div><div class='add'>+	struct list_head certificates;</div><div class='add'>+	size_t size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ipl_report_component {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ipl_rb_component_entry entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ipl_report_certificate {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ipl_rb_certificate_entry entry;</div><div class='add'>+	void *key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kexec_buf;</div><div class='add'>+struct ipl_report *ipl_report_init(struct ipl_parameter_block *ipib);</div><div class='add'>+void *ipl_report_finish(struct ipl_report *report);</div><div class='add'>+int ipl_report_free(struct ipl_report *report);</div><div class='add'>+int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,</div><div class='add'>+			     unsigned char flags, unsigned short cert);</div><div class='add'>+int ipl_report_add_certificate(struct ipl_report *report, void *key,</div><div class='add'>+			       unsigned long addr, unsigned long len);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * DIAG 308 support</div><div class='ctx'>  */</div><div class='hunk'>@@ -133,32 +121,12 @@ enum diag308_subcode  {</div><div class='ctx'> 	DIAG308_STORE = 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum diag308_ipl_type {</div><div class='del'>-	DIAG308_IPL_TYPE_FCP	= 0,</div><div class='del'>-	DIAG308_IPL_TYPE_CCW	= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum diag308_opt {</div><div class='del'>-	DIAG308_IPL_OPT_IPL	= 0x10,</div><div class='del'>-	DIAG308_IPL_OPT_DUMP	= 0x20,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum diag308_flags {</div><div class='del'>-	DIAG308_FLAGS_LP_VALID	= 0x80,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum diag308_vm_flags {</div><div class='del'>-	DIAG308_VM_FLAGS_NSS_VALID	= 0x80,</div><div class='del'>-	DIAG308_VM_FLAGS_VP_VALID	= 0x40,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum diag308_rc {</div><div class='ctx'> 	DIAG308_RC_OK		= 0x0001,</div><div class='ctx'> 	DIAG308_RC_NOCONFIG	= 0x0102,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int diag308(unsigned long subcode, void *addr);</div><div class='del'>-extern void diag308_reset(void);</div><div class='ctx'> extern void store_status(void (*fn)(void *), void *data);</div><div class='ctx'> extern void lgr_info_log(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h<br/>index afaf5e3c57fd..9f75d67b8c20 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/irq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/irq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/irq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/irq.h</a></div><div class='hunk'>@@ -47,7 +47,6 @@ enum interruption_class {</div><div class='ctx'> 	IRQEXT_CMC,</div><div class='ctx'> 	IRQEXT_FTP,</div><div class='ctx'> 	IRQIO_CIO,</div><div class='del'>-	IRQIO_QAI,</div><div class='ctx'> 	IRQIO_DAS,</div><div class='ctx'> 	IRQIO_C15,</div><div class='ctx'> 	IRQIO_C70,</div><div class='hunk'>@@ -55,12 +54,14 @@ enum interruption_class {</div><div class='ctx'> 	IRQIO_VMR,</div><div class='ctx'> 	IRQIO_LCS,</div><div class='ctx'> 	IRQIO_CTC,</div><div class='del'>-	IRQIO_APB,</div><div class='ctx'> 	IRQIO_ADM,</div><div class='ctx'> 	IRQIO_CSC,</div><div class='del'>-	IRQIO_PCI,</div><div class='del'>-	IRQIO_MSI,</div><div class='ctx'> 	IRQIO_VIR,</div><div class='add'>+	IRQIO_QAI,</div><div class='add'>+	IRQIO_APB,</div><div class='add'>+	IRQIO_PCF,</div><div class='add'>+	IRQIO_PCD,</div><div class='add'>+	IRQIO_MSI,</div><div class='ctx'> 	IRQIO_VAI,</div><div class='ctx'> 	IRQIO_GAL,</div><div class='ctx'> 	NMI_NMI,</div><div class='head'>diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h<br/>index 825dd0f7f221..ea398a05f643 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/kexec.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/kexec.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/kexec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/kexec.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> /*</div><div class='ctx'>  * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.</div><div class='ctx'>  * I.e. Maximum page that is mapped directly into kernel memory,</div><div class='hunk'>@@ -42,6 +43,9 @@</div><div class='ctx'> /* The native architecture */</div><div class='ctx'> #define KEXEC_ARCH KEXEC_ARCH_S390</div><div class='ctx'> </div><div class='add'>+/* Allow kexec_file to load a segment to 0 */</div><div class='add'>+#define KEXEC_BUF_MEM_UNKNOWN -1</div><div class='add'>+</div><div class='ctx'> /* Provide a dummy definition to avoid build failures. */</div><div class='ctx'> static inline void crash_setup_regs(struct pt_regs *newregs,</div><div class='ctx'> 					struct pt_regs *oldregs) { }</div><div class='hunk'>@@ -51,20 +55,24 @@ struct s390_load_data {</div><div class='ctx'> 	/* Pointer to the kernel buffer. Used to register cmdline etc.. */</div><div class='ctx'> 	void *kernel_buf;</div><div class='ctx'> </div><div class='add'>+	/* Load address of the kernel_buf. */</div><div class='add'>+	unsigned long kernel_mem;</div><div class='add'>+</div><div class='add'>+	/* Parmarea in the kernel buffer. */</div><div class='add'>+	struct parmarea *parm;</div><div class='add'>+</div><div class='ctx'> 	/* Total size of loaded segments in memory. Used as an offset. */</div><div class='ctx'> 	size_t memsz;</div><div class='ctx'> </div><div class='del'>-	/* Load address of initrd. Used to register INITRD_START in kernel. */</div><div class='del'>-	unsigned long initrd_load_addr;</div><div class='add'>+	struct ipl_report *report;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int kexec_file_add_purgatory(struct kimage *image,</div><div class='del'>-			     struct s390_load_data *data);</div><div class='del'>-int kexec_file_add_initrd(struct kimage *image,</div><div class='del'>-			  struct s390_load_data *data,</div><div class='del'>-			  char *initrd, unsigned long initrd_len);</div><div class='del'>-int *kexec_file_update_kernel(struct kimage *iamge,</div><div class='del'>-			      struct s390_load_data *data);</div><div class='add'>+int s390_verify_sig(const char *kernel, unsigned long kernel_len);</div><div class='add'>+void *kexec_file_add_components(struct kimage *image,</div><div class='add'>+				int (*add_kernel)(struct kimage *image,</div><div class='add'>+						  struct s390_load_data *data));</div><div class='add'>+int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val,</div><div class='add'>+			 unsigned long addr);</div><div class='ctx'> </div><div class='ctx'> extern const struct kexec_file_ops s390_kexec_image_ops;</div><div class='ctx'> extern const struct kexec_file_ops s390_kexec_elf_ops;</div><div class='head'>diff --git a/arch/s390/include/asm/linkage.h b/arch/s390/include/asm/linkage.h<br/>index 1b95da3fdd64..7f22262b0e46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/linkage.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/linkage.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/linkage.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/linkage.h</a></div><div class='hunk'>@@ -28,5 +28,12 @@</div><div class='ctx'> 	.long	(_target) - . ;		\</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='add'>+#define EX_TABLE_DMA(_fault, _target)	\</div><div class='add'>+	.section .dma.ex_table, "a" ;	\</div><div class='add'>+	.align	4 ;			\</div><div class='add'>+	.long	(_fault) - . ;		\</div><div class='add'>+	.long	(_target) - . ;		\</div><div class='add'>+	.previous</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h<br/>index cc0947e08b6f..237ee0c4169f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/lowcore.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/lowcore.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/lowcore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/lowcore.h</a></div><div class='hunk'>@@ -91,52 +91,53 @@ struct lowcore {</div><div class='ctx'> 	__u64	hardirq_timer;			/* 0x02e8 */</div><div class='ctx'> 	__u64	softirq_timer;			/* 0x02f0 */</div><div class='ctx'> 	__u64	steal_timer;			/* 0x02f8 */</div><div class='del'>-	__u64	last_update_timer;		/* 0x0300 */</div><div class='del'>-	__u64	last_update_clock;		/* 0x0308 */</div><div class='del'>-	__u64	int_clock;			/* 0x0310 */</div><div class='del'>-	__u64	mcck_clock;			/* 0x0318 */</div><div class='del'>-	__u64	clock_comparator;		/* 0x0320 */</div><div class='del'>-	__u64	boot_clock[2];			/* 0x0328 */</div><div class='add'>+	__u64	avg_steal_timer;		/* 0x0300 */</div><div class='add'>+	__u64	last_update_timer;		/* 0x0308 */</div><div class='add'>+	__u64	last_update_clock;		/* 0x0310 */</div><div class='add'>+	__u64	int_clock;			/* 0x0318*/</div><div class='add'>+	__u64	mcck_clock;			/* 0x0320 */</div><div class='add'>+	__u64	clock_comparator;		/* 0x0328 */</div><div class='add'>+	__u64	boot_clock[2];			/* 0x0330 */</div><div class='ctx'> </div><div class='ctx'> 	/* Current process. */</div><div class='del'>-	__u64	current_task;			/* 0x0338 */</div><div class='del'>-	__u64	kernel_stack;			/* 0x0340 */</div><div class='add'>+	__u64	current_task;			/* 0x0340 */</div><div class='add'>+	__u64	kernel_stack;			/* 0x0348 */</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt, DAT-off and restartstack. */</div><div class='del'>-	__u64	async_stack;			/* 0x0348 */</div><div class='del'>-	__u64	nodat_stack;			/* 0x0350 */</div><div class='del'>-	__u64	restart_stack;			/* 0x0358 */</div><div class='add'>+	__u64	async_stack;			/* 0x0350 */</div><div class='add'>+	__u64	nodat_stack;			/* 0x0358 */</div><div class='add'>+	__u64	restart_stack;			/* 0x0360 */</div><div class='ctx'> </div><div class='ctx'> 	/* Restart function and parameter. */</div><div class='del'>-	__u64	restart_fn;			/* 0x0360 */</div><div class='del'>-	__u64	restart_data;			/* 0x0368 */</div><div class='del'>-	__u64	restart_source;			/* 0x0370 */</div><div class='add'>+	__u64	restart_fn;			/* 0x0368 */</div><div class='add'>+	__u64	restart_data;			/* 0x0370 */</div><div class='add'>+	__u64	restart_source;			/* 0x0378 */</div><div class='ctx'> </div><div class='ctx'> 	/* Address space pointer. */</div><div class='del'>-	__u64	kernel_asce;			/* 0x0378 */</div><div class='del'>-	__u64	user_asce;			/* 0x0380 */</div><div class='del'>-	__u64	vdso_asce;			/* 0x0388 */</div><div class='add'>+	__u64	kernel_asce;			/* 0x0380 */</div><div class='add'>+	__u64	user_asce;			/* 0x0388 */</div><div class='add'>+	__u64	vdso_asce;			/* 0x0390 */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The lpp and current_pid fields form a</div><div class='ctx'> 	 * 64-bit value that is set as program</div><div class='ctx'> 	 * parameter with the LPP instruction.</div><div class='ctx'> 	 */</div><div class='del'>-	__u32	lpp;				/* 0x0390 */</div><div class='del'>-	__u32	current_pid;			/* 0x0394 */</div><div class='add'>+	__u32	lpp;				/* 0x0398 */</div><div class='add'>+	__u32	current_pid;			/* 0x039c */</div><div class='ctx'> </div><div class='ctx'> 	/* SMP info area */</div><div class='del'>-	__u32	cpu_nr;				/* 0x0398 */</div><div class='del'>-	__u32	softirq_pending;		/* 0x039c */</div><div class='del'>-	__u32	preempt_count;			/* 0x03a0 */</div><div class='del'>-	__u32	spinlock_lockval;		/* 0x03a4 */</div><div class='del'>-	__u32	spinlock_index;			/* 0x03a8 */</div><div class='del'>-	__u32	fpu_flags;			/* 0x03ac */</div><div class='del'>-	__u64	percpu_offset;			/* 0x03b0 */</div><div class='del'>-	__u64	vdso_per_cpu_data;		/* 0x03b8 */</div><div class='del'>-	__u64	machine_flags;			/* 0x03c0 */</div><div class='del'>-	__u64	gmap;				/* 0x03c8 */</div><div class='del'>-	__u8	pad_0x03d0[0x0400-0x03d0];	/* 0x03d0 */</div><div class='add'>+	__u32	cpu_nr;				/* 0x03a0 */</div><div class='add'>+	__u32	softirq_pending;		/* 0x03a4 */</div><div class='add'>+	__s32	preempt_count;			/* 0x03a8 */</div><div class='add'>+	__u32	spinlock_lockval;		/* 0x03ac */</div><div class='add'>+	__u32	spinlock_index;			/* 0x03b0 */</div><div class='add'>+	__u32	fpu_flags;			/* 0x03b4 */</div><div class='add'>+	__u64	percpu_offset;			/* 0x03b8 */</div><div class='add'>+	__u64	vdso_per_cpu_data;		/* 0x03c0 */</div><div class='add'>+	__u64	machine_flags;			/* 0x03c8 */</div><div class='add'>+	__u64	gmap;				/* 0x03d0 */</div><div class='add'>+	__u8	pad_0x03d8[0x0400-0x03d8];	/* 0x03d8 */</div><div class='ctx'> </div><div class='ctx'> 	/* br %r1 trampoline */</div><div class='ctx'> 	__u16	br_r1_trampoline;		/* 0x0400 */</div><div class='head'>diff --git a/arch/s390/include/asm/nospec-insn.h b/arch/s390/include/asm/nospec-insn.h<br/>index 123dac3717b3..0033dcd663b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/nospec-insn.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/nospec-insn.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/nospec-insn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/nospec-insn.h</a></div><div class='hunk'>@@ -32,23 +32,23 @@ _LC_BR_R1 = __LC_BR_R1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro __THUNK_PROLOG_BR r1,r2</div><div class='del'>-	__THUNK_PROLOG_NAME __s390x_indirect_jump_r\r2\()use_r\r1</div><div class='add'>+	__THUNK_PROLOG_NAME __s390_indirect_jump_r\r2\()use_r\r1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro __THUNK_PROLOG_BC d0,r1,r2</div><div class='del'>-	__THUNK_PROLOG_NAME __s390x_indirect_branch_\d0\()_\r2\()use_\r1</div><div class='add'>+	__THUNK_PROLOG_NAME __s390_indirect_branch_\d0\()_\r2\()use_\r1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro __THUNK_BR r1,r2</div><div class='del'>-	jg	__s390x_indirect_jump_r\r2\()use_r\r1</div><div class='add'>+	jg	__s390_indirect_jump_r\r2\()use_r\r1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro __THUNK_BC d0,r1,r2</div><div class='del'>-	jg	__s390x_indirect_branch_\d0\()_\r2\()use_\r1</div><div class='add'>+	jg	__s390_indirect_branch_\d0\()_\r2\()use_\r1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro __THUNK_BRASL r1,r2,r3</div><div class='del'>-	brasl	\r1,__s390x_indirect_jump_r\r3\()use_r\r2</div><div class='add'>+	brasl	\r1,__s390_indirect_jump_r\r3\()use_r\r2</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	__DECODE_RR expand,reg,ruse</div><div class='head'>diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h<br/>index 4e0efebc56a9..305befd55326 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/pci.h</a></div><div class='hunk'>@@ -26,6 +26,9 @@ int pci_proc_domain(struct pci_bus *);</div><div class='ctx'> #define ZPCI_BUS_NR			0	/* default bus number */</div><div class='ctx'> #define ZPCI_DEVFN			0	/* default device number */</div><div class='ctx'> </div><div class='add'>+#define ZPCI_NR_DMA_SPACES		1</div><div class='add'>+#define ZPCI_NR_DEVICES			CONFIG_PCI_NR_FUNCTIONS</div><div class='add'>+</div><div class='ctx'> /* PCI Function Controls */</div><div class='ctx'> #define ZPCI_FC_FN_ENABLED		0x80</div><div class='ctx'> #define ZPCI_FC_ERROR			0x40</div><div class='hunk'>@@ -83,6 +86,8 @@ enum zpci_state {</div><div class='ctx'> </div><div class='ctx'> struct zpci_bar_struct {</div><div class='ctx'> 	struct resource *res;		/* bus resource */</div><div class='add'>+	void __iomem	*mio_wb;</div><div class='add'>+	void __iomem	*mio_wt;</div><div class='ctx'> 	u32		val;		/* bar start &amp; 3 flag bits */</div><div class='ctx'> 	u16		map_idx;	/* index into bar mapping array */</div><div class='ctx'> 	u8		size;		/* order 2 exponent */</div><div class='hunk'>@@ -112,6 +117,8 @@ struct zpci_dev {</div><div class='ctx'> 	/* IRQ stuff */</div><div class='ctx'> 	u64		msi_addr;	/* MSI address */</div><div class='ctx'> 	unsigned int	max_msi;	/* maximum number of MSI's */</div><div class='add'>+	unsigned int	msi_first_bit;</div><div class='add'>+	unsigned int	msi_nr_irqs;</div><div class='ctx'> 	struct airq_iv *aibv;		/* adapter interrupt bit vector */</div><div class='ctx'> 	unsigned long	aisb;		/* number of the summary bit */</div><div class='ctx'> </div><div class='hunk'>@@ -130,6 +137,7 @@ struct zpci_dev {</div><div class='ctx'> 	struct iommu_device iommu_dev;  /* IOMMU core handle */</div><div class='ctx'> </div><div class='ctx'> 	char res_name[16];</div><div class='add'>+	bool mio_capable;</div><div class='ctx'> 	struct zpci_bar_struct bars[PCI_BAR_COUNT];</div><div class='ctx'> </div><div class='ctx'> 	u64		start_dma;	/* Start of available DMA addresses */</div><div class='hunk'>@@ -158,6 +166,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern const struct attribute_group *zpci_attr_groups[];</div><div class='add'>+extern unsigned int s390_pci_force_floating __initdata;</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------------------</div><div class='ctx'>   Prototypes</div><div class='hunk'>@@ -219,6 +228,9 @@ struct zpci_dev *get_zdev_by_fid(u32);</div><div class='ctx'> int zpci_dma_init(void);</div><div class='ctx'> void zpci_dma_exit(void);</div><div class='ctx'> </div><div class='add'>+int __init zpci_irq_init(void);</div><div class='add'>+void __init zpci_irq_exit(void);</div><div class='add'>+</div><div class='ctx'> /* FMB */</div><div class='ctx'> int zpci_fmb_enable_device(struct zpci_dev *);</div><div class='ctx'> int zpci_fmb_disable_device(struct zpci_dev *);</div><div class='head'>diff --git a/arch/s390/include/asm/pci_clp.h b/arch/s390/include/asm/pci_clp.h<br/>index b3b31b31f0d3..3ec52a05d500 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci_clp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci_clp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci_clp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/pci_clp.h</a></div><div class='hunk'>@@ -43,6 +43,8 @@ struct clp_fh_list_entry {</div><div class='ctx'> </div><div class='ctx'> #define CLP_SET_ENABLE_PCI_FN	0	/* Yes, 0 enables it */</div><div class='ctx'> #define CLP_SET_DISABLE_PCI_FN	1	/* Yes, 1 disables it */</div><div class='add'>+#define CLP_SET_ENABLE_MIO	2</div><div class='add'>+#define CLP_SET_DISABLE_MIO	3</div><div class='ctx'> </div><div class='ctx'> #define CLP_UTIL_STR_LEN	64</div><div class='ctx'> #define CLP_PFIP_NR_SEGMENTS	4</div><div class='hunk'>@@ -80,7 +82,8 @@ struct clp_req_query_pci {</div><div class='ctx'> struct clp_rsp_query_pci {</div><div class='ctx'> 	struct clp_rsp_hdr hdr;</div><div class='ctx'> 	u16 vfn;			/* virtual fn number */</div><div class='del'>-	u16			:  7;</div><div class='add'>+	u16			:  6;</div><div class='add'>+	u16 mio_addr_avail	:  1;</div><div class='ctx'> 	u16 util_str_avail	:  1;	/* utility string available? */</div><div class='ctx'> 	u16 pfgid		:  8;	/* pci function group id */</div><div class='ctx'> 	u32 fid;			/* pci function id */</div><div class='hunk'>@@ -96,6 +99,15 @@ struct clp_rsp_query_pci {</div><div class='ctx'> 	u32 reserved[11];</div><div class='ctx'> 	u32 uid;			/* user defined id */</div><div class='ctx'> 	u8 util_str[CLP_UTIL_STR_LEN];	/* utility string */</div><div class='add'>+	u32 reserved2[16];</div><div class='add'>+	u32 mio_valid : 6;</div><div class='add'>+	u32 : 26;</div><div class='add'>+	u32 : 32;</div><div class='add'>+	struct {</div><div class='add'>+		u64 wb;</div><div class='add'>+		u64 wt;</div><div class='add'>+	} addr[PCI_BAR_COUNT];</div><div class='add'>+	u32 reserved3[6];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Query PCI function group request */</div><div class='hunk'>@@ -118,7 +130,11 @@ struct clp_rsp_query_pci_grp {</div><div class='ctx'> 	u8 refresh		:  1;	/* TLB refresh mode */</div><div class='ctx'> 	u16 reserved2;</div><div class='ctx'> 	u16 mui;</div><div class='del'>-	u64 reserved3;</div><div class='add'>+	u16			: 16;</div><div class='add'>+	u16 maxfaal;</div><div class='add'>+	u16			:  4;</div><div class='add'>+	u16 dnoi		: 12;</div><div class='add'>+	u16 maxcpu;</div><div class='ctx'> 	u64 dasm;			/* dma address space mask */</div><div class='ctx'> 	u64 msia;			/* MSI address */</div><div class='ctx'> 	u64 reserved4;</div><div class='head'>diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h<br/>index ba22a6ea51a1..ff81ed19c506 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci_insn.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci_insn.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci_insn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/pci_insn.h</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> #ifndef _ASM_S390_PCI_INSN_H</div><div class='ctx'> #define _ASM_S390_PCI_INSN_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Load/Store status codes */</div><div class='ctx'> #define ZPCI_PCI_ST_FUNC_NOT_ENABLED		4</div><div class='ctx'> #define ZPCI_PCI_ST_FUNC_IN_ERR			8</div><div class='hunk'>@@ -38,6 +40,8 @@</div><div class='ctx'> #define ZPCI_MOD_FC_RESET_ERROR	7</div><div class='ctx'> #define ZPCI_MOD_FC_RESET_BLOCK	9</div><div class='ctx'> #define ZPCI_MOD_FC_SET_MEASURE	10</div><div class='add'>+#define ZPCI_MOD_FC_REG_INT_D	16</div><div class='add'>+#define ZPCI_MOD_FC_DEREG_INT_D	17</div><div class='ctx'> </div><div class='ctx'> /* FIB function controls */</div><div class='ctx'> #define ZPCI_FIB_FC_ENABLED	0x80</div><div class='hunk'>@@ -51,16 +55,7 @@</div><div class='ctx'> #define ZPCI_FIB_FC_LS_BLOCKED	0x20</div><div class='ctx'> #define ZPCI_FIB_FC_DMAAS_REG	0x10</div><div class='ctx'> </div><div class='del'>-/* Function Information Block */</div><div class='del'>-struct zpci_fib {</div><div class='del'>-	u32 fmt		:  8;	/* format */</div><div class='del'>-	u32		: 24;</div><div class='del'>-	u32		: 32;</div><div class='del'>-	u8 fc;			/* function controls */</div><div class='del'>-	u64		: 56;</div><div class='del'>-	u64 pba;		/* PCI base address */</div><div class='del'>-	u64 pal;		/* PCI address limit */</div><div class='del'>-	u64 iota;		/* I/O Translation Anchor */</div><div class='add'>+struct zpci_fib_fmt0 {</div><div class='ctx'> 	u32		:  1;</div><div class='ctx'> 	u32 isc		:  3;	/* Interrupt subclass */</div><div class='ctx'> 	u32 noi		: 12;	/* Number of interrupts */</div><div class='hunk'>@@ -72,16 +67,90 @@ struct zpci_fib {</div><div class='ctx'> 	u32		: 32;</div><div class='ctx'> 	u64 aibv;		/* Adapter int bit vector address */</div><div class='ctx'> 	u64 aisb;		/* Adapter int summary bit address */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zpci_fib_fmt1 {</div><div class='add'>+	u32		:  4;</div><div class='add'>+	u32 noi		: 12;</div><div class='add'>+	u32		: 16;</div><div class='add'>+	u32 dibvo	: 16;</div><div class='add'>+	u32		: 16;</div><div class='add'>+	u64		: 64;</div><div class='add'>+	u64		: 64;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Function Information Block */</div><div class='add'>+struct zpci_fib {</div><div class='add'>+	u32 fmt		:  8;	/* format */</div><div class='add'>+	u32		: 24;</div><div class='add'>+	u32		: 32;</div><div class='add'>+	u8 fc;			/* function controls */</div><div class='add'>+	u64		: 56;</div><div class='add'>+	u64 pba;		/* PCI base address */</div><div class='add'>+	u64 pal;		/* PCI address limit */</div><div class='add'>+	u64 iota;		/* I/O Translation Anchor */</div><div class='add'>+	union {</div><div class='add'>+		struct zpci_fib_fmt0 fmt0;</div><div class='add'>+		struct zpci_fib_fmt1 fmt1;</div><div class='add'>+	};</div><div class='ctx'> 	u64 fmb_addr;		/* Function measurement block address and key */</div><div class='ctx'> 	u32		: 32;</div><div class='ctx'> 	u32 gd;</div><div class='ctx'> } __packed __aligned(8);</div><div class='ctx'> </div><div class='add'>+/* directed interruption information block */</div><div class='add'>+struct zpci_diib {</div><div class='add'>+	u32 : 1;</div><div class='add'>+	u32 isc : 3;</div><div class='add'>+	u32 : 28;</div><div class='add'>+	u16 : 16;</div><div class='add'>+	u16 nr_cpus;</div><div class='add'>+	u64 disb_addr;</div><div class='add'>+	u64 : 64;</div><div class='add'>+	u64 : 64;</div><div class='add'>+} __packed __aligned(8);</div><div class='add'>+</div><div class='add'>+/* cpu directed interruption information block */</div><div class='add'>+struct zpci_cdiib {</div><div class='add'>+	u64 : 64;</div><div class='add'>+	u64 dibv_addr;</div><div class='add'>+	u64 : 64;</div><div class='add'>+	u64 : 64;</div><div class='add'>+	u64 : 64;</div><div class='add'>+} __packed __aligned(8);</div><div class='add'>+</div><div class='add'>+union zpci_sic_iib {</div><div class='add'>+	struct zpci_diib diib;</div><div class='add'>+	struct zpci_cdiib cdiib;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(have_mio);</div><div class='add'>+</div><div class='ctx'> u8 zpci_mod_fc(u64 req, struct zpci_fib *fib, u8 *status);</div><div class='ctx'> int zpci_refresh_trans(u64 fn, u64 addr, u64 range);</div><div class='del'>-int zpci_load(u64 *data, u64 req, u64 offset);</div><div class='del'>-int zpci_store(u64 data, u64 req, u64 offset);</div><div class='del'>-int zpci_store_block(const u64 *data, u64 req, u64 offset);</div><div class='del'>-int zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);</div><div class='add'>+int __zpci_load(u64 *data, u64 req, u64 offset);</div><div class='add'>+int zpci_load(u64 *data, const volatile void __iomem *addr, unsigned long len);</div><div class='add'>+int __zpci_store(u64 data, u64 req, u64 offset);</div><div class='add'>+int zpci_store(const volatile void __iomem *addr, u64 data, unsigned long len);</div><div class='add'>+int __zpci_store_block(const u64 *data, u64 req, u64 offset);</div><div class='add'>+void zpci_barrier(void);</div><div class='add'>+int __zpci_set_irq_ctrl(u16 ctl, u8 isc, union zpci_sic_iib *iib);</div><div class='add'>+</div><div class='add'>+static inline int zpci_set_irq_ctrl(u16 ctl, u8 isc)</div><div class='add'>+{</div><div class='add'>+	union zpci_sic_iib iib = {{0}};</div><div class='add'>+</div><div class='add'>+	return __zpci_set_irq_ctrl(ctl, isc, &amp;iib);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static inline void enable_mio_ctl(void)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		__ctl_set_bit(2, 5);</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_PCI */</div><div class='add'>+static inline void enable_mio_ctl(void) {}</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h<br/>index cbb9cb9c6547..cd060b5dd8fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci_io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pci_io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pci_io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/pci_io.h</a></div><div class='hunk'>@@ -37,12 +37,10 @@ extern struct zpci_iomap_entry *zpci_iomap_start;</div><div class='ctx'> #define zpci_read(LENGTH, RETTYPE)						\</div><div class='ctx'> static inline RETTYPE zpci_read_##RETTYPE(const volatile void __iomem *addr)	\</div><div class='ctx'> {										\</div><div class='del'>-	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(addr)];	\</div><div class='del'>-	u64 req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, LENGTH);		\</div><div class='ctx'> 	u64 data;								\</div><div class='ctx'> 	int rc;									\</div><div class='ctx'> 										\</div><div class='del'>-	rc = zpci_load(&amp;data, req, ZPCI_OFFSET(addr));				\</div><div class='add'>+	rc = zpci_load(&amp;data, addr, LENGTH);					\</div><div class='ctx'> 	if (rc)									\</div><div class='ctx'> 		data = -1ULL;							\</div><div class='ctx'> 	return (RETTYPE) data;							\</div><div class='hunk'>@@ -52,11 +50,9 @@ static inline RETTYPE zpci_read_##RETTYPE(const volatile void __iomem *addr)	\</div><div class='ctx'> static inline void zpci_write_##VALTYPE(VALTYPE val,				\</div><div class='ctx'> 					const volatile void __iomem *addr)	\</div><div class='ctx'> {										\</div><div class='del'>-	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(addr)];	\</div><div class='del'>-	u64 req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, LENGTH);		\</div><div class='ctx'> 	u64 data = (VALTYPE) val;						\</div><div class='ctx'> 										\</div><div class='del'>-	zpci_store(data, req, ZPCI_OFFSET(addr));				\</div><div class='add'>+	zpci_store(addr, data, LENGTH);						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> zpci_read(8, u64)</div><div class='hunk'>@@ -68,36 +64,38 @@ zpci_write(4, u32)</div><div class='ctx'> zpci_write(2, u16)</div><div class='ctx'> zpci_write(1, u8)</div><div class='ctx'> </div><div class='del'>-static inline int zpci_write_single(u64 req, const u64 *data, u64 offset, u8 len)</div><div class='add'>+static inline int zpci_write_single(volatile void __iomem *dst, const void *src,</div><div class='add'>+				    unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='ctx'> 	switch (len) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		val = (u64) *((u8 *) data);</div><div class='add'>+		val = (u64) *((u8 *) src);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		val = (u64) *((u16 *) data);</div><div class='add'>+		val = (u64) *((u16 *) src);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		val = (u64) *((u32 *) data);</div><div class='add'>+		val = (u64) *((u32 *) src);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 8:</div><div class='del'>-		val = (u64) *((u64 *) data);</div><div class='add'>+		val = (u64) *((u64 *) src);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		val = 0;		/* let FW report error */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return zpci_store(val, req, offset);</div><div class='add'>+	return zpci_store(dst, val, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)</div><div class='add'>+static inline int zpci_read_single(void *dst, const volatile void __iomem *src,</div><div class='add'>+				   unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	u64 data;</div><div class='ctx'> 	int cc;</div><div class='ctx'> </div><div class='del'>-	cc = zpci_load(&amp;data, req, offset);</div><div class='add'>+	cc = zpci_load(&amp;data, src, len);</div><div class='ctx'> 	if (cc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -119,10 +117,8 @@ out:</div><div class='ctx'> 	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zpci_write_block(u64 req, const u64 *data, u64 offset)</div><div class='del'>-{</div><div class='del'>-	return zpci_store_block(data, req, offset);</div><div class='del'>-}</div><div class='add'>+int zpci_write_block(volatile void __iomem *dst, const void *src,</div><div class='add'>+		     unsigned long len);</div><div class='ctx'> </div><div class='ctx'> static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)</div><div class='ctx'> {</div><div class='hunk'>@@ -140,18 +136,15 @@ static inline int zpci_memcpy_fromio(void *dst,</div><div class='ctx'> 				     const volatile void __iomem *src,</div><div class='ctx'> 				     unsigned long n)</div><div class='ctx'> {</div><div class='del'>-	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(src)];</div><div class='del'>-	u64 req, offset = ZPCI_OFFSET(src);</div><div class='ctx'> 	int size, rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (n &gt; 0) {</div><div class='ctx'> 		size = zpci_get_max_write_size((u64 __force) src,</div><div class='ctx'> 					       (u64) dst, n, 8);</div><div class='del'>-		req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, size);</div><div class='del'>-		rc = zpci_read_single(req, dst, offset, size);</div><div class='add'>+		rc = zpci_read_single(dst, src, size);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='del'>-		offset += size;</div><div class='add'>+		src += size;</div><div class='ctx'> 		dst += size;</div><div class='ctx'> 		n -= size;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -161,8 +154,6 @@ static inline int zpci_memcpy_fromio(void *dst,</div><div class='ctx'> static inline int zpci_memcpy_toio(volatile void __iomem *dst,</div><div class='ctx'> 				   const void *src, unsigned long n)</div><div class='ctx'> {</div><div class='del'>-	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(dst)];</div><div class='del'>-	u64 req, offset = ZPCI_OFFSET(dst);</div><div class='ctx'> 	int size, rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!src)</div><div class='hunk'>@@ -171,16 +162,14 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst,</div><div class='ctx'> 	while (n &gt; 0) {</div><div class='ctx'> 		size = zpci_get_max_write_size((u64 __force) dst,</div><div class='ctx'> 					       (u64) src, n, 128);</div><div class='del'>-		req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, size);</div><div class='del'>-</div><div class='ctx'> 		if (size &gt; 8) /* main path */</div><div class='del'>-			rc = zpci_write_block(req, src, offset);</div><div class='add'>+			rc = zpci_write_block(dst, src, size);</div><div class='ctx'> 		else</div><div class='del'>-			rc = zpci_write_single(req, src, offset, size);</div><div class='add'>+			rc = zpci_write_single(dst, src, size);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='del'>-		offset += size;</div><div class='ctx'> 		src += size;</div><div class='add'>+		dst += size;</div><div class='ctx'> 		n -= size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h<br/>index 76dc344edb8c..9f0195d5fa16 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pgtable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/pgtable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/pgtable.h</a></div><div class='hunk'>@@ -238,7 +238,7 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'> #define _REGION_ENTRY_NOEXEC	0x100	/* region no-execute bit	    */</div><div class='ctx'> #define _REGION_ENTRY_OFFSET	0xc0	/* region table offset		    */</div><div class='ctx'> #define _REGION_ENTRY_INVALID	0x20	/* invalid region table entry	    */</div><div class='del'>-#define _REGION_ENTRY_TYPE_MASK	0x0c	/* region/segment table type mask   */</div><div class='add'>+#define _REGION_ENTRY_TYPE_MASK	0x0c	/* region table type mask	    */</div><div class='ctx'> #define _REGION_ENTRY_TYPE_R1	0x0c	/* region first table type	    */</div><div class='ctx'> #define _REGION_ENTRY_TYPE_R2	0x08	/* region second table type	    */</div><div class='ctx'> #define _REGION_ENTRY_TYPE_R3	0x04	/* region third table type	    */</div><div class='hunk'>@@ -277,6 +277,7 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'> #define _SEGMENT_ENTRY_PROTECT	0x200	/* segment protection bit	    */</div><div class='ctx'> #define _SEGMENT_ENTRY_NOEXEC	0x100	/* segment no-execute bit	    */</div><div class='ctx'> #define _SEGMENT_ENTRY_INVALID	0x20	/* invalid segment table entry	    */</div><div class='add'>+#define _SEGMENT_ENTRY_TYPE_MASK 0x0c	/* segment table type mask	    */</div><div class='ctx'> </div><div class='ctx'> #define _SEGMENT_ENTRY		(0)</div><div class='ctx'> #define _SEGMENT_ENTRY_EMPTY	(_SEGMENT_ENTRY_INVALID)</div><div class='hunk'>@@ -614,15 +615,9 @@ static inline int pgd_none(pgd_t pgd)</div><div class='ctx'> </div><div class='ctx'> static inline int pgd_bad(pgd_t pgd)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * With dynamic page table levels the pgd can be a region table</div><div class='del'>-	 * entry or a segment table entry. Check for the bit that are</div><div class='del'>-	 * invalid for either table entry.</div><div class='del'>-	 */</div><div class='del'>-	unsigned long mask =</div><div class='del'>-		~_SEGMENT_ENTRY_ORIGIN &amp; ~_REGION_ENTRY_INVALID &amp;</div><div class='del'>-		~_REGION_ENTRY_TYPE_MASK &amp; ~_REGION_ENTRY_LENGTH;</div><div class='del'>-	return (pgd_val(pgd) &amp; mask) != 0;</div><div class='add'>+	if ((pgd_val(pgd) &amp; _REGION_ENTRY_TYPE_MASK) &lt; _REGION_ENTRY_TYPE_R1)</div><div class='add'>+		return 0;</div><div class='add'>+	return (pgd_val(pgd) &amp; ~_REGION_ENTRY_BITS) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long pgd_pfn(pgd_t pgd)</div><div class='hunk'>@@ -703,6 +698,8 @@ static inline int pmd_large(pmd_t pmd)</div><div class='ctx'> </div><div class='ctx'> static inline int pmd_bad(pmd_t pmd)</div><div class='ctx'> {</div><div class='add'>+	if ((pmd_val(pmd) &amp; _SEGMENT_ENTRY_TYPE_MASK) &gt; 0)</div><div class='add'>+		return 1;</div><div class='ctx'> 	if (pmd_large(pmd))</div><div class='ctx'> 		return (pmd_val(pmd) &amp; ~_SEGMENT_ENTRY_BITS_LARGE) != 0;</div><div class='ctx'> 	return (pmd_val(pmd) &amp; ~_SEGMENT_ENTRY_BITS) != 0;</div><div class='hunk'>@@ -710,8 +707,12 @@ static inline int pmd_bad(pmd_t pmd)</div><div class='ctx'> </div><div class='ctx'> static inline int pud_bad(pud_t pud)</div><div class='ctx'> {</div><div class='del'>-	if ((pud_val(pud) &amp; _REGION_ENTRY_TYPE_MASK) &lt; _REGION_ENTRY_TYPE_R3)</div><div class='del'>-		return pmd_bad(__pmd(pud_val(pud)));</div><div class='add'>+	unsigned long type = pud_val(pud) &amp; _REGION_ENTRY_TYPE_MASK;</div><div class='add'>+</div><div class='add'>+	if (type &gt; _REGION_ENTRY_TYPE_R3)</div><div class='add'>+		return 1;</div><div class='add'>+	if (type &lt; _REGION_ENTRY_TYPE_R3)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (pud_large(pud))</div><div class='ctx'> 		return (pud_val(pud) &amp; ~_REGION_ENTRY_BITS_LARGE) != 0;</div><div class='ctx'> 	return (pud_val(pud) &amp; ~_REGION_ENTRY_BITS) != 0;</div><div class='hunk'>@@ -719,8 +720,12 @@ static inline int pud_bad(pud_t pud)</div><div class='ctx'> </div><div class='ctx'> static inline int p4d_bad(p4d_t p4d)</div><div class='ctx'> {</div><div class='del'>-	if ((p4d_val(p4d) &amp; _REGION_ENTRY_TYPE_MASK) &lt; _REGION_ENTRY_TYPE_R2)</div><div class='del'>-		return pud_bad(__pud(p4d_val(p4d)));</div><div class='add'>+	unsigned long type = p4d_val(p4d) &amp; _REGION_ENTRY_TYPE_MASK;</div><div class='add'>+</div><div class='add'>+	if (type &gt; _REGION_ENTRY_TYPE_R2)</div><div class='add'>+		return 1;</div><div class='add'>+	if (type &lt; _REGION_ENTRY_TYPE_R2)</div><div class='add'>+		return 0;</div><div class='ctx'> 	return (p4d_val(p4d) &amp; ~_REGION_ENTRY_BITS) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1204,41 +1209,78 @@ static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)</div><div class='ctx'> #define pmd_index(address) (((address) &gt;&gt; PMD_SHIFT) &amp; (PTRS_PER_PMD-1))</div><div class='ctx'> #define pte_index(address) (((address) &gt;&gt; PAGE_SHIFT) &amp; (PTRS_PER_PTE-1))</div><div class='ctx'> </div><div class='del'>-#define pgd_offset(mm, address) ((mm)-&gt;pgd + pgd_index(address))</div><div class='del'>-#define pgd_offset_k(address) pgd_offset(&amp;init_mm, address)</div><div class='del'>-#define pgd_offset_raw(pgd, addr) ((pgd) + pgd_index(addr))</div><div class='del'>-</div><div class='ctx'> #define pmd_deref(pmd) (pmd_val(pmd) &amp; _SEGMENT_ENTRY_ORIGIN)</div><div class='ctx'> #define pud_deref(pud) (pud_val(pud) &amp; _REGION_ENTRY_ORIGIN)</div><div class='ctx'> #define p4d_deref(pud) (p4d_val(pud) &amp; _REGION_ENTRY_ORIGIN)</div><div class='ctx'> #define pgd_deref(pgd) (pgd_val(pgd) &amp; _REGION_ENTRY_ORIGIN)</div><div class='ctx'> </div><div class='del'>-static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)</div><div class='add'>+/*</div><div class='add'>+ * The pgd_offset function *always* adds the index for the top-level</div><div class='add'>+ * region/segment table. This is done to get a sequence like the</div><div class='add'>+ * following to work:</div><div class='add'>+ *	pgdp = pgd_offset(current-&gt;mm, addr);</div><div class='add'>+ *	pgd = READ_ONCE(*pgdp);</div><div class='add'>+ *	p4dp = p4d_offset(&amp;pgd, addr);</div><div class='add'>+ *	...</div><div class='add'>+ * The subsequent p4d_offset, pud_offset and pmd_offset functions</div><div class='add'>+ * only add an index if they dereferenced the pointer.</div><div class='add'>+ */</div><div class='add'>+static inline pgd_t *pgd_offset_raw(pgd_t *pgd, unsigned long address)</div><div class='ctx'> {</div><div class='del'>-	p4d_t *p4d = (p4d_t *) pgd;</div><div class='add'>+	unsigned long rste;</div><div class='add'>+	unsigned int shift;</div><div class='ctx'> </div><div class='del'>-	if ((pgd_val(*pgd) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R1)</div><div class='del'>-		p4d = (p4d_t *) pgd_deref(*pgd);</div><div class='del'>-	return p4d + p4d_index(address);</div><div class='add'>+	/* Get the first entry of the top level table */</div><div class='add'>+	rste = pgd_val(*pgd);</div><div class='add'>+	/* Pick up the shift from the table type of the first entry */</div><div class='add'>+	shift = ((rste &amp; _REGION_ENTRY_TYPE_MASK) &gt;&gt; 2) * 11 + 20;</div><div class='add'>+	return pgd + ((address &gt;&gt; shift) &amp; (PTRS_PER_PGD - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)</div><div class='add'>+#define pgd_offset(mm, address) pgd_offset_raw(READ_ONCE((mm)-&gt;pgd), address)</div><div class='add'>+#define pgd_offset_k(address) pgd_offset(&amp;init_mm, address)</div><div class='add'>+</div><div class='add'>+static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)</div><div class='ctx'> {</div><div class='del'>-	pud_t *pud = (pud_t *) p4d;</div><div class='add'>+	if ((pgd_val(*pgd) &amp; _REGION_ENTRY_TYPE_MASK) &gt;= _REGION_ENTRY_TYPE_R1)</div><div class='add'>+		return (p4d_t *) pgd_deref(*pgd) + p4d_index(address);</div><div class='add'>+	return (p4d_t *) pgd;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if ((p4d_val(*p4d) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R2)</div><div class='del'>-		pud = (pud_t *) p4d_deref(*p4d);</div><div class='del'>-	return pud + pud_index(address);</div><div class='add'>+static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	if ((p4d_val(*p4d) &amp; _REGION_ENTRY_TYPE_MASK) &gt;= _REGION_ENTRY_TYPE_R2)</div><div class='add'>+		return (pud_t *) p4d_deref(*p4d) + pud_index(address);</div><div class='add'>+	return (pud_t *) p4d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)</div><div class='ctx'> {</div><div class='del'>-	pmd_t *pmd = (pmd_t *) pud;</div><div class='add'>+	if ((pud_val(*pud) &amp; _REGION_ENTRY_TYPE_MASK) &gt;= _REGION_ENTRY_TYPE_R3)</div><div class='add'>+		return (pmd_t *) pud_deref(*pud) + pmd_index(address);</div><div class='add'>+	return (pmd_t *) pud;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if ((pud_val(*pud) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)</div><div class='del'>-		pmd = (pmd_t *) pud_deref(*pud);</div><div class='del'>-	return pmd + pmd_index(address);</div><div class='add'>+static inline pte_t *pte_offset(pmd_t *pmd, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	return (pte_t *) pmd_deref(*pmd) + pte_index(address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pte_offset_kernel(pmd, address) pte_offset(pmd, address)</div><div class='add'>+#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)</div><div class='add'>+#define pte_unmap(pte) do { } while (0)</div><div class='add'>+</div><div class='add'>+static inline bool gup_fast_permitted(unsigned long start, int nr_pages)</div><div class='add'>+{</div><div class='add'>+	unsigned long len, end;</div><div class='add'>+</div><div class='add'>+	len = (unsigned long) nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	end = start + len;</div><div class='add'>+	if (end &lt; start)</div><div class='add'>+		return false;</div><div class='add'>+	return end &lt;= current-&gt;mm-&gt;context.asce_limit;</div><div class='ctx'> }</div><div class='add'>+#define gup_fast_permitted gup_fast_permitted</div><div class='ctx'> </div><div class='ctx'> #define pfn_pte(pfn,pgprot) mk_pte_phys(__pa((pfn) &lt;&lt; PAGE_SHIFT),(pgprot))</div><div class='ctx'> #define pte_pfn(x) (pte_val(x) &gt;&gt; PAGE_SHIFT)</div><div class='hunk'>@@ -1249,12 +1291,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)</div><div class='ctx'> #define p4d_page(p4d) pfn_to_page(p4d_pfn(p4d))</div><div class='ctx'> #define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd))</div><div class='ctx'> </div><div class='del'>-/* Find an entry in the lowest level page table.. */</div><div class='del'>-#define pte_offset(pmd, addr) ((pte_t *) pmd_deref(*(pmd)) + pte_index(addr))</div><div class='del'>-#define pte_offset_kernel(pmd, address) pte_offset(pmd,address)</div><div class='del'>-#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)</div><div class='del'>-#define pte_unmap(pte) do { } while (0)</div><div class='del'>-</div><div class='ctx'> static inline pmd_t pmd_wrprotect(pmd_t pmd)</div><div class='ctx'> {</div><div class='ctx'> 	pmd_val(pmd) &amp;= ~_SEGMENT_ENTRY_WRITE;</div><div class='head'>diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h<br/>index 81038ab357ce..b0fcbc37b637 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/processor.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/processor.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/processor.h</a></div><div class='hunk'>@@ -156,25 +156,6 @@ struct thread_struct {</div><div class='ctx'> </div><div class='ctx'> typedef struct thread_struct thread_struct;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Stack layout of a C stack frame.</div><div class='del'>- */</div><div class='del'>-#ifndef __PACK_STACK</div><div class='del'>-struct stack_frame {</div><div class='del'>-	unsigned long back_chain;</div><div class='del'>-	unsigned long empty1[5];</div><div class='del'>-	unsigned long gprs[10];</div><div class='del'>-	unsigned int  empty2[8];</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-struct stack_frame {</div><div class='del'>-	unsigned long empty1[5];</div><div class='del'>-	unsigned int  empty2[8];</div><div class='del'>-	unsigned long gprs[10];</div><div class='del'>-	unsigned long back_chain;</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define ARCH_MIN_TASKALIGN	8</div><div class='ctx'> </div><div class='ctx'> #define INIT_THREAD {							\</div><div class='hunk'>@@ -206,11 +187,7 @@ struct mm_struct;</div><div class='ctx'> struct seq_file;</div><div class='ctx'> struct pt_regs;</div><div class='ctx'> </div><div class='del'>-typedef int (*dump_trace_func_t)(void *data, unsigned long address, int reliable);</div><div class='del'>-void dump_trace(dump_trace_func_t func, void *data,</div><div class='del'>-		struct task_struct *task, unsigned long sp);</div><div class='ctx'> void show_registers(struct pt_regs *regs);</div><div class='del'>-</div><div class='ctx'> void show_cacheinfo(struct seq_file *m);</div><div class='ctx'> </div><div class='ctx'> /* Free all resources held by a thread. */</div><div class='hunk'>@@ -244,55 +221,6 @@ static __no_kasan_or_inline unsigned short stap(void)</div><div class='ctx'> 	return cpu_address;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CALL_ARGS_0()							\</div><div class='del'>-	register unsigned long r2 asm("2")</div><div class='del'>-#define CALL_ARGS_1(arg1)						\</div><div class='del'>-	register unsigned long r2 asm("2") = (unsigned long)(arg1)</div><div class='del'>-#define CALL_ARGS_2(arg1, arg2)						\</div><div class='del'>-	CALL_ARGS_1(arg1);						\</div><div class='del'>-	register unsigned long r3 asm("3") = (unsigned long)(arg2)</div><div class='del'>-#define CALL_ARGS_3(arg1, arg2, arg3)					\</div><div class='del'>-	CALL_ARGS_2(arg1, arg2);					\</div><div class='del'>-	register unsigned long r4 asm("4") = (unsigned long)(arg3)</div><div class='del'>-#define CALL_ARGS_4(arg1, arg2, arg3, arg4)				\</div><div class='del'>-	CALL_ARGS_3(arg1, arg2, arg3);					\</div><div class='del'>-	register unsigned long r4 asm("5") = (unsigned long)(arg4)</div><div class='del'>-#define CALL_ARGS_5(arg1, arg2, arg3, arg4, arg5)			\</div><div class='del'>-	CALL_ARGS_4(arg1, arg2, arg3, arg4);				\</div><div class='del'>-	register unsigned long r4 asm("6") = (unsigned long)(arg5)</div><div class='del'>-</div><div class='del'>-#define CALL_FMT_0</div><div class='del'>-#define CALL_FMT_1 CALL_FMT_0, "0" (r2)</div><div class='del'>-#define CALL_FMT_2 CALL_FMT_1, "d" (r3)</div><div class='del'>-#define CALL_FMT_3 CALL_FMT_2, "d" (r4)</div><div class='del'>-#define CALL_FMT_4 CALL_FMT_3, "d" (r5)</div><div class='del'>-#define CALL_FMT_5 CALL_FMT_4, "d" (r6)</div><div class='del'>-</div><div class='del'>-#define CALL_CLOBBER_5 "0", "1", "14", "cc", "memory"</div><div class='del'>-#define CALL_CLOBBER_4 CALL_CLOBBER_5</div><div class='del'>-#define CALL_CLOBBER_3 CALL_CLOBBER_4, "5"</div><div class='del'>-#define CALL_CLOBBER_2 CALL_CLOBBER_3, "4"</div><div class='del'>-#define CALL_CLOBBER_1 CALL_CLOBBER_2, "3"</div><div class='del'>-#define CALL_CLOBBER_0 CALL_CLOBBER_1</div><div class='del'>-</div><div class='del'>-#define CALL_ON_STACK(fn, stack, nr, args...)				\</div><div class='del'>-({									\</div><div class='del'>-	CALL_ARGS_##nr(args);						\</div><div class='del'>-	unsigned long prev;						\</div><div class='del'>-									\</div><div class='del'>-	asm volatile(							\</div><div class='del'>-		"	la	%[_prev],0(15)\n"			\</div><div class='del'>-		"	la	15,0(%[_stack])\n"			\</div><div class='del'>-		"	stg	%[_prev],%[_bc](15)\n"			\</div><div class='del'>-		"	brasl	14,%[_fn]\n"				\</div><div class='del'>-		"	la	15,0(%[_prev])\n"			\</div><div class='del'>-		: "+&amp;d" (r2), [_prev] "=&amp;a" (prev)			\</div><div class='del'>-		: [_stack] "a" (stack),					\</div><div class='del'>-		  [_bc] "i" (offsetof(struct stack_frame, back_chain)),	\</div><div class='del'>-		  [_fn] "X" (fn) CALL_FMT_##nr : CALL_CLOBBER_##nr);	\</div><div class='del'>-	r2;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Give up the time slice of the virtual PU.</div><div class='ctx'>  */</div><div class='hunk'>@@ -339,10 +267,10 @@ static __no_kasan_or_inline void __load_psw_mask(unsigned long mask)</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"	larl	%0,1f\n"</div><div class='del'>-		"	stg	%0,%O1+8(%R1)\n"</div><div class='del'>-		"	lpswe	%1\n"</div><div class='add'>+		"	stg	%0,%1\n"</div><div class='add'>+		"	lpswe	%2\n"</div><div class='ctx'> 		"1:"</div><div class='del'>-		: "=&amp;d" (addr), "=Q" (psw) : "Q" (psw) : "memory", "cc");</div><div class='add'>+		: "=&amp;d" (addr), "=Q" (psw.addr) : "Q" (psw) : "memory", "cc");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -387,12 +315,12 @@ void enabled_wait(void);</div><div class='ctx'> /*</div><div class='ctx'>  * Function to drop a processor into disabled wait state</div><div class='ctx'>  */</div><div class='del'>-static inline void __noreturn disabled_wait(unsigned long code)</div><div class='add'>+static inline void __noreturn disabled_wait(void)</div><div class='ctx'> {</div><div class='ctx'> 	psw_t psw;</div><div class='ctx'> </div><div class='ctx'> 	psw.mask = PSW_MASK_BASE | PSW_MASK_WAIT | PSW_MASK_BA | PSW_MASK_EA;</div><div class='del'>-	psw.addr = code;</div><div class='add'>+	psw.addr = _THIS_IP_;</div><div class='ctx'> 	__load_psw(psw);</div><div class='ctx'> 	while (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h<br/>index ef4c9dec06a4..f577c5f6031a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/sclp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/sclp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/sclp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/sclp.h</a></div><div class='hunk'>@@ -79,6 +79,9 @@ struct sclp_info {</div><div class='ctx'> 	unsigned char has_kss : 1;</div><div class='ctx'> 	unsigned char has_gisaf : 1;</div><div class='ctx'> 	unsigned char has_diag318 : 1;</div><div class='add'>+	unsigned char has_sipl : 1;</div><div class='add'>+	unsigned char has_sipl_g2 : 1;</div><div class='add'>+	unsigned char has_dirq : 1;</div><div class='ctx'> 	unsigned int ibc;</div><div class='ctx'> 	unsigned int mtid;</div><div class='ctx'> 	unsigned int mtid_cp;</div><div class='head'>diff --git a/arch/s390/include/asm/sections.h b/arch/s390/include/asm/sections.h<br/>index 7afe4620685c..42de04ad9c07 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/sections.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/sections.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/sections.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/sections.h</a></div><div class='hunk'>@@ -2,8 +2,20 @@</div><div class='ctx'> #ifndef _S390_SECTIONS_H</div><div class='ctx'> #define _S390_SECTIONS_H</div><div class='ctx'> </div><div class='add'>+#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/sections.h&gt;</div><div class='ctx'> </div><div class='add'>+extern bool initmem_freed;</div><div class='add'>+</div><div class='add'>+static inline int arch_is_kernel_initmem_freed(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	if (!initmem_freed)</div><div class='add'>+		return 0;</div><div class='add'>+	return addr &gt;= (unsigned long)__init_begin &amp;&amp;</div><div class='add'>+	       addr &lt; (unsigned long)__init_end;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * .boot.data section contains variables "shared" between the decompressor and</div><div class='ctx'>  * the decompressed kernel. The decompressor will store values in them, and</div><div class='hunk'>@@ -16,4 +28,14 @@</div><div class='ctx'>  */</div><div class='ctx'> #define __bootdata(var) __section(.boot.data.var) var</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * .boot.preserved.data is similar to .boot.data, but it is not part of the</div><div class='add'>+ * .init section and thus will be preserved for later use in the decompressed</div><div class='add'>+ * kernel.</div><div class='add'>+ */</div><div class='add'>+#define __bootdata_preserved(var) __section(.boot.preserved.data.var) var</div><div class='add'>+</div><div class='add'>+extern unsigned long __sdma, __edma;</div><div class='add'>+extern unsigned long __stext_dma, __etext_dma;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h<br/>index efda97804aa4..925889d360c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/setup.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/setup.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/setup.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/setup.h</a></div><div class='hunk'>@@ -12,7 +12,10 @@</div><div class='ctx'> #define EP_OFFSET		0x10008</div><div class='ctx'> #define EP_STRING		"S390EP"</div><div class='ctx'> #define PARMAREA		0x10400</div><div class='del'>-#define PARMAREA_END		0x11000</div><div class='add'>+#define EARLY_SCCB_OFFSET	0x11000</div><div class='add'>+#define HEAD_END		0x12000</div><div class='add'>+</div><div class='add'>+#define EARLY_SCCB_SIZE		PAGE_SIZE</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Machine features detected in early.c</div><div class='hunk'>@@ -65,6 +68,16 @@</div><div class='ctx'> #define OLDMEM_SIZE	(*(unsigned long *)  (OLDMEM_SIZE_OFFSET))</div><div class='ctx'> #define COMMAND_LINE	((char *)	     (COMMAND_LINE_OFFSET))</div><div class='ctx'> </div><div class='add'>+struct parmarea {</div><div class='add'>+	unsigned long ipl_device;			/* 0x10400 */</div><div class='add'>+	unsigned long initrd_start;			/* 0x10408 */</div><div class='add'>+	unsigned long initrd_size;			/* 0x10410 */</div><div class='add'>+	unsigned long oldmem_base;			/* 0x10418 */</div><div class='add'>+	unsigned long oldmem_size;			/* 0x10420 */</div><div class='add'>+	char pad1[0x10480 - 0x10428];			/* 0x10428 - 0x10480 */</div><div class='add'>+	char command_line[ARCH_COMMAND_LINE_SIZE];	/* 0x10480 */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern int noexec_disabled;</div><div class='ctx'> extern int memory_end_set;</div><div class='ctx'> extern unsigned long memory_end;</div><div class='hunk'>@@ -134,6 +147,12 @@ extern void (*_machine_restart)(char *command);</div><div class='ctx'> extern void (*_machine_halt)(void);</div><div class='ctx'> extern void (*_machine_power_off)(void);</div><div class='ctx'> </div><div class='add'>+extern unsigned long __kaslr_offset;</div><div class='add'>+static inline unsigned long kaslr_offset(void)</div><div class='add'>+{</div><div class='add'>+	return __kaslr_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #define IPL_DEVICE	(IPL_DEVICE_OFFSET)</div><div class='head'>diff --git a/arch/s390/include/asm/stacktrace.h b/arch/s390/include/asm/stacktrace.h<br/>new file mode 100644<br/>index 000000000000..49634bfbecdd<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/stacktrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/stacktrace.h</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_S390_STACKTRACE_H</div><div class='add'>+#define _ASM_S390_STACKTRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/switch_to.h&gt;</div><div class='add'>+</div><div class='add'>+enum stack_type {</div><div class='add'>+	STACK_TYPE_UNKNOWN,</div><div class='add'>+	STACK_TYPE_TASK,</div><div class='add'>+	STACK_TYPE_IRQ,</div><div class='add'>+	STACK_TYPE_NODAT,</div><div class='add'>+	STACK_TYPE_RESTART,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stack_info {</div><div class='add'>+	enum stack_type type;</div><div class='add'>+	unsigned long begin, end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *stack_type_name(enum stack_type type);</div><div class='add'>+int get_stack_info(unsigned long sp, struct task_struct *task,</div><div class='add'>+		   struct stack_info *info, unsigned long *visit_mask);</div><div class='add'>+</div><div class='add'>+static inline bool on_stack(struct stack_info *info,</div><div class='add'>+			    unsigned long addr, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;type == STACK_TYPE_UNKNOWN)</div><div class='add'>+		return false;</div><div class='add'>+	if (addr + len &lt; addr)</div><div class='add'>+		return false;</div><div class='add'>+	return addr &gt;= info-&gt;begin &amp;&amp; addr + len &lt; info-&gt;end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long get_stack_pointer(struct task_struct *task,</div><div class='add'>+					      struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (regs)</div><div class='add'>+		return (unsigned long) kernel_stack_pointer(regs);</div><div class='add'>+	if (task == current)</div><div class='add'>+		return current_stack_pointer();</div><div class='add'>+	return (unsigned long) task-&gt;thread.ksp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stack layout of a C stack frame.</div><div class='add'>+ */</div><div class='add'>+#ifndef __PACK_STACK</div><div class='add'>+struct stack_frame {</div><div class='add'>+	unsigned long back_chain;</div><div class='add'>+	unsigned long empty1[5];</div><div class='add'>+	unsigned long gprs[10];</div><div class='add'>+	unsigned int  empty2[8];</div><div class='add'>+};</div><div class='add'>+#else</div><div class='add'>+struct stack_frame {</div><div class='add'>+	unsigned long empty1[5];</div><div class='add'>+	unsigned int  empty2[8];</div><div class='add'>+	unsigned long gprs[10];</div><div class='add'>+	unsigned long back_chain;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define CALL_ARGS_0()							\</div><div class='add'>+	register unsigned long r2 asm("2")</div><div class='add'>+#define CALL_ARGS_1(arg1)						\</div><div class='add'>+	register unsigned long r2 asm("2") = (unsigned long)(arg1)</div><div class='add'>+#define CALL_ARGS_2(arg1, arg2)						\</div><div class='add'>+	CALL_ARGS_1(arg1);						\</div><div class='add'>+	register unsigned long r3 asm("3") = (unsigned long)(arg2)</div><div class='add'>+#define CALL_ARGS_3(arg1, arg2, arg3)					\</div><div class='add'>+	CALL_ARGS_2(arg1, arg2);					\</div><div class='add'>+	register unsigned long r4 asm("4") = (unsigned long)(arg3)</div><div class='add'>+#define CALL_ARGS_4(arg1, arg2, arg3, arg4)				\</div><div class='add'>+	CALL_ARGS_3(arg1, arg2, arg3);					\</div><div class='add'>+	register unsigned long r4 asm("5") = (unsigned long)(arg4)</div><div class='add'>+#define CALL_ARGS_5(arg1, arg2, arg3, arg4, arg5)			\</div><div class='add'>+	CALL_ARGS_4(arg1, arg2, arg3, arg4);				\</div><div class='add'>+	register unsigned long r4 asm("6") = (unsigned long)(arg5)</div><div class='add'>+</div><div class='add'>+#define CALL_FMT_0 "=&amp;d" (r2) :</div><div class='add'>+#define CALL_FMT_1 "+&amp;d" (r2) :</div><div class='add'>+#define CALL_FMT_2 CALL_FMT_1 "d" (r3),</div><div class='add'>+#define CALL_FMT_3 CALL_FMT_2 "d" (r4),</div><div class='add'>+#define CALL_FMT_4 CALL_FMT_3 "d" (r5),</div><div class='add'>+#define CALL_FMT_5 CALL_FMT_4 "d" (r6),</div><div class='add'>+</div><div class='add'>+#define CALL_CLOBBER_5 "0", "1", "14", "cc", "memory"</div><div class='add'>+#define CALL_CLOBBER_4 CALL_CLOBBER_5</div><div class='add'>+#define CALL_CLOBBER_3 CALL_CLOBBER_4, "5"</div><div class='add'>+#define CALL_CLOBBER_2 CALL_CLOBBER_3, "4"</div><div class='add'>+#define CALL_CLOBBER_1 CALL_CLOBBER_2, "3"</div><div class='add'>+#define CALL_CLOBBER_0 CALL_CLOBBER_1</div><div class='add'>+</div><div class='add'>+#define CALL_ON_STACK(fn, stack, nr, args...)				\</div><div class='add'>+({									\</div><div class='add'>+	CALL_ARGS_##nr(args);						\</div><div class='add'>+	unsigned long prev;						\</div><div class='add'>+									\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+		"	la	%[_prev],0(15)\n"			\</div><div class='add'>+		"	la	15,0(%[_stack])\n"			\</div><div class='add'>+		"	stg	%[_prev],%[_bc](15)\n"			\</div><div class='add'>+		"	brasl	14,%[_fn]\n"				\</div><div class='add'>+		"	la	15,0(%[_prev])\n"			\</div><div class='add'>+		: [_prev] "=&amp;a" (prev), CALL_FMT_##nr			\</div><div class='add'>+		  [_stack] "a" (stack),					\</div><div class='add'>+		  [_bc] "i" (offsetof(struct stack_frame, back_chain)),	\</div><div class='add'>+		  [_fn] "X" (fn) : CALL_CLOBBER_##nr);			\</div><div class='add'>+	r2;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_S390_STACKTRACE_H */</div><div class='head'>diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h<br/>index 96f9a9151fde..f073292e9fdb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/syscall.h</a></div><div class='hunk'>@@ -14,13 +14,8 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The syscall table always contains 32 bit pointers since we know that the</div><div class='del'>- * address of the function to be called is (way) below 4GB.  So the "int"</div><div class='del'>- * type here is what we want [need] for both 32 bit and 64 bit systems.</div><div class='del'>- */</div><div class='del'>-extern const unsigned int sys_call_table[];</div><div class='del'>-extern const unsigned int sys_call_table_emu[];</div><div class='add'>+extern const unsigned long sys_call_table[];</div><div class='add'>+extern const unsigned long sys_call_table_emu[];</div><div class='ctx'> </div><div class='ctx'> static inline long syscall_get_nr(struct task_struct *task,</div><div class='ctx'> 				  struct pt_regs *regs)</div><div class='hunk'>@@ -56,46 +51,38 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask = -1UL;</div><div class='add'>+	unsigned int n = 6;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * No arguments for this syscall, there's nothing to do.</div><div class='del'>-	 */</div><div class='del'>-	if (!n)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	if (test_tsk_thread_flag(task, TIF_31BIT))</div><div class='ctx'> 		mask = 0xffffffff;</div><div class='ctx'> #endif</div><div class='ctx'> 	while (n-- &gt; 0)</div><div class='del'>-		if (i + n &gt; 0)</div><div class='del'>-			args[n] = regs-&gt;gprs[2 + i + n] &amp; mask;</div><div class='del'>-	if (i == 0)</div><div class='del'>-		args[0] = regs-&gt;orig_gpr2 &amp; mask;</div><div class='add'>+		if (n &gt; 0)</div><div class='add'>+			args[n] = regs-&gt;gprs[2 + n] &amp; mask;</div><div class='add'>+</div><div class='add'>+	args[0] = regs-&gt;orig_gpr2 &amp; mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='add'>+	unsigned int n = 6;</div><div class='add'>+</div><div class='ctx'> 	while (n-- &gt; 0)</div><div class='del'>-		if (i + n &gt; 0)</div><div class='del'>-			regs-&gt;gprs[2 + i + n] = args[n];</div><div class='del'>-	if (i == 0)</div><div class='del'>-		regs-&gt;orig_gpr2 = args[0];</div><div class='add'>+		if (n &gt; 0)</div><div class='add'>+			regs-&gt;gprs[2 + n] = args[n];</div><div class='add'>+	regs-&gt;orig_gpr2 = args[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	if (test_tsk_thread_flag(current, TIF_31BIT))</div><div class='add'>+	if (test_tsk_thread_flag(task, TIF_31BIT))</div><div class='ctx'> 		return AUDIT_ARCH_S390;</div><div class='ctx'> #endif</div><div class='ctx'> 	return AUDIT_ARCH_S390X;</div><div class='head'>diff --git a/arch/s390/include/asm/syscall_wrapper.h b/arch/s390/include/asm/syscall_wrapper.h<br/>index 5596c5c625d2..3c3d6fe8e2f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/syscall_wrapper.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/syscall_wrapper.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/syscall_wrapper.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/syscall_wrapper.h</a></div><div class='hunk'>@@ -119,8 +119,8 @@</div><div class='ctx'> 		      "Type aliasing is used to sanitize syscall arguments");\</div><div class='ctx'> 	asmlinkage long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\</div><div class='ctx'> 		__attribute__((alias(__stringify(__se_sys##name))));		\</div><div class='del'>-	ALLOW_ERROR_INJECTION(__s390x_sys##name, ERRNO);				\</div><div class='del'>-	static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));		\</div><div class='add'>+	ALLOW_ERROR_INJECTION(__s390x_sys##name, ERRNO);			\</div><div class='add'>+	long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));			\</div><div class='ctx'> 	static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\</div><div class='ctx'> 	__S390_SYS_STUBx(x, name, __VA_ARGS__)					\</div><div class='ctx'> 	asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))		\</div><div class='head'>diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h<br/>index b31c779cf581..aa406c05a350 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/tlb.h</a></div><div class='hunk'>@@ -22,98 +22,39 @@</div><div class='ctx'>  * Pages used for the page tables is a different story. FIXME: more</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/tlbflush.h&gt;</div><div class='del'>-</div><div class='del'>-struct mmu_gather {</div><div class='del'>-	struct mm_struct *mm;</div><div class='del'>-	struct mmu_table_batch *batch;</div><div class='del'>-	unsigned int fullmm;</div><div class='del'>-	unsigned long start, end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mmu_table_batch {</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	unsigned int		nr;</div><div class='del'>-	void			*tables[0];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MAX_TABLE_BATCH		\</div><div class='del'>-	((PAGE_SIZE - sizeof(struct mmu_table_batch)) / sizeof(void *))</div><div class='del'>-</div><div class='del'>-extern void tlb_table_flush(struct mmu_gather *tlb);</div><div class='del'>-extern void tlb_remove_table(struct mmu_gather *tlb, void *table);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,</div><div class='del'>-			unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;mm = mm;</div><div class='del'>-	tlb-&gt;start = start;</div><div class='del'>-	tlb-&gt;end = end;</div><div class='del'>-	tlb-&gt;fullmm = !(start | (end+1));</div><div class='del'>-	tlb-&gt;batch = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	__tlb_flush_mm_lazy(tlb-&gt;mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_free(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	tlb_table_flush(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+void __tlb_remove_table(void *_table);</div><div class='add'>+static inline void tlb_flush(struct mmu_gather *tlb);</div><div class='add'>+static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='add'>+					  struct page *page, int page_size);</div><div class='ctx'> </div><div class='del'>-static inline void tlb_flush_mmu(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	tlb_flush_mmu_tlbonly(tlb);</div><div class='del'>-	tlb_flush_mmu_free(tlb);</div><div class='del'>-}</div><div class='add'>+#define tlb_start_vma(tlb, vma)			do { } while (0)</div><div class='add'>+#define tlb_end_vma(tlb, vma)			do { } while (0)</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_finish_mmu(struct mmu_gather *tlb,</div><div class='del'>-		unsigned long start, unsigned long end, bool force)</div><div class='del'>-{</div><div class='del'>-	if (force) {</div><div class='del'>-		tlb-&gt;start = start;</div><div class='del'>-		tlb-&gt;end = end;</div><div class='del'>-	}</div><div class='add'>+#define tlb_flush tlb_flush</div><div class='add'>+#define pte_free_tlb pte_free_tlb</div><div class='add'>+#define pmd_free_tlb pmd_free_tlb</div><div class='add'>+#define p4d_free_tlb p4d_free_tlb</div><div class='add'>+#define pud_free_tlb pud_free_tlb</div><div class='ctx'> </div><div class='del'>-	tlb_flush_mmu(tlb);</div><div class='del'>-}</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='add'>+#include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Release the page cache reference for a pte removed by</div><div class='ctx'>  * tlb_ptep_clear_flush. In both flush modes the tlb for a page cache page</div><div class='ctx'>  * has already been freed, so just do free_page_and_swap_cache.</div><div class='ctx'>  */</div><div class='del'>-static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	free_page_and_swap_cache(page);</div><div class='del'>-	return false; /* avoid calling tlb_flush_mmu */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	free_page_and_swap_cache(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					  struct page *page, int page_size)</div><div class='ctx'> {</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='add'>+	free_page_and_swap_cache(page);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					struct page *page, int page_size)</div><div class='add'>+static inline void tlb_flush(struct mmu_gather *tlb)</div><div class='ctx'> {</div><div class='del'>-	return tlb_remove_page(tlb, page);</div><div class='add'>+	__tlb_flush_mm_lazy(tlb-&gt;mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -121,8 +62,17 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'>  * page table from the tlb.</div><div class='ctx'>  */</div><div class='ctx'> static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,</div><div class='del'>-				unsigned long address)</div><div class='add'>+                                unsigned long address)</div><div class='ctx'> {</div><div class='add'>+	__tlb_adjust_range(tlb, address, PAGE_SIZE);</div><div class='add'>+	tlb-&gt;mm-&gt;context.flush_mm = 1;</div><div class='add'>+	tlb-&gt;freed_tables = 1;</div><div class='add'>+	tlb-&gt;cleared_ptes = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * page_table_free_rcu takes care of the allocation bit masks</div><div class='add'>+	 * of the 2K table fragments in the 4K page table page,</div><div class='add'>+	 * then calls tlb_remove_table.</div><div class='add'>+	 */</div><div class='ctx'> 	page_table_free_rcu(tlb, (unsigned long *) pte, address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -139,6 +89,10 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,</div><div class='ctx'> 	if (mm_pmd_folded(tlb-&gt;mm))</div><div class='ctx'> 		return;</div><div class='ctx'> 	pgtable_pmd_page_dtor(virt_to_page(pmd));</div><div class='add'>+	__tlb_adjust_range(tlb, address, PAGE_SIZE);</div><div class='add'>+	tlb-&gt;mm-&gt;context.flush_mm = 1;</div><div class='add'>+	tlb-&gt;freed_tables = 1;</div><div class='add'>+	tlb-&gt;cleared_puds = 1;</div><div class='ctx'> 	tlb_remove_table(tlb, pmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -154,6 +108,10 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,</div><div class='ctx'> {</div><div class='ctx'> 	if (mm_p4d_folded(tlb-&gt;mm))</div><div class='ctx'> 		return;</div><div class='add'>+	__tlb_adjust_range(tlb, address, PAGE_SIZE);</div><div class='add'>+	tlb-&gt;mm-&gt;context.flush_mm = 1;</div><div class='add'>+	tlb-&gt;freed_tables = 1;</div><div class='add'>+	tlb-&gt;cleared_p4ds = 1;</div><div class='ctx'> 	tlb_remove_table(tlb, p4d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -169,21 +127,11 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,</div><div class='ctx'> {</div><div class='ctx'> 	if (mm_pud_folded(tlb-&gt;mm))</div><div class='ctx'> 		return;</div><div class='add'>+	tlb-&gt;mm-&gt;context.flush_mm = 1;</div><div class='add'>+	tlb-&gt;freed_tables = 1;</div><div class='add'>+	tlb-&gt;cleared_puds = 1;</div><div class='ctx'> 	tlb_remove_table(tlb, pud);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define tlb_start_vma(tlb, vma)			do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)			do { } while (0)</div><div class='del'>-#define tlb_remove_tlb_entry(tlb, ptep, addr)	do { } while (0)</div><div class='del'>-#define tlb_remove_pmd_tlb_entry(tlb, pmdp, addr)	do { } while (0)</div><div class='del'>-#define tlb_migrate_finish(mm)			do { } while (0)</div><div class='del'>-#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='del'>-	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='del'>-static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='del'>-						     unsigned int page_size)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #endif /* _S390_TLB_H */</div><div class='head'>diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h<br/>index 007fcb9aeeb8..bd2fd9a7821d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/uaccess.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/uaccess.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/uaccess.h</a></div><div class='hunk'>@@ -55,8 +55,10 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n);</div><div class='ctx'> unsigned long __must_check</div><div class='ctx'> raw_copy_to_user(void __user *to, const void *from, unsigned long n);</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_KASAN</div><div class='ctx'> #define INLINE_COPY_FROM_USER</div><div class='ctx'> #define INLINE_COPY_TO_USER</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_MARCH_Z10_FEATURES</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/unwind.h b/arch/s390/include/asm/unwind.h<br/>new file mode 100644<br/>index 000000000000..6eb2ef105d87<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/unwind.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/unwind.h</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_S390_UNWIND_H</div><div class='add'>+#define _ASM_S390_UNWIND_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/ftrace.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To use the stack unwinder it has to be initialized with unwind_start.</div><div class='add'>+ * There four combinations for task and regs:</div><div class='add'>+ * 1) task==NULL, regs==NULL: the unwind starts for the task that is currently</div><div class='add'>+ *    running, sp/ip picked up from the CPU registers</div><div class='add'>+ * 2) task==NULL, regs!=NULL: the unwind starts from the sp/ip found in</div><div class='add'>+ *    the struct pt_regs of an interrupt frame for the current task</div><div class='add'>+ * 3) task!=NULL, regs==NULL: the unwind starts for an inactive task with</div><div class='add'>+ *    the sp picked up from task-&gt;thread.ksp and the ip picked up from the</div><div class='add'>+ *    return address stored by __switch_to</div><div class='add'>+ * 4) task!=NULL, regs!=NULL: the sp/ip are picked up from the interrupt</div><div class='add'>+ *    frame 'regs' of a inactive task</div><div class='add'>+ * If 'first_frame' is not zero unwind_start skips unwind frames until it</div><div class='add'>+ * reaches the specified stack pointer.</div><div class='add'>+ * The end of the unwinding is indicated with unwind_done, this can be true</div><div class='add'>+ * right after unwind_start, e.g. with first_frame!=0 that can not be found.</div><div class='add'>+ * unwind_next_frame skips to the next frame.</div><div class='add'>+ * Once the unwind is completed unwind_error() can be used to check if there</div><div class='add'>+ * has been a situation where the unwinder could not correctly understand</div><div class='add'>+ * the tasks call chain.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct unwind_state {</div><div class='add'>+	struct stack_info stack_info;</div><div class='add'>+	unsigned long stack_mask;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	struct pt_regs *regs;</div><div class='add'>+	unsigned long sp, ip;</div><div class='add'>+	int graph_idx;</div><div class='add'>+	bool reliable;</div><div class='add'>+	bool error;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __unwind_start(struct unwind_state *state, struct task_struct *task,</div><div class='add'>+		    struct pt_regs *regs, unsigned long first_frame);</div><div class='add'>+bool unwind_next_frame(struct unwind_state *state);</div><div class='add'>+unsigned long unwind_get_return_address(struct unwind_state *state);</div><div class='add'>+</div><div class='add'>+static inline bool unwind_done(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;stack_info.type == STACK_TYPE_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool unwind_error(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unwind_start(struct unwind_state *state,</div><div class='add'>+				struct task_struct *task,</div><div class='add'>+				struct pt_regs *regs,</div><div class='add'>+				unsigned long sp)</div><div class='add'>+{</div><div class='add'>+	sp = sp ? : get_stack_pointer(task, regs);</div><div class='add'>+	__unwind_start(state, task, regs, sp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	return unwind_done(state) ? NULL : state-&gt;regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define unwind_for_each_frame(state, task, regs, first_frame)	\</div><div class='add'>+	for (unwind_start(state, task, regs, first_frame);	\</div><div class='add'>+	     !unwind_done(state);				\</div><div class='add'>+	     unwind_next_frame(state))</div><div class='add'>+</div><div class='add'>+static inline void unwind_init(void) {}</div><div class='add'>+static inline void unwind_module_init(struct module *mod, void *orc_ip,</div><div class='add'>+				      size_t orc_ip_size, void *orc,</div><div class='add'>+				      size_t orc_size) {}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KASAN</div><div class='add'>+/*</div><div class='add'>+ * This disables KASAN checking when reading a value from another task's stack,</div><div class='add'>+ * since the other task could be running on another CPU and could have poisoned</div><div class='add'>+ * the stack in the meantime.</div><div class='add'>+ */</div><div class='add'>+#define READ_ONCE_TASK_STACK(task, x)			\</div><div class='add'>+({							\</div><div class='add'>+	unsigned long val;				\</div><div class='add'>+	if (task == current)				\</div><div class='add'>+		val = READ_ONCE(x);			\</div><div class='add'>+	else						\</div><div class='add'>+		val = READ_ONCE_NOCHECK(x);		\</div><div class='add'>+	val;						\</div><div class='add'>+})</div><div class='add'>+#else</div><div class='add'>+#define READ_ONCE_TASK_STACK(task, x) READ_ONCE(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_S390_UNWIND_H */</div><div class='head'>diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h<br/>new file mode 100644<br/>index 000000000000..ef3c00b049ab<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/uv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/uv.h</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Ultravisor Interfaces</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 2019</div><div class='add'>+ *</div><div class='add'>+ * Author(s):</div><div class='add'>+ *	Vasily Gorbik &lt;gor@linux.ibm.com&gt;</div><div class='add'>+ *	Janosch Frank &lt;frankja@linux.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_S390_UV_H</div><div class='add'>+#define _ASM_S390_UV_H</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/bug.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+#define UVC_RC_EXECUTED		0x0001</div><div class='add'>+#define UVC_RC_INV_CMD		0x0002</div><div class='add'>+#define UVC_RC_INV_STATE	0x0003</div><div class='add'>+#define UVC_RC_INV_LEN		0x0005</div><div class='add'>+#define UVC_RC_NO_RESUME	0x0007</div><div class='add'>+</div><div class='add'>+#define UVC_CMD_QUI			0x0001</div><div class='add'>+#define UVC_CMD_SET_SHARED_ACCESS	0x1000</div><div class='add'>+#define UVC_CMD_REMOVE_SHARED_ACCESS	0x1001</div><div class='add'>+</div><div class='add'>+/* Bits in installed uv calls */</div><div class='add'>+enum uv_cmds_inst {</div><div class='add'>+	BIT_UVC_CMD_QUI = 0,</div><div class='add'>+	BIT_UVC_CMD_SET_SHARED_ACCESS = 8,</div><div class='add'>+	BIT_UVC_CMD_REMOVE_SHARED_ACCESS = 9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct uv_cb_header {</div><div class='add'>+	u16 len;</div><div class='add'>+	u16 cmd;	/* Command Code */</div><div class='add'>+	u16 rc;		/* Response Code */</div><div class='add'>+	u16 rrc;	/* Return Reason Code */</div><div class='add'>+} __packed __aligned(8);</div><div class='add'>+</div><div class='add'>+struct uv_cb_qui {</div><div class='add'>+	struct uv_cb_header header;</div><div class='add'>+	u64 reserved08;</div><div class='add'>+	u64 inst_calls_list[4];</div><div class='add'>+	u64 reserved30[15];</div><div class='add'>+} __packed __aligned(8);</div><div class='add'>+</div><div class='add'>+struct uv_cb_share {</div><div class='add'>+	struct uv_cb_header header;</div><div class='add'>+	u64 reserved08[3];</div><div class='add'>+	u64 paddr;</div><div class='add'>+	u64 reserved28;</div><div class='add'>+} __packed __aligned(8);</div><div class='add'>+</div><div class='add'>+static inline int uv_call(unsigned long r1, unsigned long r2)</div><div class='add'>+{</div><div class='add'>+	int cc;</div><div class='add'>+</div><div class='add'>+	asm volatile(</div><div class='add'>+		"0:	.insn rrf,0xB9A40000,%[r1],%[r2],0,0\n"</div><div class='add'>+		"		brc	3,0b\n"</div><div class='add'>+		"		ipm	%[cc]\n"</div><div class='add'>+		"		srl	%[cc],28\n"</div><div class='add'>+		: [cc] "=d" (cc)</div><div class='add'>+		: [r1] "a" (r1), [r2] "a" (r2)</div><div class='add'>+		: "memory", "cc");</div><div class='add'>+	return cc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST</div><div class='add'>+extern int prot_virt_guest;</div><div class='add'>+</div><div class='add'>+static inline int is_prot_virt_guest(void)</div><div class='add'>+{</div><div class='add'>+	return prot_virt_guest;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int share(unsigned long addr, u16 cmd)</div><div class='add'>+{</div><div class='add'>+	struct uv_cb_share uvcb = {</div><div class='add'>+		.header.cmd = cmd,</div><div class='add'>+		.header.len = sizeof(uvcb),</div><div class='add'>+		.paddr = addr</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!is_prot_virt_guest())</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	/*</div><div class='add'>+	 * Sharing is page wise, if we encounter addresses that are</div><div class='add'>+	 * not page aligned, we assume something went wrong. If</div><div class='add'>+	 * malloced structs are passed to this function, we could leak</div><div class='add'>+	 * data to the hypervisor.</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(addr &amp; ~PAGE_MASK);</div><div class='add'>+</div><div class='add'>+	if (!uv_call(0, (u64)&amp;uvcb))</div><div class='add'>+		return 0;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Guest 2 request to the Ultravisor to make a page shared with the</div><div class='add'>+ * hypervisor for IO.</div><div class='add'>+ *</div><div class='add'>+ * @addr: Real or absolute address of the page to be shared</div><div class='add'>+ */</div><div class='add'>+static inline int uv_set_shared(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return share(addr, UVC_CMD_SET_SHARED_ACCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Guest 2 request to the Ultravisor to make a page unshared.</div><div class='add'>+ *</div><div class='add'>+ * @addr: Real or absolute address of the page to be unshared</div><div class='add'>+ */</div><div class='add'>+static inline int uv_remove_shared(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return share(addr, UVC_CMD_REMOVE_SHARED_ACCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void uv_query_info(void);</div><div class='add'>+#else</div><div class='add'>+#define is_prot_virt_guest() 0</div><div class='add'>+static inline int uv_set_shared(unsigned long addr) { return 0; }</div><div class='add'>+static inline int uv_remove_shared(unsigned long addr) { return 0; }</div><div class='add'>+static inline void uv_query_info(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_S390_UV_H */</div><div class='head'>diff --git a/arch/s390/include/asm/vmlinux.lds.h b/arch/s390/include/asm/vmlinux.lds.h<br/>index 2d127f900352..cbe670a6861b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/vmlinux.lds.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/include/asm/vmlinux.lds.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/asm/vmlinux.lds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/asm/vmlinux.lds.h</a></div><div class='hunk'>@@ -18,3 +18,16 @@</div><div class='ctx'> 		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.boot.data*)))		\</div><div class='ctx'> 		__boot_data_end = .;					\</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * .boot.preserved.data is similar to .boot.data, but it is not part of the</div><div class='add'>+ * .init section and thus will be preserved for later use in the decompressed</div><div class='add'>+ * kernel.</div><div class='add'>+ */</div><div class='add'>+#define BOOT_DATA_PRESERVED						\</div><div class='add'>+	. = ALIGN(PAGE_SIZE);						\</div><div class='add'>+	.boot.preserved.data : {					\</div><div class='add'>+		__boot_data_preserved_start = .;			\</div><div class='add'>+		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.boot.preserved.data*))) \</div><div class='add'>+		__boot_data_preserved_end = .;				\</div><div class='add'>+	}</div><div class='head'>diff --git a/arch/s390/include/uapi/asm/ipl.h b/arch/s390/include/uapi/asm/ipl.h<br/>new file mode 100644<br/>index 000000000000..fd32b1cd80d2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/include/uapi/asm/ipl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/include/uapi/asm/ipl.h</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_S390_UAPI_IPL_H</div><div class='add'>+#define _ASM_S390_UAPI_IPL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* IPL Parameter List header */</div><div class='add'>+struct ipl_pl_hdr {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u8  reserved1[2];</div><div class='add'>+	__u8  version;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IPL_PL_FLAG_IPLPS	0x80</div><div class='add'>+#define IPL_PL_FLAG_SIPL	0x40</div><div class='add'>+#define IPL_PL_FLAG_IPLSR	0x20</div><div class='add'>+</div><div class='add'>+/* IPL Parameter Block header */</div><div class='add'>+struct ipl_pb_hdr {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  pbt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* IPL Parameter Block types */</div><div class='add'>+enum ipl_pbt {</div><div class='add'>+	IPL_PBT_FCP = 0,</div><div class='add'>+	IPL_PBT_SCP_DATA = 1,</div><div class='add'>+	IPL_PBT_CCW = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IPL Parameter Block 0 with common fields */</div><div class='add'>+struct ipl_pb0_common {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  pbt;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u8  reserved1[2];</div><div class='add'>+	__u8  loadparm[8];</div><div class='add'>+	__u8  reserved2[84];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IPL_PB0_FLAG_LOADPARM	0x80</div><div class='add'>+</div><div class='add'>+/* IPL Parameter Block 0 for FCP */</div><div class='add'>+struct ipl_pb0_fcp {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  pbt;</div><div class='add'>+	__u8  reserved1[3];</div><div class='add'>+	__u8  loadparm[8];</div><div class='add'>+	__u8  reserved2[304];</div><div class='add'>+	__u8  opt;</div><div class='add'>+	__u8  reserved3[3];</div><div class='add'>+	__u8  cssid;</div><div class='add'>+	__u8  reserved4[1];</div><div class='add'>+	__u16 devno;</div><div class='add'>+	__u8  reserved5[4];</div><div class='add'>+	__u64 wwpn;</div><div class='add'>+	__u64 lun;</div><div class='add'>+	__u32 bootprog;</div><div class='add'>+	__u8  reserved6[12];</div><div class='add'>+	__u64 br_lba;</div><div class='add'>+	__u32 scp_data_len;</div><div class='add'>+	__u8  reserved7[260];</div><div class='add'>+	__u8  scp_data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IPL_PB0_FCP_OPT_IPL	0x10</div><div class='add'>+#define IPL_PB0_FCP_OPT_DUMP	0x20</div><div class='add'>+</div><div class='add'>+/* IPL Parameter Block 0 for CCW */</div><div class='add'>+struct ipl_pb0_ccw {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  pbt;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u8  reserved1[2];</div><div class='add'>+	__u8  loadparm[8];</div><div class='add'>+	__u8  reserved2[84];</div><div class='add'>+	__u16 reserved3 : 13;</div><div class='add'>+	__u8  ssid : 3;</div><div class='add'>+	__u16 devno;</div><div class='add'>+	__u8  vm_flags;</div><div class='add'>+	__u8  reserved4[3];</div><div class='add'>+	__u32 vm_parm_len;</div><div class='add'>+	__u8  nss_name[8];</div><div class='add'>+	__u8  vm_parm[64];</div><div class='add'>+	__u8  reserved5[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IPL_PB0_CCW_VM_FLAG_NSS		0x80</div><div class='add'>+#define IPL_PB0_CCW_VM_FLAG_VP		0x40</div><div class='add'>+</div><div class='add'>+/* IPL Parameter Block 1 for additional SCP data */</div><div class='add'>+struct ipl_pb1_scp_data {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  pbt;</div><div class='add'>+	__u8  scp_data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* IPL Report List header */</div><div class='add'>+struct ipl_rl_hdr {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u8  reserved1[2];</div><div class='add'>+	__u8  version;</div><div class='add'>+	__u8  reserved2[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* IPL Report Block header */</div><div class='add'>+struct ipl_rb_hdr {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  rbt;</div><div class='add'>+	__u8  reserved1[11];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* IPL Report Block types */</div><div class='add'>+enum ipl_rbt {</div><div class='add'>+	IPL_RBT_CERTIFICATES = 1,</div><div class='add'>+	IPL_RBT_COMPONENTS = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IPL Report Block for the certificate list */</div><div class='add'>+struct ipl_rb_certificate_entry {</div><div class='add'>+	__u64 addr;</div><div class='add'>+	__u64 len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ipl_rb_certificates {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  rbt;</div><div class='add'>+	__u8  reserved1[11];</div><div class='add'>+	struct ipl_rb_certificate_entry entries[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* IPL Report Block for the component list */</div><div class='add'>+struct ipl_rb_component_entry {</div><div class='add'>+	__u64 addr;</div><div class='add'>+	__u64 len;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u8  reserved1[5];</div><div class='add'>+	__u16 certificate_index;</div><div class='add'>+	__u8  reserved2[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IPL_RB_COMPONENT_FLAG_SIGNED	0x80</div><div class='add'>+#define IPL_RB_COMPONENT_FLAG_VERIFIED	0x40</div><div class='add'>+</div><div class='add'>+struct ipl_rb_components {</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u8  rbt;</div><div class='add'>+	__u8  reserved1[11];</div><div class='add'>+	struct ipl_rb_component_entry entries[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile<br/>index 8a62c7f72e1b..b0478d01a0c5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/Makefile</a></div><div class='hunk'>@@ -39,6 +39,7 @@ CFLAGS_smp.o		:= -Wno-nonnull</div><div class='ctx'> #</div><div class='ctx'> CFLAGS_stacktrace.o	+= -fno-optimize-sibling-calls</div><div class='ctx'> CFLAGS_dumpstack.o	+= -fno-optimize-sibling-calls</div><div class='add'>+CFLAGS_unwind_bc.o	+= -fno-optimize-sibling-calls</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Pass UTS_MACHINE for user_regset definition</div><div class='hunk'>@@ -51,7 +52,7 @@ obj-y	+= debug.o irq.o ipl.o dis.o diag.o vdso.o early_nobss.o</div><div class='ctx'> obj-y	+= sysinfo.o lgr.o os_info.o machine_kexec.o pgm_check.o</div><div class='ctx'> obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o</div><div class='ctx'> obj-y	+= entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o</div><div class='del'>-obj-y	+= nospec-branch.o ipl_vmparm.o</div><div class='add'>+obj-y	+= nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o</div><div class='ctx'> </div><div class='ctx'> extra-y				+= head64.o vmlinux.lds</div><div class='ctx'> </div><div class='hunk'>@@ -77,6 +78,8 @@ obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o</div><div class='ctx'> obj-$(CONFIG_KEXEC_FILE)	+= machine_kexec_file.o kexec_image.o</div><div class='ctx'> obj-$(CONFIG_KEXEC_FILE)	+= kexec_elf.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_IMA)		+= ima_arch.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf_common.o</div><div class='ctx'> obj-$(CONFIG_PERF_EVENTS)	+= perf_cpum_cf.o perf_cpum_sf.o</div><div class='ctx'> obj-$(CONFIG_PERF_EVENTS)	+= perf_cpum_cf_events.o perf_regs.o</div><div class='hunk'>@@ -86,7 +89,7 @@ obj-$(CONFIG_TRACEPOINTS)	+= trace.o</div><div class='ctx'> </div><div class='ctx'> # vdso</div><div class='ctx'> obj-y				+= vdso64/</div><div class='del'>-obj-$(CONFIG_COMPAT)		+= vdso32/</div><div class='add'>+obj-$(CONFIG_COMPAT_VDSO)	+= vdso32/</div><div class='ctx'> </div><div class='ctx'> chkbss := head64.o early_nobss.o</div><div class='ctx'> include $(srctree)/arch/s390/scripts/Makefile.chkbss</div><div class='head'>diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c<br/>index 164bec175628..41ac4ad21311 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/asm-offsets.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/asm-offsets.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/asm-offsets.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/gmap.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kernel/base.S b/arch/s390/kernel/base.S<br/>index f268fca67e82..2f39ea57f358 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/base.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/base.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/base.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/base.S</a></div><div class='hunk'>@@ -28,6 +28,7 @@ ENTRY(s390_base_mcck_handler)</div><div class='ctx'> 1:	la	%r1,4095</div><div class='ctx'> 	lmg	%r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)</div><div class='ctx'> 	lpswe	__LC_MCK_OLD_PSW</div><div class='add'>+ENDPROC(s390_base_mcck_handler)</div><div class='ctx'> </div><div class='ctx'> 	.section .bss</div><div class='ctx'> 	.align 8</div><div class='hunk'>@@ -48,6 +49,7 @@ ENTRY(s390_base_ext_handler)</div><div class='ctx'> 1:	lmg	%r0,%r15,__LC_SAVE_AREA_ASYNC</div><div class='ctx'> 	ni	__LC_EXT_OLD_PSW+1,0xfd	# clear wait state bit</div><div class='ctx'> 	lpswe	__LC_EXT_OLD_PSW</div><div class='add'>+ENDPROC(s390_base_ext_handler)</div><div class='ctx'> </div><div class='ctx'> 	.section .bss</div><div class='ctx'> 	.align 8</div><div class='hunk'>@@ -68,6 +70,7 @@ ENTRY(s390_base_pgm_handler)</div><div class='ctx'> 	lmg	%r0,%r15,__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	lpswe	__LC_PGM_OLD_PSW</div><div class='ctx'> 1:	lpswe	disabled_wait_psw-0b(%r13)</div><div class='add'>+ENDPROC(s390_base_pgm_handler)</div><div class='ctx'> </div><div class='ctx'> 	.align	8</div><div class='ctx'> disabled_wait_psw:</div><div class='hunk'>@@ -79,71 +82,3 @@ disabled_wait_psw:</div><div class='ctx'> s390_base_pgm_handler_fn:</div><div class='ctx'> 	.quad	0</div><div class='ctx'> 	.previous</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Calls diag 308 subcode 1 and continues execution</div><div class='del'>-#</div><div class='del'>-ENTRY(diag308_reset)</div><div class='del'>-	larl	%r4,.Lctlregs		# Save control registers</div><div class='del'>-	stctg	%c0,%c15,0(%r4)</div><div class='del'>-	lg	%r2,0(%r4)		# Disable lowcore protection</div><div class='del'>-	nilh	%r2,0xefff</div><div class='del'>-	larl	%r4,.Lctlreg0</div><div class='del'>-	stg	%r2,0(%r4)</div><div class='del'>-	lctlg	%c0,%c0,0(%r4)</div><div class='del'>-	larl	%r4,.Lfpctl		# Floating point control register</div><div class='del'>-	stfpc	0(%r4)</div><div class='del'>-	larl	%r4,.Lprefix		# Save prefix register</div><div class='del'>-	stpx	0(%r4)</div><div class='del'>-	larl	%r4,.Lprefix_zero	# Set prefix register to 0</div><div class='del'>-	spx	0(%r4)</div><div class='del'>-	larl	%r4,.Lcontinue_psw	# Save PSW flags</div><div class='del'>-	epsw	%r2,%r3</div><div class='del'>-	stm	%r2,%r3,0(%r4)</div><div class='del'>-	larl	%r4,.Lrestart_psw	# Setup restart PSW at absolute 0</div><div class='del'>-	lghi	%r3,0</div><div class='del'>-	lg	%r4,0(%r4)		# Save PSW</div><div class='del'>-	sturg	%r4,%r3			# Use sturg, because of large pages</div><div class='del'>-	lghi	%r1,1</div><div class='del'>-	lghi	%r0,0</div><div class='del'>-	diag	%r0,%r1,0x308</div><div class='del'>-.Lrestart_part2:</div><div class='del'>-	lhi	%r0,0			# Load r0 with zero</div><div class='del'>-	lhi	%r1,2			# Use mode 2 = ESAME (dump)</div><div class='del'>-	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE	# Switch to ESAME mode</div><div class='del'>-	sam64				# Switch to 64 bit addressing mode</div><div class='del'>-	larl	%r4,.Lctlregs		# Restore control registers</div><div class='del'>-	lctlg	%c0,%c15,0(%r4)</div><div class='del'>-	larl	%r4,.Lfpctl		# Restore floating point ctl register</div><div class='del'>-	lfpc	0(%r4)</div><div class='del'>-	larl	%r4,.Lprefix		# Restore prefix register</div><div class='del'>-	spx	0(%r4)</div><div class='del'>-	larl	%r4,.Lcontinue_psw	# Restore PSW flags</div><div class='del'>-	lpswe	0(%r4)</div><div class='del'>-.Lcontinue:</div><div class='del'>-	BR_EX	%r14</div><div class='del'>-.align 16</div><div class='del'>-.Lrestart_psw:</div><div class='del'>-	.long	0x00080000,0x80000000 + .Lrestart_part2</div><div class='del'>-</div><div class='del'>-	.section .data..nosave,"aw",@progbits</div><div class='del'>-.align 8</div><div class='del'>-.Lcontinue_psw:</div><div class='del'>-	.quad	0,.Lcontinue</div><div class='del'>-	.previous</div><div class='del'>-</div><div class='del'>-	.section .bss</div><div class='del'>-.align 8</div><div class='del'>-.Lctlreg0:</div><div class='del'>-	.quad	0</div><div class='del'>-.Lctlregs:</div><div class='del'>-	.rept	16</div><div class='del'>-	.quad	0</div><div class='del'>-	.endr</div><div class='del'>-.Lfpctl:</div><div class='del'>-	.long	0</div><div class='del'>-.Lprefix:</div><div class='del'>-	.long	0</div><div class='del'>-.Lprefix_zero:</div><div class='del'>-	.long	0</div><div class='del'>-	.previous</div><div class='head'>diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c<br/>index 7edaa733a77f..e9dac9a24d3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/diag.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/diag.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/diag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/diag.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;asm/diag.h&gt;</div><div class='ctx'> #include &lt;asm/trace/diag.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct diag_stat {</div><div class='ctx'> 	unsigned int counter[NR_DIAG_STAT];</div><div class='hunk'>@@ -49,6 +50,9 @@ static const struct diag_desc diag_map[NR_DIAG_STAT] = {</div><div class='ctx'> 	[DIAG_STAT_X500] = { .code = 0x500, .name = "Virtio Service" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct diag_ops __bootdata_preserved(diag_dma_ops);</div><div class='add'>+struct diag210 *__bootdata_preserved(__diag210_tmp_dma);</div><div class='add'>+</div><div class='ctx'> static int show_diag_stat(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct diag_stat *stat;</div><div class='hunk'>@@ -139,30 +143,10 @@ EXPORT_SYMBOL(diag_stat_inc_norecursion);</div><div class='ctx'> /*</div><div class='ctx'>  * Diagnose 14: Input spool file manipulation</div><div class='ctx'>  */</div><div class='del'>-static inline int __diag14(unsigned long rx, unsigned long ry1,</div><div class='del'>-			   unsigned long subcode)</div><div class='del'>-{</div><div class='del'>-	register unsigned long _ry1 asm("2") = ry1;</div><div class='del'>-	register unsigned long _ry2 asm("3") = subcode;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	asm volatile(</div><div class='del'>-		"   sam31\n"</div><div class='del'>-		"   diag    %2,2,0x14\n"</div><div class='del'>-		"   sam64\n"</div><div class='del'>-		"   ipm     %0\n"</div><div class='del'>-		"   srl     %0,28\n"</div><div class='del'>-		: "=d" (rc), "+d" (_ry2)</div><div class='del'>-		: "d" (rx), "d" (_ry1)</div><div class='del'>-		: "cc");</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)</div><div class='ctx'> {</div><div class='ctx'> 	diag_stat_inc(DIAG_STAT_X014);</div><div class='del'>-	return __diag14(rx, ry1, subcode);</div><div class='add'>+	return diag_dma_ops.diag14(rx, ry1, subcode);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(diag14);</div><div class='ctx'> </div><div class='hunk'>@@ -195,30 +179,17 @@ EXPORT_SYMBOL(diag204);</div><div class='ctx'>  */</div><div class='ctx'> int diag210(struct diag210 *addr)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * diag 210 needs its data below the 2GB border, so we</div><div class='del'>-	 * use a static data area to be sure</div><div class='del'>-	 */</div><div class='del'>-	static struct diag210 diag210_tmp;</div><div class='ctx'> 	static DEFINE_SPINLOCK(diag210_lock);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ccode;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;diag210_lock, flags);</div><div class='del'>-	diag210_tmp = *addr;</div><div class='add'>+	*__diag210_tmp_dma = *addr;</div><div class='ctx'> </div><div class='ctx'> 	diag_stat_inc(DIAG_STAT_X210);</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	lhi	%0,-1\n"</div><div class='del'>-		"	sam31\n"</div><div class='del'>-		"	diag	%1,0,0x210\n"</div><div class='del'>-		"0:	ipm	%0\n"</div><div class='del'>-		"	srl	%0,28\n"</div><div class='del'>-		"1:	sam64\n"</div><div class='del'>-		EX_TABLE(0b, 1b)</div><div class='del'>-		: "=&amp;d" (ccode) : "a" (&amp;diag210_tmp) : "cc", "memory");</div><div class='del'>-</div><div class='del'>-	*addr = diag210_tmp;</div><div class='add'>+	ccode = diag_dma_ops.diag210(__diag210_tmp_dma);</div><div class='add'>+</div><div class='add'>+	*addr = *__diag210_tmp_dma;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;diag210_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return ccode;</div><div class='hunk'>@@ -243,27 +214,9 @@ EXPORT_SYMBOL(diag224);</div><div class='ctx'> /*</div><div class='ctx'>  * Diagnose 26C: Access Certain System Information</div><div class='ctx'>  */</div><div class='del'>-static inline int __diag26c(void *req, void *resp, enum diag26c_sc subcode)</div><div class='del'>-{</div><div class='del'>-	register unsigned long _req asm("2") = (addr_t) req;</div><div class='del'>-	register unsigned long _resp asm("3") = (addr_t) resp;</div><div class='del'>-	register unsigned long _subcode asm("4") = subcode;</div><div class='del'>-	register unsigned long _rc asm("5") = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	sam31\n"</div><div class='del'>-		"	diag	%[rx],%[ry],0x26c\n"</div><div class='del'>-		"0:	sam64\n"</div><div class='del'>-		EX_TABLE(0b,0b)</div><div class='del'>-		: "+d" (_rc)</div><div class='del'>-		: [rx] "d" (_req), "d" (_resp), [ry] "d" (_subcode)</div><div class='del'>-		: "cc", "memory");</div><div class='del'>-	return _rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int diag26c(void *req, void *resp, enum diag26c_sc subcode)</div><div class='ctx'> {</div><div class='ctx'> 	diag_stat_inc(DIAG_STAT_X26C);</div><div class='del'>-	return __diag26c(req, resp, subcode);</div><div class='add'>+	return diag_dma_ops.diag26c(req, resp, subcode);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(diag26c);</div><div class='head'>diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c<br/>index cb7f55bbe06e..9e87b68be21c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/dumpstack.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/dumpstack.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/dumpstack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/dumpstack.c</a></div><div class='hunk'>@@ -21,95 +21,124 @@</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/dis.h&gt;</div><div class='ctx'> #include &lt;asm/ipl.h&gt;</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * For dump_trace we have tree different stack to consider:</div><div class='del'>- *   - the panic stack which is used if the kernel stack has overflown</div><div class='del'>- *   - the asynchronous interrupt stack (cpu related)</div><div class='del'>- *   - the synchronous kernel stack (process related)</div><div class='del'>- * The stack trace can start at any of the three stacks and can potentially</div><div class='del'>- * touch all of them. The order is: panic stack, async stack, sync stack.</div><div class='del'>- */</div><div class='del'>-static unsigned long __no_sanitize_address</div><div class='del'>-__dump_trace(dump_trace_func_t func, void *data, unsigned long sp,</div><div class='del'>-	     unsigned long low, unsigned long high)</div><div class='add'>+const char *stack_type_name(enum stack_type type)</div><div class='ctx'> {</div><div class='del'>-	struct stack_frame *sf;</div><div class='del'>-	struct pt_regs *regs;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (sp &lt; low || sp &gt; high - sizeof(*sf))</div><div class='del'>-			return sp;</div><div class='del'>-		sf = (struct stack_frame *) sp;</div><div class='del'>-		if (func(data, sf-&gt;gprs[8], 0))</div><div class='del'>-			return sp;</div><div class='del'>-		/* Follow the backchain. */</div><div class='del'>-		while (1) {</div><div class='del'>-			low = sp;</div><div class='del'>-			sp = sf-&gt;back_chain;</div><div class='del'>-			if (!sp)</div><div class='del'>-				break;</div><div class='del'>-			if (sp &lt;= low || sp &gt; high - sizeof(*sf))</div><div class='del'>-				return sp;</div><div class='del'>-			sf = (struct stack_frame *) sp;</div><div class='del'>-			if (func(data, sf-&gt;gprs[8], 1))</div><div class='del'>-				return sp;</div><div class='del'>-		}</div><div class='del'>-		/* Zero backchain detected, check for interrupt frame. */</div><div class='del'>-		sp = (unsigned long) (sf + 1);</div><div class='del'>-		if (sp &lt;= low || sp &gt; high - sizeof(*regs))</div><div class='del'>-			return sp;</div><div class='del'>-		regs = (struct pt_regs *) sp;</div><div class='del'>-		if (!user_mode(regs)) {</div><div class='del'>-			if (func(data, regs-&gt;psw.addr, 1))</div><div class='del'>-				return sp;</div><div class='del'>-		}</div><div class='del'>-		low = sp;</div><div class='del'>-		sp = regs-&gt;gprs[15];</div><div class='add'>+	switch (type) {</div><div class='add'>+	case STACK_TYPE_TASK:</div><div class='add'>+		return "task";</div><div class='add'>+	case STACK_TYPE_IRQ:</div><div class='add'>+		return "irq";</div><div class='add'>+	case STACK_TYPE_NODAT:</div><div class='add'>+		return "nodat";</div><div class='add'>+	case STACK_TYPE_RESTART:</div><div class='add'>+		return "restart";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dump_trace(dump_trace_func_t func, void *data, struct task_struct *task,</div><div class='del'>-		unsigned long sp)</div><div class='add'>+static inline bool in_stack(unsigned long sp, struct stack_info *info,</div><div class='add'>+			    enum stack_type type, unsigned long low,</div><div class='add'>+			    unsigned long high)</div><div class='add'>+{</div><div class='add'>+	if (sp &lt; low || sp &gt;= high)</div><div class='add'>+		return false;</div><div class='add'>+	info-&gt;type = type;</div><div class='add'>+	info-&gt;begin = low;</div><div class='add'>+	info-&gt;end = high;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool in_task_stack(unsigned long sp, struct task_struct *task,</div><div class='add'>+			  struct stack_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned long stack;</div><div class='add'>+</div><div class='add'>+	stack = (unsigned long) task_stack_page(task);</div><div class='add'>+	return in_stack(sp, info, STACK_TYPE_TASK, stack, stack + THREAD_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool in_irq_stack(unsigned long sp, struct stack_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned long frame_size;</div><div class='add'>+	unsigned long frame_size, top;</div><div class='ctx'> </div><div class='ctx'> 	frame_size = STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);</div><div class='del'>-#ifdef CONFIG_CHECK_STACK</div><div class='del'>-	sp = __dump_trace(func, data, sp,</div><div class='del'>-			  S390_lowcore.nodat_stack + frame_size - THREAD_SIZE,</div><div class='del'>-			  S390_lowcore.nodat_stack + frame_size);</div><div class='del'>-#endif</div><div class='del'>-	sp = __dump_trace(func, data, sp,</div><div class='del'>-			  S390_lowcore.async_stack + frame_size - THREAD_SIZE,</div><div class='del'>-			  S390_lowcore.async_stack + frame_size);</div><div class='del'>-	task = task ?: current;</div><div class='del'>-	__dump_trace(func, data, sp,</div><div class='del'>-		     (unsigned long)task_stack_page(task),</div><div class='del'>-		     (unsigned long)task_stack_page(task) + THREAD_SIZE);</div><div class='add'>+	top = S390_lowcore.async_stack + frame_size;</div><div class='add'>+	return in_stack(sp, info, STACK_TYPE_IRQ, top - THREAD_SIZE, top);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool in_nodat_stack(unsigned long sp, struct stack_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned long frame_size, top;</div><div class='add'>+</div><div class='add'>+	frame_size = STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);</div><div class='add'>+	top = S390_lowcore.nodat_stack + frame_size;</div><div class='add'>+	return in_stack(sp, info, STACK_TYPE_NODAT, top - THREAD_SIZE, top);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dump_trace);</div><div class='ctx'> </div><div class='del'>-static int show_address(void *data, unsigned long address, int reliable)</div><div class='add'>+static bool in_restart_stack(unsigned long sp, struct stack_info *info)</div><div class='ctx'> {</div><div class='del'>-	if (reliable)</div><div class='del'>-		printk(" [&lt;%016lx&gt;] %pSR \n", address, (void *)address);</div><div class='del'>-	else</div><div class='del'>-		printk("([&lt;%016lx&gt;] %pSR)\n", address, (void *)address);</div><div class='add'>+	unsigned long frame_size, top;</div><div class='add'>+</div><div class='add'>+	frame_size = STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);</div><div class='add'>+	top = S390_lowcore.restart_stack + frame_size;</div><div class='add'>+	return in_stack(sp, info, STACK_TYPE_RESTART, top - THREAD_SIZE, top);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_stack_info(unsigned long sp, struct task_struct *task,</div><div class='add'>+		   struct stack_info *info, unsigned long *visit_mask)</div><div class='add'>+{</div><div class='add'>+	if (!sp)</div><div class='add'>+		goto unknown;</div><div class='add'>+</div><div class='add'>+	task = task ? : current;</div><div class='add'>+</div><div class='add'>+	/* Check per-task stack */</div><div class='add'>+	if (in_task_stack(sp, task, info))</div><div class='add'>+		goto recursion_check;</div><div class='add'>+</div><div class='add'>+	if (task != current)</div><div class='add'>+		goto unknown;</div><div class='add'>+</div><div class='add'>+	/* Check per-cpu stacks */</div><div class='add'>+	if (!in_irq_stack(sp, info) &amp;&amp;</div><div class='add'>+	    !in_nodat_stack(sp, info) &amp;&amp;</div><div class='add'>+	    !in_restart_stack(sp, info))</div><div class='add'>+		goto unknown;</div><div class='add'>+</div><div class='add'>+recursion_check:</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure we don't iterate through any given stack more than once.</div><div class='add'>+	 * If it comes up a second time then there's something wrong going on:</div><div class='add'>+	 * just break out and report an unknown stack type.</div><div class='add'>+	 */</div><div class='add'>+	if (*visit_mask &amp; (1UL &lt;&lt; info-&gt;type)) {</div><div class='add'>+		printk_deferred_once(KERN_WARNING</div><div class='add'>+			"WARNING: stack recursion on stack type %d\n",</div><div class='add'>+			info-&gt;type);</div><div class='add'>+		goto unknown;</div><div class='add'>+	}</div><div class='add'>+	*visit_mask |= 1UL &lt;&lt; info-&gt;type;</div><div class='ctx'> 	return 0;</div><div class='add'>+unknown:</div><div class='add'>+	info-&gt;type = STACK_TYPE_UNKNOWN;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long sp = (unsigned long) stack;</div><div class='add'>+	struct unwind_state state;</div><div class='ctx'> </div><div class='del'>-	if (!sp)</div><div class='del'>-		sp = task ? task-&gt;thread.ksp : current_stack_pointer();</div><div class='ctx'> 	printk("Call Trace:\n");</div><div class='del'>-	dump_trace(show_address, NULL, task, sp);</div><div class='ctx'> 	if (!task)</div><div class='ctx'> 		task = current;</div><div class='del'>-	debug_show_held_locks(task);</div><div class='add'>+	unwind_for_each_frame(&amp;state, task, NULL, (unsigned long) stack)</div><div class='add'>+		printk(state.reliable ? " [&lt;%016lx&gt;] %pSR \n" :</div><div class='add'>+					"([&lt;%016lx&gt;] %pSR)\n",</div><div class='add'>+		       state.ip, (void *) state.ip);</div><div class='add'>+	debug_show_held_locks(task ? : current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void show_last_breaking_event(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c<br/>index d6edf45f93b9..629f173f60cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/early.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/early.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/early.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/early.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/boot_data.h&gt;</div><div class='add'>+#include &lt;asm/pci_insn.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -138,9 +139,9 @@ static void early_pgm_check_handler(void)</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = S390_lowcore.program_old_psw.addr;</div><div class='del'>-	fixup = search_exception_tables(addr);</div><div class='add'>+	fixup = s390_search_extables(addr);</div><div class='ctx'> 	if (!fixup)</div><div class='del'>-		disabled_wait(0);</div><div class='add'>+		disabled_wait();</div><div class='ctx'> 	/* Disable low address protection before storing into lowcore. */</div><div class='ctx'> 	__ctl_store(cr0, 0, 0);</div><div class='ctx'> 	cr0_new = cr0 &amp; ~(1UL &lt;&lt; 28);</div><div class='hunk'>@@ -235,6 +236,7 @@ static __init void detect_machine_facilities(void)</div><div class='ctx'> 		clock_comparator_max = -1ULL &gt;&gt; 1;</div><div class='ctx'> 		__ctl_set_bit(0, 53);</div><div class='ctx'> 	}</div><div class='add'>+	enable_mio_ctl();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void save_vector_registers(void)</div><div class='hunk'>@@ -296,7 +298,7 @@ static void __init check_image_bootable(void)</div><div class='ctx'> 	sclp_early_printk("Linux kernel boot failure: An attempt to boot a vmlinux ELF image failed.\n");</div><div class='ctx'> 	sclp_early_printk("This image does not contain all parts necessary for starting up. Use\n");</div><div class='ctx'> 	sclp_early_printk("bzImage or arch/s390/boot/compressed/vmlinux instead.\n");</div><div class='del'>-	disabled_wait(0xbadb007);</div><div class='add'>+	disabled_wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init startup_init(void)</div><div class='hunk'>@@ -309,7 +311,6 @@ void __init startup_init(void)</div><div class='ctx'> 	setup_facility_list();</div><div class='ctx'> 	detect_machine_type();</div><div class='ctx'> 	setup_arch_string();</div><div class='del'>-	ipl_store_parameters();</div><div class='ctx'> 	setup_boot_command_line();</div><div class='ctx'> 	detect_diag9c();</div><div class='ctx'> 	detect_diag44();</div><div class='head'>diff --git a/arch/s390/kernel/early_nobss.c b/arch/s390/kernel/early_nobss.c<br/>index 8d73f7fae16e..52a3ef959341 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/early_nobss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/early_nobss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/early_nobss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/early_nobss.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ static void __init reset_tod_clock(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* TOD clock not running. Set the clock to Unix Epoch. */</div><div class='ctx'> 	if (set_tod_clock(TOD_UNIX_EPOCH) != 0 || store_tod_clock(&amp;time) != 0)</div><div class='del'>-		disabled_wait(0);</div><div class='add'>+		disabled_wait();</div><div class='ctx'> </div><div class='ctx'> 	memset(tod_clock_base, 0, 16);</div><div class='ctx'> 	*(__u64 *) &amp;tod_clock_base[1] = TOD_UNIX_EPOCH;</div><div class='head'>diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S<br/>index 583d65ef5007..3f4d272577d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/entry.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/entry.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/entry.S</a></div><div class='hunk'>@@ -224,6 +224,7 @@ ENTRY(__bpon)</div><div class='ctx'> 	.globl __bpon</div><div class='ctx'> 	BPON</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(__bpon)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Scheduler resume function, called by switch_to</div><div class='hunk'>@@ -248,6 +249,7 @@ ENTRY(__switch_to)</div><div class='ctx'> 	lmg	%r6,%r15,__SF_GPRS(%r15)	# load gprs of next task</div><div class='ctx'> 	ALTERNATIVE "", ".insn s,0xb2800000,_LPP_OFFSET", 40</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(__switch_to)</div><div class='ctx'> </div><div class='ctx'> .L__critical_start:</div><div class='ctx'> </div><div class='hunk'>@@ -324,6 +326,7 @@ sie_exit:</div><div class='ctx'> 	EX_TABLE(.Lrewind_pad4,.Lsie_fault)</div><div class='ctx'> 	EX_TABLE(.Lrewind_pad2,.Lsie_fault)</div><div class='ctx'> 	EX_TABLE(sie_exit,.Lsie_fault)</div><div class='add'>+ENDPROC(sie64a)</div><div class='ctx'> EXPORT_SYMBOL(sie64a)</div><div class='ctx'> EXPORT_SYMBOL(sie_exit)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -358,19 +361,19 @@ ENTRY(system_call)</div><div class='ctx'> 	# load address of system call table</div><div class='ctx'> 	lg	%r10,__THREAD_sysc_table(%r13,%r12)</div><div class='ctx'> 	llgh	%r8,__PT_INT_CODE+2(%r11)</div><div class='del'>-	slag	%r8,%r8,2			# shift and test for svc 0</div><div class='add'>+	slag	%r8,%r8,3			# shift and test for svc 0</div><div class='ctx'> 	jnz	.Lsysc_nr_ok</div><div class='ctx'> 	# svc 0: system call number in %r1</div><div class='ctx'> 	llgfr	%r1,%r1				# clear high word in r1</div><div class='ctx'> 	cghi	%r1,NR_syscalls</div><div class='ctx'> 	jnl	.Lsysc_nr_ok</div><div class='ctx'> 	sth	%r1,__PT_INT_CODE+2(%r11)</div><div class='del'>-	slag	%r8,%r1,2</div><div class='add'>+	slag	%r8,%r1,3</div><div class='ctx'> .Lsysc_nr_ok:</div><div class='ctx'> 	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='ctx'> 	stg	%r2,__PT_ORIG_GPR2(%r11)</div><div class='ctx'> 	stg	%r7,STACK_FRAME_OVERHEAD(%r15)</div><div class='del'>-	lgf	%r9,0(%r8,%r10)			# get system call add.</div><div class='add'>+	lg	%r9,0(%r8,%r10)			# get system call add.</div><div class='ctx'> 	TSTMSK	__TI_flags(%r12),_TIF_TRACE</div><div class='ctx'> 	jnz	.Lsysc_tracesys</div><div class='ctx'> 	BASR_EX	%r14,%r9			# call sys_xxxx</div><div class='hunk'>@@ -556,8 +559,8 @@ ENTRY(system_call)</div><div class='ctx'> 	lghi	%r0,NR_syscalls</div><div class='ctx'> 	clgr	%r0,%r2</div><div class='ctx'> 	jnh	.Lsysc_tracenogo</div><div class='del'>-	sllg	%r8,%r2,2</div><div class='del'>-	lgf	%r9,0(%r8,%r10)</div><div class='add'>+	sllg	%r8,%r2,3</div><div class='add'>+	lg	%r9,0(%r8,%r10)</div><div class='ctx'> .Lsysc_tracego:</div><div class='ctx'> 	lmg	%r3,%r7,__PT_R3(%r11)</div><div class='ctx'> 	stg	%r7,STACK_FRAME_OVERHEAD(%r15)</div><div class='hunk'>@@ -570,6 +573,7 @@ ENTRY(system_call)</div><div class='ctx'> 	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	larl	%r14,.Lsysc_return</div><div class='ctx'> 	jg	do_syscall_trace_exit</div><div class='add'>+ENDPROC(system_call)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # a new process exits the kernel with ret_from_fork</div><div class='hunk'>@@ -584,10 +588,16 @@ ENTRY(ret_from_fork)</div><div class='ctx'> 	jne	.Lsysc_tracenogo</div><div class='ctx'> 	# it's a kernel thread</div><div class='ctx'> 	lmg	%r9,%r10,__PT_R9(%r11)	# load gprs</div><div class='add'>+	la	%r2,0(%r10)</div><div class='add'>+	BASR_EX	%r14,%r9</div><div class='add'>+	j	.Lsysc_tracenogo</div><div class='add'>+ENDPROC(ret_from_fork)</div><div class='add'>+</div><div class='ctx'> ENTRY(kernel_thread_starter)</div><div class='ctx'> 	la	%r2,0(%r10)</div><div class='ctx'> 	BASR_EX	%r14,%r9</div><div class='ctx'> 	j	.Lsysc_tracenogo</div><div class='add'>+ENDPROC(kernel_thread_starter)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Program check handler routine</div><div class='hunk'>@@ -665,9 +675,9 @@ ENTRY(pgm_check_handler)</div><div class='ctx'> 	larl	%r1,pgm_check_table</div><div class='ctx'> 	llgh	%r10,__PT_INT_CODE+2(%r11)</div><div class='ctx'> 	nill	%r10,0x007f</div><div class='del'>-	sll	%r10,2</div><div class='add'>+	sll	%r10,3</div><div class='ctx'> 	je	.Lpgm_return</div><div class='del'>-	lgf	%r9,0(%r10,%r1)		# load address of handler routine</div><div class='add'>+	lg	%r9,0(%r10,%r1)		# load address of handler routine</div><div class='ctx'> 	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	BASR_EX	%r14,%r9		# branch to interrupt-handler</div><div class='ctx'> .Lpgm_return:</div><div class='hunk'>@@ -698,6 +708,7 @@ ENTRY(pgm_check_handler)</div><div class='ctx'> 	stg	%r14,__LC_RETURN_PSW+8</div><div class='ctx'> 	lghi	%r14,_PIF_SYSCALL | _PIF_PER_TRAP</div><div class='ctx'> 	lpswe	__LC_RETURN_PSW		# branch to .Lsysc_per and enable irqs</div><div class='add'>+ENDPROC(pgm_check_handler)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IO interrupt handler routine</div><div class='hunk'>@@ -926,6 +937,7 @@ ENTRY(io_int_handler)</div><div class='ctx'> 	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	j	.Lio_return</div><div class='add'>+ENDPROC(io_int_handler)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * External interrupt handler routine</div><div class='hunk'>@@ -965,6 +977,7 @@ ENTRY(ext_int_handler)</div><div class='ctx'> 	lghi	%r3,EXT_INTERRUPT</div><div class='ctx'> 	brasl	%r14,do_IRQ</div><div class='ctx'> 	j	.Lio_return</div><div class='add'>+ENDPROC(ext_int_handler)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Load idle PSW. The second "half" of this function is in .Lcleanup_idle.</div><div class='hunk'>@@ -989,6 +1002,7 @@ ENTRY(psw_idle)</div><div class='ctx'> 	lpswe	__SF_EMPTY(%r15)</div><div class='ctx'> 	BR_EX	%r14</div><div class='ctx'> .Lpsw_idle_end:</div><div class='add'>+ENDPROC(psw_idle)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Store floating-point controls and floating-point or vector register</div><div class='hunk'>@@ -1031,6 +1045,7 @@ ENTRY(save_fpu_regs)</div><div class='ctx'> .Lsave_fpu_regs_exit:</div><div class='ctx'> 	BR_EX	%r14</div><div class='ctx'> .Lsave_fpu_regs_end:</div><div class='add'>+ENDPROC(save_fpu_regs)</div><div class='ctx'> EXPORT_SYMBOL(save_fpu_regs)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1077,6 +1092,7 @@ load_fpu_regs:</div><div class='ctx'> .Lload_fpu_regs_exit:</div><div class='ctx'> 	BR_EX	%r14</div><div class='ctx'> .Lload_fpu_regs_end:</div><div class='add'>+ENDPROC(load_fpu_regs)</div><div class='ctx'> </div><div class='ctx'> .L__critical_end:</div><div class='ctx'> </div><div class='hunk'>@@ -1206,6 +1222,7 @@ ENTRY(mcck_int_handler)</div><div class='ctx'> 	lg	%r15,__LC_NODAT_STACK</div><div class='ctx'> 	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	j	.Lmcck_skip</div><div class='add'>+ENDPROC(mcck_int_handler)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PSW restart interrupt handler</div><div class='hunk'>@@ -1232,6 +1249,7 @@ ENTRY(restart_int_handler)</div><div class='ctx'> 2:	sigp	%r4,%r3,SIGP_STOP		# sigp stop to current cpu</div><div class='ctx'> 	brc	2,2b</div><div class='ctx'> 3:	j	3b</div><div class='add'>+ENDPROC(restart_int_handler)</div><div class='ctx'> </div><div class='ctx'> 	.section .kprobes.text, "ax"</div><div class='ctx'> </div><div class='hunk'>@@ -1241,7 +1259,7 @@ ENTRY(restart_int_handler)</div><div class='ctx'>  * No need to properly save the registers, we are going to panic anyway.</div><div class='ctx'>  * Setup a pt_regs so that show_trace can provide a good call trace.</div><div class='ctx'>  */</div><div class='del'>-stack_overflow:</div><div class='add'>+ENTRY(stack_overflow)</div><div class='ctx'> 	lg	%r15,__LC_NODAT_STACK	# change to panic stack</div><div class='ctx'> 	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='hunk'>@@ -1251,9 +1269,10 @@ stack_overflow:</div><div class='ctx'> 	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='ctx'> 	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	jg	kernel_stack_overflow</div><div class='add'>+ENDPROC(stack_overflow)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-cleanup_critical:</div><div class='add'>+ENTRY(cleanup_critical)</div><div class='ctx'> #if IS_ENABLED(CONFIG_KVM)</div><div class='ctx'> 	clg	%r9,BASED(.Lcleanup_table_sie)	# .Lsie_gmap</div><div class='ctx'> 	jl	0f</div><div class='hunk'>@@ -1289,6 +1308,7 @@ cleanup_critical:</div><div class='ctx'> 	clg	%r9,BASED(.Lcleanup_table+104)	# .Lload_fpu_regs_end</div><div class='ctx'> 	jl	.Lcleanup_load_fpu_regs</div><div class='ctx'> 0:	BR_EX	%r14,%r11</div><div class='add'>+ENDPROC(cleanup_critical)</div><div class='ctx'> </div><div class='ctx'> 	.align	8</div><div class='ctx'> .Lcleanup_table:</div><div class='hunk'>@@ -1512,7 +1532,7 @@ cleanup_critical:</div><div class='ctx'> 	.quad   .Lsie_skip - .Lsie_entry</div><div class='ctx'> #endif</div><div class='ctx'> 	.section .rodata, "a"</div><div class='del'>-#define SYSCALL(esame,emu)	.long __s390x_ ## esame</div><div class='add'>+#define SYSCALL(esame,emu)	.quad __s390x_ ## esame</div><div class='ctx'> 	.globl	sys_call_table</div><div class='ctx'> sys_call_table:</div><div class='ctx'> #include "asm/syscall_table.h"</div><div class='hunk'>@@ -1520,7 +1540,7 @@ sys_call_table:</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> </div><div class='del'>-#define SYSCALL(esame,emu)	.long __s390_ ## emu</div><div class='add'>+#define SYSCALL(esame,emu)	.quad __s390_ ## emu</div><div class='ctx'> 	.globl	sys_call_table_emu</div><div class='ctx'> sys_call_table_emu:</div><div class='ctx'> #include "asm/syscall_table.h"</div><div class='head'>diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h<br/>index c3816ae108b0..20420c2b8a14 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/entry.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/entry.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/entry.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/entry.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@ int setup_profiling_timer(unsigned int multiplier);</div><div class='ctx'> void __init time_init(void);</div><div class='ctx'> int pfn_is_nosave(unsigned long);</div><div class='ctx'> void s390_early_resume(void);</div><div class='del'>-unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip);</div><div class='add'>+unsigned long prepare_ftrace_return(unsigned long parent, unsigned long sp, unsigned long ip);</div><div class='ctx'> </div><div class='ctx'> struct s390_mmap_arg_struct;</div><div class='ctx'> struct fadvise64_64_args;</div><div class='head'>diff --git a/arch/s390/kernel/fpu.c b/arch/s390/kernel/fpu.c<br/>index 594464f2129d..0da378e2eb25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/fpu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/fpu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/fpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/fpu.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@ void __kernel_fpu_begin(struct kernel_fpu *state, u32 flags)</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; KERNEL_FPC)</div><div class='ctx'> 		/* Save floating point control */</div><div class='del'>-		asm volatile("stfpc %0" : "=m" (state-&gt;fpc));</div><div class='add'>+		asm volatile("stfpc %0" : "=Q" (state-&gt;fpc));</div><div class='ctx'> </div><div class='ctx'> 	if (!MACHINE_HAS_VX) {</div><div class='ctx'> 		if (flags &amp; KERNEL_VXR_V0V7) {</div><div class='head'>diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c<br/>index 39b13d71a8fe..1bb85f60c0dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ftrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ftrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/ftrace.c</a></div><div class='hunk'>@@ -201,17 +201,18 @@ device_initcall(ftrace_plt_init);</div><div class='ctx'>  * Hook the return address and push it in the stack of return addresses</div><div class='ctx'>  * in current thread info.</div><div class='ctx'>  */</div><div class='del'>-unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip)</div><div class='add'>+unsigned long prepare_ftrace_return(unsigned long ra, unsigned long sp,</div><div class='add'>+				    unsigned long ip)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(ftrace_graph_is_dead()))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (unlikely(atomic_read(&amp;current-&gt;tracing_graph_pause)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ip -= MCOUNT_INSN_SIZE;</div><div class='del'>-	if (!function_graph_enter(parent, ip, 0, NULL))</div><div class='del'>-		parent = (unsigned long) return_to_handler;</div><div class='add'>+	if (!function_graph_enter(ra, ip, 0, (void *) sp))</div><div class='add'>+		ra = (unsigned long) return_to_handler;</div><div class='ctx'> out:</div><div class='del'>-	return parent;</div><div class='add'>+	return ra;</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(prepare_ftrace_return);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S<br/>index 56491e636eab..5aea1a527443 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/head64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/head64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/head64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/head64.S</a></div><div class='hunk'>@@ -26,7 +26,6 @@ ENTRY(startup_continue)</div><div class='ctx'> 0:	larl	%r1,tod_clock_base</div><div class='ctx'> 	mvc	0(16,%r1),__LC_BOOT_CLOCK</div><div class='ctx'> 	larl	%r13,.LPG1		# get base</div><div class='del'>-	lctlg	%c0,%c15,.Lctl-.LPG1(%r13)	# load control registers</div><div class='ctx'> 	larl	%r0,boot_vdso_data</div><div class='ctx'> 	stg	%r0,__LC_VDSO_PER_CPU</div><div class='ctx'> #</div><div class='hunk'>@@ -61,22 +60,6 @@ ENTRY(startup_continue)</div><div class='ctx'> </div><div class='ctx'> 	.align	16</div><div class='ctx'> .LPG1:</div><div class='del'>-.Lctl:	.quad	0x04040000		# cr0: AFP registers &amp; secondary space</div><div class='del'>-	.quad	0			# cr1: primary space segment table</div><div class='del'>-	.quad	.Lduct			# cr2: dispatchable unit control table</div><div class='del'>-	.quad	0			# cr3: instruction authorization</div><div class='del'>-	.quad	0xffff			# cr4: instruction authorization</div><div class='del'>-	.quad	.Lduct			# cr5: primary-aste origin</div><div class='del'>-	.quad	0			# cr6:	I/O interrupts</div><div class='del'>-	.quad	0			# cr7:	secondary space segment table</div><div class='del'>-	.quad	0			# cr8:	access registers translation</div><div class='del'>-	.quad	0			# cr9:	tracing off</div><div class='del'>-	.quad	0			# cr10: tracing off</div><div class='del'>-	.quad	0			# cr11: tracing off</div><div class='del'>-	.quad	0			# cr12: tracing off</div><div class='del'>-	.quad	0			# cr13: home space segment table</div><div class='del'>-	.quad	0xc0000000		# cr14: machine check handling off</div><div class='del'>-	.quad	.Llinkage_stack		# cr15: linkage stack operations</div><div class='ctx'> .Lpcmsk:.quad	0x0000000180000000</div><div class='ctx'> .L4malign:.quad 0xffffffffffc00000</div><div class='ctx'> .Lscan2g:.quad	0x80000000 + 0x20000 - 8	# 2GB + 128K - 8</div><div class='hunk'>@@ -84,14 +67,5 @@ ENTRY(startup_continue)</div><div class='ctx'> .Lparmaddr:</div><div class='ctx'> 	.quad	PARMAREA</div><div class='ctx'> 	.align	64</div><div class='del'>-.Lduct: .long	0,.Laste,.Laste,0,.Lduald,0,0,0</div><div class='del'>-	.long	0,0,0,0,0,0,0,0</div><div class='del'>-.Laste:	.quad	0,0xffffffffffffffff,0,0,0,0,0,0</div><div class='del'>-	.align	128</div><div class='del'>-.Lduald:.rept	8</div><div class='del'>-	.long	0x80000000,0,0,0	# invalid access-list entries</div><div class='del'>-	.endr</div><div class='del'>-.Llinkage_stack:</div><div class='del'>-	.long	0,0,0x89000000,0,0,0,0x8a000000,0</div><div class='ctx'> .Ldw:	.quad	0x0002000180000000,0x0000000000000000</div><div class='ctx'> .Laregs:.long	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</div><div class='head'>diff --git a/arch/s390/kernel/ima_arch.c b/arch/s390/kernel/ima_arch.c<br/>new file mode 100644<br/>index 000000000000..f3c3e6e1c5d3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ima_arch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/ima_arch.c</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ima.h&gt;</div><div class='add'>+#include &lt;asm/boot_data.h&gt;</div><div class='add'>+</div><div class='add'>+bool arch_ima_get_secureboot(void)</div><div class='add'>+{</div><div class='add'>+	return ipl_secure_flag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char * const *arch_get_ima_policy(void)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c<br/>index 18a5d6317acc..d836af3ccc38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ipl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ipl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ipl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/ipl.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/os_info.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/boot_data.h&gt;</div><div class='add'>+#include &lt;asm/uv.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='ctx'> #define IPL_PARM_BLOCK_VERSION 0</div><div class='hunk'>@@ -119,11 +120,15 @@ static char *dump_type_str(enum dump_type type)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ipl_parameter_block __bootdata(early_ipl_block);</div><div class='del'>-int __bootdata(early_ipl_block_valid);</div><div class='add'>+int __bootdata_preserved(ipl_block_valid);</div><div class='add'>+struct ipl_parameter_block __bootdata_preserved(ipl_block);</div><div class='add'>+int __bootdata_preserved(ipl_secure_flag);</div><div class='ctx'> </div><div class='del'>-static int ipl_block_valid;</div><div class='del'>-static struct ipl_parameter_block ipl_block;</div><div class='add'>+unsigned long __bootdata_preserved(ipl_cert_list_addr);</div><div class='add'>+unsigned long __bootdata_preserved(ipl_cert_list_size);</div><div class='add'>+</div><div class='add'>+unsigned long __bootdata(early_ipl_comp_list_addr);</div><div class='add'>+unsigned long __bootdata(early_ipl_comp_list_size);</div><div class='ctx'> </div><div class='ctx'> static int reipl_capabilities = IPL_TYPE_UNKNOWN;</div><div class='ctx'> </div><div class='hunk'>@@ -246,11 +251,11 @@ static __init enum ipl_type get_ipl_type(void)</div><div class='ctx'> 	if (!ipl_block_valid)</div><div class='ctx'> 		return IPL_TYPE_UNKNOWN;</div><div class='ctx'> </div><div class='del'>-	switch (ipl_block.hdr.pbt) {</div><div class='del'>-	case DIAG308_IPL_TYPE_CCW:</div><div class='add'>+	switch (ipl_block.pb0_hdr.pbt) {</div><div class='add'>+	case IPL_PBT_CCW:</div><div class='ctx'> 		return IPL_TYPE_CCW;</div><div class='del'>-	case DIAG308_IPL_TYPE_FCP:</div><div class='del'>-		if (ipl_block.ipl_info.fcp.opt == DIAG308_IPL_OPT_DUMP)</div><div class='add'>+	case IPL_PBT_FCP:</div><div class='add'>+		if (ipl_block.fcp.opt == IPL_PB0_FCP_OPT_DUMP)</div><div class='ctx'> 			return IPL_TYPE_FCP_DUMP;</div><div class='ctx'> 		else</div><div class='ctx'> 			return IPL_TYPE_FCP;</div><div class='hunk'>@@ -269,12 +274,35 @@ static ssize_t ipl_type_show(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> static struct kobj_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);</div><div class='ctx'> </div><div class='add'>+static ssize_t ipl_secure_show(struct kobject *kobj,</div><div class='add'>+			       struct kobj_attribute *attr, char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%i\n", !!ipl_secure_flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute sys_ipl_secure_attr =</div><div class='add'>+	__ATTR(secure, 0444, ipl_secure_show, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t ipl_has_secure_show(struct kobject *kobj,</div><div class='add'>+				   struct kobj_attribute *attr, char *page)</div><div class='add'>+{</div><div class='add'>+	if (MACHINE_IS_LPAR)</div><div class='add'>+		return sprintf(page, "%i\n", !!sclp.has_sipl);</div><div class='add'>+	else if (MACHINE_IS_VM)</div><div class='add'>+		return sprintf(page, "%i\n", !!sclp.has_sipl_g2);</div><div class='add'>+	else</div><div class='add'>+		return sprintf(page, "%i\n", 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute sys_ipl_has_secure_attr =</div><div class='add'>+	__ATTR(has_secure, 0444, ipl_has_secure_show, NULL);</div><div class='add'>+</div><div class='ctx'> static ssize_t ipl_vm_parm_show(struct kobject *kobj,</div><div class='ctx'> 				struct kobj_attribute *attr, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	char parm[DIAG308_VMPARM_SIZE + 1] = {};</div><div class='ctx'> </div><div class='del'>-	if (ipl_block_valid &amp;&amp; (ipl_block.hdr.pbt == DIAG308_IPL_TYPE_CCW))</div><div class='add'>+	if (ipl_block_valid &amp;&amp; (ipl_block.pb0_hdr.pbt == IPL_PBT_CCW))</div><div class='ctx'> 		ipl_block_get_ascii_vmparm(parm, sizeof(parm), &amp;ipl_block);</div><div class='ctx'> 	return sprintf(page, "%s\n", parm);</div><div class='ctx'> }</div><div class='hunk'>@@ -287,12 +315,11 @@ static ssize_t sys_ipl_device_show(struct kobject *kobj,</div><div class='ctx'> {</div><div class='ctx'> 	switch (ipl_info.type) {</div><div class='ctx'> 	case IPL_TYPE_CCW:</div><div class='del'>-		return sprintf(page, "0.%x.%04x\n", ipl_block.ipl_info.ccw.ssid,</div><div class='del'>-			       ipl_block.ipl_info.ccw.devno);</div><div class='add'>+		return sprintf(page, "0.%x.%04x\n", ipl_block.ccw.ssid,</div><div class='add'>+			       ipl_block.ccw.devno);</div><div class='ctx'> 	case IPL_TYPE_FCP:</div><div class='ctx'> 	case IPL_TYPE_FCP_DUMP:</div><div class='del'>-		return sprintf(page, "0.0.%04x\n",</div><div class='del'>-			       ipl_block.ipl_info.fcp.devno);</div><div class='add'>+		return sprintf(page, "0.0.%04x\n", ipl_block.fcp.devno);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -316,8 +343,8 @@ static ssize_t ipl_scp_data_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 				 struct bin_attribute *attr, char *buf,</div><div class='ctx'> 				 loff_t off, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size = ipl_block.ipl_info.fcp.scp_data_len;</div><div class='del'>-	void *scp_data = &amp;ipl_block.ipl_info.fcp.scp_data;</div><div class='add'>+	unsigned int size = ipl_block.fcp.scp_data_len;</div><div class='add'>+	void *scp_data = &amp;ipl_block.fcp.scp_data;</div><div class='ctx'> </div><div class='ctx'> 	return memory_read_from_buffer(buf, count, &amp;off, scp_data, size);</div><div class='ctx'> }</div><div class='hunk'>@@ -333,13 +360,13 @@ static struct bin_attribute *ipl_fcp_bin_attrs[] = {</div><div class='ctx'> /* FCP ipl device attributes */</div><div class='ctx'> </div><div class='ctx'> DEFINE_IPL_ATTR_RO(ipl_fcp, wwpn, "0x%016llx\n",</div><div class='del'>-		   (unsigned long long)ipl_block.ipl_info.fcp.wwpn);</div><div class='add'>+		   (unsigned long long)ipl_block.fcp.wwpn);</div><div class='ctx'> DEFINE_IPL_ATTR_RO(ipl_fcp, lun, "0x%016llx\n",</div><div class='del'>-		   (unsigned long long)ipl_block.ipl_info.fcp.lun);</div><div class='add'>+		   (unsigned long long)ipl_block.fcp.lun);</div><div class='ctx'> DEFINE_IPL_ATTR_RO(ipl_fcp, bootprog, "%lld\n",</div><div class='del'>-		   (unsigned long long)ipl_block.ipl_info.fcp.bootprog);</div><div class='add'>+		   (unsigned long long)ipl_block.fcp.bootprog);</div><div class='ctx'> DEFINE_IPL_ATTR_RO(ipl_fcp, br_lba, "%lld\n",</div><div class='del'>-		   (unsigned long long)ipl_block.ipl_info.fcp.br_lba);</div><div class='add'>+		   (unsigned long long)ipl_block.fcp.br_lba);</div><div class='ctx'> </div><div class='ctx'> static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,</div><div class='ctx'> 				     struct kobj_attribute *attr, char *page)</div><div class='hunk'>@@ -365,6 +392,8 @@ static struct attribute *ipl_fcp_attrs[] = {</div><div class='ctx'> 	&amp;sys_ipl_fcp_bootprog_attr.attr,</div><div class='ctx'> 	&amp;sys_ipl_fcp_br_lba_attr.attr,</div><div class='ctx'> 	&amp;sys_ipl_ccw_loadparm_attr.attr,</div><div class='add'>+	&amp;sys_ipl_secure_attr.attr,</div><div class='add'>+	&amp;sys_ipl_has_secure_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -380,6 +409,8 @@ static struct attribute *ipl_ccw_attrs_vm[] = {</div><div class='ctx'> 	&amp;sys_ipl_device_attr.attr,</div><div class='ctx'> 	&amp;sys_ipl_ccw_loadparm_attr.attr,</div><div class='ctx'> 	&amp;sys_ipl_vm_parm_attr.attr,</div><div class='add'>+	&amp;sys_ipl_secure_attr.attr,</div><div class='add'>+	&amp;sys_ipl_has_secure_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -387,6 +418,8 @@ static struct attribute *ipl_ccw_attrs_lpar[] = {</div><div class='ctx'> 	&amp;sys_ipl_type_attr.attr,</div><div class='ctx'> 	&amp;sys_ipl_device_attr.attr,</div><div class='ctx'> 	&amp;sys_ipl_ccw_loadparm_attr.attr,</div><div class='add'>+	&amp;sys_ipl_secure_attr.attr,</div><div class='add'>+	&amp;sys_ipl_has_secure_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -495,14 +528,14 @@ static ssize_t reipl_generic_vmparm_store(struct ipl_parameter_block *ipb,</div><div class='ctx'> 		if (!(isalnum(buf[i]) || isascii(buf[i]) || isprint(buf[i])))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memset(ipb-&gt;ipl_info.ccw.vm_parm, 0, DIAG308_VMPARM_SIZE);</div><div class='del'>-	ipb-&gt;ipl_info.ccw.vm_parm_len = ip_len;</div><div class='add'>+	memset(ipb-&gt;ccw.vm_parm, 0, DIAG308_VMPARM_SIZE);</div><div class='add'>+	ipb-&gt;ccw.vm_parm_len = ip_len;</div><div class='ctx'> 	if (ip_len &gt; 0) {</div><div class='del'>-		ipb-&gt;ipl_info.ccw.vm_flags |= DIAG308_VM_FLAGS_VP_VALID;</div><div class='del'>-		memcpy(ipb-&gt;ipl_info.ccw.vm_parm, buf, ip_len);</div><div class='del'>-		ASCEBC(ipb-&gt;ipl_info.ccw.vm_parm, ip_len);</div><div class='add'>+		ipb-&gt;ccw.vm_flags |= IPL_PB0_CCW_VM_FLAG_VP;</div><div class='add'>+		memcpy(ipb-&gt;ccw.vm_parm, buf, ip_len);</div><div class='add'>+		ASCEBC(ipb-&gt;ccw.vm_parm, ip_len);</div><div class='ctx'> 	} else {</div><div class='del'>-		ipb-&gt;ipl_info.ccw.vm_flags &amp;= ~DIAG308_VM_FLAGS_VP_VALID;</div><div class='add'>+		ipb-&gt;ccw.vm_flags &amp;= ~IPL_PB0_CCW_VM_FLAG_VP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -549,8 +582,8 @@ static ssize_t reipl_fcp_scpdata_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 				      struct bin_attribute *attr,</div><div class='ctx'> 				      char *buf, loff_t off, size_t count)</div><div class='ctx'> {</div><div class='del'>-	size_t size = reipl_block_fcp-&gt;ipl_info.fcp.scp_data_len;</div><div class='del'>-	void *scp_data = reipl_block_fcp-&gt;ipl_info.fcp.scp_data;</div><div class='add'>+	size_t size = reipl_block_fcp-&gt;fcp.scp_data_len;</div><div class='add'>+	void *scp_data = reipl_block_fcp-&gt;fcp.scp_data;</div><div class='ctx'> </div><div class='ctx'> 	return memory_read_from_buffer(buf, count, &amp;off, scp_data, size);</div><div class='ctx'> }</div><div class='hunk'>@@ -566,17 +599,17 @@ static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	if (off)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memcpy(reipl_block_fcp-&gt;ipl_info.fcp.scp_data, buf, count);</div><div class='add'>+	memcpy(reipl_block_fcp-&gt;fcp.scp_data, buf, count);</div><div class='ctx'> 	if (scpdata_len % 8) {</div><div class='ctx'> 		padding = 8 - (scpdata_len % 8);</div><div class='del'>-		memset(reipl_block_fcp-&gt;ipl_info.fcp.scp_data + scpdata_len,</div><div class='add'>+		memset(reipl_block_fcp-&gt;fcp.scp_data + scpdata_len,</div><div class='ctx'> 		       0, padding);</div><div class='ctx'> 		scpdata_len += padding;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reipl_block_fcp-&gt;ipl_info.fcp.scp_data_len = scpdata_len;</div><div class='del'>-	reipl_block_fcp-&gt;hdr.len = IPL_PARM_BLK_FCP_LEN + scpdata_len;</div><div class='del'>-	reipl_block_fcp-&gt;hdr.blk0_len = IPL_PARM_BLK0_FCP_LEN + scpdata_len;</div><div class='add'>+	reipl_block_fcp-&gt;hdr.len = IPL_BP_FCP_LEN + scpdata_len;</div><div class='add'>+	reipl_block_fcp-&gt;fcp.len = IPL_BP0_FCP_LEN + scpdata_len;</div><div class='add'>+	reipl_block_fcp-&gt;fcp.scp_data_len = scpdata_len;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -590,20 +623,20 @@ static struct bin_attribute *reipl_fcp_bin_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> DEFINE_IPL_ATTR_RW(reipl_fcp, wwpn, "0x%016llx\n", "%llx\n",</div><div class='del'>-		   reipl_block_fcp-&gt;ipl_info.fcp.wwpn);</div><div class='add'>+		   reipl_block_fcp-&gt;fcp.wwpn);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(reipl_fcp, lun, "0x%016llx\n", "%llx\n",</div><div class='del'>-		   reipl_block_fcp-&gt;ipl_info.fcp.lun);</div><div class='add'>+		   reipl_block_fcp-&gt;fcp.lun);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(reipl_fcp, bootprog, "%lld\n", "%lld\n",</div><div class='del'>-		   reipl_block_fcp-&gt;ipl_info.fcp.bootprog);</div><div class='add'>+		   reipl_block_fcp-&gt;fcp.bootprog);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(reipl_fcp, br_lba, "%lld\n", "%lld\n",</div><div class='del'>-		   reipl_block_fcp-&gt;ipl_info.fcp.br_lba);</div><div class='add'>+		   reipl_block_fcp-&gt;fcp.br_lba);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(reipl_fcp, device, "0.0.%04llx\n", "0.0.%llx\n",</div><div class='del'>-		   reipl_block_fcp-&gt;ipl_info.fcp.devno);</div><div class='add'>+		   reipl_block_fcp-&gt;fcp.devno);</div><div class='ctx'> </div><div class='ctx'> static void reipl_get_ascii_loadparm(char *loadparm,</div><div class='ctx'> 				     struct ipl_parameter_block *ibp)</div><div class='ctx'> {</div><div class='del'>-	memcpy(loadparm, ibp-&gt;hdr.loadparm, LOADPARM_LEN);</div><div class='add'>+	memcpy(loadparm, ibp-&gt;common.loadparm, LOADPARM_LEN);</div><div class='ctx'> 	EBCASC(loadparm, LOADPARM_LEN);</div><div class='ctx'> 	loadparm[LOADPARM_LEN] = 0;</div><div class='ctx'> 	strim(loadparm);</div><div class='hunk'>@@ -638,11 +671,11 @@ static ssize_t reipl_generic_loadparm_store(struct ipl_parameter_block *ipb,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* initialize loadparm with blanks */</div><div class='del'>-	memset(ipb-&gt;hdr.loadparm, ' ', LOADPARM_LEN);</div><div class='add'>+	memset(ipb-&gt;common.loadparm, ' ', LOADPARM_LEN);</div><div class='ctx'> 	/* copy and convert to ebcdic */</div><div class='del'>-	memcpy(ipb-&gt;hdr.loadparm, buf, lp_len);</div><div class='del'>-	ASCEBC(ipb-&gt;hdr.loadparm, LOADPARM_LEN);</div><div class='del'>-	ipb-&gt;hdr.flags |= DIAG308_FLAGS_LP_VALID;</div><div class='add'>+	memcpy(ipb-&gt;common.loadparm, buf, lp_len);</div><div class='add'>+	ASCEBC(ipb-&gt;common.loadparm, LOADPARM_LEN);</div><div class='add'>+	ipb-&gt;common.flags |= IPL_PB0_FLAG_LOADPARM;</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -680,7 +713,7 @@ static struct attribute_group reipl_fcp_attr_group = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CCW reipl device attributes */</div><div class='del'>-DEFINE_IPL_CCW_ATTR_RW(reipl_ccw, device, reipl_block_ccw-&gt;ipl_info.ccw);</div><div class='add'>+DEFINE_IPL_CCW_ATTR_RW(reipl_ccw, device, reipl_block_ccw-&gt;ccw);</div><div class='ctx'> </div><div class='ctx'> /* NSS wrapper */</div><div class='ctx'> static ssize_t reipl_nss_loadparm_show(struct kobject *kobj,</div><div class='hunk'>@@ -742,7 +775,7 @@ static struct attribute_group reipl_ccw_attr_group_lpar = {</div><div class='ctx'> static void reipl_get_ascii_nss_name(char *dst,</div><div class='ctx'> 				     struct ipl_parameter_block *ipb)</div><div class='ctx'> {</div><div class='del'>-	memcpy(dst, ipb-&gt;ipl_info.ccw.nss_name, NSS_NAME_SIZE);</div><div class='add'>+	memcpy(dst, ipb-&gt;ccw.nss_name, NSS_NAME_SIZE);</div><div class='ctx'> 	EBCASC(dst, NSS_NAME_SIZE);</div><div class='ctx'> 	dst[NSS_NAME_SIZE] = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -770,16 +803,14 @@ static ssize_t reipl_nss_name_store(struct kobject *kobj,</div><div class='ctx'> 	if (nss_len &gt; NSS_NAME_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memset(reipl_block_nss-&gt;ipl_info.ccw.nss_name, 0x40, NSS_NAME_SIZE);</div><div class='add'>+	memset(reipl_block_nss-&gt;ccw.nss_name, 0x40, NSS_NAME_SIZE);</div><div class='ctx'> 	if (nss_len &gt; 0) {</div><div class='del'>-		reipl_block_nss-&gt;ipl_info.ccw.vm_flags |=</div><div class='del'>-			DIAG308_VM_FLAGS_NSS_VALID;</div><div class='del'>-		memcpy(reipl_block_nss-&gt;ipl_info.ccw.nss_name, buf, nss_len);</div><div class='del'>-		ASCEBC(reipl_block_nss-&gt;ipl_info.ccw.nss_name, nss_len);</div><div class='del'>-		EBC_TOUPPER(reipl_block_nss-&gt;ipl_info.ccw.nss_name, nss_len);</div><div class='add'>+		reipl_block_nss-&gt;ccw.vm_flags |= IPL_PB0_CCW_VM_FLAG_NSS;</div><div class='add'>+		memcpy(reipl_block_nss-&gt;ccw.nss_name, buf, nss_len);</div><div class='add'>+		ASCEBC(reipl_block_nss-&gt;ccw.nss_name, nss_len);</div><div class='add'>+		EBC_TOUPPER(reipl_block_nss-&gt;ccw.nss_name, nss_len);</div><div class='ctx'> 	} else {</div><div class='del'>-		reipl_block_nss-&gt;ipl_info.ccw.vm_flags &amp;=</div><div class='del'>-			~DIAG308_VM_FLAGS_NSS_VALID;</div><div class='add'>+		reipl_block_nss-&gt;ccw.vm_flags &amp;= ~IPL_PB0_CCW_VM_FLAG_NSS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -866,15 +897,21 @@ static void __reipl_run(void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	switch (reipl_type) {</div><div class='ctx'> 	case IPL_TYPE_CCW:</div><div class='add'>+		uv_set_shared(__pa(reipl_block_ccw));</div><div class='ctx'> 		diag308(DIAG308_SET, reipl_block_ccw);</div><div class='add'>+		uv_remove_shared(__pa(reipl_block_ccw));</div><div class='ctx'> 		diag308(DIAG308_LOAD_CLEAR, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPL_TYPE_FCP:</div><div class='add'>+		uv_set_shared(__pa(reipl_block_fcp));</div><div class='ctx'> 		diag308(DIAG308_SET, reipl_block_fcp);</div><div class='add'>+		uv_remove_shared(__pa(reipl_block_fcp));</div><div class='ctx'> 		diag308(DIAG308_LOAD_CLEAR, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPL_TYPE_NSS:</div><div class='add'>+		uv_set_shared(__pa(reipl_block_nss));</div><div class='ctx'> 		diag308(DIAG308_SET, reipl_block_nss);</div><div class='add'>+		uv_remove_shared(__pa(reipl_block_nss));</div><div class='ctx'> 		diag308(DIAG308_LOAD_CLEAR, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPL_TYPE_UNKNOWN:</div><div class='hunk'>@@ -883,7 +920,7 @@ static void __reipl_run(void *unused)</div><div class='ctx'> 	case IPL_TYPE_FCP_DUMP:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	disabled_wait((unsigned long) __builtin_return_address(0));</div><div class='add'>+	disabled_wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void reipl_run(struct shutdown_trigger *trigger)</div><div class='hunk'>@@ -893,10 +930,10 @@ static void reipl_run(struct shutdown_trigger *trigger)</div><div class='ctx'> </div><div class='ctx'> static void reipl_block_ccw_init(struct ipl_parameter_block *ipb)</div><div class='ctx'> {</div><div class='del'>-	ipb-&gt;hdr.len = IPL_PARM_BLK_CCW_LEN;</div><div class='add'>+	ipb-&gt;hdr.len = IPL_BP_CCW_LEN;</div><div class='ctx'> 	ipb-&gt;hdr.version = IPL_PARM_BLOCK_VERSION;</div><div class='del'>-	ipb-&gt;hdr.blk0_len = IPL_PARM_BLK0_CCW_LEN;</div><div class='del'>-	ipb-&gt;hdr.pbt = DIAG308_IPL_TYPE_CCW;</div><div class='add'>+	ipb-&gt;pb0_hdr.len = IPL_BP0_CCW_LEN;</div><div class='add'>+	ipb-&gt;pb0_hdr.pbt = IPL_PBT_CCW;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void reipl_block_ccw_fill_parms(struct ipl_parameter_block *ipb)</div><div class='hunk'>@@ -904,21 +941,20 @@ static void reipl_block_ccw_fill_parms(struct ipl_parameter_block *ipb)</div><div class='ctx'> 	/* LOADPARM */</div><div class='ctx'> 	/* check if read scp info worked and set loadparm */</div><div class='ctx'> 	if (sclp_ipl_info.is_valid)</div><div class='del'>-		memcpy(ipb-&gt;hdr.loadparm, &amp;sclp_ipl_info.loadparm, LOADPARM_LEN);</div><div class='add'>+		memcpy(ipb-&gt;ccw.loadparm, &amp;sclp_ipl_info.loadparm, LOADPARM_LEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* read scp info failed: set empty loadparm (EBCDIC blanks) */</div><div class='del'>-		memset(ipb-&gt;hdr.loadparm, 0x40, LOADPARM_LEN);</div><div class='del'>-	ipb-&gt;hdr.flags = DIAG308_FLAGS_LP_VALID;</div><div class='add'>+		memset(ipb-&gt;ccw.loadparm, 0x40, LOADPARM_LEN);</div><div class='add'>+	ipb-&gt;ccw.flags = IPL_PB0_FLAG_LOADPARM;</div><div class='ctx'> </div><div class='ctx'> 	/* VM PARM */</div><div class='ctx'> 	if (MACHINE_IS_VM &amp;&amp; ipl_block_valid &amp;&amp;</div><div class='del'>-	    (ipl_block.ipl_info.ccw.vm_flags &amp; DIAG308_VM_FLAGS_VP_VALID)) {</div><div class='add'>+	    (ipl_block.ccw.vm_flags &amp; IPL_PB0_CCW_VM_FLAG_VP)) {</div><div class='ctx'> </div><div class='del'>-		ipb-&gt;ipl_info.ccw.vm_flags |= DIAG308_VM_FLAGS_VP_VALID;</div><div class='del'>-		ipb-&gt;ipl_info.ccw.vm_parm_len =</div><div class='del'>-					ipl_block.ipl_info.ccw.vm_parm_len;</div><div class='del'>-		memcpy(ipb-&gt;ipl_info.ccw.vm_parm,</div><div class='del'>-		       ipl_block.ipl_info.ccw.vm_parm, DIAG308_VMPARM_SIZE);</div><div class='add'>+		ipb-&gt;ccw.vm_flags |= IPL_PB0_CCW_VM_FLAG_VP;</div><div class='add'>+		ipb-&gt;ccw.vm_parm_len = ipl_block.ccw.vm_parm_len;</div><div class='add'>+		memcpy(ipb-&gt;ccw.vm_parm,</div><div class='add'>+		       ipl_block.ccw.vm_parm, DIAG308_VMPARM_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -958,8 +994,8 @@ static int __init reipl_ccw_init(void)</div><div class='ctx'> </div><div class='ctx'> 	reipl_block_ccw_init(reipl_block_ccw);</div><div class='ctx'> 	if (ipl_info.type == IPL_TYPE_CCW) {</div><div class='del'>-		reipl_block_ccw-&gt;ipl_info.ccw.ssid = ipl_block.ipl_info.ccw.ssid;</div><div class='del'>-		reipl_block_ccw-&gt;ipl_info.ccw.devno = ipl_block.ipl_info.ccw.devno;</div><div class='add'>+		reipl_block_ccw-&gt;ccw.ssid = ipl_block.ccw.ssid;</div><div class='add'>+		reipl_block_ccw-&gt;ccw.devno = ipl_block.ccw.devno;</div><div class='ctx'> 		reipl_block_ccw_fill_parms(reipl_block_ccw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -997,14 +1033,14 @@ static int __init reipl_fcp_init(void)</div><div class='ctx'> 		 * is invalid in the SCSI IPL parameter block, so take it</div><div class='ctx'> 		 * always from sclp_ipl_info.</div><div class='ctx'> 		 */</div><div class='del'>-		memcpy(reipl_block_fcp-&gt;hdr.loadparm, sclp_ipl_info.loadparm,</div><div class='add'>+		memcpy(reipl_block_fcp-&gt;fcp.loadparm, sclp_ipl_info.loadparm,</div><div class='ctx'> 		       LOADPARM_LEN);</div><div class='ctx'> 	} else {</div><div class='del'>-		reipl_block_fcp-&gt;hdr.len = IPL_PARM_BLK_FCP_LEN;</div><div class='add'>+		reipl_block_fcp-&gt;hdr.len = IPL_BP_FCP_LEN;</div><div class='ctx'> 		reipl_block_fcp-&gt;hdr.version = IPL_PARM_BLOCK_VERSION;</div><div class='del'>-		reipl_block_fcp-&gt;hdr.blk0_len = IPL_PARM_BLK0_FCP_LEN;</div><div class='del'>-		reipl_block_fcp-&gt;hdr.pbt = DIAG308_IPL_TYPE_FCP;</div><div class='del'>-		reipl_block_fcp-&gt;ipl_info.fcp.opt = DIAG308_IPL_OPT_IPL;</div><div class='add'>+		reipl_block_fcp-&gt;fcp.len = IPL_BP0_FCP_LEN;</div><div class='add'>+		reipl_block_fcp-&gt;fcp.pbt = IPL_PBT_FCP;</div><div class='add'>+		reipl_block_fcp-&gt;fcp.opt = IPL_PB0_FCP_OPT_IPL;</div><div class='ctx'> 	}</div><div class='ctx'> 	reipl_capabilities |= IPL_TYPE_FCP;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1022,10 +1058,10 @@ static int __init reipl_type_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we have an OS info reipl block, this will be used</div><div class='ctx'> 	 */</div><div class='del'>-	if (reipl_block-&gt;hdr.pbt == DIAG308_IPL_TYPE_FCP) {</div><div class='add'>+	if (reipl_block-&gt;pb0_hdr.pbt == IPL_PBT_FCP) {</div><div class='ctx'> 		memcpy(reipl_block_fcp, reipl_block, size);</div><div class='ctx'> 		reipl_type = IPL_TYPE_FCP;</div><div class='del'>-	} else if (reipl_block-&gt;hdr.pbt == DIAG308_IPL_TYPE_CCW) {</div><div class='add'>+	} else if (reipl_block-&gt;pb0_hdr.pbt == IPL_PBT_CCW) {</div><div class='ctx'> 		memcpy(reipl_block_ccw, reipl_block, size);</div><div class='ctx'> 		reipl_type = IPL_TYPE_CCW;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1070,15 +1106,15 @@ static struct shutdown_action __refdata reipl_action = {</div><div class='ctx'> /* FCP dump device attributes */</div><div class='ctx'> </div><div class='ctx'> DEFINE_IPL_ATTR_RW(dump_fcp, wwpn, "0x%016llx\n", "%llx\n",</div><div class='del'>-		   dump_block_fcp-&gt;ipl_info.fcp.wwpn);</div><div class='add'>+		   dump_block_fcp-&gt;fcp.wwpn);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(dump_fcp, lun, "0x%016llx\n", "%llx\n",</div><div class='del'>-		   dump_block_fcp-&gt;ipl_info.fcp.lun);</div><div class='add'>+		   dump_block_fcp-&gt;fcp.lun);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(dump_fcp, bootprog, "%lld\n", "%lld\n",</div><div class='del'>-		   dump_block_fcp-&gt;ipl_info.fcp.bootprog);</div><div class='add'>+		   dump_block_fcp-&gt;fcp.bootprog);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(dump_fcp, br_lba, "%lld\n", "%lld\n",</div><div class='del'>-		   dump_block_fcp-&gt;ipl_info.fcp.br_lba);</div><div class='add'>+		   dump_block_fcp-&gt;fcp.br_lba);</div><div class='ctx'> DEFINE_IPL_ATTR_RW(dump_fcp, device, "0.0.%04llx\n", "0.0.%llx\n",</div><div class='del'>-		   dump_block_fcp-&gt;ipl_info.fcp.devno);</div><div class='add'>+		   dump_block_fcp-&gt;fcp.devno);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *dump_fcp_attrs[] = {</div><div class='ctx'> 	&amp;sys_dump_fcp_device_attr.attr,</div><div class='hunk'>@@ -1095,7 +1131,7 @@ static struct attribute_group dump_fcp_attr_group = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CCW dump device attributes */</div><div class='del'>-DEFINE_IPL_CCW_ATTR_RW(dump_ccw, device, dump_block_ccw-&gt;ipl_info.ccw);</div><div class='add'>+DEFINE_IPL_CCW_ATTR_RW(dump_ccw, device, dump_block_ccw-&gt;ccw);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *dump_ccw_attrs[] = {</div><div class='ctx'> 	&amp;sys_dump_ccw_device_attr.attr,</div><div class='hunk'>@@ -1145,7 +1181,9 @@ static struct kset *dump_kset;</div><div class='ctx'> </div><div class='ctx'> static void diag308_dump(void *dump_block)</div><div class='ctx'> {</div><div class='add'>+	uv_set_shared(__pa(dump_block));</div><div class='ctx'> 	diag308(DIAG308_SET, dump_block);</div><div class='add'>+	uv_remove_shared(__pa(dump_block));</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (diag308(DIAG308_LOAD_NORMAL_DUMP, NULL) != 0x302)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1187,10 +1225,10 @@ static int __init dump_ccw_init(void)</div><div class='ctx'> 		free_page((unsigned long)dump_block_ccw);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	dump_block_ccw-&gt;hdr.len = IPL_PARM_BLK_CCW_LEN;</div><div class='add'>+	dump_block_ccw-&gt;hdr.len = IPL_BP_CCW_LEN;</div><div class='ctx'> 	dump_block_ccw-&gt;hdr.version = IPL_PARM_BLOCK_VERSION;</div><div class='del'>-	dump_block_ccw-&gt;hdr.blk0_len = IPL_PARM_BLK0_CCW_LEN;</div><div class='del'>-	dump_block_ccw-&gt;hdr.pbt = DIAG308_IPL_TYPE_CCW;</div><div class='add'>+	dump_block_ccw-&gt;ccw.len = IPL_BP0_CCW_LEN;</div><div class='add'>+	dump_block_ccw-&gt;ccw.pbt = IPL_PBT_CCW;</div><div class='ctx'> 	dump_capabilities |= DUMP_TYPE_CCW;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1209,11 +1247,11 @@ static int __init dump_fcp_init(void)</div><div class='ctx'> 		free_page((unsigned long)dump_block_fcp);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	dump_block_fcp-&gt;hdr.len = IPL_PARM_BLK_FCP_LEN;</div><div class='add'>+	dump_block_fcp-&gt;hdr.len = IPL_BP_FCP_LEN;</div><div class='ctx'> 	dump_block_fcp-&gt;hdr.version = IPL_PARM_BLOCK_VERSION;</div><div class='del'>-	dump_block_fcp-&gt;hdr.blk0_len = IPL_PARM_BLK0_FCP_LEN;</div><div class='del'>-	dump_block_fcp-&gt;hdr.pbt = DIAG308_IPL_TYPE_FCP;</div><div class='del'>-	dump_block_fcp-&gt;ipl_info.fcp.opt = DIAG308_IPL_OPT_DUMP;</div><div class='add'>+	dump_block_fcp-&gt;fcp.len = IPL_BP0_FCP_LEN;</div><div class='add'>+	dump_block_fcp-&gt;fcp.pbt = IPL_PBT_FCP;</div><div class='add'>+	dump_block_fcp-&gt;fcp.opt = IPL_PB0_FCP_OPT_DUMP;</div><div class='ctx'> 	dump_capabilities |= DUMP_TYPE_FCP;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1337,7 +1375,7 @@ static void stop_run(struct shutdown_trigger *trigger)</div><div class='ctx'> {</div><div class='ctx'> 	if (strcmp(trigger-&gt;name, ON_PANIC_STR) == 0 ||</div><div class='ctx'> 	    strcmp(trigger-&gt;name, ON_RESTART_STR) == 0)</div><div class='del'>-		disabled_wait((unsigned long) __builtin_return_address(0));</div><div class='add'>+		disabled_wait();</div><div class='ctx'> 	smp_stop_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1572,7 +1610,7 @@ static int __init s390_ipl_init(void)</div><div class='ctx'> 	 * READ SCP info provides the correct value.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (memcmp(sclp_ipl_info.loadparm, str, sizeof(str)) == 0 &amp;&amp; ipl_block_valid)</div><div class='del'>-		memcpy(sclp_ipl_info.loadparm, ipl_block.hdr.loadparm, LOADPARM_LEN);</div><div class='add'>+		memcpy(sclp_ipl_info.loadparm, ipl_block.ccw.loadparm, LOADPARM_LEN);</div><div class='ctx'> 	shutdown_actions_init();</div><div class='ctx'> 	shutdown_triggers_init();</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1657,15 +1695,15 @@ void __init setup_ipl(void)</div><div class='ctx'> 	ipl_info.type = get_ipl_type();</div><div class='ctx'> 	switch (ipl_info.type) {</div><div class='ctx'> 	case IPL_TYPE_CCW:</div><div class='del'>-		ipl_info.data.ccw.dev_id.ssid = ipl_block.ipl_info.ccw.ssid;</div><div class='del'>-		ipl_info.data.ccw.dev_id.devno = ipl_block.ipl_info.ccw.devno;</div><div class='add'>+		ipl_info.data.ccw.dev_id.ssid = ipl_block.ccw.ssid;</div><div class='add'>+		ipl_info.data.ccw.dev_id.devno = ipl_block.ccw.devno;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPL_TYPE_FCP:</div><div class='ctx'> 	case IPL_TYPE_FCP_DUMP:</div><div class='ctx'> 		ipl_info.data.fcp.dev_id.ssid = 0;</div><div class='del'>-		ipl_info.data.fcp.dev_id.devno = ipl_block.ipl_info.fcp.devno;</div><div class='del'>-		ipl_info.data.fcp.wwpn = ipl_block.ipl_info.fcp.wwpn;</div><div class='del'>-		ipl_info.data.fcp.lun = ipl_block.ipl_info.fcp.lun;</div><div class='add'>+		ipl_info.data.fcp.dev_id.devno = ipl_block.fcp.devno;</div><div class='add'>+		ipl_info.data.fcp.wwpn = ipl_block.fcp.wwpn;</div><div class='add'>+		ipl_info.data.fcp.lun = ipl_block.fcp.lun;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPL_TYPE_NSS:</div><div class='ctx'> 	case IPL_TYPE_UNKNOWN:</div><div class='hunk'>@@ -1675,14 +1713,6 @@ void __init setup_ipl(void)</div><div class='ctx'> 	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;on_panic_nb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ipl_store_parameters(void)</div><div class='del'>-{</div><div class='del'>-	if (early_ipl_block_valid) {</div><div class='del'>-		memcpy(&amp;ipl_block, &amp;early_ipl_block, sizeof(ipl_block));</div><div class='del'>-		ipl_block_valid = 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void s390_reset_system(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable prefixing */</div><div class='hunk'>@@ -1690,5 +1720,139 @@ void s390_reset_system(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Disable lowcore protection */</div><div class='ctx'> 	__ctl_clear_bit(0, 28);</div><div class='del'>-	diag308_reset();</div><div class='add'>+	diag_dma_ops.diag308_reset();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KEXEC_FILE</div><div class='add'>+</div><div class='add'>+int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,</div><div class='add'>+			     unsigned char flags, unsigned short cert)</div><div class='add'>+{</div><div class='add'>+	struct ipl_report_component *comp;</div><div class='add'>+</div><div class='add'>+	comp = vzalloc(sizeof(*comp));</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	list_add_tail(&amp;comp-&gt;list, &amp;report-&gt;components);</div><div class='add'>+</div><div class='add'>+	comp-&gt;entry.addr = kbuf-&gt;mem;</div><div class='add'>+	comp-&gt;entry.len = kbuf-&gt;memsz;</div><div class='add'>+	comp-&gt;entry.flags = flags;</div><div class='add'>+	comp-&gt;entry.certificate_index = cert;</div><div class='add'>+</div><div class='add'>+	report-&gt;size += sizeof(comp-&gt;entry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ipl_report_add_certificate(struct ipl_report *report, void *key,</div><div class='add'>+			       unsigned long addr, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct ipl_report_certificate *cert;</div><div class='add'>+</div><div class='add'>+	cert = vzalloc(sizeof(*cert));</div><div class='add'>+	if (!cert)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	list_add_tail(&amp;cert-&gt;list, &amp;report-&gt;certificates);</div><div class='add'>+</div><div class='add'>+	cert-&gt;entry.addr = addr;</div><div class='add'>+	cert-&gt;entry.len = len;</div><div class='add'>+	cert-&gt;key = key;</div><div class='add'>+</div><div class='add'>+	report-&gt;size += sizeof(cert-&gt;entry);</div><div class='add'>+	report-&gt;size += cert-&gt;entry.len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ipl_report *ipl_report_init(struct ipl_parameter_block *ipib)</div><div class='add'>+{</div><div class='add'>+	struct ipl_report *report;</div><div class='add'>+</div><div class='add'>+	report = vzalloc(sizeof(*report));</div><div class='add'>+	if (!report)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	report-&gt;ipib = ipib;</div><div class='add'>+	INIT_LIST_HEAD(&amp;report-&gt;components);</div><div class='add'>+	INIT_LIST_HEAD(&amp;report-&gt;certificates);</div><div class='add'>+</div><div class='add'>+	report-&gt;size = ALIGN(ipib-&gt;hdr.len, 8);</div><div class='add'>+	report-&gt;size += sizeof(struct ipl_rl_hdr);</div><div class='add'>+	report-&gt;size += sizeof(struct ipl_rb_components);</div><div class='add'>+	report-&gt;size += sizeof(struct ipl_rb_certificates);</div><div class='add'>+</div><div class='add'>+	return report;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ipl_report_finish(struct ipl_report *report)</div><div class='add'>+{</div><div class='add'>+	struct ipl_report_certificate *cert;</div><div class='add'>+	struct ipl_report_component *comp;</div><div class='add'>+	struct ipl_rb_certificates *certs;</div><div class='add'>+	struct ipl_parameter_block *ipib;</div><div class='add'>+	struct ipl_rb_components *comps;</div><div class='add'>+	struct ipl_rl_hdr *rl_hdr;</div><div class='add'>+	void *buf, *ptr;</div><div class='add'>+</div><div class='add'>+	buf = vzalloc(report-&gt;size);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	ptr = buf;</div><div class='add'>+</div><div class='add'>+	memcpy(ptr, report-&gt;ipib, report-&gt;ipib-&gt;hdr.len);</div><div class='add'>+	ipib = ptr;</div><div class='add'>+	if (ipl_secure_flag)</div><div class='add'>+		ipib-&gt;hdr.flags |= IPL_PL_FLAG_SIPL;</div><div class='add'>+	ipib-&gt;hdr.flags |= IPL_PL_FLAG_IPLSR;</div><div class='add'>+	ptr += report-&gt;ipib-&gt;hdr.len;</div><div class='add'>+	ptr = PTR_ALIGN(ptr, 8);</div><div class='add'>+</div><div class='add'>+	rl_hdr = ptr;</div><div class='add'>+	ptr += sizeof(*rl_hdr);</div><div class='add'>+</div><div class='add'>+	comps = ptr;</div><div class='add'>+	comps-&gt;rbt = IPL_RBT_COMPONENTS;</div><div class='add'>+	ptr += sizeof(*comps);</div><div class='add'>+	list_for_each_entry(comp, &amp;report-&gt;components, list) {</div><div class='add'>+		memcpy(ptr, &amp;comp-&gt;entry, sizeof(comp-&gt;entry));</div><div class='add'>+		ptr += sizeof(comp-&gt;entry);</div><div class='add'>+	}</div><div class='add'>+	comps-&gt;len = ptr - (void *)comps;</div><div class='add'>+</div><div class='add'>+	certs = ptr;</div><div class='add'>+	certs-&gt;rbt = IPL_RBT_CERTIFICATES;</div><div class='add'>+	ptr += sizeof(*certs);</div><div class='add'>+	list_for_each_entry(cert, &amp;report-&gt;certificates, list) {</div><div class='add'>+		memcpy(ptr, &amp;cert-&gt;entry, sizeof(cert-&gt;entry));</div><div class='add'>+		ptr += sizeof(cert-&gt;entry);</div><div class='add'>+	}</div><div class='add'>+	certs-&gt;len = ptr - (void *)certs;</div><div class='add'>+	rl_hdr-&gt;len = ptr - (void *)rl_hdr;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cert, &amp;report-&gt;certificates, list) {</div><div class='add'>+		memcpy(ptr, cert-&gt;key, cert-&gt;entry.len);</div><div class='add'>+		ptr += cert-&gt;entry.len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(ptr &gt; buf + report-&gt;size);</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ipl_report_free(struct ipl_report *report)</div><div class='add'>+{</div><div class='add'>+	struct ipl_report_component *comp, *ncomp;</div><div class='add'>+	struct ipl_report_certificate *cert, *ncert;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(comp, ncomp, &amp;report-&gt;components, list)</div><div class='add'>+		vfree(comp);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(cert, ncert, &amp;report-&gt;certificates, list)</div><div class='add'>+		vfree(cert);</div><div class='add'>+</div><div class='add'>+	vfree(report);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/s390/kernel/ipl_vmparm.c b/arch/s390/kernel/ipl_vmparm.c<br/>index 411838c0a0af..af43535a976d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ipl_vmparm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/ipl_vmparm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/ipl_vmparm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/ipl_vmparm.c</a></div><div class='hunk'>@@ -11,11 +11,11 @@ size_t ipl_block_get_ascii_vmparm(char *dest, size_t size,</div><div class='ctx'> 	char has_lowercase = 0;</div><div class='ctx'> </div><div class='ctx'> 	len = 0;</div><div class='del'>-	if ((ipb-&gt;ipl_info.ccw.vm_flags &amp; DIAG308_VM_FLAGS_VP_VALID) &amp;&amp;</div><div class='del'>-	    (ipb-&gt;ipl_info.ccw.vm_parm_len &gt; 0)) {</div><div class='add'>+	if ((ipb-&gt;ccw.vm_flags &amp; IPL_PB0_CCW_VM_FLAG_VP) &amp;&amp;</div><div class='add'>+	    (ipb-&gt;ccw.vm_parm_len &gt; 0)) {</div><div class='ctx'> </div><div class='del'>-		len = min_t(size_t, size - 1, ipb-&gt;ipl_info.ccw.vm_parm_len);</div><div class='del'>-		memcpy(dest, ipb-&gt;ipl_info.ccw.vm_parm, len);</div><div class='add'>+		len = min_t(size_t, size - 1, ipb-&gt;ccw.vm_parm_len);</div><div class='add'>+		memcpy(dest, ipb-&gt;ccw.vm_parm, len);</div><div class='ctx'> 		/* If at least one character is lowercase, we assume mixed</div><div class='ctx'> 		 * case; otherwise we convert everything to lowercase.</div><div class='ctx'> 		 */</div><div class='head'>diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c<br/>index 0cd5a5f96729..8371855042dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/irq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/irq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/irq.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU_SHARED_ALIGNED(struct irq_stat, irq_stat);</div><div class='hunk'>@@ -73,7 +74,6 @@ static const struct irq_class irqclass_sub_desc[] = {</div><div class='ctx'> 	{.irq = IRQEXT_CMC, .name = "CMC", .desc = "[EXT] CPU-Measurement: Counter"},</div><div class='ctx'> 	{.irq = IRQEXT_FTP, .name = "FTP", .desc = "[EXT] HMC FTP Service"},</div><div class='ctx'> 	{.irq = IRQIO_CIO,  .name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt"},</div><div class='del'>-	{.irq = IRQIO_QAI,  .name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt"},</div><div class='ctx'> 	{.irq = IRQIO_DAS,  .name = "DAS", .desc = "[I/O] DASD"},</div><div class='ctx'> 	{.irq = IRQIO_C15,  .name = "C15", .desc = "[I/O] 3215"},</div><div class='ctx'> 	{.irq = IRQIO_C70,  .name = "C70", .desc = "[I/O] 3270"},</div><div class='hunk'>@@ -81,14 +81,16 @@ static const struct irq_class irqclass_sub_desc[] = {</div><div class='ctx'> 	{.irq = IRQIO_VMR,  .name = "VMR", .desc = "[I/O] Unit Record Devices"},</div><div class='ctx'> 	{.irq = IRQIO_LCS,  .name = "LCS", .desc = "[I/O] LCS"},</div><div class='ctx'> 	{.irq = IRQIO_CTC,  .name = "CTC", .desc = "[I/O] CTC"},</div><div class='del'>-	{.irq = IRQIO_APB,  .name = "APB", .desc = "[I/O] AP Bus"},</div><div class='ctx'> 	{.irq = IRQIO_ADM,  .name = "ADM", .desc = "[I/O] EADM Subchannel"},</div><div class='ctx'> 	{.irq = IRQIO_CSC,  .name = "CSC", .desc = "[I/O] CHSC Subchannel"},</div><div class='del'>-	{.irq = IRQIO_PCI,  .name = "PCI", .desc = "[I/O] PCI Interrupt" },</div><div class='del'>-	{.irq = IRQIO_MSI,  .name = "MSI", .desc = "[I/O] MSI Interrupt" },</div><div class='ctx'> 	{.irq = IRQIO_VIR,  .name = "VIR", .desc = "[I/O] Virtual I/O Devices"},</div><div class='del'>-	{.irq = IRQIO_VAI,  .name = "VAI", .desc = "[I/O] Virtual I/O Devices AI"},</div><div class='del'>-	{.irq = IRQIO_GAL,  .name = "GAL", .desc = "[I/O] GIB Alert"},</div><div class='add'>+	{.irq = IRQIO_QAI,  .name = "QAI", .desc = "[AIO] QDIO Adapter Interrupt"},</div><div class='add'>+	{.irq = IRQIO_APB,  .name = "APB", .desc = "[AIO] AP Bus"},</div><div class='add'>+	{.irq = IRQIO_PCF,  .name = "PCF", .desc = "[AIO] PCI Floating Interrupt"},</div><div class='add'>+	{.irq = IRQIO_PCD,  .name = "PCD", .desc = "[AIO] PCI Directed Interrupt"},</div><div class='add'>+	{.irq = IRQIO_MSI,  .name = "MSI", .desc = "[AIO] MSI Interrupt"},</div><div class='add'>+	{.irq = IRQIO_VAI,  .name = "VAI", .desc = "[AIO] Virtual I/O Devices AI"},</div><div class='add'>+	{.irq = IRQIO_GAL,  .name = "GAL", .desc = "[AIO] GIB Alert"},</div><div class='ctx'> 	{.irq = NMI_NMI,    .name = "NMI", .desc = "[NMI] Machine Check"},</div><div class='ctx'> 	{.irq = CPU_RST,    .name = "RST", .desc = "[CPU] CPU Restart"},</div><div class='ctx'> };</div><div class='hunk'>@@ -116,6 +118,34 @@ void do_IRQ(struct pt_regs *regs, int irq)</div><div class='ctx'> 	set_irq_regs(old_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void show_msi_interrupt(struct seq_file *p, int irq)</div><div class='add'>+{</div><div class='add'>+	struct irq_desc *desc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	irq_lock_sparse();</div><div class='add'>+	desc = irq_to_desc(irq);</div><div class='add'>+	if (!desc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='add'>+	seq_printf(p, "%3d: ", irq);</div><div class='add'>+	for_each_online_cpu(cpu)</div><div class='add'>+		seq_printf(p, "%10u ", kstat_irqs_cpu(irq, cpu));</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;irq_data.chip)</div><div class='add'>+		seq_printf(p, " %8s", desc-&gt;irq_data.chip-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;action)</div><div class='add'>+		seq_printf(p, "  %s", desc-&gt;action-&gt;name);</div><div class='add'>+</div><div class='add'>+	seq_putc(p, '\n');</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='add'>+out:</div><div class='add'>+	irq_unlock_sparse();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * show_interrupts is needed by /proc/interrupts.</div><div class='ctx'>  */</div><div class='hunk'>@@ -128,7 +158,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 	if (index == 0) {</div><div class='ctx'> 		seq_puts(p, "           ");</div><div class='ctx'> 		for_each_online_cpu(cpu)</div><div class='del'>-			seq_printf(p, "CPU%d       ", cpu);</div><div class='add'>+			seq_printf(p, "CPU%-8d", cpu);</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> 	if (index &lt; NR_IRQS_BASE) {</div><div class='hunk'>@@ -139,9 +169,10 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (index &gt; NR_IRQS_BASE)</div><div class='add'>+	if (index &lt; nr_irqs) {</div><div class='add'>+		show_msi_interrupt(p, index);</div><div class='ctx'> 		goto out;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	for (index = 0; index &lt; NR_ARCH_IRQS; index++) {</div><div class='ctx'> 		seq_printf(p, "%s: ", irqclass_sub_desc[index].name);</div><div class='ctx'> 		irq = irqclass_sub_desc[index].irq;</div><div class='head'>diff --git a/arch/s390/kernel/kexec_elf.c b/arch/s390/kernel/kexec_elf.c<br/>index 5a286b012043..6d0635ceddd0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/kexec_elf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/kexec_elf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/kexec_elf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/kexec_elf.c</a></div><div class='hunk'>@@ -10,19 +10,26 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;asm/ipl.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-static int kexec_file_add_elf_kernel(struct kimage *image,</div><div class='del'>-				     struct s390_load_data *data,</div><div class='del'>-				     char *kernel, unsigned long kernel_len)</div><div class='add'>+static int kexec_file_add_kernel_elf(struct kimage *image,</div><div class='add'>+				     struct s390_load_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct kexec_buf buf;</div><div class='ctx'> 	const Elf_Ehdr *ehdr;</div><div class='ctx'> 	const Elf_Phdr *phdr;</div><div class='add'>+	Elf_Addr entry;</div><div class='add'>+	void *kernel;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='add'>+	kernel = image-&gt;kernel_buf;</div><div class='ctx'> 	ehdr = (Elf_Ehdr *)kernel;</div><div class='ctx'> 	buf.image = image;</div><div class='add'>+	if (image-&gt;type == KEXEC_TYPE_CRASH)</div><div class='add'>+		entry = STARTUP_KDUMP_OFFSET;</div><div class='add'>+	else</div><div class='add'>+		entry = ehdr-&gt;e_entry;</div><div class='ctx'> </div><div class='ctx'> 	phdr = (void *)ehdr + ehdr-&gt;e_phoff;</div><div class='ctx'> 	for (i = 0; i &lt; ehdr-&gt;e_phnum; i++, phdr++) {</div><div class='hunk'>@@ -33,30 +40,27 @@ static int kexec_file_add_elf_kernel(struct kimage *image,</div><div class='ctx'> 		buf.bufsz = phdr-&gt;p_filesz;</div><div class='ctx'> </div><div class='ctx'> 		buf.mem = ALIGN(phdr-&gt;p_paddr, phdr-&gt;p_align);</div><div class='add'>+		if (image-&gt;type == KEXEC_TYPE_CRASH)</div><div class='add'>+			buf.mem += crashk_res.start;</div><div class='ctx'> 		buf.memsz = phdr-&gt;p_memsz;</div><div class='add'>+		data-&gt;memsz = ALIGN(data-&gt;memsz, phdr-&gt;p_align) + buf.memsz;</div><div class='ctx'> </div><div class='del'>-		if (phdr-&gt;p_paddr == 0) {</div><div class='add'>+		if (entry - phdr-&gt;p_paddr &lt; phdr-&gt;p_memsz) {</div><div class='ctx'> 			data-&gt;kernel_buf = buf.buffer;</div><div class='del'>-			data-&gt;memsz += STARTUP_NORMAL_OFFSET;</div><div class='del'>-</div><div class='del'>-			buf.buffer += STARTUP_NORMAL_OFFSET;</div><div class='del'>-			buf.bufsz -= STARTUP_NORMAL_OFFSET;</div><div class='del'>-</div><div class='del'>-			buf.mem += STARTUP_NORMAL_OFFSET;</div><div class='del'>-			buf.memsz -= STARTUP_NORMAL_OFFSET;</div><div class='add'>+			data-&gt;kernel_mem = buf.mem;</div><div class='add'>+			data-&gt;parm = buf.buffer + PARMAREA;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (image-&gt;type == KEXEC_TYPE_CRASH)</div><div class='del'>-			buf.mem += crashk_res.start;</div><div class='del'>-</div><div class='add'>+		ipl_report_add_component(data-&gt;report, &amp;buf,</div><div class='add'>+					 IPL_RB_COMPONENT_FLAG_SIGNED |</div><div class='add'>+					 IPL_RB_COMPONENT_FLAG_VERIFIED,</div><div class='add'>+					 IPL_RB_CERT_UNKNOWN);</div><div class='ctx'> 		ret = kexec_add_buffer(&amp;buf);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-</div><div class='del'>-		data-&gt;memsz += buf.memsz;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return data-&gt;memsz ? 0 : -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *s390_elf_load(struct kimage *image,</div><div class='hunk'>@@ -64,11 +68,10 @@ static void *s390_elf_load(struct kimage *image,</div><div class='ctx'> 			   char *initrd, unsigned long initrd_len,</div><div class='ctx'> 			   char *cmdline, unsigned long cmdline_len)</div><div class='ctx'> {</div><div class='del'>-	struct s390_load_data data = {0};</div><div class='ctx'> 	const Elf_Ehdr *ehdr;</div><div class='ctx'> 	const Elf_Phdr *phdr;</div><div class='ctx'> 	size_t size;</div><div class='del'>-	int i, ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* image-&gt;fobs-&gt;probe already checked for valid ELF magic number. */</div><div class='ctx'> 	ehdr = (Elf_Ehdr *)kernel;</div><div class='hunk'>@@ -101,24 +104,7 @@ static void *s390_elf_load(struct kimage *image,</div><div class='ctx'> 	if (size &gt; kernel_len)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	ret = kexec_file_add_elf_kernel(image, &amp;data, kernel, kernel_len);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (!data.memsz)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	if (initrd) {</div><div class='del'>-		ret = kexec_file_add_initrd(image, &amp;data, initrd, initrd_len);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = kexec_file_add_purgatory(image, &amp;data);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	return kexec_file_update_kernel(image, &amp;data);</div><div class='add'>+	return kexec_file_add_components(image, kexec_file_add_kernel_elf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s390_elf_probe(const char *buf, unsigned long len)</div><div class='hunk'>@@ -144,4 +130,7 @@ static int s390_elf_probe(const char *buf, unsigned long len)</div><div class='ctx'> const struct kexec_file_ops s390_kexec_elf_ops = {</div><div class='ctx'> 	.probe = s390_elf_probe,</div><div class='ctx'> 	.load = s390_elf_load,</div><div class='add'>+#ifdef CONFIG_KEXEC_VERIFY_SIG</div><div class='add'>+	.verify_sig = s390_verify_sig,</div><div class='add'>+#endif /* CONFIG_KEXEC_VERIFY_SIG */</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/s390/kernel/kexec_image.c b/arch/s390/kernel/kexec_image.c<br/>index 3800852595e8..58318bf89fd9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/kexec_image.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/kexec_image.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/kexec_image.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/kexec_image.c</a></div><div class='hunk'>@@ -10,31 +10,34 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;asm/ipl.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-static int kexec_file_add_image_kernel(struct kimage *image,</div><div class='del'>-				       struct s390_load_data *data,</div><div class='del'>-				       char *kernel, unsigned long kernel_len)</div><div class='add'>+static int kexec_file_add_kernel_image(struct kimage *image,</div><div class='add'>+				       struct s390_load_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct kexec_buf buf;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	buf.image = image;</div><div class='ctx'> </div><div class='del'>-	buf.buffer = kernel + STARTUP_NORMAL_OFFSET;</div><div class='del'>-	buf.bufsz = kernel_len - STARTUP_NORMAL_OFFSET;</div><div class='add'>+	buf.buffer = image-&gt;kernel_buf;</div><div class='add'>+	buf.bufsz = image-&gt;kernel_buf_len;</div><div class='ctx'> </div><div class='del'>-	buf.mem = STARTUP_NORMAL_OFFSET;</div><div class='add'>+	buf.mem = 0;</div><div class='ctx'> 	if (image-&gt;type == KEXEC_TYPE_CRASH)</div><div class='ctx'> 		buf.mem += crashk_res.start;</div><div class='ctx'> 	buf.memsz = buf.bufsz;</div><div class='ctx'> </div><div class='del'>-	ret = kexec_add_buffer(&amp;buf);</div><div class='add'>+	data-&gt;kernel_buf = image-&gt;kernel_buf;</div><div class='add'>+	data-&gt;kernel_mem = buf.mem;</div><div class='add'>+	data-&gt;parm = image-&gt;kernel_buf + PARMAREA;</div><div class='add'>+	data-&gt;memsz += buf.memsz;</div><div class='ctx'> </div><div class='del'>-	data-&gt;kernel_buf = kernel;</div><div class='del'>-	data-&gt;memsz += buf.memsz + STARTUP_NORMAL_OFFSET;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	ipl_report_add_component(data-&gt;report, &amp;buf,</div><div class='add'>+				 IPL_RB_COMPONENT_FLAG_SIGNED |</div><div class='add'>+				 IPL_RB_COMPONENT_FLAG_VERIFIED,</div><div class='add'>+				 IPL_RB_CERT_UNKNOWN);</div><div class='add'>+	return kexec_add_buffer(&amp;buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *s390_image_load(struct kimage *image,</div><div class='hunk'>@@ -42,24 +45,7 @@ static void *s390_image_load(struct kimage *image,</div><div class='ctx'> 			     char *initrd, unsigned long initrd_len,</div><div class='ctx'> 			     char *cmdline, unsigned long cmdline_len)</div><div class='ctx'> {</div><div class='del'>-	struct s390_load_data data = {0};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = kexec_file_add_image_kernel(image, &amp;data, kernel, kernel_len);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (initrd) {</div><div class='del'>-		ret = kexec_file_add_initrd(image, &amp;data, initrd, initrd_len);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = kexec_file_add_purgatory(image, &amp;data);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	return kexec_file_update_kernel(image, &amp;data);</div><div class='add'>+	return kexec_file_add_components(image, kexec_file_add_kernel_image);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s390_image_probe(const char *buf, unsigned long len)</div><div class='hunk'>@@ -73,4 +59,7 @@ static int s390_image_probe(const char *buf, unsigned long len)</div><div class='ctx'> const struct kexec_file_ops s390_kexec_image_ops = {</div><div class='ctx'> 	.probe = s390_image_probe,</div><div class='ctx'> 	.load = s390_image_load,</div><div class='add'>+#ifdef CONFIG_KEXEC_VERIFY_SIG</div><div class='add'>+	.verify_sig = s390_verify_sig,</div><div class='add'>+#endif /* CONFIG_KEXEC_VERIFY_SIG */</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c<br/>index 7c0a095e9c5f..6f1388391620 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/kprobes.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/kprobes.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/kprobes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/kprobes.c</a></div><div class='hunk'>@@ -27,29 +27,30 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);</div><div class='ctx'> </div><div class='ctx'> struct kretprobe_blackpoint kretprobe_blacklist[] = { };</div><div class='ctx'> </div><div class='del'>-DEFINE_INSN_CACHE_OPS(dmainsn);</div><div class='add'>+DEFINE_INSN_CACHE_OPS(s390_insn);</div><div class='ctx'> </div><div class='del'>-static void *alloc_dmainsn_page(void)</div><div class='del'>-{</div><div class='del'>-	void *page;</div><div class='add'>+static int insn_page_in_use;</div><div class='add'>+static char insn_page[PAGE_SIZE] __aligned(PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	page = (void *) __get_free_page(GFP_KERNEL | GFP_DMA);</div><div class='del'>-	if (page)</div><div class='del'>-		set_memory_x((unsigned long) page, 1);</div><div class='del'>-	return page;</div><div class='add'>+static void *alloc_s390_insn_page(void)</div><div class='add'>+{</div><div class='add'>+	if (xchg(&amp;insn_page_in_use, 1) == 1)</div><div class='add'>+		return NULL;</div><div class='add'>+	set_memory_x((unsigned long) &amp;insn_page, 1);</div><div class='add'>+	return &amp;insn_page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_dmainsn_page(void *page)</div><div class='add'>+static void free_s390_insn_page(void *page)</div><div class='ctx'> {</div><div class='ctx'> 	set_memory_nx((unsigned long) page, 1);</div><div class='del'>-	free_page((unsigned long)page);</div><div class='add'>+	xchg(&amp;insn_page_in_use, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct kprobe_insn_cache kprobe_dmainsn_slots = {</div><div class='del'>-	.mutex = __MUTEX_INITIALIZER(kprobe_dmainsn_slots.mutex),</div><div class='del'>-	.alloc = alloc_dmainsn_page,</div><div class='del'>-	.free = free_dmainsn_page,</div><div class='del'>-	.pages = LIST_HEAD_INIT(kprobe_dmainsn_slots.pages),</div><div class='add'>+struct kprobe_insn_cache kprobe_s390_insn_slots = {</div><div class='add'>+	.mutex = __MUTEX_INITIALIZER(kprobe_s390_insn_slots.mutex),</div><div class='add'>+	.alloc = alloc_s390_insn_page,</div><div class='add'>+	.free = free_s390_insn_page,</div><div class='add'>+	.pages = LIST_HEAD_INIT(kprobe_s390_insn_slots.pages),</div><div class='ctx'> 	.insn_size = MAX_INSN_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +103,7 @@ static int s390_get_insn_slot(struct kprobe *p)</div><div class='ctx'> 	 */</div><div class='ctx'> 	p-&gt;ainsn.insn = NULL;</div><div class='ctx'> 	if (is_kernel_addr(p-&gt;addr))</div><div class='del'>-		p-&gt;ainsn.insn = get_dmainsn_slot();</div><div class='add'>+		p-&gt;ainsn.insn = get_s390_insn_slot();</div><div class='ctx'> 	else if (is_module_addr(p-&gt;addr))</div><div class='ctx'> 		p-&gt;ainsn.insn = get_insn_slot();</div><div class='ctx'> 	return p-&gt;ainsn.insn ? 0 : -ENOMEM;</div><div class='hunk'>@@ -114,7 +115,7 @@ static void s390_free_insn_slot(struct kprobe *p)</div><div class='ctx'> 	if (!p-&gt;ainsn.insn)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (is_kernel_addr(p-&gt;addr))</div><div class='del'>-		free_dmainsn_slot(p-&gt;ainsn.insn, 0);</div><div class='add'>+		free_s390_insn_slot(p-&gt;ainsn.insn, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		free_insn_slot(p-&gt;ainsn.insn, 0);</div><div class='ctx'> 	p-&gt;ainsn.insn = NULL;</div><div class='hunk'>@@ -572,7 +573,7 @@ static int kprobe_trap_handler(struct pt_regs *regs, int trapnr)</div><div class='ctx'> 		 * In case the user-specified fault handler returned</div><div class='ctx'> 		 * zero, try to fix up.</div><div class='ctx'> 		 */</div><div class='del'>-		entry = search_exception_tables(regs-&gt;psw.addr);</div><div class='add'>+		entry = s390_search_extables(regs-&gt;psw.addr);</div><div class='ctx'> 		if (entry) {</div><div class='ctx'> 			regs-&gt;psw.addr = extable_fixup(entry);</div><div class='ctx'> 			return 1;</div><div class='head'>diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c<br/>index cb582649aba6..8a1ae140c5e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/machine_kexec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/machine_kexec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/machine_kexec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/os_info.h&gt;</div><div class='ctx'> #include &lt;asm/set_memory.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +96,7 @@ static void __do_machine_kdump(void *image)</div><div class='ctx'> 	start_kdump(1);</div><div class='ctx'> </div><div class='ctx'> 	/* Die if start_kdump returns */</div><div class='del'>-	disabled_wait((unsigned long) __builtin_return_address(0));</div><div class='add'>+	disabled_wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -253,6 +254,9 @@ void arch_crash_save_vmcoreinfo(void)</div><div class='ctx'> 	VMCOREINFO_SYMBOL(high_memory);</div><div class='ctx'> 	VMCOREINFO_LENGTH(lowcore_ptr, NR_CPUS);</div><div class='ctx'> 	mem_assign_absolute(S390_lowcore.vmcore_info, paddr_vmcoreinfo_note());</div><div class='add'>+	vmcoreinfo_append_str("SDMA=%lx\n", __sdma);</div><div class='add'>+	vmcoreinfo_append_str("EDMA=%lx\n", __edma);</div><div class='add'>+	vmcoreinfo_append_str("KERNELOFFSET=%lx\n", kaslr_offset());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void machine_shutdown(void)</div><div class='hunk'>@@ -280,7 +284,7 @@ static void __do_machine_kexec(void *data)</div><div class='ctx'> 	(*data_mover)(&amp;image-&gt;head, image-&gt;start);</div><div class='ctx'> </div><div class='ctx'> 	/* Die if kexec returns */</div><div class='del'>-	disabled_wait((unsigned long) __builtin_return_address(0));</div><div class='add'>+	disabled_wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c<br/>index 32023b4f9dc0..fbdd3ea73667 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/machine_kexec_file.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/machine_kexec_file.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/machine_kexec_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/machine_kexec_file.c</a></div><div class='hunk'>@@ -8,7 +8,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/verification.h&gt;</div><div class='add'>+#include &lt;asm/boot_data.h&gt;</div><div class='add'>+#include &lt;asm/ipl.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> const struct kexec_file_ops * const kexec_file_loaders[] = {</div><div class='hunk'>@@ -17,38 +22,78 @@ const struct kexec_file_ops * const kexec_file_loaders[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int *kexec_file_update_kernel(struct kimage *image,</div><div class='del'>-			      struct s390_load_data *data)</div><div class='del'>-{</div><div class='del'>-	unsigned long *loc;</div><div class='del'>-</div><div class='del'>-	if (image-&gt;cmdline_buf_len &gt;= ARCH_COMMAND_LINE_SIZE)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	if (image-&gt;cmdline_buf_len)</div><div class='del'>-		memcpy(data-&gt;kernel_buf + COMMAND_LINE_OFFSET,</div><div class='del'>-		       image-&gt;cmdline_buf, image-&gt;cmdline_buf_len);</div><div class='del'>-</div><div class='del'>-	if (image-&gt;type == KEXEC_TYPE_CRASH) {</div><div class='del'>-		loc = (unsigned long *)(data-&gt;kernel_buf + OLDMEM_BASE_OFFSET);</div><div class='del'>-		*loc = crashk_res.start;</div><div class='del'>-</div><div class='del'>-		loc = (unsigned long *)(data-&gt;kernel_buf + OLDMEM_SIZE_OFFSET);</div><div class='del'>-		*loc = crashk_res.end - crashk_res.start + 1;</div><div class='del'>-	}</div><div class='add'>+#ifdef CONFIG_KEXEC_VERIFY_SIG</div><div class='add'>+/*</div><div class='add'>+ * Module signature information block.</div><div class='add'>+ *</div><div class='add'>+ * The constituents of the signature section are, in order:</div><div class='add'>+ *</div><div class='add'>+ *	- Signer's name</div><div class='add'>+ *	- Key identifier</div><div class='add'>+ *	- Signature data</div><div class='add'>+ *	- Information block</div><div class='add'>+ */</div><div class='add'>+struct module_signature {</div><div class='add'>+	u8	algo;		/* Public-key crypto algorithm [0] */</div><div class='add'>+	u8	hash;		/* Digest algorithm [0] */</div><div class='add'>+	u8	id_type;	/* Key identifier type [PKEY_ID_PKCS7] */</div><div class='add'>+	u8	signer_len;	/* Length of signer's name [0] */</div><div class='add'>+	u8	key_id_len;	/* Length of key identifier [0] */</div><div class='add'>+	u8	__pad[3];</div><div class='add'>+	__be32	sig_len;	/* Length of signature data */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (image-&gt;initrd_buf) {</div><div class='del'>-		loc = (unsigned long *)(data-&gt;kernel_buf + INITRD_START_OFFSET);</div><div class='del'>-		*loc = data-&gt;initrd_load_addr;</div><div class='add'>+#define PKEY_ID_PKCS7 2</div><div class='ctx'> </div><div class='del'>-		loc = (unsigned long *)(data-&gt;kernel_buf + INITRD_SIZE_OFFSET);</div><div class='del'>-		*loc = image-&gt;initrd_buf_len;</div><div class='add'>+int s390_verify_sig(const char *kernel, unsigned long kernel_len)</div><div class='add'>+{</div><div class='add'>+	const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1;</div><div class='add'>+	struct module_signature *ms;</div><div class='add'>+	unsigned long sig_len;</div><div class='add'>+</div><div class='add'>+	/* Skip signature verification when not secure IPLed. */</div><div class='add'>+	if (!ipl_secure_flag)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (marker_len &gt; kernel_len)</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+	if (memcmp(kernel + kernel_len - marker_len, MODULE_SIG_STRING,</div><div class='add'>+		   marker_len))</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+	kernel_len -= marker_len;</div><div class='add'>+</div><div class='add'>+	ms = (void *)kernel + kernel_len - sizeof(*ms);</div><div class='add'>+	kernel_len -= sizeof(*ms);</div><div class='add'>+</div><div class='add'>+	sig_len = be32_to_cpu(ms-&gt;sig_len);</div><div class='add'>+	if (sig_len &gt;= kernel_len)</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+	kernel_len -= sig_len;</div><div class='add'>+</div><div class='add'>+	if (ms-&gt;id_type != PKEY_ID_PKCS7)</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+	if (ms-&gt;algo != 0 ||</div><div class='add'>+	    ms-&gt;hash != 0 ||</div><div class='add'>+	    ms-&gt;signer_len != 0 ||</div><div class='add'>+	    ms-&gt;key_id_len != 0 ||</div><div class='add'>+	    ms-&gt;__pad[0] != 0 ||</div><div class='add'>+	    ms-&gt;__pad[1] != 0 ||</div><div class='add'>+	    ms-&gt;__pad[2] != 0) {</div><div class='add'>+		return -EBADMSG;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return verify_pkcs7_signature(kernel, kernel_len,</div><div class='add'>+				      kernel + kernel_len, sig_len,</div><div class='add'>+				      VERIFY_USE_PLATFORM_KEYRING,</div><div class='add'>+				      VERIFYING_MODULE_SIGNATURE,</div><div class='add'>+				      NULL, NULL);</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_KEXEC_VERIFY_SIG */</div><div class='ctx'> </div><div class='del'>-static int kexec_file_update_purgatory(struct kimage *image)</div><div class='add'>+static int kexec_file_update_purgatory(struct kimage *image,</div><div class='add'>+				       struct s390_load_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	u64 entry, type;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -90,7 +135,8 @@ static int kexec_file_update_purgatory(struct kimage *image)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kexec_file_add_purgatory(struct kimage *image, struct s390_load_data *data)</div><div class='add'>+static int kexec_file_add_purgatory(struct kimage *image,</div><div class='add'>+				    struct s390_load_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct kexec_buf buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -105,21 +151,21 @@ int kexec_file_add_purgatory(struct kimage *image, struct s390_load_data *data)</div><div class='ctx'> 	ret = kexec_load_purgatory(image, &amp;buf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='add'>+	data-&gt;memsz += buf.memsz;</div><div class='ctx'> </div><div class='del'>-	ret = kexec_file_update_purgatory(image);</div><div class='del'>-	return ret;</div><div class='add'>+	return kexec_file_update_purgatory(image, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,</div><div class='del'>-			  char *initrd, unsigned long initrd_len)</div><div class='add'>+static int kexec_file_add_initrd(struct kimage *image,</div><div class='add'>+				 struct s390_load_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct kexec_buf buf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	buf.image = image;</div><div class='ctx'> </div><div class='del'>-	buf.buffer = initrd;</div><div class='del'>-	buf.bufsz = initrd_len;</div><div class='add'>+	buf.buffer = image-&gt;initrd_buf;</div><div class='add'>+	buf.bufsz = image-&gt;initrd_buf_len;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;memsz = ALIGN(data-&gt;memsz, PAGE_SIZE);</div><div class='ctx'> 	buf.mem = data-&gt;memsz;</div><div class='hunk'>@@ -127,11 +173,115 @@ int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,</div><div class='ctx'> 		buf.mem += crashk_res.start;</div><div class='ctx'> 	buf.memsz = buf.bufsz;</div><div class='ctx'> </div><div class='del'>-	data-&gt;initrd_load_addr = buf.mem;</div><div class='add'>+	data-&gt;parm-&gt;initrd_start = buf.mem;</div><div class='add'>+	data-&gt;parm-&gt;initrd_size = buf.memsz;</div><div class='ctx'> 	data-&gt;memsz += buf.memsz;</div><div class='ctx'> </div><div class='ctx'> 	ret = kexec_add_buffer(&amp;buf);</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'>+	return ipl_report_add_component(data-&gt;report, &amp;buf, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kexec_file_add_ipl_report(struct kimage *image,</div><div class='add'>+				     struct s390_load_data *data)</div><div class='add'>+{</div><div class='add'>+	__u32 *lc_ipl_parmblock_ptr;</div><div class='add'>+	unsigned int len, ncerts;</div><div class='add'>+	struct kexec_buf buf;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	void *ptr, *end;</div><div class='add'>+</div><div class='add'>+	buf.image = image;</div><div class='add'>+</div><div class='add'>+	data-&gt;memsz = ALIGN(data-&gt;memsz, PAGE_SIZE);</div><div class='add'>+	buf.mem = data-&gt;memsz;</div><div class='add'>+	if (image-&gt;type == KEXEC_TYPE_CRASH)</div><div class='add'>+		buf.mem += crashk_res.start;</div><div class='add'>+</div><div class='add'>+	ptr = (void *)ipl_cert_list_addr;</div><div class='add'>+	end = ptr + ipl_cert_list_size;</div><div class='add'>+	ncerts = 0;</div><div class='add'>+	while (ptr &lt; end) {</div><div class='add'>+		ncerts++;</div><div class='add'>+		len = *(unsigned int *)ptr;</div><div class='add'>+		ptr += sizeof(len);</div><div class='add'>+		ptr += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = data-&gt;memsz + data-&gt;report-&gt;size;</div><div class='add'>+	addr += ncerts * sizeof(struct ipl_rb_certificate_entry);</div><div class='add'>+	ptr = (void *)ipl_cert_list_addr;</div><div class='add'>+	while (ptr &lt; end) {</div><div class='add'>+		len = *(unsigned int *)ptr;</div><div class='add'>+		ptr += sizeof(len);</div><div class='add'>+		ipl_report_add_certificate(data-&gt;report, ptr, addr, len);</div><div class='add'>+		addr += len;</div><div class='add'>+		ptr += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf.buffer = ipl_report_finish(data-&gt;report);</div><div class='add'>+	buf.bufsz = data-&gt;report-&gt;size;</div><div class='add'>+	buf.memsz = buf.bufsz;</div><div class='add'>+</div><div class='add'>+	data-&gt;memsz += buf.memsz;</div><div class='add'>+</div><div class='add'>+	lc_ipl_parmblock_ptr =</div><div class='add'>+		data-&gt;kernel_buf + offsetof(struct lowcore, ipl_parmblock_ptr);</div><div class='add'>+	*lc_ipl_parmblock_ptr = (__u32)buf.mem;</div><div class='add'>+</div><div class='add'>+	return kexec_add_buffer(&amp;buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *kexec_file_add_components(struct kimage *image,</div><div class='add'>+				int (*add_kernel)(struct kimage *image,</div><div class='add'>+						  struct s390_load_data *data))</div><div class='add'>+{</div><div class='add'>+	struct s390_load_data data = {0};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data.report = ipl_report_init(&amp;ipl_block);</div><div class='add'>+	if (IS_ERR(data.report))</div><div class='add'>+		return data.report;</div><div class='add'>+</div><div class='add'>+	ret = add_kernel(image, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (image-&gt;cmdline_buf_len &gt;= ARCH_COMMAND_LINE_SIZE) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	memcpy(data.parm-&gt;command_line, image-&gt;cmdline_buf,</div><div class='add'>+	       image-&gt;cmdline_buf_len);</div><div class='add'>+</div><div class='add'>+	if (image-&gt;type == KEXEC_TYPE_CRASH) {</div><div class='add'>+		data.parm-&gt;oldmem_base = crashk_res.start;</div><div class='add'>+		data.parm-&gt;oldmem_size = crashk_res.end - crashk_res.start + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (image-&gt;initrd_buf) {</div><div class='add'>+		ret = kexec_file_add_initrd(image, &amp;data);</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 = kexec_file_add_purgatory(image, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (data.kernel_mem == 0) {</div><div class='add'>+		unsigned long restart_psw =  0x0008000080000000UL;</div><div class='add'>+		restart_psw += image-&gt;start;</div><div class='add'>+		memcpy(data.kernel_buf, &amp;restart_psw, sizeof(restart_psw));</div><div class='add'>+		image-&gt;start = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = kexec_file_add_ipl_report(image, &amp;data);</div><div class='add'>+out:</div><div class='add'>+	ipl_report_free(data.report);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int arch_kexec_apply_relocations_add(struct purgatory_info *pi,</div><div class='hunk'>@@ -140,7 +290,7 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,</div><div class='ctx'> 				     const Elf_Shdr *symtab)</div><div class='ctx'> {</div><div class='ctx'> 	Elf_Rela *relas;</div><div class='del'>-	int i;</div><div class='add'>+	int i, r_type;</div><div class='ctx'> </div><div class='ctx'> 	relas = (void *)pi-&gt;ehdr + relsec-&gt;sh_offset;</div><div class='ctx'> </div><div class='hunk'>@@ -174,46 +324,8 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,</div><div class='ctx'> </div><div class='ctx'> 		addr = section-&gt;sh_addr + relas[i].r_offset;</div><div class='ctx'> </div><div class='del'>-		switch (ELF64_R_TYPE(relas[i].r_info)) {</div><div class='del'>-		case R_390_8:		/* Direct 8 bit.   */</div><div class='del'>-			*(u8 *)loc = val;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_12:		/* Direct 12 bit.  */</div><div class='del'>-			*(u16 *)loc &amp;= 0xf000;</div><div class='del'>-			*(u16 *)loc |= val &amp; 0xfff;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_16:		/* Direct 16 bit.  */</div><div class='del'>-			*(u16 *)loc = val;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_20:		/* Direct 20 bit.  */</div><div class='del'>-			*(u32 *)loc &amp;= 0xf00000ff;</div><div class='del'>-			*(u32 *)loc |= (val &amp; 0xfff) &lt;&lt; 16;	/* DL */</div><div class='del'>-			*(u32 *)loc |= (val &amp; 0xff000) &gt;&gt; 4;	/* DH */</div><div class='del'>-			break;</div><div class='del'>-		case R_390_32:		/* Direct 32 bit.  */</div><div class='del'>-			*(u32 *)loc = val;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_64:		/* Direct 64 bit.  */</div><div class='del'>-			*(u64 *)loc = val;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_PC16:	/* PC relative 16 bit.	*/</div><div class='del'>-			*(u16 *)loc = (val - addr);</div><div class='del'>-			break;</div><div class='del'>-		case R_390_PC16DBL:	/* PC relative 16 bit shifted by 1.  */</div><div class='del'>-			*(u16 *)loc = (val - addr) &gt;&gt; 1;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_PC32DBL:	/* PC relative 32 bit shifted by 1.  */</div><div class='del'>-			*(u32 *)loc = (val - addr) &gt;&gt; 1;</div><div class='del'>-			break;</div><div class='del'>-		case R_390_PC32:	/* PC relative 32 bit.	*/</div><div class='del'>-			*(u32 *)loc = (val - addr);</div><div class='del'>-			break;</div><div class='del'>-		case R_390_PC64:	/* PC relative 64 bit.	*/</div><div class='del'>-			*(u64 *)loc = (val - addr);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		r_type = ELF64_R_TYPE(relas[i].r_info);</div><div class='add'>+		arch_kexec_do_relocs(r_type, loc, val, addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -225,10 +337,8 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,</div><div class='ctx'> 	 * load memory in head.S will be accessed, e.g. to register the next</div><div class='ctx'> 	 * command line. If the next kernel were smaller the current kernel</div><div class='ctx'> 	 * will panic at load.</div><div class='del'>-	 *</div><div class='del'>-	 * 0x11000 = sizeof(head.S)</div><div class='ctx'> 	 */</div><div class='del'>-	if (buf_len &lt; 0x11000)</div><div class='add'>+	if (buf_len &lt; HEAD_END)</div><div class='ctx'> 		return -ENOEXEC;</div><div class='ctx'> </div><div class='ctx'> 	return kexec_image_probe_default(image, buf, buf_len);</div><div class='head'>diff --git a/arch/s390/kernel/machine_kexec_reloc.c b/arch/s390/kernel/machine_kexec_reloc.c<br/>new file mode 100644<br/>index 000000000000..1dded39239f8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/machine_kexec_reloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/machine_kexec_reloc.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+</div><div class='add'>+int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val,</div><div class='add'>+			 unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	switch (r_type) {</div><div class='add'>+	case R_390_NONE:</div><div class='add'>+		break;</div><div class='add'>+	case R_390_8:		/* Direct 8 bit.   */</div><div class='add'>+		*(u8 *)loc = val;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_12:		/* Direct 12 bit.  */</div><div class='add'>+		*(u16 *)loc &amp;= 0xf000;</div><div class='add'>+		*(u16 *)loc |= val &amp; 0xfff;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_16:		/* Direct 16 bit.  */</div><div class='add'>+		*(u16 *)loc = val;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_20:		/* Direct 20 bit.  */</div><div class='add'>+		*(u32 *)loc &amp;= 0xf00000ff;</div><div class='add'>+		*(u32 *)loc |= (val &amp; 0xfff) &lt;&lt; 16;	/* DL */</div><div class='add'>+		*(u32 *)loc |= (val &amp; 0xff000) &gt;&gt; 4;	/* DH */</div><div class='add'>+		break;</div><div class='add'>+	case R_390_32:		/* Direct 32 bit.  */</div><div class='add'>+		*(u32 *)loc = val;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_64:		/* Direct 64 bit.  */</div><div class='add'>+		*(u64 *)loc = val;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_PC16:	/* PC relative 16 bit.	*/</div><div class='add'>+		*(u16 *)loc = (val - addr);</div><div class='add'>+		break;</div><div class='add'>+	case R_390_PC16DBL:	/* PC relative 16 bit shifted by 1.  */</div><div class='add'>+		*(u16 *)loc = (val - addr) &gt;&gt; 1;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_PC32DBL:	/* PC relative 32 bit shifted by 1.  */</div><div class='add'>+		*(u32 *)loc = (val - addr) &gt;&gt; 1;</div><div class='add'>+		break;</div><div class='add'>+	case R_390_PC32:	/* PC relative 32 bit.	*/</div><div class='add'>+		*(u32 *)loc = (val - addr);</div><div class='add'>+		break;</div><div class='add'>+	case R_390_PC64:	/* PC relative 64 bit.	*/</div><div class='add'>+		*(u64 *)loc = (val - addr);</div><div class='add'>+		break;</div><div class='add'>+	case R_390_RELATIVE:</div><div class='add'>+		*(unsigned long *) loc = val;</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='head'>diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S<br/>index e93fbf02490c..9e1660a6b9db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/mcount.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/mcount.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/mcount.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/mcount.S</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> ENTRY(ftrace_stub)</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(ftrace_stub)</div><div class='ctx'> </div><div class='ctx'> #define STACK_FRAME_SIZE  (STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> #define STACK_PTREGS	  (STACK_FRAME_OVERHEAD)</div><div class='hunk'>@@ -28,7 +29,7 @@ ENTRY(ftrace_stub)</div><div class='ctx'> </div><div class='ctx'> ENTRY(_mcount)</div><div class='ctx'> 	BR_EX	%r14</div><div class='del'>-</div><div class='add'>+ENDPROC(_mcount)</div><div class='ctx'> EXPORT_SYMBOL(_mcount)</div><div class='ctx'> </div><div class='ctx'> ENTRY(ftrace_caller)</div><div class='hunk'>@@ -61,10 +62,11 @@ ENTRY(ftrace_caller)</div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> # The j instruction gets runtime patched to a nop instruction.</div><div class='ctx'> # See ftrace_enable_ftrace_graph_caller.</div><div class='del'>-ENTRY(ftrace_graph_caller)</div><div class='add'>+	.globl ftrace_graph_caller</div><div class='add'>+ftrace_graph_caller:</div><div class='ctx'> 	j	ftrace_graph_caller_end</div><div class='del'>-	lg	%r2,(STACK_PTREGS_GPRS+14*8)(%r15)</div><div class='del'>-	lg	%r3,(STACK_PTREGS_PSW+8)(%r15)</div><div class='add'>+	lmg	%r2,%r3,(STACK_PTREGS_GPRS+14*8)(%r15)</div><div class='add'>+	lg	%r4,(STACK_PTREGS_PSW+8)(%r15)</div><div class='ctx'> 	brasl	%r14,prepare_ftrace_return</div><div class='ctx'> 	stg	%r2,(STACK_PTREGS_GPRS+14*8)(%r15)</div><div class='ctx'> ftrace_graph_caller_end:</div><div class='hunk'>@@ -73,6 +75,7 @@ ftrace_graph_caller_end:</div><div class='ctx'> 	lg	%r1,(STACK_PTREGS_PSW+8)(%r15)</div><div class='ctx'> 	lmg	%r2,%r15,(STACK_PTREGS_GPRS+2*8)(%r15)</div><div class='ctx'> 	BR_EX	%r1</div><div class='add'>+ENDPROC(ftrace_caller)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> </div><div class='hunk'>@@ -86,5 +89,6 @@ ENTRY(return_to_handler)</div><div class='ctx'> 	lgr	%r14,%r2</div><div class='ctx'> 	lmg	%r2,%r5,32(%r15)</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(return_to_handler)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c<br/>index 8c867b43c8eb..0a487fae763e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/nmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/nmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/nmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/nmi.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ void nmi_free_per_cpu(struct lowcore *lc)</div><div class='ctx'> static notrace void s390_handle_damage(void)</div><div class='ctx'> {</div><div class='ctx'> 	smp_emergency_stop();</div><div class='del'>-	disabled_wait((unsigned long) __builtin_return_address(0));</div><div class='add'>+	disabled_wait();</div><div class='ctx'> 	while (1);</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(s390_handle_damage);</div><div class='head'>diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c<br/>index bdddaae96559..29e511f5bf06 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/nospec-branch.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/nospec-branch.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/nospec-branch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/nospec-branch.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/nospec-branch.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int __init nobp_setup_early(char *str)</div><div class='hunk'>@@ -37,7 +38,7 @@ static int __init nospec_report(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_facility(156))</div><div class='ctx'> 		pr_info("Spectre V2 mitigation: etokens\n");</div><div class='del'>-	if (IS_ENABLED(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable)</div><div class='add'>+	if (__is_defined(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable)</div><div class='ctx'> 		pr_info("Spectre V2 mitigation: execute trampolines\n");</div><div class='ctx'> 	if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))</div><div class='ctx'> 		pr_info("Spectre V2 mitigation: limited branch prediction\n");</div><div class='hunk'>@@ -58,15 +59,15 @@ early_param("nospectre_v2", nospectre_v2_setup_early);</div><div class='ctx'> </div><div class='ctx'> void __init nospec_auto_detect(void)</div><div class='ctx'> {</div><div class='del'>-	if (test_facility(156)) {</div><div class='add'>+	if (test_facility(156) || cpu_mitigations_off()) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The machine supports etokens.</div><div class='ctx'> 		 * Disable expolines and disable nobp.</div><div class='ctx'> 		 */</div><div class='del'>-		if (IS_ENABLED(CC_USING_EXPOLINE))</div><div class='add'>+		if (__is_defined(CC_USING_EXPOLINE))</div><div class='ctx'> 			nospec_disable = 1;</div><div class='ctx'> 		__clear_facility(82, S390_lowcore.alt_stfle_fac_list);</div><div class='del'>-	} else if (IS_ENABLED(CC_USING_EXPOLINE)) {</div><div class='add'>+	} else if (__is_defined(CC_USING_EXPOLINE)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The kernel has been compiled with expolines.</div><div class='ctx'> 		 * Keep expolines enabled and disable nobp.</div><div class='head'>diff --git a/arch/s390/kernel/nospec-sysfs.c b/arch/s390/kernel/nospec-sysfs.c<br/>index e30e580ae362..48f472bf9290 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/nospec-sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/nospec-sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/nospec-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/nospec-sysfs.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@ ssize_t cpu_show_spectre_v2(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	if (test_facility(156))</div><div class='ctx'> 		return sprintf(buf, "Mitigation: etokens\n");</div><div class='del'>-	if (IS_ENABLED(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable)</div><div class='add'>+	if (__is_defined(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable)</div><div class='ctx'> 		return sprintf(buf, "Mitigation: execute trampolines\n");</div><div class='ctx'> 	if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))</div><div class='ctx'> 		return sprintf(buf, "Mitigation: limited branch prediction\n");</div><div class='head'>diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c<br/>index e1c54d28713a..48d48b6187c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_cpum_cf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_cpum_cf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_cpum_cf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/perf_cpum_cf.c</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Performance event support for s390x - CPU-measurement Counter Facility</div><div class='ctx'>  *</div><div class='del'>- *  Copyright IBM Corp. 2012, 2017</div><div class='del'>- *  Author(s): Hendrik Brueckner &lt;brueckner@linux.vnet.ibm.com&gt;</div><div class='add'>+ *  Copyright IBM Corp. 2012, 2019</div><div class='add'>+ *  Author(s): Hendrik Brueckner &lt;brueckner@linux.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #define KMSG_COMPONENT	"cpum_cf"</div><div class='ctx'> #define pr_fmt(fmt)	KMSG_COMPONENT ": " fmt</div><div class='hunk'>@@ -26,7 +26,7 @@ static enum cpumf_ctr_set get_counter_set(u64 event)</div><div class='ctx'> 		set = CPUMF_CTR_SET_USER;</div><div class='ctx'> 	else if (event &lt; 128)</div><div class='ctx'> 		set = CPUMF_CTR_SET_CRYPTO;</div><div class='del'>-	else if (event &lt; 256)</div><div class='add'>+	else if (event &lt; 288)</div><div class='ctx'> 		set = CPUMF_CTR_SET_EXT;</div><div class='ctx'> 	else if (event &gt;= 448 &amp;&amp; event &lt; 496)</div><div class='ctx'> 		set = CPUMF_CTR_SET_MT_DIAG;</div><div class='hunk'>@@ -50,12 +50,19 @@ static int validate_ctr_version(const struct hw_perf_event *hwc)</div><div class='ctx'> 			err = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUMF_CTR_SET_CRYPTO:</div><div class='add'>+		if ((cpuhw-&gt;info.csvn &gt;= 1 &amp;&amp; cpuhw-&gt;info.csvn &lt;= 5 &amp;&amp;</div><div class='add'>+		     hwc-&gt;config &gt; 79) ||</div><div class='add'>+		    (cpuhw-&gt;info.csvn &gt;= 6 &amp;&amp; hwc-&gt;config &gt; 83))</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='ctx'> 	case CPUMF_CTR_SET_EXT:</div><div class='ctx'> 		if (cpuhw-&gt;info.csvn &lt; 1)</div><div class='ctx'> 			err = -EOPNOTSUPP;</div><div class='ctx'> 		if ((cpuhw-&gt;info.csvn == 1 &amp;&amp; hwc-&gt;config &gt; 159) ||</div><div class='ctx'> 		    (cpuhw-&gt;info.csvn == 2 &amp;&amp; hwc-&gt;config &gt; 175) ||</div><div class='del'>-		    (cpuhw-&gt;info.csvn  &gt; 2 &amp;&amp; hwc-&gt;config &gt; 255))</div><div class='add'>+		    (cpuhw-&gt;info.csvn &gt;= 3 &amp;&amp; cpuhw-&gt;info.csvn &lt;= 5</div><div class='add'>+		     &amp;&amp; hwc-&gt;config &gt; 255) ||</div><div class='add'>+		    (cpuhw-&gt;info.csvn &gt;= 6 &amp;&amp; hwc-&gt;config &gt; 287))</div><div class='ctx'> 			err = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUMF_CTR_SET_MT_DIAG:</div><div class='head'>diff --git a/arch/s390/kernel/perf_cpum_cf_diag.c b/arch/s390/kernel/perf_cpum_cf_diag.c<br/>index c6fad208c2fa..d4e031f7b9c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_cpum_cf_diag.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_cpum_cf_diag.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_cpum_cf_diag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/perf_cpum_cf_diag.c</a></div><div class='hunk'>@@ -196,23 +196,30 @@ static void cf_diag_perf_event_destroy(struct perf_event *event)</div><div class='ctx'>  */</div><div class='ctx'> static int __hw_perf_event_init(struct perf_event *event)</div><div class='ctx'> {</div><div class='del'>-	struct cpu_cf_events *cpuhw = this_cpu_ptr(&amp;cpu_cf_events);</div><div class='ctx'> 	struct perf_event_attr *attr = &amp;event-&gt;attr;</div><div class='add'>+	struct cpu_cf_events *cpuhw;</div><div class='ctx'> 	enum cpumf_ctr_set i;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	debug_sprintf_event(cf_diag_dbg, 5,</div><div class='del'>-			    "%s event %p cpu %d authorized %#x\n", __func__,</div><div class='del'>-			    event, event-&gt;cpu, cpuhw-&gt;info.auth_ctl);</div><div class='add'>+	debug_sprintf_event(cf_diag_dbg, 5, "%s event %p cpu %d\n", __func__,</div><div class='add'>+			    event, event-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 	event-&gt;hw.config = attr-&gt;config;</div><div class='ctx'> 	event-&gt;hw.config_base = 0;</div><div class='del'>-	local64_set(&amp;event-&gt;count, 0);</div><div class='ctx'> </div><div class='del'>-	/* Add all authorized counter sets to config_base */</div><div class='add'>+	/* Add all authorized counter sets to config_base. The</div><div class='add'>+	 * the hardware init function is either called per-cpu or just once</div><div class='add'>+	 * for all CPUS (event-&gt;cpu == -1).  This depends on the whether</div><div class='add'>+	 * counting is started for all CPUs or on a per workload base where</div><div class='add'>+	 * the perf event moves from one CPU to another CPU.</div><div class='add'>+	 * Checking the authorization on any CPU is fine as the hardware</div><div class='add'>+	 * applies the same authorization settings to all CPUs.</div><div class='add'>+	 */</div><div class='add'>+	cpuhw = &amp;get_cpu_var(cpu_cf_events);</div><div class='ctx'> 	for (i = CPUMF_CTR_SET_BASIC; i &lt; CPUMF_CTR_SET_MAX; ++i)</div><div class='ctx'> 		if (cpuhw-&gt;info.auth_ctl &amp; cpumf_ctr_ctl[i])</div><div class='ctx'> 			event-&gt;hw.config_base |= cpumf_ctr_ctl[i];</div><div class='add'>+	put_cpu_var(cpu_cf_events);</div><div class='ctx'> </div><div class='ctx'> 	/* No authorized counter sets, nothing to count/sample */</div><div class='ctx'> 	if (!event-&gt;hw.config_base) {</div><div class='hunk'>@@ -299,15 +306,20 @@ static size_t cf_diag_ctrset_size(enum cpumf_ctr_set ctrset,</div><div class='ctx'> 			ctrset_size = 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUMF_CTR_SET_CRYPTO:</div><div class='del'>-		ctrset_size = 16;</div><div class='add'>+		if (info-&gt;csvn &gt;= 1 &amp;&amp; info-&gt;csvn &lt;= 5)</div><div class='add'>+			ctrset_size = 16;</div><div class='add'>+		else if (info-&gt;csvn == 6)</div><div class='add'>+			ctrset_size = 20;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUMF_CTR_SET_EXT:</div><div class='ctx'> 		if (info-&gt;csvn == 1)</div><div class='ctx'> 			ctrset_size = 32;</div><div class='ctx'> 		else if (info-&gt;csvn == 2)</div><div class='ctx'> 			ctrset_size = 48;</div><div class='del'>-		else if (info-&gt;csvn &gt;= 3)</div><div class='add'>+		else if (info-&gt;csvn &gt;= 3 &amp;&amp; info-&gt;csvn &lt;= 5)</div><div class='ctx'> 			ctrset_size = 128;</div><div class='add'>+		else if (info-&gt;csvn == 6)</div><div class='add'>+			ctrset_size = 160;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUMF_CTR_SET_MT_DIAG:</div><div class='ctx'> 		if (info-&gt;csvn &gt; 3)</div><div class='head'>diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c<br/>index b45238c89728..34cc96449b30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_cpum_cf_events.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_cpum_cf_events.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_cpum_cf_events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/perf_cpum_cf_events.c</a></div><div class='hunk'>@@ -31,22 +31,26 @@ CPUMF_EVENT_ATTR(cf_fvn3, PROBLEM_STATE_CPU_CYCLES, 0x0020);</div><div class='ctx'> CPUMF_EVENT_ATTR(cf_fvn3, PROBLEM_STATE_INSTRUCTIONS, 0x0021);</div><div class='ctx'> CPUMF_EVENT_ATTR(cf_fvn3, L1D_DIR_WRITES, 0x0004);</div><div class='ctx'> CPUMF_EVENT_ATTR(cf_fvn3, L1D_PENALTY_CYCLES, 0x0005);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, PRNG_FUNCTIONS, 0x0040);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, PRNG_CYCLES, 0x0041);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, PRNG_BLOCKED_FUNCTIONS, 0x0042);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, PRNG_BLOCKED_CYCLES, 0x0043);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, SHA_FUNCTIONS, 0x0044);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, SHA_CYCLES, 0x0045);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, SHA_BLOCKED_FUNCTIONS, 0x0046);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, SHA_BLOCKED_CYCLES, 0x0047);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, DEA_FUNCTIONS, 0x0048);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, DEA_CYCLES, 0x0049);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, DEA_BLOCKED_FUNCTIONS, 0x004a);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, DEA_BLOCKED_CYCLES, 0x004b);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, AES_FUNCTIONS, 0x004c);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, AES_CYCLES, 0x004d);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, AES_BLOCKED_FUNCTIONS, 0x004e);</div><div class='del'>-CPUMF_EVENT_ATTR(cf_svn_generic, AES_BLOCKED_CYCLES, 0x004f);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, PRNG_FUNCTIONS, 0x0040);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, PRNG_CYCLES, 0x0041);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, PRNG_BLOCKED_FUNCTIONS, 0x0042);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, PRNG_BLOCKED_CYCLES, 0x0043);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, SHA_FUNCTIONS, 0x0044);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, SHA_CYCLES, 0x0045);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, SHA_BLOCKED_FUNCTIONS, 0x0046);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, SHA_BLOCKED_CYCLES, 0x0047);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, DEA_FUNCTIONS, 0x0048);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, DEA_CYCLES, 0x0049);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, DEA_BLOCKED_FUNCTIONS, 0x004a);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, DEA_BLOCKED_CYCLES, 0x004b);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, AES_FUNCTIONS, 0x004c);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, AES_CYCLES, 0x004d);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, AES_BLOCKED_FUNCTIONS, 0x004e);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_12345, AES_BLOCKED_CYCLES, 0x004f);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_6, ECC_FUNCTION_COUNT, 0x0050);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_6, ECC_CYCLES_COUNT, 0x0051);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_6, ECC_BLOCKED_FUNCTION_COUNT, 0x0052);</div><div class='add'>+CPUMF_EVENT_ATTR(cf_svn_6, ECC_BLOCKED_CYCLES_COUNT, 0x0053);</div><div class='ctx'> CPUMF_EVENT_ATTR(cf_z10, L1I_L2_SOURCED_WRITES, 0x0080);</div><div class='ctx'> CPUMF_EVENT_ATTR(cf_z10, L1D_L2_SOURCED_WRITES, 0x0081);</div><div class='ctx'> CPUMF_EVENT_ATTR(cf_z10, L1I_L3_LOCAL_WRITES, 0x0082);</div><div class='hunk'>@@ -262,23 +266,47 @@ static struct attribute *cpumcf_fvn3_pmu_event_attr[] __initdata = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct attribute *cpumcf_svn_generic_pmu_event_attr[] __initdata = {</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, PRNG_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, PRNG_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, PRNG_BLOCKED_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, PRNG_BLOCKED_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, SHA_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, SHA_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, SHA_BLOCKED_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, SHA_BLOCKED_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, DEA_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, DEA_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, DEA_BLOCKED_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, DEA_BLOCKED_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, AES_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, AES_CYCLES),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, AES_BLOCKED_FUNCTIONS),</div><div class='del'>-	CPUMF_EVENT_PTR(cf_svn_generic, AES_BLOCKED_CYCLES),</div><div class='add'>+static struct attribute *cpumcf_svn_12345_pmu_event_attr[] __initdata = {</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_BLOCKED_CYCLES),</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *cpumcf_svn_6_pmu_event_attr[] __initdata = {</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, SHA_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, DEA_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_BLOCKED_FUNCTIONS),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_12345, AES_BLOCKED_CYCLES),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_6, ECC_FUNCTION_COUNT),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_6, ECC_CYCLES_COUNT),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_6, ECC_BLOCKED_FUNCTION_COUNT),</div><div class='add'>+	CPUMF_EVENT_PTR(cf_svn_6, ECC_BLOCKED_CYCLES_COUNT),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -562,7 +590,18 @@ __init const struct attribute_group **cpumf_cf_event_group(void)</div><div class='ctx'> 	default:</div><div class='ctx'> 		cfvn = none;</div><div class='ctx'> 	}</div><div class='del'>-	csvn = cpumcf_svn_generic_pmu_event_attr;</div><div class='add'>+</div><div class='add'>+	/* Determine version specific crypto set */</div><div class='add'>+	switch (ci.csvn) {</div><div class='add'>+	case 1 ... 5:</div><div class='add'>+		csvn = cpumcf_svn_12345_pmu_event_attr;</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		csvn = cpumcf_svn_6_pmu_event_attr;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		csvn = none;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Determine model-specific counter set(s) */</div><div class='ctx'> 	get_cpu_id(&amp;cpu_id);</div><div class='head'>diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c<br/>index 0d770e513abf..fcb6c2e92b07 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/perf_event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/perf_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/perf_event.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sysinfo.h&gt;</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='ctx'> </div><div class='ctx'> const char *perf_pmu_name(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -219,20 +220,13 @@ static int __init service_level_perf_register(void)</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(service_level_perf_register);</div><div class='ctx'> </div><div class='del'>-static int __perf_callchain_kernel(void *data, unsigned long address, int reliable)</div><div class='del'>-{</div><div class='del'>-	struct perf_callchain_entry_ctx *entry = data;</div><div class='del'>-</div><div class='del'>-	perf_callchain_store(entry, address);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,</div><div class='ctx'> 			   struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return;</div><div class='del'>-	dump_trace(__perf_callchain_kernel, entry, NULL, regs-&gt;gprs[15]);</div><div class='add'>+	struct unwind_state state;</div><div class='add'>+</div><div class='add'>+	unwind_for_each_frame(&amp;state, current, regs, 0)</div><div class='add'>+		perf_callchain_store(entry, state.ip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Perf definitions for PMU event attributes in sysfs */</div><div class='head'>diff --git a/arch/s390/kernel/pgm_check.S b/arch/s390/kernel/pgm_check.S<br/>index 3e62aae34ea3..59dee9d3bebf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/pgm_check.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/pgm_check.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/pgm_check.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/pgm_check.S</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PGM_CHECK(handler)	.long handler</div><div class='add'>+#define PGM_CHECK(handler)	.quad handler</div><div class='ctx'> #define PGM_CHECK_DEFAULT	PGM_CHECK(default_trap_handler)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c<br/>index 6e758bb6cd29..63873aa6693f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/process.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/process.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/process.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/process.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;asm/runtime_instr.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='head'>diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c<br/>index 6fe2e1875058..5de13307b703 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/processor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/processor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/processor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/processor.c</a></div><div class='hunk'>@@ -109,7 +109,8 @@ static void show_cpu_summary(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	static const char *hwcap_str[] = {</div><div class='ctx'> 		"esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",</div><div class='del'>-		"edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe", "gs"</div><div class='add'>+		"edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe", "gs",</div><div class='add'>+		"vxe2", "vxp", "sort", "dflt"</div><div class='ctx'> 	};</div><div class='ctx'> 	static const char * const int_hwcap_str[] = {</div><div class='ctx'> 		"sie"</div><div class='head'>diff --git a/arch/s390/kernel/reipl.S b/arch/s390/kernel/reipl.S<br/>index 7f14adf512c6..4a22163962eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/reipl.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/reipl.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/reipl.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/reipl.S</a></div><div class='hunk'>@@ -73,6 +73,7 @@ ENTRY(store_status)</div><div class='ctx'> 	lgr	%r9,%r2</div><div class='ctx'> 	lgr	%r2,%r3</div><div class='ctx'> 	BR_EX	%r9</div><div class='add'>+ENDPROC(store_status)</div><div class='ctx'> </div><div class='ctx'> 	.section .bss</div><div class='ctx'> 	.align	8</div><div class='head'>diff --git a/arch/s390/kernel/relocate_kernel.S b/arch/s390/kernel/relocate_kernel.S<br/>index c97c2d40fe15..fe396673e8a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/relocate_kernel.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/relocate_kernel.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/relocate_kernel.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/relocate_kernel.S</a></div><div class='hunk'>@@ -58,11 +58,15 @@ ENTRY(relocate_kernel)</div><div class='ctx'> 		j	.base</div><div class='ctx'> 	.done:</div><div class='ctx'> 		sgr	%r0,%r0		# clear register r0</div><div class='add'>+		cghi	%r3,0</div><div class='add'>+		je	.diag</div><div class='ctx'> 		la	%r4,load_psw-.base(%r13)	# load psw-address into the register</div><div class='ctx'> 		o	%r3,4(%r4)	# or load address into psw</div><div class='ctx'> 		st	%r3,4(%r4)</div><div class='ctx'> 		mvc	0(8,%r0),0(%r4)	# copy psw to absolute address 0</div><div class='add'>+	.diag:</div><div class='ctx'> 		diag	%r0,%r0,0x308</div><div class='add'>+ENDPROC(relocate_kernel)</div><div class='ctx'> </div><div class='ctx'> 		.align	8</div><div class='ctx'> 	load_psw:</div><div class='head'>diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c<br/>index 2c642af526ce..f8544d517430 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/setup.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/start_kernel.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/boot_data.h&gt;</div><div class='ctx'> #include &lt;asm/ipl.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -65,11 +66,13 @@</div><div class='ctx'> #include &lt;asm/diag.h&gt;</div><div class='ctx'> #include &lt;asm/os_info.h&gt;</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/sysinfo.h&gt;</div><div class='ctx'> #include &lt;asm/numa.h&gt;</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/nospec-branch.h&gt;</div><div class='ctx'> #include &lt;asm/mem_detect.h&gt;</div><div class='add'>+#include &lt;asm/uv.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -89,12 +92,25 @@ char elf_platform[ELF_PLATFORM_SIZE];</div><div class='ctx'> </div><div class='ctx'> unsigned long int_hwcap = 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST</div><div class='add'>+int __bootdata_preserved(prot_virt_guest);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int __bootdata(noexec_disabled);</div><div class='ctx'> int __bootdata(memory_end_set);</div><div class='ctx'> unsigned long __bootdata(memory_end);</div><div class='ctx'> unsigned long __bootdata(max_physmem_end);</div><div class='ctx'> struct mem_detect_info __bootdata(mem_detect);</div><div class='ctx'> </div><div class='add'>+struct exception_table_entry *__bootdata_preserved(__start_dma_ex_table);</div><div class='add'>+struct exception_table_entry *__bootdata_preserved(__stop_dma_ex_table);</div><div class='add'>+unsigned long __bootdata_preserved(__swsusp_reset_dma);</div><div class='add'>+unsigned long __bootdata_preserved(__stext_dma);</div><div class='add'>+unsigned long __bootdata_preserved(__etext_dma);</div><div class='add'>+unsigned long __bootdata_preserved(__sdma);</div><div class='add'>+unsigned long __bootdata_preserved(__edma);</div><div class='add'>+unsigned long __bootdata_preserved(__kaslr_offset);</div><div class='add'>+</div><div class='ctx'> unsigned long VMALLOC_START;</div><div class='ctx'> EXPORT_SYMBOL(VMALLOC_START);</div><div class='ctx'> </div><div class='hunk'>@@ -736,6 +752,15 @@ static void __init reserve_initrd(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Reserve the memory area used to pass the certificate lists</div><div class='add'>+ */</div><div class='add'>+static void __init reserve_certificate_list(void)</div><div class='add'>+{</div><div class='add'>+	if (ipl_cert_list_addr)</div><div class='add'>+		memblock_reserve(ipl_cert_list_addr, ipl_cert_list_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init reserve_mem_detect_info(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long start, size;</div><div class='hunk'>@@ -814,9 +839,10 @@ static void __init reserve_kernel(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long start_pfn = PFN_UP(__pa(_end));</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(0, PARMAREA_END);</div><div class='add'>+	memblock_reserve(0, HEAD_END);</div><div class='ctx'> 	memblock_reserve((unsigned long)_stext, PFN_PHYS(start_pfn)</div><div class='ctx'> 			 - (unsigned long)_stext);</div><div class='add'>+	memblock_reserve(__sdma, __edma - __sdma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init setup_memory(void)</div><div class='hunk'>@@ -914,7 +940,15 @@ static int __init setup_hwcaps(void)</div><div class='ctx'> 			elf_hwcap |= HWCAP_S390_VXRS_EXT;</div><div class='ctx'> 		if (test_facility(135))</div><div class='ctx'> 			elf_hwcap |= HWCAP_S390_VXRS_BCD;</div><div class='add'>+		if (test_facility(148))</div><div class='add'>+			elf_hwcap |= HWCAP_S390_VXRS_EXT2;</div><div class='add'>+		if (test_facility(152))</div><div class='add'>+			elf_hwcap |= HWCAP_S390_VXRS_PDE;</div><div class='ctx'> 	}</div><div class='add'>+	if (test_facility(150))</div><div class='add'>+		elf_hwcap |= HWCAP_S390_SORT;</div><div class='add'>+	if (test_facility(151))</div><div class='add'>+		elf_hwcap |= HWCAP_S390_DFLT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Guarded storage support HWCAP_S390_GS is bit 12.</div><div class='hunk'>@@ -1023,6 +1057,38 @@ static void __init setup_control_program_code(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Print the component list from the IPL report</div><div class='add'>+ */</div><div class='add'>+static void __init log_component_list(void)</div><div class='add'>+{</div><div class='add'>+	struct ipl_rb_component_entry *ptr, *end;</div><div class='add'>+	char *str;</div><div class='add'>+</div><div class='add'>+	if (!early_ipl_comp_list_addr)</div><div class='add'>+		return;</div><div class='add'>+	if (ipl_block.hdr.flags &amp; IPL_PL_FLAG_IPLSR)</div><div class='add'>+		pr_info("Linux is running with Secure-IPL enabled\n");</div><div class='add'>+	else</div><div class='add'>+		pr_info("Linux is running with Secure-IPL disabled\n");</div><div class='add'>+	ptr = (void *) early_ipl_comp_list_addr;</div><div class='add'>+	end = (void *) ptr + early_ipl_comp_list_size;</div><div class='add'>+	pr_info("The IPL report contains the following components:\n");</div><div class='add'>+	while (ptr &lt; end) {</div><div class='add'>+		if (ptr-&gt;flags &amp; IPL_RB_COMPONENT_FLAG_SIGNED) {</div><div class='add'>+			if (ptr-&gt;flags &amp; IPL_RB_COMPONENT_FLAG_VERIFIED)</div><div class='add'>+				str = "signed, verified";</div><div class='add'>+			else</div><div class='add'>+				str = "signed, verification failed";</div><div class='add'>+		} else {</div><div class='add'>+			str = "not signed";</div><div class='add'>+		}</div><div class='add'>+		pr_info("%016llx - %016llx (%s)\n",</div><div class='add'>+			ptr-&gt;addr, ptr-&gt;addr + ptr-&gt;len, str);</div><div class='add'>+		ptr++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Setup function called from init/main.c just after the banner</div><div class='ctx'>  * was printed.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1042,6 +1108,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	else</div><div class='ctx'> 		pr_info("Linux is running as a guest in 64-bit mode\n");</div><div class='ctx'> </div><div class='add'>+	log_component_list();</div><div class='add'>+</div><div class='ctx'> 	/* Have one command line that is parsed and saved in /proc/cmdline */</div><div class='ctx'> 	/* boot_command_line has been already set up in early.c */</div><div class='ctx'> 	*cmdline_p = boot_command_line;</div><div class='hunk'>@@ -1073,6 +1141,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	reserve_oldmem();</div><div class='ctx'> 	reserve_kernel();</div><div class='ctx'> 	reserve_initrd();</div><div class='add'>+	reserve_certificate_list();</div><div class='ctx'> 	reserve_mem_detect_info();</div><div class='ctx'> 	memblock_allow_resize();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c<br/>index 3fe1c77c361b..35fafa2b91a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/smp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/smp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/smp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/smp.c</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> #include &lt;asm/sigp.h&gt;</div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/topology.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +267,8 @@ static void pcpu_prepare_secondary(struct pcpu *pcpu, int cpu)</div><div class='ctx'> 	lc-&gt;percpu_offset = __per_cpu_offset[cpu];</div><div class='ctx'> 	lc-&gt;kernel_asce = S390_lowcore.kernel_asce;</div><div class='ctx'> 	lc-&gt;machine_flags = S390_lowcore.machine_flags;</div><div class='del'>-	lc-&gt;user_timer = lc-&gt;system_timer = lc-&gt;steal_timer = 0;</div><div class='add'>+	lc-&gt;user_timer = lc-&gt;system_timer =</div><div class='add'>+		lc-&gt;steal_timer = lc-&gt;avg_steal_timer = 0;</div><div class='ctx'> 	__ctl_store(lc-&gt;cregs_save_area, 0, 15);</div><div class='ctx'> 	save_access_regs((unsigned int *) lc-&gt;access_regs_save_area);</div><div class='ctx'> 	memcpy(lc-&gt;stfle_fac_list, S390_lowcore.stfle_fac_list,</div><div class='hunk'>@@ -688,7 +690,7 @@ void __init smp_save_dump_cpus(void)</div><div class='ctx'> 			smp_save_cpu_regs(sa, addr, is_boot_cpu, page);</div><div class='ctx'> 	}</div><div class='ctx'> 	memblock_free(page, PAGE_SIZE);</div><div class='del'>-	diag308_reset();</div><div class='add'>+	diag_dma_ops.diag308_reset();</div><div class='ctx'> 	pcpu_set_smt(0);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_CRASH_DUMP */</div><div class='head'>diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c<br/>index 460dcfba7d4e..f6a620f854e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/stacktrace.c</a></div><div class='hunk'>@@ -11,65 +11,52 @@</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-static int __save_address(void *data, unsigned long address, int nosched)</div><div class='del'>-{</div><div class='del'>-	struct stack_trace *trace = data;</div><div class='del'>-</div><div class='del'>-	if (nosched &amp;&amp; in_sched_functions(address))</div><div class='del'>-		return 0;</div><div class='del'>-	if (trace-&gt;skip &gt; 0) {</div><div class='del'>-		trace-&gt;skip--;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries) {</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = address;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int save_address(void *data, unsigned long address, int reliable)</div><div class='del'>-{</div><div class='del'>-	return __save_address(data, address, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int save_address_nosched(void *data, unsigned long address, int reliable)</div><div class='del'>-{</div><div class='del'>-	return __save_address(data, address, 1);</div><div class='del'>-}</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace(struct stack_trace *trace)</div><div class='ctx'> {</div><div class='del'>-	unsigned long sp;</div><div class='del'>-</div><div class='del'>-	sp = current_stack_pointer();</div><div class='del'>-	dump_trace(save_address, trace, NULL, sp);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='add'>+	struct unwind_state state;</div><div class='add'>+</div><div class='add'>+	unwind_for_each_frame(&amp;state, current, NULL, 0) {</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+		if (trace-&gt;skip &gt; 0)</div><div class='add'>+			trace-&gt;skip--;</div><div class='add'>+		else</div><div class='add'>+			trace-&gt;entries[trace-&gt;nr_entries++] = state.ip;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace);</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> {</div><div class='del'>-	unsigned long sp;</div><div class='del'>-</div><div class='del'>-	sp = tsk-&gt;thread.ksp;</div><div class='del'>-	if (tsk == current)</div><div class='del'>-		sp = current_stack_pointer();</div><div class='del'>-	dump_trace(save_address_nosched, trace, tsk, sp);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='add'>+	struct unwind_state state;</div><div class='add'>+</div><div class='add'>+	unwind_for_each_frame(&amp;state, tsk, NULL, 0) {</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+		if (in_sched_functions(state.ip))</div><div class='add'>+			continue;</div><div class='add'>+		if (trace-&gt;skip &gt; 0)</div><div class='add'>+			trace-&gt;skip--;</div><div class='add'>+		else</div><div class='add'>+			trace-&gt;entries[trace-&gt;nr_entries++] = state.ip;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace_tsk);</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)</div><div class='ctx'> {</div><div class='del'>-	unsigned long sp;</div><div class='del'>-</div><div class='del'>-	sp = kernel_stack_pointer(regs);</div><div class='del'>-	dump_trace(save_address, trace, NULL, sp);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='add'>+	struct unwind_state state;</div><div class='add'>+</div><div class='add'>+	unwind_for_each_frame(&amp;state, current, regs, 0) {</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+		if (trace-&gt;skip &gt; 0)</div><div class='add'>+			trace-&gt;skip--;</div><div class='add'>+		else</div><div class='add'>+			trace-&gt;entries[trace-&gt;nr_entries++] = state.ip;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace_regs);</div><div class='head'>diff --git a/arch/s390/kernel/swsusp.S b/arch/s390/kernel/swsusp.S<br/>index 993100c31d65..19a3c427801a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/swsusp.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/swsusp.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/swsusp.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/swsusp.S</a></div><div class='hunk'>@@ -108,6 +108,7 @@ ENTRY(swsusp_arch_suspend)</div><div class='ctx'> 	lmg	%r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)</div><div class='ctx'> 	lghi	%r2,0</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(swsusp_arch_suspend)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Restore saved memory image to correct place and restore register context.</div><div class='hunk'>@@ -154,20 +155,13 @@ ENTRY(swsusp_arch_resume)</div><div class='ctx'> 	ptlb				/* flush tlb */</div><div class='ctx'> </div><div class='ctx'> 	/* Reset System */</div><div class='del'>-	larl	%r1,restart_entry</div><div class='del'>-	larl	%r2,.Lrestart_diag308_psw</div><div class='del'>-	og	%r1,0(%r2)</div><div class='del'>-	stg	%r1,0(%r0)</div><div class='ctx'> 	larl	%r1,.Lnew_pgm_check_psw</div><div class='ctx'> 	epsw	%r2,%r3</div><div class='ctx'> 	stm	%r2,%r3,0(%r1)</div><div class='ctx'> 	mvc	__LC_PGM_NEW_PSW(16,%r0),0(%r1)</div><div class='del'>-	lghi	%r0,0</div><div class='del'>-	diag	%r0,%r0,0x308</div><div class='del'>-restart_entry:</div><div class='del'>-	lhi	%r1,1</div><div class='del'>-	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE</div><div class='del'>-	sam64</div><div class='add'>+	larl	%r1,__swsusp_reset_dma</div><div class='add'>+	lg	%r1,0(%r1)</div><div class='add'>+	BASR_EX	%r14,%r1</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	larl	%r1,smp_cpu_mt_shift</div><div class='ctx'> 	icm	%r1,15,0(%r1)</div><div class='hunk'>@@ -267,6 +261,7 @@ restore_registers:</div><div class='ctx'> 	lmg	%r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)</div><div class='ctx'> 	lghi	%r2,0</div><div class='ctx'> 	BR_EX	%r14</div><div class='add'>+ENDPROC(swsusp_arch_resume)</div><div class='ctx'> </div><div class='ctx'> 	.section .data..nosave,"aw",@progbits</div><div class='ctx'> 	.align	8</div><div class='hunk'>@@ -275,8 +270,6 @@ restore_registers:</div><div class='ctx'> .Lpanic_string:</div><div class='ctx'> 	.asciz	"Resume not possible because suspend CPU is no longer available\n"</div><div class='ctx'> 	.align	8</div><div class='del'>-.Lrestart_diag308_psw:</div><div class='del'>-	.long	0x00080000,0x80000000</div><div class='ctx'> .Lrestart_suspend_psw:</div><div class='ctx'> 	.quad	0x0000000180000000,restart_suspend</div><div class='ctx'> .Lnew_pgm_check_psw:</div><div class='head'>diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl<br/>index 02579f95f391..061418f787c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -426,3 +426,7 @@</div><div class='ctx'> 421	32	rt_sigtimedwait_time64	-				compat_sys_rt_sigtimedwait_time64</div><div class='ctx'> 422	32	futex_time64		-				sys_futex</div><div class='ctx'> 423	32	sched_rr_get_interval_time64	-			sys_sched_rr_get_interval</div><div class='add'>+424  common	pidfd_send_signal	sys_pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425  common	io_uring_setup		sys_io_uring_setup              sys_io_uring_setup</div><div class='add'>+426  common	io_uring_enter		sys_io_uring_enter              sys_io_uring_enter</div><div class='add'>+427  common	io_uring_register	sys_io_uring_register           sys_io_uring_register</div><div class='head'>diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c<br/>index 8003b38c1688..82e81a9f7112 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/traps.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/traps.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/traps.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ void do_report_trap(struct pt_regs *regs, int si_signo, int si_code, char *str)</div><div class='ctx'> 		report_user_fault(regs, si_signo, 0);</div><div class='ctx'>         } else {</div><div class='ctx'>                 const struct exception_table_entry *fixup;</div><div class='del'>-		fixup = search_exception_tables(regs-&gt;psw.addr);</div><div class='add'>+		fixup = s390_search_extables(regs-&gt;psw.addr);</div><div class='ctx'>                 if (fixup)</div><div class='ctx'> 			regs-&gt;psw.addr = extable_fixup(fixup);</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -263,5 +263,6 @@ NOKPROBE_SYMBOL(kernel_stack_overflow);</div><div class='ctx'> </div><div class='ctx'> void __init trap_init(void)</div><div class='ctx'> {</div><div class='add'>+	sort_extable(__start_dma_ex_table, __stop_dma_ex_table);</div><div class='ctx'> 	local_mcck_enable();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kernel/unwind_bc.c b/arch/s390/kernel/unwind_bc.c<br/>new file mode 100644<br/>index 000000000000..57fd4e902f1f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/unwind_bc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/unwind_bc.c</a></div><div class='hunk'>@@ -0,0 +1,155 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned long unwind_get_return_address(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	if (unwind_done(state))</div><div class='add'>+		return 0;</div><div class='add'>+	return __kernel_text_address(state-&gt;ip) ? state-&gt;ip : 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(unwind_get_return_address);</div><div class='add'>+</div><div class='add'>+static bool outside_of_stack(struct unwind_state *state, unsigned long sp)</div><div class='add'>+{</div><div class='add'>+	return (sp &lt;= state-&gt;sp) ||</div><div class='add'>+		(sp + sizeof(struct stack_frame) &gt; state-&gt;stack_info.end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool update_stack_info(struct unwind_state *state, unsigned long sp)</div><div class='add'>+{</div><div class='add'>+	struct stack_info *info = &amp;state-&gt;stack_info;</div><div class='add'>+	unsigned long *mask = &amp;state-&gt;stack_mask;</div><div class='add'>+</div><div class='add'>+	/* New stack pointer leaves the current stack */</div><div class='add'>+	if (get_stack_info(sp, state-&gt;task, info, mask) != 0 ||</div><div class='add'>+	    !on_stack(info, sp, sizeof(struct stack_frame)))</div><div class='add'>+		/* 'sp' does not point to a valid stack */</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool unwind_next_frame(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	struct stack_info *info = &amp;state-&gt;stack_info;</div><div class='add'>+	struct stack_frame *sf;</div><div class='add'>+	struct pt_regs *regs;</div><div class='add'>+	unsigned long sp, ip;</div><div class='add'>+	bool reliable;</div><div class='add'>+</div><div class='add'>+	regs = state-&gt;regs;</div><div class='add'>+	if (unlikely(regs)) {</div><div class='add'>+		sp = READ_ONCE_TASK_STACK(state-&gt;task, regs-&gt;gprs[15]);</div><div class='add'>+		if (unlikely(outside_of_stack(state, sp))) {</div><div class='add'>+			if (!update_stack_info(state, sp))</div><div class='add'>+				goto out_err;</div><div class='add'>+		}</div><div class='add'>+		sf = (struct stack_frame *) sp;</div><div class='add'>+		ip = READ_ONCE_TASK_STACK(state-&gt;task, sf-&gt;gprs[8]);</div><div class='add'>+		reliable = false;</div><div class='add'>+		regs = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		sf = (struct stack_frame *) state-&gt;sp;</div><div class='add'>+		sp = READ_ONCE_TASK_STACK(state-&gt;task, sf-&gt;back_chain);</div><div class='add'>+		if (likely(sp)) {</div><div class='add'>+			/* Non-zero back-chain points to the previous frame */</div><div class='add'>+			if (unlikely(outside_of_stack(state, sp))) {</div><div class='add'>+				if (!update_stack_info(state, sp))</div><div class='add'>+					goto out_err;</div><div class='add'>+			}</div><div class='add'>+			sf = (struct stack_frame *) sp;</div><div class='add'>+			ip = READ_ONCE_TASK_STACK(state-&gt;task, sf-&gt;gprs[8]);</div><div class='add'>+			reliable = true;</div><div class='add'>+		} else {</div><div class='add'>+			/* No back-chain, look for a pt_regs structure */</div><div class='add'>+			sp = state-&gt;sp + STACK_FRAME_OVERHEAD;</div><div class='add'>+			if (!on_stack(info, sp, sizeof(struct pt_regs)))</div><div class='add'>+				goto out_stop;</div><div class='add'>+			regs = (struct pt_regs *) sp;</div><div class='add'>+			if (user_mode(regs))</div><div class='add'>+				goto out_stop;</div><div class='add'>+			ip = READ_ONCE_TASK_STACK(state-&gt;task, regs-&gt;psw.addr);</div><div class='add'>+			reliable = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='add'>+	/* Decode any ftrace redirection */</div><div class='add'>+	if (ip == (unsigned long) return_to_handler)</div><div class='add'>+		ip = ftrace_graph_ret_addr(state-&gt;task, &amp;state-&gt;graph_idx,</div><div class='add'>+					   ip, (void *) sp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Update unwind state */</div><div class='add'>+	state-&gt;sp = sp;</div><div class='add'>+	state-&gt;ip = ip;</div><div class='add'>+	state-&gt;regs = regs;</div><div class='add'>+	state-&gt;reliable = reliable;</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	state-&gt;error = true;</div><div class='add'>+out_stop:</div><div class='add'>+	state-&gt;stack_info.type = STACK_TYPE_UNKNOWN;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(unwind_next_frame);</div><div class='add'>+</div><div class='add'>+void __unwind_start(struct unwind_state *state, struct task_struct *task,</div><div class='add'>+		    struct pt_regs *regs, unsigned long sp)</div><div class='add'>+{</div><div class='add'>+	struct stack_info *info = &amp;state-&gt;stack_info;</div><div class='add'>+	unsigned long *mask = &amp;state-&gt;stack_mask;</div><div class='add'>+	struct stack_frame *sf;</div><div class='add'>+	unsigned long ip;</div><div class='add'>+	bool reliable;</div><div class='add'>+</div><div class='add'>+	memset(state, 0, sizeof(*state));</div><div class='add'>+	state-&gt;task = task;</div><div class='add'>+	state-&gt;regs = regs;</div><div class='add'>+</div><div class='add'>+	/* Don't even attempt to start from user mode regs: */</div><div class='add'>+	if (regs &amp;&amp; user_mode(regs)) {</div><div class='add'>+		info-&gt;type = STACK_TYPE_UNKNOWN;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get current stack pointer and initialize stack info */</div><div class='add'>+	if (get_stack_info(sp, task, info, mask) != 0 ||</div><div class='add'>+	    !on_stack(info, sp, sizeof(struct stack_frame))) {</div><div class='add'>+		/* Something is wrong with the stack pointer */</div><div class='add'>+		info-&gt;type = STACK_TYPE_UNKNOWN;</div><div class='add'>+		state-&gt;error = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the instruction pointer from pt_regs or the stack frame */</div><div class='add'>+	if (regs) {</div><div class='add'>+		ip = READ_ONCE_TASK_STACK(state-&gt;task, regs-&gt;psw.addr);</div><div class='add'>+		reliable = true;</div><div class='add'>+	} else {</div><div class='add'>+		sf = (struct stack_frame *) sp;</div><div class='add'>+		ip = READ_ONCE_TASK_STACK(state-&gt;task, sf-&gt;gprs[8]);</div><div class='add'>+		reliable = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='add'>+	/* Decode any ftrace redirection */</div><div class='add'>+	if (ip == (unsigned long) return_to_handler)</div><div class='add'>+		ip = ftrace_graph_ret_addr(state-&gt;task, &amp;state-&gt;graph_idx,</div><div class='add'>+					   ip, NULL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Update unwind state */</div><div class='add'>+	state-&gt;sp = sp;</div><div class='add'>+	state-&gt;ip = ip;</div><div class='add'>+	state-&gt;reliable = reliable;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__unwind_start);</div><div class='head'>diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c<br/>index e7920a68a12e..243d8b1185bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vdso.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vdso.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vdso.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/vdso.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_COMPAT_VDSO</div><div class='ctx'> extern char vdso32_start, vdso32_end;</div><div class='ctx'> static void *vdso32_kbase = &amp;vdso32_start;</div><div class='ctx'> static unsigned int vdso32_pages;</div><div class='hunk'>@@ -55,7 +55,7 @@ static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,</div><div class='ctx'> </div><div class='ctx'> 	vdso_pagelist = vdso64_pagelist;</div><div class='ctx'> 	vdso_pages = vdso64_pages;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_COMPAT_VDSO</div><div class='ctx'> 	if (vma-&gt;vm_mm-&gt;context.compat_mm) {</div><div class='ctx'> 		vdso_pagelist = vdso32_pagelist;</div><div class='ctx'> 		vdso_pages = vdso32_pages;</div><div class='hunk'>@@ -76,7 +76,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm,</div><div class='ctx'> 	unsigned long vdso_pages;</div><div class='ctx'> </div><div class='ctx'> 	vdso_pages = vdso64_pages;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_COMPAT_VDSO</div><div class='ctx'> 	if (vma-&gt;vm_mm-&gt;context.compat_mm)</div><div class='ctx'> 		vdso_pages = vdso32_pages;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -223,7 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	vdso_pages = vdso64_pages;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_COMPAT_VDSO</div><div class='ctx'> 	mm-&gt;context.compat_mm = is_compat_task();</div><div class='ctx'> 	if (mm-&gt;context.compat_mm)</div><div class='ctx'> 		vdso_pages = vdso32_pages;</div><div class='hunk'>@@ -280,7 +280,7 @@ static int __init vdso_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	vdso_init_data(vdso_data);</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='add'>+#ifdef CONFIG_COMPAT_VDSO</div><div class='ctx'> 	/* Calculate the size of the 32 bit vDSO */</div><div class='ctx'> 	vdso32_pages = ((&amp;vdso32_end - &amp;vdso32_start</div><div class='ctx'> 			 + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT) + 1;</div><div class='head'>diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile<br/>index e76309fbbcb3..aee9ffbccb54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vdso32/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vdso32/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vdso32/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/vdso32/Makefile</a></div><div class='hunk'>@@ -19,7 +19,7 @@ KBUILD_AFLAGS_31 += -m31 -s</div><div class='ctx'> KBUILD_CFLAGS_31 := $(filter-out -m64,$(KBUILD_CFLAGS))</div><div class='ctx'> KBUILD_CFLAGS_31 += -m31 -fPIC -shared -fno-common -fno-builtin</div><div class='ctx'> KBUILD_CFLAGS_31 += -nostdlib -Wl,-soname=linux-vdso32.so.1 \</div><div class='del'>-			$(call cc-ldoption, -Wl$(comma)--hash-style=both)</div><div class='add'>+		    -Wl,--hash-style=both</div><div class='ctx'> </div><div class='ctx'> $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_31)</div><div class='ctx'> $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_31)</div><div class='head'>diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile<br/>index f849ac61c5da..bec19e7e6e1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vdso64/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vdso64/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vdso64/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/vdso64/Makefile</a></div><div class='hunk'>@@ -19,7 +19,7 @@ KBUILD_AFLAGS_64 += -m64 -s</div><div class='ctx'> KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS))</div><div class='ctx'> KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin</div><div class='ctx'> KBUILD_CFLAGS_64 += -nostdlib -Wl,-soname=linux-vdso64.so.1 \</div><div class='del'>-			$(call cc-ldoption, -Wl$(comma)--hash-style=both)</div><div class='add'>+		    -Wl,--hash-style=both</div><div class='ctx'> </div><div class='ctx'> $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)</div><div class='ctx'> $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)</div><div class='head'>diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S<br/>index 8429ab079715..49d55327de0b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vmlinux.lds.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -72,6 +72,7 @@ SECTIONS</div><div class='ctx'> 	__end_ro_after_init = .;</div><div class='ctx'> </div><div class='ctx'> 	RW_DATA_SECTION(0x100, PAGE_SIZE, THREAD_SIZE)</div><div class='add'>+	BOOT_DATA_PRESERVED</div><div class='ctx'> </div><div class='ctx'> 	_edata = .;		/* End of data section */</div><div class='ctx'> </div><div class='hunk'>@@ -143,6 +144,18 @@ SECTIONS</div><div class='ctx'> 	INIT_DATA_SECTION(0x100)</div><div class='ctx'> </div><div class='ctx'> 	PERCPU_SECTION(0x100)</div><div class='add'>+</div><div class='add'>+	.dynsym ALIGN(8) : {</div><div class='add'>+		__dynsym_start = .;</div><div class='add'>+		*(.dynsym)</div><div class='add'>+		__dynsym_end = .;</div><div class='add'>+	}</div><div class='add'>+	.rela.dyn ALIGN(8) : {</div><div class='add'>+		__rela_dyn_start = .;</div><div class='add'>+		*(.rela*)</div><div class='add'>+		__rela_dyn_end = .;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);</div><div class='ctx'> 	__init_end = .;		/* freed after init ends here */</div><div class='ctx'> </div><div class='hunk'>@@ -161,6 +174,12 @@ SECTIONS</div><div class='ctx'> 		QUAD(__bss_stop - __bss_start)			/* bss_size */</div><div class='ctx'> 		QUAD(__boot_data_start)				/* bootdata_off */</div><div class='ctx'> 		QUAD(__boot_data_end - __boot_data_start)	/* bootdata_size */</div><div class='add'>+		QUAD(__boot_data_preserved_start)		/* bootdata_preserved_off */</div><div class='add'>+		QUAD(__boot_data_preserved_end -</div><div class='add'>+		     __boot_data_preserved_start)		/* bootdata_preserved_size */</div><div class='add'>+		QUAD(__dynsym_start)				/* dynsym_start */</div><div class='add'>+		QUAD(__rela_dyn_start)				/* rela_dyn_start */</div><div class='add'>+		QUAD(__rela_dyn_end)				/* rela_dyn_end */</div><div class='ctx'> 	} :NONE</div><div class='ctx'> </div><div class='ctx'> 	/* Debugging sections.	*/</div><div class='head'>diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c<br/>index 98f850e00008..c475ca49cfc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vtime.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kernel/vtime.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kernel/vtime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kernel/vtime.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@ static inline u64 get_vtimer(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 timer;</div><div class='ctx'> </div><div class='del'>-	asm volatile("stpt %0" : "=m" (timer));</div><div class='add'>+	asm volatile("stpt %0" : "=Q" (timer));</div><div class='ctx'> 	return timer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +48,7 @@ static inline void set_vtimer(u64 expires)</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"	stpt	%0\n"	/* Store current cpu timer value */</div><div class='ctx'> 		"	spt	%1"	/* Set new value imm. afterwards */</div><div class='del'>-		: "=m" (timer) : "m" (expires));</div><div class='add'>+		: "=Q" (timer) : "Q" (expires));</div><div class='ctx'> 	S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer;</div><div class='ctx'> 	S390_lowcore.last_update_timer = expires;</div><div class='ctx'> }</div><div class='hunk'>@@ -124,7 +124,7 @@ static void account_system_index_scaled(struct task_struct *p, u64 cputime,</div><div class='ctx'>  */</div><div class='ctx'> static int do_account_vtime(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	u64 timer, clock, user, guest, system, hardirq, softirq, steal;</div><div class='add'>+	u64 timer, clock, user, guest, system, hardirq, softirq;</div><div class='ctx'> </div><div class='ctx'> 	timer = S390_lowcore.last_update_timer;</div><div class='ctx'> 	clock = S390_lowcore.last_update_clock;</div><div class='hunk'>@@ -135,8 +135,8 @@ static int do_account_vtime(struct task_struct *tsk)</div><div class='ctx'> #else</div><div class='ctx'> 		"	stck	%1"	/* Store current tod clock value */</div><div class='ctx'> #endif</div><div class='del'>-		: "=m" (S390_lowcore.last_update_timer),</div><div class='del'>-		  "=m" (S390_lowcore.last_update_clock));</div><div class='add'>+		: "=Q" (S390_lowcore.last_update_timer),</div><div class='add'>+		  "=Q" (S390_lowcore.last_update_clock));</div><div class='ctx'> 	clock = S390_lowcore.last_update_clock - clock;</div><div class='ctx'> 	timer -= S390_lowcore.last_update_timer;</div><div class='ctx'> </div><div class='hunk'>@@ -182,12 +182,6 @@ static int do_account_vtime(struct task_struct *tsk)</div><div class='ctx'> 	if (softirq)</div><div class='ctx'> 		account_system_index_scaled(tsk, softirq, CPUTIME_SOFTIRQ);</div><div class='ctx'> </div><div class='del'>-	steal = S390_lowcore.steal_timer;</div><div class='del'>-	if ((s64) steal &gt; 0) {</div><div class='del'>-		S390_lowcore.steal_timer = 0;</div><div class='del'>-		account_steal_time(cputime_to_nsecs(steal));</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return virt_timer_forward(user + guest + system + hardirq + softirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -213,8 +207,19 @@ void vtime_task_switch(struct task_struct *prev)</div><div class='ctx'>  */</div><div class='ctx'> void vtime_flush(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='add'>+	u64 steal, avg_steal;</div><div class='add'>+</div><div class='ctx'> 	if (do_account_vtime(tsk))</div><div class='ctx'> 		virt_timer_expire();</div><div class='add'>+</div><div class='add'>+	steal = S390_lowcore.steal_timer;</div><div class='add'>+	avg_steal = S390_lowcore.avg_steal_timer / 2;</div><div class='add'>+	if ((s64) steal &gt; 0) {</div><div class='add'>+		S390_lowcore.steal_timer = 0;</div><div class='add'>+		account_steal_time(steal);</div><div class='add'>+		avg_steal += steal;</div><div class='add'>+	}</div><div class='add'>+	S390_lowcore.avg_steal_timer = avg_steal;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig<br/>index 767453faacfc..1816ee48eadd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kvm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kvm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kvm/Kconfig</a></div><div class='hunk'>@@ -21,7 +21,6 @@ config KVM</div><div class='ctx'> 	prompt "Kernel-based Virtual Machine (KVM) support"</div><div class='ctx'> 	depends on HAVE_KVM</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select HAVE_KVM_CPU_RELAX_INTERCEPT</div><div class='ctx'> 	select HAVE_KVM_VCPU_ASYNC_IOCTL</div><div class='ctx'> 	select HAVE_KVM_EVENTFD</div><div class='head'>diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c<br/>index 82162867f378..37503ae62486 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kvm/interrupt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/kvm/interrupt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/kvm/interrupt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/kvm/interrupt.c</a></div><div class='hunk'>@@ -3194,7 +3194,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_s390_gisc_unregister);</div><div class='ctx'> </div><div class='del'>-static void gib_alert_irq_handler(struct airq_struct *airq)</div><div class='add'>+static void gib_alert_irq_handler(struct airq_struct *airq, bool floating)</div><div class='ctx'> {</div><div class='ctx'> 	inc_irq_stat(IRQIO_GAL);</div><div class='ctx'> 	process_gib_alert_list();</div><div class='head'>diff --git a/arch/s390/lib/mem.S b/arch/s390/lib/mem.S<br/>index 53008da05190..dc0874f2e203 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/lib/mem.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/lib/mem.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/lib/mem.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/lib/mem.S</a></div><div class='hunk'>@@ -178,6 +178,7 @@ ENTRY(__memset\bits)</div><div class='ctx'> 	BR_EX	%r14</div><div class='ctx'> .L__memset_mvc\bits:</div><div class='ctx'> 	mvc	\bytes(1,%r1),0(%r1)</div><div class='add'>+ENDPROC(__memset\bits)</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> __MEMSET 16,2,sth</div><div class='head'>diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile<br/>index f5880bfd1b0c..3175413186b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y		:= init.o fault.o extmem.o mmap.o vmem.o maccess.o</div><div class='del'>-obj-y		+= page-states.o gup.o pageattr.o pgtable.o pgalloc.o</div><div class='add'>+obj-y		+= page-states.o pageattr.o pgtable.o pgalloc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CMM)		+= cmm.o</div><div class='ctx'> obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o</div><div class='head'>diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c<br/>index 11613362c4e7..c220399ae196 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/fault.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/fault.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/fault.c</a></div><div class='hunk'>@@ -247,12 +247,24 @@ static noinline void do_sigsegv(struct pt_regs *regs, int si_code)</div><div class='ctx'> 			current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct exception_table_entry *s390_search_extables(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	const struct exception_table_entry *fixup;</div><div class='add'>+</div><div class='add'>+	fixup = search_extable(__start_dma_ex_table,</div><div class='add'>+			       __stop_dma_ex_table - __start_dma_ex_table,</div><div class='add'>+			       addr);</div><div class='add'>+	if (!fixup)</div><div class='add'>+		fixup = search_exception_tables(addr);</div><div class='add'>+	return fixup;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static noinline void do_no_context(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	const struct exception_table_entry *fixup;</div><div class='ctx'> </div><div class='ctx'> 	/* Are we prepared to handle this kernel fault?  */</div><div class='del'>-	fixup = search_exception_tables(regs-&gt;psw.addr);</div><div class='add'>+	fixup = s390_search_extables(regs-&gt;psw.addr);</div><div class='ctx'> 	if (fixup) {</div><div class='ctx'> 		regs-&gt;psw.addr = extable_fixup(fixup);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c<br/>deleted file mode 100644<br/>index 2809d11c7a28..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/gup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/gup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,300 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- *  Lockless get_user_pages_fast for s390</div><div class='del'>- *</div><div class='del'>- *  Copyright IBM Corp. 2010</div><div class='del'>- *  Author(s): Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/hugetlb.h&gt;</div><div class='del'>-#include &lt;linux/vmstat.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The performance critical leaf functions are made noinline otherwise gcc</div><div class='del'>- * inlines everything into a single function which results in too much</div><div class='del'>- * register pressure.</div><div class='del'>- */</div><div class='del'>-static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,</div><div class='del'>-		unsigned long end, int write, struct page **pages, int *nr)</div><div class='del'>-{</div><div class='del'>-	struct page *head, *page;</div><div class='del'>-	unsigned long mask;</div><div class='del'>-	pte_t *ptep, pte;</div><div class='del'>-</div><div class='del'>-	mask = (write ? _PAGE_PROTECT : 0) | _PAGE_INVALID | _PAGE_SPECIAL;</div><div class='del'>-</div><div class='del'>-	ptep = ((pte_t *) pmd_deref(pmd)) + pte_index(addr);</div><div class='del'>-	do {</div><div class='del'>-		pte = *ptep;</div><div class='del'>-		barrier();</div><div class='del'>-		/* Similar to the PMD case, NUMA hinting must take slow path */</div><div class='del'>-		if (pte_protnone(pte))</div><div class='del'>-			return 0;</div><div class='del'>-		if ((pte_val(pte) &amp; mask) != 0)</div><div class='del'>-			return 0;</div><div class='del'>-		VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='del'>-		page = pte_page(pte);</div><div class='del'>-		head = compound_head(page);</div><div class='del'>-		if (!page_cache_get_speculative(head))</div><div class='del'>-			return 0;</div><div class='del'>-		if (unlikely(pte_val(pte) != pte_val(*ptep))) {</div><div class='del'>-			put_page(head);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		VM_BUG_ON_PAGE(compound_head(page) != head, page);</div><div class='del'>-		pages[*nr] = page;</div><div class='del'>-		(*nr)++;</div><div class='del'>-</div><div class='del'>-	} while (ptep++, addr += PAGE_SIZE, addr != end);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,</div><div class='del'>-		unsigned long end, int write, struct page **pages, int *nr)</div><div class='del'>-{</div><div class='del'>-	struct page *head, *page;</div><div class='del'>-	unsigned long mask;</div><div class='del'>-	int refs;</div><div class='del'>-</div><div class='del'>-	mask = (write ? _SEGMENT_ENTRY_PROTECT : 0) | _SEGMENT_ENTRY_INVALID;</div><div class='del'>-	if ((pmd_val(pmd) &amp; mask) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-	VM_BUG_ON(!pfn_valid(pmd_val(pmd) &gt;&gt; PAGE_SHIFT));</div><div class='del'>-</div><div class='del'>-	refs = 0;</div><div class='del'>-	head = pmd_page(pmd);</div><div class='del'>-	page = head + ((addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	do {</div><div class='del'>-		VM_BUG_ON(compound_head(page) != head);</div><div class='del'>-		pages[*nr] = page;</div><div class='del'>-		(*nr)++;</div><div class='del'>-		page++;</div><div class='del'>-		refs++;</div><div class='del'>-	} while (addr += PAGE_SIZE, addr != end);</div><div class='del'>-</div><div class='del'>-	if (!page_cache_add_speculative(head, refs)) {</div><div class='del'>-		*nr -= refs;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(pmd_val(pmd) != pmd_val(*pmdp))) {</div><div class='del'>-		*nr -= refs;</div><div class='del'>-		while (refs--)</div><div class='del'>-			put_page(head);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int gup_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr,</div><div class='del'>-		unsigned long end, int write, struct page **pages, int *nr)</div><div class='del'>-{</div><div class='del'>-	unsigned long next;</div><div class='del'>-	pmd_t *pmdp, pmd;</div><div class='del'>-</div><div class='del'>-	pmdp = (pmd_t *) pudp;</div><div class='del'>-	if ((pud_val(pud) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)</div><div class='del'>-		pmdp = (pmd_t *) pud_deref(pud);</div><div class='del'>-	pmdp += pmd_index(addr);</div><div class='del'>-	do {</div><div class='del'>-		pmd = *pmdp;</div><div class='del'>-		barrier();</div><div class='del'>-		next = pmd_addr_end(addr, end);</div><div class='del'>-		if (pmd_none(pmd))</div><div class='del'>-			return 0;</div><div class='del'>-		if (unlikely(pmd_large(pmd))) {</div><div class='del'>-			/*</div><div class='del'>-			 * NUMA hinting faults need to be handled in the GUP</div><div class='del'>-			 * slowpath for accounting purposes and so that they</div><div class='del'>-			 * can be serialised against THP migration.</div><div class='del'>-			 */</div><div class='del'>-			if (pmd_protnone(pmd))</div><div class='del'>-				return 0;</div><div class='del'>-			if (!gup_huge_pmd(pmdp, pmd, addr, next,</div><div class='del'>-					  write, pages, nr))</div><div class='del'>-				return 0;</div><div class='del'>-		} else if (!gup_pte_range(pmdp, pmd, addr, next,</div><div class='del'>-					  write, pages, nr))</div><div class='del'>-			return 0;</div><div class='del'>-	} while (pmdp++, addr = next, addr != end);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gup_huge_pud(pud_t *pudp, pud_t pud, unsigned long addr,</div><div class='del'>-		unsigned long end, int write, struct page **pages, int *nr)</div><div class='del'>-{</div><div class='del'>-	struct page *head, *page;</div><div class='del'>-	unsigned long mask;</div><div class='del'>-	int refs;</div><div class='del'>-</div><div class='del'>-	mask = (write ? _REGION_ENTRY_PROTECT : 0) | _REGION_ENTRY_INVALID;</div><div class='del'>-	if ((pud_val(pud) &amp; mask) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-	VM_BUG_ON(!pfn_valid(pud_pfn(pud)));</div><div class='del'>-</div><div class='del'>-	refs = 0;</div><div class='del'>-	head = pud_page(pud);</div><div class='del'>-	page = head + ((addr &amp; ~PUD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	do {</div><div class='del'>-		VM_BUG_ON_PAGE(compound_head(page) != head, page);</div><div class='del'>-		pages[*nr] = page;</div><div class='del'>-		(*nr)++;</div><div class='del'>-		page++;</div><div class='del'>-		refs++;</div><div class='del'>-	} while (addr += PAGE_SIZE, addr != end);</div><div class='del'>-</div><div class='del'>-	if (!page_cache_add_speculative(head, refs)) {</div><div class='del'>-		*nr -= refs;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(pud_val(pud) != pud_val(*pudp))) {</div><div class='del'>-		*nr -= refs;</div><div class='del'>-		while (refs--)</div><div class='del'>-			put_page(head);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gup_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr,</div><div class='del'>-		unsigned long end, int write, struct page **pages, int *nr)</div><div class='del'>-{</div><div class='del'>-	unsigned long next;</div><div class='del'>-	pud_t *pudp, pud;</div><div class='del'>-</div><div class='del'>-	pudp = (pud_t *) p4dp;</div><div class='del'>-	if ((p4d_val(p4d) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R2)</div><div class='del'>-		pudp = (pud_t *) p4d_deref(p4d);</div><div class='del'>-	pudp += pud_index(addr);</div><div class='del'>-	do {</div><div class='del'>-		pud = *pudp;</div><div class='del'>-		barrier();</div><div class='del'>-		next = pud_addr_end(addr, end);</div><div class='del'>-		if (pud_none(pud))</div><div class='del'>-			return 0;</div><div class='del'>-		if (unlikely(pud_large(pud))) {</div><div class='del'>-			if (!gup_huge_pud(pudp, pud, addr, next, write, pages,</div><div class='del'>-					  nr))</div><div class='del'>-				return 0;</div><div class='del'>-		} else if (!gup_pmd_range(pudp, pud, addr, next, write, pages,</div><div class='del'>-					  nr))</div><div class='del'>-			return 0;</div><div class='del'>-	} while (pudp++, addr = next, addr != end);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gup_p4d_range(pgd_t *pgdp, pgd_t pgd, unsigned long addr,</div><div class='del'>-		unsigned long end, int write, struct page **pages, int *nr)</div><div class='del'>-{</div><div class='del'>-	unsigned long next;</div><div class='del'>-	p4d_t *p4dp, p4d;</div><div class='del'>-</div><div class='del'>-	p4dp = (p4d_t *) pgdp;</div><div class='del'>-	if ((pgd_val(pgd) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R1)</div><div class='del'>-		p4dp = (p4d_t *) pgd_deref(pgd);</div><div class='del'>-	p4dp += p4d_index(addr);</div><div class='del'>-	do {</div><div class='del'>-		p4d = *p4dp;</div><div class='del'>-		barrier();</div><div class='del'>-		next = p4d_addr_end(addr, end);</div><div class='del'>-		if (p4d_none(p4d))</div><div class='del'>-			return 0;</div><div class='del'>-		if (!gup_pud_range(p4dp, p4d, addr, next, write, pages, nr))</div><div class='del'>-			return 0;</div><div class='del'>-	} while (p4dp++, addr = next, addr != end);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Like get_user_pages_fast() except its IRQ-safe in that it won't fall</div><div class='del'>- * back to the regular GUP.</div><div class='del'>- * Note a difference with get_user_pages_fast: this always returns the</div><div class='del'>- * number of pages pinned, 0 if no pages were pinned.</div><div class='del'>- */</div><div class='del'>-int __get_user_pages_fast(unsigned long start, int nr_pages, int write,</div><div class='del'>-			  struct page **pages)</div><div class='del'>-{</div><div class='del'>-	struct mm_struct *mm = current-&gt;mm;</div><div class='del'>-	unsigned long addr, len, end;</div><div class='del'>-	unsigned long next, flags;</div><div class='del'>-	pgd_t *pgdp, pgd;</div><div class='del'>-	int nr = 0;</div><div class='del'>-</div><div class='del'>-	start &amp;= PAGE_MASK;</div><div class='del'>-	addr = start;</div><div class='del'>-	len = (unsigned long) nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	end = start + len;</div><div class='del'>-	if ((end &lt;= start) || (end &gt; mm-&gt;context.asce_limit))</div><div class='del'>-		return 0;</div><div class='del'>-	/*</div><div class='del'>-	 * local_irq_save() doesn't prevent pagetable teardown, but does</div><div class='del'>-	 * prevent the pagetables from being freed on s390.</div><div class='del'>-	 *</div><div class='del'>-	 * So long as we atomically load page table pointers versus teardown,</div><div class='del'>-	 * we can follow the address down to the the page and take a ref on it.</div><div class='del'>-	 */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	pgdp = pgd_offset(mm, addr);</div><div class='del'>-	do {</div><div class='del'>-		pgd = *pgdp;</div><div class='del'>-		barrier();</div><div class='del'>-		next = pgd_addr_end(addr, end);</div><div class='del'>-		if (pgd_none(pgd))</div><div class='del'>-			break;</div><div class='del'>-		if (!gup_p4d_range(pgdp, pgd, addr, next, write, pages, &amp;nr))</div><div class='del'>-			break;</div><div class='del'>-	} while (pgdp++, addr = next, addr != end);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	return nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * get_user_pages_fast() - pin user pages in memory</div><div class='del'>- * @start:	starting user address</div><div class='del'>- * @nr_pages:	number of pages from start to pin</div><div class='del'>- * @write:	whether pages will be written to</div><div class='del'>- * @pages:	array that receives pointers to the pages pinned.</div><div class='del'>- *		Should be at least nr_pages long.</div><div class='del'>- *</div><div class='del'>- * Attempt to pin user pages in memory without taking mm-&gt;mmap_sem.</div><div class='del'>- * If not successful, it will fall back to taking the lock and</div><div class='del'>- * calling get_user_pages().</div><div class='del'>- *</div><div class='del'>- * Returns number of pages pinned. This may be fewer than the number</div><div class='del'>- * requested. If nr_pages is 0 or negative, returns 0. If no pages</div><div class='del'>- * were pinned, returns -errno.</div><div class='del'>- */</div><div class='del'>-int get_user_pages_fast(unsigned long start, int nr_pages, int write,</div><div class='del'>-			struct page **pages)</div><div class='del'>-{</div><div class='del'>-	int nr, ret;</div><div class='del'>-</div><div class='del'>-	might_sleep();</div><div class='del'>-	start &amp;= PAGE_MASK;</div><div class='del'>-	nr = __get_user_pages_fast(start, nr_pages, write, pages);</div><div class='del'>-	if (nr == nr_pages)</div><div class='del'>-		return nr;</div><div class='del'>-</div><div class='del'>-	/* Try to get the remaining pages with get_user_pages */</div><div class='del'>-	start += nr &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	pages += nr;</div><div class='del'>-	ret = get_user_pages_unlocked(start, nr_pages - nr, pages,</div><div class='del'>-				      write ? FOLL_WRITE : 0);</div><div class='del'>-	/* Have to be a bit careful with return values */</div><div class='del'>-	if (nr &gt; 0)</div><div class='del'>-		ret = (ret &lt; 0) ? nr : ret + nr;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c<br/>index 3e82f66d5c61..7cf48eefec8f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/init.c</a></div><div class='hunk'>@@ -49,6 +49,8 @@ unsigned long empty_zero_page, zero_page_mask;</div><div class='ctx'> EXPORT_SYMBOL(empty_zero_page);</div><div class='ctx'> EXPORT_SYMBOL(zero_page_mask);</div><div class='ctx'> </div><div class='add'>+bool initmem_freed;</div><div class='add'>+</div><div class='ctx'> static void __init setup_zero_pages(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int order;</div><div class='hunk'>@@ -148,6 +150,7 @@ void __init mem_init(void)</div><div class='ctx'> </div><div class='ctx'> void free_initmem(void)</div><div class='ctx'> {</div><div class='add'>+	initmem_freed = true;</div><div class='ctx'> 	__set_memory((unsigned long)_sinittext,</div><div class='ctx'> 		     (unsigned long)(_einittext - _sinittext) &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 		     SET_MEMORY_RW | SET_MEMORY_NX);</div><div class='head'>diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c<br/>index 97b3ee53852b..818deeb1ebc3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/maccess.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/maccess.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/maccess.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/maccess.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/ctl_reg.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> static notrace long s390_kernel_write_odd(void *dst, const void *src, size_t size)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c<br/>index db6bb2f97a2c..99e06213a22b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/pgalloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/pgalloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/pgalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/pgalloc.c</a></div><div class='hunk'>@@ -290,7 +290,7 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table,</div><div class='ctx'> 	tlb_remove_table(tlb, table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __tlb_remove_table(void *_table)</div><div class='add'>+void __tlb_remove_table(void *_table)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mask = (unsigned long) _table &amp; 3;</div><div class='ctx'> 	void *table = (void *)((unsigned long) _table ^ mask);</div><div class='hunk'>@@ -316,67 +316,6 @@ static void __tlb_remove_table(void *_table)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tlb_remove_table_smp_sync(void *arg)</div><div class='del'>-{</div><div class='del'>-	/* Simply deliver the interrupt */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tlb_remove_table_one(void *table)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * This isn't an RCU grace period and hence the page-tables cannot be</div><div class='del'>-	 * assumed to be actually RCU-freed.</div><div class='del'>-	 *</div><div class='del'>-	 * It is however sufficient for software page-table walkers that rely</div><div class='del'>-	 * on IRQ disabling. See the comment near struct mmu_table_batch.</div><div class='del'>-	 */</div><div class='del'>-	smp_call_function(tlb_remove_table_smp_sync, NULL, 1);</div><div class='del'>-	__tlb_remove_table(table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tlb_remove_table_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct mmu_table_batch *batch;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	batch = container_of(head, struct mmu_table_batch, rcu);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; batch-&gt;nr; i++)</div><div class='del'>-		__tlb_remove_table(batch-&gt;tables[i]);</div><div class='del'>-</div><div class='del'>-	free_page((unsigned long)batch);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tlb_table_flush(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	struct mmu_table_batch **batch = &amp;tlb-&gt;batch;</div><div class='del'>-</div><div class='del'>-	if (*batch) {</div><div class='del'>-		call_rcu(&amp;(*batch)-&gt;rcu, tlb_remove_table_rcu);</div><div class='del'>-		*batch = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tlb_remove_table(struct mmu_gather *tlb, void *table)</div><div class='del'>-{</div><div class='del'>-	struct mmu_table_batch **batch = &amp;tlb-&gt;batch;</div><div class='del'>-</div><div class='del'>-	tlb-&gt;mm-&gt;context.flush_mm = 1;</div><div class='del'>-	if (*batch == NULL) {</div><div class='del'>-		*batch = (struct mmu_table_batch *)</div><div class='del'>-			__get_free_page(GFP_NOWAIT | __GFP_NOWARN);</div><div class='del'>-		if (*batch == NULL) {</div><div class='del'>-			__tlb_flush_mm_lazy(tlb-&gt;mm);</div><div class='del'>-			tlb_remove_table_one(table);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		(*batch)-&gt;nr = 0;</div><div class='del'>-	}</div><div class='del'>-	(*batch)-&gt;tables[(*batch)-&gt;nr++] = table;</div><div class='del'>-	if ((*batch)-&gt;nr == MAX_TABLE_BATCH)</div><div class='del'>-		tlb_flush_mmu(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Base infrastructure required to generate basic asces, region, segment,</div><div class='ctx'>  * and page tables that do not make use of enhanced features like EDAT1.</div><div class='head'>diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c<br/>index 8485d6dc2754..9ebd01219812 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/pgtable.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/pgtable.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/pgtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/pgtable.c</a></div><div class='hunk'>@@ -410,6 +410,7 @@ static inline pmd_t pmdp_flush_lazy(struct mm_struct *mm,</div><div class='ctx'> 	return old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PGSTE</div><div class='ctx'> static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pgd;</div><div class='hunk'>@@ -427,6 +428,7 @@ static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> 	pmd = pmd_alloc(mm, pud, addr);</div><div class='ctx'> 	return pmd;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> pmd_t pmdp_xchg_direct(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		       pmd_t *pmdp, pmd_t new)</div><div class='head'>diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c<br/>index 0472e27febdf..b403fa14847d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/vmem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/mm/vmem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/mm/vmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/mm/vmem.c</a></div><div class='hunk'>@@ -413,6 +413,8 @@ void __init vmem_map_init(void)</div><div class='ctx'> 	__set_memory((unsigned long)_sinittext,</div><div class='ctx'> 		     (unsigned long)(_einittext - _sinittext) &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 		     SET_MEMORY_RO | SET_MEMORY_X);</div><div class='add'>+	__set_memory(__stext_dma, (__etext_dma - __stext_dma) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		     SET_MEMORY_RO | SET_MEMORY_X);</div><div class='ctx'> 	pr_info("Write protected kernel read-only data: %luk\n",</div><div class='ctx'> 		(unsigned long)(__end_rodata - _stext) &gt;&gt; 10);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c<br/>index 51dd0267d014..5e7c63033159 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/net/bpf_jit_comp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/net/bpf_jit_comp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/net/bpf_jit_comp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/net/bpf_jit_comp.c</a></div><div class='hunk'>@@ -455,7 +455,7 @@ static void bpf_jit_epilogue(struct bpf_jit *jit, u32 stack_depth)</div><div class='ctx'> 	EMIT4(0xb9040000, REG_2, BPF_REG_0);</div><div class='ctx'> 	/* Restore registers */</div><div class='ctx'> 	save_restore_regs(jit, REGS_RESTORE, stack_depth);</div><div class='del'>-	if (IS_ENABLED(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable) {</div><div class='add'>+	if (__is_defined(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable) {</div><div class='ctx'> 		jit-&gt;r14_thunk_ip = jit-&gt;prg;</div><div class='ctx'> 		/* Generate __s390_indirect_jump_r14 thunk */</div><div class='ctx'> 		if (test_facility(35)) {</div><div class='hunk'>@@ -473,7 +473,7 @@ static void bpf_jit_epilogue(struct bpf_jit *jit, u32 stack_depth)</div><div class='ctx'> 	/* br %r14 */</div><div class='ctx'> 	_EMIT2(0x07fe);</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable &amp;&amp;</div><div class='add'>+	if (__is_defined(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable &amp;&amp;</div><div class='ctx'> 	    (jit-&gt;seen &amp; SEEN_FUNC)) {</div><div class='ctx'> 		jit-&gt;r1_thunk_ip = jit-&gt;prg;</div><div class='ctx'> 		/* Generate __s390_indirect_jump_r1 thunk */</div><div class='hunk'>@@ -999,7 +999,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i</div><div class='ctx'> 		/* lg %w1,&lt;d(imm)&gt;(%l) */</div><div class='ctx'> 		EMIT6_DISP_LH(0xe3000000, 0x0004, REG_W1, REG_0, REG_L,</div><div class='ctx'> 			      EMIT_CONST_U64(func));</div><div class='del'>-		if (IS_ENABLED(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable) {</div><div class='add'>+		if (__is_defined(CC_USING_EXPOLINE) &amp;&amp; !nospec_disable) {</div><div class='ctx'> 			/* brasl %r14,__s390_indirect_jump_r1 */</div><div class='ctx'> 			EMIT6_PCREL_RILB(0xc0050000, REG_14, jit-&gt;r1_thunk_ip);</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c<br/>index 43d9525c36fc..7441857df51b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/oprofile/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/oprofile/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/oprofile/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/oprofile/init.c</a></div><div class='hunk'>@@ -13,23 +13,17 @@</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-</div><div class='del'>-static int __s390_backtrace(void *data, unsigned long address, int reliable)</div><div class='del'>-{</div><div class='del'>-	unsigned int *depth = data;</div><div class='del'>-</div><div class='del'>-	if (*depth == 0)</div><div class='del'>-		return 1;</div><div class='del'>-	(*depth)--;</div><div class='del'>-	oprofile_add_trace(address);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void s390_backtrace(struct pt_regs *regs, unsigned int depth)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return;</div><div class='del'>-	dump_trace(__s390_backtrace, &amp;depth, NULL, regs-&gt;gprs[15]);</div><div class='add'>+	struct unwind_state state;</div><div class='add'>+</div><div class='add'>+	unwind_for_each_frame(&amp;state, current, regs, 0) {</div><div class='add'>+		if (depth-- == 0)</div><div class='add'>+			break;</div><div class='add'>+		oprofile_add_trace(state.ip);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init oprofile_arch_init(struct oprofile_operations *ops)</div><div class='head'>diff --git a/arch/s390/pci/Makefile b/arch/s390/pci/Makefile<br/>index 22d0871291ee..748626a33028 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/pci/Makefile</a></div><div class='hunk'>@@ -3,5 +3,5 @@</div><div class='ctx'> # Makefile for the s390 PCI subsystem.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_PCI)	+= pci.o pci_dma.o pci_clp.o pci_sysfs.o \</div><div class='add'>+obj-$(CONFIG_PCI)	+= pci.o pci_irq.o pci_dma.o pci_clp.o pci_sysfs.o \</div><div class='ctx'> 			   pci_event.o pci_debug.o pci_insn.o pci_mmio.o</div><div class='head'>diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c<br/>index dc9bc82c072c..0ebb7c405a25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/pci/pci.c</a></div><div class='hunk'>@@ -24,11 +24,9 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/msi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/isc.h&gt;</div><div class='ctx'> #include &lt;asm/airq.h&gt;</div><div class='hunk'>@@ -37,30 +35,13 @@</div><div class='ctx'> #include &lt;asm/pci_clp.h&gt;</div><div class='ctx'> #include &lt;asm/pci_dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DEBUG				/* enable pr_debug */</div><div class='del'>-</div><div class='del'>-#define	SIC_IRQ_MODE_ALL		0</div><div class='del'>-#define	SIC_IRQ_MODE_SINGLE		1</div><div class='del'>-</div><div class='del'>-#define ZPCI_NR_DMA_SPACES		1</div><div class='del'>-#define ZPCI_NR_DEVICES			CONFIG_PCI_NR_FUNCTIONS</div><div class='del'>-</div><div class='ctx'> /* list of all detected zpci devices */</div><div class='ctx'> static LIST_HEAD(zpci_list);</div><div class='ctx'> static DEFINE_SPINLOCK(zpci_list_lock);</div><div class='ctx'> </div><div class='del'>-static struct irq_chip zpci_irq_chip = {</div><div class='del'>-	.name = "zPCI",</div><div class='del'>-	.irq_unmask = pci_msi_unmask_irq,</div><div class='del'>-	.irq_mask = pci_msi_mask_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);</div><div class='ctx'> static DEFINE_SPINLOCK(zpci_domain_lock);</div><div class='ctx'> </div><div class='del'>-static struct airq_iv *zpci_aisb_iv;</div><div class='del'>-static struct airq_iv *zpci_aibv[ZPCI_NR_DEVICES];</div><div class='del'>-</div><div class='ctx'> #define ZPCI_IOMAP_ENTRIES						\</div><div class='ctx'> 	min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2),	\</div><div class='ctx'> 	    ZPCI_IOMAP_MAX_ENTRIES)</div><div class='hunk'>@@ -70,6 +51,8 @@ static unsigned long *zpci_iomap_bitmap;</div><div class='ctx'> struct zpci_iomap_entry *zpci_iomap_start;</div><div class='ctx'> EXPORT_SYMBOL_GPL(zpci_iomap_start);</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_FALSE(have_mio);</div><div class='add'>+</div><div class='ctx'> static struct kmem_cache *zdev_fmb_cache;</div><div class='ctx'> </div><div class='ctx'> struct zpci_dev *get_zdev_by_fid(u32 fid)</div><div class='hunk'>@@ -123,39 +106,6 @@ int pci_proc_domain(struct pci_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_proc_domain);</div><div class='ctx'> </div><div class='del'>-/* Modify PCI: Register adapter interruptions */</div><div class='del'>-static int zpci_set_airq(struct zpci_dev *zdev)</div><div class='del'>-{</div><div class='del'>-	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, ZPCI_MOD_FC_REG_INT);</div><div class='del'>-	struct zpci_fib fib = {0};</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	fib.isc = PCI_ISC;</div><div class='del'>-	fib.sum = 1;		/* enable summary notifications */</div><div class='del'>-	fib.noi = airq_iv_end(zdev-&gt;aibv);</div><div class='del'>-	fib.aibv = (unsigned long) zdev-&gt;aibv-&gt;vector;</div><div class='del'>-	fib.aibvo = 0;		/* each zdev has its own interrupt vector */</div><div class='del'>-	fib.aisb = (unsigned long) zpci_aisb_iv-&gt;vector + (zdev-&gt;aisb/64)*8;</div><div class='del'>-	fib.aisbo = zdev-&gt;aisb &amp; 63;</div><div class='del'>-</div><div class='del'>-	return zpci_mod_fc(req, &amp;fib, &amp;status) ? -EIO : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Modify PCI: Unregister adapter interruptions */</div><div class='del'>-static int zpci_clear_airq(struct zpci_dev *zdev)</div><div class='del'>-{</div><div class='del'>-	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, ZPCI_MOD_FC_DEREG_INT);</div><div class='del'>-	struct zpci_fib fib = {0};</div><div class='del'>-	u8 cc, status;</div><div class='del'>-</div><div class='del'>-	cc = zpci_mod_fc(req, &amp;fib, &amp;status);</div><div class='del'>-	if (cc == 3 || (cc == 1 &amp;&amp; status == 24))</div><div class='del'>-		/* Function already gone or IRQs already deregistered. */</div><div class='del'>-		cc = 0;</div><div class='del'>-</div><div class='del'>-	return cc ? -EIO : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Modify PCI: Register I/O address translation parameters */</div><div class='ctx'> int zpci_register_ioat(struct zpci_dev *zdev, u8 dmaas,</div><div class='ctx'> 		       u64 base, u64 limit, u64 iota)</div><div class='hunk'>@@ -241,7 +191,7 @@ static int zpci_cfg_load(struct zpci_dev *zdev, int offset, u32 *val, u8 len)</div><div class='ctx'> 	u64 data;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = zpci_load(&amp;data, req, offset);</div><div class='add'>+	rc = __zpci_load(&amp;data, req, offset);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		data = le64_to_cpu((__force __le64) data);</div><div class='ctx'> 		data &gt;&gt;= (8 - len) * 8;</div><div class='hunk'>@@ -259,7 +209,7 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)</div><div class='ctx'> </div><div class='ctx'> 	data &lt;&lt;= (8 - len) * 8;</div><div class='ctx'> 	data = (__force u64) cpu_to_le64(data);</div><div class='del'>-	rc = zpci_store(data, req, offset);</div><div class='add'>+	rc = __zpci_store(data, req, offset);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,18 +226,48 @@ void __iowrite64_copy(void __iomem *to, const void *from, size_t count)</div><div class='ctx'>        zpci_memcpy_toio(to, from, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __iomem *ioremap(unsigned long ioaddr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	struct vm_struct *area;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	if (!size)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;have_mio))</div><div class='add'>+		return (void __iomem *) ioaddr;</div><div class='add'>+</div><div class='add'>+	offset = ioaddr &amp; ~PAGE_MASK;</div><div class='add'>+	ioaddr &amp;= PAGE_MASK;</div><div class='add'>+	size = PAGE_ALIGN(size + offset);</div><div class='add'>+	area = get_vm_area(size, VM_IOREMAP);</div><div class='add'>+	if (!area)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (ioremap_page_range((unsigned long) area-&gt;addr,</div><div class='add'>+			       (unsigned long) area-&gt;addr + size,</div><div class='add'>+			       ioaddr, PAGE_KERNEL)) {</div><div class='add'>+		vunmap(area-&gt;addr);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return (void __iomem *) ((unsigned long) area-&gt;addr + offset);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ioremap);</div><div class='add'>+</div><div class='add'>+void iounmap(volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		vunmap((__force void *) ((unsigned long) addr &amp; PAGE_MASK));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iounmap);</div><div class='add'>+</div><div class='ctx'> /* Create a virtual mapping cookie for a PCI BAR */</div><div class='del'>-void __iomem *pci_iomap_range(struct pci_dev *pdev,</div><div class='del'>-			      int bar,</div><div class='del'>-			      unsigned long offset,</div><div class='del'>-			      unsigned long max)</div><div class='add'>+static void __iomem *pci_iomap_range_fh(struct pci_dev *pdev, int bar,</div><div class='add'>+					unsigned long offset, unsigned long max)</div><div class='ctx'> {</div><div class='ctx'> 	struct zpci_dev *zdev =	to_zpci(pdev);</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	if (!pci_resource_len(pdev, bar) || bar &gt;= PCI_BAR_COUNT)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	idx = zdev-&gt;bars[bar].map_idx;</div><div class='ctx'> 	spin_lock(&amp;zpci_iomap_lock);</div><div class='ctx'> 	/* Detect overrun */</div><div class='hunk'>@@ -298,6 +278,30 @@ void __iomem *pci_iomap_range(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	return (void __iomem *) ZPCI_ADDR(idx) + offset;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,</div><div class='add'>+					 unsigned long offset,</div><div class='add'>+					 unsigned long max)</div><div class='add'>+{</div><div class='add'>+	unsigned long barsize = pci_resource_len(pdev, bar);</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='add'>+	void __iomem *iova;</div><div class='add'>+</div><div class='add'>+	iova = ioremap((unsigned long) zdev-&gt;bars[bar].mio_wt, barsize);</div><div class='add'>+	return iova ? iova + offset : iova;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __iomem *pci_iomap_range(struct pci_dev *pdev, int bar,</div><div class='add'>+			      unsigned long offset, unsigned long max)</div><div class='add'>+{</div><div class='add'>+	if (!pci_resource_len(pdev, bar) || bar &gt;= PCI_BAR_COUNT)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		return pci_iomap_range_mio(pdev, bar, offset, max);</div><div class='add'>+	else</div><div class='add'>+		return pci_iomap_range_fh(pdev, bar, offset, max);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(pci_iomap_range);</div><div class='ctx'> </div><div class='ctx'> void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='hunk'>@@ -306,7 +310,37 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_iomap);</div><div class='ctx'> </div><div class='del'>-void pci_iounmap(struct pci_dev *pdev, void __iomem *addr)</div><div class='add'>+static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,</div><div class='add'>+					    unsigned long offset, unsigned long max)</div><div class='add'>+{</div><div class='add'>+	unsigned long barsize = pci_resource_len(pdev, bar);</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='add'>+	void __iomem *iova;</div><div class='add'>+</div><div class='add'>+	iova = ioremap((unsigned long) zdev-&gt;bars[bar].mio_wb, barsize);</div><div class='add'>+	return iova ? iova + offset : iova;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __iomem *pci_iomap_wc_range(struct pci_dev *pdev, int bar,</div><div class='add'>+				 unsigned long offset, unsigned long max)</div><div class='add'>+{</div><div class='add'>+	if (!pci_resource_len(pdev, bar) || bar &gt;= PCI_BAR_COUNT)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		return pci_iomap_wc_range_mio(pdev, bar, offset, max);</div><div class='add'>+	else</div><div class='add'>+		return pci_iomap_range_fh(pdev, bar, offset, max);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_iomap_wc_range);</div><div class='add'>+</div><div class='add'>+void __iomem *pci_iomap_wc(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='add'>+{</div><div class='add'>+	return pci_iomap_wc_range(dev, bar, 0, maxlen);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_iomap_wc);</div><div class='add'>+</div><div class='add'>+static void pci_iounmap_fh(struct pci_dev *pdev, void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx = ZPCI_IDX(addr);</div><div class='ctx'> </div><div class='hunk'>@@ -319,6 +353,19 @@ void pci_iounmap(struct pci_dev *pdev, void __iomem *addr)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;zpci_iomap_lock);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void pci_iounmap_mio(struct pci_dev *pdev, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	iounmap(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pci_iounmap(struct pci_dev *pdev, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		pci_iounmap_mio(pdev, addr);</div><div class='add'>+	else</div><div class='add'>+		pci_iounmap_fh(pdev, addr);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(pci_iounmap);</div><div class='ctx'> </div><div class='ctx'> static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,</div><div class='hunk'>@@ -354,136 +401,6 @@ static struct pci_ops pci_root_ops = {</div><div class='ctx'> 	.write = pci_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void zpci_irq_handler(struct airq_struct *airq)</div><div class='del'>-{</div><div class='del'>-	unsigned long si, ai;</div><div class='del'>-	struct airq_iv *aibv;</div><div class='del'>-	int irqs_on = 0;</div><div class='del'>-</div><div class='del'>-	inc_irq_stat(IRQIO_PCI);</div><div class='del'>-	for (si = 0;;) {</div><div class='del'>-		/* Scan adapter summary indicator bit vector */</div><div class='del'>-		si = airq_iv_scan(zpci_aisb_iv, si, airq_iv_end(zpci_aisb_iv));</div><div class='del'>-		if (si == -1UL) {</div><div class='del'>-			if (irqs_on++)</div><div class='del'>-				/* End of second scan with interrupts on. */</div><div class='del'>-				break;</div><div class='del'>-			/* First scan complete, reenable interrupts. */</div><div class='del'>-			if (zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC))</div><div class='del'>-				break;</div><div class='del'>-			si = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Scan the adapter interrupt vector for this device. */</div><div class='del'>-		aibv = zpci_aibv[si];</div><div class='del'>-		for (ai = 0;;) {</div><div class='del'>-			ai = airq_iv_scan(aibv, ai, airq_iv_end(aibv));</div><div class='del'>-			if (ai == -1UL)</div><div class='del'>-				break;</div><div class='del'>-			inc_irq_stat(IRQIO_MSI);</div><div class='del'>-			airq_iv_lock(aibv, ai);</div><div class='del'>-			generic_handle_irq(airq_iv_get_data(aibv, ai));</div><div class='del'>-			airq_iv_unlock(aibv, ai);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='del'>-{</div><div class='del'>-	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='del'>-	unsigned int hwirq, msi_vecs;</div><div class='del'>-	unsigned long aisb;</div><div class='del'>-	struct msi_desc *msi;</div><div class='del'>-	struct msi_msg msg;</div><div class='del'>-	int rc, irq;</div><div class='del'>-</div><div class='del'>-	zdev-&gt;aisb = -1UL;</div><div class='del'>-	if (type == PCI_CAP_ID_MSI &amp;&amp; nvec &gt; 1)</div><div class='del'>-		return 1;</div><div class='del'>-	msi_vecs = min_t(unsigned int, nvec, zdev-&gt;max_msi);</div><div class='del'>-</div><div class='del'>-	/* Allocate adapter summary indicator bit */</div><div class='del'>-	aisb = airq_iv_alloc_bit(zpci_aisb_iv);</div><div class='del'>-	if (aisb == -1UL)</div><div class='del'>-		return -EIO;</div><div class='del'>-	zdev-&gt;aisb = aisb;</div><div class='del'>-</div><div class='del'>-	/* Create adapter interrupt vector */</div><div class='del'>-	zdev-&gt;aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);</div><div class='del'>-	if (!zdev-&gt;aibv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Wire up shortcut pointer */</div><div class='del'>-	zpci_aibv[aisb] = zdev-&gt;aibv;</div><div class='del'>-</div><div class='del'>-	/* Request MSI interrupts */</div><div class='del'>-	hwirq = 0;</div><div class='del'>-	for_each_pci_msi_entry(msi, pdev) {</div><div class='del'>-		if (hwirq &gt;= msi_vecs)</div><div class='del'>-			break;</div><div class='del'>-		irq = irq_alloc_desc(0);	/* Alloc irq on node 0 */</div><div class='del'>-		if (irq &lt; 0)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		rc = irq_set_msi_desc(irq, msi);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-		irq_set_chip_and_handler(irq, &amp;zpci_irq_chip,</div><div class='del'>-					 handle_simple_irq);</div><div class='del'>-		msg.data = hwirq;</div><div class='del'>-		msg.address_lo = zdev-&gt;msi_addr &amp; 0xffffffff;</div><div class='del'>-		msg.address_hi = zdev-&gt;msi_addr &gt;&gt; 32;</div><div class='del'>-		pci_write_msi_msg(irq, &amp;msg);</div><div class='del'>-		airq_iv_set_data(zdev-&gt;aibv, hwirq, irq);</div><div class='del'>-		hwirq++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable adapter interrupts */</div><div class='del'>-	rc = zpci_set_airq(zdev);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	return (msi_vecs == nvec) ? 0 : msi_vecs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void arch_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='del'>-	struct msi_desc *msi;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* Disable adapter interrupts */</div><div class='del'>-	rc = zpci_clear_airq(zdev);</div><div class='del'>-	if (rc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Release MSI interrupts */</div><div class='del'>-	for_each_pci_msi_entry(msi, pdev) {</div><div class='del'>-		if (!msi-&gt;irq)</div><div class='del'>-			continue;</div><div class='del'>-		if (msi-&gt;msi_attrib.is_msix)</div><div class='del'>-			__pci_msix_desc_mask_irq(msi, 1);</div><div class='del'>-		else</div><div class='del'>-			__pci_msi_desc_mask_irq(msi, 1, 1);</div><div class='del'>-		irq_set_msi_desc(msi-&gt;irq, NULL);</div><div class='del'>-		irq_free_desc(msi-&gt;irq);</div><div class='del'>-		msi-&gt;msg.address_lo = 0;</div><div class='del'>-		msi-&gt;msg.address_hi = 0;</div><div class='del'>-		msi-&gt;msg.data = 0;</div><div class='del'>-		msi-&gt;irq = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zdev-&gt;aisb != -1UL) {</div><div class='del'>-		zpci_aibv[zdev-&gt;aisb] = NULL;</div><div class='del'>-		airq_iv_free_bit(zpci_aisb_iv, zdev-&gt;aisb);</div><div class='del'>-		zdev-&gt;aisb = -1UL;</div><div class='del'>-	}</div><div class='del'>-	if (zdev-&gt;aibv) {</div><div class='del'>-		airq_iv_release(zdev-&gt;aibv);</div><div class='del'>-		zdev-&gt;aibv = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='ctx'> static struct resource iov_res = {</div><div class='ctx'> 	.name	= "PCI IOV res",</div><div class='hunk'>@@ -495,6 +412,7 @@ static struct resource iov_res = {</div><div class='ctx'> </div><div class='ctx'> static void zpci_map_resources(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='ctx'> 	resource_size_t len;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -502,8 +420,13 @@ static void zpci_map_resources(struct pci_dev *pdev)</div><div class='ctx'> 		len = pci_resource_len(pdev, i);</div><div class='ctx'> 		if (!len)</div><div class='ctx'> 			continue;</div><div class='del'>-		pdev-&gt;resource[i].start =</div><div class='del'>-			(resource_size_t __force) pci_iomap(pdev, i, 0);</div><div class='add'>+</div><div class='add'>+		if (static_branch_likely(&amp;have_mio))</div><div class='add'>+			pdev-&gt;resource[i].start =</div><div class='add'>+				(resource_size_t __force) zdev-&gt;bars[i].mio_wb;</div><div class='add'>+		else</div><div class='add'>+			pdev-&gt;resource[i].start =</div><div class='add'>+				(resource_size_t __force) pci_iomap(pdev, i, 0);</div><div class='ctx'> 		pdev-&gt;resource[i].end = pdev-&gt;resource[i].start + len - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -524,6 +447,9 @@ static void zpci_unmap_resources(struct pci_dev *pdev)</div><div class='ctx'> 	resource_size_t len;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; PCI_BAR_COUNT; i++) {</div><div class='ctx'> 		len = pci_resource_len(pdev, i);</div><div class='ctx'> 		if (!len)</div><div class='hunk'>@@ -533,41 +459,6 @@ static void zpci_unmap_resources(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct airq_struct zpci_airq = {</div><div class='del'>-	.handler = zpci_irq_handler,</div><div class='del'>-	.isc = PCI_ISC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init zpci_irq_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = register_adapter_interrupt(&amp;zpci_airq);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out;</div><div class='del'>-	/* Set summary to 1 to be called every time for the ISC. */</div><div class='del'>-	*zpci_airq.lsi_ptr = 1;</div><div class='del'>-</div><div class='del'>-	rc = -ENOMEM;</div><div class='del'>-	zpci_aisb_iv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC);</div><div class='del'>-	if (!zpci_aisb_iv)</div><div class='del'>-		goto out_airq;</div><div class='del'>-</div><div class='del'>-	zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_airq:</div><div class='del'>-	unregister_adapter_interrupt(&amp;zpci_airq);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zpci_irq_exit(void)</div><div class='del'>-{</div><div class='del'>-	airq_iv_release(zpci_aisb_iv);</div><div class='del'>-	unregister_adapter_interrupt(&amp;zpci_airq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int zpci_alloc_iomap(struct zpci_dev *zdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long entry;</div><div class='hunk'>@@ -958,7 +849,9 @@ static void zpci_mem_exit(void)</div><div class='ctx'> 	kmem_cache_destroy(zdev_fmb_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int s390_pci_probe = 1;</div><div class='add'>+static unsigned int s390_pci_probe __initdata = 1;</div><div class='add'>+static unsigned int s390_pci_no_mio __initdata;</div><div class='add'>+unsigned int s390_pci_force_floating __initdata;</div><div class='ctx'> static unsigned int s390_pci_initialized;</div><div class='ctx'> </div><div class='ctx'> char * __init pcibios_setup(char *str)</div><div class='hunk'>@@ -967,6 +860,14 @@ char * __init pcibios_setup(char *str)</div><div class='ctx'> 		s390_pci_probe = 0;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	if (!strcmp(str, "nomio")) {</div><div class='add'>+		s390_pci_no_mio = 1;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (!strcmp(str, "force_floating")) {</div><div class='add'>+		s390_pci_force_floating = 1;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -985,6 +886,9 @@ static int __init pci_base_init(void)</div><div class='ctx'> 	if (!test_facility(69) || !test_facility(71))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (test_facility(153) &amp;&amp; !s390_pci_no_mio)</div><div class='add'>+		static_branch_enable(&amp;have_mio);</div><div class='add'>+</div><div class='ctx'> 	rc = zpci_debug_init();</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c<br/>index eeb7450db18c..3a36b07a5571 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci_clp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci_clp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci_clp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/pci/pci_clp.c</a></div><div class='hunk'>@@ -163,7 +163,14 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev,</div><div class='ctx'> 		memcpy(zdev-&gt;util_str, response-&gt;util_str,</div><div class='ctx'> 		       sizeof(zdev-&gt;util_str));</div><div class='ctx'> 	}</div><div class='add'>+	zdev-&gt;mio_capable = response-&gt;mio_addr_avail;</div><div class='add'>+	for (i = 0; i &lt; PCI_BAR_COUNT; i++) {</div><div class='add'>+		if (!(response-&gt;mio_valid &amp; (1 &lt;&lt; (PCI_BAR_COUNT - i - 1))))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='add'>+		zdev-&gt;bars[i].mio_wb = (void __iomem *) response-&gt;addr[i].wb;</div><div class='add'>+		zdev-&gt;bars[i].mio_wt = (void __iomem *) response-&gt;addr[i].wt;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -279,11 +286,18 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = clp_set_pci_fn(&amp;fh, nr_dma_as, CLP_SET_ENABLE_PCI_FN);</div><div class='del'>-	if (!rc)</div><div class='del'>-		/* Success -&gt; store enabled handle in zdev */</div><div class='del'>-		zdev-&gt;fh = fh;</div><div class='add'>+	zpci_dbg(3, "ena fid:%x, fh:%x, rc:%d\n", zdev-&gt;fid, fh, rc);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	zpci_dbg(3, "ena fid:%x, fh:%x, rc:%d\n", zdev-&gt;fid, zdev-&gt;fh, rc);</div><div class='add'>+	zdev-&gt;fh = fh;</div><div class='add'>+	if (zdev-&gt;mio_capable) {</div><div class='add'>+		rc = clp_set_pci_fn(&amp;fh, nr_dma_as, CLP_SET_ENABLE_MIO);</div><div class='add'>+		zpci_dbg(3, "ena mio fid:%x, fh:%x, rc:%d\n", zdev-&gt;fid, fh, rc);</div><div class='add'>+		if (rc)</div><div class='add'>+			clp_disable_fh(zdev);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -296,11 +310,10 @@ int clp_disable_fh(struct zpci_dev *zdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	rc = clp_set_pci_fn(&amp;fh, 0, CLP_SET_DISABLE_PCI_FN);</div><div class='add'>+	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev-&gt;fid, fh, rc);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		/* Success -&gt; store disabled handle in zdev */</div><div class='ctx'> 		zdev-&gt;fh = fh;</div><div class='ctx'> </div><div class='del'>-	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev-&gt;fid, zdev-&gt;fh, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/pci/pci_insn.c b/arch/s390/pci/pci_insn.c<br/>index f069929e8211..02f9505c99a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci_insn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/pci/pci_insn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci_insn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/pci/pci_insn.c</a></div><div class='hunk'>@@ -8,9 +8,11 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/pci_insn.h&gt;</div><div class='ctx'> #include &lt;asm/pci_debug.h&gt;</div><div class='add'>+#include &lt;asm/pci_io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ZPCI_INSN_BUSY_DELAY	1	/* 1 microsecond */</div><div class='hunk'>@@ -96,13 +98,15 @@ int zpci_refresh_trans(u64 fn, u64 addr, u64 range)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set Interruption Controls */</div><div class='del'>-int zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc)</div><div class='add'>+int __zpci_set_irq_ctrl(u16 ctl, u8 isc, union zpci_sic_iib *iib)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_facility(72))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	asm volatile (</div><div class='del'>-		"	.insn	rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"</div><div class='del'>-		: : [ctl] "d" (ctl), [isc] "d" (isc &lt;&lt; 27), [u] "Q" (*unused));</div><div class='add'>+</div><div class='add'>+	asm volatile(</div><div class='add'>+		".insn	rsy,0xeb00000000d1,%[ctl],%[isc],%[iib]\n"</div><div class='add'>+		: : [ctl] "d" (ctl), [isc] "d" (isc &lt;&lt; 27), [iib] "Q" (*iib));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +144,7 @@ static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)</div><div class='ctx'> 	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zpci_load(u64 *data, u64 req, u64 offset)</div><div class='add'>+int __zpci_load(u64 *data, u64 req, u64 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int cc;</div><div class='hunk'>@@ -156,6 +160,52 @@ int zpci_load(u64 *data, u64 req, u64 offset)</div><div class='ctx'> </div><div class='ctx'> 	return (cc &gt; 0) ? -EIO : cc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__zpci_load);</div><div class='add'>+</div><div class='add'>+static inline int zpci_load_fh(u64 *data, const volatile void __iomem *addr,</div><div class='add'>+			       unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(addr)];</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, len);</div><div class='add'>+</div><div class='add'>+	return __zpci_load(data, req, ZPCI_OFFSET(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __pcilg_mio(u64 *data, u64 ioaddr, u64 len, u8 *status)</div><div class='add'>+{</div><div class='add'>+	register u64 addr asm("2") = ioaddr;</div><div class='add'>+	register u64 r3 asm("3") = len;</div><div class='add'>+	int cc = -ENXIO;</div><div class='add'>+	u64 __data;</div><div class='add'>+</div><div class='add'>+	asm volatile (</div><div class='add'>+		"       .insn   rre,0xb9d60000,%[data],%[ioaddr]\n"</div><div class='add'>+		"0:     ipm     %[cc]\n"</div><div class='add'>+		"       srl     %[cc],28\n"</div><div class='add'>+		"1:\n"</div><div class='add'>+		EX_TABLE(0b, 1b)</div><div class='add'>+		: [cc] "+d" (cc), [data] "=d" (__data), "+d" (r3)</div><div class='add'>+		: [ioaddr] "d" (addr)</div><div class='add'>+		: "cc");</div><div class='add'>+	*status = r3 &gt;&gt; 24 &amp; 0xff;</div><div class='add'>+	*data = __data;</div><div class='add'>+	return cc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zpci_load(u64 *data, const volatile void __iomem *addr, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int cc;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;have_mio))</div><div class='add'>+		return zpci_load_fh(data, addr, len);</div><div class='add'>+</div><div class='add'>+	cc = __pcilg_mio(data, (__force u64) addr, len, &amp;status);</div><div class='add'>+	if (cc)</div><div class='add'>+		zpci_err_insn(cc, status, 0, (__force u64) addr);</div><div class='add'>+</div><div class='add'>+	return (cc &gt; 0) ? -EIO : cc;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(zpci_load);</div><div class='ctx'> </div><div class='ctx'> /* PCI Store */</div><div class='hunk'>@@ -178,7 +228,7 @@ static inline int __pcistg(u64 data, u64 req, u64 offset, u8 *status)</div><div class='ctx'> 	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zpci_store(u64 data, u64 req, u64 offset)</div><div class='add'>+int __zpci_store(u64 data, u64 req, u64 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int cc;</div><div class='hunk'>@@ -194,6 +244,50 @@ int zpci_store(u64 data, u64 req, u64 offset)</div><div class='ctx'> </div><div class='ctx'> 	return (cc &gt; 0) ? -EIO : cc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__zpci_store);</div><div class='add'>+</div><div class='add'>+static inline int zpci_store_fh(const volatile void __iomem *addr, u64 data,</div><div class='add'>+				unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(addr)];</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, len);</div><div class='add'>+</div><div class='add'>+	return __zpci_store(data, req, ZPCI_OFFSET(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __pcistg_mio(u64 data, u64 ioaddr, u64 len, u8 *status)</div><div class='add'>+{</div><div class='add'>+	register u64 addr asm("2") = ioaddr;</div><div class='add'>+	register u64 r3 asm("3") = len;</div><div class='add'>+	int cc = -ENXIO;</div><div class='add'>+</div><div class='add'>+	asm volatile (</div><div class='add'>+		"       .insn   rre,0xb9d40000,%[data],%[ioaddr]\n"</div><div class='add'>+		"0:     ipm     %[cc]\n"</div><div class='add'>+		"       srl     %[cc],28\n"</div><div class='add'>+		"1:\n"</div><div class='add'>+		EX_TABLE(0b, 1b)</div><div class='add'>+		: [cc] "+d" (cc), "+d" (r3)</div><div class='add'>+		: [data] "d" (data), [ioaddr] "d" (addr)</div><div class='add'>+		: "cc");</div><div class='add'>+	*status = r3 &gt;&gt; 24 &amp; 0xff;</div><div class='add'>+	return cc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zpci_store(const volatile void __iomem *addr, u64 data, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int cc;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;have_mio))</div><div class='add'>+		return zpci_store_fh(addr, data, len);</div><div class='add'>+</div><div class='add'>+	cc = __pcistg_mio(data, (__force u64) addr, len, &amp;status);</div><div class='add'>+	if (cc)</div><div class='add'>+		zpci_err_insn(cc, status, 0, (__force u64) addr);</div><div class='add'>+</div><div class='add'>+	return (cc &gt; 0) ? -EIO : cc;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(zpci_store);</div><div class='ctx'> </div><div class='ctx'> /* PCI Store Block */</div><div class='hunk'>@@ -214,7 +308,7 @@ static inline int __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)</div><div class='ctx'> 	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zpci_store_block(const u64 *data, u64 req, u64 offset)</div><div class='add'>+int __zpci_store_block(const u64 *data, u64 req, u64 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	int cc;</div><div class='hunk'>@@ -230,4 +324,63 @@ int zpci_store_block(const u64 *data, u64 req, u64 offset)</div><div class='ctx'> </div><div class='ctx'> 	return (cc &gt; 0) ? -EIO : cc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(zpci_store_block);</div><div class='add'>+EXPORT_SYMBOL_GPL(__zpci_store_block);</div><div class='add'>+</div><div class='add'>+static inline int zpci_write_block_fh(volatile void __iomem *dst,</div><div class='add'>+				      const void *src, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct zpci_iomap_entry *entry = &amp;zpci_iomap_start[ZPCI_IDX(dst)];</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(entry-&gt;fh, entry-&gt;bar, len);</div><div class='add'>+	u64 offset = ZPCI_OFFSET(dst);</div><div class='add'>+</div><div class='add'>+	return __zpci_store_block(src, req, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __pcistb_mio(const u64 *data, u64 ioaddr, u64 len, u8 *status)</div><div class='add'>+{</div><div class='add'>+	int cc = -ENXIO;</div><div class='add'>+</div><div class='add'>+	asm volatile (</div><div class='add'>+		"       .insn   rsy,0xeb00000000d4,%[len],%[ioaddr],%[data]\n"</div><div class='add'>+		"0:     ipm     %[cc]\n"</div><div class='add'>+		"       srl     %[cc],28\n"</div><div class='add'>+		"1:\n"</div><div class='add'>+		EX_TABLE(0b, 1b)</div><div class='add'>+		: [cc] "+d" (cc), [len] "+d" (len)</div><div class='add'>+		: [ioaddr] "d" (ioaddr), [data] "Q" (*data)</div><div class='add'>+		: "cc");</div><div class='add'>+	*status = len &gt;&gt; 24 &amp; 0xff;</div><div class='add'>+	return cc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zpci_write_block(volatile void __iomem *dst,</div><div class='add'>+		     const void *src, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int cc;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;have_mio))</div><div class='add'>+		return zpci_write_block_fh(dst, src, len);</div><div class='add'>+</div><div class='add'>+	cc = __pcistb_mio(src, (__force u64) dst, len, &amp;status);</div><div class='add'>+	if (cc)</div><div class='add'>+		zpci_err_insn(cc, status, 0, (__force u64) dst);</div><div class='add'>+</div><div class='add'>+	return (cc &gt; 0) ? -EIO : cc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(zpci_write_block);</div><div class='add'>+</div><div class='add'>+static inline void __pciwb_mio(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long unused = 0;</div><div class='add'>+</div><div class='add'>+	asm volatile (".insn    rre,0xb9d50000,%[op],%[op]\n"</div><div class='add'>+		      : [op] "+d" (unused));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zpci_barrier(void)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_likely(&amp;have_mio))</div><div class='add'>+		__pciwb_mio();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(zpci_barrier);</div><div class='head'>diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c<br/>new file mode 100644<br/>index 000000000000..d80616ae8dd8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/pci/pci_irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/pci/pci_irq.c</a></div><div class='hunk'>@@ -0,0 +1,486 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#define KMSG_COMPONENT "zpci"</div><div class='add'>+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/isc.h&gt;</div><div class='add'>+#include &lt;asm/airq.h&gt;</div><div class='add'>+</div><div class='add'>+static enum {FLOATING, DIRECTED} irq_delivery;</div><div class='add'>+</div><div class='add'>+#define	SIC_IRQ_MODE_ALL		0</div><div class='add'>+#define	SIC_IRQ_MODE_SINGLE		1</div><div class='add'>+#define	SIC_IRQ_MODE_DIRECT		4</div><div class='add'>+#define	SIC_IRQ_MODE_D_ALL		16</div><div class='add'>+#define	SIC_IRQ_MODE_D_SINGLE		17</div><div class='add'>+#define	SIC_IRQ_MODE_SET_CPU		18</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * summary bit vector</div><div class='add'>+ * FLOATING - summary bit per function</div><div class='add'>+ * DIRECTED - summary bit per cpu (only used in fallback path)</div><div class='add'>+ */</div><div class='add'>+static struct airq_iv *zpci_sbv;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * interrupt bit vectors</div><div class='add'>+ * FLOATING - interrupt bit vector per function</div><div class='add'>+ * DIRECTED - interrupt bit vector per cpu</div><div class='add'>+ */</div><div class='add'>+static struct airq_iv **zpci_ibv;</div><div class='add'>+</div><div class='add'>+/* Modify PCI: Register adapter interruptions */</div><div class='add'>+static int zpci_set_airq(struct zpci_dev *zdev)</div><div class='add'>+{</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, ZPCI_MOD_FC_REG_INT);</div><div class='add'>+	struct zpci_fib fib = {0};</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	fib.fmt0.isc = PCI_ISC;</div><div class='add'>+	fib.fmt0.sum = 1;	/* enable summary notifications */</div><div class='add'>+	fib.fmt0.noi = airq_iv_end(zdev-&gt;aibv);</div><div class='add'>+	fib.fmt0.aibv = (unsigned long) zdev-&gt;aibv-&gt;vector;</div><div class='add'>+	fib.fmt0.aibvo = 0;	/* each zdev has its own interrupt vector */</div><div class='add'>+	fib.fmt0.aisb = (unsigned long) zpci_sbv-&gt;vector + (zdev-&gt;aisb/64)*8;</div><div class='add'>+	fib.fmt0.aisbo = zdev-&gt;aisb &amp; 63;</div><div class='add'>+</div><div class='add'>+	return zpci_mod_fc(req, &amp;fib, &amp;status) ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Modify PCI: Unregister adapter interruptions */</div><div class='add'>+static int zpci_clear_airq(struct zpci_dev *zdev)</div><div class='add'>+{</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, ZPCI_MOD_FC_DEREG_INT);</div><div class='add'>+	struct zpci_fib fib = {0};</div><div class='add'>+	u8 cc, status;</div><div class='add'>+</div><div class='add'>+	cc = zpci_mod_fc(req, &amp;fib, &amp;status);</div><div class='add'>+	if (cc == 3 || (cc == 1 &amp;&amp; status == 24))</div><div class='add'>+		/* Function already gone or IRQs already deregistered. */</div><div class='add'>+		cc = 0;</div><div class='add'>+</div><div class='add'>+	return cc ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Modify PCI: Register CPU directed interruptions */</div><div class='add'>+static int zpci_set_directed_irq(struct zpci_dev *zdev)</div><div class='add'>+{</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, ZPCI_MOD_FC_REG_INT_D);</div><div class='add'>+	struct zpci_fib fib = {0};</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	fib.fmt = 1;</div><div class='add'>+	fib.fmt1.noi = zdev-&gt;msi_nr_irqs;</div><div class='add'>+	fib.fmt1.dibvo = zdev-&gt;msi_first_bit;</div><div class='add'>+</div><div class='add'>+	return zpci_mod_fc(req, &amp;fib, &amp;status) ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Modify PCI: Unregister CPU directed interruptions */</div><div class='add'>+static int zpci_clear_directed_irq(struct zpci_dev *zdev)</div><div class='add'>+{</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, ZPCI_MOD_FC_DEREG_INT_D);</div><div class='add'>+	struct zpci_fib fib = {0};</div><div class='add'>+	u8 cc, status;</div><div class='add'>+</div><div class='add'>+	fib.fmt = 1;</div><div class='add'>+	cc = zpci_mod_fc(req, &amp;fib, &amp;status);</div><div class='add'>+	if (cc == 3 || (cc == 1 &amp;&amp; status == 24))</div><div class='add'>+		/* Function already gone or IRQs already deregistered. */</div><div class='add'>+		cc = 0;</div><div class='add'>+</div><div class='add'>+	return cc ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zpci_set_irq_affinity(struct irq_data *data, const struct cpumask *dest,</div><div class='add'>+				 bool force)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *entry = irq_get_msi_desc(data-&gt;irq);</div><div class='add'>+	struct msi_msg msg = entry-&gt;msg;</div><div class='add'>+</div><div class='add'>+	msg.address_lo &amp;= 0xff0000ff;</div><div class='add'>+	msg.address_lo |= (cpumask_first(dest) &lt;&lt; 8);</div><div class='add'>+	pci_write_msi_msg(data-&gt;irq, &amp;msg);</div><div class='add'>+</div><div class='add'>+	return IRQ_SET_MASK_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip zpci_irq_chip = {</div><div class='add'>+	.name = "PCI-MSI",</div><div class='add'>+	.irq_unmask = pci_msi_unmask_irq,</div><div class='add'>+	.irq_mask = pci_msi_mask_irq,</div><div class='add'>+	.irq_set_affinity = zpci_set_irq_affinity,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void zpci_handle_cpu_local_irq(bool rescan)</div><div class='add'>+{</div><div class='add'>+	struct airq_iv *dibv = zpci_ibv[smp_processor_id()];</div><div class='add'>+	unsigned long bit;</div><div class='add'>+	int irqs_on = 0;</div><div class='add'>+</div><div class='add'>+	for (bit = 0;;) {</div><div class='add'>+		/* Scan the directed IRQ bit vector */</div><div class='add'>+		bit = airq_iv_scan(dibv, bit, airq_iv_end(dibv));</div><div class='add'>+		if (bit == -1UL) {</div><div class='add'>+			if (!rescan || irqs_on++)</div><div class='add'>+				/* End of second scan with interrupts on. */</div><div class='add'>+				break;</div><div class='add'>+			/* First scan complete, reenable interrupts. */</div><div class='add'>+			if (zpci_set_irq_ctrl(SIC_IRQ_MODE_D_SINGLE, PCI_ISC))</div><div class='add'>+				break;</div><div class='add'>+			bit = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		inc_irq_stat(IRQIO_MSI);</div><div class='add'>+		generic_handle_irq(airq_iv_get_data(dibv, bit));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpu_irq_data {</div><div class='add'>+	call_single_data_t csd;</div><div class='add'>+	atomic_t scheduled;</div><div class='add'>+};</div><div class='add'>+static DEFINE_PER_CPU_SHARED_ALIGNED(struct cpu_irq_data, irq_data);</div><div class='add'>+</div><div class='add'>+static void zpci_handle_remote_irq(void *data)</div><div class='add'>+{</div><div class='add'>+	atomic_t *scheduled = data;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		zpci_handle_cpu_local_irq(false);</div><div class='add'>+	} while (atomic_dec_return(scheduled));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zpci_handle_fallback_irq(void)</div><div class='add'>+{</div><div class='add'>+	struct cpu_irq_data *cpu_data;</div><div class='add'>+	unsigned long cpu;</div><div class='add'>+	int irqs_on = 0;</div><div class='add'>+</div><div class='add'>+	for (cpu = 0;;) {</div><div class='add'>+		cpu = airq_iv_scan(zpci_sbv, cpu, airq_iv_end(zpci_sbv));</div><div class='add'>+		if (cpu == -1UL) {</div><div class='add'>+			if (irqs_on++)</div><div class='add'>+				/* End of second scan with interrupts on. */</div><div class='add'>+				break;</div><div class='add'>+			/* First scan complete, reenable interrupts. */</div><div class='add'>+			if (zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, PCI_ISC))</div><div class='add'>+				break;</div><div class='add'>+			cpu = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		cpu_data = &amp;per_cpu(irq_data, cpu);</div><div class='add'>+		if (atomic_inc_return(&amp;cpu_data-&gt;scheduled) &gt; 1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cpu_data-&gt;csd.func = zpci_handle_remote_irq;</div><div class='add'>+		cpu_data-&gt;csd.info = &amp;cpu_data-&gt;scheduled;</div><div class='add'>+		cpu_data-&gt;csd.flags = 0;</div><div class='add'>+		smp_call_function_single_async(cpu, &amp;cpu_data-&gt;csd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zpci_directed_irq_handler(struct airq_struct *airq, bool floating)</div><div class='add'>+{</div><div class='add'>+	if (floating) {</div><div class='add'>+		inc_irq_stat(IRQIO_PCF);</div><div class='add'>+		zpci_handle_fallback_irq();</div><div class='add'>+	} else {</div><div class='add'>+		inc_irq_stat(IRQIO_PCD);</div><div class='add'>+		zpci_handle_cpu_local_irq(true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zpci_floating_irq_handler(struct airq_struct *airq, bool floating)</div><div class='add'>+{</div><div class='add'>+	unsigned long si, ai;</div><div class='add'>+	struct airq_iv *aibv;</div><div class='add'>+	int irqs_on = 0;</div><div class='add'>+</div><div class='add'>+	inc_irq_stat(IRQIO_PCF);</div><div class='add'>+	for (si = 0;;) {</div><div class='add'>+		/* Scan adapter summary indicator bit vector */</div><div class='add'>+		si = airq_iv_scan(zpci_sbv, si, airq_iv_end(zpci_sbv));</div><div class='add'>+		if (si == -1UL) {</div><div class='add'>+			if (irqs_on++)</div><div class='add'>+				/* End of second scan with interrupts on. */</div><div class='add'>+				break;</div><div class='add'>+			/* First scan complete, reenable interrupts. */</div><div class='add'>+			if (zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, PCI_ISC))</div><div class='add'>+				break;</div><div class='add'>+			si = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Scan the adapter interrupt vector for this device. */</div><div class='add'>+		aibv = zpci_ibv[si];</div><div class='add'>+		for (ai = 0;;) {</div><div class='add'>+			ai = airq_iv_scan(aibv, ai, airq_iv_end(aibv));</div><div class='add'>+			if (ai == -1UL)</div><div class='add'>+				break;</div><div class='add'>+			inc_irq_stat(IRQIO_MSI);</div><div class='add'>+			airq_iv_lock(aibv, ai);</div><div class='add'>+			generic_handle_irq(airq_iv_get_data(aibv, ai));</div><div class='add'>+			airq_iv_unlock(aibv, ai);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='add'>+{</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='add'>+	unsigned int hwirq, msi_vecs, cpu;</div><div class='add'>+	unsigned long bit;</div><div class='add'>+	struct msi_desc *msi;</div><div class='add'>+	struct msi_msg msg;</div><div class='add'>+	int rc, irq;</div><div class='add'>+</div><div class='add'>+	zdev-&gt;aisb = -1UL;</div><div class='add'>+	zdev-&gt;msi_first_bit = -1U;</div><div class='add'>+	if (type == PCI_CAP_ID_MSI &amp;&amp; nvec &gt; 1)</div><div class='add'>+		return 1;</div><div class='add'>+	msi_vecs = min_t(unsigned int, nvec, zdev-&gt;max_msi);</div><div class='add'>+</div><div class='add'>+	if (irq_delivery == DIRECTED) {</div><div class='add'>+		/* Allocate cpu vector bits */</div><div class='add'>+		bit = airq_iv_alloc(zpci_ibv[0], msi_vecs);</div><div class='add'>+		if (bit == -1UL)</div><div class='add'>+			return -EIO;</div><div class='add'>+	} else {</div><div class='add'>+		/* Allocate adapter summary indicator bit */</div><div class='add'>+		bit = airq_iv_alloc_bit(zpci_sbv);</div><div class='add'>+		if (bit == -1UL)</div><div class='add'>+			return -EIO;</div><div class='add'>+		zdev-&gt;aisb = bit;</div><div class='add'>+</div><div class='add'>+		/* Create adapter interrupt vector */</div><div class='add'>+		zdev-&gt;aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);</div><div class='add'>+		if (!zdev-&gt;aibv)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		/* Wire up shortcut pointer */</div><div class='add'>+		zpci_ibv[bit] = zdev-&gt;aibv;</div><div class='add'>+		/* Each function has its own interrupt vector */</div><div class='add'>+		bit = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Request MSI interrupts */</div><div class='add'>+	hwirq = bit;</div><div class='add'>+	for_each_pci_msi_entry(msi, pdev) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		if (hwirq - bit &gt;= msi_vecs)</div><div class='add'>+			break;</div><div class='add'>+		irq = __irq_alloc_descs(-1, 0, 1, 0, THIS_MODULE, msi-&gt;affinity);</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		rc = irq_set_msi_desc(irq, msi);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		irq_set_chip_and_handler(irq, &amp;zpci_irq_chip,</div><div class='add'>+					 handle_percpu_irq);</div><div class='add'>+		msg.data = hwirq;</div><div class='add'>+		if (irq_delivery == DIRECTED) {</div><div class='add'>+			msg.address_lo = zdev-&gt;msi_addr &amp; 0xff0000ff;</div><div class='add'>+			msg.address_lo |= msi-&gt;affinity ?</div><div class='add'>+				(cpumask_first(&amp;msi-&gt;affinity-&gt;mask) &lt;&lt; 8) : 0;</div><div class='add'>+			for_each_possible_cpu(cpu) {</div><div class='add'>+				airq_iv_set_data(zpci_ibv[cpu], hwirq, irq);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			msg.address_lo = zdev-&gt;msi_addr &amp; 0xffffffff;</div><div class='add'>+			airq_iv_set_data(zdev-&gt;aibv, hwirq, irq);</div><div class='add'>+		}</div><div class='add'>+		msg.address_hi = zdev-&gt;msi_addr &gt;&gt; 32;</div><div class='add'>+		pci_write_msi_msg(irq, &amp;msg);</div><div class='add'>+		hwirq++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	zdev-&gt;msi_first_bit = bit;</div><div class='add'>+	zdev-&gt;msi_nr_irqs = msi_vecs;</div><div class='add'>+</div><div class='add'>+	if (irq_delivery == DIRECTED)</div><div class='add'>+		rc = zpci_set_directed_irq(zdev);</div><div class='add'>+	else</div><div class='add'>+		rc = zpci_set_airq(zdev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return (msi_vecs == nvec) ? 0 : msi_vecs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(pdev);</div><div class='add'>+	struct msi_desc *msi;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts */</div><div class='add'>+	if (irq_delivery == DIRECTED)</div><div class='add'>+		rc = zpci_clear_directed_irq(zdev);</div><div class='add'>+	else</div><div class='add'>+		rc = zpci_clear_airq(zdev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Release MSI interrupts */</div><div class='add'>+	for_each_pci_msi_entry(msi, pdev) {</div><div class='add'>+		if (!msi-&gt;irq)</div><div class='add'>+			continue;</div><div class='add'>+		if (msi-&gt;msi_attrib.is_msix)</div><div class='add'>+			__pci_msix_desc_mask_irq(msi, 1);</div><div class='add'>+		else</div><div class='add'>+			__pci_msi_desc_mask_irq(msi, 1, 1);</div><div class='add'>+		irq_set_msi_desc(msi-&gt;irq, NULL);</div><div class='add'>+		irq_free_desc(msi-&gt;irq);</div><div class='add'>+		msi-&gt;msg.address_lo = 0;</div><div class='add'>+		msi-&gt;msg.address_hi = 0;</div><div class='add'>+		msi-&gt;msg.data = 0;</div><div class='add'>+		msi-&gt;irq = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (zdev-&gt;aisb != -1UL) {</div><div class='add'>+		zpci_ibv[zdev-&gt;aisb] = NULL;</div><div class='add'>+		airq_iv_free_bit(zpci_sbv, zdev-&gt;aisb);</div><div class='add'>+		zdev-&gt;aisb = -1UL;</div><div class='add'>+	}</div><div class='add'>+	if (zdev-&gt;aibv) {</div><div class='add'>+		airq_iv_release(zdev-&gt;aibv);</div><div class='add'>+		zdev-&gt;aibv = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((irq_delivery == DIRECTED) &amp;&amp; zdev-&gt;msi_first_bit != -1U)</div><div class='add'>+		airq_iv_free(zpci_ibv[0], zdev-&gt;msi_first_bit, zdev-&gt;msi_nr_irqs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct airq_struct zpci_airq = {</div><div class='add'>+	.handler = zpci_floating_irq_handler,</div><div class='add'>+	.isc = PCI_ISC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init cpu_enable_directed_irq(void *unused)</div><div class='add'>+{</div><div class='add'>+	union zpci_sic_iib iib = {{0}};</div><div class='add'>+</div><div class='add'>+	iib.cdiib.dibv_addr = (u64) zpci_ibv[smp_processor_id()]-&gt;vector;</div><div class='add'>+</div><div class='add'>+	__zpci_set_irq_ctrl(SIC_IRQ_MODE_SET_CPU, 0, &amp;iib);</div><div class='add'>+	zpci_set_irq_ctrl(SIC_IRQ_MODE_D_SINGLE, PCI_ISC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init zpci_directed_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	union zpci_sic_iib iib = {{0}};</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+</div><div class='add'>+	zpci_sbv = airq_iv_create(num_possible_cpus(), 0);</div><div class='add'>+	if (!zpci_sbv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iib.diib.isc = PCI_ISC;</div><div class='add'>+	iib.diib.nr_cpus = num_possible_cpus();</div><div class='add'>+	iib.diib.disb_addr = (u64) zpci_sbv-&gt;vector;</div><div class='add'>+	__zpci_set_irq_ctrl(SIC_IRQ_MODE_DIRECT, 0, &amp;iib);</div><div class='add'>+</div><div class='add'>+	zpci_ibv = kcalloc(num_possible_cpus(), sizeof(*zpci_ibv),</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+	if (!zpci_ibv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		/*</div><div class='add'>+		 * Per CPU IRQ vectors look the same but bit-allocation</div><div class='add'>+		 * is only done on the first vector.</div><div class='add'>+		 */</div><div class='add'>+		zpci_ibv[cpu] = airq_iv_create(cache_line_size() * BITS_PER_BYTE,</div><div class='add'>+					       AIRQ_IV_DATA |</div><div class='add'>+					       AIRQ_IV_CACHELINE |</div><div class='add'>+					       (!cpu ? AIRQ_IV_ALLOC : 0));</div><div class='add'>+		if (!zpci_ibv[cpu])</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	on_each_cpu(cpu_enable_directed_irq, NULL, 1);</div><div class='add'>+</div><div class='add'>+	zpci_irq_chip.irq_set_affinity = zpci_set_irq_affinity;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init zpci_floating_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	zpci_ibv = kcalloc(ZPCI_NR_DEVICES, sizeof(*zpci_ibv), GFP_KERNEL);</div><div class='add'>+	if (!zpci_ibv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	zpci_sbv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC);</div><div class='add'>+	if (!zpci_sbv)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(zpci_ibv);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init zpci_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	irq_delivery = sclp.has_dirq ? DIRECTED : FLOATING;</div><div class='add'>+	if (s390_pci_force_floating)</div><div class='add'>+		irq_delivery = FLOATING;</div><div class='add'>+</div><div class='add'>+	if (irq_delivery == DIRECTED)</div><div class='add'>+		zpci_airq.handler = zpci_directed_irq_handler;</div><div class='add'>+</div><div class='add'>+	rc = register_adapter_interrupt(&amp;zpci_airq);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Set summary to 1 to be called every time for the ISC. */</div><div class='add'>+	*zpci_airq.lsi_ptr = 1;</div><div class='add'>+</div><div class='add'>+	switch (irq_delivery) {</div><div class='add'>+	case FLOATING:</div><div class='add'>+		rc = zpci_floating_irq_init();</div><div class='add'>+		break;</div><div class='add'>+	case DIRECTED:</div><div class='add'>+		rc = zpci_directed_irq_init();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_airq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable floating IRQs (with suppression after one IRQ). When using</div><div class='add'>+	 * directed IRQs this enables the fallback path.</div><div class='add'>+	 */</div><div class='add'>+	zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, PCI_ISC);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out_airq:</div><div class='add'>+	unregister_adapter_interrupt(&amp;zpci_airq);</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init zpci_irq_exit(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+</div><div class='add'>+	if (irq_delivery == DIRECTED) {</div><div class='add'>+		for_each_possible_cpu(cpu) {</div><div class='add'>+			airq_iv_release(zpci_ibv[cpu]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(zpci_ibv);</div><div class='add'>+	if (zpci_sbv)</div><div class='add'>+		airq_iv_release(zpci_sbv);</div><div class='add'>+	unregister_adapter_interrupt(&amp;zpci_airq);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile<br/>index ce6a3f75065b..dc1ae4ff79d7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/purgatory/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/purgatory/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/purgatory/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/purgatory/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@ OBJECT_FILES_NON_STANDARD := y</div><div class='ctx'> </div><div class='ctx'> purgatory-y := head.o purgatory.o string.o sha256.o mem.o</div><div class='ctx'> </div><div class='del'>-targets += $(purgatory-y) purgatory.ro kexec-purgatory.c</div><div class='add'>+targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro</div><div class='ctx'> PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))</div><div class='ctx'> </div><div class='ctx'> $(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE</div><div class='hunk'>@@ -16,22 +16,26 @@ $(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE</div><div class='ctx'> $(obj)/string.o: $(srctree)/arch/s390/lib/string.c FORCE</div><div class='ctx'> 	$(call if_changed_rule,cc_o_c)</div><div class='ctx'> </div><div class='del'>-LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib</div><div class='del'>-LDFLAGS_purgatory.ro += -z nodefaultlib</div><div class='ctx'> KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes</div><div class='ctx'> KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare</div><div class='ctx'> KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding</div><div class='ctx'> KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common</div><div class='add'>+KBUILD_CFLAGS += $(CLANG_FLAGS)</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-option,-fno-PIE)</div><div class='ctx'> KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))</div><div class='ctx'> </div><div class='del'>-$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE</div><div class='add'>+LDFLAGS_purgatory := -r --no-undefined -nostdlib -z nodefaultlib -T</div><div class='add'>+$(obj)/purgatory: $(obj)/purgatory.lds $(PURGATORY_OBJS) FORCE</div><div class='ctx'> 		$(call if_changed,ld)</div><div class='ctx'> </div><div class='del'>-quiet_cmd_bin2c = BIN2C   $@</div><div class='del'>-      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory &lt; $&lt; &gt; $@</div><div class='add'>+OBJCOPYFLAGS_purgatory.ro := -O elf64-s390</div><div class='add'>+OBJCOPYFLAGS_purgatory.ro += --remove-section='*debug*'</div><div class='add'>+OBJCOPYFLAGS_purgatory.ro += --remove-section='.comment'</div><div class='add'>+OBJCOPYFLAGS_purgatory.ro += --remove-section='.note.*'</div><div class='add'>+$(obj)/purgatory.ro: $(obj)/purgatory FORCE</div><div class='add'>+		$(call if_changed,objcopy)</div><div class='ctx'> </div><div class='del'>-$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE</div><div class='del'>-	$(call if_changed,bin2c)</div><div class='add'>+$(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE</div><div class='add'>+	$(call if_changed_rule,as_o_S)</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o</div><div class='head'>diff --git a/arch/s390/purgatory/kexec-purgatory.S b/arch/s390/purgatory/kexec-purgatory.S<br/>new file mode 100644<br/>index 000000000000..8293753100ae<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/purgatory/kexec-purgatory.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/purgatory/kexec-purgatory.S</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+	.section .rodata, "a"</div><div class='add'>+</div><div class='add'>+	.align	8</div><div class='add'>+kexec_purgatory:</div><div class='add'>+	.globl	kexec_purgatory</div><div class='add'>+	.incbin	"arch/s390/purgatory/purgatory.ro"</div><div class='add'>+.Lkexec_purgatroy_end:</div><div class='add'>+</div><div class='add'>+	.align	8</div><div class='add'>+kexec_purgatory_size:</div><div class='add'>+	.globl	kexec_purgatory_size</div><div class='add'>+	.quad	.Lkexec_purgatroy_end - kexec_purgatory</div><div class='head'>diff --git a/arch/s390/purgatory/purgatory.lds.S b/arch/s390/purgatory/purgatory.lds.S<br/>new file mode 100644<br/>index 000000000000..482eb4fbcef1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/purgatory/purgatory.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/purgatory/purgatory.lds.S</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='add'>+</div><div class='add'>+OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")</div><div class='add'>+OUTPUT_ARCH(s390:64-bit)</div><div class='add'>+</div><div class='add'>+ENTRY(purgatory_start)</div><div class='add'>+</div><div class='add'>+SECTIONS</div><div class='add'>+{</div><div class='add'>+	. = 0;</div><div class='add'>+	.head.text : {</div><div class='add'>+		_head = . ;</div><div class='add'>+		HEAD_TEXT</div><div class='add'>+		_ehead = . ;</div><div class='add'>+	}</div><div class='add'>+	.text :	{</div><div class='add'>+		_text = .;	/* Text */</div><div class='add'>+		*(.text)</div><div class='add'>+		*(.text.*)</div><div class='add'>+		_etext = . ;</div><div class='add'>+	}</div><div class='add'>+	.rodata : {</div><div class='add'>+		_rodata = . ;</div><div class='add'>+		*(.rodata)	 /* read-only data */</div><div class='add'>+		*(.rodata.*)</div><div class='add'>+		_erodata = . ;</div><div class='add'>+	}</div><div class='add'>+	.data :	{</div><div class='add'>+		_data = . ;</div><div class='add'>+		*(.data)</div><div class='add'>+		*(.data.*)</div><div class='add'>+		_edata = . ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	. = ALIGN(256);</div><div class='add'>+	.bss : {</div><div class='add'>+		_bss = . ;</div><div class='add'>+		*(.bss)</div><div class='add'>+		*(.bss.*)</div><div class='add'>+		*(COMMON)</div><div class='add'>+		. = ALIGN(8);	/* For convenience during zeroing */</div><div class='add'>+		_ebss = .;</div><div class='add'>+	}</div><div class='add'>+	_end = .;</div><div class='add'>+</div><div class='add'>+	/* Sections to be discarded */</div><div class='add'>+	/DISCARD/ : {</div><div class='add'>+		*(.eh_frame)</div><div class='add'>+		*(*__ksymtab*)</div><div class='add'>+		*(___kcrctab*)</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/scripts/Makefile.chkbss b/arch/s390/scripts/Makefile.chkbss<br/>index cd7e8f4419f5..884a9caff5fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/scripts/Makefile.chkbss?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/scripts/Makefile.chkbss</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/scripts/Makefile.chkbss?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/scripts/Makefile.chkbss</a></div><div class='hunk'>@@ -11,7 +11,8 @@ chkbss: $(addprefix $(obj)/, $(chkbss-files))</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_chkbss = CHKBSS  $&lt;</div><div class='ctx'>       cmd_chkbss = \</div><div class='del'>-	if ! $(OBJDUMP) -j .bss -w -h $&lt; | awk 'END { if ($$3) exit 1 }'; then \</div><div class='add'>+	if $(OBJDUMP) -h $&lt; | grep -q "\.bss" &amp;&amp; \</div><div class='add'>+	   ! $(OBJDUMP) -j .bss -w -h $&lt; | awk 'END { if ($$3) exit 1 }'; then \</div><div class='ctx'> 		echo "error: $&lt; .bss section is not empty" &gt;&amp;2; exit 1; \</div><div class='ctx'> 	fi; \</div><div class='ctx'> 	touch $@;</div><div class='head'>diff --git a/arch/s390/tools/opcodes.txt b/arch/s390/tools/opcodes.txt<br/>index 1cbed82cd17b..64638b764d1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/tools/opcodes.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/s390/tools/opcodes.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/s390/tools/opcodes.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/s390/tools/opcodes.txt</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+0000	illegal	E</div><div class='add'>+0002	brkpt	E</div><div class='ctx'> 0101	pr	E</div><div class='ctx'> 0102	upt	E</div><div class='ctx'> 0104	ptff	E</div><div class='hunk'>@@ -257,6 +259,7 @@ b258	bsg	RRE_RR</div><div class='ctx'> b25a	bsa	RRE_RR</div><div class='ctx'> b25d	clst	RRE_RR</div><div class='ctx'> b25e	srst	RRE_RR</div><div class='add'>+b25f	chsc	RRE_R0</div><div class='ctx'> b263	cmpsc	RRE_RR</div><div class='ctx'> b274	siga	S_RD</div><div class='ctx'> b276	xsch	S_00</div><div class='hunk'>@@ -277,6 +280,9 @@ b29d	lfpc	S_RD</div><div class='ctx'> b2a5	tre	RRE_RR</div><div class='ctx'> b2a6	cu21	RRF_U0RR</div><div class='ctx'> b2a7	cu12	RRF_U0RR</div><div class='add'>+b2ad	nqap	RRE_RR</div><div class='add'>+b2ae	dqap	RRE_RR</div><div class='add'>+b2af	pqap	RRE_RR</div><div class='ctx'> b2b0	stfle	S_RD</div><div class='ctx'> b2b1	stfl	S_RD</div><div class='ctx'> b2b2	lpswe	S_RD</div><div class='hunk'>@@ -290,6 +296,7 @@ b2e5	epctr	RRE_RR</div><div class='ctx'> b2e8	ppa	RRF_U0RR</div><div class='ctx'> b2ec	etnd	RRE_R0</div><div class='ctx'> b2ed	ecpga	RRE_RR</div><div class='add'>+b2f0	iucv	RRE_RR</div><div class='ctx'> b2f8	tend	S_00</div><div class='ctx'> b2fa	niai	IE_UU</div><div class='ctx'> b2fc	tabort	S_RD</div><div class='hunk'>@@ -559,12 +566,15 @@ b998	alcr	RRE_RR</div><div class='ctx'> b999	slbr	RRE_RR</div><div class='ctx'> b99a	epair	RRE_R0</div><div class='ctx'> b99b	esair	RRE_R0</div><div class='add'>+b99c	eqbs	RRF_U0RR</div><div class='ctx'> b99d	esea	RRE_R0</div><div class='ctx'> b99e	pti	RRE_RR</div><div class='ctx'> b99f	ssair	RRE_R0</div><div class='add'>+b9a0	clp	RRF_U0RR</div><div class='ctx'> b9a1	tpei	RRE_RR</div><div class='ctx'> b9a2	ptf	RRE_R0</div><div class='ctx'> b9aa	lptea	RRF_RURR2</div><div class='add'>+b9ab	essa	RRF_U0RR</div><div class='ctx'> b9ac	irbm	RRE_RR</div><div class='ctx'> b9ae	rrbm	RRE_RR</div><div class='ctx'> b9af	pfmf	RRE_RR</div><div class='hunk'>@@ -1039,6 +1049,7 @@ eb7a	agsi	SIY_IRD</div><div class='ctx'> eb7e	algsi	SIY_IRD</div><div class='ctx'> eb80	icmh	RSY_RURD</div><div class='ctx'> eb81	icmy	RSY_RURD</div><div class='add'>+eb8a	sqbs	RSY_RDRU</div><div class='ctx'> eb8e	mvclu	RSY_RRRD</div><div class='ctx'> eb8f	clclu	RSY_RRRD</div><div class='ctx'> eb90	stmy	RSY_RRRD</div><div class='head'>diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig<br/>index b1c91ea9a958..0be08d586d40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/Kconfig</a></div><div class='hunk'>@@ -90,12 +90,6 @@ config ARCH_DEFCONFIG</div><div class='ctx'> 	default "arch/sh/configs/shx3_defconfig" if SUPERH32</div><div class='ctx'> 	default "arch/sh/configs/cayman_defconfig" if SUPERH64</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config GENERIC_BUG</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on BUG &amp;&amp; SUPERH32</div><div class='head'>diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c<br/>index 34e5414c5563..f402aa741bf3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/boards/mach-ecovec24/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/boards/mach-ecovec24/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/boards/mach-ecovec24/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/boards/mach-ecovec24/setup.c</a></div><div class='hunk'>@@ -806,7 +806,6 @@ static struct spi_board_info spi_bus[] = {</div><div class='ctx'> 		.platform_data	= &amp;mmc_spi_info,</div><div class='ctx'> 		.max_speed_hz	= 5000000,</div><div class='ctx'> 		.mode		= SPI_MODE_0,</div><div class='del'>-		.controller_data = (void *) GPIO_PTM4,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -838,6 +837,14 @@ static struct platform_device msiof0_device = {</div><div class='ctx'> 	.resource	= msiof0_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct gpiod_lookup_table msiof_gpio_table = {</div><div class='add'>+	.dev_id = "spi_sh_msiof.0",</div><div class='add'>+	.table = {</div><div class='add'>+		GPIO_LOOKUP("sh7724_pfc", GPIO_PTM4, "cs", GPIO_ACTIVE_HIGH),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* FSI */</div><div class='hunk'>@@ -1296,12 +1303,11 @@ static int __init arch_setup(void)</div><div class='ctx'> 	gpio_request(GPIO_FN_MSIOF0_TXD, NULL);</div><div class='ctx'> 	gpio_request(GPIO_FN_MSIOF0_RXD, NULL);</div><div class='ctx'> 	gpio_request(GPIO_FN_MSIOF0_TSCK, NULL);</div><div class='del'>-	gpio_request(GPIO_PTM4, NULL); /* software CS control of TSYNC pin */</div><div class='del'>-	gpio_direction_output(GPIO_PTM4, 1); /* active low CS */</div><div class='ctx'> 	gpio_request(GPIO_PTB6, NULL); /* 3.3V power control */</div><div class='ctx'> 	gpio_direction_output(GPIO_PTB6, 0); /* disable power by default */</div><div class='ctx'> </div><div class='ctx'> 	gpiod_add_lookup_table(&amp;mmc_spi_gpio_table);</div><div class='add'>+	gpiod_add_lookup_table(&amp;msiof_gpio_table);</div><div class='ctx'> 	spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c<br/>index 958f46da3a79..d91065e81a4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/boards/of-generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/boards/of-generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/boards/of-generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/boards/of-generic.c</a></div><div class='hunk'>@@ -164,10 +164,10 @@ static struct sh_machine_vector __initmv sh_of_generic_mv = {</div><div class='ctx'> </div><div class='ctx'> struct sh_clk_ops;</div><div class='ctx'> </div><div class='del'>-void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)</div><div class='add'>+void __init __weak arch_init_clk_ops(struct sh_clk_ops **ops, int idx)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_irq_setup(void)</div><div class='add'>+void __init __weak plat_irq_setup(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig<br/>index 825c641726c4..d0d9ebc7165b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/apsh4ad0a_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/apsh4ad0a_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/apsh4ad0a_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/configs/apsh4ad0a_defconfig</a></div><div class='hunk'>@@ -19,7 +19,6 @@ CONFIG_SLAB=y</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_CFQ_GROUP_IOSCHED=y</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7786=y</div><div class='head'>diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig<br/>index 0c5dfccbfe37..bdb61d1d0127 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/ecovec24-romimage_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/ecovec24-romimage_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/ecovec24-romimage_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/configs/ecovec24-romimage_defconfig</a></div><div class='hunk'>@@ -7,7 +7,6 @@ CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='ctx'> CONFIG_SLAB=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7724=y</div><div class='ctx'> CONFIG_MEMORY_SIZE=0x10000000</div><div class='head'>diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig<br/>index 2b9b731fc86b..ad003ee469ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/rsk7264_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/rsk7264_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/rsk7264_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/configs/rsk7264_defconfig</a></div><div class='hunk'>@@ -16,7 +16,6 @@ CONFIG_PERF_COUNTERS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> CONFIG_MMAP_ALLOW_UNINITIALIZED=y</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='head'>diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig<br/>index d041f7bcb84c..27fc01d58cf8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/rsk7269_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/rsk7269_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/rsk7269_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/configs/rsk7269_defconfig</a></div><div class='hunk'>@@ -3,7 +3,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> CONFIG_SLAB=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='head'>diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig<br/>index 2ddf5ca7094e..a89ccc15af23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/sh7785lcr_32bit_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/configs/sh7785lcr_32bit_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/configs/sh7785lcr_32bit_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/configs/sh7785lcr_32bit_defconfig</a></div><div class='hunk'>@@ -11,7 +11,6 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_GCOV_KERNEL=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_CPU_SUBTYPE_SH7785=y</div><div class='ctx'> CONFIG_MEMORY_START=0x40000000</div><div class='head'>diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild<br/>index a6ef3fee5f85..73fff39a0122 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/Kbuild</a></div><div class='hunk'>@@ -9,6 +9,7 @@ generic-y += emergency-restart.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += irq_regs.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='hunk'>@@ -16,7 +17,6 @@ generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += serial.h</div><div class='ctx'> generic-y += sizes.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='head'>diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h<br/>index 4f7f235f15f8..c28e37a344ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/io.h</a></div><div class='hunk'>@@ -229,9 +229,6 @@ __BUILD_IOPORT_STRING(q, u64)</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT 0xffffffff</div><div class='ctx'> </div><div class='del'>-/* synco on SH-4A, otherwise a nop */</div><div class='del'>-#define mmiowb()		wmb()</div><div class='del'>-</div><div class='ctx'> /* We really want to try and get these to memcpy etc */</div><div class='ctx'> void memcpy_fromio(void *, const volatile void __iomem *, unsigned long);</div><div class='ctx'> void memcpy_toio(volatile void __iomem *, const void *, unsigned long);</div><div class='head'>diff --git a/arch/sh/include/asm/mmiowb.h b/arch/sh/include/asm/mmiowb.h<br/>new file mode 100644<br/>index 000000000000..535d59735f1d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/mmiowb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/mmiowb.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __ASM_SH_MMIOWB_H</div><div class='add'>+#define __ASM_SH_MMIOWB_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/barrier.h&gt;</div><div class='add'>+</div><div class='add'>+/* synco on SH-4A, otherwise a nop */</div><div class='add'>+#define mmiowb()			wmb()</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/mmiowb.h&gt;</div><div class='add'>+</div><div class='add'>+#endif	/* __ASM_SH_MMIOWB_H */</div><div class='head'>diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h<br/>index 8ad73cb31121..b56f908b1395 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/pgalloc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/pgalloc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/pgalloc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -70,6 +70,15 @@ do {							\</div><div class='ctx'> 	tlb_remove_page((tlb), (pte));			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#if CONFIG_PGTABLE_LEVELS &gt; 2</div><div class='add'>+#define __pmd_free_tlb(tlb, pmdp, addr)			\</div><div class='add'>+do {							\</div><div class='add'>+	struct page *page = virt_to_page(pmdp);		\</div><div class='add'>+	pgtable_pmd_page_dtor(page);			\</div><div class='add'>+	tlb_remove_page((tlb), page);			\</div><div class='add'>+} while (0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void check_pgt_cache(void)</div><div class='ctx'> {</div><div class='ctx'> 	quicklist_trim(QUICK_PT, NULL, 25, 16);</div><div class='head'>diff --git a/arch/sh/include/asm/spinlock-llsc.h b/arch/sh/include/asm/spinlock-llsc.h<br/>index 786ee0fde3b0..7fd929cd2e7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/spinlock-llsc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/spinlock-llsc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/spinlock-llsc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/spinlock-llsc.h</a></div><div class='hunk'>@@ -47,6 +47,8 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tmp;</div><div class='ctx'> </div><div class='add'>+	/* This could be optimised with ARCH_HAS_MMIOWB */</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	__asm__ __volatile__ (</div><div class='ctx'> 		"mov		#1, %0 ! arch_spin_unlock	\n\t"</div><div class='ctx'> 		"mov.l		%0, @%1				\n\t"</div><div class='head'>diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall_32.h<br/>index 6e118799831c..0b5b8e75edac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/syscall_32.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/syscall_32.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/syscall_32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/syscall_32.h</a></div><div class='hunk'>@@ -48,54 +48,31 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Do this simply for now. If we need to start supporting</div><div class='del'>-	 * fetching arguments from arbitrary indices, this will need some</div><div class='del'>-	 * extra logic. Presently there are no in-tree users that depend</div><div class='del'>-	 * on this behaviour.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(i);</div><div class='ctx'> </div><div class='ctx'> 	/* Argument pattern is: R4, R5, R6, R7, R0, R1 */</div><div class='del'>-	switch (n) {</div><div class='del'>-	case 6: args[5] = regs-&gt;regs[1];</div><div class='del'>-	case 5: args[4] = regs-&gt;regs[0];</div><div class='del'>-	case 4: args[3] = regs-&gt;regs[7];</div><div class='del'>-	case 3: args[2] = regs-&gt;regs[6];</div><div class='del'>-	case 2: args[1] = regs-&gt;regs[5];</div><div class='del'>-	case 1:	args[0] = regs-&gt;regs[4];</div><div class='del'>-	case 0:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	args[5] = regs-&gt;regs[1];</div><div class='add'>+	args[4] = regs-&gt;regs[0];</div><div class='add'>+	args[3] = regs-&gt;regs[7];</div><div class='add'>+	args[2] = regs-&gt;regs[6];</div><div class='add'>+	args[1] = regs-&gt;regs[5];</div><div class='add'>+	args[0] = regs-&gt;regs[4];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	/* Same note as above applies */</div><div class='del'>-	BUG_ON(i);</div><div class='del'>-</div><div class='del'>-	switch (n) {</div><div class='del'>-	case 6: regs-&gt;regs[1] = args[5];</div><div class='del'>-	case 5: regs-&gt;regs[0] = args[4];</div><div class='del'>-	case 4: regs-&gt;regs[7] = args[3];</div><div class='del'>-	case 3: regs-&gt;regs[6] = args[2];</div><div class='del'>-	case 2: regs-&gt;regs[5] = args[1];</div><div class='del'>-	case 1: regs-&gt;regs[4] = args[0];</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	regs-&gt;regs[1] = args[5];</div><div class='add'>+	regs-&gt;regs[0] = args[4];</div><div class='add'>+	regs-&gt;regs[7] = args[3];</div><div class='add'>+	regs-&gt;regs[6] = args[2];</div><div class='add'>+	regs-&gt;regs[5] = args[1];</div><div class='add'>+	regs-&gt;regs[4] = args[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	int arch = AUDIT_ARCH_SH;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/include/asm/syscall_64.h b/arch/sh/include/asm/syscall_64.h<br/>index 43882580c7f9..72efcbc76f91 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/syscall_64.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/syscall_64.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/syscall_64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/syscall_64.h</a></div><div class='hunk'>@@ -47,23 +47,19 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	memcpy(args, &amp;regs-&gt;regs[2 + i], n * sizeof(args[0]));</div><div class='add'>+	memcpy(args, &amp;regs-&gt;regs[2], 6 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	memcpy(&amp;regs-&gt;regs[2 + i], args, n * sizeof(args[0]));</div><div class='add'>+	memcpy(&amp;regs-&gt;regs[2], args, 6 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	int arch = AUDIT_ARCH_SH;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h<br/>index 77abe192fb43..bc77f3dd4261 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/asm/tlb.h</a></div><div class='hunk'>@@ -11,133 +11,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TLB handling.  This allows us to remove pages from the page</div><div class='del'>- * tables, and efficiently handle the TLB issues.</div><div class='del'>- */</div><div class='del'>-struct mmu_gather {</div><div class='del'>-	struct mm_struct	*mm;</div><div class='del'>-	unsigned int		fullmm;</div><div class='del'>-	unsigned long		start, end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void init_tlb_gather(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;start = TASK_SIZE;</div><div class='del'>-	tlb-&gt;end = 0;</div><div class='del'>-</div><div class='del'>-	if (tlb-&gt;fullmm) {</div><div class='del'>-		tlb-&gt;start = 0;</div><div class='del'>-		tlb-&gt;end = TASK_SIZE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,</div><div class='del'>-		unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;mm = mm;</div><div class='del'>-	tlb-&gt;start = start;</div><div class='del'>-	tlb-&gt;end = end;</div><div class='del'>-	tlb-&gt;fullmm = !(start | (end+1));</div><div class='del'>-</div><div class='del'>-	init_tlb_gather(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_finish_mmu(struct mmu_gather *tlb,</div><div class='del'>-		unsigned long start, unsigned long end, bool force)</div><div class='del'>-{</div><div class='del'>-	if (tlb-&gt;fullmm || force)</div><div class='del'>-		flush_tlb_mm(tlb-&gt;mm);</div><div class='del'>-</div><div class='del'>-	/* keep the page table cache within bounds */</div><div class='del'>-	check_pgt_cache();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address)</div><div class='del'>-{</div><div class='del'>-	if (tlb-&gt;start &gt; address)</div><div class='del'>-		tlb-&gt;start = address;</div><div class='del'>-	if (tlb-&gt;end &lt; address + PAGE_SIZE)</div><div class='del'>-		tlb-&gt;end = address + PAGE_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='del'>-	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In the case of tlb vma handling, we can optimise these away in the</div><div class='del'>- * case where we're doing a full MM flush.  When we're doing a munmap,</div><div class='del'>- * the vmas are adjusted to only cover the region to be torn down.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;fullmm)</div><div class='del'>-		flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;fullmm &amp;&amp; tlb-&gt;end) {</div><div class='del'>-		flush_tlb_range(vma, tlb-&gt;start, tlb-&gt;end);</div><div class='del'>-		init_tlb_gather(tlb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu_free(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_flush_mmu(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	free_page_and_swap_cache(page);</div><div class='del'>-	return false; /* avoid calling tlb_flush_mmu */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	__tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					  struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='del'>-static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='del'>-						     unsigned int page_size)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define pte_free_tlb(tlb, ptep, addr)	pte_free((tlb)-&gt;mm, ptep)</div><div class='del'>-#define pmd_free_tlb(tlb, pmdp, addr)	pmd_free((tlb)-&gt;mm, pmdp)</div><div class='del'>-#define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)-&gt;mm, pudp)</div><div class='del'>-</div><div class='del'>-#define tlb_migrate_finish(mm)		do { } while (0)</div><div class='add'>+#include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_SH4) || defined(CONFIG_SUPERH64)</div><div class='ctx'> extern void tlb_wire_entry(struct vm_area_struct *, unsigned long, pte_t);</div><div class='hunk'>@@ -157,11 +32,6 @@ static inline void tlb_unwire_entry(void)</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_MMU */</div><div class='ctx'> </div><div class='del'>-#define tlb_start_vma(tlb, vma)				do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)				do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, pte, address)	do { } while (0)</div><div class='del'>-#define tlb_flush(tlb)					do { } while (0)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='head'>diff --git a/arch/sh/include/cpu-sh4/cpu/sh7786.h b/arch/sh/include/cpu-sh4/cpu/sh7786.h<br/>index 8f9bfbf3cdb1..d6cce65b4871 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7786.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/cpu-sh4/cpu/sh7786.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7786.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/cpu-sh4/cpu/sh7786.h</a></div><div class='hunk'>@@ -132,7 +132,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> static inline u32 sh7786_mm_sel(void)</div><div class='ctx'> {</div><div class='del'>-	return __raw_readl(0xFC400020) &amp; 0x7;</div><div class='add'>+	return __raw_readl((const volatile void __iomem *)0xFC400020) &amp; 0x7;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* __CPU_SH7786_H__ */</div><div class='head'>diff --git a/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild<br/>index ecfbd40924dd..b8812c74c1de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> generated-y += unistd_32.h</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/sh/include/uapi/asm/sockios.h b/arch/sh/include/uapi/asm/sockios.h<br/>index 17313d2c3527..ef18a668456d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/include/uapi/asm/sockios.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/include/uapi/asm/sockios.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #define SIOCSPGRP	_IOW('s', 8, pid_t)</div><div class='ctx'> #define SIOCGPGRP	_IOR('s', 9, pid_t)</div><div class='ctx'> </div><div class='del'>-#define SIOCGSTAMP	_IOR('s', 100, struct timeval) /* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	_IOR('s', 101, struct timespec) /* Get stamp (timespec) */</div><div class='add'>+#define SIOCGSTAMP_OLD	_IOR('s', 100, struct timeval) /* Get stamp (timeval) */</div><div class='add'>+#define SIOCGSTAMPNS_OLD _IOR('s', 101, struct timespec) /* Get stamp (timespec) */</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_SH_SOCKIOS_H */</div><div class='head'>diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c<br/>index f3cb2cccb262..2950b19ad077 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/kernel/stacktrace.c</a></div><div class='hunk'>@@ -49,8 +49,6 @@ void save_stack_trace(struct stack_trace *trace)</div><div class='ctx'> 	unsigned long *sp = (unsigned long *)current_stack_pointer;</div><div class='ctx'> </div><div class='ctx'> 	unwind_stack(current, NULL, sp,  &amp;save_stack_ops, trace);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace);</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +82,5 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> 	unsigned long *sp = (unsigned long *)tsk-&gt;thread.sp;</div><div class='ctx'> </div><div class='ctx'> 	unwind_stack(current, NULL, sp,  &amp;save_stack_ops_nosched, trace);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(save_stack_trace_tsk);</div><div class='head'>diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl<br/>index bfda678576e4..480b057556ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sh/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sh/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sh/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -426,3 +426,7 @@</div><div class='ctx'> 421	common	rt_sigtimedwait_time64		sys_rt_sigtimedwait</div><div class='ctx'> 422	common	futex_time64			sys_futex</div><div class='ctx'> 423	common	sched_rr_get_interval_time64	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig<br/>index 40f8f4f73fe8..f6421c9ce5d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/Kconfig</a></div><div class='hunk'>@@ -63,6 +63,7 @@ config SPARC64</div><div class='ctx'> 	select HAVE_KRETPROBES</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE if SMP</div><div class='add'>+	select HAVE_RCU_TABLE_NO_INVALIDATE if HAVE_RCU_TABLE_FREE</div><div class='ctx'> 	select HAVE_MEMBLOCK_NODE_MAP</div><div class='ctx'> 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE</div><div class='hunk'>@@ -191,14 +192,6 @@ config NR_CPUS</div><div class='ctx'> </div><div class='ctx'> source "kernel/Kconfig.hz"</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	bool</div><div class='del'>-	default y if SPARC32</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-	default y if SPARC64</div><div class='del'>-</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/sparc/crypto/des_glue.c b/arch/sparc/crypto/des_glue.c<br/>index 4884315daff4..453a4cf5492a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/crypto/des_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/crypto/des_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/crypto/des_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/crypto/des_glue.c</a></div><div class='hunk'>@@ -201,18 +201,15 @@ static int des3_ede_set_key(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 			    unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct des3_ede_sparc64_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	const u32 *K = (const u32 *)key;</div><div class='ctx'> 	u32 *flags = &amp;tfm-&gt;crt_flags;</div><div class='ctx'> 	u64 k1[DES_EXPKEY_WORDS / 2];</div><div class='ctx'> 	u64 k2[DES_EXPKEY_WORDS / 2];</div><div class='ctx'> 	u64 k3[DES_EXPKEY_WORDS / 2];</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-		     !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &amp;&amp;</div><div class='del'>-		     (*flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = __des3_verify_key(flags, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	des_sparc64_key_expand((const u32 *)key, k1);</div><div class='ctx'> 	key += DES_KEY_SIZE;</div><div class='head'>diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild<br/>index b82f64e28f55..95c44380b1d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/include/asm/Kbuild</a></div><div class='hunk'>@@ -9,15 +9,16 @@ generic-y += exec.h</div><div class='ctx'> generic-y += export.h</div><div class='ctx'> generic-y += irq_regs.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += linkage.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += module.h</div><div class='ctx'> generic-y += msi.h</div><div class='ctx'> generic-y += preempt.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += serial.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='head'>diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h<br/>index b162c23ae8c2..688911051b44 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/io_64.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/io_64.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/io_64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/include/asm/io_64.h</a></div><div class='hunk'>@@ -396,8 +396,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define mmiowb()</div><div class='del'>-</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> /* On sparc64 we have the whole physical IO address space accessible</div><div class='head'>diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h<br/>index 053989e3f6a6..62a5a78804c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/include/asm/syscall.h</a></div><div class='hunk'>@@ -96,11 +96,11 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	int zero_extend = 0;</div><div class='ctx'> 	unsigned int j;</div><div class='add'>+	unsigned int n = 6;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARC64</div><div class='ctx'> 	if (test_tsk_thread_flag(task, TIF_32BIT))</div><div class='hunk'>@@ -108,7 +108,7 @@ static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; n; j++) {</div><div class='del'>-		unsigned long val = regs-&gt;u_regs[UREG_I0 + i + j];</div><div class='add'>+		unsigned long val = regs-&gt;u_regs[UREG_I0 + j];</div><div class='ctx'> </div><div class='ctx'> 		if (zero_extend)</div><div class='ctx'> 			args[j] = (u32) val;</div><div class='hunk'>@@ -119,19 +119,19 @@ static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	unsigned int j;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; n; j++)</div><div class='del'>-		regs-&gt;u_regs[UREG_I0 + i + j] = args[j];</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		regs-&gt;u_regs[UREG_I0 + i] = args[i];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_SPARC64) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='del'>-	return in_compat_syscall() ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64;</div><div class='add'>+	return test_tsk_thread_flag(task, TIF_32BIT)</div><div class='add'>+		? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64;</div><div class='ctx'> #elif defined(CONFIG_SPARC64)</div><div class='ctx'> 	return AUDIT_ARCH_SPARC64;</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h<br/>index 343cea19e573..5cd28a8793e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/tlb_32.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/asm/tlb_32.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/asm/tlb_32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/include/asm/tlb_32.h</a></div><div class='hunk'>@@ -2,24 +2,6 @@</div><div class='ctx'> #ifndef _SPARC_TLB_H</div><div class='ctx'> #define _SPARC_TLB_H</div><div class='ctx'> </div><div class='del'>-#define tlb_start_vma(tlb, vma) \</div><div class='del'>-do {								\</div><div class='del'>-	flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_end_vma(tlb, vma) \</div><div class='del'>-do {								\</div><div class='del'>-	flush_tlb_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, pte, address) \</div><div class='del'>-	do { } while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_flush(tlb) \</div><div class='del'>-do {								\</div><div class='del'>-	flush_tlb_mm((tlb)-&gt;mm);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _SPARC_TLB_H */</div><div class='head'>diff --git a/arch/sparc/include/uapi/asm/kvm_para.h b/arch/sparc/include/uapi/asm/kvm_para.h<br/>deleted file mode 100644<br/>index baacc4996d18..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/uapi/asm/kvm_para.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/uapi/asm/kvm_para.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#include &lt;asm-generic/kvm_para.h&gt;</div><div class='head'>diff --git a/arch/sparc/include/uapi/asm/sockios.h b/arch/sparc/include/uapi/asm/sockios.h<br/>deleted file mode 100644<br/>index 18a3ec14a847..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/include/uapi/asm/sockios.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */</div><div class='del'>-#ifndef _ASM_SPARC_SOCKIOS_H</div><div class='del'>-#define _ASM_SPARC_SOCKIOS_H</div><div class='del'>-</div><div class='del'>-/* Socket-level I/O control calls. */</div><div class='del'>-#define FIOSETOWN 	0x8901</div><div class='del'>-#define SIOCSPGRP	0x8902</div><div class='del'>-#define FIOGETOWN	0x8903</div><div class='del'>-#define SIOCGPGRP	0x8904</div><div class='del'>-#define SIOCATMARK	0x8905</div><div class='del'>-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */</div><div class='del'>-</div><div class='del'>-#endif /* !(_ASM_SPARC_SOCKIOS_H) */</div><div class='del'>-</div><div class='head'>diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c<br/>index f87265afb175..cad08ccce625 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/kernel/ds.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/kernel/ds.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/kernel/ds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/kernel/ds.c</a></div><div class='hunk'>@@ -876,7 +876,7 @@ void ldom_power_off(void)</div><div class='ctx'> </div><div class='ctx'> static void ds_conn_reset(struct ds_info *dp)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_ERR "ds-%llu: ds_conn_reset() from %pf\n",</div><div class='add'>+	printk(KERN_ERR "ds-%llu: ds_conn_reset() from %ps\n",</div><div class='ctx'> 	       dp-&gt;id, __builtin_return_address(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c<br/>index a8af6023c126..14b93c5564e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/kernel/pci_sun4v.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/kernel/pci_sun4v.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/kernel/pci_sun4v.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/kernel/pci_sun4v.c</a></div><div class='hunk'>@@ -73,6 +73,11 @@ static inline void iommu_batch_start(struct device *dev, unsigned long prot, uns</div><div class='ctx'> 	p-&gt;npages	= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool iommu_use_atu(struct iommu *iommu, u64 mask)</div><div class='add'>+{</div><div class='add'>+	return iommu-&gt;atu &amp;&amp; mask &gt; DMA_BIT_MASK(32);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Interrupts must be disabled.  */</div><div class='ctx'> static long iommu_batch_flush(struct iommu_batch *p, u64 mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -92,7 +97,7 @@ static long iommu_batch_flush(struct iommu_batch *p, u64 mask)</div><div class='ctx'> 		prot &amp;= (HV_PCI_MAP_ATTR_READ | HV_PCI_MAP_ATTR_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	while (npages != 0) {</div><div class='del'>-		if (mask &lt;= DMA_BIT_MASK(32) || !pbm-&gt;iommu-&gt;atu) {</div><div class='add'>+		if (!iommu_use_atu(pbm-&gt;iommu, mask)) {</div><div class='ctx'> 			num = pci_sun4v_iommu_map(devhandle,</div><div class='ctx'> 						  HV_PCI_TSBID(0, entry),</div><div class='ctx'> 						  npages,</div><div class='hunk'>@@ -179,7 +184,6 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	unsigned long flags, order, first_page, npages, n;</div><div class='ctx'> 	unsigned long prot = 0;</div><div class='ctx'> 	struct iommu *iommu;</div><div class='del'>-	struct atu *atu;</div><div class='ctx'> 	struct iommu_map_table *tbl;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	void *ret;</div><div class='hunk'>@@ -205,13 +209,11 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	memset((char *)first_page, 0, PAGE_SIZE &lt;&lt; order);</div><div class='ctx'> </div><div class='ctx'> 	iommu = dev-&gt;archdata.iommu;</div><div class='del'>-	atu = iommu-&gt;atu;</div><div class='del'>-</div><div class='ctx'> 	mask = dev-&gt;coherent_dma_mask;</div><div class='del'>-	if (mask &lt;= DMA_BIT_MASK(32) || !atu)</div><div class='add'>+	if (!iommu_use_atu(iommu, mask))</div><div class='ctx'> 		tbl = &amp;iommu-&gt;tbl;</div><div class='ctx'> 	else</div><div class='del'>-		tbl = &amp;atu-&gt;tbl;</div><div class='add'>+		tbl = &amp;iommu-&gt;atu-&gt;tbl;</div><div class='ctx'> </div><div class='ctx'> 	entry = iommu_tbl_range_alloc(dev, tbl, npages, NULL,</div><div class='ctx'> 				      (unsigned long)(-1), 0);</div><div class='hunk'>@@ -333,7 +335,7 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,</div><div class='ctx'> 	atu = iommu-&gt;atu;</div><div class='ctx'> 	devhandle = pbm-&gt;devhandle;</div><div class='ctx'> </div><div class='del'>-	if (dvma &lt;= DMA_BIT_MASK(32)) {</div><div class='add'>+	if (!iommu_use_atu(iommu, dvma)) {</div><div class='ctx'> 		tbl = &amp;iommu-&gt;tbl;</div><div class='ctx'> 		iotsb_num = 0; /* we don't care for legacy iommu */</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -374,7 +376,7 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	npages &gt;&gt;= IO_PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	mask = *dev-&gt;dma_mask;</div><div class='del'>-	if (mask &lt;= DMA_BIT_MASK(32))</div><div class='add'>+	if (!iommu_use_atu(iommu, mask))</div><div class='ctx'> 		tbl = &amp;iommu-&gt;tbl;</div><div class='ctx'> 	else</div><div class='ctx'> 		tbl = &amp;atu-&gt;tbl;</div><div class='hunk'>@@ -510,7 +512,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 				  IO_PAGE_SIZE) &gt;&gt; IO_PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	mask = *dev-&gt;dma_mask;</div><div class='del'>-	if (mask &lt;= DMA_BIT_MASK(32))</div><div class='add'>+	if (!iommu_use_atu(iommu, mask))</div><div class='ctx'> 		tbl = &amp;iommu-&gt;tbl;</div><div class='ctx'> 	else</div><div class='ctx'> 		tbl = &amp;atu-&gt;tbl;</div><div class='head'>diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl<br/>index b9a5a04b2d2c..a1dd24307b00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/sparc/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/sparc/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/sparc/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -469,3 +469,7 @@</div><div class='ctx'> 421	32	rt_sigtimedwait_time64		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait_time64</div><div class='ctx'> 422	32	futex_time64			sys_futex			sys_futex</div><div class='ctx'> 423	32	sched_rr_get_interval_time64	sys_sched_rr_get_interval	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c<br/>index 6d381279b362..000cb69ba0bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/drivers/harddog_kern.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/drivers/harddog_kern.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/drivers/harddog_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/drivers/harddog_kern.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static int harddog_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	timer_alive = 1;</div><div class='ctx'> 	spin_unlock(&amp;lock);</div><div class='ctx'> 	mutex_unlock(&amp;harddog_mutex);</div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> err:</div><div class='ctx'> 	spin_unlock(&amp;lock);</div><div class='ctx'> 	mutex_unlock(&amp;harddog_mutex);</div><div class='head'>diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c<br/>index 596e7056f376..e190e4ca52e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/drivers/vector_kern.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/drivers/vector_kern.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/drivers/vector_kern.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/drivers/vector_kern.c</a></div><div class='hunk'>@@ -1043,7 +1043,7 @@ static int vector_net_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		vector_send(vp-&gt;tx_queue);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='del'>-	if (skb-&gt;xmit_more) {</div><div class='add'>+	if (netdev_xmit_more()) {</div><div class='ctx'> 		mod_timer(&amp;vp-&gt;tl, vp-&gt;coalesce);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild<br/>index 00bcbe2326d9..b506ad06aefc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/include/asm/Kbuild</a></div><div class='hunk'>@@ -16,6 +16,7 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='head'>diff --git a/arch/um/include/asm/syscall-generic.h b/arch/um/include/asm/syscall-generic.h<br/>index 9fb9cf8cd39a..98e50c50c12e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/include/asm/syscall-generic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/include/asm/syscall-generic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/include/asm/syscall-generic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/include/asm/syscall-generic.h</a></div><div class='hunk'>@@ -53,84 +53,30 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	const struct uml_pt_regs *r = &amp;regs-&gt;regs;</div><div class='ctx'> </div><div class='del'>-	switch (i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = UPT_SYSCALL_ARG1(r);</div><div class='del'>-	case 1:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = UPT_SYSCALL_ARG2(r);</div><div class='del'>-	case 2:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = UPT_SYSCALL_ARG3(r);</div><div class='del'>-	case 3:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = UPT_SYSCALL_ARG4(r);</div><div class='del'>-	case 4:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = UPT_SYSCALL_ARG5(r);</div><div class='del'>-	case 5:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		*args++ = UPT_SYSCALL_ARG6(r);</div><div class='del'>-	case 6:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	*args++ = UPT_SYSCALL_ARG1(r);</div><div class='add'>+	*args++ = UPT_SYSCALL_ARG2(r);</div><div class='add'>+	*args++ = UPT_SYSCALL_ARG3(r);</div><div class='add'>+	*args++ = UPT_SYSCALL_ARG4(r);</div><div class='add'>+	*args++ = UPT_SYSCALL_ARG5(r);</div><div class='add'>+	*args   = UPT_SYSCALL_ARG6(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct uml_pt_regs *r = &amp;regs-&gt;regs;</div><div class='ctx'> </div><div class='del'>-	switch (i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		UPT_SYSCALL_ARG1(r) = *args++;</div><div class='del'>-	case 1:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		UPT_SYSCALL_ARG2(r) = *args++;</div><div class='del'>-	case 2:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		UPT_SYSCALL_ARG3(r) = *args++;</div><div class='del'>-	case 3:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		UPT_SYSCALL_ARG4(r) = *args++;</div><div class='del'>-	case 4:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		UPT_SYSCALL_ARG5(r) = *args++;</div><div class='del'>-	case 5:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-		UPT_SYSCALL_ARG6(r) = *args++;</div><div class='del'>-	case 6:</div><div class='del'>-		if (!n--)</div><div class='del'>-			break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	UPT_SYSCALL_ARG1(r) = *args++;</div><div class='add'>+	UPT_SYSCALL_ARG2(r) = *args++;</div><div class='add'>+	UPT_SYSCALL_ARG3(r) = *args++;</div><div class='add'>+	UPT_SYSCALL_ARG4(r) = *args++;</div><div class='add'>+	UPT_SYSCALL_ARG5(r) = *args++;</div><div class='add'>+	UPT_SYSCALL_ARG6(r) = *args;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */</div><div class='head'>diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/asm/tlb.h<br/>index dce6db147f24..70ee60383900 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/include/asm/tlb.h</a></div><div class='hunk'>@@ -2,162 +2,8 @@</div><div class='ctx'> #ifndef __UM_TLB_H</div><div class='ctx'> #define __UM_TLB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;asm/percpu.h&gt;</div><div class='del'>-#include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-</div><div class='del'>-#define tlb_start_vma(tlb, vma) do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma) do { } while (0)</div><div class='del'>-#define tlb_flush(tlb) flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='del'>-/* struct mmu_gather is an opaque type used by the mm code for passing around</div><div class='del'>- * any data needed by arch specific code for tlb_remove_page.</div><div class='del'>- */</div><div class='del'>-struct mmu_gather {</div><div class='del'>-	struct mm_struct	*mm;</div><div class='del'>-	unsigned int		need_flush; /* Really unmapped some ptes? */</div><div class='del'>-	unsigned long		start;</div><div class='del'>-	unsigned long		end;</div><div class='del'>-	unsigned int		fullmm; /* non-zero means full mm flush */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,</div><div class='del'>-					  unsigned long address)</div><div class='del'>-{</div><div class='del'>-	if (tlb-&gt;start &gt; address)</div><div class='del'>-		tlb-&gt;start = address;</div><div class='del'>-	if (tlb-&gt;end &lt; address + PAGE_SIZE)</div><div class='del'>-		tlb-&gt;end = address + PAGE_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void init_tlb_gather(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;need_flush = 0;</div><div class='del'>-</div><div class='del'>-	tlb-&gt;start = TASK_SIZE;</div><div class='del'>-	tlb-&gt;end = 0;</div><div class='del'>-</div><div class='del'>-	if (tlb-&gt;fullmm) {</div><div class='del'>-		tlb-&gt;start = 0;</div><div class='del'>-		tlb-&gt;end = TASK_SIZE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,</div><div class='del'>-		unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;mm = mm;</div><div class='del'>-	tlb-&gt;start = start;</div><div class='del'>-	tlb-&gt;end = end;</div><div class='del'>-	tlb-&gt;fullmm = !(start | (end+1));</div><div class='del'>-</div><div class='del'>-	init_tlb_gather(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,</div><div class='del'>-			       unsigned long end);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	flush_tlb_mm_range(tlb-&gt;mm, tlb-&gt;start, tlb-&gt;end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-tlb_flush_mmu_free(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	init_tlb_gather(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-tlb_flush_mmu(struct mmu_gather *tlb)</div><div class='del'>-{</div><div class='del'>-	if (!tlb-&gt;need_flush)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tlb_flush_mmu_tlbonly(tlb);</div><div class='del'>-	tlb_flush_mmu_free(tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* arch_tlb_finish_mmu</div><div class='del'>- *	Called at the end of the shootdown operation to free up any resources</div><div class='del'>- *	that were required.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-arch_tlb_finish_mmu(struct mmu_gather *tlb,</div><div class='del'>-		unsigned long start, unsigned long end, bool force)</div><div class='del'>-{</div><div class='del'>-	if (force) {</div><div class='del'>-		tlb-&gt;start = start;</div><div class='del'>-		tlb-&gt;end = end;</div><div class='del'>-		tlb-&gt;need_flush = 1;</div><div class='del'>-	}</div><div class='del'>-	tlb_flush_mmu(tlb);</div><div class='del'>-</div><div class='del'>-	/* keep the page table cache within bounds */</div><div class='del'>-	check_pgt_cache();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* tlb_remove_page</div><div class='del'>- *	Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)),</div><div class='del'>- *	while handling the additional races in SMP caused by other CPUs</div><div class='del'>- *	caching valid mappings in their TLBs.</div><div class='del'>- */</div><div class='del'>-static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	tlb-&gt;need_flush = 1;</div><div class='del'>-	free_page_and_swap_cache(page);</div><div class='del'>-	return false; /* avoid calling tlb_flush_mmu */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='del'>-{</div><div class='del'>-	__tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					  struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-					struct page *page, int page_size)</div><div class='del'>-{</div><div class='del'>-	return tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tlb_remove_tlb_entry - remember a pte unmapping for later tlb invalidation.</div><div class='del'>- *</div><div class='del'>- * Record the fact that pte's were really umapped in -&gt;need_flush, so we can</div><div class='del'>- * later optimise away the tlb invalidate.   This helps when userspace is</div><div class='del'>- * unmapping already-unmapped pages, which happens quite a lot.</div><div class='del'>- */</div><div class='del'>-#define tlb_remove_tlb_entry(tlb, ptep, address)		\</div><div class='del'>-	do {							\</div><div class='del'>-		tlb-&gt;need_flush = 1;				\</div><div class='del'>-		__tlb_remove_tlb_entry(tlb, ptep, address);	\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='del'>-	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='del'>-</div><div class='del'>-#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='del'>-static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='del'>-						     unsigned int page_size)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr)</div><div class='del'>-</div><div class='del'>-#define pud_free_tlb(tlb, pudp, addr) __pud_free_tlb(tlb, pudp, addr)</div><div class='del'>-</div><div class='del'>-#define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr)</div><div class='del'>-</div><div class='del'>-#define tlb_migrate_finish(mm) do {} while (0)</div><div class='add'>+#include &lt;asm-generic/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/um/kernel/stacktrace.c b/arch/um/kernel/stacktrace.c<br/>index ebe7bcf62684..bd95e020d509 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/kernel/stacktrace.c</a></div><div class='hunk'>@@ -63,8 +63,6 @@ static const struct stacktrace_ops dump_ops = {</div><div class='ctx'> static void __save_stack_trace(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> {</div><div class='ctx'> 	dump_trace(tsk, &amp;dump_ops, trace);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace(struct stack_trace *trace)</div><div class='head'>diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c<br/>index 6b995e870d55..05585eef11d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/kernel/sysrq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/um/kernel/sysrq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/um/kernel/sysrq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/um/kernel/sysrq.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> static void _print_addr(void *data, unsigned long address, int reliable)</div><div class='ctx'> {</div><div class='del'>-	pr_info(" [&lt;%08lx&gt;] %s%pF\n", address, reliable ? "" : "? ",</div><div class='add'>+	pr_info(" [&lt;%08lx&gt;] %s%pS\n", address, reliable ? "" : "? ",</div><div class='ctx'> 		(void *)address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig<br/>index 817d82608712..2445dfcf6444 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/Kconfig</a></div><div class='hunk'>@@ -20,6 +20,7 @@ config UNICORE32</div><div class='ctx'> 	select GENERIC_IOMAP</div><div class='ctx'> 	select MODULES_USE_ELF_REL</div><div class='ctx'> 	select NEED_DMA_MAP_STATE</div><div class='add'>+	select MMU_GATHER_NO_RANGE if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  UniCore-32 is 32-bit Instruction Set Architecture,</div><div class='ctx'> 	  including a series of low-power-consumption RISC chip</div><div class='hunk'>@@ -38,12 +39,6 @@ config STACKTRACE_SUPPORT</div><div class='ctx'> config LOCKDEP_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config ARCH_HAS_ILOG2_U32</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild<br/>index 1d1544b6ca74..b301a0b3c0b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/include/asm/Kbuild</a></div><div class='hunk'>@@ -18,9 +18,11 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += module.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += percpu.h</div><div class='head'>diff --git a/arch/unicore32/include/asm/elf.h b/arch/unicore32/include/asm/elf.h<br/>index 829042d07722..ae66dc1be49e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/elf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/elf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/elf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/include/asm/elf.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  * ELF register definitions..</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/elf-em.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long elf_greg_t;</div><div class='ctx'> typedef unsigned long elf_freg_t[3];</div><div class='hunk'>@@ -28,8 +29,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];</div><div class='ctx'> </div><div class='ctx'> typedef struct fp_state elf_fpregset_t;</div><div class='ctx'> </div><div class='del'>-#define EM_UNICORE		110</div><div class='del'>-</div><div class='ctx'> #define R_UNICORE_NONE		0</div><div class='ctx'> #define R_UNICORE_PC24		1</div><div class='ctx'> #define R_UNICORE_ABS32		2</div><div class='head'>diff --git a/arch/unicore32/include/asm/syscall.h b/arch/unicore32/include/asm/syscall.h<br/>new file mode 100644<br/>index 000000000000..607961797fff<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/include/asm/syscall.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_UNICORE_SYSCALL_H</div><div class='add'>+#define _ASM_UNICORE_SYSCALL_H</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/audit.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return AUDIT_ARCH_UNICORE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_UNICORE_SYSCALL_H */</div><div class='head'>diff --git a/arch/unicore32/include/asm/tlb.h b/arch/unicore32/include/asm/tlb.h<br/>index 9cca15cdae94..00a8477333f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/include/asm/tlb.h</a></div><div class='hunk'>@@ -12,10 +12,9 @@</div><div class='ctx'> #ifndef __UNICORE_TLB_H__</div><div class='ctx'> #define __UNICORE_TLB_H__</div><div class='ctx'> </div><div class='del'>-#define tlb_start_vma(tlb, vma)				do { } while (0)</div><div class='del'>-#define tlb_end_vma(tlb, vma)				do { } while (0)</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)</div><div class='del'>-#define tlb_flush(tlb) flush_tlb_mm((tlb)-&gt;mm)</div><div class='add'>+/*</div><div class='add'>+ * unicore32 lacks an efficient flush_tlb_range(), use flush_tlb_mm().</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #define __pte_free_tlb(tlb, pte, addr)				\</div><div class='ctx'> 	do {							\</div><div class='head'>diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild<br/>index 755bb11323d8..1c72f04ff75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-generic-y += kvm_para.h</div><div class='ctx'> generic-y += ucontext.h</div><div class='head'>diff --git a/arch/unicore32/kernel/stacktrace.c b/arch/unicore32/kernel/stacktrace.c<br/>index 9976e767d51c..e37da8c6837b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/unicore32/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/unicore32/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/unicore32/kernel/stacktrace.c</a></div><div class='hunk'>@@ -120,8 +120,6 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	walk_stackframe(&amp;frame, save_trace, &amp;data);</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace(struct stack_trace *trace)</div><div class='head'>diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig<br/>index c1f9b3cf437c..e7212731cffb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/Kconfig</a></div><div class='hunk'>@@ -14,6 +14,7 @@ config X86_32</div><div class='ctx'> 	select ARCH_WANT_IPC_PARSE_VERSION</div><div class='ctx'> 	select CLKSRC_I8253</div><div class='ctx'> 	select CLONE_BACKWARDS</div><div class='add'>+	select HAVE_DEBUG_STACKOVERFLOW</div><div class='ctx'> 	select MODULES_USE_ELF_REL</div><div class='ctx'> 	select OLD_SIGACTION</div><div class='ctx'> </div><div class='hunk'>@@ -28,7 +29,6 @@ config X86_64</div><div class='ctx'> 	select MODULES_USE_ELF_RELA</div><div class='ctx'> 	select NEED_DMA_MAP_STATE</div><div class='ctx'> 	select SWIOTLB</div><div class='del'>-	select X86_DEV_DMA_OPS</div><div class='ctx'> 	select ARCH_HAS_SYSCALL_WRAPPER</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -44,7 +44,6 @@ config X86</div><div class='ctx'> 	#</div><div class='ctx'> 	select ACPI_LEGACY_TABLES_LOOKUP	if ACPI</div><div class='ctx'> 	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select ARCH_32BIT_OFF_T			if X86_32</div><div class='ctx'> 	select ARCH_CLOCKSOURCE_DATA</div><div class='ctx'> 	select ARCH_CLOCKSOURCE_INIT</div><div class='hunk'>@@ -65,6 +64,7 @@ config X86</div><div class='ctx'> 	select ARCH_HAS_UACCESS_FLUSHCACHE	if X86_64</div><div class='ctx'> 	select ARCH_HAS_UACCESS_MCSAFE		if X86_64 &amp;&amp; X86_MCE</div><div class='ctx'> 	select ARCH_HAS_SET_MEMORY</div><div class='add'>+	select ARCH_HAS_SET_DIRECT_MAP</div><div class='ctx'> 	select ARCH_HAS_STRICT_KERNEL_RWX</div><div class='ctx'> 	select ARCH_HAS_STRICT_MODULE_RWX</div><div class='ctx'> 	select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE</div><div class='hunk'>@@ -74,6 +74,7 @@ config X86</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_PC_PARPORT</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_PC_SERIO</div><div class='add'>+	select ARCH_STACKWALK</div><div class='ctx'> 	select ARCH_SUPPORTS_ACPI</div><div class='ctx'> 	select ARCH_SUPPORTS_ATOMIC_RMW</div><div class='ctx'> 	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64</div><div class='hunk'>@@ -138,7 +139,6 @@ config X86</div><div class='ctx'> 	select HAVE_COPY_THREAD_TLS</div><div class='ctx'> 	select HAVE_C_RECORDMCOUNT</div><div class='ctx'> 	select HAVE_DEBUG_KMEMLEAK</div><div class='del'>-	select HAVE_DEBUG_STACKOVERFLOW</div><div class='ctx'> 	select HAVE_DMA_CONTIGUOUS</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE_WITH_REGS</div><div class='hunk'>@@ -183,7 +183,6 @@ config X86</div><div class='ctx'> 	select HAVE_PERF_REGS</div><div class='ctx'> 	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE		if PARAVIRT</div><div class='del'>-	select HAVE_RCU_TABLE_INVALIDATE	if HAVE_RCU_TABLE_FREE</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='ctx'> 	select HAVE_RELIABLE_STACKTRACE		if X86_64 &amp;&amp; (UNWINDER_FRAME_POINTER || UNWINDER_ORC) &amp;&amp; STACK_VALIDATION</div><div class='ctx'> 	select HAVE_FUNCTION_ARG_ACCESS_API</div><div class='hunk'>@@ -268,9 +267,6 @@ config ARCH_MAY_HAVE_PC_FDC</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on ISA_DMA_API</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -703,8 +699,6 @@ config STA2X11</div><div class='ctx'> 	bool "STA2X11 Companion Chip Support"</div><div class='ctx'> 	depends on X86_32_NON_STANDARD &amp;&amp; PCI</div><div class='ctx'> 	select ARCH_HAS_PHYS_TO_DMA</div><div class='del'>-	select X86_DEV_DMA_OPS</div><div class='del'>-	select X86_DMA_REMAP</div><div class='ctx'> 	select SWIOTLB</div><div class='ctx'> 	select MFD_STA2X11</div><div class='ctx'> 	select GPIOLIB</div><div class='hunk'>@@ -783,14 +777,6 @@ config PARAVIRT_SPINLOCKS</div><div class='ctx'> </div><div class='ctx'> 	  If you are unsure how to answer this question, answer Y.</div><div class='ctx'> </div><div class='del'>-config QUEUED_LOCK_STAT</div><div class='del'>-	bool "Paravirt queued spinlock statistics"</div><div class='del'>-	depends on PARAVIRT_SPINLOCKS &amp;&amp; DEBUG_FS</div><div class='del'>-	---help---</div><div class='del'>-	  Enable the collection of statistical data on the slowpath</div><div class='del'>-	  behavior of paravirtualized queued spinlocks and report</div><div class='del'>-	  them on debugfs.</div><div class='del'>-</div><div class='ctx'> source "arch/x86/xen/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config KVM_GUEST</div><div class='hunk'>@@ -1330,8 +1316,16 @@ config MICROCODE_AMD</div><div class='ctx'> 	  processors will be enabled.</div><div class='ctx'> </div><div class='ctx'> config MICROCODE_OLD_INTERFACE</div><div class='del'>-	def_bool y</div><div class='add'>+	bool "Ancient loading interface (DEPRECATED)"</div><div class='add'>+	default n</div><div class='ctx'> 	depends on MICROCODE</div><div class='add'>+	---help---</div><div class='add'>+	  DO NOT USE THIS! This is the ancient /dev/cpu/microcode interface</div><div class='add'>+	  which was used by userspace tools like iucode_tool and microcode.ctl.</div><div class='add'>+	  It is inadequate because it runs too late to be able to properly</div><div class='add'>+	  load microcode on a machine and it needs special tools. Instead, you</div><div class='add'>+	  should've switched to the early loading method with the initrd or</div><div class='add'>+	  builtin microcode by now: Documentation/x86/microcode.txt</div><div class='ctx'> </div><div class='ctx'> config X86_MSR</div><div class='ctx'> 	tristate "/dev/cpu/*/msr - Model-specific register support"</div><div class='hunk'>@@ -1499,7 +1493,7 @@ config X86_CPA_STATISTICS</div><div class='ctx'> 	depends on DEBUG_FS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Expose statistics about the Change Page Attribute mechanims, which</div><div class='del'>-	  helps to determine the effectivness of preserving large and huge</div><div class='add'>+	  helps to determine the effectiveness of preserving large and huge</div><div class='ctx'> 	  page mappings when mapping protections are changed.</div><div class='ctx'> </div><div class='ctx'> config ARCH_HAS_MEM_ENCRYPT</div><div class='hunk'>@@ -1606,12 +1600,9 @@ config ARCH_FLATMEM_ENABLE</div><div class='ctx'> 	depends on X86_32 &amp;&amp; !NUMA</div><div class='ctx'> </div><div class='ctx'> config ARCH_DISCONTIGMEM_ENABLE</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on NUMA &amp;&amp; X86_32</div><div class='del'>-</div><div class='del'>-config ARCH_DISCONTIGMEM_DEFAULT</div><div class='del'>-	def_bool y</div><div class='add'>+	def_bool n</div><div class='ctx'> 	depends on NUMA &amp;&amp; X86_32</div><div class='add'>+	depends on BROKEN</div><div class='ctx'> </div><div class='ctx'> config ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -1620,8 +1611,7 @@ config ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	select SPARSEMEM_VMEMMAP_ENABLE if X86_64</div><div class='ctx'> </div><div class='ctx'> config ARCH_SPARSEMEM_DEFAULT</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on X86_64</div><div class='add'>+	def_bool X86_64 || (NUMA &amp;&amp; X86_32)</div><div class='ctx'> </div><div class='ctx'> config ARCH_SELECT_MEMORY_MODEL</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -2217,14 +2207,8 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING</div><div class='ctx'> 	   If unsure, leave at the default value.</div><div class='ctx'> </div><div class='ctx'> config HOTPLUG_CPU</div><div class='del'>-	bool "Support for hot-pluggable CPUs"</div><div class='add'>+	def_bool y</div><div class='ctx'> 	depends on SMP</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here to allow turning CPUs off and on. CPUs can be</div><div class='del'>-	  controlled through /sys/devices/system/cpu.</div><div class='del'>-	  ( Note: power management support will enable this option</div><div class='del'>-	    automatically on SMP systems. )</div><div class='del'>-	  Say N if you want to disable CPU hotplug.</div><div class='ctx'> </div><div class='ctx'> config BOOTPARAM_HOTPLUG_CPU0</div><div class='ctx'> 	bool "Set default setting of cpu0_hotpluggable"</div><div class='hunk'>@@ -2884,11 +2868,6 @@ config HAVE_ATOMIC_IOMAP</div><div class='ctx'> </div><div class='ctx'> config X86_DEV_DMA_OPS</div><div class='ctx'> 	bool</div><div class='del'>-	depends on X86_64 || STA2X11</div><div class='del'>-</div><div class='del'>-config X86_DMA_REMAP</div><div class='del'>-	bool</div><div class='del'>-	depends on STA2X11</div><div class='ctx'> </div><div class='ctx'> config HAVE_GENERIC_GUP</div><div class='ctx'> 	def_bool y</div><div class='head'>diff --git a/arch/x86/Makefile b/arch/x86/Makefile<br/>index 2d8b9d8ca4f8..56e748a7679f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/Makefile</a></div><div class='hunk'>@@ -47,7 +47,7 @@ export REALMODE_CFLAGS</div><div class='ctx'> export BITS</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_X86_NEED_RELOCS</div><div class='del'>-        LDFLAGS_vmlinux := --emit-relocs</div><div class='add'>+        LDFLAGS_vmlinux := --emit-relocs --discard-none</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -219,8 +219,12 @@ ifdef CONFIG_RETPOLINE</div><div class='ctx'>   # Additionally, avoid generating expensive indirect jumps which</div><div class='ctx'>   # are subject to retpolines for small number of switch cases.</div><div class='ctx'>   # clang turns off jump table generation by default when under</div><div class='del'>-  # retpoline builds, however, gcc does not for x86.</div><div class='del'>-  KBUILD_CFLAGS += $(call cc-option,--param=case-values-threshold=20)</div><div class='add'>+  # retpoline builds, however, gcc does not for x86. This has</div><div class='add'>+  # only been fixed starting from gcc stable version 8.4.0 and</div><div class='add'>+  # onwards, but not for older ones. See gcc bug #86952.</div><div class='add'>+  ifndef CONFIG_CC_IS_CLANG</div><div class='add'>+    KBUILD_CFLAGS += $(call cc-option,-fno-jump-tables)</div><div class='add'>+  endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> archscripts: scripts_basic</div><div class='head'>diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c<br/>index 0ef4ad55b29b..ad84239e595e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/compressed/acpi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/compressed/acpi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/compressed/acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/boot/compressed/acpi.c</a></div><div class='hunk'>@@ -276,7 +276,7 @@ static unsigned long get_acpi_srat_table(void)</div><div class='ctx'> 		if (acpi_table) {</div><div class='ctx'> 			header = (struct acpi_table_header *)acpi_table;</div><div class='ctx'> </div><div class='del'>-			if (ACPI_COMPARE_NAME(header-&gt;signature, ACPI_SIG_SRAT))</div><div class='add'>+			if (ACPI_COMPARE_NAMESEG(header-&gt;signature, ACPI_SIG_SRAT))</div><div class='ctx'> 				return acpi_table;</div><div class='ctx'> 		}</div><div class='ctx'> 		entry += size;</div><div class='head'>diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c<br/>index c0d6c560df69..5a237e8dbf8d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/compressed/misc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/compressed/misc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/compressed/misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/boot/compressed/misc.c</a></div><div class='hunk'>@@ -352,7 +352,7 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,</div><div class='ctx'> 	boot_params-&gt;hdr.loadflags &amp;= ~KASLR_FLAG;</div><div class='ctx'> </div><div class='ctx'> 	/* Save RSDP address for later use. */</div><div class='del'>-	boot_params-&gt;acpi_rsdp_addr = get_rsdp_addr();</div><div class='add'>+	/* boot_params-&gt;acpi_rsdp_addr = get_rsdp_addr(); */</div><div class='ctx'> </div><div class='ctx'> 	sanitize_boot_params(boot_params);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h<br/>index fd13655e0f9b..d2f184165934 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/compressed/misc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/compressed/misc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/compressed/misc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/boot/compressed/misc.h</a></div><div class='hunk'>@@ -120,8 +120,6 @@ static inline void console_init(void)</div><div class='ctx'> </div><div class='ctx'> void set_sev_encryption_mask(void);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* acpi.c */</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> acpi_physical_address get_rsdp_addr(void);</div><div class='hunk'>@@ -135,3 +133,5 @@ int count_immovable_mem_regions(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int count_immovable_mem_regions(void) { return 0; }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#endif /* BOOT_COMPRESSED_MISC_H */</div><div class='head'>diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c<br/>index 315a67b8896b..90154df8f125 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/string.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/boot/string.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/boot/string.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/boot/string.c</a></div><div class='hunk'>@@ -13,8 +13,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include "ctype.h"</div><div class='ctx'> #include "string.h"</div><div class='head'>diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig<br/>index 9f908112bbb9..2b2481acc661 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/configs/i386_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/configs/i386_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/configs/i386_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/configs/i386_defconfig</a></div><div class='hunk'>@@ -25,18 +25,6 @@ CONFIG_JUMP_LABEL=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-CONFIG_PARTITION_ADVANCED=y</div><div class='del'>-CONFIG_OSF_PARTITION=y</div><div class='del'>-CONFIG_AMIGA_PARTITION=y</div><div class='del'>-CONFIG_MAC_PARTITION=y</div><div class='del'>-CONFIG_BSD_DISKLABEL=y</div><div class='del'>-CONFIG_MINIX_SUBPARTITION=y</div><div class='del'>-CONFIG_SOLARIS_X86_PARTITION=y</div><div class='del'>-CONFIG_UNIXWARE_DISKLABEL=y</div><div class='del'>-CONFIG_SGI_PARTITION=y</div><div class='del'>-CONFIG_SUN_PARTITION=y</div><div class='del'>-CONFIG_KARMA_PARTITION=y</div><div class='del'>-CONFIG_EFI_PARTITION=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_X86_GENERIC=y</div><div class='ctx'> CONFIG_HPET_TIMER=y</div><div class='head'>diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig<br/>index 1d3badfda09e..e8829abf063a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/configs/x86_64_defconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/configs/x86_64_defconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/configs/x86_64_defconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/configs/x86_64_defconfig</a></div><div class='hunk'>@@ -24,18 +24,6 @@ CONFIG_JUMP_LABEL=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-CONFIG_PARTITION_ADVANCED=y</div><div class='del'>-CONFIG_OSF_PARTITION=y</div><div class='del'>-CONFIG_AMIGA_PARTITION=y</div><div class='del'>-CONFIG_MAC_PARTITION=y</div><div class='del'>-CONFIG_BSD_DISKLABEL=y</div><div class='del'>-CONFIG_MINIX_SUBPARTITION=y</div><div class='del'>-CONFIG_SOLARIS_X86_PARTITION=y</div><div class='del'>-CONFIG_UNIXWARE_DISKLABEL=y</div><div class='del'>-CONFIG_SGI_PARTITION=y</div><div class='del'>-CONFIG_SUN_PARTITION=y</div><div class='del'>-CONFIG_KARMA_PARTITION=y</div><div class='del'>-CONFIG_EFI_PARTITION=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_CALGARY_IOMMU=y</div><div class='ctx'> CONFIG_NR_CPUS=64</div><div class='head'>diff --git a/arch/x86/crypto/aegis128-aesni-glue.c b/arch/x86/crypto/aegis128-aesni-glue.c<br/>index 3ea71b871813..bdeee1b830be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aegis128-aesni-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aegis128-aesni-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aegis128-aesni-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/aegis128-aesni-glue.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  * any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -242,131 +242,35 @@ static void crypto_aegis128_aesni_exit_tfm(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cryptd_aegis128_aesni_setkey(struct crypto_aead *aead,</div><div class='del'>-					const u8 *key, unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setkey(&amp;cryptd_tfm-&gt;base, key, keylen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128_aesni_setauthsize(struct crypto_aead *aead,</div><div class='del'>-					     unsigned int authsize)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setauthsize(&amp;cryptd_tfm-&gt;base, authsize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128_aesni_encrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_encrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128_aesni_decrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_decrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128_aesni_init_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead("__aegis128-aesni", CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_aegis128_aesni_exit_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct aead_alg crypto_aegis128_aesni_alg[] = {</div><div class='del'>-	{</div><div class='del'>-		.setkey = crypto_aegis128_aesni_setkey,</div><div class='del'>-		.setauthsize = crypto_aegis128_aesni_setauthsize,</div><div class='del'>-		.encrypt = crypto_aegis128_aesni_encrypt,</div><div class='del'>-		.decrypt = crypto_aegis128_aesni_decrypt,</div><div class='del'>-		.init = crypto_aegis128_aesni_init_tfm,</div><div class='del'>-		.exit = crypto_aegis128_aesni_exit_tfm,</div><div class='del'>-</div><div class='del'>-		.ivsize = AEGIS128_NONCE_SIZE,</div><div class='del'>-		.maxauthsize = AEGIS128_MAX_AUTH_SIZE,</div><div class='del'>-		.chunksize = AEGIS128_BLOCK_SIZE,</div><div class='del'>-</div><div class='del'>-		.base = {</div><div class='del'>-			.cra_flags = CRYPTO_ALG_INTERNAL,</div><div class='del'>-			.cra_blocksize = 1,</div><div class='del'>-			.cra_ctxsize = sizeof(struct aegis_ctx) +</div><div class='del'>-				__alignof__(struct aegis_ctx),</div><div class='del'>-			.cra_alignmask = 0,</div><div class='del'>-</div><div class='del'>-			.cra_name = "__aegis128",</div><div class='del'>-			.cra_driver_name = "__aegis128-aesni",</div><div class='del'>-</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-		}</div><div class='del'>-	}, {</div><div class='del'>-		.setkey = cryptd_aegis128_aesni_setkey,</div><div class='del'>-		.setauthsize = cryptd_aegis128_aesni_setauthsize,</div><div class='del'>-		.encrypt = cryptd_aegis128_aesni_encrypt,</div><div class='del'>-		.decrypt = cryptd_aegis128_aesni_decrypt,</div><div class='del'>-		.init = cryptd_aegis128_aesni_init_tfm,</div><div class='del'>-		.exit = cryptd_aegis128_aesni_exit_tfm,</div><div class='del'>-</div><div class='del'>-		.ivsize = AEGIS128_NONCE_SIZE,</div><div class='del'>-		.maxauthsize = AEGIS128_MAX_AUTH_SIZE,</div><div class='del'>-		.chunksize = AEGIS128_BLOCK_SIZE,</div><div class='del'>-</div><div class='del'>-		.base = {</div><div class='del'>-			.cra_flags = CRYPTO_ALG_ASYNC,</div><div class='del'>-			.cra_blocksize = 1,</div><div class='del'>-			.cra_ctxsize = sizeof(struct cryptd_aead *),</div><div class='del'>-			.cra_alignmask = 0,</div><div class='del'>-</div><div class='del'>-			.cra_priority = 400,</div><div class='del'>-</div><div class='del'>-			.cra_name = "aegis128",</div><div class='del'>-			.cra_driver_name = "aegis128-aesni",</div><div class='del'>-</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-		}</div><div class='add'>+static struct aead_alg crypto_aegis128_aesni_alg = {</div><div class='add'>+	.setkey = crypto_aegis128_aesni_setkey,</div><div class='add'>+	.setauthsize = crypto_aegis128_aesni_setauthsize,</div><div class='add'>+	.encrypt = crypto_aegis128_aesni_encrypt,</div><div class='add'>+	.decrypt = crypto_aegis128_aesni_decrypt,</div><div class='add'>+	.init = crypto_aegis128_aesni_init_tfm,</div><div class='add'>+	.exit = crypto_aegis128_aesni_exit_tfm,</div><div class='add'>+</div><div class='add'>+	.ivsize = AEGIS128_NONCE_SIZE,</div><div class='add'>+	.maxauthsize = AEGIS128_MAX_AUTH_SIZE,</div><div class='add'>+	.chunksize = AEGIS128_BLOCK_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_flags = CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize = 1,</div><div class='add'>+		.cra_ctxsize = sizeof(struct aegis_ctx) +</div><div class='add'>+			       __alignof__(struct aegis_ctx),</div><div class='add'>+		.cra_alignmask = 0,</div><div class='add'>+		.cra_priority = 400,</div><div class='add'>+</div><div class='add'>+		.cra_name = "__aegis128",</div><div class='add'>+		.cra_driver_name = "__aegis128-aesni",</div><div class='add'>+</div><div class='add'>+		.cra_module = THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct simd_aead_alg *simd_alg;</div><div class='add'>+</div><div class='ctx'> static int __init crypto_aegis128_aesni_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||</div><div class='hunk'>@@ -374,14 +278,13 @@ static int __init crypto_aegis128_aesni_module_init(void)</div><div class='ctx'> 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return crypto_register_aeads(crypto_aegis128_aesni_alg,</div><div class='del'>-				     ARRAY_SIZE(crypto_aegis128_aesni_alg));</div><div class='add'>+	return simd_register_aeads_compat(&amp;crypto_aegis128_aesni_alg, 1,</div><div class='add'>+					  &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto_aegis128_aesni_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_aeads(crypto_aegis128_aesni_alg,</div><div class='del'>-				ARRAY_SIZE(crypto_aegis128_aesni_alg));</div><div class='add'>+	simd_unregister_aeads(&amp;crypto_aegis128_aesni_alg, 1, &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_aegis128_aesni_module_init);</div><div class='head'>diff --git a/arch/x86/crypto/aegis128l-aesni-glue.c b/arch/x86/crypto/aegis128l-aesni-glue.c<br/>index 1b1b39c66c5e..80d917f7e467 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aegis128l-aesni-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aegis128l-aesni-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aegis128l-aesni-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/aegis128l-aesni-glue.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  * any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -242,131 +242,35 @@ static void crypto_aegis128l_aesni_exit_tfm(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cryptd_aegis128l_aesni_setkey(struct crypto_aead *aead,</div><div class='del'>-					 const u8 *key, unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setkey(&amp;cryptd_tfm-&gt;base, key, keylen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128l_aesni_setauthsize(struct crypto_aead *aead,</div><div class='del'>-					      unsigned int authsize)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setauthsize(&amp;cryptd_tfm-&gt;base, authsize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128l_aesni_encrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_encrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128l_aesni_decrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_decrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis128l_aesni_init_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead("__aegis128l-aesni", CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_aegis128l_aesni_exit_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct aead_alg crypto_aegis128l_aesni_alg[] = {</div><div class='del'>-	{</div><div class='del'>-		.setkey = crypto_aegis128l_aesni_setkey,</div><div class='del'>-		.setauthsize = crypto_aegis128l_aesni_setauthsize,</div><div class='del'>-		.encrypt = crypto_aegis128l_aesni_encrypt,</div><div class='del'>-		.decrypt = crypto_aegis128l_aesni_decrypt,</div><div class='del'>-		.init = crypto_aegis128l_aesni_init_tfm,</div><div class='del'>-		.exit = crypto_aegis128l_aesni_exit_tfm,</div><div class='del'>-</div><div class='del'>-		.ivsize = AEGIS128L_NONCE_SIZE,</div><div class='del'>-		.maxauthsize = AEGIS128L_MAX_AUTH_SIZE,</div><div class='del'>-		.chunksize = AEGIS128L_BLOCK_SIZE,</div><div class='del'>-</div><div class='del'>-		.base = {</div><div class='del'>-			.cra_flags = CRYPTO_ALG_INTERNAL,</div><div class='del'>-			.cra_blocksize = 1,</div><div class='del'>-			.cra_ctxsize = sizeof(struct aegis_ctx) +</div><div class='del'>-				__alignof__(struct aegis_ctx),</div><div class='del'>-			.cra_alignmask = 0,</div><div class='del'>-</div><div class='del'>-			.cra_name = "__aegis128l",</div><div class='del'>-			.cra_driver_name = "__aegis128l-aesni",</div><div class='del'>-</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-		}</div><div class='del'>-	}, {</div><div class='del'>-		.setkey = cryptd_aegis128l_aesni_setkey,</div><div class='del'>-		.setauthsize = cryptd_aegis128l_aesni_setauthsize,</div><div class='del'>-		.encrypt = cryptd_aegis128l_aesni_encrypt,</div><div class='del'>-		.decrypt = cryptd_aegis128l_aesni_decrypt,</div><div class='del'>-		.init = cryptd_aegis128l_aesni_init_tfm,</div><div class='del'>-		.exit = cryptd_aegis128l_aesni_exit_tfm,</div><div class='del'>-</div><div class='del'>-		.ivsize = AEGIS128L_NONCE_SIZE,</div><div class='del'>-		.maxauthsize = AEGIS128L_MAX_AUTH_SIZE,</div><div class='del'>-		.chunksize = AEGIS128L_BLOCK_SIZE,</div><div class='del'>-</div><div class='del'>-		.base = {</div><div class='del'>-			.cra_flags = CRYPTO_ALG_ASYNC,</div><div class='del'>-			.cra_blocksize = 1,</div><div class='del'>-			.cra_ctxsize = sizeof(struct cryptd_aead *),</div><div class='del'>-			.cra_alignmask = 0,</div><div class='del'>-</div><div class='del'>-			.cra_priority = 400,</div><div class='del'>-</div><div class='del'>-			.cra_name = "aegis128l",</div><div class='del'>-			.cra_driver_name = "aegis128l-aesni",</div><div class='del'>-</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-		}</div><div class='add'>+static struct aead_alg crypto_aegis128l_aesni_alg = {</div><div class='add'>+	.setkey = crypto_aegis128l_aesni_setkey,</div><div class='add'>+	.setauthsize = crypto_aegis128l_aesni_setauthsize,</div><div class='add'>+	.encrypt = crypto_aegis128l_aesni_encrypt,</div><div class='add'>+	.decrypt = crypto_aegis128l_aesni_decrypt,</div><div class='add'>+	.init = crypto_aegis128l_aesni_init_tfm,</div><div class='add'>+	.exit = crypto_aegis128l_aesni_exit_tfm,</div><div class='add'>+</div><div class='add'>+	.ivsize = AEGIS128L_NONCE_SIZE,</div><div class='add'>+	.maxauthsize = AEGIS128L_MAX_AUTH_SIZE,</div><div class='add'>+	.chunksize = AEGIS128L_BLOCK_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_flags = CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize = 1,</div><div class='add'>+		.cra_ctxsize = sizeof(struct aegis_ctx) +</div><div class='add'>+			       __alignof__(struct aegis_ctx),</div><div class='add'>+		.cra_alignmask = 0,</div><div class='add'>+		.cra_priority = 400,</div><div class='add'>+</div><div class='add'>+		.cra_name = "__aegis128l",</div><div class='add'>+		.cra_driver_name = "__aegis128l-aesni",</div><div class='add'>+</div><div class='add'>+		.cra_module = THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct simd_aead_alg *simd_alg;</div><div class='add'>+</div><div class='ctx'> static int __init crypto_aegis128l_aesni_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||</div><div class='hunk'>@@ -374,14 +278,13 @@ static int __init crypto_aegis128l_aesni_module_init(void)</div><div class='ctx'> 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return crypto_register_aeads(crypto_aegis128l_aesni_alg,</div><div class='del'>-				     ARRAY_SIZE(crypto_aegis128l_aesni_alg));</div><div class='add'>+	return simd_register_aeads_compat(&amp;crypto_aegis128l_aesni_alg, 1,</div><div class='add'>+					  &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto_aegis128l_aesni_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_aeads(crypto_aegis128l_aesni_alg,</div><div class='del'>-				ARRAY_SIZE(crypto_aegis128l_aesni_alg));</div><div class='add'>+	simd_unregister_aeads(&amp;crypto_aegis128l_aesni_alg, 1, &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_aegis128l_aesni_module_init);</div><div class='head'>diff --git a/arch/x86/crypto/aegis256-aesni-glue.c b/arch/x86/crypto/aegis256-aesni-glue.c<br/>index 6227ca3220a0..716eecb66bd5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aegis256-aesni-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aegis256-aesni-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aegis256-aesni-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/aegis256-aesni-glue.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  * any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -242,131 +242,35 @@ static void crypto_aegis256_aesni_exit_tfm(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cryptd_aegis256_aesni_setkey(struct crypto_aead *aead,</div><div class='del'>-					const u8 *key, unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setkey(&amp;cryptd_tfm-&gt;base, key, keylen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis256_aesni_setauthsize(struct crypto_aead *aead,</div><div class='del'>-					     unsigned int authsize)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setauthsize(&amp;cryptd_tfm-&gt;base, authsize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis256_aesni_encrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_encrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis256_aesni_decrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_decrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_aegis256_aesni_init_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead("__aegis256-aesni", CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_aegis256_aesni_exit_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct aead_alg crypto_aegis256_aesni_alg[] = {</div><div class='del'>-	{</div><div class='del'>-		.setkey = crypto_aegis256_aesni_setkey,</div><div class='del'>-		.setauthsize = crypto_aegis256_aesni_setauthsize,</div><div class='del'>-		.encrypt = crypto_aegis256_aesni_encrypt,</div><div class='del'>-		.decrypt = crypto_aegis256_aesni_decrypt,</div><div class='del'>-		.init = crypto_aegis256_aesni_init_tfm,</div><div class='del'>-		.exit = crypto_aegis256_aesni_exit_tfm,</div><div class='del'>-</div><div class='del'>-		.ivsize = AEGIS256_NONCE_SIZE,</div><div class='del'>-		.maxauthsize = AEGIS256_MAX_AUTH_SIZE,</div><div class='del'>-		.chunksize = AEGIS256_BLOCK_SIZE,</div><div class='del'>-</div><div class='del'>-		.base = {</div><div class='del'>-			.cra_flags = CRYPTO_ALG_INTERNAL,</div><div class='del'>-			.cra_blocksize = 1,</div><div class='del'>-			.cra_ctxsize = sizeof(struct aegis_ctx) +</div><div class='del'>-				__alignof__(struct aegis_ctx),</div><div class='del'>-			.cra_alignmask = 0,</div><div class='del'>-</div><div class='del'>-			.cra_name = "__aegis256",</div><div class='del'>-			.cra_driver_name = "__aegis256-aesni",</div><div class='del'>-</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-		}</div><div class='del'>-	}, {</div><div class='del'>-		.setkey = cryptd_aegis256_aesni_setkey,</div><div class='del'>-		.setauthsize = cryptd_aegis256_aesni_setauthsize,</div><div class='del'>-		.encrypt = cryptd_aegis256_aesni_encrypt,</div><div class='del'>-		.decrypt = cryptd_aegis256_aesni_decrypt,</div><div class='del'>-		.init = cryptd_aegis256_aesni_init_tfm,</div><div class='del'>-		.exit = cryptd_aegis256_aesni_exit_tfm,</div><div class='del'>-</div><div class='del'>-		.ivsize = AEGIS256_NONCE_SIZE,</div><div class='del'>-		.maxauthsize = AEGIS256_MAX_AUTH_SIZE,</div><div class='del'>-		.chunksize = AEGIS256_BLOCK_SIZE,</div><div class='del'>-</div><div class='del'>-		.base = {</div><div class='del'>-			.cra_flags = CRYPTO_ALG_ASYNC,</div><div class='del'>-			.cra_blocksize = 1,</div><div class='del'>-			.cra_ctxsize = sizeof(struct cryptd_aead *),</div><div class='del'>-			.cra_alignmask = 0,</div><div class='del'>-</div><div class='del'>-			.cra_priority = 400,</div><div class='del'>-</div><div class='del'>-			.cra_name = "aegis256",</div><div class='del'>-			.cra_driver_name = "aegis256-aesni",</div><div class='del'>-</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-		}</div><div class='add'>+static struct aead_alg crypto_aegis256_aesni_alg = {</div><div class='add'>+	.setkey = crypto_aegis256_aesni_setkey,</div><div class='add'>+	.setauthsize = crypto_aegis256_aesni_setauthsize,</div><div class='add'>+	.encrypt = crypto_aegis256_aesni_encrypt,</div><div class='add'>+	.decrypt = crypto_aegis256_aesni_decrypt,</div><div class='add'>+	.init = crypto_aegis256_aesni_init_tfm,</div><div class='add'>+	.exit = crypto_aegis256_aesni_exit_tfm,</div><div class='add'>+</div><div class='add'>+	.ivsize = AEGIS256_NONCE_SIZE,</div><div class='add'>+	.maxauthsize = AEGIS256_MAX_AUTH_SIZE,</div><div class='add'>+	.chunksize = AEGIS256_BLOCK_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_flags = CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize = 1,</div><div class='add'>+		.cra_ctxsize = sizeof(struct aegis_ctx) +</div><div class='add'>+			       __alignof__(struct aegis_ctx),</div><div class='add'>+		.cra_alignmask = 0,</div><div class='add'>+		.cra_priority = 400,</div><div class='add'>+</div><div class='add'>+		.cra_name = "__aegis256",</div><div class='add'>+		.cra_driver_name = "__aegis256-aesni",</div><div class='add'>+</div><div class='add'>+		.cra_module = THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct simd_aead_alg *simd_alg;</div><div class='add'>+</div><div class='ctx'> static int __init crypto_aegis256_aesni_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||</div><div class='hunk'>@@ -374,14 +278,13 @@ static int __init crypto_aegis256_aesni_module_init(void)</div><div class='ctx'> 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return crypto_register_aeads(crypto_aegis256_aesni_alg,</div><div class='del'>-				    ARRAY_SIZE(crypto_aegis256_aesni_alg));</div><div class='add'>+	return simd_register_aeads_compat(&amp;crypto_aegis256_aesni_alg, 1,</div><div class='add'>+					  &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto_aegis256_aesni_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_aeads(crypto_aegis256_aesni_alg,</div><div class='del'>-				ARRAY_SIZE(crypto_aegis256_aesni_alg));</div><div class='add'>+	simd_unregister_aeads(&amp;crypto_aegis256_aesni_alg, 1, &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_aegis256_aesni_module_init);</div><div class='head'>diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c<br/>index 1e3d2102033a..21c246799aa5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aesni-intel_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/aesni-intel_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/aesni-intel_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/aesni-intel_glue.c</a></div><div class='hunk'>@@ -25,14 +25,13 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/ctr.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='ctx'> #include &lt;crypto/gcm.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;asm/crypto/aes.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/simd.h&gt;</div><div class='hunk'>@@ -333,7 +332,7 @@ static int aes_set_key_common(struct crypto_tfm *tfm, void *raw_ctx,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		err = crypto_aes_expand_key(ctx, in_key, key_len);</div><div class='ctx'> 	else {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='hunk'>@@ -354,7 +353,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		crypto_aes_encrypt_x86(ctx, dst, src);</div><div class='ctx'> 	else {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='hunk'>@@ -367,7 +366,7 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		crypto_aes_decrypt_x86(ctx, dst, src);</div><div class='ctx'> 	else {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='hunk'>@@ -643,29 +642,6 @@ static int xts_decrypt(struct skcipher_request *req)</div><div class='ctx'> 				   aes_ctx(ctx-&gt;raw_crypt_ctx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rfc4106_init(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead("__driver-gcm-aes-aesni",</div><div class='del'>-				       CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rfc4106_exit(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> rfc4106_set_hash_subkey(u8 *hash_subkey, const u8 *key, unsigned int key_len)</div><div class='ctx'> {</div><div class='hunk'>@@ -710,15 +686,8 @@ static int common_rfc4106_set_key(struct crypto_aead *aead, const u8 *key,</div><div class='ctx'> 	       rfc4106_set_hash_subkey(ctx-&gt;hash_subkey, key, key_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gcmaes_wrapper_set_key(struct crypto_aead *parent, const u8 *key,</div><div class='del'>-				  unsigned int key_len)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(parent);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setkey(&amp;cryptd_tfm-&gt;base, key, key_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+/* This is the Integrity Check Value (aka the authentication tag) length and can</div><div class='add'>+ * be 8, 12 or 16 bytes long. */</div><div class='ctx'> static int common_rfc4106_set_authsize(struct crypto_aead *aead,</div><div class='ctx'> 				       unsigned int authsize)</div><div class='ctx'> {</div><div class='hunk'>@@ -734,17 +703,6 @@ static int common_rfc4106_set_authsize(struct crypto_aead *aead,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This is the Integrity Check Value (aka the authentication tag length and can</div><div class='del'>- * be 8, 12 or 16 bytes long. */</div><div class='del'>-static int gcmaes_wrapper_set_authsize(struct crypto_aead *parent,</div><div class='del'>-				       unsigned int authsize)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(parent);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setauthsize(&amp;cryptd_tfm-&gt;base, authsize);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int generic_gcmaes_set_authsize(struct crypto_aead *tfm,</div><div class='ctx'> 				       unsigned int authsize)</div><div class='ctx'> {</div><div class='hunk'>@@ -964,38 +922,6 @@ static int helper_rfc4106_decrypt(struct aead_request *req)</div><div class='ctx'> 	return gcmaes_decrypt(req, req-&gt;assoclen - 8, ctx-&gt;hash_subkey, iv,</div><div class='ctx'> 			      aes_ctx);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int gcmaes_wrapper_encrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(tfm);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	tfm = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		tfm = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, tfm);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_encrypt(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gcmaes_wrapper_decrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(tfm);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	tfm = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		tfm = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, tfm);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_decrypt(req);</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg aesni_algs[] = { {</div><div class='hunk'>@@ -1148,31 +1074,7 @@ static int generic_gcmaes_decrypt(struct aead_request *req)</div><div class='ctx'> 			      aes_ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int generic_gcmaes_init(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead("__driver-generic-gcm-aes-aesni",</div><div class='del'>-				       CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void generic_gcmaes_exit(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct aead_alg aesni_aead_algs[] = { {</div><div class='add'>+static struct aead_alg aesni_aeads[] = { {</div><div class='ctx'> 	.setkey			= common_rfc4106_set_key,</div><div class='ctx'> 	.setauthsize		= common_rfc4106_set_authsize,</div><div class='ctx'> 	.encrypt		= helper_rfc4106_encrypt,</div><div class='hunk'>@@ -1180,8 +1082,9 @@ static struct aead_alg aesni_aead_algs[] = { {</div><div class='ctx'> 	.ivsize			= GCM_RFC4106_IV_SIZE,</div><div class='ctx'> 	.maxauthsize		= 16,</div><div class='ctx'> 	.base = {</div><div class='del'>-		.cra_name		= "__gcm-aes-aesni",</div><div class='del'>-		.cra_driver_name	= "__driver-gcm-aes-aesni",</div><div class='add'>+		.cra_name		= "__rfc4106(gcm(aes))",</div><div class='add'>+		.cra_driver_name	= "__rfc4106-gcm-aesni",</div><div class='add'>+		.cra_priority		= 400,</div><div class='ctx'> 		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='ctx'> 		.cra_blocksize		= 1,</div><div class='ctx'> 		.cra_ctxsize		= sizeof(struct aesni_rfc4106_gcm_ctx),</div><div class='hunk'>@@ -1189,24 +1092,6 @@ static struct aead_alg aesni_aead_algs[] = { {</div><div class='ctx'> 		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> }, {</div><div class='del'>-	.init			= rfc4106_init,</div><div class='del'>-	.exit			= rfc4106_exit,</div><div class='del'>-	.setkey			= gcmaes_wrapper_set_key,</div><div class='del'>-	.setauthsize		= gcmaes_wrapper_set_authsize,</div><div class='del'>-	.encrypt		= gcmaes_wrapper_encrypt,</div><div class='del'>-	.decrypt		= gcmaes_wrapper_decrypt,</div><div class='del'>-	.ivsize			= GCM_RFC4106_IV_SIZE,</div><div class='del'>-	.maxauthsize		= 16,</div><div class='del'>-	.base = {</div><div class='del'>-		.cra_name		= "rfc4106(gcm(aes))",</div><div class='del'>-		.cra_driver_name	= "rfc4106-gcm-aesni",</div><div class='del'>-		.cra_priority		= 400,</div><div class='del'>-		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='del'>-		.cra_blocksize		= 1,</div><div class='del'>-		.cra_ctxsize		= sizeof(struct cryptd_aead *),</div><div class='del'>-		.cra_module		= THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='ctx'> 	.setkey			= generic_gcmaes_set_key,</div><div class='ctx'> 	.setauthsize		= generic_gcmaes_set_authsize,</div><div class='ctx'> 	.encrypt		= generic_gcmaes_encrypt,</div><div class='hunk'>@@ -1214,38 +1099,21 @@ static struct aead_alg aesni_aead_algs[] = { {</div><div class='ctx'> 	.ivsize			= GCM_AES_IV_SIZE,</div><div class='ctx'> 	.maxauthsize		= 16,</div><div class='ctx'> 	.base = {</div><div class='del'>-		.cra_name		= "__generic-gcm-aes-aesni",</div><div class='del'>-		.cra_driver_name	= "__driver-generic-gcm-aes-aesni",</div><div class='del'>-		.cra_priority		= 0,</div><div class='add'>+		.cra_name		= "__gcm(aes)",</div><div class='add'>+		.cra_driver_name	= "__generic-gcm-aesni",</div><div class='add'>+		.cra_priority		= 400,</div><div class='ctx'> 		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='ctx'> 		.cra_blocksize		= 1,</div><div class='ctx'> 		.cra_ctxsize		= sizeof(struct generic_gcmaes_ctx),</div><div class='ctx'> 		.cra_alignmask		= AESNI_ALIGN - 1,</div><div class='ctx'> 		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='del'>-}, {</div><div class='del'>-	.init			= generic_gcmaes_init,</div><div class='del'>-	.exit			= generic_gcmaes_exit,</div><div class='del'>-	.setkey			= gcmaes_wrapper_set_key,</div><div class='del'>-	.setauthsize		= gcmaes_wrapper_set_authsize,</div><div class='del'>-	.encrypt		= gcmaes_wrapper_encrypt,</div><div class='del'>-	.decrypt		= gcmaes_wrapper_decrypt,</div><div class='del'>-	.ivsize			= GCM_AES_IV_SIZE,</div><div class='del'>-	.maxauthsize		= 16,</div><div class='del'>-	.base = {</div><div class='del'>-		.cra_name		= "gcm(aes)",</div><div class='del'>-		.cra_driver_name	= "generic-gcm-aesni",</div><div class='del'>-		.cra_priority		= 400,</div><div class='del'>-		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='del'>-		.cra_blocksize		= 1,</div><div class='del'>-		.cra_ctxsize		= sizeof(struct cryptd_aead *),</div><div class='del'>-		.cra_module		= THIS_MODULE,</div><div class='del'>-	},</div><div class='ctx'> } };</div><div class='ctx'> #else</div><div class='del'>-static struct aead_alg aesni_aead_algs[0];</div><div class='add'>+static struct aead_alg aesni_aeads[0];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static struct simd_aead_alg *aesni_simd_aeads[ARRAY_SIZE(aesni_aeads)];</div><div class='ctx'> </div><div class='ctx'> static const struct x86_cpu_id aesni_cpu_id[] = {</div><div class='ctx'> 	X86_FEATURE_MATCH(X86_FEATURE_AES),</div><div class='hunk'>@@ -1253,23 +1121,9 @@ static const struct x86_cpu_id aesni_cpu_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(x86cpu, aesni_cpu_id);</div><div class='ctx'> </div><div class='del'>-static void aesni_free_simds(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(aesni_simd_skciphers) &amp;&amp;</div><div class='del'>-		    aesni_simd_skciphers[i]; i++)</div><div class='del'>-		simd_skcipher_free(aesni_simd_skciphers[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init aesni_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct simd_skcipher_alg *simd;</div><div class='del'>-	const char *basename;</div><div class='del'>-	const char *algname;</div><div class='del'>-	const char *drvname;</div><div class='ctx'> 	int err;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!x86_match_cpu(aesni_cpu_id))</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1304,36 +1158,22 @@ static int __init aesni_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_register_skciphers(aesni_skciphers,</div><div class='del'>-					ARRAY_SIZE(aesni_skciphers));</div><div class='add'>+	err = simd_register_skciphers_compat(aesni_skciphers,</div><div class='add'>+					     ARRAY_SIZE(aesni_skciphers),</div><div class='add'>+					     aesni_simd_skciphers);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unregister_algs;</div><div class='ctx'> </div><div class='del'>-	err = crypto_register_aeads(aesni_aead_algs,</div><div class='del'>-				    ARRAY_SIZE(aesni_aead_algs));</div><div class='add'>+	err = simd_register_aeads_compat(aesni_aeads, ARRAY_SIZE(aesni_aeads),</div><div class='add'>+					 aesni_simd_aeads);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unregister_skciphers;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(aesni_skciphers); i++) {</div><div class='del'>-		algname = aesni_skciphers[i].base.cra_name + 2;</div><div class='del'>-		drvname = aesni_skciphers[i].base.cra_driver_name + 2;</div><div class='del'>-		basename = aesni_skciphers[i].base.cra_driver_name;</div><div class='del'>-		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='del'>-		err = PTR_ERR(simd);</div><div class='del'>-		if (IS_ERR(simd))</div><div class='del'>-			goto unregister_simds;</div><div class='del'>-</div><div class='del'>-		aesni_simd_skciphers[i] = simd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-unregister_simds:</div><div class='del'>-	aesni_free_simds();</div><div class='del'>-	crypto_unregister_aeads(aesni_aead_algs, ARRAY_SIZE(aesni_aead_algs));</div><div class='ctx'> unregister_skciphers:</div><div class='del'>-	crypto_unregister_skciphers(aesni_skciphers,</div><div class='del'>-				    ARRAY_SIZE(aesni_skciphers));</div><div class='add'>+	simd_unregister_skciphers(aesni_skciphers, ARRAY_SIZE(aesni_skciphers),</div><div class='add'>+				  aesni_simd_skciphers);</div><div class='ctx'> unregister_algs:</div><div class='ctx'> 	crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1341,10 +1181,10 @@ unregister_algs:</div><div class='ctx'> </div><div class='ctx'> static void __exit aesni_exit(void)</div><div class='ctx'> {</div><div class='del'>-	aesni_free_simds();</div><div class='del'>-	crypto_unregister_aeads(aesni_aead_algs, ARRAY_SIZE(aesni_aead_algs));</div><div class='del'>-	crypto_unregister_skciphers(aesni_skciphers,</div><div class='del'>-				    ARRAY_SIZE(aesni_skciphers));</div><div class='add'>+	simd_unregister_aeads(aesni_aeads, ARRAY_SIZE(aesni_aeads),</div><div class='add'>+			      aesni_simd_aeads);</div><div class='add'>+	simd_unregister_skciphers(aesni_skciphers, ARRAY_SIZE(aesni_skciphers),</div><div class='add'>+				  aesni_simd_skciphers);</div><div class='ctx'> 	crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c<br/>index 45c1c4143176..4967ad620775 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/chacha_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/chacha_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/chacha_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/chacha_glue.c</a></div><div class='hunk'>@@ -12,10 +12,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/chacha.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.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='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CHACHA_STATE_ALIGN 16</div><div class='hunk'>@@ -170,7 +170,7 @@ static int chacha_simd(struct skcipher_request *req)</div><div class='ctx'> 	struct skcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !irq_fpu_usable())</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_chacha_crypt(req);</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='hunk'>@@ -193,7 +193,7 @@ static int xchacha_simd(struct skcipher_request *req)</div><div class='ctx'> 	u8 real_iv[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !irq_fpu_usable())</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA_BLOCK_SIZE || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_xchacha_crypt(req);</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='head'>diff --git a/arch/x86/crypto/crc32-pclmul_glue.c b/arch/x86/crypto/crc32-pclmul_glue.c<br/>index c8d9cdacbf10..cb4ab6645106 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/crc32-pclmul_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/crc32-pclmul_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/crc32-pclmul_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/crc32-pclmul_glue.c</a></div><div class='hunk'>@@ -32,10 +32,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeatures.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CHKSUM_BLOCK_SIZE	1</div><div class='ctx'> #define CHKSUM_DIGEST_SIZE	4</div><div class='hunk'>@@ -54,7 +55,7 @@ static u32 __attribute__((pure))</div><div class='ctx'> 	unsigned int iremainder;</div><div class='ctx'> 	unsigned int prealign;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; PCLMUL_MIN_LEN + SCALE_F_MASK || !irq_fpu_usable())</div><div class='add'>+	if (len &lt; PCLMUL_MIN_LEN + SCALE_F_MASK || !crypto_simd_usable())</div><div class='ctx'> 		return crc32_le(crc, p, len);</div><div class='ctx'> </div><div class='ctx'> 	if ((long)p &amp; SCALE_F_MASK) {</div><div class='head'>diff --git a/arch/x86/crypto/crc32c-intel_glue.c b/arch/x86/crypto/crc32c-intel_glue.c<br/>index 5773e1161072..a58fe217c856 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/crc32c-intel_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/crc32c-intel_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/crc32c-intel_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/crc32c-intel_glue.c</a></div><div class='hunk'>@@ -29,10 +29,11 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeatures.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='del'>-#include &lt;asm/fpu/internal.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CHKSUM_BLOCK_SIZE	1</div><div class='ctx'> #define CHKSUM_DIGEST_SIZE	4</div><div class='hunk'>@@ -177,7 +178,7 @@ static int crc32c_pcl_intel_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	 * use faster PCL version if datasize is large enough to</div><div class='ctx'> 	 * overcome kernel fpu state save/restore overhead</div><div class='ctx'> 	 */</div><div class='del'>-	if (len &gt;= CRC32C_PCL_BREAKEVEN &amp;&amp; irq_fpu_usable()) {</div><div class='add'>+	if (len &gt;= CRC32C_PCL_BREAKEVEN &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='ctx'> 		*crcp = crc_pcl(data, len, *crcp);</div><div class='ctx'> 		kernel_fpu_end();</div><div class='hunk'>@@ -189,7 +190,7 @@ static int crc32c_pcl_intel_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int __crc32c_pcl_intel_finup(u32 *crcp, const u8 *data, unsigned int len,</div><div class='ctx'> 				u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (len &gt;= CRC32C_PCL_BREAKEVEN &amp;&amp; irq_fpu_usable()) {</div><div class='add'>+	if (len &gt;= CRC32C_PCL_BREAKEVEN &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='ctx'> 		*(__le32 *)out = ~cpu_to_le32(crc_pcl(data, len, *crcp));</div><div class='ctx'> 		kernel_fpu_end();</div><div class='head'>diff --git a/arch/x86/crypto/crct10dif-pclmul_glue.c b/arch/x86/crypto/crct10dif-pclmul_glue.c<br/>index 0e785c0b2354..3c81e15b0873 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/crct10dif-pclmul_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/crct10dif-pclmul_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/crct10dif-pclmul_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/crct10dif-pclmul_glue.c</a></div><div class='hunk'>@@ -26,12 +26,13 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/crc-t10dif.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeatures.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage u16 crc_t10dif_pcl(u16 init_crc, const u8 *buf, size_t len);</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +54,7 @@ static int chksum_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (length &gt;= 16 &amp;&amp; irq_fpu_usable()) {</div><div class='add'>+	if (length &gt;= 16 &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='ctx'> 		ctx-&gt;crc = crc_t10dif_pcl(ctx-&gt;crc, data, length);</div><div class='ctx'> 		kernel_fpu_end();</div><div class='hunk'>@@ -70,15 +71,14 @@ static int chksum_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len,</div><div class='del'>-			u8 *out)</div><div class='add'>+static int __chksum_finup(__u16 crc, const u8 *data, unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (len &gt;= 16 &amp;&amp; irq_fpu_usable()) {</div><div class='add'>+	if (len &gt;= 16 &amp;&amp; crypto_simd_usable()) {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='del'>-		*(__u16 *)out = crc_t10dif_pcl(*crcp, data, len);</div><div class='add'>+		*(__u16 *)out = crc_t10dif_pcl(crc, data, len);</div><div class='ctx'> 		kernel_fpu_end();</div><div class='ctx'> 	} else</div><div class='del'>-		*(__u16 *)out = crc_t10dif_generic(*crcp, data, len);</div><div class='add'>+		*(__u16 *)out = crc_t10dif_generic(crc, data, len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -87,15 +87,13 @@ static int chksum_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	return __chksum_finup(&amp;ctx-&gt;crc, data, len, out);</div><div class='add'>+	return __chksum_finup(ctx-&gt;crc, data, len, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int chksum_digest(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			 unsigned int length, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return __chksum_finup(&amp;ctx-&gt;crc, data, length, out);</div><div class='add'>+	return __chksum_finup(0, data, length, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct shash_alg alg = {</div><div class='head'>diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c<br/>index 3582ae885ee1..e3f3e6fd9d65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/ghash-clmulni-intel_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/ghash-clmulni-intel_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/ghash-clmulni-intel_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/ghash-clmulni-intel_glue.c</a></div><div class='hunk'>@@ -19,8 +19,9 @@</div><div class='ctx'> #include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GHASH_BLOCK_SIZE	16</div><div class='ctx'> #define GHASH_DIGEST_SIZE	16</div><div class='hunk'>@@ -171,7 +172,6 @@ static int ghash_async_init(struct ahash_request *req)</div><div class='ctx'> 	struct crypto_shash *child = cryptd_ahash_child(cryptd_tfm);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = child;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> 	return crypto_shash_init(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +182,7 @@ static int ghash_async_update(struct ahash_request *req)</div><div class='ctx'> 	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);</div><div class='ctx'> 	struct cryptd_ahash *cryptd_tfm = ctx-&gt;cryptd_tfm;</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_ahash_queued(cryptd_tfm))) {</div><div class='ctx'> 		memcpy(cryptd_req, req, sizeof(*req));</div><div class='ctx'> 		ahash_request_set_tfm(cryptd_req, &amp;cryptd_tfm-&gt;base);</div><div class='hunk'>@@ -200,7 +200,7 @@ static int ghash_async_final(struct ahash_request *req)</div><div class='ctx'> 	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);</div><div class='ctx'> 	struct cryptd_ahash *cryptd_tfm = ctx-&gt;cryptd_tfm;</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_ahash_queued(cryptd_tfm))) {</div><div class='ctx'> 		memcpy(cryptd_req, req, sizeof(*req));</div><div class='ctx'> 		ahash_request_set_tfm(cryptd_req, &amp;cryptd_tfm-&gt;base);</div><div class='hunk'>@@ -241,7 +241,7 @@ static int ghash_async_digest(struct ahash_request *req)</div><div class='ctx'> 	struct ahash_request *cryptd_req = ahash_request_ctx(req);</div><div class='ctx'> 	struct cryptd_ahash *cryptd_tfm = ctx-&gt;cryptd_tfm;</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_ahash_queued(cryptd_tfm))) {</div><div class='ctx'> 		memcpy(cryptd_req, req, sizeof(*req));</div><div class='ctx'> 		ahash_request_set_tfm(cryptd_req, &amp;cryptd_tfm-&gt;base);</div><div class='hunk'>@@ -251,7 +251,6 @@ static int ghash_async_digest(struct ahash_request *req)</div><div class='ctx'> 		struct crypto_shash *child = cryptd_ahash_child(cryptd_tfm);</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;tfm = child;</div><div class='del'>-		desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> 		return shash_ahash_digest(req, desc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/crypto/morus1280-avx2-glue.c b/arch/x86/crypto/morus1280-avx2-glue.c<br/>index 6634907d6ccd..679627a2a824 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus1280-avx2-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus1280-avx2-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus1280-avx2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/morus1280-avx2-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/morus1280_glue.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='hunk'>@@ -35,7 +36,9 @@ asmlinkage void crypto_morus1280_avx2_dec_tail(void *state, const void *src,</div><div class='ctx'> asmlinkage void crypto_morus1280_avx2_final(void *state, void *tag_xor,</div><div class='ctx'> 					    u64 assoclen, u64 cryptlen);</div><div class='ctx'> </div><div class='del'>-MORUS1280_DECLARE_ALGS(avx2, "morus1280-avx2", 400);</div><div class='add'>+MORUS1280_DECLARE_ALG(avx2, "morus1280-avx2", 400);</div><div class='add'>+</div><div class='add'>+static struct simd_aead_alg *simd_alg;</div><div class='ctx'> </div><div class='ctx'> static int __init crypto_morus1280_avx2_module_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -44,14 +47,13 @@ static int __init crypto_morus1280_avx2_module_init(void)</div><div class='ctx'> 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return crypto_register_aeads(crypto_morus1280_avx2_algs,</div><div class='del'>-				     ARRAY_SIZE(crypto_morus1280_avx2_algs));</div><div class='add'>+	return simd_register_aeads_compat(&amp;crypto_morus1280_avx2_alg, 1,</div><div class='add'>+					  &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto_morus1280_avx2_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_aeads(crypto_morus1280_avx2_algs,</div><div class='del'>-				ARRAY_SIZE(crypto_morus1280_avx2_algs));</div><div class='add'>+	simd_unregister_aeads(&amp;crypto_morus1280_avx2_alg, 1, &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_morus1280_avx2_module_init);</div><div class='head'>diff --git a/arch/x86/crypto/morus1280-sse2-glue.c b/arch/x86/crypto/morus1280-sse2-glue.c<br/>index f40244eaf14d..c35c0638d0bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus1280-sse2-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus1280-sse2-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus1280-sse2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/morus1280-sse2-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/morus1280_glue.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='hunk'>@@ -35,7 +36,9 @@ asmlinkage void crypto_morus1280_sse2_dec_tail(void *state, const void *src,</div><div class='ctx'> asmlinkage void crypto_morus1280_sse2_final(void *state, void *tag_xor,</div><div class='ctx'> 					    u64 assoclen, u64 cryptlen);</div><div class='ctx'> </div><div class='del'>-MORUS1280_DECLARE_ALGS(sse2, "morus1280-sse2", 350);</div><div class='add'>+MORUS1280_DECLARE_ALG(sse2, "morus1280-sse2", 350);</div><div class='add'>+</div><div class='add'>+static struct simd_aead_alg *simd_alg;</div><div class='ctx'> </div><div class='ctx'> static int __init crypto_morus1280_sse2_module_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,14 +46,13 @@ static int __init crypto_morus1280_sse2_module_init(void)</div><div class='ctx'> 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return crypto_register_aeads(crypto_morus1280_sse2_algs,</div><div class='del'>-				     ARRAY_SIZE(crypto_morus1280_sse2_algs));</div><div class='add'>+	return simd_register_aeads_compat(&amp;crypto_morus1280_sse2_alg, 1,</div><div class='add'>+					  &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto_morus1280_sse2_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_aeads(crypto_morus1280_sse2_algs,</div><div class='del'>-				ARRAY_SIZE(crypto_morus1280_sse2_algs));</div><div class='add'>+	simd_unregister_aeads(&amp;crypto_morus1280_sse2_alg, 1, &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_morus1280_sse2_module_init);</div><div class='head'>diff --git a/arch/x86/crypto/morus1280_glue.c b/arch/x86/crypto/morus1280_glue.c<br/>index 7e600f8bcdad..30fc1bd98ec3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus1280_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus1280_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus1280_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/morus1280_glue.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/morus1280_glue.h&gt;</div><div class='hunk'>@@ -205,90 +204,6 @@ void crypto_morus1280_glue_init_ops(struct crypto_aead *aead,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_morus1280_glue_init_ops);</div><div class='ctx'> </div><div class='del'>-int cryptd_morus1280_glue_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='del'>-				 unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setkey(&amp;cryptd_tfm-&gt;base, key, keylen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_setkey);</div><div class='del'>-</div><div class='del'>-int cryptd_morus1280_glue_setauthsize(struct crypto_aead *aead,</div><div class='del'>-				      unsigned int authsize)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setauthsize(&amp;cryptd_tfm-&gt;base, authsize);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_setauthsize);</div><div class='del'>-</div><div class='del'>-int cryptd_morus1280_glue_encrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_encrypt(req);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_encrypt);</div><div class='del'>-</div><div class='del'>-int cryptd_morus1280_glue_decrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_decrypt(req);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_decrypt);</div><div class='del'>-</div><div class='del'>-int cryptd_morus1280_glue_init_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	const char *name = crypto_aead_alg(aead)-&gt;base.cra_driver_name;</div><div class='del'>-	char internal_name[CRYPTO_MAX_ALG_NAME];</div><div class='del'>-</div><div class='del'>-	if (snprintf(internal_name, CRYPTO_MAX_ALG_NAME, "__%s", name)</div><div class='del'>-			&gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return -ENAMETOOLONG;</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead(internal_name, CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_init_tfm);</div><div class='del'>-</div><div class='del'>-void cryptd_morus1280_glue_exit_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_exit_tfm);</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Ondrej Mosnacek &lt;omosnacek@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for x86 optimizations");</div><div class='head'>diff --git a/arch/x86/crypto/morus640-sse2-glue.c b/arch/x86/crypto/morus640-sse2-glue.c<br/>index 9afaf8f8565a..32da56b3bdad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus640-sse2-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus640-sse2-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus640-sse2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/morus640-sse2-glue.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/morus640_glue.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='hunk'>@@ -35,7 +36,9 @@ asmlinkage void crypto_morus640_sse2_dec_tail(void *state, const void *src,</div><div class='ctx'> asmlinkage void crypto_morus640_sse2_final(void *state, void *tag_xor,</div><div class='ctx'> 					   u64 assoclen, u64 cryptlen);</div><div class='ctx'> </div><div class='del'>-MORUS640_DECLARE_ALGS(sse2, "morus640-sse2", 400);</div><div class='add'>+MORUS640_DECLARE_ALG(sse2, "morus640-sse2", 400);</div><div class='add'>+</div><div class='add'>+static struct simd_aead_alg *simd_alg;</div><div class='ctx'> </div><div class='ctx'> static int __init crypto_morus640_sse2_module_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,14 +46,13 @@ static int __init crypto_morus640_sse2_module_init(void)</div><div class='ctx'> 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return crypto_register_aeads(crypto_morus640_sse2_algs,</div><div class='del'>-				     ARRAY_SIZE(crypto_morus640_sse2_algs));</div><div class='add'>+	return simd_register_aeads_compat(&amp;crypto_morus640_sse2_alg, 1,</div><div class='add'>+					  &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto_morus640_sse2_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_aeads(crypto_morus640_sse2_algs,</div><div class='del'>-				ARRAY_SIZE(crypto_morus640_sse2_algs));</div><div class='add'>+	simd_unregister_aeads(&amp;crypto_morus640_sse2_alg, 1, &amp;simd_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_morus640_sse2_module_init);</div><div class='head'>diff --git a/arch/x86/crypto/morus640_glue.c b/arch/x86/crypto/morus640_glue.c<br/>index cb3a81732016..1dea33d84426 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus640_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/morus640_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/morus640_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/morus640_glue.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/morus640_glue.h&gt;</div><div class='hunk'>@@ -200,90 +199,6 @@ void crypto_morus640_glue_init_ops(struct crypto_aead *aead,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_morus640_glue_init_ops);</div><div class='ctx'> </div><div class='del'>-int cryptd_morus640_glue_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='del'>-				unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setkey(&amp;cryptd_tfm-&gt;base, key, keylen);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus640_glue_setkey);</div><div class='del'>-</div><div class='del'>-int cryptd_morus640_glue_setauthsize(struct crypto_aead *aead,</div><div class='del'>-				     unsigned int authsize)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	return crypto_aead_setauthsize(&amp;cryptd_tfm-&gt;base, authsize);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus640_glue_setauthsize);</div><div class='del'>-</div><div class='del'>-int cryptd_morus640_glue_encrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_encrypt(req);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus640_glue_encrypt);</div><div class='del'>-</div><div class='del'>-int cryptd_morus640_glue_decrypt(struct aead_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct cryptd_aead *cryptd_tfm = *ctx;</div><div class='del'>-</div><div class='del'>-	aead = &amp;cryptd_tfm-&gt;base;</div><div class='del'>-	if (irq_fpu_usable() &amp;&amp; (!in_atomic() ||</div><div class='del'>-				 !cryptd_aead_queued(cryptd_tfm)))</div><div class='del'>-		aead = cryptd_aead_child(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, aead);</div><div class='del'>-</div><div class='del'>-	return crypto_aead_decrypt(req);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus640_glue_decrypt);</div><div class='del'>-</div><div class='del'>-int cryptd_morus640_glue_init_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead *cryptd_tfm;</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-	const char *name = crypto_aead_alg(aead)-&gt;base.cra_driver_name;</div><div class='del'>-	char internal_name[CRYPTO_MAX_ALG_NAME];</div><div class='del'>-</div><div class='del'>-	if (snprintf(internal_name, CRYPTO_MAX_ALG_NAME, "__%s", name)</div><div class='del'>-			&gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return -ENAMETOOLONG;</div><div class='del'>-</div><div class='del'>-	cryptd_tfm = cryptd_alloc_aead(internal_name, CRYPTO_ALG_INTERNAL,</div><div class='del'>-				       CRYPTO_ALG_INTERNAL);</div><div class='del'>-	if (IS_ERR(cryptd_tfm))</div><div class='del'>-		return PTR_ERR(cryptd_tfm);</div><div class='del'>-</div><div class='del'>-	*ctx = cryptd_tfm;</div><div class='del'>-	crypto_aead_set_reqsize(aead, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus640_glue_init_tfm);</div><div class='del'>-</div><div class='del'>-void cryptd_morus640_glue_exit_tfm(struct crypto_aead *aead)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_aead **ctx = crypto_aead_ctx(aead);</div><div class='del'>-</div><div class='del'>-	cryptd_free_aead(*ctx);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_morus640_glue_exit_tfm);</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Ondrej Mosnacek &lt;omosnacek@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for x86 optimizations");</div><div class='head'>diff --git a/arch/x86/crypto/nhpoly1305-avx2-glue.c b/arch/x86/crypto/nhpoly1305-avx2-glue.c<br/>index 20d815ea4b6a..f7567cbd35b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/nhpoly1305-avx2-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/nhpoly1305-avx2-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/nhpoly1305-avx2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/nhpoly1305-avx2-glue.c</a></div><div class='hunk'>@@ -7,9 +7,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/nhpoly1305.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void nh_avx2(const u32 *key, const u8 *message, size_t message_len,</div><div class='ctx'> 			u8 hash[NH_HASH_BYTES]);</div><div class='hunk'>@@ -24,7 +25,7 @@ static void _nh_avx2(const u32 *key, const u8 *message, size_t message_len,</div><div class='ctx'> static int nhpoly1305_avx2_update(struct shash_desc *desc,</div><div class='ctx'> 				  const u8 *src, unsigned int srclen)</div><div class='ctx'> {</div><div class='del'>-	if (srclen &lt; 64 || !irq_fpu_usable())</div><div class='add'>+	if (srclen &lt; 64 || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_nhpoly1305_update(desc, src, srclen);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='head'>diff --git a/arch/x86/crypto/nhpoly1305-sse2-glue.c b/arch/x86/crypto/nhpoly1305-sse2-glue.c<br/>index ed68d164ce14..a661ede3b5cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/nhpoly1305-sse2-glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/nhpoly1305-sse2-glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/nhpoly1305-sse2-glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/nhpoly1305-sse2-glue.c</a></div><div class='hunk'>@@ -7,9 +7,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/nhpoly1305.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void nh_sse2(const u32 *key, const u8 *message, size_t message_len,</div><div class='ctx'> 			u8 hash[NH_HASH_BYTES]);</div><div class='hunk'>@@ -24,7 +25,7 @@ static void _nh_sse2(const u32 *key, const u8 *message, size_t message_len,</div><div class='ctx'> static int nhpoly1305_sse2_update(struct shash_desc *desc,</div><div class='ctx'> 				  const u8 *src, unsigned int srclen)</div><div class='ctx'> {</div><div class='del'>-	if (srclen &lt; 64 || !irq_fpu_usable())</div><div class='add'>+	if (srclen &lt; 64 || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_nhpoly1305_update(desc, src, srclen);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='head'>diff --git a/arch/x86/crypto/poly1305-avx2-x86_64.S b/arch/x86/crypto/poly1305-avx2-x86_64.S<br/>index 3b6e70d085da..8457cdd47f75 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/poly1305-avx2-x86_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/poly1305-avx2-x86_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/poly1305-avx2-x86_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/poly1305-avx2-x86_64.S</a></div><div class='hunk'>@@ -323,6 +323,12 @@ ENTRY(poly1305_4block_avx2)</div><div class='ctx'> 	vpaddq		t2,t1,t1</div><div class='ctx'> 	vmovq		t1x,d4</div><div class='ctx'> </div><div class='add'>+	# Now do a partial reduction mod (2^130)-5, carrying h0 -&gt; h1 -&gt; h2 -&gt;</div><div class='add'>+	# h3 -&gt; h4 -&gt; h0 -&gt; h1 to get h0,h2,h3,h4 &lt; 2^26 and h1 &lt; 2^26 + a small</div><div class='add'>+	# amount.  Careful: we must not assume the carry bits 'd0 &gt;&gt; 26',</div><div class='add'>+	# 'd1 &gt;&gt; 26', 'd2 &gt;&gt; 26', 'd3 &gt;&gt; 26', and '(d4 &gt;&gt; 26) * 5' fit in 32-bit</div><div class='add'>+	# integers.  It's true in a single-block implementation, but not here.</div><div class='add'>+</div><div class='ctx'> 	# d1 += d0 &gt;&gt; 26</div><div class='ctx'> 	mov		d0,%rax</div><div class='ctx'> 	shr		$26,%rax</div><div class='hunk'>@@ -361,16 +367,16 @@ ENTRY(poly1305_4block_avx2)</div><div class='ctx'> 	# h0 += (d4 &gt;&gt; 26) * 5</div><div class='ctx'> 	mov		d4,%rax</div><div class='ctx'> 	shr		$26,%rax</div><div class='del'>-	lea		(%eax,%eax,4),%eax</div><div class='del'>-	add		%eax,%ebx</div><div class='add'>+	lea		(%rax,%rax,4),%rax</div><div class='add'>+	add		%rax,%rbx</div><div class='ctx'> 	# h4 = d4 &amp; 0x3ffffff</div><div class='ctx'> 	mov		d4,%rax</div><div class='ctx'> 	and		$0x3ffffff,%eax</div><div class='ctx'> 	mov		%eax,h4</div><div class='ctx'> </div><div class='ctx'> 	# h1 += h0 &gt;&gt; 26</div><div class='del'>-	mov		%ebx,%eax</div><div class='del'>-	shr		$26,%eax</div><div class='add'>+	mov		%rbx,%rax</div><div class='add'>+	shr		$26,%rax</div><div class='ctx'> 	add		%eax,h1</div><div class='ctx'> 	# h0 = h0 &amp; 0x3ffffff</div><div class='ctx'> 	andl		$0x3ffffff,%ebx</div><div class='head'>diff --git a/arch/x86/crypto/poly1305-sse2-x86_64.S b/arch/x86/crypto/poly1305-sse2-x86_64.S<br/>index e6add74d78a5..6f0be7a86964 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/poly1305-sse2-x86_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/poly1305-sse2-x86_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/poly1305-sse2-x86_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/poly1305-sse2-x86_64.S</a></div><div class='hunk'>@@ -253,16 +253,16 @@ ENTRY(poly1305_block_sse2)</div><div class='ctx'> 	# h0 += (d4 &gt;&gt; 26) * 5</div><div class='ctx'> 	mov		d4,%rax</div><div class='ctx'> 	shr		$26,%rax</div><div class='del'>-	lea		(%eax,%eax,4),%eax</div><div class='del'>-	add		%eax,%ebx</div><div class='add'>+	lea		(%rax,%rax,4),%rax</div><div class='add'>+	add		%rax,%rbx</div><div class='ctx'> 	# h4 = d4 &amp; 0x3ffffff</div><div class='ctx'> 	mov		d4,%rax</div><div class='ctx'> 	and		$0x3ffffff,%eax</div><div class='ctx'> 	mov		%eax,h4</div><div class='ctx'> </div><div class='ctx'> 	# h1 += h0 &gt;&gt; 26</div><div class='del'>-	mov		%ebx,%eax</div><div class='del'>-	shr		$26,%eax</div><div class='add'>+	mov		%rbx,%rax</div><div class='add'>+	shr		$26,%rax</div><div class='ctx'> 	add		%eax,h1</div><div class='ctx'> 	# h0 = h0 &amp; 0x3ffffff</div><div class='ctx'> 	andl		$0x3ffffff,%ebx</div><div class='hunk'>@@ -524,6 +524,12 @@ ENTRY(poly1305_2block_sse2)</div><div class='ctx'> 	paddq		t2,t1</div><div class='ctx'> 	movq		t1,d4</div><div class='ctx'> </div><div class='add'>+	# Now do a partial reduction mod (2^130)-5, carrying h0 -&gt; h1 -&gt; h2 -&gt;</div><div class='add'>+	# h3 -&gt; h4 -&gt; h0 -&gt; h1 to get h0,h2,h3,h4 &lt; 2^26 and h1 &lt; 2^26 + a small</div><div class='add'>+	# amount.  Careful: we must not assume the carry bits 'd0 &gt;&gt; 26',</div><div class='add'>+	# 'd1 &gt;&gt; 26', 'd2 &gt;&gt; 26', 'd3 &gt;&gt; 26', and '(d4 &gt;&gt; 26) * 5' fit in 32-bit</div><div class='add'>+	# integers.  It's true in a single-block implementation, but not here.</div><div class='add'>+</div><div class='ctx'> 	# d1 += d0 &gt;&gt; 26</div><div class='ctx'> 	mov		d0,%rax</div><div class='ctx'> 	shr		$26,%rax</div><div class='hunk'>@@ -562,16 +568,16 @@ ENTRY(poly1305_2block_sse2)</div><div class='ctx'> 	# h0 += (d4 &gt;&gt; 26) * 5</div><div class='ctx'> 	mov		d4,%rax</div><div class='ctx'> 	shr		$26,%rax</div><div class='del'>-	lea		(%eax,%eax,4),%eax</div><div class='del'>-	add		%eax,%ebx</div><div class='add'>+	lea		(%rax,%rax,4),%rax</div><div class='add'>+	add		%rax,%rbx</div><div class='ctx'> 	# h4 = d4 &amp; 0x3ffffff</div><div class='ctx'> 	mov		d4,%rax</div><div class='ctx'> 	and		$0x3ffffff,%eax</div><div class='ctx'> 	mov		%eax,h4</div><div class='ctx'> </div><div class='ctx'> 	# h1 += h0 &gt;&gt; 26</div><div class='del'>-	mov		%ebx,%eax</div><div class='del'>-	shr		$26,%eax</div><div class='add'>+	mov		%rbx,%rax</div><div class='add'>+	shr		$26,%rax</div><div class='ctx'> 	add		%eax,h1</div><div class='ctx'> 	# h0 = h0 &amp; 0x3ffffff</div><div class='ctx'> 	andl		$0x3ffffff,%ebx</div><div class='head'>diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c<br/>index 88cc01506c84..6eb65b237b3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/poly1305_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/poly1305_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/poly1305_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/poly1305_glue.c</a></div><div class='hunk'>@@ -11,11 +11,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/poly1305.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.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='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct poly1305_simd_desc_ctx {</div><div class='hunk'>@@ -126,7 +126,7 @@ static int poly1305_simd_update(struct shash_desc *desc,</div><div class='ctx'> 	unsigned int bytes;</div><div class='ctx'> </div><div class='ctx'> 	/* kernel_fpu_begin/end is costly, use fallback for small updates */</div><div class='del'>-	if (srclen &lt;= 288 || !may_use_simd())</div><div class='add'>+	if (srclen &lt;= 288 || !crypto_simd_usable())</div><div class='ctx'> 		return crypto_poly1305_update(desc, src, srclen);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='head'>diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c<br/>index 7391c7de72c7..42f177afc33a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/sha1_ssse3_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/sha1_ssse3_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/sha1_ssse3_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/sha1_ssse3_glue.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -29,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha1_base.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef void (sha1_transform_fn)(u32 *digest, const char *data,</div><div class='ctx'> 				unsigned int rounds);</div><div class='hunk'>@@ -39,7 +40,7 @@ static int sha1_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count % SHA1_BLOCK_SIZE) + len &lt; SHA1_BLOCK_SIZE)</div><div class='ctx'> 		return crypto_sha1_update(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +58,7 @@ static int sha1_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha1_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 		      unsigned int len, u8 *out, sha1_transform_fn *sha1_xform)</div><div class='ctx'> {</div><div class='del'>-	if (!irq_fpu_usable())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha1_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='head'>diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c<br/>index 773a873d2b28..73867da3cbee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/sha256_ssse3_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/sha256_ssse3_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/sha256_ssse3_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/sha256_ssse3_glue.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -37,8 +38,8 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha256_base.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void sha256_transform_ssse3(u32 *digest, const char *data,</div><div class='ctx'> 				       u64 rounds);</div><div class='hunk'>@@ -49,7 +50,7 @@ static int sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count % SHA256_BLOCK_SIZE) + len &lt; SHA256_BLOCK_SIZE)</div><div class='ctx'> 		return crypto_sha256_update(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +68,7 @@ static int sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha256_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	      unsigned int len, u8 *out, sha256_transform_fn *sha256_xform)</div><div class='ctx'> {</div><div class='del'>-	if (!irq_fpu_usable())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha256_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='head'>diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c<br/>index f1b811b60ba6..458356a3f124 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/sha512_ssse3_glue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/crypto/sha512_ssse3_glue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/crypto/sha512_ssse3_glue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/crypto/sha512_ssse3_glue.c</a></div><div class='hunk'>@@ -28,16 +28,16 @@</div><div class='ctx'> #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/cryptohash.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='ctx'> #include &lt;crypto/sha512_base.h&gt;</div><div class='del'>-#include &lt;asm/fpu/api.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void sha512_transform_ssse3(u64 *digest, const char *data,</div><div class='ctx'> 				       u64 rounds);</div><div class='hunk'>@@ -49,7 +49,7 @@ static int sha512_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (!irq_fpu_usable() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (sctx-&gt;count[0] % SHA512_BLOCK_SIZE) + len &lt; SHA512_BLOCK_SIZE)</div><div class='ctx'> 		return crypto_sha512_update(desc, data, len);</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +67,7 @@ static int sha512_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int sha512_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	      unsigned int len, u8 *out, sha512_transform_fn *sha512_xform)</div><div class='ctx'> {</div><div class='del'>-	if (!irq_fpu_usable())</div><div class='add'>+	if (!crypto_simd_usable())</div><div class='ctx'> 		return crypto_sha512_finup(desc, data, len, out);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='head'>diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c<br/>index 7bc105f47d21..51beb8d29123 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/common.c</a></div><div class='hunk'>@@ -25,12 +25,13 @@</div><div class='ctx'> #include &lt;linux/uprobes.h&gt;</div><div class='ctx'> #include &lt;linux/livepatch.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/syscalls.h&gt;</div><div class='hunk'>@@ -196,6 +197,13 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(cached_flags &amp; EXIT_TO_USERMODE_LOOP_FLAGS))</div><div class='ctx'> 		exit_to_usermode_loop(regs, cached_flags);</div><div class='ctx'> </div><div class='add'>+	/* Reload ti-&gt;flags; we may have rescheduled above. */</div><div class='add'>+	cached_flags = READ_ONCE(ti-&gt;flags);</div><div class='add'>+</div><div class='add'>+	fpregs_assert_state_consistent();</div><div class='add'>+	if (unlikely(cached_flags &amp; _TIF_NEED_FPU_LOAD))</div><div class='add'>+		switch_fpu_return();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Compat syscalls set TS_COMPAT.  Make sure we clear it before</div><div class='head'>diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S<br/>index d309f30cf7af..7b23431be5cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/entry_32.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/entry_32.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/entry_32.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/entry_32.S</a></div><div class='hunk'>@@ -650,6 +650,7 @@ ENTRY(__switch_to_asm)</div><div class='ctx'> 	pushl	%ebx</div><div class='ctx'> 	pushl	%edi</div><div class='ctx'> 	pushl	%esi</div><div class='add'>+	pushfl</div><div class='ctx'> </div><div class='ctx'> 	/* switch stack */</div><div class='ctx'> 	movl	%esp, TASK_threadsp(%eax)</div><div class='hunk'>@@ -672,6 +673,7 @@ ENTRY(__switch_to_asm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* restore callee-saved registers */</div><div class='add'>+	popfl</div><div class='ctx'> 	popl	%esi</div><div class='ctx'> 	popl	%edi</div><div class='ctx'> 	popl	%ebx</div><div class='hunk'>@@ -766,13 +768,12 @@ END(ret_from_exception)</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> ENTRY(resume_kernel)</div><div class='ctx'> 	DISABLE_INTERRUPTS(CLBR_ANY)</div><div class='del'>-.Lneed_resched:</div><div class='ctx'> 	cmpl	$0, PER_CPU_VAR(__preempt_count)</div><div class='ctx'> 	jnz	restore_all_kernel</div><div class='ctx'> 	testl	$X86_EFLAGS_IF, PT_EFLAGS(%esp)	# interrupts off (exception path) ?</div><div class='ctx'> 	jz	restore_all_kernel</div><div class='ctx'> 	call	preempt_schedule_irq</div><div class='del'>-	jmp	.Lneed_resched</div><div class='add'>+	jmp	restore_all_kernel</div><div class='ctx'> END(resume_kernel)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S<br/>index 1f0efdb7b629..20e45d9b4e15 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/entry_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/entry_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/entry_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/entry_64.S</a></div><div class='hunk'>@@ -298,7 +298,7 @@ ENTRY(__switch_to_asm)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_STACKPROTECTOR</div><div class='ctx'> 	movq	TASK_stack_canary(%rsi), %rbx</div><div class='del'>-	movq	%rbx, PER_CPU_VAR(irq_stack_union)+stack_canary_offset</div><div class='add'>+	movq	%rbx, PER_CPU_VAR(fixed_percpu_data) + stack_canary_offset</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RETPOLINE</div><div class='hunk'>@@ -430,8 +430,8 @@ END(irq_entries_start)</div><div class='ctx'> 	 * it before we actually move ourselves to the IRQ stack.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	movq	\old_rsp, PER_CPU_VAR(irq_stack_union + IRQ_STACK_SIZE - 8)</div><div class='del'>-	movq	PER_CPU_VAR(irq_stack_ptr), %rsp</div><div class='add'>+	movq	\old_rsp, PER_CPU_VAR(irq_stack_backing_store + IRQ_STACK_SIZE - 8)</div><div class='add'>+	movq	PER_CPU_VAR(hardirq_stack_ptr), %rsp</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_ENTRY</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -645,10 +645,9 @@ retint_kernel:</div><div class='ctx'> 	/* Check if we need preemption */</div><div class='ctx'> 	btl	$9, EFLAGS(%rsp)		/* were interrupts off? */</div><div class='ctx'> 	jnc	1f</div><div class='del'>-0:	cmpl	$0, PER_CPU_VAR(__preempt_count)</div><div class='add'>+	cmpl	$0, PER_CPU_VAR(__preempt_count)</div><div class='ctx'> 	jnz	1f</div><div class='ctx'> 	call	preempt_schedule_irq</div><div class='del'>-	jmp	0b</div><div class='ctx'> 1:</div><div class='ctx'> #endif</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -841,7 +840,7 @@ apicinterrupt IRQ_WORK_VECTOR			irq_work_interrupt		smp_irq_work_interrupt</div><div class='ctx'> /*</div><div class='ctx'>  * Exception entry points.</div><div class='ctx'>  */</div><div class='del'>-#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss_rw) + (TSS_ist + ((x) - 1) * 8)</div><div class='add'>+#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss_rw) + (TSS_ist + (x) * 8)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * idtentry - Generate an IDT entry stub</div><div class='hunk'>@@ -879,7 +878,7 @@ apicinterrupt IRQ_WORK_VECTOR			irq_work_interrupt		smp_irq_work_interrupt</div><div class='ctx'>  * @paranoid == 2 is special: the stub will never switch stacks.  This is for</div><div class='ctx'>  * #DF: if the thread stack is somehow unusable, we'll still get a useful OOPS.</div><div class='ctx'>  */</div><div class='del'>-.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1</div><div class='add'>+.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 ist_offset=0</div><div class='ctx'> ENTRY(\sym)</div><div class='ctx'> 	UNWIND_HINT_IRET_REGS offset=\has_error_code*8</div><div class='ctx'> </div><div class='hunk'>@@ -925,13 +924,13 @@ ENTRY(\sym)</div><div class='ctx'> 	.endif</div><div class='ctx'> </div><div class='ctx'> 	.if \shift_ist != -1</div><div class='del'>-	subq	$EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)</div><div class='add'>+	subq	$\ist_offset, CPU_TSS_IST(\shift_ist)</div><div class='ctx'> 	.endif</div><div class='ctx'> </div><div class='ctx'> 	call	\do_sym</div><div class='ctx'> </div><div class='ctx'> 	.if \shift_ist != -1</div><div class='del'>-	addq	$EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)</div><div class='add'>+	addq	$\ist_offset, CPU_TSS_IST(\shift_ist)</div><div class='ctx'> 	.endif</div><div class='ctx'> </div><div class='ctx'> 	/* these procedures expect "no swapgs" flag in ebx */</div><div class='hunk'>@@ -1129,7 +1128,7 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \</div><div class='ctx'> 	hv_stimer0_callback_vector hv_stimer0_vector_handler</div><div class='ctx'> #endif /* CONFIG_HYPERV */</div><div class='ctx'> </div><div class='del'>-idtentry debug			do_debug		has_error_code=0	paranoid=1 shift_ist=DEBUG_STACK</div><div class='add'>+idtentry debug			do_debug		has_error_code=0	paranoid=1 shift_ist=IST_INDEX_DB ist_offset=DB_STACK_OFFSET</div><div class='ctx'> idtentry int3			do_int3			has_error_code=0</div><div class='ctx'> idtentry stack_segment		do_stack_segment	has_error_code=1</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl<br/>index 1f9607ed087c..4cd5f982b1e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/syscalls/syscall_32.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/syscalls/syscall_32.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/syscalls/syscall_32.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/syscalls/syscall_32.tbl</a></div><div class='hunk'>@@ -398,7 +398,12 @@</div><div class='ctx'> 384	i386	arch_prctl		sys_arch_prctl			__ia32_compat_sys_arch_prctl</div><div class='ctx'> 385	i386	io_pgetevents		sys_io_pgetevents_time32	__ia32_compat_sys_io_pgetevents</div><div class='ctx'> 386	i386	rseq			sys_rseq			__ia32_sys_rseq</div><div class='del'>-# don't use numbers 387 through 392, add new calls at the end</div><div class='add'>+387	i386	open_tree		sys_open_tree			__ia32_sys_open_tree</div><div class='add'>+388	i386	move_mount		sys_move_mount			__ia32_sys_move_mount</div><div class='add'>+389	i386	fsopen			sys_fsopen			__ia32_sys_fsopen</div><div class='add'>+390	i386	fsconfig		sys_fsconfig			__ia32_sys_fsconfig</div><div class='add'>+391	i386	fsmount			sys_fsmount			__ia32_sys_fsmount</div><div class='add'>+392	i386	fspick			sys_fspick			__ia32_sys_fspick</div><div class='ctx'> 393	i386	semget			sys_semget    			__ia32_sys_semget</div><div class='ctx'> 394	i386	semctl			sys_semctl    			__ia32_compat_sys_semctl</div><div class='ctx'> 395	i386	shmget			sys_shmget    			__ia32_sys_shmget</div><div class='head'>diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl<br/>index 92ee0b4378d4..64ca0d06259a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/syscalls/syscall_64.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/syscalls/syscall_64.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/syscalls/syscall_64.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/syscalls/syscall_64.tbl</a></div><div class='hunk'>@@ -343,6 +343,12 @@</div><div class='ctx'> 332	common	statx			__x64_sys_statx</div><div class='ctx'> 333	common	io_pgetevents		__x64_sys_io_pgetevents</div><div class='ctx'> 334	common	rseq			__x64_sys_rseq</div><div class='add'>+335	common	open_tree		__x64_sys_open_tree</div><div class='add'>+336	common	move_mount		__x64_sys_move_mount</div><div class='add'>+337	common	fsopen			__x64_sys_fsopen</div><div class='add'>+338	common	fsconfig		__x64_sys_fsconfig</div><div class='add'>+339	common	fsmount			__x64_sys_fsmount</div><div class='add'>+340	common	fspick			__x64_sys_fspick</div><div class='ctx'> # don't use numbers 387 through 423, add new calls after the last</div><div class='ctx'> # 'common' entry</div><div class='ctx'> 424	common	pidfd_send_signal	__x64_sys_pidfd_send_signal</div><div class='head'>diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile<br/>index 5bfe2243a08f..42fe42e82baf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/vdso/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/vdso/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/vdso/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/vdso/Makefile</a></div><div class='hunk'>@@ -116,7 +116,7 @@ $(obj)/%-x32.o: $(obj)/%.o FORCE</div><div class='ctx'> targets += vdsox32.lds $(vobjx32s-y)</div><div class='ctx'> </div><div class='ctx'> $(obj)/%.so: OBJCOPYFLAGS := -S</div><div class='del'>-$(obj)/%.so: $(obj)/%.so.dbg</div><div class='add'>+$(obj)/%.so: $(obj)/%.so.dbg FORCE</div><div class='ctx'> 	$(call if_changed,objcopy)</div><div class='ctx'> </div><div class='ctx'> $(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE</div><div class='head'>diff --git a/arch/x86/entry/vdso/vclock_gettime.c b/arch/x86/entry/vdso/vclock_gettime.c<br/>index 007b3fe9d727..98c7d12b945c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/vdso/vclock_gettime.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/vdso/vclock_gettime.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/vdso/vclock_gettime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/vdso/vclock_gettime.c</a></div><div class='hunk'>@@ -29,12 +29,12 @@ extern int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz);</div><div class='ctx'> extern time_t __vdso_time(time_t *t);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PARAVIRT_CLOCK</div><div class='del'>-extern u8 pvclock_page</div><div class='add'>+extern u8 pvclock_page[PAGE_SIZE]</div><div class='ctx'> 	__attribute__((visibility("hidden")));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HYPERV_TSCPAGE</div><div class='del'>-extern u8 hvclock_page</div><div class='add'>+extern u8 hvclock_page[PAGE_SIZE]</div><div class='ctx'> 	__attribute__((visibility("hidden")));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h<br/>index fa847a620f40..a20b134de2a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/vdso/vdso2c.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/entry/vdso/vdso2c.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/entry/vdso/vdso2c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/entry/vdso/vdso2c.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> static void BITSFUNC(go)(void *raw_addr, size_t raw_len,</div><div class='ctx'> 			 void *stripped_addr, size_t stripped_len,</div><div class='del'>-			 FILE *outfile, const char *name)</div><div class='add'>+			 FILE *outfile, const char *image_name)</div><div class='ctx'> {</div><div class='ctx'> 	int found_load = 0;</div><div class='ctx'> 	unsigned long load_size = -1;  /* Work around bogus warning */</div><div class='hunk'>@@ -93,11 +93,12 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,</div><div class='ctx'> 		int k;</div><div class='ctx'> 		ELF(Sym) *sym = raw_addr + GET_LE(&amp;symtab_hdr-&gt;sh_offset) +</div><div class='ctx'> 			GET_LE(&amp;symtab_hdr-&gt;sh_entsize) * i;</div><div class='del'>-		const char *name = raw_addr + GET_LE(&amp;strtab_hdr-&gt;sh_offset) +</div><div class='del'>-			GET_LE(&amp;sym-&gt;st_name);</div><div class='add'>+		const char *sym_name = raw_addr +</div><div class='add'>+				       GET_LE(&amp;strtab_hdr-&gt;sh_offset) +</div><div class='add'>+				       GET_LE(&amp;sym-&gt;st_name);</div><div class='ctx'> </div><div class='ctx'> 		for (k = 0; k &lt; NSYMS; k++) {</div><div class='del'>-			if (!strcmp(name, required_syms[k].name)) {</div><div class='add'>+			if (!strcmp(sym_name, required_syms[k].name)) {</div><div class='ctx'> 				if (syms[k]) {</div><div class='ctx'> 					fail("duplicate symbol %s\n",</div><div class='ctx'> 					     required_syms[k].name);</div><div class='hunk'>@@ -134,7 +135,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,</div><div class='ctx'> 	if (syms[sym_vvar_start] % 4096)</div><div class='ctx'> 		fail("vvar_begin must be a multiple of 4096\n");</div><div class='ctx'> </div><div class='del'>-	if (!name) {</div><div class='add'>+	if (!image_name) {</div><div class='ctx'> 		fwrite(stripped_addr, stripped_len, 1, outfile);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -157,7 +158,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,</div><div class='ctx'> 	}</div><div class='ctx'> 	fprintf(outfile, "\n};\n\n");</div><div class='ctx'> </div><div class='del'>-	fprintf(outfile, "const struct vdso_image %s = {\n", name);</div><div class='add'>+	fprintf(outfile, "const struct vdso_image %s = {\n", image_name);</div><div class='ctx'> 	fprintf(outfile, "\t.data = raw_data,\n");</div><div class='ctx'> 	fprintf(outfile, "\t.size = %lu,\n", mapping_size);</div><div class='ctx'> 	if (alt_sec) {</div><div class='head'>diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c<br/>index 7d2d7c801dba..f15441b07dad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/amd/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/amd/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/amd/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/amd/core.c</a></div><div class='hunk'>@@ -3,10 +3,14 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../perf_event.h"</div><div class='ctx'> </div><div class='add'>+static DEFINE_PER_CPU(unsigned int, perf_nmi_counter);</div><div class='add'>+</div><div class='ctx'> static __initconst const u64 amd_hw_cache_event_ids</div><div class='ctx'> 				[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 				[PERF_COUNT_HW_CACHE_OP_MAX]</div><div class='hunk'>@@ -112,23 +116,144 @@ static __initconst const u64 amd_hw_cache_event_ids</div><div class='ctx'>  },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __initconst const u64 amd_hw_cache_event_ids_f17h</div><div class='add'>+				[PERF_COUNT_HW_CACHE_MAX]</div><div class='add'>+				[PERF_COUNT_HW_CACHE_OP_MAX]</div><div class='add'>+				[PERF_COUNT_HW_CACHE_RESULT_MAX] = {</div><div class='add'>+[C(L1D)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0x0040, /* Data Cache Accesses */</div><div class='add'>+		[C(RESULT_MISS)]   = 0xc860, /* L2$ access from DC Miss */</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0xff5a, /* h/w prefetch DC Fills */</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+[C(L1I)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0x0080, /* Instruction cache fetches  */</div><div class='add'>+		[C(RESULT_MISS)]   = 0x0081, /* Instruction cache misses   */</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+[C(LL)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+[C(DTLB)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0xff45, /* All L2 DTLB accesses */</div><div class='add'>+		[C(RESULT_MISS)]   = 0xf045, /* L2 DTLB misses (PT walks) */</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+[C(ITLB)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0x0084, /* L1 ITLB misses, L2 ITLB hits */</div><div class='add'>+		[C(RESULT_MISS)]   = 0xff85, /* L1 ITLB misses, L2 misses */</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+[C(BPU)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0x00c2, /* Retired Branch Instr.      */</div><div class='add'>+		[C(RESULT_MISS)]   = 0x00c3, /* Retired Mispredicted BI    */</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+[C(NODE)] = {</div><div class='add'>+	[C(OP_READ)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = 0,</div><div class='add'>+		[C(RESULT_MISS)]   = 0,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_WRITE)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+	[C(OP_PREFETCH)] = {</div><div class='add'>+		[C(RESULT_ACCESS)] = -1,</div><div class='add'>+		[C(RESULT_MISS)]   = -1,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * AMD Performance Monitor K7 and later.</div><div class='add'>+ * AMD Performance Monitor K7 and later, up to and including Family 16h:</div><div class='ctx'>  */</div><div class='ctx'> static const u64 amd_perfmon_event_map[PERF_COUNT_HW_MAX] =</div><div class='ctx'> {</div><div class='del'>-  [PERF_COUNT_HW_CPU_CYCLES]			= 0x0076,</div><div class='del'>-  [PERF_COUNT_HW_INSTRUCTIONS]			= 0x00c0,</div><div class='del'>-  [PERF_COUNT_HW_CACHE_REFERENCES]		= 0x077d,</div><div class='del'>-  [PERF_COUNT_HW_CACHE_MISSES]			= 0x077e,</div><div class='del'>-  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]		= 0x00c2,</div><div class='del'>-  [PERF_COUNT_HW_BRANCH_MISSES]			= 0x00c3,</div><div class='del'>-  [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= 0x00d0, /* "Decoder empty" event */</div><div class='del'>-  [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= 0x00d1, /* "Dispatch stalls" event */</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= 0x0076,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= 0x00c0,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= 0x077d,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= 0x077e,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= 0x00c2,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= 0x00c3,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= 0x00d0, /* "Decoder empty" event */</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= 0x00d1, /* "Dispatch stalls" event */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AMD Performance Monitor Family 17h and later:</div><div class='add'>+ */</div><div class='add'>+static const u64 amd_f17h_perfmon_event_map[PERF_COUNT_HW_MAX] =</div><div class='add'>+{</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= 0x0076,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= 0x00c0,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= 0xff60,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= 0x00c2,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= 0x00c3,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= 0x0287,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= 0x0187,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 amd_pmu_event_map(int hw_event)</div><div class='ctx'> {</div><div class='add'>+	if (boot_cpu_data.x86 &gt;= 0x17)</div><div class='add'>+		return amd_f17h_perfmon_event_map[hw_event];</div><div class='add'>+</div><div class='ctx'> 	return amd_perfmon_event_map[hw_event];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -429,6 +554,132 @@ static void amd_pmu_cpu_dead(int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * When a PMC counter overflows, an NMI is used to process the event and</div><div class='add'>+ * reset the counter. NMI latency can result in the counter being updated</div><div class='add'>+ * before the NMI can run, which can result in what appear to be spurious</div><div class='add'>+ * NMIs. This function is intended to wait for the NMI to run and reset</div><div class='add'>+ * the counter to avoid possible unhandled NMI messages.</div><div class='add'>+ */</div><div class='add'>+#define OVERFLOW_WAIT_COUNT	50</div><div class='add'>+</div><div class='add'>+static void amd_pmu_wait_on_overflow(int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u64 counter;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for the counter to be reset if it has overflowed. This loop</div><div class='add'>+	 * should exit very, very quickly, but just in case, don't wait</div><div class='add'>+	 * forever...</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; OVERFLOW_WAIT_COUNT; i++) {</div><div class='add'>+		rdmsrl(x86_pmu_event_addr(idx), counter);</div><div class='add'>+		if (counter &amp; (1ULL &lt;&lt; (x86_pmu.cntval_bits - 1)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Might be in IRQ context, so can't sleep */</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amd_pmu_disable_all(void)</div><div class='add'>+{</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	x86_pmu_disable_all();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This shouldn't be called from NMI context, but add a safeguard here</div><div class='add'>+	 * to return, since if we're in NMI context we can't wait for an NMI</div><div class='add'>+	 * to reset an overflowed counter value.</div><div class='add'>+	 */</div><div class='add'>+	if (in_nmi())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check each counter for overflow and wait for it to be reset by the</div><div class='add'>+	 * NMI if it has overflowed. This relies on the fact that all active</div><div class='add'>+	 * counters are always enabled when this function is caled and</div><div class='add'>+	 * ARCH_PERFMON_EVENTSEL_INT is always set.</div><div class='add'>+	 */</div><div class='add'>+	for (idx = 0; idx &lt; x86_pmu.num_counters; idx++) {</div><div class='add'>+		if (!test_bit(idx, cpuc-&gt;active_mask))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		amd_pmu_wait_on_overflow(idx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amd_pmu_disable_event(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	x86_pmu_disable_event(event);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This can be called from NMI context (via x86_pmu_stop). The counter</div><div class='add'>+	 * may have overflowed, but either way, we'll never see it get reset</div><div class='add'>+	 * by the NMI if we're already in the NMI. And the NMI latency support</div><div class='add'>+	 * below will take care of any pending NMI that might have been</div><div class='add'>+	 * generated by the overflow.</div><div class='add'>+	 */</div><div class='add'>+	if (in_nmi())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	amd_pmu_wait_on_overflow(event-&gt;hw.idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Because of NMI latency, if multiple PMC counters are active or other sources</div><div class='add'>+ * of NMIs are received, the perf NMI handler can handle one or more overflowed</div><div class='add'>+ * PMC counters outside of the NMI associated with the PMC overflow. If the NMI</div><div class='add'>+ * doesn't arrive at the LAPIC in time to become a pending NMI, then the kernel</div><div class='add'>+ * back-to-back NMI support won't be active. This PMC handler needs to take into</div><div class='add'>+ * account that this can occur, otherwise this could result in unknown NMI</div><div class='add'>+ * messages being issued. Examples of this is PMC overflow while in the NMI</div><div class='add'>+ * handler when multiple PMCs are active or PMC overflow while handling some</div><div class='add'>+ * other source of an NMI.</div><div class='add'>+ *</div><div class='add'>+ * Attempt to mitigate this by using the number of active PMCs to determine</div><div class='add'>+ * whether to return NMI_HANDLED if the perf NMI handler did not handle/reset</div><div class='add'>+ * any PMCs. The per-CPU perf_nmi_counter variable is set to a minimum of the</div><div class='add'>+ * number of active PMCs or 2. The value of 2 is used in case an NMI does not</div><div class='add'>+ * arrive at the LAPIC in time to be collapsed into an already pending NMI.</div><div class='add'>+ */</div><div class='add'>+static int amd_pmu_handle_irq(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+	int active, handled;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Obtain the active count before calling x86_pmu_handle_irq() since</div><div class='add'>+	 * it is possible that x86_pmu_handle_irq() may make a counter</div><div class='add'>+	 * inactive (through x86_pmu_stop).</div><div class='add'>+	 */</div><div class='add'>+	active = __bitmap_weight(cpuc-&gt;active_mask, X86_PMC_IDX_MAX);</div><div class='add'>+</div><div class='add'>+	/* Process any counter overflows */</div><div class='add'>+	handled = x86_pmu_handle_irq(regs);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a counter was handled, record the number of possible remaining</div><div class='add'>+	 * NMIs that can occur.</div><div class='add'>+	 */</div><div class='add'>+	if (handled) {</div><div class='add'>+		this_cpu_write(perf_nmi_counter,</div><div class='add'>+			       min_t(unsigned int, 2, active));</div><div class='add'>+</div><div class='add'>+		return handled;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!this_cpu_read(perf_nmi_counter))</div><div class='add'>+		return NMI_DONE;</div><div class='add'>+</div><div class='add'>+	this_cpu_dec(perf_nmi_counter);</div><div class='add'>+</div><div class='add'>+	return NMI_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct event_constraint *</div><div class='ctx'> amd_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 			  struct perf_event *event)</div><div class='hunk'>@@ -621,11 +872,11 @@ static ssize_t amd_event_sysfs_show(char *page, u64 config)</div><div class='ctx'> </div><div class='ctx'> static __initconst const struct x86_pmu amd_pmu = {</div><div class='ctx'> 	.name			= "AMD",</div><div class='del'>-	.handle_irq		= x86_pmu_handle_irq,</div><div class='del'>-	.disable_all		= x86_pmu_disable_all,</div><div class='add'>+	.handle_irq		= amd_pmu_handle_irq,</div><div class='add'>+	.disable_all		= amd_pmu_disable_all,</div><div class='ctx'> 	.enable_all		= x86_pmu_enable_all,</div><div class='ctx'> 	.enable			= x86_pmu_enable_event,</div><div class='del'>-	.disable		= x86_pmu_disable_event,</div><div class='add'>+	.disable		= amd_pmu_disable_event,</div><div class='ctx'> 	.hw_config		= amd_pmu_hw_config,</div><div class='ctx'> 	.schedule_events	= x86_schedule_events,</div><div class='ctx'> 	.eventsel		= MSR_K7_EVNTSEL0,</div><div class='hunk'>@@ -718,9 +969,10 @@ __init int amd_pmu_init(void)</div><div class='ctx'> 		x86_pmu.amd_nb_constraints = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Events are common for all AMDs */</div><div class='del'>-	memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,</div><div class='del'>-	       sizeof(hw_cache_event_ids));</div><div class='add'>+	if (boot_cpu_data.x86 &gt;= 0x17)</div><div class='add'>+		memcpy(hw_cache_event_ids, amd_hw_cache_event_ids_f17h, sizeof(hw_cache_event_ids));</div><div class='add'>+	else</div><div class='add'>+		memcpy(hw_cache_event_ids, amd_hw_cache_event_ids, sizeof(hw_cache_event_ids));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -732,7 +984,7 @@ void amd_pmu_enable_virt(void)</div><div class='ctx'> 	cpuc-&gt;perf_ctr_virt_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Reload all events */</div><div class='del'>-	x86_pmu_disable_all();</div><div class='add'>+	amd_pmu_disable_all();</div><div class='ctx'> 	x86_pmu_enable_all(0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(amd_pmu_enable_virt);</div><div class='hunk'>@@ -750,7 +1002,7 @@ void amd_pmu_disable_virt(void)</div><div class='ctx'> 	cpuc-&gt;perf_ctr_virt_mask = AMD64_EVENTSEL_HOSTONLY;</div><div class='ctx'> </div><div class='ctx'> 	/* Reload all events */</div><div class='del'>-	x86_pmu_disable_all();</div><div class='add'>+	amd_pmu_disable_all();</div><div class='ctx'> 	x86_pmu_enable_all(0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(amd_pmu_disable_virt);</div><div class='head'>diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c<br/>index e2b1447192a8..f315425d8468 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/core.c</a></div><div class='hunk'>@@ -560,6 +560,21 @@ int x86_pmu_hw_config(struct perf_event *event)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* sample_regs_user never support XMM registers */</div><div class='add'>+	if (unlikely(event-&gt;attr.sample_regs_user &amp; PEBS_XMM_REGS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/*</div><div class='add'>+	 * Besides the general purpose registers, XMM registers may</div><div class='add'>+	 * be collected in PEBS on some platforms, e.g. Icelake</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(event-&gt;attr.sample_regs_intr &amp; PEBS_XMM_REGS)) {</div><div class='add'>+		if (x86_pmu.pebs_no_xmm_regs)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!event-&gt;attr.precise_ip)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return x86_setup_perfctr(event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -661,6 +676,10 @@ static inline int is_x86_event(struct perf_event *event)</div><div class='ctx'> 	return event-&gt;pmu == &amp;pmu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct pmu *x86_get_pmu(void)</div><div class='add'>+{</div><div class='add'>+	return &amp;pmu;</div><div class='add'>+}</div><div class='ctx'> /*</div><div class='ctx'>  * Event scheduler state:</div><div class='ctx'>  *</div><div class='hunk'>@@ -849,18 +868,43 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)</div><div class='ctx'> 	struct event_constraint *c;</div><div class='ctx'> 	unsigned long used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];</div><div class='ctx'> 	struct perf_event *e;</div><div class='del'>-	int i, wmin, wmax, unsched = 0;</div><div class='add'>+	int n0, i, wmin, wmax, unsched = 0;</div><div class='ctx'> 	struct hw_perf_event *hwc;</div><div class='ctx'> </div><div class='ctx'> 	bitmap_zero(used_mask, X86_PMC_IDX_MAX);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Compute the number of events already present; see x86_pmu_add(),</div><div class='add'>+	 * validate_group() and x86_pmu_commit_txn(). For the former two</div><div class='add'>+	 * cpuc-&gt;n_events hasn't been updated yet, while for the latter</div><div class='add'>+	 * cpuc-&gt;n_txn contains the number of events added in the current</div><div class='add'>+	 * transaction.</div><div class='add'>+	 */</div><div class='add'>+	n0 = cpuc-&gt;n_events;</div><div class='add'>+	if (cpuc-&gt;txn_flags &amp; PERF_PMU_TXN_ADD)</div><div class='add'>+		n0 -= cpuc-&gt;n_txn;</div><div class='add'>+</div><div class='ctx'> 	if (x86_pmu.start_scheduling)</div><div class='ctx'> 		x86_pmu.start_scheduling(cpuc);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, wmin = X86_PMC_IDX_MAX, wmax = 0; i &lt; n; i++) {</div><div class='del'>-		cpuc-&gt;event_constraint[i] = NULL;</div><div class='del'>-		c = x86_pmu.get_event_constraints(cpuc, i, cpuc-&gt;event_list[i]);</div><div class='del'>-		cpuc-&gt;event_constraint[i] = c;</div><div class='add'>+		c = cpuc-&gt;event_constraint[i];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Previously scheduled events should have a cached constraint,</div><div class='add'>+		 * while new events should not have one.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE((c &amp;&amp; i &gt;= n0) || (!c &amp;&amp; i &lt; n0));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Request constraints for new events; or for those events that</div><div class='add'>+		 * have a dynamic constraint -- for those the constraint can</div><div class='add'>+		 * change due to external factors (sibling state, allow_tfa).</div><div class='add'>+		 */</div><div class='add'>+		if (!c || (c-&gt;flags &amp; PERF_X86_EVENT_DYNAMIC)) {</div><div class='add'>+			c = x86_pmu.get_event_constraints(cpuc, i, cpuc-&gt;event_list[i]);</div><div class='add'>+			cpuc-&gt;event_constraint[i] = c;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		wmin = min(wmin, c-&gt;weight);</div><div class='ctx'> 		wmax = max(wmax, c-&gt;weight);</div><div class='hunk'>@@ -925,25 +969,20 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)</div><div class='ctx'> 	if (!unsched &amp;&amp; assign) {</div><div class='ctx'> 		for (i = 0; i &lt; n; i++) {</div><div class='ctx'> 			e = cpuc-&gt;event_list[i];</div><div class='del'>-			e-&gt;hw.flags |= PERF_X86_EVENT_COMMITTED;</div><div class='ctx'> 			if (x86_pmu.commit_scheduling)</div><div class='ctx'> 				x86_pmu.commit_scheduling(cpuc, i, assign[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; n; i++) {</div><div class='add'>+		for (i = n0; i &lt; n; i++) {</div><div class='ctx'> 			e = cpuc-&gt;event_list[i];</div><div class='del'>-			/*</div><div class='del'>-			 * do not put_constraint() on comitted events,</div><div class='del'>-			 * because they are good to go</div><div class='del'>-			 */</div><div class='del'>-			if ((e-&gt;hw.flags &amp; PERF_X86_EVENT_COMMITTED))</div><div class='del'>-				continue;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * release events that failed scheduling</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (x86_pmu.put_event_constraints)</div><div class='ctx'> 				x86_pmu.put_event_constraints(cpuc, e);</div><div class='add'>+</div><div class='add'>+			cpuc-&gt;event_constraint[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1349,8 +1388,9 @@ void x86_pmu_stop(struct perf_event *event, int flags)</div><div class='ctx'> 	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='ctx'> 	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (__test_and_clear_bit(hwc-&gt;idx, cpuc-&gt;active_mask)) {</div><div class='add'>+	if (test_bit(hwc-&gt;idx, cpuc-&gt;active_mask)) {</div><div class='ctx'> 		x86_pmu.disable(event);</div><div class='add'>+		__clear_bit(hwc-&gt;idx, cpuc-&gt;active_mask);</div><div class='ctx'> 		cpuc-&gt;events[hwc-&gt;idx] = NULL;</div><div class='ctx'> 		WARN_ON_ONCE(hwc-&gt;state &amp; PERF_HES_STOPPED);</div><div class='ctx'> 		hwc-&gt;state |= PERF_HES_STOPPED;</div><div class='hunk'>@@ -1372,11 +1412,6 @@ static void x86_pmu_del(struct perf_event *event, int flags)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * event is descheduled</div><div class='del'>-	 */</div><div class='del'>-	event-&gt;hw.flags &amp;= ~PERF_X86_EVENT_COMMITTED;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * If we're called during a txn, we only need to undo x86_pmu.add.</div><div class='ctx'> 	 * The events never got scheduled and -&gt;cancel_txn will truncate</div><div class='ctx'> 	 * the event_list.</div><div class='hunk'>@@ -1412,6 +1447,7 @@ static void x86_pmu_del(struct perf_event *event, int flags)</div><div class='ctx'> 		cpuc-&gt;event_list[i-1] = cpuc-&gt;event_list[i];</div><div class='ctx'> 		cpuc-&gt;event_constraint[i-1] = cpuc-&gt;event_constraint[i];</div><div class='ctx'> 	}</div><div class='add'>+	cpuc-&gt;event_constraint[i-1] = NULL;</div><div class='ctx'> 	--cpuc-&gt;n_events;</div><div class='ctx'> </div><div class='ctx'> 	perf_event_update_userpage(event);</div><div class='hunk'>@@ -1447,16 +1483,8 @@ int x86_pmu_handle_irq(struct pt_regs *regs)</div><div class='ctx'> 	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; x86_pmu.num_counters; idx++) {</div><div class='del'>-		if (!test_bit(idx, cpuc-&gt;active_mask)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Though we deactivated the counter some cpus</div><div class='del'>-			 * might still deliver spurious interrupts still</div><div class='del'>-			 * in flight. Catch them:</div><div class='del'>-			 */</div><div class='del'>-			if (__test_and_clear_bit(idx, cpuc-&gt;running))</div><div class='del'>-				handled++;</div><div class='add'>+		if (!test_bit(idx, cpuc-&gt;active_mask))</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		event = cpuc-&gt;events[idx];</div><div class='ctx'> </div><div class='hunk'>@@ -2031,7 +2059,7 @@ static int validate_event(struct perf_event *event)</div><div class='ctx'> 	if (IS_ERR(fake_cpuc))</div><div class='ctx'> 		return PTR_ERR(fake_cpuc);</div><div class='ctx'> </div><div class='del'>-	c = x86_pmu.get_event_constraints(fake_cpuc, -1, event);</div><div class='add'>+	c = x86_pmu.get_event_constraints(fake_cpuc, 0, event);</div><div class='ctx'> </div><div class='ctx'> 	if (!c || !c-&gt;weight)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -2079,8 +2107,7 @@ static int validate_group(struct perf_event *event)</div><div class='ctx'> 	if (n &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	fake_cpuc-&gt;n_events = n;</div><div class='del'>-</div><div class='add'>+	fake_cpuc-&gt;n_events = 0;</div><div class='ctx'> 	ret = x86_pmu.schedule_events(fake_cpuc, n, NULL);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -2355,6 +2382,15 @@ void arch_perf_update_userpage(struct perf_event *event,</div><div class='ctx'> 	cyc2ns_read_end();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Determine whether the regs were taken from an irq/exception handler rather</div><div class='add'>+ * than from perf_arch_fetch_caller_regs().</div><div class='add'>+ */</div><div class='add'>+static bool perf_hw_regs(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;flags &amp; X86_EFLAGS_FIXED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -2366,11 +2402,15 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (perf_callchain_store(entry, regs-&gt;ip))</div><div class='del'>-		return;</div><div class='add'>+	if (perf_hw_regs(regs)) {</div><div class='add'>+		if (perf_callchain_store(entry, regs-&gt;ip))</div><div class='add'>+			return;</div><div class='add'>+		unwind_start(&amp;state, current, regs, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		unwind_start(&amp;state, current, NULL, (void *)regs-&gt;sp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (unwind_start(&amp;state, current, regs, NULL); !unwind_done(&amp;state);</div><div class='del'>-	     unwind_next_frame(&amp;state)) {</div><div class='add'>+	for (; !unwind_done(&amp;state); unwind_next_frame(&amp;state)) {</div><div class='ctx'> 		addr = unwind_get_return_address(&amp;state);</div><div class='ctx'> 		if (!addr || perf_callchain_store(entry, addr))</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c<br/>index 8baa441d8000..ef763f535e3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/core.c</a></div><div class='hunk'>@@ -239,6 +239,35 @@ static struct extra_reg intel_skl_extra_regs[] __read_mostly = {</div><div class='ctx'> 	EVENT_EXTRA_END</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct event_constraint intel_icl_event_constraints[] = {</div><div class='add'>+	FIXED_EVENT_CONSTRAINT(0x00c0, 0),	/* INST_RETIRED.ANY */</div><div class='add'>+	INTEL_UEVENT_CONSTRAINT(0x1c0, 0),	/* INST_RETIRED.PREC_DIST */</div><div class='add'>+	FIXED_EVENT_CONSTRAINT(0x003c, 1),	/* CPU_CLK_UNHALTED.CORE */</div><div class='add'>+	FIXED_EVENT_CONSTRAINT(0x0300, 2),	/* CPU_CLK_UNHALTED.REF */</div><div class='add'>+	FIXED_EVENT_CONSTRAINT(0x0400, 3),	/* SLOTS */</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0x03, 0x0a, 0xf),</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0x1f, 0x28, 0xf),</div><div class='add'>+	INTEL_EVENT_CONSTRAINT(0x32, 0xf),	/* SW_PREFETCH_ACCESS.* */</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x54, 0xf),</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0x60, 0x8b, 0xf),</div><div class='add'>+	INTEL_UEVENT_CONSTRAINT(0x04a3, 0xff),  /* CYCLE_ACTIVITY.STALLS_TOTAL */</div><div class='add'>+	INTEL_UEVENT_CONSTRAINT(0x10a3, 0xff),  /* CYCLE_ACTIVITY.STALLS_MEM_ANY */</div><div class='add'>+	INTEL_EVENT_CONSTRAINT(0xa3, 0xf),      /* CYCLE_ACTIVITY.* */</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0xa8, 0xb0, 0xf),</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0xb7, 0xbd, 0xf),</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0xd0, 0xe6, 0xf),</div><div class='add'>+	INTEL_EVENT_CONSTRAINT_RANGE(0xf0, 0xf4, 0xf),</div><div class='add'>+	EVENT_CONSTRAINT_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct extra_reg intel_icl_extra_regs[] __read_mostly = {</div><div class='add'>+	INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3fffff9fffull, RSP_0),</div><div class='add'>+	INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3fffff9fffull, RSP_1),</div><div class='add'>+	INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),</div><div class='add'>+	INTEL_UEVENT_EXTRA_REG(0x01c6, MSR_PEBS_FRONTEND, 0x7fff17, FE),</div><div class='add'>+	EVENT_EXTRA_END</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> EVENT_ATTR_STR(mem-loads,	mem_ld_nhm,	"event=0x0b,umask=0x10,ldlat=3");</div><div class='ctx'> EVENT_ATTR_STR(mem-loads,	mem_ld_snb,	"event=0xcd,umask=0x1,ldlat=3");</div><div class='ctx'> EVENT_ATTR_STR(mem-stores,	mem_st_snb,	"event=0xcd,umask=0x2");</div><div class='hunk'>@@ -1827,6 +1856,45 @@ static __initconst const u64 glp_hw_cache_extra_regs</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define TNT_LOCAL_DRAM			BIT_ULL(26)</div><div class='add'>+#define TNT_DEMAND_READ			GLM_DEMAND_DATA_RD</div><div class='add'>+#define TNT_DEMAND_WRITE		GLM_DEMAND_RFO</div><div class='add'>+#define TNT_LLC_ACCESS			GLM_ANY_RESPONSE</div><div class='add'>+#define TNT_SNP_ANY			(SNB_SNP_NOT_NEEDED|SNB_SNP_MISS| \</div><div class='add'>+					 SNB_NO_FWD|SNB_SNP_FWD|SNB_HITM)</div><div class='add'>+#define TNT_LLC_MISS			(TNT_SNP_ANY|SNB_NON_DRAM|TNT_LOCAL_DRAM)</div><div class='add'>+</div><div class='add'>+static __initconst const u64 tnt_hw_cache_extra_regs</div><div class='add'>+				[PERF_COUNT_HW_CACHE_MAX]</div><div class='add'>+				[PERF_COUNT_HW_CACHE_OP_MAX]</div><div class='add'>+				[PERF_COUNT_HW_CACHE_RESULT_MAX] = {</div><div class='add'>+	[C(LL)] = {</div><div class='add'>+		[C(OP_READ)] = {</div><div class='add'>+			[C(RESULT_ACCESS)]	= TNT_DEMAND_READ|</div><div class='add'>+						  TNT_LLC_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= TNT_DEMAND_READ|</div><div class='add'>+						  TNT_LLC_MISS,</div><div class='add'>+		},</div><div class='add'>+		[C(OP_WRITE)] = {</div><div class='add'>+			[C(RESULT_ACCESS)]	= TNT_DEMAND_WRITE|</div><div class='add'>+						  TNT_LLC_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= TNT_DEMAND_WRITE|</div><div class='add'>+						  TNT_LLC_MISS,</div><div class='add'>+		},</div><div class='add'>+		[C(OP_PREFETCH)] = {</div><div class='add'>+			[C(RESULT_ACCESS)]	= 0x0,</div><div class='add'>+			[C(RESULT_MISS)]	= 0x0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct extra_reg intel_tnt_extra_regs[] __read_mostly = {</div><div class='add'>+	/* must define OFFCORE_RSP_X first, see intel_fixup_er() */</div><div class='add'>+	INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0xffffff9fffull, RSP_0),</div><div class='add'>+	INTEL_UEVENT_EXTRA_REG(0x02b7, MSR_OFFCORE_RSP_1, 0xffffff9fffull, RSP_1),</div><div class='add'>+	EVENT_EXTRA_END</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define KNL_OT_L2_HITE		BIT_ULL(19) /* Other Tile L2 Hit */</div><div class='ctx'> #define KNL_OT_L2_HITF		BIT_ULL(20) /* Other Tile L2 Hit */</div><div class='ctx'> #define KNL_MCDRAM_LOCAL	BIT_ULL(21)</div><div class='hunk'>@@ -2015,7 +2083,7 @@ static void intel_tfa_commit_scheduling(struct cpu_hw_events *cpuc, int idx, int</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're going to use PMC3, make sure TFA is set before we touch it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cntr == 3 &amp;&amp; !cpuc-&gt;is_fake)</div><div class='add'>+	if (cntr == 3)</div><div class='ctx'> 		intel_set_tfa(cpuc, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2091,15 +2159,19 @@ static void intel_pmu_disable_event(struct perf_event *event)</div><div class='ctx'> 	cpuc-&gt;intel_ctrl_host_mask &amp;= ~(1ull &lt;&lt; hwc-&gt;idx);</div><div class='ctx'> 	cpuc-&gt;intel_cp_status &amp;= ~(1ull &lt;&lt; hwc-&gt;idx);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(event-&gt;attr.precise_ip))</div><div class='del'>-		intel_pmu_pebs_disable(event);</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(hwc-&gt;config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {</div><div class='ctx'> 		intel_pmu_disable_fixed(hwc);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	x86_pmu_disable_event(event);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Needs to be called after x86_pmu_disable_event,</div><div class='add'>+	 * so we don't trigger the event without PEBS bit set.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(event-&gt;attr.precise_ip))</div><div class='add'>+		intel_pmu_pebs_disable(event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void intel_pmu_del_event(struct perf_event *event)</div><div class='hunk'>@@ -2145,6 +2217,11 @@ static void intel_pmu_enable_fixed(struct perf_event *event)</div><div class='ctx'> 	bits &lt;&lt;= (idx * 4);</div><div class='ctx'> 	mask = 0xfULL &lt;&lt; (idx * 4);</div><div class='ctx'> </div><div class='add'>+	if (x86_pmu.intel_cap.pebs_baseline &amp;&amp; event-&gt;attr.precise_ip) {</div><div class='add'>+		bits |= ICL_FIXED_0_ADAPTIVE &lt;&lt; (idx * 4);</div><div class='add'>+		mask |= ICL_FIXED_0_ADAPTIVE &lt;&lt; (idx * 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rdmsrl(hwc-&gt;config_base, ctrl_val);</div><div class='ctx'> 	ctrl_val &amp;= ~mask;</div><div class='ctx'> 	ctrl_val |= bits;</div><div class='hunk'>@@ -2688,7 +2765,7 @@ x86_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> </div><div class='ctx'> 	if (x86_pmu.event_constraints) {</div><div class='ctx'> 		for_each_event_constraint(c, x86_pmu.event_constraints) {</div><div class='del'>-			if ((event-&gt;hw.config &amp; c-&gt;cmask) == c-&gt;code) {</div><div class='add'>+			if (constraint_match(c, event-&gt;hw.config)) {</div><div class='ctx'> 				event-&gt;hw.flags |= c-&gt;flags;</div><div class='ctx'> 				return c;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2838,7 +2915,7 @@ intel_get_excl_constraints(struct cpu_hw_events *cpuc, struct perf_event *event,</div><div class='ctx'> 	struct intel_excl_cntrs *excl_cntrs = cpuc-&gt;excl_cntrs;</div><div class='ctx'> 	struct intel_excl_states *xlo;</div><div class='ctx'> 	int tid = cpuc-&gt;excl_thread_id;</div><div class='del'>-	int is_excl, i;</div><div class='add'>+	int is_excl, i, w;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * validating a group does not require</div><div class='hunk'>@@ -2894,36 +2971,40 @@ intel_get_excl_constraints(struct cpu_hw_events *cpuc, struct perf_event *event,</div><div class='ctx'> 	 * SHARED   : sibling counter measuring non-exclusive event</div><div class='ctx'> 	 * UNUSED   : sibling counter unused</div><div class='ctx'> 	 */</div><div class='add'>+	w = c-&gt;weight;</div><div class='ctx'> 	for_each_set_bit(i, c-&gt;idxmsk, X86_PMC_IDX_MAX) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * exclusive event in sibling counter</div><div class='ctx'> 		 * our corresponding counter cannot be used</div><div class='ctx'> 		 * regardless of our event</div><div class='ctx'> 		 */</div><div class='del'>-		if (xlo-&gt;state[i] == INTEL_EXCL_EXCLUSIVE)</div><div class='add'>+		if (xlo-&gt;state[i] == INTEL_EXCL_EXCLUSIVE) {</div><div class='ctx'> 			__clear_bit(i, c-&gt;idxmsk);</div><div class='add'>+			w--;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if measuring an exclusive event, sibling</div><div class='ctx'> 		 * measuring non-exclusive, then counter cannot</div><div class='ctx'> 		 * be used</div><div class='ctx'> 		 */</div><div class='del'>-		if (is_excl &amp;&amp; xlo-&gt;state[i] == INTEL_EXCL_SHARED)</div><div class='add'>+		if (is_excl &amp;&amp; xlo-&gt;state[i] == INTEL_EXCL_SHARED) {</div><div class='ctx'> 			__clear_bit(i, c-&gt;idxmsk);</div><div class='add'>+			w--;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * recompute actual bit weight for scheduling algorithm</div><div class='del'>-	 */</div><div class='del'>-	c-&gt;weight = hweight64(c-&gt;idxmsk64);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * if we return an empty mask, then switch</div><div class='ctx'> 	 * back to static empty constraint to avoid</div><div class='ctx'> 	 * the cost of freeing later on</div><div class='ctx'> 	 */</div><div class='del'>-	if (c-&gt;weight == 0)</div><div class='add'>+	if (!w)</div><div class='ctx'> 		c = &amp;emptyconstraint;</div><div class='ctx'> </div><div class='add'>+	c-&gt;weight = w;</div><div class='add'>+</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2931,11 +3012,9 @@ static struct event_constraint *</div><div class='ctx'> intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 			    struct perf_event *event)</div><div class='ctx'> {</div><div class='del'>-	struct event_constraint *c1 = NULL;</div><div class='del'>-	struct event_constraint *c2;</div><div class='add'>+	struct event_constraint *c1, *c2;</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= 0) /* fake does &lt; 0 */</div><div class='del'>-		c1 = cpuc-&gt;event_constraint[idx];</div><div class='add'>+	c1 = cpuc-&gt;event_constraint[idx];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * first time only</div><div class='hunk'>@@ -2943,7 +3022,8 @@ intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 	 * - dynamic constraint: handled by intel_get_excl_constraints()</div><div class='ctx'> 	 */</div><div class='ctx'> 	c2 = __intel_get_event_constraints(cpuc, idx, event);</div><div class='del'>-	if (c1 &amp;&amp; (c1-&gt;flags &amp; PERF_X86_EVENT_DYNAMIC)) {</div><div class='add'>+	if (c1) {</div><div class='add'>+	        WARN_ON_ONCE(!(c1-&gt;flags &amp; PERF_X86_EVENT_DYNAMIC));</div><div class='ctx'> 		bitmap_copy(c1-&gt;idxmsk, c2-&gt;idxmsk, X86_PMC_IDX_MAX);</div><div class='ctx'> 		c1-&gt;weight = c2-&gt;weight;</div><div class='ctx'> 		c2 = c1;</div><div class='hunk'>@@ -3131,7 +3211,7 @@ static unsigned long intel_pmu_large_pebs_flags(struct perf_event *event)</div><div class='ctx'> 		flags &amp;= ~PERF_SAMPLE_TIME;</div><div class='ctx'> 	if (!event-&gt;attr.exclude_kernel)</div><div class='ctx'> 		flags &amp;= ~PERF_SAMPLE_REGS_USER;</div><div class='del'>-	if (event-&gt;attr.sample_regs_user &amp; ~PEBS_REGS)</div><div class='add'>+	if (event-&gt;attr.sample_regs_user &amp; ~PEBS_GP_REGS)</div><div class='ctx'> 		flags &amp;= ~(PERF_SAMPLE_REGS_USER | PERF_SAMPLE_REGS_INTR);</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='hunk'>@@ -3185,7 +3265,7 @@ static int intel_pmu_hw_config(struct perf_event *event)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (event-&gt;attr.precise_ip) {</div><div class='del'>-		if (!event-&gt;attr.freq) {</div><div class='add'>+		if (!(event-&gt;attr.freq || event-&gt;attr.wakeup_events)) {</div><div class='ctx'> 			event-&gt;hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;</div><div class='ctx'> 			if (!(event-&gt;attr.sample_type &amp;</div><div class='ctx'> 			      ~intel_pmu_large_pebs_flags(event)))</div><div class='hunk'>@@ -3366,6 +3446,12 @@ static struct event_constraint counter0_constraint =</div><div class='ctx'> static struct event_constraint counter2_constraint =</div><div class='ctx'> 			EVENT_CONSTRAINT(0, 0x4, 0);</div><div class='ctx'> </div><div class='add'>+static struct event_constraint fixed0_constraint =</div><div class='add'>+			FIXED_EVENT_CONSTRAINT(0x00c0, 0);</div><div class='add'>+</div><div class='add'>+static struct event_constraint fixed0_counter0_constraint =</div><div class='add'>+			INTEL_ALL_EVENT_CONSTRAINT(0, 0x100000001ULL);</div><div class='add'>+</div><div class='ctx'> static struct event_constraint *</div><div class='ctx'> hsw_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 			  struct perf_event *event)</div><div class='hunk'>@@ -3385,6 +3471,21 @@ hsw_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct event_constraint *</div><div class='add'>+icl_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='add'>+			  struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Fixed counter 0 has less skid.</div><div class='add'>+	 * Force instruction:ppp in Fixed counter 0</div><div class='add'>+	 */</div><div class='add'>+	if ((event-&gt;attr.precise_ip == 3) &amp;&amp;</div><div class='add'>+	    constraint_match(&amp;fixed0_constraint, event-&gt;hw.config))</div><div class='add'>+		return &amp;fixed0_constraint;</div><div class='add'>+</div><div class='add'>+	return hsw_get_event_constraints(cpuc, idx, event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct event_constraint *</div><div class='ctx'> glp_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 			  struct perf_event *event)</div><div class='ctx'> {</div><div class='hunk'>@@ -3399,6 +3500,29 @@ glp_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct event_constraint *</div><div class='add'>+tnt_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='add'>+			  struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct event_constraint *c;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * :ppp means to do reduced skid PEBS,</div><div class='add'>+	 * which is available on PMC0 and fixed counter 0.</div><div class='add'>+	 */</div><div class='add'>+	if (event-&gt;attr.precise_ip == 3) {</div><div class='add'>+		/* Force instruction:ppp on PMC0 and Fixed counter 0 */</div><div class='add'>+		if (constraint_match(&amp;fixed0_constraint, event-&gt;hw.config))</div><div class='add'>+			return &amp;fixed0_counter0_constraint;</div><div class='add'>+</div><div class='add'>+		return &amp;counter0_constraint;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	c = intel_get_event_constraints(cpuc, idx, event);</div><div class='add'>+</div><div class='add'>+	return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool allow_tsx_force_abort = true;</div><div class='ctx'> </div><div class='ctx'> static struct event_constraint *</div><div class='hunk'>@@ -3410,7 +3534,7 @@ tfa_get_event_constraints(struct cpu_hw_events *cpuc, int idx,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Without TFA we must not use PMC3.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!allow_tsx_force_abort &amp;&amp; test_bit(3, c-&gt;idxmsk) &amp;&amp; idx &gt;= 0) {</div><div class='add'>+	if (!allow_tsx_force_abort &amp;&amp; test_bit(3, c-&gt;idxmsk)) {</div><div class='ctx'> 		c = dyn_constraint(cpuc, c, idx);</div><div class='ctx'> 		c-&gt;idxmsk64 &amp;= ~(1ULL &lt;&lt; 3);</div><div class='ctx'> 		c-&gt;weight--;</div><div class='hunk'>@@ -3507,6 +3631,8 @@ static struct intel_excl_cntrs *allocate_excl_cntrs(int cpu)</div><div class='ctx'> </div><div class='ctx'> int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)</div><div class='ctx'> {</div><div class='add'>+	cpuc-&gt;pebs_record_size = x86_pmu.pebs_record_size;</div><div class='add'>+</div><div class='ctx'> 	if (x86_pmu.extra_regs || x86_pmu.lbr_sel_map) {</div><div class='ctx'> 		cpuc-&gt;shared_regs = allocate_shared_regs(cpu);</div><div class='ctx'> 		if (!cpuc-&gt;shared_regs)</div><div class='hunk'>@@ -3575,6 +3701,12 @@ static void intel_pmu_cpu_starting(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	cpuc-&gt;lbr_sel = NULL;</div><div class='ctx'> </div><div class='add'>+	if (x86_pmu.flags &amp; PMU_FL_TFA) {</div><div class='add'>+		WARN_ON_ONCE(cpuc-&gt;tfa_shadow);</div><div class='add'>+		cpuc-&gt;tfa_shadow = ~0ULL;</div><div class='add'>+		intel_set_tfa(cpuc, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (x86_pmu.version &gt; 1)</div><div class='ctx'> 		flip_smm_bit(&amp;x86_pmu.attr_freeze_on_smi);</div><div class='ctx'> </div><div class='hunk'>@@ -4108,6 +4240,42 @@ static struct attribute *hsw_tsx_events_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+EVENT_ATTR_STR(tx-capacity-read,  tx_capacity_read,  "event=0x54,umask=0x80");</div><div class='add'>+EVENT_ATTR_STR(tx-capacity-write, tx_capacity_write, "event=0x54,umask=0x2");</div><div class='add'>+EVENT_ATTR_STR(el-capacity-read,  el_capacity_read,  "event=0x54,umask=0x80");</div><div class='add'>+EVENT_ATTR_STR(el-capacity-write, el_capacity_write, "event=0x54,umask=0x2");</div><div class='add'>+</div><div class='add'>+static struct attribute *icl_events_attrs[] = {</div><div class='add'>+	EVENT_PTR(mem_ld_hsw),</div><div class='add'>+	EVENT_PTR(mem_st_hsw),</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *icl_tsx_events_attrs[] = {</div><div class='add'>+	EVENT_PTR(tx_start),</div><div class='add'>+	EVENT_PTR(tx_abort),</div><div class='add'>+	EVENT_PTR(tx_commit),</div><div class='add'>+	EVENT_PTR(tx_capacity_read),</div><div class='add'>+	EVENT_PTR(tx_capacity_write),</div><div class='add'>+	EVENT_PTR(tx_conflict),</div><div class='add'>+	EVENT_PTR(el_start),</div><div class='add'>+	EVENT_PTR(el_abort),</div><div class='add'>+	EVENT_PTR(el_commit),</div><div class='add'>+	EVENT_PTR(el_capacity_read),</div><div class='add'>+	EVENT_PTR(el_capacity_write),</div><div class='add'>+	EVENT_PTR(el_conflict),</div><div class='add'>+	EVENT_PTR(cycles_t),</div><div class='add'>+	EVENT_PTR(cycles_ct),</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init struct attribute **get_icl_events_attrs(void)</div><div class='add'>+{</div><div class='add'>+	return boot_cpu_has(X86_FEATURE_RTM) ?</div><div class='add'>+		merge_attr(icl_events_attrs, icl_tsx_events_attrs) :</div><div class='add'>+		icl_events_attrs;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t freeze_on_smi_show(struct device *cdev,</div><div class='ctx'> 				  struct device_attribute *attr,</div><div class='ctx'> 				  char *buf)</div><div class='hunk'>@@ -4147,6 +4315,50 @@ done:</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void update_tfa_sched(void *ignored)</div><div class='add'>+{</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * check if PMC3 is used</div><div class='add'>+	 * and if so force schedule out for all event types all contexts</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(3, cpuc-&gt;active_mask))</div><div class='add'>+		perf_pmu_resched(x86_get_pmu());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_sysctl_tfa(struct device *cdev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='add'>+			      char *buf)</div><div class='add'>+{</div><div class='add'>+	return snprintf(buf, 40, "%d\n", allow_tsx_force_abort);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_sysctl_tfa(struct device *cdev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='add'>+			      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	bool val;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* no change */</div><div class='add'>+	if (val == allow_tsx_force_abort)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	allow_tsx_force_abort = val;</div><div class='add'>+</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	on_each_cpu(update_tfa_sched, NULL, 1);</div><div class='add'>+	put_online_cpus();</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static DEVICE_ATTR_RW(freeze_on_smi);</div><div class='ctx'> </div><div class='ctx'> static ssize_t branches_show(struct device *cdev,</div><div class='hunk'>@@ -4179,7 +4391,9 @@ static struct attribute *intel_pmu_caps_attrs[] = {</div><div class='ctx'>        NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);</div><div class='add'>+static DEVICE_ATTR(allow_tsx_force_abort, 0644,</div><div class='add'>+		   show_sysctl_tfa,</div><div class='add'>+		   set_sysctl_tfa);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *intel_pmu_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_freeze_on_smi.attr,</div><div class='hunk'>@@ -4440,6 +4654,32 @@ __init int intel_pmu_init(void)</div><div class='ctx'> 		name = "goldmont_plus";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case INTEL_FAM6_ATOM_TREMONT_X:</div><div class='add'>+		x86_pmu.late_ack = true;</div><div class='add'>+		memcpy(hw_cache_event_ids, glp_hw_cache_event_ids,</div><div class='add'>+		       sizeof(hw_cache_event_ids));</div><div class='add'>+		memcpy(hw_cache_extra_regs, tnt_hw_cache_extra_regs,</div><div class='add'>+		       sizeof(hw_cache_extra_regs));</div><div class='add'>+		hw_cache_event_ids[C(ITLB)][C(OP_READ)][C(RESULT_ACCESS)] = -1;</div><div class='add'>+</div><div class='add'>+		intel_pmu_lbr_init_skl();</div><div class='add'>+</div><div class='add'>+		x86_pmu.event_constraints = intel_slm_event_constraints;</div><div class='add'>+		x86_pmu.extra_regs = intel_tnt_extra_regs;</div><div class='add'>+		/*</div><div class='add'>+		 * It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS</div><div class='add'>+		 * for precise cycles.</div><div class='add'>+		 */</div><div class='add'>+		x86_pmu.pebs_aliases = NULL;</div><div class='add'>+		x86_pmu.pebs_prec_dist = true;</div><div class='add'>+		x86_pmu.lbr_pt_coexist = true;</div><div class='add'>+		x86_pmu.flags |= PMU_FL_HAS_RSP_1;</div><div class='add'>+		x86_pmu.get_event_constraints = tnt_get_event_constraints;</div><div class='add'>+		extra_attr = slm_format_attr;</div><div class='add'>+		pr_cont("Tremont events, ");</div><div class='add'>+		name = "Tremont";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case INTEL_FAM6_WESTMERE:</div><div class='ctx'> 	case INTEL_FAM6_WESTMERE_EP:</div><div class='ctx'> 	case INTEL_FAM6_WESTMERE_EX:</div><div class='hunk'>@@ -4688,13 +4928,41 @@ __init int intel_pmu_init(void)</div><div class='ctx'> 			x86_pmu.get_event_constraints = tfa_get_event_constraints;</div><div class='ctx'> 			x86_pmu.enable_all = intel_tfa_pmu_enable_all;</div><div class='ctx'> 			x86_pmu.commit_scheduling = intel_tfa_commit_scheduling;</div><div class='del'>-			intel_pmu_attrs[1] = &amp;dev_attr_allow_tsx_force_abort.attr.attr;</div><div class='add'>+			intel_pmu_attrs[1] = &amp;dev_attr_allow_tsx_force_abort.attr;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pr_cont("Skylake events, ");</div><div class='ctx'> 		name = "skylake";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case INTEL_FAM6_ICELAKE_MOBILE:</div><div class='add'>+		x86_pmu.late_ack = true;</div><div class='add'>+		memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));</div><div class='add'>+		memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));</div><div class='add'>+		hw_cache_event_ids[C(ITLB)][C(OP_READ)][C(RESULT_ACCESS)] = -1;</div><div class='add'>+		intel_pmu_lbr_init_skl();</div><div class='add'>+</div><div class='add'>+		x86_pmu.event_constraints = intel_icl_event_constraints;</div><div class='add'>+		x86_pmu.pebs_constraints = intel_icl_pebs_event_constraints;</div><div class='add'>+		x86_pmu.extra_regs = intel_icl_extra_regs;</div><div class='add'>+		x86_pmu.pebs_aliases = NULL;</div><div class='add'>+		x86_pmu.pebs_prec_dist = true;</div><div class='add'>+		x86_pmu.flags |= PMU_FL_HAS_RSP_1;</div><div class='add'>+		x86_pmu.flags |= PMU_FL_NO_HT_SHARING;</div><div class='add'>+</div><div class='add'>+		x86_pmu.hw_config = hsw_hw_config;</div><div class='add'>+		x86_pmu.get_event_constraints = icl_get_event_constraints;</div><div class='add'>+		extra_attr = boot_cpu_has(X86_FEATURE_RTM) ?</div><div class='add'>+			hsw_format_attr : nhm_format_attr;</div><div class='add'>+		extra_attr = merge_attr(extra_attr, skl_format_attr);</div><div class='add'>+		x86_pmu.cpu_events = get_icl_events_attrs();</div><div class='add'>+		x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xca, .umask=0x02);</div><div class='add'>+		x86_pmu.lbr_pt_coexist = true;</div><div class='add'>+		intel_pmu_pebs_data_source_skl(false);</div><div class='add'>+		pr_cont("Icelake events, ");</div><div class='add'>+		name = "icelake";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		switch (x86_pmu.version) {</div><div class='ctx'> 		case 1:</div><div class='head'>diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c<br/>index 94a4b7fc75d0..6072f92cb8ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/cstate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/cstate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/cstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/cstate.c</a></div><div class='hunk'>@@ -76,15 +76,15 @@</div><div class='ctx'>  *			       Scope: Package (physical package)</div><div class='ctx'>  *	MSR_PKG_C8_RESIDENCY:  Package C8 Residency Counter.</div><div class='ctx'>  *			       perf code: 0x04</div><div class='del'>- *			       Available model: HSW ULT,CNL</div><div class='add'>+ *			       Available model: HSW ULT,KBL,CNL</div><div class='ctx'>  *			       Scope: Package (physical package)</div><div class='ctx'>  *	MSR_PKG_C9_RESIDENCY:  Package C9 Residency Counter.</div><div class='ctx'>  *			       perf code: 0x05</div><div class='del'>- *			       Available model: HSW ULT,CNL</div><div class='add'>+ *			       Available model: HSW ULT,KBL,CNL</div><div class='ctx'>  *			       Scope: Package (physical package)</div><div class='ctx'>  *	MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.</div><div class='ctx'>  *			       perf code: 0x06</div><div class='del'>- *			       Available model: HSW ULT,GLM,CNL</div><div class='add'>+ *			       Available model: HSW ULT,KBL,GLM,CNL</div><div class='ctx'>  *			       Scope: Package (physical package)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -566,8 +566,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates),</div><div class='ctx'> </div><div class='del'>-	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE,  snb_cstates),</div><div class='del'>-	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates),</div><div class='add'>+	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE,  hswult_cstates),</div><div class='add'>+	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, hswult_cstates),</div><div class='ctx'> </div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates),</div><div class='ctx'> </div><div class='hunk'>@@ -578,6 +578,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_X, glm_cstates),</div><div class='ctx'> </div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),</div><div class='add'>+</div><div class='add'>+	X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_MOBILE, snb_cstates),</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);</div><div class='head'>diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c<br/>index 10c99ce1fead..7a9f5dac5abe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/ds.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/ds.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/ds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/ds.c</a></div><div class='hunk'>@@ -849,6 +849,26 @@ struct event_constraint intel_skl_pebs_event_constraints[] = {</div><div class='ctx'> 	EVENT_CONSTRAINT_END</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct event_constraint intel_icl_pebs_event_constraints[] = {</div><div class='add'>+	INTEL_FLAGS_UEVENT_CONSTRAINT(0x1c0, 0x100000000ULL),	/* INST_RETIRED.PREC_DIST */</div><div class='add'>+	INTEL_FLAGS_UEVENT_CONSTRAINT(0x0400, 0x400000000ULL),	/* SLOTS */</div><div class='add'>+</div><div class='add'>+	INTEL_PLD_CONSTRAINT(0x1cd, 0xff),			/* MEM_TRANS_RETIRED.LOAD_LATENCY */</div><div class='add'>+	INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x1d0, 0xf),	/* MEM_INST_RETIRED.LOAD */</div><div class='add'>+	INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x2d0, 0xf),	/* MEM_INST_RETIRED.STORE */</div><div class='add'>+</div><div class='add'>+	INTEL_FLAGS_EVENT_CONSTRAINT_DATALA_LD_RANGE(0xd1, 0xd4, 0xf), /* MEM_LOAD_*_RETIRED.* */</div><div class='add'>+</div><div class='add'>+	INTEL_FLAGS_EVENT_CONSTRAINT(0xd0, 0xf),		/* MEM_INST_RETIRED.* */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Everything else is handled by PMU_FL_PEBS_ALL, because we</div><div class='add'>+	 * need the full constraints from the main table.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	EVENT_CONSTRAINT_END</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct event_constraint *intel_pebs_constraints(struct perf_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct event_constraint *c;</div><div class='hunk'>@@ -858,7 +878,7 @@ struct event_constraint *intel_pebs_constraints(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 	if (x86_pmu.pebs_constraints) {</div><div class='ctx'> 		for_each_event_constraint(c, x86_pmu.pebs_constraints) {</div><div class='del'>-			if ((event-&gt;hw.config &amp; c-&gt;cmask) == c-&gt;code) {</div><div class='add'>+			if (constraint_match(c, event-&gt;hw.config)) {</div><div class='ctx'> 				event-&gt;hw.flags |= c-&gt;flags;</div><div class='ctx'> 				return c;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -906,17 +926,87 @@ static inline void pebs_update_threshold(struct cpu_hw_events *cpuc)</div><div class='ctx'> </div><div class='ctx'> 	if (cpuc-&gt;n_pebs == cpuc-&gt;n_large_pebs) {</div><div class='ctx'> 		threshold = ds-&gt;pebs_absolute_maximum -</div><div class='del'>-			reserved * x86_pmu.pebs_record_size;</div><div class='add'>+			reserved * cpuc-&gt;pebs_record_size;</div><div class='ctx'> 	} else {</div><div class='del'>-		threshold = ds-&gt;pebs_buffer_base + x86_pmu.pebs_record_size;</div><div class='add'>+		threshold = ds-&gt;pebs_buffer_base + cpuc-&gt;pebs_record_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ds-&gt;pebs_interrupt_threshold = threshold;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void adaptive_pebs_record_size_update(void)</div><div class='add'>+{</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+	u64 pebs_data_cfg = cpuc-&gt;pebs_data_cfg;</div><div class='add'>+	int sz = sizeof(struct pebs_basic);</div><div class='add'>+</div><div class='add'>+	if (pebs_data_cfg &amp; PEBS_DATACFG_MEMINFO)</div><div class='add'>+		sz += sizeof(struct pebs_meminfo);</div><div class='add'>+	if (pebs_data_cfg &amp; PEBS_DATACFG_GP)</div><div class='add'>+		sz += sizeof(struct pebs_gprs);</div><div class='add'>+	if (pebs_data_cfg &amp; PEBS_DATACFG_XMMS)</div><div class='add'>+		sz += sizeof(struct pebs_xmm);</div><div class='add'>+	if (pebs_data_cfg &amp; PEBS_DATACFG_LBRS)</div><div class='add'>+		sz += x86_pmu.lbr_nr * sizeof(struct pebs_lbr_entry);</div><div class='add'>+</div><div class='add'>+	cpuc-&gt;pebs_record_size = sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PERF_PEBS_MEMINFO_TYPE	(PERF_SAMPLE_ADDR | PERF_SAMPLE_DATA_SRC |   \</div><div class='add'>+				PERF_SAMPLE_PHYS_ADDR | PERF_SAMPLE_WEIGHT | \</div><div class='add'>+				PERF_SAMPLE_TRANSACTION)</div><div class='add'>+</div><div class='add'>+static u64 pebs_update_adaptive_cfg(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct perf_event_attr *attr = &amp;event-&gt;attr;</div><div class='add'>+	u64 sample_type = attr-&gt;sample_type;</div><div class='add'>+	u64 pebs_data_cfg = 0;</div><div class='add'>+	bool gprs, tsx_weight;</div><div class='add'>+</div><div class='add'>+	if (!(sample_type &amp; ~(PERF_SAMPLE_IP|PERF_SAMPLE_TIME)) &amp;&amp;</div><div class='add'>+	    attr-&gt;precise_ip &gt; 1)</div><div class='add'>+		return pebs_data_cfg;</div><div class='add'>+</div><div class='add'>+	if (sample_type &amp; PERF_PEBS_MEMINFO_TYPE)</div><div class='add'>+		pebs_data_cfg |= PEBS_DATACFG_MEMINFO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need GPRs when:</div><div class='add'>+	 * + user requested them</div><div class='add'>+	 * + precise_ip &lt; 2 for the non event IP</div><div class='add'>+	 * + For RTM TSX weight we need GPRs for the abort code.</div><div class='add'>+	 */</div><div class='add'>+	gprs = (sample_type &amp; PERF_SAMPLE_REGS_INTR) &amp;&amp;</div><div class='add'>+	       (attr-&gt;sample_regs_intr &amp; PEBS_GP_REGS);</div><div class='add'>+</div><div class='add'>+	tsx_weight = (sample_type &amp; PERF_SAMPLE_WEIGHT) &amp;&amp;</div><div class='add'>+		     ((attr-&gt;config &amp; INTEL_ARCH_EVENT_MASK) ==</div><div class='add'>+		      x86_pmu.rtm_abort_event);</div><div class='add'>+</div><div class='add'>+	if (gprs || (attr-&gt;precise_ip &lt; 2) || tsx_weight)</div><div class='add'>+		pebs_data_cfg |= PEBS_DATACFG_GP;</div><div class='add'>+</div><div class='add'>+	if ((sample_type &amp; PERF_SAMPLE_REGS_INTR) &amp;&amp;</div><div class='add'>+	    (attr-&gt;sample_regs_intr &amp; PEBS_XMM_REGS))</div><div class='add'>+		pebs_data_cfg |= PEBS_DATACFG_XMMS;</div><div class='add'>+</div><div class='add'>+	if (sample_type &amp; PERF_SAMPLE_BRANCH_STACK) {</div><div class='add'>+		/*</div><div class='add'>+		 * For now always log all LBRs. Could configure this</div><div class='add'>+		 * later.</div><div class='add'>+		 */</div><div class='add'>+		pebs_data_cfg |= PEBS_DATACFG_LBRS |</div><div class='add'>+			((x86_pmu.lbr_nr-1) &lt;&lt; PEBS_DATACFG_LBR_SHIFT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pebs_data_cfg;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc, struct pmu *pmu)</div><div class='add'>+pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc,</div><div class='add'>+		  struct perf_event *event, bool add)</div><div class='ctx'> {</div><div class='add'>+	struct pmu *pmu = event-&gt;ctx-&gt;pmu;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure we get updated with the first PEBS</div><div class='ctx'> 	 * event. It will trigger also during removal, but</div><div class='hunk'>@@ -933,6 +1023,29 @@ pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc, struct pmu *pmu)</div><div class='ctx'> 		update = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The PEBS record doesn't shrink on pmu::del(). Doing so would require</div><div class='add'>+	 * iterating all remaining PEBS events to reconstruct the config.</div><div class='add'>+	 */</div><div class='add'>+	if (x86_pmu.intel_cap.pebs_baseline &amp;&amp; add) {</div><div class='add'>+		u64 pebs_data_cfg;</div><div class='add'>+</div><div class='add'>+		/* Clear pebs_data_cfg and pebs_record_size for first PEBS. */</div><div class='add'>+		if (cpuc-&gt;n_pebs == 1) {</div><div class='add'>+			cpuc-&gt;pebs_data_cfg = 0;</div><div class='add'>+			cpuc-&gt;pebs_record_size = sizeof(struct pebs_basic);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pebs_data_cfg = pebs_update_adaptive_cfg(event);</div><div class='add'>+</div><div class='add'>+		/* Update pebs_record_size if new event requires more data. */</div><div class='add'>+		if (pebs_data_cfg &amp; ~cpuc-&gt;pebs_data_cfg) {</div><div class='add'>+			cpuc-&gt;pebs_data_cfg |= pebs_data_cfg;</div><div class='add'>+			adaptive_pebs_record_size_update();</div><div class='add'>+			update = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (update)</div><div class='ctx'> 		pebs_update_threshold(cpuc);</div><div class='ctx'> }</div><div class='hunk'>@@ -947,7 +1060,7 @@ void intel_pmu_pebs_add(struct perf_event *event)</div><div class='ctx'> 	if (hwc-&gt;flags &amp; PERF_X86_EVENT_LARGE_PEBS)</div><div class='ctx'> 		cpuc-&gt;n_large_pebs++;</div><div class='ctx'> </div><div class='del'>-	pebs_update_state(needed_cb, cpuc, event-&gt;ctx-&gt;pmu);</div><div class='add'>+	pebs_update_state(needed_cb, cpuc, event, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void intel_pmu_pebs_enable(struct perf_event *event)</div><div class='hunk'>@@ -960,11 +1073,19 @@ void intel_pmu_pebs_enable(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 	cpuc-&gt;pebs_enabled |= 1ULL &lt;&lt; hwc-&gt;idx;</div><div class='ctx'> </div><div class='del'>-	if (event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_LDLAT)</div><div class='add'>+	if ((event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_LDLAT) &amp;&amp; (x86_pmu.version &lt; 5))</div><div class='ctx'> 		cpuc-&gt;pebs_enabled |= 1ULL &lt;&lt; (hwc-&gt;idx + 32);</div><div class='ctx'> 	else if (event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_ST)</div><div class='ctx'> 		cpuc-&gt;pebs_enabled |= 1ULL &lt;&lt; 63;</div><div class='ctx'> </div><div class='add'>+	if (x86_pmu.intel_cap.pebs_baseline) {</div><div class='add'>+		hwc-&gt;config |= ICL_EVENTSEL_ADAPTIVE;</div><div class='add'>+		if (cpuc-&gt;pebs_data_cfg != cpuc-&gt;active_pebs_data_cfg) {</div><div class='add'>+			wrmsrl(MSR_PEBS_DATA_CFG, cpuc-&gt;pebs_data_cfg);</div><div class='add'>+			cpuc-&gt;active_pebs_data_cfg = cpuc-&gt;pebs_data_cfg;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Use auto-reload if possible to save a MSR write in the PMI.</div><div class='ctx'> 	 * This must be done in pmu::start(), because PERF_EVENT_IOC_PERIOD.</div><div class='hunk'>@@ -991,7 +1112,7 @@ void intel_pmu_pebs_del(struct perf_event *event)</div><div class='ctx'> 	if (hwc-&gt;flags &amp; PERF_X86_EVENT_LARGE_PEBS)</div><div class='ctx'> 		cpuc-&gt;n_large_pebs--;</div><div class='ctx'> </div><div class='del'>-	pebs_update_state(needed_cb, cpuc, event-&gt;ctx-&gt;pmu);</div><div class='add'>+	pebs_update_state(needed_cb, cpuc, event, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void intel_pmu_pebs_disable(struct perf_event *event)</div><div class='hunk'>@@ -1004,7 +1125,8 @@ void intel_pmu_pebs_disable(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 	cpuc-&gt;pebs_enabled &amp;= ~(1ULL &lt;&lt; hwc-&gt;idx);</div><div class='ctx'> </div><div class='del'>-	if (event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_LDLAT)</div><div class='add'>+	if ((event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_LDLAT) &amp;&amp;</div><div class='add'>+	    (x86_pmu.version &lt; 5))</div><div class='ctx'> 		cpuc-&gt;pebs_enabled &amp;= ~(1ULL &lt;&lt; (hwc-&gt;idx + 32));</div><div class='ctx'> 	else if (event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_ST)</div><div class='ctx'> 		cpuc-&gt;pebs_enabled &amp;= ~(1ULL &lt;&lt; 63);</div><div class='hunk'>@@ -1125,34 +1247,57 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 intel_hsw_weight(struct pebs_record_skl *pebs)</div><div class='add'>+static inline u64 intel_get_tsx_weight(u64 tsx_tuning)</div><div class='ctx'> {</div><div class='del'>-	if (pebs-&gt;tsx_tuning) {</div><div class='del'>-		union hsw_tsx_tuning tsx = { .value = pebs-&gt;tsx_tuning };</div><div class='add'>+	if (tsx_tuning) {</div><div class='add'>+		union hsw_tsx_tuning tsx = { .value = tsx_tuning };</div><div class='ctx'> 		return tsx.cycles_last_block;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 intel_hsw_transaction(struct pebs_record_skl *pebs)</div><div class='add'>+static inline u64 intel_get_tsx_transaction(u64 tsx_tuning, u64 ax)</div><div class='ctx'> {</div><div class='del'>-	u64 txn = (pebs-&gt;tsx_tuning &amp; PEBS_HSW_TSX_FLAGS) &gt;&gt; 32;</div><div class='add'>+	u64 txn = (tsx_tuning &amp; PEBS_HSW_TSX_FLAGS) &gt;&gt; 32;</div><div class='ctx'> </div><div class='ctx'> 	/* For RTM XABORTs also log the abort code from AX */</div><div class='del'>-	if ((txn &amp; PERF_TXN_TRANSACTION) &amp;&amp; (pebs-&gt;ax &amp; 1))</div><div class='del'>-		txn |= ((pebs-&gt;ax &gt;&gt; 24) &amp; 0xff) &lt;&lt; PERF_TXN_ABORT_SHIFT;</div><div class='add'>+	if ((txn &amp; PERF_TXN_TRANSACTION) &amp;&amp; (ax &amp; 1))</div><div class='add'>+		txn |= ((ax &gt;&gt; 24) &amp; 0xff) &lt;&lt; PERF_TXN_ABORT_SHIFT;</div><div class='ctx'> 	return txn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setup_pebs_sample_data(struct perf_event *event,</div><div class='del'>-				   struct pt_regs *iregs, void *__pebs,</div><div class='del'>-				   struct perf_sample_data *data,</div><div class='del'>-				   struct pt_regs *regs)</div><div class='add'>+static inline u64 get_pebs_status(void *n)</div><div class='ctx'> {</div><div class='add'>+	if (x86_pmu.intel_cap.pebs_format &lt; 4)</div><div class='add'>+		return ((struct pebs_record_nhm *)n)-&gt;status;</div><div class='add'>+	return ((struct pebs_basic *)n)-&gt;applicable_counters;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define PERF_X86_EVENT_PEBS_HSW_PREC \</div><div class='ctx'> 		(PERF_X86_EVENT_PEBS_ST_HSW | \</div><div class='ctx'> 		 PERF_X86_EVENT_PEBS_LD_HSW | \</div><div class='ctx'> 		 PERF_X86_EVENT_PEBS_NA_HSW)</div><div class='add'>+</div><div class='add'>+static u64 get_data_src(struct perf_event *event, u64 aux)</div><div class='add'>+{</div><div class='add'>+	u64 val = PERF_MEM_NA;</div><div class='add'>+	int fl = event-&gt;hw.flags;</div><div class='add'>+	bool fst = fl &amp; (PERF_X86_EVENT_PEBS_ST | PERF_X86_EVENT_PEBS_HSW_PREC);</div><div class='add'>+</div><div class='add'>+	if (fl &amp; PERF_X86_EVENT_PEBS_LDLAT)</div><div class='add'>+		val = load_latency_data(aux);</div><div class='add'>+	else if (fst &amp;&amp; (fl &amp; PERF_X86_EVENT_PEBS_HSW_PREC))</div><div class='add'>+		val = precise_datala_hsw(event, aux);</div><div class='add'>+	else if (fst)</div><div class='add'>+		val = precise_store_data(aux);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_pebs_fixed_sample_data(struct perf_event *event,</div><div class='add'>+				   struct pt_regs *iregs, void *__pebs,</div><div class='add'>+				   struct perf_sample_data *data,</div><div class='add'>+				   struct pt_regs *regs)</div><div class='add'>+{</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We cast to the biggest pebs_record but are careful not to</div><div class='ctx'> 	 * unconditionally access the 'extra' entries.</div><div class='hunk'>@@ -1160,17 +1305,13 @@ static void setup_pebs_sample_data(struct perf_event *event,</div><div class='ctx'> 	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='ctx'> 	struct pebs_record_skl *pebs = __pebs;</div><div class='ctx'> 	u64 sample_type;</div><div class='del'>-	int fll, fst, dsrc;</div><div class='del'>-	int fl = event-&gt;hw.flags;</div><div class='add'>+	int fll;</div><div class='ctx'> </div><div class='ctx'> 	if (pebs == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	sample_type = event-&gt;attr.sample_type;</div><div class='del'>-	dsrc = sample_type &amp; PERF_SAMPLE_DATA_SRC;</div><div class='del'>-</div><div class='del'>-	fll = fl &amp; PERF_X86_EVENT_PEBS_LDLAT;</div><div class='del'>-	fst = fl &amp; (PERF_X86_EVENT_PEBS_ST | PERF_X86_EVENT_PEBS_HSW_PREC);</div><div class='add'>+	fll = event-&gt;hw.flags &amp; PERF_X86_EVENT_PEBS_LDLAT;</div><div class='ctx'> </div><div class='ctx'> 	perf_sample_data_init(data, 0, event-&gt;hw.last_period);</div><div class='ctx'> </div><div class='hunk'>@@ -1185,16 +1326,8 @@ static void setup_pebs_sample_data(struct perf_event *event,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * data.data_src encodes the data source</div><div class='ctx'> 	 */</div><div class='del'>-	if (dsrc) {</div><div class='del'>-		u64 val = PERF_MEM_NA;</div><div class='del'>-		if (fll)</div><div class='del'>-			val = load_latency_data(pebs-&gt;dse);</div><div class='del'>-		else if (fst &amp;&amp; (fl &amp; PERF_X86_EVENT_PEBS_HSW_PREC))</div><div class='del'>-			val = precise_datala_hsw(event, pebs-&gt;dse);</div><div class='del'>-		else if (fst)</div><div class='del'>-			val = precise_store_data(pebs-&gt;dse);</div><div class='del'>-		data-&gt;data_src.val = val;</div><div class='del'>-	}</div><div class='add'>+	if (sample_type &amp; PERF_SAMPLE_DATA_SRC)</div><div class='add'>+		data-&gt;data_src.val = get_data_src(event, pebs-&gt;dse);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must however always use iregs for the unwinder to stay sane; the</div><div class='hunk'>@@ -1281,10 +1414,11 @@ static void setup_pebs_sample_data(struct perf_event *event,</div><div class='ctx'> 	if (x86_pmu.intel_cap.pebs_format &gt;= 2) {</div><div class='ctx'> 		/* Only set the TSX weight when no memory weight. */</div><div class='ctx'> 		if ((sample_type &amp; PERF_SAMPLE_WEIGHT) &amp;&amp; !fll)</div><div class='del'>-			data-&gt;weight = intel_hsw_weight(pebs);</div><div class='add'>+			data-&gt;weight = intel_get_tsx_weight(pebs-&gt;tsx_tuning);</div><div class='ctx'> </div><div class='ctx'> 		if (sample_type &amp; PERF_SAMPLE_TRANSACTION)</div><div class='del'>-			data-&gt;txn = intel_hsw_transaction(pebs);</div><div class='add'>+			data-&gt;txn = intel_get_tsx_transaction(pebs-&gt;tsx_tuning,</div><div class='add'>+							      pebs-&gt;ax);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1301,6 +1435,140 @@ static void setup_pebs_sample_data(struct perf_event *event,</div><div class='ctx'> 		data-&gt;br_stack = &amp;cpuc-&gt;lbr_stack;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void adaptive_pebs_save_regs(struct pt_regs *regs,</div><div class='add'>+				    struct pebs_gprs *gprs)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;ax = gprs-&gt;ax;</div><div class='add'>+	regs-&gt;bx = gprs-&gt;bx;</div><div class='add'>+	regs-&gt;cx = gprs-&gt;cx;</div><div class='add'>+	regs-&gt;dx = gprs-&gt;dx;</div><div class='add'>+	regs-&gt;si = gprs-&gt;si;</div><div class='add'>+	regs-&gt;di = gprs-&gt;di;</div><div class='add'>+	regs-&gt;bp = gprs-&gt;bp;</div><div class='add'>+	regs-&gt;sp = gprs-&gt;sp;</div><div class='add'>+#ifndef CONFIG_X86_32</div><div class='add'>+	regs-&gt;r8 = gprs-&gt;r8;</div><div class='add'>+	regs-&gt;r9 = gprs-&gt;r9;</div><div class='add'>+	regs-&gt;r10 = gprs-&gt;r10;</div><div class='add'>+	regs-&gt;r11 = gprs-&gt;r11;</div><div class='add'>+	regs-&gt;r12 = gprs-&gt;r12;</div><div class='add'>+	regs-&gt;r13 = gprs-&gt;r13;</div><div class='add'>+	regs-&gt;r14 = gprs-&gt;r14;</div><div class='add'>+	regs-&gt;r15 = gprs-&gt;r15;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * With adaptive PEBS the layout depends on what fields are configured.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void setup_pebs_adaptive_sample_data(struct perf_event *event,</div><div class='add'>+					    struct pt_regs *iregs, void *__pebs,</div><div class='add'>+					    struct perf_sample_data *data,</div><div class='add'>+					    struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+	struct pebs_basic *basic = __pebs;</div><div class='add'>+	void *next_record = basic + 1;</div><div class='add'>+	u64 sample_type;</div><div class='add'>+	u64 format_size;</div><div class='add'>+	struct pebs_meminfo *meminfo = NULL;</div><div class='add'>+	struct pebs_gprs *gprs = NULL;</div><div class='add'>+	struct x86_perf_regs *perf_regs;</div><div class='add'>+</div><div class='add'>+	if (basic == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	perf_regs = container_of(regs, struct x86_perf_regs, regs);</div><div class='add'>+	perf_regs-&gt;xmm_regs = NULL;</div><div class='add'>+</div><div class='add'>+	sample_type = event-&gt;attr.sample_type;</div><div class='add'>+	format_size = basic-&gt;format_size;</div><div class='add'>+	perf_sample_data_init(data, 0, event-&gt;hw.last_period);</div><div class='add'>+	data-&gt;period = event-&gt;hw.last_period;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;attr.use_clockid == 0)</div><div class='add'>+		data-&gt;time = native_sched_clock_from_tsc(basic-&gt;tsc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must however always use iregs for the unwinder to stay sane; the</div><div class='add'>+	 * record BP,SP,IP can point into thin air when the record is from a</div><div class='add'>+	 * previous PMI context or an (I)RET happened between the record and</div><div class='add'>+	 * PMI.</div><div class='add'>+	 */</div><div class='add'>+	if (sample_type &amp; PERF_SAMPLE_CALLCHAIN)</div><div class='add'>+		data-&gt;callchain = perf_callchain(event, iregs);</div><div class='add'>+</div><div class='add'>+	*regs = *iregs;</div><div class='add'>+	/* The ip in basic is EventingIP */</div><div class='add'>+	set_linear_ip(regs, basic-&gt;ip);</div><div class='add'>+	regs-&gt;flags = PERF_EFLAGS_EXACT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The record for MEMINFO is in front of GP</div><div class='add'>+	 * But PERF_SAMPLE_TRANSACTION needs gprs-&gt;ax.</div><div class='add'>+	 * Save the pointer here but process later.</div><div class='add'>+	 */</div><div class='add'>+	if (format_size &amp; PEBS_DATACFG_MEMINFO) {</div><div class='add'>+		meminfo = next_record;</div><div class='add'>+		next_record = meminfo + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format_size &amp; PEBS_DATACFG_GP) {</div><div class='add'>+		gprs = next_record;</div><div class='add'>+		next_record = gprs + 1;</div><div class='add'>+</div><div class='add'>+		if (event-&gt;attr.precise_ip &lt; 2) {</div><div class='add'>+			set_linear_ip(regs, gprs-&gt;ip);</div><div class='add'>+			regs-&gt;flags &amp;= ~PERF_EFLAGS_EXACT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sample_type &amp; PERF_SAMPLE_REGS_INTR)</div><div class='add'>+			adaptive_pebs_save_regs(regs, gprs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format_size &amp; PEBS_DATACFG_MEMINFO) {</div><div class='add'>+		if (sample_type &amp; PERF_SAMPLE_WEIGHT)</div><div class='add'>+			data-&gt;weight = meminfo-&gt;latency ?:</div><div class='add'>+				intel_get_tsx_weight(meminfo-&gt;tsx_tuning);</div><div class='add'>+</div><div class='add'>+		if (sample_type &amp; PERF_SAMPLE_DATA_SRC)</div><div class='add'>+			data-&gt;data_src.val = get_data_src(event, meminfo-&gt;aux);</div><div class='add'>+</div><div class='add'>+		if (sample_type &amp; (PERF_SAMPLE_ADDR | PERF_SAMPLE_PHYS_ADDR))</div><div class='add'>+			data-&gt;addr = meminfo-&gt;address;</div><div class='add'>+</div><div class='add'>+		if (sample_type &amp; PERF_SAMPLE_TRANSACTION)</div><div class='add'>+			data-&gt;txn = intel_get_tsx_transaction(meminfo-&gt;tsx_tuning,</div><div class='add'>+							  gprs ? gprs-&gt;ax : 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format_size &amp; PEBS_DATACFG_XMMS) {</div><div class='add'>+		struct pebs_xmm *xmm = next_record;</div><div class='add'>+</div><div class='add'>+		next_record = xmm + 1;</div><div class='add'>+		perf_regs-&gt;xmm_regs = xmm-&gt;xmm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format_size &amp; PEBS_DATACFG_LBRS) {</div><div class='add'>+		struct pebs_lbr *lbr = next_record;</div><div class='add'>+		int num_lbr = ((format_size &gt;&gt; PEBS_DATACFG_LBR_SHIFT)</div><div class='add'>+					&amp; 0xff) + 1;</div><div class='add'>+		next_record = next_record + num_lbr*sizeof(struct pebs_lbr_entry);</div><div class='add'>+</div><div class='add'>+		if (has_branch_stack(event)) {</div><div class='add'>+			intel_pmu_store_pebs_lbrs(lbr);</div><div class='add'>+			data-&gt;br_stack = &amp;cpuc-&gt;lbr_stack;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(next_record != __pebs + (format_size &gt;&gt; 48),</div><div class='add'>+			"PEBS record size %llu, expected %llu, config %llx\n",</div><div class='add'>+			format_size &gt;&gt; 48,</div><div class='add'>+			(u64)(next_record - __pebs),</div><div class='add'>+			basic-&gt;format_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void *</div><div class='ctx'> get_next_pebs_record_by_bit(void *base, void *top, int bit)</div><div class='ctx'> {</div><div class='hunk'>@@ -1318,19 +1586,19 @@ get_next_pebs_record_by_bit(void *base, void *top, int bit)</div><div class='ctx'> 	if (base == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	for (at = base; at &lt; top; at += x86_pmu.pebs_record_size) {</div><div class='del'>-		struct pebs_record_nhm *p = at;</div><div class='add'>+	for (at = base; at &lt; top; at += cpuc-&gt;pebs_record_size) {</div><div class='add'>+		unsigned long status = get_pebs_status(at);</div><div class='ctx'> </div><div class='del'>-		if (test_bit(bit, (unsigned long *)&amp;p-&gt;status)) {</div><div class='add'>+		if (test_bit(bit, (unsigned long *)&amp;status)) {</div><div class='ctx'> 			/* PEBS v3 has accurate status bits */</div><div class='ctx'> 			if (x86_pmu.intel_cap.pebs_format &gt;= 3)</div><div class='ctx'> 				return at;</div><div class='ctx'> </div><div class='del'>-			if (p-&gt;status == (1 &lt;&lt; bit))</div><div class='add'>+			if (status == (1 &lt;&lt; bit))</div><div class='ctx'> 				return at;</div><div class='ctx'> </div><div class='ctx'> 			/* clear non-PEBS bit and re-check */</div><div class='del'>-			pebs_status = p-&gt;status &amp; cpuc-&gt;pebs_enabled;</div><div class='add'>+			pebs_status = status &amp; cpuc-&gt;pebs_enabled;</div><div class='ctx'> 			pebs_status &amp;= PEBS_COUNTER_MASK;</div><div class='ctx'> 			if (pebs_status == (1 &lt;&lt; bit))</div><div class='ctx'> 				return at;</div><div class='hunk'>@@ -1410,11 +1678,18 @@ intel_pmu_save_and_restart_reload(struct perf_event *event, int count)</div><div class='ctx'> static void __intel_pmu_pebs_event(struct perf_event *event,</div><div class='ctx'> 				   struct pt_regs *iregs,</div><div class='ctx'> 				   void *base, void *top,</div><div class='del'>-				   int bit, int count)</div><div class='add'>+				   int bit, int count,</div><div class='add'>+				   void (*setup_sample)(struct perf_event *,</div><div class='add'>+						struct pt_regs *,</div><div class='add'>+						void *,</div><div class='add'>+						struct perf_sample_data *,</div><div class='add'>+						struct pt_regs *))</div><div class='ctx'> {</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='ctx'> 	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='ctx'> 	struct perf_sample_data data;</div><div class='del'>-	struct pt_regs regs;</div><div class='add'>+	struct x86_perf_regs perf_regs;</div><div class='add'>+	struct pt_regs *regs = &amp;perf_regs.regs;</div><div class='ctx'> 	void *at = get_next_pebs_record_by_bit(base, top, bit);</div><div class='ctx'> </div><div class='ctx'> 	if (hwc-&gt;flags &amp; PERF_X86_EVENT_AUTO_RELOAD) {</div><div class='hunk'>@@ -1429,20 +1704,20 @@ static void __intel_pmu_pebs_event(struct perf_event *event,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	while (count &gt; 1) {</div><div class='del'>-		setup_pebs_sample_data(event, iregs, at, &amp;data, &amp;regs);</div><div class='del'>-		perf_event_output(event, &amp;data, &amp;regs);</div><div class='del'>-		at += x86_pmu.pebs_record_size;</div><div class='add'>+		setup_sample(event, iregs, at, &amp;data, regs);</div><div class='add'>+		perf_event_output(event, &amp;data, regs);</div><div class='add'>+		at += cpuc-&gt;pebs_record_size;</div><div class='ctx'> 		at = get_next_pebs_record_by_bit(at, top, bit);</div><div class='ctx'> 		count--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	setup_pebs_sample_data(event, iregs, at, &amp;data, &amp;regs);</div><div class='add'>+	setup_sample(event, iregs, at, &amp;data, regs);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All but the last records are processed.</div><div class='ctx'> 	 * The last one is left to be able to call the overflow handler.</div><div class='ctx'> 	 */</div><div class='del'>-	if (perf_event_overflow(event, &amp;data, &amp;regs)) {</div><div class='add'>+	if (perf_event_overflow(event, &amp;data, regs)) {</div><div class='ctx'> 		x86_pmu_stop(event, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1483,7 +1758,27 @@ static void intel_pmu_drain_pebs_core(struct pt_regs *iregs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__intel_pmu_pebs_event(event, iregs, at, top, 0, n);</div><div class='add'>+	__intel_pmu_pebs_event(event, iregs, at, top, 0, n,</div><div class='add'>+			       setup_pebs_fixed_sample_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_pmu_pebs_event_update_no_drain(struct cpu_hw_events *cpuc, int size)</div><div class='add'>+{</div><div class='add'>+	struct perf_event *event;</div><div class='add'>+	int bit;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The drain_pebs() could be called twice in a short period</div><div class='add'>+	 * for auto-reload event in pmu::read(). There are no</div><div class='add'>+	 * overflows have happened in between.</div><div class='add'>+	 * It needs to call intel_pmu_save_and_restart_reload() to</div><div class='add'>+	 * update the event-&gt;count for this case.</div><div class='add'>+	 */</div><div class='add'>+	for_each_set_bit(bit, (unsigned long *)&amp;cpuc-&gt;pebs_enabled, size) {</div><div class='add'>+		event = cpuc-&gt;events[bit];</div><div class='add'>+		if (event-&gt;hw.flags &amp; PERF_X86_EVENT_AUTO_RELOAD)</div><div class='add'>+			intel_pmu_save_and_restart_reload(event, 0);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='hunk'>@@ -1513,19 +1808,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(base &gt;= top)) {</div><div class='del'>-		/*</div><div class='del'>-		 * The drain_pebs() could be called twice in a short period</div><div class='del'>-		 * for auto-reload event in pmu::read(). There are no</div><div class='del'>-		 * overflows have happened in between.</div><div class='del'>-		 * It needs to call intel_pmu_save_and_restart_reload() to</div><div class='del'>-		 * update the event-&gt;count for this case.</div><div class='del'>-		 */</div><div class='del'>-		for_each_set_bit(bit, (unsigned long *)&amp;cpuc-&gt;pebs_enabled,</div><div class='del'>-				 size) {</div><div class='del'>-			event = cpuc-&gt;events[bit];</div><div class='del'>-			if (event-&gt;hw.flags &amp; PERF_X86_EVENT_AUTO_RELOAD)</div><div class='del'>-				intel_pmu_save_and_restart_reload(event, 0);</div><div class='del'>-		}</div><div class='add'>+		intel_pmu_pebs_event_update_no_drain(cpuc, size);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1538,8 +1821,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='ctx'> </div><div class='ctx'> 		/* PEBS v3 has more accurate status bits */</div><div class='ctx'> 		if (x86_pmu.intel_cap.pebs_format &gt;= 3) {</div><div class='del'>-			for_each_set_bit(bit, (unsigned long *)&amp;pebs_status,</div><div class='del'>-					 size)</div><div class='add'>+			for_each_set_bit(bit, (unsigned long *)&amp;pebs_status, size)</div><div class='ctx'> 				counts[bit]++;</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1578,8 +1860,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='ctx'> 		 * If collision happened, the record will be dropped.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (p-&gt;status != (1ULL &lt;&lt; bit)) {</div><div class='del'>-			for_each_set_bit(i, (unsigned long *)&amp;pebs_status,</div><div class='del'>-					 x86_pmu.max_pebs_events)</div><div class='add'>+			for_each_set_bit(i, (unsigned long *)&amp;pebs_status, size)</div><div class='ctx'> 				error[i]++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1587,7 +1868,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='ctx'> 		counts[bit]++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (bit = 0; bit &lt; size; bit++) {</div><div class='add'>+	for_each_set_bit(bit, (unsigned long *)&amp;mask, size) {</div><div class='ctx'> 		if ((counts[bit] == 0) &amp;&amp; (error[bit] == 0))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1608,11 +1889,66 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='ctx'> </div><div class='ctx'> 		if (counts[bit]) {</div><div class='ctx'> 			__intel_pmu_pebs_event(event, iregs, base,</div><div class='del'>-					       top, bit, counts[bit]);</div><div class='add'>+					       top, bit, counts[bit],</div><div class='add'>+					       setup_pebs_fixed_sample_data);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void intel_pmu_drain_pebs_icl(struct pt_regs *iregs)</div><div class='add'>+{</div><div class='add'>+	short counts[INTEL_PMC_IDX_FIXED + MAX_FIXED_PEBS_EVENTS] = {};</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+	struct debug_store *ds = cpuc-&gt;ds;</div><div class='add'>+	struct perf_event *event;</div><div class='add'>+	void *base, *at, *top;</div><div class='add'>+	int bit, size;</div><div class='add'>+	u64 mask;</div><div class='add'>+</div><div class='add'>+	if (!x86_pmu.pebs_active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	base = (struct pebs_basic *)(unsigned long)ds-&gt;pebs_buffer_base;</div><div class='add'>+	top = (struct pebs_basic *)(unsigned long)ds-&gt;pebs_index;</div><div class='add'>+</div><div class='add'>+	ds-&gt;pebs_index = ds-&gt;pebs_buffer_base;</div><div class='add'>+</div><div class='add'>+	mask = ((1ULL &lt;&lt; x86_pmu.max_pebs_events) - 1) |</div><div class='add'>+	       (((1ULL &lt;&lt; x86_pmu.num_counters_fixed) - 1) &lt;&lt; INTEL_PMC_IDX_FIXED);</div><div class='add'>+	size = INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed;</div><div class='add'>+</div><div class='add'>+	if (unlikely(base &gt;= top)) {</div><div class='add'>+		intel_pmu_pebs_event_update_no_drain(cpuc, size);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (at = base; at &lt; top; at += cpuc-&gt;pebs_record_size) {</div><div class='add'>+		u64 pebs_status;</div><div class='add'>+</div><div class='add'>+		pebs_status = get_pebs_status(at) &amp; cpuc-&gt;pebs_enabled;</div><div class='add'>+		pebs_status &amp;= mask;</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(bit, (unsigned long *)&amp;pebs_status, size)</div><div class='add'>+			counts[bit]++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, (unsigned long *)&amp;mask, size) {</div><div class='add'>+		if (counts[bit] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		event = cpuc-&gt;events[bit];</div><div class='add'>+		if (WARN_ON_ONCE(!event))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(!event-&gt;attr.precise_ip))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		__intel_pmu_pebs_event(event, iregs, base,</div><div class='add'>+				       top, bit, counts[bit],</div><div class='add'>+				       setup_pebs_adaptive_sample_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * BTS, PEBS probe and setup</div><div class='ctx'>  */</div><div class='hunk'>@@ -1628,12 +1964,18 @@ void __init intel_ds_init(void)</div><div class='ctx'> 	x86_pmu.bts  = boot_cpu_has(X86_FEATURE_BTS);</div><div class='ctx'> 	x86_pmu.pebs = boot_cpu_has(X86_FEATURE_PEBS);</div><div class='ctx'> 	x86_pmu.pebs_buffer_size = PEBS_BUFFER_SIZE;</div><div class='del'>-	if (x86_pmu.version &lt;= 4)</div><div class='add'>+	if (x86_pmu.version &lt;= 4) {</div><div class='ctx'> 		x86_pmu.pebs_no_isolation = 1;</div><div class='add'>+		x86_pmu.pebs_no_xmm_regs = 1;</div><div class='add'>+	}</div><div class='ctx'> 	if (x86_pmu.pebs) {</div><div class='ctx'> 		char pebs_type = x86_pmu.intel_cap.pebs_trap ?  '+' : '-';</div><div class='add'>+		char *pebs_qual = "";</div><div class='ctx'> 		int format = x86_pmu.intel_cap.pebs_format;</div><div class='ctx'> </div><div class='add'>+		if (format &lt; 4)</div><div class='add'>+			x86_pmu.intel_cap.pebs_baseline = 0;</div><div class='add'>+</div><div class='ctx'> 		switch (format) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			pr_cont("PEBS fmt0%c, ", pebs_type);</div><div class='hunk'>@@ -1669,6 +2011,29 @@ void __init intel_ds_init(void)</div><div class='ctx'> 			x86_pmu.large_pebs_flags |= PERF_SAMPLE_TIME;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case 4:</div><div class='add'>+			x86_pmu.drain_pebs = intel_pmu_drain_pebs_icl;</div><div class='add'>+			x86_pmu.pebs_record_size = sizeof(struct pebs_basic);</div><div class='add'>+			if (x86_pmu.intel_cap.pebs_baseline) {</div><div class='add'>+				x86_pmu.large_pebs_flags |=</div><div class='add'>+					PERF_SAMPLE_BRANCH_STACK |</div><div class='add'>+					PERF_SAMPLE_TIME;</div><div class='add'>+				x86_pmu.flags |= PMU_FL_PEBS_ALL;</div><div class='add'>+				pebs_qual = "-baseline";</div><div class='add'>+			} else {</div><div class='add'>+				/* Only basic record supported */</div><div class='add'>+				x86_pmu.pebs_no_xmm_regs = 1;</div><div class='add'>+				x86_pmu.large_pebs_flags &amp;=</div><div class='add'>+					~(PERF_SAMPLE_ADDR |</div><div class='add'>+					  PERF_SAMPLE_TIME |</div><div class='add'>+					  PERF_SAMPLE_DATA_SRC |</div><div class='add'>+					  PERF_SAMPLE_TRANSACTION |</div><div class='add'>+					  PERF_SAMPLE_REGS_USER |</div><div class='add'>+					  PERF_SAMPLE_REGS_INTR);</div><div class='add'>+			}</div><div class='add'>+			pr_cont("PEBS fmt4%c%s, ", pebs_type, pebs_qual);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			pr_cont("no PEBS fmt%d%c, ", format, pebs_type);</div><div class='ctx'> 			x86_pmu.pebs = 0;</div><div class='head'>diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c<br/>index 580c1b91c454..6f814a27416b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/lbr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/lbr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/lbr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/lbr.c</a></div><div class='hunk'>@@ -488,6 +488,8 @@ void intel_pmu_lbr_add(struct perf_event *event)</div><div class='ctx'> 	 * be 'new'. Conversely, a new event can get installed through the</div><div class='ctx'> 	 * context switch path for the first time.</div><div class='ctx'> 	 */</div><div class='add'>+	if (x86_pmu.intel_cap.pebs_baseline &amp;&amp; event-&gt;attr.precise_ip &gt; 0)</div><div class='add'>+		cpuc-&gt;lbr_pebs_users++;</div><div class='ctx'> 	perf_sched_cb_inc(event-&gt;ctx-&gt;pmu);</div><div class='ctx'> 	if (!cpuc-&gt;lbr_users++ &amp;&amp; !event-&gt;total_time_running)</div><div class='ctx'> 		intel_pmu_lbr_reset();</div><div class='hunk'>@@ -507,8 +509,11 @@ void intel_pmu_lbr_del(struct perf_event *event)</div><div class='ctx'> 		task_ctx-&gt;lbr_callstack_users--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (x86_pmu.intel_cap.pebs_baseline &amp;&amp; event-&gt;attr.precise_ip &gt; 0)</div><div class='add'>+		cpuc-&gt;lbr_pebs_users--;</div><div class='ctx'> 	cpuc-&gt;lbr_users--;</div><div class='ctx'> 	WARN_ON_ONCE(cpuc-&gt;lbr_users &lt; 0);</div><div class='add'>+	WARN_ON_ONCE(cpuc-&gt;lbr_pebs_users &lt; 0);</div><div class='ctx'> 	perf_sched_cb_dec(event-&gt;ctx-&gt;pmu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -658,7 +663,13 @@ void intel_pmu_lbr_read(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='ctx'> </div><div class='del'>-	if (!cpuc-&gt;lbr_users)</div><div class='add'>+	/*</div><div class='add'>+	 * Don't read when all LBRs users are using adaptive PEBS.</div><div class='add'>+	 *</div><div class='add'>+	 * This could be smarter and actually check the event,</div><div class='add'>+	 * but this simple approach seems to work for now.</div><div class='add'>+	 */</div><div class='add'>+	if (!cpuc-&gt;lbr_users || cpuc-&gt;lbr_users == cpuc-&gt;lbr_pebs_users)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_32)</div><div class='hunk'>@@ -1080,6 +1091,28 @@ intel_pmu_lbr_filter(struct cpu_hw_events *cpuc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr)</div><div class='add'>+{</div><div class='add'>+	struct cpu_hw_events *cpuc = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cpuc-&gt;lbr_stack.nr = x86_pmu.lbr_nr;</div><div class='add'>+	for (i = 0; i &lt; x86_pmu.lbr_nr; i++) {</div><div class='add'>+		u64 info = lbr-&gt;lbr[i].info;</div><div class='add'>+		struct perf_branch_entry *e = &amp;cpuc-&gt;lbr_entries[i];</div><div class='add'>+</div><div class='add'>+		e-&gt;from		= lbr-&gt;lbr[i].from;</div><div class='add'>+		e-&gt;to		= lbr-&gt;lbr[i].to;</div><div class='add'>+		e-&gt;mispred	= !!(info &amp; LBR_INFO_MISPRED);</div><div class='add'>+		e-&gt;predicted	= !(info &amp; LBR_INFO_MISPRED);</div><div class='add'>+		e-&gt;in_tx	= !!(info &amp; LBR_INFO_IN_TX);</div><div class='add'>+		e-&gt;abort	= !!(info &amp; LBR_INFO_ABORT);</div><div class='add'>+		e-&gt;cycles	= info &amp; LBR_INFO_CYCLES;</div><div class='add'>+		e-&gt;reserved	= 0;</div><div class='add'>+	}</div><div class='add'>+	intel_pmu_lbr_filter(cpuc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Map interface branch filters onto LBR filters</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c<br/>index fb3a2f13fc70..339d7628080c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/pt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/pt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/pt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/pt.c</a></div><div class='hunk'>@@ -1525,8 +1525,7 @@ static __init int pt_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries))</div><div class='del'>-		pt_pmu.pmu.capabilities =</div><div class='del'>-			PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_AUX_SW_DOUBLEBUF;</div><div class='add'>+		pt_pmu.pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG;</div><div class='ctx'> </div><div class='ctx'> 	pt_pmu.pmu.capabilities	|= PERF_PMU_CAP_EXCLUSIVE | PERF_PMU_CAP_ITRACE;</div><div class='ctx'> 	pt_pmu.pmu.attr_groups		 = pt_attr_groups;</div><div class='head'>diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c<br/>index 94dc564146ca..37ebf6fc5415 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/rapl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/rapl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/rapl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/rapl.c</a></div><div class='hunk'>@@ -775,6 +775,8 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {</div><div class='ctx'> 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X, hsw_rapl_init),</div><div class='ctx'> </div><div class='ctx'> 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, hsw_rapl_init),</div><div class='add'>+</div><div class='add'>+	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE,  skl_rapl_init),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c<br/>index 9fe64c01a2e5..fc40a1473058 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/uncore.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/uncore.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/uncore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/uncore.c</a></div><div class='hunk'>@@ -1367,6 +1367,11 @@ static const struct intel_uncore_init_fun skx_uncore_init __initconst = {</div><div class='ctx'> 	.pci_init = skx_uncore_pci_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct intel_uncore_init_fun icl_uncore_init __initconst = {</div><div class='add'>+	.cpu_init = icl_uncore_cpu_init,</div><div class='add'>+	.pci_init = skl_uncore_pci_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct x86_cpu_id intel_uncore_match[] __initconst = {</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EP,	  nhm_uncore_init),</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM,	  nhm_uncore_init),</div><div class='hunk'>@@ -1393,6 +1398,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,      skx_uncore_init),</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE, skl_uncore_init),</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_uncore_init),</div><div class='add'>+	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, icl_uncore_init),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h<br/>index 853a49a8ccf6..79eb2e21e4f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/uncore.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/uncore.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/uncore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/uncore.h</a></div><div class='hunk'>@@ -512,6 +512,7 @@ int skl_uncore_pci_init(void);</div><div class='ctx'> void snb_uncore_cpu_init(void);</div><div class='ctx'> void nhm_uncore_cpu_init(void);</div><div class='ctx'> void skl_uncore_cpu_init(void);</div><div class='add'>+void icl_uncore_cpu_init(void);</div><div class='ctx'> int snb_pci2phy_map_init(int devid);</div><div class='ctx'> </div><div class='ctx'> /* uncore_snbep.c */</div><div class='head'>diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c<br/>index 13493f43b247..f8431819b3e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/uncore_snb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/intel/uncore_snb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/intel/uncore_snb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/intel/uncore_snb.c</a></div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_CFL_4S_S_IMC	0x3e33</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_CFL_6S_S_IMC	0x3eca</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_CFL_8S_S_IMC	0x3e32</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_ICL_U_IMC		0x8a02</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_ICL_U2_IMC		0x8a12</div><div class='ctx'> </div><div class='ctx'> /* SNB event control */</div><div class='ctx'> #define SNB_UNC_CTL_EV_SEL_MASK			0x000000ff</div><div class='hunk'>@@ -93,6 +95,12 @@</div><div class='ctx'> #define SKL_UNC_PERF_GLOBAL_CTL			0xe01</div><div class='ctx'> #define SKL_UNC_GLOBAL_CTL_CORE_ALL		((1 &lt;&lt; 5) - 1)</div><div class='ctx'> </div><div class='add'>+/* ICL Cbo register */</div><div class='add'>+#define ICL_UNC_CBO_CONFIG			0x396</div><div class='add'>+#define ICL_UNC_NUM_CBO_MASK			0xf</div><div class='add'>+#define ICL_UNC_CBO_0_PER_CTR0			0x702</div><div class='add'>+#define ICL_UNC_CBO_MSR_OFFSET			0x8</div><div class='add'>+</div><div class='ctx'> DEFINE_UNCORE_FORMAT_ATTR(event, event, "config:0-7");</div><div class='ctx'> DEFINE_UNCORE_FORMAT_ATTR(umask, umask, "config:8-15");</div><div class='ctx'> DEFINE_UNCORE_FORMAT_ATTR(edge, edge, "config:18");</div><div class='hunk'>@@ -280,6 +288,70 @@ void skl_uncore_cpu_init(void)</div><div class='ctx'> 	snb_uncore_arb.ops = &amp;skl_uncore_msr_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct intel_uncore_type icl_uncore_cbox = {</div><div class='add'>+	.name		= "cbox",</div><div class='add'>+	.num_counters   = 4,</div><div class='add'>+	.perf_ctr_bits	= 44,</div><div class='add'>+	.perf_ctr	= ICL_UNC_CBO_0_PER_CTR0,</div><div class='add'>+	.event_ctl	= SNB_UNC_CBO_0_PERFEVTSEL0,</div><div class='add'>+	.event_mask	= SNB_UNC_RAW_EVENT_MASK,</div><div class='add'>+	.msr_offset	= ICL_UNC_CBO_MSR_OFFSET,</div><div class='add'>+	.ops		= &amp;skl_uncore_msr_ops,</div><div class='add'>+	.format_group	= &amp;snb_uncore_format_group,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct uncore_event_desc icl_uncore_events[] = {</div><div class='add'>+	INTEL_UNCORE_EVENT_DESC(clockticks, "event=0xff"),</div><div class='add'>+	{ /* end: all zeroes */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *icl_uncore_clock_formats_attr[] = {</div><div class='add'>+	&amp;format_attr_event.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group icl_uncore_clock_format_group = {</div><div class='add'>+	.name = "format",</div><div class='add'>+	.attrs = icl_uncore_clock_formats_attr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intel_uncore_type icl_uncore_clockbox = {</div><div class='add'>+	.name		= "clock",</div><div class='add'>+	.num_counters	= 1,</div><div class='add'>+	.num_boxes	= 1,</div><div class='add'>+	.fixed_ctr_bits	= 48,</div><div class='add'>+	.fixed_ctr	= SNB_UNC_FIXED_CTR,</div><div class='add'>+	.fixed_ctl	= SNB_UNC_FIXED_CTR_CTRL,</div><div class='add'>+	.single_fixed	= 1,</div><div class='add'>+	.event_mask	= SNB_UNC_CTL_EV_SEL_MASK,</div><div class='add'>+	.format_group	= &amp;icl_uncore_clock_format_group,</div><div class='add'>+	.ops		= &amp;skl_uncore_msr_ops,</div><div class='add'>+	.event_descs	= icl_uncore_events,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intel_uncore_type *icl_msr_uncores[] = {</div><div class='add'>+	&amp;icl_uncore_cbox,</div><div class='add'>+	&amp;snb_uncore_arb,</div><div class='add'>+	&amp;icl_uncore_clockbox,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int icl_get_cbox_num(void)</div><div class='add'>+{</div><div class='add'>+	u64 num_boxes;</div><div class='add'>+</div><div class='add'>+	rdmsrl(ICL_UNC_CBO_CONFIG, num_boxes);</div><div class='add'>+</div><div class='add'>+	return num_boxes &amp; ICL_UNC_NUM_CBO_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void icl_uncore_cpu_init(void)</div><div class='add'>+{</div><div class='add'>+	uncore_msr_uncores = icl_msr_uncores;</div><div class='add'>+	icl_uncore_cbox.num_boxes = icl_get_cbox_num();</div><div class='add'>+	snb_uncore_arb.ops = &amp;skl_uncore_msr_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	SNB_PCI_UNCORE_IMC,</div><div class='ctx'> };</div><div class='hunk'>@@ -668,6 +740,18 @@ static const struct pci_device_id skl_uncore_pci_ids[] = {</div><div class='ctx'> 	{ /* end: all zeroes */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct pci_device_id icl_uncore_pci_ids[] = {</div><div class='add'>+	{ /* IMC */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICL_U_IMC),</div><div class='add'>+		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),</div><div class='add'>+	},</div><div class='add'>+	{ /* IMC */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICL_U2_IMC),</div><div class='add'>+		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),</div><div class='add'>+	},</div><div class='add'>+	{ /* end: all zeroes */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct pci_driver snb_uncore_pci_driver = {</div><div class='ctx'> 	.name		= "snb_uncore",</div><div class='ctx'> 	.id_table	= snb_uncore_pci_ids,</div><div class='hunk'>@@ -693,6 +777,11 @@ static struct pci_driver skl_uncore_pci_driver = {</div><div class='ctx'> 	.id_table	= skl_uncore_pci_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct pci_driver icl_uncore_pci_driver = {</div><div class='add'>+	.name		= "icl_uncore",</div><div class='add'>+	.id_table	= icl_uncore_pci_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct imc_uncore_pci_dev {</div><div class='ctx'> 	__u32 pci_id;</div><div class='ctx'> 	struct pci_driver *driver;</div><div class='hunk'>@@ -732,6 +821,8 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = {</div><div class='ctx'> 	IMC_DEV(CFL_4S_S_IMC, &amp;skl_uncore_pci_driver),  /* 8th Gen Core S 4 Cores Server */</div><div class='ctx'> 	IMC_DEV(CFL_6S_S_IMC, &amp;skl_uncore_pci_driver),  /* 8th Gen Core S 6 Cores Server */</div><div class='ctx'> 	IMC_DEV(CFL_8S_S_IMC, &amp;skl_uncore_pci_driver),  /* 8th Gen Core S 8 Cores Server */</div><div class='add'>+	IMC_DEV(ICL_U_IMC, &amp;icl_uncore_pci_driver),	/* 10th Gen Core Mobile */</div><div class='add'>+	IMC_DEV(ICL_U2_IMC, &amp;icl_uncore_pci_driver),	/* 10th Gen Core Mobile */</div><div class='ctx'> 	{  /* end marker */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c<br/>index a878e6286e4a..f3f4c2263501 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/msr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/msr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/msr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/msr.c</a></div><div class='hunk'>@@ -89,6 +89,7 @@ static bool test_intel(int idx)</div><div class='ctx'> 	case INTEL_FAM6_SKYLAKE_X:</div><div class='ctx'> 	case INTEL_FAM6_KABYLAKE_MOBILE:</div><div class='ctx'> 	case INTEL_FAM6_KABYLAKE_DESKTOP:</div><div class='add'>+	case INTEL_FAM6_ICELAKE_MOBILE:</div><div class='ctx'> 		if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF)</div><div class='ctx'> 			return true;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h<br/>index a75955741c50..07fc84bb85c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/perf_event.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/events/perf_event.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/events/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/events/perf_event.h</a></div><div class='hunk'>@@ -49,28 +49,33 @@ struct event_constraint {</div><div class='ctx'> 		unsigned long	idxmsk[BITS_TO_LONGS(X86_PMC_IDX_MAX)];</div><div class='ctx'> 		u64		idxmsk64;</div><div class='ctx'> 	};</div><div class='del'>-	u64	code;</div><div class='del'>-	u64	cmask;</div><div class='del'>-	int	weight;</div><div class='del'>-	int	overlap;</div><div class='del'>-	int	flags;</div><div class='add'>+	u64		code;</div><div class='add'>+	u64		cmask;</div><div class='add'>+	int		weight;</div><div class='add'>+	int		overlap;</div><div class='add'>+	int		flags;</div><div class='add'>+	unsigned int	size;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static inline bool constraint_match(struct event_constraint *c, u64 ecode)</div><div class='add'>+{</div><div class='add'>+	return ((ecode &amp; c-&gt;cmask) - c-&gt;code) &lt;= (u64)c-&gt;size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * struct hw_perf_event.flags flags</div><div class='ctx'>  */</div><div class='ctx'> #define PERF_X86_EVENT_PEBS_LDLAT	0x0001 /* ld+ldlat data address sampling */</div><div class='ctx'> #define PERF_X86_EVENT_PEBS_ST		0x0002 /* st data address sampling */</div><div class='ctx'> #define PERF_X86_EVENT_PEBS_ST_HSW	0x0004 /* haswell style datala, store */</div><div class='del'>-#define PERF_X86_EVENT_COMMITTED	0x0008 /* event passed commit_txn */</div><div class='del'>-#define PERF_X86_EVENT_PEBS_LD_HSW	0x0010 /* haswell style datala, load */</div><div class='del'>-#define PERF_X86_EVENT_PEBS_NA_HSW	0x0020 /* haswell style datala, unknown */</div><div class='del'>-#define PERF_X86_EVENT_EXCL		0x0040 /* HT exclusivity on counter */</div><div class='del'>-#define PERF_X86_EVENT_DYNAMIC		0x0080 /* dynamic alloc'd constraint */</div><div class='del'>-#define PERF_X86_EVENT_RDPMC_ALLOWED	0x0100 /* grant rdpmc permission */</div><div class='del'>-#define PERF_X86_EVENT_EXCL_ACCT	0x0200 /* accounted EXCL event */</div><div class='del'>-#define PERF_X86_EVENT_AUTO_RELOAD	0x0400 /* use PEBS auto-reload */</div><div class='del'>-#define PERF_X86_EVENT_LARGE_PEBS	0x0800 /* use large PEBS */</div><div class='del'>-</div><div class='add'>+#define PERF_X86_EVENT_PEBS_LD_HSW	0x0008 /* haswell style datala, load */</div><div class='add'>+#define PERF_X86_EVENT_PEBS_NA_HSW	0x0010 /* haswell style datala, unknown */</div><div class='add'>+#define PERF_X86_EVENT_EXCL		0x0020 /* HT exclusivity on counter */</div><div class='add'>+#define PERF_X86_EVENT_DYNAMIC		0x0040 /* dynamic alloc'd constraint */</div><div class='add'>+#define PERF_X86_EVENT_RDPMC_ALLOWED	0x0080 /* grant rdpmc permission */</div><div class='add'>+#define PERF_X86_EVENT_EXCL_ACCT	0x0100 /* accounted EXCL event */</div><div class='add'>+#define PERF_X86_EVENT_AUTO_RELOAD	0x0200 /* use PEBS auto-reload */</div><div class='add'>+#define PERF_X86_EVENT_LARGE_PEBS	0x0400 /* use large PEBS */</div><div class='ctx'> </div><div class='ctx'> struct amd_nb {</div><div class='ctx'> 	int nb_id;  /* NorthBridge id */</div><div class='hunk'>@@ -96,25 +101,43 @@ struct amd_nb {</div><div class='ctx'> 	PERF_SAMPLE_REGS_INTR | PERF_SAMPLE_REGS_USER | \</div><div class='ctx'> 	PERF_SAMPLE_PERIOD)</div><div class='ctx'> </div><div class='del'>-#define PEBS_REGS \</div><div class='del'>-	(PERF_REG_X86_AX | \</div><div class='del'>-	 PERF_REG_X86_BX | \</div><div class='del'>-	 PERF_REG_X86_CX | \</div><div class='del'>-	 PERF_REG_X86_DX | \</div><div class='del'>-	 PERF_REG_X86_DI | \</div><div class='del'>-	 PERF_REG_X86_SI | \</div><div class='del'>-	 PERF_REG_X86_SP | \</div><div class='del'>-	 PERF_REG_X86_BP | \</div><div class='del'>-	 PERF_REG_X86_IP | \</div><div class='del'>-	 PERF_REG_X86_FLAGS | \</div><div class='del'>-	 PERF_REG_X86_R8 | \</div><div class='del'>-	 PERF_REG_X86_R9 | \</div><div class='del'>-	 PERF_REG_X86_R10 | \</div><div class='del'>-	 PERF_REG_X86_R11 | \</div><div class='del'>-	 PERF_REG_X86_R12 | \</div><div class='del'>-	 PERF_REG_X86_R13 | \</div><div class='del'>-	 PERF_REG_X86_R14 | \</div><div class='del'>-	 PERF_REG_X86_R15)</div><div class='add'>+#define PEBS_GP_REGS			\</div><div class='add'>+	((1ULL &lt;&lt; PERF_REG_X86_AX)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_BX)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_CX)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_DX)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_DI)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_SI)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_SP)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_BP)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_IP)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_FLAGS) | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R8)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R9)    | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R10)   | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R11)   | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R12)   | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R13)   | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R14)   | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_R15))</div><div class='add'>+</div><div class='add'>+#define PEBS_XMM_REGS                   \</div><div class='add'>+	((1ULL &lt;&lt; PERF_REG_X86_XMM0)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM1)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM2)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM3)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM4)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM5)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM6)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM7)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM8)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM9)  | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM10) | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM11) | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM12) | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM13) | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM14) | \</div><div class='add'>+	 (1ULL &lt;&lt; PERF_REG_X86_XMM15))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Per register state.</div><div class='hunk'>@@ -207,10 +230,16 @@ struct cpu_hw_events {</div><div class='ctx'> 	int			n_pebs;</div><div class='ctx'> 	int			n_large_pebs;</div><div class='ctx'> </div><div class='add'>+	/* Current super set of events hardware configuration */</div><div class='add'>+	u64			pebs_data_cfg;</div><div class='add'>+	u64			active_pebs_data_cfg;</div><div class='add'>+	int			pebs_record_size;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Intel LBR bits</div><div class='ctx'> 	 */</div><div class='ctx'> 	int				lbr_users;</div><div class='add'>+	int				lbr_pebs_users;</div><div class='ctx'> 	struct perf_branch_stack	lbr_stack;</div><div class='ctx'> 	struct perf_branch_entry	lbr_entries[MAX_LBR_ENTRIES];</div><div class='ctx'> 	struct er_account		*lbr_sel;</div><div class='hunk'>@@ -257,18 +286,29 @@ struct cpu_hw_events {</div><div class='ctx'> 	void				*kfree_on_online[X86_PERF_KFREE_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define __EVENT_CONSTRAINT(c, n, m, w, o, f) {\</div><div class='add'>+#define __EVENT_CONSTRAINT_RANGE(c, e, n, m, w, o, f) {	\</div><div class='ctx'> 	{ .idxmsk64 = (n) },		\</div><div class='ctx'> 	.code = (c),			\</div><div class='add'>+	.size = (e) - (c),		\</div><div class='ctx'> 	.cmask = (m),			\</div><div class='ctx'> 	.weight = (w),			\</div><div class='ctx'> 	.overlap = (o),			\</div><div class='ctx'> 	.flags = f,			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __EVENT_CONSTRAINT(c, n, m, w, o, f) \</div><div class='add'>+	__EVENT_CONSTRAINT_RANGE(c, c, n, m, w, o, f)</div><div class='add'>+</div><div class='ctx'> #define EVENT_CONSTRAINT(c, n, m)	\</div><div class='ctx'> 	__EVENT_CONSTRAINT(c, n, m, HWEIGHT(n), 0, 0)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The constraint_match() function only works for 'simple' event codes</div><div class='add'>+ * and not for extended (AMD64_EVENTSEL_EVENT) events codes.</div><div class='add'>+ */</div><div class='add'>+#define EVENT_CONSTRAINT_RANGE(c, e, n, m) \</div><div class='add'>+	__EVENT_CONSTRAINT_RANGE(c, e, n, m, HWEIGHT(n), 0, 0)</div><div class='add'>+</div><div class='ctx'> #define INTEL_EXCLEVT_CONSTRAINT(c, n)	\</div><div class='ctx'> 	__EVENT_CONSTRAINT(c, n, ARCH_PERFMON_EVENTSEL_EVENT, HWEIGHT(n),\</div><div class='ctx'> 			   0, PERF_X86_EVENT_EXCL)</div><div class='hunk'>@@ -304,6 +344,12 @@ struct cpu_hw_events {</div><div class='ctx'> 	EVENT_CONSTRAINT(c, n, ARCH_PERFMON_EVENTSEL_EVENT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Constraint on a range of Event codes</div><div class='add'>+ */</div><div class='add'>+#define INTEL_EVENT_CONSTRAINT_RANGE(c, e, n)			\</div><div class='add'>+	EVENT_CONSTRAINT_RANGE(c, e, n, ARCH_PERFMON_EVENTSEL_EVENT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Constraint on the Event code + UMask + fixed-mask</div><div class='ctx'>  *</div><div class='ctx'>  * filter mask to validate fixed counter events.</div><div class='hunk'>@@ -350,6 +396,9 @@ struct cpu_hw_events {</div><div class='ctx'> #define INTEL_FLAGS_EVENT_CONSTRAINT(c, n) \</div><div class='ctx'> 	EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS)</div><div class='ctx'> </div><div class='add'>+#define INTEL_FLAGS_EVENT_CONSTRAINT_RANGE(c, e, n)			\</div><div class='add'>+	EVENT_CONSTRAINT_RANGE(c, e, n, INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS)</div><div class='add'>+</div><div class='ctx'> /* Check only flags, but allow all event/umask */</div><div class='ctx'> #define INTEL_ALL_EVENT_CONSTRAINT(code, n)	\</div><div class='ctx'> 	EVENT_CONSTRAINT(code, n, X86_ALL_EVENT_FLAGS)</div><div class='hunk'>@@ -366,6 +415,11 @@ struct cpu_hw_events {</div><div class='ctx'> 			  ARCH_PERFMON_EVENTSEL_EVENT|X86_ALL_EVENT_FLAGS, \</div><div class='ctx'> 			  HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_LD_HSW)</div><div class='ctx'> </div><div class='add'>+#define INTEL_FLAGS_EVENT_CONSTRAINT_DATALA_LD_RANGE(code, end, n) \</div><div class='add'>+	__EVENT_CONSTRAINT_RANGE(code, end, n,				\</div><div class='add'>+			  ARCH_PERFMON_EVENTSEL_EVENT|X86_ALL_EVENT_FLAGS, \</div><div class='add'>+			  HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_LD_HSW)</div><div class='add'>+</div><div class='ctx'> #define INTEL_FLAGS_EVENT_CONSTRAINT_DATALA_XLD(code, n) \</div><div class='ctx'> 	__EVENT_CONSTRAINT(code, n,			\</div><div class='ctx'> 			  ARCH_PERFMON_EVENTSEL_EVENT|X86_ALL_EVENT_FLAGS, \</div><div class='hunk'>@@ -473,6 +527,7 @@ union perf_capabilities {</div><div class='ctx'> 		 * values &gt; 32bit.</div><div class='ctx'> 		 */</div><div class='ctx'> 		u64	full_width_write:1;</div><div class='add'>+		u64     pebs_baseline:1;</div><div class='ctx'> 	};</div><div class='ctx'> 	u64	capabilities;</div><div class='ctx'> };</div><div class='hunk'>@@ -613,14 +668,16 @@ struct x86_pmu {</div><div class='ctx'> 			pebs_broken		:1,</div><div class='ctx'> 			pebs_prec_dist		:1,</div><div class='ctx'> 			pebs_no_tlb		:1,</div><div class='del'>-			pebs_no_isolation	:1;</div><div class='add'>+			pebs_no_isolation	:1,</div><div class='add'>+			pebs_no_xmm_regs	:1;</div><div class='ctx'> 	int		pebs_record_size;</div><div class='ctx'> 	int		pebs_buffer_size;</div><div class='add'>+	int		max_pebs_events;</div><div class='ctx'> 	void		(*drain_pebs)(struct pt_regs *regs);</div><div class='ctx'> 	struct event_constraint *pebs_constraints;</div><div class='ctx'> 	void		(*pebs_aliases)(struct perf_event *event);</div><div class='del'>-	int 		max_pebs_events;</div><div class='ctx'> 	unsigned long	large_pebs_flags;</div><div class='add'>+	u64		rtm_abort_event;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Intel LBR</div><div class='hunk'>@@ -714,6 +771,7 @@ static struct perf_pmu_events_ht_attr event_attr_##v = {		\</div><div class='ctx'> 	.event_str_ht	= ht,						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct pmu *x86_get_pmu(void);</div><div class='ctx'> extern struct x86_pmu x86_pmu __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static inline bool x86_pmu_has_lbr_callstack(void)</div><div class='hunk'>@@ -941,6 +999,8 @@ extern struct event_constraint intel_bdw_pebs_event_constraints[];</div><div class='ctx'> </div><div class='ctx'> extern struct event_constraint intel_skl_pebs_event_constraints[];</div><div class='ctx'> </div><div class='add'>+extern struct event_constraint intel_icl_pebs_event_constraints[];</div><div class='add'>+</div><div class='ctx'> struct event_constraint *intel_pebs_constraints(struct perf_event *event);</div><div class='ctx'> </div><div class='ctx'> void intel_pmu_pebs_add(struct perf_event *event);</div><div class='hunk'>@@ -959,6 +1019,8 @@ void intel_pmu_pebs_sched_task(struct perf_event_context *ctx, bool sched_in);</div><div class='ctx'> </div><div class='ctx'> void intel_pmu_auto_reload_read(struct perf_event *event);</div><div class='ctx'> </div><div class='add'>+void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr);</div><div class='add'>+</div><div class='ctx'> void intel_ds_init(void);</div><div class='ctx'> </div><div class='ctx'> void intel_pmu_lbr_sched_task(struct perf_event_context *ctx, bool sched_in);</div><div class='head'>diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c<br/>index 8eb6fbee8e13..5c056b8aebef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/hyperv/hv_apic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/hyperv/hv_apic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/hyperv/hv_apic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/hyperv/hv_apic.c</a></div><div class='hunk'>@@ -86,6 +86,11 @@ static void hv_apic_write(u32 reg, u32 val)</div><div class='ctx'> </div><div class='ctx'> static void hv_apic_eoi_write(u32 reg, u32 val)</div><div class='ctx'> {</div><div class='add'>+	struct hv_vp_assist_page *hvp = hv_vp_assist_page[smp_processor_id()];</div><div class='add'>+</div><div class='add'>+	if (hvp &amp;&amp; (xchg(&amp;hvp-&gt;apic_assist, 0) &amp; 0x1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	wrmsr(HV_X64_MSR_EOI, val, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c<br/>index 6461a16b4559..e4ba467a9fc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/hyperv/hv_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/hyperv/hv_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/hyperv/hv_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/hyperv/hv_init.c</a></div><div class='hunk'>@@ -103,9 +103,13 @@ static int hv_cpu_init(unsigned int cpu)</div><div class='ctx'> 	u64 msr_vp_index;</div><div class='ctx'> 	struct hv_vp_assist_page **hvp = &amp;hv_vp_assist_page[smp_processor_id()];</div><div class='ctx'> 	void **input_arg;</div><div class='add'>+	struct page *pg;</div><div class='ctx'> </div><div class='ctx'> 	input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg);</div><div class='del'>-	*input_arg = page_address(alloc_page(GFP_KERNEL));</div><div class='add'>+	pg = alloc_page(GFP_KERNEL);</div><div class='add'>+	if (unlikely(!pg))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	*input_arg = page_address(pg);</div><div class='ctx'> </div><div class='ctx'> 	hv_get_vp_index(msr_vp_index);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/hyperv/hv_spinlock.c b/arch/x86/hyperv/hv_spinlock.c<br/>index a861b0456b1a..07f21a06392f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/hyperv/hv_spinlock.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/hyperv/hv_spinlock.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/hyperv/hv_spinlock.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/hyperv/hv_spinlock.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static void hv_qlock_wait(u8 *byte, u8 val)</div><div class='ctx'> /*</div><div class='ctx'>  * Hyper-V does not support this so far.</div><div class='ctx'>  */</div><div class='del'>-bool hv_vcpu_is_preempted(int vcpu)</div><div class='add'>+__visible bool hv_vcpu_is_preempted(int vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c<br/>index 321fe5f5d0e9..629d1ee05599 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/ia32/ia32_signal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/ia32/ia32_signal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/ia32/ia32_signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/ia32/ia32_signal.c</a></div><div class='hunk'>@@ -61,9 +61,8 @@</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define RELOAD_SEG(seg)		{		\</div><div class='del'>-	unsigned int pre = GET_SEG(seg);	\</div><div class='add'>+	unsigned int pre = (seg) | 3;		\</div><div class='ctx'> 	unsigned int cur = get_user_seg(seg);	\</div><div class='del'>-	pre |= 3;				\</div><div class='ctx'> 	if (pre != cur)				\</div><div class='ctx'> 		set_user_seg(seg, pre);		\</div><div class='ctx'> }</div><div class='hunk'>@@ -72,6 +71,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 				   struct sigcontext_32 __user *sc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmpflags, err = 0;</div><div class='add'>+	u16 gs, fs, es, ds;</div><div class='ctx'> 	void __user *buf;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -79,16 +79,10 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 	current-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='ctx'> </div><div class='ctx'> 	get_user_try {</div><div class='del'>-		/*</div><div class='del'>-		 * Reload fs and gs if they have changed in the signal</div><div class='del'>-		 * handler.  This does not handle long fs/gs base changes in</div><div class='del'>-		 * the handler, but does not clobber them at least in the</div><div class='del'>-		 * normal case.</div><div class='del'>-		 */</div><div class='del'>-		RELOAD_SEG(gs);</div><div class='del'>-		RELOAD_SEG(fs);</div><div class='del'>-		RELOAD_SEG(ds);</div><div class='del'>-		RELOAD_SEG(es);</div><div class='add'>+		gs = GET_SEG(gs);</div><div class='add'>+		fs = GET_SEG(fs);</div><div class='add'>+		ds = GET_SEG(ds);</div><div class='add'>+		es = GET_SEG(es);</div><div class='ctx'> </div><div class='ctx'> 		COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);</div><div class='ctx'> 		COPY(dx); COPY(cx); COPY(ip); COPY(ax);</div><div class='hunk'>@@ -106,6 +100,17 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 		buf = compat_ptr(tmp);</div><div class='ctx'> 	} get_user_catch(err);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Reload fs and gs if they have changed in the signal</div><div class='add'>+	 * handler.  This does not handle long fs/gs base changes in</div><div class='add'>+	 * the handler, but does not clobber them at least in the</div><div class='add'>+	 * normal case.</div><div class='add'>+	 */</div><div class='add'>+	RELOAD_SEG(gs);</div><div class='add'>+	RELOAD_SEG(fs);</div><div class='add'>+	RELOAD_SEG(ds);</div><div class='add'>+	RELOAD_SEG(es);</div><div class='add'>+</div><div class='ctx'> 	err |= fpu__restore_sig(buf, 1);</div><div class='ctx'> </div><div class='ctx'> 	force_iret();</div><div class='hunk'>@@ -216,8 +221,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,</div><div class='ctx'> 				 size_t frame_size,</div><div class='ctx'> 				 void __user **fpstate)</div><div class='ctx'> {</div><div class='del'>-	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='del'>-	unsigned long sp;</div><div class='add'>+	unsigned long sp, fx_aligned, math_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Default to using normal stack */</div><div class='ctx'> 	sp = regs-&gt;sp;</div><div class='hunk'>@@ -231,15 +235,11 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,</div><div class='ctx'> 		 ksig-&gt;ka.sa.sa_restorer)</div><div class='ctx'> 		sp = (unsigned long) ksig-&gt;ka.sa.sa_restorer;</div><div class='ctx'> </div><div class='del'>-	if (fpu-&gt;initialized) {</div><div class='del'>-		unsigned long fx_aligned, math_size;</div><div class='del'>-</div><div class='del'>-		sp = fpu__alloc_mathframe(sp, 1, &amp;fx_aligned, &amp;math_size);</div><div class='del'>-		*fpstate = (struct _fpstate_32 __user *) sp;</div><div class='del'>-		if (copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,</div><div class='del'>-				    math_size) &lt; 0)</div><div class='del'>-			return (void __user *) -1L;</div><div class='del'>-	}</div><div class='add'>+	sp = fpu__alloc_mathframe(sp, 1, &amp;fx_aligned, &amp;math_size);</div><div class='add'>+	*fpstate = (struct _fpstate_32 __user *) sp;</div><div class='add'>+	if (copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,</div><div class='add'>+				     math_size) &lt; 0)</div><div class='add'>+		return (void __user *) -1L;</div><div class='ctx'> </div><div class='ctx'> 	sp -= frame_size;</div><div class='ctx'> 	/* Align the stack pointer according to the i386 ABI,</div><div class='head'>diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild<br/>index a0ab9ab61c75..eebd05942e6c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/Kbuild</a></div><div class='hunk'>@@ -11,3 +11,4 @@ generic-y += early_ioremap.h</div><div class='ctx'> generic-y += export.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='head'>diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h<br/>index 31b627b43a8e..464034db299f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/alternative-asm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/alternative-asm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/alternative-asm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/alternative-asm.h</a></div><div class='hunk'>@@ -20,6 +20,17 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * objtool annotation to ignore the alternatives and only consider the original</div><div class='add'>+ * instruction(s).</div><div class='add'>+ */</div><div class='add'>+.macro ANNOTATE_IGNORE_ALTERNATIVE</div><div class='add'>+	.Lannotate_\@:</div><div class='add'>+	.pushsection .discard.ignore_alts</div><div class='add'>+	.long .Lannotate_\@ - .</div><div class='add'>+	.popsection</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Issue one struct alt_instr descriptor entry (need to put it into</div><div class='ctx'>  * the section .altinstructions, see below). This entry contains</div><div class='ctx'>  * enough information for the alternatives patching code to patch an</div><div class='head'>diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h<br/>index 4c74073a19cc..094fbc9c0b1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/alternative.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/alternative.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/alternative.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/alternative.h</a></div><div class='hunk'>@@ -45,6 +45,16 @@</div><div class='ctx'> #define LOCK_PREFIX ""</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * objtool annotation to ignore the alternatives and only consider the original</div><div class='add'>+ * instruction(s).</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_IGNORE_ALTERNATIVE				\</div><div class='add'>+	"999:\n\t"						\</div><div class='add'>+	".pushsection .discard.ignore_alts\n\t"			\</div><div class='add'>+	".long 999b - .\n\t"					\</div><div class='add'>+	".popsection\n\t"</div><div class='add'>+</div><div class='ctx'> struct alt_instr {</div><div class='ctx'> 	s32 instr_offset;	/* original instruction */</div><div class='ctx'> 	s32 repl_offset;	/* offset to replacement instruction */</div><div class='head'>diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h<br/>index 6467757bb39f..3ff577c0b102 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/asm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/asm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/asm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/asm.h</a></div><div class='hunk'>@@ -148,30 +148,6 @@</div><div class='ctx'> 	_ASM_PTR (entry);					\</div><div class='ctx'> 	.popsection</div><div class='ctx'> </div><div class='del'>-.macro ALIGN_DESTINATION</div><div class='del'>-	/* check for bad alignment of destination */</div><div class='del'>-	movl %edi,%ecx</div><div class='del'>-	andl $7,%ecx</div><div class='del'>-	jz 102f				/* already aligned */</div><div class='del'>-	subl $8,%ecx</div><div class='del'>-	negl %ecx</div><div class='del'>-	subl %ecx,%edx</div><div class='del'>-100:	movb (%rsi),%al</div><div class='del'>-101:	movb %al,(%rdi)</div><div class='del'>-	incq %rsi</div><div class='del'>-	incq %rdi</div><div class='del'>-	decl %ecx</div><div class='del'>-	jnz 100b</div><div class='del'>-102:</div><div class='del'>-	.section .fixup,"ax"</div><div class='del'>-103:	addl %ecx,%edx			/* ecx is zerorest also */</div><div class='del'>-	jmp copy_user_handle_tail</div><div class='del'>-	.previous</div><div class='del'>-</div><div class='del'>-	_ASM_EXTABLE_UA(100b, 103b)</div><div class='del'>-	_ASM_EXTABLE_UA(101b, 103b)</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> #else</div><div class='ctx'> # define _EXPAND_EXTABLE_HANDLE(x) #x</div><div class='ctx'> # define _ASM_EXTABLE_HANDLE(from, to, handler)			\</div><div class='head'>diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h<br/>index d153d570bb04..8e790ec219a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/bitops.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/bitops.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/bitops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/bitops.h</a></div><div class='hunk'>@@ -36,16 +36,17 @@</div><div class='ctx'>  * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define BITOP_ADDR(x) "+m" (*(volatile long *) (x))</div><div class='add'>+#define RLONG_ADDR(x)			 "m" (*(volatile long *) (x))</div><div class='add'>+#define WBYTE_ADDR(x)			"+m" (*(volatile char *) (x))</div><div class='ctx'> </div><div class='del'>-#define ADDR				BITOP_ADDR(addr)</div><div class='add'>+#define ADDR				RLONG_ADDR(addr)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We do the locked ops that don't return the old value as</div><div class='ctx'>  * a mask operation on a byte.</div><div class='ctx'>  */</div><div class='ctx'> #define IS_IMMEDIATE(nr)		(__builtin_constant_p(nr))</div><div class='del'>-#define CONST_MASK_ADDR(nr, addr)	BITOP_ADDR((void *)(addr) + ((nr)&gt;&gt;3))</div><div class='add'>+#define CONST_MASK_ADDR(nr, addr)	WBYTE_ADDR((void *)(addr) + ((nr)&gt;&gt;3))</div><div class='ctx'> #define CONST_MASK(nr)			(1 &lt;&lt; ((nr) &amp; 7))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -73,7 +74,7 @@ set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> 			: "memory");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		asm volatile(LOCK_PREFIX __ASM_SIZE(bts) " %1,%0"</div><div class='del'>-			: BITOP_ADDR(addr) : "Ir" (nr) : "memory");</div><div class='add'>+			: : RLONG_ADDR(addr), "Ir" (nr) : "memory");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +89,7 @@ set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline void __set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	asm volatile(__ASM_SIZE(bts) " %1,%0" : ADDR : "Ir" (nr) : "memory");</div><div class='add'>+	asm volatile(__ASM_SIZE(bts) " %1,%0" : : ADDR, "Ir" (nr) : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -110,8 +111,7 @@ clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> 			: "iq" ((u8)~CONST_MASK(nr)));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0"</div><div class='del'>-			: BITOP_ADDR(addr)</div><div class='del'>-			: "Ir" (nr));</div><div class='add'>+			: : RLONG_ADDR(addr), "Ir" (nr) : "memory");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +131,7 @@ static __always_inline void clear_bit_unlock(long nr, volatile unsigned long *ad</div><div class='ctx'> </div><div class='ctx'> static __always_inline void __clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr));</div><div class='add'>+	asm volatile(__ASM_SIZE(btr) " %1,%0" : : ADDR, "Ir" (nr) : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)</div><div class='hunk'>@@ -139,7 +139,7 @@ static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile</div><div class='ctx'> 	bool negative;</div><div class='ctx'> 	asm volatile(LOCK_PREFIX "andb %2,%1"</div><div class='ctx'> 		CC_SET(s)</div><div class='del'>-		: CC_OUT(s) (negative), ADDR</div><div class='add'>+		: CC_OUT(s) (negative), WBYTE_ADDR(addr)</div><div class='ctx'> 		: "ir" ((char) ~(1 &lt;&lt; nr)) : "memory");</div><div class='ctx'> 	return negative;</div><div class='ctx'> }</div><div class='hunk'>@@ -155,13 +155,9 @@ static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile</div><div class='ctx'>  * __clear_bit() is non-atomic and implies release semantics before the memory</div><div class='ctx'>  * operation. It can be used for an unlock if no other CPUs can concurrently</div><div class='ctx'>  * modify other bits in the word.</div><div class='del'>- *</div><div class='del'>- * No memory barrier is required here, because x86 cannot reorder stores past</div><div class='del'>- * older loads. Same principle as spin_unlock.</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline void __clear_bit_unlock(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	barrier();</div><div class='ctx'> 	__clear_bit(nr, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +172,7 @@ static __always_inline void __clear_bit_unlock(long nr, volatile unsigned long *</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline void __change_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr));</div><div class='add'>+	asm volatile(__ASM_SIZE(btc) " %1,%0" : : ADDR, "Ir" (nr) : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -196,8 +192,7 @@ static __always_inline void change_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> 			: "iq" ((u8)CONST_MASK(nr)));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		asm volatile(LOCK_PREFIX __ASM_SIZE(btc) " %1,%0"</div><div class='del'>-			: BITOP_ADDR(addr)</div><div class='del'>-			: "Ir" (nr));</div><div class='add'>+			: : RLONG_ADDR(addr), "Ir" (nr) : "memory");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -242,8 +237,8 @@ static __always_inline bool __test_and_set_bit(long nr, volatile unsigned long *</div><div class='ctx'> </div><div class='ctx'> 	asm(__ASM_SIZE(bts) " %2,%1"</div><div class='ctx'> 	    CC_SET(c)</div><div class='del'>-	    : CC_OUT(c) (oldbit), ADDR</div><div class='del'>-	    : "Ir" (nr));</div><div class='add'>+	    : CC_OUT(c) (oldbit)</div><div class='add'>+	    : ADDR, "Ir" (nr) : "memory");</div><div class='ctx'> 	return oldbit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -282,8 +277,8 @@ static __always_inline bool __test_and_clear_bit(long nr, volatile unsigned long</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(__ASM_SIZE(btr) " %2,%1"</div><div class='ctx'> 		     CC_SET(c)</div><div class='del'>-		     : CC_OUT(c) (oldbit), ADDR</div><div class='del'>-		     : "Ir" (nr));</div><div class='add'>+		     : CC_OUT(c) (oldbit)</div><div class='add'>+		     : ADDR, "Ir" (nr) : "memory");</div><div class='ctx'> 	return oldbit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -294,8 +289,8 @@ static __always_inline bool __test_and_change_bit(long nr, volatile unsigned lon</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(__ASM_SIZE(btc) " %2,%1"</div><div class='ctx'> 		     CC_SET(c)</div><div class='del'>-		     : CC_OUT(c) (oldbit), ADDR</div><div class='del'>-		     : "Ir" (nr) : "memory");</div><div class='add'>+		     : CC_OUT(c) (oldbit)</div><div class='add'>+		     : ADDR, "Ir" (nr) : "memory");</div><div class='ctx'> </div><div class='ctx'> 	return oldbit;</div><div class='ctx'> }</div><div class='hunk'>@@ -326,7 +321,7 @@ static __always_inline bool variable_test_bit(long nr, volatile const unsigned l</div><div class='ctx'> 	asm volatile(__ASM_SIZE(bt) " %2,%1"</div><div class='ctx'> 		     CC_SET(c)</div><div class='ctx'> 		     : CC_OUT(c) (oldbit)</div><div class='del'>-		     : "m" (*(unsigned long *)addr), "Ir" (nr));</div><div class='add'>+		     : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");</div><div class='ctx'> </div><div class='ctx'> 	return oldbit;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h<br/>index 3417110574c1..31c379c1da41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/cpu_device_id.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/cpu_device_id.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/cpu_device_id.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/cpu_device_id.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _CPU_DEVICE_ID</div><div class='del'>-#define _CPU_DEVICE_ID 1</div><div class='add'>+#ifndef _ASM_X86_CPU_DEVICE_ID</div><div class='add'>+#define _ASM_X86_CPU_DEVICE_ID</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Declare drivers belonging to specific x86 CPUs</div><div class='hunk'>@@ -9,8 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> </div><div class='del'>-extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Match specific microcode revisions.</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,21 +20,22 @@ extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct x86_cpu_desc {</div><div class='del'>-	__u8	x86_family;</div><div class='del'>-	__u8	x86_vendor;</div><div class='del'>-	__u8	x86_model;</div><div class='del'>-	__u8	x86_stepping;</div><div class='del'>-	__u32	x86_microcode_rev;</div><div class='add'>+	u8	x86_family;</div><div class='add'>+	u8	x86_vendor;</div><div class='add'>+	u8	x86_model;</div><div class='add'>+	u8	x86_stepping;</div><div class='add'>+	u32	x86_microcode_rev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define INTEL_CPU_DESC(mod, step, rev) {			\</div><div class='del'>-	.x86_family = 6,					\</div><div class='del'>-	.x86_vendor = X86_VENDOR_INTEL,				\</div><div class='del'>-	.x86_model = mod,					\</div><div class='del'>-	.x86_stepping = step,					\</div><div class='del'>-	.x86_microcode_rev = rev,				\</div><div class='add'>+#define INTEL_CPU_DESC(model, stepping, revision) {		\</div><div class='add'>+	.x86_family		= 6,				\</div><div class='add'>+	.x86_vendor		= X86_VENDOR_INTEL,		\</div><div class='add'>+	.x86_model		= (model),			\</div><div class='add'>+	.x86_stepping		= (stepping),			\</div><div class='add'>+	.x86_microcode_rev	= (revision),			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);</div><div class='ctx'> extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* _ASM_X86_CPU_DEVICE_ID */</div><div class='head'>diff --git a/arch/x86/include/asm/cpu_entry_area.h b/arch/x86/include/asm/cpu_entry_area.h<br/>index 29c706415443..cff3f3f3bfe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/cpu_entry_area.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/cpu_entry_area.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/cpu_entry_area.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/cpu_entry_area.h</a></div><div class='hunk'>@@ -7,6 +7,64 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/intel_ds.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+</div><div class='add'>+/* Macro to enforce the same ordering and stack sizes */</div><div class='add'>+#define ESTACKS_MEMBERS(guardsize, db2_holesize)\</div><div class='add'>+	char	DF_stack_guard[guardsize];	\</div><div class='add'>+	char	DF_stack[EXCEPTION_STKSZ];	\</div><div class='add'>+	char	NMI_stack_guard[guardsize];	\</div><div class='add'>+	char	NMI_stack[EXCEPTION_STKSZ];	\</div><div class='add'>+	char	DB2_stack_guard[guardsize];	\</div><div class='add'>+	char	DB2_stack[db2_holesize];	\</div><div class='add'>+	char	DB1_stack_guard[guardsize];	\</div><div class='add'>+	char	DB1_stack[EXCEPTION_STKSZ];	\</div><div class='add'>+	char	DB_stack_guard[guardsize];	\</div><div class='add'>+	char	DB_stack[EXCEPTION_STKSZ];	\</div><div class='add'>+	char	MCE_stack_guard[guardsize];	\</div><div class='add'>+	char	MCE_stack[EXCEPTION_STKSZ];	\</div><div class='add'>+	char	IST_top_guard[guardsize];	\</div><div class='add'>+</div><div class='add'>+/* The exception stacks' physical storage. No guard pages required */</div><div class='add'>+struct exception_stacks {</div><div class='add'>+	ESTACKS_MEMBERS(0, 0)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The effective cpu entry area mapping with guard pages. */</div><div class='add'>+struct cea_exception_stacks {</div><div class='add'>+	ESTACKS_MEMBERS(PAGE_SIZE, EXCEPTION_STKSZ)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The exception stack ordering in [cea_]exception_stacks</div><div class='add'>+ */</div><div class='add'>+enum exception_stack_ordering {</div><div class='add'>+	ESTACK_DF,</div><div class='add'>+	ESTACK_NMI,</div><div class='add'>+	ESTACK_DB2,</div><div class='add'>+	ESTACK_DB1,</div><div class='add'>+	ESTACK_DB,</div><div class='add'>+	ESTACK_MCE,</div><div class='add'>+	N_EXCEPTION_STACKS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CEA_ESTACK_SIZE(st)					\</div><div class='add'>+	sizeof(((struct cea_exception_stacks *)0)-&gt;st## _stack)</div><div class='add'>+</div><div class='add'>+#define CEA_ESTACK_BOT(ceastp, st)				\</div><div class='add'>+	((unsigned long)&amp;(ceastp)-&gt;st## _stack)</div><div class='add'>+</div><div class='add'>+#define CEA_ESTACK_TOP(ceastp, st)				\</div><div class='add'>+	(CEA_ESTACK_BOT(ceastp, st) + CEA_ESTACK_SIZE(st))</div><div class='add'>+</div><div class='add'>+#define CEA_ESTACK_OFFS(st)					\</div><div class='add'>+	offsetof(struct cea_exception_stacks, st## _stack)</div><div class='add'>+</div><div class='add'>+#define CEA_ESTACK_PAGES					\</div><div class='add'>+	(sizeof(struct cea_exception_stacks) / PAGE_SIZE)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * cpu_entry_area is a percpu region that contains things needed by the CPU</div><div class='ctx'>  * and early entry/exit code.  Real types aren't used for all fields here</div><div class='hunk'>@@ -32,12 +90,9 @@ struct cpu_entry_area {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	/*</div><div class='del'>-	 * Exception stacks used for IST entries.</div><div class='del'>-	 *</div><div class='del'>-	 * In the future, this should have a separate slot for each stack</div><div class='del'>-	 * with guard pages between them.</div><div class='add'>+	 * Exception stacks used for IST entries with guard pages.</div><div class='ctx'> 	 */</div><div class='del'>-	char exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + DEBUG_STKSZ];</div><div class='add'>+	struct cea_exception_stacks estacks;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_CPU_SUP_INTEL</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -57,6 +112,7 @@ struct cpu_entry_area {</div><div class='ctx'> #define CPU_ENTRY_AREA_TOT_SIZE	(CPU_ENTRY_AREA_SIZE * NR_CPUS)</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU(struct cpu_entry_area *, cpu_entry_area);</div><div class='add'>+DECLARE_PER_CPU(struct cea_exception_stacks *, cea_exception_stacks);</div><div class='ctx'> </div><div class='ctx'> extern void setup_cpu_entry_areas(void);</div><div class='ctx'> extern void cea_set_pte(void *cea_vaddr, phys_addr_t pa, pgprot_t flags);</div><div class='hunk'>@@ -76,4 +132,7 @@ static inline struct entry_stack *cpu_entry_stack(int cpu)</div><div class='ctx'> 	return &amp;get_cpu_entry_area(cpu)-&gt;entry_stack_page.stack;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __this_cpu_ist_top_va(name)					\</div><div class='add'>+	CEA_ESTACK_TOP(__this_cpu_read(cea_exception_stacks), name)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h<br/>index ce95b8cbd229..1d337c51f7e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/cpufeature.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/cpufeature.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/cpufeature.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/cpufeature.h</a></div><div class='hunk'>@@ -112,8 +112,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32];</div><div class='ctx'> 	 test_cpu_cap(c, bit))</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_has(bit)						\</div><div class='del'>-	(__builtin_constant_p(bit) &amp;&amp; REQUIRED_MASK_BIT_SET(bit) ? 1 : 	\</div><div class='del'>-	 x86_this_cpu_test_bit(bit, (unsigned long *)&amp;cpu_info.x86_capability))</div><div class='add'>+	(__builtin_constant_p(bit) &amp;&amp; REQUIRED_MASK_BIT_SET(bit) ? 1 :	\</div><div class='add'>+	 x86_this_cpu_test_bit(bit,					\</div><div class='add'>+		(unsigned long __percpu *)&amp;cpu_info.x86_capability))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This macro is for detection of features which need kernel</div><div class='hunk'>@@ -155,11 +156,14 @@ extern void clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int bit);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Static testing of CPU features.  Used the same as boot_cpu_has().</div><div class='del'>- * These will statically patch the target code for additional</div><div class='del'>- * performance.</div><div class='add'>+ * Static testing of CPU features. Used the same as boot_cpu_has(). It</div><div class='add'>+ * statically patches the target code for additional performance. Use</div><div class='add'>+ * static_cpu_has() only in fast paths, where every cycle counts. Which</div><div class='add'>+ * means that the boot_cpu_has() variant is already fast enough for the</div><div class='add'>+ * majority of cases and you should stick to using it as it is generally</div><div class='add'>+ * only two instructions: a RIP-relative MOV and a TEST.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline __pure bool _static_cpu_has(u16 bit)</div><div class='add'>+static __always_inline bool _static_cpu_has(u16 bit)</div><div class='ctx'> {</div><div class='ctx'> 	asm_volatile_goto("1: jmp 6f\n"</div><div class='ctx'> 		 "2:\n"</div><div class='head'>diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h<br/>index 9e5ca30738e5..1a8609a15856 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/debugreg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/debugreg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/debugreg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/debugreg.h</a></div><div class='hunk'>@@ -104,11 +104,9 @@ static inline void debug_stack_usage_dec(void)</div><div class='ctx'> {</div><div class='ctx'> 	__this_cpu_dec(debug_stack_usage);</div><div class='ctx'> }</div><div class='del'>-int is_debug_stack(unsigned long addr);</div><div class='ctx'> void debug_stack_set_zero(void);</div><div class='ctx'> void debug_stack_reset(void);</div><div class='ctx'> #else /* !X86_64 */</div><div class='del'>-static inline int is_debug_stack(unsigned long addr) { return 0; }</div><div class='ctx'> static inline void debug_stack_set_zero(void) { }</div><div class='ctx'> static inline void debug_stack_reset(void) { }</div><div class='ctx'> static inline void debug_stack_usage_inc(void) { }</div><div class='head'>diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h<br/>index 50ba74a34a37..9da8cccdf3fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fixmap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fixmap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fixmap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/fixmap.h</a></div><div class='hunk'>@@ -103,8 +103,6 @@ enum fixed_addresses {</div><div class='ctx'> #ifdef CONFIG_PARAVIRT</div><div class='ctx'> 	FIX_PARAVIRT_BOOTMAP,</div><div class='ctx'> #endif</div><div class='del'>-	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */</div><div class='del'>-	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */</div><div class='ctx'> #ifdef	CONFIG_X86_INTEL_MID</div><div class='ctx'> 	FIX_LNW_VRTC,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h<br/>index b56d504af654..b774c52e5411 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/api.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/api.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/api.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/fpu/api.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef _ASM_X86_FPU_API_H</div><div class='ctx'> #define _ASM_X86_FPU_API_H</div><div class='add'>+#include &lt;linux/bottom_half.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Use kernel_fpu_begin/end() if you intend to use FPU in kernel context. It</div><div class='hunk'>@@ -21,6 +22,36 @@</div><div class='ctx'> extern void kernel_fpu_begin(void);</div><div class='ctx'> extern void kernel_fpu_end(void);</div><div class='ctx'> extern bool irq_fpu_usable(void);</div><div class='add'>+extern void fpregs_mark_activate(void);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use fpregs_lock() while editing CPU's FPU registers or fpu-&gt;state.</div><div class='add'>+ * A context switch will (and softirq might) save CPU's FPU registers to</div><div class='add'>+ * fpu-&gt;state and set TIF_NEED_FPU_LOAD leaving CPU's FPU registers in</div><div class='add'>+ * a random state.</div><div class='add'>+ */</div><div class='add'>+static inline void fpregs_lock(void)</div><div class='add'>+{</div><div class='add'>+	preempt_disable();</div><div class='add'>+	local_bh_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fpregs_unlock(void)</div><div class='add'>+{</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_DEBUG_FPU</div><div class='add'>+extern void fpregs_assert_state_consistent(void);</div><div class='add'>+#else</div><div class='add'>+static inline void fpregs_assert_state_consistent(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load the task FPU state before returning to userspace.</div><div class='add'>+ */</div><div class='add'>+extern void switch_fpu_return(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Query the presence of one or more xfeatures. Works on any legacy CPU as well.</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h<br/>index fb04a3ded7dd..9e27fa05a7ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/fpu/internal.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/user.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='hunk'>@@ -24,14 +25,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * High level FPU state handling functions:</div><div class='ctx'>  */</div><div class='del'>-extern void fpu__initialize(struct fpu *fpu);</div><div class='ctx'> extern void fpu__prepare_read(struct fpu *fpu);</div><div class='ctx'> extern void fpu__prepare_write(struct fpu *fpu);</div><div class='ctx'> extern void fpu__save(struct fpu *fpu);</div><div class='del'>-extern void fpu__restore(struct fpu *fpu);</div><div class='ctx'> extern int  fpu__restore_sig(void __user *buf, int ia32_frame);</div><div class='ctx'> extern void fpu__drop(struct fpu *fpu);</div><div class='del'>-extern int  fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu);</div><div class='add'>+extern int  fpu__copy(struct task_struct *dst, struct task_struct *src);</div><div class='ctx'> extern void fpu__clear(struct fpu *fpu);</div><div class='ctx'> extern int  fpu__exception_code(struct fpu *fpu, int trap_nr);</div><div class='ctx'> extern int  dump_fpu(struct pt_regs *ptregs, struct user_i387_struct *fpstate);</div><div class='hunk'>@@ -122,6 +121,21 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu);</div><div class='ctx'> 	err;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#define kernel_insn_err(insn, output, input...)				\</div><div class='add'>+({									\</div><div class='add'>+	int err;							\</div><div class='add'>+	asm volatile("1:" #insn "\n\t"					\</div><div class='add'>+		     "2:\n"						\</div><div class='add'>+		     ".section .fixup,\"ax\"\n"				\</div><div class='add'>+		     "3:  movl $-1,%[err]\n"				\</div><div class='add'>+		     "    jmp  2b\n"					\</div><div class='add'>+		     ".previous\n"					\</div><div class='add'>+		     _ASM_EXTABLE(1b, 3b)				\</div><div class='add'>+		     : [err] "=r" (err), output				\</div><div class='add'>+		     : "0"(0), input);					\</div><div class='add'>+	err;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> #define kernel_insn(insn, output, input...)				\</div><div class='ctx'> 	asm volatile("1:" #insn "\n\t"					\</div><div class='ctx'> 		     "2:\n"						\</div><div class='hunk'>@@ -150,6 +164,14 @@ static inline void copy_kernel_to_fxregs(struct fxregs_state *fx)</div><div class='ctx'> 		kernel_insn(fxrstorq %[fx], "=m" (*fx), [fx] "m" (*fx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int copy_kernel_to_fxregs_err(struct fxregs_state *fx)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32))</div><div class='add'>+		return kernel_insn_err(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx));</div><div class='add'>+	else</div><div class='add'>+		return kernel_insn_err(fxrstorq %[fx], "=m" (*fx), [fx] "m" (*fx));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int copy_user_to_fxregs(struct fxregs_state __user *fx)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_X86_32))</div><div class='hunk'>@@ -163,6 +185,11 @@ static inline void copy_kernel_to_fregs(struct fregs_state *fx)</div><div class='ctx'> 	kernel_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int copy_kernel_to_fregs_err(struct fregs_state *fx)</div><div class='add'>+{</div><div class='add'>+	return kernel_insn_err(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int copy_user_to_fregs(struct fregs_state __user *fx)</div><div class='ctx'> {</div><div class='ctx'> 	return user_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));</div><div class='hunk'>@@ -253,7 +280,7 @@ static inline void copy_xregs_to_kernel_booting(struct xregs_state *xstate)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(system_state != SYSTEM_BOOTING);</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_XSAVES))</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_XSAVES))</div><div class='ctx'> 		XSTATE_OP(XSAVES, xstate, lmask, hmask, err);</div><div class='ctx'> 	else</div><div class='ctx'> 		XSTATE_OP(XSAVE, xstate, lmask, hmask, err);</div><div class='hunk'>@@ -275,7 +302,7 @@ static inline void copy_kernel_to_xregs_booting(struct xregs_state *xstate)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(system_state != SYSTEM_BOOTING);</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_XSAVES))</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_XSAVES))</div><div class='ctx'> 		XSTATE_OP(XRSTORS, xstate, lmask, hmask, err);</div><div class='ctx'> 	else</div><div class='ctx'> 		XSTATE_OP(XRSTOR, xstate, lmask, hmask, err);</div><div class='hunk'>@@ -363,6 +390,21 @@ static inline int copy_user_to_xregs(struct xregs_state __user *buf, u64 mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Restore xstate from kernel space xsave area, return an error code instead of</div><div class='add'>+ * an exception.</div><div class='add'>+ */</div><div class='add'>+static inline int copy_kernel_to_xregs_err(struct xregs_state *xstate, u64 mask)</div><div class='add'>+{</div><div class='add'>+	u32 lmask = mask;</div><div class='add'>+	u32 hmask = mask &gt;&gt; 32;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	XSTATE_OP(XRSTOR, xstate, lmask, hmask, err);</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'>  * These must be called with preempt disabled. Returns</div><div class='ctx'>  * 'true' if the FPU state is still intact and we can</div><div class='ctx'>  * keep registers active.</div><div class='hunk'>@@ -487,6 +529,25 @@ static inline void fpregs_activate(struct fpu *fpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Internal helper, do not use directly. Use switch_fpu_return() instead.</div><div class='add'>+ */</div><div class='add'>+static inline void __fpregs_load_activate(void)</div><div class='add'>+{</div><div class='add'>+	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(current-&gt;mm == NULL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!fpregs_state_valid(fpu, cpu)) {</div><div class='add'>+		copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='add'>+		fpregs_activate(fpu);</div><div class='add'>+		fpu-&gt;last_cpu = cpu;</div><div class='add'>+	}</div><div class='add'>+	clear_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * FPU state switching for scheduling.</div><div class='ctx'>  *</div><div class='ctx'>  * This is a two-stage process:</div><div class='hunk'>@@ -494,13 +555,23 @@ static inline void fpregs_activate(struct fpu *fpu)</div><div class='ctx'>  *  - switch_fpu_prepare() saves the old state.</div><div class='ctx'>  *    This is done within the context of the old process.</div><div class='ctx'>  *</div><div class='del'>- *  - switch_fpu_finish() restores the new state as</div><div class='del'>- *    necessary.</div><div class='add'>+ *  - switch_fpu_finish() sets TIF_NEED_FPU_LOAD; the floating point state</div><div class='add'>+ *    will get loaded on return to userspace, or when the kernel needs it.</div><div class='add'>+ *</div><div class='add'>+ * If TIF_NEED_FPU_LOAD is cleared then the CPU's FPU registers</div><div class='add'>+ * are saved in the current thread's FPU register state.</div><div class='add'>+ *</div><div class='add'>+ * If TIF_NEED_FPU_LOAD is set then CPU's FPU registers may not</div><div class='add'>+ * hold current()'s FPU registers. It is required to load the</div><div class='add'>+ * registers before returning to userland or using the content</div><div class='add'>+ * otherwise.</div><div class='add'>+ *</div><div class='add'>+ * The FPU context is only stored/restored for a user task and</div><div class='add'>+ * -&gt;mm is used to distinguish between kernel and user threads.</div><div class='ctx'>  */</div><div class='del'>-static inline void</div><div class='del'>-switch_fpu_prepare(struct fpu *old_fpu, int cpu)</div><div class='add'>+static inline void switch_fpu_prepare(struct fpu *old_fpu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_FPU) &amp;&amp; old_fpu-&gt;initialized) {</div><div class='add'>+	if (static_cpu_has(X86_FEATURE_FPU) &amp;&amp; current-&gt;mm) {</div><div class='ctx'> 		if (!copy_fpregs_to_fpstate(old_fpu))</div><div class='ctx'> 			old_fpu-&gt;last_cpu = -1;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -508,8 +579,7 @@ switch_fpu_prepare(struct fpu *old_fpu, int cpu)</div><div class='ctx'> </div><div class='ctx'> 		/* But leave fpu_fpregs_owner_ctx! */</div><div class='ctx'> 		trace_x86_fpu_regs_deactivated(old_fpu);</div><div class='del'>-	} else</div><div class='del'>-		old_fpu-&gt;last_cpu = -1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -517,36 +587,32 @@ switch_fpu_prepare(struct fpu *old_fpu, int cpu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Set up the userspace FPU context for the new task, if the task</div><div class='del'>- * has used the FPU.</div><div class='add'>+ * Load PKRU from the FPU context if available. Delay loading of the</div><div class='add'>+ * complete FPU state until the return to userland.</div><div class='ctx'>  */</div><div class='del'>-static inline void switch_fpu_finish(struct fpu *new_fpu, int cpu)</div><div class='add'>+static inline void switch_fpu_finish(struct fpu *new_fpu)</div><div class='ctx'> {</div><div class='del'>-	bool preload = static_cpu_has(X86_FEATURE_FPU) &amp;&amp;</div><div class='del'>-		       new_fpu-&gt;initialized;</div><div class='add'>+	u32 pkru_val = init_pkru_value;</div><div class='add'>+	struct pkru_state *pk;</div><div class='ctx'> </div><div class='del'>-	if (preload) {</div><div class='del'>-		if (!fpregs_state_valid(new_fpu, cpu))</div><div class='del'>-			copy_kernel_to_fpregs(&amp;new_fpu-&gt;state);</div><div class='del'>-		fpregs_activate(new_fpu);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	if (!static_cpu_has(X86_FEATURE_FPU))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Needs to be preemption-safe.</div><div class='del'>- *</div><div class='del'>- * NOTE! user_fpu_begin() must be used only immediately before restoring</div><div class='del'>- * the save state. It does not do any saving/restoring on its own. In</div><div class='del'>- * lazy FPU mode, it is just an optimization to avoid a #NM exception,</div><div class='del'>- * the task can lose the FPU right after preempt_enable().</div><div class='del'>- */</div><div class='del'>-static inline void user_fpu_begin(void)</div><div class='del'>-{</div><div class='del'>-	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='add'>+	set_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='add'>+</div><div class='add'>+	if (!cpu_feature_enabled(X86_FEATURE_OSPKE))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='del'>-	fpregs_activate(fpu);</div><div class='del'>-	preempt_enable();</div><div class='add'>+	/*</div><div class='add'>+	 * PKRU state is switched eagerly because it needs to be valid before we</div><div class='add'>+	 * return to userland e.g. for a copy_to_user() operation.</div><div class='add'>+	 */</div><div class='add'>+	if (current-&gt;mm) {</div><div class='add'>+		pk = get_xsave_addr(&amp;new_fpu-&gt;state.xsave, XFEATURE_PKRU);</div><div class='add'>+		if (pk)</div><div class='add'>+			pkru_val = pk-&gt;pkru;</div><div class='add'>+	}</div><div class='add'>+	__write_pkru(pkru_val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h<br/>index 44bbc39a57b3..7fb516b6893a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/signal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/signal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/signal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/fpu/signal.h</a></div><div class='hunk'>@@ -22,7 +22,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,</div><div class='ctx'> </div><div class='ctx'> extern void convert_from_fxsr(struct user_i387_ia32_struct *env,</div><div class='ctx'> 			      struct task_struct *tsk);</div><div class='del'>-extern void convert_to_fxsr(struct task_struct *tsk,</div><div class='add'>+extern void convert_to_fxsr(struct fxregs_state *fxsave,</div><div class='ctx'> 			    const struct user_i387_ia32_struct *env);</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/types.h b/arch/x86/include/asm/fpu/types.h<br/>index 2e32e178e064..f098f6cab94b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/types.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/types.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/fpu/types.h</a></div><div class='hunk'>@@ -294,15 +294,6 @@ struct fpu {</div><div class='ctx'> 	unsigned int			last_cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * @initialized:</div><div class='del'>-	 *</div><div class='del'>-	 * This flag indicates whether this context is initialized: if the task</div><div class='del'>-	 * is not running then we can restore from this context, if the task</div><div class='del'>-	 * is running then we should save into this context.</div><div class='del'>-	 */</div><div class='del'>-	unsigned char			initialized;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * @avx512_timestamp:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Records the timestamp of AVX512 use during last context switch.</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/xstate.h b/arch/x86/include/asm/fpu/xstate.h<br/>index 48581988d78c..7e42b285c856 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/xstate.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/fpu/xstate.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/fpu/xstate.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/fpu/xstate.h</a></div><div class='hunk'>@@ -2,9 +2,11 @@</div><div class='ctx'> #ifndef __ASM_X86_XSAVE_H</div><div class='ctx'> #define __ASM_X86_XSAVE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/user.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Bit 63 of XCR0 is reserved for future expansion */</div><div class='ctx'> #define XFEATURE_MASK_EXTEND	(~(XFEATURE_MASK_FPSSE | (1ULL &lt;&lt; 63)))</div><div class='hunk'>@@ -46,8 +48,8 @@ extern void __init update_regset_xstate_info(unsigned int size,</div><div class='ctx'> 					     u64 xstate_mask);</div><div class='ctx'> </div><div class='ctx'> void fpu__xstate_clear_all_cpu_caps(void);</div><div class='del'>-void *get_xsave_addr(struct xregs_state *xsave, int xstate);</div><div class='del'>-const void *get_xsave_field_ptr(int xstate_field);</div><div class='add'>+void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr);</div><div class='add'>+const void *get_xsave_field_ptr(int xfeature_nr);</div><div class='ctx'> int using_compacted_format(void);</div><div class='ctx'> int copy_xstate_to_kernel(void *kbuf, struct xregs_state *xsave, unsigned int offset, unsigned int size);</div><div class='ctx'> int copy_xstate_to_user(void __user *ubuf, struct xregs_state *xsave, unsigned int offset, unsigned int size);</div><div class='head'>diff --git a/arch/x86/include/asm/intel_ds.h b/arch/x86/include/asm/intel_ds.h<br/>index ae26df1c2789..8380c3ddd4b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/intel_ds.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/intel_ds.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/intel_ds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/intel_ds.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> /* The maximal number of PEBS events: */</div><div class='ctx'> #define MAX_PEBS_EVENTS		8</div><div class='del'>-#define MAX_FIXED_PEBS_EVENTS	3</div><div class='add'>+#define MAX_FIXED_PEBS_EVENTS	4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A debug store configuration.</div><div class='head'>diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h<br/>index 686247db3106..a06a9f8294ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/io.h</a></div><div class='hunk'>@@ -90,8 +90,6 @@ build_mmio_write(__writel, "l", unsigned int, "r", )</div><div class='ctx'> #define __raw_writew __writew</div><div class='ctx'> #define __raw_writel __writel</div><div class='ctx'> </div><div class='del'>-#define mmiowb() barrier()</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> </div><div class='ctx'> build_mmio_read(readq, "q", u64, "=r", :"memory")</div><div class='head'>diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h<br/>index fbb16e6b6c18..8f95686ec27e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/irq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/irq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/irq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/irq.h</a></div><div class='hunk'>@@ -16,11 +16,7 @@ static inline int irq_canonicalize(int irq)</div><div class='ctx'> 	return ((irq == 2) ? 9 : irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-extern void irq_ctx_init(int cpu);</div><div class='del'>-#else</div><div class='del'>-# define irq_ctx_init(cpu) do { } while (0)</div><div class='del'>-#endif</div><div class='add'>+extern int irq_init_percpu_irqstack(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_HAS_DO_SOFTIRQ</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h<br/>index 548d90bbf919..889f8b1b5b7f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/irq_vectors.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/irq_vectors.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/irq_vectors.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/irq_vectors.h</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'>  *  Vectors   0 ...  31 : system traps and exceptions - hardcoded events</div><div class='ctx'>  *  Vectors  32 ... 127 : device interrupts</div><div class='ctx'>  *  Vector  128         : legacy int80 syscall interface</div><div class='del'>- *  Vectors 129 ... INVALIDATE_TLB_VECTOR_START-1 except 204 : device interrupts</div><div class='del'>- *  Vectors INVALIDATE_TLB_VECTOR_START ... 255 : special interrupts</div><div class='add'>+ *  Vectors 129 ... LOCAL_TIMER_VECTOR-1</div><div class='add'>+ *  Vectors LOCAL_TIMER_VECTOR ... 255 : special interrupts</div><div class='ctx'>  *</div><div class='ctx'>  * 64-bit x86 has per CPU IDT tables, 32-bit has one shared IDT table.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h<br/>index 93c4bf598fb0..feab24cac610 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/kvm_emulate.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/kvm_emulate.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/kvm_emulate.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/kvm_emulate.h</a></div><div class='hunk'>@@ -226,7 +226,9 @@ struct x86_emulate_ops {</div><div class='ctx'> </div><div class='ctx'> 	unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> 	void (*set_hflags)(struct x86_emulate_ctxt *ctxt, unsigned hflags);</div><div class='del'>-	int (*pre_leave_smm)(struct x86_emulate_ctxt *ctxt, u64 smbase);</div><div class='add'>+	int (*pre_leave_smm)(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+			     const char *smstate);</div><div class='add'>+	void (*post_leave_smm)(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h<br/>index a5db4475e72d..c79abe7ca093 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/kvm_host.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/kvm_host.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/kvm_host.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define KVM_PERMILLE_MMU_PAGES 20</div><div class='del'>-#define KVM_MIN_ALLOC_MMU_PAGES 64</div><div class='add'>+#define KVM_MIN_ALLOC_MMU_PAGES 64UL</div><div class='ctx'> #define KVM_MMU_HASH_SHIFT 12</div><div class='ctx'> #define KVM_NUM_MMU_PAGES (1 &lt;&lt; KVM_MMU_HASH_SHIFT)</div><div class='ctx'> #define KVM_MIN_FREE_MMU_PAGES 5</div><div class='hunk'>@@ -253,14 +253,14 @@ struct kvm_mmu_memory_cache {</div><div class='ctx'>  * kvm_memory_slot.arch.gfn_track which is 16 bits, so the role bits used</div><div class='ctx'>  * by indirect shadow page can not be more than 15 bits.</div><div class='ctx'>  *</div><div class='del'>- * Currently, we used 14 bits that are @level, @cr4_pae, @quadrant, @access,</div><div class='add'>+ * Currently, we used 14 bits that are @level, @gpte_is_8_bytes, @quadrant, @access,</div><div class='ctx'>  * @nxe, @cr0_wp, @smep_andnot_wp and @smap_andnot_wp.</div><div class='ctx'>  */</div><div class='ctx'> union kvm_mmu_page_role {</div><div class='ctx'> 	u32 word;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		unsigned level:4;</div><div class='del'>-		unsigned cr4_pae:1;</div><div class='add'>+		unsigned gpte_is_8_bytes:1;</div><div class='ctx'> 		unsigned quadrant:2;</div><div class='ctx'> 		unsigned direct:1;</div><div class='ctx'> 		unsigned access:3;</div><div class='hunk'>@@ -295,6 +295,7 @@ union kvm_mmu_extended_role {</div><div class='ctx'> 		unsigned int valid:1;</div><div class='ctx'> 		unsigned int execonly:1;</div><div class='ctx'> 		unsigned int cr0_pg:1;</div><div class='add'>+		unsigned int cr4_pae:1;</div><div class='ctx'> 		unsigned int cr4_pse:1;</div><div class='ctx'> 		unsigned int cr4_pke:1;</div><div class='ctx'> 		unsigned int cr4_smap:1;</div><div class='hunk'>@@ -350,6 +351,7 @@ struct kvm_mmu_page {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_pio_request {</div><div class='add'>+	unsigned long linear_rip;</div><div class='ctx'> 	unsigned long count;</div><div class='ctx'> 	int in;</div><div class='ctx'> 	int port;</div><div class='hunk'>@@ -568,6 +570,7 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	bool tpr_access_reporting;</div><div class='ctx'> 	u64 ia32_xss;</div><div class='ctx'> 	u64 microcode_version;</div><div class='add'>+	u64 arch_capabilities;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Paging state of the vcpu</div><div class='hunk'>@@ -842,9 +845,9 @@ enum kvm_irqchip_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_arch {</div><div class='del'>-	unsigned int n_used_mmu_pages;</div><div class='del'>-	unsigned int n_requested_mmu_pages;</div><div class='del'>-	unsigned int n_max_mmu_pages;</div><div class='add'>+	unsigned long n_used_mmu_pages;</div><div class='add'>+	unsigned long n_requested_mmu_pages;</div><div class='add'>+	unsigned long n_max_mmu_pages;</div><div class='ctx'> 	unsigned int indirect_shadow_pages;</div><div class='ctx'> 	struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1180,7 +1183,7 @@ struct kvm_x86_ops {</div><div class='ctx'> </div><div class='ctx'> 	int (*smi_allowed)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	int (*pre_enter_smm)(struct kvm_vcpu *vcpu, char *smstate);</div><div class='del'>-	int (*pre_leave_smm)(struct kvm_vcpu *vcpu, u64 smbase);</div><div class='add'>+	int (*pre_leave_smm)(struct kvm_vcpu *vcpu, const char *smstate);</div><div class='ctx'> 	int (*enable_smi_window)(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> 	int (*mem_enc_op)(struct kvm *kvm, void __user *argp);</div><div class='hunk'>@@ -1192,6 +1195,8 @@ struct kvm_x86_ops {</div><div class='ctx'> 	int (*nested_enable_evmcs)(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				   uint16_t *vmcs_version);</div><div class='ctx'> 	uint16_t (*nested_get_evmcs_version)(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='add'>+	bool (*need_emulation_on_page_fault)(struct kvm_vcpu *vcpu);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_arch_async_pf {</div><div class='hunk'>@@ -1252,8 +1257,8 @@ void kvm_mmu_clear_dirty_pt_masked(struct kvm *kvm,</div><div class='ctx'> 				   gfn_t gfn_offset, unsigned long mask);</div><div class='ctx'> void kvm_mmu_zap_all(struct kvm *kvm);</div><div class='ctx'> void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen);</div><div class='del'>-unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm);</div><div class='del'>-void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);</div><div class='add'>+unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm);</div><div class='add'>+void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned long kvm_nr_mmu_pages);</div><div class='ctx'> </div><div class='ctx'> int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);</div><div class='ctx'> bool pdptrs_changed(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -1588,4 +1593,7 @@ static inline int kvm_cpu_get_apicid(int mps_cpu)</div><div class='ctx'> #define put_smstate(type, buf, offset, val)                      \</div><div class='ctx'> 	*(type *)((buf) + (offset) - 0x7e00) = val</div><div class='ctx'> </div><div class='add'>+#define GET_SMSTATE(type, buf, offset)		\</div><div class='add'>+	(*(type *)((buf) + (offset) - 0x7e00))</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_X86_KVM_HOST_H */</div><div class='head'>diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h<br/>index 22d05e3835f0..dc2d4b206ab7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/mce.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/mce.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/mce.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/mce.h</a></div><div class='hunk'>@@ -210,16 +210,6 @@ static inline void cmci_rediscover(void) {}</div><div class='ctx'> static inline void cmci_recheck(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_MCE_AMD</div><div class='del'>-void mce_amd_feature_init(struct cpuinfo_x86 *c);</div><div class='del'>-int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr);</div><div class='del'>-#else</div><div class='del'>-static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { }</div><div class='del'>-static inline int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr) { return -EINVAL; };</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c) { return mce_amd_feature_init(c); }</div><div class='del'>-</div><div class='ctx'> int mce_available(struct cpuinfo_x86 *c);</div><div class='ctx'> bool mce_is_memory_error(struct mce *m);</div><div class='ctx'> bool mce_is_correctable(struct mce *m);</div><div class='hunk'>@@ -345,12 +335,19 @@ extern bool amd_mce_is_memory_error(struct mce *m);</div><div class='ctx'> extern int mce_threshold_create_device(unsigned int cpu);</div><div class='ctx'> extern int mce_threshold_remove_device(unsigned int cpu);</div><div class='ctx'> </div><div class='del'>-#else</div><div class='add'>+void mce_amd_feature_init(struct cpuinfo_x86 *c);</div><div class='add'>+int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr);</div><div class='ctx'> </div><div class='del'>-static inline int mce_threshold_create_device(unsigned int cpu) { return 0; };</div><div class='del'>-static inline int mce_threshold_remove_device(unsigned int cpu) { return 0; };</div><div class='del'>-static inline bool amd_mce_is_memory_error(struct mce *m) { return false; };</div><div class='add'>+#else</div><div class='ctx'> </div><div class='add'>+static inline int mce_threshold_create_device(unsigned int cpu)		{ return 0; };</div><div class='add'>+static inline int mce_threshold_remove_device(unsigned int cpu)		{ return 0; };</div><div class='add'>+static inline bool amd_mce_is_memory_error(struct mce *m)		{ return false; };</div><div class='add'>+static inline void mce_amd_feature_init(struct cpuinfo_x86 *c)		{ }</div><div class='add'>+static inline int</div><div class='add'>+umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr)	{ return -EINVAL; };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c)	{ return mce_amd_feature_init(c); }</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_X86_MCE_H */</div><div class='head'>diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h<br/>index 19d18fae6ec6..93dff1963337 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/mmu_context.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/mmu_context.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/mmu_context.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='ctx'> #include &lt;asm/mpx.h&gt;</div><div class='add'>+#include &lt;asm/debugreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern atomic64_t last_mm_ctx_id;</div><div class='ctx'> </div><div class='hunk'>@@ -356,4 +357,59 @@ static inline unsigned long __get_current_cr3_fast(void)</div><div class='ctx'> 	return cr3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+typedef struct {</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+} temp_mm_state_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Using a temporary mm allows to set temporary mappings that are not accessible</div><div class='add'>+ * by other CPUs. Such mappings are needed to perform sensitive memory writes</div><div class='add'>+ * that override the kernel memory protections (e.g., W^X), without exposing the</div><div class='add'>+ * temporary page-table mappings that are required for these write operations to</div><div class='add'>+ * other CPUs. Using a temporary mm also allows to avoid TLB shootdowns when the</div><div class='add'>+ * mapping is torn down.</div><div class='add'>+ *</div><div class='add'>+ * Context: The temporary mm needs to be used exclusively by a single core. To</div><div class='add'>+ *          harden security IRQs must be disabled while the temporary mm is</div><div class='add'>+ *          loaded, thereby preventing interrupt handler bugs from overriding</div><div class='add'>+ *          the kernel memory protection.</div><div class='add'>+ */</div><div class='add'>+static inline temp_mm_state_t use_temporary_mm(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	temp_mm_state_t temp_state;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+	temp_state.mm = this_cpu_read(cpu_tlbstate.loaded_mm);</div><div class='add'>+	switch_mm_irqs_off(NULL, mm, current);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If breakpoints are enabled, disable them while the temporary mm is</div><div class='add'>+	 * used. Userspace might set up watchpoints on addresses that are used</div><div class='add'>+	 * in the temporary mm, which would lead to wrong signals being sent or</div><div class='add'>+	 * crashes.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that breakpoints are not disabled selectively, which also causes</div><div class='add'>+	 * kernel breakpoints (e.g., perf's) to be disabled. This might be</div><div class='add'>+	 * undesirable, but still seems reasonable as the code that runs in the</div><div class='add'>+	 * temporary mm should be short.</div><div class='add'>+	 */</div><div class='add'>+	if (hw_breakpoint_active())</div><div class='add'>+		hw_breakpoint_disable();</div><div class='add'>+</div><div class='add'>+	return temp_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unuse_temporary_mm(temp_mm_state_t prev_state)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+	switch_mm_irqs_off(NULL, prev_state.mm, current);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restore the breakpoints if they were disabled before the temporary mm</div><div class='add'>+	 * was loaded.</div><div class='add'>+	 */</div><div class='add'>+	if (hw_breakpoint_active())</div><div class='add'>+		hw_breakpoint_restore();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_X86_MMU_CONTEXT_H */</div><div class='head'>diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h<br/>index ca5bc0eacb95..1378518cf63f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/msr-index.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/msr-index.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/msr-index.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/msr-index.h</a></div><div class='hunk'>@@ -116,6 +116,7 @@</div><div class='ctx'> #define LBR_INFO_CYCLES			0xffff</div><div class='ctx'> </div><div class='ctx'> #define MSR_IA32_PEBS_ENABLE		0x000003f1</div><div class='add'>+#define MSR_PEBS_DATA_CFG		0x000003f2</div><div class='ctx'> #define MSR_IA32_DS_AREA		0x00000600</div><div class='ctx'> #define MSR_IA32_PERF_CAPABILITIES	0x00000345</div><div class='ctx'> #define MSR_PEBS_LD_LAT_THRESHOLD	0x000003f6</div><div class='head'>diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h<br/>index dad12b767ba0..daf25b60c9e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/nospec-branch.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/nospec-branch.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/nospec-branch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/nospec-branch.h</a></div><div class='hunk'>@@ -11,6 +11,15 @@</div><div class='ctx'> #include &lt;asm/msr-index.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This should be used immediately before a retpoline alternative. It tells</div><div class='add'>+ * objtool where the retpolines are so that it can make sense of the control</div><div class='add'>+ * flow by just reading the original instruction(s) and ignoring the</div><div class='add'>+ * alternatives.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_NOSPEC_ALTERNATIVE \</div><div class='add'>+	ANNOTATE_IGNORE_ALTERNATIVE</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Fill the CPU return stack buffer.</div><div class='ctx'>  *</div><div class='ctx'>  * Each entry in the RSB, if used for a speculative 'ret', contains an</div><div class='hunk'>@@ -57,19 +66,6 @@</div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This should be used immediately before a retpoline alternative.  It tells</div><div class='del'>- * objtool where the retpolines are so that it can make sense of the control</div><div class='del'>- * flow by just reading the original instruction(s) and ignoring the</div><div class='del'>- * alternatives.</div><div class='del'>- */</div><div class='del'>-.macro ANNOTATE_NOSPEC_ALTERNATIVE</div><div class='del'>-	.Lannotate_\@:</div><div class='del'>-	.pushsection .discard.nospec</div><div class='del'>-	.long .Lannotate_\@ - .</div><div class='del'>-	.popsection</div><div class='del'>-.endm</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This should be used immediately before an indirect jump/call. It tells</div><div class='ctx'>  * objtool the subsequent indirect jump/call is vouched safe for retpoline</div><div class='ctx'>  * builds.</div><div class='hunk'>@@ -152,12 +148,6 @@</div><div class='ctx'> </div><div class='ctx'> #else /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='del'>-#define ANNOTATE_NOSPEC_ALTERNATIVE				\</div><div class='del'>-	"999:\n\t"						\</div><div class='del'>-	".pushsection .discard.nospec\n\t"			\</div><div class='del'>-	".long 999b - .\n\t"					\</div><div class='del'>-	".popsection\n\t"</div><div class='del'>-</div><div class='ctx'> #define ANNOTATE_RETPOLINE_SAFE					\</div><div class='ctx'> 	"999:\n\t"						\</div><div class='ctx'> 	".pushsection .discard.retpoline_safe\n\t"		\</div><div class='head'>diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h<br/>index 0d5c739eebd7..565ad755c785 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/page_32_types.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/page_32_types.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/page_32_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/page_32_types.h</a></div><div class='hunk'>@@ -22,11 +22,9 @@</div><div class='ctx'> #define THREAD_SIZE_ORDER	1</div><div class='ctx'> #define THREAD_SIZE		(PAGE_SIZE &lt;&lt; THREAD_SIZE_ORDER)</div><div class='ctx'> </div><div class='del'>-#define DOUBLEFAULT_STACK 1</div><div class='del'>-#define NMI_STACK 0</div><div class='del'>-#define DEBUG_STACK 0</div><div class='del'>-#define MCE_STACK 0</div><div class='del'>-#define N_EXCEPTION_STACKS 1</div><div class='add'>+#define IRQ_STACK_SIZE		THREAD_SIZE</div><div class='add'>+</div><div class='add'>+#define N_EXCEPTION_STACKS	1</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h<br/>index 8f657286d599..793c14c372cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/page_64_types.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/page_64_types.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/page_64_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/page_64_types.h</a></div><div class='hunk'>@@ -14,22 +14,20 @@</div><div class='ctx'> </div><div class='ctx'> #define THREAD_SIZE_ORDER	(2 + KASAN_STACK_ORDER)</div><div class='ctx'> #define THREAD_SIZE  (PAGE_SIZE &lt;&lt; THREAD_SIZE_ORDER)</div><div class='del'>-#define CURRENT_MASK (~(THREAD_SIZE - 1))</div><div class='ctx'> </div><div class='ctx'> #define EXCEPTION_STACK_ORDER (0 + KASAN_STACK_ORDER)</div><div class='ctx'> #define EXCEPTION_STKSZ (PAGE_SIZE &lt;&lt; EXCEPTION_STACK_ORDER)</div><div class='ctx'> </div><div class='del'>-#define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1)</div><div class='del'>-#define DEBUG_STKSZ (PAGE_SIZE &lt;&lt; DEBUG_STACK_ORDER)</div><div class='del'>-</div><div class='ctx'> #define IRQ_STACK_ORDER (2 + KASAN_STACK_ORDER)</div><div class='ctx'> #define IRQ_STACK_SIZE (PAGE_SIZE &lt;&lt; IRQ_STACK_ORDER)</div><div class='ctx'> </div><div class='del'>-#define DOUBLEFAULT_STACK 1</div><div class='del'>-#define NMI_STACK 2</div><div class='del'>-#define DEBUG_STACK 3</div><div class='del'>-#define MCE_STACK 4</div><div class='del'>-#define N_EXCEPTION_STACKS 4  /* hw limit: 7 */</div><div class='add'>+/*</div><div class='add'>+ * The index for the tss.ist[] array. The hardware limit is 7 entries.</div><div class='add'>+ */</div><div class='add'>+#define	IST_INDEX_DF		0</div><div class='add'>+#define	IST_INDEX_NMI		1</div><div class='add'>+#define	IST_INDEX_DB		2</div><div class='add'>+#define	IST_INDEX_MCE		3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set __PAGE_OFFSET to the most negative possible address +</div><div class='head'>diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h<br/>index 8bdf74902293..1392d5e6e8d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/perf_event.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/perf_event.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/perf_event.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/perf_event.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define INTEL_PMC_MAX_GENERIC				       32</div><div class='del'>-#define INTEL_PMC_MAX_FIXED					3</div><div class='add'>+#define INTEL_PMC_MAX_FIXED					4</div><div class='ctx'> #define INTEL_PMC_IDX_FIXED				       32</div><div class='ctx'> </div><div class='ctx'> #define X86_PMC_IDX_MAX					       64</div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> </div><div class='ctx'> #define HSW_IN_TX					(1ULL &lt;&lt; 32)</div><div class='ctx'> #define HSW_IN_TX_CHECKPOINTED				(1ULL &lt;&lt; 33)</div><div class='add'>+#define ICL_EVENTSEL_ADAPTIVE				(1ULL &lt;&lt; 34)</div><div class='add'>+#define ICL_FIXED_0_ADAPTIVE				(1ULL &lt;&lt; 32)</div><div class='ctx'> </div><div class='ctx'> #define AMD64_EVENTSEL_INT_CORE_ENABLE			(1ULL &lt;&lt; 36)</div><div class='ctx'> #define AMD64_EVENTSEL_GUESTONLY			(1ULL &lt;&lt; 40)</div><div class='hunk'>@@ -87,6 +89,12 @@</div><div class='ctx'> #define ARCH_PERFMON_BRANCH_MISSES_RETIRED		6</div><div class='ctx'> #define ARCH_PERFMON_EVENTS_COUNT			7</div><div class='ctx'> </div><div class='add'>+#define PEBS_DATACFG_MEMINFO	BIT_ULL(0)</div><div class='add'>+#define PEBS_DATACFG_GP	BIT_ULL(1)</div><div class='add'>+#define PEBS_DATACFG_XMMS	BIT_ULL(2)</div><div class='add'>+#define PEBS_DATACFG_LBRS	BIT_ULL(3)</div><div class='add'>+#define PEBS_DATACFG_LBR_SHIFT	24</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Intel "Architectural Performance Monitoring" CPUID</div><div class='ctx'>  * detection/enumeration details:</div><div class='hunk'>@@ -177,6 +185,41 @@ struct x86_pmu_capability {</div><div class='ctx'> #define GLOBAL_STATUS_TRACE_TOPAPMI			BIT_ULL(55)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Adaptive PEBS v4</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct pebs_basic {</div><div class='add'>+	u64 format_size;</div><div class='add'>+	u64 ip;</div><div class='add'>+	u64 applicable_counters;</div><div class='add'>+	u64 tsc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pebs_meminfo {</div><div class='add'>+	u64 address;</div><div class='add'>+	u64 aux;</div><div class='add'>+	u64 latency;</div><div class='add'>+	u64 tsx_tuning;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pebs_gprs {</div><div class='add'>+	u64 flags, ip, ax, cx, dx, bx, sp, bp, si, di;</div><div class='add'>+	u64 r8, r9, r10, r11, r12, r13, r14, r15;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pebs_xmm {</div><div class='add'>+	u64 xmm[16*2];	/* two entries for each register */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pebs_lbr_entry {</div><div class='add'>+	u64 from, to, info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pebs_lbr {</div><div class='add'>+	struct pebs_lbr_entry lbr[0]; /* Variable length */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * IBS cpuid feature detection</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -248,6 +291,11 @@ extern void perf_events_lapic_init(void);</div><div class='ctx'> #define PERF_EFLAGS_VM		(1UL &lt;&lt; 5)</div><div class='ctx'> </div><div class='ctx'> struct pt_regs;</div><div class='add'>+struct x86_perf_regs {</div><div class='add'>+	struct pt_regs	regs;</div><div class='add'>+	u64		*xmm_regs;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern unsigned long perf_instruction_pointer(struct pt_regs *regs);</div><div class='ctx'> extern unsigned long perf_misc_flags(struct pt_regs *regs);</div><div class='ctx'> #define perf_misc_flags(regs)	perf_misc_flags(regs)</div><div class='hunk'>@@ -260,14 +308,9 @@ extern unsigned long perf_misc_flags(struct pt_regs *regs);</div><div class='ctx'>  */</div><div class='ctx'> #define perf_arch_fetch_caller_regs(regs, __ip)		{	\</div><div class='ctx'> 	(regs)-&gt;ip = (__ip);					\</div><div class='del'>-	(regs)-&gt;bp = caller_frame_pointer();			\</div><div class='add'>+	(regs)-&gt;sp = (unsigned long)__builtin_frame_address(0);	\</div><div class='ctx'> 	(regs)-&gt;cs = __KERNEL_CS;				\</div><div class='ctx'> 	regs-&gt;flags = 0;					\</div><div class='del'>-	asm volatile(						\</div><div class='del'>-		_ASM_MOV "%%"_ASM_SP ", %0\n"			\</div><div class='del'>-		: "=m" ((regs)-&gt;sp)				\</div><div class='del'>-		:: "memory"					\</div><div class='del'>-	);							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct perf_guest_switch_msr {</div><div class='head'>diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h<br/>index 2779ace16d23..5e0509b41986 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/pgtable.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/pgtable.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/pgtable.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/pgtable.h</a></div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> #include &lt;asm/x86_init.h&gt;</div><div class='add'>+#include &lt;asm/fpu/xstate.h&gt;</div><div class='add'>+#include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern pgd_t early_top_pgt[PTRS_PER_PGD];</div><div class='ctx'> int __init __early_make_pgtable(unsigned long address, pmdval_t pmd);</div><div class='hunk'>@@ -46,7 +48,7 @@ void ptdump_walk_user_pgd_level_checkwx(void);</div><div class='ctx'>  */</div><div class='ctx'> extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]</div><div class='ctx'> 	__visible;</div><div class='del'>-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))</div><div class='add'>+#define ZERO_PAGE(vaddr) ((void)(vaddr),virt_to_page(empty_zero_page))</div><div class='ctx'> </div><div class='ctx'> extern spinlock_t pgd_lock;</div><div class='ctx'> extern struct list_head pgd_list;</div><div class='hunk'>@@ -127,14 +129,29 @@ static inline int pte_dirty(pte_t pte)</div><div class='ctx'> static inline u32 read_pkru(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_OSPKE))</div><div class='del'>-		return __read_pkru();</div><div class='add'>+		return rdpkru();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void write_pkru(u32 pkru)</div><div class='ctx'> {</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_OSPKE))</div><div class='del'>-		__write_pkru(pkru);</div><div class='add'>+	struct pkru_state *pk;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_OSPKE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pk = get_xsave_addr(&amp;current-&gt;thread.fpu.state.xsave, XFEATURE_PKRU);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The PKRU value in xstate needs to be in sync with the value that is</div><div class='add'>+	 * written to the CPU. The FPU restore on return to userland would</div><div class='add'>+	 * otherwise load the previous value again.</div><div class='add'>+	 */</div><div class='add'>+	fpregs_lock();</div><div class='add'>+	if (pk)</div><div class='add'>+		pk-&gt;pkru = pkru;</div><div class='add'>+	__write_pkru(pkru);</div><div class='add'>+	fpregs_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pte_young(pte_t pte)</div><div class='hunk'>@@ -1021,6 +1038,9 @@ static inline void __meminit init_trampoline_default(void)</div><div class='ctx'> 	/* Default trampoline pgd value */</div><div class='ctx'> 	trampoline_pgd_entry = init_top_pgt[pgd_index(__PAGE_OFFSET)];</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init poking_init(void);</div><div class='add'>+</div><div class='ctx'> # ifdef CONFIG_RANDOMIZE_MEMORY</div><div class='ctx'> void __meminit init_trampoline(void);</div><div class='ctx'> # else</div><div class='hunk'>@@ -1355,6 +1375,12 @@ static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd)</div><div class='ctx'> #define PKRU_WD_BIT 0x2</div><div class='ctx'> #define PKRU_BITS_PER_PKEY 2</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS</div><div class='add'>+extern u32 init_pkru_value;</div><div class='add'>+#else</div><div class='add'>+#define init_pkru_value	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline bool __pkru_allows_read(u32 pkru, u16 pkey)</div><div class='ctx'> {</div><div class='ctx'> 	int pkru_pkey_bits = pkey * PKRU_BITS_PER_PKEY;</div><div class='head'>diff --git a/arch/x86/include/asm/processor-cyrix.h b/arch/x86/include/asm/processor-cyrix.h<br/>index aaedd73ea2c6..df700a6cc869 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/processor-cyrix.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/processor-cyrix.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/processor-cyrix.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/processor-cyrix.h</a></div><div class='hunk'>@@ -3,19 +3,6 @@</div><div class='ctx'>  * NSC/Cyrix CPU indexed register access. Must be inlined instead of</div><div class='ctx'>  * macros to ensure correct access ordering</div><div class='ctx'>  * Access order is always 0x22 (=offset), 0x23 (=value)</div><div class='del'>- *</div><div class='del'>- * When using the old macros a line like</div><div class='del'>- *   setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);</div><div class='del'>- * gets expanded to:</div><div class='del'>- *  do {</div><div class='del'>- *    outb((CX86_CCR2), 0x22);</div><div class='del'>- *    outb((({</div><div class='del'>- *        outb((CX86_CCR2), 0x22);</div><div class='del'>- *        inb(0x23);</div><div class='del'>- *    }) | 0x88), 0x23);</div><div class='del'>- *  } while (0);</div><div class='del'>- *</div><div class='del'>- * which in fact violates the access order (= 0x22, 0x22, 0x23, 0x23).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline u8 getCx86(u8 reg)</div><div class='hunk'>@@ -29,11 +16,3 @@ static inline void setCx86(u8 reg, u8 data)</div><div class='ctx'> 	outb(reg, 0x22);</div><div class='ctx'> 	outb(data, 0x23);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#define getCx86_old(reg) ({ outb((reg), 0x22); inb(0x23); })</div><div class='del'>-</div><div class='del'>-#define setCx86_old(reg, data) do { \</div><div class='del'>-	outb((reg), 0x22); \</div><div class='del'>-	outb((data), 0x23); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='head'>diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h<br/>index 2bb3a648fc12..7e99ef67bff0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/processor.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/processor.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/processor.h</a></div><div class='hunk'>@@ -367,6 +367,13 @@ DECLARE_PER_CPU_PAGE_ALIGNED(struct tss_struct, cpu_tss_rw);</div><div class='ctx'> #define __KERNEL_TSS_LIMIT	\</div><div class='ctx'> 	(IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1)</div><div class='ctx'> </div><div class='add'>+/* Per CPU interrupt stacks */</div><div class='add'>+struct irq_stack {</div><div class='add'>+	char		stack[IRQ_STACK_SIZE];</div><div class='add'>+} __aligned(IRQ_STACK_SIZE);</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU(struct irq_stack *, hardirq_stack_ptr);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);</div><div class='ctx'> #else</div><div class='hunk'>@@ -374,38 +381,25 @@ DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);</div><div class='ctx'> #define cpu_current_top_of_stack cpu_tss_rw.x86_tss.sp1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Save the original ist values for checking stack pointers during debugging</div><div class='del'>- */</div><div class='del'>-struct orig_ist {</div><div class='del'>-	unsigned long		ist[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-DECLARE_PER_CPU(struct orig_ist, orig_ist);</div><div class='del'>-</div><div class='del'>-union irq_stack_union {</div><div class='del'>-	char irq_stack[IRQ_STACK_SIZE];</div><div class='add'>+struct fixed_percpu_data {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * GCC hardcodes the stack canary as %gs:40.  Since the</div><div class='ctx'> 	 * irq_stack is the object at %gs:0, we reserve the bottom</div><div class='ctx'> 	 * 48 bytes of the irq stack for the canary.</div><div class='ctx'> 	 */</div><div class='del'>-	struct {</div><div class='del'>-		char gs_base[40];</div><div class='del'>-		unsigned long stack_canary;</div><div class='del'>-	};</div><div class='add'>+	char		gs_base[40];</div><div class='add'>+	unsigned long	stack_canary;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union) __visible;</div><div class='del'>-DECLARE_INIT_PER_CPU(irq_stack_union);</div><div class='add'>+DECLARE_PER_CPU_FIRST(struct fixed_percpu_data, fixed_percpu_data) __visible;</div><div class='add'>+DECLARE_INIT_PER_CPU(fixed_percpu_data);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long cpu_kernelmode_gs_base(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return (unsigned long)per_cpu(irq_stack_union.gs_base, cpu);</div><div class='add'>+	return (unsigned long)per_cpu(fixed_percpu_data.gs_base, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU(char *, irq_stack_ptr);</div><div class='ctx'> DECLARE_PER_CPU(unsigned int, irq_count);</div><div class='ctx'> extern asmlinkage void ignore_sysret(void);</div><div class='ctx'> </div><div class='hunk'>@@ -427,15 +421,8 @@ struct stack_canary {</div><div class='ctx'> };</div><div class='ctx'> DECLARE_PER_CPU_ALIGNED(struct stack_canary, stack_canary);</div><div class='ctx'> #endif</div><div class='del'>-/*</div><div class='del'>- * per-CPU IRQ handling stacks</div><div class='del'>- */</div><div class='del'>-struct irq_stack {</div><div class='del'>-	u32                     stack[THREAD_SIZE/sizeof(u32)];</div><div class='del'>-} __aligned(THREAD_SIZE);</div><div class='del'>-</div><div class='del'>-DECLARE_PER_CPU(struct irq_stack *, hardirq_stack);</div><div class='del'>-DECLARE_PER_CPU(struct irq_stack *, softirq_stack);</div><div class='add'>+/* Per CPU softirq stack pointer */</div><div class='add'>+DECLARE_PER_CPU(struct irq_stack *, softirq_stack_ptr);</div><div class='ctx'> #endif	/* X86_64 */</div><div class='ctx'> </div><div class='ctx'> extern unsigned int fpu_kernel_xstate_size;</div><div class='head'>diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h<br/>index 63b3393bd98e..c53682303c9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/realmode.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/realmode.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/realmode.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/realmode.h</a></div><div class='hunk'>@@ -77,7 +77,11 @@ static inline size_t real_mode_size_needed(void)</div><div class='ctx'> 	return ALIGN(real_mode_blob_end - real_mode_blob, PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void set_real_mode_mem(phys_addr_t mem, size_t size);</div><div class='add'>+static inline void set_real_mode_mem(phys_addr_t mem)</div><div class='add'>+{</div><div class='add'>+	real_mode_header = (struct real_mode_header *) __va(mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void reserve_real_mode(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='head'>diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h<br/>deleted file mode 100644<br/>index 4c25cf6caefa..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/rwsem.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/rwsem.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* rwsem.h: R/W semaphores implemented using XADD/CMPXCHG for i486+</div><div class='del'>- *</div><div class='del'>- * Written by David Howells (dhowells@redhat.com).</div><div class='del'>- *</div><div class='del'>- * Derived from asm-x86/semaphore.h</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * The MSW of the count is the negated number of active writers and waiting</div><div class='del'>- * lockers, and the LSW is the total number of active locks</div><div class='del'>- *</div><div class='del'>- * The lock count is initialized to 0 (no active and no waiting lockers).</div><div class='del'>- *</div><div class='del'>- * When a writer subtracts WRITE_BIAS, it'll get 0xffff0001 for the case of an</div><div class='del'>- * uncontended lock. This can be determined because XADD returns the old value.</div><div class='del'>- * Readers increment by 1 and see a positive value when uncontended, negative</div><div class='del'>- * if there are writers (and maybe) readers waiting (in which case it goes to</div><div class='del'>- * sleep).</div><div class='del'>- *</div><div class='del'>- * The value of WAITING_BIAS supports up to 32766 waiting processes. This can</div><div class='del'>- * be extended to 65534 by manually checking the whole MSW rather than relying</div><div class='del'>- * on the S flag.</div><div class='del'>- *</div><div class='del'>- * The value of ACTIVE_BIAS supports up to 65535 active processes.</div><div class='del'>- *</div><div class='del'>- * This should be totally fair - if anything is waiting, a process that wants a</div><div class='del'>- * lock will go to the back of the queue. When the currently active lock is</div><div class='del'>- * released, if there's a writer at the front of the queue, then that and only</div><div class='del'>- * that will be woken up; if there's a bunch of consecutive readers at the</div><div class='del'>- * front, then they'll all be woken up, but no other readers will be.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_X86_RWSEM_H</div><div class='del'>-#define _ASM_X86_RWSEM_H</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_RWSEM_H</div><div class='del'>-#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The bias values and the counter type limits the number of</div><div class='del'>- * potential readers/writers to 32767 for 32 bits and 2147483647</div><div class='del'>- * for 64 bits.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-# define RWSEM_ACTIVE_MASK		0xffffffffL</div><div class='del'>-#else</div><div class='del'>-# define RWSEM_ACTIVE_MASK		0x0000ffffL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define RWSEM_UNLOCKED_VALUE		0x00000000L</div><div class='del'>-#define RWSEM_ACTIVE_BIAS		0x00000001L</div><div class='del'>-#define RWSEM_WAITING_BIAS		(-RWSEM_ACTIVE_MASK-1)</div><div class='del'>-#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS</div><div class='del'>-#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * lock for reading</div><div class='del'>- */</div><div class='del'>-#define ____down_read(sem, slow_path)					\</div><div class='del'>-({									\</div><div class='del'>-	struct rw_semaphore* ret;					\</div><div class='del'>-	asm volatile("# beginning down_read\n\t"			\</div><div class='del'>-		     LOCK_PREFIX _ASM_INC "(%[sem])\n\t"		\</div><div class='del'>-		     /* adds 0x00000001 */				\</div><div class='del'>-		     "  jns        1f\n"				\</div><div class='del'>-		     "  call " slow_path "\n"				\</div><div class='del'>-		     "1:\n\t"						\</div><div class='del'>-		     "# ending down_read\n\t"				\</div><div class='del'>-		     : "+m" (sem-&gt;count), "=a" (ret),			\</div><div class='del'>-			ASM_CALL_CONSTRAINT				\</div><div class='del'>-		     : [sem] "a" (sem)					\</div><div class='del'>-		     : "memory", "cc");					\</div><div class='del'>-	ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline void __down_read(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	____down_read(sem, "call_rwsem_down_read_failed");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __down_read_killable(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (IS_ERR(____down_read(sem, "call_rwsem_down_read_failed_killable")))</div><div class='del'>-		return -EINTR;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * trylock for reading -- returns 1 if successful, 0 if contention</div><div class='del'>- */</div><div class='del'>-static inline bool __down_read_trylock(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long result, tmp;</div><div class='del'>-	asm volatile("# beginning __down_read_trylock\n\t"</div><div class='del'>-		     "  mov          %[count],%[result]\n\t"</div><div class='del'>-		     "1:\n\t"</div><div class='del'>-		     "  mov          %[result],%[tmp]\n\t"</div><div class='del'>-		     "  add          %[inc],%[tmp]\n\t"</div><div class='del'>-		     "  jle	     2f\n\t"</div><div class='del'>-		     LOCK_PREFIX "  cmpxchg  %[tmp],%[count]\n\t"</div><div class='del'>-		     "  jnz	     1b\n\t"</div><div class='del'>-		     "2:\n\t"</div><div class='del'>-		     "# ending __down_read_trylock\n\t"</div><div class='del'>-		     : [count] "+m" (sem-&gt;count), [result] "=&amp;a" (result),</div><div class='del'>-		       [tmp] "=&amp;r" (tmp)</div><div class='del'>-		     : [inc] "i" (RWSEM_ACTIVE_READ_BIAS)</div><div class='del'>-		     : "memory", "cc");</div><div class='del'>-	return result &gt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * lock for writing</div><div class='del'>- */</div><div class='del'>-#define ____down_write(sem, slow_path)			\</div><div class='del'>-({							\</div><div class='del'>-	long tmp;					\</div><div class='del'>-	struct rw_semaphore* ret;			\</div><div class='del'>-							\</div><div class='del'>-	asm volatile("# beginning down_write\n\t"	\</div><div class='del'>-		     LOCK_PREFIX "  xadd      %[tmp],(%[sem])\n\t"	\</div><div class='del'>-		     /* adds 0xffff0001, returns the old value */ \</div><div class='del'>-		     "  test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t" \</div><div class='del'>-		     /* was the active mask 0 before? */\</div><div class='del'>-		     "  jz        1f\n"			\</div><div class='del'>-		     "  call " slow_path "\n"		\</div><div class='del'>-		     "1:\n"				\</div><div class='del'>-		     "# ending down_write"		\</div><div class='del'>-		     : "+m" (sem-&gt;count), [tmp] "=d" (tmp),	\</div><div class='del'>-		       "=a" (ret), ASM_CALL_CONSTRAINT	\</div><div class='del'>-		     : [sem] "a" (sem), "[tmp]" (RWSEM_ACTIVE_WRITE_BIAS) \</div><div class='del'>-		     : "memory", "cc");			\</div><div class='del'>-	ret;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline void __down_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	____down_write(sem, "call_rwsem_down_write_failed");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __down_write_killable(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (IS_ERR(____down_write(sem, "call_rwsem_down_write_failed_killable")))</div><div class='del'>-		return -EINTR;</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'>- * trylock for writing -- returns 1 if successful, 0 if contention</div><div class='del'>- */</div><div class='del'>-static inline bool __down_write_trylock(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	bool result;</div><div class='del'>-	long tmp0, tmp1;</div><div class='del'>-	asm volatile("# beginning __down_write_trylock\n\t"</div><div class='del'>-		     "  mov          %[count],%[tmp0]\n\t"</div><div class='del'>-		     "1:\n\t"</div><div class='del'>-		     "  test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"</div><div class='del'>-		     /* was the active mask 0 before? */</div><div class='del'>-		     "  jnz          2f\n\t"</div><div class='del'>-		     "  mov          %[tmp0],%[tmp1]\n\t"</div><div class='del'>-		     "  add          %[inc],%[tmp1]\n\t"</div><div class='del'>-		     LOCK_PREFIX "  cmpxchg  %[tmp1],%[count]\n\t"</div><div class='del'>-		     "  jnz	     1b\n\t"</div><div class='del'>-		     "2:\n\t"</div><div class='del'>-		     CC_SET(e)</div><div class='del'>-		     "# ending __down_write_trylock\n\t"</div><div class='del'>-		     : [count] "+m" (sem-&gt;count), [tmp0] "=&amp;a" (tmp0),</div><div class='del'>-		       [tmp1] "=&amp;r" (tmp1), CC_OUT(e) (result)</div><div class='del'>-		     : [inc] "er" (RWSEM_ACTIVE_WRITE_BIAS)</div><div class='del'>-		     : "memory");</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unlock after reading</div><div class='del'>- */</div><div class='del'>-static inline void __up_read(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long tmp;</div><div class='del'>-	asm volatile("# beginning __up_read\n\t"</div><div class='del'>-		     LOCK_PREFIX "  xadd      %[tmp],(%[sem])\n\t"</div><div class='del'>-		     /* subtracts 1, returns the old value */</div><div class='del'>-		     "  jns        1f\n\t"</div><div class='del'>-		     "  call call_rwsem_wake\n" /* expects old value in %edx */</div><div class='del'>-		     "1:\n"</div><div class='del'>-		     "# ending __up_read\n"</div><div class='del'>-		     : "+m" (sem-&gt;count), [tmp] "=d" (tmp)</div><div class='del'>-		     : [sem] "a" (sem), "[tmp]" (-RWSEM_ACTIVE_READ_BIAS)</div><div class='del'>-		     : "memory", "cc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unlock after writing</div><div class='del'>- */</div><div class='del'>-static inline void __up_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long tmp;</div><div class='del'>-	asm volatile("# beginning __up_write\n\t"</div><div class='del'>-		     LOCK_PREFIX "  xadd      %[tmp],(%[sem])\n\t"</div><div class='del'>-		     /* subtracts 0xffff0001, returns the old value */</div><div class='del'>-		     "  jns        1f\n\t"</div><div class='del'>-		     "  call call_rwsem_wake\n" /* expects old value in %edx */</div><div class='del'>-		     "1:\n\t"</div><div class='del'>-		     "# ending __up_write\n"</div><div class='del'>-		     : "+m" (sem-&gt;count), [tmp] "=d" (tmp)</div><div class='del'>-		     : [sem] "a" (sem), "[tmp]" (-RWSEM_ACTIVE_WRITE_BIAS)</div><div class='del'>-		     : "memory", "cc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * downgrade write lock to read lock</div><div class='del'>- */</div><div class='del'>-static inline void __downgrade_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	asm volatile("# beginning __downgrade_write\n\t"</div><div class='del'>-		     LOCK_PREFIX _ASM_ADD "%[inc],(%[sem])\n\t"</div><div class='del'>-		     /*</div><div class='del'>-		      * transitions 0xZZZZ0001 -&gt; 0xYYYY0001 (i386)</div><div class='del'>-		      *     0xZZZZZZZZ00000001 -&gt; 0xYYYYYYYY00000001 (x86_64)</div><div class='del'>-		      */</div><div class='del'>-		     "  jns       1f\n\t"</div><div class='del'>-		     "  call call_rwsem_downgrade_wake\n"</div><div class='del'>-		     "1:\n\t"</div><div class='del'>-		     "# ending __downgrade_write\n"</div><div class='del'>-		     : "+m" (sem-&gt;count)</div><div class='del'>-		     : [sem] "a" (sem), [inc] "er" (-RWSEM_WAITING_BIAS)</div><div class='del'>-		     : "memory", "cc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='del'>-#endif /* _ASM_X86_RWSEM_H */</div><div class='head'>diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h<br/>index 07a25753e85c..ae7b909dc242 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/set_memory.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/set_memory.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/set_memory.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/set_memory.h</a></div><div class='hunk'>@@ -85,6 +85,9 @@ int set_pages_nx(struct page *page, int numpages);</div><div class='ctx'> int set_pages_ro(struct page *page, int numpages);</div><div class='ctx'> int set_pages_rw(struct page *page, int numpages);</div><div class='ctx'> </div><div class='add'>+int set_direct_map_invalid_noflush(struct page *page);</div><div class='add'>+int set_direct_map_default_noflush(struct page *page);</div><div class='add'>+</div><div class='ctx'> extern int kernel_set_to_readonly;</div><div class='ctx'> void set_kernel_text_rw(void);</div><div class='ctx'> void set_kernel_text_ro(void);</div><div class='head'>diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h<br/>index db333300bd4b..f94a7d0ddd49 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/smap.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/smap.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/smap.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/smap.h</a></div><div class='hunk'>@@ -13,13 +13,12 @@</div><div class='ctx'> #ifndef _ASM_X86_SMAP_H</div><div class='ctx'> #define _ASM_X86_SMAP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;asm/nops.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeatures.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* "Raw" instruction opcodes */</div><div class='del'>-#define __ASM_CLAC	.byte 0x0f,0x01,0xca</div><div class='del'>-#define __ASM_STAC	.byte 0x0f,0x01,0xcb</div><div class='add'>+#define __ASM_CLAC	".byte 0x0f,0x01,0xca"</div><div class='add'>+#define __ASM_STAC	".byte 0x0f,0x01,0xcb"</div><div class='ctx'> </div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -28,10 +27,10 @@</div><div class='ctx'> #ifdef CONFIG_X86_SMAP</div><div class='ctx'> </div><div class='ctx'> #define ASM_CLAC \</div><div class='del'>-	ALTERNATIVE "", __stringify(__ASM_CLAC), X86_FEATURE_SMAP</div><div class='add'>+	ALTERNATIVE "", __ASM_CLAC, X86_FEATURE_SMAP</div><div class='ctx'> </div><div class='ctx'> #define ASM_STAC \</div><div class='del'>-	ALTERNATIVE "", __stringify(__ASM_STAC), X86_FEATURE_SMAP</div><div class='add'>+	ALTERNATIVE "", __ASM_STAC, X86_FEATURE_SMAP</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_X86_SMAP */</div><div class='ctx'> </div><div class='hunk'>@@ -49,26 +48,46 @@</div><div class='ctx'> static __always_inline void clac(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Note: a barrier is implicit in alternative() */</div><div class='del'>-	alternative("", __stringify(__ASM_CLAC), X86_FEATURE_SMAP);</div><div class='add'>+	alternative("", __ASM_CLAC, X86_FEATURE_SMAP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline void stac(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Note: a barrier is implicit in alternative() */</div><div class='del'>-	alternative("", __stringify(__ASM_STAC), X86_FEATURE_SMAP);</div><div class='add'>+	alternative("", __ASM_STAC, X86_FEATURE_SMAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline unsigned long smap_save(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	asm volatile (ALTERNATIVE("", "pushf; pop %0; " __ASM_CLAC,</div><div class='add'>+				  X86_FEATURE_SMAP)</div><div class='add'>+		      : "=rm" (flags) : : "memory", "cc");</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void smap_restore(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	asm volatile (ALTERNATIVE("", "push %0; popf", X86_FEATURE_SMAP)</div><div class='add'>+		      : : "g" (flags) : "memory", "cc");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* These macros can be used in asm() statements */</div><div class='ctx'> #define ASM_CLAC \</div><div class='del'>-	ALTERNATIVE("", __stringify(__ASM_CLAC), X86_FEATURE_SMAP)</div><div class='add'>+	ALTERNATIVE("", __ASM_CLAC, X86_FEATURE_SMAP)</div><div class='ctx'> #define ASM_STAC \</div><div class='del'>-	ALTERNATIVE("", __stringify(__ASM_STAC), X86_FEATURE_SMAP)</div><div class='add'>+	ALTERNATIVE("", __ASM_STAC, X86_FEATURE_SMAP)</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_X86_SMAP */</div><div class='ctx'> </div><div class='ctx'> static inline void clac(void) { }</div><div class='ctx'> static inline void stac(void) { }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long smap_save(void) { return 0; }</div><div class='add'>+static inline void smap_restore(unsigned long flags) { }</div><div class='add'>+</div><div class='ctx'> #define ASM_CLAC</div><div class='ctx'> #define ASM_STAC</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h<br/>index 2e95b6c1bca3..da545df207b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/smp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/smp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/smp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/smp.h</a></div><div class='hunk'>@@ -131,7 +131,7 @@ void native_smp_prepare_boot_cpu(void);</div><div class='ctx'> void native_smp_prepare_cpus(unsigned int max_cpus);</div><div class='ctx'> void calculate_max_logical_packages(void);</div><div class='ctx'> void native_smp_cpus_done(unsigned int max_cpus);</div><div class='del'>-void common_cpu_up(unsigned int cpunum, struct task_struct *tidle);</div><div class='add'>+int common_cpu_up(unsigned int cpunum, struct task_struct *tidle);</div><div class='ctx'> int native_cpu_up(unsigned int cpunum, struct task_struct *tidle);</div><div class='ctx'> int native_cpu_disable(void);</div><div class='ctx'> int common_cpu_die(unsigned int cpu);</div><div class='head'>diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h<br/>index 43c029cdc3fe..0a3c4cab39db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/special_insns.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/special_insns.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/special_insns.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/special_insns.h</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static inline void native_write_cr8(unsigned long val)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS</div><div class='del'>-static inline u32 __read_pkru(void)</div><div class='add'>+static inline u32 rdpkru(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ecx = 0;</div><div class='ctx'> 	u32 edx, pkru;</div><div class='hunk'>@@ -107,7 +107,7 @@ static inline u32 __read_pkru(void)</div><div class='ctx'> 	return pkru;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __write_pkru(u32 pkru)</div><div class='add'>+static inline void wrpkru(u32 pkru)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ecx = 0, edx = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -118,8 +118,21 @@ static inline void __write_pkru(u32 pkru)</div><div class='ctx'> 	asm volatile(".byte 0x0f,0x01,0xef\n\t"</div><div class='ctx'> 		     : : "a" (pkru), "c"(ecx), "d"(edx));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void __write_pkru(u32 pkru)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * WRPKRU is relatively expensive compared to RDPKRU.</div><div class='add'>+	 * Avoid WRPKRU when it would not change the value.</div><div class='add'>+	 */</div><div class='add'>+	if (pkru == rdpkru())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wrpkru(pkru);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-static inline u32 __read_pkru(void)</div><div class='add'>+static inline u32 rdpkru(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h<br/>index 8ec97a62c245..91e29b6a86a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/stackprotector.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/stackprotector.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/stackprotector.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/stackprotector.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  * On x86_64, %gs is shared by percpu area and stack canary.  All</div><div class='ctx'>  * percpu symbols are zero based and %gs points to the base of percpu</div><div class='ctx'>  * area.  The first occupant of the percpu area is always</div><div class='del'>- * irq_stack_union which contains stack_canary at offset 40.  Userland</div><div class='add'>+ * fixed_percpu_data which contains stack_canary at offset 40.  Userland</div><div class='ctx'>  * %gs is always saved and restored on kernel entry and exit using</div><div class='ctx'>  * swapgs, so stack protector doesn't add any complexity there.</div><div class='ctx'>  *</div><div class='hunk'>@@ -64,7 +64,7 @@ static __always_inline void boot_init_stack_canary(void)</div><div class='ctx'> 	u64 tsc;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-	BUILD_BUG_ON(offsetof(union irq_stack_union, stack_canary) != 40);</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct fixed_percpu_data, stack_canary) != 40);</div><div class='ctx'> #endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We both use the random pool and the current TSC as a source</div><div class='hunk'>@@ -79,7 +79,7 @@ static __always_inline void boot_init_stack_canary(void)</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;stack_canary = canary;</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-	this_cpu_write(irq_stack_union.stack_canary, canary);</div><div class='add'>+	this_cpu_write(fixed_percpu_data.stack_canary, canary);</div><div class='ctx'> #else</div><div class='ctx'> 	this_cpu_write(stack_canary.canary, canary);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h<br/>index f335aad404a4..a8d0cdf48616 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/stacktrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/stacktrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/stacktrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/stacktrace.h</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpu_entry_area.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum stack_type {</div><div class='hunk'>@@ -98,19 +100,6 @@ struct stack_frame_ia32 {</div><div class='ctx'>     u32 return_address;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline unsigned long caller_frame_pointer(void)</div><div class='del'>-{</div><div class='del'>-	struct stack_frame *frame;</div><div class='del'>-</div><div class='del'>-	frame = __builtin_frame_address(0);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FRAME_POINTER</div><div class='del'>-	frame = frame-&gt;next_frame;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return (unsigned long)frame;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void show_opcodes(struct pt_regs *regs, const char *loglvl);</div><div class='ctx'> void show_ip(struct pt_regs *regs, const char *loglvl);</div><div class='ctx'> #endif /* _ASM_X86_STACKTRACE_H */</div><div class='head'>diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h<br/>index 7cf1a270d891..18a4b6890fa8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/switch_to.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/switch_to.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/switch_to.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/switch_to.h</a></div><div class='hunk'>@@ -46,6 +46,7 @@ struct inactive_task_frame {</div><div class='ctx'> 	unsigned long r13;</div><div class='ctx'> 	unsigned long r12;</div><div class='ctx'> #else</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned long si;</div><div class='ctx'> 	unsigned long di;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/sync_bitops.h b/arch/x86/include/asm/sync_bitops.h<br/>index 2fe745356fb1..6d8d6bc183b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/sync_bitops.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/sync_bitops.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/sync_bitops.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/sync_bitops.h</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'>  * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/rmwcc.h&gt;</div><div class='add'>+</div><div class='ctx'> #define ADDR (*(volatile long *)addr)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -29,7 +31,7 @@</div><div class='ctx'>  */</div><div class='ctx'> static inline void sync_set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("lock; bts %1,%0"</div><div class='add'>+	asm volatile("lock; " __ASM_SIZE(bts) " %1,%0"</div><div class='ctx'> 		     : "+m" (ADDR)</div><div class='ctx'> 		     : "Ir" (nr)</div><div class='ctx'> 		     : "memory");</div><div class='hunk'>@@ -47,7 +49,7 @@ static inline void sync_set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'>  */</div><div class='ctx'> static inline void sync_clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("lock; btr %1,%0"</div><div class='add'>+	asm volatile("lock; " __ASM_SIZE(btr) " %1,%0"</div><div class='ctx'> 		     : "+m" (ADDR)</div><div class='ctx'> 		     : "Ir" (nr)</div><div class='ctx'> 		     : "memory");</div><div class='hunk'>@@ -64,7 +66,7 @@ static inline void sync_clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'>  */</div><div class='ctx'> static inline void sync_change_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("lock; btc %1,%0"</div><div class='add'>+	asm volatile("lock; " __ASM_SIZE(btc) " %1,%0"</div><div class='ctx'> 		     : "+m" (ADDR)</div><div class='ctx'> 		     : "Ir" (nr)</div><div class='ctx'> 		     : "memory");</div><div class='hunk'>@@ -78,14 +80,9 @@ static inline void sync_change_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'>  * This operation is atomic and cannot be reordered.</div><div class='ctx'>  * It also implies a memory barrier.</div><div class='ctx'>  */</div><div class='del'>-static inline int sync_test_and_set_bit(long nr, volatile unsigned long *addr)</div><div class='add'>+static inline bool sync_test_and_set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned char oldbit;</div><div class='del'>-</div><div class='del'>-	asm volatile("lock; bts %2,%1\n\tsetc %0"</div><div class='del'>-		     : "=qm" (oldbit), "+m" (ADDR)</div><div class='del'>-		     : "Ir" (nr) : "memory");</div><div class='del'>-	return oldbit;</div><div class='add'>+	return GEN_BINARY_RMWcc("lock; " __ASM_SIZE(bts), *addr, c, "Ir", nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -98,12 +95,7 @@ static inline int sync_test_and_set_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'>  */</div><div class='ctx'> static inline int sync_test_and_clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned char oldbit;</div><div class='del'>-</div><div class='del'>-	asm volatile("lock; btr %2,%1\n\tsetc %0"</div><div class='del'>-		     : "=qm" (oldbit), "+m" (ADDR)</div><div class='del'>-		     : "Ir" (nr) : "memory");</div><div class='del'>-	return oldbit;</div><div class='add'>+	return GEN_BINARY_RMWcc("lock; " __ASM_SIZE(btr), *addr, c, "Ir", nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -116,12 +108,7 @@ static inline int sync_test_and_clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'>  */</div><div class='ctx'> static inline int sync_test_and_change_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned char oldbit;</div><div class='del'>-</div><div class='del'>-	asm volatile("lock; btc %2,%1\n\tsetc %0"</div><div class='del'>-		     : "=qm" (oldbit), "+m" (ADDR)</div><div class='del'>-		     : "Ir" (nr) : "memory");</div><div class='del'>-	return oldbit;</div><div class='add'>+	return GEN_BINARY_RMWcc("lock; " __ASM_SIZE(btc), *addr, c, "Ir", nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define sync_test_bit(nr, addr) test_bit(nr, addr)</div><div class='head'>diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h<br/>index d653139857af..b05ad16174e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/syscall.h</a></div><div class='hunk'>@@ -91,11 +91,9 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(i + n &gt; 6);</div><div class='del'>-	memcpy(args, &amp;regs-&gt;bx + i, n * sizeof(args[0]));</div><div class='add'>+	memcpy(args, &amp;regs-&gt;bx, 6 * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='hunk'>@@ -107,7 +105,7 @@ static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 	memcpy(&amp;regs-&gt;bx + i, args, n * sizeof(args[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_I386;</div><div class='ctx'> }</div><div class='hunk'>@@ -116,130 +114,58 @@ static inline int syscall_get_arch(void)</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> # ifdef CONFIG_IA32_EMULATION</div><div class='del'>-	if (task-&gt;thread_info.status &amp; TS_COMPAT)</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;bx;</div><div class='del'>-		case 1:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;cx;</div><div class='del'>-		case 2:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;dx;</div><div class='del'>-		case 3:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;si;</div><div class='del'>-		case 4:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;di;</div><div class='del'>-		case 5:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;bp;</div><div class='del'>-		case 6:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	else</div><div class='add'>+	if (task-&gt;thread_info.status &amp; TS_COMPAT) {</div><div class='add'>+		*args++ = regs-&gt;bx;</div><div class='add'>+		*args++ = regs-&gt;cx;</div><div class='add'>+		*args++ = regs-&gt;dx;</div><div class='add'>+		*args++ = regs-&gt;si;</div><div class='add'>+		*args++ = regs-&gt;di;</div><div class='add'>+		*args   = regs-&gt;bp;</div><div class='add'>+	} else</div><div class='ctx'> # endif</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;di;</div><div class='del'>-		case 1:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;si;</div><div class='del'>-		case 2:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;dx;</div><div class='del'>-		case 3:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;r10;</div><div class='del'>-		case 4:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;r8;</div><div class='del'>-		case 5:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			*args++ = regs-&gt;r9;</div><div class='del'>-		case 6:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	{</div><div class='add'>+		*args++ = regs-&gt;di;</div><div class='add'>+		*args++ = regs-&gt;si;</div><div class='add'>+		*args++ = regs-&gt;dx;</div><div class='add'>+		*args++ = regs-&gt;r10;</div><div class='add'>+		*args++ = regs-&gt;r8;</div><div class='add'>+		*args   = regs-&gt;r9;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> # ifdef CONFIG_IA32_EMULATION</div><div class='del'>-	if (task-&gt;thread_info.status &amp; TS_COMPAT)</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;bx = *args++;</div><div class='del'>-		case 1:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;cx = *args++;</div><div class='del'>-		case 2:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;dx = *args++;</div><div class='del'>-		case 3:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;si = *args++;</div><div class='del'>-		case 4:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;di = *args++;</div><div class='del'>-		case 5:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;bp = *args++;</div><div class='del'>-		case 6:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	else</div><div class='add'>+	if (task-&gt;thread_info.status &amp; TS_COMPAT) {</div><div class='add'>+		regs-&gt;bx = *args++;</div><div class='add'>+		regs-&gt;cx = *args++;</div><div class='add'>+		regs-&gt;dx = *args++;</div><div class='add'>+		regs-&gt;si = *args++;</div><div class='add'>+		regs-&gt;di = *args++;</div><div class='add'>+		regs-&gt;bp = *args;</div><div class='add'>+	} else</div><div class='ctx'> # endif</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;di = *args++;</div><div class='del'>-		case 1:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;si = *args++;</div><div class='del'>-		case 2:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;dx = *args++;</div><div class='del'>-		case 3:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;r10 = *args++;</div><div class='del'>-		case 4:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;r8 = *args++;</div><div class='del'>-		case 5:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-			regs-&gt;r9 = *args++;</div><div class='del'>-		case 6:</div><div class='del'>-			if (!n--) break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	{</div><div class='add'>+		regs-&gt;di = *args++;</div><div class='add'>+		regs-&gt;si = *args++;</div><div class='add'>+		regs-&gt;dx = *args++;</div><div class='add'>+		regs-&gt;r10 = *args++;</div><div class='add'>+		regs-&gt;r8 = *args++;</div><div class='add'>+		regs-&gt;r9 = *args;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	/* x32 tasks should be considered AUDIT_ARCH_X86_64. */</div><div class='del'>-	return in_ia32_syscall() ? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64;</div><div class='add'>+	return (IS_ENABLED(CONFIG_IA32_EMULATION) &amp;&amp;</div><div class='add'>+		task-&gt;thread_info.status &amp; TS_COMPAT)</div><div class='add'>+		? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64;</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_X86_32 */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h<br/>index e85ff65c43c3..c90678fd391a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/text-patching.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/text-patching.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/text-patching.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/text-patching.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@ static inline void apply_paravirt(struct paravirt_patch_site *start,</div><div class='ctx'> #define __parainstructions_end	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void *text_poke_early(void *addr, const void *opcode, size_t len);</div><div class='add'>+extern void text_poke_early(void *addr, const void *opcode, size_t len);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clear and restore the kernel write-protection flag on the local CPU.</div><div class='hunk'>@@ -35,8 +35,11 @@ extern void *text_poke_early(void *addr, const void *opcode, size_t len);</div><div class='ctx'>  * inconsistent instruction while you patch.</div><div class='ctx'>  */</div><div class='ctx'> extern void *text_poke(void *addr, const void *opcode, size_t len);</div><div class='add'>+extern void *text_poke_kgdb(void *addr, const void *opcode, size_t len);</div><div class='ctx'> extern int poke_int3_handler(struct pt_regs *regs);</div><div class='del'>-extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);</div><div class='add'>+extern void text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);</div><div class='ctx'> extern int after_bootmem;</div><div class='add'>+extern __ro_after_init struct mm_struct *poking_mm;</div><div class='add'>+extern __ro_after_init unsigned long poking_addr;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_TEXT_PATCHING_H */</div><div class='head'>diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h<br/>index e0eccbcb8447..f9453536f9bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/thread_info.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/thread_info.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/thread_info.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/thread_info.h</a></div><div class='hunk'>@@ -88,6 +88,7 @@ struct thread_info {</div><div class='ctx'> #define TIF_USER_RETURN_NOTIFY	11	/* notify kernel of userspace return */</div><div class='ctx'> #define TIF_UPROBE		12	/* breakpointed or singlestepping */</div><div class='ctx'> #define TIF_PATCH_PENDING	13	/* pending live patching update */</div><div class='add'>+#define TIF_NEED_FPU_LOAD	14	/* load FPU on return to userspace */</div><div class='ctx'> #define TIF_NOCPUID		15	/* CPUID is not accessible in userland */</div><div class='ctx'> #define TIF_NOTSC		16	/* TSC is not accessible in userland */</div><div class='ctx'> #define TIF_IA32		17	/* IA32 compatibility process */</div><div class='hunk'>@@ -117,6 +118,7 @@ struct thread_info {</div><div class='ctx'> #define _TIF_USER_RETURN_NOTIFY	(1 &lt;&lt; TIF_USER_RETURN_NOTIFY)</div><div class='ctx'> #define _TIF_UPROBE		(1 &lt;&lt; TIF_UPROBE)</div><div class='ctx'> #define _TIF_PATCH_PENDING	(1 &lt;&lt; TIF_PATCH_PENDING)</div><div class='add'>+#define _TIF_NEED_FPU_LOAD	(1 &lt;&lt; TIF_NEED_FPU_LOAD)</div><div class='ctx'> #define _TIF_NOCPUID		(1 &lt;&lt; TIF_NOCPUID)</div><div class='ctx'> #define _TIF_NOTSC		(1 &lt;&lt; TIF_NOTSC)</div><div class='ctx'> #define _TIF_IA32		(1 &lt;&lt; TIF_IA32)</div><div class='head'>diff --git a/arch/x86/include/asm/tlb.h b/arch/x86/include/asm/tlb.h<br/>index 404b8b1d44f5..f23e7aaff4cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/tlb.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #define tlb_end_vma(tlb, vma) do { } while (0)</div><div class='ctx'> #define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)</div><div class='ctx'> </div><div class='add'>+#define tlb_flush tlb_flush</div><div class='ctx'> static inline void tlb_flush(struct mmu_gather *tlb);</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='head'>diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h<br/>index f4204bf377fc..dee375831962 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/tlbflush.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/tlbflush.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/tlbflush.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -167,7 +167,7 @@ struct tlb_state {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mm_struct *loaded_mm;</div><div class='ctx'> </div><div class='del'>-#define LOADED_MM_SWITCHING ((struct mm_struct *)1)</div><div class='add'>+#define LOADED_MM_SWITCHING ((struct mm_struct *)1UL)</div><div class='ctx'> </div><div class='ctx'> 	/* Last user mm for optimizing IBPB */</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -274,6 +274,8 @@ static inline bool nmi_uaccess_okay(void)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define nmi_uaccess_okay nmi_uaccess_okay</div><div class='add'>+</div><div class='ctx'> /* Initialize cr4 shadow for this CPU. */</div><div class='ctx'> static inline void cr4_init_shadow(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h<br/>index e0e6d7f21399..6b1e87194809 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/trace/exceptions.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/trace/exceptions.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/trace/exceptions.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/trace/exceptions.h</a></div><div class='hunk'>@@ -30,7 +30,7 @@ DECLARE_EVENT_CLASS(x86_exceptions,</div><div class='ctx'> 		__entry-&gt;error_code = error_code;</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='del'>-	TP_printk("address=%pf ip=%pf error_code=0x%lx",</div><div class='add'>+	TP_printk("address=%ps ip=%ps error_code=0x%lx",</div><div class='ctx'> 		  (void *)__entry-&gt;address, (void *)__entry-&gt;ip,</div><div class='ctx'> 		  __entry-&gt;error_code) );</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/trace/fpu.h b/arch/x86/include/asm/trace/fpu.h<br/>index 069c04be1507..879b77792f94 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/trace/fpu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/trace/fpu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/trace/fpu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/trace/fpu.h</a></div><div class='hunk'>@@ -13,22 +13,22 @@ DECLARE_EVENT_CLASS(x86_fpu,</div><div class='ctx'> </div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(struct fpu *, fpu)</div><div class='del'>-		__field(bool, initialized)</div><div class='add'>+		__field(bool, load_fpu)</div><div class='ctx'> 		__field(u64, xfeatures)</div><div class='ctx'> 		__field(u64, xcomp_bv)</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;fpu		= fpu;</div><div class='del'>-		__entry-&gt;initialized	= fpu-&gt;initialized;</div><div class='add'>+		__entry-&gt;load_fpu	= test_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='ctx'> 		if (boot_cpu_has(X86_FEATURE_OSXSAVE)) {</div><div class='ctx'> 			__entry-&gt;xfeatures = fpu-&gt;state.xsave.header.xfeatures;</div><div class='ctx'> 			__entry-&gt;xcomp_bv  = fpu-&gt;state.xsave.header.xcomp_bv;</div><div class='ctx'> 		}</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("x86/fpu: %p initialized: %d xfeatures: %llx xcomp_bv: %llx",</div><div class='add'>+	TP_printk("x86/fpu: %p load: %d xfeatures: %llx xcomp_bv: %llx",</div><div class='ctx'> 			__entry-&gt;fpu,</div><div class='del'>-			__entry-&gt;initialized,</div><div class='add'>+			__entry-&gt;load_fpu,</div><div class='ctx'> 			__entry-&gt;xfeatures,</div><div class='ctx'> 			__entry-&gt;xcomp_bv</div><div class='ctx'> 	)</div><div class='hunk'>@@ -64,11 +64,6 @@ DEFINE_EVENT(x86_fpu, x86_fpu_regs_deactivated,</div><div class='ctx'> 	TP_ARGS(fpu)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='del'>-DEFINE_EVENT(x86_fpu, x86_fpu_activate_state,</div><div class='del'>-	TP_PROTO(struct fpu *fpu),</div><div class='del'>-	TP_ARGS(fpu)</div><div class='del'>-);</div><div class='del'>-</div><div class='ctx'> DEFINE_EVENT(x86_fpu, x86_fpu_init_state,</div><div class='ctx'> 	TP_PROTO(struct fpu *fpu),</div><div class='ctx'> 	TP_ARGS(fpu)</div><div class='head'>diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h<br/>index 1954dd5552a2..c82abd6e4ca3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/uaccess.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/uaccess.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/uaccess.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/uaccess.h</a></div><div class='hunk'>@@ -427,10 +427,11 @@ do {									\</div><div class='ctx'> ({								\</div><div class='ctx'> 	__label__ __pu_label;					\</div><div class='ctx'> 	int __pu_err = -EFAULT;					\</div><div class='del'>-	__typeof__(*(ptr)) __pu_val;				\</div><div class='del'>-	__pu_val = x;						\</div><div class='add'>+	__typeof__(*(ptr)) __pu_val = (x);			\</div><div class='add'>+	__typeof__(ptr) __pu_ptr = (ptr);			\</div><div class='add'>+	__typeof__(size) __pu_size = (size);			\</div><div class='ctx'> 	__uaccess_begin();					\</div><div class='del'>-	__put_user_size(__pu_val, (ptr), (size), __pu_label);	\</div><div class='add'>+	__put_user_size(__pu_val, __pu_ptr, __pu_size, __pu_label);	\</div><div class='ctx'> 	__pu_err = 0;						\</div><div class='ctx'> __pu_label:							\</div><div class='ctx'> 	__uaccess_end();					\</div><div class='hunk'>@@ -585,7 +586,6 @@ extern void __cmpxchg_wrong_size(void)</div><div class='ctx'> #define __user_atomic_cmpxchg_inatomic(uval, ptr, old, new, size)	\</div><div class='ctx'> ({									\</div><div class='ctx'> 	int __ret = 0;							\</div><div class='del'>-	__typeof__(ptr) __uval = (uval);				\</div><div class='ctx'> 	__typeof__(*(ptr)) __old = (old);				\</div><div class='ctx'> 	__typeof__(*(ptr)) __new = (new);				\</div><div class='ctx'> 	__uaccess_begin_nospec();					\</div><div class='hunk'>@@ -661,7 +661,7 @@ extern void __cmpxchg_wrong_size(void)</div><div class='ctx'> 		__cmpxchg_wrong_size();					\</div><div class='ctx'> 	}								\</div><div class='ctx'> 	__uaccess_end();						\</div><div class='del'>-	*__uval = __old;						\</div><div class='add'>+	*(uval) = __old;						\</div><div class='ctx'> 	__ret;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='hunk'>@@ -705,7 +705,7 @@ extern struct movsl_mask {</div><div class='ctx'>  * checking before using them, but you have to surround them with the</div><div class='ctx'>  * user_access_begin/end() pair.</div><div class='ctx'>  */</div><div class='del'>-static __must_check inline bool user_access_begin(const void __user *ptr, size_t len)</div><div class='add'>+static __must_check __always_inline bool user_access_begin(const void __user *ptr, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(!access_ok(ptr,len)))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -715,6 +715,9 @@ static __must_check inline bool user_access_begin(const void __user *ptr, size_t</div><div class='ctx'> #define user_access_begin(a,b)	user_access_begin(a,b)</div><div class='ctx'> #define user_access_end()	__uaccess_end()</div><div class='ctx'> </div><div class='add'>+#define user_access_save()	smap_save()</div><div class='add'>+#define user_access_restore(x)	smap_restore(x)</div><div class='add'>+</div><div class='ctx'> #define unsafe_put_user(x, ptr, label)	\</div><div class='ctx'> 	__put_user_size((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), label)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h<br/>index a9d637bc301d..5cd1caa8bc65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/uaccess_64.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/uaccess_64.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/uaccess_64.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/uaccess_64.h</a></div><div class='hunk'>@@ -208,9 +208,6 @@ __copy_from_user_flushcache(void *dst, const void __user *src, unsigned size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='del'>-copy_user_handle_tail(char *to, char *from, unsigned len);</div><div class='del'>-</div><div class='del'>-unsigned long</div><div class='ctx'> mcsafe_handle_tail(char *to, char *from, unsigned len);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_UACCESS_64_H */</div><div class='head'>diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h<br/>index de6f0d59a24f..d50c7b747d8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/xen/hypercall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/asm/xen/hypercall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/asm/xen/hypercall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/asm/xen/hypercall.h</a></div><div class='hunk'>@@ -206,6 +206,9 @@ xen_single_call(unsigned int call,</div><div class='ctx'> 	__HYPERCALL_DECLS;</div><div class='ctx'> 	__HYPERCALL_5ARG(a1, a2, a3, a4, a5);</div><div class='ctx'> </div><div class='add'>+	if (call &gt;= PAGE_SIZE / sizeof(hypercall_page[0]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	asm volatile(CALL_NOSPEC</div><div class='ctx'> 		     : __HYPERCALL_5PARAM</div><div class='ctx'> 		     : [thunk_target] "a" (&amp;hypercall_page[call])</div><div class='hunk'>@@ -214,6 +217,22 @@ xen_single_call(unsigned int call,</div><div class='ctx'> 	return (long)__res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline void __xen_stac(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Suppress objtool seeing the STAC/CLAC and getting confused about it</div><div class='add'>+	 * calling random code with AC=1.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile(ANNOTATE_IGNORE_ALTERNATIVE</div><div class='add'>+		     ASM_STAC ::: "memory", "flags");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void __xen_clac(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile(ANNOTATE_IGNORE_ALTERNATIVE</div><div class='add'>+		     ASM_CLAC ::: "memory", "flags");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline long</div><div class='ctx'> privcmd_call(unsigned int call,</div><div class='ctx'> 	     unsigned long a1, unsigned long a2,</div><div class='hunk'>@@ -222,9 +241,9 @@ privcmd_call(unsigned int call,</div><div class='ctx'> {</div><div class='ctx'> 	long res;</div><div class='ctx'> </div><div class='del'>-	stac();</div><div class='add'>+	__xen_stac();</div><div class='ctx'> 	res = xen_single_call(call, a1, a2, a3, a4, a5);</div><div class='del'>-	clac();</div><div class='add'>+	__xen_clac();</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -421,9 +440,9 @@ HYPERVISOR_dm_op(</div><div class='ctx'> 	domid_t dom, unsigned int nr_bufs, struct xen_dm_op_buf *bufs)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	stac();</div><div class='add'>+	__xen_stac();</div><div class='ctx'> 	ret = _hypercall3(int, dm_op, dom, nr_bufs, bufs);</div><div class='del'>-	clac();</div><div class='add'>+	__xen_clac();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h<br/>index dabfcf7c3941..7a0e64ccd6ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/kvm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/kvm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/kvm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/uapi/asm/kvm.h</a></div><div class='hunk'>@@ -381,6 +381,7 @@ struct kvm_sync_regs {</div><div class='ctx'> #define KVM_X86_QUIRK_LINT0_REENABLED	(1 &lt;&lt; 0)</div><div class='ctx'> #define KVM_X86_QUIRK_CD_NW_CLEARED	(1 &lt;&lt; 1)</div><div class='ctx'> #define KVM_X86_QUIRK_LAPIC_MMIO_HOLE	(1 &lt;&lt; 2)</div><div class='add'>+#define KVM_X86_QUIRK_OUT_7E_INC_RIP	(1 &lt;&lt; 3)</div><div class='ctx'> </div><div class='ctx'> #define KVM_STATE_NESTED_GUEST_MODE	0x00000001</div><div class='ctx'> #define KVM_STATE_NESTED_RUN_PENDING	0x00000002</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/perf_regs.h b/arch/x86/include/uapi/asm/perf_regs.h<br/>index f3329cabce5c..ac67bbea10ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/perf_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/perf_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/perf_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/uapi/asm/perf_regs.h</a></div><div class='hunk'>@@ -27,8 +27,29 @@ enum perf_event_x86_regs {</div><div class='ctx'> 	PERF_REG_X86_R13,</div><div class='ctx'> 	PERF_REG_X86_R14,</div><div class='ctx'> 	PERF_REG_X86_R15,</div><div class='del'>-</div><div class='add'>+	/* These are the limits for the GPRs. */</div><div class='ctx'> 	PERF_REG_X86_32_MAX = PERF_REG_X86_GS + 1,</div><div class='ctx'> 	PERF_REG_X86_64_MAX = PERF_REG_X86_R15 + 1,</div><div class='add'>+</div><div class='add'>+	/* These all need two bits set because they are 128bit */</div><div class='add'>+	PERF_REG_X86_XMM0  = 32,</div><div class='add'>+	PERF_REG_X86_XMM1  = 34,</div><div class='add'>+	PERF_REG_X86_XMM2  = 36,</div><div class='add'>+	PERF_REG_X86_XMM3  = 38,</div><div class='add'>+	PERF_REG_X86_XMM4  = 40,</div><div class='add'>+	PERF_REG_X86_XMM5  = 42,</div><div class='add'>+	PERF_REG_X86_XMM6  = 44,</div><div class='add'>+	PERF_REG_X86_XMM7  = 46,</div><div class='add'>+	PERF_REG_X86_XMM8  = 48,</div><div class='add'>+	PERF_REG_X86_XMM9  = 50,</div><div class='add'>+	PERF_REG_X86_XMM10 = 52,</div><div class='add'>+	PERF_REG_X86_XMM11 = 54,</div><div class='add'>+	PERF_REG_X86_XMM12 = 56,</div><div class='add'>+	PERF_REG_X86_XMM13 = 58,</div><div class='add'>+	PERF_REG_X86_XMM14 = 60,</div><div class='add'>+	PERF_REG_X86_XMM15 = 62,</div><div class='add'>+</div><div class='add'>+	/* These include both GPRs and XMMX registers */</div><div class='add'>+	PERF_REG_X86_XMM_MAX = PERF_REG_X86_XMM15 + 2,</div><div class='ctx'> };</div><div class='ctx'> #endif /* _ASM_X86_PERF_REGS_H */</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/sockios.h b/arch/x86/include/uapi/asm/sockios.h<br/>deleted file mode 100644<br/>index def6d4746ee7..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/sockios.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#include &lt;asm-generic/sockios.h&gt;</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h<br/>index f0b0c90dd398..d213ec5c3766 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/vmx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/include/uapi/asm/vmx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/include/uapi/asm/vmx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/include/uapi/asm/vmx.h</a></div><div class='hunk'>@@ -146,6 +146,7 @@</div><div class='ctx'> </div><div class='ctx'> #define VMX_ABORT_SAVE_GUEST_MSR_FAIL        1</div><div class='ctx'> #define VMX_ABORT_LOAD_HOST_PDPTE_FAIL       2</div><div class='add'>+#define VMX_ABORT_VMCS_CORRUPTED             3</div><div class='ctx'> #define VMX_ABORT_LOAD_HOST_MSR_FAIL         4</div><div class='ctx'> </div><div class='ctx'> #endif /* _UAPIVMX_H */</div><div class='head'>diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c<br/>index 8dcbf6890714..9fc92e4539d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/acpi/boot.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/acpi/boot.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/acpi/boot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/acpi/boot.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ static int acpi_register_lapic(int id, u32 acpiid, u8 enabled)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)</div><div class='add'>+acpi_parse_x2apic(union acpi_subtable_headers *header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_x2apic *processor = NULL;</div><div class='ctx'> #ifdef CONFIG_X86_X2APIC</div><div class='hunk'>@@ -210,7 +210,7 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)</div><div class='ctx'> 	if (BAD_MADT_ENTRY(processor, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_X2APIC</div><div class='ctx'> 	apic_id = processor-&gt;local_apic_id;</div><div class='hunk'>@@ -242,7 +242,7 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_lapic(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_apic *processor = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -251,7 +251,7 @@ acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='ctx'> 	if (BAD_MADT_ENTRY(processor, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore invalid ID */</div><div class='ctx'> 	if (processor-&gt;id == 0xff)</div><div class='hunk'>@@ -272,7 +272,7 @@ acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end)</div><div class='add'>+acpi_parse_sapic(union acpi_subtable_headers *header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_sapic *processor = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -281,7 +281,7 @@ acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end)</div><div class='ctx'> 	if (BAD_MADT_ENTRY(processor, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	acpi_register_lapic((processor-&gt;id &lt;&lt; 8) | processor-&gt;eid,/* APIC ID */</div><div class='ctx'> 			    processor-&gt;processor_id, /* ACPI ID */</div><div class='hunk'>@@ -291,7 +291,7 @@ acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,</div><div class='add'>+acpi_parse_lapic_addr_ovr(union acpi_subtable_headers * header,</div><div class='ctx'> 			  const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;</div><div class='hunk'>@@ -301,7 +301,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,</div><div class='ctx'> 	if (BAD_MADT_ENTRY(lapic_addr_ovr, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	acpi_lapic_addr = lapic_addr_ovr-&gt;address;</div><div class='ctx'> </div><div class='hunk'>@@ -309,7 +309,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_x2apic_nmi(struct acpi_subtable_header *header,</div><div class='add'>+acpi_parse_x2apic_nmi(union acpi_subtable_headers *header,</div><div class='ctx'> 		      const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_x2apic_nmi *x2apic_nmi = NULL;</div><div class='hunk'>@@ -319,7 +319,7 @@ acpi_parse_x2apic_nmi(struct acpi_subtable_header *header,</div><div class='ctx'> 	if (BAD_MADT_ENTRY(x2apic_nmi, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	if (x2apic_nmi-&gt;lint != 1)</div><div class='ctx'> 		printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");</div><div class='hunk'>@@ -328,7 +328,7 @@ acpi_parse_x2apic_nmi(struct acpi_subtable_header *header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_lapic_nmi(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_local_apic_nmi *lapic_nmi = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -337,7 +337,7 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e</div><div class='ctx'> 	if (BAD_MADT_ENTRY(lapic_nmi, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	if (lapic_nmi-&gt;lint != 1)</div><div class='ctx'> 		printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");</div><div class='hunk'>@@ -449,7 +449,7 @@ static int __init mp_register_ioapic_irq(u8 bus_irq, u8 polarity,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_ioapic(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_io_apic *ioapic = NULL;</div><div class='ctx'> 	struct ioapic_domain_cfg cfg = {</div><div class='hunk'>@@ -462,7 +462,7 @@ acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)</div><div class='ctx'> 	if (BAD_MADT_ENTRY(ioapic, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* Statically assign IRQ numbers for IOAPICs hosting legacy IRQs */</div><div class='ctx'> 	if (ioapic-&gt;global_irq_base &lt; nr_legacy_irqs())</div><div class='hunk'>@@ -508,7 +508,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_int_src_ovr(struct acpi_subtable_header * header,</div><div class='add'>+acpi_parse_int_src_ovr(union acpi_subtable_headers * header,</div><div class='ctx'> 		       const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_interrupt_override *intsrc = NULL;</div><div class='hunk'>@@ -518,7 +518,7 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header,</div><div class='ctx'> 	if (BAD_MADT_ENTRY(intsrc, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	if (intsrc-&gt;source_irq == acpi_gbl_FADT.sci_interrupt) {</div><div class='ctx'> 		acpi_sci_ioapic_setup(intsrc-&gt;source_irq,</div><div class='hunk'>@@ -550,7 +550,7 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end)</div><div class='add'>+acpi_parse_nmi_src(union acpi_subtable_headers * header, const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_nmi_source *nmi_src = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -559,7 +559,7 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end</div><div class='ctx'> 	if (BAD_MADT_ENTRY(nmi_src, end))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_madt_entry(header);</div><div class='add'>+	acpi_table_print_madt_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Support nimsrc entries? */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c<br/>index 158ad1483c43..cb6e076a6d39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/acpi/cstate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/acpi/cstate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/acpi/cstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/acpi/cstate.c</a></div><div class='hunk'>@@ -51,6 +51,18 @@ void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,</div><div class='ctx'> 	if (c-&gt;x86_vendor == X86_VENDOR_INTEL &amp;&amp;</div><div class='ctx'> 	    (c-&gt;x86 &gt; 0xf || (c-&gt;x86 == 6 &amp;&amp; c-&gt;x86_model &gt;= 0x0f)))</div><div class='ctx'> 			flags-&gt;bm_control = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * For all recent Centaur CPUs, the ucode will make sure that each</div><div class='add'>+	 * core can keep cache coherence with each other while entering C3</div><div class='add'>+	 * type state. So, set bm_check to 1 to indicate that the kernel</div><div class='add'>+	 * doesn't need to execute a cache flush operation (WBINVD) when</div><div class='add'>+	 * entering C3 type state.</div><div class='add'>+	 */</div><div class='add'>+	if (c-&gt;x86_vendor == X86_VENDOR_CENTAUR) {</div><div class='add'>+		if (c-&gt;x86 &gt; 6 || (c-&gt;x86 == 6 &amp;&amp; c-&gt;x86_model == 0x0f &amp;&amp;</div><div class='add'>+		    c-&gt;x86_stepping &gt;= 0x0e))</div><div class='add'>+			flags-&gt;bm_check = 1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(acpi_processor_power_init_bm_check);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c<br/>index 9a79c7808f9c..7b9b49dfc05a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/alternative.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/alternative.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/alternative.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/alternative.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/text-patching.h&gt;</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='hunk'>@@ -264,7 +265,7 @@ static void __init_or_module add_nops(void *insns, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> extern struct alt_instr __alt_instructions[], __alt_instructions_end[];</div><div class='ctx'> extern s32 __smp_locks[], __smp_locks_end[];</div><div class='del'>-void *text_poke_early(void *addr, const void *opcode, size_t len);</div><div class='add'>+void text_poke_early(void *addr, const void *opcode, size_t len);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Are we looking at a near JMP with a 1 or 4-byte displacement.</div><div class='hunk'>@@ -666,16 +667,136 @@ void __init alternative_instructions(void)</div><div class='ctx'>  * instructions. And on the local CPU you need to be protected again NMI or MCE</div><div class='ctx'>  * handlers seeing an inconsistent instruction while you patch.</div><div class='ctx'>  */</div><div class='del'>-void *__init_or_module text_poke_early(void *addr, const void *opcode,</div><div class='del'>-					      size_t len)</div><div class='add'>+void __init_or_module text_poke_early(void *addr, const void *opcode,</div><div class='add'>+				      size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_NX) &amp;&amp;</div><div class='add'>+	    is_module_text_address((unsigned long)addr)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Modules text is marked initially as non-executable, so the</div><div class='add'>+		 * code cannot be running and speculative code-fetches are</div><div class='add'>+		 * prevented. Just change the code.</div><div class='add'>+		 */</div><div class='add'>+		memcpy(addr, opcode, len);</div><div class='add'>+	} else {</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		memcpy(addr, opcode, len);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		sync_core();</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Could also do a CLFLUSH here to speed up CPU recovery; but</div><div class='add'>+		 * that causes hangs on some VIA CPUs.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__ro_after_init struct mm_struct *poking_mm;</div><div class='add'>+__ro_after_init unsigned long poking_addr;</div><div class='add'>+</div><div class='add'>+static void *__text_poke(void *addr, const void *opcode, size_t len)</div><div class='add'>+{</div><div class='add'>+	bool cross_page_boundary = offset_in_page(addr) + len &gt; PAGE_SIZE;</div><div class='add'>+	struct page *pages[2] = {NULL};</div><div class='add'>+	temp_mm_state_t prev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	pte_t pte, *ptep;</div><div class='add'>+	spinlock_t *ptl;</div><div class='add'>+	pgprot_t pgprot;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * While boot memory allocator is running we cannot use struct pages as</div><div class='add'>+	 * they are not yet initialized. There is no way to recover.</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(!after_bootmem);</div><div class='add'>+</div><div class='add'>+	if (!core_kernel_text((unsigned long)addr)) {</div><div class='add'>+		pages[0] = vmalloc_to_page(addr);</div><div class='add'>+		if (cross_page_boundary)</div><div class='add'>+			pages[1] = vmalloc_to_page(addr + PAGE_SIZE);</div><div class='add'>+	} else {</div><div class='add'>+		pages[0] = virt_to_page(addr);</div><div class='add'>+		WARN_ON(!PageReserved(pages[0]));</div><div class='add'>+		if (cross_page_boundary)</div><div class='add'>+			pages[1] = virt_to_page(addr + PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * If something went wrong, crash and burn since recovery paths are not</div><div class='add'>+	 * implemented.</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(!pages[0] || (cross_page_boundary &amp;&amp; !pages[1]));</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	memcpy(addr, opcode, len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Map the page without the global bit, as TLB flushing is done with</div><div class='add'>+	 * flush_tlb_mm_range(), which is intended for non-global PTEs.</div><div class='add'>+	 */</div><div class='add'>+	pgprot = __pgprot(pgprot_val(PAGE_KERNEL) &amp; ~_PAGE_GLOBAL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The lock is not really needed, but this allows to avoid open-coding.</div><div class='add'>+	 */</div><div class='add'>+	ptep = get_locked_pte(poking_mm, poking_addr, &amp;ptl);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This must not fail; preallocated in poking_init().</div><div class='add'>+	 */</div><div class='add'>+	VM_BUG_ON(!ptep);</div><div class='add'>+</div><div class='add'>+	pte = mk_pte(pages[0], pgprot);</div><div class='add'>+	set_pte_at(poking_mm, poking_addr, ptep, pte);</div><div class='add'>+</div><div class='add'>+	if (cross_page_boundary) {</div><div class='add'>+		pte = mk_pte(pages[1], pgprot);</div><div class='add'>+		set_pte_at(poking_mm, poking_addr + PAGE_SIZE, ptep + 1, pte);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Loading the temporary mm behaves as a compiler barrier, which</div><div class='add'>+	 * guarantees that the PTE will be set at the time memcpy() is done.</div><div class='add'>+	 */</div><div class='add'>+	prev = use_temporary_mm(poking_mm);</div><div class='add'>+</div><div class='add'>+	kasan_disable_current();</div><div class='add'>+	memcpy((u8 *)poking_addr + offset_in_page(addr), opcode, len);</div><div class='add'>+	kasan_enable_current();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that the PTE is only cleared after the instructions of memcpy</div><div class='add'>+	 * were issued by using a compiler barrier.</div><div class='add'>+	 */</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	pte_clear(poking_mm, poking_addr, ptep);</div><div class='add'>+	if (cross_page_boundary)</div><div class='add'>+		pte_clear(poking_mm, poking_addr + PAGE_SIZE, ptep + 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Loading the previous page-table hierarchy requires a serializing</div><div class='add'>+	 * instruction that already allows the core to see the updated version.</div><div class='add'>+	 * Xen-PV is assumed to serialize execution in a similar manner.</div><div class='add'>+	 */</div><div class='add'>+	unuse_temporary_mm(prev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Flushing the TLB might involve IPIs, which would require enabled</div><div class='add'>+	 * IRQs, but not if the mm is not used, as it is in this point.</div><div class='add'>+	 */</div><div class='add'>+	flush_tlb_mm_range(poking_mm, poking_addr, poking_addr +</div><div class='add'>+			   (cross_page_boundary ? 2 : 1) * PAGE_SIZE,</div><div class='add'>+			   PAGE_SHIFT, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the text does not match what we just wrote then something is</div><div class='add'>+	 * fundamentally screwy; there's nothing we can really do about that.</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(memcmp(addr, opcode, len));</div><div class='add'>+</div><div class='add'>+	pte_unmap_unlock(ptep, ptl);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='del'>-	sync_core();</div><div class='del'>-	/* Could also do a CLFLUSH here to speed up CPU recovery; but</div><div class='del'>-	   that causes hangs on some VIA CPUs. */</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -689,48 +810,36 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,</div><div class='ctx'>  * It means the size must be writable atomically and the address must be aligned</div><div class='ctx'>  * in a way that permits an atomic write. It also makes sure we fit on a single</div><div class='ctx'>  * page.</div><div class='add'>+ *</div><div class='add'>+ * Note that the caller must ensure that if the modified code is part of a</div><div class='add'>+ * module, the module would not be removed during poking. This can be achieved</div><div class='add'>+ * by registering a module notifier, and ordering module removal and patching</div><div class='add'>+ * trough a mutex.</div><div class='ctx'>  */</div><div class='ctx'> void *text_poke(void *addr, const void *opcode, size_t len)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	char *vaddr;</div><div class='del'>-	struct page *pages[2];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * While boot memory allocator is runnig we cannot use struct</div><div class='del'>-	 * pages as they are not yet initialized.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(!after_bootmem);</div><div class='del'>-</div><div class='ctx'> 	lockdep_assert_held(&amp;text_mutex);</div><div class='ctx'> </div><div class='del'>-	if (!core_kernel_text((unsigned long)addr)) {</div><div class='del'>-		pages[0] = vmalloc_to_page(addr);</div><div class='del'>-		pages[1] = vmalloc_to_page(addr + PAGE_SIZE);</div><div class='del'>-	} else {</div><div class='del'>-		pages[0] = virt_to_page(addr);</div><div class='del'>-		WARN_ON(!PageReserved(pages[0]));</div><div class='del'>-		pages[1] = virt_to_page(addr + PAGE_SIZE);</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!pages[0]);</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));</div><div class='del'>-	if (pages[1])</div><div class='del'>-		set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));</div><div class='del'>-	vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);</div><div class='del'>-	memcpy(&amp;vaddr[(unsigned long)addr &amp; ~PAGE_MASK], opcode, len);</div><div class='del'>-	clear_fixmap(FIX_TEXT_POKE0);</div><div class='del'>-	if (pages[1])</div><div class='del'>-		clear_fixmap(FIX_TEXT_POKE1);</div><div class='del'>-	local_flush_tlb();</div><div class='del'>-	sync_core();</div><div class='del'>-	/* Could also do a CLFLUSH here to speed up CPU recovery; but</div><div class='del'>-	   that causes hangs on some VIA CPUs. */</div><div class='del'>-	for (i = 0; i &lt; len; i++)</div><div class='del'>-		BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return addr;</div><div class='add'>+	return __text_poke(addr, opcode, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * text_poke_kgdb - Update instructions on a live kernel by kgdb</div><div class='add'>+ * @addr: address to modify</div><div class='add'>+ * @opcode: source of the copy</div><div class='add'>+ * @len: length to copy</div><div class='add'>+ *</div><div class='add'>+ * Only atomic text poke/set should be allowed when not doing early patching.</div><div class='add'>+ * It means the size must be writable atomically and the address must be aligned</div><div class='add'>+ * in a way that permits an atomic write. It also makes sure we fit on a single</div><div class='add'>+ * page.</div><div class='add'>+ *</div><div class='add'>+ * Context: should only be used by kgdb, which ensures no other core is running,</div><div class='add'>+ *	    despite the fact it does not hold the text_mutex.</div><div class='add'>+ */</div><div class='add'>+void *text_poke_kgdb(void *addr, const void *opcode, size_t len)</div><div class='add'>+{</div><div class='add'>+	return __text_poke(addr, opcode, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void do_sync_core(void *info)</div><div class='hunk'>@@ -788,7 +897,7 @@ NOKPROBE_SYMBOL(poke_int3_handler);</div><div class='ctx'>  *	  replacing opcode</div><div class='ctx'>  *	- sync cores</div><div class='ctx'>  */</div><div class='del'>-void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)</div><div class='add'>+void text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char int3 = 0xcc;</div><div class='ctx'> </div><div class='hunk'>@@ -830,7 +939,5 @@ void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)</div><div class='ctx'> 	 * the writing of the new instruction.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bp_patching_in_progress = false;</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c<br/>index 58176b56354e..294ed4392a0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/aperture_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/aperture_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/aperture_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/aperture_64.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #define pr_fmt(fmt) "AGP: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/kcore.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='hunk'>@@ -57,7 +58,7 @@ int fallback_aper_force __initdata;</div><div class='ctx'> </div><div class='ctx'> int fix_aperture __initdata = 1;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_VMCORE</div><div class='add'>+#if defined(CONFIG_PROC_VMCORE) || defined(CONFIG_PROC_KCORE)</div><div class='ctx'> /*</div><div class='ctx'>  * If the first kernel maps the aperture over e820 RAM, the kdump kernel will</div><div class='ctx'>  * use the same range because it will remain configured in the northbridge.</div><div class='hunk'>@@ -66,20 +67,25 @@ int fix_aperture __initdata = 1;</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long aperture_pfn_start, aperture_page_count;</div><div class='ctx'> </div><div class='del'>-static int gart_oldmem_pfn_is_ram(unsigned long pfn)</div><div class='add'>+static int gart_mem_pfn_is_ram(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	return likely((pfn &lt; aperture_pfn_start) ||</div><div class='ctx'> 		      (pfn &gt;= aperture_pfn_start + aperture_page_count));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exclude_from_vmcore(u64 aper_base, u32 aper_order)</div><div class='add'>+static void __init exclude_from_core(u64 aper_base, u32 aper_order)</div><div class='ctx'> {</div><div class='ctx'> 	aperture_pfn_start = aper_base &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	aperture_page_count = (32 * 1024 * 1024) &lt;&lt; aper_order &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	WARN_ON(register_oldmem_pfn_is_ram(&amp;gart_oldmem_pfn_is_ram));</div><div class='add'>+#ifdef CONFIG_PROC_VMCORE</div><div class='add'>+	WARN_ON(register_oldmem_pfn_is_ram(&amp;gart_mem_pfn_is_ram));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PROC_KCORE</div><div class='add'>+	WARN_ON(register_mem_pfn_is_ram(&amp;gart_mem_pfn_is_ram));</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void exclude_from_vmcore(u64 aper_base, u32 aper_order)</div><div class='add'>+static void exclude_from_core(u64 aper_base, u32 aper_order)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -474,7 +480,7 @@ out:</div><div class='ctx'> 			 * may have allocated the range over its e820 RAM</div><div class='ctx'> 			 * and fixed up the northbridge</div><div class='ctx'> 			 */</div><div class='del'>-			exclude_from_vmcore(last_aper_base, last_aper_order);</div><div class='add'>+			exclude_from_core(last_aper_base, last_aper_order);</div><div class='ctx'> </div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -520,7 +526,7 @@ out:</div><div class='ctx'> 	 * overlap with the first kernel's memory. We can't access the</div><div class='ctx'> 	 * range through vmcore even though it should be part of the dump.</div><div class='ctx'> 	 */</div><div class='del'>-	exclude_from_vmcore(aper_alloc, aper_order);</div><div class='add'>+	exclude_from_core(aper_alloc, aper_order);</div><div class='ctx'> </div><div class='ctx'> 	/* Fix up the north bridges */</div><div class='ctx'> 	for (i = 0; i &lt; amd_nb_bus_dev_ranges[i].dev_limit; i++) {</div><div class='head'>diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c<br/>index b7bcdd781651..ab6af775f06c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/apic/apic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/apic/apic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/apic/apic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/apic/apic.c</a></div><div class='hunk'>@@ -802,6 +802,24 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init lapic_init_clockevent(void)</div><div class='add'>+{</div><div class='add'>+	if (!lapic_timer_frequency)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Calculate the scaled math multiplication factor */</div><div class='add'>+	lapic_clockevent.mult = div_sc(lapic_timer_frequency/APIC_DIVISOR,</div><div class='add'>+					TICK_NSEC, lapic_clockevent.shift);</div><div class='add'>+	lapic_clockevent.max_delta_ns =</div><div class='add'>+		clockevent_delta2ns(0x7FFFFFFF, &amp;lapic_clockevent);</div><div class='add'>+	lapic_clockevent.max_delta_ticks = 0x7FFFFFFF;</div><div class='add'>+	lapic_clockevent.min_delta_ns =</div><div class='add'>+		clockevent_delta2ns(0xF, &amp;lapic_clockevent);</div><div class='add'>+	lapic_clockevent.min_delta_ticks = 0xF;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init calibrate_APIC_clock(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct clock_event_device *levt = this_cpu_ptr(&amp;lapic_events);</div><div class='hunk'>@@ -810,25 +828,21 @@ static int __init calibrate_APIC_clock(void)</div><div class='ctx'> 	long delta, deltatsc;</div><div class='ctx'> 	int pm_referenced = 0;</div><div class='ctx'> </div><div class='del'>-	/**</div><div class='del'>-	 * check if lapic timer has already been calibrated by platform</div><div class='del'>-	 * specific routine, such as tsc calibration code. if so, we just fill</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if lapic timer has already been calibrated by platform</div><div class='add'>+	 * specific routine, such as tsc calibration code. If so just fill</div><div class='ctx'> 	 * in the clockevent structure and return.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER)) {</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (lapic_timer_frequency) {</div><div class='add'>+	if (!lapic_init_clockevent()) {</div><div class='ctx'> 		apic_printk(APIC_VERBOSE, "lapic timer already calibrated %d\n",</div><div class='del'>-				lapic_timer_frequency);</div><div class='del'>-		lapic_clockevent.mult = div_sc(lapic_timer_frequency/APIC_DIVISOR,</div><div class='del'>-					TICK_NSEC, lapic_clockevent.shift);</div><div class='del'>-		lapic_clockevent.max_delta_ns =</div><div class='del'>-			clockevent_delta2ns(0x7FFFFF, &amp;lapic_clockevent);</div><div class='del'>-		lapic_clockevent.max_delta_ticks = 0x7FFFFF;</div><div class='del'>-		lapic_clockevent.min_delta_ns =</div><div class='del'>-			clockevent_delta2ns(0xF, &amp;lapic_clockevent);</div><div class='del'>-		lapic_clockevent.min_delta_ticks = 0xF;</div><div class='add'>+			    lapic_timer_frequency);</div><div class='add'>+		/*</div><div class='add'>+		 * Direct calibration methods must have an always running</div><div class='add'>+		 * local APIC timer, no need for broadcast timer.</div><div class='add'>+		 */</div><div class='ctx'> 		lapic_clockevent.features &amp;= ~CLOCK_EVT_FEAT_DUMMY;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -869,17 +883,8 @@ static int __init calibrate_APIC_clock(void)</div><div class='ctx'> 	pm_referenced = !calibrate_by_pmtimer(lapic_cal_pm2 - lapic_cal_pm1,</div><div class='ctx'> 					&amp;delta, &amp;deltatsc);</div><div class='ctx'> </div><div class='del'>-	/* Calculate the scaled math multiplication factor */</div><div class='del'>-	lapic_clockevent.mult = div_sc(delta, TICK_NSEC * LAPIC_CAL_LOOPS,</div><div class='del'>-				       lapic_clockevent.shift);</div><div class='del'>-	lapic_clockevent.max_delta_ns =</div><div class='del'>-		clockevent_delta2ns(0x7FFFFFFF, &amp;lapic_clockevent);</div><div class='del'>-	lapic_clockevent.max_delta_ticks = 0x7FFFFFFF;</div><div class='del'>-	lapic_clockevent.min_delta_ns =</div><div class='del'>-		clockevent_delta2ns(0xF, &amp;lapic_clockevent);</div><div class='del'>-	lapic_clockevent.min_delta_ticks = 0xF;</div><div class='del'>-</div><div class='ctx'> 	lapic_timer_frequency = (delta * APIC_DIVISOR) / LAPIC_CAL_LOOPS;</div><div class='add'>+	lapic_init_clockevent();</div><div class='ctx'> </div><div class='ctx'> 	apic_printk(APIC_VERBOSE, "..... delta %ld\n", delta);</div><div class='ctx'> 	apic_printk(APIC_VERBOSE, "..... mult: %u\n", lapic_clockevent.mult);</div><div class='head'>diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c<br/>index 78778b54f904..a5464b8b6c46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/apic/apic_numachip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/apic/apic_numachip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/apic/apic_numachip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/apic/apic_numachip.c</a></div><div class='hunk'>@@ -175,7 +175,7 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)</div><div class='ctx'> 	this_cpu_write(cpu_llc_id, node);</div><div class='ctx'> </div><div class='ctx'> 	/* Account for nodes per socket in multi-core-module processors */</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_NODEID_MSR)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_NODEID_MSR)) {</div><div class='ctx'> 		rdmsrl(MSR_FAM10H_NODE_ID, val);</div><div class='ctx'> 		nodes = ((val &gt;&gt; 3) &amp; 7) + 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c<br/>index ddced33184b5..d3d075226c0a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/asm-offsets_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/asm-offsets_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/asm-offsets_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/asm-offsets_64.c</a></div><div class='hunk'>@@ -68,10 +68,12 @@ int main(void)</div><div class='ctx'> #undef ENTRY</div><div class='ctx'> </div><div class='ctx'> 	OFFSET(TSS_ist, tss_struct, x86_tss.ist);</div><div class='add'>+	DEFINE(DB_STACK_OFFSET, offsetof(struct cea_exception_stacks, DB_stack) -</div><div class='add'>+	       offsetof(struct cea_exception_stacks, DB1_stack));</div><div class='ctx'> 	BLANK();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_STACKPROTECTOR</div><div class='del'>-	DEFINE(stack_canary_offset, offsetof(union irq_stack_union, stack_canary));</div><div class='add'>+	DEFINE(stack_canary_offset, offsetof(struct fixed_percpu_data, stack_canary));</div><div class='ctx'> 	BLANK();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile<br/>index cfd24f9f7614..1796d2bdcaaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/Makefile</a></div><div class='hunk'>@@ -28,7 +28,7 @@ obj-y			+= cpuid-deps.o</div><div class='ctx'> obj-$(CONFIG_PROC_FS)	+= proc.o</div><div class='ctx'> obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel.o intel_pconfig.o</div><div class='add'>+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel.o intel_pconfig.o intel_epb.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_AMD)		+= amd.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_HYGON)		+= hygon.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix.o</div><div class='head'>diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c<br/>index 01004bfb1a1b..fb6a64bd765f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/amd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/amd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/amd.c</a></div><div class='hunk'>@@ -82,11 +82,14 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)</div><div class='ctx'>  *	performance at the same time..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> extern __visible void vide(void);</div><div class='del'>-__asm__(".globl vide\n"</div><div class='add'>+__asm__(".text\n"</div><div class='add'>+	".globl vide\n"</div><div class='ctx'> 	".type vide, @function\n"</div><div class='ctx'> 	".align 4\n"</div><div class='ctx'> 	"vide: ret\n");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void init_amd_k5(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c<br/>index 804c49493938..64d5aec24203 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/aperfmperf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/aperfmperf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/aperfmperf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/aperfmperf.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ unsigned int aperfmperf_get_khz(int cpu)</div><div class='ctx'> 	if (!cpu_khz)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_APERFMPERF))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	aperfmperf_snapshot_cpu(cpu, ktime_get(), true);</div><div class='hunk'>@@ -99,7 +99,7 @@ void arch_freq_prepare_all(void)</div><div class='ctx'> 	if (!cpu_khz)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_APERFMPERF))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(cpu)</div><div class='hunk'>@@ -115,7 +115,7 @@ unsigned int arch_freq_get_on_cpu(int cpu)</div><div class='ctx'> 	if (!cpu_khz)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_APERFMPERF))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (aperfmperf_snapshot_cpu(cpu, ktime_get(), true))</div><div class='head'>diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c<br/>index 2da82eff0eb4..29630393f300 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/bugs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/bugs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/bugs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/bugs.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ static const struct {</div><div class='ctx'> 	const char			*option;</div><div class='ctx'> 	enum spectre_v2_user_cmd	cmd;</div><div class='ctx'> 	bool				secure;</div><div class='del'>-} v2_user_options[] __initdata = {</div><div class='add'>+} v2_user_options[] __initconst = {</div><div class='ctx'> 	{ "auto",		SPECTRE_V2_USER_CMD_AUTO,		false },</div><div class='ctx'> 	{ "off",		SPECTRE_V2_USER_CMD_NONE,		false },</div><div class='ctx'> 	{ "on",			SPECTRE_V2_USER_CMD_FORCE,		true  },</div><div class='hunk'>@@ -419,7 +419,7 @@ static const struct {</div><div class='ctx'> 	const char *option;</div><div class='ctx'> 	enum spectre_v2_mitigation_cmd cmd;</div><div class='ctx'> 	bool secure;</div><div class='del'>-} mitigation_options[] __initdata = {</div><div class='add'>+} mitigation_options[] __initconst = {</div><div class='ctx'> 	{ "off",		SPECTRE_V2_CMD_NONE,		  false },</div><div class='ctx'> 	{ "on",			SPECTRE_V2_CMD_FORCE,		  true  },</div><div class='ctx'> 	{ "retpoline",		SPECTRE_V2_CMD_RETPOLINE,	  false },</div><div class='hunk'>@@ -440,7 +440,8 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)</div><div class='ctx'> 	char arg[20];</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='del'>-	if (cmdline_find_option_bool(boot_command_line, "nospectre_v2"))</div><div class='add'>+	if (cmdline_find_option_bool(boot_command_line, "nospectre_v2") ||</div><div class='add'>+	    cpu_mitigations_off())</div><div class='ctx'> 		return SPECTRE_V2_CMD_NONE;</div><div class='ctx'> </div><div class='ctx'> 	ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg));</div><div class='hunk'>@@ -658,7 +659,7 @@ static const char * const ssb_strings[] = {</div><div class='ctx'> static const struct {</div><div class='ctx'> 	const char *option;</div><div class='ctx'> 	enum ssb_mitigation_cmd cmd;</div><div class='del'>-} ssb_mitigation_options[]  __initdata = {</div><div class='add'>+} ssb_mitigation_options[]  __initconst = {</div><div class='ctx'> 	{ "auto",	SPEC_STORE_BYPASS_CMD_AUTO },    /* Platform decides */</div><div class='ctx'> 	{ "on",		SPEC_STORE_BYPASS_CMD_ON },      /* Disable Speculative Store Bypass */</div><div class='ctx'> 	{ "off",	SPEC_STORE_BYPASS_CMD_NONE },    /* Don't touch Speculative Store Bypass */</div><div class='hunk'>@@ -672,7 +673,8 @@ static enum ssb_mitigation_cmd __init ssb_parse_cmdline(void)</div><div class='ctx'> 	char arg[20];</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='del'>-	if (cmdline_find_option_bool(boot_command_line, "nospec_store_bypass_disable")) {</div><div class='add'>+	if (cmdline_find_option_bool(boot_command_line, "nospec_store_bypass_disable") ||</div><div class='add'>+	    cpu_mitigations_off()) {</div><div class='ctx'> 		return SPEC_STORE_BYPASS_CMD_NONE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = cmdline_find_option(boot_command_line, "spec_store_bypass_disable",</div><div class='hunk'>@@ -1008,6 +1010,11 @@ static void __init l1tf_select_mitigation(void)</div><div class='ctx'> 	if (!boot_cpu_has_bug(X86_BUG_L1TF))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (cpu_mitigations_off())</div><div class='add'>+		l1tf_mitigation = L1TF_MITIGATION_OFF;</div><div class='add'>+	else if (cpu_mitigations_auto_nosmt())</div><div class='add'>+		l1tf_mitigation = L1TF_MITIGATION_FLUSH_NOSMT;</div><div class='add'>+</div><div class='ctx'> 	override_cache_bits(&amp;boot_cpu_data);</div><div class='ctx'> </div><div class='ctx'> 	switch (l1tf_mitigation) {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c<br/>index cb28e98a0659..8739bdfe9bdf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/common.c</a></div><div class='hunk'>@@ -372,6 +372,8 @@ static bool pku_disabled;</div><div class='ctx'> </div><div class='ctx'> static __always_inline void setup_pku(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='add'>+	struct pkru_state *pk;</div><div class='add'>+</div><div class='ctx'> 	/* check the boot processor, plus compile options for PKU: */</div><div class='ctx'> 	if (!cpu_feature_enabled(X86_FEATURE_PKU))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -382,6 +384,9 @@ static __always_inline void setup_pku(struct cpuinfo_x86 *c)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cr4_set_bits(X86_CR4_PKE);</div><div class='add'>+	pk = get_xsave_addr(&amp;init_fpstate.xsave, XFEATURE_PKRU);</div><div class='add'>+	if (pk)</div><div class='add'>+		pk-&gt;pkru = init_pkru_value;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Seting X86_CR4_PKE will cause the X86_FEATURE_OSPKE</div><div class='ctx'> 	 * cpuid bit to be set.  We need to ensure that we</div><div class='hunk'>@@ -507,19 +512,6 @@ void load_percpu_segment(int cpu)</div><div class='ctx'> DEFINE_PER_CPU(struct cpu_entry_area *, cpu_entry_area);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-/*</div><div class='del'>- * Special IST stacks which the CPU switches to when it calls</div><div class='del'>- * an IST-marked descriptor entry. Up to 7 stacks (hardware</div><div class='del'>- * limit), all of them are 4K, except the debug stack which</div><div class='del'>- * is 8K.</div><div class='del'>- */</div><div class='del'>-static const unsigned int exception_stack_sizes[N_EXCEPTION_STACKS] = {</div><div class='del'>-	  [0 ... N_EXCEPTION_STACKS - 1]	= EXCEPTION_STKSZ,</div><div class='del'>-	  [DEBUG_STACK - 1]			= DEBUG_STKSZ</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* Load the original GDT from the per-cpu structure */</div><div class='ctx'> void load_direct_gdt(int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -1511,9 +1503,9 @@ static __init int setup_clearcpuid(char *arg)</div><div class='ctx'> __setup("clearcpuid=", setup_clearcpuid);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-DEFINE_PER_CPU_FIRST(union irq_stack_union,</div><div class='del'>-		     irq_stack_union) __aligned(PAGE_SIZE) __visible;</div><div class='del'>-EXPORT_PER_CPU_SYMBOL_GPL(irq_stack_union);</div><div class='add'>+DEFINE_PER_CPU_FIRST(struct fixed_percpu_data,</div><div class='add'>+		     fixed_percpu_data) __aligned(PAGE_SIZE) __visible;</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(fixed_percpu_data);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following percpu variables are hot.  Align current_task to</div><div class='hunk'>@@ -1523,9 +1515,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =</div><div class='ctx'> 	&amp;init_task;</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(current_task);</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(char *, irq_stack_ptr) =</div><div class='del'>-	init_per_cpu_var(irq_stack_union.irq_stack) + IRQ_STACK_SIZE;</div><div class='del'>-</div><div class='add'>+DEFINE_PER_CPU(struct irq_stack *, hardirq_stack_ptr);</div><div class='ctx'> DEFINE_PER_CPU(unsigned int, irq_count) __visible = -1;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(int, __preempt_count) = INIT_PREEMPT_COUNT;</div><div class='hunk'>@@ -1562,23 +1552,7 @@ void syscall_init(void)</div><div class='ctx'> 	       X86_EFLAGS_IOPL|X86_EFLAGS_AC|X86_EFLAGS_NT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Copies of the original ist values from the tss are only accessed during</div><div class='del'>- * debugging, no special alignment required.</div><div class='del'>- */</div><div class='del'>-DEFINE_PER_CPU(struct orig_ist, orig_ist);</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(unsigned long, debug_stack_addr);</div><div class='ctx'> DEFINE_PER_CPU(int, debug_stack_usage);</div><div class='del'>-</div><div class='del'>-int is_debug_stack(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	return __this_cpu_read(debug_stack_usage) ||</div><div class='del'>-		(addr &lt;= __this_cpu_read(debug_stack_addr) &amp;&amp;</div><div class='del'>-		 addr &gt; (__this_cpu_read(debug_stack_addr) - DEBUG_STKSZ));</div><div class='del'>-}</div><div class='del'>-NOKPROBE_SYMBOL(is_debug_stack);</div><div class='del'>-</div><div class='ctx'> DEFINE_PER_CPU(u32, debug_idt_ctr);</div><div class='ctx'> </div><div class='ctx'> void debug_stack_set_zero(void)</div><div class='hunk'>@@ -1668,7 +1642,7 @@ static void setup_getcpu(int cpu)</div><div class='ctx'> 	unsigned long cpudata = vdso_encode_cpunode(cpu, early_cpu_to_node(cpu));</div><div class='ctx'> 	struct desc_struct d = { };</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_RDTSCP))</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_RDTSCP))</div><div class='ctx'> 		write_rdtscp_aux(cpudata);</div><div class='ctx'> </div><div class='ctx'> 	/* Store CPU and node number in limit. */</div><div class='hunk'>@@ -1690,17 +1664,14 @@ static void setup_getcpu(int cpu)</div><div class='ctx'>  * initialized (naturally) in the bootstrap process, such as the GDT</div><div class='ctx'>  * and IDT. We reload them nevertheless, this function acts as a</div><div class='ctx'>  * 'CPU state barrier', nothing should get across.</div><div class='del'>- * A lot of state is already set up in PDA init for 64 bit</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> </div><div class='ctx'> void cpu_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct orig_ist *oist;</div><div class='add'>+	int cpu = raw_smp_processor_id();</div><div class='ctx'> 	struct task_struct *me;</div><div class='ctx'> 	struct tss_struct *t;</div><div class='del'>-	unsigned long v;</div><div class='del'>-	int cpu = raw_smp_processor_id();</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	wait_for_master_cpu(cpu);</div><div class='hunk'>@@ -1715,7 +1686,6 @@ void cpu_init(void)</div><div class='ctx'> 		load_ucode_ap();</div><div class='ctx'> </div><div class='ctx'> 	t = &amp;per_cpu(cpu_tss_rw, cpu);</div><div class='del'>-	oist = &amp;per_cpu(orig_ist, cpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> 	if (this_cpu_read(numa_node) == 0 &amp;&amp;</div><div class='hunk'>@@ -1753,16 +1723,11 @@ void cpu_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set up and load the per-CPU TSS</div><div class='ctx'> 	 */</div><div class='del'>-	if (!oist-&gt;ist[0]) {</div><div class='del'>-		char *estacks = get_cpu_entry_area(cpu)-&gt;exception_stacks;</div><div class='del'>-</div><div class='del'>-		for (v = 0; v &lt; N_EXCEPTION_STACKS; v++) {</div><div class='del'>-			estacks += exception_stack_sizes[v];</div><div class='del'>-			oist-&gt;ist[v] = t-&gt;x86_tss.ist[v] =</div><div class='del'>-					(unsigned long)estacks;</div><div class='del'>-			if (v == DEBUG_STACK-1)</div><div class='del'>-				per_cpu(debug_stack_addr, cpu) = (unsigned long)estacks;</div><div class='del'>-		}</div><div class='add'>+	if (!t-&gt;x86_tss.ist[0]) {</div><div class='add'>+		t-&gt;x86_tss.ist[IST_INDEX_DF] = __this_cpu_ist_top_va(DF);</div><div class='add'>+		t-&gt;x86_tss.ist[IST_INDEX_NMI] = __this_cpu_ist_top_va(NMI);</div><div class='add'>+		t-&gt;x86_tss.ist[IST_INDEX_DB] = __this_cpu_ist_top_va(DB);</div><div class='add'>+		t-&gt;x86_tss.ist[IST_INDEX_MCE] = __this_cpu_ist_top_va(MCE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;x86_tss.io_bitmap_base = IO_BITMAP_OFFSET;</div><div class='hunk'>@@ -1864,23 +1829,6 @@ void cpu_init(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void bsp_resume(void)</div><div class='del'>-{</div><div class='del'>-	if (this_cpu-&gt;c_bsp_resume)</div><div class='del'>-		this_cpu-&gt;c_bsp_resume(&amp;boot_cpu_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct syscore_ops cpu_syscore_ops = {</div><div class='del'>-	.resume		= bsp_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init init_cpu_syscore(void)</div><div class='del'>-{</div><div class='del'>-	register_syscore_ops(&amp;cpu_syscore_ops);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-core_initcall(init_cpu_syscore);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The microcode loader calls this upon late microcode load to recheck features,</div><div class='ctx'>  * only when microcode has been updated. Caller holds microcode_mutex and CPU</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h<br/>index 5eb946b9a9f3..c0e2407abdd6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/cpu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/cpu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/cpu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/cpu.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@ struct cpu_dev {</div><div class='ctx'> 	void		(*c_init)(struct cpuinfo_x86 *);</div><div class='ctx'> 	void		(*c_identify)(struct cpuinfo_x86 *);</div><div class='ctx'> 	void		(*c_detect_tlb)(struct cpuinfo_x86 *);</div><div class='del'>-	void		(*c_bsp_resume)(struct cpuinfo_x86 *);</div><div class='ctx'> 	int		c_x86_vendor;</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	/* Optional vendor specific routine to obtain the cache size. */</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c<br/>index d12226f60168..1d9b8aaea06c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/cyrix.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/cyrix.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/cyrix.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/cyrix.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ static void set_cx86_reorder(void)</div><div class='ctx'> 	setCx86(CX86_CCR3, (ccr3 &amp; 0x0f) | 0x10); /* enable MAPEN */</div><div class='ctx'> </div><div class='ctx'> 	/* Load/Store Serialize to mem access disable (=reorder it) */</div><div class='del'>-	setCx86_old(CX86_PCR0, getCx86_old(CX86_PCR0) &amp; ~0x80);</div><div class='add'>+	setCx86(CX86_PCR0, getCx86(CX86_PCR0) &amp; ~0x80);</div><div class='ctx'> 	/* set load/store serialize from 1GB to 4GB */</div><div class='ctx'> 	ccr3 |= 0xe0;</div><div class='ctx'> 	setCx86(CX86_CCR3, ccr3);</div><div class='hunk'>@@ -135,11 +135,11 @@ static void set_cx86_memwb(void)</div><div class='ctx'> 	pr_info("Enable Memory-Write-back mode on Cyrix/NSC processor.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* CCR2 bit 2: unlock NW bit */</div><div class='del'>-	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) &amp; ~0x04);</div><div class='add'>+	setCx86(CX86_CCR2, getCx86(CX86_CCR2) &amp; ~0x04);</div><div class='ctx'> 	/* set 'Not Write-through' */</div><div class='ctx'> 	write_cr0(read_cr0() | X86_CR0_NW);</div><div class='ctx'> 	/* CCR2 bit 2: lock NW bit and set WT1 */</div><div class='del'>-	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) | 0x14);</div><div class='add'>+	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -153,14 +153,14 @@ static void geode_configure(void)</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Suspend on halt power saving and enable #SUSP pin */</div><div class='del'>-	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) | 0x88);</div><div class='add'>+	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);</div><div class='ctx'> </div><div class='ctx'> 	ccr3 = getCx86(CX86_CCR3);</div><div class='ctx'> 	setCx86(CX86_CCR3, (ccr3 &amp; 0x0f) | 0x10);	/* enable MAPEN */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* FPU fast, DTE cache, Mem bypass */</div><div class='del'>-	setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x38);</div><div class='add'>+	setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x38);</div><div class='ctx'> 	setCx86(CX86_CCR3, ccr3);			/* disable MAPEN */</div><div class='ctx'> </div><div class='ctx'> 	set_cx86_memwb();</div><div class='hunk'>@@ -296,7 +296,7 @@ static void init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> 		/* GXm supports extended cpuid levels 'ala' AMD */</div><div class='ctx'> 		if (c-&gt;cpuid_level == 2) {</div><div class='ctx'> 			/* Enable cxMMX extensions (GX1 Datasheet 54) */</div><div class='del'>-			setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7) | 1);</div><div class='add'>+			setCx86(CX86_CCR7, getCx86(CX86_CCR7) | 1);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * GXm : 0x30 ... 0x5f GXm  datasheet 51</div><div class='hunk'>@@ -319,7 +319,7 @@ static void init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> 		if (dir1 &gt; 7) {</div><div class='ctx'> 			dir0_msn++;  /* M II */</div><div class='ctx'> 			/* Enable MMX extensions (App note 108) */</div><div class='del'>-			setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7)|1);</div><div class='add'>+			setCx86(CX86_CCR7, getCx86(CX86_CCR7)|1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* A 6x86MX - it has the bug. */</div><div class='ctx'> 			set_cpu_bug(c, X86_BUG_COMA);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c<br/>index cf25405444ab..415621ddb8a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/hygon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/hygon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/hygon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/hygon.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='add'>+#define APICID_SOCKET_ID_BIT 6</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * nodes_per_socket: Stores the number of nodes per socket.</div><div class='ctx'>  * Refer to CPUID Fn8000_001E_ECX Node Identifiers[10:8]</div><div class='hunk'>@@ -87,6 +89,9 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			c-&gt;x86_coreid_bits = get_count_order(c-&gt;x86_max_cores);</div><div class='ctx'> </div><div class='add'>+		/* Socket ID is ApicId[6] for these processors. */</div><div class='add'>+		c-&gt;phys_proc_id = c-&gt;apicid &gt;&gt; APICID_SOCKET_ID_BIT;</div><div class='add'>+</div><div class='ctx'> 		cacheinfo_hygon_init_llc_id(c, cpu, node_id);</div><div class='ctx'> 	} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {</div><div class='ctx'> 		u64 value;</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c<br/>index fc3c07fe7df5..f17c1a714779 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/intel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/intel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/intel.c</a></div><div class='hunk'>@@ -596,36 +596,6 @@ detect_keyid_bits:</div><div class='ctx'> 	c-&gt;x86_phys_bits -= keyid_bits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void init_intel_energy_perf(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	u64 epb;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize MSR_IA32_ENERGY_PERF_BIAS if not already initialized.</div><div class='del'>-	 * (x86_energy_perf_policy(8) is available to change it at run-time.)</div><div class='del'>-	 */</div><div class='del'>-	if (!cpu_has(c, X86_FEATURE_EPB))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);</div><div class='del'>-	if ((epb &amp; 0xF) != ENERGY_PERF_BIAS_PERFORMANCE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");</div><div class='del'>-	pr_warn_once("ENERGY_PERF_BIAS: View and update with x86_energy_perf_policy(8)\n");</div><div class='del'>-	epb = (epb &amp; ~0xF) | ENERGY_PERF_BIAS_NORMAL;</div><div class='del'>-	wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intel_bsp_resume(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * MSR_IA32_ENERGY_PERF_BIAS is lost across suspend/resume,</div><div class='del'>-	 * so reinitialize it properly like during bootup:</div><div class='del'>-	 */</div><div class='del'>-	init_intel_energy_perf(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void init_cpuid_fault(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	u64 msr;</div><div class='hunk'>@@ -763,8 +733,6 @@ static void init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (cpu_has(c, X86_FEATURE_TME))</div><div class='ctx'> 		detect_tme(c);</div><div class='ctx'> </div><div class='del'>-	init_intel_energy_perf(c);</div><div class='del'>-</div><div class='ctx'> 	init_intel_misc_features(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1023,9 +991,7 @@ static const struct cpu_dev intel_cpu_dev = {</div><div class='ctx'> 	.c_detect_tlb	= intel_detect_tlb,</div><div class='ctx'> 	.c_early_init   = early_init_intel,</div><div class='ctx'> 	.c_init		= init_intel,</div><div class='del'>-	.c_bsp_resume	= intel_bsp_resume,</div><div class='ctx'> 	.c_x86_vendor	= X86_VENDOR_INTEL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> cpu_dev_register(intel_cpu_dev);</div><div class='del'>-</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_epb.c b/arch/x86/kernel/cpu/intel_epb.c<br/>new file mode 100644<br/>index 000000000000..f4dd73396f28<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/intel_epb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/intel_epb.c</a></div><div class='hunk'>@@ -0,0 +1,216 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Intel Performance and Energy Bias Hint support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author:</div><div class='add'>+ *	Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpuhotplug.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/syscore_ops.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: overview</div><div class='add'>+ *</div><div class='add'>+ * The Performance and Energy Bias Hint (EPB) allows software to specify its</div><div class='add'>+ * preference with respect to the power-performance tradeoffs present in the</div><div class='add'>+ * processor.  Generally, the EPB is expected to be set by user space (directly</div><div class='add'>+ * via sysfs or with the help of the x86_energy_perf_policy tool), but there are</div><div class='add'>+ * two reasons for the kernel to update it.</div><div class='add'>+ *</div><div class='add'>+ * First, there are systems where the platform firmware resets the EPB during</div><div class='add'>+ * system-wide transitions from sleep states back into the working state</div><div class='add'>+ * effectively causing the previous EPB updates by user space to be lost.</div><div class='add'>+ * Thus the kernel needs to save the current EPB values for all CPUs during</div><div class='add'>+ * system-wide transitions to sleep states and restore them on the way back to</div><div class='add'>+ * the working state.  That can be achieved by saving EPB for secondary CPUs</div><div class='add'>+ * when they are taken offline during transitions into system sleep states and</div><div class='add'>+ * for the boot CPU in a syscore suspend operation, so that it can be restored</div><div class='add'>+ * for the boot CPU in a syscore resume operation and for the other CPUs when</div><div class='add'>+ * they are brought back online.  However, CPUs that are already offline when</div><div class='add'>+ * a system-wide PM transition is started are not taken offline again, but their</div><div class='add'>+ * EPB values may still be reset by the platform firmware during the transition,</div><div class='add'>+ * so in fact it is necessary to save the EPB of any CPU taken offline and to</div><div class='add'>+ * restore it when the given CPU goes back online at all times.</div><div class='add'>+ *</div><div class='add'>+ * Second, on many systems the initial EPB value coming from the platform</div><div class='add'>+ * firmware is 0 ('performance') and at least on some of them that is because</div><div class='add'>+ * the platform firmware does not initialize EPB at all with the assumption that</div><div class='add'>+ * the OS will do that anyway.  That sometimes is problematic, as it may cause</div><div class='add'>+ * the system battery to drain too fast, for example, so it is better to adjust</div><div class='add'>+ * it on CPU bring-up and if the initial EPB value for a given CPU is 0, the</div><div class='add'>+ * kernel changes it to 6 ('normal').</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(u8, saved_epb);</div><div class='add'>+</div><div class='add'>+#define EPB_MASK	0x0fULL</div><div class='add'>+#define EPB_SAVED	0x10ULL</div><div class='add'>+#define MAX_EPB		EPB_MASK</div><div class='add'>+</div><div class='add'>+static int intel_epb_save(void)</div><div class='add'>+{</div><div class='add'>+	u64 epb;</div><div class='add'>+</div><div class='add'>+	rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that saved_epb will always be nonzero after this write even if</div><div class='add'>+	 * the EPB value read from the MSR is 0.</div><div class='add'>+	 */</div><div class='add'>+	this_cpu_write(saved_epb, (epb &amp; EPB_MASK) | EPB_SAVED);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_epb_restore(void)</div><div class='add'>+{</div><div class='add'>+	u64 val = this_cpu_read(saved_epb);</div><div class='add'>+	u64 epb;</div><div class='add'>+</div><div class='add'>+	rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);</div><div class='add'>+	if (val) {</div><div class='add'>+		val &amp;= EPB_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Because intel_epb_save() has not run for the current CPU yet,</div><div class='add'>+		 * it is going online for the first time, so if its EPB value is</div><div class='add'>+		 * 0 ('performance') at this point, assume that it has not been</div><div class='add'>+		 * initialized by the platform firmware and set it to 6</div><div class='add'>+		 * ('normal').</div><div class='add'>+		 */</div><div class='add'>+		val = epb &amp; EPB_MASK;</div><div class='add'>+		if (val == ENERGY_PERF_BIAS_PERFORMANCE) {</div><div class='add'>+			val = ENERGY_PERF_BIAS_NORMAL;</div><div class='add'>+			pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, (epb &amp; ~EPB_MASK) | val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct syscore_ops intel_epb_syscore_ops = {</div><div class='add'>+	.suspend = intel_epb_save,</div><div class='add'>+	.resume = intel_epb_restore,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const energy_perf_strings[] = {</div><div class='add'>+	"performance",</div><div class='add'>+	"balance-performance",</div><div class='add'>+	"normal",</div><div class='add'>+	"balance-power",</div><div class='add'>+	"power"</div><div class='add'>+};</div><div class='add'>+static const u8 energ_perf_values[] = {</div><div class='add'>+	ENERGY_PERF_BIAS_PERFORMANCE,</div><div class='add'>+	ENERGY_PERF_BIAS_BALANCE_PERFORMANCE,</div><div class='add'>+	ENERGY_PERF_BIAS_NORMAL,</div><div class='add'>+	ENERGY_PERF_BIAS_BALANCE_POWERSAVE,</div><div class='add'>+	ENERGY_PERF_BIAS_POWERSAVE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t energy_perf_bias_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr,</div><div class='add'>+				     char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='add'>+	u64 epb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &amp;epb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%llu\n", epb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t energy_perf_bias_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='add'>+{</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='add'>+	u64 epb, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __sysfs_match_string(energy_perf_strings,</div><div class='add'>+				   ARRAY_SIZE(energy_perf_strings), buf);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		val = energ_perf_values[ret];</div><div class='add'>+	else if (kstrtou64(buf, 0, &amp;val) || val &gt; MAX_EPB)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &amp;epb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wrmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS,</div><div class='add'>+			    (epb &amp; ~EPB_MASK) | val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RW(energy_perf_bias);</div><div class='add'>+</div><div class='add'>+static struct attribute *intel_epb_attrs[] = {</div><div class='add'>+	&amp;dev_attr_energy_perf_bias.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group intel_epb_attr_group = {</div><div class='add'>+	.name = power_group_name,</div><div class='add'>+	.attrs =  intel_epb_attrs</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int intel_epb_online(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct device *cpu_dev = get_cpu_device(cpu);</div><div class='add'>+</div><div class='add'>+	intel_epb_restore();</div><div class='add'>+	if (!cpuhp_tasks_frozen)</div><div class='add'>+		sysfs_merge_group(&amp;cpu_dev-&gt;kobj, &amp;intel_epb_attr_group);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_epb_offline(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct device *cpu_dev = get_cpu_device(cpu);</div><div class='add'>+</div><div class='add'>+	if (!cpuhp_tasks_frozen)</div><div class='add'>+		sysfs_unmerge_group(&amp;cpu_dev-&gt;kobj, &amp;intel_epb_attr_group);</div><div class='add'>+</div><div class='add'>+	intel_epb_save();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int intel_epb_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_EPB))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_X86_INTEL_EPB_ONLINE,</div><div class='add'>+				"x86/intel/epb:online", intel_epb_online,</div><div class='add'>+				intel_epb_offline);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_out_online;</div><div class='add'>+</div><div class='add'>+	register_syscore_ops(&amp;intel_epb_syscore_ops);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_online:</div><div class='add'>+	cpuhp_remove_state(CPUHP_AP_X86_INTEL_EPB_ONLINE);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(intel_epb_init);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c<br/>index e64de5149e50..d904aafe6409 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/amd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/amd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/mce/amd.c</a></div><div class='hunk'>@@ -563,33 +563,59 @@ out:</div><div class='ctx'> 	return offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool amd_filter_mce(struct mce *m)</div><div class='add'>+{</div><div class='add'>+	enum smca_bank_types bank_type = smca_get_bank_type(m-&gt;bank);</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;boot_cpu_data;</div><div class='add'>+	u8 xec = (m-&gt;status &gt;&gt; 16) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	/* See Family 17h Models 10h-2Fh Erratum #1114. */</div><div class='add'>+	if (c-&gt;x86 == 0x17 &amp;&amp;</div><div class='add'>+	    c-&gt;x86_model &gt;= 0x10 &amp;&amp; c-&gt;x86_model &lt;= 0x2F &amp;&amp;</div><div class='add'>+	    bank_type == SMCA_IF &amp;&amp; xec == 10)</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='ctx'> /*</div><div class='del'>- * Turn off MC4_MISC thresholding banks on all family 0x15 models since</div><div class='del'>- * they're not supported there.</div><div class='add'>+ * Turn off thresholding banks for the following conditions:</div><div class='add'>+ * - MC4_MISC thresholding is not supported on Family 0x15.</div><div class='add'>+ * - Prevent possible spurious interrupts from the IF bank on Family 0x17</div><div class='add'>+ *   Models 0x10-0x2F due to Erratum #1114.</div><div class='ctx'>  */</div><div class='del'>-void disable_err_thresholding(struct cpuinfo_x86 *c)</div><div class='add'>+void disable_err_thresholding(struct cpuinfo_x86 *c, unsigned int bank)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, num_msrs;</div><div class='ctx'> 	u64 hwcr;</div><div class='ctx'> 	bool need_toggle;</div><div class='del'>-	u32 msrs[] = {</div><div class='del'>-		0x00000413, /* MC4_MISC0 */</div><div class='del'>-		0xc0000408, /* MC4_MISC1 */</div><div class='del'>-	};</div><div class='add'>+	u32 msrs[NR_BLOCKS];</div><div class='add'>+</div><div class='add'>+	if (c-&gt;x86 == 0x15 &amp;&amp; bank == 4) {</div><div class='add'>+		msrs[0] = 0x00000413; /* MC4_MISC0 */</div><div class='add'>+		msrs[1] = 0xc0000408; /* MC4_MISC1 */</div><div class='add'>+		num_msrs = 2;</div><div class='add'>+	} else if (c-&gt;x86 == 0x17 &amp;&amp;</div><div class='add'>+		   (c-&gt;x86_model &gt;= 0x10 &amp;&amp; c-&gt;x86_model &lt;= 0x2F)) {</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;x86 != 0x15)</div><div class='add'>+		if (smca_get_bank_type(bank) != SMCA_IF)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		msrs[0] = MSR_AMD64_SMCA_MCx_MISC(bank);</div><div class='add'>+		num_msrs = 1;</div><div class='add'>+	} else {</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rdmsrl(MSR_K7_HWCR, hwcr);</div><div class='ctx'> </div><div class='ctx'> 	/* McStatusWrEn has to be set */</div><div class='ctx'> 	need_toggle = !(hwcr &amp; BIT(18));</div><div class='del'>-</div><div class='ctx'> 	if (need_toggle)</div><div class='ctx'> 		wrmsrl(MSR_K7_HWCR, hwcr | BIT(18));</div><div class='ctx'> </div><div class='ctx'> 	/* Clear CntP bit safely */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(msrs); i++)</div><div class='add'>+	for (i = 0; i &lt; num_msrs; i++)</div><div class='ctx'> 		msr_clear_bit(msrs[i], 62);</div><div class='ctx'> </div><div class='ctx'> 	/* restore old settings */</div><div class='hunk'>@@ -604,12 +630,12 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)</div><div class='ctx'> 	unsigned int bank, block, cpu = smp_processor_id();</div><div class='ctx'> 	int offset = -1;</div><div class='ctx'> </div><div class='del'>-	disable_err_thresholding(c);</div><div class='del'>-</div><div class='ctx'> 	for (bank = 0; bank &lt; mca_cfg.banks; ++bank) {</div><div class='ctx'> 		if (mce_flags.smca)</div><div class='ctx'> 			smca_configure(bank, cpu);</div><div class='ctx'> </div><div class='add'>+		disable_err_thresholding(c, bank);</div><div class='add'>+</div><div class='ctx'> 		for (block = 0; block &lt; NR_BLOCKS; ++block) {</div><div class='ctx'> 			address = get_block_address(address, low, high, bank, block);</div><div class='ctx'> 			if (!address)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c<br/>index b7fb541a4873..5112a50e6486 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/mce/core.c</a></div><div class='hunk'>@@ -460,23 +460,6 @@ static void mce_irq_work_cb(struct irq_work *entry)</div><div class='ctx'> 	mce_schedule_work();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mce_report_event(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	if (regs-&gt;flags &amp; (X86_VM_MASK|X86_EFLAGS_IF)) {</div><div class='del'>-		mce_notify_irq();</div><div class='del'>-		/*</div><div class='del'>-		 * Triggering the work queue here is just an insurance</div><div class='del'>-		 * policy in case the syscall exit notify handler</div><div class='del'>-		 * doesn't run soon enough or ends up running on the</div><div class='del'>-		 * wrong CPU (can happen when audit sleeps)</div><div class='del'>-		 */</div><div class='del'>-		mce_schedule_work();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	irq_work_queue(&amp;mce_irq_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Check if the address reported by the CPU is in a format we can parse.</div><div class='ctx'>  * It would be possible to add code for most other cases, but all would</div><div class='hunk'>@@ -712,19 +695,49 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b)</div><div class='ctx'> </div><div class='ctx'> 		barrier();</div><div class='ctx'> 		m.status = mce_rdmsrl(msr_ops.status(i));</div><div class='add'>+</div><div class='add'>+		/* If this entry is not valid, ignore it */</div><div class='ctx'> 		if (!(m.status &amp; MCI_STATUS_VAL))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Uncorrected or signalled events are handled by the exception</div><div class='del'>-		 * handler when it is enabled, so don't process those here.</div><div class='del'>-		 *</div><div class='del'>-		 * TBD do the same check for MCI_STATUS_EN here?</div><div class='add'>+		 * If we are logging everything (at CPU online) or this</div><div class='add'>+		 * is a corrected error, then we must log it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(flags &amp; MCP_UC) &amp;&amp;</div><div class='del'>-		    (m.status &amp; (mca_cfg.ser ? MCI_STATUS_S : MCI_STATUS_UC)))</div><div class='del'>-			continue;</div><div class='add'>+		if ((flags &amp; MCP_UC) || !(m.status &amp; MCI_STATUS_UC))</div><div class='add'>+			goto log_it;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Newer Intel systems that support software error</div><div class='add'>+		 * recovery need to make additional checks. Other</div><div class='add'>+		 * CPUs should skip over uncorrected errors, but log</div><div class='add'>+		 * everything else.</div><div class='add'>+		 */</div><div class='add'>+		if (!mca_cfg.ser) {</div><div class='add'>+			if (m.status &amp; MCI_STATUS_UC)</div><div class='add'>+				continue;</div><div class='add'>+			goto log_it;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		/* Log "not enabled" (speculative) errors */</div><div class='add'>+		if (!(m.status &amp; MCI_STATUS_EN))</div><div class='add'>+			goto log_it;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Log UCNA (SDM: 15.6.3 "UCR Error Classification")</div><div class='add'>+		 * UC == 1 &amp;&amp; PCC == 0 &amp;&amp; S == 0</div><div class='add'>+		 */</div><div class='add'>+		if (!(m.status &amp; MCI_STATUS_PCC) &amp;&amp; !(m.status &amp; MCI_STATUS_S))</div><div class='add'>+			goto log_it;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Skip anything else. Presumption is that our read of this</div><div class='add'>+		 * bank is racing with a machine check. Leave the log alone</div><div class='add'>+		 * for do_machine_check() to deal with it.</div><div class='add'>+		 */</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+log_it:</div><div class='ctx'> 		error_seen = true;</div><div class='ctx'> </div><div class='ctx'> 		mce_read_aux(&amp;m, i);</div><div class='hunk'>@@ -1301,7 +1314,8 @@ void do_machine_check(struct pt_regs *regs, long error_code)</div><div class='ctx'> 		mce_panic("Fatal machine check on current CPU", &amp;m, msg);</div><div class='ctx'> </div><div class='ctx'> 	if (worst &gt; 0)</div><div class='del'>-		mce_report_event(regs);</div><div class='add'>+		irq_work_queue(&amp;mce_irq_work);</div><div class='add'>+</div><div class='ctx'> 	mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);</div><div class='ctx'> </div><div class='ctx'> 	sync_core();</div><div class='hunk'>@@ -1451,13 +1465,12 @@ EXPORT_SYMBOL_GPL(mce_notify_irq);</div><div class='ctx'> static int __mcheck_cpu_mce_banks_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	u8 num_banks = mca_cfg.banks;</div><div class='ctx'> </div><div class='del'>-	mce_banks = kcalloc(num_banks, sizeof(struct mce_bank), GFP_KERNEL);</div><div class='add'>+	mce_banks = kcalloc(MAX_NR_BANKS, sizeof(struct mce_bank), GFP_KERNEL);</div><div class='ctx'> 	if (!mce_banks)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_banks; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_BANKS; i++) {</div><div class='ctx'> 		struct mce_bank *b = &amp;mce_banks[i];</div><div class='ctx'> </div><div class='ctx'> 		b-&gt;ctl = -1ULL;</div><div class='hunk'>@@ -1471,28 +1484,19 @@ static int __mcheck_cpu_mce_banks_init(void)</div><div class='ctx'>  */</div><div class='ctx'> static int __mcheck_cpu_cap_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned b;</div><div class='ctx'> 	u64 cap;</div><div class='add'>+	u8 b;</div><div class='ctx'> </div><div class='ctx'> 	rdmsrl(MSR_IA32_MCG_CAP, cap);</div><div class='ctx'> </div><div class='ctx'> 	b = cap &amp; MCG_BANKCNT_MASK;</div><div class='del'>-	if (!mca_cfg.banks)</div><div class='del'>-		pr_info("CPU supports %d MCE banks\n", b);</div><div class='del'>-</div><div class='del'>-	if (b &gt; MAX_NR_BANKS) {</div><div class='del'>-		pr_warn("Using only %u machine check banks out of %u\n",</div><div class='del'>-			MAX_NR_BANKS, b);</div><div class='add'>+	if (WARN_ON_ONCE(b &gt; MAX_NR_BANKS))</div><div class='ctx'> 		b = MAX_NR_BANKS;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* Don't support asymmetric configurations today */</div><div class='del'>-	WARN_ON(mca_cfg.banks != 0 &amp;&amp; b != mca_cfg.banks);</div><div class='del'>-	mca_cfg.banks = b;</div><div class='add'>+	mca_cfg.banks = max(mca_cfg.banks, b);</div><div class='ctx'> </div><div class='ctx'> 	if (!mce_banks) {</div><div class='ctx'> 		int err = __mcheck_cpu_mce_banks_init();</div><div class='del'>-</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1771,6 +1775,14 @@ static void __mcheck_cpu_init_timer(void)</div><div class='ctx'> 	mce_start_timer(t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool filter_mce(struct mce *m)</div><div class='add'>+{</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)</div><div class='add'>+		return amd_filter_mce(m);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Handle unconfigured int18 (should never happen) */</div><div class='ctx'> static void unexpected_machine_check(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='hunk'>@@ -2425,8 +2437,8 @@ static int fake_panic_set(void *data, u64 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(fake_panic_fops, fake_panic_get,</div><div class='del'>-			fake_panic_set, "%llu\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fake_panic_fops, fake_panic_get, fake_panic_set,</div><div class='add'>+			 "%llu\n");</div><div class='ctx'> </div><div class='ctx'> static int __init mcheck_debugfs_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2435,8 +2447,8 @@ static int __init mcheck_debugfs_init(void)</div><div class='ctx'> 	dmce = mce_get_debugfs_dir();</div><div class='ctx'> 	if (!dmce)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ffake_panic = debugfs_create_file("fake_panic", 0444, dmce, NULL,</div><div class='del'>-					  &amp;fake_panic_fops);</div><div class='add'>+	ffake_panic = debugfs_create_file_unsafe("fake_panic", 0444, dmce,</div><div class='add'>+						 NULL, &amp;fake_panic_fops);</div><div class='ctx'> 	if (!ffake_panic)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2451,6 +2463,8 @@ EXPORT_SYMBOL_GPL(mcsafe_key);</div><div class='ctx'> </div><div class='ctx'> static int __init mcheck_late_init(void)</div><div class='ctx'> {</div><div class='add'>+	pr_info("Using %d MCE banks\n", mca_cfg.banks);</div><div class='add'>+</div><div class='ctx'> 	if (mca_cfg.recovery)</div><div class='ctx'> 		static_branch_inc(&amp;mcsafe_key);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/mce/genpool.c b/arch/x86/kernel/cpu/mce/genpool.c<br/>index 3395549c51d3..64d1d5a00f39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/genpool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/genpool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/genpool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/mce/genpool.c</a></div><div class='hunk'>@@ -99,6 +99,9 @@ int mce_gen_pool_add(struct mce *mce)</div><div class='ctx'> {</div><div class='ctx'> 	struct mce_evt_llist *node;</div><div class='ctx'> </div><div class='add'>+	if (filter_mce(mce))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (!mce_evt_pool)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c<br/>index 8492ef7d9015..a6026170af92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/inject.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/inject.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/inject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/mce/inject.c</a></div><div class='hunk'>@@ -46,8 +46,6 @@</div><div class='ctx'> static struct mce i_mce;</div><div class='ctx'> static struct dentry *dfs_inj;</div><div class='ctx'> </div><div class='del'>-static u8 n_banks;</div><div class='del'>-</div><div class='ctx'> #define MAX_FLAG_OPT_SIZE	4</div><div class='ctx'> #define NBCFG			0x44</div><div class='ctx'> </div><div class='hunk'>@@ -528,7 +526,7 @@ static void do_inject(void)</div><div class='ctx'> 	 * only on the node base core. Refer to D18F3x44[NbMcaToMstCpuEn] for</div><div class='ctx'> 	 * Fam10h and later BKDGs.</div><div class='ctx'> 	 */</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_AMD_DCM) &amp;&amp;</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_AMD_DCM) &amp;&amp;</div><div class='ctx'> 	    b == 4 &amp;&amp;</div><div class='ctx'> 	    boot_cpu_data.x86 &lt; 0x17) {</div><div class='ctx'> 		toggle_nb_mca_mst_cpu(amd_get_nb_id(cpu));</div><div class='hunk'>@@ -570,9 +568,15 @@ err:</div><div class='ctx'> static int inj_bank_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mce *m = (struct mce *)data;</div><div class='add'>+	u8 n_banks;</div><div class='add'>+	u64 cap;</div><div class='add'>+</div><div class='add'>+	/* Get bank count on target CPU so we can handle non-uniform values. */</div><div class='add'>+	rdmsrl_on_cpu(m-&gt;extcpu, MSR_IA32_MCG_CAP, &amp;cap);</div><div class='add'>+	n_banks = cap &amp; MCG_BANKCNT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt;= n_banks) {</div><div class='del'>-		pr_err("Non-existent MCE bank: %llu\n", val);</div><div class='add'>+		pr_err("MCA bank %llu non-existent on CPU%d\n", val, m-&gt;extcpu);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -665,10 +669,6 @@ static struct dfs_node {</div><div class='ctx'> static int __init debugfs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	u64 cap;</div><div class='del'>-</div><div class='del'>-	rdmsrl(MSR_IA32_MCG_CAP, cap);</div><div class='del'>-	n_banks = cap &amp; MCG_BANKCNT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	dfs_inj = debugfs_create_dir("mce-inject", NULL);</div><div class='ctx'> 	if (!dfs_inj)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h<br/>index af5eab1e65e2..a34b55baa7aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/mce/internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/mce/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/mce/internal.h</a></div><div class='hunk'>@@ -173,4 +173,13 @@ struct mca_msr_regs {</div><div class='ctx'> </div><div class='ctx'> extern struct mca_msr_regs msr_ops;</div><div class='ctx'> </div><div class='add'>+/* Decide whether to add MCE record to MCE event pool or filter it out. */</div><div class='add'>+extern bool filter_mce(struct mce *m);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_MCE_AMD</div><div class='add'>+extern bool amd_filter_mce(struct mce *m);</div><div class='add'>+#else</div><div class='add'>+static inline bool amd_filter_mce(struct mce *m)			{ return false; };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __X86_MCE_INTERNAL_H__ */</div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c<br/>index 97f9ada9ceda..c321f4f513f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/microcode/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/microcode/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/microcode/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/microcode/core.c</a></div><div class='hunk'>@@ -418,8 +418,9 @@ static int do_microcode_update(const void __user *buf, size_t size)</div><div class='ctx'> 		if (ustate == UCODE_ERROR) {</div><div class='ctx'> 			error = -1;</div><div class='ctx'> 			break;</div><div class='del'>-		} else if (ustate == UCODE_OK)</div><div class='add'>+		} else if (ustate == UCODE_NEW) {</div><div class='ctx'> 			apply_microcode_on_target(cpu);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -427,7 +428,7 @@ static int do_microcode_update(const void __user *buf, size_t size)</div><div class='ctx'> </div><div class='ctx'> static int microcode_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return capable(CAP_SYS_RAWIO) ? nonseekable_open(inode, file) : -EPERM;</div><div class='add'>+	return capable(CAP_SYS_RAWIO) ? stream_open(inode, file) : -EPERM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t microcode_write(struct file *file, const char __user *buf,</div><div class='hunk'>@@ -608,6 +609,8 @@ static int microcode_reload_late(void)</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		microcode_check();</div><div class='ctx'> </div><div class='add'>+	pr_info("Reload completed, microcode revision: 0x%x\n", boot_cpu_data.microcode);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c<br/>index 16936a24795c..a44bdbe7c55e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/microcode/intel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/microcode/intel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/microcode/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/microcode/intel.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/microcode_intel.h&gt;</div><div class='hunk'>@@ -861,32 +862,33 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='del'>-				int (*get_ucode_data)(void *, const void *, size_t))</div><div class='add'>+static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-	u8 *ucode_ptr = data, *new_mc = NULL, *mc = NULL;</div><div class='del'>-	int new_rev = uci-&gt;cpu_sig.rev;</div><div class='del'>-	unsigned int leftover = size;</div><div class='ctx'> 	unsigned int curr_mc_size = 0, new_mc_size = 0;</div><div class='del'>-	unsigned int csig, cpf;</div><div class='ctx'> 	enum ucode_state ret = UCODE_OK;</div><div class='add'>+	int new_rev = uci-&gt;cpu_sig.rev;</div><div class='add'>+	u8 *new_mc = NULL, *mc = NULL;</div><div class='add'>+	unsigned int csig, cpf;</div><div class='ctx'> </div><div class='del'>-	while (leftover) {</div><div class='add'>+	while (iov_iter_count(iter)) {</div><div class='ctx'> 		struct microcode_header_intel mc_header;</div><div class='del'>-		unsigned int mc_size;</div><div class='add'>+		unsigned int mc_size, data_size;</div><div class='add'>+		u8 *data;</div><div class='ctx'> </div><div class='del'>-		if (leftover &lt; sizeof(mc_header)) {</div><div class='del'>-			pr_err("error! Truncated header in microcode data file\n");</div><div class='add'>+		if (!copy_from_iter_full(&amp;mc_header, sizeof(mc_header), iter)) {</div><div class='add'>+			pr_err("error! Truncated or inaccessible header in microcode data file\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (get_ucode_data(&amp;mc_header, ucode_ptr, sizeof(mc_header)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		mc_size = get_totalsize(&amp;mc_header);</div><div class='del'>-		if (!mc_size || mc_size &gt; leftover) {</div><div class='del'>-			pr_err("error! Bad data in microcode data file\n");</div><div class='add'>+		if (mc_size &lt; sizeof(mc_header)) {</div><div class='add'>+			pr_err("error! Bad data in microcode data file (totalsize too small)\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		data_size = mc_size - sizeof(mc_header);</div><div class='add'>+		if (data_size &gt; iov_iter_count(iter)) {</div><div class='add'>+			pr_err("error! Bad data in microcode data file (truncated file?)\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -899,7 +901,9 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> 			curr_mc_size = mc_size;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (get_ucode_data(mc, ucode_ptr, mc_size) ||</div><div class='add'>+		memcpy(mc, &amp;mc_header, sizeof(mc_header));</div><div class='add'>+		data = mc + sizeof(mc_header);</div><div class='add'>+		if (!copy_from_iter_full(data, data_size, iter) ||</div><div class='ctx'> 		    microcode_sanity_check(mc, 1) &lt; 0) {</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -914,14 +918,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> 			mc = NULL;	/* trigger new vmalloc */</div><div class='ctx'> 			ret = UCODE_NEW;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		ucode_ptr += mc_size;</div><div class='del'>-		leftover  -= mc_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vfree(mc);</div><div class='ctx'> </div><div class='del'>-	if (leftover) {</div><div class='add'>+	if (iov_iter_count(iter)) {</div><div class='ctx'> 		vfree(new_mc);</div><div class='ctx'> 		return UCODE_ERROR;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -945,12 +946,6 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_ucode_fw(void *to, const void *from, size_t n)</div><div class='del'>-{</div><div class='del'>-	memcpy(to, from, n);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool is_blacklisted(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='hunk'>@@ -977,10 +972,12 @@ static bool is_blacklisted(unsigned int cpu)</div><div class='ctx'> static enum ucode_state request_microcode_fw(int cpu, struct device *device,</div><div class='ctx'> 					     bool refresh_fw)</div><div class='ctx'> {</div><div class='del'>-	char name[30];</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='ctx'> 	const struct firmware *firmware;</div><div class='add'>+	struct iov_iter iter;</div><div class='ctx'> 	enum ucode_state ret;</div><div class='add'>+	struct kvec kvec;</div><div class='add'>+	char name[30];</div><div class='ctx'> </div><div class='ctx'> 	if (is_blacklisted(cpu))</div><div class='ctx'> 		return UCODE_NFOUND;</div><div class='hunk'>@@ -993,26 +990,30 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,</div><div class='ctx'> 		return UCODE_NFOUND;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = generic_load_microcode(cpu, (void *)firmware-&gt;data,</div><div class='del'>-				     firmware-&gt;size, &amp;get_ucode_fw);</div><div class='add'>+	kvec.iov_base = (void *)firmware-&gt;data;</div><div class='add'>+	kvec.iov_len = firmware-&gt;size;</div><div class='add'>+	iov_iter_kvec(&amp;iter, WRITE, &amp;kvec, 1, firmware-&gt;size);</div><div class='add'>+	ret = generic_load_microcode(cpu, &amp;iter);</div><div class='ctx'> </div><div class='ctx'> 	release_firmware(firmware);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_ucode_user(void *to, const void *from, size_t n)</div><div class='del'>-{</div><div class='del'>-	return copy_from_user(to, from, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static enum ucode_state</div><div class='ctx'> request_microcode_user(int cpu, const void __user *buf, size_t size)</div><div class='ctx'> {</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	struct iovec iov;</div><div class='add'>+</div><div class='ctx'> 	if (is_blacklisted(cpu))</div><div class='ctx'> 		return UCODE_NFOUND;</div><div class='ctx'> </div><div class='del'>-	return generic_load_microcode(cpu, (void *)buf, size, &amp;get_ucode_user);</div><div class='add'>+	iov.iov_base = (void __user *)buf;</div><div class='add'>+	iov.iov_len = size;</div><div class='add'>+	iov_iter_init(&amp;iter, WRITE, &amp;iov, 1, size);</div><div class='add'>+</div><div class='add'>+	return generic_load_microcode(cpu, &amp;iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct microcode_ops microcode_intel_ops = {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c<br/>index 2c8522a39ed5..cb2e49810d68 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/proc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/proc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/proc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/proc.c</a></div><div class='hunk'>@@ -35,11 +35,11 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)</div><div class='ctx'> 		   "fpu_exception\t: %s\n"</div><div class='ctx'> 		   "cpuid level\t: %d\n"</div><div class='ctx'> 		   "wp\t\t: yes\n",</div><div class='del'>-		   static_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",</div><div class='del'>-		   static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",</div><div class='del'>-		   static_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",</div><div class='del'>-		   static_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",</div><div class='del'>-		   static_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",</div><div class='add'>+		   boot_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",</div><div class='add'>+		   boot_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",</div><div class='add'>+		   boot_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",</div><div class='add'>+		   boot_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",</div><div class='add'>+		   boot_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",</div><div class='ctx'> 		   c-&gt;cpuid_level);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c<br/>index 2dbd990a2eb7..89320c0396b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/resctrl/ctrlmondata.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/resctrl/ctrlmondata.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/resctrl/ctrlmondata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/resctrl/ctrlmondata.c</a></div><div class='hunk'>@@ -342,10 +342,10 @@ int update_domains(struct rdt_resource *r, int closid)</div><div class='ctx'> 	if (cpumask_empty(cpu_mask) || mba_sc)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	cpu = get_cpu();</div><div class='del'>-	/* Update CBM on this cpu if it's in cpu_mask. */</div><div class='add'>+	/* Update resource control msr on this CPU if it's in cpu_mask. */</div><div class='ctx'> 	if (cpumask_test_cpu(cpu, cpu_mask))</div><div class='ctx'> 		rdt_ctrl_update(&amp;msr_param);</div><div class='del'>-	/* Update CBM on other cpus. */</div><div class='add'>+	/* Update resource control msr on other CPUs. */</div><div class='ctx'> 	smp_call_function_many(cpu_mask, rdt_ctrl_update, &amp;msr_param, 1);</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c<br/>index f33f11f69078..1573a0a6b525 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/resctrl/monitor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/resctrl/monitor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/resctrl/monitor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/resctrl/monitor.c</a></div><div class='hunk'>@@ -501,11 +501,8 @@ out_unlock:</div><div class='ctx'> void cqm_setup_limbo_handler(struct rdt_domain *dom, unsigned long delay_ms)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long delay = msecs_to_jiffies(delay_ms);</div><div class='del'>-	struct rdt_resource *r;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	r = &amp;rdt_resources_all[RDT_RESOURCE_L3];</div><div class='del'>-</div><div class='ctx'> 	cpu = cpumask_any(&amp;dom-&gt;cpu_mask);</div><div class='ctx'> 	dom-&gt;cqm_work_cpu = cpu;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c<br/>index 399601eda8e4..333c177a2471 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/resctrl/rdtgroup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/cpu/resctrl/rdtgroup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/cpu/resctrl/rdtgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/cpu/resctrl/rdtgroup.c</a></div><div class='hunk'>@@ -2039,14 +2039,14 @@ out:</div><div class='ctx'> enum rdt_param {</div><div class='ctx'> 	Opt_cdp,</div><div class='ctx'> 	Opt_cdpl2,</div><div class='del'>-	Opt_mba_mpbs,</div><div class='add'>+	Opt_mba_mbps,</div><div class='ctx'> 	nr__rdt_params</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fs_parameter_spec rdt_param_specs[] = {</div><div class='ctx'> 	fsparam_flag("cdp",		Opt_cdp),</div><div class='ctx'> 	fsparam_flag("cdpl2",		Opt_cdpl2),</div><div class='del'>-	fsparam_flag("mba_mpbs",	Opt_mba_mpbs),</div><div class='add'>+	fsparam_flag("mba_MBps",	Opt_mba_mbps),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2072,7 +2072,7 @@ static int rdt_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 	case Opt_cdpl2:</div><div class='ctx'> 		ctx-&gt;enable_cdpl2 = true;</div><div class='ctx'> 		return 0;</div><div class='del'>-	case Opt_mba_mpbs:</div><div class='add'>+	case Opt_mba_mbps:</div><div class='ctx'> 		if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		ctx-&gt;enable_mba_mbps = true;</div><div class='hunk'>@@ -2516,103 +2516,131 @@ static void cbm_ensure_valid(u32 *_val, struct rdt_resource *r)</div><div class='ctx'> 	bitmap_clear(val, zero_bit, cbm_len - zero_bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * rdtgroup_init_alloc - Initialize the new RDT group's allocations</div><div class='del'>- *</div><div class='del'>- * A new RDT group is being created on an allocation capable (CAT)</div><div class='del'>- * supporting system. Set this group up to start off with all usable</div><div class='del'>- * allocations. That is, all shareable and unused bits.</div><div class='add'>+/*</div><div class='add'>+ * Initialize cache resources per RDT domain</div><div class='ctx'>  *</div><div class='del'>- * All-zero CBM is invalid. If there are no more shareable bits available</div><div class='del'>- * on any domain then the entire allocation will fail.</div><div class='add'>+ * Set the RDT domain up to start off with all usable allocations. That is,</div><div class='add'>+ * all shareable and unused bits. All-zero CBM is invalid.</div><div class='ctx'>  */</div><div class='del'>-static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)</div><div class='add'>+static int __init_one_rdt_domain(struct rdt_domain *d, struct rdt_resource *r,</div><div class='add'>+				 u32 closid)</div><div class='ctx'> {</div><div class='ctx'> 	struct rdt_resource *r_cdp = NULL;</div><div class='ctx'> 	struct rdt_domain *d_cdp = NULL;</div><div class='ctx'> 	u32 used_b = 0, unused_b = 0;</div><div class='del'>-	u32 closid = rdtgrp-&gt;closid;</div><div class='del'>-	struct rdt_resource *r;</div><div class='ctx'> 	unsigned long tmp_cbm;</div><div class='ctx'> 	enum rdtgrp_mode mode;</div><div class='del'>-	struct rdt_domain *d;</div><div class='ctx'> 	u32 peer_ctl, *ctrl;</div><div class='del'>-	int i, ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	for_each_alloc_enabled_rdt_resource(r) {</div><div class='del'>-		/*</div><div class='del'>-		 * Only initialize default allocations for CBM cache</div><div class='del'>-		 * resources</div><div class='del'>-		 */</div><div class='del'>-		if (r-&gt;rid == RDT_RESOURCE_MBA)</div><div class='del'>-			continue;</div><div class='del'>-		list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='del'>-			rdt_cdp_peer_get(r, d, &amp;r_cdp, &amp;d_cdp);</div><div class='del'>-			d-&gt;have_new_ctrl = false;</div><div class='del'>-			d-&gt;new_ctrl = r-&gt;cache.shareable_bits;</div><div class='del'>-			used_b = r-&gt;cache.shareable_bits;</div><div class='del'>-			ctrl = d-&gt;ctrl_val;</div><div class='del'>-			for (i = 0; i &lt; closids_supported(); i++, ctrl++) {</div><div class='del'>-				if (closid_allocated(i) &amp;&amp; i != closid) {</div><div class='del'>-					mode = rdtgroup_mode_by_closid(i);</div><div class='del'>-					if (mode == RDT_MODE_PSEUDO_LOCKSETUP)</div><div class='del'>-						break;</div><div class='del'>-					/*</div><div class='del'>-					 * If CDP is active include peer</div><div class='del'>-					 * domain's usage to ensure there</div><div class='del'>-					 * is no overlap with an exclusive</div><div class='del'>-					 * group.</div><div class='del'>-					 */</div><div class='del'>-					if (d_cdp)</div><div class='del'>-						peer_ctl = d_cdp-&gt;ctrl_val[i];</div><div class='del'>-					else</div><div class='del'>-						peer_ctl = 0;</div><div class='del'>-					used_b |= *ctrl | peer_ctl;</div><div class='del'>-					if (mode == RDT_MODE_SHAREABLE)</div><div class='del'>-						d-&gt;new_ctrl |= *ctrl | peer_ctl;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (d-&gt;plr &amp;&amp; d-&gt;plr-&gt;cbm &gt; 0)</div><div class='del'>-				used_b |= d-&gt;plr-&gt;cbm;</div><div class='del'>-			unused_b = used_b ^ (BIT_MASK(r-&gt;cache.cbm_len) - 1);</div><div class='del'>-			unused_b &amp;= BIT_MASK(r-&gt;cache.cbm_len) - 1;</div><div class='del'>-			d-&gt;new_ctrl |= unused_b;</div><div class='del'>-			/*</div><div class='del'>-			 * Force the initial CBM to be valid, user can</div><div class='del'>-			 * modify the CBM based on system availability.</div><div class='del'>-			 */</div><div class='del'>-			cbm_ensure_valid(&amp;d-&gt;new_ctrl, r);</div><div class='add'>+	rdt_cdp_peer_get(r, d, &amp;r_cdp, &amp;d_cdp);</div><div class='add'>+	d-&gt;have_new_ctrl = false;</div><div class='add'>+	d-&gt;new_ctrl = r-&gt;cache.shareable_bits;</div><div class='add'>+	used_b = r-&gt;cache.shareable_bits;</div><div class='add'>+	ctrl = d-&gt;ctrl_val;</div><div class='add'>+	for (i = 0; i &lt; closids_supported(); i++, ctrl++) {</div><div class='add'>+		if (closid_allocated(i) &amp;&amp; i != closid) {</div><div class='add'>+			mode = rdtgroup_mode_by_closid(i);</div><div class='add'>+			if (mode == RDT_MODE_PSEUDO_LOCKSETUP)</div><div class='add'>+				break;</div><div class='ctx'> 			/*</div><div class='del'>-			 * Assign the u32 CBM to an unsigned long to ensure</div><div class='del'>-			 * that bitmap_weight() does not access out-of-bound</div><div class='del'>-			 * memory.</div><div class='add'>+			 * If CDP is active include peer domain's</div><div class='add'>+			 * usage to ensure there is no overlap</div><div class='add'>+			 * with an exclusive group.</div><div class='ctx'> 			 */</div><div class='del'>-			tmp_cbm = d-&gt;new_ctrl;</div><div class='del'>-			if (bitmap_weight(&amp;tmp_cbm, r-&gt;cache.cbm_len) &lt;</div><div class='del'>-			    r-&gt;cache.min_cbm_bits) {</div><div class='del'>-				rdt_last_cmd_printf("No space on %s:%d\n",</div><div class='del'>-						    r-&gt;name, d-&gt;id);</div><div class='del'>-				return -ENOSPC;</div><div class='del'>-			}</div><div class='del'>-			d-&gt;have_new_ctrl = true;</div><div class='add'>+			if (d_cdp)</div><div class='add'>+				peer_ctl = d_cdp-&gt;ctrl_val[i];</div><div class='add'>+			else</div><div class='add'>+				peer_ctl = 0;</div><div class='add'>+			used_b |= *ctrl | peer_ctl;</div><div class='add'>+			if (mode == RDT_MODE_SHAREABLE)</div><div class='add'>+				d-&gt;new_ctrl |= *ctrl | peer_ctl;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (d-&gt;plr &amp;&amp; d-&gt;plr-&gt;cbm &gt; 0)</div><div class='add'>+		used_b |= d-&gt;plr-&gt;cbm;</div><div class='add'>+	unused_b = used_b ^ (BIT_MASK(r-&gt;cache.cbm_len) - 1);</div><div class='add'>+	unused_b &amp;= BIT_MASK(r-&gt;cache.cbm_len) - 1;</div><div class='add'>+	d-&gt;new_ctrl |= unused_b;</div><div class='add'>+	/*</div><div class='add'>+	 * Force the initial CBM to be valid, user can</div><div class='add'>+	 * modify the CBM based on system availability.</div><div class='add'>+	 */</div><div class='add'>+	cbm_ensure_valid(&amp;d-&gt;new_ctrl, r);</div><div class='add'>+	/*</div><div class='add'>+	 * Assign the u32 CBM to an unsigned long to ensure that</div><div class='add'>+	 * bitmap_weight() does not access out-of-bound memory.</div><div class='add'>+	 */</div><div class='add'>+	tmp_cbm = d-&gt;new_ctrl;</div><div class='add'>+	if (bitmap_weight(&amp;tmp_cbm, r-&gt;cache.cbm_len) &lt; r-&gt;cache.min_cbm_bits) {</div><div class='add'>+		rdt_last_cmd_printf("No space on %s:%d\n", r-&gt;name, d-&gt;id);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+	d-&gt;have_new_ctrl = true;</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'>+ * Initialize cache resources with default values.</div><div class='add'>+ *</div><div class='add'>+ * A new RDT group is being created on an allocation capable (CAT)</div><div class='add'>+ * supporting system. Set this group up to start off with all usable</div><div class='add'>+ * allocations.</div><div class='add'>+ *</div><div class='add'>+ * If there are no more shareable bits available on any domain then</div><div class='add'>+ * the entire allocation will fail.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_init_cat(struct rdt_resource *r, u32 closid)</div><div class='add'>+{</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		ret = __init_one_rdt_domain(d, r, closid);</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'>+/* Initialize MBA resource with default values. */</div><div class='add'>+static void rdtgroup_init_mba(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		d-&gt;new_ctrl = is_mba_sc(r) ? MBA_MAX_MBPS : r-&gt;default_ctrl;</div><div class='add'>+		d-&gt;have_new_ctrl = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize the RDT group's allocations. */</div><div class='add'>+static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for_each_alloc_enabled_rdt_resource(r) {</div><div class='del'>-		/*</div><div class='del'>-		 * Only initialize default allocations for CBM cache</div><div class='del'>-		 * resources</div><div class='del'>-		 */</div><div class='del'>-		if (r-&gt;rid == RDT_RESOURCE_MBA)</div><div class='del'>-			continue;</div><div class='add'>+		if (r-&gt;rid == RDT_RESOURCE_MBA) {</div><div class='add'>+			rdtgroup_init_mba(r);</div><div class='add'>+		} else {</div><div class='add'>+			ret = rdtgroup_init_cat(r, rdtgrp-&gt;closid);</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='ctx'> 		ret = update_domains(r, rdtgrp-&gt;closid);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			rdt_last_cmd_puts("Failed to initialize allocations\n");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		rdtgrp-&gt;mode = RDT_MODE_SHAREABLE;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rdtgrp-&gt;mode = RDT_MODE_SHAREABLE;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c<br/>index 17ffc869cab8..a96ca8584803 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/crash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/crash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/crash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/crash.c</a></div><div class='hunk'>@@ -204,8 +204,7 @@ static struct crash_mem *fill_up_crash_elf_data(void)</div><div class='ctx'> 	 * another range split. So add extra two slots here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	nr_ranges += 2;</div><div class='del'>-	cmem = vzalloc(sizeof(struct crash_mem) +</div><div class='del'>-			sizeof(struct crash_mem_range) * nr_ranges);</div><div class='add'>+	cmem = vzalloc(struct_size(cmem, ranges, nr_ranges));</div><div class='ctx'> 	if (!cmem)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c<br/>index cd53f3030e40..64a59d726639 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/dumpstack_32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/dumpstack_32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/dumpstack_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/dumpstack_32.c</a></div><div class='hunk'>@@ -34,14 +34,14 @@ const char *stack_type_name(enum stack_type type)</div><div class='ctx'> </div><div class='ctx'> static bool in_hardirq_stack(unsigned long *stack, struct stack_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *begin = (unsigned long *)this_cpu_read(hardirq_stack);</div><div class='add'>+	unsigned long *begin = (unsigned long *)this_cpu_read(hardirq_stack_ptr);</div><div class='ctx'> 	unsigned long *end   = begin + (THREAD_SIZE / sizeof(long));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a software stack, so 'end' can be a valid stack pointer.</div><div class='ctx'> 	 * It just means the stack is empty.</div><div class='ctx'> 	 */</div><div class='del'>-	if (stack &lt;= begin || stack &gt; end)</div><div class='add'>+	if (stack &lt; begin || stack &gt; end)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;type	= STACK_TYPE_IRQ;</div><div class='hunk'>@@ -59,14 +59,14 @@ static bool in_hardirq_stack(unsigned long *stack, struct stack_info *info)</div><div class='ctx'> </div><div class='ctx'> static bool in_softirq_stack(unsigned long *stack, struct stack_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *begin = (unsigned long *)this_cpu_read(softirq_stack);</div><div class='add'>+	unsigned long *begin = (unsigned long *)this_cpu_read(softirq_stack_ptr);</div><div class='ctx'> 	unsigned long *end   = begin + (THREAD_SIZE / sizeof(long));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a software stack, so 'end' can be a valid stack pointer.</div><div class='ctx'> 	 * It just means the stack is empty.</div><div class='ctx'> 	 */</div><div class='del'>-	if (stack &lt;= begin || stack &gt; end)</div><div class='add'>+	if (stack &lt; begin || stack &gt; end)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;type	= STACK_TYPE_SOFTIRQ;</div><div class='head'>diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c<br/>index 5cdb9e84da57..753b8cfe8b8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/dumpstack_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/dumpstack_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/dumpstack_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/dumpstack_64.c</a></div><div class='hunk'>@@ -16,23 +16,21 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cpu_entry_area.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='del'>-static char *exception_stack_names[N_EXCEPTION_STACKS] = {</div><div class='del'>-		[ DOUBLEFAULT_STACK-1	]	= "#DF",</div><div class='del'>-		[ NMI_STACK-1		]	= "NMI",</div><div class='del'>-		[ DEBUG_STACK-1		]	= "#DB",</div><div class='del'>-		[ MCE_STACK-1		]	= "#MC",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned long exception_stack_sizes[N_EXCEPTION_STACKS] = {</div><div class='del'>-	[0 ... N_EXCEPTION_STACKS - 1]		= EXCEPTION_STKSZ,</div><div class='del'>-	[DEBUG_STACK - 1]			= DEBUG_STKSZ</div><div class='add'>+static const char * const exception_stack_names[] = {</div><div class='add'>+		[ ESTACK_DF	]	= "#DF",</div><div class='add'>+		[ ESTACK_NMI	]	= "NMI",</div><div class='add'>+		[ ESTACK_DB2	]	= "#DB2",</div><div class='add'>+		[ ESTACK_DB1	]	= "#DB1",</div><div class='add'>+		[ ESTACK_DB	]	= "#DB",</div><div class='add'>+		[ ESTACK_MCE	]	= "#MC",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const char *stack_type_name(enum stack_type type)</div><div class='ctx'> {</div><div class='del'>-	BUILD_BUG_ON(N_EXCEPTION_STACKS != 4);</div><div class='add'>+	BUILD_BUG_ON(N_EXCEPTION_STACKS != 6);</div><div class='ctx'> </div><div class='ctx'> 	if (type == STACK_TYPE_IRQ)</div><div class='ctx'> 		return "IRQ";</div><div class='hunk'>@@ -52,43 +50,84 @@ const char *stack_type_name(enum stack_type type)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct estack_pages - Page descriptor for exception stacks</div><div class='add'>+ * @offs:	Offset from the start of the exception stack area</div><div class='add'>+ * @size:	Size of the exception stack</div><div class='add'>+ * @type:	Type to store in the stack_info struct</div><div class='add'>+ */</div><div class='add'>+struct estack_pages {</div><div class='add'>+	u32	offs;</div><div class='add'>+	u16	size;</div><div class='add'>+	u16	type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EPAGERANGE(st)							\</div><div class='add'>+	[PFN_DOWN(CEA_ESTACK_OFFS(st)) ...				\</div><div class='add'>+	 PFN_DOWN(CEA_ESTACK_OFFS(st) + CEA_ESTACK_SIZE(st) - 1)] = {	\</div><div class='add'>+		.offs	= CEA_ESTACK_OFFS(st),				\</div><div class='add'>+		.size	= CEA_ESTACK_SIZE(st),				\</div><div class='add'>+		.type	= STACK_TYPE_EXCEPTION + ESTACK_ ##st, }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Array of exception stack page descriptors. If the stack is larger than</div><div class='add'>+ * PAGE_SIZE, all pages covering a particular stack will have the same</div><div class='add'>+ * info. The guard pages including the not mapped DB2 stack are zeroed</div><div class='add'>+ * out.</div><div class='add'>+ */</div><div class='add'>+static const</div><div class='add'>+struct estack_pages estack_pages[CEA_ESTACK_PAGES] ____cacheline_aligned = {</div><div class='add'>+	EPAGERANGE(DF),</div><div class='add'>+	EPAGERANGE(NMI),</div><div class='add'>+	EPAGERANGE(DB1),</div><div class='add'>+	EPAGERANGE(DB),</div><div class='add'>+	EPAGERANGE(MCE),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static bool in_exception_stack(unsigned long *stack, struct stack_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *begin, *end;</div><div class='add'>+	unsigned long begin, end, stk = (unsigned long)stack;</div><div class='add'>+	const struct estack_pages *ep;</div><div class='ctx'> 	struct pt_regs *regs;</div><div class='del'>-	unsigned k;</div><div class='add'>+	unsigned int k;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(N_EXCEPTION_STACKS != 4);</div><div class='add'>+	BUILD_BUG_ON(N_EXCEPTION_STACKS != 6);</div><div class='ctx'> </div><div class='del'>-	for (k = 0; k &lt; N_EXCEPTION_STACKS; k++) {</div><div class='del'>-		end   = (unsigned long *)raw_cpu_ptr(&amp;orig_ist)-&gt;ist[k];</div><div class='del'>-		begin = end - (exception_stack_sizes[k] / sizeof(long));</div><div class='del'>-		regs  = (struct pt_regs *)end - 1;</div><div class='del'>-</div><div class='del'>-		if (stack &lt;= begin || stack &gt;= end)</div><div class='del'>-			continue;</div><div class='add'>+	begin = (unsigned long)__this_cpu_read(cea_exception_stacks);</div><div class='add'>+	end = begin + sizeof(struct cea_exception_stacks);</div><div class='add'>+	/* Bail if @stack is outside the exception stack area. */</div><div class='add'>+	if (stk &lt; begin || stk &gt;= end)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-		info-&gt;type	= STACK_TYPE_EXCEPTION + k;</div><div class='del'>-		info-&gt;begin	= begin;</div><div class='del'>-		info-&gt;end	= end;</div><div class='del'>-		info-&gt;next_sp	= (unsigned long *)regs-&gt;sp;</div><div class='add'>+	/* Calc page offset from start of exception stacks */</div><div class='add'>+	k = (stk - begin) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	/* Lookup the page descriptor */</div><div class='add'>+	ep = &amp;estack_pages[k];</div><div class='add'>+	/* Guard page? */</div><div class='add'>+	if (!ep-&gt;size)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='add'>+	begin += (unsigned long)ep-&gt;offs;</div><div class='add'>+	end = begin + (unsigned long)ep-&gt;size;</div><div class='add'>+	regs = (struct pt_regs *)end - 1;</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	info-&gt;type	= ep-&gt;type;</div><div class='add'>+	info-&gt;begin	= (unsigned long *)begin;</div><div class='add'>+	info-&gt;end	= (unsigned long *)end;</div><div class='add'>+	info-&gt;next_sp	= (unsigned long *)regs-&gt;sp;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool in_irq_stack(unsigned long *stack, struct stack_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *end   = (unsigned long *)this_cpu_read(irq_stack_ptr);</div><div class='add'>+	unsigned long *end   = (unsigned long *)this_cpu_read(hardirq_stack_ptr);</div><div class='ctx'> 	unsigned long *begin = end - (IRQ_STACK_SIZE / sizeof(long));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a software stack, so 'end' can be a valid stack pointer.</div><div class='ctx'> 	 * It just means the stack is empty.</div><div class='ctx'> 	 */</div><div class='del'>-	if (stack &lt;= begin || stack &gt; end)</div><div class='add'>+	if (stack &lt; begin || stack &gt;= end)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;type	= STACK_TYPE_IRQ;</div><div class='head'>diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c<br/>index 2e5003fef51a..ce243f76bdb7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/fpu/core.c</a></div><div class='hunk'>@@ -101,24 +101,21 @@ static void __kernel_fpu_begin(void)</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_disable();</div><div class='ctx'> </div><div class='del'>-	if (fpu-&gt;initialized) {</div><div class='del'>-		/*</div><div class='del'>-		 * Ignore return value -- we don't care if reg state</div><div class='del'>-		 * is clobbered.</div><div class='del'>-		 */</div><div class='del'>-		copy_fpregs_to_fpstate(fpu);</div><div class='del'>-	} else {</div><div class='del'>-		__cpu_invalidate_fpregs_state();</div><div class='add'>+	if (current-&gt;mm) {</div><div class='add'>+		if (!test_thread_flag(TIF_NEED_FPU_LOAD)) {</div><div class='add'>+			set_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='add'>+			/*</div><div class='add'>+			 * Ignore return value -- we don't care if reg state</div><div class='add'>+			 * is clobbered.</div><div class='add'>+			 */</div><div class='add'>+			copy_fpregs_to_fpstate(fpu);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	__cpu_invalidate_fpregs_state();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __kernel_fpu_end(void)</div><div class='ctx'> {</div><div class='del'>-	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='del'>-</div><div class='del'>-	if (fpu-&gt;initialized)</div><div class='del'>-		copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='del'>-</div><div class='ctx'> 	kernel_fpu_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -145,15 +142,17 @@ void fpu__save(struct fpu *fpu)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_FPU(fpu != &amp;current-&gt;thread.fpu);</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='add'>+	fpregs_lock();</div><div class='ctx'> 	trace_x86_fpu_before_save(fpu);</div><div class='del'>-	if (fpu-&gt;initialized) {</div><div class='add'>+</div><div class='add'>+	if (!test_thread_flag(TIF_NEED_FPU_LOAD)) {</div><div class='ctx'> 		if (!copy_fpregs_to_fpstate(fpu)) {</div><div class='ctx'> 			copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	trace_x86_fpu_after_save(fpu);</div><div class='del'>-	preempt_enable();</div><div class='add'>+	fpregs_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fpu__save);</div><div class='ctx'> </div><div class='hunk'>@@ -186,11 +185,14 @@ void fpstate_init(union fpregs_state *state)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fpstate_init);</div><div class='ctx'> </div><div class='del'>-int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)</div><div class='add'>+int fpu__copy(struct task_struct *dst, struct task_struct *src)</div><div class='ctx'> {</div><div class='add'>+	struct fpu *dst_fpu = &amp;dst-&gt;thread.fpu;</div><div class='add'>+	struct fpu *src_fpu = &amp;src-&gt;thread.fpu;</div><div class='add'>+</div><div class='ctx'> 	dst_fpu-&gt;last_cpu = -1;</div><div class='ctx'> </div><div class='del'>-	if (!src_fpu-&gt;initialized || !static_cpu_has(X86_FEATURE_FPU))</div><div class='add'>+	if (!static_cpu_has(X86_FEATURE_FPU))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_FPU(src_fpu != &amp;current-&gt;thread.fpu);</div><div class='hunk'>@@ -202,16 +204,23 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)</div><div class='ctx'> 	memset(&amp;dst_fpu-&gt;state.xsave, 0, fpu_kernel_xstate_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Save current FPU registers directly into the child</div><div class='del'>-	 * FPU context, without any memory-to-memory copying.</div><div class='add'>+	 * If the FPU registers are not current just memcpy() the state.</div><div class='add'>+	 * Otherwise save current FPU registers directly into the child's FPU</div><div class='add'>+	 * context, without any memory-to-memory copying.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * ( The function 'fails' in the FNSAVE case, which destroys</div><div class='del'>-	 *   register contents so we have to copy them back. )</div><div class='add'>+	 *   register contents so we have to load them back. )</div><div class='ctx'> 	 */</div><div class='del'>-	if (!copy_fpregs_to_fpstate(dst_fpu)) {</div><div class='del'>-		memcpy(&amp;src_fpu-&gt;state, &amp;dst_fpu-&gt;state, fpu_kernel_xstate_size);</div><div class='del'>-		copy_kernel_to_fpregs(&amp;src_fpu-&gt;state);</div><div class='del'>-	}</div><div class='add'>+	fpregs_lock();</div><div class='add'>+	if (test_thread_flag(TIF_NEED_FPU_LOAD))</div><div class='add'>+		memcpy(&amp;dst_fpu-&gt;state, &amp;src_fpu-&gt;state, fpu_kernel_xstate_size);</div><div class='add'>+</div><div class='add'>+	else if (!copy_fpregs_to_fpstate(dst_fpu))</div><div class='add'>+		copy_kernel_to_fpregs(&amp;dst_fpu-&gt;state);</div><div class='add'>+</div><div class='add'>+	fpregs_unlock();</div><div class='add'>+</div><div class='add'>+	set_tsk_thread_flag(dst, TIF_NEED_FPU_LOAD);</div><div class='ctx'> </div><div class='ctx'> 	trace_x86_fpu_copy_src(src_fpu);</div><div class='ctx'> 	trace_x86_fpu_copy_dst(dst_fpu);</div><div class='hunk'>@@ -223,20 +232,14 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)</div><div class='ctx'>  * Activate the current task's in-memory FPU context,</div><div class='ctx'>  * if it has not been used before:</div><div class='ctx'>  */</div><div class='del'>-void fpu__initialize(struct fpu *fpu)</div><div class='add'>+static void fpu__initialize(struct fpu *fpu)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_FPU(fpu != &amp;current-&gt;thread.fpu);</div><div class='ctx'> </div><div class='del'>-	if (!fpu-&gt;initialized) {</div><div class='del'>-		fpstate_init(&amp;fpu-&gt;state);</div><div class='del'>-		trace_x86_fpu_init_state(fpu);</div><div class='del'>-</div><div class='del'>-		trace_x86_fpu_activate_state(fpu);</div><div class='del'>-		/* Safe to do for the current task: */</div><div class='del'>-		fpu-&gt;initialized = 1;</div><div class='del'>-	}</div><div class='add'>+	set_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='add'>+	fpstate_init(&amp;fpu-&gt;state);</div><div class='add'>+	trace_x86_fpu_init_state(fpu);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(fpu__initialize);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function must be called before we read a task's fpstate.</div><div class='hunk'>@@ -248,32 +251,20 @@ EXPORT_SYMBOL_GPL(fpu__initialize);</div><div class='ctx'>  *</div><div class='ctx'>  * - or it's called for stopped tasks (ptrace), in which case the</div><div class='ctx'>  *   registers were already saved by the context-switch code when</div><div class='del'>- *   the task scheduled out - we only have to initialize the registers</div><div class='del'>- *   if they've never been initialized.</div><div class='add'>+ *   the task scheduled out.</div><div class='ctx'>  *</div><div class='ctx'>  * If the task has used the FPU before then save it.</div><div class='ctx'>  */</div><div class='ctx'> void fpu__prepare_read(struct fpu *fpu)</div><div class='ctx'> {</div><div class='del'>-	if (fpu == &amp;current-&gt;thread.fpu) {</div><div class='add'>+	if (fpu == &amp;current-&gt;thread.fpu)</div><div class='ctx'> 		fpu__save(fpu);</div><div class='del'>-	} else {</div><div class='del'>-		if (!fpu-&gt;initialized) {</div><div class='del'>-			fpstate_init(&amp;fpu-&gt;state);</div><div class='del'>-			trace_x86_fpu_init_state(fpu);</div><div class='del'>-</div><div class='del'>-			trace_x86_fpu_activate_state(fpu);</div><div class='del'>-			/* Safe to do for current and for stopped child tasks: */</div><div class='del'>-			fpu-&gt;initialized = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function must be called before we write a task's fpstate.</div><div class='ctx'>  *</div><div class='del'>- * If the task has used the FPU before then invalidate any cached FPU registers.</div><div class='del'>- * If the task has not used the FPU before then initialize its fpstate.</div><div class='add'>+ * Invalidate any cached FPU registers.</div><div class='ctx'>  *</div><div class='ctx'>  * After this function call, after registers in the fpstate are</div><div class='ctx'>  * modified and the child task has woken up, the child task will</div><div class='hunk'>@@ -290,44 +281,11 @@ void fpu__prepare_write(struct fpu *fpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON_FPU(fpu == &amp;current-&gt;thread.fpu);</div><div class='ctx'> </div><div class='del'>-	if (fpu-&gt;initialized) {</div><div class='del'>-		/* Invalidate any cached state: */</div><div class='del'>-		__fpu_invalidate_fpregs_state(fpu);</div><div class='del'>-	} else {</div><div class='del'>-		fpstate_init(&amp;fpu-&gt;state);</div><div class='del'>-		trace_x86_fpu_init_state(fpu);</div><div class='del'>-</div><div class='del'>-		trace_x86_fpu_activate_state(fpu);</div><div class='del'>-		/* Safe to do for stopped child tasks: */</div><div class='del'>-		fpu-&gt;initialized = 1;</div><div class='del'>-	}</div><div class='add'>+	/* Invalidate any cached state: */</div><div class='add'>+	__fpu_invalidate_fpregs_state(fpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * 'fpu__restore()' is called to copy FPU registers from</div><div class='del'>- * the FPU fpstate to the live hw registers and to activate</div><div class='del'>- * access to the hardware registers, so that FPU instructions</div><div class='del'>- * can be used afterwards.</div><div class='del'>- *</div><div class='del'>- * Must be called with kernel preemption disabled (for example</div><div class='del'>- * with local interrupts disabled, as it is in the case of</div><div class='del'>- * do_device_not_available()).</div><div class='del'>- */</div><div class='del'>-void fpu__restore(struct fpu *fpu)</div><div class='del'>-{</div><div class='del'>-	fpu__initialize(fpu);</div><div class='del'>-</div><div class='del'>-	/* Avoid __kernel_fpu_begin() right after fpregs_activate() */</div><div class='del'>-	kernel_fpu_disable();</div><div class='del'>-	trace_x86_fpu_before_restore(fpu);</div><div class='del'>-	fpregs_activate(fpu);</div><div class='del'>-	copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='del'>-	trace_x86_fpu_after_restore(fpu);</div><div class='del'>-	kernel_fpu_enable();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(fpu__restore);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Drops current FPU state: deactivates the fpregs and</div><div class='ctx'>  * the fpstate. NOTE: it still leaves previous contents</div><div class='ctx'>  * in the fpregs in the eager-FPU case.</div><div class='hunk'>@@ -341,17 +299,13 @@ void fpu__drop(struct fpu *fpu)</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='ctx'> 	if (fpu == &amp;current-&gt;thread.fpu) {</div><div class='del'>-		if (fpu-&gt;initialized) {</div><div class='del'>-			/* Ignore delayed exceptions from user space */</div><div class='del'>-			asm volatile("1: fwait\n"</div><div class='del'>-				     "2:\n"</div><div class='del'>-				     _ASM_EXTABLE(1b, 2b));</div><div class='del'>-			fpregs_deactivate(fpu);</div><div class='del'>-		}</div><div class='add'>+		/* Ignore delayed exceptions from user space */</div><div class='add'>+		asm volatile("1: fwait\n"</div><div class='add'>+			     "2:\n"</div><div class='add'>+			     _ASM_EXTABLE(1b, 2b));</div><div class='add'>+		fpregs_deactivate(fpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fpu-&gt;initialized = 0;</div><div class='del'>-</div><div class='ctx'> 	trace_x86_fpu_dropped(fpu);</div><div class='ctx'> </div><div class='ctx'> 	preempt_enable();</div><div class='hunk'>@@ -363,6 +317,8 @@ void fpu__drop(struct fpu *fpu)</div><div class='ctx'>  */</div><div class='ctx'> static inline void copy_init_fpstate_to_fpregs(void)</div><div class='ctx'> {</div><div class='add'>+	fpregs_lock();</div><div class='add'>+</div><div class='ctx'> 	if (use_xsave())</div><div class='ctx'> 		copy_kernel_to_xregs(&amp;init_fpstate.xsave, -1);</div><div class='ctx'> 	else if (static_cpu_has(X86_FEATURE_FXSR))</div><div class='hunk'>@@ -372,6 +328,9 @@ static inline void copy_init_fpstate_to_fpregs(void)</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_OSPKE))</div><div class='ctx'> 		copy_init_pkru_to_fpregs();</div><div class='add'>+</div><div class='add'>+	fpregs_mark_activate();</div><div class='add'>+	fpregs_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -389,16 +348,52 @@ void fpu__clear(struct fpu *fpu)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure fpstate is cleared and initialized.</div><div class='ctx'> 	 */</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_FPU)) {</div><div class='del'>-		preempt_disable();</div><div class='del'>-		fpu__initialize(fpu);</div><div class='del'>-		user_fpu_begin();</div><div class='add'>+	fpu__initialize(fpu);</div><div class='add'>+	if (static_cpu_has(X86_FEATURE_FPU))</div><div class='ctx'> 		copy_init_fpstate_to_fpregs();</div><div class='del'>-		preempt_enable();</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Load FPU context before returning to userspace.</div><div class='add'>+ */</div><div class='add'>+void switch_fpu_return(void)</div><div class='add'>+{</div><div class='add'>+	if (!static_cpu_has(X86_FEATURE_FPU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__fpregs_load_activate();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(switch_fpu_return);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_DEBUG_FPU</div><div class='add'>+/*</div><div class='add'>+ * If current FPU state according to its tracking (loaded FPU context on this</div><div class='add'>+ * CPU) is not valid then we must have TIF_NEED_FPU_LOAD set so the context is</div><div class='add'>+ * loaded on return to userland.</div><div class='add'>+ */</div><div class='add'>+void fpregs_assert_state_consistent(void)</div><div class='add'>+{</div><div class='add'>+	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_NEED_FPU_LOAD))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ON_FPU(!fpregs_state_valid(fpu, smp_processor_id()));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fpregs_assert_state_consistent);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void fpregs_mark_activate(void)</div><div class='add'>+{</div><div class='add'>+	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='add'>+</div><div class='add'>+	fpregs_activate(fpu);</div><div class='add'>+	fpu-&gt;last_cpu = smp_processor_id();</div><div class='add'>+	clear_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fpregs_mark_activate);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * x87 math exception handling:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c<br/>index 6abd83572b01..20d8fa7124c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/fpu/init.c</a></div><div class='hunk'>@@ -239,8 +239,6 @@ static void __init fpu__init_system_ctx_switch(void)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_FPU(!on_boot_cpu);</div><div class='ctx'> 	on_boot_cpu = 0;</div><div class='del'>-</div><div class='del'>-	WARN_ON_FPU(current-&gt;thread.fpu.initialized);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c<br/>index bc02f5144b95..d652b939ccfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/regset.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/regset.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/regset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/fpu/regset.c</a></div><div class='hunk'>@@ -15,16 +15,12 @@</div><div class='ctx'>  */</div><div class='ctx'> int regset_fpregs_active(struct task_struct *target, const struct user_regset *regset)</div><div class='ctx'> {</div><div class='del'>-	struct fpu *target_fpu = &amp;target-&gt;thread.fpu;</div><div class='del'>-</div><div class='del'>-	return target_fpu-&gt;initialized ? regset-&gt;n : 0;</div><div class='add'>+	return regset-&gt;n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int regset_xregset_fpregs_active(struct task_struct *target, const struct user_regset *regset)</div><div class='ctx'> {</div><div class='del'>-	struct fpu *target_fpu = &amp;target-&gt;thread.fpu;</div><div class='del'>-</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_FXSR) &amp;&amp; target_fpu-&gt;initialized)</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_FXSR))</div><div class='ctx'> 		return regset-&gt;n;</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -269,11 +265,10 @@ convert_from_fxsr(struct user_i387_ia32_struct *env, struct task_struct *tsk)</div><div class='ctx'> 		memcpy(&amp;to[i], &amp;from[i], sizeof(to[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void convert_to_fxsr(struct task_struct *tsk,</div><div class='add'>+void convert_to_fxsr(struct fxregs_state *fxsave,</div><div class='ctx'> 		     const struct user_i387_ia32_struct *env)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct fxregs_state *fxsave = &amp;tsk-&gt;thread.fpu.state.fxsave;</div><div class='ctx'> 	struct _fpreg *from = (struct _fpreg *) &amp;env-&gt;st_space[0];</div><div class='ctx'> 	struct _fpxreg *to = (struct _fpxreg *) &amp;fxsave-&gt;st_space[0];</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -350,7 +345,7 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;env, 0, -1);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		convert_to_fxsr(target, &amp;env);</div><div class='add'>+		convert_to_fxsr(&amp;target-&gt;thread.fpu.state.fxsave, &amp;env);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * update the header bit in the xsave header, indicating the</div><div class='hunk'>@@ -371,16 +366,9 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> int dump_fpu(struct pt_regs *regs, struct user_i387_struct *ufpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='del'>-	struct fpu *fpu = &amp;tsk-&gt;thread.fpu;</div><div class='del'>-	int fpvalid;</div><div class='del'>-</div><div class='del'>-	fpvalid = fpu-&gt;initialized;</div><div class='del'>-	if (fpvalid)</div><div class='del'>-		fpvalid = !fpregs_get(tsk, NULL,</div><div class='del'>-				      0, sizeof(struct user_i387_ia32_struct),</div><div class='del'>-				      ufpu, NULL);</div><div class='ctx'> </div><div class='del'>-	return fpvalid;</div><div class='add'>+	return !fpregs_get(tsk, NULL, 0, sizeof(struct user_i387_ia32_struct),</div><div class='add'>+			   ufpu, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dump_fpu);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c<br/>index f6a1d299627c..5a8d118bc423 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/signal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/signal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/fpu/signal.c</a></div><div class='hunk'>@@ -92,13 +92,13 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err |= __put_user(FP_XSTATE_MAGIC2,</div><div class='del'>-			  (__u32 *)(buf + fpu_user_xstate_size));</div><div class='add'>+			  (__u32 __user *)(buf + fpu_user_xstate_size));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read the xfeatures which we copied (directly from the cpu or</div><div class='ctx'> 	 * from the state in task struct) to the user buffers.</div><div class='ctx'> 	 */</div><div class='del'>-	err |= __get_user(xfeatures, (__u32 *)&amp;x-&gt;header.xfeatures);</div><div class='add'>+	err |= __get_user(xfeatures, (__u32 __user *)&amp;x-&gt;header.xfeatures);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For legacy compatible, we always set FP/SSE bits in the bit</div><div class='hunk'>@@ -113,7 +113,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)</div><div class='ctx'> 	 */</div><div class='ctx'> 	xfeatures |= XFEATURE_MASK_FPSSE;</div><div class='ctx'> </div><div class='del'>-	err |= __put_user(xfeatures, (__u32 *)&amp;x-&gt;header.xfeatures);</div><div class='add'>+	err |= __put_user(xfeatures, (__u32 __user *)&amp;x-&gt;header.xfeatures);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -144,9 +144,10 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)</div><div class='ctx'>  *	buf == buf_fx for 64-bit frames and 32-bit fsave frame.</div><div class='ctx'>  *	buf != buf_fx for 32-bit frames with fxstate.</div><div class='ctx'>  *</div><div class='del'>- * If the fpu, extended register state is live, save the state directly</div><div class='del'>- * to the user frame pointed by the aligned pointer 'buf_fx'. Otherwise,</div><div class='del'>- * copy the thread's fpu state to the user frame starting at 'buf_fx'.</div><div class='add'>+ * Try to save it directly to the user frame with disabled page fault handler.</div><div class='add'>+ * If this fails then do the slow path where the FPU state is first saved to</div><div class='add'>+ * task's fpu-&gt;state and then copy it to the user frame pointed to by the</div><div class='add'>+ * aligned pointer 'buf_fx'.</div><div class='ctx'>  *</div><div class='ctx'>  * If this is a 32-bit frame with fxstate, put a fsave header before</div><div class='ctx'>  * the aligned state at 'buf_fx'.</div><div class='hunk'>@@ -156,10 +157,9 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)</div><div class='ctx'>  */</div><div class='ctx'> int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> {</div><div class='del'>-	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='del'>-	struct xregs_state *xsave = &amp;fpu-&gt;state.xsave;</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> 	int ia32_fxstate = (buf != buf_fx);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ia32_fxstate &amp;= (IS_ENABLED(CONFIG_X86_32) ||</div><div class='ctx'> 			 IS_ENABLED(CONFIG_IA32_EMULATION));</div><div class='hunk'>@@ -172,28 +172,34 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> 			sizeof(struct user_i387_ia32_struct), NULL,</div><div class='ctx'> 			(struct _fpstate_32 __user *) buf) ? -1 : 1;</div><div class='ctx'> </div><div class='del'>-	if (fpu-&gt;initialized || using_compacted_format()) {</div><div class='del'>-		/* Save the live register state to the user directly. */</div><div class='del'>-		if (copy_fpregs_to_sigframe(buf_fx))</div><div class='del'>-			return -1;</div><div class='del'>-		/* Update the thread's fxstate to save the fsave header. */</div><div class='del'>-		if (ia32_fxstate)</div><div class='del'>-			copy_fxregs_to_kernel(fpu);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * It is a *bug* if kernel uses compacted-format for xsave</div><div class='del'>-		 * area and we copy it out directly to a signal frame. It</div><div class='del'>-		 * should have been handled above by saving the registers</div><div class='del'>-		 * directly.</div><div class='del'>-		 */</div><div class='del'>-		if (boot_cpu_has(X86_FEATURE_XSAVES)) {</div><div class='del'>-			WARN_ONCE(1, "x86/fpu: saving compacted-format xsave area to a signal frame!\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fpstate_sanitize_xstate(fpu);</div><div class='del'>-		if (__copy_to_user(buf_fx, xsave, fpu_user_xstate_size))</div><div class='del'>-			return -1;</div><div class='add'>+retry:</div><div class='add'>+	/*</div><div class='add'>+	 * Load the FPU registers if they are not valid for the current task.</div><div class='add'>+	 * With a valid FPU state we can attempt to save the state directly to</div><div class='add'>+	 * userland's stack frame which will likely succeed. If it does not,</div><div class='add'>+	 * resolve the fault in the user memory and try again.</div><div class='add'>+	 */</div><div class='add'>+	fpregs_lock();</div><div class='add'>+	if (test_thread_flag(TIF_NEED_FPU_LOAD))</div><div class='add'>+		__fpregs_load_activate();</div><div class='add'>+</div><div class='add'>+	pagefault_disable();</div><div class='add'>+	ret = copy_fpregs_to_sigframe(buf_fx);</div><div class='add'>+	pagefault_enable();</div><div class='add'>+	fpregs_unlock();</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		int aligned_size;</div><div class='add'>+		int nr_pages;</div><div class='add'>+</div><div class='add'>+		aligned_size = offset_in_page(buf_fx) + fpu_user_xstate_size;</div><div class='add'>+		nr_pages = DIV_ROUND_UP(aligned_size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		ret = get_user_pages_unlocked((unsigned long)buf_fx, nr_pages,</div><div class='add'>+					      NULL, FOLL_WRITE);</div><div class='add'>+		if (ret == nr_pages)</div><div class='add'>+			goto retry;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Save the fsave header for the 32-bit frames. */</div><div class='hunk'>@@ -207,11 +213,11 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-sanitize_restored_xstate(struct task_struct *tsk,</div><div class='add'>+sanitize_restored_xstate(union fpregs_state *state,</div><div class='ctx'> 			 struct user_i387_ia32_struct *ia32_env,</div><div class='ctx'> 			 u64 xfeatures, int fx_only)</div><div class='ctx'> {</div><div class='del'>-	struct xregs_state *xsave = &amp;tsk-&gt;thread.fpu.state.xsave;</div><div class='add'>+	struct xregs_state *xsave = &amp;state-&gt;xsave;</div><div class='ctx'> 	struct xstate_header *header = &amp;xsave-&gt;header;</div><div class='ctx'> </div><div class='ctx'> 	if (use_xsave()) {</div><div class='hunk'>@@ -238,17 +244,18 @@ sanitize_restored_xstate(struct task_struct *tsk,</div><div class='ctx'> 		 */</div><div class='ctx'> 		xsave-&gt;i387.mxcsr &amp;= mxcsr_feature_mask;</div><div class='ctx'> </div><div class='del'>-		convert_to_fxsr(tsk, ia32_env);</div><div class='add'>+		if (ia32_env)</div><div class='add'>+			convert_to_fxsr(&amp;state-&gt;fxsave, ia32_env);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Restore the extended state if present. Otherwise, restore the FP/SSE state.</div><div class='ctx'>  */</div><div class='del'>-static inline int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only)</div><div class='add'>+static int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only)</div><div class='ctx'> {</div><div class='ctx'> 	if (use_xsave()) {</div><div class='del'>-		if ((unsigned long)buf % 64 || fx_only) {</div><div class='add'>+		if (fx_only) {</div><div class='ctx'> 			u64 init_bv = xfeatures_mask &amp; ~XFEATURE_MASK_FPSSE;</div><div class='ctx'> 			copy_kernel_to_xregs(&amp;init_fpstate.xsave, init_bv);</div><div class='ctx'> 			return copy_user_to_fxregs(buf);</div><div class='hunk'>@@ -266,12 +273,15 @@ static inline int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_</div><div class='ctx'> </div><div class='ctx'> static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> {</div><div class='add'>+	struct user_i387_ia32_struct *envp = NULL;</div><div class='add'>+	int state_size = fpu_kernel_xstate_size;</div><div class='ctx'> 	int ia32_fxstate = (buf != buf_fx);</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> 	struct fpu *fpu = &amp;tsk-&gt;thread.fpu;</div><div class='del'>-	int state_size = fpu_kernel_xstate_size;</div><div class='add'>+	struct user_i387_ia32_struct env;</div><div class='ctx'> 	u64 xfeatures = 0;</div><div class='ctx'> 	int fx_only = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ia32_fxstate &amp;= (IS_ENABLED(CONFIG_X86_32) ||</div><div class='ctx'> 			 IS_ENABLED(CONFIG_IA32_EMULATION));</div><div class='hunk'>@@ -284,8 +294,6 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> 	if (!access_ok(buf, size))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='del'>-	fpu__initialize(fpu);</div><div class='del'>-</div><div class='ctx'> 	if (!static_cpu_has(X86_FEATURE_FPU))</div><div class='ctx'> 		return fpregs_soft_set(current, NULL,</div><div class='ctx'> 				       0, sizeof(struct user_i387_ia32_struct),</div><div class='hunk'>@@ -308,61 +316,101 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The current state of the FPU registers does not matter. By setting</div><div class='add'>+	 * TIF_NEED_FPU_LOAD unconditionally it is ensured that the our xstate</div><div class='add'>+	 * is not modified on context switch and that the xstate is considered</div><div class='add'>+	 * to be loaded again on return to userland (overriding last_cpu avoids</div><div class='add'>+	 * the optimisation).</div><div class='add'>+	 */</div><div class='add'>+	set_thread_flag(TIF_NEED_FPU_LOAD);</div><div class='add'>+	__fpu_invalidate_fpregs_state(fpu);</div><div class='add'>+</div><div class='add'>+	if ((unsigned long)buf_fx % 64)</div><div class='add'>+		fx_only = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * For 32-bit frames with fxstate, copy the fxstate so it can be</div><div class='add'>+	 * reconstructed later.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ia32_fxstate) {</div><div class='add'>+		ret = __copy_from_user(&amp;env, buf, sizeof(env));</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='add'>+		envp = &amp;env;</div><div class='add'>+	} else {</div><div class='ctx'> 		/*</div><div class='del'>-		 * For 32-bit frames with fxstate, copy the user state to the</div><div class='del'>-		 * thread's fpu state, reconstruct fxstate from the fsave</div><div class='del'>-		 * header. Validate and sanitize the copied state.</div><div class='add'>+		 * Attempt to restore the FPU registers directly from user</div><div class='add'>+		 * memory. For that to succeed, the user access cannot cause</div><div class='add'>+		 * page faults. If it does, fall back to the slow path below,</div><div class='add'>+		 * going through the kernel buffer with the enabled pagefault</div><div class='add'>+		 * handler.</div><div class='ctx'> 		 */</div><div class='del'>-		struct user_i387_ia32_struct env;</div><div class='del'>-		int err = 0;</div><div class='add'>+		fpregs_lock();</div><div class='add'>+		pagefault_disable();</div><div class='add'>+		ret = copy_user_to_fpregs_zeroing(buf_fx, xfeatures, fx_only);</div><div class='add'>+		pagefault_enable();</div><div class='add'>+		if (!ret) {</div><div class='add'>+			fpregs_mark_activate();</div><div class='add'>+			fpregs_unlock();</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		fpregs_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Drop the current fpu which clears fpu-&gt;initialized. This ensures</div><div class='del'>-		 * that any context-switch during the copy of the new state,</div><div class='del'>-		 * avoids the intermediate state from getting restored/saved.</div><div class='del'>-		 * Thus avoiding the new restored state from getting corrupted.</div><div class='del'>-		 * We will be ready to restore/save the state only after</div><div class='del'>-		 * fpu-&gt;initialized is again set.</div><div class='del'>-		 */</div><div class='del'>-		fpu__drop(fpu);</div><div class='add'>+</div><div class='add'>+	if (use_xsave() &amp;&amp; !fx_only) {</div><div class='add'>+		u64 init_bv = xfeatures_mask &amp; ~xfeatures;</div><div class='ctx'> </div><div class='ctx'> 		if (using_compacted_format()) {</div><div class='del'>-			err = copy_user_to_xstate(&amp;fpu-&gt;state.xsave, buf_fx);</div><div class='add'>+			ret = copy_user_to_xstate(&amp;fpu-&gt;state.xsave, buf_fx);</div><div class='ctx'> 		} else {</div><div class='del'>-			err = __copy_from_user(&amp;fpu-&gt;state.xsave, buf_fx, state_size);</div><div class='add'>+			ret = __copy_from_user(&amp;fpu-&gt;state.xsave, buf_fx, state_size);</div><div class='ctx'> </div><div class='del'>-			if (!err &amp;&amp; state_size &gt; offsetof(struct xregs_state, header))</div><div class='del'>-				err = validate_xstate_header(&amp;fpu-&gt;state.xsave.header);</div><div class='add'>+			if (!ret &amp;&amp; state_size &gt; offsetof(struct xregs_state, header))</div><div class='add'>+				ret = validate_xstate_header(&amp;fpu-&gt;state.xsave.header);</div><div class='ctx'> 		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='ctx'> </div><div class='del'>-		if (err || __copy_from_user(&amp;env, buf, sizeof(env))) {</div><div class='del'>-			fpstate_init(&amp;fpu-&gt;state);</div><div class='del'>-			trace_x86_fpu_init_state(fpu);</div><div class='del'>-			err = -1;</div><div class='del'>-		} else {</div><div class='del'>-			sanitize_restored_xstate(tsk, &amp;env, xfeatures, fx_only);</div><div class='add'>+		sanitize_restored_xstate(&amp;fpu-&gt;state, envp, xfeatures, fx_only);</div><div class='add'>+</div><div class='add'>+		fpregs_lock();</div><div class='add'>+		if (unlikely(init_bv))</div><div class='add'>+			copy_kernel_to_xregs(&amp;init_fpstate.xsave, init_bv);</div><div class='add'>+		ret = copy_kernel_to_xregs_err(&amp;fpu-&gt;state.xsave, xfeatures);</div><div class='add'>+</div><div class='add'>+	} else if (use_fxsr()) {</div><div class='add'>+		ret = __copy_from_user(&amp;fpu-&gt;state.fxsave, buf_fx, state_size);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto err_out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		local_bh_disable();</div><div class='del'>-		fpu-&gt;initialized = 1;</div><div class='del'>-		fpu__restore(fpu);</div><div class='del'>-		local_bh_enable();</div><div class='add'>+		sanitize_restored_xstate(&amp;fpu-&gt;state, envp, xfeatures, fx_only);</div><div class='ctx'> </div><div class='del'>-		return err;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * For 64-bit frames and 32-bit fsave frames, restore the user</div><div class='del'>-		 * state to the registers directly (with exceptions handled).</div><div class='del'>-		 */</div><div class='del'>-		user_fpu_begin();</div><div class='del'>-		if (copy_user_to_fpregs_zeroing(buf_fx, xfeatures, fx_only)) {</div><div class='del'>-			fpu__clear(fpu);</div><div class='del'>-			return -1;</div><div class='add'>+		fpregs_lock();</div><div class='add'>+		if (use_xsave()) {</div><div class='add'>+			u64 init_bv = xfeatures_mask &amp; ~XFEATURE_MASK_FPSSE;</div><div class='add'>+			copy_kernel_to_xregs(&amp;init_fpstate.xsave, init_bv);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ret = copy_kernel_to_fxregs_err(&amp;fpu-&gt;state.fxsave);</div><div class='add'>+	} else {</div><div class='add'>+		ret = __copy_from_user(&amp;fpu-&gt;state.fsave, buf_fx, state_size);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_out;</div><div class='add'>+</div><div class='add'>+		fpregs_lock();</div><div class='add'>+		ret = copy_kernel_to_fregs_err(&amp;fpu-&gt;state.fsave);</div><div class='ctx'> 	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		fpregs_mark_activate();</div><div class='add'>+	fpregs_unlock();</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+err_out:</div><div class='add'>+	if (ret)</div><div class='add'>+		fpu__clear(fpu);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int xstate_sigframe_size(void)</div><div class='head'>diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c<br/>index d7432c2b1051..9c459fd1d38e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/xstate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/fpu/xstate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/fpu/xstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/fpu/xstate.c</a></div><div class='hunk'>@@ -805,20 +805,18 @@ void fpu__resume_cpu(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Given an xstate feature mask, calculate where in the xsave</div><div class='add'>+ * Given an xstate feature nr, calculate where in the xsave</div><div class='ctx'>  * buffer the state is.  Callers should ensure that the buffer</div><div class='ctx'>  * is valid.</div><div class='ctx'>  */</div><div class='del'>-static void *__raw_xsave_addr(struct xregs_state *xsave, int xstate_feature_mask)</div><div class='add'>+static void *__raw_xsave_addr(struct xregs_state *xsave, int xfeature_nr)</div><div class='ctx'> {</div><div class='del'>-	int feature_nr = fls64(xstate_feature_mask) - 1;</div><div class='del'>-</div><div class='del'>-	if (!xfeature_enabled(feature_nr)) {</div><div class='add'>+	if (!xfeature_enabled(xfeature_nr)) {</div><div class='ctx'> 		WARN_ON_FPU(1);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (void *)xsave + xstate_comp_offsets[feature_nr];</div><div class='add'>+	return (void *)xsave + xstate_comp_offsets[xfeature_nr];</div><div class='ctx'> }</div><div class='ctx'> /*</div><div class='ctx'>  * Given the xsave area and a state inside, this function returns the</div><div class='hunk'>@@ -832,13 +830,13 @@ static void *__raw_xsave_addr(struct xregs_state *xsave, int xstate_feature_mask</div><div class='ctx'>  *</div><div class='ctx'>  * Inputs:</div><div class='ctx'>  *	xstate: the thread's storage area for all FPU data</div><div class='del'>- *	xstate_feature: state which is defined in xsave.h (e.g.</div><div class='del'>- *	XFEATURE_MASK_FP, XFEATURE_MASK_SSE, etc...)</div><div class='add'>+ *	xfeature_nr: state which is defined in xsave.h (e.g. XFEATURE_FP,</div><div class='add'>+ *	XFEATURE_SSE, etc...)</div><div class='ctx'>  * Output:</div><div class='ctx'>  *	address of the state in the xsave area, or NULL if the</div><div class='ctx'>  *	field is not present in the xsave buffer.</div><div class='ctx'>  */</div><div class='del'>-void *get_xsave_addr(struct xregs_state *xsave, int xstate_feature)</div><div class='add'>+void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do we even *have* xsave state?</div><div class='hunk'>@@ -851,11 +849,11 @@ void *get_xsave_addr(struct xregs_state *xsave, int xstate_feature)</div><div class='ctx'> 	 * have not enabled.  Remember that pcntxt_mask is</div><div class='ctx'> 	 * what we write to the XCR0 register.</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ONCE(!(xfeatures_mask &amp; xstate_feature),</div><div class='add'>+	WARN_ONCE(!(xfeatures_mask &amp; BIT_ULL(xfeature_nr)),</div><div class='ctx'> 		  "get of unsupported state");</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This assumes the last 'xsave*' instruction to</div><div class='del'>-	 * have requested that 'xstate_feature' be saved.</div><div class='add'>+	 * have requested that 'xfeature_nr' be saved.</div><div class='ctx'> 	 * If it did not, we might be seeing and old value</div><div class='ctx'> 	 * of the field in the buffer.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -864,10 +862,10 @@ void *get_xsave_addr(struct xregs_state *xsave, int xstate_feature)</div><div class='ctx'> 	 * or because the "init optimization" caused it</div><div class='ctx'> 	 * to not be saved.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(xsave-&gt;header.xfeatures &amp; xstate_feature))</div><div class='add'>+	if (!(xsave-&gt;header.xfeatures &amp; BIT_ULL(xfeature_nr)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return __raw_xsave_addr(xsave, xstate_feature);</div><div class='add'>+	return __raw_xsave_addr(xsave, xfeature_nr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(get_xsave_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -882,25 +880,23 @@ EXPORT_SYMBOL_GPL(get_xsave_addr);</div><div class='ctx'>  * Note that this only works on the current task.</div><div class='ctx'>  *</div><div class='ctx'>  * Inputs:</div><div class='del'>- *	@xsave_state: state which is defined in xsave.h (e.g. XFEATURE_MASK_FP,</div><div class='del'>- *	XFEATURE_MASK_SSE, etc...)</div><div class='add'>+ *	@xfeature_nr: state which is defined in xsave.h (e.g. XFEATURE_FP,</div><div class='add'>+ *	XFEATURE_SSE, etc...)</div><div class='ctx'>  * Output:</div><div class='ctx'>  *	address of the state in the xsave area or NULL if the state</div><div class='ctx'>  *	is not present or is in its 'init state'.</div><div class='ctx'>  */</div><div class='del'>-const void *get_xsave_field_ptr(int xsave_state)</div><div class='add'>+const void *get_xsave_field_ptr(int xfeature_nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='ctx'> </div><div class='del'>-	if (!fpu-&gt;initialized)</div><div class='del'>-		return NULL;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fpu__save() takes the CPU's xstate registers</div><div class='ctx'> 	 * and saves them off to the 'fpu memory buffer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	fpu__save(fpu);</div><div class='ctx'> </div><div class='del'>-	return get_xsave_addr(&amp;fpu-&gt;state.xsave, xsave_state);</div><div class='add'>+	return get_xsave_addr(&amp;fpu-&gt;state.xsave, xfeature_nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_PKEYS</div><div class='hunk'>@@ -1016,7 +1012,7 @@ int copy_xstate_to_kernel(void *kbuf, struct xregs_state *xsave, unsigned int of</div><div class='ctx'> 		 * Copy only in-use xstates:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((header.xfeatures &gt;&gt; i) &amp; 1) {</div><div class='del'>-			void *src = __raw_xsave_addr(xsave, 1 &lt;&lt; i);</div><div class='add'>+			void *src = __raw_xsave_addr(xsave, i);</div><div class='ctx'> </div><div class='ctx'> 			offset = xstate_offsets[i];</div><div class='ctx'> 			size = xstate_sizes[i];</div><div class='hunk'>@@ -1102,7 +1098,7 @@ int copy_xstate_to_user(void __user *ubuf, struct xregs_state *xsave, unsigned i</div><div class='ctx'> 		 * Copy only in-use xstates:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((header.xfeatures &gt;&gt; i) &amp; 1) {</div><div class='del'>-			void *src = __raw_xsave_addr(xsave, 1 &lt;&lt; i);</div><div class='add'>+			void *src = __raw_xsave_addr(xsave, i);</div><div class='ctx'> </div><div class='ctx'> 			offset = xstate_offsets[i];</div><div class='ctx'> 			size = xstate_sizes[i];</div><div class='hunk'>@@ -1159,7 +1155,7 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf)</div><div class='ctx'> 		u64 mask = ((u64)1 &lt;&lt; i);</div><div class='ctx'> </div><div class='ctx'> 		if (hdr.xfeatures &amp; mask) {</div><div class='del'>-			void *dst = __raw_xsave_addr(xsave, 1 &lt;&lt; i);</div><div class='add'>+			void *dst = __raw_xsave_addr(xsave, i);</div><div class='ctx'> </div><div class='ctx'> 			offset = xstate_offsets[i];</div><div class='ctx'> 			size = xstate_sizes[i];</div><div class='hunk'>@@ -1213,7 +1209,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)</div><div class='ctx'> 		u64 mask = ((u64)1 &lt;&lt; i);</div><div class='ctx'> </div><div class='ctx'> 		if (hdr.xfeatures &amp; mask) {</div><div class='del'>-			void *dst = __raw_xsave_addr(xsave, 1 &lt;&lt; i);</div><div class='add'>+			void *dst = __raw_xsave_addr(xsave, i);</div><div class='ctx'> </div><div class='ctx'> 			offset = xstate_offsets[i];</div><div class='ctx'> 			size = xstate_sizes[i];</div><div class='head'>diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c<br/>index ef49517f6bb2..0caf8122d680 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/ftrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/ftrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/ftrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/ftrace.c</a></div><div class='hunk'>@@ -678,12 +678,8 @@ static inline void *alloc_tramp(unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return module_alloc(size);</div><div class='ctx'> }</div><div class='del'>-static inline void tramp_free(void *tramp, int size)</div><div class='add'>+static inline void tramp_free(void *tramp)</div><div class='ctx'> {</div><div class='del'>-	int npages = PAGE_ALIGN(size) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	set_memory_nx((unsigned long)tramp, npages);</div><div class='del'>-	set_memory_rw((unsigned long)tramp, npages);</div><div class='ctx'> 	module_memfree(tramp);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -692,7 +688,7 @@ static inline void *alloc_tramp(unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-static inline void tramp_free(void *tramp, int size) { }</div><div class='add'>+static inline void tramp_free(void *tramp) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Defined as markers to the end of the ftrace default trampolines */</div><div class='hunk'>@@ -730,6 +726,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)</div><div class='ctx'> 	unsigned long end_offset;</div><div class='ctx'> 	unsigned long op_offset;</div><div class='ctx'> 	unsigned long offset;</div><div class='add'>+	unsigned long npages;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	unsigned long retq;</div><div class='ctx'> 	unsigned long *ptr;</div><div class='hunk'>@@ -762,6 +759,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	*tramp_size = size + RET_SIZE + sizeof(void *);</div><div class='add'>+	npages = DIV_ROUND_UP(*tramp_size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy ftrace_caller onto the trampoline memory */</div><div class='ctx'> 	ret = probe_kernel_read(trampoline, (void *)start_offset, size);</div><div class='hunk'>@@ -806,9 +804,17 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)</div><div class='ctx'> 	/* ALLOC_TRAMP flags lets us know we created it */</div><div class='ctx'> 	ops-&gt;flags |= FTRACE_OPS_FL_ALLOC_TRAMP;</div><div class='ctx'> </div><div class='add'>+	set_vm_flush_reset_perms(trampoline);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Module allocation needs to be completed by making the page</div><div class='add'>+	 * executable. The page is still writable, which is a security hazard,</div><div class='add'>+	 * but anyhow ftrace breaks W^X completely.</div><div class='add'>+	 */</div><div class='add'>+	set_memory_x((unsigned long)trampoline, npages);</div><div class='ctx'> 	return (unsigned long)trampoline;</div><div class='ctx'> fail:</div><div class='del'>-	tramp_free(trampoline, *tramp_size);</div><div class='add'>+	tramp_free(trampoline);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -939,7 +945,7 @@ void arch_ftrace_trampoline_free(struct ftrace_ops *ops)</div><div class='ctx'> 	if (!ops || !(ops-&gt;flags &amp; FTRACE_OPS_FL_ALLOC_TRAMP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tramp_free((void *)ops-&gt;trampoline, ops-&gt;trampoline_size);</div><div class='add'>+	tramp_free((void *)ops-&gt;trampoline);</div><div class='ctx'> 	ops-&gt;trampoline = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S<br/>index d1dbe8e4eb82..bcd206c8ac90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/head_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/head_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/head_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/head_64.S</a></div><div class='hunk'>@@ -265,7 +265,7 @@ ENDPROC(start_cpu0)</div><div class='ctx'> 	GLOBAL(initial_code)</div><div class='ctx'> 	.quad	x86_64_start_kernel</div><div class='ctx'> 	GLOBAL(initial_gs)</div><div class='del'>-	.quad	INIT_PER_CPU_VAR(irq_stack_union)</div><div class='add'>+	.quad	INIT_PER_CPU_VAR(fixed_percpu_data)</div><div class='ctx'> 	GLOBAL(initial_stack)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The SIZEOF_PTREGS gap is a convention which helps the in-kernel</div><div class='head'>diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c<br/>index dfd3aca82c61..fb32925a2e62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/hpet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/hpet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/hpet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/hpet.c</a></div><div class='hunk'>@@ -905,6 +905,8 @@ int __init hpet_enable(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	hpet_set_mapping();</div><div class='add'>+	if (!hpet_virt_address)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read the period and check for a sane value:</div><div class='head'>diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c<br/>index ff9bfd40429e..d73083021002 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/hw_breakpoint.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/hw_breakpoint.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/hw_breakpoint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/hw_breakpoint.c</a></div><div class='hunk'>@@ -354,6 +354,7 @@ int hw_breakpoint_arch_parse(struct perf_event *bp,</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c<br/>index 01adea278a71..6d8917875f44 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/idt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/idt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/idt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/idt.c</a></div><div class='hunk'>@@ -41,13 +41,12 @@ struct idt_data {</div><div class='ctx'> #define SYSG(_vector, _addr)				\</div><div class='ctx'> 	G(_vector, _addr, DEFAULT_STACK, GATE_INTERRUPT, DPL3, __KERNEL_CS)</div><div class='ctx'> </div><div class='del'>-/* Interrupt gate with interrupt stack */</div><div class='add'>+/*</div><div class='add'>+ * Interrupt gate with interrupt stack. The _ist index is the index in</div><div class='add'>+ * the tss.ist[] array, but for the descriptor it needs to start at 1.</div><div class='add'>+ */</div><div class='ctx'> #define ISTG(_vector, _addr, _ist)			\</div><div class='del'>-	G(_vector, _addr, _ist, GATE_INTERRUPT, DPL0, __KERNEL_CS)</div><div class='del'>-</div><div class='del'>-/* System interrupt gate with interrupt stack */</div><div class='del'>-#define SISTG(_vector, _addr, _ist)			\</div><div class='del'>-	G(_vector, _addr, _ist, GATE_INTERRUPT, DPL3, __KERNEL_CS)</div><div class='add'>+	G(_vector, _addr, _ist + 1, GATE_INTERRUPT, DPL0, __KERNEL_CS)</div><div class='ctx'> </div><div class='ctx'> /* Task gate */</div><div class='ctx'> #define TSKG(_vector, _gdt)				\</div><div class='hunk'>@@ -184,11 +183,11 @@ gate_desc debug_idt_table[IDT_ENTRIES] __page_aligned_bss;</div><div class='ctx'>  * cpu_init() when the TSS has been initialized.</div><div class='ctx'>  */</div><div class='ctx'> static const __initconst struct idt_data ist_idts[] = {</div><div class='del'>-	ISTG(X86_TRAP_DB,	debug,		DEBUG_STACK),</div><div class='del'>-	ISTG(X86_TRAP_NMI,	nmi,		NMI_STACK),</div><div class='del'>-	ISTG(X86_TRAP_DF,	double_fault,	DOUBLEFAULT_STACK),</div><div class='add'>+	ISTG(X86_TRAP_DB,	debug,		IST_INDEX_DB),</div><div class='add'>+	ISTG(X86_TRAP_NMI,	nmi,		IST_INDEX_NMI),</div><div class='add'>+	ISTG(X86_TRAP_DF,	double_fault,	IST_INDEX_DF),</div><div class='ctx'> #ifdef CONFIG_X86_MCE</div><div class='del'>-	ISTG(X86_TRAP_MC,	&amp;machine_check,	MCE_STACK),</div><div class='add'>+	ISTG(X86_TRAP_MC,	&amp;machine_check,	IST_INDEX_MCE),</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c<br/>index 95600a99ae93..fc34816c6f04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/irq_32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/irq_32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/irq_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/irq_32.c</a></div><div class='hunk'>@@ -51,8 +51,8 @@ static inline int check_stack_overflow(void) { return 0; }</div><div class='ctx'> static inline void print_stack_overflow(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct irq_stack *, hardirq_stack);</div><div class='del'>-DEFINE_PER_CPU(struct irq_stack *, softirq_stack);</div><div class='add'>+DEFINE_PER_CPU(struct irq_stack *, hardirq_stack_ptr);</div><div class='add'>+DEFINE_PER_CPU(struct irq_stack *, softirq_stack_ptr);</div><div class='ctx'> </div><div class='ctx'> static void call_on_stack(void *func, void *stack)</div><div class='ctx'> {</div><div class='hunk'>@@ -76,7 +76,7 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc)</div><div class='ctx'> 	u32 *isp, *prev_esp, arg1;</div><div class='ctx'> </div><div class='ctx'> 	curstk = (struct irq_stack *) current_stack();</div><div class='del'>-	irqstk = __this_cpu_read(hardirq_stack);</div><div class='add'>+	irqstk = __this_cpu_read(hardirq_stack_ptr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * this is where we switch to the IRQ stack. However, if we are</div><div class='hunk'>@@ -107,27 +107,28 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * allocate per-cpu stacks for hardirq and for softirq processing</div><div class='add'>+ * Allocate per-cpu stacks for hardirq and softirq processing</div><div class='ctx'>  */</div><div class='del'>-void irq_ctx_init(int cpu)</div><div class='add'>+int irq_init_percpu_irqstack(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct irq_stack *irqstk;</div><div class='del'>-</div><div class='del'>-	if (per_cpu(hardirq_stack, cpu))</div><div class='del'>-		return;</div><div class='add'>+	int node = cpu_to_node(cpu);</div><div class='add'>+	struct page *ph, *ps;</div><div class='ctx'> </div><div class='del'>-	irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),</div><div class='del'>-					       THREADINFO_GFP,</div><div class='del'>-					       THREAD_SIZE_ORDER));</div><div class='del'>-	per_cpu(hardirq_stack, cpu) = irqstk;</div><div class='add'>+	if (per_cpu(hardirq_stack_ptr, cpu))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),</div><div class='del'>-					       THREADINFO_GFP,</div><div class='del'>-					       THREAD_SIZE_ORDER));</div><div class='del'>-	per_cpu(softirq_stack, cpu) = irqstk;</div><div class='add'>+	ph = alloc_pages_node(node, THREADINFO_GFP, THREAD_SIZE_ORDER);</div><div class='add'>+	if (!ph)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ps = alloc_pages_node(node, THREADINFO_GFP, THREAD_SIZE_ORDER);</div><div class='add'>+	if (!ps) {</div><div class='add'>+		__free_pages(ph, THREAD_SIZE_ORDER);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",</div><div class='del'>-	       cpu, per_cpu(hardirq_stack, cpu),  per_cpu(softirq_stack, cpu));</div><div class='add'>+	per_cpu(hardirq_stack_ptr, cpu) = page_address(ph);</div><div class='add'>+	per_cpu(softirq_stack_ptr, cpu) = page_address(ps);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void do_softirq_own_stack(void)</div><div class='hunk'>@@ -135,7 +136,7 @@ void do_softirq_own_stack(void)</div><div class='ctx'> 	struct irq_stack *irqstk;</div><div class='ctx'> 	u32 *isp, *prev_esp;</div><div class='ctx'> </div><div class='del'>-	irqstk = __this_cpu_read(softirq_stack);</div><div class='add'>+	irqstk = __this_cpu_read(softirq_stack_ptr);</div><div class='ctx'> </div><div class='ctx'> 	/* build the stack frame on the softirq stack */</div><div class='ctx'> 	isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));</div><div class='head'>diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c<br/>index 0469cd078db1..6bf6517a05bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/irq_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/irq_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/irq_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/irq_64.c</a></div><div class='hunk'>@@ -18,63 +18,64 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpu_entry_area.h&gt;</div><div class='ctx'> #include &lt;asm/io_apic.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> </div><div class='del'>-int sysctl_panic_on_stackoverflow;</div><div class='add'>+DEFINE_PER_CPU_PAGE_ALIGNED(struct irq_stack, irq_stack_backing_store) __visible;</div><div class='add'>+DECLARE_INIT_PER_CPU(irq_stack_backing_store);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Probabilistic stack overflow check:</div><div class='del'>- *</div><div class='del'>- * Only check the stack in process context, because everything else</div><div class='del'>- * runs on the big interrupt stacks. Checking reliably is too expensive,</div><div class='del'>- * so we just check from interrupts.</div><div class='del'>- */</div><div class='del'>-static inline void stack_overflow_check(struct pt_regs *regs)</div><div class='add'>+bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='del'>-#define STACK_TOP_MARGIN	128</div><div class='del'>-	struct orig_ist *oist;</div><div class='del'>-	u64 irq_stack_top, irq_stack_bottom;</div><div class='del'>-	u64 estack_top, estack_bottom;</div><div class='del'>-	u64 curbase = (u64)task_stack_page(current);</div><div class='add'>+	if (IS_ERR_OR_NULL(desc))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	if (user_mode(regs))</div><div class='del'>-		return;</div><div class='add'>+	generic_handle_irq_desc(desc);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (regs-&gt;sp &gt;= curbase + sizeof(struct pt_regs) + STACK_TOP_MARGIN &amp;&amp;</div><div class='del'>-	    regs-&gt;sp &lt;= curbase + THREAD_SIZE)</div><div class='del'>-		return;</div><div class='add'>+#ifdef CONFIG_VMAP_STACK</div><div class='add'>+/*</div><div class='add'>+ * VMAP the backing store with guard pages</div><div class='add'>+ */</div><div class='add'>+static int map_irq_stack(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	char *stack = (char *)per_cpu_ptr(&amp;irq_stack_backing_store, cpu);</div><div class='add'>+	struct page *pages[IRQ_STACK_SIZE / PAGE_SIZE];</div><div class='add'>+	void *va;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	irq_stack_top = (u64)this_cpu_ptr(irq_stack_union.irq_stack) +</div><div class='del'>-			STACK_TOP_MARGIN;</div><div class='del'>-	irq_stack_bottom = (u64)__this_cpu_read(irq_stack_ptr);</div><div class='del'>-	if (regs-&gt;sp &gt;= irq_stack_top &amp;&amp; regs-&gt;sp &lt;= irq_stack_bottom)</div><div class='del'>-		return;</div><div class='add'>+	for (i = 0; i &lt; IRQ_STACK_SIZE / PAGE_SIZE; i++) {</div><div class='add'>+		phys_addr_t pa = per_cpu_ptr_to_phys(stack + (i &lt;&lt; PAGE_SHIFT));</div><div class='ctx'> </div><div class='del'>-	oist = this_cpu_ptr(&amp;orig_ist);</div><div class='del'>-	estack_top = (u64)oist-&gt;ist[0] - EXCEPTION_STKSZ + STACK_TOP_MARGIN;</div><div class='del'>-	estack_bottom = (u64)oist-&gt;ist[N_EXCEPTION_STACKS - 1];</div><div class='del'>-	if (regs-&gt;sp &gt;= estack_top &amp;&amp; regs-&gt;sp &lt;= estack_bottom)</div><div class='del'>-		return;</div><div class='add'>+		pages[i] = pfn_to_page(pa &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	WARN_ONCE(1, "do_IRQ(): %s has overflown the kernel stack (cur:%Lx,sp:%lx,irq stk top-bottom:%Lx-%Lx,exception stk top-bottom:%Lx-%Lx,ip:%pF)\n",</div><div class='del'>-		current-&gt;comm, curbase, regs-&gt;sp,</div><div class='del'>-		irq_stack_top, irq_stack_bottom,</div><div class='del'>-		estack_top, estack_bottom, (void *)regs-&gt;ip);</div><div class='add'>+	va = vmap(pages, IRQ_STACK_SIZE / PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL);</div><div class='add'>+	if (!va)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (sysctl_panic_on_stackoverflow)</div><div class='del'>-		panic("low stack detected by irq handler - check messages\n");</div><div class='del'>-#endif</div><div class='add'>+	per_cpu(hardirq_stack_ptr, cpu) = va + IRQ_STACK_SIZE;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)</div><div class='add'>+#else</div><div class='add'>+/*</div><div class='add'>+ * If VMAP stacks are disabled due to KASAN, just use the per cpu</div><div class='add'>+ * backing store without guard pages.</div><div class='add'>+ */</div><div class='add'>+static int map_irq_stack(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	stack_overflow_check(regs);</div><div class='add'>+	void *va = per_cpu_ptr(&amp;irq_stack_backing_store, cpu);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_OR_NULL(desc))</div><div class='del'>-		return false;</div><div class='add'>+	per_cpu(hardirq_stack_ptr, cpu) = va + IRQ_STACK_SIZE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	generic_handle_irq_desc(desc);</div><div class='del'>-	return true;</div><div class='add'>+int irq_init_percpu_irqstack(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	if (per_cpu(hardirq_stack_ptr, cpu))</div><div class='add'>+		return 0;</div><div class='add'>+	return map_irq_stack(cpu);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c<br/>index a0693b71cfc1..16919a9671fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/irqinit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/irqinit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/irqinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/irqinit.c</a></div><div class='hunk'>@@ -91,6 +91,8 @@ void __init init_IRQ(void)</div><div class='ctx'> 	for (i = 0; i &lt; nr_legacy_irqs(); i++)</div><div class='ctx'> 		per_cpu(vector_irq, 0)[ISA_IRQ_VECTOR(i)] = irq_to_desc(i);</div><div class='ctx'> </div><div class='add'>+	BUG_ON(irq_init_percpu_irqstack(smp_processor_id()));</div><div class='add'>+</div><div class='ctx'> 	x86_init.irqs.intr_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +106,4 @@ void __init native_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_ioapic &amp;&amp; !of_ioapic &amp;&amp; nr_legacy_irqs())</div><div class='ctx'> 		setup_irq(2, &amp;irq2);</div><div class='del'>-</div><div class='del'>-	irq_ctx_init(smp_processor_id());</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c<br/>index f99bd26bd3f1..e631c358f7f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/jump_label.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/jump_label.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/jump_label.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/jump_label.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@ static void bug_at(unsigned char *ip, int line)</div><div class='ctx'> </div><div class='ctx'> static void __ref __jump_label_transform(struct jump_entry *entry,</div><div class='ctx'> 					 enum jump_label_type type,</div><div class='del'>-					 void *(*poker)(void *, const void *, size_t),</div><div class='ctx'> 					 int init)</div><div class='ctx'> {</div><div class='ctx'> 	union jump_code_union jmp;</div><div class='hunk'>@@ -50,9 +49,6 @@ static void __ref __jump_label_transform(struct jump_entry *entry,</div><div class='ctx'> 	jmp.offset = jump_entry_target(entry) -</div><div class='ctx'> 		     (jump_entry_code(entry) + JUMP_LABEL_NOP_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (early_boot_irqs_disabled)</div><div class='del'>-		poker = text_poke_early;</div><div class='del'>-</div><div class='ctx'> 	if (type == JUMP_LABEL_JMP) {</div><div class='ctx'> 		if (init) {</div><div class='ctx'> 			expect = default_nop; line = __LINE__;</div><div class='hunk'>@@ -75,16 +71,19 @@ static void __ref __jump_label_transform(struct jump_entry *entry,</div><div class='ctx'> 		bug_at((void *)jump_entry_code(entry), line);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Make text_poke_bp() a default fallback poker.</div><div class='add'>+	 * As long as only a single processor is running and the code is still</div><div class='add'>+	 * not marked as RO, text_poke_early() can be used; Checking that</div><div class='add'>+	 * system_state is SYSTEM_BOOTING guarantees it. It will be set to</div><div class='add'>+	 * SYSTEM_SCHEDULING before other cores are awaken and before the</div><div class='add'>+	 * code is write-protected.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * At the time the change is being done, just ignore whether we</div><div class='ctx'> 	 * are doing nop -&gt; jump or jump -&gt; nop transition, and assume</div><div class='ctx'> 	 * always nop being the 'currently valid' instruction</div><div class='del'>-	 *</div><div class='ctx'> 	 */</div><div class='del'>-	if (poker) {</div><div class='del'>-		(*poker)((void *)jump_entry_code(entry), code,</div><div class='del'>-			 JUMP_LABEL_NOP_SIZE);</div><div class='add'>+	if (init || system_state == SYSTEM_BOOTING) {</div><div class='add'>+		text_poke_early((void *)jump_entry_code(entry), code,</div><div class='add'>+				JUMP_LABEL_NOP_SIZE);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -96,7 +95,7 @@ void arch_jump_label_transform(struct jump_entry *entry,</div><div class='ctx'> 			       enum jump_label_type type)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;text_mutex);</div><div class='del'>-	__jump_label_transform(entry, type, NULL, 0);</div><div class='add'>+	__jump_label_transform(entry, type, 0);</div><div class='ctx'> 	mutex_unlock(&amp;text_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -126,5 +125,5 @@ __init_or_module void arch_jump_label_transform_static(struct jump_entry *entry,</div><div class='ctx'> 			jlstate = JL_STATE_NO_UPDATE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (jlstate == JL_STATE_UPDATE)</div><div class='del'>-		__jump_label_transform(entry, type, text_poke_early, 1);</div><div class='add'>+		__jump_label_transform(entry, type, 1);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c<br/>index 4ff6b4cdb941..13b13311b792 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/kgdb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/kgdb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/kgdb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/kgdb.c</a></div><div class='hunk'>@@ -747,7 +747,6 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)</div><div class='ctx'> int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	char opc[BREAK_INSTR_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	bpt-&gt;type = BP_BREAKPOINT;</div><div class='ctx'> 	err = probe_kernel_read(bpt-&gt;saved_instr, (char *)bpt-&gt;bpt_addr,</div><div class='hunk'>@@ -759,18 +758,13 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/*</div><div class='del'>-	 * It is safe to call text_poke() because normal kernel execution</div><div class='add'>+	 * It is safe to call text_poke_kgdb() because normal kernel execution</div><div class='ctx'> 	 * is stopped on all cores, so long as the text_mutex is not locked.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mutex_is_locked(&amp;text_mutex))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	text_poke((void *)bpt-&gt;bpt_addr, arch_kgdb_ops.gdb_bpt_instr,</div><div class='del'>-		  BREAK_INSTR_SIZE);</div><div class='del'>-	err = probe_kernel_read(opc, (char *)bpt-&gt;bpt_addr, BREAK_INSTR_SIZE);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	text_poke_kgdb((void *)bpt-&gt;bpt_addr, arch_kgdb_ops.gdb_bpt_instr,</div><div class='add'>+		       BREAK_INSTR_SIZE);</div><div class='ctx'> 	bpt-&gt;type = BP_POKE_BREAKPOINT;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -778,22 +772,17 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)</div><div class='ctx'> </div><div class='ctx'> int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	char opc[BREAK_INSTR_SIZE];</div><div class='del'>-</div><div class='ctx'> 	if (bpt-&gt;type != BP_POKE_BREAKPOINT)</div><div class='ctx'> 		goto knl_write;</div><div class='ctx'> 	/*</div><div class='del'>-	 * It is safe to call text_poke() because normal kernel execution</div><div class='add'>+	 * It is safe to call text_poke_kgdb() because normal kernel execution</div><div class='ctx'> 	 * is stopped on all cores, so long as the text_mutex is not locked.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mutex_is_locked(&amp;text_mutex))</div><div class='ctx'> 		goto knl_write;</div><div class='del'>-	text_poke((void *)bpt-&gt;bpt_addr, bpt-&gt;saved_instr, BREAK_INSTR_SIZE);</div><div class='del'>-	err = probe_kernel_read(opc, (char *)bpt-&gt;bpt_addr, BREAK_INSTR_SIZE);</div><div class='del'>-	if (err || memcmp(opc, bpt-&gt;saved_instr, BREAK_INSTR_SIZE))</div><div class='del'>-		goto knl_write;</div><div class='del'>-	return err;</div><div class='add'>+	text_poke_kgdb((void *)bpt-&gt;bpt_addr, bpt-&gt;saved_instr,</div><div class='add'>+		       BREAK_INSTR_SIZE);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> knl_write:</div><div class='ctx'> 	return probe_kernel_write((char *)bpt-&gt;bpt_addr,</div><div class='head'>diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c<br/>index a034cb808e7e..cf52ee0d8711 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/kprobes/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/kprobes/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/kprobes/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/kprobes/core.c</a></div><div class='hunk'>@@ -431,8 +431,21 @@ void *alloc_insn_page(void)</div><div class='ctx'> 	void *page;</div><div class='ctx'> </div><div class='ctx'> 	page = module_alloc(PAGE_SIZE);</div><div class='del'>-	if (page)</div><div class='del'>-		set_memory_ro((unsigned long)page &amp; PAGE_MASK, 1);</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	set_vm_flush_reset_perms(page);</div><div class='add'>+	/*</div><div class='add'>+	 * First make the page read-only, and only then make it executable to</div><div class='add'>+	 * prevent it from being W+X in between.</div><div class='add'>+	 */</div><div class='add'>+	set_memory_ro((unsigned long)page, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: Once additional kernel code protection mechanisms are set, ensure</div><div class='add'>+	 * that the page was not maliciously altered and it is still zeroed.</div><div class='add'>+	 */</div><div class='add'>+	set_memory_x((unsigned long)page, 1);</div><div class='ctx'> </div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='hunk'>@@ -440,8 +453,6 @@ void *alloc_insn_page(void)</div><div class='ctx'> /* Recover page to RW mode before releasing it */</div><div class='ctx'> void free_insn_page(void *page)</div><div class='ctx'> {</div><div class='del'>-	set_memory_nx((unsigned long)page &amp; PAGE_MASK, 1);</div><div class='del'>-	set_memory_rw((unsigned long)page &amp; PAGE_MASK, 1);</div><div class='ctx'> 	module_memfree(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,6 +580,7 @@ void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)</div><div class='ctx'> 	unsigned long *sara = stack_addr(regs);</div><div class='ctx'> </div><div class='ctx'> 	ri-&gt;ret_addr = (kprobe_opcode_t *) *sara;</div><div class='add'>+	ri-&gt;fp = sara;</div><div class='ctx'> </div><div class='ctx'> 	/* Replace the return addr with trampoline addr */</div><div class='ctx'> 	*sara = (unsigned long) &amp;kretprobe_trampoline;</div><div class='hunk'>@@ -715,6 +727,7 @@ NOKPROBE_SYMBOL(kprobe_int3_handler);</div><div class='ctx'>  * calls trampoline_handler() runs, which calls the kretprobe's handler.</div><div class='ctx'>  */</div><div class='ctx'> asm(</div><div class='add'>+	".text\n"</div><div class='ctx'> 	".global kretprobe_trampoline\n"</div><div class='ctx'> 	".type kretprobe_trampoline, @function\n"</div><div class='ctx'> 	"kretprobe_trampoline:\n"</div><div class='hunk'>@@ -748,26 +761,48 @@ asm(</div><div class='ctx'> NOKPROBE_SYMBOL(kretprobe_trampoline);</div><div class='ctx'> STACK_FRAME_NON_STANDARD(kretprobe_trampoline);</div><div class='ctx'> </div><div class='add'>+static struct kprobe kretprobe_kprobe = {</div><div class='add'>+	.addr = (void *)kretprobe_trampoline,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Called from kretprobe_trampoline</div><div class='ctx'>  */</div><div class='ctx'> static __used void *trampoline_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	struct kprobe_ctlblk *kcb;</div><div class='ctx'> 	struct kretprobe_instance *ri = NULL;</div><div class='ctx'> 	struct hlist_head *head, empty_rp;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> 	unsigned long flags, orig_ret_address = 0;</div><div class='ctx'> 	unsigned long trampoline_address = (unsigned long)&amp;kretprobe_trampoline;</div><div class='ctx'> 	kprobe_opcode_t *correct_ret_addr = NULL;</div><div class='add'>+	void *frame_pointer;</div><div class='add'>+	bool skipped = false;</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set a dummy kprobe for avoiding kretprobe recursion.</div><div class='add'>+	 * Since kretprobe never run in kprobe handler, kprobe must not</div><div class='add'>+	 * be running at this point.</div><div class='add'>+	 */</div><div class='add'>+	kcb = get_kprobe_ctlblk();</div><div class='add'>+	__this_cpu_write(current_kprobe, &amp;kretprobe_kprobe);</div><div class='add'>+	kcb-&gt;kprobe_status = KPROBE_HIT_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;empty_rp);</div><div class='ctx'> 	kretprobe_hash_lock(current, &amp;head, &amp;flags);</div><div class='ctx'> 	/* fixup registers */</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	regs-&gt;cs = __KERNEL_CS;</div><div class='add'>+	/* On x86-64, we use pt_regs-&gt;sp for return address holder. */</div><div class='add'>+	frame_pointer = &amp;regs-&gt;sp;</div><div class='ctx'> #else</div><div class='ctx'> 	regs-&gt;cs = __KERNEL_CS | get_kernel_rpl();</div><div class='ctx'> 	regs-&gt;gs = 0;</div><div class='add'>+	/* On x86-32, we use pt_regs-&gt;flags for return address holder. */</div><div class='add'>+	frame_pointer = &amp;regs-&gt;flags;</div><div class='ctx'> #endif</div><div class='ctx'> 	regs-&gt;ip = trampoline_address;</div><div class='ctx'> 	regs-&gt;orig_ax = ~0UL;</div><div class='hunk'>@@ -789,8 +824,25 @@ static __used void *trampoline_handler(struct pt_regs *regs)</div><div class='ctx'> 		if (ri-&gt;task != current)</div><div class='ctx'> 			/* another task is sharing our hash bucket */</div><div class='ctx'> 			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Return probes must be pushed on this hash list correct</div><div class='add'>+		 * order (same as return order) so that it can be poped</div><div class='add'>+		 * correctly. However, if we find it is pushed it incorrect</div><div class='add'>+		 * order, this means we find a function which should not be</div><div class='add'>+		 * probed, because the wrong order entry is pushed on the</div><div class='add'>+		 * path of processing other kretprobe itself.</div><div class='add'>+		 */</div><div class='add'>+		if (ri-&gt;fp != frame_pointer) {</div><div class='add'>+			if (!skipped)</div><div class='add'>+				pr_warn("kretprobe is stacked incorrectly. Trying to fixup.\n");</div><div class='add'>+			skipped = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		orig_ret_address = (unsigned long)ri-&gt;ret_addr;</div><div class='add'>+		if (skipped)</div><div class='add'>+			pr_warn("%ps must be blacklisted because of incorrect kretprobe order\n",</div><div class='add'>+				ri-&gt;rp-&gt;kp.addr);</div><div class='ctx'> </div><div class='ctx'> 		if (orig_ret_address != trampoline_address)</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -808,14 +860,15 @@ static __used void *trampoline_handler(struct pt_regs *regs)</div><div class='ctx'> 		if (ri-&gt;task != current)</div><div class='ctx'> 			/* another task is sharing our hash bucket */</div><div class='ctx'> 			continue;</div><div class='add'>+		if (ri-&gt;fp != frame_pointer)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		orig_ret_address = (unsigned long)ri-&gt;ret_addr;</div><div class='ctx'> 		if (ri-&gt;rp &amp;&amp; ri-&gt;rp-&gt;handler) {</div><div class='ctx'> 			__this_cpu_write(current_kprobe, &amp;ri-&gt;rp-&gt;kp);</div><div class='del'>-			get_kprobe_ctlblk()-&gt;kprobe_status = KPROBE_HIT_ACTIVE;</div><div class='ctx'> 			ri-&gt;ret_addr = correct_ret_addr;</div><div class='ctx'> 			ri-&gt;rp-&gt;handler(ri, regs);</div><div class='del'>-			__this_cpu_write(current_kprobe, NULL);</div><div class='add'>+			__this_cpu_write(current_kprobe, &amp;kretprobe_kprobe);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		recycle_rp_inst(ri, &amp;empty_rp);</div><div class='hunk'>@@ -831,6 +884,9 @@ static __used void *trampoline_handler(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	kretprobe_hash_unlock(current, &amp;flags);</div><div class='ctx'> </div><div class='add'>+	__this_cpu_write(current_kprobe, NULL);</div><div class='add'>+	preempt_enable();</div><div class='add'>+</div><div class='ctx'> 	hlist_for_each_entry_safe(ri, tmp, &amp;empty_rp, hlist) {</div><div class='ctx'> 		hlist_del(&amp;ri-&gt;hlist);</div><div class='ctx'> 		kfree(ri);</div><div class='head'>diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c<br/>index 5c93a65ee1e5..3f0cc828cc36 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/kvm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/kvm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/kvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/kvm.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static int __init parse_no_stealacc(char *arg)</div><div class='ctx'> early_param("no-steal-acc", parse_no_stealacc);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU_DECRYPTED(struct kvm_vcpu_pv_apf_data, apf_reason) __aligned(64);</div><div class='del'>-static DEFINE_PER_CPU_DECRYPTED(struct kvm_steal_time, steal_time) __aligned(64);</div><div class='add'>+DEFINE_PER_CPU_DECRYPTED(struct kvm_steal_time, steal_time) __aligned(64) __visible;</div><div class='ctx'> static int has_steal_clock = 0;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c<br/>index 6135ae8ce036..b2463fcb20a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/ldt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/ldt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/ldt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/ldt.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static void do_sanity_check(struct mm_struct *mm,</div><div class='ctx'> 		 * tables.</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON(!had_kernel_mapping);</div><div class='del'>-		if (static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+		if (boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 			WARN_ON(!had_user_mapping);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -121,7 +121,7 @@ static void do_sanity_check(struct mm_struct *mm,</div><div class='ctx'> 		 * Sync the pgd to the usermode tables.</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON(had_kernel_mapping);</div><div class='del'>-		if (static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+		if (boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 			WARN_ON(had_user_mapping);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -156,7 +156,7 @@ static void map_ldt_struct_to_user(struct mm_struct *mm)</div><div class='ctx'> 	k_pmd = pgd_to_pmd_walk(k_pgd, LDT_BASE_ADDR);</div><div class='ctx'> 	u_pmd = pgd_to_pmd_walk(u_pgd, LDT_BASE_ADDR);</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_PTI) &amp;&amp; !mm-&gt;context.ldt)</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_PTI) &amp;&amp; !mm-&gt;context.ldt)</div><div class='ctx'> 		set_pmd(u_pmd, *k_pmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +181,7 @@ static void map_ldt_struct_to_user(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pgd = pgd_offset(mm, LDT_BASE_ADDR);</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_PTI) &amp;&amp; !mm-&gt;context.ldt)</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_PTI) &amp;&amp; !mm-&gt;context.ldt)</div><div class='ctx'> 		set_pgd(kernel_to_user_pgdp(pgd), *pgd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +208,7 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)</div><div class='ctx'> 	spinlock_t *ptl;</div><div class='ctx'> 	int i, nr_pages;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -271,7 +271,7 @@ static void unmap_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* LDT map/unmap is only required for PTI */</div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	nr_pages = DIV_ROUND_UP(ldt-&gt;nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE);</div><div class='hunk'>@@ -311,7 +311,7 @@ static void free_ldt_pgtables(struct mm_struct *mm)</div><div class='ctx'> 	unsigned long start = LDT_BASE_ADDR;</div><div class='ctx'> 	unsigned long end = LDT_END_ADDR;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tlb_gather_mmu(&amp;tlb, mm, start, end);</div><div class='head'>diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c<br/>index b052e883dd8c..cfa3106faee4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/module.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/module.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/module.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ void *module_alloc(unsigned long size)</div><div class='ctx'> 	p = __vmalloc_node_range(size, MODULE_ALIGN,</div><div class='ctx'> 				    MODULES_VADDR + get_module_load_offset(),</div><div class='ctx'> 				    MODULES_END, GFP_KERNEL,</div><div class='del'>-				    PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,</div><div class='add'>+				    PAGE_KERNEL, 0, NUMA_NO_NODE,</div><div class='ctx'> 				    __builtin_return_address(0));</div><div class='ctx'> 	if (p &amp;&amp; (kasan_module_alloc(p, size) &lt; 0)) {</div><div class='ctx'> 		vfree(p);</div><div class='head'>diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c<br/>index 3482460d984d..1bfe5c6e6cfe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/mpparse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/mpparse.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/mpparse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/mpparse.c</a></div><div class='hunk'>@@ -598,8 +598,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)</div><div class='ctx'> 			mpf_base = base;</div><div class='ctx'> 			mpf_found = true;</div><div class='ctx'> </div><div class='del'>-			pr_info("found SMP MP-table at [mem %#010lx-%#010lx] mapped at [%p]\n",</div><div class='del'>-				base, base + sizeof(*mpf) - 1, mpf);</div><div class='add'>+			pr_info("found SMP MP-table at [mem %#010lx-%#010lx]\n",</div><div class='add'>+				base, base + sizeof(*mpf) - 1);</div><div class='ctx'> </div><div class='ctx'> 			memblock_reserve(base, sizeof(*mpf));</div><div class='ctx'> 			if (mpf-&gt;physptr)</div><div class='head'>diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c<br/>index 18bc9b51ac9b..3755d0310026 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/nmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/nmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/nmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/nmi.c</a></div><div class='hunk'>@@ -21,13 +21,14 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_EDAC)</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;asm/cpu_entry_area.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/mach_traps.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='hunk'>@@ -487,6 +488,23 @@ static DEFINE_PER_CPU(unsigned long, nmi_cr2);</div><div class='ctx'>  * switch back to the original IDT.</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_PER_CPU(int, update_debug_stack);</div><div class='add'>+</div><div class='add'>+static bool notrace is_debug_stack(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	struct cea_exception_stacks *cs = __this_cpu_read(cea_exception_stacks);</div><div class='add'>+	unsigned long top = CEA_ESTACK_TOP(cs, DB);</div><div class='add'>+	unsigned long bot = CEA_ESTACK_BOT(cs, DB1);</div><div class='add'>+</div><div class='add'>+	if (__this_cpu_read(debug_stack_usage))</div><div class='add'>+		return true;</div><div class='add'>+	/*</div><div class='add'>+	 * Note, this covers the guard page between DB and DB1 as well to</div><div class='add'>+	 * avoid two checks. But by all means @addr can never point into</div><div class='add'>+	 * the guard page.</div><div class='add'>+	 */</div><div class='add'>+	return addr &gt;= bot &amp;&amp; addr &lt; top;</div><div class='add'>+}</div><div class='add'>+NOKPROBE_SYMBOL(is_debug_stack);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> dotraplinkage notrace void</div><div class='head'>diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c<br/>index c0e0101133f3..7bbaa6baf37f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/paravirt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/paravirt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/paravirt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/paravirt.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ DEFINE_STATIC_KEY_TRUE(virt_spin_lock_key);</div><div class='ctx'> </div><div class='ctx'> void __init native_pv_lock_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_HYPERVISOR))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_HYPERVISOR))</div><div class='ctx'> 		static_branch_disable(&amp;virt_spin_lock_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/perf_regs.c b/arch/x86/kernel/perf_regs.c<br/>index c06c4c16c6b6..07c30ee17425 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/perf_regs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/perf_regs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/perf_regs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/perf_regs.c</a></div><div class='hunk'>@@ -59,18 +59,34 @@ static unsigned int pt_regs_offset[PERF_REG_X86_MAX] = {</div><div class='ctx'> </div><div class='ctx'> u64 perf_reg_value(struct pt_regs *regs, int idx)</div><div class='ctx'> {</div><div class='add'>+	struct x86_perf_regs *perf_regs;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= PERF_REG_X86_XMM0 &amp;&amp; idx &lt; PERF_REG_X86_XMM_MAX) {</div><div class='add'>+		perf_regs = container_of(regs, struct x86_perf_regs, regs);</div><div class='add'>+		if (!perf_regs-&gt;xmm_regs)</div><div class='add'>+			return 0;</div><div class='add'>+		return perf_regs-&gt;xmm_regs[idx - PERF_REG_X86_XMM0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON_ONCE(idx &gt;= ARRAY_SIZE(pt_regs_offset)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return regs_get_register(regs, pt_regs_offset[idx]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define REG_RESERVED (~((1ULL &lt;&lt; PERF_REG_X86_MAX) - 1ULL))</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='add'>+#define REG_NOSUPPORT ((1ULL &lt;&lt; PERF_REG_X86_R8) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R9) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R10) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R11) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R12) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R13) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R14) | \</div><div class='add'>+		       (1ULL &lt;&lt; PERF_REG_X86_R15))</div><div class='add'>+</div><div class='ctx'> int perf_reg_validate(u64 mask)</div><div class='ctx'> {</div><div class='del'>-	if (!mask || mask &amp; REG_RESERVED)</div><div class='add'>+	if (!mask || (mask &amp; REG_NOSUPPORT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -96,10 +112,7 @@ void perf_get_regs_user(struct perf_regs *regs_user,</div><div class='ctx'> </div><div class='ctx'> int perf_reg_validate(u64 mask)</div><div class='ctx'> {</div><div class='del'>-	if (!mask || mask &amp; REG_RESERVED)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (mask &amp; REG_NOSUPPORT)</div><div class='add'>+	if (!mask || (mask &amp; REG_NOSUPPORT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c<br/>index 58ac7be52c7a..75fea0d48c0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/process.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/process.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/process.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/process.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)</div><div class='ctx'> 	dst-&gt;thread.vm86 = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return fpu__copy(&amp;dst-&gt;thread.fpu, &amp;src-&gt;thread.fpu);</div><div class='add'>+	return fpu__copy(dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -236,7 +236,7 @@ static int get_cpuid_mode(void)</div><div class='ctx'> </div><div class='ctx'> static int set_cpuid_mode(struct task_struct *task, unsigned long cpuid_enabled)</div><div class='ctx'> {</div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_CPUID_FAULT))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_CPUID_FAULT))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (cpuid_enabled)</div><div class='hunk'>@@ -426,6 +426,8 @@ static __always_inline void __speculation_ctrl_update(unsigned long tifp,</div><div class='ctx'> 	u64 msr = x86_spec_ctrl_base;</div><div class='ctx'> 	bool updmsr = false;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If TIF_SSBD is different, select the proper mitigation</div><div class='ctx'> 	 * method. Note that if SSBD mitigation is disabled or permanentely</div><div class='hunk'>@@ -477,10 +479,12 @@ static unsigned long speculation_ctrl_update_tif(struct task_struct *tsk)</div><div class='ctx'> </div><div class='ctx'> void speculation_ctrl_update(unsigned long tif)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	/* Forced update. Make sure all relevant TIF flags are different */</div><div class='del'>-	preempt_disable();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	__speculation_ctrl_update(~tif, tif);</div><div class='del'>-	preempt_enable();</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called from seccomp/prctl update */</div><div class='hunk'>@@ -666,7 +670,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86_vendor != X86_VENDOR_INTEL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!cpu_has(c, X86_FEATURE_MWAIT) || static_cpu_has_bug(X86_BUG_MONITOR))</div><div class='add'>+	if (!cpu_has(c, X86_FEATURE_MWAIT) || boot_cpu_has_bug(X86_BUG_MONITOR))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c<br/>index e471d8e6f0b2..2399e910d109 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/process_32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/process_32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/process_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/process_32.c</a></div><div class='hunk'>@@ -127,6 +127,13 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp,</div><div class='ctx'> 	struct task_struct *tsk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * For a new task use the RESET flags value since there is no before.</div><div class='add'>+	 * All the status flags are zero; DF and all the system flags must also</div><div class='add'>+	 * be 0, specifically IF must be 0 because we context switch to the new</div><div class='add'>+	 * task with interrupts disabled.</div><div class='add'>+	 */</div><div class='add'>+	frame-&gt;flags = X86_EFLAGS_FIXED;</div><div class='ctx'> 	frame-&gt;bp = 0;</div><div class='ctx'> 	frame-&gt;ret_addr = (unsigned long) ret_from_fork;</div><div class='ctx'> 	p-&gt;thread.sp = (unsigned long) fork_frame;</div><div class='hunk'>@@ -234,7 +241,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> </div><div class='ctx'> 	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */</div><div class='ctx'> </div><div class='del'>-	switch_fpu_prepare(prev_fpu, cpu);</div><div class='add'>+	if (!test_thread_flag(TIF_NEED_FPU_LOAD))</div><div class='add'>+		switch_fpu_prepare(prev_fpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save away %gs. No need to save %fs, as it was saved on the</div><div class='hunk'>@@ -267,9 +275,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Leave lazy mode, flushing any hypercalls made here.</div><div class='ctx'> 	 * This must be done before restoring TLS segments so</div><div class='del'>-	 * the GDT and LDT are properly updated, and must be</div><div class='del'>-	 * done before fpu__restore(), so the TS bit is up</div><div class='del'>-	 * to date.</div><div class='add'>+	 * the GDT and LDT are properly updated.</div><div class='ctx'> 	 */</div><div class='ctx'> 	arch_end_context_switch(next_p);</div><div class='ctx'> </div><div class='hunk'>@@ -290,10 +296,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	if (prev-&gt;gs | next-&gt;gs)</div><div class='ctx'> 		lazy_load_gs(next-&gt;gs);</div><div class='ctx'> </div><div class='del'>-	switch_fpu_finish(next_fpu, cpu);</div><div class='del'>-</div><div class='ctx'> 	this_cpu_write(current_task, next_p);</div><div class='ctx'> </div><div class='add'>+	switch_fpu_finish(next_fpu);</div><div class='add'>+</div><div class='ctx'> 	/* Load the Intel cache allocation PQR MSR. */</div><div class='ctx'> 	resctrl_sched_in();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c<br/>index 6a62f4af9fcf..f8e1af380cdf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/process_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/process_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/process_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/process_64.c</a></div><div class='hunk'>@@ -392,6 +392,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp,</div><div class='ctx'> 	childregs = task_pt_regs(p);</div><div class='ctx'> 	fork_frame = container_of(childregs, struct fork_frame, regs);</div><div class='ctx'> 	frame = &amp;fork_frame-&gt;frame;</div><div class='add'>+</div><div class='ctx'> 	frame-&gt;bp = 0;</div><div class='ctx'> 	frame-&gt;ret_addr = (unsigned long) ret_from_fork;</div><div class='ctx'> 	p-&gt;thread.sp = (unsigned long) fork_frame;</div><div class='hunk'>@@ -520,7 +521,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	WARN_ON_ONCE(IS_ENABLED(CONFIG_DEBUG_ENTRY) &amp;&amp;</div><div class='ctx'> 		     this_cpu_read(irq_count) != -1);</div><div class='ctx'> </div><div class='del'>-	switch_fpu_prepare(prev_fpu, cpu);</div><div class='add'>+	if (!test_thread_flag(TIF_NEED_FPU_LOAD))</div><div class='add'>+		switch_fpu_prepare(prev_fpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	/* We must save %fs and %gs before load_TLS() because</div><div class='ctx'> 	 * %fs and %gs may be cleared by load_TLS().</div><div class='hunk'>@@ -538,9 +540,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Leave lazy mode, flushing any hypercalls made here.  This</div><div class='ctx'> 	 * must be done after loading TLS entries in the GDT but before</div><div class='del'>-	 * loading segments that might reference them, and and it must</div><div class='del'>-	 * be done before fpu__restore(), so the TS bit is up to</div><div class='del'>-	 * date.</div><div class='add'>+	 * loading segments that might reference them.</div><div class='ctx'> 	 */</div><div class='ctx'> 	arch_end_context_switch(next_p);</div><div class='ctx'> </div><div class='hunk'>@@ -568,14 +568,14 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> </div><div class='ctx'> 	x86_fsgsbase_load(prev, next);</div><div class='ctx'> </div><div class='del'>-	switch_fpu_finish(next_fpu, cpu);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Switch the PDA and FPU contexts.</div><div class='ctx'> 	 */</div><div class='ctx'> 	this_cpu_write(current_task, next_p);</div><div class='ctx'> 	this_cpu_write(cpu_current_top_of_stack, task_top_of_stack(next_p));</div><div class='ctx'> </div><div class='add'>+	switch_fpu_finish(next_fpu);</div><div class='add'>+</div><div class='ctx'> 	/* Reload sp0. */</div><div class='ctx'> 	update_task_stack(next_p);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c<br/>index 725624b6c0c0..09d6bded3c1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/reboot.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/reboot.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/reboot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/reboot.c</a></div><div class='hunk'>@@ -81,6 +81,19 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Some machines don't handle the default ACPI reboot method and</div><div class='add'>+ * require the EFI reboot method:</div><div class='add'>+ */</div><div class='add'>+static int __init set_efi_reboot(const struct dmi_system_id *d)</div><div class='add'>+{</div><div class='add'>+	if (reboot_type != BOOT_EFI &amp;&amp; !efi_runtime_disabled()) {</div><div class='add'>+		reboot_type = BOOT_EFI;</div><div class='add'>+		pr_info("%s series board detected. Selecting EFI-method for reboot.\n", d-&gt;ident);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __noreturn machine_real_restart(unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='hunk'>@@ -108,7 +121,7 @@ void __noreturn machine_real_restart(unsigned int type)</div><div class='ctx'> 	write_cr3(real_mode_header-&gt;trampoline_pgd);</div><div class='ctx'> </div><div class='ctx'> 	/* Exiting long mode will fail if CR4.PCIDE is set. */</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_PCID))</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_PCID))</div><div class='ctx'> 		cr4_clear_bits(X86_CR4_PCIDE);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -166,6 +179,14 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {</div><div class='ctx'> 			DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{	/* Handle reboot issue on Acer TravelMate X514-51T */</div><div class='add'>+		.callback = set_efi_reboot,</div><div class='add'>+		.ident = "Acer TravelMate X514-51T",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate X514-51T"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> </div><div class='ctx'> 	/* Apple */</div><div class='ctx'> 	{	/* Handle problems with rebooting on Apple MacBook5 */</div><div class='head'>diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c<br/>index 3d872a527cd9..905dae880563 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/setup.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@</div><div class='ctx'> #include &lt;linux/tboot.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/mem_encrypt.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb/xhci-dbgp.h&gt;</div><div class='ctx'> #include &lt;video/edid.h&gt;</div><div class='hunk'>@@ -448,18 +449,17 @@ static void __init memblock_x86_reserve_range_setup_data(void)</div><div class='ctx'> #ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> </div><div class='ctx'> /* 16M alignment for crash kernel regions */</div><div class='del'>-#define CRASH_ALIGN		(16 &lt;&lt; 20)</div><div class='add'>+#define CRASH_ALIGN		SZ_16M</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Keep the crash kernel below this limit.  On 32 bits earlier kernels</div><div class='ctx'>  * would limit the kernel to the low 512 MiB due to mapping restrictions.</div><div class='del'>- * On 64bit, old kexec-tools need to under 896MiB.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='del'>-# define CRASH_ADDR_LOW_MAX	(512 &lt;&lt; 20)</div><div class='del'>-# define CRASH_ADDR_HIGH_MAX	(512 &lt;&lt; 20)</div><div class='add'>+# define CRASH_ADDR_LOW_MAX	SZ_512M</div><div class='add'>+# define CRASH_ADDR_HIGH_MAX	SZ_512M</div><div class='ctx'> #else</div><div class='del'>-# define CRASH_ADDR_LOW_MAX	(896UL &lt;&lt; 20)</div><div class='add'>+# define CRASH_ADDR_LOW_MAX	SZ_4G</div><div class='ctx'> # define CRASH_ADDR_HIGH_MAX	MAXMEM</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -541,21 +541,27 @@ static void __init reserve_crashkernel(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 0 means: find the address automatically */</div><div class='del'>-	if (crash_base &lt;= 0) {</div><div class='add'>+	if (!crash_base) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,</div><div class='del'>-		 * as old kexec-tools loads bzImage below that, unless</div><div class='del'>-		 * "crashkernel=size[KMG],high" is specified.</div><div class='add'>+		 * crashkernel=x,high reserves memory over 4G, also allocates</div><div class='add'>+		 * 256M extra low memory for DMA buffers and swiotlb.</div><div class='add'>+		 * But the extra memory is not required for all machines.</div><div class='add'>+		 * So try low memory first and fall back to high memory</div><div class='add'>+		 * unless "crashkernel=size[KMG],high" is specified.</div><div class='ctx'> 		 */</div><div class='del'>-		crash_base = memblock_find_in_range(CRASH_ALIGN,</div><div class='del'>-						    high ? CRASH_ADDR_HIGH_MAX</div><div class='del'>-							 : CRASH_ADDR_LOW_MAX,</div><div class='del'>-						    crash_size, CRASH_ALIGN);</div><div class='add'>+		if (!high)</div><div class='add'>+			crash_base = memblock_find_in_range(CRASH_ALIGN,</div><div class='add'>+						CRASH_ADDR_LOW_MAX,</div><div class='add'>+						crash_size, CRASH_ALIGN);</div><div class='add'>+		if (!crash_base)</div><div class='add'>+			crash_base = memblock_find_in_range(CRASH_ALIGN,</div><div class='add'>+						CRASH_ADDR_HIGH_MAX,</div><div class='add'>+						crash_size, CRASH_ALIGN);</div><div class='ctx'> 		if (!crash_base) {</div><div class='ctx'> 			pr_info("crashkernel reservation failed - No suitable area found.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned long long start;</div><div class='ctx'> </div><div class='hunk'>@@ -1005,13 +1011,11 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	if (efi_enabled(EFI_BOOT))</div><div class='ctx'> 		efi_init();</div><div class='ctx'> </div><div class='del'>-	dmi_scan_machine();</div><div class='del'>-	dmi_memdev_walk();</div><div class='del'>-	dmi_set_dump_stack_arch_desc();</div><div class='add'>+	dmi_setup();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * VMware detection requires dmi to be available, so this</div><div class='del'>-	 * needs to be done after dmi_scan_machine(), for the boot CPU.</div><div class='add'>+	 * needs to be done after dmi_setup(), for the boot CPU.</div><div class='ctx'> 	 */</div><div class='ctx'> 	init_hypervisor_platform();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c<br/>index 4bf46575568a..86663874ef04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/setup_percpu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/setup_percpu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/setup_percpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/setup_percpu.c</a></div><div class='hunk'>@@ -244,11 +244,6 @@ void __init setup_per_cpu_areas(void)</div><div class='ctx'> 		per_cpu(x86_cpu_to_logical_apicid, cpu) =</div><div class='ctx'> 			early_per_cpu_map(x86_cpu_to_logical_apicid, cpu);</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-		per_cpu(irq_stack_ptr, cpu) =</div><div class='del'>-			per_cpu(irq_stack_union.irq_stack, cpu) +</div><div class='del'>-			IRQ_STACK_SIZE;</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> 		per_cpu(x86_cpu_to_node_map, cpu) =</div><div class='ctx'> 			early_per_cpu_map(x86_cpu_to_node_map, cpu);</div><div class='head'>diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c<br/>index 08dfd4c1a4f9..364813cea647 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/signal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/signal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/signal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/signal.c</a></div><div class='hunk'>@@ -132,16 +132,6 @@ static int restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 		COPY_SEG_CPL3(cs);</div><div class='ctx'> 		COPY_SEG_CPL3(ss);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-		/*</div><div class='del'>-		 * Fix up SS if needed for the benefit of old DOSEMU and</div><div class='del'>-		 * CRIU.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(!(uc_flags &amp; UC_STRICT_RESTORE_SS) &amp;&amp;</div><div class='del'>-			     user_64bit_mode(regs)))</div><div class='del'>-			force_valid_ss(regs);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 		get_user_ex(tmpflags, &amp;sc-&gt;flags);</div><div class='ctx'> 		regs-&gt;flags = (regs-&gt;flags &amp; ~FIX_EFLAGS) | (tmpflags &amp; FIX_EFLAGS);</div><div class='ctx'> 		regs-&gt;orig_ax = -1;		/* disable syscall checks */</div><div class='hunk'>@@ -150,6 +140,15 @@ static int restore_sigcontext(struct pt_regs *regs,</div><div class='ctx'> 		buf = (void __user *)buf_val;</div><div class='ctx'> 	} get_user_catch(err);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/*</div><div class='add'>+	 * Fix up SS if needed for the benefit of old DOSEMU and</div><div class='add'>+	 * CRIU.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!(uc_flags &amp; UC_STRICT_RESTORE_SS) &amp;&amp; user_64bit_mode(regs)))</div><div class='add'>+		force_valid_ss(regs);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	err |= fpu__restore_sig(buf, IS_ENABLED(CONFIG_X86_32));</div><div class='ctx'> </div><div class='ctx'> 	force_iret();</div><div class='hunk'>@@ -206,7 +205,7 @@ int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,</div><div class='ctx'> 		put_user_ex(regs-&gt;ss, &amp;sc-&gt;ss);</div><div class='ctx'> #endif /* CONFIG_X86_32 */</div><div class='ctx'> </div><div class='del'>-		put_user_ex(fpstate, &amp;sc-&gt;fpstate);</div><div class='add'>+		put_user_ex(fpstate, (unsigned long __user *)&amp;sc-&gt;fpstate);</div><div class='ctx'> </div><div class='ctx'> 		/* non-iBCS2 extensions.. */</div><div class='ctx'> 		put_user_ex(mask, &amp;sc-&gt;oldmask);</div><div class='hunk'>@@ -246,7 +245,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,</div><div class='ctx'> 	unsigned long sp = regs-&gt;sp;</div><div class='ctx'> 	unsigned long buf_fx = 0;</div><div class='ctx'> 	int onsigstack = on_sig_stack(sp);</div><div class='del'>-	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* redzone */</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_X86_64))</div><div class='hunk'>@@ -265,11 +264,9 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,</div><div class='ctx'> 		sp = (unsigned long) ka-&gt;sa.sa_restorer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fpu-&gt;initialized) {</div><div class='del'>-		sp = fpu__alloc_mathframe(sp, IS_ENABLED(CONFIG_X86_32),</div><div class='del'>-					  &amp;buf_fx, &amp;math_size);</div><div class='del'>-		*fpstate = (void __user *)sp;</div><div class='del'>-	}</div><div class='add'>+	sp = fpu__alloc_mathframe(sp, IS_ENABLED(CONFIG_X86_32),</div><div class='add'>+				  &amp;buf_fx, &amp;math_size);</div><div class='add'>+	*fpstate = (void __user *)sp;</div><div class='ctx'> </div><div class='ctx'> 	sp = align_sigframe(sp - frame_size);</div><div class='ctx'> </div><div class='hunk'>@@ -281,8 +278,8 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,</div><div class='ctx'> 		return (void __user *)-1L;</div><div class='ctx'> </div><div class='ctx'> 	/* save i387 and extended state */</div><div class='del'>-	if (fpu-&gt;initialized &amp;&amp;</div><div class='del'>-	    copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size) &lt; 0)</div><div class='add'>+	ret = copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return (void __user *)-1L;</div><div class='ctx'> </div><div class='ctx'> 	return (void __user *)sp;</div><div class='hunk'>@@ -461,6 +458,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,</div><div class='ctx'> {</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='ctx'> 	void __user *fp = NULL;</div><div class='add'>+	unsigned long uc_flags;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	frame = get_sigframe(&amp;ksig-&gt;ka, regs, sizeof(struct rt_sigframe), &amp;fp);</div><div class='hunk'>@@ -473,9 +471,11 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	uc_flags = frame_uc_flags(regs);</div><div class='add'>+</div><div class='ctx'> 	put_user_try {</div><div class='ctx'> 		/* Create the ucontext.  */</div><div class='del'>-		put_user_ex(frame_uc_flags(regs), &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+		put_user_ex(uc_flags, &amp;frame-&gt;uc.uc_flags);</div><div class='ctx'> 		put_user_ex(0, &amp;frame-&gt;uc.uc_link);</div><div class='ctx'> 		save_altstack_ex(&amp;frame-&gt;uc.uc_stack, regs-&gt;sp);</div><div class='ctx'> </div><div class='hunk'>@@ -541,6 +541,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_X86_X32_ABI</div><div class='ctx'> 	struct rt_sigframe_x32 __user *frame;</div><div class='add'>+	unsigned long uc_flags;</div><div class='ctx'> 	void __user *restorer;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	void __user *fpstate = NULL;</div><div class='hunk'>@@ -555,9 +556,11 @@ static int x32_setup_rt_frame(struct ksignal *ksig,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	uc_flags = frame_uc_flags(regs);</div><div class='add'>+</div><div class='ctx'> 	put_user_try {</div><div class='ctx'> 		/* Create the ucontext.  */</div><div class='del'>-		put_user_ex(frame_uc_flags(regs), &amp;frame-&gt;uc.uc_flags);</div><div class='add'>+		put_user_ex(uc_flags, &amp;frame-&gt;uc.uc_flags);</div><div class='ctx'> 		put_user_ex(0, &amp;frame-&gt;uc.uc_link);</div><div class='ctx'> 		compat_save_altstack_ex(&amp;frame-&gt;uc.uc_stack, regs-&gt;sp);</div><div class='ctx'> 		put_user_ex(0, &amp;frame-&gt;uc.uc__pad0);</div><div class='hunk'>@@ -569,7 +572,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,</div><div class='ctx'> 			restorer = NULL;</div><div class='ctx'> 			err |= -EFAULT;</div><div class='ctx'> 		}</div><div class='del'>-		put_user_ex(restorer, &amp;frame-&gt;pretcode);</div><div class='add'>+		put_user_ex(restorer, (unsigned long __user *)&amp;frame-&gt;pretcode);</div><div class='ctx'> 	} put_user_catch(err);</div><div class='ctx'> </div><div class='ctx'> 	err |= setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, fpstate,</div><div class='hunk'>@@ -688,10 +691,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)</div><div class='ctx'> 	sigset_t *set = sigmask_to_save();</div><div class='ctx'> 	compat_sigset_t *cset = (compat_sigset_t *) set;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Increment event counter and perform fixup for the pre-signal</div><div class='del'>-	 * frame.</div><div class='del'>-	 */</div><div class='add'>+	/* Perform fixup for the pre-signal frame. */</div><div class='ctx'> 	rseq_signal_deliver(ksig, regs);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the stack frame */</div><div class='hunk'>@@ -763,8 +763,7 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ensure the signal handler starts with the new fpu state.</div><div class='ctx'> 		 */</div><div class='del'>-		if (fpu-&gt;initialized)</div><div class='del'>-			fpu__clear(fpu);</div><div class='add'>+		fpu__clear(fpu);</div><div class='ctx'> 	}</div><div class='ctx'> 	signal_setup_done(failed, ksig, stepping);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c<br/>index ce1a67b70168..73e69aaaa117 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/smpboot.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/smpboot.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/smpboot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/smpboot.c</a></div><div class='hunk'>@@ -455,7 +455,7 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)</div><div class='ctx'>  * multicore group inside a NUMA node.  If this happens, we will</div><div class='ctx'>  * discard the MC level of the topology later.</div><div class='ctx'>  */</div><div class='del'>-static bool match_die(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)</div><div class='add'>+static bool match_pkg(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)</div><div class='ctx'> {</div><div class='ctx'> 	if (c-&gt;phys_proc_id == o-&gt;phys_proc_id)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -546,7 +546,7 @@ void set_cpu_sibling_map(int cpu)</div><div class='ctx'> 	for_each_cpu(i, cpu_sibling_setup_mask) {</div><div class='ctx'> 		o = &amp;cpu_data(i);</div><div class='ctx'> </div><div class='del'>-		if ((i == cpu) || (has_mp &amp;&amp; match_die(c, o))) {</div><div class='add'>+		if ((i == cpu) || (has_mp &amp;&amp; match_pkg(c, o))) {</div><div class='ctx'> 			link_mask(topology_core_cpumask, cpu, i);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -570,7 +570,7 @@ void set_cpu_sibling_map(int cpu)</div><div class='ctx'> 			} else if (i != cpu &amp;&amp; !c-&gt;booted_cores)</div><div class='ctx'> 				c-&gt;booted_cores = cpu_data(i).booted_cores;</div><div class='ctx'> 		}</div><div class='del'>-		if (match_die(c, o) &amp;&amp; !topology_same_node(c, o))</div><div class='add'>+		if (match_pkg(c, o) &amp;&amp; !topology_same_node(c, o))</div><div class='ctx'> 			x86_has_numa_in_package = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -935,20 +935,27 @@ out:</div><div class='ctx'> 	return boot_error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void common_cpu_up(unsigned int cpu, struct task_struct *idle)</div><div class='add'>+int common_cpu_up(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	/* Just in case we booted with a single CPU. */</div><div class='ctx'> 	alternatives_enable_smp();</div><div class='ctx'> </div><div class='ctx'> 	per_cpu(current_task, cpu) = idle;</div><div class='ctx'> </div><div class='add'>+	/* Initialize the interrupt stack(s) */</div><div class='add'>+	ret = irq_init_percpu_irqstack(cpu);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	/* Stack for startup_32 can be just as for start_secondary onwards */</div><div class='del'>-	irq_ctx_init(cpu);</div><div class='ctx'> 	per_cpu(cpu_current_top_of_stack, cpu) = task_top_of_stack(idle);</div><div class='ctx'> #else</div><div class='ctx'> 	initial_gs = per_cpu_offset(cpu);</div><div class='ctx'> #endif</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1106,7 +1113,9 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)</div><div class='ctx'> 	/* the FPU context is blank, nobody can own it */</div><div class='ctx'> 	per_cpu(fpu_fpregs_owner_ctx, cpu) = NULL;</div><div class='ctx'> </div><div class='del'>-	common_cpu_up(cpu, tidle);</div><div class='add'>+	err = common_cpu_up(cpu, tidle);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = do_boot_cpu(apicid, cpu, tidle, &amp;cpu0_nmi_registered);</div><div class='ctx'> 	if (err) {</div><div class='head'>diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c<br/>index 5c2d71a1dc06..2abf27d7df6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/stacktrace.c</a></div><div class='hunk'>@@ -12,78 +12,31 @@</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='ctx'> </div><div class='del'>-static int save_stack_address(struct stack_trace *trace, unsigned long addr,</div><div class='del'>-			      bool nosched)</div><div class='del'>-{</div><div class='del'>-	if (nosched &amp;&amp; in_sched_functions(addr))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (trace-&gt;skip &gt; 0) {</div><div class='del'>-		trace-&gt;skip--;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	trace-&gt;entries[trace-&gt;nr_entries++] = addr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void noinline __save_stack_trace(struct stack_trace *trace,</div><div class='del'>-			       struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-			       bool nosched)</div><div class='add'>+void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,</div><div class='add'>+		     struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct unwind_state state;</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='del'>-	if (regs)</div><div class='del'>-		save_stack_address(trace, regs-&gt;ip, nosched);</div><div class='add'>+	if (regs &amp;&amp; !consume_entry(cookie, regs-&gt;ip, false))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	for (unwind_start(&amp;state, task, regs, NULL); !unwind_done(&amp;state);</div><div class='ctx'> 	     unwind_next_frame(&amp;state)) {</div><div class='ctx'> 		addr = unwind_get_return_address(&amp;state);</div><div class='del'>-		if (!addr || save_stack_address(trace, addr, nosched))</div><div class='add'>+		if (!addr || !consume_entry(cookie, addr, false))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Save stack-backtrace addresses into a stack_trace buffer.</div><div class='add'>+ * This function returns an error if it detects any unreliable features of the</div><div class='add'>+ * stack.  Otherwise it guarantees that the stack trace is reliable.</div><div class='add'>+ *</div><div class='add'>+ * If the task is not 'current', the caller *must* ensure the task is inactive.</div><div class='ctx'>  */</div><div class='del'>-void save_stack_trace(struct stack_trace *trace)</div><div class='del'>-{</div><div class='del'>-	trace-&gt;skip++;</div><div class='del'>-	__save_stack_trace(trace, current, NULL, false);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(save_stack_trace);</div><div class='del'>-</div><div class='del'>-void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)</div><div class='del'>-{</div><div class='del'>-	__save_stack_trace(trace, current, regs, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='del'>-{</div><div class='del'>-	if (!try_get_task_stack(tsk))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (tsk == current)</div><div class='del'>-		trace-&gt;skip++;</div><div class='del'>-	__save_stack_trace(trace, tsk, NULL, true);</div><div class='del'>-</div><div class='del'>-	put_task_stack(tsk);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(save_stack_trace_tsk);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_RELIABLE_STACKTRACE</div><div class='del'>-</div><div class='del'>-static int __always_inline</div><div class='del'>-__save_stack_trace_reliable(struct stack_trace *trace,</div><div class='del'>-			    struct task_struct *task)</div><div class='add'>+int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,</div><div class='add'>+			     void *cookie, struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	struct unwind_state state;</div><div class='ctx'> 	struct pt_regs *regs;</div><div class='hunk'>@@ -97,7 +50,7 @@ __save_stack_trace_reliable(struct stack_trace *trace,</div><div class='ctx'> 		if (regs) {</div><div class='ctx'> 			/* Success path for user tasks */</div><div class='ctx'> 			if (user_mode(regs))</div><div class='del'>-				goto success;</div><div class='add'>+				return 0;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Kernel mode registers on the stack indicate an</div><div class='hunk'>@@ -120,7 +73,7 @@ __save_stack_trace_reliable(struct stack_trace *trace,</div><div class='ctx'> 		if (!addr)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (save_stack_address(trace, addr, false))</div><div class='add'>+		if (!consume_entry(cookie, addr, false))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -132,39 +85,9 @@ __save_stack_trace_reliable(struct stack_trace *trace,</div><div class='ctx'> 	if (!(task-&gt;flags &amp; (PF_KTHREAD | PF_IDLE)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-success:</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This function returns an error if it detects any unreliable features of the</div><div class='del'>- * stack.  Otherwise it guarantees that the stack trace is reliable.</div><div class='del'>- *</div><div class='del'>- * If the task is not 'current', the caller *must* ensure the task is inactive.</div><div class='del'>- */</div><div class='del'>-int save_stack_trace_tsk_reliable(struct task_struct *tsk,</div><div class='del'>-				  struct stack_trace *trace)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the task doesn't have a stack (e.g., a zombie), the stack is</div><div class='del'>-	 * "reliably" empty.</div><div class='del'>-	 */</div><div class='del'>-	if (!try_get_task_stack(tsk))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = __save_stack_trace_reliable(trace, tsk);</div><div class='del'>-</div><div class='del'>-	put_task_stack(tsk);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_HAVE_RELIABLE_STACKTRACE */</div><div class='del'>-</div><div class='ctx'> /* Userspace stacktrace - based on kernel/trace/trace_sysprof.c */</div><div class='ctx'> </div><div class='ctx'> struct stack_frame_user {</div><div class='hunk'>@@ -189,15 +112,15 @@ copy_stack_frame(const void __user *fp, struct stack_frame_user *frame)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __save_stack_trace_user(struct stack_trace *trace)</div><div class='add'>+void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,</div><div class='add'>+			  const struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	const struct pt_regs *regs = task_pt_regs(current);</div><div class='ctx'> 	const void __user *fp = (const void __user *)regs-&gt;bp;</div><div class='ctx'> </div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = regs-&gt;ip;</div><div class='add'>+	if (!consume_entry(cookie, regs-&gt;ip, false))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	while (trace-&gt;nr_entries &lt; trace-&gt;max_entries) {</div><div class='add'>+	while (1) {</div><div class='ctx'> 		struct stack_frame_user frame;</div><div class='ctx'> </div><div class='ctx'> 		frame.next_fp = NULL;</div><div class='hunk'>@@ -207,8 +130,8 @@ static inline void __save_stack_trace_user(struct stack_trace *trace)</div><div class='ctx'> 		if ((unsigned long)fp &lt; regs-&gt;sp)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (frame.ret_addr) {</div><div class='del'>-			trace-&gt;entries[trace-&gt;nr_entries++] =</div><div class='del'>-				frame.ret_addr;</div><div class='add'>+			if (!consume_entry(cookie, frame.ret_addr, false))</div><div class='add'>+				return;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (fp == frame.next_fp)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -216,14 +139,3 @@ static inline void __save_stack_trace_user(struct stack_trace *trace)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void save_stack_trace_user(struct stack_trace *trace)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Trace user stack if we are not a kernel thread</div><div class='del'>-	 */</div><div class='del'>-	if (current-&gt;mm) {</div><div class='del'>-		__save_stack_trace_user(trace);</div><div class='del'>-	}</div><div class='del'>-	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='del'>-		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c<br/>index 738bf42b0218..be5bc2e47c71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/topology.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/topology.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/topology.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/topology.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ int _debug_hotplug_cpu(int cpu, int action)</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		ret = cpu_down(cpu);</div><div class='ctx'> 		if (!ret) {</div><div class='del'>-			pr_info("CPU %u is now offline\n", cpu);</div><div class='add'>+			pr_info("DEBUG_HOTPLUG_CPU0: CPU %u is now offline\n", cpu);</div><div class='ctx'> 			dev-&gt;offline = true;</div><div class='ctx'> 			kobject_uevent(&amp;dev-&gt;kobj, KOBJ_OFFLINE);</div><div class='ctx'> 		} else</div><div class='head'>diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c<br/>index d26f9e9c3d83..8b6d03e55d2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/traps.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/traps.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/traps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/traps.c</a></div><div class='hunk'>@@ -456,7 +456,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	 * which is all zeros which indicates MPX was not</div><div class='ctx'> 	 * responsible for the exception.</div><div class='ctx'> 	 */</div><div class='del'>-	bndcsr = get_xsave_field_ptr(XFEATURE_MASK_BNDCSR);</div><div class='add'>+	bndcsr = get_xsave_field_ptr(XFEATURE_BNDCSR);</div><div class='ctx'> 	if (!bndcsr)</div><div class='ctx'> 		goto exit_trap;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c<br/>index 3fae23834069..15b5e98a86f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/tsc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/tsc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/tsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/tsc.c</a></div><div class='hunk'>@@ -185,8 +185,7 @@ static void __init cyc2ns_init_boot_cpu(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Secondary CPUs do not run through tsc_init(), so set up</div><div class='ctx'>  * all the scale factors for all CPUs, assuming the same</div><div class='del'>- * speed as the bootup CPU. (cpufreq notifiers will fix this</div><div class='del'>- * up if their speed diverges)</div><div class='add'>+ * speed as the bootup CPU.</div><div class='ctx'>  */</div><div class='ctx'> static void __init cyc2ns_init_secondary_cpus(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -283,6 +282,7 @@ int __init notsc_setup(char *str)</div><div class='ctx'> __setup("notsc", notsc_setup);</div><div class='ctx'> </div><div class='ctx'> static int no_sched_irq_time;</div><div class='add'>+static int no_tsc_watchdog;</div><div class='ctx'> </div><div class='ctx'> static int __init tsc_setup(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -292,6 +292,8 @@ static int __init tsc_setup(char *str)</div><div class='ctx'> 		no_sched_irq_time = 1;</div><div class='ctx'> 	if (!strcmp(str, "unstable"))</div><div class='ctx'> 		mark_tsc_unstable("boot parameter");</div><div class='add'>+	if (!strcmp(str, "nowatchdog"))</div><div class='add'>+		no_tsc_watchdog = 1;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -937,12 +939,12 @@ void tsc_restore_sched_clock_state(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_FREQ</div><div class='del'>-/* Frequency scaling support. Adjust the TSC based timer when the cpu frequency</div><div class='add'>+/*</div><div class='add'>+ * Frequency scaling support. Adjust the TSC based timer when the CPU frequency</div><div class='ctx'>  * changes.</div><div class='ctx'>  *</div><div class='del'>- * RED-PEN: On SMP we assume all CPUs run with the same frequency.  It's</div><div class='del'>- * not that important because current Opteron setups do not support</div><div class='del'>- * scaling on SMP anyroads.</div><div class='add'>+ * NOTE: On SMP the situation is not fixable in general, so simply mark the TSC</div><div class='add'>+ * as unstable and give up in those cases.</div><div class='ctx'>  *</div><div class='ctx'>  * Should fix up last_tsc too. Currently gettimeofday in the</div><div class='ctx'>  * first tick after the change will be slightly wrong.</div><div class='hunk'>@@ -956,22 +958,22 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> 				void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_freqs *freq = data;</div><div class='del'>-	unsigned long *lpj;</div><div class='ctx'> </div><div class='del'>-	lpj = &amp;boot_cpu_data.loops_per_jiffy;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS))</div><div class='del'>-		lpj = &amp;cpu_data(freq-&gt;cpu).loops_per_jiffy;</div><div class='del'>-#endif</div><div class='add'>+	if (num_online_cpus() &gt; 1) {</div><div class='add'>+		mark_tsc_unstable("cpufreq changes on SMP");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ref_freq) {</div><div class='ctx'> 		ref_freq = freq-&gt;old;</div><div class='del'>-		loops_per_jiffy_ref = *lpj;</div><div class='add'>+		loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy;</div><div class='ctx'> 		tsc_khz_ref = tsc_khz;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if ((val == CPUFREQ_PRECHANGE  &amp;&amp; freq-&gt;old &lt; freq-&gt;new) ||</div><div class='del'>-			(val == CPUFREQ_POSTCHANGE &amp;&amp; freq-&gt;old &gt; freq-&gt;new)) {</div><div class='del'>-		*lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq-&gt;new);</div><div class='add'>+	    (val == CPUFREQ_POSTCHANGE &amp;&amp; freq-&gt;old &gt; freq-&gt;new)) {</div><div class='add'>+		boot_cpu_data.loops_per_jiffy =</div><div class='add'>+			cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq-&gt;new);</div><div class='ctx'> </div><div class='ctx'> 		tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq-&gt;new);</div><div class='ctx'> 		if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS))</div><div class='hunk'>@@ -1349,7 +1351,7 @@ static int __init init_tsc_clocksource(void)</div><div class='ctx'> 	if (tsc_unstable)</div><div class='ctx'> 		goto unreg;</div><div class='ctx'> </div><div class='del'>-	if (tsc_clocksource_reliable)</div><div class='add'>+	if (tsc_clocksource_reliable || no_tsc_watchdog)</div><div class='ctx'> 		clocksource_tsc.flags &amp;= ~CLOCK_SOURCE_MUST_VERIFY;</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3))</div><div class='head'>diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c<br/>index a092b6b40c6b..6a38717d179c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/vm86_32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/vm86_32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/vm86_32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/vm86_32.c</a></div><div class='hunk'>@@ -369,7 +369,7 @@ static long do_sys_vm86(struct vm86plus_struct __user *user_vm86, bool plus)</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	tsk-&gt;thread.sp0 += 16;</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_SEP)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_SEP)) {</div><div class='ctx'> 		tsk-&gt;thread.sysenter_cs = 0;</div><div class='ctx'> 		refresh_sysenter_cs(&amp;tsk-&gt;thread);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S<br/>index bad8c51fee6e..0850b5149345 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/vmlinux.lds.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kernel/vmlinux.lds.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -141,11 +141,11 @@ SECTIONS</div><div class='ctx'> 		*(.text.__x86.indirect_thunk)</div><div class='ctx'> 		__indirect_thunk_end = .;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-		/* End of text section */</div><div class='del'>-		_etext = .;</div><div class='ctx'> 	} :text = 0x9090</div><div class='ctx'> </div><div class='add'>+	/* End of text section */</div><div class='add'>+	_etext = .;</div><div class='add'>+</div><div class='ctx'> 	NOTES :text :note</div><div class='ctx'> </div><div class='ctx'> 	EXCEPTION_TABLE(16) :text = 0x9090</div><div class='hunk'>@@ -362,7 +362,7 @@ SECTIONS</div><div class='ctx'> 	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {</div><div class='ctx'> 		__bss_start = .;</div><div class='ctx'> 		*(.bss..page_aligned)</div><div class='del'>-		*(.bss)</div><div class='add'>+		*(BSS_MAIN)</div><div class='ctx'> 		BSS_DECRYPTED</div><div class='ctx'> 		. = ALIGN(PAGE_SIZE);</div><div class='ctx'> 		__bss_stop = .;</div><div class='hunk'>@@ -403,7 +403,8 @@ SECTIONS</div><div class='ctx'>  */</div><div class='ctx'> #define INIT_PER_CPU(x) init_per_cpu__##x = ABSOLUTE(x) + __per_cpu_load</div><div class='ctx'> INIT_PER_CPU(gdt_page);</div><div class='del'>-INIT_PER_CPU(irq_stack_union);</div><div class='add'>+INIT_PER_CPU(fixed_percpu_data);</div><div class='add'>+INIT_PER_CPU(irq_stack_backing_store);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Build-time check on the image size:</div><div class='hunk'>@@ -412,8 +413,8 @@ INIT_PER_CPU(irq_stack_union);</div><div class='ctx'> 	   "kernel image bigger than KERNEL_IMAGE_SIZE");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-. = ASSERT((irq_stack_union == 0),</div><div class='del'>-           "irq_stack_union is not at start of per-cpu area");</div><div class='add'>+. = ASSERT((fixed_percpu_data == 0),</div><div class='add'>+           "fixed_percpu_data is not at start of per-cpu area");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_X86_32 */</div><div class='head'>diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig<br/>index 72fa955f4a15..fc042419e670 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/Kconfig</a></div><div class='hunk'>@@ -27,7 +27,6 @@ config KVM</div><div class='ctx'> 	depends on X86_LOCAL_APIC</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='ctx'> 	select MMU_NOTIFIER</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select HAVE_KVM_IRQCHIP</div><div class='ctx'> 	select HAVE_KVM_IRQFD</div><div class='ctx'> 	select IRQ_BYPASS_MANAGER</div><div class='head'>diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c<br/>index c338984c850d..d0d5dd44b4f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/emulate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/emulate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/emulate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/emulate.c</a></div><div class='hunk'>@@ -2331,24 +2331,18 @@ static int em_lseg(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> </div><div class='ctx'> static int emulator_has_longmode(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	u32 eax, ebx, ecx, edx;</div><div class='ctx'> </div><div class='ctx'> 	eax = 0x80000001;</div><div class='ctx'> 	ecx = 0;</div><div class='ctx'> 	ctxt-&gt;ops-&gt;get_cpuid(ctxt, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx, false);</div><div class='ctx'> 	return edx &amp; bit(X86_FEATURE_LM);</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='del'>-#define GET_SMSTATE(type, smbase, offset)				  \</div><div class='del'>-	({								  \</div><div class='del'>-	 type __val;							  \</div><div class='del'>-	 int r = ctxt-&gt;ops-&gt;read_phys(ctxt, smbase + offset, &amp;__val,      \</div><div class='del'>-				      sizeof(__val));			  \</div><div class='del'>-	 if (r != X86EMUL_CONTINUE)					  \</div><div class='del'>-		 return X86EMUL_UNHANDLEABLE;				  \</div><div class='del'>-	 __val;								  \</div><div class='del'>-	})</div><div class='del'>-</div><div class='ctx'> static void rsm_set_desc_flags(struct desc_struct *desc, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	desc-&gt;g    = (flags &gt;&gt; 23) &amp; 1;</div><div class='hunk'>@@ -2361,27 +2355,30 @@ static void rsm_set_desc_flags(struct desc_struct *desc, u32 flags)</div><div class='ctx'> 	desc-&gt;type = (flags &gt;&gt;  8) &amp; 15;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsm_load_seg_32(struct x86_emulate_ctxt *ctxt, u64 smbase, int n)</div><div class='add'>+static int rsm_load_seg_32(struct x86_emulate_ctxt *ctxt, const char *smstate,</div><div class='add'>+			   int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_struct desc;</div><div class='ctx'> 	int offset;</div><div class='ctx'> 	u16 selector;</div><div class='ctx'> </div><div class='del'>-	selector = GET_SMSTATE(u32, smbase, 0x7fa8 + n * 4);</div><div class='add'>+	selector = GET_SMSTATE(u32, smstate, 0x7fa8 + n * 4);</div><div class='ctx'> </div><div class='ctx'> 	if (n &lt; 3)</div><div class='ctx'> 		offset = 0x7f84 + n * 12;</div><div class='ctx'> 	else</div><div class='ctx'> 		offset = 0x7f2c + (n - 3) * 12;</div><div class='ctx'> </div><div class='del'>-	set_desc_base(&amp;desc,      GET_SMSTATE(u32, smbase, offset + 8));</div><div class='del'>-	set_desc_limit(&amp;desc,     GET_SMSTATE(u32, smbase, offset + 4));</div><div class='del'>-	rsm_set_desc_flags(&amp;desc, GET_SMSTATE(u32, smbase, offset));</div><div class='add'>+	set_desc_base(&amp;desc,      GET_SMSTATE(u32, smstate, offset + 8));</div><div class='add'>+	set_desc_limit(&amp;desc,     GET_SMSTATE(u32, smstate, offset + 4));</div><div class='add'>+	rsm_set_desc_flags(&amp;desc, GET_SMSTATE(u32, smstate, offset));</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_segment(ctxt, selector, &amp;desc, 0, n);</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsm_load_seg_64(struct x86_emulate_ctxt *ctxt, u64 smbase, int n)</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+static int rsm_load_seg_64(struct x86_emulate_ctxt *ctxt, const char *smstate,</div><div class='add'>+			   int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_struct desc;</div><div class='ctx'> 	int offset;</div><div class='hunk'>@@ -2390,15 +2387,16 @@ static int rsm_load_seg_64(struct x86_emulate_ctxt *ctxt, u64 smbase, int n)</div><div class='ctx'> </div><div class='ctx'> 	offset = 0x7e00 + n * 16;</div><div class='ctx'> </div><div class='del'>-	selector =                GET_SMSTATE(u16, smbase, offset);</div><div class='del'>-	rsm_set_desc_flags(&amp;desc, GET_SMSTATE(u16, smbase, offset + 2) &lt;&lt; 8);</div><div class='del'>-	set_desc_limit(&amp;desc,     GET_SMSTATE(u32, smbase, offset + 4));</div><div class='del'>-	set_desc_base(&amp;desc,      GET_SMSTATE(u32, smbase, offset + 8));</div><div class='del'>-	base3 =                   GET_SMSTATE(u32, smbase, offset + 12);</div><div class='add'>+	selector =                GET_SMSTATE(u16, smstate, offset);</div><div class='add'>+	rsm_set_desc_flags(&amp;desc, GET_SMSTATE(u16, smstate, offset + 2) &lt;&lt; 8);</div><div class='add'>+	set_desc_limit(&amp;desc,     GET_SMSTATE(u32, smstate, offset + 4));</div><div class='add'>+	set_desc_base(&amp;desc,      GET_SMSTATE(u32, smstate, offset + 8));</div><div class='add'>+	base3 =                   GET_SMSTATE(u32, smstate, offset + 12);</div><div class='ctx'> </div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_segment(ctxt, selector, &amp;desc, base3, n);</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 				    u64 cr0, u64 cr3, u64 cr4)</div><div class='hunk'>@@ -2445,7 +2443,8 @@ static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, u64 smbase)</div><div class='add'>+static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+			     const char *smstate)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_struct desc;</div><div class='ctx'> 	struct desc_ptr dt;</div><div class='hunk'>@@ -2453,53 +2452,55 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, u64 smbase)</div><div class='ctx'> 	u32 val, cr0, cr3, cr4;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	cr0 =                      GET_SMSTATE(u32, smbase, 0x7ffc);</div><div class='del'>-	cr3 =                      GET_SMSTATE(u32, smbase, 0x7ff8);</div><div class='del'>-	ctxt-&gt;eflags =             GET_SMSTATE(u32, smbase, 0x7ff4) | X86_EFLAGS_FIXED;</div><div class='del'>-	ctxt-&gt;_eip =               GET_SMSTATE(u32, smbase, 0x7ff0);</div><div class='add'>+	cr0 =                      GET_SMSTATE(u32, smstate, 0x7ffc);</div><div class='add'>+	cr3 =                      GET_SMSTATE(u32, smstate, 0x7ff8);</div><div class='add'>+	ctxt-&gt;eflags =             GET_SMSTATE(u32, smstate, 0x7ff4) | X86_EFLAGS_FIXED;</div><div class='add'>+	ctxt-&gt;_eip =               GET_SMSTATE(u32, smstate, 0x7ff0);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		*reg_write(ctxt, i) = GET_SMSTATE(u32, smbase, 0x7fd0 + i * 4);</div><div class='add'>+		*reg_write(ctxt, i) = GET_SMSTATE(u32, smstate, 0x7fd0 + i * 4);</div><div class='ctx'> </div><div class='del'>-	val = GET_SMSTATE(u32, smbase, 0x7fcc);</div><div class='add'>+	val = GET_SMSTATE(u32, smstate, 0x7fcc);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_dr(ctxt, 6, (val &amp; DR6_VOLATILE) | DR6_FIXED_1);</div><div class='del'>-	val = GET_SMSTATE(u32, smbase, 0x7fc8);</div><div class='add'>+	val = GET_SMSTATE(u32, smstate, 0x7fc8);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_dr(ctxt, 7, (val &amp; DR7_VOLATILE) | DR7_FIXED_1);</div><div class='ctx'> </div><div class='del'>-	selector =                 GET_SMSTATE(u32, smbase, 0x7fc4);</div><div class='del'>-	set_desc_base(&amp;desc,       GET_SMSTATE(u32, smbase, 0x7f64));</div><div class='del'>-	set_desc_limit(&amp;desc,      GET_SMSTATE(u32, smbase, 0x7f60));</div><div class='del'>-	rsm_set_desc_flags(&amp;desc,  GET_SMSTATE(u32, smbase, 0x7f5c));</div><div class='add'>+	selector =                 GET_SMSTATE(u32, smstate, 0x7fc4);</div><div class='add'>+	set_desc_base(&amp;desc,       GET_SMSTATE(u32, smstate, 0x7f64));</div><div class='add'>+	set_desc_limit(&amp;desc,      GET_SMSTATE(u32, smstate, 0x7f60));</div><div class='add'>+	rsm_set_desc_flags(&amp;desc,  GET_SMSTATE(u32, smstate, 0x7f5c));</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_segment(ctxt, selector, &amp;desc, 0, VCPU_SREG_TR);</div><div class='ctx'> </div><div class='del'>-	selector =                 GET_SMSTATE(u32, smbase, 0x7fc0);</div><div class='del'>-	set_desc_base(&amp;desc,       GET_SMSTATE(u32, smbase, 0x7f80));</div><div class='del'>-	set_desc_limit(&amp;desc,      GET_SMSTATE(u32, smbase, 0x7f7c));</div><div class='del'>-	rsm_set_desc_flags(&amp;desc,  GET_SMSTATE(u32, smbase, 0x7f78));</div><div class='add'>+	selector =                 GET_SMSTATE(u32, smstate, 0x7fc0);</div><div class='add'>+	set_desc_base(&amp;desc,       GET_SMSTATE(u32, smstate, 0x7f80));</div><div class='add'>+	set_desc_limit(&amp;desc,      GET_SMSTATE(u32, smstate, 0x7f7c));</div><div class='add'>+	rsm_set_desc_flags(&amp;desc,  GET_SMSTATE(u32, smstate, 0x7f78));</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_segment(ctxt, selector, &amp;desc, 0, VCPU_SREG_LDTR);</div><div class='ctx'> </div><div class='del'>-	dt.address =               GET_SMSTATE(u32, smbase, 0x7f74);</div><div class='del'>-	dt.size =                  GET_SMSTATE(u32, smbase, 0x7f70);</div><div class='add'>+	dt.address =               GET_SMSTATE(u32, smstate, 0x7f74);</div><div class='add'>+	dt.size =                  GET_SMSTATE(u32, smstate, 0x7f70);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_gdt(ctxt, &amp;dt);</div><div class='ctx'> </div><div class='del'>-	dt.address =               GET_SMSTATE(u32, smbase, 0x7f58);</div><div class='del'>-	dt.size =                  GET_SMSTATE(u32, smbase, 0x7f54);</div><div class='add'>+	dt.address =               GET_SMSTATE(u32, smstate, 0x7f58);</div><div class='add'>+	dt.size =                  GET_SMSTATE(u32, smstate, 0x7f54);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_idt(ctxt, &amp;dt);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++) {</div><div class='del'>-		int r = rsm_load_seg_32(ctxt, smbase, i);</div><div class='add'>+		int r = rsm_load_seg_32(ctxt, smstate, i);</div><div class='ctx'> 		if (r != X86EMUL_CONTINUE)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cr4 = GET_SMSTATE(u32, smbase, 0x7f14);</div><div class='add'>+	cr4 = GET_SMSTATE(u32, smstate, 0x7f14);</div><div class='ctx'> </div><div class='del'>-	ctxt-&gt;ops-&gt;set_smbase(ctxt, GET_SMSTATE(u32, smbase, 0x7ef8));</div><div class='add'>+	ctxt-&gt;ops-&gt;set_smbase(ctxt, GET_SMSTATE(u32, smstate, 0x7ef8));</div><div class='ctx'> </div><div class='ctx'> 	return rsm_enter_protected_mode(ctxt, cr0, cr3, cr4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+			     const char *smstate)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_struct desc;</div><div class='ctx'> 	struct desc_ptr dt;</div><div class='hunk'>@@ -2509,43 +2510,43 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)</div><div class='ctx'> 	int i, r;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		*reg_write(ctxt, i) = GET_SMSTATE(u64, smbase, 0x7ff8 - i * 8);</div><div class='add'>+		*reg_write(ctxt, i) = GET_SMSTATE(u64, smstate, 0x7ff8 - i * 8);</div><div class='ctx'> </div><div class='del'>-	ctxt-&gt;_eip   = GET_SMSTATE(u64, smbase, 0x7f78);</div><div class='del'>-	ctxt-&gt;eflags = GET_SMSTATE(u32, smbase, 0x7f70) | X86_EFLAGS_FIXED;</div><div class='add'>+	ctxt-&gt;_eip   = GET_SMSTATE(u64, smstate, 0x7f78);</div><div class='add'>+	ctxt-&gt;eflags = GET_SMSTATE(u32, smstate, 0x7f70) | X86_EFLAGS_FIXED;</div><div class='ctx'> </div><div class='del'>-	val = GET_SMSTATE(u32, smbase, 0x7f68);</div><div class='add'>+	val = GET_SMSTATE(u32, smstate, 0x7f68);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_dr(ctxt, 6, (val &amp; DR6_VOLATILE) | DR6_FIXED_1);</div><div class='del'>-	val = GET_SMSTATE(u32, smbase, 0x7f60);</div><div class='add'>+	val = GET_SMSTATE(u32, smstate, 0x7f60);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_dr(ctxt, 7, (val &amp; DR7_VOLATILE) | DR7_FIXED_1);</div><div class='ctx'> </div><div class='del'>-	cr0 =                       GET_SMSTATE(u64, smbase, 0x7f58);</div><div class='del'>-	cr3 =                       GET_SMSTATE(u64, smbase, 0x7f50);</div><div class='del'>-	cr4 =                       GET_SMSTATE(u64, smbase, 0x7f48);</div><div class='del'>-	ctxt-&gt;ops-&gt;set_smbase(ctxt, GET_SMSTATE(u32, smbase, 0x7f00));</div><div class='del'>-	val =                       GET_SMSTATE(u64, smbase, 0x7ed0);</div><div class='add'>+	cr0 =                       GET_SMSTATE(u64, smstate, 0x7f58);</div><div class='add'>+	cr3 =                       GET_SMSTATE(u64, smstate, 0x7f50);</div><div class='add'>+	cr4 =                       GET_SMSTATE(u64, smstate, 0x7f48);</div><div class='add'>+	ctxt-&gt;ops-&gt;set_smbase(ctxt, GET_SMSTATE(u32, smstate, 0x7f00));</div><div class='add'>+	val =                       GET_SMSTATE(u64, smstate, 0x7ed0);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_msr(ctxt, MSR_EFER, val &amp; ~EFER_LMA);</div><div class='ctx'> </div><div class='del'>-	selector =                  GET_SMSTATE(u32, smbase, 0x7e90);</div><div class='del'>-	rsm_set_desc_flags(&amp;desc,   GET_SMSTATE(u32, smbase, 0x7e92) &lt;&lt; 8);</div><div class='del'>-	set_desc_limit(&amp;desc,       GET_SMSTATE(u32, smbase, 0x7e94));</div><div class='del'>-	set_desc_base(&amp;desc,        GET_SMSTATE(u32, smbase, 0x7e98));</div><div class='del'>-	base3 =                     GET_SMSTATE(u32, smbase, 0x7e9c);</div><div class='add'>+	selector =                  GET_SMSTATE(u32, smstate, 0x7e90);</div><div class='add'>+	rsm_set_desc_flags(&amp;desc,   GET_SMSTATE(u32, smstate, 0x7e92) &lt;&lt; 8);</div><div class='add'>+	set_desc_limit(&amp;desc,       GET_SMSTATE(u32, smstate, 0x7e94));</div><div class='add'>+	set_desc_base(&amp;desc,        GET_SMSTATE(u32, smstate, 0x7e98));</div><div class='add'>+	base3 =                     GET_SMSTATE(u32, smstate, 0x7e9c);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_segment(ctxt, selector, &amp;desc, base3, VCPU_SREG_TR);</div><div class='ctx'> </div><div class='del'>-	dt.size =                   GET_SMSTATE(u32, smbase, 0x7e84);</div><div class='del'>-	dt.address =                GET_SMSTATE(u64, smbase, 0x7e88);</div><div class='add'>+	dt.size =                   GET_SMSTATE(u32, smstate, 0x7e84);</div><div class='add'>+	dt.address =                GET_SMSTATE(u64, smstate, 0x7e88);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_idt(ctxt, &amp;dt);</div><div class='ctx'> </div><div class='del'>-	selector =                  GET_SMSTATE(u32, smbase, 0x7e70);</div><div class='del'>-	rsm_set_desc_flags(&amp;desc,   GET_SMSTATE(u32, smbase, 0x7e72) &lt;&lt; 8);</div><div class='del'>-	set_desc_limit(&amp;desc,       GET_SMSTATE(u32, smbase, 0x7e74));</div><div class='del'>-	set_desc_base(&amp;desc,        GET_SMSTATE(u32, smbase, 0x7e78));</div><div class='del'>-	base3 =                     GET_SMSTATE(u32, smbase, 0x7e7c);</div><div class='add'>+	selector =                  GET_SMSTATE(u32, smstate, 0x7e70);</div><div class='add'>+	rsm_set_desc_flags(&amp;desc,   GET_SMSTATE(u32, smstate, 0x7e72) &lt;&lt; 8);</div><div class='add'>+	set_desc_limit(&amp;desc,       GET_SMSTATE(u32, smstate, 0x7e74));</div><div class='add'>+	set_desc_base(&amp;desc,        GET_SMSTATE(u32, smstate, 0x7e78));</div><div class='add'>+	base3 =                     GET_SMSTATE(u32, smstate, 0x7e7c);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_segment(ctxt, selector, &amp;desc, base3, VCPU_SREG_LDTR);</div><div class='ctx'> </div><div class='del'>-	dt.size =                   GET_SMSTATE(u32, smbase, 0x7e64);</div><div class='del'>-	dt.address =                GET_SMSTATE(u64, smbase, 0x7e68);</div><div class='add'>+	dt.size =                   GET_SMSTATE(u32, smstate, 0x7e64);</div><div class='add'>+	dt.address =                GET_SMSTATE(u64, smstate, 0x7e68);</div><div class='ctx'> 	ctxt-&gt;ops-&gt;set_gdt(ctxt, &amp;dt);</div><div class='ctx'> </div><div class='ctx'> 	r = rsm_enter_protected_mode(ctxt, cr0, cr3, cr4);</div><div class='hunk'>@@ -2553,37 +2554,49 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++) {</div><div class='del'>-		r = rsm_load_seg_64(ctxt, smbase, i);</div><div class='add'>+		r = rsm_load_seg_64(ctxt, smstate, i);</div><div class='ctx'> 		if (r != X86EMUL_CONTINUE)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int em_rsm(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cr0, cr4, efer;</div><div class='add'>+	char buf[512];</div><div class='ctx'> 	u64 smbase;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if ((ctxt-&gt;ops-&gt;get_hflags(ctxt) &amp; X86EMUL_SMM_MASK) == 0)</div><div class='ctx'> 		return emulate_ud(ctxt);</div><div class='ctx'> </div><div class='add'>+	smbase = ctxt-&gt;ops-&gt;get_smbase(ctxt);</div><div class='add'>+</div><div class='add'>+	ret = ctxt-&gt;ops-&gt;read_phys(ctxt, smbase + 0xfe00, buf, sizeof(buf));</div><div class='add'>+	if (ret != X86EMUL_CONTINUE)</div><div class='add'>+		return X86EMUL_UNHANDLEABLE;</div><div class='add'>+</div><div class='add'>+	if ((ctxt-&gt;ops-&gt;get_hflags(ctxt) &amp; X86EMUL_SMM_INSIDE_NMI_MASK) == 0)</div><div class='add'>+		ctxt-&gt;ops-&gt;set_nmi_mask(ctxt, false);</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ops-&gt;set_hflags(ctxt, ctxt-&gt;ops-&gt;get_hflags(ctxt) &amp;</div><div class='add'>+		~(X86EMUL_SMM_INSIDE_NMI_MASK | X86EMUL_SMM_MASK));</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get back to real mode, to prepare a safe state in which to load</div><div class='ctx'> 	 * CR0/CR3/CR4/EFER.  It's all a bit more complicated if the vCPU</div><div class='ctx'> 	 * supports long mode.</div><div class='ctx'> 	 */</div><div class='del'>-	cr4 = ctxt-&gt;ops-&gt;get_cr(ctxt, 4);</div><div class='ctx'> 	if (emulator_has_longmode(ctxt)) {</div><div class='ctx'> 		struct desc_struct cs_desc;</div><div class='ctx'> </div><div class='ctx'> 		/* Zero CR4.PCIDE before CR0.PG.  */</div><div class='del'>-		if (cr4 &amp; X86_CR4_PCIDE) {</div><div class='add'>+		cr4 = ctxt-&gt;ops-&gt;get_cr(ctxt, 4);</div><div class='add'>+		if (cr4 &amp; X86_CR4_PCIDE)</div><div class='ctx'> 			ctxt-&gt;ops-&gt;set_cr(ctxt, 4, cr4 &amp; ~X86_CR4_PCIDE);</div><div class='del'>-			cr4 &amp;= ~X86_CR4_PCIDE;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* A 32-bit code segment is required to clear EFER.LMA.  */</div><div class='ctx'> 		memset(&amp;cs_desc, 0, sizeof(cs_desc));</div><div class='hunk'>@@ -2597,39 +2610,39 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	if (cr0 &amp; X86_CR0_PE)</div><div class='ctx'> 		ctxt-&gt;ops-&gt;set_cr(ctxt, 0, cr0 &amp; ~(X86_CR0_PG | X86_CR0_PE));</div><div class='ctx'> </div><div class='del'>-	/* Now clear CR4.PAE (which must be done before clearing EFER.LME).  */</div><div class='del'>-	if (cr4 &amp; X86_CR4_PAE)</div><div class='del'>-		ctxt-&gt;ops-&gt;set_cr(ctxt, 4, cr4 &amp; ~X86_CR4_PAE);</div><div class='del'>-</div><div class='del'>-	/* And finally go back to 32-bit mode.  */</div><div class='del'>-	efer = 0;</div><div class='del'>-	ctxt-&gt;ops-&gt;set_msr(ctxt, MSR_EFER, efer);</div><div class='add'>+	if (emulator_has_longmode(ctxt)) {</div><div class='add'>+		/* Clear CR4.PAE before clearing EFER.LME. */</div><div class='add'>+		cr4 = ctxt-&gt;ops-&gt;get_cr(ctxt, 4);</div><div class='add'>+		if (cr4 &amp; X86_CR4_PAE)</div><div class='add'>+			ctxt-&gt;ops-&gt;set_cr(ctxt, 4, cr4 &amp; ~X86_CR4_PAE);</div><div class='ctx'> </div><div class='del'>-	smbase = ctxt-&gt;ops-&gt;get_smbase(ctxt);</div><div class='add'>+		/* And finally go back to 32-bit mode.  */</div><div class='add'>+		efer = 0;</div><div class='add'>+		ctxt-&gt;ops-&gt;set_msr(ctxt, MSR_EFER, efer);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Give pre_leave_smm() a chance to make ISA-specific changes to the</div><div class='ctx'> 	 * vCPU state (e.g. enter guest mode) before loading state from the SMM</div><div class='ctx'> 	 * state-save area.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ctxt-&gt;ops-&gt;pre_leave_smm(ctxt, smbase))</div><div class='add'>+	if (ctxt-&gt;ops-&gt;pre_leave_smm(ctxt, buf))</div><div class='ctx'> 		return X86EMUL_UNHANDLEABLE;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	if (emulator_has_longmode(ctxt))</div><div class='del'>-		ret = rsm_load_state_64(ctxt, smbase + 0x8000);</div><div class='add'>+		ret = rsm_load_state_64(ctxt, buf);</div><div class='ctx'> 	else</div><div class='del'>-		ret = rsm_load_state_32(ctxt, smbase + 0x8000);</div><div class='add'>+#endif</div><div class='add'>+		ret = rsm_load_state_32(ctxt, buf);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != X86EMUL_CONTINUE) {</div><div class='ctx'> 		/* FIXME: should triple fault */</div><div class='ctx'> 		return X86EMUL_UNHANDLEABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ctxt-&gt;ops-&gt;get_hflags(ctxt) &amp; X86EMUL_SMM_INSIDE_NMI_MASK) == 0)</div><div class='del'>-		ctxt-&gt;ops-&gt;set_nmi_mask(ctxt, false);</div><div class='add'>+	ctxt-&gt;ops-&gt;post_leave_smm(ctxt);</div><div class='ctx'> </div><div class='del'>-	ctxt-&gt;ops-&gt;set_hflags(ctxt, ctxt-&gt;ops-&gt;get_hflags(ctxt) &amp;</div><div class='del'>-		~(X86EMUL_SMM_INSIDE_NMI_MASK | X86EMUL_SMM_MASK));</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c<br/>index 27c43525a05f..cc24b3a32c44 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/hyperv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/hyperv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/hyperv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/hyperv.c</a></div><div class='hunk'>@@ -526,7 +526,9 @@ static int stimer_set_config(struct kvm_vcpu_hv_stimer *stimer, u64 config,</div><div class='ctx'> 		new_config.enable = 0;</div><div class='ctx'> 	stimer-&gt;config.as_uint64 = new_config.as_uint64;</div><div class='ctx'> </div><div class='del'>-	stimer_mark_pending(stimer, false);</div><div class='add'>+	if (stimer-&gt;config.enable)</div><div class='add'>+		stimer_mark_pending(stimer, false);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -542,7 +544,10 @@ static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count,</div><div class='ctx'> 		stimer-&gt;config.enable = 0;</div><div class='ctx'> 	else if (stimer-&gt;config.auto_enable)</div><div class='ctx'> 		stimer-&gt;config.enable = 1;</div><div class='del'>-	stimer_mark_pending(stimer, false);</div><div class='add'>+</div><div class='add'>+	if (stimer-&gt;config.enable)</div><div class='add'>+		stimer_mark_pending(stimer, false);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1366,7 +1371,16 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *current_vcpu, u64 ingpa,</div><div class='ctx'> </div><div class='ctx'> 		valid_bank_mask = BIT_ULL(0);</div><div class='ctx'> 		sparse_banks[0] = flush.processor_mask;</div><div class='del'>-		all_cpus = flush.flags &amp; HV_FLUSH_ALL_PROCESSORS;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Work around possible WS2012 bug: it sends hypercalls</div><div class='add'>+		 * with processor_mask = 0x0 and HV_FLUSH_ALL_PROCESSORS clear,</div><div class='add'>+		 * while also expecting us to flush something and crashing if</div><div class='add'>+		 * we don't. Let's treat processor_mask == 0 same as</div><div class='add'>+		 * HV_FLUSH_ALL_PROCESSORS.</div><div class='add'>+		 */</div><div class='add'>+		all_cpus = (flush.flags &amp; HV_FLUSH_ALL_PROCESSORS) ||</div><div class='add'>+			flush.processor_mask == 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (unlikely(kvm_read_guest(kvm, ingpa, &amp;flush_ex,</div><div class='ctx'> 					    sizeof(flush_ex))))</div><div class='head'>diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c<br/>index 991fdf7fc17f..bd13fdddbdc4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/lapic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/lapic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/lapic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/lapic.c</a></div><div class='hunk'>@@ -70,7 +70,6 @@</div><div class='ctx'> #define APIC_BROADCAST			0xFF</div><div class='ctx'> #define X2APIC_BROADCAST		0xFFFFFFFFul</div><div class='ctx'> </div><div class='del'>-static bool lapic_timer_advance_adjust_done = false;</div><div class='ctx'> #define LAPIC_TIMER_ADVANCE_ADJUST_DONE 100</div><div class='ctx'> /* step-by-step approximation to mitigate fluctuation */</div><div class='ctx'> #define LAPIC_TIMER_ADVANCE_ADJUST_STEP 8</div><div class='hunk'>@@ -138,6 +137,7 @@ static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map,</div><div class='ctx'> 		if (offset &lt;= max_apic_id) {</div><div class='ctx'> 			u8 cluster_size = min(max_apic_id - offset + 1, 16U);</div><div class='ctx'> </div><div class='add'>+			offset = array_index_nospec(offset, map-&gt;max_apic_id + 1);</div><div class='ctx'> 			*cluster = &amp;map-&gt;phys_map[offset];</div><div class='ctx'> 			*mask = dest_id &amp; (0xffff &gt;&gt; (16 - cluster_size));</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -901,7 +901,8 @@ static inline bool kvm_apic_map_get_dest_lapic(struct kvm *kvm,</div><div class='ctx'> 		if (irq-&gt;dest_id &gt; map-&gt;max_apic_id) {</div><div class='ctx'> 			*bitmap = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			*dst = &amp;map-&gt;phys_map[irq-&gt;dest_id];</div><div class='add'>+			u32 dest_id = array_index_nospec(irq-&gt;dest_id, map-&gt;max_apic_id + 1);</div><div class='add'>+			*dst = &amp;map-&gt;phys_map[dest_id];</div><div class='ctx'> 			*bitmap = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -1480,14 +1481,32 @@ static bool lapic_timer_int_injected(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void __wait_lapic_expire(struct kvm_vcpu *vcpu, u64 guest_cycles)</div><div class='add'>+{</div><div class='add'>+	u64 timer_advance_ns = vcpu-&gt;arch.apic-&gt;lapic_timer.timer_advance_ns;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the guest TSC is running at a different ratio than the host, then</div><div class='add'>+	 * convert the delay to nanoseconds to achieve an accurate delay.  Note</div><div class='add'>+	 * that __delay() uses delay_tsc whenever the hardware has TSC, thus</div><div class='add'>+	 * always for VMX enabled hardware.</div><div class='add'>+	 */</div><div class='add'>+	if (vcpu-&gt;arch.tsc_scaling_ratio == kvm_default_tsc_scaling_ratio) {</div><div class='add'>+		__delay(min(guest_cycles,</div><div class='add'>+			nsec_to_cycles(vcpu, timer_advance_ns)));</div><div class='add'>+	} else {</div><div class='add'>+		u64 delay_ns = guest_cycles * 1000000ULL;</div><div class='add'>+		do_div(delay_ns, vcpu-&gt;arch.virtual_tsc_khz);</div><div class='add'>+		ndelay(min_t(u32, delay_ns, timer_advance_ns));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void wait_lapic_expire(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='add'>+	u32 timer_advance_ns = apic-&gt;lapic_timer.timer_advance_ns;</div><div class='ctx'> 	u64 guest_tsc, tsc_deadline, ns;</div><div class='ctx'> </div><div class='del'>-	if (!lapic_in_kernel(vcpu))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (apic-&gt;lapic_timer.expired_tscdeadline == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1499,33 +1518,37 @@ void wait_lapic_expire(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc());</div><div class='ctx'> 	trace_kvm_wait_lapic_expire(vcpu-&gt;vcpu_id, guest_tsc - tsc_deadline);</div><div class='ctx'> </div><div class='del'>-	/* __delay is delay_tsc whenever the hardware has TSC, thus always.  */</div><div class='ctx'> 	if (guest_tsc &lt; tsc_deadline)</div><div class='del'>-		__delay(min(tsc_deadline - guest_tsc,</div><div class='del'>-			nsec_to_cycles(vcpu, lapic_timer_advance_ns)));</div><div class='add'>+		__wait_lapic_expire(vcpu, tsc_deadline - guest_tsc);</div><div class='ctx'> </div><div class='del'>-	if (!lapic_timer_advance_adjust_done) {</div><div class='add'>+	if (!apic-&gt;lapic_timer.timer_advance_adjust_done) {</div><div class='ctx'> 		/* too early */</div><div class='ctx'> 		if (guest_tsc &lt; tsc_deadline) {</div><div class='ctx'> 			ns = (tsc_deadline - guest_tsc) * 1000000ULL;</div><div class='ctx'> 			do_div(ns, vcpu-&gt;arch.virtual_tsc_khz);</div><div class='del'>-			lapic_timer_advance_ns -= min((unsigned int)ns,</div><div class='del'>-				lapic_timer_advance_ns / LAPIC_TIMER_ADVANCE_ADJUST_STEP);</div><div class='add'>+			timer_advance_ns -= min((u32)ns,</div><div class='add'>+				timer_advance_ns / LAPIC_TIMER_ADVANCE_ADJUST_STEP);</div><div class='ctx'> 		} else {</div><div class='ctx'> 		/* too late */</div><div class='ctx'> 			ns = (guest_tsc - tsc_deadline) * 1000000ULL;</div><div class='ctx'> 			do_div(ns, vcpu-&gt;arch.virtual_tsc_khz);</div><div class='del'>-			lapic_timer_advance_ns += min((unsigned int)ns,</div><div class='del'>-				lapic_timer_advance_ns / LAPIC_TIMER_ADVANCE_ADJUST_STEP);</div><div class='add'>+			timer_advance_ns += min((u32)ns,</div><div class='add'>+				timer_advance_ns / LAPIC_TIMER_ADVANCE_ADJUST_STEP);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (abs(guest_tsc - tsc_deadline) &lt; LAPIC_TIMER_ADVANCE_ADJUST_DONE)</div><div class='del'>-			lapic_timer_advance_adjust_done = true;</div><div class='add'>+			apic-&gt;lapic_timer.timer_advance_adjust_done = true;</div><div class='add'>+		if (unlikely(timer_advance_ns &gt; 5000)) {</div><div class='add'>+			timer_advance_ns = 0;</div><div class='add'>+			apic-&gt;lapic_timer.timer_advance_adjust_done = true;</div><div class='add'>+		}</div><div class='add'>+		apic-&gt;lapic_timer.timer_advance_ns = timer_advance_ns;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void start_sw_tscdeadline(struct kvm_lapic *apic)</div><div class='ctx'> {</div><div class='del'>-	u64 guest_tsc, tscdeadline = apic-&gt;lapic_timer.tscdeadline;</div><div class='add'>+	struct kvm_timer *ktimer = &amp;apic-&gt;lapic_timer;</div><div class='add'>+	u64 guest_tsc, tscdeadline = ktimer-&gt;tscdeadline;</div><div class='ctx'> 	u64 ns = 0;</div><div class='ctx'> 	ktime_t expire;</div><div class='ctx'> 	struct kvm_vcpu *vcpu = apic-&gt;vcpu;</div><div class='hunk'>@@ -1540,13 +1563,15 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic)</div><div class='ctx'> </div><div class='ctx'> 	now = ktime_get();</div><div class='ctx'> 	guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc());</div><div class='del'>-	if (likely(tscdeadline &gt; guest_tsc)) {</div><div class='del'>-		ns = (tscdeadline - guest_tsc) * 1000000ULL;</div><div class='del'>-		do_div(ns, this_tsc_khz);</div><div class='add'>+</div><div class='add'>+	ns = (tscdeadline - guest_tsc) * 1000000ULL;</div><div class='add'>+	do_div(ns, this_tsc_khz);</div><div class='add'>+</div><div class='add'>+	if (likely(tscdeadline &gt; guest_tsc) &amp;&amp;</div><div class='add'>+	    likely(ns &gt; apic-&gt;lapic_timer.timer_advance_ns)) {</div><div class='ctx'> 		expire = ktime_add_ns(now, ns);</div><div class='del'>-		expire = ktime_sub_ns(expire, lapic_timer_advance_ns);</div><div class='del'>-		hrtimer_start(&amp;apic-&gt;lapic_timer.timer,</div><div class='del'>-				expire, HRTIMER_MODE_ABS_PINNED);</div><div class='add'>+		expire = ktime_sub_ns(expire, ktimer-&gt;timer_advance_ns);</div><div class='add'>+		hrtimer_start(&amp;ktimer-&gt;timer, expire, HRTIMER_MODE_ABS_PINNED);</div><div class='ctx'> 	} else</div><div class='ctx'> 		apic_timer_expired(apic);</div><div class='ctx'> </div><div class='hunk'>@@ -2253,7 +2278,7 @@ static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)</div><div class='ctx'> 		return HRTIMER_NORESTART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kvm_create_lapic(struct kvm_vcpu *vcpu)</div><div class='add'>+int kvm_create_lapic(struct kvm_vcpu *vcpu, int timer_advance_ns)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_lapic *apic;</div><div class='ctx'> </div><div class='hunk'>@@ -2277,6 +2302,14 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	hrtimer_init(&amp;apic-&gt;lapic_timer.timer, CLOCK_MONOTONIC,</div><div class='ctx'> 		     HRTIMER_MODE_ABS_PINNED);</div><div class='ctx'> 	apic-&gt;lapic_timer.timer.function = apic_timer_fn;</div><div class='add'>+	if (timer_advance_ns == -1) {</div><div class='add'>+		apic-&gt;lapic_timer.timer_advance_ns = 1000;</div><div class='add'>+		apic-&gt;lapic_timer.timer_advance_adjust_done = false;</div><div class='add'>+	} else {</div><div class='add'>+		apic-&gt;lapic_timer.timer_advance_ns = timer_advance_ns;</div><div class='add'>+		apic-&gt;lapic_timer.timer_advance_adjust_done = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * APIC is created enabled. This will prevent kvm_lapic_set_base from</div><div class='head'>diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h<br/>index ff6ef9c3d760..d6d049ba3045 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/lapic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/lapic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/lapic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/lapic.h</a></div><div class='hunk'>@@ -31,8 +31,10 @@ struct kvm_timer {</div><div class='ctx'> 	u32 timer_mode_mask;</div><div class='ctx'> 	u64 tscdeadline;</div><div class='ctx'> 	u64 expired_tscdeadline;</div><div class='add'>+	u32 timer_advance_ns;</div><div class='ctx'> 	atomic_t pending;			/* accumulated triggered timers */</div><div class='ctx'> 	bool hv_timer_in_use;</div><div class='add'>+	bool timer_advance_adjust_done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_lapic {</div><div class='hunk'>@@ -62,7 +64,7 @@ struct kvm_lapic {</div><div class='ctx'> </div><div class='ctx'> struct dest_map;</div><div class='ctx'> </div><div class='del'>-int kvm_create_lapic(struct kvm_vcpu *vcpu);</div><div class='add'>+int kvm_create_lapic(struct kvm_vcpu *vcpu, int timer_advance_ns);</div><div class='ctx'> void kvm_free_lapic(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu);</div><div class='head'>diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c<br/>index 7837ab001d80..d9c7b45d231f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/mmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/mmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/mmu.c</a></div><div class='hunk'>@@ -182,7 +182,7 @@ struct kvm_shadow_walk_iterator {</div><div class='ctx'> </div><div class='ctx'> static const union kvm_mmu_page_role mmu_base_role_mask = {</div><div class='ctx'> 	.cr0_wp = 1,</div><div class='del'>-	.cr4_pae = 1,</div><div class='add'>+	.gpte_is_8_bytes = 1,</div><div class='ctx'> 	.nxe = 1,</div><div class='ctx'> 	.smep_andnot_wp = 1,</div><div class='ctx'> 	.smap_andnot_wp = 1,</div><div class='hunk'>@@ -2007,7 +2007,7 @@ static int is_empty_shadow_page(u64 *spt)</div><div class='ctx'>  * aggregate version in order to make the slab shrinker</div><div class='ctx'>  * faster</div><div class='ctx'>  */</div><div class='del'>-static inline void kvm_mod_used_mmu_pages(struct kvm *kvm, int nr)</div><div class='add'>+static inline void kvm_mod_used_mmu_pages(struct kvm *kvm, unsigned long nr)</div><div class='ctx'> {</div><div class='ctx'> 	kvm-&gt;arch.n_used_mmu_pages += nr;</div><div class='ctx'> 	percpu_counter_add(&amp;kvm_total_used_mmu_pages, nr);</div><div class='hunk'>@@ -2205,6 +2205,7 @@ static bool kvm_mmu_prepare_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp,</div><div class='ctx'> static void kvm_mmu_commit_zap_page(struct kvm *kvm,</div><div class='ctx'> 				    struct list_head *invalid_list);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> #define for_each_valid_sp(_kvm, _sp, _gfn)				\</div><div class='ctx'> 	hlist_for_each_entry(_sp,					\</div><div class='ctx'> 	  &amp;(_kvm)-&gt;arch.mmu_page_hash[kvm_page_table_hashfn(_gfn)], hash_link) \</div><div class='hunk'>@@ -2215,12 +2216,17 @@ static void kvm_mmu_commit_zap_page(struct kvm *kvm,</div><div class='ctx'> 	for_each_valid_sp(_kvm, _sp, _gfn)				\</div><div class='ctx'> 		if ((_sp)-&gt;gfn != (_gfn) || (_sp)-&gt;role.direct) {} else</div><div class='ctx'> </div><div class='add'>+static inline bool is_ept_sp(struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	return sp-&gt;role.cr0_wp &amp;&amp; sp-&gt;role.smap_andnot_wp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* @sp-&gt;gfn should be write-protected at the call site */</div><div class='ctx'> static bool __kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,</div><div class='ctx'> 			    struct list_head *invalid_list)</div><div class='ctx'> {</div><div class='del'>-	if (sp-&gt;role.cr4_pae != !!is_pae(vcpu)</div><div class='del'>-	    || vcpu-&gt;arch.mmu-&gt;sync_page(vcpu, sp) == 0) {</div><div class='add'>+	if ((!is_ept_sp(sp) &amp;&amp; sp-&gt;role.gpte_is_8_bytes != !!is_pae(vcpu)) ||</div><div class='add'>+	    vcpu-&gt;arch.mmu-&gt;sync_page(vcpu, sp) == 0) {</div><div class='ctx'> 		kvm_mmu_prepare_zap_page(vcpu-&gt;kvm, sp, invalid_list);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2232,7 +2238,7 @@ static bool kvm_mmu_remote_flush_or_zap(struct kvm *kvm,</div><div class='ctx'> 					struct list_head *invalid_list,</div><div class='ctx'> 					bool remote_flush)</div><div class='ctx'> {</div><div class='del'>-	if (!remote_flush &amp;&amp; !list_empty(invalid_list))</div><div class='add'>+	if (!remote_flush &amp;&amp; list_empty(invalid_list))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(invalid_list))</div><div class='hunk'>@@ -2423,7 +2429,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	role.level = level;</div><div class='ctx'> 	role.direct = direct;</div><div class='ctx'> 	if (role.direct)</div><div class='del'>-		role.cr4_pae = 0;</div><div class='add'>+		role.gpte_is_8_bytes = true;</div><div class='ctx'> 	role.access = access;</div><div class='ctx'> 	if (!vcpu-&gt;arch.mmu-&gt;direct_map</div><div class='ctx'> 	    &amp;&amp; vcpu-&gt;arch.mmu-&gt;root_level &lt;= PT32_ROOT_LEVEL) {</div><div class='hunk'>@@ -2757,7 +2763,7 @@ static bool prepare_zap_oldest_mmu_page(struct kvm *kvm,</div><div class='ctx'>  * Changing the number of mmu pages allocated to the vm</div><div class='ctx'>  * Note: if goal_nr_mmu_pages is too small, you will get dead lock</div><div class='ctx'>  */</div><div class='del'>-void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int goal_nr_mmu_pages)</div><div class='add'>+void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned long goal_nr_mmu_pages)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(invalid_list);</div><div class='ctx'> </div><div class='hunk'>@@ -4775,6 +4781,7 @@ static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	union kvm_mmu_extended_role ext = {0};</div><div class='ctx'> </div><div class='ctx'> 	ext.cr0_pg = !!is_paging(vcpu);</div><div class='add'>+	ext.cr4_pae = !!is_pae(vcpu);</div><div class='ctx'> 	ext.cr4_smep = !!kvm_read_cr4_bits(vcpu, X86_CR4_SMEP);</div><div class='ctx'> 	ext.cr4_smap = !!kvm_read_cr4_bits(vcpu, X86_CR4_SMAP);</div><div class='ctx'> 	ext.cr4_pse = !!is_pse(vcpu);</div><div class='hunk'>@@ -4794,7 +4801,6 @@ static union kvm_mmu_role kvm_calc_mmu_role_common(struct kvm_vcpu *vcpu,</div><div class='ctx'> </div><div class='ctx'> 	role.base.access = ACC_ALL;</div><div class='ctx'> 	role.base.nxe = !!is_nx(vcpu);</div><div class='del'>-	role.base.cr4_pae = !!is_pae(vcpu);</div><div class='ctx'> 	role.base.cr0_wp = is_write_protection(vcpu);</div><div class='ctx'> 	role.base.smm = is_smm(vcpu);</div><div class='ctx'> 	role.base.guest_mode = is_guest_mode(vcpu);</div><div class='hunk'>@@ -4815,6 +4821,7 @@ kvm_calc_tdp_mmu_root_page_role(struct kvm_vcpu *vcpu, bool base_only)</div><div class='ctx'> 	role.base.ad_disabled = (shadow_accessed_mask == 0);</div><div class='ctx'> 	role.base.level = kvm_x86_ops-&gt;get_tdp_level(vcpu);</div><div class='ctx'> 	role.base.direct = true;</div><div class='add'>+	role.base.gpte_is_8_bytes = true;</div><div class='ctx'> </div><div class='ctx'> 	return role;</div><div class='ctx'> }</div><div class='hunk'>@@ -4879,6 +4886,7 @@ kvm_calc_shadow_mmu_root_page_role(struct kvm_vcpu *vcpu, bool base_only)</div><div class='ctx'> 	role.base.smap_andnot_wp = role.ext.cr4_smap &amp;&amp;</div><div class='ctx'> 		!is_write_protection(vcpu);</div><div class='ctx'> 	role.base.direct = !is_paging(vcpu);</div><div class='add'>+	role.base.gpte_is_8_bytes = !!is_pae(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_long_mode(vcpu))</div><div class='ctx'> 		role.base.level = PT32E_ROOT_LEVEL;</div><div class='hunk'>@@ -4918,18 +4926,26 @@ static union kvm_mmu_role</div><div class='ctx'> kvm_calc_shadow_ept_root_page_role(struct kvm_vcpu *vcpu, bool accessed_dirty,</div><div class='ctx'> 				   bool execonly)</div><div class='ctx'> {</div><div class='del'>-	union kvm_mmu_role role;</div><div class='add'>+	union kvm_mmu_role role = {0};</div><div class='ctx'> </div><div class='del'>-	/* Base role is inherited from root_mmu */</div><div class='del'>-	role.base.word = vcpu-&gt;arch.root_mmu.mmu_role.base.word;</div><div class='del'>-	role.ext = kvm_calc_mmu_role_ext(vcpu);</div><div class='add'>+	/* SMM flag is inherited from root_mmu */</div><div class='add'>+	role.base.smm = vcpu-&gt;arch.root_mmu.mmu_role.base.smm;</div><div class='ctx'> </div><div class='ctx'> 	role.base.level = PT64_ROOT_4LEVEL;</div><div class='add'>+	role.base.gpte_is_8_bytes = true;</div><div class='ctx'> 	role.base.direct = false;</div><div class='ctx'> 	role.base.ad_disabled = !accessed_dirty;</div><div class='ctx'> 	role.base.guest_mode = true;</div><div class='ctx'> 	role.base.access = ACC_ALL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * WP=1 and NOT_WP=1 is an impossible combination, use WP and the</div><div class='add'>+	 * SMAP variation to denote shadow EPT entries.</div><div class='add'>+	 */</div><div class='add'>+	role.base.cr0_wp = true;</div><div class='add'>+	role.base.smap_andnot_wp = true;</div><div class='add'>+</div><div class='add'>+	role.ext = kvm_calc_mmu_role_ext(vcpu);</div><div class='ctx'> 	role.ext.execonly = execonly;</div><div class='ctx'> </div><div class='ctx'> 	return role;</div><div class='hunk'>@@ -5179,7 +5195,7 @@ static bool detect_write_misaligned(struct kvm_mmu_page *sp, gpa_t gpa,</div><div class='ctx'> 		 gpa, bytes, sp-&gt;role.word);</div><div class='ctx'> </div><div class='ctx'> 	offset = offset_in_page(gpa);</div><div class='del'>-	pte_size = sp-&gt;role.cr4_pae ? 8 : 4;</div><div class='add'>+	pte_size = sp-&gt;role.gpte_is_8_bytes ? 8 : 4;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sometimes, the OS only writes the last one bytes to update status</div><div class='hunk'>@@ -5203,7 +5219,7 @@ static u64 *get_written_sptes(struct kvm_mmu_page *sp, gpa_t gpa, int *nspte)</div><div class='ctx'> 	page_offset = offset_in_page(gpa);</div><div class='ctx'> 	level = sp-&gt;role.level;</div><div class='ctx'> 	*nspte = 1;</div><div class='del'>-	if (!sp-&gt;role.cr4_pae) {</div><div class='add'>+	if (!sp-&gt;role.gpte_is_8_bytes) {</div><div class='ctx'> 		page_offset &lt;&lt;= 1;	/* 32-&gt;64 */</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * A 32-bit pde maps 4MB while the shadow pdes map</div><div class='hunk'>@@ -5393,10 +5409,12 @@ emulate:</div><div class='ctx'> 	 * This can happen if a guest gets a page-fault on data access but the HW</div><div class='ctx'> 	 * table walker is not able to read the instruction page (e.g instruction</div><div class='ctx'> 	 * page is not present in memory). In those cases we simply restart the</div><div class='del'>-	 * guest.</div><div class='add'>+	 * guest, with the exception of AMD Erratum 1096 which is unrecoverable.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(insn &amp;&amp; !insn_len))</div><div class='del'>-		return 1;</div><div class='add'>+	if (unlikely(insn &amp;&amp; !insn_len)) {</div><div class='add'>+		if (!kvm_x86_ops-&gt;need_emulation_on_page_fault(vcpu))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	er = x86_emulate_instruction(vcpu, cr2, emulation_type, insn, insn_len);</div><div class='ctx'> </div><div class='hunk'>@@ -5509,7 +5527,9 @@ slot_handle_level_range(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='ctx'> </div><div class='ctx'> 		if (need_resched() || spin_needbreak(&amp;kvm-&gt;mmu_lock)) {</div><div class='ctx'> 			if (flush &amp;&amp; lock_flush_tlb) {</div><div class='del'>-				kvm_flush_remote_tlbs(kvm);</div><div class='add'>+				kvm_flush_remote_tlbs_with_address(kvm,</div><div class='add'>+						start_gfn,</div><div class='add'>+						iterator.gfn - start_gfn + 1);</div><div class='ctx'> 				flush = false;</div><div class='ctx'> 			}</div><div class='ctx'> 			cond_resched_lock(&amp;kvm-&gt;mmu_lock);</div><div class='hunk'>@@ -5517,7 +5537,8 @@ slot_handle_level_range(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flush &amp;&amp; lock_flush_tlb) {</div><div class='del'>-		kvm_flush_remote_tlbs(kvm);</div><div class='add'>+		kvm_flush_remote_tlbs_with_address(kvm, start_gfn,</div><div class='add'>+						   end_gfn - start_gfn + 1);</div><div class='ctx'> 		flush = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6011,10 +6032,10 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * Calculate mmu pages needed for kvm.</div><div class='ctx'>  */</div><div class='del'>-unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)</div><div class='add'>+unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	unsigned int nr_mmu_pages;</div><div class='del'>-	unsigned int  nr_pages = 0;</div><div class='add'>+	unsigned long nr_mmu_pages;</div><div class='add'>+	unsigned long nr_pages = 0;</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -6027,8 +6048,7 @@ unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nr_mmu_pages = nr_pages * KVM_PERMILLE_MMU_PAGES / 1000;</div><div class='del'>-	nr_mmu_pages = max(nr_mmu_pages,</div><div class='del'>-			   (unsigned int) KVM_MIN_ALLOC_MMU_PAGES);</div><div class='add'>+	nr_mmu_pages = max(nr_mmu_pages, KVM_MIN_ALLOC_MMU_PAGES);</div><div class='ctx'> </div><div class='ctx'> 	return nr_mmu_pages;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h<br/>index bbdc60f2fae8..54c2a377795b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/mmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/mmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/mmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/mmu.h</a></div><div class='hunk'>@@ -64,7 +64,7 @@ bool kvm_can_do_async_pf(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_handle_page_fault(struct kvm_vcpu *vcpu, u64 error_code,</div><div class='ctx'> 				u64 fault_address, char *insn, int insn_len);</div><div class='ctx'> </div><div class='del'>-static inline unsigned int kvm_mmu_available_pages(struct kvm *kvm)</div><div class='add'>+static inline unsigned long kvm_mmu_available_pages(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	if (kvm-&gt;arch.n_max_mmu_pages &gt; kvm-&gt;arch.n_used_mmu_pages)</div><div class='ctx'> 		return kvm-&gt;arch.n_max_mmu_pages -</div><div class='head'>diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h<br/>index 9f6c855a0043..dd30dccd2ad5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/mmutrace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/mmutrace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/mmutrace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/mmutrace.h</a></div><div class='hunk'>@@ -29,10 +29,10 @@</div><div class='ctx'> 								        \</div><div class='ctx'> 	role.word = __entry-&gt;role;					\</div><div class='ctx'> 									\</div><div class='del'>-	trace_seq_printf(p, "sp gfn %llx l%u%s q%u%s %s%s"		\</div><div class='add'>+	trace_seq_printf(p, "sp gfn %llx l%u %u-byte q%u%s %s%s"	\</div><div class='ctx'> 			 " %snxe %sad root %u %s%c",			\</div><div class='ctx'> 			 __entry-&gt;gfn, role.level,			\</div><div class='del'>-			 role.cr4_pae ? " pae" : "",			\</div><div class='add'>+			 role.gpte_is_8_bytes ? 8 : 4,			\</div><div class='ctx'> 			 role.quadrant,					\</div><div class='ctx'> 			 role.direct ? " direct" : "",			\</div><div class='ctx'> 			 access_str[role.access],			\</div><div class='head'>diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c<br/>index 58ead7db71a3..e39741997893 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/pmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/pmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/pmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/pmu.c</a></div><div class='hunk'>@@ -281,9 +281,13 @@ static int kvm_pmu_rdpmc_vmware(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)</div><div class='ctx'> int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	bool fast_mode = idx &amp; (1u &lt;&lt; 31);</div><div class='add'>+	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);</div><div class='ctx'> 	struct kvm_pmc *pmc;</div><div class='ctx'> 	u64 ctr_val;</div><div class='ctx'> </div><div class='add'>+	if (!pmu-&gt;version)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	if (is_vmware_backdoor_pmc(idx))</div><div class='ctx'> 		return kvm_pmu_rdpmc_vmware(vcpu, idx, data);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c<br/>index b5b128a0a051..406b558abfef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/svm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/svm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/svm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/svm.c</a></div><div class='hunk'>@@ -262,6 +262,7 @@ struct amd_svm_iommu_ir {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK	(0xFF)</div><div class='add'>+#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT			31</div><div class='ctx'> #define AVIC_LOGICAL_ID_ENTRY_VALID_MASK		(1 &lt;&lt; 31)</div><div class='ctx'> </div><div class='ctx'> #define AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK	(0xFFULL)</div><div class='hunk'>@@ -2692,6 +2693,7 @@ static int npf_interception(struct vcpu_svm *svm)</div><div class='ctx'> static int db_interception(struct vcpu_svm *svm)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_run *kvm_run = svm-&gt;vcpu.run;</div><div class='add'>+	struct kvm_vcpu *vcpu = &amp;svm-&gt;vcpu;</div><div class='ctx'> </div><div class='ctx'> 	if (!(svm-&gt;vcpu.guest_debug &amp;</div><div class='ctx'> 	      (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP)) &amp;&amp;</div><div class='hunk'>@@ -2702,6 +2704,8 @@ static int db_interception(struct vcpu_svm *svm)</div><div class='ctx'> </div><div class='ctx'> 	if (svm-&gt;nmi_singlestep) {</div><div class='ctx'> 		disable_nmi_singlestep(svm);</div><div class='add'>+		/* Make sure we check for pending NMIs upon entry */</div><div class='add'>+		kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (svm-&gt;vcpu.guest_debug &amp;</div><div class='hunk'>@@ -4517,14 +4521,25 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm)</div><div class='ctx'> 		kvm_lapic_reg_write(apic, APIC_ICR, icrl);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AVIC_IPI_FAILURE_TARGET_NOT_RUNNING: {</div><div class='add'>+		int i;</div><div class='add'>+		struct kvm_vcpu *vcpu;</div><div class='add'>+		struct kvm *kvm = svm-&gt;vcpu.kvm;</div><div class='ctx'> 		struct kvm_lapic *apic = svm-&gt;vcpu.arch.apic;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Update ICR high and low, then emulate sending IPI,</div><div class='del'>-		 * which is handled when writing APIC_ICR.</div><div class='add'>+		 * At this point, we expect that the AVIC HW has already</div><div class='add'>+		 * set the appropriate IRR bits on the valid target</div><div class='add'>+		 * vcpus. So, we just need to kick the appropriate vcpu.</div><div class='ctx'> 		 */</div><div class='del'>-		kvm_lapic_reg_write(apic, APIC_ICR2, icrh);</div><div class='del'>-		kvm_lapic_reg_write(apic, APIC_ICR, icrl);</div><div class='add'>+		kvm_for_each_vcpu(i, vcpu, kvm) {</div><div class='add'>+			bool m = kvm_apic_match_dest(vcpu, apic,</div><div class='add'>+						     icrl &amp; KVM_APIC_SHORT_MASK,</div><div class='add'>+						     GET_APIC_DEST_FIELD(icrh),</div><div class='add'>+						     icrl &amp; KVM_APIC_DEST_MASK);</div><div class='add'>+</div><div class='add'>+			if (m &amp;&amp; !avic_vcpu_is_running(vcpu))</div><div class='add'>+				kvm_vcpu_wake_up(vcpu);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case AVIC_IPI_FAILURE_INVALID_TARGET:</div><div class='hunk'>@@ -4596,7 +4611,7 @@ static void avic_invalidate_logical_id_entry(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 *entry = avic_get_logical_id_entry(vcpu, svm-&gt;ldr_reg, flat);</div><div class='ctx'> </div><div class='ctx'> 	if (entry)</div><div class='del'>-		WRITE_ONCE(*entry, (u32) ~AVIC_LOGICAL_ID_ENTRY_VALID_MASK);</div><div class='add'>+		clear_bit(AVIC_LOGICAL_ID_ENTRY_VALID_BIT, (unsigned long *)entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int avic_handle_ldr_update(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5621,6 +5636,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	svm-&gt;vmcb-&gt;save.cr2 = vcpu-&gt;arch.cr2;</div><div class='ctx'> </div><div class='ctx'> 	clgi();</div><div class='add'>+	kvm_load_guest_xcr0(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If this vCPU has touched SPEC_CTRL, restore the guest's value if</div><div class='hunk'>@@ -5766,6 +5782,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (unlikely(svm-&gt;vmcb-&gt;control.exit_code == SVM_EXIT_NMI))</div><div class='ctx'> 		kvm_before_interrupt(&amp;svm-&gt;vcpu);</div><div class='ctx'> </div><div class='add'>+	kvm_put_guest_xcr0(vcpu);</div><div class='ctx'> 	stgi();</div><div class='ctx'> </div><div class='ctx'> 	/* Any pending NMI will happen here */</div><div class='hunk'>@@ -6215,32 +6232,24 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, u64 smbase)</div><div class='add'>+static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='ctx'> 	struct vmcb *nested_vmcb;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	struct {</div><div class='del'>-		u64 guest;</div><div class='del'>-		u64 vmcb;</div><div class='del'>-	} svm_state_save;</div><div class='del'>-	int ret;</div><div class='add'>+	u64 guest;</div><div class='add'>+	u64 vmcb;</div><div class='ctx'> </div><div class='del'>-	ret = kvm_vcpu_read_guest(vcpu, smbase + 0xfed8, &amp;svm_state_save,</div><div class='del'>-				  sizeof(svm_state_save));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	guest = GET_SMSTATE(u64, smstate, 0x7ed8);</div><div class='add'>+	vmcb = GET_SMSTATE(u64, smstate, 0x7ee0);</div><div class='ctx'> </div><div class='del'>-	if (svm_state_save.guest) {</div><div class='del'>-		vcpu-&gt;arch.hflags &amp;= ~HF_SMM_MASK;</div><div class='del'>-		nested_vmcb = nested_svm_map(svm, svm_state_save.vmcb, &amp;page);</div><div class='del'>-		if (nested_vmcb)</div><div class='del'>-			enter_svm_guest_mode(svm, svm_state_save.vmcb, nested_vmcb, page);</div><div class='del'>-		else</div><div class='del'>-			ret = 1;</div><div class='del'>-		vcpu-&gt;arch.hflags |= HF_SMM_MASK;</div><div class='add'>+	if (guest) {</div><div class='add'>+		nested_vmcb = nested_svm_map(svm, vmcb, &amp;page);</div><div class='add'>+		if (!nested_vmcb)</div><div class='add'>+			return 1;</div><div class='add'>+		enter_svm_guest_mode(svm, vmcb, nested_vmcb, page);</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'> static int enable_smi_window(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -6422,11 +6431,11 @@ e_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_num_contig_pages(int idx, struct page **inpages,</div><div class='del'>-				unsigned long npages)</div><div class='add'>+static unsigned long get_num_contig_pages(unsigned long idx,</div><div class='add'>+				struct page **inpages, unsigned long npages)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long paddr, next_paddr;</div><div class='del'>-	int i = idx + 1, pages = 1;</div><div class='add'>+	unsigned long i = idx + 1, pages = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* find the number of contiguous pages starting from idx */</div><div class='ctx'> 	paddr = __sme_page_pa(inpages[idx]);</div><div class='hunk'>@@ -6445,12 +6454,12 @@ static int get_num_contig_pages(int idx, struct page **inpages,</div><div class='ctx'> </div><div class='ctx'> static int sev_launch_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long vaddr, vaddr_end, next_vaddr, npages, size;</div><div class='add'>+	unsigned long vaddr, vaddr_end, next_vaddr, npages, pages, size, i;</div><div class='ctx'> 	struct kvm_sev_info *sev = &amp;to_kvm_svm(kvm)-&gt;sev_info;</div><div class='ctx'> 	struct kvm_sev_launch_update_data params;</div><div class='ctx'> 	struct sev_data_launch_update_data *data;</div><div class='ctx'> 	struct page **inpages;</div><div class='del'>-	int i, ret, pages;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!sev_guest(kvm))</div><div class='ctx'> 		return -ENOTTY;</div><div class='hunk'>@@ -6799,7 +6808,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)</div><div class='ctx'> 	struct page **src_p, **dst_p;</div><div class='ctx'> 	struct kvm_sev_dbg debug;</div><div class='ctx'> 	unsigned long n;</div><div class='del'>-	int ret, size;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!sev_guest(kvm))</div><div class='ctx'> 		return -ENOTTY;</div><div class='hunk'>@@ -6807,6 +6817,11 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)</div><div class='ctx'> 	if (copy_from_user(&amp;debug, (void __user *)(uintptr_t)argp-&gt;data, sizeof(debug)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	if (!debug.len || debug.src_uaddr + debug.len &lt; debug.src_uaddr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!debug.dst_uaddr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	vaddr = debug.src_uaddr;</div><div class='ctx'> 	size = debug.len;</div><div class='ctx'> 	vaddr_end = vaddr + size;</div><div class='hunk'>@@ -6857,8 +6872,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)</div><div class='ctx'> 						     dst_vaddr,</div><div class='ctx'> 						     len, &amp;argp-&gt;error);</div><div class='ctx'> </div><div class='del'>-		sev_unpin_memory(kvm, src_p, 1);</div><div class='del'>-		sev_unpin_memory(kvm, dst_p, 1);</div><div class='add'>+		sev_unpin_memory(kvm, src_p, n);</div><div class='add'>+		sev_unpin_memory(kvm, dst_p, n);</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -7098,6 +7113,36 @@ static int nested_enable_evmcs(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	bool is_user, smap;</div><div class='add'>+</div><div class='add'>+	is_user = svm_get_cpl(vcpu) == 3;</div><div class='add'>+	smap = !kvm_read_cr4_bits(vcpu, X86_CR4_SMAP);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Detect and workaround Errata 1096 Fam_17h_00_0Fh</div><div class='add'>+	 *</div><div class='add'>+	 * In non SEV guest, hypervisor will be able to read the guest</div><div class='add'>+	 * memory to decode the instruction pointer when insn_len is zero</div><div class='add'>+	 * so we return true to indicate that decoding is possible.</div><div class='add'>+	 *</div><div class='add'>+	 * But in the SEV guest, the guest memory is encrypted with the</div><div class='add'>+	 * guest specific key and hypervisor will not be able to decode the</div><div class='add'>+	 * instruction pointer so we will not able to workaround it. Lets</div><div class='add'>+	 * print the error and request to kill the guest.</div><div class='add'>+	 */</div><div class='add'>+	if (is_user &amp;&amp; smap) {</div><div class='add'>+		if (!sev_guest(vcpu-&gt;kvm))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		pr_err_ratelimited("KVM: Guest triggered AMD Erratum 1096\n");</div><div class='add'>+		kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);</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 kvm_x86_ops svm_x86_ops __ro_after_init = {</div><div class='ctx'> 	.cpu_has_kvm_support = has_svm,</div><div class='ctx'> 	.disabled_by_bios = is_disabled,</div><div class='hunk'>@@ -7231,6 +7276,8 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {</div><div class='ctx'> </div><div class='ctx'> 	.nested_enable_evmcs = nested_enable_evmcs,</div><div class='ctx'> 	.nested_get_evmcs_version = nested_get_evmcs_version,</div><div class='add'>+</div><div class='add'>+	.need_emulation_on_page_fault = svm_need_emulation_on_page_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init svm_init(void)</div><div class='head'>diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h<br/>index 6432d08c7de7..4d47a2631d1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/trace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/trace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/trace.h</a></div><div class='hunk'>@@ -438,13 +438,13 @@ TRACE_EVENT(kvm_apic_ipi,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(kvm_apic_accept_irq,</div><div class='del'>-	    TP_PROTO(__u32 apicid, __u16 dm, __u8 tm, __u8 vec),</div><div class='add'>+	    TP_PROTO(__u32 apicid, __u16 dm, __u16 tm, __u8 vec),</div><div class='ctx'> 	    TP_ARGS(apicid, dm, tm, vec),</div><div class='ctx'> </div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(	__u32,		apicid		)</div><div class='ctx'> 		__field(	__u16,		dm		)</div><div class='del'>-		__field(	__u8,		tm		)</div><div class='add'>+		__field(	__u16,		tm		)</div><div class='ctx'> 		__field(	__u8,		vec		)</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c<br/>index f24a2c225070..0c601d079cd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/nested.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/nested.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/nested.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/vmx/nested.c</a></div><div class='hunk'>@@ -500,6 +500,17 @@ static void nested_vmx_disable_intercept_for_msr(unsigned long *msr_bitmap_l1,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void enable_x2apic_msr_intercepts(unsigned long *msr_bitmap) {</div><div class='add'>+	int msr;</div><div class='add'>+</div><div class='add'>+	for (msr = 0x800; msr &lt;= 0x8ff; msr += BITS_PER_LONG) {</div><div class='add'>+		unsigned word = msr / BITS_PER_LONG;</div><div class='add'>+</div><div class='add'>+		msr_bitmap[word] = ~0;</div><div class='add'>+		msr_bitmap[word + (0x800 / sizeof(long))] = ~0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Merge L0's and L1's MSR bitmap, return false to indicate that</div><div class='ctx'>  * we do not use the hardware.</div><div class='hunk'>@@ -541,39 +552,44 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	msr_bitmap_l1 = (unsigned long *)kmap(page);</div><div class='del'>-	if (nested_cpu_has_apic_reg_virt(vmcs12)) {</div><div class='del'>-		/*</div><div class='del'>-		 * L0 need not intercept reads for MSRs between 0x800 and 0x8ff, it</div><div class='del'>-		 * just lets the processor take the value from the virtual-APIC page;</div><div class='del'>-		 * take those 256 bits directly from the L1 bitmap.</div><div class='del'>-		 */</div><div class='del'>-		for (msr = 0x800; msr &lt;= 0x8ff; msr += BITS_PER_LONG) {</div><div class='del'>-			unsigned word = msr / BITS_PER_LONG;</div><div class='del'>-			msr_bitmap_l0[word] = msr_bitmap_l1[word];</div><div class='del'>-			msr_bitmap_l0[word + (0x800 / sizeof(long))] = ~0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		for (msr = 0x800; msr &lt;= 0x8ff; msr += BITS_PER_LONG) {</div><div class='del'>-			unsigned word = msr / BITS_PER_LONG;</div><div class='del'>-			msr_bitmap_l0[word] = ~0;</div><div class='del'>-			msr_bitmap_l0[word + (0x800 / sizeof(long))] = ~0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	nested_vmx_disable_intercept_for_msr(</div><div class='del'>-		msr_bitmap_l1, msr_bitmap_l0,</div><div class='del'>-		X2APIC_MSR(APIC_TASKPRI),</div><div class='del'>-		MSR_TYPE_W);</div><div class='add'>+	/*</div><div class='add'>+	 * To keep the control flow simple, pay eight 8-byte writes (sixteen</div><div class='add'>+	 * 4-byte writes on 32-bit systems) up front to enable intercepts for</div><div class='add'>+	 * the x2APIC MSR range and selectively disable them below.</div><div class='add'>+	 */</div><div class='add'>+	enable_x2apic_msr_intercepts(msr_bitmap_l0);</div><div class='add'>+</div><div class='add'>+	if (nested_cpu_has_virt_x2apic_mode(vmcs12)) {</div><div class='add'>+		if (nested_cpu_has_apic_reg_virt(vmcs12)) {</div><div class='add'>+			/*</div><div class='add'>+			 * L0 need not intercept reads for MSRs between 0x800</div><div class='add'>+			 * and 0x8ff, it just lets the processor take the value</div><div class='add'>+			 * from the virtual-APIC page; take those 256 bits</div><div class='add'>+			 * directly from the L1 bitmap.</div><div class='add'>+			 */</div><div class='add'>+			for (msr = 0x800; msr &lt;= 0x8ff; msr += BITS_PER_LONG) {</div><div class='add'>+				unsigned word = msr / BITS_PER_LONG;</div><div class='add'>+</div><div class='add'>+				msr_bitmap_l0[word] = msr_bitmap_l1[word];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (nested_cpu_has_vid(vmcs12)) {</div><div class='del'>-		nested_vmx_disable_intercept_for_msr(</div><div class='del'>-			msr_bitmap_l1, msr_bitmap_l0,</div><div class='del'>-			X2APIC_MSR(APIC_EOI),</div><div class='del'>-			MSR_TYPE_W);</div><div class='ctx'> 		nested_vmx_disable_intercept_for_msr(</div><div class='ctx'> 			msr_bitmap_l1, msr_bitmap_l0,</div><div class='del'>-			X2APIC_MSR(APIC_SELF_IPI),</div><div class='del'>-			MSR_TYPE_W);</div><div class='add'>+			X2APIC_MSR(APIC_TASKPRI),</div><div class='add'>+			MSR_TYPE_R | MSR_TYPE_W);</div><div class='add'>+</div><div class='add'>+		if (nested_cpu_has_vid(vmcs12)) {</div><div class='add'>+			nested_vmx_disable_intercept_for_msr(</div><div class='add'>+				msr_bitmap_l1, msr_bitmap_l0,</div><div class='add'>+				X2APIC_MSR(APIC_EOI),</div><div class='add'>+				MSR_TYPE_W);</div><div class='add'>+			nested_vmx_disable_intercept_for_msr(</div><div class='add'>+				msr_bitmap_l1, msr_bitmap_l0,</div><div class='add'>+				X2APIC_MSR(APIC_SELF_IPI),</div><div class='add'>+				MSR_TYPE_W);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (spec_ctrl)</div><div class='hunk'>@@ -2585,6 +2601,11 @@ static int nested_check_host_control_regs(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	    !nested_host_cr4_valid(vcpu, vmcs12-&gt;host_cr4) ||</div><div class='ctx'> 	    !nested_cr3_valid(vcpu, vmcs12-&gt;host_cr3))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (is_noncanonical_address(vmcs12-&gt;host_ia32_sysenter_esp, vcpu) ||</div><div class='add'>+	    is_noncanonical_address(vmcs12-&gt;host_ia32_sysenter_eip, vcpu))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the load IA32_EFER VM-exit control is 1, bits reserved in the</div><div class='ctx'> 	 * IA32_EFER MSR must be 0 in the field for that register. In addition,</div><div class='hunk'>@@ -2852,20 +2873,27 @@ static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If translation failed, VM entry will fail because</div><div class='ctx'> 		 * prepare_vmcs02 set VIRTUAL_APIC_PAGE_ADDR to -1ull.</div><div class='del'>-		 * Failing the vm entry is _not_ what the processor</div><div class='del'>-		 * does but it's basically the only possibility we</div><div class='del'>-		 * have.  We could still enter the guest if CR8 load</div><div class='del'>-		 * exits are enabled, CR8 store exits are enabled, and</div><div class='del'>-		 * virtualize APIC access is disabled; in this case</div><div class='del'>-		 * the processor would never use the TPR shadow and we</div><div class='del'>-		 * could simply clear the bit from the execution</div><div class='del'>-		 * control.  But such a configuration is useless, so</div><div class='del'>-		 * let's keep the code simple.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!is_error_page(page)) {</div><div class='ctx'> 			vmx-&gt;nested.virtual_apic_page = page;</div><div class='ctx'> 			hpa = page_to_phys(vmx-&gt;nested.virtual_apic_page);</div><div class='ctx'> 			vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, hpa);</div><div class='add'>+		} else if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING) &amp;&amp;</div><div class='add'>+		           nested_cpu_has(vmcs12, CPU_BASED_CR8_STORE_EXITING) &amp;&amp;</div><div class='add'>+			   !nested_cpu_has2(vmcs12, SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) {</div><div class='add'>+			/*</div><div class='add'>+			 * The processor will never use the TPR shadow, simply</div><div class='add'>+			 * clear the bit from the execution control.  Such a</div><div class='add'>+			 * configuration is useless, but it happens in tests.</div><div class='add'>+			 * For any other configuration, failing the vm entry is</div><div class='add'>+			 * _not_ what the processor does but it's basically the</div><div class='add'>+			 * only possibility we have.</div><div class='add'>+			 */</div><div class='add'>+			vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+					CPU_BASED_TPR_SHADOW);</div><div class='add'>+		} else {</div><div class='add'>+			printk("bad virtual-APIC page address\n");</div><div class='add'>+			dump_vmcs();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3768,8 +3796,18 @@ static void nested_vmx_restore_host_state(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vmx_set_cr4(vcpu, vmcs_readl(CR4_READ_SHADOW));</div><div class='ctx'> </div><div class='ctx'> 	nested_ept_uninit_mmu_context(vcpu);</div><div class='del'>-	vcpu-&gt;arch.cr3 = vmcs_readl(GUEST_CR3);</div><div class='del'>-	__set_bit(VCPU_EXREG_CR3, (ulong *)&amp;vcpu-&gt;arch.regs_avail);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is only valid if EPT is in use, otherwise the vmcs01 GUEST_CR3</div><div class='add'>+	 * points to shadow pages!  Fortunately we only get here after a WARN_ON</div><div class='add'>+	 * if EPT is disabled, so a VMabort is perfectly fine.</div><div class='add'>+	 */</div><div class='add'>+	if (enable_ept) {</div><div class='add'>+		vcpu-&gt;arch.cr3 = vmcs_readl(GUEST_CR3);</div><div class='add'>+		__set_bit(VCPU_EXREG_CR3, (ulong *)&amp;vcpu-&gt;arch.regs_avail);</div><div class='add'>+	} else {</div><div class='add'>+		nested_vmx_abort(vcpu, VMX_ABORT_VMCS_CORRUPTED);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Use ept_save_pdptrs(vcpu) to load the MMU's cached PDPTRs</div><div class='hunk'>@@ -5385,7 +5423,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Empty 'VMXON' state is permitted */</div><div class='del'>-	if (kvm_state-&gt;size &lt; sizeof(kvm_state) + sizeof(*vmcs12))</div><div class='add'>+	if (kvm_state-&gt;size &lt; sizeof(*kvm_state) + sizeof(*vmcs12))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (kvm_state-&gt;vmx.vmcs_pa != -1ull) {</div><div class='hunk'>@@ -5429,7 +5467,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	    vmcs12-&gt;vmcs_link_pointer != -1ull) {</div><div class='ctx'> 		struct vmcs12 *shadow_vmcs12 = get_shadow_vmcs12(vcpu);</div><div class='ctx'> </div><div class='del'>-		if (kvm_state-&gt;size &lt; sizeof(kvm_state) + 2 * sizeof(*vmcs12))</div><div class='add'>+		if (kvm_state-&gt;size &lt; sizeof(*kvm_state) + 2 * sizeof(*vmcs12))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(shadow_vmcs12,</div><div class='hunk'>@@ -5717,6 +5755,14 @@ __init int nested_vmx_hardware_setup(int (*exit_handlers[])(struct kvm_vcpu *))</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Without EPT it is not possible to restore L1's CR3 and PDPTR on</div><div class='add'>+	 * VMfail, because they are not available in vmcs01.  Just always</div><div class='add'>+	 * use hardware checks.</div><div class='add'>+	 */</div><div class='add'>+	if (!enable_ept)</div><div class='add'>+		nested_early_check = 1;</div><div class='add'>+</div><div class='ctx'> 	if (!cpu_has_vmx_shadow_vmcs())</div><div class='ctx'> 		enable_shadow_vmcs = 0;</div><div class='ctx'> 	if (enable_shadow_vmcs) {</div><div class='head'>diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S<br/>index 7b272738c576..d4cb1945b2e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/vmenter.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/vmenter.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/vmenter.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/vmx/vmenter.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/bitsperlong.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_vcpu_regs.h&gt;</div><div class='add'>+#include &lt;asm/nospec-branch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define WORD_SIZE (BITS_PER_LONG / 8)</div><div class='ctx'> </div><div class='hunk'>@@ -77,6 +78,17 @@ ENDPROC(vmx_vmenter)</div><div class='ctx'>  * referred to by VMCS.HOST_RIP.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(vmx_vmexit)</div><div class='add'>+#ifdef CONFIG_RETPOLINE</div><div class='add'>+	ALTERNATIVE "jmp .Lvmexit_skip_rsb", "", X86_FEATURE_RETPOLINE</div><div class='add'>+	/* Preserve guest's RAX, it's used to stuff the RSB. */</div><div class='add'>+	push %_ASM_AX</div><div class='add'>+</div><div class='add'>+	/* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */</div><div class='add'>+	FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE</div><div class='add'>+</div><div class='add'>+	pop %_ASM_AX</div><div class='add'>+.Lvmexit_skip_rsb:</div><div class='add'>+#endif</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(vmx_vmexit)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c<br/>index c73375e01ab8..9663d41cc2bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/vmx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/vmx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/vmx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/vmx/vmx.c</a></div><div class='hunk'>@@ -1683,12 +1683,6 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> </div><div class='ctx'> 		msr_info-&gt;data = to_vmx(vcpu)-&gt;spec_ctrl;</div><div class='ctx'> 		break;</div><div class='del'>-	case MSR_IA32_ARCH_CAPABILITIES:</div><div class='del'>-		if (!msr_info-&gt;host_initiated &amp;&amp;</div><div class='del'>-		    !guest_cpuid_has(vcpu, X86_FEATURE_ARCH_CAPABILITIES))</div><div class='del'>-			return 1;</div><div class='del'>-		msr_info-&gt;data = to_vmx(vcpu)-&gt;arch_capabilities;</div><div class='del'>-		break;</div><div class='ctx'> 	case MSR_IA32_SYSENTER_CS:</div><div class='ctx'> 		msr_info-&gt;data = vmcs_read32(GUEST_SYSENTER_CS);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1895,11 +1889,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		vmx_disable_intercept_for_msr(vmx-&gt;vmcs01.msr_bitmap, MSR_IA32_PRED_CMD,</div><div class='ctx'> 					      MSR_TYPE_W);</div><div class='ctx'> 		break;</div><div class='del'>-	case MSR_IA32_ARCH_CAPABILITIES:</div><div class='del'>-		if (!msr_info-&gt;host_initiated)</div><div class='del'>-			return 1;</div><div class='del'>-		vmx-&gt;arch_capabilities = data;</div><div class='del'>-		break;</div><div class='ctx'> 	case MSR_IA32_CR_PAT:</div><div class='ctx'> 		if (vmcs_config.vmentry_ctrl &amp; VM_ENTRY_LOAD_IA32_PAT) {</div><div class='ctx'> 			if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data))</div><div class='hunk'>@@ -4088,8 +4077,6 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx)</div><div class='ctx'> 		++vmx-&gt;nmsrs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vmx-&gt;arch_capabilities = kvm_get_arch_capabilities();</div><div class='del'>-</div><div class='ctx'> 	vm_exit_controls_init(vmx, vmx_vmexit_ctrl());</div><div class='ctx'> </div><div class='ctx'> 	/* 22.2.1, 20.8.1 */</div><div class='hunk'>@@ -5616,7 +5603,7 @@ static void vmx_dump_dtsel(char *name, uint32_t limit)</div><div class='ctx'> 	       vmcs_readl(limit + GUEST_GDTR_BASE - GUEST_GDTR_LIMIT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dump_vmcs(void)</div><div class='add'>+void dump_vmcs(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 vmentry_ctl = vmcs_read32(VM_ENTRY_CONTROLS);</div><div class='ctx'> 	u32 vmexit_ctl = vmcs_read32(VM_EXIT_CONTROLS);</div><div class='hunk'>@@ -6423,6 +6410,8 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (vcpu-&gt;guest_debug &amp; KVM_GUESTDBG_SINGLESTEP)</div><div class='ctx'> 		vmx_set_interrupt_shadow(vcpu, 0);</div><div class='ctx'> </div><div class='add'>+	kvm_load_guest_xcr0(vcpu);</div><div class='add'>+</div><div class='ctx'> 	if (static_cpu_has(X86_FEATURE_PKU) &amp;&amp;</div><div class='ctx'> 	    kvm_read_cr4_bits(vcpu, X86_CR4_PKE) &amp;&amp;</div><div class='ctx'> 	    vcpu-&gt;arch.pkru != vmx-&gt;host_pkru)</div><div class='hunk'>@@ -6473,9 +6462,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	x86_spec_ctrl_restore_host(vmx-&gt;spec_ctrl, 0);</div><div class='ctx'> </div><div class='del'>-	/* Eliminate branch target predictions from guest mode */</div><div class='del'>-	vmexit_fill_RSB();</div><div class='del'>-</div><div class='ctx'> 	/* All fields are clean at this point */</div><div class='ctx'> 	if (static_branch_unlikely(&amp;enable_evmcs))</div><div class='ctx'> 		current_evmcs-&gt;hv_clean_fields |=</div><div class='hunk'>@@ -6514,11 +6500,13 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (static_cpu_has(X86_FEATURE_PKU) &amp;&amp;</div><div class='ctx'> 	    kvm_read_cr4_bits(vcpu, X86_CR4_PKE)) {</div><div class='del'>-		vcpu-&gt;arch.pkru = __read_pkru();</div><div class='add'>+		vcpu-&gt;arch.pkru = rdpkru();</div><div class='ctx'> 		if (vcpu-&gt;arch.pkru != vmx-&gt;host_pkru)</div><div class='ctx'> 			__write_pkru(vmx-&gt;host_pkru);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kvm_put_guest_xcr0(vcpu);</div><div class='add'>+</div><div class='ctx'> 	vmx-&gt;nested.nested_run_pending = 0;</div><div class='ctx'> 	vmx-&gt;idt_vectoring_info = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6865,6 +6853,30 @@ static void nested_vmx_entry_exit_ctls_update(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool guest_cpuid_has_pmu(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *entry;</div><div class='add'>+	union cpuid10_eax eax;</div><div class='add'>+</div><div class='add'>+	entry = kvm_find_cpuid_entry(vcpu, 0xa, 0);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	eax.full = entry-&gt;eax;</div><div class='add'>+	return (eax.split.version_id &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nested_vmx_procbased_ctls_update(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	bool pmu_enabled = guest_cpuid_has_pmu(vcpu);</div><div class='add'>+</div><div class='add'>+	if (pmu_enabled)</div><div class='add'>+		vmx-&gt;nested.msrs.procbased_ctls_high |= CPU_BASED_RDPMC_EXITING;</div><div class='add'>+	else</div><div class='add'>+		vmx-&gt;nested.msrs.procbased_ctls_high &amp;= ~CPU_BASED_RDPMC_EXITING;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void update_intel_pt_cfg(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='hunk'>@@ -6953,6 +6965,7 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (nested_vmx_allowed(vcpu)) {</div><div class='ctx'> 		nested_vmx_cr_fixed1_bits_update(vcpu);</div><div class='ctx'> 		nested_vmx_entry_exit_ctls_update(vcpu);</div><div class='add'>+		nested_vmx_procbased_ctls_update(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_INTEL_PT) &amp;&amp;</div><div class='hunk'>@@ -7016,6 +7029,7 @@ static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx;</div><div class='ctx'> 	u64 tscl, guest_tscl, delta_tsc, lapic_timer_advance_cycles;</div><div class='add'>+	struct kvm_timer *ktimer = &amp;vcpu-&gt;arch.apic-&gt;lapic_timer;</div><div class='ctx'> </div><div class='ctx'> 	if (kvm_mwait_in_guest(vcpu-&gt;kvm))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -7024,7 +7038,8 @@ static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc)</div><div class='ctx'> 	tscl = rdtsc();</div><div class='ctx'> 	guest_tscl = kvm_read_l1_tsc(vcpu, tscl);</div><div class='ctx'> 	delta_tsc = max(guest_deadline_tsc, guest_tscl) - guest_tscl;</div><div class='del'>-	lapic_timer_advance_cycles = nsec_to_cycles(vcpu, lapic_timer_advance_ns);</div><div class='add'>+	lapic_timer_advance_cycles = nsec_to_cycles(vcpu,</div><div class='add'>+						    ktimer-&gt;timer_advance_ns);</div><div class='ctx'> </div><div class='ctx'> 	if (delta_tsc &gt; lapic_timer_advance_cycles)</div><div class='ctx'> 		delta_tsc -= lapic_timer_advance_cycles;</div><div class='hunk'>@@ -7382,7 +7397,7 @@ static int vmx_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vmx_pre_leave_smm(struct kvm_vcpu *vcpu, u64 smbase)</div><div class='add'>+static int vmx_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -7393,9 +7408,7 @@ static int vmx_pre_leave_smm(struct kvm_vcpu *vcpu, u64 smbase)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vmx-&gt;nested.smm.guest_mode) {</div><div class='del'>-		vcpu-&gt;arch.hflags &amp;= ~HF_SMM_MASK;</div><div class='ctx'> 		ret = nested_vmx_enter_non_root_mode(vcpu, false);</div><div class='del'>-		vcpu-&gt;arch.hflags |= HF_SMM_MASK;</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -7409,6 +7422,11 @@ static int enable_smi_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool vmx_need_emulation_on_page_fault(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __init int hardware_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long host_bndcfgs;</div><div class='hunk'>@@ -7711,6 +7729,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {</div><div class='ctx'> 	.set_nested_state = NULL,</div><div class='ctx'> 	.get_vmcs12_pages = NULL,</div><div class='ctx'> 	.nested_enable_evmcs = NULL,</div><div class='add'>+	.need_emulation_on_page_fault = vmx_need_emulation_on_page_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void vmx_cleanup_l1d_flush(void)</div><div class='head'>diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h<br/>index 1554cb45b393..f879529906b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/vmx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/vmx/vmx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/vmx/vmx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/vmx/vmx.h</a></div><div class='hunk'>@@ -190,7 +190,6 @@ struct vcpu_vmx {</div><div class='ctx'> 	u64		      msr_guest_kernel_gs_base;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	u64		      arch_capabilities;</div><div class='ctx'> 	u64		      spec_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	u32 vm_entry_controls_shadow;</div><div class='hunk'>@@ -518,4 +517,6 @@ static inline void decache_tsc_multiplier(struct vcpu_vmx *vmx)</div><div class='ctx'> 	vmcs_write64(TSC_MULTIPLIER, vmx-&gt;current_tsc_ratio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void dump_vmcs(void);</div><div class='add'>+</div><div class='ctx'> #endif /* __KVM_X86_VMX_H */</div><div class='head'>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c<br/>index 65e4559eef2f..d75bb97b983c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/x86.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/x86.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/x86.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/x86.c</a></div><div class='hunk'>@@ -136,10 +136,14 @@ EXPORT_SYMBOL_GPL(kvm_default_tsc_scaling_ratio);</div><div class='ctx'> static u32 __read_mostly tsc_tolerance_ppm = 250;</div><div class='ctx'> module_param(tsc_tolerance_ppm, uint, S_IRUGO | S_IWUSR);</div><div class='ctx'> </div><div class='del'>-/* lapic timer advance (tscdeadline mode only) in nanoseconds */</div><div class='del'>-unsigned int __read_mostly lapic_timer_advance_ns = 1000;</div><div class='add'>+/*</div><div class='add'>+ * lapic timer advance (tscdeadline mode only) in nanoseconds.  '-1' enables</div><div class='add'>+ * adaptive tuning starting from default advancment of 1000ns.  '0' disables</div><div class='add'>+ * advancement entirely.  Any other value is used as-is and disables adaptive</div><div class='add'>+ * tuning, i.e. allows priveleged userspace to set an exact advancement time.</div><div class='add'>+ */</div><div class='add'>+static int __read_mostly lapic_timer_advance_ns = -1;</div><div class='ctx'> module_param(lapic_timer_advance_ns, uint, S_IRUGO | S_IWUSR);</div><div class='del'>-EXPORT_SYMBOL_GPL(lapic_timer_advance_ns);</div><div class='ctx'> </div><div class='ctx'> static bool __read_mostly vector_hashing = true;</div><div class='ctx'> module_param(vector_hashing, bool, S_IRUGO);</div><div class='hunk'>@@ -800,7 +804,7 @@ void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_lmsw);</div><div class='ctx'> </div><div class='del'>-static void kvm_load_guest_xcr0(struct kvm_vcpu *vcpu)</div><div class='add'>+void kvm_load_guest_xcr0(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE) &amp;&amp;</div><div class='ctx'> 			!vcpu-&gt;guest_xcr0_loaded) {</div><div class='hunk'>@@ -810,8 +814,9 @@ static void kvm_load_guest_xcr0(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		vcpu-&gt;guest_xcr0_loaded = 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_load_guest_xcr0);</div><div class='ctx'> </div><div class='del'>-static void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu)</div><div class='add'>+void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (vcpu-&gt;guest_xcr0_loaded) {</div><div class='ctx'> 		if (vcpu-&gt;arch.xcr0 != host_xcr0)</div><div class='hunk'>@@ -819,6 +824,7 @@ static void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		vcpu-&gt;guest_xcr0_loaded = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_put_guest_xcr0);</div><div class='ctx'> </div><div class='ctx'> static int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1125,7 +1131,7 @@ static u32 msrs_to_save[] = {</div><div class='ctx'> #endif</div><div class='ctx'> 	MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA,</div><div class='ctx'> 	MSR_IA32_FEATURE_CONTROL, MSR_IA32_BNDCFGS, MSR_TSC_AUX,</div><div class='del'>-	MSR_IA32_SPEC_CTRL, MSR_IA32_ARCH_CAPABILITIES,</div><div class='add'>+	MSR_IA32_SPEC_CTRL,</div><div class='ctx'> 	MSR_IA32_RTIT_CTL, MSR_IA32_RTIT_STATUS, MSR_IA32_RTIT_CR3_MATCH,</div><div class='ctx'> 	MSR_IA32_RTIT_OUTPUT_BASE, MSR_IA32_RTIT_OUTPUT_MASK,</div><div class='ctx'> 	MSR_IA32_RTIT_ADDR0_A, MSR_IA32_RTIT_ADDR0_B,</div><div class='hunk'>@@ -1158,6 +1164,7 @@ static u32 emulated_msrs[] = {</div><div class='ctx'> </div><div class='ctx'> 	MSR_IA32_TSC_ADJUST,</div><div class='ctx'> 	MSR_IA32_TSCDEADLINE,</div><div class='add'>+	MSR_IA32_ARCH_CAPABILITIES,</div><div class='ctx'> 	MSR_IA32_MISC_ENABLE,</div><div class='ctx'> 	MSR_IA32_MCG_STATUS,</div><div class='ctx'> 	MSR_IA32_MCG_CTL,</div><div class='hunk'>@@ -2443,6 +2450,11 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		if (msr_info-&gt;host_initiated)</div><div class='ctx'> 			vcpu-&gt;arch.microcode_version = data;</div><div class='ctx'> 		break;</div><div class='add'>+	case MSR_IA32_ARCH_CAPABILITIES:</div><div class='add'>+		if (!msr_info-&gt;host_initiated)</div><div class='add'>+			return 1;</div><div class='add'>+		vcpu-&gt;arch.arch_capabilities = data;</div><div class='add'>+		break;</div><div class='ctx'> 	case MSR_EFER:</div><div class='ctx'> 		return set_efer(vcpu, data);</div><div class='ctx'> 	case MSR_K7_HWCR:</div><div class='hunk'>@@ -2747,6 +2759,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 	case MSR_IA32_UCODE_REV:</div><div class='ctx'> 		msr_info-&gt;data = vcpu-&gt;arch.microcode_version;</div><div class='ctx'> 		break;</div><div class='add'>+	case MSR_IA32_ARCH_CAPABILITIES:</div><div class='add'>+		if (!msr_info-&gt;host_initiated &amp;&amp;</div><div class='add'>+		    !guest_cpuid_has(vcpu, X86_FEATURE_ARCH_CAPABILITIES))</div><div class='add'>+			return 1;</div><div class='add'>+		msr_info-&gt;data = vcpu-&gt;arch.arch_capabilities;</div><div class='add'>+		break;</div><div class='ctx'> 	case MSR_IA32_TSC:</div><div class='ctx'> 		msr_info-&gt;data = kvm_scale_tsc(vcpu, rdtsc()) + vcpu-&gt;arch.tsc_offset;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3081,7 +3099,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_NESTED_STATE:</div><div class='ctx'> 		r = kvm_x86_ops-&gt;get_nested_state ?</div><div class='del'>-			kvm_x86_ops-&gt;get_nested_state(NULL, 0, 0) : 0;</div><div class='add'>+			kvm_x86_ops-&gt;get_nested_state(NULL, NULL, 0) : 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3516,7 +3534,7 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	memset(&amp;events-&gt;reserved, 0, sizeof(events-&gt;reserved));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_set_hflags(struct kvm_vcpu *vcpu, unsigned emul_flags);</div><div class='add'>+static void kvm_smm_changed(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					      struct kvm_vcpu_events *events)</div><div class='hunk'>@@ -3576,12 +3594,13 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		vcpu-&gt;arch.apic-&gt;sipi_vector = events-&gt;sipi_vector;</div><div class='ctx'> </div><div class='ctx'> 	if (events-&gt;flags &amp; KVM_VCPUEVENT_VALID_SMM) {</div><div class='del'>-		u32 hflags = vcpu-&gt;arch.hflags;</div><div class='del'>-		if (events-&gt;smi.smm)</div><div class='del'>-			hflags |= HF_SMM_MASK;</div><div class='del'>-		else</div><div class='del'>-			hflags &amp;= ~HF_SMM_MASK;</div><div class='del'>-		kvm_set_hflags(vcpu, hflags);</div><div class='add'>+		if (!!(vcpu-&gt;arch.hflags &amp; HF_SMM_MASK) != events-&gt;smi.smm) {</div><div class='add'>+			if (events-&gt;smi.smm)</div><div class='add'>+				vcpu-&gt;arch.hflags |= HF_SMM_MASK;</div><div class='add'>+			else</div><div class='add'>+				vcpu-&gt;arch.hflags &amp;= ~HF_SMM_MASK;</div><div class='add'>+			kvm_smm_changed(vcpu);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		vcpu-&gt;arch.smi_pending = events-&gt;smi.pending;</div><div class='ctx'> </div><div class='hunk'>@@ -3662,15 +3681,15 @@ static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	valid = xstate_bv &amp; ~XFEATURE_MASK_FPSSE;</div><div class='ctx'> 	while (valid) {</div><div class='del'>-		u64 feature = valid &amp; -valid;</div><div class='del'>-		int index = fls64(feature) - 1;</div><div class='del'>-		void *src = get_xsave_addr(xsave, feature);</div><div class='add'>+		u64 xfeature_mask = valid &amp; -valid;</div><div class='add'>+		int xfeature_nr = fls64(xfeature_mask) - 1;</div><div class='add'>+		void *src = get_xsave_addr(xsave, xfeature_nr);</div><div class='ctx'> </div><div class='ctx'> 		if (src) {</div><div class='ctx'> 			u32 size, offset, ecx, edx;</div><div class='del'>-			cpuid_count(XSTATE_CPUID, index,</div><div class='add'>+			cpuid_count(XSTATE_CPUID, xfeature_nr,</div><div class='ctx'> 				    &amp;size, &amp;offset, &amp;ecx, &amp;edx);</div><div class='del'>-			if (feature == XFEATURE_MASK_PKRU)</div><div class='add'>+			if (xfeature_nr == XFEATURE_PKRU)</div><div class='ctx'> 				memcpy(dest + offset, &amp;vcpu-&gt;arch.pkru,</div><div class='ctx'> 				       sizeof(vcpu-&gt;arch.pkru));</div><div class='ctx'> 			else</div><div class='hunk'>@@ -3678,7 +3697,7 @@ static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		valid -= feature;</div><div class='add'>+		valid -= xfeature_mask;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3705,22 +3724,22 @@ static void load_xsave(struct kvm_vcpu *vcpu, u8 *src)</div><div class='ctx'> 	 */</div><div class='ctx'> 	valid = xstate_bv &amp; ~XFEATURE_MASK_FPSSE;</div><div class='ctx'> 	while (valid) {</div><div class='del'>-		u64 feature = valid &amp; -valid;</div><div class='del'>-		int index = fls64(feature) - 1;</div><div class='del'>-		void *dest = get_xsave_addr(xsave, feature);</div><div class='add'>+		u64 xfeature_mask = valid &amp; -valid;</div><div class='add'>+		int xfeature_nr = fls64(xfeature_mask) - 1;</div><div class='add'>+		void *dest = get_xsave_addr(xsave, xfeature_nr);</div><div class='ctx'> </div><div class='ctx'> 		if (dest) {</div><div class='ctx'> 			u32 size, offset, ecx, edx;</div><div class='del'>-			cpuid_count(XSTATE_CPUID, index,</div><div class='add'>+			cpuid_count(XSTATE_CPUID, xfeature_nr,</div><div class='ctx'> 				    &amp;size, &amp;offset, &amp;ecx, &amp;edx);</div><div class='del'>-			if (feature == XFEATURE_MASK_PKRU)</div><div class='add'>+			if (xfeature_nr == XFEATURE_PKRU)</div><div class='ctx'> 				memcpy(&amp;vcpu-&gt;arch.pkru, src + offset,</div><div class='ctx'> 				       sizeof(vcpu-&gt;arch.pkru));</div><div class='ctx'> 			else</div><div class='ctx'> 				memcpy(dest, src + offset, size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		valid -= feature;</div><div class='add'>+		valid -= xfeature_mask;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4258,7 +4277,7 @@ static int kvm_vm_ioctl_set_identity_map_addr(struct kvm *kvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_vm_ioctl_set_nr_mmu_pages(struct kvm *kvm,</div><div class='del'>-					  u32 kvm_nr_mmu_pages)</div><div class='add'>+					 unsigned long kvm_nr_mmu_pages)</div><div class='ctx'> {</div><div class='ctx'> 	if (kvm_nr_mmu_pages &lt; KVM_MIN_ALLOC_MMU_PAGES)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -4272,7 +4291,7 @@ static int kvm_vm_ioctl_set_nr_mmu_pages(struct kvm *kvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_vm_ioctl_get_nr_mmu_pages(struct kvm *kvm)</div><div class='add'>+static unsigned long kvm_vm_ioctl_get_nr_mmu_pages(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm-&gt;arch.n_max_mmu_pages;</div><div class='ctx'> }</div><div class='hunk'>@@ -5946,12 +5965,18 @@ static unsigned emulator_get_hflags(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> </div><div class='ctx'> static void emulator_set_hflags(struct x86_emulate_ctxt *ctxt, unsigned emul_flags)</div><div class='ctx'> {</div><div class='del'>-	kvm_set_hflags(emul_to_vcpu(ctxt), emul_flags);</div><div class='add'>+	emul_to_vcpu(ctxt)-&gt;arch.hflags = emul_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int emulator_pre_leave_smm(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+				  const char *smstate)</div><div class='add'>+{</div><div class='add'>+	return kvm_x86_ops-&gt;pre_leave_smm(emul_to_vcpu(ctxt), smstate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int emulator_pre_leave_smm(struct x86_emulate_ctxt *ctxt, u64 smbase)</div><div class='add'>+static void emulator_post_leave_smm(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='del'>-	return kvm_x86_ops-&gt;pre_leave_smm(emul_to_vcpu(ctxt), smbase);</div><div class='add'>+	kvm_smm_changed(emul_to_vcpu(ctxt));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct x86_emulate_ops emulate_ops = {</div><div class='hunk'>@@ -5994,6 +6019,7 @@ static const struct x86_emulate_ops emulate_ops = {</div><div class='ctx'> 	.get_hflags          = emulator_get_hflags,</div><div class='ctx'> 	.set_hflags          = emulator_set_hflags,</div><div class='ctx'> 	.pre_leave_smm       = emulator_pre_leave_smm,</div><div class='add'>+	.post_leave_smm      = emulator_post_leave_smm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void toggle_interruptibility(struct kvm_vcpu *vcpu, u32 mask)</div><div class='hunk'>@@ -6235,16 +6261,6 @@ static void kvm_smm_changed(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_mmu_reset_context(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_set_hflags(struct kvm_vcpu *vcpu, unsigned emul_flags)</div><div class='del'>-{</div><div class='del'>-	unsigned changed = vcpu-&gt;arch.hflags ^ emul_flags;</div><div class='del'>-</div><div class='del'>-	vcpu-&gt;arch.hflags = emul_flags;</div><div class='del'>-</div><div class='del'>-	if (changed &amp; HF_SMM_MASK)</div><div class='del'>-		kvm_smm_changed(vcpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int kvm_vcpu_check_hw_bp(unsigned long addr, u32 type, u32 dr7,</div><div class='ctx'> 				unsigned long *db)</div><div class='ctx'> {</div><div class='hunk'>@@ -6523,15 +6539,45 @@ int kvm_emulate_instruction_from_buffer(struct kvm_vcpu *vcpu,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_emulate_instruction_from_buffer);</div><div class='ctx'> </div><div class='add'>+static int complete_fast_pio_out_port_0x7e(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	vcpu-&gt;arch.pio.count = 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int complete_fast_pio_out(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	vcpu-&gt;arch.pio.count = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!kvm_is_linear_rip(vcpu, vcpu-&gt;arch.pio.linear_rip)))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size,</div><div class='ctx'> 			    unsigned short port)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='ctx'> 	int ret = emulator_pio_out_emulated(&amp;vcpu-&gt;arch.emulate_ctxt,</div><div class='ctx'> 					    size, port, &amp;val, 1);</div><div class='del'>-	/* do not return to emulator after return from userspace */</div><div class='del'>-	vcpu-&gt;arch.pio.count = 0;</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'>+	/*</div><div class='add'>+	 * Workaround userspace that relies on old KVM behavior of %rip being</div><div class='add'>+	 * incremented prior to exiting to userspace to handle "OUT 0x7e".</div><div class='add'>+	 */</div><div class='add'>+	if (port == 0x7e &amp;&amp;</div><div class='add'>+	    kvm_check_has_quirk(vcpu-&gt;kvm, KVM_X86_QUIRK_OUT_7E_INC_RIP)) {</div><div class='add'>+		vcpu-&gt;arch.complete_userspace_io =</div><div class='add'>+			complete_fast_pio_out_port_0x7e;</div><div class='add'>+		kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+	} else {</div><div class='add'>+		vcpu-&gt;arch.pio.linear_rip = kvm_get_linear_rip(vcpu);</div><div class='add'>+		vcpu-&gt;arch.complete_userspace_io = complete_fast_pio_out;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int complete_fast_pio_in(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -6541,6 +6587,11 @@ static int complete_fast_pio_in(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	/* We should only ever be called with arch.pio.count equal to 1 */</div><div class='ctx'> 	BUG_ON(vcpu-&gt;arch.pio.count != 1);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!kvm_is_linear_rip(vcpu, vcpu-&gt;arch.pio.linear_rip))) {</div><div class='add'>+		vcpu-&gt;arch.pio.count = 0;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* For size less than 4 we merge, else we zero extend */</div><div class='ctx'> 	val = (vcpu-&gt;arch.pio.size &lt; 4) ? kvm_register_read(vcpu, VCPU_REGS_RAX)</div><div class='ctx'> 					: 0;</div><div class='hunk'>@@ -6553,7 +6604,7 @@ static int complete_fast_pio_in(struct kvm_vcpu *vcpu)</div><div class='ctx'> 				 vcpu-&gt;arch.pio.port, &amp;val, 1);</div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RAX, val);</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size,</div><div class='hunk'>@@ -6572,6 +6623,7 @@ static int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;arch.pio.linear_rip = kvm_get_linear_rip(vcpu);</div><div class='ctx'> 	vcpu-&gt;arch.complete_userspace_io = complete_fast_pio_in;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -6579,16 +6631,13 @@ static int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size,</div><div class='ctx'> </div><div class='ctx'> int kvm_fast_pio(struct kvm_vcpu *vcpu, int size, unsigned short port, int in)</div><div class='ctx'> {</div><div class='del'>-	int ret = kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TODO: we might be squashing a KVM_GUESTDBG_SINGLESTEP-triggered</div><div class='del'>-	 * KVM_EXIT_DEBUG here.</div><div class='del'>-	 */</div><div class='ctx'> 	if (in)</div><div class='del'>-		return kvm_fast_pio_in(vcpu, size, port) &amp;&amp; ret;</div><div class='add'>+		ret = kvm_fast_pio_in(vcpu, size, port);</div><div class='ctx'> 	else</div><div class='del'>-		return kvm_fast_pio_out(vcpu, size, port) &amp;&amp; ret;</div><div class='add'>+		ret = kvm_fast_pio_out(vcpu, size, port);</div><div class='add'>+	return ret &amp;&amp; kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_fast_pio);</div><div class='ctx'> </div><div class='hunk'>@@ -7413,9 +7462,9 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, char *buf)</div><div class='ctx'> 	put_smstate(u32, buf, 0x7ef8, vcpu-&gt;arch.smbase);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, char *buf)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='ctx'> 	struct desc_ptr dt;</div><div class='ctx'> 	struct kvm_segment seg;</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -7465,10 +7514,8 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, char *buf)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		enter_smm_save_seg_64(vcpu, buf, i);</div><div class='del'>-#else</div><div class='del'>-	WARN_ON_ONCE(1);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void enter_smm(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -7479,9 +7526,11 @@ static void enter_smm(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_enter_smm(vcpu-&gt;vcpu_id, vcpu-&gt;arch.smbase, true);</div><div class='ctx'> 	memset(buf, 0, 512);</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	if (guest_cpuid_has(vcpu, X86_FEATURE_LM))</div><div class='ctx'> 		enter_smm_save_state_64(vcpu, buf);</div><div class='ctx'> 	else</div><div class='add'>+#endif</div><div class='ctx'> 		enter_smm_save_state_32(vcpu, buf);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -7539,8 +7588,10 @@ static void enter_smm(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_set_segment(vcpu, &amp;ds, VCPU_SREG_GS);</div><div class='ctx'> 	kvm_set_segment(vcpu, &amp;ds, VCPU_SREG_SS);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 	if (guest_cpuid_has(vcpu, X86_FEATURE_LM))</div><div class='ctx'> 		kvm_x86_ops-&gt;set_efer(vcpu, 0);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	kvm_update_cpuid(vcpu);</div><div class='ctx'> 	kvm_mmu_reset_context(vcpu);</div><div class='hunk'>@@ -7837,18 +7888,21 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		goto cancel_injection;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kvm_load_guest_xcr0(vcpu);</div><div class='del'>-</div><div class='ctx'> 	if (req_immediate_exit) {</div><div class='ctx'> 		kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='ctx'> 		kvm_x86_ops-&gt;request_immediate_exit(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_entry(vcpu-&gt;vcpu_id);</div><div class='del'>-	if (lapic_timer_advance_ns)</div><div class='add'>+	if (lapic_in_kernel(vcpu) &amp;&amp;</div><div class='add'>+	    vcpu-&gt;arch.apic-&gt;lapic_timer.timer_advance_ns)</div><div class='ctx'> 		wait_lapic_expire(vcpu);</div><div class='ctx'> 	guest_enter_irqoff();</div><div class='ctx'> </div><div class='add'>+	fpregs_assert_state_consistent();</div><div class='add'>+	if (test_thread_flag(TIF_NEED_FPU_LOAD))</div><div class='add'>+		switch_fpu_return();</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(vcpu-&gt;arch.switch_db_regs)) {</div><div class='ctx'> 		set_debugreg(0, 7);</div><div class='ctx'> 		set_debugreg(vcpu-&gt;arch.eff_db[0], 0);</div><div class='hunk'>@@ -7891,8 +7945,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vcpu-&gt;mode = OUTSIDE_GUEST_MODE;</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='del'>-	kvm_put_guest_xcr0(vcpu);</div><div class='del'>-</div><div class='ctx'> 	kvm_before_interrupt(vcpu);</div><div class='ctx'> 	kvm_x86_ops-&gt;handle_external_intr(vcpu);</div><div class='ctx'> 	kvm_after_interrupt(vcpu);</div><div class='hunk'>@@ -8109,22 +8161,30 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu)</div><div class='ctx'> /* Swap (qemu) user FPU context for the guest FPU context. */</div><div class='ctx'> static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	preempt_disable();</div><div class='add'>+	fpregs_lock();</div><div class='add'>+</div><div class='ctx'> 	copy_fpregs_to_fpstate(&amp;current-&gt;thread.fpu);</div><div class='ctx'> 	/* PKRU is separately restored in kvm_x86_ops-&gt;run.  */</div><div class='ctx'> 	__copy_kernel_to_fpregs(&amp;vcpu-&gt;arch.guest_fpu-&gt;state,</div><div class='ctx'> 				~XFEATURE_MASK_PKRU);</div><div class='del'>-	preempt_enable();</div><div class='add'>+</div><div class='add'>+	fpregs_mark_activate();</div><div class='add'>+	fpregs_unlock();</div><div class='add'>+</div><div class='ctx'> 	trace_kvm_fpu(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* When vcpu_run ends, restore user space FPU context. */</div><div class='ctx'> static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	preempt_disable();</div><div class='add'>+	fpregs_lock();</div><div class='add'>+</div><div class='ctx'> 	copy_fpregs_to_fpstate(vcpu-&gt;arch.guest_fpu);</div><div class='ctx'> 	copy_kernel_to_fpregs(&amp;current-&gt;thread.fpu.state);</div><div class='del'>-	preempt_enable();</div><div class='add'>+</div><div class='add'>+	fpregs_mark_activate();</div><div class='add'>+	fpregs_unlock();</div><div class='add'>+</div><div class='ctx'> 	++vcpu-&gt;stat.fpu_reload;</div><div class='ctx'> 	trace_kvm_fpu(0);</div><div class='ctx'> }</div><div class='hunk'>@@ -8733,6 +8793,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	vcpu-&gt;arch.arch_capabilities = kvm_get_arch_capabilities();</div><div class='ctx'> 	vcpu-&gt;arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT;</div><div class='ctx'> 	kvm_vcpu_mtrr_init(vcpu);</div><div class='ctx'> 	vcpu_load(vcpu);</div><div class='hunk'>@@ -8821,11 +8882,11 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)</div><div class='ctx'> 		if (init_event)</div><div class='ctx'> 			kvm_put_guest_fpu(vcpu);</div><div class='ctx'> 		mpx_state_buffer = get_xsave_addr(&amp;vcpu-&gt;arch.guest_fpu-&gt;state.xsave,</div><div class='del'>-					XFEATURE_MASK_BNDREGS);</div><div class='add'>+					XFEATURE_BNDREGS);</div><div class='ctx'> 		if (mpx_state_buffer)</div><div class='ctx'> 			memset(mpx_state_buffer, 0, sizeof(struct mpx_bndreg_state));</div><div class='ctx'> 		mpx_state_buffer = get_xsave_addr(&amp;vcpu-&gt;arch.guest_fpu-&gt;state.xsave,</div><div class='del'>-					XFEATURE_MASK_BNDCSR);</div><div class='add'>+					XFEATURE_BNDCSR);</div><div class='ctx'> 		if (mpx_state_buffer)</div><div class='ctx'> 			memset(mpx_state_buffer, 0, sizeof(struct mpx_bndcsr));</div><div class='ctx'> 		if (init_event)</div><div class='hunk'>@@ -9034,7 +9095,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	if (irqchip_in_kernel(vcpu-&gt;kvm)) {</div><div class='ctx'> 		vcpu-&gt;arch.apicv_active = kvm_x86_ops-&gt;get_enable_apicv(vcpu);</div><div class='del'>-		r = kvm_create_lapic(vcpu);</div><div class='add'>+		r = kvm_create_lapic(vcpu, lapic_timer_advance_ns);</div><div class='ctx'> 		if (r &lt; 0)</div><div class='ctx'> 			goto fail_mmu_destroy;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -9429,13 +9490,9 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,</div><div class='ctx'> 				const struct kvm_memory_slot *new,</div><div class='ctx'> 				enum kvm_mr_change change)</div><div class='ctx'> {</div><div class='del'>-	int nr_mmu_pages = 0;</div><div class='del'>-</div><div class='ctx'> 	if (!kvm-&gt;arch.n_requested_mmu_pages)</div><div class='del'>-		nr_mmu_pages = kvm_mmu_calculate_mmu_pages(kvm);</div><div class='del'>-</div><div class='del'>-	if (nr_mmu_pages)</div><div class='del'>-		kvm_mmu_change_mmu_pages(kvm, nr_mmu_pages);</div><div class='add'>+		kvm_mmu_change_mmu_pages(kvm,</div><div class='add'>+				kvm_mmu_calculate_default_mmu_pages(kvm));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Dirty logging tracks sptes in 4k granularity, meaning that large</div><div class='head'>diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h<br/>index 28406aa1136d..534d3f28bb01 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/x86.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/kvm/x86.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/kvm/x86.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/kvm/x86.h</a></div><div class='hunk'>@@ -294,8 +294,6 @@ extern u64 kvm_supported_xcr0(void);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int min_timer_period_us;</div><div class='ctx'> </div><div class='del'>-extern unsigned int lapic_timer_advance_ns;</div><div class='del'>-</div><div class='ctx'> extern bool enable_vmware_backdoor;</div><div class='ctx'> </div><div class='ctx'> extern struct static_key kvm_no_apic_vcpu;</div><div class='hunk'>@@ -347,4 +345,6 @@ static inline void kvm_after_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	__this_cpu_write(current_vcpu, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void kvm_load_guest_xcr0(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile<br/>index 140e61843a07..5246db42de45 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/Makefile</a></div><div class='hunk'>@@ -6,6 +6,18 @@</div><div class='ctx'> # Produces uninteresting flaky coverage.</div><div class='ctx'> KCOV_INSTRUMENT_delay.o	:= n</div><div class='ctx'> </div><div class='add'>+# Early boot use of cmdline; don't instrument it</div><div class='add'>+ifdef CONFIG_AMD_MEM_ENCRYPT</div><div class='add'>+KCOV_INSTRUMENT_cmdline.o := n</div><div class='add'>+KASAN_SANITIZE_cmdline.o  := n</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_FUNCTION_TRACER</div><div class='add'>+CFLAGS_REMOVE_cmdline.o = -pg</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+CFLAGS_cmdline.o := $(call cc-option, -fno-stack-protector)</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk</div><div class='ctx'> inat_tables_maps = $(srctree)/arch/x86/lib/x86-opcode-map.txt</div><div class='ctx'> quiet_cmd_inat_tables = GEN     $@</div><div class='hunk'>@@ -23,7 +35,6 @@ obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o</div><div class='ctx'> lib-y := delay.o misc.o cmdline.o cpu.o</div><div class='ctx'> lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o</div><div class='ctx'> lib-y += memcpy_$(BITS).o</div><div class='del'>-lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o</div><div class='ctx'> lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o</div><div class='ctx'> lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o</div><div class='ctx'> lib-$(CONFIG_FUNCTION_ERROR_INJECTION)	+= error-inject.o</div><div class='head'>diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S<br/>index db4e5aa0858b..b2f1822084ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/copy_user_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/copy_user_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/copy_user_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/copy_user_64.S</a></div><div class='hunk'>@@ -16,6 +16,30 @@</div><div class='ctx'> #include &lt;asm/smap.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='ctx'> </div><div class='add'>+.macro ALIGN_DESTINATION</div><div class='add'>+	/* check for bad alignment of destination */</div><div class='add'>+	movl %edi,%ecx</div><div class='add'>+	andl $7,%ecx</div><div class='add'>+	jz 102f				/* already aligned */</div><div class='add'>+	subl $8,%ecx</div><div class='add'>+	negl %ecx</div><div class='add'>+	subl %ecx,%edx</div><div class='add'>+100:	movb (%rsi),%al</div><div class='add'>+101:	movb %al,(%rdi)</div><div class='add'>+	incq %rsi</div><div class='add'>+	incq %rdi</div><div class='add'>+	decl %ecx</div><div class='add'>+	jnz 100b</div><div class='add'>+102:</div><div class='add'>+	.section .fixup,"ax"</div><div class='add'>+103:	addl %ecx,%edx			/* ecx is zerorest also */</div><div class='add'>+	jmp copy_user_handle_tail</div><div class='add'>+	.previous</div><div class='add'>+</div><div class='add'>+	_ASM_EXTABLE_UA(100b, 103b)</div><div class='add'>+	_ASM_EXTABLE_UA(101b, 103b)</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * copy_user_generic_unrolled - memory copy with exception handling.</div><div class='ctx'>  * This version is for CPUs like P4 that don't have efficient micro</div><div class='hunk'>@@ -194,6 +218,30 @@ ENDPROC(copy_user_enhanced_fast_string)</div><div class='ctx'> EXPORT_SYMBOL(copy_user_enhanced_fast_string)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Try to copy last bytes and clear the rest if needed.</div><div class='add'>+ * Since protection fault in copy_from/to_user is not a normal situation,</div><div class='add'>+ * it is not necessary to optimize tail handling.</div><div class='add'>+ *</div><div class='add'>+ * Input:</div><div class='add'>+ * rdi destination</div><div class='add'>+ * rsi source</div><div class='add'>+ * rdx count</div><div class='add'>+ *</div><div class='add'>+ * Output:</div><div class='add'>+ * eax uncopied bytes or 0 if successful.</div><div class='add'>+ */</div><div class='add'>+ALIGN;</div><div class='add'>+copy_user_handle_tail:</div><div class='add'>+	movl %edx,%ecx</div><div class='add'>+1:	rep movsb</div><div class='add'>+2:	mov %ecx,%eax</div><div class='add'>+	ASM_CLAC</div><div class='add'>+	ret</div><div class='add'>+</div><div class='add'>+	_ASM_EXTABLE_UA(1b, 2b)</div><div class='add'>+ENDPROC(copy_user_handle_tail)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * copy_user_nocache - Uncached memory copy with exception handling</div><div class='ctx'>  * This will force destination out of cache for more performance.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/x86/lib/csum-partial_64.c b/arch/x86/lib/csum-partial_64.c<br/>index 9baca3e054be..e7925d668b68 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/csum-partial_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/csum-partial_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/csum-partial_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/csum-partial_64.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ static unsigned do_csum(const unsigned char *buff, unsigned len)</div><div class='ctx'> 				    : "m" (*(unsigned long *)buff), </div><div class='ctx'> 				    "r" (zero),  "0" (result));</div><div class='ctx'> 				--count; </div><div class='del'>-					buff += 8;</div><div class='add'>+				buff += 8;</div><div class='ctx'> 			}</div><div class='ctx'> 			result = add32_with_carry(result&gt;&gt;32,</div><div class='ctx'> 						  result&amp;0xffffffff); </div><div class='head'>diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c<br/>index f5b7f1b3b6d7..b7375dc6898f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/delay.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/delay.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/delay.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/delay.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ void __delay(unsigned long loops)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__delay);</div><div class='ctx'> </div><div class='del'>-void __const_udelay(unsigned long xloops)</div><div class='add'>+noinline void __const_udelay(unsigned long xloops)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpj = this_cpu_read(cpu_info.loops_per_jiffy) ? : loops_per_jiffy;</div><div class='ctx'> 	int d0;</div><div class='head'>diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c<br/>index 3cdf06128d13..be5b5fb1598b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/error-inject.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/error-inject.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/error-inject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/error-inject.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> asmlinkage void just_return_func(void);</div><div class='ctx'> </div><div class='ctx'> asm(</div><div class='add'>+	".text\n"</div><div class='ctx'> 	".type just_return_func, @function\n"</div><div class='ctx'> 	".globl just_return_func\n"</div><div class='ctx'> 	"just_return_func:\n"</div><div class='head'>diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S<br/>index 3b24dc05251c..9d05572370ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/memcpy_64.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/memcpy_64.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/memcpy_64.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/memcpy_64.S</a></div><div class='hunk'>@@ -257,6 +257,7 @@ ENTRY(__memcpy_mcsafe)</div><div class='ctx'> 	/* Copy successful. Return zero */</div><div class='ctx'> .L_done_memcpy_trap:</div><div class='ctx'> 	xorl %eax, %eax</div><div class='add'>+.L_done:</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(__memcpy_mcsafe)</div><div class='ctx'> EXPORT_SYMBOL_GPL(__memcpy_mcsafe)</div><div class='hunk'>@@ -273,7 +274,7 @@ EXPORT_SYMBOL_GPL(__memcpy_mcsafe)</div><div class='ctx'> 	addl	%edx, %ecx</div><div class='ctx'> .E_trailing_bytes:</div><div class='ctx'> 	mov	%ecx, %eax</div><div class='del'>-	ret</div><div class='add'>+	jmp	.L_done</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For write fault handling, given the destination is unaligned,</div><div class='head'>diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S<br/>deleted file mode 100644<br/>index dc2ab6ea6768..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/rwsem.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/rwsem.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * x86 semaphore implementation.</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 1999 Linus Torvalds</div><div class='del'>- *</div><div class='del'>- * Portions Copyright 1999 Red Hat, Inc.</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</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * rw semaphores implemented November 1999 by Benjamin LaHaise &lt;bcrl@kvack.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/alternative-asm.h&gt;</div><div class='del'>-#include &lt;asm/frame.h&gt;</div><div class='del'>-</div><div class='del'>-#define __ASM_HALF_REG(reg)	__ASM_SEL(reg, e##reg)</div><div class='del'>-#define __ASM_HALF_SIZE(inst)	__ASM_SEL(inst##w, inst##l)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The semaphore operations have a special calling sequence that</div><div class='del'>- * allow us to do a simpler in-line version of them. These routines</div><div class='del'>- * need to convert that sequence back into the C sequence when</div><div class='del'>- * there is contention on the semaphore.</div><div class='del'>- *</div><div class='del'>- * %eax contains the semaphore pointer on entry. Save the C-clobbered</div><div class='del'>- * registers (%eax, %edx and %ecx) except %eax which is either a return</div><div class='del'>- * value or just gets clobbered. Same is true for %edx so make sure GCC</div><div class='del'>- * reloads it after the slow path, by making it hold a temporary, for</div><div class='del'>- * example see ____down_write().</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define save_common_regs \</div><div class='del'>-	pushl %ecx</div><div class='del'>-</div><div class='del'>-#define restore_common_regs \</div><div class='del'>-	popl %ecx</div><div class='del'>-</div><div class='del'>-	/* Avoid uglifying the argument copying x86-64 needs to do. */</div><div class='del'>-	.macro movq src, dst</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * x86-64 rwsem wrappers</div><div class='del'>- *</div><div class='del'>- * This interfaces the inline asm code to the slow-path</div><div class='del'>- * C routines. We need to save the call-clobbered regs</div><div class='del'>- * that the asm does not mark as clobbered, and move the</div><div class='del'>- * argument from %rax to %rdi.</div><div class='del'>- *</div><div class='del'>- * NOTE! We don't need to save %rax, because the functions</div><div class='del'>- * will always return the semaphore pointer in %rax (which</div><div class='del'>- * is also the input argument to these helpers)</div><div class='del'>- *</div><div class='del'>- * The following can clobber %rdx because the asm clobbers it:</div><div class='del'>- *   call_rwsem_down_write_failed</div><div class='del'>- *   call_rwsem_wake</div><div class='del'>- * but %rdi, %rsi, %rcx, %r8-r11 always need saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define save_common_regs \</div><div class='del'>-	pushq %rdi; \</div><div class='del'>-	pushq %rsi; \</div><div class='del'>-	pushq %rcx; \</div><div class='del'>-	pushq %r8;  \</div><div class='del'>-	pushq %r9;  \</div><div class='del'>-	pushq %r10; \</div><div class='del'>-	pushq %r11</div><div class='del'>-</div><div class='del'>-#define restore_common_regs \</div><div class='del'>-	popq %r11; \</div><div class='del'>-	popq %r10; \</div><div class='del'>-	popq %r9; \</div><div class='del'>-	popq %r8; \</div><div class='del'>-	popq %rcx; \</div><div class='del'>-	popq %rsi; \</div><div class='del'>-	popq %rdi</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Fix up special calling conventions */</div><div class='del'>-ENTRY(call_rwsem_down_read_failed)</div><div class='del'>-	FRAME_BEGIN</div><div class='del'>-	save_common_regs</div><div class='del'>-	__ASM_SIZE(push,) %__ASM_REG(dx)</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	call rwsem_down_read_failed</div><div class='del'>-	__ASM_SIZE(pop,) %__ASM_REG(dx)</div><div class='del'>-	restore_common_regs</div><div class='del'>-	FRAME_END</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(call_rwsem_down_read_failed)</div><div class='del'>-</div><div class='del'>-ENTRY(call_rwsem_down_read_failed_killable)</div><div class='del'>-	FRAME_BEGIN</div><div class='del'>-	save_common_regs</div><div class='del'>-	__ASM_SIZE(push,) %__ASM_REG(dx)</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	call rwsem_down_read_failed_killable</div><div class='del'>-	__ASM_SIZE(pop,) %__ASM_REG(dx)</div><div class='del'>-	restore_common_regs</div><div class='del'>-	FRAME_END</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(call_rwsem_down_read_failed_killable)</div><div class='del'>-</div><div class='del'>-ENTRY(call_rwsem_down_write_failed)</div><div class='del'>-	FRAME_BEGIN</div><div class='del'>-	save_common_regs</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	call rwsem_down_write_failed</div><div class='del'>-	restore_common_regs</div><div class='del'>-	FRAME_END</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(call_rwsem_down_write_failed)</div><div class='del'>-</div><div class='del'>-ENTRY(call_rwsem_down_write_failed_killable)</div><div class='del'>-	FRAME_BEGIN</div><div class='del'>-	save_common_regs</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	call rwsem_down_write_failed_killable</div><div class='del'>-	restore_common_regs</div><div class='del'>-	FRAME_END</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(call_rwsem_down_write_failed_killable)</div><div class='del'>-</div><div class='del'>-ENTRY(call_rwsem_wake)</div><div class='del'>-	FRAME_BEGIN</div><div class='del'>-	/* do nothing if still outstanding active readers */</div><div class='del'>-	__ASM_HALF_SIZE(dec) %__ASM_HALF_REG(dx)</div><div class='del'>-	jnz 1f</div><div class='del'>-	save_common_regs</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	call rwsem_wake</div><div class='del'>-	restore_common_regs</div><div class='del'>-1:	FRAME_END</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(call_rwsem_wake)</div><div class='del'>-</div><div class='del'>-ENTRY(call_rwsem_downgrade_wake)</div><div class='del'>-	FRAME_BEGIN</div><div class='del'>-	save_common_regs</div><div class='del'>-	__ASM_SIZE(push,) %__ASM_REG(dx)</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	call rwsem_downgrade_wake</div><div class='del'>-	__ASM_SIZE(pop,) %__ASM_REG(dx)</div><div class='del'>-	restore_common_regs</div><div class='del'>-	FRAME_END</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(call_rwsem_downgrade_wake)</div><div class='head'>diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c<br/>index ee42bb0cbeb3..9952a01cad24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/usercopy_64.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/lib/usercopy_64.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/lib/usercopy_64.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/lib/usercopy_64.c</a></div><div class='hunk'>@@ -55,26 +55,6 @@ unsigned long clear_user(void __user *to, unsigned long n)</div><div class='ctx'> EXPORT_SYMBOL(clear_user);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Try to copy last bytes and clear the rest if needed.</div><div class='del'>- * Since protection fault in copy_from/to_user is not a normal situation,</div><div class='del'>- * it is not necessary to optimize tail handling.</div><div class='del'>- */</div><div class='del'>-__visible unsigned long</div><div class='del'>-copy_user_handle_tail(char *to, char *from, unsigned len)</div><div class='del'>-{</div><div class='del'>-	for (; len; --len, to++) {</div><div class='del'>-		char c;</div><div class='del'>-</div><div class='del'>-		if (__get_user_nocheck(c, from++, sizeof(char)))</div><div class='del'>-			break;</div><div class='del'>-		if (__put_user_nocheck(c, to, sizeof(char)))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	clac();</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Similar to copy_user_handle_tail, probe for the write fault point,</div><div class='ctx'>  * but reuse __memcpy_mcsafe in case a new read error is encountered.</div><div class='ctx'>  * clac() is handled in _copy_to_iter_mcsafe().</div><div class='head'>diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c<br/>index 9e2ba7e667f6..a873da6b46d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/math-emu/fpu_entry.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/math-emu/fpu_entry.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/math-emu/fpu_entry.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/math-emu/fpu_entry.c</a></div><div class='hunk'>@@ -113,9 +113,6 @@ void math_emulate(struct math_emu_info *info)</div><div class='ctx'> 	unsigned long code_base = 0;</div><div class='ctx'> 	unsigned long code_limit = 0;	/* Initialized to stop compiler warnings */</div><div class='ctx'> 	struct desc_struct code_descriptor;</div><div class='del'>-	struct fpu *fpu = &amp;current-&gt;thread.fpu;</div><div class='del'>-</div><div class='del'>-	fpu__initialize(fpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef RE_ENTRANT_CHECKING</div><div class='ctx'> 	if (emulating) {</div><div class='head'>diff --git a/arch/x86/mm/cpu_entry_area.c b/arch/x86/mm/cpu_entry_area.c<br/>index 19c6abf9ea31..752ad11d6868 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/cpu_entry_area.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/cpu_entry_area.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/cpu_entry_area.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/cpu_entry_area.c</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> static DEFINE_PER_CPU_PAGE_ALIGNED(struct entry_stack_page, entry_stack_storage);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-static DEFINE_PER_CPU_PAGE_ALIGNED(char, exception_stacks</div><div class='del'>-	[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + DEBUG_STKSZ]);</div><div class='add'>+static DEFINE_PER_CPU_PAGE_ALIGNED(struct exception_stacks, exception_stacks);</div><div class='add'>+DEFINE_PER_CPU(struct cea_exception_stacks*, cea_exception_stacks);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct cpu_entry_area *get_cpu_entry_area(int cpu)</div><div class='hunk'>@@ -52,10 +52,10 @@ cea_map_percpu_pages(void *cea_vaddr, void *ptr, int pages, pgprot_t prot)</div><div class='ctx'> 		cea_set_pte(cea_vaddr, per_cpu_ptr_to_phys(ptr), prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init percpu_setup_debug_store(int cpu)</div><div class='add'>+static void __init percpu_setup_debug_store(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CPU_SUP_INTEL</div><div class='del'>-	int npages;</div><div class='add'>+	unsigned int npages;</div><div class='ctx'> 	void *cea;</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)</div><div class='hunk'>@@ -78,9 +78,43 @@ static void __init percpu_setup_debug_store(int cpu)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+</div><div class='add'>+#define cea_map_stack(name) do {					\</div><div class='add'>+	npages = sizeof(estacks-&gt;name## _stack) / PAGE_SIZE;		\</div><div class='add'>+	cea_map_percpu_pages(cea-&gt;estacks.name## _stack,		\</div><div class='add'>+			estacks-&gt;name## _stack, npages, PAGE_KERNEL);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static void __init percpu_setup_exception_stacks(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct exception_stacks *estacks = per_cpu_ptr(&amp;exception_stacks, cpu);</div><div class='add'>+	struct cpu_entry_area *cea = get_cpu_entry_area(cpu);</div><div class='add'>+	unsigned int npages;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(exception_stacks) % PAGE_SIZE != 0);</div><div class='add'>+</div><div class='add'>+	per_cpu(cea_exception_stacks, cpu) = &amp;cea-&gt;estacks;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The exceptions stack mappings in the per cpu area are protected</div><div class='add'>+	 * by guard pages so each stack must be mapped separately. DB2 is</div><div class='add'>+	 * not mapped; it just exists to catch triple nesting of #DB.</div><div class='add'>+	 */</div><div class='add'>+	cea_map_stack(DF);</div><div class='add'>+	cea_map_stack(NMI);</div><div class='add'>+	cea_map_stack(DB1);</div><div class='add'>+	cea_map_stack(DB);</div><div class='add'>+	cea_map_stack(MCE);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void percpu_setup_exception_stacks(unsigned int cpu) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Setup the fixmap mappings only once per-processor */</div><div class='del'>-static void __init setup_cpu_entry_area(int cpu)</div><div class='add'>+static void __init setup_cpu_entry_area(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	struct cpu_entry_area *cea = get_cpu_entry_area(cpu);</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	/* On 64-bit systems, we use a read-only fixmap GDT and TSS. */</div><div class='ctx'> 	pgprot_t gdt_prot = PAGE_KERNEL_RO;</div><div class='hunk'>@@ -101,10 +135,9 @@ static void __init setup_cpu_entry_area(int cpu)</div><div class='ctx'> 	pgprot_t tss_prot = PAGE_KERNEL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	cea_set_pte(&amp;get_cpu_entry_area(cpu)-&gt;gdt, get_cpu_gdt_paddr(cpu),</div><div class='del'>-		    gdt_prot);</div><div class='add'>+	cea_set_pte(&amp;cea-&gt;gdt, get_cpu_gdt_paddr(cpu), gdt_prot);</div><div class='ctx'> </div><div class='del'>-	cea_map_percpu_pages(&amp;get_cpu_entry_area(cpu)-&gt;entry_stack_page,</div><div class='add'>+	cea_map_percpu_pages(&amp;cea-&gt;entry_stack_page,</div><div class='ctx'> 			     per_cpu_ptr(&amp;entry_stack_storage, cpu), 1,</div><div class='ctx'> 			     PAGE_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -128,22 +161,15 @@ static void __init setup_cpu_entry_area(int cpu)</div><div class='ctx'> 	BUILD_BUG_ON((offsetof(struct tss_struct, x86_tss) ^</div><div class='ctx'> 		      offsetofend(struct tss_struct, x86_tss)) &amp; PAGE_MASK);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct tss_struct) % PAGE_SIZE != 0);</div><div class='del'>-	cea_map_percpu_pages(&amp;get_cpu_entry_area(cpu)-&gt;tss,</div><div class='del'>-			     &amp;per_cpu(cpu_tss_rw, cpu),</div><div class='add'>+	cea_map_percpu_pages(&amp;cea-&gt;tss, &amp;per_cpu(cpu_tss_rw, cpu),</div><div class='ctx'> 			     sizeof(struct tss_struct) / PAGE_SIZE, tss_prot);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='del'>-	per_cpu(cpu_entry_area, cpu) = get_cpu_entry_area(cpu);</div><div class='add'>+	per_cpu(cpu_entry_area, cpu) = cea;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	BUILD_BUG_ON(sizeof(exception_stacks) % PAGE_SIZE != 0);</div><div class='del'>-	BUILD_BUG_ON(sizeof(exception_stacks) !=</div><div class='del'>-		     sizeof(((struct cpu_entry_area *)0)-&gt;exception_stacks));</div><div class='del'>-	cea_map_percpu_pages(&amp;get_cpu_entry_area(cpu)-&gt;exception_stacks,</div><div class='del'>-			     &amp;per_cpu(exception_stacks, cpu),</div><div class='del'>-			     sizeof(exception_stacks) / PAGE_SIZE, PAGE_KERNEL);</div><div class='del'>-#endif</div><div class='add'>+	percpu_setup_exception_stacks(cpu);</div><div class='add'>+</div><div class='ctx'> 	percpu_setup_debug_store(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c<br/>index ee8f8ab46941..6a7302d1161f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/dump_pagetables.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/dump_pagetables.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/dump_pagetables.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/dump_pagetables.c</a></div><div class='hunk'>@@ -259,7 +259,8 @@ static void note_wx(struct pg_state *st)</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Account the WX pages */</div><div class='ctx'> 	st-&gt;wx_pages += npages;</div><div class='del'>-	WARN_ONCE(1, "x86/mm: Found insecure W+X mapping at address %pS\n",</div><div class='add'>+	WARN_ONCE(__supported_pte_mask &amp; _PAGE_NX,</div><div class='add'>+		  "x86/mm: Found insecure W+X mapping at address %pS\n",</div><div class='ctx'> 		  (void *)st-&gt;start_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -577,7 +578,7 @@ void ptdump_walk_pgd_level(struct seq_file *m, pgd_t *pgd)</div><div class='ctx'> void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PAGE_TABLE_ISOLATION</div><div class='del'>-	if (user &amp;&amp; static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	if (user &amp;&amp; boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		pgd = kernel_to_user_pgdp(pgd);</div><div class='ctx'> #endif</div><div class='ctx'> 	ptdump_walk_pgd_level_core(m, pgd, false, false);</div><div class='hunk'>@@ -590,7 +591,7 @@ void ptdump_walk_user_pgd_level_checkwx(void)</div><div class='ctx'> 	pgd_t *pgd = INIT_PGD;</div><div class='ctx'> </div><div class='ctx'> 	if (!(__supported_pte_mask &amp; _PAGE_NX) ||</div><div class='del'>-	    !static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	    !boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("x86/mm: Checking user space page tables\n");</div><div class='head'>diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c<br/>index 3c4568f8fb28..b0a2de8d2f9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/extable.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/extable.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/extable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/extable.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ __visible bool ex_handler_rdmsr_unsafe(const struct exception_table_entry *fixup</div><div class='ctx'> 				       unsigned long error_code,</div><div class='ctx'> 				       unsigned long fault_addr)</div><div class='ctx'> {</div><div class='del'>-	if (pr_warn_once("unchecked MSR access error: RDMSR from 0x%x at rIP: 0x%lx (%pF)\n",</div><div class='add'>+	if (pr_warn_once("unchecked MSR access error: RDMSR from 0x%x at rIP: 0x%lx (%pS)\n",</div><div class='ctx'> 			 (unsigned int)regs-&gt;cx, regs-&gt;ip, (void *)regs-&gt;ip))</div><div class='ctx'> 		show_stack_regs(regs);</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +162,7 @@ __visible bool ex_handler_wrmsr_unsafe(const struct exception_table_entry *fixup</div><div class='ctx'> 				       unsigned long error_code,</div><div class='ctx'> 				       unsigned long fault_addr)</div><div class='ctx'> {</div><div class='del'>-	if (pr_warn_once("unchecked MSR access error: WRMSR to 0x%x (tried to write 0x%08x%08x) at rIP: 0x%lx (%pF)\n",</div><div class='add'>+	if (pr_warn_once("unchecked MSR access error: WRMSR to 0x%x (tried to write 0x%08x%08x) at rIP: 0x%lx (%pS)\n",</div><div class='ctx'> 			 (unsigned int)regs-&gt;cx, (unsigned int)regs-&gt;dx,</div><div class='ctx'> 			 (unsigned int)regs-&gt;ax,  regs-&gt;ip, (void *)regs-&gt;ip))</div><div class='ctx'> 		show_stack_regs(regs);</div><div class='head'>diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c<br/>index 667f1da36208..46df4c6aae46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/fault.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/fault.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/fault.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/fault.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;		/* vma_pkey()			*/</div><div class='ctx'> #include &lt;asm/efi.h&gt;			/* efi_recover_from_page_fault()*/</div><div class='ctx'> #include &lt;asm/desc.h&gt;			/* store_idt(), ...		*/</div><div class='add'>+#include &lt;asm/cpu_entry_area.h&gt;		/* exception stack		*/</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;asm/trace/exceptions.h&gt;</div><div class='hunk'>@@ -359,8 +360,6 @@ static noinline int vmalloc_fault(unsigned long address)</div><div class='ctx'> 	if (!(address &gt;= VMALLOC_START &amp;&amp; address &lt; VMALLOC_END))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(in_nmi());</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy kernel mappings over when needed. This can also</div><div class='ctx'> 	 * happen within a race in page table update. In the later</div><div class='hunk'>@@ -603,24 +602,9 @@ static void show_ldttss(const struct desc_ptr *gdt, const char *name, u16 index)</div><div class='ctx'> 		 name, index, addr, (desc.limit0 | (desc.limit1 &lt;&lt; 16)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This helper function transforms the #PF error_code bits into</div><div class='del'>- * "[PROT] [USER]" type of descriptive, almost human-readable error strings:</div><div class='del'>- */</div><div class='del'>-static void err_str_append(unsigned long error_code, char *buf, unsigned long mask, const char *txt)</div><div class='del'>-{</div><div class='del'>-	if (error_code &amp; mask) {</div><div class='del'>-		if (buf[0])</div><div class='del'>-			strcat(buf, " ");</div><div class='del'>-		strcat(buf, txt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> show_fault_oops(struct pt_regs *regs, unsigned long error_code, unsigned long address)</div><div class='ctx'> {</div><div class='del'>-	char err_txt[64];</div><div class='del'>-</div><div class='ctx'> 	if (!oops_may_print())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -644,31 +628,29 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code, unsigned long ad</div><div class='ctx'> 				from_kuid(&amp;init_user_ns, current_uid()));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_alert("BUG: unable to handle kernel %s at %px\n",</div><div class='del'>-		 address &lt; PAGE_SIZE ? "NULL pointer dereference" : "paging request",</div><div class='del'>-		 (void *)address);</div><div class='del'>-</div><div class='del'>-	err_txt[0] = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note: length of these appended strings including the separation space and the</div><div class='del'>-	 * zero delimiter must fit into err_txt[].</div><div class='del'>-	 */</div><div class='del'>-	err_str_append(error_code, err_txt, X86_PF_PROT,  "[PROT]" );</div><div class='del'>-	err_str_append(error_code, err_txt, X86_PF_WRITE, "[WRITE]");</div><div class='del'>-	err_str_append(error_code, err_txt, X86_PF_USER,  "[USER]" );</div><div class='del'>-	err_str_append(error_code, err_txt, X86_PF_RSVD,  "[RSVD]" );</div><div class='del'>-	err_str_append(error_code, err_txt, X86_PF_INSTR, "[INSTR]");</div><div class='del'>-	err_str_append(error_code, err_txt, X86_PF_PK,    "[PK]"   );</div><div class='del'>-</div><div class='del'>-	pr_alert("#PF error: %s\n", error_code ? err_txt : "[normal kernel read fault]");</div><div class='add'>+	if (address &lt; PAGE_SIZE &amp;&amp; !user_mode(regs))</div><div class='add'>+		pr_alert("BUG: kernel NULL pointer dereference, address: %px\n",</div><div class='add'>+			(void *)address);</div><div class='add'>+	else</div><div class='add'>+		pr_alert("BUG: unable to handle page fault for address: %px\n",</div><div class='add'>+			(void *)address);</div><div class='add'>+</div><div class='add'>+	pr_alert("#PF: %s %s in %s mode\n",</div><div class='add'>+		 (error_code &amp; X86_PF_USER)  ? "user" : "supervisor",</div><div class='add'>+		 (error_code &amp; X86_PF_INSTR) ? "instruction fetch" :</div><div class='add'>+		 (error_code &amp; X86_PF_WRITE) ? "write access" :</div><div class='add'>+					       "read access",</div><div class='add'>+			     user_mode(regs) ? "user" : "kernel");</div><div class='add'>+	pr_alert("#PF: error_code(0x%04lx) - %s\n", error_code,</div><div class='add'>+		 !(error_code &amp; X86_PF_PROT) ? "not-present page" :</div><div class='add'>+		 (error_code &amp; X86_PF_RSVD)  ? "reserved bit violation" :</div><div class='add'>+		 (error_code &amp; X86_PF_PK)    ? "protection keys violation" :</div><div class='add'>+					       "permissions violation");</div><div class='ctx'> </div><div class='ctx'> 	if (!(error_code &amp; X86_PF_USER) &amp;&amp; user_mode(regs)) {</div><div class='ctx'> 		struct desc_ptr idt, gdt;</div><div class='ctx'> 		u16 ldtr, tr;</div><div class='ctx'> </div><div class='del'>-		pr_alert("This was a system access from user code\n");</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This can happen for quite a few reasons.  The more obvious</div><div class='ctx'> 		 * ones are faults accessing the GDT, or LDT.  Perhaps</div><div class='hunk'>@@ -793,7 +775,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,</div><div class='ctx'> 	if (is_vmalloc_addr((void *)address) &amp;&amp;</div><div class='ctx'> 	    (((unsigned long)tsk-&gt;stack - 1 - address &lt; PAGE_SIZE) ||</div><div class='ctx'> 	     address - ((unsigned long)tsk-&gt;stack + THREAD_SIZE) &lt; PAGE_SIZE)) {</div><div class='del'>-		unsigned long stack = this_cpu_read(orig_ist.ist[DOUBLEFAULT_STACK]) - sizeof(void *);</div><div class='add'>+		unsigned long stack = __this_cpu_ist_top_va(DF) - sizeof(void *);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We're likely to be running with very little stack space</div><div class='ctx'> 		 * left.  It's plausible that we'd hit this condition but</div><div class='head'>diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c<br/>index f905a2371080..fd10d91a6115 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/init.c</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/swapfile.h&gt;</div><div class='ctx'> #include &lt;linux/swapops.h&gt;</div><div class='add'>+#include &lt;linux/kmemleak.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/set_memory.h&gt;</div><div class='ctx'> #include &lt;asm/e820/api.h&gt;</div><div class='hunk'>@@ -22,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/pti.h&gt;</div><div class='add'>+#include &lt;asm/text-patching.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We need to define the tracepoints somewhere, and tlb.c</div><div class='hunk'>@@ -701,6 +704,41 @@ void __init init_mem_mapping(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Initialize an mm_struct to be used during poking and a pointer to be used</div><div class='add'>+ * during patching.</div><div class='add'>+ */</div><div class='add'>+void __init poking_init(void)</div><div class='add'>+{</div><div class='add'>+	spinlock_t *ptl;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+</div><div class='add'>+	poking_mm = copy_init_mm();</div><div class='add'>+	BUG_ON(!poking_mm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Randomize the poking address, but make sure that the following page</div><div class='add'>+	 * will be mapped at the same PMD. We need 2 pages, so find space for 3,</div><div class='add'>+	 * and adjust the address if the PMD ends after the first one.</div><div class='add'>+	 */</div><div class='add'>+	poking_addr = TASK_UNMAPPED_BASE;</div><div class='add'>+	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))</div><div class='add'>+		poking_addr += (kaslr_get_random_long("Poking") &amp; PAGE_MASK) %</div><div class='add'>+			(TASK_SIZE - TASK_UNMAPPED_BASE - 3 * PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	if (((poking_addr + PAGE_SIZE) &amp; ~PMD_MASK) == 0)</div><div class='add'>+		poking_addr += PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to trigger the allocation of the page-tables that will be</div><div class='add'>+	 * needed for poking now. Later, poking may be performed in an atomic</div><div class='add'>+	 * section, which might cause allocation to fail.</div><div class='add'>+	 */</div><div class='add'>+	ptep = get_locked_pte(poking_mm, poking_addr, &amp;ptl);</div><div class='add'>+	BUG_ON(!ptep);</div><div class='add'>+	pte_unmap_unlock(ptep, ptl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * devmem_is_allowed() checks to see if /dev/mem access to a certain address</div><div class='ctx'>  * is valid. The argument is a physical page number.</div><div class='ctx'>  *</div><div class='hunk'>@@ -766,6 +804,11 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)</div><div class='ctx'> 	if (debug_pagealloc_enabled()) {</div><div class='ctx'> 		pr_info("debug: unmapping init [mem %#010lx-%#010lx]\n",</div><div class='ctx'> 			begin, end - 1);</div><div class='add'>+		/*</div><div class='add'>+		 * Inform kmemleak about the hole in the memory since the</div><div class='add'>+		 * corresponding pages will be unmapped.</div><div class='add'>+		 */</div><div class='add'>+		kmemleak_free_part((void *)begin, end - begin);</div><div class='ctx'> 		set_memory_np(begin, (end - begin) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='head'>diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c<br/>index 0029604af8a4..dd73d5d74393 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/ioremap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/ioremap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/ioremap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/ioremap.c</a></div><div class='hunk'>@@ -825,7 +825,7 @@ void __init __early_set_fixmap(enum fixed_addresses idx,</div><div class='ctx'> 	pte = early_ioremap_pte(addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanitize 'prot' against any unsupported bits: */</div><div class='del'>-	pgprot_val(flags) &amp;= __default_kernel_pte_mask;</div><div class='add'>+	pgprot_val(flags) &amp;= __supported_pte_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (pgprot_val(flags))</div><div class='ctx'> 		set_pte(pte, pfn_pte(phys &gt;&gt; PAGE_SHIFT, flags));</div><div class='head'>diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c<br/>index 3f452ffed7e9..dc3f058bdf9b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/kaslr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/kaslr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/kaslr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/kaslr.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ void __init kernel_randomize_memory(void)</div><div class='ctx'> 	if (!kaslr_memory_enabled())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	kaslr_regions[0].size_tb = 1 &lt;&lt; (__PHYSICAL_MASK_SHIFT - TB_SHIFT);</div><div class='add'>+	kaslr_regions[0].size_tb = 1 &lt;&lt; (MAX_PHYSMEM_BITS - TB_SHIFT);</div><div class='ctx'> 	kaslr_regions[1].size_tb = VMALLOC_SIZE_TB;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -125,10 +125,7 @@ void __init kernel_randomize_memory(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		entropy = remain_entropy / (ARRAY_SIZE(kaslr_regions) - i);</div><div class='ctx'> 		prandom_bytes_state(&amp;rand_state, &amp;rand, sizeof(rand));</div><div class='del'>-		if (pgtable_l5_enabled())</div><div class='del'>-			entropy = (rand % (entropy + 1)) &amp; P4D_MASK;</div><div class='del'>-		else</div><div class='del'>-			entropy = (rand % (entropy + 1)) &amp; PUD_MASK;</div><div class='add'>+		entropy = (rand % (entropy + 1)) &amp; PUD_MASK;</div><div class='ctx'> 		vaddr += entropy;</div><div class='ctx'> 		*kaslr_regions[i].base = vaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -137,84 +134,71 @@ void __init kernel_randomize_memory(void)</div><div class='ctx'> 		 * randomization alignment.</div><div class='ctx'> 		 */</div><div class='ctx'> 		vaddr += get_padding(&amp;kaslr_regions[i]);</div><div class='del'>-		if (pgtable_l5_enabled())</div><div class='del'>-			vaddr = round_up(vaddr + 1, P4D_SIZE);</div><div class='del'>-		else</div><div class='del'>-			vaddr = round_up(vaddr + 1, PUD_SIZE);</div><div class='add'>+		vaddr = round_up(vaddr + 1, PUD_SIZE);</div><div class='ctx'> 		remain_entropy -= entropy;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __meminit init_trampoline_pud(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long paddr, paddr_next;</div><div class='add'>+	pud_t *pud_page_tramp, *pud, *pud_tramp;</div><div class='add'>+	p4d_t *p4d_page_tramp, *p4d, *p4d_tramp;</div><div class='add'>+	unsigned long paddr, vaddr;</div><div class='ctx'> 	pgd_t *pgd;</div><div class='del'>-	pud_t *pud_page, *pud_page_tramp;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	pud_page_tramp = alloc_low_page();</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * There are two mappings for the low 1MB area, the direct mapping</div><div class='add'>+	 * and the 1:1 mapping for the real mode trampoline:</div><div class='add'>+	 *</div><div class='add'>+	 * Direct mapping: virt_addr = phys_addr + PAGE_OFFSET</div><div class='add'>+	 * 1:1 mapping:    virt_addr = phys_addr</div><div class='add'>+	 */</div><div class='ctx'> 	paddr = 0;</div><div class='del'>-	pgd = pgd_offset_k((unsigned long)__va(paddr));</div><div class='del'>-	pud_page = (pud_t *) pgd_page_vaddr(*pgd);</div><div class='del'>-</div><div class='del'>-	for (i = pud_index(paddr); i &lt; PTRS_PER_PUD; i++, paddr = paddr_next) {</div><div class='del'>-		pud_t *pud, *pud_tramp;</div><div class='del'>-		unsigned long vaddr = (unsigned long)__va(paddr);</div><div class='add'>+	vaddr = (unsigned long)__va(paddr);</div><div class='add'>+	pgd = pgd_offset_k(vaddr);</div><div class='ctx'> </div><div class='del'>-		pud_tramp = pud_page_tramp + pud_index(paddr);</div><div class='del'>-		pud = pud_page + pud_index(vaddr);</div><div class='del'>-		paddr_next = (paddr &amp; PUD_MASK) + PUD_SIZE;</div><div class='del'>-</div><div class='del'>-		*pud_tramp = *pud;</div><div class='del'>-	}</div><div class='add'>+	p4d = p4d_offset(pgd, vaddr);</div><div class='add'>+	pud = pud_offset(p4d, vaddr);</div><div class='ctx'> </div><div class='del'>-	set_pgd(&amp;trampoline_pgd_entry,</div><div class='del'>-		__pgd(_KERNPG_TABLE | __pa(pud_page_tramp)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __meminit init_trampoline_p4d(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long paddr, paddr_next;</div><div class='del'>-	pgd_t *pgd;</div><div class='del'>-	p4d_t *p4d_page, *p4d_page_tramp;</div><div class='del'>-	int i;</div><div class='add'>+	pud_tramp = pud_page_tramp + pud_index(paddr);</div><div class='add'>+	*pud_tramp = *pud;</div><div class='ctx'> </div><div class='del'>-	p4d_page_tramp = alloc_low_page();</div><div class='del'>-</div><div class='del'>-	paddr = 0;</div><div class='del'>-	pgd = pgd_offset_k((unsigned long)__va(paddr));</div><div class='del'>-	p4d_page = (p4d_t *) pgd_page_vaddr(*pgd);</div><div class='del'>-</div><div class='del'>-	for (i = p4d_index(paddr); i &lt; PTRS_PER_P4D; i++, paddr = paddr_next) {</div><div class='del'>-		p4d_t *p4d, *p4d_tramp;</div><div class='del'>-		unsigned long vaddr = (unsigned long)__va(paddr);</div><div class='add'>+	if (pgtable_l5_enabled()) {</div><div class='add'>+		p4d_page_tramp = alloc_low_page();</div><div class='ctx'> </div><div class='ctx'> 		p4d_tramp = p4d_page_tramp + p4d_index(paddr);</div><div class='del'>-		p4d = p4d_page + p4d_index(vaddr);</div><div class='del'>-		paddr_next = (paddr &amp; P4D_MASK) + P4D_SIZE;</div><div class='ctx'> </div><div class='del'>-		*p4d_tramp = *p4d;</div><div class='del'>-	}</div><div class='add'>+		set_p4d(p4d_tramp,</div><div class='add'>+			__p4d(_KERNPG_TABLE | __pa(pud_page_tramp)));</div><div class='ctx'> </div><div class='del'>-	set_pgd(&amp;trampoline_pgd_entry,</div><div class='del'>-		__pgd(_KERNPG_TABLE | __pa(p4d_page_tramp)));</div><div class='add'>+		set_pgd(&amp;trampoline_pgd_entry,</div><div class='add'>+			__pgd(_KERNPG_TABLE | __pa(p4d_page_tramp)));</div><div class='add'>+	} else {</div><div class='add'>+		set_pgd(&amp;trampoline_pgd_entry,</div><div class='add'>+			__pgd(_KERNPG_TABLE | __pa(pud_page_tramp)));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Create PGD aligned trampoline table to allow real mode initialization</div><div class='del'>- * of additional CPUs. Consume only 1 low memory page.</div><div class='add'>+ * The real mode trampoline, which is required for bootstrapping CPUs</div><div class='add'>+ * occupies only a small area under the low 1MB.  See reserve_real_mode()</div><div class='add'>+ * for details.</div><div class='add'>+ *</div><div class='add'>+ * If KASLR is disabled the first PGD entry of the direct mapping is copied</div><div class='add'>+ * to map the real mode trampoline.</div><div class='add'>+ *</div><div class='add'>+ * If KASLR is enabled, copy only the PUD which covers the low 1MB</div><div class='add'>+ * area. This limits the randomization granularity to 1GB for both 4-level</div><div class='add'>+ * and 5-level paging.</div><div class='ctx'>  */</div><div class='ctx'> void __meminit init_trampoline(void)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	if (!kaslr_memory_enabled()) {</div><div class='ctx'> 		init_trampoline_default();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pgtable_l5_enabled())</div><div class='del'>-		init_trampoline_p4d();</div><div class='del'>-	else</div><div class='del'>-		init_trampoline_pud();</div><div class='add'>+	init_trampoline_pud();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c<br/>index db3165714521..dc726e07d8ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/mmap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/mmap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/mmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/mmap.c</a></div><div class='hunk'>@@ -230,7 +230,7 @@ bool mmap_address_hint_valid(unsigned long addr, unsigned long len)</div><div class='ctx'> /* Can we access it for direct reading/writing? Must be RAM: */</div><div class='ctx'> int valid_phys_addr_range(phys_addr_t addr, size_t count)</div><div class='ctx'> {</div><div class='del'>-	return addr + count &lt;= __pa(high_memory);</div><div class='add'>+	return addr + count - 1 &lt;= __pa(high_memory - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Can we access it through mmap? Must be a valid physical address: */</div><div class='head'>diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c<br/>index c805db6236b4..59726aaf4671 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/mpx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/mpx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/mpx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/mpx.c</a></div><div class='hunk'>@@ -142,7 +142,7 @@ int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* get bndregs field from current task's xsave area */</div><div class='del'>-	bndregs = get_xsave_field_ptr(XFEATURE_MASK_BNDREGS);</div><div class='add'>+	bndregs = get_xsave_field_ptr(XFEATURE_BNDREGS);</div><div class='ctx'> 	if (!bndregs) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -190,7 +190,7 @@ static __user void *mpx_get_bounds_dir(void)</div><div class='ctx'> 	 * The bounds directory pointer is stored in a register</div><div class='ctx'> 	 * only accessible if we first do an xsave.</div><div class='ctx'> 	 */</div><div class='del'>-	bndcsr = get_xsave_field_ptr(XFEATURE_MASK_BNDCSR);</div><div class='add'>+	bndcsr = get_xsave_field_ptr(XFEATURE_BNDCSR);</div><div class='ctx'> 	if (!bndcsr)</div><div class='ctx'> 		return MPX_INVALID_BOUNDS_DIR;</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +376,7 @@ static int do_mpx_bt_fault(void)</div><div class='ctx'> 	const struct mpx_bndcsr *bndcsr;</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='ctx'> </div><div class='del'>-	bndcsr = get_xsave_field_ptr(XFEATURE_MASK_BNDCSR);</div><div class='add'>+	bndcsr = get_xsave_field_ptr(XFEATURE_BNDCSR);</div><div class='ctx'> 	if (!bndcsr)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c<br/>index 4c570612e24e..daf4d645e537 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pageattr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pageattr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pageattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/pageattr.c</a></div><div class='hunk'>@@ -2209,8 +2209,6 @@ int set_pages_rw(struct page *page, int numpages)</div><div class='ctx'> 	return set_memory_rw(addr, numpages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='del'>-</div><div class='ctx'> static int __set_pages_p(struct page *page, int numpages)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tempaddr = (unsigned long) page_address(page);</div><div class='hunk'>@@ -2249,6 +2247,16 @@ static int __set_pages_np(struct page *page, int numpages)</div><div class='ctx'> 	return __change_page_attr_set_clr(&amp;cpa, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int set_direct_map_invalid_noflush(struct page *page)</div><div class='add'>+{</div><div class='add'>+	return __set_pages_np(page, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int set_direct_map_default_noflush(struct page *page)</div><div class='add'>+{</div><div class='add'>+	return __set_pages_p(page, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	if (PageHighMem(page))</div><div class='hunk'>@@ -2282,7 +2290,6 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIBERNATION</div><div class='del'>-</div><div class='ctx'> bool kernel_page_present(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int level;</div><div class='hunk'>@@ -2294,11 +2301,8 @@ bool kernel_page_present(struct page *page)</div><div class='ctx'> 	pte = lookup_address((unsigned long)page_address(page), &amp;level);</div><div class='ctx'> 	return (pte_val(*pte) &amp; _PAGE_PRESENT);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_HIBERNATION */</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_DEBUG_PAGEALLOC */</div><div class='del'>-</div><div class='ctx'> int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address,</div><div class='ctx'> 				   unsigned numpages, unsigned long page_flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c<br/>index 7bd01709a091..1f67b1e15bf6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pgtable.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pgtable.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pgtable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/pgtable.c</a></div><div class='hunk'>@@ -190,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd)</div><div class='ctx'>  * when PTI is enabled. We need them to map the per-process LDT into the</div><div class='ctx'>  * user-space page-table.</div><div class='ctx'>  */</div><div class='del'>-#define PREALLOCATED_USER_PMDS	 (static_cpu_has(X86_FEATURE_PTI) ? \</div><div class='add'>+#define PREALLOCATED_USER_PMDS	 (boot_cpu_has(X86_FEATURE_PTI) ? \</div><div class='ctx'> 					KERNEL_PGD_PTRS : 0)</div><div class='ctx'> #define MAX_PREALLOCATED_USER_PMDS KERNEL_PGD_PTRS</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +292,7 @@ static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PAGE_TABLE_ISOLATION</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pgdp = kernel_to_user_pgdp(pgdp);</div><div class='hunk'>@@ -373,14 +373,14 @@ static void pgd_prepopulate_user_pmd(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *pgd_cache;</div><div class='ctx'> </div><div class='del'>-static int __init pgd_cache_init(void)</div><div class='add'>+void __init pgd_cache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When PAE kernel is running as a Xen domain, it does not use</div><div class='ctx'> 	 * shared kernel pmd. And this requires a whole page for pgd.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!SHARED_KERNEL_PMD)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * when PAE kernel is not running as a Xen domain, it uses</div><div class='hunk'>@@ -390,9 +390,7 @@ static int __init pgd_cache_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pgd_cache = kmem_cache_create("pgd_cache", PGD_SIZE, PGD_ALIGN,</div><div class='ctx'> 				      SLAB_PANIC, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='del'>-core_initcall(pgd_cache_init);</div><div class='ctx'> </div><div class='ctx'> static inline pgd_t *_pgd_alloc(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -420,6 +418,10 @@ static inline void _pgd_free(pgd_t *pgd)</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+void __init pgd_cache_init(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline pgd_t *_pgd_alloc(void)</div><div class='ctx'> {</div><div class='ctx'> 	return (pgd_t *)__get_free_pages(PGALLOC_GFP, PGD_ALLOCATION_ORDER);</div><div class='head'>diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c<br/>index 047a77f6a10c..1dcfc91c8f0c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pkeys.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pkeys.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pkeys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/pkeys.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;             /* boot_cpu_has, ...            */</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;            /* vma_pkey()                   */</div><div class='add'>+#include &lt;asm/fpu/internal.h&gt;		/* init_fpstate			*/</div><div class='ctx'> </div><div class='ctx'> int __execute_only_pkey(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='hunk'>@@ -39,17 +40,12 @@ int __execute_only_pkey(struct mm_struct *mm)</div><div class='ctx'> 	 * dance to set PKRU if we do not need to.  Check it</div><div class='ctx'> 	 * first and assume that if the execute-only pkey is</div><div class='ctx'> 	 * write-disabled that we do not have to set it</div><div class='del'>-	 * ourselves.  We need preempt off so that nobody</div><div class='del'>-	 * can make fpregs inactive.</div><div class='add'>+	 * ourselves.</div><div class='ctx'> 	 */</div><div class='del'>-	preempt_disable();</div><div class='ctx'> 	if (!need_to_set_mm_pkey &amp;&amp;</div><div class='del'>-	    current-&gt;thread.fpu.initialized &amp;&amp;</div><div class='ctx'> 	    !__pkru_allows_read(read_pkru(), execute_only_pkey)) {</div><div class='del'>-		preempt_enable();</div><div class='ctx'> 		return execute_only_pkey;</div><div class='ctx'> 	}</div><div class='del'>-	preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set up PKRU so that it denies access for everything</div><div class='hunk'>@@ -131,7 +127,6 @@ int __arch_override_mprotect_pkey(struct vm_area_struct *vma, int prot, int pkey</div><div class='ctx'>  * in the process's lifetime will not accidentally get access</div><div class='ctx'>  * to data which is pkey-protected later on.</div><div class='ctx'>  */</div><div class='del'>-static</div><div class='ctx'> u32 init_pkru_value = PKRU_AD_KEY( 1) | PKRU_AD_KEY( 2) | PKRU_AD_KEY( 3) |</div><div class='ctx'> 		      PKRU_AD_KEY( 4) | PKRU_AD_KEY( 5) | PKRU_AD_KEY( 6) |</div><div class='ctx'> 		      PKRU_AD_KEY( 7) | PKRU_AD_KEY( 8) | PKRU_AD_KEY( 9) |</div><div class='hunk'>@@ -148,13 +143,6 @@ void copy_init_pkru_to_fpregs(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 init_pkru_value_snapshot = READ_ONCE(init_pkru_value);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Any write to PKRU takes it out of the XSAVE 'init</div><div class='del'>-	 * state' which increases context switch cost.  Avoid</div><div class='del'>-	 * writing 0 when PKRU was already 0.</div><div class='del'>-	 */</div><div class='del'>-	if (!init_pkru_value_snapshot &amp;&amp; !read_pkru())</div><div class='del'>-		return;</div><div class='del'>-	/*</div><div class='ctx'> 	 * Override the PKRU state that came from 'init_fpstate'</div><div class='ctx'> 	 * with the baseline from the process.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -174,6 +162,7 @@ static ssize_t init_pkru_read_file(struct file *file, char __user *user_buf,</div><div class='ctx'> static ssize_t init_pkru_write_file(struct file *file,</div><div class='ctx'> 		 const char __user *user_buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='add'>+	struct pkru_state *pk;</div><div class='ctx'> 	char buf[32];</div><div class='ctx'> 	ssize_t len;</div><div class='ctx'> 	u32 new_init_pkru;</div><div class='hunk'>@@ -196,6 +185,10 @@ static ssize_t init_pkru_write_file(struct file *file,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(init_pkru_value, new_init_pkru);</div><div class='add'>+	pk = get_xsave_addr(&amp;init_fpstate.xsave, XFEATURE_PKRU);</div><div class='add'>+	if (!pk)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pk-&gt;pkru = new_init_pkru;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c<br/>index 4fee5c3003ed..9c2463bc158f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pti.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/pti.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/pti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/pti.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='hunk'>@@ -77,7 +78,7 @@ static void __init pti_print_if_secure(const char *reason)</div><div class='ctx'> 		pr_info("%s\n", reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum pti_mode {</div><div class='add'>+static enum pti_mode {</div><div class='ctx'> 	PTI_AUTO = 0,</div><div class='ctx'> 	PTI_FORCE_OFF,</div><div class='ctx'> 	PTI_FORCE_ON</div><div class='hunk'>@@ -115,7 +116,8 @@ void __init pti_check_boottime_disable(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cmdline_find_option_bool(boot_command_line, "nopti")) {</div><div class='add'>+	if (cmdline_find_option_bool(boot_command_line, "nopti") ||</div><div class='add'>+	    cpu_mitigations_off()) {</div><div class='ctx'> 		pti_mode = PTI_FORCE_OFF;</div><div class='ctx'> 		pti_print_if_insecure("disabled on command line.");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -602,7 +604,7 @@ static void pti_clone_kernel_text(void)</div><div class='ctx'> 	set_memory_global(start, (end_global - start) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void pti_set_kernel_image_nonglobal(void)</div><div class='add'>+static void pti_set_kernel_image_nonglobal(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The identity map is created with PMDs, regardless of the</div><div class='hunk'>@@ -626,7 +628,7 @@ void pti_set_kernel_image_nonglobal(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init pti_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_PTI))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_PTI))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("enabled\n");</div><div class='head'>diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c<br/>index bc4bc7b2f075..7f61431c75fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/tlb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/mm/tlb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/mm/tlb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/mm/tlb.c</a></div><div class='hunk'>@@ -634,7 +634,7 @@ static void flush_tlb_func_common(const struct flush_tlb_info *f,</div><div class='ctx'> 	this_cpu_write(cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen, mm_tlb_gen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void flush_tlb_func_local(void *info, enum tlb_flush_reason reason)</div><div class='add'>+static void flush_tlb_func_local(const void *info, enum tlb_flush_reason reason)</div><div class='ctx'> {</div><div class='ctx'> 	const struct flush_tlb_info *f = info;</div><div class='ctx'> </div><div class='hunk'>@@ -722,43 +722,81 @@ void native_flush_tlb_others(const struct cpumask *cpumask,</div><div class='ctx'>  */</div><div class='ctx'> unsigned long tlb_single_page_flush_ceiling __read_mostly = 33;</div><div class='ctx'> </div><div class='add'>+static DEFINE_PER_CPU_SHARED_ALIGNED(struct flush_tlb_info, flush_tlb_info);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_VM</div><div class='add'>+static DEFINE_PER_CPU(unsigned int, flush_tlb_info_idx);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm,</div><div class='add'>+			unsigned long start, unsigned long end,</div><div class='add'>+			unsigned int stride_shift, bool freed_tables,</div><div class='add'>+			u64 new_tlb_gen)</div><div class='add'>+{</div><div class='add'>+	struct flush_tlb_info *info = this_cpu_ptr(&amp;flush_tlb_info);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_VM</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that the following code is non-reentrant and flush_tlb_info</div><div class='add'>+	 * is not overwritten. This means no TLB flushing is initiated by</div><div class='add'>+	 * interrupt handlers and machine-check exception handlers.</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(this_cpu_inc_return(flush_tlb_info_idx) != 1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	info-&gt;start		= start;</div><div class='add'>+	info-&gt;end		= end;</div><div class='add'>+	info-&gt;mm		= mm;</div><div class='add'>+	info-&gt;stride_shift	= stride_shift;</div><div class='add'>+	info-&gt;freed_tables	= freed_tables;</div><div class='add'>+	info-&gt;new_tlb_gen	= new_tlb_gen;</div><div class='add'>+</div><div class='add'>+	return info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_flush_tlb_info(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_DEBUG_VM</div><div class='add'>+	/* Complete reentrency prevention checks */</div><div class='add'>+	barrier();</div><div class='add'>+	this_cpu_dec(flush_tlb_info_idx);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,</div><div class='ctx'> 				unsigned long end, unsigned int stride_shift,</div><div class='ctx'> 				bool freed_tables)</div><div class='ctx'> {</div><div class='add'>+	struct flush_tlb_info *info;</div><div class='add'>+	u64 new_tlb_gen;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	struct flush_tlb_info info __aligned(SMP_CACHE_BYTES) = {</div><div class='del'>-		.mm = mm,</div><div class='del'>-		.stride_shift = stride_shift,</div><div class='del'>-		.freed_tables = freed_tables,</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	cpu = get_cpu();</div><div class='ctx'> </div><div class='del'>-	/* This is also a barrier that synchronizes with switch_mm(). */</div><div class='del'>-	info.new_tlb_gen = inc_mm_tlb_gen(mm);</div><div class='del'>-</div><div class='ctx'> 	/* Should we flush just the requested range? */</div><div class='del'>-	if ((end != TLB_FLUSH_ALL) &amp;&amp;</div><div class='del'>-	    ((end - start) &gt;&gt; stride_shift) &lt;= tlb_single_page_flush_ceiling) {</div><div class='del'>-		info.start = start;</div><div class='del'>-		info.end = end;</div><div class='del'>-	} else {</div><div class='del'>-		info.start = 0UL;</div><div class='del'>-		info.end = TLB_FLUSH_ALL;</div><div class='add'>+	if ((end == TLB_FLUSH_ALL) ||</div><div class='add'>+	    ((end - start) &gt;&gt; stride_shift) &gt; tlb_single_page_flush_ceiling) {</div><div class='add'>+		start = 0;</div><div class='add'>+		end = TLB_FLUSH_ALL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* This is also a barrier that synchronizes with switch_mm(). */</div><div class='add'>+	new_tlb_gen = inc_mm_tlb_gen(mm);</div><div class='add'>+</div><div class='add'>+	info = get_flush_tlb_info(mm, start, end, stride_shift, freed_tables,</div><div class='add'>+				  new_tlb_gen);</div><div class='add'>+</div><div class='ctx'> 	if (mm == this_cpu_read(cpu_tlbstate.loaded_mm)) {</div><div class='del'>-		VM_WARN_ON(irqs_disabled());</div><div class='add'>+		lockdep_assert_irqs_enabled();</div><div class='ctx'> 		local_irq_disable();</div><div class='del'>-		flush_tlb_func_local(&amp;info, TLB_LOCAL_MM_SHOOTDOWN);</div><div class='add'>+		flush_tlb_func_local(info, TLB_LOCAL_MM_SHOOTDOWN);</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpumask_any_but(mm_cpumask(mm), cpu) &lt; nr_cpu_ids)</div><div class='del'>-		flush_tlb_others(mm_cpumask(mm), &amp;info);</div><div class='add'>+		flush_tlb_others(mm_cpumask(mm), info);</div><div class='ctx'> </div><div class='add'>+	put_flush_tlb_info();</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -787,38 +825,48 @@ static void do_kernel_range_flush(void *info)</div><div class='ctx'> </div><div class='ctx'> void flush_tlb_kernel_range(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	/* Balance as user space task's flush, a bit conservative */</div><div class='ctx'> 	if (end == TLB_FLUSH_ALL ||</div><div class='ctx'> 	    (end - start) &gt; tlb_single_page_flush_ceiling &lt;&lt; PAGE_SHIFT) {</div><div class='ctx'> 		on_each_cpu(do_flush_tlb_all, NULL, 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct flush_tlb_info info;</div><div class='del'>-		info.start = start;</div><div class='del'>-		info.end = end;</div><div class='del'>-		on_each_cpu(do_kernel_range_flush, &amp;info, 1);</div><div class='add'>+		struct flush_tlb_info *info;</div><div class='add'>+</div><div class='add'>+		preempt_disable();</div><div class='add'>+		info = get_flush_tlb_info(NULL, start, end, 0, false, 0);</div><div class='add'>+</div><div class='add'>+		on_each_cpu(do_kernel_range_flush, info, 1);</div><div class='add'>+</div><div class='add'>+		put_flush_tlb_info();</div><div class='add'>+		preempt_enable();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * arch_tlbbatch_flush() performs a full TLB flush regardless of the active mm.</div><div class='add'>+ * This means that the 'struct flush_tlb_info' that describes which mappings to</div><div class='add'>+ * flush is actually fixed. We therefore set a single fixed struct and use it in</div><div class='add'>+ * arch_tlbbatch_flush().</div><div class='add'>+ */</div><div class='add'>+static const struct flush_tlb_info full_flush_tlb_info = {</div><div class='add'>+	.mm = NULL,</div><div class='add'>+	.start = 0,</div><div class='add'>+	.end = TLB_FLUSH_ALL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)</div><div class='ctx'> {</div><div class='del'>-	struct flush_tlb_info info = {</div><div class='del'>-		.mm = NULL,</div><div class='del'>-		.start = 0UL,</div><div class='del'>-		.end = TLB_FLUSH_ALL,</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	int cpu = get_cpu();</div><div class='ctx'> </div><div class='ctx'> 	if (cpumask_test_cpu(cpu, &amp;batch-&gt;cpumask)) {</div><div class='del'>-		VM_WARN_ON(irqs_disabled());</div><div class='add'>+		lockdep_assert_irqs_enabled();</div><div class='ctx'> 		local_irq_disable();</div><div class='del'>-		flush_tlb_func_local(&amp;info, TLB_LOCAL_SHOOTDOWN);</div><div class='add'>+		flush_tlb_func_local(&amp;full_flush_tlb_info, TLB_LOCAL_SHOOTDOWN);</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpumask_any_but(&amp;batch-&gt;cpumask, cpu) &lt; nr_cpu_ids)</div><div class='del'>-		flush_tlb_others(&amp;batch-&gt;cpumask, &amp;info);</div><div class='add'>+		flush_tlb_others(&amp;batch-&gt;cpumask, &amp;full_flush_tlb_info);</div><div class='ctx'> </div><div class='ctx'> 	cpumask_clear(&amp;batch-&gt;cpumask);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c<br/>index 0d9cdffce6ac..b29e82f190c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/net/bpf_jit_comp32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/net/bpf_jit_comp32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/net/bpf_jit_comp32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/net/bpf_jit_comp32.c</a></div><div class='hunk'>@@ -117,6 +117,8 @@ static bool is_simm32(s64 value)</div><div class='ctx'> #define IA32_JLE 0x7E</div><div class='ctx'> #define IA32_JG  0x7F</div><div class='ctx'> </div><div class='add'>+#define COND_JMP_OPCODE_INVALID	(0xFF)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Map eBPF registers to IA32 32bit registers or stack scratch space.</div><div class='ctx'>  *</div><div class='hunk'>@@ -698,19 +700,12 @@ static inline void emit_ia32_neg64(const u8 dst[], bool dstk, u8 **pprog)</div><div class='ctx'> 		      STACK_VAR(dst_hi));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* xor ecx,ecx */</div><div class='del'>-	EMIT2(0x31, add_2reg(0xC0, IA32_ECX, IA32_ECX));</div><div class='del'>-	/* sub dreg_lo,ecx */</div><div class='del'>-	EMIT2(0x2B, add_2reg(0xC0, dreg_lo, IA32_ECX));</div><div class='del'>-	/* mov dreg_lo,ecx */</div><div class='del'>-	EMIT2(0x89, add_2reg(0xC0, dreg_lo, IA32_ECX));</div><div class='del'>-</div><div class='del'>-	/* xor ecx,ecx */</div><div class='del'>-	EMIT2(0x31, add_2reg(0xC0, IA32_ECX, IA32_ECX));</div><div class='del'>-	/* sbb dreg_hi,ecx */</div><div class='del'>-	EMIT2(0x19, add_2reg(0xC0, dreg_hi, IA32_ECX));</div><div class='del'>-	/* mov dreg_hi,ecx */</div><div class='del'>-	EMIT2(0x89, add_2reg(0xC0, dreg_hi, IA32_ECX));</div><div class='add'>+	/* neg dreg_lo */</div><div class='add'>+	EMIT2(0xF7, add_1reg(0xD8, dreg_lo));</div><div class='add'>+	/* adc dreg_hi,0x0 */</div><div class='add'>+	EMIT3(0x83, add_1reg(0xD0, dreg_hi), 0x00);</div><div class='add'>+	/* neg dreg_hi */</div><div class='add'>+	EMIT2(0xF7, add_1reg(0xD8, dreg_hi));</div><div class='ctx'> </div><div class='ctx'> 	if (dstk) {</div><div class='ctx'> 		/* mov dword ptr [ebp+off],dreg_lo */</div><div class='hunk'>@@ -1613,6 +1608,75 @@ static inline void emit_push_r64(const u8 src[], u8 **pprog)</div><div class='ctx'> 	*pprog = prog;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 get_cond_jmp_opcode(const u8 op, bool is_cmp_lo)</div><div class='add'>+{</div><div class='add'>+	u8 jmp_cond;</div><div class='add'>+</div><div class='add'>+	/* Convert BPF opcode to x86 */</div><div class='add'>+	switch (op) {</div><div class='add'>+	case BPF_JEQ:</div><div class='add'>+		jmp_cond = IA32_JE;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JSET:</div><div class='add'>+	case BPF_JNE:</div><div class='add'>+		jmp_cond = IA32_JNE;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JGT:</div><div class='add'>+		/* GT is unsigned '&gt;', JA in x86 */</div><div class='add'>+		jmp_cond = IA32_JA;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JLT:</div><div class='add'>+		/* LT is unsigned '&lt;', JB in x86 */</div><div class='add'>+		jmp_cond = IA32_JB;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JGE:</div><div class='add'>+		/* GE is unsigned '&gt;=', JAE in x86 */</div><div class='add'>+		jmp_cond = IA32_JAE;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JLE:</div><div class='add'>+		/* LE is unsigned '&lt;=', JBE in x86 */</div><div class='add'>+		jmp_cond = IA32_JBE;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JSGT:</div><div class='add'>+		if (!is_cmp_lo)</div><div class='add'>+			/* Signed '&gt;', GT in x86 */</div><div class='add'>+			jmp_cond = IA32_JG;</div><div class='add'>+		else</div><div class='add'>+			/* GT is unsigned '&gt;', JA in x86 */</div><div class='add'>+			jmp_cond = IA32_JA;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JSLT:</div><div class='add'>+		if (!is_cmp_lo)</div><div class='add'>+			/* Signed '&lt;', LT in x86 */</div><div class='add'>+			jmp_cond = IA32_JL;</div><div class='add'>+		else</div><div class='add'>+			/* LT is unsigned '&lt;', JB in x86 */</div><div class='add'>+			jmp_cond = IA32_JB;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JSGE:</div><div class='add'>+		if (!is_cmp_lo)</div><div class='add'>+			/* Signed '&gt;=', GE in x86 */</div><div class='add'>+			jmp_cond = IA32_JGE;</div><div class='add'>+		else</div><div class='add'>+			/* GE is unsigned '&gt;=', JAE in x86 */</div><div class='add'>+			jmp_cond = IA32_JAE;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_JSLE:</div><div class='add'>+		if (!is_cmp_lo)</div><div class='add'>+			/* Signed '&lt;=', LE in x86 */</div><div class='add'>+			jmp_cond = IA32_JLE;</div><div class='add'>+		else</div><div class='add'>+			/* LE is unsigned '&lt;=', JBE in x86 */</div><div class='add'>+			jmp_cond = IA32_JBE;</div><div class='add'>+		break;</div><div class='add'>+	default: /* to silence GCC warning */</div><div class='add'>+		jmp_cond = COND_JMP_OPCODE_INVALID;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return jmp_cond;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,</div><div class='ctx'> 		  int oldproglen, struct jit_context *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -2069,10 +2133,6 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,</div><div class='ctx'> 		case BPF_JMP | BPF_JLT | BPF_X:</div><div class='ctx'> 		case BPF_JMP | BPF_JGE | BPF_X:</div><div class='ctx'> 		case BPF_JMP | BPF_JLE | BPF_X:</div><div class='del'>-		case BPF_JMP | BPF_JSGT | BPF_X:</div><div class='del'>-		case BPF_JMP | BPF_JSLE | BPF_X:</div><div class='del'>-		case BPF_JMP | BPF_JSLT | BPF_X:</div><div class='del'>-		case BPF_JMP | BPF_JSGE | BPF_X:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JEQ | BPF_X:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JNE | BPF_X:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JGT | BPF_X:</div><div class='hunk'>@@ -2118,6 +2178,40 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,</div><div class='ctx'> 			EMIT2(0x39, add_2reg(0xC0, dreg_lo, sreg_lo));</div><div class='ctx'> 			goto emit_cond_jmp;</div><div class='ctx'> 		}</div><div class='add'>+		case BPF_JMP | BPF_JSGT | BPF_X:</div><div class='add'>+		case BPF_JMP | BPF_JSLE | BPF_X:</div><div class='add'>+		case BPF_JMP | BPF_JSLT | BPF_X:</div><div class='add'>+		case BPF_JMP | BPF_JSGE | BPF_X: {</div><div class='add'>+			u8 dreg_lo = dstk ? IA32_EAX : dst_lo;</div><div class='add'>+			u8 dreg_hi = dstk ? IA32_EDX : dst_hi;</div><div class='add'>+			u8 sreg_lo = sstk ? IA32_ECX : src_lo;</div><div class='add'>+			u8 sreg_hi = sstk ? IA32_EBX : src_hi;</div><div class='add'>+</div><div class='add'>+			if (dstk) {</div><div class='add'>+				EMIT3(0x8B, add_2reg(0x40, IA32_EBP, IA32_EAX),</div><div class='add'>+				      STACK_VAR(dst_lo));</div><div class='add'>+				EMIT3(0x8B,</div><div class='add'>+				      add_2reg(0x40, IA32_EBP,</div><div class='add'>+					       IA32_EDX),</div><div class='add'>+				      STACK_VAR(dst_hi));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (sstk) {</div><div class='add'>+				EMIT3(0x8B, add_2reg(0x40, IA32_EBP, IA32_ECX),</div><div class='add'>+				      STACK_VAR(src_lo));</div><div class='add'>+				EMIT3(0x8B,</div><div class='add'>+				      add_2reg(0x40, IA32_EBP,</div><div class='add'>+					       IA32_EBX),</div><div class='add'>+				      STACK_VAR(src_hi));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* cmp dreg_hi,sreg_hi */</div><div class='add'>+			EMIT2(0x39, add_2reg(0xC0, dreg_hi, sreg_hi));</div><div class='add'>+			EMIT2(IA32_JNE, 10);</div><div class='add'>+			/* cmp dreg_lo,sreg_lo */</div><div class='add'>+			EMIT2(0x39, add_2reg(0xC0, dreg_lo, sreg_lo));</div><div class='add'>+			goto emit_cond_jmp_signed;</div><div class='add'>+		}</div><div class='ctx'> 		case BPF_JMP | BPF_JSET | BPF_X:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JSET | BPF_X: {</div><div class='ctx'> 			bool is_jmp64 = BPF_CLASS(insn-&gt;code) == BPF_JMP;</div><div class='hunk'>@@ -2194,10 +2288,6 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,</div><div class='ctx'> 		case BPF_JMP | BPF_JLT | BPF_K:</div><div class='ctx'> 		case BPF_JMP | BPF_JGE | BPF_K:</div><div class='ctx'> 		case BPF_JMP | BPF_JLE | BPF_K:</div><div class='del'>-		case BPF_JMP | BPF_JSGT | BPF_K:</div><div class='del'>-		case BPF_JMP | BPF_JSLE | BPF_K:</div><div class='del'>-		case BPF_JMP | BPF_JSLT | BPF_K:</div><div class='del'>-		case BPF_JMP | BPF_JSGE | BPF_K:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JEQ | BPF_K:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JNE | BPF_K:</div><div class='ctx'> 		case BPF_JMP32 | BPF_JGT | BPF_K:</div><div class='hunk'>@@ -2238,50 +2328,9 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,</div><div class='ctx'> 			/* cmp dreg_lo,sreg_lo */</div><div class='ctx'> 			EMIT2(0x39, add_2reg(0xC0, dreg_lo, sreg_lo));</div><div class='ctx'> </div><div class='del'>-emit_cond_jmp:		/* Convert BPF opcode to x86 */</div><div class='del'>-			switch (BPF_OP(code)) {</div><div class='del'>-			case BPF_JEQ:</div><div class='del'>-				jmp_cond = IA32_JE;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JSET:</div><div class='del'>-			case BPF_JNE:</div><div class='del'>-				jmp_cond = IA32_JNE;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JGT:</div><div class='del'>-				/* GT is unsigned '&gt;', JA in x86 */</div><div class='del'>-				jmp_cond = IA32_JA;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JLT:</div><div class='del'>-				/* LT is unsigned '&lt;', JB in x86 */</div><div class='del'>-				jmp_cond = IA32_JB;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JGE:</div><div class='del'>-				/* GE is unsigned '&gt;=', JAE in x86 */</div><div class='del'>-				jmp_cond = IA32_JAE;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JLE:</div><div class='del'>-				/* LE is unsigned '&lt;=', JBE in x86 */</div><div class='del'>-				jmp_cond = IA32_JBE;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JSGT:</div><div class='del'>-				/* Signed '&gt;', GT in x86 */</div><div class='del'>-				jmp_cond = IA32_JG;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JSLT:</div><div class='del'>-				/* Signed '&lt;', LT in x86 */</div><div class='del'>-				jmp_cond = IA32_JL;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JSGE:</div><div class='del'>-				/* Signed '&gt;=', GE in x86 */</div><div class='del'>-				jmp_cond = IA32_JGE;</div><div class='del'>-				break;</div><div class='del'>-			case BPF_JSLE:</div><div class='del'>-				/* Signed '&lt;=', LE in x86 */</div><div class='del'>-				jmp_cond = IA32_JLE;</div><div class='del'>-				break;</div><div class='del'>-			default: /* to silence GCC warning */</div><div class='add'>+emit_cond_jmp:		jmp_cond = get_cond_jmp_opcode(BPF_OP(code), false);</div><div class='add'>+			if (jmp_cond == COND_JMP_OPCODE_INVALID)</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			}</div><div class='ctx'> 			jmp_offset = addrs[i + insn-&gt;off] - addrs[i];</div><div class='ctx'> 			if (is_imm8(jmp_offset)) {</div><div class='ctx'> 				EMIT2(jmp_cond, jmp_offset);</div><div class='hunk'>@@ -2291,7 +2340,66 @@ emit_cond_jmp:		/* Convert BPF opcode to x86 */</div><div class='ctx'> 				pr_err("cond_jmp gen bug %llx\n", jmp_offset);</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case BPF_JMP | BPF_JSGT | BPF_K:</div><div class='add'>+		case BPF_JMP | BPF_JSLE | BPF_K:</div><div class='add'>+		case BPF_JMP | BPF_JSLT | BPF_K:</div><div class='add'>+		case BPF_JMP | BPF_JSGE | BPF_K: {</div><div class='add'>+			u8 dreg_lo = dstk ? IA32_EAX : dst_lo;</div><div class='add'>+			u8 dreg_hi = dstk ? IA32_EDX : dst_hi;</div><div class='add'>+			u8 sreg_lo = IA32_ECX;</div><div class='add'>+			u8 sreg_hi = IA32_EBX;</div><div class='add'>+			u32 hi;</div><div class='ctx'> </div><div class='add'>+			if (dstk) {</div><div class='add'>+				EMIT3(0x8B, add_2reg(0x40, IA32_EBP, IA32_EAX),</div><div class='add'>+				      STACK_VAR(dst_lo));</div><div class='add'>+				EMIT3(0x8B,</div><div class='add'>+				      add_2reg(0x40, IA32_EBP,</div><div class='add'>+					       IA32_EDX),</div><div class='add'>+				      STACK_VAR(dst_hi));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* mov ecx,imm32 */</div><div class='add'>+			EMIT2_off32(0xC7, add_1reg(0xC0, IA32_ECX), imm32);</div><div class='add'>+			hi = imm32 &amp; (1 &lt;&lt; 31) ? (u32)~0 : 0;</div><div class='add'>+			/* mov ebx,imm32 */</div><div class='add'>+			EMIT2_off32(0xC7, add_1reg(0xC0, IA32_EBX), hi);</div><div class='add'>+			/* cmp dreg_hi,sreg_hi */</div><div class='add'>+			EMIT2(0x39, add_2reg(0xC0, dreg_hi, sreg_hi));</div><div class='add'>+			EMIT2(IA32_JNE, 10);</div><div class='add'>+			/* cmp dreg_lo,sreg_lo */</div><div class='add'>+			EMIT2(0x39, add_2reg(0xC0, dreg_lo, sreg_lo));</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * For simplicity of branch offset computation,</div><div class='add'>+			 * let's use fixed jump coding here.</div><div class='add'>+			 */</div><div class='add'>+emit_cond_jmp_signed:	/* Check the condition for low 32-bit comparison */</div><div class='add'>+			jmp_cond = get_cond_jmp_opcode(BPF_OP(code), true);</div><div class='add'>+			if (jmp_cond == COND_JMP_OPCODE_INVALID)</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			jmp_offset = addrs[i + insn-&gt;off] - addrs[i] + 8;</div><div class='add'>+			if (is_simm32(jmp_offset)) {</div><div class='add'>+				EMIT2_off32(0x0F, jmp_cond + 0x10, jmp_offset);</div><div class='add'>+			} else {</div><div class='add'>+				pr_err("cond_jmp gen bug %llx\n", jmp_offset);</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+			EMIT2(0xEB, 6);</div><div class='add'>+</div><div class='add'>+			/* Check the condition for high 32-bit comparison */</div><div class='add'>+			jmp_cond = get_cond_jmp_opcode(BPF_OP(code), false);</div><div class='add'>+			if (jmp_cond == COND_JMP_OPCODE_INVALID)</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			jmp_offset = addrs[i + insn-&gt;off] - addrs[i];</div><div class='add'>+			if (is_simm32(jmp_offset)) {</div><div class='add'>+				EMIT2_off32(0x0F, jmp_cond + 0x10, jmp_offset);</div><div class='add'>+			} else {</div><div class='add'>+				pr_err("cond_jmp gen bug %llx\n", jmp_offset);</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		case BPF_JMP | BPF_JA:</div><div class='head'>diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c<br/>index 458a0e2bcc57..a25a9fd987a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/platform/efi/quirks.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/platform/efi/quirks.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/platform/efi/quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/platform/efi/quirks.c</a></div><div class='hunk'>@@ -449,7 +449,7 @@ void __init efi_free_boot_services(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		rm_size = real_mode_size_needed();</div><div class='ctx'> 		if (rm_size &amp;&amp; (start + rm_size) &lt; (1&lt;&lt;20) &amp;&amp; size &gt;= rm_size) {</div><div class='del'>-			set_real_mode_mem(start, rm_size);</div><div class='add'>+			set_real_mode_mem(start);</div><div class='ctx'> 			start += rm_size;</div><div class='ctx'> 			size -= rm_size;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c<br/>index 2c53b0f19329..1297e185b8c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/platform/uv/tlb_uv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/platform/uv/tlb_uv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/platform/uv/tlb_uv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/platform/uv/tlb_uv.c</a></div><div class='hunk'>@@ -2133,14 +2133,19 @@ static int __init summarize_uvhub_sockets(int nuvhubs,</div><div class='ctx'>  */</div><div class='ctx'> static int __init init_per_cpu(int nuvhubs, int base_part_pnode)</div><div class='ctx'> {</div><div class='del'>-	unsigned char *uvhub_mask;</div><div class='ctx'> 	struct uvhub_desc *uvhub_descs;</div><div class='add'>+	unsigned char *uvhub_mask = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())</div><div class='ctx'> 		timeout_us = calculate_destination_timeout();</div><div class='ctx'> </div><div class='ctx'> 	uvhub_descs = kcalloc(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);</div><div class='add'>+	if (!uvhub_descs)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='ctx'> 	uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);</div><div class='add'>+	if (!uvhub_mask)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))</div><div class='ctx'> 		goto fail;</div><div class='head'>diff --git a/arch/x86/power/hibernate.c b/arch/x86/power/hibernate.c<br/>index bcddf09b5aa3..4845b8c7be7f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/power/hibernate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/power/hibernate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/power/hibernate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/power/hibernate.c</a></div><div class='hunk'>@@ -90,7 +90,6 @@ static int get_e820_md5(struct e820_table *table, void *buf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	size = offsetof(struct e820_table, entries) +</div><div class='ctx'> 		sizeof(struct e820_entry) * table-&gt;nr_entries;</div><div class='head'>diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c<br/>index d10105825d57..7dce39c8c034 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/realmode/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/realmode/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/realmode/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/realmode/init.c</a></div><div class='hunk'>@@ -15,15 +15,6 @@ u32 *trampoline_cr4_features;</div><div class='ctx'> /* Hold the pgd entry used on booting additional CPUs */</div><div class='ctx'> pgd_t trampoline_pgd_entry;</div><div class='ctx'> </div><div class='del'>-void __init set_real_mode_mem(phys_addr_t mem, size_t size)</div><div class='del'>-{</div><div class='del'>-	void *base = __va(mem);</div><div class='del'>-</div><div class='del'>-	real_mode_header = (struct real_mode_header *) base;</div><div class='del'>-	printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n",</div><div class='del'>-	       base, (unsigned long long)mem, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init reserve_real_mode(void)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t mem;</div><div class='hunk'>@@ -42,7 +33,7 @@ void __init reserve_real_mode(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memblock_reserve(mem, size);</div><div class='del'>-	set_real_mode_mem(mem, size);</div><div class='add'>+	set_real_mode_mem(mem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init setup_real_mode(void)</div><div class='head'>diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c<br/>index b629f6992d9f..ce7188cbdae5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/tools/relocs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/tools/relocs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/tools/relocs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/tools/relocs.c</a></div><div class='hunk'>@@ -11,7 +11,9 @@</div><div class='ctx'> #define Elf_Shdr		ElfW(Shdr)</div><div class='ctx'> #define Elf_Sym			ElfW(Sym)</div><div class='ctx'> </div><div class='del'>-static Elf_Ehdr ehdr;</div><div class='add'>+static Elf_Ehdr		ehdr;</div><div class='add'>+static unsigned long	shnum;</div><div class='add'>+static unsigned int	shstrndx;</div><div class='ctx'> </div><div class='ctx'> struct relocs {</div><div class='ctx'> 	uint32_t	*offset;</div><div class='hunk'>@@ -241,9 +243,9 @@ static const char *sec_name(unsigned shndx)</div><div class='ctx'> {</div><div class='ctx'> 	const char *sec_strtab;</div><div class='ctx'> 	const char *name;</div><div class='del'>-	sec_strtab = secs[ehdr.e_shstrndx].strtab;</div><div class='add'>+	sec_strtab = secs[shstrndx].strtab;</div><div class='ctx'> 	name = "&lt;noname&gt;";</div><div class='del'>-	if (shndx &lt; ehdr.e_shnum) {</div><div class='add'>+	if (shndx &lt; shnum) {</div><div class='ctx'> 		name = sec_strtab + secs[shndx].shdr.sh_name;</div><div class='ctx'> 	}</div><div class='ctx'> 	else if (shndx == SHN_ABS) {</div><div class='hunk'>@@ -271,7 +273,7 @@ static const char *sym_name(const char *sym_strtab, Elf_Sym *sym)</div><div class='ctx'> static Elf_Sym *sym_lookup(const char *symname)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		long nsyms;</div><div class='ctx'> 		char *strtab;</div><div class='hunk'>@@ -366,27 +368,41 @@ static void read_ehdr(FILE *fp)</div><div class='ctx'> 	ehdr.e_shnum     = elf_half_to_cpu(ehdr.e_shnum);</div><div class='ctx'> 	ehdr.e_shstrndx  = elf_half_to_cpu(ehdr.e_shstrndx);</div><div class='ctx'> </div><div class='del'>-	if ((ehdr.e_type != ET_EXEC) &amp;&amp; (ehdr.e_type != ET_DYN)) {</div><div class='add'>+	shnum = ehdr.e_shnum;</div><div class='add'>+	shstrndx = ehdr.e_shstrndx;</div><div class='add'>+</div><div class='add'>+	if ((ehdr.e_type != ET_EXEC) &amp;&amp; (ehdr.e_type != ET_DYN))</div><div class='ctx'> 		die("Unsupported ELF header type\n");</div><div class='del'>-	}</div><div class='del'>-	if (ehdr.e_machine != ELF_MACHINE) {</div><div class='add'>+	if (ehdr.e_machine != ELF_MACHINE)</div><div class='ctx'> 		die("Not for %s\n", ELF_MACHINE_NAME);</div><div class='del'>-	}</div><div class='del'>-	if (ehdr.e_version != EV_CURRENT) {</div><div class='add'>+	if (ehdr.e_version != EV_CURRENT)</div><div class='ctx'> 		die("Unknown ELF version\n");</div><div class='del'>-	}</div><div class='del'>-	if (ehdr.e_ehsize != sizeof(Elf_Ehdr)) {</div><div class='add'>+	if (ehdr.e_ehsize != sizeof(Elf_Ehdr))</div><div class='ctx'> 		die("Bad Elf header size\n");</div><div class='del'>-	}</div><div class='del'>-	if (ehdr.e_phentsize != sizeof(Elf_Phdr)) {</div><div class='add'>+	if (ehdr.e_phentsize != sizeof(Elf_Phdr))</div><div class='ctx'> 		die("Bad program header entry\n");</div><div class='del'>-	}</div><div class='del'>-	if (ehdr.e_shentsize != sizeof(Elf_Shdr)) {</div><div class='add'>+	if (ehdr.e_shentsize != sizeof(Elf_Shdr))</div><div class='ctx'> 		die("Bad section header entry\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (shnum == SHN_UNDEF || shstrndx == SHN_XINDEX) {</div><div class='add'>+		Elf_Shdr shdr;</div><div class='add'>+</div><div class='add'>+		if (fseek(fp, ehdr.e_shoff, SEEK_SET) &lt; 0)</div><div class='add'>+			die("Seek to %d failed: %s\n", ehdr.e_shoff, strerror(errno));</div><div class='add'>+</div><div class='add'>+		if (fread(&amp;shdr, sizeof(shdr), 1, fp) != 1)</div><div class='add'>+			die("Cannot read initial ELF section header: %s\n", strerror(errno));</div><div class='add'>+</div><div class='add'>+		if (shnum == SHN_UNDEF)</div><div class='add'>+			shnum = elf_xword_to_cpu(shdr.sh_size);</div><div class='add'>+</div><div class='add'>+		if (shstrndx == SHN_XINDEX)</div><div class='add'>+			shstrndx = elf_word_to_cpu(shdr.sh_link);</div><div class='ctx'> 	}</div><div class='del'>-	if (ehdr.e_shstrndx &gt;= ehdr.e_shnum) {</div><div class='add'>+</div><div class='add'>+	if (shstrndx &gt;= shnum)</div><div class='ctx'> 		die("String table index out of bounds\n");</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void read_shdrs(FILE *fp)</div><div class='hunk'>@@ -394,20 +410,20 @@ static void read_shdrs(FILE *fp)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	Elf_Shdr shdr;</div><div class='ctx'> </div><div class='del'>-	secs = calloc(ehdr.e_shnum, sizeof(struct section));</div><div class='add'>+	secs = calloc(shnum, sizeof(struct section));</div><div class='ctx'> 	if (!secs) {</div><div class='ctx'> 		die("Unable to allocate %d section headers\n",</div><div class='del'>-		    ehdr.e_shnum);</div><div class='add'>+		    shnum);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fseek(fp, ehdr.e_shoff, SEEK_SET) &lt; 0) {</div><div class='ctx'> 		die("Seek to %d failed: %s\n",</div><div class='ctx'> 			ehdr.e_shoff, strerror(errno));</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		if (fread(&amp;shdr, sizeof(shdr), 1, fp) != 1)</div><div class='ctx'> 			die("Cannot read ELF section headers %d/%d: %s\n",</div><div class='del'>-			    i, ehdr.e_shnum, strerror(errno));</div><div class='add'>+			    i, shnum, strerror(errno));</div><div class='ctx'> 		sec-&gt;shdr.sh_name      = elf_word_to_cpu(shdr.sh_name);</div><div class='ctx'> 		sec-&gt;shdr.sh_type      = elf_word_to_cpu(shdr.sh_type);</div><div class='ctx'> 		sec-&gt;shdr.sh_flags     = elf_xword_to_cpu(shdr.sh_flags);</div><div class='hunk'>@@ -418,7 +434,7 @@ static void read_shdrs(FILE *fp)</div><div class='ctx'> 		sec-&gt;shdr.sh_info      = elf_word_to_cpu(shdr.sh_info);</div><div class='ctx'> 		sec-&gt;shdr.sh_addralign = elf_xword_to_cpu(shdr.sh_addralign);</div><div class='ctx'> 		sec-&gt;shdr.sh_entsize   = elf_xword_to_cpu(shdr.sh_entsize);</div><div class='del'>-		if (sec-&gt;shdr.sh_link &lt; ehdr.e_shnum)</div><div class='add'>+		if (sec-&gt;shdr.sh_link &lt; shnum)</div><div class='ctx'> 			sec-&gt;link = &amp;secs[sec-&gt;shdr.sh_link];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -427,7 +443,7 @@ static void read_shdrs(FILE *fp)</div><div class='ctx'> static void read_strtabs(FILE *fp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		if (sec-&gt;shdr.sh_type != SHT_STRTAB) {</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -452,7 +468,7 @@ static void read_strtabs(FILE *fp)</div><div class='ctx'> static void read_symtabs(FILE *fp)</div><div class='ctx'> {</div><div class='ctx'> 	int i,j;</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		if (sec-&gt;shdr.sh_type != SHT_SYMTAB) {</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -485,7 +501,7 @@ static void read_symtabs(FILE *fp)</div><div class='ctx'> static void read_relocs(FILE *fp)</div><div class='ctx'> {</div><div class='ctx'> 	int i,j;</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		if (sec-&gt;shdr.sh_type != SHT_REL_TYPE) {</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -528,7 +544,7 @@ static void print_absolute_symbols(void)</div><div class='ctx'> </div><div class='ctx'> 	printf("Absolute symbols\n");</div><div class='ctx'> 	printf(" Num:    Value Size  Type       Bind        Visibility  Name\n");</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		char *sym_strtab;</div><div class='ctx'> 		int j;</div><div class='hunk'>@@ -566,7 +582,7 @@ static void print_absolute_relocs(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		format = "%08"PRIx32" %08"PRIx32" %10s %08"PRIx32"  %s\n";</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		struct section *sec = &amp;secs[i];</div><div class='ctx'> 		struct section *sec_applies, *sec_symtab;</div><div class='ctx'> 		char *sym_strtab;</div><div class='hunk'>@@ -650,7 +666,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	/* Walk through the relocations */</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		char *sym_strtab;</div><div class='ctx'> 		Elf_Sym *sh_symtab;</div><div class='ctx'> 		struct section *sec_applies, *sec_symtab;</div><div class='hunk'>@@ -706,7 +722,7 @@ static Elf_Addr per_cpu_load_addr;</div><div class='ctx'> static void percpu_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	for (i = 0; i &lt; ehdr.e_shnum; i++) {</div><div class='add'>+	for (i = 0; i &lt; shnum; i++) {</div><div class='ctx'> 		ElfW(Sym) *sym;</div><div class='ctx'> 		if (strcmp(sec_name(i), ".data..percpu"))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -738,7 +754,7 @@ static void percpu_init(void)</div><div class='ctx'>  *	__per_cpu_load</div><div class='ctx'>  *</div><div class='ctx'>  * The "gold" linker incorrectly associates:</div><div class='del'>- *	init_per_cpu__irq_stack_union</div><div class='add'>+ *	init_per_cpu__fixed_percpu_data</div><div class='ctx'>  *	init_per_cpu__gdt_page</div><div class='ctx'>  */</div><div class='ctx'> static int is_percpu_sym(ElfW(Sym) *sym, const char *symname)</div><div class='head'>diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig<br/>index a9e80e44178c..a8985e1f7432 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/um/Kconfig</a></div><div class='hunk'>@@ -32,12 +32,6 @@ config ARCH_DEFCONFIG</div><div class='ctx'> 	default "arch/um/configs/i386_defconfig" if X86_32</div><div class='ctx'> 	default "arch/um/configs/x86_64_defconfig" if X86_64</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool 64BIT</div><div class='del'>-</div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-	def_bool !RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-</div><div class='ctx'> config 3_LEVEL_PGTABLES</div><div class='ctx'> 	bool "Three-level pagetables" if !64BIT</div><div class='ctx'> 	default 64BIT</div><div class='head'>diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile<br/>index 2d686ae54681..33c51c064c77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/um/Makefile</a></div><div class='hunk'>@@ -21,14 +21,12 @@ obj-y += checksum_32.o syscalls_32.o</div><div class='ctx'> obj-$(CONFIG_ELF_CORE) += elfcore.o</div><div class='ctx'> </div><div class='ctx'> subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o</div><div class='del'>-subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o</div><div class='ctx'> </div><div class='ctx'> else</div><div class='ctx'> </div><div class='ctx'> obj-y += syscalls_64.o vdso/</div><div class='ctx'> </div><div class='del'>-subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o \</div><div class='del'>-		../lib/rwsem.o</div><div class='add'>+subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/um/asm/syscall.h b/arch/x86/um/asm/syscall.h<br/>index ef898af102d1..56a2f0913e3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/um/asm/syscall.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@ typedef asmlinkage long (*sys_call_ptr_t)(unsigned long, unsigned long,</div><div class='ctx'> 					  unsigned long, unsigned long,</div><div class='ctx'> 					  unsigned long, unsigned long);</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	return AUDIT_ARCH_I386;</div><div class='head'>diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile<br/>index bf94060fc06f..0caddd6acb22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/vdso/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/um/vdso/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/um/vdso/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/um/vdso/Makefile</a></div><div class='hunk'>@@ -62,7 +62,7 @@ quiet_cmd_vdso = VDSO    $@</div><div class='ctx'> 		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) &amp;&amp; \</div><div class='ctx'> 		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'</div><div class='ctx'> </div><div class='del'>-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)</div><div class='add'>+VDSO_LDFLAGS = -fPIC -shared -Wl,--hash-style=sysv</div><div class='ctx'> GCOV_PROFILE := n</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c<br/>index a21e1734fc1f..beb44e22afdf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/mmu_pv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/mmu_pv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/mmu_pv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/xen/mmu_pv.c</a></div><div class='hunk'>@@ -2318,8 +2318,6 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)</div><div class='ctx'> #elif defined(CONFIG_X86_VSYSCALL_EMULATION)</div><div class='ctx'> 	case VSYSCALL_PAGE:</div><div class='ctx'> #endif</div><div class='del'>-	case FIX_TEXT_POKE0:</div><div class='del'>-	case FIX_TEXT_POKE1:</div><div class='ctx'> 		/* All local page mappings */</div><div class='ctx'> 		pte = pfn_pte(phys, prot);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c<br/>index 0766a08bdf45..07054572297f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/multicalls.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/multicalls.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/multicalls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/xen/multicalls.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ void xen_mc_flush(void)</div><div class='ctx'> 		for (i = 0; i &lt; b-&gt;mcidx; i++) {</div><div class='ctx'> 			if (b-&gt;entries[i].result &lt; 0) {</div><div class='ctx'> #if MC_DEBUG</div><div class='del'>-				pr_err("  call %2d: op=%lu arg=[%lx] result=%ld\t%pF\n",</div><div class='add'>+				pr_err("  call %2d: op=%lu arg=[%lx] result=%ld\t%pS\n",</div><div class='ctx'> 				       i + 1,</div><div class='ctx'> 				       b-&gt;debug[i].op,</div><div class='ctx'> 				       b-&gt;debug[i].args[0],</div><div class='head'>diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c<br/>index 145506f9fdbe..590fcf863006 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/smp_pv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/smp_pv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/smp_pv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/xen/smp_pv.c</a></div><div class='hunk'>@@ -361,7 +361,9 @@ static int xen_pv_cpu_up(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	common_cpu_up(cpu, idle);</div><div class='add'>+	rc = common_cpu_up(cpu, idle);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	xen_setup_runstate_info(cpu);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S<br/>index 5077ead5e59c..c1d8b90aa4e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/xen-head.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/x86/xen/xen-head.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/x86/xen/xen-head.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/x86/xen/xen-head.S</a></div><div class='hunk'>@@ -40,13 +40,13 @@ ENTRY(startup_xen)</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	/* Set up %gs.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The base of %gs always points to the bottom of the irqstack</div><div class='del'>-	 * union.  If the stack protector canary is enabled, it is</div><div class='del'>-	 * located at %gs:40.  Note that, on SMP, the boot cpu uses</div><div class='del'>-	 * init data section till per cpu areas are set up.</div><div class='add'>+	 * The base of %gs always points to fixed_percpu_data.  If the</div><div class='add'>+	 * stack protector canary is enabled, it is located at %gs:40.</div><div class='add'>+	 * Note that, on SMP, the boot cpu uses init data section until</div><div class='add'>+	 * the per cpu areas are set up.</div><div class='ctx'> 	 */</div><div class='ctx'> 	movl	$MSR_GS_BASE,%ecx</div><div class='del'>-	movq	$INIT_PER_CPU_VAR(irq_stack_union),%rax</div><div class='add'>+	movq	$INIT_PER_CPU_VAR(fixed_percpu_data),%rax</div><div class='ctx'> 	cdq</div><div class='ctx'> 	wrmsr</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig<br/>index 4b9aafe766c5..35c8d91e6106 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/Kconfig</a></div><div class='hunk'>@@ -46,9 +46,6 @@ config XTENSA</div><div class='ctx'> 	  with reasonable minimum requirements.  The Xtensa Linux project has</div><div class='ctx'> 	  a home page at &lt;http://www.linux-xtensa.org/&gt;.</div><div class='ctx'> </div><div class='del'>-config RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild<br/>index 42b6cb3d16f7..35f83c4bf239 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/include/asm/Kbuild</a></div><div class='hunk'>@@ -15,16 +15,17 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += kmap_types.h</div><div class='ctx'> generic-y += kprobes.h</div><div class='add'>+generic-y += kvm_para.h</div><div class='ctx'> generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='add'>+generic-y += mmiowb.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += qrwlock.h</div><div class='ctx'> generic-y += qspinlock.h</div><div class='del'>-generic-y += rwsem.h</div><div class='ctx'> generic-y += sections.h</div><div class='ctx'> generic-y += socket.h</div><div class='ctx'> generic-y += topology.h</div><div class='head'>diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h<br/>index f7dd895b2353..0c14018d1c26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/processor.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/processor.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/processor.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/include/asm/processor.h</a></div><div class='hunk'>@@ -187,15 +187,18 @@ struct thread_struct {</div><div class='ctx'> </div><div class='ctx'> /* Clearing a0 terminates the backtrace. */</div><div class='ctx'> #define start_thread(regs, new_pc, new_sp) \</div><div class='del'>-	memset(regs, 0, sizeof(*regs)); \</div><div class='del'>-	regs-&gt;pc = new_pc; \</div><div class='del'>-	regs-&gt;ps = USER_PS_VALUE; \</div><div class='del'>-	regs-&gt;areg[1] = new_sp; \</div><div class='del'>-	regs-&gt;areg[0] = 0; \</div><div class='del'>-	regs-&gt;wmask = 1; \</div><div class='del'>-	regs-&gt;depc = 0; \</div><div class='del'>-	regs-&gt;windowbase = 0; \</div><div class='del'>-	regs-&gt;windowstart = 1;</div><div class='add'>+	do { \</div><div class='add'>+		memset((regs), 0, sizeof(*(regs))); \</div><div class='add'>+		(regs)-&gt;pc = (new_pc); \</div><div class='add'>+		(regs)-&gt;ps = USER_PS_VALUE; \</div><div class='add'>+		(regs)-&gt;areg[1] = (new_sp); \</div><div class='add'>+		(regs)-&gt;areg[0] = 0; \</div><div class='add'>+		(regs)-&gt;wmask = 1; \</div><div class='add'>+		(regs)-&gt;depc = 0; \</div><div class='add'>+		(regs)-&gt;windowbase = 0; \</div><div class='add'>+		(regs)-&gt;windowstart = 1; \</div><div class='add'>+		(regs)-&gt;syscall = NO_SYSCALL; \</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* Forward declaration */</div><div class='ctx'> struct task_struct;</div><div class='head'>diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.h<br/>index a168bf81c7f4..359ab40e935a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/syscall.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/syscall.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/syscall.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/include/asm/syscall.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/audit.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline int syscall_get_arch(void)</div><div class='add'>+static inline int syscall_get_arch(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return AUDIT_ARCH_XTENSA;</div><div class='ctx'> }</div><div class='hunk'>@@ -59,45 +59,24 @@ static inline void syscall_set_return_value(struct task_struct *task,</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_get_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned int reg[] = XTENSA_SYSCALL_ARGUMENT_REGS;</div><div class='del'>-	unsigned int j;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(i + n &gt; SYSCALL_MAX_ARGS);</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; n; ++j) {</div><div class='del'>-		if (i + j &lt; SYSCALL_MAX_ARGS)</div><div class='del'>-			args[j] = regs-&gt;areg[reg[i + j]];</div><div class='del'>-		else</div><div class='del'>-			args[j] = 0;</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; 6; ++i)</div><div class='add'>+		args[i] = regs-&gt;areg[reg[i]];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_set_arguments(struct task_struct *task,</div><div class='ctx'> 					 struct pt_regs *regs,</div><div class='del'>-					 unsigned int i, unsigned int n,</div><div class='ctx'> 					 const unsigned long *args)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned int reg[] = XTENSA_SYSCALL_ARGUMENT_REGS;</div><div class='del'>-	unsigned int j;</div><div class='del'>-</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(i + n &gt; SYSCALL_MAX_ARGS)) {</div><div class='del'>-		if (i &lt; SYSCALL_MAX_ARGS)</div><div class='del'>-			n = SYSCALL_MAX_ARGS - i;</div><div class='del'>-		else</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; n; ++j)</div><div class='del'>-		regs-&gt;areg[reg[i + j]] = args[j];</div><div class='add'>+	for (i = 0; i &lt; 6; ++i)</div><div class='add'>+		regs-&gt;areg[reg[i]] = args[i];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage long xtensa_rt_sigreturn(struct pt_regs*);</div><div class='head'>diff --git a/arch/xtensa/include/asm/tlb.h b/arch/xtensa/include/asm/tlb.h<br/>index 0d766f9c1083..50889935138a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/tlb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/asm/tlb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/asm/tlb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/include/asm/tlb.h</a></div><div class='hunk'>@@ -14,32 +14,6 @@</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='del'>-#if (DCACHE_WAY_SIZE &lt;= PAGE_SIZE)</div><div class='del'>-</div><div class='del'>-/* Note, read http://lkml.org/lkml/2004/1/15/6 */</div><div class='del'>-</div><div class='del'>-# define tlb_start_vma(tlb,vma)			do { } while (0)</div><div class='del'>-# define tlb_end_vma(tlb,vma)			do { } while (0)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-# define tlb_start_vma(tlb, vma)					      \</div><div class='del'>-	do {								      \</div><div class='del'>-		if (!tlb-&gt;fullmm)					      \</div><div class='del'>-			flush_cache_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);   \</div><div class='del'>-	} while(0)</div><div class='del'>-</div><div class='del'>-# define tlb_end_vma(tlb, vma)						      \</div><div class='del'>-	do {								      \</div><div class='del'>-		if (!tlb-&gt;fullmm)					      \</div><div class='del'>-			flush_tlb_range(vma, vma-&gt;vm_start, vma-&gt;vm_end);     \</div><div class='del'>-	} while(0)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb,pte,addr)	do { } while (0)</div><div class='del'>-#define tlb_flush(tlb)				flush_tlb_mm((tlb)-&gt;mm)</div><div class='del'>-</div><div class='ctx'> #include &lt;asm-generic/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __pte_free_tlb(tlb, pte, address)	pte_free((tlb)-&gt;mm, pte)</div><div class='head'>diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild<br/>index 8a7ad40be463..7417847dc438 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/uapi/asm/Kbuild?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/uapi/asm/Kbuild?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='ctx'> generated-y += unistd_32.h</div><div class='del'>-generic-y += kvm_para.h</div><div class='head'>diff --git a/arch/xtensa/include/uapi/asm/sockios.h b/arch/xtensa/include/uapi/asm/sockios.h<br/>index fb8ac3607189..1a1f58f4b75a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/uapi/asm/sockios.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/include/uapi/asm/sockios.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/include/uapi/asm/sockios.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/include/uapi/asm/sockios.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #define SIOCSPGRP	_IOW('s', 8, pid_t)</div><div class='ctx'> #define SIOCGPGRP	_IOR('s', 9, pid_t)</div><div class='ctx'> </div><div class='del'>-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */</div><div class='del'>-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */</div><div class='add'>+#define SIOCGSTAMP_OLD	0x8906		/* Get stamp (timeval) */</div><div class='add'>+#define SIOCGSTAMPNS_OLD 0x8907		/* Get stamp (timespec) */</div><div class='ctx'> </div><div class='ctx'> #endif	/* _XTENSA_SOCKIOS_H */</div><div class='head'>diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S<br/>index e50f5124dc6f..e54af8b7e0f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/kernel/entry.S?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/kernel/entry.S</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/kernel/entry.S?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/kernel/entry.S</a></div><div class='hunk'>@@ -1860,6 +1860,8 @@ ENTRY(system_call)</div><div class='ctx'> 	l32i	a7, a2, PT_SYSCALL</div><div class='ctx'> </div><div class='ctx'> 1:</div><div class='add'>+	s32i	a7, a1, 4</div><div class='add'>+</div><div class='ctx'> 	/* syscall = sys_call_table[syscall_nr] */</div><div class='ctx'> </div><div class='ctx'> 	movi	a4, sys_call_table</div><div class='hunk'>@@ -1893,8 +1895,12 @@ ENTRY(system_call)</div><div class='ctx'> 	retw</div><div class='ctx'> </div><div class='ctx'> 1:</div><div class='add'>+	l32i	a4, a1, 4</div><div class='add'>+	l32i	a3, a2, PT_SYSCALL</div><div class='add'>+	s32i	a4, a2, PT_SYSCALL</div><div class='ctx'> 	mov	a6, a2</div><div class='ctx'> 	call4	do_syscall_trace_leave</div><div class='add'>+	s32i	a3, a2, PT_SYSCALL</div><div class='ctx'> 	retw</div><div class='ctx'> </div><div class='ctx'> ENDPROC(system_call)</div><div class='head'>diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c<br/>index 174c11f13bba..b9f82510c650 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/kernel/stacktrace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/kernel/stacktrace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/kernel/stacktrace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/kernel/stacktrace.c</a></div><div class='hunk'>@@ -253,10 +253,14 @@ static int return_address_cb(struct stackframe *frame, void *data)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * level == 0 is for the return address from the caller of this function,</div><div class='add'>+ * not from this function itself.</div><div class='add'>+ */</div><div class='ctx'> unsigned long return_address(unsigned level)</div><div class='ctx'> {</div><div class='ctx'> 	struct return_addr_data r = {</div><div class='del'>-		.skip = level + 1,</div><div class='add'>+		.skip = level,</div><div class='ctx'> 	};</div><div class='ctx'> 	walk_stackframe(stack_pointer(NULL), return_address_cb, &amp;r);</div><div class='ctx'> 	return r.addr;</div><div class='head'>diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl<br/>index 6af49929de85..30084eaf8422 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/kernel/syscalls/syscall.tbl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/kernel/syscalls/syscall.tbl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/kernel/syscalls/syscall.tbl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/kernel/syscalls/syscall.tbl</a></div><div class='hunk'>@@ -394,3 +394,7 @@</div><div class='ctx'> 421	common	rt_sigtimedwait_time64		sys_rt_sigtimedwait</div><div class='ctx'> 422	common	futex_time64			sys_futex</div><div class='ctx'> 423	common	sched_rr_get_interval_time64	sys_sched_rr_get_interval</div><div class='add'>+424	common	pidfd_send_signal		sys_pidfd_send_signal</div><div class='add'>+425	common	io_uring_setup			sys_io_uring_setup</div><div class='add'>+426	common	io_uring_enter			sys_io_uring_enter</div><div class='add'>+427	common	io_uring_register		sys_io_uring_register</div><div class='head'>diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c<br/>index 2fb7d1172228..03678c4afc39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/mm/mmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>arch/xtensa/mm/mmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/arch/xtensa/mm/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>arch/xtensa/mm/mmu.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@ static void * __init init_pmd(unsigned long vaddr, unsigned long n_pages)</div><div class='ctx'> </div><div class='ctx'> 	pte = memblock_alloc_low(n_pages * sizeof(pte_t), PAGE_SIZE);</div><div class='ctx'> 	if (!pte)</div><div class='del'>-		panic("%s: Failed to allocate %zu bytes align=%lx\n",</div><div class='add'>+		panic("%s: Failed to allocate %lu bytes align=%lx\n",</div><div class='ctx'> 		      __func__, n_pages * sizeof(pte_t), PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n_pages; ++i)</div><div class='head'>diff --git a/block/Kconfig b/block/Kconfig<br/>index 028bc085dac8..1b220101a9cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/Kconfig</a></div><div class='hunk'>@@ -26,30 +26,6 @@ menuconfig BLOCK</div><div class='ctx'> </div><div class='ctx'> if BLOCK</div><div class='ctx'> </div><div class='del'>-config LBDAF</div><div class='del'>-	bool "Support for large (2TB+) block devices and files"</div><div class='del'>-	depends on !64BIT</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Enable block devices or files of size 2TB and larger.</div><div class='del'>-</div><div class='del'>-	  This option is required to support the full capacity of large</div><div class='del'>-	  (2TB+) block devices, including RAID, disk, Network Block Device,</div><div class='del'>-	  Logical Volume Manager (LVM) and loopback.</div><div class='del'>-	</div><div class='del'>-	  This option also enables support for single files larger than</div><div class='del'>-	  2TB.</div><div class='del'>-</div><div class='del'>-	  The ext4 filesystem requires that this feature be enabled in</div><div class='del'>-	  order to support filesystems that have the huge_file feature</div><div class='del'>-	  enabled.  Otherwise, it will refuse to mount in the read-write</div><div class='del'>-	  mode any filesystems that use the huge_file feature, which is</div><div class='del'>-	  enabled by default by mke2fs.ext4.</div><div class='del'>-</div><div class='del'>-	  The GFS2 filesystem also requires this feature.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='ctx'> config BLK_SCSI_REQUEST</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/block/badblocks.c b/block/badblocks.c<br/>index 91f7bcf979d3..2e5f5697db35 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/badblocks.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/badblocks.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/badblocks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/badblocks.c</a></div><div class='hunk'>@@ -1,18 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Bad block management</div><div class='ctx'>  *</div><div class='ctx'>  * - Heavily based on MD badblocks code from Neil Brown</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2015, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/badblocks.h&gt;</div><div class='head'>diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c<br/>index c6113af31960..b3796a40a61a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-cgroup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-cgroup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bfq-cgroup.c</a></div><div class='hunk'>@@ -1,15 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * cgroups support for the BFQ I/O scheduler.</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; either version 2 of the</div><div class='del'>- *  License, or (at your option) any later version.</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 GNU</div><div class='del'>- *  General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -578,7 +569,8 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> 	bfqg_and_blkg_get(bfqg);</div><div class='ctx'> </div><div class='ctx'> 	if (bfq_bfqq_busy(bfqq)) {</div><div class='del'>-		bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='add'>+		if (unlikely(!bfqd-&gt;nonrot_with_queueing))</div><div class='add'>+			bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='ctx'> 		bfq_activate_bfqq(bfqd, bfqq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1102,7 +1094,7 @@ struct cftype bfq_blkcg_legacy_files[] = {</div><div class='ctx'> 	},</div><div class='ctx'> #endif /* CONFIG_DEBUG_BLK_CGROUP */</div><div class='ctx'> </div><div class='del'>-	/* the same statictics which cover the bfqg and its descendants */</div><div class='add'>+	/* the same statistics which cover the bfqg and its descendants */</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "bfq.io_service_bytes_recursive",</div><div class='ctx'> 		.private = (unsigned long)&amp;blkcg_policy_bfq,</div><div class='head'>diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c<br/>index 4c592496a16a..f8d430f88d25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-iosched.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-iosched.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-iosched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bfq-iosched.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Budget Fair Queueing (BFQ) I/O scheduler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,16 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 Paolo Valente &lt;paolo.valente@linaro.org&gt;</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 as</div><div class='del'>- *  published by the Free Software Foundation; either version 2 of the</div><div class='del'>- *  License, or (at your option) any later version.</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 GNU</div><div class='del'>- *  General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * BFQ is a proportional-share I/O scheduler, with some extra</div><div class='ctx'>  * low-latency capabilities. BFQ also supports full hierarchical</div><div class='ctx'>  * scheduling through cgroups. Next paragraphs provide an introduction</div><div class='hunk'>@@ -189,7 +180,7 @@ static const int bfq_default_max_budget = 16 * 1024;</div><div class='ctx'> /*</div><div class='ctx'>  * When a sync request is dispatched, the queue that contains that</div><div class='ctx'>  * request, and all the ancestor entities of that queue, are charged</div><div class='del'>- * with the number of sectors of the request. In constrast, if the</div><div class='add'>+ * with the number of sectors of the request. In contrast, if the</div><div class='ctx'>  * request is async, then the queue and its ancestor entities are</div><div class='ctx'>  * charged with the number of sectors of the request, multiplied by</div><div class='ctx'>  * the factor below. This throttles the bandwidth for async I/O,</div><div class='hunk'>@@ -217,7 +208,7 @@ const int bfq_timeout = HZ / 8;</div><div class='ctx'>  * queue merging.</div><div class='ctx'>  *</div><div class='ctx'>  * As can be deduced from the low time limit below, queue merging, if</div><div class='del'>- * successful, happens at the very beggining of the I/O of the involved</div><div class='add'>+ * successful, happens at the very beginning of the I/O of the involved</div><div class='ctx'>  * cooperating processes, as a consequence of the arrival of the very</div><div class='ctx'>  * first requests from each cooperator.  After that, there is very</div><div class='ctx'>  * little chance to find cooperators.</div><div class='hunk'>@@ -242,6 +233,14 @@ static struct kmem_cache *bfq_pool;</div><div class='ctx'> 	  blk_rq_sectors(rq) &lt; BFQQ_SECT_THR_NONROT))</div><div class='ctx'> #define BFQQ_CLOSE_THR		(sector_t)(8 * 1024)</div><div class='ctx'> #define BFQQ_SEEKY(bfqq)	(hweight32(bfqq-&gt;seek_history) &gt; 19)</div><div class='add'>+/*</div><div class='add'>+ * Sync random I/O is likely to be confused with soft real-time I/O,</div><div class='add'>+ * because it is characterized by limited throughput and apparently</div><div class='add'>+ * isochronous arrival pattern. To avoid false positives, queues</div><div class='add'>+ * containing only random (seeky) I/O are prevented from being tagged</div><div class='add'>+ * as soft real-time.</div><div class='add'>+ */</div><div class='add'>+#define BFQQ_TOTALLY_SEEKY(bfqq)	(bfqq-&gt;seek_history &amp; -1)</div><div class='ctx'> </div><div class='ctx'> /* Min number of samples required to perform peak-rate update */</div><div class='ctx'> #define BFQ_RATE_MIN_SAMPLES	32</div><div class='hunk'>@@ -433,7 +432,7 @@ void bfq_schedule_dispatch(struct bfq_data *bfqd)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Lifted from AS - choose which of rq1 and rq2 that is best served now.</div><div class='del'>- * We choose the request that is closesr to the head right now.  Distance</div><div class='add'>+ * We choose the request that is closer to the head right now.  Distance</div><div class='ctx'>  * behind the head is penalized and only allowed to a certain extent.</div><div class='ctx'>  */</div><div class='ctx'> static struct request *bfq_choose_req(struct bfq_data *bfqd,</div><div class='hunk'>@@ -595,7 +594,16 @@ static bool bfq_too_late_for_merging(struct bfq_queue *bfqq)</div><div class='ctx'> 				       bfq_merge_time_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='add'>+/*</div><div class='add'>+ * The following function is not marked as __cold because it is</div><div class='add'>+ * actually cold, but for the same performance goal described in the</div><div class='add'>+ * comments on the likely() at the beginning of</div><div class='add'>+ * bfq_setup_cooperator(). Unexpectedly, to reach an even lower</div><div class='add'>+ * execution time for the case where this function is not invoked, we</div><div class='add'>+ * had to add an unlikely() in each involved if().</div><div class='add'>+ */</div><div class='add'>+void __cold</div><div class='add'>+bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node **p, *parent;</div><div class='ctx'> 	struct bfq_queue *__bfqq;</div><div class='hunk'>@@ -629,12 +637,19 @@ void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The following function returns true if every queue must receive the</div><div class='del'>- * same share of the throughput (this condition is used when deciding</div><div class='del'>- * whether idling may be disabled, see the comments in the function</div><div class='del'>- * bfq_better_to_idle()).</div><div class='add'>+ * The following function returns false either if every active queue</div><div class='add'>+ * must receive the same share of the throughput (symmetric scenario),</div><div class='add'>+ * or, as a special case, if bfqq must receive a share of the</div><div class='add'>+ * throughput lower than or equal to the share that every other active</div><div class='add'>+ * queue must receive.  If bfqq does sync I/O, then these are the only</div><div class='add'>+ * two cases where bfqq happens to be guaranteed its share of the</div><div class='add'>+ * throughput even if I/O dispatching is not plugged when bfqq remains</div><div class='add'>+ * temporarily empty (for more details, see the comments in the</div><div class='add'>+ * function bfq_better_to_idle()). For this reason, the return value</div><div class='add'>+ * of this function is used to check whether I/O-dispatch plugging can</div><div class='add'>+ * be avoided.</div><div class='ctx'>  *</div><div class='del'>- * Such a scenario occurs when:</div><div class='add'>+ * The above first case (symmetric scenario) occurs when:</div><div class='ctx'>  * 1) all active queues have the same weight,</div><div class='ctx'>  * 2) all active queues belong to the same I/O-priority class,</div><div class='ctx'>  * 3) all active groups at the same level in the groups tree have the same</div><div class='hunk'>@@ -654,30 +669,36 @@ void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'>  * support or the cgroups interface are not enabled, thus no state</div><div class='ctx'>  * needs to be maintained in this case.</div><div class='ctx'>  */</div><div class='del'>-static bool bfq_symmetric_scenario(struct bfq_data *bfqd)</div><div class='add'>+static bool bfq_asymmetric_scenario(struct bfq_data *bfqd,</div><div class='add'>+				   struct bfq_queue *bfqq)</div><div class='ctx'> {</div><div class='add'>+	bool smallest_weight = bfqq &amp;&amp;</div><div class='add'>+		bfqq-&gt;weight_counter &amp;&amp;</div><div class='add'>+		bfqq-&gt;weight_counter ==</div><div class='add'>+		container_of(</div><div class='add'>+			rb_first_cached(&amp;bfqd-&gt;queue_weights_tree),</div><div class='add'>+			struct bfq_weight_counter,</div><div class='add'>+			weights_node);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For queue weights to differ, queue_weights_tree must contain</div><div class='ctx'> 	 * at least two nodes.</div><div class='ctx'> 	 */</div><div class='del'>-	bool varied_queue_weights = !RB_EMPTY_ROOT(&amp;bfqd-&gt;queue_weights_tree) &amp;&amp;</div><div class='del'>-		(bfqd-&gt;queue_weights_tree.rb_node-&gt;rb_left ||</div><div class='del'>-		 bfqd-&gt;queue_weights_tree.rb_node-&gt;rb_right);</div><div class='add'>+	bool varied_queue_weights = !smallest_weight &amp;&amp;</div><div class='add'>+		!RB_EMPTY_ROOT(&amp;bfqd-&gt;queue_weights_tree.rb_root) &amp;&amp;</div><div class='add'>+		(bfqd-&gt;queue_weights_tree.rb_root.rb_node-&gt;rb_left ||</div><div class='add'>+		 bfqd-&gt;queue_weights_tree.rb_root.rb_node-&gt;rb_right);</div><div class='ctx'> </div><div class='ctx'> 	bool multiple_classes_busy =</div><div class='ctx'> 		(bfqd-&gt;busy_queues[0] &amp;&amp; bfqd-&gt;busy_queues[1]) ||</div><div class='ctx'> 		(bfqd-&gt;busy_queues[0] &amp;&amp; bfqd-&gt;busy_queues[2]) ||</div><div class='ctx'> 		(bfqd-&gt;busy_queues[1] &amp;&amp; bfqd-&gt;busy_queues[2]);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For queue weights to differ, queue_weights_tree must contain</div><div class='del'>-	 * at least two nodes.</div><div class='del'>-	 */</div><div class='del'>-	return !(varied_queue_weights || multiple_classes_busy</div><div class='del'>-#ifdef BFQ_GROUP_IOSCHED_ENABLED</div><div class='add'>+	return varied_queue_weights || multiple_classes_busy</div><div class='add'>+#ifdef CONFIG_BFQ_GROUP_IOSCHED</div><div class='ctx'> 	       || bfqd-&gt;num_groups_with_pending_reqs &gt; 0</div><div class='ctx'> #endif</div><div class='del'>-		);</div><div class='add'>+		;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -694,10 +715,11 @@ static bool bfq_symmetric_scenario(struct bfq_data *bfqd)</div><div class='ctx'>  * should be low too.</div><div class='ctx'>  */</div><div class='ctx'> void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='del'>-			  struct rb_root *root)</div><div class='add'>+			  struct rb_root_cached *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct bfq_entity *entity = &amp;bfqq-&gt;entity;</div><div class='del'>-	struct rb_node **new = &amp;(root-&gt;rb_node), *parent = NULL;</div><div class='add'>+	struct rb_node **new = &amp;(root-&gt;rb_root.rb_node), *parent = NULL;</div><div class='add'>+	bool leftmost = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do not insert if the queue is already associated with a</div><div class='hunk'>@@ -726,8 +748,10 @@ void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (entity-&gt;weight &lt; __counter-&gt;weight)</div><div class='ctx'> 			new = &amp;((*new)-&gt;rb_left);</div><div class='del'>-		else</div><div class='add'>+		else {</div><div class='ctx'> 			new = &amp;((*new)-&gt;rb_right);</div><div class='add'>+			leftmost = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bfqq-&gt;weight_counter = kzalloc(sizeof(struct bfq_weight_counter),</div><div class='hunk'>@@ -736,7 +760,7 @@ void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In the unlucky event of an allocation failure, we just</div><div class='ctx'> 	 * exit. This will cause the weight of queue to not be</div><div class='del'>-	 * considered in bfq_symmetric_scenario, which, in its turn,</div><div class='add'>+	 * considered in bfq_asymmetric_scenario, which, in its turn,</div><div class='ctx'> 	 * causes the scenario to be deemed wrongly symmetric in case</div><div class='ctx'> 	 * bfqq's weight would have been the only weight making the</div><div class='ctx'> 	 * scenario asymmetric.  On the bright side, no unbalance will</div><div class='hunk'>@@ -750,7 +774,8 @@ void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> </div><div class='ctx'> 	bfqq-&gt;weight_counter-&gt;weight = entity-&gt;weight;</div><div class='ctx'> 	rb_link_node(&amp;bfqq-&gt;weight_counter-&gt;weights_node, parent, new);</div><div class='del'>-	rb_insert_color(&amp;bfqq-&gt;weight_counter-&gt;weights_node, root);</div><div class='add'>+	rb_insert_color_cached(&amp;bfqq-&gt;weight_counter-&gt;weights_node, root,</div><div class='add'>+				leftmost);</div><div class='ctx'> </div><div class='ctx'> inc_counter:</div><div class='ctx'> 	bfqq-&gt;weight_counter-&gt;num_active++;</div><div class='hunk'>@@ -765,7 +790,7 @@ inc_counter:</div><div class='ctx'>  */</div><div class='ctx'> void __bfq_weights_tree_remove(struct bfq_data *bfqd,</div><div class='ctx'> 			       struct bfq_queue *bfqq,</div><div class='del'>-			       struct rb_root *root)</div><div class='add'>+			       struct rb_root_cached *root)</div><div class='ctx'> {</div><div class='ctx'> 	if (!bfqq-&gt;weight_counter)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -774,7 +799,7 @@ void __bfq_weights_tree_remove(struct bfq_data *bfqd,</div><div class='ctx'> 	if (bfqq-&gt;weight_counter-&gt;num_active &gt; 0)</div><div class='ctx'> 		goto reset_entity_pointer;</div><div class='ctx'> </div><div class='del'>-	rb_erase(&amp;bfqq-&gt;weight_counter-&gt;weights_node, root);</div><div class='add'>+	rb_erase_cached(&amp;bfqq-&gt;weight_counter-&gt;weights_node, root);</div><div class='ctx'> 	kfree(bfqq-&gt;weight_counter);</div><div class='ctx'> </div><div class='ctx'> reset_entity_pointer:</div><div class='hunk'>@@ -889,7 +914,7 @@ static unsigned long bfq_serv_to_charge(struct request *rq,</div><div class='ctx'> 					struct bfq_queue *bfqq)</div><div class='ctx'> {</div><div class='ctx'> 	if (bfq_bfqq_sync(bfqq) || bfqq-&gt;wr_coeff &gt; 1 ||</div><div class='del'>-	    !bfq_symmetric_scenario(bfqq-&gt;bfqd))</div><div class='add'>+	    bfq_asymmetric_scenario(bfqq-&gt;bfqd, bfqq))</div><div class='ctx'> 		return blk_rq_sectors(rq);</div><div class='ctx'> </div><div class='ctx'> 	return blk_rq_sectors(rq) * bfq_async_charge_factor;</div><div class='hunk'>@@ -955,7 +980,7 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd)</div><div class='ctx'> 	 *   of several files</div><div class='ctx'> 	 * mplayer took 23 seconds to start, if constantly weight-raised.</div><div class='ctx'> 	 *</div><div class='del'>-	 * As for higher values than that accomodating the above bad</div><div class='add'>+	 * As for higher values than that accommodating the above bad</div><div class='ctx'> 	 * scenario, tests show that higher values would often yield</div><div class='ctx'> 	 * the opposite of the desired result, i.e., would worsen</div><div class='ctx'> 	 * responsiveness by allowing non-interactive applications to</div><div class='hunk'>@@ -994,6 +1019,7 @@ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd,</div><div class='ctx'> 	else</div><div class='ctx'> 		bfq_clear_bfqq_IO_bound(bfqq);</div><div class='ctx'> </div><div class='add'>+	bfqq-&gt;entity.new_weight = bic-&gt;saved_weight;</div><div class='ctx'> 	bfqq-&gt;ttime = bic-&gt;saved_ttime;</div><div class='ctx'> 	bfqq-&gt;wr_coeff = bic-&gt;saved_wr_coeff;</div><div class='ctx'> 	bfqq-&gt;wr_start_at_switch_to_srt = bic-&gt;saved_wr_start_at_switch_to_srt;</div><div class='hunk'>@@ -1041,8 +1067,18 @@ static void bfq_reset_burst_list(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_safe(item, n, &amp;bfqd-&gt;burst_list, burst_list_node)</div><div class='ctx'> 		hlist_del_init(&amp;item-&gt;burst_list_node);</div><div class='del'>-	hlist_add_head(&amp;bfqq-&gt;burst_list_node, &amp;bfqd-&gt;burst_list);</div><div class='del'>-	bfqd-&gt;burst_size = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start the creation of a new burst list only if there is no</div><div class='add'>+	 * active queue. See comments on the conditional invocation of</div><div class='add'>+	 * bfq_handle_burst().</div><div class='add'>+	 */</div><div class='add'>+	if (bfq_tot_busy_queues(bfqd) == 0) {</div><div class='add'>+		hlist_add_head(&amp;bfqq-&gt;burst_list_node, &amp;bfqd-&gt;burst_list);</div><div class='add'>+		bfqd-&gt;burst_size = 1;</div><div class='add'>+	} else</div><div class='add'>+		bfqd-&gt;burst_size = 0;</div><div class='add'>+</div><div class='ctx'> 	bfqd-&gt;burst_parent_entity = bfqq-&gt;entity.parent;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1098,7 +1134,8 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'>  * many parallel threads/processes. Examples are systemd during boot,</div><div class='ctx'>  * or git grep. To help these processes get their job done as soon as</div><div class='ctx'>  * possible, it is usually better to not grant either weight-raising</div><div class='del'>- * or device idling to their queues.</div><div class='add'>+ * or device idling to their queues, unless these queues must be</div><div class='add'>+ * protected from the I/O flowing through other active queues.</div><div class='ctx'>  *</div><div class='ctx'>  * In this comment we describe, firstly, the reasons why this fact</div><div class='ctx'>  * holds, and, secondly, the next function, which implements the main</div><div class='hunk'>@@ -1110,7 +1147,10 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'>  * cumulatively served, the sooner the target job of these queues gets</div><div class='ctx'>  * completed. As a consequence, weight-raising any of these queues,</div><div class='ctx'>  * which also implies idling the device for it, is almost always</div><div class='del'>- * counterproductive. In most cases it just lowers throughput.</div><div class='add'>+ * counterproductive, unless there are other active queues to isolate</div><div class='add'>+ * these new queues from. If there no other active queues, then</div><div class='add'>+ * weight-raising these new queues just lowers throughput in most</div><div class='add'>+ * cases.</div><div class='ctx'>  *</div><div class='ctx'>  * On the other hand, a burst of queue creations may be caused also by</div><div class='ctx'>  * the start of an application that does not consist of a lot of</div><div class='hunk'>@@ -1144,14 +1184,16 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'>  * are very rare. They typically occur if some service happens to</div><div class='ctx'>  * start doing I/O exactly when the interactive task starts.</div><div class='ctx'>  *</div><div class='del'>- * Turning back to the next function, it implements all the steps</div><div class='del'>- * needed to detect the occurrence of a large burst and to properly</div><div class='del'>- * mark all the queues belonging to it (so that they can then be</div><div class='del'>- * treated in a different way). This goal is achieved by maintaining a</div><div class='del'>- * "burst list" that holds, temporarily, the queues that belong to the</div><div class='del'>- * burst in progress. The list is then used to mark these queues as</div><div class='del'>- * belonging to a large burst if the burst does become large. The main</div><div class='del'>- * steps are the following.</div><div class='add'>+ * Turning back to the next function, it is invoked only if there are</div><div class='add'>+ * no active queues (apart from active queues that would belong to the</div><div class='add'>+ * same, possible burst bfqq would belong to), and it implements all</div><div class='add'>+ * the steps needed to detect the occurrence of a large burst and to</div><div class='add'>+ * properly mark all the queues belonging to it (so that they can then</div><div class='add'>+ * be treated in a different way). This goal is achieved by</div><div class='add'>+ * maintaining a "burst list" that holds, temporarily, the queues that</div><div class='add'>+ * belong to the burst in progress. The list is then used to mark</div><div class='add'>+ * these queues as belonging to a large burst if the burst does become</div><div class='add'>+ * large. The main steps are the following.</div><div class='ctx'>  *</div><div class='ctx'>  * . when the very first queue is created, the queue is inserted into the</div><div class='ctx'>  *   list (as it could be the first queue in a possible burst)</div><div class='hunk'>@@ -1596,6 +1638,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd,</div><div class='ctx'> 	 */</div><div class='ctx'> 	in_burst = bfq_bfqq_in_large_burst(bfqq);</div><div class='ctx'> 	soft_rt = bfqd-&gt;bfq_wr_max_softrt_rate &gt; 0 &amp;&amp;</div><div class='add'>+		!BFQQ_TOTALLY_SEEKY(bfqq) &amp;&amp;</div><div class='ctx'> 		!in_burst &amp;&amp;</div><div class='ctx'> 		time_is_before_jiffies(bfqq-&gt;soft_rt_next_start) &amp;&amp;</div><div class='ctx'> 		bfqq-&gt;dispatched == 0;</div><div class='hunk'>@@ -1704,6 +1747,123 @@ static void bfq_add_request(struct request *rq)</div><div class='ctx'> 	bfqq-&gt;queued[rq_is_sync(rq)]++;</div><div class='ctx'> 	bfqd-&gt;queued++;</div><div class='ctx'> </div><div class='add'>+	if (RB_EMPTY_ROOT(&amp;bfqq-&gt;sort_list) &amp;&amp; bfq_bfqq_sync(bfqq)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Periodically reset inject limit, to make sure that</div><div class='add'>+		 * the latter eventually drops in case workload</div><div class='add'>+		 * changes, see step (3) in the comments on</div><div class='add'>+		 * bfq_update_inject_limit().</div><div class='add'>+		 */</div><div class='add'>+		if (time_is_before_eq_jiffies(bfqq-&gt;decrease_time_jif +</div><div class='add'>+					     msecs_to_jiffies(1000))) {</div><div class='add'>+			/* invalidate baseline total service time */</div><div class='add'>+			bfqq-&gt;last_serv_time_ns = 0;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Reset pointer in case we are waiting for</div><div class='add'>+			 * some request completion.</div><div class='add'>+			 */</div><div class='add'>+			bfqd-&gt;waited_rq = NULL;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * If bfqq has a short think time, then start</div><div class='add'>+			 * by setting the inject limit to 0</div><div class='add'>+			 * prudentially, because the service time of</div><div class='add'>+			 * an injected I/O request may be higher than</div><div class='add'>+			 * the think time of bfqq, and therefore, if</div><div class='add'>+			 * one request was injected when bfqq remains</div><div class='add'>+			 * empty, this injected request might delay</div><div class='add'>+			 * the service of the next I/O request for</div><div class='add'>+			 * bfqq significantly. In case bfqq can</div><div class='add'>+			 * actually tolerate some injection, then the</div><div class='add'>+			 * adaptive update will however raise the</div><div class='add'>+			 * limit soon. This lucky circumstance holds</div><div class='add'>+			 * exactly because bfqq has a short think</div><div class='add'>+			 * time, and thus, after remaining empty, is</div><div class='add'>+			 * likely to get new I/O enqueued---and then</div><div class='add'>+			 * completed---before being expired. This is</div><div class='add'>+			 * the very pattern that gives the</div><div class='add'>+			 * limit-update algorithm the chance to</div><div class='add'>+			 * measure the effect of injection on request</div><div class='add'>+			 * service times, and then to update the limit</div><div class='add'>+			 * accordingly.</div><div class='add'>+			 *</div><div class='add'>+			 * On the opposite end, if bfqq has a long</div><div class='add'>+			 * think time, then start directly by 1,</div><div class='add'>+			 * because:</div><div class='add'>+			 * a) on the bright side, keeping at most one</div><div class='add'>+			 * request in service in the drive is unlikely</div><div class='add'>+			 * to cause any harm to the latency of bfqq's</div><div class='add'>+			 * requests, as the service time of a single</div><div class='add'>+			 * request is likely to be lower than the</div><div class='add'>+			 * think time of bfqq;</div><div class='add'>+			 * b) on the downside, after becoming empty,</div><div class='add'>+			 * bfqq is likely to expire before getting its</div><div class='add'>+			 * next request. With this request arrival</div><div class='add'>+			 * pattern, it is very hard to sample total</div><div class='add'>+			 * service times and update the inject limit</div><div class='add'>+			 * accordingly (see comments on</div><div class='add'>+			 * bfq_update_inject_limit()). So the limit is</div><div class='add'>+			 * likely to be never, or at least seldom,</div><div class='add'>+			 * updated.  As a consequence, by setting the</div><div class='add'>+			 * limit to 1, we avoid that no injection ever</div><div class='add'>+			 * occurs with bfqq. On the downside, this</div><div class='add'>+			 * proactive step further reduces chances to</div><div class='add'>+			 * actually compute the baseline total service</div><div class='add'>+			 * time. Thus it reduces chances to execute the</div><div class='add'>+			 * limit-update algorithm and possibly raise the</div><div class='add'>+			 * limit to more than 1.</div><div class='add'>+			 */</div><div class='add'>+			if (bfq_bfqq_has_short_ttime(bfqq))</div><div class='add'>+				bfqq-&gt;inject_limit = 0;</div><div class='add'>+			else</div><div class='add'>+				bfqq-&gt;inject_limit = 1;</div><div class='add'>+			bfqq-&gt;decrease_time_jif = jiffies;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The following conditions must hold to setup a new</div><div class='add'>+		 * sampling of total service time, and then a new</div><div class='add'>+		 * update of the inject limit:</div><div class='add'>+		 * - bfqq is in service, because the total service</div><div class='add'>+		 *   time is evaluated only for the I/O requests of</div><div class='add'>+		 *   the queues in service;</div><div class='add'>+		 * - this is the right occasion to compute or to</div><div class='add'>+		 *   lower the baseline total service time, because</div><div class='add'>+		 *   there are actually no requests in the drive,</div><div class='add'>+		 *   or</div><div class='add'>+		 *   the baseline total service time is available, and</div><div class='add'>+		 *   this is the right occasion to compute the other</div><div class='add'>+		 *   quantity needed to update the inject limit, i.e.,</div><div class='add'>+		 *   the total service time caused by the amount of</div><div class='add'>+		 *   injection allowed by the current value of the</div><div class='add'>+		 *   limit. It is the right occasion because injection</div><div class='add'>+		 *   has actually been performed during the service</div><div class='add'>+		 *   hole, and there are still in-flight requests,</div><div class='add'>+		 *   which are very likely to be exactly the injected</div><div class='add'>+		 *   requests, or part of them;</div><div class='add'>+		 * - the minimum interval for sampling the total</div><div class='add'>+		 *   service time and updating the inject limit has</div><div class='add'>+		 *   elapsed.</div><div class='add'>+		 */</div><div class='add'>+		if (bfqq == bfqd-&gt;in_service_queue &amp;&amp;</div><div class='add'>+		    (bfqd-&gt;rq_in_driver == 0 ||</div><div class='add'>+		     (bfqq-&gt;last_serv_time_ns &gt; 0 &amp;&amp;</div><div class='add'>+		      bfqd-&gt;rqs_injected &amp;&amp; bfqd-&gt;rq_in_driver &gt; 0)) &amp;&amp;</div><div class='add'>+		    time_is_before_eq_jiffies(bfqq-&gt;decrease_time_jif +</div><div class='add'>+					      msecs_to_jiffies(100))) {</div><div class='add'>+			bfqd-&gt;last_empty_occupied_ns = ktime_get_ns();</div><div class='add'>+			/*</div><div class='add'>+			 * Start the state machine for measuring the</div><div class='add'>+			 * total service time of rq: setting</div><div class='add'>+			 * wait_dispatch will cause bfqd-&gt;waited_rq to</div><div class='add'>+			 * be set when rq will be dispatched.</div><div class='add'>+			 */</div><div class='add'>+			bfqd-&gt;wait_dispatch = true;</div><div class='add'>+			bfqd-&gt;rqs_injected = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	elv_rb_add(&amp;bfqq-&gt;sort_list, rq);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1715,8 +1875,9 @@ static void bfq_add_request(struct request *rq)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Adjust priority tree position, if next_rq changes.</div><div class='add'>+	 * See comments on bfq_pos_tree_add_move() for the unlikely().</div><div class='ctx'> 	 */</div><div class='del'>-	if (prev != bfqq-&gt;next_rq)</div><div class='add'>+	if (unlikely(!bfqd-&gt;nonrot_with_queueing &amp;&amp; prev != bfqq-&gt;next_rq))</div><div class='ctx'> 		bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='ctx'> </div><div class='ctx'> 	if (!bfq_bfqq_busy(bfqq)) /* switching to busy ... */</div><div class='hunk'>@@ -1856,7 +2017,9 @@ static void bfq_remove_request(struct request_queue *q,</div><div class='ctx'> 			bfqq-&gt;pos_root = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='add'>+		/* see comments on bfq_pos_tree_add_move() for the unlikely() */</div><div class='add'>+		if (unlikely(!bfqd-&gt;nonrot_with_queueing))</div><div class='add'>+			bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;cmd_flags &amp; REQ_META)</div><div class='hunk'>@@ -1941,7 +2104,12 @@ static void bfq_request_merged(struct request_queue *q, struct request *req,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (prev != bfqq-&gt;next_rq) {</div><div class='ctx'> 			bfq_updated_next_req(bfqd, bfqq);</div><div class='del'>-			bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='add'>+			/*</div><div class='add'>+			 * See comments on bfq_pos_tree_add_move() for</div><div class='add'>+			 * the unlikely().</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(!bfqd-&gt;nonrot_with_queueing))</div><div class='add'>+				bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2224,6 +2392,46 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> 	struct bfq_queue *in_service_bfqq, *new_bfqq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Do not perform queue merging if the device is non</div><div class='add'>+	 * rotational and performs internal queueing. In fact, such a</div><div class='add'>+	 * device reaches a high speed through internal parallelism</div><div class='add'>+	 * and pipelining. This means that, to reach a high</div><div class='add'>+	 * throughput, it must have many requests enqueued at the same</div><div class='add'>+	 * time. But, in this configuration, the internal scheduling</div><div class='add'>+	 * algorithm of the device does exactly the job of queue</div><div class='add'>+	 * merging: it reorders requests so as to obtain as much as</div><div class='add'>+	 * possible a sequential I/O pattern. As a consequence, with</div><div class='add'>+	 * the workload generated by processes doing interleaved I/O,</div><div class='add'>+	 * the throughput reached by the device is likely to be the</div><div class='add'>+	 * same, with and without queue merging.</div><div class='add'>+	 *</div><div class='add'>+	 * Disabling merging also provides a remarkable benefit in</div><div class='add'>+	 * terms of throughput. Merging tends to make many workloads</div><div class='add'>+	 * artificially more uneven, because of shared queues</div><div class='add'>+	 * remaining non empty for incomparably more time than</div><div class='add'>+	 * non-merged queues. This may accentuate workload</div><div class='add'>+	 * asymmetries. For example, if one of the queues in a set of</div><div class='add'>+	 * merged queues has a higher weight than a normal queue, then</div><div class='add'>+	 * the shared queue may inherit such a high weight and, by</div><div class='add'>+	 * staying almost always active, may force BFQ to perform I/O</div><div class='add'>+	 * plugging most of the time. This evidently makes it harder</div><div class='add'>+	 * for BFQ to let the device reach a high throughput.</div><div class='add'>+	 *</div><div class='add'>+	 * Finally, the likely() macro below is not used because one</div><div class='add'>+	 * of the two branches is more likely than the other, but to</div><div class='add'>+	 * have the code path after the following if() executed as</div><div class='add'>+	 * fast as possible for the case of a non rotational device</div><div class='add'>+	 * with queueing. We want it because this is the fastest kind</div><div class='add'>+	 * of device. On the opposite end, the likely() may lengthen</div><div class='add'>+	 * the execution time of BFQ for the case of slower devices</div><div class='add'>+	 * (rotational or at least without queueing). But in this case</div><div class='add'>+	 * the execution time of BFQ matters very little, if not at</div><div class='add'>+	 * all.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(bfqd-&gt;nonrot_with_queueing))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Prevent bfqq from being merged if it has been created too</div><div class='ctx'> 	 * long ago. The idea is that true cooperating processes, and</div><div class='ctx'> 	 * thus their associated bfq_queues, are supposed to be</div><div class='hunk'>@@ -2286,6 +2494,7 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq)</div><div class='ctx'> 	if (!bic)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	bic-&gt;saved_weight = bfqq-&gt;entity.orig_weight;</div><div class='ctx'> 	bic-&gt;saved_ttime = bfqq-&gt;ttime;</div><div class='ctx'> 	bic-&gt;saved_has_short_ttime = bfq_bfqq_has_short_ttime(bfqq);</div><div class='ctx'> 	bic-&gt;saved_IO_bound = bfq_bfqq_IO_bound(bfqq);</div><div class='hunk'>@@ -2374,6 +2583,16 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,</div><div class='ctx'> 	 *   assignment causes no harm).</div><div class='ctx'> 	 */</div><div class='ctx'> 	new_bfqq-&gt;bic = NULL;</div><div class='add'>+	/*</div><div class='add'>+	 * If the queue is shared, the pid is the pid of one of the associated</div><div class='add'>+	 * processes. Which pid depends on the exact sequence of merge events</div><div class='add'>+	 * the queue underwent. So printing such a pid is useless and confusing</div><div class='add'>+	 * because it reports a random pid between those of the associated</div><div class='add'>+	 * processes.</div><div class='add'>+	 * We mark such a queue with a pid -1, and then print SHARED instead of</div><div class='add'>+	 * a pid in logging messages.</div><div class='add'>+	 */</div><div class='add'>+	new_bfqq-&gt;pid = -1;</div><div class='ctx'> 	bfqq-&gt;bic = NULL;</div><div class='ctx'> 	/* release process reference to bfqq */</div><div class='ctx'> 	bfq_put_queue(bfqq);</div><div class='hunk'>@@ -2408,8 +2627,8 @@ static bool bfq_allow_bio_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * bic still points to bfqq, then it has not yet been</div><div class='ctx'> 		 * redirected to some other bfq_queue, and a queue</div><div class='del'>-		 * merge beween bfqq and new_bfqq can be safely</div><div class='del'>-		 * fulfillled, i.e., bic can be redirected to new_bfqq</div><div class='add'>+		 * merge between bfqq and new_bfqq can be safely</div><div class='add'>+		 * fulfilled, i.e., bic can be redirected to new_bfqq</div><div class='ctx'> 		 * and bfqq can be put.</div><div class='ctx'> 		 */</div><div class='ctx'> 		bfq_merge_bfqqs(bfqd, bfqd-&gt;bio_bic, bfqq,</div><div class='hunk'>@@ -2543,10 +2762,14 @@ static void bfq_arm_slice_timer(struct bfq_data *bfqd)</div><div class='ctx'> 	 * queue).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (BFQQ_SEEKY(bfqq) &amp;&amp; bfqq-&gt;wr_coeff == 1 &amp;&amp;</div><div class='del'>-	    bfq_symmetric_scenario(bfqd))</div><div class='add'>+	    !bfq_asymmetric_scenario(bfqd, bfqq))</div><div class='ctx'> 		sl = min_t(u64, sl, BFQ_MIN_TT);</div><div class='add'>+	else if (bfqq-&gt;wr_coeff &gt; 1)</div><div class='add'>+		sl = max_t(u32, sl, 20ULL * NSEC_PER_MSEC);</div><div class='ctx'> </div><div class='ctx'> 	bfqd-&gt;last_idling_start = ktime_get();</div><div class='add'>+	bfqd-&gt;last_idling_start_jiffies = jiffies;</div><div class='add'>+</div><div class='ctx'> 	hrtimer_start(&amp;bfqd-&gt;idle_slice_timer, ns_to_ktime(sl),</div><div class='ctx'> 		      HRTIMER_MODE_REL);</div><div class='ctx'> 	bfqg_stats_set_start_idle_time(bfqq_group(bfqq));</div><div class='hunk'>@@ -2822,7 +3045,7 @@ static void bfq_dispatch_remove(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	bfq_remove_request(q, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='add'>+static bool __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If this bfqq is shared between multiple processes, check</div><div class='hunk'>@@ -2848,16 +3071,20 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)</div><div class='ctx'> 		bfq_requeue_bfqq(bfqd, bfqq, true);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Resort priority tree of potential close cooperators.</div><div class='add'>+		 * See comments on bfq_pos_tree_add_move() for the unlikely().</div><div class='ctx'> 		 */</div><div class='del'>-		bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='add'>+		if (unlikely(!bfqd-&gt;nonrot_with_queueing))</div><div class='add'>+			bfq_pos_tree_add_move(bfqd, bfqq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All in-service entities must have been properly deactivated</div><div class='ctx'> 	 * or requeued before executing the next function, which</div><div class='del'>-	 * resets all in-service entites as no more in service.</div><div class='add'>+	 * resets all in-service entities as no more in service. This</div><div class='add'>+	 * may cause bfqq to be freed. If this happens, the next</div><div class='add'>+	 * function returns true.</div><div class='ctx'> 	 */</div><div class='del'>-	__bfq_bfqd_reset_in_service(bfqd);</div><div class='add'>+	return __bfq_bfqd_reset_in_service(bfqd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3221,13 +3448,6 @@ static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,</div><div class='ctx'> 		    jiffies + nsecs_to_jiffies(bfqq-&gt;bfqd-&gt;bfq_slice_idle) + 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool bfq_bfqq_injectable(struct bfq_queue *bfqq)</div><div class='del'>-{</div><div class='del'>-	return BFQQ_SEEKY(bfqq) &amp;&amp; bfqq-&gt;wr_coeff == 1 &amp;&amp;</div><div class='del'>-		blk_queue_nonrot(bfqq-&gt;bfqd-&gt;queue) &amp;&amp;</div><div class='del'>-		bfqq-&gt;bfqd-&gt;hw_tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * bfq_bfqq_expire - expire a queue.</div><div class='ctx'>  * @bfqd: device owning the queue.</div><div class='hunk'>@@ -3262,7 +3482,6 @@ void bfq_bfqq_expire(struct bfq_data *bfqd,</div><div class='ctx'> 	bool slow;</div><div class='ctx'> 	unsigned long delta = 0;</div><div class='ctx'> 	struct bfq_entity *entity = &amp;bfqq-&gt;entity;</div><div class='del'>-	int ref;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check whether the process is slow (see bfq_bfqq_is_slow).</div><div class='hunk'>@@ -3343,18 +3562,22 @@ void bfq_bfqq_expire(struct bfq_data *bfqd,</div><div class='ctx'> 		slow, bfqq-&gt;dispatched, bfq_bfqq_has_short_ttime(bfqq));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * bfqq expired, so no total service time needs to be computed</div><div class='add'>+	 * any longer: reset state machine for measuring total service</div><div class='add'>+	 * times.</div><div class='add'>+	 */</div><div class='add'>+	bfqd-&gt;rqs_injected = bfqd-&gt;wait_dispatch = false;</div><div class='add'>+	bfqd-&gt;waited_rq = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Increase, decrease or leave budget unchanged according to</div><div class='ctx'> 	 * reason.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__bfq_bfqq_recalc_budget(bfqd, bfqq, reason);</div><div class='del'>-	ref = bfqq-&gt;ref;</div><div class='del'>-	__bfq_bfqq_expire(bfqd, bfqq);</div><div class='del'>-</div><div class='del'>-	if (ref == 1) /* bfqq is gone, no more actions on it */</div><div class='add'>+	if (__bfq_bfqq_expire(bfqd, bfqq))</div><div class='add'>+		/* bfqq is gone, no more actions on it */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bfqq-&gt;injected_service = 0;</div><div class='del'>-</div><div class='ctx'> 	/* mark bfqq as waiting a request only if a bic still points to it */</div><div class='ctx'> 	if (!bfq_bfqq_busy(bfqq) &amp;&amp;</div><div class='ctx'> 	    reason != BFQQE_BUDGET_TIMEOUT &amp;&amp;</div><div class='hunk'>@@ -3498,8 +3721,9 @@ static bool idling_boosts_thr_without_issues(struct bfq_data *bfqd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * There is a case where idling must be performed not for</div><div class='del'>- * throughput concerns, but to preserve service guarantees.</div><div class='add'>+ * There is a case where idling does not have to be performed for</div><div class='add'>+ * throughput concerns, but to preserve the throughput share of</div><div class='add'>+ * the process associated with bfqq.</div><div class='ctx'>  *</div><div class='ctx'>  * To introduce this case, we can note that allowing the drive</div><div class='ctx'>  * to enqueue more than one request at a time, and hence</div><div class='hunk'>@@ -3515,77 +3739,83 @@ static bool idling_boosts_thr_without_issues(struct bfq_data *bfqd,</div><div class='ctx'>  * concern about per-process throughput distribution, and</div><div class='ctx'>  * makes its decisions only on a per-request basis. Therefore,</div><div class='ctx'>  * the service distribution enforced by the drive's internal</div><div class='del'>- * scheduler is likely to coincide with the desired</div><div class='del'>- * device-throughput distribution only in a completely</div><div class='del'>- * symmetric scenario where:</div><div class='del'>- * (i)  each of these processes must get the same throughput as</div><div class='del'>- *      the others;</div><div class='del'>- * (ii) the I/O of each process has the same properties, in</div><div class='del'>- *      terms of locality (sequential or random), direction</div><div class='del'>- *      (reads or writes), request sizes, greediness</div><div class='del'>- *      (from I/O-bound to sporadic), and so on.</div><div class='del'>- * In fact, in such a scenario, the drive tends to treat</div><div class='del'>- * the requests of each of these processes in about the same</div><div class='del'>- * way as the requests of the others, and thus to provide</div><div class='del'>- * each of these processes with about the same throughput</div><div class='del'>- * (which is exactly the desired throughput distribution). In</div><div class='del'>- * contrast, in any asymmetric scenario, device idling is</div><div class='del'>- * certainly needed to guarantee that bfqq receives its</div><div class='del'>- * assigned fraction of the device throughput (see [1] for</div><div class='del'>- * details).</div><div class='del'>- * The problem is that idling may significantly reduce</div><div class='del'>- * throughput with certain combinations of types of I/O and</div><div class='del'>- * devices. An important example is sync random I/O, on flash</div><div class='del'>- * storage with command queueing. So, unless bfqq falls in the</div><div class='del'>- * above cases where idling also boosts throughput, it would</div><div class='del'>- * be important to check conditions (i) and (ii) accurately,</div><div class='del'>- * so as to avoid idling when not strictly needed for service</div><div class='del'>- * guarantees.</div><div class='add'>+ * scheduler is likely to coincide with the desired throughput</div><div class='add'>+ * distribution only in a completely symmetric, or favorably</div><div class='add'>+ * skewed scenario where:</div><div class='add'>+ * (i-a) each of these processes must get the same throughput as</div><div class='add'>+ *	 the others,</div><div class='add'>+ * (i-b) in case (i-a) does not hold, it holds that the process</div><div class='add'>+ *       associated with bfqq must receive a lower or equal</div><div class='add'>+ *	 throughput than any of the other processes;</div><div class='add'>+ * (ii)  the I/O of each process has the same properties, in</div><div class='add'>+ *       terms of locality (sequential or random), direction</div><div class='add'>+ *       (reads or writes), request sizes, greediness</div><div class='add'>+ *       (from I/O-bound to sporadic), and so on;</div><div class='add'>+</div><div class='add'>+ * In fact, in such a scenario, the drive tends to treat the requests</div><div class='add'>+ * of each process in about the same way as the requests of the</div><div class='add'>+ * others, and thus to provide each of these processes with about the</div><div class='add'>+ * same throughput.  This is exactly the desired throughput</div><div class='add'>+ * distribution if (i-a) holds, or, if (i-b) holds instead, this is an</div><div class='add'>+ * even more convenient distribution for (the process associated with)</div><div class='add'>+ * bfqq.</div><div class='ctx'>  *</div><div class='del'>- * Unfortunately, it is extremely difficult to thoroughly</div><div class='del'>- * check condition (ii). And, in case there are active groups,</div><div class='del'>- * it becomes very difficult to check condition (i) too. In</div><div class='del'>- * fact, if there are active groups, then, for condition (i)</div><div class='del'>- * to become false, it is enough that an active group contains</div><div class='del'>- * more active processes or sub-groups than some other active</div><div class='del'>- * group. More precisely, for condition (i) to hold because of</div><div class='del'>- * such a group, it is not even necessary that the group is</div><div class='del'>- * (still) active: it is sufficient that, even if the group</div><div class='del'>- * has become inactive, some of its descendant processes still</div><div class='del'>- * have some request already dispatched but still waiting for</div><div class='del'>- * completion. In fact, requests have still to be guaranteed</div><div class='del'>- * their share of the throughput even after being</div><div class='del'>- * dispatched. In this respect, it is easy to show that, if a</div><div class='del'>- * group frequently becomes inactive while still having</div><div class='del'>- * in-flight requests, and if, when this happens, the group is</div><div class='del'>- * not considered in the calculation of whether the scenario</div><div class='del'>- * is asymmetric, then the group may fail to be guaranteed its</div><div class='del'>- * fair share of the throughput (basically because idling may</div><div class='del'>- * not be performed for the descendant processes of the group,</div><div class='del'>- * but it had to be).  We address this issue with the</div><div class='del'>- * following bi-modal behavior, implemented in the function</div><div class='del'>- * bfq_symmetric_scenario().</div><div class='add'>+ * In contrast, in any asymmetric or unfavorable scenario, device</div><div class='add'>+ * idling (I/O-dispatch plugging) is certainly needed to guarantee</div><div class='add'>+ * that bfqq receives its assigned fraction of the device throughput</div><div class='add'>+ * (see [1] for details).</div><div class='add'>+ *</div><div class='add'>+ * The problem is that idling may significantly reduce throughput with</div><div class='add'>+ * certain combinations of types of I/O and devices. An important</div><div class='add'>+ * example is sync random I/O on flash storage with command</div><div class='add'>+ * queueing. So, unless bfqq falls in cases where idling also boosts</div><div class='add'>+ * throughput, it is important to check conditions (i-a), i(-b) and</div><div class='add'>+ * (ii) accurately, so as to avoid idling when not strictly needed for</div><div class='add'>+ * service guarantees.</div><div class='add'>+ *</div><div class='add'>+ * Unfortunately, it is extremely difficult to thoroughly check</div><div class='add'>+ * condition (ii). And, in case there are active groups, it becomes</div><div class='add'>+ * very difficult to check conditions (i-a) and (i-b) too.  In fact,</div><div class='add'>+ * if there are active groups, then, for conditions (i-a) or (i-b) to</div><div class='add'>+ * become false 'indirectly', it is enough that an active group</div><div class='add'>+ * contains more active processes or sub-groups than some other active</div><div class='add'>+ * group. More precisely, for conditions (i-a) or (i-b) to become</div><div class='add'>+ * false because of such a group, it is not even necessary that the</div><div class='add'>+ * group is (still) active: it is sufficient that, even if the group</div><div class='add'>+ * has become inactive, some of its descendant processes still have</div><div class='add'>+ * some request already dispatched but still waiting for</div><div class='add'>+ * completion. In fact, requests have still to be guaranteed their</div><div class='add'>+ * share of the throughput even after being dispatched. In this</div><div class='add'>+ * respect, it is easy to show that, if a group frequently becomes</div><div class='add'>+ * inactive while still having in-flight requests, and if, when this</div><div class='add'>+ * happens, the group is not considered in the calculation of whether</div><div class='add'>+ * the scenario is asymmetric, then the group may fail to be</div><div class='add'>+ * guaranteed its fair share of the throughput (basically because</div><div class='add'>+ * idling may not be performed for the descendant processes of the</div><div class='add'>+ * group, but it had to be).  We address this issue with the following</div><div class='add'>+ * bi-modal behavior, implemented in the function</div><div class='add'>+ * bfq_asymmetric_scenario().</div><div class='ctx'>  *</div><div class='ctx'>  * If there are groups with requests waiting for completion</div><div class='ctx'>  * (as commented above, some of these groups may even be</div><div class='ctx'>  * already inactive), then the scenario is tagged as</div><div class='ctx'>  * asymmetric, conservatively, without checking any of the</div><div class='del'>- * conditions (i) and (ii). So the device is idled for bfqq.</div><div class='add'>+ * conditions (i-a), (i-b) or (ii). So the device is idled for bfqq.</div><div class='ctx'>  * This behavior matches also the fact that groups are created</div><div class='ctx'>  * exactly if controlling I/O is a primary concern (to</div><div class='ctx'>  * preserve bandwidth and latency guarantees).</div><div class='ctx'>  *</div><div class='del'>- * On the opposite end, if there are no groups with requests</div><div class='del'>- * waiting for completion, then only condition (i) is actually</div><div class='del'>- * controlled, i.e., provided that condition (i) holds, idling</div><div class='del'>- * is not performed, regardless of whether condition (ii)</div><div class='del'>- * holds. In other words, only if condition (i) does not hold,</div><div class='del'>- * then idling is allowed, and the device tends to be</div><div class='del'>- * prevented from queueing many requests, possibly of several</div><div class='del'>- * processes. Since there are no groups with requests waiting</div><div class='del'>- * for completion, then, to control condition (i) it is enough</div><div class='del'>- * to check just whether all the queues with requests waiting</div><div class='del'>- * for completion also have the same weight.</div><div class='add'>+ * On the opposite end, if there are no groups with requests waiting</div><div class='add'>+ * for completion, then only conditions (i-a) and (i-b) are actually</div><div class='add'>+ * controlled, i.e., provided that conditions (i-a) or (i-b) holds,</div><div class='add'>+ * idling is not performed, regardless of whether condition (ii)</div><div class='add'>+ * holds.  In other words, only if conditions (i-a) and (i-b) do not</div><div class='add'>+ * hold, then idling is allowed, and the device tends to be prevented</div><div class='add'>+ * from queueing many requests, possibly of several processes. Since</div><div class='add'>+ * there are no groups with requests waiting for completion, then, to</div><div class='add'>+ * control conditions (i-a) and (i-b) it is enough to check just</div><div class='add'>+ * whether all the queues with requests waiting for completion also</div><div class='add'>+ * have the same weight.</div><div class='ctx'>  *</div><div class='ctx'>  * Not checking condition (ii) evidently exposes bfqq to the</div><div class='ctx'>  * risk of getting less throughput than its fair share.</div><div class='hunk'>@@ -3637,7 +3867,7 @@ static bool idling_boosts_thr_without_issues(struct bfq_data *bfqd,</div><div class='ctx'>  * compound condition that is checked below for deciding</div><div class='ctx'>  * whether the scenario is asymmetric. To explain this</div><div class='ctx'>  * compound condition, we need to add that the function</div><div class='del'>- * bfq_symmetric_scenario checks the weights of only</div><div class='add'>+ * bfq_asymmetric_scenario checks the weights of only</div><div class='ctx'>  * non-weight-raised queues, for efficiency reasons (see</div><div class='ctx'>  * comments on bfq_weights_tree_add()). Then the fact that</div><div class='ctx'>  * bfqq is weight-raised is checked explicitly here. More</div><div class='hunk'>@@ -3665,7 +3895,7 @@ static bool idling_needed_for_service_guarantees(struct bfq_data *bfqd,</div><div class='ctx'> 	return (bfqq-&gt;wr_coeff &gt; 1 &amp;&amp;</div><div class='ctx'> 		bfqd-&gt;wr_busy_queues &lt;</div><div class='ctx'> 		bfq_tot_busy_queues(bfqd)) ||</div><div class='del'>-		!bfq_symmetric_scenario(bfqd);</div><div class='add'>+		bfq_asymmetric_scenario(bfqd, bfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3741,26 +3971,98 @@ static bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)</div><div class='ctx'> 	return RB_EMPTY_ROOT(&amp;bfqq-&gt;sort_list) &amp;&amp; bfq_better_to_idle(bfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct bfq_queue *bfq_choose_bfqq_for_injection(struct bfq_data *bfqd)</div><div class='add'>+/*</div><div class='add'>+ * This function chooses the queue from which to pick the next extra</div><div class='add'>+ * I/O request to inject, if it finds a compatible queue. See the</div><div class='add'>+ * comments on bfq_update_inject_limit() for details on the injection</div><div class='add'>+ * mechanism, and for the definitions of the quantities mentioned</div><div class='add'>+ * below.</div><div class='add'>+ */</div><div class='add'>+static struct bfq_queue *</div><div class='add'>+bfq_choose_bfqq_for_injection(struct bfq_data *bfqd)</div><div class='ctx'> {</div><div class='del'>-	struct bfq_queue *bfqq;</div><div class='add'>+	struct bfq_queue *bfqq, *in_serv_bfqq = bfqd-&gt;in_service_queue;</div><div class='add'>+	unsigned int limit = in_serv_bfqq-&gt;inject_limit;</div><div class='add'>+	/*</div><div class='add'>+	 * If</div><div class='add'>+	 * - bfqq is not weight-raised and therefore does not carry</div><div class='add'>+	 *   time-critical I/O,</div><div class='add'>+	 * or</div><div class='add'>+	 * - regardless of whether bfqq is weight-raised, bfqq has</div><div class='add'>+	 *   however a long think time, during which it can absorb the</div><div class='add'>+	 *   effect of an appropriate number of extra I/O requests</div><div class='add'>+	 *   from other queues (see bfq_update_inject_limit for</div><div class='add'>+	 *   details on the computation of this number);</div><div class='add'>+	 * then injection can be performed without restrictions.</div><div class='add'>+	 */</div><div class='add'>+	bool in_serv_always_inject = in_serv_bfqq-&gt;wr_coeff == 1 ||</div><div class='add'>+		!bfq_bfqq_has_short_ttime(in_serv_bfqq);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * A linear search; but, with a high probability, very few</div><div class='del'>-	 * steps are needed to find a candidate queue, i.e., a queue</div><div class='del'>-	 * with enough budget left for its next request. In fact:</div><div class='add'>+	 * If</div><div class='add'>+	 * - the baseline total service time could not be sampled yet,</div><div class='add'>+	 *   so the inject limit happens to be still 0, and</div><div class='add'>+	 * - a lot of time has elapsed since the plugging of I/O</div><div class='add'>+	 *   dispatching started, so drive speed is being wasted</div><div class='add'>+	 *   significantly;</div><div class='add'>+	 * then temporarily raise inject limit to one request.</div><div class='add'>+	 */</div><div class='add'>+	if (limit == 0 &amp;&amp; in_serv_bfqq-&gt;last_serv_time_ns == 0 &amp;&amp;</div><div class='add'>+	    bfq_bfqq_wait_request(in_serv_bfqq) &amp;&amp;</div><div class='add'>+	    time_is_before_eq_jiffies(bfqd-&gt;last_idling_start_jiffies +</div><div class='add'>+				      bfqd-&gt;bfq_slice_idle)</div><div class='add'>+		)</div><div class='add'>+		limit = 1;</div><div class='add'>+</div><div class='add'>+	if (bfqd-&gt;rq_in_driver &gt;= limit)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Linear search of the source queue for injection; but, with</div><div class='add'>+	 * a high probability, very few steps are needed to find a</div><div class='add'>+	 * candidate queue, i.e., a queue with enough budget left for</div><div class='add'>+	 * its next request. In fact:</div><div class='ctx'> 	 * - BFQ dynamically updates the budget of every queue so as</div><div class='ctx'> 	 *   to accommodate the expected backlog of the queue;</div><div class='ctx'> 	 * - if a queue gets all its requests dispatched as injected</div><div class='ctx'> 	 *   service, then the queue is removed from the active list</div><div class='del'>-	 *   (and re-added only if it gets new requests, but with</div><div class='del'>-	 *   enough budget for its new backlog).</div><div class='add'>+	 *   (and re-added only if it gets new requests, but then it</div><div class='add'>+	 *   is assigned again enough budget for its new backlog).</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(bfqq, &amp;bfqd-&gt;active_list, bfqq_list)</div><div class='ctx'> 		if (!RB_EMPTY_ROOT(&amp;bfqq-&gt;sort_list) &amp;&amp;</div><div class='add'>+		    (in_serv_always_inject || bfqq-&gt;wr_coeff &gt; 1) &amp;&amp;</div><div class='ctx'> 		    bfq_serv_to_charge(bfqq-&gt;next_rq, bfqq) &lt;=</div><div class='del'>-		    bfq_bfqq_budget_left(bfqq))</div><div class='del'>-			return bfqq;</div><div class='add'>+		    bfq_bfqq_budget_left(bfqq)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Allow for only one large in-flight request</div><div class='add'>+			 * on non-rotational devices, for the</div><div class='add'>+			 * following reason. On non-rotationl drives,</div><div class='add'>+			 * large requests take much longer than</div><div class='add'>+			 * smaller requests to be served. In addition,</div><div class='add'>+			 * the drive prefers to serve large requests</div><div class='add'>+			 * w.r.t. to small ones, if it can choose. So,</div><div class='add'>+			 * having more than one large requests queued</div><div class='add'>+			 * in the drive may easily make the next first</div><div class='add'>+			 * request of the in-service queue wait for so</div><div class='add'>+			 * long to break bfqq's service guarantees. On</div><div class='add'>+			 * the bright side, large requests let the</div><div class='add'>+			 * drive reach a very high throughput, even if</div><div class='add'>+			 * there is only one in-flight large request</div><div class='add'>+			 * at a time.</div><div class='add'>+			 */</div><div class='add'>+			if (blk_queue_nonrot(bfqd-&gt;queue) &amp;&amp;</div><div class='add'>+			    blk_rq_sectors(bfqq-&gt;next_rq) &gt;=</div><div class='add'>+			    BFQQ_SECT_THR_NONROT)</div><div class='add'>+				limit = min_t(unsigned int, 1, limit);</div><div class='add'>+			else</div><div class='add'>+				limit = in_serv_bfqq-&gt;inject_limit;</div><div class='add'>+</div><div class='add'>+			if (bfqd-&gt;rq_in_driver &lt; limit) {</div><div class='add'>+				bfqd-&gt;rqs_injected = true;</div><div class='add'>+				return bfqq;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -3847,14 +4149,32 @@ check_queue:</div><div class='ctx'> 	 * for a new request, or has requests waiting for a completion and</div><div class='ctx'> 	 * may idle after their completion, then keep it anyway.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Yet, to boost throughput, inject service from other queues if</div><div class='del'>-	 * possible.</div><div class='add'>+	 * Yet, inject service from other queues if it boosts</div><div class='add'>+	 * throughput and is possible.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bfq_bfqq_wait_request(bfqq) ||</div><div class='ctx'> 	    (bfqq-&gt;dispatched != 0 &amp;&amp; bfq_better_to_idle(bfqq))) {</div><div class='del'>-		if (bfq_bfqq_injectable(bfqq) &amp;&amp;</div><div class='del'>-		    bfqq-&gt;injected_service * bfqq-&gt;inject_coeff &lt;</div><div class='del'>-		    bfqq-&gt;entity.service * 10)</div><div class='add'>+		struct bfq_queue *async_bfqq =</div><div class='add'>+			bfqq-&gt;bic &amp;&amp; bfqq-&gt;bic-&gt;bfqq[0] &amp;&amp;</div><div class='add'>+			bfq_bfqq_busy(bfqq-&gt;bic-&gt;bfqq[0]) ?</div><div class='add'>+			bfqq-&gt;bic-&gt;bfqq[0] : NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the process associated with bfqq has also async</div><div class='add'>+		 * I/O pending, then inject it</div><div class='add'>+		 * unconditionally. Injecting I/O from the same</div><div class='add'>+		 * process can cause no harm to the process. On the</div><div class='add'>+		 * contrary, it can only increase bandwidth and reduce</div><div class='add'>+		 * latency for the process.</div><div class='add'>+		 */</div><div class='add'>+		if (async_bfqq &amp;&amp;</div><div class='add'>+		    icq_to_bic(async_bfqq-&gt;next_rq-&gt;elv.icq) == bfqq-&gt;bic &amp;&amp;</div><div class='add'>+		    bfq_serv_to_charge(async_bfqq-&gt;next_rq, async_bfqq) &lt;=</div><div class='add'>+		    bfq_bfqq_budget_left(async_bfqq))</div><div class='add'>+			bfqq = bfqq-&gt;bic-&gt;bfqq[0];</div><div class='add'>+		else if (!idling_boosts_thr_without_issues(bfqd, bfqq) &amp;&amp;</div><div class='add'>+			 (bfqq-&gt;wr_coeff == 1 || bfqd-&gt;wr_busy_queues &gt; 1 ||</div><div class='add'>+			  !bfq_bfqq_has_short_ttime(bfqq)))</div><div class='ctx'> 			bfqq = bfq_choose_bfqq_for_injection(bfqd);</div><div class='ctx'> 		else</div><div class='ctx'> 			bfqq = NULL;</div><div class='hunk'>@@ -3946,15 +4266,15 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,</div><div class='ctx'> </div><div class='ctx'> 	bfq_bfqq_served(bfqq, service_to_charge);</div><div class='ctx'> </div><div class='del'>-	bfq_dispatch_remove(bfqd-&gt;queue, rq);</div><div class='add'>+	if (bfqq == bfqd-&gt;in_service_queue &amp;&amp; bfqd-&gt;wait_dispatch) {</div><div class='add'>+		bfqd-&gt;wait_dispatch = false;</div><div class='add'>+		bfqd-&gt;waited_rq = rq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (bfqq != bfqd-&gt;in_service_queue) {</div><div class='del'>-		if (likely(bfqd-&gt;in_service_queue))</div><div class='del'>-			bfqd-&gt;in_service_queue-&gt;injected_service +=</div><div class='del'>-				bfq_serv_to_charge(rq, bfqq);</div><div class='add'>+	bfq_dispatch_remove(bfqd-&gt;queue, rq);</div><div class='ctx'> </div><div class='add'>+	if (bfqq != bfqd-&gt;in_service_queue)</div><div class='ctx'> 		goto return_rq;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If weight raising has to terminate for bfqq, then next</div><div class='hunk'>@@ -4385,13 +4705,6 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> 			bfq_mark_bfqq_has_short_ttime(bfqq);</div><div class='ctx'> 		bfq_mark_bfqq_sync(bfqq);</div><div class='ctx'> 		bfq_mark_bfqq_just_created(bfqq);</div><div class='del'>-		/*</div><div class='del'>-		 * Aggressively inject a lot of service: up to 90%.</div><div class='del'>-		 * This coefficient remains constant during bfqq life,</div><div class='del'>-		 * but this behavior might be changed, after enough</div><div class='del'>-		 * testing and tuning.</div><div class='del'>-		 */</div><div class='del'>-		bfqq-&gt;inject_coeff = 1;</div><div class='ctx'> 	} else</div><div class='ctx'> 		bfq_clear_bfqq_sync(bfqq);</div><div class='ctx'> </div><div class='hunk'>@@ -4530,6 +4843,11 @@ bfq_update_io_seektime(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> {</div><div class='ctx'> 	bfqq-&gt;seek_history &lt;&lt;= 1;</div><div class='ctx'> 	bfqq-&gt;seek_history |= BFQ_RQ_SEEKY(bfqd, bfqq-&gt;last_request_pos, rq);</div><div class='add'>+</div><div class='add'>+	if (bfqq-&gt;wr_coeff &gt; 1 &amp;&amp;</div><div class='add'>+	    bfqq-&gt;wr_cur_max_time == bfqd-&gt;bfq_wr_rt_max_time &amp;&amp;</div><div class='add'>+	    BFQQ_TOTALLY_SEEKY(bfqq))</div><div class='add'>+		bfq_bfqq_end_wr(bfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bfq_update_has_short_ttime(struct bfq_data *bfqd,</div><div class='hunk'>@@ -4824,6 +5142,9 @@ static void bfq_update_hw_tag(struct bfq_data *bfqd)</div><div class='ctx'> 	bfqd-&gt;hw_tag = bfqd-&gt;max_rq_in_driver &gt; BFQ_HW_QUEUE_THRESHOLD;</div><div class='ctx'> 	bfqd-&gt;max_rq_in_driver = 0;</div><div class='ctx'> 	bfqd-&gt;hw_tag_samples = 0;</div><div class='add'>+</div><div class='add'>+	bfqd-&gt;nonrot_with_queueing =</div><div class='add'>+		blk_queue_nonrot(bfqd-&gt;queue) &amp;&amp; bfqd-&gt;hw_tag;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd)</div><div class='hunk'>@@ -4951,6 +5272,147 @@ static void bfq_finish_requeue_request_body(struct bfq_queue *bfqq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The processes associated with bfqq may happen to generate their</div><div class='add'>+ * cumulative I/O at a lower rate than the rate at which the device</div><div class='add'>+ * could serve the same I/O. This is rather probable, e.g., if only</div><div class='add'>+ * one process is associated with bfqq and the device is an SSD. It</div><div class='add'>+ * results in bfqq becoming often empty while in service. In this</div><div class='add'>+ * respect, if BFQ is allowed to switch to another queue when bfqq</div><div class='add'>+ * remains empty, then the device goes on being fed with I/O requests,</div><div class='add'>+ * and the throughput is not affected. In contrast, if BFQ is not</div><div class='add'>+ * allowed to switch to another queue---because bfqq is sync and</div><div class='add'>+ * I/O-dispatch needs to be plugged while bfqq is temporarily</div><div class='add'>+ * empty---then, during the service of bfqq, there will be frequent</div><div class='add'>+ * "service holes", i.e., time intervals during which bfqq gets empty</div><div class='add'>+ * and the device can only consume the I/O already queued in its</div><div class='add'>+ * hardware queues. During service holes, the device may even get to</div><div class='add'>+ * remaining idle. In the end, during the service of bfqq, the device</div><div class='add'>+ * is driven at a lower speed than the one it can reach with the kind</div><div class='add'>+ * of I/O flowing through bfqq.</div><div class='add'>+ *</div><div class='add'>+ * To counter this loss of throughput, BFQ implements a "request</div><div class='add'>+ * injection mechanism", which tries to fill the above service holes</div><div class='add'>+ * with I/O requests taken from other queues. The hard part in this</div><div class='add'>+ * mechanism is finding the right amount of I/O to inject, so as to</div><div class='add'>+ * both boost throughput and not break bfqq's bandwidth and latency</div><div class='add'>+ * guarantees. In this respect, the mechanism maintains a per-queue</div><div class='add'>+ * inject limit, computed as below. While bfqq is empty, the injection</div><div class='add'>+ * mechanism dispatches extra I/O requests only until the total number</div><div class='add'>+ * of I/O requests in flight---i.e., already dispatched but not yet</div><div class='add'>+ * completed---remains lower than this limit.</div><div class='add'>+ *</div><div class='add'>+ * A first definition comes in handy to introduce the algorithm by</div><div class='add'>+ * which the inject limit is computed.  We define as first request for</div><div class='add'>+ * bfqq, an I/O request for bfqq that arrives while bfqq is in</div><div class='add'>+ * service, and causes bfqq to switch from empty to non-empty. The</div><div class='add'>+ * algorithm updates the limit as a function of the effect of</div><div class='add'>+ * injection on the service times of only the first requests of</div><div class='add'>+ * bfqq. The reason for this restriction is that these are the</div><div class='add'>+ * requests whose service time is affected most, because they are the</div><div class='add'>+ * first to arrive after injection possibly occurred.</div><div class='add'>+ *</div><div class='add'>+ * To evaluate the effect of injection, the algorithm measures the</div><div class='add'>+ * "total service time" of first requests. We define as total service</div><div class='add'>+ * time of an I/O request, the time that elapses since when the</div><div class='add'>+ * request is enqueued into bfqq, to when it is completed. This</div><div class='add'>+ * quantity allows the whole effect of injection to be measured. It is</div><div class='add'>+ * easy to see why. Suppose that some requests of other queues are</div><div class='add'>+ * actually injected while bfqq is empty, and that a new request R</div><div class='add'>+ * then arrives for bfqq. If the device does start to serve all or</div><div class='add'>+ * part of the injected requests during the service hole, then,</div><div class='add'>+ * because of this extra service, it may delay the next invocation of</div><div class='add'>+ * the dispatch hook of BFQ. Then, even after R gets eventually</div><div class='add'>+ * dispatched, the device may delay the actual service of R if it is</div><div class='add'>+ * still busy serving the extra requests, or if it decides to serve,</div><div class='add'>+ * before R, some extra request still present in its queues. As a</div><div class='add'>+ * conclusion, the cumulative extra delay caused by injection can be</div><div class='add'>+ * easily evaluated by just comparing the total service time of first</div><div class='add'>+ * requests with and without injection.</div><div class='add'>+ *</div><div class='add'>+ * The limit-update algorithm works as follows. On the arrival of a</div><div class='add'>+ * first request of bfqq, the algorithm measures the total time of the</div><div class='add'>+ * request only if one of the three cases below holds, and, for each</div><div class='add'>+ * case, it updates the limit as described below:</div><div class='add'>+ *</div><div class='add'>+ * (1) If there is no in-flight request. This gives a baseline for the</div><div class='add'>+ *     total service time of the requests of bfqq. If the baseline has</div><div class='add'>+ *     not been computed yet, then, after computing it, the limit is</div><div class='add'>+ *     set to 1, to start boosting throughput, and to prepare the</div><div class='add'>+ *     ground for the next case. If the baseline has already been</div><div class='add'>+ *     computed, then it is updated, in case it results to be lower</div><div class='add'>+ *     than the previous value.</div><div class='add'>+ *</div><div class='add'>+ * (2) If the limit is higher than 0 and there are in-flight</div><div class='add'>+ *     requests. By comparing the total service time in this case with</div><div class='add'>+ *     the above baseline, it is possible to know at which extent the</div><div class='add'>+ *     current value of the limit is inflating the total service</div><div class='add'>+ *     time. If the inflation is below a certain threshold, then bfqq</div><div class='add'>+ *     is assumed to be suffering from no perceivable loss of its</div><div class='add'>+ *     service guarantees, and the limit is even tentatively</div><div class='add'>+ *     increased. If the inflation is above the threshold, then the</div><div class='add'>+ *     limit is decreased. Due to the lack of any hysteresis, this</div><div class='add'>+ *     logic makes the limit oscillate even in steady workload</div><div class='add'>+ *     conditions. Yet we opted for it, because it is fast in reaching</div><div class='add'>+ *     the best value for the limit, as a function of the current I/O</div><div class='add'>+ *     workload. To reduce oscillations, this step is disabled for a</div><div class='add'>+ *     short time interval after the limit happens to be decreased.</div><div class='add'>+ *</div><div class='add'>+ * (3) Periodically, after resetting the limit, to make sure that the</div><div class='add'>+ *     limit eventually drops in case the workload changes. This is</div><div class='add'>+ *     needed because, after the limit has gone safely up for a</div><div class='add'>+ *     certain workload, it is impossible to guess whether the</div><div class='add'>+ *     baseline total service time may have changed, without measuring</div><div class='add'>+ *     it again without injection. A more effective version of this</div><div class='add'>+ *     step might be to just sample the baseline, by interrupting</div><div class='add'>+ *     injection only once, and then to reset/lower the limit only if</div><div class='add'>+ *     the total service time with the current limit does happen to be</div><div class='add'>+ *     too large.</div><div class='add'>+ *</div><div class='add'>+ * More details on each step are provided in the comments on the</div><div class='add'>+ * pieces of code that implement these steps: the branch handling the</div><div class='add'>+ * transition from empty to non empty in bfq_add_request(), the branch</div><div class='add'>+ * handling injection in bfq_select_queue(), and the function</div><div class='add'>+ * bfq_choose_bfqq_for_injection(). These comments also explain some</div><div class='add'>+ * exceptions, made by the injection mechanism in some special cases.</div><div class='add'>+ */</div><div class='add'>+static void bfq_update_inject_limit(struct bfq_data *bfqd,</div><div class='add'>+				    struct bfq_queue *bfqq)</div><div class='add'>+{</div><div class='add'>+	u64 tot_time_ns = ktime_get_ns() - bfqd-&gt;last_empty_occupied_ns;</div><div class='add'>+	unsigned int old_limit = bfqq-&gt;inject_limit;</div><div class='add'>+</div><div class='add'>+	if (bfqq-&gt;last_serv_time_ns &gt; 0) {</div><div class='add'>+		u64 threshold = (bfqq-&gt;last_serv_time_ns * 3)&gt;&gt;1;</div><div class='add'>+</div><div class='add'>+		if (tot_time_ns &gt;= threshold &amp;&amp; old_limit &gt; 0) {</div><div class='add'>+			bfqq-&gt;inject_limit--;</div><div class='add'>+			bfqq-&gt;decrease_time_jif = jiffies;</div><div class='add'>+		} else if (tot_time_ns &lt; threshold &amp;&amp;</div><div class='add'>+			   old_limit &lt; bfqd-&gt;max_rq_in_driver&lt;&lt;1)</div><div class='add'>+			bfqq-&gt;inject_limit++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Either we still have to compute the base value for the</div><div class='add'>+	 * total service time, and there seem to be the right</div><div class='add'>+	 * conditions to do it, or we can lower the last base value</div><div class='add'>+	 * computed.</div><div class='add'>+	 */</div><div class='add'>+	if ((bfqq-&gt;last_serv_time_ns == 0 &amp;&amp; bfqd-&gt;rq_in_driver == 0) ||</div><div class='add'>+	    tot_time_ns &lt; bfqq-&gt;last_serv_time_ns) {</div><div class='add'>+		bfqq-&gt;last_serv_time_ns = tot_time_ns;</div><div class='add'>+		/*</div><div class='add'>+		 * Now we certainly have a base value: make sure we</div><div class='add'>+		 * start trying injection.</div><div class='add'>+		 */</div><div class='add'>+		bfqq-&gt;inject_limit = max_t(unsigned int, 1, old_limit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update complete, not waiting for any request completion any longer */</div><div class='add'>+	bfqd-&gt;waited_rq = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Handle either a requeue or a finish for rq. The things to do are</div><div class='ctx'>  * the same in both cases: all references to rq are to be dropped. In</div><div class='ctx'>  * particular, rq is considered completed from the point of view of</div><div class='hunk'>@@ -4994,6 +5456,9 @@ static void bfq_finish_requeue_request(struct request *rq)</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;bfqd-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+		if (rq == bfqd-&gt;waited_rq)</div><div class='add'>+			bfq_update_inject_limit(bfqd, bfqq);</div><div class='add'>+</div><div class='ctx'> 		bfq_completed_request(bfqq, bfqd);</div><div class='ctx'> 		bfq_finish_requeue_request_body(bfqq);</div><div class='ctx'> </div><div class='hunk'>@@ -5157,7 +5622,7 @@ static void bfq_prepare_request(struct request *rq, struct bio *bio)</div><div class='ctx'>  * preparation is that, after the prepare_request hook is invoked for</div><div class='ctx'>  * rq, rq may still be transformed into a request with no icq, i.e., a</div><div class='ctx'>  * request not associated with any queue. No bfq hook is invoked to</div><div class='del'>- * signal this tranformation. As a consequence, should these</div><div class='add'>+ * signal this transformation. As a consequence, should these</div><div class='ctx'>  * preparation operations be performed when the prepare_request hook</div><div class='ctx'>  * is invoked, and should rq be transformed one moment later, bfq</div><div class='ctx'>  * would end up in an inconsistent state, because it would have</div><div class='hunk'>@@ -5248,7 +5713,29 @@ static struct bfq_queue *bfq_init_rq(struct request *rq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(bfq_bfqq_just_created(bfqq)))</div><div class='add'>+	/*</div><div class='add'>+	 * Consider bfqq as possibly belonging to a burst of newly</div><div class='add'>+	 * created queues only if:</div><div class='add'>+	 * 1) A burst is actually happening (bfqd-&gt;burst_size &gt; 0)</div><div class='add'>+	 * or</div><div class='add'>+	 * 2) There is no other active queue. In fact, if, in</div><div class='add'>+	 *    contrast, there are active queues not belonging to the</div><div class='add'>+	 *    possible burst bfqq may belong to, then there is no gain</div><div class='add'>+	 *    in considering bfqq as belonging to a burst, and</div><div class='add'>+	 *    therefore in not weight-raising bfqq. See comments on</div><div class='add'>+	 *    bfq_handle_burst().</div><div class='add'>+	 *</div><div class='add'>+	 * This filtering also helps eliminating false positives,</div><div class='add'>+	 * occurring when bfqq does not belong to an actual large</div><div class='add'>+	 * burst, but some background task (e.g., a service) happens</div><div class='add'>+	 * to trigger the creation of new queues very close to when</div><div class='add'>+	 * bfqq and its possible companion queues are created. See</div><div class='add'>+	 * comments on bfq_handle_burst() for further details also on</div><div class='add'>+	 * this issue.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(bfq_bfqq_just_created(bfqq) &amp;&amp;</div><div class='add'>+		     (bfqd-&gt;burst_size &gt; 0 ||</div><div class='add'>+		      bfq_tot_busy_queues(bfqd) == 0)))</div><div class='ctx'> 		bfq_handle_burst(bfqd, bfqq);</div><div class='ctx'> </div><div class='ctx'> 	return bfqq;</div><div class='hunk'>@@ -5397,7 +5884,7 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd,</div><div class='ctx'> 	return min_shallow;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bfq_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int index)</div><div class='add'>+static void bfq_depth_updated(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bfq_data *bfqd = hctx-&gt;queue-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> 	struct blk_mq_tags *tags = hctx-&gt;sched_tags;</div><div class='hunk'>@@ -5405,6 +5892,11 @@ static int bfq_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int index)</div><div class='ctx'> </div><div class='ctx'> 	min_shallow = bfq_update_depths(bfqd, &amp;tags-&gt;bitmap_tags);</div><div class='ctx'> 	sbitmap_queue_min_shallow_depth(&amp;tags-&gt;bitmap_tags, min_shallow);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bfq_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int index)</div><div class='add'>+{</div><div class='add'>+	bfq_depth_updated(hctx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5503,7 +5995,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)</div><div class='ctx'> 		     HRTIMER_MODE_REL);</div><div class='ctx'> 	bfqd-&gt;idle_slice_timer.function = bfq_idle_slice_timer;</div><div class='ctx'> </div><div class='del'>-	bfqd-&gt;queue_weights_tree = RB_ROOT;</div><div class='add'>+	bfqd-&gt;queue_weights_tree = RB_ROOT_CACHED;</div><div class='ctx'> 	bfqd-&gt;num_groups_with_pending_reqs = 0;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bfqd-&gt;active_list);</div><div class='hunk'>@@ -5511,6 +6003,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;bfqd-&gt;burst_list);</div><div class='ctx'> </div><div class='ctx'> 	bfqd-&gt;hw_tag = -1;</div><div class='add'>+	bfqd-&gt;nonrot_with_queueing = blk_queue_nonrot(bfqd-&gt;queue);</div><div class='ctx'> </div><div class='ctx'> 	bfqd-&gt;bfq_max_budget = bfq_default_max_budget;</div><div class='ctx'> </div><div class='hunk'>@@ -5827,6 +6320,7 @@ static struct elevator_type iosched_bfq_mq = {</div><div class='ctx'> 		.requests_merged	= bfq_requests_merged,</div><div class='ctx'> 		.request_merged		= bfq_request_merged,</div><div class='ctx'> 		.has_work		= bfq_has_work,</div><div class='add'>+		.depth_updated		= bfq_depth_updated,</div><div class='ctx'> 		.init_hctx		= bfq_init_hctx,</div><div class='ctx'> 		.init_sched		= bfq_init_queue,</div><div class='ctx'> 		.exit_sched		= bfq_exit_queue,</div><div class='head'>diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h<br/>index 062e1c4787f4..c2faa77824f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-iosched.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-iosched.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-iosched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bfq-iosched.h</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * Header file for the BFQ I/O scheduler: data structures and</div><div class='ctx'>  * prototypes of interface functions among BFQ components.</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; either version 2 of the</div><div class='del'>- *  License, or (at your option) any later version.</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 GNU</div><div class='del'>- *  General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _BFQ_H</div><div class='ctx'> #define _BFQ_H</div><div class='hunk'>@@ -32,6 +23,8 @@</div><div class='ctx'> #define BFQ_DEFAULT_GRP_IOPRIO	0</div><div class='ctx'> #define BFQ_DEFAULT_GRP_CLASS	IOPRIO_CLASS_BE</div><div class='ctx'> </div><div class='add'>+#define MAX_PID_STR_LENGTH 12</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Soft real-time applications are extremely more latency sensitive</div><div class='ctx'>  * than interactive ones. Over-raise the weight of the former to</div><div class='hunk'>@@ -89,7 +82,7 @@ struct bfq_service_tree {</div><div class='ctx'>  * expiration. This peculiar definition allows for the following</div><div class='ctx'>  * optimization, not yet exploited: while a given entity is still in</div><div class='ctx'>  * service, we already know which is the best candidate for next</div><div class='del'>- * service among the other active entitities in the same parent</div><div class='add'>+ * service among the other active entities in the same parent</div><div class='ctx'>  * entity. We can then quickly compare the timestamps of the</div><div class='ctx'>  * in-service entity with those of such best candidate.</div><div class='ctx'>  *</div><div class='hunk'>@@ -140,7 +133,7 @@ struct bfq_weight_counter {</div><div class='ctx'>  *</div><div class='ctx'>  * Unless cgroups are used, the weight value is calculated from the</div><div class='ctx'>  * ioprio to export the same interface as CFQ.  When dealing with</div><div class='del'>- * ``well-behaved'' queues (i.e., queues that do not spend too much</div><div class='add'>+ * "well-behaved" queues (i.e., queues that do not spend too much</div><div class='ctx'>  * time to consume their budget and have true sequential behavior, and</div><div class='ctx'>  * when there are no external factors breaking anticipation) the</div><div class='ctx'>  * relative weights at each level of the cgroups hierarchy should be</div><div class='hunk'>@@ -240,6 +233,13 @@ struct bfq_queue {</div><div class='ctx'> 	/* next ioprio and ioprio class if a change is in progress */</div><div class='ctx'> 	unsigned short new_ioprio, new_ioprio_class;</div><div class='ctx'> </div><div class='add'>+	/* last total-service-time sample, see bfq_update_inject_limit() */</div><div class='add'>+	u64 last_serv_time_ns;</div><div class='add'>+	/* limit for request injection */</div><div class='add'>+	unsigned int inject_limit;</div><div class='add'>+	/* last time the inject limit has been decreased, in jiffies */</div><div class='add'>+	unsigned long decrease_time_jif;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Shared bfq_queue if queue is cooperating with one or more</div><div class='ctx'> 	 * other queues.</div><div class='hunk'>@@ -357,29 +357,6 @@ struct bfq_queue {</div><div class='ctx'> </div><div class='ctx'> 	/* max service rate measured so far */</div><div class='ctx'> 	u32 max_service_rate;</div><div class='del'>-	/*</div><div class='del'>-	 * Ratio between the service received by bfqq while it is in</div><div class='del'>-	 * service, and the cumulative service (of requests of other</div><div class='del'>-	 * queues) that may be injected while bfqq is empty but still</div><div class='del'>-	 * in service. To increase precision, the coefficient is</div><div class='del'>-	 * measured in tenths of unit. Here are some example of (1)</div><div class='del'>-	 * ratios, (2) resulting percentages of service injected</div><div class='del'>-	 * w.r.t. to the total service dispatched while bfqq is in</div><div class='del'>-	 * service, and (3) corresponding values of the coefficient:</div><div class='del'>-	 * 1 (50%) -&gt; 10</div><div class='del'>-	 * 2 (33%) -&gt; 20</div><div class='del'>-	 * 10 (9%) -&gt; 100</div><div class='del'>-	 * 9.9 (9%) -&gt; 99</div><div class='del'>-	 * 1.5 (40%) -&gt; 15</div><div class='del'>-	 * 0.5 (66%) -&gt; 5</div><div class='del'>-	 * 0.1 (90%) -&gt; 1</div><div class='del'>-	 *</div><div class='del'>-	 * So, if the coefficient is lower than 10, then</div><div class='del'>-	 * injected service is more than bfqq service.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int inject_coeff;</div><div class='del'>-	/* amount of service injected in current service slot */</div><div class='del'>-	unsigned int injected_service;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -419,6 +396,15 @@ struct bfq_io_cq {</div><div class='ctx'> 	bool was_in_burst_list;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Save the weight when a merge occurs, to be able</div><div class='add'>+	 * to restore it in case of split. If the weight is not</div><div class='add'>+	 * correctly resumed when the queue is recycled,</div><div class='add'>+	 * then the weight of the recycled queue could differ</div><div class='add'>+	 * from the weight of the original queue.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int saved_weight;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Similar to previous fields: save wr information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long saved_wr_coeff;</div><div class='hunk'>@@ -450,7 +436,7 @@ struct bfq_data {</div><div class='ctx'> 	 * weight-raised @bfq_queue (see the comments to the functions</div><div class='ctx'> 	 * bfq_weights_tree_[add|remove] for further details).</div><div class='ctx'> 	 */</div><div class='del'>-	struct rb_root queue_weights_tree;</div><div class='add'>+	struct rb_root_cached queue_weights_tree;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Number of groups with at least one descendant process that</div><div class='hunk'>@@ -513,6 +499,9 @@ struct bfq_data {</div><div class='ctx'> 	/* number of requests dispatched and waiting for completion */</div><div class='ctx'> 	int rq_in_driver;</div><div class='ctx'> </div><div class='add'>+	/* true if the device is non rotational and performs queueing */</div><div class='add'>+	bool nonrot_with_queueing;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Maximum number of requests in driver in the last</div><div class='ctx'> 	 * @hw_tag_samples completed requests.</div><div class='hunk'>@@ -544,6 +533,26 @@ struct bfq_data {</div><div class='ctx'> 	/* time of last request completion (ns) */</div><div class='ctx'> 	u64 last_completion;</div><div class='ctx'> </div><div class='add'>+	/* time of last transition from empty to non-empty (ns) */</div><div class='add'>+	u64 last_empty_occupied_ns;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Flag set to activate the sampling of the total service time</div><div class='add'>+	 * of a just-arrived first I/O request (see</div><div class='add'>+	 * bfq_update_inject_limit()). This will cause the setting of</div><div class='add'>+	 * waited_rq when the request is finally dispatched.</div><div class='add'>+	 */</div><div class='add'>+	bool wait_dispatch;</div><div class='add'>+	/*</div><div class='add'>+	 *  If set, then bfq_update_inject_limit() is invoked when</div><div class='add'>+	 *  waited_rq is eventually completed.</div><div class='add'>+	 */</div><div class='add'>+	struct request *waited_rq;</div><div class='add'>+	/*</div><div class='add'>+	 * True if some request has been injected during the last service hole.</div><div class='add'>+	 */</div><div class='add'>+	bool rqs_injected;</div><div class='add'>+</div><div class='ctx'> 	/* time of first rq dispatch in current observation interval (ns) */</div><div class='ctx'> 	u64 first_dispatch;</div><div class='ctx'> 	/* time of last rq dispatch in current observation interval (ns) */</div><div class='hunk'>@@ -553,6 +562,7 @@ struct bfq_data {</div><div class='ctx'> 	ktime_t last_budget_start;</div><div class='ctx'> 	/* beginning of the last idle slice */</div><div class='ctx'> 	ktime_t last_idling_start;</div><div class='add'>+	unsigned long last_idling_start_jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/* number of samples in current observation interval */</div><div class='ctx'> 	int peak_rate_samples;</div><div class='hunk'>@@ -898,10 +908,10 @@ void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync);</div><div class='ctx'> struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic);</div><div class='ctx'> void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq);</div><div class='ctx'> void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='del'>-			  struct rb_root *root);</div><div class='add'>+			  struct rb_root_cached *root);</div><div class='ctx'> void __bfq_weights_tree_remove(struct bfq_data *bfqd,</div><div class='ctx'> 			       struct bfq_queue *bfqq,</div><div class='del'>-			       struct rb_root *root);</div><div class='add'>+			       struct rb_root_cached *root);</div><div class='ctx'> void bfq_weights_tree_remove(struct bfq_data *bfqd,</div><div class='ctx'> 			     struct bfq_queue *bfqq);</div><div class='ctx'> void bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='hunk'>@@ -995,7 +1005,7 @@ bool __bfq_deactivate_entity(struct bfq_entity *entity,</div><div class='ctx'> 			     bool ins_into_idle_tree);</div><div class='ctx'> bool next_queue_may_preempt(struct bfq_data *bfqd);</div><div class='ctx'> struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd);</div><div class='del'>-void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd);</div><div class='add'>+bool __bfq_bfqd_reset_in_service(struct bfq_data *bfqd);</div><div class='ctx'> void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='ctx'> 			 bool ins_into_idle_tree, bool expiration);</div><div class='ctx'> void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);</div><div class='hunk'>@@ -1008,13 +1018,23 @@ void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq);</div><div class='ctx'> /* --------------- end of interface of B-WF2Q+ ---------------- */</div><div class='ctx'> </div><div class='ctx'> /* Logging facilities. */</div><div class='add'>+static inline void bfq_pid_to_str(int pid, char *str, int len)</div><div class='add'>+{</div><div class='add'>+	if (pid != -1)</div><div class='add'>+		snprintf(str, len, "%d", pid);</div><div class='add'>+	else</div><div class='add'>+		snprintf(str, len, "SHARED-");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BFQ_GROUP_IOSCHED</div><div class='ctx'> struct bfq_group *bfqq_group(struct bfq_queue *bfqq);</div><div class='ctx'> </div><div class='ctx'> #define bfq_log_bfqq(bfqd, bfqq, fmt, args...)	do {			\</div><div class='add'>+	char pid_str[MAX_PID_STR_LENGTH];	\</div><div class='add'>+	bfq_pid_to_str((bfqq)-&gt;pid, pid_str, MAX_PID_STR_LENGTH);	\</div><div class='ctx'> 	blk_add_cgroup_trace_msg((bfqd)-&gt;queue,				\</div><div class='ctx'> 			bfqg_to_blkg(bfqq_group(bfqq))-&gt;blkcg,		\</div><div class='del'>-			"bfq%d%c " fmt, (bfqq)-&gt;pid,			\</div><div class='add'>+			"bfq%s%c " fmt, pid_str,			\</div><div class='ctx'> 			bfq_bfqq_sync((bfqq)) ? 'S' : 'A', ##args);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -1025,10 +1045,13 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_BFQ_GROUP_IOSCHED */</div><div class='ctx'> </div><div class='del'>-#define bfq_log_bfqq(bfqd, bfqq, fmt, args...)	\</div><div class='del'>-	blk_add_trace_msg((bfqd)-&gt;queue, "bfq%d%c " fmt, (bfqq)-&gt;pid,	\</div><div class='add'>+#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) do {	\</div><div class='add'>+	char pid_str[MAX_PID_STR_LENGTH];	\</div><div class='add'>+	bfq_pid_to_str((bfqq)-&gt;pid, pid_str, MAX_PID_STR_LENGTH);	\</div><div class='add'>+	blk_add_trace_msg((bfqd)-&gt;queue, "bfq%s%c " fmt, pid_str,	\</div><div class='ctx'> 			bfq_bfqq_sync((bfqq)) ? 'S' : 'A',		\</div><div class='del'>-				##args)</div><div class='add'>+				##args);	\</div><div class='add'>+} while (0)</div><div class='ctx'> #define bfq_log_bfqg(bfqd, bfqg, fmt, args...)		do {} while (0)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_BFQ_GROUP_IOSCHED */</div><div class='head'>diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c<br/>index 63311d1ff1ed..c9ba225081ce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-wf2q.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bfq-wf2q.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bfq-wf2q.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bfq-wf2q.c</a></div><div class='hunk'>@@ -1,19 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Hierarchical Budget Worst-case Fair Weighted Fair Queueing</div><div class='ctx'>  * (B-WF2Q+): hierarchical scheduling algorithm by which the BFQ I/O</div><div class='ctx'>  * scheduler schedules generic entities. The latter can represent</div><div class='ctx'>  * either single bfq queues (associated with processes) or groups of</div><div class='ctx'>  * bfq queues (associated with cgroups).</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; either version 2 of the</div><div class='del'>- *  License, or (at your option) any later version.</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 GNU</div><div class='del'>- *  General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> #include "bfq-iosched.h"</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +50,7 @@ static bool bfq_update_parent_budget(struct bfq_entity *next_in_service);</div><div class='ctx'>  * bfq_update_next_in_service - update sd-&gt;next_in_service</div><div class='ctx'>  * @sd: sched_data for which to perform the update.</div><div class='ctx'>  * @new_entity: if not NULL, pointer to the entity whose activation,</div><div class='del'>- *		requeueing or repositionig triggered the invocation of</div><div class='add'>+ *		requeueing or repositioning triggered the invocation of</div><div class='ctx'>  *		this function.</div><div class='ctx'>  * @expiration: id true, this function is being invoked after the</div><div class='ctx'>  *             expiration of the in-service entity</div><div class='hunk'>@@ -90,7 +81,7 @@ static bool bfq_update_next_in_service(struct bfq_sched_data *sd,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If this update is triggered by the activation, requeueing</div><div class='del'>-	 * or repositiong of an entity that does not coincide with</div><div class='add'>+	 * or repositioning of an entity that does not coincide with</div><div class='ctx'> 	 * sd-&gt;next_in_service, then a full lookup in the active tree</div><div class='ctx'> 	 * can be avoided. In fact, it is enough to check whether the</div><div class='ctx'> 	 * just-modified entity has the same priority as</div><div class='hunk'>@@ -737,7 +728,7 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,</div><div class='ctx'> 		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);</div><div class='ctx'> 		unsigned int prev_weight, new_weight;</div><div class='ctx'> 		struct bfq_data *bfqd = NULL;</div><div class='del'>-		struct rb_root *root;</div><div class='add'>+		struct rb_root_cached *root;</div><div class='ctx'> #ifdef CONFIG_BFQ_GROUP_IOSCHED</div><div class='ctx'> 		struct bfq_sched_data *sd;</div><div class='ctx'> 		struct bfq_group *bfqg;</div><div class='hunk'>@@ -1012,7 +1003,7 @@ static void __bfq_activate_entity(struct bfq_entity *entity,</div><div class='ctx'> 		entity-&gt;on_st = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef BFQ_GROUP_IOSCHED_ENABLED</div><div class='add'>+#ifdef CONFIG_BFQ_GROUP_IOSCHED</div><div class='ctx'> 	if (!bfq_entity_to_bfqq(entity)) { /* bfq_group */</div><div class='ctx'> 		struct bfq_group *bfqg =</div><div class='ctx'> 			container_of(entity, struct bfq_group, entity);</div><div class='hunk'>@@ -1396,7 +1387,7 @@ left:</div><div class='ctx'>  * In this first case, update the virtual time in @st too (see the</div><div class='ctx'>  * comments on this update inside the function).</div><div class='ctx'>  *</div><div class='del'>- * In constrast, if there is an in-service entity, then return the</div><div class='add'>+ * In contrast, if there is an in-service entity, then return the</div><div class='ctx'>  * entity that would be set in service if not only the above</div><div class='ctx'>  * conditions, but also the next one held true: the currently</div><div class='ctx'>  * in-service entity, on expiration,</div><div class='hunk'>@@ -1479,12 +1470,12 @@ static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,</div><div class='ctx'> 		 * is being invoked as a part of the expiration path</div><div class='ctx'> 		 * of the in-service queue. In this case, even if</div><div class='ctx'> 		 * sd-&gt;in_service_entity is not NULL,</div><div class='del'>-		 * sd-&gt;in_service_entiy at this point is actually not</div><div class='add'>+		 * sd-&gt;in_service_entity at this point is actually not</div><div class='ctx'> 		 * in service any more, and, if needed, has already</div><div class='ctx'> 		 * been properly queued or requeued into the right</div><div class='ctx'> 		 * tree. The reason why sd-&gt;in_service_entity is still</div><div class='ctx'> 		 * not NULL here, even if expiration is true, is that</div><div class='del'>-		 * sd-&gt;in_service_entiy is reset as a last step in the</div><div class='add'>+		 * sd-&gt;in_service_entity is reset as a last step in the</div><div class='ctx'> 		 * expiration path. So, if expiration is true, tell</div><div class='ctx'> 		 * __bfq_lookup_next_entity that there is no</div><div class='ctx'> 		 * sd-&gt;in_service_entity.</div><div class='hunk'>@@ -1605,7 +1596,8 @@ struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd)</div><div class='ctx'> 	return bfqq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)</div><div class='add'>+/* returns true if the in-service queue gets freed */</div><div class='add'>+bool __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bfq_queue *in_serv_bfqq = bfqd-&gt;in_service_queue;</div><div class='ctx'> 	struct bfq_entity *in_serv_entity = &amp;in_serv_bfqq-&gt;entity;</div><div class='hunk'>@@ -1629,8 +1621,20 @@ void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)</div><div class='ctx'> 	 * service tree either, then release the service reference to</div><div class='ctx'> 	 * the queue it represents (taken with bfq_get_entity).</div><div class='ctx'> 	 */</div><div class='del'>-	if (!in_serv_entity-&gt;on_st)</div><div class='add'>+	if (!in_serv_entity-&gt;on_st) {</div><div class='add'>+		/*</div><div class='add'>+		 * If no process is referencing in_serv_bfqq any</div><div class='add'>+		 * longer, then the service reference may be the only</div><div class='add'>+		 * reference to the queue. If this is the case, then</div><div class='add'>+		 * bfqq gets freed here.</div><div class='add'>+		 */</div><div class='add'>+		int ref = in_serv_bfqq-&gt;ref;</div><div class='ctx'> 		bfq_put_queue(in_serv_bfqq);</div><div class='add'>+		if (ref == 1)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,</div><div class='head'>diff --git a/block/bio-integrity.c b/block/bio-integrity.c<br/>index 1b633a3526d4..42536674020a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bio-integrity.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bio-integrity.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bio-integrity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bio-integrity.c</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * bio-integrity.c - bio data integrity extensions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007, 2008, 2009 Oracle Corporation</div><div class='ctx'>  * Written by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;</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 version</div><div class='del'>- * 2 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; see the file COPYING.  If not, write to</div><div class='del'>- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='head'>diff --git a/block/bio.c b/block/bio.c<br/>index 71a78d9fb8b7..683cbb40f051 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bio.c</a></div><div class='hunk'>@@ -1,19 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2001 Jens Axboe &lt;axboe@kernel.dk&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'>- * 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 Licens</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='hunk'>@@ -647,25 +634,72 @@ struct bio *bio_clone_fast(struct bio *bio, gfp_t gfp_mask, struct bio_set *bs)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_clone_fast);</div><div class='ctx'> </div><div class='add'>+static inline bool page_is_mergeable(const struct bio_vec *bv,</div><div class='add'>+		struct page *page, unsigned int len, unsigned int off,</div><div class='add'>+		bool same_page)</div><div class='add'>+{</div><div class='add'>+	phys_addr_t vec_end_addr = page_to_phys(bv-&gt;bv_page) +</div><div class='add'>+		bv-&gt;bv_offset + bv-&gt;bv_len - 1;</div><div class='add'>+	phys_addr_t page_addr = page_to_phys(page);</div><div class='add'>+</div><div class='add'>+	if (vec_end_addr + 1 != page_addr + off)</div><div class='add'>+		return false;</div><div class='add'>+	if (xen_domain() &amp;&amp; !xen_biovec_phys_mergeable(bv, page))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if ((vec_end_addr &amp; PAGE_MASK) != page_addr) {</div><div class='add'>+		if (same_page)</div><div class='add'>+			return false;</div><div class='add'>+		if (pfn_to_page(PFN_DOWN(vec_end_addr)) + 1 != page)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(same_page &amp;&amp; (len + off) &gt; PAGE_SIZE);</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'>+ * Check if the @page can be added to the current segment(@bv), and make</div><div class='add'>+ * sure to call it only if page_is_mergeable(@bv, @page) is true</div><div class='add'>+ */</div><div class='add'>+static bool can_add_page_to_seg(struct request_queue *q,</div><div class='add'>+		struct bio_vec *bv, struct page *page, unsigned len,</div><div class='add'>+		unsigned offset)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = queue_segment_boundary(q);</div><div class='add'>+	phys_addr_t addr1 = page_to_phys(bv-&gt;bv_page) + bv-&gt;bv_offset;</div><div class='add'>+	phys_addr_t addr2 = page_to_phys(page) + offset + len - 1;</div><div class='add'>+</div><div class='add'>+	if ((addr1 | mask) != (addr2 | mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (bv-&gt;bv_len + len &gt; queue_max_segment_size(q))</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='ctx'> /**</div><div class='del'>- *	bio_add_pc_page	-	attempt to add page to bio</div><div class='add'>+ *	__bio_add_pc_page	- attempt to add page to passthrough bio</div><div class='ctx'>  *	@q: the target queue</div><div class='ctx'>  *	@bio: destination bio</div><div class='ctx'>  *	@page: page to add</div><div class='ctx'>  *	@len: vec entry length</div><div class='ctx'>  *	@offset: vec entry offset</div><div class='add'>+ *	@put_same_page: put the page if it is same with last added page</div><div class='ctx'>  *</div><div class='ctx'>  *	Attempt to add a page to the bio_vec maplist. This can fail for a</div><div class='ctx'>  *	number of reasons, such as the bio being full or target block device</div><div class='ctx'>  *	limitations. The target block device must allow bio's up to PAGE_SIZE,</div><div class='ctx'>  *	so it is always possible to add a single page to an empty bio.</div><div class='ctx'>  *</div><div class='del'>- *	This should only be used by REQ_PC bios.</div><div class='add'>+ *	This should only be used by passthrough bios.</div><div class='ctx'>  */</div><div class='del'>-int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page</div><div class='del'>-		    *page, unsigned int len, unsigned int offset)</div><div class='add'>+static int __bio_add_pc_page(struct request_queue *q, struct bio *bio,</div><div class='add'>+		struct page *page, unsigned int len, unsigned int offset,</div><div class='add'>+		bool put_same_page)</div><div class='ctx'> {</div><div class='del'>-	int retried_segments = 0;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -677,18 +711,14 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page</div><div class='ctx'> 	if (((bio-&gt;bi_iter.bi_size + len) &gt;&gt; 9) &gt; queue_max_hw_sectors(q))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For filesystems with a blocksize smaller than the pagesize</div><div class='del'>-	 * we will often be called with the same page as last time and</div><div class='del'>-	 * a consecutive offset.  Optimize this special case.</div><div class='del'>-	 */</div><div class='ctx'> 	if (bio-&gt;bi_vcnt &gt; 0) {</div><div class='del'>-		struct bio_vec *prev = &amp;bio-&gt;bi_io_vec[bio-&gt;bi_vcnt - 1];</div><div class='add'>+		bvec = &amp;bio-&gt;bi_io_vec[bio-&gt;bi_vcnt - 1];</div><div class='ctx'> </div><div class='del'>-		if (page == prev-&gt;bv_page &amp;&amp;</div><div class='del'>-		    offset == prev-&gt;bv_offset + prev-&gt;bv_len) {</div><div class='del'>-			prev-&gt;bv_len += len;</div><div class='del'>-			bio-&gt;bi_iter.bi_size += len;</div><div class='add'>+		if (page == bvec-&gt;bv_page &amp;&amp;</div><div class='add'>+		    offset == bvec-&gt;bv_offset + bvec-&gt;bv_len) {</div><div class='add'>+			if (put_same_page)</div><div class='add'>+				put_page(page);</div><div class='add'>+			bvec-&gt;bv_len += len;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -696,63 +726,47 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page</div><div class='ctx'> 		 * If the queue doesn't support SG gaps and adding this</div><div class='ctx'> 		 * offset would create a gap, disallow it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (bvec_gap_to_prev(q, prev, offset))</div><div class='add'>+		if (bvec_gap_to_prev(q, bvec, offset))</div><div class='ctx'> 			return 0;</div><div class='add'>+</div><div class='add'>+		if (page_is_mergeable(bvec, page, len, offset, false) &amp;&amp;</div><div class='add'>+		    can_add_page_to_seg(q, bvec, page, len, offset)) {</div><div class='add'>+			bvec-&gt;bv_len += len;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bio_full(bio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * setup the new entry, we might clear it again later if we</div><div class='del'>-	 * cannot add the page</div><div class='del'>-	 */</div><div class='add'>+	if (bio-&gt;bi_phys_segments &gt;= queue_max_segments(q))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	bvec = &amp;bio-&gt;bi_io_vec[bio-&gt;bi_vcnt];</div><div class='ctx'> 	bvec-&gt;bv_page = page;</div><div class='ctx'> 	bvec-&gt;bv_len = len;</div><div class='ctx'> 	bvec-&gt;bv_offset = offset;</div><div class='ctx'> 	bio-&gt;bi_vcnt++;</div><div class='del'>-	bio-&gt;bi_phys_segments++;</div><div class='del'>-	bio-&gt;bi_iter.bi_size += len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Perform a recount if the number of segments is greater</div><div class='del'>-	 * than queue_max_segments(q).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	while (bio-&gt;bi_phys_segments &gt; queue_max_segments(q)) {</div><div class='del'>-</div><div class='del'>-		if (retried_segments)</div><div class='del'>-			goto failed;</div><div class='del'>-</div><div class='del'>-		retried_segments = 1;</div><div class='del'>-		blk_recount_segments(q, bio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we may be able to merge these biovecs, force a recount */</div><div class='del'>-	if (bio-&gt;bi_vcnt &gt; 1 &amp;&amp; biovec_phys_mergeable(q, bvec - 1, bvec))</div><div class='del'>-		bio_clear_flag(bio, BIO_SEG_VALID);</div><div class='del'>-</div><div class='ctx'>  done:</div><div class='add'>+	bio-&gt;bi_iter.bi_size += len;</div><div class='add'>+	bio-&gt;bi_phys_segments = bio-&gt;bi_vcnt;</div><div class='add'>+	bio_set_flag(bio, BIO_SEG_VALID);</div><div class='ctx'> 	return len;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>- failed:</div><div class='del'>-	bvec-&gt;bv_page = NULL;</div><div class='del'>-	bvec-&gt;bv_len = 0;</div><div class='del'>-	bvec-&gt;bv_offset = 0;</div><div class='del'>-	bio-&gt;bi_vcnt--;</div><div class='del'>-	bio-&gt;bi_iter.bi_size -= len;</div><div class='del'>-	blk_recount_segments(q, bio);</div><div class='del'>-	return 0;</div><div class='add'>+int bio_add_pc_page(struct request_queue *q, struct bio *bio,</div><div class='add'>+		struct page *page, unsigned int len, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return __bio_add_pc_page(q, bio, page, len, offset, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_add_pc_page);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __bio_try_merge_page - try appending data to an existing bvec.</div><div class='ctx'>  * @bio: destination bio</div><div class='del'>- * @page: page to add</div><div class='add'>+ * @page: start page to add</div><div class='ctx'>  * @len: length of the data to add</div><div class='del'>- * @off: offset of the data in @page</div><div class='add'>+ * @off: offset of the data relative to @page</div><div class='ctx'>  * @same_page: if %true only merge if the new data is in the same physical</div><div class='ctx'>  *		page as the last segment of the bio.</div><div class='ctx'>  *</div><div class='hunk'>@@ -760,6 +774,8 @@ EXPORT_SYMBOL(bio_add_pc_page);</div><div class='ctx'>  * a useful optimisation for file systems with a block size smaller than the</div><div class='ctx'>  * page size.</div><div class='ctx'>  *</div><div class='add'>+ * Warn if (@len, @off) crosses pages in case that @same_page is true.</div><div class='add'>+ *</div><div class='ctx'>  * Return %true on success or %false on failure.</div><div class='ctx'>  */</div><div class='ctx'> bool __bio_try_merge_page(struct bio *bio, struct page *page,</div><div class='hunk'>@@ -770,29 +786,23 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,</div><div class='ctx'> </div><div class='ctx'> 	if (bio-&gt;bi_vcnt &gt; 0) {</div><div class='ctx'> 		struct bio_vec *bv = &amp;bio-&gt;bi_io_vec[bio-&gt;bi_vcnt - 1];</div><div class='del'>-		phys_addr_t vec_end_addr = page_to_phys(bv-&gt;bv_page) +</div><div class='del'>-			bv-&gt;bv_offset + bv-&gt;bv_len - 1;</div><div class='del'>-		phys_addr_t page_addr = page_to_phys(page);</div><div class='del'>-</div><div class='del'>-		if (vec_end_addr + 1 != page_addr + off)</div><div class='del'>-			return false;</div><div class='del'>-		if (same_page &amp;&amp; (vec_end_addr &amp; PAGE_MASK) != page_addr)</div><div class='del'>-			return false;</div><div class='ctx'> </div><div class='del'>-		bv-&gt;bv_len += len;</div><div class='del'>-		bio-&gt;bi_iter.bi_size += len;</div><div class='del'>-		return true;</div><div class='add'>+		if (page_is_mergeable(bv, page, len, off, same_page)) {</div><div class='add'>+			bv-&gt;bv_len += len;</div><div class='add'>+			bio-&gt;bi_iter.bi_size += len;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__bio_try_merge_page);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __bio_add_page - add page to a bio in a new segment</div><div class='add'>+ * __bio_add_page - add page(s) to a bio in a new segment</div><div class='ctx'>  * @bio: destination bio</div><div class='del'>- * @page: page to add</div><div class='del'>- * @len: length of the data to add</div><div class='del'>- * @off: offset of the data in @page</div><div class='add'>+ * @page: start page to add</div><div class='add'>+ * @len: length of the data to add, may cross pages</div><div class='add'>+ * @off: offset of the data relative to @page, may cross pages</div><div class='ctx'>  *</div><div class='ctx'>  * Add the data at @page + @off to @bio as a new bvec.  The caller must ensure</div><div class='ctx'>  * that @bio has space for another bvec.</div><div class='hunk'>@@ -815,13 +825,13 @@ void __bio_add_page(struct bio *bio, struct page *page,</div><div class='ctx'> EXPORT_SYMBOL_GPL(__bio_add_page);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	bio_add_page	-	attempt to add page to bio</div><div class='add'>+ *	bio_add_page	-	attempt to add page(s) to bio</div><div class='ctx'>  *	@bio: destination bio</div><div class='del'>- *	@page: page to add</div><div class='del'>- *	@len: vec entry length</div><div class='del'>- *	@offset: vec entry offset</div><div class='add'>+ *	@page: start page to add</div><div class='add'>+ *	@len: vec entry length, may cross pages</div><div class='add'>+ *	@offset: vec entry offset relative to @page, may cross pages</div><div class='ctx'>  *</div><div class='del'>- *	Attempt to add a page to the bio_vec maplist. This will only fail</div><div class='add'>+ *	Attempt to add page(s) to the bio_vec maplist. This will only fail</div><div class='ctx'>  *	if either bio-&gt;bi_vcnt == bio-&gt;bi_max_vecs or it's a cloned bio.</div><div class='ctx'>  */</div><div class='ctx'> int bio_add_page(struct bio *bio, struct page *page,</div><div class='hunk'>@@ -836,6 +846,24 @@ int bio_add_page(struct bio *bio, struct page *page,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_add_page);</div><div class='ctx'> </div><div class='add'>+static void bio_get_pages(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct bvec_iter_all iter_all;</div><div class='add'>+	struct bio_vec *bvec;</div><div class='add'>+</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all)</div><div class='add'>+		get_page(bvec-&gt;bv_page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bio_release_pages(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct bvec_iter_all iter_all;</div><div class='add'>+	struct bio_vec *bvec;</div><div class='add'>+</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all)</div><div class='add'>+		put_page(bvec-&gt;bv_page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bio_vec *bv = iter-&gt;bvec;</div><div class='hunk'>@@ -848,26 +876,10 @@ static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'> 	len = min_t(size_t, bv-&gt;bv_len - iter-&gt;iov_offset, iter-&gt;count);</div><div class='ctx'> 	size = bio_add_page(bio, bv-&gt;bv_page, len,</div><div class='ctx'> 				bv-&gt;bv_offset + iter-&gt;iov_offset);</div><div class='del'>-	if (size == len) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For the normal O_DIRECT case, we could skip grabbing this</div><div class='del'>-		 * reference and then not have to put them again when IO</div><div class='del'>-		 * completes. But this breaks some in-kernel users, like</div><div class='del'>-		 * splicing to/from a loop device, where we release the pipe</div><div class='del'>-		 * pages unconditionally. If we can fix that case, we can</div><div class='del'>-		 * get rid of the get here and the need to call</div><div class='del'>-		 * bio_release_pages() at IO completion time.</div><div class='del'>-		 */</div><div class='del'>-		mp_bvec_for_each_page(page, bv, i)</div><div class='del'>-			get_page(page);</div><div class='del'>-		iov_iter_advance(iter, size);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	if (unlikely(size != len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	iov_iter_advance(iter, size);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PAGE_PTRS_PER_BVEC     (sizeof(struct bio_vec) / sizeof(struct page *))</div><div class='hunk'>@@ -925,10 +937,12 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'>  * This takes either an iterator pointing to user memory, or one pointing to</div><div class='ctx'>  * kernel pages (BVEC iterator). If we're adding user pages, we pin them and</div><div class='ctx'>  * map them into the kernel. On IO completion, the caller should put those</div><div class='del'>- * pages. For now, when adding kernel pages, we still grab a reference to the</div><div class='del'>- * page. This isn't strictly needed for the common case, but some call paths</div><div class='del'>- * end up releasing pages from eg a pipe and we can't easily control these.</div><div class='del'>- * See comment in __bio_iov_bvec_add_pages().</div><div class='add'>+ * pages. If we're adding kernel pages, and the caller told us it's safe to</div><div class='add'>+ * do so, we just have to add the pages to the bio directly. We don't grab an</div><div class='add'>+ * extra reference to those pages (the user should already have that), and we</div><div class='add'>+ * don't put the page on IO completion. The caller needs to check if the bio is</div><div class='add'>+ * flagged BIO_NO_PAGE_REF on IO completion. If it isn't, then pages should be</div><div class='add'>+ * released.</div><div class='ctx'>  *</div><div class='ctx'>  * The function tries, but does not guarantee, to pin as many pages as</div><div class='ctx'>  * fit into the bio, or are requested in *iter, whatever is smaller. If</div><div class='hunk'>@@ -938,22 +952,24 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'> int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	const bool is_bvec = iov_iter_is_bvec(iter);</div><div class='del'>-	unsigned short orig_vcnt = bio-&gt;bi_vcnt;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		int ret;</div><div class='add'>+	if (WARN_ON_ONCE(bio-&gt;bi_vcnt))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	do {</div><div class='ctx'> 		if (is_bvec)</div><div class='ctx'> 			ret = __bio_iov_bvec_add_pages(bio, iter);</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = __bio_iov_iter_get_pages(bio, iter);</div><div class='add'>+	} while (!ret &amp;&amp; iov_iter_count(iter) &amp;&amp; !bio_full(bio));</div><div class='ctx'> </div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			return bio-&gt;bi_vcnt &gt; orig_vcnt ? 0 : ret;</div><div class='add'>+	if (iov_iter_bvec_no_ref(iter))</div><div class='add'>+		bio_set_flag(bio, BIO_NO_PAGE_REF);</div><div class='add'>+	else if (is_bvec)</div><div class='add'>+		bio_get_pages(bio);</div><div class='ctx'> </div><div class='del'>-	} while (iov_iter_count(iter) &amp;&amp; !bio_full(bio));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return bio-&gt;bi_vcnt ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void submit_bio_wait_endio(struct bio *bio)</div><div class='hunk'>@@ -1124,11 +1140,10 @@ static struct bio_map_data *bio_alloc_map_data(struct iov_iter *data,</div><div class='ctx'>  */</div><div class='ctx'> static int bio_copy_from_iter(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 		ret = copy_page_from_iter(bvec-&gt;bv_page,</div><div class='hunk'>@@ -1156,11 +1171,10 @@ static int bio_copy_from_iter(struct bio *bio, struct iov_iter *iter)</div><div class='ctx'>  */</div><div class='ctx'> static int bio_copy_to_iter(struct bio *bio, struct iov_iter iter)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 		ret = copy_page_to_iter(bvec-&gt;bv_page,</div><div class='hunk'>@@ -1181,10 +1195,9 @@ static int bio_copy_to_iter(struct bio *bio, struct iov_iter iter)</div><div class='ctx'> void bio_free_pages(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all)</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all)</div><div class='ctx'> 		__free_page(bvec-&gt;bv_page);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_free_pages);</div><div class='hunk'>@@ -1295,8 +1308,11 @@ struct bio *bio_copy_user_iov(struct request_queue *q,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (bio_add_pc_page(q, bio, page, bytes, offset) &lt; bytes)</div><div class='add'>+		if (bio_add_pc_page(q, bio, page, bytes, offset) &lt; bytes) {</div><div class='add'>+			if (!map_data)</div><div class='add'>+				__free_page(page);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		len -= bytes;</div><div class='ctx'> 		offset = 0;</div><div class='hunk'>@@ -1382,21 +1398,14 @@ struct bio *bio_map_user_iov(struct request_queue *q,</div><div class='ctx'> 			for (j = 0; j &lt; npages; j++) {</div><div class='ctx'> 				struct page *page = pages[j];</div><div class='ctx'> 				unsigned int n = PAGE_SIZE - offs;</div><div class='del'>-				unsigned short prev_bi_vcnt = bio-&gt;bi_vcnt;</div><div class='ctx'> </div><div class='ctx'> 				if (n &gt; bytes)</div><div class='ctx'> 					n = bytes;</div><div class='ctx'> </div><div class='del'>-				if (!bio_add_pc_page(q, bio, page, n, offs))</div><div class='add'>+				if (!__bio_add_pc_page(q, bio, page, n, offs,</div><div class='add'>+							true))</div><div class='ctx'> 					break;</div><div class='ctx'> </div><div class='del'>-				/*</div><div class='del'>-				 * check if vector was merged with previous</div><div class='del'>-				 * drop page reference if needed</div><div class='del'>-				 */</div><div class='del'>-				if (bio-&gt;bi_vcnt == prev_bi_vcnt)</div><div class='del'>-					put_page(page);</div><div class='del'>-</div><div class='ctx'> 				added += n;</div><div class='ctx'> 				bytes -= n;</div><div class='ctx'> 				offs = 0;</div><div class='hunk'>@@ -1426,7 +1435,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,</div><div class='ctx'> 	return bio;</div><div class='ctx'> </div><div class='ctx'>  out_unmap:</div><div class='del'>-	bio_for_each_segment_all(bvec, bio, j, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		put_page(bvec-&gt;bv_page);</div><div class='ctx'> 	}</div><div class='ctx'> 	bio_put(bio);</div><div class='hunk'>@@ -1436,13 +1445,12 @@ struct bio *bio_map_user_iov(struct request_queue *q,</div><div class='ctx'> static void __bio_unmap_user(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * make sure we dirty pages we wrote to</div><div class='ctx'> 	 */</div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		if (bio_data_dir(bio) == READ)</div><div class='ctx'> 			set_page_dirty_lock(bvec-&gt;bv_page);</div><div class='ctx'> </div><div class='hunk'>@@ -1533,10 +1541,9 @@ static void bio_copy_kern_endio_read(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	char *p = bio-&gt;bi_private;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		memcpy(p, page_address(bvec-&gt;bv_page), bvec-&gt;bv_len);</div><div class='ctx'> 		p += bvec-&gt;bv_len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1644,25 +1651,14 @@ cleanup:</div><div class='ctx'> void bio_set_pages_dirty(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		if (!PageCompound(bvec-&gt;bv_page))</div><div class='ctx'> 			set_page_dirty_lock(bvec-&gt;bv_page);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bio_release_pages(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	int i;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='del'>-</div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all)</div><div class='del'>-		put_page(bvec-&gt;bv_page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * bio_check_pages_dirty() will check that all the BIO's pages are still dirty.</div><div class='ctx'>  * If they are, then fine.  If, however, some pages are clean then they must</div><div class='hunk'>@@ -1696,7 +1692,8 @@ static void bio_dirty_fn(struct work_struct *work)</div><div class='ctx'> 		next = bio-&gt;bi_private;</div><div class='ctx'> </div><div class='ctx'> 		bio_set_pages_dirty(bio);</div><div class='del'>-		bio_release_pages(bio);</div><div class='add'>+		if (!bio_flagged(bio, BIO_NO_PAGE_REF))</div><div class='add'>+			bio_release_pages(bio);</div><div class='ctx'> 		bio_put(bio);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1705,15 +1702,15 @@ void bio_check_pages_dirty(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		if (!PageDirty(bvec-&gt;bv_page) &amp;&amp; !PageCompound(bvec-&gt;bv_page))</div><div class='ctx'> 			goto defer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bio_release_pages(bio);</div><div class='add'>+	if (!bio_flagged(bio, BIO_NO_PAGE_REF))</div><div class='add'>+		bio_release_pages(bio);</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> 	return;</div><div class='ctx'> defer:</div><div class='hunk'>@@ -2195,6 +2192,9 @@ static int __init init_bio(void)</div><div class='ctx'> 	bio_slab_nr = 0;</div><div class='ctx'> 	bio_slabs = kcalloc(bio_slab_max, sizeof(struct bio_slab),</div><div class='ctx'> 			    GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(BIO_FLAG_LAST &gt; BVEC_POOL_OFFSET);</div><div class='add'>+</div><div class='ctx'> 	if (!bio_slabs)</div><div class='ctx'> 		panic("bio: can't allocate bios\n");</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c<br/>index 77f37ef8ef06..b97b479e4f64 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-cgroup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-cgroup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-cgroup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-cgroup.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Common Block IO controller cgroup interface</div><div class='ctx'>  *</div><div class='hunk'>@@ -1736,8 +1737,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blkcg_schedule_throttle - this task needs to check for throttling</div><div class='del'>- * @q - the request queue IO was submitted on</div><div class='del'>- * @use_memdelay - do we charge this to memory delay for PSI</div><div class='add'>+ * @q: the request queue IO was submitted on</div><div class='add'>+ * @use_memdelay: do we charge this to memory delay for PSI</div><div class='ctx'>  *</div><div class='ctx'>  * This is called by the IO controller when we know there's delay accumulated</div><div class='ctx'>  * for the blkg for this task.  We do not pass the blkg because there are places</div><div class='hunk'>@@ -1769,8 +1770,9 @@ void blkcg_schedule_throttle(struct request_queue *q, bool use_memdelay)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blkcg_add_delay - add delay to this blkg</div><div class='del'>- * @now - the current time in nanoseconds</div><div class='del'>- * @delta - how many nanoseconds of delay to add</div><div class='add'>+ * @blkg: blkg of interest</div><div class='add'>+ * @now: the current time in nanoseconds</div><div class='add'>+ * @delta: how many nanoseconds of delay to add</div><div class='ctx'>  *</div><div class='ctx'>  * Charge @delta to the blkg's current delay accumulation.  This is used to</div><div class='ctx'>  * throttle tasks if an IO controller thinks we need more throttling.</div><div class='head'>diff --git a/block/blk-core.c b/block/blk-core.c<br/>index 4673ebe42255..419d600e6637 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-core.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 1991, 1992 Linus Torvalds</div><div class='ctx'>  * Copyright (C) 1994,      Karl Keyte: Added support for disk statistics</div><div class='hunk'>@@ -232,15 +233,6 @@ void blk_sync_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	del_timer_sync(&amp;q-&gt;timeout);</div><div class='ctx'> 	cancel_work_sync(&amp;q-&gt;timeout_work);</div><div class='del'>-</div><div class='del'>-	if (queue_is_mq(q)) {</div><div class='del'>-		struct blk_mq_hw_ctx *hctx;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		cancel_delayed_work_sync(&amp;q-&gt;requeue_work);</div><div class='del'>-		queue_for_each_hw_ctx(q, hctx, i)</div><div class='del'>-			cancel_delayed_work_sync(&amp;hctx-&gt;run_work);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_sync_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -347,18 +339,6 @@ void blk_cleanup_queue(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_flag_set(QUEUE_FLAG_DEAD, q);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * make sure all in-progress dispatch are completed because</div><div class='del'>-	 * blk_freeze_queue() can only complete all requests, and</div><div class='del'>-	 * dispatch may still be in-progress since we dispatch requests</div><div class='del'>-	 * from more than one contexts.</div><div class='del'>-	 *</div><div class='del'>-	 * We rely on driver to deal with the race in case that queue</div><div class='del'>-	 * initialization isn't done.</div><div class='del'>-	 */</div><div class='del'>-	if (queue_is_mq(q) &amp;&amp; blk_queue_init_done(q))</div><div class='del'>-		blk_mq_quiesce_queue(q);</div><div class='del'>-</div><div class='ctx'> 	/* for synchronous bio-based driver finish in-flight integrity i/o */</div><div class='ctx'> 	blk_flush_integrity();</div><div class='ctx'> </div><div class='hunk'>@@ -375,7 +355,7 @@ void blk_cleanup_queue(struct request_queue *q)</div><div class='ctx'> 	blk_exit_queue(q);</div><div class='ctx'> </div><div class='ctx'> 	if (queue_is_mq(q))</div><div class='del'>-		blk_mq_free_queue(q);</div><div class='add'>+		blk_mq_exit_queue(q);</div><div class='ctx'> </div><div class='ctx'> 	percpu_ref_exit(&amp;q-&gt;q_usage_counter);</div><div class='ctx'> </div><div class='hunk'>@@ -1245,8 +1225,6 @@ static int blk_cloned_rq_check_limits(struct request_queue *q,</div><div class='ctx'>  */</div><div class='ctx'> blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	blk_qc_t unused;</div><div class='del'>-</div><div class='ctx'> 	if (blk_cloned_rq_check_limits(q, rq))</div><div class='ctx'> 		return BLK_STS_IOERR;</div><div class='ctx'> </div><div class='hunk'>@@ -1262,7 +1240,7 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *</div><div class='ctx'> 	 * bypass a potential scheduler on the bottom device for</div><div class='ctx'> 	 * insert.</div><div class='ctx'> 	 */</div><div class='del'>-	return blk_mq_try_issue_directly(rq-&gt;mq_hctx, rq, &amp;unused, true, true);</div><div class='add'>+	return blk_mq_request_issue_directly(rq, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_insert_cloned_request);</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-exec.c b/block/blk-exec.c<br/>index a34b7d918742..1db44ca0f4a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-exec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-exec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-exec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-exec.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Functions related to setting various queue properties from drivers</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/blk-flush.c b/block/blk-flush.c<br/>index 6e0f2d97fc6d..aedd9320e605 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-flush.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-flush.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-flush.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-flush.c</a></div><div class='hunk'>@@ -1,11 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Functions to sequence PREFLUSH and FUA writes.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2011		Max Planck Institute for Gravitational Physics</div><div class='ctx'>  * Copyright (C) 2011		Tejun Heo &lt;tj@kernel.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='del'>- *</div><div class='ctx'>  * REQ_{PREFLUSH|FUA} requests are decomposed to sequences consisted of three</div><div class='ctx'>  * optional steps - PREFLUSH, DATA and POSTFLUSH - according to the request</div><div class='ctx'>  * properties and hardware capability.</div><div class='hunk'>@@ -220,7 +219,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)</div><div class='ctx'> 		blk_mq_tag_set_rq(hctx, flush_rq-&gt;tag, fq-&gt;orig_rq);</div><div class='ctx'> 		flush_rq-&gt;tag = -1;</div><div class='ctx'> 	} else {</div><div class='del'>-		blk_mq_put_driver_tag_hctx(hctx, flush_rq);</div><div class='add'>+		blk_mq_put_driver_tag(flush_rq);</div><div class='ctx'> 		flush_rq-&gt;internal_tag = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +323,7 @@ static void mq_flush_data_end_io(struct request *rq, blk_status_t error)</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;elevator) {</div><div class='ctx'> 		WARN_ON(rq-&gt;tag &lt; 0);</div><div class='del'>-		blk_mq_put_driver_tag_hctx(hctx, rq);</div><div class='add'>+		blk_mq_put_driver_tag(rq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/block/blk-integrity.c b/block/blk-integrity.c<br/>index d1ab089e0919..825c9c070458 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-integrity.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-integrity.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-integrity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-integrity.c</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * blk-integrity.c - Block layer data integrity extensions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007, 2008 Oracle Corporation</div><div class='ctx'>  * Written by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;</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 version</div><div class='del'>- * 2 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; see the file COPYING.  If not, write to</div><div class='del'>- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -365,6 +351,7 @@ static struct attribute *integrity_attrs[] = {</div><div class='ctx'> 	&amp;integrity_device_entry.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(integrity);</div><div class='ctx'> </div><div class='ctx'> static const struct sysfs_ops integrity_ops = {</div><div class='ctx'> 	.show	= &amp;integrity_attr_show,</div><div class='hunk'>@@ -372,7 +359,7 @@ static const struct sysfs_ops integrity_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct kobj_type integrity_ktype = {</div><div class='del'>-	.default_attrs	= integrity_attrs,</div><div class='add'>+	.default_groups = integrity_groups,</div><div class='ctx'> 	.sysfs_ops	= &amp;integrity_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c<br/>index 2620baa1f699..d22e61bced86 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-iolatency.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-iolatency.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-iolatency.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-iolatency.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Block rq-qos base io controller</div><div class='ctx'>  *</div><div class='hunk'>@@ -75,6 +76,7 @@</div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='ctx'> #include "blk-rq-qos.h"</div><div class='ctx'> #include "blk-stat.h"</div><div class='add'>+#include "blk.h"</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_SCALE_COOKIE 1000000U</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-merge.c b/block/blk-merge.c<br/>index 1c9d4f0f96ea..21e87a714a73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-merge.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-merge.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-merge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-merge.c</a></div><div class='hunk'>@@ -267,23 +267,6 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,</div><div class='ctx'> 			goto split;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (bvprvp) {</div><div class='del'>-			if (seg_size + bv.bv_len &gt; queue_max_segment_size(q))</div><div class='del'>-				goto new_segment;</div><div class='del'>-			if (!biovec_phys_mergeable(q, bvprvp, &amp;bv))</div><div class='del'>-				goto new_segment;</div><div class='del'>-</div><div class='del'>-			seg_size += bv.bv_len;</div><div class='del'>-			bvprv = bv;</div><div class='del'>-			bvprvp = &amp;bvprv;</div><div class='del'>-			sectors += bv.bv_len &gt;&gt; 9;</div><div class='del'>-</div><div class='del'>-			if (nsegs == 1 &amp;&amp; seg_size &gt; front_seg_size)</div><div class='del'>-				front_seg_size = seg_size;</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-new_segment:</div><div class='ctx'> 		if (nsegs == max_segs)</div><div class='ctx'> 			goto split;</div><div class='ctx'> </div><div class='hunk'>@@ -370,12 +353,12 @@ EXPORT_SYMBOL(blk_queue_split);</div><div class='ctx'> static unsigned int __blk_recalc_rq_segments(struct request_queue *q,</div><div class='ctx'> 					     struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec bv, bvprv = { NULL };</div><div class='del'>-	int prev = 0;</div><div class='add'>+	struct bio_vec uninitialized_var(bv), bvprv = { NULL };</div><div class='ctx'> 	unsigned int seg_size, nr_phys_segs;</div><div class='ctx'> 	unsigned front_seg_size;</div><div class='ctx'> 	struct bio *fbio, *bbio;</div><div class='ctx'> 	struct bvec_iter iter;</div><div class='add'>+	bool new_bio = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -396,7 +379,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,</div><div class='ctx'> 	nr_phys_segs = 0;</div><div class='ctx'> 	for_each_bio(bio) {</div><div class='ctx'> 		bio_for_each_bvec(bv, bio, iter) {</div><div class='del'>-			if (prev) {</div><div class='add'>+			if (new_bio) {</div><div class='ctx'> 				if (seg_size + bv.bv_len</div><div class='ctx'> 				    &gt; queue_max_segment_size(q))</div><div class='ctx'> 					goto new_segment;</div><div class='hunk'>@@ -404,7 +387,6 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,</div><div class='ctx'> 					goto new_segment;</div><div class='ctx'> </div><div class='ctx'> 				seg_size += bv.bv_len;</div><div class='del'>-				bvprv = bv;</div><div class='ctx'> </div><div class='ctx'> 				if (nr_phys_segs == 1 &amp;&amp; seg_size &gt;</div><div class='ctx'> 						front_seg_size)</div><div class='hunk'>@@ -413,12 +395,15 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> new_segment:</div><div class='del'>-			bvprv = bv;</div><div class='del'>-			prev = 1;</div><div class='ctx'> 			bvec_split_segs(q, &amp;bv, &amp;nr_phys_segs, &amp;seg_size,</div><div class='ctx'> 					&amp;front_seg_size, NULL, UINT_MAX);</div><div class='add'>+			new_bio = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		bbio = bio;</div><div class='add'>+		if (likely(bio-&gt;bi_iter.bi_size)) {</div><div class='add'>+			bvprv = bv;</div><div class='add'>+			new_bio = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fbio-&gt;bi_seg_front_size = front_seg_size;</div><div class='hunk'>@@ -484,79 +469,97 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,</div><div class='ctx'> 		struct scatterlist **sg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned nbytes = bvec-&gt;bv_len;</div><div class='del'>-	unsigned nsegs = 0, total = 0, offset = 0;</div><div class='add'>+	unsigned nsegs = 0, total = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (nbytes &gt; 0) {</div><div class='del'>-		unsigned seg_size;</div><div class='del'>-		struct page *pg;</div><div class='del'>-		unsigned idx;</div><div class='del'>-</div><div class='del'>-		*sg = blk_next_sg(sg, sglist);</div><div class='add'>+		unsigned offset = bvec-&gt;bv_offset + total;</div><div class='add'>+		unsigned len = min(get_max_segment_size(q, offset), nbytes);</div><div class='add'>+		struct page *page = bvec-&gt;bv_page;</div><div class='ctx'> </div><div class='del'>-		seg_size = get_max_segment_size(q, bvec-&gt;bv_offset + total);</div><div class='del'>-		seg_size = min(nbytes, seg_size);</div><div class='del'>-</div><div class='del'>-		offset = (total + bvec-&gt;bv_offset) % PAGE_SIZE;</div><div class='del'>-		idx = (total + bvec-&gt;bv_offset) / PAGE_SIZE;</div><div class='del'>-		pg = bvec_nth_page(bvec-&gt;bv_page, idx);</div><div class='add'>+		/*</div><div class='add'>+		 * Unfortunately a fair number of drivers barf on scatterlists</div><div class='add'>+		 * that have an offset larger than PAGE_SIZE, despite other</div><div class='add'>+		 * subsystems dealing with that invariant just fine.  For now</div><div class='add'>+		 * stick to the legacy format where we never present those from</div><div class='add'>+		 * the block layer, but the code below should be removed once</div><div class='add'>+		 * these offenders (mostly MMC/SD drivers) are fixed.</div><div class='add'>+		 */</div><div class='add'>+		page += (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		offset &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-		sg_set_page(*sg, pg, seg_size, offset);</div><div class='add'>+		*sg = blk_next_sg(sg, sglist);</div><div class='add'>+		sg_set_page(*sg, page, len, offset);</div><div class='ctx'> </div><div class='del'>-		total += seg_size;</div><div class='del'>-		nbytes -= seg_size;</div><div class='add'>+		total += len;</div><div class='add'>+		nbytes -= len;</div><div class='ctx'> 		nsegs++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return nsegs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-__blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec,</div><div class='del'>-		     struct scatterlist *sglist, struct bio_vec *bvprv,</div><div class='del'>-		     struct scatterlist **sg, int *nsegs)</div><div class='add'>+static inline int __blk_bvec_map_sg(struct bio_vec bv,</div><div class='add'>+		struct scatterlist *sglist, struct scatterlist **sg)</div><div class='add'>+{</div><div class='add'>+	*sg = blk_next_sg(sg, sglist);</div><div class='add'>+	sg_set_page(*sg, bv.bv_page, bv.bv_len, bv.bv_offset);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* only try to merge bvecs into one sg if they are from two bios */</div><div class='add'>+static inline bool</div><div class='add'>+__blk_segment_map_sg_merge(struct request_queue *q, struct bio_vec *bvec,</div><div class='add'>+			   struct bio_vec *bvprv, struct scatterlist **sg)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	int nbytes = bvec-&gt;bv_len;</div><div class='ctx'> </div><div class='del'>-	if (*sg) {</div><div class='del'>-		if ((*sg)-&gt;length + nbytes &gt; queue_max_segment_size(q))</div><div class='del'>-			goto new_segment;</div><div class='del'>-		if (!biovec_phys_mergeable(q, bvprv, bvec))</div><div class='del'>-			goto new_segment;</div><div class='add'>+	if (!*sg)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-		(*sg)-&gt;length += nbytes;</div><div class='del'>-	} else {</div><div class='del'>-new_segment:</div><div class='del'>-		if (bvec-&gt;bv_offset + bvec-&gt;bv_len &lt;= PAGE_SIZE) {</div><div class='del'>-			*sg = blk_next_sg(sg, sglist);</div><div class='del'>-			sg_set_page(*sg, bvec-&gt;bv_page, nbytes, bvec-&gt;bv_offset);</div><div class='del'>-			(*nsegs) += 1;</div><div class='del'>-		} else</div><div class='del'>-			(*nsegs) += blk_bvec_map_sg(q, bvec, sglist, sg);</div><div class='del'>-	}</div><div class='del'>-	*bvprv = *bvec;</div><div class='del'>-}</div><div class='add'>+	if ((*sg)-&gt;length + nbytes &gt; queue_max_segment_size(q))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-static inline int __blk_bvec_map_sg(struct request_queue *q, struct bio_vec bv,</div><div class='del'>-		struct scatterlist *sglist, struct scatterlist **sg)</div><div class='del'>-{</div><div class='del'>-	*sg = sglist;</div><div class='del'>-	sg_set_page(*sg, bv.bv_page, bv.bv_len, bv.bv_offset);</div><div class='del'>-	return 1;</div><div class='add'>+	if (!biovec_phys_mergeable(q, bvprv, bvec))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	(*sg)-&gt;length += nbytes;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 			     struct scatterlist *sglist,</div><div class='ctx'> 			     struct scatterlist **sg)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec bvec, bvprv = { NULL };</div><div class='add'>+	struct bio_vec uninitialized_var(bvec), bvprv = { NULL };</div><div class='ctx'> 	struct bvec_iter iter;</div><div class='ctx'> 	int nsegs = 0;</div><div class='add'>+	bool new_bio = false;</div><div class='ctx'> </div><div class='del'>-	for_each_bio(bio)</div><div class='del'>-		bio_for_each_bvec(bvec, bio, iter)</div><div class='del'>-			__blk_segment_map_sg(q, &amp;bvec, sglist, &amp;bvprv, sg,</div><div class='del'>-					     &amp;nsegs);</div><div class='add'>+	for_each_bio(bio) {</div><div class='add'>+		bio_for_each_bvec(bvec, bio, iter) {</div><div class='add'>+			/*</div><div class='add'>+			 * Only try to merge bvecs from two bios given we</div><div class='add'>+			 * have done bio internal merge when adding pages</div><div class='add'>+			 * to bio</div><div class='add'>+			 */</div><div class='add'>+			if (new_bio &amp;&amp;</div><div class='add'>+			    __blk_segment_map_sg_merge(q, &amp;bvec, &amp;bvprv, sg))</div><div class='add'>+				goto next_bvec;</div><div class='add'>+</div><div class='add'>+			if (bvec.bv_offset + bvec.bv_len &lt;= PAGE_SIZE)</div><div class='add'>+				nsegs += __blk_bvec_map_sg(bvec, sglist, sg);</div><div class='add'>+			else</div><div class='add'>+				nsegs += blk_bvec_map_sg(q, &amp;bvec, sglist, sg);</div><div class='add'>+ next_bvec:</div><div class='add'>+			new_bio = false;</div><div class='add'>+		}</div><div class='add'>+		if (likely(bio-&gt;bi_iter.bi_size)) {</div><div class='add'>+			bvprv = bvec;</div><div class='add'>+			new_bio = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return nsegs;</div><div class='ctx'> }</div><div class='hunk'>@@ -572,9 +575,9 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	int nsegs = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;rq_flags &amp; RQF_SPECIAL_PAYLOAD)</div><div class='del'>-		nsegs = __blk_bvec_map_sg(q, rq-&gt;special_vec, sglist, &amp;sg);</div><div class='add'>+		nsegs = __blk_bvec_map_sg(rq-&gt;special_vec, sglist, &amp;sg);</div><div class='ctx'> 	else if (rq-&gt;bio &amp;&amp; bio_op(rq-&gt;bio) == REQ_OP_WRITE_SAME)</div><div class='del'>-		nsegs = __blk_bvec_map_sg(q, bio_iovec(rq-&gt;bio), sglist, &amp;sg);</div><div class='add'>+		nsegs = __blk_bvec_map_sg(bio_iovec(rq-&gt;bio), sglist, &amp;sg);</div><div class='ctx'> 	else if (rq-&gt;bio)</div><div class='ctx'> 		nsegs = __blk_bios_map_sg(q, rq-&gt;bio, sglist, &amp;sg);</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c<br/>index 03a534820271..48bebf00a5f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-cpumap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-cpumap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-cpumap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-cpumap.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * CPU &lt;-&gt; hardware queue mapping helpers</div><div class='ctx'>  *</div><div class='head'>diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c<br/>index ec1d18cb643c..6aea0ebc3a73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-debugfs.c</a></div><div class='hunk'>@@ -1,17 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Facebook</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</div><div class='del'>- * License v2 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 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;https://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='head'>diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c<br/>index 1dce18553984..ad4545a2a98b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-pci.c</a></div><div class='hunk'>@@ -1,14 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2016 Christoph Hellwig.</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'>- * 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='ctx'>  */</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='head'>diff --git a/block/blk-mq-rdma.c b/block/blk-mq-rdma.c<br/>index 45030a81a1ed..cc921e6ba709 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-rdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-rdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-rdma.c</a></div><div class='hunk'>@@ -1,14 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2017 Sagi Grimberg.</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'>- * 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='ctx'>  */</div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='ctx'> #include &lt;linux/blk-mq-rdma.h&gt;</div><div class='head'>diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c<br/>index 40905539afed..74c6bb871f7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-sched.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-sched.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-sched.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * blk-mq scheduling framework</div><div class='ctx'>  *</div><div class='hunk'>@@ -413,6 +414,14 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 				  struct list_head *list, bool run_queue_async)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e;</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * blk_mq_sched_insert_requests() is called from flush plug</div><div class='add'>+	 * context only, and hold one usage counter to prevent queue</div><div class='add'>+	 * from being released.</div><div class='add'>+	 */</div><div class='add'>+	percpu_ref_get(&amp;q-&gt;q_usage_counter);</div><div class='ctx'> </div><div class='ctx'> 	e = hctx-&gt;queue-&gt;elevator;</div><div class='ctx'> 	if (e &amp;&amp; e-&gt;type-&gt;ops.insert_requests)</div><div class='hunk'>@@ -423,13 +432,17 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 		 * busy in case of 'none' scheduler, and this way may save</div><div class='ctx'> 		 * us one extra enqueue &amp; dequeue to sw queue.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!hctx-&gt;dispatch_busy &amp;&amp; !e &amp;&amp; !run_queue_async)</div><div class='add'>+		if (!hctx-&gt;dispatch_busy &amp;&amp; !e &amp;&amp; !run_queue_async) {</div><div class='ctx'> 			blk_mq_try_issue_list_directly(hctx, list);</div><div class='del'>-		else</div><div class='del'>-			blk_mq_insert_requests(hctx, ctx, list);</div><div class='add'>+			if (list_empty(list))</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		blk_mq_insert_requests(hctx, ctx, list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_run_hw_queue(hctx, run_queue_async);</div><div class='add'>+ out:</div><div class='add'>+	percpu_ref_put(&amp;q-&gt;q_usage_counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void blk_mq_sched_free_tags(struct blk_mq_tag_set *set,</div><div class='head'>diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c<br/>index 3f9c3f4ac44c..d6e1a9bd7131 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-sysfs.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</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/backing-dev.h&gt;</div><div class='hunk'>@@ -10,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include "blk.h"</div><div class='ctx'> #include "blk-mq.h"</div><div class='ctx'> #include "blk-mq-tag.h"</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +35,13 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx,</div><div class='ctx'> 						  kobj);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;hctx-&gt;run_work);</div><div class='add'>+</div><div class='add'>+	if (hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='add'>+		cleanup_srcu_struct(hctx-&gt;srcu);</div><div class='add'>+	blk_free_flush_queue(hctx-&gt;fq);</div><div class='add'>+	sbitmap_free(&amp;hctx-&gt;ctx_map);</div><div class='ctx'> 	free_cpumask_var(hctx-&gt;cpumask);</div><div class='ctx'> 	kfree(hctx-&gt;ctxs);</div><div class='ctx'> 	kfree(hctx);</div><div class='hunk'>@@ -173,10 +182,6 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct attribute *default_ctx_attrs[] = {</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_tags = {</div><div class='ctx'> 	.attr = {.name = "nr_tags", .mode = 0444 },</div><div class='ctx'> 	.show = blk_mq_hw_sysfs_nr_tags_show,</div><div class='hunk'>@@ -196,6 +201,7 @@ static struct attribute *default_hw_ctx_attrs[] = {</div><div class='ctx'> 	&amp;blk_mq_hw_sysfs_cpus.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(default_hw_ctx);</div><div class='ctx'> </div><div class='ctx'> static const struct sysfs_ops blk_mq_sysfs_ops = {</div><div class='ctx'> 	.show	= blk_mq_sysfs_show,</div><div class='hunk'>@@ -214,13 +220,12 @@ static struct kobj_type blk_mq_ktype = {</div><div class='ctx'> </div><div class='ctx'> static struct kobj_type blk_mq_ctx_ktype = {</div><div class='ctx'> 	.sysfs_ops	= &amp;blk_mq_sysfs_ops,</div><div class='del'>-	.default_attrs	= default_ctx_attrs,</div><div class='ctx'> 	.release	= blk_mq_ctx_sysfs_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct kobj_type blk_mq_hw_ktype = {</div><div class='ctx'> 	.sysfs_ops	= &amp;blk_mq_hw_sysfs_ops,</div><div class='del'>-	.default_attrs	= default_hw_ctx_attrs,</div><div class='add'>+	.default_groups = default_hw_ctx_groups,</div><div class='ctx'> 	.release	= blk_mq_hw_sysfs_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c<br/>index a4931fc7be8a..7513c8eaabee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-tag.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-tag.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-tag.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-tag.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Tag allocation using scalable bitmaps. Uses active queue tracking to support</div><div class='ctx'>  * fairer distribution of tags between multiple submitters when a shared tag map</div><div class='head'>diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c<br/>index 370827163835..75a52c18a8f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-virtio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq-virtio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq-virtio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq-virtio.c</a></div><div class='hunk'>@@ -1,14 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2016 Christoph Hellwig.</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'>- * 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='ctx'>  */</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='head'>diff --git a/block/blk-mq.c b/block/blk-mq.c<br/>index a9c181603cbd..08a6248d8536 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Block multiqueue core code</div><div class='ctx'>  *</div><div class='hunk'>@@ -59,7 +60,8 @@ static int blk_mq_poll_stats_bkt(const struct request *rq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check if any of the ctx's have pending work in this hardware queue</div><div class='add'>+ * Check if any of the ctx, dispatch list or elevator</div><div class='add'>+ * have pending work in this hardware queue.</div><div class='ctx'>  */</div><div class='ctx'> static bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -653,6 +655,13 @@ bool blk_mq_complete_request(struct request *rq)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_complete_request);</div><div class='ctx'> </div><div class='add'>+void blk_mq_complete_request_sync(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(rq-&gt;state, MQ_RQ_COMPLETE);</div><div class='add'>+	rq-&gt;q-&gt;mq_ops-&gt;complete(rq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_complete_request_sync);</div><div class='add'>+</div><div class='ctx'> int blk_mq_request_started(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	return blk_mq_rq_state(rq) != MQ_RQ_IDLE;</div><div class='hunk'>@@ -782,7 +791,6 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,</div><div class='ctx'> 	if (kick_requeue_list)</div><div class='ctx'> 		blk_mq_kick_requeue_list(q);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(blk_mq_add_to_requeue_list);</div><div class='ctx'> </div><div class='ctx'> void blk_mq_kick_requeue_list(struct request_queue *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -1072,7 +1080,13 @@ static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode,</div><div class='ctx'> 	hctx = container_of(wait, struct blk_mq_hw_ctx, dispatch_wait);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;hctx-&gt;dispatch_wait_lock);</div><div class='del'>-	list_del_init(&amp;wait-&gt;entry);</div><div class='add'>+	if (!list_empty(&amp;wait-&gt;entry)) {</div><div class='add'>+		struct sbitmap_queue *sbq;</div><div class='add'>+</div><div class='add'>+		list_del_init(&amp;wait-&gt;entry);</div><div class='add'>+		sbq = &amp;hctx-&gt;tags-&gt;bitmap_tags;</div><div class='add'>+		atomic_dec(&amp;sbq-&gt;ws_active);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;hctx-&gt;dispatch_wait_lock);</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_run_hw_queue(hctx, true);</div><div class='hunk'>@@ -1088,13 +1102,13 @@ static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode,</div><div class='ctx'> static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 				 struct request *rq)</div><div class='ctx'> {</div><div class='add'>+	struct sbitmap_queue *sbq = &amp;hctx-&gt;tags-&gt;bitmap_tags;</div><div class='ctx'> 	struct wait_queue_head *wq;</div><div class='ctx'> 	wait_queue_entry_t *wait;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(hctx-&gt;flags &amp; BLK_MQ_F_TAG_SHARED)) {</div><div class='del'>-		if (!test_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state))</div><div class='del'>-			set_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state);</div><div class='add'>+		blk_mq_sched_mark_restart_hctx(hctx);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * It's possible that a tag was freed in the window between the</div><div class='hunk'>@@ -1111,7 +1125,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	if (!list_empty_careful(&amp;wait-&gt;entry))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	wq = &amp;bt_wait_ptr(&amp;hctx-&gt;tags-&gt;bitmap_tags, hctx)-&gt;wait;</div><div class='add'>+	wq = &amp;bt_wait_ptr(sbq, hctx)-&gt;wait;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;wq-&gt;lock);</div><div class='ctx'> 	spin_lock(&amp;hctx-&gt;dispatch_wait_lock);</div><div class='hunk'>@@ -1121,6 +1135,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;sbq-&gt;ws_active);</div><div class='ctx'> 	wait-&gt;flags &amp;= ~WQ_FLAG_EXCLUSIVE;</div><div class='ctx'> 	__add_wait_queue(wq, wait);</div><div class='ctx'> </div><div class='hunk'>@@ -1141,6 +1156,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	 * someone else gets the wakeup.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_del_init(&amp;wait-&gt;entry);</div><div class='add'>+	atomic_dec(&amp;sbq-&gt;ws_active);</div><div class='ctx'> 	spin_unlock(&amp;hctx-&gt;dispatch_wait_lock);</div><div class='ctx'> 	spin_unlock_irq(&amp;wq-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1703,11 +1719,12 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)</div><div class='ctx'> 	unsigned int depth;</div><div class='ctx'> </div><div class='ctx'> 	list_splice_init(&amp;plug-&gt;mq_list, &amp;list);</div><div class='del'>-	plug-&gt;rq_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (plug-&gt;rq_count &gt; 2 &amp;&amp; plug-&gt;multiple_queues)</div><div class='ctx'> 		list_sort(NULL, &amp;list, plug_rq_cmp);</div><div class='ctx'> </div><div class='add'>+	plug-&gt;rq_count = 0;</div><div class='add'>+</div><div class='ctx'> 	this_q = NULL;</div><div class='ctx'> 	this_hctx = NULL;</div><div class='ctx'> 	this_ctx = NULL;</div><div class='hunk'>@@ -1792,74 +1809,76 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 						struct request *rq,</div><div class='ctx'> 						blk_qc_t *cookie,</div><div class='del'>-						bool bypass, bool last)</div><div class='add'>+						bool bypass_insert, bool last)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> 	bool run_queue = true;</div><div class='del'>-	blk_status_t ret = BLK_STS_RESOURCE;</div><div class='del'>-	int srcu_idx;</div><div class='del'>-	bool force = false;</div><div class='ctx'> </div><div class='del'>-	hctx_lock(hctx, &amp;srcu_idx);</div><div class='ctx'> 	/*</div><div class='del'>-	 * hctx_lock is needed before checking quiesced flag.</div><div class='add'>+	 * RCU or SRCU read lock is needed before checking quiesced flag.</div><div class='ctx'> 	 *</div><div class='del'>-	 * When queue is stopped or quiesced, ignore 'bypass', insert</div><div class='del'>-	 * and return BLK_STS_OK to caller, and avoid driver to try to</div><div class='del'>-	 * dispatch again.</div><div class='add'>+	 * When queue is stopped or quiesced, ignore 'bypass_insert' from</div><div class='add'>+	 * blk_mq_request_issue_directly(), and return BLK_STS_OK to caller,</div><div class='add'>+	 * and avoid driver to try to dispatch again.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q))) {</div><div class='add'>+	if (blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q)) {</div><div class='ctx'> 		run_queue = false;</div><div class='del'>-		bypass = false;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		bypass_insert = false;</div><div class='add'>+		goto insert;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(q-&gt;elevator &amp;&amp; !bypass))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (q-&gt;elevator &amp;&amp; !bypass_insert)</div><div class='add'>+		goto insert;</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_mq_get_dispatch_budget(hctx))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto insert;</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_mq_get_driver_tag(rq)) {</div><div class='ctx'> 		blk_mq_put_dispatch_budget(hctx);</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto insert;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Always add a request that has been through</div><div class='del'>-	 *.queue_rq() to the hardware dispatch list.</div><div class='del'>-	 */</div><div class='del'>-	force = true;</div><div class='del'>-	ret = __blk_mq_issue_directly(hctx, rq, cookie, last);</div><div class='del'>-out_unlock:</div><div class='add'>+	return __blk_mq_issue_directly(hctx, rq, cookie, last);</div><div class='add'>+insert:</div><div class='add'>+	if (bypass_insert)</div><div class='add'>+		return BLK_STS_RESOURCE;</div><div class='add'>+</div><div class='add'>+	blk_mq_request_bypass_insert(rq, run_queue);</div><div class='add'>+	return BLK_STS_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+		struct request *rq, blk_qc_t *cookie)</div><div class='add'>+{</div><div class='add'>+	blk_status_t ret;</div><div class='add'>+	int srcu_idx;</div><div class='add'>+</div><div class='add'>+	might_sleep_if(hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING);</div><div class='add'>+</div><div class='add'>+	hctx_lock(hctx, &amp;srcu_idx);</div><div class='add'>+</div><div class='add'>+	ret = __blk_mq_try_issue_directly(hctx, rq, cookie, false, true);</div><div class='add'>+	if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE)</div><div class='add'>+		blk_mq_request_bypass_insert(rq, true);</div><div class='add'>+	else if (ret != BLK_STS_OK)</div><div class='add'>+		blk_mq_end_request(rq, ret);</div><div class='add'>+</div><div class='add'>+	hctx_unlock(hctx, srcu_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last)</div><div class='add'>+{</div><div class='add'>+	blk_status_t ret;</div><div class='add'>+	int srcu_idx;</div><div class='add'>+	blk_qc_t unused_cookie;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = rq-&gt;mq_hctx;</div><div class='add'>+</div><div class='add'>+	hctx_lock(hctx, &amp;srcu_idx);</div><div class='add'>+	ret = __blk_mq_try_issue_directly(hctx, rq, &amp;unused_cookie, true, last);</div><div class='ctx'> 	hctx_unlock(hctx, srcu_idx);</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case BLK_STS_OK:</div><div class='del'>-		break;</div><div class='del'>-	case BLK_STS_DEV_RESOURCE:</div><div class='del'>-	case BLK_STS_RESOURCE:</div><div class='del'>-		if (force) {</div><div class='del'>-			blk_mq_request_bypass_insert(rq, run_queue);</div><div class='del'>-			/*</div><div class='del'>-			 * We have to return BLK_STS_OK for the DM</div><div class='del'>-			 * to avoid livelock. Otherwise, we return</div><div class='del'>-			 * the real result to indicate whether the</div><div class='del'>-			 * request is direct-issued successfully.</div><div class='del'>-			 */</div><div class='del'>-			ret = bypass ? BLK_STS_OK : ret;</div><div class='del'>-		} else if (!bypass) {</div><div class='del'>-			blk_mq_sched_insert_request(rq, false,</div><div class='del'>-						    run_queue, false);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (!bypass)</div><div class='del'>-			blk_mq_end_request(rq, ret);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1867,20 +1886,22 @@ out_unlock:</div><div class='ctx'> void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 		struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	blk_qc_t unused;</div><div class='del'>-	blk_status_t ret = BLK_STS_OK;</div><div class='del'>-</div><div class='ctx'> 	while (!list_empty(list)) {</div><div class='add'>+		blk_status_t ret;</div><div class='ctx'> 		struct request *rq = list_first_entry(list, struct request,</div><div class='ctx'> 				queuelist);</div><div class='ctx'> </div><div class='ctx'> 		list_del_init(&amp;rq-&gt;queuelist);</div><div class='del'>-		if (ret == BLK_STS_OK)</div><div class='del'>-			ret = blk_mq_try_issue_directly(hctx, rq, &amp;unused,</div><div class='del'>-							false,</div><div class='add'>+		ret = blk_mq_request_issue_directly(rq, list_empty(list));</div><div class='add'>+		if (ret != BLK_STS_OK) {</div><div class='add'>+			if (ret == BLK_STS_RESOURCE ||</div><div class='add'>+					ret == BLK_STS_DEV_RESOURCE) {</div><div class='add'>+				blk_mq_request_bypass_insert(rq,</div><div class='ctx'> 							list_empty(list));</div><div class='del'>-		else</div><div class='del'>-			blk_mq_sched_insert_request(rq, false, true, false);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			blk_mq_end_request(rq, ret);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1888,7 +1909,7 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	 * the driver there was more coming, but that turned out to</div><div class='ctx'> 	 * be a lie.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ret != BLK_STS_OK &amp;&amp; hctx-&gt;queue-&gt;mq_ops-&gt;commit_rqs)</div><div class='add'>+	if (!list_empty(list) &amp;&amp; hctx-&gt;queue-&gt;mq_ops-&gt;commit_rqs)</div><div class='ctx'> 		hctx-&gt;queue-&gt;mq_ops-&gt;commit_rqs(hctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1995,19 +2016,21 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 			plug-&gt;rq_count--;</div><div class='ctx'> 		}</div><div class='ctx'> 		blk_add_rq_to_plug(plug, rq);</div><div class='add'>+		trace_block_plug(q);</div><div class='ctx'> </div><div class='ctx'> 		blk_mq_put_ctx(data.ctx);</div><div class='ctx'> </div><div class='ctx'> 		if (same_queue_rq) {</div><div class='ctx'> 			data.hctx = same_queue_rq-&gt;mq_hctx;</div><div class='add'>+			trace_block_unplug(q, 1, true);</div><div class='ctx'> 			blk_mq_try_issue_directly(data.hctx, same_queue_rq,</div><div class='del'>-					&amp;cookie, false, true);</div><div class='add'>+					&amp;cookie);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if ((q-&gt;nr_hw_queues &gt; 1 &amp;&amp; is_sync) || (!q-&gt;elevator &amp;&amp;</div><div class='ctx'> 			!data.hctx-&gt;dispatch_busy)) {</div><div class='ctx'> 		blk_mq_put_ctx(data.ctx);</div><div class='ctx'> 		blk_mq_bio_to_request(rq, bio);</div><div class='del'>-		blk_mq_try_issue_directly(data.hctx, rq, &amp;cookie, false, true);</div><div class='add'>+		blk_mq_try_issue_directly(data.hctx, rq, &amp;cookie);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		blk_mq_put_ctx(data.ctx);</div><div class='ctx'> 		blk_mq_bio_to_request(rq, bio);</div><div class='hunk'>@@ -2040,7 +2063,7 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,</div><div class='ctx'> 		list_del_init(&amp;page-&gt;lru);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Remove kmemleak object previously allocated in</div><div class='del'>-		 * blk_mq_init_rq_map().</div><div class='add'>+		 * blk_mq_alloc_rqs().</div><div class='ctx'> 		 */</div><div class='ctx'> 		kmemleak_free(page_address(page));</div><div class='ctx'> 		__free_pages(page, page-&gt;private);</div><div class='hunk'>@@ -2245,12 +2268,11 @@ static void blk_mq_exit_hctx(struct request_queue *q,</div><div class='ctx'> 	if (set-&gt;ops-&gt;exit_hctx)</div><div class='ctx'> 		set-&gt;ops-&gt;exit_hctx(hctx, hctx_idx);</div><div class='ctx'> </div><div class='del'>-	if (hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='del'>-		cleanup_srcu_struct(hctx-&gt;srcu);</div><div class='del'>-</div><div class='ctx'> 	blk_mq_remove_cpuhp(hctx);</div><div class='del'>-	blk_free_flush_queue(hctx-&gt;fq);</div><div class='del'>-	sbitmap_free(&amp;hctx-&gt;ctx_map);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;q-&gt;unused_hctx_lock);</div><div class='add'>+	list_add(&amp;hctx-&gt;hctx_list, &amp;q-&gt;unused_hctx_list);</div><div class='add'>+	spin_unlock(&amp;q-&gt;unused_hctx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void blk_mq_exit_hw_queues(struct request_queue *q,</div><div class='hunk'>@@ -2267,15 +2289,65 @@ static void blk_mq_exit_hw_queues(struct request_queue *q,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int blk_mq_hw_ctx_size(struct blk_mq_tag_set *tag_set)</div><div class='add'>+{</div><div class='add'>+	int hw_ctx_size = sizeof(struct blk_mq_hw_ctx);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ALIGN(offsetof(struct blk_mq_hw_ctx, srcu),</div><div class='add'>+			   __alignof__(struct blk_mq_hw_ctx)) !=</div><div class='add'>+		     sizeof(struct blk_mq_hw_ctx));</div><div class='add'>+</div><div class='add'>+	if (tag_set-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='add'>+		hw_ctx_size += sizeof(struct srcu_struct);</div><div class='add'>+</div><div class='add'>+	return hw_ctx_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int blk_mq_init_hctx(struct request_queue *q,</div><div class='ctx'> 		struct blk_mq_tag_set *set,</div><div class='ctx'> 		struct blk_mq_hw_ctx *hctx, unsigned hctx_idx)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='add'>+	hctx-&gt;queue_num = hctx_idx;</div><div class='add'>+</div><div class='add'>+	cpuhp_state_add_instance_nocalls(CPUHP_BLK_MQ_DEAD, &amp;hctx-&gt;cpuhp_dead);</div><div class='add'>+</div><div class='add'>+	hctx-&gt;tags = set-&gt;tags[hctx_idx];</div><div class='add'>+</div><div class='add'>+	if (set-&gt;ops-&gt;init_hctx &amp;&amp;</div><div class='add'>+	    set-&gt;ops-&gt;init_hctx(hctx, set-&gt;driver_data, hctx_idx))</div><div class='add'>+		goto unregister_cpu_notifier;</div><div class='add'>+</div><div class='add'>+	if (blk_mq_init_request(set, hctx-&gt;fq-&gt;flush_rq, hctx_idx,</div><div class='add'>+				hctx-&gt;numa_node))</div><div class='add'>+		goto exit_hctx;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ exit_hctx:</div><div class='add'>+	if (set-&gt;ops-&gt;exit_hctx)</div><div class='add'>+		set-&gt;ops-&gt;exit_hctx(hctx, hctx_idx);</div><div class='add'>+ unregister_cpu_notifier:</div><div class='add'>+	blk_mq_remove_cpuhp(hctx);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct blk_mq_hw_ctx *</div><div class='add'>+blk_mq_alloc_hctx(struct request_queue *q, struct blk_mq_tag_set *set,</div><div class='add'>+		int node)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	gfp_t gfp = GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY;</div><div class='add'>+</div><div class='add'>+	hctx = kzalloc_node(blk_mq_hw_ctx_size(set), gfp, node);</div><div class='add'>+	if (!hctx)</div><div class='add'>+		goto fail_alloc_hctx;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var_node(&amp;hctx-&gt;cpumask, gfp, node))</div><div class='add'>+		goto free_hctx;</div><div class='ctx'> </div><div class='del'>-	node = hctx-&gt;numa_node;</div><div class='add'>+	atomic_set(&amp;hctx-&gt;nr_active, 0);</div><div class='ctx'> 	if (node == NUMA_NO_NODE)</div><div class='del'>-		node = hctx-&gt;numa_node = set-&gt;numa_node;</div><div class='add'>+		node = set-&gt;numa_node;</div><div class='add'>+	hctx-&gt;numa_node = node;</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;hctx-&gt;run_work, blk_mq_run_work_fn);</div><div class='ctx'> 	spin_lock_init(&amp;hctx-&gt;lock);</div><div class='hunk'>@@ -2283,58 +2355,47 @@ static int blk_mq_init_hctx(struct request_queue *q,</div><div class='ctx'> 	hctx-&gt;queue = q;</div><div class='ctx'> 	hctx-&gt;flags = set-&gt;flags &amp; ~BLK_MQ_F_TAG_SHARED;</div><div class='ctx'> </div><div class='del'>-	cpuhp_state_add_instance_nocalls(CPUHP_BLK_MQ_DEAD, &amp;hctx-&gt;cpuhp_dead);</div><div class='del'>-</div><div class='del'>-	hctx-&gt;tags = set-&gt;tags[hctx_idx];</div><div class='add'>+	INIT_LIST_HEAD(&amp;hctx-&gt;hctx_list);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate space for all possible cpus to avoid allocation at</div><div class='ctx'> 	 * runtime</div><div class='ctx'> 	 */</div><div class='ctx'> 	hctx-&gt;ctxs = kmalloc_array_node(nr_cpu_ids, sizeof(void *),</div><div class='del'>-			GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, node);</div><div class='add'>+			gfp, node);</div><div class='ctx'> 	if (!hctx-&gt;ctxs)</div><div class='del'>-		goto unregister_cpu_notifier;</div><div class='add'>+		goto free_cpumask;</div><div class='ctx'> </div><div class='ctx'> 	if (sbitmap_init_node(&amp;hctx-&gt;ctx_map, nr_cpu_ids, ilog2(8),</div><div class='del'>-				GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, node))</div><div class='add'>+				gfp, node))</div><div class='ctx'> 		goto free_ctxs;</div><div class='del'>-</div><div class='ctx'> 	hctx-&gt;nr_ctx = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;hctx-&gt;dispatch_wait_lock);</div><div class='ctx'> 	init_waitqueue_func_entry(&amp;hctx-&gt;dispatch_wait, blk_mq_dispatch_wake);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hctx-&gt;dispatch_wait.entry);</div><div class='ctx'> </div><div class='del'>-	if (set-&gt;ops-&gt;init_hctx &amp;&amp;</div><div class='del'>-	    set-&gt;ops-&gt;init_hctx(hctx, set-&gt;driver_data, hctx_idx))</div><div class='del'>-		goto free_bitmap;</div><div class='del'>-</div><div class='ctx'> 	hctx-&gt;fq = blk_alloc_flush_queue(q, hctx-&gt;numa_node, set-&gt;cmd_size,</div><div class='del'>-			GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY);</div><div class='add'>+			gfp);</div><div class='ctx'> 	if (!hctx-&gt;fq)</div><div class='del'>-		goto exit_hctx;</div><div class='del'>-</div><div class='del'>-	if (blk_mq_init_request(set, hctx-&gt;fq-&gt;flush_rq, hctx_idx, node))</div><div class='del'>-		goto free_fq;</div><div class='add'>+		goto free_bitmap;</div><div class='ctx'> </div><div class='ctx'> 	if (hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='ctx'> 		init_srcu_struct(hctx-&gt;srcu);</div><div class='add'>+	blk_mq_hctx_kobj_init(hctx);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return hctx;</div><div class='ctx'> </div><div class='del'>- free_fq:</div><div class='del'>-	kfree(hctx-&gt;fq);</div><div class='del'>- exit_hctx:</div><div class='del'>-	if (set-&gt;ops-&gt;exit_hctx)</div><div class='del'>-		set-&gt;ops-&gt;exit_hctx(hctx, hctx_idx);</div><div class='ctx'>  free_bitmap:</div><div class='ctx'> 	sbitmap_free(&amp;hctx-&gt;ctx_map);</div><div class='ctx'>  free_ctxs:</div><div class='ctx'> 	kfree(hctx-&gt;ctxs);</div><div class='del'>- unregister_cpu_notifier:</div><div class='del'>-	blk_mq_remove_cpuhp(hctx);</div><div class='del'>-	return -1;</div><div class='add'>+ free_cpumask:</div><div class='add'>+	free_cpumask_var(hctx-&gt;cpumask);</div><div class='add'>+ free_hctx:</div><div class='add'>+	kfree(hctx);</div><div class='add'>+ fail_alloc_hctx:</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void blk_mq_init_cpu_queues(struct request_queue *q,</div><div class='hunk'>@@ -2609,13 +2670,17 @@ static int blk_mq_alloc_ctxs(struct request_queue *q)</div><div class='ctx'>  */</div><div class='ctx'> void blk_mq_release(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx, *next;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* hctx kobj stays in hctx */</div><div class='del'>-	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='del'>-		if (!hctx)</div><div class='del'>-			continue;</div><div class='add'>+	cancel_delayed_work_sync(&amp;q-&gt;requeue_work);</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i)</div><div class='add'>+		WARN_ON_ONCE(hctx &amp;&amp; list_empty(&amp;hctx-&gt;hctx_list));</div><div class='add'>+</div><div class='add'>+	/* all hctx are in .unused_hctx_list now */</div><div class='add'>+	list_for_each_entry_safe(hctx, next, &amp;q-&gt;unused_hctx_list, hctx_list) {</div><div class='add'>+		list_del_init(&amp;hctx-&gt;hctx_list);</div><div class='ctx'> 		kobject_put(&amp;hctx-&gt;kobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2678,51 +2743,38 @@ struct request_queue *blk_mq_init_sq_queue(struct blk_mq_tag_set *set,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_init_sq_queue);</div><div class='ctx'> </div><div class='del'>-static int blk_mq_hw_ctx_size(struct blk_mq_tag_set *tag_set)</div><div class='del'>-{</div><div class='del'>-	int hw_ctx_size = sizeof(struct blk_mq_hw_ctx);</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(ALIGN(offsetof(struct blk_mq_hw_ctx, srcu),</div><div class='del'>-			   __alignof__(struct blk_mq_hw_ctx)) !=</div><div class='del'>-		     sizeof(struct blk_mq_hw_ctx));</div><div class='del'>-</div><div class='del'>-	if (tag_set-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='del'>-		hw_ctx_size += sizeof(struct srcu_struct);</div><div class='del'>-</div><div class='del'>-	return hw_ctx_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx(</div><div class='ctx'> 		struct blk_mq_tag_set *set, struct request_queue *q,</div><div class='ctx'> 		int hctx_idx, int node)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = NULL, *tmp;</div><div class='ctx'> </div><div class='del'>-	hctx = kzalloc_node(blk_mq_hw_ctx_size(set),</div><div class='del'>-			GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,</div><div class='del'>-			node);</div><div class='del'>-	if (!hctx)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!zalloc_cpumask_var_node(&amp;hctx-&gt;cpumask,</div><div class='del'>-				GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,</div><div class='del'>-				node)) {</div><div class='del'>-		kfree(hctx);</div><div class='del'>-		return NULL;</div><div class='add'>+	/* reuse dead hctx first */</div><div class='add'>+	spin_lock(&amp;q-&gt;unused_hctx_lock);</div><div class='add'>+	list_for_each_entry(tmp, &amp;q-&gt;unused_hctx_list, hctx_list) {</div><div class='add'>+		if (tmp-&gt;numa_node == node) {</div><div class='add'>+			hctx = tmp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	if (hctx)</div><div class='add'>+		list_del_init(&amp;hctx-&gt;hctx_list);</div><div class='add'>+	spin_unlock(&amp;q-&gt;unused_hctx_lock);</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;hctx-&gt;nr_active, 0);</div><div class='del'>-	hctx-&gt;numa_node = node;</div><div class='del'>-	hctx-&gt;queue_num = hctx_idx;</div><div class='add'>+	if (!hctx)</div><div class='add'>+		hctx = blk_mq_alloc_hctx(q, set, node);</div><div class='add'>+	if (!hctx)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (blk_mq_init_hctx(q, set, hctx, hctx_idx)) {</div><div class='del'>-		free_cpumask_var(hctx-&gt;cpumask);</div><div class='del'>-		kfree(hctx);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	blk_mq_hctx_kobj_init(hctx);</div><div class='add'>+	if (blk_mq_init_hctx(q, set, hctx, hctx_idx))</div><div class='add'>+		goto free_hctx;</div><div class='ctx'> </div><div class='ctx'> 	return hctx;</div><div class='add'>+</div><div class='add'>+ free_hctx:</div><div class='add'>+	kobject_put(&amp;hctx-&gt;kobj);</div><div class='add'>+ fail:</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,</div><div class='hunk'>@@ -2748,10 +2800,8 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,</div><div class='ctx'> </div><div class='ctx'> 		hctx = blk_mq_alloc_and_init_hctx(set, q, i, node);</div><div class='ctx'> 		if (hctx) {</div><div class='del'>-			if (hctxs[i]) {</div><div class='add'>+			if (hctxs[i])</div><div class='ctx'> 				blk_mq_exit_hctx(q, set, hctxs[i], i);</div><div class='del'>-				kobject_put(&amp;hctxs[i]-&gt;kobj);</div><div class='del'>-			}</div><div class='ctx'> 			hctxs[i] = hctx;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (hctxs[i])</div><div class='hunk'>@@ -2782,9 +2832,7 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,</div><div class='ctx'> 			if (hctx-&gt;tags)</div><div class='ctx'> 				blk_mq_free_map_and_requests(set, j);</div><div class='ctx'> 			blk_mq_exit_hctx(q, set, hctx, j);</div><div class='del'>-			kobject_put(&amp;hctx-&gt;kobj);</div><div class='ctx'> 			hctxs[j] = NULL;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='hunk'>@@ -2827,6 +2875,9 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,</div><div class='ctx'> 	if (!q-&gt;queue_hw_ctx)</div><div class='ctx'> 		goto err_sys_init;</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;unused_hctx_list);</div><div class='add'>+	spin_lock_init(&amp;q-&gt;unused_hctx_lock);</div><div class='add'>+</div><div class='ctx'> 	blk_mq_realloc_hw_ctxs(set, q);</div><div class='ctx'> 	if (!q-&gt;nr_hw_queues)</div><div class='ctx'> 		goto err_hctxs;</div><div class='hunk'>@@ -2857,7 +2908,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Default to classic polling</div><div class='ctx'> 	 */</div><div class='del'>-	q-&gt;poll_nsec = -1;</div><div class='add'>+	q-&gt;poll_nsec = BLK_MQ_POLL_CLASSIC;</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_init_cpu_queues(q, set-&gt;nr_hw_queues);</div><div class='ctx'> 	blk_mq_add_queue_tag_set(set, q);</div><div class='hunk'>@@ -2883,7 +2934,8 @@ err_exit:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_init_allocated_queue);</div><div class='ctx'> </div><div class='del'>-void blk_mq_free_queue(struct request_queue *q)</div><div class='add'>+/* tags can _not_ be used after returning from blk_mq_exit_queue */</div><div class='add'>+void blk_mq_exit_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_tag_set	*set = q-&gt;tag_set;</div><div class='ctx'> </div><div class='hunk'>@@ -3113,6 +3165,8 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='add'>+		if (q-&gt;elevator &amp;&amp; q-&gt;elevator-&gt;type-&gt;ops.depth_updated)</div><div class='add'>+			q-&gt;elevator-&gt;type-&gt;ops.depth_updated(hctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -3392,7 +3446,7 @@ static bool blk_mq_poll_hybrid(struct request_queue *q,</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;poll_nsec == -1)</div><div class='add'>+	if (q-&gt;poll_nsec == BLK_MQ_POLL_CLASSIC)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_qc_t_is_internal(cookie))</div><div class='head'>diff --git a/block/blk-mq.h b/block/blk-mq.h<br/>index c11353a3749d..633a5a77ee8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-mq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-mq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-mq.h</a></div><div class='hunk'>@@ -37,10 +37,12 @@ struct blk_mq_ctx {</div><div class='ctx'> 	struct kobject		kobj;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='del'>-void blk_mq_free_queue(struct request_queue *q);</div><div class='add'>+void blk_mq_exit_queue(struct request_queue *q);</div><div class='ctx'> int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);</div><div class='ctx'> void blk_mq_wake_waiters(struct request_queue *q);</div><div class='ctx'> bool blk_mq_dispatch_rq_list(struct request_queue *, struct list_head *, bool);</div><div class='add'>+void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,</div><div class='add'>+				bool kick_requeue_list);</div><div class='ctx'> void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list);</div><div class='ctx'> bool blk_mq_get_driver_tag(struct request *rq);</div><div class='ctx'> struct request *blk_mq_dequeue_from_ctx(struct blk_mq_hw_ctx *hctx,</div><div class='hunk'>@@ -68,10 +70,8 @@ void blk_mq_request_bypass_insert(struct request *rq, bool run_queue);</div><div class='ctx'> void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='ctx'> 				struct list_head *list);</div><div class='ctx'> </div><div class='del'>-blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-						struct request *rq,</div><div class='del'>-						blk_qc_t *cookie,</div><div class='del'>-						bool bypass, bool last);</div><div class='add'>+/* Used by blk_insert_cloned_request() to issue request directly */</div><div class='add'>+blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last);</div><div class='ctx'> void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 				    struct list_head *list);</div><div class='ctx'> </div><div class='hunk'>@@ -222,15 +222,6 @@ static inline void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void blk_mq_put_driver_tag_hctx(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-				       struct request *rq)</div><div class='del'>-{</div><div class='del'>-	if (rq-&gt;tag == -1 || rq-&gt;internal_tag == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__blk_mq_put_driver_tag(hctx, rq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void blk_mq_put_driver_tag(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	if (rq-&gt;tag == -1 || rq-&gt;internal_tag == -1)</div><div class='head'>diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c<br/>index d169d7188fa6..3f55b56f24bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-rq-qos.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-rq-qos.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-rq-qos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-rq-qos.c</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='ctx'> #include "blk-rq-qos.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h<br/>index 564851889550..2300e038b9fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-rq-qos.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-rq-qos.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-rq-qos.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-rq-qos.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef RQ_QOS_H</div><div class='ctx'> #define RQ_QOS_H</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-settings.c b/block/blk-settings.c<br/>index 6375afaedcec..3facc41476be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-settings.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-settings.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-settings.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-settings.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Functions related to setting various queue properties from drivers</div><div class='ctx'>  */</div><div class='hunk'>@@ -663,22 +664,6 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev,</div><div class='ctx'> EXPORT_SYMBOL(disk_stack_limits);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_queue_dma_pad - set pad mask</div><div class='del'>- * @q:     the request queue for the device</div><div class='del'>- * @mask:  pad mask</div><div class='del'>- *</div><div class='del'>- * Set dma pad mask.</div><div class='del'>- *</div><div class='del'>- * Appending pad buffer to a request modifies the last entry of a</div><div class='del'>- * scatter list such that it includes the pad buffer.</div><div class='del'>- **/</div><div class='del'>-void blk_queue_dma_pad(struct request_queue *q, unsigned int mask)</div><div class='del'>-{</div><div class='del'>-	q-&gt;dma_pad_mask = mask;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(blk_queue_dma_pad);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * blk_queue_update_dma_pad - update pad mask</div><div class='ctx'>  * @q:     the request queue for the device</div><div class='ctx'>  * @mask:  pad mask</div><div class='head'>diff --git a/block/blk-stat.c b/block/blk-stat.c<br/>index 696a04176e4d..940f15d600f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-stat.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-stat.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-stat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-stat.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Block stat tracking code</div><div class='ctx'>  *</div><div class='head'>diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c<br/>index 59685918167e..a16a02c52a85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-sysfs.c</a></div><div class='hunk'>@@ -360,8 +360,8 @@ static ssize_t queue_poll_delay_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;poll_nsec == -1)</div><div class='del'>-		val = -1;</div><div class='add'>+	if (q-&gt;poll_nsec == BLK_MQ_POLL_CLASSIC)</div><div class='add'>+		val = BLK_MQ_POLL_CLASSIC;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = q-&gt;poll_nsec / 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -380,10 +380,12 @@ static ssize_t queue_poll_delay_store(struct request_queue *q, const char *page,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (val == -1)</div><div class='del'>-		q-&gt;poll_nsec = -1;</div><div class='del'>-	else</div><div class='add'>+	if (val == BLK_MQ_POLL_CLASSIC)</div><div class='add'>+		q-&gt;poll_nsec = BLK_MQ_POLL_CLASSIC;</div><div class='add'>+	else if (val &gt;= 0)</div><div class='ctx'> 		q-&gt;poll_nsec = val * 1000;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -726,7 +728,7 @@ static struct queue_sysfs_entry throtl_sample_time_entry = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct attribute *default_attrs[] = {</div><div class='add'>+static struct attribute *queue_attrs[] = {</div><div class='ctx'> 	&amp;queue_requests_entry.attr,</div><div class='ctx'> 	&amp;queue_ra_entry.attr,</div><div class='ctx'> 	&amp;queue_max_hw_sectors_entry.attr,</div><div class='hunk'>@@ -768,6 +770,25 @@ static struct attribute *default_attrs[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static umode_t queue_attr_visible(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				int n)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q =</div><div class='add'>+		container_of(kobj, struct request_queue, kobj);</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;queue_io_timeout_entry.attr &amp;&amp;</div><div class='add'>+		(!q-&gt;mq_ops || !q-&gt;mq_ops-&gt;timeout))</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 struct attribute_group queue_attr_group = {</div><div class='add'>+	.attrs = queue_attrs,</div><div class='add'>+	.is_visible = queue_attr_visible,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define to_queue(atr) container_of((atr), struct queue_sysfs_entry, attr)</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -888,7 +909,6 @@ static const struct sysfs_ops queue_sysfs_ops = {</div><div class='ctx'> </div><div class='ctx'> struct kobj_type blk_queue_ktype = {</div><div class='ctx'> 	.sysfs_ops	= &amp;queue_sysfs_ops,</div><div class='del'>-	.default_attrs	= default_attrs,</div><div class='ctx'> 	.release	= blk_release_queue,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -937,6 +957,14 @@ int blk_register_queue(struct gendisk *disk)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = sysfs_create_group(&amp;q-&gt;kobj, &amp;queue_attr_group);</div><div class='add'>+	if (ret) {</div><div class='add'>+		blk_trace_remove_sysfs(dev);</div><div class='add'>+		kobject_del(&amp;q-&gt;kobj);</div><div class='add'>+		kobject_put(&amp;dev-&gt;kobj);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (queue_is_mq(q)) {</div><div class='ctx'> 		__blk_mq_register_dev(dev, q);</div><div class='ctx'> 		blk_mq_debugfs_register(q);</div><div class='head'>diff --git a/block/blk-timeout.c b/block/blk-timeout.c<br/>index 124c26128bf6..8aa68fae96ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-timeout.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-timeout.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-timeout.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-timeout.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Functions related to generic timeout handling of requests.</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/blk-wbt.c b/block/blk-wbt.c<br/>index fd166fbb0f65..313f45a37e9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-wbt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-wbt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-wbt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-wbt.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * buffered writeback throttling. loosely based on CoDel. We can't drop</div><div class='ctx'>  * packets for IO scheduling, so the logic is something like this:</div><div class='head'>diff --git a/block/blk-zoned.c b/block/blk-zoned.c<br/>index 2d98803faec2..ae7e91bd0618 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-zoned.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk-zoned.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk-zoned.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk-zoned.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Zoned block device handling</div><div class='ctx'>  *</div><div class='head'>diff --git a/block/blk.h b/block/blk.h<br/>index 5d636ee41663..e27fd1512e4b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/blk.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/blk.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/blk.h</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static inline bool biovec_phys_mergeable(struct request_queue *q,</div><div class='ctx'> </div><div class='ctx'> 	if (addr1 + vec1-&gt;bv_len != addr2)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (xen_domain() &amp;&amp; !xen_biovec_phys_mergeable(vec1, vec2))</div><div class='add'>+	if (xen_domain() &amp;&amp; !xen_biovec_phys_mergeable(vec1, vec2-&gt;bv_page))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if ((addr1 | mask) != ((addr2 + vec2-&gt;bv_len - 1) | mask))</div><div class='ctx'> 		return false;</div><div class='head'>diff --git a/block/bounce.c b/block/bounce.c<br/>index 47eb7e936e22..f8ed677a1bf7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bounce.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bounce.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bounce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bounce.c</a></div><div class='hunk'>@@ -163,14 +163,13 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio_orig = bio-&gt;bi_private;</div><div class='ctx'> 	struct bio_vec *bvec, orig_vec;</div><div class='del'>-	int i;</div><div class='ctx'> 	struct bvec_iter orig_iter = bio_orig-&gt;bi_iter;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * free up bounce indirect pages used</div><div class='ctx'> 	 */</div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		orig_vec = bio_iter_iovec(bio_orig, orig_iter);</div><div class='ctx'> 		if (bvec-&gt;bv_page != orig_vec.bv_page) {</div><div class='ctx'> 			dec_zone_page_state(bvec-&gt;bv_page, NR_BOUNCE);</div><div class='head'>diff --git a/block/bsg-lib.c b/block/bsg-lib.c<br/>index 005e2b75d775..b898a1cdf872 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bsg-lib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bsg-lib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bsg-lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bsg-lib.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  BSG helper library</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008   James Smart, Emulex Corporation</div><div class='ctx'>  *  Copyright (C) 2011   Red Hat, Inc.  All rights reserved.</div><div class='ctx'>  *  Copyright (C) 2011   Mike Christie</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, or</div><div class='del'>- *  (at your option) any later version.</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, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='head'>diff --git a/block/bsg.c b/block/bsg.c<br/>index f306853c6b08..833c44b3d458 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bsg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/bsg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/bsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/bsg.c</a></div><div class='hunk'>@@ -1,13 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * bsg.c - block layer implementation of the sg v4 interface</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2004 Jens Axboe &lt;axboe@suse.de&gt; SUSE Labs</div><div class='del'>- * Copyright (C) 2004 Peter M. Jones &lt;pjones@redhat.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- *  License version 2.  See the file "COPYING" in the main directory of this</div><div class='del'>- *  archive for more details.</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/init.h&gt;</div><div class='head'>diff --git a/block/elevator.c b/block/elevator.c<br/>index d6d835a08de6..ec55d5fc0b3e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/elevator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/elevator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/elevator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/elevator.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *  Block device elevator/IO-scheduler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -509,8 +510,6 @@ void elv_unregister_queue(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> int elv_register(struct elevator_type *e)</div><div class='ctx'> {</div><div class='del'>-	char *def = "";</div><div class='del'>-</div><div class='ctx'> 	/* create icq_cache if requested */</div><div class='ctx'> 	if (e-&gt;icq_size) {</div><div class='ctx'> 		if (WARN_ON(e-&gt;icq_size &lt; sizeof(struct io_cq)) ||</div><div class='hunk'>@@ -535,8 +534,8 @@ int elv_register(struct elevator_type *e)</div><div class='ctx'> 	list_add_tail(&amp;e-&gt;list, &amp;elv_list);</div><div class='ctx'> 	spin_unlock(&amp;elv_list_lock);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "io scheduler %s registered%s\n", e-&gt;elevator_name,</div><div class='del'>-								def);</div><div class='add'>+	printk(KERN_INFO "io scheduler %s registered\n", e-&gt;elevator_name);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(elv_register);</div><div class='head'>diff --git a/block/genhd.c b/block/genhd.c<br/>index 703267865f14..ad6826628e79 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/genhd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/genhd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/genhd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/genhd.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *  gendisk handling</div><div class='ctx'>  */</div><div class='hunk'>@@ -531,6 +532,18 @@ void blk_free_devt(dev_t devt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	We invalidate devt by assigning NULL pointer for devt in idr.</div><div class='add'>+ */</div><div class='add'>+void blk_invalidate_devt(dev_t devt)</div><div class='add'>+{</div><div class='add'>+	if (MAJOR(devt) == BLOCK_EXT_MAJOR) {</div><div class='add'>+		spin_lock_bh(&amp;ext_devt_lock);</div><div class='add'>+		idr_replace(&amp;ext_devt_idr, NULL, blk_mangle_minor(MINOR(devt)));</div><div class='add'>+		spin_unlock_bh(&amp;ext_devt_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static char *bdevt_str(dev_t devt, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (MAJOR(devt) &lt;= 0xff &amp;&amp; MINOR(devt) &lt;= 0xff) {</div><div class='hunk'>@@ -793,6 +806,13 @@ void del_gendisk(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> 	if (!(disk-&gt;flags &amp; GENHD_FL_HIDDEN))</div><div class='ctx'> 		blk_unregister_region(disk_devt(disk), disk-&gt;minors);</div><div class='add'>+	/*</div><div class='add'>+	 * Remove gendisk pointer from idr so that it cannot be looked up</div><div class='add'>+	 * while RCU period before freeing gendisk is running to prevent</div><div class='add'>+	 * use-after-free issues. Note that the device number stays</div><div class='add'>+	 * "in-use" until we really free the gendisk.</div><div class='add'>+	 */</div><div class='add'>+	blk_invalidate_devt(disk_devt(disk));</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(disk-&gt;part0.holder_dir);</div><div class='ctx'> 	kobject_put(disk-&gt;slave_dir);</div><div class='hunk'>@@ -1628,12 +1648,11 @@ static unsigned long disk_events_poll_jiffies(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If device-specific poll interval is set, always use it.  If</div><div class='del'>-	 * the default is being used, poll iff there are events which</div><div class='del'>-	 * can't be monitored asynchronously.</div><div class='add'>+	 * the default is being used, poll if the POLL flag is set.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ev-&gt;poll_msecs &gt;= 0)</div><div class='ctx'> 		intv_msecs = ev-&gt;poll_msecs;</div><div class='del'>-	else if (disk-&gt;events &amp; ~disk-&gt;async_events)</div><div class='add'>+	else if (disk-&gt;event_flags &amp; DISK_EVENT_FLAG_POLL)</div><div class='ctx'> 		intv_msecs = disk_events_dfl_poll_msecs;</div><div class='ctx'> </div><div class='ctx'> 	return msecs_to_jiffies(intv_msecs);</div><div class='hunk'>@@ -1843,11 +1862,13 @@ static void disk_check_events(struct disk_events *ev,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tell userland about new events.  Only the events listed in</div><div class='del'>-	 * @disk-&gt;events are reported.  Unlisted events are processed the</div><div class='del'>-	 * same internally but never get reported to userland.</div><div class='add'>+	 * @disk-&gt;events are reported, and only if DISK_EVENT_FLAG_UEVENT</div><div class='add'>+	 * is set. Otherwise, events are processed internally but never</div><div class='add'>+	 * get reported to userland.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(disk_uevents); i++)</div><div class='del'>-		if (events &amp; disk-&gt;events &amp; (1 &lt;&lt; i))</div><div class='add'>+		if ((events &amp; disk-&gt;events &amp; (1 &lt;&lt; i)) &amp;&amp;</div><div class='add'>+		    (disk-&gt;event_flags &amp; DISK_EVENT_FLAG_UEVENT))</div><div class='ctx'> 			envp[nr_events++] = disk_uevents[i];</div><div class='ctx'> </div><div class='ctx'> 	if (nr_events)</div><div class='hunk'>@@ -1860,6 +1881,7 @@ static void disk_check_events(struct disk_events *ev,</div><div class='ctx'>  *</div><div class='ctx'>  * events		: list of all supported events</div><div class='ctx'>  * events_async		: list of events which can be detected w/o polling</div><div class='add'>+ *			  (always empty, only for backwards compatibility)</div><div class='ctx'>  * events_poll_msecs	: polling interval, 0: disable, -1: system default</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t __disk_events_show(unsigned int events, char *buf)</div><div class='hunk'>@@ -1884,15 +1906,16 @@ static ssize_t disk_events_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='add'>+	if (!(disk-&gt;event_flags &amp; DISK_EVENT_FLAG_UEVENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return __disk_events_show(disk-&gt;events, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t disk_events_async_show(struct device *dev,</div><div class='ctx'> 				      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct gendisk *disk = dev_to_disk(dev);</div><div class='del'>-</div><div class='del'>-	return __disk_events_show(disk-&gt;async_events, buf);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t disk_events_poll_msecs_show(struct device *dev,</div><div class='hunk'>@@ -1901,6 +1924,9 @@ static ssize_t disk_events_poll_msecs_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='add'>+	if (!disk-&gt;ev)</div><div class='add'>+		return sprintf(buf, "-1\n");</div><div class='add'>+</div><div class='ctx'> 	return sprintf(buf, "%ld\n", disk-&gt;ev-&gt;poll_msecs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1917,6 +1943,9 @@ static ssize_t disk_events_poll_msecs_store(struct device *dev,</div><div class='ctx'> 	if (intv &lt; 0 &amp;&amp; intv != -1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (!disk-&gt;ev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	disk_block_events(disk);</div><div class='ctx'> 	disk-&gt;ev-&gt;poll_msecs = intv;</div><div class='ctx'> 	__disk_unblock_events(disk, true);</div><div class='hunk'>@@ -1981,7 +2010,7 @@ static void disk_alloc_events(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct disk_events *ev;</div><div class='ctx'> </div><div class='del'>-	if (!disk-&gt;fops-&gt;check_events)</div><div class='add'>+	if (!disk-&gt;fops-&gt;check_events || !disk-&gt;events)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ev = kzalloc(sizeof(*ev), GFP_KERNEL);</div><div class='hunk'>@@ -2003,14 +2032,14 @@ static void disk_alloc_events(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static void disk_add_events(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	if (!disk-&gt;ev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/* FIXME: error handling */</div><div class='ctx'> 	if (sysfs_create_files(&amp;disk_to_dev(disk)-&gt;kobj, disk_events_attrs) &lt; 0)</div><div class='ctx'> 		pr_warn("%s: failed to create sysfs files for events\n",</div><div class='ctx'> 			disk-&gt;disk_name);</div><div class='ctx'> </div><div class='add'>+	if (!disk-&gt;ev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;disk_events_mutex);</div><div class='ctx'> 	list_add_tail(&amp;disk-&gt;ev-&gt;node, &amp;disk_events);</div><div class='ctx'> 	mutex_unlock(&amp;disk_events_mutex);</div><div class='hunk'>@@ -2024,14 +2053,13 @@ static void disk_add_events(struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> static void disk_del_events(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	if (!disk-&gt;ev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	disk_block_events(disk);</div><div class='add'>+	if (disk-&gt;ev) {</div><div class='add'>+		disk_block_events(disk);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;disk_events_mutex);</div><div class='del'>-	list_del_init(&amp;disk-&gt;ev-&gt;node);</div><div class='del'>-	mutex_unlock(&amp;disk_events_mutex);</div><div class='add'>+		mutex_lock(&amp;disk_events_mutex);</div><div class='add'>+		list_del_init(&amp;disk-&gt;ev-&gt;node);</div><div class='add'>+		mutex_unlock(&amp;disk_events_mutex);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_files(&amp;disk_to_dev(disk)-&gt;kobj, disk_events_attrs);</div><div class='ctx'> }</div><div class='head'>diff --git a/block/ioctl.c b/block/ioctl.c<br/>index 4825c78a6baa..15a0eb80ada9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/ioctl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/ioctl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/ioctl.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='head'>diff --git a/block/ioprio.c b/block/ioprio.c<br/>index f9821080c92c..2e0559f157c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/ioprio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/ioprio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/ioprio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/ioprio.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * fs/ioprio.c</div><div class='ctx'>  *</div><div class='head'>diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c<br/>index ec6a04e01bc1..c3b05119cebd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/kyber-iosched.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/kyber-iosched.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/kyber-iosched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/kyber-iosched.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * The Kyber I/O scheduler. Controls latency by throttling queue depths using</div><div class='ctx'>  * scalable techniques.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 Facebook</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</div><div class='del'>- * License v2 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 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;https://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='head'>diff --git a/block/mq-deadline.c b/block/mq-deadline.c<br/>index 14288f864e94..1876f5712bfd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/mq-deadline.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/mq-deadline.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/mq-deadline.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/mq-deadline.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *  MQ Deadline i/o scheduler - adaptation of the legacy deadline scheduler,</div><div class='ctx'>  *  for the blk-mq scheduling framework</div><div class='head'>diff --git a/block/opal_proto.h b/block/opal_proto.h<br/>index e20be8258854..d9a05ad02eb5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/opal_proto.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/opal_proto.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/opal_proto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/opal_proto.h</a></div><div class='hunk'>@@ -1,18 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright © 2016 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  *    Rafael Antognolli &lt;rafael.antognolli@intel.com&gt;</div><div class='ctx'>  *    Scott  Bauer      &lt;scott.bauer@intel.com&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 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='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -170,6 +162,8 @@ enum opal_token {</div><div class='ctx'> 	OPAL_READLOCKED = 0x07,</div><div class='ctx'> 	OPAL_WRITELOCKED = 0x08,</div><div class='ctx'> 	OPAL_ACTIVEKEY = 0x0A,</div><div class='add'>+	/* lockingsp table */</div><div class='add'>+	OPAL_LIFECYCLE = 0x06,</div><div class='ctx'> 	/* locking info table */</div><div class='ctx'> 	OPAL_MAXRANGES = 0x04,</div><div class='ctx'> 	 /* mbr control */</div><div class='head'>diff --git a/block/partition-generic.c b/block/partition-generic.c<br/>index 8e596a8dff32..aee643ce13d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partition-generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partition-generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partition-generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partition-generic.c</a></div><div class='hunk'>@@ -285,6 +285,13 @@ void delete_partition(struct gendisk *disk, int partno)</div><div class='ctx'> 	kobject_put(part-&gt;holder_dir);</div><div class='ctx'> 	device_del(part_to_dev(part));</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Remove gendisk pointer from idr so that it cannot be looked up</div><div class='add'>+	 * while RCU period before freeing gendisk is running to prevent</div><div class='add'>+	 * use-after-free issues. Note that the device number stays</div><div class='add'>+	 * "in-use" until we really free the gendisk.</div><div class='add'>+	 */</div><div class='add'>+	blk_invalidate_devt(part_devt(part));</div><div class='ctx'> 	hd_struct_kill(part);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c<br/>index fbeb697374d5..7587700fad4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/acorn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/acorn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/acorn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/acorn.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *  linux/fs/partitions/acorn.c</div><div class='del'>- *</div><div class='ctx'>  *  Copyright (c) 1996-2000 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'>  *  Scan ADFS partitions on hard disk drives.  Unfortunately, there</div><div class='ctx'>  *  isn't a standard for partitioning drives on Acorn machines, so</div><div class='ctx'>  *  every single manufacturer of SCSI and IDE cards created their own</div><div class='head'>diff --git a/block/partitions/aix.h b/block/partitions/aix.h<br/>index e0c66a987523..b4449f0b9f2b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/aix.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/aix.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/aix.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/aix.h</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> extern int aix_partition(struct parsed_partitions *state);</div><div class='head'>diff --git a/block/partitions/amiga.h b/block/partitions/amiga.h<br/>index d094585cadaa..7e63f4d9d969 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/amiga.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/amiga.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/amiga.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/amiga.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/amiga.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/partitions/efi.c b/block/partitions/efi.c<br/>index 39f70d968754..db2fef7dfc47 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/efi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/efi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/efi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/efi.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /************************************************************</div><div class='ctx'>  * EFI GUID Partition Table handling</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  * efi.[ch] by Matt Domsch &lt;Matt_Domsch@dell.com&gt;</div><div class='ctx'>  *   Copyright 2000,2001,2002,2004 Dell Inc.</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 as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</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, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * TODO:</div><div class='ctx'>  *</div><div class='ctx'>  * Changelog:</div><div class='head'>diff --git a/block/partitions/efi.h b/block/partitions/efi.h<br/>index abd0b19288a6..3e8576157575 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/efi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/efi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/efi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/efi.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /************************************************************</div><div class='ctx'>  * EFI GUID Partition Table</div><div class='ctx'>  * Per Intel EFI Specification v1.02</div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * By Matt Domsch &lt;Matt_Domsch@dell.com&gt;  Fri Sep 22 22:15:56 CDT 2000  </div><div class='ctx'>  *   Copyright 2000,2001 Dell Inc.</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, or</div><div class='del'>- *  (at your option) any later version.</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, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- * </div><div class='ctx'>  ************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef FS_PART_EFI_H_INCLUDED</div><div class='head'>diff --git a/block/partitions/ibm.h b/block/partitions/ibm.h<br/>index 08fb0804a812..8bf13febb2b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ibm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ibm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ibm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/ibm.h</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> int ibm_partition(struct parsed_partitions *);</div><div class='head'>diff --git a/block/partitions/karma.h b/block/partitions/karma.h<br/>index c764b2e9df21..48e074d417fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/karma.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/karma.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/karma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/karma.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/karma.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c<br/>index 16766f267559..6db573f33219 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ldm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ldm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ldm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/ldm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /**</div><div class='ctx'>  * ldm - Support for Windows Logical Disk Manager (Dynamic Disks)</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,21 +7,6 @@</div><div class='ctx'>  * Copyright (C) 2001,2002 Jakob Kemi &lt;jakob.kemi@telia.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads </div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it under</div><div class='del'>- * the terms of the GNU General Public License as published by the Free Software</div><div class='del'>- * Foundation; either version 2 of the License, or (at your option) any later</div><div class='del'>- * version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='del'>- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS</div><div class='del'>- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more</div><div class='del'>- * details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along with</div><div class='del'>- * this program (in the main directory of the source in the file COPYING); if</div><div class='del'>- * not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,</div><div class='del'>- * Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h<br/>index f4c6055df956..1ca63e97bccc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ldm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ldm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ldm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/ldm.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /**</div><div class='ctx'>  * ldm - Part of the Linux-NTFS project.</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,21 +7,6 @@</div><div class='ctx'>  * Copyright (C) 2001,2002 Jakob Kemi &lt;jakob.kemi@telia.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads </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 Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- * any later version.</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 (in the main directory of the Linux-NTFS source</div><div class='del'>- * in the file COPYING); if not, write to the Free Software Foundation,</div><div class='del'>- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _FS_PT_LDM_H_</div><div class='head'>diff --git a/block/partitions/msdos.h b/block/partitions/msdos.h<br/>index 38c781c490b3..fcacfc486092 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/msdos.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/msdos.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/msdos.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/msdos.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/msdos.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/partitions/osf.h b/block/partitions/osf.h<br/>index 20ed2315ec16..4d8088e7ea8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/osf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/osf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/osf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/osf.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/osf.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/partitions/sgi.h b/block/partitions/sgi.h<br/>index b9553ebdd5a9..a5b77c3987cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/sgi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/sgi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/sgi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/sgi.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/sgi.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/partitions/sun.h b/block/partitions/sun.h<br/>index 2424baa8319f..ae1b9eed3fd7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/sun.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/sun.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/sun.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/sun.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/sun.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/partitions/sysv68.h b/block/partitions/sysv68.h<br/>index bf2f5ffa97ac..4fb6b8ec78ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/sysv68.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/sysv68.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/sysv68.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/sysv68.h</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> extern int sysv68_partition(struct parsed_partitions *state);</div><div class='head'>diff --git a/block/partitions/ultrix.h b/block/partitions/ultrix.h<br/>index a3cc00b2bded..9f676cead222 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ultrix.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/partitions/ultrix.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/partitions/ultrix.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/partitions/ultrix.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/partitions/ultrix.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c<br/>index 533f4aee8567..f5e0ad65e86a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/scsi_ioctl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/scsi_ioctl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/scsi_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/scsi_ioctl.c</a></div><div class='hunk'>@@ -1,20 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2001 Jens Axboe &lt;axboe@suse.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 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 that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *</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 Licens</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-</div><div class='del'>- *</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='head'>diff --git a/block/sed-opal.c b/block/sed-opal.c<br/>index e0de4dd448b3..a46e8d13e16d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/sed-opal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/sed-opal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/sed-opal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/sed-opal.c</a></div><div class='hunk'>@@ -1,18 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright © 2016 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  *    Scott  Bauer      &lt;scott.bauer@intel.com&gt;</div><div class='ctx'>  *    Rafael Antognolli &lt;rafael.antognolli@intel.com&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 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ":OPAL: " fmt</div><div class='hunk'>@@ -85,7 +77,6 @@ struct opal_dev {</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	sec_send_recv *send_recv;</div><div class='ctx'> </div><div class='del'>-	const struct opal_step *steps;</div><div class='ctx'> 	struct mutex dev_lock;</div><div class='ctx'> 	u16 comid;</div><div class='ctx'> 	u32 hsn;</div><div class='hunk'>@@ -157,7 +148,7 @@ static const u8 opaluid[][OPAL_UID_LENGTH] = {</div><div class='ctx'> </div><div class='ctx'> 	/* C_PIN_TABLE object ID's */</div><div class='ctx'> </div><div class='del'>-        [OPAL_C_PIN_MSID] =</div><div class='add'>+	[OPAL_C_PIN_MSID] =</div><div class='ctx'> 		{ 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x84, 0x02},</div><div class='ctx'> 	[OPAL_C_PIN_SID] =</div><div class='ctx'> 		{ 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01},</div><div class='hunk'>@@ -181,7 +172,7 @@ static const u8 opaluid[][OPAL_UID_LENGTH] = {</div><div class='ctx'>  * Derived from: TCG_Storage_Architecture_Core_Spec_v2.01_r1.00</div><div class='ctx'>  * Section: 6.3 Assigned UIDs</div><div class='ctx'>  */</div><div class='del'>-static const u8 opalmethod[][OPAL_UID_LENGTH] = {</div><div class='add'>+static const u8 opalmethod[][OPAL_METHOD_LENGTH] = {</div><div class='ctx'> 	[OPAL_PROPERTIES] =</div><div class='ctx'> 		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x01 },</div><div class='ctx'> 	[OPAL_STARTSESSION] =</div><div class='hunk'>@@ -217,6 +208,7 @@ static const u8 opalmethod[][OPAL_UID_LENGTH] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int end_opal_session_error(struct opal_dev *dev);</div><div class='add'>+static int opal_discovery0_step(struct opal_dev *dev);</div><div class='ctx'> </div><div class='ctx'> struct opal_suspend_data {</div><div class='ctx'> 	struct opal_lock_unlock unlk;</div><div class='hunk'>@@ -382,37 +374,50 @@ static void check_geometry(struct opal_dev *dev, const void *data)</div><div class='ctx'> 	dev-&gt;lowest_lba = geo-&gt;lowest_aligned_lba;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int next(struct opal_dev *dev)</div><div class='add'>+static int execute_step(struct opal_dev *dev,</div><div class='add'>+			const struct opal_step *step, size_t stepIndex)</div><div class='ctx'> {</div><div class='del'>-	const struct opal_step *step;</div><div class='del'>-	int state = 0, error = 0;</div><div class='add'>+	int error = step-&gt;fn(dev, step-&gt;data);</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		step = &amp;dev-&gt;steps[state];</div><div class='del'>-		if (!step-&gt;fn)</div><div class='del'>-			break;</div><div class='add'>+	if (error) {</div><div class='add'>+		pr_debug("Step %zu (%pS) failed with error %d: %s\n",</div><div class='add'>+			 stepIndex, step-&gt;fn, error,</div><div class='add'>+			 opal_error_to_human(error));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		error = step-&gt;fn(dev, step-&gt;data);</div><div class='del'>-		if (error) {</div><div class='del'>-			pr_debug("Error on step function: %d with error %d: %s\n",</div><div class='del'>-				 state, error,</div><div class='del'>-				 opal_error_to_human(error));</div><div class='del'>-</div><div class='del'>-			/* For each OPAL command we do a discovery0 then we</div><div class='del'>-			 * start some sort of session.</div><div class='del'>-			 * If we haven't passed state 1 then there was an error</div><div class='del'>-			 * on discovery0 or during the attempt to start a</div><div class='del'>-			 * session. Therefore we shouldn't attempt to terminate</div><div class='del'>-			 * a session, as one has not yet been created.</div><div class='del'>-			 */</div><div class='del'>-			if (state &gt; 1) {</div><div class='del'>-				end_opal_session_error(dev);</div><div class='del'>-				return error;</div><div class='del'>-			}</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		}</div><div class='del'>-		state++;</div><div class='del'>-	} while (!error);</div><div class='add'>+static int execute_steps(struct opal_dev *dev,</div><div class='add'>+			 const struct opal_step *steps, size_t n_steps)</div><div class='add'>+{</div><div class='add'>+	size_t state = 0;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	/* first do a discovery0 */</div><div class='add'>+	error = opal_discovery0_step(dev);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	for (state = 0; state &lt; n_steps; state++) {</div><div class='add'>+		error = execute_step(dev, &amp;steps[state], state);</div><div class='add'>+		if (error)</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'>+	/*</div><div class='add'>+	 * For each OPAL command the first step in steps starts some sort of</div><div class='add'>+	 * session. If an error occurred in the initial discovery0 or if an</div><div class='add'>+	 * error occurred in the first step (and thus stopping the loop with</div><div class='add'>+	 * state == 0) then there was an error before or during the attempt to</div><div class='add'>+	 * start a session. Therefore we shouldn't attempt to terminate a</div><div class='add'>+	 * session, as one has not yet been created.</div><div class='add'>+	 */</div><div class='add'>+	if (state &gt; 0)</div><div class='add'>+		end_opal_session_error(dev);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -510,15 +515,32 @@ static int opal_discovery0(struct opal_dev *dev, void *data)</div><div class='ctx'> 	return opal_discovery0_end(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_token_u8(int *err, struct opal_dev *cmd, u8 tok)</div><div class='add'>+static int opal_discovery0_step(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step discovery0_step = {</div><div class='add'>+		opal_discovery0,</div><div class='add'>+	};</div><div class='add'>+	return execute_step(dev, &amp;discovery0_step, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool can_add(int *err, struct opal_dev *cmd, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	if (*err)</div><div class='del'>-		return;</div><div class='del'>-	if (cmd-&gt;pos &gt;= IO_BUFFER_LENGTH - 1) {</div><div class='del'>-		pr_debug("Error adding u8: end of buffer.\n");</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (len &gt; IO_BUFFER_LENGTH || cmd-&gt;pos &gt; IO_BUFFER_LENGTH - len) {</div><div class='add'>+		pr_debug("Error adding %zu bytes: end of buffer.\n", len);</div><div class='ctx'> 		*err = -ERANGE;</div><div class='del'>-		return;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_token_u8(int *err, struct opal_dev *cmd, u8 tok)</div><div class='add'>+{</div><div class='add'>+	if (!can_add(err, cmd, 1))</div><div class='add'>+		return;</div><div class='ctx'> 	cmd-&gt;cmd[cmd-&gt;pos++] = tok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +573,6 @@ static void add_medium_atom_header(struct opal_dev *cmd, bool bytestring,</div><div class='ctx'> </div><div class='ctx'> static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	int msb;</div><div class='ctx'> </div><div class='hunk'>@@ -563,9 +584,8 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)</div><div class='ctx'> 	msb = fls64(number);</div><div class='ctx'> 	len = DIV_ROUND_UP(msb, 8);</div><div class='ctx'> </div><div class='del'>-	if (cmd-&gt;pos &gt;= IO_BUFFER_LENGTH - len - 1) {</div><div class='add'>+	if (!can_add(err, cmd, len + 1)) {</div><div class='ctx'> 		pr_debug("Error adding u64: end of buffer.\n");</div><div class='del'>-		*err = -ERANGE;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	add_short_atom_header(cmd, false, false, len);</div><div class='hunk'>@@ -573,24 +593,19 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)</div><div class='ctx'> 		add_token_u8(err, cmd, number &gt;&gt; (len * 8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_token_bytestring(int *err, struct opal_dev *cmd,</div><div class='del'>-				 const u8 *bytestring, size_t len)</div><div class='add'>+static u8 *add_bytestring_header(int *err, struct opal_dev *cmd, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	size_t header_len = 1;</div><div class='ctx'> 	bool is_short_atom = true;</div><div class='ctx'> </div><div class='del'>-	if (*err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (len &amp; ~SHORT_ATOM_LEN_MASK) {</div><div class='ctx'> 		header_len = 2;</div><div class='ctx'> 		is_short_atom = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (len &gt;= IO_BUFFER_LENGTH - cmd-&gt;pos - header_len) {</div><div class='add'>+	if (!can_add(err, cmd, header_len + len)) {</div><div class='ctx'> 		pr_debug("Error adding bytestring: end of buffer.\n");</div><div class='del'>-		*err = -ERANGE;</div><div class='del'>-		return;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_short_atom)</div><div class='hunk'>@@ -598,9 +613,19 @@ static void add_token_bytestring(int *err, struct opal_dev *cmd,</div><div class='ctx'> 	else</div><div class='ctx'> 		add_medium_atom_header(cmd, true, false, len);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;cmd-&gt;cmd[cmd-&gt;pos], bytestring, len);</div><div class='del'>-	cmd-&gt;pos += len;</div><div class='add'>+	return &amp;cmd-&gt;cmd[cmd-&gt;pos];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_token_bytestring(int *err, struct opal_dev *cmd,</div><div class='add'>+				 const u8 *bytestring, size_t len)</div><div class='add'>+{</div><div class='add'>+	u8 *start;</div><div class='ctx'> </div><div class='add'>+	start = add_bytestring_header(err, cmd, len);</div><div class='add'>+	if (!start)</div><div class='add'>+		return;</div><div class='add'>+	memcpy(start, bytestring, len);</div><div class='add'>+	cmd-&gt;pos += len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int build_locking_range(u8 *buffer, size_t length, u8 lr)</div><div class='hunk'>@@ -623,7 +648,7 @@ static int build_locking_range(u8 *buffer, size_t length, u8 lr)</div><div class='ctx'> static int build_locking_user(u8 *buffer, size_t length, u8 lr)</div><div class='ctx'> {</div><div class='ctx'> 	if (length &gt; OPAL_UID_LENGTH) {</div><div class='del'>-		pr_debug("Can't build locking range user, Length OOB\n");</div><div class='add'>+		pr_debug("Can't build locking range user. Length OOB\n");</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -649,6 +674,9 @@ static int cmd_finalize(struct opal_dev *cmd, u32 hsn, u32 tsn)</div><div class='ctx'> 	struct opal_header *hdr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	/* close the parameter list opened from cmd_start */</div><div class='add'>+	add_token_u8(&amp;err, cmd, OPAL_ENDLIST);</div><div class='add'>+</div><div class='ctx'> 	add_token_u8(&amp;err, cmd, OPAL_ENDOFDATA);</div><div class='ctx'> 	add_token_u8(&amp;err, cmd, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, cmd, 0);</div><div class='hunk'>@@ -687,6 +715,11 @@ static const struct opal_resp_tok *response_get_token(</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_resp_tok *tok;</div><div class='ctx'> </div><div class='add'>+	if (!resp) {</div><div class='add'>+		pr_debug("Response is NULL\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (n &gt;= resp-&gt;num) {</div><div class='ctx'> 		pr_debug("Token number doesn't exist: %d, resp: %d\n",</div><div class='ctx'> 			 n, resp-&gt;num);</div><div class='hunk'>@@ -869,27 +902,19 @@ static size_t response_get_string(const struct parsed_resp *resp, int n,</div><div class='ctx'> 				  const char **store)</div><div class='ctx'> {</div><div class='ctx'> 	u8 skip;</div><div class='del'>-	const struct opal_resp_tok *token;</div><div class='add'>+	const struct opal_resp_tok *tok;</div><div class='ctx'> </div><div class='ctx'> 	*store = NULL;</div><div class='del'>-	if (!resp) {</div><div class='del'>-		pr_debug("Response is NULL\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (n &gt;= resp-&gt;num) {</div><div class='del'>-		pr_debug("Response has %d tokens. Can't access %d\n",</div><div class='del'>-			 resp-&gt;num, n);</div><div class='add'>+	tok = response_get_token(resp, n);</div><div class='add'>+	if (IS_ERR(tok))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	token = &amp;resp-&gt;toks[n];</div><div class='del'>-	if (token-&gt;type != OPAL_DTA_TOKENID_BYTESTRING) {</div><div class='add'>+	if (tok-&gt;type != OPAL_DTA_TOKENID_BYTESTRING) {</div><div class='ctx'> 		pr_debug("Token is not a byte string!\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (token-&gt;width) {</div><div class='add'>+	switch (tok-&gt;width) {</div><div class='ctx'> 	case OPAL_WIDTH_TINY:</div><div class='ctx'> 	case OPAL_WIDTH_SHORT:</div><div class='ctx'> 		skip = 1;</div><div class='hunk'>@@ -905,37 +930,29 @@ static size_t response_get_string(const struct parsed_resp *resp, int n,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*store = token-&gt;pos + skip;</div><div class='del'>-	return token-&gt;len - skip;</div><div class='add'>+	*store = tok-&gt;pos + skip;</div><div class='add'>+	return tok-&gt;len - skip;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 response_get_u64(const struct parsed_resp *resp, int n)</div><div class='ctx'> {</div><div class='del'>-	if (!resp) {</div><div class='del'>-		pr_debug("Response is NULL\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	const struct opal_resp_tok *tok;</div><div class='ctx'> </div><div class='del'>-	if (n &gt;= resp-&gt;num) {</div><div class='del'>-		pr_debug("Response has %d tokens. Can't access %d\n",</div><div class='del'>-			 resp-&gt;num, n);</div><div class='add'>+	tok = response_get_token(resp, n);</div><div class='add'>+	if (IS_ERR(tok))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (resp-&gt;toks[n].type != OPAL_DTA_TOKENID_UINT) {</div><div class='del'>-		pr_debug("Token is not unsigned it: %d\n",</div><div class='del'>-			 resp-&gt;toks[n].type);</div><div class='add'>+	if (tok-&gt;type != OPAL_DTA_TOKENID_UINT) {</div><div class='add'>+		pr_debug("Token is not unsigned int: %d\n", tok-&gt;type);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(resp-&gt;toks[n].width == OPAL_WIDTH_TINY ||</div><div class='del'>-	      resp-&gt;toks[n].width == OPAL_WIDTH_SHORT)) {</div><div class='del'>-		pr_debug("Atom is not short or tiny: %d\n",</div><div class='del'>-			 resp-&gt;toks[n].width);</div><div class='add'>+	if (tok-&gt;width != OPAL_WIDTH_TINY &amp;&amp; tok-&gt;width != OPAL_WIDTH_SHORT) {</div><div class='add'>+		pr_debug("Atom is not short or tiny: %d\n", tok-&gt;width);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return resp-&gt;toks[n].stored.u;</div><div class='add'>+	return tok-&gt;stored.u;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool response_token_matches(const struct opal_resp_tok *token, u8 match)</div><div class='hunk'>@@ -991,6 +1008,27 @@ static void clear_opal_cmd(struct opal_dev *dev)</div><div class='ctx'> 	memset(dev-&gt;cmd, 0, IO_BUFFER_LENGTH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cmd_start(struct opal_dev *dev, const u8 *uid, const u8 *method)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, method, OPAL_METHOD_LENGTH);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Every method call is followed by its parameters enclosed within</div><div class='add'>+	 * OPAL_STARTLIST and OPAL_ENDLIST tokens. We automatically open the</div><div class='add'>+	 * parameter list here and close it later in cmd_finalize.</div><div class='add'>+	 */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int start_opal_session_cont(struct opal_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 hsn, tsn;</div><div class='hunk'>@@ -1050,24 +1088,47 @@ static int finalize_and_send(struct opal_dev *dev, cont_fn cont)</div><div class='ctx'> 	return opal_send_recv(dev, cont);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * request @column from table @table on device @dev. On success, the column</div><div class='add'>+ * data will be available in dev-&gt;resp-&gt;tok[4]</div><div class='add'>+ */</div><div class='add'>+static int generic_get_column(struct opal_dev *dev, const u8 *table,</div><div class='add'>+			      u64 column)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = cmd_start(dev, table, opalmethod[OPAL_GET]);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTCOLUMN);</div><div class='add'>+	add_token_u64(&amp;err, dev, column);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDCOLUMN);</div><div class='add'>+	add_token_u64(&amp;err, dev, column);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int gen_key(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 uid[OPAL_UID_LENGTH];</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(uid, dev-&gt;prev_data, min(sizeof(uid), dev-&gt;prev_d_len));</div><div class='ctx'> 	kfree(dev-&gt;prev_data);</div><div class='ctx'> 	dev-&gt;prev_data = NULL;</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GENKEY],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	err = cmd_start(dev, uid, opalmethod[OPAL_GENKEY]);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building gen key command\n");</div><div class='hunk'>@@ -1105,62 +1166,39 @@ static int get_active_key_cont(struct opal_dev *dev)</div><div class='ctx'> static int get_active_key(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 uid[OPAL_UID_LENGTH];</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	u8 *lr = data;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='del'>-</div><div class='ctx'> 	err = build_locking_range(uid, sizeof(uid), *lr);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GET], OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 3); /* startCloumn */</div><div class='del'>-	add_token_u8(&amp;err, dev, 10); /* ActiveKey */</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 4); /* endColumn */</div><div class='del'>-	add_token_u8(&amp;err, dev, 10); /* ActiveKey */</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_debug("Error building get active key command\n");</div><div class='add'>+	err = generic_get_column(dev, uid, OPAL_ACTIVEKEY);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return finalize_and_send(dev, get_active_key_cont);</div><div class='add'>+	return get_active_key_cont(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int generic_lr_enable_disable(struct opal_dev *dev,</div><div class='ctx'> 				     u8 *uid, bool rle, bool wle,</div><div class='ctx'> 				     bool rl, bool wl)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='add'>+	err = cmd_start(dev, uid, opalmethod[OPAL_SET]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> </div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 5); /* ReadLockEnabled */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_READLOCKENABLED);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, rle);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> </div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 6); /* WriteLockEnabled */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_WRITELOCKENABLED);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, wle);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> </div><div class='hunk'>@@ -1176,7 +1214,6 @@ static int generic_lr_enable_disable(struct opal_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1197,10 +1234,7 @@ static int setup_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> 	u8 uid[OPAL_UID_LENGTH];</div><div class='ctx'> 	struct opal_user_lr_setup *setup = data;</div><div class='ctx'> 	u8 lr;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	lr = setup-&gt;session.opal_key.lr;</div><div class='ctx'> 	err = build_locking_range(uid, sizeof(uid), lr);</div><div class='hunk'>@@ -1210,40 +1244,34 @@ static int setup_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> 	if (lr == 0)</div><div class='ctx'> 		err = enable_global_lr(dev, uid, setup);</div><div class='ctx'> 	else {</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-		add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='del'>-		add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET],</div><div class='del'>-				     OPAL_UID_LENGTH);</div><div class='add'>+		err = cmd_start(dev, uid, opalmethod[OPAL_SET]);</div><div class='ctx'> </div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> </div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, 3); /* Ranges Start */</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_RANGESTART);</div><div class='ctx'> 		add_token_u64(&amp;err, dev, setup-&gt;range_start);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> </div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, 4); /* Ranges length */</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_RANGELENGTH);</div><div class='ctx'> 		add_token_u64(&amp;err, dev, setup-&gt;range_length);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> </div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, 5); /*ReadLockEnabled */</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_READLOCKENABLED);</div><div class='ctx'> 		add_token_u64(&amp;err, dev, !!setup-&gt;RLE);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> </div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, 6); /*WriteLockEnabled*/</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_WRITELOCKENABLED);</div><div class='ctx'> 		add_token_u64(&amp;err, dev, !!setup-&gt;WLE);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> </div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building Setup Locking range command.\n");</div><div class='hunk'>@@ -1261,29 +1289,21 @@ static int start_generic_opal_session(struct opal_dev *dev,</div><div class='ctx'> 				      u8 key_len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 hsn;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (key == NULL &amp;&amp; auth != OPAL_ANYBODY_UID)</div><div class='ctx'> 		return OPAL_INVAL_PARAM;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='ctx'> 	hsn = GENERIC_HOST_SESSION_NUM;</div><div class='add'>+	err = cmd_start(dev, opaluid[OPAL_SMUID_UID],</div><div class='add'>+			opalmethod[OPAL_STARTSESSION]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_SMUID_UID],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_STARTSESSION],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u64(&amp;err, dev, hsn);</div><div class='ctx'> 	add_token_bytestring(&amp;err, dev, opaluid[sp_type], OPAL_UID_LENGTH);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, 1);</div><div class='ctx'> </div><div class='ctx'> 	switch (auth) {</div><div class='ctx'> 	case OPAL_ANYBODY_UID:</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OPAL_ADMIN1_UID:</div><div class='ctx'> 	case OPAL_SID_UID:</div><div class='hunk'>@@ -1296,7 +1316,6 @@ static int start_generic_opal_session(struct opal_dev *dev,</div><div class='ctx'> 		add_token_bytestring(&amp;err, dev, opaluid[auth],</div><div class='ctx'> 				     OPAL_UID_LENGTH);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_debug("Cannot start Admin SP session with auth %d\n", auth);</div><div class='hunk'>@@ -1324,6 +1343,7 @@ static int start_SIDASP_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (!key) {</div><div class='ctx'> 		const struct opal_key *okey = data;</div><div class='add'>+</div><div class='ctx'> 		ret = start_generic_opal_session(dev, OPAL_SID_UID,</div><div class='ctx'> 						 OPAL_ADMINSP_UID,</div><div class='ctx'> 						 okey-&gt;key,</div><div class='hunk'>@@ -1341,6 +1361,7 @@ static int start_SIDASP_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> static int start_admin1LSP_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct opal_key *key = data;</div><div class='add'>+</div><div class='ctx'> 	return start_generic_opal_session(dev, OPAL_ADMIN1_UID,</div><div class='ctx'> 					  OPAL_LOCKINGSP_UID,</div><div class='ctx'> 					  key-&gt;key, key-&gt;key_len);</div><div class='hunk'>@@ -1356,30 +1377,21 @@ static int start_auth_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> 	u8 *key = session-&gt;opal_key.key;</div><div class='ctx'> 	u32 hsn = GENERIC_HOST_SESSION_NUM;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='del'>-</div><div class='del'>-	if (session-&gt;sum) {</div><div class='add'>+	if (session-&gt;sum)</div><div class='ctx'> 		err = build_locking_user(lk_ul_user, sizeof(lk_ul_user),</div><div class='ctx'> 					 session-&gt;opal_key.lr);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-	} else if (session-&gt;who != OPAL_ADMIN1 &amp;&amp; !session-&gt;sum) {</div><div class='add'>+	else if (session-&gt;who != OPAL_ADMIN1 &amp;&amp; !session-&gt;sum)</div><div class='ctx'> 		err = build_locking_user(lk_ul_user, sizeof(lk_ul_user),</div><div class='ctx'> 					 session-&gt;who - 1);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	} else</div><div class='add'>+	else</div><div class='ctx'> 		memcpy(lk_ul_user, opaluid[OPAL_ADMIN1_UID], OPAL_UID_LENGTH);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_SMUID_UID],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_STARTSESSION],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = cmd_start(dev, opaluid[OPAL_SMUID_UID],</div><div class='add'>+			opalmethod[OPAL_STARTSESSION]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u64(&amp;err, dev, hsn);</div><div class='ctx'> 	add_token_bytestring(&amp;err, dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='ctx'> 			     OPAL_UID_LENGTH);</div><div class='hunk'>@@ -1392,7 +1404,6 @@ static int start_auth_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> 	add_token_u8(&amp;err, dev, 3);</div><div class='ctx'> 	add_token_bytestring(&amp;err, dev, lk_ul_user, OPAL_UID_LENGTH);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building STARTSESSION command.\n");</div><div class='hunk'>@@ -1404,18 +1415,10 @@ static int start_auth_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> static int revert_tper(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_ADMINSP_UID],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_REVERT],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	err = cmd_start(dev, opaluid[OPAL_ADMINSP_UID],</div><div class='add'>+			opalmethod[OPAL_REVERT]);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building REVERT TPER command.\n");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1428,18 +1431,12 @@ static int internal_activate_user(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct opal_session_info *session = data;</div><div class='ctx'> 	u8 uid[OPAL_UID_LENGTH];</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(uid, opaluid[OPAL_USER1_UID], OPAL_UID_LENGTH);</div><div class='ctx'> 	uid[7] = session-&gt;who;</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	err = cmd_start(dev, uid, opalmethod[OPAL_SET]);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='hunk'>@@ -1449,7 +1446,6 @@ static int internal_activate_user(struct opal_dev *dev, void *data)</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building Activate UserN command.\n");</div><div class='hunk'>@@ -1463,20 +1459,12 @@ static int erase_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct opal_session_info *session = data;</div><div class='ctx'> 	u8 uid[OPAL_UID_LENGTH];</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (build_locking_range(uid, sizeof(uid), session-&gt;opal_key.lr) &lt; 0)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_ERASE],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	err = cmd_start(dev, uid, opalmethod[OPAL_ERASE]);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building Erase Locking Range Command.\n");</div><div class='hunk'>@@ -1488,26 +1476,20 @@ static int erase_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> static int set_mbr_done(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *mbr_done_tf = data;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	err = cmd_start(dev, opaluid[OPAL_MBRCONTROL],</div><div class='add'>+			opalmethod[OPAL_SET]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_MBRCONTROL],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 2); /* Done */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_MBRDONE);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, *mbr_done_tf); /* Done T or F */</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error Building set MBR Done command\n");</div><div class='hunk'>@@ -1520,26 +1502,20 @@ static int set_mbr_done(struct opal_dev *dev, void *data)</div><div class='ctx'> static int set_mbr_enable_disable(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *mbr_en_dis = data;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	err = cmd_start(dev, opaluid[OPAL_MBRCONTROL],</div><div class='add'>+			opalmethod[OPAL_SET]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_MBRCONTROL],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 1);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_MBRENABLE);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, *mbr_en_dis);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error Building set MBR done command\n");</div><div class='hunk'>@@ -1552,26 +1528,19 @@ static int set_mbr_enable_disable(struct opal_dev *dev, void *data)</div><div class='ctx'> static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid,</div><div class='ctx'> 			  struct opal_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	err = cmd_start(dev, cpin_uid, opalmethod[OPAL_SET]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, cpin_uid, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 3); /* PIN */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_PIN);</div><div class='ctx'> 	add_token_bytestring(&amp;err, dev, key, key_len);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1619,10 +1588,7 @@ static int add_user_to_lr(struct opal_dev *dev, void *data)</div><div class='ctx'> 	u8 lr_buffer[OPAL_UID_LENGTH];</div><div class='ctx'> 	u8 user_uid[OPAL_UID_LENGTH];</div><div class='ctx'> 	struct opal_lock_unlock *lkul = data;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(lr_buffer, opaluid[OPAL_LOCKINGRANGE_ACE_RDLOCKED],</div><div class='ctx'> 	       OPAL_UID_LENGTH);</div><div class='hunk'>@@ -1637,12 +1603,8 @@ static int add_user_to_lr(struct opal_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	user_uid[7] = lkul-&gt;session.who;</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, lr_buffer, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='add'>+	err = cmd_start(dev, lr_buffer, opalmethod[OPAL_SET]);</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> </div><div class='hunk'>@@ -1680,7 +1642,6 @@ static int add_user_to_lr(struct opal_dev *dev, void *data)</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building add user to locking range command.\n");</div><div class='hunk'>@@ -1697,9 +1658,6 @@ static int lock_unlock_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> 	u8 read_locked = 1, write_locked = 1;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='del'>-</div><div class='ctx'> 	if (build_locking_range(lr_buffer, sizeof(lr_buffer),</div><div class='ctx'> 				lkul-&gt;session.opal_key.lr) &lt; 0)</div><div class='ctx'> 		return -ERANGE;</div><div class='hunk'>@@ -1714,17 +1672,15 @@ static int lock_unlock_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> 		write_locked = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OPAL_LK:</div><div class='del'>-		/* vars are initalized to locked */</div><div class='add'>+		/* vars are initialized to locked */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_debug("Tried to set an invalid locking state... returning to uland\n");</div><div class='ctx'> 		return OPAL_INVAL_PARAM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, lr_buffer, OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	err = cmd_start(dev, lr_buffer, opalmethod[OPAL_SET]);</div><div class='add'>+</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='hunk'>@@ -1741,7 +1697,6 @@ static int lock_unlock_locking_range(struct opal_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("Error building SET command.\n");</div><div class='hunk'>@@ -1775,7 +1730,7 @@ static int lock_unlock_locking_range_sum(struct opal_dev *dev, void *data)</div><div class='ctx'> 		write_locked = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OPAL_LK:</div><div class='del'>-		/* vars are initalized to locked */</div><div class='add'>+		/* vars are initialized to locked */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_debug("Tried to set an invalid locking state.\n");</div><div class='hunk'>@@ -1796,17 +1751,10 @@ static int activate_lsp(struct opal_dev *dev, void *data)</div><div class='ctx'> 	struct opal_lr_act *opal_act = data;</div><div class='ctx'> 	u8 user_lr[OPAL_UID_LENGTH];</div><div class='ctx'> 	u8 uint_3 = 0x83;</div><div class='del'>-	int err = 0, i;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_ACTIVATE],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='add'>+	err = cmd_start(dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='add'>+			opalmethod[OPAL_ACTIVATE]);</div><div class='ctx'> </div><div class='ctx'> 	if (opal_act-&gt;sum) {</div><div class='ctx'> 		err = build_locking_range(user_lr, sizeof(user_lr),</div><div class='hunk'>@@ -1814,7 +1762,6 @@ static int activate_lsp(struct opal_dev *dev, void *data)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, uint_3);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, 6);</div><div class='hunk'>@@ -1829,11 +1776,6 @@ static int activate_lsp(struct opal_dev *dev, void *data)</div><div class='ctx'> 		}</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1844,17 +1786,19 @@ static int activate_lsp(struct opal_dev *dev, void *data)</div><div class='ctx'> 	return finalize_and_send(dev, parse_and_check_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_lsp_lifecycle_cont(struct opal_dev *dev)</div><div class='add'>+/* Determine if we're in the Manufactured Inactive or Active state */</div><div class='add'>+static int get_lsp_lifecycle(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 lc_status;</div><div class='del'>-	int error = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	error = parse_and_check_status(dev);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='add'>+	err = generic_get_column(dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='add'>+				 OPAL_LIFECYCLE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	lc_status = response_get_u64(&amp;dev-&gt;parsed, 4);</div><div class='del'>-	/* 0x08 is Manufacured Inactive */</div><div class='add'>+	/* 0x08 is Manufactured Inactive */</div><div class='ctx'> 	/* 0x09 is Manufactured */</div><div class='ctx'> 	if (lc_status != OPAL_MANUFACTURED_INACTIVE) {</div><div class='ctx'> 		pr_debug("Couldn't determine the status of the Lifecycle state\n");</div><div class='hunk'>@@ -1864,56 +1808,19 @@ static int get_lsp_lifecycle_cont(struct opal_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Determine if we're in the Manufactured Inactive or Active state */</div><div class='del'>-static int get_lsp_lifecycle(struct opal_dev *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GET], OPAL_UID_LENGTH);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 3); /* Start Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, 6); /* Lifecycle Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 4); /* End Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, 6); /* Lifecycle Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_debug("Error Building GET Lifecycle Status command\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return finalize_and_send(dev, get_lsp_lifecycle_cont);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_msid_cpin_pin_cont(struct opal_dev *dev)</div><div class='add'>+static int get_msid_cpin_pin(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	const char *msid_pin;</div><div class='ctx'> 	size_t strlen;</div><div class='del'>-	int error = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	error = parse_and_check_status(dev);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='add'>+	err = generic_get_column(dev, opaluid[OPAL_C_PIN_MSID], OPAL_PIN);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	strlen = response_get_string(&amp;dev-&gt;parsed, 4, &amp;msid_pin);</div><div class='ctx'> 	if (!msid_pin) {</div><div class='del'>-		pr_debug("%s: Couldn't extract PIN from response\n", __func__);</div><div class='add'>+		pr_debug("Couldn't extract MSID_CPIN from response\n");</div><div class='ctx'> 		return OPAL_INVAL_PARAM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1926,42 +1833,6 @@ static int get_msid_cpin_pin_cont(struct opal_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_msid_cpin_pin(struct opal_dev *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	clear_opal_cmd(dev);</div><div class='del'>-	set_comid(dev, dev-&gt;comid);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opaluid[OPAL_C_PIN_MSID],</div><div class='del'>-			     OPAL_UID_LENGTH);</div><div class='del'>-	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GET], OPAL_UID_LENGTH);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 3); /* Start Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, 3); /* PIN */</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='del'>-	add_token_u8(&amp;err, dev, 4); /* End Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, 3); /* Lifecycle Column */</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='del'>-</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_debug("Error building Get MSID CPIN PIN command.\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return finalize_and_send(dev, get_msid_cpin_pin_cont);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int end_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1977,18 +1848,14 @@ static int end_opal_session(struct opal_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> static int end_opal_session_error(struct opal_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	const struct opal_step error_end_session[] = {</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+	const struct opal_step error_end_session = {</div><div class='add'>+		end_opal_session,</div><div class='ctx'> 	};</div><div class='del'>-	dev-&gt;steps = error_end_session;</div><div class='del'>-	return next(dev);</div><div class='add'>+	return execute_step(dev, &amp;error_end_session, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void setup_opal_dev(struct opal_dev *dev,</div><div class='del'>-				  const struct opal_step *steps)</div><div class='add'>+static inline void setup_opal_dev(struct opal_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;steps = steps;</div><div class='ctx'> 	dev-&gt;tsn = 0;</div><div class='ctx'> 	dev-&gt;hsn = 0;</div><div class='ctx'> 	dev-&gt;prev_data = NULL;</div><div class='hunk'>@@ -1996,15 +1863,11 @@ static inline void setup_opal_dev(struct opal_dev *dev,</div><div class='ctx'> </div><div class='ctx'> static int check_opal_support(struct opal_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	const struct opal_step steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='del'>-		{ NULL, }</div><div class='del'>-	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = opal_discovery0_step(dev);</div><div class='ctx'> 	dev-&gt;supported = !ret;</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2057,18 +1920,16 @@ static int opal_secure_erase_locking_range(struct opal_dev *dev,</div><div class='ctx'> 					   struct opal_session_info *opal_session)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step erase_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_auth_opal_session, opal_session },</div><div class='ctx'> 		{ get_active_key, &amp;opal_session-&gt;opal_key.lr },</div><div class='ctx'> 		{ gen_key, },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, erase_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, erase_steps, ARRAY_SIZE(erase_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2077,17 +1938,15 @@ static int opal_erase_locking_range(struct opal_dev *dev,</div><div class='ctx'> 				    struct opal_session_info *opal_session)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step erase_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_auth_opal_session, opal_session },</div><div class='ctx'> 		{ erase_locking_range, opal_session },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, erase_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, erase_steps, ARRAY_SIZE(erase_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2095,15 +1954,16 @@ static int opal_erase_locking_range(struct opal_dev *dev,</div><div class='ctx'> static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,</div><div class='ctx'> 					  struct opal_mbr_data *opal_mbr)</div><div class='ctx'> {</div><div class='add'>+	u8 enable_disable = opal_mbr-&gt;enable_disable == OPAL_MBR_ENABLE ?</div><div class='add'>+		OPAL_TRUE : OPAL_FALSE;</div><div class='add'>+</div><div class='ctx'> 	const struct opal_step mbr_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_admin1LSP_opal_session, &amp;opal_mbr-&gt;key },</div><div class='del'>-		{ set_mbr_done, &amp;opal_mbr-&gt;enable_disable },</div><div class='add'>+		{ set_mbr_done, &amp;enable_disable },</div><div class='ctx'> 		{ end_opal_session, },</div><div class='ctx'> 		{ start_admin1LSP_opal_session, &amp;opal_mbr-&gt;key },</div><div class='del'>-		{ set_mbr_enable_disable, &amp;opal_mbr-&gt;enable_disable },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ set_mbr_enable_disable, &amp;enable_disable },</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2112,8 +1972,8 @@ static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, mbr_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, mbr_steps, ARRAY_SIZE(mbr_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2130,7 +1990,7 @@ static int opal_save(struct opal_dev *dev, struct opal_lock_unlock *lk_unlk)</div><div class='ctx'> 	suspend-&gt;lr = lk_unlk-&gt;session.opal_key.lr;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, NULL);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='ctx'> 	add_suspend_info(dev, suspend);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2140,11 +2000,9 @@ static int opal_add_user_to_lr(struct opal_dev *dev,</div><div class='ctx'> 			       struct opal_lock_unlock *lk_unlk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_admin1LSP_opal_session, &amp;lk_unlk-&gt;session.opal_key },</div><div class='ctx'> 		{ add_user_to_lr, lk_unlk },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2166,8 +2024,8 @@ static int opal_add_user_to_lr(struct opal_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, steps, ARRAY_SIZE(steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2175,16 +2033,14 @@ static int opal_add_user_to_lr(struct opal_dev *dev,</div><div class='ctx'> static int opal_reverttper(struct opal_dev *dev, struct opal_key *opal)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step revert_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_SIDASP_opal_session, opal },</div><div class='del'>-		{ revert_tper, }, /* controller will terminate session */</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ revert_tper, } /* controller will terminate session */</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, revert_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, revert_steps, ARRAY_SIZE(revert_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2201,37 +2057,34 @@ static int __opal_lock_unlock(struct opal_dev *dev,</div><div class='ctx'> 			      struct opal_lock_unlock *lk_unlk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step unlock_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_auth_opal_session, &amp;lk_unlk-&gt;session },</div><div class='ctx'> 		{ lock_unlock_locking_range, lk_unlk },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	const struct opal_step unlock_sum_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_auth_opal_session, &amp;lk_unlk-&gt;session },</div><div class='ctx'> 		{ lock_unlock_locking_range_sum, lk_unlk },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dev-&gt;steps = lk_unlk-&gt;session.sum ? unlock_sum_steps : unlock_steps;</div><div class='del'>-	return next(dev);</div><div class='add'>+	if (lk_unlk-&gt;session.sum)</div><div class='add'>+		return execute_steps(dev, unlock_sum_steps,</div><div class='add'>+				     ARRAY_SIZE(unlock_sum_steps));</div><div class='add'>+	else</div><div class='add'>+		return execute_steps(dev, unlock_steps,</div><div class='add'>+				     ARRAY_SIZE(unlock_steps));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)</div><div class='ctx'> {</div><div class='del'>-	u8 mbr_done_tf = 1;</div><div class='del'>-	const struct opal_step mbrdone_step [] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='add'>+	u8 mbr_done_tf = OPAL_TRUE;</div><div class='add'>+	const struct opal_step mbrdone_step[] = {</div><div class='ctx'> 		{ start_admin1LSP_opal_session, key },</div><div class='ctx'> 		{ set_mbr_done, &amp;mbr_done_tf },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dev-&gt;steps = mbrdone_step;</div><div class='del'>-	return next(dev);</div><div class='add'>+	return execute_steps(dev, mbrdone_step, ARRAY_SIZE(mbrdone_step));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int opal_lock_unlock(struct opal_dev *dev,</div><div class='hunk'>@@ -2252,14 +2105,12 @@ static int opal_lock_unlock(struct opal_dev *dev,</div><div class='ctx'> static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step owner_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_anybodyASP_opal_session, },</div><div class='ctx'> 		{ get_msid_cpin_pin, },</div><div class='ctx'> 		{ end_opal_session, },</div><div class='ctx'> 		{ start_SIDASP_opal_session, opal },</div><div class='ctx'> 		{ set_sid_cpin_pin, opal },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2267,21 +2118,20 @@ static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, owner_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, owner_steps, ARRAY_SIZE(owner_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_act)</div><div class='add'>+static int opal_activate_lsp(struct opal_dev *dev,</div><div class='add'>+			     struct opal_lr_act *opal_lr_act)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step active_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_SIDASP_opal_session, &amp;opal_lr_act-&gt;key },</div><div class='ctx'> 		{ get_lsp_lifecycle, },</div><div class='ctx'> 		{ activate_lsp, opal_lr_act },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2289,8 +2139,8 @@ static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_a</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, active_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, active_steps, ARRAY_SIZE(active_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2299,17 +2149,15 @@ static int opal_setup_locking_range(struct opal_dev *dev,</div><div class='ctx'> 				    struct opal_user_lr_setup *opal_lrs)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step lr_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_auth_opal_session, &amp;opal_lrs-&gt;session },</div><div class='ctx'> 		{ setup_locking_range, opal_lrs },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, lr_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, lr_steps, ARRAY_SIZE(lr_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2317,11 +2165,9 @@ static int opal_setup_locking_range(struct opal_dev *dev,</div><div class='ctx'> static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step pw_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_auth_opal_session, &amp;opal_pw-&gt;session },</div><div class='ctx'> 		{ set_new_pw, &amp;opal_pw-&gt;new_user_pw },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2332,8 +2178,8 @@ static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, pw_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, pw_steps, ARRAY_SIZE(pw_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2342,11 +2188,9 @@ static int opal_activate_user(struct opal_dev *dev,</div><div class='ctx'> 			      struct opal_session_info *opal_session)</div><div class='ctx'> {</div><div class='ctx'> 	const struct opal_step act_steps[] = {</div><div class='del'>-		{ opal_discovery0, },</div><div class='ctx'> 		{ start_admin1LSP_opal_session, &amp;opal_session-&gt;opal_key },</div><div class='ctx'> 		{ internal_activate_user, opal_session },</div><div class='del'>-		{ end_opal_session, },</div><div class='del'>-		{ NULL, }</div><div class='add'>+		{ end_opal_session, }</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2358,8 +2202,8 @@ static int opal_activate_user(struct opal_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, act_steps);</div><div class='del'>-	ret = next(dev);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='add'>+	ret = execute_steps(dev, act_steps, ARRAY_SIZE(act_steps));</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2376,7 +2220,7 @@ bool opal_unlock_from_suspend(struct opal_dev *dev)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='del'>-	setup_opal_dev(dev, NULL);</div><div class='add'>+	setup_opal_dev(dev);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(suspend, &amp;dev-&gt;unlk_lst, node) {</div><div class='ctx'> 		dev-&gt;tsn = 0;</div><div class='head'>diff --git a/block/t10-pi.c b/block/t10-pi.c<br/>index 62aed77d0bb9..0c0094609dd6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/block/t10-pi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>block/t10-pi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/block/t10-pi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>block/t10-pi.c</a></div><div class='hunk'>@@ -1,24 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * t10_pi.c - Functions for generating and verifying T10 Protection</div><div class='ctx'>  *	      Information.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007, 2008, 2014 Oracle Corporation</div><div class='del'>- * Written by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;</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 version</div><div class='del'>- * 2 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; see the file COPYING.  If not, write to</div><div class='del'>- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/t10-pi.h&gt;</div><div class='head'>diff --git a/crypto/842.c b/crypto/842.c<br/>index bc26dc942821..5f98393b65d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/842.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/842.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/842.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/842.c</a></div><div class='hunk'>@@ -144,7 +144,7 @@ static int __init crypto842_mod_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-module_init(crypto842_mod_init);</div><div class='add'>+subsys_initcall(crypto842_mod_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto842_mod_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/Kconfig b/crypto/Kconfig<br/>index bbab6bf33519..3d056e7da65f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/Kconfig</a></div><div class='hunk'>@@ -27,8 +27,8 @@ config CRYPTO_FIPS</div><div class='ctx'> 	depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) &amp;&amp; !CRYPTO_MANAGER_DISABLE_TESTS</div><div class='ctx'> 	depends on (MODULE_SIG || !MODULES)</div><div class='ctx'> 	help</div><div class='del'>-	  This options enables the fips boot option which is</div><div class='del'>-	  required if you want to system to operate in a FIPS 200</div><div class='add'>+	  This option enables the fips boot option which is</div><div class='add'>+	  required if you want the system to operate in a FIPS 200</div><div class='ctx'> 	  certification.  You should say no unless you know what</div><div class='ctx'> 	  this is.</div><div class='ctx'> </div><div class='hunk'>@@ -113,29 +113,6 @@ config CRYPTO_ACOMP</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='ctx'> 	select CRYPTO_ACOMP2</div><div class='ctx'> </div><div class='del'>-config CRYPTO_RSA</div><div class='del'>-	tristate "RSA algorithm"</div><div class='del'>-	select CRYPTO_AKCIPHER</div><div class='del'>-	select CRYPTO_MANAGER</div><div class='del'>-	select MPILIB</div><div class='del'>-	select ASN1</div><div class='del'>-	help</div><div class='del'>-	  Generic implementation of the RSA public key algorithm.</div><div class='del'>-</div><div class='del'>-config CRYPTO_DH</div><div class='del'>-	tristate "Diffie-Hellman algorithm"</div><div class='del'>-	select CRYPTO_KPP</div><div class='del'>-	select MPILIB</div><div class='del'>-	help</div><div class='del'>-	  Generic implementation of the Diffie-Hellman algorithm.</div><div class='del'>-</div><div class='del'>-config CRYPTO_ECDH</div><div class='del'>-	tristate "ECDH algorithm"</div><div class='del'>-	select CRYPTO_KPP</div><div class='del'>-	select CRYPTO_RNG_DEFAULT</div><div class='del'>-	help</div><div class='del'>-	  Generic implementation of the ECDH algorithm</div><div class='del'>-</div><div class='ctx'> config CRYPTO_MANAGER</div><div class='ctx'> 	tristate "Cryptographic algorithm manager"</div><div class='ctx'> 	select CRYPTO_MANAGER2</div><div class='hunk'>@@ -253,6 +230,48 @@ config CRYPTO_GLUE_HELPER_X86</div><div class='ctx'> config CRYPTO_ENGINE</div><div class='ctx'> 	tristate</div><div class='ctx'> </div><div class='add'>+comment "Public-key cryptography"</div><div class='add'>+</div><div class='add'>+config CRYPTO_RSA</div><div class='add'>+	tristate "RSA algorithm"</div><div class='add'>+	select CRYPTO_AKCIPHER</div><div class='add'>+	select CRYPTO_MANAGER</div><div class='add'>+	select MPILIB</div><div class='add'>+	select ASN1</div><div class='add'>+	help</div><div class='add'>+	  Generic implementation of the RSA public key algorithm.</div><div class='add'>+</div><div class='add'>+config CRYPTO_DH</div><div class='add'>+	tristate "Diffie-Hellman algorithm"</div><div class='add'>+	select CRYPTO_KPP</div><div class='add'>+	select MPILIB</div><div class='add'>+	help</div><div class='add'>+	  Generic implementation of the Diffie-Hellman algorithm.</div><div class='add'>+</div><div class='add'>+config CRYPTO_ECC</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config CRYPTO_ECDH</div><div class='add'>+	tristate "ECDH algorithm"</div><div class='add'>+	select CRYPTO_ECC</div><div class='add'>+	select CRYPTO_KPP</div><div class='add'>+	select CRYPTO_RNG_DEFAULT</div><div class='add'>+	help</div><div class='add'>+	  Generic implementation of the ECDH algorithm</div><div class='add'>+</div><div class='add'>+config CRYPTO_ECRDSA</div><div class='add'>+	tristate "EC-RDSA (GOST 34.10) algorithm"</div><div class='add'>+	select CRYPTO_ECC</div><div class='add'>+	select CRYPTO_AKCIPHER</div><div class='add'>+	select CRYPTO_STREEBOG</div><div class='add'>+	select OID_REGISTRY</div><div class='add'>+	select ASN1</div><div class='add'>+	help</div><div class='add'>+	  Elliptic Curve Russian Digital Signature Algorithm (GOST R 34.10-2012,</div><div class='add'>+	  RFC 7091, ISO/IEC 14888-3:2018) is one of the Russian cryptographic</div><div class='add'>+	  standard algorithms (called GOST algorithms). Only signature verification</div><div class='add'>+	  is implemented.</div><div class='add'>+</div><div class='ctx'> comment "Authenticated Encryption with Associated Data"</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_CCM</div><div class='hunk'>@@ -310,25 +329,25 @@ config CRYPTO_AEGIS128_AESNI_SSE2</div><div class='ctx'> 	tristate "AEGIS-128 AEAD algorithm (x86_64 AESNI+SSE2 implementation)"</div><div class='ctx'> 	depends on X86 &amp;&amp; 64BIT</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='del'>-	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='del'>-	 AESNI+SSE2 implementation of the AEGSI-128 dedicated AEAD algorithm.</div><div class='add'>+	 AESNI+SSE2 implementation of the AEGIS-128 dedicated AEAD algorithm.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_AEGIS128L_AESNI_SSE2</div><div class='ctx'> 	tristate "AEGIS-128L AEAD algorithm (x86_64 AESNI+SSE2 implementation)"</div><div class='ctx'> 	depends on X86 &amp;&amp; 64BIT</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='del'>-	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='del'>-	 AESNI+SSE2 implementation of the AEGSI-128L dedicated AEAD algorithm.</div><div class='add'>+	 AESNI+SSE2 implementation of the AEGIS-128L dedicated AEAD algorithm.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_AEGIS256_AESNI_SSE2</div><div class='ctx'> 	tristate "AEGIS-256 AEAD algorithm (x86_64 AESNI+SSE2 implementation)"</div><div class='ctx'> 	depends on X86 &amp;&amp; 64BIT</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='del'>-	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='del'>-	 AESNI+SSE2 implementation of the AEGSI-256 dedicated AEAD algorithm.</div><div class='add'>+	 AESNI+SSE2 implementation of the AEGIS-256 dedicated AEAD algorithm.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_MORUS640</div><div class='ctx'> 	tristate "MORUS-640 AEAD algorithm"</div><div class='hunk'>@@ -340,7 +359,7 @@ config CRYPTO_MORUS640_GLUE</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on X86</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='del'>-	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common glue for SIMD optimizations of the MORUS-640 dedicated AEAD</div><div class='ctx'> 	  algorithm.</div><div class='hunk'>@@ -363,7 +382,7 @@ config CRYPTO_MORUS1280_GLUE</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on X86</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='del'>-	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common glue for SIMD optimizations of the MORUS-1280 dedicated AEAD</div><div class='ctx'> 	  algorithm.</div><div class='head'>diff --git a/crypto/Makefile b/crypto/Makefile<br/>index fb5bf2a3a666..266a4cdbb9e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/Makefile</a></div><div class='hunk'>@@ -147,12 +147,20 @@ obj-$(CONFIG_CRYPTO_USER_API_RNG) += algif_rng.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_USER_API_AEAD) += algif_aead.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_ZSTD) += zstd.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_OFB) += ofb.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_ECC) += ecc.o</div><div class='ctx'> </div><div class='del'>-ecdh_generic-y := ecc.o</div><div class='ctx'> ecdh_generic-y += ecdh.o</div><div class='ctx'> ecdh_generic-y += ecdh_helper.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o</div><div class='ctx'> </div><div class='add'>+$(obj)/ecrdsa_params.asn1.o: $(obj)/ecrdsa_params.asn1.c $(obj)/ecrdsa_params.asn1.h</div><div class='add'>+$(obj)/ecrdsa_pub_key.asn1.o: $(obj)/ecrdsa_pub_key.asn1.c $(obj)/ecrdsa_pub_key.asn1.h</div><div class='add'>+$(obj)/ecrdsa.o: $(obj)/ecrdsa_params.asn1.h $(obj)/ecrdsa_pub_key.asn1.h</div><div class='add'>+ecrdsa_generic-y += ecrdsa.o</div><div class='add'>+ecrdsa_generic-y += ecrdsa_params.asn1.o</div><div class='add'>+ecrdsa_generic-y += ecrdsa_pub_key.asn1.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # generic algorithms and the async_tx api</div><div class='ctx'> #</div><div class='head'>diff --git a/crypto/adiantum.c b/crypto/adiantum.c<br/>index 5564e73266a6..395a3ddd3707 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/adiantum.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/adiantum.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/adiantum.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/adiantum.c</a></div><div class='hunk'>@@ -265,7 +265,6 @@ static int adiantum_hash_message(struct skcipher_request *req,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	hash_desc-&gt;tfm = tctx-&gt;hash;</div><div class='del'>-	hash_desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_shash_init(hash_desc);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -659,7 +658,7 @@ static void __exit adiantum_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;adiantum_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(adiantum_module_init);</div><div class='add'>+subsys_initcall(adiantum_module_init);</div><div class='ctx'> module_exit(adiantum_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Adiantum length-preserving encryption mode");</div><div class='head'>diff --git a/crypto/aegis128.c b/crypto/aegis128.c<br/>index 3718a8341303..d78f77fc5dd1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aegis128.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aegis128.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aegis128.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/aegis128.c</a></div><div class='hunk'>@@ -448,7 +448,7 @@ static void __exit crypto_aegis128_module_exit(void)</div><div class='ctx'> 	crypto_unregister_aead(&amp;crypto_aegis128_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_aegis128_module_init);</div><div class='add'>+subsys_initcall(crypto_aegis128_module_init);</div><div class='ctx'> module_exit(crypto_aegis128_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/aegis128l.c b/crypto/aegis128l.c<br/>index 275a8616d71b..9bca3d619a22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aegis128l.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aegis128l.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aegis128l.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/aegis128l.c</a></div><div class='hunk'>@@ -512,7 +512,7 @@ static void __exit crypto_aegis128l_module_exit(void)</div><div class='ctx'> 	crypto_unregister_aead(&amp;crypto_aegis128l_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_aegis128l_module_init);</div><div class='add'>+subsys_initcall(crypto_aegis128l_module_init);</div><div class='ctx'> module_exit(crypto_aegis128l_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/aegis256.c b/crypto/aegis256.c<br/>index ecd6b7f34a2d..b47fd39595ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aegis256.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aegis256.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aegis256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/aegis256.c</a></div><div class='hunk'>@@ -463,7 +463,7 @@ static void __exit crypto_aegis256_module_exit(void)</div><div class='ctx'> 	crypto_unregister_aead(&amp;crypto_aegis256_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_aegis256_module_init);</div><div class='add'>+subsys_initcall(crypto_aegis256_module_init);</div><div class='ctx'> module_exit(crypto_aegis256_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c<br/>index 13df33aca463..f217568917e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aes_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/aes_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/aes_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/aes_generic.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static inline u8 byte(const u32 x, const unsigned n)</div><div class='ctx'> static const u32 rco_tab[10] = { 1, 2, 4, 8, 16, 32, 64, 128, 27, 54 };</div><div class='ctx'> </div><div class='ctx'> /* cacheline-aligned to facilitate prefetching into cache */</div><div class='del'>-__visible const u32 crypto_ft_tab[4][256] __cacheline_aligned = {</div><div class='add'>+__visible const u32 crypto_ft_tab[4][256] ____cacheline_aligned = {</div><div class='ctx'> 	{</div><div class='ctx'> 		0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,</div><div class='ctx'> 		0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,</div><div class='hunk'>@@ -328,7 +328,7 @@ __visible const u32 crypto_ft_tab[4][256] __cacheline_aligned = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-__visible const u32 crypto_fl_tab[4][256] __cacheline_aligned = {</div><div class='add'>+__visible const u32 crypto_fl_tab[4][256] ____cacheline_aligned = {</div><div class='ctx'> 	{</div><div class='ctx'> 		0x00000063, 0x0000007c, 0x00000077, 0x0000007b,</div><div class='ctx'> 		0x000000f2, 0x0000006b, 0x0000006f, 0x000000c5,</div><div class='hunk'>@@ -592,7 +592,7 @@ __visible const u32 crypto_fl_tab[4][256] __cacheline_aligned = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-__visible const u32 crypto_it_tab[4][256] __cacheline_aligned = {</div><div class='add'>+__visible const u32 crypto_it_tab[4][256] ____cacheline_aligned = {</div><div class='ctx'> 	{</div><div class='ctx'> 		0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a,</div><div class='ctx'> 		0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b,</div><div class='hunk'>@@ -856,7 +856,7 @@ __visible const u32 crypto_it_tab[4][256] __cacheline_aligned = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-__visible const u32 crypto_il_tab[4][256] __cacheline_aligned = {</div><div class='add'>+__visible const u32 crypto_il_tab[4][256] ____cacheline_aligned = {</div><div class='ctx'> 	{</div><div class='ctx'> 		0x00000052, 0x00000009, 0x0000006a, 0x000000d5,</div><div class='ctx'> 		0x00000030, 0x00000036, 0x000000a5, 0x00000038,</div><div class='hunk'>@@ -1470,7 +1470,7 @@ static void __exit aes_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;aes_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(aes_init);</div><div class='add'>+subsys_initcall(aes_init);</div><div class='ctx'> module_exit(aes_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");</div><div class='head'>diff --git a/crypto/akcipher.c b/crypto/akcipher.c<br/>index 0cbeae137e0a..780daa436dac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/akcipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/akcipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/akcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/akcipher.c</a></div><div class='hunk'>@@ -119,10 +119,24 @@ static void akcipher_prepare_alg(struct akcipher_alg *alg)</div><div class='ctx'> 	base-&gt;cra_flags |= CRYPTO_ALG_TYPE_AKCIPHER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int akcipher_default_op(struct akcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int crypto_register_akcipher(struct akcipher_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *base = &amp;alg-&gt;base;</div><div class='ctx'> </div><div class='add'>+	if (!alg-&gt;sign)</div><div class='add'>+		alg-&gt;sign = akcipher_default_op;</div><div class='add'>+	if (!alg-&gt;verify)</div><div class='add'>+		alg-&gt;verify = akcipher_default_op;</div><div class='add'>+	if (!alg-&gt;encrypt)</div><div class='add'>+		alg-&gt;encrypt = akcipher_default_op;</div><div class='add'>+	if (!alg-&gt;decrypt)</div><div class='add'>+		alg-&gt;decrypt = akcipher_default_op;</div><div class='add'>+</div><div class='ctx'> 	akcipher_prepare_alg(alg);</div><div class='ctx'> 	return crypto_register_alg(base);</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/algboss.c b/crypto/algboss.c<br/>index 527b44d0af21..bb97cfb38836 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/algboss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/algboss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/algboss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/algboss.c</a></div><div class='hunk'>@@ -296,7 +296,13 @@ static void __exit cryptomgr_exit(void)</div><div class='ctx'> 	BUG_ON(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-subsys_initcall(cryptomgr_init);</div><div class='add'>+/*</div><div class='add'>+ * This is arch_initcall() so that the crypto self-tests are run on algorithms</div><div class='add'>+ * registered early by subsys_initcall().  subsys_initcall() is needed for</div><div class='add'>+ * generic implementations so that they're available for comparison tests when</div><div class='add'>+ * other implementations are registered later by module_init().</div><div class='add'>+ */</div><div class='add'>+arch_initcall(cryptomgr_init);</div><div class='ctx'> module_exit(cryptomgr_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c<br/>index eff337ce9003..e7c43ea4ce9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ansi_cprng.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ansi_cprng.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ansi_cprng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ansi_cprng.c</a></div><div class='hunk'>@@ -472,7 +472,7 @@ MODULE_DESCRIPTION("Software Pseudo Random Number Generator");</div><div class='ctx'> MODULE_AUTHOR("Neil Horman &lt;nhorman@tuxdriver.com&gt;");</div><div class='ctx'> module_param(dbg, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)");</div><div class='del'>-module_init(prng_mod_init);</div><div class='add'>+subsys_initcall(prng_mod_init);</div><div class='ctx'> module_exit(prng_mod_fini);</div><div class='ctx'> MODULE_ALIAS_CRYPTO("stdrng");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("ansi_cprng");</div><div class='head'>diff --git a/crypto/anubis.c b/crypto/anubis.c<br/>index 4bb187c2a902..673927de0eb9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/anubis.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/anubis.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/anubis.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/anubis.c</a></div><div class='hunk'>@@ -699,7 +699,7 @@ static void __exit anubis_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;anubis_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(anubis_mod_init);</div><div class='add'>+subsys_initcall(anubis_mod_init);</div><div class='ctx'> module_exit(anubis_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/arc4.c b/crypto/arc4.c<br/>index 6c93342e3405..2233d36456e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/arc4.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/arc4.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/arc4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/arc4.c</a></div><div class='hunk'>@@ -163,7 +163,7 @@ static void __exit arc4_exit(void)</div><div class='ctx'> 	crypto_unregister_skcipher(&amp;arc4_skcipher);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(arc4_init);</div><div class='add'>+subsys_initcall(arc4_init);</div><div class='ctx'> module_exit(arc4_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/asymmetric_keys/asym_tpm.c b/crypto/asymmetric_keys/asym_tpm.c<br/>index 5d4c270463f6..76d2ce3a1b5b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/asym_tpm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/asym_tpm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/asym_tpm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/asym_tpm.c</a></div><div class='hunk'>@@ -276,6 +276,10 @@ static int tpm_sign(struct tpm_buf *tb,</div><div class='ctx'> </div><div class='ctx'> 	return datalen;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Room to fit two u32 zeros for algo id and parameters length. */</div><div class='add'>+#define SETKEY_PARAMS_SIZE (sizeof(u32) * 2)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Maximum buffer size for the BER/DER encoded public key.  The public key</div><div class='ctx'>  * is of the form SEQUENCE { INTEGER n, INTEGER e } where n is a maximum 2048</div><div class='hunk'>@@ -286,8 +290,9 @@ static int tpm_sign(struct tpm_buf *tb,</div><div class='ctx'>  *     - 257 bytes of n</div><div class='ctx'>  *   - max 2 bytes for INTEGER e type/length</div><div class='ctx'>  *     - 3 bytes of e</div><div class='add'>+ * - 4+4 of zeros for set_pub_key parameters (SETKEY_PARAMS_SIZE)</div><div class='ctx'>  */</div><div class='del'>-#define PUB_KEY_BUF_SIZE (4 + 4 + 257 + 2 + 3)</div><div class='add'>+#define PUB_KEY_BUF_SIZE (4 + 4 + 257 + 2 + 3 + SETKEY_PARAMS_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Provide a part of a description of the key for /proc/keys.</div><div class='hunk'>@@ -364,6 +369,8 @@ static uint32_t derive_pub_key(const void *pub_key, uint32_t len, uint8_t *buf)</div><div class='ctx'> 	cur = encode_tag_length(cur, 0x02, sizeof(e));</div><div class='ctx'> 	memcpy(cur, e, sizeof(e));</div><div class='ctx'> 	cur += sizeof(e);</div><div class='add'>+	/* Zero parameters to satisfy set_pub_key ABI. */</div><div class='add'>+	memset(cur, 0, SETKEY_PARAMS_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return cur - buf;</div><div class='ctx'> }</div><div class='hunk'>@@ -744,12 +751,10 @@ static int tpm_key_verify_signature(const struct key *key,</div><div class='ctx'> 	struct crypto_wait cwait;</div><div class='ctx'> 	struct crypto_akcipher *tfm;</div><div class='ctx'> 	struct akcipher_request *req;</div><div class='del'>-	struct scatterlist sig_sg, digest_sg;</div><div class='add'>+	struct scatterlist src_sg[2];</div><div class='ctx'> 	char alg_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	uint8_t der_pub_key[PUB_KEY_BUF_SIZE];</div><div class='ctx'> 	uint32_t der_pub_key_len;</div><div class='del'>-	void *output;</div><div class='del'>-	unsigned int outlen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pr_devel("==&gt;%s()\n", __func__);</div><div class='hunk'>@@ -781,37 +786,17 @@ static int tpm_key_verify_signature(const struct key *key,</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		goto error_free_tfm;</div><div class='ctx'> </div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	outlen = crypto_akcipher_maxsize(tfm);</div><div class='del'>-	output = kmalloc(outlen, GFP_KERNEL);</div><div class='del'>-	if (!output)</div><div class='del'>-		goto error_free_req;</div><div class='del'>-</div><div class='del'>-	sg_init_one(&amp;sig_sg, sig-&gt;s, sig-&gt;s_size);</div><div class='del'>-	sg_init_one(&amp;digest_sg, output, outlen);</div><div class='del'>-	akcipher_request_set_crypt(req, &amp;sig_sg, &amp;digest_sg, sig-&gt;s_size,</div><div class='del'>-				   outlen);</div><div class='add'>+	sg_init_table(src_sg, 2);</div><div class='add'>+	sg_set_buf(&amp;src_sg[0], sig-&gt;s, sig-&gt;s_size);</div><div class='add'>+	sg_set_buf(&amp;src_sg[1], sig-&gt;digest, sig-&gt;digest_size);</div><div class='add'>+	akcipher_request_set_crypt(req, src_sg, NULL, sig-&gt;s_size,</div><div class='add'>+				   sig-&gt;digest_size);</div><div class='ctx'> 	crypto_init_wait(&amp;cwait);</div><div class='ctx'> 	akcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 				      CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='ctx'> 				      crypto_req_done, &amp;cwait);</div><div class='del'>-</div><div class='del'>-	/* Perform the verification calculation.  This doesn't actually do the</div><div class='del'>-	 * verification, but rather calculates the hash expected by the</div><div class='del'>-	 * signature and returns that to us.</div><div class='del'>-	 */</div><div class='ctx'> 	ret = crypto_wait_req(crypto_akcipher_verify(req), &amp;cwait);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_free_output;</div><div class='del'>-</div><div class='del'>-	/* Do the actual verification step. */</div><div class='del'>-	if (req-&gt;dst_len != sig-&gt;digest_size ||</div><div class='del'>-	    memcmp(sig-&gt;digest, output, sig-&gt;digest_size) != 0)</div><div class='del'>-		ret = -EKEYREJECTED;</div><div class='ctx'> </div><div class='del'>-out_free_output:</div><div class='del'>-	kfree(output);</div><div class='del'>-error_free_req:</div><div class='ctx'> 	akcipher_request_free(req);</div><div class='ctx'> error_free_tfm:</div><div class='ctx'> 	crypto_free_akcipher(tfm);</div><div class='head'>diff --git a/crypto/asymmetric_keys/pkcs7_verify.c b/crypto/asymmetric_keys/pkcs7_verify.c<br/>index 97c77f66b20d..f7b0980bf02d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/pkcs7_verify.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/pkcs7_verify.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/pkcs7_verify.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/pkcs7_verify.c</a></div><div class='hunk'>@@ -56,7 +56,6 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,</div><div class='ctx'> 		goto error_no_desc;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm   = tfm;</div><div class='del'>-	desc-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	/* Digest the message [RFC2315 9.3] */</div><div class='ctx'> 	ret = crypto_shash_digest(desc, pkcs7-&gt;data, pkcs7-&gt;data_len,</div><div class='head'>diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c<br/>index f5d85b47fcc6..77e0ae7840ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/public_key.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/public_key.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/public_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/public_key.c</a></div><div class='hunk'>@@ -45,6 +45,7 @@ void public_key_free(struct public_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	if (key) {</div><div class='ctx'> 		kfree(key-&gt;key);</div><div class='add'>+		kfree(key-&gt;params);</div><div class='ctx'> 		kfree(key);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -94,6 +95,12 @@ int software_key_determine_akcipher(const char *encoding,</div><div class='ctx'> 	return -ENOPKG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 *pkey_pack_u32(u8 *dst, u32 val)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst, &amp;val, sizeof(val));</div><div class='add'>+	return dst + sizeof(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Query information about a key.</div><div class='ctx'>  */</div><div class='hunk'>@@ -103,6 +110,7 @@ static int software_key_query(const struct kernel_pkey_params *params,</div><div class='ctx'> 	struct crypto_akcipher *tfm;</div><div class='ctx'> 	struct public_key *pkey = params-&gt;key-&gt;payload.data[asym_crypto];</div><div class='ctx'> 	char alg_name[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	u8 *key, *ptr;</div><div class='ctx'> 	int ret, len;</div><div class='ctx'> </div><div class='ctx'> 	ret = software_key_determine_akcipher(params-&gt;encoding,</div><div class='hunk'>@@ -115,14 +123,22 @@ static int software_key_query(const struct kernel_pkey_params *params,</div><div class='ctx'> 	if (IS_ERR(tfm))</div><div class='ctx'> 		return PTR_ERR(tfm);</div><div class='ctx'> </div><div class='add'>+	key = kmalloc(pkey-&gt;keylen + sizeof(u32) * 2 + pkey-&gt;paramlen,</div><div class='add'>+		      GFP_KERNEL);</div><div class='add'>+	if (!key)</div><div class='add'>+		goto error_free_tfm;</div><div class='add'>+	memcpy(key, pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+	ptr = key + pkey-&gt;keylen;</div><div class='add'>+	ptr = pkey_pack_u32(ptr, pkey-&gt;algo);</div><div class='add'>+	ptr = pkey_pack_u32(ptr, pkey-&gt;paramlen);</div><div class='add'>+	memcpy(ptr, pkey-&gt;params, pkey-&gt;paramlen);</div><div class='add'>+</div><div class='ctx'> 	if (pkey-&gt;key_is_private)</div><div class='del'>-		ret = crypto_akcipher_set_priv_key(tfm,</div><div class='del'>-						   pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+		ret = crypto_akcipher_set_priv_key(tfm, key, pkey-&gt;keylen);</div><div class='ctx'> 	else</div><div class='del'>-		ret = crypto_akcipher_set_pub_key(tfm,</div><div class='del'>-						  pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+		ret = crypto_akcipher_set_pub_key(tfm, key, pkey-&gt;keylen);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto error_free_tfm;</div><div class='add'>+		goto error_free_key;</div><div class='ctx'> </div><div class='ctx'> 	len = crypto_akcipher_maxsize(tfm);</div><div class='ctx'> 	info-&gt;key_size = len * 8;</div><div class='hunk'>@@ -137,6 +153,8 @@ static int software_key_query(const struct kernel_pkey_params *params,</div><div class='ctx'> 					KEYCTL_SUPPORTS_SIGN);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='add'>+error_free_key:</div><div class='add'>+	kfree(key);</div><div class='ctx'> error_free_tfm:</div><div class='ctx'> 	crypto_free_akcipher(tfm);</div><div class='ctx'> 	pr_devel("&lt;==%s() = %d\n", __func__, ret);</div><div class='hunk'>@@ -155,6 +173,7 @@ static int software_key_eds_op(struct kernel_pkey_params *params,</div><div class='ctx'> 	struct crypto_wait cwait;</div><div class='ctx'> 	struct scatterlist in_sg, out_sg;</div><div class='ctx'> 	char alg_name[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	char *key, *ptr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pr_devel("==&gt;%s()\n", __func__);</div><div class='hunk'>@@ -173,14 +192,23 @@ static int software_key_eds_op(struct kernel_pkey_params *params,</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		goto error_free_tfm;</div><div class='ctx'> </div><div class='add'>+	key = kmalloc(pkey-&gt;keylen + sizeof(u32) * 2 + pkey-&gt;paramlen,</div><div class='add'>+		      GFP_KERNEL);</div><div class='add'>+	if (!key)</div><div class='add'>+		goto error_free_req;</div><div class='add'>+</div><div class='add'>+	memcpy(key, pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+	ptr = key + pkey-&gt;keylen;</div><div class='add'>+	ptr = pkey_pack_u32(ptr, pkey-&gt;algo);</div><div class='add'>+	ptr = pkey_pack_u32(ptr, pkey-&gt;paramlen);</div><div class='add'>+	memcpy(ptr, pkey-&gt;params, pkey-&gt;paramlen);</div><div class='add'>+</div><div class='ctx'> 	if (pkey-&gt;key_is_private)</div><div class='del'>-		ret = crypto_akcipher_set_priv_key(tfm,</div><div class='del'>-						   pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+		ret = crypto_akcipher_set_priv_key(tfm, key, pkey-&gt;keylen);</div><div class='ctx'> 	else</div><div class='del'>-		ret = crypto_akcipher_set_pub_key(tfm,</div><div class='del'>-						  pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+		ret = crypto_akcipher_set_pub_key(tfm, key, pkey-&gt;keylen);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_free_req;</div><div class='add'>+		goto error_free_key;</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(&amp;in_sg, in, params-&gt;in_len);</div><div class='ctx'> 	sg_init_one(&amp;out_sg, out, params-&gt;out_len);</div><div class='hunk'>@@ -210,6 +238,8 @@ static int software_key_eds_op(struct kernel_pkey_params *params,</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		ret = req-&gt;dst_len;</div><div class='ctx'> </div><div class='add'>+error_free_key:</div><div class='add'>+	kfree(key);</div><div class='ctx'> error_free_req:</div><div class='ctx'> 	akcipher_request_free(req);</div><div class='ctx'> error_free_tfm:</div><div class='hunk'>@@ -227,10 +257,9 @@ int public_key_verify_signature(const struct public_key *pkey,</div><div class='ctx'> 	struct crypto_wait cwait;</div><div class='ctx'> 	struct crypto_akcipher *tfm;</div><div class='ctx'> 	struct akcipher_request *req;</div><div class='del'>-	struct scatterlist sig_sg, digest_sg;</div><div class='add'>+	struct scatterlist src_sg[2];</div><div class='ctx'> 	char alg_name[CRYPTO_MAX_ALG_NAME];</div><div class='del'>-	void *output;</div><div class='del'>-	unsigned int outlen;</div><div class='add'>+	char *key, *ptr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pr_devel("==&gt;%s()\n", __func__);</div><div class='hunk'>@@ -254,45 +283,37 @@ int public_key_verify_signature(const struct public_key *pkey,</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		goto error_free_tfm;</div><div class='ctx'> </div><div class='add'>+	key = kmalloc(pkey-&gt;keylen + sizeof(u32) * 2 + pkey-&gt;paramlen,</div><div class='add'>+		      GFP_KERNEL);</div><div class='add'>+	if (!key)</div><div class='add'>+		goto error_free_req;</div><div class='add'>+</div><div class='add'>+	memcpy(key, pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+	ptr = key + pkey-&gt;keylen;</div><div class='add'>+	ptr = pkey_pack_u32(ptr, pkey-&gt;algo);</div><div class='add'>+	ptr = pkey_pack_u32(ptr, pkey-&gt;paramlen);</div><div class='add'>+	memcpy(ptr, pkey-&gt;params, pkey-&gt;paramlen);</div><div class='add'>+</div><div class='ctx'> 	if (pkey-&gt;key_is_private)</div><div class='del'>-		ret = crypto_akcipher_set_priv_key(tfm,</div><div class='del'>-						   pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+		ret = crypto_akcipher_set_priv_key(tfm, key, pkey-&gt;keylen);</div><div class='ctx'> 	else</div><div class='del'>-		ret = crypto_akcipher_set_pub_key(tfm,</div><div class='del'>-						  pkey-&gt;key, pkey-&gt;keylen);</div><div class='add'>+		ret = crypto_akcipher_set_pub_key(tfm, key, pkey-&gt;keylen);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_free_req;</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	outlen = crypto_akcipher_maxsize(tfm);</div><div class='del'>-	output = kmalloc(outlen, GFP_KERNEL);</div><div class='del'>-	if (!output)</div><div class='del'>-		goto error_free_req;</div><div class='add'>+		goto error_free_key;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(&amp;sig_sg, sig-&gt;s, sig-&gt;s_size);</div><div class='del'>-	sg_init_one(&amp;digest_sg, output, outlen);</div><div class='del'>-	akcipher_request_set_crypt(req, &amp;sig_sg, &amp;digest_sg, sig-&gt;s_size,</div><div class='del'>-				   outlen);</div><div class='add'>+	sg_init_table(src_sg, 2);</div><div class='add'>+	sg_set_buf(&amp;src_sg[0], sig-&gt;s, sig-&gt;s_size);</div><div class='add'>+	sg_set_buf(&amp;src_sg[1], sig-&gt;digest, sig-&gt;digest_size);</div><div class='add'>+	akcipher_request_set_crypt(req, src_sg, NULL, sig-&gt;s_size,</div><div class='add'>+				   sig-&gt;digest_size);</div><div class='ctx'> 	crypto_init_wait(&amp;cwait);</div><div class='ctx'> 	akcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 				      CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='ctx'> 				      crypto_req_done, &amp;cwait);</div><div class='del'>-</div><div class='del'>-	/* Perform the verification calculation.  This doesn't actually do the</div><div class='del'>-	 * verification, but rather calculates the hash expected by the</div><div class='del'>-	 * signature and returns that to us.</div><div class='del'>-	 */</div><div class='ctx'> 	ret = crypto_wait_req(crypto_akcipher_verify(req), &amp;cwait);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_free_output;</div><div class='del'>-</div><div class='del'>-	/* Do the actual verification step. */</div><div class='del'>-	if (req-&gt;dst_len != sig-&gt;digest_size ||</div><div class='del'>-	    memcmp(sig-&gt;digest, output, sig-&gt;digest_size) != 0)</div><div class='del'>-		ret = -EKEYREJECTED;</div><div class='ctx'> </div><div class='del'>-out_free_output:</div><div class='del'>-	kfree(output);</div><div class='add'>+error_free_key:</div><div class='add'>+	kfree(key);</div><div class='ctx'> error_free_req:</div><div class='ctx'> 	akcipher_request_free(req);</div><div class='ctx'> error_free_tfm:</div><div class='head'>diff --git a/crypto/asymmetric_keys/verify_pefile.c b/crypto/asymmetric_keys/verify_pefile.c<br/>index d178650fd524..f8e4a932bcfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/verify_pefile.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/verify_pefile.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/verify_pefile.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/verify_pefile.c</a></div><div class='hunk'>@@ -354,7 +354,6 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen,</div><div class='ctx'> 		goto error_no_desc;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm   = tfm;</div><div class='del'>-	desc-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 	ret = crypto_shash_init(desc);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='head'>diff --git a/crypto/asymmetric_keys/x509.asn1 b/crypto/asymmetric_keys/x509.asn1<br/>index aae0cde414e2..5c9f4e4a5231 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/x509.asn1?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/x509.asn1</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/x509.asn1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/x509.asn1</a></div><div class='hunk'>@@ -22,7 +22,7 @@ CertificateSerialNumber ::= INTEGER</div><div class='ctx'> </div><div class='ctx'> AlgorithmIdentifier ::= SEQUENCE {</div><div class='ctx'> 	algorithm		OBJECT IDENTIFIER ({ x509_note_OID }),</div><div class='del'>-	parameters		ANY OPTIONAL</div><div class='add'>+	parameters		ANY OPTIONAL ({ x509_note_params })</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> Name ::= SEQUENCE OF RelativeDistinguishedName</div><div class='head'>diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c<br/>index 991f4d735a4e..5b7bfd95c334 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/x509_cert_parser.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/x509_cert_parser.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/x509_cert_parser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/x509_cert_parser.c</a></div><div class='hunk'>@@ -26,6 +26,9 @@ struct x509_parse_context {</div><div class='ctx'> 	const void	*cert_start;		/* Start of cert content */</div><div class='ctx'> 	const void	*key;			/* Key data */</div><div class='ctx'> 	size_t		key_size;		/* Size of key data */</div><div class='add'>+	const void	*params;		/* Key parameters */</div><div class='add'>+	size_t		params_size;		/* Size of key parameters */</div><div class='add'>+	enum OID	key_algo;		/* Public key algorithm */</div><div class='ctx'> 	enum OID	last_oid;		/* Last OID encountered */</div><div class='ctx'> 	enum OID	algo_oid;		/* Algorithm OID */</div><div class='ctx'> 	unsigned char	nr_mpi;			/* Number of MPIs stored */</div><div class='hunk'>@@ -109,6 +112,13 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen)</div><div class='ctx'> </div><div class='ctx'> 	cert-&gt;pub-&gt;keylen = ctx-&gt;key_size;</div><div class='ctx'> </div><div class='add'>+	cert-&gt;pub-&gt;params = kmemdup(ctx-&gt;params, ctx-&gt;params_size, GFP_KERNEL);</div><div class='add'>+	if (!cert-&gt;pub-&gt;params)</div><div class='add'>+		goto error_decode;</div><div class='add'>+</div><div class='add'>+	cert-&gt;pub-&gt;paramlen = ctx-&gt;params_size;</div><div class='add'>+	cert-&gt;pub-&gt;algo = ctx-&gt;key_algo;</div><div class='add'>+</div><div class='ctx'> 	/* Grab the signature bits */</div><div class='ctx'> 	ret = x509_get_sig_params(cert);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -220,6 +230,14 @@ int x509_note_pkey_algo(void *context, size_t hdrlen,</div><div class='ctx'> 	case OID_sha224WithRSAEncryption:</div><div class='ctx'> 		ctx-&gt;cert-&gt;sig-&gt;hash_algo = "sha224";</div><div class='ctx'> 		goto rsa_pkcs1;</div><div class='add'>+</div><div class='add'>+	case OID_gost2012Signature256:</div><div class='add'>+		ctx-&gt;cert-&gt;sig-&gt;hash_algo = "streebog256";</div><div class='add'>+		goto ecrdsa;</div><div class='add'>+</div><div class='add'>+	case OID_gost2012Signature512:</div><div class='add'>+		ctx-&gt;cert-&gt;sig-&gt;hash_algo = "streebog512";</div><div class='add'>+		goto ecrdsa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> rsa_pkcs1:</div><div class='hunk'>@@ -227,6 +245,11 @@ rsa_pkcs1:</div><div class='ctx'> 	ctx-&gt;cert-&gt;sig-&gt;encoding = "pkcs1";</div><div class='ctx'> 	ctx-&gt;algo_oid = ctx-&gt;last_oid;</div><div class='ctx'> 	return 0;</div><div class='add'>+ecrdsa:</div><div class='add'>+	ctx-&gt;cert-&gt;sig-&gt;pkey_algo = "ecrdsa";</div><div class='add'>+	ctx-&gt;cert-&gt;sig-&gt;encoding = "raw";</div><div class='add'>+	ctx-&gt;algo_oid = ctx-&gt;last_oid;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -246,7 +269,8 @@ int x509_note_signature(void *context, size_t hdrlen,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strcmp(ctx-&gt;cert-&gt;sig-&gt;pkey_algo, "rsa") == 0) {</div><div class='add'>+	if (strcmp(ctx-&gt;cert-&gt;sig-&gt;pkey_algo, "rsa") == 0 ||</div><div class='add'>+	    strcmp(ctx-&gt;cert-&gt;sig-&gt;pkey_algo, "ecrdsa") == 0) {</div><div class='ctx'> 		/* Discard the BIT STRING metadata */</div><div class='ctx'> 		if (vlen &lt; 1 || *(const u8 *)value != 0)</div><div class='ctx'> 			return -EBADMSG;</div><div class='hunk'>@@ -401,6 +425,27 @@ int x509_note_subject(void *context, size_t hdrlen,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Extract the parameters for the public key</div><div class='add'>+ */</div><div class='add'>+int x509_note_params(void *context, size_t hdrlen,</div><div class='add'>+		     unsigned char tag,</div><div class='add'>+		     const void *value, size_t vlen)</div><div class='add'>+{</div><div class='add'>+	struct x509_parse_context *ctx = context;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AlgorithmIdentifier is used three times in the x509, we should skip</div><div class='add'>+	 * first and ignore third, using second one which is after subject and</div><div class='add'>+	 * before subjectPublicKey.</div><div class='add'>+	 */</div><div class='add'>+	if (!ctx-&gt;cert-&gt;raw_subject || ctx-&gt;key)</div><div class='add'>+		return 0;</div><div class='add'>+	ctx-&gt;params = value - hdrlen;</div><div class='add'>+	ctx-&gt;params_size = vlen + hdrlen;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Extract the data for the public key algorithm</div><div class='ctx'>  */</div><div class='ctx'> int x509_extract_key_data(void *context, size_t hdrlen,</div><div class='hunk'>@@ -409,11 +454,15 @@ int x509_extract_key_data(void *context, size_t hdrlen,</div><div class='ctx'> {</div><div class='ctx'> 	struct x509_parse_context *ctx = context;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;last_oid != OID_rsaEncryption)</div><div class='add'>+	ctx-&gt;key_algo = ctx-&gt;last_oid;</div><div class='add'>+	if (ctx-&gt;last_oid == OID_rsaEncryption)</div><div class='add'>+		ctx-&gt;cert-&gt;pub-&gt;pkey_algo = "rsa";</div><div class='add'>+	else if (ctx-&gt;last_oid == OID_gost2012PKey256 ||</div><div class='add'>+		 ctx-&gt;last_oid == OID_gost2012PKey512)</div><div class='add'>+		ctx-&gt;cert-&gt;pub-&gt;pkey_algo = "ecrdsa";</div><div class='add'>+	else</div><div class='ctx'> 		return -ENOPKG;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;cert-&gt;pub-&gt;pkey_algo = "rsa";</div><div class='del'>-</div><div class='ctx'> 	/* Discard the BIT STRING metadata */</div><div class='ctx'> 	if (vlen &lt; 1 || *(const u8 *)value != 0)</div><div class='ctx'> 		return -EBADMSG;</div><div class='head'>diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c<br/>index 9338b4558cdc..bd96683d8cde 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/x509_public_key.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/asymmetric_keys/x509_public_key.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/asymmetric_keys/x509_public_key.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/asymmetric_keys/x509_public_key.c</a></div><div class='hunk'>@@ -77,7 +77,6 @@ int x509_get_sig_params(struct x509_certificate *cert)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm;</div><div class='del'>-	desc-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	ret = crypto_shash_digest(desc, cert-&gt;tbs, cert-&gt;tbs_size, sig-&gt;digest);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/crypto/authenc.c b/crypto/authenc.c<br/>index 4be293a4b5f0..b3eddac7fa3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/authenc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/authenc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/authenc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/authenc.c</a></div><div class='hunk'>@@ -508,7 +508,7 @@ static void __exit crypto_authenc_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_authenc_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_authenc_module_init);</div><div class='add'>+subsys_initcall(crypto_authenc_module_init);</div><div class='ctx'> module_exit(crypto_authenc_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/authencesn.c b/crypto/authencesn.c<br/>index 4741fe89ba2c..58074308e535 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/authencesn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/authencesn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/authencesn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/authencesn.c</a></div><div class='hunk'>@@ -523,7 +523,7 @@ static void __exit crypto_authenc_esn_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_authenc_esn_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_authenc_esn_module_init);</div><div class='add'>+subsys_initcall(crypto_authenc_esn_module_init);</div><div class='ctx'> module_exit(crypto_authenc_esn_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/blowfish_generic.c b/crypto/blowfish_generic.c<br/>index 87b392a77a93..8548ced8b074 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/blowfish_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/blowfish_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/blowfish_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/blowfish_generic.c</a></div><div class='hunk'>@@ -133,7 +133,7 @@ static void __exit blowfish_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(blowfish_mod_init);</div><div class='add'>+subsys_initcall(blowfish_mod_init);</div><div class='ctx'> module_exit(blowfish_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c<br/>index 32ddd4836ff5..15ce1281f5d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/camellia_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/camellia_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/camellia_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/camellia_generic.c</a></div><div class='hunk'>@@ -1092,7 +1092,7 @@ static void __exit camellia_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;camellia_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(camellia_init);</div><div class='add'>+subsys_initcall(camellia_init);</div><div class='ctx'> module_exit(camellia_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Camellia Cipher Algorithm");</div><div class='head'>diff --git a/crypto/cast5_generic.c b/crypto/cast5_generic.c<br/>index 66169c178314..24bc7d4e33be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cast5_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cast5_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cast5_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cast5_generic.c</a></div><div class='hunk'>@@ -543,7 +543,7 @@ static void __exit cast5_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(cast5_mod_init);</div><div class='add'>+subsys_initcall(cast5_mod_init);</div><div class='ctx'> module_exit(cast5_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/cast6_generic.c b/crypto/cast6_generic.c<br/>index c8e5ec69790e..edd59cc34991 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cast6_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cast6_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cast6_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cast6_generic.c</a></div><div class='hunk'>@@ -285,7 +285,7 @@ static void __exit cast6_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(cast6_mod_init);</div><div class='add'>+subsys_initcall(cast6_mod_init);</div><div class='ctx'> module_exit(cast6_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/cbc.c b/crypto/cbc.c<br/>index d12efaac9230..129f79d03365 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cbc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cbc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cbc.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static void __exit crypto_cbc_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_cbc_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_cbc_module_init);</div><div class='add'>+subsys_initcall(crypto_cbc_module_init);</div><div class='ctx'> module_exit(crypto_cbc_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/ccm.c b/crypto/ccm.c<br/>index 50df8f001c1c..c1ef9d0b4271 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ccm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ccm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ccm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ccm.c</a></div><div class='hunk'>@@ -458,7 +458,6 @@ static void crypto_ccm_free(struct aead_instance *inst)</div><div class='ctx'> </div><div class='ctx'> static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 				    struct rtattr **tb,</div><div class='del'>-				    const char *full_name,</div><div class='ctx'> 				    const char *ctr_name,</div><div class='ctx'> 				    const char *mac_name)</div><div class='ctx'> {</div><div class='hunk'>@@ -486,7 +485,8 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> </div><div class='ctx'> 	mac = __crypto_hash_alg_common(mac_alg);</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (mac-&gt;digestsize != 16)</div><div class='add'>+	if (strncmp(mac-&gt;base.cra_name, "cbcmac(", 7) != 0 ||</div><div class='add'>+	    mac-&gt;digestsize != 16)</div><div class='ctx'> 		goto out_put_mac;</div><div class='ctx'> </div><div class='ctx'> 	inst = kzalloc(sizeof(*inst) + sizeof(*ictx), GFP_KERNEL);</div><div class='hunk'>@@ -509,23 +509,27 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> </div><div class='ctx'> 	ctr = crypto_spawn_skcipher_alg(&amp;ictx-&gt;ctr);</div><div class='ctx'> </div><div class='del'>-	/* Not a stream cipher? */</div><div class='add'>+	/* The skcipher algorithm must be CTR mode, using 16-byte blocks. */</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (ctr-&gt;base.cra_blocksize != 1)</div><div class='add'>+	if (strncmp(ctr-&gt;base.cra_name, "ctr(", 4) != 0 ||</div><div class='add'>+	    crypto_skcipher_alg_ivsize(ctr) != 16 ||</div><div class='add'>+	    ctr-&gt;base.cra_blocksize != 1)</div><div class='ctx'> 		goto err_drop_ctr;</div><div class='ctx'> </div><div class='del'>-	/* We want the real thing! */</div><div class='del'>-	if (crypto_skcipher_alg_ivsize(ctr) != 16)</div><div class='add'>+	/* ctr and cbcmac must use the same underlying block cipher. */</div><div class='add'>+	if (strcmp(ctr-&gt;base.cra_name + 4, mac-&gt;base.cra_name + 7) != 0)</div><div class='ctx'> 		goto err_drop_ctr;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENAMETOOLONG;</div><div class='add'>+	if (snprintf(inst-&gt;alg.base.cra_name, CRYPTO_MAX_ALG_NAME,</div><div class='add'>+		     "ccm(%s", ctr-&gt;base.cra_name + 4) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		goto err_drop_ctr;</div><div class='add'>+</div><div class='ctx'> 	if (snprintf(inst-&gt;alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,</div><div class='ctx'> 		     "ccm_base(%s,%s)", ctr-&gt;base.cra_driver_name,</div><div class='ctx'> 		     mac-&gt;base.cra_driver_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		goto err_drop_ctr;</div><div class='ctx'> </div><div class='del'>-	memcpy(inst-&gt;alg.base.cra_name, full_name, CRYPTO_MAX_ALG_NAME);</div><div class='del'>-</div><div class='ctx'> 	inst-&gt;alg.base.cra_flags = ctr-&gt;base.cra_flags &amp; CRYPTO_ALG_ASYNC;</div><div class='ctx'> 	inst-&gt;alg.base.cra_priority = (mac-&gt;base.cra_priority +</div><div class='ctx'> 				       ctr-&gt;base.cra_priority) / 2;</div><div class='hunk'>@@ -567,7 +571,6 @@ static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	const char *cipher_name;</div><div class='ctx'> 	char ctr_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	char mac_name[CRYPTO_MAX_ALG_NAME];</div><div class='del'>-	char full_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> </div><div class='ctx'> 	cipher_name = crypto_attr_alg_name(tb[1]);</div><div class='ctx'> 	if (IS_ERR(cipher_name))</div><div class='hunk'>@@ -581,35 +584,24 @@ static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 		     cipher_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='del'>-	if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "ccm(%s)", cipher_name) &gt;=</div><div class='del'>-	    CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return -ENAMETOOLONG;</div><div class='del'>-</div><div class='del'>-	return crypto_ccm_create_common(tmpl, tb, full_name, ctr_name,</div><div class='del'>-					mac_name);</div><div class='add'>+	return crypto_ccm_create_common(tmpl, tb, ctr_name, mac_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_ccm_base_create(struct crypto_template *tmpl,</div><div class='ctx'> 				  struct rtattr **tb)</div><div class='ctx'> {</div><div class='ctx'> 	const char *ctr_name;</div><div class='del'>-	const char *cipher_name;</div><div class='del'>-	char full_name[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	const char *mac_name;</div><div class='ctx'> </div><div class='ctx'> 	ctr_name = crypto_attr_alg_name(tb[1]);</div><div class='ctx'> 	if (IS_ERR(ctr_name))</div><div class='ctx'> 		return PTR_ERR(ctr_name);</div><div class='ctx'> </div><div class='del'>-	cipher_name = crypto_attr_alg_name(tb[2]);</div><div class='del'>-	if (IS_ERR(cipher_name))</div><div class='del'>-		return PTR_ERR(cipher_name);</div><div class='del'>-</div><div class='del'>-	if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "ccm_base(%s,%s)",</div><div class='del'>-		     ctr_name, cipher_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return -ENAMETOOLONG;</div><div class='add'>+	mac_name = crypto_attr_alg_name(tb[2]);</div><div class='add'>+	if (IS_ERR(mac_name))</div><div class='add'>+		return PTR_ERR(mac_name);</div><div class='ctx'> </div><div class='del'>-	return crypto_ccm_create_common(tmpl, tb, full_name, ctr_name,</div><div class='del'>-					cipher_name);</div><div class='add'>+	return crypto_ccm_create_common(tmpl, tb, ctr_name, mac_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_rfc4309_setkey(struct crypto_aead *parent, const u8 *key,</div><div class='hunk'>@@ -1014,7 +1006,7 @@ static void __exit crypto_ccm_module_exit(void)</div><div class='ctx'> 				    ARRAY_SIZE(crypto_ccm_tmpls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_ccm_module_init);</div><div class='add'>+subsys_initcall(crypto_ccm_module_init);</div><div class='ctx'> module_exit(crypto_ccm_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/cfb.c b/crypto/cfb.c<br/>index 03ac847f6d6a..7b68fbb61732 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cfb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cfb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cfb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cfb.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static void __exit crypto_cfb_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_cfb_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_cfb_module_init);</div><div class='add'>+subsys_initcall(crypto_cfb_module_init);</div><div class='ctx'> module_exit(crypto_cfb_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c<br/>index ed2e12e26dd8..e38a2d61819a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/chacha20poly1305.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/chacha20poly1305.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/chacha20poly1305.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/chacha20poly1305.c</a></div><div class='hunk'>@@ -645,8 +645,8 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,</div><div class='ctx'> </div><div class='ctx'> 	err = -ENAMETOOLONG;</div><div class='ctx'> 	if (snprintf(inst-&gt;alg.base.cra_name, CRYPTO_MAX_ALG_NAME,</div><div class='del'>-		     "%s(%s,%s)", name, chacha_name,</div><div class='del'>-		     poly_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		     "%s(%s,%s)", name, chacha-&gt;base.cra_name,</div><div class='add'>+		     poly-&gt;cra_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		goto out_drop_chacha;</div><div class='ctx'> 	if (snprintf(inst-&gt;alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,</div><div class='ctx'> 		     "%s(%s,%s)", name, chacha-&gt;base.cra_driver_name,</div><div class='hunk'>@@ -725,7 +725,7 @@ static void __exit chacha20poly1305_module_exit(void)</div><div class='ctx'> 				    ARRAY_SIZE(rfc7539_tmpls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(chacha20poly1305_module_init);</div><div class='add'>+subsys_initcall(chacha20poly1305_module_init);</div><div class='ctx'> module_exit(chacha20poly1305_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c<br/>index 35b583101f4f..d2ec04997832 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/chacha_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/chacha_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/chacha_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/chacha_generic.c</a></div><div class='hunk'>@@ -22,18 +22,16 @@ static void chacha_docrypt(u32 *state, u8 *dst, const u8 *src,</div><div class='ctx'> 	/* aligned to potentially speed up crypto_xor() */</div><div class='ctx'> 	u8 stream[CHACHA_BLOCK_SIZE] __aligned(sizeof(long));</div><div class='ctx'> </div><div class='del'>-	if (dst != src)</div><div class='del'>-		memcpy(dst, src, bytes);</div><div class='del'>-</div><div class='ctx'> 	while (bytes &gt;= CHACHA_BLOCK_SIZE) {</div><div class='ctx'> 		chacha_block(state, stream, nrounds);</div><div class='del'>-		crypto_xor(dst, stream, CHACHA_BLOCK_SIZE);</div><div class='add'>+		crypto_xor_cpy(dst, src, stream, CHACHA_BLOCK_SIZE);</div><div class='ctx'> 		bytes -= CHACHA_BLOCK_SIZE;</div><div class='ctx'> 		dst += CHACHA_BLOCK_SIZE;</div><div class='add'>+		src += CHACHA_BLOCK_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bytes) {</div><div class='ctx'> 		chacha_block(state, stream, nrounds);</div><div class='del'>-		crypto_xor(dst, stream, bytes);</div><div class='add'>+		crypto_xor_cpy(dst, src, stream, bytes);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +50,7 @@ static int chacha_stream_xor(struct skcipher_request *req,</div><div class='ctx'> 		unsigned int nbytes = walk.nbytes;</div><div class='ctx'> </div><div class='ctx'> 		if (nbytes &lt; walk.total)</div><div class='del'>-			nbytes = round_down(nbytes, walk.stride);</div><div class='add'>+			nbytes = round_down(nbytes, CHACHA_BLOCK_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		chacha_docrypt(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 			       nbytes, ctx-&gt;nrounds);</div><div class='hunk'>@@ -203,7 +201,7 @@ static void __exit chacha_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(chacha_generic_mod_init);</div><div class='add'>+subsys_initcall(chacha_generic_mod_init);</div><div class='ctx'> module_exit(chacha_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/cmac.c b/crypto/cmac.c<br/>index 16301f52858c..c60b6c011ec6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cmac.c</a></div><div class='hunk'>@@ -313,7 +313,7 @@ static void __exit crypto_cmac_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_cmac_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_cmac_module_init);</div><div class='add'>+subsys_initcall(crypto_cmac_module_init);</div><div class='ctx'> module_exit(crypto_cmac_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/crc32_generic.c b/crypto/crc32_generic.c<br/>index 00facd27bcc2..9e97912280bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crc32_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crc32_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crc32_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/crc32_generic.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static void __exit crc32_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crc32_mod_init);</div><div class='add'>+subsys_initcall(crc32_mod_init);</div><div class='ctx'> module_exit(crc32_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alexander Boyko &lt;alexander_boyko@xyratex.com&gt;");</div><div class='head'>diff --git a/crypto/crc32c_generic.c b/crypto/crc32c_generic.c<br/>index 7283066ecc98..ad26f15d4c7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crc32c_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crc32c_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crc32c_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/crc32c_generic.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static void __exit crc32c_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crc32c_mod_init);</div><div class='add'>+subsys_initcall(crc32c_mod_init);</div><div class='ctx'> module_exit(crc32c_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Clay Haapala &lt;chaapala@cisco.com&gt;");</div><div class='head'>diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c<br/>index 8e94e29dc6fc..d90c0070710e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crct10dif_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crct10dif_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crct10dif_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/crct10dif_generic.c</a></div><div class='hunk'>@@ -65,10 +65,9 @@ static int chksum_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len,</div><div class='del'>-			u8 *out)</div><div class='add'>+static int __chksum_finup(__u16 crc, const u8 *data, unsigned int len, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	*(__u16 *)out = crc_t10dif_generic(*crcp, data, len);</div><div class='add'>+	*(__u16 *)out = crc_t10dif_generic(crc, data, len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -77,15 +76,13 @@ static int chksum_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	return __chksum_finup(&amp;ctx-&gt;crc, data, len, out);</div><div class='add'>+	return __chksum_finup(ctx-&gt;crc, data, len, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int chksum_digest(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			 unsigned int length, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return __chksum_finup(&amp;ctx-&gt;crc, data, length, out);</div><div class='add'>+	return __chksum_finup(0, data, length, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct shash_alg alg = {</div><div class='hunk'>@@ -115,7 +112,7 @@ static void __exit crct10dif_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crct10dif_mod_init);</div><div class='add'>+subsys_initcall(crct10dif_mod_init);</div><div class='ctx'> module_exit(crct10dif_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Tim Chen &lt;tim.c.chen@linux.intel.com&gt;");</div><div class='head'>diff --git a/crypto/cryptd.c b/crypto/cryptd.c<br/>index 5640e5db7bdb..b3bb99390ae7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cryptd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cryptd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cryptd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cryptd.c</a></div><div class='hunk'>@@ -65,15 +65,6 @@ struct aead_instance_ctx {</div><div class='ctx'> 	struct cryptd_queue *queue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct cryptd_blkcipher_ctx {</div><div class='del'>-	atomic_t refcnt;</div><div class='del'>-	struct crypto_blkcipher *child;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cryptd_blkcipher_request_ctx {</div><div class='del'>-	crypto_completion_t complete;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct cryptd_skcipher_ctx {</div><div class='ctx'> 	atomic_t refcnt;</div><div class='ctx'> 	struct crypto_sync_skcipher *child;</div><div class='hunk'>@@ -216,129 +207,6 @@ static inline void cryptd_check_internal(struct rtattr **tb, u32 *type,</div><div class='ctx'> 	*mask |= algt-&gt;mask &amp; CRYPTO_ALG_INTERNAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cryptd_blkcipher_setkey(struct crypto_ablkcipher *parent,</div><div class='del'>-				   const u8 *key, unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_ablkcipher_ctx(parent);</div><div class='del'>-	struct crypto_blkcipher *child = ctx-&gt;child;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	crypto_blkcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_blkcipher_set_flags(child, crypto_ablkcipher_get_flags(parent) &amp;</div><div class='del'>-					  CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	err = crypto_blkcipher_setkey(child, key, keylen);</div><div class='del'>-	crypto_ablkcipher_set_flags(parent, crypto_blkcipher_get_flags(child) &amp;</div><div class='del'>-					    CRYPTO_TFM_RES_MASK);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_blkcipher_crypt(struct ablkcipher_request *req,</div><div class='del'>-				   struct crypto_blkcipher *child,</div><div class='del'>-				   int err,</div><div class='del'>-				   int (*crypt)(struct blkcipher_desc *desc,</div><div class='del'>-						struct scatterlist *dst,</div><div class='del'>-						struct scatterlist *src,</div><div class='del'>-						unsigned int len))</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_request_ctx *rctx;</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx;</div><div class='del'>-	struct crypto_ablkcipher *tfm;</div><div class='del'>-	struct blkcipher_desc desc;</div><div class='del'>-	int refcnt;</div><div class='del'>-</div><div class='del'>-	rctx = ablkcipher_request_ctx(req);</div><div class='del'>-</div><div class='del'>-	if (unlikely(err == -EINPROGRESS))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	desc.tfm = child;</div><div class='del'>-	desc.info = req-&gt;info;</div><div class='del'>-	desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='del'>-	err = crypt(&amp;desc, req-&gt;dst, req-&gt;src, req-&gt;nbytes);</div><div class='del'>-</div><div class='del'>-	req-&gt;base.complete = rctx-&gt;complete;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	tfm = crypto_ablkcipher_reqtfm(req);</div><div class='del'>-	ctx = crypto_ablkcipher_ctx(tfm);</div><div class='del'>-	refcnt = atomic_read(&amp;ctx-&gt;refcnt);</div><div class='del'>-</div><div class='del'>-	local_bh_disable();</div><div class='del'>-	rctx-&gt;complete(&amp;req-&gt;base, err);</div><div class='del'>-	local_bh_enable();</div><div class='del'>-</div><div class='del'>-	if (err != -EINPROGRESS &amp;&amp; refcnt &amp;&amp; atomic_dec_and_test(&amp;ctx-&gt;refcnt))</div><div class='del'>-		crypto_free_ablkcipher(tfm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_blkcipher_encrypt(struct crypto_async_request *req, int err)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_tfm_ctx(req-&gt;tfm);</div><div class='del'>-	struct crypto_blkcipher *child = ctx-&gt;child;</div><div class='del'>-</div><div class='del'>-	cryptd_blkcipher_crypt(ablkcipher_request_cast(req), child, err,</div><div class='del'>-			       crypto_blkcipher_crt(child)-&gt;encrypt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_blkcipher_decrypt(struct crypto_async_request *req, int err)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_tfm_ctx(req-&gt;tfm);</div><div class='del'>-	struct crypto_blkcipher *child = ctx-&gt;child;</div><div class='del'>-</div><div class='del'>-	cryptd_blkcipher_crypt(ablkcipher_request_cast(req), child, err,</div><div class='del'>-			       crypto_blkcipher_crt(child)-&gt;decrypt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_blkcipher_enqueue(struct ablkcipher_request *req,</div><div class='del'>-				    crypto_completion_t compl)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_request_ctx *rctx = ablkcipher_request_ctx(req);</div><div class='del'>-	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='del'>-	struct cryptd_queue *queue;</div><div class='del'>-</div><div class='del'>-	queue = cryptd_get_queue(crypto_ablkcipher_tfm(tfm));</div><div class='del'>-	rctx-&gt;complete = req-&gt;base.complete;</div><div class='del'>-	req-&gt;base.complete = compl;</div><div class='del'>-</div><div class='del'>-	return cryptd_enqueue_request(queue, &amp;req-&gt;base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_blkcipher_encrypt_enqueue(struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	return cryptd_blkcipher_enqueue(req, cryptd_blkcipher_encrypt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_blkcipher_decrypt_enqueue(struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	return cryptd_blkcipher_enqueue(req, cryptd_blkcipher_decrypt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cryptd_blkcipher_init_tfm(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);</div><div class='del'>-	struct cryptd_instance_ctx *ictx = crypto_instance_ctx(inst);</div><div class='del'>-	struct crypto_spawn *spawn = &amp;ictx-&gt;spawn;</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	struct crypto_blkcipher *cipher;</div><div class='del'>-</div><div class='del'>-	cipher = crypto_spawn_blkcipher(spawn);</div><div class='del'>-	if (IS_ERR(cipher))</div><div class='del'>-		return PTR_ERR(cipher);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;child = cipher;</div><div class='del'>-	tfm-&gt;crt_ablkcipher.reqsize =</div><div class='del'>-		sizeof(struct cryptd_blkcipher_request_ctx);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cryptd_blkcipher_exit_tfm(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	crypto_free_blkcipher(ctx-&gt;child);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cryptd_init_instance(struct crypto_instance *inst,</div><div class='ctx'> 				struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='hunk'>@@ -382,67 +250,6 @@ out_free_inst:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cryptd_create_blkcipher(struct crypto_template *tmpl,</div><div class='del'>-				   struct rtattr **tb,</div><div class='del'>-				   struct cryptd_queue *queue)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_instance_ctx *ctx;</div><div class='del'>-	struct crypto_instance *inst;</div><div class='del'>-	struct crypto_alg *alg;</div><div class='del'>-	u32 type = CRYPTO_ALG_TYPE_BLKCIPHER;</div><div class='del'>-	u32 mask = CRYPTO_ALG_TYPE_MASK;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	cryptd_check_internal(tb, &amp;type, &amp;mask);</div><div class='del'>-</div><div class='del'>-	alg = crypto_get_attr_alg(tb, type, mask);</div><div class='del'>-	if (IS_ERR(alg))</div><div class='del'>-		return PTR_ERR(alg);</div><div class='del'>-</div><div class='del'>-	inst = cryptd_alloc_instance(alg, 0, sizeof(*ctx));</div><div class='del'>-	err = PTR_ERR(inst);</div><div class='del'>-	if (IS_ERR(inst))</div><div class='del'>-		goto out_put_alg;</div><div class='del'>-</div><div class='del'>-	ctx = crypto_instance_ctx(inst);</div><div class='del'>-	ctx-&gt;queue = queue;</div><div class='del'>-</div><div class='del'>-	err = crypto_init_spawn(&amp;ctx-&gt;spawn, alg, inst,</div><div class='del'>-				CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free_inst;</div><div class='del'>-</div><div class='del'>-	type = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;</div><div class='del'>-	if (alg-&gt;cra_flags &amp; CRYPTO_ALG_INTERNAL)</div><div class='del'>-		type |= CRYPTO_ALG_INTERNAL;</div><div class='del'>-	inst-&gt;alg.cra_flags = type;</div><div class='del'>-	inst-&gt;alg.cra_type = &amp;crypto_ablkcipher_type;</div><div class='del'>-</div><div class='del'>-	inst-&gt;alg.cra_ablkcipher.ivsize = alg-&gt;cra_blkcipher.ivsize;</div><div class='del'>-	inst-&gt;alg.cra_ablkcipher.min_keysize = alg-&gt;cra_blkcipher.min_keysize;</div><div class='del'>-	inst-&gt;alg.cra_ablkcipher.max_keysize = alg-&gt;cra_blkcipher.max_keysize;</div><div class='del'>-</div><div class='del'>-	inst-&gt;alg.cra_ctxsize = sizeof(struct cryptd_blkcipher_ctx);</div><div class='del'>-</div><div class='del'>-	inst-&gt;alg.cra_init = cryptd_blkcipher_init_tfm;</div><div class='del'>-	inst-&gt;alg.cra_exit = cryptd_blkcipher_exit_tfm;</div><div class='del'>-</div><div class='del'>-	inst-&gt;alg.cra_ablkcipher.setkey = cryptd_blkcipher_setkey;</div><div class='del'>-	inst-&gt;alg.cra_ablkcipher.encrypt = cryptd_blkcipher_encrypt_enqueue;</div><div class='del'>-	inst-&gt;alg.cra_ablkcipher.decrypt = cryptd_blkcipher_decrypt_enqueue;</div><div class='del'>-</div><div class='del'>-	err = crypto_register_instance(tmpl, inst);</div><div class='del'>-	if (err) {</div><div class='del'>-		crypto_drop_spawn(&amp;ctx-&gt;spawn);</div><div class='del'>-out_free_inst:</div><div class='del'>-		kfree(inst);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out_put_alg:</div><div class='del'>-	crypto_mod_put(alg);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cryptd_skcipher_setkey(struct crypto_skcipher *parent,</div><div class='ctx'> 				  const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='hunk'>@@ -738,7 +545,6 @@ static void cryptd_hash_init(struct crypto_async_request *req_async, int err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = child;</div><div class='del'>-	desc-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_shash_init(desc);</div><div class='ctx'> </div><div class='hunk'>@@ -830,7 +636,6 @@ static void cryptd_hash_digest(struct crypto_async_request *req_async, int err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = child;</div><div class='del'>-	desc-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	err = shash_ahash_digest(req, desc);</div><div class='ctx'> </div><div class='hunk'>@@ -859,7 +664,6 @@ static int cryptd_hash_import(struct ahash_request *req, const void *in)</div><div class='ctx'> 	struct shash_desc *desc = cryptd_shash_desc(req);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = ctx-&gt;child;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_import(desc, in);</div><div class='ctx'> }</div><div class='hunk'>@@ -1118,10 +922,6 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> </div><div class='ctx'> 	switch (algt-&gt;type &amp; algt-&gt;mask &amp; CRYPTO_ALG_TYPE_MASK) {</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_BLKCIPHER:</div><div class='del'>-		if ((algt-&gt;type &amp; CRYPTO_ALG_TYPE_MASK) ==</div><div class='del'>-		    CRYPTO_ALG_TYPE_BLKCIPHER)</div><div class='del'>-			return cryptd_create_blkcipher(tmpl, tb, &amp;queue);</div><div class='del'>-</div><div class='ctx'> 		return cryptd_create_skcipher(tmpl, tb, &amp;queue);</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_DIGEST:</div><div class='ctx'> 		return cryptd_create_hash(tmpl, tb, &amp;queue);</div><div class='hunk'>@@ -1160,58 +960,6 @@ static struct crypto_template cryptd_tmpl = {</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct cryptd_ablkcipher *cryptd_alloc_ablkcipher(const char *alg_name,</div><div class='del'>-						  u32 type, u32 mask)</div><div class='del'>-{</div><div class='del'>-	char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx;</div><div class='del'>-	struct crypto_tfm *tfm;</div><div class='del'>-</div><div class='del'>-	if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,</div><div class='del'>-		     "cryptd(%s)", alg_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	type = crypto_skcipher_type(type);</div><div class='del'>-	mask &amp;= ~CRYPTO_ALG_TYPE_MASK;</div><div class='del'>-	mask |= CRYPTO_ALG_TYPE_BLKCIPHER_MASK;</div><div class='del'>-	tfm = crypto_alloc_base(cryptd_alg_name, type, mask);</div><div class='del'>-	if (IS_ERR(tfm))</div><div class='del'>-		return ERR_CAST(tfm);</div><div class='del'>-	if (tfm-&gt;__crt_alg-&gt;cra_module != THIS_MODULE) {</div><div class='del'>-		crypto_free_tfm(tfm);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	atomic_set(&amp;ctx-&gt;refcnt, 1);</div><div class='del'>-</div><div class='del'>-	return __cryptd_ablkcipher_cast(__crypto_ablkcipher_cast(tfm));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_alloc_ablkcipher);</div><div class='del'>-</div><div class='del'>-struct crypto_blkcipher *cryptd_ablkcipher_child(struct cryptd_ablkcipher *tfm)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_ablkcipher_ctx(&amp;tfm-&gt;base);</div><div class='del'>-	return ctx-&gt;child;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_ablkcipher_child);</div><div class='del'>-</div><div class='del'>-bool cryptd_ablkcipher_queued(struct cryptd_ablkcipher *tfm)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_ablkcipher_ctx(&amp;tfm-&gt;base);</div><div class='del'>-</div><div class='del'>-	return atomic_read(&amp;ctx-&gt;refcnt) - 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_ablkcipher_queued);</div><div class='del'>-</div><div class='del'>-void cryptd_free_ablkcipher(struct cryptd_ablkcipher *tfm)</div><div class='del'>-{</div><div class='del'>-	struct cryptd_blkcipher_ctx *ctx = crypto_ablkcipher_ctx(&amp;tfm-&gt;base);</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;ctx-&gt;refcnt))</div><div class='del'>-		crypto_free_ablkcipher(&amp;tfm-&gt;base);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cryptd_free_ablkcipher);</div><div class='del'>-</div><div class='ctx'> struct cryptd_skcipher *cryptd_alloc_skcipher(const char *alg_name,</div><div class='ctx'> 					      u32 type, u32 mask)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c<br/>index 01630a9c7e01..9320d4eaa4a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crypto_null.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crypto_null.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crypto_null.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/crypto_null.c</a></div><div class='hunk'>@@ -220,7 +220,7 @@ static void __exit crypto_null_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_skcipher(&amp;skcipher_null);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_null_mod_init);</div><div class='add'>+subsys_initcall(crypto_null_mod_init);</div><div class='ctx'> module_exit(crypto_null_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/crypto_user_base.c b/crypto/crypto_user_base.c<br/>index f25d3f32c9c2..e48da3b75c71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crypto_user_base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/crypto_user_base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/crypto_user_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/crypto_user_base.c</a></div><div class='hunk'>@@ -465,8 +465,8 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX,</div><div class='del'>-			  crypto_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, crypto_msg_min[type], attrs,</div><div class='add'>+				     CRYPTOCFGA_MAX, crypto_policy, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/ctr.c b/crypto/ctr.c<br/>index ec8f8b67473a..52cdf2c5605f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ctr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ctr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ctr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ctr.c</a></div><div class='hunk'>@@ -384,7 +384,7 @@ static void __exit crypto_ctr_module_exit(void)</div><div class='ctx'> 				    ARRAY_SIZE(crypto_ctr_tmpls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_ctr_module_init);</div><div class='add'>+subsys_initcall(crypto_ctr_module_init);</div><div class='ctx'> module_exit(crypto_ctr_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/cts.c b/crypto/cts.c<br/>index 4e28d83ae37d..6b6087dbb62a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cts.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/cts.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/cts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/cts.c</a></div><div class='hunk'>@@ -152,12 +152,14 @@ static int crypto_cts_encrypt(struct skcipher_request *req)</div><div class='ctx'> 	struct skcipher_request *subreq = &amp;rctx-&gt;subreq;</div><div class='ctx'> 	int bsize = crypto_skcipher_blocksize(tfm);</div><div class='ctx'> 	unsigned int nbytes = req-&gt;cryptlen;</div><div class='del'>-	int cbc_blocks = (nbytes + bsize - 1) / bsize - 1;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> </div><div class='ctx'> 	skcipher_request_set_tfm(subreq, ctx-&gt;child);</div><div class='ctx'> </div><div class='del'>-	if (cbc_blocks &lt;= 0) {</div><div class='add'>+	if (nbytes &lt; bsize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nbytes == bsize) {</div><div class='ctx'> 		skcipher_request_set_callback(subreq, req-&gt;base.flags,</div><div class='ctx'> 					      req-&gt;base.complete,</div><div class='ctx'> 					      req-&gt;base.data);</div><div class='hunk'>@@ -166,7 +168,7 @@ static int crypto_cts_encrypt(struct skcipher_request *req)</div><div class='ctx'> 		return crypto_skcipher_encrypt(subreq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	offset = cbc_blocks * bsize;</div><div class='add'>+	offset = rounddown(nbytes - 1, bsize);</div><div class='ctx'> 	rctx-&gt;offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	skcipher_request_set_callback(subreq, req-&gt;base.flags,</div><div class='hunk'>@@ -244,13 +246,15 @@ static int crypto_cts_decrypt(struct skcipher_request *req)</div><div class='ctx'> 	struct skcipher_request *subreq = &amp;rctx-&gt;subreq;</div><div class='ctx'> 	int bsize = crypto_skcipher_blocksize(tfm);</div><div class='ctx'> 	unsigned int nbytes = req-&gt;cryptlen;</div><div class='del'>-	int cbc_blocks = (nbytes + bsize - 1) / bsize - 1;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> 	u8 *space;</div><div class='ctx'> </div><div class='ctx'> 	skcipher_request_set_tfm(subreq, ctx-&gt;child);</div><div class='ctx'> </div><div class='del'>-	if (cbc_blocks &lt;= 0) {</div><div class='add'>+	if (nbytes &lt; bsize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nbytes == bsize) {</div><div class='ctx'> 		skcipher_request_set_callback(subreq, req-&gt;base.flags,</div><div class='ctx'> 					      req-&gt;base.complete,</div><div class='ctx'> 					      req-&gt;base.data);</div><div class='hunk'>@@ -264,10 +268,10 @@ static int crypto_cts_decrypt(struct skcipher_request *req)</div><div class='ctx'> </div><div class='ctx'> 	space = crypto_cts_reqctx_space(req);</div><div class='ctx'> </div><div class='del'>-	offset = cbc_blocks * bsize;</div><div class='add'>+	offset = rounddown(nbytes - 1, bsize);</div><div class='ctx'> 	rctx-&gt;offset = offset;</div><div class='ctx'> </div><div class='del'>-	if (cbc_blocks &lt;= 1)</div><div class='add'>+	if (offset &lt;= bsize)</div><div class='ctx'> 		memcpy(space, req-&gt;iv, bsize);</div><div class='ctx'> 	else</div><div class='ctx'> 		scatterwalk_map_and_copy(space, req-&gt;src, offset - 2 * bsize,</div><div class='hunk'>@@ -419,7 +423,7 @@ static void __exit crypto_cts_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_cts_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_cts_module_init);</div><div class='add'>+subsys_initcall(crypto_cts_module_init);</div><div class='ctx'> module_exit(crypto_cts_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/crypto/deflate.c b/crypto/deflate.c<br/>index 94ec3b36a8e8..aab089cde1bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/deflate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/deflate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/deflate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/deflate.c</a></div><div class='hunk'>@@ -334,7 +334,7 @@ static void __exit deflate_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_scomps(scomp, ARRAY_SIZE(scomp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(deflate_mod_init);</div><div class='add'>+subsys_initcall(deflate_mod_init);</div><div class='ctx'> module_exit(deflate_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/des_generic.c b/crypto/des_generic.c<br/>index 1e6621665dd9..d7a88b4fa611 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/des_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/des_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/des_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/des_generic.c</a></div><div class='hunk'>@@ -862,14 +862,11 @@ static void des_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key,</div><div class='ctx'> 		      unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	const u32 *K = (const u32 *)key;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-		     !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &amp;&amp;</div><div class='del'>-		     (*flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = __des3_verify_key(flags, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	des_ekey(expkey, key); expkey += DES_EXPKEY_WORDS; key += DES_KEY_SIZE;</div><div class='ctx'> 	dkey(expkey, key); expkey += DES_EXPKEY_WORDS; key += DES_KEY_SIZE;</div><div class='hunk'>@@ -993,7 +990,7 @@ static void __exit des_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_algs(des_algs, ARRAY_SIZE(des_algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(des_generic_mod_init);</div><div class='add'>+subsys_initcall(des_generic_mod_init);</div><div class='ctx'> module_exit(des_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/dh.c b/crypto/dh.c<br/>index 09a44de4209d..ce77fb4ee8b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/dh.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/dh.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/dh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/dh.c</a></div><div class='hunk'>@@ -236,7 +236,7 @@ static void dh_exit(void)</div><div class='ctx'> 	crypto_unregister_kpp(&amp;dh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(dh_init);</div><div class='add'>+subsys_initcall(dh_init);</div><div class='ctx'> module_exit(dh_exit);</div><div class='ctx'> MODULE_ALIAS_CRYPTO("dh");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/drbg.c b/crypto/drbg.c<br/>index bc52d9562611..2a5b16bb000c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/drbg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/drbg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/drbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/drbg.c</a></div><div class='hunk'>@@ -1587,7 +1587,6 @@ static int drbg_init_hash_kernel(struct drbg_state *drbg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sdesc-&gt;shash.tfm = tfm;</div><div class='del'>-	sdesc-&gt;shash.flags = 0;</div><div class='ctx'> 	drbg-&gt;priv_data = sdesc;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_alignmask(tfm);</div><div class='hunk'>@@ -2039,7 +2038,7 @@ static void __exit drbg_exit(void)</div><div class='ctx'> 	crypto_unregister_rngs(drbg_algs, (ARRAY_SIZE(drbg_cores) * 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(drbg_init);</div><div class='add'>+subsys_initcall(drbg_init);</div><div class='ctx'> module_exit(drbg_exit);</div><div class='ctx'> #ifndef CRYPTO_DRBG_HASH_STRING</div><div class='ctx'> #define CRYPTO_DRBG_HASH_STRING ""</div><div class='head'>diff --git a/crypto/ecb.c b/crypto/ecb.c<br/>index 0732715c8d91..de839129d151 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecb.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ static void __exit crypto_ecb_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_ecb_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_ecb_module_init);</div><div class='add'>+subsys_initcall(crypto_ecb_module_init);</div><div class='ctx'> module_exit(crypto_ecb_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/ecc.c b/crypto/ecc.c<br/>index ed1237115066..dfe114bc0c4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecc.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2013, Kenneth MacKay</div><div class='del'>- * All rights reserved.</div><div class='add'>+ * Copyright (c) 2013, 2014 Kenneth MacKay. All rights reserved.</div><div class='add'>+ * Copyright (c) 2019 Vitaly Chikunov &lt;vt@altlinux.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='ctx'>  * modification, are permitted provided that the following conditions are</div><div class='hunk'>@@ -24,12 +24,15 @@</div><div class='ctx'>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/swab.h&gt;</div><div class='ctx'> #include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;crypto/ecdh.h&gt;</div><div class='ctx'> #include &lt;crypto/rng.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ecc.h"</div><div class='ctx'> #include "ecc_curve_defs.h"</div><div class='hunk'>@@ -112,7 +115,7 @@ static void vli_clear(u64 *vli, unsigned int ndigits)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns true if vli == 0, false otherwise. */</div><div class='del'>-static bool vli_is_zero(const u64 *vli, unsigned int ndigits)</div><div class='add'>+bool vli_is_zero(const u64 *vli, unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +126,7 @@ static bool vli_is_zero(const u64 *vli, unsigned int ndigits)</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(vli_is_zero);</div><div class='ctx'> </div><div class='ctx'> /* Returns nonzero if bit bit of vli is set. */</div><div class='ctx'> static u64 vli_test_bit(const u64 *vli, unsigned int bit)</div><div class='hunk'>@@ -130,6 +134,11 @@ static u64 vli_test_bit(const u64 *vli, unsigned int bit)</div><div class='ctx'> 	return (vli[bit / 64] &amp; ((u64)1 &lt;&lt; (bit % 64)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool vli_is_negative(const u64 *vli, unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	return vli_test_bit(vli, ndigits * 64 - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Counts the number of 64-bit "digits" in vli. */</div><div class='ctx'> static unsigned int vli_num_digits(const u64 *vli, unsigned int ndigits)</div><div class='ctx'> {</div><div class='hunk'>@@ -161,6 +170,27 @@ static unsigned int vli_num_bits(const u64 *vli, unsigned int ndigits)</div><div class='ctx'> 	return ((num_digits - 1) * 64 + i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Set dest from unaligned bit string src. */</div><div class='add'>+void vli_from_be64(u64 *dest, const void *src, unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	const u64 *from = src;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ndigits; i++)</div><div class='add'>+		dest[i] = get_unaligned_be64(&amp;from[ndigits - 1 - i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vli_from_be64);</div><div class='add'>+</div><div class='add'>+void vli_from_le64(u64 *dest, const void *src, unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	const u64 *from = src;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ndigits; i++)</div><div class='add'>+		dest[i] = get_unaligned_le64(&amp;from[i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vli_from_le64);</div><div class='add'>+</div><div class='ctx'> /* Sets dest = src. */</div><div class='ctx'> static void vli_set(u64 *dest, const u64 *src, unsigned int ndigits)</div><div class='ctx'> {</div><div class='hunk'>@@ -171,7 +201,7 @@ static void vli_set(u64 *dest, const u64 *src, unsigned int ndigits)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns sign of left - right. */</div><div class='del'>-static int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits)</div><div class='add'>+int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -184,6 +214,7 @@ static int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(vli_cmp);</div><div class='ctx'> </div><div class='ctx'> /* Computes result = in &lt;&lt; c, returning carry. Can modify in place</div><div class='ctx'>  * (if result == in). 0 &lt; shift &lt; 64.</div><div class='hunk'>@@ -239,8 +270,30 @@ static u64 vli_add(u64 *result, const u64 *left, const u64 *right,</div><div class='ctx'> 	return carry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Computes result = left + right, returning carry. Can modify in place. */</div><div class='add'>+static u64 vli_uadd(u64 *result, const u64 *left, u64 right,</div><div class='add'>+		    unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 carry = right;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ndigits; i++) {</div><div class='add'>+		u64 sum;</div><div class='add'>+</div><div class='add'>+		sum = left[i] + carry;</div><div class='add'>+		if (sum != left[i])</div><div class='add'>+			carry = (sum &lt; left[i]);</div><div class='add'>+		else</div><div class='add'>+			carry = !!carry;</div><div class='add'>+</div><div class='add'>+		result[i] = sum;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return carry;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Computes result = left - right, returning borrow. Can modify in place. */</div><div class='del'>-static u64 vli_sub(u64 *result, const u64 *left, const u64 *right,</div><div class='add'>+u64 vli_sub(u64 *result, const u64 *left, const u64 *right,</div><div class='ctx'> 		   unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	u64 borrow = 0;</div><div class='hunk'>@@ -258,9 +311,37 @@ static u64 vli_sub(u64 *result, const u64 *left, const u64 *right,</div><div class='ctx'> </div><div class='ctx'> 	return borrow;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(vli_sub);</div><div class='add'>+</div><div class='add'>+/* Computes result = left - right, returning borrow. Can modify in place. */</div><div class='add'>+static u64 vli_usub(u64 *result, const u64 *left, u64 right,</div><div class='add'>+	     unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 borrow = right;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ndigits; i++) {</div><div class='add'>+		u64 diff;</div><div class='add'>+</div><div class='add'>+		diff = left[i] - borrow;</div><div class='add'>+		if (diff != left[i])</div><div class='add'>+			borrow = (diff &gt; left[i]);</div><div class='add'>+</div><div class='add'>+		result[i] = diff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return borrow;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static uint128_t mul_64_64(u64 left, u64 right)</div><div class='ctx'> {</div><div class='add'>+	uint128_t result;</div><div class='add'>+#if defined(CONFIG_ARCH_SUPPORTS_INT128) &amp;&amp; defined(__SIZEOF_INT128__)</div><div class='add'>+	unsigned __int128 m = (unsigned __int128)left * right;</div><div class='add'>+</div><div class='add'>+	result.m_low  = m;</div><div class='add'>+	result.m_high = m &gt;&gt; 64;</div><div class='add'>+#else</div><div class='ctx'> 	u64 a0 = left &amp; 0xffffffffull;</div><div class='ctx'> 	u64 a1 = left &gt;&gt; 32;</div><div class='ctx'> 	u64 b0 = right &amp; 0xffffffffull;</div><div class='hunk'>@@ -269,7 +350,6 @@ static uint128_t mul_64_64(u64 left, u64 right)</div><div class='ctx'> 	u64 m1 = a0 * b1;</div><div class='ctx'> 	u64 m2 = a1 * b0;</div><div class='ctx'> 	u64 m3 = a1 * b1;</div><div class='del'>-	uint128_t result;</div><div class='ctx'> </div><div class='ctx'> 	m2 += (m0 &gt;&gt; 32);</div><div class='ctx'> 	m2 += m1;</div><div class='hunk'>@@ -280,7 +360,7 @@ static uint128_t mul_64_64(u64 left, u64 right)</div><div class='ctx'> </div><div class='ctx'> 	result.m_low = (m0 &amp; 0xffffffffull) | (m2 &lt;&lt; 32);</div><div class='ctx'> 	result.m_high = m3 + (m2 &gt;&gt; 32);</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,6 +410,28 @@ static void vli_mult(u64 *result, const u64 *left, const u64 *right,</div><div class='ctx'> 	result[ndigits * 2 - 1] = r01.m_low;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Compute product = left * right, for a small right value. */</div><div class='add'>+static void vli_umult(u64 *result, const u64 *left, u32 right,</div><div class='add'>+		      unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	uint128_t r01 = { 0 };</div><div class='add'>+	unsigned int k;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; ndigits; k++) {</div><div class='add'>+		uint128_t product;</div><div class='add'>+</div><div class='add'>+		product = mul_64_64(left[k], right);</div><div class='add'>+		r01 = add_128_128(r01, product);</div><div class='add'>+		/* no carry */</div><div class='add'>+		result[k] = r01.m_low;</div><div class='add'>+		r01.m_low = r01.m_high;</div><div class='add'>+		r01.m_high = 0;</div><div class='add'>+	}</div><div class='add'>+	result[k] = r01.m_low;</div><div class='add'>+	for (++k; k &lt; ndigits * 2; k++)</div><div class='add'>+		result[k] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void vli_square(u64 *result, const u64 *left, unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	uint128_t r01 = { 0, 0 };</div><div class='hunk'>@@ -402,6 +504,170 @@ static void vli_mod_sub(u64 *result, const u64 *left, const u64 *right,</div><div class='ctx'> 		vli_add(result, result, mod, ndigits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Computes result = product % mod</div><div class='add'>+ * for special form moduli: p = 2^k-c, for small c (note the minus sign)</div><div class='add'>+ *</div><div class='add'>+ * References:</div><div class='add'>+ * R. Crandall, C. Pomerance. Prime Numbers: A Computational Perspective.</div><div class='add'>+ * 9 Fast Algorithms for Large-Integer Arithmetic. 9.2.3 Moduli of special form</div><div class='add'>+ * Algorithm 9.2.13 (Fast mod operation for special-form moduli).</div><div class='add'>+ */</div><div class='add'>+static void vli_mmod_special(u64 *result, const u64 *product,</div><div class='add'>+			      const u64 *mod, unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 c = -mod[0];</div><div class='add'>+	u64 t[ECC_MAX_DIGITS * 2];</div><div class='add'>+	u64 r[ECC_MAX_DIGITS * 2];</div><div class='add'>+</div><div class='add'>+	vli_set(r, product, ndigits * 2);</div><div class='add'>+	while (!vli_is_zero(r + ndigits, ndigits)) {</div><div class='add'>+		vli_umult(t, r + ndigits, c, ndigits);</div><div class='add'>+		vli_clear(r + ndigits, ndigits);</div><div class='add'>+		vli_add(r, r, t, ndigits * 2);</div><div class='add'>+	}</div><div class='add'>+	vli_set(t, mod, ndigits);</div><div class='add'>+	vli_clear(t + ndigits, ndigits);</div><div class='add'>+	while (vli_cmp(r, t, ndigits * 2) &gt;= 0)</div><div class='add'>+		vli_sub(r, r, t, ndigits * 2);</div><div class='add'>+	vli_set(result, r, ndigits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Computes result = product % mod</div><div class='add'>+ * for special form moduli: p = 2^{k-1}+c, for small c (note the plus sign)</div><div class='add'>+ * where k-1 does not fit into qword boundary by -1 bit (such as 255).</div><div class='add'>+</div><div class='add'>+ * References (loosely based on):</div><div class='add'>+ * A. Menezes, P. van Oorschot, S. Vanstone. Handbook of Applied Cryptography.</div><div class='add'>+ * 14.3.4 Reduction methods for moduli of special form. Algorithm 14.47.</div><div class='add'>+ * URL: http://cacr.uwaterloo.ca/hac/about/chap14.pdf</div><div class='add'>+ *</div><div class='add'>+ * H. Cohen, G. Frey, R. Avanzi, C. Doche, T. Lange, K. Nguyen, F. Vercauteren.</div><div class='add'>+ * Handbook of Elliptic and Hyperelliptic Curve Cryptography.</div><div class='add'>+ * Algorithm 10.25 Fast reduction for special form moduli</div><div class='add'>+ */</div><div class='add'>+static void vli_mmod_special2(u64 *result, const u64 *product,</div><div class='add'>+			       const u64 *mod, unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 c2 = mod[0] * 2;</div><div class='add'>+	u64 q[ECC_MAX_DIGITS];</div><div class='add'>+	u64 r[ECC_MAX_DIGITS * 2];</div><div class='add'>+	u64 m[ECC_MAX_DIGITS * 2]; /* expanded mod */</div><div class='add'>+	int carry; /* last bit that doesn't fit into q */</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	vli_set(m, mod, ndigits);</div><div class='add'>+	vli_clear(m + ndigits, ndigits);</div><div class='add'>+</div><div class='add'>+	vli_set(r, product, ndigits);</div><div class='add'>+	/* q and carry are top bits */</div><div class='add'>+	vli_set(q, product + ndigits, ndigits);</div><div class='add'>+	vli_clear(r + ndigits, ndigits);</div><div class='add'>+	carry = vli_is_negative(r, ndigits);</div><div class='add'>+	if (carry)</div><div class='add'>+		r[ndigits - 1] &amp;= (1ull &lt;&lt; 63) - 1;</div><div class='add'>+	for (i = 1; carry || !vli_is_zero(q, ndigits); i++) {</div><div class='add'>+		u64 qc[ECC_MAX_DIGITS * 2];</div><div class='add'>+</div><div class='add'>+		vli_umult(qc, q, c2, ndigits);</div><div class='add'>+		if (carry)</div><div class='add'>+			vli_uadd(qc, qc, mod[0], ndigits * 2);</div><div class='add'>+		vli_set(q, qc + ndigits, ndigits);</div><div class='add'>+		vli_clear(qc + ndigits, ndigits);</div><div class='add'>+		carry = vli_is_negative(qc, ndigits);</div><div class='add'>+		if (carry)</div><div class='add'>+			qc[ndigits - 1] &amp;= (1ull &lt;&lt; 63) - 1;</div><div class='add'>+		if (i &amp; 1)</div><div class='add'>+			vli_sub(r, r, qc, ndigits * 2);</div><div class='add'>+		else</div><div class='add'>+			vli_add(r, r, qc, ndigits * 2);</div><div class='add'>+	}</div><div class='add'>+	while (vli_is_negative(r, ndigits * 2))</div><div class='add'>+		vli_add(r, r, m, ndigits * 2);</div><div class='add'>+	while (vli_cmp(r, m, ndigits * 2) &gt;= 0)</div><div class='add'>+		vli_sub(r, r, m, ndigits * 2);</div><div class='add'>+</div><div class='add'>+	vli_set(result, r, ndigits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Computes result = product % mod, where product is 2N words long.</div><div class='add'>+ * Reference: Ken MacKay's micro-ecc.</div><div class='add'>+ * Currently only designed to work for curve_p or curve_n.</div><div class='add'>+ */</div><div class='add'>+static void vli_mmod_slow(u64 *result, u64 *product, const u64 *mod,</div><div class='add'>+			  unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 mod_m[2 * ECC_MAX_DIGITS];</div><div class='add'>+	u64 tmp[2 * ECC_MAX_DIGITS];</div><div class='add'>+	u64 *v[2] = { tmp, product };</div><div class='add'>+	u64 carry = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	/* Shift mod so its highest set bit is at the maximum position. */</div><div class='add'>+	int shift = (ndigits * 2 * 64) - vli_num_bits(mod, ndigits);</div><div class='add'>+	int word_shift = shift / 64;</div><div class='add'>+	int bit_shift = shift % 64;</div><div class='add'>+</div><div class='add'>+	vli_clear(mod_m, word_shift);</div><div class='add'>+	if (bit_shift &gt; 0) {</div><div class='add'>+		for (i = 0; i &lt; ndigits; ++i) {</div><div class='add'>+			mod_m[word_shift + i] = (mod[i] &lt;&lt; bit_shift) | carry;</div><div class='add'>+			carry = mod[i] &gt;&gt; (64 - bit_shift);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		vli_set(mod_m + word_shift, mod, ndigits);</div><div class='add'>+</div><div class='add'>+	for (i = 1; shift &gt;= 0; --shift) {</div><div class='add'>+		u64 borrow = 0;</div><div class='add'>+		unsigned int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ndigits * 2; ++j) {</div><div class='add'>+			u64 diff = v[i][j] - mod_m[j] - borrow;</div><div class='add'>+</div><div class='add'>+			if (diff != v[i][j])</div><div class='add'>+				borrow = (diff &gt; v[i][j]);</div><div class='add'>+			v[1 - i][j] = diff;</div><div class='add'>+		}</div><div class='add'>+		i = !(i ^ borrow); /* Swap the index if there was no borrow */</div><div class='add'>+		vli_rshift1(mod_m, ndigits);</div><div class='add'>+		mod_m[ndigits - 1] |= mod_m[ndigits] &lt;&lt; (64 - 1);</div><div class='add'>+		vli_rshift1(mod_m + ndigits, ndigits);</div><div class='add'>+	}</div><div class='add'>+	vli_set(result, v[i], ndigits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Computes result = product % mod using Barrett's reduction with precomputed</div><div class='add'>+ * value mu appended to the mod after ndigits, mu = (2^{2w} / mod) and have</div><div class='add'>+ * length ndigits + 1, where mu * (2^w - 1) should not overflow ndigits</div><div class='add'>+ * boundary.</div><div class='add'>+ *</div><div class='add'>+ * Reference:</div><div class='add'>+ * R. Brent, P. Zimmermann. Modern Computer Arithmetic. 2010.</div><div class='add'>+ * 2.4.1 Barrett's algorithm. Algorithm 2.5.</div><div class='add'>+ */</div><div class='add'>+static void vli_mmod_barrett(u64 *result, u64 *product, const u64 *mod,</div><div class='add'>+			     unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 q[ECC_MAX_DIGITS * 2];</div><div class='add'>+	u64 r[ECC_MAX_DIGITS * 2];</div><div class='add'>+	const u64 *mu = mod + ndigits;</div><div class='add'>+</div><div class='add'>+	vli_mult(q, product + ndigits, mu, ndigits);</div><div class='add'>+	if (mu[ndigits])</div><div class='add'>+		vli_add(q + ndigits, q + ndigits, product + ndigits, ndigits);</div><div class='add'>+	vli_mult(r, mod, q + ndigits, ndigits);</div><div class='add'>+	vli_sub(r, product, r, ndigits * 2);</div><div class='add'>+	while (!vli_is_zero(r + ndigits, ndigits) ||</div><div class='add'>+	       vli_cmp(r, mod, ndigits) != -1) {</div><div class='add'>+		u64 carry;</div><div class='add'>+</div><div class='add'>+		carry = vli_sub(r, r, mod, ndigits);</div><div class='add'>+		vli_usub(r + ndigits, r + ndigits, carry, ndigits);</div><div class='add'>+	}</div><div class='add'>+	vli_set(result, r, ndigits);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Computes p_result = p_product % curve_p.</div><div class='ctx'>  * See algorithm 5 and 6 from</div><div class='ctx'>  * http://www.isys.uni-klu.ac.at/PDF/2001-0126-MT.pdf</div><div class='hunk'>@@ -509,14 +775,33 @@ static void vli_mmod_fast_256(u64 *result, const u64 *product,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Computes result = product % curve_prime</div><div class='del'>- *  from http://www.nsa.gov/ia/_files/nist-routines.pdf</div><div class='del'>-*/</div><div class='add'>+/* Computes result = product % curve_prime for different curve_primes.</div><div class='add'>+ *</div><div class='add'>+ * Note that curve_primes are distinguished just by heuristic check and</div><div class='add'>+ * not by complete conformance check.</div><div class='add'>+ */</div><div class='ctx'> static bool vli_mmod_fast(u64 *result, u64 *product,</div><div class='ctx'> 			  const u64 *curve_prime, unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	u64 tmp[2 * ECC_MAX_DIGITS];</div><div class='ctx'> </div><div class='add'>+	/* Currently, both NIST primes have -1 in lowest qword. */</div><div class='add'>+	if (curve_prime[0] != -1ull) {</div><div class='add'>+		/* Try to handle Pseudo-Marsenne primes. */</div><div class='add'>+		if (curve_prime[ndigits - 1] == -1ull) {</div><div class='add'>+			vli_mmod_special(result, product, curve_prime,</div><div class='add'>+					 ndigits);</div><div class='add'>+			return true;</div><div class='add'>+		} else if (curve_prime[ndigits - 1] == 1ull &lt;&lt; 63 &amp;&amp;</div><div class='add'>+			   curve_prime[ndigits - 2] == 0) {</div><div class='add'>+			vli_mmod_special2(result, product, curve_prime,</div><div class='add'>+					  ndigits);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		vli_mmod_barrett(result, product, curve_prime, ndigits);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (ndigits) {</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		vli_mmod_fast_192(result, product, curve_prime, tmp);</div><div class='hunk'>@@ -525,13 +810,26 @@ static bool vli_mmod_fast(u64 *result, u64 *product,</div><div class='ctx'> 		vli_mmod_fast_256(result, product, curve_prime, tmp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		pr_err("unsupports digits size!\n");</div><div class='add'>+		pr_err_ratelimited("ecc: unsupported digits size!\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Computes result = (left * right) % mod.</div><div class='add'>+ * Assumes that mod is big enough curve order.</div><div class='add'>+ */</div><div class='add'>+void vli_mod_mult_slow(u64 *result, const u64 *left, const u64 *right,</div><div class='add'>+		       const u64 *mod, unsigned int ndigits)</div><div class='add'>+{</div><div class='add'>+	u64 product[ECC_MAX_DIGITS * 2];</div><div class='add'>+</div><div class='add'>+	vli_mult(product, left, right, ndigits);</div><div class='add'>+	vli_mmod_slow(result, product, mod, ndigits);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vli_mod_mult_slow);</div><div class='add'>+</div><div class='ctx'> /* Computes result = (left * right) % curve_prime. */</div><div class='ctx'> static void vli_mod_mult_fast(u64 *result, const u64 *left, const u64 *right,</div><div class='ctx'> 			      const u64 *curve_prime, unsigned int ndigits)</div><div class='hunk'>@@ -557,7 +855,7 @@ static void vli_mod_square_fast(u64 *result, const u64 *left,</div><div class='ctx'>  * See "From Euclid's GCD to Montgomery Multiplication to the Great Divide"</div><div class='ctx'>  * https://labs.oracle.com/techrep/2001/smli_tr-2001-95.pdf</div><div class='ctx'>  */</div><div class='del'>-static void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,</div><div class='add'>+void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,</div><div class='ctx'> 			unsigned int ndigits)</div><div class='ctx'> {</div><div class='ctx'> 	u64 a[ECC_MAX_DIGITS], b[ECC_MAX_DIGITS];</div><div class='hunk'>@@ -630,6 +928,7 @@ static void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,</div><div class='ctx'> </div><div class='ctx'> 	vli_set(result, u, ndigits);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(vli_mod_inv);</div><div class='ctx'> </div><div class='ctx'> /* ------ Point operations ------ */</div><div class='ctx'> </div><div class='hunk'>@@ -903,6 +1202,85 @@ static void ecc_point_mult(struct ecc_point *result,</div><div class='ctx'> 	vli_set(result-&gt;y, ry[0], ndigits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Computes R = P + Q mod p */</div><div class='add'>+static void ecc_point_add(const struct ecc_point *result,</div><div class='add'>+		   const struct ecc_point *p, const struct ecc_point *q,</div><div class='add'>+		   const struct ecc_curve *curve)</div><div class='add'>+{</div><div class='add'>+	u64 z[ECC_MAX_DIGITS];</div><div class='add'>+	u64 px[ECC_MAX_DIGITS];</div><div class='add'>+	u64 py[ECC_MAX_DIGITS];</div><div class='add'>+	unsigned int ndigits = curve-&gt;g.ndigits;</div><div class='add'>+</div><div class='add'>+	vli_set(result-&gt;x, q-&gt;x, ndigits);</div><div class='add'>+	vli_set(result-&gt;y, q-&gt;y, ndigits);</div><div class='add'>+	vli_mod_sub(z, result-&gt;x, p-&gt;x, curve-&gt;p, ndigits);</div><div class='add'>+	vli_set(px, p-&gt;x, ndigits);</div><div class='add'>+	vli_set(py, p-&gt;y, ndigits);</div><div class='add'>+	xycz_add(px, py, result-&gt;x, result-&gt;y, curve-&gt;p, ndigits);</div><div class='add'>+	vli_mod_inv(z, z, curve-&gt;p, ndigits);</div><div class='add'>+	apply_z(result-&gt;x, result-&gt;y, z, curve-&gt;p, ndigits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Computes R = u1P + u2Q mod p using Shamir's trick.</div><div class='add'>+ * Based on: Kenneth MacKay's micro-ecc (2014).</div><div class='add'>+ */</div><div class='add'>+void ecc_point_mult_shamir(const struct ecc_point *result,</div><div class='add'>+			   const u64 *u1, const struct ecc_point *p,</div><div class='add'>+			   const u64 *u2, const struct ecc_point *q,</div><div class='add'>+			   const struct ecc_curve *curve)</div><div class='add'>+{</div><div class='add'>+	u64 z[ECC_MAX_DIGITS];</div><div class='add'>+	u64 sump[2][ECC_MAX_DIGITS];</div><div class='add'>+	u64 *rx = result-&gt;x;</div><div class='add'>+	u64 *ry = result-&gt;y;</div><div class='add'>+	unsigned int ndigits = curve-&gt;g.ndigits;</div><div class='add'>+	unsigned int num_bits;</div><div class='add'>+	struct ecc_point sum = ECC_POINT_INIT(sump[0], sump[1], ndigits);</div><div class='add'>+	const struct ecc_point *points[4];</div><div class='add'>+	const struct ecc_point *point;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ecc_point_add(&amp;sum, p, q, curve);</div><div class='add'>+	points[0] = NULL;</div><div class='add'>+	points[1] = p;</div><div class='add'>+	points[2] = q;</div><div class='add'>+	points[3] = &amp;sum;</div><div class='add'>+</div><div class='add'>+	num_bits = max(vli_num_bits(u1, ndigits),</div><div class='add'>+		       vli_num_bits(u2, ndigits));</div><div class='add'>+	i = num_bits - 1;</div><div class='add'>+	idx = (!!vli_test_bit(u1, i)) | ((!!vli_test_bit(u2, i)) &lt;&lt; 1);</div><div class='add'>+	point = points[idx];</div><div class='add'>+</div><div class='add'>+	vli_set(rx, point-&gt;x, ndigits);</div><div class='add'>+	vli_set(ry, point-&gt;y, ndigits);</div><div class='add'>+	vli_clear(z + 1, ndigits - 1);</div><div class='add'>+	z[0] = 1;</div><div class='add'>+</div><div class='add'>+	for (--i; i &gt;= 0; i--) {</div><div class='add'>+		ecc_point_double_jacobian(rx, ry, z, curve-&gt;p, ndigits);</div><div class='add'>+		idx = (!!vli_test_bit(u1, i)) | ((!!vli_test_bit(u2, i)) &lt;&lt; 1);</div><div class='add'>+		point = points[idx];</div><div class='add'>+		if (point) {</div><div class='add'>+			u64 tx[ECC_MAX_DIGITS];</div><div class='add'>+			u64 ty[ECC_MAX_DIGITS];</div><div class='add'>+			u64 tz[ECC_MAX_DIGITS];</div><div class='add'>+</div><div class='add'>+			vli_set(tx, point-&gt;x, ndigits);</div><div class='add'>+			vli_set(ty, point-&gt;y, ndigits);</div><div class='add'>+			apply_z(tx, ty, z, curve-&gt;p, ndigits);</div><div class='add'>+			vli_mod_sub(tz, rx, tx, curve-&gt;p, ndigits);</div><div class='add'>+			xycz_add(tx, ty, rx, ry, curve-&gt;p, ndigits);</div><div class='add'>+			vli_mod_mult_fast(z, z, tz, curve-&gt;p, ndigits);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	vli_mod_inv(z, z, curve-&gt;p, ndigits);</div><div class='add'>+	apply_z(rx, ry, z, curve-&gt;p, ndigits);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ecc_point_mult_shamir);</div><div class='add'>+</div><div class='ctx'> static inline void ecc_swap_digits(const u64 *in, u64 *out,</div><div class='ctx'> 				   unsigned int ndigits)</div><div class='ctx'> {</div><div class='hunk'>@@ -948,6 +1326,7 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,</div><div class='ctx'> </div><div class='ctx'> 	return __ecc_is_key_valid(curve, private_key, ndigits);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ecc_is_key_valid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ECC private keys are generated using the method of extra random bits,</div><div class='hunk'>@@ -1000,6 +1379,7 @@ int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits, u64 *privkey)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ecc_gen_privkey);</div><div class='ctx'> </div><div class='ctx'> int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits,</div><div class='ctx'> 		     const u64 *private_key, u64 *public_key)</div><div class='hunk'>@@ -1036,13 +1416,17 @@ err_free_point:</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ecc_make_pub_key);</div><div class='ctx'> </div><div class='ctx'> /* SP800-56A section 5.6.2.3.4 partial verification: ephemeral keys only */</div><div class='del'>-static int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,</div><div class='del'>-				       struct ecc_point *pk)</div><div class='add'>+int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,</div><div class='add'>+				struct ecc_point *pk)</div><div class='ctx'> {</div><div class='ctx'> 	u64 yy[ECC_MAX_DIGITS], xxx[ECC_MAX_DIGITS], w[ECC_MAX_DIGITS];</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(pk-&gt;ndigits != curve-&gt;g.ndigits))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* Check 1: Verify key is not the zero point. */</div><div class='ctx'> 	if (ecc_point_is_zero(pk))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1064,8 +1448,8 @@ static int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ecc_is_pubkey_valid_partial);</div><div class='ctx'> </div><div class='ctx'> int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,</div><div class='ctx'> 			      const u64 *private_key, const u64 *public_key,</div><div class='hunk'>@@ -1121,3 +1505,6 @@ err_alloc_product:</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(crypto_ecdh_shared_secret);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/crypto/ecc.h b/crypto/ecc.h<br/>index f75a86baa3bd..ab0eb70b9c09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecc.h</a></div><div class='hunk'>@@ -26,13 +26,51 @@</div><div class='ctx'> #ifndef _CRYPTO_ECC_H</div><div class='ctx'> #define _CRYPTO_ECC_H</div><div class='ctx'> </div><div class='add'>+/* One digit is u64 qword. */</div><div class='ctx'> #define ECC_CURVE_NIST_P192_DIGITS  3</div><div class='ctx'> #define ECC_CURVE_NIST_P256_DIGITS  4</div><div class='del'>-#define ECC_MAX_DIGITS              ECC_CURVE_NIST_P256_DIGITS</div><div class='add'>+#define ECC_MAX_DIGITS             (512 / 64)</div><div class='ctx'> </div><div class='ctx'> #define ECC_DIGITS_TO_BYTES_SHIFT 3</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct ecc_point - elliptic curve point in affine coordinates</div><div class='add'>+ *</div><div class='add'>+ * @x:		X coordinate in vli form.</div><div class='add'>+ * @y:		Y coordinate in vli form.</div><div class='add'>+ * @ndigits:	Length of vlis in u64 qwords.</div><div class='add'>+ */</div><div class='add'>+struct ecc_point {</div><div class='add'>+	u64 *x;</div><div class='add'>+	u64 *y;</div><div class='add'>+	u8 ndigits;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ECC_POINT_INIT(x, y, ndigits)	(struct ecc_point) { x, y, ndigits }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ecc_curve - definition of elliptic curve</div><div class='add'>+ *</div><div class='add'>+ * @name:	Short name of the curve.</div><div class='add'>+ * @g:		Generator point of the curve.</div><div class='add'>+ * @p:		Prime number, if Barrett's reduction is used for this curve</div><div class='add'>+ *		pre-calculated value 'mu' is appended to the @p after ndigits.</div><div class='add'>+ *		Use of Barrett's reduction is heuristically determined in</div><div class='add'>+ *		vli_mmod_fast().</div><div class='add'>+ * @n:		Order of the curve group.</div><div class='add'>+ * @a:		Curve parameter a.</div><div class='add'>+ * @b:		Curve parameter b.</div><div class='add'>+ */</div><div class='add'>+struct ecc_curve {</div><div class='add'>+	char *name;</div><div class='add'>+	struct ecc_point g;</div><div class='add'>+	u64 *p;</div><div class='add'>+	u64 *n;</div><div class='add'>+	u64 *a;</div><div class='add'>+	u64 *b;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ecc_is_key_valid() - Validate a given ECDH private key</div><div class='ctx'>  *</div><div class='ctx'>  * @curve_id:		id representing the curve to use</div><div class='hunk'>@@ -91,4 +129,117 @@ int ecc_make_pub_key(const unsigned int curve_id, unsigned int ndigits,</div><div class='ctx'> int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,</div><div class='ctx'> 			      const u64 *private_key, const u64 *public_key,</div><div class='ctx'> 			      u64 *secret);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ecc_is_pubkey_valid_partial() - Partial public key validation</div><div class='add'>+ *</div><div class='add'>+ * @curve:		elliptic curve domain parameters</div><div class='add'>+ * @pk:			public key as a point</div><div class='add'>+ *</div><div class='add'>+ * Valdiate public key according to SP800-56A section 5.6.2.3.4 ECC Partial</div><div class='add'>+ * Public-Key Validation Routine.</div><div class='add'>+ *</div><div class='add'>+ * Note: There is no check that the public key is in the correct elliptic curve</div><div class='add'>+ * subgroup.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if validation is successful, -EINVAL if validation is failed.</div><div class='add'>+ */</div><div class='add'>+int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,</div><div class='add'>+				struct ecc_point *pk);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_is_zero() - Determine is vli is zero</div><div class='add'>+ *</div><div class='add'>+ * @vli:		vli to check.</div><div class='add'>+ * @ndigits:		length of the @vli</div><div class='add'>+ */</div><div class='add'>+bool vli_is_zero(const u64 *vli, unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_cmp() - compare left and right vlis</div><div class='add'>+ *</div><div class='add'>+ * @left:		vli</div><div class='add'>+ * @right:		vli</div><div class='add'>+ * @ndigits:		length of both vlis</div><div class='add'>+ *</div><div class='add'>+ * Returns sign of @left - @right, i.e. -1 if @left &lt; @right,</div><div class='add'>+ * 0 if @left == @right, 1 if @left &gt; @right.</div><div class='add'>+ */</div><div class='add'>+int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_sub() - Subtracts right from left</div><div class='add'>+ *</div><div class='add'>+ * @result:		where to write result</div><div class='add'>+ * @left:		vli</div><div class='add'>+ * @right		vli</div><div class='add'>+ * @ndigits:		length of all vlis</div><div class='add'>+ *</div><div class='add'>+ * Note: can modify in-place.</div><div class='add'>+ *</div><div class='add'>+ * Return: carry bit.</div><div class='add'>+ */</div><div class='add'>+u64 vli_sub(u64 *result, const u64 *left, const u64 *right,</div><div class='add'>+	    unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_from_be64() - Load vli from big-endian u64 array</div><div class='add'>+ *</div><div class='add'>+ * @dest:		destination vli</div><div class='add'>+ * @src:		source array of u64 BE values</div><div class='add'>+ * @ndigits:		length of both vli and array</div><div class='add'>+ */</div><div class='add'>+void vli_from_be64(u64 *dest, const void *src, unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_from_le64() - Load vli from little-endian u64 array</div><div class='add'>+ *</div><div class='add'>+ * @dest:		destination vli</div><div class='add'>+ * @src:		source array of u64 LE values</div><div class='add'>+ * @ndigits:		length of both vli and array</div><div class='add'>+ */</div><div class='add'>+void vli_from_le64(u64 *dest, const void *src, unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_mod_inv() - Modular inversion</div><div class='add'>+ *</div><div class='add'>+ * @result:		where to write vli number</div><div class='add'>+ * @input:		vli value to operate on</div><div class='add'>+ * @mod:		modulus</div><div class='add'>+ * @ndigits:		length of all vlis</div><div class='add'>+ */</div><div class='add'>+void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,</div><div class='add'>+		 unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vli_mod_mult_slow() - Modular multiplication</div><div class='add'>+ *</div><div class='add'>+ * @result:		where to write result value</div><div class='add'>+ * @left:		vli number to multiply with @right</div><div class='add'>+ * @right:		vli number to multiply with @left</div><div class='add'>+ * @mod:		modulus</div><div class='add'>+ * @ndigits:		length of all vlis</div><div class='add'>+ *</div><div class='add'>+ * Note: Assumes that mod is big enough curve order.</div><div class='add'>+ */</div><div class='add'>+void vli_mod_mult_slow(u64 *result, const u64 *left, const u64 *right,</div><div class='add'>+		       const u64 *mod, unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ecc_point_mult_shamir() - Add two points multiplied by scalars</div><div class='add'>+ *</div><div class='add'>+ * @result:		resulting point</div><div class='add'>+ * @x:			scalar to multiply with @p</div><div class='add'>+ * @p:			point to multiply with @x</div><div class='add'>+ * @y:			scalar to multiply with @q</div><div class='add'>+ * @q:			point to multiply with @y</div><div class='add'>+ * @curve:		curve</div><div class='add'>+ *</div><div class='add'>+ * Returns result = x * p + x * q over the curve.</div><div class='add'>+ * This works faster than two multiplications and addition.</div><div class='add'>+ */</div><div class='add'>+void ecc_point_mult_shamir(const struct ecc_point *result,</div><div class='add'>+			   const u64 *x, const struct ecc_point *p,</div><div class='add'>+			   const u64 *y, const struct ecc_point *q,</div><div class='add'>+			   const struct ecc_curve *curve);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/crypto/ecc_curve_defs.h b/crypto/ecc_curve_defs.h<br/>index 336ab1805639..69be6c7d228f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecc_curve_defs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecc_curve_defs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecc_curve_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecc_curve_defs.h</a></div><div class='hunk'>@@ -2,21 +2,6 @@</div><div class='ctx'> #ifndef _CRYTO_ECC_CURVE_DEFS_H</div><div class='ctx'> #define _CRYTO_ECC_CURVE_DEFS_H</div><div class='ctx'> </div><div class='del'>-struct ecc_point {</div><div class='del'>-	u64 *x;</div><div class='del'>-	u64 *y;</div><div class='del'>-	u8 ndigits;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ecc_curve {</div><div class='del'>-	char *name;</div><div class='del'>-	struct ecc_point g;</div><div class='del'>-	u64 *p;</div><div class='del'>-	u64 *n;</div><div class='del'>-	u64 *a;</div><div class='del'>-	u64 *b;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* NIST P-192: a = p - 3 */</div><div class='ctx'> static u64 nist_p192_g_x[] = { 0xF4FF0AFD82FF1012ull, 0x7CBF20EB43A18800ull,</div><div class='ctx'> 				0x188DA80EB03090F6ull };</div><div class='head'>diff --git a/crypto/ecdh.c b/crypto/ecdh.c<br/>index bf6300175b9c..890092bd8989 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecdh.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ecdh.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecdh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecdh.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ static void ecdh_exit(void)</div><div class='ctx'> 	crypto_unregister_kpp(&amp;ecdh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(ecdh_init);</div><div class='add'>+subsys_initcall(ecdh_init);</div><div class='ctx'> module_exit(ecdh_exit);</div><div class='ctx'> MODULE_ALIAS_CRYPTO("ecdh");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/echainiv.c b/crypto/echainiv.c<br/>index 77e607fdbfb7..e71d1bc8d850 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/echainiv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/echainiv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/echainiv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/echainiv.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ static void __exit echainiv_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;echainiv_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(echainiv_module_init);</div><div class='add'>+subsys_initcall(echainiv_module_init);</div><div class='ctx'> module_exit(echainiv_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/ecrdsa.c b/crypto/ecrdsa.c<br/>new file mode 100644<br/>index 000000000000..887ec21aee49<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecrdsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecrdsa.c</a></div><div class='hunk'>@@ -0,0 +1,296 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Elliptic Curve (Russian) Digital Signature Algorithm for Cryptographic API</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Vitaly Chikunov &lt;vt@altlinux.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * References:</div><div class='add'>+ * GOST 34.10-2018, GOST R 34.10-2012, RFC 7091, ISO/IEC 14888-3:2018.</div><div class='add'>+ *</div><div class='add'>+ * Historical references:</div><div class='add'>+ * GOST R 34.10-2001, RFC 4357, ISO/IEC 14888-3:2006/Amd 1:2010.</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 Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</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/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/streebog.h&gt;</div><div class='add'>+#include &lt;crypto/internal/akcipher.h&gt;</div><div class='add'>+#include &lt;crypto/akcipher.h&gt;</div><div class='add'>+#include &lt;linux/oid_registry.h&gt;</div><div class='add'>+#include "ecrdsa_params.asn1.h"</div><div class='add'>+#include "ecrdsa_pub_key.asn1.h"</div><div class='add'>+#include "ecc.h"</div><div class='add'>+#include "ecrdsa_defs.h"</div><div class='add'>+</div><div class='add'>+#define ECRDSA_MAX_SIG_SIZE (2 * 512 / 8)</div><div class='add'>+#define ECRDSA_MAX_DIGITS (512 / 64)</div><div class='add'>+</div><div class='add'>+struct ecrdsa_ctx {</div><div class='add'>+	enum OID algo_oid; /* overall public key oid */</div><div class='add'>+	enum OID curve_oid; /* parameter */</div><div class='add'>+	enum OID digest_oid; /* parameter */</div><div class='add'>+	const struct ecc_curve *curve; /* curve from oid */</div><div class='add'>+	unsigned int digest_len; /* parameter (bytes) */</div><div class='add'>+	const char *digest; /* digest name from oid */</div><div class='add'>+	unsigned int key_len; /* @key length (bytes) */</div><div class='add'>+	const char *key; /* raw public key */</div><div class='add'>+	struct ecc_point pub_key;</div><div class='add'>+	u64 _pubp[2][ECRDSA_MAX_DIGITS]; /* point storage for @pub_key */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ecc_curve *get_curve_by_oid(enum OID oid)</div><div class='add'>+{</div><div class='add'>+	switch (oid) {</div><div class='add'>+	case OID_gostCPSignA:</div><div class='add'>+	case OID_gostTC26Sign256B:</div><div class='add'>+		return &amp;gost_cp256a;</div><div class='add'>+	case OID_gostCPSignB:</div><div class='add'>+	case OID_gostTC26Sign256C:</div><div class='add'>+		return &amp;gost_cp256b;</div><div class='add'>+	case OID_gostCPSignC:</div><div class='add'>+	case OID_gostTC26Sign256D:</div><div class='add'>+		return &amp;gost_cp256c;</div><div class='add'>+	case OID_gostTC26Sign512A:</div><div class='add'>+		return &amp;gost_tc512a;</div><div class='add'>+	case OID_gostTC26Sign512B:</div><div class='add'>+		return &amp;gost_tc512b;</div><div class='add'>+	/* The following two aren't implemented: */</div><div class='add'>+	case OID_gostTC26Sign256A:</div><div class='add'>+	case OID_gostTC26Sign512C:</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 int ecrdsa_verify(struct akcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='add'>+	struct ecrdsa_ctx *ctx = akcipher_tfm_ctx(tfm);</div><div class='add'>+	unsigned char sig[ECRDSA_MAX_SIG_SIZE];</div><div class='add'>+	unsigned char digest[STREEBOG512_DIGEST_SIZE];</div><div class='add'>+	unsigned int ndigits = req-&gt;dst_len / sizeof(u64);</div><div class='add'>+	u64 r[ECRDSA_MAX_DIGITS]; /* witness (r) */</div><div class='add'>+	u64 _r[ECRDSA_MAX_DIGITS]; /* -r */</div><div class='add'>+	u64 s[ECRDSA_MAX_DIGITS]; /* second part of sig (s) */</div><div class='add'>+	u64 e[ECRDSA_MAX_DIGITS]; /* h \mod q */</div><div class='add'>+	u64 *v = e;		  /* e^{-1} \mod q */</div><div class='add'>+	u64 z1[ECRDSA_MAX_DIGITS];</div><div class='add'>+	u64 *z2 = _r;</div><div class='add'>+	struct ecc_point cc = ECC_POINT_INIT(s, e, ndigits); /* reuse s, e */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Digest value, digest algorithm, and curve (modulus) should have the</div><div class='add'>+	 * same length (256 or 512 bits), public key and signature should be</div><div class='add'>+	 * twice bigger.</div><div class='add'>+	 */</div><div class='add'>+	if (!ctx-&gt;curve ||</div><div class='add'>+	    !ctx-&gt;digest ||</div><div class='add'>+	    !req-&gt;src ||</div><div class='add'>+	    !ctx-&gt;pub_key.x ||</div><div class='add'>+	    req-&gt;dst_len != ctx-&gt;digest_len ||</div><div class='add'>+	    req-&gt;dst_len != ctx-&gt;curve-&gt;g.ndigits * sizeof(u64) ||</div><div class='add'>+	    ctx-&gt;pub_key.ndigits != ctx-&gt;curve-&gt;g.ndigits ||</div><div class='add'>+	    req-&gt;dst_len * 2 != req-&gt;src_len ||</div><div class='add'>+	    WARN_ON(req-&gt;src_len &gt; sizeof(sig)) ||</div><div class='add'>+	    WARN_ON(req-&gt;dst_len &gt; sizeof(digest)))</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	sg_copy_to_buffer(req-&gt;src, sg_nents_for_len(req-&gt;src, req-&gt;src_len),</div><div class='add'>+			  sig, req-&gt;src_len);</div><div class='add'>+	sg_pcopy_to_buffer(req-&gt;src,</div><div class='add'>+			   sg_nents_for_len(req-&gt;src,</div><div class='add'>+					    req-&gt;src_len + req-&gt;dst_len),</div><div class='add'>+			   digest, req-&gt;dst_len, req-&gt;src_len);</div><div class='add'>+</div><div class='add'>+	vli_from_be64(s, sig, ndigits);</div><div class='add'>+	vli_from_be64(r, sig + ndigits * sizeof(u64), ndigits);</div><div class='add'>+</div><div class='add'>+	/* Step 1: verify that 0 &lt; r &lt; q, 0 &lt; s &lt; q */</div><div class='add'>+	if (vli_is_zero(r, ndigits) ||</div><div class='add'>+	    vli_cmp(r, ctx-&gt;curve-&gt;n, ndigits) == 1 ||</div><div class='add'>+	    vli_is_zero(s, ndigits) ||</div><div class='add'>+	    vli_cmp(s, ctx-&gt;curve-&gt;n, ndigits) == 1)</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+	/* Step 2: calculate hash (h) of the message (passed as input) */</div><div class='add'>+	/* Step 3: calculate e = h \mod q */</div><div class='add'>+	vli_from_le64(e, digest, ndigits);</div><div class='add'>+	if (vli_cmp(e, ctx-&gt;curve-&gt;n, ndigits) == 1)</div><div class='add'>+		vli_sub(e, e, ctx-&gt;curve-&gt;n, ndigits);</div><div class='add'>+	if (vli_is_zero(e, ndigits))</div><div class='add'>+		e[0] = 1;</div><div class='add'>+</div><div class='add'>+	/* Step 4: calculate v = e^{-1} \mod q */</div><div class='add'>+	vli_mod_inv(v, e, ctx-&gt;curve-&gt;n, ndigits);</div><div class='add'>+</div><div class='add'>+	/* Step 5: calculate z_1 = sv \mod q, z_2 = -rv \mod q */</div><div class='add'>+	vli_mod_mult_slow(z1, s, v, ctx-&gt;curve-&gt;n, ndigits);</div><div class='add'>+	vli_sub(_r, ctx-&gt;curve-&gt;n, r, ndigits);</div><div class='add'>+	vli_mod_mult_slow(z2, _r, v, ctx-&gt;curve-&gt;n, ndigits);</div><div class='add'>+</div><div class='add'>+	/* Step 6: calculate point C = z_1P + z_2Q, and R = x_c \mod q */</div><div class='add'>+	ecc_point_mult_shamir(&amp;cc, z1, &amp;ctx-&gt;curve-&gt;g, z2, &amp;ctx-&gt;pub_key,</div><div class='add'>+			      ctx-&gt;curve);</div><div class='add'>+	if (vli_cmp(cc.x, ctx-&gt;curve-&gt;n, ndigits) == 1)</div><div class='add'>+		vli_sub(cc.x, cc.x, ctx-&gt;curve-&gt;n, ndigits);</div><div class='add'>+</div><div class='add'>+	/* Step 7: if R == r signature is valid */</div><div class='add'>+	if (!vli_cmp(cc.x, r, ndigits))</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ecrdsa_param_curve(void *context, size_t hdrlen, unsigned char tag,</div><div class='add'>+		       const void *value, size_t vlen)</div><div class='add'>+{</div><div class='add'>+	struct ecrdsa_ctx *ctx = context;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;curve_oid = look_up_OID(value, vlen);</div><div class='add'>+	if (!ctx-&gt;curve_oid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ctx-&gt;curve = get_curve_by_oid(ctx-&gt;curve_oid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Optional. If present should match expected digest algo OID. */</div><div class='add'>+int ecrdsa_param_digest(void *context, size_t hdrlen, unsigned char tag,</div><div class='add'>+			const void *value, size_t vlen)</div><div class='add'>+{</div><div class='add'>+	struct ecrdsa_ctx *ctx = context;</div><div class='add'>+	int digest_oid = look_up_OID(value, vlen);</div><div class='add'>+</div><div class='add'>+	if (digest_oid != ctx-&gt;digest_oid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ecrdsa_parse_pub_key(void *context, size_t hdrlen, unsigned char tag,</div><div class='add'>+			 const void *value, size_t vlen)</div><div class='add'>+{</div><div class='add'>+	struct ecrdsa_ctx *ctx = context;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key = value;</div><div class='add'>+	ctx-&gt;key_len = vlen;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ecrdsa_unpack_u32(u32 *dst, void *src)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst, src, sizeof(u32));</div><div class='add'>+	return src + sizeof(u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Parse BER encoded subjectPublicKey. */</div><div class='add'>+static int ecrdsa_set_pub_key(struct crypto_akcipher *tfm, const void *key,</div><div class='add'>+			      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct ecrdsa_ctx *ctx = akcipher_tfm_ctx(tfm);</div><div class='add'>+	unsigned int ndigits;</div><div class='add'>+	u32 algo, paramlen;</div><div class='add'>+	u8 *params;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = asn1_ber_decoder(&amp;ecrdsa_pub_key_decoder, ctx, key, keylen);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Key parameters is in the key after keylen. */</div><div class='add'>+	params = ecrdsa_unpack_u32(&amp;paramlen,</div><div class='add'>+			  ecrdsa_unpack_u32(&amp;algo, (u8 *)key + keylen));</div><div class='add'>+</div><div class='add'>+	if (algo == OID_gost2012PKey256) {</div><div class='add'>+		ctx-&gt;digest	= "streebog256";</div><div class='add'>+		ctx-&gt;digest_oid	= OID_gost2012Digest256;</div><div class='add'>+		ctx-&gt;digest_len	= 256 / 8;</div><div class='add'>+	} else if (algo == OID_gost2012PKey512) {</div><div class='add'>+		ctx-&gt;digest	= "streebog512";</div><div class='add'>+		ctx-&gt;digest_oid	= OID_gost2012Digest512;</div><div class='add'>+		ctx-&gt;digest_len	= 512 / 8;</div><div class='add'>+	} else</div><div class='add'>+		return -ENOPKG;</div><div class='add'>+	ctx-&gt;algo_oid = algo;</div><div class='add'>+</div><div class='add'>+	/* Parse SubjectPublicKeyInfo.AlgorithmIdentifier.parameters. */</div><div class='add'>+	err = asn1_ber_decoder(&amp;ecrdsa_params_decoder, ctx, params, paramlen);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	/*</div><div class='add'>+	 * Sizes of algo (set in digest_len) and curve should match</div><div class='add'>+	 * each other.</div><div class='add'>+	 */</div><div class='add'>+	if (!ctx-&gt;curve ||</div><div class='add'>+	    ctx-&gt;curve-&gt;g.ndigits * sizeof(u64) != ctx-&gt;digest_len)</div><div class='add'>+		return -ENOPKG;</div><div class='add'>+	/*</div><div class='add'>+	 * Key is two 256- or 512-bit coordinates which should match</div><div class='add'>+	 * curve size.</div><div class='add'>+	 */</div><div class='add'>+	if ((ctx-&gt;key_len != (2 * 256 / 8) &amp;&amp;</div><div class='add'>+	     ctx-&gt;key_len != (2 * 512 / 8)) ||</div><div class='add'>+	    ctx-&gt;key_len != ctx-&gt;curve-&gt;g.ndigits * sizeof(u64) * 2)</div><div class='add'>+		return -ENOPKG;</div><div class='add'>+</div><div class='add'>+	ndigits = ctx-&gt;key_len / sizeof(u64) / 2;</div><div class='add'>+	ctx-&gt;pub_key = ECC_POINT_INIT(ctx-&gt;_pubp[0], ctx-&gt;_pubp[1], ndigits);</div><div class='add'>+	vli_from_le64(ctx-&gt;pub_key.x, ctx-&gt;key, ndigits);</div><div class='add'>+	vli_from_le64(ctx-&gt;pub_key.y, ctx-&gt;key + ndigits * sizeof(u64),</div><div class='add'>+		      ndigits);</div><div class='add'>+</div><div class='add'>+	if (ecc_is_pubkey_valid_partial(ctx-&gt;curve, &amp;ctx-&gt;pub_key))</div><div class='add'>+		return -EKEYREJECTED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ecrdsa_max_size(struct crypto_akcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct ecrdsa_ctx *ctx = akcipher_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Verify doesn't need any output, so it's just informational</div><div class='add'>+	 * for keyctl to determine the key bit size.</div><div class='add'>+	 */</div><div class='add'>+	return ctx-&gt;pub_key.ndigits * sizeof(u64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ecrdsa_exit_tfm(struct crypto_akcipher *tfm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct akcipher_alg ecrdsa_alg = {</div><div class='add'>+	.verify		= ecrdsa_verify,</div><div class='add'>+	.set_pub_key	= ecrdsa_set_pub_key,</div><div class='add'>+	.max_size	= ecrdsa_max_size,</div><div class='add'>+	.exit		= ecrdsa_exit_tfm,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name	 = "ecrdsa",</div><div class='add'>+		.cra_driver_name = "ecrdsa-generic",</div><div class='add'>+		.cra_priority	 = 100,</div><div class='add'>+		.cra_module	 = THIS_MODULE,</div><div class='add'>+		.cra_ctxsize	 = sizeof(struct ecrdsa_ctx),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ecrdsa_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_akcipher(&amp;ecrdsa_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ecrdsa_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_akcipher(&amp;ecrdsa_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ecrdsa_mod_init);</div><div class='add'>+module_exit(ecrdsa_mod_fini);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Vitaly Chikunov &lt;vt@altlinux.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("EC-RDSA generic algorithm");</div><div class='add'>+MODULE_ALIAS_CRYPTO("ecrdsa-generic");</div><div class='head'>diff --git a/crypto/ecrdsa_defs.h b/crypto/ecrdsa_defs.h<br/>new file mode 100644<br/>index 000000000000..170baf039007<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecrdsa_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecrdsa_defs.h</a></div><div class='hunk'>@@ -0,0 +1,225 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Definitions of EC-RDSA Curve Parameters</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Vitaly Chikunov &lt;vt@altlinux.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 Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CRYTO_ECRDSA_DEFS_H</div><div class='add'>+#define _CRYTO_ECRDSA_DEFS_H</div><div class='add'>+</div><div class='add'>+#include "ecc.h"</div><div class='add'>+</div><div class='add'>+#define ECRDSA_MAX_SIG_SIZE (2 * 512 / 8)</div><div class='add'>+#define ECRDSA_MAX_DIGITS (512 / 64)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EC-RDSA uses its own set of curves.</div><div class='add'>+ *</div><div class='add'>+ * cp256{a,b,c} curves first defined for GOST R 34.10-2001 in RFC 4357 (as</div><div class='add'>+ * 256-bit {A,B,C}-ParamSet), but inherited for GOST R 34.10-2012 and</div><div class='add'>+ * proposed for use in R 50.1.114-2016 and RFC 7836 as the 256-bit curves.</div><div class='add'>+ */</div><div class='add'>+/* OID_gostCPSignA 1.2.643.2.2.35.1 */</div><div class='add'>+static u64 cp256a_g_x[] = {</div><div class='add'>+	0x0000000000000001ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull, };</div><div class='add'>+static u64 cp256a_g_y[] = {</div><div class='add'>+	0x22ACC99C9E9F1E14ull, 0x35294F2DDF23E3B1ull,</div><div class='add'>+	0x27DF505A453F2B76ull, 0x8D91E471E0989CDAull, };</div><div class='add'>+static u64 cp256a_p[] = { /* p = 2^256 - 617 */</div><div class='add'>+	0xFFFFFFFFFFFFFD97ull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull };</div><div class='add'>+static u64 cp256a_n[] = {</div><div class='add'>+	0x45841B09B761B893ull, 0x6C611070995AD100ull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull };</div><div class='add'>+static u64 cp256a_a[] = { /* a = p - 3 */</div><div class='add'>+	0xFFFFFFFFFFFFFD94ull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull };</div><div class='add'>+static u64 cp256a_b[] = {</div><div class='add'>+	0x00000000000000a6ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull };</div><div class='add'>+</div><div class='add'>+static struct ecc_curve gost_cp256a = {</div><div class='add'>+	.name = "cp256a",</div><div class='add'>+	.g = {</div><div class='add'>+		.x = cp256a_g_x,</div><div class='add'>+		.y = cp256a_g_y,</div><div class='add'>+		.ndigits = 256 / 64,</div><div class='add'>+	},</div><div class='add'>+	.p = cp256a_p,</div><div class='add'>+	.n = cp256a_n,</div><div class='add'>+	.a = cp256a_a,</div><div class='add'>+	.b = cp256a_b</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* OID_gostCPSignB 1.2.643.2.2.35.2 */</div><div class='add'>+static u64 cp256b_g_x[] = {</div><div class='add'>+	0x0000000000000001ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull, };</div><div class='add'>+static u64 cp256b_g_y[] = {</div><div class='add'>+	0x744BF8D717717EFCull, 0xC545C9858D03ECFBull,</div><div class='add'>+	0xB83D1C3EB2C070E5ull, 0x3FA8124359F96680ull, };</div><div class='add'>+static u64 cp256b_p[] = { /* p = 2^255 + 3225 */</div><div class='add'>+	0x0000000000000C99ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x8000000000000000ull, };</div><div class='add'>+static u64 cp256b_n[] = {</div><div class='add'>+	0xE497161BCC8A198Full, 0x5F700CFFF1A624E5ull,</div><div class='add'>+	0x0000000000000001ull, 0x8000000000000000ull, };</div><div class='add'>+static u64 cp256b_a[] = { /* a = p - 3 */</div><div class='add'>+	0x0000000000000C96ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x8000000000000000ull, };</div><div class='add'>+static u64 cp256b_b[] = {</div><div class='add'>+	0x2F49D4CE7E1BBC8Bull, 0xE979259373FF2B18ull,</div><div class='add'>+	0x66A7D3C25C3DF80Aull, 0x3E1AF419A269A5F8ull, };</div><div class='add'>+</div><div class='add'>+static struct ecc_curve gost_cp256b = {</div><div class='add'>+	.name = "cp256b",</div><div class='add'>+	.g = {</div><div class='add'>+		.x = cp256b_g_x,</div><div class='add'>+		.y = cp256b_g_y,</div><div class='add'>+		.ndigits = 256 / 64,</div><div class='add'>+	},</div><div class='add'>+	.p = cp256b_p,</div><div class='add'>+	.n = cp256b_n,</div><div class='add'>+	.a = cp256b_a,</div><div class='add'>+	.b = cp256b_b</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* OID_gostCPSignC 1.2.643.2.2.35.3 */</div><div class='add'>+static u64 cp256c_g_x[] = {</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull, };</div><div class='add'>+static u64 cp256c_g_y[] = {</div><div class='add'>+	0x366E550DFDB3BB67ull, 0x4D4DC440D4641A8Full,</div><div class='add'>+	0x3CBF3783CD08C0EEull, 0x41ECE55743711A8Cull, };</div><div class='add'>+static u64 cp256c_p[] = {</div><div class='add'>+	0x7998F7B9022D759Bull, 0xCF846E86789051D3ull,</div><div class='add'>+	0xAB1EC85E6B41C8AAull, 0x9B9F605F5A858107ull,</div><div class='add'>+	/* pre-computed value for Barrett's reduction */</div><div class='add'>+	0xedc283cdd217b5a2ull, 0xbac48fc06398ae59ull,</div><div class='add'>+	0x405384d55f9f3b73ull, 0xa51f176161f1d734ull,</div><div class='add'>+	0x0000000000000001ull, };</div><div class='add'>+static u64 cp256c_n[] = {</div><div class='add'>+	0xF02F3A6598980BB9ull, 0x582CA3511EDDFB74ull,</div><div class='add'>+	0xAB1EC85E6B41C8AAull, 0x9B9F605F5A858107ull, };</div><div class='add'>+static u64 cp256c_a[] = { /* a = p - 3 */</div><div class='add'>+	0x7998F7B9022D7598ull, 0xCF846E86789051D3ull,</div><div class='add'>+	0xAB1EC85E6B41C8AAull, 0x9B9F605F5A858107ull, };</div><div class='add'>+static u64 cp256c_b[] = {</div><div class='add'>+	0x000000000000805aull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull, };</div><div class='add'>+</div><div class='add'>+static struct ecc_curve gost_cp256c = {</div><div class='add'>+	.name = "cp256c",</div><div class='add'>+	.g = {</div><div class='add'>+		.x = cp256c_g_x,</div><div class='add'>+		.y = cp256c_g_y,</div><div class='add'>+		.ndigits = 256 / 64,</div><div class='add'>+	},</div><div class='add'>+	.p = cp256c_p,</div><div class='add'>+	.n = cp256c_n,</div><div class='add'>+	.a = cp256c_a,</div><div class='add'>+	.b = cp256c_b</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* tc512{a,b} curves first recommended in 2013 and then standardized in</div><div class='add'>+ * R 50.1.114-2016 and RFC 7836 for use with GOST R 34.10-2012 (as TC26</div><div class='add'>+ * 512-bit ParamSet{A,B}).</div><div class='add'>+ */</div><div class='add'>+/* OID_gostTC26Sign512A 1.2.643.7.1.2.1.2.1 */</div><div class='add'>+static u64 tc512a_g_x[] = {</div><div class='add'>+	0x0000000000000003ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull, };</div><div class='add'>+static u64 tc512a_g_y[] = {</div><div class='add'>+	0x89A589CB5215F2A4ull, 0x8028FE5FC235F5B8ull,</div><div class='add'>+	0x3D75E6A50E3A41E9ull, 0xDF1626BE4FD036E9ull,</div><div class='add'>+	0x778064FDCBEFA921ull, 0xCE5E1C93ACF1ABC1ull,</div><div class='add'>+	0xA61B8816E25450E6ull, 0x7503CFE87A836AE3ull, };</div><div class='add'>+static u64 tc512a_p[] = { /* p = 2^512 - 569 */</div><div class='add'>+	0xFFFFFFFFFFFFFDC7ull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull, };</div><div class='add'>+static u64 tc512a_n[] = {</div><div class='add'>+	0xCACDB1411F10B275ull, 0x9B4B38ABFAD2B85Dull,</div><div class='add'>+	0x6FF22B8D4E056060ull, 0x27E69532F48D8911ull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull, };</div><div class='add'>+static u64 tc512a_a[] = { /* a = p - 3 */</div><div class='add'>+	0xFFFFFFFFFFFFFDC4ull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull,</div><div class='add'>+	0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull, };</div><div class='add'>+static u64 tc512a_b[] = {</div><div class='add'>+	0x503190785A71C760ull, 0x862EF9D4EBEE4761ull,</div><div class='add'>+	0x4CB4574010DA90DDull, 0xEE3CB090F30D2761ull,</div><div class='add'>+	0x79BD081CFD0B6265ull, 0x34B82574761CB0E8ull,</div><div class='add'>+	0xC1BD0B2B6667F1DAull, 0xE8C2505DEDFC86DDull, };</div><div class='add'>+</div><div class='add'>+static struct ecc_curve gost_tc512a = {</div><div class='add'>+	.name = "tc512a",</div><div class='add'>+	.g = {</div><div class='add'>+		.x = tc512a_g_x,</div><div class='add'>+		.y = tc512a_g_y,</div><div class='add'>+		.ndigits = 512 / 64,</div><div class='add'>+	},</div><div class='add'>+	.p = tc512a_p,</div><div class='add'>+	.n = tc512a_n,</div><div class='add'>+	.a = tc512a_a,</div><div class='add'>+	.b = tc512a_b</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* OID_gostTC26Sign512B 1.2.643.7.1.2.1.2.2 */</div><div class='add'>+static u64 tc512b_g_x[] = {</div><div class='add'>+	0x0000000000000002ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull, };</div><div class='add'>+static u64 tc512b_g_y[] = {</div><div class='add'>+	0x7E21340780FE41BDull, 0x28041055F94CEEECull,</div><div class='add'>+	0x152CBCAAF8C03988ull, 0xDCB228FD1EDF4A39ull,</div><div class='add'>+	0xBE6DD9E6C8EC7335ull, 0x3C123B697578C213ull,</div><div class='add'>+	0x2C071E3647A8940Full, 0x1A8F7EDA389B094Cull, };</div><div class='add'>+static u64 tc512b_p[] = { /* p = 2^511 + 111 */</div><div class='add'>+	0x000000000000006Full, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x8000000000000000ull, };</div><div class='add'>+static u64 tc512b_n[] = {</div><div class='add'>+	0xC6346C54374F25BDull, 0x8B996712101BEA0Eull,</div><div class='add'>+	0xACFDB77BD9D40CFAull, 0x49A1EC142565A545ull,</div><div class='add'>+	0x0000000000000001ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x8000000000000000ull, };</div><div class='add'>+static u64 tc512b_a[] = { /* a = p - 3 */</div><div class='add'>+	0x000000000000006Cull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x0000000000000000ull,</div><div class='add'>+	0x0000000000000000ull, 0x8000000000000000ull, };</div><div class='add'>+static u64 tc512b_b[] = {</div><div class='add'>+	0xFB8CCBC7C5140116ull, 0x50F78BEE1FA3106Eull,</div><div class='add'>+	0x7F8B276FAD1AB69Cull, 0x3E965D2DB1416D21ull,</div><div class='add'>+	0xBF85DC806C4B289Full, 0xB97C7D614AF138BCull,</div><div class='add'>+	0x7E3E06CF6F5E2517ull, 0x687D1B459DC84145ull, };</div><div class='add'>+</div><div class='add'>+static struct ecc_curve gost_tc512b = {</div><div class='add'>+	.name = "tc512b",</div><div class='add'>+	.g = {</div><div class='add'>+		.x = tc512b_g_x,</div><div class='add'>+		.y = tc512b_g_y,</div><div class='add'>+		.ndigits = 512 / 64,</div><div class='add'>+	},</div><div class='add'>+	.p = tc512b_p,</div><div class='add'>+	.n = tc512b_n,</div><div class='add'>+	.a = tc512b_a,</div><div class='add'>+	.b = tc512b_b</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/crypto/ecrdsa_params.asn1 b/crypto/ecrdsa_params.asn1<br/>new file mode 100644<br/>index 000000000000..aba99c3763cf<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecrdsa_params.asn1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecrdsa_params.asn1</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+EcrdsaParams ::= SEQUENCE {</div><div class='add'>+	curve	OBJECT IDENTIFIER ({ ecrdsa_param_curve }),</div><div class='add'>+	digest	OBJECT IDENTIFIER OPTIONAL ({ ecrdsa_param_digest })</div><div class='add'>+}</div><div class='head'>diff --git a/crypto/ecrdsa_pub_key.asn1 b/crypto/ecrdsa_pub_key.asn1<br/>new file mode 100644<br/>index 000000000000..048cb646bce4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ecrdsa_pub_key.asn1?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ecrdsa_pub_key.asn1</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+EcrdsaPubKey ::= OCTET STRING ({ ecrdsa_parse_pub_key })</div><div class='head'>diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c<br/>index 77286ea28865..4e8704405a3b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/fcrypt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/fcrypt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/fcrypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/fcrypt.c</a></div><div class='hunk'>@@ -414,7 +414,7 @@ static void __exit fcrypt_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;fcrypt_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(fcrypt_mod_init);</div><div class='add'>+subsys_initcall(fcrypt_mod_init);</div><div class='ctx'> module_exit(fcrypt_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/crypto/fips.c b/crypto/fips.c<br/>index 9d627c1cf8bc..9dfed122d6da 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/fips.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/fips.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/fips.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/fips.c</a></div><div class='hunk'>@@ -74,5 +74,5 @@ static void __exit fips_exit(void)</div><div class='ctx'> 	crypto_proc_fips_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(fips_init);</div><div class='add'>+subsys_initcall(fips_init);</div><div class='ctx'> module_exit(fips_exit);</div><div class='head'>diff --git a/crypto/gcm.c b/crypto/gcm.c<br/>index e1a11f529d25..33f45a980967 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/gcm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/gcm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/gcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/gcm.c</a></div><div class='hunk'>@@ -597,7 +597,6 @@ static void crypto_gcm_free(struct aead_instance *inst)</div><div class='ctx'> </div><div class='ctx'> static int crypto_gcm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 				    struct rtattr **tb,</div><div class='del'>-				    const char *full_name,</div><div class='ctx'> 				    const char *ctr_name,</div><div class='ctx'> 				    const char *ghash_name)</div><div class='ctx'> {</div><div class='hunk'>@@ -638,7 +637,8 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (ghash-&gt;digestsize != 16)</div><div class='add'>+	if (strcmp(ghash-&gt;base.cra_name, "ghash") != 0 ||</div><div class='add'>+	    ghash-&gt;digestsize != 16)</div><div class='ctx'> 		goto err_drop_ghash;</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(&amp;ctx-&gt;ctr, aead_crypto_instance(inst));</div><div class='hunk'>@@ -650,24 +650,24 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> </div><div class='ctx'> 	ctr = crypto_spawn_skcipher_alg(&amp;ctx-&gt;ctr);</div><div class='ctx'> </div><div class='del'>-	/* We only support 16-byte blocks. */</div><div class='add'>+	/* The skcipher algorithm must be CTR mode, using 16-byte blocks. */</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (crypto_skcipher_alg_ivsize(ctr) != 16)</div><div class='add'>+	if (strncmp(ctr-&gt;base.cra_name, "ctr(", 4) != 0 ||</div><div class='add'>+	    crypto_skcipher_alg_ivsize(ctr) != 16 ||</div><div class='add'>+	    ctr-&gt;base.cra_blocksize != 1)</div><div class='ctx'> 		goto out_put_ctr;</div><div class='ctx'> </div><div class='del'>-	/* Not a stream cipher? */</div><div class='del'>-	if (ctr-&gt;base.cra_blocksize != 1)</div><div class='add'>+	err = -ENAMETOOLONG;</div><div class='add'>+	if (snprintf(inst-&gt;alg.base.cra_name, CRYPTO_MAX_ALG_NAME,</div><div class='add'>+		     "gcm(%s", ctr-&gt;base.cra_name + 4) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		goto out_put_ctr;</div><div class='ctx'> </div><div class='del'>-	err = -ENAMETOOLONG;</div><div class='ctx'> 	if (snprintf(inst-&gt;alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,</div><div class='ctx'> 		     "gcm_base(%s,%s)", ctr-&gt;base.cra_driver_name,</div><div class='ctx'> 		     ghash_alg-&gt;cra_driver_name) &gt;=</div><div class='ctx'> 	    CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		goto out_put_ctr;</div><div class='ctx'> </div><div class='del'>-	memcpy(inst-&gt;alg.base.cra_name, full_name, CRYPTO_MAX_ALG_NAME);</div><div class='del'>-</div><div class='ctx'> 	inst-&gt;alg.base.cra_flags = (ghash-&gt;base.cra_flags |</div><div class='ctx'> 				    ctr-&gt;base.cra_flags) &amp; CRYPTO_ALG_ASYNC;</div><div class='ctx'> 	inst-&gt;alg.base.cra_priority = (ghash-&gt;base.cra_priority +</div><div class='hunk'>@@ -709,7 +709,6 @@ static int crypto_gcm_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> {</div><div class='ctx'> 	const char *cipher_name;</div><div class='ctx'> 	char ctr_name[CRYPTO_MAX_ALG_NAME];</div><div class='del'>-	char full_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> </div><div class='ctx'> 	cipher_name = crypto_attr_alg_name(tb[1]);</div><div class='ctx'> 	if (IS_ERR(cipher_name))</div><div class='hunk'>@@ -719,12 +718,7 @@ static int crypto_gcm_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	    CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='del'>-	if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "gcm(%s)", cipher_name) &gt;=</div><div class='del'>-	    CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return -ENAMETOOLONG;</div><div class='del'>-</div><div class='del'>-	return crypto_gcm_create_common(tmpl, tb, full_name,</div><div class='del'>-					ctr_name, "ghash");</div><div class='add'>+	return crypto_gcm_create_common(tmpl, tb, ctr_name, "ghash");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_gcm_base_create(struct crypto_template *tmpl,</div><div class='hunk'>@@ -732,7 +726,6 @@ static int crypto_gcm_base_create(struct crypto_template *tmpl,</div><div class='ctx'> {</div><div class='ctx'> 	const char *ctr_name;</div><div class='ctx'> 	const char *ghash_name;</div><div class='del'>-	char full_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> </div><div class='ctx'> 	ctr_name = crypto_attr_alg_name(tb[1]);</div><div class='ctx'> 	if (IS_ERR(ctr_name))</div><div class='hunk'>@@ -742,12 +735,7 @@ static int crypto_gcm_base_create(struct crypto_template *tmpl,</div><div class='ctx'> 	if (IS_ERR(ghash_name))</div><div class='ctx'> 		return PTR_ERR(ghash_name);</div><div class='ctx'> </div><div class='del'>-	if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "gcm_base(%s,%s)",</div><div class='del'>-		     ctr_name, ghash_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='del'>-		return -ENAMETOOLONG;</div><div class='del'>-</div><div class='del'>-	return crypto_gcm_create_common(tmpl, tb, full_name,</div><div class='del'>-					ctr_name, ghash_name);</div><div class='add'>+	return crypto_gcm_create_common(tmpl, tb, ctr_name, ghash_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_rfc4106_setkey(struct crypto_aead *parent, const u8 *key,</div><div class='hunk'>@@ -1258,7 +1246,7 @@ static void __exit crypto_gcm_module_exit(void)</div><div class='ctx'> 				    ARRAY_SIZE(crypto_gcm_tmpls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_gcm_module_init);</div><div class='add'>+subsys_initcall(crypto_gcm_module_init);</div><div class='ctx'> module_exit(crypto_gcm_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c<br/>index d9f192b953b2..e6307935413c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ghash-generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ghash-generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ghash-generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ghash-generic.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ static void __exit ghash_mod_exit(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;ghash_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(ghash_mod_init);</div><div class='add'>+subsys_initcall(ghash_mod_init);</div><div class='ctx'> module_exit(ghash_mod_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/hmac.c b/crypto/hmac.c<br/>index e74730224f0a..a68c1266121f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/hmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/hmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/hmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/hmac.c</a></div><div class='hunk'>@@ -57,8 +57,6 @@ static int hmac_setkey(struct crypto_shash *parent,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = hash;</div><div class='del'>-	shash-&gt;flags = crypto_shash_get_flags(parent)</div><div class='del'>-		&amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen &gt; bs) {</div><div class='ctx'> 		int err;</div><div class='hunk'>@@ -91,8 +89,6 @@ static int hmac_export(struct shash_desc *pdesc, void *out)</div><div class='ctx'> {</div><div class='ctx'> 	struct shash_desc *desc = shash_desc_ctx(pdesc);</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags = pdesc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='ctx'> 	return crypto_shash_export(desc, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +98,6 @@ static int hmac_import(struct shash_desc *pdesc, const void *in)</div><div class='ctx'> 	struct hmac_ctx *ctx = hmac_ctx(pdesc-&gt;tfm);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = ctx-&gt;hash;</div><div class='del'>-	desc-&gt;flags = pdesc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_import(desc, in);</div><div class='ctx'> }</div><div class='hunk'>@@ -117,8 +112,6 @@ static int hmac_update(struct shash_desc *pdesc,</div><div class='ctx'> {</div><div class='ctx'> 	struct shash_desc *desc = shash_desc_ctx(pdesc);</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags = pdesc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='ctx'> 	return crypto_shash_update(desc, data, nbytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -130,8 +123,6 @@ static int hmac_final(struct shash_desc *pdesc, u8 *out)</div><div class='ctx'> 	char *opad = crypto_shash_ctx_aligned(parent) + ss;</div><div class='ctx'> 	struct shash_desc *desc = shash_desc_ctx(pdesc);</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags = pdesc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='ctx'> 	return crypto_shash_final(desc, out) ?:</div><div class='ctx'> 	       crypto_shash_import(desc, opad) ?:</div><div class='ctx'> 	       crypto_shash_finup(desc, out, ds, out);</div><div class='hunk'>@@ -147,8 +138,6 @@ static int hmac_finup(struct shash_desc *pdesc, const u8 *data,</div><div class='ctx'> 	char *opad = crypto_shash_ctx_aligned(parent) + ss;</div><div class='ctx'> 	struct shash_desc *desc = shash_desc_ctx(pdesc);</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags = pdesc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='ctx'> 	return crypto_shash_finup(desc, data, nbytes, out) ?:</div><div class='ctx'> 	       crypto_shash_import(desc, opad) ?:</div><div class='ctx'> 	       crypto_shash_finup(desc, out, ds, out);</div><div class='hunk'>@@ -268,7 +257,7 @@ static void __exit hmac_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;hmac_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(hmac_module_init);</div><div class='add'>+subsys_initcall(hmac_module_init);</div><div class='ctx'> module_exit(hmac_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c<br/>index 787dccca3715..6ea1a270b8dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/jitterentropy-kcapi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/jitterentropy-kcapi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/jitterentropy-kcapi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/jitterentropy-kcapi.c</a></div><div class='hunk'>@@ -198,7 +198,7 @@ static void __exit jent_mod_exit(void)</div><div class='ctx'> 	crypto_unregister_rng(&amp;jent_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(jent_mod_init);</div><div class='add'>+subsys_initcall(jent_mod_init);</div><div class='ctx'> module_exit(jent_mod_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/crypto/keywrap.c b/crypto/keywrap.c<br/>index a5cfe610d8f4..a155c88105ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/keywrap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/keywrap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/keywrap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/keywrap.c</a></div><div class='hunk'>@@ -310,7 +310,7 @@ static void __exit crypto_kw_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_kw_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_kw_init);</div><div class='add'>+subsys_initcall(crypto_kw_init);</div><div class='ctx'> module_exit(crypto_kw_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/crypto/khazad.c b/crypto/khazad.c<br/>index 873eb5ded6d7..b50aa8a3ab4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/khazad.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/khazad.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/khazad.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/khazad.c</a></div><div class='hunk'>@@ -875,7 +875,7 @@ static void __exit khazad_mod_fini(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-module_init(khazad_mod_init);</div><div class='add'>+subsys_initcall(khazad_mod_init);</div><div class='ctx'> module_exit(khazad_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/lrw.c b/crypto/lrw.c<br/>index 0430ccd08728..fa302f3f161e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lrw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lrw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lrw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/lrw.c</a></div><div class='hunk'>@@ -162,8 +162,10 @@ static int xor_tweak(struct skcipher_request *req, bool second_pass)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_virt(&amp;w, req, false);</div><div class='del'>-	iv = (__be32 *)w.iv;</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	iv = (__be32 *)w.iv;</div><div class='ctx'> 	counter[0] = be32_to_cpu(iv[3]);</div><div class='ctx'> 	counter[1] = be32_to_cpu(iv[2]);</div><div class='ctx'> 	counter[2] = be32_to_cpu(iv[1]);</div><div class='hunk'>@@ -212,8 +214,12 @@ static void crypt_done(struct crypto_async_request *areq, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct skcipher_request *req = areq-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='add'>+	if (!err) {</div><div class='add'>+		struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+		rctx-&gt;subreq.base.flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 		err = xor_tweak_post(req);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skcipher_request_complete(req, err);</div><div class='ctx'> }</div><div class='hunk'>@@ -431,7 +437,7 @@ static void __exit crypto_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_module_init);</div><div class='add'>+subsys_initcall(crypto_module_init);</div><div class='ctx'> module_exit(crypto_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/lz4.c b/crypto/lz4.c<br/>index c160dfdbf2e0..1e35134d0a98 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lz4.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lz4.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lz4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/lz4.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ static void __exit lz4_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(lz4_mod_init);</div><div class='add'>+subsys_initcall(lz4_mod_init);</div><div class='ctx'> module_exit(lz4_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c<br/>index 583b5e013d7a..4a220b628fe7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lz4hc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lz4hc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lz4hc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/lz4hc.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static void __exit lz4hc_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(lz4hc_mod_init);</div><div class='add'>+subsys_initcall(lz4hc_mod_init);</div><div class='ctx'> module_exit(lz4hc_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/lzo-rle.c b/crypto/lzo-rle.c<br/>index ea9c75b1db49..4c82bf18440f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lzo-rle.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lzo-rle.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lzo-rle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/lzo-rle.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ static void __exit lzorle_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(lzorle_mod_init);</div><div class='add'>+subsys_initcall(lzorle_mod_init);</div><div class='ctx'> module_exit(lzorle_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/lzo.c b/crypto/lzo.c<br/>index 218567d717d6..4a6ac8f247d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lzo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/lzo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/lzo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/lzo.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ static void __exit lzo_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(lzo_mod_init);</div><div class='add'>+subsys_initcall(lzo_mod_init);</div><div class='ctx'> module_exit(lzo_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/md4.c b/crypto/md4.c<br/>index 9965ec40d9f9..9a1a228a0c69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/md4.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/md4.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/md4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/md4.c</a></div><div class='hunk'>@@ -232,7 +232,7 @@ static void __exit md4_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(md4_mod_init);</div><div class='add'>+subsys_initcall(md4_mod_init);</div><div class='ctx'> module_exit(md4_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/md5.c b/crypto/md5.c<br/>index 94dd78144ba3..221c2c0932f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/md5.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/md5.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/md5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/md5.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ static void __exit md5_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(md5_mod_init);</div><div class='add'>+subsys_initcall(md5_mod_init);</div><div class='ctx'> module_exit(md5_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/michael_mic.c b/crypto/michael_mic.c<br/>index 46195e0d0f4d..538ae7933795 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/michael_mic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/michael_mic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/michael_mic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/michael_mic.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ static void __exit michael_mic_exit(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-module_init(michael_mic_init);</div><div class='add'>+subsys_initcall(michael_mic_init);</div><div class='ctx'> module_exit(michael_mic_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/crypto/morus1280.c b/crypto/morus1280.c<br/>index 0747732d5b78..f8734c6576af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/morus1280.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/morus1280.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/morus1280.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/morus1280.c</a></div><div class='hunk'>@@ -532,7 +532,7 @@ static void __exit crypto_morus1280_module_exit(void)</div><div class='ctx'> 	crypto_unregister_aead(&amp;crypto_morus1280_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_morus1280_module_init);</div><div class='add'>+subsys_initcall(crypto_morus1280_module_init);</div><div class='ctx'> module_exit(crypto_morus1280_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/morus640.c b/crypto/morus640.c<br/>index 1617a1eb8be1..ae5aa9482cb4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/morus640.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/morus640.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/morus640.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/morus640.c</a></div><div class='hunk'>@@ -523,7 +523,7 @@ static void __exit crypto_morus640_module_exit(void)</div><div class='ctx'> 	crypto_unregister_aead(&amp;crypto_morus640_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_morus640_module_init);</div><div class='add'>+subsys_initcall(crypto_morus640_module_init);</div><div class='ctx'> module_exit(crypto_morus640_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/nhpoly1305.c b/crypto/nhpoly1305.c<br/>index ec831a5594d8..9ab4e07cde4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/nhpoly1305.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/nhpoly1305.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/nhpoly1305.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/nhpoly1305.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ static void __exit nhpoly1305_mod_exit(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;nhpoly1305_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(nhpoly1305_mod_init);</div><div class='add'>+subsys_initcall(nhpoly1305_mod_init);</div><div class='ctx'> module_exit(nhpoly1305_mod_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("NHPoly1305 ε-almost-∆-universal hash function");</div><div class='head'>diff --git a/crypto/ofb.c b/crypto/ofb.c<br/>index 34b6e1f426f7..133ff4c7f2c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ofb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/ofb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/ofb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/ofb.c</a></div><div class='hunk'>@@ -95,7 +95,7 @@ static void __exit crypto_ofb_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_ofb_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_ofb_module_init);</div><div class='add'>+subsys_initcall(crypto_ofb_module_init);</div><div class='ctx'> module_exit(crypto_ofb_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/pcbc.c b/crypto/pcbc.c<br/>index 2fa03fc576fe..31b3ce948474 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/pcbc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/pcbc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/pcbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/pcbc.c</a></div><div class='hunk'>@@ -191,7 +191,7 @@ static void __exit crypto_pcbc_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_pcbc_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_pcbc_module_init);</div><div class='add'>+subsys_initcall(crypto_pcbc_module_init);</div><div class='ctx'> module_exit(crypto_pcbc_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c<br/>index d47cfc47b1b1..0e9ce329fd47 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/pcrypt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/pcrypt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/pcrypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/pcrypt.c</a></div><div class='hunk'>@@ -512,7 +512,7 @@ static void __exit pcrypt_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;pcrypt_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(pcrypt_init);</div><div class='add'>+subsys_initcall(pcrypt_init);</div><div class='ctx'> module_exit(pcrypt_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c<br/>index 2a06874204e8..adc40298c749 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/poly1305_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/poly1305_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/poly1305_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/poly1305_generic.c</a></div><div class='hunk'>@@ -318,7 +318,7 @@ static void __exit poly1305_mod_exit(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;poly1305_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(poly1305_mod_init);</div><div class='add'>+subsys_initcall(poly1305_mod_init);</div><div class='ctx'> module_exit(poly1305_mod_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/rmd128.c b/crypto/rmd128.c<br/>index 5f4472256e27..faf4252c4b85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd128.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd128.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd128.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/rmd128.c</a></div><div class='hunk'>@@ -318,7 +318,7 @@ static void __exit rmd128_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(rmd128_mod_init);</div><div class='add'>+subsys_initcall(rmd128_mod_init);</div><div class='ctx'> module_exit(rmd128_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/rmd160.c b/crypto/rmd160.c<br/>index 737645344d1c..b33309916d4f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd160.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd160.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd160.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/rmd160.c</a></div><div class='hunk'>@@ -362,7 +362,7 @@ static void __exit rmd160_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(rmd160_mod_init);</div><div class='add'>+subsys_initcall(rmd160_mod_init);</div><div class='ctx'> module_exit(rmd160_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/rmd256.c b/crypto/rmd256.c<br/>index 0e9d30676a01..2a643250c9a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd256.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd256.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/rmd256.c</a></div><div class='hunk'>@@ -337,7 +337,7 @@ static void __exit rmd256_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(rmd256_mod_init);</div><div class='add'>+subsys_initcall(rmd256_mod_init);</div><div class='ctx'> module_exit(rmd256_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/rmd320.c b/crypto/rmd320.c<br/>index 3ae1df5bb48c..2f062574fc8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd320.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rmd320.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rmd320.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/rmd320.c</a></div><div class='hunk'>@@ -386,7 +386,7 @@ static void __exit rmd320_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(rmd320_mod_init);</div><div class='add'>+subsys_initcall(rmd320_mod_init);</div><div class='ctx'> module_exit(rmd320_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c<br/>index 0a6680ca8cb6..29c336068dc0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rsa-pkcs1pad.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rsa-pkcs1pad.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rsa-pkcs1pad.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/rsa-pkcs1pad.c</a></div><div class='hunk'>@@ -429,7 +429,7 @@ static int pkcs1pad_sign(struct akcipher_request *req)</div><div class='ctx'> 	akcipher_request_set_crypt(&amp;req_ctx-&gt;child_req, req_ctx-&gt;in_sg,</div><div class='ctx'> 				   req-&gt;dst, ctx-&gt;key_size - 1, req-&gt;dst_len);</div><div class='ctx'> </div><div class='del'>-	err = crypto_akcipher_sign(&amp;req_ctx-&gt;child_req);</div><div class='add'>+	err = crypto_akcipher_decrypt(&amp;req_ctx-&gt;child_req);</div><div class='ctx'> 	if (err != -EINPROGRESS &amp;&amp; err != -EBUSY)</div><div class='ctx'> 		return pkcs1pad_encrypt_sign_complete(req, err);</div><div class='ctx'> </div><div class='hunk'>@@ -488,14 +488,21 @@ static int pkcs1pad_verify_complete(struct akcipher_request *req, int err)</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;dst_len &lt; dst_len - pos)</div><div class='del'>-		err = -EOVERFLOW;</div><div class='del'>-	req-&gt;dst_len = dst_len - pos;</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='del'>-		sg_copy_from_buffer(req-&gt;dst,</div><div class='del'>-				sg_nents_for_len(req-&gt;dst, req-&gt;dst_len),</div><div class='del'>-				out_buf + pos, req-&gt;dst_len);</div><div class='add'>+	if (req-&gt;dst_len != dst_len - pos) {</div><div class='add'>+		err = -EKEYREJECTED;</div><div class='add'>+		req-&gt;dst_len = dst_len - pos;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	/* Extract appended digest. */</div><div class='add'>+	sg_pcopy_to_buffer(req-&gt;src,</div><div class='add'>+			   sg_nents_for_len(req-&gt;src,</div><div class='add'>+					    req-&gt;src_len + req-&gt;dst_len),</div><div class='add'>+			   req_ctx-&gt;out_buf + ctx-&gt;key_size,</div><div class='add'>+			   req-&gt;dst_len, ctx-&gt;key_size);</div><div class='add'>+	/* Do the actual verification step. */</div><div class='add'>+	if (memcmp(req_ctx-&gt;out_buf + ctx-&gt;key_size, out_buf + pos,</div><div class='add'>+		   req-&gt;dst_len) != 0)</div><div class='add'>+		err = -EKEYREJECTED;</div><div class='ctx'> done:</div><div class='ctx'> 	kzfree(req_ctx-&gt;out_buf);</div><div class='ctx'> </div><div class='hunk'>@@ -532,10 +539,12 @@ static int pkcs1pad_verify(struct akcipher_request *req)</div><div class='ctx'> 	struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!ctx-&gt;key_size || req-&gt;src_len &lt; ctx-&gt;key_size)</div><div class='add'>+	if (WARN_ON(req-&gt;dst) ||</div><div class='add'>+	    WARN_ON(!req-&gt;dst_len) ||</div><div class='add'>+	    !ctx-&gt;key_size || req-&gt;src_len &lt; ctx-&gt;key_size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	req_ctx-&gt;out_buf = kmalloc(ctx-&gt;key_size, GFP_KERNEL);</div><div class='add'>+	req_ctx-&gt;out_buf = kmalloc(ctx-&gt;key_size + req-&gt;dst_len, GFP_KERNEL);</div><div class='ctx'> 	if (!req_ctx-&gt;out_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +560,7 @@ static int pkcs1pad_verify(struct akcipher_request *req)</div><div class='ctx'> 				   req_ctx-&gt;out_sg, req-&gt;src_len,</div><div class='ctx'> 				   ctx-&gt;key_size);</div><div class='ctx'> </div><div class='del'>-	err = crypto_akcipher_verify(&amp;req_ctx-&gt;child_req);</div><div class='add'>+	err = crypto_akcipher_encrypt(&amp;req_ctx-&gt;child_req);</div><div class='ctx'> 	if (err != -EINPROGRESS &amp;&amp; err != -EBUSY)</div><div class='ctx'> 		return pkcs1pad_verify_complete(req, err);</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/rsa.c b/crypto/rsa.c<br/>index 4167980c243d..dcbb03431778 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rsa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/rsa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/rsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/rsa.c</a></div><div class='hunk'>@@ -50,34 +50,6 @@ static int _rsa_dec(const struct rsa_mpi_key *key, MPI m, MPI c)</div><div class='ctx'> 	return mpi_powm(m, c, key-&gt;d, key-&gt;n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * RSASP1 function [RFC3447 sec 5.2.1]</div><div class='del'>- * s = m^d mod n</div><div class='del'>- */</div><div class='del'>-static int _rsa_sign(const struct rsa_mpi_key *key, MPI s, MPI m)</div><div class='del'>-{</div><div class='del'>-	/* (1) Validate 0 &lt;= m &lt; n */</div><div class='del'>-	if (mpi_cmp_ui(m, 0) &lt; 0 || mpi_cmp(m, key-&gt;n) &gt;= 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* (2) s = m^d mod n */</div><div class='del'>-	return mpi_powm(s, m, key-&gt;d, key-&gt;n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RSAVP1 function [RFC3447 sec 5.2.2]</div><div class='del'>- * m = s^e mod n;</div><div class='del'>- */</div><div class='del'>-static int _rsa_verify(const struct rsa_mpi_key *key, MPI m, MPI s)</div><div class='del'>-{</div><div class='del'>-	/* (1) Validate 0 &lt;= s &lt; n */</div><div class='del'>-	if (mpi_cmp_ui(s, 0) &lt; 0 || mpi_cmp(s, key-&gt;n) &gt;= 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* (2) m = s^e mod n */</div><div class='del'>-	return mpi_powm(m, s, key-&gt;e, key-&gt;n);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct rsa_mpi_key *rsa_get_key(struct crypto_akcipher *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return akcipher_tfm_ctx(tfm);</div><div class='hunk'>@@ -160,85 +132,6 @@ err_free_m:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsa_sign(struct akcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='del'>-	const struct rsa_mpi_key *pkey = rsa_get_key(tfm);</div><div class='del'>-	MPI m, s = mpi_alloc(0);</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int sign;</div><div class='del'>-</div><div class='del'>-	if (!s)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pkey-&gt;n || !pkey-&gt;d)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_free_s;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	m = mpi_read_raw_from_sgl(req-&gt;src, req-&gt;src_len);</div><div class='del'>-	if (!m)</div><div class='del'>-		goto err_free_s;</div><div class='del'>-</div><div class='del'>-	ret = _rsa_sign(pkey, s, m);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_m;</div><div class='del'>-</div><div class='del'>-	ret = mpi_write_to_sgl(s, req-&gt;dst, req-&gt;dst_len, &amp;sign);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_m;</div><div class='del'>-</div><div class='del'>-	if (sign &lt; 0)</div><div class='del'>-		ret = -EBADMSG;</div><div class='del'>-</div><div class='del'>-err_free_m:</div><div class='del'>-	mpi_free(m);</div><div class='del'>-err_free_s:</div><div class='del'>-	mpi_free(s);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rsa_verify(struct akcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='del'>-	const struct rsa_mpi_key *pkey = rsa_get_key(tfm);</div><div class='del'>-	MPI s, m = mpi_alloc(0);</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int sign;</div><div class='del'>-</div><div class='del'>-	if (!m)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pkey-&gt;n || !pkey-&gt;e)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_free_m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = mpi_read_raw_from_sgl(req-&gt;src, req-&gt;src_len);</div><div class='del'>-	if (!s) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_free_m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = _rsa_verify(pkey, m, s);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_s;</div><div class='del'>-</div><div class='del'>-	ret = mpi_write_to_sgl(m, req-&gt;dst, req-&gt;dst_len, &amp;sign);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_s;</div><div class='del'>-</div><div class='del'>-	if (sign &lt; 0)</div><div class='del'>-		ret = -EBADMSG;</div><div class='del'>-</div><div class='del'>-err_free_s:</div><div class='del'>-	mpi_free(s);</div><div class='del'>-err_free_m:</div><div class='del'>-	mpi_free(m);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void rsa_free_mpi_key(struct rsa_mpi_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	mpi_free(key-&gt;d);</div><div class='hunk'>@@ -353,8 +246,6 @@ static void rsa_exit_tfm(struct crypto_akcipher *tfm)</div><div class='ctx'> static struct akcipher_alg rsa = {</div><div class='ctx'> 	.encrypt = rsa_enc,</div><div class='ctx'> 	.decrypt = rsa_dec,</div><div class='del'>-	.sign = rsa_sign,</div><div class='del'>-	.verify = rsa_verify,</div><div class='ctx'> 	.set_priv_key = rsa_set_priv_key,</div><div class='ctx'> 	.set_pub_key = rsa_set_pub_key,</div><div class='ctx'> 	.max_size = rsa_max_size,</div><div class='hunk'>@@ -391,7 +282,7 @@ static void rsa_exit(void)</div><div class='ctx'> 	crypto_unregister_akcipher(&amp;rsa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(rsa_init);</div><div class='add'>+subsys_initcall(rsa_init);</div><div class='ctx'> module_exit(rsa_exit);</div><div class='ctx'> MODULE_ALIAS_CRYPTO("rsa");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/salsa20_generic.c b/crypto/salsa20_generic.c<br/>index 00fce32ae17a..c81a44404086 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/salsa20_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/salsa20_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/salsa20_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/salsa20_generic.c</a></div><div class='hunk'>@@ -86,18 +86,17 @@ static void salsa20_docrypt(u32 *state, u8 *dst, const u8 *src,</div><div class='ctx'> {</div><div class='ctx'> 	__le32 stream[SALSA20_BLOCK_SIZE / sizeof(__le32)];</div><div class='ctx'> </div><div class='del'>-	if (dst != src)</div><div class='del'>-		memcpy(dst, src, bytes);</div><div class='del'>-</div><div class='ctx'> 	while (bytes &gt;= SALSA20_BLOCK_SIZE) {</div><div class='ctx'> 		salsa20_block(state, stream);</div><div class='del'>-		crypto_xor(dst, (const u8 *)stream, SALSA20_BLOCK_SIZE);</div><div class='add'>+		crypto_xor_cpy(dst, src, (const u8 *)stream,</div><div class='add'>+			       SALSA20_BLOCK_SIZE);</div><div class='ctx'> 		bytes -= SALSA20_BLOCK_SIZE;</div><div class='ctx'> 		dst += SALSA20_BLOCK_SIZE;</div><div class='add'>+		src += SALSA20_BLOCK_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bytes) {</div><div class='ctx'> 		salsa20_block(state, stream);</div><div class='del'>-		crypto_xor(dst, (const u8 *)stream, bytes);</div><div class='add'>+		crypto_xor_cpy(dst, src, (const u8 *)stream, bytes);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +160,7 @@ static int salsa20_crypt(struct skcipher_request *req)</div><div class='ctx'> </div><div class='ctx'> 	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='del'>-	salsa20_init(state, ctx, walk.iv);</div><div class='add'>+	salsa20_init(state, ctx, req-&gt;iv);</div><div class='ctx'> </div><div class='ctx'> 	while (walk.nbytes &gt; 0) {</div><div class='ctx'> 		unsigned int nbytes = walk.nbytes;</div><div class='hunk'>@@ -204,7 +203,7 @@ static void __exit salsa20_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_skcipher(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(salsa20_generic_mod_init);</div><div class='add'>+subsys_initcall(salsa20_generic_mod_init);</div><div class='ctx'> module_exit(salsa20_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/scompress.c b/crypto/scompress.c<br/>index 6f8305f8c300..712b4c2ea021 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/scompress.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/scompress.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/scompress.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/scompress.c</a></div><div class='hunk'>@@ -29,9 +29,17 @@</div><div class='ctx'> #include &lt;crypto/internal/scompress.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+struct scomp_scratch {</div><div class='add'>+	spinlock_t	lock;</div><div class='add'>+	void		*src;</div><div class='add'>+	void		*dst;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct scomp_scratch, scomp_scratch) = {</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(scomp_scratch.lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct crypto_type crypto_scomp_type;</div><div class='del'>-static void * __percpu *scomp_src_scratches;</div><div class='del'>-static void * __percpu *scomp_dst_scratches;</div><div class='ctx'> static int scomp_scratch_users;</div><div class='ctx'> static DEFINE_MUTEX(scomp_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -62,76 +70,53 @@ static void crypto_scomp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> 	seq_puts(m, "type         : scomp\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void crypto_scomp_free_scratches(void * __percpu *scratches)</div><div class='add'>+static void crypto_scomp_free_scratches(void)</div><div class='ctx'> {</div><div class='add'>+	struct scomp_scratch *scratch;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!scratches)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i)</div><div class='del'>-		vfree(*per_cpu_ptr(scratches, i));</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		scratch = per_cpu_ptr(&amp;scomp_scratch, i);</div><div class='ctx'> </div><div class='del'>-	free_percpu(scratches);</div><div class='add'>+		vfree(scratch-&gt;src);</div><div class='add'>+		vfree(scratch-&gt;dst);</div><div class='add'>+		scratch-&gt;src = NULL;</div><div class='add'>+		scratch-&gt;dst = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void * __percpu *crypto_scomp_alloc_scratches(void)</div><div class='add'>+static int crypto_scomp_alloc_scratches(void)</div><div class='ctx'> {</div><div class='del'>-	void * __percpu *scratches;</div><div class='add'>+	struct scomp_scratch *scratch;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	scratches = alloc_percpu(void *);</div><div class='del'>-	if (!scratches)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='del'>-		void *scratch;</div><div class='del'>-</div><div class='del'>-		scratch = vmalloc_node(SCOMP_SCRATCH_SIZE, cpu_to_node(i));</div><div class='del'>-		if (!scratch)</div><div class='del'>-			goto error;</div><div class='del'>-		*per_cpu_ptr(scratches, i) = scratch;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return scratches;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	crypto_scomp_free_scratches(scratches);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+		void *mem;</div><div class='ctx'> </div><div class='del'>-static void crypto_scomp_free_all_scratches(void)</div><div class='del'>-{</div><div class='del'>-	if (!--scomp_scratch_users) {</div><div class='del'>-		crypto_scomp_free_scratches(scomp_src_scratches);</div><div class='del'>-		crypto_scomp_free_scratches(scomp_dst_scratches);</div><div class='del'>-		scomp_src_scratches = NULL;</div><div class='del'>-		scomp_dst_scratches = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+		scratch = per_cpu_ptr(&amp;scomp_scratch, i);</div><div class='ctx'> </div><div class='del'>-static int crypto_scomp_alloc_all_scratches(void)</div><div class='del'>-{</div><div class='del'>-	if (!scomp_scratch_users++) {</div><div class='del'>-		scomp_src_scratches = crypto_scomp_alloc_scratches();</div><div class='del'>-		if (!scomp_src_scratches)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		scomp_dst_scratches = crypto_scomp_alloc_scratches();</div><div class='del'>-		if (!scomp_dst_scratches) {</div><div class='del'>-			crypto_scomp_free_scratches(scomp_src_scratches);</div><div class='del'>-			scomp_src_scratches = NULL;</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+		mem = vmalloc_node(SCOMP_SCRATCH_SIZE, cpu_to_node(i));</div><div class='add'>+		if (!mem)</div><div class='add'>+			goto error;</div><div class='add'>+		scratch-&gt;src = mem;</div><div class='add'>+		mem = vmalloc_node(SCOMP_SCRATCH_SIZE, cpu_to_node(i));</div><div class='add'>+		if (!mem)</div><div class='add'>+			goto error;</div><div class='add'>+		scratch-&gt;dst = mem;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+error:</div><div class='add'>+	crypto_scomp_free_scratches();</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_scomp_init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;scomp_lock);</div><div class='del'>-	ret = crypto_scomp_alloc_all_scratches();</div><div class='add'>+	if (!scomp_scratch_users++)</div><div class='add'>+		ret = crypto_scomp_alloc_scratches();</div><div class='ctx'> 	mutex_unlock(&amp;scomp_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -143,42 +128,41 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)</div><div class='ctx'> 	void **tfm_ctx = acomp_tfm_ctx(tfm);</div><div class='ctx'> 	struct crypto_scomp *scomp = *tfm_ctx;</div><div class='ctx'> 	void **ctx = acomp_request_ctx(req);</div><div class='del'>-	const int cpu = get_cpu();</div><div class='del'>-	u8 *scratch_src = *per_cpu_ptr(scomp_src_scratches, cpu);</div><div class='del'>-	u8 *scratch_dst = *per_cpu_ptr(scomp_dst_scratches, cpu);</div><div class='add'>+	struct scomp_scratch *scratch;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!req-&gt;src || !req-&gt;slen || req-&gt;slen &gt; SCOMP_SCRATCH_SIZE) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!req-&gt;src || !req-&gt;slen || req-&gt;slen &gt; SCOMP_SCRATCH_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;dst &amp;&amp; !req-&gt;dlen) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (req-&gt;dst &amp;&amp; !req-&gt;dlen)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!req-&gt;dlen || req-&gt;dlen &gt; SCOMP_SCRATCH_SIZE)</div><div class='ctx'> 		req-&gt;dlen = SCOMP_SCRATCH_SIZE;</div><div class='ctx'> </div><div class='del'>-	scatterwalk_map_and_copy(scratch_src, req-&gt;src, 0, req-&gt;slen, 0);</div><div class='add'>+	scratch = raw_cpu_ptr(&amp;scomp_scratch);</div><div class='add'>+	spin_lock(&amp;scratch-&gt;lock);</div><div class='add'>+</div><div class='add'>+	scatterwalk_map_and_copy(scratch-&gt;src, req-&gt;src, 0, req-&gt;slen, 0);</div><div class='ctx'> 	if (dir)</div><div class='del'>-		ret = crypto_scomp_compress(scomp, scratch_src, req-&gt;slen,</div><div class='del'>-					    scratch_dst, &amp;req-&gt;dlen, *ctx);</div><div class='add'>+		ret = crypto_scomp_compress(scomp, scratch-&gt;src, req-&gt;slen,</div><div class='add'>+					    scratch-&gt;dst, &amp;req-&gt;dlen, *ctx);</div><div class='ctx'> 	else</div><div class='del'>-		ret = crypto_scomp_decompress(scomp, scratch_src, req-&gt;slen,</div><div class='del'>-					      scratch_dst, &amp;req-&gt;dlen, *ctx);</div><div class='add'>+		ret = crypto_scomp_decompress(scomp, scratch-&gt;src, req-&gt;slen,</div><div class='add'>+					      scratch-&gt;dst, &amp;req-&gt;dlen, *ctx);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		if (!req-&gt;dst) {</div><div class='ctx'> 			req-&gt;dst = sgl_alloc(req-&gt;dlen, GFP_ATOMIC, NULL);</div><div class='del'>-			if (!req-&gt;dst)</div><div class='add'>+			if (!req-&gt;dst) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='ctx'> 				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		scatterwalk_map_and_copy(scratch_dst, req-&gt;dst, 0, req-&gt;dlen,</div><div class='add'>+		scatterwalk_map_and_copy(scratch-&gt;dst, req-&gt;dst, 0, req-&gt;dlen,</div><div class='ctx'> 					 1);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	put_cpu();</div><div class='add'>+	spin_unlock(&amp;scratch-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +183,8 @@ static void crypto_exit_scomp_ops_async(struct crypto_tfm *tfm)</div><div class='ctx'> 	crypto_free_scomp(*ctx);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;scomp_lock);</div><div class='del'>-	crypto_scomp_free_all_scratches();</div><div class='add'>+	if (!--scomp_scratch_users)</div><div class='add'>+		crypto_scomp_free_scratches();</div><div class='ctx'> 	mutex_unlock(&amp;scomp_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/seed.c b/crypto/seed.c<br/>index c6ba8438be43..a75ac50fa4fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/seed.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/seed.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/seed.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/seed.c</a></div><div class='hunk'>@@ -470,7 +470,7 @@ static void __exit seed_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;seed_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(seed_init);</div><div class='add'>+subsys_initcall(seed_init);</div><div class='ctx'> module_exit(seed_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SEED Cipher Algorithm");</div><div class='head'>diff --git a/crypto/seqiv.c b/crypto/seqiv.c<br/>index ed1b0e9f2436..3f2fad615d26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/seqiv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/seqiv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/seqiv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/seqiv.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ static void __exit seqiv_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;seqiv_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(seqiv_module_init);</div><div class='add'>+subsys_initcall(seqiv_module_init);</div><div class='ctx'> module_exit(seqiv_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c<br/>index 7c3382facc82..ec4ec89ad108 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/serpent_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/serpent_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/serpent_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/serpent_generic.c</a></div><div class='hunk'>@@ -664,7 +664,7 @@ static void __exit serpent_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_algs(srp_algs, ARRAY_SIZE(srp_algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(serpent_mod_init);</div><div class='add'>+subsys_initcall(serpent_mod_init);</div><div class='ctx'> module_exit(serpent_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c<br/>index 2af64ef81f40..1b806d4584b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha1_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha1_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha1_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/sha1_generic.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static void __exit sha1_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sha1_generic_mod_init);</div><div class='add'>+subsys_initcall(sha1_generic_mod_init);</div><div class='ctx'> module_exit(sha1_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c<br/>index 1e5ba6649e8d..5844e9a469e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha256_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha256_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha256_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/sha256_generic.c</a></div><div class='hunk'>@@ -301,7 +301,7 @@ static void __exit sha256_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sha256_generic_mod_init);</div><div class='add'>+subsys_initcall(sha256_generic_mod_init);</div><div class='ctx'> module_exit(sha256_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c<br/>index 7ed98367d4fb..60fd2be609d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha3_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha3_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha3_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/sha3_generic.c</a></div><div class='hunk'>@@ -294,7 +294,7 @@ static void __exit sha3_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sha3_generic_mod_init);</div><div class='add'>+subsys_initcall(sha3_generic_mod_init);</div><div class='ctx'> module_exit(sha3_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c<br/>index 4097cd555eb6..0193ecb8ae10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha512_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sha512_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sha512_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/sha512_generic.c</a></div><div class='hunk'>@@ -223,7 +223,7 @@ static void __exit sha512_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shashes(sha512_algs, ARRAY_SIZE(sha512_algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sha512_generic_mod_init);</div><div class='add'>+subsys_initcall(sha512_generic_mod_init);</div><div class='ctx'> module_exit(sha512_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/shash.c b/crypto/shash.c<br/>index 15b369c4745f..e55c1f558bc3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/shash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/shash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/shash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/shash.c</a></div><div class='hunk'>@@ -238,7 +238,6 @@ static int shash_async_init(struct ahash_request *req)</div><div class='ctx'> 	struct shash_desc *desc = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = *ctx;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_init(desc);</div><div class='ctx'> }</div><div class='hunk'>@@ -293,7 +292,6 @@ static int shash_async_finup(struct ahash_request *req)</div><div class='ctx'> 	struct shash_desc *desc = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = *ctx;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> </div><div class='ctx'> 	return shash_ahash_finup(req, desc);</div><div class='ctx'> }</div><div class='hunk'>@@ -307,14 +305,13 @@ int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	if (nbytes &amp;&amp;</div><div class='ctx'> 	    (sg = req-&gt;src, offset = sg-&gt;offset,</div><div class='del'>-	     nbytes &lt; min(sg-&gt;length, ((unsigned int)(PAGE_SIZE)) - offset))) {</div><div class='add'>+	     nbytes &lt;= min(sg-&gt;length, ((unsigned int)(PAGE_SIZE)) - offset))) {</div><div class='ctx'> 		void *data;</div><div class='ctx'> </div><div class='ctx'> 		data = kmap_atomic(sg_page(sg));</div><div class='ctx'> 		err = crypto_shash_digest(desc, data + offset, nbytes,</div><div class='ctx'> 					  req-&gt;result);</div><div class='ctx'> 		kunmap_atomic(data);</div><div class='del'>-		crypto_yield(desc-&gt;flags);</div><div class='ctx'> 	} else</div><div class='ctx'> 		err = crypto_shash_init(desc) ?:</div><div class='ctx'> 		      shash_ahash_finup(req, desc);</div><div class='hunk'>@@ -329,7 +326,6 @@ static int shash_async_digest(struct ahash_request *req)</div><div class='ctx'> 	struct shash_desc *desc = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = *ctx;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> </div><div class='ctx'> 	return shash_ahash_digest(req, desc);</div><div class='ctx'> }</div><div class='hunk'>@@ -345,7 +341,6 @@ static int shash_async_import(struct ahash_request *req, const void *in)</div><div class='ctx'> 	struct shash_desc *desc = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = *ctx;</div><div class='del'>-	desc-&gt;flags = req-&gt;base.flags;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_import(desc, in);</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/simd.c b/crypto/simd.c<br/>index 78e8d037ae2b..3e3b1d1a6b1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/simd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/simd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/simd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/simd.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2012 Jussi Kivilinna &lt;jussi.kivilinna@mbnet.fi&gt;</div><div class='ctx'>  * Copyright (c) 2016 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ * Copyright (c) 2019 Google LLC</div><div class='ctx'>  *</div><div class='ctx'>  * Based on aesni-intel_glue.c by:</div><div class='ctx'>  *  Copyright (C) 2008, Intel Corp.</div><div class='hunk'>@@ -20,10 +21,26 @@</div><div class='ctx'>  *</div><div class='ctx'>  * You should have received a copy of the GNU General Public License</div><div class='ctx'>  * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shared crypto SIMD helpers.  These functions dynamically create and register</div><div class='add'>+ * an skcipher or AEAD algorithm that wraps another, internal algorithm.  The</div><div class='add'>+ * wrapper ensures that the internal algorithm is only executed in a context</div><div class='add'>+ * where SIMD instructions are usable, i.e. where may_use_simd() returns true.</div><div class='add'>+ * If SIMD is already usable, the wrapper directly calls the internal algorithm.</div><div class='add'>+ * Otherwise it defers execution to a workqueue via cryptd.</div><div class='ctx'>  *</div><div class='add'>+ * This is an alternative to the internal algorithm implementing a fallback for</div><div class='add'>+ * the !may_use_simd() case itself.</div><div class='add'>+ *</div><div class='add'>+ * Note that the wrapper algorithm is asynchronous, i.e. it has the</div><div class='add'>+ * CRYPTO_ALG_ASYNC flag set.  Therefore it won't be found by users who</div><div class='add'>+ * explicitly allocate a synchronous algorithm.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/cryptd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -31,6 +48,8 @@</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;asm/simd.h&gt;</div><div class='ctx'> </div><div class='add'>+/* skcipher support */</div><div class='add'>+</div><div class='ctx'> struct simd_skcipher_alg {</div><div class='ctx'> 	const char *ialg_name;</div><div class='ctx'> 	struct skcipher_alg alg;</div><div class='hunk'>@@ -66,7 +85,7 @@ static int simd_skcipher_encrypt(struct skcipher_request *req)</div><div class='ctx'> 	subreq = skcipher_request_ctx(req);</div><div class='ctx'> 	*subreq = *req;</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_skcipher_queued(ctx-&gt;cryptd_tfm)))</div><div class='ctx'> 		child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -87,7 +106,7 @@ static int simd_skcipher_decrypt(struct skcipher_request *req)</div><div class='ctx'> 	subreq = skcipher_request_ctx(req);</div><div class='ctx'> 	*subreq = *req;</div><div class='ctx'> </div><div class='del'>-	if (!may_use_simd() ||</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='ctx'> 	    (in_atomic() &amp;&amp; cryptd_skcipher_queued(ctx-&gt;cryptd_tfm)))</div><div class='ctx'> 		child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -272,4 +291,254 @@ void simd_unregister_skciphers(struct skcipher_alg *algs, int count,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(simd_unregister_skciphers);</div><div class='ctx'> </div><div class='add'>+/* AEAD support */</div><div class='add'>+</div><div class='add'>+struct simd_aead_alg {</div><div class='add'>+	const char *ialg_name;</div><div class='add'>+	struct aead_alg alg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct simd_aead_ctx {</div><div class='add'>+	struct cryptd_aead *cryptd_tfm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int simd_aead_setkey(struct crypto_aead *tfm, const u8 *key,</div><div class='add'>+				unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct simd_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct crypto_aead *child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crypto_aead_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_aead_set_flags(child, crypto_aead_get_flags(tfm) &amp;</div><div class='add'>+				     CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_aead_setkey(child, key, key_len);</div><div class='add'>+	crypto_aead_set_flags(tfm, crypto_aead_get_flags(child) &amp;</div><div class='add'>+				   CRYPTO_TFM_RES_MASK);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_aead_setauthsize(struct crypto_aead *tfm, unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct simd_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct crypto_aead *child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+</div><div class='add'>+	return crypto_aead_setauthsize(child, authsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_aead_encrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct simd_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct aead_request *subreq;</div><div class='add'>+	struct crypto_aead *child;</div><div class='add'>+</div><div class='add'>+	subreq = aead_request_ctx(req);</div><div class='add'>+	*subreq = *req;</div><div class='add'>+</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='add'>+	    (in_atomic() &amp;&amp; cryptd_aead_queued(ctx-&gt;cryptd_tfm)))</div><div class='add'>+		child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	else</div><div class='add'>+		child = cryptd_aead_child(ctx-&gt;cryptd_tfm);</div><div class='add'>+</div><div class='add'>+	aead_request_set_tfm(subreq, child);</div><div class='add'>+</div><div class='add'>+	return crypto_aead_encrypt(subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_aead_decrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct simd_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct aead_request *subreq;</div><div class='add'>+	struct crypto_aead *child;</div><div class='add'>+</div><div class='add'>+	subreq = aead_request_ctx(req);</div><div class='add'>+	*subreq = *req;</div><div class='add'>+</div><div class='add'>+	if (!crypto_simd_usable() ||</div><div class='add'>+	    (in_atomic() &amp;&amp; cryptd_aead_queued(ctx-&gt;cryptd_tfm)))</div><div class='add'>+		child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	else</div><div class='add'>+		child = cryptd_aead_child(ctx-&gt;cryptd_tfm);</div><div class='add'>+</div><div class='add'>+	aead_request_set_tfm(subreq, child);</div><div class='add'>+</div><div class='add'>+	return crypto_aead_decrypt(subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void simd_aead_exit(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	struct simd_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	cryptd_free_aead(ctx-&gt;cryptd_tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_aead_init(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	struct simd_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct cryptd_aead *cryptd_tfm;</div><div class='add'>+	struct simd_aead_alg *salg;</div><div class='add'>+	struct aead_alg *alg;</div><div class='add'>+	unsigned reqsize;</div><div class='add'>+</div><div class='add'>+	alg = crypto_aead_alg(tfm);</div><div class='add'>+	salg = container_of(alg, struct simd_aead_alg, alg);</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_aead(salg-&gt;ialg_name, CRYPTO_ALG_INTERNAL,</div><div class='add'>+				       CRYPTO_ALG_INTERNAL);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;cryptd_tfm = cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	reqsize = crypto_aead_reqsize(cryptd_aead_child(cryptd_tfm));</div><div class='add'>+	reqsize = max(reqsize, crypto_aead_reqsize(&amp;cryptd_tfm-&gt;base));</div><div class='add'>+	reqsize += sizeof(struct aead_request);</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(tfm, reqsize);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct simd_aead_alg *simd_aead_create_compat(const char *algname,</div><div class='add'>+					      const char *drvname,</div><div class='add'>+					      const char *basename)</div><div class='add'>+{</div><div class='add'>+	struct simd_aead_alg *salg;</div><div class='add'>+	struct crypto_aead *tfm;</div><div class='add'>+	struct aead_alg *ialg;</div><div class='add'>+	struct aead_alg *alg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_aead(basename, CRYPTO_ALG_INTERNAL,</div><div class='add'>+				CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return ERR_CAST(tfm);</div><div class='add'>+</div><div class='add'>+	ialg = crypto_aead_alg(tfm);</div><div class='add'>+</div><div class='add'>+	salg = kzalloc(sizeof(*salg), GFP_KERNEL);</div><div class='add'>+	if (!salg) {</div><div class='add'>+		salg = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out_put_tfm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	salg-&gt;ialg_name = basename;</div><div class='add'>+	alg = &amp;salg-&gt;alg;</div><div class='add'>+</div><div class='add'>+	err = -ENAMETOOLONG;</div><div class='add'>+	if (snprintf(alg-&gt;base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", algname) &gt;=</div><div class='add'>+	    CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		goto out_free_salg;</div><div class='add'>+</div><div class='add'>+	if (snprintf(alg-&gt;base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",</div><div class='add'>+		     drvname) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		goto out_free_salg;</div><div class='add'>+</div><div class='add'>+	alg-&gt;base.cra_flags = CRYPTO_ALG_ASYNC;</div><div class='add'>+	alg-&gt;base.cra_priority = ialg-&gt;base.cra_priority;</div><div class='add'>+	alg-&gt;base.cra_blocksize = ialg-&gt;base.cra_blocksize;</div><div class='add'>+	alg-&gt;base.cra_alignmask = ialg-&gt;base.cra_alignmask;</div><div class='add'>+	alg-&gt;base.cra_module = ialg-&gt;base.cra_module;</div><div class='add'>+	alg-&gt;base.cra_ctxsize = sizeof(struct simd_aead_ctx);</div><div class='add'>+</div><div class='add'>+	alg-&gt;ivsize = ialg-&gt;ivsize;</div><div class='add'>+	alg-&gt;maxauthsize = ialg-&gt;maxauthsize;</div><div class='add'>+	alg-&gt;chunksize = ialg-&gt;chunksize;</div><div class='add'>+</div><div class='add'>+	alg-&gt;init = simd_aead_init;</div><div class='add'>+	alg-&gt;exit = simd_aead_exit;</div><div class='add'>+</div><div class='add'>+	alg-&gt;setkey = simd_aead_setkey;</div><div class='add'>+	alg-&gt;setauthsize = simd_aead_setauthsize;</div><div class='add'>+	alg-&gt;encrypt = simd_aead_encrypt;</div><div class='add'>+	alg-&gt;decrypt = simd_aead_decrypt;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_aead(alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_salg;</div><div class='add'>+</div><div class='add'>+out_put_tfm:</div><div class='add'>+	crypto_free_aead(tfm);</div><div class='add'>+	return salg;</div><div class='add'>+</div><div class='add'>+out_free_salg:</div><div class='add'>+	kfree(salg);</div><div class='add'>+	salg = ERR_PTR(err);</div><div class='add'>+	goto out_put_tfm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_aead_create_compat);</div><div class='add'>+</div><div class='add'>+struct simd_aead_alg *simd_aead_create(const char *algname,</div><div class='add'>+				       const char *basename)</div><div class='add'>+{</div><div class='add'>+	char drvname[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+</div><div class='add'>+	if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) &gt;=</div><div class='add'>+	    CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+</div><div class='add'>+	return simd_aead_create_compat(algname, drvname, basename);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_aead_create);</div><div class='add'>+</div><div class='add'>+void simd_aead_free(struct simd_aead_alg *salg)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_aead(&amp;salg-&gt;alg);</div><div class='add'>+	kfree(salg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_aead_free);</div><div class='add'>+</div><div class='add'>+int simd_register_aeads_compat(struct aead_alg *algs, int count,</div><div class='add'>+			       struct simd_aead_alg **simd_algs)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='add'>+	const char *basename;</div><div class='add'>+	struct simd_aead_alg *simd;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_aeads(algs, count);</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; count; i++) {</div><div class='add'>+		WARN_ON(strncmp(algs[i].base.cra_name, "__", 2));</div><div class='add'>+		WARN_ON(strncmp(algs[i].base.cra_driver_name, "__", 2));</div><div class='add'>+		algname = algs[i].base.cra_name + 2;</div><div class='add'>+		drvname = algs[i].base.cra_driver_name + 2;</div><div class='add'>+		basename = algs[i].base.cra_driver_name;</div><div class='add'>+		simd = simd_aead_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			goto err_unregister;</div><div class='add'>+		simd_algs[i] = simd;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister:</div><div class='add'>+	simd_unregister_aeads(algs, count, simd_algs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_register_aeads_compat);</div><div class='add'>+</div><div class='add'>+void simd_unregister_aeads(struct aead_alg *algs, int count,</div><div class='add'>+			   struct simd_aead_alg **simd_algs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	crypto_unregister_aeads(algs, count);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (simd_algs[i]) {</div><div class='add'>+			simd_aead_free(simd_algs[i]);</div><div class='add'>+			simd_algs[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_unregister_aeads);</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/skcipher.c b/crypto/skcipher.c<br/>index bcf13d95f54a..2e66f312e2c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/skcipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/skcipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/skcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/skcipher.c</a></div><div class='hunk'>@@ -131,8 +131,13 @@ unmap_src:</div><div class='ctx'> 		memcpy(walk-&gt;dst.virt.addr, walk-&gt;page, n);</div><div class='ctx'> 		skcipher_unmap_dst(walk);</div><div class='ctx'> 	} else if (unlikely(walk-&gt;flags &amp; SKCIPHER_WALK_SLOW)) {</div><div class='del'>-		if (WARN_ON(err)) {</div><div class='del'>-			/* unexpected case; didn't process all bytes */</div><div class='add'>+		if (err) {</div><div class='add'>+			/*</div><div class='add'>+			 * Didn't process all bytes.  Either the algorithm is</div><div class='add'>+			 * broken, or this was the last step and it turned out</div><div class='add'>+			 * the message wasn't evenly divisible into blocks but</div><div class='add'>+			 * the algorithm requires it.</div><div class='add'>+			 */</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto finish;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c<br/>index c0cf87ae7ef6..e227bcada2a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sm3_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sm3_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sm3_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/sm3_generic.c</a></div><div class='hunk'>@@ -199,7 +199,7 @@ static void __exit sm3_generic_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shash(&amp;sm3_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sm3_generic_mod_init);</div><div class='add'>+subsys_initcall(sm3_generic_mod_init);</div><div class='ctx'> module_exit(sm3_generic_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/crypto/sm4_generic.c b/crypto/sm4_generic.c<br/>index c18eebfd5edd..71ffb343709a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sm4_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/sm4_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/sm4_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/sm4_generic.c</a></div><div class='hunk'>@@ -237,7 +237,7 @@ static void __exit sm4_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;sm4_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sm4_init);</div><div class='add'>+subsys_initcall(sm4_init);</div><div class='ctx'> module_exit(sm4_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SM4 Cipher Algorithm");</div><div class='head'>diff --git a/crypto/streebog_generic.c b/crypto/streebog_generic.c<br/>index 5a2eafed9c29..63663c3bab7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/streebog_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/streebog_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/streebog_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/streebog_generic.c</a></div><div class='hunk'>@@ -996,7 +996,7 @@ static void streebog_add512(const struct streebog_uint512 *x,</div><div class='ctx'> </div><div class='ctx'> static void streebog_g(struct streebog_uint512 *h,</div><div class='ctx'> 		       const struct streebog_uint512 *N,</div><div class='del'>-		       const u8 *m)</div><div class='add'>+		       const struct streebog_uint512 *m)</div><div class='ctx'> {</div><div class='ctx'> 	struct streebog_uint512 Ki, data;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1005,7 +1005,7 @@ static void streebog_g(struct streebog_uint512 *h,</div><div class='ctx'> </div><div class='ctx'> 	/* Starting E() */</div><div class='ctx'> 	Ki = data;</div><div class='del'>-	streebog_xlps(&amp;Ki, (const struct streebog_uint512 *)&amp;m[0], &amp;data);</div><div class='add'>+	streebog_xlps(&amp;Ki, m, &amp;data);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 11; i++)</div><div class='ctx'> 		streebog_round(i, &amp;Ki, &amp;data);</div><div class='hunk'>@@ -1015,16 +1015,19 @@ static void streebog_g(struct streebog_uint512 *h,</div><div class='ctx'> 	/* E() done */</div><div class='ctx'> </div><div class='ctx'> 	streebog_xor(&amp;data, h, &amp;data);</div><div class='del'>-	streebog_xor(&amp;data, (const struct streebog_uint512 *)&amp;m[0], h);</div><div class='add'>+	streebog_xor(&amp;data, m, h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void streebog_stage2(struct streebog_state *ctx, const u8 *data)</div><div class='ctx'> {</div><div class='del'>-	streebog_g(&amp;ctx-&gt;h, &amp;ctx-&gt;N, data);</div><div class='add'>+	struct streebog_uint512 m;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;m, data, sizeof(m));</div><div class='add'>+</div><div class='add'>+	streebog_g(&amp;ctx-&gt;h, &amp;ctx-&gt;N, &amp;m);</div><div class='ctx'> </div><div class='ctx'> 	streebog_add512(&amp;ctx-&gt;N, &amp;buffer512, &amp;ctx-&gt;N);</div><div class='del'>-	streebog_add512(&amp;ctx-&gt;Sigma, (const struct streebog_uint512 *)data,</div><div class='del'>-			&amp;ctx-&gt;Sigma);</div><div class='add'>+	streebog_add512(&amp;ctx-&gt;Sigma, &amp;m, &amp;ctx-&gt;Sigma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void streebog_stage3(struct streebog_state *ctx)</div><div class='hunk'>@@ -1034,13 +1037,11 @@ static void streebog_stage3(struct streebog_state *ctx)</div><div class='ctx'> 	buf.qword[0] = cpu_to_le64(ctx-&gt;fillsize &lt;&lt; 3);</div><div class='ctx'> 	streebog_pad(ctx);</div><div class='ctx'> </div><div class='del'>-	streebog_g(&amp;ctx-&gt;h, &amp;ctx-&gt;N, (const u8 *)&amp;ctx-&gt;buffer);</div><div class='add'>+	streebog_g(&amp;ctx-&gt;h, &amp;ctx-&gt;N, &amp;ctx-&gt;m);</div><div class='ctx'> 	streebog_add512(&amp;ctx-&gt;N, &amp;buf, &amp;ctx-&gt;N);</div><div class='del'>-	streebog_add512(&amp;ctx-&gt;Sigma,</div><div class='del'>-			(const struct streebog_uint512 *)&amp;ctx-&gt;buffer[0],</div><div class='del'>-			&amp;ctx-&gt;Sigma);</div><div class='del'>-	streebog_g(&amp;ctx-&gt;h, &amp;buffer0, (const u8 *)&amp;ctx-&gt;N);</div><div class='del'>-	streebog_g(&amp;ctx-&gt;h, &amp;buffer0, (const u8 *)&amp;ctx-&gt;Sigma);</div><div class='add'>+	streebog_add512(&amp;ctx-&gt;Sigma, &amp;ctx-&gt;m, &amp;ctx-&gt;Sigma);</div><div class='add'>+	streebog_g(&amp;ctx-&gt;h, &amp;buffer0, &amp;ctx-&gt;N);</div><div class='add'>+	streebog_g(&amp;ctx-&gt;h, &amp;buffer0, &amp;ctx-&gt;Sigma);</div><div class='ctx'> 	memcpy(&amp;ctx-&gt;hash, &amp;ctx-&gt;h, sizeof(struct streebog_uint512));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1128,7 @@ static void __exit streebog_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(streebog_mod_init);</div><div class='add'>+subsys_initcall(streebog_mod_init);</div><div class='ctx'> module_exit(streebog_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c<br/>index 1ea2d5007ff5..798253f05203 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/tcrypt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/tcrypt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/tcrypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/tcrypt.c</a></div><div class='hunk'>@@ -3053,7 +3053,7 @@ err_free_tv:</div><div class='ctx'>  */</div><div class='ctx'> static void __exit tcrypt_mod_fini(void) { }</div><div class='ctx'> </div><div class='del'>-module_init(tcrypt_mod_init);</div><div class='add'>+subsys_initcall(tcrypt_mod_init);</div><div class='ctx'> module_exit(tcrypt_mod_fini);</div><div class='ctx'> </div><div class='ctx'> module_param(alg, charp, 0);</div><div class='head'>diff --git a/crypto/tea.c b/crypto/tea.c<br/>index b70b441c7d1e..786b589e1399 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/tea.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/tea.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/tea.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/tea.c</a></div><div class='hunk'>@@ -274,7 +274,7 @@ MODULE_ALIAS_CRYPTO("tea");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("xtea");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("xeta");</div><div class='ctx'> </div><div class='del'>-module_init(tea_mod_init);</div><div class='add'>+subsys_initcall(tea_mod_init);</div><div class='ctx'> module_exit(tea_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/testmgr.c b/crypto/testmgr.c<br/>index 8386038d67c7..c9e67c2bd725 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/testmgr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/testmgr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/testmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/testmgr.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;crypto/akcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/kpp.h&gt;</div><div class='ctx'> #include &lt;crypto/acompress.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -44,6 +45,9 @@ static bool notests;</div><div class='ctx'> module_param(notests, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(notests, "disable crypto self-tests");</div><div class='ctx'> </div><div class='add'>+static bool panic_on_fail;</div><div class='add'>+module_param(panic_on_fail, bool, 0444);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS</div><div class='ctx'> static bool noextratests;</div><div class='ctx'> module_param(noextratests, bool, 0644);</div><div class='hunk'>@@ -52,6 +56,9 @@ MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests");</div><div class='ctx'> static unsigned int fuzz_iterations = 100;</div><div class='ctx'> module_param(fuzz_iterations, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations");</div><div class='add'>+</div><div class='add'>+DEFINE_PER_CPU(bool, crypto_simd_disabled_for_test);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(crypto_simd_disabled_for_test);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS</div><div class='hunk'>@@ -121,6 +128,7 @@ struct kpp_test_suite {</div><div class='ctx'> </div><div class='ctx'> struct alg_test_desc {</div><div class='ctx'> 	const char *alg;</div><div class='add'>+	const char *generic_driver;</div><div class='ctx'> 	int (*test)(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 		    u32 type, u32 mask);</div><div class='ctx'> 	int fips_allowed;	/* set if alg is allowed in fips mode */</div><div class='hunk'>@@ -230,12 +238,14 @@ enum finalization_type {</div><div class='ctx'>  *				  @offset</div><div class='ctx'>  * @flush_type: for hashes, whether an update() should be done now vs.</div><div class='ctx'>  *		continuing to accumulate data</div><div class='add'>+ * @nosimd: if doing the pending update(), do it with SIMD disabled?</div><div class='ctx'>  */</div><div class='ctx'> struct test_sg_division {</div><div class='ctx'> 	unsigned int proportion_of_total;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> 	bool offset_relative_to_alignmask;</div><div class='ctx'> 	enum flush_type flush_type;</div><div class='add'>+	bool nosimd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -255,6 +265,7 @@ struct test_sg_division {</div><div class='ctx'>  * @iv_offset_relative_to_alignmask: if true, add the algorithm's alignmask to</div><div class='ctx'>  *				     the @iv_offset</div><div class='ctx'>  * @finalization_type: what finalization function to use for hashes</div><div class='add'>+ * @nosimd: execute with SIMD disabled?  Requires !CRYPTO_TFM_REQ_MAY_SLEEP.</div><div class='ctx'>  */</div><div class='ctx'> struct testvec_config {</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -265,6 +276,7 @@ struct testvec_config {</div><div class='ctx'> 	unsigned int iv_offset;</div><div class='ctx'> 	bool iv_offset_relative_to_alignmask;</div><div class='ctx'> 	enum finalization_type finalization_type;</div><div class='add'>+	bool nosimd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TESTVEC_CONFIG_NAMELEN	192</div><div class='hunk'>@@ -416,8 +428,11 @@ static unsigned int count_test_sg_divisions(const struct test_sg_division *divs)</div><div class='ctx'> 	return ndivs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define SGDIVS_HAVE_FLUSHES	BIT(0)</div><div class='add'>+#define SGDIVS_HAVE_NOSIMD	BIT(1)</div><div class='add'>+</div><div class='ctx'> static bool valid_sg_divisions(const struct test_sg_division *divs,</div><div class='del'>-			       unsigned int count, bool *any_flushes_ret)</div><div class='add'>+			       unsigned int count, int *flags_ret)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int total = 0;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -428,7 +443,9 @@ static bool valid_sg_divisions(const struct test_sg_division *divs,</div><div class='ctx'> 			return false;</div><div class='ctx'> 		total += divs[i].proportion_of_total;</div><div class='ctx'> 		if (divs[i].flush_type != FLUSH_TYPE_NONE)</div><div class='del'>-			*any_flushes_ret = true;</div><div class='add'>+			*flags_ret |= SGDIVS_HAVE_FLUSHES;</div><div class='add'>+		if (divs[i].nosimd)</div><div class='add'>+			*flags_ret |= SGDIVS_HAVE_NOSIMD;</div><div class='ctx'> 	}</div><div class='ctx'> 	return total == TEST_SG_TOTAL &amp;&amp;</div><div class='ctx'> 		memchr_inv(&amp;divs[i], 0, (count - i) * sizeof(divs[0])) == NULL;</div><div class='hunk'>@@ -441,19 +458,18 @@ static bool valid_sg_divisions(const struct test_sg_division *divs,</div><div class='ctx'>  */</div><div class='ctx'> static bool valid_testvec_config(const struct testvec_config *cfg)</div><div class='ctx'> {</div><div class='del'>-	bool any_flushes = false;</div><div class='add'>+	int flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;name == NULL)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (!valid_sg_divisions(cfg-&gt;src_divs, ARRAY_SIZE(cfg-&gt;src_divs),</div><div class='del'>-				&amp;any_flushes))</div><div class='add'>+				&amp;flags))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;dst_divs[0].proportion_of_total) {</div><div class='ctx'> 		if (!valid_sg_divisions(cfg-&gt;dst_divs,</div><div class='del'>-					ARRAY_SIZE(cfg-&gt;dst_divs),</div><div class='del'>-					&amp;any_flushes))</div><div class='add'>+					ARRAY_SIZE(cfg-&gt;dst_divs), &amp;flags))</div><div class='ctx'> 			return false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (memchr_inv(cfg-&gt;dst_divs, 0, sizeof(cfg-&gt;dst_divs)))</div><div class='hunk'>@@ -466,7 +482,12 @@ static bool valid_testvec_config(const struct testvec_config *cfg)</div><div class='ctx'> 	    MAX_ALGAPI_ALIGNMASK + 1)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (any_flushes &amp;&amp; cfg-&gt;finalization_type == FINALIZATION_TYPE_DIGEST)</div><div class='add'>+	if ((flags &amp; (SGDIVS_HAVE_FLUSHES | SGDIVS_HAVE_NOSIMD)) &amp;&amp;</div><div class='add'>+	    cfg-&gt;finalization_type == FINALIZATION_TYPE_DIGEST)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if ((cfg-&gt;nosimd || (flags &amp; SGDIVS_HAVE_NOSIMD)) &amp;&amp;</div><div class='add'>+	    (cfg-&gt;req_flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -725,15 +746,101 @@ static int build_cipher_test_sglists(struct cipher_test_sglists *tsgls,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS</div><div class='add'>+</div><div class='add'>+/* Generate a random length in range [0, max_len], but prefer smaller values */</div><div class='add'>+static unsigned int generate_random_length(unsigned int max_len)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = prandom_u32() % (max_len + 1);</div><div class='add'>+</div><div class='add'>+	switch (prandom_u32() % 4) {</div><div class='add'>+	case 0:</div><div class='add'>+		return len % 64;</div><div class='add'>+	case 1:</div><div class='add'>+		return len % 256;</div><div class='add'>+	case 2:</div><div class='add'>+		return len % 1024;</div><div class='add'>+	default:</div><div class='add'>+		return len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sometimes make some random changes to the given data buffer */</div><div class='add'>+static void mutate_buffer(u8 *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	size_t num_flips;</div><div class='add'>+	size_t i;</div><div class='add'>+	size_t pos;</div><div class='add'>+</div><div class='add'>+	/* Sometimes flip some bits */</div><div class='add'>+	if (prandom_u32() % 4 == 0) {</div><div class='add'>+		num_flips = min_t(size_t, 1 &lt;&lt; (prandom_u32() % 8), count * 8);</div><div class='add'>+		for (i = 0; i &lt; num_flips; i++) {</div><div class='add'>+			pos = prandom_u32() % (count * 8);</div><div class='add'>+			buf[pos / 8] ^= 1 &lt;&lt; (pos % 8);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sometimes flip some bytes */</div><div class='add'>+	if (prandom_u32() % 4 == 0) {</div><div class='add'>+		num_flips = min_t(size_t, 1 &lt;&lt; (prandom_u32() % 8), count);</div><div class='add'>+		for (i = 0; i &lt; num_flips; i++)</div><div class='add'>+			buf[prandom_u32() % count] ^= 0xff;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Randomly generate 'count' bytes, but sometimes make them "interesting" */</div><div class='add'>+static void generate_random_bytes(u8 *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	u8 b;</div><div class='add'>+	u8 increment;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (prandom_u32() % 8) { /* Choose a generation strategy */</div><div class='add'>+	case 0:</div><div class='add'>+	case 1:</div><div class='add'>+		/* All the same byte, plus optional mutations */</div><div class='add'>+		switch (prandom_u32() % 4) {</div><div class='add'>+		case 0:</div><div class='add'>+			b = 0x00;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			b = 0xff;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			b = (u8)prandom_u32();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		memset(buf, b, count);</div><div class='add'>+		mutate_buffer(buf, count);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		/* Ascending or descending bytes, plus optional mutations */</div><div class='add'>+		increment = (u8)prandom_u32();</div><div class='add'>+		b = (u8)prandom_u32();</div><div class='add'>+		for (i = 0; i &lt; count; i++, b += increment)</div><div class='add'>+			buf[i] = b;</div><div class='add'>+		mutate_buffer(buf, count);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Fully random bytes */</div><div class='add'>+		for (i = 0; i &lt; count; i++)</div><div class='add'>+			buf[i] = (u8)prandom_u32();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static char *generate_random_sgl_divisions(struct test_sg_division *divs,</div><div class='ctx'> 					   size_t max_divs, char *p, char *end,</div><div class='del'>-					   bool gen_flushes)</div><div class='add'>+					   bool gen_flushes, u32 req_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct test_sg_division *div = divs;</div><div class='ctx'> 	unsigned int remaining = TEST_SG_TOTAL;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		unsigned int this_len;</div><div class='add'>+		const char *flushtype_str;</div><div class='ctx'> </div><div class='ctx'> 		if (div == &amp;divs[max_divs - 1] || prandom_u32() % 2 == 0)</div><div class='ctx'> 			this_len = remaining;</div><div class='hunk'>@@ -762,11 +869,31 @@ static char *generate_random_sgl_divisions(struct test_sg_division *divs,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (div-&gt;flush_type != FLUSH_TYPE_NONE &amp;&amp;</div><div class='add'>+		    !(req_flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) &amp;&amp;</div><div class='add'>+		    prandom_u32() % 2 == 0)</div><div class='add'>+			div-&gt;nosimd = true;</div><div class='add'>+</div><div class='add'>+		switch (div-&gt;flush_type) {</div><div class='add'>+		case FLUSH_TYPE_FLUSH:</div><div class='add'>+			if (div-&gt;nosimd)</div><div class='add'>+				flushtype_str = "&lt;flush,nosimd&gt;";</div><div class='add'>+			else</div><div class='add'>+				flushtype_str = "&lt;flush&gt;";</div><div class='add'>+			break;</div><div class='add'>+		case FLUSH_TYPE_REIMPORT:</div><div class='add'>+			if (div-&gt;nosimd)</div><div class='add'>+				flushtype_str = "&lt;reimport,nosimd&gt;";</div><div class='add'>+			else</div><div class='add'>+				flushtype_str = "&lt;reimport&gt;";</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			flushtype_str = "";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		BUILD_BUG_ON(TEST_SG_TOTAL != 10000); /* for "%u.%u%%" */</div><div class='del'>-		p += scnprintf(p, end - p, "%s%u.%u%%@%s+%u%s",</div><div class='del'>-			       div-&gt;flush_type == FLUSH_TYPE_NONE ? "" :</div><div class='del'>-			       div-&gt;flush_type == FLUSH_TYPE_FLUSH ?</div><div class='del'>-			       "&lt;flush&gt; " : "&lt;reimport&gt; ",</div><div class='add'>+		p += scnprintf(p, end - p, "%s%u.%u%%@%s+%u%s", flushtype_str,</div><div class='ctx'> 			       this_len / 100, this_len % 100,</div><div class='ctx'> 			       div-&gt;offset_relative_to_alignmask ?</div><div class='ctx'> 					"alignmask" : "",</div><div class='hunk'>@@ -816,18 +943,26 @@ static void generate_random_testvec_config(struct testvec_config *cfg,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!(cfg-&gt;req_flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) &amp;&amp;</div><div class='add'>+	    prandom_u32() % 2 == 0) {</div><div class='add'>+		cfg-&gt;nosimd = true;</div><div class='add'>+		p += scnprintf(p, end - p, " nosimd");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	p += scnprintf(p, end - p, " src_divs=[");</div><div class='ctx'> 	p = generate_random_sgl_divisions(cfg-&gt;src_divs,</div><div class='ctx'> 					  ARRAY_SIZE(cfg-&gt;src_divs), p, end,</div><div class='ctx'> 					  (cfg-&gt;finalization_type !=</div><div class='del'>-					   FINALIZATION_TYPE_DIGEST));</div><div class='add'>+					   FINALIZATION_TYPE_DIGEST),</div><div class='add'>+					  cfg-&gt;req_flags);</div><div class='ctx'> 	p += scnprintf(p, end - p, "]");</div><div class='ctx'> </div><div class='ctx'> 	if (!cfg-&gt;inplace &amp;&amp; prandom_u32() % 2 == 0) {</div><div class='ctx'> 		p += scnprintf(p, end - p, " dst_divs=[");</div><div class='ctx'> 		p = generate_random_sgl_divisions(cfg-&gt;dst_divs,</div><div class='ctx'> 						  ARRAY_SIZE(cfg-&gt;dst_divs),</div><div class='del'>-						  p, end, false);</div><div class='add'>+						  p, end, false,</div><div class='add'>+						  cfg-&gt;req_flags);</div><div class='ctx'> 		p += scnprintf(p, end - p, "]");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -838,21 +973,100 @@ static void generate_random_testvec_config(struct testvec_config *cfg,</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!valid_testvec_config(cfg));</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+</div><div class='add'>+static void crypto_disable_simd_for_test(void)</div><div class='add'>+{</div><div class='add'>+	preempt_disable();</div><div class='add'>+	__this_cpu_write(crypto_simd_disabled_for_test, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_reenable_simd_for_test(void)</div><div class='add'>+{</div><div class='add'>+	__this_cpu_write(crypto_simd_disabled_for_test, false);</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Given an algorithm name, build the name of the generic implementation of that</div><div class='add'>+ * algorithm, assuming the usual naming convention.  Specifically, this appends</div><div class='add'>+ * "-generic" to every part of the name that is not a template name.  Examples:</div><div class='add'>+ *</div><div class='add'>+ *	aes =&gt; aes-generic</div><div class='add'>+ *	cbc(aes) =&gt; cbc(aes-generic)</div><div class='add'>+ *	cts(cbc(aes)) =&gt; cts(cbc(aes-generic))</div><div class='add'>+ *	rfc7539(chacha20,poly1305) =&gt; rfc7539(chacha20-generic,poly1305-generic)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or -ENAMETOOLONG if the generic name would be too long</div><div class='add'>+ */</div><div class='add'>+static int build_generic_driver_name(const char *algname,</div><div class='add'>+				     char driver_name[CRYPTO_MAX_ALG_NAME])</div><div class='add'>+{</div><div class='add'>+	const char *in = algname;</div><div class='add'>+	char *out = driver_name;</div><div class='add'>+	size_t len = strlen(algname);</div><div class='add'>+</div><div class='add'>+	if (len &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		goto too_long;</div><div class='add'>+	do {</div><div class='add'>+		const char *in_saved = in;</div><div class='add'>+</div><div class='add'>+		while (*in &amp;&amp; *in != '(' &amp;&amp; *in != ')' &amp;&amp; *in != ',')</div><div class='add'>+			*out++ = *in++;</div><div class='add'>+		if (*in != '(' &amp;&amp; in &gt; in_saved) {</div><div class='add'>+			len += 8;</div><div class='add'>+			if (len &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+				goto too_long;</div><div class='add'>+			memcpy(out, "-generic", 8);</div><div class='add'>+			out += 8;</div><div class='add'>+		}</div><div class='add'>+	} while ((*out++ = *in++) != '\0');</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+too_long:</div><div class='add'>+	pr_err("alg: generic driver name for \"%s\" would be too long\n",</div><div class='add'>+	       algname);</div><div class='add'>+	return -ENAMETOOLONG;</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+static void crypto_disable_simd_for_test(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_reenable_simd_for_test(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+</div><div class='add'>+static int do_ahash_op(int (*op)(struct ahash_request *req),</div><div class='add'>+		       struct ahash_request *req,</div><div class='add'>+		       struct crypto_wait *wait, bool nosimd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (nosimd)</div><div class='add'>+		crypto_disable_simd_for_test();</div><div class='add'>+</div><div class='add'>+	err = op(req);</div><div class='add'>+</div><div class='add'>+	if (nosimd)</div><div class='add'>+		crypto_reenable_simd_for_test();</div><div class='add'>+</div><div class='add'>+	return crypto_wait_req(err, wait);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int check_nonfinal_hash_op(const char *op, int err,</div><div class='ctx'> 				  u8 *result, unsigned int digestsize,</div><div class='del'>-				  const char *driver, unsigned int vec_num,</div><div class='add'>+				  const char *driver, const char *vec_name,</div><div class='ctx'> 				  const struct testvec_config *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	if (err) {</div><div class='del'>-		pr_err("alg: hash: %s %s() failed with err %d on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, err, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: hash: %s %s() failed with err %d on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, err, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!testmgr_is_poison(result, digestsize)) {</div><div class='del'>-		pr_err("alg: hash: %s %s() used result buffer on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: hash: %s %s() used result buffer on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -860,7 +1074,7 @@ static int check_nonfinal_hash_op(const char *op, int err,</div><div class='ctx'> </div><div class='ctx'> static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 			     const struct hash_testvec *vec,</div><div class='del'>-			     unsigned int vec_num,</div><div class='add'>+			     const char *vec_name,</div><div class='ctx'> 			     const struct testvec_config *cfg,</div><div class='ctx'> 			     struct ahash_request *req,</div><div class='ctx'> 			     struct test_sglist *tsgl,</div><div class='hunk'>@@ -885,11 +1099,18 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 	if (vec-&gt;ksize) {</div><div class='ctx'> 		err = crypto_ahash_setkey(tfm, vec-&gt;key, vec-&gt;ksize);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			pr_err("alg: hash: %s setkey failed with err %d on test vector %u; flags=%#x\n",</div><div class='del'>-			       driver, err, vec_num,</div><div class='add'>+			if (err == vec-&gt;setkey_error)</div><div class='add'>+				return 0;</div><div class='add'>+			pr_err("alg: hash: %s setkey failed on test vector %s; expected_error=%d, actual_error=%d, flags=%#x\n",</div><div class='add'>+			       driver, vec_name, vec-&gt;setkey_error, err,</div><div class='ctx'> 			       crypto_ahash_get_flags(tfm));</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='add'>+		if (vec-&gt;setkey_error) {</div><div class='add'>+			pr_err("alg: hash: %s setkey unexpectedly succeeded on test vector %s; expected_error=%d\n",</div><div class='add'>+			       driver, vec_name, vec-&gt;setkey_error);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Build the scatterlist for the source data */</div><div class='hunk'>@@ -899,8 +1120,8 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 	err = build_test_sglist(tsgl, cfg-&gt;src_divs, alignmask, vec-&gt;psize,</div><div class='ctx'> 				&amp;input, divs);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		pr_err("alg: hash: %s: error preparing scatterlist for test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: hash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -909,17 +1130,26 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 	testmgr_poison(req-&gt;__ctx, crypto_ahash_reqsize(tfm));</div><div class='ctx'> 	testmgr_poison(result, digestsize + TESTMGR_POISON_LEN);</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;finalization_type == FINALIZATION_TYPE_DIGEST) {</div><div class='add'>+	if (cfg-&gt;finalization_type == FINALIZATION_TYPE_DIGEST ||</div><div class='add'>+	    vec-&gt;digest_error) {</div><div class='ctx'> 		/* Just using digest() */</div><div class='ctx'> 		ahash_request_set_callback(req, req_flags, crypto_req_done,</div><div class='ctx'> 					   &amp;wait);</div><div class='ctx'> 		ahash_request_set_crypt(req, tsgl-&gt;sgl, result, vec-&gt;psize);</div><div class='del'>-		err = crypto_wait_req(crypto_ahash_digest(req), &amp;wait);</div><div class='add'>+		err = do_ahash_op(crypto_ahash_digest, req, &amp;wait, cfg-&gt;nosimd);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			pr_err("alg: hash: %s digest() failed with err %d on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-			       driver, err, vec_num, cfg-&gt;name);</div><div class='add'>+			if (err == vec-&gt;digest_error)</div><div class='add'>+				return 0;</div><div class='add'>+			pr_err("alg: hash: %s digest() failed on test vector %s; expected_error=%d, actual_error=%d, cfg=\"%s\"\n",</div><div class='add'>+			       driver, vec_name, vec-&gt;digest_error, err,</div><div class='add'>+			       cfg-&gt;name);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='add'>+		if (vec-&gt;digest_error) {</div><div class='add'>+			pr_err("alg: hash: %s digest() unexpectedly succeeded on test vector %s; expected_error=%d, cfg=\"%s\"\n",</div><div class='add'>+			       driver, vec_name, vec-&gt;digest_error, cfg-&gt;name);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		goto result_ready;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -927,9 +1157,9 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> </div><div class='ctx'> 	ahash_request_set_callback(req, req_flags, crypto_req_done, &amp;wait);</div><div class='ctx'> 	ahash_request_set_crypt(req, NULL, result, 0);</div><div class='del'>-	err = crypto_wait_req(crypto_ahash_init(req), &amp;wait);</div><div class='add'>+	err = do_ahash_op(crypto_ahash_init, req, &amp;wait, cfg-&gt;nosimd);</div><div class='ctx'> 	err = check_nonfinal_hash_op("init", err, result, digestsize,</div><div class='del'>-				     driver, vec_num, cfg);</div><div class='add'>+				     driver, vec_name, cfg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -943,10 +1173,11 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 						   crypto_req_done, &amp;wait);</div><div class='ctx'> 			ahash_request_set_crypt(req, pending_sgl, result,</div><div class='ctx'> 						pending_len);</div><div class='del'>-			err = crypto_wait_req(crypto_ahash_update(req), &amp;wait);</div><div class='add'>+			err = do_ahash_op(crypto_ahash_update, req, &amp;wait,</div><div class='add'>+					  divs[i]-&gt;nosimd);</div><div class='ctx'> 			err = check_nonfinal_hash_op("update", err,</div><div class='ctx'> 						     result, digestsize,</div><div class='del'>-						     driver, vec_num, cfg);</div><div class='add'>+						     driver, vec_name, cfg);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			pending_sgl = NULL;</div><div class='hunk'>@@ -959,13 +1190,13 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 			err = crypto_ahash_export(req, hashstate);</div><div class='ctx'> 			err = check_nonfinal_hash_op("export", err,</div><div class='ctx'> 						     result, digestsize,</div><div class='del'>-						     driver, vec_num, cfg);</div><div class='add'>+						     driver, vec_name, cfg);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			if (!testmgr_is_poison(hashstate + statesize,</div><div class='ctx'> 					       TESTMGR_POISON_LEN)) {</div><div class='del'>-				pr_err("alg: hash: %s export() overran state buffer on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-				       driver, vec_num, cfg-&gt;name);</div><div class='add'>+				pr_err("alg: hash: %s export() overran state buffer on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+				       driver, vec_name, cfg-&gt;name);</div><div class='ctx'> 				return -EOVERFLOW;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -973,7 +1204,7 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 			err = crypto_ahash_import(req, hashstate);</div><div class='ctx'> 			err = check_nonfinal_hash_op("import", err,</div><div class='ctx'> 						     result, digestsize,</div><div class='del'>-						     driver, vec_num, cfg);</div><div class='add'>+						     driver, vec_name, cfg);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -986,23 +1217,23 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> 	ahash_request_set_crypt(req, pending_sgl, result, pending_len);</div><div class='ctx'> 	if (cfg-&gt;finalization_type == FINALIZATION_TYPE_FINAL) {</div><div class='ctx'> 		/* finish with update() and final() */</div><div class='del'>-		err = crypto_wait_req(crypto_ahash_update(req), &amp;wait);</div><div class='add'>+		err = do_ahash_op(crypto_ahash_update, req, &amp;wait, cfg-&gt;nosimd);</div><div class='ctx'> 		err = check_nonfinal_hash_op("update", err, result, digestsize,</div><div class='del'>-					     driver, vec_num, cfg);</div><div class='add'>+					     driver, vec_name, cfg);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		err = crypto_wait_req(crypto_ahash_final(req), &amp;wait);</div><div class='add'>+		err = do_ahash_op(crypto_ahash_final, req, &amp;wait, cfg-&gt;nosimd);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			pr_err("alg: hash: %s final() failed with err %d on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-			       driver, err, vec_num, cfg-&gt;name);</div><div class='add'>+			pr_err("alg: hash: %s final() failed with err %d on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+			       driver, err, vec_name, cfg-&gt;name);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* finish with finup() */</div><div class='del'>-		err = crypto_wait_req(crypto_ahash_finup(req), &amp;wait);</div><div class='add'>+		err = do_ahash_op(crypto_ahash_finup, req, &amp;wait, cfg-&gt;nosimd);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			pr_err("alg: hash: %s finup() failed with err %d on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-			       driver, err, vec_num, cfg-&gt;name);</div><div class='add'>+			pr_err("alg: hash: %s finup() failed with err %d on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+			       driver, err, vec_name, cfg-&gt;name);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1010,13 +1241,13 @@ static int test_hash_vec_cfg(const char *driver,</div><div class='ctx'> result_ready:</div><div class='ctx'> 	/* Check that the algorithm produced the correct digest */</div><div class='ctx'> 	if (memcmp(result, vec-&gt;digest, digestsize) != 0) {</div><div class='del'>-		pr_err("alg: hash: %s test failed (wrong result) on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: hash: %s test failed (wrong result) on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!testmgr_is_poison(&amp;result[digestsize], TESTMGR_POISON_LEN)) {</div><div class='del'>-		pr_err("alg: hash: %s overran result buffer on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: hash: %s overran result buffer on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return -EOVERFLOW;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1027,11 +1258,14 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec,</div><div class='ctx'> 			 unsigned int vec_num, struct ahash_request *req,</div><div class='ctx'> 			 struct test_sglist *tsgl, u8 *hashstate)</div><div class='ctx'> {</div><div class='add'>+	char vec_name[16];</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	sprintf(vec_name, "%u", vec_num);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(default_hash_testvec_configs); i++) {</div><div class='del'>-		err = test_hash_vec_cfg(driver, vec, vec_num,</div><div class='add'>+		err = test_hash_vec_cfg(driver, vec, vec_name,</div><div class='ctx'> 					&amp;default_hash_testvec_configs[i],</div><div class='ctx'> 					req, tsgl, hashstate);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1046,7 +1280,7 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec,</div><div class='ctx'> 		for (i = 0; i &lt; fuzz_iterations; i++) {</div><div class='ctx'> 			generate_random_testvec_config(&amp;cfg, cfgname,</div><div class='ctx'> 						       sizeof(cfgname));</div><div class='del'>-			err = test_hash_vec_cfg(driver, vec, vec_num, &amp;cfg,</div><div class='add'>+			err = test_hash_vec_cfg(driver, vec, vec_name, &amp;cfg,</div><div class='ctx'> 						req, tsgl, hashstate);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -1056,9 +1290,168 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS</div><div class='add'>+/*</div><div class='add'>+ * Generate a hash test vector from the given implementation.</div><div class='add'>+ * Assumes the buffers in 'vec' were already allocated.</div><div class='add'>+ */</div><div class='add'>+static void generate_random_hash_testvec(struct crypto_shash *tfm,</div><div class='add'>+					 struct hash_testvec *vec,</div><div class='add'>+					 unsigned int maxkeysize,</div><div class='add'>+					 unsigned int maxdatasize,</div><div class='add'>+					 char *name, size_t max_namelen)</div><div class='add'>+{</div><div class='add'>+	SHASH_DESC_ON_STACK(desc, tfm);</div><div class='add'>+</div><div class='add'>+	/* Data */</div><div class='add'>+	vec-&gt;psize = generate_random_length(maxdatasize);</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;plaintext, vec-&gt;psize);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Key: length in range [1, maxkeysize], but usually choose maxkeysize.</div><div class='add'>+	 * If algorithm is unkeyed, then maxkeysize == 0 and set ksize = 0.</div><div class='add'>+	 */</div><div class='add'>+	vec-&gt;setkey_error = 0;</div><div class='add'>+	vec-&gt;ksize = 0;</div><div class='add'>+	if (maxkeysize) {</div><div class='add'>+		vec-&gt;ksize = maxkeysize;</div><div class='add'>+		if (prandom_u32() % 4 == 0)</div><div class='add'>+			vec-&gt;ksize = 1 + (prandom_u32() % maxkeysize);</div><div class='add'>+		generate_random_bytes((u8 *)vec-&gt;key, vec-&gt;ksize);</div><div class='add'>+</div><div class='add'>+		vec-&gt;setkey_error = crypto_shash_setkey(tfm, vec-&gt;key,</div><div class='add'>+							vec-&gt;ksize);</div><div class='add'>+		/* If the key couldn't be set, no need to continue to digest. */</div><div class='add'>+		if (vec-&gt;setkey_error)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Digest */</div><div class='add'>+	desc-&gt;tfm = tfm;</div><div class='add'>+	vec-&gt;digest_error = crypto_shash_digest(desc, vec-&gt;plaintext,</div><div class='add'>+						vec-&gt;psize, (u8 *)vec-&gt;digest);</div><div class='add'>+done:</div><div class='add'>+	snprintf(name, max_namelen, "\"random: psize=%u ksize=%u\"",</div><div class='add'>+		 vec-&gt;psize, vec-&gt;ksize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test the hash algorithm represented by @req against the corresponding generic</div><div class='add'>+ * implementation, if one is available.</div><div class='add'>+ */</div><div class='add'>+static int test_hash_vs_generic_impl(const char *driver,</div><div class='add'>+				     const char *generic_driver,</div><div class='add'>+				     unsigned int maxkeysize,</div><div class='add'>+				     struct ahash_request *req,</div><div class='add'>+				     struct test_sglist *tsgl,</div><div class='add'>+				     u8 *hashstate)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	const unsigned int digestsize = crypto_ahash_digestsize(tfm);</div><div class='add'>+	const unsigned int blocksize = crypto_ahash_blocksize(tfm);</div><div class='add'>+	const unsigned int maxdatasize = (2 * PAGE_SIZE) - TESTMGR_POISON_LEN;</div><div class='add'>+	const char *algname = crypto_hash_alg_common(tfm)-&gt;base.cra_name;</div><div class='add'>+	char _generic_driver[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	struct crypto_shash *generic_tfm = NULL;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	struct hash_testvec vec = { 0 };</div><div class='add'>+	char vec_name[64];</div><div class='add'>+	struct testvec_config cfg;</div><div class='add'>+	char cfgname[TESTVEC_CONFIG_NAMELEN];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (noextratests)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!generic_driver) { /* Use default naming convention? */</div><div class='add'>+		err = build_generic_driver_name(algname, _generic_driver);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		generic_driver = _generic_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strcmp(generic_driver, driver) == 0) /* Already the generic impl? */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	generic_tfm = crypto_alloc_shash(generic_driver, 0, 0);</div><div class='add'>+	if (IS_ERR(generic_tfm)) {</div><div class='add'>+		err = PTR_ERR(generic_tfm);</div><div class='add'>+		if (err == -ENOENT) {</div><div class='add'>+			pr_warn("alg: hash: skipping comparison tests for %s because %s is unavailable\n",</div><div class='add'>+				driver, generic_driver);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		pr_err("alg: hash: error allocating %s (generic impl of %s): %d\n",</div><div class='add'>+		       generic_driver, algname, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the algorithm properties for consistency. */</div><div class='add'>+</div><div class='add'>+	if (digestsize != crypto_shash_digestsize(generic_tfm)) {</div><div class='add'>+		pr_err("alg: hash: digestsize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, digestsize,</div><div class='add'>+		       crypto_shash_digestsize(generic_tfm));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (blocksize != crypto_shash_blocksize(generic_tfm)) {</div><div class='add'>+		pr_err("alg: hash: blocksize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, blocksize, crypto_shash_blocksize(generic_tfm));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now generate test vectors using the generic implementation, and test</div><div class='add'>+	 * the other implementation against them.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	vec.key = kmalloc(maxkeysize, GFP_KERNEL);</div><div class='add'>+	vec.plaintext = kmalloc(maxdatasize, GFP_KERNEL);</div><div class='add'>+	vec.digest = kmalloc(digestsize, GFP_KERNEL);</div><div class='add'>+	if (!vec.key || !vec.plaintext || !vec.digest) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fuzz_iterations * 8; i++) {</div><div class='add'>+		generate_random_hash_testvec(generic_tfm, &amp;vec,</div><div class='add'>+					     maxkeysize, maxdatasize,</div><div class='add'>+					     vec_name, sizeof(vec_name));</div><div class='add'>+		generate_random_testvec_config(&amp;cfg, cfgname, sizeof(cfgname));</div><div class='add'>+</div><div class='add'>+		err = test_hash_vec_cfg(driver, &amp;vec, vec_name, &amp;cfg,</div><div class='add'>+					req, tsgl, hashstate);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(vec.key);</div><div class='add'>+	kfree(vec.plaintext);</div><div class='add'>+	kfree(vec.digest);</div><div class='add'>+	crypto_free_shash(generic_tfm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+static int test_hash_vs_generic_impl(const char *driver,</div><div class='add'>+				     const char *generic_driver,</div><div class='add'>+				     unsigned int maxkeysize,</div><div class='add'>+				     struct ahash_request *req,</div><div class='add'>+				     struct test_sglist *tsgl,</div><div class='add'>+				     u8 *hashstate)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+</div><div class='ctx'> static int __alg_test_hash(const struct hash_testvec *vecs,</div><div class='ctx'> 			   unsigned int num_vecs, const char *driver,</div><div class='del'>-			   u32 type, u32 mask)</div><div class='add'>+			   u32 type, u32 mask,</div><div class='add'>+			   const char *generic_driver, unsigned int maxkeysize)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ahash *tfm;</div><div class='ctx'> 	struct ahash_request *req = NULL;</div><div class='hunk'>@@ -1106,7 +1499,8 @@ static int __alg_test_hash(const struct hash_testvec *vecs,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	err = 0;</div><div class='add'>+	err = test_hash_vs_generic_impl(driver, generic_driver, maxkeysize, req,</div><div class='add'>+					tsgl, hashstate);</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(hashstate);</div><div class='ctx'> 	if (tsgl) {</div><div class='hunk'>@@ -1124,6 +1518,7 @@ static int alg_test_hash(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 	const struct hash_testvec *template = desc-&gt;suite.hash.vecs;</div><div class='ctx'> 	unsigned int tcount = desc-&gt;suite.hash.count;</div><div class='ctx'> 	unsigned int nr_unkeyed, nr_keyed;</div><div class='add'>+	unsigned int maxkeysize = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1142,23 +1537,27 @@ static int alg_test_hash(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 			       "unkeyed ones must come first\n", desc-&gt;alg);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		maxkeysize = max_t(unsigned int, maxkeysize,</div><div class='add'>+				   template[nr_unkeyed + nr_keyed].ksize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	if (nr_unkeyed) {</div><div class='del'>-		err = __alg_test_hash(template, nr_unkeyed, driver, type, mask);</div><div class='add'>+		err = __alg_test_hash(template, nr_unkeyed, driver, type, mask,</div><div class='add'>+				      desc-&gt;generic_driver, maxkeysize);</div><div class='ctx'> 		template += nr_unkeyed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!err &amp;&amp; nr_keyed)</div><div class='del'>-		err = __alg_test_hash(template, nr_keyed, driver, type, mask);</div><div class='add'>+		err = __alg_test_hash(template, nr_keyed, driver, type, mask,</div><div class='add'>+				      desc-&gt;generic_driver, maxkeysize);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 			     const struct aead_testvec *vec,</div><div class='del'>-			     unsigned int vec_num,</div><div class='add'>+			     const char *vec_name,</div><div class='ctx'> 			     const struct testvec_config *cfg,</div><div class='ctx'> 			     struct aead_request *req,</div><div class='ctx'> 			     struct cipher_test_sglists *tsgls)</div><div class='hunk'>@@ -1175,6 +1574,7 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 		 cfg-&gt;iv_offset +</div><div class='ctx'> 		 (cfg-&gt;iv_offset_relative_to_alignmask ? alignmask : 0);</div><div class='ctx'> 	struct kvec input[2];</div><div class='add'>+	int expected_error;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the key */</div><div class='hunk'>@@ -1183,26 +1583,33 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	else</div><div class='ctx'> 		crypto_aead_clear_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);</div><div class='ctx'> 	err = crypto_aead_setkey(tfm, vec-&gt;key, vec-&gt;klen);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (vec-&gt;fail) /* expectedly failed to set key? */</div><div class='del'>-			return 0;</div><div class='del'>-		pr_err("alg: aead: %s setkey failed with err %d on test vector %u; flags=%#x\n",</div><div class='del'>-		       driver, err, vec_num, crypto_aead_get_flags(tfm));</div><div class='add'>+	if (err &amp;&amp; err != vec-&gt;setkey_error) {</div><div class='add'>+		pr_err("alg: aead: %s setkey failed on test vector %s; expected_error=%d, actual_error=%d, flags=%#x\n",</div><div class='add'>+		       driver, vec_name, vec-&gt;setkey_error, err,</div><div class='add'>+		       crypto_aead_get_flags(tfm));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (vec-&gt;fail) {</div><div class='del'>-		pr_err("alg: aead: %s setkey unexpectedly succeeded on test vector %u\n",</div><div class='del'>-		       driver, vec_num);</div><div class='add'>+	if (!err &amp;&amp; vec-&gt;setkey_error) {</div><div class='add'>+		pr_err("alg: aead: %s setkey unexpectedly succeeded on test vector %s; expected_error=%d\n",</div><div class='add'>+		       driver, vec_name, vec-&gt;setkey_error);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the authentication tag size */</div><div class='ctx'> 	err = crypto_aead_setauthsize(tfm, authsize);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("alg: aead: %s setauthsize failed with err %d on test vector %u\n",</div><div class='del'>-		       driver, err, vec_num);</div><div class='add'>+	if (err &amp;&amp; err != vec-&gt;setauthsize_error) {</div><div class='add'>+		pr_err("alg: aead: %s setauthsize failed on test vector %s; expected_error=%d, actual_error=%d\n",</div><div class='add'>+		       driver, vec_name, vec-&gt;setauthsize_error, err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='add'>+	if (!err &amp;&amp; vec-&gt;setauthsize_error) {</div><div class='add'>+		pr_err("alg: aead: %s setauthsize unexpectedly succeeded on test vector %s; expected_error=%d\n",</div><div class='add'>+		       driver, vec_name, vec-&gt;setauthsize_error);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vec-&gt;setkey_error || vec-&gt;setauthsize_error)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* The IV must be copied to a buffer, as the algorithm may modify it */</div><div class='ctx'> 	if (WARN_ON(ivsize &gt; MAX_IVLEN))</div><div class='hunk'>@@ -1224,8 +1631,8 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 						     vec-&gt;plen),</div><div class='ctx'> 					input, 2);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		pr_err("alg: aead: %s %s: error preparing scatterlists for test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: aead: %s %s: error preparing scatterlists for test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1235,23 +1642,12 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	aead_request_set_crypt(req, tsgls-&gt;src.sgl_ptr, tsgls-&gt;dst.sgl_ptr,</div><div class='ctx'> 			       enc ? vec-&gt;plen : vec-&gt;clen, iv);</div><div class='ctx'> 	aead_request_set_ad(req, vec-&gt;alen);</div><div class='del'>-	err = crypto_wait_req(enc ? crypto_aead_encrypt(req) :</div><div class='del'>-			      crypto_aead_decrypt(req), &amp;wait);</div><div class='del'>-</div><div class='del'>-	aead_request_set_tfm(req, tfm); /* TODO: get rid of this */</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err == -EBADMSG &amp;&amp; vec-&gt;novrfy)</div><div class='del'>-			return 0;</div><div class='del'>-		pr_err("alg: aead: %s %s failed with err %d on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, err, vec_num, cfg-&gt;name);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if (vec-&gt;novrfy) {</div><div class='del'>-		pr_err("alg: aead: %s %s unexpectedly succeeded on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (cfg-&gt;nosimd)</div><div class='add'>+		crypto_disable_simd_for_test();</div><div class='add'>+	err = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);</div><div class='add'>+	if (cfg-&gt;nosimd)</div><div class='add'>+		crypto_reenable_simd_for_test();</div><div class='add'>+	err = crypto_wait_req(err, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 	/* Check that the algorithm didn't overwrite things it shouldn't have */</div><div class='ctx'> 	if (req-&gt;cryptlen != (enc ? vec-&gt;plen : vec-&gt;clen) ||</div><div class='hunk'>@@ -1263,8 +1659,8 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	    req-&gt;base.complete != crypto_req_done ||</div><div class='ctx'> 	    req-&gt;base.flags != req_flags ||</div><div class='ctx'> 	    req-&gt;base.data != &amp;wait) {</div><div class='del'>-		pr_err("alg: aead: %s %s corrupted request struct on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: aead: %s %s corrupted request struct on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		if (req-&gt;cryptlen != (enc ? vec-&gt;plen : vec-&gt;clen))</div><div class='ctx'> 			pr_err("alg: aead: changed 'req-&gt;cryptlen'\n");</div><div class='ctx'> 		if (req-&gt;assoclen != vec-&gt;alen)</div><div class='hunk'>@@ -1286,14 +1682,29 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (is_test_sglist_corrupted(&amp;tsgls-&gt;src)) {</div><div class='del'>-		pr_err("alg: aead: %s %s corrupted src sgl on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: aead: %s %s corrupted src sgl on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tsgls-&gt;dst.sgl_ptr != tsgls-&gt;src.sgl &amp;&amp;</div><div class='ctx'> 	    is_test_sglist_corrupted(&amp;tsgls-&gt;dst)) {</div><div class='del'>-		pr_err("alg: aead: %s %s corrupted dst sgl on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: aead: %s %s corrupted dst sgl on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for success or failure */</div><div class='add'>+	expected_error = vec-&gt;novrfy ? -EBADMSG : vec-&gt;crypt_error;</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == expected_error)</div><div class='add'>+			return 0;</div><div class='add'>+		pr_err("alg: aead: %s %s failed on test vector %s; expected_error=%d, actual_error=%d, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, expected_error, err, cfg-&gt;name);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (expected_error) {</div><div class='add'>+		pr_err("alg: aead: %s %s unexpectedly succeeded on test vector %s; expected_error=%d, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, expected_error, cfg-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1302,13 +1713,13 @@ static int test_aead_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 				    enc ? vec-&gt;clen : vec-&gt;plen,</div><div class='ctx'> 				    vec-&gt;alen, enc || !cfg-&gt;inplace);</div><div class='ctx'> 	if (err == -EOVERFLOW) {</div><div class='del'>-		pr_err("alg: aead: %s %s overran dst buffer on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: aead: %s %s overran dst buffer on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err) {</div><div class='del'>-		pr_err("alg: aead: %s %s test failed (wrong result) on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: aead: %s %s test failed (wrong result) on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1320,14 +1731,17 @@ static int test_aead_vec(const char *driver, int enc,</div><div class='ctx'> 			 struct aead_request *req,</div><div class='ctx'> 			 struct cipher_test_sglists *tsgls)</div><div class='ctx'> {</div><div class='add'>+	char vec_name[16];</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (enc &amp;&amp; vec-&gt;novrfy)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	sprintf(vec_name, "%u", vec_num);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(default_cipher_testvec_configs); i++) {</div><div class='del'>-		err = test_aead_vec_cfg(driver, enc, vec, vec_num,</div><div class='add'>+		err = test_aead_vec_cfg(driver, enc, vec, vec_name,</div><div class='ctx'> 					&amp;default_cipher_testvec_configs[i],</div><div class='ctx'> 					req, tsgls);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1342,7 +1756,7 @@ static int test_aead_vec(const char *driver, int enc,</div><div class='ctx'> 		for (i = 0; i &lt; fuzz_iterations; i++) {</div><div class='ctx'> 			generate_random_testvec_config(&amp;cfg, cfgname,</div><div class='ctx'> 						       sizeof(cfgname));</div><div class='del'>-			err = test_aead_vec_cfg(driver, enc, vec, vec_num,</div><div class='add'>+			err = test_aead_vec_cfg(driver, enc, vec, vec_name,</div><div class='ctx'> 						&amp;cfg, req, tsgls);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -1352,6 +1766,226 @@ static int test_aead_vec(const char *driver, int enc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS</div><div class='add'>+/*</div><div class='add'>+ * Generate an AEAD test vector from the given implementation.</div><div class='add'>+ * Assumes the buffers in 'vec' were already allocated.</div><div class='add'>+ */</div><div class='add'>+static void generate_random_aead_testvec(struct aead_request *req,</div><div class='add'>+					 struct aead_testvec *vec,</div><div class='add'>+					 unsigned int maxkeysize,</div><div class='add'>+					 unsigned int maxdatasize,</div><div class='add'>+					 char *name, size_t max_namelen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	const unsigned int ivsize = crypto_aead_ivsize(tfm);</div><div class='add'>+	unsigned int maxauthsize = crypto_aead_alg(tfm)-&gt;maxauthsize;</div><div class='add'>+	unsigned int authsize;</div><div class='add'>+	unsigned int total_len;</div><div class='add'>+	int i;</div><div class='add'>+	struct scatterlist src[2], dst;</div><div class='add'>+	u8 iv[MAX_IVLEN];</div><div class='add'>+	DECLARE_CRYPTO_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	/* Key: length in [0, maxkeysize], but usually choose maxkeysize */</div><div class='add'>+	vec-&gt;klen = maxkeysize;</div><div class='add'>+	if (prandom_u32() % 4 == 0)</div><div class='add'>+		vec-&gt;klen = prandom_u32() % (maxkeysize + 1);</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;key, vec-&gt;klen);</div><div class='add'>+	vec-&gt;setkey_error = crypto_aead_setkey(tfm, vec-&gt;key, vec-&gt;klen);</div><div class='add'>+</div><div class='add'>+	/* IV */</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;iv, ivsize);</div><div class='add'>+</div><div class='add'>+	/* Tag length: in [0, maxauthsize], but usually choose maxauthsize */</div><div class='add'>+	authsize = maxauthsize;</div><div class='add'>+	if (prandom_u32() % 4 == 0)</div><div class='add'>+		authsize = prandom_u32() % (maxauthsize + 1);</div><div class='add'>+	if (WARN_ON(authsize &gt; maxdatasize))</div><div class='add'>+		authsize = maxdatasize;</div><div class='add'>+	maxdatasize -= authsize;</div><div class='add'>+	vec-&gt;setauthsize_error = crypto_aead_setauthsize(tfm, authsize);</div><div class='add'>+</div><div class='add'>+	/* Plaintext and associated data */</div><div class='add'>+	total_len = generate_random_length(maxdatasize);</div><div class='add'>+	if (prandom_u32() % 4 == 0)</div><div class='add'>+		vec-&gt;alen = 0;</div><div class='add'>+	else</div><div class='add'>+		vec-&gt;alen = generate_random_length(total_len);</div><div class='add'>+	vec-&gt;plen = total_len - vec-&gt;alen;</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;assoc, vec-&gt;alen);</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;ptext, vec-&gt;plen);</div><div class='add'>+</div><div class='add'>+	vec-&gt;clen = vec-&gt;plen + authsize;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the key or authentication tag size couldn't be set, no need to</div><div class='add'>+	 * continue to encrypt.</div><div class='add'>+	 */</div><div class='add'>+	if (vec-&gt;setkey_error || vec-&gt;setauthsize_error)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Ciphertext */</div><div class='add'>+	sg_init_table(src, 2);</div><div class='add'>+	i = 0;</div><div class='add'>+	if (vec-&gt;alen)</div><div class='add'>+		sg_set_buf(&amp;src[i++], vec-&gt;assoc, vec-&gt;alen);</div><div class='add'>+	if (vec-&gt;plen)</div><div class='add'>+		sg_set_buf(&amp;src[i++], vec-&gt;ptext, vec-&gt;plen);</div><div class='add'>+	sg_init_one(&amp;dst, vec-&gt;ctext, vec-&gt;alen + vec-&gt;clen);</div><div class='add'>+	memcpy(iv, vec-&gt;iv, ivsize);</div><div class='add'>+	aead_request_set_callback(req, 0, crypto_req_done, &amp;wait);</div><div class='add'>+	aead_request_set_crypt(req, src, &amp;dst, vec-&gt;plen, iv);</div><div class='add'>+	aead_request_set_ad(req, vec-&gt;alen);</div><div class='add'>+	vec-&gt;crypt_error = crypto_wait_req(crypto_aead_encrypt(req), &amp;wait);</div><div class='add'>+	if (vec-&gt;crypt_error == 0)</div><div class='add'>+		memmove((u8 *)vec-&gt;ctext, vec-&gt;ctext + vec-&gt;alen, vec-&gt;clen);</div><div class='add'>+done:</div><div class='add'>+	snprintf(name, max_namelen,</div><div class='add'>+		 "\"random: alen=%u plen=%u authsize=%u klen=%u\"",</div><div class='add'>+		 vec-&gt;alen, vec-&gt;plen, authsize, vec-&gt;klen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test the AEAD algorithm represented by @req against the corresponding generic</div><div class='add'>+ * implementation, if one is available.</div><div class='add'>+ */</div><div class='add'>+static int test_aead_vs_generic_impl(const char *driver,</div><div class='add'>+				     const struct alg_test_desc *test_desc,</div><div class='add'>+				     struct aead_request *req,</div><div class='add'>+				     struct cipher_test_sglists *tsgls)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	const unsigned int ivsize = crypto_aead_ivsize(tfm);</div><div class='add'>+	const unsigned int maxauthsize = crypto_aead_alg(tfm)-&gt;maxauthsize;</div><div class='add'>+	const unsigned int blocksize = crypto_aead_blocksize(tfm);</div><div class='add'>+	const unsigned int maxdatasize = (2 * PAGE_SIZE) - TESTMGR_POISON_LEN;</div><div class='add'>+	const char *algname = crypto_aead_alg(tfm)-&gt;base.cra_name;</div><div class='add'>+	const char *generic_driver = test_desc-&gt;generic_driver;</div><div class='add'>+	char _generic_driver[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	struct crypto_aead *generic_tfm = NULL;</div><div class='add'>+	struct aead_request *generic_req = NULL;</div><div class='add'>+	unsigned int maxkeysize;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	struct aead_testvec vec = { 0 };</div><div class='add'>+	char vec_name[64];</div><div class='add'>+	struct testvec_config cfg;</div><div class='add'>+	char cfgname[TESTVEC_CONFIG_NAMELEN];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (noextratests)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!generic_driver) { /* Use default naming convention? */</div><div class='add'>+		err = build_generic_driver_name(algname, _generic_driver);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		generic_driver = _generic_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strcmp(generic_driver, driver) == 0) /* Already the generic impl? */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	generic_tfm = crypto_alloc_aead(generic_driver, 0, 0);</div><div class='add'>+	if (IS_ERR(generic_tfm)) {</div><div class='add'>+		err = PTR_ERR(generic_tfm);</div><div class='add'>+		if (err == -ENOENT) {</div><div class='add'>+			pr_warn("alg: aead: skipping comparison tests for %s because %s is unavailable\n",</div><div class='add'>+				driver, generic_driver);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		pr_err("alg: aead: error allocating %s (generic impl of %s): %d\n",</div><div class='add'>+		       generic_driver, algname, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	generic_req = aead_request_alloc(generic_tfm, GFP_KERNEL);</div><div class='add'>+	if (!generic_req) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the algorithm properties for consistency. */</div><div class='add'>+</div><div class='add'>+	if (maxauthsize != crypto_aead_alg(generic_tfm)-&gt;maxauthsize) {</div><div class='add'>+		pr_err("alg: aead: maxauthsize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, maxauthsize,</div><div class='add'>+		       crypto_aead_alg(generic_tfm)-&gt;maxauthsize);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ivsize != crypto_aead_ivsize(generic_tfm)) {</div><div class='add'>+		pr_err("alg: aead: ivsize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, ivsize, crypto_aead_ivsize(generic_tfm));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (blocksize != crypto_aead_blocksize(generic_tfm)) {</div><div class='add'>+		pr_err("alg: aead: blocksize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, blocksize, crypto_aead_blocksize(generic_tfm));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now generate test vectors using the generic implementation, and test</div><div class='add'>+	 * the other implementation against them.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	maxkeysize = 0;</div><div class='add'>+	for (i = 0; i &lt; test_desc-&gt;suite.aead.count; i++)</div><div class='add'>+		maxkeysize = max_t(unsigned int, maxkeysize,</div><div class='add'>+				   test_desc-&gt;suite.aead.vecs[i].klen);</div><div class='add'>+</div><div class='add'>+	vec.key = kmalloc(maxkeysize, GFP_KERNEL);</div><div class='add'>+	vec.iv = kmalloc(ivsize, GFP_KERNEL);</div><div class='add'>+	vec.assoc = kmalloc(maxdatasize, GFP_KERNEL);</div><div class='add'>+	vec.ptext = kmalloc(maxdatasize, GFP_KERNEL);</div><div class='add'>+	vec.ctext = kmalloc(maxdatasize, GFP_KERNEL);</div><div class='add'>+	if (!vec.key || !vec.iv || !vec.assoc || !vec.ptext || !vec.ctext) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fuzz_iterations * 8; i++) {</div><div class='add'>+		generate_random_aead_testvec(generic_req, &amp;vec,</div><div class='add'>+					     maxkeysize, maxdatasize,</div><div class='add'>+					     vec_name, sizeof(vec_name));</div><div class='add'>+		generate_random_testvec_config(&amp;cfg, cfgname, sizeof(cfgname));</div><div class='add'>+</div><div class='add'>+		err = test_aead_vec_cfg(driver, ENCRYPT, &amp;vec, vec_name, &amp;cfg,</div><div class='add'>+					req, tsgls);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		err = test_aead_vec_cfg(driver, DECRYPT, &amp;vec, vec_name, &amp;cfg,</div><div class='add'>+					req, tsgls);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(vec.key);</div><div class='add'>+	kfree(vec.iv);</div><div class='add'>+	kfree(vec.assoc);</div><div class='add'>+	kfree(vec.ptext);</div><div class='add'>+	kfree(vec.ctext);</div><div class='add'>+	crypto_free_aead(generic_tfm);</div><div class='add'>+	aead_request_free(generic_req);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+static int test_aead_vs_generic_impl(const char *driver,</div><div class='add'>+				     const struct alg_test_desc *test_desc,</div><div class='add'>+				     struct aead_request *req,</div><div class='add'>+				     struct cipher_test_sglists *tsgls)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+</div><div class='ctx'> static int test_aead(const char *driver, int enc,</div><div class='ctx'> 		     const struct aead_test_suite *suite,</div><div class='ctx'> 		     struct aead_request *req,</div><div class='hunk'>@@ -1411,6 +2045,10 @@ static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = test_aead(driver, DECRYPT, suite, req, tsgls);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = test_aead_vs_generic_impl(driver, desc, req, tsgls);</div><div class='ctx'> out:</div><div class='ctx'> 	free_cipher_test_sglists(tsgls);</div><div class='ctx'> 	aead_request_free(req);</div><div class='hunk'>@@ -1462,13 +2100,20 @@ static int test_cipher(struct crypto_cipher *tfm, int enc,</div><div class='ctx'> </div><div class='ctx'> 		ret = crypto_cipher_setkey(tfm, template[i].key,</div><div class='ctx'> 					   template[i].klen);</div><div class='del'>-		if (template[i].fail == !ret) {</div><div class='del'>-			printk(KERN_ERR "alg: cipher: setkey failed "</div><div class='del'>-			       "on test %d for %s: flags=%x\n", j,</div><div class='del'>-			       algo, crypto_cipher_get_flags(tfm));</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret == template[i].setkey_error)</div><div class='add'>+				continue;</div><div class='add'>+			pr_err("alg: cipher: %s setkey failed on test vector %u; expected_error=%d, actual_error=%d, flags=%#x\n",</div><div class='add'>+			       algo, j, template[i].setkey_error, ret,</div><div class='add'>+			       crypto_cipher_get_flags(tfm));</div><div class='ctx'> 			goto out;</div><div class='del'>-		} else if (ret)</div><div class='del'>-			continue;</div><div class='add'>+		}</div><div class='add'>+		if (template[i].setkey_error) {</div><div class='add'>+			pr_err("alg: cipher: %s setkey unexpectedly succeeded on test vector %u; expected_error=%d\n",</div><div class='add'>+			       algo, j, template[i].setkey_error);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		for (k = 0; k &lt; template[i].len;</div><div class='ctx'> 		     k += crypto_cipher_blocksize(tfm)) {</div><div class='hunk'>@@ -1500,7 +2145,7 @@ out_nobuf:</div><div class='ctx'> </div><div class='ctx'> static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 				 const struct cipher_testvec *vec,</div><div class='del'>-				 unsigned int vec_num,</div><div class='add'>+				 const char *vec_name,</div><div class='ctx'> 				 const struct testvec_config *cfg,</div><div class='ctx'> 				 struct skcipher_request *req,</div><div class='ctx'> 				 struct cipher_test_sglists *tsgls)</div><div class='hunk'>@@ -1526,15 +2171,16 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 					    CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);</div><div class='ctx'> 	err = crypto_skcipher_setkey(tfm, vec-&gt;key, vec-&gt;klen);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (vec-&gt;fail) /* expectedly failed to set key? */</div><div class='add'>+		if (err == vec-&gt;setkey_error)</div><div class='ctx'> 			return 0;</div><div class='del'>-		pr_err("alg: skcipher: %s setkey failed with err %d on test vector %u; flags=%#x\n",</div><div class='del'>-		       driver, err, vec_num, crypto_skcipher_get_flags(tfm));</div><div class='add'>+		pr_err("alg: skcipher: %s setkey failed on test vector %s; expected_error=%d, actual_error=%d, flags=%#x\n",</div><div class='add'>+		       driver, vec_name, vec-&gt;setkey_error, err,</div><div class='add'>+		       crypto_skcipher_get_flags(tfm));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (vec-&gt;fail) {</div><div class='del'>-		pr_err("alg: skcipher: %s setkey unexpectedly succeeded on test vector %u\n",</div><div class='del'>-		       driver, vec_num);</div><div class='add'>+	if (vec-&gt;setkey_error) {</div><div class='add'>+		pr_err("alg: skcipher: %s setkey unexpectedly succeeded on test vector %s; expected_error=%d\n",</div><div class='add'>+		       driver, vec_name, vec-&gt;setkey_error);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1550,8 +2196,8 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 			memset(iv, 0, ivsize);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (vec-&gt;generates_iv) {</div><div class='del'>-			pr_err("alg: skcipher: %s has ivsize=0 but test vector %u generates IV!\n",</div><div class='del'>-			       driver, vec_num);</div><div class='add'>+			pr_err("alg: skcipher: %s has ivsize=0 but test vector %s generates IV!\n",</div><div class='add'>+			       driver, vec_name);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		iv = NULL;</div><div class='hunk'>@@ -1563,8 +2209,8 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	err = build_cipher_test_sglists(tsgls, cfg, alignmask,</div><div class='ctx'> 					vec-&gt;len, vec-&gt;len, &amp;input, 1);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s: error preparing scatterlists for test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s: error preparing scatterlists for test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1573,13 +2219,12 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	skcipher_request_set_callback(req, req_flags, crypto_req_done, &amp;wait);</div><div class='ctx'> 	skcipher_request_set_crypt(req, tsgls-&gt;src.sgl_ptr, tsgls-&gt;dst.sgl_ptr,</div><div class='ctx'> 				   vec-&gt;len, iv);</div><div class='del'>-	err = crypto_wait_req(enc ? crypto_skcipher_encrypt(req) :</div><div class='del'>-			      crypto_skcipher_decrypt(req), &amp;wait);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s failed with err %d on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, err, vec_num, cfg-&gt;name);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (cfg-&gt;nosimd)</div><div class='add'>+		crypto_disable_simd_for_test();</div><div class='add'>+	err = enc ? crypto_skcipher_encrypt(req) : crypto_skcipher_decrypt(req);</div><div class='add'>+	if (cfg-&gt;nosimd)</div><div class='add'>+		crypto_reenable_simd_for_test();</div><div class='add'>+	err = crypto_wait_req(err, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 	/* Check that the algorithm didn't overwrite things it shouldn't have */</div><div class='ctx'> 	if (req-&gt;cryptlen != vec-&gt;len ||</div><div class='hunk'>@@ -1590,8 +2235,8 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	    req-&gt;base.complete != crypto_req_done ||</div><div class='ctx'> 	    req-&gt;base.flags != req_flags ||</div><div class='ctx'> 	    req-&gt;base.data != &amp;wait) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s corrupted request struct on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s corrupted request struct on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		if (req-&gt;cryptlen != vec-&gt;len)</div><div class='ctx'> 			pr_err("alg: skcipher: changed 'req-&gt;cryptlen'\n");</div><div class='ctx'> 		if (req-&gt;iv != iv)</div><div class='hunk'>@@ -1611,14 +2256,28 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (is_test_sglist_corrupted(&amp;tsgls-&gt;src)) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s corrupted src sgl on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s corrupted src sgl on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tsgls-&gt;dst.sgl_ptr != tsgls-&gt;src.sgl &amp;&amp;</div><div class='ctx'> 	    is_test_sglist_corrupted(&amp;tsgls-&gt;dst)) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s corrupted dst sgl on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s corrupted dst sgl on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for success or failure */</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == vec-&gt;crypt_error)</div><div class='add'>+			return 0;</div><div class='add'>+		pr_err("alg: skcipher: %s %s failed on test vector %s; expected_error=%d, actual_error=%d, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, vec-&gt;crypt_error, err, cfg-&gt;name);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (vec-&gt;crypt_error) {</div><div class='add'>+		pr_err("alg: skcipher: %s %s unexpectedly succeeded on test vector %s; expected_error=%d, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, vec-&gt;crypt_error, cfg-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1626,20 +2285,20 @@ static int test_skcipher_vec_cfg(const char *driver, int enc,</div><div class='ctx'> 	err = verify_correct_output(&amp;tsgls-&gt;dst, enc ? vec-&gt;ctext : vec-&gt;ptext,</div><div class='ctx'> 				    vec-&gt;len, 0, true);</div><div class='ctx'> 	if (err == -EOVERFLOW) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s overran dst buffer on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s overran dst buffer on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s test failed (wrong result) on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s test failed (wrong result) on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If applicable, check that the algorithm generated the correct IV */</div><div class='ctx'> 	if (vec-&gt;iv_out &amp;&amp; memcmp(iv, vec-&gt;iv_out, ivsize) != 0) {</div><div class='del'>-		pr_err("alg: skcipher: %s %s test failed (wrong output IV) on test vector %u, cfg=\"%s\"\n",</div><div class='del'>-		       driver, op, vec_num, cfg-&gt;name);</div><div class='add'>+		pr_err("alg: skcipher: %s %s test failed (wrong output IV) on test vector %s, cfg=\"%s\"\n",</div><div class='add'>+		       driver, op, vec_name, cfg-&gt;name);</div><div class='ctx'> 		hexdump(iv, ivsize);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1653,14 +2312,17 @@ static int test_skcipher_vec(const char *driver, int enc,</div><div class='ctx'> 			     struct skcipher_request *req,</div><div class='ctx'> 			     struct cipher_test_sglists *tsgls)</div><div class='ctx'> {</div><div class='add'>+	char vec_name[16];</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (fips_enabled &amp;&amp; vec-&gt;fips_skip)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	sprintf(vec_name, "%u", vec_num);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(default_cipher_testvec_configs); i++) {</div><div class='del'>-		err = test_skcipher_vec_cfg(driver, enc, vec, vec_num,</div><div class='add'>+		err = test_skcipher_vec_cfg(driver, enc, vec, vec_name,</div><div class='ctx'> 					    &amp;default_cipher_testvec_configs[i],</div><div class='ctx'> 					    req, tsgls);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1675,7 +2337,7 @@ static int test_skcipher_vec(const char *driver, int enc,</div><div class='ctx'> 		for (i = 0; i &lt; fuzz_iterations; i++) {</div><div class='ctx'> 			generate_random_testvec_config(&amp;cfg, cfgname,</div><div class='ctx'> 						       sizeof(cfgname));</div><div class='del'>-			err = test_skcipher_vec_cfg(driver, enc, vec, vec_num,</div><div class='add'>+			err = test_skcipher_vec_cfg(driver, enc, vec, vec_name,</div><div class='ctx'> 						    &amp;cfg, req, tsgls);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -1685,6 +2347,186 @@ static int test_skcipher_vec(const char *driver, int enc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS</div><div class='add'>+/*</div><div class='add'>+ * Generate a symmetric cipher test vector from the given implementation.</div><div class='add'>+ * Assumes the buffers in 'vec' were already allocated.</div><div class='add'>+ */</div><div class='add'>+static void generate_random_cipher_testvec(struct skcipher_request *req,</div><div class='add'>+					   struct cipher_testvec *vec,</div><div class='add'>+					   unsigned int maxdatasize,</div><div class='add'>+					   char *name, size_t max_namelen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	const unsigned int maxkeysize = tfm-&gt;keysize;</div><div class='add'>+	const unsigned int ivsize = crypto_skcipher_ivsize(tfm);</div><div class='add'>+	struct scatterlist src, dst;</div><div class='add'>+	u8 iv[MAX_IVLEN];</div><div class='add'>+	DECLARE_CRYPTO_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	/* Key: length in [0, maxkeysize], but usually choose maxkeysize */</div><div class='add'>+	vec-&gt;klen = maxkeysize;</div><div class='add'>+	if (prandom_u32() % 4 == 0)</div><div class='add'>+		vec-&gt;klen = prandom_u32() % (maxkeysize + 1);</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;key, vec-&gt;klen);</div><div class='add'>+	vec-&gt;setkey_error = crypto_skcipher_setkey(tfm, vec-&gt;key, vec-&gt;klen);</div><div class='add'>+</div><div class='add'>+	/* IV */</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;iv, ivsize);</div><div class='add'>+</div><div class='add'>+	/* Plaintext */</div><div class='add'>+	vec-&gt;len = generate_random_length(maxdatasize);</div><div class='add'>+	generate_random_bytes((u8 *)vec-&gt;ptext, vec-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* If the key couldn't be set, no need to continue to encrypt. */</div><div class='add'>+	if (vec-&gt;setkey_error)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Ciphertext */</div><div class='add'>+	sg_init_one(&amp;src, vec-&gt;ptext, vec-&gt;len);</div><div class='add'>+	sg_init_one(&amp;dst, vec-&gt;ctext, vec-&gt;len);</div><div class='add'>+	memcpy(iv, vec-&gt;iv, ivsize);</div><div class='add'>+	skcipher_request_set_callback(req, 0, crypto_req_done, &amp;wait);</div><div class='add'>+	skcipher_request_set_crypt(req, &amp;src, &amp;dst, vec-&gt;len, iv);</div><div class='add'>+	vec-&gt;crypt_error = crypto_wait_req(crypto_skcipher_encrypt(req), &amp;wait);</div><div class='add'>+done:</div><div class='add'>+	snprintf(name, max_namelen, "\"random: len=%u klen=%u\"",</div><div class='add'>+		 vec-&gt;len, vec-&gt;klen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test the skcipher algorithm represented by @req against the corresponding</div><div class='add'>+ * generic implementation, if one is available.</div><div class='add'>+ */</div><div class='add'>+static int test_skcipher_vs_generic_impl(const char *driver,</div><div class='add'>+					 const char *generic_driver,</div><div class='add'>+					 struct skcipher_request *req,</div><div class='add'>+					 struct cipher_test_sglists *tsgls)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	const unsigned int ivsize = crypto_skcipher_ivsize(tfm);</div><div class='add'>+	const unsigned int blocksize = crypto_skcipher_blocksize(tfm);</div><div class='add'>+	const unsigned int maxdatasize = (2 * PAGE_SIZE) - TESTMGR_POISON_LEN;</div><div class='add'>+	const char *algname = crypto_skcipher_alg(tfm)-&gt;base.cra_name;</div><div class='add'>+	char _generic_driver[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	struct crypto_skcipher *generic_tfm = NULL;</div><div class='add'>+	struct skcipher_request *generic_req = NULL;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	struct cipher_testvec vec = { 0 };</div><div class='add'>+	char vec_name[64];</div><div class='add'>+	struct testvec_config cfg;</div><div class='add'>+	char cfgname[TESTVEC_CONFIG_NAMELEN];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (noextratests)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Keywrap isn't supported here yet as it handles its IV differently. */</div><div class='add'>+	if (strncmp(algname, "kw(", 3) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!generic_driver) { /* Use default naming convention? */</div><div class='add'>+		err = build_generic_driver_name(algname, _generic_driver);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		generic_driver = _generic_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strcmp(generic_driver, driver) == 0) /* Already the generic impl? */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	generic_tfm = crypto_alloc_skcipher(generic_driver, 0, 0);</div><div class='add'>+	if (IS_ERR(generic_tfm)) {</div><div class='add'>+		err = PTR_ERR(generic_tfm);</div><div class='add'>+		if (err == -ENOENT) {</div><div class='add'>+			pr_warn("alg: skcipher: skipping comparison tests for %s because %s is unavailable\n",</div><div class='add'>+				driver, generic_driver);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		pr_err("alg: skcipher: error allocating %s (generic impl of %s): %d\n",</div><div class='add'>+		       generic_driver, algname, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	generic_req = skcipher_request_alloc(generic_tfm, GFP_KERNEL);</div><div class='add'>+	if (!generic_req) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the algorithm properties for consistency. */</div><div class='add'>+</div><div class='add'>+	if (tfm-&gt;keysize != generic_tfm-&gt;keysize) {</div><div class='add'>+		pr_err("alg: skcipher: max keysize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, tfm-&gt;keysize, generic_tfm-&gt;keysize);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ivsize != crypto_skcipher_ivsize(generic_tfm)) {</div><div class='add'>+		pr_err("alg: skcipher: ivsize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, ivsize, crypto_skcipher_ivsize(generic_tfm));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (blocksize != crypto_skcipher_blocksize(generic_tfm)) {</div><div class='add'>+		pr_err("alg: skcipher: blocksize for %s (%u) doesn't match generic impl (%u)\n",</div><div class='add'>+		       driver, blocksize,</div><div class='add'>+		       crypto_skcipher_blocksize(generic_tfm));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now generate test vectors using the generic implementation, and test</div><div class='add'>+	 * the other implementation against them.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	vec.key = kmalloc(tfm-&gt;keysize, GFP_KERNEL);</div><div class='add'>+	vec.iv = kmalloc(ivsize, GFP_KERNEL);</div><div class='add'>+	vec.ptext = kmalloc(maxdatasize, GFP_KERNEL);</div><div class='add'>+	vec.ctext = kmalloc(maxdatasize, GFP_KERNEL);</div><div class='add'>+	if (!vec.key || !vec.iv || !vec.ptext || !vec.ctext) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fuzz_iterations * 8; i++) {</div><div class='add'>+		generate_random_cipher_testvec(generic_req, &amp;vec, maxdatasize,</div><div class='add'>+					       vec_name, sizeof(vec_name));</div><div class='add'>+		generate_random_testvec_config(&amp;cfg, cfgname, sizeof(cfgname));</div><div class='add'>+</div><div class='add'>+		err = test_skcipher_vec_cfg(driver, ENCRYPT, &amp;vec, vec_name,</div><div class='add'>+					    &amp;cfg, req, tsgls);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		err = test_skcipher_vec_cfg(driver, DECRYPT, &amp;vec, vec_name,</div><div class='add'>+					    &amp;cfg, req, tsgls);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(vec.key);</div><div class='add'>+	kfree(vec.iv);</div><div class='add'>+	kfree(vec.ptext);</div><div class='add'>+	kfree(vec.ctext);</div><div class='add'>+	crypto_free_skcipher(generic_tfm);</div><div class='add'>+	skcipher_request_free(generic_req);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+static int test_skcipher_vs_generic_impl(const char *driver,</div><div class='add'>+					 const char *generic_driver,</div><div class='add'>+					 struct skcipher_request *req,</div><div class='add'>+					 struct cipher_test_sglists *tsgls)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */</div><div class='add'>+</div><div class='ctx'> static int test_skcipher(const char *driver, int enc,</div><div class='ctx'> 			 const struct cipher_test_suite *suite,</div><div class='ctx'> 			 struct skcipher_request *req,</div><div class='hunk'>@@ -1744,6 +2586,11 @@ static int alg_test_skcipher(const struct alg_test_desc *desc,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = test_skcipher(driver, DECRYPT, suite, req, tsgls);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = test_skcipher_vs_generic_impl(driver, desc-&gt;generic_driver, req,</div><div class='add'>+					    tsgls);</div><div class='ctx'> out:</div><div class='ctx'> 	free_cipher_test_sglists(tsgls);</div><div class='ctx'> 	skcipher_request_free(req);</div><div class='hunk'>@@ -2179,7 +3026,6 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,</div><div class='ctx'> 		u32 *ctx = (u32 *)shash_desc_ctx(shash);</div><div class='ctx'> </div><div class='ctx'> 		shash-&gt;tfm = tfm;</div><div class='del'>-		shash-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 		*ctx = 420553207;</div><div class='ctx'> 		err = crypto_shash_final(shash, (u8 *)&amp;val);</div><div class='hunk'>@@ -2493,6 +3339,12 @@ static int alg_test_kpp(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 *test_pack_u32(u8 *dst, u32 val)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst, &amp;val, sizeof(val));</div><div class='add'>+	return dst + sizeof(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int test_akcipher_one(struct crypto_akcipher *tfm,</div><div class='ctx'> 			     const struct akcipher_testvec *vecs)</div><div class='ctx'> {</div><div class='hunk'>@@ -2503,10 +3355,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,</div><div class='ctx'> 	struct crypto_wait wait;</div><div class='ctx'> 	unsigned int out_len_max, out_len = 0;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='del'>-	struct scatterlist src, dst, src_tab[2];</div><div class='add'>+	struct scatterlist src, dst, src_tab[3];</div><div class='ctx'> 	const char *m, *c;</div><div class='ctx'> 	unsigned int m_size, c_size;</div><div class='ctx'> 	const char *op;</div><div class='add'>+	u8 *key, *ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (testmgr_alloc_buf(xbuf))</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2517,22 +3370,29 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,</div><div class='ctx'> </div><div class='ctx'> 	crypto_init_wait(&amp;wait);</div><div class='ctx'> </div><div class='add'>+	key = kmalloc(vecs-&gt;key_len + sizeof(u32) * 2 + vecs-&gt;param_len,</div><div class='add'>+		      GFP_KERNEL);</div><div class='add'>+	if (!key)</div><div class='add'>+		goto free_xbuf;</div><div class='add'>+	memcpy(key, vecs-&gt;key, vecs-&gt;key_len);</div><div class='add'>+	ptr = key + vecs-&gt;key_len;</div><div class='add'>+	ptr = test_pack_u32(ptr, vecs-&gt;algo);</div><div class='add'>+	ptr = test_pack_u32(ptr, vecs-&gt;param_len);</div><div class='add'>+	memcpy(ptr, vecs-&gt;params, vecs-&gt;param_len);</div><div class='add'>+</div><div class='ctx'> 	if (vecs-&gt;public_key_vec)</div><div class='del'>-		err = crypto_akcipher_set_pub_key(tfm, vecs-&gt;key,</div><div class='del'>-						  vecs-&gt;key_len);</div><div class='add'>+		err = crypto_akcipher_set_pub_key(tfm, key, vecs-&gt;key_len);</div><div class='ctx'> 	else</div><div class='del'>-		err = crypto_akcipher_set_priv_key(tfm, vecs-&gt;key,</div><div class='del'>-						   vecs-&gt;key_len);</div><div class='add'>+		err = crypto_akcipher_set_priv_key(tfm, key, vecs-&gt;key_len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_req;</div><div class='ctx'> </div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	out_len_max = crypto_akcipher_maxsize(tfm);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First run test which do not require a private key, such as</div><div class='ctx'> 	 * encrypt or verify.</div><div class='ctx'> 	 */</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	out_len_max = crypto_akcipher_maxsize(tfm);</div><div class='ctx'> 	outbuf_enc = kzalloc(out_len_max, GFP_KERNEL);</div><div class='ctx'> 	if (!outbuf_enc)</div><div class='ctx'> 		goto free_req;</div><div class='hunk'>@@ -2558,12 +3418,20 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,</div><div class='ctx'> 		goto free_all;</div><div class='ctx'> 	memcpy(xbuf[0], m, m_size);</div><div class='ctx'> </div><div class='del'>-	sg_init_table(src_tab, 2);</div><div class='add'>+	sg_init_table(src_tab, 3);</div><div class='ctx'> 	sg_set_buf(&amp;src_tab[0], xbuf[0], 8);</div><div class='ctx'> 	sg_set_buf(&amp;src_tab[1], xbuf[0] + 8, m_size - 8);</div><div class='del'>-	sg_init_one(&amp;dst, outbuf_enc, out_len_max);</div><div class='del'>-	akcipher_request_set_crypt(req, src_tab, &amp;dst, m_size,</div><div class='del'>-				   out_len_max);</div><div class='add'>+	if (vecs-&gt;siggen_sigver_test) {</div><div class='add'>+		if (WARN_ON(c_size &gt; PAGE_SIZE))</div><div class='add'>+			goto free_all;</div><div class='add'>+		memcpy(xbuf[1], c, c_size);</div><div class='add'>+		sg_set_buf(&amp;src_tab[2], xbuf[1], c_size);</div><div class='add'>+		akcipher_request_set_crypt(req, src_tab, NULL, m_size, c_size);</div><div class='add'>+	} else {</div><div class='add'>+		sg_init_one(&amp;dst, outbuf_enc, out_len_max);</div><div class='add'>+		akcipher_request_set_crypt(req, src_tab, &amp;dst, m_size,</div><div class='add'>+					   out_len_max);</div><div class='add'>+	}</div><div class='ctx'> 	akcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='ctx'> 				      crypto_req_done, &amp;wait);</div><div class='ctx'> </div><div class='hunk'>@@ -2576,18 +3444,21 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,</div><div class='ctx'> 		pr_err("alg: akcipher: %s test failed. err %d\n", op, err);</div><div class='ctx'> 		goto free_all;</div><div class='ctx'> 	}</div><div class='del'>-	if (req-&gt;dst_len != c_size) {</div><div class='del'>-		pr_err("alg: akcipher: %s test failed. Invalid output len\n",</div><div class='del'>-		       op);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto free_all;</div><div class='del'>-	}</div><div class='del'>-	/* verify that encrypted message is equal to expected */</div><div class='del'>-	if (memcmp(c, outbuf_enc, c_size)) {</div><div class='del'>-		pr_err("alg: akcipher: %s test failed. Invalid output\n", op);</div><div class='del'>-		hexdump(outbuf_enc, c_size);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto free_all;</div><div class='add'>+	if (!vecs-&gt;siggen_sigver_test) {</div><div class='add'>+		if (req-&gt;dst_len != c_size) {</div><div class='add'>+			pr_err("alg: akcipher: %s test failed. Invalid output len\n",</div><div class='add'>+			       op);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto free_all;</div><div class='add'>+		}</div><div class='add'>+		/* verify that encrypted message is equal to expected */</div><div class='add'>+		if (memcmp(c, outbuf_enc, c_size) != 0) {</div><div class='add'>+			pr_err("alg: akcipher: %s test failed. Invalid output\n",</div><div class='add'>+			       op);</div><div class='add'>+			hexdump(outbuf_enc, c_size);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto free_all;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2642,6 +3513,7 @@ free_all:</div><div class='ctx'> 	kfree(outbuf_enc);</div><div class='ctx'> free_req:</div><div class='ctx'> 	akcipher_request_free(req);</div><div class='add'>+	kfree(key);</div><div class='ctx'> free_xbuf:</div><div class='ctx'> 	testmgr_free_buf(xbuf);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2699,12 +3571,14 @@ static int alg_test_null(const struct alg_test_desc *desc,</div><div class='ctx'> static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.alg = "adiantum(xchacha12,aes)",</div><div class='add'>+		.generic_driver = "adiantum(xchacha12-generic,aes-generic,nhpoly1305-generic)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(adiantum_xchacha12_aes_tv_template)</div><div class='ctx'> 		},</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "adiantum(xchacha20,aes)",</div><div class='add'>+		.generic_driver = "adiantum(xchacha20-generic,aes-generic,nhpoly1305-generic)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(adiantum_xchacha20_aes_tv_template)</div><div class='hunk'>@@ -2921,6 +3795,12 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 	}, {</div><div class='add'>+		/* Same as cbc(sm4) except the key is stored in</div><div class='add'>+		 * hardware secure memory which we reference by index</div><div class='add'>+		 */</div><div class='add'>+		.alg = "cbc(psm4)",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "cbc(serpent)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -2947,6 +3827,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "ccm(aes)",</div><div class='add'>+		.generic_driver = "ccm_base(ctr(aes-generic),cbcmac(aes-generic))",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -3055,6 +3936,13 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 	}, {</div><div class='add'>+</div><div class='add'>+		/* Same as ctr(sm4) except the key is stored in</div><div class='add'>+		 * hardware secure memory which we reference by index</div><div class='add'>+		 */</div><div class='add'>+		.alg = "ctr(psm4)",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "ctr(serpent)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -3080,6 +3968,13 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			.cipher = __VECS(cts_mode_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		/* Same as cts(cbc((aes)) except the key is stored in</div><div class='add'>+		 * hardware secure memory which we reference by index</div><div class='add'>+		 */</div><div class='add'>+		.alg = "cts(cbc(paes))",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+		.fips_allowed = 1,</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "deflate",</div><div class='ctx'> 		.test = alg_test_comp,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='hunk'>@@ -3358,7 +4253,14 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			.kpp = __VECS(ecdh_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "ecrdsa",</div><div class='add'>+		.test = alg_test_akcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.akcipher = __VECS(ecrdsa_tv_template)</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "gcm(aes)",</div><div class='add'>+		.generic_driver = "gcm_base(ctr(aes-generic),ghash-generic)",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -3477,30 +4379,35 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "lrw(aes)",</div><div class='add'>+		.generic_driver = "lrw(ecb(aes-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(aes_lrw_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "lrw(camellia)",</div><div class='add'>+		.generic_driver = "lrw(ecb(camellia-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(camellia_lrw_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "lrw(cast6)",</div><div class='add'>+		.generic_driver = "lrw(ecb(cast6-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(cast6_lrw_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "lrw(serpent)",</div><div class='add'>+		.generic_driver = "lrw(ecb(serpent-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(serpent_lrw_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "lrw(twofish)",</div><div class='add'>+		.generic_driver = "lrw(ecb(twofish-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(tf_lrw_tv_template)</div><div class='hunk'>@@ -3625,6 +4532,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rfc4106(gcm(aes))",</div><div class='add'>+		.generic_driver = "rfc4106(gcm_base(ctr(aes-generic),ghash-generic))",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -3632,6 +4540,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rfc4309(ccm(aes))",</div><div class='add'>+		.generic_driver = "rfc4309(ccm_base(ctr(aes-generic),cbcmac(aes-generic)))",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -3639,6 +4548,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rfc4543(gcm(aes))",</div><div class='add'>+		.generic_driver = "rfc4543(gcm_base(ctr(aes-generic),ghash-generic))",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = __VECS(aes_gcm_rfc4543_tv_template)</div><div class='hunk'>@@ -3835,6 +4745,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xts(aes)",</div><div class='add'>+		.generic_driver = "xts(ecb(aes-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -3842,12 +4753,14 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xts(camellia)",</div><div class='add'>+		.generic_driver = "xts(ecb(camellia-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(camellia_xts_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xts(cast6)",</div><div class='add'>+		.generic_driver = "xts(ecb(cast6-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(cast6_xts_tv_template)</div><div class='hunk'>@@ -3861,12 +4774,14 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xts(serpent)",</div><div class='add'>+		.generic_driver = "xts(ecb(serpent-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(serpent_xts_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xts(twofish)",</div><div class='add'>+		.generic_driver = "xts(ecb(twofish-generic))",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = __VECS(tf_xts_tv_template)</div><div class='hunk'>@@ -4020,8 +4935,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)</div><div class='ctx'> 					     type, mask);</div><div class='ctx'> </div><div class='ctx'> test_done:</div><div class='del'>-	if (fips_enabled &amp;&amp; rc)</div><div class='del'>-		panic("%s: %s alg self test failed in fips mode!\n", driver, alg);</div><div class='add'>+	if (rc &amp;&amp; (fips_enabled || panic_on_fail))</div><div class='add'>+		panic("alg: self-tests for %s (%s) failed in %s mode!\n",</div><div class='add'>+		      driver, alg, fips_enabled ? "fips" : "panic_on_fail");</div><div class='ctx'> </div><div class='ctx'> 	if (fips_enabled &amp;&amp; !rc)</div><div class='ctx'> 		pr_info("alg: self-tests for %s (%s) passed\n", driver, alg);</div><div class='head'>diff --git a/crypto/testmgr.h b/crypto/testmgr.h<br/>index f267633cf13a..b6daae1f6a1d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/testmgr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/testmgr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/testmgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/testmgr.h</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #ifndef _CRYPTO_TESTMGR_H</div><div class='ctx'> #define _CRYPTO_TESTMGR_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/oid_registry.h&gt;</div><div class='add'>+</div><div class='ctx'> #define MAX_IVLEN		32</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -34,6 +36,8 @@</div><div class='ctx'>  * @digest:	Pointer to expected digest</div><div class='ctx'>  * @psize:	Length of source data in bytes</div><div class='ctx'>  * @ksize:	Length of @key in bytes (0 if no key)</div><div class='add'>+ * @setkey_error: Expected error from setkey()</div><div class='add'>+ * @digest_error: Expected error from digest()</div><div class='ctx'>  */</div><div class='ctx'> struct hash_testvec {</div><div class='ctx'> 	const char *key;</div><div class='hunk'>@@ -41,6 +45,8 @@ struct hash_testvec {</div><div class='ctx'> 	const char *digest;</div><div class='ctx'> 	unsigned short psize;</div><div class='ctx'> 	unsigned short ksize;</div><div class='add'>+	int setkey_error;</div><div class='add'>+	int digest_error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -52,12 +58,13 @@ struct hash_testvec {</div><div class='ctx'>  * @ptext:	Pointer to plaintext</div><div class='ctx'>  * @ctext:	Pointer to ciphertext</div><div class='ctx'>  * @len:	Length of @ptext and @ctext in bytes</div><div class='del'>- * @fail:	If set to one, the test need to fail</div><div class='ctx'>  * @wk:		Does the test need CRYPTO_TFM_REQ_FORBID_WEAK_KEYS?</div><div class='ctx'>  * 		( e.g. test needs to fail due to a weak key )</div><div class='ctx'>  * @fips_skip:	Skip the test vector in FIPS mode</div><div class='ctx'>  * @generates_iv: Encryption should ignore the given IV, and output @iv_out.</div><div class='ctx'>  *		  Decryption takes @iv_out.  Needed for AES Keywrap ("kw(aes)").</div><div class='add'>+ * @setkey_error: Expected error from setkey()</div><div class='add'>+ * @crypt_error: Expected error from encrypt() and decrypt()</div><div class='ctx'>  */</div><div class='ctx'> struct cipher_testvec {</div><div class='ctx'> 	const char *key;</div><div class='hunk'>@@ -65,12 +72,13 @@ struct cipher_testvec {</div><div class='ctx'> 	const char *iv_out;</div><div class='ctx'> 	const char *ptext;</div><div class='ctx'> 	const char *ctext;</div><div class='del'>-	bool fail;</div><div class='ctx'> 	unsigned char wk; /* weak key flag */</div><div class='del'>-	unsigned char klen;</div><div class='add'>+	unsigned short klen;</div><div class='ctx'> 	unsigned short len;</div><div class='ctx'> 	bool fips_skip;</div><div class='ctx'> 	bool generates_iv;</div><div class='add'>+	int setkey_error;</div><div class='add'>+	int crypt_error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -82,7 +90,6 @@ struct cipher_testvec {</div><div class='ctx'>  * @ctext:	Pointer to the full authenticated ciphertext.  For AEADs that</div><div class='ctx'>  *		produce a separate "ciphertext" and "authentication tag", these</div><div class='ctx'>  *		two parts are concatenated: ciphertext || tag.</div><div class='del'>- * @fail:	setkey() failure expected?</div><div class='ctx'>  * @novrfy:	Decryption verification failure expected?</div><div class='ctx'>  * @wk:		Does the test need CRYPTO_TFM_REQ_FORBID_WEAK_KEYS?</div><div class='ctx'>  *		(e.g. setkey() needs to fail due to a weak key)</div><div class='hunk'>@@ -90,6 +97,9 @@ struct cipher_testvec {</div><div class='ctx'>  * @plen:	Length of @ptext in bytes</div><div class='ctx'>  * @alen:	Length of @assoc in bytes</div><div class='ctx'>  * @clen:	Length of @ctext in bytes</div><div class='add'>+ * @setkey_error: Expected error from setkey()</div><div class='add'>+ * @setauthsize_error: Expected error from setauthsize()</div><div class='add'>+ * @crypt_error: Expected error from encrypt() and decrypt()</div><div class='ctx'>  */</div><div class='ctx'> struct aead_testvec {</div><div class='ctx'> 	const char *key;</div><div class='hunk'>@@ -97,13 +107,15 @@ struct aead_testvec {</div><div class='ctx'> 	const char *ptext;</div><div class='ctx'> 	const char *assoc;</div><div class='ctx'> 	const char *ctext;</div><div class='del'>-	bool fail;</div><div class='ctx'> 	unsigned char novrfy;</div><div class='ctx'> 	unsigned char wk;</div><div class='ctx'> 	unsigned char klen;</div><div class='ctx'> 	unsigned short plen;</div><div class='ctx'> 	unsigned short clen;</div><div class='ctx'> 	unsigned short alen;</div><div class='add'>+	int setkey_error;</div><div class='add'>+	int setauthsize_error;</div><div class='add'>+	int crypt_error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cprng_testvec {</div><div class='hunk'>@@ -135,13 +147,16 @@ struct drbg_testvec {</div><div class='ctx'> </div><div class='ctx'> struct akcipher_testvec {</div><div class='ctx'> 	const unsigned char *key;</div><div class='add'>+	const unsigned char *params;</div><div class='ctx'> 	const unsigned char *m;</div><div class='ctx'> 	const unsigned char *c;</div><div class='ctx'> 	unsigned int key_len;</div><div class='add'>+	unsigned int param_len;</div><div class='ctx'> 	unsigned int m_size;</div><div class='ctx'> 	unsigned int c_size;</div><div class='ctx'> 	bool public_key_vec;</div><div class='ctx'> 	bool siggen_sigver_test;</div><div class='add'>+	enum OID algo;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kpp_testvec {</div><div class='hunk'>@@ -551,6 +566,160 @@ static const struct akcipher_testvec rsa_tv_template[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * EC-RDSA test vectors are generated by gost-engine.</div><div class='add'>+ */</div><div class='add'>+static const struct akcipher_testvec ecrdsa_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+	.key =</div><div class='add'>+	"\x04\x40\xd5\xa7\x77\xf9\x26\x2f\x8c\xbd\xcc\xe3\x1f\x01\x94\x05"</div><div class='add'>+	"\x3d\x2f\xec\xb5\x00\x34\xf5\x51\x6d\x3b\x90\x4b\x23\x28\x6f\x1d"</div><div class='add'>+	"\xc8\x36\x61\x60\x36\xec\xbb\xb4\x0b\x95\x4e\x54\x4f\x15\x21\x05"</div><div class='add'>+	"\xd8\x52\x66\x44\x31\x7e\x5d\xc5\xd1\x26\x00\x5f\x60\xd8\xf0\xc7"</div><div class='add'>+	"\x27\xfc",</div><div class='add'>+	.key_len = 66,</div><div class='add'>+	.params = /* OID_gostCPSignA */</div><div class='add'>+	"\x30\x13\x06\x07\x2a\x85\x03\x02\x02\x23\x01\x06\x08\x2a\x85\x03"</div><div class='add'>+	"\x07\x01\x01\x02\x02",</div><div class='add'>+	.param_len = 21,</div><div class='add'>+	.c =</div><div class='add'>+	"\x41\x32\x09\x73\xa4\xc1\x38\xd6\x63\x7d\x8b\xf7\x50\x3f\xda\x9f"</div><div class='add'>+	"\x68\x48\xc1\x50\xe3\x42\x3a\x9b\x2b\x28\x12\x2a\xa7\xc2\x75\x31"</div><div class='add'>+	"\x65\x77\x8c\x3c\x9e\x0d\x56\xb2\xf9\xdc\x04\x33\x3e\xb0\x9e\xf9"</div><div class='add'>+	"\x74\x4e\x59\xb3\x83\xf2\x91\x27\xda\x5e\xc7\x33\xc0\xc1\x8f\x41",</div><div class='add'>+	.c_size = 64,</div><div class='add'>+	.algo = OID_gost2012PKey256,</div><div class='add'>+	.m =</div><div class='add'>+	"\x75\x1b\x9b\x40\x25\xb9\x96\xd2\x9b\x00\x41\xb3\x58\xbf\x23\x14"</div><div class='add'>+	"\x79\xd2\x76\x64\xa3\xbd\x66\x10\x79\x05\x5a\x06\x42\xec\xb9\xc9",</div><div class='add'>+	.m_size = 32,</div><div class='add'>+	.public_key_vec = true,</div><div class='add'>+	.siggen_sigver_test = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.key =</div><div class='add'>+	"\x04\x40\x66\x6f\xd6\xb7\x06\xd0\xf5\xa5\x6f\x69\x5c\xa5\x13\x45"</div><div class='add'>+	"\x14\xdd\xcb\x12\x9c\x1b\xf5\x28\x64\x7a\x49\x48\x29\x14\x66\x42"</div><div class='add'>+	"\xb8\x1b\x5c\xf9\x56\x6d\x08\x3b\xce\xbb\x62\x2f\xc2\x3c\xc5\x49"</div><div class='add'>+	"\x93\x27\x70\x20\xcc\x79\xeb\xdc\x76\x8e\x48\x6e\x04\x96\xc3\x29"</div><div class='add'>+	"\xa0\x73",</div><div class='add'>+	.key_len = 66,</div><div class='add'>+	.params = /* OID_gostCPSignB */</div><div class='add'>+	"\x30\x13\x06\x07\x2a\x85\x03\x02\x02\x23\x02\x06\x08\x2a\x85\x03"</div><div class='add'>+	"\x07\x01\x01\x02\x02",</div><div class='add'>+	.param_len = 21,</div><div class='add'>+	.c =</div><div class='add'>+	"\x45\x6d\x4a\x03\x1d\x5c\x0b\x17\x79\xe7\x19\xdb\xbf\x81\x9f\x82"</div><div class='add'>+	"\xae\x06\xda\xf5\x47\x00\x05\x80\xc3\x16\x06\x9a\x8e\x7c\xb2\x8e"</div><div class='add'>+	"\x7f\x74\xaa\xec\x6b\x7b\x7f\x8b\xc6\x0b\x10\x42\x4e\x91\x2c\xdf"</div><div class='add'>+	"\x7b\x8b\x15\xf4\x9e\x59\x0f\xc7\xa4\x68\x2e\xce\x89\xdf\x84\xe9",</div><div class='add'>+	.c_size = 64,</div><div class='add'>+	.algo = OID_gost2012PKey256,</div><div class='add'>+	.m =</div><div class='add'>+	"\xd0\x54\x00\x27\x6a\xeb\xce\x6c\xf5\xf6\xfb\x57\x18\x18\x21\x13"</div><div class='add'>+	"\x11\x23\x4a\x70\x43\x52\x7a\x68\x11\x65\x45\x37\xbb\x25\xb7\x40",</div><div class='add'>+	.m_size = 32,</div><div class='add'>+	.public_key_vec = true,</div><div class='add'>+	.siggen_sigver_test = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.key =</div><div class='add'>+	"\x04\x40\x05\x91\xa9\x7d\xcb\x87\xdc\x98\xa1\xbf\xff\xdd\x20\x61"</div><div class='add'>+	"\xaa\x58\x3b\x2d\x8e\x9c\x41\x9d\x4f\xc6\x23\x17\xf9\xca\x60\x65"</div><div class='add'>+	"\xbc\x97\x97\xf6\x6b\x24\xe8\xac\xb1\xa7\x61\x29\x3c\x71\xdc\xad"</div><div class='add'>+	"\xcb\x20\xbe\x96\xe8\xf4\x44\x2e\x49\xd5\x2c\xb9\xc9\x3b\x9c\xaa"</div><div class='add'>+	"\xba\x15",</div><div class='add'>+	.key_len = 66,</div><div class='add'>+	.params = /* OID_gostCPSignC */</div><div class='add'>+	"\x30\x13\x06\x07\x2a\x85\x03\x02\x02\x23\x03\x06\x08\x2a\x85\x03"</div><div class='add'>+	"\x07\x01\x01\x02\x02",</div><div class='add'>+	.param_len = 21,</div><div class='add'>+	.c =</div><div class='add'>+	"\x3b\x2e\x2e\x74\x74\x47\xda\xea\x93\x90\x6a\xe2\xf5\xf5\xe6\x46"</div><div class='add'>+	"\x11\xfc\xab\xdc\x52\xbc\x58\xdb\x45\x44\x12\x4a\xf7\xd0\xab\xc9"</div><div class='add'>+	"\x73\xba\x64\xab\x0d\xac\x4e\x72\x10\xa8\x04\xf6\x1e\xe0\x48\x6a"</div><div class='add'>+	"\xcd\xe8\xe3\x78\x73\x77\x82\x24\x8d\xf1\xd3\xeb\x4c\x25\x7e\xc0",</div><div class='add'>+	.c_size = 64,</div><div class='add'>+	.algo = OID_gost2012PKey256,</div><div class='add'>+	.m =</div><div class='add'>+	"\x52\x33\xf4\x3f\x7b\x5d\xcf\x20\xee\xe4\x5c\xab\x0b\x3f\x14\xd6"</div><div class='add'>+	"\x9f\x16\xc6\x1c\xb1\x3f\x84\x41\x69\xec\x34\xfd\xf1\xf9\xa3\x39",</div><div class='add'>+	.m_size = 32,</div><div class='add'>+	.public_key_vec = true,</div><div class='add'>+	.siggen_sigver_test = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.key =</div><div class='add'>+	"\x04\x81\x80\x85\x46\x8f\x16\xf8\x7a\x7e\x4a\xc3\x81\x9e\xf1\x6e"</div><div class='add'>+	"\x94\x1e\x5d\x02\x87\xea\xfa\xa0\x0a\x17\x70\x49\x64\xad\x95\x68"</div><div class='add'>+	"\x60\x0a\xf0\x57\x29\x41\x79\x30\x3c\x61\x69\xf2\xa6\x94\x87\x17"</div><div class='add'>+	"\x54\xfa\x97\x2c\xe6\x1e\x0a\xbb\x55\x10\x57\xbe\xf7\xc1\x77\x2b"</div><div class='add'>+	"\x11\x74\x0a\x50\x37\x14\x10\x2a\x45\xfc\x7a\xae\x1c\x4c\xce\x08"</div><div class='add'>+	"\x05\xb7\xa4\x50\xc8\x3d\x39\x3d\xdc\x5c\x8f\x96\x6c\xe7\xfc\x21"</div><div class='add'>+	"\xc3\x2d\x1e\x9f\x11\xb3\xec\x22\x18\x8a\x8c\x08\x6b\x8b\xed\xf5"</div><div class='add'>+	"\xc5\x47\x3c\x7e\x73\x59\x44\x1e\x77\x83\x84\x52\x9e\x3b\x7d\xff"</div><div class='add'>+	"\x9d\x86\x1a",</div><div class='add'>+	.key_len = 131,</div><div class='add'>+	.params = /* OID_gostTC26Sign512A */</div><div class='add'>+	"\x30\x0b\x06\x09\x2a\x85\x03\x07\x01\x02\x01\x02\x01",</div><div class='add'>+	.param_len = 13,</div><div class='add'>+	.c =</div><div class='add'>+	"\x92\x81\x74\x5f\x95\x48\x38\x87\xd9\x8f\x5e\xc8\x8a\xbb\x01\x4e"</div><div class='add'>+	"\xb0\x75\x3c\x2f\xc7\x5a\x08\x4c\x68\xab\x75\x01\x32\x75\x75\xb5"</div><div class='add'>+	"\x37\xe0\x74\x6d\x94\x84\x31\x2a\x6b\xf4\xf7\xb7\xa7\x39\x7b\x46"</div><div class='add'>+	"\x07\xf0\x98\xbd\x33\x18\xa1\x72\xb2\x6d\x54\xe3\xde\x91\xc2\x2e"</div><div class='add'>+	"\x4f\x6a\xf8\xb7\xec\xa8\x83\xc9\x8f\xd9\xce\x7c\x45\x06\x02\xf4"</div><div class='add'>+	"\x4f\x21\xb5\x24\x3d\xb4\xb5\xd8\x58\x42\xbe\x2d\x29\xae\x93\xc0"</div><div class='add'>+	"\x13\x41\x96\x35\x08\x69\xe8\x36\xc7\xd1\x83\x81\xd7\xca\xfb\xc0"</div><div class='add'>+	"\xd2\xb7\x78\x32\x3e\x30\x1a\x1e\xce\xdc\x34\x35\xc6\xad\x68\x24",</div><div class='add'>+	.c_size = 128,</div><div class='add'>+	.algo = OID_gost2012PKey512,</div><div class='add'>+	.m =</div><div class='add'>+	"\x1f\x70\xb5\xe9\x55\x12\xd6\x88\xcc\x55\xb9\x0c\x7f\xc4\x94\xf2"</div><div class='add'>+	"\x04\x77\x41\x12\x02\xd6\xf1\x1f\x83\x56\xe9\xd6\x5a\x6a\x72\xb9"</div><div class='add'>+	"\x6e\x8e\x24\x2a\x84\xf1\xba\x67\xe8\xbf\xff\xc1\xd3\xde\xfb\xc6"</div><div class='add'>+	"\xa8\xf6\x80\x01\xb9\x27\xac\xd8\x45\x96\x66\xa1\xee\x48\x08\x3f",</div><div class='add'>+	.m_size = 64,</div><div class='add'>+	.public_key_vec = true,</div><div class='add'>+	.siggen_sigver_test = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.key =</div><div class='add'>+	"\x04\x81\x80\x28\xf3\x2b\x92\x04\x32\xea\x66\x20\xde\xa0\x2f\x74"</div><div class='add'>+	"\xbf\x2d\xf7\xb5\x30\x76\xb1\xc8\xee\x38\x9f\xea\xe5\xad\xc6\xa3"</div><div class='add'>+	"\x28\x1e\x51\x3d\x67\xa3\x41\xcc\x6b\x81\xe2\xe2\x9e\x82\xf3\x78"</div><div class='add'>+	"\x56\xd7\x2e\xb2\xb5\xbe\xb4\x50\x21\x05\xe5\x29\x82\xef\x15\x1b"</div><div class='add'>+	"\xc0\xd7\x30\xd6\x2f\x96\xe8\xff\x99\x4c\x25\xcf\x9a\xfc\x54\x30"</div><div class='add'>+	"\xce\xdf\x59\xe9\xc6\x45\xce\xe4\x22\xe8\x01\xd5\xcd\x2f\xaa\x78"</div><div class='add'>+	"\x99\xc6\x04\x1e\x6f\x4c\x25\x6a\x76\xad\xff\x48\xf3\xb3\xb4\xd6"</div><div class='add'>+	"\x14\x5c\x2c\x0e\xea\xa2\x4b\xb9\x7e\x89\x77\x02\x3a\x29\xc8\x16"</div><div class='add'>+	"\x8e\x78\x48",</div><div class='add'>+	.key_len = 131,</div><div class='add'>+	.params = /* OID_gostTC26Sign512B */</div><div class='add'>+	"\x30\x0b\x06\x09\x2a\x85\x03\x07\x01\x02\x01\x02\x02",</div><div class='add'>+	.param_len = 13,</div><div class='add'>+	.c =</div><div class='add'>+	"\x0a\xed\xb6\x27\xea\xa7\xa6\x7e\x2f\xc1\x02\x21\x74\xce\x27\xd2"</div><div class='add'>+	"\xee\x8a\x92\x4d\xa9\x43\x2d\xa4\x5b\xdc\x23\x02\xfc\x3a\xf3\xb2"</div><div class='add'>+	"\x10\x93\x0b\x40\x1b\x75\x95\x3e\x39\x41\x37\xb9\xab\x51\x09\xeb"</div><div class='add'>+	"\xf1\xb9\x49\x58\xec\x58\xc7\xf9\x2e\xb9\xc9\x40\xf2\x00\x39\x7e"</div><div class='add'>+	"\x3f\xde\x72\xe3\x85\x67\x06\xbe\xd8\xb8\xc1\x81\x1e\xe3\x0a\xfe"</div><div class='add'>+	"\xce\xd3\x77\x92\x56\x8c\x58\xf9\x37\x60\x2d\xe6\x8b\x66\xa3\xdd"</div><div class='add'>+	"\xd2\xf0\xf8\xda\x1b\x20\xbc\x9c\xec\x29\x5d\xd1\x8f\xcc\x37\xd1"</div><div class='add'>+	"\x3b\x8d\xb7\xc1\xe0\xb8\x3b\xef\x14\x1b\x87\xbc\xc1\x03\x9a\x93",</div><div class='add'>+	.c_size = 128,</div><div class='add'>+	.algo = OID_gost2012PKey512,</div><div class='add'>+	.m =</div><div class='add'>+	"\x11\x24\x21\x27\xf2\x42\x9f\xce\x5a\xf9\x01\x70\xe0\x07\x2b\x57"</div><div class='add'>+	"\xfb\x7d\x77\x5e\x74\x66\xe6\xa5\x40\x4c\x1a\x85\x18\xff\xd0\x63"</div><div class='add'>+	"\xe0\x39\xd3\xd6\xe5\x17\xf8\xc3\x4b\xc6\x1c\x33\x1a\xca\xa6\x66"</div><div class='add'>+	"\x6d\xf4\xd2\x45\xc2\x83\xa0\x42\x95\x05\x9d\x89\x8e\x0a\xca\xcc",</div><div class='add'>+	.m_size = 64,</div><div class='add'>+	.public_key_vec = true,</div><div class='add'>+	.siggen_sigver_test = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PKCS#1 RSA test vectors. Obtained from CAVS testing.</div><div class='ctx'>  */</div><div class='ctx'> static const struct akcipher_testvec pkcs1pad_rsa_tv_template[] = {</div><div class='hunk'>@@ -5634,7 +5803,49 @@ static const struct hash_testvec poly1305_tv_template[] = {</div><div class='ctx'> 		.psize		= 80,</div><div class='ctx'> 		.digest		= "\x13\x00\x00\x00\x00\x00\x00\x00"</div><div class='ctx'> 				  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='del'>-	},</div><div class='add'>+	}, { /* Regression test for overflow in AVX2 implementation */</div><div class='add'>+		.plaintext	= "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff\xff\xff\xff\xff"</div><div class='add'>+				  "\xff\xff\xff\xff",</div><div class='add'>+		.psize		= 300,</div><div class='add'>+		.digest		= "\xfb\x5e\x96\xd8\x61\xd5\xc7\xc8"</div><div class='add'>+				  "\x78\xe5\x87\xcc\x2d\x5a\x22\xe1",</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NHPoly1305 test vectors from https://github.com/google/adiantum */</div><div class='hunk'>@@ -7042,7 +7253,7 @@ static const struct cipher_testvec des_tv_template[] = {</div><div class='ctx'> 			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",</div><div class='ctx'> 		.len	= 24,</div><div class='ctx'> 	}, { /* Weak key */</div><div class='del'>-		.fail	= true,</div><div class='add'>+		.setkey_error = -EINVAL,</div><div class='ctx'> 		.wk	= 1,</div><div class='ctx'> 		.key	= "\x01\x01\x01\x01\x01\x01\x01\x01",</div><div class='ctx'> 		.klen	= 8,</div><div class='head'>diff --git a/crypto/tgr192.c b/crypto/tgr192.c<br/>index f8e1d9f9938f..40020f8adc46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/tgr192.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/tgr192.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/tgr192.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/tgr192.c</a></div><div class='hunk'>@@ -677,7 +677,7 @@ MODULE_ALIAS_CRYPTO("tgr192");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("tgr160");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("tgr128");</div><div class='ctx'> </div><div class='del'>-module_init(tgr192_mod_init);</div><div class='add'>+subsys_initcall(tgr192_mod_init);</div><div class='ctx'> module_exit(tgr192_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/twofish_generic.c b/crypto/twofish_generic.c<br/>index 07e62433fbfb..dbac6e233285 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/twofish_generic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/twofish_generic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/twofish_generic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/twofish_generic.c</a></div><div class='hunk'>@@ -205,7 +205,7 @@ static void __exit twofish_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(twofish_mod_init);</div><div class='add'>+subsys_initcall(twofish_mod_init);</div><div class='ctx'> module_exit(twofish_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/vmac.c b/crypto/vmac.c<br/>index 5f436dfdfc61..f50a85060b39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/vmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/vmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/vmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/vmac.c</a></div><div class='hunk'>@@ -690,7 +690,7 @@ static void __exit vmac_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;vmac64_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(vmac_module_init);</div><div class='add'>+subsys_initcall(vmac_module_init);</div><div class='ctx'> module_exit(vmac_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/wp512.c b/crypto/wp512.c<br/>index 149e577fb772..1b8e502d999f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/wp512.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/wp512.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/wp512.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/wp512.c</a></div><div class='hunk'>@@ -1168,7 +1168,7 @@ MODULE_ALIAS_CRYPTO("wp512");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("wp384");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("wp256");</div><div class='ctx'> </div><div class='del'>-module_init(wp512_mod_init);</div><div class='add'>+subsys_initcall(wp512_mod_init);</div><div class='ctx'> module_exit(wp512_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/xcbc.c b/crypto/xcbc.c<br/>index c055f57fab11..94ca694ef091 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/xcbc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/xcbc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/xcbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/xcbc.c</a></div><div class='hunk'>@@ -282,7 +282,7 @@ static void __exit crypto_xcbc_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_xcbc_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_xcbc_module_init);</div><div class='add'>+subsys_initcall(crypto_xcbc_module_init);</div><div class='ctx'> module_exit(crypto_xcbc_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/xts.c b/crypto/xts.c<br/>index 847f54f76789..33cf726df4ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/xts.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/xts.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/xts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/xts.c</a></div><div class='hunk'>@@ -137,8 +137,12 @@ static void crypt_done(struct crypto_async_request *areq, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct skcipher_request *req = areq-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='add'>+	if (!err) {</div><div class='add'>+		struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+		rctx-&gt;subreq.base.flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 		err = xor_tweak_post(req);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skcipher_request_complete(req, err);</div><div class='ctx'> }</div><div class='hunk'>@@ -359,7 +363,7 @@ static void __exit crypto_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(crypto_module_init);</div><div class='add'>+subsys_initcall(crypto_module_init);</div><div class='ctx'> module_exit(crypto_module_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/zstd.c b/crypto/zstd.c<br/>index 9a76b3ed8b8b..2c04055e407f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/zstd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>crypto/zstd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/crypto/zstd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>crypto/zstd.c</a></div><div class='hunk'>@@ -257,7 +257,7 @@ static void __exit zstd_mod_fini(void)</div><div class='ctx'> 	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(zstd_mod_init);</div><div class='add'>+subsys_initcall(zstd_mod_init);</div><div class='ctx'> module_exit(zstd_mod_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/Kconfig b/drivers/Kconfig<br/>index 45f9decb9848..e8231663f201 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/Kconfig</a></div><div class='hunk'>@@ -230,4 +230,6 @@ source "drivers/slimbus/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/interconnect/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/counter/Kconfig"</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/Makefile b/drivers/Makefile<br/>index c61cde554340..28b030d7988d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/Makefile</a></div><div class='hunk'>@@ -187,3 +187,4 @@ obj-$(CONFIG_UNISYS_VISORBUS)	+= visorbus/</div><div class='ctx'> obj-$(CONFIG_SIOX)		+= siox/</div><div class='ctx'> obj-$(CONFIG_GNSS)		+= gnss/</div><div class='ctx'> obj-$(CONFIG_INTERCONNECT)	+= interconnect/</div><div class='add'>+obj-$(CONFIG_COUNTER)		+= counter/</div><div class='head'>diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig<br/>index 4e015c77e48e..283ee94224c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/Kconfig</a></div><div class='hunk'>@@ -475,6 +475,7 @@ config ACPI_REDUCED_HARDWARE_ONLY</div><div class='ctx'> 	  If you are unsure what to do, do not enable this option.</div><div class='ctx'> </div><div class='ctx'> source "drivers/acpi/nfit/Kconfig"</div><div class='add'>+source "drivers/acpi/hmat/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/acpi/apei/Kconfig"</div><div class='ctx'> source "drivers/acpi/dptf/Kconfig"</div><div class='head'>diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile<br/>index bb857421c2e8..5d361e4e3405 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/Makefile</a></div><div class='hunk'>@@ -80,6 +80,7 @@ obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o</div><div class='ctx'> obj-$(CONFIG_ACPI)		+= container.o</div><div class='ctx'> obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o</div><div class='ctx'> obj-$(CONFIG_ACPI_NFIT)		+= nfit/</div><div class='add'>+obj-$(CONFIG_ACPI_HMAT)		+= hmat/</div><div class='ctx'> obj-$(CONFIG_ACPI)		+= acpi_memhotplug.o</div><div class='ctx'> obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o</div><div class='ctx'> obj-$(CONFIG_ACPI_BATTERY)	+= battery.o</div><div class='head'>diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c<br/>index 81bfc6197293..f92033661239 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_configfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_configfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpi_configfs.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str)</div><div class='ctx'> 	if (!h)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h-&gt;signature);</div><div class='add'>+	return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h-&gt;signature);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)</div><div class='hunk'>@@ -170,7 +170,7 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg,</div><div class='ctx'> 	if (!h)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h-&gt;asl_compiler_id);</div><div class='add'>+	return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h-&gt;asl_compiler_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,</div><div class='head'>diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c<br/>index 4a434c23a196..d18246a2a65e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_dbg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_dbg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpi_dbg.c</a></div><div class='hunk'>@@ -390,7 +390,7 @@ again:</div><div class='ctx'> 	return size &gt; 0 ? size : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int acpi_aml_thread(void *unsed)</div><div class='add'>+static int acpi_aml_thread(void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_osd_exec_callback function = NULL;</div><div class='ctx'> 	void *context;</div><div class='head'>diff --git a/drivers/acpi/acpi_lpat.c b/drivers/acpi/acpi_lpat.c<br/>index 2cd9f738812b..43f1b99c86ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_lpat.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_lpat.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_lpat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpi_lpat.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'>  * LPAT conversion table</div><div class='ctx'>  *</div><div class='ctx'>  * @lpat_table: the temperature_raw mapping table structure</div><div class='del'>- * @raw: the raw value, used as a key to get the temerature from the</div><div class='add'>+ * @raw: the raw value, used as a key to get the temperature from the</div><div class='ctx'>  *       above mapping table</div><div class='ctx'>  *</div><div class='ctx'>  * A positive converted temperature value will be returned on success,</div><div class='head'>diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c<br/>index 1e2a10a06b9d..cf768608437e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_lpss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpi_lpss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpi_lpss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpi_lpss.c</a></div><div class='hunk'>@@ -1142,8 +1142,8 @@ static struct dev_pm_domain acpi_lpss_pm_domain = {</div><div class='ctx'> 		.thaw_noirq = acpi_subsys_thaw_noirq,</div><div class='ctx'> 		.poweroff = acpi_subsys_suspend,</div><div class='ctx'> 		.poweroff_late = acpi_lpss_suspend_late,</div><div class='del'>-		.poweroff_noirq = acpi_subsys_suspend_noirq,</div><div class='del'>-		.restore_noirq = acpi_subsys_resume_noirq,</div><div class='add'>+		.poweroff_noirq = acpi_lpss_suspend_noirq,</div><div class='add'>+		.restore_noirq = acpi_lpss_resume_noirq,</div><div class='ctx'> 		.restore_early = acpi_lpss_resume_early,</div><div class='ctx'> #endif</div><div class='ctx'> 		.runtime_suspend = acpi_lpss_runtime_suspend,</div><div class='head'>diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h<br/>index a2dfbf6b004e..13d513b81589 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/aclocal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/aclocal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/aclocal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/aclocal.h</a></div><div class='hunk'>@@ -293,7 +293,7 @@ acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state);</div><div class='ctx'>  * expected_return_btypes - Allowed type(s) for the return value</div><div class='ctx'>  */</div><div class='ctx'> struct acpi_name_info {</div><div class='del'>-	char name[ACPI_NAME_SIZE];</div><div class='add'>+	char name[ACPI_NAMESEG_SIZE];</div><div class='ctx'> 	u16 argument_list;</div><div class='ctx'> 	u8 expected_btypes;</div><div class='ctx'> };</div><div class='hunk'>@@ -370,7 +370,7 @@ typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node *</div><div class='ctx'> 					      converted_object);</div><div class='ctx'> </div><div class='ctx'> struct acpi_simple_repair_info {</div><div class='del'>-	char name[ACPI_NAME_SIZE];</div><div class='add'>+	char name[ACPI_NAMESEG_SIZE];</div><div class='ctx'> 	u32 unexpected_btypes;</div><div class='ctx'> 	u32 package_index;</div><div class='ctx'> 	acpi_object_converter object_converter;</div><div class='head'>diff --git a/drivers/acpi/acpica/dbexec.c b/drivers/acpi/acpica/dbexec.c<br/>index bb43305cb215..4027eaab18a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/dbexec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/dbexec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/dbexec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/dbexec.c</a></div><div class='hunk'>@@ -453,7 +453,7 @@ acpi_db_execute(char *name, char **args, acpi_object_type *types, u32 flags)</div><div class='ctx'> </div><div class='ctx'> 			/* Dump a _PLD buffer if present */</div><div class='ctx'> </div><div class='del'>-			if (ACPI_COMPARE_NAME</div><div class='add'>+			if (ACPI_COMPARE_NAMESEG</div><div class='ctx'> 			    ((ACPI_CAST_PTR</div><div class='ctx'> 			      (struct acpi_namespace_node,</div><div class='ctx'> 			       acpi_gbl_db_method_info.method)-&gt;name.ascii),</div><div class='head'>diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c<br/>index 004d34d9369b..63fe30e86807 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/dbnames.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/dbnames.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/dbnames.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/dbnames.c</a></div><div class='hunk'>@@ -354,7 +354,7 @@ acpi_status acpi_db_find_name_in_namespace(char *name_arg)</div><div class='ctx'> 	char acpi_name[5] = "____";</div><div class='ctx'> 	char *acpi_name_ptr = acpi_name;</div><div class='ctx'> </div><div class='del'>-	if (strlen(name_arg) &gt; ACPI_NAME_SIZE) {</div><div class='add'>+	if (strlen(name_arg) &gt; ACPI_NAMESEG_SIZE) {</div><div class='ctx'> 		acpi_os_printf("Name must be no longer than 4 characters\n");</div><div class='ctx'> 		return (AE_OK);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c<br/>index a4a24ffe5fae..4ebd23700bbc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/dsinit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/dsinit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/dsinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/dsinit.c</a></div><div class='hunk'>@@ -200,7 +200,7 @@ acpi_ds_initialize_objects(u32 table_index,</div><div class='ctx'> </div><div class='ctx'> 	/* DSDT is always the first AML table */</div><div class='ctx'> </div><div class='del'>-	if (ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_DSDT)) {</div><div class='add'>+	if (ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_DSDT)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,</div><div class='ctx'> 				      "\nInitializing Namespace objects:\n"));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c<br/>index c92d2f6ebe01..b04f982e59fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/evgpeinit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/evgpeinit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/evgpeinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/evgpeinit.c</a></div><div class='hunk'>@@ -292,7 +292,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 gpe_number;</div><div class='ctx'> 	u8 temp_gpe_number;</div><div class='del'>-	char name[ACPI_NAME_SIZE + 1];</div><div class='add'>+	char name[ACPI_NAMESEG_SIZE + 1];</div><div class='ctx'> 	u8 type;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ev_match_gpe_method);</div><div class='hunk'>@@ -310,7 +310,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,</div><div class='ctx'> 	 * 1) Extract the method name and null terminate it</div><div class='ctx'> 	 */</div><div class='ctx'> 	ACPI_MOVE_32_TO_32(name, &amp;method_node-&gt;name.integer);</div><div class='del'>-	name[ACPI_NAME_SIZE] = 0;</div><div class='add'>+	name[ACPI_NAMESEG_SIZE] = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* 2) Name must begin with an underscore */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c<br/>index bd68d66e89f0..6b76be5212a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/exnames.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/exnames.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/exnames.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/exnames.c</a></div><div class='hunk'>@@ -53,10 +53,10 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)</div><div class='ctx'> </div><div class='ctx'> 		/* Special case for root */</div><div class='ctx'> </div><div class='del'>-		size_needed = 1 + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;</div><div class='add'>+		size_needed = 1 + (ACPI_NAMESEG_SIZE * num_name_segs) + 2 + 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		size_needed =</div><div class='del'>-		    prefix_count + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;</div><div class='add'>+		    prefix_count + (ACPI_NAMESEG_SIZE * num_name_segs) + 2 + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -141,7 +141,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0;</div><div class='del'>-	     (index &lt; ACPI_NAME_SIZE)</div><div class='add'>+	     (index &lt; ACPI_NAMESEG_SIZE)</div><div class='ctx'> 	     &amp;&amp; (acpi_ut_valid_name_char(*aml_address, 0)); index++) {</div><div class='ctx'> 		char_buf[index] = *aml_address++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c<br/>index 75192b958544..7b855603f81a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsaccess.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsaccess.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsaccess.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsaccess.c</a></div><div class='hunk'>@@ -683,7 +683,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> </div><div class='ctx'> 		/* Point to next name segment and make this node current */</div><div class='ctx'> </div><div class='del'>-		path += ACPI_NAME_SIZE;</div><div class='add'>+		path += ACPI_NAMESEG_SIZE;</div><div class='ctx'> 		current_node = this_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c<br/>index 5470213b8e64..6eb63db72249 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsalloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsalloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsalloc.c</a></div><div class='hunk'>@@ -74,6 +74,10 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_NAME(ns_delete_node);</div><div class='ctx'> </div><div class='add'>+	if (!node) {</div><div class='add'>+		return_VOID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Detach an object if there is one */</div><div class='ctx'> </div><div class='ctx'> 	acpi_ns_detach_object(node);</div><div class='head'>diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c<br/>index 15070bd0c28a..1b12c172e115 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsdump.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsdump.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsdump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsdump.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ void acpi_ns_print_pathname(u32 num_segments, const char *pathname)</div><div class='ctx'> 			    acpi_os_printf("?");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pathname += ACPI_NAME_SIZE;</div><div class='add'>+		pathname += ACPI_NAMESEG_SIZE;</div><div class='ctx'> 		num_segments--;</div><div class='ctx'> 		if (num_segments) {</div><div class='ctx'> 			acpi_os_printf(".");</div><div class='head'>diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c<br/>index 19fb8dda870f..53e5d00d3a5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsinit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsinit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsinit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsinit.c</a></div><div class='hunk'>@@ -478,7 +478,7 @@ acpi_ns_find_ini_methods(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 	/* We are only looking for methods named _INI */</div><div class='ctx'> </div><div class='del'>-	if (!ACPI_COMPARE_NAME(node-&gt;name.ascii, METHOD_NAME__INI)) {</div><div class='add'>+	if (!ACPI_COMPARE_NAMESEG(node-&gt;name.ascii, METHOD_NAME__INI)) {</div><div class='ctx'> 		return (AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -641,7 +641,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,</div><div class='ctx'> 	 * Note: We know there is an _INI within this subtree, but it may not be</div><div class='ctx'> 	 * under this particular device, it may be lower in the branch.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ACPI_COMPARE_NAME(device_node-&gt;name.ascii, "_SB_") ||</div><div class='add'>+	if (!ACPI_COMPARE_NAMESEG(device_node-&gt;name.ascii, "_SB_") ||</div><div class='ctx'> 	    device_node-&gt;parent != acpi_gbl_root_node) {</div><div class='ctx'> 		ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname</div><div class='ctx'> 				(ACPI_TYPE_METHOD, device_node,</div><div class='head'>diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c<br/>index 289c15bb8c6a..370bbc867745 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsnames.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsnames.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsnames.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsnames.c</a></div><div class='hunk'>@@ -108,8 +108,8 @@ acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer)</div><div class='ctx'> 	/* Just copy the ACPI name from the Node and zero terminate it */</div><div class='ctx'> </div><div class='ctx'> 	node_name = acpi_ut_get_node_name(node);</div><div class='del'>-	ACPI_MOVE_NAME(buffer-&gt;pointer, node_name);</div><div class='del'>-	((char *)buffer-&gt;pointer)[ACPI_NAME_SIZE] = 0;</div><div class='add'>+	ACPI_COPY_NAMESEG(buffer-&gt;pointer, node_name);</div><div class='add'>+	((char *)buffer-&gt;pointer)[ACPI_NAMESEG_SIZE] = 0;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%4.4s\n", (char *)buffer-&gt;pointer));</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -198,7 +198,7 @@ acpi_ns_build_normalized_path(struct acpi_namespace_node *node,</div><div class='ctx'> 			      char *full_path, u32 path_size, u8 no_trailing)</div><div class='ctx'> {</div><div class='ctx'> 	u32 length = 0, i;</div><div class='del'>-	char name[ACPI_NAME_SIZE];</div><div class='add'>+	char name[ACPI_NAMESEG_SIZE];</div><div class='ctx'> 	u8 do_no_trailing;</div><div class='ctx'> 	char c, *left, *right;</div><div class='ctx'> 	struct acpi_namespace_node *next_node;</div><div class='hunk'>@@ -446,7 +446,7 @@ static void acpi_ns_normalize_pathname(char *original_path)</div><div class='ctx'> </div><div class='ctx'> 		/* Do one nameseg at a time */</div><div class='ctx'> </div><div class='del'>-		for (i = 0; (i &lt; ACPI_NAME_SIZE) &amp;&amp; *input_path; i++) {</div><div class='add'>+		for (i = 0; (i &lt; ACPI_NAMESEG_SIZE) &amp;&amp; *input_path; i++) {</div><div class='ctx'> 			if ((i == 0) || (*input_path != '_')) {	/* First char is allowed to be underscore */</div><div class='ctx'> 				*new_path = *input_path;</div><div class='ctx'> 				new_path++;</div><div class='head'>diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c<br/>index 8638f43cfc3d..79d86da1c892 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsobject.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsobject.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsobject.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsobject.c</a></div><div class='hunk'>@@ -186,6 +186,10 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (obj_desc-&gt;common.type == ACPI_TYPE_REGION) {</div><div class='add'>+		acpi_ut_remove_address_range(obj_desc-&gt;region.space_id, node);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Clear the Node entry in all cases */</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;object = NULL;</div><div class='head'>diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c<br/>index c0b4f7bedfab..f16cf5e4742c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsparse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsparse.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsparse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsparse.c</a></div><div class='hunk'>@@ -203,7 +203,7 @@ acpi_ns_one_complete_parse(u32 pass_number,</div><div class='ctx'> </div><div class='ctx'> 	/* Found OSDT table, enable the namespace override feature */</div><div class='ctx'> </div><div class='del'>-	if (ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_OSDT) &amp;&amp;</div><div class='add'>+	if (ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_OSDT) &amp;&amp;</div><div class='ctx'> 	    pass_number == ACPI_IMODE_LOAD_PASS1) {</div><div class='ctx'> 		walk_state-&gt;namespace_override = TRUE;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c<br/>index 0aacfa48e20d..be86fea8e4d4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsrepair.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsrepair.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsrepair.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsrepair.c</a></div><div class='hunk'>@@ -316,7 +316,7 @@ static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct</div><div class='ctx'> </div><div class='ctx'> 	this_name = acpi_object_repair_info;</div><div class='ctx'> 	while (this_name-&gt;object_converter) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(node-&gt;name.ascii, this_name-&gt;name)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(node-&gt;name.ascii, this_name-&gt;name)) {</div><div class='ctx'> </div><div class='ctx'> 			/* Check if we can actually repair this name/type combination */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c<br/>index d5804a6d1d65..8d776256b213 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsrepair2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsrepair2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsrepair2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsrepair2.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ acpi_status (*acpi_repair_function) (struct acpi_evaluate_info * info,</div><div class='ctx'> 				     return_object_ptr);</div><div class='ctx'> </div><div class='ctx'> typedef struct acpi_repair_info {</div><div class='del'>-	char name[ACPI_NAME_SIZE];</div><div class='add'>+	char name[ACPI_NAMESEG_SIZE];</div><div class='ctx'> 	acpi_repair_function repair_function;</div><div class='ctx'> </div><div class='ctx'> } acpi_repair_info;</div><div class='hunk'>@@ -188,7 +188,7 @@ static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct</div><div class='ctx'> </div><div class='ctx'> 	this_name = acpi_ns_repairable_names;</div><div class='ctx'> 	while (this_name-&gt;repair_function) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(node-&gt;name.ascii, this_name-&gt;name)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(node-&gt;name.ascii, this_name-&gt;name)) {</div><div class='ctx'> 			return (this_name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c<br/>index e5cef1edf49f..6bc90d46db5c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsutils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsutils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsutils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsutils.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info-&gt;length = (ACPI_NAME_SIZE * info-&gt;num_segments) +</div><div class='add'>+	info-&gt;length = (ACPI_NAMESEG_SIZE * info-&gt;num_segments) +</div><div class='ctx'> 	    4 + info-&gt;num_carats;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;next_external_char = next_external_char;</div><div class='hunk'>@@ -249,7 +249,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)</div><div class='ctx'> 	/* Build the name (minus path separators) */</div><div class='ctx'> </div><div class='ctx'> 	for (; num_segments; num_segments--) {</div><div class='del'>-		for (i = 0; i &lt; ACPI_NAME_SIZE; i++) {</div><div class='add'>+		for (i = 0; i &lt; ACPI_NAMESEG_SIZE; i++) {</div><div class='ctx'> 			if (ACPI_IS_PATH_SEPARATOR(*external_name) ||</div><div class='ctx'> 			    (*external_name == 0)) {</div><div class='ctx'> </div><div class='hunk'>@@ -274,7 +274,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)</div><div class='ctx'> 		/* Move on the next segment */</div><div class='ctx'> </div><div class='ctx'> 		external_name++;</div><div class='del'>-		result += ACPI_NAME_SIZE;</div><div class='add'>+		result += ACPI_NAMESEG_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Terminate the string */</div><div class='hunk'>@@ -489,12 +489,12 @@ acpi_ns_externalize_name(u32 internal_name_length,</div><div class='ctx'> </div><div class='ctx'> 			/* Copy and validate the 4-char name segment */</div><div class='ctx'> </div><div class='del'>-			ACPI_MOVE_NAME(&amp;(*converted_name)[j],</div><div class='del'>-				       &amp;internal_name[names_index]);</div><div class='add'>+			ACPI_COPY_NAMESEG(&amp;(*converted_name)[j],</div><div class='add'>+					  &amp;internal_name[names_index]);</div><div class='ctx'> 			acpi_ut_repair_name(&amp;(*converted_name)[j]);</div><div class='ctx'> </div><div class='del'>-			j += ACPI_NAME_SIZE;</div><div class='del'>-			names_index += ACPI_NAME_SIZE;</div><div class='add'>+			j += ACPI_NAMESEG_SIZE;</div><div class='add'>+			names_index += ACPI_NAMESEG_SIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c<br/>index de2d3135d6a9..55b4a5b3331f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsxfname.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/nsxfname.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/nsxfname.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/nsxfname.c</a></div><div class='hunk'>@@ -495,8 +495,8 @@ acpi_status acpi_install_method(u8 *buffer)</div><div class='ctx'> </div><div class='ctx'> 	/* Table must be a DSDT or SSDT */</div><div class='ctx'> </div><div class='del'>-	if (!ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_DSDT) &amp;&amp;</div><div class='del'>-	    !ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_SSDT)) {</div><div class='add'>+	if (!ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_DSDT) &amp;&amp;</div><div class='add'>+	    !ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_SSDT)) {</div><div class='ctx'> 		return (AE_BAD_HEADER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c<br/>index 9d9d442cd999..e62c7897fdf1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/psargs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/psargs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/psargs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/psargs.c</a></div><div class='hunk'>@@ -150,21 +150,21 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)</div><div class='ctx'> </div><div class='ctx'> 		/* Two name segments */</div><div class='ctx'> </div><div class='del'>-		end += 1 + (2 * ACPI_NAME_SIZE);</div><div class='add'>+		end += 1 + (2 * ACPI_NAMESEG_SIZE);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AML_MULTI_NAME_PREFIX:</div><div class='ctx'> </div><div class='ctx'> 		/* Multiple name segments, 4 chars each, count in next byte */</div><div class='ctx'> </div><div class='del'>-		end += 2 + (*(end + 1) * ACPI_NAME_SIZE);</div><div class='add'>+		end += 2 + (*(end + 1) * ACPI_NAMESEG_SIZE);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> </div><div class='ctx'> 		/* Single name segment */</div><div class='ctx'> </div><div class='del'>-		end += ACPI_NAME_SIZE;</div><div class='add'>+		end += ACPI_NAMESEG_SIZE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -522,7 +522,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state</div><div class='ctx'> </div><div class='ctx'> 		ACPI_MOVE_32_TO_32(&amp;name, parser_state-&gt;aml);</div><div class='ctx'> 		acpi_ps_set_name(field, name);</div><div class='del'>-		parser_state-&gt;aml += ACPI_NAME_SIZE;</div><div class='add'>+		parser_state-&gt;aml += ACPI_NAMESEG_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		ASL_CV_CAPTURE_COMMENTS_ONLY(parser_state);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c<br/>index 1d6f136e4068..c62be3d91712 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/rsxface.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/rsxface.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/rsxface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/rsxface.c</a></div><div class='hunk'>@@ -603,10 +603,10 @@ acpi_walk_resources(acpi_handle device_handle,</div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='ctx'> 	if (!device_handle || !user_function || !name ||</div><div class='del'>-	    (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &amp;&amp;</div><div class='del'>-	     !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) &amp;&amp;</div><div class='del'>-	     !ACPI_COMPARE_NAME(name, METHOD_NAME__AEI) &amp;&amp;</div><div class='del'>-	     !ACPI_COMPARE_NAME(name, METHOD_NAME__DMA))) {</div><div class='add'>+	    (!ACPI_COMPARE_NAMESEG(name, METHOD_NAME__CRS) &amp;&amp;</div><div class='add'>+	     !ACPI_COMPARE_NAMESEG(name, METHOD_NAME__PRS) &amp;&amp;</div><div class='add'>+	     !ACPI_COMPARE_NAMESEG(name, METHOD_NAME__AEI) &amp;&amp;</div><div class='add'>+	     !ACPI_COMPARE_NAMESEG(name, METHOD_NAME__DMA))) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c<br/>index 0cecd0039acf..933f81316ad2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbdata.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbdata.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbdata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbdata.c</a></div><div class='hunk'>@@ -480,7 +480,8 @@ acpi_tb_verify_temp_table(struct acpi_table_desc *table_desc,</div><div class='ctx'> </div><div class='ctx'> 	/* If a particular signature is expected (DSDT/FACS), it must match */</div><div class='ctx'> </div><div class='del'>-	if (signature &amp;&amp; !ACPI_COMPARE_NAME(&amp;table_desc-&gt;signature, signature)) {</div><div class='add'>+	if (signature &amp;&amp;</div><div class='add'>+	    !ACPI_COMPARE_NAMESEG(&amp;table_desc-&gt;signature, signature)) {</div><div class='ctx'> 		ACPI_BIOS_ERROR((AE_INFO,</div><div class='ctx'> 				 "Invalid signature 0x%X for ACPI table, expected [%s]",</div><div class='ctx'> 				 table_desc-&gt;signature.integer, signature));</div><div class='head'>diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c<br/>index 951bd8e1c50a..b2abb40023a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbfind.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbfind.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbfind.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbfind.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ acpi_tb_find_table(char *signature,</div><div class='ctx'> 	/* Normalize the input strings */</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;header, 0, sizeof(struct acpi_table_header));</div><div class='del'>-	ACPI_MOVE_NAME(header.signature, signature);</div><div class='add'>+	ACPI_COPY_NAMESEG(header.signature, signature);</div><div class='ctx'> 	strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);</div><div class='ctx'> 	strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +65,7 @@ acpi_tb_find_table(char *signature,</div><div class='ctx'> 	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> 	for (i = 0; i &lt; acpi_gbl_root_table_list.current_table_count; ++i) {</div><div class='ctx'> 		if (memcmp(&amp;(acpi_gbl_root_table_list.tables[i].signature),</div><div class='del'>-			   header.signature, ACPI_NAME_SIZE)) {</div><div class='add'>+			   header.signature, ACPI_NAMESEG_SIZE)) {</div><div class='ctx'> </div><div class='ctx'> 			/* Not the requested table */</div><div class='ctx'> </div><div class='hunk'>@@ -94,14 +94,14 @@ acpi_tb_find_table(char *signature,</div><div class='ctx'> </div><div class='ctx'> 		if (!memcmp</div><div class='ctx'> 		    (acpi_gbl_root_table_list.tables[i].pointer-&gt;signature,</div><div class='del'>-		     header.signature, ACPI_NAME_SIZE) &amp;&amp; (!oem_id[0]</div><div class='del'>-							   ||</div><div class='del'>-							   !memcmp</div><div class='del'>-							   (acpi_gbl_root_table_list.</div><div class='del'>-							    tables[i].pointer-&gt;</div><div class='del'>-							    oem_id,</div><div class='del'>-							    header.oem_id,</div><div class='del'>-							    ACPI_OEM_ID_SIZE))</div><div class='add'>+		     header.signature, ACPI_NAMESEG_SIZE) &amp;&amp; (!oem_id[0]</div><div class='add'>+							      ||</div><div class='add'>+							      !memcmp</div><div class='add'>+							      (acpi_gbl_root_table_list.</div><div class='add'>+							       tables[i].</div><div class='add'>+							       pointer-&gt;oem_id,</div><div class='add'>+							       header.oem_id,</div><div class='add'>+							       ACPI_OEM_ID_SIZE))</div><div class='ctx'> 		    &amp;&amp; (!oem_table_id[0]</div><div class='ctx'> 			|| !memcmp(acpi_gbl_root_table_list.tables[i].pointer-&gt;</div><div class='ctx'> 				   oem_table_id, header.oem_table_id,</div><div class='head'>diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c<br/>index be6642bf6366..ef1ffd36ab3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbinstal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbinstal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbinstal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbinstal.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!reload &amp;&amp;</div><div class='ctx'> 	    acpi_gbl_disable_ssdt_table_install &amp;&amp;</div><div class='del'>-	    ACPI_COMPARE_NAME(&amp;new_table_desc.signature, ACPI_SIG_SSDT)) {</div><div class='add'>+	    ACPI_COMPARE_NAMESEG(&amp;new_table_desc.signature, ACPI_SIG_SSDT)) {</div><div class='ctx'> 		ACPI_INFO(("Ignoring installation of %4.4s at %8.8X%8.8X",</div><div class='ctx'> 			   new_table_desc.signature.ascii,</div><div class='ctx'> 			   ACPI_FORMAT_UINT64(address)));</div><div class='head'>diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c<br/>index 9b5df95d881b..4764f849cb78 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbprint.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbprint.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbprint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbprint.c</a></div><div class='hunk'>@@ -69,10 +69,10 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(out_header, header, sizeof(struct acpi_table_header));</div><div class='ctx'> </div><div class='del'>-	acpi_tb_fix_string(out_header-&gt;signature, ACPI_NAME_SIZE);</div><div class='add'>+	acpi_tb_fix_string(out_header-&gt;signature, ACPI_NAMESEG_SIZE);</div><div class='ctx'> 	acpi_tb_fix_string(out_header-&gt;oem_id, ACPI_OEM_ID_SIZE);</div><div class='ctx'> 	acpi_tb_fix_string(out_header-&gt;oem_table_id, ACPI_OEM_TABLE_ID_SIZE);</div><div class='del'>-	acpi_tb_fix_string(out_header-&gt;asl_compiler_id, ACPI_NAME_SIZE);</div><div class='add'>+	acpi_tb_fix_string(out_header-&gt;asl_compiler_id, ACPI_NAMESEG_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -94,7 +94,7 @@ acpi_tb_print_table_header(acpi_physical_address address,</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_header local_header;</div><div class='ctx'> </div><div class='del'>-	if (ACPI_COMPARE_NAME(header-&gt;signature, ACPI_SIG_FACS)) {</div><div class='add'>+	if (ACPI_COMPARE_NAMESEG(header-&gt;signature, ACPI_SIG_FACS)) {</div><div class='ctx'> </div><div class='ctx'> 		/* FACS only has signature and length fields */</div><div class='ctx'> </div><div class='hunk'>@@ -158,8 +158,8 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)</div><div class='ctx'> 	 * They are the odd tables, have no standard ACPI header and no checksum</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_S3PT) ||</div><div class='del'>-	    ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_FACS)) {</div><div class='add'>+	if (ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_S3PT) ||</div><div class='add'>+	    ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_FACS)) {</div><div class='ctx'> 		return (AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c<br/>index 2469e01310e2..c5f0b8ec70cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbutils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbutils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbutils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbutils.c</a></div><div class='hunk'>@@ -332,9 +332,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)</div><div class='ctx'> 							&amp;table_index);</div><div class='ctx'> </div><div class='ctx'> 		if (ACPI_SUCCESS(status) &amp;&amp;</div><div class='del'>-		    ACPI_COMPARE_NAME(&amp;acpi_gbl_root_table_list.</div><div class='del'>-				      tables[table_index].signature,</div><div class='del'>-				      ACPI_SIG_FADT)) {</div><div class='add'>+		    ACPI_COMPARE_NAMESEG(&amp;acpi_gbl_root_table_list.</div><div class='add'>+					 tables[table_index].signature,</div><div class='add'>+					 ACPI_SIG_FADT)) {</div><div class='ctx'> 			acpi_gbl_fadt_index = table_index;</div><div class='ctx'> 			acpi_tb_parse_fadt();</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c<br/>index 36592888f0e7..1640685bf4ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbxface.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbxface.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbxface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbxface.c</a></div><div class='hunk'>@@ -230,7 +230,7 @@ acpi_get_table_header(char *signature,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; acpi_gbl_root_table_list.current_table_count;</div><div class='ctx'> 	     i++) {</div><div class='del'>-		if (!ACPI_COMPARE_NAME</div><div class='add'>+		if (!ACPI_COMPARE_NAMESEG</div><div class='ctx'> 		    (&amp;(acpi_gbl_root_table_list.tables[i].signature),</div><div class='ctx'> 		     signature)) {</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -323,7 +323,7 @@ acpi_get_table(char *signature,</div><div class='ctx'> 	     i++) {</div><div class='ctx'> 		table_desc = &amp;acpi_gbl_root_table_list.tables[i];</div><div class='ctx'> </div><div class='del'>-		if (!ACPI_COMPARE_NAME(&amp;table_desc-&gt;signature, signature)) {</div><div class='add'>+		if (!ACPI_COMPARE_NAMESEG(&amp;table_desc-&gt;signature, signature)) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c<br/>index 1a2592cc3245..4f30f06a6f78 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbxfload.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/tbxfload.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/tbxfload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/tbxfload.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ acpi_status acpi_tb_load_namespace(void)</div><div class='ctx'> 	table = &amp;acpi_gbl_root_table_list.tables[acpi_gbl_dsdt_index];</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_root_table_list.current_table_count ||</div><div class='del'>-	    !ACPI_COMPARE_NAME(table-&gt;signature.ascii, ACPI_SIG_DSDT) ||</div><div class='add'>+	    !ACPI_COMPARE_NAMESEG(table-&gt;signature.ascii, ACPI_SIG_DSDT) ||</div><div class='ctx'> 	    ACPI_FAILURE(acpi_tb_validate_table(table))) {</div><div class='ctx'> 		status = AE_NO_ACPI_TABLES;</div><div class='ctx'> 		goto unlock_and_exit;</div><div class='hunk'>@@ -170,11 +170,12 @@ acpi_status acpi_tb_load_namespace(void)</div><div class='ctx'> 		table = &amp;acpi_gbl_root_table_list.tables[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!table-&gt;address ||</div><div class='del'>-		    (!ACPI_COMPARE_NAME(table-&gt;signature.ascii, ACPI_SIG_SSDT)</div><div class='del'>-		     &amp;&amp; !ACPI_COMPARE_NAME(table-&gt;signature.ascii,</div><div class='del'>-					   ACPI_SIG_PSDT)</div><div class='del'>-		     &amp;&amp; !ACPI_COMPARE_NAME(table-&gt;signature.ascii,</div><div class='del'>-					   ACPI_SIG_OSDT))</div><div class='add'>+		    (!ACPI_COMPARE_NAMESEG</div><div class='add'>+		     (table-&gt;signature.ascii, ACPI_SIG_SSDT)</div><div class='add'>+		     &amp;&amp; !ACPI_COMPARE_NAMESEG(table-&gt;signature.ascii,</div><div class='add'>+					      ACPI_SIG_PSDT)</div><div class='add'>+		     &amp;&amp; !ACPI_COMPARE_NAMESEG(table-&gt;signature.ascii,</div><div class='add'>+					      ACPI_SIG_OSDT))</div><div class='ctx'> 		    || ACPI_FAILURE(acpi_tb_validate_table(table))) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -364,7 +365,7 @@ acpi_status acpi_unload_parent_table(acpi_handle object)</div><div class='ctx'> 		 * only these types can contain AML and thus are the only types</div><div class='ctx'> 		 * that can create namespace objects.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ACPI_COMPARE_NAME</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG</div><div class='ctx'> 		    (acpi_gbl_root_table_list.tables[i].signature.ascii,</div><div class='ctx'> 		     ACPI_SIG_DSDT)) {</div><div class='ctx'> 			status = AE_TYPE;</div><div class='head'>diff --git a/drivers/acpi/acpica/utascii.c b/drivers/acpi/acpica/utascii.c<br/>index 79d7426fd7bf..f6cd7d4f698b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utascii.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utascii.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utascii.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/utascii.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ u8 acpi_ut_valid_nameseg(char *name)</div><div class='ctx'> </div><div class='ctx'> 	/* Validate each character in the signature */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ACPI_NAME_SIZE; i++) {</div><div class='add'>+	for (i = 0; i &lt; ACPI_NAMESEG_SIZE; i++) {</div><div class='ctx'> 		if (!acpi_ut_valid_name_char(name[i], i)) {</div><div class='ctx'> 			return (FALSE);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c<br/>index ad9f77eb554f..65beaa237669 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utdecode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utdecode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utdecode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/utdecode.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {</div><div class='ctx'> 	"IPMI",			/* 0x07 */</div><div class='ctx'> 	"GeneralPurposeIo",	/* 0x08 */</div><div class='ctx'> 	"GenericSerialBus",	/* 0x09 */</div><div class='del'>-	"PCC"			/* 0x0A */</div><div class='add'>+	"PlatformCommChannel"	/* 0x0A */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const char *acpi_ut_get_region_name(u8 space_id)</div><div class='hunk'>@@ -239,7 +239,7 @@ const char *acpi_ut_get_node_name(void *object)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_namespace_node *node = (struct acpi_namespace_node *)object;</div><div class='ctx'> </div><div class='del'>-	/* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */</div><div class='add'>+	/* Must return a string of exactly 4 characters == ACPI_NAMESEG_SIZE */</div><div class='ctx'> </div><div class='ctx'> 	if (!object) {</div><div class='ctx'> 		return ("NULL");</div><div class='head'>diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c<br/>index afaadc73196b..8638efacdbf4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utmisc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utmisc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utmisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/utmisc.c</a></div><div class='hunk'>@@ -59,10 +59,10 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)</div><div class='ctx'> </div><div class='ctx'> 	/* These are the only tables that contain executable AML */</div><div class='ctx'> </div><div class='del'>-	if (ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_DSDT) ||</div><div class='del'>-	    ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_PSDT) ||</div><div class='del'>-	    ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_SSDT) ||</div><div class='del'>-	    ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_OSDT) ||</div><div class='add'>+	if (ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_DSDT) ||</div><div class='add'>+	    ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_PSDT) ||</div><div class='add'>+	    ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_SSDT) ||</div><div class='add'>+	    ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_OSDT) ||</div><div class='ctx'> 	    ACPI_IS_OEM_SIG(table-&gt;signature)) {</div><div class='ctx'> 		return (TRUE);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/utpredef.c b/drivers/acpi/acpica/utpredef.c<br/>index a9f08f43c685..1b0f68f5ed8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utpredef.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utpredef.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utpredef.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/utpredef.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name)</div><div class='ctx'> </div><div class='ctx'> 	this_name = acpi_gbl_predefined_methods;</div><div class='ctx'> 	while (this_name-&gt;info.name[0]) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(name, this_name-&gt;info.name)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(name, this_name-&gt;info.name)) {</div><div class='ctx'> 			return (this_name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +201,7 @@ const union acpi_predefined_info *acpi_ut_match_resource_name(char *name)</div><div class='ctx'> </div><div class='ctx'> 	this_name = acpi_gbl_resource_names;</div><div class='ctx'> 	while (this_name-&gt;info.name[0]) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(name, this_name-&gt;info.name)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(name, this_name-&gt;info.name)) {</div><div class='ctx'> 			return (this_name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c<br/>index 5bef0b059406..c39b5483045d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utstring.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/acpica/utstring.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/acpica/utstring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/acpica/utstring.c</a></div><div class='hunk'>@@ -141,15 +141,15 @@ void acpi_ut_repair_name(char *name)</div><div class='ctx'> 	 * Special case for the root node. This can happen if we get an</div><div class='ctx'> 	 * error during the execution of module-level code.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ACPI_COMPARE_NAME(name, ACPI_ROOT_PATHNAME)) {</div><div class='add'>+	if (ACPI_COMPARE_NAMESEG(name, ACPI_ROOT_PATHNAME)) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_MOVE_NAME(&amp;original_name, name);</div><div class='add'>+	ACPI_COPY_NAMESEG(&amp;original_name, name);</div><div class='ctx'> </div><div class='ctx'> 	/* Check each character in the name */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ACPI_NAME_SIZE; i++) {</div><div class='add'>+	for (i = 0; i &lt; ACPI_NAMESEG_SIZE; i++) {</div><div class='ctx'> 		if (acpi_ut_valid_name_char(name[i], i)) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c<br/>index e48894e002ba..adbf7cbedf80 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/arm64/iort.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/arm64/iort.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/arm64/iort.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/arm64/iort.c</a></div><div class='hunk'>@@ -356,7 +356,8 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,</div><div class='ctx'> 	if (map-&gt;flags &amp; ACPI_IORT_ID_SINGLE_MAPPING) {</div><div class='ctx'> 		if (node-&gt;type == ACPI_IORT_NODE_NAMED_COMPONENT ||</div><div class='ctx'> 		    node-&gt;type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX ||</div><div class='del'>-		    node-&gt;type == ACPI_IORT_NODE_SMMU_V3) {</div><div class='add'>+		    node-&gt;type == ACPI_IORT_NODE_SMMU_V3 ||</div><div class='add'>+		    node-&gt;type == ACPI_IORT_NODE_PMCG) {</div><div class='ctx'> 			*id_out = map-&gt;output_base;</div><div class='ctx'> 			return parent;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -394,6 +395,8 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return smmu-&gt;id_mapping_index;</div><div class='add'>+	case ACPI_IORT_NODE_PMCG:</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1218,32 +1221,47 @@ static void __init arm_smmu_v3_init_resources(struct resource *res,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __init arm_smmu_v3_is_coherent(struct acpi_iort_node *node)</div><div class='add'>+static void __init arm_smmu_v3_dma_configure(struct device *dev,</div><div class='add'>+					     struct acpi_iort_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_iort_smmu_v3 *smmu;</div><div class='add'>+	enum dev_dma_attr attr;</div><div class='ctx'> </div><div class='ctx'> 	/* Retrieve SMMUv3 specific data */</div><div class='ctx'> 	smmu = (struct acpi_iort_smmu_v3 *)node-&gt;node_data;</div><div class='ctx'> </div><div class='del'>-	return smmu-&gt;flags &amp; ACPI_IORT_SMMU_V3_COHACC_OVERRIDE;</div><div class='add'>+	attr = (smmu-&gt;flags &amp; ACPI_IORT_SMMU_V3_COHACC_OVERRIDE) ?</div><div class='add'>+			DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;</div><div class='add'>+</div><div class='add'>+	/* We expect the dma masks to be equivalent for all SMMUv3 set-ups */</div><div class='add'>+	dev-&gt;dma_mask = &amp;dev-&gt;coherent_dma_mask;</div><div class='add'>+</div><div class='add'>+	/* Configure DMA for the page table walker */</div><div class='add'>+	acpi_dma_configure(dev, attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ACPI_NUMA)</div><div class='ctx'> /*</div><div class='ctx'>  * set numa proximity domain for smmuv3 device</div><div class='ctx'>  */</div><div class='del'>-static void  __init arm_smmu_v3_set_proximity(struct device *dev,</div><div class='add'>+static int  __init arm_smmu_v3_set_proximity(struct device *dev,</div><div class='ctx'> 					      struct acpi_iort_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_iort_smmu_v3 *smmu;</div><div class='ctx'> </div><div class='ctx'> 	smmu = (struct acpi_iort_smmu_v3 *)node-&gt;node_data;</div><div class='ctx'> 	if (smmu-&gt;flags &amp; ACPI_IORT_SMMU_V3_PXM_VALID) {</div><div class='del'>-		set_dev_node(dev, acpi_map_pxm_to_node(smmu-&gt;pxm));</div><div class='add'>+		int node = acpi_map_pxm_to_node(smmu-&gt;pxm);</div><div class='add'>+</div><div class='add'>+		if (node != NUMA_NO_NODE &amp;&amp; !node_online(node))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		set_dev_node(dev, node);</div><div class='ctx'> 		pr_info("SMMU-v3[%llx] Mapped to Proximity domain %d\n",</div><div class='ctx'> 			smmu-&gt;base_address,</div><div class='ctx'> 			smmu-&gt;pxm);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define arm_smmu_v3_set_proximity NULL</div><div class='hunk'>@@ -1301,30 +1319,96 @@ static void __init arm_smmu_init_resources(struct resource *res,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __init arm_smmu_is_coherent(struct acpi_iort_node *node)</div><div class='add'>+static void __init arm_smmu_dma_configure(struct device *dev,</div><div class='add'>+					  struct acpi_iort_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_iort_smmu *smmu;</div><div class='add'>+	enum dev_dma_attr attr;</div><div class='ctx'> </div><div class='ctx'> 	/* Retrieve SMMU specific data */</div><div class='ctx'> 	smmu = (struct acpi_iort_smmu *)node-&gt;node_data;</div><div class='ctx'> </div><div class='del'>-	return smmu-&gt;flags &amp; ACPI_IORT_SMMU_COHERENT_WALK;</div><div class='add'>+	attr = (smmu-&gt;flags &amp; ACPI_IORT_SMMU_COHERENT_WALK) ?</div><div class='add'>+			DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;</div><div class='add'>+</div><div class='add'>+	/* We expect the dma masks to be equivalent for SMMU set-ups */</div><div class='add'>+	dev-&gt;dma_mask = &amp;dev-&gt;coherent_dma_mask;</div><div class='add'>+</div><div class='add'>+	/* Configure DMA for the page table walker */</div><div class='add'>+	acpi_dma_configure(dev, attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init arm_smmu_v3_pmcg_count_resources(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_pmcg *pmcg;</div><div class='add'>+</div><div class='add'>+	/* Retrieve PMCG specific data */</div><div class='add'>+	pmcg = (struct acpi_iort_pmcg *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There are always 2 memory resources.</div><div class='add'>+	 * If the overflow_gsiv is present then add that for a total of 3.</div><div class='add'>+	 */</div><div class='add'>+	return pmcg-&gt;overflow_gsiv ? 3 : 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init arm_smmu_v3_pmcg_init_resources(struct resource *res,</div><div class='add'>+						   struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_pmcg *pmcg;</div><div class='add'>+</div><div class='add'>+	/* Retrieve PMCG specific data */</div><div class='add'>+	pmcg = (struct acpi_iort_pmcg *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	res[0].start = pmcg-&gt;page0_base_address;</div><div class='add'>+	res[0].end = pmcg-&gt;page0_base_address + SZ_4K - 1;</div><div class='add'>+	res[0].flags = IORESOURCE_MEM;</div><div class='add'>+	res[1].start = pmcg-&gt;page1_base_address;</div><div class='add'>+	res[1].end = pmcg-&gt;page1_base_address + SZ_4K - 1;</div><div class='add'>+	res[1].flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	if (pmcg-&gt;overflow_gsiv)</div><div class='add'>+		acpi_iort_register_irq(pmcg-&gt;overflow_gsiv, "overflow",</div><div class='add'>+				       ACPI_EDGE_SENSITIVE, &amp;res[2]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct acpi_platform_list pmcg_plat_info[] __initdata = {</div><div class='add'>+	/* HiSilicon Hip08 Platform */</div><div class='add'>+	{"HISI  ", "HIP08   ", 0, ACPI_SIG_IORT, greater_than_or_equal,</div><div class='add'>+	 "Erratum #162001800", IORT_SMMU_V3_PMCG_HISI_HIP08},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init arm_smmu_v3_pmcg_add_platdata(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	u32 model;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = acpi_match_platform_list(pmcg_plat_info);</div><div class='add'>+	if (idx &gt;= 0)</div><div class='add'>+		model = pmcg_plat_info[idx].data;</div><div class='add'>+	else</div><div class='add'>+		model = IORT_SMMU_V3_PMCG_GENERIC;</div><div class='add'>+</div><div class='add'>+	return platform_device_add_data(pdev, &amp;model, sizeof(model));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iort_dev_config {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int (*dev_init)(struct acpi_iort_node *node);</div><div class='del'>-	bool (*dev_is_coherent)(struct acpi_iort_node *node);</div><div class='add'>+	void (*dev_dma_configure)(struct device *dev,</div><div class='add'>+				  struct acpi_iort_node *node);</div><div class='ctx'> 	int (*dev_count_resources)(struct acpi_iort_node *node);</div><div class='ctx'> 	void (*dev_init_resources)(struct resource *res,</div><div class='ctx'> 				     struct acpi_iort_node *node);</div><div class='del'>-	void (*dev_set_proximity)(struct device *dev,</div><div class='add'>+	int (*dev_set_proximity)(struct device *dev,</div><div class='ctx'> 				    struct acpi_iort_node *node);</div><div class='add'>+	int (*dev_add_platdata)(struct platform_device *pdev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = {</div><div class='ctx'> 	.name = "arm-smmu-v3",</div><div class='del'>-	.dev_is_coherent = arm_smmu_v3_is_coherent,</div><div class='add'>+	.dev_dma_configure = arm_smmu_v3_dma_configure,</div><div class='ctx'> 	.dev_count_resources = arm_smmu_v3_count_resources,</div><div class='ctx'> 	.dev_init_resources = arm_smmu_v3_init_resources,</div><div class='ctx'> 	.dev_set_proximity = arm_smmu_v3_set_proximity,</div><div class='hunk'>@@ -1332,9 +1416,16 @@ static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = {</div><div class='ctx'> </div><div class='ctx'> static const struct iort_dev_config iort_arm_smmu_cfg __initconst = {</div><div class='ctx'> 	.name = "arm-smmu",</div><div class='del'>-	.dev_is_coherent = arm_smmu_is_coherent,</div><div class='add'>+	.dev_dma_configure = arm_smmu_dma_configure,</div><div class='ctx'> 	.dev_count_resources = arm_smmu_count_resources,</div><div class='del'>-	.dev_init_resources = arm_smmu_init_resources</div><div class='add'>+	.dev_init_resources = arm_smmu_init_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iort_dev_config iort_arm_smmu_v3_pmcg_cfg __initconst = {</div><div class='add'>+	.name = "arm-smmu-v3-pmcg",</div><div class='add'>+	.dev_count_resources = arm_smmu_v3_pmcg_count_resources,</div><div class='add'>+	.dev_init_resources = arm_smmu_v3_pmcg_init_resources,</div><div class='add'>+	.dev_add_platdata = arm_smmu_v3_pmcg_add_platdata,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init const struct iort_dev_config *iort_get_dev_cfg(</div><div class='hunk'>@@ -1345,6 +1436,8 @@ static __init const struct iort_dev_config *iort_get_dev_cfg(</div><div class='ctx'> 		return &amp;iort_arm_smmu_v3_cfg;</div><div class='ctx'> 	case ACPI_IORT_NODE_SMMU:</div><div class='ctx'> 		return &amp;iort_arm_smmu_cfg;</div><div class='add'>+	case ACPI_IORT_NODE_PMCG:</div><div class='add'>+		return &amp;iort_arm_smmu_v3_pmcg_cfg;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1362,15 +1455,17 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,</div><div class='ctx'> 	struct fwnode_handle *fwnode;</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> 	struct resource *r;</div><div class='del'>-	enum dev_dma_attr attr;</div><div class='ctx'> 	int ret, count;</div><div class='ctx'> </div><div class='ctx'> 	pdev = platform_device_alloc(ops-&gt;name, PLATFORM_DEVID_AUTO);</div><div class='ctx'> 	if (!pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;dev_set_proximity)</div><div class='del'>-		ops-&gt;dev_set_proximity(&amp;pdev-&gt;dev, node);</div><div class='add'>+	if (ops-&gt;dev_set_proximity) {</div><div class='add'>+		ret = ops-&gt;dev_set_proximity(&amp;pdev-&gt;dev, node);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto dev_put;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	count = ops-&gt;dev_count_resources(node);</div><div class='ctx'> </div><div class='hunk'>@@ -1393,19 +1488,19 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,</div><div class='ctx'> 		goto dev_put;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Add a copy of IORT node pointer to platform_data to</div><div class='del'>-	 * be used to retrieve IORT data information.</div><div class='add'>+	 * Platform devices based on PMCG nodes uses platform_data to</div><div class='add'>+	 * pass the hardware model info to the driver. For others, add</div><div class='add'>+	 * a copy of IORT node pointer to platform_data to be used to</div><div class='add'>+	 * retrieve IORT data information.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = platform_device_add_data(pdev, &amp;node, sizeof(node));</div><div class='add'>+	if (ops-&gt;dev_add_platdata)</div><div class='add'>+		ret = ops-&gt;dev_add_platdata(pdev);</div><div class='add'>+	else</div><div class='add'>+		ret = platform_device_add_data(pdev, &amp;node, sizeof(node));</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto dev_put;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We expect the dma masks to be equivalent for</div><div class='del'>-	 * all SMMUs set-ups</div><div class='del'>-	 */</div><div class='del'>-	pdev-&gt;dev.dma_mask = &amp;pdev-&gt;dev.coherent_dma_mask;</div><div class='del'>-</div><div class='ctx'> 	fwnode = iort_get_fwnode(node);</div><div class='ctx'> </div><div class='ctx'> 	if (!fwnode) {</div><div class='hunk'>@@ -1415,11 +1510,8 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;dev.fwnode = fwnode;</div><div class='ctx'> </div><div class='del'>-	attr = ops-&gt;dev_is_coherent &amp;&amp; ops-&gt;dev_is_coherent(node) ?</div><div class='del'>-			DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;</div><div class='del'>-</div><div class='del'>-	/* Configure DMA for the page table walker */</div><div class='del'>-	acpi_dma_configure(&amp;pdev-&gt;dev, attr);</div><div class='add'>+	if (ops-&gt;dev_dma_configure)</div><div class='add'>+		ops-&gt;dev_dma_configure(&amp;pdev-&gt;dev, node);</div><div class='ctx'> </div><div class='ctx'> 	iort_set_device_domain(&amp;pdev-&gt;dev, node);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c<br/>index 6ecbbabf1233..eec263c9019e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/bus.c</a></div><div class='hunk'>@@ -1043,9 +1043,6 @@ void __init acpi_early_init(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_permanent_mmap = true;</div><div class='ctx'> </div><div class='del'>-	/* Initialize debug output. Linux does not use ACPICA defaults */</div><div class='del'>-	acpi_dbg_level = ACPI_LV_INFO | ACPI_LV_REPAIR;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the machine falls into the DMI check table,</div><div class='head'>diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c<br/>index a19ff3977ac4..623998a8d722 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/button.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/button.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/button.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/button.c</a></div><div class='hunk'>@@ -456,8 +456,11 @@ static int acpi_button_resume(struct device *dev)</div><div class='ctx'> 	struct acpi_button *button = acpi_driver_data(device);</div><div class='ctx'> </div><div class='ctx'> 	button-&gt;suspended = false;</div><div class='del'>-	if (button-&gt;type == ACPI_BUTTON_TYPE_LID &amp;&amp; button-&gt;input-&gt;users)</div><div class='add'>+	if (button-&gt;type == ACPI_BUTTON_TYPE_LID &amp;&amp; button-&gt;input-&gt;users) {</div><div class='add'>+		button-&gt;last_state = !!acpi_lid_evaluate_state(device);</div><div class='add'>+		button-&gt;last_time = ktime_get();</div><div class='ctx'> 		acpi_lid_initialize_state(device);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c<br/>index 1b207fca1420..653642a4cbdd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/cppc_acpi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/cppc_acpi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/cppc_acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/cppc_acpi.c</a></div><div class='hunk'>@@ -81,9 +81,9 @@ struct cppc_pcc_data {</div><div class='ctx'> 	int refcount;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Array  to represent the PCC channel per subspace id */</div><div class='add'>+/* Array to represent the PCC channel per subspace ID */</div><div class='ctx'> static struct cppc_pcc_data *pcc_data[MAX_PCC_SUBSPACES];</div><div class='del'>-/* The cpu_pcc_subspace_idx containsper CPU subspace id */</div><div class='add'>+/* The cpu_pcc_subspace_idx contains per CPU subspace ID */</div><div class='ctx'> static DEFINE_PER_CPU(int, cpu_pcc_subspace_idx);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -436,7 +436,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Now that we have _PSD data from all CPUs, lets setup P-state</div><div class='add'>+	 * Now that we have _PSD data from all CPUs, let's setup P-state</div><div class='ctx'> 	 * domain info.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='hunk'>@@ -588,7 +588,7 @@ static int register_pcc_channel(int pcc_ss_idx)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Set flag so that we dont come here for each CPU. */</div><div class='add'>+		/* Set flag so that we don't come here for each CPU. */</div><div class='ctx'> 		pcc_data[pcc_ss_idx]-&gt;pcc_channel_acquired = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -613,7 +613,7 @@ bool __weak cpc_ffh_supported(void)</div><div class='ctx'>  *</div><div class='ctx'>  * Check and allocate the cppc_pcc_data memory.</div><div class='ctx'>  * In some processor configurations it is possible that same subspace</div><div class='del'>- * is shared between multiple CPU's. This is seen especially in CPU's</div><div class='add'>+ * is shared between multiple CPUs. This is seen especially in CPUs</div><div class='ctx'>  * with hardware multi-threading support.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 for success, errno for failure</div><div class='hunk'>@@ -711,7 +711,7 @@ static bool is_cppc_supported(int revision, int num_ent)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * acpi_cppc_processor_probe - Search for per CPU _CPC objects.</div><div class='del'>- * @pr: Ptr to acpi_processor containing this CPUs logical Id.</div><div class='add'>+ * @pr: Ptr to acpi_processor containing this CPU's logical ID.</div><div class='ctx'>  *</div><div class='ctx'>  *	Return: 0 for success or negative value for err.</div><div class='ctx'>  */</div><div class='hunk'>@@ -728,7 +728,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	int ret = -EFAULT;</div><div class='ctx'> </div><div class='del'>-	/* Parse the ACPI _CPC table for this cpu. */</div><div class='add'>+	/* Parse the ACPI _CPC table for this CPU. */</div><div class='ctx'> 	status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &amp;output,</div><div class='ctx'> 			ACPI_TYPE_PACKAGE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -840,7 +840,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	/* Register PCC channel once for all PCC subspace id. */</div><div class='add'>+	/* Register PCC channel once for all PCC subspace ID. */</div><div class='ctx'> 	if (pcc_subspace_id &gt;= 0 &amp;&amp; !pcc_data[pcc_subspace_id]-&gt;pcc_channel_acquired) {</div><div class='ctx'> 		ret = register_pcc_channel(pcc_subspace_id);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -860,7 +860,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Plug PSD data into this CPUs CPC descriptor. */</div><div class='add'>+	/* Plug PSD data into this CPU's CPC descriptor. */</div><div class='ctx'> 	per_cpu(cpc_desc_ptr, pr-&gt;id) = cpc_ptr;</div><div class='ctx'> </div><div class='ctx'> 	ret = kobject_init_and_add(&amp;cpc_ptr-&gt;kobj, &amp;cppc_ktype, &amp;cpu_dev-&gt;kobj,</div><div class='hunk'>@@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(acpi_cppc_processor_probe);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * acpi_cppc_processor_exit - Cleanup CPC structs.</div><div class='del'>- * @pr: Ptr to acpi_processor containing this CPUs logical Id.</div><div class='add'>+ * @pr: Ptr to acpi_processor containing this CPU's logical ID.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Void</div><div class='ctx'>  */</div><div class='hunk'>@@ -931,7 +931,7 @@ EXPORT_SYMBOL_GPL(acpi_cppc_processor_exit);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpc_read_ffh() - Read FFH register</div><div class='del'>- * @cpunum:	cpu number to read</div><div class='add'>+ * @cpunum:	CPU number to read</div><div class='ctx'>  * @reg:	cppc register information</div><div class='ctx'>  * @val:	place holder for return value</div><div class='ctx'>  *</div><div class='hunk'>@@ -946,7 +946,7 @@ int __weak cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpc_write_ffh() - Write FFH register</div><div class='del'>- * @cpunum:	cpu number to write</div><div class='add'>+ * @cpunum:	CPU number to write</div><div class='ctx'>  * @reg:	cppc register information</div><div class='ctx'>  * @val:	value to write</div><div class='ctx'>  *</div><div class='hunk'>@@ -1093,7 +1093,7 @@ int cppc_get_desired_perf(int cpunum, u64 *desired_perf)</div><div class='ctx'> EXPORT_SYMBOL_GPL(cppc_get_desired_perf);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cppc_get_perf_caps - Get a CPUs performance capabilities.</div><div class='add'>+ * cppc_get_perf_caps - Get a CPU's performance capabilities.</div><div class='ctx'>  * @cpunum: CPU from which to get capabilities info.</div><div class='ctx'>  * @perf_caps: ptr to cppc_perf_caps. See cppc_acpi.h</div><div class='ctx'>  *</div><div class='hunk'>@@ -1150,8 +1150,13 @@ int cppc_get_perf_caps(int cpunum, struct cppc_perf_caps *perf_caps)</div><div class='ctx'> 	cpc_read(cpunum, nominal_reg, &amp;nom);</div><div class='ctx'> 	perf_caps-&gt;nominal_perf = nom;</div><div class='ctx'> </div><div class='del'>-	cpc_read(cpunum, guaranteed_reg, &amp;guaranteed);</div><div class='del'>-	perf_caps-&gt;guaranteed_perf = guaranteed;</div><div class='add'>+	if (guaranteed_reg-&gt;type != ACPI_TYPE_BUFFER  ||</div><div class='add'>+	    IS_NULL_REG(&amp;guaranteed_reg-&gt;cpc_entry.reg)) {</div><div class='add'>+		perf_caps-&gt;guaranteed_perf = 0;</div><div class='add'>+	} else {</div><div class='add'>+		cpc_read(cpunum, guaranteed_reg, &amp;guaranteed);</div><div class='add'>+		perf_caps-&gt;guaranteed_perf = guaranteed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cpc_read(cpunum, lowest_non_linear_reg, &amp;min_nonlinear);</div><div class='ctx'> 	perf_caps-&gt;lowest_nonlinear_perf = min_nonlinear;</div><div class='hunk'>@@ -1178,7 +1183,7 @@ out_err:</div><div class='ctx'> EXPORT_SYMBOL_GPL(cppc_get_perf_caps);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cppc_get_perf_ctrs - Read a CPUs performance feedback counters.</div><div class='add'>+ * cppc_get_perf_ctrs - Read a CPU's performance feedback counters.</div><div class='ctx'>  * @cpunum: CPU from which to read counters.</div><div class='ctx'>  * @perf_fb_ctrs: ptr to cppc_perf_fb_ctrs. See cppc_acpi.h</div><div class='ctx'>  *</div><div class='hunk'>@@ -1205,7 +1210,7 @@ int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs)</div><div class='ctx'> 	ctr_wrap_reg = &amp;cpc_desc-&gt;cpc_regs[CTR_WRAP_TIME];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If refernce perf register is not supported then we should</div><div class='add'>+	 * If reference perf register is not supported then we should</div><div class='ctx'> 	 * use the nominal perf value</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!CPC_SUPPORTED(ref_perf_reg))</div><div class='hunk'>@@ -1258,7 +1263,7 @@ out_err:</div><div class='ctx'> EXPORT_SYMBOL_GPL(cppc_get_perf_ctrs);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cppc_set_perf - Set a CPUs performance controls.</div><div class='add'>+ * cppc_set_perf - Set a CPU's performance controls.</div><div class='ctx'>  * @cpu: CPU for which to set performance controls.</div><div class='ctx'>  * @perf_ctrls: ptr to cppc_perf_ctrls. See cppc_acpi.h</div><div class='ctx'>  *</div><div class='hunk'>@@ -1339,7 +1344,7 @@ int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls)</div><div class='ctx'> 	 * executing the Phase-II.</div><div class='ctx'> 	 *     2. Some other CPU has beaten this CPU to successfully execute the</div><div class='ctx'> 	 * write_trylock and has already acquired the write_lock. We know for a</div><div class='del'>-	 * fact it(other CPU acquiring the write_lock) couldn't have happened</div><div class='add'>+	 * fact it (other CPU acquiring the write_lock) couldn't have happened</div><div class='ctx'> 	 * before this CPU's Phase-I as we held the read_lock.</div><div class='ctx'> 	 *     3. Some other CPU executing pcc CMD_READ has stolen the</div><div class='ctx'> 	 * down_write, in which case, send_pcc_cmd will check for pending</div><div class='head'>diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c<br/>index 824ae985ad93..b859d75eaf9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/device_pm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/device_pm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/device_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/device_pm.c</a></div><div class='hunk'>@@ -414,7 +414,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used)</div><div class='ctx'> 	if (adev-&gt;wakeup.flags.notifier_present) {</div><div class='ctx'> 		pm_wakeup_ws_event(adev-&gt;wakeup.ws, 0, acpi_s2idle_wakeup());</div><div class='ctx'> 		if (adev-&gt;wakeup.context.func) {</div><div class='del'>-			acpi_handle_debug(handle, "Running %pF for %s\n",</div><div class='add'>+			acpi_handle_debug(handle, "Running %pS for %s\n",</div><div class='ctx'> 					  adev-&gt;wakeup.context.func,</div><div class='ctx'> 					  dev_name(adev-&gt;wakeup.context.dev));</div><div class='ctx'> 			adev-&gt;wakeup.context.func(&amp;adev-&gt;wakeup.context);</div><div class='hunk'>@@ -728,6 +728,9 @@ static int __acpi_device_wakeup_enable(struct acpi_device *adev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	acpi_handle_debug(adev-&gt;handle, "GPE%2X enabled for wakeup\n",</div><div class='add'>+			  (unsigned int)wakeup-&gt;gpe_number);</div><div class='add'>+</div><div class='ctx'> inc:</div><div class='ctx'> 	wakeup-&gt;enable_count++;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c<br/>index e1c242568341..0c081390930a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/dptf/dptf_power.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/dptf/dptf_power.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/dptf/dptf_power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/dptf/dptf_power.c</a></div><div class='hunk'>@@ -31,8 +31,7 @@ static ssize_t name##_show(struct device *dev,\</div><div class='ctx'> 			   struct device_attribute *attr,\</div><div class='ctx'> 			   char *buf)\</div><div class='ctx'> {\</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);\</div><div class='del'>-	struct acpi_device *acpi_dev = platform_get_drvdata(pdev);\</div><div class='add'>+	struct acpi_device *acpi_dev = dev_get_drvdata(dev);\</div><div class='ctx'> 	unsigned long long val;\</div><div class='ctx'> 	acpi_status status;\</div><div class='ctx'> \</div><div class='head'>diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c<br/>index 5a127f3f2d5c..47f21599f2ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/event.c</a></div><div class='hunk'>@@ -131,8 +131,8 @@ int acpi_bus_generate_netlink_event(const char *device_class,</div><div class='ctx'> 	event = nla_data(attr);</div><div class='ctx'> 	memset(event, 0, sizeof(struct acpi_genl_event));</div><div class='ctx'> </div><div class='del'>-	strcpy(event-&gt;device_class, device_class);</div><div class='del'>-	strcpy(event-&gt;bus_id, bus_id);</div><div class='add'>+	strscpy(event-&gt;device_class, device_class, sizeof(event-&gt;device_class));</div><div class='add'>+	strscpy(event-&gt;bus_id, bus_id, sizeof(event-&gt;bus_id));</div><div class='ctx'> 	event-&gt;type = type;</div><div class='ctx'> 	event-&gt;data = data;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/hmat/Kconfig b/drivers/acpi/hmat/Kconfig<br/>new file mode 100644<br/>index 000000000000..95a29964dbea<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/hmat/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/hmat/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 ACPI_HMAT</div><div class='add'>+	bool "ACPI Heterogeneous Memory Attribute Table Support"</div><div class='add'>+	depends on ACPI_NUMA</div><div class='add'>+	select HMEM_REPORTING</div><div class='add'>+	help</div><div class='add'>+	 If set, this option has the kernel parse and report the</div><div class='add'>+	 platform's ACPI HMAT (Heterogeneous Memory Attributes Table),</div><div class='add'>+	 register memory initiators with their targets, and export</div><div class='add'>+	 performance attributes through the node's sysfs device if</div><div class='add'>+	 provided.</div><div class='head'>diff --git a/drivers/acpi/hmat/Makefile b/drivers/acpi/hmat/Makefile<br/>new file mode 100644<br/>index 000000000000..e909051d3d00<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/hmat/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/hmat/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_ACPI_HMAT) := hmat.o</div><div class='head'>diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/hmat/hmat.c<br/>new file mode 100644<br/>index 000000000000..96b7d39a97c6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/hmat/hmat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/hmat/hmat.c</a></div><div class='hunk'>@@ -0,0 +1,666 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019, Intel Corporation.</div><div class='add'>+ *</div><div class='add'>+ * Heterogeneous Memory Attributes Table (HMAT) representation</div><div class='add'>+ *</div><div class='add'>+ * This program parses and reports the platform's HMAT tables, and registers</div><div class='add'>+ * the applicable attributes with the node's interfaces.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/list_sort.h&gt;</div><div class='add'>+#include &lt;linux/node.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+</div><div class='add'>+static __initdata u8 hmat_revision;</div><div class='add'>+</div><div class='add'>+static __initdata LIST_HEAD(targets);</div><div class='add'>+static __initdata LIST_HEAD(initiators);</div><div class='add'>+static __initdata LIST_HEAD(localities);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The defined enum order is used to prioritize attributes to break ties when</div><div class='add'>+ * selecting the best performing node.</div><div class='add'>+ */</div><div class='add'>+enum locality_types {</div><div class='add'>+	WRITE_LATENCY,</div><div class='add'>+	READ_LATENCY,</div><div class='add'>+	WRITE_BANDWIDTH,</div><div class='add'>+	READ_BANDWIDTH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct memory_locality *localities_types[4];</div><div class='add'>+</div><div class='add'>+struct memory_target {</div><div class='add'>+	struct list_head node;</div><div class='add'>+	unsigned int memory_pxm;</div><div class='add'>+	unsigned int processor_pxm;</div><div class='add'>+	struct node_hmem_attrs hmem_attrs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct memory_initiator {</div><div class='add'>+	struct list_head node;</div><div class='add'>+	unsigned int processor_pxm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct memory_locality {</div><div class='add'>+	struct list_head node;</div><div class='add'>+	struct acpi_hmat_locality *hmat_loc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init struct memory_initiator *find_mem_initiator(unsigned int cpu_pxm)</div><div class='add'>+{</div><div class='add'>+	struct memory_initiator *initiator;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(initiator, &amp;initiators, node)</div><div class='add'>+		if (initiator-&gt;processor_pxm == cpu_pxm)</div><div class='add'>+			return initiator;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init struct memory_target *find_mem_target(unsigned int mem_pxm)</div><div class='add'>+{</div><div class='add'>+	struct memory_target *target;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(target, &amp;targets, node)</div><div class='add'>+		if (target-&gt;memory_pxm == mem_pxm)</div><div class='add'>+			return target;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void alloc_memory_initiator(unsigned int cpu_pxm)</div><div class='add'>+{</div><div class='add'>+	struct memory_initiator *initiator;</div><div class='add'>+</div><div class='add'>+	if (pxm_to_node(cpu_pxm) == NUMA_NO_NODE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	initiator = find_mem_initiator(cpu_pxm);</div><div class='add'>+	if (initiator)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	initiator = kzalloc(sizeof(*initiator), GFP_KERNEL);</div><div class='add'>+	if (!initiator)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	initiator-&gt;processor_pxm = cpu_pxm;</div><div class='add'>+	list_add_tail(&amp;initiator-&gt;node, &amp;initiators);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void alloc_memory_target(unsigned int mem_pxm)</div><div class='add'>+{</div><div class='add'>+	struct memory_target *target;</div><div class='add'>+</div><div class='add'>+	if (pxm_to_node(mem_pxm) == NUMA_NO_NODE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	target = find_mem_target(mem_pxm);</div><div class='add'>+	if (target)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	target = kzalloc(sizeof(*target), GFP_KERNEL);</div><div class='add'>+	if (!target)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	target-&gt;memory_pxm = mem_pxm;</div><div class='add'>+	target-&gt;processor_pxm = PXM_INVAL;</div><div class='add'>+	list_add_tail(&amp;target-&gt;node, &amp;targets);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init const char *hmat_data_type(u8 type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACPI_HMAT_ACCESS_LATENCY:</div><div class='add'>+		return "Access Latency";</div><div class='add'>+	case ACPI_HMAT_READ_LATENCY:</div><div class='add'>+		return "Read Latency";</div><div class='add'>+	case ACPI_HMAT_WRITE_LATENCY:</div><div class='add'>+		return "Write Latency";</div><div class='add'>+	case ACPI_HMAT_ACCESS_BANDWIDTH:</div><div class='add'>+		return "Access Bandwidth";</div><div class='add'>+	case ACPI_HMAT_READ_BANDWIDTH:</div><div class='add'>+		return "Read Bandwidth";</div><div class='add'>+	case ACPI_HMAT_WRITE_BANDWIDTH:</div><div class='add'>+		return "Write Bandwidth";</div><div class='add'>+	default:</div><div class='add'>+		return "Reserved";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init const char *hmat_data_type_suffix(u8 type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACPI_HMAT_ACCESS_LATENCY:</div><div class='add'>+	case ACPI_HMAT_READ_LATENCY:</div><div class='add'>+	case ACPI_HMAT_WRITE_LATENCY:</div><div class='add'>+		return " nsec";</div><div class='add'>+	case ACPI_HMAT_ACCESS_BANDWIDTH:</div><div class='add'>+	case ACPI_HMAT_READ_BANDWIDTH:</div><div class='add'>+	case ACPI_HMAT_WRITE_BANDWIDTH:</div><div class='add'>+		return " MB/s";</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 __init u32 hmat_normalize(u16 entry, u64 base, u8 type)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for invalid and overflow values</div><div class='add'>+	 */</div><div class='add'>+	if (entry == 0xffff || !entry)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (base &gt; (UINT_MAX / (entry)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Divide by the base unit for version 1, convert latency from</div><div class='add'>+	 * picosenonds to nanoseconds if revision 2.</div><div class='add'>+	 */</div><div class='add'>+	value = entry * base;</div><div class='add'>+	if (hmat_revision == 1) {</div><div class='add'>+		if (value &lt; 10)</div><div class='add'>+			return 0;</div><div class='add'>+		value = DIV_ROUND_UP(value, 10);</div><div class='add'>+	} else if (hmat_revision == 2) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case ACPI_HMAT_ACCESS_LATENCY:</div><div class='add'>+		case ACPI_HMAT_READ_LATENCY:</div><div class='add'>+		case ACPI_HMAT_WRITE_LATENCY:</div><div class='add'>+			value = DIV_ROUND_UP(value, 1000);</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 value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void hmat_update_target_access(struct memory_target *target,</div><div class='add'>+					     u8 type, u32 value)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACPI_HMAT_ACCESS_LATENCY:</div><div class='add'>+		target-&gt;hmem_attrs.read_latency = value;</div><div class='add'>+		target-&gt;hmem_attrs.write_latency = value;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_READ_LATENCY:</div><div class='add'>+		target-&gt;hmem_attrs.read_latency = value;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_WRITE_LATENCY:</div><div class='add'>+		target-&gt;hmem_attrs.write_latency = value;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_ACCESS_BANDWIDTH:</div><div class='add'>+		target-&gt;hmem_attrs.read_bandwidth = value;</div><div class='add'>+		target-&gt;hmem_attrs.write_bandwidth = value;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_READ_BANDWIDTH:</div><div class='add'>+		target-&gt;hmem_attrs.read_bandwidth = value;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_WRITE_BANDWIDTH:</div><div class='add'>+		target-&gt;hmem_attrs.write_bandwidth = value;</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 __init void hmat_add_locality(struct acpi_hmat_locality *hmat_loc)</div><div class='add'>+{</div><div class='add'>+	struct memory_locality *loc;</div><div class='add'>+</div><div class='add'>+	loc = kzalloc(sizeof(*loc), GFP_KERNEL);</div><div class='add'>+	if (!loc) {</div><div class='add'>+		pr_notice_once("Failed to allocate HMAT locality\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loc-&gt;hmat_loc = hmat_loc;</div><div class='add'>+	list_add_tail(&amp;loc-&gt;node, &amp;localities);</div><div class='add'>+</div><div class='add'>+	switch (hmat_loc-&gt;data_type) {</div><div class='add'>+	case ACPI_HMAT_ACCESS_LATENCY:</div><div class='add'>+		localities_types[READ_LATENCY] = loc;</div><div class='add'>+		localities_types[WRITE_LATENCY] = loc;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_READ_LATENCY:</div><div class='add'>+		localities_types[READ_LATENCY] = loc;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_WRITE_LATENCY:</div><div class='add'>+		localities_types[WRITE_LATENCY] = loc;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_ACCESS_BANDWIDTH:</div><div class='add'>+		localities_types[READ_BANDWIDTH] = loc;</div><div class='add'>+		localities_types[WRITE_BANDWIDTH] = loc;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_READ_BANDWIDTH:</div><div class='add'>+		localities_types[READ_BANDWIDTH] = loc;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_WRITE_BANDWIDTH:</div><div class='add'>+		localities_types[WRITE_BANDWIDTH] = loc;</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 __init int hmat_parse_locality(union acpi_subtable_headers *header,</div><div class='add'>+				      const unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct acpi_hmat_locality *hmat_loc = (void *)header;</div><div class='add'>+	struct memory_target *target;</div><div class='add'>+	unsigned int init, targ, total_size, ipds, tpds;</div><div class='add'>+	u32 *inits, *targs, value;</div><div class='add'>+	u16 *entries;</div><div class='add'>+	u8 type, mem_hier;</div><div class='add'>+</div><div class='add'>+	if (hmat_loc-&gt;header.length &lt; sizeof(*hmat_loc)) {</div><div class='add'>+		pr_notice("HMAT: Unexpected locality header length: %d\n",</div><div class='add'>+			 hmat_loc-&gt;header.length);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	type = hmat_loc-&gt;data_type;</div><div class='add'>+	mem_hier = hmat_loc-&gt;flags &amp; ACPI_HMAT_MEMORY_HIERARCHY;</div><div class='add'>+	ipds = hmat_loc-&gt;number_of_initiator_Pds;</div><div class='add'>+	tpds = hmat_loc-&gt;number_of_target_Pds;</div><div class='add'>+	total_size = sizeof(*hmat_loc) + sizeof(*entries) * ipds * tpds +</div><div class='add'>+		     sizeof(*inits) * ipds + sizeof(*targs) * tpds;</div><div class='add'>+	if (hmat_loc-&gt;header.length &lt; total_size) {</div><div class='add'>+		pr_notice("HMAT: Unexpected locality header length:%d, minimum required:%d\n",</div><div class='add'>+			 hmat_loc-&gt;header.length, total_size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("HMAT: Locality: Flags:%02x Type:%s Initiator Domains:%d Target Domains:%d Base:%lld\n",</div><div class='add'>+		hmat_loc-&gt;flags, hmat_data_type(type), ipds, tpds,</div><div class='add'>+		hmat_loc-&gt;entry_base_unit);</div><div class='add'>+</div><div class='add'>+	inits = (u32 *)(hmat_loc + 1);</div><div class='add'>+	targs = inits + ipds;</div><div class='add'>+	entries = (u16 *)(targs + tpds);</div><div class='add'>+	for (init = 0; init &lt; ipds; init++) {</div><div class='add'>+		alloc_memory_initiator(inits[init]);</div><div class='add'>+		for (targ = 0; targ &lt; tpds; targ++) {</div><div class='add'>+			value = hmat_normalize(entries[init * tpds + targ],</div><div class='add'>+					       hmat_loc-&gt;entry_base_unit,</div><div class='add'>+					       type);</div><div class='add'>+			pr_info("  Initiator-Target[%d-%d]:%d%s\n",</div><div class='add'>+				inits[init], targs[targ], value,</div><div class='add'>+				hmat_data_type_suffix(type));</div><div class='add'>+</div><div class='add'>+			if (mem_hier == ACPI_HMAT_MEMORY) {</div><div class='add'>+				target = find_mem_target(targs[targ]);</div><div class='add'>+				if (target &amp;&amp; target-&gt;processor_pxm == inits[init])</div><div class='add'>+					hmat_update_target_access(target, type, value);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mem_hier == ACPI_HMAT_MEMORY)</div><div class='add'>+		hmat_add_locality(hmat_loc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int hmat_parse_cache(union acpi_subtable_headers *header,</div><div class='add'>+				   const unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct acpi_hmat_cache *cache = (void *)header;</div><div class='add'>+	struct node_cache_attrs cache_attrs;</div><div class='add'>+	u32 attrs;</div><div class='add'>+</div><div class='add'>+	if (cache-&gt;header.length &lt; sizeof(*cache)) {</div><div class='add'>+		pr_notice("HMAT: Unexpected cache header length: %d\n",</div><div class='add'>+			 cache-&gt;header.length);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attrs = cache-&gt;cache_attributes;</div><div class='add'>+	pr_info("HMAT: Cache: Domain:%d Size:%llu Attrs:%08x SMBIOS Handles:%d\n",</div><div class='add'>+		cache-&gt;memory_PD, cache-&gt;cache_size, attrs,</div><div class='add'>+		cache-&gt;number_of_SMBIOShandles);</div><div class='add'>+</div><div class='add'>+	cache_attrs.size = cache-&gt;cache_size;</div><div class='add'>+	cache_attrs.level = (attrs &amp; ACPI_HMAT_CACHE_LEVEL) &gt;&gt; 4;</div><div class='add'>+	cache_attrs.line_size = (attrs &amp; ACPI_HMAT_CACHE_LINE_SIZE) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	switch ((attrs &amp; ACPI_HMAT_CACHE_ASSOCIATIVITY) &gt;&gt; 8) {</div><div class='add'>+	case ACPI_HMAT_CA_DIRECT_MAPPED:</div><div class='add'>+		cache_attrs.indexing = NODE_CACHE_DIRECT_MAP;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_CA_COMPLEX_CACHE_INDEXING:</div><div class='add'>+		cache_attrs.indexing = NODE_CACHE_INDEXED;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_CA_NONE:</div><div class='add'>+	default:</div><div class='add'>+		cache_attrs.indexing = NODE_CACHE_OTHER;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((attrs &amp; ACPI_HMAT_WRITE_POLICY) &gt;&gt; 12) {</div><div class='add'>+	case ACPI_HMAT_CP_WB:</div><div class='add'>+		cache_attrs.write_policy = NODE_CACHE_WRITE_BACK;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_CP_WT:</div><div class='add'>+		cache_attrs.write_policy = NODE_CACHE_WRITE_THROUGH;</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_CP_NONE:</div><div class='add'>+	default:</div><div class='add'>+		cache_attrs.write_policy = NODE_CACHE_WRITE_OTHER;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_add_cache(pxm_to_node(cache-&gt;memory_PD), &amp;cache_attrs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *header,</div><div class='add'>+					      const unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct acpi_hmat_proximity_domain *p = (void *)header;</div><div class='add'>+	struct memory_target *target = NULL;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;header.length != sizeof(*p)) {</div><div class='add'>+		pr_notice("HMAT: Unexpected address range header length: %d\n",</div><div class='add'>+			 p-&gt;header.length);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hmat_revision == 1)</div><div class='add'>+		pr_info("HMAT: Memory (%#llx length %#llx) Flags:%04x Processor Domain:%d Memory Domain:%d\n",</div><div class='add'>+			p-&gt;reserved3, p-&gt;reserved4, p-&gt;flags, p-&gt;processor_PD,</div><div class='add'>+			p-&gt;memory_PD);</div><div class='add'>+	else</div><div class='add'>+		pr_info("HMAT: Memory Flags:%04x Processor Domain:%d Memory Domain:%d\n",</div><div class='add'>+			p-&gt;flags, p-&gt;processor_PD, p-&gt;memory_PD);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;flags &amp; ACPI_HMAT_MEMORY_PD_VALID) {</div><div class='add'>+		target = find_mem_target(p-&gt;memory_PD);</div><div class='add'>+		if (!target) {</div><div class='add'>+			pr_debug("HMAT: Memory Domain missing from SRAT\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (target &amp;&amp; p-&gt;flags &amp; ACPI_HMAT_PROCESSOR_PD_VALID) {</div><div class='add'>+		int p_node = pxm_to_node(p-&gt;processor_PD);</div><div class='add'>+</div><div class='add'>+		if (p_node == NUMA_NO_NODE) {</div><div class='add'>+			pr_debug("HMAT: Invalid Processor Domain\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		target-&gt;processor_pxm = p_node;</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 __init hmat_parse_subtable(union acpi_subtable_headers *header,</div><div class='add'>+				      const unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct acpi_hmat_structure *hdr = (void *)header;</div><div class='add'>+</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (hdr-&gt;type) {</div><div class='add'>+	case ACPI_HMAT_TYPE_PROXIMITY:</div><div class='add'>+		return hmat_parse_proximity_domain(header, end);</div><div class='add'>+	case ACPI_HMAT_TYPE_LOCALITY:</div><div class='add'>+		return hmat_parse_locality(header, end);</div><div class='add'>+	case ACPI_HMAT_TYPE_CACHE:</div><div class='add'>+		return hmat_parse_cache(header, end);</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 __init int srat_parse_mem_affinity(union acpi_subtable_headers *header,</div><div class='add'>+					  const unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct acpi_srat_mem_affinity *ma = (void *)header;</div><div class='add'>+</div><div class='add'>+	if (!ma)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!(ma-&gt;flags &amp; ACPI_SRAT_MEM_ENABLED))</div><div class='add'>+		return 0;</div><div class='add'>+	alloc_memory_target(ma-&gt;proximity_domain);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init u32 hmat_initiator_perf(struct memory_target *target,</div><div class='add'>+			       struct memory_initiator *initiator,</div><div class='add'>+			       struct acpi_hmat_locality *hmat_loc)</div><div class='add'>+{</div><div class='add'>+	unsigned int ipds, tpds, i, idx = 0, tdx = 0;</div><div class='add'>+	u32 *inits, *targs;</div><div class='add'>+	u16 *entries;</div><div class='add'>+</div><div class='add'>+	ipds = hmat_loc-&gt;number_of_initiator_Pds;</div><div class='add'>+	tpds = hmat_loc-&gt;number_of_target_Pds;</div><div class='add'>+	inits = (u32 *)(hmat_loc + 1);</div><div class='add'>+	targs = inits + ipds;</div><div class='add'>+	entries = (u16 *)(targs + tpds);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ipds; i++) {</div><div class='add'>+		if (inits[i] == initiator-&gt;processor_pxm) {</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 (i == ipds)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tpds; i++) {</div><div class='add'>+		if (targs[i] == target-&gt;memory_pxm) {</div><div class='add'>+			tdx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == tpds)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hmat_normalize(entries[idx * tpds + tdx],</div><div class='add'>+			      hmat_loc-&gt;entry_base_unit,</div><div class='add'>+			      hmat_loc-&gt;data_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init bool hmat_update_best(u8 type, u32 value, u32 *best)</div><div class='add'>+{</div><div class='add'>+	bool updated = false;</div><div class='add'>+</div><div class='add'>+	if (!value)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACPI_HMAT_ACCESS_LATENCY:</div><div class='add'>+	case ACPI_HMAT_READ_LATENCY:</div><div class='add'>+	case ACPI_HMAT_WRITE_LATENCY:</div><div class='add'>+		if (!*best || *best &gt; value) {</div><div class='add'>+			*best = value;</div><div class='add'>+			updated = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_HMAT_ACCESS_BANDWIDTH:</div><div class='add'>+	case ACPI_HMAT_READ_BANDWIDTH:</div><div class='add'>+	case ACPI_HMAT_WRITE_BANDWIDTH:</div><div class='add'>+		if (!*best || *best &lt; value) {</div><div class='add'>+			*best = value;</div><div class='add'>+			updated = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return updated;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int initiator_cmp(void *priv, struct list_head *a, struct list_head *b)</div><div class='add'>+{</div><div class='add'>+	struct memory_initiator *ia;</div><div class='add'>+	struct memory_initiator *ib;</div><div class='add'>+	unsigned long *p_nodes = priv;</div><div class='add'>+</div><div class='add'>+	ia = list_entry(a, struct memory_initiator, node);</div><div class='add'>+	ib = list_entry(b, struct memory_initiator, node);</div><div class='add'>+</div><div class='add'>+	set_bit(ia-&gt;processor_pxm, p_nodes);</div><div class='add'>+	set_bit(ib-&gt;processor_pxm, p_nodes);</div><div class='add'>+</div><div class='add'>+	return ia-&gt;processor_pxm - ib-&gt;processor_pxm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void hmat_register_target_initiators(struct memory_target *target)</div><div class='add'>+{</div><div class='add'>+	static DECLARE_BITMAP(p_nodes, MAX_NUMNODES);</div><div class='add'>+	struct memory_initiator *initiator;</div><div class='add'>+	unsigned int mem_nid, cpu_nid;</div><div class='add'>+	struct memory_locality *loc = NULL;</div><div class='add'>+	u32 best = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mem_nid = pxm_to_node(target-&gt;memory_pxm);</div><div class='add'>+	/*</div><div class='add'>+	 * If the Address Range Structure provides a local processor pxm, link</div><div class='add'>+	 * only that one. Otherwise, find the best performance attributes and</div><div class='add'>+	 * register all initiators that match.</div><div class='add'>+	 */</div><div class='add'>+	if (target-&gt;processor_pxm != PXM_INVAL) {</div><div class='add'>+		cpu_nid = pxm_to_node(target-&gt;processor_pxm);</div><div class='add'>+		register_memory_node_under_compute_node(mem_nid, cpu_nid, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;localities))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need the initiator list sorted so we can use bitmap_clear for</div><div class='add'>+	 * previously set initiators when we find a better memory accessor.</div><div class='add'>+	 * We'll also use the sorting to prime the candidate nodes with known</div><div class='add'>+	 * initiators.</div><div class='add'>+	 */</div><div class='add'>+	bitmap_zero(p_nodes, MAX_NUMNODES);</div><div class='add'>+	list_sort(p_nodes, &amp;initiators, initiator_cmp);</div><div class='add'>+	for (i = WRITE_LATENCY; i &lt;= READ_BANDWIDTH; i++) {</div><div class='add'>+		loc = localities_types[i];</div><div class='add'>+		if (!loc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		best = 0;</div><div class='add'>+		list_for_each_entry(initiator, &amp;initiators, node) {</div><div class='add'>+			u32 value;</div><div class='add'>+</div><div class='add'>+			if (!test_bit(initiator-&gt;processor_pxm, p_nodes))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			value = hmat_initiator_perf(target, initiator, loc-&gt;hmat_loc);</div><div class='add'>+			if (hmat_update_best(loc-&gt;hmat_loc-&gt;data_type, value, &amp;best))</div><div class='add'>+				bitmap_clear(p_nodes, 0, initiator-&gt;processor_pxm);</div><div class='add'>+			if (value != best)</div><div class='add'>+				clear_bit(initiator-&gt;processor_pxm, p_nodes);</div><div class='add'>+		}</div><div class='add'>+		if (best)</div><div class='add'>+			hmat_update_target_access(target, loc-&gt;hmat_loc-&gt;data_type, best);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, p_nodes, MAX_NUMNODES) {</div><div class='add'>+		cpu_nid = pxm_to_node(i);</div><div class='add'>+		register_memory_node_under_compute_node(mem_nid, cpu_nid, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void hmat_register_target_perf(struct memory_target *target)</div><div class='add'>+{</div><div class='add'>+	unsigned mem_nid = pxm_to_node(target-&gt;memory_pxm);</div><div class='add'>+	node_set_perf_attrs(mem_nid, &amp;target-&gt;hmem_attrs, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void hmat_register_targets(void)</div><div class='add'>+{</div><div class='add'>+	struct memory_target *target;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(target, &amp;targets, node) {</div><div class='add'>+		hmat_register_target_initiators(target);</div><div class='add'>+		hmat_register_target_perf(target);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init void hmat_free_structures(void)</div><div class='add'>+{</div><div class='add'>+	struct memory_target *target, *tnext;</div><div class='add'>+	struct memory_locality *loc, *lnext;</div><div class='add'>+	struct memory_initiator *initiator, *inext;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(target, tnext, &amp;targets, node) {</div><div class='add'>+		list_del(&amp;target-&gt;node);</div><div class='add'>+		kfree(target);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(initiator, inext, &amp;initiators, node) {</div><div class='add'>+		list_del(&amp;initiator-&gt;node);</div><div class='add'>+		kfree(initiator);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(loc, lnext, &amp;localities, node) {</div><div class='add'>+		list_del(&amp;loc-&gt;node);</div><div class='add'>+		kfree(loc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int hmat_init(void)</div><div class='add'>+{</div><div class='add'>+	struct acpi_table_header *tbl;</div><div class='add'>+	enum acpi_hmat_type i;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (srat_disabled())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_SRAT, 0, &amp;tbl);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (acpi_table_parse_entries(ACPI_SIG_SRAT,</div><div class='add'>+				sizeof(struct acpi_table_srat),</div><div class='add'>+				ACPI_SRAT_TYPE_MEMORY_AFFINITY,</div><div class='add'>+				srat_parse_mem_affinity, 0) &lt; 0)</div><div class='add'>+		goto out_put;</div><div class='add'>+	acpi_put_table(tbl);</div><div class='add'>+</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_HMAT, 0, &amp;tbl);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	hmat_revision = tbl-&gt;revision;</div><div class='add'>+	switch (hmat_revision) {</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_notice("Ignoring HMAT: Unknown revision:%d\n", hmat_revision);</div><div class='add'>+		goto out_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = ACPI_HMAT_TYPE_PROXIMITY; i &lt; ACPI_HMAT_TYPE_RESERVED; i++) {</div><div class='add'>+		if (acpi_table_parse_entries(ACPI_SIG_HMAT,</div><div class='add'>+					     sizeof(struct acpi_table_hmat), i,</div><div class='add'>+					     hmat_parse_subtable, 0) &lt; 0) {</div><div class='add'>+			pr_notice("Ignoring HMAT: Invalid table");</div><div class='add'>+			goto out_put;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hmat_register_targets();</div><div class='add'>+out_put:</div><div class='add'>+	hmat_free_structures();</div><div class='add'>+	acpi_put_table(tbl);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(hmat_init);</div><div class='head'>diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c<br/>index 5a389a4f4f65..f1ed0befe303 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/nfit/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/nfit/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/nfit/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/nfit/core.c</a></div><div class='hunk'>@@ -567,6 +567,12 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name,</div><div class='add'>+			cmd_name, out_obj-&gt;buffer.length);</div><div class='add'>+	print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,</div><div class='add'>+			out_obj-&gt;buffer.pointer,</div><div class='add'>+			min_t(u32, 128, out_obj-&gt;buffer.length), true);</div><div class='add'>+</div><div class='ctx'> 	if (call_pkg) {</div><div class='ctx'> 		call_pkg-&gt;nd_fw_size = out_obj-&gt;buffer.length;</div><div class='ctx'> 		memcpy(call_pkg-&gt;nd_payload + call_pkg-&gt;nd_size_in,</div><div class='hunk'>@@ -585,12 +591,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name,</div><div class='del'>-			cmd_name, out_obj-&gt;buffer.length);</div><div class='del'>-	print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,</div><div class='del'>-			out_obj-&gt;buffer.pointer,</div><div class='del'>-			min_t(u32, 128, out_obj-&gt;buffer.length), true);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0, offset = 0; i &lt; desc-&gt;out_num; i++) {</div><div class='ctx'> 		u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf,</div><div class='ctx'> 				(u32 *) out_obj-&gt;buffer.pointer,</div><div class='head'>diff --git a/drivers/acpi/nfit/intel.c b/drivers/acpi/nfit/intel.c<br/>index f70de71f79d6..cddd0fcf622c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/nfit/intel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/nfit/intel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/nfit/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/nfit/intel.c</a></div><div class='hunk'>@@ -122,9 +122,8 @@ static int intel_security_change_key(struct nvdimm *nvdimm,</div><div class='ctx'> 	if (!test_bit(cmd, &amp;nfit_mem-&gt;dsm_mask))</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> </div><div class='del'>-	if (old_data)</div><div class='del'>-		memcpy(nd_cmd.cmd.old_pass, old_data-&gt;data,</div><div class='del'>-				sizeof(nd_cmd.cmd.old_pass));</div><div class='add'>+	memcpy(nd_cmd.cmd.old_pass, old_data-&gt;data,</div><div class='add'>+			sizeof(nd_cmd.cmd.old_pass));</div><div class='ctx'> 	memcpy(nd_cmd.cmd.new_pass, new_data-&gt;data,</div><div class='ctx'> 			sizeof(nd_cmd.cmd.new_pass));</div><div class='ctx'> 	rc = nvdimm_ctl(nvdimm, ND_CMD_CALL, &amp;nd_cmd, sizeof(nd_cmd), NULL);</div><div class='hunk'>@@ -336,9 +335,8 @@ static int __maybe_unused intel_security_overwrite(struct nvdimm *nvdimm,</div><div class='ctx'> </div><div class='ctx'> 	/* flush all cache before we erase DIMM */</div><div class='ctx'> 	nvdimm_invalidate_cache();</div><div class='del'>-	if (nkey)</div><div class='del'>-		memcpy(nd_cmd.cmd.passphrase, nkey-&gt;data,</div><div class='del'>-				sizeof(nd_cmd.cmd.passphrase));</div><div class='add'>+	memcpy(nd_cmd.cmd.passphrase, nkey-&gt;data,</div><div class='add'>+			sizeof(nd_cmd.cmd.passphrase));</div><div class='ctx'> 	rc = nvdimm_ctl(nvdimm, ND_CMD_CALL, &amp;nd_cmd, sizeof(nd_cmd), NULL);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='head'>diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c<br/>index 867f6e3f2b4f..30995834ad70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/numa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/numa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/numa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/numa.c</a></div><div class='hunk'>@@ -339,7 +339,7 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,</div><div class='add'>+acpi_parse_x2apic_affinity(union acpi_subtable_headers *header,</div><div class='ctx'> 			   const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_srat_x2apic_cpu_affinity *processor_affinity;</div><div class='hunk'>@@ -348,7 +348,7 @@ acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,</div><div class='ctx'> 	if (!processor_affinity)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_srat_entry(header);</div><div class='add'>+	acpi_table_print_srat_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* let architecture-dependent part to do it */</div><div class='ctx'> 	acpi_numa_x2apic_affinity_init(processor_affinity);</div><div class='hunk'>@@ -357,7 +357,7 @@ acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_processor_affinity(struct acpi_subtable_header *header,</div><div class='add'>+acpi_parse_processor_affinity(union acpi_subtable_headers *header,</div><div class='ctx'> 			      const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_srat_cpu_affinity *processor_affinity;</div><div class='hunk'>@@ -366,7 +366,7 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header,</div><div class='ctx'> 	if (!processor_affinity)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_srat_entry(header);</div><div class='add'>+	acpi_table_print_srat_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* let architecture-dependent part to do it */</div><div class='ctx'> 	acpi_numa_processor_affinity_init(processor_affinity);</div><div class='hunk'>@@ -375,7 +375,7 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_gicc_affinity(struct acpi_subtable_header *header,</div><div class='add'>+acpi_parse_gicc_affinity(union acpi_subtable_headers *header,</div><div class='ctx'> 			 const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_srat_gicc_affinity *processor_affinity;</div><div class='hunk'>@@ -384,7 +384,7 @@ acpi_parse_gicc_affinity(struct acpi_subtable_header *header,</div><div class='ctx'> 	if (!processor_affinity)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_srat_entry(header);</div><div class='add'>+	acpi_table_print_srat_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* let architecture-dependent part to do it */</div><div class='ctx'> 	acpi_numa_gicc_affinity_init(processor_affinity);</div><div class='hunk'>@@ -395,7 +395,7 @@ acpi_parse_gicc_affinity(struct acpi_subtable_header *header,</div><div class='ctx'> static int __initdata parsed_numa_memblks;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_memory_affinity(struct acpi_subtable_header * header,</div><div class='add'>+acpi_parse_memory_affinity(union acpi_subtable_headers * header,</div><div class='ctx'> 			   const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_srat_mem_affinity *memory_affinity;</div><div class='hunk'>@@ -404,7 +404,7 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,</div><div class='ctx'> 	if (!memory_affinity)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	acpi_table_print_srat_entry(header);</div><div class='add'>+	acpi_table_print_srat_entry(&amp;header-&gt;common);</div><div class='ctx'> </div><div class='ctx'> 	/* let architecture-dependent part to do it */</div><div class='ctx'> 	if (!acpi_numa_memory_affinity_init(memory_affinity))</div><div class='head'>diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c<br/>index 665e93ca0b40..87db3e124725 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/power.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/power.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/power.c</a></div><div class='hunk'>@@ -535,12 +535,12 @@ int acpi_device_sleep_wake(struct acpi_device *dev,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to execute _DSW first.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Three agruments are needed for the _DSW object:</div><div class='add'>+	 * Three arguments are needed for the _DSW object:</div><div class='ctx'> 	 * Argument 0: enable/disable the wake capabilities</div><div class='ctx'> 	 * Argument 1: target system state</div><div class='ctx'> 	 * Argument 2: target device state</div><div class='ctx'> 	 * When _DSW object is called to disable the wake capabilities, maybe</div><div class='del'>-	 * the first argument is filled. The values of the other two agruments</div><div class='add'>+	 * the first argument is filled. The values of the other two arguments</div><div class='ctx'> 	 * are meaningless.</div><div class='ctx'> 	 */</div><div class='ctx'> 	in_arg[0].type = ACPI_TYPE_INTEGER;</div><div class='head'>diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c<br/>index 065c4fc245d1..b72e6afaa8fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/pptt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/pptt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/pptt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/pptt.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ static struct acpi_pptt_cache *acpi_find_cache_level(struct acpi_table_header *t</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * acpi_count_levels() - Given a PPTT table, and a cpu node, count the caches</div><div class='add'>+ * acpi_count_levels() - Given a PPTT table, and a CPU node, count the caches</div><div class='ctx'>  * @table_hdr: Pointer to the head of the PPTT table</div><div class='ctx'>  * @cpu_node: processor node we wish to count caches for</div><div class='ctx'>  *</div><div class='hunk'>@@ -235,7 +235,7 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr,</div><div class='ctx'> /**</div><div class='ctx'>  * acpi_find_processor_node() - Given a PPTT table find the requested processor</div><div class='ctx'>  * @table_hdr:  Pointer to the head of the PPTT table</div><div class='del'>- * @acpi_cpu_id: cpu we are searching for</div><div class='add'>+ * @acpi_cpu_id: CPU we are searching for</div><div class='ctx'>  *</div><div class='ctx'>  * Find the subtable entry describing the provided processor.</div><div class='ctx'>  * This is done by iterating the PPTT table looking for processor nodes</div><div class='hunk'>@@ -456,21 +456,21 @@ static struct acpi_pptt_processor *acpi_find_processor_package_id(struct acpi_ta</div><div class='ctx'> </div><div class='ctx'> static void acpi_pptt_warn_missing(void)</div><div class='ctx'> {</div><div class='del'>-	pr_warn_once("No PPTT table found, cpu and cache topology may be inaccurate\n");</div><div class='add'>+	pr_warn_once("No PPTT table found, CPU and cache topology may be inaccurate\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * topology_get_acpi_cpu_tag() - Find a unique topology value for a feature</div><div class='ctx'>  * @table: Pointer to the head of the PPTT table</div><div class='del'>- * @cpu: Kernel logical cpu number</div><div class='add'>+ * @cpu: Kernel logical CPU number</div><div class='ctx'>  * @level: A level that terminates the search</div><div class='ctx'>  * @flag: A flag which terminates the search</div><div class='ctx'>  *</div><div class='del'>- * Get a unique value given a cpu, and a topology level, that can be</div><div class='add'>+ * Get a unique value given a CPU, and a topology level, that can be</div><div class='ctx'>  * matched to determine which cpus share common topological features</div><div class='ctx'>  * at that level.</div><div class='ctx'>  *</div><div class='del'>- * Return: Unique value, or -ENOENT if unable to locate cpu</div><div class='add'>+ * Return: Unique value, or -ENOENT if unable to locate CPU</div><div class='ctx'>  */</div><div class='ctx'> static int topology_get_acpi_cpu_tag(struct acpi_table_header *table,</div><div class='ctx'> 				     unsigned int cpu, int level, int flag)</div><div class='hunk'>@@ -510,7 +510,7 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	retval = topology_get_acpi_cpu_tag(table, cpu, level, flag);</div><div class='del'>-	pr_debug("Topology Setup ACPI cpu %d, level %d ret = %d\n",</div><div class='add'>+	pr_debug("Topology Setup ACPI CPU %d, level %d ret = %d\n",</div><div class='ctx'> 		 cpu, level, retval);</div><div class='ctx'> 	acpi_put_table(table);</div><div class='ctx'> </div><div class='hunk'>@@ -519,9 +519,9 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * acpi_find_last_cache_level() - Determines the number of cache levels for a PE</div><div class='del'>- * @cpu: Kernel logical cpu number</div><div class='add'>+ * @cpu: Kernel logical CPU number</div><div class='ctx'>  *</div><div class='del'>- * Given a logical cpu number, returns the number of levels of cache represented</div><div class='add'>+ * Given a logical CPU number, returns the number of levels of cache represented</div><div class='ctx'>  * in the PPTT. Errors caused by lack of a PPTT table, or otherwise, return 0</div><div class='ctx'>  * indicating we didn't find any cache levels.</div><div class='ctx'>  *</div><div class='hunk'>@@ -534,7 +534,7 @@ int acpi_find_last_cache_level(unsigned int cpu)</div><div class='ctx'> 	int number_of_levels = 0;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	pr_debug("Cache Setup find last level cpu=%d\n", cpu);</div><div class='add'>+	pr_debug("Cache Setup find last level CPU=%d\n", cpu);</div><div class='ctx'> </div><div class='ctx'> 	acpi_cpu_id = get_acpi_id_for_cpu(cpu);</div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_PPTT, 0, &amp;table);</div><div class='hunk'>@@ -551,14 +551,14 @@ int acpi_find_last_cache_level(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cache_setup_acpi() - Override CPU cache topology with data from the PPTT</div><div class='del'>- * @cpu: Kernel logical cpu number</div><div class='add'>+ * @cpu: Kernel logical CPU number</div><div class='ctx'>  *</div><div class='ctx'>  * Updates the global cache info provided by cpu_get_cacheinfo()</div><div class='ctx'>  * when there are valid properties in the acpi_pptt_cache nodes. A</div><div class='ctx'>  * successful parse may not result in any updates if none of the</div><div class='del'>- * cache levels have any valid flags set.  Futher, a unique value is</div><div class='add'>+ * cache levels have any valid flags set.  Further, a unique value is</div><div class='ctx'>  * associated with each known CPU cache entry. This unique value</div><div class='del'>- * can be used to determine whether caches are shared between cpus.</div><div class='add'>+ * can be used to determine whether caches are shared between CPUs.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -ENOENT on failure to find table, or 0 on success</div><div class='ctx'>  */</div><div class='hunk'>@@ -567,7 +567,7 @@ int cache_setup_acpi(unsigned int cpu)</div><div class='ctx'> 	struct acpi_table_header *table;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	pr_debug("Cache Setup ACPI cpu %d\n", cpu);</div><div class='add'>+	pr_debug("Cache Setup ACPI CPU %d\n", cpu);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_PPTT, 0, &amp;table);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -582,8 +582,8 @@ int cache_setup_acpi(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * find_acpi_cpu_topology() - Determine a unique topology value for a given cpu</div><div class='del'>- * @cpu: Kernel logical cpu number</div><div class='add'>+ * find_acpi_cpu_topology() - Determine a unique topology value for a given CPU</div><div class='add'>+ * @cpu: Kernel logical CPU number</div><div class='ctx'>  * @level: The topological level for which we would like a unique ID</div><div class='ctx'>  *</div><div class='ctx'>  * Determine a topology unique ID for each thread/core/cluster/mc_grouping</div><div class='hunk'>@@ -596,7 +596,7 @@ int cache_setup_acpi(unsigned int cpu)</div><div class='ctx'>  * other levels beyond this use a generated value to uniquely identify</div><div class='ctx'>  * a topological feature.</div><div class='ctx'>  *</div><div class='del'>- * Return: -ENOENT if the PPTT doesn't exist, or the cpu cannot be found.</div><div class='add'>+ * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.</div><div class='ctx'>  * Otherwise returns a value which represents a unique topological feature.</div><div class='ctx'>  */</div><div class='ctx'> int find_acpi_cpu_topology(unsigned int cpu, int level)</div><div class='hunk'>@@ -606,12 +606,12 @@ int find_acpi_cpu_topology(unsigned int cpu, int level)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * find_acpi_cpu_cache_topology() - Determine a unique cache topology value</div><div class='del'>- * @cpu: Kernel logical cpu number</div><div class='add'>+ * @cpu: Kernel logical CPU number</div><div class='ctx'>  * @level: The cache level for which we would like a unique ID</div><div class='ctx'>  *</div><div class='ctx'>  * Determine a unique ID for each unified cache in the system</div><div class='ctx'>  *</div><div class='del'>- * Return: -ENOENT if the PPTT doesn't exist, or the cpu cannot be found.</div><div class='add'>+ * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.</div><div class='ctx'>  * Otherwise returns a value which represents a unique topological feature.</div><div class='ctx'>  */</div><div class='ctx'> int find_acpi_cpu_cache_topology(unsigned int cpu, int level)</div><div class='hunk'>@@ -643,17 +643,17 @@ int find_acpi_cpu_cache_topology(unsigned int cpu, int level)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * find_acpi_cpu_topology_package() - Determine a unique cpu package value</div><div class='del'>- * @cpu: Kernel logical cpu number</div><div class='add'>+ * find_acpi_cpu_topology_package() - Determine a unique CPU package value</div><div class='add'>+ * @cpu: Kernel logical CPU number</div><div class='ctx'>  *</div><div class='del'>- * Determine a topology unique package ID for the given cpu.</div><div class='add'>+ * Determine a topology unique package ID for the given CPU.</div><div class='ctx'>  * This ID can then be used to group peers, which will have matching ids.</div><div class='ctx'>  *</div><div class='ctx'>  * The search terminates when either a level is found with the PHYSICAL_PACKAGE</div><div class='ctx'>  * flag set or we reach a root node.</div><div class='ctx'>  *</div><div class='del'>- * Return: -ENOENT if the PPTT doesn't exist, or the cpu cannot be found.</div><div class='del'>- * Otherwise returns a value which represents the package for this cpu.</div><div class='add'>+ * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.</div><div class='add'>+ * Otherwise returns a value which represents the package for this CPU.</div><div class='ctx'>  */</div><div class='ctx'> int find_acpi_cpu_topology_package(unsigned int cpu)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c<br/>index a303fd0e108c..c73d3a62799a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/processor_perflib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/processor_perflib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/processor_perflib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/processor_perflib.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag)</div><div class='ctx'> 			acpi_processor_ppc_ost(pr-&gt;handle, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &gt;= 0)</div><div class='del'>-		cpufreq_update_policy(pr-&gt;id);</div><div class='add'>+		cpufreq_update_limits(pr-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)</div><div class='head'>diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c<br/>index 77abe0ec4043..9d460a859be0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/property.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/property.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/property.c</a></div><div class='hunk'>@@ -44,6 +44,7 @@ static const guid_t prp_guids[] = {</div><div class='ctx'> 		  0xbf, 0xf0, 0x76, 0x14, 0x38, 0x07, 0xc3, 0x89),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* ACPI _DSD data subnodes GUID: dbb8e3e6-5886-4ba6-8795-1319f52a966b */</div><div class='ctx'> static const guid_t ads_guid =</div><div class='ctx'> 	GUID_INIT(0xdbb8e3e6, 0x5886, 0x4ba6,</div><div class='ctx'> 		  0x87, 0x95, 0x13, 0x19, 0xf5, 0x2a, 0x96, 0x6b);</div><div class='hunk'>@@ -1031,6 +1032,14 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,</div><div class='ctx'> 		const struct acpi_data_node *data = to_acpi_data_node(fwnode);</div><div class='ctx'> 		struct acpi_data_node *dn;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * We can have a combination of device and data nodes, e.g. with</div><div class='add'>+		 * hierarchical _DSD properties. Make sure the adev pointer is</div><div class='add'>+		 * restored before going through data nodes, otherwise we will</div><div class='add'>+		 * be looking for data_nodes below the last device found instead</div><div class='add'>+		 * of the common fwnode shared by device_nodes and data_nodes.</div><div class='add'>+		 */</div><div class='add'>+		adev = to_acpi_device_node(fwnode);</div><div class='ctx'> 		if (adev)</div><div class='ctx'> 			head = &amp;adev-&gt;data.subnodes;</div><div class='ctx'> 		else if (data)</div><div class='head'>diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c<br/>index 446c959a8f08..566270d0e91a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/scan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/scan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/scan.c</a></div><div class='hunk'>@@ -763,18 +763,16 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_bus_get_ejd);</div><div class='ctx'> </div><div class='del'>-static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,</div><div class='del'>-					struct acpi_device_wakeup *wakeup)</div><div class='add'>+static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev)</div><div class='ctx'> {</div><div class='add'>+	acpi_handle handle = dev-&gt;handle;</div><div class='add'>+	struct acpi_device_wakeup *wakeup = &amp;dev-&gt;wakeup;</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	union acpi_object *package = NULL;</div><div class='ctx'> 	union acpi_object *element = NULL;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	int err = -ENODATA;</div><div class='ctx'> </div><div class='del'>-	if (!wakeup)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wakeup-&gt;resources);</div><div class='ctx'> </div><div class='ctx'> 	/* _PRW */</div><div class='hunk'>@@ -848,9 +846,9 @@ static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,</div><div class='ctx'> static bool acpi_wakeup_gpe_init(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct acpi_device_id button_device_ids[] = {</div><div class='del'>-		{"PNP0C0C", 0},</div><div class='del'>-		{"PNP0C0D", 0},</div><div class='del'>-		{"PNP0C0E", 0},</div><div class='add'>+		{"PNP0C0C", 0},		/* Power button */</div><div class='add'>+		{"PNP0C0D", 0},		/* Lid */</div><div class='add'>+		{"PNP0C0E", 0},		/* Sleep button */</div><div class='ctx'> 		{"", 0},</div><div class='ctx'> 	};</div><div class='ctx'> 	struct acpi_device_wakeup *wakeup = &amp;device-&gt;wakeup;</div><div class='hunk'>@@ -883,8 +881,7 @@ static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)</div><div class='ctx'> 	if (!acpi_has_method(device-&gt;handle, "_PRW"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	err = acpi_bus_extract_wakeup_device_power_package(device-&gt;handle,</div><div class='del'>-							   &amp;device-&gt;wakeup);</div><div class='add'>+	err = acpi_bus_extract_wakeup_device_power_package(device);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;device-&gt;dev, "_PRW evaluation error: %d\n", err);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -895,7 +892,7 @@ static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Call _PSW/_DSW object to disable its ability to wake the sleeping</div><div class='ctx'> 	 * system for the ACPI device with the _PRW object.</div><div class='del'>-	 * The _PSW object is depreciated in ACPI 3.0 and is replaced by _DSW.</div><div class='add'>+	 * The _PSW object is deprecated in ACPI 3.0 and is replaced by _DSW.</div><div class='ctx'> 	 * So it is necessary to call _DSW object first. Only when it is not</div><div class='ctx'> 	 * present will the _PSW object used.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2241,10 +2238,10 @@ static struct acpi_probe_entry *ape;</div><div class='ctx'> static int acpi_probe_count;</div><div class='ctx'> static DEFINE_MUTEX(acpi_probe_mutex);</div><div class='ctx'> </div><div class='del'>-static int __init acpi_match_madt(struct acpi_subtable_header *header,</div><div class='add'>+static int __init acpi_match_madt(union acpi_subtable_headers *header,</div><div class='ctx'> 				  const unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	if (!ape-&gt;subtable_valid || ape-&gt;subtable_valid(header, ape))</div><div class='add'>+	if (!ape-&gt;subtable_valid || ape-&gt;subtable_valid(&amp;header-&gt;common, ape))</div><div class='ctx'> 		if (!ape-&gt;probe_subtbl(header, end))</div><div class='ctx'> 			acpi_probe_count++;</div><div class='ctx'> </div><div class='hunk'>@@ -2260,7 +2257,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;acpi_probe_mutex);</div><div class='ctx'> 	for (ape = ap_head; nr; ape++, nr--) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape-&gt;id)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(ACPI_SIG_MADT, ape-&gt;id)) {</div><div class='ctx'> 			acpi_probe_count = 0;</div><div class='ctx'> 			acpi_table_parse_madt(ape-&gt;type, acpi_match_madt, 0);</div><div class='ctx'> 			count += acpi_probe_count;</div><div class='head'>diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c<br/>index c336784d0bcb..b34d05e365b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/spcr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/spcr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/spcr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/spcr.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ EXPORT_SYMBOL(qdf2400_e44_present);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some Qualcomm Datacenter Technologies SoCs have a defective UART BUSY bit.</div><div class='del'>- * Detect them by examining the OEM fields in the SPCR header, similiar to PCI</div><div class='add'>+ * Detect them by examining the OEM fields in the SPCR header, similar to PCI</div><div class='ctx'>  * quirk detection in pci_mcfg.c.</div><div class='ctx'>  */</div><div class='ctx'> static bool qdf2400_erratum_44_present(struct acpi_table_header *h)</div><div class='head'>diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c<br/>index fa76f5e41b5c..75948a3f1a20 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/sysfs.c</a></div><div class='hunk'>@@ -327,9 +327,9 @@ static struct kobject *hotplug_kobj;</div><div class='ctx'> </div><div class='ctx'> struct acpi_table_attr {</div><div class='ctx'> 	struct bin_attribute attr;</div><div class='del'>-	char name[ACPI_NAME_SIZE];</div><div class='add'>+	char name[ACPI_NAMESEG_SIZE];</div><div class='ctx'> 	int instance;</div><div class='del'>-	char filename[ACPI_NAME_SIZE+ACPI_INST_SIZE];</div><div class='add'>+	char filename[ACPI_NAMESEG_SIZE+ACPI_INST_SIZE];</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -368,10 +368,10 @@ static int acpi_table_attr_init(struct kobject *tables_obj,</div><div class='ctx'> 	char instance_str[ACPI_INST_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	sysfs_attr_init(&amp;table_attr-&gt;attr.attr);</div><div class='del'>-	ACPI_MOVE_NAME(table_attr-&gt;name, table_header-&gt;signature);</div><div class='add'>+	ACPI_COPY_NAMESEG(table_attr-&gt;name, table_header-&gt;signature);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(attr, &amp;acpi_table_attr_list, node) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(table_attr-&gt;name, attr-&gt;name))</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(table_attr-&gt;name, attr-&gt;name))</div><div class='ctx'> 			if (table_attr-&gt;instance &lt; attr-&gt;instance)</div><div class='ctx'> 				table_attr-&gt;instance = attr-&gt;instance;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -382,8 +382,8 @@ static int acpi_table_attr_init(struct kobject *tables_obj,</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_MOVE_NAME(table_attr-&gt;filename, table_header-&gt;signature);</div><div class='del'>-	table_attr-&gt;filename[ACPI_NAME_SIZE] = '\0';</div><div class='add'>+	ACPI_COPY_NAMESEG(table_attr-&gt;filename, table_header-&gt;signature);</div><div class='add'>+	table_attr-&gt;filename[ACPI_NAMESEG_SIZE] = '\0';</div><div class='ctx'> 	if (table_attr-&gt;instance &gt; 1 || (table_attr-&gt;instance == 1 &amp;&amp;</div><div class='ctx'> 					 !acpi_get_table</div><div class='ctx'> 					 (table_header-&gt;signature, 2, &amp;header))) {</div><div class='hunk'>@@ -484,7 +484,7 @@ static int acpi_table_data_init(struct acpi_table_header *th)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_ACPI_DATA_OBJS; i++) {</div><div class='del'>-		if (ACPI_COMPARE_NAME(th-&gt;signature, acpi_data_objs[i].name)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(th-&gt;signature, acpi_data_objs[i].name)) {</div><div class='ctx'> 			data_attr = kzalloc(sizeof(*data_attr), GFP_KERNEL);</div><div class='ctx'> 			if (!data_attr)</div><div class='ctx'> 				return -ENOMEM;</div><div class='head'>diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c<br/>index 8fccbe49612a..3b5d04fd5e3e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/tables.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/tables.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/tables.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/tables.c</a></div><div class='hunk'>@@ -49,6 +49,16 @@ static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;</div><div class='ctx'> </div><div class='ctx'> static int acpi_apic_instance __initdata;</div><div class='ctx'> </div><div class='add'>+enum acpi_subtable_type {</div><div class='add'>+	ACPI_SUBTABLE_COMMON,</div><div class='add'>+	ACPI_SUBTABLE_HMAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_subtable_entry {</div><div class='add'>+	union acpi_subtable_headers *hdr;</div><div class='add'>+	enum acpi_subtable_type type;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Disable table checksum verification for the early stage due to the size</div><div class='ctx'>  * limitation of the current x86 early mapping implementation.</div><div class='hunk'>@@ -217,6 +227,50 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long __init</div><div class='add'>+acpi_get_entry_type(struct acpi_subtable_entry *entry)</div><div class='add'>+{</div><div class='add'>+	switch (entry-&gt;type) {</div><div class='add'>+	case ACPI_SUBTABLE_COMMON:</div><div class='add'>+		return entry-&gt;hdr-&gt;common.type;</div><div class='add'>+	case ACPI_SUBTABLE_HMAT:</div><div class='add'>+		return entry-&gt;hdr-&gt;hmat.type;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __init</div><div class='add'>+acpi_get_entry_length(struct acpi_subtable_entry *entry)</div><div class='add'>+{</div><div class='add'>+	switch (entry-&gt;type) {</div><div class='add'>+	case ACPI_SUBTABLE_COMMON:</div><div class='add'>+		return entry-&gt;hdr-&gt;common.length;</div><div class='add'>+	case ACPI_SUBTABLE_HMAT:</div><div class='add'>+		return entry-&gt;hdr-&gt;hmat.length;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __init</div><div class='add'>+acpi_get_subtable_header_length(struct acpi_subtable_entry *entry)</div><div class='add'>+{</div><div class='add'>+	switch (entry-&gt;type) {</div><div class='add'>+	case ACPI_SUBTABLE_COMMON:</div><div class='add'>+		return sizeof(entry-&gt;hdr-&gt;common);</div><div class='add'>+	case ACPI_SUBTABLE_HMAT:</div><div class='add'>+		return sizeof(entry-&gt;hdr-&gt;hmat);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum acpi_subtable_type __init</div><div class='add'>+acpi_get_subtable_type(char *id)</div><div class='add'>+{</div><div class='add'>+	if (strncmp(id, ACPI_SIG_HMAT, 4) == 0)</div><div class='add'>+		return ACPI_SUBTABLE_HMAT;</div><div class='add'>+	return ACPI_SUBTABLE_COMMON;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * acpi_parse_entries_array - for each proc_num find a suitable subtable</div><div class='ctx'>  *</div><div class='hunk'>@@ -240,14 +294,13 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)</div><div class='ctx'>  * On success returns sum of all matching entries for all proc handlers.</div><div class='ctx'>  * Otherwise, -ENODEV or -EINVAL is returned.</div><div class='ctx'>  */</div><div class='del'>-static int __init</div><div class='del'>-acpi_parse_entries_array(char *id, unsigned long table_size,</div><div class='add'>+static int __init acpi_parse_entries_array(char *id, unsigned long table_size,</div><div class='ctx'> 		struct acpi_table_header *table_header,</div><div class='ctx'> 		struct acpi_subtable_proc *proc, int proc_num,</div><div class='ctx'> 		unsigned int max_entries)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_subtable_header *entry;</div><div class='del'>-	unsigned long table_end;</div><div class='add'>+	struct acpi_subtable_entry entry;</div><div class='add'>+	unsigned long table_end, subtable_len, entry_len;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	int errs = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -270,19 +323,20 @@ acpi_parse_entries_array(char *id, unsigned long table_size,</div><div class='ctx'> </div><div class='ctx'> 	/* Parse all entries looking for a match. */</div><div class='ctx'> </div><div class='del'>-	entry = (struct acpi_subtable_header *)</div><div class='add'>+	entry.type = acpi_get_subtable_type(id);</div><div class='add'>+	entry.hdr = (union acpi_subtable_headers *)</div><div class='ctx'> 	    ((unsigned long)table_header + table_size);</div><div class='add'>+	subtable_len = acpi_get_subtable_header_length(&amp;entry);</div><div class='ctx'> </div><div class='del'>-	while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) &lt;</div><div class='del'>-	       table_end) {</div><div class='add'>+	while (((unsigned long)entry.hdr) + subtable_len  &lt; table_end) {</div><div class='ctx'> 		if (max_entries &amp;&amp; count &gt;= max_entries)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; proc_num; i++) {</div><div class='del'>-			if (entry-&gt;type != proc[i].id)</div><div class='add'>+			if (acpi_get_entry_type(&amp;entry) != proc[i].id)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (!proc[i].handler ||</div><div class='del'>-			     (!errs &amp;&amp; proc[i].handler(entry, table_end))) {</div><div class='add'>+			     (!errs &amp;&amp; proc[i].handler(entry.hdr, table_end))) {</div><div class='ctx'> 				errs++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -297,13 +351,14 @@ acpi_parse_entries_array(char *id, unsigned long table_size,</div><div class='ctx'> 		 * If entry-&gt;length is 0, break from this loop to avoid</div><div class='ctx'> 		 * infinite loop.</div><div class='ctx'> 		 */</div><div class='del'>-		if (entry-&gt;length == 0) {</div><div class='add'>+		entry_len = acpi_get_entry_length(&amp;entry);</div><div class='add'>+		if (entry_len == 0) {</div><div class='ctx'> 			pr_err("[%4.4s:0x%02x] Invalid zero length\n", id, proc-&gt;id);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		entry = (struct acpi_subtable_header *)</div><div class='del'>-		    ((unsigned long)entry + entry-&gt;length);</div><div class='add'>+		entry.hdr = (union acpi_subtable_headers *)</div><div class='add'>+		    ((unsigned long)entry.hdr + entry_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (max_entries &amp;&amp; count &gt; max_entries) {</div><div class='hunk'>@@ -314,8 +369,7 @@ acpi_parse_entries_array(char *id, unsigned long table_size,</div><div class='ctx'> 	return errs ? -EINVAL : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-acpi_table_parse_entries_array(char *id,</div><div class='add'>+int __init acpi_table_parse_entries_array(char *id,</div><div class='ctx'> 			 unsigned long table_size,</div><div class='ctx'> 			 struct acpi_subtable_proc *proc, int proc_num,</div><div class='ctx'> 			 unsigned int max_entries)</div><div class='hunk'>@@ -346,8 +400,7 @@ acpi_table_parse_entries_array(char *id,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-acpi_table_parse_entries(char *id,</div><div class='add'>+int __init acpi_table_parse_entries(char *id,</div><div class='ctx'> 			unsigned long table_size,</div><div class='ctx'> 			int entry_id,</div><div class='ctx'> 			acpi_tbl_entry_handler handler,</div><div class='hunk'>@@ -362,8 +415,7 @@ acpi_table_parse_entries(char *id,</div><div class='ctx'> 						max_entries);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-acpi_table_parse_madt(enum acpi_madt_type id,</div><div class='add'>+int __init acpi_table_parse_madt(enum acpi_madt_type id,</div><div class='ctx'> 		      acpi_tbl_entry_handler handler, unsigned int max_entries)</div><div class='ctx'> {</div><div class='ctx'> 	return acpi_table_parse_entries(ACPI_SIG_MADT,</div><div class='hunk'>@@ -670,8 +722,8 @@ static void __init acpi_table_initrd_scan(void)</div><div class='ctx'> 		table_length = table-&gt;length;</div><div class='ctx'> </div><div class='ctx'> 		/* Skip RSDT/XSDT which should only be used for override */</div><div class='del'>-		if (ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_RSDT) ||</div><div class='del'>-		    ACPI_COMPARE_NAME(table-&gt;signature, ACPI_SIG_XSDT)) {</div><div class='add'>+		if (ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_RSDT) ||</div><div class='add'>+		    ACPI_COMPARE_NAMESEG(table-&gt;signature, ACPI_SIG_XSDT)) {</div><div class='ctx'> 			acpi_os_unmap_memory(table, ACPI_HEADER_SIZE);</div><div class='ctx'> 			goto next_table;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -725,8 +777,7 @@ static void *amlcode __attribute__ ((weakref("AmlCode")));</div><div class='ctx'> static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code")));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_os_table_override(struct acpi_table_header *existing_table,</div><div class='add'>+acpi_status acpi_os_table_override(struct acpi_table_header *existing_table,</div><div class='ctx'> 		       struct acpi_table_header **new_table)</div><div class='ctx'> {</div><div class='ctx'> 	if (!existing_table || !new_table)</div><div class='hunk'>@@ -788,7 +839,6 @@ static int __init acpi_parse_apic_instance(char *str)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> early_param("acpi_apic_instance", acpi_parse_apic_instance);</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_force_table_verification_setup(char *s)</div><div class='hunk'>@@ -797,7 +847,6 @@ static int __init acpi_force_table_verification_setup(char *s)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> early_param("acpi_force_table_verification", acpi_force_table_verification_setup);</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_force_32bit_fadt_addr(char *s)</div><div class='hunk'>@@ -807,5 +856,4 @@ static int __init acpi_force_32bit_fadt_addr(char *s)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> early_param("acpi_force_32bit_fadt_addr", acpi_force_32bit_fadt_addr);</div><div class='head'>diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c<br/>index 78db97687f26..89363b245489 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/utils.c</a></div><div class='hunk'>@@ -739,6 +739,7 @@ EXPORT_SYMBOL(acpi_dev_found);</div><div class='ctx'> </div><div class='ctx'> struct acpi_dev_match_info {</div><div class='ctx'> 	const char *dev_name;</div><div class='add'>+	struct acpi_device *adev;</div><div class='ctx'> 	struct acpi_device_id hid[2];</div><div class='ctx'> 	const char *uid;</div><div class='ctx'> 	s64 hrv;</div><div class='hunk'>@@ -759,6 +760,7 @@ static int acpi_dev_match_cb(struct device *dev, void *data)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	match-&gt;dev_name = acpi_dev_name(adev);</div><div class='add'>+	match-&gt;adev = adev;</div><div class='ctx'> </div><div class='ctx'> 	if (match-&gt;hrv == -1)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -800,23 +802,26 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv)</div><div class='ctx'> 	match.hrv = hrv;</div><div class='ctx'> </div><div class='ctx'> 	dev = bus_find_device(&amp;acpi_bus_type, NULL, &amp;match, acpi_dev_match_cb);</div><div class='add'>+	put_device(dev);</div><div class='ctx'> 	return !!dev;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(acpi_dev_present);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * acpi_dev_get_first_match_name - Return name of first match of ACPI device</div><div class='add'>+ * acpi_dev_get_first_match_dev - Return the first match of ACPI device</div><div class='ctx'>  * @hid: Hardware ID of the device.</div><div class='ctx'>  * @uid: Unique ID of the device, pass NULL to not check _UID</div><div class='ctx'>  * @hrv: Hardware Revision of the device, pass -1 to not check _HRV</div><div class='ctx'>  *</div><div class='del'>- * Return device name if a matching device was present</div><div class='add'>+ * Return the first match of ACPI device if a matching device was present</div><div class='ctx'>  * at the moment of invocation, or NULL otherwise.</div><div class='ctx'>  *</div><div class='add'>+ * The caller is responsible to call put_device() on the returned device.</div><div class='add'>+ *</div><div class='ctx'>  * See additional information in acpi_dev_present() as well.</div><div class='ctx'>  */</div><div class='del'>-const char *</div><div class='del'>-acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv)</div><div class='add'>+struct acpi_device *</div><div class='add'>+acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_dev_match_info match = {};</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -826,9 +831,9 @@ acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv)</div><div class='ctx'> 	match.hrv = hrv;</div><div class='ctx'> </div><div class='ctx'> 	dev = bus_find_device(&amp;acpi_bus_type, NULL, &amp;match, acpi_dev_match_cb);</div><div class='del'>-	return dev ? match.dev_name : NULL;</div><div class='add'>+	return dev ? match.adev : NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(acpi_dev_get_first_match_name);</div><div class='add'>+EXPORT_SYMBOL(acpi_dev_get_first_match_dev);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * acpi_backlight= handling, this is done here rather then in video_detect.c</div><div class='head'>diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c<br/>index 43587ac680e4..31014c7d3793 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/video_detect.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/acpi/video_detect.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/acpi/video_detect.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/acpi/video_detect.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static int video_detect_force_none(const struct dmi_system_id *d)</div><div class='ctx'> static const struct dmi_system_id video_detect_dmi_table[] = {</div><div class='ctx'> 	/* On Samsung X360, the BIOS will set a flag (VDRV) if generic</div><div class='ctx'> 	 * ACPI backlight device is used. This flag will definitively break</div><div class='del'>-	 * the backlight interface (even the vendor interface) untill next</div><div class='add'>+	 * the backlight interface (even the vendor interface) until next</div><div class='ctx'> 	 * reboot. It's why we should prevent video.ko from being used here</div><div class='ctx'> 	 * and we can't rely on a later call to acpi_video_unregister().</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -141,6 +141,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {</div><div class='ctx'> 		DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+	.callback = video_detect_force_vendor,</div><div class='add'>+	.ident = "Sony VPCEH3U1E",</div><div class='add'>+	.matches = {</div><div class='add'>+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),</div><div class='add'>+		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * These models have a working acpi_video backlight control, and using</div><div class='head'>diff --git a/drivers/android/binder.c b/drivers/android/binder.c<br/>index 8685882da64c..6f0712f0767c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/android/binder.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/android/binder.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/android/binder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/android/binder.c</a></div><div class='hunk'>@@ -2057,7 +2057,8 @@ static size_t binder_get_object(struct binder_proc *proc,</div><div class='ctx'> 	size_t object_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	read_size = min_t(size_t, sizeof(*object), buffer-&gt;data_size - offset);</div><div class='del'>-	if (read_size &lt; sizeof(*hdr) || !IS_ALIGNED(offset, sizeof(u32)))</div><div class='add'>+	if (offset &gt; buffer-&gt;data_size || read_size &lt; sizeof(*hdr) ||</div><div class='add'>+	    !IS_ALIGNED(offset, sizeof(u32)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	binder_alloc_copy_from_buffer(&amp;proc-&gt;alloc, object, buffer,</div><div class='ctx'> 				      offset, read_size);</div><div class='hunk'>@@ -3120,6 +3121,7 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> </div><div class='ctx'> 	if (target_node &amp;&amp; target_node-&gt;txn_security_ctx) {</div><div class='ctx'> 		u32 secid;</div><div class='add'>+		size_t added_size;</div><div class='ctx'> </div><div class='ctx'> 		security_task_getsecid(proc-&gt;tsk, &amp;secid);</div><div class='ctx'> 		ret = security_secid_to_secctx(secid, &amp;secctx, &amp;secctx_sz);</div><div class='hunk'>@@ -3129,7 +3131,15 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 			return_error_line = __LINE__;</div><div class='ctx'> 			goto err_get_secctx_failed;</div><div class='ctx'> 		}</div><div class='del'>-		extra_buffers_size += ALIGN(secctx_sz, sizeof(u64));</div><div class='add'>+		added_size = ALIGN(secctx_sz, sizeof(u64));</div><div class='add'>+		extra_buffers_size += added_size;</div><div class='add'>+		if (extra_buffers_size &lt; added_size) {</div><div class='add'>+			/* integer overflow of extra_buffers_size */</div><div class='add'>+			return_error = BR_FAILED_REPLY;</div><div class='add'>+			return_error_param = EINVAL;</div><div class='add'>+			return_error_line = __LINE__;</div><div class='add'>+			goto err_bad_extra_size;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trace_binder_transaction(reply, t, target_node);</div><div class='hunk'>@@ -3479,6 +3489,7 @@ err_copy_data_failed:</div><div class='ctx'> 	t-&gt;buffer-&gt;transaction = NULL;</div><div class='ctx'> 	binder_alloc_free_buf(&amp;target_proc-&gt;alloc, t-&gt;buffer);</div><div class='ctx'> err_binder_alloc_buf_failed:</div><div class='add'>+err_bad_extra_size:</div><div class='ctx'> 	if (secctx)</div><div class='ctx'> 		security_release_secctx(secctx, secctx_sz);</div><div class='ctx'> err_get_secctx_failed:</div><div class='head'>diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c<br/>index 6389467670a0..bb929eb87116 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/android/binder_alloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/android/binder_alloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/android/binder_alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/android/binder_alloc.c</a></div><div class='hunk'>@@ -927,14 +927,13 @@ enum lru_status binder_alloc_free_page(struct list_head *item,</div><div class='ctx'> </div><div class='ctx'> 	index = page - alloc-&gt;pages;</div><div class='ctx'> 	page_addr = (uintptr_t)alloc-&gt;buffer + index * PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	mm = alloc-&gt;vma_vm_mm;</div><div class='add'>+	if (!mmget_not_zero(mm))</div><div class='add'>+		goto err_mmget;</div><div class='add'>+	if (!down_read_trylock(&amp;mm-&gt;mmap_sem))</div><div class='add'>+		goto err_down_read_mmap_sem_failed;</div><div class='ctx'> 	vma = binder_alloc_get_vma(alloc);</div><div class='del'>-	if (vma) {</div><div class='del'>-		if (!mmget_not_zero(alloc-&gt;vma_vm_mm))</div><div class='del'>-			goto err_mmget;</div><div class='del'>-		mm = alloc-&gt;vma_vm_mm;</div><div class='del'>-		if (!down_read_trylock(&amp;mm-&gt;mmap_sem))</div><div class='del'>-			goto err_down_write_mmap_sem_failed;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	list_lru_isolate(lru, item);</div><div class='ctx'> 	spin_unlock(lock);</div><div class='hunk'>@@ -945,10 +944,9 @@ enum lru_status binder_alloc_free_page(struct list_head *item,</div><div class='ctx'> 		zap_page_range(vma, page_addr, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		trace_binder_unmap_user_end(alloc, index);</div><div class='del'>-</div><div class='del'>-		up_read(&amp;mm-&gt;mmap_sem);</div><div class='del'>-		mmput(mm);</div><div class='ctx'> 	}</div><div class='add'>+	up_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	mmput(mm);</div><div class='ctx'> </div><div class='ctx'> 	trace_binder_unmap_kernel_start(alloc, index);</div><div class='ctx'> </div><div class='hunk'>@@ -961,7 +959,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item,</div><div class='ctx'> 	mutex_unlock(&amp;alloc-&gt;mutex);</div><div class='ctx'> 	return LRU_REMOVED_RETRY;</div><div class='ctx'> </div><div class='del'>-err_down_write_mmap_sem_failed:</div><div class='add'>+err_down_read_mmap_sem_failed:</div><div class='ctx'> 	mmput_async(mm);</div><div class='ctx'> err_mmget:</div><div class='ctx'> err_page_already_freed:</div><div class='head'>diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c<br/>index ce59253ec158..ea1175f7f147 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ata/ahci_qoriq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ata/ahci_qoriq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ata/ahci_qoriq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ata/ahci_qoriq.c</a></div><div class='hunk'>@@ -53,11 +53,13 @@</div><div class='ctx'> </div><div class='ctx'> enum ahci_qoriq_type {</div><div class='ctx'> 	AHCI_LS1021A,</div><div class='add'>+	AHCI_LS1028A,</div><div class='ctx'> 	AHCI_LS1043A,</div><div class='ctx'> 	AHCI_LS2080A,</div><div class='ctx'> 	AHCI_LS1046A,</div><div class='ctx'> 	AHCI_LS1088A,</div><div class='ctx'> 	AHCI_LS2088A,</div><div class='add'>+	AHCI_LX2160A,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ahci_qoriq_priv {</div><div class='hunk'>@@ -67,13 +69,17 @@ struct ahci_qoriq_priv {</div><div class='ctx'> 	bool is_dmacoherent;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool ecc_initialized;</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id ahci_qoriq_of_match[] = {</div><div class='ctx'> 	{ .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A},</div><div class='add'>+	{ .compatible = "fsl,ls1028a-ahci", .data = (void *)AHCI_LS1028A},</div><div class='ctx'> 	{ .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A},</div><div class='ctx'> 	{ .compatible = "fsl,ls2080a-ahci", .data = (void *)AHCI_LS2080A},</div><div class='ctx'> 	{ .compatible = "fsl,ls1046a-ahci", .data = (void *)AHCI_LS1046A},</div><div class='ctx'> 	{ .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A},</div><div class='ctx'> 	{ .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A},</div><div class='add'>+	{ .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);</div><div class='hunk'>@@ -165,9 +171,10 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> </div><div class='ctx'> 	switch (qpriv-&gt;type) {</div><div class='ctx'> 	case AHCI_LS1021A:</div><div class='del'>-		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+		if (!(qpriv-&gt;ecc_addr || ecc_initialized))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		writel(SATA_ECC_DISABLE, qpriv-&gt;ecc_addr);</div><div class='add'>+		else if (qpriv-&gt;ecc_addr &amp;&amp; !ecc_initialized)</div><div class='add'>+			writel(SATA_ECC_DISABLE, qpriv-&gt;ecc_addr);</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(LS1021A_PORT_PHY2, reg_base + PORT_PHY2);</div><div class='ctx'> 		writel(LS1021A_PORT_PHY3, reg_base + PORT_PHY3);</div><div class='hunk'>@@ -180,10 +187,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AHCI_LS1043A:</div><div class='del'>-		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+		if (!(qpriv-&gt;ecc_addr || ecc_initialized))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		writel(readl(qpriv-&gt;ecc_addr) | ECC_DIS_ARMV8_CH2,</div><div class='del'>-				qpriv-&gt;ecc_addr);</div><div class='add'>+		else if (qpriv-&gt;ecc_addr &amp;&amp; !ecc_initialized)</div><div class='add'>+			writel(readl(qpriv-&gt;ecc_addr) |</div><div class='add'>+			       ECC_DIS_ARMV8_CH2,</div><div class='add'>+			       qpriv-&gt;ecc_addr);</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);</div><div class='ctx'> 		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3);</div><div class='hunk'>@@ -202,10 +211,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AHCI_LS1046A:</div><div class='del'>-		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+		if (!(qpriv-&gt;ecc_addr || ecc_initialized))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		writel(readl(qpriv-&gt;ecc_addr) | ECC_DIS_ARMV8_CH2,</div><div class='del'>-				qpriv-&gt;ecc_addr);</div><div class='add'>+		else if (qpriv-&gt;ecc_addr &amp;&amp; !ecc_initialized)</div><div class='add'>+			writel(readl(qpriv-&gt;ecc_addr) |</div><div class='add'>+			       ECC_DIS_ARMV8_CH2,</div><div class='add'>+			       qpriv-&gt;ecc_addr);</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);</div><div class='ctx'> 		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3);</div><div class='hunk'>@@ -214,11 +225,15 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> 			writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case AHCI_LS1028A:</div><div class='ctx'> 	case AHCI_LS1088A:</div><div class='del'>-		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+	case AHCI_LX2160A:</div><div class='add'>+		if (!(qpriv-&gt;ecc_addr || ecc_initialized))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		writel(readl(qpriv-&gt;ecc_addr) | ECC_DIS_LS1088A,</div><div class='del'>-		       qpriv-&gt;ecc_addr);</div><div class='add'>+		else if (qpriv-&gt;ecc_addr &amp;&amp; !ecc_initialized)</div><div class='add'>+			writel(readl(qpriv-&gt;ecc_addr) |</div><div class='add'>+			       ECC_DIS_LS1088A,</div><div class='add'>+			       qpriv-&gt;ecc_addr);</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);</div><div class='ctx'> 		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3);</div><div class='hunk'>@@ -237,6 +252,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ecc_initialized = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -264,13 +280,18 @@ static int ahci_qoriq_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	qoriq_priv-&gt;type = (enum ahci_qoriq_type)of_id-&gt;data;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,</div><div class='del'>-			"sata-ecc");</div><div class='del'>-	if (res) {</div><div class='del'>-		qoriq_priv-&gt;ecc_addr = devm_ioremap_resource(dev, res);</div><div class='del'>-		if (IS_ERR(qoriq_priv-&gt;ecc_addr))</div><div class='del'>-			return PTR_ERR(qoriq_priv-&gt;ecc_addr);</div><div class='add'>+	if (unlikely(!ecc_initialized)) {</div><div class='add'>+		res = platform_get_resource_byname(pdev,</div><div class='add'>+						   IORESOURCE_MEM,</div><div class='add'>+						   "sata-ecc");</div><div class='add'>+		if (res) {</div><div class='add'>+			qoriq_priv-&gt;ecc_addr =</div><div class='add'>+				devm_ioremap_resource(dev, res);</div><div class='add'>+			if (IS_ERR(qoriq_priv-&gt;ecc_addr))</div><div class='add'>+				return PTR_ERR(qoriq_priv-&gt;ecc_addr);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	qoriq_priv-&gt;is_dmacoherent = of_dma_is_coherent(np);</div><div class='ctx'> </div><div class='ctx'> 	rc = ahci_platform_enable_resources(hpriv);</div><div class='head'>diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c<br/>index b3ed8f9953a8..173e6f2dd9af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ata/libata-zpodd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ata/libata-zpodd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ata/libata-zpodd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ata/libata-zpodd.c</a></div><div class='hunk'>@@ -52,38 +52,52 @@ static int eject_tray(struct ata_device *dev)</div><div class='ctx'> /* Per the spec, only slot type and drawer type ODD can be supported */</div><div class='ctx'> static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)</div><div class='ctx'> {</div><div class='del'>-	char buf[16];</div><div class='add'>+	char *buf;</div><div class='ctx'> 	unsigned int ret;</div><div class='del'>-	struct rm_feature_desc *desc = (void *)(buf + 8);</div><div class='add'>+	struct rm_feature_desc *desc;</div><div class='ctx'> 	struct ata_taskfile tf;</div><div class='ctx'> 	static const char cdb[] = {  GPCMD_GET_CONFIGURATION,</div><div class='ctx'> 			2,      /* only 1 feature descriptor requested */</div><div class='ctx'> 			0, 3,   /* 3, removable medium feature */</div><div class='ctx'> 			0, 0, 0,/* reserved */</div><div class='del'>-			0, sizeof(buf),</div><div class='add'>+			0, 16,</div><div class='ctx'> 			0, 0, 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	buf = kzalloc(16, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return ODD_MECH_TYPE_UNSUPPORTED;</div><div class='add'>+	desc = (void *)(buf + 8);</div><div class='add'>+</div><div class='ctx'> 	ata_tf_init(dev, &amp;tf);</div><div class='ctx'> 	tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='ctx'> 	tf.command = ATA_CMD_PACKET;</div><div class='ctx'> 	tf.protocol = ATAPI_PROT_PIO;</div><div class='del'>-	tf.lbam = sizeof(buf);</div><div class='add'>+	tf.lbam = 16;</div><div class='ctx'> </div><div class='ctx'> 	ret = ata_exec_internal(dev, &amp;tf, cdb, DMA_FROM_DEVICE,</div><div class='del'>-				buf, sizeof(buf), 0);</div><div class='del'>-	if (ret)</div><div class='add'>+				buf, 16, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 		return ODD_MECH_TYPE_UNSUPPORTED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (be16_to_cpu(desc-&gt;feature_code) != 3)</div><div class='add'>+	if (be16_to_cpu(desc-&gt;feature_code) != 3) {</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 		return ODD_MECH_TYPE_UNSUPPORTED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (desc-&gt;mech_type == 0 &amp;&amp; desc-&gt;load == 0 &amp;&amp; desc-&gt;eject == 1)</div><div class='add'>+	if (desc-&gt;mech_type == 0 &amp;&amp; desc-&gt;load == 0 &amp;&amp; desc-&gt;eject == 1) {</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 		return ODD_MECH_TYPE_SLOT;</div><div class='del'>-	else if (desc-&gt;mech_type == 1 &amp;&amp; desc-&gt;load == 0 &amp;&amp; desc-&gt;eject == 1)</div><div class='add'>+	} else if (desc-&gt;mech_type == 1 &amp;&amp; desc-&gt;load == 0 &amp;&amp;</div><div class='add'>+		   desc-&gt;eject == 1) {</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 		return ODD_MECH_TYPE_DRAWER;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 		return ODD_MECH_TYPE_UNSUPPORTED;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Test if ODD is zero power ready by sense code */</div><div class='head'>diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c<br/>index 11e1663bdc4d..b2c06da4f62e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/atm/firestream.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/atm/firestream.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/atm/firestream.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/atm/firestream.c</a></div><div class='hunk'>@@ -1646,7 +1646,7 @@ static irqreturn_t fs_irq (int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; ISR_TBRQ_W) {</div><div class='del'>-		fs_dprintk (FS_DEBUG_IRQ, "Data tramsitted!\n");</div><div class='add'>+		fs_dprintk (FS_DEBUG_IRQ, "Data transmitted!\n");</div><div class='ctx'> 		process_txdone_queue (dev, &amp;dev-&gt;tx_relq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c<br/>index 82532c299bb5..5278c57dce73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/atm/iphase.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/atm/iphase.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/atm/iphase.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/atm/iphase.c</a></div><div class='hunk'>@@ -2826,8 +2826,8 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)</div><div class='ctx'>          case 0x6:</div><div class='ctx'>          {  </div><div class='ctx'>              ia_cmds.status = 0; </div><div class='del'>-             printk("skb = 0x%lx\n", (long)skb_peek(&amp;iadev-&gt;tx_backlog));</div><div class='del'>-             printk("rtn_q: 0x%lx\n",(long)ia_deque_rtn_q(&amp;iadev-&gt;tx_return_q));</div><div class='add'>+             printk("skb = 0x%p\n", skb_peek(&amp;iadev-&gt;tx_backlog));</div><div class='add'>+             printk("rtn_q: 0x%p\n",ia_deque_rtn_q(&amp;iadev-&gt;tx_return_q));</div><div class='ctx'>          }</div><div class='ctx'>              break;</div><div class='ctx'>          case 0x8:</div><div class='head'>diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig<br/>index 57410f9c5d44..c52c738e554a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/auxdisplay/Kconfig</a></div><div class='hunk'>@@ -164,9 +164,7 @@ config ARM_CHARLCD</div><div class='ctx'> 	  line and the Linux version on the second line, but that's</div><div class='ctx'> 	  still useful.</div><div class='ctx'> </div><div class='del'>-endif # AUXDISPLAY</div><div class='del'>-</div><div class='del'>-menuconfig PANEL</div><div class='add'>+menuconfig PARPORT_PANEL</div><div class='ctx'> 	tristate "Parallel port LCD/Keypad Panel support"</div><div class='ctx'> 	depends on PARPORT</div><div class='ctx'> 	select CHARLCD</div><div class='hunk'>@@ -178,7 +176,7 @@ menuconfig PANEL</div><div class='ctx'> 	  compiled as a module, or linked into the kernel and started at boot.</div><div class='ctx'> 	  If you don't understand what all this is about, say N.</div><div class='ctx'> </div><div class='del'>-if PANEL</div><div class='add'>+if PARPORT_PANEL</div><div class='ctx'> </div><div class='ctx'> config PANEL_PARPORT</div><div class='ctx'> 	int "Default parallel port number (0=LPT1)"</div><div class='hunk'>@@ -419,8 +417,11 @@ config PANEL_LCD_PIN_BL</div><div class='ctx'> </div><div class='ctx'> 	  Default for the 'BL' pin in custom profile is '0' (uncontrolled).</div><div class='ctx'> </div><div class='add'>+endif # PARPORT_PANEL</div><div class='add'>+</div><div class='ctx'> config PANEL_CHANGE_MESSAGE</div><div class='ctx'> 	bool "Change LCD initialization message ?"</div><div class='add'>+	depends on CHARLCD</div><div class='ctx'> 	default "n"</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This allows you to replace the boot message indicating the kernel version</div><div class='hunk'>@@ -444,7 +445,34 @@ config PANEL_BOOT_MESSAGE</div><div class='ctx'> 	  An empty message will only clear the display at driver init time. Any other</div><div class='ctx'> 	  printf()-formatted message is valid with newline and escape codes.</div><div class='ctx'> </div><div class='del'>-endif # PANEL</div><div class='add'>+choice</div><div class='add'>+	prompt "Backlight initial state"</div><div class='add'>+	default CHARLCD_BL_FLASH</div><div class='add'>+</div><div class='add'>+	config CHARLCD_BL_OFF</div><div class='add'>+		bool "Off"</div><div class='add'>+		help</div><div class='add'>+		  Backlight is initially turned off</div><div class='add'>+</div><div class='add'>+	config CHARLCD_BL_ON</div><div class='add'>+		bool "On"</div><div class='add'>+		help</div><div class='add'>+		  Backlight is initially turned on</div><div class='add'>+</div><div class='add'>+	config CHARLCD_BL_FLASH</div><div class='add'>+		bool "Flash"</div><div class='add'>+		help</div><div class='add'>+		  Backlight is flashed briefly on init</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+endif # AUXDISPLAY</div><div class='add'>+</div><div class='add'>+config PANEL</div><div class='add'>+	tristate "Parallel port LCD/Keypad Panel support (OLD OPTION)"</div><div class='add'>+	depends on PARPORT</div><div class='add'>+	select AUXDISPLAY</div><div class='add'>+	select PARPORT_PANEL</div><div class='ctx'> </div><div class='ctx'> config CHARLCD</div><div class='ctx'> 	tristate "Character LCD core support" if COMPILE_TEST</div><div class='head'>diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile<br/>index 7ac6776ca3f6..cf54b5efb07e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/auxdisplay/Makefile</a></div><div class='hunk'>@@ -10,4 +10,4 @@ obj-$(CONFIG_CFAG12864B)	+= cfag12864b.o cfag12864bfb.o</div><div class='ctx'> obj-$(CONFIG_IMG_ASCII_LCD)	+= img-ascii-lcd.o</div><div class='ctx'> obj-$(CONFIG_HD44780)		+= hd44780.o</div><div class='ctx'> obj-$(CONFIG_HT16K33)		+= ht16k33.o</div><div class='del'>-obj-$(CONFIG_PANEL)             += panel.o</div><div class='add'>+obj-$(CONFIG_PARPORT_PANEL)	+= panel.o</div><div class='head'>diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c<br/>index 60e0b772673f..92745efefb54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/charlcd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/charlcd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/charlcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/auxdisplay/charlcd.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ struct charlcd_priv {</div><div class='ctx'> 	unsigned long long drvdata[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_priv(p)	container_of(p, struct charlcd_priv, lcd)</div><div class='add'>+#define charlcd_to_priv(p)	container_of(p, struct charlcd_priv, lcd)</div><div class='ctx'> </div><div class='ctx'> /* Device single-open policy control */</div><div class='ctx'> static atomic_t charlcd_available = ATOMIC_INIT(1);</div><div class='hunk'>@@ -105,7 +105,7 @@ static void long_sleep(int ms)</div><div class='ctx'> /* turn the backlight on or off */</div><div class='ctx'> static void charlcd_backlight(struct charlcd *lcd, int on)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	if (!lcd-&gt;ops-&gt;backlight)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -134,7 +134,7 @@ static void charlcd_bl_off(struct work_struct *work)</div><div class='ctx'> /* turn the backlight on for a little while */</div><div class='ctx'> void charlcd_poke(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	if (!lcd-&gt;ops-&gt;backlight)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(charlcd_poke);</div><div class='ctx'> </div><div class='ctx'> static void charlcd_gotoxy(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> 	unsigned int addr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -170,7 +170,7 @@ static void charlcd_gotoxy(struct charlcd *lcd)</div><div class='ctx'> </div><div class='ctx'> static void charlcd_home(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;addr.x = 0;</div><div class='ctx'> 	priv-&gt;addr.y = 0;</div><div class='hunk'>@@ -179,7 +179,7 @@ static void charlcd_home(struct charlcd *lcd)</div><div class='ctx'> </div><div class='ctx'> static void charlcd_print(struct charlcd *lcd, char c)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;addr.x &lt; lcd-&gt;bwidth) {</div><div class='ctx'> 		if (lcd-&gt;char_conv)</div><div class='hunk'>@@ -211,7 +211,7 @@ static void charlcd_clear_fast(struct charlcd *lcd)</div><div class='ctx'> /* clears the display and resets X/Y */</div><div class='ctx'> static void charlcd_clear_display(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	lcd-&gt;ops-&gt;write_cmd(lcd, LCD_CMD_DISPLAY_CLEAR);</div><div class='ctx'> 	priv-&gt;addr.x = 0;</div><div class='hunk'>@@ -223,7 +223,7 @@ static void charlcd_clear_display(struct charlcd *lcd)</div><div class='ctx'> static int charlcd_init_display(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='ctx'> 	void (*write_cmd_raw)(struct charlcd *lcd, int cmd);</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> 	u8 init;</div><div class='ctx'> </div><div class='ctx'> 	if (lcd-&gt;ifwidth != 4 &amp;&amp; lcd-&gt;ifwidth != 8)</div><div class='hunk'>@@ -369,7 +369,7 @@ static bool parse_xy(const char *s, unsigned long *x, unsigned long *y)</div><div class='ctx'> </div><div class='ctx'> static inline int handle_lcd_special_code(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	/* LCD special codes */</div><div class='ctx'> </div><div class='hunk'>@@ -580,7 +580,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)</div><div class='ctx'> </div><div class='ctx'> static void charlcd_write_char(struct charlcd *lcd, char c)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	/* first, we'll test if we're in escape mode */</div><div class='ctx'> 	if ((c != '\n') &amp;&amp; priv-&gt;esc_seq.len &gt;= 0) {</div><div class='hunk'>@@ -705,7 +705,7 @@ static ssize_t charlcd_write(struct file *file, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> static int charlcd_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(the_charlcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(the_charlcd);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EBUSY;</div><div class='hunk'>@@ -763,10 +763,24 @@ static void charlcd_puts(struct charlcd *lcd, const char *s)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PANEL_BOOT_MESSAGE</div><div class='add'>+#define LCD_INIT_TEXT CONFIG_PANEL_BOOT_MESSAGE</div><div class='add'>+#else</div><div class='add'>+#define LCD_INIT_TEXT "Linux-" UTS_RELEASE "\n"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CHARLCD_BL_ON</div><div class='add'>+#define LCD_INIT_BL "\x1b[L+"</div><div class='add'>+#elif defined(CONFIG_CHARLCD_BL_FLASH)</div><div class='add'>+#define LCD_INIT_BL "\x1b[L*"</div><div class='add'>+#else</div><div class='add'>+#define LCD_INIT_BL "\x1b[L-"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* initialize the LCD driver */</div><div class='ctx'> static int charlcd_init(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (lcd-&gt;ops-&gt;backlight) {</div><div class='hunk'>@@ -784,13 +798,8 @@ static int charlcd_init(struct charlcd *lcd)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* display a short message */</div><div class='del'>-#ifdef CONFIG_PANEL_CHANGE_MESSAGE</div><div class='del'>-#ifdef CONFIG_PANEL_BOOT_MESSAGE</div><div class='del'>-	charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE);</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-	charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE "\n");</div><div class='del'>-#endif</div><div class='add'>+	charlcd_puts(lcd, "\x1b[Lc\x1b[Lb" LCD_INIT_BL LCD_INIT_TEXT);</div><div class='add'>+</div><div class='ctx'> 	/* clear the display on the next device opening */</div><div class='ctx'> 	priv-&gt;must_clear = true;</div><div class='ctx'> 	charlcd_home(lcd);</div><div class='hunk'>@@ -818,6 +827,12 @@ struct charlcd *charlcd_alloc(unsigned int drvdata_size)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(charlcd_alloc);</div><div class='ctx'> </div><div class='add'>+void charlcd_free(struct charlcd *lcd)</div><div class='add'>+{</div><div class='add'>+	kfree(charlcd_to_priv(lcd));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(charlcd_free);</div><div class='add'>+</div><div class='ctx'> static int panel_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'> 			    void *unused)</div><div class='ctx'> {</div><div class='hunk'>@@ -866,7 +881,7 @@ EXPORT_SYMBOL_GPL(charlcd_register);</div><div class='ctx'> </div><div class='ctx'> int charlcd_unregister(struct charlcd *lcd)</div><div class='ctx'> {</div><div class='del'>-	struct charlcd_priv *priv = to_priv(lcd);</div><div class='add'>+	struct charlcd_priv *priv = charlcd_to_priv(lcd);</div><div class='ctx'> </div><div class='ctx'> 	unregister_reboot_notifier(&amp;panel_notifier);</div><div class='ctx'> 	charlcd_puts(lcd, "\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-");</div><div class='head'>diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c<br/>index 9ad93ea42fdc..ab15b64707ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/hd44780.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/hd44780.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/hd44780.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/auxdisplay/hd44780.c</a></div><div class='hunk'>@@ -271,7 +271,7 @@ static int hd44780_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	kfree(lcd);</div><div class='add'>+	charlcd_free(lcd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -280,6 +280,8 @@ static int hd44780_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct charlcd *lcd = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	charlcd_unregister(lcd);</div><div class='add'>+</div><div class='add'>+	charlcd_free(lcd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c<br/>index 21b9b2f2470a..e06de63497cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/panel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/auxdisplay/panel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/auxdisplay/panel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/auxdisplay/panel.c</a></div><div class='hunk'>@@ -1620,7 +1620,7 @@ err_lcd_unreg:</div><div class='ctx'> 	if (lcd.enabled)</div><div class='ctx'> 		charlcd_unregister(lcd.charlcd);</div><div class='ctx'> err_unreg_device:</div><div class='del'>-	kfree(lcd.charlcd);</div><div class='add'>+	charlcd_free(lcd.charlcd);</div><div class='ctx'> 	lcd.charlcd = NULL;</div><div class='ctx'> 	parport_unregister_device(pprt);</div><div class='ctx'> 	pprt = NULL;</div><div class='hunk'>@@ -1647,7 +1647,7 @@ static void panel_detach(struct parport *port)</div><div class='ctx'> 	if (lcd.enabled) {</div><div class='ctx'> 		charlcd_unregister(lcd.charlcd);</div><div class='ctx'> 		lcd.initialized = false;</div><div class='del'>-		kfree(lcd.charlcd);</div><div class='add'>+		charlcd_free(lcd.charlcd);</div><div class='ctx'> 		lcd.charlcd = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig<br/>index 059700ea3521..dc404492381d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,6 @@ menu "Generic Driver Options"</div><div class='ctx'> </div><div class='ctx'> config UEVENT_HELPER</div><div class='ctx'> 	bool "Support for uevent helper"</div><div class='del'>-	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  The uevent helper program is forked by the kernel for</div><div class='ctx'> 	  every uevent.</div><div class='hunk'>@@ -149,6 +148,14 @@ config DEBUG_TEST_DRIVER_REMOVE</div><div class='ctx'> 	  unusable. You should say N here unless you are explicitly looking to</div><div class='ctx'> 	  test this functionality.</div><div class='ctx'> </div><div class='add'>+config HMEM_REPORTING</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+	depends on NUMA</div><div class='add'>+	help</div><div class='add'>+	  Enable reporting for heterogenous memory access attributes under</div><div class='add'>+	  their non-uniform memory nodes.</div><div class='add'>+</div><div class='ctx'> source "drivers/base/test/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config SYS_HYPERVISOR</div><div class='hunk'>@@ -174,7 +181,6 @@ source "drivers/base/regmap/Kconfig"</div><div class='ctx'> config DMA_SHARED_BUFFER</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select IRQ_WORK</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables the framework for buffer-sharing between</div><div class='head'>diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c<br/>index edfcf8d982e4..1739d7e1952a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/arch_topology.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/arch_topology.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/arch_topology.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/arch_topology.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='del'>-#include &lt;linux/arch_topology.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -31,7 +30,6 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,</div><div class='ctx'> 		per_cpu(freq_scale, i) = scale;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_MUTEX(cpu_scale_mutex);</div><div class='ctx'> DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;</div><div class='ctx'> </div><div class='ctx'> void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity)</div><div class='hunk'>@@ -51,37 +49,7 @@ static ssize_t cpu_capacity_show(struct device *dev,</div><div class='ctx'> static void update_topology_flags_workfn(struct work_struct *work);</div><div class='ctx'> static DECLARE_WORK(update_topology_flags_work, update_topology_flags_workfn);</div><div class='ctx'> </div><div class='del'>-static ssize_t cpu_capacity_store(struct device *dev,</div><div class='del'>-				  struct device_attribute *attr,</div><div class='del'>-				  const char *buf,</div><div class='del'>-				  size_t count)</div><div class='del'>-{</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='del'>-	int this_cpu = cpu-&gt;dev.id;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long new_capacity;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = kstrtoul(buf, 0, &amp;new_capacity);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	if (new_capacity &gt; SCHED_CAPACITY_SCALE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;cpu_scale_mutex);</div><div class='del'>-	for_each_cpu(i, &amp;cpu_topology[this_cpu].core_sibling)</div><div class='del'>-		topology_set_cpu_scale(i, new_capacity);</div><div class='del'>-	mutex_unlock(&amp;cpu_scale_mutex);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;update_topology_flags_work);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR_RW(cpu_capacity);</div><div class='add'>+static DEVICE_ATTR_RO(cpu_capacity);</div><div class='ctx'> </div><div class='ctx'> static int register_cpu_capacity_sysctl(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -141,7 +109,6 @@ void topology_normalize_cpu_scale(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale);</div><div class='del'>-	mutex_lock(&amp;cpu_scale_mutex);</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		pr_debug("cpu_capacity: cpu=%d raw_capacity=%u\n",</div><div class='ctx'> 			 cpu, raw_capacity[cpu]);</div><div class='hunk'>@@ -151,7 +118,6 @@ void topology_normalize_cpu_scale(void)</div><div class='ctx'> 		pr_debug("cpu_capacity: CPU%d cpu_capacity=%lu\n",</div><div class='ctx'> 			cpu, topology_get_cpu_scale(NULL, cpu));</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;cpu_scale_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)</div><div class='head'>diff --git a/drivers/base/core.c b/drivers/base/core.c<br/>index 4aeaa0c92bda..fd7511e04e62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/core.c</a></div><div class='hunk'>@@ -1999,6 +1999,11 @@ static int device_private_init(struct device *dev)</div><div class='ctx'>  * NOTE: _Never_ directly free @dev after calling this function, even</div><div class='ctx'>  * if it returned an error! Always use put_device() to give up your</div><div class='ctx'>  * reference instead.</div><div class='add'>+ *</div><div class='add'>+ * Rule of thumb is: if device_add() succeeds, you should call</div><div class='add'>+ * device_del() when you want to get rid of it. If device_add() has</div><div class='add'>+ * *not* succeeded, use *only* put_device() to drop the reference</div><div class='add'>+ * count.</div><div class='ctx'>  */</div><div class='ctx'> int device_add(struct device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/dd.c b/drivers/base/dd.c<br/>index a823f469e53f..0df9b4461766 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/dd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/dd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/dd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/dd.c</a></div><div class='hunk'>@@ -490,7 +490,7 @@ re_probe:</div><div class='ctx'> 	if (dev-&gt;bus-&gt;dma_configure) {</div><div class='ctx'> 		ret = dev-&gt;bus-&gt;dma_configure(dev);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto dma_failed;</div><div class='add'>+			goto probe_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (driver_sysfs_add(dev)) {</div><div class='hunk'>@@ -546,14 +546,13 @@ re_probe:</div><div class='ctx'> 	goto done;</div><div class='ctx'> </div><div class='ctx'> probe_failed:</div><div class='del'>-	arch_teardown_dma_ops(dev);</div><div class='del'>-dma_failed:</div><div class='ctx'> 	if (dev-&gt;bus)</div><div class='ctx'> 		blocking_notifier_call_chain(&amp;dev-&gt;bus-&gt;p-&gt;bus_notifier,</div><div class='ctx'> 					     BUS_NOTIFY_DRIVER_NOT_BOUND, dev);</div><div class='ctx'> pinctrl_bind_failed:</div><div class='ctx'> 	device_links_no_driver(dev);</div><div class='ctx'> 	devres_release_all(dev);</div><div class='add'>+	arch_teardown_dma_ops(dev);</div><div class='ctx'> 	driver_sysfs_remove(dev);</div><div class='ctx'> 	dev-&gt;driver = NULL;</div><div class='ctx'> 	dev_set_drvdata(dev, NULL);</div><div class='head'>diff --git a/drivers/base/firmware_loader/Kconfig b/drivers/base/firmware_loader/Kconfig<br/>index eb15d976a9ea..38f2da6f5c2b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/firmware_loader/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/firmware_loader/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/firmware_loader/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/firmware_loader/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menu "Firmware loader"</div><div class='ctx'> </div><div class='ctx'> config FW_LOADER</div><div class='head'>diff --git a/drivers/base/firmware_loader/builtin/.gitignore b/drivers/base/firmware_loader/builtin/.gitignore<br/>index 9c8bdb9fdcc3..166f76b43049 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/firmware_loader/builtin/.gitignore?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/firmware_loader/builtin/.gitignore</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/firmware_loader/builtin/.gitignore?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/firmware_loader/builtin/.gitignore</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> *.gen.S</div><div class='head'>diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c<br/>index b5c865fe263b..f962488546b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/firmware_loader/fallback.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/firmware_loader/fallback.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/firmware_loader/fallback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/firmware_loader/fallback.c</a></div><div class='hunk'>@@ -674,8 +674,8 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags)</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called if direct lookup for the firmware failed, it enables</div><div class='ctx'>  * a fallback mechanism through userspace by exposing a sysfs loading</div><div class='del'>- * interface. Userspace is in charge of loading the firmware through the syfs</div><div class='del'>- * loading interface. This syfs fallback mechanism may be disabled completely</div><div class='add'>+ * interface. Userspace is in charge of loading the firmware through the sysfs</div><div class='add'>+ * loading interface. This sysfs fallback mechanism may be disabled completely</div><div class='ctx'>  * on a system by setting the proc sysctl value ignore_sysfs_fallback to true.</div><div class='ctx'>  * If this false we check if the internal API caller set the @FW_OPT_NOFALLBACK</div><div class='ctx'>  * flag, if so it would also disable the fallback mechanism. A system may want</div><div class='hunk'>@@ -693,7 +693,7 @@ int firmware_fallback_sysfs(struct firmware *fw, const char *name,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(opt_flags &amp; FW_OPT_NO_WARN))</div><div class='del'>-		dev_warn(device, "Falling back to syfs fallback for: %s\n",</div><div class='add'>+		dev_warn(device, "Falling back to sysfs fallback for: %s\n",</div><div class='ctx'> 				 name);</div><div class='ctx'> 	else</div><div class='ctx'> 		dev_dbg(device, "Falling back to sysfs fallback for: %s\n",</div><div class='head'>diff --git a/drivers/base/memory.c b/drivers/base/memory.c<br/>index cb8347500ce2..e49028a60429 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/memory.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/memory.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/memory.c</a></div><div class='hunk'>@@ -506,7 +506,7 @@ static ssize_t probe_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	ret = lock_device_hotplug_sysfs();</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	nid = memory_add_physaddr_to_nid(phys_addr);</div><div class='ctx'> 	ret = __add_memory(nid, phys_addr,</div><div class='head'>diff --git a/drivers/base/node.c b/drivers/base/node.c<br/>index 86d6cd92ce3d..8598fcbd2a17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/node.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/node.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/node.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/node.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -59,6 +60,302 @@ static inline ssize_t node_read_cpulist(struct device *dev,</div><div class='ctx'> static DEVICE_ATTR(cpumap,  S_IRUGO, node_read_cpumask, NULL);</div><div class='ctx'> static DEVICE_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct node_access_nodes - Access class device to hold user visible</div><div class='add'>+ * 			      relationships to other nodes.</div><div class='add'>+ * @dev:	Device for this memory access class</div><div class='add'>+ * @list_node:	List element in the node's access list</div><div class='add'>+ * @access:	The access class rank</div><div class='add'>+ */</div><div class='add'>+struct node_access_nodes {</div><div class='add'>+	struct device		dev;</div><div class='add'>+	struct list_head	list_node;</div><div class='add'>+	unsigned		access;</div><div class='add'>+#ifdef CONFIG_HMEM_REPORTING</div><div class='add'>+	struct node_hmem_attrs	hmem_attrs;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+#define to_access_nodes(dev) container_of(dev, struct node_access_nodes, dev)</div><div class='add'>+</div><div class='add'>+static struct attribute *node_init_access_node_attrs[] = {</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *node_targ_access_node_attrs[] = {</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group initiators = {</div><div class='add'>+	.name	= "initiators",</div><div class='add'>+	.attrs	= node_init_access_node_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group targets = {</div><div class='add'>+	.name	= "targets",</div><div class='add'>+	.attrs	= node_targ_access_node_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *node_access_node_groups[] = {</div><div class='add'>+	&amp;initiators,</div><div class='add'>+	&amp;targets,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void node_remove_accesses(struct node *node)</div><div class='add'>+{</div><div class='add'>+	struct node_access_nodes *c, *cnext;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(c, cnext, &amp;node-&gt;access_list, list_node) {</div><div class='add'>+		list_del(&amp;c-&gt;list_node);</div><div class='add'>+		device_unregister(&amp;c-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void node_access_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(to_access_nodes(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct node_access_nodes *node_init_node_access(struct node *node,</div><div class='add'>+						       unsigned access)</div><div class='add'>+{</div><div class='add'>+	struct node_access_nodes *access_node;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(access_node, &amp;node-&gt;access_list, list_node)</div><div class='add'>+		if (access_node-&gt;access == access)</div><div class='add'>+			return access_node;</div><div class='add'>+</div><div class='add'>+	access_node = kzalloc(sizeof(*access_node), GFP_KERNEL);</div><div class='add'>+	if (!access_node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	access_node-&gt;access = access;</div><div class='add'>+	dev = &amp;access_node-&gt;dev;</div><div class='add'>+	dev-&gt;parent = &amp;node-&gt;dev;</div><div class='add'>+	dev-&gt;release = node_access_release;</div><div class='add'>+	dev-&gt;groups = node_access_node_groups;</div><div class='add'>+	if (dev_set_name(dev, "access%u", access))</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	if (device_register(dev))</div><div class='add'>+		goto free_name;</div><div class='add'>+</div><div class='add'>+	pm_runtime_no_callbacks(dev);</div><div class='add'>+	list_add_tail(&amp;access_node-&gt;list_node, &amp;node-&gt;access_list);</div><div class='add'>+	return access_node;</div><div class='add'>+free_name:</div><div class='add'>+	kfree_const(dev-&gt;kobj.name);</div><div class='add'>+free:</div><div class='add'>+	kfree(access_node);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HMEM_REPORTING</div><div class='add'>+#define ACCESS_ATTR(name) 						   \</div><div class='add'>+static ssize_t name##_show(struct device *dev,				   \</div><div class='add'>+			   struct device_attribute *attr,		   \</div><div class='add'>+			   char *buf)					   \</div><div class='add'>+{									   \</div><div class='add'>+	return sprintf(buf, "%u\n", to_access_nodes(dev)-&gt;hmem_attrs.name); \</div><div class='add'>+}									   \</div><div class='add'>+static DEVICE_ATTR_RO(name);</div><div class='add'>+</div><div class='add'>+ACCESS_ATTR(read_bandwidth)</div><div class='add'>+ACCESS_ATTR(read_latency)</div><div class='add'>+ACCESS_ATTR(write_bandwidth)</div><div class='add'>+ACCESS_ATTR(write_latency)</div><div class='add'>+</div><div class='add'>+static struct attribute *access_attrs[] = {</div><div class='add'>+	&amp;dev_attr_read_bandwidth.attr,</div><div class='add'>+	&amp;dev_attr_read_latency.attr,</div><div class='add'>+	&amp;dev_attr_write_bandwidth.attr,</div><div class='add'>+	&amp;dev_attr_write_latency.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * node_set_perf_attrs - Set the performance values for given access class</div><div class='add'>+ * @nid: Node identifier to be set</div><div class='add'>+ * @hmem_attrs: Heterogeneous memory performance attributes</div><div class='add'>+ * @access: The access class the for the given attributes</div><div class='add'>+ */</div><div class='add'>+void node_set_perf_attrs(unsigned int nid, struct node_hmem_attrs *hmem_attrs,</div><div class='add'>+			 unsigned access)</div><div class='add'>+{</div><div class='add'>+	struct node_access_nodes *c;</div><div class='add'>+	struct node *node;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!node_online(nid)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	node = node_devices[nid];</div><div class='add'>+	c = node_init_node_access(node, access);</div><div class='add'>+	if (!c)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	c-&gt;hmem_attrs = *hmem_attrs;</div><div class='add'>+	for (i = 0; access_attrs[i] != NULL; i++) {</div><div class='add'>+		if (sysfs_add_file_to_group(&amp;c-&gt;dev.kobj, access_attrs[i],</div><div class='add'>+					    "initiators")) {</div><div class='add'>+			pr_info("failed to add performance attribute to node %d\n",</div><div class='add'>+				nid);</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'>+/**</div><div class='add'>+ * struct node_cache_info - Internal tracking for memory node caches</div><div class='add'>+ * @dev:	Device represeting the cache level</div><div class='add'>+ * @node:	List element for tracking in the node</div><div class='add'>+ * @cache_attrs:Attributes for this cache level</div><div class='add'>+ */</div><div class='add'>+struct node_cache_info {</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct list_head node;</div><div class='add'>+	struct node_cache_attrs cache_attrs;</div><div class='add'>+};</div><div class='add'>+#define to_cache_info(device) container_of(device, struct node_cache_info, dev)</div><div class='add'>+</div><div class='add'>+#define CACHE_ATTR(name, fmt) 						\</div><div class='add'>+static ssize_t name##_show(struct device *dev,				\</div><div class='add'>+			   struct device_attribute *attr,		\</div><div class='add'>+			   char *buf)					\</div><div class='add'>+{									\</div><div class='add'>+	return sprintf(buf, fmt "\n", to_cache_info(dev)-&gt;cache_attrs.name);\</div><div class='add'>+}									\</div><div class='add'>+DEVICE_ATTR_RO(name);</div><div class='add'>+</div><div class='add'>+CACHE_ATTR(size, "%llu")</div><div class='add'>+CACHE_ATTR(line_size, "%u")</div><div class='add'>+CACHE_ATTR(indexing, "%u")</div><div class='add'>+CACHE_ATTR(write_policy, "%u")</div><div class='add'>+</div><div class='add'>+static struct attribute *cache_attrs[] = {</div><div class='add'>+	&amp;dev_attr_indexing.attr,</div><div class='add'>+	&amp;dev_attr_size.attr,</div><div class='add'>+	&amp;dev_attr_line_size.attr,</div><div class='add'>+	&amp;dev_attr_write_policy.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(cache);</div><div class='add'>+</div><div class='add'>+static void node_cache_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void node_cacheinfo_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct node_cache_info *info = to_cache_info(dev);</div><div class='add'>+	kfree(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void node_init_cache_dev(struct node *node)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev-&gt;parent = &amp;node-&gt;dev;</div><div class='add'>+	dev-&gt;release = node_cache_release;</div><div class='add'>+	if (dev_set_name(dev, "memory_side_cache"))</div><div class='add'>+		goto free_dev;</div><div class='add'>+</div><div class='add'>+	if (device_register(dev))</div><div class='add'>+		goto free_name;</div><div class='add'>+</div><div class='add'>+	pm_runtime_no_callbacks(dev);</div><div class='add'>+	node-&gt;cache_dev = dev;</div><div class='add'>+	return;</div><div class='add'>+free_name:</div><div class='add'>+	kfree_const(dev-&gt;kobj.name);</div><div class='add'>+free_dev:</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * node_add_cache() - add cache attribute to a memory node</div><div class='add'>+ * @nid: Node identifier that has new cache attributes</div><div class='add'>+ * @cache_attrs: Attributes for the cache being added</div><div class='add'>+ */</div><div class='add'>+void node_add_cache(unsigned int nid, struct node_cache_attrs *cache_attrs)</div><div class='add'>+{</div><div class='add'>+	struct node_cache_info *info;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct node *node;</div><div class='add'>+</div><div class='add'>+	if (!node_online(nid) || !node_devices[nid])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	node = node_devices[nid];</div><div class='add'>+	list_for_each_entry(info, &amp;node-&gt;cache_attrs, node) {</div><div class='add'>+		if (info-&gt;cache_attrs.level == cache_attrs-&gt;level) {</div><div class='add'>+			dev_warn(&amp;node-&gt;dev,</div><div class='add'>+				"attempt to add duplicate cache level:%d\n",</div><div class='add'>+				cache_attrs-&gt;level);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!node-&gt;cache_dev)</div><div class='add'>+		node_init_cache_dev(node);</div><div class='add'>+	if (!node-&gt;cache_dev)</div><div class='add'>+		return;</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;</div><div class='add'>+</div><div class='add'>+	dev = &amp;info-&gt;dev;</div><div class='add'>+	dev-&gt;parent = node-&gt;cache_dev;</div><div class='add'>+	dev-&gt;release = node_cacheinfo_release;</div><div class='add'>+	dev-&gt;groups = cache_groups;</div><div class='add'>+	if (dev_set_name(dev, "index%d", cache_attrs-&gt;level))</div><div class='add'>+		goto free_cache;</div><div class='add'>+</div><div class='add'>+	info-&gt;cache_attrs = *cache_attrs;</div><div class='add'>+	if (device_register(dev)) {</div><div class='add'>+		dev_warn(&amp;node-&gt;dev, "failed to add cache level:%d\n",</div><div class='add'>+			 cache_attrs-&gt;level);</div><div class='add'>+		goto free_name;</div><div class='add'>+	}</div><div class='add'>+	pm_runtime_no_callbacks(dev);</div><div class='add'>+	list_add_tail(&amp;info-&gt;node, &amp;node-&gt;cache_attrs);</div><div class='add'>+	return;</div><div class='add'>+free_name:</div><div class='add'>+	kfree_const(dev-&gt;kobj.name);</div><div class='add'>+free_cache:</div><div class='add'>+	kfree(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void node_remove_caches(struct node *node)</div><div class='add'>+{</div><div class='add'>+	struct node_cache_info *info, *next;</div><div class='add'>+</div><div class='add'>+	if (!node-&gt;cache_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(info, next, &amp;node-&gt;cache_attrs, node) {</div><div class='add'>+		list_del(&amp;info-&gt;node);</div><div class='add'>+		device_unregister(&amp;info-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	device_unregister(node-&gt;cache_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void node_init_caches(unsigned int nid)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;node_devices[nid]-&gt;cache_attrs);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void node_init_caches(unsigned int nid) { }</div><div class='add'>+static void node_remove_caches(struct node *node) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define K(x) ((x) &lt;&lt; (PAGE_SHIFT - 10))</div><div class='ctx'> static ssize_t node_read_meminfo(struct device *dev,</div><div class='ctx'> 			struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -340,7 +637,8 @@ static int register_node(struct node *node, int num)</div><div class='ctx'> void unregister_node(struct node *node)</div><div class='ctx'> {</div><div class='ctx'> 	hugetlb_unregister_node(node);		/* no-op, if memoryless node */</div><div class='del'>-</div><div class='add'>+	node_remove_accesses(node);</div><div class='add'>+	node_remove_caches(node);</div><div class='ctx'> 	device_unregister(&amp;node-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,6 +670,56 @@ int register_cpu_under_node(unsigned int cpu, unsigned int nid)</div><div class='ctx'> 				 kobject_name(&amp;node_devices[nid]-&gt;dev.kobj));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * register_memory_node_under_compute_node - link memory node to its compute</div><div class='add'>+ *					     node for a given access class.</div><div class='add'>+ * @mem_node:	Memory node number</div><div class='add'>+ * @cpu_node:	Cpu  node number</div><div class='add'>+ * @access:	Access class to register</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * 	For use with platforms that may have separate memory and compute nodes.</div><div class='add'>+ * 	This function will export node relationships linking which memory</div><div class='add'>+ * 	initiator nodes can access memory targets at a given ranked access</div><div class='add'>+ * 	class.</div><div class='add'>+ */</div><div class='add'>+int register_memory_node_under_compute_node(unsigned int mem_nid,</div><div class='add'>+					    unsigned int cpu_nid,</div><div class='add'>+					    unsigned access)</div><div class='add'>+{</div><div class='add'>+	struct node *init_node, *targ_node;</div><div class='add'>+	struct node_access_nodes *initiator, *target;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!node_online(cpu_nid) || !node_online(mem_nid))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	init_node = node_devices[cpu_nid];</div><div class='add'>+	targ_node = node_devices[mem_nid];</div><div class='add'>+	initiator = node_init_node_access(init_node, access);</div><div class='add'>+	target = node_init_node_access(targ_node, access);</div><div class='add'>+	if (!initiator || !target)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_add_link_to_group(&amp;initiator-&gt;dev.kobj, "targets",</div><div class='add'>+				      &amp;targ_node-&gt;dev.kobj,</div><div class='add'>+				      dev_name(&amp;targ_node-&gt;dev));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_add_link_to_group(&amp;target-&gt;dev.kobj, "initiators",</div><div class='add'>+				      &amp;init_node-&gt;dev.kobj,</div><div class='add'>+				      dev_name(&amp;init_node-&gt;dev));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+ err:</div><div class='add'>+	sysfs_remove_link_from_group(&amp;initiator-&gt;dev.kobj, "targets",</div><div class='add'>+				     dev_name(&amp;targ_node-&gt;dev));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *obj;</div><div class='hunk'>@@ -580,8 +928,10 @@ int __register_one_node(int nid)</div><div class='ctx'> 			register_cpu_under_node(cpu, nid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;node_devices[nid]-&gt;access_list);</div><div class='ctx'> 	/* initialize work queue for memory hot plug */</div><div class='ctx'> 	init_node_hugetlb_work(nid);</div><div class='add'>+	node_init_caches(nid);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/platform.c b/drivers/base/platform.c<br/>index dab0a5abc391..4d1729853d1a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/platform.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/platform.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/platform.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(platform_get_resource);</div><div class='ctx'>  *				    device</div><div class='ctx'>  *</div><div class='ctx'>  * @pdev: platform device to use both for memory resource lookup as well as</div><div class='del'>- *        resource managemend</div><div class='add'>+ *        resource management</div><div class='ctx'>  * @index: resource index</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_HAS_IOMEM</div><div class='hunk'>@@ -438,10 +438,12 @@ int platform_device_add(struct platform_device *pdev)</div><div class='ctx'> 				p = &amp;ioport_resource;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (p &amp;&amp; insert_resource(p, r)) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "failed to claim resource %d: %pR\n", i, r);</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto failed;</div><div class='add'>+		if (p) {</div><div class='add'>+			ret = insert_resource(p, r);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "failed to claim resource %d: %pR\n", i, r);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c<br/>index 365ad751ce0f..59d19dd64928 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/clock_ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/clock_ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/clock_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/clock_ops.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/clock_ops.c - Generic clock manipulation PM callbacks</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Renesas Electronics Corp.</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</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/base/power/common.c b/drivers/base/power/common.c<br/>index 22aedb28aad7..8db98a1f83dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/common.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/common.c - Common device power management code.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Renesas Electronics Corp.</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='head'>diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c<br/>index 76c9969b7124..7a6aa2318915 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/domain.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/domain.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/domain.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/domain.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/domain.c - Common code related to device power domains.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Renesas Electronics Corp.</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define pr_fmt(fmt) "PM: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -22,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "power.h"</div><div class='ctx'> </div><div class='hunk'>@@ -128,6 +127,7 @@ static const struct genpd_lock_ops genpd_spin_ops = {</div><div class='ctx'> #define genpd_is_irq_safe(genpd)	(genpd-&gt;flags &amp; GENPD_FLAG_IRQ_SAFE)</div><div class='ctx'> #define genpd_is_always_on(genpd)	(genpd-&gt;flags &amp; GENPD_FLAG_ALWAYS_ON)</div><div class='ctx'> #define genpd_is_active_wakeup(genpd)	(genpd-&gt;flags &amp; GENPD_FLAG_ACTIVE_WAKEUP)</div><div class='add'>+#define genpd_is_cpu_domain(genpd)	(genpd-&gt;flags &amp; GENPD_FLAG_CPU_DOMAIN)</div><div class='ctx'> </div><div class='ctx'> static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev,</div><div class='ctx'> 		const struct generic_pm_domain *genpd)</div><div class='hunk'>@@ -391,11 +391,9 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)</div><div class='ctx'> 	if (unlikely(!genpd-&gt;set_performance_state))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!dev-&gt;power.subsys_data ||</div><div class='del'>-		     !dev-&gt;power.subsys_data-&gt;domain_data)) {</div><div class='del'>-		WARN_ON(1);</div><div class='add'>+	if (WARN_ON(!dev-&gt;power.subsys_data ||</div><div class='add'>+		     !dev-&gt;power.subsys_data-&gt;domain_data))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	genpd_lock(genpd);</div><div class='ctx'> </div><div class='hunk'>@@ -1396,8 +1394,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='del'>-static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,</div><div class='del'>-					struct gpd_timing_data *td)</div><div class='add'>+static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain_data *gpd_data;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1412,9 +1409,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,</div><div class='ctx'> 		goto err_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (td)</div><div class='del'>-		gpd_data-&gt;td = *td;</div><div class='del'>-</div><div class='ctx'> 	gpd_data-&gt;base.dev = dev;</div><div class='ctx'> 	gpd_data-&gt;td.constraint_changed = true;</div><div class='ctx'> 	gpd_data-&gt;td.effective_constraint_ns = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT_NS;</div><div class='hunk'>@@ -1454,8 +1448,57 @@ static void genpd_free_dev_data(struct device *dev,</div><div class='ctx'> 	dev_pm_put_subsys_data(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void genpd_update_cpumask(struct generic_pm_domain *genpd,</div><div class='add'>+				 int cpu, bool set, unsigned int depth)</div><div class='add'>+{</div><div class='add'>+	struct gpd_link *link;</div><div class='add'>+</div><div class='add'>+	if (!genpd_is_cpu_domain(genpd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;genpd-&gt;slave_links, slave_node) {</div><div class='add'>+		struct generic_pm_domain *master = link-&gt;master;</div><div class='add'>+</div><div class='add'>+		genpd_lock_nested(master, depth + 1);</div><div class='add'>+		genpd_update_cpumask(master, cpu, set, depth + 1);</div><div class='add'>+		genpd_unlock(master);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		cpumask_set_cpu(cpu, genpd-&gt;cpus);</div><div class='add'>+	else</div><div class='add'>+		cpumask_clear_cpu(cpu, genpd-&gt;cpus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_set_cpumask(struct generic_pm_domain *genpd, int cpu)</div><div class='add'>+{</div><div class='add'>+	if (cpu &gt;= 0)</div><div class='add'>+		genpd_update_cpumask(genpd, cpu, true, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_clear_cpumask(struct generic_pm_domain *genpd, int cpu)</div><div class='add'>+{</div><div class='add'>+	if (cpu &gt;= 0)</div><div class='add'>+		genpd_update_cpumask(genpd, cpu, false, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_get_cpu(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!genpd_is_cpu_domain(genpd))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		if (get_cpu_device(cpu) == dev)</div><div class='add'>+			return cpu;</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='ctx'> static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,</div><div class='del'>-			    struct gpd_timing_data *td)</div><div class='add'>+			    struct device *base_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain_data *gpd_data;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1465,16 +1508,19 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,</div><div class='ctx'> 	if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	gpd_data = genpd_alloc_dev_data(dev, td);</div><div class='add'>+	gpd_data = genpd_alloc_dev_data(dev);</div><div class='ctx'> 	if (IS_ERR(gpd_data))</div><div class='ctx'> 		return PTR_ERR(gpd_data);</div><div class='ctx'> </div><div class='del'>-	genpd_lock(genpd);</div><div class='add'>+	gpd_data-&gt;cpu = genpd_get_cpu(genpd, base_dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = genpd-&gt;attach_dev ? genpd-&gt;attach_dev(genpd, dev) : 0;</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	genpd_lock(genpd);</div><div class='add'>+</div><div class='add'>+	genpd_set_cpumask(genpd, gpd_data-&gt;cpu);</div><div class='ctx'> 	dev_pm_domain_set(dev, &amp;genpd-&gt;domain);</div><div class='ctx'> </div><div class='ctx'> 	genpd-&gt;device_count++;</div><div class='hunk'>@@ -1482,9 +1528,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;gpd_data-&gt;base.list_node, &amp;genpd-&gt;dev_list);</div><div class='ctx'> </div><div class='del'>- out:</div><div class='ctx'> 	genpd_unlock(genpd);</div><div class='del'>-</div><div class='add'>+ out:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		genpd_free_dev_data(dev, gpd_data);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1503,7 +1548,7 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;gpd_list_lock);</div><div class='del'>-	ret = genpd_add_device(genpd, dev, NULL);</div><div class='add'>+	ret = genpd_add_device(genpd, dev, dev);</div><div class='ctx'> 	mutex_unlock(&amp;gpd_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1533,15 +1578,16 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,</div><div class='ctx'> 	genpd-&gt;device_count--;</div><div class='ctx'> 	genpd-&gt;max_off_time_changed = true;</div><div class='ctx'> </div><div class='del'>-	if (genpd-&gt;detach_dev)</div><div class='del'>-		genpd-&gt;detach_dev(genpd, dev);</div><div class='del'>-</div><div class='add'>+	genpd_clear_cpumask(genpd, gpd_data-&gt;cpu);</div><div class='ctx'> 	dev_pm_domain_set(dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;pdd-&gt;list_node);</div><div class='ctx'> </div><div class='ctx'> 	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='add'>+	if (genpd-&gt;detach_dev)</div><div class='add'>+		genpd-&gt;detach_dev(genpd, dev);</div><div class='add'>+</div><div class='ctx'> 	genpd_free_dev_data(dev, gpd_data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1687,6 +1733,12 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);</div><div class='ctx'> </div><div class='add'>+static void genpd_free_default_power_state(struct genpd_power_state *states,</div><div class='add'>+					   unsigned int state_count)</div><div class='add'>+{</div><div class='add'>+	kfree(states);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int genpd_set_default_power_state(struct generic_pm_domain *genpd)</div><div class='ctx'> {</div><div class='ctx'> 	struct genpd_power_state *state;</div><div class='hunk'>@@ -1697,7 +1749,7 @@ static int genpd_set_default_power_state(struct generic_pm_domain *genpd)</div><div class='ctx'> </div><div class='ctx'> 	genpd-&gt;states = state;</div><div class='ctx'> 	genpd-&gt;state_count = 1;</div><div class='del'>-	genpd-&gt;free = state;</div><div class='add'>+	genpd-&gt;free_states = genpd_free_default_power_state;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1763,11 +1815,18 @@ int pm_genpd_init(struct generic_pm_domain *genpd,</div><div class='ctx'> 	if (genpd_is_always_on(genpd) &amp;&amp; !genpd_status_on(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (genpd_is_cpu_domain(genpd) &amp;&amp;</div><div class='add'>+	    !zalloc_cpumask_var(&amp;genpd-&gt;cpus, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	/* Use only one "off" state if there were no states declared */</div><div class='ctx'> 	if (genpd-&gt;state_count == 0) {</div><div class='ctx'> 		ret = genpd_set_default_power_state(genpd);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (genpd_is_cpu_domain(genpd))</div><div class='add'>+				free_cpumask_var(genpd-&gt;cpus);</div><div class='ctx'> 			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (!gov &amp;&amp; genpd-&gt;state_count &gt; 1) {</div><div class='ctx'> 		pr_warn("%s: no governor for states\n", genpd-&gt;name);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1813,7 +1872,11 @@ static int genpd_remove(struct generic_pm_domain *genpd)</div><div class='ctx'> 	list_del(&amp;genpd-&gt;gpd_list_node);</div><div class='ctx'> 	genpd_unlock(genpd);</div><div class='ctx'> 	cancel_work_sync(&amp;genpd-&gt;power_off_work);</div><div class='del'>-	kfree(genpd-&gt;free);</div><div class='add'>+	if (genpd_is_cpu_domain(genpd))</div><div class='add'>+		free_cpumask_var(genpd-&gt;cpus);</div><div class='add'>+	if (genpd-&gt;free_states)</div><div class='add'>+		genpd-&gt;free_states(genpd-&gt;states, genpd-&gt;state_count);</div><div class='add'>+</div><div class='ctx'> 	pr_debug("%s: removed %s\n", __func__, genpd-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2191,7 +2254,7 @@ int of_genpd_add_device(struct of_phandle_args *genpdspec, struct device *dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = genpd_add_device(genpd, dev, NULL);</div><div class='add'>+	ret = genpd_add_device(genpd, dev, dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;gpd_list_lock);</div><div class='hunk'>@@ -2275,6 +2338,7 @@ EXPORT_SYMBOL_GPL(of_genpd_remove_last);</div><div class='ctx'> </div><div class='ctx'> static void genpd_release_dev(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	of_node_put(dev-&gt;of_node);</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2336,14 +2400,14 @@ static void genpd_dev_pm_sync(struct device *dev)</div><div class='ctx'> 	genpd_queue_power_off_work(pd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,</div><div class='add'>+static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,</div><div class='ctx'> 				 unsigned int index, bool power_on)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_phandle_args pd_args;</div><div class='ctx'> 	struct generic_pm_domain *pd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = of_parse_phandle_with_args(np, "power-domains",</div><div class='add'>+	ret = of_parse_phandle_with_args(dev-&gt;of_node, "power-domains",</div><div class='ctx'> 				"#power-domain-cells", index, &amp;pd_args);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2355,12 +2419,12 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,</div><div class='ctx'> 		mutex_unlock(&amp;gpd_list_lock);</div><div class='ctx'> 		dev_dbg(dev, "%s() failed to find PM domain: %ld\n",</div><div class='ctx'> 			__func__, PTR_ERR(pd));</div><div class='del'>-		return driver_deferred_probe_check_state(dev);</div><div class='add'>+		return driver_deferred_probe_check_state(base_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "adding to PM domain %s\n", pd-&gt;name);</div><div class='ctx'> </div><div class='del'>-	ret = genpd_add_device(pd, dev, NULL);</div><div class='add'>+	ret = genpd_add_device(pd, dev, base_dev);</div><div class='ctx'> 	mutex_unlock(&amp;gpd_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -2411,7 +2475,7 @@ int genpd_dev_pm_attach(struct device *dev)</div><div class='ctx'> 				       "#power-domain-cells") != 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return __genpd_dev_pm_attach(dev, dev-&gt;of_node, 0, true);</div><div class='add'>+	return __genpd_dev_pm_attach(dev, dev, 0, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);</div><div class='ctx'> </div><div class='hunk'>@@ -2441,10 +2505,10 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,</div><div class='ctx'> 	if (!dev-&gt;of_node)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* Deal only with devices using multiple PM domains. */</div><div class='add'>+	/* Verify that the index is within a valid range. */</div><div class='ctx'> 	num_domains = of_count_phandle_with_args(dev-&gt;of_node, "power-domains",</div><div class='ctx'> 						 "#power-domain-cells");</div><div class='del'>-	if (num_domains &lt; 2 || index &gt;= num_domains)</div><div class='add'>+	if (index &gt;= num_domains)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate and register device on the genpd bus. */</div><div class='hunk'>@@ -2455,15 +2519,16 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,</div><div class='ctx'> 	dev_set_name(virt_dev, "genpd:%u:%s", index, dev_name(dev));</div><div class='ctx'> 	virt_dev-&gt;bus = &amp;genpd_bus_type;</div><div class='ctx'> 	virt_dev-&gt;release = genpd_release_dev;</div><div class='add'>+	virt_dev-&gt;of_node = of_node_get(dev-&gt;of_node);</div><div class='ctx'> </div><div class='ctx'> 	ret = device_register(virt_dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		kfree(virt_dev);</div><div class='add'>+		put_device(virt_dev);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Try to attach the device to the PM domain at the specified index. */</div><div class='del'>-	ret = __genpd_dev_pm_attach(virt_dev, dev-&gt;of_node, index, false);</div><div class='add'>+	ret = __genpd_dev_pm_attach(virt_dev, dev, index, false);</div><div class='ctx'> 	if (ret &lt; 1) {</div><div class='ctx'> 		device_unregister(virt_dev);</div><div class='ctx'> 		return ret ? ERR_PTR(ret) : NULL;</div><div class='head'>diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c<br/>index 4d07e38a8247..3838045c9277 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/domain_governor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/domain_governor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/domain_governor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/domain_governor.c</a></div><div class='hunk'>@@ -1,15 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/domain_governor.c - Governors for device PM domains.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Renesas Electronics Corp.</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pm_domain.h&gt;</div><div class='ctx'> #include &lt;linux/pm_qos.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/cpuidle.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int dev_update_qos_constraint(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,8 +211,10 @@ static bool default_power_down_ok(struct dev_pm_domain *pd)</div><div class='ctx'> 	struct generic_pm_domain *genpd = pd_to_genpd(pd);</div><div class='ctx'> 	struct gpd_link *link;</div><div class='ctx'> </div><div class='del'>-	if (!genpd-&gt;max_off_time_changed)</div><div class='add'>+	if (!genpd-&gt;max_off_time_changed) {</div><div class='add'>+		genpd-&gt;state_idx = genpd-&gt;cached_power_down_state_idx;</div><div class='ctx'> 		return genpd-&gt;cached_power_down_ok;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to invalidate the cached results for the masters, so</div><div class='hunk'>@@ -236,6 +239,7 @@ static bool default_power_down_ok(struct dev_pm_domain *pd)</div><div class='ctx'> 		genpd-&gt;state_idx--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	genpd-&gt;cached_power_down_state_idx = genpd-&gt;state_idx;</div><div class='ctx'> 	return genpd-&gt;cached_power_down_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -244,6 +248,65 @@ static bool always_on_power_down_ok(struct dev_pm_domain *domain)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_IDLE</div><div class='add'>+static bool cpu_power_down_ok(struct dev_pm_domain *pd)</div><div class='add'>+{</div><div class='add'>+	struct generic_pm_domain *genpd = pd_to_genpd(pd);</div><div class='add'>+	struct cpuidle_device *dev;</div><div class='add'>+	ktime_t domain_wakeup, next_hrtimer;</div><div class='add'>+	s64 idle_duration_ns;</div><div class='add'>+	int cpu, i;</div><div class='add'>+</div><div class='add'>+	/* Validate dev PM QoS constraints. */</div><div class='add'>+	if (!default_power_down_ok(pd))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!(genpd-&gt;flags &amp; GENPD_FLAG_CPU_DOMAIN))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find the next wakeup for any of the online CPUs within the PM domain</div><div class='add'>+	 * and its subdomains. Note, we only need the genpd-&gt;cpus, as it already</div><div class='add'>+	 * contains a mask of all CPUs from subdomains.</div><div class='add'>+	 */</div><div class='add'>+	domain_wakeup = ktime_set(KTIME_SEC_MAX, 0);</div><div class='add'>+	for_each_cpu_and(cpu, genpd-&gt;cpus, cpu_online_mask) {</div><div class='add'>+		dev = per_cpu(cpuidle_devices, cpu);</div><div class='add'>+		if (dev) {</div><div class='add'>+			next_hrtimer = READ_ONCE(dev-&gt;next_hrtimer);</div><div class='add'>+			if (ktime_before(next_hrtimer, domain_wakeup))</div><div class='add'>+				domain_wakeup = next_hrtimer;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The minimum idle duration is from now - until the next wakeup. */</div><div class='add'>+	idle_duration_ns = ktime_to_ns(ktime_sub(domain_wakeup, ktime_get()));</div><div class='add'>+	if (idle_duration_ns &lt;= 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find the deepest idle state that has its residency value satisfied</div><div class='add'>+	 * and by also taking into account the power off latency for the state.</div><div class='add'>+	 * Start at the state picked by the dev PM QoS constraint validation.</div><div class='add'>+	 */</div><div class='add'>+	i = genpd-&gt;state_idx;</div><div class='add'>+	do {</div><div class='add'>+		if (idle_duration_ns &gt;= (genpd-&gt;states[i].residency_ns +</div><div class='add'>+		    genpd-&gt;states[i].power_off_latency_ns)) {</div><div class='add'>+			genpd-&gt;state_idx = i;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	} while (--i &gt;= 0);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dev_power_governor pm_domain_cpu_gov = {</div><div class='add'>+	.suspend_ok = default_suspend_ok,</div><div class='add'>+	.power_down_ok = cpu_power_down_ok,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct dev_power_governor simple_qos_governor = {</div><div class='ctx'> 	.suspend_ok = default_suspend_ok,</div><div class='ctx'> 	.power_down_ok = default_power_down_ok,</div><div class='head'>diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c<br/>index b2ed606265a8..4fa525668cb7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/generic_ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/generic_ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/generic_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/generic_ops.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/generic_ops.c - Generic PM callbacks for subsystems</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='head'>diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c<br/>index f80d298de3fa..dcfc0a36c8f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/main.c</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/main.c - Where the driver meets power management.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003 Patrick Mochel</div><div class='ctx'>  * Copyright (c) 2003 Open Source Development Lab</div><div class='ctx'>  *</div><div class='del'>- * This file is released under the GPLv2</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * The driver model core calls device_pm_add() when a device is registered.</div><div class='ctx'>  * This will initialize the embedded device_pm_info object in the device</div><div class='ctx'>  * and add it to the list of power-controlled devices. sysfs entries for</div><div class='hunk'>@@ -207,7 +205,7 @@ static ktime_t initcall_debug_start(struct device *dev, void *cb)</div><div class='ctx'> 	if (!pm_print_times_enabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "calling %pF @ %i, parent: %s\n", cb,</div><div class='add'>+	dev_info(dev, "calling %pS @ %i, parent: %s\n", cb,</div><div class='ctx'> 		 task_pid_nr(current),</div><div class='ctx'> 		 dev-&gt;parent ? dev_name(dev-&gt;parent) : "none");</div><div class='ctx'> 	return ktime_get();</div><div class='hunk'>@@ -225,7 +223,7 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime,</div><div class='ctx'> 	rettime = ktime_get();</div><div class='ctx'> 	nsecs = (s64) ktime_to_ns(ktime_sub(rettime, calltime));</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "%pF returned %d after %Ld usecs\n", cb, error,</div><div class='add'>+	dev_info(dev, "%pS returned %d after %Ld usecs\n", cb, error,</div><div class='ctx'> 		 (unsigned long long)nsecs &gt;&gt; 10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -478,7 +476,7 @@ struct dpm_watchdog {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dpm_watchdog_handler - Driver suspend / resume watchdog handler.</div><div class='del'>- * @data: Watchdog object address.</div><div class='add'>+ * @t: The timer that PM watchdog depends on.</div><div class='ctx'>  *</div><div class='ctx'>  * Called when a driver has timed out suspending or resuming.</div><div class='ctx'>  * There's not much we can do here to recover so panic() to</div><div class='hunk'>@@ -706,6 +704,19 @@ static bool is_async(struct device *dev)</div><div class='ctx'> 		&amp;&amp; !pm_trace_is_enabled();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool dpm_async_fn(struct device *dev, async_func_t func)</div><div class='add'>+{</div><div class='add'>+	reinit_completion(&amp;dev-&gt;power.completion);</div><div class='add'>+</div><div class='add'>+	if (is_async(dev)) {</div><div class='add'>+		get_device(dev);</div><div class='add'>+		async_schedule(func, dev);</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 void async_resume_noirq(void *data, async_cookie_t cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = (struct device *)data;</div><div class='hunk'>@@ -732,13 +743,8 @@ void dpm_noirq_resume_devices(pm_message_t state)</div><div class='ctx'> 	 * in case the starting of async threads is</div><div class='ctx'> 	 * delayed by non-async resuming devices.</div><div class='ctx'> 	 */</div><div class='del'>-	list_for_each_entry(dev, &amp;dpm_noirq_list, power.entry) {</div><div class='del'>-		reinit_completion(&amp;dev-&gt;power.completion);</div><div class='del'>-		if (is_async(dev)) {</div><div class='del'>-			get_device(dev);</div><div class='del'>-			async_schedule_dev(async_resume_noirq, dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(dev, &amp;dpm_noirq_list, power.entry)</div><div class='add'>+		dpm_async_fn(dev, async_resume_noirq);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;dpm_noirq_list)) {</div><div class='ctx'> 		dev = to_device(dpm_noirq_list.next);</div><div class='hunk'>@@ -889,13 +895,8 @@ void dpm_resume_early(pm_message_t state)</div><div class='ctx'> 	 * in case the starting of async threads is</div><div class='ctx'> 	 * delayed by non-async resuming devices.</div><div class='ctx'> 	 */</div><div class='del'>-	list_for_each_entry(dev, &amp;dpm_late_early_list, power.entry) {</div><div class='del'>-		reinit_completion(&amp;dev-&gt;power.completion);</div><div class='del'>-		if (is_async(dev)) {</div><div class='del'>-			get_device(dev);</div><div class='del'>-			async_schedule_dev(async_resume_early, dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(dev, &amp;dpm_late_early_list, power.entry)</div><div class='add'>+		dpm_async_fn(dev, async_resume_early);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;dpm_late_early_list)) {</div><div class='ctx'> 		dev = to_device(dpm_late_early_list.next);</div><div class='hunk'>@@ -1053,13 +1054,8 @@ void dpm_resume(pm_message_t state)</div><div class='ctx'> 	pm_transition = state;</div><div class='ctx'> 	async_error = 0;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(dev, &amp;dpm_suspended_list, power.entry) {</div><div class='del'>-		reinit_completion(&amp;dev-&gt;power.completion);</div><div class='del'>-		if (is_async(dev)) {</div><div class='del'>-			get_device(dev);</div><div class='del'>-			async_schedule_dev(async_resume, dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(dev, &amp;dpm_suspended_list, power.entry)</div><div class='add'>+		dpm_async_fn(dev, async_resume);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;dpm_suspended_list)) {</div><div class='ctx'> 		dev = to_device(dpm_suspended_list.next);</div><div class='hunk'>@@ -1373,13 +1369,9 @@ static void async_suspend_noirq(void *data, async_cookie_t cookie)</div><div class='ctx'> </div><div class='ctx'> static int device_suspend_noirq(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	reinit_completion(&amp;dev-&gt;power.completion);</div><div class='del'>-</div><div class='del'>-	if (is_async(dev)) {</div><div class='del'>-		get_device(dev);</div><div class='del'>-		async_schedule_dev(async_suspend_noirq, dev);</div><div class='add'>+	if (dpm_async_fn(dev, async_suspend_noirq))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return __device_suspend_noirq(dev, pm_transition, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1576,13 +1568,8 @@ static void async_suspend_late(void *data, async_cookie_t cookie)</div><div class='ctx'> </div><div class='ctx'> static int device_suspend_late(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	reinit_completion(&amp;dev-&gt;power.completion);</div><div class='del'>-</div><div class='del'>-	if (is_async(dev)) {</div><div class='del'>-		get_device(dev);</div><div class='del'>-		async_schedule_dev(async_suspend_late, dev);</div><div class='add'>+	if (dpm_async_fn(dev, async_suspend_late))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return __device_suspend_late(dev, pm_transition, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -1747,6 +1734,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> 	if (dev-&gt;power.syscore)</div><div class='ctx'> 		goto Complete;</div><div class='ctx'> </div><div class='add'>+	/* Avoid direct_complete to let wakeup_path propagate. */</div><div class='add'>+	if (device_may_wakeup(dev) || dev-&gt;power.wakeup_path)</div><div class='add'>+		dev-&gt;power.direct_complete = false;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;power.direct_complete) {</div><div class='ctx'> 		if (pm_runtime_status_suspended(dev)) {</div><div class='ctx'> 			pm_runtime_disable(dev);</div><div class='hunk'>@@ -1842,13 +1833,8 @@ static void async_suspend(void *data, async_cookie_t cookie)</div><div class='ctx'> </div><div class='ctx'> static int device_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	reinit_completion(&amp;dev-&gt;power.completion);</div><div class='del'>-</div><div class='del'>-	if (is_async(dev)) {</div><div class='del'>-		get_device(dev);</div><div class='del'>-		async_schedule_dev(async_suspend, dev);</div><div class='add'>+	if (dpm_async_fn(dev, async_suspend))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return __device_suspend(dev, pm_transition, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -2063,14 +2049,14 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start);</div><div class='ctx'> void __suspend_report_result(const char *function, void *fn, int ret)</div><div class='ctx'> {</div><div class='ctx'> 	if (ret)</div><div class='del'>-		pr_err("%s(): %pF returns %d\n", function, fn, ret);</div><div class='add'>+		pr_err("%s(): %pS returns %d\n", function, fn, ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__suspend_report_result);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * device_pm_wait_for_dev - Wait for suspend/resume of a device to complete.</div><div class='del'>- * @dev: Device to wait for.</div><div class='ctx'>  * @subordinate: Device that needs to wait for @dev.</div><div class='add'>+ * @dev: Device to wait for.</div><div class='ctx'>  */</div><div class='ctx'> int device_pm_wait_for_dev(struct device *subordinate, struct device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c<br/>index f80e402ef778..6c91f8df1d59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/qos.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/qos.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/qos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/qos.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Devices PM QoS constraints management</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2011 Texas Instruments, Inc.</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'>- *</div><div class='ctx'>  * This module exposes the interface to kernel space for specifying</div><div class='ctx'>  * per-device PM QoS dependencies. It provides infrastructure for registration</div><div class='ctx'>  * of:</div><div class='head'>diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c<br/>index 977db40378b0..952a1e7057c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/runtime.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/runtime.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/runtime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/runtime.c</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/runtime.c - Helper functions for device runtime PM</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2009 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='ctx'>  * Copyright (C) 2010 Alan Stern &lt;stern@rowland.harvard.edu&gt;</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='head'>diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c<br/>index 1226e441ddfe..1b9c281cbe41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/sysfs.c</a></div><div class='hunk'>@@ -1,7 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * drivers/base/power/sysfs.c - sysfs entries for device PM</div><div class='del'>- */</div><div class='del'>-</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* sysfs entries for device PM */</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='head'>diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c<br/>index 2bd9d2c744ca..977d27bd1a22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/trace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/trace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/trace.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/trace.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,7 +7,6 @@</div><div class='ctx'>  * Trace facility for suspend/resume problems, when none of the</div><div class='ctx'>  * devices may be working.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define pr_fmt(fmt) "PM: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pm-trace.h&gt;</div><div class='head'>diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c<br/>index b8fa5c0f2d13..5ce77d1ef9fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/wakeirq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/wakeirq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/wakeirq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/wakeirq.c</a></div><div class='hunk'>@@ -1,16 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * wakeirq.c - Device wakeirq helper functions</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'>- * 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='del'>-</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Device wakeirq helper functions */</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='head'>diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c<br/>index bb1ae175fae1..5b2b6a05a4f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/wakeup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/power/wakeup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/power/wakeup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/power/wakeup.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * drivers/base/power/wakeup.c - System wakeup events framework</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='del'>- *</div><div class='del'>- * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define pr_fmt(fmt) "PM: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -804,7 +802,7 @@ void pm_print_active_wakeup_sources(void)</div><div class='ctx'> 	srcuidx = srcu_read_lock(&amp;wakeup_srcu);</div><div class='ctx'> 	list_for_each_entry_rcu(ws, &amp;wakeup_sources, entry) {</div><div class='ctx'> 		if (ws-&gt;active) {</div><div class='del'>-			pr_debug("active wakeup source: %s\n", ws-&gt;name);</div><div class='add'>+			pm_pr_dbg("active wakeup source: %s\n", ws-&gt;name);</div><div class='ctx'> 			active = 1;</div><div class='ctx'> 		} else if (!active &amp;&amp;</div><div class='ctx'> 			   (!last_activity_ws ||</div><div class='hunk'>@@ -815,7 +813,7 @@ void pm_print_active_wakeup_sources(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!active &amp;&amp; last_activity_ws)</div><div class='del'>-		pr_debug("last active wakeup source: %s\n",</div><div class='add'>+		pm_pr_dbg("last active wakeup source: %s\n",</div><div class='ctx'> 			last_activity_ws-&gt;name);</div><div class='ctx'> 	srcu_read_unlock(&amp;wakeup_srcu, srcuidx);</div><div class='ctx'> }</div><div class='hunk'>@@ -845,7 +843,7 @@ bool pm_wakeup_pending(void)</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;events_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		pr_debug("Wakeup pending, aborting suspend\n");</div><div class='add'>+		pm_pr_dbg("Wakeup pending, aborting suspend\n");</div><div class='ctx'> 		pm_print_active_wakeup_sources();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/property.c b/drivers/base/property.c<br/>index 8b91ab380d14..348b37e64944 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/property.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/property.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/property.c</a></div><div class='hunk'>@@ -984,6 +984,81 @@ fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port_id,</div><div class='ctx'> EXPORT_SYMBOL_GPL(fwnode_graph_get_remote_node);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * fwnode_graph_get_endpoint_by_id - get endpoint by port and endpoint numbers</div><div class='add'>+ * @fwnode: parent fwnode_handle containing the graph</div><div class='add'>+ * @port: identifier of the port node</div><div class='add'>+ * @endpoint: identifier of the endpoint node under the port node</div><div class='add'>+ * @flags: fwnode lookup flags</div><div class='add'>+ *</div><div class='add'>+ * Return the fwnode handle of the local endpoint corresponding the port and</div><div class='add'>+ * endpoint IDs or NULL if not found.</div><div class='add'>+ *</div><div class='add'>+ * If FWNODE_GRAPH_ENDPOINT_NEXT is passed in @flags and the specified endpoint</div><div class='add'>+ * has not been found, look for the closest endpoint ID greater than the</div><div class='add'>+ * specified one and return the endpoint that corresponds to it, if present.</div><div class='add'>+ *</div><div class='add'>+ * Do not return endpoints that belong to disabled devices, unless</div><div class='add'>+ * FWNODE_GRAPH_DEVICE_DISABLED is passed in @flags.</div><div class='add'>+ *</div><div class='add'>+ * The returned endpoint needs to be released by calling fwnode_handle_put() on</div><div class='add'>+ * it when it is not needed any more.</div><div class='add'>+ */</div><div class='add'>+struct fwnode_handle *</div><div class='add'>+fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,</div><div class='add'>+				u32 port, u32 endpoint, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *ep = NULL, *best_ep = NULL;</div><div class='add'>+	unsigned int best_ep_id = 0;</div><div class='add'>+	bool endpoint_next = flags &amp; FWNODE_GRAPH_ENDPOINT_NEXT;</div><div class='add'>+	bool enabled_only = !(flags &amp; FWNODE_GRAPH_DEVICE_DISABLED);</div><div class='add'>+</div><div class='add'>+	while ((ep = fwnode_graph_get_next_endpoint(fwnode, ep))) {</div><div class='add'>+		struct fwnode_endpoint fwnode_ep = { 0 };</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (enabled_only) {</div><div class='add'>+			struct fwnode_handle *dev_node;</div><div class='add'>+			bool available;</div><div class='add'>+</div><div class='add'>+			dev_node = fwnode_graph_get_remote_port_parent(ep);</div><div class='add'>+			available = fwnode_device_is_available(dev_node);</div><div class='add'>+			fwnode_handle_put(dev_node);</div><div class='add'>+			if (!available)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = fwnode_graph_parse_endpoint(ep, &amp;fwnode_ep);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (fwnode_ep.port != port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (fwnode_ep.id == endpoint)</div><div class='add'>+			return ep;</div><div class='add'>+</div><div class='add'>+		if (!endpoint_next)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the endpoint that has just been found is not the first</div><div class='add'>+		 * matching one and the ID of the one found previously is closer</div><div class='add'>+		 * to the requested endpoint ID, skip it.</div><div class='add'>+		 */</div><div class='add'>+		if (fwnode_ep.id &lt; endpoint ||</div><div class='add'>+		    (best_ep &amp;&amp; best_ep_id &lt; fwnode_ep.id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fwnode_handle_put(best_ep);</div><div class='add'>+		best_ep = fwnode_handle_get(ep);</div><div class='add'>+		best_ep_id = fwnode_ep.id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return best_ep;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * fwnode_graph_parse_endpoint - parse common endpoint node properties</div><div class='ctx'>  * @fwnode: pointer to endpoint fwnode_handle</div><div class='ctx'>  * @endpoint: pointer to the fwnode endpoint data structure</div><div class='head'>diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h<br/>index a98fced9bff8..3d80c4b43f72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/internal.h</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Register map access API internal header</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Wolfson Microelectronics plc</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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'> </div><div class='ctx'> #ifndef _REGMAP_INTERNAL_H</div><div class='head'>diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c<br/>index bc6cd88b8cc6..b7e4b2464102 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache-flat.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache-flat.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache-flat.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regcache-flat.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register cache access API - flat caching support</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register cache access API - flat caching support</div><div class='add'>+//</div><div class='add'>+// Copyright 2012 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c<br/>index 4ff311374c4a..fc14e8b9344f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache-lzo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache-lzo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache-lzo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regcache-lzo.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register cache access API - LZO caching support</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register cache access API - LZO caching support</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/lzo.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c<br/>index 9cbb4b0cd01b..cfa29dc89bbf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache-rbtree.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache-rbtree.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache-rbtree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regcache-rbtree.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register cache access API - rbtree caching support</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register cache access API - rbtree caching support</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c<br/>index 773560348337..a93cafd7be4f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regcache.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regcache.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regcache.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register cache access API</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register cache access API</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bsearch.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap-ac97.c b/drivers/base/regmap/regmap-ac97.c<br/>index c03ebfd4c731..b9f76bdf74a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-ac97.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-ac97.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-ac97.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-ac97.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - AC'97 support</div><div class='del'>- *</div><div class='del'>- * Copyright 2013 Linaro Ltd.  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'>- * 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</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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - AC'97 support</div><div class='add'>+//</div><div class='add'>+// Copyright 2013 Linaro Ltd.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c<br/>index 19eb454f26c3..263f82516ff4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-debugfs.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - debugfs</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - debugfs</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -195,6 +191,28 @@ static inline void regmap_calc_tot_len(struct regmap *map,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int regmap_next_readable_reg(struct regmap *map, int reg)</div><div class='add'>+{</div><div class='add'>+	struct regmap_debugfs_off_cache *c;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (regmap_printable(map, reg + map-&gt;reg_stride)) {</div><div class='add'>+		ret = reg + map-&gt;reg_stride;</div><div class='add'>+	} else {</div><div class='add'>+		mutex_lock(&amp;map-&gt;cache_lock);</div><div class='add'>+		list_for_each_entry(c, &amp;map-&gt;debugfs_off_cache, list) {</div><div class='add'>+			if (reg &gt; c-&gt;max_reg)</div><div class='add'>+				continue;</div><div class='add'>+			if (reg &lt; c-&gt;base_reg) {</div><div class='add'>+				ret = c-&gt;base_reg;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;map-&gt;cache_lock);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from,</div><div class='ctx'> 				   unsigned int to, char __user *user_buf,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='hunk'>@@ -218,12 +236,8 @@ static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from,</div><div class='ctx'> 	/* Work out which register we're starting at */</div><div class='ctx'> 	start_reg = regmap_debugfs_get_dump_start(map, from, *ppos, &amp;p);</div><div class='ctx'> </div><div class='del'>-	for (i = start_reg; i &lt;= to; i += map-&gt;reg_stride) {</div><div class='del'>-		if (!regmap_readable(map, i) &amp;&amp; !regmap_cached(map, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (regmap_precious(map, i))</div><div class='del'>-			continue;</div><div class='add'>+	for (i = start_reg; i &gt;= 0 &amp;&amp; i &lt;= to;</div><div class='add'>+	     i = regmap_next_readable_reg(map, i)) {</div><div class='ctx'> </div><div class='ctx'> 		/* If we're in the region the user is trying to read */</div><div class='ctx'> 		if (p &gt;= *ppos) {</div><div class='head'>diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c<br/>index 056acde5e7d3..ac9b31c57967 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-i2c.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - I2C support</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - I2C support</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c<br/>index 5059748afd4c..c9dc70ceca5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-irq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-irq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-irq.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * regmap based irq_chip</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// regmap based irq_chip</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='hunk'>@@ -761,9 +757,6 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;num_type_reg &amp;&amp; !chip-&gt;type_in_mask) {</div><div class='ctx'> 		for (i = 0; i &lt; chip-&gt;num_type_reg; ++i) {</div><div class='del'>-			if (!d-&gt;type_buf_def[i])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='ctx'> 			reg = chip-&gt;type_base +</div><div class='ctx'> 				(i * map-&gt;reg_stride * d-&gt;type_reg_stride);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c<br/>index 8741fb5f8f54..af967d8f975e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-mmio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-mmio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-mmio.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - MMIO support</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012, NVIDIA 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'>- * 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</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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - MMIO support</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c<br/>index c7150dd264d5..c1894e93c378 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-spi.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - SPI support</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - SPI support</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap-spmi.c b/drivers/base/regmap/regmap-spmi.c<br/>index 0bfb8ed244d5..cdf12d2aa3a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-spmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-spmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-spmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-spmi.c</a></div><div class='hunk'>@@ -1,22 +1,13 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - SPMI support</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Based on regmap-i2c.c:</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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 and</div><div class='del'>- * only version 2 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'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - SPMI support</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.</div><div class='add'>+//</div><div class='add'>+// Based on regmap-i2c.c:</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/spmi.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c<br/>index e6c64b0be5b2..3a7d30b8c3ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-w1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap-w1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap-w1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap-w1.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API - W1 (1-Wire) support</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2017 Radioavionica Corporation</div><div class='del'>- * Author: Alex A. Mihaylov &lt;minimumlaw@rambler.ru&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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API - W1 (1-Wire) support</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2017 Radioavionica Corporation</div><div class='add'>+// Author: Alex A. Mihaylov &lt;minimumlaw@rambler.ru&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c<br/>index 4f822e087def..f1025452bb39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/regmap/regmap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/regmap/regmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/regmap/regmap.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Register map access API</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Wolfson Microelectronics plc</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Register map access API</div><div class='add'>+//</div><div class='add'>+// Copyright 2011 Wolfson Microelectronics plc</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -1493,11 +1489,10 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,</div><div class='ctx'> 	WARN_ON(!map-&gt;bus);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for unwritable registers before we start */</div><div class='del'>-	if (map-&gt;writeable_reg)</div><div class='del'>-		for (i = 0; i &lt; val_len / map-&gt;format.val_bytes; i++)</div><div class='del'>-			if (!map-&gt;writeable_reg(map-&gt;dev,</div><div class='del'>-					       reg + regmap_get_offset(map, i)))</div><div class='del'>-				return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; val_len / map-&gt;format.val_bytes; i++)</div><div class='add'>+		if (!regmap_writeable(map,</div><div class='add'>+				     reg + regmap_get_offset(map, i)))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!map-&gt;cache_bypass &amp;&amp; map-&gt;format.parse_val) {</div><div class='ctx'> 		unsigned int ival;</div><div class='head'>diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c<br/>index 1fad9291f6aa..7fc5a18e02ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/swnode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/swnode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/swnode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/swnode.c</a></div><div class='hunk'>@@ -472,7 +472,7 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode,</div><div class='ctx'> 						val, nval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fwnode_handle *</div><div class='add'>+static struct fwnode_handle *</div><div class='ctx'> software_node_get_parent(const struct fwnode_handle *fwnode)</div><div class='ctx'> {</div><div class='ctx'> 	struct software_node *swnode = to_software_node(fwnode);</div><div class='hunk'>@@ -481,7 +481,7 @@ software_node_get_parent(const struct fwnode_handle *fwnode)</div><div class='ctx'> 			NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fwnode_handle *</div><div class='add'>+static struct fwnode_handle *</div><div class='ctx'> software_node_get_next_child(const struct fwnode_handle *fwnode,</div><div class='ctx'> 			     struct fwnode_handle *child)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c<br/>index 6e076f359dcc..0d346a307140 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/syscore.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/syscore.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/syscore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/syscore.c</a></div><div class='hunk'>@@ -62,19 +62,19 @@ int syscore_suspend(void)</div><div class='ctx'> 	list_for_each_entry_reverse(ops, &amp;syscore_ops_list, node)</div><div class='ctx'> 		if (ops-&gt;suspend) {</div><div class='ctx'> 			if (initcall_debug)</div><div class='del'>-				pr_info("PM: Calling %pF\n", ops-&gt;suspend);</div><div class='add'>+				pr_info("PM: Calling %pS\n", ops-&gt;suspend);</div><div class='ctx'> 			ret = ops-&gt;suspend();</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto err_out;</div><div class='ctx'> 			WARN_ONCE(!irqs_disabled(),</div><div class='del'>-				"Interrupts enabled after %pF\n", ops-&gt;suspend);</div><div class='add'>+				"Interrupts enabled after %pS\n", ops-&gt;suspend);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	trace_suspend_resume(TPS("syscore_suspend"), 0, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_out:</div><div class='del'>-	pr_err("PM: System core suspend callback %pF failed.\n", ops-&gt;suspend);</div><div class='add'>+	pr_err("PM: System core suspend callback %pS failed.\n", ops-&gt;suspend);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_continue(ops, &amp;syscore_ops_list, node)</div><div class='ctx'> 		if (ops-&gt;resume)</div><div class='hunk'>@@ -100,10 +100,10 @@ void syscore_resume(void)</div><div class='ctx'> 	list_for_each_entry(ops, &amp;syscore_ops_list, node)</div><div class='ctx'> 		if (ops-&gt;resume) {</div><div class='ctx'> 			if (initcall_debug)</div><div class='del'>-				pr_info("PM: Calling %pF\n", ops-&gt;resume);</div><div class='add'>+				pr_info("PM: Calling %pS\n", ops-&gt;resume);</div><div class='ctx'> 			ops-&gt;resume();</div><div class='ctx'> 			WARN_ONCE(!irqs_disabled(),</div><div class='del'>-				"Interrupts enabled after %pF\n", ops-&gt;resume);</div><div class='add'>+				"Interrupts enabled after %pS\n", ops-&gt;resume);</div><div class='ctx'> 		}</div><div class='ctx'> 	trace_suspend_resume(TPS("syscore_resume"), 0, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -122,7 +122,7 @@ void syscore_shutdown(void)</div><div class='ctx'> 	list_for_each_entry_reverse(ops, &amp;syscore_ops_list, node)</div><div class='ctx'> 		if (ops-&gt;shutdown) {</div><div class='ctx'> 			if (initcall_debug)</div><div class='del'>-				pr_info("PM: Calling %pF\n", ops-&gt;shutdown);</div><div class='add'>+				pr_info("PM: Calling %pS\n", ops-&gt;shutdown);</div><div class='ctx'> 			ops-&gt;shutdown();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/test/Makefile b/drivers/base/test/Makefile<br/>index 90477c5fd9f9..0f1f7277a013 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/test/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/base/test/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/base/test/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/base/test/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_TEST_ASYNC_DRIVER_PROBE)	+= test_async_driver_probe.o</div><div class='head'>diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c<br/>index 0903e0803ec8..92b930cb3b72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/amiflop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/amiflop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/amiflop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/amiflop.c</a></div><div class='hunk'>@@ -1829,6 +1829,7 @@ static int __init fd_probe_drives(void)</div><div class='ctx'> 		disk-&gt;major = FLOPPY_MAJOR;</div><div class='ctx'> 		disk-&gt;first_minor = drive;</div><div class='ctx'> 		disk-&gt;fops = &amp;floppy_fops;</div><div class='add'>+		disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "fd%d", drive);</div><div class='ctx'> 		disk-&gt;private_data = &amp;unit[drive];</div><div class='ctx'> 		set_capacity(disk, 880*2);</div><div class='head'>diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c<br/>index b0dbbdfeb33e..c7b5c4671f05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/ataflop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/ataflop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/ataflop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/ataflop.c</a></div><div class='hunk'>@@ -2028,6 +2028,7 @@ static int __init atari_floppy_init (void)</div><div class='ctx'> 		unit[i].disk-&gt;first_minor = i;</div><div class='ctx'> 		sprintf(unit[i].disk-&gt;disk_name, "fd%d", i);</div><div class='ctx'> 		unit[i].disk-&gt;fops = &amp;floppy_fops;</div><div class='add'>+		unit[i].disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 		unit[i].disk-&gt;private_data = &amp;unit[i];</div><div class='ctx'> 		set_capacity(unit[i].disk, MAX_DISK_SIZE * 2);</div><div class='ctx'> 		add_disk(unit[i].disk);</div><div class='head'>diff --git a/drivers/block/brd.c b/drivers/block/brd.c<br/>index c18586fccb6f..17defbf4f332 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/brd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/brd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/brd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/brd.c</a></div><div class='hunk'>@@ -96,13 +96,8 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must use NOIO because we don't want to recurse back into the</div><div class='ctx'> 	 * block or filesystem layers from page reclaim.</div><div class='del'>-	 *</div><div class='del'>-	 * Cannot support DAX and highmem, because our -&gt;direct_access</div><div class='del'>-	 * routine for DAX must return memory that is always addressable.</div><div class='del'>-	 * If DAX was reworked to use pfns and kmap throughout, this</div><div class='del'>-	 * restriction might be able to be lifted.</div><div class='ctx'> 	 */</div><div class='del'>-	gfp_flags = GFP_NOIO | __GFP_ZERO;</div><div class='add'>+	gfp_flags = GFP_NOIO | __GFP_ZERO | __GFP_HIGHMEM;</div><div class='ctx'> 	page = alloc_page(gfp_flags);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return NULL;</div><div class='head'>diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h<br/>index 000a2f4c0e92..549c64df9708 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_int.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_int.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_int.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/drbd/drbd_int.h</a></div><div class='hunk'>@@ -1317,10 +1317,6 @@ struct bm_extent {</div><div class='ctx'> </div><div class='ctx'> #define DRBD_MAX_SECTORS_FIXED_BM \</div><div class='ctx'> 	  ((MD_128MB_SECT - MD_32kB_SECT - MD_4kB_SECT) * (1LL&lt;&lt;(BM_EXT_SHIFT-9)))</div><div class='del'>-#if !defined(CONFIG_LBDAF) &amp;&amp; BITS_PER_LONG == 32</div><div class='del'>-#define DRBD_MAX_SECTORS      DRBD_MAX_SECTORS_32</div><div class='del'>-#define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_32</div><div class='del'>-#else</div><div class='ctx'> #define DRBD_MAX_SECTORS      DRBD_MAX_SECTORS_FIXED_BM</div><div class='ctx'> /* 16 TB in units of sectors */</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='hunk'>@@ -1333,7 +1329,6 @@ struct bm_extent {</div><div class='ctx'> #define DRBD_MAX_SECTORS_FLEX (1UL &lt;&lt; 51)</div><div class='ctx'> /* corresponds to (1UL &lt;&lt; 38) bits right now. */</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* Estimate max bio size as 256 * PAGE_SIZE,</div><div class='ctx'>  * so for typical PAGE_SIZE of 4k, that is (1&lt;&lt;20) Byte.</div><div class='hunk'>@@ -1778,7 +1773,7 @@ static inline void __drbd_chk_io_error_(struct drbd_device *device,</div><div class='ctx'> 				_drbd_set_state(_NS(device, disk, D_INCONSISTENT), CS_HARD, NULL);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* NOTE fall through for DRBD_META_IO_ERROR or DRBD_FORCE_DETACH */</div><div class='add'>+		/* fall through - for DRBD_META_IO_ERROR or DRBD_FORCE_DETACH */</div><div class='ctx'> 	case EP_DETACH:</div><div class='ctx'> 	case EP_CALL_HELPER:</div><div class='ctx'> 		/* Remember whether we saw a READ or WRITE error.</div><div class='head'>diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c<br/>index f2471172a961..1cb5a0b85fd9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_nl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_nl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_nl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/drbd/drbd_nl.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static int drbd_msg_put_info(struct sk_buff *skb, const char *info)</div><div class='ctx'> 	if (!info || !info[0])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	nla = nla_nest_start(skb, DRBD_NLA_CFG_REPLY);</div><div class='add'>+	nla = nla_nest_start_noflag(skb, DRBD_NLA_CFG_REPLY);</div><div class='ctx'> 	if (!nla)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +135,7 @@ static int drbd_msg_sprintf_info(struct sk_buff *skb, const char *fmt, ...)</div><div class='ctx'> 	int err = -EMSGSIZE;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	nla = nla_nest_start(skb, DRBD_NLA_CFG_REPLY);</div><div class='add'>+	nla = nla_nest_start_noflag(skb, DRBD_NLA_CFG_REPLY);</div><div class='ctx'> 	if (!nla)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3269,7 +3269,7 @@ static int nla_put_drbd_cfg_context(struct sk_buff *skb,</div><div class='ctx'> 				    struct drbd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *nla;</div><div class='del'>-	nla = nla_nest_start(skb, DRBD_NLA_CFG_CONTEXT);</div><div class='add'>+	nla = nla_nest_start_noflag(skb, DRBD_NLA_CFG_CONTEXT);</div><div class='ctx'> 	if (!nla)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (device &amp;&amp;</div><div class='hunk'>@@ -3837,7 +3837,7 @@ static int nla_put_status_info(struct sk_buff *skb, struct drbd_device *device,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nla = nla_nest_start(skb, DRBD_NLA_STATE_INFO);</div><div class='add'>+	nla = nla_nest_start_noflag(skb, DRBD_NLA_STATE_INFO);</div><div class='ctx'> 	if (!nla)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (nla_put_u32(skb, T_sib_reason, sib ? sib-&gt;sib_reason : SIB_GET_STATUS_REPLY) ||</div><div class='head'>diff --git a/drivers/block/drbd/drbd_nla.c b/drivers/block/drbd/drbd_nla.c<br/>index 8e261cb5198b..6a09b0b98018 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_nla.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_nla.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_nla.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/drbd/drbd_nla.c</a></div><div class='hunk'>@@ -35,7 +35,8 @@ int drbd_nla_parse_nested(struct nlattr *tb[], int maxtype, struct nlattr *nla,</div><div class='ctx'> </div><div class='ctx'> 	err = drbd_nla_check_mandatory(maxtype, nla);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = nla_parse_nested(tb, maxtype, nla, policy, NULL);</div><div class='add'>+		err = nla_parse_nested_deprecated(tb, maxtype, nla, policy,</div><div class='add'>+						  NULL);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c<br/>index c7ad88d91a09..6a727df02889 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_receiver.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_receiver.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_receiver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/drbd/drbd_receiver.c</a></div><div class='hunk'>@@ -3094,7 +3094,7 @@ static int drbd_asb_recover_0p(struct drbd_peer_device *peer_device) __must_hold</div><div class='ctx'> 			rv =  1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* Else fall through to one of the other strategies... */</div><div class='add'>+		/* Else fall through - to one of the other strategies... */</div><div class='ctx'> 	case ASB_DISCARD_OLDER_PRI:</div><div class='ctx'> 		if (self == 0 &amp;&amp; peer == 1) {</div><div class='ctx'> 			rv = 1;</div><div class='hunk'>@@ -3119,7 +3119,7 @@ static int drbd_asb_recover_0p(struct drbd_peer_device *peer_device) __must_hold</div><div class='ctx'> 		}</div><div class='ctx'> 		if (after_sb_0p == ASB_DISCARD_ZERO_CHG)</div><div class='ctx'> 			break;</div><div class='del'>-		/* else: fall through */</div><div class='add'>+		/* else, fall through */</div><div class='ctx'> 	case ASB_DISCARD_LEAST_CHG:</div><div class='ctx'> 		if	(ch_self &lt; ch_peer)</div><div class='ctx'> 			rv = -1;</div><div class='hunk'>@@ -5443,7 +5443,6 @@ static int drbd_do_auth(struct drbd_connection *connection)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = connection-&gt;cram_hmac_tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	rv = crypto_shash_setkey(connection-&gt;cram_hmac_tfm, (u8 *)secret, key_len);</div><div class='ctx'> 	if (rv) {</div><div class='hunk'>@@ -6116,7 +6115,7 @@ int drbd_ack_receiver(struct drbd_thread *thi)</div><div class='ctx'> </div><div class='ctx'> 			err = cmd-&gt;fn(connection, &amp;pi);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				drbd_err(connection, "%pf failed\n", cmd-&gt;fn);</div><div class='add'>+				drbd_err(connection, "%ps failed\n", cmd-&gt;fn);</div><div class='ctx'> 				goto reconnect;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c<br/>index 643a04af213b..3809c7e6be8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_req.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_req.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_req.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/drbd/drbd_req.c</a></div><div class='hunk'>@@ -866,7 +866,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,</div><div class='ctx'> 			} /* else: FIXME can this happen? */</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* else, fall through to BARRIER_ACKED */</div><div class='add'>+		/* else, fall through - to BARRIER_ACKED */</div><div class='ctx'> </div><div class='ctx'> 	case BARRIER_ACKED:</div><div class='ctx'> 		/* barrier ack for READ requests does not make sense */</div><div class='head'>diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c<br/>index 268ef0c5d4ab..6781bcf3ec26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_worker.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/drbd/drbd_worker.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/drbd/drbd_worker.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/drbd/drbd_worker.c</a></div><div class='hunk'>@@ -304,7 +304,6 @@ void drbd_csum_ee(struct crypto_shash *tfm, struct drbd_peer_request *peer_req,</div><div class='ctx'> 	void *src;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	crypto_shash_init(desc);</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +331,6 @@ void drbd_csum_bio(struct crypto_shash *tfm, struct bio *bio, void *digest)</div><div class='ctx'> 	struct bvec_iter iter;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	crypto_shash_init(desc);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c<br/>index 95f608d1a098..b8998abd86a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/floppy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/floppy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/floppy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/floppy.c</a></div><div class='hunk'>@@ -1693,7 +1693,7 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		/* we don't even know which FDC is the culprit */</div><div class='ctx'> 		pr_info("DOR0=%x\n", fdc_state[0].dor);</div><div class='ctx'> 		pr_info("floppy interrupt on bizarre fdc %d\n", fdc);</div><div class='del'>-		pr_info("handler=%pf\n", handler);</div><div class='add'>+		pr_info("handler=%ps\n", handler);</div><div class='ctx'> 		is_alive(__func__, "bizarre fdc");</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1752,7 +1752,7 @@ static void reset_interrupt(void)</div><div class='ctx'> 	debugt(__func__, "");</div><div class='ctx'> 	result();		/* get the status ready for set_fdc */</div><div class='ctx'> 	if (FDCS-&gt;reset) {</div><div class='del'>-		pr_info("reset set in interrupt, calling %pf\n", cont-&gt;error);</div><div class='add'>+		pr_info("reset set in interrupt, calling %ps\n", cont-&gt;error);</div><div class='ctx'> 		cont-&gt;error();	/* a reset just after a reset. BAD! */</div><div class='ctx'> 	}</div><div class='ctx'> 	cont-&gt;redo();</div><div class='hunk'>@@ -1793,7 +1793,7 @@ static void show_floppy(void)</div><div class='ctx'> 	pr_info("\n");</div><div class='ctx'> 	pr_info("floppy driver state\n");</div><div class='ctx'> 	pr_info("-------------------\n");</div><div class='del'>-	pr_info("now=%lu last interrupt=%lu diff=%lu last called handler=%pf\n",</div><div class='add'>+	pr_info("now=%lu last interrupt=%lu diff=%lu last called handler=%ps\n",</div><div class='ctx'> 		jiffies, interruptjiffies, jiffies - interruptjiffies,</div><div class='ctx'> 		lasthandler);</div><div class='ctx'> </div><div class='hunk'>@@ -1812,9 +1812,9 @@ static void show_floppy(void)</div><div class='ctx'> 	pr_info("status=%x\n", fd_inb(FD_STATUS));</div><div class='ctx'> 	pr_info("fdc_busy=%lu\n", fdc_busy);</div><div class='ctx'> 	if (do_floppy)</div><div class='del'>-		pr_info("do_floppy=%pf\n", do_floppy);</div><div class='add'>+		pr_info("do_floppy=%ps\n", do_floppy);</div><div class='ctx'> 	if (work_pending(&amp;floppy_work))</div><div class='del'>-		pr_info("floppy_work.func=%pf\n", floppy_work.func);</div><div class='add'>+		pr_info("floppy_work.func=%ps\n", floppy_work.func);</div><div class='ctx'> 	if (delayed_work_pending(&amp;fd_timer))</div><div class='ctx'> 		pr_info("delayed work.function=%p expires=%ld\n",</div><div class='ctx'> 		       fd_timer.work.func,</div><div class='hunk'>@@ -4540,6 +4540,7 @@ static int __init do_floppy_init(void)</div><div class='ctx'> 		disks[drive]-&gt;major = FLOPPY_MAJOR;</div><div class='ctx'> 		disks[drive]-&gt;first_minor = TOMINOR(drive);</div><div class='ctx'> 		disks[drive]-&gt;fops = &amp;floppy_fops;</div><div class='add'>+		disks[drive]-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 		sprintf(disks[drive]-&gt;disk_name, "fd%d", drive);</div><div class='ctx'> </div><div class='ctx'> 		timer_setup(&amp;motor_off_timer[drive], motor_off_callback, 0);</div><div class='head'>diff --git a/drivers/block/loop.c b/drivers/block/loop.c<br/>index 1e6edd568214..102d79575895 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/loop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/loop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/loop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/loop.c</a></div><div class='hunk'>@@ -264,12 +264,20 @@ lo_do_transfer(struct loop_device *lo, int cmd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void loop_iov_iter_bvec(struct iov_iter *i,</div><div class='add'>+		unsigned int direction, const struct bio_vec *bvec,</div><div class='add'>+		unsigned long nr_segs, size_t count)</div><div class='add'>+{</div><div class='add'>+	iov_iter_bvec(i, direction, bvec, nr_segs, count);</div><div class='add'>+	i-&gt;type |= ITER_BVEC_FLAG_NO_REF;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct iov_iter i;</div><div class='ctx'> 	ssize_t bw;</div><div class='ctx'> </div><div class='del'>-	iov_iter_bvec(&amp;i, WRITE, bvec, 1, bvec-&gt;bv_len);</div><div class='add'>+	loop_iov_iter_bvec(&amp;i, WRITE, bvec, 1, bvec-&gt;bv_len);</div><div class='ctx'> </div><div class='ctx'> 	file_start_write(file);</div><div class='ctx'> 	bw = vfs_iter_write(file, &amp;i, ppos, 0);</div><div class='hunk'>@@ -347,7 +355,7 @@ static int lo_read_simple(struct loop_device *lo, struct request *rq,</div><div class='ctx'> 	ssize_t len;</div><div class='ctx'> </div><div class='ctx'> 	rq_for_each_segment(bvec, rq, iter) {</div><div class='del'>-		iov_iter_bvec(&amp;i, READ, &amp;bvec, 1, bvec.bv_len);</div><div class='add'>+		loop_iov_iter_bvec(&amp;i, READ, &amp;bvec, 1, bvec.bv_len);</div><div class='ctx'> 		len = vfs_iter_read(lo-&gt;lo_backing_file, &amp;i, &amp;pos, 0);</div><div class='ctx'> 		if (len &lt; 0)</div><div class='ctx'> 			return len;</div><div class='hunk'>@@ -388,7 +396,7 @@ static int lo_read_transfer(struct loop_device *lo, struct request *rq,</div><div class='ctx'> 		b.bv_offset = 0;</div><div class='ctx'> 		b.bv_len = bvec.bv_len;</div><div class='ctx'> </div><div class='del'>-		iov_iter_bvec(&amp;i, READ, &amp;b, 1, b.bv_len);</div><div class='add'>+		loop_iov_iter_bvec(&amp;i, READ, &amp;b, 1, b.bv_len);</div><div class='ctx'> 		len = vfs_iter_read(lo-&gt;lo_backing_file, &amp;i, &amp;pos, 0);</div><div class='ctx'> 		if (len &lt; 0) {</div><div class='ctx'> 			ret = len;</div><div class='hunk'>@@ -555,7 +563,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_set(&amp;cmd-&gt;ref, 2);</div><div class='ctx'> </div><div class='del'>-	iov_iter_bvec(&amp;iter, rw, bvec, nr_bvec, blk_rq_bytes(rq));</div><div class='add'>+	loop_iov_iter_bvec(&amp;iter, rw, bvec, nr_bvec, blk_rq_bytes(rq));</div><div class='ctx'> 	iter.iov_offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;iocb.ki_pos = pos;</div><div class='hunk'>@@ -656,7 +664,7 @@ static int loop_validate_file(struct file *file, struct block_device *bdev)</div><div class='ctx'> 			return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 		l = f-&gt;f_mapping-&gt;host-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='del'>-		if (l-&gt;lo_state == Lo_unbound) {</div><div class='add'>+		if (l-&gt;lo_state != Lo_bound) {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		f = l-&gt;lo_backing_file;</div><div class='hunk'>@@ -900,6 +908,24 @@ static int loop_prepare_queue(struct loop_device *lo)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void loop_update_rotational(struct loop_device *lo)</div><div class='add'>+{</div><div class='add'>+	struct file *file = lo-&gt;lo_backing_file;</div><div class='add'>+	struct inode *file_inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+	struct block_device *file_bdev = file_inode-&gt;i_sb-&gt;s_bdev;</div><div class='add'>+	struct request_queue *q = lo-&gt;lo_queue;</div><div class='add'>+	bool nonrot = true;</div><div class='add'>+</div><div class='add'>+	/* not all filesystems (e.g. tmpfs) have a sb-&gt;s_bdev */</div><div class='add'>+	if (file_bdev)</div><div class='add'>+		nonrot = blk_queue_nonrot(bdev_get_queue(file_bdev));</div><div class='add'>+</div><div class='add'>+	if (nonrot)</div><div class='add'>+		blk_queue_flag_set(QUEUE_FLAG_NONROT, q);</div><div class='add'>+	else</div><div class='add'>+		blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int loop_set_fd(struct loop_device *lo, fmode_t mode,</div><div class='ctx'> 		       struct block_device *bdev, unsigned int arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -963,6 +989,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,</div><div class='ctx'> 	if (!(lo_flags &amp; LO_FLAGS_READ_ONLY) &amp;&amp; file-&gt;f_op-&gt;fsync)</div><div class='ctx'> 		blk_queue_write_cache(lo-&gt;lo_queue, true, false);</div><div class='ctx'> </div><div class='add'>+	loop_update_rotational(lo);</div><div class='ctx'> 	loop_update_dio(lo);</div><div class='ctx'> 	set_capacity(lo-&gt;lo_disk, size);</div><div class='ctx'> 	bd_set_size(bdev, size &lt;&lt; 9);</div><div class='head'>diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c<br/>index 83302ecdc8db..f0105d118056 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/mtip32xx/mtip32xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/mtip32xx/mtip32xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/mtip32xx/mtip32xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/mtip32xx/mtip32xx.c</a></div><div class='hunk'>@@ -1192,14 +1192,6 @@ static int mtip_get_identify(struct mtip_port *port, void __user *user_buffer)</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(MTIP_DDF_SEC_LOCK_BIT, &amp;port-&gt;dd-&gt;dd_flag);</div><div class='ctx'> </div><div class='del'>-#ifdef MTIP_TRIM /* Disabling TRIM support temporarily */</div><div class='del'>-	/* Demux ID.DRAT &amp; ID.RZAT to determine trim support */</div><div class='del'>-	if (port-&gt;identify[69] &amp; (1 &lt;&lt; 14) &amp;&amp; port-&gt;identify[69] &amp; (1 &lt;&lt; 5))</div><div class='del'>-		port-&gt;dd-&gt;trim_supp = true;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-		port-&gt;dd-&gt;trim_supp = false;</div><div class='del'>-</div><div class='ctx'> 	/* Set the identify buffer as valid. */</div><div class='ctx'> 	port-&gt;identify_valid = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1387,77 +1379,6 @@ static int mtip_get_smart_attr(struct mtip_port *port, unsigned int id,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Trim unused sectors</div><div class='del'>- *</div><div class='del'>- * @dd		pointer to driver_data structure</div><div class='del'>- * @lba		starting lba</div><div class='del'>- * @len		# of 512b sectors to trim</div><div class='del'>- */</div><div class='del'>-static blk_status_t mtip_send_trim(struct driver_data *dd, unsigned int lba,</div><div class='del'>-		unsigned int len)</div><div class='del'>-{</div><div class='del'>-	u64 tlba, tlen, sect_left;</div><div class='del'>-	struct mtip_trim_entry *buf;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-	struct host_to_dev_fis fis;</div><div class='del'>-	blk_status_t ret = BLK_STS_OK;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!len || dd-&gt;trim_supp == false)</div><div class='del'>-		return BLK_STS_IOERR;</div><div class='del'>-</div><div class='del'>-	/* Trim request too big */</div><div class='del'>-	WARN_ON(len &gt; (MTIP_MAX_TRIM_ENTRY_LEN * MTIP_MAX_TRIM_ENTRIES));</div><div class='del'>-</div><div class='del'>-	/* Trim request not aligned on 4k boundary */</div><div class='del'>-	WARN_ON(len % 8 != 0);</div><div class='del'>-</div><div class='del'>-	/* Warn if vu_trim structure is too big */</div><div class='del'>-	WARN_ON(sizeof(struct mtip_trim) &gt; ATA_SECT_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Allocate a DMA buffer for the trim structure */</div><div class='del'>-	buf = dma_alloc_coherent(&amp;dd-&gt;pdev-&gt;dev, ATA_SECT_SIZE, &amp;dma_addr,</div><div class='del'>-								GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return BLK_STS_RESOURCE;</div><div class='del'>-	memset(buf, 0, ATA_SECT_SIZE);</div><div class='del'>-</div><div class='del'>-	for (i = 0, sect_left = len, tlba = lba;</div><div class='del'>-			i &lt; MTIP_MAX_TRIM_ENTRIES &amp;&amp; sect_left;</div><div class='del'>-			i++) {</div><div class='del'>-		tlen = (sect_left &gt;= MTIP_MAX_TRIM_ENTRY_LEN ?</div><div class='del'>-					MTIP_MAX_TRIM_ENTRY_LEN :</div><div class='del'>-					sect_left);</div><div class='del'>-		buf[i].lba = cpu_to_le32(tlba);</div><div class='del'>-		buf[i].range = cpu_to_le16(tlen);</div><div class='del'>-		tlba += tlen;</div><div class='del'>-		sect_left -= tlen;</div><div class='del'>-	}</div><div class='del'>-	WARN_ON(sect_left != 0);</div><div class='del'>-</div><div class='del'>-	/* Build the fis */</div><div class='del'>-	memset(&amp;fis, 0, sizeof(struct host_to_dev_fis));</div><div class='del'>-	fis.type       = 0x27;</div><div class='del'>-	fis.opts       = 1 &lt;&lt; 7;</div><div class='del'>-	fis.command    = 0xfb;</div><div class='del'>-	fis.features   = 0x60;</div><div class='del'>-	fis.sect_count = 1;</div><div class='del'>-	fis.device     = ATA_DEVICE_OBS;</div><div class='del'>-</div><div class='del'>-	if (mtip_exec_internal_command(dd-&gt;port,</div><div class='del'>-					&amp;fis,</div><div class='del'>-					5,</div><div class='del'>-					dma_addr,</div><div class='del'>-					ATA_SECT_SIZE,</div><div class='del'>-					0,</div><div class='del'>-					MTIP_TRIM_TIMEOUT_MS) &lt; 0)</div><div class='del'>-		ret = BLK_STS_IOERR;</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(&amp;dd-&gt;pdev-&gt;dev, ATA_SECT_SIZE, buf, dma_addr);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Get the drive capacity.</div><div class='ctx'>  *</div><div class='ctx'>  * @dd      Pointer to the device data structure.</div><div class='hunk'>@@ -3590,8 +3511,6 @@ static blk_status_t mtip_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_start_request(rq);</div><div class='ctx'> </div><div class='del'>-	if (req_op(rq) == REQ_OP_DISCARD)</div><div class='del'>-		return mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq));</div><div class='ctx'> 	mtip_hw_submit_io(dd, rq, cmd, hctx);</div><div class='ctx'> 	return BLK_STS_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -3769,14 +3688,6 @@ skip_create_disk:</div><div class='ctx'> 	blk_queue_max_segment_size(dd-&gt;queue, 0x400000);</div><div class='ctx'> 	blk_queue_io_min(dd-&gt;queue, 4096);</div><div class='ctx'> </div><div class='del'>-	/* Signal trim support */</div><div class='del'>-	if (dd-&gt;trim_supp == true) {</div><div class='del'>-		blk_queue_flag_set(QUEUE_FLAG_DISCARD, dd-&gt;queue);</div><div class='del'>-		dd-&gt;queue-&gt;limits.discard_granularity = 4096;</div><div class='del'>-		blk_queue_max_discard_sectors(dd-&gt;queue,</div><div class='del'>-			MTIP_MAX_TRIM_ENTRY_LEN * MTIP_MAX_TRIM_ENTRIES);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Set the capacity of the device in 512 byte sectors. */</div><div class='ctx'> 	if (!(mtip_hw_get_capacity(dd, &amp;capacity))) {</div><div class='ctx'> 		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='head'>diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h<br/>index abce25f27f57..91c1cb5b1532 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/mtip32xx/mtip32xx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/mtip32xx/mtip32xx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/mtip32xx/mtip32xx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/mtip32xx/mtip32xx.h</a></div><div class='hunk'>@@ -193,21 +193,6 @@ struct mtip_work {</div><div class='ctx'> 		mtip_workq_sdbfx(w-&gt;port, group, w-&gt;completed);     \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#define MTIP_TRIM_TIMEOUT_MS		240000</div><div class='del'>-#define MTIP_MAX_TRIM_ENTRIES		8</div><div class='del'>-#define MTIP_MAX_TRIM_ENTRY_LEN		0xfff8</div><div class='del'>-</div><div class='del'>-struct mtip_trim_entry {</div><div class='del'>-	__le32 lba;   /* starting lba of region */</div><div class='del'>-	__le16 rsvd;  /* unused */</div><div class='del'>-	__le16 range; /* # of 512b blocks to trim */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mtip_trim {</div><div class='del'>-	/* Array of regions to trim */</div><div class='del'>-	struct mtip_trim_entry entry[MTIP_MAX_TRIM_ENTRIES];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> /* Register Frame Information Structure (FIS), host to device. */</div><div class='ctx'> struct host_to_dev_fis {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -474,8 +459,6 @@ struct driver_data {</div><div class='ctx'> </div><div class='ctx'> 	struct dentry *dfs_node;</div><div class='ctx'> </div><div class='del'>-	bool trim_supp; /* flag indicating trim support */</div><div class='del'>-</div><div class='ctx'> 	bool sr;</div><div class='ctx'> </div><div class='ctx'> 	int numa_node; /* NUMA support */</div><div class='head'>diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c<br/>index 90ba9f4c03f3..053958a8a2ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/nbd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/nbd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/nbd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/nbd.c</a></div><div class='hunk'>@@ -44,6 +44,9 @@</div><div class='ctx'> #include &lt;linux/nbd-netlink.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> </div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/nbd.h&gt;</div><div class='add'>+</div><div class='ctx'> static DEFINE_IDR(nbd_index_idr);</div><div class='ctx'> static DEFINE_MUTEX(nbd_index_mutex);</div><div class='ctx'> static int nbd_total_devices = 0;</div><div class='hunk'>@@ -510,6 +513,10 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)</div><div class='ctx'> 	if (sent) {</div><div class='ctx'> 		if (sent &gt;= sizeof(request)) {</div><div class='ctx'> 			skip = sent - sizeof(request);</div><div class='add'>+</div><div class='add'>+			/* initialize handle for tracing purposes */</div><div class='add'>+			handle = nbd_cmd_handle(cmd);</div><div class='add'>+</div><div class='ctx'> 			goto send_pages;</div><div class='ctx'> 		}</div><div class='ctx'> 		iov_iter_advance(&amp;from, sent);</div><div class='hunk'>@@ -526,11 +533,14 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)</div><div class='ctx'> 	handle = nbd_cmd_handle(cmd);</div><div class='ctx'> 	memcpy(request.handle, &amp;handle, sizeof(handle));</div><div class='ctx'> </div><div class='add'>+	trace_nbd_send_request(&amp;request, nbd-&gt;index, blk_mq_rq_from_pdu(cmd));</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(nbd_to_dev(nbd), "request %p: sending control (%s@%llu,%uB)\n",</div><div class='ctx'> 		req, nbdcmd_to_ascii(type),</div><div class='ctx'> 		(unsigned long long)blk_rq_pos(req) &lt;&lt; 9, blk_rq_bytes(req));</div><div class='ctx'> 	result = sock_xmit(nbd, index, 1, &amp;from,</div><div class='ctx'> 			(type == NBD_CMD_WRITE) ? MSG_MORE : 0, &amp;sent);</div><div class='add'>+	trace_nbd_header_sent(req, handle);</div><div class='ctx'> 	if (result &lt;= 0) {</div><div class='ctx'> 		if (was_interrupted(result)) {</div><div class='ctx'> 			/* If we havne't sent anything we can just return BUSY,</div><div class='hunk'>@@ -603,6 +613,7 @@ send_pages:</div><div class='ctx'> 		bio = next;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	trace_nbd_payload_sent(req, handle);</div><div class='ctx'> 	nsock-&gt;pending = NULL;</div><div class='ctx'> 	nsock-&gt;sent = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -650,6 +661,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)</div><div class='ctx'> 			tag, req);</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='add'>+	trace_nbd_header_received(req, handle);</div><div class='ctx'> 	cmd = blk_mq_rq_to_pdu(req);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cmd-&gt;lock);</div><div class='hunk'>@@ -703,6 +715,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	trace_nbd_payload_received(req, handle);</div><div class='ctx'> 	mutex_unlock(&amp;cmd-&gt;lock);</div><div class='ctx'> 	return ret ? ERR_PTR(ret) : cmd;</div><div class='ctx'> }</div><div class='hunk'>@@ -1797,8 +1810,10 @@ again:</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,</div><div class='del'>-					       nbd_sock_policy, info-&gt;extack);</div><div class='add'>+			ret = nla_parse_nested_deprecated(socks, NBD_SOCK_MAX,</div><div class='add'>+							  attr,</div><div class='add'>+							  nbd_sock_policy,</div><div class='add'>+							  info-&gt;extack);</div><div class='ctx'> 			if (ret != 0) {</div><div class='ctx'> 				printk(KERN_ERR "nbd: error processing sock list\n");</div><div class='ctx'> 				ret = -EINVAL;</div><div class='hunk'>@@ -1968,8 +1983,10 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,</div><div class='del'>-					       nbd_sock_policy, info-&gt;extack);</div><div class='add'>+			ret = nla_parse_nested_deprecated(socks, NBD_SOCK_MAX,</div><div class='add'>+							  attr,</div><div class='add'>+							  nbd_sock_policy,</div><div class='add'>+							  info-&gt;extack);</div><div class='ctx'> 			if (ret != 0) {</div><div class='ctx'> 				printk(KERN_ERR "nbd: error processing sock list\n");</div><div class='ctx'> 				ret = -EINVAL;</div><div class='hunk'>@@ -1999,22 +2016,22 @@ out:</div><div class='ctx'> static const struct genl_ops nbd_connect_genl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= NBD_CMD_CONNECT,</div><div class='del'>-		.policy	= nbd_attr_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= nbd_genl_connect,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= NBD_CMD_DISCONNECT,</div><div class='del'>-		.policy	= nbd_attr_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= nbd_genl_disconnect,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= NBD_CMD_RECONFIGURE,</div><div class='del'>-		.policy	= nbd_attr_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= nbd_genl_reconfigure,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= NBD_CMD_STATUS,</div><div class='del'>-		.policy	= nbd_attr_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit	= nbd_genl_status,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -2031,6 +2048,7 @@ static struct genl_family nbd_genl_family __ro_after_init = {</div><div class='ctx'> 	.ops		= nbd_connect_genl_ops,</div><div class='ctx'> 	.n_ops		= ARRAY_SIZE(nbd_connect_genl_ops),</div><div class='ctx'> 	.maxattr	= NBD_ATTR_MAX,</div><div class='add'>+	.policy = nbd_attr_policy,</div><div class='ctx'> 	.mcgrps		= nbd_mcast_grps,</div><div class='ctx'> 	.n_mcgrps	= ARRAY_SIZE(nbd_mcast_grps),</div><div class='ctx'> };</div><div class='hunk'>@@ -2050,7 +2068,7 @@ static int populate_nbd_status(struct nbd_device *nbd, struct sk_buff *reply)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (refcount_read(&amp;nbd-&gt;config_refs))</div><div class='ctx'> 		connected = 1;</div><div class='del'>-	dev_opt = nla_nest_start(reply, NBD_DEVICE_ITEM);</div><div class='add'>+	dev_opt = nla_nest_start_noflag(reply, NBD_DEVICE_ITEM);</div><div class='ctx'> 	if (!dev_opt)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	ret = nla_put_u32(reply, NBD_DEVICE_INDEX, nbd-&gt;index);</div><div class='hunk'>@@ -2098,7 +2116,7 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_list = nla_nest_start(reply, NBD_ATTR_DEVICE_LIST);</div><div class='add'>+	dev_list = nla_nest_start_noflag(reply, NBD_ATTR_DEVICE_LIST);</div><div class='ctx'> 	if (index == -1) {</div><div class='ctx'> 		ret = idr_for_each(&amp;nbd_index_idr, &amp;status_cb, reply);</div><div class='ctx'> 		if (ret) {</div><div class='head'>diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c<br/>index 417a9f15c116..d7ac09c092f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/null_blk_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/null_blk_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/null_blk_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/null_blk_main.c</a></div><div class='hunk'>@@ -1748,6 +1748,11 @@ static int __init null_init(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (g_home_node != NUMA_NO_NODE &amp;&amp; g_home_node &gt;= nr_online_nodes) {</div><div class='add'>+		pr_err("null_blk: invalid home_node value\n");</div><div class='add'>+		g_home_node = NUMA_NO_NODE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (g_queue_mode == NULL_Q_RQ) {</div><div class='ctx'> 		pr_err("null_blk: legacy IO path no longer available\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c<br/>index 96670eefaeb2..001dbdcbf355 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/paride/pcd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/paride/pcd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/paride/pcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/paride/pcd.c</a></div><div class='hunk'>@@ -314,6 +314,7 @@ static void pcd_init_units(void)</div><div class='ctx'> 		disk-&gt;queue = blk_mq_init_sq_queue(&amp;cd-&gt;tag_set, &amp;pcd_mq_ops,</div><div class='ctx'> 						   1, BLK_MQ_F_SHOULD_MERGE);</div><div class='ctx'> 		if (IS_ERR(disk-&gt;queue)) {</div><div class='add'>+			put_disk(disk);</div><div class='ctx'> 			disk-&gt;queue = NULL;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -342,6 +343,7 @@ static void pcd_init_units(void)</div><div class='ctx'> 		strcpy(disk-&gt;disk_name, cd-&gt;name);	/* umm... */</div><div class='ctx'> 		disk-&gt;fops = &amp;pcd_bdops;</div><div class='ctx'> 		disk-&gt;flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;</div><div class='add'>+		disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -749,8 +751,14 @@ static int pcd_detect(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk("%s: No CD-ROM drive found\n", name);</div><div class='del'>-	for (unit = 0, cd = pcd; unit &lt; PCD_UNITS; unit++, cd++)</div><div class='add'>+	for (unit = 0, cd = pcd; unit &lt; PCD_UNITS; unit++, cd++) {</div><div class='add'>+		if (!cd-&gt;disk)</div><div class='add'>+			continue;</div><div class='add'>+		blk_cleanup_queue(cd-&gt;disk-&gt;queue);</div><div class='add'>+		cd-&gt;disk-&gt;queue = NULL;</div><div class='add'>+		blk_mq_free_tag_set(&amp;cd-&gt;tag_set);</div><div class='ctx'> 		put_disk(cd-&gt;disk);</div><div class='add'>+	}</div><div class='ctx'> 	pi_unregister_driver(par_drv);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1006,8 +1014,14 @@ static int __init pcd_init(void)</div><div class='ctx'> 	pcd_probe_capabilities();</div><div class='ctx'> </div><div class='ctx'> 	if (register_blkdev(major, name)) {</div><div class='del'>-		for (unit = 0, cd = pcd; unit &lt; PCD_UNITS; unit++, cd++)</div><div class='add'>+		for (unit = 0, cd = pcd; unit &lt; PCD_UNITS; unit++, cd++) {</div><div class='add'>+			if (!cd-&gt;disk)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			blk_cleanup_queue(cd-&gt;disk-&gt;queue);</div><div class='add'>+			blk_mq_free_tag_set(&amp;cd-&gt;tag_set);</div><div class='ctx'> 			put_disk(cd-&gt;disk);</div><div class='add'>+		}</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1028,6 +1042,9 @@ static void __exit pcd_exit(void)</div><div class='ctx'> 	int unit;</div><div class='ctx'> </div><div class='ctx'> 	for (unit = 0, cd = pcd; unit &lt; PCD_UNITS; unit++, cd++) {</div><div class='add'>+		if (!cd-&gt;disk)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (cd-&gt;present) {</div><div class='ctx'> 			del_gendisk(cd-&gt;disk);</div><div class='ctx'> 			pi_release(cd-&gt;pi);</div><div class='head'>diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c<br/>index 0ff9b12d0e35..6f9ad3fc716f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/paride/pd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/paride/pd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/paride/pd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/paride/pd.c</a></div><div class='hunk'>@@ -897,6 +897,7 @@ static void pd_probe_drive(struct pd_unit *disk)</div><div class='ctx'> 	p-&gt;fops = &amp;pd_fops;</div><div class='ctx'> 	p-&gt;major = major;</div><div class='ctx'> 	p-&gt;first_minor = (disk - pd) &lt;&lt; PD_BITS;</div><div class='add'>+	p-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	disk-&gt;gd = p;</div><div class='ctx'> 	p-&gt;private_data = disk;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c<br/>index e92e7a8eeeb2..1e9c50a7256c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/paride/pf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/paride/pf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/paride/pf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/paride/pf.c</a></div><div class='hunk'>@@ -319,6 +319,7 @@ static void __init pf_init_units(void)</div><div class='ctx'> 		disk-&gt;first_minor = unit;</div><div class='ctx'> 		strcpy(disk-&gt;disk_name, pf-&gt;name);</div><div class='ctx'> 		disk-&gt;fops = &amp;pf_fops;</div><div class='add'>+		disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 		if (!(*drives[unit])[D_PRT])</div><div class='ctx'> 			pf_drive_count++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -761,8 +762,14 @@ static int pf_detect(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk("%s: No ATAPI disk detected\n", name);</div><div class='del'>-	for (pf = units, unit = 0; unit &lt; PF_UNITS; pf++, unit++)</div><div class='add'>+	for (pf = units, unit = 0; unit &lt; PF_UNITS; pf++, unit++) {</div><div class='add'>+		if (!pf-&gt;disk)</div><div class='add'>+			continue;</div><div class='add'>+		blk_cleanup_queue(pf-&gt;disk-&gt;queue);</div><div class='add'>+		pf-&gt;disk-&gt;queue = NULL;</div><div class='add'>+		blk_mq_free_tag_set(&amp;pf-&gt;tag_set);</div><div class='ctx'> 		put_disk(pf-&gt;disk);</div><div class='add'>+	}</div><div class='ctx'> 	pi_unregister_driver(par_drv);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1025,8 +1032,13 @@ static int __init pf_init(void)</div><div class='ctx'> 	pf_busy = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (register_blkdev(major, name)) {</div><div class='del'>-		for (pf = units, unit = 0; unit &lt; PF_UNITS; pf++, unit++)</div><div class='add'>+		for (pf = units, unit = 0; unit &lt; PF_UNITS; pf++, unit++) {</div><div class='add'>+			if (!pf-&gt;disk)</div><div class='add'>+				continue;</div><div class='add'>+			blk_cleanup_queue(pf-&gt;disk-&gt;queue);</div><div class='add'>+			blk_mq_free_tag_set(&amp;pf-&gt;tag_set);</div><div class='ctx'> 			put_disk(pf-&gt;disk);</div><div class='add'>+		}</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1047,13 +1059,18 @@ static void __exit pf_exit(void)</div><div class='ctx'> 	int unit;</div><div class='ctx'> 	unregister_blkdev(major, name);</div><div class='ctx'> 	for (pf = units, unit = 0; unit &lt; PF_UNITS; pf++, unit++) {</div><div class='del'>-		if (!pf-&gt;present)</div><div class='add'>+		if (!pf-&gt;disk)</div><div class='ctx'> 			continue;</div><div class='del'>-		del_gendisk(pf-&gt;disk);</div><div class='add'>+</div><div class='add'>+		if (pf-&gt;present)</div><div class='add'>+			del_gendisk(pf-&gt;disk);</div><div class='add'>+</div><div class='ctx'> 		blk_cleanup_queue(pf-&gt;disk-&gt;queue);</div><div class='ctx'> 		blk_mq_free_tag_set(&amp;pf-&gt;tag_set);</div><div class='ctx'> 		put_disk(pf-&gt;disk);</div><div class='del'>-		pi_release(pf-&gt;pi);</div><div class='add'>+</div><div class='add'>+		if (pf-&gt;present)</div><div class='add'>+			pi_release(pf-&gt;pi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c<br/>index f5a71023f76c..024060165afa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/pktcdvd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/pktcdvd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/pktcdvd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/pktcdvd.c</a></div><div class='hunk'>@@ -2761,7 +2761,6 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* inherit events of the host device */</div><div class='ctx'> 	disk-&gt;events = pd-&gt;bdev-&gt;bd_disk-&gt;events;</div><div class='del'>-	disk-&gt;async_events = pd-&gt;bdev-&gt;bd_disk-&gt;async_events;</div><div class='ctx'> </div><div class='ctx'> 	add_disk(disk);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c<br/>index 4e1d9b31f60c..cc61c5ce3ad5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/ps3disk.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/ps3disk.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/ps3disk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/ps3disk.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	rq_for_each_segment(bvec, req, iter) {</div><div class='ctx'> 		unsigned long flags;</div><div class='del'>-		dev_dbg(&amp;dev-&gt;sbd.core, "%s:%u: bio %u: %u sectors from %lu\n",</div><div class='add'>+		dev_dbg(&amp;dev-&gt;sbd.core, "%s:%u: bio %u: %u sectors from %llu\n",</div><div class='ctx'> 			__func__, __LINE__, i, bio_sectors(iter.bio),</div><div class='ctx'> 			iter.bio-&gt;bi_iter.bi_sector);</div><div class='ctx'> </div><div class='hunk'>@@ -496,7 +496,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)</div><div class='ctx'> 		     dev-&gt;regions[dev-&gt;region_idx].size*priv-&gt;blocking_factor);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;dev-&gt;sbd.core,</div><div class='del'>-		 "%s is a %s (%llu MiB total, %lu MiB for OtherOS)\n",</div><div class='add'>+		 "%s is a %s (%llu MiB total, %llu MiB for OtherOS)\n",</div><div class='ctx'> 		 gendisk-&gt;disk_name, priv-&gt;model, priv-&gt;raw_capacity &gt;&gt; 11,</div><div class='ctx'> 		 get_capacity(gendisk) &gt;&gt; 11);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c<br/>index 4ba967d65cf9..2210c1b9491b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/rbd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/rbd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/rbd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/rbd.c</a></div><div class='hunk'>@@ -833,7 +833,7 @@ static int parse_rbd_opts_token(char *c, void *private)</div><div class='ctx'> 		pctx-&gt;opts-&gt;queue_depth = intval;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_alloc_size:</div><div class='del'>-		if (intval &lt; 1) {</div><div class='add'>+		if (intval &lt; SECTOR_SIZE) {</div><div class='ctx'> 			pr_err("alloc_size out of range\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -924,23 +924,6 @@ static void rbd_put_client(struct rbd_client *rbdc)</div><div class='ctx'> 		kref_put(&amp;rbdc-&gt;kref, rbd_client_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wait_for_latest_osdmap(struct ceph_client *client)</div><div class='del'>-{</div><div class='del'>-	u64 newest_epoch;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = ceph_monc_get_version(&amp;client-&gt;monc, "osdmap", &amp;newest_epoch);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (client-&gt;osdc.osdmap-&gt;epoch &gt;= newest_epoch)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ceph_osdc_maybe_request_map(&amp;client-&gt;osdc);</div><div class='del'>-	return ceph_monc_wait_osdmap(&amp;client-&gt;monc, newest_epoch,</div><div class='del'>-				     client-&gt;options-&gt;mount_timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Get a ceph client with specific addr and configuration, if one does</div><div class='ctx'>  * not exist create it.  Either way, ceph_opts is consumed by this</div><div class='hunk'>@@ -960,7 +943,8 @@ static struct rbd_client *rbd_get_client(struct ceph_options *ceph_opts)</div><div class='ctx'> 		 * Using an existing client.  Make sure -&gt;pg_pools is up to</div><div class='ctx'> 		 * date before we look up the pool id in do_rbd_add().</div><div class='ctx'> 		 */</div><div class='del'>-		ret = wait_for_latest_osdmap(rbdc-&gt;client);</div><div class='add'>+		ret = ceph_wait_for_latest_osdmap(rbdc-&gt;client,</div><div class='add'>+					rbdc-&gt;client-&gt;options-&gt;mount_timeout);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			rbd_warn(NULL, "failed to get latest osdmap: %d", ret);</div><div class='ctx'> 			rbd_put_client(rbdc);</div><div class='hunk'>@@ -4203,12 +4187,12 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)</div><div class='ctx'> 	q-&gt;limits.max_sectors = queue_max_hw_sectors(q);</div><div class='ctx'> 	blk_queue_max_segments(q, USHRT_MAX);</div><div class='ctx'> 	blk_queue_max_segment_size(q, UINT_MAX);</div><div class='del'>-	blk_queue_io_min(q, objset_bytes);</div><div class='del'>-	blk_queue_io_opt(q, objset_bytes);</div><div class='add'>+	blk_queue_io_min(q, rbd_dev-&gt;opts-&gt;alloc_size);</div><div class='add'>+	blk_queue_io_opt(q, rbd_dev-&gt;opts-&gt;alloc_size);</div><div class='ctx'> </div><div class='ctx'> 	if (rbd_dev-&gt;opts-&gt;trim) {</div><div class='ctx'> 		blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);</div><div class='del'>-		q-&gt;limits.discard_granularity = objset_bytes;</div><div class='add'>+		q-&gt;limits.discard_granularity = rbd_dev-&gt;opts-&gt;alloc_size;</div><div class='ctx'> 		blk_queue_max_discard_sectors(q, objset_bytes &gt;&gt; SECTOR_SHIFT);</div><div class='ctx'> 		blk_queue_max_write_zeroes_sectors(q, objset_bytes &gt;&gt; SECTOR_SHIFT);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c<br/>index 0cf4509d575c..898d522e8338 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/rsxx/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/rsxx/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/rsxx/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/rsxx/core.c</a></div><div class='hunk'>@@ -439,6 +439,7 @@ static void card_state_change(struct rsxx_cardinfo *card,</div><div class='ctx'> 		 * Fall through so the DMA devices can be attached and</div><div class='ctx'> 		 * the user can attempt to pull off their data.</div><div class='ctx'> 		 */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case CARD_STATE_GOOD:</div><div class='ctx'> 		st = rsxx_get_card_size8(card, &amp;card-&gt;size8);</div><div class='ctx'> 		if (st)</div><div class='head'>diff --git a/drivers/block/swim.c b/drivers/block/swim.c<br/>index 3fa6fcc34790..67b5ec281c6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/swim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/swim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/swim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/swim.c</a></div><div class='hunk'>@@ -862,6 +862,7 @@ static int swim_floppy_init(struct swim_priv *swd)</div><div class='ctx'> 		swd-&gt;unit[drive].disk-&gt;first_minor = drive;</div><div class='ctx'> 		sprintf(swd-&gt;unit[drive].disk-&gt;disk_name, "fd%d", drive);</div><div class='ctx'> 		swd-&gt;unit[drive].disk-&gt;fops = &amp;floppy_fops;</div><div class='add'>+		swd-&gt;unit[drive].disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 		swd-&gt;unit[drive].disk-&gt;private_data = &amp;swd-&gt;unit[drive];</div><div class='ctx'> 		set_capacity(swd-&gt;unit[drive].disk, 2880);</div><div class='ctx'> 		add_disk(swd-&gt;unit[drive].disk);</div><div class='head'>diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c<br/>index 1e2ae90d7715..cf42729c788e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/swim3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/swim3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/swim3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/swim3.c</a></div><div class='hunk'>@@ -1216,6 +1216,7 @@ static int swim3_attach(struct macio_dev *mdev,</div><div class='ctx'> 	disk-&gt;first_minor = floppy_count;</div><div class='ctx'> 	disk-&gt;fops = &amp;floppy_fops;</div><div class='ctx'> 	disk-&gt;private_data = fs;</div><div class='add'>+	disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	disk-&gt;flags |= GENHD_FL_REMOVABLE;</div><div class='ctx'> 	sprintf(disk-&gt;disk_name, "fd%d", floppy_count);</div><div class='ctx'> 	set_capacity(disk, 2880);</div><div class='head'>diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c<br/>index 4bc083b7c9b5..f1d90cd3dc47 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/virtio_blk.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/virtio_blk.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/virtio_blk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/virtio_blk.c</a></div><div class='hunk'>@@ -513,6 +513,8 @@ static int init_vq(struct virtio_blk *vblk)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		num_vqs = 1;</div><div class='ctx'> </div><div class='add'>+	num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs);</div><div class='add'>+</div><div class='ctx'> 	vblk-&gt;vqs = kmalloc_array(num_vqs, sizeof(*vblk-&gt;vqs), GFP_KERNEL);</div><div class='ctx'> 	if (!vblk-&gt;vqs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -691,7 +693,8 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_blk *vblk = set-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	return blk_mq_virtio_map_queues(&amp;set-&gt;map[0], vblk-&gt;vdev, 0);</div><div class='add'>+	return blk_mq_virtio_map_queues(&amp;set-&gt;map[HCTX_TYPE_DEFAULT],</div><div class='add'>+					vblk-&gt;vdev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_VIRTIO_BLK_SCSI</div><div class='head'>diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c<br/>index 87ccef4bd69e..464c9092bc8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/xsysace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/xsysace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/xsysace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/xsysace.c</a></div><div class='hunk'>@@ -1032,6 +1032,7 @@ static int ace_setup(struct ace_device *ace)</div><div class='ctx'> 	ace-&gt;gd-&gt;major = ace_major;</div><div class='ctx'> 	ace-&gt;gd-&gt;first_minor = ace-&gt;id * ACE_NUM_MINORS;</div><div class='ctx'> 	ace-&gt;gd-&gt;fops = &amp;ace_fops;</div><div class='add'>+	ace-&gt;gd-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	ace-&gt;gd-&gt;queue = ace-&gt;queue;</div><div class='ctx'> 	ace-&gt;gd-&gt;private_data = ace;</div><div class='ctx'> 	snprintf(ace-&gt;gd-&gt;disk_name, 32, "xs%c", ace-&gt;id + 'a');</div><div class='hunk'>@@ -1090,6 +1091,8 @@ static int ace_setup(struct ace_device *ace)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_read:</div><div class='add'>+	/* prevent double queue cleanup */</div><div class='add'>+	ace-&gt;gd-&gt;queue = NULL;</div><div class='ctx'> 	put_disk(ace-&gt;gd);</div><div class='ctx'> err_alloc_disk:</div><div class='ctx'> 	blk_cleanup_queue(ace-&gt;queue);</div><div class='head'>diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c<br/>index e7a5f1d1c314..d58a359a6622 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/zram/zram_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/block/zram/zram_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/block/zram/zram_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/block/zram/zram_drv.c</a></div><div class='hunk'>@@ -290,18 +290,8 @@ static ssize_t idle_store(struct device *dev,</div><div class='ctx'> 	struct zram *zram = dev_to_zram(dev);</div><div class='ctx'> 	unsigned long nr_pages = zram-&gt;disksize &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	int index;</div><div class='del'>-	char mode_buf[8];</div><div class='del'>-	ssize_t sz;</div><div class='ctx'> </div><div class='del'>-	sz = strscpy(mode_buf, buf, sizeof(mode_buf));</div><div class='del'>-	if (sz &lt;= 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* ignore trailing new line */</div><div class='del'>-	if (mode_buf[sz - 1] == '\n')</div><div class='del'>-		mode_buf[sz - 1] = 0x00;</div><div class='del'>-</div><div class='del'>-	if (strcmp(mode_buf, "all"))</div><div class='add'>+	if (!sysfs_streq(buf, "all"))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;zram-&gt;init_lock);</div><div class='hunk'>@@ -635,25 +625,15 @@ static ssize_t writeback_store(struct device *dev,</div><div class='ctx'> 	struct bio bio;</div><div class='ctx'> 	struct bio_vec bio_vec;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	ssize_t ret, sz;</div><div class='del'>-	char mode_buf[8];</div><div class='del'>-	int mode = -1;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	int mode;</div><div class='ctx'> 	unsigned long blk_idx = 0;</div><div class='ctx'> </div><div class='del'>-	sz = strscpy(mode_buf, buf, sizeof(mode_buf));</div><div class='del'>-	if (sz &lt;= 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* ignore trailing newline */</div><div class='del'>-	if (mode_buf[sz - 1] == '\n')</div><div class='del'>-		mode_buf[sz - 1] = 0x00;</div><div class='del'>-</div><div class='del'>-	if (!strcmp(mode_buf, "idle"))</div><div class='add'>+	if (sysfs_streq(buf, "idle"))</div><div class='ctx'> 		mode = IDLE_WRITEBACK;</div><div class='del'>-	else if (!strcmp(mode_buf, "huge"))</div><div class='add'>+	else if (sysfs_streq(buf, "huge"))</div><div class='ctx'> 		mode = HUGE_WRITEBACK;</div><div class='del'>-</div><div class='del'>-	if (mode == -1)</div><div class='add'>+	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;zram-&gt;init_lock);</div><div class='hunk'>@@ -794,18 +774,18 @@ struct zram_work {</div><div class='ctx'> 	struct zram *zram;</div><div class='ctx'> 	unsigned long entry;</div><div class='ctx'> 	struct bio *bio;</div><div class='add'>+	struct bio_vec bvec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if PAGE_SIZE != 4096</div><div class='ctx'> static void zram_sync_read(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec bvec;</div><div class='ctx'> 	struct zram_work *zw = container_of(work, struct zram_work, work);</div><div class='ctx'> 	struct zram *zram = zw-&gt;zram;</div><div class='ctx'> 	unsigned long entry = zw-&gt;entry;</div><div class='ctx'> 	struct bio *bio = zw-&gt;bio;</div><div class='ctx'> </div><div class='del'>-	read_from_bdev_async(zram, &amp;bvec, entry, bio);</div><div class='add'>+	read_from_bdev_async(zram, &amp;zw-&gt;bvec, entry, bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -818,6 +798,7 @@ static int read_from_bdev_sync(struct zram *zram, struct bio_vec *bvec,</div><div class='ctx'> {</div><div class='ctx'> 	struct zram_work work;</div><div class='ctx'> </div><div class='add'>+	work.bvec = *bvec;</div><div class='ctx'> 	work.zram = zram;</div><div class='ctx'> 	work.entry = entry;</div><div class='ctx'> 	work.bio = bio;</div><div class='head'>diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig<br/>index 7b2e76e7f22f..b9c34ff9a0d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/Kconfig</a></div><div class='hunk'>@@ -336,7 +336,7 @@ config BT_MRVL</div><div class='ctx'> 	  The core driver to support Marvell Bluetooth devices.</div><div class='ctx'> </div><div class='ctx'> 	  This driver is required if you want to support</div><div class='del'>-	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8977/8997.</div><div class='add'>+	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8977/8987/8997.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y here to compile Marvell Bluetooth driver</div><div class='ctx'> 	  into the kernel or say M to compile it as module.</div><div class='hunk'>@@ -350,7 +350,7 @@ config BT_MRVL_SDIO</div><div class='ctx'> 	  The driver for Marvell Bluetooth chipsets with SDIO interface.</div><div class='ctx'> </div><div class='ctx'> 	  This driver is required if you want to use Marvell Bluetooth</div><div class='del'>-	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897/SD8977/SD8997</div><div class='add'>+	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897/SD8977/SD8987/SD8997</div><div class='ctx'> 	  chipsets are supported.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y here to compile support for Marvell BT-over-SDIO driver</div><div class='hunk'>@@ -379,6 +379,17 @@ config BT_WILINK</div><div class='ctx'> 	  Say Y here to compile support for Texas Instrument's WiLink7 driver</div><div class='ctx'> 	  into the kernel or say M to compile it as module (btwilink).</div><div class='ctx'> </div><div class='add'>+config BT_MTKSDIO</div><div class='add'>+	tristate "MediaTek HCI SDIO driver"</div><div class='add'>+	depends on MMC</div><div class='add'>+	help</div><div class='add'>+	  MediaTek Bluetooth HCI SDIO driver.</div><div class='add'>+	  This driver is required if you want to use MediaTek Bluetooth</div><div class='add'>+	  with SDIO interface.</div><div class='add'>+</div><div class='add'>+	  Say Y here to compile support for MediaTek Bluetooth SDIO devices</div><div class='add'>+	  into the kernel or say M to compile it as module (btmtksdio).</div><div class='add'>+</div><div class='ctx'> config BT_MTKUART</div><div class='ctx'> 	tristate "MediaTek HCI UART driver"</div><div class='ctx'> 	depends on SERIAL_DEV_BUS</div><div class='head'>diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile<br/>index b7e393cfc1e3..34887b9b3a85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/Makefile</a></div><div class='hunk'>@@ -20,6 +20,7 @@ obj-$(CONFIG_BT_ATH3K)		+= ath3k.o</div><div class='ctx'> obj-$(CONFIG_BT_MRVL)		+= btmrvl.o</div><div class='ctx'> obj-$(CONFIG_BT_MRVL_SDIO)	+= btmrvl_sdio.o</div><div class='ctx'> obj-$(CONFIG_BT_WILINK)		+= btwilink.o</div><div class='add'>+obj-$(CONFIG_BT_MTKSDIO)	+= btmtksdio.o</div><div class='ctx'> obj-$(CONFIG_BT_MTKUART)	+= btmtkuart.o</div><div class='ctx'> obj-$(CONFIG_BT_QCOMSMD)	+= btqcomsmd.o</div><div class='ctx'> obj-$(CONFIG_BT_BCM)		+= btbcm.o</div><div class='head'>diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c<br/>index d5d6e6e5da3b..8e17963ab65a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btbcm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btbcm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btbcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btbcm.c</a></div><div class='hunk'>@@ -34,9 +34,11 @@</div><div class='ctx'> </div><div class='ctx'> #define BDADDR_BCM20702A0 (&amp;(bdaddr_t) {{0x00, 0xa0, 0x02, 0x70, 0x20, 0x00}})</div><div class='ctx'> #define BDADDR_BCM20702A1 (&amp;(bdaddr_t) {{0x00, 0x00, 0xa0, 0x02, 0x70, 0x20}})</div><div class='add'>+#define BDADDR_BCM2076B1 (&amp;(bdaddr_t) {{0x79, 0x56, 0x00, 0xa0, 0x76, 0x20}})</div><div class='ctx'> #define BDADDR_BCM43430A0 (&amp;(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa0, 0x43, 0x43}})</div><div class='ctx'> #define BDADDR_BCM4324B3 (&amp;(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})</div><div class='ctx'> #define BDADDR_BCM4330B1 (&amp;(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}})</div><div class='add'>+#define BDADDR_BCM43341B (&amp;(bdaddr_t) {{0xac, 0x1f, 0x00, 0x1b, 0x34, 0x43}})</div><div class='ctx'> </div><div class='ctx'> int btbcm_check_bdaddr(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -69,6 +71,9 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)</div><div class='ctx'> 	 * The address 20:70:02:A0:00:00 indicates a BCM20702A1 controller</div><div class='ctx'> 	 * with no configured address.</div><div class='ctx'> 	 *</div><div class='add'>+	 * The address 20:76:A0:00:56:79 indicates a BCM2076B1 controller</div><div class='add'>+	 * with no configured address.</div><div class='add'>+	 *</div><div class='ctx'> 	 * The address 43:24:B3:00:00:00 indicates a BCM4324B3 controller</div><div class='ctx'> 	 * with waiting for configuration state.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -80,9 +85,11 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM20702A0) ||</div><div class='ctx'> 	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM20702A1) ||</div><div class='add'>+	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM2076B1) ||</div><div class='ctx'> 	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM4324B3) ||</div><div class='ctx'> 	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM4330B1) ||</div><div class='del'>-	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM43430A0)) {</div><div class='add'>+	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM43430A0) ||</div><div class='add'>+	    !bacmp(&amp;bda-&gt;bdaddr, BDADDR_BCM43341B)) {</div><div class='ctx'> 		bt_dev_info(hdev, "BCM: Using default device address (%pMR)",</div><div class='ctx'> 			    &amp;bda-&gt;bdaddr);</div><div class='ctx'> 		set_bit(HCI_QUIRK_INVALID_BDADDR, &amp;hdev-&gt;quirks);</div><div class='hunk'>@@ -333,6 +340,7 @@ struct bcm_subver_table {</div><div class='ctx'> static const struct bcm_subver_table bcm_uart_subver_table[] = {</div><div class='ctx'> 	{ 0x4103, "BCM4330B1"	},	/* 002.001.003 */</div><div class='ctx'> 	{ 0x410e, "BCM43341B0"	},	/* 002.001.014 */</div><div class='add'>+	{ 0x4204, "BCM2076B1"	},	/* 002.002.004 */</div><div class='ctx'> 	{ 0x4406, "BCM4324B3"	},	/* 002.004.006 */</div><div class='ctx'> 	{ 0x6109, "BCM4335C0"	},	/* 003.001.009 */</div><div class='ctx'> 	{ 0x610c, "BCM4354"	},	/* 003.001.012 */</div><div class='head'>diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c<br/>index 047b75ce1deb..0f3a020703ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btmrvl_sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btmrvl_sdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btmrvl_sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btmrvl_sdio.c</a></div><div class='hunk'>@@ -235,6 +235,29 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8977 = {</div><div class='ctx'> 	.fw_dump_end = 0xf8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct btmrvl_sdio_card_reg btmrvl_reg_8987 = {</div><div class='add'>+	.cfg = 0x00,</div><div class='add'>+	.host_int_mask = 0x08,</div><div class='add'>+	.host_intstatus = 0x0c,</div><div class='add'>+	.card_status = 0x5c,</div><div class='add'>+	.sq_read_base_addr_a0 = 0xf8,</div><div class='add'>+	.sq_read_base_addr_a1 = 0xf9,</div><div class='add'>+	.card_revision = 0xc8,</div><div class='add'>+	.card_fw_status0 = 0xe8,</div><div class='add'>+	.card_fw_status1 = 0xe9,</div><div class='add'>+	.card_rx_len = 0xea,</div><div class='add'>+	.card_rx_unit = 0xeb,</div><div class='add'>+	.io_port_0 = 0xe4,</div><div class='add'>+	.io_port_1 = 0xe5,</div><div class='add'>+	.io_port_2 = 0xe6,</div><div class='add'>+	.int_read_to_clear = true,</div><div class='add'>+	.host_int_rsr = 0x04,</div><div class='add'>+	.card_misc_cfg = 0xd8,</div><div class='add'>+	.fw_dump_ctrl = 0xf0,</div><div class='add'>+	.fw_dump_start = 0xf1,</div><div class='add'>+	.fw_dump_end = 0xf8,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct btmrvl_sdio_card_reg btmrvl_reg_8997 = {</div><div class='ctx'> 	.cfg = 0x00,</div><div class='ctx'> 	.host_int_mask = 0x08,</div><div class='hunk'>@@ -312,6 +335,15 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = {</div><div class='ctx'> 	.supports_fw_dump = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = {</div><div class='add'>+	.helper		= NULL,</div><div class='add'>+	.firmware	= "mrvl/sd8987_uapsta.bin",</div><div class='add'>+	.reg		= &amp;btmrvl_reg_8987,</div><div class='add'>+	.support_pscan_win_report = true,</div><div class='add'>+	.sd_blksz_fw_dl	= 256,</div><div class='add'>+	.supports_fw_dump = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = {</div><div class='ctx'> 	.helper         = NULL,</div><div class='ctx'> 	.firmware       = "mrvl/sd8997_uapsta.bin",</div><div class='hunk'>@@ -343,6 +375,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = {</div><div class='ctx'> 	/* Marvell SD8977 Bluetooth device */</div><div class='ctx'> 	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146),</div><div class='ctx'> 			.driver_data = (unsigned long)&amp;btmrvl_sdio_sd8977 },</div><div class='add'>+	/* Marvell SD8987 Bluetooth device */</div><div class='add'>+	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x914A),</div><div class='add'>+			.driver_data = (unsigned long)&amp;btmrvl_sdio_sd8987 },</div><div class='ctx'> 	/* Marvell SD8997 Bluetooth device */</div><div class='ctx'> 	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142),</div><div class='ctx'> 			.driver_data = (unsigned long)&amp;btmrvl_sdio_sd8997 },</div><div class='hunk'>@@ -1797,4 +1832,5 @@ MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");</div><div class='ctx'> MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin");</div><div class='ctx'> MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");</div><div class='ctx'> MODULE_FIRMWARE("mrvl/sd8977_uapsta.bin");</div><div class='add'>+MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin");</div><div class='ctx'> MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin");</div><div class='head'>diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c<br/>new file mode 100644<br/>index 000000000000..813338288453<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btmtksdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btmtksdio.c</a></div><div class='hunk'>@@ -0,0 +1,1101 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2019 MediaTek Inc.</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bluetooth support for MediaTek SDIO devices</div><div class='add'>+ *</div><div class='add'>+ * This file is written based on btsdio.c and btmtkuart.c.</div><div class='add'>+ *</div><div class='add'>+ * Author: Sean Wang &lt;sean.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/init.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/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdio_func.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='add'>+#include &lt;net/bluetooth/hci_core.h&gt;</div><div class='add'>+</div><div class='add'>+#include "h4_recv.h"</div><div class='add'>+</div><div class='add'>+#define VERSION "0.1"</div><div class='add'>+</div><div class='add'>+#define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"</div><div class='add'>+#define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"</div><div class='add'>+</div><div class='add'>+#define MTKBTSDIO_AUTOSUSPEND_DELAY	8000</div><div class='add'>+</div><div class='add'>+static bool enable_autosuspend;</div><div class='add'>+</div><div class='add'>+struct btmtksdio_data {</div><div class='add'>+	const char *fwname;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btmtksdio_data mt7663_data = {</div><div class='add'>+	.fwname = FIRMWARE_MT7663,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct btmtksdio_data mt7668_data = {</div><div class='add'>+	.fwname = FIRMWARE_MT7668,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sdio_device_id btmtksdio_table[] = {</div><div class='add'>+	{SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7663),</div><div class='add'>+	 .driver_data = (kernel_ulong_t)&amp;mt7663_data },</div><div class='add'>+	{SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7668),</div><div class='add'>+	 .driver_data = (kernel_ulong_t)&amp;mt7668_data },</div><div class='add'>+	{ }	/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MTK_REG_CHLPCR		0x4	/* W1S */</div><div class='add'>+#define C_INT_EN_SET		BIT(0)</div><div class='add'>+#define C_INT_EN_CLR		BIT(1)</div><div class='add'>+#define C_FW_OWN_REQ_SET	BIT(8)  /* For write */</div><div class='add'>+#define C_COM_DRV_OWN		BIT(8)  /* For read */</div><div class='add'>+#define C_FW_OWN_REQ_CLR	BIT(9)</div><div class='add'>+</div><div class='add'>+#define MTK_REG_CSDIOCSR	0x8</div><div class='add'>+#define SDIO_RE_INIT_EN		BIT(0)</div><div class='add'>+#define SDIO_INT_CTL		BIT(2)</div><div class='add'>+</div><div class='add'>+#define MTK_REG_CHCR		0xc</div><div class='add'>+#define C_INT_CLR_CTRL		BIT(1)</div><div class='add'>+</div><div class='add'>+/* CHISR have the same bits field definition with CHIER */</div><div class='add'>+#define MTK_REG_CHISR		0x10</div><div class='add'>+#define MTK_REG_CHIER		0x14</div><div class='add'>+#define FW_OWN_BACK_INT		BIT(0)</div><div class='add'>+#define RX_DONE_INT		BIT(1)</div><div class='add'>+#define TX_EMPTY		BIT(2)</div><div class='add'>+#define TX_FIFO_OVERFLOW	BIT(8)</div><div class='add'>+#define RX_PKT_LEN		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MTK_REG_CTDR		0x18</div><div class='add'>+</div><div class='add'>+#define MTK_REG_CRDR		0x1c</div><div class='add'>+</div><div class='add'>+#define MTK_SDIO_BLOCK_SIZE	256</div><div class='add'>+</div><div class='add'>+#define BTMTKSDIO_TX_WAIT_VND_EVT	1</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MTK_WMT_PATCH_DWNLD = 0x1,</div><div class='add'>+	MTK_WMT_TEST = 0x2,</div><div class='add'>+	MTK_WMT_WAKEUP = 0x3,</div><div class='add'>+	MTK_WMT_HIF = 0x4,</div><div class='add'>+	MTK_WMT_FUNC_CTRL = 0x6,</div><div class='add'>+	MTK_WMT_RST = 0x7,</div><div class='add'>+	MTK_WMT_SEMAPHORE = 0x17,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BTMTK_WMT_INVALID,</div><div class='add'>+	BTMTK_WMT_PATCH_UNDONE,</div><div class='add'>+	BTMTK_WMT_PATCH_DONE,</div><div class='add'>+	BTMTK_WMT_ON_UNDONE,</div><div class='add'>+	BTMTK_WMT_ON_DONE,</div><div class='add'>+	BTMTK_WMT_ON_PROGRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtkbtsdio_hdr {</div><div class='add'>+	__le16	len;</div><div class='add'>+	__le16	reserved;</div><div class='add'>+	u8	bt_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mtk_wmt_hdr {</div><div class='add'>+	u8	dir;</div><div class='add'>+	u8	op;</div><div class='add'>+	__le16	dlen;</div><div class='add'>+	u8	flag;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mtk_hci_wmt_cmd {</div><div class='add'>+	struct mtk_wmt_hdr hdr;</div><div class='add'>+	u8 data[256];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct btmtk_hci_wmt_evt {</div><div class='add'>+	struct hci_event_hdr hhdr;</div><div class='add'>+	struct mtk_wmt_hdr whdr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct btmtk_hci_wmt_evt_funcc {</div><div class='add'>+	struct btmtk_hci_wmt_evt hwhdr;</div><div class='add'>+	__be16 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct btmtk_tci_sleep {</div><div class='add'>+	u8 mode;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	__le16 host_duration;</div><div class='add'>+	u8 host_wakeup_pin;</div><div class='add'>+	u8 time_compensation;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct btmtk_hci_wmt_params {</div><div class='add'>+	u8 op;</div><div class='add'>+	u8 flag;</div><div class='add'>+	u16 dlen;</div><div class='add'>+	const void *data;</div><div class='add'>+	u32 *status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct btmtksdio_dev {</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	struct sdio_func *func;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	struct work_struct tx_work;</div><div class='add'>+	unsigned long tx_state;</div><div class='add'>+	struct sk_buff_head txq;</div><div class='add'>+</div><div class='add'>+	struct sk_buff *evt_skb;</div><div class='add'>+</div><div class='add'>+	const struct btmtksdio_data *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mtk_hci_wmt_sync(struct hci_dev *hdev,</div><div class='add'>+			    struct btmtk_hci_wmt_params *wmt_params)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+	struct btmtk_hci_wmt_evt_funcc *wmt_evt_funcc;</div><div class='add'>+	u32 hlen, status = BTMTK_WMT_INVALID;</div><div class='add'>+	struct btmtk_hci_wmt_evt *wmt_evt;</div><div class='add'>+	struct mtk_hci_wmt_cmd wc;</div><div class='add'>+	struct mtk_wmt_hdr *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hlen = sizeof(*hdr) + wmt_params-&gt;dlen;</div><div class='add'>+	if (hlen &gt; 255)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hdr = (struct mtk_wmt_hdr *)&amp;wc;</div><div class='add'>+	hdr-&gt;dir = 1;</div><div class='add'>+	hdr-&gt;op = wmt_params-&gt;op;</div><div class='add'>+	hdr-&gt;dlen = cpu_to_le16(wmt_params-&gt;dlen + 1);</div><div class='add'>+	hdr-&gt;flag = wmt_params-&gt;flag;</div><div class='add'>+	memcpy(wc.data, wmt_params-&gt;data, wmt_params-&gt;dlen);</div><div class='add'>+</div><div class='add'>+	set_bit(BTMTKSDIO_TX_WAIT_VND_EVT, &amp;bdev-&gt;tx_state);</div><div class='add'>+</div><div class='add'>+	err = __hci_cmd_send(hdev, 0xfc6f, hlen, &amp;wc);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		clear_bit(BTMTKSDIO_TX_WAIT_VND_EVT, &amp;bdev-&gt;tx_state);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The vendor specific WMT commands are all answered by a vendor</div><div class='add'>+	 * specific event and will not have the Command Status or Command</div><div class='add'>+	 * Complete as with usual HCI command flow control.</div><div class='add'>+	 *</div><div class='add'>+	 * After sending the command, wait for BTMTKSDIO_TX_WAIT_VND_EVT</div><div class='add'>+	 * state to be cleared. The driver specific event receive routine</div><div class='add'>+	 * will clear that state and with that indicate completion of the</div><div class='add'>+	 * WMT command.</div><div class='add'>+	 */</div><div class='add'>+	err = wait_on_bit_timeout(&amp;bdev-&gt;tx_state, BTMTKSDIO_TX_WAIT_VND_EVT,</div><div class='add'>+				  TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT);</div><div class='add'>+	if (err == -EINTR) {</div><div class='add'>+		bt_dev_err(hdev, "Execution of wmt command interrupted");</div><div class='add'>+		clear_bit(BTMTKSDIO_TX_WAIT_VND_EVT, &amp;bdev-&gt;tx_state);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		bt_dev_err(hdev, "Execution of wmt command timed out");</div><div class='add'>+		clear_bit(BTMTKSDIO_TX_WAIT_VND_EVT, &amp;bdev-&gt;tx_state);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse and handle the return WMT event */</div><div class='add'>+	wmt_evt = (struct btmtk_hci_wmt_evt *)bdev-&gt;evt_skb-&gt;data;</div><div class='add'>+	if (wmt_evt-&gt;whdr.op != hdr-&gt;op) {</div><div class='add'>+		bt_dev_err(hdev, "Wrong op received %d expected %d",</div><div class='add'>+			   wmt_evt-&gt;whdr.op, hdr-&gt;op);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (wmt_evt-&gt;whdr.op) {</div><div class='add'>+	case MTK_WMT_SEMAPHORE:</div><div class='add'>+		if (wmt_evt-&gt;whdr.flag == 2)</div><div class='add'>+			status = BTMTK_WMT_PATCH_UNDONE;</div><div class='add'>+		else</div><div class='add'>+			status = BTMTK_WMT_PATCH_DONE;</div><div class='add'>+		break;</div><div class='add'>+	case MTK_WMT_FUNC_CTRL:</div><div class='add'>+		wmt_evt_funcc = (struct btmtk_hci_wmt_evt_funcc *)wmt_evt;</div><div class='add'>+		if (be16_to_cpu(wmt_evt_funcc-&gt;status) == 0x404)</div><div class='add'>+			status = BTMTK_WMT_ON_DONE;</div><div class='add'>+		else if (be16_to_cpu(wmt_evt_funcc-&gt;status) == 0x420)</div><div class='add'>+			status = BTMTK_WMT_ON_PROGRESS;</div><div class='add'>+		else</div><div class='add'>+			status = BTMTK_WMT_ON_UNDONE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wmt_params-&gt;status)</div><div class='add'>+		*wmt_params-&gt;status = status;</div><div class='add'>+</div><div class='add'>+err_free_skb:</div><div class='add'>+	kfree_skb(bdev-&gt;evt_skb);</div><div class='add'>+	bdev-&gt;evt_skb = 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 btmtksdio_tx_packet(struct btmtksdio_dev *bdev,</div><div class='add'>+			       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mtkbtsdio_hdr *sdio_hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Make sure that there are enough rooms for SDIO header */</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; sizeof(*sdio_hdr))) {</div><div class='add'>+		err = pskb_expand_head(skb, sizeof(*sdio_hdr), 0,</div><div class='add'>+				       GFP_ATOMIC);</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'>+	/* Prepend MediaTek SDIO Specific Header */</div><div class='add'>+	skb_push(skb, sizeof(*sdio_hdr));</div><div class='add'>+</div><div class='add'>+	sdio_hdr = (void *)skb-&gt;data;</div><div class='add'>+	sdio_hdr-&gt;len = cpu_to_le16(skb-&gt;len);</div><div class='add'>+	sdio_hdr-&gt;reserved = cpu_to_le16(0);</div><div class='add'>+	sdio_hdr-&gt;bt_type = hci_skb_pkt_type(skb);</div><div class='add'>+</div><div class='add'>+	err = sdio_writesb(bdev-&gt;func, MTK_REG_CTDR, skb-&gt;data,</div><div class='add'>+			   round_up(skb-&gt;len, MTK_SDIO_BLOCK_SIZE));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_skb_pull;</div><div class='add'>+</div><div class='add'>+	bdev-&gt;hdev-&gt;stat.byte_tx += skb-&gt;len;</div><div class='add'>+</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'>+err_skb_pull:</div><div class='add'>+	skb_pull(skb, sizeof(*sdio_hdr));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 btmtksdio_drv_own_query(struct btmtksdio_dev *bdev)</div><div class='add'>+{</div><div class='add'>+	return sdio_readl(bdev-&gt;func, MTK_REG_CHLPCR, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btmtksdio_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = container_of(work, struct btmtksdio_dev,</div><div class='add'>+						  tx_work);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;bdev-&gt;txq))) {</div><div class='add'>+		err = btmtksdio_tx_packet(bdev, skb);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			bdev-&gt;hdev-&gt;stat.err_tx++;</div><div class='add'>+			skb_queue_head(&amp;bdev-&gt;txq, skb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sdio_release_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	pm_runtime_mark_last_busy(bdev-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(bdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_recv_event(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+	struct hci_event_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Fix up the vendor event id with 0xff for vendor specific instead</div><div class='add'>+	 * of 0xe4 so that event send via monitoring socket can be parsed</div><div class='add'>+	 * properly.</div><div class='add'>+	 */</div><div class='add'>+	if (hdr-&gt;evt == 0xe4)</div><div class='add'>+		hdr-&gt;evt = HCI_EV_VENDOR;</div><div class='add'>+</div><div class='add'>+	/* When someone waits for the WMT event, the skb is being cloned</div><div class='add'>+	 * and being processed the events from there then.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(BTMTKSDIO_TX_WAIT_VND_EVT, &amp;bdev-&gt;tx_state)) {</div><div class='add'>+		bdev-&gt;evt_skb = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+		if (!bdev-&gt;evt_skb) {</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'>+</div><div class='add'>+	err = hci_recv_frame(hdev, skb);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;evt == HCI_EV_VENDOR) {</div><div class='add'>+		if (test_and_clear_bit(BTMTKSDIO_TX_WAIT_VND_EVT,</div><div class='add'>+				       &amp;bdev-&gt;tx_state)) {</div><div class='add'>+			/* Barrier to sync with other CPUs */</div><div class='add'>+			smp_mb__after_atomic();</div><div class='add'>+			wake_up_bit(&amp;bdev-&gt;tx_state, BTMTKSDIO_TX_WAIT_VND_EVT);</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_skb:</div><div class='add'>+	kfree_skb(bdev-&gt;evt_skb);</div><div class='add'>+	bdev-&gt;evt_skb = NULL;</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 const struct h4_recv_pkt mtk_recv_pkts[] = {</div><div class='add'>+	{ H4_RECV_ACL,      .recv = hci_recv_frame },</div><div class='add'>+	{ H4_RECV_SCO,      .recv = hci_recv_frame },</div><div class='add'>+	{ H4_RECV_EVENT,    .recv = btmtksdio_recv_event },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int btmtksdio_rx_packet(struct btmtksdio_dev *bdev, u16 rx_size)</div><div class='add'>+{</div><div class='add'>+	const struct h4_recv_pkt *pkts = mtk_recv_pkts;</div><div class='add'>+	int pkts_count = ARRAY_SIZE(mtk_recv_pkts);</div><div class='add'>+	struct mtkbtsdio_hdr *sdio_hdr;</div><div class='add'>+	int err, i, pad_size;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 dlen;</div><div class='add'>+</div><div class='add'>+	if (rx_size &lt; sizeof(*sdio_hdr))</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+</div><div class='add'>+	/* A SDIO packet is exactly containing a Bluetooth packet */</div><div class='add'>+	skb = bt_skb_alloc(rx_size, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, rx_size);</div><div class='add'>+</div><div class='add'>+	err = sdio_readsb(bdev-&gt;func, skb-&gt;data, MTK_REG_CRDR, rx_size);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_kfree_skb;</div><div class='add'>+</div><div class='add'>+	sdio_hdr = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* We assume the default error as -EILSEQ simply to make the error path</div><div class='add'>+	 * be cleaner.</div><div class='add'>+	 */</div><div class='add'>+	err = -EILSEQ;</div><div class='add'>+</div><div class='add'>+	if (rx_size != le16_to_cpu(sdio_hdr-&gt;len)) {</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "Rx size in sdio header is mismatched ");</div><div class='add'>+		goto err_kfree_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_skb_pkt_type(skb) = sdio_hdr-&gt;bt_type;</div><div class='add'>+</div><div class='add'>+	/* Remove MediaTek SDIO header */</div><div class='add'>+	skb_pull(skb, sizeof(*sdio_hdr));</div><div class='add'>+</div><div class='add'>+	/* We have to dig into the packet to get payload size and then know how</div><div class='add'>+	 * many padding bytes at the tail, these padding bytes should be removed</div><div class='add'>+	 * before the packet is indicated to the core layer.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; pkts_count; i++) {</div><div class='add'>+		if (sdio_hdr-&gt;bt_type == (&amp;pkts[i])-&gt;type)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &gt;= pkts_count) {</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "Invalid bt type 0x%02x",</div><div class='add'>+			   sdio_hdr-&gt;bt_type);</div><div class='add'>+		goto err_kfree_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remaining bytes cannot hold a header*/</div><div class='add'>+	if (skb-&gt;len &lt; (&amp;pkts[i])-&gt;hlen) {</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "The size of bt header is mismatched");</div><div class='add'>+		goto err_kfree_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((&amp;pkts[i])-&gt;lsize) {</div><div class='add'>+		case 1:</div><div class='add'>+			dlen = skb-&gt;data[(&amp;pkts[i])-&gt;loff];</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			dlen = get_unaligned_le16(skb-&gt;data +</div><div class='add'>+						  (&amp;pkts[i])-&gt;loff);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto err_kfree_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pad_size = skb-&gt;len - (&amp;pkts[i])-&gt;hlen -  dlen;</div><div class='add'>+</div><div class='add'>+	/* Remaining bytes cannot hold a payload */</div><div class='add'>+	if (pad_size &lt; 0) {</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "The size of bt payload is mismatched");</div><div class='add'>+		goto err_kfree_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove padding bytes */</div><div class='add'>+	skb_trim(skb, skb-&gt;len - pad_size);</div><div class='add'>+</div><div class='add'>+	/* Complete frame */</div><div class='add'>+	(&amp;pkts[i])-&gt;recv(bdev-&gt;hdev, skb);</div><div class='add'>+</div><div class='add'>+	bdev-&gt;hdev-&gt;stat.byte_rx += rx_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_kfree_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btmtksdio_interrupt(struct sdio_func *func)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = sdio_get_drvdata(func);</div><div class='add'>+	u32 int_status;</div><div class='add'>+	u16 rx_size;</div><div class='add'>+</div><div class='add'>+	/* It is required that the host gets ownership from the device before</div><div class='add'>+	 * accessing any register, however, if SDIO host is not being released,</div><div class='add'>+	 * a potential deadlock probably happens in a circular wait between SDIO</div><div class='add'>+	 * IRQ work and PM runtime work. So, we have to explicitly release SDIO</div><div class='add'>+	 * host here and claim again after the PM runtime work is all done.</div><div class='add'>+	 */</div><div class='add'>+	sdio_release_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupt */</div><div class='add'>+	sdio_writel(func, C_INT_EN_CLR, MTK_REG_CHLPCR, 0);</div><div class='add'>+</div><div class='add'>+	int_status = sdio_readl(func, MTK_REG_CHISR, NULL);</div><div class='add'>+</div><div class='add'>+	/* Ack an interrupt as soon as possible before any operation on</div><div class='add'>+	 * hardware.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that we don't ack any status during operations to avoid race</div><div class='add'>+	 * condition between the host and the device such as it's possible to</div><div class='add'>+	 * mistakenly ack RX_DONE for the next packet and then cause interrupts</div><div class='add'>+	 * not be raised again but there is still pending data in the hardware</div><div class='add'>+	 * FIFO.</div><div class='add'>+	 */</div><div class='add'>+	sdio_writel(func, int_status, MTK_REG_CHISR, NULL);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!int_status))</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "CHISR is 0");</div><div class='add'>+</div><div class='add'>+	if (int_status &amp; FW_OWN_BACK_INT)</div><div class='add'>+		bt_dev_dbg(bdev-&gt;hdev, "Get fw own back");</div><div class='add'>+</div><div class='add'>+	if (int_status &amp; TX_EMPTY)</div><div class='add'>+		schedule_work(&amp;bdev-&gt;tx_work);</div><div class='add'>+	else if (unlikely(int_status &amp; TX_FIFO_OVERFLOW))</div><div class='add'>+		bt_dev_warn(bdev-&gt;hdev, "Tx fifo overflow");</div><div class='add'>+</div><div class='add'>+	if (int_status &amp; RX_DONE_INT) {</div><div class='add'>+		rx_size = (int_status &amp; RX_PKT_LEN) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+		if (btmtksdio_rx_packet(bdev, rx_size) &lt; 0)</div><div class='add'>+			bdev-&gt;hdev-&gt;stat.err_rx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable interrupt */</div><div class='add'>+	sdio_writel(func, C_INT_EN_SET, MTK_REG_CHLPCR, 0);</div><div class='add'>+</div><div class='add'>+	pm_runtime_mark_last_busy(bdev-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(bdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_open(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+	int err;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	err = sdio_enable_func(bdev-&gt;func);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_host;</div><div class='add'>+</div><div class='add'>+	/* Get ownership from the device */</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_disable_func;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,</div><div class='add'>+				 status &amp; C_COM_DRV_OWN, 2000, 1000000);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "Cannot get ownership from device");</div><div class='add'>+		goto err_disable_func;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable interrupt &amp; mask out all interrupt sources */</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_INT_EN_CLR, MTK_REG_CHLPCR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_disable_func;</div><div class='add'>+</div><div class='add'>+	sdio_writel(bdev-&gt;func, 0, MTK_REG_CHIER, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_disable_func;</div><div class='add'>+</div><div class='add'>+	err = sdio_claim_irq(bdev-&gt;func, btmtksdio_interrupt);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_disable_func;</div><div class='add'>+</div><div class='add'>+	err = sdio_set_block_size(bdev-&gt;func, MTK_SDIO_BLOCK_SIZE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_irq;</div><div class='add'>+</div><div class='add'>+	/* SDIO CMD 5 allows the SDIO device back to idle state an</div><div class='add'>+	 * synchronous interrupt is supported in SDIO 4-bit mode</div><div class='add'>+	 */</div><div class='add'>+	sdio_writel(bdev-&gt;func, SDIO_INT_CTL | SDIO_RE_INIT_EN,</div><div class='add'>+		    MTK_REG_CSDIOCSR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_irq;</div><div class='add'>+</div><div class='add'>+	/* Setup write-1-clear for CHISR register */</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_INT_CLR_CTRL, MTK_REG_CHCR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_irq;</div><div class='add'>+</div><div class='add'>+	/* Setup interrupt sources */</div><div class='add'>+	sdio_writel(bdev-&gt;func, RX_DONE_INT | TX_EMPTY | TX_FIFO_OVERFLOW,</div><div class='add'>+		    MTK_REG_CHIER, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_irq;</div><div class='add'>+</div><div class='add'>+	/* Enable interrupt */</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_INT_EN_SET, MTK_REG_CHLPCR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_release_irq;</div><div class='add'>+</div><div class='add'>+	sdio_release_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_release_irq:</div><div class='add'>+	sdio_release_irq(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+err_disable_func:</div><div class='add'>+	sdio_disable_func(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+err_release_host:</div><div class='add'>+	sdio_release_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_close(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+	u32 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupt */</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);</div><div class='add'>+</div><div class='add'>+	sdio_release_irq(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	/* Return ownership to the device */</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_FW_OWN_REQ_SET, MTK_REG_CHLPCR, NULL);</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,</div><div class='add'>+				 !(status &amp; C_COM_DRV_OWN), 2000, 1000000);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		bt_dev_err(bdev-&gt;hdev, "Cannot return ownership to device");</div><div class='add'>+</div><div class='add'>+	sdio_disable_func(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	sdio_release_host(bdev-&gt;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 btmtksdio_flush(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	skb_queue_purge(&amp;bdev-&gt;txq);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;bdev-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_func_query(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btmtk_hci_wmt_params wmt_params;</div><div class='add'>+	int status, err;</div><div class='add'>+	u8 param = 0;</div><div class='add'>+</div><div class='add'>+	/* Query whether the function is enabled */</div><div class='add'>+	wmt_params.op = MTK_WMT_FUNC_CTRL;</div><div class='add'>+	wmt_params.flag = 4;</div><div class='add'>+	wmt_params.dlen = sizeof(param);</div><div class='add'>+	wmt_params.data = &amp;param;</div><div class='add'>+	wmt_params.status = &amp;status;</div><div class='add'>+</div><div class='add'>+	err = mtk_hci_wmt_sync(hdev, &amp;wmt_params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to query function status (%d)", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)</div><div class='add'>+{</div><div class='add'>+	struct btmtk_hci_wmt_params wmt_params;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const u8 *fw_ptr;</div><div class='add'>+	size_t fw_size;</div><div class='add'>+	int err, dlen;</div><div class='add'>+	u8 flag;</div><div class='add'>+</div><div class='add'>+	err = request_firmware(&amp;fw, fwname, &amp;hdev-&gt;dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to load firmware file (%d)", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_ptr = fw-&gt;data;</div><div class='add'>+	fw_size = fw-&gt;size;</div><div class='add'>+</div><div class='add'>+	/* The size of patch header is 30 bytes, should be skip */</div><div class='add'>+	if (fw_size &lt; 30) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto free_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_size -= 30;</div><div class='add'>+	fw_ptr += 30;</div><div class='add'>+	flag = 1;</div><div class='add'>+</div><div class='add'>+	wmt_params.op = MTK_WMT_PATCH_DWNLD;</div><div class='add'>+	wmt_params.status = NULL;</div><div class='add'>+</div><div class='add'>+	while (fw_size &gt; 0) {</div><div class='add'>+		dlen = min_t(int, 250, fw_size);</div><div class='add'>+</div><div class='add'>+		/* Tell device the position in sequence */</div><div class='add'>+		if (fw_size - dlen &lt;= 0)</div><div class='add'>+			flag = 3;</div><div class='add'>+		else if (fw_size &lt; fw-&gt;size - 30)</div><div class='add'>+			flag = 2;</div><div class='add'>+</div><div class='add'>+		wmt_params.flag = flag;</div><div class='add'>+		wmt_params.dlen = dlen;</div><div class='add'>+		wmt_params.data = fw_ptr;</div><div class='add'>+</div><div class='add'>+		err = mtk_hci_wmt_sync(hdev, &amp;wmt_params);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			bt_dev_err(hdev, "Failed to send wmt patch dwnld (%d)",</div><div class='add'>+				   err);</div><div class='add'>+			goto free_fw;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fw_size -= dlen;</div><div class='add'>+		fw_ptr += dlen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wmt_params.op = MTK_WMT_RST;</div><div class='add'>+	wmt_params.flag = 4;</div><div class='add'>+	wmt_params.dlen = 0;</div><div class='add'>+	wmt_params.data = NULL;</div><div class='add'>+	wmt_params.status = NULL;</div><div class='add'>+</div><div class='add'>+	/* Activate funciton the firmware providing to */</div><div class='add'>+	err = mtk_hci_wmt_sync(hdev, &amp;wmt_params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to send wmt rst (%d)", err);</div><div class='add'>+		goto free_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait a few moments for firmware activation done */</div><div class='add'>+	usleep_range(10000, 12000);</div><div class='add'>+</div><div class='add'>+free_fw:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_setup(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+	struct btmtk_hci_wmt_params wmt_params;</div><div class='add'>+	ktime_t calltime, delta, rettime;</div><div class='add'>+	struct btmtk_tci_sleep tci_sleep;</div><div class='add'>+	unsigned long long duration;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err, status;</div><div class='add'>+	u8 param = 0x1;</div><div class='add'>+</div><div class='add'>+	calltime = ktime_get();</div><div class='add'>+</div><div class='add'>+	/* Query whether the firmware is already download */</div><div class='add'>+	wmt_params.op = MTK_WMT_SEMAPHORE;</div><div class='add'>+	wmt_params.flag = 1;</div><div class='add'>+	wmt_params.dlen = 0;</div><div class='add'>+	wmt_params.data = NULL;</div><div class='add'>+	wmt_params.status = &amp;status;</div><div class='add'>+</div><div class='add'>+	err = mtk_hci_wmt_sync(hdev, &amp;wmt_params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to query firmware status (%d)", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status == BTMTK_WMT_PATCH_DONE) {</div><div class='add'>+		bt_dev_info(hdev, "Firmware already downloaded");</div><div class='add'>+		goto ignore_setup_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup a firmware which the device definitely requires */</div><div class='add'>+	err = mtk_setup_firmware(hdev, bdev-&gt;data-&gt;fwname);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+ignore_setup_fw:</div><div class='add'>+	/* Query whether the device is already enabled */</div><div class='add'>+	err = readx_poll_timeout(btmtksdio_func_query, hdev, status,</div><div class='add'>+				 status &lt; 0 || status != BTMTK_WMT_ON_PROGRESS,</div><div class='add'>+				 2000, 5000000);</div><div class='add'>+	/* -ETIMEDOUT happens */</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* The other errors happen in btusb_mtk_func_query */</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	if (status == BTMTK_WMT_ON_DONE) {</div><div class='add'>+		bt_dev_info(hdev, "function already on");</div><div class='add'>+		goto ignore_func_on;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable Bluetooth protocol */</div><div class='add'>+	wmt_params.op = MTK_WMT_FUNC_CTRL;</div><div class='add'>+	wmt_params.flag = 0;</div><div class='add'>+	wmt_params.dlen = sizeof(param);</div><div class='add'>+	wmt_params.data = &amp;param;</div><div class='add'>+	wmt_params.status = NULL;</div><div class='add'>+</div><div class='add'>+	err = mtk_hci_wmt_sync(hdev, &amp;wmt_params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ignore_func_on:</div><div class='add'>+	/* Apply the low power environment setup */</div><div class='add'>+	tci_sleep.mode = 0x5;</div><div class='add'>+	tci_sleep.duration = cpu_to_le16(0x640);</div><div class='add'>+	tci_sleep.host_duration = cpu_to_le16(0x640);</div><div class='add'>+	tci_sleep.host_wakeup_pin = 0;</div><div class='add'>+	tci_sleep.time_compensation = 0;</div><div class='add'>+</div><div class='add'>+	skb = __hci_cmd_sync(hdev, 0xfc7a, sizeof(tci_sleep), &amp;tci_sleep,</div><div class='add'>+			     HCI_INIT_TIMEOUT);</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		err = PTR_ERR(skb);</div><div class='add'>+		bt_dev_err(hdev, "Failed to apply low power setting (%d)", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	rettime = ktime_get();</div><div class='add'>+	delta = ktime_sub(rettime, calltime);</div><div class='add'>+	duration = (unsigned long long)ktime_to_ns(delta) &gt;&gt; 10;</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_autosuspend_delay(bdev-&gt;dev,</div><div class='add'>+					 MTKBTSDIO_AUTOSUSPEND_DELAY);</div><div class='add'>+	pm_runtime_use_autosuspend(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	err = pm_runtime_set_active(bdev-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Default forbid runtime auto suspend, that can be allowed by</div><div class='add'>+	 * enable_autosuspend flag or the PM runtime entry under sysfs.</div><div class='add'>+	 */</div><div class='add'>+	pm_runtime_forbid(bdev-&gt;dev);</div><div class='add'>+	pm_runtime_enable(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (enable_autosuspend)</div><div class='add'>+		pm_runtime_allow(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	bt_dev_info(hdev, "Device setup in %llu usecs", duration);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_shutdown(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+	struct btmtk_hci_wmt_params wmt_params;</div><div class='add'>+	u8 param = 0x0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Get back the state to be consistent with the state</div><div class='add'>+	 * in btmtksdio_setup.</div><div class='add'>+	 */</div><div class='add'>+	pm_runtime_get_sync(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Disable the device */</div><div class='add'>+	wmt_params.op = MTK_WMT_FUNC_CTRL;</div><div class='add'>+	wmt_params.flag = 0;</div><div class='add'>+	wmt_params.dlen = sizeof(param);</div><div class='add'>+	wmt_params.data = &amp;param;</div><div class='add'>+	wmt_params.status = NULL;</div><div class='add'>+</div><div class='add'>+	err = mtk_hci_wmt_sync(hdev, &amp;wmt_params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_noidle(bdev-&gt;dev);</div><div class='add'>+	pm_runtime_disable(bdev-&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 int btmtksdio_send_frame(struct hci_dev *hdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	switch (hci_skb_pkt_type(skb)) {</div><div class='add'>+	case HCI_COMMAND_PKT:</div><div class='add'>+		hdev-&gt;stat.cmd_tx++;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HCI_ACLDATA_PKT:</div><div class='add'>+		hdev-&gt;stat.acl_tx++;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HCI_SCODATA_PKT:</div><div class='add'>+		hdev-&gt;stat.sco_tx++;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;bdev-&gt;txq, skb);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;bdev-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_probe(struct sdio_func *func,</div><div class='add'>+			   const struct sdio_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev;</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bdev = devm_kzalloc(&amp;func-&gt;dev, sizeof(*bdev), GFP_KERNEL);</div><div class='add'>+	if (!bdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bdev-&gt;data = (void *)id-&gt;driver_data;</div><div class='add'>+	if (!bdev-&gt;data)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	bdev-&gt;dev = &amp;func-&gt;dev;</div><div class='add'>+	bdev-&gt;func = func;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;bdev-&gt;tx_work, btmtksdio_tx_work);</div><div class='add'>+	skb_queue_head_init(&amp;bdev-&gt;txq);</div><div class='add'>+</div><div class='add'>+	/* Initialize and register HCI device */</div><div class='add'>+	hdev = hci_alloc_dev();</div><div class='add'>+	if (!hdev) {</div><div class='add'>+		dev_err(&amp;func-&gt;dev, "Can't allocate HCI device\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bdev-&gt;hdev = hdev;</div><div class='add'>+</div><div class='add'>+	hdev-&gt;bus = HCI_SDIO;</div><div class='add'>+	hci_set_drvdata(hdev, bdev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;open     = btmtksdio_open;</div><div class='add'>+	hdev-&gt;close    = btmtksdio_close;</div><div class='add'>+	hdev-&gt;flush    = btmtksdio_flush;</div><div class='add'>+	hdev-&gt;setup    = btmtksdio_setup;</div><div class='add'>+	hdev-&gt;shutdown = btmtksdio_shutdown;</div><div class='add'>+	hdev-&gt;send     = btmtksdio_send_frame;</div><div class='add'>+	SET_HCIDEV_DEV(hdev, &amp;func-&gt;dev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;manufacturer = 70;</div><div class='add'>+	set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &amp;hdev-&gt;quirks);</div><div class='add'>+</div><div class='add'>+	err = hci_register_dev(hdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;func-&gt;dev, "Can't register HCI device\n");</div><div class='add'>+		hci_free_dev(hdev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sdio_set_drvdata(func, bdev);</div><div class='add'>+</div><div class='add'>+	/* pm_runtime_enable would be done after the firmware is being</div><div class='add'>+	 * downloaded because the core layer probably already enables</div><div class='add'>+	 * runtime PM for this func such as the case host-&gt;caps &amp;</div><div class='add'>+	 * MMC_CAP_POWER_OFF_CARD.</div><div class='add'>+	 */</div><div class='add'>+	if (pm_runtime_enabled(bdev-&gt;dev))</div><div class='add'>+		pm_runtime_disable(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* As explaination in drivers/mmc/core/sdio_bus.c tells us:</div><div class='add'>+	 * Unbound SDIO functions are always suspended.</div><div class='add'>+	 * During probe, the function is set active and the usage count</div><div class='add'>+	 * is incremented.  If the driver supports runtime PM,</div><div class='add'>+	 * it should call pm_runtime_put_noidle() in its probe routine and</div><div class='add'>+	 * pm_runtime_get_noresume() in its remove routine.</div><div class='add'>+	 *</div><div class='add'>+	 * So, put a pm_runtime_put_noidle here !</div><div class='add'>+	 */</div><div class='add'>+	pm_runtime_put_noidle(bdev-&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 void btmtksdio_remove(struct sdio_func *func)</div><div class='add'>+{</div><div class='add'>+	struct btmtksdio_dev *bdev = sdio_get_drvdata(func);</div><div class='add'>+	struct hci_dev *hdev;</div><div class='add'>+</div><div class='add'>+	if (!bdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Be consistent the state in btmtksdio_probe */</div><div class='add'>+	pm_runtime_get_noresume(bdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	hdev = bdev-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	sdio_set_drvdata(func, NULL);</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='add'>+	hci_free_dev(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int btmtksdio_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='add'>+	struct btmtksdio_dev *bdev;</div><div class='add'>+	u32 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bdev = sdio_get_drvdata(func);</div><div class='add'>+	if (!bdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_FW_OWN_REQ_SET, MTK_REG_CHLPCR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,</div><div class='add'>+				 !(status &amp; C_COM_DRV_OWN), 2000, 1000000);</div><div class='add'>+out:</div><div class='add'>+	bt_dev_info(bdev-&gt;hdev, "status (%d) return ownership to device", err);</div><div class='add'>+</div><div class='add'>+	sdio_release_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btmtksdio_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='add'>+	struct btmtksdio_dev *bdev;</div><div class='add'>+	u32 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bdev = sdio_get_drvdata(func);</div><div class='add'>+	if (!bdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	sdio_writel(bdev-&gt;func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &amp;err);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(btmtksdio_drv_own_query, bdev, status,</div><div class='add'>+				 status &amp; C_COM_DRV_OWN, 2000, 1000000);</div><div class='add'>+out:</div><div class='add'>+	bt_dev_info(bdev-&gt;hdev, "status (%d) get ownership from device", err);</div><div class='add'>+</div><div class='add'>+	sdio_release_host(bdev-&gt;func);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static UNIVERSAL_DEV_PM_OPS(btmtksdio_pm_ops, btmtksdio_runtime_suspend,</div><div class='add'>+			    btmtksdio_runtime_resume, NULL);</div><div class='add'>+#define BTMTKSDIO_PM_OPS (&amp;btmtksdio_pm_ops)</div><div class='add'>+#else	/* CONFIG_PM */</div><div class='add'>+#define BTMTKSDIO_PM_OPS NULL</div><div class='add'>+#endif	/* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static struct sdio_driver btmtksdio_driver = {</div><div class='add'>+	.name		= "btmtksdio",</div><div class='add'>+	.probe		= btmtksdio_probe,</div><div class='add'>+	.remove		= btmtksdio_remove,</div><div class='add'>+	.id_table	= btmtksdio_table,</div><div class='add'>+	.drv = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.pm = BTMTKSDIO_PM_OPS,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_sdio_driver(btmtksdio_driver);</div><div class='add'>+</div><div class='add'>+module_param(enable_autosuspend, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(enable_autosuspend, "Enable autosuspend by default");</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek Bluetooth SDIO driver ver " VERSION);</div><div class='add'>+MODULE_VERSION(VERSION);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_FIRMWARE(FIRMWARE_MT7663);</div><div class='add'>+MODULE_FIRMWARE(FIRMWARE_MT7668);</div><div class='head'>diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c<br/>index b0b680dd69f4..f5dbeec8e274 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btmtkuart.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btmtkuart.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btmtkuart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btmtkuart.c</a></div><div class='hunk'>@@ -661,7 +661,7 @@ static int btmtkuart_change_baudrate(struct hci_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct btmtkuart_dev *bdev = hci_get_drvdata(hdev);</div><div class='ctx'> 	struct btmtk_hci_wmt_params wmt_params;</div><div class='del'>-	u32 baudrate;</div><div class='add'>+	__le32 baudrate;</div><div class='ctx'> 	u8 param;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c<br/>index 612268574fc7..cc12eecd9e4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btqca.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btqca.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btqca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btqca.c</a></div><div class='hunk'>@@ -336,7 +336,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,</div><div class='ctx'> {</div><div class='ctx'> 	struct rome_config config;</div><div class='ctx'> 	int err;</div><div class='del'>-	u8 rom_ver;</div><div class='add'>+	u8 rom_ver = 0;</div><div class='ctx'> </div><div class='ctx'> 	bt_dev_dbg(hdev, "QCA setup on UART");</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +344,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,</div><div class='ctx'> </div><div class='ctx'> 	/* Download rampatch file */</div><div class='ctx'> 	config.type = TLV_TYPE_PATCH;</div><div class='del'>-	if (soc_type == QCA_WCN3990) {</div><div class='add'>+	if (qca_is_wcn399x(soc_type)) {</div><div class='ctx'> 		/* Firmware files to download are based on ROM version.</div><div class='ctx'> 		 * ROM version is derived from last two bytes of soc_ver.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -365,7 +365,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,</div><div class='ctx'> </div><div class='ctx'> 	/* Download NVM configuration */</div><div class='ctx'> 	config.type = TLV_TYPE_NVM;</div><div class='del'>-	if (soc_type == QCA_WCN3990)</div><div class='add'>+	if (qca_is_wcn399x(soc_type))</div><div class='ctx'> 		snprintf(config.fwname, sizeof(config.fwname),</div><div class='ctx'> 			 "qca/crnv%02x.bin", rom_ver);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -410,6 +410,7 @@ int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qca_set_bdaddr);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Ben Young Tae Kim &lt;ytkim@qca.qualcomm.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Bluetooth support for Qualcomm Atheros family ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h<br/>index c72c56ea7480..4c4fe2b5b7b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btqca.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btqca.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btqca.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btqca.h</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #define QCA_WCN3990_POWERON_PULSE	0xFC</div><div class='ctx'> #define QCA_WCN3990_POWEROFF_PULSE	0xC0</div><div class='ctx'> </div><div class='del'>-enum qca_bardrate {</div><div class='add'>+enum qca_baudrate {</div><div class='ctx'> 	QCA_BAUDRATE_115200 	= 0,</div><div class='ctx'> 	QCA_BAUDRATE_57600,</div><div class='ctx'> 	QCA_BAUDRATE_38400,</div><div class='hunk'>@@ -132,7 +132,8 @@ enum qca_btsoc_type {</div><div class='ctx'> 	QCA_INVALID = -1,</div><div class='ctx'> 	QCA_AR3002,</div><div class='ctx'> 	QCA_ROME,</div><div class='del'>-	QCA_WCN3990</div><div class='add'>+	QCA_WCN3990,</div><div class='add'>+	QCA_WCN3998,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_BT_QCA)</div><div class='hunk'>@@ -142,6 +143,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,</div><div class='ctx'> 		   enum qca_btsoc_type soc_type, u32 soc_ver);</div><div class='ctx'> int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);</div><div class='ctx'> int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);</div><div class='add'>+static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)</div><div class='add'>+{</div><div class='add'>+	return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3998;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)</div><div class='hunk'>@@ -165,4 +170,8 @@ static inline int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c<br/>index 282d1af1d3ba..4cfa9abe03c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btsdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btsdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btsdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btsdio.c</a></div><div class='hunk'>@@ -376,20 +376,7 @@ static struct sdio_driver btsdio_driver = {</div><div class='ctx'> 	.id_table	= btsdio_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init btsdio_init(void)</div><div class='del'>-{</div><div class='del'>-	BT_INFO("Generic Bluetooth SDIO driver ver %s", VERSION);</div><div class='del'>-</div><div class='del'>-	return sdio_register_driver(&amp;btsdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit btsdio_exit(void)</div><div class='del'>-{</div><div class='del'>-	sdio_unregister_driver(&amp;btsdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(btsdio_init);</div><div class='del'>-module_exit(btsdio_exit);</div><div class='add'>+module_sdio_driver(btsdio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Generic Bluetooth SDIO driver ver " VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c<br/>index ded198328f21..7db48ae65cd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btusb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/btusb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/btusb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/btusb.c</a></div><div class='hunk'>@@ -2942,6 +2942,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	irq_set_status_flags(irq, IRQ_NOAUTOEN);</div><div class='ctx'> 	ret = devm_request_irq(&amp;hdev-&gt;dev, irq, btusb_oob_wake_handler,</div><div class='ctx'> 			       0, "OOB Wake-on-BT", data);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2956,7 +2957,6 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;oob_wake_irq = irq;</div><div class='del'>-	disable_irq(irq);</div><div class='ctx'> 	bt_dev_info(hdev, "OOB Wake-on-BT configured at IRQ %u", irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c<br/>index ddbe518c3e5b..b5d31d583d60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/hci_bcm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/hci_bcm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/hci_bcm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/hci_bcm.c</a></div><div class='hunk'>@@ -228,9 +228,15 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (powered &amp;&amp; !dev-&gt;res_enabled) {</div><div class='del'>-		err = regulator_bulk_enable(BCM_NUM_SUPPLIES, dev-&gt;supplies);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		/* Intel Macs use bcm_apple_get_resources() and don't</div><div class='add'>+		 * have regulator supplies configured.</div><div class='add'>+		 */</div><div class='add'>+		if (dev-&gt;supplies[0].supply) {</div><div class='add'>+			err = regulator_bulk_enable(BCM_NUM_SUPPLIES,</div><div class='add'>+						    dev-&gt;supplies);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* LPO clock needs to be 32.768 kHz */</div><div class='ctx'> 		err = clk_set_rate(dev-&gt;lpo_clk, 32768);</div><div class='hunk'>@@ -259,7 +265,13 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)</div><div class='ctx'> 	if (!powered &amp;&amp; dev-&gt;res_enabled) {</div><div class='ctx'> 		clk_disable_unprepare(dev-&gt;txco_clk);</div><div class='ctx'> 		clk_disable_unprepare(dev-&gt;lpo_clk);</div><div class='del'>-		regulator_bulk_disable(BCM_NUM_SUPPLIES, dev-&gt;supplies);</div><div class='add'>+</div><div class='add'>+		/* Intel Macs use bcm_apple_get_resources() and don't</div><div class='add'>+		 * have regulator supplies configured.</div><div class='add'>+		 */</div><div class='add'>+		if (dev-&gt;supplies[0].supply)</div><div class='add'>+			regulator_bulk_disable(BCM_NUM_SUPPLIES,</div><div class='add'>+					       dev-&gt;supplies);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* wait for device to power on and come out of reset */</div><div class='head'>diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c<br/>index 069d1c8fde73..3f02ae560120 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/hci_h5.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/hci_h5.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/hci_h5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/hci_h5.c</a></div><div class='hunk'>@@ -536,7 +536,7 @@ static void h5_unslip_one_byte(struct h5 *h5, unsigned char c)</div><div class='ctx'> 	skb_put_data(h5-&gt;rx_skb, byte, 1);</div><div class='ctx'> 	h5-&gt;rx_pending--;</div><div class='ctx'> </div><div class='del'>-	BT_DBG("unsliped 0x%02hhx, rx_pending %zu", *byte, h5-&gt;rx_pending);</div><div class='add'>+	BT_DBG("unslipped 0x%02hhx, rx_pending %zu", *byte, h5-&gt;rx_pending);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void h5_reset_rx(struct h5 *h5)</div><div class='head'>diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c<br/>index 237aea34b69f..57322c42bb2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/hci_qca.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/bluetooth/hci_qca.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/bluetooth/hci_qca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/bluetooth/hci_qca.c</a></div><div class='hunk'>@@ -54,9 +54,6 @@</div><div class='ctx'> #define HCI_IBS_WAKE_ACK	0xFC</div><div class='ctx'> #define HCI_MAX_IBS_SIZE	10</div><div class='ctx'> </div><div class='del'>-/* Controller states */</div><div class='del'>-#define STATE_IN_BAND_SLEEP_ENABLED	1</div><div class='del'>-</div><div class='ctx'> #define IBS_WAKE_RETRANS_TIMEOUT_MS	100</div><div class='ctx'> #define IBS_TX_IDLE_TIMEOUT_MS		2000</div><div class='ctx'> #define CMD_TRANS_TIMEOUT_MS		100</div><div class='hunk'>@@ -67,6 +64,10 @@</div><div class='ctx'> /* Controller debug log header */</div><div class='ctx'> #define QCA_DEBUG_HANDLE	0x2EDC</div><div class='ctx'> </div><div class='add'>+enum qca_flags {</div><div class='add'>+	QCA_IBS_ENABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* HCI_IBS transmit side sleep protocol states */</div><div class='ctx'> enum tx_ibs_states {</div><div class='ctx'> 	HCI_IBS_TX_ASLEEP,</div><div class='hunk'>@@ -174,6 +175,21 @@ static int qca_power_setup(struct hci_uart *hu, bool on);</div><div class='ctx'> static void qca_power_shutdown(struct hci_uart *hu);</div><div class='ctx'> static int qca_power_off(struct hci_dev *hdev);</div><div class='ctx'> </div><div class='add'>+static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu)</div><div class='add'>+{</div><div class='add'>+	enum qca_btsoc_type soc_type;</div><div class='add'>+</div><div class='add'>+	if (hu-&gt;serdev) {</div><div class='add'>+		struct qca_serdev *qsd = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='add'>+</div><div class='add'>+		soc_type = qsd-&gt;btsoc_type;</div><div class='add'>+	} else {</div><div class='add'>+		soc_type = QCA_ROME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return soc_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __serial_clock_on(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	/* TODO: Some chipset requires to enable UART clock on client</div><div class='hunk'>@@ -506,8 +522,10 @@ static int qca_open(struct hci_uart *hu)</div><div class='ctx'> 	if (hu-&gt;serdev) {</div><div class='ctx'> </div><div class='ctx'> 		qcadev = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='del'>-		if (qcadev-&gt;btsoc_type != QCA_WCN3990) {</div><div class='add'>+		if (!qca_is_wcn399x(qcadev-&gt;btsoc_type)) {</div><div class='ctx'> 			gpiod_set_value_cansleep(qcadev-&gt;bt_en, 1);</div><div class='add'>+			/* Controller needs time to bootup. */</div><div class='add'>+			msleep(150);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			hu-&gt;init_speed = qcadev-&gt;init_speed;</div><div class='ctx'> 			hu-&gt;oper_speed = qcadev-&gt;oper_speed;</div><div class='hunk'>@@ -612,7 +630,7 @@ static int qca_close(struct hci_uart *hu)</div><div class='ctx'> </div><div class='ctx'> 	if (hu-&gt;serdev) {</div><div class='ctx'> 		qcadev = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='del'>-		if (qcadev-&gt;btsoc_type == QCA_WCN3990)</div><div class='add'>+		if (qca_is_wcn399x(qcadev-&gt;btsoc_type))</div><div class='ctx'> 			qca_power_shutdown(hu);</div><div class='ctx'> 		else</div><div class='ctx'> 			gpiod_set_value_cansleep(qcadev-&gt;bt_en, 0);</div><div class='hunk'>@@ -775,7 +793,7 @@ static int qca_enqueue(struct hci_uart *hu, struct sk_buff *skb)</div><div class='ctx'> 	/* Don't go to sleep in middle of patch download or</div><div class='ctx'> 	 * Out-Of-Band(GPIOs control) sleep is selected.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(STATE_IN_BAND_SLEEP_ENABLED, &amp;qca-&gt;flags)) {</div><div class='add'>+	if (!test_bit(QCA_IBS_ENABLED, &amp;qca-&gt;flags)) {</div><div class='ctx'> 		skb_queue_tail(&amp;qca-&gt;txq, skb);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;qca-&gt;hci_ibs_lock, flags);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -963,7 +981,6 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)</div><div class='ctx'> {</div><div class='ctx'> 	struct hci_uart *hu = hci_get_drvdata(hdev);</div><div class='ctx'> 	struct qca_data *qca = hu-&gt;priv;</div><div class='del'>-	struct qca_serdev *qcadev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u8 cmd[] = { 0x01, 0x48, 0xFC, 0x01, 0x00 };</div><div class='ctx'> </div><div class='hunk'>@@ -985,18 +1002,17 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)</div><div class='ctx'> 	skb_queue_tail(&amp;qca-&gt;txq, skb);</div><div class='ctx'> 	hci_uart_tx_wakeup(hu);</div><div class='ctx'> </div><div class='del'>-	qcadev = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='del'>-</div><div class='ctx'> 	/* Wait for the baudrate change request to be sent */</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;qca-&gt;txq))</div><div class='ctx'> 		usleep_range(100, 200);</div><div class='ctx'> </div><div class='del'>-	serdev_device_wait_until_sent(hu-&gt;serdev,</div><div class='add'>+	if (hu-&gt;serdev)</div><div class='add'>+		serdev_device_wait_until_sent(hu-&gt;serdev,</div><div class='ctx'> 		      msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS));</div><div class='ctx'> </div><div class='ctx'> 	/* Give the controller time to process the request */</div><div class='del'>-	if (qcadev-&gt;btsoc_type == QCA_WCN3990)</div><div class='add'>+	if (qca_is_wcn399x(qca_soc_type(hu)))</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 	else</div><div class='ctx'> 		msleep(300);</div><div class='hunk'>@@ -1072,10 +1088,7 @@ static unsigned int qca_get_speed(struct hci_uart *hu,</div><div class='ctx'> </div><div class='ctx'> static int qca_check_speeds(struct hci_uart *hu)</div><div class='ctx'> {</div><div class='del'>-	struct qca_serdev *qcadev;</div><div class='del'>-</div><div class='del'>-	qcadev = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='del'>-	if (qcadev-&gt;btsoc_type == QCA_WCN3990) {</div><div class='add'>+	if (qca_is_wcn399x(qca_soc_type(hu))) {</div><div class='ctx'> 		if (!qca_get_speed(hu, QCA_INIT_SPEED) &amp;&amp;</div><div class='ctx'> 		    !qca_get_speed(hu, QCA_OPER_SPEED))</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1091,7 +1104,6 @@ static int qca_check_speeds(struct hci_uart *hu)</div><div class='ctx'> static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int speed, qca_baudrate;</div><div class='del'>-	struct qca_serdev *qcadev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (speed_type == QCA_INIT_SPEED) {</div><div class='hunk'>@@ -1099,6 +1111,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)</div><div class='ctx'> 		if (speed)</div><div class='ctx'> 			host_set_baudrate(hu, speed);</div><div class='ctx'> 	} else {</div><div class='add'>+		enum qca_btsoc_type soc_type = qca_soc_type(hu);</div><div class='add'>+</div><div class='ctx'> 		speed = qca_get_speed(hu, QCA_OPER_SPEED);</div><div class='ctx'> 		if (!speed)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1106,8 +1120,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)</div><div class='ctx'> 		/* Disable flow control for wcn3990 to deassert RTS while</div><div class='ctx'> 		 * changing the baudrate of chip and host.</div><div class='ctx'> 		 */</div><div class='del'>-		qcadev = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='del'>-		if (qcadev-&gt;btsoc_type == QCA_WCN3990)</div><div class='add'>+		if (qca_is_wcn399x(soc_type))</div><div class='ctx'> 			hci_uart_set_flow_control(hu, true);</div><div class='ctx'> </div><div class='ctx'> 		qca_baudrate = qca_get_baudrate_value(speed);</div><div class='hunk'>@@ -1119,7 +1132,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)</div><div class='ctx'> 		host_set_baudrate(hu, speed);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-		if (qcadev-&gt;btsoc_type == QCA_WCN3990)</div><div class='add'>+		if (qca_is_wcn399x(soc_type))</div><div class='ctx'> 			hci_uart_set_flow_control(hu, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1181,20 +1194,18 @@ static int qca_setup(struct hci_uart *hu)</div><div class='ctx'> 	struct hci_dev *hdev = hu-&gt;hdev;</div><div class='ctx'> 	struct qca_data *qca = hu-&gt;priv;</div><div class='ctx'> 	unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;</div><div class='del'>-	struct qca_serdev *qcadev;</div><div class='add'>+	enum qca_btsoc_type soc_type = qca_soc_type(hu);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int soc_ver = 0;</div><div class='ctx'> </div><div class='del'>-	qcadev = serdev_device_get_drvdata(hu-&gt;serdev);</div><div class='del'>-</div><div class='ctx'> 	ret = qca_check_speeds(hu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Patch downloading has to be done without IBS mode */</div><div class='del'>-	clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &amp;qca-&gt;flags);</div><div class='add'>+	clear_bit(QCA_IBS_ENABLED, &amp;qca-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (qcadev-&gt;btsoc_type == QCA_WCN3990) {</div><div class='add'>+	if (qca_is_wcn399x(soc_type)) {</div><div class='ctx'> 		bt_dev_info(hdev, "setting up wcn3990");</div><div class='ctx'> </div><div class='ctx'> 		/* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute</div><div class='hunk'>@@ -1225,7 +1236,7 @@ static int qca_setup(struct hci_uart *hu)</div><div class='ctx'> 		qca_baudrate = qca_get_baudrate_value(speed);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (qcadev-&gt;btsoc_type != QCA_WCN3990) {</div><div class='add'>+	if (!qca_is_wcn399x(soc_type)) {</div><div class='ctx'> 		/* Get QCA version information */</div><div class='ctx'> 		ret = qca_read_soc_version(hdev, &amp;soc_ver);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1234,9 +1245,9 @@ static int qca_setup(struct hci_uart *hu)</div><div class='ctx'> </div><div class='ctx'> 	bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);</div><div class='ctx'> 	/* Setup patch / NVM configurations */</div><div class='del'>-	ret = qca_uart_setup(hdev, qca_baudrate, qcadev-&gt;btsoc_type, soc_ver);</div><div class='add'>+	ret = qca_uart_setup(hdev, qca_baudrate, soc_type, soc_ver);</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		set_bit(STATE_IN_BAND_SLEEP_ENABLED, &amp;qca-&gt;flags);</div><div class='add'>+		set_bit(QCA_IBS_ENABLED, &amp;qca-&gt;flags);</div><div class='ctx'> 		qca_debugfs_init(hdev);</div><div class='ctx'> 	} else if (ret == -ENOENT) {</div><div class='ctx'> 		/* No patch/nvm-config found, run with original fw/config */</div><div class='hunk'>@@ -1250,7 +1261,7 @@ static int qca_setup(struct hci_uart *hu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup bdaddr */</div><div class='del'>-	if (qcadev-&gt;btsoc_type == QCA_WCN3990)</div><div class='add'>+	if (qca_is_wcn399x(soc_type))</div><div class='ctx'> 		hu-&gt;hdev-&gt;set_bdaddr = qca_set_bdaddr;</div><div class='ctx'> 	else</div><div class='ctx'> 		hu-&gt;hdev-&gt;set_bdaddr = qca_set_bdaddr_rome;</div><div class='hunk'>@@ -1273,7 +1284,7 @@ static struct hci_uart_proto qca_proto = {</div><div class='ctx'> 	.dequeue	= qca_dequeue,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct qca_vreg_data qca_soc_data = {</div><div class='add'>+static const struct qca_vreg_data qca_soc_data_wcn3990 = {</div><div class='ctx'> 	.soc_type = QCA_WCN3990,</div><div class='ctx'> 	.vregs = (struct qca_vreg []) {</div><div class='ctx'> 		{ "vddio",   1800000, 1900000,  15000  },</div><div class='hunk'>@@ -1284,6 +1295,17 @@ static const struct qca_vreg_data qca_soc_data = {</div><div class='ctx'> 	.num_vregs = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct qca_vreg_data qca_soc_data_wcn3998 = {</div><div class='add'>+	.soc_type = QCA_WCN3998,</div><div class='add'>+	.vregs = (struct qca_vreg []) {</div><div class='add'>+		{ "vddio",   1800000, 1900000,  10000  },</div><div class='add'>+		{ "vddxo",   1800000, 1900000,  80000  },</div><div class='add'>+		{ "vddrf",   1300000, 1352000,  300000 },</div><div class='add'>+		{ "vddch0",  3300000, 3300000,  450000 },</div><div class='add'>+	},</div><div class='add'>+	.num_vregs = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void qca_power_shutdown(struct hci_uart *hu)</div><div class='ctx'> {</div><div class='ctx'> 	struct qca_data *qca = hu-&gt;priv;</div><div class='hunk'>@@ -1294,7 +1316,7 @@ static void qca_power_shutdown(struct hci_uart *hu)</div><div class='ctx'> 	 * data in skb's.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irqsave(&amp;qca-&gt;hci_ibs_lock, flags);</div><div class='del'>-	clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &amp;qca-&gt;flags);</div><div class='add'>+	clear_bit(QCA_IBS_ENABLED, &amp;qca-&gt;flags);</div><div class='ctx'> 	qca_flush(hu);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;qca-&gt;hci_ibs_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1417,8 +1439,8 @@ static int qca_serdev_probe(struct serdev_device *serdev)</div><div class='ctx'> 	qcadev-&gt;serdev_hu.serdev = serdev;</div><div class='ctx'> 	data = of_device_get_match_data(&amp;serdev-&gt;dev);</div><div class='ctx'> 	serdev_device_set_drvdata(serdev, qcadev);</div><div class='del'>-	if (data &amp;&amp; data-&gt;soc_type == QCA_WCN3990) {</div><div class='del'>-		qcadev-&gt;btsoc_type = QCA_WCN3990;</div><div class='add'>+	if (data &amp;&amp; qca_is_wcn399x(data-&gt;soc_type)) {</div><div class='add'>+		qcadev-&gt;btsoc_type = data-&gt;soc_type;</div><div class='ctx'> 		qcadev-&gt;bt_power = devm_kzalloc(&amp;serdev-&gt;dev,</div><div class='ctx'> 						sizeof(struct qca_power),</div><div class='ctx'> 						GFP_KERNEL);</div><div class='hunk'>@@ -1482,7 +1504,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);</div><div class='ctx'> </div><div class='del'>-	if (qcadev-&gt;btsoc_type == QCA_WCN3990)</div><div class='add'>+	if (qca_is_wcn399x(qcadev-&gt;btsoc_type))</div><div class='ctx'> 		qca_power_shutdown(&amp;qcadev-&gt;serdev_hu);</div><div class='ctx'> 	else</div><div class='ctx'> 		clk_disable_unprepare(qcadev-&gt;susclk);</div><div class='hunk'>@@ -1492,7 +1514,8 @@ static void qca_serdev_remove(struct serdev_device *serdev)</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id qca_bluetooth_of_match[] = {</div><div class='ctx'> 	{ .compatible = "qcom,qca6174-bt" },</div><div class='del'>-	{ .compatible = "qcom,wcn3990-bt", .data = &amp;qca_soc_data},</div><div class='add'>+	{ .compatible = "qcom,wcn3990-bt", .data = &amp;qca_soc_data_wcn3990},</div><div class='add'>+	{ .compatible = "qcom,wcn3998-bt", .data = &amp;qca_soc_data_wcn3998},</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);</div><div class='head'>diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c<br/>index f8b7345fe1cb..5cf3bade0d57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cdrom/gdrom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cdrom/gdrom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cdrom/gdrom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cdrom/gdrom.c</a></div><div class='hunk'>@@ -786,6 +786,7 @@ static int probe_gdrom(struct platform_device *devptr)</div><div class='ctx'> 		goto probe_fail_cdrom_register;</div><div class='ctx'> 	}</div><div class='ctx'> 	gd.disk-&gt;fops = &amp;gdrom_bdops;</div><div class='add'>+	gd.disk-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	/* latch on to the interrupt */</div><div class='ctx'> 	err = gdrom_set_interrupt_handlers();</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig<br/>index 72866a004f07..466ebd84ad17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/Kconfig</a></div><div class='hunk'>@@ -348,7 +348,7 @@ config XILINX_HWICAP</div><div class='ctx'> </div><div class='ctx'> config R3964</div><div class='ctx'> 	tristate "Siemens R3964 line discipline"</div><div class='del'>-	depends on TTY</div><div class='add'>+	depends on TTY &amp;&amp; BROKEN</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver allows synchronous communication with devices using the</div><div class='ctx'> 	  Siemens R3964 packet protocol. Unless you are dealing with special</div><div class='head'>diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c<br/>index a5ecf6dae02e..373f549525fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ds1620.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ds1620.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ds1620.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ds1620.c</a></div><div class='hunk'>@@ -212,7 +212,7 @@ static void ds1620_read_state(struct therm *therm)</div><div class='ctx'> </div><div class='ctx'> static int ds1620_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='head'>diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c<br/>index f882460b5a44..4fed8fafa0f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/dtlk.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/dtlk.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/dtlk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/dtlk.c</a></div><div class='hunk'>@@ -298,12 +298,11 @@ static int dtlk_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	TRACE_TEXT("(dtlk_open");</div><div class='ctx'> </div><div class='del'>-	nonseekable_open(inode, file);</div><div class='ctx'> 	switch (iminor(inode)) {</div><div class='ctx'> 	case DTLK_MINOR:</div><div class='ctx'> 		if (dtlk_busy)</div><div class='ctx'> 			return -EBUSY;</div><div class='del'>-		return nonseekable_open(inode, file);</div><div class='add'>+		return stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENXIO;</div><div class='head'>diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c<br/>index d0ad85900b79..3a1e6b3ccd10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/hpet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/hpet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/hpet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/hpet.c</a></div><div class='hunk'>@@ -973,6 +973,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 		hdp-&gt;hd_phys_address = addr.address.minimum;</div><div class='ctx'> 		hdp-&gt;hd_address = ioremap(addr.address.minimum, addr.address.address_length);</div><div class='add'>+		if (!hdp-&gt;hd_address)</div><div class='add'>+			return AE_ERROR;</div><div class='ctx'> </div><div class='ctx'> 		if (hpet_is_known(hdp)) {</div><div class='ctx'> 			iounmap(hdp-&gt;hd_address);</div><div class='head'>diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c<br/>index b65ff6962899..e9b6ac61fb7f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/hw_random/omap-rng.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/hw_random/omap-rng.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/hw_random/omap-rng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/hw_random/omap-rng.c</a></div><div class='hunk'>@@ -443,6 +443,7 @@ static int omap_rng_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;rng.read = omap_rng_do_read;</div><div class='ctx'> 	priv-&gt;rng.init = omap_rng_init;</div><div class='ctx'> 	priv-&gt;rng.cleanup = omap_rng_cleanup;</div><div class='add'>+	priv-&gt;rng.quality = 900;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;rng.priv = (unsigned long)priv;</div><div class='ctx'> 	platform_set_drvdata(pdev, priv);</div><div class='head'>diff --git a/drivers/char/hw_random/stm32-rng.c b/drivers/char/hw_random/stm32-rng.c<br/>index 042860d97b15..0ef5b6a3f560 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/hw_random/stm32-rng.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/hw_random/stm32-rng.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/hw_random/stm32-rng.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/hw_random/stm32-rng.c</a></div><div class='hunk'>@@ -161,6 +161,7 @@ static int stm32_rng_probe(struct platform_device *ofdev)</div><div class='ctx'> #endif</div><div class='ctx'> 	priv-&gt;rng.read = stm32_rng_read,</div><div class='ctx'> 	priv-&gt;rng.priv = (unsigned long) dev;</div><div class='add'>+	priv-&gt;rng.quality = 900;</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_set_autosuspend_delay(dev, 100);</div><div class='ctx'> 	pm_runtime_use_autosuspend(dev);</div><div class='hunk'>@@ -169,6 +170,13 @@ static int stm32_rng_probe(struct platform_device *ofdev)</div><div class='ctx'> 	return devm_hwrng_register(dev, &amp;priv-&gt;rng);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int stm32_rng_remove(struct platform_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	pm_runtime_disable(&amp;ofdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int stm32_rng_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,6 +218,7 @@ static struct platform_driver stm32_rng_driver = {</div><div class='ctx'> 		.of_match_table = stm32_rng_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = stm32_rng_probe,</div><div class='add'>+	.remove = stm32_rng_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(stm32_rng_driver);</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c<br/>index 99c9f581a1f3..f7b1c004a12b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_devintf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_devintf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_devintf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_devintf.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@ struct ipmi_file_private</div><div class='ctx'> 	struct ipmi_user     *user;</div><div class='ctx'> 	spinlock_t           recv_msg_lock;</div><div class='ctx'> 	struct list_head     recv_msgs;</div><div class='del'>-	struct file          *file;</div><div class='ctx'> 	struct fasync_struct *fasync_queue;</div><div class='ctx'> 	wait_queue_head_t    wait;</div><div class='ctx'> 	struct mutex	     recv_mutex;</div><div class='hunk'>@@ -95,8 +94,6 @@ static int ipmi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;file = file;</div><div class='del'>-</div><div class='ctx'> 	rv = ipmi_create_user(if_num,</div><div class='ctx'> 			      &amp;ipmi_hndlrs,</div><div class='ctx'> 			      priv,</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c<br/>index ff0b199be472..f38e651dd1b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_dmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_dmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_dmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_dmi.c</a></div><div class='hunk'>@@ -47,9 +47,11 @@ static void __init dmi_add_platform_ipmi(unsigned long base_addr,</div><div class='ctx'> 	memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> </div><div class='ctx'> 	name = "dmi-ipmi-si";</div><div class='add'>+	p.iftype = IPMI_PLAT_IF_SI;</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case IPMI_DMI_TYPE_SSIF:</div><div class='ctx'> 		name = "dmi-ipmi-ssif";</div><div class='add'>+		p.iftype = IPMI_PLAT_IF_SSIF;</div><div class='ctx'> 		p.type = SI_TYPE_INVALID;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPMI_DMI_TYPE_BT:</div><div class='hunk'>@@ -66,7 +68,6 @@ static void __init dmi_add_platform_ipmi(unsigned long base_addr,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> 	p.addr = base_addr;</div><div class='ctx'> 	p.space = space;</div><div class='ctx'> 	p.regspacing = offset;</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c<br/>index e8ba67834746..1dc10740fc0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_msghandler.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_msghandler.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_msghandler.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_msghandler.c</a></div><div class='hunk'>@@ -214,6 +214,9 @@ struct ipmi_user {</div><div class='ctx'> </div><div class='ctx'> 	/* Does this interface receive IPMI events? */</div><div class='ctx'> 	bool gets_events;</div><div class='add'>+</div><div class='add'>+	/* Free must run in process context for RCU cleanup. */</div><div class='add'>+	struct work_struct remove_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ipmi_user *acquire_ipmi_user(struct ipmi_user *user, int *index)</div><div class='hunk'>@@ -632,7 +635,7 @@ static DEFINE_MUTEX(ipmidriver_mutex);</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(ipmi_interfaces);</div><div class='ctx'> static DEFINE_MUTEX(ipmi_interfaces_mutex);</div><div class='del'>-struct srcu_struct ipmi_interfaces_srcu;</div><div class='add'>+static struct srcu_struct ipmi_interfaces_srcu;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * List of watchers that want to know when smi's are added and deleted.</div><div class='hunk'>@@ -1157,6 +1160,15 @@ static int intf_err_seq(struct ipmi_smi *intf,</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void free_user_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ipmi_user *user = container_of(work, struct ipmi_user,</div><div class='add'>+					      remove_work);</div><div class='add'>+</div><div class='add'>+	cleanup_srcu_struct(&amp;user-&gt;release_barrier);</div><div class='add'>+	kfree(user);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ipmi_create_user(unsigned int          if_num,</div><div class='ctx'> 		     const struct ipmi_user_hndl *handler,</div><div class='ctx'> 		     void                  *handler_data,</div><div class='hunk'>@@ -1200,6 +1212,8 @@ int ipmi_create_user(unsigned int          if_num,</div><div class='ctx'> 	goto out_kfree;</div><div class='ctx'> </div><div class='ctx'>  found:</div><div class='add'>+	INIT_WORK(&amp;new_user-&gt;remove_work, free_user_work);</div><div class='add'>+</div><div class='ctx'> 	rv = init_srcu_struct(&amp;new_user-&gt;release_barrier);</div><div class='ctx'> 	if (rv)</div><div class='ctx'> 		goto out_kfree;</div><div class='hunk'>@@ -1260,8 +1274,9 @@ EXPORT_SYMBOL(ipmi_get_smi_info);</div><div class='ctx'> static void free_user(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipmi_user *user = container_of(ref, struct ipmi_user, refcount);</div><div class='del'>-	cleanup_srcu_struct(&amp;user-&gt;release_barrier);</div><div class='del'>-	kfree(user);</div><div class='add'>+</div><div class='add'>+	/* SRCU cleanup must happen in task context. */</div><div class='add'>+	schedule_work(&amp;user-&gt;remove_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _ipmi_destroy_user(struct ipmi_user *user)</div><div class='hunk'>@@ -5164,7 +5179,7 @@ static void __exit cleanup_ipmi(void)</div><div class='ctx'> 		 * avoids problems with race conditions removing the timer</div><div class='ctx'> 		 * here.</div><div class='ctx'> 		 */</div><div class='del'>-		atomic_inc(&amp;stop_operation);</div><div class='add'>+		atomic_set(&amp;stop_operation, 1);</div><div class='ctx'> 		del_timer_sync(&amp;ipmi_timer);</div><div class='ctx'> </div><div class='ctx'> 		initialized = false;</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_plat_data.c b/drivers/char/ipmi/ipmi_plat_data.c<br/>index 8f0ca2a848eb..28471ff2a3a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_plat_data.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_plat_data.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_plat_data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_plat_data.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst,</div><div class='ctx'> 					  struct ipmi_plat_data *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='del'>-	unsigned int num_r = 1, size, pidx = 0;</div><div class='add'>+	unsigned int num_r = 1, size = 0, pidx = 0;</div><div class='ctx'> 	struct resource r[4];</div><div class='ctx'> 	struct property_entry pr[6];</div><div class='ctx'> 	u32 flags;</div><div class='hunk'>@@ -21,19 +21,22 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst,</div><div class='ctx'> 	memset(pr, 0, sizeof(pr));</div><div class='ctx'> 	memset(r, 0, sizeof(r));</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;type == SI_BT)</div><div class='del'>-		size = 3;</div><div class='del'>-	else if (p-&gt;type == SI_TYPE_INVALID)</div><div class='del'>-		size = 0;</div><div class='del'>-	else</div><div class='del'>-		size = 2;</div><div class='add'>+	if (p-&gt;iftype == IPMI_PLAT_IF_SI) {</div><div class='add'>+		if (p-&gt;type == SI_BT)</div><div class='add'>+			size = 3;</div><div class='add'>+		else if (p-&gt;type != SI_TYPE_INVALID)</div><div class='add'>+			size = 2;</div><div class='add'>+</div><div class='add'>+		if (p-&gt;regsize == 0)</div><div class='add'>+			p-&gt;regsize = DEFAULT_REGSIZE;</div><div class='add'>+		if (p-&gt;regspacing == 0)</div><div class='add'>+			p-&gt;regspacing = p-&gt;regsize;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;regsize == 0)</div><div class='del'>-		p-&gt;regsize = DEFAULT_REGSIZE;</div><div class='del'>-	if (p-&gt;regspacing == 0)</div><div class='del'>-		p-&gt;regspacing = p-&gt;regsize;</div><div class='add'>+		pr[pidx++] = PROPERTY_ENTRY_U8("ipmi-type", p-&gt;type);</div><div class='add'>+	} else if (p-&gt;iftype == IPMI_PLAT_IF_SSIF) {</div><div class='add'>+		pr[pidx++] = PROPERTY_ENTRY_U16("i2c-addr", p-&gt;addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pr[pidx++] = PROPERTY_ENTRY_U8("ipmi-type", p-&gt;type);</div><div class='ctx'> 	if (p-&gt;slave_addr)</div><div class='ctx'> 		pr[pidx++] = PROPERTY_ENTRY_U8("slave-addr", p-&gt;slave_addr);</div><div class='ctx'> 	pr[pidx++] = PROPERTY_ENTRY_U8("addr-source", p-&gt;addr_source);</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_plat_data.h b/drivers/char/ipmi/ipmi_plat_data.h<br/>index 567cfcec8ada..9ba744ea9571 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_plat_data.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_plat_data.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_plat_data.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_plat_data.h</a></div><div class='hunk'>@@ -6,7 +6,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ipmi.h&gt;</div><div class='ctx'> </div><div class='add'>+enum ipmi_plat_interface_type { IPMI_PLAT_IF_SI, IPMI_PLAT_IF_SSIF };</div><div class='add'>+</div><div class='ctx'> struct ipmi_plat_data {</div><div class='add'>+	enum ipmi_plat_interface_type iftype;</div><div class='ctx'> 	unsigned int type; /* si_type for si, SI_INVALID for others */</div><div class='ctx'> 	unsigned int space; /* addr_space for si, intf# for ssif. */</div><div class='ctx'> 	unsigned long addr;</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_hardcode.c b/drivers/char/ipmi/ipmi_si_hardcode.c<br/>index 01946cad3d13..f6ece7569504 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_hardcode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_hardcode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_hardcode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_si_hardcode.c</a></div><div class='hunk'>@@ -83,6 +83,7 @@ static void __init ipmi_hardcode_init_one(const char *si_type_str,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> </div><div class='add'>+	p.iftype = IPMI_PLAT_IF_SI;</div><div class='ctx'> 	if (!si_type_str || !*si_type_str || strcmp(si_type_str, "kcs") == 0) {</div><div class='ctx'> 		p.type = SI_KCS;</div><div class='ctx'> 	} else if (strcmp(si_type_str, "smic") == 0) {</div><div class='hunk'>@@ -118,6 +119,8 @@ void __init ipmi_hardcode_init(void)</div><div class='ctx'> 	char *str;</div><div class='ctx'> 	char *si_type[SI_MAX_PARMS];</div><div class='ctx'> </div><div class='add'>+	memset(si_type, 0, sizeof(si_type));</div><div class='add'>+</div><div class='ctx'> 	/* Parse out the si_type string into its components. */</div><div class='ctx'> 	str = si_type_str;</div><div class='ctx'> 	if (*str != '\0') {</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_hotmod.c b/drivers/char/ipmi/ipmi_si_hotmod.c<br/>index 03140f6cdf6f..42a925f8cf69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_hotmod.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_hotmod.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_hotmod.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_si_hotmod.c</a></div><div class='hunk'>@@ -108,6 +108,7 @@ static int parse_hotmod_str(const char *curr, enum hotmod_op *op,</div><div class='ctx'> 	int rv;</div><div class='ctx'> 	unsigned int ival;</div><div class='ctx'> </div><div class='add'>+	h-&gt;iftype = IPMI_PLAT_IF_SI;</div><div class='ctx'> 	rv = parse_str(hotmod_ops, &amp;ival, "operation", &amp;curr);</div><div class='ctx'> 	if (rv)</div><div class='ctx'> 		return rv;</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c<br/>index b1732882b97e..f124a2d2bb9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_intf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_si_intf.c</a></div><div class='hunk'>@@ -1931,7 +1931,6 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> {</div><div class='ctx'> 	int rv = 0;</div><div class='ctx'> 	int i;</div><div class='del'>-	char *init_name = NULL;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Trying %s-specified %s state machine at %s address 0x%lx, slave address 0x%x, irq %d\n",</div><div class='ctx'> 		ipmi_addr_src_to_str(new_smi-&gt;io.addr_source),</div><div class='hunk'>@@ -2073,7 +2072,6 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> 		new_smi-&gt;io.io_cleanup = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(init_name);</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c<br/>index 54c7ded2a1ff..f2a91c4d8cab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_platform.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_si_platform.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_si_platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_si_platform.c</a></div><div class='hunk'>@@ -188,12 +188,10 @@ static int platform_ipmi_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	rv = device_property_read_u8(&amp;pdev-&gt;dev, "slave-addr", &amp;slave_addr);</div><div class='del'>-	if (rv) {</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "device has no slave-addr property\n");</div><div class='add'>+	if (rv)</div><div class='ctx'> 		io.slave_addr = 0x20;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		io.slave_addr = slave_addr;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	io.irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (io.irq &gt; 0)</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c<br/>index 8b5aec5430f1..cf8156d6bc07 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_ssif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_ssif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_ssif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_ssif.c</a></div><div class='hunk'>@@ -727,12 +727,16 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,</div><div class='ctx'> 			/* End of read */</div><div class='ctx'> 			len = ssif_info-&gt;multi_len;</div><div class='ctx'> 			data = ssif_info-&gt;data;</div><div class='del'>-		} else if (blocknum != ssif_info-&gt;multi_pos) {</div><div class='add'>+		} else if (blocknum + 1 != ssif_info-&gt;multi_pos) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Out of sequence block, just abort.  Block</div><div class='ctx'> 			 * numbers start at zero for the second block,</div><div class='ctx'> 			 * but multi_pos starts at one, so the +1.</div><div class='ctx'> 			 */</div><div class='add'>+			if (ssif_info-&gt;ssif_debug &amp; SSIF_DEBUG_MSG)</div><div class='add'>+				dev_dbg(&amp;ssif_info-&gt;client-&gt;dev,</div><div class='add'>+					"Received message out of sequence, expected %u, got %u\n",</div><div class='add'>+					ssif_info-&gt;multi_pos - 1, blocknum);</div><div class='ctx'> 			result = -EIO;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ssif_inc_stat(ssif_info, received_message_parts);</div><div class='hunk'>@@ -1991,7 +1995,7 @@ static int dmi_ipmi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	rv = device_property_read_u8(&amp;pdev-&gt;dev, "slave-addr", &amp;slave_addr);</div><div class='ctx'> 	if (rv)</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "device has no slave-addr property");</div><div class='add'>+		slave_addr = 0x20;</div><div class='ctx'> </div><div class='ctx'> 	return new_ssif_client(i2c_addr, NULL, 0,</div><div class='ctx'> 			       slave_addr, SI_SMBIOS, &amp;pdev-&gt;dev);</div><div class='hunk'>@@ -2107,7 +2111,8 @@ static void cleanup_ipmi_ssif(void)</div><div class='ctx'> </div><div class='ctx'> 	kfree(ssif_i2c_driver.address_list);</div><div class='ctx'> </div><div class='del'>-	platform_driver_unregister(&amp;ipmi_driver);</div><div class='add'>+	if (ssif_trydmi)</div><div class='add'>+		platform_driver_unregister(&amp;ipmi_driver);</div><div class='ctx'> </div><div class='ctx'> 	free_ssif_clients();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c<br/>index 2924a4bc4a32..74c6d1f34132 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_watchdog.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/ipmi/ipmi_watchdog.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/ipmi/ipmi_watchdog.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/ipmi/ipmi_watchdog.c</a></div><div class='hunk'>@@ -837,7 +837,7 @@ static int ipmi_open(struct inode *ino, struct file *filep)</div><div class='ctx'> 		 * first heartbeat.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ipmi_start_timer_on_heartbeat = 1;</div><div class='del'>-		return nonseekable_open(ino, filep);</div><div class='add'>+		return stream_open(ino, filep);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return (-ENODEV);</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c<br/>index 7a4eb86aedac..15bf585af5d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/pcmcia/cm4000_cs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/pcmcia/cm4000_cs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/pcmcia/cm4000_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/pcmcia/cm4000_cs.c</a></div><div class='hunk'>@@ -1682,7 +1682,7 @@ static int cmm_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	link-&gt;open = 1;		/* only one open per device */</div><div class='ctx'> </div><div class='ctx'> 	DEBUGP(2, dev, "&lt;- cmm_open\n");</div><div class='del'>-	ret = nonseekable_open(inode, filp);</div><div class='add'>+	ret = stream_open(inode, filp);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;cmm_mutex);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/char/pcmcia/scr24x_cs.c b/drivers/char/pcmcia/scr24x_cs.c<br/>index f6b43d9350f0..04b39c3596cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/pcmcia/scr24x_cs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/pcmcia/scr24x_cs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/pcmcia/scr24x_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/pcmcia/scr24x_cs.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static int scr24x_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	kref_get(&amp;dev-&gt;refcnt);</div><div class='ctx'> 	filp-&gt;private_data = dev;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int scr24x_release(struct inode *inode, struct file *filp)</div><div class='head'>diff --git a/drivers/char/random.c b/drivers/char/random.c<br/>index 38c6d1af6d1c..a42b3d764da8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/random.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/random.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/random.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/random.c</a></div><div class='hunk'>@@ -101,15 +101,13 @@</div><div class='ctx'>  * Exported interfaces ---- output</div><div class='ctx'>  * ===============================</div><div class='ctx'>  *</div><div class='del'>- * There are three exported interfaces; the first is one designed to</div><div class='del'>- * be used from within the kernel:</div><div class='add'>+ * There are four exported interfaces; two for use within the kernel,</div><div class='add'>+ * and two or use from userspace.</div><div class='ctx'>  *</div><div class='del'>- * 	void get_random_bytes(void *buf, int nbytes);</div><div class='del'>- *</div><div class='del'>- * This interface will return the requested number of random bytes,</div><div class='del'>- * and place it in the requested buffer.</div><div class='add'>+ * Exported interfaces ---- userspace output</div><div class='add'>+ * -----------------------------------------</div><div class='ctx'>  *</div><div class='del'>- * The two other interfaces are two character devices /dev/random and</div><div class='add'>+ * The userspace interfaces are two character devices /dev/random and</div><div class='ctx'>  * /dev/urandom.  /dev/random is suitable for use when very high</div><div class='ctx'>  * quality randomness is desired (for example, for key generation or</div><div class='ctx'>  * one-time pads), as it will only return a maximum of the number of</div><div class='hunk'>@@ -122,6 +120,77 @@</div><div class='ctx'>  * this will result in random numbers that are merely cryptographically</div><div class='ctx'>  * strong.  For many applications, however, this is acceptable.</div><div class='ctx'>  *</div><div class='add'>+ * Exported interfaces ---- kernel output</div><div class='add'>+ * --------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * The primary kernel interface is</div><div class='add'>+ *</div><div class='add'>+ * 	void get_random_bytes(void *buf, int nbytes);</div><div class='add'>+ *</div><div class='add'>+ * This interface will return the requested number of random bytes,</div><div class='add'>+ * and place it in the requested buffer.  This is equivalent to a</div><div class='add'>+ * read from /dev/urandom.</div><div class='add'>+ *</div><div class='add'>+ * For less critical applications, there are the functions:</div><div class='add'>+ *</div><div class='add'>+ * 	u32 get_random_u32()</div><div class='add'>+ * 	u64 get_random_u64()</div><div class='add'>+ * 	unsigned int get_random_int()</div><div class='add'>+ * 	unsigned long get_random_long()</div><div class='add'>+ *</div><div class='add'>+ * These are produced by a cryptographic RNG seeded from get_random_bytes,</div><div class='add'>+ * and so do not deplete the entropy pool as much.  These are recommended</div><div class='add'>+ * for most in-kernel operations *if the result is going to be stored in</div><div class='add'>+ * the kernel*.</div><div class='add'>+ *</div><div class='add'>+ * Specifically, the get_random_int() family do not attempt to do</div><div class='add'>+ * "anti-backtracking".  If you capture the state of the kernel (e.g.</div><div class='add'>+ * by snapshotting the VM), you can figure out previous get_random_int()</div><div class='add'>+ * return values.  But if the value is stored in the kernel anyway,</div><div class='add'>+ * this is not a problem.</div><div class='add'>+ *</div><div class='add'>+ * It *is* safe to expose get_random_int() output to attackers (e.g. as</div><div class='add'>+ * network cookies); given outputs 1..n, it's not feasible to predict</div><div class='add'>+ * outputs 0 or n+1.  The only concern is an attacker who breaks into</div><div class='add'>+ * the kernel later; the get_random_int() engine is not reseeded as</div><div class='add'>+ * often as the get_random_bytes() one.</div><div class='add'>+ *</div><div class='add'>+ * get_random_bytes() is needed for keys that need to stay secret after</div><div class='add'>+ * they are erased from the kernel.  For example, any key that will</div><div class='add'>+ * be wrapped and stored encrypted.  And session encryption keys: we'd</div><div class='add'>+ * like to know that after the session is closed and the keys erased,</div><div class='add'>+ * the plaintext is unrecoverable to someone who recorded the ciphertext.</div><div class='add'>+ *</div><div class='add'>+ * But for network ports/cookies, stack canaries, PRNG seeds, address</div><div class='add'>+ * space layout randomization, session *authentication* keys, or other</div><div class='add'>+ * applications where the sensitive data is stored in the kernel in</div><div class='add'>+ * plaintext for as long as it's sensitive, the get_random_int() family</div><div class='add'>+ * is just fine.</div><div class='add'>+ *</div><div class='add'>+ * Consider ASLR.  We want to keep the address space secret from an</div><div class='add'>+ * outside attacker while the process is running, but once the address</div><div class='add'>+ * space is torn down, it's of no use to an attacker any more.  And it's</div><div class='add'>+ * stored in kernel data structures as long as it's alive, so worrying</div><div class='add'>+ * about an attacker's ability to extrapolate it from the get_random_int()</div><div class='add'>+ * CRNG is silly.</div><div class='add'>+ *</div><div class='add'>+ * Even some cryptographic keys are safe to generate with get_random_int().</div><div class='add'>+ * In particular, keys for SipHash are generally fine.  Here, knowledge</div><div class='add'>+ * of the key authorizes you to do something to a kernel object (inject</div><div class='add'>+ * packets to a network connection, or flood a hash table), and the</div><div class='add'>+ * key is stored with the object being protected.  Once it goes away,</div><div class='add'>+ * we no longer care if anyone knows the key.</div><div class='add'>+ *</div><div class='add'>+ * prandom_u32()</div><div class='add'>+ * -------------</div><div class='add'>+ *</div><div class='add'>+ * For even weaker applications, see the pseudorandom generator</div><div class='add'>+ * prandom_u32(), prandom_max(), and prandom_bytes().  If the random</div><div class='add'>+ * numbers aren't security-critical at all, these are *far* cheaper.</div><div class='add'>+ * Useful for self-tests, random error simulation, randomized backoffs,</div><div class='add'>+ * and any other application where you trust that nobody is trying to</div><div class='add'>+ * maliciously mess with you by guessing the "random" numbers.</div><div class='add'>+ *</div><div class='ctx'>  * Exported interfaces ---- input</div><div class='ctx'>  * ==============================</div><div class='ctx'>  *</div><div class='hunk'>@@ -295,7 +364,7 @@</div><div class='ctx'>  * To allow fractional bits to be tracked, the entropy_count field is</div><div class='ctx'>  * denominated in units of 1/8th bits.</div><div class='ctx'>  *</div><div class='del'>- * 2*(ENTROPY_SHIFT + log2(poolbits)) must &lt;= 31, or the multiply in</div><div class='add'>+ * 2*(ENTROPY_SHIFT + poolbitshift) must &lt;= 31, or the multiply in</div><div class='ctx'>  * credit_entropy_bits() needs to be 64 bits wide.</div><div class='ctx'>  */</div><div class='ctx'> #define ENTROPY_SHIFT 3</div><div class='hunk'>@@ -359,9 +428,9 @@ static int random_write_wakeup_bits = 28 * OUTPUT_POOL_WORDS;</div><div class='ctx'>  * polynomial which improves the resulting TGFSR polynomial to be</div><div class='ctx'>  * irreducible, which we have made here.</div><div class='ctx'>  */</div><div class='del'>-static struct poolinfo {</div><div class='del'>-	int poolbitshift, poolwords, poolbytes, poolbits, poolfracbits;</div><div class='del'>-#define S(x) ilog2(x)+5, (x), (x)*4, (x)*32, (x) &lt;&lt; (ENTROPY_SHIFT+5)</div><div class='add'>+static const struct poolinfo {</div><div class='add'>+	int poolbitshift, poolwords, poolbytes, poolfracbits;</div><div class='add'>+#define S(x) ilog2(x)+5, (x), (x)*4, (x) &lt;&lt; (ENTROPY_SHIFT+5)</div><div class='ctx'> 	int tap1, tap2, tap3, tap4, tap5;</div><div class='ctx'> } poolinfo_table[] = {</div><div class='ctx'> 	/* was: x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 */</div><div class='hunk'>@@ -415,7 +484,7 @@ struct crng_state {</div><div class='ctx'> 	spinlock_t	lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct crng_state primary_crng = {</div><div class='add'>+static struct crng_state primary_crng = {</div><div class='ctx'> 	.lock = __SPIN_LOCK_UNLOCKED(primary_crng.lock),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -470,7 +539,6 @@ struct entropy_store {</div><div class='ctx'> 	unsigned short add_ptr;</div><div class='ctx'> 	unsigned short input_rotate;</div><div class='ctx'> 	int entropy_count;</div><div class='del'>-	int entropy_total;</div><div class='ctx'> 	unsigned int initialized:1;</div><div class='ctx'> 	unsigned int last_data_init:1;</div><div class='ctx'> 	__u8 last_data[EXTRACT_SIZE];</div><div class='hunk'>@@ -643,7 +711,7 @@ static void process_random_ready_list(void)</div><div class='ctx'>  */</div><div class='ctx'> static void credit_entropy_bits(struct entropy_store *r, int nbits)</div><div class='ctx'> {</div><div class='del'>-	int entropy_count, orig;</div><div class='add'>+	int entropy_count, orig, has_initialized = 0;</div><div class='ctx'> 	const int pool_size = r-&gt;poolinfo-&gt;poolfracbits;</div><div class='ctx'> 	int nfrac = nbits &lt;&lt; ENTROPY_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -698,23 +766,25 @@ retry:</div><div class='ctx'> 		entropy_count = 0;</div><div class='ctx'> 	} else if (entropy_count &gt; pool_size)</div><div class='ctx'> 		entropy_count = pool_size;</div><div class='add'>+	if ((r == &amp;blocking_pool) &amp;&amp; !r-&gt;initialized &amp;&amp;</div><div class='add'>+	    (entropy_count &gt;&gt; ENTROPY_SHIFT) &gt; 128)</div><div class='add'>+		has_initialized = 1;</div><div class='ctx'> 	if (cmpxchg(&amp;r-&gt;entropy_count, orig, entropy_count) != orig)</div><div class='ctx'> 		goto retry;</div><div class='ctx'> </div><div class='del'>-	r-&gt;entropy_total += nbits;</div><div class='del'>-	if (!r-&gt;initialized &amp;&amp; r-&gt;entropy_total &gt; 128) {</div><div class='add'>+	if (has_initialized)</div><div class='ctx'> 		r-&gt;initialized = 1;</div><div class='del'>-		r-&gt;entropy_total = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	trace_credit_entropy_bits(r-&gt;name, nbits,</div><div class='del'>-				  entropy_count &gt;&gt; ENTROPY_SHIFT,</div><div class='del'>-				  r-&gt;entropy_total, _RET_IP_);</div><div class='add'>+				  entropy_count &gt;&gt; ENTROPY_SHIFT, _RET_IP_);</div><div class='ctx'> </div><div class='ctx'> 	if (r == &amp;input_pool) {</div><div class='ctx'> 		int entropy_bits = entropy_count &gt;&gt; ENTROPY_SHIFT;</div><div class='add'>+		struct entropy_store *other = &amp;blocking_pool;</div><div class='ctx'> </div><div class='del'>-		if (crng_init &lt; 2 &amp;&amp; entropy_bits &gt;= 128) {</div><div class='add'>+		if (crng_init &lt; 2) {</div><div class='add'>+			if (entropy_bits &lt; 128)</div><div class='add'>+				return;</div><div class='ctx'> 			crng_reseed(&amp;primary_crng, r);</div><div class='ctx'> 			entropy_bits = r-&gt;entropy_count &gt;&gt; ENTROPY_SHIFT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -725,20 +795,14 @@ retry:</div><div class='ctx'> 			wake_up_interruptible(&amp;random_read_wait);</div><div class='ctx'> 			kill_fasync(&amp;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 		}</div><div class='del'>-		/* If the input pool is getting full, send some</div><div class='del'>-		 * entropy to the blocking pool until it is 75% full.</div><div class='add'>+		/* If the input pool is getting full, and the blocking</div><div class='add'>+		 * pool has room, send some entropy to the blocking</div><div class='add'>+		 * pool.</div><div class='ctx'> 		 */</div><div class='del'>-		if (entropy_bits &gt; random_write_wakeup_bits &amp;&amp;</div><div class='del'>-		    r-&gt;initialized &amp;&amp;</div><div class='del'>-		    r-&gt;entropy_total &gt;= 2*random_read_wakeup_bits) {</div><div class='del'>-			struct entropy_store *other = &amp;blocking_pool;</div><div class='del'>-</div><div class='del'>-			if (other-&gt;entropy_count &lt;=</div><div class='del'>-			    3 * other-&gt;poolinfo-&gt;poolfracbits / 4) {</div><div class='del'>-				schedule_work(&amp;other-&gt;push_work);</div><div class='del'>-				r-&gt;entropy_total = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (!work_pending(&amp;other-&gt;push_work) &amp;&amp;</div><div class='add'>+		    (ENTROPY_BITS(r) &gt; 6 * r-&gt;poolinfo-&gt;poolbytes) &amp;&amp;</div><div class='add'>+		    (ENTROPY_BITS(other) &lt;= 6 * other-&gt;poolinfo-&gt;poolbytes))</div><div class='add'>+			schedule_work(&amp;other-&gt;push_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -777,6 +841,7 @@ static struct crng_state **crng_node_pool __read_mostly;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void invalidate_batched_entropy(void);</div><div class='add'>+static void numa_crng_init(void);</div><div class='ctx'> </div><div class='ctx'> static bool trust_cpu __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_CPU);</div><div class='ctx'> static int __init parse_trust_cpu(char *arg)</div><div class='hunk'>@@ -805,7 +870,9 @@ static void crng_initialize(struct crng_state *crng)</div><div class='ctx'> 		}</div><div class='ctx'> 		crng-&gt;state[i] ^= rv;</div><div class='ctx'> 	}</div><div class='del'>-	if (trust_cpu &amp;&amp; arch_init) {</div><div class='add'>+	if (trust_cpu &amp;&amp; arch_init &amp;&amp; crng == &amp;primary_crng) {</div><div class='add'>+		invalidate_batched_entropy();</div><div class='add'>+		numa_crng_init();</div><div class='ctx'> 		crng_init = 2;</div><div class='ctx'> 		pr_notice("random: crng done (trusting CPU's manufacturer)\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1553,6 +1620,11 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,</div><div class='ctx'> 	int large_request = (nbytes &gt; 256);</div><div class='ctx'> </div><div class='ctx'> 	trace_extract_entropy_user(r-&gt;name, nbytes, ENTROPY_BITS(r), _RET_IP_);</div><div class='add'>+	if (!r-&gt;initialized &amp;&amp; r-&gt;pull) {</div><div class='add'>+		xfer_secondary_pool(r, ENTROPY_BITS(r-&gt;pull)/8);</div><div class='add'>+		if (!r-&gt;initialized)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> 	xfer_secondary_pool(r, nbytes);</div><div class='ctx'> 	nbytes = account(r, nbytes, 0, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1783,7 +1855,7 @@ EXPORT_SYMBOL(get_random_bytes_arch);</div><div class='ctx'>  * data into the pool to prepare it for use. The pool is not cleared</div><div class='ctx'>  * as that can only decrease the entropy in the pool.</div><div class='ctx'>  */</div><div class='del'>-static void init_std_data(struct entropy_store *r)</div><div class='add'>+static void __init init_std_data(struct entropy_store *r)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	ktime_t now = ktime_get_real();</div><div class='hunk'>@@ -1810,7 +1882,7 @@ static void init_std_data(struct entropy_store *r)</div><div class='ctx'>  * take care not to overwrite the precious per platform data</div><div class='ctx'>  * we were given.</div><div class='ctx'>  */</div><div class='del'>-static int rand_initialize(void)</div><div class='add'>+int __init rand_initialize(void)</div><div class='ctx'> {</div><div class='ctx'> 	init_std_data(&amp;input_pool);</div><div class='ctx'> 	init_std_data(&amp;blocking_pool);</div><div class='hunk'>@@ -1822,7 +1894,6 @@ static int rand_initialize(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-early_initcall(rand_initialize);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> void rand_initialize_disk(struct gendisk *disk)</div><div class='hunk'>@@ -2211,8 +2282,8 @@ struct batched_entropy {</div><div class='ctx'> 		u32 entropy_u32[CHACHA_BLOCK_SIZE / sizeof(u32)];</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int position;</div><div class='add'>+	spinlock_t batch_lock;</div><div class='ctx'> };</div><div class='del'>-static rwlock_t batched_entropy_reset_lock = __RW_LOCK_UNLOCKED(batched_entropy_reset_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Get a random word for internal kernel use only. The quality of the random</div><div class='hunk'>@@ -2222,12 +2293,14 @@ static rwlock_t batched_entropy_reset_lock = __RW_LOCK_UNLOCKED(batched_entropy_</div><div class='ctx'>  * wait_for_random_bytes() should be called and return 0 at least once</div><div class='ctx'>  * at any point prior.</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64);</div><div class='add'>+static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64) = {</div><div class='add'>+	.batch_lock	= __SPIN_LOCK_UNLOCKED(batched_entropy_u64.lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> u64 get_random_u64(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 ret;</div><div class='del'>-	bool use_lock;</div><div class='del'>-	unsigned long flags = 0;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct batched_entropy *batch;</div><div class='ctx'> 	static void *previous;</div><div class='ctx'> </div><div class='hunk'>@@ -2242,28 +2315,25 @@ u64 get_random_u64(void)</div><div class='ctx'> </div><div class='ctx'> 	warn_unseeded_randomness(&amp;previous);</div><div class='ctx'> </div><div class='del'>-	use_lock = READ_ONCE(crng_init) &lt; 2;</div><div class='del'>-	batch = &amp;get_cpu_var(batched_entropy_u64);</div><div class='del'>-	if (use_lock)</div><div class='del'>-		read_lock_irqsave(&amp;batched_entropy_reset_lock, flags);</div><div class='add'>+	batch = raw_cpu_ptr(&amp;batched_entropy_u64);</div><div class='add'>+	spin_lock_irqsave(&amp;batch-&gt;batch_lock, flags);</div><div class='ctx'> 	if (batch-&gt;position % ARRAY_SIZE(batch-&gt;entropy_u64) == 0) {</div><div class='ctx'> 		extract_crng((u8 *)batch-&gt;entropy_u64);</div><div class='ctx'> 		batch-&gt;position = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = batch-&gt;entropy_u64[batch-&gt;position++];</div><div class='del'>-	if (use_lock)</div><div class='del'>-		read_unlock_irqrestore(&amp;batched_entropy_reset_lock, flags);</div><div class='del'>-	put_cpu_var(batched_entropy_u64);</div><div class='add'>+	spin_unlock_irqrestore(&amp;batch-&gt;batch_lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(get_random_u64);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32);</div><div class='add'>+static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32) = {</div><div class='add'>+	.batch_lock	= __SPIN_LOCK_UNLOCKED(batched_entropy_u32.lock),</div><div class='add'>+};</div><div class='ctx'> u32 get_random_u32(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ret;</div><div class='del'>-	bool use_lock;</div><div class='del'>-	unsigned long flags = 0;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct batched_entropy *batch;</div><div class='ctx'> 	static void *previous;</div><div class='ctx'> </div><div class='hunk'>@@ -2272,18 +2342,14 @@ u32 get_random_u32(void)</div><div class='ctx'> </div><div class='ctx'> 	warn_unseeded_randomness(&amp;previous);</div><div class='ctx'> </div><div class='del'>-	use_lock = READ_ONCE(crng_init) &lt; 2;</div><div class='del'>-	batch = &amp;get_cpu_var(batched_entropy_u32);</div><div class='del'>-	if (use_lock)</div><div class='del'>-		read_lock_irqsave(&amp;batched_entropy_reset_lock, flags);</div><div class='add'>+	batch = raw_cpu_ptr(&amp;batched_entropy_u32);</div><div class='add'>+	spin_lock_irqsave(&amp;batch-&gt;batch_lock, flags);</div><div class='ctx'> 	if (batch-&gt;position % ARRAY_SIZE(batch-&gt;entropy_u32) == 0) {</div><div class='ctx'> 		extract_crng((u8 *)batch-&gt;entropy_u32);</div><div class='ctx'> 		batch-&gt;position = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = batch-&gt;entropy_u32[batch-&gt;position++];</div><div class='del'>-	if (use_lock)</div><div class='del'>-		read_unlock_irqrestore(&amp;batched_entropy_reset_lock, flags);</div><div class='del'>-	put_cpu_var(batched_entropy_u32);</div><div class='add'>+	spin_unlock_irqrestore(&amp;batch-&gt;batch_lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(get_random_u32);</div><div class='hunk'>@@ -2297,12 +2363,19 @@ static void invalidate_batched_entropy(void)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	write_lock_irqsave(&amp;batched_entropy_reset_lock, flags);</div><div class='ctx'> 	for_each_possible_cpu (cpu) {</div><div class='del'>-		per_cpu_ptr(&amp;batched_entropy_u32, cpu)-&gt;position = 0;</div><div class='del'>-		per_cpu_ptr(&amp;batched_entropy_u64, cpu)-&gt;position = 0;</div><div class='add'>+		struct batched_entropy *batched_entropy;</div><div class='add'>+</div><div class='add'>+		batched_entropy = per_cpu_ptr(&amp;batched_entropy_u32, cpu);</div><div class='add'>+		spin_lock_irqsave(&amp;batched_entropy-&gt;batch_lock, flags);</div><div class='add'>+		batched_entropy-&gt;position = 0;</div><div class='add'>+		spin_unlock(&amp;batched_entropy-&gt;batch_lock);</div><div class='add'>+</div><div class='add'>+		batched_entropy = per_cpu_ptr(&amp;batched_entropy_u64, cpu);</div><div class='add'>+		spin_lock(&amp;batched_entropy-&gt;batch_lock);</div><div class='add'>+		batched_entropy-&gt;position = 0;</div><div class='add'>+		spin_unlock_irqrestore(&amp;batched_entropy-&gt;batch_lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_irqrestore(&amp;batched_entropy_reset_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c<br/>index 7c19d9b22785..e8614ea843e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tb0219.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tb0219.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tb0219.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/tb0219.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static int tanbac_tb0219_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	case 16 ... 23:</div><div class='ctx'> 	case 32 ... 39:</div><div class='ctx'> 	case 48 ... 55:</div><div class='del'>-		return nonseekable_open(inode, file);</div><div class='add'>+		return stream_open(inode, file);</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig<br/>index 536e55d3919f..f3e4bc490cf0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/tpm/Kconfig</a></div><div class='hunk'>@@ -157,7 +157,6 @@ config TCG_CRB</div><div class='ctx'> config TCG_VTPM_PROXY</div><div class='ctx'> 	tristate "VTPM Proxy Interface"</div><div class='ctx'> 	depends on TCG_TPM</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver proxies for an emulated TPM (vTPM) running in userspace.</div><div class='ctx'> 	  A device /dev/vtpmx is provided that creates a device pair</div><div class='head'>diff --git a/drivers/char/tpm/eventlog/tpm2.c b/drivers/char/tpm/eventlog/tpm2.c<br/>index d8b77133a83a..f824563fc28d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/eventlog/tpm2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/eventlog/tpm2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/eventlog/tpm2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/tpm/eventlog/tpm2.c</a></div><div class='hunk'>@@ -37,8 +37,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Returns size of the event. If it is an invalid event, returns 0.</div><div class='ctx'>  */</div><div class='del'>-static int calc_tpm2_event_size(struct tcg_pcr_event2_head *event,</div><div class='del'>-				struct tcg_pcr_event *event_header)</div><div class='add'>+static size_t calc_tpm2_event_size(struct tcg_pcr_event2_head *event,</div><div class='add'>+				   struct tcg_pcr_event *event_header)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcg_efi_specid_event_head *efispecid;</div><div class='ctx'> 	struct tcg_event_field *event_field;</div><div class='head'>diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c<br/>index 8856cce5a23b..817ae09a369e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/tpm-dev-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/tpm-dev-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/tpm-dev-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/tpm/tpm-dev-common.c</a></div><div class='hunk'>@@ -233,12 +233,19 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait)</div><div class='ctx'> 	__poll_t mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	poll_wait(file, &amp;priv-&gt;async_wait, wait);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;buffer_mutex);</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;response_read || priv-&gt;response_length)</div><div class='add'>+	/*</div><div class='add'>+	 * The response_length indicates if there is still response</div><div class='add'>+	 * (or part of it) to be consumed. Partial reads decrease it</div><div class='add'>+	 * by the number of bytes read, and write resets it the zero.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;response_length)</div><div class='ctx'> 		mask = EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	else</div><div class='ctx'> 		mask = EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;priv-&gt;buffer_mutex);</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c<br/>index 83ece5639f86..ae1030c9b086 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/tpm-interface.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/tpm/tpm-interface.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/tpm/tpm-interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/tpm/tpm-interface.c</a></div><div class='hunk'>@@ -402,15 +402,13 @@ int tpm_pm_suspend(struct device *dev)</div><div class='ctx'> 	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_ALWAYS_POWERED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2) {</div><div class='del'>-		mutex_lock(&amp;chip-&gt;tpm_mutex);</div><div class='del'>-		if (!tpm_chip_start(chip)) {</div><div class='add'>+	if (!tpm_chip_start(chip)) {</div><div class='add'>+		if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='ctx'> 			tpm2_shutdown(chip, TPM2_SU_STATE);</div><div class='del'>-			tpm_chip_stop(chip);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;tpm_mutex);</div><div class='del'>-	} else {</div><div class='del'>-		rc = tpm1_pm_suspend(chip, tpm_suspend_pcr);</div><div class='add'>+		else</div><div class='add'>+			rc = tpm1_pm_suspend(chip, tpm_suspend_pcr);</div><div class='add'>+</div><div class='add'>+		tpm_chip_stop(chip);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c<br/>index fbeb71953526..05dbfdb9f4af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/virtio_console.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/char/virtio_console.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/char/virtio_console.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/char/virtio_console.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ struct ports_driver_data {</div><div class='ctx'> 	/* All the console devices handled by this driver */</div><div class='ctx'> 	struct list_head consoles;</div><div class='ctx'> };</div><div class='del'>-static struct ports_driver_data pdrvdata;</div><div class='add'>+static struct ports_driver_data pdrvdata = { .next_vtermno = 1};</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(pdrvdata_lock);</div><div class='ctx'> static DECLARE_COMPLETION(early_console_added);</div><div class='hunk'>@@ -1394,6 +1394,7 @@ static int add_port(struct ports_device *portdev, u32 id)</div><div class='ctx'> 	port-&gt;async_queue = NULL;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;cons.ws.ws_row = port-&gt;cons.ws.ws_col = 0;</div><div class='add'>+	port-&gt;cons.vtermno = 0;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;host_connected = port-&gt;guest_connected = false;</div><div class='ctx'> 	port-&gt;stats = (struct port_stats) { 0 };</div><div class='head'>diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c<br/>index 89d6f3736dbf..f8edbb65eda3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/at91/clk-programmable.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/at91/clk-programmable.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/at91/clk-programmable.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/at91/clk-programmable.c</a></div><div class='hunk'>@@ -20,8 +20,7 @@</div><div class='ctx'> #define PROG_ID_MAX		7</div><div class='ctx'> </div><div class='ctx'> #define PROG_STATUS_MASK(id)	(1 &lt;&lt; ((id) + 8))</div><div class='del'>-#define PROG_PRES_MASK		0x7</div><div class='del'>-#define PROG_PRES(layout, pckr)	((pckr &gt;&gt; layout-&gt;pres_shift) &amp; PROG_PRES_MASK)</div><div class='add'>+#define PROG_PRES(layout, pckr)	((pckr &gt;&gt; layout-&gt;pres_shift) &amp; layout-&gt;pres_mask)</div><div class='ctx'> #define PROG_MAX_RM9200_CSS	3</div><div class='ctx'> </div><div class='ctx'> struct clk_programmable {</div><div class='hunk'>@@ -37,20 +36,29 @@ static unsigned long clk_programmable_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 						  unsigned long parent_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_programmable *prog = to_clk_programmable(hw);</div><div class='add'>+	const struct clk_programmable_layout *layout = prog-&gt;layout;</div><div class='ctx'> 	unsigned int pckr;</div><div class='add'>+	unsigned long rate;</div><div class='ctx'> </div><div class='ctx'> 	regmap_read(prog-&gt;regmap, AT91_PMC_PCKR(prog-&gt;id), &amp;pckr);</div><div class='ctx'> </div><div class='del'>-	return parent_rate &gt;&gt; PROG_PRES(prog-&gt;layout, pckr);</div><div class='add'>+	if (layout-&gt;is_pres_direct)</div><div class='add'>+		rate = parent_rate / (PROG_PRES(layout, pckr) + 1);</div><div class='add'>+	else</div><div class='add'>+		rate = parent_rate &gt;&gt; PROG_PRES(layout, pckr);</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int clk_programmable_determine_rate(struct clk_hw *hw,</div><div class='ctx'> 					   struct clk_rate_request *req)</div><div class='ctx'> {</div><div class='add'>+	struct clk_programmable *prog = to_clk_programmable(hw);</div><div class='add'>+	const struct clk_programmable_layout *layout = prog-&gt;layout;</div><div class='ctx'> 	struct clk_hw *parent;</div><div class='ctx'> 	long best_rate = -EINVAL;</div><div class='ctx'> 	unsigned long parent_rate;</div><div class='del'>-	unsigned long tmp_rate;</div><div class='add'>+	unsigned long tmp_rate = 0;</div><div class='ctx'> 	int shift;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -60,10 +68,18 @@ static int clk_programmable_determine_rate(struct clk_hw *hw,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		parent_rate = clk_hw_get_rate(parent);</div><div class='del'>-		for (shift = 0; shift &lt; PROG_PRES_MASK; shift++) {</div><div class='del'>-			tmp_rate = parent_rate &gt;&gt; shift;</div><div class='del'>-			if (tmp_rate &lt;= req-&gt;rate)</div><div class='del'>-				break;</div><div class='add'>+		if (layout-&gt;is_pres_direct) {</div><div class='add'>+			for (shift = 0; shift &lt;= layout-&gt;pres_mask; shift++) {</div><div class='add'>+				tmp_rate = parent_rate / (shift + 1);</div><div class='add'>+				if (tmp_rate &lt;= req-&gt;rate)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			for (shift = 0; shift &lt; layout-&gt;pres_mask; shift++) {</div><div class='add'>+				tmp_rate = parent_rate &gt;&gt; shift;</div><div class='add'>+				if (tmp_rate &lt;= req-&gt;rate)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tmp_rate &gt; req-&gt;rate)</div><div class='hunk'>@@ -137,16 +153,23 @@ static int clk_programmable_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	if (!div)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	shift = fls(div) - 1;</div><div class='add'>+	if (layout-&gt;is_pres_direct) {</div><div class='add'>+		shift = div - 1;</div><div class='ctx'> </div><div class='del'>-	if (div != (1 &lt;&lt; shift))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		if (shift &gt; layout-&gt;pres_mask)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		shift = fls(div) - 1;</div><div class='ctx'> </div><div class='del'>-	if (shift &gt;= PROG_PRES_MASK)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		if (div != (1 &lt;&lt; shift))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (shift &gt;= layout-&gt;pres_mask)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	regmap_update_bits(prog-&gt;regmap, AT91_PMC_PCKR(prog-&gt;id),</div><div class='del'>-			   PROG_PRES_MASK &lt;&lt; layout-&gt;pres_shift,</div><div class='add'>+			   layout-&gt;pres_mask &lt;&lt; layout-&gt;pres_shift,</div><div class='ctx'> 			   shift &lt;&lt; layout-&gt;pres_shift);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -202,19 +225,25 @@ at91_clk_register_programmable(struct regmap *regmap,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct clk_programmable_layout at91rm9200_programmable_layout = {</div><div class='add'>+	.pres_mask = 0x7,</div><div class='ctx'> 	.pres_shift = 2,</div><div class='ctx'> 	.css_mask = 0x3,</div><div class='ctx'> 	.have_slck_mck = 0,</div><div class='add'>+	.is_pres_direct = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct clk_programmable_layout at91sam9g45_programmable_layout = {</div><div class='add'>+	.pres_mask = 0x7,</div><div class='ctx'> 	.pres_shift = 2,</div><div class='ctx'> 	.css_mask = 0x3,</div><div class='ctx'> 	.have_slck_mck = 1,</div><div class='add'>+	.is_pres_direct = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct clk_programmable_layout at91sam9x5_programmable_layout = {</div><div class='add'>+	.pres_mask = 0x7,</div><div class='ctx'> 	.pres_shift = 4,</div><div class='ctx'> 	.css_mask = 0x7,</div><div class='ctx'> 	.have_slck_mck = 0,</div><div class='add'>+	.is_pres_direct = 0,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h<br/>index 672a79bda88c..a0e5ce9c9b9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/at91/pmc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/at91/pmc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/at91/pmc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/at91/pmc.h</a></div><div class='hunk'>@@ -71,9 +71,11 @@ struct clk_pll_characteristics {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct clk_programmable_layout {</div><div class='add'>+	u8 pres_mask;</div><div class='ctx'> 	u8 pres_shift;</div><div class='ctx'> 	u8 css_mask;</div><div class='ctx'> 	u8 have_slck_mck;</div><div class='add'>+	u8 is_pres_direct;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct clk_programmable_layout at91rm9200_programmable_layout;</div><div class='head'>diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c<br/>index 1f70cb164b06..81943fac4537 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/at91/sama5d2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/at91/sama5d2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/at91/sama5d2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/at91/sama5d2.c</a></div><div class='hunk'>@@ -125,6 +125,14 @@ static const struct {</div><div class='ctx'> 	  .pll = true },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct clk_programmable_layout sama5d2_programmable_layout = {</div><div class='add'>+	.pres_mask = 0xff,</div><div class='add'>+	.pres_shift = 4,</div><div class='add'>+	.css_mask = 0x7,</div><div class='add'>+	.have_slck_mck = 0,</div><div class='add'>+	.is_pres_direct = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init sama5d2_pmc_setup(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_range range = CLK_RANGE(0, 0);</div><div class='hunk'>@@ -249,7 +257,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 		hw = at91_clk_register_programmable(regmap, name,</div><div class='ctx'> 						    parent_names, 6, i,</div><div class='del'>-						    &amp;at91sam9x5_programmable_layout);</div><div class='add'>+						    &amp;sama5d2_programmable_layout);</div><div class='ctx'> 		if (IS_ERR(hw))</div><div class='ctx'> 			goto err_free;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c<br/>index 8c4435c53f09..6e787cc9e5b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/clkdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/clkdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/clkdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/clkdev.c</a></div><div class='hunk'>@@ -46,6 +46,8 @@ static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)</div><div class='ctx'> 	if (con_id)</div><div class='ctx'> 		best_possible += 1;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;clocks_mutex);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(p, &amp;clocks, node) {</div><div class='ctx'> 		match = 0;</div><div class='ctx'> 		if (p-&gt;dev_id) {</div><div class='hunk'>@@ -402,7 +404,10 @@ void devm_clk_release_clkdev(struct device *dev, const char *con_id,</div><div class='ctx'> 	struct clk_lookup *cl;</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;clocks_mutex);</div><div class='ctx'> 	cl = clk_find(dev_id, con_id);</div><div class='add'>+	mutex_unlock(&amp;clocks_mutex);</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(!cl);</div><div class='ctx'> 	rval = devres_release(dev, devm_clkdev_release,</div><div class='ctx'> 			      devm_clk_match_clkdev, cl);</div><div class='head'>diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c<br/>index 1acfa3e3cfb4..113d71042199 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/imx/clk-pll14xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/imx/clk-pll14xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/imx/clk-pll14xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/imx/clk-pll14xx.c</a></div><div class='hunk'>@@ -362,7 +362,7 @@ struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,</div><div class='ctx'> </div><div class='ctx'> 	switch (pll_clk-&gt;type) {</div><div class='ctx'> 	case PLL_1416X:</div><div class='del'>-		if (!pll-&gt;rate_table)</div><div class='add'>+		if (!pll_clk-&gt;rate_table)</div><div class='ctx'> 			init.ops = &amp;clk_pll1416x_min_ops;</div><div class='ctx'> 		else</div><div class='ctx'> 			init.ops = &amp;clk_pll1416x_ops;</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-gate.c b/drivers/clk/mediatek/clk-gate.c<br/>index 9628d4e7690b..85daf826619a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/mediatek/clk-gate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/mediatek/clk-gate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/mediatek/clk-gate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/mediatek/clk-gate.c</a></div><div class='hunk'>@@ -169,11 +169,10 @@ struct clk *mtk_clk_register_gate(</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	init.name = name;</div><div class='del'>-	init.flags = CLK_SET_RATE_PARENT;</div><div class='add'>+	init.flags = flags | CLK_SET_RATE_PARENT;</div><div class='ctx'> 	init.parent_names = parent_name ? &amp;parent_name : NULL;</div><div class='ctx'> 	init.num_parents = parent_name ? 1 : 0;</div><div class='ctx'> 	init.ops = ops;</div><div class='del'>-	init.flags = flags;</div><div class='ctx'> </div><div class='ctx'> 	cg-&gt;regmap = regmap;</div><div class='ctx'> 	cg-&gt;set_ofs = set_ofs;</div><div class='head'>diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c<br/>index 41e16dd7272a..7a14ac9b2fec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/clk-pll.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/clk-pll.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/clk-pll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/meson/clk-pll.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ static bool meson_clk_pll_is_better(unsigned long rate,</div><div class='ctx'> 			return true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Round down */</div><div class='del'>-		if (now &lt; rate &amp;&amp; best &lt; now)</div><div class='add'>+		if (now &lt;= rate &amp;&amp; best &lt; now)</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c<br/>index 0e1ce8c03259..f7b11e1eeebe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/g12a.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/g12a.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/meson/g12a.c</a></div><div class='hunk'>@@ -960,14 +960,14 @@ static struct clk_regmap g12a_sd_emmc_c_clk0 = {</div><div class='ctx'> /* VPU Clock */</div><div class='ctx'> </div><div class='ctx'> static const char * const g12a_vpu_parent_names[] = {</div><div class='del'>-	"fclk_div4", "fclk_div3", "fclk_div5", "fclk_div7",</div><div class='add'>+	"fclk_div3", "fclk_div4", "fclk_div5", "fclk_div7",</div><div class='ctx'> 	"mpll1", "vid_pll", "hifi_pll", "gp0_pll",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_regmap g12a_vpu_0_sel = {</div><div class='ctx'> 	.data = &amp;(struct clk_regmap_mux_data){</div><div class='ctx'> 		.offset = HHI_VPU_CLK_CNTL,</div><div class='del'>-		.mask = 0x3,</div><div class='add'>+		.mask = 0x7,</div><div class='ctx'> 		.shift = 9,</div><div class='ctx'> 	},</div><div class='ctx'> 	.hw.init = &amp;(struct clk_init_data){</div><div class='hunk'>@@ -1011,7 +1011,7 @@ static struct clk_regmap g12a_vpu_0 = {</div><div class='ctx'> static struct clk_regmap g12a_vpu_1_sel = {</div><div class='ctx'> 	.data = &amp;(struct clk_regmap_mux_data){</div><div class='ctx'> 		.offset = HHI_VPU_CLK_CNTL,</div><div class='del'>-		.mask = 0x3,</div><div class='add'>+		.mask = 0x7,</div><div class='ctx'> 		.shift = 25,</div><div class='ctx'> 	},</div><div class='ctx'> 	.hw.init = &amp;(struct clk_init_data){</div><div class='head'>diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c<br/>index 04df2e208ed6..29ffb4fde714 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/gxbb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/gxbb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/gxbb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/meson/gxbb.c</a></div><div class='hunk'>@@ -2216,6 +2216,7 @@ static struct clk_regmap gxbb_vdec_1_div = {</div><div class='ctx'> 		.offset = HHI_VDEC_CLK_CNTL,</div><div class='ctx'> 		.shift = 0,</div><div class='ctx'> 		.width = 7,</div><div class='add'>+		.flags = CLK_DIVIDER_ROUND_CLOSEST,</div><div class='ctx'> 	},</div><div class='ctx'> 	.hw.init = &amp;(struct clk_init_data){</div><div class='ctx'> 		.name = "vdec_1_div",</div><div class='hunk'>@@ -2261,6 +2262,7 @@ static struct clk_regmap gxbb_vdec_hevc_div = {</div><div class='ctx'> 		.offset = HHI_VDEC2_CLK_CNTL,</div><div class='ctx'> 		.shift = 16,</div><div class='ctx'> 		.width = 7,</div><div class='add'>+		.flags = CLK_DIVIDER_ROUND_CLOSEST,</div><div class='ctx'> 	},</div><div class='ctx'> 	.hw.init = &amp;(struct clk_init_data){</div><div class='ctx'> 		.name = "vdec_hevc_div",</div><div class='head'>diff --git a/drivers/clk/meson/vid-pll-div.c b/drivers/clk/meson/vid-pll-div.c<br/>index 08bcc01c0923..daff235bc763 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/vid-pll-div.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/meson/vid-pll-div.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/meson/vid-pll-div.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/meson/vid-pll-div.c</a></div><div class='hunk'>@@ -82,8 +82,8 @@ static unsigned long meson_vid_pll_div_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 	div = _get_table_val(meson_parm_read(clk-&gt;map, &amp;pll_div-&gt;val),</div><div class='ctx'> 			     meson_parm_read(clk-&gt;map, &amp;pll_div-&gt;sel));</div><div class='ctx'> 	if (!div || !div-&gt;divider) {</div><div class='del'>-		pr_info("%s: Invalid config value for vid_pll_div\n", __func__);</div><div class='del'>-		return parent_rate;</div><div class='add'>+		pr_debug("%s: Invalid config value for vid_pll_div\n", __func__);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return DIV_ROUND_UP_ULL(parent_rate * div-&gt;multiplier, div-&gt;divider);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c<br/>index 9b49adb20d07..cbcdf664f336 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/sunxi-ng/ccu_nkmp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/sunxi-ng/ccu_nkmp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/sunxi-ng/ccu_nkmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/sunxi-ng/ccu_nkmp.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 			   unsigned long parent_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);</div><div class='del'>-	u32 n_mask, k_mask, m_mask, p_mask;</div><div class='add'>+	u32 n_mask = 0, k_mask = 0, m_mask = 0, p_mask = 0;</div><div class='ctx'> 	struct _ccu_nkmp _nkmp;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -186,10 +186,24 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> </div><div class='ctx'> 	ccu_nkmp_find_best(parent_rate, rate, &amp;_nkmp);</div><div class='ctx'> </div><div class='del'>-	n_mask = GENMASK(nkmp-&gt;n.width + nkmp-&gt;n.shift - 1, nkmp-&gt;n.shift);</div><div class='del'>-	k_mask = GENMASK(nkmp-&gt;k.width + nkmp-&gt;k.shift - 1, nkmp-&gt;k.shift);</div><div class='del'>-	m_mask = GENMASK(nkmp-&gt;m.width + nkmp-&gt;m.shift - 1, nkmp-&gt;m.shift);</div><div class='del'>-	p_mask = GENMASK(nkmp-&gt;p.width + nkmp-&gt;p.shift - 1, nkmp-&gt;p.shift);</div><div class='add'>+	/*</div><div class='add'>+	 * If width is 0, GENMASK() macro may not generate expected mask (0)</div><div class='add'>+	 * as it falls under undefined behaviour by C standard due to shifts</div><div class='add'>+	 * which are equal or greater than width of left operand. This can</div><div class='add'>+	 * be easily avoided by explicitly checking if width is 0.</div><div class='add'>+	 */</div><div class='add'>+	if (nkmp-&gt;n.width)</div><div class='add'>+		n_mask = GENMASK(nkmp-&gt;n.width + nkmp-&gt;n.shift - 1,</div><div class='add'>+				 nkmp-&gt;n.shift);</div><div class='add'>+	if (nkmp-&gt;k.width)</div><div class='add'>+		k_mask = GENMASK(nkmp-&gt;k.width + nkmp-&gt;k.shift - 1,</div><div class='add'>+				 nkmp-&gt;k.shift);</div><div class='add'>+	if (nkmp-&gt;m.width)</div><div class='add'>+		m_mask = GENMASK(nkmp-&gt;m.width + nkmp-&gt;m.shift - 1,</div><div class='add'>+				 nkmp-&gt;m.shift);</div><div class='add'>+	if (nkmp-&gt;p.width)</div><div class='add'>+		p_mask = GENMASK(nkmp-&gt;p.width + nkmp-&gt;p.shift - 1,</div><div class='add'>+				 nkmp-&gt;p.shift);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(nkmp-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/x86/clk-pmc-atom.c b/drivers/clk/x86/clk-pmc-atom.c<br/>index d977193842df..19174835693b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/x86/clk-pmc-atom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clk/x86/clk-pmc-atom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clk/x86/clk-pmc-atom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clk/x86/clk-pmc-atom.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static const struct clk_ops plt_clk_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id,</div><div class='del'>-					void __iomem *base,</div><div class='add'>+					const struct pmc_clk_data *pmc_data,</div><div class='ctx'> 					const char **parent_names,</div><div class='ctx'> 					int num_parents)</div><div class='ctx'> {</div><div class='hunk'>@@ -184,9 +184,17 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id,</div><div class='ctx'> 	init.num_parents = num_parents;</div><div class='ctx'> </div><div class='ctx'> 	pclk-&gt;hw.init = &amp;init;</div><div class='del'>-	pclk-&gt;reg = base + PMC_CLK_CTL_OFFSET + id * PMC_CLK_CTL_SIZE;</div><div class='add'>+	pclk-&gt;reg = pmc_data-&gt;base + PMC_CLK_CTL_OFFSET + id * PMC_CLK_CTL_SIZE;</div><div class='ctx'> 	spin_lock_init(&amp;pclk-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * On some systems, the pmc_plt_clocks already enabled by the</div><div class='add'>+	 * firmware are being marked as critical to avoid them being</div><div class='add'>+	 * gated by the clock framework.</div><div class='add'>+	 */</div><div class='add'>+	if (pmc_data-&gt;critical &amp;&amp; plt_clk_is_enabled(&amp;pclk-&gt;hw))</div><div class='add'>+		init.flags |= CLK_IS_CRITICAL;</div><div class='add'>+</div><div class='ctx'> 	ret = devm_clk_hw_register(&amp;pdev-&gt;dev, &amp;pclk-&gt;hw);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pclk = ERR_PTR(ret);</div><div class='hunk'>@@ -332,7 +340,7 @@ static int plt_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 		return PTR_ERR(parent_names);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PMC_CLK_NUM; i++) {</div><div class='del'>-		data-&gt;clks[i] = plt_clk_register(pdev, i, pmc_data-&gt;base,</div><div class='add'>+		data-&gt;clks[i] = plt_clk_register(pdev, i, pmc_data,</div><div class='ctx'> 						 parent_names, data-&gt;nparents);</div><div class='ctx'> 		if (IS_ERR(data-&gt;clks[i])) {</div><div class='ctx'> 			err = PTR_ERR(data-&gt;clks[i]);</div><div class='head'>diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig<br/>index 171502a356aa..4b3d143f0f8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/Kconfig</a></div><div class='hunk'>@@ -145,6 +145,7 @@ config VT8500_TIMER</div><div class='ctx'> config NPCM7XX_TIMER</div><div class='ctx'> 	bool "NPCM7xx timer driver" if COMPILE_TEST</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='add'>+	select TIMER_OF</div><div class='ctx'> 	select CLKSRC_MMIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable 24-bit TIMER0 and TIMER1 counters in the NPCM7xx architecture,</div><div class='head'>diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c<br/>index aa4ec53281ce..b2a951a798e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/arm_arch_timer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/arm_arch_timer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/arm_arch_timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/arm_arch_timer.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define pr_fmt(fmt)	"arm_arch_timer: " fmt</div><div class='add'>+#define pr_fmt(fmt) 	"arch_timer: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -33,9 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;clocksource/arm_arch_timer.h&gt;</div><div class='ctx'> </div><div class='del'>-#undef pr_fmt</div><div class='del'>-#define pr_fmt(fmt) "arch_timer: " fmt</div><div class='del'>-</div><div class='ctx'> #define CNTTIDR		0x08</div><div class='ctx'> #define CNTTIDR_VIRT(n)	(BIT(1) &lt;&lt; ((n) * 4))</div><div class='ctx'> </div><div class='hunk'>@@ -152,6 +149,26 @@ u32 arch_timer_reg_read(int access, enum arch_timer_reg reg,</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 arch_counter_get_cntpct_stable(void)</div><div class='add'>+{</div><div class='add'>+	return __arch_counter_get_cntpct_stable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 arch_counter_get_cntpct(void)</div><div class='add'>+{</div><div class='add'>+	return __arch_counter_get_cntpct();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 arch_counter_get_cntvct_stable(void)</div><div class='add'>+{</div><div class='add'>+	return __arch_counter_get_cntvct_stable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 arch_counter_get_cntvct(void)</div><div class='add'>+{</div><div class='add'>+	return __arch_counter_get_cntvct();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Default to cp15 based access because arm64 uses this function for</div><div class='ctx'>  * sched_clock() before DT is probed and the cp15 method is guaranteed</div><div class='hunk'>@@ -319,13 +336,6 @@ static u64 notrace arm64_858921_read_cntvct_el0(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM64_ERRATUM_1188873</div><div class='del'>-static u64 notrace arm64_1188873_read_cntvct_el0(void)</div><div class='del'>-{</div><div class='del'>-	return read_sysreg(cntvct_el0);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1</div><div class='ctx'> /*</div><div class='ctx'>  * The low bits of the counter registers are indeterminate while bit 10 or</div><div class='hunk'>@@ -372,8 +382,7 @@ static u32 notrace sun50i_a64_read_cntv_tval_el0(void)</div><div class='ctx'> DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *, timer_unstable_counter_workaround);</div><div class='ctx'> EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround);</div><div class='ctx'> </div><div class='del'>-DEFINE_STATIC_KEY_FALSE(arch_timer_read_ool_enabled);</div><div class='del'>-EXPORT_SYMBOL_GPL(arch_timer_read_ool_enabled);</div><div class='add'>+static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> static void erratum_set_next_event_tval_generic(const int access, unsigned long evt,</div><div class='ctx'> 						struct clock_event_device *clk)</div><div class='hunk'>@@ -457,14 +466,6 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {</div><div class='ctx'> 		.read_cntvct_el0 = arm64_858921_read_cntvct_el0,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_ARM64_ERRATUM_1188873</div><div class='del'>-	{</div><div class='del'>-		.match_type = ate_match_local_cap_id,</div><div class='del'>-		.id = (void *)ARM64_WORKAROUND_1188873,</div><div class='del'>-		.desc = "ARM erratum 1188873",</div><div class='del'>-		.read_cntvct_el0 = arm64_1188873_read_cntvct_el0,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1</div><div class='ctx'> 	{</div><div class='ctx'> 		.match_type = ate_match_dt,</div><div class='hunk'>@@ -552,11 +553,8 @@ void arch_timer_enable_workaround(const struct arch_timer_erratum_workaround *wa</div><div class='ctx'> 			per_cpu(timer_unstable_counter_workaround, i) = wa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Use the locked version, as we're called from the CPU</div><div class='del'>-	 * hotplug framework. Otherwise, we end-up in deadlock-land.</div><div class='del'>-	 */</div><div class='del'>-	static_branch_enable_cpuslocked(&amp;arch_timer_read_ool_enabled);</div><div class='add'>+	if (wa-&gt;read_cntvct_el0 || wa-&gt;read_cntpct_el0)</div><div class='add'>+		atomic_set(&amp;timer_unstable_counter_workaround_in_use, 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't use the vdso fastpath if errata require using the</div><div class='hunk'>@@ -573,7 +571,7 @@ void arch_timer_enable_workaround(const struct arch_timer_erratum_workaround *wa</div><div class='ctx'> static void arch_timer_check_ool_workaround(enum arch_timer_erratum_match_type type,</div><div class='ctx'> 					    void *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct arch_timer_erratum_workaround *wa;</div><div class='add'>+	const struct arch_timer_erratum_workaround *wa, *__wa;</div><div class='ctx'> 	ate_match_fn_t match_fn = NULL;</div><div class='ctx'> 	bool local = false;</div><div class='ctx'> </div><div class='hunk'>@@ -597,53 +595,32 @@ static void arch_timer_check_ool_workaround(enum arch_timer_erratum_match_type t</div><div class='ctx'> 	if (!wa)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (needs_unstable_timer_counter_workaround()) {</div><div class='del'>-		const struct arch_timer_erratum_workaround *__wa;</div><div class='del'>-		__wa = __this_cpu_read(timer_unstable_counter_workaround);</div><div class='del'>-		if (__wa &amp;&amp; wa != __wa)</div><div class='del'>-			pr_warn("Can't enable workaround for %s (clashes with %s\n)",</div><div class='del'>-				wa-&gt;desc, __wa-&gt;desc);</div><div class='add'>+	__wa = __this_cpu_read(timer_unstable_counter_workaround);</div><div class='add'>+	if (__wa &amp;&amp; wa != __wa)</div><div class='add'>+		pr_warn("Can't enable workaround for %s (clashes with %s\n)",</div><div class='add'>+			wa-&gt;desc, __wa-&gt;desc);</div><div class='ctx'> </div><div class='del'>-		if (__wa)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='add'>+	if (__wa)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	arch_timer_enable_workaround(wa, local);</div><div class='ctx'> 	pr_info("Enabling %s workaround for %s\n",</div><div class='ctx'> 		local ? "local" : "global", wa-&gt;desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define erratum_handler(fn, r, ...)					\</div><div class='del'>-({									\</div><div class='del'>-	bool __val;							\</div><div class='del'>-	if (needs_unstable_timer_counter_workaround()) {		\</div><div class='del'>-		const struct arch_timer_erratum_workaround *__wa;	\</div><div class='del'>-		__wa = __this_cpu_read(timer_unstable_counter_workaround); \</div><div class='del'>-		if (__wa &amp;&amp; __wa-&gt;fn) {					\</div><div class='del'>-			r = __wa-&gt;fn(__VA_ARGS__);			\</div><div class='del'>-			__val = true;					\</div><div class='del'>-		} else {						\</div><div class='del'>-			__val = false;					\</div><div class='del'>-		}							\</div><div class='del'>-	} else {							\</div><div class='del'>-		__val = false;						\</div><div class='del'>-	}								\</div><div class='del'>-	__val;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> static bool arch_timer_this_cpu_has_cntvct_wa(void)</div><div class='ctx'> {</div><div class='del'>-	const struct arch_timer_erratum_workaround *wa;</div><div class='add'>+	return has_erratum_handler(read_cntvct_el0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	wa = __this_cpu_read(timer_unstable_counter_workaround);</div><div class='del'>-	return wa &amp;&amp; wa-&gt;read_cntvct_el0;</div><div class='add'>+static bool arch_timer_counter_has_wa(void)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;timer_unstable_counter_workaround_in_use);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define arch_timer_check_ool_workaround(t,a)		do { } while(0)</div><div class='del'>-#define erratum_set_next_event_tval_virt(...)		({BUG(); 0;})</div><div class='del'>-#define erratum_set_next_event_tval_phys(...)		({BUG(); 0;})</div><div class='del'>-#define erratum_handler(fn, r, ...)			({false;})</div><div class='ctx'> #define arch_timer_this_cpu_has_cntvct_wa()		({false;})</div><div class='add'>+#define arch_timer_counter_has_wa()			({false;})</div><div class='ctx'> #endif /* CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND */</div><div class='ctx'> </div><div class='ctx'> static __always_inline irqreturn_t timer_handler(const int access,</div><div class='hunk'>@@ -736,11 +713,6 @@ static __always_inline void set_next_event(const int access, unsigned long evt,</div><div class='ctx'> static int arch_timer_set_next_event_virt(unsigned long evt,</div><div class='ctx'> 					  struct clock_event_device *clk)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (erratum_handler(set_next_event_virt, ret, evt, clk))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	set_next_event(ARCH_TIMER_VIRT_ACCESS, evt, clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -748,11 +720,6 @@ static int arch_timer_set_next_event_virt(unsigned long evt,</div><div class='ctx'> static int arch_timer_set_next_event_phys(unsigned long evt,</div><div class='ctx'> 					  struct clock_event_device *clk)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (erratum_handler(set_next_event_phys, ret, evt, clk))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	set_next_event(ARCH_TIMER_PHYS_ACCESS, evt, clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -777,6 +744,10 @@ static void __arch_timer_setup(unsigned type,</div><div class='ctx'> 	clk-&gt;features = CLOCK_EVT_FEAT_ONESHOT;</div><div class='ctx'> </div><div class='ctx'> 	if (type == ARCH_TIMER_TYPE_CP15) {</div><div class='add'>+		typeof(clk-&gt;set_next_event) sne;</div><div class='add'>+</div><div class='add'>+		arch_timer_check_ool_workaround(ate_match_local_cap_id, NULL);</div><div class='add'>+</div><div class='ctx'> 		if (arch_timer_c3stop)</div><div class='ctx'> 			clk-&gt;features |= CLOCK_EVT_FEAT_C3STOP;</div><div class='ctx'> 		clk-&gt;name = "arch_sys_timer";</div><div class='hunk'>@@ -787,20 +758,20 @@ static void __arch_timer_setup(unsigned type,</div><div class='ctx'> 		case ARCH_TIMER_VIRT_PPI:</div><div class='ctx'> 			clk-&gt;set_state_shutdown = arch_timer_shutdown_virt;</div><div class='ctx'> 			clk-&gt;set_state_oneshot_stopped = arch_timer_shutdown_virt;</div><div class='del'>-			clk-&gt;set_next_event = arch_timer_set_next_event_virt;</div><div class='add'>+			sne = erratum_handler(set_next_event_virt);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ARCH_TIMER_PHYS_SECURE_PPI:</div><div class='ctx'> 		case ARCH_TIMER_PHYS_NONSECURE_PPI:</div><div class='ctx'> 		case ARCH_TIMER_HYP_PPI:</div><div class='ctx'> 			clk-&gt;set_state_shutdown = arch_timer_shutdown_phys;</div><div class='ctx'> 			clk-&gt;set_state_oneshot_stopped = arch_timer_shutdown_phys;</div><div class='del'>-			clk-&gt;set_next_event = arch_timer_set_next_event_phys;</div><div class='add'>+			sne = erratum_handler(set_next_event_phys);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		arch_timer_check_ool_workaround(ate_match_local_cap_id, NULL);</div><div class='add'>+		clk-&gt;set_next_event = sne;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		clk-&gt;features |= CLOCK_EVT_FEAT_DYNIRQ;</div><div class='ctx'> 		clk-&gt;name = "arch_mem_timer";</div><div class='hunk'>@@ -833,7 +804,11 @@ static void arch_timer_evtstrm_enable(int divider)</div><div class='ctx'> 	cntkctl |= (divider &lt;&lt; ARCH_TIMER_EVT_TRIGGER_SHIFT)</div><div class='ctx'> 			| ARCH_TIMER_VIRT_EVT_EN;</div><div class='ctx'> 	arch_timer_set_cntkctl(cntkctl);</div><div class='add'>+#ifdef CONFIG_ARM64</div><div class='add'>+	cpu_set_named_feature(EVTSTRM);</div><div class='add'>+#else</div><div class='ctx'> 	elf_hwcap |= HWCAP_EVTSTRM;</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -998,12 +973,22 @@ static void __init arch_counter_register(unsigned type)</div><div class='ctx'> </div><div class='ctx'> 	/* Register the CP15 based counter if we have one */</div><div class='ctx'> 	if (type &amp; ARCH_TIMER_TYPE_CP15) {</div><div class='add'>+		u64 (*rd)(void);</div><div class='add'>+</div><div class='ctx'> 		if ((IS_ENABLED(CONFIG_ARM64) &amp;&amp; !is_hyp_mode_available()) ||</div><div class='del'>-		    arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)</div><div class='del'>-			arch_timer_read_counter = arch_counter_get_cntvct;</div><div class='del'>-		else</div><div class='del'>-			arch_timer_read_counter = arch_counter_get_cntpct;</div><div class='add'>+		    arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI) {</div><div class='add'>+			if (arch_timer_counter_has_wa())</div><div class='add'>+				rd = arch_counter_get_cntvct_stable;</div><div class='add'>+			else</div><div class='add'>+				rd = arch_counter_get_cntvct;</div><div class='add'>+		} else {</div><div class='add'>+			if (arch_timer_counter_has_wa())</div><div class='add'>+				rd = arch_counter_get_cntpct_stable;</div><div class='add'>+			else</div><div class='add'>+				rd = arch_counter_get_cntpct;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		arch_timer_read_counter = rd;</div><div class='ctx'> 		clocksource_counter.archdata.vdso_direct = vdso_default;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		arch_timer_read_counter = arch_counter_get_cntvct_mem;</div><div class='hunk'>@@ -1055,7 +1040,11 @@ static int arch_timer_cpu_pm_notify(struct notifier_block *self,</div><div class='ctx'> 	} else if (action == CPU_PM_ENTER_FAILED || action == CPU_PM_EXIT) {</div><div class='ctx'> 		arch_timer_set_cntkctl(__this_cpu_read(saved_cntkctl));</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM64</div><div class='add'>+		if (cpu_have_named_feature(EVTSTRM))</div><div class='add'>+#else</div><div class='ctx'> 		if (elf_hwcap &amp; HWCAP_EVTSTRM)</div><div class='add'>+#endif</div><div class='ctx'> 			cpumask_set_cpu(smp_processor_id(), &amp;evtstrm_available);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='head'>diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c<br/>index a8dd80576c95..857f8c086274 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/clps711x-timer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/clps711x-timer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/clps711x-timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/clps711x-timer.c</a></div><div class='hunk'>@@ -31,16 +31,9 @@ static u64 notrace clps711x_sched_clock_read(void)</div><div class='ctx'> 	return ~readw(tcd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init _clps711x_clksrc_init(struct clk *clock, void __iomem *base)</div><div class='add'>+static void __init clps711x_clksrc_init(struct clk *clock, void __iomem *base)</div><div class='ctx'> {</div><div class='del'>-	unsigned long rate;</div><div class='del'>-</div><div class='del'>-	if (!base)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (IS_ERR(clock))</div><div class='del'>-		return PTR_ERR(clock);</div><div class='del'>-</div><div class='del'>-	rate = clk_get_rate(clock);</div><div class='add'>+	unsigned long rate = clk_get_rate(clock);</div><div class='ctx'> </div><div class='ctx'> 	tcd = base;</div><div class='ctx'> </div><div class='hunk'>@@ -48,8 +41,6 @@ static int __init _clps711x_clksrc_init(struct clk *clock, void __iomem *base)</div><div class='ctx'> 			      clocksource_mmio_readw_down);</div><div class='ctx'> </div><div class='ctx'> 	sched_clock_register(clps711x_sched_clock_read, 16, rate);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t clps711x_timer_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -67,13 +58,6 @@ static int __init _clps711x_clkevt_init(struct clk *clock, void __iomem *base,</div><div class='ctx'> 	struct clock_event_device *clkevt;</div><div class='ctx'> 	unsigned long rate;</div><div class='ctx'> </div><div class='del'>-	if (!irq)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!base)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (IS_ERR(clock))</div><div class='del'>-		return PTR_ERR(clock);</div><div class='del'>-</div><div class='ctx'> 	clkevt = kzalloc(sizeof(*clkevt), GFP_KERNEL);</div><div class='ctx'> 	if (!clkevt)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -93,31 +77,29 @@ static int __init _clps711x_clkevt_init(struct clk *clock, void __iomem *base,</div><div class='ctx'> 			   "clps711x-timer", clkevt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base,</div><div class='del'>-				 unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct clk *tc1 = clk_get_sys("clps711x-timer.0", NULL);</div><div class='del'>-	struct clk *tc2 = clk_get_sys("clps711x-timer.1", NULL);</div><div class='del'>-</div><div class='del'>-	BUG_ON(_clps711x_clksrc_init(tc1, tc1_base));</div><div class='del'>-	BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_TIMER_OF</div><div class='ctx'> static int __init clps711x_timer_init(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq = irq_of_parse_and_map(np, 0);</div><div class='ctx'> 	struct clk *clock = of_clk_get(np, 0);</div><div class='ctx'> 	void __iomem *base = of_iomap(np, 0);</div><div class='ctx'> </div><div class='add'>+	if (!base)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (!irq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (IS_ERR(clock))</div><div class='add'>+		return PTR_ERR(clock);</div><div class='add'>+</div><div class='ctx'> 	switch (of_alias_get_id(np, "timer")) {</div><div class='ctx'> 	case CLPS711X_CLKSRC_CLOCKSOURCE:</div><div class='del'>-		return _clps711x_clksrc_init(clock, base);</div><div class='add'>+		clps711x_clksrc_init(clock, base);</div><div class='add'>+		break;</div><div class='ctx'> 	case CLPS711X_CLKSRC_CLOCKEVENT:</div><div class='ctx'> 		return _clps711x_clkevt_init(clock, base, irq);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c<br/>index 54f8a331b53a..37671a5d4ed9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/mips-gic-timer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/mips-gic-timer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/mips-gic-timer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/mips-gic-timer.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static irqreturn_t gic_compare_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'>-struct irqaction gic_compare_irqaction = {</div><div class='add'>+static struct irqaction gic_compare_irqaction = {</div><div class='ctx'> 	.handler = gic_compare_interrupt,</div><div class='ctx'> 	.percpu_dev_id = &amp;gic_clockevent_device,</div><div class='ctx'> 	.flags = IRQF_PERCPU | IRQF_TIMER,</div><div class='head'>diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c<br/>index 43f4d5c4d6fa..f987027ca566 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/tcb_clksrc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/tcb_clksrc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/tcb_clksrc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/tcb_clksrc.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ static u64 tc_get_cycles32(struct clocksource *cs)</div><div class='ctx'> 	return readl_relaxed(tcaddr + ATMEL_TC_REG(0, CV));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tc_clksrc_suspend(struct clocksource *cs)</div><div class='add'>+static void tc_clksrc_suspend(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ void tc_clksrc_suspend(struct clocksource *cs)</div><div class='ctx'> 	bmr_cache = readl(tcaddr + ATMEL_TC_BMR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tc_clksrc_resume(struct clocksource *cs)</div><div class='add'>+static void tc_clksrc_resume(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clocksource/timer-fsl-ftm.c b/drivers/clocksource/timer-fsl-ftm.c<br/>index 846d18daf893..e1c34b2f53a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-fsl-ftm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-fsl-ftm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-fsl-ftm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/timer-fsl-ftm.c</a></div><div class='hunk'>@@ -19,20 +19,9 @@</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fsl/ftm.h&gt;</div><div class='ctx'> </div><div class='del'>-#define FTM_SC		0x00</div><div class='del'>-#define FTM_SC_CLK_SHIFT	3</div><div class='del'>-#define FTM_SC_CLK_MASK	(0x3 &lt;&lt; FTM_SC_CLK_SHIFT)</div><div class='del'>-#define FTM_SC_CLK(c)	((c) &lt;&lt; FTM_SC_CLK_SHIFT)</div><div class='del'>-#define FTM_SC_PS_MASK	0x7</div><div class='del'>-#define FTM_SC_TOIE	BIT(6)</div><div class='del'>-#define FTM_SC_TOF	BIT(7)</div><div class='del'>-</div><div class='del'>-#define FTM_CNT		0x04</div><div class='del'>-#define FTM_MOD		0x08</div><div class='del'>-#define FTM_CNTIN	0x4C</div><div class='del'>-</div><div class='del'>-#define FTM_PS_MAX	7</div><div class='add'>+#define FTM_SC_CLK(c)	((c) &lt;&lt; FTM_SC_CLK_MASK_SHIFT)</div><div class='ctx'> </div><div class='ctx'> struct ftm_clock_device {</div><div class='ctx'> 	void __iomem *clksrc_base;</div><div class='head'>diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c<br/>index eed6feff8b5f..30c6f4ce672b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-oxnas-rps.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-oxnas-rps.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-oxnas-rps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/timer-oxnas-rps.c</a></div><div class='hunk'>@@ -296,4 +296,4 @@ err_alloc:</div><div class='ctx'> TIMER_OF_DECLARE(ox810se_rps,</div><div class='ctx'> 		       "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);</div><div class='ctx'> TIMER_OF_DECLARE(ox820_rps,</div><div class='del'>-		       "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init);</div><div class='add'>+		       "oxsemi,ox820-rps-timer", oxnas_rps_timer_init);</div><div class='head'>diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c<br/>index e8163693e936..5e6038fbf115 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-riscv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-riscv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-riscv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/timer-riscv.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static u64 riscv_sched_clock(void)</div><div class='ctx'> static DEFINE_PER_CPU(struct clocksource, riscv_clocksource) = {</div><div class='ctx'> 	.name		= "riscv_clocksource",</div><div class='ctx'> 	.rating		= 300,</div><div class='del'>-	.mask		= CLOCKSOURCE_MASK(BITS_PER_LONG),</div><div class='add'>+	.mask		= CLOCKSOURCE_MASK(64),</div><div class='ctx'> 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> 	.read		= riscv_clocksource_rdtime,</div><div class='ctx'> };</div><div class='hunk'>@@ -120,8 +120,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sched_clock_register(riscv_sched_clock,</div><div class='del'>-			BITS_PER_LONG, riscv_timebase);</div><div class='add'>+	sched_clock_register(riscv_sched_clock, 64, riscv_timebase);</div><div class='ctx'> </div><div class='ctx'> 	error = cpuhp_setup_state(CPUHP_AP_RISCV_TIMER_STARTING,</div><div class='ctx'> 			 "clockevents/riscv/timer:starting",</div><div class='head'>diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c<br/>index c364027638e1..e40b55a7086f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-ti-dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/clocksource/timer-ti-dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/clocksource/timer-ti-dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/clocksource/timer-ti-dm.c</a></div><div class='hunk'>@@ -585,34 +585,6 @@ static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Optimized set_load which removes costly spin wait in timer_start */</div><div class='del'>-int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,</div><div class='del'>-                            unsigned int load)</div><div class='del'>-{</div><div class='del'>-	u32 l;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!timer))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	omap_dm_timer_enable(timer);</div><div class='del'>-</div><div class='del'>-	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='del'>-	if (autoreload) {</div><div class='del'>-		l |= OMAP_TIMER_CTRL_AR;</div><div class='del'>-		omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);</div><div class='del'>-	} else {</div><div class='del'>-		l &amp;= ~OMAP_TIMER_CTRL_AR;</div><div class='del'>-	}</div><div class='del'>-	l |= OMAP_TIMER_CTRL_ST;</div><div class='del'>-</div><div class='del'>-	__omap_dm_timer_load_start(timer, l, load, timer-&gt;posted);</div><div class='del'>-</div><div class='del'>-	/* Save the context */</div><div class='del'>-	timer-&gt;context.tclr = l;</div><div class='del'>-	timer-&gt;context.tldr = load;</div><div class='del'>-	timer-&gt;context.tcrr = load;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> static int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,</div><div class='ctx'> 				   unsigned int match)</div><div class='ctx'> {</div><div class='hunk'>@@ -998,5 +970,4 @@ module_platform_driver(omap_dm_timer_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("OMAP Dual-Mode Timer Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='ctx'> MODULE_AUTHOR("Texas Instruments Inc");</div><div class='head'>diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c<br/>new file mode 100644<br/>index 000000000000..4fa2931dcb7b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/104-quad-8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/104-quad-8.c</a></div><div class='hunk'>@@ -0,0 +1,1367 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Counter driver for the ACCES 104-QUAD-8</div><div class='add'>+ * Copyright (C) 2016 William Breathitt Gray</div><div class='add'>+ *</div><div class='add'>+ * This driver supports the ACCES 104-QUAD-8 and ACCES 104-QUAD-4.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/counter.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/iio/types.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/isa.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='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define QUAD8_EXTENT 32</div><div class='add'>+</div><div class='add'>+static unsigned int base[max_num_isa_dev(QUAD8_EXTENT)];</div><div class='add'>+static unsigned int num_quad8;</div><div class='add'>+module_param_array(base, uint, &amp;num_quad8, 0);</div><div class='add'>+MODULE_PARM_DESC(base, "ACCES 104-QUAD-8 base addresses");</div><div class='add'>+</div><div class='add'>+#define QUAD8_NUM_COUNTERS 8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct quad8_iio - IIO device private data structure</div><div class='add'>+ * @counter:		instance of the counter_device</div><div class='add'>+ * @preset:		array of preset values</div><div class='add'>+ * @count_mode:		array of count mode configurations</div><div class='add'>+ * @quadrature_mode:	array of quadrature mode configurations</div><div class='add'>+ * @quadrature_scale:	array of quadrature mode scale configurations</div><div class='add'>+ * @ab_enable:		array of A and B inputs enable configurations</div><div class='add'>+ * @preset_enable:	array of set_to_preset_on_index attribute configurations</div><div class='add'>+ * @synchronous_mode:	array of index function synchronous mode configurations</div><div class='add'>+ * @index_polarity:	array of index function polarity configurations</div><div class='add'>+ * @base:		base port address of the IIO device</div><div class='add'>+ */</div><div class='add'>+struct quad8_iio {</div><div class='add'>+	struct counter_device counter;</div><div class='add'>+	unsigned int preset[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int count_mode[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int quadrature_mode[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int quadrature_scale[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int ab_enable[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int preset_enable[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int synchronous_mode[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int index_polarity[QUAD8_NUM_COUNTERS];</div><div class='add'>+	unsigned int base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QUAD8_REG_CHAN_OP 0x11</div><div class='add'>+#define QUAD8_REG_INDEX_INPUT_LEVELS 0x16</div><div class='add'>+/* Borrow Toggle flip-flop */</div><div class='add'>+#define QUAD8_FLAG_BT BIT(0)</div><div class='add'>+/* Carry Toggle flip-flop */</div><div class='add'>+#define QUAD8_FLAG_CT BIT(1)</div><div class='add'>+/* Error flag */</div><div class='add'>+#define QUAD8_FLAG_E BIT(4)</div><div class='add'>+/* Up/Down flag */</div><div class='add'>+#define QUAD8_FLAG_UD BIT(5)</div><div class='add'>+/* Reset and Load Signal Decoders */</div><div class='add'>+#define QUAD8_CTR_RLD 0x00</div><div class='add'>+/* Counter Mode Register */</div><div class='add'>+#define QUAD8_CTR_CMR 0x20</div><div class='add'>+/* Input / Output Control Register */</div><div class='add'>+#define QUAD8_CTR_IOR 0x40</div><div class='add'>+/* Index Control Register */</div><div class='add'>+#define QUAD8_CTR_IDR 0x60</div><div class='add'>+/* Reset Byte Pointer (three byte data pointer) */</div><div class='add'>+#define QUAD8_RLD_RESET_BP 0x01</div><div class='add'>+/* Reset Counter */</div><div class='add'>+#define QUAD8_RLD_RESET_CNTR 0x02</div><div class='add'>+/* Reset Borrow Toggle, Carry Toggle, Compare Toggle, and Sign flags */</div><div class='add'>+#define QUAD8_RLD_RESET_FLAGS 0x04</div><div class='add'>+/* Reset Error flag */</div><div class='add'>+#define QUAD8_RLD_RESET_E 0x06</div><div class='add'>+/* Preset Register to Counter */</div><div class='add'>+#define QUAD8_RLD_PRESET_CNTR 0x08</div><div class='add'>+/* Transfer Counter to Output Latch */</div><div class='add'>+#define QUAD8_RLD_CNTR_OUT 0x10</div><div class='add'>+#define QUAD8_CHAN_OP_ENABLE_COUNTERS 0x00</div><div class='add'>+#define QUAD8_CHAN_OP_RESET_COUNTERS 0x01</div><div class='add'>+#define QUAD8_CMR_QUADRATURE_X1 0x08</div><div class='add'>+#define QUAD8_CMR_QUADRATURE_X2 0x10</div><div class='add'>+#define QUAD8_CMR_QUADRATURE_X4 0x18</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int quad8_read_raw(struct iio_dev *indio_dev,</div><div class='add'>+	struct iio_chan_spec const *chan, int *val, int *val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	unsigned int borrow;</div><div class='add'>+	unsigned int carry;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		if (chan-&gt;type == IIO_INDEX) {</div><div class='add'>+			*val = !!(inb(priv-&gt;base + QUAD8_REG_INDEX_INPUT_LEVELS)</div><div class='add'>+				&amp; BIT(chan-&gt;channel));</div><div class='add'>+			return IIO_VAL_INT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flags = inb(base_offset + 1);</div><div class='add'>+		borrow = flags &amp; QUAD8_FLAG_BT;</div><div class='add'>+		carry = !!(flags &amp; QUAD8_FLAG_CT);</div><div class='add'>+</div><div class='add'>+		/* Borrow XOR Carry effectively doubles count range */</div><div class='add'>+		*val = (borrow ^ carry) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+		/* Reset Byte Pointer; transfer Counter to Output Latch */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP | QUAD8_RLD_CNTR_OUT,</div><div class='add'>+		     base_offset + 1);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 3; i++)</div><div class='add'>+			*val |= (unsigned int)inb(base_offset) &lt;&lt; (8 * i);</div><div class='add'>+</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+	case IIO_CHAN_INFO_ENABLE:</div><div class='add'>+		*val = priv-&gt;ab_enable[chan-&gt;channel];</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		*val = 1;</div><div class='add'>+		*val2 = priv-&gt;quadrature_scale[chan-&gt;channel];</div><div class='add'>+		return IIO_VAL_FRACTIONAL_LOG2;</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 quad8_write_raw(struct iio_dev *indio_dev,</div><div class='add'>+	struct iio_chan_spec const *chan, int val, int val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int ior_cfg;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		if (chan-&gt;type == IIO_INDEX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Only 24-bit values are supported */</div><div class='add'>+		if ((unsigned int)val &gt; 0xFFFFFF)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Reset Byte Pointer */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+</div><div class='add'>+		/* Counter can only be set via Preset Register */</div><div class='add'>+		for (i = 0; i &lt; 3; i++)</div><div class='add'>+			outb(val &gt;&gt; (8 * i), base_offset);</div><div class='add'>+</div><div class='add'>+		/* Transfer Preset Register to Counter */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_PRESET_CNTR, base_offset + 1);</div><div class='add'>+</div><div class='add'>+		/* Reset Byte Pointer */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+</div><div class='add'>+		/* Set Preset Register back to original value */</div><div class='add'>+		val = priv-&gt;preset[chan-&gt;channel];</div><div class='add'>+		for (i = 0; i &lt; 3; i++)</div><div class='add'>+			outb(val &gt;&gt; (8 * i), base_offset);</div><div class='add'>+</div><div class='add'>+		/* Reset Borrow, Carry, Compare, and Sign flags */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_FLAGS, base_offset + 1);</div><div class='add'>+		/* Reset Error flag */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_E, base_offset + 1);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	case IIO_CHAN_INFO_ENABLE:</div><div class='add'>+		/* only boolean values accepted */</div><div class='add'>+		if (val &lt; 0 || val &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		priv-&gt;ab_enable[chan-&gt;channel] = val;</div><div class='add'>+</div><div class='add'>+		ior_cfg = val | priv-&gt;preset_enable[chan-&gt;channel] &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+		/* Load I/O control configuration */</div><div class='add'>+		outb(QUAD8_CTR_IOR | ior_cfg, base_offset + 1);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		/* Quadrature scaling only available in quadrature mode */</div><div class='add'>+		if (!priv-&gt;quadrature_mode[chan-&gt;channel] &amp;&amp; (val2 || val != 1))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Only three gain states (1, 0.5, 0.25) */</div><div class='add'>+		if (val == 1 &amp;&amp; !val2)</div><div class='add'>+			priv-&gt;quadrature_scale[chan-&gt;channel] = 0;</div><div class='add'>+		else if (!val)</div><div class='add'>+			switch (val2) {</div><div class='add'>+			case 500000:</div><div class='add'>+				priv-&gt;quadrature_scale[chan-&gt;channel] = 1;</div><div class='add'>+				break;</div><div class='add'>+			case 250000:</div><div class='add'>+				priv-&gt;quadrature_scale[chan-&gt;channel] = 2;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		else</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'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_info quad8_info = {</div><div class='add'>+	.read_raw = quad8_read_raw,</div><div class='add'>+	.write_raw = quad8_write_raw</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_read_preset(struct iio_dev *indio_dev, uintptr_t private,</div><div class='add'>+	const struct iio_chan_spec *chan, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%u\n", priv-&gt;preset[chan-&gt;channel]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_write_preset(struct iio_dev *indio_dev, uintptr_t private,</div><div class='add'>+	const struct iio_chan_spec *chan, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel;</div><div class='add'>+	unsigned int preset;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;preset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Only 24-bit values are supported */</div><div class='add'>+	if (preset &gt; 0xFFFFFF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;preset[chan-&gt;channel] = preset;</div><div class='add'>+</div><div class='add'>+	/* Reset Byte Pointer */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+</div><div class='add'>+	/* Set Preset Register */</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		outb(preset &gt;&gt; (8 * i), base_offset);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_read_set_to_preset_on_index(struct iio_dev *indio_dev,</div><div class='add'>+	uintptr_t private, const struct iio_chan_spec *chan, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%u\n",</div><div class='add'>+		!priv-&gt;preset_enable[chan-&gt;channel]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,</div><div class='add'>+	uintptr_t private, const struct iio_chan_spec *chan, const char *buf,</div><div class='add'>+	size_t len)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+	bool preset_enable;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int ior_cfg;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;preset_enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Preset enable is active low in Input/Output Control register */</div><div class='add'>+	preset_enable = !preset_enable;</div><div class='add'>+</div><div class='add'>+	priv-&gt;preset_enable[chan-&gt;channel] = preset_enable;</div><div class='add'>+</div><div class='add'>+	ior_cfg = priv-&gt;ab_enable[chan-&gt;channel] |</div><div class='add'>+		(unsigned int)preset_enable &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	/* Load I/O control configuration to Input / Output Control Register */</div><div class='add'>+	outb(QUAD8_CTR_IOR | ior_cfg, base_offset);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *const quad8_noise_error_states[] = {</div><div class='add'>+	"No excessive noise is present at the count inputs",</div><div class='add'>+	"Excessive noise is present at the count inputs"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_get_noise_error(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+</div><div class='add'>+	return !!(inb(base_offset) &amp; QUAD8_FLAG_E);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_enum quad8_noise_error_enum = {</div><div class='add'>+	.items = quad8_noise_error_states,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_noise_error_states),</div><div class='add'>+	.get = quad8_get_noise_error</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const quad8_count_direction_states[] = {</div><div class='add'>+	"down",</div><div class='add'>+	"up"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_get_count_direction(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+</div><div class='add'>+	return !!(inb(base_offset) &amp; QUAD8_FLAG_UD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_enum quad8_count_direction_enum = {</div><div class='add'>+	.items = quad8_count_direction_states,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_count_direction_states),</div><div class='add'>+	.get = quad8_get_count_direction</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const quad8_count_modes[] = {</div><div class='add'>+	"normal",</div><div class='add'>+	"range limit",</div><div class='add'>+	"non-recycle",</div><div class='add'>+	"modulo-n"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_set_count_mode(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan, unsigned int cnt_mode)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	unsigned int mode_cfg = cnt_mode &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+</div><div class='add'>+	priv-&gt;count_mode[chan-&gt;channel] = cnt_mode;</div><div class='add'>+</div><div class='add'>+	/* Add quadrature mode configuration */</div><div class='add'>+	if (priv-&gt;quadrature_mode[chan-&gt;channel])</div><div class='add'>+		mode_cfg |= (priv-&gt;quadrature_scale[chan-&gt;channel] + 1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	/* Load mode configuration to Counter Mode Register */</div><div class='add'>+	outb(QUAD8_CTR_CMR | mode_cfg, base_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 quad8_get_count_mode(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;count_mode[chan-&gt;channel];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_enum quad8_count_mode_enum = {</div><div class='add'>+	.items = quad8_count_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_count_modes),</div><div class='add'>+	.set = quad8_set_count_mode,</div><div class='add'>+	.get = quad8_get_count_mode</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const quad8_synchronous_modes[] = {</div><div class='add'>+	"non-synchronous",</div><div class='add'>+	"synchronous"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_set_synchronous_mode(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan, unsigned int synchronous_mode)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const unsigned int idr_cfg = synchronous_mode |</div><div class='add'>+		priv-&gt;index_polarity[chan-&gt;channel] &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+</div><div class='add'>+	/* Index function must be non-synchronous in non-quadrature mode */</div><div class='add'>+	if (synchronous_mode &amp;&amp; !priv-&gt;quadrature_mode[chan-&gt;channel])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;synchronous_mode[chan-&gt;channel] = synchronous_mode;</div><div class='add'>+</div><div class='add'>+	/* Load Index Control configuration to Index Control Register */</div><div class='add'>+	outb(QUAD8_CTR_IDR | idr_cfg, base_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 quad8_get_synchronous_mode(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;synchronous_mode[chan-&gt;channel];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_enum quad8_synchronous_mode_enum = {</div><div class='add'>+	.items = quad8_synchronous_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_synchronous_modes),</div><div class='add'>+	.set = quad8_set_synchronous_mode,</div><div class='add'>+	.get = quad8_get_synchronous_mode</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const quad8_quadrature_modes[] = {</div><div class='add'>+	"non-quadrature",</div><div class='add'>+	"quadrature"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_set_quadrature_mode(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan, unsigned int quadrature_mode)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	unsigned int mode_cfg = priv-&gt;count_mode[chan-&gt;channel] &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+</div><div class='add'>+	if (quadrature_mode)</div><div class='add'>+		mode_cfg |= (priv-&gt;quadrature_scale[chan-&gt;channel] + 1) &lt;&lt; 3;</div><div class='add'>+	else {</div><div class='add'>+		/* Quadrature scaling only available in quadrature mode */</div><div class='add'>+		priv-&gt;quadrature_scale[chan-&gt;channel] = 0;</div><div class='add'>+</div><div class='add'>+		/* Synchronous function not supported in non-quadrature mode */</div><div class='add'>+		if (priv-&gt;synchronous_mode[chan-&gt;channel])</div><div class='add'>+			quad8_set_synchronous_mode(indio_dev, chan, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;quadrature_mode[chan-&gt;channel] = quadrature_mode;</div><div class='add'>+</div><div class='add'>+	/* Load mode configuration to Counter Mode Register */</div><div class='add'>+	outb(QUAD8_CTR_CMR | mode_cfg, base_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 quad8_get_quadrature_mode(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;quadrature_mode[chan-&gt;channel];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_enum quad8_quadrature_mode_enum = {</div><div class='add'>+	.items = quad8_quadrature_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_quadrature_modes),</div><div class='add'>+	.set = quad8_set_quadrature_mode,</div><div class='add'>+	.get = quad8_get_quadrature_mode</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const quad8_index_polarity_modes[] = {</div><div class='add'>+	"negative",</div><div class='add'>+	"positive"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_set_index_polarity(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan, unsigned int index_polarity)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+	const unsigned int idr_cfg = priv-&gt;synchronous_mode[chan-&gt;channel] |</div><div class='add'>+		index_polarity &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='add'>+</div><div class='add'>+	priv-&gt;index_polarity[chan-&gt;channel] = index_polarity;</div><div class='add'>+</div><div class='add'>+	/* Load Index Control configuration to Index Control Register */</div><div class='add'>+	outb(QUAD8_CTR_IDR | idr_cfg, base_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 quad8_get_index_polarity(struct iio_dev *indio_dev,</div><div class='add'>+	const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;index_polarity[chan-&gt;channel];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_enum quad8_index_polarity_enum = {</div><div class='add'>+	.items = quad8_index_polarity_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_index_polarity_modes),</div><div class='add'>+	.set = quad8_set_index_polarity,</div><div class='add'>+	.get = quad8_get_index_polarity</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec_ext_info quad8_count_ext_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "preset",</div><div class='add'>+		.shared = IIO_SEPARATE,</div><div class='add'>+		.read = quad8_read_preset,</div><div class='add'>+		.write = quad8_write_preset</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "set_to_preset_on_index",</div><div class='add'>+		.shared = IIO_SEPARATE,</div><div class='add'>+		.read = quad8_read_set_to_preset_on_index,</div><div class='add'>+		.write = quad8_write_set_to_preset_on_index</div><div class='add'>+	},</div><div class='add'>+	IIO_ENUM("noise_error", IIO_SEPARATE, &amp;quad8_noise_error_enum),</div><div class='add'>+	IIO_ENUM_AVAILABLE("noise_error", &amp;quad8_noise_error_enum),</div><div class='add'>+	IIO_ENUM("count_direction", IIO_SEPARATE, &amp;quad8_count_direction_enum),</div><div class='add'>+	IIO_ENUM_AVAILABLE("count_direction", &amp;quad8_count_direction_enum),</div><div class='add'>+	IIO_ENUM("count_mode", IIO_SEPARATE, &amp;quad8_count_mode_enum),</div><div class='add'>+	IIO_ENUM_AVAILABLE("count_mode", &amp;quad8_count_mode_enum),</div><div class='add'>+	IIO_ENUM("quadrature_mode", IIO_SEPARATE, &amp;quad8_quadrature_mode_enum),</div><div class='add'>+	IIO_ENUM_AVAILABLE("quadrature_mode", &amp;quad8_quadrature_mode_enum),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec_ext_info quad8_index_ext_info[] = {</div><div class='add'>+	IIO_ENUM("synchronous_mode", IIO_SEPARATE,</div><div class='add'>+		&amp;quad8_synchronous_mode_enum),</div><div class='add'>+	IIO_ENUM_AVAILABLE("synchronous_mode", &amp;quad8_synchronous_mode_enum),</div><div class='add'>+	IIO_ENUM("index_polarity", IIO_SEPARATE, &amp;quad8_index_polarity_enum),</div><div class='add'>+	IIO_ENUM_AVAILABLE("index_polarity", &amp;quad8_index_polarity_enum),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QUAD8_COUNT_CHAN(_chan) {					\</div><div class='add'>+	.type = IIO_COUNT,						\</div><div class='add'>+	.channel = (_chan),						\</div><div class='add'>+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |			\</div><div class='add'>+		BIT(IIO_CHAN_INFO_ENABLE) | BIT(IIO_CHAN_INFO_SCALE),	\</div><div class='add'>+	.ext_info = quad8_count_ext_info,				\</div><div class='add'>+	.indexed = 1							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define QUAD8_INDEX_CHAN(_chan) {			\</div><div class='add'>+	.type = IIO_INDEX,				\</div><div class='add'>+	.channel = (_chan),				\</div><div class='add'>+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\</div><div class='add'>+	.ext_info = quad8_index_ext_info,		\</div><div class='add'>+	.indexed = 1					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec quad8_channels[] = {</div><div class='add'>+	QUAD8_COUNT_CHAN(0), QUAD8_INDEX_CHAN(0),</div><div class='add'>+	QUAD8_COUNT_CHAN(1), QUAD8_INDEX_CHAN(1),</div><div class='add'>+	QUAD8_COUNT_CHAN(2), QUAD8_INDEX_CHAN(2),</div><div class='add'>+	QUAD8_COUNT_CHAN(3), QUAD8_INDEX_CHAN(3),</div><div class='add'>+	QUAD8_COUNT_CHAN(4), QUAD8_INDEX_CHAN(4),</div><div class='add'>+	QUAD8_COUNT_CHAN(5), QUAD8_INDEX_CHAN(5),</div><div class='add'>+	QUAD8_COUNT_CHAN(6), QUAD8_INDEX_CHAN(6),</div><div class='add'>+	QUAD8_COUNT_CHAN(7), QUAD8_INDEX_CHAN(7)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_signal_read(struct counter_device *counter,</div><div class='add'>+	struct counter_signal *signal, struct counter_signal_read_value *val)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	unsigned int state;</div><div class='add'>+	enum counter_signal_level level;</div><div class='add'>+</div><div class='add'>+	/* Only Index signal levels can be read */</div><div class='add'>+	if (signal-&gt;id &lt; 16)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	state = inb(priv-&gt;base + QUAD8_REG_INDEX_INPUT_LEVELS)</div><div class='add'>+		&amp; BIT(signal-&gt;id - 16);</div><div class='add'>+</div><div class='add'>+	level = (state) ? COUNTER_SIGNAL_LEVEL_HIGH : COUNTER_SIGNAL_LEVEL_LOW;</div><div class='add'>+</div><div class='add'>+	counter_signal_read_value_set(val, COUNTER_SIGNAL_LEVEL, &amp;level);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int quad8_count_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, struct counter_count_read_value *val)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	unsigned int borrow;</div><div class='add'>+	unsigned int carry;</div><div class='add'>+	unsigned long position;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	flags = inb(base_offset + 1);</div><div class='add'>+	borrow = flags &amp; QUAD8_FLAG_BT;</div><div class='add'>+	carry = !!(flags &amp; QUAD8_FLAG_CT);</div><div class='add'>+</div><div class='add'>+	/* Borrow XOR Carry effectively doubles count range */</div><div class='add'>+	position = (unsigned long)(borrow ^ carry) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	/* Reset Byte Pointer; transfer Counter to Output Latch */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP | QUAD8_RLD_CNTR_OUT,</div><div class='add'>+	     base_offset + 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		position |= (unsigned long)inb(base_offset) &lt;&lt; (8 * i);</div><div class='add'>+</div><div class='add'>+	counter_count_read_value_set(val, COUNTER_COUNT_POSITION, &amp;position);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int quad8_count_write(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, struct counter_count_write_value *val)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned long position;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err = counter_count_write_value_get(&amp;position, COUNTER_COUNT_POSITION,</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'>+	/* Only 24-bit values are supported */</div><div class='add'>+	if (position &gt; 0xFFFFFF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Reset Byte Pointer */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+</div><div class='add'>+	/* Counter can only be set via Preset Register */</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		outb(position &gt;&gt; (8 * i), base_offset);</div><div class='add'>+</div><div class='add'>+	/* Transfer Preset Register to Counter */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_PRESET_CNTR, base_offset + 1);</div><div class='add'>+</div><div class='add'>+	/* Reset Byte Pointer */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+</div><div class='add'>+	/* Set Preset Register back to original value */</div><div class='add'>+	position = priv-&gt;preset[count-&gt;id];</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		outb(position &gt;&gt; (8 * i), base_offset);</div><div class='add'>+</div><div class='add'>+	/* Reset Borrow, Carry, Compare, and Sign flags */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_FLAGS, base_offset + 1);</div><div class='add'>+	/* Reset Error flag */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_E, base_offset + 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum quad8_count_function {</div><div class='add'>+	QUAD8_COUNT_FUNCTION_PULSE_DIRECTION = 0,</div><div class='add'>+	QUAD8_COUNT_FUNCTION_QUADRATURE_X1,</div><div class='add'>+	QUAD8_COUNT_FUNCTION_QUADRATURE_X2,</div><div class='add'>+	QUAD8_COUNT_FUNCTION_QUADRATURE_X4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_count_function quad8_count_functions_list[] = {</div><div class='add'>+	[QUAD8_COUNT_FUNCTION_PULSE_DIRECTION] = COUNTER_COUNT_FUNCTION_PULSE_DIRECTION,</div><div class='add'>+	[QUAD8_COUNT_FUNCTION_QUADRATURE_X1] = COUNTER_COUNT_FUNCTION_QUADRATURE_X1_A,</div><div class='add'>+	[QUAD8_COUNT_FUNCTION_QUADRATURE_X2] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A,</div><div class='add'>+	[QUAD8_COUNT_FUNCTION_QUADRATURE_X4] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_function_get(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, size_t *function)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int id = count-&gt;id;</div><div class='add'>+	const unsigned int quadrature_mode = priv-&gt;quadrature_mode[id];</div><div class='add'>+	const unsigned int scale = priv-&gt;quadrature_scale[id];</div><div class='add'>+</div><div class='add'>+	if (quadrature_mode)</div><div class='add'>+		switch (scale) {</div><div class='add'>+		case 0:</div><div class='add'>+			*function = QUAD8_COUNT_FUNCTION_QUADRATURE_X1;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			*function = QUAD8_COUNT_FUNCTION_QUADRATURE_X2;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			*function = QUAD8_COUNT_FUNCTION_QUADRATURE_X4;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	else</div><div class='add'>+		*function = QUAD8_COUNT_FUNCTION_PULSE_DIRECTION;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int quad8_function_set(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, size_t function)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int id = count-&gt;id;</div><div class='add'>+	unsigned int *const quadrature_mode = priv-&gt;quadrature_mode + id;</div><div class='add'>+	unsigned int *const scale = priv-&gt;quadrature_scale + id;</div><div class='add'>+	unsigned int mode_cfg = priv-&gt;count_mode[id] &lt;&lt; 1;</div><div class='add'>+	unsigned int *const synchronous_mode = priv-&gt;synchronous_mode + id;</div><div class='add'>+	const unsigned int idr_cfg = priv-&gt;index_polarity[id] &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * id + 1;</div><div class='add'>+</div><div class='add'>+	if (function == QUAD8_COUNT_FUNCTION_PULSE_DIRECTION) {</div><div class='add'>+		*quadrature_mode = 0;</div><div class='add'>+</div><div class='add'>+		/* Quadrature scaling only available in quadrature mode */</div><div class='add'>+		*scale = 0;</div><div class='add'>+</div><div class='add'>+		/* Synchronous function not supported in non-quadrature mode */</div><div class='add'>+		if (*synchronous_mode) {</div><div class='add'>+			*synchronous_mode = 0;</div><div class='add'>+			/* Disable synchronous function mode */</div><div class='add'>+			outb(QUAD8_CTR_IDR | idr_cfg, base_offset);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		*quadrature_mode = 1;</div><div class='add'>+</div><div class='add'>+		switch (function) {</div><div class='add'>+		case QUAD8_COUNT_FUNCTION_QUADRATURE_X1:</div><div class='add'>+			*scale = 0;</div><div class='add'>+			mode_cfg |= QUAD8_CMR_QUADRATURE_X1;</div><div class='add'>+			break;</div><div class='add'>+		case QUAD8_COUNT_FUNCTION_QUADRATURE_X2:</div><div class='add'>+			*scale = 1;</div><div class='add'>+			mode_cfg |= QUAD8_CMR_QUADRATURE_X2;</div><div class='add'>+			break;</div><div class='add'>+		case QUAD8_COUNT_FUNCTION_QUADRATURE_X4:</div><div class='add'>+			*scale = 2;</div><div class='add'>+			mode_cfg |= QUAD8_CMR_QUADRATURE_X4;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load mode configuration to Counter Mode Register */</div><div class='add'>+	outb(QUAD8_CTR_CMR | mode_cfg, base_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 quad8_direction_get(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, enum counter_count_direction *direction)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	unsigned int ud_flag;</div><div class='add'>+	const unsigned int flag_addr = priv-&gt;base + 2 * count-&gt;id + 1;</div><div class='add'>+</div><div class='add'>+	/* U/D flag: nonzero = up, zero = down */</div><div class='add'>+	ud_flag = inb(flag_addr) &amp; QUAD8_FLAG_UD;</div><div class='add'>+</div><div class='add'>+	*direction = (ud_flag) ? COUNTER_COUNT_DIRECTION_FORWARD :</div><div class='add'>+		COUNTER_COUNT_DIRECTION_BACKWARD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum quad8_synapse_action {</div><div class='add'>+	QUAD8_SYNAPSE_ACTION_NONE = 0,</div><div class='add'>+	QUAD8_SYNAPSE_ACTION_RISING_EDGE,</div><div class='add'>+	QUAD8_SYNAPSE_ACTION_FALLING_EDGE,</div><div class='add'>+	QUAD8_SYNAPSE_ACTION_BOTH_EDGES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_synapse_action quad8_index_actions_list[] = {</div><div class='add'>+	[QUAD8_SYNAPSE_ACTION_NONE] = COUNTER_SYNAPSE_ACTION_NONE,</div><div class='add'>+	[QUAD8_SYNAPSE_ACTION_RISING_EDGE] = COUNTER_SYNAPSE_ACTION_RISING_EDGE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_synapse_action quad8_synapse_actions_list[] = {</div><div class='add'>+	[QUAD8_SYNAPSE_ACTION_NONE] = COUNTER_SYNAPSE_ACTION_NONE,</div><div class='add'>+	[QUAD8_SYNAPSE_ACTION_RISING_EDGE] = COUNTER_SYNAPSE_ACTION_RISING_EDGE,</div><div class='add'>+	[QUAD8_SYNAPSE_ACTION_FALLING_EDGE] = COUNTER_SYNAPSE_ACTION_FALLING_EDGE,</div><div class='add'>+	[QUAD8_SYNAPSE_ACTION_BOTH_EDGES] = COUNTER_SYNAPSE_ACTION_BOTH_EDGES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_action_get(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, struct counter_synapse *synapse,</div><div class='add'>+	size_t *action)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+	size_t function = 0;</div><div class='add'>+	const size_t signal_a_id = count-&gt;synapses[0].signal-&gt;id;</div><div class='add'>+	enum counter_count_direction direction;</div><div class='add'>+</div><div class='add'>+	/* Handle Index signals */</div><div class='add'>+	if (synapse-&gt;signal-&gt;id &gt;= 16) {</div><div class='add'>+		if (priv-&gt;preset_enable[count-&gt;id])</div><div class='add'>+			*action = QUAD8_SYNAPSE_ACTION_RISING_EDGE;</div><div class='add'>+		else</div><div class='add'>+			*action = QUAD8_SYNAPSE_ACTION_NONE;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = quad8_function_get(counter, count, &amp;function);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Default action mode */</div><div class='add'>+	*action = QUAD8_SYNAPSE_ACTION_NONE;</div><div class='add'>+</div><div class='add'>+	/* Determine action mode based on current count function mode */</div><div class='add'>+	switch (function) {</div><div class='add'>+	case QUAD8_COUNT_FUNCTION_PULSE_DIRECTION:</div><div class='add'>+		if (synapse-&gt;signal-&gt;id == signal_a_id)</div><div class='add'>+			*action = QUAD8_SYNAPSE_ACTION_RISING_EDGE;</div><div class='add'>+		break;</div><div class='add'>+	case QUAD8_COUNT_FUNCTION_QUADRATURE_X1:</div><div class='add'>+		if (synapse-&gt;signal-&gt;id == signal_a_id) {</div><div class='add'>+			quad8_direction_get(counter, count, &amp;direction);</div><div class='add'>+</div><div class='add'>+			if (direction == COUNTER_COUNT_DIRECTION_FORWARD)</div><div class='add'>+				*action = QUAD8_SYNAPSE_ACTION_RISING_EDGE;</div><div class='add'>+			else</div><div class='add'>+				*action = QUAD8_SYNAPSE_ACTION_FALLING_EDGE;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case QUAD8_COUNT_FUNCTION_QUADRATURE_X2:</div><div class='add'>+		if (synapse-&gt;signal-&gt;id == signal_a_id)</div><div class='add'>+			*action = QUAD8_SYNAPSE_ACTION_BOTH_EDGES;</div><div class='add'>+		break;</div><div class='add'>+	case QUAD8_COUNT_FUNCTION_QUADRATURE_X4:</div><div class='add'>+		*action = QUAD8_SYNAPSE_ACTION_BOTH_EDGES;</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 counter_ops quad8_ops = {</div><div class='add'>+	.signal_read = quad8_signal_read,</div><div class='add'>+	.count_read = quad8_count_read,</div><div class='add'>+	.count_write = quad8_count_write,</div><div class='add'>+	.function_get = quad8_function_get,</div><div class='add'>+	.function_set = quad8_function_set,</div><div class='add'>+	.action_get = quad8_action_get</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_index_polarity_get(struct counter_device *counter,</div><div class='add'>+	struct counter_signal *signal, size_t *index_polarity)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const size_t channel_id = signal-&gt;id - 16;</div><div class='add'>+</div><div class='add'>+	*index_polarity = priv-&gt;index_polarity[channel_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 quad8_index_polarity_set(struct counter_device *counter,</div><div class='add'>+	struct counter_signal *signal, size_t index_polarity)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const size_t channel_id = signal-&gt;id - 16;</div><div class='add'>+	const unsigned int idr_cfg = priv-&gt;synchronous_mode[channel_id] |</div><div class='add'>+		index_polarity &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * channel_id + 1;</div><div class='add'>+</div><div class='add'>+	priv-&gt;index_polarity[channel_id] = index_polarity;</div><div class='add'>+</div><div class='add'>+	/* Load Index Control configuration to Index Control Register */</div><div class='add'>+	outb(QUAD8_CTR_IDR | idr_cfg, base_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_signal_enum_ext quad8_index_pol_enum = {</div><div class='add'>+	.items = quad8_index_polarity_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_index_polarity_modes),</div><div class='add'>+	.get = quad8_index_polarity_get,</div><div class='add'>+	.set = quad8_index_polarity_set</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_synchronous_mode_get(struct counter_device *counter,</div><div class='add'>+	struct counter_signal *signal, size_t *synchronous_mode)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const size_t channel_id = signal-&gt;id - 16;</div><div class='add'>+</div><div class='add'>+	*synchronous_mode = priv-&gt;synchronous_mode[channel_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 quad8_synchronous_mode_set(struct counter_device *counter,</div><div class='add'>+	struct counter_signal *signal, size_t synchronous_mode)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const size_t channel_id = signal-&gt;id - 16;</div><div class='add'>+	const unsigned int idr_cfg = synchronous_mode |</div><div class='add'>+		priv-&gt;index_polarity[channel_id] &lt;&lt; 1;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * channel_id + 1;</div><div class='add'>+</div><div class='add'>+	/* Index function must be non-synchronous in non-quadrature mode */</div><div class='add'>+	if (synchronous_mode &amp;&amp; !priv-&gt;quadrature_mode[channel_id])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;synchronous_mode[channel_id] = synchronous_mode;</div><div class='add'>+</div><div class='add'>+	/* Load Index Control configuration to Index Control Register */</div><div class='add'>+	outb(QUAD8_CTR_IDR | idr_cfg, base_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_signal_enum_ext quad8_syn_mode_enum = {</div><div class='add'>+	.items = quad8_synchronous_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_synchronous_modes),</div><div class='add'>+	.get = quad8_synchronous_mode_get,</div><div class='add'>+	.set = quad8_synchronous_mode_set</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_floor_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	/* Only a floor of 0 is supported */</div><div class='add'>+	return sprintf(buf, "0\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int quad8_count_mode_get(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, size_t *cnt_mode)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Map 104-QUAD-8 count mode to Generic Counter count mode */</div><div class='add'>+	switch (priv-&gt;count_mode[count-&gt;id]) {</div><div class='add'>+	case 0:</div><div class='add'>+		*cnt_mode = COUNTER_COUNT_MODE_NORMAL;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*cnt_mode = COUNTER_COUNT_MODE_RANGE_LIMIT;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		*cnt_mode = COUNTER_COUNT_MODE_NON_RECYCLE;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		*cnt_mode = COUNTER_COUNT_MODE_MODULO_N;</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 quad8_count_mode_set(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, size_t cnt_mode)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	unsigned int mode_cfg;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id + 1;</div><div class='add'>+</div><div class='add'>+	/* Map Generic Counter count mode to 104-QUAD-8 count mode */</div><div class='add'>+	switch (cnt_mode) {</div><div class='add'>+	case COUNTER_COUNT_MODE_NORMAL:</div><div class='add'>+		cnt_mode = 0;</div><div class='add'>+		break;</div><div class='add'>+	case COUNTER_COUNT_MODE_RANGE_LIMIT:</div><div class='add'>+		cnt_mode = 1;</div><div class='add'>+		break;</div><div class='add'>+	case COUNTER_COUNT_MODE_NON_RECYCLE:</div><div class='add'>+		cnt_mode = 2;</div><div class='add'>+		break;</div><div class='add'>+	case COUNTER_COUNT_MODE_MODULO_N:</div><div class='add'>+		cnt_mode = 3;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;count_mode[count-&gt;id] = cnt_mode;</div><div class='add'>+</div><div class='add'>+	/* Set count mode configuration value */</div><div class='add'>+	mode_cfg = cnt_mode &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	/* Add quadrature mode configuration */</div><div class='add'>+	if (priv-&gt;quadrature_mode[count-&gt;id])</div><div class='add'>+		mode_cfg |= (priv-&gt;quadrature_scale[count-&gt;id] + 1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	/* Load mode configuration to Counter Mode Register */</div><div class='add'>+	outb(QUAD8_CTR_CMR | mode_cfg, base_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_count_enum_ext quad8_cnt_mode_enum = {</div><div class='add'>+	.items = counter_count_mode_str,</div><div class='add'>+	.num_items = ARRAY_SIZE(counter_count_mode_str),</div><div class='add'>+	.get = quad8_count_mode_get,</div><div class='add'>+	.set = quad8_count_mode_set</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_direction_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *priv, char *buf)</div><div class='add'>+{</div><div class='add'>+	enum counter_count_direction dir;</div><div class='add'>+</div><div class='add'>+	quad8_direction_get(counter, count, &amp;dir);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", counter_count_direction_str[dir]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_enable_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", priv-&gt;ab_enable[count-&gt;id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_enable_write(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id;</div><div class='add'>+	int err;</div><div class='add'>+	bool ab_enable;</div><div class='add'>+	unsigned int ior_cfg;</div><div class='add'>+</div><div class='add'>+	err = kstrtobool(buf, &amp;ab_enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ab_enable[count-&gt;id] = ab_enable;</div><div class='add'>+</div><div class='add'>+	ior_cfg = ab_enable | priv-&gt;preset_enable[count-&gt;id] &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	/* Load I/O control configuration */</div><div class='add'>+	outb(QUAD8_CTR_IOR | ior_cfg, base_offset + 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 quad8_error_noise_get(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, size_t *noise_error)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id + 1;</div><div class='add'>+</div><div class='add'>+	*noise_error = !!(inb(base_offset) &amp; QUAD8_FLAG_E);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_count_enum_ext quad8_error_noise_enum = {</div><div class='add'>+	.items = quad8_noise_error_states,</div><div class='add'>+	.num_items = ARRAY_SIZE(quad8_noise_error_states),</div><div class='add'>+	.get = quad8_error_noise_get</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_preset_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", priv-&gt;preset[count-&gt;id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_preset_write(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id;</div><div class='add'>+	unsigned int preset;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;preset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Only 24-bit values are supported */</div><div class='add'>+	if (preset &gt; 0xFFFFFF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;preset[count-&gt;id] = preset;</div><div class='add'>+</div><div class='add'>+	/* Reset Byte Pointer */</div><div class='add'>+	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+</div><div class='add'>+	/* Set Preset Register */</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		outb(preset &gt;&gt; (8 * i), base_offset);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_ceiling_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Range Limit and Modulo-N count modes use preset value as ceiling */</div><div class='add'>+	switch (priv-&gt;count_mode[count-&gt;id]) {</div><div class='add'>+	case 1:</div><div class='add'>+	case 3:</div><div class='add'>+		return quad8_count_preset_read(counter, count, private, buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* By default 0x1FFFFFF (25 bits unsigned) is maximum count */</div><div class='add'>+	return sprintf(buf, "33554431\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_ceiling_write(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Range Limit and Modulo-N count modes use preset value as ceiling */</div><div class='add'>+	switch (priv-&gt;count_mode[count-&gt;id]) {</div><div class='add'>+	case 1:</div><div class='add'>+	case 3:</div><div class='add'>+		return quad8_count_preset_write(counter, count, private, buf,</div><div class='add'>+						len);</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 ssize_t quad8_count_preset_enable_read(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", !priv-&gt;preset_enable[count-&gt;id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t quad8_count_preset_enable_write(struct counter_device *counter,</div><div class='add'>+	struct counter_count *count, void *private, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct quad8_iio *const priv = counter-&gt;priv;</div><div class='add'>+	const int base_offset = priv-&gt;base + 2 * count-&gt;id + 1;</div><div class='add'>+	bool preset_enable;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int ior_cfg;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;preset_enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Preset enable is active low in Input/Output Control register */</div><div class='add'>+	preset_enable = !preset_enable;</div><div class='add'>+</div><div class='add'>+	priv-&gt;preset_enable[count-&gt;id] = preset_enable;</div><div class='add'>+</div><div class='add'>+	ior_cfg = priv-&gt;ab_enable[count-&gt;id] | (unsigned int)preset_enable &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	/* Load I/O control configuration to Input / Output Control Register */</div><div class='add'>+	outb(QUAD8_CTR_IOR | ior_cfg, base_offset);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct counter_signal_ext quad8_index_ext[] = {</div><div class='add'>+	COUNTER_SIGNAL_ENUM("index_polarity", &amp;quad8_index_pol_enum),</div><div class='add'>+	COUNTER_SIGNAL_ENUM_AVAILABLE("index_polarity",	&amp;quad8_index_pol_enum),</div><div class='add'>+	COUNTER_SIGNAL_ENUM("synchronous_mode", &amp;quad8_syn_mode_enum),</div><div class='add'>+	COUNTER_SIGNAL_ENUM_AVAILABLE("synchronous_mode", &amp;quad8_syn_mode_enum)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	QUAD8_QUAD_SIGNAL(_id, _name) {	\</div><div class='add'>+	.id = (_id),			\</div><div class='add'>+	.name = (_name)			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define	QUAD8_INDEX_SIGNAL(_id, _name) {	\</div><div class='add'>+	.id = (_id),				\</div><div class='add'>+	.name = (_name),			\</div><div class='add'>+	.ext = quad8_index_ext,			\</div><div class='add'>+	.num_ext = ARRAY_SIZE(quad8_index_ext)	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_signal quad8_signals[] = {</div><div class='add'>+	QUAD8_QUAD_SIGNAL(0, "Channel 1 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(1, "Channel 1 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(2, "Channel 2 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(3, "Channel 2 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(4, "Channel 3 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(5, "Channel 3 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(6, "Channel 4 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(7, "Channel 4 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(8, "Channel 5 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(9, "Channel 5 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(10, "Channel 6 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(11, "Channel 6 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(12, "Channel 7 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(13, "Channel 7 Quadrature B"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(14, "Channel 8 Quadrature A"),</div><div class='add'>+	QUAD8_QUAD_SIGNAL(15, "Channel 8 Quadrature B"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(16, "Channel 1 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(17, "Channel 2 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(18, "Channel 3 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(19, "Channel 4 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(20, "Channel 5 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(21, "Channel 6 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(22, "Channel 7 Index"),</div><div class='add'>+	QUAD8_INDEX_SIGNAL(23, "Channel 8 Index")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QUAD8_COUNT_SYNAPSES(_id) {					\</div><div class='add'>+	{								\</div><div class='add'>+		.actions_list = quad8_synapse_actions_list,		\</div><div class='add'>+		.num_actions = ARRAY_SIZE(quad8_synapse_actions_list),	\</div><div class='add'>+		.signal = quad8_signals + 2 * (_id)			\</div><div class='add'>+	},								\</div><div class='add'>+	{								\</div><div class='add'>+		.actions_list = quad8_synapse_actions_list,		\</div><div class='add'>+		.num_actions = ARRAY_SIZE(quad8_synapse_actions_list),	\</div><div class='add'>+		.signal = quad8_signals + 2 * (_id) + 1			\</div><div class='add'>+	},								\</div><div class='add'>+	{								\</div><div class='add'>+		.actions_list = quad8_index_actions_list,		\</div><div class='add'>+		.num_actions = ARRAY_SIZE(quad8_index_actions_list),	\</div><div class='add'>+		.signal = quad8_signals + 2 * (_id) + 16		\</div><div class='add'>+	}								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_synapse quad8_count_synapses[][3] = {</div><div class='add'>+	QUAD8_COUNT_SYNAPSES(0), QUAD8_COUNT_SYNAPSES(1),</div><div class='add'>+	QUAD8_COUNT_SYNAPSES(2), QUAD8_COUNT_SYNAPSES(3),</div><div class='add'>+	QUAD8_COUNT_SYNAPSES(4), QUAD8_COUNT_SYNAPSES(5),</div><div class='add'>+	QUAD8_COUNT_SYNAPSES(6), QUAD8_COUNT_SYNAPSES(7)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct counter_count_ext quad8_count_ext[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "ceiling",</div><div class='add'>+		.read = quad8_count_ceiling_read,</div><div class='add'>+		.write = quad8_count_ceiling_write</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "floor",</div><div class='add'>+		.read = quad8_count_floor_read</div><div class='add'>+	},</div><div class='add'>+	COUNTER_COUNT_ENUM("count_mode", &amp;quad8_cnt_mode_enum),</div><div class='add'>+	COUNTER_COUNT_ENUM_AVAILABLE("count_mode", &amp;quad8_cnt_mode_enum),</div><div class='add'>+	{</div><div class='add'>+		.name = "direction",</div><div class='add'>+		.read = quad8_count_direction_read</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "enable",</div><div class='add'>+		.read = quad8_count_enable_read,</div><div class='add'>+		.write = quad8_count_enable_write</div><div class='add'>+	},</div><div class='add'>+	COUNTER_COUNT_ENUM("error_noise", &amp;quad8_error_noise_enum),</div><div class='add'>+	COUNTER_COUNT_ENUM_AVAILABLE("error_noise", &amp;quad8_error_noise_enum),</div><div class='add'>+	{</div><div class='add'>+		.name = "preset",</div><div class='add'>+		.read = quad8_count_preset_read,</div><div class='add'>+		.write = quad8_count_preset_write</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "preset_enable",</div><div class='add'>+		.read = quad8_count_preset_enable_read,</div><div class='add'>+		.write = quad8_count_preset_enable_write</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QUAD8_COUNT(_id, _cntname) {					\</div><div class='add'>+	.id = (_id),							\</div><div class='add'>+	.name = (_cntname),						\</div><div class='add'>+	.functions_list = quad8_count_functions_list,			\</div><div class='add'>+	.num_functions = ARRAY_SIZE(quad8_count_functions_list),	\</div><div class='add'>+	.synapses = quad8_count_synapses[(_id)],			\</div><div class='add'>+	.num_synapses =	2,						\</div><div class='add'>+	.ext = quad8_count_ext,						\</div><div class='add'>+	.num_ext = ARRAY_SIZE(quad8_count_ext)				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct counter_count quad8_counts[] = {</div><div class='add'>+	QUAD8_COUNT(0, "Channel 1 Count"),</div><div class='add'>+	QUAD8_COUNT(1, "Channel 2 Count"),</div><div class='add'>+	QUAD8_COUNT(2, "Channel 3 Count"),</div><div class='add'>+	QUAD8_COUNT(3, "Channel 4 Count"),</div><div class='add'>+	QUAD8_COUNT(4, "Channel 5 Count"),</div><div class='add'>+	QUAD8_COUNT(5, "Channel 6 Count"),</div><div class='add'>+	QUAD8_COUNT(6, "Channel 7 Count"),</div><div class='add'>+	QUAD8_COUNT(7, "Channel 8 Count")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int quad8_probe(struct device *dev, unsigned int id)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev;</div><div class='add'>+	struct quad8_iio *quad8iio;</div><div class='add'>+	int i, j;</div><div class='add'>+	unsigned int base_offset;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!devm_request_region(dev, base[id], QUAD8_EXTENT, dev_name(dev))) {</div><div class='add'>+		dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",</div><div class='add'>+			base[id], base[id] + QUAD8_EXTENT);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate IIO device; this also allocates driver data structure */</div><div class='add'>+	indio_dev = devm_iio_device_alloc(dev, sizeof(*quad8iio));</div><div class='add'>+	if (!indio_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Initialize IIO device */</div><div class='add'>+	indio_dev-&gt;info = &amp;quad8_info;</div><div class='add'>+	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='add'>+	indio_dev-&gt;num_channels = ARRAY_SIZE(quad8_channels);</div><div class='add'>+	indio_dev-&gt;channels = quad8_channels;</div><div class='add'>+	indio_dev-&gt;name = dev_name(dev);</div><div class='add'>+	indio_dev-&gt;dev.parent = dev;</div><div class='add'>+</div><div class='add'>+	/* Initialize Counter device and driver data */</div><div class='add'>+	quad8iio = iio_priv(indio_dev);</div><div class='add'>+	quad8iio-&gt;counter.name = dev_name(dev);</div><div class='add'>+	quad8iio-&gt;counter.parent = dev;</div><div class='add'>+	quad8iio-&gt;counter.ops = &amp;quad8_ops;</div><div class='add'>+	quad8iio-&gt;counter.counts = quad8_counts;</div><div class='add'>+	quad8iio-&gt;counter.num_counts = ARRAY_SIZE(quad8_counts);</div><div class='add'>+	quad8iio-&gt;counter.signals = quad8_signals;</div><div class='add'>+	quad8iio-&gt;counter.num_signals = ARRAY_SIZE(quad8_signals);</div><div class='add'>+	quad8iio-&gt;counter.priv = quad8iio;</div><div class='add'>+	quad8iio-&gt;base = base[id];</div><div class='add'>+</div><div class='add'>+	/* Reset all counters and disable interrupt function */</div><div class='add'>+	outb(QUAD8_CHAN_OP_RESET_COUNTERS, base[id] + QUAD8_REG_CHAN_OP);</div><div class='add'>+	/* Set initial configuration for all counters */</div><div class='add'>+	for (i = 0; i &lt; QUAD8_NUM_COUNTERS; i++) {</div><div class='add'>+		base_offset = base[id] + 2 * i;</div><div class='add'>+		/* Reset Byte Pointer */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='add'>+		/* Reset Preset Register */</div><div class='add'>+		for (j = 0; j &lt; 3; j++)</div><div class='add'>+			outb(0x00, base_offset);</div><div class='add'>+		/* Reset Borrow, Carry, Compare, and Sign flags */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_FLAGS, base_offset + 1);</div><div class='add'>+		/* Reset Error flag */</div><div class='add'>+		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_E, base_offset + 1);</div><div class='add'>+		/* Binary encoding; Normal count; non-quadrature mode */</div><div class='add'>+		outb(QUAD8_CTR_CMR, base_offset + 1);</div><div class='add'>+		/* Disable A and B inputs; preset on index; FLG1 as Carry */</div><div class='add'>+		outb(QUAD8_CTR_IOR, base_offset + 1);</div><div class='add'>+		/* Disable index function; negative index polarity */</div><div class='add'>+		outb(QUAD8_CTR_IDR, base_offset + 1);</div><div class='add'>+	}</div><div class='add'>+	/* Enable all counters */</div><div class='add'>+	outb(QUAD8_CHAN_OP_ENABLE_COUNTERS, base[id] + QUAD8_REG_CHAN_OP);</div><div class='add'>+</div><div class='add'>+	/* Register IIO device */</div><div class='add'>+	err = devm_iio_device_register(dev, indio_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Register Counter device */</div><div class='add'>+	return devm_counter_register(dev, &amp;quad8iio-&gt;counter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct isa_driver quad8_driver = {</div><div class='add'>+	.probe = quad8_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "104-quad-8"</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_isa_driver(quad8_driver, num_quad8);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("ACCES 104-QUAD-8 IIO driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig<br/>new file mode 100644<br/>index 000000000000..233ac305d878<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+#</div><div class='add'>+# Counter devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+menuconfig COUNTER</div><div class='add'>+	tristate "Counter support"</div><div class='add'>+	help</div><div class='add'>+	  This enables counter device support through the Generic Counter</div><div class='add'>+	  interface. You only need to enable this, if you also want to enable</div><div class='add'>+	  one or more of the counter device drivers below.</div><div class='add'>+</div><div class='add'>+if COUNTER</div><div class='add'>+</div><div class='add'>+config 104_QUAD_8</div><div class='add'>+	tristate "ACCES 104-QUAD-8 driver"</div><div class='add'>+	depends on PC104 &amp;&amp; X86 &amp;&amp; IIO</div><div class='add'>+	select ISA_BUS_API</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to build support for the ACCES 104-QUAD-8 quadrature</div><div class='add'>+	  encoder counter/interface device family (104-QUAD-8, 104-QUAD-4).</div><div class='add'>+</div><div class='add'>+	  A counter's respective error flag may be cleared by performing a write</div><div class='add'>+	  operation on the respective count value attribute. Although the</div><div class='add'>+	  104-QUAD-8 counters have a 25-bit range, only the lower 24 bits may be</div><div class='add'>+	  set, either directly or via the counter's preset attribute. Interrupts</div><div class='add'>+	  are not supported by this driver.</div><div class='add'>+</div><div class='add'>+	  The base port addresses for the devices may be configured via the base</div><div class='add'>+	  array module parameter.</div><div class='add'>+</div><div class='add'>+config STM32_TIMER_CNT</div><div class='add'>+	tristate "STM32 Timer encoder counter driver"</div><div class='add'>+	depends on MFD_STM32_TIMERS || COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  Select this option to enable STM32 Timer quadrature encoder</div><div class='add'>+	  and counter driver.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called stm32-timer-cnt.</div><div class='add'>+</div><div class='add'>+config STM32_LPTIMER_CNT</div><div class='add'>+	tristate "STM32 LP Timer encoder counter driver"</div><div class='add'>+	depends on (MFD_STM32_LPTIMER || COMPILE_TEST) &amp;&amp; IIO</div><div class='add'>+	help</div><div class='add'>+	  Select this option to enable STM32 Low-Power Timer quadrature encoder</div><div class='add'>+	  and counter driver.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called stm32-lptimer-cnt.</div><div class='add'>+</div><div class='add'>+config FTM_QUADDEC</div><div class='add'>+	tristate "Flex Timer Module Quadrature decoder driver"</div><div class='add'>+	help</div><div class='add'>+	  Select this option to enable the Flex Timer Quadrature decoder</div><div class='add'>+	  driver.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called ftm-quaddec.</div><div class='add'>+</div><div class='add'>+endif # COUNTER</div><div class='head'>diff --git a/drivers/counter/Makefile b/drivers/counter/Makefile<br/>new file mode 100644<br/>index 000000000000..0c9e622a6bea<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for Counter devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_COUNTER) += counter.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_104_QUAD_8)	+= 104-quad-8.o</div><div class='add'>+obj-$(CONFIG_STM32_TIMER_CNT)	+= stm32-timer-cnt.o</div><div class='add'>+obj-$(CONFIG_STM32_LPTIMER_CNT)	+= stm32-lptimer-cnt.o</div><div class='add'>+obj-$(CONFIG_FTM_QUADDEC)	+= ftm-quaddec.o</div><div class='head'>diff --git a/drivers/counter/counter.c b/drivers/counter/counter.c<br/>new file mode 100644<br/>index 000000000000..106bc7180cd8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/counter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/counter.c</a></div><div class='hunk'>@@ -0,0 +1,1567 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Generic Counter interface</div><div class='add'>+ * Copyright (C) 2018 William Breathitt Gray</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/counter.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/idr.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/list.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/printk.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'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+const char *const counter_count_direction_str[2] = {</div><div class='add'>+	[COUNTER_COUNT_DIRECTION_FORWARD] = "forward",</div><div class='add'>+	[COUNTER_COUNT_DIRECTION_BACKWARD] = "backward"</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_count_direction_str);</div><div class='add'>+</div><div class='add'>+const char *const counter_count_mode_str[4] = {</div><div class='add'>+	[COUNTER_COUNT_MODE_NORMAL] = "normal",</div><div class='add'>+	[COUNTER_COUNT_MODE_RANGE_LIMIT] = "range limit",</div><div class='add'>+	[COUNTER_COUNT_MODE_NON_RECYCLE] = "non-recycle",</div><div class='add'>+	[COUNTER_COUNT_MODE_MODULO_N] = "modulo-n"</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_count_mode_str);</div><div class='add'>+</div><div class='add'>+ssize_t counter_signal_enum_read(struct counter_device *counter,</div><div class='add'>+				 struct counter_signal *signal, void *priv,</div><div class='add'>+				 char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_signal_enum_ext *const e = priv;</div><div class='add'>+	int err;</div><div class='add'>+	size_t index;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;get)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = e-&gt;get(counter, signal, &amp;index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= e-&gt;num_items)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", e-&gt;items[index]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_signal_enum_read);</div><div class='add'>+</div><div class='add'>+ssize_t counter_signal_enum_write(struct counter_device *counter,</div><div class='add'>+				  struct counter_signal *signal, void *priv,</div><div class='add'>+				  const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_signal_enum_ext *const e = priv;</div><div class='add'>+	ssize_t index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;set)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	index = __sysfs_match_string(e-&gt;items, e-&gt;num_items, buf);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return index;</div><div class='add'>+</div><div class='add'>+	err = e-&gt;set(counter, signal, index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_signal_enum_write);</div><div class='add'>+</div><div class='add'>+ssize_t counter_signal_enum_available_read(struct counter_device *counter,</div><div class='add'>+					   struct counter_signal *signal,</div><div class='add'>+					   void *priv, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_signal_enum_ext *const e = priv;</div><div class='add'>+	size_t i;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;num_items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;num_items; i++)</div><div class='add'>+		len += sprintf(buf + len, "%s\n", e-&gt;items[i]);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_signal_enum_available_read);</div><div class='add'>+</div><div class='add'>+ssize_t counter_count_enum_read(struct counter_device *counter,</div><div class='add'>+				struct counter_count *count, void *priv,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_count_enum_ext *const e = priv;</div><div class='add'>+	int err;</div><div class='add'>+	size_t index;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;get)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = e-&gt;get(counter, count, &amp;index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= e-&gt;num_items)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", e-&gt;items[index]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_count_enum_read);</div><div class='add'>+</div><div class='add'>+ssize_t counter_count_enum_write(struct counter_device *counter,</div><div class='add'>+				 struct counter_count *count, void *priv,</div><div class='add'>+				 const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_count_enum_ext *const e = priv;</div><div class='add'>+	ssize_t index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;set)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	index = __sysfs_match_string(e-&gt;items, e-&gt;num_items, buf);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return index;</div><div class='add'>+</div><div class='add'>+	err = e-&gt;set(counter, count, index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_count_enum_write);</div><div class='add'>+</div><div class='add'>+ssize_t counter_count_enum_available_read(struct counter_device *counter,</div><div class='add'>+					  struct counter_count *count,</div><div class='add'>+					  void *priv, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_count_enum_ext *const e = priv;</div><div class='add'>+	size_t i;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;num_items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;num_items; i++)</div><div class='add'>+		len += sprintf(buf + len, "%s\n", e-&gt;items[i]);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_count_enum_available_read);</div><div class='add'>+</div><div class='add'>+ssize_t counter_device_enum_read(struct counter_device *counter, void *priv,</div><div class='add'>+				 char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_enum_ext *const e = priv;</div><div class='add'>+	int err;</div><div class='add'>+	size_t index;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;get)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = e-&gt;get(counter, &amp;index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= e-&gt;num_items)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", e-&gt;items[index]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_device_enum_read);</div><div class='add'>+</div><div class='add'>+ssize_t counter_device_enum_write(struct counter_device *counter, void *priv,</div><div class='add'>+				  const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_enum_ext *const e = priv;</div><div class='add'>+	ssize_t index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;set)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	index = __sysfs_match_string(e-&gt;items, e-&gt;num_items, buf);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return index;</div><div class='add'>+</div><div class='add'>+	err = e-&gt;set(counter, index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_device_enum_write);</div><div class='add'>+</div><div class='add'>+ssize_t counter_device_enum_available_read(struct counter_device *counter,</div><div class='add'>+					   void *priv, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_enum_ext *const e = priv;</div><div class='add'>+	size_t i;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+</div><div class='add'>+	if (!e-&gt;num_items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;num_items; i++)</div><div class='add'>+		len += sprintf(buf + len, "%s\n", e-&gt;items[i]);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_device_enum_available_read);</div><div class='add'>+</div><div class='add'>+static const char *const counter_signal_level_str[] = {</div><div class='add'>+	[COUNTER_SIGNAL_LEVEL_LOW] = "low",</div><div class='add'>+	[COUNTER_SIGNAL_LEVEL_HIGH] = "high"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * counter_signal_read_value_set - set counter_signal_read_value data</div><div class='add'>+ * @val:	counter_signal_read_value structure to set</div><div class='add'>+ * @type:	property Signal data represents</div><div class='add'>+ * @data:	Signal data</div><div class='add'>+ *</div><div class='add'>+ * This function sets an opaque counter_signal_read_value structure with the</div><div class='add'>+ * provided Signal data.</div><div class='add'>+ */</div><div class='add'>+void counter_signal_read_value_set(struct counter_signal_read_value *const val,</div><div class='add'>+				   const enum counter_signal_value_type type,</div><div class='add'>+				   void *const data)</div><div class='add'>+{</div><div class='add'>+	if (type == COUNTER_SIGNAL_LEVEL)</div><div class='add'>+		val-&gt;len = sprintf(val-&gt;buf, "%s\n",</div><div class='add'>+				   counter_signal_level_str[*(enum counter_signal_level *)data]);</div><div class='add'>+	else</div><div class='add'>+		val-&gt;len = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_signal_read_value_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * counter_count_read_value_set - set counter_count_read_value data</div><div class='add'>+ * @val:	counter_count_read_value structure to set</div><div class='add'>+ * @type:	property Count data represents</div><div class='add'>+ * @data:	Count data</div><div class='add'>+ *</div><div class='add'>+ * This function sets an opaque counter_count_read_value structure with the</div><div class='add'>+ * provided Count data.</div><div class='add'>+ */</div><div class='add'>+void counter_count_read_value_set(struct counter_count_read_value *const val,</div><div class='add'>+				  const enum counter_count_value_type type,</div><div class='add'>+				  void *const data)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case COUNTER_COUNT_POSITION:</div><div class='add'>+		val-&gt;len = sprintf(val-&gt;buf, "%lu\n", *(unsigned long *)data);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		val-&gt;len = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_count_read_value_set);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * counter_count_write_value_get - get counter_count_write_value data</div><div class='add'>+ * @data:	Count data</div><div class='add'>+ * @type:	property Count data represents</div><div class='add'>+ * @val:	counter_count_write_value structure containing data</div><div class='add'>+ *</div><div class='add'>+ * This function extracts Count data from the provided opaque</div><div class='add'>+ * counter_count_write_value structure and stores it at the address provided by</div><div class='add'>+ * @data.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * 0 on success, negative error number on failure.</div><div class='add'>+ */</div><div class='add'>+int counter_count_write_value_get(void *const data,</div><div class='add'>+				  const enum counter_count_value_type type,</div><div class='add'>+				  const struct counter_count_write_value *const val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case COUNTER_COUNT_POSITION:</div><div class='add'>+		err = kstrtoul(val-&gt;buf, 0, data);</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'>+EXPORT_SYMBOL_GPL(counter_count_write_value_get);</div><div class='add'>+</div><div class='add'>+struct counter_attr_parm {</div><div class='add'>+	struct counter_device_attr_group *group;</div><div class='add'>+	const char *prefix;</div><div class='add'>+	const char *name;</div><div class='add'>+	ssize_t (*show)(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf);</div><div class='add'>+	ssize_t (*store)(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t len);</div><div class='add'>+	void *component;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct counter_device_attr {</div><div class='add'>+	struct device_attribute dev_attr;</div><div class='add'>+	struct list_head l;</div><div class='add'>+	void *component;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int counter_attribute_create(const struct counter_attr_parm *const parm)</div><div class='add'>+{</div><div class='add'>+	struct counter_device_attr *counter_attr;</div><div class='add'>+	struct device_attribute *dev_attr;</div><div class='add'>+	int err;</div><div class='add'>+	struct list_head *const attr_list = &amp;parm-&gt;group-&gt;attr_list;</div><div class='add'>+</div><div class='add'>+	/* Allocate a Counter device attribute */</div><div class='add'>+	counter_attr = kzalloc(sizeof(*counter_attr), GFP_KERNEL);</div><div class='add'>+	if (!counter_attr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev_attr = &amp;counter_attr-&gt;dev_attr;</div><div class='add'>+</div><div class='add'>+	sysfs_attr_init(&amp;dev_attr-&gt;attr);</div><div class='add'>+</div><div class='add'>+	/* Configure device attribute */</div><div class='add'>+	dev_attr-&gt;attr.name = kasprintf(GFP_KERNEL, "%s%s", parm-&gt;prefix,</div><div class='add'>+					parm-&gt;name);</div><div class='add'>+	if (!dev_attr-&gt;attr.name) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_counter_attr;</div><div class='add'>+	}</div><div class='add'>+	if (parm-&gt;show) {</div><div class='add'>+		dev_attr-&gt;attr.mode |= 0444;</div><div class='add'>+		dev_attr-&gt;show = parm-&gt;show;</div><div class='add'>+	}</div><div class='add'>+	if (parm-&gt;store) {</div><div class='add'>+		dev_attr-&gt;attr.mode |= 0200;</div><div class='add'>+		dev_attr-&gt;store = parm-&gt;store;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store associated Counter component with attribute */</div><div class='add'>+	counter_attr-&gt;component = parm-&gt;component;</div><div class='add'>+</div><div class='add'>+	/* Keep track of the attribute for later cleanup */</div><div class='add'>+	list_add(&amp;counter_attr-&gt;l, attr_list);</div><div class='add'>+	parm-&gt;group-&gt;num_attr++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_counter_attr:</div><div class='add'>+	kfree(counter_attr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define to_counter_attr(_dev_attr) \</div><div class='add'>+	container_of(_dev_attr, struct counter_device_attr, dev_attr)</div><div class='add'>+</div><div class='add'>+struct counter_signal_unit {</div><div class='add'>+	struct counter_signal *signal;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_signal_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_signal_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_signal *const signal = component-&gt;signal;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_signal_read_value val = { .buf = buf };</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;signal_read(counter, signal, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return val.len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_name_unit {</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_device_attr_name_show(struct device *dev,</div><div class='add'>+					     struct device_attribute *attr,</div><div class='add'>+					     char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_name_unit *const comp = to_counter_attr(attr)-&gt;component;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", comp-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_name_attribute_create(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	const char *const name)</div><div class='add'>+{</div><div class='add'>+	struct counter_name_unit *name_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Skip if no name */</div><div class='add'>+	if (!name)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Allocate name attribute component */</div><div class='add'>+	name_comp = kmalloc(sizeof(*name_comp), GFP_KERNEL);</div><div class='add'>+	if (!name_comp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	name_comp-&gt;name = name;</div><div class='add'>+</div><div class='add'>+	/* Allocate Signal name attribute */</div><div class='add'>+	parm.group = group;</div><div class='add'>+	parm.prefix = "";</div><div class='add'>+	parm.name = "name";</div><div class='add'>+	parm.show = counter_device_attr_name_show;</div><div class='add'>+	parm.store = NULL;</div><div class='add'>+	parm.component = name_comp;</div><div class='add'>+	err = counter_attribute_create(&amp;parm);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_name_comp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_name_comp:</div><div class='add'>+	kfree(name_comp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_signal_ext_unit {</div><div class='add'>+	struct counter_signal *signal;</div><div class='add'>+	const struct counter_signal_ext *ext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_signal_ext_show(struct device *dev,</div><div class='add'>+				       struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_signal_ext_unit *const comp = devattr-&gt;component;</div><div class='add'>+	const struct counter_signal_ext *const ext = comp-&gt;ext;</div><div class='add'>+</div><div class='add'>+	return ext-&gt;read(dev_get_drvdata(dev), comp-&gt;signal, ext-&gt;priv, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t counter_signal_ext_store(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_signal_ext_unit *const comp = devattr-&gt;component;</div><div class='add'>+	const struct counter_signal_ext *const ext = comp-&gt;ext;</div><div class='add'>+</div><div class='add'>+	return ext-&gt;write(dev_get_drvdata(dev), comp-&gt;signal, ext-&gt;priv, buf,</div><div class='add'>+		len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void counter_device_attr_list_free(struct list_head *attr_list)</div><div class='add'>+{</div><div class='add'>+	struct counter_device_attr *p, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(p, n, attr_list, l) {</div><div class='add'>+		/* free attribute name and associated component memory */</div><div class='add'>+		kfree(p-&gt;dev_attr.attr.name);</div><div class='add'>+		kfree(p-&gt;component);</div><div class='add'>+		list_del(&amp;p-&gt;l);</div><div class='add'>+		kfree(p);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_signal_ext_register(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	struct counter_signal *const signal)</div><div class='add'>+{</div><div class='add'>+	const size_t num_ext = signal-&gt;num_ext;</div><div class='add'>+	size_t i;</div><div class='add'>+	const struct counter_signal_ext *ext;</div><div class='add'>+	struct counter_signal_ext_unit *signal_ext_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Create an attribute for each extension */</div><div class='add'>+	for (i = 0 ; i &lt; num_ext; i++) {</div><div class='add'>+		ext = signal-&gt;ext + i;</div><div class='add'>+</div><div class='add'>+		/* Allocate signal_ext attribute component */</div><div class='add'>+		signal_ext_comp = kmalloc(sizeof(*signal_ext_comp), GFP_KERNEL);</div><div class='add'>+		if (!signal_ext_comp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_attr_list;</div><div class='add'>+		}</div><div class='add'>+		signal_ext_comp-&gt;signal = signal;</div><div class='add'>+		signal_ext_comp-&gt;ext = ext;</div><div class='add'>+</div><div class='add'>+		/* Allocate a Counter device attribute */</div><div class='add'>+		parm.group = group;</div><div class='add'>+		parm.prefix = "";</div><div class='add'>+		parm.name = ext-&gt;name;</div><div class='add'>+		parm.show = (ext-&gt;read) ? counter_signal_ext_show : NULL;</div><div class='add'>+		parm.store = (ext-&gt;write) ? counter_signal_ext_store : NULL;</div><div class='add'>+		parm.component = signal_ext_comp;</div><div class='add'>+		err = counter_attribute_create(&amp;parm);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(signal_ext_comp);</div><div class='add'>+			goto err_free_attr_list;</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_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_signal_attributes_create(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	const struct counter_device *const counter,</div><div class='add'>+	struct counter_signal *const signal)</div><div class='add'>+{</div><div class='add'>+	struct counter_signal_unit *signal_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Allocate Signal attribute component */</div><div class='add'>+	signal_comp = kmalloc(sizeof(*signal_comp), GFP_KERNEL);</div><div class='add'>+	if (!signal_comp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	signal_comp-&gt;signal = signal;</div><div class='add'>+</div><div class='add'>+	/* Create main Signal attribute */</div><div class='add'>+	parm.group = group;</div><div class='add'>+	parm.prefix = "";</div><div class='add'>+	parm.name = "signal";</div><div class='add'>+	parm.show = (counter-&gt;ops-&gt;signal_read) ? counter_signal_show : NULL;</div><div class='add'>+	parm.store = NULL;</div><div class='add'>+	parm.component = signal_comp;</div><div class='add'>+	err = counter_attribute_create(&amp;parm);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(signal_comp);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create Signal name attribute */</div><div class='add'>+	err = counter_name_attribute_create(group, signal-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	/* Register Signal extension attributes */</div><div class='add'>+	err = counter_signal_ext_register(group, signal);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_signals_register(</div><div class='add'>+	struct counter_device_attr_group *const groups_list,</div><div class='add'>+	const struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	const size_t num_signals = counter-&gt;num_signals;</div><div class='add'>+	size_t i;</div><div class='add'>+	struct counter_signal *signal;</div><div class='add'>+	const char *name;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Register each Signal */</div><div class='add'>+	for (i = 0; i &lt; num_signals; i++) {</div><div class='add'>+		signal = counter-&gt;signals + i;</div><div class='add'>+</div><div class='add'>+		/* Generate Signal attribute directory name */</div><div class='add'>+		name = kasprintf(GFP_KERNEL, "signal%d", signal-&gt;id);</div><div class='add'>+		if (!name) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_attr_groups;</div><div class='add'>+		}</div><div class='add'>+		groups_list[i].attr_group.name = name;</div><div class='add'>+</div><div class='add'>+		/* Create all attributes associated with Signal */</div><div class='add'>+		err = counter_signal_attributes_create(groups_list + i, counter,</div><div class='add'>+						       signal);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_attr_groups;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_attr_groups:</div><div class='add'>+	do {</div><div class='add'>+		kfree(groups_list[i].attr_group.name);</div><div class='add'>+		counter_device_attr_list_free(&amp;groups_list[i].attr_list);</div><div class='add'>+	} while (i--);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *const counter_synapse_action_str[] = {</div><div class='add'>+	[COUNTER_SYNAPSE_ACTION_NONE] = "none",</div><div class='add'>+	[COUNTER_SYNAPSE_ACTION_RISING_EDGE] = "rising edge",</div><div class='add'>+	[COUNTER_SYNAPSE_ACTION_FALLING_EDGE] = "falling edge",</div><div class='add'>+	[COUNTER_SYNAPSE_ACTION_BOTH_EDGES] = "both edges"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct counter_action_unit {</div><div class='add'>+	struct counter_synapse *synapse;</div><div class='add'>+	struct counter_count *count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_action_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	const struct counter_action_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_count *const count = component-&gt;count;</div><div class='add'>+	struct counter_synapse *const synapse = component-&gt;synapse;</div><div class='add'>+	size_t action_index;</div><div class='add'>+	enum counter_synapse_action action;</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;action_get(counter, count, synapse, &amp;action_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	synapse-&gt;action = action_index;</div><div class='add'>+</div><div class='add'>+	action = synapse-&gt;actions_list[action_index];</div><div class='add'>+	return sprintf(buf, "%s\n", counter_synapse_action_str[action]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t counter_action_store(struct device *dev,</div><div class='add'>+				    struct device_attribute *attr,</div><div class='add'>+				    const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_action_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_synapse *const synapse = component-&gt;synapse;</div><div class='add'>+	size_t action_index;</div><div class='add'>+	const size_t num_actions = synapse-&gt;num_actions;</div><div class='add'>+	enum counter_synapse_action action;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	struct counter_count *const count = component-&gt;count;</div><div class='add'>+</div><div class='add'>+	/* Find requested action mode */</div><div class='add'>+	for (action_index = 0; action_index &lt; num_actions; action_index++) {</div><div class='add'>+		action = synapse-&gt;actions_list[action_index];</div><div class='add'>+		if (sysfs_streq(buf, counter_synapse_action_str[action]))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	/* If requested action mode not found */</div><div class='add'>+	if (action_index &gt;= num_actions)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;action_set(counter, count, synapse, action_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	synapse-&gt;action = action_index;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_action_avail_unit {</div><div class='add'>+	const enum counter_synapse_action *actions_list;</div><div class='add'>+	size_t num_actions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_synapse_action_available_show(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_action_avail_unit *const component = devattr-&gt;component;</div><div class='add'>+	size_t i;</div><div class='add'>+	enum counter_synapse_action action;</div><div class='add'>+	ssize_t len = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; component-&gt;num_actions; i++) {</div><div class='add'>+		action = component-&gt;actions_list[i];</div><div class='add'>+		len += sprintf(buf + len, "%s\n",</div><div class='add'>+			       counter_synapse_action_str[action]);</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 int counter_synapses_register(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	const struct counter_device *const counter,</div><div class='add'>+	struct counter_count *const count, const char *const count_attr_name)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	struct counter_synapse *synapse;</div><div class='add'>+	const char *prefix;</div><div class='add'>+	struct counter_action_unit *action_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_action_avail_unit *avail_comp;</div><div class='add'>+</div><div class='add'>+	/* Register each Synapse */</div><div class='add'>+	for (i = 0; i &lt; count-&gt;num_synapses; i++) {</div><div class='add'>+		synapse = count-&gt;synapses + i;</div><div class='add'>+</div><div class='add'>+		/* Generate attribute prefix */</div><div class='add'>+		prefix = kasprintf(GFP_KERNEL, "signal%d_",</div><div class='add'>+				   synapse-&gt;signal-&gt;id);</div><div class='add'>+		if (!prefix) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_attr_list;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Allocate action attribute component */</div><div class='add'>+		action_comp = kmalloc(sizeof(*action_comp), GFP_KERNEL);</div><div class='add'>+		if (!action_comp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_prefix;</div><div class='add'>+		}</div><div class='add'>+		action_comp-&gt;synapse = synapse;</div><div class='add'>+		action_comp-&gt;count = count;</div><div class='add'>+</div><div class='add'>+		/* Create action attribute */</div><div class='add'>+		parm.group = group;</div><div class='add'>+		parm.prefix = prefix;</div><div class='add'>+		parm.name = "action";</div><div class='add'>+		parm.show = (counter-&gt;ops-&gt;action_get) ? counter_action_show : NULL;</div><div class='add'>+		parm.store = (counter-&gt;ops-&gt;action_set) ? counter_action_store : NULL;</div><div class='add'>+		parm.component = action_comp;</div><div class='add'>+		err = counter_attribute_create(&amp;parm);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(action_comp);</div><div class='add'>+			goto err_free_prefix;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Allocate action available attribute component */</div><div class='add'>+		avail_comp = kmalloc(sizeof(*avail_comp), GFP_KERNEL);</div><div class='add'>+		if (!avail_comp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_prefix;</div><div class='add'>+		}</div><div class='add'>+		avail_comp-&gt;actions_list = synapse-&gt;actions_list;</div><div class='add'>+		avail_comp-&gt;num_actions = synapse-&gt;num_actions;</div><div class='add'>+</div><div class='add'>+		/* Create action_available attribute */</div><div class='add'>+		parm.group = group;</div><div class='add'>+		parm.prefix = prefix;</div><div class='add'>+		parm.name = "action_available";</div><div class='add'>+		parm.show = counter_synapse_action_available_show;</div><div class='add'>+		parm.store = NULL;</div><div class='add'>+		parm.component = avail_comp;</div><div class='add'>+		err = counter_attribute_create(&amp;parm);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(avail_comp);</div><div class='add'>+			goto err_free_prefix;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(prefix);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_prefix:</div><div class='add'>+	kfree(prefix);</div><div class='add'>+err_free_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_count_unit {</div><div class='add'>+	struct counter_count *count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_count_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='add'>+				  char *buf)</div><div class='add'>+{</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_count_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_count *const count = component-&gt;count;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_count_read_value val = { .buf = buf };</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;count_read(counter, count, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return val.len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t counter_count_store(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr,</div><div class='add'>+				   const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_count_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_count *const count = component-&gt;count;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_count_write_value val = { .buf = buf };</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;count_write(counter, count, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *const counter_count_function_str[] = {</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_INCREASE] = "increase",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_DECREASE] = "decrease",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_PULSE_DIRECTION] = "pulse-direction",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_QUADRATURE_X1_A] = "quadrature x1 a",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_QUADRATURE_X1_B] = "quadrature x1 b",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A] = "quadrature x2 a",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B] = "quadrature x2 b",</div><div class='add'>+	[COUNTER_COUNT_FUNCTION_QUADRATURE_X4] = "quadrature x4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_function_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_count_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_count *const count = component-&gt;count;</div><div class='add'>+	size_t func_index;</div><div class='add'>+	enum counter_count_function function;</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;function_get(counter, count, &amp;func_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	count-&gt;function = func_index;</div><div class='add'>+</div><div class='add'>+	function = count-&gt;functions_list[func_index];</div><div class='add'>+	return sprintf(buf, "%s\n", counter_count_function_str[function]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t counter_function_store(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr,</div><div class='add'>+				      const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_count_unit *const component = devattr-&gt;component;</div><div class='add'>+	struct counter_count *const count = component-&gt;count;</div><div class='add'>+	const size_t num_functions = count-&gt;num_functions;</div><div class='add'>+	size_t func_index;</div><div class='add'>+	enum counter_count_function function;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/* Find requested Count function mode */</div><div class='add'>+	for (func_index = 0; func_index &lt; num_functions; func_index++) {</div><div class='add'>+		function = count-&gt;functions_list[func_index];</div><div class='add'>+		if (sysfs_streq(buf, counter_count_function_str[function]))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	/* Return error if requested Count function mode not found */</div><div class='add'>+	if (func_index &gt;= num_functions)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = counter-&gt;ops-&gt;function_set(counter, count, func_index);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	count-&gt;function = func_index;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_count_ext_unit {</div><div class='add'>+	struct counter_count *count;</div><div class='add'>+	const struct counter_count_ext *ext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_count_ext_show(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_count_ext_unit *const comp = devattr-&gt;component;</div><div class='add'>+	const struct counter_count_ext *const ext = comp-&gt;ext;</div><div class='add'>+</div><div class='add'>+	return ext-&gt;read(dev_get_drvdata(dev), comp-&gt;count, ext-&gt;priv, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t counter_count_ext_store(struct device *dev,</div><div class='add'>+				       struct device_attribute *attr,</div><div class='add'>+				       const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_count_ext_unit *const comp = devattr-&gt;component;</div><div class='add'>+	const struct counter_count_ext *const ext = comp-&gt;ext;</div><div class='add'>+</div><div class='add'>+	return ext-&gt;write(dev_get_drvdata(dev), comp-&gt;count, ext-&gt;priv, buf,</div><div class='add'>+		len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_count_ext_register(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	struct counter_count *const count)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	const struct counter_count_ext *ext;</div><div class='add'>+	struct counter_count_ext_unit *count_ext_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Create an attribute for each extension */</div><div class='add'>+	for (i = 0 ; i &lt; count-&gt;num_ext; i++) {</div><div class='add'>+		ext = count-&gt;ext + i;</div><div class='add'>+</div><div class='add'>+		/* Allocate count_ext attribute component */</div><div class='add'>+		count_ext_comp = kmalloc(sizeof(*count_ext_comp), GFP_KERNEL);</div><div class='add'>+		if (!count_ext_comp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_attr_list;</div><div class='add'>+		}</div><div class='add'>+		count_ext_comp-&gt;count = count;</div><div class='add'>+		count_ext_comp-&gt;ext = ext;</div><div class='add'>+</div><div class='add'>+		/* Allocate count_ext attribute */</div><div class='add'>+		parm.group = group;</div><div class='add'>+		parm.prefix = "";</div><div class='add'>+		parm.name = ext-&gt;name;</div><div class='add'>+		parm.show = (ext-&gt;read) ? counter_count_ext_show : NULL;</div><div class='add'>+		parm.store = (ext-&gt;write) ? counter_count_ext_store : NULL;</div><div class='add'>+		parm.component = count_ext_comp;</div><div class='add'>+		err = counter_attribute_create(&amp;parm);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(count_ext_comp);</div><div class='add'>+			goto err_free_attr_list;</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_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_func_avail_unit {</div><div class='add'>+	const enum counter_count_function *functions_list;</div><div class='add'>+	size_t num_functions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_count_function_available_show(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_func_avail_unit *const component = devattr-&gt;component;</div><div class='add'>+	const enum counter_count_function *const func_list = component-&gt;functions_list;</div><div class='add'>+	const size_t num_functions = component-&gt;num_functions;</div><div class='add'>+	size_t i;</div><div class='add'>+	enum counter_count_function function;</div><div class='add'>+	ssize_t len = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_functions; i++) {</div><div class='add'>+		function = func_list[i];</div><div class='add'>+		len += sprintf(buf + len, "%s\n",</div><div class='add'>+			       counter_count_function_str[function]);</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 int counter_count_attributes_create(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	const struct counter_device *const counter,</div><div class='add'>+	struct counter_count *const count)</div><div class='add'>+{</div><div class='add'>+	struct counter_count_unit *count_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_count_unit *func_comp;</div><div class='add'>+	struct counter_func_avail_unit *avail_comp;</div><div class='add'>+</div><div class='add'>+	/* Allocate count attribute component */</div><div class='add'>+	count_comp = kmalloc(sizeof(*count_comp), GFP_KERNEL);</div><div class='add'>+	if (!count_comp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	count_comp-&gt;count = count;</div><div class='add'>+</div><div class='add'>+	/* Create main Count attribute */</div><div class='add'>+	parm.group = group;</div><div class='add'>+	parm.prefix = "";</div><div class='add'>+	parm.name = "count";</div><div class='add'>+	parm.show = (counter-&gt;ops-&gt;count_read) ? counter_count_show : NULL;</div><div class='add'>+	parm.store = (counter-&gt;ops-&gt;count_write) ? counter_count_store : NULL;</div><div class='add'>+	parm.component = count_comp;</div><div class='add'>+	err = counter_attribute_create(&amp;parm);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(count_comp);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate function attribute component */</div><div class='add'>+	func_comp = kmalloc(sizeof(*func_comp), GFP_KERNEL);</div><div class='add'>+	if (!func_comp) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+	}</div><div class='add'>+	func_comp-&gt;count = count;</div><div class='add'>+</div><div class='add'>+	/* Create Count function attribute */</div><div class='add'>+	parm.group = group;</div><div class='add'>+	parm.prefix = "";</div><div class='add'>+	parm.name = "function";</div><div class='add'>+	parm.show = (counter-&gt;ops-&gt;function_get) ? counter_function_show : NULL;</div><div class='add'>+	parm.store = (counter-&gt;ops-&gt;function_set) ? counter_function_store : NULL;</div><div class='add'>+	parm.component = func_comp;</div><div class='add'>+	err = counter_attribute_create(&amp;parm);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(func_comp);</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate function available attribute component */</div><div class='add'>+	avail_comp = kmalloc(sizeof(*avail_comp), GFP_KERNEL);</div><div class='add'>+	if (!avail_comp) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+	}</div><div class='add'>+	avail_comp-&gt;functions_list = count-&gt;functions_list;</div><div class='add'>+	avail_comp-&gt;num_functions = count-&gt;num_functions;</div><div class='add'>+</div><div class='add'>+	/* Create Count function_available attribute */</div><div class='add'>+	parm.group = group;</div><div class='add'>+	parm.prefix = "";</div><div class='add'>+	parm.name = "function_available";</div><div class='add'>+	parm.show = counter_count_function_available_show;</div><div class='add'>+	parm.store = NULL;</div><div class='add'>+	parm.component = avail_comp;</div><div class='add'>+	err = counter_attribute_create(&amp;parm);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(avail_comp);</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create Count name attribute */</div><div class='add'>+	err = counter_name_attribute_create(group, count-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	/* Register Count extension attributes */</div><div class='add'>+	err = counter_count_ext_register(group, count);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_counts_register(</div><div class='add'>+	struct counter_device_attr_group *const groups_list,</div><div class='add'>+	const struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	struct counter_count *count;</div><div class='add'>+	const char *name;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Register each Count */</div><div class='add'>+	for (i = 0; i &lt; counter-&gt;num_counts; i++) {</div><div class='add'>+		count = counter-&gt;counts + i;</div><div class='add'>+</div><div class='add'>+		/* Generate Count attribute directory name */</div><div class='add'>+		name = kasprintf(GFP_KERNEL, "count%d", count-&gt;id);</div><div class='add'>+		if (!name) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_attr_groups;</div><div class='add'>+		}</div><div class='add'>+		groups_list[i].attr_group.name = name;</div><div class='add'>+</div><div class='add'>+		/* Register the Synapses associated with each Count */</div><div class='add'>+		err = counter_synapses_register(groups_list + i, counter, count,</div><div class='add'>+						name);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_attr_groups;</div><div class='add'>+</div><div class='add'>+		/* Create all attributes associated with Count */</div><div class='add'>+		err = counter_count_attributes_create(groups_list + i, counter,</div><div class='add'>+						      count);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_attr_groups;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_attr_groups:</div><div class='add'>+	do {</div><div class='add'>+		kfree(groups_list[i].attr_group.name);</div><div class='add'>+		counter_device_attr_list_free(&amp;groups_list[i].attr_list);</div><div class='add'>+	} while (i--);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_size_unit {</div><div class='add'>+	size_t size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_device_attr_size_show(struct device *dev,</div><div class='add'>+					     struct device_attribute *attr,</div><div class='add'>+					     char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_size_unit *const comp = to_counter_attr(attr)-&gt;component;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%zu\n", comp-&gt;size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_size_attribute_create(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	const size_t size, const char *const name)</div><div class='add'>+{</div><div class='add'>+	struct counter_size_unit *size_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Allocate size attribute component */</div><div class='add'>+	size_comp = kmalloc(sizeof(*size_comp), GFP_KERNEL);</div><div class='add'>+	if (!size_comp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	size_comp-&gt;size = size;</div><div class='add'>+</div><div class='add'>+	parm.group = group;</div><div class='add'>+	parm.prefix = "";</div><div class='add'>+	parm.name = name;</div><div class='add'>+	parm.show = counter_device_attr_size_show;</div><div class='add'>+	parm.store = NULL;</div><div class='add'>+	parm.component = size_comp;</div><div class='add'>+	err = counter_attribute_create(&amp;parm);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_size_comp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_size_comp:</div><div class='add'>+	kfree(size_comp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct counter_ext_unit {</div><div class='add'>+	const struct counter_device_ext *ext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t counter_device_ext_show(struct device *dev,</div><div class='add'>+				       struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_ext_unit *const component = devattr-&gt;component;</div><div class='add'>+	const struct counter_device_ext *const ext = component-&gt;ext;</div><div class='add'>+</div><div class='add'>+	return ext-&gt;read(dev_get_drvdata(dev), ext-&gt;priv, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t counter_device_ext_store(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct counter_device_attr *const devattr = to_counter_attr(attr);</div><div class='add'>+	const struct counter_ext_unit *const component = devattr-&gt;component;</div><div class='add'>+	const struct counter_device_ext *const ext = component-&gt;ext;</div><div class='add'>+</div><div class='add'>+	return ext-&gt;write(dev_get_drvdata(dev), ext-&gt;priv, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_device_ext_register(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	struct counter_ext_unit *ext_comp;</div><div class='add'>+	struct counter_attr_parm parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Create an attribute for each extension */</div><div class='add'>+	for (i = 0 ; i &lt; counter-&gt;num_ext; i++) {</div><div class='add'>+		/* Allocate extension attribute component */</div><div class='add'>+		ext_comp = kmalloc(sizeof(*ext_comp), GFP_KERNEL);</div><div class='add'>+		if (!ext_comp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_attr_list;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ext_comp-&gt;ext = counter-&gt;ext + i;</div><div class='add'>+</div><div class='add'>+		/* Allocate extension attribute */</div><div class='add'>+		parm.group = group;</div><div class='add'>+		parm.prefix = "";</div><div class='add'>+		parm.name = counter-&gt;ext[i].name;</div><div class='add'>+		parm.show = (counter-&gt;ext[i].read) ? counter_device_ext_show : NULL;</div><div class='add'>+		parm.store = (counter-&gt;ext[i].write) ? counter_device_ext_store : NULL;</div><div class='add'>+		parm.component = ext_comp;</div><div class='add'>+		err = counter_attribute_create(&amp;parm);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(ext_comp);</div><div class='add'>+			goto err_free_attr_list;</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_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_global_attr_register(</div><div class='add'>+	struct counter_device_attr_group *const group,</div><div class='add'>+	struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Create name attribute */</div><div class='add'>+	err = counter_name_attribute_create(group, counter-&gt;name);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Create num_counts attribute */</div><div class='add'>+	err = counter_size_attribute_create(group, counter-&gt;num_counts,</div><div class='add'>+					    "num_counts");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	/* Create num_signals attribute */</div><div class='add'>+	err = counter_size_attribute_create(group, counter-&gt;num_signals,</div><div class='add'>+					    "num_signals");</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	/* Register Counter device extension attributes */</div><div class='add'>+	err = counter_device_ext_register(group, counter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_attr_list;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_attr_list:</div><div class='add'>+	counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void counter_device_groups_list_free(</div><div class='add'>+	struct counter_device_attr_group *const groups_list,</div><div class='add'>+	const size_t num_groups)</div><div class='add'>+{</div><div class='add'>+	struct counter_device_attr_group *group;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	/* loop through all attribute groups (signals, counts, global, etc.) */</div><div class='add'>+	for (i = 0; i &lt; num_groups; i++) {</div><div class='add'>+		group = groups_list + i;</div><div class='add'>+</div><div class='add'>+		/* free all attribute group and associated attributes memory */</div><div class='add'>+		kfree(group-&gt;attr_group.name);</div><div class='add'>+		kfree(group-&gt;attr_group.attrs);</div><div class='add'>+		counter_device_attr_list_free(&amp;group-&gt;attr_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(groups_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_device_groups_list_prepare(</div><div class='add'>+	struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	const size_t total_num_groups =</div><div class='add'>+		counter-&gt;num_signals + counter-&gt;num_counts + 1;</div><div class='add'>+	struct counter_device_attr_group *groups_list;</div><div class='add'>+	size_t i;</div><div class='add'>+	int err;</div><div class='add'>+	size_t num_groups = 0;</div><div class='add'>+</div><div class='add'>+	/* Allocate space for attribute groups (signals, counts, and ext) */</div><div class='add'>+	groups_list = kcalloc(total_num_groups, sizeof(*groups_list),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!groups_list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Initialize attribute lists */</div><div class='add'>+	for (i = 0; i &lt; total_num_groups; i++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;groups_list[i].attr_list);</div><div class='add'>+</div><div class='add'>+	/* Register Signals */</div><div class='add'>+	err = counter_signals_register(groups_list, counter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_groups_list;</div><div class='add'>+	num_groups += counter-&gt;num_signals;</div><div class='add'>+</div><div class='add'>+	/* Register Counts and respective Synapses */</div><div class='add'>+	err = counter_counts_register(groups_list + num_groups, counter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_groups_list;</div><div class='add'>+	num_groups += counter-&gt;num_counts;</div><div class='add'>+</div><div class='add'>+	/* Register Counter global attributes */</div><div class='add'>+	err = counter_global_attr_register(groups_list + num_groups, counter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_groups_list;</div><div class='add'>+	num_groups++;</div><div class='add'>+</div><div class='add'>+	/* Store groups_list in device_state */</div><div class='add'>+	counter-&gt;device_state-&gt;groups_list = groups_list;</div><div class='add'>+	counter-&gt;device_state-&gt;num_groups = num_groups;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_groups_list:</div><div class='add'>+	counter_device_groups_list_free(groups_list, num_groups);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int counter_device_groups_prepare(</div><div class='add'>+	struct counter_device_state *const device_state)</div><div class='add'>+{</div><div class='add'>+	size_t i, j;</div><div class='add'>+	struct counter_device_attr_group *group;</div><div class='add'>+	int err;</div><div class='add'>+	struct counter_device_attr *p;</div><div class='add'>+</div><div class='add'>+	/* Allocate attribute groups for association with device */</div><div class='add'>+	device_state-&gt;groups = kcalloc(device_state-&gt;num_groups + 1,</div><div class='add'>+				       sizeof(*device_state-&gt;groups),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!device_state-&gt;groups)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Prepare each group of attributes for association */</div><div class='add'>+	for (i = 0; i &lt; device_state-&gt;num_groups; i++) {</div><div class='add'>+		group = device_state-&gt;groups_list + i;</div><div class='add'>+</div><div class='add'>+		/* Allocate space for attribute pointers in attribute group */</div><div class='add'>+		group-&gt;attr_group.attrs = kcalloc(group-&gt;num_attr + 1,</div><div class='add'>+			sizeof(*group-&gt;attr_group.attrs), GFP_KERNEL);</div><div class='add'>+		if (!group-&gt;attr_group.attrs) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_groups;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Add attribute pointers to attribute group */</div><div class='add'>+		j = 0;</div><div class='add'>+		list_for_each_entry(p, &amp;group-&gt;attr_list, l)</div><div class='add'>+			group-&gt;attr_group.attrs[j++] = &amp;p-&gt;dev_attr.attr;</div><div class='add'>+</div><div class='add'>+		/* Group attributes in attribute group */</div><div class='add'>+		device_state-&gt;groups[i] = &amp;group-&gt;attr_group;</div><div class='add'>+	}</div><div class='add'>+	/* Associate attributes with device */</div><div class='add'>+	device_state-&gt;dev.groups = device_state-&gt;groups;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_groups:</div><div class='add'>+	do {</div><div class='add'>+		group = device_state-&gt;groups_list + i;</div><div class='add'>+		kfree(group-&gt;attr_group.attrs);</div><div class='add'>+		group-&gt;attr_group.attrs = NULL;</div><div class='add'>+	} while (i--);</div><div class='add'>+	kfree(device_state-&gt;groups);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Provides a unique ID for each counter device */</div><div class='add'>+static DEFINE_IDA(counter_ida);</div><div class='add'>+</div><div class='add'>+static void counter_device_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct counter_device *const counter = dev_get_drvdata(dev);</div><div class='add'>+	struct counter_device_state *const device_state = counter-&gt;device_state;</div><div class='add'>+</div><div class='add'>+	kfree(device_state-&gt;groups);</div><div class='add'>+	counter_device_groups_list_free(device_state-&gt;groups_list,</div><div class='add'>+					device_state-&gt;num_groups);</div><div class='add'>+	ida_simple_remove(&amp;counter_ida, device_state-&gt;id);</div><div class='add'>+	kfree(device_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_type counter_device_type = {</div><div class='add'>+	.name = "counter_device",</div><div class='add'>+	.release = counter_device_release</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bus_type counter_bus_type = {</div><div class='add'>+	.name = "counter"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * counter_register - register Counter to the system</div><div class='add'>+ * @counter:	pointer to Counter to register</div><div class='add'>+ *</div><div class='add'>+ * This function registers a Counter to the system. A sysfs "counter" directory</div><div class='add'>+ * will be created and populated with sysfs attributes correlating with the</div><div class='add'>+ * Counter Signals, Synapses, and Counts respectively.</div><div class='add'>+ */</div><div class='add'>+int counter_register(struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	struct counter_device_state *device_state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Allocate internal state container for Counter device */</div><div class='add'>+	device_state = kzalloc(sizeof(*device_state), GFP_KERNEL);</div><div class='add'>+	if (!device_state)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	counter-&gt;device_state = device_state;</div><div class='add'>+</div><div class='add'>+	/* Acquire unique ID */</div><div class='add'>+	device_state-&gt;id = ida_simple_get(&amp;counter_ida, 0, 0, GFP_KERNEL);</div><div class='add'>+	if (device_state-&gt;id &lt; 0) {</div><div class='add'>+		err = device_state-&gt;id;</div><div class='add'>+		goto err_free_device_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure device structure for Counter */</div><div class='add'>+	device_state-&gt;dev.type = &amp;counter_device_type;</div><div class='add'>+	device_state-&gt;dev.bus = &amp;counter_bus_type;</div><div class='add'>+	if (counter-&gt;parent) {</div><div class='add'>+		device_state-&gt;dev.parent = counter-&gt;parent;</div><div class='add'>+		device_state-&gt;dev.of_node = counter-&gt;parent-&gt;of_node;</div><div class='add'>+	}</div><div class='add'>+	dev_set_name(&amp;device_state-&gt;dev, "counter%d", device_state-&gt;id);</div><div class='add'>+	device_initialize(&amp;device_state-&gt;dev);</div><div class='add'>+	dev_set_drvdata(&amp;device_state-&gt;dev, counter);</div><div class='add'>+</div><div class='add'>+	/* Prepare device attributes */</div><div class='add'>+	err = counter_device_groups_list_prepare(counter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_id;</div><div class='add'>+</div><div class='add'>+	/* Organize device attributes to groups and match to device */</div><div class='add'>+	err = counter_device_groups_prepare(device_state);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_groups_list;</div><div class='add'>+</div><div class='add'>+	/* Add device to system */</div><div class='add'>+	err = device_add(&amp;device_state-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_groups;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_groups:</div><div class='add'>+	kfree(device_state-&gt;groups);</div><div class='add'>+err_free_groups_list:</div><div class='add'>+	counter_device_groups_list_free(device_state-&gt;groups_list,</div><div class='add'>+					device_state-&gt;num_groups);</div><div class='add'>+err_free_id:</div><div class='add'>+	ida_simple_remove(&amp;counter_ida, device_state-&gt;id);</div><div class='add'>+err_free_device_state:</div><div class='add'>+	kfree(device_state);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * counter_unregister - unregister Counter from the system</div><div class='add'>+ * @counter:	pointer to Counter to unregister</div><div class='add'>+ *</div><div class='add'>+ * The Counter is unregistered from the system; all allocated memory is freed.</div><div class='add'>+ */</div><div class='add'>+void counter_unregister(struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	if (counter)</div><div class='add'>+		device_del(&amp;counter-&gt;device_state-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(counter_unregister);</div><div class='add'>+</div><div class='add'>+static void devm_counter_unreg(struct device *dev, void *res)</div><div class='add'>+{</div><div class='add'>+	counter_unregister(*(struct counter_device **)res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_counter_register - Resource-managed counter_register</div><div class='add'>+ * @dev:	device to allocate counter_device for</div><div class='add'>+ * @counter:	pointer to Counter to register</div><div class='add'>+ *</div><div class='add'>+ * Managed counter_register. The Counter registered with this function is</div><div class='add'>+ * automatically unregistered on driver detach. This function calls</div><div class='add'>+ * counter_register internally. Refer to that function for more information.</div><div class='add'>+ *</div><div class='add'>+ * If an Counter registered with this function needs to be unregistered</div><div class='add'>+ * separately, devm_counter_unregister must be used.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * 0 on success, negative error number on failure.</div><div class='add'>+ */</div><div class='add'>+int devm_counter_register(struct device *dev,</div><div class='add'>+			  struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	struct counter_device **ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ptr = devres_alloc(devm_counter_unreg, sizeof(*ptr), GFP_KERNEL);</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = counter_register(counter);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		*ptr = counter;</div><div class='add'>+		devres_add(dev, ptr);</div><div class='add'>+	} else {</div><div class='add'>+		devres_free(ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devm_counter_register);</div><div class='add'>+</div><div class='add'>+static int devm_counter_match(struct device *dev, void *res, void *data)</div><div class='add'>+{</div><div class='add'>+	struct counter_device **r = res;</div><div class='add'>+</div><div class='add'>+	if (!r || !*r) {</div><div class='add'>+		WARN_ON(!r || !*r);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return *r == data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_counter_unregister - Resource-managed counter_unregister</div><div class='add'>+ * @dev:	device this counter_device belongs to</div><div class='add'>+ * @counter:	pointer to Counter associated with the device</div><div class='add'>+ *</div><div class='add'>+ * Unregister Counter registered with devm_counter_register.</div><div class='add'>+ */</div><div class='add'>+void devm_counter_unregister(struct device *dev,</div><div class='add'>+			     struct counter_device *const counter)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = devres_release(dev, devm_counter_unreg, devm_counter_match,</div><div class='add'>+			    counter);</div><div class='add'>+	WARN_ON(rc);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devm_counter_unregister);</div><div class='add'>+</div><div class='add'>+static int __init counter_init(void)</div><div class='add'>+{</div><div class='add'>+	return bus_register(&amp;counter_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit counter_exit(void)</div><div class='add'>+{</div><div class='add'>+	bus_unregister(&amp;counter_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(counter_init);</div><div class='add'>+module_exit(counter_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Generic Counter interface");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/counter/ftm-quaddec.c b/drivers/counter/ftm-quaddec.c<br/>new file mode 100644<br/>index 000000000000..c83c8875bf82<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/ftm-quaddec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/ftm-quaddec.c</a></div><div class='hunk'>@@ -0,0 +1,356 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Flex Timer Module Quadrature decoder</div><div class='add'>+ *</div><div class='add'>+ * This module implements a driver for decoding the FTM quadrature</div><div class='add'>+ * of ex. a LS1021A</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fsl/ftm.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/of.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/counter.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#define FTM_FIELD_UPDATE(ftm, offset, mask, val)			\</div><div class='add'>+	({								\</div><div class='add'>+		uint32_t flags;						\</div><div class='add'>+		ftm_read(ftm, offset, &amp;flags);				\</div><div class='add'>+		flags &amp;= ~mask;						\</div><div class='add'>+		flags |= FIELD_PREP(mask, val);				\</div><div class='add'>+		ftm_write(ftm, offset, flags);				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+struct ftm_quaddec {</div><div class='add'>+	struct counter_device counter;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	void __iomem *ftm_base;</div><div class='add'>+	bool big_endian;</div><div class='add'>+	struct mutex ftm_quaddec_mutex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ftm_read(struct ftm_quaddec *ftm, uint32_t offset, uint32_t *data)</div><div class='add'>+{</div><div class='add'>+	if (ftm-&gt;big_endian)</div><div class='add'>+		*data = ioread32be(ftm-&gt;ftm_base + offset);</div><div class='add'>+	else</div><div class='add'>+		*data = ioread32(ftm-&gt;ftm_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftm_write(struct ftm_quaddec *ftm, uint32_t offset, uint32_t data)</div><div class='add'>+{</div><div class='add'>+	if (ftm-&gt;big_endian)</div><div class='add'>+		iowrite32be(data, ftm-&gt;ftm_base + offset);</div><div class='add'>+	else</div><div class='add'>+		iowrite32(data, ftm-&gt;ftm_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Hold mutex before modifying write protection state */</div><div class='add'>+static void ftm_clear_write_protection(struct ftm_quaddec *ftm)</div><div class='add'>+{</div><div class='add'>+	uint32_t flag;</div><div class='add'>+</div><div class='add'>+	/* First see if it is enabled */</div><div class='add'>+	ftm_read(ftm, FTM_FMS, &amp;flag);</div><div class='add'>+</div><div class='add'>+	if (flag &amp; FTM_FMS_WPEN)</div><div class='add'>+		FTM_FIELD_UPDATE(ftm, FTM_MODE, FTM_MODE_WPDIS, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftm_set_write_protection(struct ftm_quaddec *ftm)</div><div class='add'>+{</div><div class='add'>+	FTM_FIELD_UPDATE(ftm, FTM_FMS, FTM_FMS_WPEN, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftm_reset_counter(struct ftm_quaddec *ftm)</div><div class='add'>+{</div><div class='add'>+	/* Reset hardware counter to CNTIN */</div><div class='add'>+	ftm_write(ftm, FTM_CNT, 0x0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftm_quaddec_init(struct ftm_quaddec *ftm)</div><div class='add'>+{</div><div class='add'>+	ftm_clear_write_protection(ftm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not write in the region from the CNTIN register through the</div><div class='add'>+	 * PWMLOAD register when FTMEN = 0.</div><div class='add'>+	 * Also reset other fields to zero</div><div class='add'>+	 */</div><div class='add'>+	ftm_write(ftm, FTM_MODE, FTM_MODE_FTMEN);</div><div class='add'>+	ftm_write(ftm, FTM_CNTIN, 0x0000);</div><div class='add'>+	ftm_write(ftm, FTM_MOD, 0xffff);</div><div class='add'>+	ftm_write(ftm, FTM_CNT, 0x0);</div><div class='add'>+	/* Set prescaler, reset other fields to zero */</div><div class='add'>+	ftm_write(ftm, FTM_SC, FTM_SC_PS_1);</div><div class='add'>+</div><div class='add'>+	/* Select quad mode, reset other fields to zero */</div><div class='add'>+	ftm_write(ftm, FTM_QDCTRL, FTM_QDCTRL_QUADEN);</div><div class='add'>+</div><div class='add'>+	/* Unused features and reset to default section */</div><div class='add'>+	ftm_write(ftm, FTM_POL, 0x0);</div><div class='add'>+	ftm_write(ftm, FTM_FLTCTRL, 0x0);</div><div class='add'>+	ftm_write(ftm, FTM_SYNCONF, 0x0);</div><div class='add'>+	ftm_write(ftm, FTM_SYNC, 0xffff);</div><div class='add'>+</div><div class='add'>+	/* Lock the FTM */</div><div class='add'>+	ftm_set_write_protection(ftm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftm_quaddec_disable(struct ftm_quaddec *ftm)</div><div class='add'>+{</div><div class='add'>+	ftm_clear_write_protection(ftm);</div><div class='add'>+	ftm_write(ftm, FTM_MODE, 0);</div><div class='add'>+	ftm_write(ftm, FTM_QDCTRL, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * This is enough to disable the counter. No clock has been</div><div class='add'>+	 * selected by writing to FTM_SC in init()</div><div class='add'>+	 */</div><div class='add'>+	ftm_set_write_protection(ftm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_get_prescaler(struct counter_device *counter,</div><div class='add'>+				     struct counter_count *count,</div><div class='add'>+				     size_t *cnt_mode)</div><div class='add'>+{</div><div class='add'>+	struct ftm_quaddec *ftm = counter-&gt;priv;</div><div class='add'>+	uint32_t scflags;</div><div class='add'>+</div><div class='add'>+	ftm_read(ftm, FTM_SC, &amp;scflags);</div><div class='add'>+</div><div class='add'>+	*cnt_mode = FIELD_GET(FTM_SC_PS_MASK, scflags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_set_prescaler(struct counter_device *counter,</div><div class='add'>+				     struct counter_count *count,</div><div class='add'>+				     size_t cnt_mode)</div><div class='add'>+{</div><div class='add'>+	struct ftm_quaddec *ftm = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ftm-&gt;ftm_quaddec_mutex);</div><div class='add'>+</div><div class='add'>+	ftm_clear_write_protection(ftm);</div><div class='add'>+	FTM_FIELD_UPDATE(ftm, FTM_SC, FTM_SC_PS_MASK, cnt_mode);</div><div class='add'>+	ftm_set_write_protection(ftm);</div><div class='add'>+</div><div class='add'>+	/* Also resets the counter as it is undefined anyway now */</div><div class='add'>+	ftm_reset_counter(ftm);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ftm-&gt;ftm_quaddec_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const ftm_quaddec_prescaler[] = {</div><div class='add'>+	"1", "2", "4", "8", "16", "32", "64", "128"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_count_enum_ext ftm_quaddec_prescaler_enum = {</div><div class='add'>+	.items = ftm_quaddec_prescaler,</div><div class='add'>+	.num_items = ARRAY_SIZE(ftm_quaddec_prescaler),</div><div class='add'>+	.get = ftm_quaddec_get_prescaler,</div><div class='add'>+	.set = ftm_quaddec_set_prescaler</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ftm_quaddec_synapse_action {</div><div class='add'>+	FTM_QUADDEC_SYNAPSE_ACTION_BOTH_EDGES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_synapse_action ftm_quaddec_synapse_actions[] = {</div><div class='add'>+	[FTM_QUADDEC_SYNAPSE_ACTION_BOTH_EDGES] =</div><div class='add'>+	COUNTER_SYNAPSE_ACTION_BOTH_EDGES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ftm_quaddec_count_function {</div><div class='add'>+	FTM_QUADDEC_COUNT_ENCODER_MODE_1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const enum counter_count_function ftm_quaddec_count_functions[] = {</div><div class='add'>+	[FTM_QUADDEC_COUNT_ENCODER_MODE_1] =</div><div class='add'>+	COUNTER_COUNT_FUNCTION_QUADRATURE_X4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_count_read(struct counter_device *counter,</div><div class='add'>+				  struct counter_count *count,</div><div class='add'>+				  struct counter_count_read_value *val)</div><div class='add'>+{</div><div class='add'>+	struct ftm_quaddec *const ftm = counter-&gt;priv;</div><div class='add'>+	uint32_t cntval;</div><div class='add'>+</div><div class='add'>+	ftm_read(ftm, FTM_CNT, &amp;cntval);</div><div class='add'>+</div><div class='add'>+	counter_count_read_value_set(val, COUNTER_COUNT_POSITION, &amp;cntval);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_count_write(struct counter_device *counter,</div><div class='add'>+				   struct counter_count *count,</div><div class='add'>+				   struct counter_count_write_value *val)</div><div class='add'>+{</div><div class='add'>+	struct ftm_quaddec *const ftm = counter-&gt;priv;</div><div class='add'>+	u32 cnt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = counter_count_write_value_get(&amp;cnt, COUNTER_COUNT_POSITION, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cnt != 0) {</div><div class='add'>+		dev_warn(&amp;ftm-&gt;pdev-&gt;dev, "Can only accept '0' as new counter value\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ftm_reset_counter(ftm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_count_function_get(struct counter_device *counter,</div><div class='add'>+					  struct counter_count *count,</div><div class='add'>+					  size_t *function)</div><div class='add'>+{</div><div class='add'>+	*function = FTM_QUADDEC_COUNT_ENCODER_MODE_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 ftm_quaddec_action_get(struct counter_device *counter,</div><div class='add'>+				  struct counter_count *count,</div><div class='add'>+				  struct counter_synapse *synapse,</div><div class='add'>+				  size_t *action)</div><div class='add'>+{</div><div class='add'>+	*action = FTM_QUADDEC_SYNAPSE_ACTION_BOTH_EDGES;</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 counter_ops ftm_quaddec_cnt_ops = {</div><div class='add'>+	.count_read = ftm_quaddec_count_read,</div><div class='add'>+	.count_write = ftm_quaddec_count_write,</div><div class='add'>+	.function_get = ftm_quaddec_count_function_get,</div><div class='add'>+	.action_get = ftm_quaddec_action_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_signal ftm_quaddec_signals[] = {</div><div class='add'>+	{</div><div class='add'>+		.id = 0,</div><div class='add'>+		.name = "Channel 1 Phase A"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = 1,</div><div class='add'>+		.name = "Channel 1 Phase B"</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_synapse ftm_quaddec_count_synapses[] = {</div><div class='add'>+	{</div><div class='add'>+		.actions_list = ftm_quaddec_synapse_actions,</div><div class='add'>+		.num_actions = ARRAY_SIZE(ftm_quaddec_synapse_actions),</div><div class='add'>+		.signal = &amp;ftm_quaddec_signals[0]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.actions_list = ftm_quaddec_synapse_actions,</div><div class='add'>+		.num_actions = ARRAY_SIZE(ftm_quaddec_synapse_actions),</div><div class='add'>+		.signal = &amp;ftm_quaddec_signals[1]</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct counter_count_ext ftm_quaddec_count_ext[] = {</div><div class='add'>+	COUNTER_COUNT_ENUM("prescaler", &amp;ftm_quaddec_prescaler_enum),</div><div class='add'>+	COUNTER_COUNT_ENUM_AVAILABLE("prescaler", &amp;ftm_quaddec_prescaler_enum),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_count ftm_quaddec_counts = {</div><div class='add'>+	.id = 0,</div><div class='add'>+	.name = "Channel 1 Count",</div><div class='add'>+	.functions_list = ftm_quaddec_count_functions,</div><div class='add'>+	.num_functions = ARRAY_SIZE(ftm_quaddec_count_functions),</div><div class='add'>+	.synapses = ftm_quaddec_count_synapses,</div><div class='add'>+	.num_synapses = ARRAY_SIZE(ftm_quaddec_count_synapses),</div><div class='add'>+	.ext = ftm_quaddec_count_ext,</div><div class='add'>+	.num_ext = ARRAY_SIZE(ftm_quaddec_count_ext)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ftm_quaddec *ftm;</div><div class='add'>+</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+	struct resource *io;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ftm = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*ftm), GFP_KERNEL);</div><div class='add'>+	if (!ftm)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, ftm);</div><div class='add'>+</div><div class='add'>+	io = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!io) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to get memory region\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ftm-&gt;pdev = pdev;</div><div class='add'>+	ftm-&gt;big_endian = of_property_read_bool(node, "big-endian");</div><div class='add'>+	ftm-&gt;ftm_base = devm_ioremap(&amp;pdev-&gt;dev, io-&gt;start, resource_size(io));</div><div class='add'>+</div><div class='add'>+	if (!ftm-&gt;ftm_base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to map memory region\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ftm-&gt;counter.name = dev_name(&amp;pdev-&gt;dev);</div><div class='add'>+	ftm-&gt;counter.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	ftm-&gt;counter.ops = &amp;ftm_quaddec_cnt_ops;</div><div class='add'>+	ftm-&gt;counter.counts = &amp;ftm_quaddec_counts;</div><div class='add'>+	ftm-&gt;counter.num_counts = 1;</div><div class='add'>+	ftm-&gt;counter.signals = ftm_quaddec_signals;</div><div class='add'>+	ftm-&gt;counter.num_signals = ARRAY_SIZE(ftm_quaddec_signals);</div><div class='add'>+	ftm-&gt;counter.priv = ftm;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ftm-&gt;ftm_quaddec_mutex);</div><div class='add'>+</div><div class='add'>+	ftm_quaddec_init(ftm);</div><div class='add'>+</div><div class='add'>+	ret = counter_register(&amp;ftm-&gt;counter);</div><div class='add'>+	if (ret)</div><div class='add'>+		ftm_quaddec_disable(ftm);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ftm_quaddec_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ftm_quaddec *ftm = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	counter_unregister(&amp;ftm-&gt;counter);</div><div class='add'>+</div><div class='add'>+	ftm_quaddec_disable(ftm);</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 of_device_id ftm_quaddec_match[] = {</div><div class='add'>+	{ .compatible = "fsl,ftm-quaddec" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver ftm_quaddec_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ftm-quaddec",</div><div class='add'>+		.of_match_table = ftm_quaddec_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = ftm_quaddec_probe,</div><div class='add'>+	.remove = ftm_quaddec_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(ftm_quaddec_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Kjeld Flarup &lt;kfa@deif.com");</div><div class='add'>+MODULE_AUTHOR("Patrick Havelange &lt;patrick.havelange@essensium.com");</div><div class='head'>diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c<br/>new file mode 100644<br/>index 000000000000..bbc930a5962c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/stm32-lptimer-cnt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/stm32-lptimer-cnt.c</a></div><div class='hunk'>@@ -0,0 +1,754 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * STM32 Low-Power Timer Encoder and Counter driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) STMicroelectronics 2017</div><div class='add'>+ *</div><div class='add'>+ * Author: Fabrice Gasnier &lt;fabrice.gasnier@st.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Inspired by 104-quad-8 and stm32-timer-trigger drivers.</div><div class='add'>+ *</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/counter.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/stm32-lptimer.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+struct stm32_lptim_cnt {</div><div class='add'>+	struct counter_device counter;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	u32 ceiling;</div><div class='add'>+	u32 polarity;</div><div class='add'>+	u32 quadrature_mode;</div><div class='add'>+	bool enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_is_enabled(struct stm32_lptim_cnt *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, STM32_LPTIM_CR, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(STM32_LPTIM_ENABLE, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_set_enable_state(struct stm32_lptim_cnt *priv,</div><div class='add'>+					int enable)</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(STM32_LPTIM_ENABLE, enable);</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, STM32_LPTIM_CR, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!enable) {</div><div class='add'>+		clk_disable(priv-&gt;clk);</div><div class='add'>+		priv-&gt;enabled = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LP timer must be enabled before writing CMP &amp; ARR */</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, STM32_LPTIM_ARR, priv-&gt;ceiling);</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, STM32_LPTIM_CMP, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* ensure CMP &amp; ARR registers are properly written */</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, STM32_LPTIM_ISR, val,</div><div class='add'>+				       (val &amp; STM32_LPTIM_CMPOK_ARROK),</div><div class='add'>+				       100, 1000);</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, STM32_LPTIM_ICR,</div><div class='add'>+			   STM32_LPTIM_CMPOKCF_ARROKCF);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_enable(priv-&gt;clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		regmap_write(priv-&gt;regmap, STM32_LPTIM_CR, 0);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+	/* Start LP timer in continuous mode */</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, STM32_LPTIM_CR,</div><div class='add'>+				  STM32_LPTIM_CNTSTRT, STM32_LPTIM_CNTSTRT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_setup(struct stm32_lptim_cnt *priv, int enable)</div><div class='add'>+{</div><div class='add'>+	u32 mask = STM32_LPTIM_ENC | STM32_LPTIM_COUNTMODE |</div><div class='add'>+		   STM32_LPTIM_CKPOL | STM32_LPTIM_PRESC;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Setup LP timer encoder/counter and polarity, without prescaler */</div><div class='add'>+	if (priv-&gt;quadrature_mode)</div><div class='add'>+		val = enable ? STM32_LPTIM_ENC : 0;</div><div class='add'>+	else</div><div class='add'>+		val = enable ? STM32_LPTIM_COUNTMODE : 0;</div><div class='add'>+	val |= FIELD_PREP(STM32_LPTIM_CKPOL, enable ? priv-&gt;polarity : 0);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, STM32_LPTIM_CFGR, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_write_raw(struct iio_dev *indio_dev,</div><div class='add'>+				 struct iio_chan_spec const *chan,</div><div class='add'>+				 int val, int val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_ENABLE:</div><div class='add'>+		if (val &lt; 0 || val &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Check nobody uses the timer, or already disabled/enabled */</div><div class='add'>+		ret = stm32_lptim_is_enabled(priv);</div><div class='add'>+		if ((ret &lt; 0) || (!ret &amp;&amp; !val))</div><div class='add'>+			return ret;</div><div class='add'>+		if (val &amp;&amp; ret)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		ret = stm32_lptim_setup(priv, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		return stm32_lptim_set_enable_state(priv, val);</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 int stm32_lptim_read_raw(struct iio_dev *indio_dev,</div><div class='add'>+				struct iio_chan_spec const *chan,</div><div class='add'>+				int *val, int *val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+	u32 dat;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		ret = regmap_read(priv-&gt;regmap, STM32_LPTIM_CNT, &amp;dat);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		*val = dat;</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+</div><div class='add'>+	case IIO_CHAN_INFO_ENABLE:</div><div class='add'>+		ret = stm32_lptim_is_enabled(priv);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		*val = ret;</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		/* Non-quadrature mode: scale = 1 */</div><div class='add'>+		*val = 1;</div><div class='add'>+		*val2 = 0;</div><div class='add'>+		if (priv-&gt;quadrature_mode) {</div><div class='add'>+			/*</div><div class='add'>+			 * Quadrature encoder mode:</div><div class='add'>+			 * - both edges, quarter cycle, scale is 0.25</div><div class='add'>+			 * - either rising/falling edge scale is 0.5</div><div class='add'>+			 */</div><div class='add'>+			if (priv-&gt;polarity &gt; 1)</div><div class='add'>+				*val2 = 2;</div><div class='add'>+			else</div><div class='add'>+				*val2 = 1;</div><div class='add'>+		}</div><div class='add'>+		return IIO_VAL_FRACTIONAL_LOG2;</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 iio_info stm32_lptim_cnt_iio_info = {</div><div class='add'>+	.read_raw = stm32_lptim_read_raw,</div><div class='add'>+	.write_raw = stm32_lptim_write_raw,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const stm32_lptim_quadrature_modes[] = {</div><div class='add'>+	"non-quadrature",</div><div class='add'>+	"quadrature",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_get_quadrature_mode(struct iio_dev *indio_dev,</div><div class='add'>+					   const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;quadrature_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_set_quadrature_mode(struct iio_dev *indio_dev,</div><div class='add'>+					   const struct iio_chan_spec *chan,</div><div class='add'>+					   unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	if (stm32_lptim_is_enabled(priv))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	priv-&gt;quadrature_mode = type;</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 iio_enum stm32_lptim_quadrature_mode_en = {</div><div class='add'>+	.items = stm32_lptim_quadrature_modes,</div><div class='add'>+	.num_items = ARRAY_SIZE(stm32_lptim_quadrature_modes),</div><div class='add'>+	.get = stm32_lptim_get_quadrature_mode,</div><div class='add'>+	.set = stm32_lptim_set_quadrature_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const stm32_lptim_cnt_polarity[] = {</div><div class='add'>+	"rising-edge", "falling-edge", "both-edges",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_get_polarity(struct iio_dev *indio_dev,</div><div class='add'>+					const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;polarity;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_set_polarity(struct iio_dev *indio_dev,</div><div class='add'>+					const struct iio_chan_spec *chan,</div><div class='add'>+					unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	if (stm32_lptim_is_enabled(priv))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	priv-&gt;polarity = type;</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 iio_enum stm32_lptim_cnt_polarity_en = {</div><div class='add'>+	.items = stm32_lptim_cnt_polarity,</div><div class='add'>+	.num_items = ARRAY_SIZE(stm32_lptim_cnt_polarity),</div><div class='add'>+	.get = stm32_lptim_cnt_get_polarity,</div><div class='add'>+	.set = stm32_lptim_cnt_set_polarity,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_lptim_cnt_get_ceiling(struct stm32_lptim_cnt *priv,</div><div class='add'>+					   char *buf)</div><div class='add'>+{</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%u\n", priv-&gt;ceiling);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_lptim_cnt_set_ceiling(struct stm32_lptim_cnt *priv,</div><div class='add'>+					   const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (stm32_lptim_is_enabled(priv))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;priv-&gt;ceiling);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ceiling &gt; STM32_LPTIM_MAX_ARR)</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 ssize_t stm32_lptim_cnt_get_preset_iio(struct iio_dev *indio_dev,</div><div class='add'>+					      uintptr_t private,</div><div class='add'>+					      const struct iio_chan_spec *chan,</div><div class='add'>+					      char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return stm32_lptim_cnt_get_ceiling(priv, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_lptim_cnt_set_preset_iio(struct iio_dev *indio_dev,</div><div class='add'>+					      uintptr_t private,</div><div class='add'>+					      const struct iio_chan_spec *chan,</div><div class='add'>+					      const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return stm32_lptim_cnt_set_ceiling(priv, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* LP timer with encoder */</div><div class='add'>+static const struct iio_chan_spec_ext_info stm32_lptim_enc_ext_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "preset",</div><div class='add'>+		.shared = IIO_SEPARATE,</div><div class='add'>+		.read = stm32_lptim_cnt_get_preset_iio,</div><div class='add'>+		.write = stm32_lptim_cnt_set_preset_iio,</div><div class='add'>+	},</div><div class='add'>+	IIO_ENUM("polarity", IIO_SEPARATE, &amp;stm32_lptim_cnt_polarity_en),</div><div class='add'>+	IIO_ENUM_AVAILABLE("polarity", &amp;stm32_lptim_cnt_polarity_en),</div><div class='add'>+	IIO_ENUM("quadrature_mode", IIO_SEPARATE,</div><div class='add'>+		 &amp;stm32_lptim_quadrature_mode_en),</div><div class='add'>+	IIO_ENUM_AVAILABLE("quadrature_mode", &amp;stm32_lptim_quadrature_mode_en),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec stm32_lptim_enc_channels = {</div><div class='add'>+	.type = IIO_COUNT,</div><div class='add'>+	.channel = 0,</div><div class='add'>+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |</div><div class='add'>+			      BIT(IIO_CHAN_INFO_ENABLE) |</div><div class='add'>+			      BIT(IIO_CHAN_INFO_SCALE),</div><div class='add'>+	.ext_info = stm32_lptim_enc_ext_info,</div><div class='add'>+	.indexed = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LP timer without encoder (counter only) */</div><div class='add'>+static const struct iio_chan_spec_ext_info stm32_lptim_cnt_ext_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "preset",</div><div class='add'>+		.shared = IIO_SEPARATE,</div><div class='add'>+		.read = stm32_lptim_cnt_get_preset_iio,</div><div class='add'>+		.write = stm32_lptim_cnt_set_preset_iio,</div><div class='add'>+	},</div><div class='add'>+	IIO_ENUM("polarity", IIO_SEPARATE, &amp;stm32_lptim_cnt_polarity_en),</div><div class='add'>+	IIO_ENUM_AVAILABLE("polarity", &amp;stm32_lptim_cnt_polarity_en),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec stm32_lptim_cnt_channels = {</div><div class='add'>+	.type = IIO_COUNT,</div><div class='add'>+	.channel = 0,</div><div class='add'>+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |</div><div class='add'>+			      BIT(IIO_CHAN_INFO_ENABLE) |</div><div class='add'>+			      BIT(IIO_CHAN_INFO_SCALE),</div><div class='add'>+	.ext_info = stm32_lptim_cnt_ext_info,</div><div class='add'>+	.indexed = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stm32_lptim_cnt_function - enumerates stm32 LPTimer counter &amp; encoder modes</div><div class='add'>+ * @STM32_LPTIM_COUNTER_INCREASE: up count on IN1 rising, falling or both edges</div><div class='add'>+ * @STM32_LPTIM_ENCODER_BOTH_EDGE: count on both edges (IN1 &amp; IN2 quadrature)</div><div class='add'>+ */</div><div class='add'>+enum stm32_lptim_cnt_function {</div><div class='add'>+	STM32_LPTIM_COUNTER_INCREASE,</div><div class='add'>+	STM32_LPTIM_ENCODER_BOTH_EDGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_count_function stm32_lptim_cnt_functions[] = {</div><div class='add'>+	[STM32_LPTIM_COUNTER_INCREASE] = COUNTER_COUNT_FUNCTION_INCREASE,</div><div class='add'>+	[STM32_LPTIM_ENCODER_BOTH_EDGE] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum stm32_lptim_synapse_action {</div><div class='add'>+	STM32_LPTIM_SYNAPSE_ACTION_RISING_EDGE,</div><div class='add'>+	STM32_LPTIM_SYNAPSE_ACTION_FALLING_EDGE,</div><div class='add'>+	STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES,</div><div class='add'>+	STM32_LPTIM_SYNAPSE_ACTION_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_synapse_action stm32_lptim_cnt_synapse_actions[] = {</div><div class='add'>+	/* Index must match with stm32_lptim_cnt_polarity[] (priv-&gt;polarity) */</div><div class='add'>+	[STM32_LPTIM_SYNAPSE_ACTION_RISING_EDGE] = COUNTER_SYNAPSE_ACTION_RISING_EDGE,</div><div class='add'>+	[STM32_LPTIM_SYNAPSE_ACTION_FALLING_EDGE] = COUNTER_SYNAPSE_ACTION_FALLING_EDGE,</div><div class='add'>+	[STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES] = COUNTER_SYNAPSE_ACTION_BOTH_EDGES,</div><div class='add'>+	[STM32_LPTIM_SYNAPSE_ACTION_NONE] = COUNTER_SYNAPSE_ACTION_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_read(struct counter_device *counter,</div><div class='add'>+				struct counter_count *count,</div><div class='add'>+				struct counter_count_read_value *val)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 cnt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, STM32_LPTIM_CNT, &amp;cnt);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	counter_count_read_value_set(val, COUNTER_COUNT_POSITION, &amp;cnt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_function_get(struct counter_device *counter,</div><div class='add'>+					struct counter_count *count,</div><div class='add'>+					size_t *function)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;quadrature_mode) {</div><div class='add'>+		*function = STM32_LPTIM_COUNTER_INCREASE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;polarity == STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES) {</div><div class='add'>+		*function = STM32_LPTIM_ENCODER_BOTH_EDGE;</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 stm32_lptim_cnt_function_set(struct counter_device *counter,</div><div class='add'>+					struct counter_count *count,</div><div class='add'>+					size_t function)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (stm32_lptim_is_enabled(priv))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	switch (function) {</div><div class='add'>+	case STM32_LPTIM_COUNTER_INCREASE:</div><div class='add'>+		priv-&gt;quadrature_mode = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	case STM32_LPTIM_ENCODER_BOTH_EDGE:</div><div class='add'>+		priv-&gt;quadrature_mode = 1;</div><div class='add'>+		priv-&gt;polarity = STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES;</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 ssize_t stm32_lptim_cnt_enable_read(struct counter_device *counter,</div><div class='add'>+					   struct counter_count *count,</div><div class='add'>+					   void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = stm32_lptim_is_enabled(priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%u\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_lptim_cnt_enable_write(struct counter_device *counter,</div><div class='add'>+					    struct counter_count *count,</div><div class='add'>+					    void *private,</div><div class='add'>+					    const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	bool enable;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check nobody uses the timer, or already disabled/enabled */</div><div class='add'>+	ret = stm32_lptim_is_enabled(priv);</div><div class='add'>+	if ((ret &lt; 0) || (!ret &amp;&amp; !enable))</div><div class='add'>+		return ret;</div><div class='add'>+	if (enable &amp;&amp; ret)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = stm32_lptim_setup(priv, enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = stm32_lptim_set_enable_state(priv, enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_lptim_cnt_ceiling_read(struct counter_device *counter,</div><div class='add'>+					    struct counter_count *count,</div><div class='add'>+					    void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return stm32_lptim_cnt_get_ceiling(priv, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_lptim_cnt_ceiling_write(struct counter_device *counter,</div><div class='add'>+					     struct counter_count *count,</div><div class='add'>+					     void *private,</div><div class='add'>+					     const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return stm32_lptim_cnt_set_ceiling(priv, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct counter_count_ext stm32_lptim_cnt_ext[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "enable",</div><div class='add'>+		.read = stm32_lptim_cnt_enable_read,</div><div class='add'>+		.write = stm32_lptim_cnt_enable_write</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "ceiling",</div><div class='add'>+		.read = stm32_lptim_cnt_ceiling_read,</div><div class='add'>+		.write = stm32_lptim_cnt_ceiling_write</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_action_get(struct counter_device *counter,</div><div class='add'>+				      struct counter_count *count,</div><div class='add'>+				      struct counter_synapse *synapse,</div><div class='add'>+				      size_t *action)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	size_t function;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = stm32_lptim_cnt_function_get(counter, count, &amp;function);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (function) {</div><div class='add'>+	case STM32_LPTIM_COUNTER_INCREASE:</div><div class='add'>+		/* LP Timer acts as up-counter on input 1 */</div><div class='add'>+		if (synapse-&gt;signal-&gt;id == count-&gt;synapses[0].signal-&gt;id)</div><div class='add'>+			*action = priv-&gt;polarity;</div><div class='add'>+		else</div><div class='add'>+			*action = STM32_LPTIM_SYNAPSE_ACTION_NONE;</div><div class='add'>+		return 0;</div><div class='add'>+	case STM32_LPTIM_ENCODER_BOTH_EDGE:</div><div class='add'>+		*action = priv-&gt;polarity;</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 stm32_lptim_cnt_action_set(struct counter_device *counter,</div><div class='add'>+				      struct counter_count *count,</div><div class='add'>+				      struct counter_synapse *synapse,</div><div class='add'>+				      size_t action)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	size_t function;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stm32_lptim_is_enabled(priv))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	err = stm32_lptim_cnt_function_get(counter, count, &amp;function);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* only set polarity when in counter mode (on input 1) */</div><div class='add'>+	if (function == STM32_LPTIM_COUNTER_INCREASE</div><div class='add'>+	    &amp;&amp; synapse-&gt;signal-&gt;id == count-&gt;synapses[0].signal-&gt;id) {</div><div class='add'>+		switch (action) {</div><div class='add'>+		case STM32_LPTIM_SYNAPSE_ACTION_RISING_EDGE:</div><div class='add'>+		case STM32_LPTIM_SYNAPSE_ACTION_FALLING_EDGE:</div><div class='add'>+		case STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES:</div><div class='add'>+			priv-&gt;polarity = action;</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'>+static const struct counter_ops stm32_lptim_cnt_ops = {</div><div class='add'>+	.count_read = stm32_lptim_cnt_read,</div><div class='add'>+	.function_get = stm32_lptim_cnt_function_get,</div><div class='add'>+	.function_set = stm32_lptim_cnt_function_set,</div><div class='add'>+	.action_get = stm32_lptim_cnt_action_get,</div><div class='add'>+	.action_set = stm32_lptim_cnt_action_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_signal stm32_lptim_cnt_signals[] = {</div><div class='add'>+	{</div><div class='add'>+		.id = 0,</div><div class='add'>+		.name = "Channel 1 Quadrature A"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = 1,</div><div class='add'>+		.name = "Channel 1 Quadrature B"</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_synapse stm32_lptim_cnt_synapses[] = {</div><div class='add'>+	{</div><div class='add'>+		.actions_list = stm32_lptim_cnt_synapse_actions,</div><div class='add'>+		.num_actions = ARRAY_SIZE(stm32_lptim_cnt_synapse_actions),</div><div class='add'>+		.signal = &amp;stm32_lptim_cnt_signals[0]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.actions_list = stm32_lptim_cnt_synapse_actions,</div><div class='add'>+		.num_actions = ARRAY_SIZE(stm32_lptim_cnt_synapse_actions),</div><div class='add'>+		.signal = &amp;stm32_lptim_cnt_signals[1]</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LP timer with encoder */</div><div class='add'>+static struct counter_count stm32_lptim_enc_counts = {</div><div class='add'>+	.id = 0,</div><div class='add'>+	.name = "LPTimer Count",</div><div class='add'>+	.functions_list = stm32_lptim_cnt_functions,</div><div class='add'>+	.num_functions = ARRAY_SIZE(stm32_lptim_cnt_functions),</div><div class='add'>+	.synapses = stm32_lptim_cnt_synapses,</div><div class='add'>+	.num_synapses = ARRAY_SIZE(stm32_lptim_cnt_synapses),</div><div class='add'>+	.ext = stm32_lptim_cnt_ext,</div><div class='add'>+	.num_ext = ARRAY_SIZE(stm32_lptim_cnt_ext)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LP timer without encoder (counter only) */</div><div class='add'>+static struct counter_count stm32_lptim_in1_counts = {</div><div class='add'>+	.id = 0,</div><div class='add'>+	.name = "LPTimer Count",</div><div class='add'>+	.functions_list = stm32_lptim_cnt_functions,</div><div class='add'>+	.num_functions = 1,</div><div class='add'>+	.synapses = stm32_lptim_cnt_synapses,</div><div class='add'>+	.num_synapses = 1,</div><div class='add'>+	.ext = stm32_lptim_cnt_ext,</div><div class='add'>+	.num_ext = ARRAY_SIZE(stm32_lptim_cnt_ext)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptimer *ddata = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	struct stm32_lptim_cnt *priv;</div><div class='add'>+	struct iio_dev *indio_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(ddata))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	indio_dev = devm_iio_device_alloc(&amp;pdev-&gt;dev, sizeof(*priv));</div><div class='add'>+	if (!indio_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv = iio_priv(indio_dev);</div><div class='add'>+	priv-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	priv-&gt;regmap = ddata-&gt;regmap;</div><div class='add'>+	priv-&gt;clk = ddata-&gt;clk;</div><div class='add'>+	priv-&gt;ceiling = STM32_LPTIM_MAX_ARR;</div><div class='add'>+</div><div class='add'>+	/* Initialize IIO device */</div><div class='add'>+	indio_dev-&gt;name = dev_name(&amp;pdev-&gt;dev);</div><div class='add'>+	indio_dev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	indio_dev-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='add'>+	indio_dev-&gt;info = &amp;stm32_lptim_cnt_iio_info;</div><div class='add'>+	if (ddata-&gt;has_encoder)</div><div class='add'>+		indio_dev-&gt;channels = &amp;stm32_lptim_enc_channels;</div><div class='add'>+	else</div><div class='add'>+		indio_dev-&gt;channels = &amp;stm32_lptim_cnt_channels;</div><div class='add'>+	indio_dev-&gt;num_channels = 1;</div><div class='add'>+</div><div class='add'>+	/* Initialize Counter device */</div><div class='add'>+	priv-&gt;counter.name = dev_name(&amp;pdev-&gt;dev);</div><div class='add'>+	priv-&gt;counter.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	priv-&gt;counter.ops = &amp;stm32_lptim_cnt_ops;</div><div class='add'>+	if (ddata-&gt;has_encoder) {</div><div class='add'>+		priv-&gt;counter.counts = &amp;stm32_lptim_enc_counts;</div><div class='add'>+		priv-&gt;counter.num_signals = ARRAY_SIZE(stm32_lptim_cnt_signals);</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;counter.counts = &amp;stm32_lptim_in1_counts;</div><div class='add'>+		priv-&gt;counter.num_signals = 1;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;counter.num_counts = 1;</div><div class='add'>+	priv-&gt;counter.signals = stm32_lptim_cnt_signals;</div><div class='add'>+	priv-&gt;counter.priv = priv;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+</div><div class='add'>+	ret = devm_iio_device_register(&amp;pdev-&gt;dev, indio_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return devm_counter_register(&amp;pdev-&gt;dev, &amp;priv-&gt;counter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int stm32_lptim_cnt_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Only take care of enabled counter: don't disturb other MFD child */</div><div class='add'>+	if (priv-&gt;enabled) {</div><div class='add'>+		ret = stm32_lptim_setup(priv, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = stm32_lptim_set_enable_state(priv, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Force enable state for later resume */</div><div class='add'>+		priv-&gt;enabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pinctrl_pm_select_sleep_state(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_lptim_cnt_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_lptim_cnt *priv = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pinctrl_pm_select_default_state(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;enabled) {</div><div class='add'>+		priv-&gt;enabled = false;</div><div class='add'>+		ret = stm32_lptim_setup(priv, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = stm32_lptim_set_enable_state(priv, 1);</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'>+#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(stm32_lptim_cnt_pm_ops, stm32_lptim_cnt_suspend,</div><div class='add'>+			 stm32_lptim_cnt_resume);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id stm32_lptim_cnt_of_match[] = {</div><div class='add'>+	{ .compatible = "st,stm32-lptimer-counter", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, stm32_lptim_cnt_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver stm32_lptim_cnt_driver = {</div><div class='add'>+	.probe = stm32_lptim_cnt_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "stm32-lptimer-counter",</div><div class='add'>+		.of_match_table = stm32_lptim_cnt_of_match,</div><div class='add'>+		.pm = &amp;stm32_lptim_cnt_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(stm32_lptim_cnt_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Fabrice Gasnier &lt;fabrice.gasnier@st.com&gt;");</div><div class='add'>+MODULE_ALIAS("platform:stm32-lptimer-counter");</div><div class='add'>+MODULE_DESCRIPTION("STMicroelectronics STM32 LPTIM counter driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c<br/>new file mode 100644<br/>index 000000000000..644ba18a72ad<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/counter/stm32-timer-cnt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/counter/stm32-timer-cnt.c</a></div><div class='hunk'>@@ -0,0 +1,390 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * STM32 Timer Encoder and Counter driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) STMicroelectronics 2018</div><div class='add'>+ *</div><div class='add'>+ * Author: Benjamin Gaignard &lt;benjamin.gaignard@st.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/counter.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/iio/types.h&gt;</div><div class='add'>+#include &lt;linux/mfd/stm32-timers.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'>+</div><div class='add'>+#define TIM_CCMR_CCXS	(BIT(8) | BIT(0))</div><div class='add'>+#define TIM_CCMR_MASK	(TIM_CCMR_CC1S | TIM_CCMR_CC2S | \</div><div class='add'>+			 TIM_CCMR_IC1F | TIM_CCMR_IC2F)</div><div class='add'>+#define TIM_CCER_MASK	(TIM_CCER_CC1P | TIM_CCER_CC1NP | \</div><div class='add'>+			 TIM_CCER_CC2P | TIM_CCER_CC2NP)</div><div class='add'>+</div><div class='add'>+struct stm32_timer_cnt {</div><div class='add'>+	struct counter_device counter;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	u32 ceiling;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stm32_count_function - enumerates stm32 timer counter encoder modes</div><div class='add'>+ * @STM32_COUNT_SLAVE_MODE_DISABLED: counts on internal clock when CEN=1</div><div class='add'>+ * @STM32_COUNT_ENCODER_MODE_1: counts TI1FP1 edges, depending on TI2FP2 level</div><div class='add'>+ * @STM32_COUNT_ENCODER_MODE_2: counts TI2FP2 edges, depending on TI1FP1 level</div><div class='add'>+ * @STM32_COUNT_ENCODER_MODE_3: counts on both TI1FP1 and TI2FP2 edges</div><div class='add'>+ */</div><div class='add'>+enum stm32_count_function {</div><div class='add'>+	STM32_COUNT_SLAVE_MODE_DISABLED = -1,</div><div class='add'>+	STM32_COUNT_ENCODER_MODE_1,</div><div class='add'>+	STM32_COUNT_ENCODER_MODE_2,</div><div class='add'>+	STM32_COUNT_ENCODER_MODE_3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_count_function stm32_count_functions[] = {</div><div class='add'>+	[STM32_COUNT_ENCODER_MODE_1] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A,</div><div class='add'>+	[STM32_COUNT_ENCODER_MODE_2] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B,</div><div class='add'>+	[STM32_COUNT_ENCODER_MODE_3] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_count_read(struct counter_device *counter,</div><div class='add'>+			    struct counter_count *count,</div><div class='add'>+			    struct counter_count_read_value *val)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 cnt;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, TIM_CNT, &amp;cnt);</div><div class='add'>+	counter_count_read_value_set(val, COUNTER_COUNT_POSITION, &amp;cnt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_count_write(struct counter_device *counter,</div><div class='add'>+			     struct counter_count *count,</div><div class='add'>+			     struct counter_count_write_value *val)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 cnt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = counter_count_write_value_get(&amp;cnt, COUNTER_COUNT_POSITION, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cnt &gt; priv-&gt;ceiling)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;regmap, TIM_CNT, cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_count_function_get(struct counter_device *counter,</div><div class='add'>+				    struct counter_count *count,</div><div class='add'>+				    size_t *function)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 smcr;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, TIM_SMCR, &amp;smcr);</div><div class='add'>+</div><div class='add'>+	switch (smcr &amp; TIM_SMCR_SMS) {</div><div class='add'>+	case 1:</div><div class='add'>+		*function = STM32_COUNT_ENCODER_MODE_1;</div><div class='add'>+		return 0;</div><div class='add'>+	case 2:</div><div class='add'>+		*function = STM32_COUNT_ENCODER_MODE_2;</div><div class='add'>+		return 0;</div><div class='add'>+	case 3:</div><div class='add'>+		*function = STM32_COUNT_ENCODER_MODE_3;</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 stm32_count_function_set(struct counter_device *counter,</div><div class='add'>+				    struct counter_count *count,</div><div class='add'>+				    size_t function)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 cr1, sms;</div><div class='add'>+</div><div class='add'>+	switch (function) {</div><div class='add'>+	case STM32_COUNT_ENCODER_MODE_1:</div><div class='add'>+		sms = 1;</div><div class='add'>+		break;</div><div class='add'>+	case STM32_COUNT_ENCODER_MODE_2:</div><div class='add'>+		sms = 2;</div><div class='add'>+		break;</div><div class='add'>+	case STM32_COUNT_ENCODER_MODE_3:</div><div class='add'>+		sms = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		sms = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store enable status */</div><div class='add'>+	regmap_read(priv-&gt;regmap, TIM_CR1, &amp;cr1);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, TIM_CR1, TIM_CR1_CEN, 0);</div><div class='add'>+</div><div class='add'>+	/* TIMx_ARR register shouldn't be buffered (ARPE=0) */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, TIM_CR1, TIM_CR1_ARPE, 0);</div><div class='add'>+	regmap_write(priv-&gt;regmap, TIM_ARR, priv-&gt;ceiling);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, TIM_SMCR, TIM_SMCR_SMS, sms);</div><div class='add'>+</div><div class='add'>+	/* Make sure that registers are updated */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, TIM_EGR, TIM_EGR_UG, TIM_EGR_UG);</div><div class='add'>+</div><div class='add'>+	/* Restore the enable status */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, TIM_CR1, TIM_CR1_CEN, cr1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_count_direction_read(struct counter_device *counter,</div><div class='add'>+				      struct counter_count *count,</div><div class='add'>+				      void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	const char *direction;</div><div class='add'>+	u32 cr1;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, TIM_CR1, &amp;cr1);</div><div class='add'>+	direction = (cr1 &amp; TIM_CR1_DIR) ? "backward" : "forward";</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", direction);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_count_ceiling_read(struct counter_device *counter,</div><div class='add'>+					struct counter_count *count,</div><div class='add'>+					void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 arr;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, TIM_ARR, &amp;arr);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%u\n", arr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_count_ceiling_write(struct counter_device *counter,</div><div class='add'>+					 struct counter_count *count,</div><div class='add'>+					 void *private,</div><div class='add'>+					 const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	unsigned int ceiling;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;ceiling);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* TIMx_ARR register shouldn't be buffered (ARPE=0) */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, TIM_CR1, TIM_CR1_ARPE, 0);</div><div class='add'>+	regmap_write(priv-&gt;regmap, TIM_ARR, ceiling);</div><div class='add'>+</div><div class='add'>+	priv-&gt;ceiling = ceiling;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_count_enable_read(struct counter_device *counter,</div><div class='add'>+				       struct counter_count *count,</div><div class='add'>+				       void *private, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	u32 cr1;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, TIM_CR1, &amp;cr1);</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", (bool)(cr1 &amp; TIM_CR1_CEN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t stm32_count_enable_write(struct counter_device *counter,</div><div class='add'>+					struct counter_count *count,</div><div class='add'>+					void *private,</div><div class='add'>+					const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timer_cnt *const priv = counter-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+	u32 cr1;</div><div class='add'>+	bool enable;</div><div class='add'>+</div><div class='add'>+	err = kstrtobool(buf, &amp;enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		regmap_read(priv-&gt;regmap, TIM_CR1, &amp;cr1);</div><div class='add'>+			if (!(cr1 &amp; TIM_CR1_CEN))</div><div class='add'>+				clk_enable(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+		regmap_update_bits(priv-&gt;regmap, TIM_CR1, TIM_CR1_CEN,</div><div class='add'>+				   TIM_CR1_CEN);</div><div class='add'>+	} else {</div><div class='add'>+		regmap_read(priv-&gt;regmap, TIM_CR1, &amp;cr1);</div><div class='add'>+		regmap_update_bits(priv-&gt;regmap, TIM_CR1, TIM_CR1_CEN, 0);</div><div class='add'>+		if (cr1 &amp; TIM_CR1_CEN)</div><div class='add'>+			clk_disable(priv-&gt;clk);</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 const struct counter_count_ext stm32_count_ext[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "direction",</div><div class='add'>+		.read = stm32_count_direction_read,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "enable",</div><div class='add'>+		.read = stm32_count_enable_read,</div><div class='add'>+		.write = stm32_count_enable_write</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "ceiling",</div><div class='add'>+		.read = stm32_count_ceiling_read,</div><div class='add'>+		.write = stm32_count_ceiling_write</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum stm32_synapse_action {</div><div class='add'>+	STM32_SYNAPSE_ACTION_NONE,</div><div class='add'>+	STM32_SYNAPSE_ACTION_BOTH_EDGES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum counter_synapse_action stm32_synapse_actions[] = {</div><div class='add'>+	[STM32_SYNAPSE_ACTION_NONE] = COUNTER_SYNAPSE_ACTION_NONE,</div><div class='add'>+	[STM32_SYNAPSE_ACTION_BOTH_EDGES] = COUNTER_SYNAPSE_ACTION_BOTH_EDGES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_action_get(struct counter_device *counter,</div><div class='add'>+			    struct counter_count *count,</div><div class='add'>+			    struct counter_synapse *synapse,</div><div class='add'>+			    size_t *action)</div><div class='add'>+{</div><div class='add'>+	size_t function;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Default action mode (e.g. STM32_COUNT_SLAVE_MODE_DISABLED) */</div><div class='add'>+	*action = STM32_SYNAPSE_ACTION_NONE;</div><div class='add'>+</div><div class='add'>+	err = stm32_count_function_get(counter, count, &amp;function);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (function) {</div><div class='add'>+	case STM32_COUNT_ENCODER_MODE_1:</div><div class='add'>+		/* counts up/down on TI1FP1 edge depending on TI2FP2 level */</div><div class='add'>+		if (synapse-&gt;signal-&gt;id == count-&gt;synapses[0].signal-&gt;id)</div><div class='add'>+			*action = STM32_SYNAPSE_ACTION_BOTH_EDGES;</div><div class='add'>+		break;</div><div class='add'>+	case STM32_COUNT_ENCODER_MODE_2:</div><div class='add'>+		/* counts up/down on TI2FP2 edge depending on TI1FP1 level */</div><div class='add'>+		if (synapse-&gt;signal-&gt;id == count-&gt;synapses[1].signal-&gt;id)</div><div class='add'>+			*action = STM32_SYNAPSE_ACTION_BOTH_EDGES;</div><div class='add'>+		break;</div><div class='add'>+	case STM32_COUNT_ENCODER_MODE_3:</div><div class='add'>+		/* counts up/down on both TI1FP1 and TI2FP2 edges */</div><div class='add'>+		*action = STM32_SYNAPSE_ACTION_BOTH_EDGES;</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 const struct counter_ops stm32_timer_cnt_ops = {</div><div class='add'>+	.count_read = stm32_count_read,</div><div class='add'>+	.count_write = stm32_count_write,</div><div class='add'>+	.function_get = stm32_count_function_get,</div><div class='add'>+	.function_set = stm32_count_function_set,</div><div class='add'>+	.action_get = stm32_action_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_signal stm32_signals[] = {</div><div class='add'>+	{</div><div class='add'>+		.id = 0,</div><div class='add'>+		.name = "Channel 1 Quadrature A"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = 1,</div><div class='add'>+		.name = "Channel 1 Quadrature B"</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_synapse stm32_count_synapses[] = {</div><div class='add'>+	{</div><div class='add'>+		.actions_list = stm32_synapse_actions,</div><div class='add'>+		.num_actions = ARRAY_SIZE(stm32_synapse_actions),</div><div class='add'>+		.signal = &amp;stm32_signals[0]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.actions_list = stm32_synapse_actions,</div><div class='add'>+		.num_actions = ARRAY_SIZE(stm32_synapse_actions),</div><div class='add'>+		.signal = &amp;stm32_signals[1]</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct counter_count stm32_counts = {</div><div class='add'>+	.id = 0,</div><div class='add'>+	.name = "Channel 1 Count",</div><div class='add'>+	.functions_list = stm32_count_functions,</div><div class='add'>+	.num_functions = ARRAY_SIZE(stm32_count_functions),</div><div class='add'>+	.synapses = stm32_count_synapses,</div><div class='add'>+	.num_synapses = ARRAY_SIZE(stm32_count_synapses),</div><div class='add'>+	.ext = stm32_count_ext,</div><div class='add'>+	.num_ext = ARRAY_SIZE(stm32_count_ext)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_timer_cnt_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_timers *ddata = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct stm32_timer_cnt *priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(ddata))</div><div class='add'>+		return -EINVAL;</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;regmap = ddata-&gt;regmap;</div><div class='add'>+	priv-&gt;clk = ddata-&gt;clk;</div><div class='add'>+	priv-&gt;ceiling = ddata-&gt;max_arr;</div><div class='add'>+</div><div class='add'>+	priv-&gt;counter.name = dev_name(dev);</div><div class='add'>+	priv-&gt;counter.parent = dev;</div><div class='add'>+	priv-&gt;counter.ops = &amp;stm32_timer_cnt_ops;</div><div class='add'>+	priv-&gt;counter.counts = &amp;stm32_counts;</div><div class='add'>+	priv-&gt;counter.num_counts = 1;</div><div class='add'>+	priv-&gt;counter.signals = stm32_signals;</div><div class='add'>+	priv-&gt;counter.num_signals = ARRAY_SIZE(stm32_signals);</div><div class='add'>+	priv-&gt;counter.priv = priv;</div><div class='add'>+</div><div class='add'>+	/* Register Counter device */</div><div class='add'>+	return devm_counter_register(dev, &amp;priv-&gt;counter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id stm32_timer_cnt_of_match[] = {</div><div class='add'>+	{ .compatible = "st,stm32-timer-counter", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, stm32_timer_cnt_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver stm32_timer_cnt_driver = {</div><div class='add'>+	.probe = stm32_timer_cnt_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "stm32-timer-counter",</div><div class='add'>+		.of_match_table = stm32_timer_cnt_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(stm32_timer_cnt_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Benjamin Gaignard &lt;benjamin.gaignard@st.com&gt;");</div><div class='add'>+MODULE_ALIAS("platform:stm32-timer-counter");</div><div class='add'>+MODULE_DESCRIPTION("STMicroelectronics STM32 TIMER counter driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig<br/>index b22e6bba71f1..4d2b33a30292 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/Kconfig</a></div><div class='hunk'>@@ -26,10 +26,6 @@ config CPU_FREQ_GOV_COMMON</div><div class='ctx'> 	select IRQ_WORK</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config CPU_FREQ_BOOST_SW</div><div class='del'>-	bool</div><div class='del'>-	depends on THERMAL</div><div class='del'>-</div><div class='ctx'> config CPU_FREQ_STAT</div><div class='ctx'> 	bool "CPU frequency transition statistics"</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c<br/>index c72258a44ba4..73bb2aafb1a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/acpi-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/acpi-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/acpi-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/acpi-cpufreq.c</a></div><div class='hunk'>@@ -366,7 +366,7 @@ static u32 get_cur_val(const struct cpumask *mask, struct acpi_cpufreq_data *dat</div><div class='ctx'> </div><div class='ctx'> 	val = drv_read(data, mask);</div><div class='ctx'> </div><div class='del'>-	pr_debug("get_cur_val = %u\n", val);</div><div class='add'>+	pr_debug("%s = %u\n", __func__, val);</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='hunk'>@@ -378,7 +378,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu)</div><div class='ctx'> 	unsigned int freq;</div><div class='ctx'> 	unsigned int cached_freq;</div><div class='ctx'> </div><div class='del'>-	pr_debug("get_cur_freq_on_cpu (%d)\n", cpu);</div><div class='add'>+	pr_debug("%s (%d)\n", __func__, cpu);</div><div class='ctx'> </div><div class='ctx'> 	policy = cpufreq_cpu_get_raw(cpu);</div><div class='ctx'> 	if (unlikely(!policy))</div><div class='hunk'>@@ -458,8 +458,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,</div><div class='ctx'> 	if (acpi_pstate_strict) {</div><div class='ctx'> 		if (!check_freqs(policy, mask,</div><div class='ctx'> 				 policy-&gt;freq_table[index].frequency)) {</div><div class='del'>-			pr_debug("acpi_cpufreq_target failed (%d)\n",</div><div class='del'>-				policy-&gt;cpu);</div><div class='add'>+			pr_debug("%s (%d)\n", __func__, policy-&gt;cpu);</div><div class='ctx'> 			result = -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -573,7 +572,7 @@ static int cpufreq_boost_down_prep(unsigned int cpu)</div><div class='ctx'> static int __init acpi_cpufreq_early_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	pr_debug("acpi_cpufreq_early_init\n");</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	acpi_perf_data = alloc_percpu(struct acpi_processor_performance);</div><div class='ctx'> 	if (!acpi_perf_data) {</div><div class='hunk'>@@ -657,7 +656,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	static int blacklisted;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	pr_debug("acpi_cpufreq_cpu_init\n");</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	if (blacklisted)</div><div class='hunk'>@@ -856,7 +855,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_cpufreq_data *data = policy-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	pr_debug("acpi_cpufreq_cpu_exit\n");</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	policy-&gt;fast_switch_possible = false;</div><div class='ctx'> 	policy-&gt;driver_data = NULL;</div><div class='hunk'>@@ -881,7 +880,7 @@ static int acpi_cpufreq_resume(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_cpufreq_data *data = policy-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	pr_debug("acpi_cpufreq_resume\n");</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;resume = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -954,7 +953,7 @@ static int __init acpi_cpufreq_init(void)</div><div class='ctx'> 	if (cpufreq_get_current_driver())</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> </div><div class='del'>-	pr_debug("acpi_cpufreq_init\n");</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	ret = acpi_cpufreq_early_init();</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -991,7 +990,7 @@ static int __init acpi_cpufreq_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_cpufreq_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("acpi_cpufreq_exit\n");</div><div class='add'>+	pr_debug("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	acpi_cpufreq_boost_exit();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c<br/>index 4ac7c3cf34be..6927a8c0e748 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/amd_freq_sensitivity.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/amd_freq_sensitivity.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/amd_freq_sensitivity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/amd_freq_sensitivity.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ static int __init amd_freq_sensitivity_init(void)</div><div class='ctx'> 			PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!pcidev) {</div><div class='del'>-		if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK))</div><div class='add'>+		if (!boot_cpu_has(X86_FEATURE_PROC_FEEDBACK))</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c<br/>index 75491fc841a6..0df16eb1eb3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/armada-37xx-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/armada-37xx-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/armada-37xx-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/armada-37xx-cpufreq.c</a></div><div class='hunk'>@@ -359,11 +359,11 @@ static int __init armada37xx_cpufreq_driver_init(void)</div><div class='ctx'> 	struct armada_37xx_dvfs *dvfs;</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> 	unsigned long freq;</div><div class='del'>-	unsigned int cur_frequency;</div><div class='add'>+	unsigned int cur_frequency, base_frequency;</div><div class='ctx'> 	struct regmap *nb_pm_base, *avs_base;</div><div class='ctx'> 	struct device *cpu_dev;</div><div class='ctx'> 	int load_lvl, ret;</div><div class='del'>-	struct clk *clk;</div><div class='add'>+	struct clk *clk, *parent;</div><div class='ctx'> </div><div class='ctx'> 	nb_pm_base =</div><div class='ctx'> 		syscon_regmap_lookup_by_compatible("marvell,armada-3700-nb-pm");</div><div class='hunk'>@@ -399,6 +399,22 @@ static int __init armada37xx_cpufreq_driver_init(void)</div><div class='ctx'> 		return PTR_ERR(clk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	parent = clk_get_parent(clk);</div><div class='add'>+	if (IS_ERR(parent)) {</div><div class='add'>+		dev_err(cpu_dev, "Cannot get parent clock for CPU0\n");</div><div class='add'>+		clk_put(clk);</div><div class='add'>+		return PTR_ERR(parent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get parent CPU frequency */</div><div class='add'>+	base_frequency =  clk_get_rate(parent);</div><div class='add'>+</div><div class='add'>+	if (!base_frequency) {</div><div class='add'>+		dev_err(cpu_dev, "Failed to get parent clock rate for CPU\n");</div><div class='add'>+		clk_put(clk);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Get nominal (current) CPU frequency */</div><div class='ctx'> 	cur_frequency = clk_get_rate(clk);</div><div class='ctx'> 	if (!cur_frequency) {</div><div class='hunk'>@@ -431,7 +447,7 @@ static int __init armada37xx_cpufreq_driver_init(void)</div><div class='ctx'> 	for (load_lvl = ARMADA_37XX_DVFS_LOAD_0; load_lvl &lt; LOAD_LEVEL_NR;</div><div class='ctx'> 	     load_lvl++) {</div><div class='ctx'> 		unsigned long u_volt = avs_map[dvfs-&gt;avs[load_lvl]] * 1000;</div><div class='del'>-		freq = cur_frequency / dvfs-&gt;divider[load_lvl];</div><div class='add'>+		freq = base_frequency / dvfs-&gt;divider[load_lvl];</div><div class='ctx'> 		ret = dev_pm_opp_add(cpu_dev, freq, u_volt);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto remove_opp;</div><div class='head'>diff --git a/drivers/cpufreq/armada-8k-cpufreq.c b/drivers/cpufreq/armada-8k-cpufreq.c<br/>index b3f4bd647e9b..988ebc326bdb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/armada-8k-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/armada-8k-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/armada-8k-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/armada-8k-cpufreq.c</a></div><div class='hunk'>@@ -132,6 +132,7 @@ static int __init armada_8k_cpufreq_init(void)</div><div class='ctx'> 		of_node_put(node);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	of_node_put(node);</div><div class='ctx'> </div><div class='ctx'> 	nb_cpus = num_possible_cpus();</div><div class='ctx'> 	freq_tables = kcalloc(nb_cpus, sizeof(*freq_tables), GFP_KERNEL);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c<br/>index e10922709d13..db779b650fce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/cpufreq.c</a></div><div class='hunk'>@@ -34,11 +34,6 @@</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(cpufreq_policy_list);</div><div class='ctx'> </div><div class='del'>-static inline bool policy_is_inactive(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	return cpumask_empty(policy-&gt;cpus);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Macros to iterate over CPU policies */</div><div class='ctx'> #define for_each_suitable_policy(__policy, __active)			 \</div><div class='ctx'> 	list_for_each_entry(__policy, &amp;cpufreq_policy_list, policy_list) \</div><div class='hunk'>@@ -250,6 +245,51 @@ void cpufreq_cpu_put(struct cpufreq_policy *policy)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cpufreq_cpu_put);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cpufreq_cpu_release - Unlock a policy and decrement its usage counter.</div><div class='add'>+ * @policy: cpufreq policy returned by cpufreq_cpu_acquire().</div><div class='add'>+ */</div><div class='add'>+void cpufreq_cpu_release(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!policy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;policy-&gt;rwsem);</div><div class='add'>+</div><div class='add'>+	up_write(&amp;policy-&gt;rwsem);</div><div class='add'>+</div><div class='add'>+	cpufreq_cpu_put(policy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpufreq_cpu_acquire - Find policy for a CPU, mark it as busy and lock it.</div><div class='add'>+ * @cpu: CPU to find the policy for.</div><div class='add'>+ *</div><div class='add'>+ * Call cpufreq_cpu_get() to get a reference on the cpufreq policy for @cpu and</div><div class='add'>+ * if the policy returned by it is not NULL, acquire its rwsem for writing.</div><div class='add'>+ * Return the policy if it is active or release it and return NULL otherwise.</div><div class='add'>+ *</div><div class='add'>+ * The policy returned by this function has to be released with the help of</div><div class='add'>+ * cpufreq_cpu_release() in order to release its rwsem and balance its usage</div><div class='add'>+ * counter properly.</div><div class='add'>+ */</div><div class='add'>+struct cpufreq_policy *cpufreq_cpu_acquire(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);</div><div class='add'>+</div><div class='add'>+	if (!policy)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;policy-&gt;rwsem);</div><div class='add'>+</div><div class='add'>+	if (policy_is_inactive(policy)) {</div><div class='add'>+		cpufreq_cpu_release(policy);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return policy;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *            EXTERNALLY AFFECTING FREQUENCY CHANGES                 *</div><div class='ctx'>  *********************************************************************/</div><div class='hunk'>@@ -426,7 +466,7 @@ static void cpufreq_list_transition_notifiers(void)</div><div class='ctx'> 	mutex_lock(&amp;cpufreq_transition_notifier_list.mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (nb = cpufreq_transition_notifier_list.head; nb; nb = nb-&gt;next)</div><div class='del'>-		pr_info("%pF\n", nb-&gt;notifier_call);</div><div class='add'>+		pr_info("%pS\n", nb-&gt;notifier_call);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cpufreq_transition_notifier_list.mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -669,9 +709,6 @@ static ssize_t show_scaling_cur_freq(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpufreq_set_policy(struct cpufreq_policy *policy,</div><div class='del'>-				struct cpufreq_policy *new_policy);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * cpufreq_per_cpu_attr_write() / store_##file_name() - sysfs write access</div><div class='ctx'>  */</div><div class='hunk'>@@ -857,11 +894,9 @@ static ssize_t show_bios_limit(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int limit;</div><div class='ctx'> 	int ret;</div><div class='del'>-	if (cpufreq_driver-&gt;bios_limit) {</div><div class='del'>-		ret = cpufreq_driver-&gt;bios_limit(policy-&gt;cpu, &amp;limit);</div><div class='del'>-		if (!ret)</div><div class='del'>-			return sprintf(buf, "%u\n", limit);</div><div class='del'>-	}</div><div class='add'>+	ret = cpufreq_driver-&gt;bios_limit(policy-&gt;cpu, &amp;limit);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return sprintf(buf, "%u\n", limit);</div><div class='ctx'> 	return sprintf(buf, "%u\n", policy-&gt;cpuinfo.max_freq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1098,6 +1133,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)</div><div class='ctx'> 				   cpufreq_global_kobject, "policy%u", cpu);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: failed to init policy-&gt;kobj: %d\n", __func__, ret);</div><div class='add'>+		kobject_put(&amp;policy-&gt;kobj);</div><div class='ctx'> 		goto err_free_real_cpus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1550,7 +1586,7 @@ static unsigned int __cpufreq_get(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ret_freq = 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(policy_is_inactive(policy)) || !cpufreq_driver-&gt;get)</div><div class='add'>+	if (unlikely(policy_is_inactive(policy)))</div><div class='ctx'> 		return ret_freq;</div><div class='ctx'> </div><div class='ctx'> 	ret_freq = cpufreq_driver-&gt;get(policy-&gt;cpu);</div><div class='hunk'>@@ -1588,7 +1624,8 @@ unsigned int cpufreq_get(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (policy) {</div><div class='ctx'> 		down_read(&amp;policy-&gt;rwsem);</div><div class='del'>-		ret_freq = __cpufreq_get(policy);</div><div class='add'>+		if (cpufreq_driver-&gt;get)</div><div class='add'>+			ret_freq = __cpufreq_get(policy);</div><div class='ctx'> 		up_read(&amp;policy-&gt;rwsem);</div><div class='ctx'> </div><div class='ctx'> 		cpufreq_cpu_put(policy);</div><div class='hunk'>@@ -2229,8 +2266,8 @@ EXPORT_SYMBOL(cpufreq_get_policy);</div><div class='ctx'>  *</div><div class='ctx'>  * The cpuinfo part of @policy is not updated by this function.</div><div class='ctx'>  */</div><div class='del'>-static int cpufreq_set_policy(struct cpufreq_policy *policy,</div><div class='del'>-			      struct cpufreq_policy *new_policy)</div><div class='add'>+int cpufreq_set_policy(struct cpufreq_policy *policy,</div><div class='add'>+		       struct cpufreq_policy *new_policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_governor *old_gov;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2337,17 +2374,12 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,</div><div class='ctx'>  */</div><div class='ctx'> void cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);</div><div class='add'>+	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);</div><div class='ctx'> 	struct cpufreq_policy new_policy;</div><div class='ctx'> </div><div class='ctx'> 	if (!policy)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;policy-&gt;rwsem);</div><div class='del'>-</div><div class='del'>-	if (policy_is_inactive(policy))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * BIOS might change freq behind our back</div><div class='ctx'> 	 * -&gt; ask driver for current freq and notify governors about a change</div><div class='hunk'>@@ -2364,12 +2396,26 @@ void cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> 	cpufreq_set_policy(policy, &amp;new_policy);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	up_write(&amp;policy-&gt;rwsem);</div><div class='del'>-</div><div class='del'>-	cpufreq_cpu_put(policy);</div><div class='add'>+	cpufreq_cpu_release(policy);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cpufreq_update_policy);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cpufreq_update_limits - Update policy limits for a given CPU.</div><div class='add'>+ * @cpu: CPU to update the policy limits for.</div><div class='add'>+ *</div><div class='add'>+ * Invoke the driver's -&gt;update_limits callback if present or call</div><div class='add'>+ * cpufreq_update_policy() for @cpu.</div><div class='add'>+ */</div><div class='add'>+void cpufreq_update_limits(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	if (cpufreq_driver-&gt;update_limits)</div><div class='add'>+		cpufreq_driver-&gt;update_limits(cpu);</div><div class='add'>+	else</div><div class='add'>+		cpufreq_update_policy(cpu);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cpufreq_update_limits);</div><div class='add'>+</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *               BOOST						     *</div><div class='ctx'>  *********************************************************************/</div><div class='hunk'>@@ -2426,7 +2472,7 @@ int cpufreq_boost_trigger_state(int state)</div><div class='ctx'> </div><div class='ctx'> static bool cpufreq_boost_supported(void)</div><div class='ctx'> {</div><div class='del'>-	return likely(cpufreq_driver) &amp;&amp; cpufreq_driver-&gt;set_boost;</div><div class='add'>+	return cpufreq_driver-&gt;set_boost;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int create_boost_sysfs_file(void)</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c<br/>index ffa9adeaba31..9d1d9bf02710 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/cpufreq_governor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/cpufreq_governor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/cpufreq_governor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/cpufreq_governor.c</a></div><div class='hunk'>@@ -459,6 +459,8 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	/* Failure, so roll back. */</div><div class='ctx'> 	pr_err("initialization failed (dbs_data kobject init error %d)\n", ret);</div><div class='ctx'> </div><div class='add'>+	kobject_put(&amp;dbs_data-&gt;attr_set.kobj);</div><div class='add'>+</div><div class='ctx'> 	policy-&gt;governor_data = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!have_governor_per_policy())</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c<br/>index e2db5581489a..08b192eb22c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/cpufreq_stats.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/cpufreq_stats.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/cpufreq_stats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/cpufreq_stats.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(cpufreq_stats_lock);</div><div class='ctx'> </div><div class='ctx'> struct cpufreq_stats {</div><div class='ctx'> 	unsigned int total_trans;</div><div class='hunk'>@@ -23,6 +22,7 @@ struct cpufreq_stats {</div><div class='ctx'> 	unsigned int state_num;</div><div class='ctx'> 	unsigned int last_index;</div><div class='ctx'> 	u64 *time_in_state;</div><div class='add'>+	spinlock_t lock;</div><div class='ctx'> 	unsigned int *freq_table;</div><div class='ctx'> 	unsigned int *trans_table;</div><div class='ctx'> };</div><div class='hunk'>@@ -39,12 +39,12 @@ static void cpufreq_stats_clear_table(struct cpufreq_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int count = stats-&gt;max_state;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cpufreq_stats_lock);</div><div class='add'>+	spin_lock(&amp;stats-&gt;lock);</div><div class='ctx'> 	memset(stats-&gt;time_in_state, 0, count * sizeof(u64));</div><div class='ctx'> 	memset(stats-&gt;trans_table, 0, count * count * sizeof(int));</div><div class='ctx'> 	stats-&gt;last_time = get_jiffies_64();</div><div class='ctx'> 	stats-&gt;total_trans = 0;</div><div class='del'>-	spin_unlock(&amp;cpufreq_stats_lock);</div><div class='add'>+	spin_unlock(&amp;stats-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_total_trans(struct cpufreq_policy *policy, char *buf)</div><div class='hunk'>@@ -62,9 +62,9 @@ static ssize_t show_time_in_state(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> 	if (policy-&gt;fast_switch_enabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cpufreq_stats_lock);</div><div class='add'>+	spin_lock(&amp;stats-&gt;lock);</div><div class='ctx'> 	cpufreq_stats_update(stats);</div><div class='del'>-	spin_unlock(&amp;cpufreq_stats_lock);</div><div class='add'>+	spin_unlock(&amp;stats-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; stats-&gt;state_num; i++) {</div><div class='ctx'> 		len += sprintf(buf + len, "%u %llu\n", stats-&gt;freq_table[i],</div><div class='hunk'>@@ -211,6 +211,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)</div><div class='ctx'> 	stats-&gt;state_num = i;</div><div class='ctx'> 	stats-&gt;last_time = get_jiffies_64();</div><div class='ctx'> 	stats-&gt;last_index = freq_table_get_index(stats, policy-&gt;cur);</div><div class='add'>+	spin_lock_init(&amp;stats-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	policy-&gt;stats = stats;</div><div class='ctx'> 	ret = sysfs_create_group(&amp;policy-&gt;kobj, &amp;stats_attr_group);</div><div class='hunk'>@@ -242,11 +243,11 @@ void cpufreq_stats_record_transition(struct cpufreq_policy *policy,</div><div class='ctx'> 	if (old_index == -1 || new_index == -1 || old_index == new_index)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cpufreq_stats_lock);</div><div class='add'>+	spin_lock(&amp;stats-&gt;lock);</div><div class='ctx'> 	cpufreq_stats_update(stats);</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;last_index = new_index;</div><div class='ctx'> 	stats-&gt;trans_table[old_index * stats-&gt;max_state + new_index]++;</div><div class='ctx'> 	stats-&gt;total_trans++;</div><div class='del'>-	spin_unlock(&amp;cpufreq_stats_lock);</div><div class='add'>+	spin_unlock(&amp;stats-&gt;lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c<br/>index 3a8cc99e6815..e7be0af3199f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/freq_table.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/freq_table.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/freq_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/freq_table.c</a></div><div class='hunk'>@@ -290,9 +290,6 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_boost_freqs);</div><div class='ctx'> </div><div class='ctx'> struct freq_attr *cpufreq_generic_attr[] = {</div><div class='ctx'> 	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='del'>-#ifdef CONFIG_CPU_FREQ_BOOST_SW</div><div class='del'>-	&amp;cpufreq_freq_attr_scaling_boost_freqs,</div><div class='del'>-#endif</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(cpufreq_generic_attr);</div><div class='head'>diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c<br/>index a4ff09f91c8f..3e17560b1efe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/imx6q-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/imx6q-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/imx6q-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/imx6q-cpufreq.c</a></div><div class='hunk'>@@ -388,11 +388,11 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)</div><div class='ctx'> 		ret = imx6ul_opp_check_speed_grading(cpu_dev);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			if (ret == -EPROBE_DEFER)</div><div class='del'>-				return ret;</div><div class='add'>+				goto put_node;</div><div class='ctx'> </div><div class='ctx'> 			dev_err(cpu_dev, "failed to read ocotp: %d\n",</div><div class='ctx'> 				ret);</div><div class='del'>-			return ret;</div><div class='add'>+			goto put_node;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		imx6q_opp_check_speed_grading(cpu_dev);</div><div class='head'>diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c<br/>index e22f0dbaebb1..34b54df41aaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/intel_pstate.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/intel_pstate.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/intel_pstate.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/intel_pstate.c</a></div><div class='hunk'>@@ -179,6 +179,7 @@ struct vid_data {</div><div class='ctx'>  *			based on the MSR_IA32_MISC_ENABLE value and whether or</div><div class='ctx'>  *			not the maximum reported turbo P-state is different from</div><div class='ctx'>  *			the maximum reported non-turbo one.</div><div class='add'>+ * @turbo_disabled_mf:	The @turbo_disabled value reflected by cpuinfo.max_freq.</div><div class='ctx'>  * @min_perf_pct:	Minimum capacity limit in percent of the maximum turbo</div><div class='ctx'>  *			P-state capacity.</div><div class='ctx'>  * @max_perf_pct:	Maximum capacity limit in percent of the maximum turbo</div><div class='hunk'>@@ -187,6 +188,7 @@ struct vid_data {</div><div class='ctx'> struct global_params {</div><div class='ctx'> 	bool no_turbo;</div><div class='ctx'> 	bool turbo_disabled;</div><div class='add'>+	bool turbo_disabled_mf;</div><div class='ctx'> 	int max_perf_pct;</div><div class='ctx'> 	int min_perf_pct;</div><div class='ctx'> };</div><div class='hunk'>@@ -385,7 +387,10 @@ static int intel_pstate_get_cppc_guranteed(int cpu)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return cppc_perf.guaranteed_perf;</div><div class='add'>+	if (cppc_perf.guaranteed_perf)</div><div class='add'>+		return cppc_perf.guaranteed_perf;</div><div class='add'>+</div><div class='add'>+	return cppc_perf.nominal_perf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_ACPI_CPPC_LIB */</div><div class='hunk'>@@ -522,7 +527,7 @@ static s16 intel_pstate_get_epb(struct cpudata *cpu_data)</div><div class='ctx'> 	u64 epb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_EPB))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_EPB))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	ret = rdmsrl_on_cpu(cpu_data-&gt;cpu, MSR_IA32_ENERGY_PERF_BIAS, &amp;epb);</div><div class='hunk'>@@ -536,7 +541,7 @@ static s16 intel_pstate_get_epp(struct cpudata *cpu_data, u64 hwp_req_data)</div><div class='ctx'> {</div><div class='ctx'> 	s16 epp;</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * When hwp_req_data is 0, means that caller didn't read</div><div class='ctx'> 		 * MSR_HWP_REQUEST, so need to read and get EPP.</div><div class='hunk'>@@ -561,7 +566,7 @@ static int intel_pstate_set_epb(int cpu, s16 pref)</div><div class='ctx'> 	u64 epb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!static_cpu_has(X86_FEATURE_EPB))</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_EPB))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &amp;epb);</div><div class='hunk'>@@ -609,7 +614,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data)</div><div class='ctx'> 	if (epp &lt; 0)</div><div class='ctx'> 		return epp;</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='ctx'> 		if (epp == HWP_EPP_PERFORMANCE)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		if (epp &lt;= HWP_EPP_BALANCE_PERFORMANCE)</div><div class='hunk'>@@ -618,7 +623,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data)</div><div class='ctx'> 			return 3;</div><div class='ctx'> 		else</div><div class='ctx'> 			return 4;</div><div class='del'>-	} else if (static_cpu_has(X86_FEATURE_EPB)) {</div><div class='add'>+	} else if (boot_cpu_has(X86_FEATURE_EPB)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Range:</div><div class='ctx'> 		 *	0x00-0x03	:	Performance</div><div class='hunk'>@@ -646,7 +651,7 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='ctx'> 		u64 value;</div><div class='ctx'> </div><div class='ctx'> 		ret = rdmsrl_on_cpu(cpu_data-&gt;cpu, MSR_HWP_REQUEST, &amp;value);</div><div class='hunk'>@@ -821,7 +826,7 @@ static void intel_pstate_hwp_set(unsigned int cpu)</div><div class='ctx'> 		epp = cpu_data-&gt;epp_powersave;</div><div class='ctx'> 	}</div><div class='ctx'> update_epp:</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='ctx'> 		value &amp;= ~GENMASK_ULL(31, 24);</div><div class='ctx'> 		value |= (u64)epp &lt;&lt; 24;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -846,7 +851,7 @@ static void intel_pstate_hwp_force_min_perf(int cpu)</div><div class='ctx'> 	value |= HWP_MIN_PERF(min_perf);</div><div class='ctx'> </div><div class='ctx'> 	/* Set EPP/EPB to min */</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HWP_EPP))</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP_EPP))</div><div class='ctx'> 		value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE);</div><div class='ctx'> 	else</div><div class='ctx'> 		intel_pstate_set_epb(cpu, HWP_EPP_BALANCE_POWERSAVE);</div><div class='hunk'>@@ -894,6 +899,48 @@ static void intel_pstate_update_policies(void)</div><div class='ctx'> 		cpufreq_update_policy(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void intel_pstate_update_max_freq(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);</div><div class='add'>+	struct cpufreq_policy new_policy;</div><div class='add'>+	struct cpudata *cpudata;</div><div class='add'>+</div><div class='add'>+	if (!policy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpudata = all_cpu_data[cpu];</div><div class='add'>+	policy-&gt;cpuinfo.max_freq = global.turbo_disabled_mf ?</div><div class='add'>+			cpudata-&gt;pstate.max_freq : cpudata-&gt;pstate.turbo_freq;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;new_policy, policy, sizeof(*policy));</div><div class='add'>+	new_policy.max = min(policy-&gt;user_policy.max, policy-&gt;cpuinfo.max_freq);</div><div class='add'>+	new_policy.min = min(policy-&gt;user_policy.min, new_policy.max);</div><div class='add'>+</div><div class='add'>+	cpufreq_set_policy(policy, &amp;new_policy);</div><div class='add'>+</div><div class='add'>+	cpufreq_cpu_release(policy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_pstate_update_limits(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	update_turbo_state();</div><div class='add'>+	/*</div><div class='add'>+	 * If turbo has been turned on or off globally, policy limits for</div><div class='add'>+	 * all CPUs need to be updated to reflect that.</div><div class='add'>+	 */</div><div class='add'>+	if (global.turbo_disabled_mf != global.turbo_disabled) {</div><div class='add'>+		global.turbo_disabled_mf = global.turbo_disabled;</div><div class='add'>+		for_each_possible_cpu(cpu)</div><div class='add'>+			intel_pstate_update_max_freq(cpu);</div><div class='add'>+	} else {</div><div class='add'>+		cpufreq_update_policy(cpu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /************************** sysfs begin ************************/</div><div class='ctx'> #define show_one(file_name, object)					\</div><div class='ctx'> 	static ssize_t show_##file_name					\</div><div class='hunk'>@@ -1194,7 +1241,7 @@ static void __init intel_pstate_sysfs_expose_params(void)</div><div class='ctx'> static void intel_pstate_hwp_enable(struct cpudata *cpudata)</div><div class='ctx'> {</div><div class='ctx'> 	/* First disable HWP notification interrupt as we don't process them */</div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HWP_NOTIFY))</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY))</div><div class='ctx'> 		wrmsrl_on_cpu(cpudata-&gt;cpu, MSR_HWP_INTERRUPT, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	wrmsrl_on_cpu(cpudata-&gt;cpu, MSR_PM_ENABLE, 0x1);</div><div class='hunk'>@@ -2135,6 +2182,7 @@ static int __intel_pstate_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	/* cpuinfo and default policy values */</div><div class='ctx'> 	policy-&gt;cpuinfo.min_freq = cpu-&gt;pstate.min_pstate * cpu-&gt;pstate.scaling;</div><div class='ctx'> 	update_turbo_state();</div><div class='add'>+	global.turbo_disabled_mf = global.turbo_disabled;</div><div class='ctx'> 	policy-&gt;cpuinfo.max_freq = global.turbo_disabled ?</div><div class='ctx'> 			cpu-&gt;pstate.max_pstate : cpu-&gt;pstate.turbo_pstate;</div><div class='ctx'> 	policy-&gt;cpuinfo.max_freq *= cpu-&gt;pstate.scaling;</div><div class='hunk'>@@ -2179,6 +2227,7 @@ static struct cpufreq_driver intel_pstate = {</div><div class='ctx'> 	.init		= intel_pstate_cpu_init,</div><div class='ctx'> 	.exit		= intel_pstate_cpu_exit,</div><div class='ctx'> 	.stop_cpu	= intel_pstate_stop_cpu,</div><div class='add'>+	.update_limits	= intel_pstate_update_limits,</div><div class='ctx'> 	.name		= "intel_pstate",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2313,6 +2362,7 @@ static struct cpufreq_driver intel_cpufreq = {</div><div class='ctx'> 	.init		= intel_cpufreq_cpu_init,</div><div class='ctx'> 	.exit		= intel_pstate_cpu_exit,</div><div class='ctx'> 	.stop_cpu	= intel_cpufreq_stop_cpu,</div><div class='add'>+	.update_limits	= intel_pstate_update_limits,</div><div class='ctx'> 	.name		= "intel_cpufreq",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2593,6 +2643,9 @@ static int __init intel_pstate_init(void)</div><div class='ctx'> 	const struct x86_cpu_id *id;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	if (no_load)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -2608,7 +2661,7 @@ static int __init intel_pstate_init(void)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		id = x86_match_cpu(intel_pstate_cpu_ids);</div><div class='ctx'> 		if (!id) {</div><div class='del'>-			pr_info("CPU ID not supported\n");</div><div class='add'>+			pr_info("CPU model not supported\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c<br/>index c2dd43f3f5d8..8d63a6dc8383 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/kirkwood-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/kirkwood-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/kirkwood-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/kirkwood-cpufreq.c</a></div><div class='hunk'>@@ -124,13 +124,14 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv.cpu_clk = of_clk_get_by_name(np, "cpu_clk");</div><div class='ctx'> 	if (IS_ERR(priv.cpu_clk)) {</div><div class='ctx'> 		dev_err(priv.dev, "Unable to get cpuclk\n");</div><div class='del'>-		return PTR_ERR(priv.cpu_clk);</div><div class='add'>+		err = PTR_ERR(priv.cpu_clk);</div><div class='add'>+		goto out_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = clk_prepare_enable(priv.cpu_clk);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(priv.dev, "Unable to prepare cpuclk\n");</div><div class='del'>-		return err;</div><div class='add'>+		goto out_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;</div><div class='hunk'>@@ -161,20 +162,22 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_ddr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	of_node_put(np);</div><div class='del'>-	np = NULL;</div><div class='del'>-</div><div class='ctx'> 	err = cpufreq_register_driver(&amp;kirkwood_cpufreq_driver);</div><div class='del'>-	if (!err)</div><div class='del'>-		return 0;</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv.dev, "Failed to register cpufreq driver\n");</div><div class='add'>+		goto out_powersave;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev_err(priv.dev, "Failed to register cpufreq driver\n");</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+out_powersave:</div><div class='ctx'> 	clk_disable_unprepare(priv.powersave_clk);</div><div class='ctx'> out_ddr:</div><div class='ctx'> 	clk_disable_unprepare(priv.ddr_clk);</div><div class='ctx'> out_cpu:</div><div class='ctx'> 	clk_disable_unprepare(priv.cpu_clk);</div><div class='add'>+out_node:</div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c<br/>index d9df89392b84..a94355723ef8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/maple-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/maple-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/maple-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/maple-cpufreq.c</a></div><div class='hunk'>@@ -210,7 +210,7 @@ static int __init maple_cpufreq_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	valp = of_get_property(cpunode, "clock-frequency", NULL);</div><div class='ctx'> 	if (!valp)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		goto bail_noprops;</div><div class='ctx'> 	max_freq = (*valp)/1000;</div><div class='ctx'> 	maple_cpu_freqs[0].frequency = max_freq;</div><div class='ctx'> 	maple_cpu_freqs[1].frequency = max_freq/2;</div><div class='hunk'>@@ -231,10 +231,6 @@ static int __init maple_cpufreq_init(void)</div><div class='ctx'> </div><div class='ctx'> 	rc = cpufreq_register_driver(&amp;maple_cpufreq_driver);</div><div class='ctx'> </div><div class='del'>-	of_node_put(cpunode);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-</div><div class='ctx'> bail_noprops:</div><div class='ctx'> 	of_node_put(cpunode);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c<br/>index 75dfbd2a58ea..c7710c149de8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/pasemi-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/pasemi-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/pasemi-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/pasemi-cpufreq.c</a></div><div class='hunk'>@@ -146,6 +146,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	cpu = of_get_cpu_node(policy-&gt;cpu, NULL);</div><div class='ctx'> </div><div class='add'>+	of_node_put(cpu);</div><div class='ctx'> 	if (!cpu)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c<br/>index 52f0d91d30c1..9b4ce2eb8222 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/pmac32-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/pmac32-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/pmac32-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/pmac32-cpufreq.c</a></div><div class='hunk'>@@ -552,6 +552,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode)</div><div class='ctx'> 	volt_gpio_np = of_find_node_by_name(NULL, "cpu-vcore-select");</div><div class='ctx'> 	if (volt_gpio_np)</div><div class='ctx'> 		voltage_gpio = read_gpio(volt_gpio_np);</div><div class='add'>+	of_node_put(volt_gpio_np);</div><div class='ctx'> 	if (!voltage_gpio){</div><div class='ctx'> 		pr_err("missing cpu-vcore-select gpio\n");</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -588,6 +589,7 @@ static int pmac_cpufreq_init_750FX(struct device_node *cpunode)</div><div class='ctx'> 	if (volt_gpio_np)</div><div class='ctx'> 		voltage_gpio = read_gpio(volt_gpio_np);</div><div class='ctx'> </div><div class='add'>+	of_node_put(volt_gpio_np);</div><div class='ctx'> 	pvr = mfspr(SPRN_PVR);</div><div class='ctx'> 	has_cpu_l2lve = !((pvr &amp; 0xf00) == 0x100);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c<br/>index fb77b39a4ce3..3c12e03fa343 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/powernow-k8.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/powernow-k8.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/powernow-k8.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/powernow-k8.c</a></div><div class='hunk'>@@ -1178,7 +1178,7 @@ static int powernowk8_init(void)</div><div class='ctx'> 	unsigned int i, supported_cpus = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (static_cpu_has(X86_FEATURE_HW_PSTATE)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HW_PSTATE)) {</div><div class='ctx'> 		__request_acpi_cpufreq();</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c<br/>index 41a0f0be3f9f..8414c3a4ea08 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/ppc_cbe_cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/ppc_cbe_cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/ppc_cbe_cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/ppc_cbe_cpufreq.c</a></div><div class='hunk'>@@ -86,6 +86,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	if (!cbe_get_cpu_pmd_regs(policy-&gt;cpu) ||</div><div class='ctx'> 	    !cbe_get_cpu_mic_tm_regs(policy-&gt;cpu)) {</div><div class='ctx'> 		pr_info("invalid CBE regs pointers for cpufreq\n");</div><div class='add'>+		of_node_put(cpu);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c<br/>index 4295e5476264..71b640c8c1a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/qoriq-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/qoriq-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/qoriq-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/qoriq-cpufreq.c</a></div><div class='hunk'>@@ -280,10 +280,12 @@ static const struct of_device_id node_matches[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> 	{ .compatible = "fsl,ls1012a-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,ls1021a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,ls1028a-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,ls1043a-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,ls1046a-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,ls1088a-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,ls2080a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,lx2160a-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,p4080-clockgen", },</div><div class='ctx'> 	{ .compatible = "fsl,qoriq-clockgen-1.0", },</div><div class='ctx'> 	{ .compatible = "fsl,qoriq-clockgen-2.0", },</div><div class='head'>diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c<br/>index 3f49427766b8..2b51e0718c9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/scpi-cpufreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/scpi-cpufreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/scpi-cpufreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/scpi-cpufreq.c</a></div><div class='hunk'>@@ -189,8 +189,8 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	clk_put(priv-&gt;clk);</div><div class='ctx'> 	dev_pm_opp_free_cpufreq_table(priv-&gt;cpu_dev, &amp;policy-&gt;freq_table);</div><div class='del'>-	kfree(priv);</div><div class='ctx'> 	dev_pm_opp_remove_all_dynamic(priv-&gt;cpu_dev);</div><div class='add'>+	kfree(priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c<br/>index a1fb735685db..e086b2dd4072 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/speedstep-centrino.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpufreq/speedstep-centrino.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpufreq/speedstep-centrino.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpufreq/speedstep-centrino.c</a></div><div class='hunk'>@@ -412,7 +412,7 @@ static int centrino_cpu_exit(struct cpufreq_policy *policy)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * centrino_setpolicy - set a new CPUFreq policy</div><div class='add'>+ * centrino_target - set a new CPUFreq policy</div><div class='ctx'>  * @policy: new policy</div><div class='ctx'>  * @index: index of target frequency</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/cpuidle/cpuidle-exynos.c b/drivers/cpuidle/cpuidle-exynos.c<br/>index 0171a6e190d7..f7199a35cbb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpuidle/cpuidle-exynos.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpuidle/cpuidle-exynos.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpuidle/cpuidle-exynos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpuidle/cpuidle-exynos.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ static struct cpuidle_driver exynos_idle_driver = {</div><div class='ctx'> 		[1] = {</div><div class='ctx'> 			.enter			= exynos_enter_lowpower,</div><div class='ctx'> 			.exit_latency		= 300,</div><div class='del'>-			.target_residency	= 100000,</div><div class='add'>+			.target_residency	= 10000,</div><div class='ctx'> 			.name			= "C1",</div><div class='ctx'> 			.desc			= "ARM power down",</div><div class='ctx'> 		},</div><div class='head'>diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c<br/>index 7f108309e871..0f4b7c45df3e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpuidle/cpuidle.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/cpuidle/cpuidle.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/cpuidle/cpuidle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/cpuidle/cpuidle.c</a></div><div class='hunk'>@@ -328,9 +328,23 @@ int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,</div><div class='ctx'> int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev,</div><div class='ctx'> 		  int index)</div><div class='ctx'> {</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Store the next hrtimer, which becomes either next tick or the next</div><div class='add'>+	 * timer event, whatever expires first. Additionally, to make this data</div><div class='add'>+	 * useful for consumers outside cpuidle, we rely on that the governor's</div><div class='add'>+	 * -&gt;select() callback have decided, whether to stop the tick or not.</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(dev-&gt;next_hrtimer, tick_nohz_get_next_hrtimer());</div><div class='add'>+</div><div class='ctx'> 	if (cpuidle_state_is_coupled(drv, index))</div><div class='del'>-		return cpuidle_enter_state_coupled(dev, drv, index);</div><div class='del'>-	return cpuidle_enter_state(dev, drv, index);</div><div class='add'>+		ret = cpuidle_enter_state_coupled(dev, drv, index);</div><div class='add'>+	else</div><div class='add'>+		ret = cpuidle_enter_state(dev, drv, index);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(dev-&gt;next_hrtimer, 0);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -511,6 +525,7 @@ static void __cpuidle_device_init(struct cpuidle_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	memset(dev-&gt;states_usage, 0, sizeof(dev-&gt;states_usage));</div><div class='ctx'> 	dev-&gt;last_residency = 0;</div><div class='add'>+	dev-&gt;next_hrtimer = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig<br/>index 0be55fcc19ba..177b7713bd2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/Kconfig</a></div><div class='hunk'>@@ -404,15 +404,6 @@ config CRYPTO_DEV_SAHARA</div><div class='ctx'> 	  This option enables support for the SAHARA HW crypto accelerator</div><div class='ctx'> 	  found in some Freescale i.MX chips.</div><div class='ctx'> </div><div class='del'>-config CRYPTO_DEV_MXC_SCC</div><div class='del'>-	tristate "Support for Freescale Security Controller (SCC)"</div><div class='del'>-	depends on ARCH_MXC &amp;&amp; OF</div><div class='del'>-	select CRYPTO_BLKCIPHER</div><div class='del'>-	select CRYPTO_DES</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for the Security Controller (SCC)</div><div class='del'>-	  found in Freescale i.MX25 chips.</div><div class='del'>-</div><div class='ctx'> config CRYPTO_DEV_EXYNOS_RNG</div><div class='ctx'> 	tristate "EXYNOS HW pseudo random number generator support"</div><div class='ctx'> 	depends on ARCH_EXYNOS || COMPILE_TEST</div><div class='head'>diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile<br/>index 8e7e225d2446..a23a7197fcd7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/Makefile</a></div><div class='hunk'>@@ -18,7 +18,6 @@ obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_MARVELL_CESA) += marvell/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_MEDIATEK) += mediatek/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_MXS_DCP) += mxs-dcp.o</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_MXC_SCC) += mxc-scc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_NIAGARA2) += n2_crypto.o</div><div class='ctx'> n2_crypto-y := n2_core.o n2_asm.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_NX) += nx/</div><div class='head'>diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c<br/>index 4092c2aad8e2..307f5cfa9ba4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/amcc/crypto4xx_alg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/amcc/crypto4xx_alg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/amcc/crypto4xx_alg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/amcc/crypto4xx_alg.c</a></div><div class='hunk'>@@ -141,9 +141,10 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher,</div><div class='ctx'> 	/* Setup SA */</div><div class='ctx'> 	sa = ctx-&gt;sa_in;</div><div class='ctx'> </div><div class='del'>-	set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?</div><div class='del'>-				 SA_SAVE_IV : SA_NOT_SAVE_IV),</div><div class='del'>-				 SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,</div><div class='add'>+	set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_ECB ?</div><div class='add'>+				 SA_NOT_SAVE_IV : SA_SAVE_IV),</div><div class='add'>+				 SA_NOT_LOAD_HASH, (cm == CRYPTO_MODE_ECB ?</div><div class='add'>+				 SA_LOAD_IV_FROM_SA : SA_LOAD_IV_FROM_STATE),</div><div class='ctx'> 				 SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,</div><div class='ctx'> 				 SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,</div><div class='ctx'> 				 SA_OP_GROUP_BASIC, SA_OPCODE_DECRYPT,</div><div class='hunk'>@@ -162,6 +163,11 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher,</div><div class='ctx'> 	memcpy(ctx-&gt;sa_out, ctx-&gt;sa_in, ctx-&gt;sa_len * 4);</div><div class='ctx'> 	sa = ctx-&gt;sa_out;</div><div class='ctx'> 	sa-&gt;sa_command_0.bf.dir = DIR_OUTBOUND;</div><div class='add'>+	/*</div><div class='add'>+	 * SA_OPCODE_ENCRYPT is the same value as SA_OPCODE_DECRYPT.</div><div class='add'>+	 * it's the DIR_(IN|OUT)BOUND that matters</div><div class='add'>+	 */</div><div class='add'>+	sa-&gt;sa_command_0.bf.opcode = SA_OPCODE_ENCRYPT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -258,10 +264,10 @@ crypto4xx_ctr_crypt(struct skcipher_request *req, bool encrypt)</div><div class='ctx'> 	 * overlow.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (counter + nblks &lt; counter) {</div><div class='del'>-		struct skcipher_request *subreq = skcipher_request_ctx(req);</div><div class='add'>+		SYNC_SKCIPHER_REQUEST_ON_STACK(subreq, ctx-&gt;sw_cipher.cipher);</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		skcipher_request_set_tfm(subreq, ctx-&gt;sw_cipher.cipher);</div><div class='add'>+		skcipher_request_set_sync_tfm(subreq, ctx-&gt;sw_cipher.cipher);</div><div class='ctx'> 		skcipher_request_set_callback(subreq, req-&gt;base.flags,</div><div class='ctx'> 			NULL, NULL);</div><div class='ctx'> 		skcipher_request_set_crypt(subreq, req-&gt;src, req-&gt;dst,</div><div class='hunk'>@@ -283,14 +289,14 @@ static int crypto4xx_sk_setup_fallback(struct crypto4xx_ctx *ctx,</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	crypto_skcipher_clear_flags(ctx-&gt;sw_cipher.cipher,</div><div class='add'>+	crypto_sync_skcipher_clear_flags(ctx-&gt;sw_cipher.cipher,</div><div class='ctx'> 				    CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_skcipher_set_flags(ctx-&gt;sw_cipher.cipher,</div><div class='add'>+	crypto_sync_skcipher_set_flags(ctx-&gt;sw_cipher.cipher,</div><div class='ctx'> 		crypto_skcipher_get_flags(cipher) &amp; CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	rc = crypto_skcipher_setkey(ctx-&gt;sw_cipher.cipher, key, keylen);</div><div class='add'>+	rc = crypto_sync_skcipher_setkey(ctx-&gt;sw_cipher.cipher, key, keylen);</div><div class='ctx'> 	crypto_skcipher_clear_flags(cipher, CRYPTO_TFM_RES_MASK);</div><div class='ctx'> 	crypto_skcipher_set_flags(cipher,</div><div class='del'>-		crypto_skcipher_get_flags(ctx-&gt;sw_cipher.cipher) &amp;</div><div class='add'>+		crypto_sync_skcipher_get_flags(ctx-&gt;sw_cipher.cipher) &amp;</div><div class='ctx'> 			CRYPTO_TFM_RES_MASK);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c<br/>index 06574a884715..3934c2523762 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/amcc/crypto4xx_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/amcc/crypto4xx_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/amcc/crypto4xx_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/amcc/crypto4xx_core.c</a></div><div class='hunk'>@@ -539,7 +539,7 @@ static void crypto4xx_cipher_done(struct crypto4xx_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	req = skcipher_request_cast(pd_uinfo-&gt;async_req);</div><div class='ctx'> </div><div class='del'>-	if (pd_uinfo-&gt;using_sd) {</div><div class='add'>+	if (pd_uinfo-&gt;sa_va-&gt;sa_command_0.bf.scatter) {</div><div class='ctx'> 		crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,</div><div class='ctx'> 					  req-&gt;cryptlen, req-&gt;dst);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -593,7 +593,7 @@ static void crypto4xx_aead_done(struct crypto4xx_device *dev,</div><div class='ctx'> 	u32 icv[AES_BLOCK_SIZE];</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (pd_uinfo-&gt;using_sd) {</div><div class='add'>+	if (pd_uinfo-&gt;sa_va-&gt;sa_command_0.bf.scatter) {</div><div class='ctx'> 		crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,</div><div class='ctx'> 					  pd-&gt;pd_ctl_len.bf.pkt_len,</div><div class='ctx'> 					  dst);</div><div class='hunk'>@@ -714,7 +714,23 @@ int crypto4xx_build_pd(struct crypto_async_request *req,</div><div class='ctx'> 	size_t offset_to_sr_ptr;</div><div class='ctx'> 	u32 gd_idx = 0;</div><div class='ctx'> 	int tmp;</div><div class='del'>-	bool is_busy;</div><div class='add'>+	bool is_busy, force_sd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's a very subtile/disguised "bug" in the hardware that</div><div class='add'>+	 * gets indirectly mentioned in 18.1.3.5 Encryption/Decryption</div><div class='add'>+	 * of the hardware spec:</div><div class='add'>+	 * *drum roll* the AES/(T)DES OFB and CFB modes are listed as</div><div class='add'>+	 * operation modes for &gt;&gt;&gt; "Block ciphers" &lt;&lt;&lt;.</div><div class='add'>+	 *</div><div class='add'>+	 * To workaround this issue and stop the hardware from causing</div><div class='add'>+	 * "overran dst buffer" on crypttexts that are not a multiple</div><div class='add'>+	 * of 16 (AES_BLOCK_SIZE), we force the driver to use the</div><div class='add'>+	 * scatter buffers.</div><div class='add'>+	 */</div><div class='add'>+	force_sd = (req_sa-&gt;sa_command_1.bf.crypto_mode9_8 == CRYPTO_MODE_CFB</div><div class='add'>+		|| req_sa-&gt;sa_command_1.bf.crypto_mode9_8 == CRYPTO_MODE_OFB)</div><div class='add'>+		&amp;&amp; (datalen % AES_BLOCK_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* figure how many gd are needed */</div><div class='ctx'> 	tmp = sg_nents_for_len(src, assoclen + datalen);</div><div class='hunk'>@@ -732,7 +748,7 @@ int crypto4xx_build_pd(struct crypto_async_request *req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* figure how many sd are needed */</div><div class='del'>-	if (sg_is_last(dst)) {</div><div class='add'>+	if (sg_is_last(dst) &amp;&amp; force_sd == false) {</div><div class='ctx'> 		num_sd = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (datalen &gt; PPC4XX_SD_BUFFER_SIZE) {</div><div class='hunk'>@@ -807,9 +823,10 @@ int crypto4xx_build_pd(struct crypto_async_request *req,</div><div class='ctx'> 	pd-&gt;sa_len = sa_len;</div><div class='ctx'> </div><div class='ctx'> 	pd_uinfo = &amp;dev-&gt;pdr_uinfo[pd_entry];</div><div class='del'>-	pd_uinfo-&gt;async_req = req;</div><div class='ctx'> 	pd_uinfo-&gt;num_gd = num_gd;</div><div class='ctx'> 	pd_uinfo-&gt;num_sd = num_sd;</div><div class='add'>+	pd_uinfo-&gt;dest_va = dst;</div><div class='add'>+	pd_uinfo-&gt;async_req = req;</div><div class='ctx'> </div><div class='ctx'> 	if (iv_len)</div><div class='ctx'> 		memcpy(pd_uinfo-&gt;sr_va-&gt;save_iv, iv, iv_len);</div><div class='hunk'>@@ -828,7 +845,6 @@ int crypto4xx_build_pd(struct crypto_async_request *req,</div><div class='ctx'> 		/* get first gd we are going to use */</div><div class='ctx'> 		gd_idx = fst_gd;</div><div class='ctx'> 		pd_uinfo-&gt;first_gd = fst_gd;</div><div class='del'>-		pd_uinfo-&gt;num_gd = num_gd;</div><div class='ctx'> 		gd = crypto4xx_get_gdp(dev, &amp;gd_dma, gd_idx);</div><div class='ctx'> 		pd-&gt;src = gd_dma;</div><div class='ctx'> 		/* enable gather */</div><div class='hunk'>@@ -865,17 +881,13 @@ int crypto4xx_build_pd(struct crypto_async_request *req,</div><div class='ctx'> 		 * Indicate gather array is not used</div><div class='ctx'> 		 */</div><div class='ctx'> 		pd_uinfo-&gt;first_gd = 0xffffffff;</div><div class='del'>-		pd_uinfo-&gt;num_gd = 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (sg_is_last(dst)) {</div><div class='add'>+	if (!num_sd) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * we know application give us dst a whole piece of memory</div><div class='ctx'> 		 * no need to use scatter ring.</div><div class='ctx'> 		 */</div><div class='del'>-		pd_uinfo-&gt;using_sd = 0;</div><div class='ctx'> 		pd_uinfo-&gt;first_sd = 0xffffffff;</div><div class='del'>-		pd_uinfo-&gt;num_sd = 0;</div><div class='del'>-		pd_uinfo-&gt;dest_va = dst;</div><div class='ctx'> 		sa-&gt;sa_command_0.bf.scatter = 0;</div><div class='ctx'> 		pd-&gt;dest = (u32)dma_map_page(dev-&gt;core_dev-&gt;device,</div><div class='ctx'> 					     sg_page(dst), dst-&gt;offset,</div><div class='hunk'>@@ -888,10 +900,7 @@ int crypto4xx_build_pd(struct crypto_async_request *req,</div><div class='ctx'> 		u32 sd_idx = fst_sd;</div><div class='ctx'> 		nbytes = datalen;</div><div class='ctx'> 		sa-&gt;sa_command_0.bf.scatter = 1;</div><div class='del'>-		pd_uinfo-&gt;using_sd = 1;</div><div class='del'>-		pd_uinfo-&gt;dest_va = dst;</div><div class='ctx'> 		pd_uinfo-&gt;first_sd = fst_sd;</div><div class='del'>-		pd_uinfo-&gt;num_sd = num_sd;</div><div class='ctx'> 		sd = crypto4xx_get_sdp(dev, &amp;sd_dma, sd_idx);</div><div class='ctx'> 		pd-&gt;dest = sd_dma;</div><div class='ctx'> 		/* setup scatter descriptor */</div><div class='hunk'>@@ -954,15 +963,10 @@ static int crypto4xx_sk_init(struct crypto_skcipher *sk)</div><div class='ctx'> </div><div class='ctx'> 	if (alg-&gt;base.cra_flags &amp; CRYPTO_ALG_NEED_FALLBACK) {</div><div class='ctx'> 		ctx-&gt;sw_cipher.cipher =</div><div class='del'>-			crypto_alloc_skcipher(alg-&gt;base.cra_name, 0,</div><div class='del'>-					      CRYPTO_ALG_NEED_FALLBACK |</div><div class='del'>-					      CRYPTO_ALG_ASYNC);</div><div class='add'>+			crypto_alloc_sync_skcipher(alg-&gt;base.cra_name, 0,</div><div class='add'>+					      CRYPTO_ALG_NEED_FALLBACK);</div><div class='ctx'> 		if (IS_ERR(ctx-&gt;sw_cipher.cipher))</div><div class='ctx'> 			return PTR_ERR(ctx-&gt;sw_cipher.cipher);</div><div class='del'>-</div><div class='del'>-		crypto_skcipher_set_reqsize(sk,</div><div class='del'>-			sizeof(struct skcipher_request) + 32 +</div><div class='del'>-			crypto_skcipher_reqsize(ctx-&gt;sw_cipher.cipher));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	amcc_alg = container_of(alg, struct crypto4xx_alg, alg.u.cipher);</div><div class='hunk'>@@ -981,7 +985,7 @@ static void crypto4xx_sk_exit(struct crypto_skcipher *sk)</div><div class='ctx'> </div><div class='ctx'> 	crypto4xx_common_exit(ctx);</div><div class='ctx'> 	if (ctx-&gt;sw_cipher.cipher)</div><div class='del'>-		crypto_free_skcipher(ctx-&gt;sw_cipher.cipher);</div><div class='add'>+		crypto_free_sync_skcipher(ctx-&gt;sw_cipher.cipher);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto4xx_aead_init(struct crypto_aead *tfm)</div><div class='head'>diff --git a/drivers/crypto/amcc/crypto4xx_core.h b/drivers/crypto/amcc/crypto4xx_core.h<br/>index 18df695ca6b1..c624f8cd3d2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/amcc/crypto4xx_core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/amcc/crypto4xx_core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/amcc/crypto4xx_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/amcc/crypto4xx_core.h</a></div><div class='hunk'>@@ -64,7 +64,6 @@ union shadow_sa_buf {</div><div class='ctx'> struct pd_uinfo {</div><div class='ctx'> 	struct crypto4xx_device *dev;</div><div class='ctx'> 	u32   state;</div><div class='del'>-	u32 using_sd;</div><div class='ctx'> 	u32 first_gd;		/* first gather discriptor</div><div class='ctx'> 				used by this packet */</div><div class='ctx'> 	u32 num_gd;             /* number of gather discriptor</div><div class='hunk'>@@ -131,7 +130,7 @@ struct crypto4xx_ctx {</div><div class='ctx'> 	__le32 iv_nonce;</div><div class='ctx'> 	u32 sa_len;</div><div class='ctx'> 	union {</div><div class='del'>-		struct crypto_skcipher *cipher;</div><div class='add'>+		struct crypto_sync_skcipher *cipher;</div><div class='ctx'> 		struct crypto_aead *aead;</div><div class='ctx'> 	} sw_cipher;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c<br/>index 65bf1a299562..fa76620281e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/atmel-tdes.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/atmel-tdes.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/atmel-tdes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/atmel-tdes.c</a></div><div class='hunk'>@@ -800,20 +800,14 @@ static int atmel_tdes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> 			   unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_tdes_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='del'>-	const char *alg_name;</div><div class='del'>-</div><div class='del'>-	alg_name = crypto_tfm_alg_name(crypto_ablkcipher_tfm(tfm));</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * HW bug in cfb 3-keys mode.</div><div class='del'>-	 */</div><div class='del'>-	if (!ctx-&gt;dd-&gt;caps.has_cfb_3keys &amp;&amp; strstr(alg_name, "cfb")</div><div class='del'>-			&amp;&amp; (keylen != 2*DES_KEY_SIZE)) {</div><div class='del'>-		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	} else if ((keylen != 2*DES_KEY_SIZE) &amp;&amp; (keylen != 3*DES_KEY_SIZE)) {</div><div class='del'>-		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(tfm);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(tfm, flags);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ctx-&gt;key, key, keylen);</div><div class='hunk'>@@ -1060,7 +1054,7 @@ static struct crypto_alg tdes_algs[] = {</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='ctx'> 	.cra_init		= atmel_tdes_cra_init,</div><div class='ctx'> 	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2 * DES_KEY_SIZE,</div><div class='add'>+		.min_keysize	= 3 * DES_KEY_SIZE,</div><div class='ctx'> 		.max_keysize	= 3 * DES_KEY_SIZE,</div><div class='ctx'> 		.setkey		= atmel_tdes_setkey,</div><div class='ctx'> 		.encrypt	= atmel_tdes_ecb_encrypt,</div><div class='hunk'>@@ -1079,7 +1073,7 @@ static struct crypto_alg tdes_algs[] = {</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='ctx'> 	.cra_init		= atmel_tdes_cra_init,</div><div class='ctx'> 	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2*DES_KEY_SIZE,</div><div class='add'>+		.min_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.max_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.ivsize		= DES_BLOCK_SIZE,</div><div class='ctx'> 		.setkey		= atmel_tdes_setkey,</div><div class='hunk'>@@ -1088,86 +1082,6 @@ static struct crypto_alg tdes_algs[] = {</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='del'>-	.cra_name		= "cfb(des3_ede)",</div><div class='del'>-	.cra_driver_name	= "atmel-cfb-tdes",</div><div class='del'>-	.cra_priority		= 100,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= DES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct atmel_tdes_ctx),</div><div class='del'>-	.cra_alignmask		= 0x7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= atmel_tdes_cra_init,</div><div class='del'>-	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.ivsize		= DES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= atmel_tdes_setkey,</div><div class='del'>-		.encrypt	= atmel_tdes_cfb_encrypt,</div><div class='del'>-		.decrypt	= atmel_tdes_cfb_decrypt,</div><div class='del'>-	}</div><div class='del'>-},</div><div class='del'>-{</div><div class='del'>-	.cra_name		= "cfb8(des3_ede)",</div><div class='del'>-	.cra_driver_name	= "atmel-cfb8-tdes",</div><div class='del'>-	.cra_priority		= 100,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= CFB8_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct atmel_tdes_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= atmel_tdes_cra_init,</div><div class='del'>-	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.ivsize		= DES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= atmel_tdes_setkey,</div><div class='del'>-		.encrypt	= atmel_tdes_cfb8_encrypt,</div><div class='del'>-		.decrypt	= atmel_tdes_cfb8_decrypt,</div><div class='del'>-	}</div><div class='del'>-},</div><div class='del'>-{</div><div class='del'>-	.cra_name		= "cfb16(des3_ede)",</div><div class='del'>-	.cra_driver_name	= "atmel-cfb16-tdes",</div><div class='del'>-	.cra_priority		= 100,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= CFB16_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct atmel_tdes_ctx),</div><div class='del'>-	.cra_alignmask		= 0x1,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= atmel_tdes_cra_init,</div><div class='del'>-	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.ivsize		= DES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= atmel_tdes_setkey,</div><div class='del'>-		.encrypt	= atmel_tdes_cfb16_encrypt,</div><div class='del'>-		.decrypt	= atmel_tdes_cfb16_decrypt,</div><div class='del'>-	}</div><div class='del'>-},</div><div class='del'>-{</div><div class='del'>-	.cra_name		= "cfb32(des3_ede)",</div><div class='del'>-	.cra_driver_name	= "atmel-cfb32-tdes",</div><div class='del'>-	.cra_priority		= 100,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= CFB32_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct atmel_tdes_ctx),</div><div class='del'>-	.cra_alignmask		= 0x3,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= atmel_tdes_cra_init,</div><div class='del'>-	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2*DES_KEY_SIZE,</div><div class='del'>-		.ivsize		= DES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= atmel_tdes_setkey,</div><div class='del'>-		.encrypt	= atmel_tdes_cfb32_encrypt,</div><div class='del'>-		.decrypt	= atmel_tdes_cfb32_decrypt,</div><div class='del'>-	}</div><div class='del'>-},</div><div class='del'>-{</div><div class='ctx'> 	.cra_name		= "ofb(des3_ede)",</div><div class='ctx'> 	.cra_driver_name	= "atmel-ofb-tdes",</div><div class='ctx'> 	.cra_priority		= 100,</div><div class='hunk'>@@ -1179,7 +1093,7 @@ static struct crypto_alg tdes_algs[] = {</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='ctx'> 	.cra_init		= atmel_tdes_cra_init,</div><div class='ctx'> 	.cra_u.ablkcipher = {</div><div class='del'>-		.min_keysize	= 2*DES_KEY_SIZE,</div><div class='add'>+		.min_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.max_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.ivsize		= DES_BLOCK_SIZE,</div><div class='ctx'> 		.setkey		= atmel_tdes_setkey,</div><div class='head'>diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c<br/>index 57e5dca3253f..d2fb72811442 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/axis/artpec6_crypto.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/axis/artpec6_crypto.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/axis/artpec6_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/axis/artpec6_crypto.c</a></div><div class='hunk'>@@ -2247,8 +2247,6 @@ artpec6_crypto_hash_set_key(struct crypto_ahash *tfm,</div><div class='ctx'> 		SHASH_DESC_ON_STACK(hdesc, tfm_ctx-&gt;child_hash);</div><div class='ctx'> </div><div class='ctx'> 		hdesc-&gt;tfm = tfm_ctx-&gt;child_hash;</div><div class='del'>-		hdesc-&gt;flags = crypto_ahash_get_flags(tfm) &amp;</div><div class='del'>-			       CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 		tfm_ctx-&gt;hmac_key_length = blocksize;</div><div class='ctx'> 		ret = crypto_shash_digest(hdesc, key, keylen,</div><div class='head'>diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c<br/>index 28f592f7e1b7..25f8d3913ceb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/bcm/cipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/bcm/cipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/bcm/cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/bcm/cipher.c</a></div><div class='hunk'>@@ -1840,13 +1840,14 @@ static int threedes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='ctx'> </div><div class='ctx'> 	if (keylen == (DES_KEY_SIZE * 3)) {</div><div class='del'>-		const u32 *K = (const u32 *)key;</div><div class='del'>-		u32 flags = CRYPTO_TFM_RES_BAD_KEY_SCHED;</div><div class='add'>+		u32 flags;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='del'>-		if (!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-		    !((K[2] ^ K[4]) | (K[3] ^ K[5]))) {</div><div class='add'>+		flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+		ret = __des3_verify_key(&amp;flags, key);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			crypto_ablkcipher_set_flags(cipher, flags);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ctx-&gt;cipher_type = CIPHER_TYPE_3DES;</div><div class='hunk'>@@ -2139,7 +2140,6 @@ static int ahash_init(struct ahash_request *req)</div><div class='ctx'> 			goto err_hash;</div><div class='ctx'> 		}</div><div class='ctx'> 		ctx-&gt;shash-&gt;tfm = hash;</div><div class='del'>-		ctx-&gt;shash-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Set the key using data we already have from setkey */</div><div class='ctx'> 		if (ctx-&gt;authkeylen &gt; 0) {</div><div class='hunk'>@@ -2885,13 +2885,13 @@ static int aead_authenc_setkey(struct crypto_aead *cipher,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CIPHER_ALG_3DES:</div><div class='ctx'> 		if (ctx-&gt;enckeylen == (DES_KEY_SIZE * 3)) {</div><div class='del'>-			const u32 *K = (const u32 *)keys.enckey;</div><div class='del'>-			u32 flags = CRYPTO_TFM_RES_BAD_KEY_SCHED;</div><div class='add'>+			u32 flags;</div><div class='ctx'> </div><div class='del'>-			if (!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-			    !((K[2] ^ K[4]) | (K[3] ^ K[5]))) {</div><div class='add'>+			flags = crypto_aead_get_flags(cipher);</div><div class='add'>+			ret = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				crypto_aead_set_flags(cipher, flags);</div><div class='del'>-				return -EINVAL;</div><div class='add'>+				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ctx-&gt;cipher_type = CIPHER_TYPE_3DES;</div><div class='head'>diff --git a/drivers/crypto/bcm/spu.c b/drivers/crypto/bcm/spu.c<br/>index dbb5c03dde49..2baf6d7f2c1d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/bcm/spu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/bcm/spu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/bcm/spu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/bcm/spu.c</a></div><div class='hunk'>@@ -22,9 +22,6 @@</div><div class='ctx'> #include "spum.h"</div><div class='ctx'> #include "cipher.h"</div><div class='ctx'> </div><div class='del'>-/* This array is based on the hash algo type supported in spu.h */</div><div class='del'>-char *tag_to_hash_idx[] = { "none", "md5", "sha1", "sha224", "sha256" };</div><div class='del'>-</div><div class='ctx'> char *hash_alg_name[] = { "None", "md5", "sha1", "sha224", "sha256", "aes",</div><div class='ctx'> 	"sha384", "sha512", "sha3_224", "sha3_256", "sha3_384", "sha3_512" };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/bcm/util.c b/drivers/crypto/bcm/util.c<br/>index d8cda5fb75ad..91ec56399d84 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/bcm/util.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/bcm/util.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/bcm/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/bcm/util.c</a></div><div class='hunk'>@@ -242,7 +242,6 @@ int do_shash(unsigned char *name, unsigned char *result,</div><div class='ctx'> 		goto do_shash_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	sdesc-&gt;shash.tfm = hash;</div><div class='del'>-	sdesc-&gt;shash.flags = 0x0;</div><div class='ctx'> </div><div class='ctx'> 	if (key_len &gt; 0) {</div><div class='ctx'> 		rc = crypto_shash_setkey(hash, key, key_len);</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c<br/>index 579578498deb..3e23d4b2cce2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/caamalg.c</a></div><div class='hunk'>@@ -638,6 +638,39 @@ badkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+			    unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_authenc_extractkeys(&amp;keys, key, keylen);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (keys.enckeylen != DES3_EDE_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	flags = crypto_aead_get_flags(aead);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_aead_set_flags(aead, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aead_setkey(aead, key, keylen);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int gcm_setkey(struct crypto_aead *aead,</div><div class='ctx'> 		      const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='hunk'>@@ -2457,7 +2490,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2479,7 +2512,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2502,7 +2535,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2525,7 +2558,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2548,7 +2581,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2571,7 +2604,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2594,7 +2627,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2617,7 +2650,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2640,7 +2673,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2663,7 +2696,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2686,7 +2719,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2709,7 +2742,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -3460,7 +3493,7 @@ static int __init caam_algapi_init(void)</div><div class='ctx'> 	u32 aes_vid, aes_inst, des_inst, md_vid, md_inst, ccha_inst, ptha_inst;</div><div class='ctx'> 	u32 arc4_inst;</div><div class='ctx'> 	unsigned int md_limit = SHA512_DIGEST_SIZE;</div><div class='del'>-	bool registered = false;</div><div class='add'>+	bool registered = false, gcm_support;</div><div class='ctx'> </div><div class='ctx'> 	dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");</div><div class='ctx'> 	if (!dev_node) {</div><div class='hunk'>@@ -3493,7 +3526,7 @@ static int __init caam_algapi_init(void)</div><div class='ctx'> 	 * First, detect presence and attributes of DES, AES, and MD blocks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;era &lt; 10) {</div><div class='del'>-		u32 cha_vid, cha_inst;</div><div class='add'>+		u32 cha_vid, cha_inst, aes_rn;</div><div class='ctx'> </div><div class='ctx'> 		cha_vid = rd_reg32(&amp;priv-&gt;ctrl-&gt;perfmon.cha_id_ls);</div><div class='ctx'> 		aes_vid = cha_vid &amp; CHA_ID_LS_AES_MASK;</div><div class='hunk'>@@ -3508,6 +3541,10 @@ static int __init caam_algapi_init(void)</div><div class='ctx'> 			    CHA_ID_LS_ARC4_SHIFT;</div><div class='ctx'> 		ccha_inst = 0;</div><div class='ctx'> 		ptha_inst = 0;</div><div class='add'>+</div><div class='add'>+		aes_rn = rd_reg32(&amp;priv-&gt;ctrl-&gt;perfmon.cha_rev_ls) &amp;</div><div class='add'>+			 CHA_ID_LS_AES_MASK;</div><div class='add'>+		gcm_support = !(aes_vid == CHA_VER_VID_AES_LP &amp;&amp; aes_rn &lt; 8);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 aesa, mdha;</div><div class='ctx'> </div><div class='hunk'>@@ -3523,6 +3560,8 @@ static int __init caam_algapi_init(void)</div><div class='ctx'> 		ccha_inst = rd_reg32(&amp;priv-&gt;ctrl-&gt;vreg.ccha) &amp; CHA_VER_NUM_MASK;</div><div class='ctx'> 		ptha_inst = rd_reg32(&amp;priv-&gt;ctrl-&gt;vreg.ptha) &amp; CHA_VER_NUM_MASK;</div><div class='ctx'> 		arc4_inst = rd_reg32(&amp;priv-&gt;ctrl-&gt;vreg.afha) &amp; CHA_VER_NUM_MASK;</div><div class='add'>+</div><div class='add'>+		gcm_support = aesa &amp; CHA_VER_MISC_AES_GCM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If MD is present, limit digest size based on LP256 */</div><div class='hunk'>@@ -3595,11 +3634,9 @@ static int __init caam_algapi_init(void)</div><div class='ctx'> 		if (c2_alg_sel == OP_ALG_ALGSEL_POLY1305 &amp;&amp; !ptha_inst)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Check support for AES algorithms not available</div><div class='del'>-		 * on LP devices.</div><div class='del'>-		 */</div><div class='del'>-		if (aes_vid  == CHA_VER_VID_AES_LP &amp;&amp; alg_aai == OP_ALG_AAI_GCM)</div><div class='add'>+		/* Skip GCM algorithms if not supported by device */</div><div class='add'>+		if (c1_alg_sel == OP_ALG_ALGSEL_AES &amp;&amp;</div><div class='add'>+		    alg_aai == OP_ALG_AAI_GCM &amp;&amp; !gcm_support)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c<br/>index c61921d32489..70af211d2d01 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg_qi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg_qi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg_qi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/caamalg_qi.c</a></div><div class='hunk'>@@ -292,6 +292,39 @@ badkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+			    unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_authenc_extractkeys(&amp;keys, key, keylen);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (keys.enckeylen != DES3_EDE_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	flags = crypto_aead_get_flags(aead);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_aead_set_flags(aead, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aead_setkey(aead, key, keylen);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int gcm_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='hunk'>@@ -667,6 +700,13 @@ badkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int des3_skcipher_setkey(struct crypto_skcipher *skcipher,</div><div class='add'>+				const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	return unlikely(des3_verify_key(skcipher, key)) ?:</div><div class='add'>+	       skcipher_setkey(skcipher, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,</div><div class='ctx'> 			       unsigned int keylen)</div><div class='ctx'> {</div><div class='hunk'>@@ -1382,7 +1422,7 @@ static struct caam_skcipher_alg driver_algs[] = {</div><div class='ctx'> 				.cra_driver_name = "cbc-3des-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = skcipher_setkey,</div><div class='add'>+			.setkey = des3_skcipher_setkey,</div><div class='ctx'> 			.encrypt = skcipher_encrypt,</div><div class='ctx'> 			.decrypt = skcipher_decrypt,</div><div class='ctx'> 			.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='hunk'>@@ -1798,7 +1838,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1820,7 +1860,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1843,7 +1883,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1866,7 +1906,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1889,7 +1929,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1912,7 +1952,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1935,7 +1975,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1958,7 +1998,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1981,7 +2021,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2004,7 +2044,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2027,7 +2067,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2050,7 +2090,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c<br/>index c2c1abc68f81..33a4df6b81de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg_qi2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg_qi2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg_qi2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/caamalg_qi2.c</a></div><div class='hunk'>@@ -323,6 +323,39 @@ badkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+			    unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_authenc_extractkeys(&amp;keys, key, keylen);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (keys.enckeylen != DES3_EDE_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	flags = crypto_aead_get_flags(aead);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_aead_set_flags(aead, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aead_setkey(aead, key, keylen);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,</div><div class='ctx'> 					   bool encrypt)</div><div class='ctx'> {</div><div class='hunk'>@@ -938,6 +971,13 @@ static int skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int des3_skcipher_setkey(struct crypto_skcipher *skcipher,</div><div class='add'>+				const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	return unlikely(des3_verify_key(skcipher, key)) ?:</div><div class='add'>+	       skcipher_setkey(skcipher, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,</div><div class='ctx'> 			       unsigned int keylen)</div><div class='ctx'> {</div><div class='hunk'>@@ -1484,7 +1524,7 @@ static struct caam_skcipher_alg driver_algs[] = {</div><div class='ctx'> 				.cra_driver_name = "cbc-3des-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = skcipher_setkey,</div><div class='add'>+			.setkey = des3_skcipher_setkey,</div><div class='ctx'> 			.encrypt = skcipher_encrypt,</div><div class='ctx'> 			.decrypt = skcipher_decrypt,</div><div class='ctx'> 			.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='hunk'>@@ -1916,7 +1956,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1938,7 +1978,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1961,7 +2001,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -1984,7 +2024,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2007,7 +2047,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2030,7 +2070,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2053,7 +2093,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2076,7 +2116,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2099,7 +2139,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2122,7 +2162,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2145,7 +2185,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2168,7 +2208,7 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 						   "cbc-des3_ede-caam-qi2",</div><div class='ctx'> 				.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			},</div><div class='del'>-			.setkey = aead_setkey,</div><div class='add'>+			.setkey = des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = aead_setauthsize,</div><div class='ctx'> 			.encrypt = aead_encrypt,</div><div class='ctx'> 			.decrypt = aead_decrypt,</div><div class='hunk'>@@ -2854,6 +2894,7 @@ struct caam_hash_state {</div><div class='ctx'> 	struct caam_request caam_req;</div><div class='ctx'> 	dma_addr_t buf_dma;</div><div class='ctx'> 	dma_addr_t ctx_dma;</div><div class='add'>+	int ctx_dma_len;</div><div class='ctx'> 	u8 buf_0[CAAM_MAX_HASH_BLOCK_SIZE] ____cacheline_aligned;</div><div class='ctx'> 	int buflen_0;</div><div class='ctx'> 	u8 buf_1[CAAM_MAX_HASH_BLOCK_SIZE] ____cacheline_aligned;</div><div class='hunk'>@@ -2927,6 +2968,7 @@ static inline int ctx_map_to_qm_sg(struct device *dev,</div><div class='ctx'> 				   struct caam_hash_state *state, int ctx_len,</div><div class='ctx'> 				   struct dpaa2_sg_entry *qm_sg, u32 flag)</div><div class='ctx'> {</div><div class='add'>+	state-&gt;ctx_dma_len = ctx_len;</div><div class='ctx'> 	state-&gt;ctx_dma = dma_map_single(dev, state-&gt;caam_ctx, ctx_len, flag);</div><div class='ctx'> 	if (dma_mapping_error(dev, state-&gt;ctx_dma)) {</div><div class='ctx'> 		dev_err(dev, "unable to map ctx\n");</div><div class='hunk'>@@ -3018,13 +3060,13 @@ static void split_key_sh_done(void *cbk_ctx, u32 err)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Digest hash size if it is too large */</div><div class='del'>-static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='del'>-			   u32 *keylen, u8 *key_out, u32 digestsize)</div><div class='add'>+static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key,</div><div class='add'>+			   u32 digestsize)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_request *req_ctx;</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	struct split_key_sh_result result;</div><div class='del'>-	dma_addr_t src_dma, dst_dma;</div><div class='add'>+	dma_addr_t key_dma;</div><div class='ctx'> 	struct caam_flc *flc;</div><div class='ctx'> 	dma_addr_t flc_dma;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='hunk'>@@ -3041,17 +3083,10 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='ctx'> 	if (!flc)</div><div class='ctx'> 		goto err_flc;</div><div class='ctx'> </div><div class='del'>-	src_dma = dma_map_single(ctx-&gt;dev, (void *)key_in, *keylen,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, src_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map key input memory\n");</div><div class='del'>-		goto err_src_dma;</div><div class='del'>-	}</div><div class='del'>-	dst_dma = dma_map_single(ctx-&gt;dev, (void *)key_out, digestsize,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, dst_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map key output memory\n");</div><div class='del'>-		goto err_dst_dma;</div><div class='add'>+	key_dma = dma_map_single(ctx-&gt;dev, key, *keylen, DMA_BIDIRECTIONAL);</div><div class='add'>+	if (dma_mapping_error(ctx-&gt;dev, key_dma)) {</div><div class='add'>+		dev_err(ctx-&gt;dev, "unable to map key memory\n");</div><div class='add'>+		goto err_key_dma;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc = flc-&gt;sh_desc;</div><div class='hunk'>@@ -3076,14 +3111,14 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='ctx'> </div><div class='ctx'> 	dpaa2_fl_set_final(in_fle, true);</div><div class='ctx'> 	dpaa2_fl_set_format(in_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(in_fle, src_dma);</div><div class='add'>+	dpaa2_fl_set_addr(in_fle, key_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(in_fle, *keylen);</div><div class='ctx'> 	dpaa2_fl_set_format(out_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(out_fle, dst_dma);</div><div class='add'>+	dpaa2_fl_set_addr(out_fle, key_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(out_fle, digestsize);</div><div class='ctx'> </div><div class='ctx'> 	print_hex_dump_debug("key_in@" __stringify(__LINE__)": ",</div><div class='del'>-			     DUMP_PREFIX_ADDRESS, 16, 4, key_in, *keylen, 1);</div><div class='add'>+			     DUMP_PREFIX_ADDRESS, 16, 4, key, *keylen, 1);</div><div class='ctx'> 	print_hex_dump_debug("shdesc@" __stringify(__LINE__)": ",</div><div class='ctx'> 			     DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc),</div><div class='ctx'> 			     1);</div><div class='hunk'>@@ -3103,17 +3138,15 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='ctx'> 		wait_for_completion(&amp;result.completion);</div><div class='ctx'> 		ret = result.err;</div><div class='ctx'> 		print_hex_dump_debug("digested key@" __stringify(__LINE__)": ",</div><div class='del'>-				     DUMP_PREFIX_ADDRESS, 16, 4, key_in,</div><div class='add'>+				     DUMP_PREFIX_ADDRESS, 16, 4, key,</div><div class='ctx'> 				     digestsize, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(ctx-&gt;dev, flc_dma, sizeof(flc-&gt;flc) + desc_bytes(desc),</div><div class='ctx'> 			 DMA_TO_DEVICE);</div><div class='ctx'> err_flc_dma:</div><div class='del'>-	dma_unmap_single(ctx-&gt;dev, dst_dma, digestsize, DMA_FROM_DEVICE);</div><div class='del'>-err_dst_dma:</div><div class='del'>-	dma_unmap_single(ctx-&gt;dev, src_dma, *keylen, DMA_TO_DEVICE);</div><div class='del'>-err_src_dma:</div><div class='add'>+	dma_unmap_single(ctx-&gt;dev, key_dma, *keylen, DMA_BIDIRECTIONAL);</div><div class='add'>+err_key_dma:</div><div class='ctx'> 	kfree(flc);</div><div class='ctx'> err_flc:</div><div class='ctx'> 	kfree(req_ctx);</div><div class='hunk'>@@ -3135,12 +3168,10 @@ static int ahash_setkey(struct crypto_ahash *ahash, const u8 *key,</div><div class='ctx'> 	dev_dbg(ctx-&gt;dev, "keylen %d blocksize %d\n", keylen, blocksize);</div><div class='ctx'> </div><div class='ctx'> 	if (keylen &gt; blocksize) {</div><div class='del'>-		hashed_key = kmalloc_array(digestsize, sizeof(*hashed_key),</div><div class='del'>-					   GFP_KERNEL | GFP_DMA);</div><div class='add'>+		hashed_key = kmemdup(key, keylen, GFP_KERNEL | GFP_DMA);</div><div class='ctx'> 		if (!hashed_key)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		ret = hash_digest_key(ctx, key, &amp;keylen, hashed_key,</div><div class='del'>-				      digestsize);</div><div class='add'>+		ret = hash_digest_key(ctx, &amp;keylen, hashed_key, digestsize);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto bad_free_key;</div><div class='ctx'> 		key = hashed_key;</div><div class='hunk'>@@ -3165,14 +3196,12 @@ bad_free_key:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ahash_unmap(struct device *dev, struct ahash_edesc *edesc,</div><div class='del'>-			       struct ahash_request *req, int dst_len)</div><div class='add'>+			       struct ahash_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='ctx'> 	if (edesc-&gt;src_nents)</div><div class='ctx'> 		dma_unmap_sg(dev, req-&gt;src, edesc-&gt;src_nents, DMA_TO_DEVICE);</div><div class='del'>-	if (edesc-&gt;dst_dma)</div><div class='del'>-		dma_unmap_single(dev, edesc-&gt;dst_dma, dst_len, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (edesc-&gt;qm_sg_bytes)</div><div class='ctx'> 		dma_unmap_single(dev, edesc-&gt;qm_sg_dma, edesc-&gt;qm_sg_bytes,</div><div class='hunk'>@@ -3187,18 +3216,15 @@ static inline void ahash_unmap(struct device *dev, struct ahash_edesc *edesc,</div><div class='ctx'> </div><div class='ctx'> static inline void ahash_unmap_ctx(struct device *dev,</div><div class='ctx'> 				   struct ahash_edesc *edesc,</div><div class='del'>-				   struct ahash_request *req, int dst_len,</div><div class='del'>-				   u32 flag)</div><div class='add'>+				   struct ahash_request *req, u32 flag)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='del'>-	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='ctx'> 	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;ctx_dma) {</div><div class='del'>-		dma_unmap_single(dev, state-&gt;ctx_dma, ctx-&gt;ctx_len, flag);</div><div class='add'>+		dma_unmap_single(dev, state-&gt;ctx_dma, state-&gt;ctx_dma_len, flag);</div><div class='ctx'> 		state-&gt;ctx_dma = 0;</div><div class='ctx'> 	}</div><div class='del'>-	ahash_unmap(dev, edesc, req, dst_len);</div><div class='add'>+	ahash_unmap(dev, edesc, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ahash_done(void *cbk_ctx, u32 status)</div><div class='hunk'>@@ -3219,16 +3245,13 @@ static void ahash_done(void *cbk_ctx, u32 status)</div><div class='ctx'> 		ecode = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ahash_unmap(ctx-&gt;dev, edesc, req, digestsize);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_FROM_DEVICE);</div><div class='add'>+	memcpy(req-&gt;result, state-&gt;caam_ctx, digestsize);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> </div><div class='ctx'> 	print_hex_dump_debug("ctx@" __stringify(__LINE__)": ",</div><div class='ctx'> 			     DUMP_PREFIX_ADDRESS, 16, 4, state-&gt;caam_ctx,</div><div class='ctx'> 			     ctx-&gt;ctx_len, 1);</div><div class='del'>-	if (req-&gt;result)</div><div class='del'>-		print_hex_dump_debug("result@" __stringify(__LINE__)": ",</div><div class='del'>-				     DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;result,</div><div class='del'>-				     digestsize, 1);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;base.complete(&amp;req-&gt;base, ecode);</div><div class='ctx'> }</div><div class='hunk'>@@ -3250,7 +3273,7 @@ static void ahash_done_bi(void *cbk_ctx, u32 status)</div><div class='ctx'> 		ecode = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, ctx-&gt;ctx_len, DMA_BIDIRECTIONAL);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	switch_buf(state);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> </div><div class='hunk'>@@ -3283,16 +3306,13 @@ static void ahash_done_ctx_src(void *cbk_ctx, u32 status)</div><div class='ctx'> 		ecode = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, digestsize, DMA_TO_DEVICE);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_BIDIRECTIONAL);</div><div class='add'>+	memcpy(req-&gt;result, state-&gt;caam_ctx, digestsize);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> </div><div class='ctx'> 	print_hex_dump_debug("ctx@" __stringify(__LINE__)": ",</div><div class='ctx'> 			     DUMP_PREFIX_ADDRESS, 16, 4, state-&gt;caam_ctx,</div><div class='ctx'> 			     ctx-&gt;ctx_len, 1);</div><div class='del'>-	if (req-&gt;result)</div><div class='del'>-		print_hex_dump_debug("result@" __stringify(__LINE__)": ",</div><div class='del'>-				     DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;result,</div><div class='del'>-				     digestsize, 1);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;base.complete(&amp;req-&gt;base, ecode);</div><div class='ctx'> }</div><div class='hunk'>@@ -3314,7 +3334,7 @@ static void ahash_done_ctx_dst(void *cbk_ctx, u32 status)</div><div class='ctx'> 		ecode = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, ctx-&gt;ctx_len, DMA_FROM_DEVICE);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_FROM_DEVICE);</div><div class='ctx'> 	switch_buf(state);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> </div><div class='hunk'>@@ -3452,7 +3472,7 @@ static int ahash_update_ctx(struct ahash_request *req)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> unmap_ctx:</div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, ctx-&gt;ctx_len, DMA_BIDIRECTIONAL);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3484,7 +3504,7 @@ static int ahash_final_ctx(struct ahash_request *req)</div><div class='ctx'> 	sg_table = &amp;edesc-&gt;sgt[0];</div><div class='ctx'> </div><div class='ctx'> 	ret = ctx_map_to_qm_sg(ctx-&gt;dev, state, ctx-&gt;ctx_len, sg_table,</div><div class='del'>-			       DMA_TO_DEVICE);</div><div class='add'>+			       DMA_BIDIRECTIONAL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unmap_ctx;</div><div class='ctx'> </div><div class='hunk'>@@ -3503,22 +3523,13 @@ static int ahash_final_ctx(struct ahash_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> 	edesc-&gt;qm_sg_bytes = qm_sg_bytes;</div><div class='ctx'> </div><div class='del'>-	edesc-&gt;dst_dma = dma_map_single(ctx-&gt;dev, req-&gt;result, digestsize,</div><div class='del'>-					DMA_FROM_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, edesc-&gt;dst_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map dst\n");</div><div class='del'>-		edesc-&gt;dst_dma = 0;</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unmap_ctx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	memset(&amp;req_ctx-&gt;fd_flt, 0, sizeof(req_ctx-&gt;fd_flt));</div><div class='ctx'> 	dpaa2_fl_set_final(in_fle, true);</div><div class='ctx'> 	dpaa2_fl_set_format(in_fle, dpaa2_fl_sg);</div><div class='ctx'> 	dpaa2_fl_set_addr(in_fle, edesc-&gt;qm_sg_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(in_fle, ctx-&gt;ctx_len + buflen);</div><div class='ctx'> 	dpaa2_fl_set_format(out_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(out_fle, edesc-&gt;dst_dma);</div><div class='add'>+	dpaa2_fl_set_addr(out_fle, state-&gt;ctx_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(out_fle, digestsize);</div><div class='ctx'> </div><div class='ctx'> 	req_ctx-&gt;flc = &amp;ctx-&gt;flc[FINALIZE];</div><div class='hunk'>@@ -3533,7 +3544,7 @@ static int ahash_final_ctx(struct ahash_request *req)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> unmap_ctx:</div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, digestsize, DMA_FROM_DEVICE);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3586,7 +3597,7 @@ static int ahash_finup_ctx(struct ahash_request *req)</div><div class='ctx'> 	sg_table = &amp;edesc-&gt;sgt[0];</div><div class='ctx'> </div><div class='ctx'> 	ret = ctx_map_to_qm_sg(ctx-&gt;dev, state, ctx-&gt;ctx_len, sg_table,</div><div class='del'>-			       DMA_TO_DEVICE);</div><div class='add'>+			       DMA_BIDIRECTIONAL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unmap_ctx;</div><div class='ctx'> </div><div class='hunk'>@@ -3605,22 +3616,13 @@ static int ahash_finup_ctx(struct ahash_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> 	edesc-&gt;qm_sg_bytes = qm_sg_bytes;</div><div class='ctx'> </div><div class='del'>-	edesc-&gt;dst_dma = dma_map_single(ctx-&gt;dev, req-&gt;result, digestsize,</div><div class='del'>-					DMA_FROM_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, edesc-&gt;dst_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map dst\n");</div><div class='del'>-		edesc-&gt;dst_dma = 0;</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unmap_ctx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	memset(&amp;req_ctx-&gt;fd_flt, 0, sizeof(req_ctx-&gt;fd_flt));</div><div class='ctx'> 	dpaa2_fl_set_final(in_fle, true);</div><div class='ctx'> 	dpaa2_fl_set_format(in_fle, dpaa2_fl_sg);</div><div class='ctx'> 	dpaa2_fl_set_addr(in_fle, edesc-&gt;qm_sg_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(in_fle, ctx-&gt;ctx_len + buflen + req-&gt;nbytes);</div><div class='ctx'> 	dpaa2_fl_set_format(out_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(out_fle, edesc-&gt;dst_dma);</div><div class='add'>+	dpaa2_fl_set_addr(out_fle, state-&gt;ctx_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(out_fle, digestsize);</div><div class='ctx'> </div><div class='ctx'> 	req_ctx-&gt;flc = &amp;ctx-&gt;flc[FINALIZE];</div><div class='hunk'>@@ -3635,7 +3637,7 @@ static int ahash_finup_ctx(struct ahash_request *req)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> unmap_ctx:</div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, digestsize, DMA_FROM_DEVICE);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3704,18 +3706,19 @@ static int ahash_digest(struct ahash_request *req)</div><div class='ctx'> 		dpaa2_fl_set_addr(in_fle, sg_dma_address(req-&gt;src));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	edesc-&gt;dst_dma = dma_map_single(ctx-&gt;dev, req-&gt;result, digestsize,</div><div class='add'>+	state-&gt;ctx_dma_len = digestsize;</div><div class='add'>+	state-&gt;ctx_dma = dma_map_single(ctx-&gt;dev, state-&gt;caam_ctx, digestsize,</div><div class='ctx'> 					DMA_FROM_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, edesc-&gt;dst_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map dst\n");</div><div class='del'>-		edesc-&gt;dst_dma = 0;</div><div class='add'>+	if (dma_mapping_error(ctx-&gt;dev, state-&gt;ctx_dma)) {</div><div class='add'>+		dev_err(ctx-&gt;dev, "unable to map ctx\n");</div><div class='add'>+		state-&gt;ctx_dma = 0;</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dpaa2_fl_set_final(in_fle, true);</div><div class='ctx'> 	dpaa2_fl_set_len(in_fle, req-&gt;nbytes);</div><div class='ctx'> 	dpaa2_fl_set_format(out_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(out_fle, edesc-&gt;dst_dma);</div><div class='add'>+	dpaa2_fl_set_addr(out_fle, state-&gt;ctx_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(out_fle, digestsize);</div><div class='ctx'> </div><div class='ctx'> 	req_ctx-&gt;flc = &amp;ctx-&gt;flc[DIGEST];</div><div class='hunk'>@@ -3729,7 +3732,7 @@ static int ahash_digest(struct ahash_request *req)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> unmap:</div><div class='del'>-	ahash_unmap(ctx-&gt;dev, edesc, req, digestsize);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_FROM_DEVICE);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3755,27 +3758,39 @@ static int ahash_final_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	if (!edesc)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	state-&gt;buf_dma = dma_map_single(ctx-&gt;dev, buf, buflen, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, state-&gt;buf_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map src\n");</div><div class='del'>-		goto unmap;</div><div class='add'>+	if (buflen) {</div><div class='add'>+		state-&gt;buf_dma = dma_map_single(ctx-&gt;dev, buf, buflen,</div><div class='add'>+						DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(ctx-&gt;dev, state-&gt;buf_dma)) {</div><div class='add'>+			dev_err(ctx-&gt;dev, "unable to map src\n");</div><div class='add'>+			goto unmap;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	edesc-&gt;dst_dma = dma_map_single(ctx-&gt;dev, req-&gt;result, digestsize,</div><div class='add'>+	state-&gt;ctx_dma_len = digestsize;</div><div class='add'>+	state-&gt;ctx_dma = dma_map_single(ctx-&gt;dev, state-&gt;caam_ctx, digestsize,</div><div class='ctx'> 					DMA_FROM_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, edesc-&gt;dst_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map dst\n");</div><div class='del'>-		edesc-&gt;dst_dma = 0;</div><div class='add'>+	if (dma_mapping_error(ctx-&gt;dev, state-&gt;ctx_dma)) {</div><div class='add'>+		dev_err(ctx-&gt;dev, "unable to map ctx\n");</div><div class='add'>+		state-&gt;ctx_dma = 0;</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req_ctx-&gt;fd_flt, 0, sizeof(req_ctx-&gt;fd_flt));</div><div class='ctx'> 	dpaa2_fl_set_final(in_fle, true);</div><div class='del'>-	dpaa2_fl_set_format(in_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(in_fle, state-&gt;buf_dma);</div><div class='del'>-	dpaa2_fl_set_len(in_fle, buflen);</div><div class='add'>+	/*</div><div class='add'>+	 * crypto engine requires the input entry to be present when</div><div class='add'>+	 * "frame list" FD is used.</div><div class='add'>+	 * Since engine does not support FMT=2'b11 (unused entry type), leaving</div><div class='add'>+	 * in_fle zeroized (except for "Final" flag) is the best option.</div><div class='add'>+	 */</div><div class='add'>+	if (buflen) {</div><div class='add'>+		dpaa2_fl_set_format(in_fle, dpaa2_fl_single);</div><div class='add'>+		dpaa2_fl_set_addr(in_fle, state-&gt;buf_dma);</div><div class='add'>+		dpaa2_fl_set_len(in_fle, buflen);</div><div class='add'>+	}</div><div class='ctx'> 	dpaa2_fl_set_format(out_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(out_fle, edesc-&gt;dst_dma);</div><div class='add'>+	dpaa2_fl_set_addr(out_fle, state-&gt;ctx_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(out_fle, digestsize);</div><div class='ctx'> </div><div class='ctx'> 	req_ctx-&gt;flc = &amp;ctx-&gt;flc[DIGEST];</div><div class='hunk'>@@ -3790,7 +3805,7 @@ static int ahash_final_no_ctx(struct ahash_request *req)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> unmap:</div><div class='del'>-	ahash_unmap(ctx-&gt;dev, edesc, req, digestsize);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_FROM_DEVICE);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3870,6 +3885,7 @@ static int ahash_update_no_ctx(struct ahash_request *req)</div><div class='ctx'> 		}</div><div class='ctx'> 		edesc-&gt;qm_sg_bytes = qm_sg_bytes;</div><div class='ctx'> </div><div class='add'>+		state-&gt;ctx_dma_len = ctx-&gt;ctx_len;</div><div class='ctx'> 		state-&gt;ctx_dma = dma_map_single(ctx-&gt;dev, state-&gt;caam_ctx,</div><div class='ctx'> 						ctx-&gt;ctx_len, DMA_FROM_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(ctx-&gt;dev, state-&gt;ctx_dma)) {</div><div class='hunk'>@@ -3918,7 +3934,7 @@ static int ahash_update_no_ctx(struct ahash_request *req)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> unmap_ctx:</div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, ctx-&gt;ctx_len, DMA_TO_DEVICE);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_TO_DEVICE);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3983,11 +3999,12 @@ static int ahash_finup_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> 	edesc-&gt;qm_sg_bytes = qm_sg_bytes;</div><div class='ctx'> </div><div class='del'>-	edesc-&gt;dst_dma = dma_map_single(ctx-&gt;dev, req-&gt;result, digestsize,</div><div class='add'>+	state-&gt;ctx_dma_len = digestsize;</div><div class='add'>+	state-&gt;ctx_dma = dma_map_single(ctx-&gt;dev, state-&gt;caam_ctx, digestsize,</div><div class='ctx'> 					DMA_FROM_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ctx-&gt;dev, edesc-&gt;dst_dma)) {</div><div class='del'>-		dev_err(ctx-&gt;dev, "unable to map dst\n");</div><div class='del'>-		edesc-&gt;dst_dma = 0;</div><div class='add'>+	if (dma_mapping_error(ctx-&gt;dev, state-&gt;ctx_dma)) {</div><div class='add'>+		dev_err(ctx-&gt;dev, "unable to map ctx\n");</div><div class='add'>+		state-&gt;ctx_dma = 0;</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3998,7 +4015,7 @@ static int ahash_finup_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	dpaa2_fl_set_addr(in_fle, edesc-&gt;qm_sg_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(in_fle, buflen + req-&gt;nbytes);</div><div class='ctx'> 	dpaa2_fl_set_format(out_fle, dpaa2_fl_single);</div><div class='del'>-	dpaa2_fl_set_addr(out_fle, edesc-&gt;dst_dma);</div><div class='add'>+	dpaa2_fl_set_addr(out_fle, state-&gt;ctx_dma);</div><div class='ctx'> 	dpaa2_fl_set_len(out_fle, digestsize);</div><div class='ctx'> </div><div class='ctx'> 	req_ctx-&gt;flc = &amp;ctx-&gt;flc[DIGEST];</div><div class='hunk'>@@ -4013,7 +4030,7 @@ static int ahash_finup_no_ctx(struct ahash_request *req)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> unmap:</div><div class='del'>-	ahash_unmap(ctx-&gt;dev, edesc, req, digestsize);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_FROM_DEVICE);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -4100,6 +4117,7 @@ static int ahash_update_first(struct ahash_request *req)</div><div class='ctx'> 			scatterwalk_map_and_copy(next_buf, req-&gt;src, to_hash,</div><div class='ctx'> 						 *next_buflen, 0);</div><div class='ctx'> </div><div class='add'>+		state-&gt;ctx_dma_len = ctx-&gt;ctx_len;</div><div class='ctx'> 		state-&gt;ctx_dma = dma_map_single(ctx-&gt;dev, state-&gt;caam_ctx,</div><div class='ctx'> 						ctx-&gt;ctx_len, DMA_FROM_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(ctx-&gt;dev, state-&gt;ctx_dma)) {</div><div class='hunk'>@@ -4143,7 +4161,7 @@ static int ahash_update_first(struct ahash_request *req)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> unmap_ctx:</div><div class='del'>-	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, ctx-&gt;ctx_len, DMA_TO_DEVICE);</div><div class='add'>+	ahash_unmap_ctx(ctx-&gt;dev, edesc, req, DMA_TO_DEVICE);</div><div class='ctx'> 	qi_cache_free(edesc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4162,6 +4180,7 @@ static int ahash_init(struct ahash_request *req)</div><div class='ctx'> 	state-&gt;final = ahash_final_no_ctx;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;ctx_dma = 0;</div><div class='add'>+	state-&gt;ctx_dma_len = 0;</div><div class='ctx'> 	state-&gt;current_buf = 0;</div><div class='ctx'> 	state-&gt;buf_dma = 0;</div><div class='ctx'> 	state-&gt;buflen_0 = 0;</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg_qi2.h b/drivers/crypto/caam/caamalg_qi2.h<br/>index 20890780fb82..be5085451053 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg_qi2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamalg_qi2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamalg_qi2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/caamalg_qi2.h</a></div><div class='hunk'>@@ -162,14 +162,12 @@ struct skcipher_edesc {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ahash_edesc - s/w-extended ahash descriptor</div><div class='del'>- * @dst_dma: I/O virtual address of req-&gt;result</div><div class='ctx'>  * @qm_sg_dma: I/O virtual address of h/w link table</div><div class='ctx'>  * @src_nents: number of segments in input scatterlist</div><div class='ctx'>  * @qm_sg_bytes: length of dma mapped qm_sg space</div><div class='ctx'>  * @sgt: pointer to h/w link table</div><div class='ctx'>  */</div><div class='ctx'> struct ahash_edesc {</div><div class='del'>-	dma_addr_t dst_dma;</div><div class='ctx'> 	dma_addr_t qm_sg_dma;</div><div class='ctx'> 	int src_nents;</div><div class='ctx'> 	int qm_sg_bytes;</div><div class='head'>diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c<br/>index b1eadc6652b5..7205d9f4029e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamhash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caamhash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caamhash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/caamhash.c</a></div><div class='hunk'>@@ -865,19 +865,18 @@ static int ahash_update_ctx(struct ahash_request *req)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto unmap_ctx;</div><div class='ctx'> </div><div class='del'>-		if (mapped_nents) {</div><div class='add'>+		if (mapped_nents)</div><div class='ctx'> 			sg_to_sec4_sg_last(req-&gt;src, mapped_nents,</div><div class='ctx'> 					   edesc-&gt;sec4_sg + sec4_sg_src_index,</div><div class='ctx'> 					   0);</div><div class='del'>-			if (*next_buflen)</div><div class='del'>-				scatterwalk_map_and_copy(next_buf, req-&gt;src,</div><div class='del'>-							 to_hash - *buflen,</div><div class='del'>-							 *next_buflen, 0);</div><div class='del'>-		} else {</div><div class='add'>+		else</div><div class='ctx'> 			sg_to_sec4_set_last(edesc-&gt;sec4_sg + sec4_sg_src_index -</div><div class='ctx'> 					    1);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='add'>+		if (*next_buflen)</div><div class='add'>+			scatterwalk_map_and_copy(next_buf, req-&gt;src,</div><div class='add'>+						 to_hash - *buflen,</div><div class='add'>+						 *next_buflen, 0);</div><div class='ctx'> 		desc = edesc-&gt;hw_desc;</div><div class='ctx'> </div><div class='ctx'> 		edesc-&gt;sec4_sg_dma = dma_map_single(jrdev, edesc-&gt;sec4_sg,</div><div class='head'>diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c<br/>index 58285642306e..fe24485274e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caampkc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/caampkc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/caampkc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/caampkc.c</a></div><div class='hunk'>@@ -994,8 +994,6 @@ static void caam_rsa_exit_tfm(struct crypto_akcipher *tfm)</div><div class='ctx'> static struct akcipher_alg caam_rsa = {</div><div class='ctx'> 	.encrypt = caam_rsa_enc,</div><div class='ctx'> 	.decrypt = caam_rsa_dec,</div><div class='del'>-	.sign = caam_rsa_dec,</div><div class='del'>-	.verify = caam_rsa_enc,</div><div class='ctx'> 	.set_pub_key = caam_rsa_set_pub_key,</div><div class='ctx'> 	.set_priv_key = caam_rsa_set_priv_key,</div><div class='ctx'> 	.max_size = caam_rsa_max_size,</div><div class='head'>diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c<br/>index 858bdc9ab4a3..e2ba3d202da5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/ctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/ctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/ctrl.c</a></div><div class='hunk'>@@ -468,6 +468,24 @@ static int caam_get_era(struct caam_ctrl __iomem *ctrl)</div><div class='ctx'> 		return caam_get_era_from_hw(ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ERRATA: imx6 devices (imx6D, imx6Q, imx6DL, imx6S, imx6DP and imx6DQ)</div><div class='add'>+ * have an issue wherein AXI bus transactions may not occur in the correct</div><div class='add'>+ * order. This isn't a problem running single descriptors, but can be if</div><div class='add'>+ * running multiple concurrent descriptors. Reworking the driver to throttle</div><div class='add'>+ * to single requests is impractical, thus the workaround is to limit the AXI</div><div class='add'>+ * pipeline to a depth of 1 (from it's default of 4) to preclude this situation</div><div class='add'>+ * from occurring.</div><div class='add'>+ */</div><div class='add'>+static void handle_imx6_err005766(u32 *mcr)</div><div class='add'>+{</div><div class='add'>+	if (of_machine_is_compatible("fsl,imx6q") ||</div><div class='add'>+	    of_machine_is_compatible("fsl,imx6dl") ||</div><div class='add'>+	    of_machine_is_compatible("fsl,imx6qp"))</div><div class='add'>+		clrsetbits_32(mcr, MCFGR_AXIPIPE_MASK,</div><div class='add'>+			      1 &lt;&lt; MCFGR_AXIPIPE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id caam_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "fsl,sec-v4.0",</div><div class='hunk'>@@ -640,6 +658,8 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 			      (sizeof(dma_addr_t) == sizeof(u64) ?</div><div class='ctx'> 			       MCFGR_LONG_PTR : 0));</div><div class='ctx'> </div><div class='add'>+	handle_imx6_err005766(&amp;ctrl-&gt;mcr);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Read the Compile Time paramters and SCFGR to determine</div><div class='ctx'> 	 * if Virtualization is enabled for this platform</div><div class='head'>diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c<br/>index 21a70fd32f5d..a4129a35a330 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/error.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/error.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/error.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/error.c</a></div><div class='hunk'>@@ -138,7 +138,7 @@ static const struct {</div><div class='ctx'> 	{ 0x46, "Annotation length exceeds offset (reuse mode)"},</div><div class='ctx'> 	{ 0x48, "Annotation output enabled but ASA limited by ASAR (reuse mode)"},</div><div class='ctx'> 	{ 0x49, "Data offset correction exceeds input frame data length (reuse mode)"},</div><div class='del'>-	{ 0x4B, "Annotation output enabled but ASA cannote be expanded (frame list)"},</div><div class='add'>+	{ 0x4B, "Annotation output enabled but ASA cannot be expanded (frame list)"},</div><div class='ctx'> 	{ 0x51, "Unsupported IF reuse mode"},</div><div class='ctx'> 	{ 0x52, "Unsupported FL use mode"},</div><div class='ctx'> 	{ 0x53, "Unsupported RJD use mode"},</div><div class='head'>diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h<br/>index 5869ad58d497..3392615dc91b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/intern.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/intern.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/intern.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/intern.h</a></div><div class='hunk'>@@ -49,13 +49,11 @@ struct caam_drv_private_jr {</div><div class='ctx'> 	atomic_t tfm_count ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> 	/* Job ring info */</div><div class='del'>-	int ringsize;	/* Size of rings (assume input = output) */</div><div class='ctx'> 	struct caam_jrentry_info *entinfo;	/* Alloc'ed 1 per ring entry */</div><div class='ctx'> 	spinlock_t inplock ____cacheline_aligned; /* Input ring index lock */</div><div class='del'>-	int inp_ring_write_index;	/* Input index "tail" */</div><div class='add'>+	u32 inpring_avail;	/* Number of free entries in input ring */</div><div class='ctx'> 	int head;			/* entinfo (s/w ring) head index */</div><div class='ctx'> 	dma_addr_t *inpring;	/* Base of input ring, alloc DMA-safe */</div><div class='del'>-	spinlock_t outlock ____cacheline_aligned; /* Output ring index lock */</div><div class='ctx'> 	int out_ring_read_index;	/* Output index "tail" */</div><div class='ctx'> 	int tail;			/* entinfo (s/w ring) tail index */</div><div class='ctx'> 	struct jr_outentry *outring;	/* Base of output ring, DMA-safe */</div><div class='head'>diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c<br/>index d50085a03597..044a69b526f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/jr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/jr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/jr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/jr.c</a></div><div class='hunk'>@@ -170,13 +170,13 @@ static void caam_jr_dequeue(unsigned long devarg)</div><div class='ctx'> 	void (*usercall)(struct device *dev, u32 *desc, u32 status, void *arg);</div><div class='ctx'> 	u32 *userdesc, userstatus;</div><div class='ctx'> 	void *userarg;</div><div class='add'>+	u32 outring_used = 0;</div><div class='ctx'> </div><div class='del'>-	while (rd_reg32(&amp;jrp-&gt;rregs-&gt;outring_used)) {</div><div class='add'>+	while (outring_used ||</div><div class='add'>+	       (outring_used = rd_reg32(&amp;jrp-&gt;rregs-&gt;outring_used))) {</div><div class='ctx'> </div><div class='ctx'> 		head = READ_ONCE(jrp-&gt;head);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;jrp-&gt;outlock);</div><div class='del'>-</div><div class='ctx'> 		sw_idx = tail = jrp-&gt;tail;</div><div class='ctx'> 		hw_idx = jrp-&gt;out_ring_read_index;</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +199,7 @@ static void caam_jr_dequeue(unsigned long devarg)</div><div class='ctx'> 		/* mark completed, avoid matching on a recycled desc addr */</div><div class='ctx'> 		jrp-&gt;entinfo[sw_idx].desc_addr_dma = 0;</div><div class='ctx'> </div><div class='del'>-		/* Stash callback params for use outside of lock */</div><div class='add'>+		/* Stash callback params */</div><div class='ctx'> 		usercall = jrp-&gt;entinfo[sw_idx].callbk;</div><div class='ctx'> 		userarg = jrp-&gt;entinfo[sw_idx].cbkarg;</div><div class='ctx'> 		userdesc = jrp-&gt;entinfo[sw_idx].desc_addr_virt;</div><div class='hunk'>@@ -213,7 +213,7 @@ static void caam_jr_dequeue(unsigned long devarg)</div><div class='ctx'> 		mb();</div><div class='ctx'> </div><div class='ctx'> 		/* set done */</div><div class='del'>-		wr_reg32(&amp;jrp-&gt;rregs-&gt;outring_rmvd, 1);</div><div class='add'>+		wr_reg32_relaxed(&amp;jrp-&gt;rregs-&gt;outring_rmvd, 1);</div><div class='ctx'> </div><div class='ctx'> 		jrp-&gt;out_ring_read_index = (jrp-&gt;out_ring_read_index + 1) &amp;</div><div class='ctx'> 					   (JOBR_DEPTH - 1);</div><div class='hunk'>@@ -232,10 +232,9 @@ static void caam_jr_dequeue(unsigned long devarg)</div><div class='ctx'> 			jrp-&gt;tail = tail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;jrp-&gt;outlock);</div><div class='del'>-</div><div class='ctx'> 		/* Finally, execute user's callback */</div><div class='ctx'> 		usercall(dev, userdesc, userstatus, userarg);</div><div class='add'>+		outring_used--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reenable / unmask IRQs */</div><div class='hunk'>@@ -345,7 +344,7 @@ int caam_jr_enqueue(struct device *dev, u32 *desc,</div><div class='ctx'> 	head = jrp-&gt;head;</div><div class='ctx'> 	tail = READ_ONCE(jrp-&gt;tail);</div><div class='ctx'> </div><div class='del'>-	if (!rd_reg32(&amp;jrp-&gt;rregs-&gt;inpring_avail) ||</div><div class='add'>+	if (!jrp-&gt;inpring_avail ||</div><div class='ctx'> 	    CIRC_SPACE(head, tail, JOBR_DEPTH) &lt;= 0) {</div><div class='ctx'> 		spin_unlock_bh(&amp;jrp-&gt;inplock);</div><div class='ctx'> 		dma_unmap_single(dev, desc_dma, desc_size, DMA_TO_DEVICE);</div><div class='hunk'>@@ -359,7 +358,7 @@ int caam_jr_enqueue(struct device *dev, u32 *desc,</div><div class='ctx'> 	head_entry-&gt;cbkarg = areq;</div><div class='ctx'> 	head_entry-&gt;desc_addr_dma = desc_dma;</div><div class='ctx'> </div><div class='del'>-	jrp-&gt;inpring[jrp-&gt;inp_ring_write_index] = cpu_to_caam_dma(desc_dma);</div><div class='add'>+	jrp-&gt;inpring[head] = cpu_to_caam_dma(desc_dma);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Guarantee that the descriptor's DMA address has been written to</div><div class='hunk'>@@ -368,18 +367,22 @@ int caam_jr_enqueue(struct device *dev, u32 *desc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='del'>-	jrp-&gt;inp_ring_write_index = (jrp-&gt;inp_ring_write_index + 1) &amp;</div><div class='del'>-				    (JOBR_DEPTH - 1);</div><div class='ctx'> 	jrp-&gt;head = (head + 1) &amp; (JOBR_DEPTH - 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that all job information has been written before</div><div class='del'>-	 * notifying CAAM that a new job was added to the input ring.</div><div class='add'>+	 * notifying CAAM that a new job was added to the input ring</div><div class='add'>+	 * using a memory barrier. The wr_reg32() uses api iowrite32()</div><div class='add'>+	 * to do the register write. iowrite32() issues a memory barrier</div><div class='add'>+	 * before the write operation.</div><div class='ctx'> 	 */</div><div class='del'>-	wmb();</div><div class='ctx'> </div><div class='ctx'> 	wr_reg32(&amp;jrp-&gt;rregs-&gt;inpring_jobadd, 1);</div><div class='ctx'> </div><div class='add'>+	jrp-&gt;inpring_avail--;</div><div class='add'>+	if (!jrp-&gt;inpring_avail)</div><div class='add'>+		jrp-&gt;inpring_avail = rd_reg32(&amp;jrp-&gt;rregs-&gt;inpring_avail);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;jrp-&gt;inplock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -431,7 +434,6 @@ static int caam_jr_init(struct device *dev)</div><div class='ctx'> 		jrp-&gt;entinfo[i].desc_addr_dma = !0;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup rings */</div><div class='del'>-	jrp-&gt;inp_ring_write_index = 0;</div><div class='ctx'> 	jrp-&gt;out_ring_read_index = 0;</div><div class='ctx'> 	jrp-&gt;head = 0;</div><div class='ctx'> 	jrp-&gt;tail = 0;</div><div class='hunk'>@@ -441,10 +443,9 @@ static int caam_jr_init(struct device *dev)</div><div class='ctx'> 	wr_reg32(&amp;jrp-&gt;rregs-&gt;inpring_size, JOBR_DEPTH);</div><div class='ctx'> 	wr_reg32(&amp;jrp-&gt;rregs-&gt;outring_size, JOBR_DEPTH);</div><div class='ctx'> </div><div class='del'>-	jrp-&gt;ringsize = JOBR_DEPTH;</div><div class='add'>+	jrp-&gt;inpring_avail = JOBR_DEPTH;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;jrp-&gt;inplock);</div><div class='del'>-	spin_lock_init(&amp;jrp-&gt;outlock);</div><div class='ctx'> </div><div class='ctx'> 	/* Select interrupt coalescing parameters */</div><div class='ctx'> 	clrsetbits_32(&amp;jrp-&gt;rregs-&gt;rconfig_lo, 0, JOBR_INTC |</div><div class='head'>diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c<br/>index 7cb8b1755e57..9f08f84cca59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/qi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/qi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/qi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/qi.c</a></div><div class='hunk'>@@ -318,7 +318,7 @@ int caam_drv_ctx_update(struct caam_drv_ctx *drv_ctx, u32 *sh_desc)</div><div class='ctx'> 	/* Create a new req FQ in parked state */</div><div class='ctx'> 	new_fq = create_caam_req_fq(drv_ctx-&gt;qidev, drv_ctx-&gt;rsp_fq,</div><div class='ctx'> 				    drv_ctx-&gt;context_a, 0);</div><div class='del'>-	if (IS_ERR_OR_NULL(new_fq)) {</div><div class='add'>+	if (IS_ERR(new_fq)) {</div><div class='ctx'> 		dev_err(qidev, "FQ allocation for shdesc update failed\n");</div><div class='ctx'> 		return PTR_ERR(new_fq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -431,7 +431,7 @@ struct caam_drv_ctx *caam_drv_ctx_init(struct device *qidev,</div><div class='ctx'> 	/* Attach request FQ */</div><div class='ctx'> 	drv_ctx-&gt;req_fq = create_caam_req_fq(qidev, drv_ctx-&gt;rsp_fq, hwdesc,</div><div class='ctx'> 					     QMAN_INITFQ_FLAG_SCHED);</div><div class='del'>-	if (IS_ERR_OR_NULL(drv_ctx-&gt;req_fq)) {</div><div class='add'>+	if (IS_ERR(drv_ctx-&gt;req_fq)) {</div><div class='ctx'> 		dev_err(qidev, "create_caam_req_fq failed\n");</div><div class='ctx'> 		dma_unmap_single(qidev, hwdesc, size, DMA_BIDIRECTIONAL);</div><div class='ctx'> 		kfree(drv_ctx);</div><div class='head'>diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h<br/>index 3cd0822ea819..c1fa1ec701d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/caam/regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/caam/regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/caam/regs.h</a></div><div class='hunk'>@@ -96,6 +96,14 @@ cpu_to_caam(16)</div><div class='ctx'> cpu_to_caam(32)</div><div class='ctx'> cpu_to_caam(64)</div><div class='ctx'> </div><div class='add'>+static inline void wr_reg32_relaxed(void __iomem *reg, u32 data)</div><div class='add'>+{</div><div class='add'>+	if (caam_little_end)</div><div class='add'>+		writel_relaxed(data, reg);</div><div class='add'>+	else</div><div class='add'>+		writel_relaxed(cpu_to_be32(data), reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void wr_reg32(void __iomem *reg, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	if (caam_little_end)</div><div class='hunk'>@@ -253,6 +261,9 @@ struct version_regs {</div><div class='ctx'> #define CHA_VER_VID_SHIFT	24</div><div class='ctx'> #define CHA_VER_VID_MASK	(0xffull &lt;&lt; CHA_VER_VID_SHIFT)</div><div class='ctx'> </div><div class='add'>+/* CHA Miscellaneous Information - AESA_MISC specific */</div><div class='add'>+#define CHA_VER_MISC_AES_GCM	BIT(1 + CHA_VER_MISC_SHIFT)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * caam_perfmon - Performance Monitor/Secure Memory Status/</div><div class='ctx'>  *                CAAM Global Status/Component Version IDs</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_algs.c b/drivers/crypto/cavium/cpt/cptvf_algs.c<br/>index 600336d169a9..9810ad8ac519 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_algs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_algs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/cpt/cptvf_algs.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/authenc.h&gt;</div><div class='del'>-#include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/crypto_wq.h&gt;</div><div class='ctx'> #include &lt;crypto/des.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='hunk'>@@ -327,27 +326,36 @@ static int cvm_cfb_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> static int cvm_cbc_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 			       u32 keylen)</div><div class='ctx'> {</div><div class='add'>+	u32 flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return cvm_setkey(cipher, key, keylen, DES3_CBC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cvm_ecb_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 			       u32 keylen)</div><div class='ctx'> {</div><div class='add'>+	u32 flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return cvm_setkey(cipher, key, keylen, DES3_ECB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cvm_enc_dec_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	memset(ctx, 0, sizeof(*ctx));</div><div class='del'>-	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct cvm_req_ctx) +</div><div class='del'>-					sizeof(struct ablkcipher_request);</div><div class='del'>-	/* Additional memory for ablkcipher_request is</div><div class='del'>-	 * allocated since the cryptd daemon uses</div><div class='del'>-	 * this memory for request_ctx information</div><div class='del'>-	 */</div><div class='del'>-</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct cvm_req_ctx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c<br/>index 2ca431ed1db8..88a0166f5477 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/cpt/cptvf_main.c</a></div><div class='hunk'>@@ -641,7 +641,7 @@ static void cptvf_write_vq_saddr(struct cpt_vf *cptvf, u64 val)</div><div class='ctx'> 	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_SADDR(0, 0), vqx_saddr.u);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void cptvf_device_init(struct cpt_vf *cptvf)</div><div class='add'>+static void cptvf_device_init(struct cpt_vf *cptvf)</div><div class='ctx'> {</div><div class='ctx'> 	u64 base_addr = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_mbox.c b/drivers/crypto/cavium/cpt/cptvf_mbox.c<br/>index d5ec3b8a9e61..4f438eceb506 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_mbox.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_mbox.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_mbox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/cpt/cptvf_mbox.c</a></div><div class='hunk'>@@ -17,23 +17,6 @@ static void cptvf_send_msg_to_pf(struct cpt_vf *cptvf, struct cpt_mbox *mbx)</div><div class='ctx'> 			mbx-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ACKs PF's mailbox message</div><div class='del'>- */</div><div class='del'>-void cptvf_mbox_send_ack(struct cpt_vf *cptvf, struct cpt_mbox *mbx)</div><div class='del'>-{</div><div class='del'>-	mbx-&gt;msg = CPT_MBOX_MSG_TYPE_ACK;</div><div class='del'>-	cptvf_send_msg_to_pf(cptvf, mbx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* NACKs PF's mailbox message that VF is not able to</div><div class='del'>- * complete the action</div><div class='del'>- */</div><div class='del'>-void cptvf_mbox_send_nack(struct cpt_vf *cptvf, struct cpt_mbox *mbx)</div><div class='del'>-{</div><div class='del'>-	mbx-&gt;msg = CPT_MBOX_MSG_TYPE_NACK;</div><div class='del'>-	cptvf_send_msg_to_pf(cptvf, mbx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Interrupt handler to handle mailbox messages from VFs */</div><div class='ctx'> void cptvf_handle_mbox_intr(struct cpt_vf *cptvf)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c<br/>index ca549c5dc08e..f16f61504241 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_reqmanager.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/cpt/cptvf_reqmanager.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/cpt/cptvf_reqmanager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/cpt/cptvf_reqmanager.c</a></div><div class='hunk'>@@ -223,7 +223,7 @@ scatter_gather_clean:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int send_cpt_command(struct cpt_vf *cptvf, union cpt_inst_s *cmd,</div><div class='add'>+static int send_cpt_command(struct cpt_vf *cptvf, union cpt_inst_s *cmd,</div><div class='ctx'> 		     u32 qno)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='hunk'>@@ -270,7 +270,7 @@ int send_cpt_command(struct cpt_vf *cptvf, union cpt_inst_s *cmd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_request_cleanup(struct cpt_vf *cptvf,</div><div class='add'>+static void do_request_cleanup(struct cpt_vf *cptvf,</div><div class='ctx'> 			struct cpt_info_buffer *info)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -316,7 +316,7 @@ void do_request_cleanup(struct cpt_vf *cptvf,</div><div class='ctx'> 	kzfree(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_post_process(struct cpt_vf *cptvf, struct cpt_info_buffer *info)</div><div class='add'>+static void do_post_process(struct cpt_vf *cptvf, struct cpt_info_buffer *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/cavium/nitrox/nitrox_aead.c b/drivers/crypto/cavium/nitrox/nitrox_aead.c<br/>index 4f43eacd2557..e4841eb2a09f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_aead.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_aead.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_aead.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/nitrox/nitrox_aead.c</a></div><div class='hunk'>@@ -18,26 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #define GCM_AES_SALT_SIZE	4</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct nitrox_crypt_params - Params to set nitrox crypto request.</div><div class='del'>- * @cryptlen: Encryption/Decryption data length</div><div class='del'>- * @authlen: Assoc data length + Cryptlen</div><div class='del'>- * @srclen: Input buffer length</div><div class='del'>- * @dstlen: Output buffer length</div><div class='del'>- * @iv: IV data</div><div class='del'>- * @ivsize: IV data length</div><div class='del'>- * @ctrl_arg: Identifies the request type (ENCRYPT/DECRYPT)</div><div class='del'>- */</div><div class='del'>-struct nitrox_crypt_params {</div><div class='del'>-	unsigned int cryptlen;</div><div class='del'>-	unsigned int authlen;</div><div class='del'>-	unsigned int srclen;</div><div class='del'>-	unsigned int dstlen;</div><div class='del'>-	u8 *iv;</div><div class='del'>-	int ivsize;</div><div class='del'>-	u8 ctrl_arg;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> union gph_p3 {</div><div class='ctx'> 	struct {</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='hunk'>@@ -94,36 +74,40 @@ static int nitrox_aead_setauthsize(struct crypto_aead *aead,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alloc_src_sglist(struct aead_request *areq, char *iv, int ivsize,</div><div class='add'>+static int alloc_src_sglist(struct nitrox_kcrypt_request *nkreq,</div><div class='add'>+			    struct scatterlist *src, char *iv, int ivsize,</div><div class='ctx'> 			    int buflen)</div><div class='ctx'> {</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-	int nents = sg_nents_for_len(areq-&gt;src, buflen) + 1;</div><div class='add'>+	int nents = sg_nents_for_len(src, buflen);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (nents &lt; 0)</div><div class='ctx'> 		return nents;</div><div class='ctx'> </div><div class='add'>+	/* IV entry */</div><div class='add'>+	nents += 1;</div><div class='ctx'> 	/* Allocate buffer to hold IV and input scatterlist array */</div><div class='ctx'> 	ret = alloc_src_req_buf(nkreq, nents, ivsize);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	nitrox_creq_copy_iv(nkreq-&gt;src, iv, ivsize);</div><div class='del'>-	nitrox_creq_set_src_sg(nkreq, nents, ivsize, areq-&gt;src, buflen);</div><div class='add'>+	nitrox_creq_set_src_sg(nkreq, nents, ivsize, src, buflen);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alloc_dst_sglist(struct aead_request *areq, int ivsize, int buflen)</div><div class='add'>+static int alloc_dst_sglist(struct nitrox_kcrypt_request *nkreq,</div><div class='add'>+			    struct scatterlist *dst, int ivsize, int buflen)</div><div class='ctx'> {</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-	int nents = sg_nents_for_len(areq-&gt;dst, buflen) + 3;</div><div class='add'>+	int nents = sg_nents_for_len(dst, buflen);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (nents &lt; 0)</div><div class='ctx'> 		return nents;</div><div class='ctx'> </div><div class='add'>+	/* IV, ORH, COMPLETION entries */</div><div class='add'>+	nents += 3;</div><div class='ctx'> 	/* Allocate buffer to hold ORH, COMPLETION and output scatterlist</div><div class='ctx'> 	 * array</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -133,61 +117,54 @@ static int alloc_dst_sglist(struct aead_request *areq, int ivsize, int buflen)</div><div class='ctx'> </div><div class='ctx'> 	nitrox_creq_set_orh(nkreq);</div><div class='ctx'> 	nitrox_creq_set_comp(nkreq);</div><div class='del'>-	nitrox_creq_set_dst_sg(nkreq, nents, ivsize, areq-&gt;dst, buflen);</div><div class='add'>+	nitrox_creq_set_dst_sg(nkreq, nents, ivsize, dst, buflen);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_src_sglist(struct aead_request *areq)</div><div class='add'>+static void free_src_sglist(struct nitrox_kcrypt_request *nkreq)</div><div class='ctx'> {</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-</div><div class='ctx'> 	kfree(nkreq-&gt;src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_dst_sglist(struct aead_request *areq)</div><div class='add'>+static void free_dst_sglist(struct nitrox_kcrypt_request *nkreq)</div><div class='ctx'> {</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-</div><div class='ctx'> 	kfree(nkreq-&gt;dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nitrox_set_creq(struct aead_request *areq,</div><div class='del'>-			   struct nitrox_crypt_params *params)</div><div class='add'>+static int nitrox_set_creq(struct nitrox_aead_rctx *rctx)</div><div class='ctx'> {</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-	struct se_crypto_request *creq = &amp;nkreq-&gt;creq;</div><div class='del'>-	struct crypto_aead *aead = crypto_aead_reqtfm(areq);</div><div class='add'>+	struct se_crypto_request *creq = &amp;rctx-&gt;nkreq.creq;</div><div class='ctx'> 	union gph_p3 param3;</div><div class='del'>-	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	creq-&gt;flags = areq-&gt;base.flags;</div><div class='del'>-	creq-&gt;gfp = (areq-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) ?</div><div class='del'>-		GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+	creq-&gt;flags = rctx-&gt;flags;</div><div class='add'>+	creq-&gt;gfp = (rctx-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) ? GFP_KERNEL :</div><div class='add'>+							       GFP_ATOMIC;</div><div class='ctx'> </div><div class='ctx'> 	creq-&gt;ctrl.value = 0;</div><div class='ctx'> 	creq-&gt;opcode = FLEXI_CRYPTO_ENCRYPT_HMAC;</div><div class='del'>-	creq-&gt;ctrl.s.arg = params-&gt;ctrl_arg;</div><div class='add'>+	creq-&gt;ctrl.s.arg = rctx-&gt;ctrl_arg;</div><div class='ctx'> </div><div class='del'>-	creq-&gt;gph.param0 = cpu_to_be16(params-&gt;cryptlen);</div><div class='del'>-	creq-&gt;gph.param1 = cpu_to_be16(params-&gt;authlen);</div><div class='del'>-	creq-&gt;gph.param2 = cpu_to_be16(params-&gt;ivsize + areq-&gt;assoclen);</div><div class='add'>+	creq-&gt;gph.param0 = cpu_to_be16(rctx-&gt;cryptlen);</div><div class='add'>+	creq-&gt;gph.param1 = cpu_to_be16(rctx-&gt;cryptlen + rctx-&gt;assoclen);</div><div class='add'>+	creq-&gt;gph.param2 = cpu_to_be16(rctx-&gt;ivsize + rctx-&gt;assoclen);</div><div class='ctx'> 	param3.iv_offset = 0;</div><div class='del'>-	param3.auth_offset = params-&gt;ivsize;</div><div class='add'>+	param3.auth_offset = rctx-&gt;ivsize;</div><div class='ctx'> 	creq-&gt;gph.param3 = cpu_to_be16(param3.param);</div><div class='ctx'> </div><div class='del'>-	creq-&gt;ctx_handle = nctx-&gt;u.ctx_handle;</div><div class='add'>+	creq-&gt;ctx_handle = rctx-&gt;ctx_handle;</div><div class='ctx'> 	creq-&gt;ctrl.s.ctxl = sizeof(struct flexi_crypto_context);</div><div class='ctx'> </div><div class='del'>-	ret = alloc_src_sglist(areq, params-&gt;iv, params-&gt;ivsize,</div><div class='del'>-			       params-&gt;srclen);</div><div class='add'>+	ret = alloc_src_sglist(&amp;rctx-&gt;nkreq, rctx-&gt;src, rctx-&gt;iv, rctx-&gt;ivsize,</div><div class='add'>+			       rctx-&gt;srclen);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = alloc_dst_sglist(areq, params-&gt;ivsize, params-&gt;dstlen);</div><div class='add'>+	ret = alloc_dst_sglist(&amp;rctx-&gt;nkreq, rctx-&gt;dst, rctx-&gt;ivsize,</div><div class='add'>+			       rctx-&gt;dstlen);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		free_src_sglist(areq);</div><div class='add'>+		free_src_sglist(&amp;rctx-&gt;nkreq);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -197,9 +174,10 @@ static int nitrox_set_creq(struct aead_request *areq,</div><div class='ctx'> static void nitrox_aead_callback(void *arg, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_request *areq = arg;</div><div class='add'>+	struct nitrox_aead_rctx *rctx = aead_request_ctx(areq);</div><div class='ctx'> </div><div class='del'>-	free_src_sglist(areq);</div><div class='del'>-	free_dst_sglist(areq);</div><div class='add'>+	free_src_sglist(&amp;rctx-&gt;nkreq);</div><div class='add'>+	free_dst_sglist(&amp;rctx-&gt;nkreq);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_err_ratelimited("request failed status 0x%0x\n", err);</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -212,23 +190,25 @@ static int nitrox_aes_gcm_enc(struct aead_request *areq)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead = crypto_aead_reqtfm(areq);</div><div class='ctx'> 	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-	struct se_crypto_request *creq = &amp;nkreq-&gt;creq;</div><div class='add'>+	struct nitrox_aead_rctx *rctx = aead_request_ctx(areq);</div><div class='add'>+	struct se_crypto_request *creq = &amp;rctx-&gt;nkreq.creq;</div><div class='ctx'> 	struct flexi_crypto_context *fctx = nctx-&gt;u.fctx;</div><div class='del'>-	struct nitrox_crypt_params params;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(fctx-&gt;crypto.iv, areq-&gt;iv, GCM_AES_SALT_SIZE);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;params, 0, sizeof(params));</div><div class='del'>-	params.cryptlen = areq-&gt;cryptlen;</div><div class='del'>-	params.authlen = areq-&gt;assoclen + params.cryptlen;</div><div class='del'>-	params.srclen = params.authlen;</div><div class='del'>-	params.dstlen = params.srclen + aead-&gt;authsize;</div><div class='del'>-	params.iv = &amp;areq-&gt;iv[GCM_AES_SALT_SIZE];</div><div class='del'>-	params.ivsize = GCM_AES_IV_SIZE - GCM_AES_SALT_SIZE;</div><div class='del'>-	params.ctrl_arg = ENCRYPT;</div><div class='del'>-	ret = nitrox_set_creq(areq, &amp;params);</div><div class='add'>+	rctx-&gt;cryptlen = areq-&gt;cryptlen;</div><div class='add'>+	rctx-&gt;assoclen = areq-&gt;assoclen;</div><div class='add'>+	rctx-&gt;srclen = areq-&gt;assoclen + areq-&gt;cryptlen;</div><div class='add'>+	rctx-&gt;dstlen = rctx-&gt;srclen + aead-&gt;authsize;</div><div class='add'>+	rctx-&gt;iv = &amp;areq-&gt;iv[GCM_AES_SALT_SIZE];</div><div class='add'>+	rctx-&gt;ivsize = GCM_AES_IV_SIZE - GCM_AES_SALT_SIZE;</div><div class='add'>+	rctx-&gt;flags = areq-&gt;base.flags;</div><div class='add'>+	rctx-&gt;ctx_handle = nctx-&gt;u.ctx_handle;</div><div class='add'>+	rctx-&gt;src = areq-&gt;src;</div><div class='add'>+	rctx-&gt;dst = areq-&gt;dst;</div><div class='add'>+	rctx-&gt;ctrl_arg = ENCRYPT;</div><div class='add'>+	ret = nitrox_set_creq(rctx);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -241,23 +221,25 @@ static int nitrox_aes_gcm_dec(struct aead_request *areq)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead = crypto_aead_reqtfm(areq);</div><div class='ctx'> 	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct nitrox_kcrypt_request *nkreq = aead_request_ctx(areq);</div><div class='del'>-	struct se_crypto_request *creq = &amp;nkreq-&gt;creq;</div><div class='add'>+	struct nitrox_aead_rctx *rctx = aead_request_ctx(areq);</div><div class='add'>+	struct se_crypto_request *creq = &amp;rctx-&gt;nkreq.creq;</div><div class='ctx'> 	struct flexi_crypto_context *fctx = nctx-&gt;u.fctx;</div><div class='del'>-	struct nitrox_crypt_params params;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(fctx-&gt;crypto.iv, areq-&gt;iv, GCM_AES_SALT_SIZE);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;params, 0, sizeof(params));</div><div class='del'>-	params.cryptlen = areq-&gt;cryptlen - aead-&gt;authsize;</div><div class='del'>-	params.authlen = areq-&gt;assoclen + params.cryptlen;</div><div class='del'>-	params.srclen = areq-&gt;cryptlen + areq-&gt;assoclen;</div><div class='del'>-	params.dstlen = params.srclen - aead-&gt;authsize;</div><div class='del'>-	params.iv = &amp;areq-&gt;iv[GCM_AES_SALT_SIZE];</div><div class='del'>-	params.ivsize = GCM_AES_IV_SIZE - GCM_AES_SALT_SIZE;</div><div class='del'>-	params.ctrl_arg = DECRYPT;</div><div class='del'>-	ret = nitrox_set_creq(areq, &amp;params);</div><div class='add'>+	rctx-&gt;cryptlen = areq-&gt;cryptlen - aead-&gt;authsize;</div><div class='add'>+	rctx-&gt;assoclen = areq-&gt;assoclen;</div><div class='add'>+	rctx-&gt;srclen = areq-&gt;cryptlen + areq-&gt;assoclen;</div><div class='add'>+	rctx-&gt;dstlen = rctx-&gt;srclen - aead-&gt;authsize;</div><div class='add'>+	rctx-&gt;iv = &amp;areq-&gt;iv[GCM_AES_SALT_SIZE];</div><div class='add'>+	rctx-&gt;ivsize = GCM_AES_IV_SIZE - GCM_AES_SALT_SIZE;</div><div class='add'>+	rctx-&gt;flags = areq-&gt;base.flags;</div><div class='add'>+	rctx-&gt;ctx_handle = nctx-&gt;u.ctx_handle;</div><div class='add'>+	rctx-&gt;src = areq-&gt;src;</div><div class='add'>+	rctx-&gt;dst = areq-&gt;dst;</div><div class='add'>+	rctx-&gt;ctrl_arg = DECRYPT;</div><div class='add'>+	ret = nitrox_set_creq(rctx);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +272,7 @@ static int nitrox_aead_init(struct crypto_aead *aead)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nitrox_aes_gcm_init(struct crypto_aead *aead)</div><div class='add'>+static int nitrox_gcm_common_init(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='hunk'>@@ -308,8 +290,20 @@ static int nitrox_aes_gcm_init(struct crypto_aead *aead)</div><div class='ctx'> 	flags-&gt;w0.auth_input_type = 1;</div><div class='ctx'> 	flags-&gt;f = be64_to_cpu(flags-&gt;f);</div><div class='ctx'> </div><div class='del'>-	crypto_aead_set_reqsize(aead, sizeof(struct aead_request) +</div><div class='del'>-				sizeof(struct nitrox_kcrypt_request));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nitrox_aes_gcm_init(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nitrox_gcm_common_init(aead);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(aead,</div><div class='add'>+				sizeof(struct aead_request) +</div><div class='add'>+					sizeof(struct nitrox_aead_rctx));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -332,6 +326,166 @@ static void nitrox_aead_exit(struct crypto_aead *aead)</div><div class='ctx'> 	nctx-&gt;ndev = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nitrox_rfc4106_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+				 unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct flexi_crypto_context *fctx = nctx-&gt;u.fctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (keylen &lt; GCM_AES_SALT_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	keylen -= GCM_AES_SALT_SIZE;</div><div class='add'>+	ret = nitrox_aes_gcm_setkey(aead, key, keylen);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memcpy(fctx-&gt;crypto.iv, key + keylen, GCM_AES_SALT_SIZE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nitrox_rfc4106_setauthsize(struct crypto_aead *aead,</div><div class='add'>+				      unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case 8:</div><div class='add'>+	case 12:</div><div class='add'>+	case 16:</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 nitrox_aead_setauthsize(aead, authsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nitrox_rfc4106_set_aead_rctx_sglist(struct aead_request *areq)</div><div class='add'>+{</div><div class='add'>+	struct nitrox_rfc4106_rctx *rctx = aead_request_ctx(areq);</div><div class='add'>+	struct nitrox_aead_rctx *aead_rctx = &amp;rctx-&gt;base;</div><div class='add'>+	unsigned int assoclen = areq-&gt;assoclen - GCM_RFC4106_IV_SIZE;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+</div><div class='add'>+	if (areq-&gt;assoclen != 16 &amp;&amp; areq-&gt;assoclen != 20)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	scatterwalk_map_and_copy(rctx-&gt;assoc, areq-&gt;src, 0, assoclen, 0);</div><div class='add'>+	sg_init_table(rctx-&gt;src, 3);</div><div class='add'>+	sg_set_buf(rctx-&gt;src, rctx-&gt;assoc, assoclen);</div><div class='add'>+	sg = scatterwalk_ffwd(rctx-&gt;src + 1, areq-&gt;src, areq-&gt;assoclen);</div><div class='add'>+	if (sg != rctx-&gt;src + 1)</div><div class='add'>+		sg_chain(rctx-&gt;src, 2, sg);</div><div class='add'>+</div><div class='add'>+	if (areq-&gt;src != areq-&gt;dst) {</div><div class='add'>+		sg_init_table(rctx-&gt;dst, 3);</div><div class='add'>+		sg_set_buf(rctx-&gt;dst, rctx-&gt;assoc, assoclen);</div><div class='add'>+		sg = scatterwalk_ffwd(rctx-&gt;dst + 1, areq-&gt;dst, areq-&gt;assoclen);</div><div class='add'>+		if (sg != rctx-&gt;dst + 1)</div><div class='add'>+			sg_chain(rctx-&gt;dst, 2, sg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aead_rctx-&gt;src = rctx-&gt;src;</div><div class='add'>+	aead_rctx-&gt;dst = (areq-&gt;src == areq-&gt;dst) ? rctx-&gt;src : rctx-&gt;dst;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nitrox_rfc4106_callback(void *arg, int err)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *areq = arg;</div><div class='add'>+	struct nitrox_rfc4106_rctx *rctx = aead_request_ctx(areq);</div><div class='add'>+	struct nitrox_kcrypt_request *nkreq = &amp;rctx-&gt;base.nkreq;</div><div class='add'>+</div><div class='add'>+	free_src_sglist(nkreq);</div><div class='add'>+	free_dst_sglist(nkreq);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err_ratelimited("request failed status 0x%0x\n", err);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	areq-&gt;base.complete(&amp;areq-&gt;base, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nitrox_rfc4106_enc(struct aead_request *areq)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(areq);</div><div class='add'>+	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct nitrox_rfc4106_rctx *rctx = aead_request_ctx(areq);</div><div class='add'>+	struct nitrox_aead_rctx *aead_rctx = &amp;rctx-&gt;base;</div><div class='add'>+	struct se_crypto_request *creq = &amp;aead_rctx-&gt;nkreq.creq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	aead_rctx-&gt;cryptlen = areq-&gt;cryptlen;</div><div class='add'>+	aead_rctx-&gt;assoclen = areq-&gt;assoclen - GCM_RFC4106_IV_SIZE;</div><div class='add'>+	aead_rctx-&gt;srclen = aead_rctx-&gt;assoclen + aead_rctx-&gt;cryptlen;</div><div class='add'>+	aead_rctx-&gt;dstlen = aead_rctx-&gt;srclen + aead-&gt;authsize;</div><div class='add'>+	aead_rctx-&gt;iv = areq-&gt;iv;</div><div class='add'>+	aead_rctx-&gt;ivsize = GCM_RFC4106_IV_SIZE;</div><div class='add'>+	aead_rctx-&gt;flags = areq-&gt;base.flags;</div><div class='add'>+	aead_rctx-&gt;ctx_handle = nctx-&gt;u.ctx_handle;</div><div class='add'>+	aead_rctx-&gt;ctrl_arg = ENCRYPT;</div><div class='add'>+</div><div class='add'>+	ret = nitrox_rfc4106_set_aead_rctx_sglist(areq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = nitrox_set_creq(aead_rctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* send the crypto request */</div><div class='add'>+	return nitrox_process_se_request(nctx-&gt;ndev, creq,</div><div class='add'>+					 nitrox_rfc4106_callback, areq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nitrox_rfc4106_dec(struct aead_request *areq)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(areq);</div><div class='add'>+	struct nitrox_crypto_ctx *nctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct nitrox_rfc4106_rctx *rctx = aead_request_ctx(areq);</div><div class='add'>+	struct nitrox_aead_rctx *aead_rctx = &amp;rctx-&gt;base;</div><div class='add'>+	struct se_crypto_request *creq = &amp;aead_rctx-&gt;nkreq.creq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	aead_rctx-&gt;cryptlen = areq-&gt;cryptlen - aead-&gt;authsize;</div><div class='add'>+	aead_rctx-&gt;assoclen = areq-&gt;assoclen - GCM_RFC4106_IV_SIZE;</div><div class='add'>+	aead_rctx-&gt;srclen =</div><div class='add'>+		areq-&gt;cryptlen - GCM_RFC4106_IV_SIZE + areq-&gt;assoclen;</div><div class='add'>+	aead_rctx-&gt;dstlen = aead_rctx-&gt;srclen - aead-&gt;authsize;</div><div class='add'>+	aead_rctx-&gt;iv = areq-&gt;iv;</div><div class='add'>+	aead_rctx-&gt;ivsize = GCM_RFC4106_IV_SIZE;</div><div class='add'>+	aead_rctx-&gt;flags = areq-&gt;base.flags;</div><div class='add'>+	aead_rctx-&gt;ctx_handle = nctx-&gt;u.ctx_handle;</div><div class='add'>+	aead_rctx-&gt;ctrl_arg = DECRYPT;</div><div class='add'>+</div><div class='add'>+	ret = nitrox_rfc4106_set_aead_rctx_sglist(areq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = nitrox_set_creq(aead_rctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* send the crypto request */</div><div class='add'>+	return nitrox_process_se_request(nctx-&gt;ndev, creq,</div><div class='add'>+					 nitrox_rfc4106_callback, areq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nitrox_rfc4106_init(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nitrox_gcm_common_init(aead);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(aead, sizeof(struct aead_request) +</div><div class='add'>+				sizeof(struct nitrox_rfc4106_rctx));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct aead_alg nitrox_aeads[] = { {</div><div class='ctx'> 	.base = {</div><div class='ctx'> 		.cra_name = "gcm(aes)",</div><div class='hunk'>@@ -351,6 +505,25 @@ static struct aead_alg nitrox_aeads[] = { {</div><div class='ctx'> 	.exit = nitrox_aead_exit,</div><div class='ctx'> 	.ivsize = GCM_AES_IV_SIZE,</div><div class='ctx'> 	.maxauthsize = AES_BLOCK_SIZE,</div><div class='add'>+}, {</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name = "rfc4106(gcm(aes))",</div><div class='add'>+		.cra_driver_name = "n5_rfc4106",</div><div class='add'>+		.cra_priority = PRIO,</div><div class='add'>+		.cra_flags = CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize = sizeof(struct nitrox_crypto_ctx),</div><div class='add'>+		.cra_alignmask = 0,</div><div class='add'>+		.cra_module = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.setkey = nitrox_rfc4106_setkey,</div><div class='add'>+	.setauthsize = nitrox_rfc4106_setauthsize,</div><div class='add'>+	.encrypt = nitrox_rfc4106_enc,</div><div class='add'>+	.decrypt = nitrox_rfc4106_dec,</div><div class='add'>+	.init = nitrox_rfc4106_init,</div><div class='add'>+	.exit = nitrox_aead_exit,</div><div class='add'>+	.ivsize = GCM_RFC4106_IV_SIZE,</div><div class='add'>+	.maxauthsize = AES_BLOCK_SIZE,</div><div class='ctx'> } };</div><div class='ctx'> </div><div class='ctx'> int nitrox_register_aeads(void)</div><div class='head'>diff --git a/drivers/crypto/cavium/nitrox/nitrox_hal.c b/drivers/crypto/cavium/nitrox/nitrox_hal.c<br/>index c08d9f33a3b1..3f0df60267a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_hal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_hal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_hal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/nitrox/nitrox_hal.c</a></div><div class='hunk'>@@ -437,6 +437,45 @@ void config_nps_core_vfcfg_mode(struct nitrox_device *ndev, enum vf_mode mode)</div><div class='ctx'> 	nitrox_write_csr(ndev, NPS_CORE_GBL_VFCFG, vfcfg.value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *get_core_option(u8 se_cores, u8 ae_cores)</div><div class='add'>+{</div><div class='add'>+	const char *option = "";</div><div class='add'>+</div><div class='add'>+	if (ae_cores == AE_MAX_CORES) {</div><div class='add'>+		switch (se_cores) {</div><div class='add'>+		case SE_MAX_CORES:</div><div class='add'>+			option = "60";</div><div class='add'>+			break;</div><div class='add'>+		case 40:</div><div class='add'>+			option = "60s";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (ae_cores == (AE_MAX_CORES / 2)) {</div><div class='add'>+		option = "30";</div><div class='add'>+	} else {</div><div class='add'>+		option = "60i";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return option;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *get_feature_option(u8 zip_cores, int core_freq)</div><div class='add'>+{</div><div class='add'>+	if (zip_cores == 0)</div><div class='add'>+		return "";</div><div class='add'>+	else if (zip_cores &lt; ZIP_MAX_CORES)</div><div class='add'>+		return "-C15";</div><div class='add'>+</div><div class='add'>+	if (core_freq &gt;= 850)</div><div class='add'>+		return "-C45";</div><div class='add'>+	else if (core_freq &gt;= 750)</div><div class='add'>+		return "-C35";</div><div class='add'>+	else if (core_freq &gt;= 550)</div><div class='add'>+		return "-C25";</div><div class='add'>+</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void nitrox_get_hwinfo(struct nitrox_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	union emu_fuse_map emu_fuse;</div><div class='hunk'>@@ -469,24 +508,14 @@ void nitrox_get_hwinfo(struct nitrox_device *ndev)</div><div class='ctx'> 		ndev-&gt;hw.zip_cores = ZIP_MAX_CORES - dead_cores;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* determine the partname CNN55&lt;cores&gt;-&lt;freq&gt;&lt;pincount&gt;-&lt;rev&gt;*/</div><div class='del'>-	if (ndev-&gt;hw.ae_cores == AE_MAX_CORES) {</div><div class='del'>-		switch (ndev-&gt;hw.se_cores) {</div><div class='del'>-		case SE_MAX_CORES:</div><div class='del'>-			i = snprintf(name, sizeof(name), "CNN5560");</div><div class='del'>-			break;</div><div class='del'>-		case 40:</div><div class='del'>-			i = snprintf(name, sizeof(name), "CNN5560s");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (ndev-&gt;hw.ae_cores == (AE_MAX_CORES / 2)) {</div><div class='del'>-		i = snprintf(name, sizeof(name), "CNN5530");</div><div class='del'>-	} else {</div><div class='del'>-		i = snprintf(name, sizeof(name), "CNN5560i");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(name + i, sizeof(name) - i, "-%3dBG676-1.%u",</div><div class='del'>-		 ndev-&gt;hw.freq, ndev-&gt;hw.revision_id);</div><div class='add'>+	/* determine the partname</div><div class='add'>+	 * CNN55&lt;core option&gt;-&lt;freq&gt;&lt;pincount&gt;-&lt;feature option&gt;-&lt;rev&gt;</div><div class='add'>+	 */</div><div class='add'>+	snprintf(name, sizeof(name), "CNN55%s-%3dBG676%s-1.%u",</div><div class='add'>+		 get_core_option(ndev-&gt;hw.se_cores, ndev-&gt;hw.ae_cores),</div><div class='add'>+		 ndev-&gt;hw.freq,</div><div class='add'>+		 get_feature_option(ndev-&gt;hw.zip_cores, ndev-&gt;hw.freq),</div><div class='add'>+		 ndev-&gt;hw.revision_id);</div><div class='ctx'> </div><div class='ctx'> 	/* copy partname */</div><div class='ctx'> 	strncpy(ndev-&gt;hw.partname, name, sizeof(ndev-&gt;hw.partname));</div><div class='head'>diff --git a/drivers/crypto/cavium/nitrox/nitrox_req.h b/drivers/crypto/cavium/nitrox/nitrox_req.h<br/>index 76c0f0be7233..efdbd0fc3e3b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_req.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_req.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_req.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/nitrox/nitrox_req.h</a></div><div class='hunk'>@@ -212,6 +212,50 @@ struct nitrox_kcrypt_request {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct nitrox_aead_rctx - AEAD request context</div><div class='add'>+ * @nkreq: Base request context</div><div class='add'>+ * @cryptlen: Encryption/Decryption data length</div><div class='add'>+ * @assoclen: AAD length</div><div class='add'>+ * @srclen: Input buffer length</div><div class='add'>+ * @dstlen: Output buffer length</div><div class='add'>+ * @iv: IV data</div><div class='add'>+ * @ivsize: IV data length</div><div class='add'>+ * @flags: AEAD req flags</div><div class='add'>+ * @ctx_handle: Device context handle</div><div class='add'>+ * @src: Source sglist</div><div class='add'>+ * @dst: Destination sglist</div><div class='add'>+ * @ctrl_arg: Identifies the request type (ENCRYPT/DECRYPT)</div><div class='add'>+ */</div><div class='add'>+struct nitrox_aead_rctx {</div><div class='add'>+	struct nitrox_kcrypt_request nkreq;</div><div class='add'>+	unsigned int cryptlen;</div><div class='add'>+	unsigned int assoclen;</div><div class='add'>+	unsigned int srclen;</div><div class='add'>+	unsigned int dstlen;</div><div class='add'>+	u8 *iv;</div><div class='add'>+	int ivsize;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u64 ctx_handle;</div><div class='add'>+	struct scatterlist *src;</div><div class='add'>+	struct scatterlist *dst;</div><div class='add'>+	u8 ctrl_arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct nitrox_rfc4106_rctx - rfc4106 cipher request context</div><div class='add'>+ * @base: AEAD request context</div><div class='add'>+ * @src: Source sglist</div><div class='add'>+ * @dst: Destination sglist</div><div class='add'>+ * @assoc: AAD</div><div class='add'>+ */</div><div class='add'>+struct nitrox_rfc4106_rctx {</div><div class='add'>+	struct nitrox_aead_rctx base;</div><div class='add'>+	struct scatterlist src[3];</div><div class='add'>+	struct scatterlist dst[3];</div><div class='add'>+	u8 assoc[20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct pkt_instr_hdr - Packet Instruction Header</div><div class='ctx'>  * @g: Gather used</div><div class='ctx'>  *   When [G] is set and [GSZ] != 0, the instruction is</div><div class='hunk'>@@ -512,7 +556,7 @@ static inline struct scatterlist *create_multi_sg(struct scatterlist *to_sg,</div><div class='ctx'> 	struct scatterlist *sg = to_sg;</div><div class='ctx'> 	unsigned int sglen;</div><div class='ctx'> </div><div class='del'>-	for (; buflen; buflen -= sglen) {</div><div class='add'>+	for (; buflen &amp;&amp; from_sg; buflen -= sglen) {</div><div class='ctx'> 		sglen = from_sg-&gt;length;</div><div class='ctx'> 		if (sglen &gt; buflen)</div><div class='ctx'> 			sglen = buflen;</div><div class='head'>diff --git a/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c b/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c<br/>index 4c97478d44bd..5826c2c98a50 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_reqmgr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/nitrox/nitrox_reqmgr.c</a></div><div class='hunk'>@@ -303,8 +303,6 @@ static void post_se_instr(struct nitrox_softreq *sr,</div><div class='ctx'> </div><div class='ctx'> 	/* Ring doorbell with count 1 */</div><div class='ctx'> 	writeq(1, cmdq-&gt;dbell_csr_addr);</div><div class='del'>-	/* orders the doorbell rings */</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	cmdq-&gt;write_idx = incr_index(idx, 1, ndev-&gt;qlen);</div><div class='ctx'> </div><div class='hunk'>@@ -599,8 +597,6 @@ void pkt_slc_resp_tasklet(unsigned long data)</div><div class='ctx'> 	 * MSI-X interrupt generates if Completion count &gt; Threshold</div><div class='ctx'> 	 */</div><div class='ctx'> 	writeq(slc_cnts.value, cmdq-&gt;compl_cnt_csr_addr);</div><div class='del'>-	/* order the writes */</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;cmdq-&gt;backlog_count))</div><div class='ctx'> 		schedule_work(&amp;cmdq-&gt;backlog_qflush);</div><div class='head'>diff --git a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c<br/>index d4935d6cefdd..7e4a5e69085e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_skcipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/nitrox/nitrox_skcipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/nitrox/nitrox_skcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/nitrox/nitrox_skcipher.c</a></div><div class='hunk'>@@ -257,12 +257,8 @@ static int nitrox_aes_decrypt(struct skcipher_request *skreq)</div><div class='ctx'> static int nitrox_3des_setkey(struct crypto_skcipher *cipher,</div><div class='ctx'> 			      const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	if (keylen != DES3_EDE_KEY_SIZE) {</div><div class='del'>-		crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nitrox_skcipher_setkey(cipher, 0, key, keylen);</div><div class='add'>+	return unlikely(des3_verify_key(cipher, key)) ?:</div><div class='add'>+	       nitrox_skcipher_setkey(cipher, 0, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nitrox_3des_encrypt(struct skcipher_request *skreq)</div><div class='head'>diff --git a/drivers/crypto/cavium/zip/zip_crypto.c b/drivers/crypto/cavium/zip/zip_crypto.c<br/>index b92b6e7e100f..4985bc812b0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/zip/zip_crypto.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/cavium/zip/zip_crypto.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/cavium/zip/zip_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/cavium/zip/zip_crypto.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static void zip_static_init_zip_ops(struct zip_operation *zip_ops,</div><div class='ctx'> 	zip_ops-&gt;csum	      = 1; /* Adler checksum desired */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zip_ctx_init(struct zip_kernel_ctx *zip_ctx, int lzs_flag)</div><div class='add'>+static int zip_ctx_init(struct zip_kernel_ctx *zip_ctx, int lzs_flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct zip_operation  *comp_ctx   = &amp;zip_ctx-&gt;zip_comp;</div><div class='ctx'> 	struct zip_operation  *decomp_ctx = &amp;zip_ctx-&gt;zip_decomp;</div><div class='hunk'>@@ -107,7 +107,7 @@ err_comp_input:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zip_ctx_exit(struct zip_kernel_ctx *zip_ctx)</div><div class='add'>+static void zip_ctx_exit(struct zip_kernel_ctx *zip_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct zip_operation  *comp_ctx   = &amp;zip_ctx-&gt;zip_comp;</div><div class='ctx'> 	struct zip_operation  *dec_ctx = &amp;zip_ctx-&gt;zip_decomp;</div><div class='hunk'>@@ -119,7 +119,7 @@ void zip_ctx_exit(struct zip_kernel_ctx *zip_ctx)</div><div class='ctx'> 	zip_data_buf_free(dec_ctx-&gt;output, MAX_OUTPUT_BUFFER_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zip_compress(const u8 *src, unsigned int slen,</div><div class='add'>+static int zip_compress(const u8 *src, unsigned int slen,</div><div class='ctx'> 		 u8 *dst, unsigned int *dlen,</div><div class='ctx'> 		 struct zip_kernel_ctx *zip_ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,7 +155,7 @@ int zip_compress(const u8 *src, unsigned int slen,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zip_decompress(const u8 *src, unsigned int slen,</div><div class='add'>+static int zip_decompress(const u8 *src, unsigned int slen,</div><div class='ctx'> 		   u8 *dst, unsigned int *dlen,</div><div class='ctx'> 		   struct zip_kernel_ctx *zip_ctx)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-crypto-des3.c b/drivers/crypto/ccp/ccp-crypto-des3.c<br/>index c2ff551d215b..91482ffcac59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/ccp-crypto-des3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/ccp-crypto-des3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/ccp-crypto-des3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccp/ccp-crypto-des3.c</a></div><div class='hunk'>@@ -43,24 +43,11 @@ static int ccp_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> 	struct ccp_crypto_ablkcipher_alg *alg =</div><div class='ctx'> 		ccp_crypto_ablkcipher_alg(crypto_ablkcipher_tfm(tfm));</div><div class='ctx'> 	u32 *flags = &amp;tfm-&gt;base.crt_flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	/* From des_generic.c:</div><div class='del'>-	 *</div><div class='del'>-	 * RFC2451:</div><div class='del'>-	 *   If the first two or last two independent 64-bit keys are</div><div class='del'>-	 *   equal (k1 == k2 or k2 == k3), then the DES3 operation is simply the</div><div class='del'>-	 *   same as DES.  Implementers MUST reject keys that exhibit this</div><div class='del'>-	 *   property.</div><div class='del'>-	 */</div><div class='del'>-	const u32 *K = (const u32 *)key;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-		     !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &amp;&amp;</div><div class='del'>-		     (*flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = __des3_verify_key(flags, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* It's not clear that there is any support for a keysize of 112.</div><div class='ctx'> 	 * If needed, the caller should make K1 == K3</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-crypto-rsa.c b/drivers/crypto/ccp/ccp-crypto-rsa.c<br/>index 05850dfd7940..a2570c0c8cdc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/ccp-crypto-rsa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/ccp-crypto-rsa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/ccp-crypto-rsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccp/ccp-crypto-rsa.c</a></div><div class='hunk'>@@ -37,10 +37,9 @@ static inline int ccp_copy_and_save_keypart(u8 **kpbuf, unsigned int *kplen,</div><div class='ctx'> 		if (buf[nskip])</div><div class='ctx'> 			break;</div><div class='ctx'> 	*kplen = sz - nskip;</div><div class='del'>-	*kpbuf = kzalloc(*kplen, GFP_KERNEL);</div><div class='add'>+	*kpbuf = kmemdup(buf + nskip, *kplen, GFP_KERNEL);</div><div class='ctx'> 	if (!*kpbuf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memcpy(*kpbuf, buf + nskip, *kplen);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -214,8 +213,6 @@ static void ccp_rsa_exit_tfm(struct crypto_akcipher *tfm)</div><div class='ctx'> static struct akcipher_alg ccp_rsa_defaults = {</div><div class='ctx'> 	.encrypt = ccp_rsa_encrypt,</div><div class='ctx'> 	.decrypt = ccp_rsa_decrypt,</div><div class='del'>-	.sign = ccp_rsa_decrypt,</div><div class='del'>-	.verify = ccp_rsa_encrypt,</div><div class='ctx'> 	.set_pub_key = ccp_rsa_setpubkey,</div><div class='ctx'> 	.set_priv_key = ccp_rsa_setprivkey,</div><div class='ctx'> 	.max_size = ccp_rsa_maxsize,</div><div class='hunk'>@@ -248,7 +245,8 @@ static struct ccp_rsa_def rsa_algs[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int ccp_register_rsa_alg(struct list_head *head, const struct ccp_rsa_def *def)</div><div class='add'>+static int ccp_register_rsa_alg(struct list_head *head,</div><div class='add'>+			        const struct ccp_rsa_def *def)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccp_crypto_akcipher_alg *ccp_alg;</div><div class='ctx'> 	struct akcipher_alg *alg;</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c<br/>index 10a61cd54fce..3e10573f589e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/ccp-crypto-sha.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/ccp-crypto-sha.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/ccp-crypto-sha.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccp/ccp-crypto-sha.c</a></div><div class='hunk'>@@ -293,8 +293,6 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 	if (key_len &gt; block_size) {</div><div class='ctx'> 		/* Must hash the input key */</div><div class='ctx'> 		sdesc-&gt;tfm = shash;</div><div class='del'>-		sdesc-&gt;flags = crypto_ahash_get_flags(tfm) &amp;</div><div class='del'>-			CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 		ret = crypto_shash_digest(sdesc, key, key_len,</div><div class='ctx'> 					  ctx-&gt;u.sha.key);</div><div class='head'>diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c<br/>index fadf859a14b8..656838433f2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/psp-dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccp/psp-dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccp/psp-dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccp/psp-dev.c</a></div><div class='hunk'>@@ -583,6 +583,69 @@ e_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sev_ioctl_do_get_id2(struct sev_issue_cmd *argp)</div><div class='add'>+{</div><div class='add'>+	struct sev_user_data_get_id2 input;</div><div class='add'>+	struct sev_data_get_id *data;</div><div class='add'>+	void *id_blob = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* SEV GET_ID is available from SEV API v0.16 and up */</div><div class='add'>+	if (!SEV_VERSION_GREATER_OR_EQUAL(0, 16))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;input, (void __user *)argp-&gt;data, sizeof(input)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/* Check if we have write access to the userspace buffer */</div><div class='add'>+	if (input.address &amp;&amp;</div><div class='add'>+	    input.length &amp;&amp;</div><div class='add'>+	    !access_ok(input.address, input.length))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (input.address &amp;&amp; input.length) {</div><div class='add'>+		id_blob = kmalloc(input.length, GFP_KERNEL);</div><div class='add'>+		if (!id_blob) {</div><div class='add'>+			kfree(data);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;address = __psp_pa(id_blob);</div><div class='add'>+		data-&gt;len = input.length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __sev_do_cmd_locked(SEV_CMD_GET_ID, data, &amp;argp-&gt;error);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Firmware will return the length of the ID value (either the minimum</div><div class='add'>+	 * required length or the actual length written), return it to the user.</div><div class='add'>+	 */</div><div class='add'>+	input.length = data-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((void __user *)argp-&gt;data, &amp;input, sizeof(input))) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto e_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (id_blob) {</div><div class='add'>+		if (copy_to_user((void __user *)input.address,</div><div class='add'>+				 id_blob, data-&gt;len)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto e_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+e_free:</div><div class='add'>+	kfree(id_blob);</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int sev_ioctl_do_get_id(struct sev_issue_cmd *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct sev_data_get_id *data;</div><div class='hunk'>@@ -761,8 +824,12 @@ static long sev_ioctl(struct file *file, unsigned int ioctl, unsigned long arg)</div><div class='ctx'> 		ret = sev_ioctl_do_pdh_export(&amp;input);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEV_GET_ID:</div><div class='add'>+		pr_warn_once("SEV_GET_ID command is deprecated, use SEV_GET_ID2\n");</div><div class='ctx'> 		ret = sev_ioctl_do_get_id(&amp;input);</div><div class='ctx'> 		break;</div><div class='add'>+	case SEV_GET_ID2:</div><div class='add'>+		ret = sev_ioctl_do_get_id2(&amp;input);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -997,7 +1064,7 @@ void psp_pci_init(void)</div><div class='ctx'> 	rc = sev_platform_init(&amp;error);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(sp-&gt;dev, "SEV: failed to INIT error %#x\n", error);</div><div class='del'>-		goto err;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(sp-&gt;dev, "SEV API:%d.%d build:%d\n", psp_master-&gt;api_major,</div><div class='head'>diff --git a/drivers/crypto/ccree/Makefile b/drivers/crypto/ccree/Makefile<br/>index bdc27970f95f..145e50bdbf16 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# Copyright (C) 2012-2019 ARM Limited (or its affiliates).</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_CCREE) := ccree.o</div><div class='ctx'> ccree-y := cc_driver.o cc_buffer_mgr.o cc_request_mgr.o cc_cipher.o cc_hash.o cc_aead.o cc_ivgen.o cc_sram_mgr.o</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_aead.c b/drivers/crypto/ccree/cc_aead.c<br/>index a3527c00b29a..7aa4cbe19a86 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_aead.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_aead.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_aead.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_aead.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</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'>@@ -23,12 +23,8 @@</div><div class='ctx'> #define MAX_HMAC_DIGEST_SIZE (SHA256_DIGEST_SIZE)</div><div class='ctx'> #define MAX_HMAC_BLOCK_SIZE (SHA256_BLOCK_SIZE)</div><div class='ctx'> </div><div class='del'>-#define AES_CCM_RFC4309_NONCE_SIZE 3</div><div class='ctx'> #define MAX_NONCE_SIZE CTR_RFC3686_NONCE_SIZE</div><div class='ctx'> </div><div class='del'>-/* Value of each ICV_CMP byte (of 8) in case of success */</div><div class='del'>-#define ICV_VERIF_OK 0x01</div><div class='del'>-</div><div class='ctx'> struct cc_aead_handle {</div><div class='ctx'> 	cc_sram_addr_t sram_workspace_addr;</div><div class='ctx'> 	struct list_head aead_list;</div><div class='hunk'>@@ -220,6 +216,10 @@ static void cc_aead_complete(struct device *dev, void *cc_req, int err)</div><div class='ctx'> 	struct crypto_aead *tfm = crypto_aead_reqtfm(cc_req);</div><div class='ctx'> 	struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='ctx'> </div><div class='add'>+	/* BACKLOG notification */</div><div class='add'>+	if (err == -EINPROGRESS)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='ctx'> 	cc_unmap_aead_request(dev, areq);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore ordinary iv pointer */</div><div class='hunk'>@@ -424,7 +424,7 @@ static int validate_keys_sizes(struct cc_aead_ctx *ctx)</div><div class='ctx'> /* This function prepers the user key so it can pass to the hmac processing</div><div class='ctx'>  * (copy to intenral buffer or hash in case of key longer than block</div><div class='ctx'>  */</div><div class='del'>-static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key,</div><div class='add'>+static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *authkey,</div><div class='ctx'> 				 unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t key_dma_addr = 0;</div><div class='hunk'>@@ -437,6 +437,7 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key,</div><div class='ctx'> 	unsigned int hashmode;</div><div class='ctx'> 	unsigned int idx = 0;</div><div class='ctx'> 	int rc = 0;</div><div class='add'>+	u8 *key = NULL;</div><div class='ctx'> 	struct cc_hw_desc desc[MAX_AEAD_SETKEY_SEQ];</div><div class='ctx'> 	dma_addr_t padded_authkey_dma_addr =</div><div class='ctx'> 		ctx-&gt;auth_state.hmac.padded_authkey_dma_addr;</div><div class='hunk'>@@ -455,11 +456,17 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (keylen != 0) {</div><div class='add'>+</div><div class='add'>+		key = kmemdup(authkey, keylen, GFP_KERNEL);</div><div class='add'>+		if (!key)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 		key_dma_addr = dma_map_single(dev, (void *)key, keylen,</div><div class='ctx'> 					      DMA_TO_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(dev, key_dma_addr)) {</div><div class='ctx'> 			dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n",</div><div class='ctx'> 				key, keylen);</div><div class='add'>+			kzfree(key);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (keylen &gt; blocksize) {</div><div class='hunk'>@@ -542,6 +549,8 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key,</div><div class='ctx'> 	if (key_dma_addr)</div><div class='ctx'> 		dma_unmap_single(dev, key_dma_addr, keylen, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='add'>+	kzfree(key);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -650,6 +659,39 @@ setkey_error:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cc_des3_aead_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+			       unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_authenc_extractkeys(&amp;keys, key, keylen);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (keys.enckeylen != DES3_EDE_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	flags = crypto_aead_get_flags(aead);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_aead_set_flags(aead, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cc_aead_setkey(aead, key, keylen);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cc_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key,</div><div class='ctx'> 				 unsigned int keylen)</div><div class='ctx'> {</div><div class='hunk'>@@ -731,7 +773,7 @@ static void cc_set_assoc_desc(struct aead_request *areq, unsigned int flow_mode,</div><div class='ctx'> 		dev_dbg(dev, "ASSOC buffer type DLLI\n");</div><div class='ctx'> 		hw_desc_init(&amp;desc[idx]);</div><div class='ctx'> 		set_din_type(&amp;desc[idx], DMA_DLLI, sg_dma_address(areq-&gt;src),</div><div class='del'>-			     areq-&gt;assoclen, NS_BIT);</div><div class='add'>+			     areq_ctx-&gt;assoclen, NS_BIT);</div><div class='ctx'> 		set_flow_mode(&amp;desc[idx], flow_mode);</div><div class='ctx'> 		if (ctx-&gt;auth_mode == DRV_HASH_XCBC_MAC &amp;&amp;</div><div class='ctx'> 		    areq_ctx-&gt;cryptlen &gt; 0)</div><div class='hunk'>@@ -1080,9 +1122,11 @@ static void cc_proc_header_desc(struct aead_request *req,</div><div class='ctx'> 				struct cc_hw_desc desc[],</div><div class='ctx'> 				unsigned int *seq_size)</div><div class='ctx'> {</div><div class='add'>+	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	unsigned int idx = *seq_size;</div><div class='add'>+</div><div class='ctx'> 	/* Hash associated data */</div><div class='del'>-	if (req-&gt;assoclen &gt; 0)</div><div class='add'>+	if (areq_ctx-&gt;assoclen &gt; 0)</div><div class='ctx'> 		cc_set_assoc_desc(req, DIN_HASH, desc, &amp;idx);</div><div class='ctx'> </div><div class='ctx'> 	/* Hash IV */</div><div class='hunk'>@@ -1159,9 +1203,9 @@ static void cc_mlli_to_sram(struct aead_request *req,</div><div class='ctx'> 	struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(ctx-&gt;drvdata);</div><div class='ctx'> </div><div class='del'>-	if (req_ctx-&gt;assoc_buff_type == CC_DMA_BUF_MLLI ||</div><div class='add'>+	if ((req_ctx-&gt;assoc_buff_type == CC_DMA_BUF_MLLI ||</div><div class='ctx'> 	    req_ctx-&gt;data_buff_type == CC_DMA_BUF_MLLI ||</div><div class='del'>-	    !req_ctx-&gt;is_single_pass) {</div><div class='add'>+	    !req_ctx-&gt;is_single_pass) &amp;&amp; req_ctx-&gt;mlli_params.mlli_len) {</div><div class='ctx'> 		dev_dbg(dev, "Copy-to-sram: mlli_dma=%08x, mlli_size=%u\n",</div><div class='ctx'> 			(unsigned int)ctx-&gt;drvdata-&gt;mlli_sram_addr,</div><div class='ctx'> 			req_ctx-&gt;mlli_params.mlli_len);</div><div class='hunk'>@@ -1310,7 +1354,7 @@ static int validate_data_size(struct cc_aead_ctx *ctx,</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(ctx-&gt;drvdata);</div><div class='del'>-	unsigned int assoclen = req-&gt;assoclen;</div><div class='add'>+	unsigned int assoclen = areq_ctx-&gt;assoclen;</div><div class='ctx'> 	unsigned int cipherlen = (direct == DRV_CRYPTO_DIRECTION_DECRYPT) ?</div><div class='ctx'> 			(req-&gt;cryptlen - ctx-&gt;authsize) : req-&gt;cryptlen;</div><div class='ctx'> </div><div class='hunk'>@@ -1469,7 +1513,7 @@ static int cc_ccm(struct aead_request *req, struct cc_hw_desc desc[],</div><div class='ctx'> 	idx++;</div><div class='ctx'> </div><div class='ctx'> 	/* process assoc data */</div><div class='del'>-	if (req-&gt;assoclen &gt; 0) {</div><div class='add'>+	if (req_ctx-&gt;assoclen &gt; 0) {</div><div class='ctx'> 		cc_set_assoc_desc(req, DIN_HASH, desc, &amp;idx);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hw_desc_init(&amp;desc[idx]);</div><div class='hunk'>@@ -1561,7 +1605,7 @@ static int config_ccm_adata(struct aead_request *req)</div><div class='ctx'> 	 * NIST Special Publication 800-38C</div><div class='ctx'> 	 */</div><div class='ctx'> 	*b0 |= (8 * ((m - 2) / 2));</div><div class='del'>-	if (req-&gt;assoclen &gt; 0)</div><div class='add'>+	if (req_ctx-&gt;assoclen &gt; 0)</div><div class='ctx'> 		*b0 |= 64;  /* Enable bit 6 if Adata exists. */</div><div class='ctx'> </div><div class='ctx'> 	rc = set_msg_len(b0 + 16 - l, cryptlen, l);  /* Write L'. */</div><div class='hunk'>@@ -1572,7 +1616,7 @@ static int config_ccm_adata(struct aead_request *req)</div><div class='ctx'> 	 /* END of "taken from crypto/ccm.c" */</div><div class='ctx'> </div><div class='ctx'> 	/* l(a) - size of associated data. */</div><div class='del'>-	req_ctx-&gt;ccm_hdr_size = format_ccm_a0(a0, req-&gt;assoclen);</div><div class='add'>+	req_ctx-&gt;ccm_hdr_size = format_ccm_a0(a0, req_ctx-&gt;assoclen);</div><div class='ctx'> </div><div class='ctx'> 	memset(req-&gt;iv + 15 - req-&gt;iv[0], 0, req-&gt;iv[0] + 1);</div><div class='ctx'> 	req-&gt;iv[15] = 1;</div><div class='hunk'>@@ -1604,7 +1648,7 @@ static void cc_proc_rfc4309_ccm(struct aead_request *req)</div><div class='ctx'> 	memcpy(areq_ctx-&gt;ctr_iv + CCM_BLOCK_IV_OFFSET, req-&gt;iv,</div><div class='ctx'> 	       CCM_BLOCK_IV_SIZE);</div><div class='ctx'> 	req-&gt;iv = areq_ctx-&gt;ctr_iv;</div><div class='del'>-	req-&gt;assoclen -= CCM_BLOCK_IV_SIZE;</div><div class='add'>+	areq_ctx-&gt;assoclen -= CCM_BLOCK_IV_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cc_set_ghash_desc(struct aead_request *req,</div><div class='hunk'>@@ -1812,7 +1856,7 @@ static int cc_gcm(struct aead_request *req, struct cc_hw_desc desc[],</div><div class='ctx'> 	// for gcm and rfc4106.</div><div class='ctx'> 	cc_set_ghash_desc(req, desc, seq_size);</div><div class='ctx'> 	/* process(ghash) assoc data */</div><div class='del'>-	if (req-&gt;assoclen &gt; 0)</div><div class='add'>+	if (req_ctx-&gt;assoclen &gt; 0)</div><div class='ctx'> 		cc_set_assoc_desc(req, DIN_HASH, desc, seq_size);</div><div class='ctx'> 	cc_set_gctr_desc(req, desc, seq_size);</div><div class='ctx'> 	/* process(gctr+ghash) */</div><div class='hunk'>@@ -1836,8 +1880,8 @@ static int config_gcm_context(struct aead_request *req)</div><div class='ctx'> 				(req-&gt;cryptlen - ctx-&gt;authsize);</div><div class='ctx'> 	__be32 counter = cpu_to_be32(2);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s() cryptlen = %d, req-&gt;assoclen = %d ctx-&gt;authsize = %d\n",</div><div class='del'>-		__func__, cryptlen, req-&gt;assoclen, ctx-&gt;authsize);</div><div class='add'>+	dev_dbg(dev, "%s() cryptlen = %d, req_ctx-&gt;assoclen = %d ctx-&gt;authsize = %d\n",</div><div class='add'>+		__func__, cryptlen, req_ctx-&gt;assoclen, ctx-&gt;authsize);</div><div class='ctx'> </div><div class='ctx'> 	memset(req_ctx-&gt;hkey, 0, AES_BLOCK_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -1853,7 +1897,7 @@ static int config_gcm_context(struct aead_request *req)</div><div class='ctx'> 	if (!req_ctx-&gt;plaintext_authenticate_only) {</div><div class='ctx'> 		__be64 temp64;</div><div class='ctx'> </div><div class='del'>-		temp64 = cpu_to_be64(req-&gt;assoclen * 8);</div><div class='add'>+		temp64 = cpu_to_be64(req_ctx-&gt;assoclen * 8);</div><div class='ctx'> 		memcpy(&amp;req_ctx-&gt;gcm_len_block.len_a, &amp;temp64, sizeof(temp64));</div><div class='ctx'> 		temp64 = cpu_to_be64(cryptlen * 8);</div><div class='ctx'> 		memcpy(&amp;req_ctx-&gt;gcm_len_block.len_c, &amp;temp64, 8);</div><div class='hunk'>@@ -1863,8 +1907,8 @@ static int config_gcm_context(struct aead_request *req)</div><div class='ctx'> 		 */</div><div class='ctx'> 		__be64 temp64;</div><div class='ctx'> </div><div class='del'>-		temp64 = cpu_to_be64((req-&gt;assoclen + GCM_BLOCK_RFC4_IV_SIZE +</div><div class='del'>-				      cryptlen) * 8);</div><div class='add'>+		temp64 = cpu_to_be64((req_ctx-&gt;assoclen +</div><div class='add'>+				      GCM_BLOCK_RFC4_IV_SIZE + cryptlen) * 8);</div><div class='ctx'> 		memcpy(&amp;req_ctx-&gt;gcm_len_block.len_a, &amp;temp64, sizeof(temp64));</div><div class='ctx'> 		temp64 = 0;</div><div class='ctx'> 		memcpy(&amp;req_ctx-&gt;gcm_len_block.len_c, &amp;temp64, 8);</div><div class='hunk'>@@ -1884,7 +1928,7 @@ static void cc_proc_rfc4_gcm(struct aead_request *req)</div><div class='ctx'> 	memcpy(areq_ctx-&gt;ctr_iv + GCM_BLOCK_RFC4_IV_OFFSET, req-&gt;iv,</div><div class='ctx'> 	       GCM_BLOCK_RFC4_IV_SIZE);</div><div class='ctx'> 	req-&gt;iv = areq_ctx-&gt;ctr_iv;</div><div class='del'>-	req-&gt;assoclen -= GCM_BLOCK_RFC4_IV_SIZE;</div><div class='add'>+	areq_ctx-&gt;assoclen -= GCM_BLOCK_RFC4_IV_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cc_proc_aead(struct aead_request *req,</div><div class='hunk'>@@ -1909,7 +1953,7 @@ static int cc_proc_aead(struct aead_request *req,</div><div class='ctx'> 	/* Check data length according to mode */</div><div class='ctx'> 	if (validate_data_size(ctx, direct, req)) {</div><div class='ctx'> 		dev_err(dev, "Unsupported crypt/assoc len %d/%d.\n",</div><div class='del'>-			req-&gt;cryptlen, req-&gt;assoclen);</div><div class='add'>+			req-&gt;cryptlen, areq_ctx-&gt;assoclen);</div><div class='ctx'> 		crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_BLOCK_LEN);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2058,8 +2102,11 @@ static int cc_aead_encrypt(struct aead_request *req)</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> 	areq_ctx-&gt;is_gcm4543 = false;</div><div class='ctx'> </div><div class='hunk'>@@ -2087,8 +2134,11 @@ static int cc_rfc4309_ccm_encrypt(struct aead_request *req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> 	areq_ctx-&gt;is_gcm4543 = true;</div><div class='ctx'> </div><div class='hunk'>@@ -2106,8 +2156,11 @@ static int cc_aead_decrypt(struct aead_request *req)</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> 	areq_ctx-&gt;is_gcm4543 = false;</div><div class='ctx'> </div><div class='hunk'>@@ -2133,8 +2186,11 @@ static int cc_rfc4309_ccm_decrypt(struct aead_request *req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	areq_ctx-&gt;is_gcm4543 = true;</div><div class='hunk'>@@ -2250,8 +2306,11 @@ static int cc_rfc4106_gcm_encrypt(struct aead_request *req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	areq_ctx-&gt;plaintext_authenticate_only = false;</div><div class='hunk'>@@ -2273,11 +2332,14 @@ static int cc_rfc4543_gcm_encrypt(struct aead_request *req)</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	//plaintext is not encryped with rfc4543</div><div class='ctx'> 	areq_ctx-&gt;plaintext_authenticate_only = true;</div><div class='ctx'> </div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	cc_proc_rfc4_gcm(req);</div><div class='hunk'>@@ -2305,8 +2367,11 @@ static int cc_rfc4106_gcm_decrypt(struct aead_request *req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	areq_ctx-&gt;plaintext_authenticate_only = false;</div><div class='hunk'>@@ -2328,11 +2393,14 @@ static int cc_rfc4543_gcm_decrypt(struct aead_request *req)</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	memset(areq_ctx, 0, sizeof(*areq_ctx));</div><div class='add'>+</div><div class='ctx'> 	//plaintext is not decryped with rfc4543</div><div class='ctx'> 	areq_ctx-&gt;plaintext_authenticate_only = true;</div><div class='ctx'> </div><div class='ctx'> 	/* No generated IV required */</div><div class='ctx'> 	areq_ctx-&gt;backup_iv = req-&gt;iv;</div><div class='add'>+	areq_ctx-&gt;assoclen = req-&gt;assoclen;</div><div class='ctx'> 	areq_ctx-&gt;backup_giv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	cc_proc_rfc4_gcm(req);</div><div class='hunk'>@@ -2372,7 +2440,7 @@ static struct cc_alg_template aead_algs[] = {</div><div class='ctx'> 		.driver_name = "authenc-hmac-sha1-cbc-des3-ccree",</div><div class='ctx'> 		.blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 		.template_aead = {</div><div class='del'>-			.setkey = cc_aead_setkey,</div><div class='add'>+			.setkey = cc_des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = cc_aead_setauthsize,</div><div class='ctx'> 			.encrypt = cc_aead_encrypt,</div><div class='ctx'> 			.decrypt = cc_aead_decrypt,</div><div class='hunk'>@@ -2412,7 +2480,7 @@ static struct cc_alg_template aead_algs[] = {</div><div class='ctx'> 		.driver_name = "authenc-hmac-sha256-cbc-des3-ccree",</div><div class='ctx'> 		.blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 		.template_aead = {</div><div class='del'>-			.setkey = cc_aead_setkey,</div><div class='add'>+			.setkey = cc_des3_aead_setkey,</div><div class='ctx'> 			.setauthsize = cc_aead_setauthsize,</div><div class='ctx'> 			.encrypt = cc_aead_encrypt,</div><div class='ctx'> 			.decrypt = cc_aead_decrypt,</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_aead.h b/drivers/crypto/ccree/cc_aead.h<br/>index 5edf3b351fa4..e51724b96c56 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_aead.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_aead.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_aead.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_aead.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_aead.h</div><div class='ctx'>  * ARM CryptoCell AEAD Crypto API</div><div class='hunk'>@@ -67,6 +67,7 @@ struct aead_req_ctx {</div><div class='ctx'> 	u8 backup_mac[MAX_MAC_SIZE];</div><div class='ctx'> 	u8 *backup_iv; /*store iv for generated IV flow*/</div><div class='ctx'> 	u8 *backup_giv; /*store iv for rfc3686(ctr) flow*/</div><div class='add'>+	u32 assoclen; /* internal assoclen */</div><div class='ctx'> 	dma_addr_t mac_buf_dma_addr; /* internal ICV DMA buffer */</div><div class='ctx'> 	/* buffer for internal ccm configurations */</div><div class='ctx'> 	dma_addr_t ccm_iv0_dma_addr;</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c<br/>index 0ee1c52da0a4..c81ad33f9115 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_buffer_mgr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_buffer_mgr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_buffer_mgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_buffer_mgr.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/authenc.h&gt;</div><div class='hunk'>@@ -65,7 +65,7 @@ static void cc_copy_mac(struct device *dev, struct aead_request *req,</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='del'>-	u32 skip = req-&gt;assoclen + req-&gt;cryptlen;</div><div class='add'>+	u32 skip = areq_ctx-&gt;assoclen + req-&gt;cryptlen;</div><div class='ctx'> </div><div class='ctx'> 	if (areq_ctx-&gt;is_gcm4543)</div><div class='ctx'> 		skip += crypto_aead_ivsize(tfm);</div><div class='hunk'>@@ -83,24 +83,17 @@ static void cc_copy_mac(struct device *dev, struct aead_request *req,</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int cc_get_sgl_nents(struct device *dev,</div><div class='ctx'> 				     struct scatterlist *sg_list,</div><div class='del'>-				     unsigned int nbytes, u32 *lbytes,</div><div class='del'>-				     bool *is_chained)</div><div class='add'>+				     unsigned int nbytes, u32 *lbytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int nents = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (nbytes &amp;&amp; sg_list) {</div><div class='del'>-		if (sg_list-&gt;length) {</div><div class='del'>-			nents++;</div><div class='del'>-			/* get the number of bytes in the last entry */</div><div class='del'>-			*lbytes = nbytes;</div><div class='del'>-			nbytes -= (sg_list-&gt;length &gt; nbytes) ?</div><div class='del'>-					nbytes : sg_list-&gt;length;</div><div class='del'>-			sg_list = sg_next(sg_list);</div><div class='del'>-		} else {</div><div class='del'>-			sg_list = (struct scatterlist *)sg_page(sg_list);</div><div class='del'>-			if (is_chained)</div><div class='del'>-				*is_chained = true;</div><div class='del'>-		}</div><div class='add'>+		nents++;</div><div class='add'>+		/* get the number of bytes in the last entry */</div><div class='add'>+		*lbytes = nbytes;</div><div class='add'>+		nbytes -= (sg_list-&gt;length &gt; nbytes) ?</div><div class='add'>+				nbytes : sg_list-&gt;length;</div><div class='add'>+		sg_list = sg_next(sg_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(dev, "nents %d last bytes %d\n", nents, *lbytes);</div><div class='ctx'> 	return nents;</div><div class='hunk'>@@ -140,9 +133,9 @@ void cc_zero_sgl(struct scatterlist *sgl, u32 data_len)</div><div class='ctx'> void cc_copy_sg_portion(struct device *dev, u8 *dest, struct scatterlist *sg,</div><div class='ctx'> 			u32 to_skip, u32 end, enum cc_sg_cpy_direct direct)</div><div class='ctx'> {</div><div class='del'>-	u32 nents, lbytes;</div><div class='add'>+	u32 nents;</div><div class='ctx'> </div><div class='del'>-	nents = cc_get_sgl_nents(dev, sg, end, &amp;lbytes, NULL);</div><div class='add'>+	nents = sg_nents_for_len(sg, end);</div><div class='ctx'> 	sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip + 1), to_skip,</div><div class='ctx'> 		       (direct == CC_SG_TO_BUF));</div><div class='ctx'> }</div><div class='hunk'>@@ -314,40 +307,10 @@ static void cc_add_sg_entry(struct device *dev, struct buffer_array *sgl_data,</div><div class='ctx'> 	sgl_data-&gt;num_of_buffers++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cc_dma_map_sg(struct device *dev, struct scatterlist *sg, u32 nents,</div><div class='del'>-			 enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	u32 i, j;</div><div class='del'>-	struct scatterlist *l_sg = sg;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nents; i++) {</div><div class='del'>-		if (!l_sg)</div><div class='del'>-			break;</div><div class='del'>-		if (dma_map_sg(dev, l_sg, 1, direction) != 1) {</div><div class='del'>-			dev_err(dev, "dma_map_page() sg buffer failed\n");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-		l_sg = sg_next(l_sg);</div><div class='del'>-	}</div><div class='del'>-	return nents;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	/* Restore mapped parts */</div><div class='del'>-	for (j = 0; j &lt; i; j++) {</div><div class='del'>-		if (!sg)</div><div class='del'>-			break;</div><div class='del'>-		dma_unmap_sg(dev, sg, 1, direction);</div><div class='del'>-		sg = sg_next(sg);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cc_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		     unsigned int nbytes, int direction, u32 *nents,</div><div class='ctx'> 		     u32 max_sg_nents, u32 *lbytes, u32 *mapped_nents)</div><div class='ctx'> {</div><div class='del'>-	bool is_chained = false;</div><div class='del'>-</div><div class='ctx'> 	if (sg_is_last(sg)) {</div><div class='ctx'> 		/* One entry only case -set to DLLI */</div><div class='ctx'> 		if (dma_map_sg(dev, sg, 1, direction) != 1) {</div><div class='hunk'>@@ -361,35 +324,21 @@ static int cc_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		*nents = 1;</div><div class='ctx'> 		*mapped_nents = 1;</div><div class='ctx'> 	} else {  /*sg_is_last*/</div><div class='del'>-		*nents = cc_get_sgl_nents(dev, sg, nbytes, lbytes,</div><div class='del'>-					  &amp;is_chained);</div><div class='add'>+		*nents = cc_get_sgl_nents(dev, sg, nbytes, lbytes);</div><div class='ctx'> 		if (*nents &gt; max_sg_nents) {</div><div class='ctx'> 			*nents = 0;</div><div class='ctx'> 			dev_err(dev, "Too many fragments. current %d max %d\n",</div><div class='ctx'> 				*nents, max_sg_nents);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		if (!is_chained) {</div><div class='del'>-			/* In case of mmu the number of mapped nents might</div><div class='del'>-			 * be changed from the original sgl nents</div><div class='del'>-			 */</div><div class='del'>-			*mapped_nents = dma_map_sg(dev, sg, *nents, direction);</div><div class='del'>-			if (*mapped_nents == 0) {</div><div class='del'>-				*nents = 0;</div><div class='del'>-				dev_err(dev, "dma_map_sg() sg buffer failed\n");</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/*In this case the driver maps entry by entry so it</div><div class='del'>-			 * must have the same nents before and after map</div><div class='del'>-			 */</div><div class='del'>-			*mapped_nents = cc_dma_map_sg(dev, sg, *nents,</div><div class='del'>-						      direction);</div><div class='del'>-			if (*mapped_nents != *nents) {</div><div class='del'>-				*nents = *mapped_nents;</div><div class='del'>-				dev_err(dev, "dma_map_sg() sg buffer failed\n");</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='add'>+		/* In case of mmu the number of mapped nents might</div><div class='add'>+		 * be changed from the original sgl nents</div><div class='add'>+		 */</div><div class='add'>+		*mapped_nents = dma_map_sg(dev, sg, *nents, direction);</div><div class='add'>+		if (*mapped_nents == 0) {</div><div class='add'>+			*nents = 0;</div><div class='add'>+			dev_err(dev, "dma_map_sg() sg buffer failed\n");</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -457,7 +406,7 @@ void cc_unmap_cipher_request(struct device *dev, void *ctx,</div><div class='ctx'> 		dev_dbg(dev, "Unmapped iv: iv_dma_addr=%pad iv_size=%u\n",</div><div class='ctx'> 			&amp;req_ctx-&gt;gen_ctx.iv_dma_addr, ivsize);</div><div class='ctx'> 		dma_unmap_single(dev, req_ctx-&gt;gen_ctx.iv_dma_addr,</div><div class='del'>-				 ivsize, DMA_TO_DEVICE);</div><div class='add'>+				 ivsize, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Release pool */</div><div class='ctx'> 	if (req_ctx-&gt;dma_buf_type == CC_DMA_BUF_MLLI &amp;&amp;</div><div class='hunk'>@@ -499,7 +448,7 @@ int cc_map_cipher_request(struct cc_drvdata *drvdata, void *ctx,</div><div class='ctx'> 		dump_byte_array("iv", (u8 *)info, ivsize);</div><div class='ctx'> 		req_ctx-&gt;gen_ctx.iv_dma_addr =</div><div class='ctx'> 			dma_map_single(dev, (void *)info,</div><div class='del'>-				       ivsize, DMA_TO_DEVICE);</div><div class='add'>+				       ivsize, DMA_BIDIRECTIONAL);</div><div class='ctx'> 		if (dma_mapping_error(dev, req_ctx-&gt;gen_ctx.iv_dma_addr)) {</div><div class='ctx'> 			dev_err(dev, "Mapping iv %u B at va=%pK for DMA failed\n",</div><div class='ctx'> 				ivsize, info);</div><div class='hunk'>@@ -568,11 +517,7 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	unsigned int hw_iv_size = areq_ctx-&gt;hw_iv_size;</div><div class='del'>-	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='ctx'> 	struct cc_drvdata *drvdata = dev_get_drvdata(dev);</div><div class='del'>-	u32 dummy;</div><div class='del'>-	bool chained;</div><div class='del'>-	u32 size_to_unmap = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (areq_ctx-&gt;mac_buf_dma_addr) {</div><div class='ctx'> 		dma_unmap_single(dev, areq_ctx-&gt;mac_buf_dma_addr,</div><div class='hunk'>@@ -612,6 +557,7 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req)</div><div class='ctx'> 	if (areq_ctx-&gt;gen_ctx.iv_dma_addr) {</div><div class='ctx'> 		dma_unmap_single(dev, areq_ctx-&gt;gen_ctx.iv_dma_addr,</div><div class='ctx'> 				 hw_iv_size, DMA_BIDIRECTIONAL);</div><div class='add'>+		kzfree(areq_ctx-&gt;gen_ctx.iv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Release pool */</div><div class='hunk'>@@ -628,23 +574,13 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "Unmapping src sgl: req-&gt;src=%pK areq_ctx-&gt;src.nents=%u areq_ctx-&gt;assoc.nents=%u assoclen:%u cryptlen=%u\n",</div><div class='ctx'> 		sg_virt(req-&gt;src), areq_ctx-&gt;src.nents, areq_ctx-&gt;assoc.nents,</div><div class='del'>-		req-&gt;assoclen, req-&gt;cryptlen);</div><div class='del'>-	size_to_unmap = req-&gt;assoclen + req-&gt;cryptlen;</div><div class='del'>-	if (areq_ctx-&gt;gen_ctx.op_type == DRV_CRYPTO_DIRECTION_ENCRYPT)</div><div class='del'>-		size_to_unmap += areq_ctx-&gt;req_authsize;</div><div class='del'>-	if (areq_ctx-&gt;is_gcm4543)</div><div class='del'>-		size_to_unmap += crypto_aead_ivsize(tfm);</div><div class='add'>+		areq_ctx-&gt;assoclen, req-&gt;cryptlen);</div><div class='ctx'> </div><div class='del'>-	dma_unmap_sg(dev, req-&gt;src,</div><div class='del'>-		     cc_get_sgl_nents(dev, req-&gt;src, size_to_unmap,</div><div class='del'>-				      &amp;dummy, &amp;chained),</div><div class='del'>-		     DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_unmap_sg(dev, req-&gt;src, sg_nents(req-&gt;src), DMA_BIDIRECTIONAL);</div><div class='ctx'> 	if (req-&gt;src != req-&gt;dst) {</div><div class='ctx'> 		dev_dbg(dev, "Unmapping dst sgl: req-&gt;dst=%pK\n",</div><div class='ctx'> 			sg_virt(req-&gt;dst));</div><div class='del'>-		dma_unmap_sg(dev, req-&gt;dst,</div><div class='del'>-			     cc_get_sgl_nents(dev, req-&gt;dst, size_to_unmap,</div><div class='del'>-					      &amp;dummy, &amp;chained),</div><div class='add'>+		dma_unmap_sg(dev, req-&gt;dst, sg_nents(req-&gt;dst),</div><div class='ctx'> 			     DMA_BIDIRECTIONAL);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (drvdata-&gt;coherent &amp;&amp;</div><div class='hunk'>@@ -658,55 +594,10 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cc_get_aead_icv_nents(struct device *dev, struct scatterlist *sgl,</div><div class='del'>-				 unsigned int sgl_nents, unsigned int authsize,</div><div class='del'>-				 u32 last_entry_data_size,</div><div class='del'>-				 bool *is_icv_fragmented)</div><div class='add'>+static bool cc_is_icv_frag(unsigned int sgl_nents, unsigned int authsize,</div><div class='add'>+			   u32 last_entry_data_size)</div><div class='ctx'> {</div><div class='del'>-	unsigned int icv_max_size = 0;</div><div class='del'>-	unsigned int icv_required_size = authsize &gt; last_entry_data_size ?</div><div class='del'>-					(authsize - last_entry_data_size) :</div><div class='del'>-					authsize;</div><div class='del'>-	unsigned int nents;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (sgl_nents &lt; MAX_ICV_NENTS_SUPPORTED) {</div><div class='del'>-		*is_icv_fragmented = false;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0 ; i &lt; (sgl_nents - MAX_ICV_NENTS_SUPPORTED) ; i++) {</div><div class='del'>-		if (!sgl)</div><div class='del'>-			break;</div><div class='del'>-		sgl = sg_next(sgl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sgl)</div><div class='del'>-		icv_max_size = sgl-&gt;length;</div><div class='del'>-</div><div class='del'>-	if (last_entry_data_size &gt; authsize) {</div><div class='del'>-		/* ICV attached to data in last entry (not fragmented!) */</div><div class='del'>-		nents = 0;</div><div class='del'>-		*is_icv_fragmented = false;</div><div class='del'>-	} else if (last_entry_data_size == authsize) {</div><div class='del'>-		/* ICV placed in whole last entry (not fragmented!) */</div><div class='del'>-		nents = 1;</div><div class='del'>-		*is_icv_fragmented = false;</div><div class='del'>-	} else if (icv_max_size &gt; icv_required_size) {</div><div class='del'>-		nents = 1;</div><div class='del'>-		*is_icv_fragmented = true;</div><div class='del'>-	} else if (icv_max_size == icv_required_size) {</div><div class='del'>-		nents = 2;</div><div class='del'>-		*is_icv_fragmented = true;</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(dev, "Unsupported num. of ICV fragments (&gt; %d)\n",</div><div class='del'>-			MAX_ICV_NENTS_SUPPORTED);</div><div class='del'>-		nents = -1; /*unsupported*/</div><div class='del'>-	}</div><div class='del'>-	dev_dbg(dev, "is_frag=%s icv_nents=%u\n",</div><div class='del'>-		(*is_icv_fragmented ? "true" : "false"), nents);</div><div class='del'>-</div><div class='del'>-	return nents;</div><div class='add'>+	return ((sgl_nents &gt; 1) &amp;&amp; (last_entry_data_size &lt; authsize));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cc_aead_chain_iv(struct cc_drvdata *drvdata,</div><div class='hunk'>@@ -717,19 +608,27 @@ static int cc_aead_chain_iv(struct cc_drvdata *drvdata,</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	unsigned int hw_iv_size = areq_ctx-&gt;hw_iv_size;</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(drvdata);</div><div class='add'>+	gfp_t flags = cc_gfp_flags(&amp;req-&gt;base);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!req-&gt;iv) {</div><div class='ctx'> 		areq_ctx-&gt;gen_ctx.iv_dma_addr = 0;</div><div class='add'>+		areq_ctx-&gt;gen_ctx.iv = NULL;</div><div class='ctx'> 		goto chain_iv_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	areq_ctx-&gt;gen_ctx.iv_dma_addr = dma_map_single(dev, req-&gt;iv,</div><div class='del'>-						       hw_iv_size,</div><div class='del'>-						       DMA_BIDIRECTIONAL);</div><div class='add'>+	areq_ctx-&gt;gen_ctx.iv = kmemdup(req-&gt;iv, hw_iv_size, flags);</div><div class='add'>+	if (!areq_ctx-&gt;gen_ctx.iv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	areq_ctx-&gt;gen_ctx.iv_dma_addr =</div><div class='add'>+		dma_map_single(dev, areq_ctx-&gt;gen_ctx.iv, hw_iv_size,</div><div class='add'>+			       DMA_BIDIRECTIONAL);</div><div class='ctx'> 	if (dma_mapping_error(dev, areq_ctx-&gt;gen_ctx.iv_dma_addr)) {</div><div class='ctx'> 		dev_err(dev, "Mapping iv %u B at va=%pK for DMA failed\n",</div><div class='ctx'> 			hw_iv_size, req-&gt;iv);</div><div class='add'>+		kzfree(areq_ctx-&gt;gen_ctx.iv);</div><div class='add'>+		areq_ctx-&gt;gen_ctx.iv = NULL;</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto chain_iv_exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -760,11 +659,9 @@ static int cc_aead_chain_assoc(struct cc_drvdata *drvdata,</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	int rc = 0;</div><div class='del'>-	u32 mapped_nents = 0;</div><div class='del'>-	struct scatterlist *current_sg = req-&gt;src;</div><div class='add'>+	int mapped_nents = 0;</div><div class='ctx'> 	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='del'>-	unsigned int sg_index = 0;</div><div class='del'>-	u32 size_of_assoc = req-&gt;assoclen;</div><div class='add'>+	unsigned int size_of_assoc = areq_ctx-&gt;assoclen;</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(drvdata);</div><div class='ctx'> </div><div class='ctx'> 	if (areq_ctx-&gt;is_gcm4543)</div><div class='hunk'>@@ -775,7 +672,7 @@ static int cc_aead_chain_assoc(struct cc_drvdata *drvdata,</div><div class='ctx'> 		goto chain_assoc_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;assoclen == 0) {</div><div class='add'>+	if (areq_ctx-&gt;assoclen == 0) {</div><div class='ctx'> 		areq_ctx-&gt;assoc_buff_type = CC_DMA_BUF_NULL;</div><div class='ctx'> 		areq_ctx-&gt;assoc.nents = 0;</div><div class='ctx'> 		areq_ctx-&gt;assoc.mlli_nents = 0;</div><div class='hunk'>@@ -785,26 +682,10 @@ static int cc_aead_chain_assoc(struct cc_drvdata *drvdata,</div><div class='ctx'> 		goto chain_assoc_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	//iterate over the sgl to see how many entries are for associated data</div><div class='del'>-	//it is assumed that if we reach here , the sgl is already mapped</div><div class='del'>-	sg_index = current_sg-&gt;length;</div><div class='del'>-	//the first entry in the scatter list contains all the associated data</div><div class='del'>-	if (sg_index &gt; size_of_assoc) {</div><div class='del'>-		mapped_nents++;</div><div class='del'>-	} else {</div><div class='del'>-		while (sg_index &lt;= size_of_assoc) {</div><div class='del'>-			current_sg = sg_next(current_sg);</div><div class='del'>-			/* if have reached the end of the sgl, then this is</div><div class='del'>-			 * unexpected</div><div class='del'>-			 */</div><div class='del'>-			if (!current_sg) {</div><div class='del'>-				dev_err(dev, "reached end of sg list. unexpected\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			sg_index += current_sg-&gt;length;</div><div class='del'>-			mapped_nents++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	mapped_nents = sg_nents_for_len(req-&gt;src, size_of_assoc);</div><div class='add'>+	if (mapped_nents &lt; 0)</div><div class='add'>+		return mapped_nents;</div><div class='add'>+</div><div class='ctx'> 	if (mapped_nents &gt; LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES) {</div><div class='ctx'> 		dev_err(dev, "Too many fragments. current %d max %d\n",</div><div class='ctx'> 			mapped_nents, LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES);</div><div class='hunk'>@@ -835,7 +716,7 @@ static int cc_aead_chain_assoc(struct cc_drvdata *drvdata,</div><div class='ctx'> 			cc_dma_buf_type(areq_ctx-&gt;assoc_buff_type),</div><div class='ctx'> 			areq_ctx-&gt;assoc.nents);</div><div class='ctx'> 		cc_add_sg_entry(dev, sg_data, areq_ctx-&gt;assoc.nents, req-&gt;src,</div><div class='del'>-				req-&gt;assoclen, 0, is_last,</div><div class='add'>+				areq_ctx-&gt;assoclen, 0, is_last,</div><div class='ctx'> 				&amp;areq_ctx-&gt;assoc.mlli_nents);</div><div class='ctx'> 		areq_ctx-&gt;assoc_buff_type = CC_DMA_BUF_MLLI;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -850,39 +731,32 @@ static void cc_prepare_aead_data_dlli(struct aead_request *req,</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	enum drv_crypto_direction direct = areq_ctx-&gt;gen_ctx.op_type;</div><div class='ctx'> 	unsigned int authsize = areq_ctx-&gt;req_authsize;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	ssize_t offset;</div><div class='ctx'> </div><div class='ctx'> 	areq_ctx-&gt;is_icv_fragmented = false;</div><div class='del'>-	if (req-&gt;src == req-&gt;dst) {</div><div class='del'>-		/*INPLACE*/</div><div class='del'>-		areq_ctx-&gt;icv_dma_addr = sg_dma_address(areq_ctx-&gt;src_sgl) +</div><div class='del'>-			(*src_last_bytes - authsize);</div><div class='del'>-		areq_ctx-&gt;icv_virt_addr = sg_virt(areq_ctx-&gt;src_sgl) +</div><div class='del'>-			(*src_last_bytes - authsize);</div><div class='del'>-	} else if (direct == DRV_CRYPTO_DIRECTION_DECRYPT) {</div><div class='del'>-		/*NON-INPLACE and DECRYPT*/</div><div class='del'>-		areq_ctx-&gt;icv_dma_addr = sg_dma_address(areq_ctx-&gt;src_sgl) +</div><div class='del'>-			(*src_last_bytes - authsize);</div><div class='del'>-		areq_ctx-&gt;icv_virt_addr = sg_virt(areq_ctx-&gt;src_sgl) +</div><div class='del'>-			(*src_last_bytes - authsize);</div><div class='add'>+</div><div class='add'>+	if ((req-&gt;src == req-&gt;dst) || direct == DRV_CRYPTO_DIRECTION_DECRYPT) {</div><div class='add'>+		sg = areq_ctx-&gt;src_sgl;</div><div class='add'>+		offset = *src_last_bytes - authsize;</div><div class='ctx'> 	} else {</div><div class='del'>-		/*NON-INPLACE and ENCRYPT*/</div><div class='del'>-		areq_ctx-&gt;icv_dma_addr = sg_dma_address(areq_ctx-&gt;dst_sgl) +</div><div class='del'>-			(*dst_last_bytes - authsize);</div><div class='del'>-		areq_ctx-&gt;icv_virt_addr = sg_virt(areq_ctx-&gt;dst_sgl) +</div><div class='del'>-			(*dst_last_bytes - authsize);</div><div class='add'>+		sg = areq_ctx-&gt;dst_sgl;</div><div class='add'>+		offset = *dst_last_bytes - authsize;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	areq_ctx-&gt;icv_dma_addr = sg_dma_address(sg) + offset;</div><div class='add'>+	areq_ctx-&gt;icv_virt_addr = sg_virt(sg) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cc_prepare_aead_data_mlli(struct cc_drvdata *drvdata,</div><div class='del'>-				     struct aead_request *req,</div><div class='del'>-				     struct buffer_array *sg_data,</div><div class='del'>-				     u32 *src_last_bytes, u32 *dst_last_bytes,</div><div class='del'>-				     bool is_last_table)</div><div class='add'>+static void cc_prepare_aead_data_mlli(struct cc_drvdata *drvdata,</div><div class='add'>+				      struct aead_request *req,</div><div class='add'>+				      struct buffer_array *sg_data,</div><div class='add'>+				      u32 *src_last_bytes, u32 *dst_last_bytes,</div><div class='add'>+				      bool is_last_table)</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);</div><div class='ctx'> 	enum drv_crypto_direction direct = areq_ctx-&gt;gen_ctx.op_type;</div><div class='ctx'> 	unsigned int authsize = areq_ctx-&gt;req_authsize;</div><div class='del'>-	int rc = 0, icv_nents;</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(drvdata);</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> </div><div class='hunk'>@@ -893,14 +767,9 @@ static int cc_prepare_aead_data_mlli(struct cc_drvdata *drvdata,</div><div class='ctx'> 				areq_ctx-&gt;src_offset, is_last_table,</div><div class='ctx'> 				&amp;areq_ctx-&gt;src.mlli_nents);</div><div class='ctx'> </div><div class='del'>-		icv_nents = cc_get_aead_icv_nents(dev, areq_ctx-&gt;src_sgl,</div><div class='del'>-						  areq_ctx-&gt;src.nents,</div><div class='del'>-						  authsize, *src_last_bytes,</div><div class='del'>-						  &amp;areq_ctx-&gt;is_icv_fragmented);</div><div class='del'>-		if (icv_nents &lt; 0) {</div><div class='del'>-			rc = -ENOTSUPP;</div><div class='del'>-			goto prepare_data_mlli_exit;</div><div class='del'>-		}</div><div class='add'>+		areq_ctx-&gt;is_icv_fragmented =</div><div class='add'>+			cc_is_icv_frag(areq_ctx-&gt;src.nents, authsize,</div><div class='add'>+				       *src_last_bytes);</div><div class='ctx'> </div><div class='ctx'> 		if (areq_ctx-&gt;is_icv_fragmented) {</div><div class='ctx'> 			/* Backup happens only when ICV is fragmented, ICV</div><div class='hunk'>@@ -942,16 +811,11 @@ static int cc_prepare_aead_data_mlli(struct cc_drvdata *drvdata,</div><div class='ctx'> 				areq_ctx-&gt;dst_offset, is_last_table,</div><div class='ctx'> 				&amp;areq_ctx-&gt;dst.mlli_nents);</div><div class='ctx'> </div><div class='del'>-		icv_nents = cc_get_aead_icv_nents(dev, areq_ctx-&gt;src_sgl,</div><div class='del'>-						  areq_ctx-&gt;src.nents,</div><div class='del'>-						  authsize, *src_last_bytes,</div><div class='del'>-						  &amp;areq_ctx-&gt;is_icv_fragmented);</div><div class='del'>-		if (icv_nents &lt; 0) {</div><div class='del'>-			rc = -ENOTSUPP;</div><div class='del'>-			goto prepare_data_mlli_exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		areq_ctx-&gt;is_icv_fragmented =</div><div class='add'>+			cc_is_icv_frag(areq_ctx-&gt;src.nents, authsize,</div><div class='add'>+				       *src_last_bytes);</div><div class='ctx'> 		/* Backup happens only when ICV is fragmented, ICV</div><div class='add'>+</div><div class='ctx'> 		 * verification is made by CPU compare in order to simplify</div><div class='ctx'> 		 * MAC verification upon request completion</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -979,14 +843,9 @@ static int cc_prepare_aead_data_mlli(struct cc_drvdata *drvdata,</div><div class='ctx'> 				areq_ctx-&gt;src_offset, is_last_table,</div><div class='ctx'> 				&amp;areq_ctx-&gt;src.mlli_nents);</div><div class='ctx'> </div><div class='del'>-		icv_nents = cc_get_aead_icv_nents(dev, areq_ctx-&gt;dst_sgl,</div><div class='del'>-						  areq_ctx-&gt;dst.nents,</div><div class='del'>-						  authsize, *dst_last_bytes,</div><div class='del'>-						  &amp;areq_ctx-&gt;is_icv_fragmented);</div><div class='del'>-		if (icv_nents &lt; 0) {</div><div class='del'>-			rc = -ENOTSUPP;</div><div class='del'>-			goto prepare_data_mlli_exit;</div><div class='del'>-		}</div><div class='add'>+		areq_ctx-&gt;is_icv_fragmented =</div><div class='add'>+			cc_is_icv_frag(areq_ctx-&gt;dst.nents, authsize,</div><div class='add'>+				       *dst_last_bytes);</div><div class='ctx'> </div><div class='ctx'> 		if (!areq_ctx-&gt;is_icv_fragmented) {</div><div class='ctx'> 			sg = &amp;areq_ctx-&gt;dst_sgl[areq_ctx-&gt;dst.nents - 1];</div><div class='hunk'>@@ -1000,9 +859,6 @@ static int cc_prepare_aead_data_mlli(struct cc_drvdata *drvdata,</div><div class='ctx'> 			areq_ctx-&gt;icv_virt_addr = areq_ctx-&gt;mac_buf;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-prepare_data_mlli_exit:</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cc_aead_chain_data(struct cc_drvdata *drvdata,</div><div class='hunk'>@@ -1019,12 +875,12 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata,</div><div class='ctx'> 	u32 src_mapped_nents = 0, dst_mapped_nents = 0;</div><div class='ctx'> 	u32 offset = 0;</div><div class='ctx'> 	/* non-inplace mode */</div><div class='del'>-	unsigned int size_for_map = req-&gt;assoclen + req-&gt;cryptlen;</div><div class='add'>+	unsigned int size_for_map = areq_ctx-&gt;assoclen + req-&gt;cryptlen;</div><div class='ctx'> 	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='ctx'> 	u32 sg_index = 0;</div><div class='del'>-	bool chained = false;</div><div class='ctx'> 	bool is_gcm4543 = areq_ctx-&gt;is_gcm4543;</div><div class='del'>-	u32 size_to_skip = req-&gt;assoclen;</div><div class='add'>+	u32 size_to_skip = areq_ctx-&gt;assoclen;</div><div class='add'>+	struct scatterlist *sgl;</div><div class='ctx'> </div><div class='ctx'> 	if (is_gcm4543)</div><div class='ctx'> 		size_to_skip += crypto_aead_ivsize(tfm);</div><div class='hunk'>@@ -1043,19 +899,17 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata,</div><div class='ctx'> 	size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ?</div><div class='ctx'> 			authsize : 0;</div><div class='ctx'> 	src_mapped_nents = cc_get_sgl_nents(dev, req-&gt;src, size_for_map,</div><div class='del'>-					    &amp;src_last_bytes, &amp;chained);</div><div class='add'>+					    &amp;src_last_bytes);</div><div class='ctx'> 	sg_index = areq_ctx-&gt;src_sgl-&gt;length;</div><div class='ctx'> 	//check where the data starts</div><div class='ctx'> 	while (sg_index &lt;= size_to_skip) {</div><div class='add'>+		src_mapped_nents--;</div><div class='ctx'> 		offset -= areq_ctx-&gt;src_sgl-&gt;length;</div><div class='del'>-		areq_ctx-&gt;src_sgl = sg_next(areq_ctx-&gt;src_sgl);</div><div class='del'>-		//if have reached the end of the sgl, then this is unexpected</div><div class='del'>-		if (!areq_ctx-&gt;src_sgl) {</div><div class='del'>-			dev_err(dev, "reached end of sg list. unexpected\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+		sgl = sg_next(areq_ctx-&gt;src_sgl);</div><div class='add'>+		if (!sgl)</div><div class='add'>+			break;</div><div class='add'>+		areq_ctx-&gt;src_sgl = sgl;</div><div class='ctx'> 		sg_index += areq_ctx-&gt;src_sgl-&gt;length;</div><div class='del'>-		src_mapped_nents--;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (src_mapped_nents &gt; LLI_MAX_NUM_OF_DATA_ENTRIES) {</div><div class='ctx'> 		dev_err(dev, "Too many fragments. current %d max %d\n",</div><div class='hunk'>@@ -1068,7 +922,7 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata,</div><div class='ctx'> 	areq_ctx-&gt;src_offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;src != req-&gt;dst) {</div><div class='del'>-		size_for_map = req-&gt;assoclen + req-&gt;cryptlen;</div><div class='add'>+		size_for_map = areq_ctx-&gt;assoclen + req-&gt;cryptlen;</div><div class='ctx'> 		size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ?</div><div class='ctx'> 				authsize : 0;</div><div class='ctx'> 		if (is_gcm4543)</div><div class='hunk'>@@ -1083,21 +937,19 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dst_mapped_nents = cc_get_sgl_nents(dev, req-&gt;dst, size_for_map,</div><div class='del'>-					    &amp;dst_last_bytes, &amp;chained);</div><div class='add'>+					    &amp;dst_last_bytes);</div><div class='ctx'> 	sg_index = areq_ctx-&gt;dst_sgl-&gt;length;</div><div class='ctx'> 	offset = size_to_skip;</div><div class='ctx'> </div><div class='ctx'> 	//check where the data starts</div><div class='ctx'> 	while (sg_index &lt;= size_to_skip) {</div><div class='add'>+		dst_mapped_nents--;</div><div class='ctx'> 		offset -= areq_ctx-&gt;dst_sgl-&gt;length;</div><div class='del'>-		areq_ctx-&gt;dst_sgl = sg_next(areq_ctx-&gt;dst_sgl);</div><div class='del'>-		//if have reached the end of the sgl, then this is unexpected</div><div class='del'>-		if (!areq_ctx-&gt;dst_sgl) {</div><div class='del'>-			dev_err(dev, "reached end of sg list. unexpected\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+		sgl = sg_next(areq_ctx-&gt;dst_sgl);</div><div class='add'>+		if (!sgl)</div><div class='add'>+			break;</div><div class='add'>+		areq_ctx-&gt;dst_sgl = sgl;</div><div class='ctx'> 		sg_index += areq_ctx-&gt;dst_sgl-&gt;length;</div><div class='del'>-		dst_mapped_nents--;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dst_mapped_nents &gt; LLI_MAX_NUM_OF_DATA_ENTRIES) {</div><div class='ctx'> 		dev_err(dev, "Too many fragments. current %d max %d\n",</div><div class='hunk'>@@ -1110,9 +962,9 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata,</div><div class='ctx'> 	    dst_mapped_nents  &gt; 1 ||</div><div class='ctx'> 	    do_chain) {</div><div class='ctx'> 		areq_ctx-&gt;data_buff_type = CC_DMA_BUF_MLLI;</div><div class='del'>-		rc = cc_prepare_aead_data_mlli(drvdata, req, sg_data,</div><div class='del'>-					       &amp;src_last_bytes,</div><div class='del'>-					       &amp;dst_last_bytes, is_last_table);</div><div class='add'>+		cc_prepare_aead_data_mlli(drvdata, req, sg_data,</div><div class='add'>+					  &amp;src_last_bytes, &amp;dst_last_bytes,</div><div class='add'>+					  is_last_table);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		areq_ctx-&gt;data_buff_type = CC_DMA_BUF_DLLI;</div><div class='ctx'> 		cc_prepare_aead_data_dlli(req, &amp;src_last_bytes,</div><div class='hunk'>@@ -1234,7 +1086,7 @@ int cc_map_aead_request(struct cc_drvdata *drvdata, struct aead_request *req)</div><div class='ctx'> 		areq_ctx-&gt;ccm_iv0_dma_addr = dma_addr;</div><div class='ctx'> </div><div class='ctx'> 		rc = cc_set_aead_conf_buf(dev, areq_ctx, areq_ctx-&gt;ccm_config,</div><div class='del'>-					  &amp;sg_data, req-&gt;assoclen);</div><div class='add'>+					  &amp;sg_data, areq_ctx-&gt;assoclen);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto aead_map_failure;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1285,7 +1137,7 @@ int cc_map_aead_request(struct cc_drvdata *drvdata, struct aead_request *req)</div><div class='ctx'> 		areq_ctx-&gt;gcm_iv_inc2_dma_addr = dma_addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size_to_map = req-&gt;cryptlen + req-&gt;assoclen;</div><div class='add'>+	size_to_map = req-&gt;cryptlen + areq_ctx-&gt;assoclen;</div><div class='ctx'> 	if (areq_ctx-&gt;gen_ctx.op_type == DRV_CRYPTO_DIRECTION_ENCRYPT)</div><div class='ctx'> 		size_to_map += authsize;</div><div class='ctx'> </div><div class='hunk'>@@ -1483,8 +1335,7 @@ int cc_map_hash_request_update(struct cc_drvdata *drvdata, void *ctx,</div><div class='ctx'> 	if (total_in_len &lt; block_size) {</div><div class='ctx'> 		dev_dbg(dev, " less than one block: curr_buff=%pK *curr_buff_cnt=0x%X copy_to=%pK\n",</div><div class='ctx'> 			curr_buff, *curr_buff_cnt, &amp;curr_buff[*curr_buff_cnt]);</div><div class='del'>-		areq_ctx-&gt;in_nents =</div><div class='del'>-			cc_get_sgl_nents(dev, src, nbytes, &amp;dummy, NULL);</div><div class='add'>+		areq_ctx-&gt;in_nents = sg_nents_for_len(src, nbytes);</div><div class='ctx'> 		sg_copy_to_buffer(src, areq_ctx-&gt;in_nents,</div><div class='ctx'> 				  &amp;curr_buff[*curr_buff_cnt], nbytes);</div><div class='ctx'> 		*curr_buff_cnt += nbytes;</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_buffer_mgr.h b/drivers/crypto/ccree/cc_buffer_mgr.h<br/>index 3ec4b4db5247..a726016bdbc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_buffer_mgr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_buffer_mgr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_buffer_mgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_buffer_mgr.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_buffer_mgr.h</div><div class='ctx'>  * Buffer Manager</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c<br/>index d9c17078517b..5b58226ea24d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_cipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_cipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_cipher.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</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'>@@ -34,6 +34,18 @@ struct cc_hw_key_info {</div><div class='ctx'> 	enum cc_hw_crypto_key key2_slot;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cc_cpp_key_info {</div><div class='add'>+	u8 slot;</div><div class='add'>+	enum cc_cpp_alg alg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cc_key_type {</div><div class='add'>+	CC_UNPROTECTED_KEY,		/* User key */</div><div class='add'>+	CC_HW_PROTECTED_KEY,		/* HW (FDE) key */</div><div class='add'>+	CC_POLICY_PROTECTED_KEY,	/* CPP key */</div><div class='add'>+	CC_INVALID_PROTECTED_KEY	/* Invalid key */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct cc_cipher_ctx {</div><div class='ctx'> 	struct cc_drvdata *drvdata;</div><div class='ctx'> 	int keylen;</div><div class='hunk'>@@ -41,19 +53,22 @@ struct cc_cipher_ctx {</div><div class='ctx'> 	int cipher_mode;</div><div class='ctx'> 	int flow_mode;</div><div class='ctx'> 	unsigned int flags;</div><div class='del'>-	bool hw_key;</div><div class='add'>+	enum cc_key_type key_type;</div><div class='ctx'> 	struct cc_user_key_info user;</div><div class='del'>-	struct cc_hw_key_info hw;</div><div class='add'>+	union {</div><div class='add'>+		struct cc_hw_key_info hw;</div><div class='add'>+		struct cc_cpp_key_info cpp;</div><div class='add'>+	};</div><div class='ctx'> 	struct crypto_shash *shash_tfm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void cc_cipher_complete(struct device *dev, void *cc_req, int err);</div><div class='ctx'> </div><div class='del'>-static inline bool cc_is_hw_key(struct crypto_tfm *tfm)</div><div class='add'>+static inline enum cc_key_type cc_key_type(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	return ctx_p-&gt;hw_key;</div><div class='add'>+	return ctx_p-&gt;key_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int validate_keys_sizes(struct cc_cipher_ctx *ctx_p, u32 size)</div><div class='hunk'>@@ -232,7 +247,7 @@ struct tdes_keys {</div><div class='ctx'> 	u8	key3[DES_KEY_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static enum cc_hw_crypto_key cc_slot_to_hw_key(int slot_num)</div><div class='add'>+static enum cc_hw_crypto_key cc_slot_to_hw_key(u8 slot_num)</div><div class='ctx'> {</div><div class='ctx'> 	switch (slot_num) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -247,6 +262,22 @@ static enum cc_hw_crypto_key cc_slot_to_hw_key(int slot_num)</div><div class='ctx'> 	return END_OF_KEYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 cc_slot_to_cpp_key(u8 slot_num)</div><div class='add'>+{</div><div class='add'>+	return (slot_num - CC_FIRST_CPP_KEY_SLOT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum cc_key_type cc_slot_to_key_type(u8 slot_num)</div><div class='add'>+{</div><div class='add'>+	if (slot_num &gt;= CC_FIRST_HW_KEY_SLOT &amp;&amp; slot_num &lt;= CC_LAST_HW_KEY_SLOT)</div><div class='add'>+		return CC_HW_PROTECTED_KEY;</div><div class='add'>+	else if (slot_num &gt;=  CC_FIRST_CPP_KEY_SLOT &amp;&amp;</div><div class='add'>+		 slot_num &lt;=  CC_LAST_CPP_KEY_SLOT)</div><div class='add'>+		return CC_POLICY_PROTECTED_KEY;</div><div class='add'>+	else</div><div class='add'>+		return CC_INVALID_PROTECTED_KEY;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cc_cipher_sethkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> 			     unsigned int keylen)</div><div class='ctx'> {</div><div class='hunk'>@@ -261,18 +292,13 @@ static int cc_cipher_sethkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> </div><div class='ctx'> 	/* STAT_PHASE_0: Init and sanity checks */</div><div class='ctx'> </div><div class='del'>-	/* This check the size of the hardware key token */</div><div class='add'>+	/* This check the size of the protected key token */</div><div class='ctx'> 	if (keylen != sizeof(hki)) {</div><div class='del'>-		dev_err(dev, "Unsupported HW key size %d.\n", keylen);</div><div class='add'>+		dev_err(dev, "Unsupported protected key size %d.\n", keylen);</div><div class='ctx'> 		crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctx_p-&gt;flow_mode != S_DIN_to_AES) {</div><div class='del'>-		dev_err(dev, "HW key not supported for non-AES flows\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	memcpy(&amp;hki, key, keylen);</div><div class='ctx'> </div><div class='ctx'> 	/* The real key len for crypto op is the size of the HW key</div><div class='hunk'>@@ -286,31 +312,70 @@ static int cc_cipher_sethkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctx_p-&gt;hw.key1_slot = cc_slot_to_hw_key(hki.hw_key1);</div><div class='del'>-	if (ctx_p-&gt;hw.key1_slot == END_OF_KEYS) {</div><div class='del'>-		dev_err(dev, "Unsupported hw key1 number (%d)\n", hki.hw_key1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	ctx_p-&gt;keylen = keylen;</div><div class='ctx'> </div><div class='del'>-	if (ctx_p-&gt;cipher_mode == DRV_CIPHER_XTS ||</div><div class='del'>-	    ctx_p-&gt;cipher_mode == DRV_CIPHER_ESSIV ||</div><div class='del'>-	    ctx_p-&gt;cipher_mode == DRV_CIPHER_BITLOCKER) {</div><div class='del'>-		if (hki.hw_key1 == hki.hw_key2) {</div><div class='del'>-			dev_err(dev, "Illegal hw key numbers (%d,%d)\n",</div><div class='del'>-				hki.hw_key1, hki.hw_key2);</div><div class='add'>+	switch (cc_slot_to_key_type(hki.hw_key1)) {</div><div class='add'>+	case CC_HW_PROTECTED_KEY:</div><div class='add'>+		if (ctx_p-&gt;flow_mode == S_DIN_to_SM4) {</div><div class='add'>+			dev_err(dev, "Only AES HW protected keys are supported\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		ctx_p-&gt;hw.key2_slot = cc_slot_to_hw_key(hki.hw_key2);</div><div class='del'>-		if (ctx_p-&gt;hw.key2_slot == END_OF_KEYS) {</div><div class='del'>-			dev_err(dev, "Unsupported hw key2 number (%d)\n",</div><div class='del'>-				hki.hw_key2);</div><div class='add'>+</div><div class='add'>+		ctx_p-&gt;hw.key1_slot = cc_slot_to_hw_key(hki.hw_key1);</div><div class='add'>+		if (ctx_p-&gt;hw.key1_slot == END_OF_KEYS) {</div><div class='add'>+			dev_err(dev, "Unsupported hw key1 number (%d)\n",</div><div class='add'>+				hki.hw_key1);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	ctx_p-&gt;keylen = keylen;</div><div class='del'>-	ctx_p-&gt;hw_key = true;</div><div class='del'>-	dev_dbg(dev, "cc_is_hw_key ret 0");</div><div class='add'>+		if (ctx_p-&gt;cipher_mode == DRV_CIPHER_XTS ||</div><div class='add'>+		    ctx_p-&gt;cipher_mode == DRV_CIPHER_ESSIV ||</div><div class='add'>+		    ctx_p-&gt;cipher_mode == DRV_CIPHER_BITLOCKER) {</div><div class='add'>+			if (hki.hw_key1 == hki.hw_key2) {</div><div class='add'>+				dev_err(dev, "Illegal hw key numbers (%d,%d)\n",</div><div class='add'>+					hki.hw_key1, hki.hw_key2);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ctx_p-&gt;hw.key2_slot = cc_slot_to_hw_key(hki.hw_key2);</div><div class='add'>+			if (ctx_p-&gt;hw.key2_slot == END_OF_KEYS) {</div><div class='add'>+				dev_err(dev, "Unsupported hw key2 number (%d)\n",</div><div class='add'>+					hki.hw_key2);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctx_p-&gt;key_type = CC_HW_PROTECTED_KEY;</div><div class='add'>+		dev_dbg(dev, "HW protected key  %d/%d set\n.",</div><div class='add'>+			ctx_p-&gt;hw.key1_slot, ctx_p-&gt;hw.key2_slot);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CC_POLICY_PROTECTED_KEY:</div><div class='add'>+		if (ctx_p-&gt;drvdata-&gt;hw_rev &lt; CC_HW_REV_713) {</div><div class='add'>+			dev_err(dev, "CPP keys not supported in this hardware revision.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ctx_p-&gt;cipher_mode != DRV_CIPHER_CBC &amp;&amp;</div><div class='add'>+		    ctx_p-&gt;cipher_mode != DRV_CIPHER_CTR) {</div><div class='add'>+			dev_err(dev, "CPP keys only supported in CBC or CTR modes.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctx_p-&gt;cpp.slot = cc_slot_to_cpp_key(hki.hw_key1);</div><div class='add'>+		if (ctx_p-&gt;flow_mode == S_DIN_to_AES)</div><div class='add'>+			ctx_p-&gt;cpp.alg = CC_CPP_AES;</div><div class='add'>+		else /* Must be SM4 since due to sethkey registration */</div><div class='add'>+			ctx_p-&gt;cpp.alg = CC_CPP_SM4;</div><div class='add'>+		ctx_p-&gt;key_type = CC_POLICY_PROTECTED_KEY;</div><div class='add'>+		dev_dbg(dev, "policy protected key alg: %d slot: %d.\n",</div><div class='add'>+			ctx_p-&gt;cpp.alg, ctx_p-&gt;cpp.slot);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Unsupported protected key (%d)\n", hki.hw_key1);</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'>@@ -321,7 +386,6 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> 	struct crypto_tfm *tfm = crypto_skcipher_tfm(sktfm);</div><div class='ctx'> 	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(ctx_p-&gt;drvdata);</div><div class='del'>-	u32 tmp[DES3_EDE_EXPKEY_WORDS];</div><div class='ctx'> 	struct cc_crypto_alg *cc_alg =</div><div class='ctx'> 			container_of(tfm-&gt;__crt_alg, struct cc_crypto_alg,</div><div class='ctx'> 				     skcipher_alg.base);</div><div class='hunk'>@@ -339,7 +403,7 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctx_p-&gt;hw_key = false;</div><div class='add'>+	ctx_p-&gt;key_type = CC_UNPROTECTED_KEY;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Verify DES weak keys</div><div class='hunk'>@@ -347,6 +411,7 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> 	 * HW does the expansion on its own.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ctx_p-&gt;flow_mode == S_DIN_to_DES) {</div><div class='add'>+		u32 tmp[DES3_EDE_EXPKEY_WORDS];</div><div class='ctx'> 		if (keylen == DES3_EDE_KEY_SIZE &amp;&amp;</div><div class='ctx'> 		    __des3_ede_setkey(tmp, &amp;tfm-&gt;crt_flags, key,</div><div class='ctx'> 				      DES3_EDE_KEY_SIZE)) {</div><div class='hunk'>@@ -399,7 +464,77 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cc_setup_cipher_desc(struct crypto_tfm *tfm,</div><div class='add'>+static int cc_out_setup_mode(struct cc_cipher_ctx *ctx_p)</div><div class='add'>+{</div><div class='add'>+	switch (ctx_p-&gt;flow_mode) {</div><div class='add'>+	case S_DIN_to_AES:</div><div class='add'>+		return S_AES_to_DOUT;</div><div class='add'>+	case S_DIN_to_DES:</div><div class='add'>+		return S_DES_to_DOUT;</div><div class='add'>+	case S_DIN_to_SM4:</div><div class='add'>+		return S_SM4_to_DOUT;</div><div class='add'>+	default:</div><div class='add'>+		return ctx_p-&gt;flow_mode;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_setup_readiv_desc(struct crypto_tfm *tfm,</div><div class='add'>+				 struct cipher_req_ctx *req_ctx,</div><div class='add'>+				 unsigned int ivsize, struct cc_hw_desc desc[],</div><div class='add'>+				 unsigned int *seq_size)</div><div class='add'>+{</div><div class='add'>+	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct device *dev = drvdata_to_dev(ctx_p-&gt;drvdata);</div><div class='add'>+	int cipher_mode = ctx_p-&gt;cipher_mode;</div><div class='add'>+	int flow_mode = cc_out_setup_mode(ctx_p);</div><div class='add'>+	int direction = req_ctx-&gt;gen_ctx.op_type;</div><div class='add'>+	dma_addr_t iv_dma_addr = req_ctx-&gt;gen_ctx.iv_dma_addr;</div><div class='add'>+</div><div class='add'>+	if (ctx_p-&gt;key_type == CC_POLICY_PROTECTED_KEY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (cipher_mode) {</div><div class='add'>+	case DRV_CIPHER_ECB:</div><div class='add'>+		break;</div><div class='add'>+	case DRV_CIPHER_CBC:</div><div class='add'>+	case DRV_CIPHER_CBC_CTS:</div><div class='add'>+	case DRV_CIPHER_CTR:</div><div class='add'>+	case DRV_CIPHER_OFB:</div><div class='add'>+		/* Read next IV */</div><div class='add'>+		hw_desc_init(&amp;desc[*seq_size]);</div><div class='add'>+		set_dout_dlli(&amp;desc[*seq_size], iv_dma_addr, ivsize, NS_BIT, 1);</div><div class='add'>+		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='add'>+		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='add'>+		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='add'>+		if (cipher_mode == DRV_CIPHER_CTR ||</div><div class='add'>+		    cipher_mode == DRV_CIPHER_OFB) {</div><div class='add'>+			set_setup_mode(&amp;desc[*seq_size], SETUP_WRITE_STATE1);</div><div class='add'>+		} else {</div><div class='add'>+			set_setup_mode(&amp;desc[*seq_size], SETUP_WRITE_STATE0);</div><div class='add'>+		}</div><div class='add'>+		set_queue_last_ind(ctx_p-&gt;drvdata, &amp;desc[*seq_size]);</div><div class='add'>+		(*seq_size)++;</div><div class='add'>+		break;</div><div class='add'>+	case DRV_CIPHER_XTS:</div><div class='add'>+	case DRV_CIPHER_ESSIV:</div><div class='add'>+	case DRV_CIPHER_BITLOCKER:</div><div class='add'>+		/*  IV */</div><div class='add'>+		hw_desc_init(&amp;desc[*seq_size]);</div><div class='add'>+		set_setup_mode(&amp;desc[*seq_size], SETUP_WRITE_STATE1);</div><div class='add'>+		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='add'>+		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='add'>+		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='add'>+		set_dout_dlli(&amp;desc[*seq_size], iv_dma_addr, CC_AES_BLOCK_SIZE,</div><div class='add'>+			     NS_BIT, 1);</div><div class='add'>+		set_queue_last_ind(ctx_p-&gt;drvdata, &amp;desc[*seq_size]);</div><div class='add'>+		(*seq_size)++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Unsupported cipher mode (%d)\n", cipher_mode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_setup_state_desc(struct crypto_tfm *tfm,</div><div class='ctx'> 				 struct cipher_req_ctx *req_ctx,</div><div class='ctx'> 				 unsigned int ivsize, unsigned int nbytes,</div><div class='ctx'> 				 struct cc_hw_desc desc[],</div><div class='hunk'>@@ -423,11 +558,13 @@ static void cc_setup_cipher_desc(struct crypto_tfm *tfm,</div><div class='ctx'> 		du_size = cc_alg-&gt;data_unit;</div><div class='ctx'> </div><div class='ctx'> 	switch (cipher_mode) {</div><div class='add'>+	case DRV_CIPHER_ECB:</div><div class='add'>+		break;</div><div class='ctx'> 	case DRV_CIPHER_CBC:</div><div class='ctx'> 	case DRV_CIPHER_CBC_CTS:</div><div class='ctx'> 	case DRV_CIPHER_CTR:</div><div class='ctx'> 	case DRV_CIPHER_OFB:</div><div class='del'>-		/* Load cipher state */</div><div class='add'>+		/* Load IV */</div><div class='ctx'> 		hw_desc_init(&amp;desc[*seq_size]);</div><div class='ctx'> 		set_din_type(&amp;desc[*seq_size], DMA_DLLI, iv_dma_addr, ivsize,</div><div class='ctx'> 			     NS_BIT);</div><div class='hunk'>@@ -441,57 +578,15 @@ static void cc_setup_cipher_desc(struct crypto_tfm *tfm,</div><div class='ctx'> 			set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_STATE0);</div><div class='ctx'> 		}</div><div class='ctx'> 		(*seq_size)++;</div><div class='del'>-		/*FALLTHROUGH*/</div><div class='del'>-	case DRV_CIPHER_ECB:</div><div class='del'>-		/* Load key */</div><div class='del'>-		hw_desc_init(&amp;desc[*seq_size]);</div><div class='del'>-		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='del'>-		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='del'>-		if (flow_mode == S_DIN_to_AES) {</div><div class='del'>-			if (cc_is_hw_key(tfm)) {</div><div class='del'>-				set_hw_crypto_key(&amp;desc[*seq_size],</div><div class='del'>-						  ctx_p-&gt;hw.key1_slot);</div><div class='del'>-			} else {</div><div class='del'>-				set_din_type(&amp;desc[*seq_size], DMA_DLLI,</div><div class='del'>-					     key_dma_addr, ((key_len == 24) ?</div><div class='del'>-							    AES_MAX_KEY_SIZE :</div><div class='del'>-							    key_len), NS_BIT);</div><div class='del'>-			}</div><div class='del'>-			set_key_size_aes(&amp;desc[*seq_size], key_len);</div><div class='del'>-		} else {</div><div class='del'>-			/*des*/</div><div class='del'>-			set_din_type(&amp;desc[*seq_size], DMA_DLLI, key_dma_addr,</div><div class='del'>-				     key_len, NS_BIT);</div><div class='del'>-			set_key_size_des(&amp;desc[*seq_size], key_len);</div><div class='del'>-		}</div><div class='del'>-		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='del'>-		set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_KEY0);</div><div class='del'>-		(*seq_size)++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DRV_CIPHER_XTS:</div><div class='ctx'> 	case DRV_CIPHER_ESSIV:</div><div class='ctx'> 	case DRV_CIPHER_BITLOCKER:</div><div class='del'>-		/* Load AES key */</div><div class='del'>-		hw_desc_init(&amp;desc[*seq_size]);</div><div class='del'>-		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='del'>-		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='del'>-		if (cc_is_hw_key(tfm)) {</div><div class='del'>-			set_hw_crypto_key(&amp;desc[*seq_size],</div><div class='del'>-					  ctx_p-&gt;hw.key1_slot);</div><div class='del'>-		} else {</div><div class='del'>-			set_din_type(&amp;desc[*seq_size], DMA_DLLI, key_dma_addr,</div><div class='del'>-				     (key_len / 2), NS_BIT);</div><div class='del'>-		}</div><div class='del'>-		set_key_size_aes(&amp;desc[*seq_size], (key_len / 2));</div><div class='del'>-		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='del'>-		set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_KEY0);</div><div class='del'>-		(*seq_size)++;</div><div class='del'>-</div><div class='ctx'> 		/* load XEX key */</div><div class='ctx'> 		hw_desc_init(&amp;desc[*seq_size]);</div><div class='ctx'> 		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='ctx'> 		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='del'>-		if (cc_is_hw_key(tfm)) {</div><div class='add'>+		if (cc_key_type(tfm) == CC_HW_PROTECTED_KEY) {</div><div class='ctx'> 			set_hw_crypto_key(&amp;desc[*seq_size],</div><div class='ctx'> 					  ctx_p-&gt;hw.key2_slot);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -505,7 +600,7 @@ static void cc_setup_cipher_desc(struct crypto_tfm *tfm,</div><div class='ctx'> 		set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_XEX_KEY);</div><div class='ctx'> 		(*seq_size)++;</div><div class='ctx'> </div><div class='del'>-		/* Set state */</div><div class='add'>+		/* Load IV */</div><div class='ctx'> 		hw_desc_init(&amp;desc[*seq_size]);</div><div class='ctx'> 		set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_STATE1);</div><div class='ctx'> 		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='hunk'>@@ -521,48 +616,113 @@ static void cc_setup_cipher_desc(struct crypto_tfm *tfm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cc_setup_cipher_data(struct crypto_tfm *tfm,</div><div class='del'>-				 struct cipher_req_ctx *req_ctx,</div><div class='del'>-				 struct scatterlist *dst,</div><div class='del'>-				 struct scatterlist *src, unsigned int nbytes,</div><div class='del'>-				 void *areq, struct cc_hw_desc desc[],</div><div class='del'>-				 unsigned int *seq_size)</div><div class='add'>+static int cc_out_flow_mode(struct cc_cipher_ctx *ctx_p)</div><div class='ctx'> {</div><div class='del'>-	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='del'>-	struct device *dev = drvdata_to_dev(ctx_p-&gt;drvdata);</div><div class='del'>-	unsigned int flow_mode = ctx_p-&gt;flow_mode;</div><div class='del'>-</div><div class='ctx'> 	switch (ctx_p-&gt;flow_mode) {</div><div class='ctx'> 	case S_DIN_to_AES:</div><div class='del'>-		flow_mode = DIN_AES_DOUT;</div><div class='del'>-		break;</div><div class='add'>+		return DIN_AES_DOUT;</div><div class='ctx'> 	case S_DIN_to_DES:</div><div class='del'>-		flow_mode = DIN_DES_DOUT;</div><div class='del'>-		break;</div><div class='add'>+		return DIN_DES_DOUT;</div><div class='ctx'> 	case S_DIN_to_SM4:</div><div class='del'>-		flow_mode = DIN_SM4_DOUT;</div><div class='del'>-		break;</div><div class='add'>+		return DIN_SM4_DOUT;</div><div class='ctx'> 	default:</div><div class='del'>-		dev_err(dev, "invalid flow mode, flow_mode = %d\n", flow_mode);</div><div class='del'>-		return;</div><div class='add'>+		return ctx_p-&gt;flow_mode;</div><div class='ctx'> 	}</div><div class='del'>-	/* Process */</div><div class='del'>-	if (req_ctx-&gt;dma_buf_type == CC_DMA_BUF_DLLI) {</div><div class='del'>-		dev_dbg(dev, " data params addr %pad length 0x%X\n",</div><div class='del'>-			&amp;sg_dma_address(src), nbytes);</div><div class='del'>-		dev_dbg(dev, " data params addr %pad length 0x%X\n",</div><div class='del'>-			&amp;sg_dma_address(dst), nbytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_setup_key_desc(struct crypto_tfm *tfm,</div><div class='add'>+			      struct cipher_req_ctx *req_ctx,</div><div class='add'>+			      unsigned int nbytes, struct cc_hw_desc desc[],</div><div class='add'>+			      unsigned int *seq_size)</div><div class='add'>+{</div><div class='add'>+	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct device *dev = drvdata_to_dev(ctx_p-&gt;drvdata);</div><div class='add'>+	int cipher_mode = ctx_p-&gt;cipher_mode;</div><div class='add'>+	int flow_mode = ctx_p-&gt;flow_mode;</div><div class='add'>+	int direction = req_ctx-&gt;gen_ctx.op_type;</div><div class='add'>+	dma_addr_t key_dma_addr = ctx_p-&gt;user.key_dma_addr;</div><div class='add'>+	unsigned int key_len = ctx_p-&gt;keylen;</div><div class='add'>+	unsigned int din_size;</div><div class='add'>+</div><div class='add'>+	switch (cipher_mode) {</div><div class='add'>+	case DRV_CIPHER_CBC:</div><div class='add'>+	case DRV_CIPHER_CBC_CTS:</div><div class='add'>+	case DRV_CIPHER_CTR:</div><div class='add'>+	case DRV_CIPHER_OFB:</div><div class='add'>+	case DRV_CIPHER_ECB:</div><div class='add'>+		/* Load key */</div><div class='ctx'> 		hw_desc_init(&amp;desc[*seq_size]);</div><div class='del'>-		set_din_type(&amp;desc[*seq_size], DMA_DLLI, sg_dma_address(src),</div><div class='del'>-			     nbytes, NS_BIT);</div><div class='del'>-		set_dout_dlli(&amp;desc[*seq_size], sg_dma_address(dst),</div><div class='del'>-			      nbytes, NS_BIT, (!areq ? 0 : 1));</div><div class='del'>-		if (areq)</div><div class='del'>-			set_queue_last_ind(ctx_p-&gt;drvdata, &amp;desc[*seq_size]);</div><div class='add'>+		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='add'>+		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='ctx'> </div><div class='add'>+		if (cc_key_type(tfm) == CC_POLICY_PROTECTED_KEY) {</div><div class='add'>+			/* We use the AES key size coding for all CPP algs */</div><div class='add'>+			set_key_size_aes(&amp;desc[*seq_size], key_len);</div><div class='add'>+			set_cpp_crypto_key(&amp;desc[*seq_size], ctx_p-&gt;cpp.slot);</div><div class='add'>+			flow_mode = cc_out_flow_mode(ctx_p);</div><div class='add'>+		} else {</div><div class='add'>+			if (flow_mode == S_DIN_to_AES) {</div><div class='add'>+				if (cc_key_type(tfm) == CC_HW_PROTECTED_KEY) {</div><div class='add'>+					set_hw_crypto_key(&amp;desc[*seq_size],</div><div class='add'>+							  ctx_p-&gt;hw.key1_slot);</div><div class='add'>+				} else {</div><div class='add'>+					/* CC_POLICY_UNPROTECTED_KEY</div><div class='add'>+					 * Invalid keys are filtered out in</div><div class='add'>+					 * sethkey()</div><div class='add'>+					 */</div><div class='add'>+					din_size = (key_len == 24) ?</div><div class='add'>+						AES_MAX_KEY_SIZE : key_len;</div><div class='add'>+</div><div class='add'>+					set_din_type(&amp;desc[*seq_size], DMA_DLLI,</div><div class='add'>+						     key_dma_addr, din_size,</div><div class='add'>+						     NS_BIT);</div><div class='add'>+				}</div><div class='add'>+				set_key_size_aes(&amp;desc[*seq_size], key_len);</div><div class='add'>+			} else {</div><div class='add'>+				/*des*/</div><div class='add'>+				set_din_type(&amp;desc[*seq_size], DMA_DLLI,</div><div class='add'>+					     key_dma_addr, key_len, NS_BIT);</div><div class='add'>+				set_key_size_des(&amp;desc[*seq_size], key_len);</div><div class='add'>+			}</div><div class='add'>+			set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_KEY0);</div><div class='add'>+		}</div><div class='ctx'> 		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='ctx'> 		(*seq_size)++;</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	case DRV_CIPHER_XTS:</div><div class='add'>+	case DRV_CIPHER_ESSIV:</div><div class='add'>+	case DRV_CIPHER_BITLOCKER:</div><div class='add'>+		/* Load AES key */</div><div class='add'>+		hw_desc_init(&amp;desc[*seq_size]);</div><div class='add'>+		set_cipher_mode(&amp;desc[*seq_size], cipher_mode);</div><div class='add'>+		set_cipher_config0(&amp;desc[*seq_size], direction);</div><div class='add'>+		if (cc_key_type(tfm) == CC_HW_PROTECTED_KEY) {</div><div class='add'>+			set_hw_crypto_key(&amp;desc[*seq_size],</div><div class='add'>+					  ctx_p-&gt;hw.key1_slot);</div><div class='add'>+		} else {</div><div class='add'>+			set_din_type(&amp;desc[*seq_size], DMA_DLLI, key_dma_addr,</div><div class='add'>+				     (key_len / 2), NS_BIT);</div><div class='add'>+		}</div><div class='add'>+		set_key_size_aes(&amp;desc[*seq_size], (key_len / 2));</div><div class='add'>+		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='add'>+		set_setup_mode(&amp;desc[*seq_size], SETUP_LOAD_KEY0);</div><div class='add'>+		(*seq_size)++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Unsupported cipher mode (%d)\n", cipher_mode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_setup_mlli_desc(struct crypto_tfm *tfm,</div><div class='add'>+			       struct cipher_req_ctx *req_ctx,</div><div class='add'>+			       struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			       unsigned int nbytes, void *areq,</div><div class='add'>+			       struct cc_hw_desc desc[], unsigned int *seq_size)</div><div class='add'>+{</div><div class='add'>+	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct device *dev = drvdata_to_dev(ctx_p-&gt;drvdata);</div><div class='add'>+</div><div class='add'>+	if (req_ctx-&gt;dma_buf_type == CC_DMA_BUF_MLLI) {</div><div class='ctx'> 		/* bypass */</div><div class='ctx'> 		dev_dbg(dev, " bypass params addr %pad length 0x%X addr 0x%08X\n",</div><div class='ctx'> 			&amp;req_ctx-&gt;mlli_params.mlli_dma_addr,</div><div class='hunk'>@@ -577,7 +737,38 @@ static void cc_setup_cipher_data(struct crypto_tfm *tfm,</div><div class='ctx'> 			      req_ctx-&gt;mlli_params.mlli_len);</div><div class='ctx'> 		set_flow_mode(&amp;desc[*seq_size], BYPASS);</div><div class='ctx'> 		(*seq_size)++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc_setup_flow_desc(struct crypto_tfm *tfm,</div><div class='add'>+			       struct cipher_req_ctx *req_ctx,</div><div class='add'>+			       struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			       unsigned int nbytes, struct cc_hw_desc desc[],</div><div class='add'>+			       unsigned int *seq_size)</div><div class='add'>+{</div><div class='add'>+	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct device *dev = drvdata_to_dev(ctx_p-&gt;drvdata);</div><div class='add'>+	unsigned int flow_mode = cc_out_flow_mode(ctx_p);</div><div class='add'>+	bool last_desc = (ctx_p-&gt;key_type == CC_POLICY_PROTECTED_KEY ||</div><div class='add'>+			  ctx_p-&gt;cipher_mode == DRV_CIPHER_ECB);</div><div class='ctx'> </div><div class='add'>+	/* Process */</div><div class='add'>+	if (req_ctx-&gt;dma_buf_type == CC_DMA_BUF_DLLI) {</div><div class='add'>+		dev_dbg(dev, " data params addr %pad length 0x%X\n",</div><div class='add'>+			&amp;sg_dma_address(src), nbytes);</div><div class='add'>+		dev_dbg(dev, " data params addr %pad length 0x%X\n",</div><div class='add'>+			&amp;sg_dma_address(dst), nbytes);</div><div class='add'>+		hw_desc_init(&amp;desc[*seq_size]);</div><div class='add'>+		set_din_type(&amp;desc[*seq_size], DMA_DLLI, sg_dma_address(src),</div><div class='add'>+			     nbytes, NS_BIT);</div><div class='add'>+		set_dout_dlli(&amp;desc[*seq_size], sg_dma_address(dst),</div><div class='add'>+			      nbytes, NS_BIT, (!last_desc ? 0 : 1));</div><div class='add'>+		if (last_desc)</div><div class='add'>+			set_queue_last_ind(ctx_p-&gt;drvdata, &amp;desc[*seq_size]);</div><div class='add'>+</div><div class='add'>+		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='add'>+		(*seq_size)++;</div><div class='add'>+	} else {</div><div class='ctx'> 		hw_desc_init(&amp;desc[*seq_size]);</div><div class='ctx'> 		set_din_type(&amp;desc[*seq_size], DMA_MLLI,</div><div class='ctx'> 			     ctx_p-&gt;drvdata-&gt;mlli_sram_addr,</div><div class='hunk'>@@ -589,7 +780,7 @@ static void cc_setup_cipher_data(struct crypto_tfm *tfm,</div><div class='ctx'> 			set_dout_mlli(&amp;desc[*seq_size],</div><div class='ctx'> 				      ctx_p-&gt;drvdata-&gt;mlli_sram_addr,</div><div class='ctx'> 				      req_ctx-&gt;in_mlli_nents, NS_BIT,</div><div class='del'>-				      (!areq ? 0 : 1));</div><div class='add'>+				      (!last_desc ? 0 : 1));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_dbg(dev, " din/dout params addr 0x%08X addr 0x%08X\n",</div><div class='ctx'> 				(unsigned int)ctx_p-&gt;drvdata-&gt;mlli_sram_addr,</div><div class='hunk'>@@ -600,9 +791,9 @@ static void cc_setup_cipher_data(struct crypto_tfm *tfm,</div><div class='ctx'> 				       (LLI_ENTRY_BYTE_SIZE *</div><div class='ctx'> 					req_ctx-&gt;in_mlli_nents)),</div><div class='ctx'> 				      req_ctx-&gt;out_mlli_nents, NS_BIT,</div><div class='del'>-				      (!areq ? 0 : 1));</div><div class='add'>+				      (!last_desc ? 0 : 1));</div><div class='ctx'> 		}</div><div class='del'>-		if (areq)</div><div class='add'>+		if (last_desc)</div><div class='ctx'> 			set_queue_last_ind(ctx_p-&gt;drvdata, &amp;desc[*seq_size]);</div><div class='ctx'> </div><div class='ctx'> 		set_flow_mode(&amp;desc[*seq_size], flow_mode);</div><div class='hunk'>@@ -610,38 +801,6 @@ static void cc_setup_cipher_data(struct crypto_tfm *tfm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Update a CTR-AES 128 bit counter</div><div class='del'>- */</div><div class='del'>-static void cc_update_ctr(u8 *ctr, unsigned int increment)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ||</div><div class='del'>-	    IS_ALIGNED((unsigned long)ctr, 8)) {</div><div class='del'>-</div><div class='del'>-		__be64 *high_be = (__be64 *)ctr;</div><div class='del'>-		__be64 *low_be = high_be + 1;</div><div class='del'>-		u64 orig_low = __be64_to_cpu(*low_be);</div><div class='del'>-		u64 new_low = orig_low + (u64)increment;</div><div class='del'>-</div><div class='del'>-		*low_be = __cpu_to_be64(new_low);</div><div class='del'>-</div><div class='del'>-		if (new_low &lt; orig_low)</div><div class='del'>-			*high_be = __cpu_to_be64(__be64_to_cpu(*high_be) + 1);</div><div class='del'>-	} else {</div><div class='del'>-		u8 *pos = (ctr + AES_BLOCK_SIZE);</div><div class='del'>-		u8 val;</div><div class='del'>-		unsigned int size;</div><div class='del'>-</div><div class='del'>-		for (; increment; increment--)</div><div class='del'>-			for (size = AES_BLOCK_SIZE; size; size--) {</div><div class='del'>-				val = *--pos + 1;</div><div class='del'>-				*pos = val;</div><div class='del'>-				if (val)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cc_cipher_complete(struct device *dev, void *cc_req, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct skcipher_request *req = (struct skcipher_request *)cc_req;</div><div class='hunk'>@@ -649,44 +808,15 @@ static void cc_cipher_complete(struct device *dev, void *cc_req, int err)</div><div class='ctx'> 	struct scatterlist *src = req-&gt;src;</div><div class='ctx'> 	struct cipher_req_ctx *req_ctx = skcipher_request_ctx(req);</div><div class='ctx'> 	struct crypto_skcipher *sk_tfm = crypto_skcipher_reqtfm(req);</div><div class='del'>-	struct crypto_tfm *tfm = crypto_skcipher_tfm(sk_tfm);</div><div class='del'>-	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	unsigned int ivsize = crypto_skcipher_ivsize(sk_tfm);</div><div class='del'>-	unsigned int len;</div><div class='ctx'> </div><div class='del'>-	cc_unmap_cipher_request(dev, req_ctx, ivsize, src, dst);</div><div class='del'>-</div><div class='del'>-	switch (ctx_p-&gt;cipher_mode) {</div><div class='del'>-	case DRV_CIPHER_CBC:</div><div class='del'>-		/*</div><div class='del'>-		 * The crypto API expects us to set the req-&gt;iv to the last</div><div class='del'>-		 * ciphertext block. For encrypt, simply copy from the result.</div><div class='del'>-		 * For decrypt, we must copy from a saved buffer since this</div><div class='del'>-		 * could be an in-place decryption operation and the src is</div><div class='del'>-		 * lost by this point.</div><div class='del'>-		 */</div><div class='del'>-		if (req_ctx-&gt;gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT)  {</div><div class='del'>-			memcpy(req-&gt;iv, req_ctx-&gt;backup_info, ivsize);</div><div class='del'>-			kzfree(req_ctx-&gt;backup_info);</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			len = req-&gt;cryptlen - ivsize;</div><div class='del'>-			scatterwalk_map_and_copy(req-&gt;iv, req-&gt;dst, len,</div><div class='del'>-						 ivsize, 0);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DRV_CIPHER_CTR:</div><div class='del'>-		/* Compute the counter of the last block */</div><div class='del'>-		len = ALIGN(req-&gt;cryptlen, AES_BLOCK_SIZE) / AES_BLOCK_SIZE;</div><div class='del'>-		cc_update_ctr((u8 *)req-&gt;iv, len);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	if (err != -EINPROGRESS) {</div><div class='add'>+		/* Not a BACKLOG notification */</div><div class='add'>+		cc_unmap_cipher_request(dev, req_ctx, ivsize, src, dst);</div><div class='add'>+		memcpy(req-&gt;iv, req_ctx-&gt;iv, ivsize);</div><div class='add'>+		kzfree(req_ctx-&gt;iv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kzfree(req_ctx-&gt;iv);</div><div class='del'>-</div><div class='ctx'> 	skcipher_request_complete(req, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -741,6 +871,13 @@ static int cc_cipher_process(struct skcipher_request *req,</div><div class='ctx'> 	cc_req.user_cb = (void *)cc_cipher_complete;</div><div class='ctx'> 	cc_req.user_arg = (void *)req;</div><div class='ctx'> </div><div class='add'>+	/* Setup CPP operation details */</div><div class='add'>+	if (ctx_p-&gt;key_type == CC_POLICY_PROTECTED_KEY) {</div><div class='add'>+		cc_req.cpp.is_cpp = true;</div><div class='add'>+		cc_req.cpp.alg = ctx_p-&gt;cpp.alg;</div><div class='add'>+		cc_req.cpp.slot = ctx_p-&gt;cpp.slot;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Setup request context */</div><div class='ctx'> 	req_ctx-&gt;gen_ctx.op_type = direction;</div><div class='ctx'> </div><div class='hunk'>@@ -755,11 +892,16 @@ static int cc_cipher_process(struct skcipher_request *req,</div><div class='ctx'> </div><div class='ctx'> 	/* STAT_PHASE_2: Create sequence */</div><div class='ctx'> </div><div class='del'>-	/* Setup processing */</div><div class='del'>-	cc_setup_cipher_desc(tfm, req_ctx, ivsize, nbytes, desc, &amp;seq_len);</div><div class='add'>+	/* Setup IV and XEX key used */</div><div class='add'>+	cc_setup_state_desc(tfm, req_ctx, ivsize, nbytes, desc, &amp;seq_len);</div><div class='add'>+	/* Setup MLLI line, if needed */</div><div class='add'>+	cc_setup_mlli_desc(tfm, req_ctx, dst, src, nbytes, req, desc, &amp;seq_len);</div><div class='add'>+	/* Setup key */</div><div class='add'>+	cc_setup_key_desc(tfm, req_ctx, nbytes, desc, &amp;seq_len);</div><div class='ctx'> 	/* Data processing */</div><div class='del'>-	cc_setup_cipher_data(tfm, req_ctx, dst, src, nbytes, req, desc,</div><div class='del'>-			     &amp;seq_len);</div><div class='add'>+	cc_setup_flow_desc(tfm, req_ctx, dst, src, nbytes, desc, &amp;seq_len);</div><div class='add'>+	/* Read next IV */</div><div class='add'>+	cc_setup_readiv_desc(tfm, req_ctx, ivsize, desc, &amp;seq_len);</div><div class='ctx'> </div><div class='ctx'> 	/* STAT_PHASE_3: Lock HW and push sequence */</div><div class='ctx'> </div><div class='hunk'>@@ -774,7 +916,6 @@ static int cc_cipher_process(struct skcipher_request *req,</div><div class='ctx'> </div><div class='ctx'> exit_process:</div><div class='ctx'> 	if (rc != -EINPROGRESS &amp;&amp; rc != -EBUSY) {</div><div class='del'>-		kzfree(req_ctx-&gt;backup_info);</div><div class='ctx'> 		kzfree(req_ctx-&gt;iv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -792,31 +933,10 @@ static int cc_cipher_encrypt(struct skcipher_request *req)</div><div class='ctx'> </div><div class='ctx'> static int cc_cipher_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_skcipher *sk_tfm = crypto_skcipher_reqtfm(req);</div><div class='del'>-	struct crypto_tfm *tfm = crypto_skcipher_tfm(sk_tfm);</div><div class='del'>-	struct cc_cipher_ctx *ctx_p = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct cipher_req_ctx *req_ctx = skcipher_request_ctx(req);</div><div class='del'>-	unsigned int ivsize = crypto_skcipher_ivsize(sk_tfm);</div><div class='del'>-	gfp_t flags = cc_gfp_flags(&amp;req-&gt;base);</div><div class='del'>-	unsigned int len;</div><div class='ctx'> </div><div class='ctx'> 	memset(req_ctx, 0, sizeof(*req_ctx));</div><div class='ctx'> </div><div class='del'>-	if ((ctx_p-&gt;cipher_mode == DRV_CIPHER_CBC) &amp;&amp;</div><div class='del'>-	    (req-&gt;cryptlen &gt;= ivsize)) {</div><div class='del'>-</div><div class='del'>-		/* Allocate and save the last IV sized bytes of the source,</div><div class='del'>-		 * which will be lost in case of in-place decryption.</div><div class='del'>-		 */</div><div class='del'>-		req_ctx-&gt;backup_info = kzalloc(ivsize, flags);</div><div class='del'>-		if (!req_ctx-&gt;backup_info)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		len = req-&gt;cryptlen - ivsize;</div><div class='del'>-		scatterwalk_map_and_copy(req_ctx-&gt;backup_info, req-&gt;src, len,</div><div class='del'>-					 ivsize, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return cc_cipher_process(req, DRV_CRYPTO_DIRECTION_DECRYPT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -838,6 +958,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_630,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "xts512(paes)",</div><div class='hunk'>@@ -856,6 +977,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.data_unit = 512,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "xts4096(paes)",</div><div class='hunk'>@@ -874,6 +996,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.data_unit = 4096,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "essiv(paes)",</div><div class='hunk'>@@ -891,6 +1014,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "essiv512(paes)",</div><div class='hunk'>@@ -909,6 +1033,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.data_unit = 512,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "essiv4096(paes)",</div><div class='hunk'>@@ -927,6 +1052,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.data_unit = 4096,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "bitlocker(paes)",</div><div class='hunk'>@@ -944,6 +1070,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "bitlocker512(paes)",</div><div class='hunk'>@@ -962,6 +1089,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.data_unit = 512,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "bitlocker4096(paes)",</div><div class='hunk'>@@ -980,6 +1108,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.data_unit = 4096,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "ecb(paes)",</div><div class='hunk'>@@ -997,6 +1126,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "cbc(paes)",</div><div class='hunk'>@@ -1014,6 +1144,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "ofb(paes)",</div><div class='hunk'>@@ -1031,6 +1162,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "cts(cbc(paes))",</div><div class='hunk'>@@ -1048,6 +1180,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "ctr(paes)",</div><div class='hunk'>@@ -1065,6 +1198,7 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.flow_mode = S_DIN_to_AES,</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_712,</div><div class='ctx'> 		.std_body = CC_STD_NIST,</div><div class='add'>+		.sec_func = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "xts(aes)",</div><div class='hunk'>@@ -1429,6 +1563,42 @@ static const struct cc_alg_template skcipher_algs[] = {</div><div class='ctx'> 		.min_hw_rev = CC_HW_REV_713,</div><div class='ctx'> 		.std_body = CC_STD_OSCCA,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.name = "cbc(psm4)",</div><div class='add'>+		.driver_name = "cbc-psm4-ccree",</div><div class='add'>+		.blocksize = SM4_BLOCK_SIZE,</div><div class='add'>+		.template_skcipher = {</div><div class='add'>+			.setkey = cc_cipher_sethkey,</div><div class='add'>+			.encrypt = cc_cipher_encrypt,</div><div class='add'>+			.decrypt = cc_cipher_decrypt,</div><div class='add'>+			.min_keysize = CC_HW_KEY_SIZE,</div><div class='add'>+			.max_keysize = CC_HW_KEY_SIZE,</div><div class='add'>+			.ivsize = SM4_BLOCK_SIZE,</div><div class='add'>+			},</div><div class='add'>+		.cipher_mode = DRV_CIPHER_CBC,</div><div class='add'>+		.flow_mode = S_DIN_to_SM4,</div><div class='add'>+		.min_hw_rev = CC_HW_REV_713,</div><div class='add'>+		.std_body = CC_STD_OSCCA,</div><div class='add'>+		.sec_func = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "ctr(psm4)",</div><div class='add'>+		.driver_name = "ctr-psm4-ccree",</div><div class='add'>+		.blocksize = SM4_BLOCK_SIZE,</div><div class='add'>+		.template_skcipher = {</div><div class='add'>+			.setkey = cc_cipher_sethkey,</div><div class='add'>+			.encrypt = cc_cipher_encrypt,</div><div class='add'>+			.decrypt = cc_cipher_decrypt,</div><div class='add'>+			.min_keysize = CC_HW_KEY_SIZE,</div><div class='add'>+			.max_keysize = CC_HW_KEY_SIZE,</div><div class='add'>+			.ivsize = SM4_BLOCK_SIZE,</div><div class='add'>+			},</div><div class='add'>+		.cipher_mode = DRV_CIPHER_CTR,</div><div class='add'>+		.flow_mode = S_DIN_to_SM4,</div><div class='add'>+		.min_hw_rev = CC_HW_REV_713,</div><div class='add'>+		.std_body = CC_STD_OSCCA,</div><div class='add'>+		.sec_func = true,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cc_crypto_alg *cc_create_alg(const struct cc_alg_template *tmpl,</div><div class='hunk'>@@ -1504,7 +1674,8 @@ int cc_cipher_alloc(struct cc_drvdata *drvdata)</div><div class='ctx'> 		ARRAY_SIZE(skcipher_algs));</div><div class='ctx'> 	for (alg = 0; alg &lt; ARRAY_SIZE(skcipher_algs); alg++) {</div><div class='ctx'> 		if ((skcipher_algs[alg].min_hw_rev &gt; drvdata-&gt;hw_rev) ||</div><div class='del'>-		    !(drvdata-&gt;std_bodies &amp; skcipher_algs[alg].std_body))</div><div class='add'>+		    !(drvdata-&gt;std_bodies &amp; skcipher_algs[alg].std_body) ||</div><div class='add'>+		    (drvdata-&gt;sec_disabled &amp;&amp; skcipher_algs[alg].sec_func))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev, "creating %s\n", skcipher_algs[alg].driver_name);</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_cipher.h b/drivers/crypto/ccree/cc_cipher.h<br/>index 4dbc0a1e6d5c..da3a38707fae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_cipher.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_cipher.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_cipher.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_cipher.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_cipher.h</div><div class='ctx'>  * ARM CryptoCell Cipher Crypto API</div><div class='hunk'>@@ -20,7 +20,6 @@ struct cipher_req_ctx {</div><div class='ctx'> 	u32 in_mlli_nents;</div><div class='ctx'> 	u32 out_nents;</div><div class='ctx'> 	u32 out_mlli_nents;</div><div class='del'>-	u8 *backup_info; /*store iv for generated IV flow*/</div><div class='ctx'> 	u8 *iv;</div><div class='ctx'> 	struct mlli_params mlli_params;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_crypto_ctx.h b/drivers/crypto/ccree/cc_crypto_ctx.h<br/>index c8dac273c563..ccf960a0d989 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_crypto_ctx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_crypto_ctx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_crypto_ctx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_crypto_ctx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CC_CRYPTO_CTX_H_</div><div class='ctx'> #define _CC_CRYPTO_CTX_H_</div><div class='hunk'>@@ -55,6 +55,14 @@</div><div class='ctx'> </div><div class='ctx'> #define CC_DRV_ALG_MAX_BLOCK_SIZE CC_HASH_BLOCK_SIZE_MAX</div><div class='ctx'> </div><div class='add'>+#define CC_CPP_NUM_SLOTS	8</div><div class='add'>+#define CC_CPP_NUM_ALGS		2</div><div class='add'>+</div><div class='add'>+enum cc_cpp_alg {</div><div class='add'>+	CC_CPP_SM4 = 1,</div><div class='add'>+	CC_CPP_AES = 0</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum drv_engine_type {</div><div class='ctx'> 	DRV_ENGINE_NULL = 0,</div><div class='ctx'> 	DRV_ENGINE_AES = 1,</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_debugfs.c b/drivers/crypto/ccree/cc_debugfs.c<br/>index 5fa05a7bcf36..566999738698 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_debugfs.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited or its affiliates. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -25,9 +25,24 @@ struct cc_debugfs_ctx {</div><div class='ctx'>  */</div><div class='ctx'> static struct dentry *cc_debugfs_dir;</div><div class='ctx'> </div><div class='del'>-static struct debugfs_reg32 debug_regs[] = {</div><div class='add'>+static struct debugfs_reg32 ver_sig_regs[] = {</div><div class='ctx'> 	{ .name = "SIGNATURE" }, /* Must be 0th */</div><div class='ctx'> 	{ .name = "VERSION" }, /* Must be 1st */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct debugfs_reg32 pid_cid_regs[] = {</div><div class='add'>+	CC_DEBUG_REG(PERIPHERAL_ID_0),</div><div class='add'>+	CC_DEBUG_REG(PERIPHERAL_ID_1),</div><div class='add'>+	CC_DEBUG_REG(PERIPHERAL_ID_2),</div><div class='add'>+	CC_DEBUG_REG(PERIPHERAL_ID_3),</div><div class='add'>+	CC_DEBUG_REG(PERIPHERAL_ID_4),</div><div class='add'>+	CC_DEBUG_REG(COMPONENT_ID_0),</div><div class='add'>+	CC_DEBUG_REG(COMPONENT_ID_1),</div><div class='add'>+	CC_DEBUG_REG(COMPONENT_ID_2),</div><div class='add'>+	CC_DEBUG_REG(COMPONENT_ID_3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct debugfs_reg32 debug_regs[] = {</div><div class='ctx'> 	CC_DEBUG_REG(HOST_IRR),</div><div class='ctx'> 	CC_DEBUG_REG(HOST_POWER_DOWN_EN),</div><div class='ctx'> 	CC_DEBUG_REG(AXIM_MON_ERR),</div><div class='hunk'>@@ -53,10 +68,7 @@ int cc_debugfs_init(struct cc_drvdata *drvdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(drvdata);</div><div class='ctx'> 	struct cc_debugfs_ctx *ctx;</div><div class='del'>-	struct debugfs_regset32 *regset;</div><div class='del'>-</div><div class='del'>-	debug_regs[0].offset = drvdata-&gt;sig_offset;</div><div class='del'>-	debug_regs[1].offset = drvdata-&gt;ver_offset;</div><div class='add'>+	struct debugfs_regset32 *regset, *verset;</div><div class='ctx'> </div><div class='ctx'> 	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);</div><div class='ctx'> 	if (!ctx)</div><div class='hunk'>@@ -75,8 +87,26 @@ int cc_debugfs_init(struct cc_drvdata *drvdata)</div><div class='ctx'> 	debugfs_create_regset32("regs", 0400, ctx-&gt;dir, regset);</div><div class='ctx'> 	debugfs_create_bool("coherent", 0400, ctx-&gt;dir, &amp;drvdata-&gt;coherent);</div><div class='ctx'> </div><div class='del'>-	drvdata-&gt;debugfs = ctx;</div><div class='add'>+	verset = devm_kzalloc(dev, sizeof(*verset), GFP_KERNEL);</div><div class='add'>+	/* Failing here is not important enough to fail the module load */</div><div class='add'>+	if (!verset)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (drvdata-&gt;hw_rev &lt;= CC_HW_REV_712) {</div><div class='add'>+		ver_sig_regs[0].offset = drvdata-&gt;sig_offset;</div><div class='add'>+		ver_sig_regs[1].offset = drvdata-&gt;ver_offset;</div><div class='add'>+		verset-&gt;regs = ver_sig_regs;</div><div class='add'>+		verset-&gt;nregs = ARRAY_SIZE(ver_sig_regs);</div><div class='add'>+	} else {</div><div class='add'>+		verset-&gt;regs = pid_cid_regs;</div><div class='add'>+		verset-&gt;nregs = ARRAY_SIZE(pid_cid_regs);</div><div class='add'>+	}</div><div class='add'>+	verset-&gt;base = drvdata-&gt;cc_base;</div><div class='ctx'> </div><div class='add'>+	debugfs_create_regset32("version", 0400, ctx-&gt;dir, verset);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	drvdata-&gt;debugfs = ctx;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/ccree/cc_debugfs.h b/drivers/crypto/ccree/cc_debugfs.h<br/>index 01cbd9a95659..664ff402e0e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_debugfs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_debugfs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_debugfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_debugfs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_DEBUGFS_H__</div><div class='ctx'> #define __CC_DEBUGFS_H__</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c<br/>index 3bcc6c76e090..86ac7b443355 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_driver.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_driver.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_driver.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited or its affiliates. */</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'>@@ -30,27 +30,47 @@</div><div class='ctx'> bool cc_dump_desc;</div><div class='ctx'> module_param_named(dump_desc, cc_dump_desc, bool, 0600);</div><div class='ctx'> MODULE_PARM_DESC(cc_dump_desc, "Dump descriptors to kernel log as debugging aid");</div><div class='del'>-</div><div class='ctx'> bool cc_dump_bytes;</div><div class='ctx'> module_param_named(dump_bytes, cc_dump_bytes, bool, 0600);</div><div class='ctx'> MODULE_PARM_DESC(cc_dump_bytes, "Dump buffers to kernel log as debugging aid");</div><div class='ctx'> </div><div class='add'>+static bool cc_sec_disable;</div><div class='add'>+module_param_named(sec_disable, cc_sec_disable, bool, 0600);</div><div class='add'>+MODULE_PARM_DESC(cc_sec_disable, "Disable security functions");</div><div class='add'>+</div><div class='ctx'> struct cc_hw_data {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	enum cc_hw_rev rev;</div><div class='ctx'> 	u32 sig;</div><div class='add'>+	u32 cidr_0123;</div><div class='add'>+	u32 pidr_0124;</div><div class='ctx'> 	int std_bodies;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CC_NUM_IDRS 4</div><div class='add'>+</div><div class='add'>+/* Note: PIDR3 holds CMOD/Rev so ignored for HW identification purposes */</div><div class='add'>+static const u32 pidr_0124_offsets[CC_NUM_IDRS] = {</div><div class='add'>+	CC_REG(PERIPHERAL_ID_0), CC_REG(PERIPHERAL_ID_1),</div><div class='add'>+	CC_REG(PERIPHERAL_ID_2), CC_REG(PERIPHERAL_ID_4)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 cidr_0123_offsets[CC_NUM_IDRS] = {</div><div class='add'>+	CC_REG(COMPONENT_ID_0), CC_REG(COMPONENT_ID_1),</div><div class='add'>+	CC_REG(COMPONENT_ID_2), CC_REG(COMPONENT_ID_3)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Hardware revisions defs. */</div><div class='ctx'> </div><div class='ctx'> /* The 703 is a OSCCA only variant of the 713 */</div><div class='ctx'> static const struct cc_hw_data cc703_hw = {</div><div class='del'>-	.name = "703", .rev = CC_HW_REV_713, .std_bodies = CC_STD_OSCCA</div><div class='add'>+	.name = "703", .rev = CC_HW_REV_713, .cidr_0123 = 0xB105F00DU,</div><div class='add'>+	.pidr_0124 = 0x040BB0D0U, .std_bodies = CC_STD_OSCCA</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct cc_hw_data cc713_hw = {</div><div class='del'>-	.name = "713", .rev = CC_HW_REV_713, .std_bodies = CC_STD_ALL</div><div class='add'>+	.name = "713", .rev = CC_HW_REV_713, .cidr_0123 = 0xB105F00DU,</div><div class='add'>+	.pidr_0124 = 0x040BB0D0U, .std_bodies = CC_STD_ALL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct cc_hw_data cc712_hw = {</div><div class='hunk'>@@ -78,6 +98,20 @@ static const struct of_device_id arm_ccree_dev_of_match[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, arm_ccree_dev_of_match);</div><div class='ctx'> </div><div class='add'>+static u32 cc_read_idr(struct cc_drvdata *drvdata, const u32 *idr_offsets)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	union {</div><div class='add'>+		u8 regs[CC_NUM_IDRS];</div><div class='add'>+		__le32 val;</div><div class='add'>+	} idr;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CC_NUM_IDRS; ++i)</div><div class='add'>+		idr.regs[i] = cc_ioread(drvdata, idr_offsets[i]);</div><div class='add'>+</div><div class='add'>+	return le32_to_cpu(idr.val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __dump_byte_array(const char *name, const u8 *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	char prefix[64];</div><div class='hunk'>@@ -114,12 +148,12 @@ static irqreturn_t cc_isr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	drvdata-&gt;irq = irr;</div><div class='ctx'> 	/* Completion interrupt - most probable */</div><div class='del'>-	if (irr &amp; CC_COMP_IRQ_MASK) {</div><div class='del'>-		/* Mask AXI completion interrupt - will be unmasked in</div><div class='del'>-		 * Deferred service handler</div><div class='add'>+	if (irr &amp; drvdata-&gt;comp_mask) {</div><div class='add'>+		/* Mask all completion interrupts - will be unmasked in</div><div class='add'>+		 * deferred service handler</div><div class='ctx'> 		 */</div><div class='del'>-		cc_iowrite(drvdata, CC_REG(HOST_IMR), imr | CC_COMP_IRQ_MASK);</div><div class='del'>-		irr &amp;= ~CC_COMP_IRQ_MASK;</div><div class='add'>+		cc_iowrite(drvdata, CC_REG(HOST_IMR), imr | drvdata-&gt;comp_mask);</div><div class='add'>+		irr &amp;= ~drvdata-&gt;comp_mask;</div><div class='ctx'> 		complete_request(drvdata);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_CRYPTO_FIPS</div><div class='hunk'>@@ -159,11 +193,14 @@ int init_cc_regs(struct cc_drvdata *drvdata, bool is_probe)</div><div class='ctx'> 	unsigned int val, cache_params;</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(drvdata);</div><div class='ctx'> </div><div class='del'>-	/* Unmask all AXI interrupt sources AXI_CFG1 register */</div><div class='del'>-	val = cc_ioread(drvdata, CC_REG(AXIM_CFG));</div><div class='del'>-	cc_iowrite(drvdata, CC_REG(AXIM_CFG), val &amp; ~CC_AXI_IRQ_MASK);</div><div class='del'>-	dev_dbg(dev, "AXIM_CFG=0x%08X\n",</div><div class='del'>-		cc_ioread(drvdata, CC_REG(AXIM_CFG)));</div><div class='add'>+	/* Unmask all AXI interrupt sources AXI_CFG1 register   */</div><div class='add'>+	/* AXI interrupt config are obsoleted startign at cc7x3 */</div><div class='add'>+	if (drvdata-&gt;hw_rev &lt;= CC_HW_REV_712) {</div><div class='add'>+		val = cc_ioread(drvdata, CC_REG(AXIM_CFG));</div><div class='add'>+		cc_iowrite(drvdata, CC_REG(AXIM_CFG), val &amp; ~CC_AXI_IRQ_MASK);</div><div class='add'>+		dev_dbg(dev, "AXIM_CFG=0x%08X\n",</div><div class='add'>+			cc_ioread(drvdata, CC_REG(AXIM_CFG)));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear all pending interrupts */</div><div class='ctx'> 	val = cc_ioread(drvdata, CC_REG(HOST_IRR));</div><div class='hunk'>@@ -171,7 +208,7 @@ int init_cc_regs(struct cc_drvdata *drvdata, bool is_probe)</div><div class='ctx'> 	cc_iowrite(drvdata, CC_REG(HOST_ICR), val);</div><div class='ctx'> </div><div class='ctx'> 	/* Unmask relevant interrupt cause */</div><div class='del'>-	val = CC_COMP_IRQ_MASK | CC_AXI_ERR_IRQ_MASK;</div><div class='add'>+	val = drvdata-&gt;comp_mask | CC_AXI_ERR_IRQ_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (drvdata-&gt;hw_rev &gt;= CC_HW_REV_712)</div><div class='ctx'> 		val |= CC_GPR0_IRQ_MASK;</div><div class='hunk'>@@ -201,7 +238,7 @@ static int init_cc_resources(struct platform_device *plat_dev)</div><div class='ctx'> 	struct cc_drvdata *new_drvdata;</div><div class='ctx'> 	struct device *dev = &amp;plat_dev-&gt;dev;</div><div class='ctx'> 	struct device_node *np = dev-&gt;of_node;</div><div class='del'>-	u32 signature_val;</div><div class='add'>+	u32 val, hw_rev_pidr, sig_cidr;</div><div class='ctx'> 	u64 dma_mask;</div><div class='ctx'> 	const struct cc_hw_data *hw_rev;</div><div class='ctx'> 	const struct of_device_id *dev_id;</div><div class='hunk'>@@ -231,6 +268,8 @@ static int init_cc_resources(struct platform_device *plat_dev)</div><div class='ctx'> 		new_drvdata-&gt;ver_offset = CC_REG(HOST_VERSION_630);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	new_drvdata-&gt;comp_mask = CC_COMP_IRQ_MASK;</div><div class='add'>+</div><div class='ctx'> 	platform_set_drvdata(plat_dev, new_drvdata);</div><div class='ctx'> 	new_drvdata-&gt;plat_dev = plat_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -311,22 +350,57 @@ static int init_cc_resources(struct platform_device *plat_dev)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	new_drvdata-&gt;sec_disabled = cc_sec_disable;</div><div class='add'>+</div><div class='ctx'> 	if (hw_rev-&gt;rev &lt;= CC_HW_REV_712) {</div><div class='ctx'> 		/* Verify correct mapping */</div><div class='del'>-		signature_val = cc_ioread(new_drvdata, new_drvdata-&gt;sig_offset);</div><div class='del'>-		if (signature_val != hw_rev-&gt;sig) {</div><div class='add'>+		val = cc_ioread(new_drvdata, new_drvdata-&gt;sig_offset);</div><div class='add'>+		if (val != hw_rev-&gt;sig) {</div><div class='ctx'> 			dev_err(dev, "Invalid CC signature: SIGNATURE=0x%08X != expected=0x%08X\n",</div><div class='del'>-				signature_val, hw_rev-&gt;sig);</div><div class='add'>+				val, hw_rev-&gt;sig);</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto post_clk_err;</div><div class='add'>+		}</div><div class='add'>+		sig_cidr = val;</div><div class='add'>+		hw_rev_pidr = cc_ioread(new_drvdata, new_drvdata-&gt;ver_offset);</div><div class='add'>+	} else {</div><div class='add'>+		/* Verify correct mapping */</div><div class='add'>+		val = cc_read_idr(new_drvdata, pidr_0124_offsets);</div><div class='add'>+		if (val != hw_rev-&gt;pidr_0124) {</div><div class='add'>+			dev_err(dev, "Invalid CC PIDR: PIDR0124=0x%08X != expected=0x%08X\n",</div><div class='add'>+				val,  hw_rev-&gt;pidr_0124);</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto post_clk_err;</div><div class='add'>+		}</div><div class='add'>+		hw_rev_pidr = val;</div><div class='add'>+</div><div class='add'>+		val = cc_read_idr(new_drvdata, cidr_0123_offsets);</div><div class='add'>+		if (val != hw_rev-&gt;cidr_0123) {</div><div class='add'>+			dev_err(dev, "Invalid CC CIDR: CIDR0123=0x%08X != expected=0x%08X\n",</div><div class='add'>+			val,  hw_rev-&gt;cidr_0123);</div><div class='ctx'> 			rc = -EINVAL;</div><div class='ctx'> 			goto post_clk_err;</div><div class='ctx'> 		}</div><div class='del'>-		dev_dbg(dev, "CC SIGNATURE=0x%08X\n", signature_val);</div><div class='add'>+		sig_cidr = val;</div><div class='add'>+</div><div class='add'>+		/* Check security disable state */</div><div class='add'>+		val = cc_ioread(new_drvdata, CC_REG(SECURITY_DISABLED));</div><div class='add'>+		val &amp;= CC_SECURITY_DISABLED_MASK;</div><div class='add'>+		new_drvdata-&gt;sec_disabled |= !!val;</div><div class='add'>+</div><div class='add'>+		if (!new_drvdata-&gt;sec_disabled) {</div><div class='add'>+			new_drvdata-&gt;comp_mask |= CC_CPP_SM4_ABORT_MASK;</div><div class='add'>+			if (new_drvdata-&gt;std_bodies &amp; CC_STD_NIST)</div><div class='add'>+				new_drvdata-&gt;comp_mask |= CC_CPP_AES_ABORT_MASK;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (new_drvdata-&gt;sec_disabled)</div><div class='add'>+		dev_info(dev, "Security Disabled mode is in effect. Security functions disabled.\n");</div><div class='add'>+</div><div class='ctx'> 	/* Display HW versions */</div><div class='del'>-	dev_info(dev, "ARM CryptoCell %s Driver: HW version 0x%08X, Driver version %s\n",</div><div class='del'>-		 hw_rev-&gt;name, cc_ioread(new_drvdata, new_drvdata-&gt;ver_offset),</div><div class='del'>-		 DRV_MODULE_VERSION);</div><div class='add'>+	dev_info(dev, "ARM CryptoCell %s Driver: HW version 0x%08X/0x%8X, Driver version %s\n",</div><div class='add'>+		 hw_rev-&gt;name, hw_rev_pidr, sig_cidr, DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	rc = init_cc_regs(new_drvdata, true);</div><div class='ctx'> 	if (rc) {</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_driver.h b/drivers/crypto/ccree/cc_driver.h<br/>index 33dbf3e6d15d..b76181335c08 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_driver.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_driver.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_driver.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_driver.h</div><div class='ctx'>  * ARM CryptoCell Linux Crypto Driver</div><div class='hunk'>@@ -65,10 +65,32 @@ enum cc_std_body {</div><div class='ctx'> </div><div class='ctx'> #define CC_COMP_IRQ_MASK BIT(CC_HOST_IRR_AXIM_COMP_INT_BIT_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define CC_SECURITY_DISABLED_MASK BIT(CC_SECURITY_DISABLED_VALUE_BIT_SHIFT)</div><div class='add'>+</div><div class='ctx'> #define AXIM_MON_COMP_VALUE GENMASK(CC_AXIM_MON_COMP_VALUE_BIT_SIZE + \</div><div class='ctx'> 				    CC_AXIM_MON_COMP_VALUE_BIT_SHIFT, \</div><div class='ctx'> 				    CC_AXIM_MON_COMP_VALUE_BIT_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define CC_CPP_AES_ABORT_MASK ( \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_0_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_1_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_2_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_3_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_4_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_5_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_6_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_AES_7_MASK_BIT_SHIFT))</div><div class='add'>+</div><div class='add'>+#define CC_CPP_SM4_ABORT_MASK ( \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_0_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_1_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_2_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_3_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_4_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_5_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_6_MASK_BIT_SHIFT) | \</div><div class='add'>+	BIT(CC_HOST_IMR_REE_OP_ABORTED_SM_7_MASK_BIT_SHIFT))</div><div class='add'>+</div><div class='ctx'> /* Register name mangling macro */</div><div class='ctx'> #define CC_REG(reg_name) CC_ ## reg_name ## _REG_OFFSET</div><div class='ctx'> </div><div class='hunk'>@@ -81,7 +103,6 @@ enum cc_std_body {</div><div class='ctx'> </div><div class='ctx'> #define MAX_REQUEST_QUEUE_SIZE 4096</div><div class='ctx'> #define MAX_MLLI_BUFF_SIZE 2080</div><div class='del'>-#define MAX_ICV_NENTS_SUPPORTED 2</div><div class='ctx'> </div><div class='ctx'> /* Definitions for HW descriptors DIN/DOUT fields */</div><div class='ctx'> #define NS_BIT 1</div><div class='hunk'>@@ -90,6 +111,12 @@ enum cc_std_body {</div><div class='ctx'>  * field in the HW descriptor. The DMA engine +8 that value.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+struct cc_cpp_req {</div><div class='add'>+	bool is_cpp;</div><div class='add'>+	enum cc_cpp_alg alg;</div><div class='add'>+	u8 slot;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define CC_MAX_IVGEN_DMA_ADDRESSES	3</div><div class='ctx'> struct cc_crypto_req {</div><div class='ctx'> 	void (*user_cb)(struct device *dev, void *req, int err);</div><div class='hunk'>@@ -104,6 +131,7 @@ struct cc_crypto_req {</div><div class='ctx'> 	/* The generated IV size required, 8/16 B allowed. */</div><div class='ctx'> 	unsigned int ivgen_size;</div><div class='ctx'> 	struct completion seq_compl; /* request completion */</div><div class='add'>+	struct cc_cpp_req cpp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -136,6 +164,8 @@ struct cc_drvdata {</div><div class='ctx'> 	u32 sig_offset;</div><div class='ctx'> 	u32 ver_offset;</div><div class='ctx'> 	int std_bodies;</div><div class='add'>+	bool sec_disabled;</div><div class='add'>+	u32 comp_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cc_crypto_alg {</div><div class='hunk'>@@ -162,12 +192,14 @@ struct cc_alg_template {</div><div class='ctx'> 	int auth_mode;</div><div class='ctx'> 	u32 min_hw_rev;</div><div class='ctx'> 	enum cc_std_body std_body;</div><div class='add'>+	bool sec_func;</div><div class='ctx'> 	unsigned int data_unit;</div><div class='ctx'> 	struct cc_drvdata *drvdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct async_gen_req_ctx {</div><div class='ctx'> 	dma_addr_t iv_dma_addr;</div><div class='add'>+	u8 *iv;</div><div class='ctx'> 	enum drv_crypto_direction op_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/ccree/cc_fips.c b/drivers/crypto/ccree/cc_fips.c<br/>index b4d0a6d983e0..5ad3ffb7acaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_fips.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_fips.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_fips.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_fips.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fips.h&gt;</div><div class='hunk'>@@ -49,8 +49,6 @@ void cc_fips_fini(struct cc_drvdata *drvdata)</div><div class='ctx'> </div><div class='ctx'> 	/* Kill tasklet */</div><div class='ctx'> 	tasklet_kill(&amp;fips_h-&gt;tasklet);</div><div class='del'>-</div><div class='del'>-	kfree(fips_h);</div><div class='ctx'> 	drvdata-&gt;fips_handle = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -72,20 +70,28 @@ static inline void tee_fips_error(struct device *dev)</div><div class='ctx'> 		dev_err(dev, "TEE reported error!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function check if cryptocell tee fips error occurred</div><div class='add'>+ * and in such case triggers system error</div><div class='add'>+ */</div><div class='add'>+void cc_tee_handle_fips_error(struct cc_drvdata *p_drvdata)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = drvdata_to_dev(p_drvdata);</div><div class='add'>+</div><div class='add'>+	if (!cc_get_tee_fips_status(p_drvdata))</div><div class='add'>+		tee_fips_error(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Deferred service handler, run as interrupt-fired tasklet */</div><div class='ctx'> static void fips_dsr(unsigned long devarg)</div><div class='ctx'> {</div><div class='ctx'> 	struct cc_drvdata *drvdata = (struct cc_drvdata *)devarg;</div><div class='del'>-	struct device *dev = drvdata_to_dev(drvdata);</div><div class='del'>-	u32 irq, state, val;</div><div class='add'>+	u32 irq, val;</div><div class='ctx'> </div><div class='ctx'> 	irq = (drvdata-&gt;irq &amp; (CC_GPR0_IRQ_MASK));</div><div class='ctx'> </div><div class='ctx'> 	if (irq) {</div><div class='del'>-		state = cc_ioread(drvdata, CC_REG(GPR_HOST));</div><div class='del'>-</div><div class='del'>-		if (state != (CC_FIPS_SYNC_TEE_STATUS | CC_FIPS_SYNC_MODULE_OK))</div><div class='del'>-			tee_fips_error(dev);</div><div class='add'>+		cc_tee_handle_fips_error(drvdata);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* after verifing that there is nothing to do,</div><div class='hunk'>@@ -104,7 +110,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata)</div><div class='ctx'> 	if (p_drvdata-&gt;hw_rev &lt; CC_HW_REV_712)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fips_h = kzalloc(sizeof(*fips_h), GFP_KERNEL);</div><div class='add'>+	fips_h = devm_kzalloc(dev, sizeof(*fips_h), GFP_KERNEL);</div><div class='ctx'> 	if (!fips_h)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -113,8 +119,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata)</div><div class='ctx'> 	dev_dbg(dev, "Initializing fips tasklet\n");</div><div class='ctx'> 	tasklet_init(&amp;fips_h-&gt;tasklet, fips_dsr, (unsigned long)p_drvdata);</div><div class='ctx'> </div><div class='del'>-	if (!cc_get_tee_fips_status(p_drvdata))</div><div class='del'>-		tee_fips_error(dev);</div><div class='add'>+	cc_tee_handle_fips_error(p_drvdata);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_fips.h b/drivers/crypto/ccree/cc_fips.h<br/>index 645e096a7a82..fc33eeb4d566 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_fips.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_fips.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_fips.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_fips.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_FIPS_H__</div><div class='ctx'> #define __CC_FIPS_H__</div><div class='hunk'>@@ -18,6 +18,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata);</div><div class='ctx'> void cc_fips_fini(struct cc_drvdata *drvdata);</div><div class='ctx'> void fips_handler(struct cc_drvdata *drvdata);</div><div class='ctx'> void cc_set_ree_fips_status(struct cc_drvdata *drvdata, bool ok);</div><div class='add'>+void cc_tee_handle_fips_error(struct cc_drvdata *p_drvdata);</div><div class='ctx'> </div><div class='ctx'> #else  /* CONFIG_CRYPTO_FIPS */</div><div class='ctx'> </div><div class='hunk'>@@ -30,6 +31,7 @@ static inline void cc_fips_fini(struct cc_drvdata *drvdata) {}</div><div class='ctx'> static inline void cc_set_ree_fips_status(struct cc_drvdata *drvdata,</div><div class='ctx'> 					  bool ok) {}</div><div class='ctx'> static inline void fips_handler(struct cc_drvdata *drvdata) {}</div><div class='add'>+static inline void cc_tee_handle_fips_error(struct cc_drvdata *p_drvdata) {}</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_CRYPTO_FIPS */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c<br/>index 2c4ddc8fb76b..a6abe4e3bb0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_hash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_hash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_hash.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</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'>@@ -69,6 +69,7 @@ struct cc_hash_alg {</div><div class='ctx'> struct hash_key_req_ctx {</div><div class='ctx'> 	u32 keylen;</div><div class='ctx'> 	dma_addr_t key_dma_addr;</div><div class='add'>+	u8 *key;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hash per-session context */</div><div class='hunk'>@@ -280,9 +281,13 @@ static void cc_update_complete(struct device *dev, void *cc_req, int err)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "req=%pK\n", req);</div><div class='ctx'> </div><div class='del'>-	cc_unmap_hash_request(dev, state, req-&gt;src, false);</div><div class='del'>-	cc_unmap_req(dev, state, ctx);</div><div class='del'>-	req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='add'>+	if (err != -EINPROGRESS) {</div><div class='add'>+		/* Not a BACKLOG notification */</div><div class='add'>+		cc_unmap_hash_request(dev, state, req-&gt;src, false);</div><div class='add'>+		cc_unmap_req(dev, state, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahash_request_complete(req, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cc_digest_complete(struct device *dev, void *cc_req, int err)</div><div class='hunk'>@@ -295,10 +300,14 @@ static void cc_digest_complete(struct device *dev, void *cc_req, int err)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "req=%pK\n", req);</div><div class='ctx'> </div><div class='del'>-	cc_unmap_hash_request(dev, state, req-&gt;src, false);</div><div class='del'>-	cc_unmap_result(dev, state, digestsize, req-&gt;result);</div><div class='del'>-	cc_unmap_req(dev, state, ctx);</div><div class='del'>-	req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='add'>+	if (err != -EINPROGRESS) {</div><div class='add'>+		/* Not a BACKLOG notification */</div><div class='add'>+		cc_unmap_hash_request(dev, state, req-&gt;src, false);</div><div class='add'>+		cc_unmap_result(dev, state, digestsize, req-&gt;result);</div><div class='add'>+		cc_unmap_req(dev, state, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahash_request_complete(req, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cc_hash_complete(struct device *dev, void *cc_req, int err)</div><div class='hunk'>@@ -311,10 +320,14 @@ static void cc_hash_complete(struct device *dev, void *cc_req, int err)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "req=%pK\n", req);</div><div class='ctx'> </div><div class='del'>-	cc_unmap_hash_request(dev, state, req-&gt;src, false);</div><div class='del'>-	cc_unmap_result(dev, state, digestsize, req-&gt;result);</div><div class='del'>-	cc_unmap_req(dev, state, ctx);</div><div class='del'>-	req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='add'>+	if (err != -EINPROGRESS) {</div><div class='add'>+		/* Not a BACKLOG notification */</div><div class='add'>+		cc_unmap_hash_request(dev, state, req-&gt;src, false);</div><div class='add'>+		cc_unmap_result(dev, state, digestsize, req-&gt;result);</div><div class='add'>+		cc_unmap_req(dev, state, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahash_request_complete(req, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cc_fin_result(struct cc_hw_desc *desc, struct ahash_request *req,</div><div class='hunk'>@@ -730,13 +743,20 @@ static int cc_hash_setkey(struct crypto_ahash *ahash, const u8 *key,</div><div class='ctx'> 	ctx-&gt;key_params.keylen = keylen;</div><div class='ctx'> 	ctx-&gt;key_params.key_dma_addr = 0;</div><div class='ctx'> 	ctx-&gt;is_hmac = true;</div><div class='add'>+	ctx-&gt;key_params.key = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen) {</div><div class='add'>+		ctx-&gt;key_params.key = kmemdup(key, keylen, GFP_KERNEL);</div><div class='add'>+		if (!ctx-&gt;key_params.key)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 		ctx-&gt;key_params.key_dma_addr =</div><div class='del'>-			dma_map_single(dev, (void *)key, keylen, DMA_TO_DEVICE);</div><div class='add'>+			dma_map_single(dev, (void *)ctx-&gt;key_params.key, keylen,</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(dev, ctx-&gt;key_params.key_dma_addr)) {</div><div class='ctx'> 			dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n",</div><div class='del'>-				key, keylen);</div><div class='add'>+				ctx-&gt;key_params.key, keylen);</div><div class='add'>+			kzfree(ctx-&gt;key_params.key);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n",</div><div class='hunk'>@@ -887,6 +907,9 @@ out:</div><div class='ctx'> 		dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",</div><div class='ctx'> 			&amp;ctx-&gt;key_params.key_dma_addr, ctx-&gt;key_params.keylen);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	kzfree(ctx-&gt;key_params.key);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -913,11 +936,16 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash,</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;key_params.keylen = keylen;</div><div class='ctx'> </div><div class='add'>+	ctx-&gt;key_params.key = kmemdup(key, keylen, GFP_KERNEL);</div><div class='add'>+	if (!ctx-&gt;key_params.key)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;key_params.key_dma_addr =</div><div class='del'>-		dma_map_single(dev, (void *)key, keylen, DMA_TO_DEVICE);</div><div class='add'>+		dma_map_single(dev, ctx-&gt;key_params.key, keylen, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(dev, ctx-&gt;key_params.key_dma_addr)) {</div><div class='ctx'> 		dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n",</div><div class='ctx'> 			key, keylen);</div><div class='add'>+		kzfree(ctx-&gt;key_params.key);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n",</div><div class='hunk'>@@ -969,6 +997,8 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash,</div><div class='ctx'> 	dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",</div><div class='ctx'> 		&amp;ctx-&gt;key_params.key_dma_addr, ctx-&gt;key_params.keylen);</div><div class='ctx'> </div><div class='add'>+	kzfree(ctx-&gt;key_params.key);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1621,7 +1651,7 @@ static struct cc_hash_template driver_hash[] = {</div><div class='ctx'> 			.setkey = cc_hash_setkey,</div><div class='ctx'> 			.halg = {</div><div class='ctx'> 				.digestsize = SHA224_DIGEST_SIZE,</div><div class='del'>-				.statesize = CC_STATE_SIZE(SHA224_DIGEST_SIZE),</div><div class='add'>+				.statesize = CC_STATE_SIZE(SHA256_DIGEST_SIZE),</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.hash_mode = DRV_HASH_SHA224,</div><div class='hunk'>@@ -1648,7 +1678,7 @@ static struct cc_hash_template driver_hash[] = {</div><div class='ctx'> 			.setkey = cc_hash_setkey,</div><div class='ctx'> 			.halg = {</div><div class='ctx'> 				.digestsize = SHA384_DIGEST_SIZE,</div><div class='del'>-				.statesize = CC_STATE_SIZE(SHA384_DIGEST_SIZE),</div><div class='add'>+				.statesize = CC_STATE_SIZE(SHA512_DIGEST_SIZE),</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.hash_mode = DRV_HASH_SHA384,</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_hash.h b/drivers/crypto/ccree/cc_hash.h<br/>index 2e5bf8b0bbb6..0d6dc61484d7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_hash.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_hash.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_hash.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_hash.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_hash.h</div><div class='ctx'>  * ARM CryptoCell Hash Crypto API</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_host_regs.h b/drivers/crypto/ccree/cc_host_regs.h<br/>index 616b2e1c41ba..d0764147573f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_host_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_host_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_host_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_host_regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited or its affiliates. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_HOST_H__</div><div class='ctx'> #define __CC_HOST_H__</div><div class='hunk'>@@ -7,33 +7,102 @@</div><div class='ctx'> // --------------------------------------</div><div class='ctx'> // BLOCK: HOST_P</div><div class='ctx'> // --------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* IRR */</div><div class='ctx'> #define CC_HOST_IRR_REG_OFFSET	0xA00UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_0_INT_BIT_SHIFT	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_0_INT_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IRR_DSCRPTR_COMPLETION_LOW_INT_BIT_SHIFT	0x2UL</div><div class='ctx'> #define CC_HOST_IRR_DSCRPTR_COMPLETION_LOW_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_1_INT_BIT_SHIFT	0x3UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_1_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_2_INT_BIT_SHIFT	0x4UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_2_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_3_INT_BIT_SHIFT	0x5UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_3_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_4_INT_BIT_SHIFT	0x6UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_4_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_5_INT_BIT_SHIFT	0x7UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_5_INT_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IRR_AXI_ERR_INT_BIT_SHIFT	0x8UL</div><div class='ctx'> #define CC_HOST_IRR_AXI_ERR_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_6_INT_BIT_SHIFT	0x9UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_6_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_7_INT_BIT_SHIFT	0xAUL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_AES_7_INT_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IRR_GPR0_BIT_SHIFT	0xBUL</div><div class='ctx'> #define CC_HOST_IRR_GPR0_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_0_INT_BIT_SHIFT	0xCUL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_0_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_1_INT_BIT_SHIFT	0xDUL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_1_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_2_INT_BIT_SHIFT	0xEUL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_2_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_3_INT_BIT_SHIFT	0xFUL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_3_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_4_INT_BIT_SHIFT	0x10UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_4_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_5_INT_BIT_SHIFT	0x11UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_5_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_6_INT_BIT_SHIFT	0x12UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_6_INT_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IRR_DSCRPTR_WATERMARK_INT_BIT_SHIFT	0x13UL</div><div class='ctx'> #define CC_HOST_IRR_DSCRPTR_WATERMARK_INT_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_7_INT_BIT_SHIFT	0x14UL</div><div class='add'>+#define CC_HOST_IRR_REE_OP_ABORTED_SM_7_INT_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IRR_AXIM_COMP_INT_BIT_SHIFT	0x17UL</div><div class='ctx'> #define CC_HOST_IRR_AXIM_COMP_INT_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_SEP_SRAM_THRESHOLD_REG_OFFSET	0xA10UL</div><div class='ctx'> #define CC_HOST_SEP_SRAM_THRESHOLD_VALUE_BIT_SHIFT	0x0UL</div><div class='ctx'> #define CC_HOST_SEP_SRAM_THRESHOLD_VALUE_BIT_SIZE	0xCUL</div><div class='del'>-#define CC_HOST_IMR_REG_OFFSET	0xA04UL</div><div class='del'>-#define CC_HOST_IMR_NOT_USED_MASK_BIT_SHIFT	0x1UL</div><div class='del'>-#define CC_HOST_IMR_NOT_USED_MASK_BIT_SIZE	0x1UL</div><div class='add'>+</div><div class='add'>+/* IMR */</div><div class='add'>+#define CC_HOST_IMR_REG_OFFSET	0x0A04UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_0_MASK_BIT_SHIFT	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_0_MASK_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IMR_DSCRPTR_COMPLETION_MASK_BIT_SHIFT	0x2UL</div><div class='ctx'> #define CC_HOST_IMR_DSCRPTR_COMPLETION_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_1_MASK_BIT_SHIFT	0x3UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_1_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_2_MASK_BIT_SHIFT	0x4UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_2_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_3_MASK_BIT_SHIFT	0x5UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_3_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_4_MASK_BIT_SHIFT	0x6UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_4_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_5_MASK_BIT_SHIFT	0x7UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_5_MASK_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IMR_AXI_ERR_MASK_BIT_SHIFT	0x8UL</div><div class='ctx'> #define CC_HOST_IMR_AXI_ERR_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_6_MASK_BIT_SHIFT	0x9UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_6_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_7_MASK_BIT_SHIFT	0xAUL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_AES_7_MASK_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IMR_GPR0_BIT_SHIFT	0xBUL</div><div class='ctx'> #define CC_HOST_IMR_GPR0_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_0_MASK_BIT_SHIFT	0xCUL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_0_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_1_MASK_BIT_SHIFT	0xDUL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_1_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_2_MASK_BIT_SHIFT	0xEUL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_2_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_3_MASK_BIT_SHIFT	0xFUL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_3_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_4_MASK_BIT_SHIFT	0x10UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_4_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_5_MASK_BIT_SHIFT	0x11UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_5_MASK_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_6_MASK_BIT_SHIFT	0x12UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_6_MASK_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IMR_DSCRPTR_WATERMARK_MASK0_BIT_SHIFT	0x13UL</div><div class='ctx'> #define CC_HOST_IMR_DSCRPTR_WATERMARK_MASK0_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_7_MASK_BIT_SHIFT	0x14UL</div><div class='add'>+#define CC_HOST_IMR_REE_OP_ABORTED_SM_7_MASK_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_IMR_AXIM_COMP_INT_MASK_BIT_SHIFT	0x17UL</div><div class='ctx'> #define CC_HOST_IMR_AXIM_COMP_INT_MASK_BIT_SIZE	0x1UL</div><div class='add'>+</div><div class='add'>+/* ICR */</div><div class='ctx'> #define CC_HOST_ICR_REG_OFFSET	0xA08UL</div><div class='ctx'> #define CC_HOST_ICR_DSCRPTR_COMPLETION_BIT_SHIFT	0x2UL</div><div class='ctx'> #define CC_HOST_ICR_DSCRPTR_COMPLETION_BIT_SIZE	0x1UL</div><div class='hunk'>@@ -45,6 +114,9 @@</div><div class='ctx'> #define CC_HOST_ICR_DSCRPTR_WATERMARK_QUEUE0_CLEAR_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_ICR_AXIM_COMP_INT_CLEAR_BIT_SHIFT	0x17UL</div><div class='ctx'> #define CC_HOST_ICR_AXIM_COMP_INT_CLEAR_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_SECURITY_DISABLED_REG_OFFSET		0x0A1CUL</div><div class='add'>+#define CC_SECURITY_DISABLED_VALUE_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_SECURITY_DISABLED_VALUE_BIT_SIZE	0x1UL</div><div class='ctx'> #define CC_HOST_SIGNATURE_712_REG_OFFSET	0xA24UL</div><div class='ctx'> #define CC_HOST_SIGNATURE_630_REG_OFFSET	0xAC8UL</div><div class='ctx'> #define CC_HOST_SIGNATURE_VALUE_BIT_SHIFT	0x0UL</div><div class='hunk'>@@ -132,6 +204,49 @@</div><div class='ctx'> #define CC_HOST_POWER_DOWN_EN_VALUE_BIT_SHIFT	0x0UL</div><div class='ctx'> #define CC_HOST_POWER_DOWN_EN_VALUE_BIT_SIZE	0x1UL</div><div class='ctx'> // --------------------------------------</div><div class='add'>+// BLOCK: ID_REGISTERS</div><div class='add'>+// --------------------------------------</div><div class='add'>+#define CC_PERIPHERAL_ID_4_REG_OFFSET	0x0FD0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_4_VALUE_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_4_VALUE_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_PIDRESERVED0_REG_OFFSET	0x0FD4UL</div><div class='add'>+#define CC_PIDRESERVED1_REG_OFFSET	0x0FD8UL</div><div class='add'>+#define CC_PIDRESERVED2_REG_OFFSET	0x0FDCUL</div><div class='add'>+#define CC_PERIPHERAL_ID_0_REG_OFFSET	0x0FE0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_0_VALUE_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_0_VALUE_BIT_SIZE	0x8UL</div><div class='add'>+#define CC_PERIPHERAL_ID_1_REG_OFFSET	0x0FE4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_1_PART_1_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_1_PART_1_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_1_DES_0_JEP106_BIT_SHIFT	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_1_DES_0_JEP106_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_REG_OFFSET	0x0FE8UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_DES_1_JEP106_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_DES_1_JEP106_BIT_SIZE	0x3UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_JEDEC_BIT_SHIFT	0x3UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_JEDEC_BIT_SIZE	0x1UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_REVISION_BIT_SHIFT	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_2_REVISION_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_3_REG_OFFSET	0x0FECUL</div><div class='add'>+#define CC_PERIPHERAL_ID_3_CMOD_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_PERIPHERAL_ID_3_CMOD_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_3_REVAND_BIT_SHIFT	0x4UL</div><div class='add'>+#define CC_PERIPHERAL_ID_3_REVAND_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_COMPONENT_ID_0_REG_OFFSET	0x0FF0UL</div><div class='add'>+#define CC_COMPONENT_ID_0_VALUE_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_COMPONENT_ID_0_VALUE_BIT_SIZE	0x8UL</div><div class='add'>+#define CC_COMPONENT_ID_1_REG_OFFSET	0x0FF4UL</div><div class='add'>+#define CC_COMPONENT_ID_1_PRMBL_1_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_COMPONENT_ID_1_PRMBL_1_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_COMPONENT_ID_1_CLASS_BIT_SHIFT	0x4UL</div><div class='add'>+#define CC_COMPONENT_ID_1_CLASS_BIT_SIZE	0x4UL</div><div class='add'>+#define CC_COMPONENT_ID_2_REG_OFFSET	0x0FF8UL</div><div class='add'>+#define CC_COMPONENT_ID_2_VALUE_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_COMPONENT_ID_2_VALUE_BIT_SIZE	0x8UL</div><div class='add'>+#define CC_COMPONENT_ID_3_REG_OFFSET	0x0FFCUL</div><div class='add'>+#define CC_COMPONENT_ID_3_VALUE_BIT_SHIFT	0x0UL</div><div class='add'>+#define CC_COMPONENT_ID_3_VALUE_BIT_SIZE	0x8UL</div><div class='add'>+// --------------------------------------</div><div class='ctx'> // BLOCK: HOST_SRAM</div><div class='ctx'> // --------------------------------------</div><div class='ctx'> #define CC_SRAM_DATA_REG_OFFSET	0xF00UL</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_hw_queue_defs.h b/drivers/crypto/ccree/cc_hw_queue_defs.h<br/>index 7a9b90db7db7..9f4db9956e91 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_hw_queue_defs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_hw_queue_defs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_hw_queue_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_hw_queue_defs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_HW_QUEUE_DEFS_H__</div><div class='ctx'> #define __CC_HW_QUEUE_DEFS_H__</div><div class='hunk'>@@ -28,11 +28,13 @@</div><div class='ctx'> 	GENMASK(CC_REG_HIGH(word, name), CC_REG_LOW(word, name))</div><div class='ctx'> </div><div class='ctx'> #define WORD0_VALUE		CC_GENMASK(0, VALUE)</div><div class='add'>+#define	WORD0_CPP_CIPHER_MODE	CC_GENMASK(0, CPP_CIPHER_MODE)</div><div class='ctx'> #define WORD1_DIN_CONST_VALUE	CC_GENMASK(1, DIN_CONST_VALUE)</div><div class='ctx'> #define WORD1_DIN_DMA_MODE	CC_GENMASK(1, DIN_DMA_MODE)</div><div class='ctx'> #define WORD1_DIN_SIZE		CC_GENMASK(1, DIN_SIZE)</div><div class='ctx'> #define WORD1_NOT_LAST		CC_GENMASK(1, NOT_LAST)</div><div class='ctx'> #define WORD1_NS_BIT		CC_GENMASK(1, NS_BIT)</div><div class='add'>+#define WORD1_LOCK_QUEUE	CC_GENMASK(1, LOCK_QUEUE)</div><div class='ctx'> #define WORD2_VALUE		CC_GENMASK(2, VALUE)</div><div class='ctx'> #define WORD3_DOUT_DMA_MODE	CC_GENMASK(3, DOUT_DMA_MODE)</div><div class='ctx'> #define WORD3_DOUT_LAST_IND	CC_GENMASK(3, DOUT_LAST_IND)</div><div class='hunk'>@@ -176,6 +178,15 @@ enum cc_hw_crypto_key {</div><div class='ctx'> 	END_OF_KEYS = S32_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CC_NUM_HW_KEY_SLOTS	4</div><div class='add'>+#define CC_FIRST_HW_KEY_SLOT	0</div><div class='add'>+#define CC_LAST_HW_KEY_SLOT	(CC_FIRST_HW_KEY_SLOT + CC_NUM_HW_KEY_SLOTS - 1)</div><div class='add'>+</div><div class='add'>+#define CC_NUM_CPP_KEY_SLOTS	8</div><div class='add'>+#define CC_FIRST_CPP_KEY_SLOT	16</div><div class='add'>+#define CC_LAST_CPP_KEY_SLOT	(CC_FIRST_CPP_KEY_SLOT + \</div><div class='add'>+					CC_NUM_CPP_KEY_SLOTS - 1)</div><div class='add'>+</div><div class='ctx'> enum cc_hw_aes_key_size {</div><div class='ctx'> 	AES_128_KEY = 0,</div><div class='ctx'> 	AES_192_KEY = 1,</div><div class='hunk'>@@ -189,6 +200,9 @@ enum cc_hash_cipher_pad {</div><div class='ctx'> 	HASH_CIPHER_DO_PADDING_RESERVE32 = S32_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CC_CPP_DIN_ADDR	0xFF00FF00UL</div><div class='add'>+#define CC_CPP_DIN_SIZE 0xFF00FFUL</div><div class='add'>+</div><div class='ctx'> /*****************************/</div><div class='ctx'> /* Descriptor packing macros */</div><div class='ctx'> /*****************************/</div><div class='hunk'>@@ -249,6 +263,25 @@ static inline void set_din_no_dma(struct cc_hw_desc *pdesc, u32 addr, u32 size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Setup the special CPP descriptor</div><div class='add'>+ *</div><div class='add'>+ * @pdesc: pointer HW descriptor struct</div><div class='add'>+ * @alg: cipher used (AES / SM4)</div><div class='add'>+ * @mode: mode used (CTR or CBC)</div><div class='add'>+ * @slot: slot number</div><div class='add'>+ * @ksize: key size</div><div class='add'>+ */</div><div class='add'>+static inline void set_cpp_crypto_key(struct cc_hw_desc *pdesc, u8 slot)</div><div class='add'>+{</div><div class='add'>+	pdesc-&gt;word[0] |= CC_CPP_DIN_ADDR;</div><div class='add'>+</div><div class='add'>+	pdesc-&gt;word[1] |= FIELD_PREP(WORD1_DIN_SIZE, CC_CPP_DIN_SIZE);</div><div class='add'>+	pdesc-&gt;word[1] |= FIELD_PREP(WORD1_LOCK_QUEUE, 1);</div><div class='add'>+</div><div class='add'>+	pdesc-&gt;word[4] |= FIELD_PREP(WORD4_SETUP_OPERATION, slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Set the DIN field of a HW descriptors to SRAM mode.</div><div class='ctx'>  * Note: No need to check SRAM alignment since host requests do not use SRAM and</div><div class='ctx'>  * adaptor will enforce alignment check.</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_ivgen.c b/drivers/crypto/ccree/cc_ivgen.c<br/>index 769458323394..99dc69383e20 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_ivgen.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_ivgen.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_ivgen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_ivgen.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/ctr.h&gt;</div><div class='ctx'> #include "cc_driver.h"</div><div class='hunk'>@@ -154,9 +154,6 @@ void cc_ivgen_fini(struct cc_drvdata *drvdata)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ivgen_ctx-&gt;pool = NULL_SRAM_ADDR;</div><div class='del'>-</div><div class='del'>-	/* release "this" context */</div><div class='del'>-	kfree(ivgen_ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drvdata)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate "this" context */</div><div class='del'>-	ivgen_ctx = kzalloc(sizeof(*ivgen_ctx), GFP_KERNEL);</div><div class='add'>+	ivgen_ctx = devm_kzalloc(device, sizeof(*ivgen_ctx), GFP_KERNEL);</div><div class='ctx'> 	if (!ivgen_ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	drvdata-&gt;ivgen_handle = ivgen_ctx;</div><div class='add'>+</div><div class='ctx'> 	/* Allocate pool's header for initial enc. key/IV */</div><div class='ctx'> 	ivgen_ctx-&gt;pool_meta = dma_alloc_coherent(device, CC_IVPOOL_META_SIZE,</div><div class='ctx'> 						  &amp;ivgen_ctx-&gt;pool_meta_dma,</div><div class='hunk'>@@ -196,8 +195,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	drvdata-&gt;ivgen_handle = ivgen_ctx;</div><div class='del'>-</div><div class='ctx'> 	return cc_init_iv_sram(drvdata);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_ivgen.h b/drivers/crypto/ccree/cc_ivgen.h<br/>index b6ac16903dda..a9f5e8bba4f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_ivgen.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_ivgen.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_ivgen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_ivgen.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_IVGEN_H__</div><div class='ctx'> #define __CC_IVGEN_H__</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_kernel_regs.h b/drivers/crypto/ccree/cc_kernel_regs.h<br/>index 8d7262a35156..582bae450596 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_kernel_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_kernel_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_kernel_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_kernel_regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_CRYS_KERNEL_H__</div><div class='ctx'> #define __CC_CRYS_KERNEL_H__</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_lli_defs.h b/drivers/crypto/ccree/cc_lli_defs.h<br/>index 64b15ac9f1d3..f891ab813f41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_lli_defs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_lli_defs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_lli_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_lli_defs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CC_LLI_DEFS_H_</div><div class='ctx'> #define _CC_LLI_DEFS_H_</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #define CC_MAX_MLLI_ENTRY_SIZE 0xFFFF</div><div class='ctx'> </div><div class='ctx'> #define LLI_MAX_NUM_OF_DATA_ENTRIES 128</div><div class='del'>-#define LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES 4</div><div class='add'>+#define LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES 8</div><div class='ctx'> #define MLLI_TABLE_MIN_ALIGNMENT 4 /* 32 bit alignment */</div><div class='ctx'> #define MAX_NUM_OF_BUFFERS_IN_MLLI 4</div><div class='ctx'> #define MAX_NUM_OF_TOTAL_MLLI_ENTRIES \</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c<br/>index 6ff7e75ad90e..2dad9c9543c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_pm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_pm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_pm.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include "cc_ivgen.h"</div><div class='ctx'> #include "cc_hash.h"</div><div class='ctx'> #include "cc_pm.h"</div><div class='add'>+#include "cc_fips.h"</div><div class='ctx'> </div><div class='ctx'> #define POWER_DOWN_ENABLE 0x01</div><div class='ctx'> #define POWER_DOWN_DISABLE 0x00</div><div class='hunk'>@@ -25,13 +26,13 @@ int cc_pm_suspend(struct device *dev)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "set HOST_POWER_DOWN_EN\n");</div><div class='del'>-	cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE);</div><div class='ctx'> 	rc = cc_suspend_req_queue(drvdata);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(dev, "cc_suspend_req_queue (%x)\n", rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	fini_cc_regs(drvdata);</div><div class='add'>+	cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE);</div><div class='ctx'> 	cc_clk_off(drvdata);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -42,19 +43,21 @@ int cc_pm_resume(struct device *dev)</div><div class='ctx'> 	struct cc_drvdata *drvdata = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "unset HOST_POWER_DOWN_EN\n");</div><div class='del'>-	cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE);</div><div class='del'>-</div><div class='add'>+	/* Enables the device source clk */</div><div class='ctx'> 	rc = cc_clk_on(drvdata);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(dev, "failed getting clock back on. We're toast.\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE);</div><div class='ctx'> 	rc = init_cc_regs(drvdata, false);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(dev, "init_cc_regs (%x)\n", rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='add'>+	/* check if tee fips error occurred during power down */</div><div class='add'>+	cc_tee_handle_fips_error(drvdata);</div><div class='ctx'> </div><div class='ctx'> 	rc = cc_resume_req_queue(drvdata);</div><div class='ctx'> 	if (rc) {</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_pm.h b/drivers/crypto/ccree/cc_pm.h<br/>index 907a6db4d6c0..6190cdba5dad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_pm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_pm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_pm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_pm.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_pm.h</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_request_mgr.c b/drivers/crypto/ccree/cc_request_mgr.c<br/>index 83a8aaae61c7..0bc6ccb0b899 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_request_mgr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_request_mgr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_request_mgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_request_mgr.c</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> #include "cc_driver.h"</div><div class='ctx'> #include "cc_buffer_mgr.h"</div><div class='ctx'> #include "cc_request_mgr.h"</div><div class='hunk'>@@ -52,11 +53,38 @@ struct cc_bl_item {</div><div class='ctx'> 	bool notif;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const u32 cc_cpp_int_masks[CC_CPP_NUM_ALGS][CC_CPP_NUM_SLOTS] = {</div><div class='add'>+	{ BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_0_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_1_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_2_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_3_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_4_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_5_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_6_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_AES_7_INT_BIT_SHIFT) },</div><div class='add'>+	{ BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_0_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_1_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_2_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_3_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_4_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_5_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_6_INT_BIT_SHIFT),</div><div class='add'>+	  BIT(CC_HOST_IRR_REE_OP_ABORTED_SM_7_INT_BIT_SHIFT) }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void comp_handler(unsigned long devarg);</div><div class='ctx'> #ifdef COMP_IN_WQ</div><div class='ctx'> static void comp_work_handler(struct work_struct *work);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline u32 cc_cpp_int_mask(enum cc_cpp_alg alg, int slot)</div><div class='add'>+{</div><div class='add'>+	alg = array_index_nospec(alg, CC_CPP_NUM_ALGS);</div><div class='add'>+	slot = array_index_nospec(slot, CC_CPP_NUM_SLOTS);</div><div class='add'>+</div><div class='add'>+	return cc_cpp_int_masks[alg][slot];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void cc_req_mgr_fini(struct cc_drvdata *drvdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct cc_req_mgr_handle *req_mgr_h = drvdata-&gt;request_mgr_handle;</div><div class='hunk'>@@ -336,10 +364,12 @@ static void cc_enqueue_backlog(struct cc_drvdata *drvdata,</div><div class='ctx'> 			       struct cc_bl_item *bli)</div><div class='ctx'> {</div><div class='ctx'> 	struct cc_req_mgr_handle *mgr = drvdata-&gt;request_mgr_handle;</div><div class='add'>+	struct device *dev = drvdata_to_dev(drvdata);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;mgr-&gt;bl_lock);</div><div class='ctx'> 	list_add_tail(&amp;bli-&gt;list, &amp;mgr-&gt;backlog);</div><div class='ctx'> 	++mgr-&gt;bl_len;</div><div class='add'>+	dev_dbg(dev, "+++bl len: %d\n", mgr-&gt;bl_len);</div><div class='ctx'> 	spin_unlock_bh(&amp;mgr-&gt;bl_lock);</div><div class='ctx'> 	tasklet_schedule(&amp;mgr-&gt;comptask);</div><div class='ctx'> }</div><div class='hunk'>@@ -349,7 +379,7 @@ static void cc_proc_backlog(struct cc_drvdata *drvdata)</div><div class='ctx'> 	struct cc_req_mgr_handle *mgr = drvdata-&gt;request_mgr_handle;</div><div class='ctx'> 	struct cc_bl_item *bli;</div><div class='ctx'> 	struct cc_crypto_req *creq;</div><div class='del'>-	struct crypto_async_request *req;</div><div class='add'>+	void *req;</div><div class='ctx'> 	bool ivgen;</div><div class='ctx'> 	unsigned int total_len;</div><div class='ctx'> 	struct device *dev = drvdata_to_dev(drvdata);</div><div class='hunk'>@@ -359,17 +389,20 @@ static void cc_proc_backlog(struct cc_drvdata *drvdata)</div><div class='ctx'> </div><div class='ctx'> 	while (mgr-&gt;bl_len) {</div><div class='ctx'> 		bli = list_first_entry(&amp;mgr-&gt;backlog, struct cc_bl_item, list);</div><div class='add'>+		dev_dbg(dev, "---bl len: %d\n", mgr-&gt;bl_len);</div><div class='add'>+</div><div class='ctx'> 		spin_unlock(&amp;mgr-&gt;bl_lock);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 		creq = &amp;bli-&gt;creq;</div><div class='del'>-		req = (struct crypto_async_request *)creq-&gt;user_arg;</div><div class='add'>+		req = creq-&gt;user_arg;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Notify the request we're moving out of the backlog</div><div class='ctx'> 		 * but only if we haven't done so already.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!bli-&gt;notif) {</div><div class='del'>-			req-&gt;complete(req, -EINPROGRESS);</div><div class='add'>+			creq-&gt;user_cb(dev, req, -EINPROGRESS);</div><div class='ctx'> 			bli-&gt;notif = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -579,6 +612,8 @@ static void proc_completions(struct cc_drvdata *drvdata)</div><div class='ctx'> 						drvdata-&gt;request_mgr_handle;</div><div class='ctx'> 	unsigned int *tail = &amp;request_mgr_handle-&gt;req_queue_tail;</div><div class='ctx'> 	unsigned int *head = &amp;request_mgr_handle-&gt;req_queue_head;</div><div class='add'>+	int rc;</div><div class='add'>+	u32 mask;</div><div class='ctx'> </div><div class='ctx'> 	while (request_mgr_handle-&gt;axi_completed) {</div><div class='ctx'> 		request_mgr_handle-&gt;axi_completed--;</div><div class='hunk'>@@ -596,8 +631,22 @@ static void proc_completions(struct cc_drvdata *drvdata)</div><div class='ctx'> </div><div class='ctx'> 		cc_req = &amp;request_mgr_handle-&gt;req_queue[*tail];</div><div class='ctx'> </div><div class='add'>+		if (cc_req-&gt;cpp.is_cpp) {</div><div class='add'>+</div><div class='add'>+			dev_dbg(dev, "CPP request completion slot: %d alg:%d\n",</div><div class='add'>+				cc_req-&gt;cpp.slot, cc_req-&gt;cpp.alg);</div><div class='add'>+			mask = cc_cpp_int_mask(cc_req-&gt;cpp.alg,</div><div class='add'>+					       cc_req-&gt;cpp.slot);</div><div class='add'>+			rc = (drvdata-&gt;irq &amp; mask ? -EPERM : 0);</div><div class='add'>+			dev_dbg(dev, "Got mask: %x irq: %x rc: %d\n", mask,</div><div class='add'>+				drvdata-&gt;irq, rc);</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(dev, "None CPP request completion\n");</div><div class='add'>+			rc = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (cc_req-&gt;user_cb)</div><div class='del'>-			cc_req-&gt;user_cb(dev, cc_req-&gt;user_arg, 0);</div><div class='add'>+			cc_req-&gt;user_cb(dev, cc_req-&gt;user_arg, rc);</div><div class='ctx'> 		*tail = (*tail + 1) &amp; (MAX_REQUEST_QUEUE_SIZE - 1);</div><div class='ctx'> 		dev_dbg(dev, "Dequeue request tail=%u\n", *tail);</div><div class='ctx'> 		dev_dbg(dev, "Request completed. axi_completed=%d\n",</div><div class='hunk'>@@ -618,47 +667,50 @@ static void comp_handler(unsigned long devarg)</div><div class='ctx'> 	struct cc_drvdata *drvdata = (struct cc_drvdata *)devarg;</div><div class='ctx'> 	struct cc_req_mgr_handle *request_mgr_handle =</div><div class='ctx'> 						drvdata-&gt;request_mgr_handle;</div><div class='del'>-</div><div class='add'>+	struct device *dev = drvdata_to_dev(drvdata);</div><div class='ctx'> 	u32 irq;</div><div class='ctx'> </div><div class='del'>-	irq = (drvdata-&gt;irq &amp; CC_COMP_IRQ_MASK);</div><div class='add'>+	dev_dbg(dev, "Completion handler called!\n");</div><div class='add'>+	irq = (drvdata-&gt;irq &amp; drvdata-&gt;comp_mask);</div><div class='ctx'> </div><div class='del'>-	if (irq &amp; CC_COMP_IRQ_MASK) {</div><div class='del'>-		/* To avoid the interrupt from firing as we unmask it,</div><div class='del'>-		 * we clear it now</div><div class='del'>-		 */</div><div class='del'>-		cc_iowrite(drvdata, CC_REG(HOST_ICR), CC_COMP_IRQ_MASK);</div><div class='add'>+	/* To avoid the interrupt from firing as we unmask it,</div><div class='add'>+	 * we clear it now</div><div class='add'>+	 */</div><div class='add'>+	cc_iowrite(drvdata, CC_REG(HOST_ICR), irq);</div><div class='ctx'> </div><div class='del'>-		/* Avoid race with above clear: Test completion counter</div><div class='del'>-		 * once more</div><div class='del'>-		 */</div><div class='del'>-		request_mgr_handle-&gt;axi_completed +=</div><div class='del'>-				cc_axi_comp_count(drvdata);</div><div class='del'>-</div><div class='del'>-		while (request_mgr_handle-&gt;axi_completed) {</div><div class='del'>-			do {</div><div class='del'>-				proc_completions(drvdata);</div><div class='del'>-				/* At this point (after proc_completions()),</div><div class='del'>-				 * request_mgr_handle-&gt;axi_completed is 0.</div><div class='del'>-				 */</div><div class='del'>-				request_mgr_handle-&gt;axi_completed =</div><div class='del'>-						cc_axi_comp_count(drvdata);</div><div class='del'>-			} while (request_mgr_handle-&gt;axi_completed &gt; 0);</div><div class='add'>+	/* Avoid race with above clear: Test completion counter once more */</div><div class='ctx'> </div><div class='del'>-			cc_iowrite(drvdata, CC_REG(HOST_ICR),</div><div class='del'>-				   CC_COMP_IRQ_MASK);</div><div class='add'>+	request_mgr_handle-&gt;axi_completed += cc_axi_comp_count(drvdata);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "AXI completion after updated: %d\n",</div><div class='add'>+		request_mgr_handle-&gt;axi_completed);</div><div class='add'>+</div><div class='add'>+	while (request_mgr_handle-&gt;axi_completed) {</div><div class='add'>+		do {</div><div class='add'>+			drvdata-&gt;irq |= cc_ioread(drvdata, CC_REG(HOST_IRR));</div><div class='add'>+			irq = (drvdata-&gt;irq &amp; drvdata-&gt;comp_mask);</div><div class='add'>+			proc_completions(drvdata);</div><div class='ctx'> </div><div class='add'>+			/* At this point (after proc_completions()),</div><div class='add'>+			 * request_mgr_handle-&gt;axi_completed is 0.</div><div class='add'>+			 */</div><div class='ctx'> 			request_mgr_handle-&gt;axi_completed +=</div><div class='del'>-					cc_axi_comp_count(drvdata);</div><div class='del'>-		}</div><div class='add'>+						cc_axi_comp_count(drvdata);</div><div class='add'>+		} while (request_mgr_handle-&gt;axi_completed &gt; 0);</div><div class='add'>+</div><div class='add'>+		cc_iowrite(drvdata, CC_REG(HOST_ICR), irq);</div><div class='add'>+</div><div class='add'>+		request_mgr_handle-&gt;axi_completed += cc_axi_comp_count(drvdata);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* after verifing that there is nothing to do,</div><div class='ctx'> 	 * unmask AXI completion interrupt</div><div class='ctx'> 	 */</div><div class='ctx'> 	cc_iowrite(drvdata, CC_REG(HOST_IMR),</div><div class='del'>-		   cc_ioread(drvdata, CC_REG(HOST_IMR)) &amp; ~irq);</div><div class='add'>+		   cc_ioread(drvdata, CC_REG(HOST_IMR)) &amp; ~drvdata-&gt;comp_mask);</div><div class='ctx'> </div><div class='ctx'> 	cc_proc_backlog(drvdata);</div><div class='add'>+	dev_dbg(dev, "Comp. handler done.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_request_mgr.h b/drivers/crypto/ccree/cc_request_mgr.h<br/>index 573cb97af085..f46cf766fe4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_request_mgr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_request_mgr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_request_mgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_request_mgr.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> /* \file cc_request_mgr.h</div><div class='ctx'>  * Request Manager</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_sram_mgr.c b/drivers/crypto/ccree/cc_sram_mgr.c<br/>index c8c276f6dee9..62c885e6e791 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_sram_mgr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_sram_mgr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_sram_mgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_sram_mgr.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #include "cc_driver.h"</div><div class='ctx'> #include "cc_sram_mgr.h"</div><div class='hunk'>@@ -19,8 +19,7 @@ struct cc_sram_ctx {</div><div class='ctx'>  */</div><div class='ctx'> void cc_sram_mgr_fini(struct cc_drvdata *drvdata)</div><div class='ctx'> {</div><div class='del'>-	/* Free "this" context */</div><div class='del'>-	kfree(drvdata-&gt;sram_mgr_handle);</div><div class='add'>+	/* Nothing needed */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -48,7 +47,7 @@ int cc_sram_mgr_init(struct cc_drvdata *drvdata)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate "this" context */</div><div class='del'>-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/crypto/ccree/cc_sram_mgr.h b/drivers/crypto/ccree/cc_sram_mgr.h<br/>index d48649fb3323..1d14de9ee8c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_sram_mgr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ccree/cc_sram_mgr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ccree/cc_sram_mgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ccree/cc_sram_mgr.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */</div><div class='add'>+/* Copyright (C) 2012-2019 ARM Limited (or its affiliates). */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CC_SRAM_MGR_H__</div><div class='ctx'> #define __CC_SRAM_MGR_H__</div><div class='head'>diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c<br/>index 8d8cf80b9294..8a76fce22943 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/chelsio/chcr_algo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/chelsio/chcr_algo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/chelsio/chcr_algo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/chelsio/chcr_algo.c</a></div><div class='hunk'>@@ -2130,7 +2130,6 @@ static int chcr_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 	 * ipad in hmacctx-&gt;ipad and opad in hmacctx-&gt;opad location</div><div class='ctx'> 	 */</div><div class='ctx'> 	shash-&gt;tfm = hmacctx-&gt;base_hash;</div><div class='del'>-	shash-&gt;flags = crypto_shash_get_flags(hmacctx-&gt;base_hash);</div><div class='ctx'> 	if (keylen &gt; bs) {</div><div class='ctx'> 		err = crypto_shash_digest(shash, key, keylen,</div><div class='ctx'> 					  hmacctx-&gt;ipad);</div><div class='hunk'>@@ -3517,7 +3516,6 @@ static int chcr_authenc_setkey(struct crypto_aead *authenc, const u8 *key,</div><div class='ctx'> 		SHASH_DESC_ON_STACK(shash, base_hash);</div><div class='ctx'> </div><div class='ctx'> 		shash-&gt;tfm = base_hash;</div><div class='del'>-		shash-&gt;flags = crypto_shash_get_flags(base_hash);</div><div class='ctx'> 		bs = crypto_shash_blocksize(base_hash);</div><div class='ctx'> 		align = KEYCTX_ALIGN_PAD(max_authsize);</div><div class='ctx'> 		o_ptr =  actx-&gt;h_iopad + param.result_size + align;</div><div class='head'>diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c<br/>index dad212cabe63..d656be0a142b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/hifn_795x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/hifn_795x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/hifn_795x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/hifn_795x.c</a></div><div class='hunk'>@@ -1976,6 +1976,29 @@ static int hifn_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hifn_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+			    unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	struct hifn_device *dev = ctx-&gt;dev;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;flags &amp;= ~HIFN_FLAG_OLD_KEY;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;key, key, len);</div><div class='add'>+	ctx-&gt;keysize = len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hifn_handle_req(struct ablkcipher_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct hifn_context *ctx = crypto_tfm_ctx(req-&gt;base.tfm);</div><div class='hunk'>@@ -2240,7 +2263,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {</div><div class='ctx'> 		.ablkcipher = {</div><div class='ctx'> 			.min_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='ctx'> 			.max_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='del'>-			.setkey		=	hifn_setkey,</div><div class='add'>+			.setkey		=	hifn_des3_setkey,</div><div class='ctx'> 			.encrypt	=	hifn_encrypt_3des_cfb,</div><div class='ctx'> 			.decrypt	=	hifn_decrypt_3des_cfb,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -2250,7 +2273,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {</div><div class='ctx'> 		.ablkcipher = {</div><div class='ctx'> 			.min_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='ctx'> 			.max_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='del'>-			.setkey		=	hifn_setkey,</div><div class='add'>+			.setkey		=	hifn_des3_setkey,</div><div class='ctx'> 			.encrypt	=	hifn_encrypt_3des_ofb,</div><div class='ctx'> 			.decrypt	=	hifn_decrypt_3des_ofb,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -2261,7 +2284,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {</div><div class='ctx'> 			.ivsize		=	HIFN_IV_LENGTH,</div><div class='ctx'> 			.min_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='ctx'> 			.max_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='del'>-			.setkey		=	hifn_setkey,</div><div class='add'>+			.setkey		=	hifn_des3_setkey,</div><div class='ctx'> 			.encrypt	=	hifn_encrypt_3des_cbc,</div><div class='ctx'> 			.decrypt	=	hifn_decrypt_3des_cbc,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -2271,7 +2294,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {</div><div class='ctx'> 		.ablkcipher = {</div><div class='ctx'> 			.min_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='ctx'> 			.max_keysize	=	HIFN_3DES_KEY_LENGTH,</div><div class='del'>-			.setkey		=	hifn_setkey,</div><div class='add'>+			.setkey		=	hifn_des3_setkey,</div><div class='ctx'> 			.encrypt	=	hifn_encrypt_3des_ecb,</div><div class='ctx'> 			.decrypt	=	hifn_decrypt_3des_ecb,</div><div class='ctx'> 		},</div><div class='head'>diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c<br/>index adc0cd8ae97b..02768af0dccd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/hisilicon/sec/sec_algs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/hisilicon/sec/sec_algs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/hisilicon/sec/sec_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/hisilicon/sec/sec_algs.c</a></div><div class='hunk'>@@ -365,20 +365,16 @@ static int sec_alg_skcipher_setkey_des_cbc(struct crypto_skcipher *tfm,</div><div class='ctx'> static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm,</div><div class='ctx'> 					    const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	if (keylen != DES_KEY_SIZE * 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return sec_alg_skcipher_setkey(tfm, key, keylen,</div><div class='add'>+	return unlikely(des3_verify_key(tfm, key)) ?:</div><div class='add'>+	       sec_alg_skcipher_setkey(tfm, key, keylen,</div><div class='ctx'> 				       SEC_C_3DES_ECB_192_3KEY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sec_alg_skcipher_setkey_3des_cbc(struct crypto_skcipher *tfm,</div><div class='ctx'> 					    const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	if (keylen != DES3_EDE_KEY_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return sec_alg_skcipher_setkey(tfm, key, keylen,</div><div class='add'>+	return unlikely(des3_verify_key(tfm, key)) ?:</div><div class='add'>+	       sec_alg_skcipher_setkey(tfm, key, keylen,</div><div class='ctx'> 				       SEC_C_3DES_CBC_192_3KEY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c<br/>index 7ef30a98cb24..de4be10b172f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/inside-secure/safexcel_cipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/inside-secure/safexcel_cipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/inside-secure/safexcel_cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/inside-secure/safexcel_cipher.c</a></div><div class='hunk'>@@ -1039,13 +1039,12 @@ static int safexcel_cbc_des3_ede_decrypt(struct skcipher_request *req)</div><div class='ctx'> static int safexcel_des3_ede_setkey(struct crypto_skcipher *ctfm,</div><div class='ctx'> 				   const u8 *key, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_tfm *tfm = crypto_skcipher_tfm(ctfm);</div><div class='del'>-	struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct safexcel_cipher_ctx *ctx = crypto_skcipher_ctx(ctfm);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (len != DES3_EDE_KEY_SIZE) {</div><div class='del'>-		crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = des3_verify_key(ctfm, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* if context exits and key changed, need to invalidate it */</div><div class='ctx'> 	if (ctx-&gt;base.ctxr_dma) {</div><div class='head'>diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c<br/>index 5c4659b04d70..9bbde2f26cac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ixp4xx_crypto.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ixp4xx_crypto.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ixp4xx_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ixp4xx_crypto.c</a></div><div class='hunk'>@@ -758,14 +758,6 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		cipher_cfg |= keylen_cfg;</div><div class='del'>-	} else if (cipher_cfg &amp; MOD_3DES) {</div><div class='del'>-		const u32 *K = (const u32 *)key;</div><div class='del'>-		if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-			     !((K[2] ^ K[4]) | (K[3] ^ K[5]))))</div><div class='del'>-		{</div><div class='del'>-			*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 tmp[DES_EXPKEY_WORDS];</div><div class='ctx'> 		if (des_ekey(tmp, key) == 0) {</div><div class='hunk'>@@ -859,6 +851,19 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ablk_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	u32 flags = crypto_ablkcipher_get_flags(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		crypto_ablkcipher_set_flags(tfm, flags);</div><div class='add'>+</div><div class='add'>+	return ablk_setkey(tfm, key, key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ablk_rfc3686_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> 		unsigned int key_len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1175,6 +1180,43 @@ badkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int des3_aead_setkey(struct crypto_aead *tfm, const u8 *key,</div><div class='add'>+			    unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct ixp_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	u32 flags = CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_authenc_extractkeys(&amp;keys, key, keylen);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (keys.authkeylen &gt; sizeof(ctx-&gt;authkey))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	if (keys.enckeylen != DES3_EDE_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	flags = crypto_aead_get_flags(tfm);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;authkey, keys.authkey, keys.authkeylen);</div><div class='add'>+	memcpy(ctx-&gt;enckey, keys.enckey, keys.enckeylen);</div><div class='add'>+	ctx-&gt;authkey_len = keys.authkeylen;</div><div class='add'>+	ctx-&gt;enckey_len = keys.enckeylen;</div><div class='add'>+</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return aead_setup(tfm, crypto_aead_authsize(tfm));</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(tfm, flags);</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aead_encrypt(struct aead_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	return aead_perform(req, 1, req-&gt;assoclen, req-&gt;cryptlen, req-&gt;iv);</div><div class='hunk'>@@ -1220,6 +1262,7 @@ static struct ixp_alg ixp4xx_algos[] = {</div><div class='ctx'> 			.min_keysize	= DES3_EDE_KEY_SIZE,</div><div class='ctx'> 			.max_keysize	= DES3_EDE_KEY_SIZE,</div><div class='ctx'> 			.ivsize		= DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.setkey		= ablk_des3_setkey,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1232,6 +1275,7 @@ static struct ixp_alg ixp4xx_algos[] = {</div><div class='ctx'> 		.cra_u		= { .ablkcipher = {</div><div class='ctx'> 			.min_keysize	= DES3_EDE_KEY_SIZE,</div><div class='ctx'> 			.max_keysize	= DES3_EDE_KEY_SIZE,</div><div class='add'>+			.setkey		= ablk_des3_setkey,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1313,6 +1357,7 @@ static struct ixp_aead_alg ixp4xx_aeads[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.ivsize		= DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 		.maxauthsize	= MD5_DIGEST_SIZE,</div><div class='add'>+		.setkey		= des3_aead_setkey,</div><div class='ctx'> 	},</div><div class='ctx'> 	.hash = &amp;hash_alg_md5,</div><div class='ctx'> 	.cfg_enc = CIPH_ENCR | MOD_3DES | MOD_CBC_ENC | KEYLEN_192,</div><div class='hunk'>@@ -1337,6 +1382,7 @@ static struct ixp_aead_alg ixp4xx_aeads[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.ivsize		= DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 		.maxauthsize	= SHA1_DIGEST_SIZE,</div><div class='add'>+		.setkey		= des3_aead_setkey,</div><div class='ctx'> 	},</div><div class='ctx'> 	.hash = &amp;hash_alg_sha1,</div><div class='ctx'> 	.cfg_enc = CIPH_ENCR | MOD_3DES | MOD_CBC_ENC | KEYLEN_192,</div><div class='hunk'>@@ -1443,7 +1489,7 @@ static int __init ixp_module_init(void)</div><div class='ctx'> 		/* authenc */</div><div class='ctx'> 		cra-&gt;base.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |</div><div class='ctx'> 				      CRYPTO_ALG_ASYNC;</div><div class='del'>-		cra-&gt;setkey = aead_setkey;</div><div class='add'>+		cra-&gt;setkey = cra-&gt;setkey ?: aead_setkey;</div><div class='ctx'> 		cra-&gt;setauthsize = aead_setauthsize;</div><div class='ctx'> 		cra-&gt;encrypt = aead_encrypt;</div><div class='ctx'> 		cra-&gt;decrypt = aead_decrypt;</div><div class='head'>diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c<br/>index fb279b3a1ca1..2fd936b19c6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/marvell/cipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/marvell/cipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/marvell/cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/marvell/cipher.c</a></div><div class='hunk'>@@ -299,13 +299,12 @@ static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key,</div><div class='ctx'> static int mv_cesa_des3_ede_setkey(struct crypto_skcipher *cipher,</div><div class='ctx'> 				   const u8 *key, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);</div><div class='del'>-	struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct mv_cesa_des_ctx *ctx = crypto_skcipher_ctx(cipher);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (len != DES3_EDE_KEY_SIZE) {</div><div class='del'>-		crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = des3_verify_key(cipher, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ctx-&gt;key, key, DES3_EDE_KEY_SIZE);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c<br/>index 99ff54cc8a15..fd456dd703bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/marvell/hash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/marvell/hash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/marvell/hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/marvell/hash.c</a></div><div class='hunk'>@@ -135,11 +135,10 @@ static int mv_cesa_ahash_pad_len(struct mv_cesa_ahash_req *creq)</div><div class='ctx'> </div><div class='ctx'> static int mv_cesa_ahash_pad_req(struct mv_cesa_ahash_req *creq, u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	unsigned int index, padlen;</div><div class='add'>+	unsigned int padlen;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = 0x80;</div><div class='ctx'> 	/* Pad out to 56 mod 64 */</div><div class='del'>-	index = creq-&gt;len &amp; CESA_HASH_BLOCK_SIZE_MSK;</div><div class='ctx'> 	padlen = mv_cesa_ahash_pad_len(creq);</div><div class='ctx'> 	memset(buf + 1, 0, padlen - 1);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/mediatek/mtk-sha.c b/drivers/crypto/mediatek/mtk-sha.c<br/>index 5f4f845adbb8..a0806ba40c68 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/mediatek/mtk-sha.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/mediatek/mtk-sha.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/mediatek/mtk-sha.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/mediatek/mtk-sha.c</a></div><div class='hunk'>@@ -365,7 +365,6 @@ static int mtk_sha_finish_hmac(struct ahash_request *req)</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, bctx-&gt;shash);</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = bctx-&gt;shash;</div><div class='del'>-	shash-&gt;flags = 0; /* not CRYPTO_TFM_REQ_MAY_SLEEP */</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_init(shash) ?:</div><div class='ctx'> 	       crypto_shash_update(shash, bctx-&gt;opad, ctx-&gt;bs) ?:</div><div class='hunk'>@@ -810,8 +809,6 @@ static int mtk_sha_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, bctx-&gt;shash);</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = bctx-&gt;shash;</div><div class='del'>-	shash-&gt;flags = crypto_shash_get_flags(bctx-&gt;shash) &amp;</div><div class='del'>-		       CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen &gt; bs) {</div><div class='ctx'> 		err = crypto_shash_digest(shash, key, keylen, bctx-&gt;ipad);</div><div class='head'>diff --git a/drivers/crypto/mxc-scc.c b/drivers/crypto/mxc-scc.c<br/>deleted file mode 100644<br/>index 519086730791..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/mxc-scc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/mxc-scc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,767 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2016 Pengutronix, Steffen Trumtrar &lt;kernel@pengutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * The driver is based on information gathered from</div><div class='del'>- * drivers/mxc/security/mxc_scc.c which can be found in</div><div class='del'>- * the Freescale linux-2.6-imx.git in the imx_2.6.35_maintain branch.</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</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 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'>- */</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/irq.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/mutex.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/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='del'>-#include &lt;crypto/des.h&gt;</div><div class='del'>-</div><div class='del'>-/* Secure Memory (SCM) registers */</div><div class='del'>-#define SCC_SCM_RED_START		0x0000</div><div class='del'>-#define SCC_SCM_BLACK_START		0x0004</div><div class='del'>-#define SCC_SCM_LENGTH			0x0008</div><div class='del'>-#define SCC_SCM_CTRL			0x000C</div><div class='del'>-#define SCC_SCM_STATUS			0x0010</div><div class='del'>-#define SCC_SCM_ERROR_STATUS		0x0014</div><div class='del'>-#define SCC_SCM_INTR_CTRL		0x0018</div><div class='del'>-#define SCC_SCM_CFG			0x001C</div><div class='del'>-#define SCC_SCM_INIT_VECTOR_0		0x0020</div><div class='del'>-#define SCC_SCM_INIT_VECTOR_1		0x0024</div><div class='del'>-#define SCC_SCM_RED_MEMORY		0x0400</div><div class='del'>-#define SCC_SCM_BLACK_MEMORY		0x0800</div><div class='del'>-</div><div class='del'>-/* Security Monitor (SMN) Registers */</div><div class='del'>-#define SCC_SMN_STATUS			0x1000</div><div class='del'>-#define SCC_SMN_COMMAND		0x1004</div><div class='del'>-#define SCC_SMN_SEQ_START		0x1008</div><div class='del'>-#define SCC_SMN_SEQ_END		0x100C</div><div class='del'>-#define SCC_SMN_SEQ_CHECK		0x1010</div><div class='del'>-#define SCC_SMN_BIT_COUNT		0x1014</div><div class='del'>-#define SCC_SMN_BITBANK_INC_SIZE	0x1018</div><div class='del'>-#define SCC_SMN_BITBANK_DECREMENT	0x101C</div><div class='del'>-#define SCC_SMN_COMPARE_SIZE		0x1020</div><div class='del'>-#define SCC_SMN_PLAINTEXT_CHECK	0x1024</div><div class='del'>-#define SCC_SMN_CIPHERTEXT_CHECK	0x1028</div><div class='del'>-#define SCC_SMN_TIMER_IV		0x102C</div><div class='del'>-#define SCC_SMN_TIMER_CONTROL		0x1030</div><div class='del'>-#define SCC_SMN_DEBUG_DETECT_STAT	0x1034</div><div class='del'>-#define SCC_SMN_TIMER			0x1038</div><div class='del'>-</div><div class='del'>-#define SCC_SCM_CTRL_START_CIPHER	BIT(2)</div><div class='del'>-#define SCC_SCM_CTRL_CBC_MODE		BIT(1)</div><div class='del'>-#define SCC_SCM_CTRL_DECRYPT_MODE	BIT(0)</div><div class='del'>-</div><div class='del'>-#define SCC_SCM_STATUS_LEN_ERR		BIT(12)</div><div class='del'>-#define SCC_SCM_STATUS_SMN_UNBLOCKED	BIT(11)</div><div class='del'>-#define SCC_SCM_STATUS_CIPHERING_DONE	BIT(10)</div><div class='del'>-#define SCC_SCM_STATUS_ZEROIZING_DONE	BIT(9)</div><div class='del'>-#define SCC_SCM_STATUS_INTR_STATUS	BIT(8)</div><div class='del'>-#define SCC_SCM_STATUS_SEC_KEY		BIT(7)</div><div class='del'>-#define SCC_SCM_STATUS_INTERNAL_ERR	BIT(6)</div><div class='del'>-#define SCC_SCM_STATUS_BAD_SEC_KEY	BIT(5)</div><div class='del'>-#define SCC_SCM_STATUS_ZEROIZE_FAIL	BIT(4)</div><div class='del'>-#define SCC_SCM_STATUS_SMN_BLOCKED	BIT(3)</div><div class='del'>-#define SCC_SCM_STATUS_CIPHERING	BIT(2)</div><div class='del'>-#define SCC_SCM_STATUS_ZEROIZING	BIT(1)</div><div class='del'>-#define SCC_SCM_STATUS_BUSY		BIT(0)</div><div class='del'>-</div><div class='del'>-#define SCC_SMN_STATUS_STATE_MASK	0x0000001F</div><div class='del'>-#define SCC_SMN_STATE_START		0x0</div><div class='del'>-/* The SMN is zeroizing its RAM during reset */</div><div class='del'>-#define SCC_SMN_STATE_ZEROIZE_RAM	0x5</div><div class='del'>-/* SMN has passed internal checks */</div><div class='del'>-#define SCC_SMN_STATE_HEALTH_CHECK	0x6</div><div class='del'>-/* Fatal Security Violation. SMN is locked, SCM is inoperative. */</div><div class='del'>-#define SCC_SMN_STATE_FAIL		0x9</div><div class='del'>-/* SCC is in secure state. SCM is using secret key. */</div><div class='del'>-#define SCC_SMN_STATE_SECURE		0xA</div><div class='del'>-/* SCC is not secure. SCM is using default key. */</div><div class='del'>-#define SCC_SMN_STATE_NON_SECURE	0xC</div><div class='del'>-</div><div class='del'>-#define SCC_SCM_INTR_CTRL_ZEROIZE_MEM	BIT(2)</div><div class='del'>-#define SCC_SCM_INTR_CTRL_CLR_INTR	BIT(1)</div><div class='del'>-#define SCC_SCM_INTR_CTRL_MASK_INTR	BIT(0)</div><div class='del'>-</div><div class='del'>-/* Size, in blocks, of Red memory. */</div><div class='del'>-#define SCC_SCM_CFG_BLACK_SIZE_MASK	0x07fe0000</div><div class='del'>-#define SCC_SCM_CFG_BLACK_SIZE_SHIFT	17</div><div class='del'>-/* Size, in blocks, of Black memory. */</div><div class='del'>-#define SCC_SCM_CFG_RED_SIZE_MASK	0x0001ff80</div><div class='del'>-#define SCC_SCM_CFG_RED_SIZE_SHIFT	7</div><div class='del'>-/* Number of bytes per block. */</div><div class='del'>-#define SCC_SCM_CFG_BLOCK_SIZE_MASK	0x0000007f</div><div class='del'>-</div><div class='del'>-#define SCC_SMN_COMMAND_TAMPER_LOCK	BIT(4)</div><div class='del'>-#define SCC_SMN_COMMAND_CLR_INTR	BIT(3)</div><div class='del'>-#define SCC_SMN_COMMAND_CLR_BIT_BANK	BIT(2)</div><div class='del'>-#define SCC_SMN_COMMAND_EN_INTR	BIT(1)</div><div class='del'>-#define SCC_SMN_COMMAND_SET_SOFTWARE_ALARM  BIT(0)</div><div class='del'>-</div><div class='del'>-#define SCC_KEY_SLOTS			20</div><div class='del'>-#define SCC_MAX_KEY_SIZE		32</div><div class='del'>-#define SCC_KEY_SLOT_SIZE		32</div><div class='del'>-</div><div class='del'>-#define SCC_CRC_CCITT_START		0xFFFF</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Offset into each RAM of the base of the area which is not</div><div class='del'>- * used for Stored Keys.</div><div class='del'>- */</div><div class='del'>-#define SCC_NON_RESERVED_OFFSET	(SCC_KEY_SLOTS * SCC_KEY_SLOT_SIZE)</div><div class='del'>-</div><div class='del'>-/* Fixed padding for appending to plaintext to fill out a block */</div><div class='del'>-static char scc_block_padding[8] = { 0x80, 0, 0, 0, 0, 0, 0, 0 };</div><div class='del'>-</div><div class='del'>-enum mxc_scc_state {</div><div class='del'>-	SCC_STATE_OK,</div><div class='del'>-	SCC_STATE_UNIMPLEMENTED,</div><div class='del'>-	SCC_STATE_FAILED</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mxc_scc {</div><div class='del'>-	struct device		*dev;</div><div class='del'>-	void __iomem		*base;</div><div class='del'>-	struct clk		*clk;</div><div class='del'>-	bool			hw_busy;</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	struct crypto_queue	queue;</div><div class='del'>-	struct crypto_async_request *req;</div><div class='del'>-	int			block_size_bytes;</div><div class='del'>-	int			black_ram_size_blocks;</div><div class='del'>-	int			memory_size_bytes;</div><div class='del'>-	int			bytes_remaining;</div><div class='del'>-</div><div class='del'>-	void __iomem		*red_memory;</div><div class='del'>-	void __iomem		*black_memory;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mxc_scc_ctx {</div><div class='del'>-	struct mxc_scc		*scc;</div><div class='del'>-	struct scatterlist	*sg_src;</div><div class='del'>-	size_t			src_nents;</div><div class='del'>-	struct scatterlist	*sg_dst;</div><div class='del'>-	size_t			dst_nents;</div><div class='del'>-	unsigned int		offset;</div><div class='del'>-	unsigned int		size;</div><div class='del'>-	unsigned int		ctrl;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mxc_scc_crypto_tmpl {</div><div class='del'>-	struct mxc_scc *scc;</div><div class='del'>-	struct crypto_alg alg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int mxc_scc_get_data(struct mxc_scc_ctx *ctx,</div><div class='del'>-			    struct crypto_async_request *req)</div><div class='del'>-{</div><div class='del'>-	struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);</div><div class='del'>-	struct mxc_scc *scc = ctx-&gt;scc;</div><div class='del'>-	size_t len;</div><div class='del'>-	void __iomem *from;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ctrl &amp; SCC_SCM_CTRL_DECRYPT_MODE)</div><div class='del'>-		from = scc-&gt;red_memory;</div><div class='del'>-	else</div><div class='del'>-		from = scc-&gt;black_memory;</div><div class='del'>-</div><div class='del'>-	dev_dbg(scc-&gt;dev, "pcopy: from 0x%p %zu bytes\n", from,</div><div class='del'>-		ctx-&gt;dst_nents * 8);</div><div class='del'>-	len = sg_pcopy_from_buffer(ablkreq-&gt;dst, ctx-&gt;dst_nents,</div><div class='del'>-				   from, ctx-&gt;size, ctx-&gt;offset);</div><div class='del'>-	if (!len) {</div><div class='del'>-		dev_err(scc-&gt;dev, "pcopy err from 0x%p (len=%zu)\n", from, len);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "red memory@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='del'>-		       scc-&gt;red_memory, ctx-&gt;size, 1);</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "black memory@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='del'>-		       scc-&gt;black_memory, ctx-&gt;size, 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ctx-&gt;offset += len;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;offset &lt; ablkreq-&gt;nbytes)</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_ablkcipher_req_init(struct ablkcipher_request *req,</div><div class='del'>-				       struct mxc_scc_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	struct mxc_scc *scc = ctx-&gt;scc;</div><div class='del'>-	int nents;</div><div class='del'>-</div><div class='del'>-	nents = sg_nents_for_len(req-&gt;src, req-&gt;nbytes);</div><div class='del'>-	if (nents &lt; 0) {</div><div class='del'>-		dev_err(scc-&gt;dev, "Invalid number of src SC");</div><div class='del'>-		return nents;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;src_nents = nents;</div><div class='del'>-</div><div class='del'>-	nents = sg_nents_for_len(req-&gt;dst, req-&gt;nbytes);</div><div class='del'>-	if (nents &lt; 0) {</div><div class='del'>-		dev_err(scc-&gt;dev, "Invalid number of dst SC");</div><div class='del'>-		return nents;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;dst_nents = nents;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;size = 0;</div><div class='del'>-	ctx-&gt;offset = 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 mxc_scc_ablkcipher_req_complete(struct crypto_async_request *req,</div><div class='del'>-					   struct mxc_scc_ctx *ctx,</div><div class='del'>-					   int result)</div><div class='del'>-{</div><div class='del'>-	struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);</div><div class='del'>-	struct mxc_scc *scc = ctx-&gt;scc;</div><div class='del'>-</div><div class='del'>-	scc-&gt;req = NULL;</div><div class='del'>-	scc-&gt;bytes_remaining = scc-&gt;memory_size_bytes;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ctrl &amp; SCC_SCM_CTRL_CBC_MODE)</div><div class='del'>-		memcpy(ablkreq-&gt;info, scc-&gt;base + SCC_SCM_INIT_VECTOR_0,</div><div class='del'>-		       scc-&gt;block_size_bytes);</div><div class='del'>-</div><div class='del'>-	req-&gt;complete(req, result);</div><div class='del'>-	scc-&gt;hw_busy = false;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_put_data(struct mxc_scc_ctx *ctx,</div><div class='del'>-			     struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	u8 padding_buffer[sizeof(u16) + sizeof(scc_block_padding)];</div><div class='del'>-	size_t len = min_t(size_t, req-&gt;nbytes - ctx-&gt;offset,</div><div class='del'>-			   ctx-&gt;scc-&gt;bytes_remaining);</div><div class='del'>-	unsigned int padding_byte_count = 0;</div><div class='del'>-	struct mxc_scc *scc = ctx-&gt;scc;</div><div class='del'>-	void __iomem *to;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ctrl &amp; SCC_SCM_CTRL_DECRYPT_MODE)</div><div class='del'>-		to = scc-&gt;black_memory;</div><div class='del'>-	else</div><div class='del'>-		to = scc-&gt;red_memory;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ctrl &amp; SCC_SCM_CTRL_CBC_MODE &amp;&amp; req-&gt;info)</div><div class='del'>-		memcpy(scc-&gt;base + SCC_SCM_INIT_VECTOR_0, req-&gt;info,</div><div class='del'>-		       scc-&gt;block_size_bytes);</div><div class='del'>-</div><div class='del'>-	len = sg_pcopy_to_buffer(req-&gt;src, ctx-&gt;src_nents,</div><div class='del'>-				 to, len, ctx-&gt;offset);</div><div class='del'>-	if (!len) {</div><div class='del'>-		dev_err(scc-&gt;dev, "pcopy err to 0x%p (len=%zu)\n", to, len);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ctx-&gt;size = len;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	dev_dbg(scc-&gt;dev, "copied %d bytes to 0x%p\n", len, to);</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "init vector0@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='del'>-		       scc-&gt;base + SCC_SCM_INIT_VECTOR_0, scc-&gt;block_size_bytes,</div><div class='del'>-		       1);</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "red memory@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='del'>-		       scc-&gt;red_memory, ctx-&gt;size, 1);</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "black memory@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='del'>-		       scc-&gt;black_memory, ctx-&gt;size, 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	scc-&gt;bytes_remaining -= len;</div><div class='del'>-</div><div class='del'>-	padding_byte_count = len % scc-&gt;block_size_bytes;</div><div class='del'>-</div><div class='del'>-	if (padding_byte_count) {</div><div class='del'>-		memcpy(padding_buffer, scc_block_padding, padding_byte_count);</div><div class='del'>-		memcpy(to + len, padding_buffer, padding_byte_count);</div><div class='del'>-		ctx-&gt;size += padding_byte_count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "data to encrypt@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='del'>-		       to, ctx-&gt;size, 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mxc_scc_ablkcipher_next(struct mxc_scc_ctx *ctx,</div><div class='del'>-				    struct crypto_async_request *req)</div><div class='del'>-{</div><div class='del'>-	struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);</div><div class='del'>-	struct mxc_scc *scc = ctx-&gt;scc;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dev_dbg(scc-&gt;dev, "dispatch request (nbytes=%d, src=%p, dst=%p)\n",</div><div class='del'>-		ablkreq-&gt;nbytes, ablkreq-&gt;src, ablkreq-&gt;dst);</div><div class='del'>-</div><div class='del'>-	writel(0, scc-&gt;base + SCC_SCM_ERROR_STATUS);</div><div class='del'>-</div><div class='del'>-	err = mxc_scc_put_data(ctx, ablkreq);</div><div class='del'>-	if (err) {</div><div class='del'>-		mxc_scc_ablkcipher_req_complete(req, ctx, err);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(scc-&gt;dev, "Start encryption (0x%x/0x%x)\n",</div><div class='del'>-		readl(scc-&gt;base + SCC_SCM_RED_START),</div><div class='del'>-		readl(scc-&gt;base + SCC_SCM_BLACK_START));</div><div class='del'>-</div><div class='del'>-	/* clear interrupt control registers */</div><div class='del'>-	writel(SCC_SCM_INTR_CTRL_CLR_INTR,</div><div class='del'>-	       scc-&gt;base + SCC_SCM_INTR_CTRL);</div><div class='del'>-</div><div class='del'>-	writel((ctx-&gt;size / ctx-&gt;scc-&gt;block_size_bytes) - 1,</div><div class='del'>-	       scc-&gt;base + SCC_SCM_LENGTH);</div><div class='del'>-</div><div class='del'>-	dev_dbg(scc-&gt;dev, "Process %d block(s) in 0x%p\n",</div><div class='del'>-		ctx-&gt;size / ctx-&gt;scc-&gt;block_size_bytes,</div><div class='del'>-		(ctx-&gt;ctrl &amp; SCC_SCM_CTRL_DECRYPT_MODE) ? scc-&gt;black_memory :</div><div class='del'>-		scc-&gt;red_memory);</div><div class='del'>-</div><div class='del'>-	writel(ctx-&gt;ctrl, scc-&gt;base + SCC_SCM_CTRL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t mxc_scc_int(int irq, void *priv)</div><div class='del'>-{</div><div class='del'>-	struct crypto_async_request *req;</div><div class='del'>-	struct mxc_scc_ctx *ctx;</div><div class='del'>-	struct mxc_scc *scc = priv;</div><div class='del'>-	int status;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	status = readl(scc-&gt;base + SCC_SCM_STATUS);</div><div class='del'>-</div><div class='del'>-	/* clear interrupt control registers */</div><div class='del'>-	writel(SCC_SCM_INTR_CTRL_CLR_INTR, scc-&gt;base + SCC_SCM_INTR_CTRL);</div><div class='del'>-</div><div class='del'>-	if (status &amp; SCC_SCM_STATUS_BUSY)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	req = scc-&gt;req;</div><div class='del'>-	if (req) {</div><div class='del'>-		ctx = crypto_tfm_ctx(req-&gt;tfm);</div><div class='del'>-		ret = mxc_scc_get_data(ctx, req);</div><div class='del'>-		if (ret != -EINPROGRESS)</div><div class='del'>-			mxc_scc_ablkcipher_req_complete(req, ctx, ret);</div><div class='del'>-		else</div><div class='del'>-			mxc_scc_ablkcipher_next(ctx, req);</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'>-static int mxc_scc_cra_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	struct mxc_scc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	struct crypto_alg *alg = tfm-&gt;__crt_alg;</div><div class='del'>-	struct mxc_scc_crypto_tmpl *algt;</div><div class='del'>-</div><div class='del'>-	algt = container_of(alg, struct mxc_scc_crypto_tmpl, alg);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;scc = algt-&gt;scc;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mxc_scc_dequeue_req_unlocked(struct mxc_scc_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	struct crypto_async_request *req, *backlog;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;scc-&gt;hw_busy)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ctx-&gt;scc-&gt;lock);</div><div class='del'>-	backlog = crypto_get_backlog(&amp;ctx-&gt;scc-&gt;queue);</div><div class='del'>-	req = crypto_dequeue_request(&amp;ctx-&gt;scc-&gt;queue);</div><div class='del'>-	ctx-&gt;scc-&gt;req = req;</div><div class='del'>-	ctx-&gt;scc-&gt;hw_busy = true;</div><div class='del'>-	spin_unlock_bh(&amp;ctx-&gt;scc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!req)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (backlog)</div><div class='del'>-		backlog-&gt;complete(backlog, -EINPROGRESS);</div><div class='del'>-</div><div class='del'>-	mxc_scc_ablkcipher_next(ctx, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_queue_req(struct mxc_scc_ctx *ctx,</div><div class='del'>-			     struct crypto_async_request *req)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ctx-&gt;scc-&gt;lock);</div><div class='del'>-	ret = crypto_enqueue_request(&amp;ctx-&gt;scc-&gt;queue, req);</div><div class='del'>-	spin_unlock_bh(&amp;ctx-&gt;scc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (ret != -EINPROGRESS)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mxc_scc_dequeue_req_unlocked(ctx);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_des3_op(struct mxc_scc_ctx *ctx,</div><div class='del'>-			   struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mxc_scc_ablkcipher_req_init(req, ctx);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return mxc_scc_queue_req(ctx, &amp;req-&gt;base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_ecb_des_encrypt(struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_ablkcipher *cipher = crypto_ablkcipher_reqtfm(req);</div><div class='del'>-	struct mxc_scc_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;ctrl = SCC_SCM_CTRL_START_CIPHER;</div><div class='del'>-</div><div class='del'>-	return mxc_scc_des3_op(ctx, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_ecb_des_decrypt(struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_ablkcipher *cipher = crypto_ablkcipher_reqtfm(req);</div><div class='del'>-	struct mxc_scc_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;ctrl = SCC_SCM_CTRL_START_CIPHER;</div><div class='del'>-	ctx-&gt;ctrl |= SCC_SCM_CTRL_DECRYPT_MODE;</div><div class='del'>-</div><div class='del'>-	return mxc_scc_des3_op(ctx, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_cbc_des_encrypt(struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_ablkcipher *cipher = crypto_ablkcipher_reqtfm(req);</div><div class='del'>-	struct mxc_scc_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;ctrl = SCC_SCM_CTRL_START_CIPHER;</div><div class='del'>-	ctx-&gt;ctrl |= SCC_SCM_CTRL_CBC_MODE;</div><div class='del'>-</div><div class='del'>-	return mxc_scc_des3_op(ctx, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_cbc_des_decrypt(struct ablkcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_ablkcipher *cipher = crypto_ablkcipher_reqtfm(req);</div><div class='del'>-	struct mxc_scc_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;ctrl = SCC_SCM_CTRL_START_CIPHER;</div><div class='del'>-	ctx-&gt;ctrl |= SCC_SCM_CTRL_CBC_MODE;</div><div class='del'>-	ctx-&gt;ctrl |= SCC_SCM_CTRL_DECRYPT_MODE;</div><div class='del'>-</div><div class='del'>-	return mxc_scc_des3_op(ctx, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mxc_scc_hw_init(struct mxc_scc *scc)</div><div class='del'>-{</div><div class='del'>-	int offset;</div><div class='del'>-</div><div class='del'>-	offset = SCC_NON_RESERVED_OFFSET / scc-&gt;block_size_bytes;</div><div class='del'>-</div><div class='del'>-	/* Fill the RED_START register */</div><div class='del'>-	writel(offset, scc-&gt;base + SCC_SCM_RED_START);</div><div class='del'>-</div><div class='del'>-	/* Fill the BLACK_START register */</div><div class='del'>-	writel(offset, scc-&gt;base + SCC_SCM_BLACK_START);</div><div class='del'>-</div><div class='del'>-	scc-&gt;red_memory = scc-&gt;base + SCC_SCM_RED_MEMORY +</div><div class='del'>-			  SCC_NON_RESERVED_OFFSET;</div><div class='del'>-</div><div class='del'>-	scc-&gt;black_memory = scc-&gt;base + SCC_SCM_BLACK_MEMORY +</div><div class='del'>-			    SCC_NON_RESERVED_OFFSET;</div><div class='del'>-</div><div class='del'>-	scc-&gt;bytes_remaining = scc-&gt;memory_size_bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_get_config(struct mxc_scc *scc)</div><div class='del'>-{</div><div class='del'>-	int config;</div><div class='del'>-</div><div class='del'>-	config = readl(scc-&gt;base + SCC_SCM_CFG);</div><div class='del'>-</div><div class='del'>-	scc-&gt;block_size_bytes = config &amp; SCC_SCM_CFG_BLOCK_SIZE_MASK;</div><div class='del'>-</div><div class='del'>-	scc-&gt;black_ram_size_blocks = config &amp; SCC_SCM_CFG_BLACK_SIZE_MASK;</div><div class='del'>-</div><div class='del'>-	scc-&gt;memory_size_bytes = (scc-&gt;block_size_bytes *</div><div class='del'>-				  scc-&gt;black_ram_size_blocks) -</div><div class='del'>-				  SCC_NON_RESERVED_OFFSET;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum mxc_scc_state mxc_scc_get_state(struct mxc_scc *scc)</div><div class='del'>-{</div><div class='del'>-	enum mxc_scc_state state;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	status = readl(scc-&gt;base + SCC_SMN_STATUS) &amp;</div><div class='del'>-		       SCC_SMN_STATUS_STATE_MASK;</div><div class='del'>-</div><div class='del'>-	/* If in Health Check, try to bringup to secure state */</div><div class='del'>-	if (status &amp; SCC_SMN_STATE_HEALTH_CHECK) {</div><div class='del'>-		/*</div><div class='del'>-		 * Write a simple algorithm to the Algorithm Sequence</div><div class='del'>-		 * Checker (ASC)</div><div class='del'>-		 */</div><div class='del'>-		writel(0xaaaa, scc-&gt;base + SCC_SMN_SEQ_START);</div><div class='del'>-		writel(0x5555, scc-&gt;base + SCC_SMN_SEQ_END);</div><div class='del'>-		writel(0x5555, scc-&gt;base + SCC_SMN_SEQ_CHECK);</div><div class='del'>-</div><div class='del'>-		status = readl(scc-&gt;base + SCC_SMN_STATUS) &amp;</div><div class='del'>-			       SCC_SMN_STATUS_STATE_MASK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case SCC_SMN_STATE_NON_SECURE:</div><div class='del'>-	case SCC_SMN_STATE_SECURE:</div><div class='del'>-		state = SCC_STATE_OK;</div><div class='del'>-		break;</div><div class='del'>-	case SCC_SMN_STATE_FAIL:</div><div class='del'>-		state = SCC_STATE_FAILED;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		state = SCC_STATE_UNIMPLEMENTED;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mxc_scc_crypto_tmpl scc_ecb_des = {</div><div class='del'>-	.alg = {</div><div class='del'>-		.cra_name = "ecb(des3_ede)",</div><div class='del'>-		.cra_driver_name = "ecb-des3-scc",</div><div class='del'>-		.cra_priority = 300,</div><div class='del'>-		.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='del'>-		.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='del'>-		.cra_ctxsize = sizeof(struct mxc_scc_ctx),</div><div class='del'>-		.cra_alignmask = 0,</div><div class='del'>-		.cra_type = &amp;crypto_ablkcipher_type,</div><div class='del'>-		.cra_module = THIS_MODULE,</div><div class='del'>-		.cra_init = mxc_scc_cra_init,</div><div class='del'>-		.cra_u.ablkcipher = {</div><div class='del'>-			.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='del'>-			.max_keysize = DES3_EDE_KEY_SIZE,</div><div class='del'>-			.encrypt = mxc_scc_ecb_des_encrypt,</div><div class='del'>-			.decrypt = mxc_scc_ecb_des_decrypt,</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mxc_scc_crypto_tmpl scc_cbc_des = {</div><div class='del'>-	.alg = {</div><div class='del'>-		.cra_name = "cbc(des3_ede)",</div><div class='del'>-		.cra_driver_name = "cbc-des3-scc",</div><div class='del'>-		.cra_priority = 300,</div><div class='del'>-		.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='del'>-		.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='del'>-		.cra_ctxsize = sizeof(struct mxc_scc_ctx),</div><div class='del'>-		.cra_alignmask = 0,</div><div class='del'>-		.cra_type = &amp;crypto_ablkcipher_type,</div><div class='del'>-		.cra_module = THIS_MODULE,</div><div class='del'>-		.cra_init = mxc_scc_cra_init,</div><div class='del'>-		.cra_u.ablkcipher = {</div><div class='del'>-			.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='del'>-			.max_keysize = DES3_EDE_KEY_SIZE,</div><div class='del'>-			.encrypt = mxc_scc_cbc_des_encrypt,</div><div class='del'>-			.decrypt = mxc_scc_cbc_des_decrypt,</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mxc_scc_crypto_tmpl *scc_crypto_algs[] = {</div><div class='del'>-	&amp;scc_ecb_des,</div><div class='del'>-	&amp;scc_cbc_des,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int mxc_scc_crypto_register(struct mxc_scc *scc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(scc_crypto_algs); i++) {</div><div class='del'>-		scc_crypto_algs[i]-&gt;scc = scc;</div><div class='del'>-		err = crypto_register_alg(&amp;scc_crypto_algs[i]-&gt;alg);</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'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	while (--i &gt;= 0)</div><div class='del'>-		crypto_unregister_alg(&amp;scc_crypto_algs[i]-&gt;alg);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mxc_scc_crypto_unregister(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(scc_crypto_algs); i++)</div><div class='del'>-		crypto_unregister_alg(&amp;scc_crypto_algs[i]-&gt;alg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_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 resource *res;</div><div class='del'>-	struct mxc_scc *scc;</div><div class='del'>-	enum mxc_scc_state state;</div><div class='del'>-	int irq;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	scc = devm_kzalloc(dev, sizeof(*scc), GFP_KERNEL);</div><div class='del'>-	if (!scc)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	scc-&gt;base = devm_ioremap_resource(dev, res);</div><div class='del'>-	if (IS_ERR(scc-&gt;base))</div><div class='del'>-		return PTR_ERR(scc-&gt;base);</div><div class='del'>-</div><div class='del'>-	scc-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, "ipg");</div><div class='del'>-	if (IS_ERR(scc-&gt;clk)) {</div><div class='del'>-		dev_err(dev, "Could not get ipg clock\n");</div><div class='del'>-		return PTR_ERR(scc-&gt;clk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = clk_prepare_enable(scc-&gt;clk);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* clear error status register */</div><div class='del'>-	writel(0x0, scc-&gt;base + SCC_SCM_ERROR_STATUS);</div><div class='del'>-</div><div class='del'>-	/* clear interrupt control registers */</div><div class='del'>-	writel(SCC_SCM_INTR_CTRL_CLR_INTR |</div><div class='del'>-	       SCC_SCM_INTR_CTRL_MASK_INTR,</div><div class='del'>-	       scc-&gt;base + SCC_SCM_INTR_CTRL);</div><div class='del'>-</div><div class='del'>-	writel(SCC_SMN_COMMAND_CLR_INTR |</div><div class='del'>-	       SCC_SMN_COMMAND_EN_INTR,</div><div class='del'>-	       scc-&gt;base + SCC_SMN_COMMAND);</div><div class='del'>-</div><div class='del'>-	scc-&gt;dev = dev;</div><div class='del'>-	platform_set_drvdata(pdev, scc);</div><div class='del'>-</div><div class='del'>-	ret = mxc_scc_get_config(scc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	state = mxc_scc_get_state(scc);</div><div class='del'>-</div><div class='del'>-	if (state != SCC_STATE_OK) {</div><div class='del'>-		dev_err(dev, "SCC in unusable state %d\n", state);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mxc_scc_hw_init(scc);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;scc-&gt;lock);</div><div class='del'>-	/* FIXME: calculate queue from RAM slots */</div><div class='del'>-	crypto_init_queue(&amp;scc-&gt;queue, 50);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		irq = platform_get_irq(pdev, i);</div><div class='del'>-		if (irq &lt; 0) {</div><div class='del'>-			dev_err(dev, "failed to get irq resource: %d\n", irq);</div><div class='del'>-			ret = irq;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = devm_request_threaded_irq(dev, irq, NULL, mxc_scc_int,</div><div class='del'>-						IRQF_ONESHOT, dev_name(dev), scc);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = mxc_scc_crypto_register(scc);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "could not register algorithms");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_info(dev, "registered successfully.\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	clk_disable_unprepare(scc-&gt;clk);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxc_scc_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct mxc_scc *scc = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	mxc_scc_crypto_unregister();</div><div class='del'>-</div><div class='del'>-	clk_disable_unprepare(scc-&gt;clk);</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 mxc_scc_dt_ids[] = {</div><div class='del'>-	{ .compatible = "fsl,imx25-scc", .data = NULL, },</div><div class='del'>-	{ /* sentinel */ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, mxc_scc_dt_ids);</div><div class='del'>-</div><div class='del'>-static struct platform_driver mxc_scc_driver = {</div><div class='del'>-	.probe	= mxc_scc_probe,</div><div class='del'>-	.remove	= mxc_scc_remove,</div><div class='del'>-	.driver	= {</div><div class='del'>-		.name		= "mxc-scc",</div><div class='del'>-		.of_match_table	= mxc_scc_dt_ids,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver(mxc_scc_driver);</div><div class='del'>-MODULE_AUTHOR("Steffen Trumtrar &lt;kernel@pengutronix.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Freescale i.MX25 SCC Crypto driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c<br/>index a2105cf33abb..b4429891e368 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/mxs-dcp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/mxs-dcp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/mxs-dcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/mxs-dcp.c</a></div><div class='hunk'>@@ -471,7 +471,7 @@ static int mxs_dcp_aes_enqueue(struct ablkcipher_request *req, int enc, int ecb)</div><div class='ctx'> </div><div class='ctx'> 	wake_up_process(sdcp-&gt;thread[actx-&gt;chan]);</div><div class='ctx'> </div><div class='del'>-	return -EINPROGRESS;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxs_dcp_aes_ecb_decrypt(struct ablkcipher_request *req)</div><div class='hunk'>@@ -700,11 +700,7 @@ static int dcp_chan_thread_sha(void *data)</div><div class='ctx'> </div><div class='ctx'> 	struct crypto_async_request *backlog;</div><div class='ctx'> 	struct crypto_async_request *arq;</div><div class='del'>-</div><div class='del'>-	struct dcp_sha_req_ctx *rctx;</div><div class='del'>-</div><div class='del'>-	struct ahash_request *req;</div><div class='del'>-	int ret, fini;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='hunk'>@@ -725,11 +721,7 @@ static int dcp_chan_thread_sha(void *data)</div><div class='ctx'> 			backlog-&gt;complete(backlog, -EINPROGRESS);</div><div class='ctx'> </div><div class='ctx'> 		if (arq) {</div><div class='del'>-			req = ahash_request_cast(arq);</div><div class='del'>-			rctx = ahash_request_ctx(req);</div><div class='del'>-</div><div class='ctx'> 			ret = dcp_sha_req_to_buf(arq);</div><div class='del'>-			fini = rctx-&gt;fini;</div><div class='ctx'> 			arq-&gt;complete(arq, ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -797,7 +789,7 @@ static int dcp_sha_update_fx(struct ahash_request *req, int fini)</div><div class='ctx'> 	wake_up_process(sdcp-&gt;thread[actx-&gt;chan]);</div><div class='ctx'> 	mutex_unlock(&amp;actx-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return -EINPROGRESS;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dcp_sha_update(struct ahash_request *req)</div><div class='head'>diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c<br/>index 9450c41211b2..0d5d3d8eb680 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/n2_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/n2_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/n2_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/n2_core.c</a></div><div class='hunk'>@@ -469,8 +469,6 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = child_shash;</div><div class='del'>-	shash-&gt;flags = crypto_ahash_get_flags(tfm) &amp;</div><div class='del'>-		CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	bs = crypto_shash_blocksize(child_shash);</div><div class='ctx'> 	ds = crypto_shash_digestsize(child_shash);</div><div class='hunk'>@@ -788,13 +786,18 @@ static int n2_3des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);</div><div class='ctx'> 	struct n2_cipher_context *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct n2_cipher_alg *n2alg = n2_cipher_alg(tfm);</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;enc_type = n2alg-&gt;enc_type;</div><div class='ctx'> </div><div class='del'>-	if (keylen != (3 * DES_KEY_SIZE)) {</div><div class='del'>-		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	ctx-&gt;key_len = keylen;</div><div class='ctx'> 	memcpy(ctx-&gt;key.des3, key, keylen);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c<br/>index 66869976cfa2..57932848361b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-842-pseries.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-842-pseries.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-842-pseries.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/nx/nx-842-pseries.c</a></div><div class='hunk'>@@ -296,7 +296,7 @@ static int nx842_pseries_compress(const unsigned char *in, unsigned int inlen,</div><div class='ctx'> 	struct nx842_workmem *workmem;</div><div class='ctx'> 	struct nx842_scatterlist slin, slout;</div><div class='ctx'> 	struct nx_csbcpb *csbcpb;</div><div class='del'>-	int ret = 0, max_sync_size;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	unsigned long inbuf, outbuf;</div><div class='ctx'> 	struct vio_pfo_op op = {</div><div class='ctx'> 		.done = NULL,</div><div class='hunk'>@@ -319,7 +319,6 @@ static int nx842_pseries_compress(const unsigned char *in, unsigned int inlen,</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	max_sync_size = local_devdata-&gt;max_sync_size;</div><div class='ctx'> 	dev = local_devdata-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Init scatterlist */</div><div class='hunk'>@@ -427,7 +426,7 @@ static int nx842_pseries_decompress(const unsigned char *in, unsigned int inlen,</div><div class='ctx'> 	struct nx842_workmem *workmem;</div><div class='ctx'> 	struct nx842_scatterlist slin, slout;</div><div class='ctx'> 	struct nx_csbcpb *csbcpb;</div><div class='del'>-	int ret = 0, max_sync_size;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	unsigned long inbuf, outbuf;</div><div class='ctx'> 	struct vio_pfo_op op = {</div><div class='ctx'> 		.done = NULL,</div><div class='hunk'>@@ -451,7 +450,6 @@ static int nx842_pseries_decompress(const unsigned char *in, unsigned int inlen,</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	max_sync_size = local_devdata-&gt;max_sync_size;</div><div class='ctx'> 	dev = local_devdata-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	workmem = PTR_ALIGN(wmem, WORKMEM_ALIGN);</div><div class='head'>diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c<br/>index d94e25df503b..f06565df2a12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-842.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-842.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-842.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/nx/nx-842.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ static int decompress(struct nx842_crypto_ctx *ctx,</div><div class='ctx'> 	unsigned int adj_slen = slen;</div><div class='ctx'> 	u8 *src = p-&gt;in, *dst = p-&gt;out;</div><div class='ctx'> 	u16 padding = be16_to_cpu(g-&gt;padding);</div><div class='del'>-	int ret, spadding = 0, dpadding = 0;</div><div class='add'>+	int ret, spadding = 0;</div><div class='ctx'> 	ktime_t timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (!slen || !required_len)</div><div class='hunk'>@@ -413,7 +413,6 @@ usesw:</div><div class='ctx'> 		spadding = 0;</div><div class='ctx'> 		dst = p-&gt;out;</div><div class='ctx'> 		dlen = p-&gt;oremain;</div><div class='del'>-		dpadding = 0;</div><div class='ctx'> 		if (dlen &lt; required_len) { /* have ignore bytes */</div><div class='ctx'> 			dst = ctx-&gt;dbounce;</div><div class='ctx'> 			dlen = BOUNCE_BUFFER_SIZE;</div><div class='head'>diff --git a/drivers/crypto/nx/nx-aes-xcbc.c b/drivers/crypto/nx/nx-aes-xcbc.c<br/>index ad3358e74f5c..8f5820b78a83 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-aes-xcbc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-aes-xcbc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-aes-xcbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/nx/nx-aes-xcbc.c</a></div><div class='hunk'>@@ -105,8 +105,7 @@ static int nx_xcbc_empty(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	nx_ctx-&gt;op.inlen = (nx_ctx-&gt;in_sg - in_sg) * sizeof(struct nx_sg);</div><div class='ctx'> 	nx_ctx-&gt;op.outlen = (nx_ctx-&gt;out_sg - out_sg) * sizeof(struct nx_sg);</div><div class='ctx'> </div><div class='del'>-	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-			   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	atomic_inc(&amp;(nx_ctx-&gt;stats-&gt;aes_ops));</div><div class='hunk'>@@ -134,8 +133,7 @@ static int nx_xcbc_empty(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	nx_ctx-&gt;op.inlen = (nx_ctx-&gt;in_sg - in_sg) * sizeof(struct nx_sg);</div><div class='ctx'> 	nx_ctx-&gt;op.outlen = (nx_ctx-&gt;out_sg - out_sg) * sizeof(struct nx_sg);</div><div class='ctx'> </div><div class='del'>-	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-			   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	atomic_inc(&amp;(nx_ctx-&gt;stats-&gt;aes_ops));</div><div class='hunk'>@@ -279,8 +277,7 @@ static int nx_xcbc_update(struct shash_desc *desc,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-			   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+		rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -361,8 +358,7 @@ static int nx_xcbc_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-			   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/nx/nx-sha256.c b/drivers/crypto/nx/nx-sha256.c<br/>index a6764af83c6d..e06f0431dee5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-sha256.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-sha256.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-sha256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/nx/nx-sha256.c</a></div><div class='hunk'>@@ -162,8 +162,7 @@ static int nx_sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-				   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+		rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -243,8 +242,7 @@ static int nx_sha256_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-			   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/nx/nx-sha512.c b/drivers/crypto/nx/nx-sha512.c<br/>index 92956bc6e45e..0293b17903d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-sha512.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/nx/nx-sha512.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/nx/nx-sha512.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/nx/nx-sha512.c</a></div><div class='hunk'>@@ -166,8 +166,7 @@ static int nx_sha512_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-				   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+		rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -249,8 +248,7 @@ static int nx_sha512_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op,</div><div class='del'>-			   desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='add'>+	rc = nx_hcall_sync(nx_ctx, &amp;nx_ctx-&gt;op, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c<br/>index 1ba2633e90d6..3d82d18ff810 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/omap-des.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/omap-des.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/omap-des.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/omap-des.c</a></div><div class='hunk'>@@ -656,9 +656,6 @@ static int omap_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='ctx'> 	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);</div><div class='ctx'> </div><div class='del'>-	if (keylen != DES_KEY_SIZE &amp;&amp; keylen != (3*DES_KEY_SIZE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	pr_debug("enter, keylen: %d\n", keylen);</div><div class='ctx'> </div><div class='ctx'> 	/* Do we need to test against weak key? */</div><div class='hunk'>@@ -678,6 +675,28 @@ static int omap_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int omap_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+			   unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pr_debug("enter, keylen: %d\n", keylen);</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;key, key, keylen);</div><div class='add'>+	ctx-&gt;keylen = keylen;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int omap_des_ecb_encrypt(struct ablkcipher_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	return omap_des_crypt(req, FLAGS_ENCRYPT);</div><div class='hunk'>@@ -788,7 +807,7 @@ static struct crypto_alg algs_ecb_cbc[] = {</div><div class='ctx'> 	.cra_u.ablkcipher = {</div><div class='ctx'> 		.min_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.max_keysize	= 3*DES_KEY_SIZE,</div><div class='del'>-		.setkey		= omap_des_setkey,</div><div class='add'>+		.setkey		= omap_des3_setkey,</div><div class='ctx'> 		.encrypt	= omap_des_ecb_encrypt,</div><div class='ctx'> 		.decrypt	= omap_des_ecb_decrypt,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -811,7 +830,7 @@ static struct crypto_alg algs_ecb_cbc[] = {</div><div class='ctx'> 		.min_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.max_keysize	= 3*DES_KEY_SIZE,</div><div class='ctx'> 		.ivsize		= DES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= omap_des_setkey,</div><div class='add'>+		.setkey		= omap_des3_setkey,</div><div class='ctx'> 		.encrypt	= omap_des_cbc_encrypt,</div><div class='ctx'> 		.decrypt	= omap_des_cbc_decrypt,</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c<br/>index 0641185bd82f..51b20abac464 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/omap-sham.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/omap-sham.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/omap-sham.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/omap-sham.c</a></div><div class='hunk'>@@ -1055,7 +1055,6 @@ static int omap_sham_finish_hmac(struct ahash_request *req)</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, bctx-&gt;shash);</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = bctx-&gt;shash;</div><div class='del'>-	shash-&gt;flags = 0; /* not CRYPTO_TFM_REQ_MAY_SLEEP */</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_init(shash) ?:</div><div class='ctx'> 	       crypto_shash_update(shash, bctx-&gt;opad, bs) ?:</div><div class='hunk'>@@ -1226,7 +1225,6 @@ static int omap_sham_shash_digest(struct crypto_shash *tfm, u32 flags,</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, tfm);</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = tfm;</div><div class='del'>-	shash-&gt;flags = flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_digest(shash, data, len, out);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c<br/>index 21e5cae0a1e0..e641481a3cd9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/padlock-sha.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/padlock-sha.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/padlock-sha.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/padlock-sha.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@ static int padlock_sha_init(struct shash_desc *desc)</div><div class='ctx'> 	struct padlock_sha_ctx *ctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='ctx'> </div><div class='ctx'> 	dctx-&gt;fallback.tfm = ctx-&gt;fallback;</div><div class='del'>-	dctx-&gt;fallback.flags = desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 	return crypto_shash_init(&amp;dctx-&gt;fallback);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +47,6 @@ static int padlock_sha_update(struct shash_desc *desc,</div><div class='ctx'> {</div><div class='ctx'> 	struct padlock_sha_desc *dctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	dctx-&gt;fallback.flags = desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 	return crypto_shash_update(&amp;dctx-&gt;fallback, data, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +63,6 @@ static int padlock_sha_import(struct shash_desc *desc, const void *in)</div><div class='ctx'> 	struct padlock_sha_ctx *ctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='ctx'> </div><div class='ctx'> 	dctx-&gt;fallback.tfm = ctx-&gt;fallback;</div><div class='del'>-	dctx-&gt;fallback.flags = desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 	return crypto_shash_import(&amp;dctx-&gt;fallback, in);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +88,6 @@ static int padlock_sha1_finup(struct shash_desc *desc, const u8 *in,</div><div class='ctx'> 	unsigned int leftover;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dctx-&gt;fallback.flags = desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 	err = crypto_shash_export(&amp;dctx-&gt;fallback, &amp;state);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -153,7 +149,6 @@ static int padlock_sha256_finup(struct shash_desc *desc, const u8 *in,</div><div class='ctx'> 	unsigned int leftover;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dctx-&gt;fallback.flags = desc-&gt;flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> 	err = crypto_shash_export(&amp;dctx-&gt;fallback, &amp;state);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c<br/>index 1b3acdeffede..05b89e703903 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/picoxcell_crypto.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/picoxcell_crypto.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/picoxcell_crypto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/picoxcell_crypto.c</a></div><div class='hunk'>@@ -753,11 +753,6 @@ static int spacc_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	struct spacc_ablk_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u32 tmp[DES_EXPKEY_WORDS];</div><div class='ctx'> </div><div class='del'>-	if (len &gt; DES3_EDE_KEY_SIZE) {</div><div class='del'>-		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(!des_ekey(tmp, key)) &amp;&amp;</div><div class='ctx'> 	    (crypto_ablkcipher_get_flags(cipher) &amp;</div><div class='ctx'> 	     CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='hunk'>@@ -772,6 +767,30 @@ static int spacc_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Set the 3DES key for a block cipher transform. This also performs weak key</div><div class='add'>+ * checking if the transform has requested it.</div><div class='add'>+ */</div><div class='add'>+static int spacc_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+			     unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct spacc_ablk_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;key, key, len);</div><div class='add'>+	ctx-&gt;key_len = 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='ctx'>  * Set the key for an AES block cipher. Some key lengths are not supported in</div><div class='ctx'>  * hardware so this must also check whether a fallback is needed.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1196,7 +1215,7 @@ static const struct dev_pm_ops spacc_pm_ops = {</div><div class='ctx'> </div><div class='ctx'> static inline struct spacc_engine *spacc_dev_to_engine(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return dev ? platform_get_drvdata(to_platform_device(dev)) : NULL;</div><div class='add'>+	return dev ? dev_get_drvdata(dev) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t spacc_stat_irq_thresh_show(struct device *dev,</div><div class='hunk'>@@ -1353,7 +1372,7 @@ static struct spacc_alg ipsec_engine_algs[] = {</div><div class='ctx'> 			.cra_type = &amp;crypto_ablkcipher_type,</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_ablkcipher = {</div><div class='del'>-				.setkey = spacc_des_setkey,</div><div class='add'>+				.setkey = spacc_des3_setkey,</div><div class='ctx'> 				.encrypt = spacc_ablk_encrypt,</div><div class='ctx'> 				.decrypt = spacc_ablk_decrypt,</div><div class='ctx'> 				.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='hunk'>@@ -1380,7 +1399,7 @@ static struct spacc_alg ipsec_engine_algs[] = {</div><div class='ctx'> 			.cra_type = &amp;crypto_ablkcipher_type,</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_ablkcipher = {</div><div class='del'>-				.setkey = spacc_des_setkey,</div><div class='add'>+				.setkey = spacc_des3_setkey,</div><div class='ctx'> 				.encrypt = spacc_ablk_encrypt,</div><div class='ctx'> 				.decrypt = spacc_ablk_decrypt,</div><div class='ctx'> 				.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='head'>diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c<br/>index 975c75198f56..c8d401646902 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/qat/qat_common/qat_algs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/qat/qat_common/qat_algs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/qat/qat_common/qat_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/qat/qat_common/qat_algs.c</a></div><div class='hunk'>@@ -164,7 +164,6 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash,</div><div class='ctx'> 	memset(ctx-&gt;ipad, 0, block_size);</div><div class='ctx'> 	memset(ctx-&gt;opad, 0, block_size);</div><div class='ctx'> 	shash-&gt;tfm = ctx-&gt;hash_tfm;</div><div class='del'>-	shash-&gt;flags = 0x0;</div><div class='ctx'> </div><div class='ctx'> 	if (auth_keylen &gt; block_size) {</div><div class='ctx'> 		int ret = crypto_shash_digest(shash, auth_key,</div><div class='head'>diff --git a/drivers/crypto/qat/qat_common/qat_asym_algs.c b/drivers/crypto/qat/qat_common/qat_asym_algs.c<br/>index c9f324730d71..692a7aaee749 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/qat/qat_common/qat_asym_algs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/qat/qat_common/qat_asym_algs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/qat/qat_common/qat_asym_algs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/qat/qat_common/qat_asym_algs.c</a></div><div class='hunk'>@@ -1300,8 +1300,6 @@ static void qat_rsa_exit_tfm(struct crypto_akcipher *tfm)</div><div class='ctx'> static struct akcipher_alg rsa = {</div><div class='ctx'> 	.encrypt = qat_rsa_enc,</div><div class='ctx'> 	.decrypt = qat_rsa_dec,</div><div class='del'>-	.sign = qat_rsa_dec,</div><div class='del'>-	.verify = qat_rsa_enc,</div><div class='ctx'> 	.set_pub_key = qat_rsa_setpubkey,</div><div class='ctx'> 	.set_priv_key = qat_rsa_setprivkey,</div><div class='ctx'> 	.max_size = qat_rsa_max_size,</div><div class='head'>diff --git a/drivers/crypto/qce/ablkcipher.c b/drivers/crypto/qce/ablkcipher.c<br/>index 154b6baa124e..8d3493855a70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/qce/ablkcipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/qce/ablkcipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/qce/ablkcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/qce/ablkcipher.c</a></div><div class='hunk'>@@ -198,6 +198,25 @@ weakkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qce_des3_setkey(struct crypto_ablkcipher *ablk, const u8 *key,</div><div class='add'>+			   unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct qce_cipher_ctx *ctx = crypto_ablkcipher_ctx(ablk);</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(ablk);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(ablk, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;enc_keylen = keylen;</div><div class='add'>+	memcpy(ctx-&gt;enc_key, key, keylen);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int qce_ablkcipher_crypt(struct ablkcipher_request *req, int encrypt)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_tfm *tfm =</div><div class='hunk'>@@ -363,7 +382,8 @@ static int qce_ablkcipher_register_one(const struct qce_ablkcipher_def *def,</div><div class='ctx'> 	alg-&gt;cra_ablkcipher.ivsize = def-&gt;ivsize;</div><div class='ctx'> 	alg-&gt;cra_ablkcipher.min_keysize = def-&gt;min_keysize;</div><div class='ctx'> 	alg-&gt;cra_ablkcipher.max_keysize = def-&gt;max_keysize;</div><div class='del'>-	alg-&gt;cra_ablkcipher.setkey = qce_ablkcipher_setkey;</div><div class='add'>+	alg-&gt;cra_ablkcipher.setkey = IS_3DES(def-&gt;flags) ?</div><div class='add'>+				     qce_des3_setkey : qce_ablkcipher_setkey;</div><div class='ctx'> 	alg-&gt;cra_ablkcipher.encrypt = qce_ablkcipher_encrypt;</div><div class='ctx'> 	alg-&gt;cra_ablkcipher.decrypt = qce_ablkcipher_decrypt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c<br/>index 02dac6ae7e53..313759521a0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c</a></div><div class='hunk'>@@ -46,24 +46,36 @@ static int rk_aes_setkey(struct crypto_ablkcipher *cipher,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rk_tdes_setkey(struct crypto_ablkcipher *cipher,</div><div class='del'>-			  const u8 *key, unsigned int keylen)</div><div class='add'>+static int rk_des_setkey(struct crypto_ablkcipher *cipher,</div><div class='add'>+			 const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);</div><div class='ctx'> 	struct rk_cipher_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u32 tmp[DES_EXPKEY_WORDS];</div><div class='ctx'> </div><div class='del'>-	if (keylen != DES_KEY_SIZE &amp;&amp; keylen != DES3_EDE_KEY_SIZE) {</div><div class='del'>-		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	if (!des_ekey(tmp, key) &amp;&amp;</div><div class='add'>+	    (tfm-&gt;crt_flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (keylen == DES_KEY_SIZE) {</div><div class='del'>-		if (!des_ekey(tmp, key) &amp;&amp;</div><div class='del'>-		    (tfm-&gt;crt_flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-			tfm-&gt;crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	ctx-&gt;keylen = keylen;</div><div class='add'>+	memcpy_toio(ctx-&gt;dev-&gt;reg + RK_CRYPTO_TDES_KEY1_0, key, keylen);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rk_tdes_setkey(struct crypto_ablkcipher *cipher,</div><div class='add'>+			  const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct rk_cipher_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;keylen = keylen;</div><div class='hunk'>@@ -250,9 +262,14 @@ static int rk_set_data_start(struct rk_crypto_info *dev)</div><div class='ctx'> 	u8 *src_last_blk = page_address(sg_page(dev-&gt;sg_src)) +</div><div class='ctx'> 		dev-&gt;sg_src-&gt;offset + dev-&gt;sg_src-&gt;length - ivsize;</div><div class='ctx'> </div><div class='del'>-	/* store the iv that need to be updated in chain mode */</div><div class='del'>-	if (ctx-&gt;mode &amp; RK_CRYPTO_DEC)</div><div class='add'>+	/* Store the iv that need to be updated in chain mode.</div><div class='add'>+	 * And update the IV buffer to contain the next IV for decryption mode.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx-&gt;mode &amp; RK_CRYPTO_DEC) {</div><div class='ctx'> 		memcpy(ctx-&gt;iv, src_last_blk, ivsize);</div><div class='add'>+		sg_pcopy_to_buffer(dev-&gt;first, dev-&gt;src_nents, req-&gt;info,</div><div class='add'>+				   ivsize, dev-&gt;total - ivsize);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = dev-&gt;load_data(dev, dev-&gt;sg_src, dev-&gt;sg_dst);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -288,13 +305,19 @@ static void rk_iv_copyback(struct rk_crypto_info *dev)</div><div class='ctx'> 	struct ablkcipher_request *req =</div><div class='ctx'> 		ablkcipher_request_cast(dev-&gt;async_req);</div><div class='ctx'> 	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct rk_cipher_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='ctx'> 	u32 ivsize = crypto_ablkcipher_ivsize(tfm);</div><div class='ctx'> </div><div class='del'>-	if (ivsize == DES_BLOCK_SIZE)</div><div class='del'>-		memcpy_fromio(req-&gt;info, dev-&gt;reg + RK_CRYPTO_TDES_IV_0,</div><div class='del'>-			      ivsize);</div><div class='del'>-	else if (ivsize == AES_BLOCK_SIZE)</div><div class='del'>-		memcpy_fromio(req-&gt;info, dev-&gt;reg + RK_CRYPTO_AES_IV_0, ivsize);</div><div class='add'>+	/* Update the IV buffer to contain the next IV for encryption mode. */</div><div class='add'>+	if (!(ctx-&gt;mode &amp; RK_CRYPTO_DEC)) {</div><div class='add'>+		if (dev-&gt;aligned) {</div><div class='add'>+			memcpy(req-&gt;info, sg_virt(dev-&gt;sg_dst) +</div><div class='add'>+				dev-&gt;sg_dst-&gt;length - ivsize, ivsize);</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(req-&gt;info, dev-&gt;addr_vir +</div><div class='add'>+				dev-&gt;count - ivsize, ivsize);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rk_update_iv(struct rk_crypto_info *dev)</div><div class='hunk'>@@ -457,7 +480,7 @@ struct rk_crypto_tmp rk_ecb_des_alg = {</div><div class='ctx'> 		.cra_u.ablkcipher	= {</div><div class='ctx'> 			.min_keysize	= DES_KEY_SIZE,</div><div class='ctx'> 			.max_keysize	= DES_KEY_SIZE,</div><div class='del'>-			.setkey		= rk_tdes_setkey,</div><div class='add'>+			.setkey		= rk_des_setkey,</div><div class='ctx'> 			.encrypt	= rk_des_ecb_encrypt,</div><div class='ctx'> 			.decrypt	= rk_des_ecb_decrypt,</div><div class='ctx'> 		}</div><div class='hunk'>@@ -483,7 +506,7 @@ struct rk_crypto_tmp rk_cbc_des_alg = {</div><div class='ctx'> 			.min_keysize	= DES_KEY_SIZE,</div><div class='ctx'> 			.max_keysize	= DES_KEY_SIZE,</div><div class='ctx'> 			.ivsize		= DES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= rk_tdes_setkey,</div><div class='add'>+			.setkey		= rk_des_setkey,</div><div class='ctx'> 			.encrypt	= rk_des_cbc_encrypt,</div><div class='ctx'> 			.decrypt	= rk_des_cbc_decrypt,</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c<br/>index 1afdcb81d8ed..9ef25230c199 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/s5p-sss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/s5p-sss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/s5p-sss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/s5p-sss.c</a></div><div class='hunk'>@@ -1534,7 +1534,6 @@ static int s5p_hash_shash_digest(struct crypto_shash *tfm, u32 flags,</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, tfm);</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = tfm;</div><div class='del'>-	shash-&gt;flags = flags &amp; ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_shash_digest(shash, data, len, out);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c<br/>index 8c32a3059b4a..fd11162a915e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sahara.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sahara.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sahara.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/sahara.c</a></div><div class='hunk'>@@ -354,7 +354,7 @@ static void sahara_decode_status(struct sahara_dev *dev, unsigned int status)</div><div class='ctx'> {</div><div class='ctx'> 	u8 state;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ENABLED(DEBUG))</div><div class='add'>+	if (!__is_defined(DEBUG))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	state = SAHARA_STATUS_GET_STATE(status);</div><div class='hunk'>@@ -406,7 +406,7 @@ static void sahara_dump_descriptors(struct sahara_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ENABLED(DEBUG))</div><div class='add'>+	if (!__is_defined(DEBUG))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SAHARA_MAX_HW_DESC; i++) {</div><div class='hunk'>@@ -427,7 +427,7 @@ static void sahara_dump_links(struct sahara_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ENABLED(DEBUG))</div><div class='add'>+	if (!__is_defined(DEBUG))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SAHARA_MAX_HW_LINK; i++) {</div><div class='head'>diff --git a/drivers/crypto/stm32/Kconfig b/drivers/crypto/stm32/Kconfig<br/>index 63aa78c0b12b..4491e2197d9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/stm32/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/stm32/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/stm32/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/stm32/Kconfig</a></div><div class='hunk'>@@ -24,6 +24,7 @@ config CRYPTO_DEV_STM32_CRYP</div><div class='ctx'> 	depends on ARCH_STM32</div><div class='ctx'> 	select CRYPTO_HASH</div><div class='ctx'> 	select CRYPTO_ENGINE</div><div class='add'>+	select CRYPTO_DES</div><div class='ctx'> 	help</div><div class='ctx'>           This enables support for the CRYP (AES/DES/TDES) hw accelerator which</div><div class='ctx'> 	  can be found on STMicroelectronics STM32 SOC.</div><div class='head'>diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c<br/>index 23b0b7bd64c7..cddcc97875b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/stm32/stm32-cryp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/stm32/stm32-cryp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/stm32/stm32-cryp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/stm32/stm32-cryp.c</a></div><div class='hunk'>@@ -137,7 +137,6 @@ struct stm32_cryp {</div><div class='ctx'> </div><div class='ctx'> 	struct crypto_engine    *engine;</div><div class='ctx'> </div><div class='del'>-	struct mutex            lock; /* protects req / areq */</div><div class='ctx'> 	struct ablkcipher_request *req;</div><div class='ctx'> 	struct aead_request     *areq;</div><div class='ctx'> </div><div class='hunk'>@@ -394,6 +393,23 @@ static void stm32_cryp_hw_write_iv(struct stm32_cryp *cryp, u32 *iv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void stm32_cryp_get_iv(struct stm32_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	struct ablkcipher_request *req = cryp-&gt;req;</div><div class='add'>+	u32 *tmp = req-&gt;info;</div><div class='add'>+</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*tmp++ = cpu_to_be32(stm32_cryp_read(cryp, CRYP_IV0LR));</div><div class='add'>+	*tmp++ = cpu_to_be32(stm32_cryp_read(cryp, CRYP_IV0RR));</div><div class='add'>+</div><div class='add'>+	if (is_aes(cryp)) {</div><div class='add'>+		*tmp++ = cpu_to_be32(stm32_cryp_read(cryp, CRYP_IV1LR));</div><div class='add'>+		*tmp++ = cpu_to_be32(stm32_cryp_read(cryp, CRYP_IV1RR));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void stm32_cryp_hw_write_key(struct stm32_cryp *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -623,6 +639,9 @@ static void stm32_cryp_finish_req(struct stm32_cryp *cryp, int err)</div><div class='ctx'> 		/* Phase 4 : output tag */</div><div class='ctx'> 		err = stm32_cryp_read_auth_tag(cryp);</div><div class='ctx'> </div><div class='add'>+	if (!err &amp;&amp; (!(is_gcm(cryp) || is_ccm(cryp))))</div><div class='add'>+		stm32_cryp_get_iv(cryp);</div><div class='add'>+</div><div class='ctx'> 	if (cryp-&gt;sgs_copied) {</div><div class='ctx'> 		void *buf_in, *buf_out;</div><div class='ctx'> 		int pages, len;</div><div class='hunk'>@@ -645,18 +664,13 @@ static void stm32_cryp_finish_req(struct stm32_cryp *cryp, int err)</div><div class='ctx'> 	pm_runtime_mark_last_busy(cryp-&gt;dev);</div><div class='ctx'> 	pm_runtime_put_autosuspend(cryp-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (is_gcm(cryp) || is_ccm(cryp)) {</div><div class='add'>+	if (is_gcm(cryp) || is_ccm(cryp))</div><div class='ctx'> 		crypto_finalize_aead_request(cryp-&gt;engine, cryp-&gt;areq, err);</div><div class='del'>-		cryp-&gt;areq = NULL;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		crypto_finalize_ablkcipher_request(cryp-&gt;engine, cryp-&gt;req,</div><div class='ctx'> 						   err);</div><div class='del'>-		cryp-&gt;req = NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memset(cryp-&gt;ctx-&gt;key, 0, cryp-&gt;ctx-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;cryp-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_cryp_cpu_start(struct stm32_cryp *cryp)</div><div class='hunk'>@@ -753,19 +767,35 @@ static int stm32_cryp_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> static int stm32_cryp_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> 				 unsigned int keylen)</div><div class='ctx'> {</div><div class='add'>+	u32 tmp[DES_EXPKEY_WORDS];</div><div class='add'>+</div><div class='ctx'> 	if (keylen != DES_KEY_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	else</div><div class='del'>-		return stm32_cryp_setkey(tfm, key, keylen);</div><div class='add'>+</div><div class='add'>+	if ((crypto_ablkcipher_get_flags(tfm) &amp;</div><div class='add'>+	     CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &amp;&amp;</div><div class='add'>+	    unlikely(!des_ekey(tmp, key))) {</div><div class='add'>+		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_WEAK_KEY);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return stm32_cryp_setkey(tfm, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_cryp_tdes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> 				  unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	if (keylen != (3 * DES_KEY_SIZE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else</div><div class='del'>-		return stm32_cryp_setkey(tfm, key, keylen);</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(tfm);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(tfm, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return stm32_cryp_setkey(tfm, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_cryp_aes_aead_setkey(struct crypto_aead *tfm, const u8 *key,</div><div class='hunk'>@@ -917,8 +947,6 @@ static int stm32_cryp_prepare_req(struct ablkcipher_request *req,</div><div class='ctx'> 	if (!cryp)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;cryp-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	rctx = req ? ablkcipher_request_ctx(req) : aead_request_ctx(areq);</div><div class='ctx'> 	rctx-&gt;mode &amp;= FLG_MODE_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -930,6 +958,7 @@ static int stm32_cryp_prepare_req(struct ablkcipher_request *req,</div><div class='ctx'> </div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		cryp-&gt;req = req;</div><div class='add'>+		cryp-&gt;areq = NULL;</div><div class='ctx'> 		cryp-&gt;total_in = req-&gt;nbytes;</div><div class='ctx'> 		cryp-&gt;total_out = cryp-&gt;total_in;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -955,6 +984,7 @@ static int stm32_cryp_prepare_req(struct ablkcipher_request *req,</div><div class='ctx'> 		 *          &lt;---------- total_out -----------------&gt;</div><div class='ctx'> 		 */</div><div class='ctx'> 		cryp-&gt;areq = areq;</div><div class='add'>+		cryp-&gt;req = NULL;</div><div class='ctx'> 		cryp-&gt;authsize = crypto_aead_authsize(crypto_aead_reqtfm(areq));</div><div class='ctx'> 		cryp-&gt;total_in = areq-&gt;assoclen + areq-&gt;cryptlen;</div><div class='ctx'> 		if (is_encrypt(cryp))</div><div class='hunk'>@@ -976,19 +1006,19 @@ static int stm32_cryp_prepare_req(struct ablkcipher_request *req,</div><div class='ctx'> 	if (cryp-&gt;in_sg_len &lt; 0) {</div><div class='ctx'> 		dev_err(cryp-&gt;dev, "Cannot get in_sg_len\n");</div><div class='ctx'> 		ret = cryp-&gt;in_sg_len;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cryp-&gt;out_sg_len = sg_nents_for_len(cryp-&gt;out_sg, cryp-&gt;total_out);</div><div class='ctx'> 	if (cryp-&gt;out_sg_len &lt; 0) {</div><div class='ctx'> 		dev_err(cryp-&gt;dev, "Cannot get out_sg_len\n");</div><div class='ctx'> 		ret = cryp-&gt;out_sg_len;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = stm32_cryp_copy_sgs(cryp);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	scatterwalk_start(&amp;cryp-&gt;in_walk, cryp-&gt;in_sg);</div><div class='ctx'> 	scatterwalk_start(&amp;cryp-&gt;out_walk, cryp-&gt;out_sg);</div><div class='hunk'>@@ -1000,10 +1030,6 @@ static int stm32_cryp_prepare_req(struct ablkcipher_request *req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = stm32_cryp_hw_init(cryp);</div><div class='del'>-out:</div><div class='del'>-	if (ret)</div><div class='del'>-		mutex_unlock(&amp;cryp-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1943,8 +1969,6 @@ static int stm32_cryp_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	cryp-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;cryp-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	cryp-&gt;regs = devm_ioremap_resource(dev, res);</div><div class='ctx'> 	if (IS_ERR(cryp-&gt;regs))</div><div class='head'>diff --git a/drivers/crypto/stm32/stm32-hash.c b/drivers/crypto/stm32/stm32-hash.c<br/>index 4a6cc8a3045d..bfc49e67124b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/stm32/stm32-hash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/stm32/stm32-hash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/stm32/stm32-hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/stm32/stm32-hash.c</a></div><div class='hunk'>@@ -181,8 +181,6 @@ struct stm32_hash_dev {</div><div class='ctx'> 	u32			dma_mode;</div><div class='ctx'> 	u32			dma_maxburst;</div><div class='ctx'> </div><div class='del'>-	spinlock_t		lock; /* lock to protect queue */</div><div class='del'>-</div><div class='ctx'> 	struct ahash_request	*req;</div><div class='ctx'> 	struct crypto_engine	*engine;</div><div class='ctx'> </div><div class='hunk'>@@ -977,7 +975,7 @@ static int stm32_hash_export(struct ahash_request *req, void *out)</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_get_sync(hdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	while (!(stm32_hash_read(hdev, HASH_SR) &amp; HASH_SR_DATA_INPUT_READY))</div><div class='add'>+	while ((stm32_hash_read(hdev, HASH_SR) &amp; HASH_SR_BUSY))</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	rctx-&gt;hw_context = kmalloc_array(3 + HASH_CSR_REGISTER_NUMBER,</div><div class='head'>diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c<br/>index 54fd714d53ca..b060a0810934 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss-cipher.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/sunxi-ss/sun4i-ss-cipher.c</a></div><div class='hunk'>@@ -41,11 +41,6 @@ static int sun4i_ss_opti_poll(struct skcipher_request *areq)</div><div class='ctx'> 	if (!areq-&gt;cryptlen)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!areq-&gt;iv) {</div><div class='del'>-		dev_err_ratelimited(ss-&gt;dev, "ERROR: Empty IV\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!areq-&gt;src || !areq-&gt;dst) {</div><div class='ctx'> 		dev_err_ratelimited(ss-&gt;dev, "ERROR: Some SGs are NULL\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -134,6 +129,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)</div><div class='ctx'> 	struct scatterlist *out_sg = areq-&gt;dst;</div><div class='ctx'> 	unsigned int ivsize = crypto_skcipher_ivsize(tfm);</div><div class='ctx'> 	struct sun4i_cipher_req_ctx *ctx = skcipher_request_ctx(areq);</div><div class='add'>+	struct skcipher_alg *alg = crypto_skcipher_alg(tfm);</div><div class='add'>+	struct sun4i_ss_alg_template *algt;</div><div class='ctx'> 	u32 mode = ctx-&gt;mode;</div><div class='ctx'> 	/* when activating SS, the default FIFO space is SS_RX_DEFAULT(32) */</div><div class='ctx'> 	u32 rx_cnt = SS_RX_DEFAULT;</div><div class='hunk'>@@ -153,20 +150,20 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)</div><div class='ctx'> 	unsigned int obo = 0;	/* offset in bufo*/</div><div class='ctx'> 	unsigned int obl = 0;	/* length of data in bufo */</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	bool need_fallback;</div><div class='ctx'> </div><div class='ctx'> 	if (!areq-&gt;cryptlen)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!areq-&gt;iv) {</div><div class='del'>-		dev_err_ratelimited(ss-&gt;dev, "ERROR: Empty IV\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!areq-&gt;src || !areq-&gt;dst) {</div><div class='ctx'> 		dev_err_ratelimited(ss-&gt;dev, "ERROR: Some SGs are NULL\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	algt = container_of(alg, struct sun4i_ss_alg_template, alg.crypto);</div><div class='add'>+	if (areq-&gt;cryptlen % algt-&gt;alg.crypto.base.cra_blocksize)</div><div class='add'>+		need_fallback = true;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if we have only SGs with size multiple of 4,</div><div class='ctx'> 	 * we can use the SS optimized function</div><div class='hunk'>@@ -182,9 +179,24 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)</div><div class='ctx'> 		out_sg = sg_next(out_sg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (no_chunk == 1)</div><div class='add'>+	if (no_chunk == 1 &amp;&amp; !need_fallback)</div><div class='ctx'> 		return sun4i_ss_opti_poll(areq);</div><div class='ctx'> </div><div class='add'>+	if (need_fallback) {</div><div class='add'>+		SYNC_SKCIPHER_REQUEST_ON_STACK(subreq, op-&gt;fallback_tfm);</div><div class='add'>+		skcipher_request_set_sync_tfm(subreq, op-&gt;fallback_tfm);</div><div class='add'>+		skcipher_request_set_callback(subreq, areq-&gt;base.flags, NULL,</div><div class='add'>+					      NULL);</div><div class='add'>+		skcipher_request_set_crypt(subreq, areq-&gt;src, areq-&gt;dst,</div><div class='add'>+					   areq-&gt;cryptlen, areq-&gt;iv);</div><div class='add'>+		if (ctx-&gt;mode &amp; SS_DECRYPTION)</div><div class='add'>+			err = crypto_skcipher_decrypt(subreq);</div><div class='add'>+		else</div><div class='add'>+			err = crypto_skcipher_encrypt(subreq);</div><div class='add'>+		skcipher_request_zero(subreq);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;ss-&gt;slock, flags);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; op-&gt;keylen; i += 4)</div><div class='hunk'>@@ -458,6 +470,7 @@ int sun4i_ss_cipher_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct sun4i_tfm_ctx *op = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct sun4i_ss_alg_template *algt;</div><div class='add'>+	const char *name = crypto_tfm_alg_name(tfm);</div><div class='ctx'> </div><div class='ctx'> 	memset(op, 0, sizeof(struct sun4i_tfm_ctx));</div><div class='ctx'> </div><div class='hunk'>@@ -468,9 +481,22 @@ int sun4i_ss_cipher_init(struct crypto_tfm *tfm)</div><div class='ctx'> 	crypto_skcipher_set_reqsize(__crypto_skcipher_cast(tfm),</div><div class='ctx'> 				    sizeof(struct sun4i_cipher_req_ctx));</div><div class='ctx'> </div><div class='add'>+	op-&gt;fallback_tfm = crypto_alloc_sync_skcipher(name, 0, CRYPTO_ALG_NEED_FALLBACK);</div><div class='add'>+	if (IS_ERR(op-&gt;fallback_tfm)) {</div><div class='add'>+		dev_err(op-&gt;ss-&gt;dev, "ERROR: Cannot allocate fallback for %s %ld\n",</div><div class='add'>+			name, PTR_ERR(op-&gt;fallback_tfm));</div><div class='add'>+		return PTR_ERR(op-&gt;fallback_tfm);</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='add'>+void sun4i_ss_cipher_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct sun4i_tfm_ctx *op = crypto_tfm_ctx(tfm);</div><div class='add'>+	crypto_free_sync_skcipher(op-&gt;fallback_tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* check and set the AES key, prepare the mode to be used */</div><div class='ctx'> int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> 			unsigned int keylen)</div><div class='hunk'>@@ -495,7 +521,11 @@ int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> 	}</div><div class='ctx'> 	op-&gt;keylen = keylen;</div><div class='ctx'> 	memcpy(op-&gt;key, key, keylen);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	crypto_sync_skcipher_clear_flags(op-&gt;fallback_tfm, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_sync_skcipher_set_flags(op-&gt;fallback_tfm, tfm-&gt;base.crt_flags &amp; CRYPTO_TFM_REQ_MASK);</div><div class='add'>+</div><div class='add'>+	return crypto_sync_skcipher_setkey(op-&gt;fallback_tfm, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* check and set the DES key, prepare the mode to be used */</div><div class='hunk'>@@ -525,7 +555,11 @@ int sun4i_ss_des_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;keylen = keylen;</div><div class='ctx'> 	memcpy(op-&gt;key, key, keylen);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	crypto_sync_skcipher_clear_flags(op-&gt;fallback_tfm, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_sync_skcipher_set_flags(op-&gt;fallback_tfm, tfm-&gt;base.crt_flags &amp; CRYPTO_TFM_REQ_MASK);</div><div class='add'>+</div><div class='add'>+	return crypto_sync_skcipher_setkey(op-&gt;fallback_tfm, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* check and set the 3DES key, prepare the mode to be used */</div><div class='hunk'>@@ -533,14 +567,18 @@ int sun4i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> 			 unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm);</div><div class='del'>-	struct sun4i_ss_ctx *ss = op-&gt;ss;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = des3_verify_key(tfm, key);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(keylen != 3 * DES_KEY_SIZE)) {</div><div class='del'>-		dev_err(ss-&gt;dev, "Invalid keylen %u\n", keylen);</div><div class='del'>-		crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	op-&gt;keylen = keylen;</div><div class='ctx'> 	memcpy(op-&gt;key, key, keylen);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	crypto_sync_skcipher_clear_flags(op-&gt;fallback_tfm, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_sync_skcipher_set_flags(op-&gt;fallback_tfm, tfm-&gt;base.crt_flags &amp; CRYPTO_TFM_REQ_MASK);</div><div class='add'>+</div><div class='add'>+	return crypto_sync_skcipher_setkey(op-&gt;fallback_tfm, key, keylen);</div><div class='add'>+</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c<br/>index 89adf9e0fed2..05b3d3c32f6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/sunxi-ss/sun4i-ss-core.c</a></div><div class='hunk'>@@ -92,11 +92,12 @@ static struct sun4i_ss_alg_template ss_algs[] = {</div><div class='ctx'> 			.cra_driver_name = "cbc-aes-sun4i-ss",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='ctx'> 			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK,</div><div class='ctx'> 			.cra_ctxsize = sizeof(struct sun4i_tfm_ctx),</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_alignmask = 3,</div><div class='ctx'> 			.cra_init = sun4i_ss_cipher_init,</div><div class='add'>+			.cra_exit = sun4i_ss_cipher_exit,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='hunk'>@@ -107,17 +108,17 @@ static struct sun4i_ss_alg_template ss_algs[] = {</div><div class='ctx'> 		.decrypt        = sun4i_ss_ecb_aes_decrypt,</div><div class='ctx'> 		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='ctx'> 		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='ctx'> 		.base = {</div><div class='ctx'> 			.cra_name = "ecb(aes)",</div><div class='ctx'> 			.cra_driver_name = "ecb-aes-sun4i-ss",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='ctx'> 			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK,</div><div class='ctx'> 			.cra_ctxsize = sizeof(struct sun4i_tfm_ctx),</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_alignmask = 3,</div><div class='ctx'> 			.cra_init = sun4i_ss_cipher_init,</div><div class='add'>+			.cra_exit = sun4i_ss_cipher_exit,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='hunk'>@@ -134,11 +135,12 @@ static struct sun4i_ss_alg_template ss_algs[] = {</div><div class='ctx'> 			.cra_driver_name = "cbc-des-sun4i-ss",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='ctx'> 			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK,</div><div class='ctx'> 			.cra_ctxsize = sizeof(struct sun4i_req_ctx),</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_alignmask = 3,</div><div class='ctx'> 			.cra_init = sun4i_ss_cipher_init,</div><div class='add'>+			.cra_exit = sun4i_ss_cipher_exit,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='hunk'>@@ -154,11 +156,12 @@ static struct sun4i_ss_alg_template ss_algs[] = {</div><div class='ctx'> 			.cra_driver_name = "ecb-des-sun4i-ss",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='ctx'> 			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK,</div><div class='ctx'> 			.cra_ctxsize = sizeof(struct sun4i_req_ctx),</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_alignmask = 3,</div><div class='ctx'> 			.cra_init = sun4i_ss_cipher_init,</div><div class='add'>+			.cra_exit = sun4i_ss_cipher_exit,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='hunk'>@@ -175,11 +178,12 @@ static struct sun4i_ss_alg_template ss_algs[] = {</div><div class='ctx'> 			.cra_driver_name = "cbc-des3-sun4i-ss",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='ctx'> 			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK,</div><div class='ctx'> 			.cra_ctxsize = sizeof(struct sun4i_req_ctx),</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_alignmask = 3,</div><div class='ctx'> 			.cra_init = sun4i_ss_cipher_init,</div><div class='add'>+			.cra_exit = sun4i_ss_cipher_exit,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='hunk'>@@ -190,16 +194,17 @@ static struct sun4i_ss_alg_template ss_algs[] = {</div><div class='ctx'> 		.decrypt        = sun4i_ss_ecb_des3_decrypt,</div><div class='ctx'> 		.min_keysize    = DES3_EDE_KEY_SIZE,</div><div class='ctx'> 		.max_keysize    = DES3_EDE_KEY_SIZE,</div><div class='del'>-		.ivsize         = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 		.base = {</div><div class='ctx'> 			.cra_name = "ecb(des3_ede)",</div><div class='ctx'> 			.cra_driver_name = "ecb-des3-sun4i-ss",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='ctx'> 			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK,</div><div class='ctx'> 			.cra_ctxsize = sizeof(struct sun4i_req_ctx),</div><div class='ctx'> 			.cra_module = THIS_MODULE,</div><div class='ctx'> 			.cra_alignmask = 3,</div><div class='ctx'> 			.cra_init = sun4i_ss_cipher_init,</div><div class='add'>+			.cra_exit = sun4i_ss_cipher_exit,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> },</div><div class='head'>diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c<br/>index a4b5ff2b72f8..f6936bb3b7be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss-hash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss-hash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss-hash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/sunxi-ss/sun4i-ss-hash.c</a></div><div class='hunk'>@@ -240,7 +240,10 @@ static int sun4i_hash(struct ahash_request *areq)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Since we have the flag final, we can go up to modulo 4 */</div><div class='del'>-		end = ((areq-&gt;nbytes + op-&gt;len) / 4) * 4 - op-&gt;len;</div><div class='add'>+		if (areq-&gt;nbytes &lt; 4)</div><div class='add'>+			end = 0;</div><div class='add'>+		else</div><div class='add'>+			end = ((areq-&gt;nbytes + op-&gt;len) / 4) * 4 - op-&gt;len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TODO if SGlen % 4 and !op-&gt;len then DMA */</div><div class='head'>diff --git a/drivers/crypto/sunxi-ss/sun4i-ss.h b/drivers/crypto/sunxi-ss/sun4i-ss.h<br/>index f3ac90692ac6..8c4ec9e93565 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/sunxi-ss/sun4i-ss.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/sunxi-ss/sun4i-ss.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/sunxi-ss/sun4i-ss.h</a></div><div class='hunk'>@@ -161,6 +161,7 @@ struct sun4i_tfm_ctx {</div><div class='ctx'> 	u32 keylen;</div><div class='ctx'> 	u32 keymode;</div><div class='ctx'> 	struct sun4i_ss_ctx *ss;</div><div class='add'>+	struct crypto_sync_skcipher *fallback_tfm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sun4i_cipher_req_ctx {</div><div class='hunk'>@@ -203,6 +204,7 @@ int sun4i_ss_ecb_des3_encrypt(struct skcipher_request *areq);</div><div class='ctx'> int sun4i_ss_ecb_des3_decrypt(struct skcipher_request *areq);</div><div class='ctx'> </div><div class='ctx'> int sun4i_ss_cipher_init(struct crypto_tfm *tfm);</div><div class='add'>+void sun4i_ss_cipher_exit(struct crypto_tfm *tfm);</div><div class='ctx'> int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> 			unsigned int keylen);</div><div class='ctx'> int sun4i_ss_des_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='head'>diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c<br/>index de78b54bcfb1..1d429fc073d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/talitos.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/talitos.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/talitos.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/talitos.c</a></div><div class='hunk'>@@ -913,6 +913,54 @@ badkey:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aead_des3_setkey(struct crypto_aead *authenc,</div><div class='add'>+			    const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct talitos_ctx *ctx = crypto_aead_ctx(authenc);</div><div class='add'>+	struct device *dev = ctx-&gt;dev;</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_authenc_extractkeys(&amp;keys, key, keylen);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (keys.authkeylen + keys.enckeylen &gt; TALITOS_MAX_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	if (keys.enckeylen != DES3_EDE_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	flags = crypto_aead_get_flags(authenc);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, keys.enckey);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_aead_set_flags(authenc, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;keylen)</div><div class='add'>+		dma_unmap_single(dev, ctx-&gt;dma_key, ctx-&gt;keylen, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;key, keys.authkey, keys.authkeylen);</div><div class='add'>+	memcpy(&amp;ctx-&gt;key[keys.authkeylen], keys.enckey, keys.enckeylen);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;keylen = keys.authkeylen + keys.enckeylen;</div><div class='add'>+	ctx-&gt;enckeylen = keys.enckeylen;</div><div class='add'>+	ctx-&gt;authkeylen = keys.authkeylen;</div><div class='add'>+	ctx-&gt;dma_key = dma_map_single(dev, ctx-&gt;key, ctx-&gt;keylen,</div><div class='add'>+				      DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(authenc, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * talitos_edesc - s/w-extended descriptor</div><div class='ctx'>  * @src_nents: number of segments in input scatterlist</div><div class='hunk'>@@ -1527,12 +1575,22 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,</div><div class='ctx'> {</div><div class='ctx'> 	struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='ctx'> 	struct device *dev = ctx-&gt;dev;</div><div class='del'>-	u32 tmp[DES_EXPKEY_WORDS];</div><div class='ctx'> </div><div class='del'>-	if (keylen &gt; TALITOS_MAX_KEY_SIZE) {</div><div class='del'>-		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (ctx-&gt;keylen)</div><div class='add'>+		dma_unmap_single(dev, ctx-&gt;dma_key, ctx-&gt;keylen, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ctx-&gt;key, key, keylen);</div><div class='add'>+	ctx-&gt;keylen = keylen;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;dma_key = dma_map_single(dev, ctx-&gt;key, keylen, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablkcipher_des_setkey(struct crypto_ablkcipher *cipher,</div><div class='add'>+				 const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u32 tmp[DES_EXPKEY_WORDS];</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(crypto_ablkcipher_get_flags(cipher) &amp;</div><div class='ctx'> 		     CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &amp;&amp;</div><div class='hunk'>@@ -1541,15 +1599,23 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;keylen)</div><div class='del'>-		dma_unmap_single(dev, ctx-&gt;dma_key, ctx-&gt;keylen, DMA_TO_DEVICE);</div><div class='add'>+	return ablkcipher_setkey(cipher, key, keylen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;ctx-&gt;key, key, keylen);</div><div class='del'>-	ctx-&gt;keylen = keylen;</div><div class='add'>+static int ablkcipher_des3_setkey(struct crypto_ablkcipher *cipher,</div><div class='add'>+				  const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;dma_key = dma_map_single(dev, ctx-&gt;key, keylen, DMA_TO_DEVICE);</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ablkcipher_setkey(cipher, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void common_nonsnoop_unmap(struct device *dev,</div><div class='hunk'>@@ -2313,6 +2379,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA1_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |</div><div class='ctx'> 			             DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2336,6 +2403,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA1_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |</div><div class='ctx'> 				     DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2399,6 +2467,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA224_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |</div><div class='ctx'> 			             DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2422,6 +2491,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA224_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |</div><div class='ctx'> 				     DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2485,6 +2555,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA256_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |</div><div class='ctx'> 			             DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2508,6 +2579,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA256_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |</div><div class='ctx'> 				     DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2550,6 +2622,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA384_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |</div><div class='ctx'> 			             DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2592,6 +2665,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = SHA512_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |</div><div class='ctx'> 			             DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2654,6 +2728,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |</div><div class='ctx'> 			             DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2676,6 +2751,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='ctx'> 			.maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+			.setkey = aead_des3_setkey,</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |</div><div class='ctx'> 				     DESC_HDR_SEL0_DEU |</div><div class='hunk'>@@ -2748,6 +2824,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 				.min_keysize = DES_KEY_SIZE,</div><div class='ctx'> 				.max_keysize = DES_KEY_SIZE,</div><div class='ctx'> 				.ivsize = DES_BLOCK_SIZE,</div><div class='add'>+				.setkey = ablkcipher_des_setkey,</div><div class='ctx'> 			}</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='hunk'>@@ -2764,6 +2841,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 				.min_keysize = DES_KEY_SIZE,</div><div class='ctx'> 				.max_keysize = DES_KEY_SIZE,</div><div class='ctx'> 				.ivsize = DES_BLOCK_SIZE,</div><div class='add'>+				.setkey = ablkcipher_des_setkey,</div><div class='ctx'> 			}</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='hunk'>@@ -2781,6 +2859,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 				.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='ctx'> 				.max_keysize = DES3_EDE_KEY_SIZE,</div><div class='ctx'> 				.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+				.setkey = ablkcipher_des3_setkey,</div><div class='ctx'> 			}</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='hunk'>@@ -2798,6 +2877,7 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 				.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='ctx'> 				.max_keysize = DES3_EDE_KEY_SIZE,</div><div class='ctx'> 				.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+				.setkey = ablkcipher_des3_setkey,</div><div class='ctx'> 			}</div><div class='ctx'> 		},</div><div class='ctx'> 		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='hunk'>@@ -3144,7 +3224,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,</div><div class='ctx'> 		alg-&gt;cra_init = talitos_cra_init;</div><div class='ctx'> 		alg-&gt;cra_exit = talitos_cra_exit;</div><div class='ctx'> 		alg-&gt;cra_type = &amp;crypto_ablkcipher_type;</div><div class='del'>-		alg-&gt;cra_ablkcipher.setkey = ablkcipher_setkey;</div><div class='add'>+		alg-&gt;cra_ablkcipher.setkey = alg-&gt;cra_ablkcipher.setkey ?:</div><div class='add'>+					     ablkcipher_setkey;</div><div class='ctx'> 		alg-&gt;cra_ablkcipher.encrypt = ablkcipher_encrypt;</div><div class='ctx'> 		alg-&gt;cra_ablkcipher.decrypt = ablkcipher_decrypt;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3152,7 +3233,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,</div><div class='ctx'> 		alg = &amp;t_alg-&gt;algt.alg.aead.base;</div><div class='ctx'> 		alg-&gt;cra_exit = talitos_cra_exit;</div><div class='ctx'> 		t_alg-&gt;algt.alg.aead.init = talitos_cra_init_aead;</div><div class='del'>-		t_alg-&gt;algt.alg.aead.setkey = aead_setkey;</div><div class='add'>+		t_alg-&gt;algt.alg.aead.setkey = t_alg-&gt;algt.alg.aead.setkey ?:</div><div class='add'>+					      aead_setkey;</div><div class='ctx'> 		t_alg-&gt;algt.alg.aead.encrypt = aead_encrypt;</div><div class='ctx'> 		t_alg-&gt;algt.alg.aead.decrypt = aead_decrypt;</div><div class='ctx'> 		if (!(priv-&gt;features &amp; TALITOS_FTR_SHA224_HWINIT) &amp;&amp;</div><div class='head'>diff --git a/drivers/crypto/ux500/cryp/Makefile b/drivers/crypto/ux500/cryp/Makefile<br/>index b497ae3dde07..dc8fff29c4b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ux500/cryp/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ux500/cryp/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ux500/cryp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ux500/cryp/Makefile</a></div><div class='hunk'>@@ -3,11 +3,7 @@</div><div class='ctx'> # * Author: shujuan.chen@stericsson.com for ST-Ericsson.</div><div class='ctx'> # * License terms: GNU General Public License (GPL) version 2  */</div><div class='ctx'> </div><div class='del'>-ifdef CONFIG_CRYPTO_DEV_UX500_DEBUG</div><div class='del'>-CFLAGS_cryp_core.o := -DDEBUG</div><div class='del'>-CFLAGS_cryp.o := -DDEBUG</div><div class='del'>-CFLAGS_cryp_irq.o := -DDEBUG</div><div class='del'>-endif</div><div class='add'>+ccflags-$(CONFIG_CRYPTO_DEV_UX500_DEBUG) += -DDEBUG</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_UX500_CRYP) += ux500_cryp.o</div><div class='ctx'> ux500_cryp-objs :=  cryp.o cryp_irq.o cryp_core.o</div><div class='head'>diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c<br/>index 3235611928f2..7a93cba0877f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ux500/cryp/cryp_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/ux500/cryp/cryp_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/ux500/cryp/cryp_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/ux500/cryp/cryp_core.c</a></div><div class='hunk'>@@ -1019,37 +1019,16 @@ static int des3_ablkcipher_setkey(struct crypto_ablkcipher *cipher,</div><div class='ctx'> 				  const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct cryp_ctx *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='del'>-	u32 *flags = &amp;cipher-&gt;base.crt_flags;</div><div class='del'>-	const u32 *K = (const u32 *)key;</div><div class='del'>-	u32 tmp[DES3_EDE_EXPKEY_WORDS];</div><div class='del'>-	int i, ret;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug(DEV_DBG_NAME " [%s]", __func__);</div><div class='del'>-	if (keylen != DES3_EDE_KEY_SIZE) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		pr_debug(DEV_DBG_NAME " [%s]: CRYPTO_TFM_RES_BAD_KEY_LEN",</div><div class='del'>-				__func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* Checking key interdependency for weak key detection. */</div><div class='del'>-	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='del'>-				!((K[2] ^ K[4]) | (K[3] ^ K[5]))) &amp;&amp;</div><div class='del'>-			(*flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-		pr_debug(DEV_DBG_NAME " [%s]: CRYPTO_TFM_RES_WEAK_KEY",</div><div class='del'>-			 __func__);</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 = des_ekey(tmp, key + i*DES_KEY_SIZE);</div><div class='del'>-		if (unlikely(ret == 0) &amp;&amp;</div><div class='del'>-		    (*flags &amp; CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {</div><div class='del'>-			*flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='del'>-			pr_debug(DEV_DBG_NAME " [%s]: CRYPTO_TFM_RES_WEAK_KEY",</div><div class='del'>-				 __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	flags = crypto_ablkcipher_get_flags(cipher);</div><div class='add'>+	err = __des3_verify_key(&amp;flags, key);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ctx-&gt;key, key, keylen);</div><div class='hunk'>@@ -1219,57 +1198,6 @@ static struct cryp_algo_template cryp_algs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.algomode = CRYP_ALGO_DES_ECB,</div><div class='ctx'> 		.crypto = {</div><div class='del'>-			.cra_name = "des",</div><div class='del'>-			.cra_driver_name = "des-ux500",</div><div class='del'>-			.cra_priority = 300,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='del'>-						CRYPTO_ALG_ASYNC,</div><div class='del'>-			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='del'>-			.cra_ctxsize = sizeof(struct cryp_ctx),</div><div class='del'>-			.cra_alignmask = 3,</div><div class='del'>-			.cra_type = &amp;crypto_ablkcipher_type,</div><div class='del'>-			.cra_init = cryp_cra_init,</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-			.cra_u = {</div><div class='del'>-				.ablkcipher = {</div><div class='del'>-					.min_keysize = DES_KEY_SIZE,</div><div class='del'>-					.max_keysize = DES_KEY_SIZE,</div><div class='del'>-					.setkey = des_ablkcipher_setkey,</div><div class='del'>-					.encrypt = cryp_blk_encrypt,</div><div class='del'>-					.decrypt = cryp_blk_decrypt</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'>-		.algomode = CRYP_ALGO_TDES_ECB,</div><div class='del'>-		.crypto = {</div><div class='del'>-			.cra_name = "des3_ede",</div><div class='del'>-			.cra_driver_name = "des3_ede-ux500",</div><div class='del'>-			.cra_priority = 300,</div><div class='del'>-			.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='del'>-						CRYPTO_ALG_ASYNC,</div><div class='del'>-			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='del'>-			.cra_ctxsize = sizeof(struct cryp_ctx),</div><div class='del'>-			.cra_alignmask = 3,</div><div class='del'>-			.cra_type = &amp;crypto_ablkcipher_type,</div><div class='del'>-			.cra_init = cryp_cra_init,</div><div class='del'>-			.cra_module = THIS_MODULE,</div><div class='del'>-			.cra_u = {</div><div class='del'>-				.ablkcipher = {</div><div class='del'>-					.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='del'>-					.max_keysize = DES3_EDE_KEY_SIZE,</div><div class='del'>-					.setkey = des_ablkcipher_setkey,</div><div class='del'>-					.encrypt = cryp_blk_encrypt,</div><div class='del'>-					.decrypt = cryp_blk_decrypt</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.algomode = CRYP_ALGO_DES_ECB,</div><div class='del'>-		.crypto = {</div><div class='ctx'> 			.cra_name = "ecb(des)",</div><div class='ctx'> 			.cra_driver_name = "ecb-des-ux500",</div><div class='ctx'> 			.cra_priority = 300,</div><div class='head'>diff --git a/drivers/crypto/vmx/aes.c b/drivers/crypto/vmx/aes.c<br/>index d7316f7a3a69..603a62081994 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/aes.c</a></div><div class='hunk'>@@ -23,9 +23,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "aesp8-ppc.h"</div><div class='ctx'> </div><div class='hunk'>@@ -78,20 +79,21 @@ static int p8_aes_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 	pagefault_disable();</div><div class='ctx'> 	enable_kernel_vsx();</div><div class='ctx'> 	ret = aes_p8_set_encrypt_key(key, keylen * 8, &amp;ctx-&gt;enc_key);</div><div class='del'>-	ret += aes_p8_set_decrypt_key(key, keylen * 8, &amp;ctx-&gt;dec_key);</div><div class='add'>+	ret |= aes_p8_set_decrypt_key(key, keylen * 8, &amp;ctx-&gt;dec_key);</div><div class='ctx'> 	disable_kernel_vsx();</div><div class='ctx'> 	pagefault_enable();</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='del'>-	ret += crypto_cipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='del'>-	return ret;</div><div class='add'>+	ret |= crypto_cipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='add'>+</div><div class='add'>+	return ret ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void p8_aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct p8_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		crypto_cipher_encrypt_one(ctx-&gt;fallback, dst, src);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		preempt_disable();</div><div class='hunk'>@@ -108,7 +110,7 @@ static void p8_aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct p8_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		crypto_cipher_decrypt_one(ctx-&gt;fallback, dst, src);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		preempt_disable();</div><div class='head'>diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c<br/>index c5c5ff82b52e..a1a9a6f0d42c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes_cbc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes_cbc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes_cbc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/aes_cbc.c</a></div><div class='hunk'>@@ -23,9 +23,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -81,13 +82,14 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 	pagefault_disable();</div><div class='ctx'> 	enable_kernel_vsx();</div><div class='ctx'> 	ret = aes_p8_set_encrypt_key(key, keylen * 8, &amp;ctx-&gt;enc_key);</div><div class='del'>-	ret += aes_p8_set_decrypt_key(key, keylen * 8, &amp;ctx-&gt;dec_key);</div><div class='add'>+	ret |= aes_p8_set_decrypt_key(key, keylen * 8, &amp;ctx-&gt;dec_key);</div><div class='ctx'> 	disable_kernel_vsx();</div><div class='ctx'> 	pagefault_enable();</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='del'>-	ret += crypto_sync_skcipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='del'>-	return ret;</div><div class='add'>+	ret |= crypto_sync_skcipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='add'>+</div><div class='add'>+	return ret ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,</div><div class='hunk'>@@ -99,7 +101,7 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct p8_aes_cbc_ctx *ctx =</div><div class='ctx'> 		crypto_tfm_ctx(crypto_blkcipher_tfm(desc-&gt;tfm));</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_sync_tfm(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_callback(req, desc-&gt;flags, NULL, NULL);</div><div class='hunk'>@@ -138,7 +140,7 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct p8_aes_cbc_ctx *ctx =</div><div class='ctx'> 		crypto_tfm_ctx(crypto_blkcipher_tfm(desc-&gt;tfm));</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_sync_tfm(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_callback(req, desc-&gt;flags, NULL, NULL);</div><div class='head'>diff --git a/drivers/crypto/vmx/aes_ctr.c b/drivers/crypto/vmx/aes_ctr.c<br/>index 8a2fe092cb8e..192a53512f5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes_ctr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes_ctr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes_ctr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/aes_ctr.c</a></div><div class='hunk'>@@ -23,9 +23,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -83,8 +84,9 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 	pagefault_enable();</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='del'>-	ret += crypto_sync_skcipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='del'>-	return ret;</div><div class='add'>+	ret |= crypto_sync_skcipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='add'>+</div><div class='add'>+	return ret ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx,</div><div class='hunk'>@@ -118,7 +120,7 @@ static int p8_aes_ctr_crypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct p8_aes_ctr_ctx *ctx =</div><div class='ctx'> 		crypto_tfm_ctx(crypto_blkcipher_tfm(desc-&gt;tfm));</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_sync_tfm(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_callback(req, desc-&gt;flags, NULL, NULL);</div><div class='head'>diff --git a/drivers/crypto/vmx/aes_xts.c b/drivers/crypto/vmx/aes_xts.c<br/>index ecd64e5cc5bb..00d412d811ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes_xts.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aes_xts.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aes_xts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/aes_xts.c</a></div><div class='hunk'>@@ -23,9 +23,10 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='hunk'>@@ -86,14 +87,15 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 	pagefault_disable();</div><div class='ctx'> 	enable_kernel_vsx();</div><div class='ctx'> 	ret = aes_p8_set_encrypt_key(key + keylen/2, (keylen/2) * 8, &amp;ctx-&gt;tweak_key);</div><div class='del'>-	ret += aes_p8_set_encrypt_key(key, (keylen/2) * 8, &amp;ctx-&gt;enc_key);</div><div class='del'>-	ret += aes_p8_set_decrypt_key(key, (keylen/2) * 8, &amp;ctx-&gt;dec_key);</div><div class='add'>+	ret |= aes_p8_set_encrypt_key(key, (keylen/2) * 8, &amp;ctx-&gt;enc_key);</div><div class='add'>+	ret |= aes_p8_set_decrypt_key(key, (keylen/2) * 8, &amp;ctx-&gt;dec_key);</div><div class='ctx'> 	disable_kernel_vsx();</div><div class='ctx'> 	pagefault_enable();</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='del'>-	ret += crypto_sync_skcipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='del'>-	return ret;</div><div class='add'>+	ret |= crypto_sync_skcipher_setkey(ctx-&gt;fallback, key, keylen);</div><div class='add'>+</div><div class='add'>+	return ret ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p8_aes_xts_crypt(struct blkcipher_desc *desc,</div><div class='hunk'>@@ -108,7 +110,7 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc,</div><div class='ctx'> 	struct p8_aes_xts_ctx *ctx =</div><div class='ctx'> 		crypto_tfm_ctx(crypto_blkcipher_tfm(desc-&gt;tfm));</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt()) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_sync_tfm(req, ctx-&gt;fallback);</div><div class='ctx'> 		skcipher_request_set_callback(req, desc-&gt;flags, NULL, NULL);</div><div class='head'>diff --git a/drivers/crypto/vmx/aesp8-ppc.pl b/drivers/crypto/vmx/aesp8-ppc.pl<br/>index d6a9f63d65ba..de78282b8f44 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aesp8-ppc.pl?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/aesp8-ppc.pl</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/aesp8-ppc.pl?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/aesp8-ppc.pl</a></div><div class='hunk'>@@ -1854,7 +1854,7 @@ Lctr32_enc8x_three:</div><div class='ctx'> 	stvx_u		$out1,$x10,$out</div><div class='ctx'> 	stvx_u		$out2,$x20,$out</div><div class='ctx'> 	addi		$out,$out,0x30</div><div class='del'>-	b		Lcbc_dec8x_done</div><div class='add'>+	b		Lctr32_enc8x_done</div><div class='ctx'> </div><div class='ctx'> .align	5</div><div class='ctx'> Lctr32_enc8x_two:</div><div class='hunk'>@@ -1866,7 +1866,7 @@ Lctr32_enc8x_two:</div><div class='ctx'> 	stvx_u		$out0,$x00,$out</div><div class='ctx'> 	stvx_u		$out1,$x10,$out</div><div class='ctx'> 	addi		$out,$out,0x20</div><div class='del'>-	b		Lcbc_dec8x_done</div><div class='add'>+	b		Lctr32_enc8x_done</div><div class='ctx'> </div><div class='ctx'> .align	5</div><div class='ctx'> Lctr32_enc8x_one:</div><div class='head'>diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c<br/>index dd8b8716467a..b5a6883bb09e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/ghash.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/ghash.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/ghash.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/ghash.c</a></div><div class='hunk'>@@ -23,16 +23,15 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='ctx'> #include &lt;crypto/ghash.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='ctx'> </div><div class='del'>-#define IN_INTERRUPT in_interrupt()</div><div class='del'>-</div><div class='ctx'> void gcm_init_p8(u128 htable[16], const u64 Xi[2]);</div><div class='ctx'> void gcm_gmult_p8(u64 Xi[2], const u128 htable[16]);</div><div class='ctx'> void gcm_ghash_p8(u64 Xi[2], const u128 htable[16],</div><div class='hunk'>@@ -102,7 +101,6 @@ static int p8_ghash_init(struct shash_desc *desc)</div><div class='ctx'> 	dctx-&gt;bytes = 0;</div><div class='ctx'> 	memset(dctx-&gt;shash, 0, GHASH_DIGEST_SIZE);</div><div class='ctx'> 	dctx-&gt;fallback_desc.tfm = ctx-&gt;fallback;</div><div class='del'>-	dctx-&gt;fallback_desc.flags = desc-&gt;flags;</div><div class='ctx'> 	return crypto_shash_init(&amp;dctx-&gt;fallback_desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +129,7 @@ static int p8_ghash_update(struct shash_desc *desc,</div><div class='ctx'> 	struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc-&gt;tfm));</div><div class='ctx'> 	struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (IN_INTERRUPT) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		return crypto_shash_update(&amp;dctx-&gt;fallback_desc, src,</div><div class='ctx'> 					   srclen);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -182,7 +180,7 @@ static int p8_ghash_final(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc-&gt;tfm));</div><div class='ctx'> 	struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);</div><div class='ctx'> </div><div class='del'>-	if (IN_INTERRUPT) {</div><div class='add'>+	if (!crypto_simd_usable()) {</div><div class='ctx'> 		return crypto_shash_final(&amp;dctx-&gt;fallback_desc, out);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dctx-&gt;bytes) {</div><div class='head'>diff --git a/drivers/crypto/vmx/vmx.c b/drivers/crypto/vmx/vmx.c<br/>index 31a98dc6f849..a9f519830615 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/vmx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/crypto/vmx/vmx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/crypto/vmx/vmx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/crypto/vmx/vmx.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static struct crypto_alg *algs[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init p8_init(void)</div><div class='add'>+static int __init p8_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct crypto_alg **alg_it;</div><div class='hunk'>@@ -67,7 +67,7 @@ int __init p8_init(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit p8_exit(void)</div><div class='add'>+static void __exit p8_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg **alg_it;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/dax/super.c b/drivers/dax/super.c<br/>index 0a339b85133e..bbd57ca0634a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dax/super.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dax/super.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dax/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dax/super.c</a></div><div class='hunk'>@@ -412,11 +412,9 @@ static struct dax_device *to_dax_dev(struct inode *inode)</div><div class='ctx'> 	return container_of(inode, struct dax_device, inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dax_i_callback(struct rcu_head *head)</div><div class='add'>+static void dax_free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = container_of(head, struct inode, i_rcu);</div><div class='ctx'> 	struct dax_device *dax_dev = to_dax_dev(inode);</div><div class='del'>-</div><div class='ctx'> 	kfree(dax_dev-&gt;host);</div><div class='ctx'> 	dax_dev-&gt;host = NULL;</div><div class='ctx'> 	if (inode-&gt;i_rdev)</div><div class='hunk'>@@ -427,16 +425,15 @@ static void dax_i_callback(struct rcu_head *head)</div><div class='ctx'> static void dax_destroy_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dax_device *dax_dev = to_dax_dev(inode);</div><div class='del'>-</div><div class='ctx'> 	WARN_ONCE(test_bit(DAXDEV_ALIVE, &amp;dax_dev-&gt;flags),</div><div class='ctx'> 			"kill_dax() must be called before final iput()\n");</div><div class='del'>-	call_rcu(&amp;inode-&gt;i_rcu, dax_i_callback);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations dax_sops = {</div><div class='ctx'> 	.statfs = simple_statfs,</div><div class='ctx'> 	.alloc_inode = dax_alloc_inode,</div><div class='ctx'> 	.destroy_inode = dax_destroy_inode,</div><div class='add'>+	.free_inode = dax_free_inode,</div><div class='ctx'> 	.drop_inode = generic_delete_inode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/devfreq/devfreq-event.c b/drivers/devfreq/devfreq-event.c<br/>index d67242d87744..87e93406d7cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/devfreq-event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/devfreq-event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/devfreq-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/devfreq-event.c</a></div><div class='hunk'>@@ -240,7 +240,7 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(edev, &amp;devfreq_event_list, node) {</div><div class='del'>-		if (!strcmp(edev-&gt;desc-&gt;name, node-&gt;name))</div><div class='add'>+		if (of_node_name_eq(node, edev-&gt;desc-&gt;name))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	edev = NULL;</div><div class='head'>diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c<br/>index 0ae3de76833b..6b6991f0e873 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/devfreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/devfreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/devfreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/devfreq.c</a></div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include "governor.h"</div><div class='ctx'> </div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/devfreq.h&gt;</div><div class='add'>+</div><div class='ctx'> static struct class *devfreq_class;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -228,7 +231,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name)</div><div class='ctx'>  * if is not found. This can happen when both drivers (the governor driver</div><div class='ctx'>  * and the driver that call devfreq_add_device) are built as modules.</div><div class='ctx'>  * devfreq_list_lock should be held by the caller. Returns the matched</div><div class='del'>- * governor's pointer.</div><div class='add'>+ * governor's pointer or an error pointer.</div><div class='ctx'>  */</div><div class='ctx'> static struct devfreq_governor *try_then_request_governor(const char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -254,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name)</div><div class='ctx'> 		/* Restore previous state before return */</div><div class='ctx'> 		mutex_lock(&amp;devfreq_list_lock);</div><div class='ctx'> 		if (err)</div><div class='del'>-			return NULL;</div><div class='add'>+			return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 		governor = find_devfreq_governor(name);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -394,6 +397,8 @@ static void devfreq_monitor(struct work_struct *work)</div><div class='ctx'> 	queue_delayed_work(devfreq_wq, &amp;devfreq-&gt;work,</div><div class='ctx'> 				msecs_to_jiffies(devfreq-&gt;profile-&gt;polling_ms));</div><div class='ctx'> 	mutex_unlock(&amp;devfreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	trace_devfreq_monitor(devfreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -528,7 +533,7 @@ void devfreq_interval_update(struct devfreq *devfreq, unsigned int *delay)</div><div class='ctx'> 		mutex_lock(&amp;devfreq-&gt;lock);</div><div class='ctx'> 		if (!devfreq-&gt;stop_polling)</div><div class='ctx'> 			queue_delayed_work(devfreq_wq, &amp;devfreq-&gt;work,</div><div class='del'>-			      msecs_to_jiffies(devfreq-&gt;profile-&gt;polling_ms));</div><div class='add'>+				msecs_to_jiffies(devfreq-&gt;profile-&gt;polling_ms));</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;devfreq-&gt;lock);</div><div class='hunk'>@@ -537,7 +542,7 @@ EXPORT_SYMBOL(devfreq_interval_update);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * devfreq_notifier_call() - Notify that the device frequency requirements</div><div class='del'>- *			   has been changed out of devfreq framework.</div><div class='add'>+ *			     has been changed out of devfreq framework.</div><div class='ctx'>  * @nb:		the notifier_block (supposed to be devfreq-&gt;nb)</div><div class='ctx'>  * @type:	not used</div><div class='ctx'>  * @devp:	not used</div><div class='hunk'>@@ -651,7 +656,7 @@ struct devfreq *devfreq_add_device(struct device *dev,</div><div class='ctx'> 		mutex_unlock(&amp;devfreq-&gt;lock);</div><div class='ctx'> 		err = set_freq_table(devfreq);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto err_out;</div><div class='add'>+			goto err_dev;</div><div class='ctx'> 		mutex_lock(&amp;devfreq-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -683,16 +688,27 @@ struct devfreq *devfreq_add_device(struct device *dev,</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfreq-&gt;trans_table =</div><div class='del'>-		devm_kzalloc(&amp;devfreq-&gt;dev,</div><div class='del'>-			     array3_size(sizeof(unsigned int),</div><div class='del'>-					 devfreq-&gt;profile-&gt;max_state,</div><div class='del'>-					 devfreq-&gt;profile-&gt;max_state),</div><div class='del'>-			     GFP_KERNEL);</div><div class='add'>+	devfreq-&gt;trans_table = devm_kzalloc(&amp;devfreq-&gt;dev,</div><div class='add'>+			array3_size(sizeof(unsigned int),</div><div class='add'>+				    devfreq-&gt;profile-&gt;max_state,</div><div class='add'>+				    devfreq-&gt;profile-&gt;max_state),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!devfreq-&gt;trans_table) {</div><div class='add'>+		mutex_unlock(&amp;devfreq-&gt;lock);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_devfreq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	devfreq-&gt;time_in_state = devm_kcalloc(&amp;devfreq-&gt;dev,</div><div class='del'>-						devfreq-&gt;profile-&gt;max_state,</div><div class='del'>-						sizeof(unsigned long),</div><div class='del'>-						GFP_KERNEL);</div><div class='add'>+			devfreq-&gt;profile-&gt;max_state,</div><div class='add'>+			sizeof(unsigned long),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!devfreq-&gt;time_in_state) {</div><div class='add'>+		mutex_unlock(&amp;devfreq-&gt;lock);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_devfreq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	devfreq-&gt;last_stat_updated = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	srcu_init_notifier_head(&amp;devfreq-&gt;transition_notifier_list);</div><div class='hunk'>@@ -726,7 +742,7 @@ struct devfreq *devfreq_add_device(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> err_init:</div><div class='ctx'> 	mutex_unlock(&amp;devfreq_list_lock);</div><div class='del'>-</div><div class='add'>+err_devfreq:</div><div class='ctx'> 	devfreq_remove_device(devfreq);</div><div class='ctx'> 	devfreq = NULL;</div><div class='ctx'> err_dev:</div><div class='hunk'>@@ -1113,7 +1129,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct devfreq *df = to_devfreq(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char str_governor[DEVFREQ_NAME_LEN + 1];</div><div class='del'>-	struct devfreq_governor *governor;</div><div class='add'>+	const struct devfreq_governor *governor, *prev_governor;</div><div class='ctx'> </div><div class='ctx'> 	ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);</div><div class='ctx'> 	if (ret != 1)</div><div class='hunk'>@@ -1142,12 +1158,24 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	prev_governor = df-&gt;governor;</div><div class='ctx'> 	df-&gt;governor = governor;</div><div class='ctx'> 	strncpy(df-&gt;governor_name, governor-&gt;name, DEVFREQ_NAME_LEN);</div><div class='ctx'> 	ret = df-&gt;governor-&gt;event_handler(df, DEVFREQ_GOV_START, NULL);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_warn(dev, "%s: Governor %s not started(%d)\n",</div><div class='ctx'> 			 __func__, df-&gt;governor-&gt;name, ret);</div><div class='add'>+		df-&gt;governor = prev_governor;</div><div class='add'>+		strncpy(df-&gt;governor_name, prev_governor-&gt;name,</div><div class='add'>+			DEVFREQ_NAME_LEN);</div><div class='add'>+		ret = df-&gt;governor-&gt;event_handler(df, DEVFREQ_GOV_START, NULL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"%s: reverting to Governor %s failed (%d)\n",</div><div class='add'>+				__func__, df-&gt;governor_name, ret);</div><div class='add'>+			df-&gt;governor = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;devfreq_list_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1172,7 +1200,7 @@ static ssize_t available_governors_show(struct device *d,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (df-&gt;governor-&gt;immutable) {</div><div class='ctx'> 		count = scnprintf(&amp;buf[count], DEVFREQ_NAME_LEN,</div><div class='del'>-				   "%s ", df-&gt;governor_name);</div><div class='add'>+				  "%s ", df-&gt;governor_name);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The devfreq device shows the registered governor except for</div><div class='ctx'> 	 * immutable governors such as passive governor .</div><div class='hunk'>@@ -1485,8 +1513,8 @@ EXPORT_SYMBOL(devfreq_recommended_opp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * devfreq_register_opp_notifier() - Helper function to get devfreq notified</div><div class='del'>- *				   for any changes in the OPP availability</div><div class='del'>- *				   changes</div><div class='add'>+ *				     for any changes in the OPP availability</div><div class='add'>+ *				     changes</div><div class='ctx'>  * @dev:	The devfreq user device. (parent of devfreq)</div><div class='ctx'>  * @devfreq:	The devfreq object.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1498,8 +1526,8 @@ EXPORT_SYMBOL(devfreq_register_opp_notifier);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * devfreq_unregister_opp_notifier() - Helper function to stop getting devfreq</div><div class='del'>- *				     notified for any changes in the OPP</div><div class='del'>- *				     availability changes anymore.</div><div class='add'>+ *				       notified for any changes in the OPP</div><div class='add'>+ *				       availability changes anymore.</div><div class='ctx'>  * @dev:	The devfreq user device. (parent of devfreq)</div><div class='ctx'>  * @devfreq:	The devfreq object.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1518,8 +1546,8 @@ static void devm_devfreq_opp_release(struct device *dev, void *res)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * devm_ devfreq_register_opp_notifier()</div><div class='del'>- *		- Resource-managed devfreq_register_opp_notifier()</div><div class='add'>+ * devm_devfreq_register_opp_notifier() - Resource-managed</div><div class='add'>+ *					  devfreq_register_opp_notifier()</div><div class='ctx'>  * @dev:	The devfreq user device. (parent of devfreq)</div><div class='ctx'>  * @devfreq:	The devfreq object.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1547,8 +1575,8 @@ int devm_devfreq_register_opp_notifier(struct device *dev,</div><div class='ctx'> EXPORT_SYMBOL(devm_devfreq_register_opp_notifier);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * devm_devfreq_unregister_opp_notifier()</div><div class='del'>- *		- Resource-managed devfreq_unregister_opp_notifier()</div><div class='add'>+ * devm_devfreq_unregister_opp_notifier() - Resource-managed</div><div class='add'>+ *					    devfreq_unregister_opp_notifier()</div><div class='ctx'>  * @dev:	The devfreq user device. (parent of devfreq)</div><div class='ctx'>  * @devfreq:	The devfreq object.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1567,8 +1595,8 @@ EXPORT_SYMBOL(devm_devfreq_unregister_opp_notifier);</div><div class='ctx'>  * @list:	DEVFREQ_TRANSITION_NOTIFIER.</div><div class='ctx'>  */</div><div class='ctx'> int devfreq_register_notifier(struct devfreq *devfreq,</div><div class='del'>-				struct notifier_block *nb,</div><div class='del'>-				unsigned int list)</div><div class='add'>+			      struct notifier_block *nb,</div><div class='add'>+			      unsigned int list)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1674,9 +1702,9 @@ EXPORT_SYMBOL(devm_devfreq_register_notifier);</div><div class='ctx'>  * @list:	DEVFREQ_TRANSITION_NOTIFIER.</div><div class='ctx'>  */</div><div class='ctx'> void devm_devfreq_unregister_notifier(struct device *dev,</div><div class='del'>-				struct devfreq *devfreq,</div><div class='del'>-				struct notifier_block *nb,</div><div class='del'>-				unsigned int list)</div><div class='add'>+				      struct devfreq *devfreq,</div><div class='add'>+				      struct notifier_block *nb,</div><div class='add'>+				      unsigned int list)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(devres_release(dev, devm_devfreq_notifier_release,</div><div class='ctx'> 			       devm_devfreq_dev_match, devfreq));</div><div class='head'>diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c<br/>index c61de0bdf053..c2ea94957501 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/event/exynos-ppmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/event/exynos-ppmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/event/exynos-ppmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/event/exynos-ppmu.c</a></div><div class='hunk'>@@ -529,7 +529,7 @@ static int of_get_devfreq_events(struct device_node *np,</div><div class='ctx'> 			if (!ppmu_events[i].name)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (!of_node_cmp(node-&gt;name, ppmu_events[i].name))</div><div class='add'>+			if (of_node_name_eq(node, ppmu_events[i].name))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c<br/>index 22b113363ffc..a436ec4901bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/event/rockchip-dfi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/event/rockchip-dfi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/event/rockchip-dfi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/event/rockchip-dfi.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;soc/rockchip/rk3399_grf.h&gt;</div><div class='add'>+</div><div class='ctx'> #define RK3399_DMC_NUM_CH	2</div><div class='ctx'> </div><div class='ctx'> /* DDRMON_CTRL */</div><div class='hunk'>@@ -43,18 +45,6 @@</div><div class='ctx'> #define DDRMON_CH1_COUNT_NUM		0x3c</div><div class='ctx'> #define DDRMON_CH1_DFI_ACCESS_NUM	0x40</div><div class='ctx'> </div><div class='del'>-/* pmu grf */</div><div class='del'>-#define PMUGRF_OS_REG2	0x308</div><div class='del'>-#define DDRTYPE_SHIFT	13</div><div class='del'>-#define DDRTYPE_MASK	7</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DDR3 = 3,</div><div class='del'>-	LPDDR3 = 6,</div><div class='del'>-	LPDDR4 = 7,</div><div class='del'>-	UNUSED = 0xFF</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct dmc_usage {</div><div class='ctx'> 	u32 access;</div><div class='ctx'> 	u32 total;</div><div class='hunk'>@@ -83,16 +73,17 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)</div><div class='ctx'> 	u32 ddr_type;</div><div class='ctx'> </div><div class='ctx'> 	/* get ddr type */</div><div class='del'>-	regmap_read(info-&gt;regmap_pmu, PMUGRF_OS_REG2, &amp;val);</div><div class='del'>-	ddr_type = (val &gt;&gt; DDRTYPE_SHIFT) &amp; DDRTYPE_MASK;</div><div class='add'>+	regmap_read(info-&gt;regmap_pmu, RK3399_PMUGRF_OS_REG2, &amp;val);</div><div class='add'>+	ddr_type = (val &gt;&gt; RK3399_PMUGRF_DDRTYPE_SHIFT) &amp;</div><div class='add'>+		    RK3399_PMUGRF_DDRTYPE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* clear DDRMON_CTRL setting */</div><div class='ctx'> 	writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* set ddr type to dfi */</div><div class='del'>-	if (ddr_type == LPDDR3)</div><div class='add'>+	if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3)</div><div class='ctx'> 		writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL);</div><div class='del'>-	else if (ddr_type == LPDDR4)</div><div class='add'>+	else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4)</div><div class='ctx'> 		writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* enable count, use software mode */</div><div class='hunk'>@@ -211,7 +202,7 @@ static int rockchip_dfi_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(data-&gt;clk)) {</div><div class='ctx'> 		dev_err(dev, "Cannot get the clk dmc_clk\n");</div><div class='ctx'> 		return PTR_ERR(data-&gt;clk);</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* try to find the optional reference to the pmu syscon */</div><div class='ctx'> 	node = of_parse_phandle(np, "rockchip,pmu", 0);</div><div class='head'>diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c<br/>index c25658b26598..486cc5b422f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/exynos-bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/exynos-bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/exynos-bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/exynos-bus.c</a></div><div class='hunk'>@@ -514,6 +514,13 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void exynos_bus_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_bus *bus = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	devfreq_suspend_device(bus-&gt;devfreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int exynos_bus_resume(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -556,6 +563,7 @@ MODULE_DEVICE_TABLE(of, exynos_bus_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver exynos_bus_platdrv = {</div><div class='ctx'> 	.probe		= exynos_bus_probe,</div><div class='add'>+	.shutdown	= exynos_bus_shutdown,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "exynos-bus",</div><div class='ctx'> 		.pm	= &amp;exynos_bus_pm,</div><div class='head'>diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c<br/>index e795ad2b3f6b..567c034d0301 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/rk3399_dmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/rk3399_dmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/rk3399_dmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/rk3399_dmc.c</a></div><div class='hunk'>@@ -18,14 +18,17 @@</div><div class='ctx'> #include &lt;linux/devfreq.h&gt;</div><div class='ctx'> #include &lt;linux/devfreq-event.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.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='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pm_opp.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;soc/rockchip/rk3399_grf.h&gt;</div><div class='ctx'> #include &lt;soc/rockchip/rockchip_sip.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct dram_timing {</div><div class='hunk'>@@ -69,8 +72,11 @@ struct rk3399_dmcfreq {</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	struct dram_timing timing;</div><div class='ctx'> 	struct regulator *vdd_center;</div><div class='add'>+	struct regmap *regmap_pmu;</div><div class='ctx'> 	unsigned long rate, target_rate;</div><div class='ctx'> 	unsigned long volt, target_volt;</div><div class='add'>+	unsigned int odt_dis_freq;</div><div class='add'>+	int odt_pd_arg0, odt_pd_arg1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,</div><div class='hunk'>@@ -80,6 +86,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='ctx'> 	unsigned long old_clk_rate = dmcfreq-&gt;rate;</div><div class='ctx'> 	unsigned long target_volt, target_rate;</div><div class='add'>+	struct arm_smccc_res res;</div><div class='add'>+	bool odt_enable = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	opp = devfreq_recommended_opp(dev, freq, flags);</div><div class='hunk'>@@ -95,6 +103,19 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dmcfreq-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (target_rate &gt;= dmcfreq-&gt;odt_dis_freq)</div><div class='add'>+		odt_enable = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This makes a SMC call to the TF-A to set the DDR PD (power-down)</div><div class='add'>+	 * timings and to enable or disable the ODT (on-die termination)</div><div class='add'>+	 * resistors.</div><div class='add'>+	 */</div><div class='add'>+	arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, dmcfreq-&gt;odt_pd_arg0,</div><div class='add'>+		      dmcfreq-&gt;odt_pd_arg1,</div><div class='add'>+		      ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD,</div><div class='add'>+		      odt_enable, 0, 0, 0, &amp;res);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If frequency scaling from low to high, adjust voltage first.</div><div class='ctx'> 	 * If frequency scaling from high to low, adjust frequency first.</div><div class='hunk'>@@ -294,11 +315,13 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node, *node;</div><div class='ctx'> 	struct rk3399_dmcfreq *data;</div><div class='ctx'> 	int ret, index, size;</div><div class='ctx'> 	uint32_t *timing;</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='add'>+	u32 ddr_type;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='hunk'>@@ -322,7 +345,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		dev_err(dev, "Cannot get the clk dmc_clk\n");</div><div class='ctx'> 		return PTR_ERR(data-&gt;dmc_clk);</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;edev = devfreq_event_get_edev_by_phandle(dev, 0);</div><div class='ctx'> 	if (IS_ERR(data-&gt;edev))</div><div class='hunk'>@@ -354,11 +377,57 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	node = of_parse_phandle(np, "rockchip,pmu", 0);</div><div class='add'>+	if (node) {</div><div class='add'>+		data-&gt;regmap_pmu = syscon_node_to_regmap(node);</div><div class='add'>+		if (IS_ERR(data-&gt;regmap_pmu))</div><div class='add'>+			return PTR_ERR(data-&gt;regmap_pmu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_read(data-&gt;regmap_pmu, RK3399_PMUGRF_OS_REG2, &amp;val);</div><div class='add'>+	ddr_type = (val &gt;&gt; RK3399_PMUGRF_DDRTYPE_SHIFT) &amp;</div><div class='add'>+		    RK3399_PMUGRF_DDRTYPE_MASK;</div><div class='add'>+</div><div class='add'>+	switch (ddr_type) {</div><div class='add'>+	case RK3399_PMUGRF_DDRTYPE_DDR3:</div><div class='add'>+		data-&gt;odt_dis_freq = data-&gt;timing.ddr3_odt_dis_freq;</div><div class='add'>+		break;</div><div class='add'>+	case RK3399_PMUGRF_DDRTYPE_LPDDR3:</div><div class='add'>+		data-&gt;odt_dis_freq = data-&gt;timing.lpddr3_odt_dis_freq;</div><div class='add'>+		break;</div><div class='add'>+	case RK3399_PMUGRF_DDRTYPE_LPDDR4:</div><div class='add'>+		data-&gt;odt_dis_freq = data-&gt;timing.lpddr4_odt_dis_freq;</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='ctx'> 	arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,</div><div class='ctx'> 		      ROCKCHIP_SIP_CONFIG_DRAM_INIT,</div><div class='ctx'> 		      0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * In TF-A there is a platform SIP call to set the PD (power-down)</div><div class='add'>+	 * timings and to enable or disable the ODT (on-die termination).</div><div class='add'>+	 * This call needs three arguments as follows:</div><div class='add'>+	 *</div><div class='add'>+	 * arg0:</div><div class='add'>+	 *     bit[0-7]   : sr_idle</div><div class='add'>+	 *     bit[8-15]  : sr_mc_gate_idle</div><div class='add'>+	 *     bit[16-31] : standby idle</div><div class='add'>+	 * arg1:</div><div class='add'>+	 *     bit[0-11]  : pd_idle</div><div class='add'>+	 *     bit[16-27] : srpd_lite_idle</div><div class='add'>+	 * arg2:</div><div class='add'>+	 *     bit[0]     : odt enable</div><div class='add'>+	 */</div><div class='add'>+	data-&gt;odt_pd_arg0 = (data-&gt;timing.sr_idle &amp; 0xff) |</div><div class='add'>+			    ((data-&gt;timing.sr_mc_gate_idle &amp; 0xff) &lt;&lt; 8) |</div><div class='add'>+			    ((data-&gt;timing.standby_idle &amp; 0xffff) &lt;&lt; 16);</div><div class='add'>+	data-&gt;odt_pd_arg1 = (data-&gt;timing.pd_idle &amp; 0xfff) |</div><div class='add'>+			    ((data-&gt;timing.srpd_lite_idle &amp; 0xfff) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * We add a devfreq driver to our parent since it has a device tree node</div><div class='ctx'> 	 * with operating points.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/devfreq/tegra-devfreq.c b/drivers/devfreq/tegra-devfreq.c<br/>index c59d2eee5d30..c89ba7b834ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/tegra-devfreq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/devfreq/tegra-devfreq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/devfreq/tegra-devfreq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/devfreq/tegra-devfreq.c</a></div><div class='hunk'>@@ -573,10 +573,7 @@ static int tegra_governor_get_target(struct devfreq *devfreq,</div><div class='ctx'> static int tegra_governor_event_handler(struct devfreq *devfreq,</div><div class='ctx'> 					unsigned int event, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct tegra_devfreq *tegra;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	tegra = dev_get_drvdata(devfreq-&gt;dev.parent);</div><div class='add'>+	struct tegra_devfreq *tegra = dev_get_drvdata(devfreq-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case DEVFREQ_GOV_START:</div><div class='hunk'>@@ -600,7 +597,7 @@ static int tegra_governor_event_handler(struct devfreq *devfreq,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</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'> static struct devfreq_governor tegra_devfreq_governor = {</div><div class='head'>diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig<br/>index 2e5a0faa2cb1..3fc9c2efc583 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma-buf/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma-buf/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma-buf/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dma-buf/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,6 @@ menu "DMABUF options"</div><div class='ctx'> config SYNC_FILE</div><div class='ctx'> 	bool "Explicit Synchronization Framework"</div><div class='ctx'> 	default n</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	select DMA_SHARED_BUFFER</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  The Sync File Framework adds explicit syncronization via</div><div class='head'>diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c<br/>index ec8a291d62ba..54093ffd0aef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/bcm2835-dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/bcm2835-dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/bcm2835-dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dma/bcm2835-dma.c</a></div><div class='hunk'>@@ -671,7 +671,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(</div><div class='ctx'> 	d = bcm2835_dma_create_cb_chain(chan, direction, false,</div><div class='ctx'> 					info, extra,</div><div class='ctx'> 					frames, src, dst, 0, 0,</div><div class='del'>-					GFP_KERNEL);</div><div class='add'>+					GFP_NOWAIT);</div><div class='ctx'> 	if (!d)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/dma/mediatek/mtk-cqdma.c b/drivers/dma/mediatek/mtk-cqdma.c<br/>index 131f3974740d..814853842e29 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/mediatek/mtk-cqdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/mediatek/mtk-cqdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/mediatek/mtk-cqdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dma/mediatek/mtk-cqdma.c</a></div><div class='hunk'>@@ -253,7 +253,7 @@ static void mtk_cqdma_start(struct mtk_cqdma_pchan *pc,</div><div class='ctx'> #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='ctx'> 	mtk_dma_set(pc, MTK_CQDMA_DST2, cvd-&gt;dest &gt;&gt; MTK_CQDMA_ADDR2_SHFIT);</div><div class='ctx'> #else</div><div class='del'>-	mtk_dma_set(pc, MTK_CQDMA_SRC2, 0);</div><div class='add'>+	mtk_dma_set(pc, MTK_CQDMA_DST2, 0);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* setup the length */</div><div class='head'>diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c<br/>index 2b4f25698169..e2a5398f89b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/sh/rcar-dmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/sh/rcar-dmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/sh/rcar-dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dma/sh/rcar-dmac.c</a></div><div class='hunk'>@@ -1282,6 +1282,9 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan,</div><div class='ctx'> 	enum dma_status status;</div><div class='ctx'> 	unsigned int residue = 0;</div><div class='ctx'> 	unsigned int dptr = 0;</div><div class='add'>+	unsigned int chcrb;</div><div class='add'>+	unsigned int tcrb;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1330,14 +1333,31 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * We need to read two registers.</div><div class='add'>+	 * Make sure the control register does not skip to next chunk</div><div class='add'>+	 * while reading the counter.</div><div class='add'>+	 * Trying it 3 times should be enough: Initial read, retry, retry</div><div class='add'>+	 * for the paranoid.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		chcrb = rcar_dmac_chan_read(chan, RCAR_DMACHCRB) &amp;</div><div class='add'>+					    RCAR_DMACHCRB_DPTR_MASK;</div><div class='add'>+		tcrb = rcar_dmac_chan_read(chan, RCAR_DMATCRB);</div><div class='add'>+		/* Still the same? */</div><div class='add'>+		if (chcrb == (rcar_dmac_chan_read(chan, RCAR_DMACHCRB) &amp;</div><div class='add'>+			      RCAR_DMACHCRB_DPTR_MASK))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	WARN_ONCE(i &gt;= 3, "residue might be not continuous!");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * In descriptor mode the descriptor running pointer is not maintained</div><div class='ctx'> 	 * by the interrupt handler, find the running descriptor from the</div><div class='ctx'> 	 * descriptor pointer field in the CHCRB register. In non-descriptor</div><div class='ctx'> 	 * mode just use the running descriptor pointer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (desc-&gt;hwdescs.use) {</div><div class='del'>-		dptr = (rcar_dmac_chan_read(chan, RCAR_DMACHCRB) &amp;</div><div class='del'>-			RCAR_DMACHCRB_DPTR_MASK) &gt;&gt; RCAR_DMACHCRB_DPTR_SHIFT;</div><div class='add'>+		dptr = chcrb &gt;&gt; RCAR_DMACHCRB_DPTR_SHIFT;</div><div class='ctx'> 		if (dptr == 0)</div><div class='ctx'> 			dptr = desc-&gt;nchunks;</div><div class='ctx'> 		dptr--;</div><div class='hunk'>@@ -1355,7 +1375,7 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Add the residue for the current chunk. */</div><div class='del'>-	residue += rcar_dmac_chan_read(chan, RCAR_DMATCRB) &lt;&lt; desc-&gt;xfer_shift;</div><div class='add'>+	residue += tcrb &lt;&lt; desc-&gt;xfer_shift;</div><div class='ctx'> </div><div class='ctx'> 	return residue;</div><div class='ctx'> }</div><div class='hunk'>@@ -1368,6 +1388,7 @@ static enum dma_status rcar_dmac_tx_status(struct dma_chan *chan,</div><div class='ctx'> 	enum dma_status status;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int residue;</div><div class='add'>+	bool cyclic;</div><div class='ctx'> </div><div class='ctx'> 	status = dma_cookie_status(chan, cookie, txstate);</div><div class='ctx'> 	if (status == DMA_COMPLETE || !txstate)</div><div class='hunk'>@@ -1375,10 +1396,11 @@ static enum dma_status rcar_dmac_tx_status(struct dma_chan *chan,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rchan-&gt;lock, flags);</div><div class='ctx'> 	residue = rcar_dmac_chan_get_residue(rchan, cookie);</div><div class='add'>+	cyclic = rchan-&gt;desc.running ? rchan-&gt;desc.running-&gt;cyclic : false;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rchan-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* if there's no residue, the cookie is complete */</div><div class='del'>-	if (!residue)</div><div class='add'>+	if (!residue &amp;&amp; !cyclic)</div><div class='ctx'> 		return DMA_COMPLETE;</div><div class='ctx'> </div><div class='ctx'> 	dma_set_residue(txstate, residue);</div><div class='head'>diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c<br/>index 4e0eede599a8..ac0301b69593 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/stm32-mdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/stm32-mdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/stm32-mdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dma/stm32-mdma.c</a></div><div class='hunk'>@@ -1578,11 +1578,9 @@ static int stm32_mdma_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dmadev-&gt;nr_channels = nr_channels;</div><div class='ctx'> 	dmadev-&gt;nr_requests = nr_requests;</div><div class='del'>-	ret = device_property_read_u32_array(&amp;pdev-&gt;dev, "st,ahb-addr-masks",</div><div class='add'>+	device_property_read_u32_array(&amp;pdev-&gt;dev, "st,ahb-addr-masks",</div><div class='ctx'> 				       dmadev-&gt;ahb_addr_masks,</div><div class='ctx'> 				       count);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='ctx'> 	dmadev-&gt;nr_ahb_addr_masks = count;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='head'>diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c<br/>index eb45af71d3a3..e8d0881b64d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/txx9dmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/dma/txx9dmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/dma/txx9dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/dma/txx9dmac.c</a></div><div class='hunk'>@@ -327,7 +327,6 @@ static void txx9dmac_reset_chan(struct txx9dmac_chan *dc)</div><div class='ctx'> 	channel_writel(dc, SAIR, 0);</div><div class='ctx'> 	channel_writel(dc, DAIR, 0);</div><div class='ctx'> 	channel_writel(dc, CCR, 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with dc-&gt;lock held and bh disabled */</div><div class='hunk'>@@ -954,7 +953,6 @@ static void txx9dmac_chain_dynamic(struct txx9dmac_chan *dc,</div><div class='ctx'> 	dma_sync_single_for_device(chan2parent(&amp;dc-&gt;chan),</div><div class='ctx'> 				   prev-&gt;txd.phys, ddev-&gt;descsize,</div><div class='ctx'> 				   DMA_TO_DEVICE);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	if (!(channel_readl(dc, CSR) &amp; TXX9_DMA_CSR_CHNEN) &amp;&amp;</div><div class='ctx'> 	    channel_read_CHAR(dc) == prev-&gt;txd.phys)</div><div class='ctx'> 		/* Restart chain DMA */</div><div class='hunk'>@@ -1080,7 +1078,6 @@ static void txx9dmac_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'> static void txx9dmac_off(struct txx9dmac_dev *ddev)</div><div class='ctx'> {</div><div class='ctx'> 	dma_writel(ddev, MCR, 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init txx9dmac_chan_probe(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c<br/>index 1bcf9aea0cdf..8816f74a22b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/altera_edac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/altera_edac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/altera_edac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/altera_edac.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='add'>+#include &lt;linux/firmware/intel/stratix10-smc.h&gt;</div><div class='ctx'> #include &lt;linux/genalloc.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irqchip/chained_irq.h&gt;</div><div class='hunk'>@@ -1361,8 +1362,19 @@ static const struct edac_device_prv_data a10_l2ecc_data = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EDAC_ALTERA_ETHERNET</div><div class='ctx'> </div><div class='add'>+static int __init socfpga_init_ethernet_ecc(struct altr_edac_device_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = altr_init_a10_ecc_device_type("altr,socfpga-eth-mac-ecc");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return altr_check_ecc_deps(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct edac_device_prv_data a10_enetecc_data = {</div><div class='del'>-	.setup = altr_check_ecc_deps,</div><div class='add'>+	.setup = socfpga_init_ethernet_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENA,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENA,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1374,21 +1386,25 @@ static const struct edac_device_prv_data a10_enetecc_data = {</div><div class='ctx'> 	.inject_fops = &amp;altr_edac_a10_device_inject2_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socfpga_init_ethernet_ecc(void)</div><div class='del'>-{</div><div class='del'>-	return altr_init_a10_ecc_device_type("altr,socfpga-eth-mac-ecc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(socfpga_init_ethernet_ecc);</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_EDAC_ALTERA_ETHERNET */</div><div class='ctx'> </div><div class='ctx'> /********************** NAND Device Functions **********************/</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EDAC_ALTERA_NAND</div><div class='ctx'> </div><div class='add'>+static int __init socfpga_init_nand_ecc(struct altr_edac_device_dev *device)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = altr_init_a10_ecc_device_type("altr,socfpga-nand-ecc");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return altr_check_ecc_deps(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct edac_device_prv_data a10_nandecc_data = {</div><div class='del'>-	.setup = altr_check_ecc_deps,</div><div class='add'>+	.setup = socfpga_init_nand_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENA,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENA,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1400,21 +1416,25 @@ static const struct edac_device_prv_data a10_nandecc_data = {</div><div class='ctx'> 	.inject_fops = &amp;altr_edac_a10_device_inject_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socfpga_init_nand_ecc(void)</div><div class='del'>-{</div><div class='del'>-	return altr_init_a10_ecc_device_type("altr,socfpga-nand-ecc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(socfpga_init_nand_ecc);</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_EDAC_ALTERA_NAND */</div><div class='ctx'> </div><div class='ctx'> /********************** DMA Device Functions **********************/</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EDAC_ALTERA_DMA</div><div class='ctx'> </div><div class='add'>+static int __init socfpga_init_dma_ecc(struct altr_edac_device_dev *device)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = altr_init_a10_ecc_device_type("altr,socfpga-dma-ecc");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return altr_check_ecc_deps(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct edac_device_prv_data a10_dmaecc_data = {</div><div class='del'>-	.setup = altr_check_ecc_deps,</div><div class='add'>+	.setup = socfpga_init_dma_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENA,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENA,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1426,21 +1446,25 @@ static const struct edac_device_prv_data a10_dmaecc_data = {</div><div class='ctx'> 	.inject_fops = &amp;altr_edac_a10_device_inject_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socfpga_init_dma_ecc(void)</div><div class='del'>-{</div><div class='del'>-	return altr_init_a10_ecc_device_type("altr,socfpga-dma-ecc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(socfpga_init_dma_ecc);</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_EDAC_ALTERA_DMA */</div><div class='ctx'> </div><div class='ctx'> /********************** USB Device Functions **********************/</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EDAC_ALTERA_USB</div><div class='ctx'> </div><div class='add'>+static int __init socfpga_init_usb_ecc(struct altr_edac_device_dev *device)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = altr_init_a10_ecc_device_type("altr,socfpga-usb-ecc");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return altr_check_ecc_deps(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct edac_device_prv_data a10_usbecc_data = {</div><div class='del'>-	.setup = altr_check_ecc_deps,</div><div class='add'>+	.setup = socfpga_init_usb_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENA,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENA,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1452,21 +1476,25 @@ static const struct edac_device_prv_data a10_usbecc_data = {</div><div class='ctx'> 	.inject_fops = &amp;altr_edac_a10_device_inject2_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socfpga_init_usb_ecc(void)</div><div class='del'>-{</div><div class='del'>-	return altr_init_a10_ecc_device_type("altr,socfpga-usb-ecc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(socfpga_init_usb_ecc);</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_EDAC_ALTERA_USB */</div><div class='ctx'> </div><div class='ctx'> /********************** QSPI Device Functions **********************/</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EDAC_ALTERA_QSPI</div><div class='ctx'> </div><div class='add'>+static int __init socfpga_init_qspi_ecc(struct altr_edac_device_dev *device)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = altr_init_a10_ecc_device_type("altr,socfpga-qspi-ecc");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return altr_check_ecc_deps(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct edac_device_prv_data a10_qspiecc_data = {</div><div class='del'>-	.setup = altr_check_ecc_deps,</div><div class='add'>+	.setup = socfpga_init_qspi_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENA,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENA,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1478,13 +1506,6 @@ static const struct edac_device_prv_data a10_qspiecc_data = {</div><div class='ctx'> 	.inject_fops = &amp;altr_edac_a10_device_inject_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socfpga_init_qspi_ecc(void)</div><div class='del'>-{</div><div class='del'>-	return altr_init_a10_ecc_device_type("altr,socfpga-qspi-ecc");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(socfpga_init_qspi_ecc);</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_EDAC_ALTERA_QSPI */</div><div class='ctx'> </div><div class='ctx'> /********************* SDMMC Device Functions **********************/</div><div class='hunk'>@@ -1593,6 +1614,35 @@ err_release_group_1:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init socfpga_init_sdmmc_ecc(struct altr_edac_device_dev *device)</div><div class='add'>+{</div><div class='add'>+	int rc = -ENODEV;</div><div class='add'>+	struct device_node *child;</div><div class='add'>+</div><div class='add'>+	child = of_find_compatible_node(NULL, NULL, "altr,socfpga-sdmmc-ecc");</div><div class='add'>+	if (!child)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!of_device_is_available(child))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (validate_parent_available(child))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Init portB */</div><div class='add'>+	rc = altr_init_a10_ecc_block(child, ALTR_A10_SDMMC_IRQ_MASK,</div><div class='add'>+				     a10_sdmmceccb_data.ecc_enable_mask, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Setup portB */</div><div class='add'>+	return altr_portb_setup(device);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	of_node_put(child);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t altr_edac_a10_ecc_irq_portb(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct altr_edac_device_dev *ad = dev_id;</div><div class='hunk'>@@ -1617,7 +1667,7 @@ static irqreturn_t altr_edac_a10_ecc_irq_portb(int irq, void *dev_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct edac_device_prv_data a10_sdmmcecca_data = {</div><div class='del'>-	.setup = altr_portb_setup,</div><div class='add'>+	.setup = socfpga_init_sdmmc_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENA,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENA,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1630,7 +1680,7 @@ static const struct edac_device_prv_data a10_sdmmcecca_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct edac_device_prv_data a10_sdmmceccb_data = {</div><div class='del'>-	.setup = altr_portb_setup,</div><div class='add'>+	.setup = socfpga_init_sdmmc_ecc,</div><div class='ctx'> 	.ce_clear_mask = ALTR_A10_ECC_SERRPENB,</div><div class='ctx'> 	.ue_clear_mask = ALTR_A10_ECC_DERRPENB,</div><div class='ctx'> 	.ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,</div><div class='hunk'>@@ -1642,35 +1692,6 @@ static const struct edac_device_prv_data a10_sdmmceccb_data = {</div><div class='ctx'> 	.inject_fops = &amp;altr_edac_a10_device_inject_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socfpga_init_sdmmc_ecc(void)</div><div class='del'>-{</div><div class='del'>-	int rc = -ENODEV;</div><div class='del'>-	struct device_node *child;</div><div class='del'>-</div><div class='del'>-	if (!socfpga_is_a10() &amp;&amp; !socfpga_is_s10())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	child = of_find_compatible_node(NULL, NULL, "altr,socfpga-sdmmc-ecc");</div><div class='del'>-	if (!child) {</div><div class='del'>-		edac_printk(KERN_WARNING, EDAC_DEVICE, "SDMMC node not found\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!of_device_is_available(child))</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	if (validate_parent_available(child))</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	rc = altr_init_a10_ecc_block(child, ALTR_A10_SDMMC_IRQ_MASK,</div><div class='del'>-				     a10_sdmmcecca_data.ecc_enable_mask, 1);</div><div class='del'>-exit:</div><div class='del'>-	of_node_put(child);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(socfpga_init_sdmmc_ecc);</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_EDAC_ALTERA_SDMMC */</div><div class='ctx'> </div><div class='ctx'> /********************* Arria10 EDAC Device Functions *************************/</div><div class='hunk'>@@ -1762,28 +1783,24 @@ static ssize_t altr_edac_a10_device_trig2(struct file *file,</div><div class='ctx'> 	if (trig_type == ALTR_UE_TRIGGER_CHAR) {</div><div class='ctx'> 		writel(priv-&gt;ue_set_mask, set_addr);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Setup write of 0 to first 4 bytes */</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA0_OFST);</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA1_OFST);</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA2_OFST);</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA3_OFST);</div><div class='del'>-		/* Setup write of 4 bytes */</div><div class='add'>+		/* Setup read/write of 4 bytes */</div><div class='ctx'> 		writel(ECC_WORD_WRITE, drvdata-&gt;base + ECC_BLK_DBYTECTRL_OFST);</div><div class='ctx'> 		/* Setup Address to 0 */</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_ADDRESS_OFST);</div><div class='del'>-		/* Setup accctrl to write &amp; data override */</div><div class='del'>-		writel(ECC_WRITE_DOVR, drvdata-&gt;base + ECC_BLK_ACCCTRL_OFST);</div><div class='del'>-		/* Kick it. */</div><div class='del'>-		writel(ECC_XACT_KICK, drvdata-&gt;base + ECC_BLK_STARTACC_OFST);</div><div class='del'>-		/* Setup accctrl to read &amp; ecc override */</div><div class='del'>-		writel(ECC_READ_EOVR, drvdata-&gt;base + ECC_BLK_ACCCTRL_OFST);</div><div class='add'>+		writel(0, drvdata-&gt;base + ECC_BLK_ADDRESS_OFST);</div><div class='add'>+		/* Setup accctrl to read &amp; ecc &amp; data override */</div><div class='add'>+		writel(ECC_READ_EDOVR, drvdata-&gt;base + ECC_BLK_ACCCTRL_OFST);</div><div class='ctx'> 		/* Kick it. */</div><div class='ctx'> 		writel(ECC_XACT_KICK, drvdata-&gt;base + ECC_BLK_STARTACC_OFST);</div><div class='ctx'> 		/* Setup write for single bit change */</div><div class='del'>-		writel(0x1, drvdata-&gt;base + ECC_BLK_WDATA0_OFST);</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA1_OFST);</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA2_OFST);</div><div class='del'>-		writel(0x0, drvdata-&gt;base + ECC_BLK_WDATA3_OFST);</div><div class='add'>+		writel(readl(drvdata-&gt;base + ECC_BLK_RDATA0_OFST) ^ 0x1,</div><div class='add'>+		       drvdata-&gt;base + ECC_BLK_WDATA0_OFST);</div><div class='add'>+		writel(readl(drvdata-&gt;base + ECC_BLK_RDATA1_OFST),</div><div class='add'>+		       drvdata-&gt;base + ECC_BLK_WDATA1_OFST);</div><div class='add'>+		writel(readl(drvdata-&gt;base + ECC_BLK_RDATA2_OFST),</div><div class='add'>+		       drvdata-&gt;base + ECC_BLK_WDATA2_OFST);</div><div class='add'>+		writel(readl(drvdata-&gt;base + ECC_BLK_RDATA3_OFST),</div><div class='add'>+		       drvdata-&gt;base + ECC_BLK_WDATA3_OFST);</div><div class='add'>+</div><div class='ctx'> 		/* Copy Read ECC to Write ECC */</div><div class='ctx'> 		writel(readl(drvdata-&gt;base + ECC_BLK_RECC0_OFST),</div><div class='ctx'> 		       drvdata-&gt;base + ECC_BLK_WECC0_OFST);</div><div class='hunk'>@@ -1930,6 +1947,15 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac,</div><div class='ctx'> 		goto err_release_group1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARCH_STRATIX10</div><div class='add'>+	/* Use IRQ to determine SError origin instead of assigning IRQ */</div><div class='add'>+	rc = of_property_read_u32_index(np, "interrupts", 0, &amp;altdev-&gt;db_irq);</div><div class='add'>+	if (rc) {</div><div class='add'>+		edac_printk(KERN_ERR, EDAC_DEVICE,</div><div class='add'>+			    "Unable to parse DB IRQ index\n");</div><div class='add'>+		goto err_release_group1;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='ctx'> 	altdev-&gt;db_irq = irq_of_parse_and_map(np, 1);</div><div class='ctx'> 	if (!altdev-&gt;db_irq) {</div><div class='ctx'> 		edac_printk(KERN_ERR, EDAC_DEVICE, "Error allocating DBIRQ\n");</div><div class='hunk'>@@ -1943,6 +1969,7 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac,</div><div class='ctx'> 		edac_printk(KERN_ERR, EDAC_DEVICE, "No DBERR IRQ resource\n");</div><div class='ctx'> 		goto err_release_group1;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	rc = edac_device_add_device(dci);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -2005,6 +2032,10 @@ static const struct irq_domain_ops a10_eccmgr_ic_ops = {</div><div class='ctx'> /************** Stratix 10 EDAC Double Bit Error Handler ************/</div><div class='ctx'> #define to_a10edac(p, m) container_of(p, struct altr_arria10_edac, m)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARCH_STRATIX10</div><div class='add'>+/* panic routine issues reboot on non-zero panic_timeout */</div><div class='add'>+extern int panic_timeout;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The double bit error is handled through SError which is fatal. This is</div><div class='ctx'>  * called as a panic notifier to printout ECC error info as part of the panic.</div><div class='hunk'>@@ -2018,17 +2049,37 @@ static int s10_edac_dberr_handler(struct notifier_block *this,</div><div class='ctx'> 	regmap_read(edac-&gt;ecc_mgr_map, S10_SYSMGR_ECC_INTSTAT_DERR_OFST,</div><div class='ctx'> 		    &amp;dberror);</div><div class='ctx'> 	regmap_write(edac-&gt;ecc_mgr_map, S10_SYSMGR_UE_VAL_OFST, dberror);</div><div class='del'>-	if (dberror &amp; S10_DDR0_IRQ_MASK) {</div><div class='del'>-		regmap_read(edac-&gt;ecc_mgr_map, A10_DERRADDR_OFST, &amp;err_addr);</div><div class='del'>-		regmap_write(edac-&gt;ecc_mgr_map, S10_SYSMGR_UE_ADDR_OFST,</div><div class='del'>-			     err_addr);</div><div class='del'>-		edac_printk(KERN_ERR, EDAC_MC,</div><div class='del'>-			    "EDAC: [Uncorrectable errors @ 0x%08X]\n\n",</div><div class='del'>-			    err_addr);</div><div class='add'>+	if (dberror &amp; S10_DBE_IRQ_MASK) {</div><div class='add'>+		struct list_head *position;</div><div class='add'>+		struct altr_edac_device_dev *ed;</div><div class='add'>+		struct arm_smccc_res result;</div><div class='add'>+</div><div class='add'>+		/* Find the matching DBE in the list of devices */</div><div class='add'>+		list_for_each(position, &amp;edac-&gt;a10_ecc_devices) {</div><div class='add'>+			ed = list_entry(position, struct altr_edac_device_dev,</div><div class='add'>+					next);</div><div class='add'>+			if (!(BIT(ed-&gt;db_irq) &amp; dberror))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			writel(ALTR_A10_ECC_DERRPENA,</div><div class='add'>+			       ed-&gt;base + ALTR_A10_ECC_INTSTAT_OFST);</div><div class='add'>+			err_addr = readl(ed-&gt;base + ALTR_S10_DERR_ADDRA_OFST);</div><div class='add'>+			regmap_write(edac-&gt;ecc_mgr_map,</div><div class='add'>+				     S10_SYSMGR_UE_ADDR_OFST, err_addr);</div><div class='add'>+			edac_printk(KERN_ERR, EDAC_DEVICE,</div><div class='add'>+				    "EDAC: [Fatal DBE on %s @ 0x%08X]\n",</div><div class='add'>+				    ed-&gt;edac_dev_name, err_addr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* Notify the System through SMC. Reboot delay = 1 second */</div><div class='add'>+		panic_timeout = 1;</div><div class='add'>+		arm_smccc_smc(INTEL_SIP_SMC_ECC_DBE, dberror, 0, 0, 0, 0,</div><div class='add'>+			      0, 0, &amp;result);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /****************** Arria 10 EDAC Probe Function *********************/</div><div class='ctx'> static int altr_edac_a10_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -2098,16 +2149,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev)</div><div class='ctx'> 					 altr_edac_a10_irq_handler,</div><div class='ctx'> 					 edac);</div><div class='ctx'> </div><div class='del'>-	if (socfpga_is_a10()) {</div><div class='del'>-		edac-&gt;db_irq = platform_get_irq(pdev, 1);</div><div class='del'>-		if (edac-&gt;db_irq &lt; 0) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "No DBERR IRQ resource\n");</div><div class='del'>-			return edac-&gt;db_irq;</div><div class='del'>-		}</div><div class='del'>-		irq_set_chained_handler_and_data(edac-&gt;db_irq,</div><div class='del'>-						 altr_edac_a10_irq_handler,</div><div class='del'>-						 edac);</div><div class='del'>-	} else {</div><div class='add'>+#ifdef CONFIG_ARCH_STRATIX10</div><div class='add'>+	{</div><div class='ctx'> 		int dberror, err_addr;</div><div class='ctx'> </div><div class='ctx'> 		edac-&gt;panic_notifier.notifier_call = s10_edac_dberr_handler;</div><div class='hunk'>@@ -2130,6 +2173,15 @@ static int altr_edac_a10_probe(struct platform_device *pdev)</div><div class='ctx'> 				     S10_SYSMGR_UE_ADDR_OFST, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+#else</div><div class='add'>+	edac-&gt;db_irq = platform_get_irq(pdev, 1);</div><div class='add'>+	if (edac-&gt;db_irq &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No DBERR IRQ resource\n");</div><div class='add'>+		return edac-&gt;db_irq;</div><div class='add'>+	}</div><div class='add'>+	irq_set_chained_handler_and_data(edac-&gt;db_irq,</div><div class='add'>+					 altr_edac_a10_irq_handler, edac);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	for_each_child_of_node(pdev-&gt;dev.of_node, child) {</div><div class='ctx'> 		if (!of_device_is_available(child))</div><div class='head'>diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h<br/>index f8664bac9fa8..55654cc4bcdf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/altera_edac.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/altera_edac.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/altera_edac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/altera_edac.h</a></div><div class='hunk'>@@ -289,6 +289,7 @@ struct altr_sdram_mc_data {</div><div class='ctx'> #define ALTR_A10_ECC_INIT_WATCHDOG_10US      10000</div><div class='ctx'> </div><div class='ctx'> /************* Stratix10 Defines **************/</div><div class='add'>+#define ALTR_S10_DERR_ADDRA_OFST          0x2C</div><div class='ctx'> </div><div class='ctx'> /* Stratix10 ECC Manager Defines */</div><div class='ctx'> #define S10_SYSMGR_ECC_INTMASK_CLR_OFST   0x98</div><div class='hunk'>@@ -299,6 +300,7 @@ struct altr_sdram_mc_data {</div><div class='ctx'> #define S10_SYSMGR_UE_ADDR_OFST           0x224</div><div class='ctx'> </div><div class='ctx'> #define S10_DDR0_IRQ_MASK                 BIT(16)</div><div class='add'>+#define S10_DBE_IRQ_MASK                  0x3FE</div><div class='ctx'> </div><div class='ctx'> /* Define ECC Block Offsets for peripherals */</div><div class='ctx'> #define ECC_BLK_ADDRESS_OFST              0x40</div><div class='hunk'>@@ -319,7 +321,7 @@ struct altr_sdram_mc_data {</div><div class='ctx'> #define ECC_BLK_STARTACC_OFST             0x7C</div><div class='ctx'> </div><div class='ctx'> #define ECC_XACT_KICK                     0x10000</div><div class='del'>-#define ECC_WORD_WRITE                    0xF</div><div class='add'>+#define ECC_WORD_WRITE                    0xFF</div><div class='ctx'> #define ECC_WRITE_DOVR                    0x101</div><div class='ctx'> #define ECC_WRITE_EDOVR                   0x103</div><div class='ctx'> #define ECC_READ_EOVR                     0x2</div><div class='hunk'>@@ -370,69 +372,4 @@ struct altr_arria10_edac {</div><div class='ctx'> 	struct notifier_block	panic_notifier;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Functions specified by ARM SMC Calling convention:</div><div class='del'>- *</div><div class='del'>- * FAST call executes atomic operations, returns when the requested operation</div><div class='del'>- * has completed.</div><div class='del'>- * STD call starts a operation which can be preempted by a non-secure</div><div class='del'>- * interrupt. The call can return before the requested operation has</div><div class='del'>- * completed.</div><div class='del'>- *</div><div class='del'>- * a0..a7 is used as register names in the descriptions below, on arm32</div><div class='del'>- * that translates to r0..r7 and on arm64 to w0..w7.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define INTEL_SIP_SMC_STD_CALL_VAL(func_num) \</div><div class='del'>-	ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, \</div><div class='del'>-	ARM_SMCCC_OWNER_SIP, (func_num))</div><div class='del'>-</div><div class='del'>-#define INTEL_SIP_SMC_FAST_CALL_VAL(func_num) \</div><div class='del'>-	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64, \</div><div class='del'>-	ARM_SMCCC_OWNER_SIP, (func_num))</div><div class='del'>-</div><div class='del'>-#define INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION		0xFFFFFFFF</div><div class='del'>-#define INTEL_SIP_SMC_STATUS_OK				0x0</div><div class='del'>-#define INTEL_SIP_SMC_REG_ERROR				0x5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Request INTEL_SIP_SMC_REG_READ</div><div class='del'>- *</div><div class='del'>- * Read a protected register using SMCCC</div><div class='del'>- *</div><div class='del'>- * Call register usage:</div><div class='del'>- * a0: INTEL_SIP_SMC_REG_READ.</div><div class='del'>- * a1: register address.</div><div class='del'>- * a2-7: not used.</div><div class='del'>- *</div><div class='del'>- * Return status:</div><div class='del'>- * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_REG_ERROR, or</div><div class='del'>- *     INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION</div><div class='del'>- * a1: Value in the register</div><div class='del'>- * a2-3: not used.</div><div class='del'>- */</div><div class='del'>-#define INTEL_SIP_SMC_FUNCID_REG_READ 7</div><div class='del'>-#define INTEL_SIP_SMC_REG_READ \</div><div class='del'>-	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_READ)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Request INTEL_SIP_SMC_REG_WRITE</div><div class='del'>- *</div><div class='del'>- * Write a protected register using SMCCC</div><div class='del'>- *</div><div class='del'>- * Call register usage:</div><div class='del'>- * a0: INTEL_SIP_SMC_REG_WRITE.</div><div class='del'>- * a1: register address</div><div class='del'>- * a2: value to program into register.</div><div class='del'>- * a3-7: not used.</div><div class='del'>- *</div><div class='del'>- * Return status:</div><div class='del'>- * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_REG_ERROR, or</div><div class='del'>- *     INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION</div><div class='del'>- * a1-3: not used.</div><div class='del'>- */</div><div class='del'>-#define INTEL_SIP_SMC_FUNCID_REG_WRITE 8</div><div class='del'>-#define INTEL_SIP_SMC_REG_WRITE \</div><div class='del'>-	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_WRITE)</div><div class='del'>-</div><div class='ctx'> #endif	/* #ifndef _ALTERA_EDAC_H */</div><div class='head'>diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c<br/>index 6ea98575a402..e2a99466faaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/amd64_edac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/amd64_edac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/amd64_edac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/amd64_edac.c</a></div><div class='hunk'>@@ -18,6 +18,9 @@ static struct msr __percpu *msrs;</div><div class='ctx'> /* Per-node stuff */</div><div class='ctx'> static struct ecc_settings **ecc_stngs;</div><div class='ctx'> </div><div class='add'>+/* Number of Unified Memory Controllers */</div><div class='add'>+static u8 num_umcs;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Valid scrub rates for the K8 hardware memory scrubber. We map the scrubbing</div><div class='ctx'>  * bandwidth to a valid bit pattern. The 'set' operation finds the 'matching-</div><div class='hunk'>@@ -449,6 +452,9 @@ static void get_cs_base_and_mask(struct amd64_pvt *pvt, int csrow, u8 dct,</div><div class='ctx'> #define for_each_chip_select_mask(i, dct, pvt) \</div><div class='ctx'> 	for (i = 0; i &lt; pvt-&gt;csels[dct].m_cnt; i++)</div><div class='ctx'> </div><div class='add'>+#define for_each_umc(i) \</div><div class='add'>+	for (i = 0; i &lt; num_umcs; i++)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * @input_addr is an InputAddr associated with the node given by mci. Return the</div><div class='ctx'>  * csrow that input_addr maps to, or -1 on failure (no csrow claims input_addr).</div><div class='hunk'>@@ -722,7 +728,7 @@ static unsigned long determine_edac_cap(struct amd64_pvt *pvt)</div><div class='ctx'> 	if (pvt-&gt;umc) {</div><div class='ctx'> 		u8 i, umc_en_mask = 0, dimm_ecc_en_mask = 0;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; NUM_UMCS; i++) {</div><div class='add'>+		for_each_umc(i) {</div><div class='ctx'> 			if (!(pvt-&gt;umc[i].sdp_ctrl &amp; UMC_SDP_INIT))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -781,6 +787,22 @@ static void debug_dump_dramcfg_low(struct amd64_pvt *pvt, u32 dclr, int chan)</div><div class='ctx'> 		 (dclr &amp; BIT(15)) ?  "yes" : "no");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The Address Mask should be a contiguous set of bits in the non-interleaved</div><div class='add'>+ * case. So to check for CS interleaving, find the most- and least-significant</div><div class='add'>+ * bits of the mask, generate a contiguous bitmask, and compare the two.</div><div class='add'>+ */</div><div class='add'>+static bool f17_cs_interleaved(struct amd64_pvt *pvt, u8 ctrl, int cs)</div><div class='add'>+{</div><div class='add'>+	u32 mask = pvt-&gt;csels[ctrl].csmasks[cs &gt;&gt; 1];</div><div class='add'>+	u32 msb = fls(mask) - 1, lsb = ffs(mask) - 1;</div><div class='add'>+	u32 test_mask = GENMASK(msb, lsb);</div><div class='add'>+</div><div class='add'>+	edac_dbg(1, "mask=0x%08x test_mask=0x%08x\n", mask, test_mask);</div><div class='add'>+</div><div class='add'>+	return mask ^ test_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void debug_display_dimm_sizes_df(struct amd64_pvt *pvt, u8 ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	int dimm, size0, size1, cs0, cs1;</div><div class='hunk'>@@ -797,8 +819,19 @@ static void debug_display_dimm_sizes_df(struct amd64_pvt *pvt, u8 ctrl)</div><div class='ctx'> 		size1 = 0;</div><div class='ctx'> 		cs1 = dimm * 2 + 1;</div><div class='ctx'> </div><div class='del'>-		if (csrow_enabled(cs1, ctrl, pvt))</div><div class='del'>-			size1 = pvt-&gt;ops-&gt;dbam_to_cs(pvt, ctrl, 0, cs1);</div><div class='add'>+		if (csrow_enabled(cs1, ctrl, pvt)) {</div><div class='add'>+			/*</div><div class='add'>+			 * CS interleaving is only supported if both CSes have</div><div class='add'>+			 * the same amount of memory. Because they are</div><div class='add'>+			 * interleaved, it will look like both CSes have the</div><div class='add'>+			 * full amount of memory. Save the size for both as</div><div class='add'>+			 * half the amount we found on CS0, if interleaved.</div><div class='add'>+			 */</div><div class='add'>+			if (f17_cs_interleaved(pvt, ctrl, cs1))</div><div class='add'>+				size1 = size0 = (size0 &gt;&gt; 1);</div><div class='add'>+			else</div><div class='add'>+				size1 = pvt-&gt;ops-&gt;dbam_to_cs(pvt, ctrl, 0, cs1);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		amd64_info(EDAC_MC ": %d: %5dMB %d: %5dMB\n",</div><div class='ctx'> 				cs0,	size0,</div><div class='hunk'>@@ -811,7 +844,7 @@ static void __dump_misc_regs_df(struct amd64_pvt *pvt)</div><div class='ctx'> 	struct amd64_umc *umc;</div><div class='ctx'> 	u32 i, tmp, umc_base;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_UMCS; i++) {</div><div class='add'>+	for_each_umc(i) {</div><div class='ctx'> 		umc_base = get_umc_base(i);</div><div class='ctx'> 		umc = &amp;pvt-&gt;umc[i];</div><div class='ctx'> </div><div class='hunk'>@@ -894,8 +927,7 @@ static void dump_misc_regs(struct amd64_pvt *pvt)</div><div class='ctx'> </div><div class='ctx'> 	edac_dbg(1, "  DramHoleValid: %s\n", dhar_valid(pvt) ? "yes" : "no");</div><div class='ctx'> </div><div class='del'>-	amd64_info("using %s syndromes.\n",</div><div class='del'>-			((pvt-&gt;ecc_sym_sz == 8) ? "x8" : "x4"));</div><div class='add'>+	amd64_info("using x%u syndromes.\n", pvt-&gt;ecc_sym_sz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1388,7 +1420,7 @@ static int f17_early_channel_count(struct amd64_pvt *pvt)</div><div class='ctx'> 	int i, channels = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* SDP Control bit 31 (SdpInit) is clear for unused UMC channels */</div><div class='del'>-	for (i = 0; i &lt; NUM_UMCS; i++)</div><div class='add'>+	for_each_umc(i)</div><div class='ctx'> 		channels += !!(pvt-&gt;umc[i].sdp_ctrl &amp; UMC_SDP_INIT);</div><div class='ctx'> </div><div class='ctx'> 	amd64_info("MCT channel count: %d\n", channels);</div><div class='hunk'>@@ -2211,6 +2243,15 @@ static struct amd64_family_type family_types[] = {</div><div class='ctx'> 			.dbam_to_cs		= f17_base_addr_to_cs_size,</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='add'>+	[F17_M30H_CPUS] = {</div><div class='add'>+		.ctl_name = "F17h_M30h",</div><div class='add'>+		.f0_id = PCI_DEVICE_ID_AMD_17H_M30H_DF_F0,</div><div class='add'>+		.f6_id = PCI_DEVICE_ID_AMD_17H_M30H_DF_F6,</div><div class='add'>+		.ops = {</div><div class='add'>+			.early_channel_count	= f17_early_channel_count,</div><div class='add'>+			.dbam_to_cs		= f17_base_addr_to_cs_size,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2464,18 +2505,14 @@ static inline void decode_bus_error(int node_id, struct mce *m)</div><div class='ctx'>  * To find the UMC channel represented by this bank we need to match on its</div><div class='ctx'>  * instance_id. The instance_id of a bank is held in the lower 32 bits of its</div><div class='ctx'>  * IPID.</div><div class='add'>+ *</div><div class='add'>+ * Currently, we can derive the channel number by looking at the 6th nibble in</div><div class='add'>+ * the instance_id. For example, instance_id=0xYXXXXX where Y is the channel</div><div class='add'>+ * number.</div><div class='ctx'>  */</div><div class='del'>-static int find_umc_channel(struct amd64_pvt *pvt, struct mce *m)</div><div class='add'>+static int find_umc_channel(struct mce *m)</div><div class='ctx'> {</div><div class='del'>-	u32 umc_instance_id[] = {0x50f00, 0x150f00};</div><div class='del'>-	u32 instance_id = m-&gt;ipid &amp; GENMASK(31, 0);</div><div class='del'>-	int i, channel = -1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(umc_instance_id); i++)</div><div class='del'>-		if (umc_instance_id[i] == instance_id)</div><div class='del'>-			channel = i;</div><div class='del'>-</div><div class='del'>-	return channel;</div><div class='add'>+	return (m-&gt;ipid &amp; GENMASK(31, 0)) &gt;&gt; 20;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void decode_umc_error(int node_id, struct mce *m)</div><div class='hunk'>@@ -2497,11 +2534,7 @@ static void decode_umc_error(int node_id, struct mce *m)</div><div class='ctx'> 	if (m-&gt;status &amp; MCI_STATUS_DEFERRED)</div><div class='ctx'> 		ecc_type = 3;</div><div class='ctx'> </div><div class='del'>-	err.channel = find_umc_channel(pvt, m);</div><div class='del'>-	if (err.channel &lt; 0) {</div><div class='del'>-		err.err_code = ERR_CHANNEL;</div><div class='del'>-		goto log_error;</div><div class='del'>-	}</div><div class='add'>+	err.channel = find_umc_channel(m);</div><div class='ctx'> </div><div class='ctx'> 	if (umc_normaddr_to_sysaddr(m-&gt;addr, pvt-&gt;mc_node_id, err.channel, &amp;sys_addr)) {</div><div class='ctx'> 		err.err_code = ERR_NORM_ADDR;</div><div class='hunk'>@@ -2603,19 +2636,19 @@ static void determine_ecc_sym_sz(struct amd64_pvt *pvt)</div><div class='ctx'> 	if (pvt-&gt;umc) {</div><div class='ctx'> 		u8 i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; NUM_UMCS; i++) {</div><div class='add'>+		for_each_umc(i) {</div><div class='ctx'> 			/* Check enabled channels only: */</div><div class='del'>-			if ((pvt-&gt;umc[i].sdp_ctrl &amp; UMC_SDP_INIT) &amp;&amp;</div><div class='del'>-			    (pvt-&gt;umc[i].ecc_ctrl &amp; BIT(7))) {</div><div class='del'>-				pvt-&gt;ecc_sym_sz = 8;</div><div class='del'>-				break;</div><div class='add'>+			if (pvt-&gt;umc[i].sdp_ctrl &amp; UMC_SDP_INIT) {</div><div class='add'>+				if (pvt-&gt;umc[i].ecc_ctrl &amp; BIT(9)) {</div><div class='add'>+					pvt-&gt;ecc_sym_sz = 16;</div><div class='add'>+					return;</div><div class='add'>+				} else if (pvt-&gt;umc[i].ecc_ctrl &amp; BIT(7)) {</div><div class='add'>+					pvt-&gt;ecc_sym_sz = 8;</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pvt-&gt;fam &gt;= 0x10) {</div><div class='add'>+	} else if (pvt-&gt;fam &gt;= 0x10) {</div><div class='ctx'> 		u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 		amd64_read_pci_cfg(pvt-&gt;F3, EXT_NB_MCA_CFG, &amp;tmp);</div><div class='hunk'>@@ -2639,7 +2672,7 @@ static void __read_mc_regs_df(struct amd64_pvt *pvt)</div><div class='ctx'> 	u32 i, umc_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Read registers from each UMC */</div><div class='del'>-	for (i = 0; i &lt; NUM_UMCS; i++) {</div><div class='add'>+	for_each_umc(i) {</div><div class='ctx'> </div><div class='ctx'> 		umc_base = get_umc_base(i);</div><div class='ctx'> 		umc = &amp;pvt-&gt;umc[i];</div><div class='hunk'>@@ -3052,7 +3085,7 @@ static bool ecc_enabled(struct pci_dev *F3, u16 nid)</div><div class='ctx'> 	if (boot_cpu_data.x86 &gt;= 0x17) {</div><div class='ctx'> 		u8 umc_en_mask = 0, ecc_en_mask = 0;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; NUM_UMCS; i++) {</div><div class='add'>+		for_each_umc(i) {</div><div class='ctx'> 			u32 base = get_umc_base(i);</div><div class='ctx'> </div><div class='ctx'> 			/* Only check enabled UMCs. */</div><div class='hunk'>@@ -3105,7 +3138,7 @@ f17h_determine_edac_ctl_cap(struct mem_ctl_info *mci, struct amd64_pvt *pvt)</div><div class='ctx'> {</div><div class='ctx'> 	u8 i, ecc_en = 1, cpk_en = 1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_UMCS; i++) {</div><div class='add'>+	for_each_umc(i) {</div><div class='ctx'> 		if (pvt-&gt;umc[i].sdp_ctrl &amp; UMC_SDP_INIT) {</div><div class='ctx'> 			ecc_en &amp;= !!(pvt-&gt;umc[i].umc_cap_hi &amp; UMC_ECC_ENABLED);</div><div class='ctx'> 			cpk_en &amp;= !!(pvt-&gt;umc[i].umc_cap_hi &amp; UMC_ECC_CHIPKILL_CAP);</div><div class='hunk'>@@ -3203,6 +3236,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)</div><div class='ctx'> 			fam_type = &amp;family_types[F17_M10H_CPUS];</div><div class='ctx'> 			pvt-&gt;ops = &amp;family_types[F17_M10H_CPUS].ops;</div><div class='ctx'> 			break;</div><div class='add'>+		} else if (pvt-&gt;model &gt;= 0x30 &amp;&amp; pvt-&gt;model &lt;= 0x3f) {</div><div class='add'>+			fam_type = &amp;family_types[F17_M30H_CPUS];</div><div class='add'>+			pvt-&gt;ops = &amp;family_types[F17_M30H_CPUS].ops;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case 0x18:</div><div class='hunk'>@@ -3236,6 +3273,22 @@ static const struct attribute_group *amd64_edac_attr_groups[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Set the number of Unified Memory Controllers in the system. */</div><div class='add'>+static void compute_num_umcs(void)</div><div class='add'>+{</div><div class='add'>+	u8 model = boot_cpu_data.x86_model;</div><div class='add'>+</div><div class='add'>+	if (boot_cpu_data.x86 &lt; 0x17)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (model &gt;= 0x30 &amp;&amp; model &lt;= 0x3f)</div><div class='add'>+		num_umcs = 8;</div><div class='add'>+	else</div><div class='add'>+		num_umcs = 2;</div><div class='add'>+</div><div class='add'>+	edac_dbg(1, "Number of UMCs: %x", num_umcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int init_one_instance(unsigned int nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *F3 = node_to_amd_nb(nid)-&gt;misc;</div><div class='hunk'>@@ -3260,7 +3313,7 @@ static int init_one_instance(unsigned int nid)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='ctx'> 	if (pvt-&gt;fam &gt;= 0x17) {</div><div class='del'>-		pvt-&gt;umc = kcalloc(NUM_UMCS, sizeof(struct amd64_umc), GFP_KERNEL);</div><div class='add'>+		pvt-&gt;umc = kcalloc(num_umcs, sizeof(struct amd64_umc), GFP_KERNEL);</div><div class='ctx'> 		if (!pvt-&gt;umc) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto err_free;</div><div class='hunk'>@@ -3299,8 +3352,14 @@ static int init_one_instance(unsigned int nid)</div><div class='ctx'> 	 * Always allocate two channels since we can have setups with DIMMs on</div><div class='ctx'> 	 * only one channel. Also, this simplifies handling later for the price</div><div class='ctx'> 	 * of a couple of KBs tops.</div><div class='add'>+	 *</div><div class='add'>+	 * On Fam17h+, the number of controllers may be greater than two. So set</div><div class='add'>+	 * the size equal to the maximum number of UMCs.</div><div class='ctx'> 	 */</div><div class='del'>-	layers[1].size = 2;</div><div class='add'>+	if (pvt-&gt;fam &gt;= 0x17)</div><div class='add'>+		layers[1].size = num_umcs;</div><div class='add'>+	else</div><div class='add'>+		layers[1].size = 2;</div><div class='ctx'> 	layers[1].is_virt_csrow = false;</div><div class='ctx'> </div><div class='ctx'> 	mci = edac_mc_alloc(nid, ARRAY_SIZE(layers), layers, 0);</div><div class='hunk'>@@ -3481,6 +3540,8 @@ static int __init amd64_edac_init(void)</div><div class='ctx'> 	if (!msrs)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='add'>+	compute_num_umcs();</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; amd_nb_num(); i++) {</div><div class='ctx'> 		err = probe_one_instance(i);</div><div class='ctx'> 		if (err) {</div><div class='head'>diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h<br/>index 4242f8e39c18..8f66472f7adc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/amd64_edac.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/amd64_edac.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/amd64_edac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/amd64_edac.h</a></div><div class='hunk'>@@ -117,6 +117,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_DF_F6	0x1466</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F0 0x15e8</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee</div><div class='add'>+#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490</div><div class='add'>+#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function 1 - Address Map</div><div class='hunk'>@@ -272,8 +274,6 @@</div><div class='ctx'> </div><div class='ctx'> #define UMC_SDP_INIT			BIT(31)</div><div class='ctx'> </div><div class='del'>-#define NUM_UMCS			2</div><div class='del'>-</div><div class='ctx'> enum amd_families {</div><div class='ctx'> 	K8_CPUS = 0,</div><div class='ctx'> 	F10_CPUS,</div><div class='hunk'>@@ -284,6 +284,7 @@ enum amd_families {</div><div class='ctx'> 	F16_M30H_CPUS,</div><div class='ctx'> 	F17_CPUS,</div><div class='ctx'> 	F17_M10H_CPUS,</div><div class='add'>+	F17_M30H_CPUS,</div><div class='ctx'> 	NUM_FAMILIES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -363,7 +364,7 @@ struct amd64_pvt {</div><div class='ctx'> 	u32 dct_sel_hi;		/* DRAM Controller Select High */</div><div class='ctx'> 	u32 online_spare;	/* On-Line spare Reg */</div><div class='ctx'> </div><div class='del'>-	/* x4 or x8 syndromes in use */</div><div class='add'>+	/* x4, x8, or x16 syndromes in use */</div><div class='ctx'> 	u8 ecc_sym_sz;</div><div class='ctx'> </div><div class='ctx'> 	/* place to store error injection parameters prior to issue */</div><div class='hunk'>@@ -396,8 +397,8 @@ struct err_info {</div><div class='ctx'> </div><div class='ctx'> static inline u32 get_umc_base(u8 channel)</div><div class='ctx'> {</div><div class='del'>-	/* ch0: 0x50000, ch1: 0x150000 */</div><div class='del'>-	return 0x50000 + (!!channel &lt;&lt; 20);</div><div class='add'>+	/* chY: 0xY50000 */</div><div class='add'>+	return 0x50000 + (channel &lt;&lt; 20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 get_dram_base(struct amd64_pvt *pvt, u8 i)</div><div class='head'>diff --git a/drivers/edac/i10nm_base.c b/drivers/edac/i10nm_base.c<br/>index c334fb7c63df..6f06aec4877c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/i10nm_base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/i10nm_base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/i10nm_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/i10nm_base.c</a></div><div class='hunk'>@@ -181,6 +181,54 @@ static struct notifier_block i10nm_mce_dec = {</div><div class='ctx'> 	.priority	= MCE_PRIO_EDAC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EDAC_DEBUG</div><div class='add'>+/*</div><div class='add'>+ * Debug feature.</div><div class='add'>+ * Exercise the address decode logic by writing an address to</div><div class='add'>+ * /sys/kernel/debug/edac/i10nm_test/addr.</div><div class='add'>+ */</div><div class='add'>+static struct dentry *i10nm_test;</div><div class='add'>+</div><div class='add'>+static int debugfs_u64_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mce m;</div><div class='add'>+</div><div class='add'>+	pr_warn_once("Fake error to 0x%llx injected via debugfs\n", val);</div><div class='add'>+</div><div class='add'>+	memset(&amp;m, 0, sizeof(m));</div><div class='add'>+	/* ADDRV + MemRd + Unknown channel */</div><div class='add'>+	m.status = MCI_STATUS_ADDRV + 0x90;</div><div class='add'>+	/* One corrected error */</div><div class='add'>+	m.status |= BIT_ULL(MCI_STATUS_CEC_SHIFT);</div><div class='add'>+	m.addr = val;</div><div class='add'>+	skx_mce_check_error(NULL, 0, &amp;m);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+DEFINE_SIMPLE_ATTRIBUTE(fops_u64_wo, NULL, debugfs_u64_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static void setup_i10nm_debug(void)</div><div class='add'>+{</div><div class='add'>+	i10nm_test = edac_debugfs_create_dir("i10nm_test");</div><div class='add'>+	if (!i10nm_test)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!edac_debugfs_create_file("addr", 0200, i10nm_test,</div><div class='add'>+				      NULL, &amp;fops_u64_wo)) {</div><div class='add'>+		debugfs_remove(i10nm_test);</div><div class='add'>+		i10nm_test = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void teardown_i10nm_debug(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(i10nm_test);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void setup_i10nm_debug(void) {}</div><div class='add'>+static inline void teardown_i10nm_debug(void) {}</div><div class='add'>+#endif /*CONFIG_EDAC_DEBUG*/</div><div class='add'>+</div><div class='ctx'> static int __init i10nm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mc = 0, src_id = 0, node_id = 0;</div><div class='hunk'>@@ -249,7 +297,7 @@ static int __init i10nm_init(void)</div><div class='ctx'> </div><div class='ctx'> 	opstate_init();</div><div class='ctx'> 	mce_register_decode_chain(&amp;i10nm_mce_dec);</div><div class='del'>-	setup_skx_debug("i10nm_test");</div><div class='add'>+	setup_i10nm_debug();</div><div class='ctx'> </div><div class='ctx'> 	i10nm_printk(KERN_INFO, "%s\n", I10NM_REVISION);</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +310,7 @@ fail:</div><div class='ctx'> static void __exit i10nm_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	edac_dbg(2, "\n");</div><div class='del'>-	teardown_skx_debug();</div><div class='add'>+	teardown_i10nm_debug();</div><div class='ctx'> 	mce_unregister_decode_chain(&amp;i10nm_mce_dec);</div><div class='ctx'> 	skx_adxl_put();</div><div class='ctx'> 	skx_remove();</div><div class='head'>diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c<br/>index 0a1814dad6cf..bb0202ad7a13 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/mce_amd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/mce_amd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/mce_amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/mce_amd.c</a></div><div class='hunk'>@@ -1004,7 +1004,7 @@ static inline void amd_decode_err_code(u16 ec)</div><div class='ctx'> /*</div><div class='ctx'>  * Filter out unwanted MCE signatures here.</div><div class='ctx'>  */</div><div class='del'>-static bool amd_filter_mce(struct mce *m)</div><div class='add'>+static bool ignore_mce(struct mce *m)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * NB GART TLB error reporting is disabled by default.</div><div class='hunk'>@@ -1038,7 +1038,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)</div><div class='ctx'> 	unsigned int fam = x86_family(m-&gt;cpuid);</div><div class='ctx'> 	int ecc;</div><div class='ctx'> </div><div class='del'>-	if (amd_filter_mce(m))</div><div class='add'>+	if (ignore_mce(m))</div><div class='ctx'> 		return NOTIFY_STOP;</div><div class='ctx'> </div><div class='ctx'> 	pr_emerg(HW_ERR "%s\n", decode_error_status(m));</div><div class='head'>diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c<br/>index adae4c848ca1..a5c8fa3a249a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/skx_base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/skx_base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/skx_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/skx_base.c</a></div><div class='hunk'>@@ -540,6 +540,54 @@ static struct notifier_block skx_mce_dec = {</div><div class='ctx'> 	.priority	= MCE_PRIO_EDAC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EDAC_DEBUG</div><div class='add'>+/*</div><div class='add'>+ * Debug feature.</div><div class='add'>+ * Exercise the address decode logic by writing an address to</div><div class='add'>+ * /sys/kernel/debug/edac/skx_test/addr.</div><div class='add'>+ */</div><div class='add'>+static struct dentry *skx_test;</div><div class='add'>+</div><div class='add'>+static int debugfs_u64_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mce m;</div><div class='add'>+</div><div class='add'>+	pr_warn_once("Fake error to 0x%llx injected via debugfs\n", val);</div><div class='add'>+</div><div class='add'>+	memset(&amp;m, 0, sizeof(m));</div><div class='add'>+	/* ADDRV + MemRd + Unknown channel */</div><div class='add'>+	m.status = MCI_STATUS_ADDRV + 0x90;</div><div class='add'>+	/* One corrected error */</div><div class='add'>+	m.status |= BIT_ULL(MCI_STATUS_CEC_SHIFT);</div><div class='add'>+	m.addr = val;</div><div class='add'>+	skx_mce_check_error(NULL, 0, &amp;m);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+DEFINE_SIMPLE_ATTRIBUTE(fops_u64_wo, NULL, debugfs_u64_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static void setup_skx_debug(void)</div><div class='add'>+{</div><div class='add'>+	skx_test = edac_debugfs_create_dir("skx_test");</div><div class='add'>+	if (!skx_test)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!edac_debugfs_create_file("addr", 0200, skx_test,</div><div class='add'>+				      NULL, &amp;fops_u64_wo)) {</div><div class='add'>+		debugfs_remove(skx_test);</div><div class='add'>+		skx_test = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void teardown_skx_debug(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(skx_test);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void setup_skx_debug(void) {}</div><div class='add'>+static inline void teardown_skx_debug(void) {}</div><div class='add'>+#endif /*CONFIG_EDAC_DEBUG*/</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * skx_init:</div><div class='ctx'>  *	make sure we are running on the correct cpu model</div><div class='hunk'>@@ -619,7 +667,7 @@ static int __init skx_init(void)</div><div class='ctx'> 	/* Ensure that the OPSTATE is set correctly for POLL or NMI */</div><div class='ctx'> 	opstate_init();</div><div class='ctx'> </div><div class='del'>-	setup_skx_debug("skx_test");</div><div class='add'>+	setup_skx_debug();</div><div class='ctx'> </div><div class='ctx'> 	mce_register_decode_chain(&amp;skx_mce_dec);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c<br/>index 0e96e7b5b0a7..b0dddcfa9baa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/skx_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/skx_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/skx_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/skx_common.c</a></div><div class='hunk'>@@ -1,7 +1,15 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- * Common codes for both the skx_edac driver and Intel 10nm server EDAC driver.</div><div class='del'>- * Originally split out from the skx_edac driver.</div><div class='add'>+ *</div><div class='add'>+ * Shared code by both skx_edac and i10nm_edac. Originally split out</div><div class='add'>+ * from the skx_edac driver.</div><div class='add'>+ *</div><div class='add'>+ * This file is linked into both skx_edac and i10nm_edac drivers. In</div><div class='add'>+ * order to avoid link errors, this file must be like a pure library</div><div class='add'>+ * without including symbols and defines which would otherwise conflict,</div><div class='add'>+ * when linked once into a module and into a built-in object, at the</div><div class='add'>+ * same time. For example, __this_module symbol references when that</div><div class='add'>+ * file is being linked into a built-in object.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2018, Intel Corporation.</div><div class='ctx'>  */</div><div class='hunk'>@@ -644,48 +652,3 @@ void skx_remove(void)</div><div class='ctx'> 		kfree(d);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EDAC_DEBUG</div><div class='del'>-/*</div><div class='del'>- * Debug feature.</div><div class='del'>- * Exercise the address decode logic by writing an address to</div><div class='del'>- * /sys/kernel/debug/edac/dirname/addr.</div><div class='del'>- */</div><div class='del'>-static struct dentry *skx_test;</div><div class='del'>-</div><div class='del'>-static int debugfs_u64_set(void *data, u64 val)</div><div class='del'>-{</div><div class='del'>-	struct mce m;</div><div class='del'>-</div><div class='del'>-	pr_warn_once("Fake error to 0x%llx injected via debugfs\n", val);</div><div class='del'>-</div><div class='del'>-	memset(&amp;m, 0, sizeof(m));</div><div class='del'>-	/* ADDRV + MemRd + Unknown channel */</div><div class='del'>-	m.status = MCI_STATUS_ADDRV + 0x90;</div><div class='del'>-	/* One corrected error */</div><div class='del'>-	m.status |= BIT_ULL(MCI_STATUS_CEC_SHIFT);</div><div class='del'>-	m.addr = val;</div><div class='del'>-	skx_mce_check_error(NULL, 0, &amp;m);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-DEFINE_SIMPLE_ATTRIBUTE(fops_u64_wo, NULL, debugfs_u64_set, "%llu\n");</div><div class='del'>-</div><div class='del'>-void setup_skx_debug(const char *dirname)</div><div class='del'>-{</div><div class='del'>-	skx_test = edac_debugfs_create_dir(dirname);</div><div class='del'>-	if (!skx_test)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!edac_debugfs_create_file("addr", 0200, skx_test,</div><div class='del'>-				      NULL, &amp;fops_u64_wo)) {</div><div class='del'>-		debugfs_remove(skx_test);</div><div class='del'>-		skx_test = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void teardown_skx_debug(void)</div><div class='del'>-{</div><div class='del'>-	debugfs_remove_recursive(skx_test);</div><div class='del'>-}</div><div class='del'>-#endif /*CONFIG_EDAC_DEBUG*/</div><div class='head'>diff --git a/drivers/edac/skx_common.h b/drivers/edac/skx_common.h<br/>index d25374e34d4f..d18fa98669af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/skx_common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/edac/skx_common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/edac/skx_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/edac/skx_common.h</a></div><div class='hunk'>@@ -141,12 +141,4 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> </div><div class='ctx'> void skx_remove(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EDAC_DEBUG</div><div class='del'>-void setup_skx_debug(const char *dirname);</div><div class='del'>-void teardown_skx_debug(void);</div><div class='del'>-#else</div><div class='del'>-static inline void setup_skx_debug(const char *dirname) {}</div><div class='del'>-static inline void teardown_skx_debug(void) {}</div><div class='del'>-#endif /*CONFIG_EDAC_DEBUG*/</div><div class='del'>-</div><div class='ctx'> #endif /* _SKX_COMM_EDAC_H */</div><div class='head'>diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig<br/>index 8e17149655f0..de06fafb52ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/Kconfig</a></div><div class='hunk'>@@ -30,7 +30,7 @@ config EXTCON_ARIZONA</div><div class='ctx'> </div><div class='ctx'> config EXTCON_AXP288</div><div class='ctx'> 	tristate "X-Power AXP288 EXTCON support"</div><div class='del'>-	depends on MFD_AXP20X &amp;&amp; USB_SUPPORT &amp;&amp; X86</div><div class='add'>+	depends on MFD_AXP20X &amp;&amp; USB_SUPPORT &amp;&amp; X86 &amp;&amp; ACPI</div><div class='ctx'> 	select USB_ROLE_SWITCH</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to enable support for USB peripheral detection</div><div class='hunk'>@@ -60,6 +60,13 @@ config EXTCON_INTEL_CHT_WC</div><div class='ctx'> 	  Say Y here to enable extcon support for charger detection / control</div><div class='ctx'> 	  on the Intel Cherrytrail Whiskey Cove PMIC.</div><div class='ctx'> </div><div class='add'>+config EXTCON_INTEL_MRFLD</div><div class='add'>+	tristate "Intel Merrifield Basin Cove PMIC extcon driver"</div><div class='add'>+	depends on INTEL_SOC_PMIC_MRFLD</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable extcon support for charger detection / control</div><div class='add'>+	  on the Intel Merrifield Basin Cove PMIC.</div><div class='add'>+</div><div class='ctx'> config EXTCON_MAX14577</div><div class='ctx'> 	tristate "Maxim MAX14577/77836 EXTCON Support"</div><div class='ctx'> 	depends on MFD_MAX14577</div><div class='hunk'>@@ -116,7 +123,7 @@ config EXTCON_PALMAS</div><div class='ctx'> </div><div class='ctx'> config EXTCON_PTN5150</div><div class='ctx'> 	tristate "NXP PTN5150 CC LOGIC USB EXTCON support"</div><div class='del'>-	depends on I2C &amp;&amp; GPIOLIB || COMPILE_TEST</div><div class='add'>+	depends on I2C &amp;&amp; (GPIOLIB || COMPILE_TEST)</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to enable support for USB peripheral and USB host</div><div class='head'>diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile<br/>index 261ce4cfe209..d3941a735df3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/Makefile</a></div><div class='hunk'>@@ -11,6 +11,7 @@ obj-$(CONFIG_EXTCON_AXP288)	+= extcon-axp288.o</div><div class='ctx'> obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o</div><div class='ctx'> obj-$(CONFIG_EXTCON_INTEL_INT3496) += extcon-intel-int3496.o</div><div class='ctx'> obj-$(CONFIG_EXTCON_INTEL_CHT_WC) += extcon-intel-cht-wc.o</div><div class='add'>+obj-$(CONFIG_EXTCON_INTEL_MRFLD) += extcon-intel-mrfld.o</div><div class='ctx'> obj-$(CONFIG_EXTCON_MAX14577)	+= extcon-max14577.o</div><div class='ctx'> obj-$(CONFIG_EXTCON_MAX3355)	+= extcon-max3355.o</div><div class='ctx'> obj-$(CONFIG_EXTCON_MAX77693)	+= extcon-max77693.o</div><div class='head'>diff --git a/drivers/extcon/devres.c b/drivers/extcon/devres.c<br/>index f599aeddf8e5..f487d877ab5d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/devres.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/devres.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/devres.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/devres.c</a></div><div class='hunk'>@@ -205,7 +205,7 @@ EXPORT_SYMBOL(devm_extcon_register_notifier);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * devm_extcon_unregister_notifier()</div><div class='del'>-			- Resource-managed extcon_unregister_notifier()</div><div class='add'>+ *			- Resource-managed extcon_unregister_notifier()</div><div class='ctx'>  * @dev:	the device owning the extcon device being created</div><div class='ctx'>  * @edev:	the extcon device</div><div class='ctx'>  * @id:		the unique id among the extcon enumeration</div><div class='head'>diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c<br/>index da0e9bc4262f..9327479c719c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-arizona.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-arizona.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-arizona.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/extcon-arizona.c</a></div><div class='hunk'>@@ -1726,6 +1726,16 @@ static int arizona_extcon_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct arizona_extcon_info *info = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct arizona *arizona = info-&gt;arizona;</div><div class='ctx'> 	int jack_irq_rise, jack_irq_fall;</div><div class='add'>+	bool change;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits_check(arizona-&gt;regmap, ARIZONA_MIC_DETECT_1,</div><div class='add'>+				 ARIZONA_MICD_ENA, 0,</div><div class='add'>+				 &amp;change);</div><div class='add'>+</div><div class='add'>+	if (change) {</div><div class='add'>+		regulator_disable(info-&gt;micvdd);</div><div class='add'>+		pm_runtime_put(info-&gt;dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gpiod_put(info-&gt;micd_pol_gpio);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c<br/>index a983708b77a6..50f9402fb325 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-axp288.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-axp288.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-axp288.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/extcon-axp288.c</a></div><div class='hunk'>@@ -333,7 +333,7 @@ static int axp288_extcon_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct axp288_extcon_info *info;</div><div class='ctx'> 	struct axp20x_dev *axp20x = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	const char *name;</div><div class='add'>+	struct acpi_device *adev;</div><div class='ctx'> 	int ret, i, pirq;</div><div class='ctx'> </div><div class='ctx'> 	info = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*info), GFP_KERNEL);</div><div class='hunk'>@@ -357,9 +357,10 @@ static int axp288_extcon_probe(struct platform_device *pdev)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		name = acpi_dev_get_first_match_name("INT3496", NULL, -1);</div><div class='del'>-		if (name) {</div><div class='del'>-			info-&gt;id_extcon = extcon_get_extcon_dev(name);</div><div class='add'>+		adev = acpi_dev_get_first_match_dev("INT3496", NULL, -1);</div><div class='add'>+		if (adev) {</div><div class='add'>+			info-&gt;id_extcon = extcon_get_extcon_dev(acpi_dev_name(adev));</div><div class='add'>+			put_device(&amp;adev-&gt;dev);</div><div class='ctx'> 			if (!info-&gt;id_extcon)</div><div class='ctx'> 				return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c<br/>index 5ef215297101..9d32150e68db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-intel-cht-wc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/extcon/extcon-intel-cht-wc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-intel-cht-wc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/extcon-intel-cht-wc.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "extcon-intel.h"</div><div class='add'>+</div><div class='ctx'> #define CHT_WC_PHYCTRL			0x5e07</div><div class='ctx'> </div><div class='ctx'> #define CHT_WC_CHGRCTRL0		0x5e16</div><div class='hunk'>@@ -29,7 +31,15 @@</div><div class='ctx'> #define CHT_WC_CHGRCTRL0_DBPOFF		BIT(6)</div><div class='ctx'> #define CHT_WC_CHGRCTRL0_CHR_WDT_NOKICK	BIT(7)</div><div class='ctx'> </div><div class='del'>-#define CHT_WC_CHGRCTRL1		0x5e17</div><div class='add'>+#define CHT_WC_CHGRCTRL1			0x5e17</div><div class='add'>+#define CHT_WC_CHGRCTRL1_FUSB_INLMT_100		BIT(0)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_FUSB_INLMT_150		BIT(1)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_FUSB_INLMT_500		BIT(2)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_FUSB_INLMT_900		BIT(3)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_FUSB_INLMT_1500	BIT(4)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_FTEMP_EVENT		BIT(5)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_OTGMODE		BIT(6)</div><div class='add'>+#define CHT_WC_CHGRCTRL1_DBPEN			BIT(7)</div><div class='ctx'> </div><div class='ctx'> #define CHT_WC_USBSRC			0x5e29</div><div class='ctx'> #define CHT_WC_USBSRC_STS_MASK		GENMASK(1, 0)</div><div class='hunk'>@@ -48,6 +58,13 @@</div><div class='ctx'> #define CHT_WC_USBSRC_TYPE_OTHER	8</div><div class='ctx'> #define CHT_WC_USBSRC_TYPE_DCP_EXTPHY	9</div><div class='ctx'> </div><div class='add'>+#define CHT_WC_CHGDISCTRL		0x5e2f</div><div class='add'>+#define CHT_WC_CHGDISCTRL_OUT		BIT(0)</div><div class='add'>+/* 0 - open drain, 1 - regular push-pull output */</div><div class='add'>+#define CHT_WC_CHGDISCTRL_DRV		BIT(4)</div><div class='add'>+/* 0 - pin is controlled by SW, 1 - by HW */</div><div class='add'>+#define CHT_WC_CHGDISCTRL_FN		BIT(6)</div><div class='add'>+</div><div class='ctx'> #define CHT_WC_PWRSRC_IRQ		0x6e03</div><div class='ctx'> #define CHT_WC_PWRSRC_IRQ_MASK		0x6e0f</div><div class='ctx'> #define CHT_WC_PWRSRC_STS		0x6e1e</div><div class='hunk'>@@ -65,15 +82,6 @@</div><div class='ctx'> #define CHT_WC_VBUS_GPIO_CTLO_DRV_OD	BIT(4)</div><div class='ctx'> #define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT	BIT(5)</div><div class='ctx'> </div><div class='del'>-enum cht_wc_usb_id {</div><div class='del'>-	USB_ID_OTG,</div><div class='del'>-	USB_ID_GND,</div><div class='del'>-	USB_ID_FLOAT,</div><div class='del'>-	USB_RID_A,</div><div class='del'>-	USB_RID_B,</div><div class='del'>-	USB_RID_C,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum cht_wc_mux_select {</div><div class='ctx'> 	MUX_SEL_PMIC = 0,</div><div class='ctx'> 	MUX_SEL_SOC,</div><div class='hunk'>@@ -101,9 +109,9 @@ static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts)</div><div class='ctx'> {</div><div class='ctx'> 	switch ((pwrsrc_sts &amp; CHT_WC_PWRSRC_USBID_MASK) &gt;&gt; CHT_WC_PWRSRC_USBID_SHIFT) {</div><div class='ctx'> 	case CHT_WC_PWRSRC_RID_GND:</div><div class='del'>-		return USB_ID_GND;</div><div class='add'>+		return INTEL_USB_ID_GND;</div><div class='ctx'> 	case CHT_WC_PWRSRC_RID_FLOAT:</div><div class='del'>-		return USB_ID_FLOAT;</div><div class='add'>+		return INTEL_USB_ID_FLOAT;</div><div class='ctx'> 	case CHT_WC_PWRSRC_RID_ACA:</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -111,7 +119,7 @@ static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts)</div><div class='ctx'> 		 * the USBID GPADC channel here and determine ACA role</div><div class='ctx'> 		 * based on that.</div><div class='ctx'> 		 */</div><div class='del'>-		return USB_ID_FLOAT;</div><div class='add'>+		return INTEL_USB_ID_FLOAT;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -198,6 +206,30 @@ static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext,</div><div class='ctx'> 		dev_err(ext-&gt;dev, "Error writing Vbus GPIO CTLO: %d\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cht_wc_extcon_set_otgmode(struct cht_wc_extcon_data *ext,</div><div class='add'>+				      bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = enable ? CHT_WC_CHGRCTRL1_OTGMODE : 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(ext-&gt;regmap, CHT_WC_CHGRCTRL1,</div><div class='add'>+				 CHT_WC_CHGRCTRL1_OTGMODE, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ext-&gt;dev, "Error updating CHGRCTRL1 reg: %d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cht_wc_extcon_enable_charging(struct cht_wc_extcon_data *ext,</div><div class='add'>+					  bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = enable ? 0 : CHT_WC_CHGDISCTRL_OUT;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(ext-&gt;regmap, CHT_WC_CHGDISCTRL,</div><div class='add'>+				 CHT_WC_CHGDISCTRL_OUT, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ext-&gt;dev, "Error updating CHGDISCTRL reg: %d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Small helper to sync EXTCON_CHG_USB_SDP and EXTCON_USB state */</div><div class='ctx'> static void cht_wc_extcon_set_state(struct cht_wc_extcon_data *ext,</div><div class='ctx'> 				    unsigned int cable, bool state)</div><div class='hunk'>@@ -221,11 +253,17 @@ static void cht_wc_extcon_pwrsrc_event(struct cht_wc_extcon_data *ext)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	id = cht_wc_extcon_get_id(ext, pwrsrc_sts);</div><div class='del'>-	if (id == USB_ID_GND) {</div><div class='add'>+	if (id == INTEL_USB_ID_GND) {</div><div class='add'>+		cht_wc_extcon_enable_charging(ext, false);</div><div class='add'>+		cht_wc_extcon_set_otgmode(ext, true);</div><div class='add'>+</div><div class='ctx'> 		/* The 5v boost causes a false VBUS / SDP detect, skip */</div><div class='ctx'> 		goto charger_det_done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cht_wc_extcon_set_otgmode(ext, false);</div><div class='add'>+	cht_wc_extcon_enable_charging(ext, true);</div><div class='add'>+</div><div class='ctx'> 	/* Plugged into a host/charger or not connected? */</div><div class='ctx'> 	if (!(pwrsrc_sts &amp; CHT_WC_PWRSRC_VBUS)) {</div><div class='ctx'> 		/* Route D+ and D- to PMIC for future charger detection */</div><div class='hunk'>@@ -248,7 +286,7 @@ set_state:</div><div class='ctx'> 		ext-&gt;previous_cable = cable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ext-&gt;usb_host = ((id == USB_ID_GND) || (id == USB_RID_A));</div><div class='add'>+	ext-&gt;usb_host = ((id == INTEL_USB_ID_GND) || (id == INTEL_USB_RID_A));</div><div class='ctx'> 	extcon_set_state_sync(ext-&gt;edev, EXTCON_USB_HOST, ext-&gt;usb_host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -278,6 +316,14 @@ static int cht_wc_extcon_sw_control(struct cht_wc_extcon_data *ext, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, mask, val;</div><div class='ctx'> </div><div class='add'>+	val = enable ? 0 : CHT_WC_CHGDISCTRL_FN;</div><div class='add'>+	ret = regmap_update_bits(ext-&gt;regmap, CHT_WC_CHGDISCTRL,</div><div class='add'>+				 CHT_WC_CHGDISCTRL_FN, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ext-&gt;dev,</div><div class='add'>+			"Error setting sw control for CHGDIS pin: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+</div><div class='ctx'> 	mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF;</div><div class='ctx'> 	val = enable ? mask : 0;</div><div class='ctx'> 	ret = regmap_update_bits(ext-&gt;regmap, CHT_WC_CHGRCTRL0, mask, val);</div><div class='hunk'>@@ -329,7 +375,10 @@ static int cht_wc_extcon_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Enable sw control */</div><div class='ctx'> 	ret = cht_wc_extcon_sw_control(ext, true);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto disable_sw_control;</div><div class='add'>+</div><div class='add'>+	/* Disable charging by external battery charger */</div><div class='add'>+	cht_wc_extcon_enable_charging(ext, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Register extcon device */</div><div class='ctx'> 	ret = devm_extcon_dev_register(ext-&gt;dev, ext-&gt;edev);</div><div class='head'>diff --git a/drivers/extcon/extcon-intel-mrfld.c b/drivers/extcon/extcon-intel-mrfld.c<br/>new file mode 100644<br/>index 000000000000..f47016fb28a8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-intel-mrfld.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/extcon-intel-mrfld.c</a></div><div class='hunk'>@@ -0,0 +1,284 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * extcon driver for Basin Cove PMIC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019, Intel Corporation.</div><div class='add'>+ * Author: Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/extcon-provider.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mfd/intel_soc_pmic.h&gt;</div><div class='add'>+#include &lt;linux/mfd/intel_soc_pmic_mrfld.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/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "extcon-intel.h"</div><div class='add'>+</div><div class='add'>+#define BCOVE_USBIDCTRL			0x19</div><div class='add'>+#define BCOVE_USBIDCTRL_ID		BIT(0)</div><div class='add'>+#define BCOVE_USBIDCTRL_ACA		BIT(1)</div><div class='add'>+#define BCOVE_USBIDCTRL_ALL	(BCOVE_USBIDCTRL_ID | BCOVE_USBIDCTRL_ACA)</div><div class='add'>+</div><div class='add'>+#define BCOVE_USBIDSTS			0x1a</div><div class='add'>+#define BCOVE_USBIDSTS_GND		BIT(0)</div><div class='add'>+#define BCOVE_USBIDSTS_RARBRC_MASK	GENMASK(2, 1)</div><div class='add'>+#define BCOVE_USBIDSTS_RARBRC_SHIFT	1</div><div class='add'>+#define BCOVE_USBIDSTS_NO_ACA		0</div><div class='add'>+#define BCOVE_USBIDSTS_R_ID_A		1</div><div class='add'>+#define BCOVE_USBIDSTS_R_ID_B		2</div><div class='add'>+#define BCOVE_USBIDSTS_R_ID_C		3</div><div class='add'>+#define BCOVE_USBIDSTS_FLOAT		BIT(3)</div><div class='add'>+#define BCOVE_USBIDSTS_SHORT		BIT(4)</div><div class='add'>+</div><div class='add'>+#define BCOVE_CHGRIRQ_ALL	(BCOVE_CHGRIRQ_VBUSDET | BCOVE_CHGRIRQ_DCDET | \</div><div class='add'>+				 BCOVE_CHGRIRQ_BATTDET | BCOVE_CHGRIRQ_USBIDDET)</div><div class='add'>+</div><div class='add'>+#define BCOVE_CHGRCTRL0			0x4b</div><div class='add'>+#define BCOVE_CHGRCTRL0_CHGRRESET	BIT(0)</div><div class='add'>+#define BCOVE_CHGRCTRL0_EMRGCHREN	BIT(1)</div><div class='add'>+#define BCOVE_CHGRCTRL0_EXTCHRDIS	BIT(2)</div><div class='add'>+#define BCOVE_CHGRCTRL0_SWCONTROL	BIT(3)</div><div class='add'>+#define BCOVE_CHGRCTRL0_TTLCK		BIT(4)</div><div class='add'>+#define BCOVE_CHGRCTRL0_BIT_5		BIT(5)</div><div class='add'>+#define BCOVE_CHGRCTRL0_BIT_6		BIT(6)</div><div class='add'>+#define BCOVE_CHGRCTRL0_CHR_WDT_NOKICK	BIT(7)</div><div class='add'>+</div><div class='add'>+struct mrfld_extcon_data {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct extcon_dev *edev;</div><div class='add'>+	unsigned int status;</div><div class='add'>+	unsigned int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int mrfld_extcon_cable[] = {</div><div class='add'>+	EXTCON_USB,</div><div class='add'>+	EXTCON_USB_HOST,</div><div class='add'>+	EXTCON_CHG_USB_SDP,</div><div class='add'>+	EXTCON_CHG_USB_CDP,</div><div class='add'>+	EXTCON_CHG_USB_DCP,</div><div class='add'>+	EXTCON_CHG_USB_ACA,</div><div class='add'>+	EXTCON_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_clear(struct mrfld_extcon_data *data, unsigned int reg,</div><div class='add'>+			      unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(data-&gt;regmap, reg, mask, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_set(struct mrfld_extcon_data *data, unsigned int reg,</div><div class='add'>+			    unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(data-&gt;regmap, reg, mask, 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_sw_control(struct mrfld_extcon_data *data, bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int mask = BCOVE_CHGRCTRL0_SWCONTROL;</div><div class='add'>+	struct device *dev = data-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		ret = mrfld_extcon_set(data, BCOVE_CHGRCTRL0, mask);</div><div class='add'>+	else</div><div class='add'>+		ret = mrfld_extcon_clear(data, BCOVE_CHGRCTRL0, mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev, "can't set SW control: %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_get_id(struct mrfld_extcon_data *data)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = data-&gt;regmap;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	bool ground;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, BCOVE_USBIDSTS, &amp;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (id &amp; BCOVE_USBIDSTS_FLOAT)</div><div class='add'>+		return INTEL_USB_ID_FLOAT;</div><div class='add'>+</div><div class='add'>+	switch ((id &amp; BCOVE_USBIDSTS_RARBRC_MASK) &gt;&gt; BCOVE_USBIDSTS_RARBRC_SHIFT) {</div><div class='add'>+	case BCOVE_USBIDSTS_R_ID_A:</div><div class='add'>+		return INTEL_USB_RID_A;</div><div class='add'>+	case BCOVE_USBIDSTS_R_ID_B:</div><div class='add'>+		return INTEL_USB_RID_B;</div><div class='add'>+	case BCOVE_USBIDSTS_R_ID_C:</div><div class='add'>+		return INTEL_USB_RID_C;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PMIC A0 reports USBIDSTS_GND = 1 for ID_GND,</div><div class='add'>+	 * but PMIC B0 reports USBIDSTS_GND = 0 for ID_GND.</div><div class='add'>+	 * Thus we must check this bit at last.</div><div class='add'>+	 */</div><div class='add'>+	ground = id &amp; BCOVE_USBIDSTS_GND;</div><div class='add'>+	switch ('A' + BCOVE_MAJOR(data-&gt;id)) {</div><div class='add'>+	case 'A':</div><div class='add'>+		return ground ? INTEL_USB_ID_GND : INTEL_USB_ID_FLOAT;</div><div class='add'>+	case 'B':</div><div class='add'>+		return ground ? INTEL_USB_ID_FLOAT : INTEL_USB_ID_GND;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unknown or unsupported type */</div><div class='add'>+	return INTEL_USB_ID_FLOAT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_role_detect(struct mrfld_extcon_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int id;</div><div class='add'>+	bool usb_host;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mrfld_extcon_get_id(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	id = ret;</div><div class='add'>+</div><div class='add'>+	usb_host = (id == INTEL_USB_ID_GND) || (id == INTEL_USB_RID_A);</div><div class='add'>+	extcon_set_state_sync(data-&gt;edev, EXTCON_USB_HOST, usb_host);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_cable_detect(struct mrfld_extcon_data *data)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = data-&gt;regmap;</div><div class='add'>+	unsigned int status, change;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It seems SCU firmware clears the content of BCOVE_CHGRIRQ1</div><div class='add'>+	 * and makes it useless for OS. Instead we compare a previously</div><div class='add'>+	 * stored status to the current one, provided by BCOVE_SCHGRIRQ1.</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_read(regmap, BCOVE_SCHGRIRQ1, &amp;status);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	change = status ^ data-&gt;status;</div><div class='add'>+	if (!change)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	if (change &amp; BCOVE_CHGRIRQ_USBIDDET) {</div><div class='add'>+		ret = mrfld_extcon_role_detect(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'>+	data-&gt;status = status;</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 mrfld_extcon_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mrfld_extcon_data *data = dev_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mrfld_extcon_cable_detect(data);</div><div class='add'>+</div><div class='add'>+	mrfld_extcon_clear(data, BCOVE_MIRQLVL1, BCOVE_LVL1_CHGR);</div><div class='add'>+</div><div class='add'>+	return ret ? IRQ_NONE: IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mrfld_extcon_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 intel_soc_pmic *pmic = dev_get_drvdata(dev-&gt;parent);</div><div class='add'>+	struct regmap *regmap = pmic-&gt;regmap;</div><div class='add'>+	struct mrfld_extcon_data *data;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	int irq, ret;</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'>+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data-&gt;dev = dev;</div><div class='add'>+	data-&gt;regmap = regmap;</div><div class='add'>+</div><div class='add'>+	data-&gt;edev = devm_extcon_dev_allocate(dev, mrfld_extcon_cable);</div><div class='add'>+	if (IS_ERR(data-&gt;edev))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = devm_extcon_dev_register(dev, data-&gt;edev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "can't register extcon device: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_request_threaded_irq(dev, irq, NULL, mrfld_extcon_interrupt,</div><div class='add'>+					IRQF_ONESHOT | IRQF_SHARED, pdev-&gt;name,</div><div class='add'>+					data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "can't register IRQ handler: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, BCOVE_ID, &amp;id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "can't read PMIC ID: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	ret = mrfld_extcon_sw_control(data, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Get initial state */</div><div class='add'>+	mrfld_extcon_role_detect(data);</div><div class='add'>+</div><div class='add'>+	mrfld_extcon_clear(data, BCOVE_MIRQLVL1, BCOVE_LVL1_CHGR);</div><div class='add'>+	mrfld_extcon_clear(data, BCOVE_MCHGRIRQ1, BCOVE_CHGRIRQ_ALL);</div><div class='add'>+</div><div class='add'>+	mrfld_extcon_set(data, BCOVE_USBIDCTRL, BCOVE_USBIDCTRL_ALL);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, 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 mrfld_extcon_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mrfld_extcon_data *data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	mrfld_extcon_sw_control(data, false);</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 platform_device_id mrfld_extcon_id_table[] = {</div><div class='add'>+	{ .name = "mrfld_bcove_pwrsrc" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(platform, mrfld_extcon_id_table);</div><div class='add'>+</div><div class='add'>+static struct platform_driver mrfld_extcon_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "mrfld_bcove_pwrsrc",</div><div class='add'>+	},</div><div class='add'>+	.probe		= mrfld_extcon_probe,</div><div class='add'>+	.remove		= mrfld_extcon_remove,</div><div class='add'>+	.id_table	= mrfld_extcon_id_table,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(mrfld_extcon_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("extcon driver for Intel Merrifield Basin Cove PMIC");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/extcon/extcon-intel.h b/drivers/extcon/extcon-intel.h<br/>new file mode 100644<br/>index 000000000000..0ad645ec7b33<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/extcon/extcon-intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/extcon/extcon-intel.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Header file for Intel extcon hardware</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Intel Corporation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __EXTCON_INTEL_H__</div><div class='add'>+#define __EXTCON_INTEL_H__</div><div class='add'>+</div><div class='add'>+enum extcon_intel_usb_id {</div><div class='add'>+	INTEL_USB_ID_OTG,</div><div class='add'>+	INTEL_USB_ID_GND,</div><div class='add'>+	INTEL_USB_ID_FLOAT,</div><div class='add'>+	INTEL_USB_RID_A,</div><div class='add'>+	INTEL_USB_RID_B,</div><div class='add'>+	INTEL_USB_RID_C,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif	/* __EXTCON_INTEL_H__ */</div><div class='head'>diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c<br/>index a128dd1126ae..515e96db4391 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firewire/nosy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firewire/nosy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firewire/nosy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firewire/nosy.c</a></div><div class='hunk'>@@ -303,7 +303,7 @@ nosy_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = client;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> fail:</div><div class='ctx'> 	kfree(client);</div><div class='ctx'> 	lynx_put(lynx);</div><div class='head'>diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c<br/>index 45c048751f3b..7183ab34269e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firewire/ohci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firewire/ohci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firewire/ohci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firewire/ohci.c</a></div><div class='hunk'>@@ -2939,7 +2939,6 @@ static void set_multichannel_mask(struct fw_ohci *ohci, u64 channels)</div><div class='ctx'> 	reg_write(ohci, OHCI1394_IRMultiChanMaskLoClear, ~lo);</div><div class='ctx'> 	reg_write(ohci, OHCI1394_IRMultiChanMaskHiSet, hi);</div><div class='ctx'> 	reg_write(ohci, OHCI1394_IRMultiChanMaskLoSet, lo);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	ohci-&gt;mc_channels = channels;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig<br/>index cac16c4b0df3..7b655f6156fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/Kconfig</a></div><div class='hunk'>@@ -5,20 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> menu "Firmware Drivers"</div><div class='ctx'> </div><div class='del'>-config ARM_PSCI_FW</div><div class='del'>-	bool</div><div class='del'>-</div><div class='del'>-config ARM_PSCI_CHECKER</div><div class='del'>-	bool "ARM PSCI checker"</div><div class='del'>-	depends on ARM_PSCI_FW &amp;&amp; HOTPLUG_CPU &amp;&amp; CPU_IDLE &amp;&amp; !TORTURE_TEST</div><div class='del'>-	help</div><div class='del'>-	  Run the PSCI checker during startup. This checks that hotplug and</div><div class='del'>-	  suspend operations work correctly when using PSCI.</div><div class='del'>-</div><div class='del'>-	  The torture tests may interfere with the PSCI checker by turning CPUs</div><div class='del'>-	  on and off through hotplug, so for now torture tests and PSCI checker</div><div class='del'>-	  are mutually exclusive.</div><div class='del'>-</div><div class='ctx'> config ARM_SCMI_PROTOCOL</div><div class='ctx'> 	bool "ARM System Control and Management Interface (SCMI) Message Protocol"</div><div class='ctx'> 	depends on ARM || ARM64 || COMPILE_TEST</div><div class='hunk'>@@ -270,6 +256,7 @@ config TI_SCI_PROTOCOL</div><div class='ctx'> config HAVE_ARM_SMCCC</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+source "drivers/firmware/psci/Kconfig"</div><div class='ctx'> source "drivers/firmware/broadcom/Kconfig"</div><div class='ctx'> source "drivers/firmware/google/Kconfig"</div><div class='ctx'> source "drivers/firmware/efi/Kconfig"</div><div class='head'>diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile<br/>index 80feb635120f..9a3909a22682 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/Makefile</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='del'>-obj-$(CONFIG_ARM_PSCI_FW)	+= psci.o</div><div class='del'>-obj-$(CONFIG_ARM_PSCI_CHECKER)	+= psci_checker.o</div><div class='ctx'> obj-$(CONFIG_ARM_SCPI_PROTOCOL)	+= arm_scpi.o</div><div class='ctx'> obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o</div><div class='ctx'> obj-$(CONFIG_ARM_SDE_INTERFACE)	+= arm_sdei.o</div><div class='hunk'>@@ -25,6 +23,7 @@ CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQU</div><div class='ctx'> obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARM_SCMI_PROTOCOL)	+= arm_scmi/</div><div class='add'>+obj-y				+= psci/</div><div class='ctx'> obj-y				+= broadcom/</div><div class='ctx'> obj-y				+= meson/</div><div class='ctx'> obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/</div><div class='head'>diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c<br/>index e6376f985ef7..9cd70d1a5622 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/arm_sdei.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/arm_sdei.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/arm_sdei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/arm_sdei.c</a></div><div class='hunk'>@@ -165,6 +165,7 @@ static int invoke_sdei_fn(unsigned long function_id, unsigned long arg0,</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+NOKPROBE_SYMBOL(invoke_sdei_fn);</div><div class='ctx'> </div><div class='ctx'> static struct sdei_event *sdei_event_find(u32 event_num)</div><div class='ctx'> {</div><div class='hunk'>@@ -879,6 +880,7 @@ static void sdei_smccc_smc(unsigned long function_id,</div><div class='ctx'> {</div><div class='ctx'> 	arm_smccc_smc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res);</div><div class='ctx'> }</div><div class='add'>+NOKPROBE_SYMBOL(sdei_smccc_smc);</div><div class='ctx'> </div><div class='ctx'> static void sdei_smccc_hvc(unsigned long function_id,</div><div class='ctx'> 			   unsigned long arg0, unsigned long arg1,</div><div class='hunk'>@@ -887,6 +889,7 @@ static void sdei_smccc_hvc(unsigned long function_id,</div><div class='ctx'> {</div><div class='ctx'> 	arm_smccc_hvc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res);</div><div class='ctx'> }</div><div class='add'>+NOKPROBE_SYMBOL(sdei_smccc_hvc);</div><div class='ctx'> </div><div class='ctx'> int sdei_register_ghes(struct ghes *ghes, sdei_event_callback *normal_cb,</div><div class='ctx'> 		       sdei_event_callback *critical_cb)</div><div class='head'>diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c<br/>index 099d83e4e910..fae2d5c43314 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/dmi_scan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/dmi_scan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/dmi_scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/dmi_scan.c</a></div><div class='hunk'>@@ -416,11 +416,8 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v)</div><div class='ctx'> 	nr++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init dmi_memdev_walk(void)</div><div class='add'>+static void __init dmi_memdev_walk(void)</div><div class='ctx'> {</div><div class='del'>-	if (!dmi_available)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (dmi_walk_early(count_mem_devices) == 0 &amp;&amp; dmi_memdev_nr) {</div><div class='ctx'> 		dmi_memdev = dmi_alloc(sizeof(*dmi_memdev) * dmi_memdev_nr);</div><div class='ctx'> 		if (dmi_memdev)</div><div class='hunk'>@@ -614,7 +611,7 @@ static int __init dmi_smbios3_present(const u8 *buf)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init dmi_scan_machine(void)</div><div class='add'>+static void __init dmi_scan_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	char __iomem *p, *q;</div><div class='ctx'> 	char buf[32];</div><div class='hunk'>@@ -769,15 +766,20 @@ static int __init dmi_init(void)</div><div class='ctx'> subsys_initcall(dmi_init);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dmi_set_dump_stack_arch_desc - set arch description for dump_stack()</div><div class='add'>+ *	dmi_setup - scan and setup DMI system information</div><div class='ctx'>  *</div><div class='del'>- * Invoke dump_stack_set_arch_desc() with DMI system information so that</div><div class='del'>- * DMI identifiers are printed out on task dumps.  Arch boot code should</div><div class='del'>- * call this function after dmi_scan_machine() if it wants to print out DMI</div><div class='del'>- * identifiers on task dumps.</div><div class='add'>+ *	Scan the DMI system information. This setups DMI identifiers</div><div class='add'>+ *	(dmi_system_id) for printing it out on task dumps and prepares</div><div class='add'>+ *	DIMM entry information (dmi_memdev_info) from the SMBIOS table</div><div class='add'>+ *	for using this when reporting memory errors.</div><div class='ctx'>  */</div><div class='del'>-void __init dmi_set_dump_stack_arch_desc(void)</div><div class='add'>+void __init dmi_setup(void)</div><div class='ctx'> {</div><div class='add'>+	dmi_scan_machine();</div><div class='add'>+	if (!dmi_available)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dmi_memdev_walk();</div><div class='ctx'> 	dump_stack_set_arch_desc("%s", dmi_ids_string);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -841,7 +843,7 @@ static bool dmi_is_end_of_table(const struct dmi_system_id *dmi)</div><div class='ctx'>  *	returns non zero or we hit the end. Callback function is called for</div><div class='ctx'>  *	each successful match. Returns the number of matches.</div><div class='ctx'>  *</div><div class='del'>- *	dmi_scan_machine must be called before this function is called.</div><div class='add'>+ *	dmi_setup must be called before this function is called.</div><div class='ctx'>  */</div><div class='ctx'> int dmi_check_system(const struct dmi_system_id *list)</div><div class='ctx'> {</div><div class='hunk'>@@ -871,7 +873,7 @@ EXPORT_SYMBOL(dmi_check_system);</div><div class='ctx'>  *	Walk the blacklist table until the first match is found.  Return the</div><div class='ctx'>  *	pointer to the matching entry or NULL if there's no match.</div><div class='ctx'>  *</div><div class='del'>- *	dmi_scan_machine must be called before this function is called.</div><div class='add'>+ *	dmi_setup must be called before this function is called.</div><div class='ctx'>  */</div><div class='ctx'> const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c<br/>index 0c1af675c338..e2ac5fa5531b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/efi/arm-runtime.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/efi/arm-runtime.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/efi/arm-runtime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/efi/arm-runtime.c</a></div><div class='hunk'>@@ -162,13 +162,11 @@ void efi_virtmap_unload(void)</div><div class='ctx'> static int __init arm_dmi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * On arm64/ARM, DMI depends on UEFI, and dmi_scan_machine() needs to</div><div class='add'>+	 * On arm64/ARM, DMI depends on UEFI, and dmi_setup() needs to</div><div class='ctx'> 	 * be called early because dmi_id_init(), which is an arch_initcall</div><div class='ctx'> 	 * itself, depends on dmi_scan_machine() having been called already.</div><div class='ctx'> 	 */</div><div class='del'>-	dmi_scan_machine();</div><div class='del'>-	if (dmi_available)</div><div class='del'>-		dmi_set_dump_stack_arch_desc();</div><div class='add'>+	dmi_setup();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> core_initcall(arm_dmi_init);</div><div class='head'>diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile<br/>index b0103e16fc1b..0460c7581220 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/efi/libstub/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/efi/libstub/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/efi/libstub/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/efi/libstub/Makefile</a></div><div class='hunk'>@@ -16,9 +16,9 @@ cflags-$(CONFIG_X86)		+= -m$(BITS) -D__KERNEL__ -O2 \</div><div class='ctx'> </div><div class='ctx'> # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly</div><div class='ctx'> # disable the stackleak plugin</div><div class='del'>-cflags-$(CONFIG_ARM64)		:= $(subst -pg,,$(KBUILD_CFLAGS)) -fpie \</div><div class='del'>-				   $(DISABLE_STACKLEAK_PLUGIN)</div><div class='del'>-cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \</div><div class='add'>+cflags-$(CONFIG_ARM64)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \</div><div class='add'>+				   -fpie $(DISABLE_STACKLEAK_PLUGIN)</div><div class='add'>+cflags-$(CONFIG_ARM)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \</div><div class='ctx'> 				   -fno-builtin -fpic \</div><div class='ctx'> 				   $(call cc-option,-mno-single-pic-base)</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +71,6 @@ CFLAGS_arm64-stub.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)</div><div class='ctx'> extra-$(CONFIG_EFI_ARMSTUB)	:= $(lib-y)</div><div class='ctx'> lib-$(CONFIG_EFI_ARMSTUB)	:= $(patsubst %.o,%.stub.o,$(lib-y))</div><div class='ctx'> </div><div class='del'>-STUBCOPY_RM-y			:= -R *ksymtab* -R *kcrctab*</div><div class='ctx'> STUBCOPY_FLAGS-$(CONFIG_ARM64)	+= --prefix-alloc-sections=.init \</div><div class='ctx'> 				   --prefix-symbols=__efistub_</div><div class='ctx'> STUBCOPY_RELOC-$(CONFIG_ARM64)	:= R_AARCH64_ABS</div><div class='hunk'>@@ -86,12 +85,13 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE</div><div class='ctx'> # this time, use objcopy and leave all sections in place.</div><div class='ctx'> #</div><div class='ctx'> quiet_cmd_stubcopy = STUBCPY $@</div><div class='del'>-      cmd_stubcopy = if $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $&lt;; \</div><div class='del'>-		     then if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); \</div><div class='del'>-		     then (echo &gt;&amp;2 "$@: absolute symbol references not allowed in the EFI stub"; \</div><div class='del'>-			   rm -f $@; /bin/false);			  \</div><div class='del'>-		     else $(OBJCOPY) $(STUBCOPY_FLAGS-y) $&lt; $@; fi	  \</div><div class='del'>-		     else /bin/false; fi</div><div class='add'>+      cmd_stubcopy =							\</div><div class='add'>+	$(STRIP) --strip-debug -o $@ $&lt;;				\</div><div class='add'>+	if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); then		\</div><div class='add'>+		echo "$@: absolute symbol references not allowed in the EFI stub" &gt;&amp;2; \</div><div class='add'>+		/bin/false;						\</div><div class='add'>+	fi;								\</div><div class='add'>+	$(OBJCOPY) $(STUBCOPY_FLAGS-y) $&lt; $@</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ARM discards the .data section because it disallows r/w data in the</div><div class='head'>diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c<br/>index c0c0b4e4e281..f240946ed701 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/google/vpd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/google/vpd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/google/vpd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/google/vpd.c</a></div><div class='hunk'>@@ -254,7 +254,7 @@ static int vpd_section_destroy(struct vpd_section *sec)</div><div class='ctx'> </div><div class='ctx'> static int vpd_sections_init(phys_addr_t physaddr)</div><div class='ctx'> {</div><div class='del'>-	struct vpd_cbmem __iomem *temp;</div><div class='add'>+	struct vpd_cbmem *temp;</div><div class='ctx'> 	struct vpd_cbmem header;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr)</div><div class='ctx'> 	if (!temp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memcpy_fromio(&amp;header, temp, sizeof(struct vpd_cbmem));</div><div class='add'>+	memcpy(&amp;header, temp, sizeof(struct vpd_cbmem));</div><div class='ctx'> 	memunmap(temp);</div><div class='ctx'> </div><div class='ctx'> 	if (header.magic != VPD_CBMEM_MAGIC)</div><div class='head'>diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c<br/>index c51462f5aa1e..a5dc0629f225 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/iscsi_ibft.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/iscsi_ibft.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/iscsi_ibft.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/iscsi_ibft.c</a></div><div class='hunk'>@@ -425,7 +425,7 @@ static ssize_t ibft_attr_show_acpitbl(void *data, int type, char *buf)</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_ACPITBL_SIGNATURE:</div><div class='del'>-		str += sprintf_string(str, ACPI_NAME_SIZE,</div><div class='add'>+		str += sprintf_string(str, ACPI_NAMESEG_SIZE,</div><div class='ctx'> 				      entry-&gt;header-&gt;header.signature);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_BOOT_ACPITBL_OEM_ID:</div><div class='head'>diff --git a/drivers/firmware/psci/Kconfig b/drivers/firmware/psci/Kconfig<br/>new file mode 100644<br/>index 000000000000..26a3b32bf7ab<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/psci/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/psci/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+config ARM_PSCI_FW</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config ARM_PSCI_CHECKER</div><div class='add'>+	bool "ARM PSCI checker"</div><div class='add'>+	depends on ARM_PSCI_FW &amp;&amp; HOTPLUG_CPU &amp;&amp; CPU_IDLE &amp;&amp; !TORTURE_TEST</div><div class='add'>+	help</div><div class='add'>+	  Run the PSCI checker during startup. This checks that hotplug and</div><div class='add'>+	  suspend operations work correctly when using PSCI.</div><div class='add'>+</div><div class='add'>+	  The torture tests may interfere with the PSCI checker by turning CPUs</div><div class='add'>+	  on and off through hotplug, so for now torture tests and PSCI checker</div><div class='add'>+	  are mutually exclusive.</div><div class='head'>diff --git a/drivers/firmware/psci/Makefile b/drivers/firmware/psci/Makefile<br/>new file mode 100644<br/>index 000000000000..1956b882470f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/psci/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/psci/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+obj-$(CONFIG_ARM_PSCI_FW)	+= psci.o</div><div class='add'>+obj-$(CONFIG_ARM_PSCI_CHECKER)	+= psci_checker.o</div><div class='head'>diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci/psci.c<br/>index c80ec1d03274..fe090ef43d28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/psci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/psci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/psci/psci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/psci/psci.c</a></div><div class='hunk'>@@ -88,6 +88,7 @@ static u32 psci_function_id[PSCI_FN_MAX];</div><div class='ctx'> 				PSCI_1_0_EXT_POWER_STATE_TYPE_MASK)</div><div class='ctx'> </div><div class='ctx'> static u32 psci_cpu_suspend_feature;</div><div class='add'>+static bool psci_system_reset2_supported;</div><div class='ctx'> </div><div class='ctx'> static inline bool psci_has_ext_power_state(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -95,6 +96,11 @@ static inline bool psci_has_ext_power_state(void)</div><div class='ctx'> 				PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool psci_has_osi_support(void)</div><div class='add'>+{</div><div class='add'>+	return psci_cpu_suspend_feature &amp; PSCI_1_0_OS_INITIATED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool psci_power_state_loses_context(u32 state)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 mask = psci_has_ext_power_state() ?</div><div class='hunk'>@@ -253,7 +259,17 @@ static int get_set_conduit_method(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)</div><div class='ctx'> {</div><div class='del'>-	invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);</div><div class='add'>+	if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) &amp;&amp;</div><div class='add'>+	    psci_system_reset2_supported) {</div><div class='add'>+		/*</div><div class='add'>+		 * reset_type[31] = 0 (architectural)</div><div class='add'>+		 * reset_type[30:0] = 0 (SYSTEM_WARM_RESET)</div><div class='add'>+		 * cookie = 0 (ignored by the implementation)</div><div class='add'>+		 */</div><div class='add'>+		invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, 0, 0);</div><div class='add'>+	} else {</div><div class='add'>+		invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void psci_sys_poweroff(void)</div><div class='hunk'>@@ -270,9 +286,26 @@ static int __init psci_features(u32 psci_func_id)</div><div class='ctx'> #ifdef CONFIG_CPU_IDLE</div><div class='ctx'> static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state);</div><div class='ctx'> </div><div class='add'>+static int psci_dt_parse_state_node(struct device_node *np, u32 *state)</div><div class='add'>+{</div><div class='add'>+	int err = of_property_read_u32(np, "arm,psci-suspend-param", state);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_warn("%pOF missing arm,psci-suspend-param property\n", np);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!psci_power_state_is_valid(*state)) {</div><div class='add'>+		pr_warn("Invalid PSCI power state %#x\n", *state);</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='ctx'> static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)</div><div class='ctx'> {</div><div class='del'>-	int i, ret, count = 0;</div><div class='add'>+	int i, ret = 0, count = 0;</div><div class='ctx'> 	u32 *psci_states;</div><div class='ctx'> 	struct device_node *state_node;</div><div class='ctx'> </div><div class='hunk'>@@ -291,29 +324,16 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		u32 state;</div><div class='del'>-</div><div class='ctx'> 		state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);</div><div class='add'>+		ret = psci_dt_parse_state_node(state_node, &amp;psci_states[i]);</div><div class='add'>+		of_node_put(state_node);</div><div class='ctx'> </div><div class='del'>-		ret = of_property_read_u32(state_node,</div><div class='del'>-					   "arm,psci-suspend-param",</div><div class='del'>-					   &amp;state);</div><div class='del'>-		if (ret) {</div><div class='del'>-			pr_warn(" * %pOF missing arm,psci-suspend-param property\n",</div><div class='del'>-				state_node);</div><div class='del'>-			of_node_put(state_node);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto free_mem;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		of_node_put(state_node);</div><div class='del'>-		pr_debug("psci-power-state %#x index %d\n", state, i);</div><div class='del'>-		if (!psci_power_state_is_valid(state)) {</div><div class='del'>-			pr_warn("Invalid PSCI power state %#x\n", state);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto free_mem;</div><div class='del'>-		}</div><div class='del'>-		psci_states[i] = state;</div><div class='add'>+		pr_debug("psci-power-state %#x index %d\n", psci_states[i], i);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Idle states parsed correctly, initialize per-cpu pointer */</div><div class='ctx'> 	per_cpu(psci_power_state, cpu) = psci_states;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -451,6 +471,16 @@ static const struct platform_suspend_ops psci_suspend_ops = {</div><div class='ctx'> 	.enter          = psci_system_suspend_enter,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void __init psci_init_system_reset2(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2));</div><div class='add'>+</div><div class='add'>+	if (ret != PSCI_RET_NOT_SUPPORTED)</div><div class='add'>+		psci_system_reset2_supported = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init psci_init_system_suspend(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -588,6 +618,7 @@ static int __init psci_probe(void)</div><div class='ctx'> 		psci_init_smccc();</div><div class='ctx'> 		psci_init_cpu_suspend();</div><div class='ctx'> 		psci_init_system_suspend();</div><div class='add'>+		psci_init_system_reset2();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -605,9 +636,9 @@ static int __init psci_0_2_init(struct device_node *np)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = get_set_conduit_method(np);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_put_node;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Starting with v0.2, the PSCI specification introduced a call</div><div class='ctx'> 	 * (PSCI_VERSION) that allows probing the firmware version, so</div><div class='hunk'>@@ -615,11 +646,7 @@ static int __init psci_0_2_init(struct device_node *np)</div><div class='ctx'> 	 * can be carried out according to the specific version reported</div><div class='ctx'> 	 * by firmware</div><div class='ctx'> 	 */</div><div class='del'>-	err = psci_probe();</div><div class='del'>-</div><div class='del'>-out_put_node:</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	return err;</div><div class='add'>+	return psci_probe();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -631,9 +658,8 @@ static int __init psci_0_1_init(struct device_node *np)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = get_set_conduit_method(np);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_put_node;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Using PSCI v0.1 Function IDs from DT\n");</div><div class='ctx'> </div><div class='hunk'>@@ -657,15 +683,27 @@ static int __init psci_0_1_init(struct device_node *np)</div><div class='ctx'> 		psci_ops.migrate = psci_migrate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_put_node:</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init psci_1_0_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = psci_0_2_init(np);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (psci_has_osi_support())</div><div class='add'>+		pr_info("OSI mode supported.\n");</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 of_device_id psci_of_match[] __initconst = {</div><div class='ctx'> 	{ .compatible = "arm,psci",	.data = psci_0_1_init},</div><div class='ctx'> 	{ .compatible = "arm,psci-0.2",	.data = psci_0_2_init},</div><div class='del'>-	{ .compatible = "arm,psci-1.0",	.data = psci_0_2_init},</div><div class='add'>+	{ .compatible = "arm,psci-1.0",	.data = psci_1_0_init},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -674,6 +712,7 @@ int __init psci_dt_init(void)</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	const struct of_device_id *matched_np;</div><div class='ctx'> 	psci_initcall_t init_fn;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_matching_node_and_match(NULL, psci_of_match, &amp;matched_np);</div><div class='ctx'> </div><div class='hunk'>@@ -681,7 +720,10 @@ int __init psci_dt_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	init_fn = (psci_initcall_t)matched_np-&gt;data;</div><div class='del'>-	return init_fn(np);</div><div class='add'>+	ret = init_fn(np);</div><div class='add'>+</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='head'>diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci/psci_checker.c<br/>index 346943657962..346943657962 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/psci_checker.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/firmware/psci_checker.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/firmware/psci/psci_checker.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/firmware/psci/psci_checker.c</a></div><div class='head'>diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c<br/>index 320cfca80d5f..e6f94501cb28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gnss/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gnss/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gnss/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gnss/core.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static int gnss_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	get_device(&amp;gdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> 	file-&gt;private_data = gdev;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;gdev-&gt;rwsem);</div><div class='head'>diff --git a/drivers/gnss/ubx.c b/drivers/gnss/ubx.c<br/>index 12568aebb7f6..7b05bc40532e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gnss/ubx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gnss/ubx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gnss/ubx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gnss/ubx.c</a></div><div class='hunk'>@@ -130,6 +130,7 @@ static void ubx_remove(struct serdev_device *serdev)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> static const struct of_device_id ubx_of_match[] = {</div><div class='add'>+	{ .compatible = "u-blox,neo-6m" },</div><div class='ctx'> 	{ .compatible = "u-blox,neo-8" },</div><div class='ctx'> 	{ .compatible = "u-blox,neo-m8" },</div><div class='ctx'> 	{},</div><div class='head'>diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig<br/>index 3f50526a771f..0f91600c27ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/Kconfig</a></div><div class='hunk'>@@ -12,7 +12,6 @@ config ARCH_HAVE_CUSTOM_GPIO_H</div><div class='ctx'> </div><div class='ctx'> menuconfig GPIOLIB</div><div class='ctx'> 	bool "GPIO Support"</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables GPIO support through the generic GPIO library.</div><div class='ctx'> 	  You only need to enable this, if you also want to enable</div><div class='head'>diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c<br/>index 91b90c0cea73..12acdac85820 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-adnp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-adnp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-adnp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpio-adnp.c</a></div><div class='hunk'>@@ -132,8 +132,10 @@ static int adnp_gpio_direction_input(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (err &amp; BIT(pos))</div><div class='del'>-		err = -EACCES;</div><div class='add'>+	if (value &amp; BIT(pos)) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c<br/>index 854bce4fb9e7..217507002dbc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-aspeed.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-aspeed.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-aspeed.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpio-aspeed.c</a></div><div class='hunk'>@@ -1224,6 +1224,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	gpio-&gt;offset_timer =</div><div class='ctx'> 		devm_kzalloc(&amp;pdev-&gt;dev, gpio-&gt;chip.ngpio, GFP_KERNEL);</div><div class='add'>+	if (!gpio-&gt;offset_timer)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return aspeed_gpio_setup_irqs(gpio, pdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c<br/>index f0223cee9774..77092268ee95 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-eic-sprd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-eic-sprd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-eic-sprd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpio-eic-sprd.c</a></div><div class='hunk'>@@ -414,6 +414,7 @@ static int sprd_eic_irq_set_type(struct irq_data *data, unsigned int flow_type)</div><div class='ctx'> 			irq_set_handler_locked(data, handle_edge_irq);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IRQ_TYPE_EDGE_BOTH:</div><div class='add'>+			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);</div><div class='ctx'> 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 1);</div><div class='ctx'> 			irq_set_handler_locked(data, handle_edge_irq);</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c<br/>index 0ecd2369c2ca..a09d2f9ebacc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-exar.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-exar.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-exar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpio-exar.c</a></div><div class='hunk'>@@ -148,6 +148,8 @@ static int gpio_exar_probe(struct platform_device *pdev)</div><div class='ctx'> 	mutex_init(&amp;exar_gpio-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	index = ida_simple_get(&amp;ida_index, 0, 0, GFP_KERNEL);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		goto err_destroy;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(exar_gpio-&gt;name, "exar_gpio%d", index);</div><div class='ctx'> 	exar_gpio-&gt;gpio_chip.label = exar_gpio-&gt;name;</div><div class='head'>diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c<br/>index 7c659fdaa6d5..3302125e5265 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-merrifield.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-merrifield.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-merrifield.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpio-merrifield.c</a></div><div class='hunk'>@@ -377,10 +377,20 @@ static void mrfld_irq_init_hw(struct mrfld_gpio *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *mrfld_gpio_get_pinctrl_dev_name(void)</div><div class='add'>+static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv)</div><div class='ctx'> {</div><div class='del'>-	const char *dev_name = acpi_dev_get_first_match_name("INTC1002", NULL, -1);</div><div class='del'>-	return dev_name ? dev_name : "pinctrl-merrifield";</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	adev = acpi_dev_get_first_match_dev("INTC1002", NULL, -1);</div><div class='add'>+	if (adev) {</div><div class='add'>+		name = devm_kstrdup(priv-&gt;dev, acpi_dev_name(adev), GFP_KERNEL);</div><div class='add'>+		acpi_dev_put(adev);</div><div class='add'>+	} else {</div><div class='add'>+		name = "pinctrl-merrifield";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='hunk'>@@ -441,7 +451,7 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pinctrl_dev_name = mrfld_gpio_get_pinctrl_dev_name();</div><div class='add'>+	pinctrl_dev_name = mrfld_gpio_get_pinctrl_dev_name(priv);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mrfld_gpio_ranges); i++) {</div><div class='ctx'> 		range = &amp;mrfld_gpio_ranges[i];</div><div class='ctx'> 		retval = gpiochip_add_pin_range(&amp;priv-&gt;chip,</div><div class='head'>diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c<br/>index 154d959e8993..b6a4efce7c92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-mockup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpio-mockup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpio-mockup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpio-mockup.c</a></div><div class='hunk'>@@ -204,8 +204,8 @@ static ssize_t gpio_mockup_debugfs_read(struct file *file,</div><div class='ctx'> 	struct gpio_mockup_chip *chip;</div><div class='ctx'> 	struct seq_file *sfile;</div><div class='ctx'> 	struct gpio_chip *gc;</div><div class='add'>+	int val, cnt;</div><div class='ctx'> 	char buf[3];</div><div class='del'>-	int val, rv;</div><div class='ctx'> </div><div class='ctx'> 	if (*ppos != 0)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -216,13 +216,9 @@ static ssize_t gpio_mockup_debugfs_read(struct file *file,</div><div class='ctx'> 	gc = &amp;chip-&gt;gc;</div><div class='ctx'> </div><div class='ctx'> 	val = gpio_mockup_get(gc, priv-&gt;offset);</div><div class='del'>-	snprintf(buf, sizeof(buf), "%d\n", val);</div><div class='add'>+	cnt = snprintf(buf, sizeof(buf), "%d\n", val);</div><div class='ctx'> </div><div class='del'>-	rv = copy_to_user(usr_buf, buf, sizeof(buf));</div><div class='del'>-	if (rv)</div><div class='del'>-		return rv;</div><div class='del'>-</div><div class='del'>-	return sizeof(buf) - 1;</div><div class='add'>+	return simple_read_from_buffer(usr_buf, size, ppos, buf, cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t gpio_mockup_debugfs_write(struct file *file,</div><div class='head'>diff --git a/drivers/gpio/gpiolib-devprop.c b/drivers/gpio/gpiolib-devprop.c<br/>index dd517098ab95..53781b253986 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib-devprop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib-devprop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib-devprop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpiolib-devprop.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpiolib.h"</div><div class='ctx'> </div><div class='hunk'>@@ -56,3 +57,4 @@ void devprop_gpiochip_set_names(struct gpio_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	kfree(names);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(devprop_gpiochip_set_names);</div><div class='head'>diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c<br/>index 8b9c3ab70f6e..6a3ec575a404 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib-of.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib-of.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib-of.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpiolib-of.c</a></div><div class='hunk'>@@ -120,7 +120,8 @@ static void of_gpio_flags_quirks(struct device_node *np,</div><div class='ctx'> 	 * to determine if the flags should have inverted semantics.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_SPI_MASTER) &amp;&amp;</div><div class='del'>-	    of_property_read_bool(np, "cs-gpios")) {</div><div class='add'>+	    of_property_read_bool(np, "cs-gpios") &amp;&amp;</div><div class='add'>+	    !strcmp(propname, "cs-gpios")) {</div><div class='ctx'> 		struct device_node *child;</div><div class='ctx'> 		u32 cs;</div><div class='ctx'> 		int ret;</div><div class='hunk'>@@ -142,16 +143,16 @@ static void of_gpio_flags_quirks(struct device_node *np,</div><div class='ctx'> 				 * conflict and the "spi-cs-high" flag will</div><div class='ctx'> 				 * take precedence.</div><div class='ctx'> 				 */</div><div class='del'>-				if (of_property_read_bool(np, "spi-cs-high")) {</div><div class='add'>+				if (of_property_read_bool(child, "spi-cs-high")) {</div><div class='ctx'> 					if (*flags &amp; OF_GPIO_ACTIVE_LOW) {</div><div class='ctx'> 						pr_warn("%s GPIO handle specifies active low - ignored\n",</div><div class='del'>-							of_node_full_name(np));</div><div class='add'>+							of_node_full_name(child));</div><div class='ctx'> 						*flags &amp;= ~OF_GPIO_ACTIVE_LOW;</div><div class='ctx'> 					}</div><div class='ctx'> 				} else {</div><div class='ctx'> 					if (!(*flags &amp; OF_GPIO_ACTIVE_LOW))</div><div class='ctx'> 						pr_info("%s enforce active low on chipselect handle\n",</div><div class='del'>-							of_node_full_name(np));</div><div class='add'>+							of_node_full_name(child));</div><div class='ctx'> 					*flags |= OF_GPIO_ACTIVE_LOW;</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -717,7 +718,13 @@ int of_gpiochip_add(struct gpio_chip *chip)</div><div class='ctx'> </div><div class='ctx'> 	of_node_get(chip-&gt;of_node);</div><div class='ctx'> </div><div class='del'>-	return of_gpiochip_scan_gpios(chip);</div><div class='add'>+	status = of_gpiochip_scan_gpios(chip);</div><div class='add'>+	if (status) {</div><div class='add'>+		of_node_put(chip-&gt;of_node);</div><div class='add'>+		gpiochip_remove_pin_ranges(chip);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void of_gpiochip_remove(struct gpio_chip *chip)</div><div class='head'>diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c<br/>index 144af0733581..bca3e7740ef6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpiolib.c</a></div><div class='hunk'>@@ -1379,7 +1379,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,</div><div class='ctx'> </div><div class='ctx'> 	status = gpiochip_add_irqchip(chip, lock_key, request_key);</div><div class='ctx'> 	if (status)</div><div class='del'>-		goto err_remove_chip;</div><div class='add'>+		goto err_free_gpiochip_mask;</div><div class='ctx'> </div><div class='ctx'> 	status = of_gpiochip_add(chip);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -1387,7 +1387,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,</div><div class='ctx'> </div><div class='ctx'> 	status = gpiochip_init_valid_mask(chip);</div><div class='ctx'> 	if (status)</div><div class='del'>-		goto err_remove_chip;</div><div class='add'>+		goto err_remove_of_chip;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;ngpio; i++) {</div><div class='ctx'> 		struct gpio_desc *desc = &amp;gdev-&gt;descs[i];</div><div class='hunk'>@@ -1415,14 +1415,18 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,</div><div class='ctx'> 	if (gpiolib_initialized) {</div><div class='ctx'> 		status = gpiochip_setup_dev(gdev);</div><div class='ctx'> 		if (status)</div><div class='del'>-			goto err_remove_chip;</div><div class='add'>+			goto err_remove_acpi_chip;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_remove_chip:</div><div class='add'>+err_remove_acpi_chip:</div><div class='ctx'> 	acpi_gpiochip_remove(chip);</div><div class='add'>+err_remove_of_chip:</div><div class='ctx'> 	gpiochip_free_hogs(chip);</div><div class='ctx'> 	of_gpiochip_remove(chip);</div><div class='add'>+err_remove_chip:</div><div class='add'>+	gpiochip_irqchip_remove(chip);</div><div class='add'>+err_free_gpiochip_mask:</div><div class='ctx'> 	gpiochip_free_valid_mask(chip);</div><div class='ctx'> err_remove_irqchip_mask:</div><div class='ctx'> 	gpiochip_irqchip_free_valid_mask(chip);</div><div class='hunk'>@@ -2776,7 +2780,7 @@ int gpiod_set_debounce(struct gpio_desc *desc, unsigned debounce)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	config = pinconf_to_config_packed(PIN_CONFIG_INPUT_DEBOUNCE, debounce);</div><div class='del'>-	return gpio_set_config(chip, gpio_chip_hwgpio(desc), config);</div><div class='add'>+	return chip-&gt;set_config(chip, gpio_chip_hwgpio(desc), config);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(gpiod_set_debounce);</div><div class='ctx'> </div><div class='hunk'>@@ -2813,7 +2817,7 @@ int gpiod_set_transitory(struct gpio_desc *desc, bool transitory)</div><div class='ctx'> 	packed = pinconf_to_config_packed(PIN_CONFIG_PERSIST_STATE,</div><div class='ctx'> 					  !transitory);</div><div class='ctx'> 	gpio = gpio_chip_hwgpio(desc);</div><div class='del'>-	rc = gpio_set_config(chip, gpio, packed);</div><div class='add'>+	rc = chip-&gt;set_config(chip, gpio, packed);</div><div class='ctx'> 	if (rc == -ENOTSUPP) {</div><div class='ctx'> 		dev_dbg(&amp;desc-&gt;gdev-&gt;dev, "Persistence not supported for GPIO %d\n",</div><div class='ctx'> 				gpio);</div><div class='head'>diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h<br/>index 078ab17b96bf..3243c1eb5c88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpio/gpiolib.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpio/gpiolib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpio/gpiolib.h</a></div><div class='hunk'>@@ -243,9 +243,6 @@ static inline int gpio_chip_hwgpio(const struct gpio_desc *desc)</div><div class='ctx'> 	return desc - &amp;desc-&gt;gdev-&gt;descs[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void devprop_gpiochip_set_names(struct gpio_chip *chip,</div><div class='del'>-				const struct fwnode_handle *fwnode);</div><div class='del'>-</div><div class='ctx'> /* With descriptor prefix */</div><div class='ctx'> </div><div class='ctx'> #define gpiod_emerg(desc, fmt, ...)					       \</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br/>index 4f8fb4ecde34..79fb302fb954 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/amdgpu_device.c</a></div><div class='hunk'>@@ -3165,6 +3165,7 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev)</div><div class='ctx'> </div><div class='ctx'> 		/* No need to recover an evicted BO */</div><div class='ctx'> 		if (shadow-&gt;tbo.mem.mem_type != TTM_PL_TT ||</div><div class='add'>+		    shadow-&gt;tbo.mem.start == AMDGPU_BO_INVALID_OFFSET ||</div><div class='ctx'> 		    shadow-&gt;parent-&gt;tbo.mem.mem_type != TTM_PL_VRAM)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -3173,11 +3174,16 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (fence) {</div><div class='del'>-			r = dma_fence_wait_timeout(fence, false, tmo);</div><div class='add'>+			tmo = dma_fence_wait_timeout(fence, false, tmo);</div><div class='ctx'> 			dma_fence_put(fence);</div><div class='ctx'> 			fence = next;</div><div class='del'>-			if (r &lt;= 0)</div><div class='add'>+			if (tmo == 0) {</div><div class='add'>+				r = -ETIMEDOUT;</div><div class='ctx'> 				break;</div><div class='add'>+			} else if (tmo &lt; 0) {</div><div class='add'>+				r = tmo;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fence = next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3188,8 +3194,8 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev)</div><div class='ctx'> 		tmo = dma_fence_wait_timeout(fence, false, tmo);</div><div class='ctx'> 	dma_fence_put(fence);</div><div class='ctx'> </div><div class='del'>-	if (r &lt;= 0 || tmo &lt;= 0) {</div><div class='del'>-		DRM_ERROR("recover vram bo from shadow failed\n");</div><div class='add'>+	if (r &lt; 0 || tmo &lt;= 0) {</div><div class='add'>+		DRM_ERROR("recover vram bo from shadow failed, r is %ld, tmo is %ld\n", r, tmo);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3625,6 +3631,7 @@ static void amdgpu_device_get_min_pci_speed_width(struct amdgpu_device *adev,</div><div class='ctx'> 	struct pci_dev *pdev = adev-&gt;pdev;</div><div class='ctx'> 	enum pci_bus_speed cur_speed;</div><div class='ctx'> 	enum pcie_link_width cur_width;</div><div class='add'>+	u32 ret = 1;</div><div class='ctx'> </div><div class='ctx'> 	*speed = PCI_SPEED_UNKNOWN;</div><div class='ctx'> 	*width = PCIE_LNK_WIDTH_UNKNOWN;</div><div class='hunk'>@@ -3632,6 +3639,10 @@ static void amdgpu_device_get_min_pci_speed_width(struct amdgpu_device *adev,</div><div class='ctx'> 	while (pdev) {</div><div class='ctx'> 		cur_speed = pcie_get_speed_cap(pdev);</div><div class='ctx'> 		cur_width = pcie_get_width_cap(pdev);</div><div class='add'>+		ret = pcie_bandwidth_available(adev-&gt;pdev, NULL,</div><div class='add'>+						       NULL, &amp;cur_width);</div><div class='add'>+		if (!ret)</div><div class='add'>+			cur_width = PCIE_LNK_WIDTH_RESRV;</div><div class='ctx'> </div><div class='ctx'> 		if (cur_speed != PCI_SPEED_UNKNOWN) {</div><div class='ctx'> 			if (*speed == PCI_SPEED_UNKNOWN)</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c<br/>index 0b8ef2d27d6b..fe393a46f881 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include "amdgpu_trace.h"</div><div class='ctx'> </div><div class='ctx'> #define AMDGPU_IB_TEST_TIMEOUT	msecs_to_jiffies(1000)</div><div class='add'>+#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT	msecs_to_jiffies(2000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IB</div><div class='hunk'>@@ -344,6 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)</div><div class='ctx'> 		 * cost waiting for it coming back under RUNTIME only</div><div class='ctx'> 		*/</div><div class='ctx'> 		tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;</div><div class='add'>+	} else if (adev-&gt;gmc.xgmi.hive_id) {</div><div class='add'>+		tmo_gfx = AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adev-&gt;num_rings; ++i) {</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c<br/>index 0767a93e4d91..639297250c21 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c</a></div><div class='hunk'>@@ -53,26 +53,25 @@ static int amdgpu_sched_process_priority_override(struct amdgpu_device *adev,</div><div class='ctx'> 						  int fd,</div><div class='ctx'> 						  enum drm_sched_priority priority)</div><div class='ctx'> {</div><div class='del'>-	struct file *filp = fget(fd);</div><div class='add'>+	struct fd f = fdget(fd);</div><div class='ctx'> 	struct amdgpu_fpriv *fpriv;</div><div class='ctx'> 	struct amdgpu_ctx *ctx;</div><div class='ctx'> 	uint32_t id;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	if (!filp)</div><div class='add'>+	if (!f.file)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	r = amdgpu_file_to_fpriv(filp, &amp;fpriv);</div><div class='add'>+	r = amdgpu_file_to_fpriv(f.file, &amp;fpriv);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		fput(filp);</div><div class='add'>+		fdput(f);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	idr_for_each_entry(&amp;fpriv-&gt;ctx_mgr.ctx_handles, ctx, id)</div><div class='ctx'> 		amdgpu_ctx_priority_override(ctx, priority);</div><div class='ctx'> </div><div class='del'>-	fput(filp);</div><div class='del'>-</div><div class='add'>+	fdput(f);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -81,30 +80,30 @@ static int amdgpu_sched_context_priority_override(struct amdgpu_device *adev,</div><div class='ctx'> 						  unsigned ctx_id,</div><div class='ctx'> 						  enum drm_sched_priority priority)</div><div class='ctx'> {</div><div class='del'>-	struct file *filp = fget(fd);</div><div class='add'>+	struct fd f = fdget(fd);</div><div class='ctx'> 	struct amdgpu_fpriv *fpriv;</div><div class='ctx'> 	struct amdgpu_ctx *ctx;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	if (!filp)</div><div class='add'>+	if (!f.file)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	r = amdgpu_file_to_fpriv(filp, &amp;fpriv);</div><div class='add'>+	r = amdgpu_file_to_fpriv(f.file, &amp;fpriv);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		fput(filp);</div><div class='add'>+		fdput(f);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx = amdgpu_ctx_get(fpriv, ctx_id);</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx) {</div><div class='del'>-		fput(filp);</div><div class='add'>+		fdput(f);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	amdgpu_ctx_priority_override(ctx, priority);</div><div class='ctx'> 	amdgpu_ctx_put(ctx);</div><div class='del'>-	fput(filp);</div><div class='add'>+	fdput(f);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c<br/>index bfa9062ce6b9..16fcb56c232b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c</a></div><div class='hunk'>@@ -700,6 +700,8 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,</div><div class='ctx'> 	struct amdgpu_vm_bo_base *bo_base, *tmp;</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='add'>+	vm-&gt;bulk_moveable &amp;= list_empty(&amp;vm-&gt;evicted);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(bo_base, tmp, &amp;vm-&gt;evicted, vm_status) {</div><div class='ctx'> 		struct amdgpu_bo *bo = bo_base-&gt;bo;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c<br/>index d0309e8c9d12..a11db2b1a63f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c</a></div><div class='hunk'>@@ -2405,8 +2405,6 @@ static int gfx_v9_0_rlc_resume(struct amdgpu_device *adev)</div><div class='ctx'> 	/* disable CG */</div><div class='ctx'> 	WREG32_SOC15(GC, 0, mmRLC_CGCG_CGLS_CTRL, 0);</div><div class='ctx'> </div><div class='del'>-	adev-&gt;gfx.rlc.funcs-&gt;reset(adev);</div><div class='del'>-</div><div class='ctx'> 	gfx_v9_0_init_pg(adev);</div><div class='ctx'> </div><div class='ctx'> 	if (adev-&gt;firmware.load_type != AMDGPU_FW_LOAD_PSP) {</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c<br/>index 600259b4e291..2fe8397241ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c</a></div><div class='hunk'>@@ -742,7 +742,7 @@ static int gmc_v9_0_allocate_vm_inv_eng(struct amdgpu_device *adev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ring-&gt;vm_inv_eng = inv_eng - 1;</div><div class='del'>-		change_bit(inv_eng - 1, (unsigned long *)(&amp;vm_inv_engs[vmhub]));</div><div class='add'>+		vm_inv_engs[vmhub] &amp;= ~(1 &lt;&lt; ring-&gt;vm_inv_eng);</div><div class='ctx'> </div><div class='ctx'> 		dev_info(adev-&gt;dev, "ring %s uses VM inv eng %u on hub %u\n",</div><div class='ctx'> 			 ring-&gt;name, ring-&gt;vm_inv_eng, ring-&gt;funcs-&gt;vmhub);</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c<br/>index d0d966d6080a..1696644ec022 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c</a></div><div class='hunk'>@@ -182,6 +182,7 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev)</div><div class='ctx'> 		tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3,</div><div class='ctx'> 				    L2_CACHE_BIGK_FRAGMENT_SIZE, 6);</div><div class='ctx'> 	}</div><div class='add'>+	WREG32_SOC15(MMHUB, 0, mmVM_L2_CNTL3, tmp);</div><div class='ctx'> </div><div class='ctx'> 	tmp = mmVM_L2_CNTL4_DEFAULT;</div><div class='ctx'> 	tmp = REG_SET_FIELD(tmp, VM_L2_CNTL4, VMC_TAP_PDE_REQUEST_PHYSICAL, 0);</div><div class='head'>diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br/>index 8be9677c0c07..cf9a49f49d3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdkfd/kfd_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/amdkfd/kfd_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/amdkfd/kfd_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/amdkfd/kfd_device.c</a></div><div class='hunk'>@@ -320,6 +320,7 @@ static const struct kfd_deviceid supported_devices[] = {</div><div class='ctx'> 	{ 0x9876, &amp;carrizo_device_info },	/* Carrizo */</div><div class='ctx'> 	{ 0x9877, &amp;carrizo_device_info },	/* Carrizo */</div><div class='ctx'> 	{ 0x15DD, &amp;raven_device_info },		/* Raven */</div><div class='add'>+	{ 0x15D8, &amp;raven_device_info },		/* Raven */</div><div class='ctx'> #endif</div><div class='ctx'> 	{ 0x67A0, &amp;hawaii_device_info },	/* Hawaii */</div><div class='ctx'> 	{ 0x67A1, &amp;hawaii_device_info },	/* Hawaii */</div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br/>index fb27783d7a54..3082b55b1e77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c</a></div><div class='hunk'>@@ -4533,6 +4533,7 @@ static void handle_cursor_update(struct drm_plane *plane,</div><div class='ctx'> 	amdgpu_crtc-&gt;cursor_width = plane-&gt;state-&gt;crtc_w;</div><div class='ctx'> 	amdgpu_crtc-&gt;cursor_height = plane-&gt;state-&gt;crtc_h;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;attributes, 0, sizeof(attributes));</div><div class='ctx'> 	attributes.address.high_part = upper_32_bits(address);</div><div class='ctx'> 	attributes.address.low_part  = lower_32_bits(address);</div><div class='ctx'> 	attributes.width             = plane-&gt;state-&gt;crtc_w;</div><div class='hunk'>@@ -5429,9 +5430,11 @@ static void get_freesync_config_for_crtc(</div><div class='ctx'> 	struct amdgpu_dm_connector *aconnector =</div><div class='ctx'> 			to_amdgpu_dm_connector(new_con_state-&gt;base.connector);</div><div class='ctx'> 	struct drm_display_mode *mode = &amp;new_crtc_state-&gt;base.mode;</div><div class='add'>+	int vrefresh = drm_mode_vrefresh(mode);</div><div class='ctx'> </div><div class='ctx'> 	new_crtc_state-&gt;vrr_supported = new_con_state-&gt;freesync_capable &amp;&amp;</div><div class='del'>-		aconnector-&gt;min_vfreq &lt;= drm_mode_vrefresh(mode);</div><div class='add'>+					vrefresh &gt;= aconnector-&gt;min_vfreq &amp;&amp;</div><div class='add'>+					vrefresh &lt;= aconnector-&gt;max_vfreq;</div><div class='ctx'> </div><div class='ctx'> 	if (new_crtc_state-&gt;vrr_supported) {</div><div class='ctx'> 		new_crtc_state-&gt;stream-&gt;ignore_msa_timing_param = true;</div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c<br/>index c68fbd55db3c..a6cda201c964 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/core/dc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/core/dc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/core/dc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/dc/core/dc.c</a></div><div class='hunk'>@@ -1377,6 +1377,11 @@ static enum surface_update_type det_surface_update(const struct dc *dc,</div><div class='ctx'> 		return UPDATE_TYPE_FULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (u-&gt;surface-&gt;force_full_update) {</div><div class='add'>+		update_flags-&gt;bits.full_update = 1;</div><div class='add'>+		return UPDATE_TYPE_FULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	type = get_plane_info_update_type(u);</div><div class='ctx'> 	elevate_update_type(&amp;overall_type, type);</div><div class='ctx'> </div><div class='hunk'>@@ -1802,6 +1807,14 @@ void dc_commit_updates_for_stream(struct dc *dc,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dc_resource_state_copy_construct(state, context);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; dc-&gt;res_pool-&gt;pipe_count; i++) {</div><div class='add'>+			struct pipe_ctx *new_pipe = &amp;context-&gt;res_ctx.pipe_ctx[i];</div><div class='add'>+			struct pipe_ctx *old_pipe = &amp;dc-&gt;current_state-&gt;res_ctx.pipe_ctx[i];</div><div class='add'>+</div><div class='add'>+			if (new_pipe-&gt;plane_state &amp;&amp; new_pipe-&gt;plane_state != old_pipe-&gt;plane_state)</div><div class='add'>+				new_pipe-&gt;plane_state-&gt;force_full_update = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1838,6 +1851,12 @@ void dc_commit_updates_for_stream(struct dc *dc,</div><div class='ctx'> 		dc-&gt;current_state = context;</div><div class='ctx'> 		dc_release_state(old);</div><div class='ctx'> </div><div class='add'>+		for (i = 0; i &lt; dc-&gt;res_pool-&gt;pipe_count; i++) {</div><div class='add'>+			struct pipe_ctx *pipe_ctx = &amp;context-&gt;res_ctx.pipe_ctx[i];</div><div class='add'>+</div><div class='add'>+			if (pipe_ctx-&gt;plane_state &amp;&amp; pipe_ctx-&gt;stream == stream)</div><div class='add'>+				pipe_ctx-&gt;plane_state-&gt;force_full_update = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/*let's use current_state to update watermark etc*/</div><div class='ctx'> 	if (update_type &gt;= UPDATE_TYPE_FULL)</div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c<br/>index 4eba3c4800b6..ea18e9c2d8ce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/core/dc_link.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/core/dc_link.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/core/dc_link.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/dc/core/dc_link.c</a></div><div class='hunk'>@@ -2660,12 +2660,18 @@ void core_link_enable_stream(</div><div class='ctx'> void core_link_disable_stream(struct pipe_ctx *pipe_ctx, int option)</div><div class='ctx'> {</div><div class='ctx'> 	struct dc  *core_dc = pipe_ctx-&gt;stream-&gt;ctx-&gt;dc;</div><div class='add'>+	struct dc_stream_state *stream = pipe_ctx-&gt;stream;</div><div class='ctx'> </div><div class='ctx'> 	core_dc-&gt;hwss.blank_stream(pipe_ctx);</div><div class='ctx'> </div><div class='ctx'> 	if (pipe_ctx-&gt;stream-&gt;signal == SIGNAL_TYPE_DISPLAY_PORT_MST)</div><div class='ctx'> 		deallocate_mst_payload(pipe_ctx);</div><div class='ctx'> </div><div class='add'>+	if (dc_is_hdmi_signal(pipe_ctx-&gt;stream-&gt;signal))</div><div class='add'>+		dal_ddc_service_write_scdc_data(</div><div class='add'>+			stream-&gt;link-&gt;ddc, 0,</div><div class='add'>+			stream-&gt;timing.flags.LTE_340MCSC_SCRAMBLE);</div><div class='add'>+</div><div class='ctx'> 	core_dc-&gt;hwss.disable_stream(pipe_ctx, option);</div><div class='ctx'> </div><div class='ctx'> 	disable_link(pipe_ctx-&gt;stream-&gt;link, pipe_ctx-&gt;stream-&gt;signal);</div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h<br/>index 1a7fd6aa77eb..0515095574e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/dc/dc.h</a></div><div class='hunk'>@@ -503,6 +503,9 @@ struct dc_plane_state {</div><div class='ctx'> 	struct dc_plane_status status;</div><div class='ctx'> 	struct dc_context *ctx;</div><div class='ctx'> </div><div class='add'>+	/* HACK: Workaround for forcing full reprogramming under some conditions */</div><div class='add'>+	bool force_full_update;</div><div class='add'>+</div><div class='ctx'> 	/* private to dc_surface.c */</div><div class='ctx'> 	enum dc_irq_source irq_source;</div><div class='ctx'> 	struct kref refcount;</div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c<br/>index 4febf4ef7240..4fe3664fb495 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dce/dce_aux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/dc/dce/dce_aux.c</a></div><div class='hunk'>@@ -190,6 +190,12 @@ static void submit_channel_request(</div><div class='ctx'> 				1,</div><div class='ctx'> 				0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	REG_UPDATE(AUX_INTERRUPT_CONTROL, AUX_SW_DONE_ACK, 1);</div><div class='add'>+</div><div class='add'>+	REG_WAIT(AUX_SW_STATUS, AUX_SW_DONE, 0,</div><div class='add'>+				10, aux110-&gt;timeout_period/10);</div><div class='add'>+</div><div class='ctx'> 	/* set the delay and the number of bytes to write */</div><div class='ctx'> </div><div class='ctx'> 	/* The length include</div><div class='hunk'>@@ -242,9 +248,6 @@ static void submit_channel_request(</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_UPDATE(AUX_INTERRUPT_CONTROL, AUX_SW_DONE_ACK, 1);</div><div class='del'>-	REG_WAIT(AUX_SW_STATUS, AUX_SW_DONE, 0,</div><div class='del'>-				10, aux110-&gt;timeout_period/10);</div><div class='ctx'> 	REG_UPDATE(AUX_SW_CONTROL, AUX_SW_GO, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h<br/>index d27f22c05e4b..e28ed6a00ff4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dce/dce_aux.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dce/dce_aux.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/dc/dce/dce_aux.h</a></div><div class='hunk'>@@ -71,11 +71,11 @@ enum {	/* This is the timeout as defined in DP 1.2a,</div><div class='ctx'> 	 * at most within ~240usec. That means,</div><div class='ctx'> 	 * increasing this timeout will not affect normal operation,</div><div class='ctx'> 	 * and we'll timeout after</div><div class='del'>-	 * SW_AUX_TIMEOUT_PERIOD_MULTIPLIER * AUX_TIMEOUT_PERIOD = 1600usec.</div><div class='add'>+	 * SW_AUX_TIMEOUT_PERIOD_MULTIPLIER * AUX_TIMEOUT_PERIOD = 2400usec.</div><div class='ctx'> 	 * This timeout is especially important for</div><div class='del'>-	 * resume from S3 and CTS.</div><div class='add'>+	 * converters, resume from S3, and CTS.</div><div class='ctx'> 	 */</div><div class='del'>-	SW_AUX_TIMEOUT_PERIOD_MULTIPLIER = 4</div><div class='add'>+	SW_AUX_TIMEOUT_PERIOD_MULTIPLIER = 6</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dce_aux {</div><div class='head'>diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c<br/>index 683829466a44..0ba68d41b9c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c</a></div><div class='hunk'>@@ -1150,28 +1150,9 @@ void hubp1_cursor_set_position(</div><div class='ctx'> 	REG_UPDATE(CURSOR_CONTROL,</div><div class='ctx'> 			CURSOR_ENABLE, cur_en);</div><div class='ctx'> </div><div class='del'>-	//account for cases where we see negative offset relative to overlay plane</div><div class='del'>-	if (src_x_offset &lt; 0 &amp;&amp; src_y_offset &lt; 0) {</div><div class='del'>-		REG_SET_2(CURSOR_POSITION, 0,</div><div class='del'>-			CURSOR_X_POSITION, 0,</div><div class='del'>-			CURSOR_Y_POSITION, 0);</div><div class='del'>-		x_hotspot -= src_x_offset;</div><div class='del'>-		y_hotspot -= src_y_offset;</div><div class='del'>-	} else if (src_x_offset &lt; 0) {</div><div class='del'>-		REG_SET_2(CURSOR_POSITION, 0,</div><div class='del'>-			CURSOR_X_POSITION, 0,</div><div class='del'>-			CURSOR_Y_POSITION, pos-&gt;y);</div><div class='del'>-		x_hotspot -= src_x_offset;</div><div class='del'>-	} else if (src_y_offset &lt; 0) {</div><div class='del'>-		REG_SET_2(CURSOR_POSITION, 0,</div><div class='add'>+	REG_SET_2(CURSOR_POSITION, 0,</div><div class='ctx'> 			CURSOR_X_POSITION, pos-&gt;x,</div><div class='del'>-			CURSOR_Y_POSITION, 0);</div><div class='del'>-		y_hotspot -= src_y_offset;</div><div class='del'>-	} else {</div><div class='del'>-		REG_SET_2(CURSOR_POSITION, 0,</div><div class='del'>-				CURSOR_X_POSITION, pos-&gt;x,</div><div class='del'>-				CURSOR_Y_POSITION, pos-&gt;y);</div><div class='del'>-	}</div><div class='add'>+			CURSOR_Y_POSITION, pos-&gt;y);</div><div class='ctx'> </div><div class='ctx'> 	REG_SET_2(CURSOR_HOT_SPOT, 0,</div><div class='ctx'> 			CURSOR_HOT_SPOT_X, x_hotspot,</div><div class='head'>diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c<br/>index 9aa7bec1b5fe..23b5b94a4939 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c</a></div><div class='hunk'>@@ -91,6 +91,12 @@ static void vega20_set_default_registry_data(struct pp_hwmgr *hwmgr)</div><div class='ctx'> 	 *   MP0CLK DS</div><div class='ctx'> 	 */</div><div class='ctx'> 	data-&gt;registry_data.disallowed_features = 0xE0041C00;</div><div class='add'>+	/* ECC feature should be disabled on old SMUs */</div><div class='add'>+	smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetSmuVersion);</div><div class='add'>+	hwmgr-&gt;smu_version = smum_get_argument(hwmgr);</div><div class='add'>+	if (hwmgr-&gt;smu_version &lt; 0x282100)</div><div class='add'>+		data-&gt;registry_data.disallowed_features |= FEATURE_ECC_MASK;</div><div class='add'>+</div><div class='ctx'> 	data-&gt;registry_data.od_state_in_dc_support = 0;</div><div class='ctx'> 	data-&gt;registry_data.thermal_support = 1;</div><div class='ctx'> 	data-&gt;registry_data.skip_baco_hardware = 0;</div><div class='hunk'>@@ -357,6 +363,7 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr)</div><div class='ctx'> 	data-&gt;smu_features[GNLD_DS_MP1CLK].smu_feature_id = FEATURE_DS_MP1CLK_BIT;</div><div class='ctx'> 	data-&gt;smu_features[GNLD_DS_MP0CLK].smu_feature_id = FEATURE_DS_MP0CLK_BIT;</div><div class='ctx'> 	data-&gt;smu_features[GNLD_XGMI].smu_feature_id = FEATURE_XGMI_BIT;</div><div class='add'>+	data-&gt;smu_features[GNLD_ECC].smu_feature_id = FEATURE_ECC_BIT;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; GNLD_FEATURES_MAX; i++) {</div><div class='ctx'> 		data-&gt;smu_features[i].smu_feature_bitmap =</div><div class='hunk'>@@ -3020,7 +3027,8 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)</div><div class='ctx'> 				"FCLK_DS",</div><div class='ctx'> 				"MP1CLK_DS",</div><div class='ctx'> 				"MP0CLK_DS",</div><div class='del'>-				"XGMI"};</div><div class='add'>+				"XGMI",</div><div class='add'>+				"ECC"};</div><div class='ctx'> 	static const char *output_title[] = {</div><div class='ctx'> 				"FEATURES",</div><div class='ctx'> 				"BITMASK",</div><div class='hunk'>@@ -3462,6 +3470,7 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)</div><div class='ctx'> 	struct vega20_single_dpm_table *dpm_table;</div><div class='ctx'> 	bool vblank_too_short = false;</div><div class='ctx'> 	bool disable_mclk_switching;</div><div class='add'>+	bool disable_fclk_switching;</div><div class='ctx'> 	uint32_t i, latency;</div><div class='ctx'> </div><div class='ctx'> 	disable_mclk_switching = ((1 &lt; hwmgr-&gt;display_config-&gt;num_display) &amp;&amp;</div><div class='hunk'>@@ -3537,13 +3546,20 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)</div><div class='ctx'> 	if (hwmgr-&gt;display_config-&gt;nb_pstate_switch_disable)</div><div class='ctx'> 		dpm_table-&gt;dpm_state.hard_min_level = dpm_table-&gt;dpm_levels[dpm_table-&gt;count - 1].value;</div><div class='ctx'> </div><div class='add'>+	if ((disable_mclk_switching &amp;&amp;</div><div class='add'>+	    (dpm_table-&gt;dpm_state.hard_min_level == dpm_table-&gt;dpm_levels[dpm_table-&gt;count - 1].value)) ||</div><div class='add'>+	     hwmgr-&gt;display_config-&gt;min_mem_set_clock / 100 &gt;= dpm_table-&gt;dpm_levels[dpm_table-&gt;count - 1].value)</div><div class='add'>+		disable_fclk_switching = true;</div><div class='add'>+	else</div><div class='add'>+		disable_fclk_switching = false;</div><div class='add'>+</div><div class='ctx'> 	/* fclk */</div><div class='ctx'> 	dpm_table = &amp;(data-&gt;dpm_table.fclk_table);</div><div class='ctx'> 	dpm_table-&gt;dpm_state.soft_min_level = dpm_table-&gt;dpm_levels[0].value;</div><div class='ctx'> 	dpm_table-&gt;dpm_state.soft_max_level = VG20_CLOCK_MAX_DEFAULT;</div><div class='ctx'> 	dpm_table-&gt;dpm_state.hard_min_level = dpm_table-&gt;dpm_levels[0].value;</div><div class='ctx'> 	dpm_table-&gt;dpm_state.hard_max_level = VG20_CLOCK_MAX_DEFAULT;</div><div class='del'>-	if (hwmgr-&gt;display_config-&gt;nb_pstate_switch_disable)</div><div class='add'>+	if (hwmgr-&gt;display_config-&gt;nb_pstate_switch_disable || disable_fclk_switching)</div><div class='ctx'> 		dpm_table-&gt;dpm_state.soft_min_level = dpm_table-&gt;dpm_levels[dpm_table-&gt;count - 1].value;</div><div class='ctx'> </div><div class='ctx'> 	/* vclk */</div><div class='head'>diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h<br/>index a5bc758ae097..ac2a3118a0ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h</a></div><div class='hunk'>@@ -80,6 +80,7 @@ enum {</div><div class='ctx'> 	GNLD_DS_MP1CLK,</div><div class='ctx'> 	GNLD_DS_MP0CLK,</div><div class='ctx'> 	GNLD_XGMI,</div><div class='add'>+	GNLD_ECC,</div><div class='ctx'> </div><div class='ctx'> 	GNLD_FEATURES_MAX</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h<br/>index 63d5cf691549..195c4ae67058 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h</a></div><div class='hunk'>@@ -99,7 +99,7 @@</div><div class='ctx'> #define FEATURE_DS_MP1CLK_BIT           30</div><div class='ctx'> #define FEATURE_DS_MP0CLK_BIT           31</div><div class='ctx'> #define FEATURE_XGMI_BIT                32</div><div class='del'>-#define FEATURE_SPARE_33_BIT            33</div><div class='add'>+#define FEATURE_ECC_BIT                 33</div><div class='ctx'> #define FEATURE_SPARE_34_BIT            34</div><div class='ctx'> #define FEATURE_SPARE_35_BIT            35</div><div class='ctx'> #define FEATURE_SPARE_36_BIT            36</div><div class='hunk'>@@ -165,7 +165,8 @@</div><div class='ctx'> #define FEATURE_DS_FCLK_MASK            (1 &lt;&lt; FEATURE_DS_FCLK_BIT            )</div><div class='ctx'> #define FEATURE_DS_MP1CLK_MASK          (1 &lt;&lt; FEATURE_DS_MP1CLK_BIT          )</div><div class='ctx'> #define FEATURE_DS_MP0CLK_MASK          (1 &lt;&lt; FEATURE_DS_MP0CLK_BIT          )</div><div class='del'>-#define FEATURE_XGMI_MASK               (1 &lt;&lt; FEATURE_XGMI_BIT               )</div><div class='add'>+#define FEATURE_XGMI_MASK               (1ULL &lt;&lt; FEATURE_XGMI_BIT               )</div><div class='add'>+#define FEATURE_ECC_MASK                (1ULL &lt;&lt; FEATURE_ECC_BIT                )</div><div class='ctx'> </div><div class='ctx'> #define DPM_OVERRIDE_DISABLE_SOCCLK_PID             0x00000001</div><div class='ctx'> #define DPM_OVERRIDE_DISABLE_UCLK_PID               0x00000002</div><div class='head'>diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c<br/>index a63e5f0dae56..ab7968c8f6a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/bridge/synopsys/dw-hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/bridge/synopsys/dw-hdmi.c</a></div><div class='hunk'>@@ -1037,6 +1037,35 @@ void dw_hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dw_hdmi_phy_i2c_write);</div><div class='ctx'> </div><div class='add'>+/* Filter out invalid setups to avoid configuring SCDC and scrambling */</div><div class='add'>+static bool dw_hdmi_support_scdc(struct dw_hdmi *hdmi)</div><div class='add'>+{</div><div class='add'>+	struct drm_display_info *display = &amp;hdmi-&gt;connector.display_info;</div><div class='add'>+</div><div class='add'>+	/* Completely disable SCDC support for older controllers */</div><div class='add'>+	if (hdmi-&gt;version &lt; 0x200a)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Disable if no DDC bus */</div><div class='add'>+	if (!hdmi-&gt;ddc)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Disable if SCDC is not supported, or if an HF-VSDB block is absent */</div><div class='add'>+	if (!display-&gt;hdmi.scdc.supported ||</div><div class='add'>+	    !display-&gt;hdmi.scdc.scrambling.supported)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable if display only support low TMDS rates and scrambling</div><div class='add'>+	 * for low rates is not supported either</div><div class='add'>+	 */</div><div class='add'>+	if (!display-&gt;hdmi.scdc.scrambling.low_rates &amp;&amp;</div><div class='add'>+	    display-&gt;max_tmds_clock &lt;= 340000)</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='ctx'> /*</div><div class='ctx'>  * HDMI2.0 Specifies the following procedure for High TMDS Bit Rates:</div><div class='ctx'>  * - The Source shall suspend transmission of the TMDS clock and data</div><div class='hunk'>@@ -1055,7 +1084,7 @@ void dw_hdmi_set_high_tmds_clock_ratio(struct dw_hdmi *hdmi)</div><div class='ctx'> 	unsigned long mtmdsclock = hdmi-&gt;hdmi_data.video_mode.mtmdsclock;</div><div class='ctx'> </div><div class='ctx'> 	/* Control for TMDS Bit Period/TMDS Clock-Period Ratio */</div><div class='del'>-	if (hdmi-&gt;connector.display_info.hdmi.scdc.supported) {</div><div class='add'>+	if (dw_hdmi_support_scdc(hdmi)) {</div><div class='ctx'> 		if (mtmdsclock &gt; HDMI14_MAX_TMDSCLK)</div><div class='ctx'> 			drm_scdc_set_high_tmds_clock_ratio(hdmi-&gt;ddc, 1);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1579,8 +1608,9 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,</div><div class='ctx'> </div><div class='ctx'> 	/* Set up HDMI_FC_INVIDCONF */</div><div class='ctx'> 	inv_val = (hdmi-&gt;hdmi_data.hdcp_enable ||</div><div class='del'>-		   vmode-&gt;mtmdsclock &gt; HDMI14_MAX_TMDSCLK ||</div><div class='del'>-		   hdmi_info-&gt;scdc.scrambling.low_rates ?</div><div class='add'>+		   (dw_hdmi_support_scdc(hdmi) &amp;&amp;</div><div class='add'>+		    (vmode-&gt;mtmdsclock &gt; HDMI14_MAX_TMDSCLK ||</div><div class='add'>+		     hdmi_info-&gt;scdc.scrambling.low_rates)) ?</div><div class='ctx'> 		HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE :</div><div class='ctx'> 		HDMI_FC_INVIDCONF_HDCP_KEEPOUT_INACTIVE);</div><div class='ctx'> </div><div class='hunk'>@@ -1646,7 +1676,7 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Scrambling Control */</div><div class='del'>-	if (hdmi_info-&gt;scdc.supported) {</div><div class='add'>+	if (dw_hdmi_support_scdc(hdmi)) {</div><div class='ctx'> 		if (vmode-&gt;mtmdsclock &gt; HDMI14_MAX_TMDSCLK ||</div><div class='ctx'> 		    hdmi_info-&gt;scdc.scrambling.low_rates) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1658,13 +1688,13 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,</div><div class='ctx'> 			 * Source Devices compliant shall set the</div><div class='ctx'> 			 * Source Version = 1.</div><div class='ctx'> 			 */</div><div class='del'>-			drm_scdc_readb(&amp;hdmi-&gt;i2c-&gt;adap, SCDC_SINK_VERSION,</div><div class='add'>+			drm_scdc_readb(hdmi-&gt;ddc, SCDC_SINK_VERSION,</div><div class='ctx'> 				       &amp;bytes);</div><div class='del'>-			drm_scdc_writeb(&amp;hdmi-&gt;i2c-&gt;adap, SCDC_SOURCE_VERSION,</div><div class='add'>+			drm_scdc_writeb(hdmi-&gt;ddc, SCDC_SOURCE_VERSION,</div><div class='ctx'> 				min_t(u8, bytes, SCDC_MIN_SOURCE_VERSION));</div><div class='ctx'> </div><div class='ctx'> 			/* Enabled Scrambling in the Sink */</div><div class='del'>-			drm_scdc_set_scrambling(&amp;hdmi-&gt;i2c-&gt;adap, 1);</div><div class='add'>+			drm_scdc_set_scrambling(hdmi-&gt;ddc, 1);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * To activate the scrambler feature, you must ensure</div><div class='hunk'>@@ -1680,7 +1710,7 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,</div><div class='ctx'> 			hdmi_writeb(hdmi, 0, HDMI_FC_SCRAMBLER_CTRL);</div><div class='ctx'> 			hdmi_writeb(hdmi, (u8)~HDMI_MC_SWRSTZ_TMDSSWRST_REQ,</div><div class='ctx'> 				    HDMI_MC_SWRSTZ);</div><div class='del'>-			drm_scdc_set_scrambling(&amp;hdmi-&gt;i2c-&gt;adap, 0);</div><div class='add'>+			drm_scdc_set_scrambling(hdmi-&gt;ddc, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1774,6 +1804,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)</div><div class='ctx'> 	 * iteration for others.</div><div class='ctx'> 	 * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing</div><div class='ctx'> 	 * the workaround with a single iteration.</div><div class='add'>+	 * The Rockchip RK3288 SoC (v2.00a) and RK3328/RK3399 SoCs (v2.11a) have</div><div class='add'>+	 * been identified as needing the workaround with a single iteration.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	switch (hdmi-&gt;version) {</div><div class='hunk'>@@ -1782,7 +1814,9 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x131a:</div><div class='ctx'> 	case 0x132a:</div><div class='add'>+	case 0x200a:</div><div class='ctx'> 	case 0x201a:</div><div class='add'>+	case 0x211a:</div><div class='ctx'> 	case 0x212a:</div><div class='ctx'> 		count = 1;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c<br/>index 40ac19848034..fbb76332cc9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_atomic_helper.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_atomic_helper.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_atomic_helper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/drm_atomic_helper.c</a></div><div class='hunk'>@@ -1034,7 +1034,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)</div><div class='ctx'> 			funcs-&gt;atomic_disable(crtc, old_crtc_state);</div><div class='ctx'> 		else if (funcs-&gt;disable)</div><div class='ctx'> 			funcs-&gt;disable(crtc);</div><div class='del'>-		else</div><div class='add'>+		else if (funcs-&gt;dpms)</div><div class='ctx'> 			funcs-&gt;dpms(crtc, DRM_MODE_DPMS_OFF);</div><div class='ctx'> </div><div class='ctx'> 		if (!(dev-&gt;irq_enabled &amp;&amp; dev-&gt;num_crtcs))</div><div class='hunk'>@@ -1277,10 +1277,9 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,</div><div class='ctx'> 		if (new_crtc_state-&gt;enable) {</div><div class='ctx'> 			DRM_DEBUG_ATOMIC("enabling [CRTC:%d:%s]\n",</div><div class='ctx'> 					 crtc-&gt;base.id, crtc-&gt;name);</div><div class='del'>-</div><div class='ctx'> 			if (funcs-&gt;atomic_enable)</div><div class='ctx'> 				funcs-&gt;atomic_enable(crtc, old_crtc_state);</div><div class='del'>-			else</div><div class='add'>+			else if (funcs-&gt;commit)</div><div class='ctx'> 				funcs-&gt;commit(crtc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c<br/>index 381581b01d48..05bbc2b622fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/drm_drv.c</a></div><div class='hunk'>@@ -376,11 +376,7 @@ void drm_dev_unplug(struct drm_device *dev)</div><div class='ctx'> 	synchronize_srcu(&amp;drm_unplug_srcu);</div><div class='ctx'> </div><div class='ctx'> 	drm_dev_unregister(dev);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;drm_global_mutex);</div><div class='del'>-	if (dev-&gt;open_count == 0)</div><div class='del'>-		drm_dev_put(dev);</div><div class='del'>-	mutex_unlock(&amp;drm_global_mutex);</div><div class='add'>+	drm_dev_put(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(drm_dev_unplug);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c<br/>index 0e9349ff2d16..af2ab640cadb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_fb_helper.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_fb_helper.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_fb_helper.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/drm_fb_helper.c</a></div><div class='hunk'>@@ -1963,7 +1963,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,</div><div class='ctx'> 				best_depth = fmt-&gt;depth;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (sizes.surface_depth != best_depth) {</div><div class='add'>+	if (sizes.surface_depth != best_depth &amp;&amp; best_depth) {</div><div class='ctx'> 		DRM_INFO("requested bpp %d, scaled depth down to %d",</div><div class='ctx'> 			 sizes.surface_bpp, best_depth);</div><div class='ctx'> 		sizes.surface_depth = best_depth;</div><div class='head'>diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c<br/>index 83a5bbca6e7e..7caa3c7ed978 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_file.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_file.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/drm_file.c</a></div><div class='hunk'>@@ -489,11 +489,9 @@ int drm_release(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	drm_close_helper(filp);</div><div class='ctx'> </div><div class='del'>-	if (!--dev-&gt;open_count) {</div><div class='add'>+	if (!--dev-&gt;open_count)</div><div class='ctx'> 		drm_lastclose(dev);</div><div class='del'>-		if (drm_dev_is_unplugged(dev))</div><div class='del'>-			drm_put_dev(dev);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;drm_global_mutex);</div><div class='ctx'> </div><div class='ctx'> 	drm_minor_release(minor);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c<br/>index 2b4f373736c7..8b4cd31ce7bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_mm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_mm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_mm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/drm_mm.c</a></div><div class='hunk'>@@ -106,25 +106,19 @@</div><div class='ctx'> static noinline void save_stack(struct drm_mm_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long entries[STACKDEPTH];</div><div class='del'>-	struct stack_trace trace = {</div><div class='del'>-		.entries = entries,</div><div class='del'>-		.max_entries = STACKDEPTH,</div><div class='del'>-		.skip = 1</div><div class='del'>-	};</div><div class='add'>+	unsigned int n;</div><div class='ctx'> </div><div class='del'>-	save_stack_trace(&amp;trace);</div><div class='del'>-	if (trace.nr_entries != 0 &amp;&amp;</div><div class='del'>-	    trace.entries[trace.nr_entries-1] == ULONG_MAX)</div><div class='del'>-		trace.nr_entries--;</div><div class='add'>+	n = stack_trace_save(entries, ARRAY_SIZE(entries), 1);</div><div class='ctx'> </div><div class='ctx'> 	/* May be called under spinlock, so avoid sleeping */</div><div class='del'>-	node-&gt;stack = depot_save_stack(&amp;trace, GFP_NOWAIT);</div><div class='add'>+	node-&gt;stack = stack_depot_save(entries, n, GFP_NOWAIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void show_leaks(struct drm_mm *mm)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_mm_node *node;</div><div class='del'>-	unsigned long entries[STACKDEPTH];</div><div class='add'>+	unsigned long *entries;</div><div class='add'>+	unsigned int nr_entries;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> </div><div class='ctx'> 	buf = kmalloc(BUFSZ, GFP_KERNEL);</div><div class='hunk'>@@ -132,19 +126,14 @@ static void show_leaks(struct drm_mm *mm)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(node, drm_mm_nodes(mm), node_list) {</div><div class='del'>-		struct stack_trace trace = {</div><div class='del'>-			.entries = entries,</div><div class='del'>-			.max_entries = STACKDEPTH</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		if (!node-&gt;stack) {</div><div class='ctx'> 			DRM_ERROR("node [%08llx + %08llx]: unknown owner\n",</div><div class='ctx'> 				  node-&gt;start, node-&gt;size);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		depot_fetch_stack(node-&gt;stack, &amp;trace);</div><div class='del'>-		snprint_stack_trace(buf, BUFSZ, &amp;trace, 0);</div><div class='add'>+		nr_entries = stack_depot_fetch(node-&gt;stack, &amp;entries);</div><div class='add'>+		stack_trace_snprint(buf, BUFSZ, entries, nr_entries, 0);</div><div class='ctx'> 		DRM_ERROR("node [%08llx + %08llx]: inserted at\n%s",</div><div class='ctx'> 			  node-&gt;start, node-&gt;size, buf);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c<br/>index e19525af0cce..8bdb4a3bd7bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_syncobj.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/drm_syncobj.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/drm_syncobj.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/drm_syncobj.c</a></div><div class='hunk'>@@ -388,20 +388,19 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,</div><div class='ctx'> 				    int fd, u32 *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_syncobj *syncobj;</div><div class='del'>-	struct file *file;</div><div class='add'>+	struct fd f = fdget(fd);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	file = fget(fd);</div><div class='del'>-	if (!file)</div><div class='add'>+	if (!f.file)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (file-&gt;f_op != &amp;drm_syncobj_file_fops) {</div><div class='del'>-		fput(file);</div><div class='add'>+	if (f.file-&gt;f_op != &amp;drm_syncobj_file_fops) {</div><div class='add'>+		fdput(f);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* take a reference to put in the idr */</div><div class='del'>-	syncobj = file-&gt;private_data;</div><div class='add'>+	syncobj = f.file-&gt;private_data;</div><div class='ctx'> 	drm_syncobj_get(syncobj);</div><div class='ctx'> </div><div class='ctx'> 	idr_preload(GFP_KERNEL);</div><div class='hunk'>@@ -416,7 +415,7 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,</div><div class='ctx'> 	} else</div><div class='ctx'> 		drm_syncobj_put(syncobj);</div><div class='ctx'> </div><div class='del'>-	fput(file);</div><div class='add'>+	fdput(f);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c<br/>index 0573eab0e190..f35e4ab55b27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/exynos/exynos_mixer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/exynos/exynos_mixer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/exynos/exynos_mixer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/exynos/exynos_mixer.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include "regs-vp.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -352,15 +353,62 @@ static void mixer_cfg_vp_blend(struct mixer_context *ctx, unsigned int alpha)</div><div class='ctx'> 	mixer_reg_write(ctx, MXR_VIDEO_CFG, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mixer_vsync_set_update(struct mixer_context *ctx, bool enable)</div><div class='add'>+static bool mixer_is_synced(struct mixer_context *ctx)</div><div class='ctx'> {</div><div class='del'>-	/* block update on vsync */</div><div class='del'>-	mixer_reg_writemask(ctx, MXR_STATUS, enable ?</div><div class='del'>-			MXR_STATUS_SYNC_ENABLE : 0, MXR_STATUS_SYNC_ENABLE);</div><div class='add'>+	u32 base, shadow;</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;mxr_ver == MXR_VER_16_0_33_0 ||</div><div class='add'>+	    ctx-&gt;mxr_ver == MXR_VER_128_0_0_184)</div><div class='add'>+		return !(mixer_reg_read(ctx, MXR_CFG) &amp;</div><div class='add'>+			 MXR_CFG_LAYER_UPDATE_COUNT_MASK);</div><div class='add'>+</div><div class='add'>+	if (test_bit(MXR_BIT_VP_ENABLED, &amp;ctx-&gt;flags) &amp;&amp;</div><div class='add'>+	    vp_reg_read(ctx, VP_SHADOW_UPDATE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	base = mixer_reg_read(ctx, MXR_CFG);</div><div class='add'>+	shadow = mixer_reg_read(ctx, MXR_CFG_S);</div><div class='add'>+	if (base != shadow)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(0));</div><div class='add'>+	shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(0));</div><div class='add'>+	if (base != shadow)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(1));</div><div class='add'>+	shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(1));</div><div class='add'>+	if (base != shadow)</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 mixer_wait_for_sync(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	ktime_t timeout = ktime_add_us(ktime_get(), 100000);</div><div class='add'>+</div><div class='add'>+	while (!mixer_is_synced(ctx)) {</div><div class='add'>+		usleep_range(1000, 2000);</div><div class='add'>+		if (ktime_compare(ktime_get(), timeout) &gt; 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'>+static void mixer_disable_sync(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	mixer_reg_writemask(ctx, MXR_STATUS, 0, MXR_STATUS_SYNC_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_enable_sync(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	if (ctx-&gt;mxr_ver == MXR_VER_16_0_33_0 ||</div><div class='add'>+	    ctx-&gt;mxr_ver == MXR_VER_128_0_0_184)</div><div class='add'>+		mixer_reg_writemask(ctx, MXR_CFG, ~0, MXR_CFG_LAYER_UPDATE);</div><div class='add'>+	mixer_reg_writemask(ctx, MXR_STATUS, ~0, MXR_STATUS_SYNC_ENABLE);</div><div class='ctx'> 	if (test_bit(MXR_BIT_VP_ENABLED, &amp;ctx-&gt;flags))</div><div class='del'>-		vp_reg_write(ctx, VP_SHADOW_UPDATE, enable ?</div><div class='del'>-			VP_SHADOW_UPDATE_ENABLE : 0);</div><div class='add'>+		vp_reg_write(ctx, VP_SHADOW_UPDATE, VP_SHADOW_UPDATE_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mixer_cfg_scan(struct mixer_context *ctx, int width, int height)</div><div class='hunk'>@@ -498,7 +546,6 @@ static void vp_video_buffer(struct mixer_context *ctx,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ctx-&gt;reg_slock, flags);</div><div class='ctx'> </div><div class='del'>-	vp_reg_write(ctx, VP_SHADOW_UPDATE, 1);</div><div class='ctx'> 	/* interlace or progressive scan mode */</div><div class='ctx'> 	val = (test_bit(MXR_BIT_INTERLACE, &amp;ctx-&gt;flags) ? ~0 : 0);</div><div class='ctx'> 	vp_reg_writemask(ctx, VP_MODE, val, VP_MODE_LINE_SKIP);</div><div class='hunk'>@@ -553,11 +600,6 @@ static void vp_video_buffer(struct mixer_context *ctx,</div><div class='ctx'> 	vp_regs_dump(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mixer_layer_update(struct mixer_context *ctx)</div><div class='del'>-{</div><div class='del'>-	mixer_reg_writemask(ctx, MXR_CFG, ~0, MXR_CFG_LAYER_UPDATE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mixer_graph_buffer(struct mixer_context *ctx,</div><div class='ctx'> 			       struct exynos_drm_plane *plane)</div><div class='ctx'> {</div><div class='hunk'>@@ -640,11 +682,6 @@ static void mixer_graph_buffer(struct mixer_context *ctx,</div><div class='ctx'> 	mixer_cfg_layer(ctx, win, priority, true);</div><div class='ctx'> 	mixer_cfg_gfx_blend(ctx, win, pixel_alpha, state-&gt;base.alpha);</div><div class='ctx'> </div><div class='del'>-	/* layer update mandatory for mixer 16.0.33.0 */</div><div class='del'>-	if (ctx-&gt;mxr_ver == MXR_VER_16_0_33_0 ||</div><div class='del'>-		ctx-&gt;mxr_ver == MXR_VER_128_0_0_184)</div><div class='del'>-		mixer_layer_update(ctx);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctx-&gt;reg_slock, flags);</div><div class='ctx'> </div><div class='ctx'> 	mixer_regs_dump(ctx);</div><div class='hunk'>@@ -709,7 +746,7 @@ static void mixer_win_reset(struct mixer_context *ctx)</div><div class='ctx'> static irqreturn_t mixer_irq_handler(int irq, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mixer_context *ctx = arg;</div><div class='del'>-	u32 val, base, shadow;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;reg_slock);</div><div class='ctx'> </div><div class='hunk'>@@ -723,26 +760,9 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg)</div><div class='ctx'> 		val &amp;= ~MXR_INT_STATUS_VSYNC;</div><div class='ctx'> </div><div class='ctx'> 		/* interlace scan need to check shadow register */</div><div class='del'>-		if (test_bit(MXR_BIT_INTERLACE, &amp;ctx-&gt;flags)) {</div><div class='del'>-			if (test_bit(MXR_BIT_VP_ENABLED, &amp;ctx-&gt;flags) &amp;&amp;</div><div class='del'>-			    vp_reg_read(ctx, VP_SHADOW_UPDATE))</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			base = mixer_reg_read(ctx, MXR_CFG);</div><div class='del'>-			shadow = mixer_reg_read(ctx, MXR_CFG_S);</div><div class='del'>-			if (base != shadow)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(0));</div><div class='del'>-			shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(0));</div><div class='del'>-			if (base != shadow)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(1));</div><div class='del'>-			shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(1));</div><div class='del'>-			if (base != shadow)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='add'>+		if (test_bit(MXR_BIT_INTERLACE, &amp;ctx-&gt;flags)</div><div class='add'>+		    &amp;&amp; !mixer_is_synced(ctx))</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		drm_crtc_handle_vblank(&amp;ctx-&gt;crtc-&gt;base);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -917,12 +937,14 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc)</div><div class='ctx'> </div><div class='ctx'> static void mixer_atomic_begin(struct exynos_drm_crtc *crtc)</div><div class='ctx'> {</div><div class='del'>-	struct mixer_context *mixer_ctx = crtc-&gt;ctx;</div><div class='add'>+	struct mixer_context *ctx = crtc-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MXR_BIT_POWERED, &amp;mixer_ctx-&gt;flags))</div><div class='add'>+	if (!test_bit(MXR_BIT_POWERED, &amp;ctx-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mixer_vsync_set_update(mixer_ctx, false);</div><div class='add'>+	if (mixer_wait_for_sync(ctx))</div><div class='add'>+		dev_err(ctx-&gt;dev, "timeout waiting for VSYNC\n");</div><div class='add'>+	mixer_disable_sync(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mixer_update_plane(struct exynos_drm_crtc *crtc,</div><div class='hunk'>@@ -964,7 +986,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc)</div><div class='ctx'> 	if (!test_bit(MXR_BIT_POWERED, &amp;mixer_ctx-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mixer_vsync_set_update(mixer_ctx, true);</div><div class='add'>+	mixer_enable_sync(mixer_ctx);</div><div class='ctx'> 	exynos_crtc_handle_event(crtc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -979,7 +1001,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)</div><div class='ctx'> </div><div class='ctx'> 	exynos_drm_pipe_clk_enable(crtc, true);</div><div class='ctx'> </div><div class='del'>-	mixer_vsync_set_update(ctx, false);</div><div class='add'>+	mixer_disable_sync(ctx);</div><div class='ctx'> </div><div class='ctx'> 	mixer_reg_writemask(ctx, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);</div><div class='ctx'> </div><div class='hunk'>@@ -992,7 +1014,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)</div><div class='ctx'> </div><div class='ctx'> 	mixer_commit(ctx);</div><div class='ctx'> </div><div class='del'>-	mixer_vsync_set_update(ctx, true);</div><div class='add'>+	mixer_enable_sync(ctx);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MXR_BIT_POWERED, &amp;ctx-&gt;flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c<br/>index 35b4ec3f7618..3592d04c33b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/cmd_parser.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/cmd_parser.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/cmd_parser.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/cmd_parser.c</a></div><div class='hunk'>@@ -1441,7 +1441,7 @@ static inline int cmd_address_audit(struct parser_exec_state *s,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (index_mode)	{</div><div class='del'>-		if (guest_gma &gt;= I915_GTT_PAGE_SIZE / sizeof(u64)) {</div><div class='add'>+		if (guest_gma &gt;= I915_GTT_PAGE_SIZE) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c<br/>index 035479e273be..e3f9caa7839f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/display.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/display.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/display.c</a></div><div class='hunk'>@@ -448,7 +448,7 @@ void intel_gvt_emulate_vblank(struct intel_gvt *gvt)</div><div class='ctx'> /**</div><div class='ctx'>  * intel_vgpu_emulate_hotplug - trigger hotplug event for vGPU</div><div class='ctx'>  * @vgpu: a vGPU</div><div class='del'>- * @conncted: link state</div><div class='add'>+ * @connected: link state</div><div class='ctx'>  *</div><div class='ctx'>  * This function is used to trigger hotplug interrupt for vGPU</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c<br/>index 3e7e2b80c857..69a9a1b2ea4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/dmabuf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/dmabuf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/dmabuf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/dmabuf.c</a></div><div class='hunk'>@@ -209,7 +209,7 @@ static int vgpu_get_plane_info(struct drm_device *dev,</div><div class='ctx'> 	struct drm_i915_private *dev_priv = to_i915(dev);</div><div class='ctx'> 	struct intel_vgpu_primary_plane_format p;</div><div class='ctx'> 	struct intel_vgpu_cursor_plane_format c;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, tile_height = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (plane_id == DRM_PLANE_TYPE_PRIMARY) {</div><div class='ctx'> 		ret = intel_vgpu_decode_primary_plane(vgpu, &amp;p);</div><div class='hunk'>@@ -228,19 +228,19 @@ static int vgpu_get_plane_info(struct drm_device *dev,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PLANE_CTL_TILED_X:</div><div class='ctx'> 			info-&gt;drm_format_mod = I915_FORMAT_MOD_X_TILED;</div><div class='add'>+			tile_height = 8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PLANE_CTL_TILED_Y:</div><div class='ctx'> 			info-&gt;drm_format_mod = I915_FORMAT_MOD_Y_TILED;</div><div class='add'>+			tile_height = 32;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PLANE_CTL_TILED_YF:</div><div class='ctx'> 			info-&gt;drm_format_mod = I915_FORMAT_MOD_Yf_TILED;</div><div class='add'>+			tile_height = 32;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			gvt_vgpu_err("invalid tiling mode: %x\n", p.tiled);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		info-&gt;size = (((p.stride * p.height * p.bpp) / 8) +</div><div class='del'>-			      (PAGE_SIZE - 1)) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	} else if (plane_id == DRM_PLANE_TYPE_CURSOR) {</div><div class='ctx'> 		ret = intel_vgpu_decode_cursor_plane(vgpu, &amp;c);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -262,14 +262,13 @@ static int vgpu_get_plane_info(struct drm_device *dev,</div><div class='ctx'> 			info-&gt;x_hot = UINT_MAX;</div><div class='ctx'> 			info-&gt;y_hot = UINT_MAX;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		info-&gt;size = (((info-&gt;stride * c.height * c.bpp) / 8)</div><div class='del'>-				+ (PAGE_SIZE - 1)) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		gvt_vgpu_err("invalid plane id:%d\n", plane_id);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	info-&gt;size = (info-&gt;stride * roundup(info-&gt;height, tile_height)</div><div class='add'>+		      + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	if (info-&gt;size == 0) {</div><div class='ctx'> 		gvt_vgpu_err("fb size is zero\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c<br/>index c7103dd2d8d5..9814773882ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/gtt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/gtt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/gtt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/gtt.c</a></div><div class='hunk'>@@ -750,14 +750,20 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)</div><div class='ctx'> </div><div class='ctx'> static void ppgtt_free_all_spt(struct intel_vgpu *vgpu)</div><div class='ctx'> {</div><div class='del'>-	struct intel_vgpu_ppgtt_spt *spt;</div><div class='add'>+	struct intel_vgpu_ppgtt_spt *spt, *spn;</div><div class='ctx'> 	struct radix_tree_iter iter;</div><div class='del'>-	void **slot;</div><div class='add'>+	LIST_HEAD(all_spt);</div><div class='add'>+	void __rcu **slot;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	radix_tree_for_each_slot(slot, &amp;vgpu-&gt;gtt.spt_tree, &amp;iter, 0) {</div><div class='ctx'> 		spt = radix_tree_deref_slot(slot);</div><div class='del'>-		ppgtt_free_spt(spt);</div><div class='add'>+		list_move(&amp;spt-&gt;post_shadow_list, &amp;all_spt);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(spt, spn, &amp;all_spt, post_shadow_list)</div><div class='add'>+		ppgtt_free_spt(spt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ppgtt_handle_guest_write_page_table_bytes(</div><div class='hunk'>@@ -1882,7 +1888,11 @@ struct intel_vgpu_mm *intel_vgpu_create_ppgtt_mm(struct intel_vgpu *vgpu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;mm-&gt;ppgtt_mm.list, &amp;vgpu-&gt;gtt.ppgtt_mm_list_head);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 	list_add_tail(&amp;mm-&gt;ppgtt_mm.lru_list, &amp;gvt-&gt;gtt.ppgtt_mm_lru_list_head);</div><div class='add'>+	mutex_unlock(&amp;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='add'>+</div><div class='ctx'> 	return mm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1942,7 +1952,7 @@ void _intel_vgpu_mm_release(struct kref *mm_ref)</div><div class='ctx'>  */</div><div class='ctx'> void intel_vgpu_unpin_mm(struct intel_vgpu_mm *mm)</div><div class='ctx'> {</div><div class='del'>-	atomic_dec(&amp;mm-&gt;pincount);</div><div class='add'>+	atomic_dec_if_positive(&amp;mm-&gt;pincount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1967,9 +1977,10 @@ int intel_vgpu_pin_mm(struct intel_vgpu_mm *mm)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='add'>+		mutex_lock(&amp;mm-&gt;vgpu-&gt;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 		list_move_tail(&amp;mm-&gt;ppgtt_mm.lru_list,</div><div class='ctx'> 			       &amp;mm-&gt;vgpu-&gt;gvt-&gt;gtt.ppgtt_mm_lru_list_head);</div><div class='del'>-</div><div class='add'>+		mutex_unlock(&amp;mm-&gt;vgpu-&gt;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1980,6 +1991,8 @@ static int reclaim_one_ppgtt_mm(struct intel_gvt *gvt)</div><div class='ctx'> 	struct intel_vgpu_mm *mm;</div><div class='ctx'> 	struct list_head *pos, *n;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_safe(pos, n, &amp;gvt-&gt;gtt.ppgtt_mm_lru_list_head) {</div><div class='ctx'> 		mm = container_of(pos, struct intel_vgpu_mm, ppgtt_mm.lru_list);</div><div class='ctx'> </div><div class='hunk'>@@ -1987,9 +2000,11 @@ static int reclaim_one_ppgtt_mm(struct intel_gvt *gvt)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		list_del_init(&amp;mm-&gt;ppgtt_mm.lru_list);</div><div class='add'>+		mutex_unlock(&amp;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 		invalidate_ppgtt_mm(mm);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2659,6 +2674,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;gvt-&gt;gtt.ppgtt_mm_lru_list_head);</div><div class='add'>+	mutex_init(&amp;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2699,7 +2715,9 @@ void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu)</div><div class='ctx'> 	list_for_each_safe(pos, n, &amp;vgpu-&gt;gtt.ppgtt_mm_list_head) {</div><div class='ctx'> 		mm = container_of(pos, struct intel_vgpu_mm, ppgtt_mm.list);</div><div class='ctx'> 		if (mm-&gt;type == INTEL_GVT_MM_PPGTT) {</div><div class='add'>+			mutex_lock(&amp;vgpu-&gt;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 			list_del_init(&amp;mm-&gt;ppgtt_mm.lru_list);</div><div class='add'>+			mutex_unlock(&amp;vgpu-&gt;gvt-&gt;gtt.ppgtt_mm_lock);</div><div class='ctx'> 			if (mm-&gt;ppgtt_mm.shadowed)</div><div class='ctx'> 				invalidate_ppgtt_mm(mm);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h<br/>index d8cb04cc946d..edb610dc5d86 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/gtt.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/gtt.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/gtt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/gtt.h</a></div><div class='hunk'>@@ -88,6 +88,7 @@ struct intel_gvt_gtt {</div><div class='ctx'> 	void (*mm_free_page_table)(struct intel_vgpu_mm *mm);</div><div class='ctx'> 	struct list_head oos_page_use_list_head;</div><div class='ctx'> 	struct list_head oos_page_free_list_head;</div><div class='add'>+	struct mutex ppgtt_mm_lock;</div><div class='ctx'> 	struct list_head ppgtt_mm_lru_list_head;</div><div class='ctx'> </div><div class='ctx'> 	struct page *scratch_page;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c<br/>index d5fcc447d22f..a68addf95c23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/kvmgt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/kvmgt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/kvmgt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/kvmgt.c</a></div><div class='hunk'>@@ -905,7 +905,7 @@ static inline bool intel_vgpu_in_aperture(struct intel_vgpu *vgpu, u64 off)</div><div class='ctx'> static int intel_vgpu_aperture_rw(struct intel_vgpu *vgpu, u64 off,</div><div class='ctx'> 		void *buf, unsigned long count, bool is_write)</div><div class='ctx'> {</div><div class='del'>-	void *aperture_va;</div><div class='add'>+	void __iomem *aperture_va;</div><div class='ctx'> </div><div class='ctx'> 	if (!intel_vgpu_in_aperture(vgpu, off) ||</div><div class='ctx'> 	    !intel_vgpu_in_aperture(vgpu, off + count)) {</div><div class='hunk'>@@ -920,9 +920,9 @@ static int intel_vgpu_aperture_rw(struct intel_vgpu *vgpu, u64 off,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (is_write)</div><div class='del'>-		memcpy(aperture_va + offset_in_page(off), buf, count);</div><div class='add'>+		memcpy_toio(aperture_va + offset_in_page(off), buf, count);</div><div class='ctx'> 	else</div><div class='del'>-		memcpy(buf, aperture_va + offset_in_page(off), count);</div><div class='add'>+		memcpy_fromio(buf, aperture_va + offset_in_page(off), count);</div><div class='ctx'> </div><div class='ctx'> 	io_mapping_unmap(aperture_va);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c<br/>index 7d84cfb9051a..7902fb162d09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/mmio_context.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/mmio_context.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/mmio_context.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/mmio_context.c</a></div><div class='hunk'>@@ -132,6 +132,7 @@ static struct engine_mmio gen9_engine_mmio_list[] __cacheline_aligned = {</div><div class='ctx'> </div><div class='ctx'> 	{RCS, GEN9_GAMT_ECO_REG_RW_IA, 0x0, false}, /* 0x4ab0 */</div><div class='ctx'> 	{RCS, GEN9_CSFE_CHICKEN1_RCS, 0xffff, false}, /* 0x20d4 */</div><div class='add'>+	{RCS, _MMIO(0x20D8), 0xffff, true}, /* 0x20d8 */</div><div class='ctx'> </div><div class='ctx'> 	{RCS, GEN8_GARBCNTL, 0x0, false}, /* 0xb004 */</div><div class='ctx'> 	{RCS, GEN7_FF_THREAD_MODE, 0x0, false}, /* 0x20a0 */</div><div class='head'>diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c<br/>index 1bb8f936fdaa..05b953793316 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/scheduler.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/gvt/scheduler.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/gvt/scheduler.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/gvt/scheduler.c</a></div><div class='hunk'>@@ -346,7 +346,7 @@ static int set_context_ppgtt_from_shadow(struct intel_vgpu_workload *workload,</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mm-&gt;type != INTEL_GVT_MM_PPGTT || !mm-&gt;ppgtt_mm.shadowed)</div><div class='del'>-		return -1;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (mm-&gt;ppgtt_mm.root_entry_type == GTT_TYPE_PPGTT_ROOT_L4_ENTRY) {</div><div class='ctx'> 		px_dma(&amp;ppgtt-&gt;pml4) = mm-&gt;ppgtt_mm.shadow_pdps[0];</div><div class='hunk'>@@ -410,12 +410,6 @@ int intel_gvt_scan_and_shadow_workload(struct intel_vgpu_workload *workload)</div><div class='ctx'> 	if (workload-&gt;shadow)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = set_context_ppgtt_from_shadow(workload, shadow_ctx);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		gvt_vgpu_err("workload shadow ppgtt isn't ready\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* pin shadow context by gvt even the shadow context will be pinned</div><div class='ctx'> 	 * when i915 alloc request. That is because gvt will update the guest</div><div class='ctx'> 	 * context from shadow context when workload is completed, and at that</div><div class='hunk'>@@ -678,6 +672,9 @@ static int dispatch_workload(struct intel_vgpu_workload *workload)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel_vgpu *vgpu = workload-&gt;vgpu;</div><div class='ctx'> 	struct drm_i915_private *dev_priv = vgpu-&gt;gvt-&gt;dev_priv;</div><div class='add'>+	struct intel_vgpu_submission *s = &amp;vgpu-&gt;submission;</div><div class='add'>+	struct i915_gem_context *shadow_ctx = s-&gt;shadow_ctx;</div><div class='add'>+	struct i915_request *rq;</div><div class='ctx'> 	int ring_id = workload-&gt;ring_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -687,6 +684,12 @@ static int dispatch_workload(struct intel_vgpu_workload *workload)</div><div class='ctx'> 	mutex_lock(&amp;vgpu-&gt;vgpu_lock);</div><div class='ctx'> 	mutex_lock(&amp;dev_priv-&gt;drm.struct_mutex);</div><div class='ctx'> </div><div class='add'>+	ret = set_context_ppgtt_from_shadow(workload, shadow_ctx);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		gvt_vgpu_err("workload shadow ppgtt isn't ready\n");</div><div class='add'>+		goto err_req;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = intel_gvt_workload_req_alloc(workload);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_req;</div><div class='hunk'>@@ -703,6 +706,14 @@ static int dispatch_workload(struct intel_vgpu_workload *workload)</div><div class='ctx'> </div><div class='ctx'> 	ret = prepare_workload(workload);</div><div class='ctx'> out:</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* We might still need to add request with</div><div class='add'>+		 * clean ctx to retire it properly..</div><div class='add'>+		 */</div><div class='add'>+		rq = fetch_and_zero(&amp;workload-&gt;req);</div><div class='add'>+		i915_request_put(rq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(workload-&gt;req)) {</div><div class='ctx'> 		gvt_dbg_sched("ring id %d submit workload to i915 %p\n",</div><div class='ctx'> 				ring_id, workload-&gt;req);</div><div class='hunk'>@@ -739,7 +750,8 @@ static struct intel_vgpu_workload *pick_next_workload(</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (list_empty(workload_q_head(scheduler-&gt;current_vgpu, ring_id)))</div><div class='add'>+	if (!scheduler-&gt;current_vgpu-&gt;active ||</div><div class='add'>+	    list_empty(workload_q_head(scheduler-&gt;current_vgpu, ring_id)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1474,8 +1486,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id,</div><div class='ctx'> 		intel_runtime_pm_put_unchecked(dev_priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret &amp;&amp; (vgpu_is_vm_unhealthy(ret))) {</div><div class='del'>-		enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (vgpu_is_vm_unhealthy(ret))</div><div class='add'>+			enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);</div><div class='ctx'> 		intel_vgpu_destroy_workload(workload);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c<br/>index 0bd890c04fe4..f6f6e5b78e97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_debugfs.c</a></div><div class='hunk'>@@ -4830,7 +4830,10 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data)</div><div class='ctx'> 		ret = drm_modeset_lock(&amp;dev-&gt;mode_config.connection_mutex,</div><div class='ctx'> 				       &amp;ctx);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ret = -EINTR;</div><div class='add'>+			if (ret == -EDEADLK &amp;&amp; !drm_modeset_backoff(&amp;ctx)) {</div><div class='add'>+				try_again = true;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		crtc = connector-&gt;state-&gt;crtc;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h<br/>index 9adc7bb9e69c..a67a63b5aa84 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_drv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_drv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_drv.h</a></div><div class='hunk'>@@ -2346,7 +2346,8 @@ static inline unsigned int i915_sg_segment_size(void)</div><div class='ctx'> 				 INTEL_DEVID(dev_priv) == 0x5915 || \</div><div class='ctx'> 				 INTEL_DEVID(dev_priv) == 0x591E)</div><div class='ctx'> #define IS_AML_ULX(dev_priv)	(INTEL_DEVID(dev_priv) == 0x591C || \</div><div class='del'>-				 INTEL_DEVID(dev_priv) == 0x87C0)</div><div class='add'>+				 INTEL_DEVID(dev_priv) == 0x87C0 || \</div><div class='add'>+				 INTEL_DEVID(dev_priv) == 0x87CA)</div><div class='ctx'> #define IS_SKL_GT2(dev_priv)	(IS_SKYLAKE(dev_priv) &amp;&amp; \</div><div class='ctx'> 				 INTEL_INFO(dev_priv)-&gt;gt == 2)</div><div class='ctx'> #define IS_SKL_GT3(dev_priv)	(IS_SKYLAKE(dev_priv) &amp;&amp; \</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c<br/>index 30d516e975c6..3c724cc949a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_gem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_gem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_gem.c</a></div><div class='hunk'>@@ -1734,8 +1734,13 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 	 * pages from.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!obj-&gt;base.filp) {</div><div class='del'>-		i915_gem_object_put(obj);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		addr = -ENXIO;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (range_overflows(args-&gt;offset, args-&gt;size, (u64)obj-&gt;base.size)) {</div><div class='add'>+		addr = -EINVAL;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	addr = vm_mmap(obj-&gt;base.filp, 0, args-&gt;size,</div><div class='hunk'>@@ -1749,8 +1754,8 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 		struct vm_area_struct *vma;</div><div class='ctx'> </div><div class='ctx'> 		if (down_write_killable(&amp;mm-&gt;mmap_sem)) {</div><div class='del'>-			i915_gem_object_put(obj);</div><div class='del'>-			return -EINTR;</div><div class='add'>+			addr = -EINTR;</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> 		vma = find_vma(mm, addr);</div><div class='ctx'> 		if (vma &amp;&amp; __vma_matches(vma, obj-&gt;base.filp, addr, args-&gt;size))</div><div class='hunk'>@@ -1768,12 +1773,10 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 	i915_gem_object_put(obj);</div><div class='ctx'> </div><div class='ctx'> 	args-&gt;addr_ptr = (u64)addr;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	i915_gem_object_put(obj);</div><div class='del'>-</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4351,7 +4354,7 @@ static bool discard_backing_storage(struct drm_i915_gem_object *obj)</div><div class='ctx'> 	 * acquiring such a reference whilst we are in the middle of</div><div class='ctx'> 	 * freeing the object.</div><div class='ctx'> 	 */</div><div class='del'>-	return atomic_long_read(&amp;obj-&gt;base.filp-&gt;f_count) == 1;</div><div class='add'>+	return file_count(obj-&gt;base.filp) == 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __i915_gem_free_objects(struct drm_i915_private *i915,</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c<br/>index 02adcaf6ebea..16f80a448820 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_gem_execbuffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_gem_execbuffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_gem_execbuffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_gem_execbuffer.c</a></div><div class='hunk'>@@ -1667,6 +1667,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)</div><div class='ctx'> 					     len)) {</div><div class='ctx'> end_user:</div><div class='ctx'> 				user_access_end();</div><div class='add'>+end:</div><div class='ctx'> 				kvfree(relocs);</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				goto err;</div><div class='hunk'>@@ -1686,7 +1687,7 @@ end_user:</div><div class='ctx'> 		 * relocations were valid.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!user_access_begin(urelocs, size))</div><div class='del'>-			goto end_user;</div><div class='add'>+			goto end;</div><div class='ctx'> </div><div class='ctx'> 		for (copied = 0; copied &lt; nreloc; copied++)</div><div class='ctx'> 			unsafe_put_user(-1,</div><div class='hunk'>@@ -2695,7 +2696,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 		 * when we did the "copy_from_user()" above.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!user_access_begin(user_exec_list, count * sizeof(*user_exec_list)))</div><div class='del'>-			goto end_user;</div><div class='add'>+			goto end;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; args-&gt;buffer_count; i++) {</div><div class='ctx'> 			if (!(exec2_list[i].offset &amp; UPDATE))</div><div class='hunk'>@@ -2709,6 +2710,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 		}</div><div class='ctx'> end_user:</div><div class='ctx'> 		user_access_end();</div><div class='add'>+end:;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	args-&gt;flags &amp;= ~__I915_EXEC_UNKNOWN_FLAGS;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c<br/>index 9a65341fec09..aa6791255252 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_gpu_error.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_gpu_error.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_gpu_error.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_gpu_error.c</a></div><div class='hunk'>@@ -1721,7 +1721,7 @@ error_msg(struct i915_gpu_state *error, unsigned long engines, const char *msg)</div><div class='ctx'> 			i915_error_generate_code(error, engines));</div><div class='ctx'> 	if (engines) {</div><div class='ctx'> 		/* Just show the first executing process, more is confusing */</div><div class='del'>-		i = ffs(engines);</div><div class='add'>+		i = __ffs(engines);</div><div class='ctx'> 		len += scnprintf(error-&gt;error_msg + len,</div><div class='ctx'> 				 sizeof(error-&gt;error_msg) - len,</div><div class='ctx'> 				 ", in %s [%d]",</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h<br/>index 638a586469f9..047855dd8c6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_reg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_reg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_reg.h</a></div><div class='hunk'>@@ -2863,7 +2863,7 @@ enum i915_power_well_id {</div><div class='ctx'> #define GEN11_GT_VEBOX_VDBOX_DISABLE	_MMIO(0x9140)</div><div class='ctx'> #define   GEN11_GT_VDBOX_DISABLE_MASK	0xff</div><div class='ctx'> #define   GEN11_GT_VEBOX_DISABLE_SHIFT	16</div><div class='del'>-#define   GEN11_GT_VEBOX_DISABLE_MASK	(0xff &lt;&lt; GEN11_GT_VEBOX_DISABLE_SHIFT)</div><div class='add'>+#define   GEN11_GT_VEBOX_DISABLE_MASK	(0x0f &lt;&lt; GEN11_GT_VEBOX_DISABLE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define GEN11_EU_DISABLE _MMIO(0x9134)</div><div class='ctx'> #define GEN11_EU_DIS_MASK 0xFF</div><div class='hunk'>@@ -9243,7 +9243,7 @@ enum skl_power_gate {</div><div class='ctx'> #define TRANS_DDI_FUNC_CTL2(tran)	_MMIO_TRANS2(tran, \</div><div class='ctx'> 						     _TRANS_DDI_FUNC_CTL2_A)</div><div class='ctx'> #define  PORT_SYNC_MODE_ENABLE			(1 &lt;&lt; 4)</div><div class='del'>-#define  PORT_SYNC_MODE_MASTER_SELECT(x)	((x) &lt; 0)</div><div class='add'>+#define  PORT_SYNC_MODE_MASTER_SELECT(x)	((x) &lt;&lt; 0)</div><div class='ctx'> #define  PORT_SYNC_MODE_MASTER_SELECT_MASK	(0x7 &lt;&lt; 0)</div><div class='ctx'> #define  PORT_SYNC_MODE_MASTER_SELECT_SHIFT	0</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c<br/>index b713bed20c38..41b5bcb803cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_vma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/i915_vma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/i915_vma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/i915_vma.c</a></div><div class='hunk'>@@ -36,11 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> static void vma_print_allocator(struct i915_vma *vma, const char *reason)</div><div class='ctx'> {</div><div class='del'>-	unsigned long entries[12];</div><div class='del'>-	struct stack_trace trace = {</div><div class='del'>-		.entries = entries,</div><div class='del'>-		.max_entries = ARRAY_SIZE(entries),</div><div class='del'>-	};</div><div class='add'>+	unsigned long *entries;</div><div class='add'>+	unsigned int nr_entries;</div><div class='ctx'> 	char buf[512];</div><div class='ctx'> </div><div class='ctx'> 	if (!vma-&gt;node.stack) {</div><div class='hunk'>@@ -49,8 +46,8 @@ static void vma_print_allocator(struct i915_vma *vma, const char *reason)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	depot_fetch_stack(vma-&gt;node.stack, &amp;trace);</div><div class='del'>-	snprint_stack_trace(buf, sizeof(buf), &amp;trace, 0);</div><div class='add'>+	nr_entries = stack_depot_fetch(vma-&gt;node.stack, &amp;entries);</div><div class='add'>+	stack_trace_snprint(buf, sizeof(buf), entries, nr_entries, 0);</div><div class='ctx'> 	DRM_DEBUG_DRIVER("vma.node [%08llx + %08llx] %s: inserted at %s\n",</div><div class='ctx'> 			 vma-&gt;node.start, vma-&gt;node.size, reason, buf);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c<br/>index 73a7bee24a66..641e0778fa9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/icl_dsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/icl_dsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/icl_dsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/icl_dsi.c</a></div><div class='hunk'>@@ -323,6 +323,21 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv,</div><div class='add'>+				     struct intel_dsi *intel_dsi)</div><div class='add'>+{</div><div class='add'>+	enum port port;</div><div class='add'>+</div><div class='add'>+	for_each_dsi_port(port, intel_dsi-&gt;ports) {</div><div class='add'>+		WARN_ON(intel_dsi-&gt;io_wakeref[port]);</div><div class='add'>+		intel_dsi-&gt;io_wakeref[port] =</div><div class='add'>+			intel_display_power_get(dev_priv,</div><div class='add'>+						port == PORT_A ?</div><div class='add'>+						POWER_DOMAIN_PORT_DDI_A_IO :</div><div class='add'>+						POWER_DOMAIN_PORT_DDI_B_IO);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gen11_dsi_enable_io_power(struct intel_encoder *encoder)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = to_i915(encoder-&gt;base.dev);</div><div class='hunk'>@@ -336,13 +351,7 @@ static void gen11_dsi_enable_io_power(struct intel_encoder *encoder)</div><div class='ctx'> 		I915_WRITE(ICL_DSI_IO_MODECTL(port), tmp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for_each_dsi_port(port, intel_dsi-&gt;ports) {</div><div class='del'>-		intel_dsi-&gt;io_wakeref[port] =</div><div class='del'>-			intel_display_power_get(dev_priv,</div><div class='del'>-						port == PORT_A ?</div><div class='del'>-						POWER_DOMAIN_PORT_DDI_A_IO :</div><div class='del'>-						POWER_DOMAIN_PORT_DDI_B_IO);</div><div class='del'>-	}</div><div class='add'>+	get_dsi_io_power_domains(dev_priv, intel_dsi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)</div><div class='hunk'>@@ -589,6 +598,12 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder,</div><div class='ctx'> 		val |= DPCLKA_CFGCR0_DDI_CLK_SEL(pll-&gt;info-&gt;id, port);</div><div class='ctx'> 	}</div><div class='ctx'> 	I915_WRITE(DPCLKA_CFGCR0_ICL, val);</div><div class='add'>+</div><div class='add'>+	for_each_dsi_port(port, intel_dsi-&gt;ports) {</div><div class='add'>+		val &amp;= ~DPCLKA_CFGCR0_DDI_CLK_OFF(port);</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(DPCLKA_CFGCR0_ICL, val);</div><div class='add'>+</div><div class='ctx'> 	POSTING_READ(DPCLKA_CFGCR0_ICL);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev_priv-&gt;dpll_lock);</div><div class='hunk'>@@ -1117,7 +1132,7 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)</div><div class='ctx'> 			DRM_ERROR("DDI port:%c buffer not idle\n",</div><div class='ctx'> 				  port_name(port));</div><div class='ctx'> 	}</div><div class='del'>-	gen11_dsi_ungate_clocks(encoder);</div><div class='add'>+	gen11_dsi_gate_clocks(encoder);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)</div><div class='hunk'>@@ -1218,20 +1233,11 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 gen11_dsi_get_power_domains(struct intel_encoder *encoder,</div><div class='del'>-				       struct intel_crtc_state *crtc_state)</div><div class='add'>+static void gen11_dsi_get_power_domains(struct intel_encoder *encoder,</div><div class='add'>+					struct intel_crtc_state *crtc_state)</div><div class='ctx'> {</div><div class='del'>-	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&amp;encoder-&gt;base);</div><div class='del'>-	u64 domains = 0;</div><div class='del'>-	enum port port;</div><div class='del'>-</div><div class='del'>-	for_each_dsi_port(port, intel_dsi-&gt;ports)</div><div class='del'>-		if (port == PORT_A)</div><div class='del'>-			domains |= BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO);</div><div class='del'>-		else</div><div class='del'>-			domains |= BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO);</div><div class='del'>-</div><div class='del'>-	return domains;</div><div class='add'>+	get_dsi_io_power_domains(to_i915(encoder-&gt;base.dev),</div><div class='add'>+				 enc_to_intel_dsi(&amp;encoder-&gt;base));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c<br/>index b508d8a735e0..4364f42cac6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_bios.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_bios.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_bios.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_bios.c</a></div><div class='hunk'>@@ -1673,6 +1673,7 @@ init_vbt_missing_defaults(struct drm_i915_private *dev_priv)</div><div class='ctx'> 		info-&gt;supports_dvi = (port != PORT_A &amp;&amp; port != PORT_E);</div><div class='ctx'> 		info-&gt;supports_hdmi = info-&gt;supports_dvi;</div><div class='ctx'> 		info-&gt;supports_dp = (port != PORT_E);</div><div class='add'>+		info-&gt;supports_edp = (port == PORT_A);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c<br/>index 14d580cdefd3..98cea1f4b3bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_ddi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_ddi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_ddi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_ddi.c</a></div><div class='hunk'>@@ -2075,12 +2075,11 @@ intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port)</div><div class='ctx'> 					      intel_aux_power_domain(dig_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder,</div><div class='del'>-				       struct intel_crtc_state *crtc_state)</div><div class='add'>+static void intel_ddi_get_power_domains(struct intel_encoder *encoder,</div><div class='add'>+					struct intel_crtc_state *crtc_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = to_i915(encoder-&gt;base.dev);</div><div class='ctx'> 	struct intel_digital_port *dig_port;</div><div class='del'>-	u64 domains;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO: Add support for MST encoders. Atm, the following should never</div><div class='hunk'>@@ -2088,10 +2087,10 @@ static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder,</div><div class='ctx'> 	 * hook.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (WARN_ON(intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)))</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	dig_port = enc_to_dig_port(&amp;encoder-&gt;base);</div><div class='del'>-	domains = BIT_ULL(dig_port-&gt;ddi_io_power_domain);</div><div class='add'>+	intel_display_power_get(dev_priv, dig_port-&gt;ddi_io_power_domain);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * AUX power is only needed for (e)DP mode, and for HDMI mode on TC</div><div class='hunk'>@@ -2099,15 +2098,15 @@ static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (intel_crtc_has_dp_encoder(crtc_state) ||</div><div class='ctx'> 	    intel_port_is_tc(dev_priv, encoder-&gt;port))</div><div class='del'>-		domains |= BIT_ULL(intel_ddi_main_link_aux_domain(dig_port));</div><div class='add'>+		intel_display_power_get(dev_priv,</div><div class='add'>+					intel_ddi_main_link_aux_domain(dig_port));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * VDSC power is needed when DSC is enabled</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (crtc_state-&gt;dsc_params.compression_enable)</div><div class='del'>-		domains |= BIT_ULL(intel_dsc_power_domain(crtc_state));</div><div class='del'>-</div><div class='del'>-	return domains;</div><div class='add'>+		intel_display_power_get(dev_priv,</div><div class='add'>+					intel_dsc_power_domain(crtc_state));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)</div><div class='hunk'>@@ -2825,10 +2824,10 @@ void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder)</div><div class='ctx'> 				return;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='del'>-		 * DSI ports should have their DDI clock ungated when disabled</div><div class='del'>-		 * and gated when enabled.</div><div class='add'>+		 * For DSI we keep the ddi clocks gated</div><div class='add'>+		 * except during enable/disable sequence.</div><div class='ctx'> 		 */</div><div class='del'>-		ddi_clk_needed = !encoder-&gt;base.crtc;</div><div class='add'>+		ddi_clk_needed = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	val = I915_READ(DPCLKA_CFGCR0_ICL);</div><div class='hunk'>@@ -3863,14 +3862,16 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,</div><div class='ctx'> 		ret = intel_hdmi_compute_config(encoder, pipe_config, conn_state);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = intel_dp_compute_config(encoder, pipe_config, conn_state);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (IS_GEN9_LP(dev_priv) &amp;&amp; ret)</div><div class='add'>+	if (IS_GEN9_LP(dev_priv))</div><div class='ctx'> 		pipe_config-&gt;lane_lat_optim_mask =</div><div class='ctx'> 			bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config-&gt;lane_count);</div><div class='ctx'> </div><div class='ctx'> 	intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);</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'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c<br/>index ccb616351bba..421aac80a838 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_display.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_display.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_display.c</a></div><div class='hunk'>@@ -15986,8 +15986,6 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)</div><div class='ctx'> 	struct intel_encoder *encoder;</div><div class='ctx'> </div><div class='ctx'> 	for_each_intel_encoder(&amp;dev_priv-&gt;drm, encoder) {</div><div class='del'>-		u64 get_domains;</div><div class='del'>-		enum intel_display_power_domain domain;</div><div class='ctx'> 		struct intel_crtc_state *crtc_state;</div><div class='ctx'> </div><div class='ctx'> 		if (!encoder-&gt;get_power_domains)</div><div class='hunk'>@@ -16001,9 +15999,7 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		crtc_state = to_intel_crtc_state(encoder-&gt;base.crtc-&gt;state);</div><div class='del'>-		get_domains = encoder-&gt;get_power_domains(encoder, crtc_state);</div><div class='del'>-		for_each_power_domain(domain, get_domains)</div><div class='del'>-			intel_display_power_get(dev_priv, domain);</div><div class='add'>+		encoder-&gt;get_power_domains(encoder, crtc_state);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c<br/>index cf709835fb9a..48da4a969a0a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_dp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_dp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_dp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_dp.c</a></div><div class='hunk'>@@ -1859,42 +1859,6 @@ intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Optimize link config in order: max bpp, min lanes, min clock */</div><div class='del'>-static int</div><div class='del'>-intel_dp_compute_link_config_fast(struct intel_dp *intel_dp,</div><div class='del'>-				  struct intel_crtc_state *pipe_config,</div><div class='del'>-				  const struct link_config_limits *limits)</div><div class='del'>-{</div><div class='del'>-	struct drm_display_mode *adjusted_mode = &amp;pipe_config-&gt;base.adjusted_mode;</div><div class='del'>-	int bpp, clock, lane_count;</div><div class='del'>-	int mode_rate, link_clock, link_avail;</div><div class='del'>-</div><div class='del'>-	for (bpp = limits-&gt;max_bpp; bpp &gt;= limits-&gt;min_bpp; bpp -= 2 * 3) {</div><div class='del'>-		mode_rate = intel_dp_link_required(adjusted_mode-&gt;crtc_clock,</div><div class='del'>-						   bpp);</div><div class='del'>-</div><div class='del'>-		for (lane_count = limits-&gt;min_lane_count;</div><div class='del'>-		     lane_count &lt;= limits-&gt;max_lane_count;</div><div class='del'>-		     lane_count &lt;&lt;= 1) {</div><div class='del'>-			for (clock = limits-&gt;min_clock; clock &lt;= limits-&gt;max_clock; clock++) {</div><div class='del'>-				link_clock = intel_dp-&gt;common_rates[clock];</div><div class='del'>-				link_avail = intel_dp_max_data_rate(link_clock,</div><div class='del'>-								    lane_count);</div><div class='del'>-</div><div class='del'>-				if (mode_rate &lt;= link_avail) {</div><div class='del'>-					pipe_config-&gt;lane_count = lane_count;</div><div class='del'>-					pipe_config-&gt;pipe_bpp = bpp;</div><div class='del'>-					pipe_config-&gt;port_clock = link_clock;</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'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)</div><div class='ctx'> {</div><div class='ctx'> 	int i, num_bpc;</div><div class='hunk'>@@ -1922,6 +1886,9 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,</div><div class='ctx'> 	int pipe_bpp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	pipe_config-&gt;fec_enable = !intel_dp_is_edp(intel_dp) &amp;&amp;</div><div class='add'>+		intel_dp_supports_fec(intel_dp, pipe_config);</div><div class='add'>+</div><div class='ctx'> 	if (!intel_dp_supports_dsc(intel_dp, pipe_config))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2031,15 +1998,13 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,</div><div class='ctx'> 	limits.min_bpp = 6 * 3;</div><div class='ctx'> 	limits.max_bpp = intel_dp_compute_bpp(intel_dp, pipe_config);</div><div class='ctx'> </div><div class='del'>-	if (intel_dp_is_edp(intel_dp) &amp;&amp; intel_dp-&gt;edp_dpcd[0] &lt; DP_EDP_14) {</div><div class='add'>+	if (intel_dp_is_edp(intel_dp)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Use the maximum clock and number of lanes the eDP panel</div><div class='del'>-		 * advertizes being capable of. The eDP 1.3 and earlier panels</div><div class='del'>-		 * are generally designed to support only a single clock and</div><div class='del'>-		 * lane configuration, and typically these values correspond to</div><div class='del'>-		 * the native resolution of the panel. With eDP 1.4 rate select</div><div class='del'>-		 * and DSC, this is decreasingly the case, and we need to be</div><div class='del'>-		 * able to select less than maximum link config.</div><div class='add'>+		 * advertizes being capable of. The panels are generally</div><div class='add'>+		 * designed to support only a single clock and lane</div><div class='add'>+		 * configuration, and typically these values correspond to the</div><div class='add'>+		 * native resolution of the panel.</div><div class='ctx'> 		 */</div><div class='ctx'> 		limits.min_lane_count = limits.max_lane_count;</div><div class='ctx'> 		limits.min_clock = limits.max_clock;</div><div class='hunk'>@@ -2053,22 +2018,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,</div><div class='ctx'> 		      intel_dp-&gt;common_rates[limits.max_clock],</div><div class='ctx'> 		      limits.max_bpp, adjusted_mode-&gt;crtc_clock);</div><div class='ctx'> </div><div class='del'>-	if (intel_dp_is_edp(intel_dp))</div><div class='del'>-		/*</div><div class='del'>-		 * Optimize for fast and narrow. eDP 1.3 section 3.3 and eDP 1.4</div><div class='del'>-		 * section A.1: "It is recommended that the minimum number of</div><div class='del'>-		 * lanes be used, using the minimum link rate allowed for that</div><div class='del'>-		 * lane configuration."</div><div class='del'>-		 *</div><div class='del'>-		 * Note that we use the max clock and lane count for eDP 1.3 and</div><div class='del'>-		 * earlier, and fast vs. wide is irrelevant.</div><div class='del'>-		 */</div><div class='del'>-		ret = intel_dp_compute_link_config_fast(intel_dp, pipe_config,</div><div class='del'>-							&amp;limits);</div><div class='del'>-	else</div><div class='del'>-		/* Optimize for slow and wide. */</div><div class='del'>-		ret = intel_dp_compute_link_config_wide(intel_dp, pipe_config,</div><div class='del'>-							&amp;limits);</div><div class='add'>+	/*</div><div class='add'>+	 * Optimize for slow and wide. This is the place to add alternative</div><div class='add'>+	 * optimization policy.</div><div class='add'>+	 */</div><div class='add'>+	ret = intel_dp_compute_link_config_wide(intel_dp, pipe_config, &amp;limits);</div><div class='ctx'> </div><div class='ctx'> 	/* enable compression if the mode doesn't fit available BW */</div><div class='ctx'> 	DRM_DEBUG_KMS("Force DSC en = %d\n", intel_dp-&gt;force_dsc_en);</div><div class='hunk'>@@ -2165,9 +2119,6 @@ intel_dp_compute_config(struct intel_encoder *encoder,</div><div class='ctx'> 	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_DBLCLK)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pipe_config-&gt;fec_enable = !intel_dp_is_edp(intel_dp) &amp;&amp;</div><div class='del'>-				  intel_dp_supports_fec(intel_dp, pipe_config);</div><div class='del'>-</div><div class='ctx'> 	ret = intel_dp_compute_link_config(encoder, pipe_config, conn_state);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h<br/>index 15db41394b9e..d5660ac1b0d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_drv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_drv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_drv.h</a></div><div class='hunk'>@@ -270,10 +270,12 @@ struct intel_encoder {</div><div class='ctx'> 	 * be set correctly before calling this function. */</div><div class='ctx'> 	void (*get_config)(struct intel_encoder *,</div><div class='ctx'> 			   struct intel_crtc_state *pipe_config);</div><div class='del'>-	/* Returns a mask of power domains that need to be referenced as part</div><div class='del'>-	 * of the hardware state readout code. */</div><div class='del'>-	u64 (*get_power_domains)(struct intel_encoder *encoder,</div><div class='del'>-				 struct intel_crtc_state *crtc_state);</div><div class='add'>+	/*</div><div class='add'>+	 * Acquires the power domains needed for an active encoder during</div><div class='add'>+	 * hardware state readout.</div><div class='add'>+	 */</div><div class='add'>+	void (*get_power_domains)(struct intel_encoder *encoder,</div><div class='add'>+				  struct intel_crtc_state *crtc_state);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Called during system suspend after all pending requests for the</div><div class='ctx'> 	 * encoder are flushed (for example for DP AUX transactions) and</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c<br/>index e8f694b57b8a..376ffe842e26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_fbdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_fbdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_fbdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_fbdev.c</a></div><div class='hunk'>@@ -338,8 +338,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,</div><div class='ctx'> 				    bool *enabled, int width, int height)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = to_i915(fb_helper-&gt;dev);</div><div class='add'>+	unsigned long conn_configured, conn_seq, mask;</div><div class='ctx'> 	unsigned int count = min(fb_helper-&gt;connector_count, BITS_PER_LONG);</div><div class='del'>-	unsigned long conn_configured, conn_seq;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	bool *save_enabled;</div><div class='ctx'> 	bool fallback = true, ret = true;</div><div class='hunk'>@@ -357,9 +357,10 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,</div><div class='ctx'> 		drm_modeset_backoff(&amp;ctx);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(save_enabled, enabled, count);</div><div class='del'>-	conn_seq = GENMASK(count - 1, 0);</div><div class='add'>+	mask = GENMASK(count - 1, 0);</div><div class='ctx'> 	conn_configured = 0;</div><div class='ctx'> retry:</div><div class='add'>+	conn_seq = conn_configured;</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		struct drm_fb_helper_connector *fb_conn;</div><div class='ctx'> 		struct drm_connector *connector;</div><div class='hunk'>@@ -372,8 +373,7 @@ retry:</div><div class='ctx'> 		if (conn_configured &amp; BIT(i))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* First pass, only consider tiled connectors */</div><div class='del'>-		if (conn_seq == GENMASK(count - 1, 0) &amp;&amp; !connector-&gt;has_tile)</div><div class='add'>+		if (conn_seq == 0 &amp;&amp; !connector-&gt;has_tile)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (connector-&gt;status == connector_status_connected)</div><div class='hunk'>@@ -477,10 +477,8 @@ retry:</div><div class='ctx'> 		conn_configured |= BIT(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn_configured != conn_seq) { /* repeat until no more are found */</div><div class='del'>-		conn_seq = conn_configured;</div><div class='add'>+	if ((conn_configured &amp; mask) != mask &amp;&amp; conn_configured != conn_seq)</div><div class='ctx'> 		goto retry;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the BIOS didn't enable everything it could, fall back to have the</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c<br/>index f125a62eba8c..a46bffe2b288 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_hdmi.c</a></div><div class='hunk'>@@ -182,7 +182,6 @@ static void g4x_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(VIDEO_DIP_CTL, val);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	for (i = 0; i &lt; len; i += 4) {</div><div class='ctx'> 		I915_WRITE(VIDEO_DIP_DATA, *data);</div><div class='ctx'> 		data++;</div><div class='hunk'>@@ -190,7 +189,6 @@ static void g4x_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> 	/* Write every possible data byte to force correct ECC calculation. */</div><div class='ctx'> 	for (; i &lt; VIDEO_DIP_DATA_SIZE; i += 4)</div><div class='ctx'> 		I915_WRITE(VIDEO_DIP_DATA, 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	val |= g4x_infoframe_enable(type);</div><div class='ctx'> 	val &amp;= ~VIDEO_DIP_FREQ_MASK;</div><div class='hunk'>@@ -237,7 +235,6 @@ static void ibx_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(reg, val);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	for (i = 0; i &lt; len; i += 4) {</div><div class='ctx'> 		I915_WRITE(TVIDEO_DIP_DATA(intel_crtc-&gt;pipe), *data);</div><div class='ctx'> 		data++;</div><div class='hunk'>@@ -245,7 +242,6 @@ static void ibx_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> 	/* Write every possible data byte to force correct ECC calculation. */</div><div class='ctx'> 	for (; i &lt; VIDEO_DIP_DATA_SIZE; i += 4)</div><div class='ctx'> 		I915_WRITE(TVIDEO_DIP_DATA(intel_crtc-&gt;pipe), 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	val |= g4x_infoframe_enable(type);</div><div class='ctx'> 	val &amp;= ~VIDEO_DIP_FREQ_MASK;</div><div class='hunk'>@@ -298,7 +294,6 @@ static void cpt_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(reg, val);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	for (i = 0; i &lt; len; i += 4) {</div><div class='ctx'> 		I915_WRITE(TVIDEO_DIP_DATA(intel_crtc-&gt;pipe), *data);</div><div class='ctx'> 		data++;</div><div class='hunk'>@@ -306,7 +301,6 @@ static void cpt_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> 	/* Write every possible data byte to force correct ECC calculation. */</div><div class='ctx'> 	for (; i &lt; VIDEO_DIP_DATA_SIZE; i += 4)</div><div class='ctx'> 		I915_WRITE(TVIDEO_DIP_DATA(intel_crtc-&gt;pipe), 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	val |= g4x_infoframe_enable(type);</div><div class='ctx'> 	val &amp;= ~VIDEO_DIP_FREQ_MASK;</div><div class='hunk'>@@ -352,7 +346,6 @@ static void vlv_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(reg, val);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	for (i = 0; i &lt; len; i += 4) {</div><div class='ctx'> 		I915_WRITE(VLV_TVIDEO_DIP_DATA(intel_crtc-&gt;pipe), *data);</div><div class='ctx'> 		data++;</div><div class='hunk'>@@ -360,7 +353,6 @@ static void vlv_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> 	/* Write every possible data byte to force correct ECC calculation. */</div><div class='ctx'> 	for (; i &lt; VIDEO_DIP_DATA_SIZE; i += 4)</div><div class='ctx'> 		I915_WRITE(VLV_TVIDEO_DIP_DATA(intel_crtc-&gt;pipe), 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	val |= g4x_infoframe_enable(type);</div><div class='ctx'> 	val &amp;= ~VIDEO_DIP_FREQ_MASK;</div><div class='hunk'>@@ -406,7 +398,6 @@ static void hsw_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> 	val &amp;= ~hsw_infoframe_enable(type);</div><div class='ctx'> 	I915_WRITE(ctl_reg, val);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	for (i = 0; i &lt; len; i += 4) {</div><div class='ctx'> 		I915_WRITE(hsw_dip_data_reg(dev_priv, cpu_transcoder,</div><div class='ctx'> 					    type, i &gt;&gt; 2), *data);</div><div class='hunk'>@@ -416,7 +407,6 @@ static void hsw_write_infoframe(struct intel_encoder *encoder,</div><div class='ctx'> 	for (; i &lt; data_size; i += 4)</div><div class='ctx'> 		I915_WRITE(hsw_dip_data_reg(dev_priv, cpu_transcoder,</div><div class='ctx'> 					    type, i &gt;&gt; 2), 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	val |= hsw_infoframe_enable(type);</div><div class='ctx'> 	I915_WRITE(ctl_reg, val);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c<br/>index a017a4232c0f..20c4434474e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_runtime_pm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/intel_runtime_pm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/intel_runtime_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/intel_runtime_pm.c</a></div><div class='hunk'>@@ -60,31 +60,20 @@</div><div class='ctx'> static noinline depot_stack_handle_t __save_depot_stack(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long entries[STACKDEPTH];</div><div class='del'>-	struct stack_trace trace = {</div><div class='del'>-		.entries = entries,</div><div class='del'>-		.max_entries = ARRAY_SIZE(entries),</div><div class='del'>-		.skip = 1,</div><div class='del'>-	};</div><div class='add'>+	unsigned int n;</div><div class='ctx'> </div><div class='del'>-	save_stack_trace(&amp;trace);</div><div class='del'>-	if (trace.nr_entries &amp;&amp;</div><div class='del'>-	    trace.entries[trace.nr_entries - 1] == ULONG_MAX)</div><div class='del'>-		trace.nr_entries--;</div><div class='del'>-</div><div class='del'>-	return depot_save_stack(&amp;trace, GFP_NOWAIT | __GFP_NOWARN);</div><div class='add'>+	n = stack_trace_save(entries, ARRAY_SIZE(entries), 1);</div><div class='add'>+	return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __print_depot_stack(depot_stack_handle_t stack,</div><div class='ctx'> 				char *buf, int sz, int indent)</div><div class='ctx'> {</div><div class='del'>-	unsigned long entries[STACKDEPTH];</div><div class='del'>-	struct stack_trace trace = {</div><div class='del'>-		.entries = entries,</div><div class='del'>-		.max_entries = ARRAY_SIZE(entries),</div><div class='del'>-	};</div><div class='add'>+	unsigned long *entries;</div><div class='add'>+	unsigned int nr_entries;</div><div class='ctx'> </div><div class='del'>-	depot_fetch_stack(stack, &amp;trace);</div><div class='del'>-	snprint_stack_trace(buf, sz, &amp;trace, indent);</div><div class='add'>+	nr_entries = stack_depot_fetch(stack, &amp;entries);</div><div class='add'>+	stack_trace_snprint(buf, sz, entries, nr_entries, indent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_intel_runtime_pm_wakeref(struct drm_i915_private *i915)</div><div class='head'>diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c<br/>index 32dce7176f63..b9b0ea4e2404 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/selftests/i915_gem_evict.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/selftests/i915_gem_evict.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/selftests/i915_gem_evict.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/selftests/i915_gem_evict.c</a></div><div class='hunk'>@@ -455,7 +455,7 @@ static int igt_evict_contexts(void *arg)</div><div class='ctx'> 			struct i915_gem_context *ctx;</div><div class='ctx'> </div><div class='ctx'> 			ctx = live_context(i915, file);</div><div class='del'>-			if (!ctx)</div><div class='add'>+			if (IS_ERR(ctx))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			/* We will need some GGTT space for the rq's context */</div><div class='head'>diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c<br/>index 6403728fe778..31c93c3ccd00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/vlv_dsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/i915/vlv_dsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/i915/vlv_dsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/i915/vlv_dsi.c</a></div><div class='hunk'>@@ -256,6 +256,28 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)</div><div class='ctx'> 	mutex_unlock(&amp;dev_priv-&gt;sb_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bdw_get_pipemisc_bpp(struct intel_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = to_i915(crtc-&gt;base.dev);</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = I915_READ(PIPEMISC(crtc-&gt;pipe));</div><div class='add'>+</div><div class='add'>+	switch (tmp &amp; PIPEMISC_DITHER_BPC_MASK) {</div><div class='add'>+	case PIPEMISC_DITHER_6_BPC:</div><div class='add'>+		return 18;</div><div class='add'>+	case PIPEMISC_DITHER_8_BPC:</div><div class='add'>+		return 24;</div><div class='add'>+	case PIPEMISC_DITHER_10_BPC:</div><div class='add'>+		return 30;</div><div class='add'>+	case PIPEMISC_DITHER_12_BPC:</div><div class='add'>+		return 36;</div><div class='add'>+	default:</div><div class='add'>+		MISSING_CASE(tmp);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int intel_dsi_compute_config(struct intel_encoder *encoder,</div><div class='ctx'> 				    struct intel_crtc_state *pipe_config,</div><div class='ctx'> 				    struct drm_connector_state *conn_state)</div><div class='hunk'>@@ -1071,6 +1093,8 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,</div><div class='ctx'> 	bpp = mipi_dsi_pixel_format_to_bpp(</div><div class='ctx'> 			pixel_format_from_register_bits(fmt));</div><div class='ctx'> </div><div class='add'>+	pipe_config-&gt;pipe_bpp = bdw_get_pipemisc_bpp(crtc);</div><div class='add'>+</div><div class='ctx'> 	/* Enable Frame time stamo based scanline reporting */</div><div class='ctx'> 	adjusted_mode-&gt;private_flags |=</div><div class='ctx'> 			I915_MODE_FLAG_GET_SCANLINE_FROM_TIMESTAMP;</div><div class='head'>diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c<br/>index ec3602ebbc1c..54011df8c2e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/imx/ipuv3-crtc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/imx/ipuv3-crtc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/imx/ipuv3-crtc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/imx/ipuv3-crtc.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ static void ipu_crtc_disable_planes(struct ipu_crtc *ipu_crtc,</div><div class='ctx'> 	if (disable_partial)</div><div class='ctx'> 		ipu_plane_disable(ipu_crtc-&gt;plane[1], true);</div><div class='ctx'> 	if (disable_full)</div><div class='del'>-		ipu_plane_disable(ipu_crtc-&gt;plane[0], false);</div><div class='add'>+		ipu_plane_disable(ipu_crtc-&gt;plane[0], true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c<br/>index 22e68a100e7b..5d333138f913 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_dpi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_dpi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_dpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_dpi.c</a></div><div class='hunk'>@@ -662,13 +662,11 @@ static unsigned int mt8173_calculate_factor(int clock)</div><div class='ctx'> static unsigned int mt2701_calculate_factor(int clock)</div><div class='ctx'> {</div><div class='ctx'> 	if (clock &lt;= 64000)</div><div class='del'>-		return 16;</div><div class='del'>-	else if (clock &lt;= 128000)</div><div class='del'>-		return 8;</div><div class='del'>-	else if (clock &lt;= 256000)</div><div class='ctx'> 		return 4;</div><div class='del'>-	else</div><div class='add'>+	else if (clock &lt;= 128000)</div><div class='ctx'> 		return 2;</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct mtk_dpi_conf mt8173_conf = {</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c<br/>index cf59ea9bccfd..57ce4708ef1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_drm_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_drm_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_drm_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_drm_drv.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;drm/drmP.h&gt;</div><div class='ctx'> #include &lt;drm/drm_atomic.h&gt;</div><div class='ctx'> #include &lt;drm/drm_atomic_helper.h&gt;</div><div class='add'>+#include &lt;drm/drm_fb_helper.h&gt;</div><div class='ctx'> #include &lt;drm/drm_gem.h&gt;</div><div class='ctx'> #include &lt;drm/drm_gem_cma_helper.h&gt;</div><div class='ctx'> #include &lt;drm/drm_of.h&gt;</div><div class='hunk'>@@ -341,6 +342,8 @@ static struct drm_driver mtk_drm_driver = {</div><div class='ctx'> 	.gem_prime_get_sg_table = mtk_gem_prime_get_sg_table,</div><div class='ctx'> 	.gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,</div><div class='ctx'> 	.gem_prime_mmap = mtk_drm_gem_mmap_buf,</div><div class='add'>+	.gem_prime_vmap = mtk_drm_gem_prime_vmap,</div><div class='add'>+	.gem_prime_vunmap = mtk_drm_gem_prime_vunmap,</div><div class='ctx'> 	.fops = &amp;mtk_drm_fops,</div><div class='ctx'> </div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='hunk'>@@ -376,6 +379,10 @@ static int mtk_drm_bind(struct device *dev)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_deinit;</div><div class='ctx'> </div><div class='add'>+	ret = drm_fbdev_generic_setup(drm, 32);</div><div class='add'>+	if (ret)</div><div class='add'>+		DRM_ERROR("Failed to initialize fbdev: %d\n", ret);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_deinit:</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c<br/>index 259b7b0de1d2..38483e9ee071 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_drm_gem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_drm_gem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_drm_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_drm_gem.c</a></div><div class='hunk'>@@ -241,3 +241,49 @@ err_gem_free:</div><div class='ctx'> 	kfree(mtk_gem);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);</div><div class='add'>+	struct sg_table *sgt;</div><div class='add'>+	struct sg_page_iter iter;</div><div class='add'>+	unsigned int npages;</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+</div><div class='add'>+	if (mtk_gem-&gt;kvaddr)</div><div class='add'>+		return mtk_gem-&gt;kvaddr;</div><div class='add'>+</div><div class='add'>+	sgt = mtk_gem_prime_get_sg_table(obj);</div><div class='add'>+	if (IS_ERR(sgt))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	npages = obj-&gt;size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	mtk_gem-&gt;pages = kcalloc(npages, sizeof(*mtk_gem-&gt;pages), GFP_KERNEL);</div><div class='add'>+	if (!mtk_gem-&gt;pages)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for_each_sg_page(sgt-&gt;sgl, &amp;iter, sgt-&gt;orig_nents, 0) {</div><div class='add'>+		mtk_gem-&gt;pages[i++] = sg_page_iter_page(&amp;iter);</div><div class='add'>+		if (i &gt; npages)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mtk_gem-&gt;kvaddr = vmap(mtk_gem-&gt;pages, npages, VM_MAP,</div><div class='add'>+			       pgprot_writecombine(PAGE_KERNEL));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree((void *)sgt);</div><div class='add'>+</div><div class='add'>+	return mtk_gem-&gt;kvaddr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)</div><div class='add'>+{</div><div class='add'>+	struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);</div><div class='add'>+</div><div class='add'>+	if (!mtk_gem-&gt;pages)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vunmap(vaddr);</div><div class='add'>+	mtk_gem-&gt;kvaddr = 0;</div><div class='add'>+	kfree((void *)mtk_gem-&gt;pages);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/mediatek/mtk_drm_gem.h<br/>index 534639b43a1c..c047a7ef294f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_drm_gem.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_drm_gem.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_drm_gem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_drm_gem.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@ struct mtk_drm_gem_obj {</div><div class='ctx'> 	dma_addr_t		dma_addr;</div><div class='ctx'> 	unsigned long		dma_attrs;</div><div class='ctx'> 	struct sg_table		*sg;</div><div class='add'>+	struct page		**pages;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_mtk_gem_obj(x)	container_of(x, struct mtk_drm_gem_obj, base)</div><div class='hunk'>@@ -52,5 +53,7 @@ int mtk_drm_gem_mmap_buf(struct drm_gem_object *obj,</div><div class='ctx'> struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj);</div><div class='ctx'> struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev,</div><div class='ctx'> 			struct dma_buf_attachment *attach, struct sg_table *sg);</div><div class='add'>+void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj);</div><div class='add'>+void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c<br/>index 915cc84621ae..e04e6c293d39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_hdmi.c</a></div><div class='hunk'>@@ -1480,7 +1480,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,</div><div class='ctx'> 	if (IS_ERR(regmap))</div><div class='ctx'> 		ret = PTR_ERR(regmap);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ret = PTR_ERR(regmap);</div><div class='ctx'> 		dev_err(dev,</div><div class='ctx'> 			"Failed to get system configuration registers: %d\n",</div><div class='ctx'> 			ret);</div><div class='hunk'>@@ -1516,6 +1515,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,</div><div class='ctx'> 	of_node_put(remote);</div><div class='ctx'> </div><div class='ctx'> 	hdmi-&gt;ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);</div><div class='add'>+	of_node_put(i2c_np);</div><div class='ctx'> 	if (!hdmi-&gt;ddc_adpt) {</div><div class='ctx'> 		dev_err(dev, "Failed to get ddc i2c adapter by node\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c<br/>index 4ef9c57ffd44..5223498502c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_hdmi_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_hdmi_phy.c</a></div><div class='hunk'>@@ -15,28 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='del'>-			     unsigned long *parent_rate)</div><div class='del'>-{</div><div class='del'>-	struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);</div><div class='del'>-</div><div class='del'>-	hdmi_phy-&gt;pll_rate = rate;</div><div class='del'>-	if (rate &lt;= 74250000)</div><div class='del'>-		*parent_rate = rate;</div><div class='del'>-	else</div><div class='del'>-		*parent_rate = rate / 2;</div><div class='del'>-</div><div class='del'>-	return rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw,</div><div class='del'>-				       unsigned long parent_rate)</div><div class='del'>-{</div><div class='del'>-	struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);</div><div class='del'>-</div><div class='del'>-	return hdmi_phy-&gt;pll_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,</div><div class='ctx'> 			     u32 bits)</div><div class='ctx'> {</div><div class='hunk'>@@ -110,13 +88,11 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mtk_hdmi_phy_clk_get_ops(struct mtk_hdmi_phy *hdmi_phy,</div><div class='del'>-				     const struct clk_ops **ops)</div><div class='add'>+static void mtk_hdmi_phy_clk_get_data(struct mtk_hdmi_phy *hdmi_phy,</div><div class='add'>+				      struct clk_init_data *clk_init)</div><div class='ctx'> {</div><div class='del'>-	if (hdmi_phy &amp;&amp; hdmi_phy-&gt;conf &amp;&amp; hdmi_phy-&gt;conf-&gt;hdmi_phy_clk_ops)</div><div class='del'>-		*ops = hdmi_phy-&gt;conf-&gt;hdmi_phy_clk_ops;</div><div class='del'>-	else</div><div class='del'>-		dev_err(hdmi_phy-&gt;dev, "Failed to get clk ops of phy\n");</div><div class='add'>+	clk_init-&gt;flags = hdmi_phy-&gt;conf-&gt;flags;</div><div class='add'>+	clk_init-&gt;ops = hdmi_phy-&gt;conf-&gt;hdmi_phy_clk_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mtk_hdmi_phy_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -129,7 +105,6 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct clk_init_data clk_init = {</div><div class='ctx'> 		.num_parents = 1,</div><div class='ctx'> 		.parent_names = (const char * const *)&amp;ref_clk_name,</div><div class='del'>-		.flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	struct phy *phy;</div><div class='hunk'>@@ -167,7 +142,7 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 	hdmi_phy-&gt;dev = dev;</div><div class='ctx'> 	hdmi_phy-&gt;conf =</div><div class='ctx'> 		(struct mtk_hdmi_phy_conf *)of_device_get_match_data(dev);</div><div class='del'>-	mtk_hdmi_phy_clk_get_ops(hdmi_phy, &amp;clk_init.ops);</div><div class='add'>+	mtk_hdmi_phy_clk_get_data(hdmi_phy, &amp;clk_init);</div><div class='ctx'> 	hdmi_phy-&gt;pll_hw.init = &amp;clk_init;</div><div class='ctx'> 	hdmi_phy-&gt;pll = devm_clk_register(dev, &amp;hdmi_phy-&gt;pll_hw);</div><div class='ctx'> 	if (IS_ERR(hdmi_phy-&gt;pll)) {</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h<br/>index f39b1fc66612..2d8b3182470d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_hdmi_phy.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_hdmi_phy.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@ struct mtk_hdmi_phy;</div><div class='ctx'> </div><div class='ctx'> struct mtk_hdmi_phy_conf {</div><div class='ctx'> 	bool tz_disabled;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	const struct clk_ops *hdmi_phy_clk_ops;</div><div class='ctx'> 	void (*hdmi_phy_enable_tmds)(struct mtk_hdmi_phy *hdmi_phy);</div><div class='ctx'> 	void (*hdmi_phy_disable_tmds)(struct mtk_hdmi_phy *hdmi_phy);</div><div class='hunk'>@@ -48,10 +49,6 @@ void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,</div><div class='ctx'> void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,</div><div class='ctx'> 		       u32 val, u32 mask);</div><div class='ctx'> struct mtk_hdmi_phy *to_mtk_hdmi_phy(struct clk_hw *hw);</div><div class='del'>-long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='del'>-			     unsigned long *parent_rate);</div><div class='del'>-unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw,</div><div class='del'>-				       unsigned long parent_rate);</div><div class='ctx'> </div><div class='ctx'> extern struct platform_driver mtk_hdmi_phy_driver;</div><div class='ctx'> extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c<br/>index fcc42dc6ea7f..d3cc4022e988 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c</a></div><div class='hunk'>@@ -79,7 +79,6 @@ static int mtk_hdmi_pll_prepare(struct clk_hw *hw)</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SLDO_MASK);</div><div class='ctx'> 	usleep_range(80, 100);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_MBIAS_LPF_EN);</div><div class='del'>-	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_EN_TX_POSDIV);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SER_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_PRED_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_DRV_MASK);</div><div class='hunk'>@@ -94,7 +93,6 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_DRV_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_PRED_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SER_MASK);</div><div class='del'>-	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_EN_TX_POSDIV);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_MBIAS_LPF_EN);</div><div class='ctx'> 	usleep_range(80, 100);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SLDO_MASK);</div><div class='hunk'>@@ -108,6 +106,12 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)</div><div class='ctx'> 	usleep_range(80, 100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				    unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 				 unsigned long parent_rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -116,13 +120,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> </div><div class='ctx'> 	if (rate &lt;= 64000000)</div><div class='ctx'> 		pos_div = 3;</div><div class='del'>-	else if (rate &lt;= 12800000)</div><div class='del'>-		pos_div = 1;</div><div class='add'>+	else if (rate &lt;= 128000000)</div><div class='add'>+		pos_div = 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		pos_div = 1;</div><div class='ctx'> </div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON6, RG_HTPLL_PREDIV_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON6, RG_HTPLL_POSDIV_MASK);</div><div class='add'>+	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_EN_TX_POSDIV);</div><div class='ctx'> 	mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON6, (0x1 &lt;&lt; RG_HTPLL_IC),</div><div class='ctx'> 			  RG_HTPLL_IC_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON6, (0x1 &lt;&lt; RG_HTPLL_IR),</div><div class='hunk'>@@ -154,6 +159,39 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					      unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);</div><div class='add'>+	unsigned long out_rate, val;</div><div class='add'>+</div><div class='add'>+	val = (readl(hdmi_phy-&gt;regs + HDMI_CON6)</div><div class='add'>+	       &amp; RG_HTPLL_PREDIV_MASK) &gt;&gt; RG_HTPLL_PREDIV;</div><div class='add'>+	switch (val) {</div><div class='add'>+	case 0x00:</div><div class='add'>+		out_rate = parent_rate;</div><div class='add'>+		break;</div><div class='add'>+	case 0x01:</div><div class='add'>+		out_rate = parent_rate / 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		out_rate = parent_rate / 4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = (readl(hdmi_phy-&gt;regs + HDMI_CON6)</div><div class='add'>+	       &amp; RG_HTPLL_FBKDIV_MASK) &gt;&gt; RG_HTPLL_FBKDIV;</div><div class='add'>+	out_rate *= (val + 1) * 2;</div><div class='add'>+	val = (readl(hdmi_phy-&gt;regs + HDMI_CON2)</div><div class='add'>+	       &amp; RG_HDMITX_TX_POSDIV_MASK);</div><div class='add'>+	out_rate &gt;&gt;= (val &gt;&gt; RG_HDMITX_TX_POSDIV);</div><div class='add'>+</div><div class='add'>+	if (readl(hdmi_phy-&gt;regs + HDMI_CON2) &amp; RG_HDMITX_EN_TX_POSDIV)</div><div class='add'>+		out_rate /= 5;</div><div class='add'>+</div><div class='add'>+	return out_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct clk_ops mtk_hdmi_phy_pll_ops = {</div><div class='ctx'> 	.prepare = mtk_hdmi_pll_prepare,</div><div class='ctx'> 	.unprepare = mtk_hdmi_pll_unprepare,</div><div class='hunk'>@@ -174,7 +212,6 @@ static void mtk_hdmi_phy_enable_tmds(struct mtk_hdmi_phy *hdmi_phy)</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SLDO_MASK);</div><div class='ctx'> 	usleep_range(80, 100);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_MBIAS_LPF_EN);</div><div class='del'>-	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_EN_TX_POSDIV);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SER_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_PRED_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_DRV_MASK);</div><div class='hunk'>@@ -186,7 +223,6 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_DRV_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_PRED_MASK);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SER_MASK);</div><div class='del'>-	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_EN_TX_POSDIV);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON2, RG_HDMITX_MBIAS_LPF_EN);</div><div class='ctx'> 	usleep_range(80, 100);</div><div class='ctx'> 	mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON0, RG_HDMITX_EN_SLDO_MASK);</div><div class='hunk'>@@ -202,6 +238,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)</div><div class='ctx'> </div><div class='ctx'> struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf = {</div><div class='ctx'> 	.tz_disabled = true,</div><div class='add'>+	.flags = CLK_SET_RATE_GATE,</div><div class='ctx'> 	.hdmi_phy_clk_ops = &amp;mtk_hdmi_phy_pll_ops,</div><div class='ctx'> 	.hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds,</div><div class='ctx'> 	.hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,</div><div class='head'>diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c<br/>index ed5916b27658..47f8a2951682 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c</a></div><div class='hunk'>@@ -199,6 +199,20 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)</div><div class='ctx'> 	usleep_range(100, 150);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long mtk_hdmi_pll_round_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 mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);</div><div class='add'>+</div><div class='add'>+	hdmi_phy-&gt;pll_rate = rate;</div><div class='add'>+	if (rate &lt;= 74250000)</div><div class='add'>+		*parent_rate = rate;</div><div class='add'>+	else</div><div class='add'>+		*parent_rate = rate / 2;</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 				 unsigned long parent_rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -285,6 +299,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					      unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);</div><div class='add'>+</div><div class='add'>+	return hdmi_phy-&gt;pll_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct clk_ops mtk_hdmi_phy_pll_ops = {</div><div class='ctx'> 	.prepare = mtk_hdmi_pll_prepare,</div><div class='ctx'> 	.unprepare = mtk_hdmi_pll_unprepare,</div><div class='hunk'>@@ -309,6 +331,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf = {</div><div class='add'>+	.flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,</div><div class='ctx'> 	.hdmi_phy_clk_ops = &amp;mtk_hdmi_phy_pll_ops,</div><div class='ctx'> 	.hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds,</div><div class='ctx'> 	.hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,</div><div class='head'>diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c<br/>index 2281ed3eb774..8a4ebcb6405c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/meson/meson_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/meson/meson_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/meson/meson_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/meson/meson_drv.c</a></div><div class='hunk'>@@ -337,12 +337,14 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)</div><div class='ctx'> </div><div class='ctx'> 	ret = drm_dev_register(drm, 0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto free_drm;</div><div class='add'>+		goto uninstall_irq;</div><div class='ctx'> </div><div class='ctx'> 	drm_fbdev_generic_setup(drm, 32);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+uninstall_irq:</div><div class='add'>+	drm_irq_uninstall(drm);</div><div class='ctx'> free_drm:</div><div class='ctx'> 	drm_dev_put(drm);</div><div class='ctx'> </div><div class='hunk'>@@ -356,8 +358,8 @@ static int meson_drv_bind(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static void meson_drv_unbind(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct drm_device *drm = dev_get_drvdata(dev);</div><div class='del'>-	struct meson_drm *priv = drm-&gt;dev_private;</div><div class='add'>+	struct meson_drm *priv = dev_get_drvdata(dev);</div><div class='add'>+	struct drm_device *drm = priv-&gt;drm;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;canvas) {</div><div class='ctx'> 		meson_canvas_free(priv-&gt;canvas, priv-&gt;canvas_id_osd1);</div><div class='hunk'>@@ -367,6 +369,7 @@ static void meson_drv_unbind(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	drm_dev_unregister(drm);</div><div class='add'>+	drm_irq_uninstall(drm);</div><div class='ctx'> 	drm_kms_helper_poll_fini(drm);</div><div class='ctx'> 	drm_mode_config_cleanup(drm);</div><div class='ctx'> 	drm_dev_put(drm);</div><div class='head'>diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c<br/>index e28814f4ea6c..563953ec6ad0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/meson/meson_dw_hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/meson/meson_dw_hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/meson/meson_dw_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/meson/meson_dw_hdmi.c</a></div><div class='hunk'>@@ -569,7 +569,8 @@ dw_hdmi_mode_valid(struct drm_connector *connector,</div><div class='ctx'> 	DRM_DEBUG_DRIVER("Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));</div><div class='ctx'> </div><div class='ctx'> 	/* If sink max TMDS clock, we reject the mode */</div><div class='del'>-	if (mode-&gt;clock &gt; connector-&gt;display_info.max_tmds_clock)</div><div class='add'>+	if (connector-&gt;display_info.max_tmds_clock &amp;&amp;</div><div class='add'>+	    mode-&gt;clock &gt; connector-&gt;display_info.max_tmds_clock)</div><div class='ctx'> 		return MODE_BAD;</div><div class='ctx'> </div><div class='ctx'> 	/* Check against non-VIC supported modes */</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c<br/>index 88a52f6b39fe..7dfbbbc1beea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nouveau_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nouveau_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nouveau_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nouveau_debugfs.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pm_runtime_get_sync(drm-&gt;dev);</div><div class='del'>-	if (IS_ERR_VALUE(ret) &amp;&amp; ret != -EACCES)</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret != -EACCES)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = nvif_mthd(ctrl, NVIF_CONTROL_PSTATE_USER, &amp;args, sizeof(args));</div><div class='ctx'> 	pm_runtime_put_autosuspend(drm-&gt;dev);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c<br/>index aa9fec80492d..40c47d6a7d78 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nouveau_dmem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nouveau_dmem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nouveau_dmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nouveau_dmem.c</a></div><div class='hunk'>@@ -100,12 +100,10 @@ static void</div><div class='ctx'> nouveau_dmem_free(struct hmm_devmem *devmem, struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_dmem_chunk *chunk;</div><div class='del'>-	struct nouveau_drm *drm;</div><div class='ctx'> 	unsigned long idx;</div><div class='ctx'> </div><div class='ctx'> 	chunk = (void *)hmm_devmem_page_get_drvdata(page);</div><div class='ctx'> 	idx = page_to_pfn(page) - chunk-&gt;pfn_first;</div><div class='del'>-	drm = chunk-&gt;drm;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME:</div><div class='hunk'>@@ -456,11 +454,6 @@ nouveau_dmem_resume(struct nouveau_drm *drm)</div><div class='ctx'> 		/* FIXME handle pin failure */</div><div class='ctx'> 		WARN_ON(ret);</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_entry (chunk, &amp;drm-&gt;dmem-&gt;chunk_empty, list) {</div><div class='del'>-		ret = nouveau_bo_pin(chunk-&gt;bo, TTM_PL_FLAG_VRAM, false);</div><div class='del'>-		/* FIXME handle pin failure */</div><div class='del'>-		WARN_ON(ret);</div><div class='del'>-	}</div><div class='ctx'> 	mutex_unlock(&amp;drm-&gt;dmem-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -479,9 +472,6 @@ nouveau_dmem_suspend(struct nouveau_drm *drm)</div><div class='ctx'> 	list_for_each_entry (chunk, &amp;drm-&gt;dmem-&gt;chunk_full, list) {</div><div class='ctx'> 		nouveau_bo_unpin(chunk-&gt;bo);</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_entry (chunk, &amp;drm-&gt;dmem-&gt;chunk_empty, list) {</div><div class='del'>-		nouveau_bo_unpin(chunk-&gt;bo);</div><div class='del'>-	}</div><div class='ctx'> 	mutex_unlock(&amp;drm-&gt;dmem-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -623,7 +613,7 @@ nouveau_dmem_init(struct nouveau_drm *drm)</div><div class='ctx'> 	 */</div><div class='ctx'> 	drm-&gt;dmem-&gt;devmem = hmm_devmem_add(&amp;nouveau_dmem_devmem_ops,</div><div class='ctx'> 					   device, size);</div><div class='del'>-	if (drm-&gt;dmem-&gt;devmem == NULL) {</div><div class='add'>+	if (IS_ERR(drm-&gt;dmem-&gt;devmem)) {</div><div class='ctx'> 		kfree(drm-&gt;dmem);</div><div class='ctx'> 		drm-&gt;dmem = NULL;</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c<br/>index d131cca999dd..10f2aa9f29a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c</a></div><div class='hunk'>@@ -23,38 +23,55 @@ void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame,</div><div class='ctx'> 		 */</div><div class='ctx'> 	case 17:</div><div class='ctx'> 		subpack1_high = (raw_frame[16] &lt;&lt; 16);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 16:</div><div class='ctx'> 		subpack1_high |= (raw_frame[15] &lt;&lt; 8);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 15:</div><div class='ctx'> 		subpack1_high |= raw_frame[14];</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 14:</div><div class='ctx'> 		subpack1_low = (raw_frame[13] &lt;&lt; 24);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 13:</div><div class='ctx'> 		subpack1_low |= (raw_frame[12] &lt;&lt; 16);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 12:</div><div class='ctx'> 		subpack1_low |= (raw_frame[11] &lt;&lt; 8);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 11:</div><div class='ctx'> 		subpack1_low |= raw_frame[10];</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 10:</div><div class='ctx'> 		subpack0_high = (raw_frame[9] &lt;&lt; 16);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 9:</div><div class='ctx'> 		subpack0_high |= (raw_frame[8] &lt;&lt; 8);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		subpack0_high |= raw_frame[7];</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		subpack0_low = (raw_frame[6] &lt;&lt; 24);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		subpack0_low |= (raw_frame[5] &lt;&lt; 16);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 5:</div><div class='ctx'> 		subpack0_low |= (raw_frame[4] &lt;&lt; 8);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		subpack0_low |= raw_frame[3];</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		header = (raw_frame[2] &lt;&lt; 16);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		header |= (raw_frame[1] &lt;&lt; 8);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		header |= raw_frame[0];</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c<br/>index 49ef7e57aad4..7f1adab21a5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c</a></div><div class='hunk'>@@ -122,6 +122,7 @@ nv04_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NV_MEM_ACCESS_WO:</div><div class='ctx'> 		dmaobj-&gt;flags0 |= 0x00008000;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case NV_MEM_ACCESS_RW:</div><div class='ctx'> 		dmaobj-&gt;flags2 |= 0x00000002;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c<br/>index ad707ff176cc..93493b335d76 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c</a></div><div class='hunk'>@@ -117,8 +117,10 @@ nv04_fifo_swmthd(struct nvkm_device *device, u32 chid, u32 addr, u32 data)</div><div class='ctx'> 	switch (mthd) {</div><div class='ctx'> 	case 0x0000 ... 0x0000: /* subchannel's engine -&gt; software */</div><div class='ctx'> 		nvkm_wr32(device, 0x003280, (engine &amp;= ~mask));</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0x0180 ... 0x01fc: /* handle -&gt; instance */</div><div class='ctx'> 		data = nvkm_rd32(device, 0x003258) &amp; 0x0000ffff;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0x0100 ... 0x017c:</div><div class='ctx'> 	case 0x0200 ... 0x1ffc: /* pass method down to sw */</div><div class='ctx'> 		if (!(engine &amp; mask) &amp;&amp; sw)</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c<br/>index 8c7ba32763c4..47c16821c37f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c</a></div><div class='hunk'>@@ -81,6 +81,7 @@ nv40_fifo_init(struct nvkm_fifo *base)</div><div class='ctx'> 	case 0x49:</div><div class='ctx'> 	case 0x4b:</div><div class='ctx'> 		nvkm_wr32(device, 0x002230, 0x00000001);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0x40:</div><div class='ctx'> 	case 0x41:</div><div class='ctx'> 	case 0x42:</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c<br/>index c3068358f695..7112992e0e38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c</a></div><div class='hunk'>@@ -135,6 +135,7 @@ nvbios_perfEp(struct nvkm_bios *bios, int idx,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x30:</div><div class='ctx'> 		info-&gt;script   = nvbios_rd16(bios, perf + 0x02);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0x35:</div><div class='ctx'> 		info-&gt;fanspeed = nvbios_rd08(bios, perf + 0x06);</div><div class='ctx'> 		info-&gt;voltage  = nvbios_rd08(bios, perf + 0x07);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c<br/>index e6e804cee2bc..bda6cc9a7aaf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c</a></div><div class='hunk'>@@ -134,6 +134,7 @@ pll_map(struct nvkm_bios *bios)</div><div class='ctx'> 		    device-&gt;chipset == 0xaa ||</div><div class='ctx'> 		    device-&gt;chipset == 0xac)</div><div class='ctx'> 			return g84_pll_mapping;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c<br/>index ba6a868d4c95..40e564524b7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c</a></div><div class='hunk'>@@ -90,6 +90,7 @@ nvkm_cstate_valid(struct nvkm_clk *clk, struct nvkm_cstate *cstate,</div><div class='ctx'> 			case NVKM_CLK_BOOST_NONE:</div><div class='ctx'> 				if (clk-&gt;base_khz &amp;&amp; freq &gt; clk-&gt;base_khz)</div><div class='ctx'> 					return false;</div><div class='add'>+				/* fall through */</div><div class='ctx'> 			case NVKM_CLK_BOOST_BIOS:</div><div class='ctx'> 				if (clk-&gt;boost_khz &amp;&amp; freq &gt; clk-&gt;boost_khz)</div><div class='ctx'> 					return false;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c<br/>index 1c21b8b53b78..4f000237796f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c</a></div><div class='hunk'>@@ -363,6 +363,7 @@ mcp77_clk_prog(struct nvkm_clk *base)</div><div class='ctx'> 	switch (clk-&gt;vsrc) {</div><div class='ctx'> 	case nv_clk_src_cclk:</div><div class='ctx'> 		mast |= 0x00400000;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		nvkm_wr32(device, 0x4600, clk-&gt;vdiv);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c<br/>index 2b12e388f47a..5f4c287d7943 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c</a></div><div class='hunk'>@@ -131,11 +131,13 @@ nv40_ram_prog(struct nvkm_ram *base)</div><div class='ctx'> 		nvkm_mask(device, 0x00402c, 0xc0771100, ram-&gt;ctrl);</div><div class='ctx'> 		nvkm_wr32(device, 0x004048, ram-&gt;coef);</div><div class='ctx'> 		nvkm_wr32(device, 0x004030, ram-&gt;coef);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0x43:</div><div class='ctx'> 	case 0x49:</div><div class='ctx'> 	case 0x4b:</div><div class='ctx'> 		nvkm_mask(device, 0x004038, 0xc0771100, ram-&gt;ctrl);</div><div class='ctx'> 		nvkm_wr32(device, 0x00403c, ram-&gt;coef);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		nvkm_mask(device, 0x004020, 0xc0771100, ram-&gt;ctrl);</div><div class='ctx'> 		nvkm_wr32(device, 0x004024, ram-&gt;coef);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c<br/>index 844971e5e874..2a6150ab5611 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c</a></div><div class='hunk'>@@ -159,6 +159,7 @@ mxm_dcb_sanitise_entry(struct nvkm_bios *bios, void *data, int idx, u16 pdcb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x0e: /* eDP, falls through to DPint */</div><div class='ctx'> 		ctx.outp[1] |= 0x00010000;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0x07: /* DP internal, wtf is this?? HP8670w */</div><div class='ctx'> 		ctx.outp[1] |= 0x00000004; /* use_power_scripts? */</div><div class='ctx'> 		type = DCB_CONNECTOR_eDP;</div><div class='head'>diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c<br/>index 340383150fb9..ebf9c96d43ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c</a></div><div class='hunk'>@@ -175,6 +175,7 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)</div><div class='ctx'> 		REG_FLD_MOD(core-&gt;base, HDMI_CORE_SYS_INTR_UNMASK4, 0, 3, 3);</div><div class='ctx'> 		hdmi_wp_clear_irqenable(core-&gt;wp, HDMI_IRQ_CORE);</div><div class='ctx'> 		hdmi_wp_set_irqstatus(core-&gt;wp, HDMI_IRQ_CORE);</div><div class='add'>+		REG_FLD_MOD(core-&gt;wp-&gt;base, HDMI_WP_CLK, 0, 5, 0);</div><div class='ctx'> 		hdmi4_core_disable(core);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -182,16 +183,24 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Initialize CEC clock divider: CEC needs 2MHz clock hence</div><div class='add'>+	 * set the divider to 24 to get 48/24=2MHz clock</div><div class='add'>+	 */</div><div class='add'>+	REG_FLD_MOD(core-&gt;wp-&gt;base, HDMI_WP_CLK, 0x18, 5, 0);</div><div class='add'>+</div><div class='ctx'> 	/* Clear TX FIFO */</div><div class='ctx'> 	if (!hdmi_cec_clear_tx_fifo(adap)) {</div><div class='ctx'> 		pr_err("cec-%s: could not clear TX FIFO\n", adap-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_disable_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear RX FIFO */</div><div class='ctx'> 	if (!hdmi_cec_clear_rx_fifo(adap)) {</div><div class='ctx'> 		pr_err("cec-%s: could not clear RX FIFO\n", adap-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_disable_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear CEC interrupts */</div><div class='hunk'>@@ -236,6 +245,12 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)</div><div class='ctx'> 		hdmi_write_reg(core-&gt;base, HDMI_CEC_INT_STATUS_1, temp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_disable_clk:</div><div class='add'>+	REG_FLD_MOD(core-&gt;wp-&gt;base, HDMI_WP_CLK, 0, 5, 0);</div><div class='add'>+	hdmi4_core_disable(core);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)</div><div class='hunk'>@@ -333,11 +348,8 @@ int hdmi4_cec_init(struct platform_device *pdev, struct hdmi_core_data *core,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	core-&gt;wp = wp;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Initialize CEC clock divider: CEC needs 2MHz clock hence</div><div class='del'>-	 * set the devider to 24 to get 48/24=2MHz clock</div><div class='del'>-	 */</div><div class='del'>-	REG_FLD_MOD(core-&gt;wp-&gt;base, HDMI_WP_CLK, 0x18, 5, 0);</div><div class='add'>+	/* Disable clock initially, hdmi_cec_adap_enable() manages it */</div><div class='add'>+	REG_FLD_MOD(core-&gt;wp-&gt;base, HDMI_WP_CLK, 0, 5, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = cec_register_adapter(core-&gt;adap, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='head'>diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c<br/>index 813ba42f2753..e384b95ad857 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/omapdrm/dss/hdmi4_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/omapdrm/dss/hdmi4_core.c</a></div><div class='hunk'>@@ -708,7 +708,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,</div><div class='ctx'> 	else</div><div class='ctx'> 		acore.i2s_cfg.justification = HDMI_AUDIO_JUSTIFY_RIGHT;</div><div class='ctx'> 	/*</div><div class='del'>-	 * The I2S input word length is twice the lenght given in the IEC-60958</div><div class='add'>+	 * The I2S input word length is twice the length given in the IEC-60958</div><div class='ctx'> 	 * status word. If the word size is greater than</div><div class='ctx'> 	 * 20 bits, increment by one.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c<br/>index 578d867a81d5..f33e349c4ec5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/qxl/qxl_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/qxl/qxl_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/qxl/qxl_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/qxl/qxl_drv.c</a></div><div class='hunk'>@@ -255,10 +255,14 @@ static struct drm_driver qxl_driver = {</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> 	.debugfs_init = qxl_debugfs_init,</div><div class='ctx'> #endif</div><div class='add'>+	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,</div><div class='add'>+	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,</div><div class='ctx'> 	.gem_prime_export = drm_gem_prime_export,</div><div class='ctx'> 	.gem_prime_import = drm_gem_prime_import,</div><div class='ctx'> 	.gem_prime_pin = qxl_gem_prime_pin,</div><div class='ctx'> 	.gem_prime_unpin = qxl_gem_prime_unpin,</div><div class='add'>+	.gem_prime_get_sg_table = qxl_gem_prime_get_sg_table,</div><div class='add'>+	.gem_prime_import_sg_table = qxl_gem_prime_import_sg_table,</div><div class='ctx'> 	.gem_prime_vmap = qxl_gem_prime_vmap,</div><div class='ctx'> 	.gem_prime_vunmap = qxl_gem_prime_vunmap,</div><div class='ctx'> 	.gem_prime_mmap = qxl_gem_prime_mmap,</div><div class='head'>diff --git a/drivers/gpu/drm/qxl/qxl_prime.c b/drivers/gpu/drm/qxl/qxl_prime.c<br/>index 8b448eca1cd9..114653b471c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/qxl/qxl_prime.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/qxl/qxl_prime.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/qxl/qxl_prime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/qxl/qxl_prime.c</a></div><div class='hunk'>@@ -42,6 +42,18 @@ void qxl_gem_prime_unpin(struct drm_gem_object *obj)</div><div class='ctx'> 	qxl_bo_unpin(bo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOSYS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drm_gem_object *qxl_gem_prime_import_sg_table(</div><div class='add'>+	struct drm_device *dev, struct dma_buf_attachment *attach,</div><div class='add'>+	struct sg_table *table)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOSYS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void *qxl_gem_prime_vmap(struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct qxl_bo *bo = gem_to_qxl_bo(obj);</div><div class='head'>diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c<br/>index c7d4c6073ea5..0d4ade9d4722 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/rockchip/rockchip_drm_vop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/rockchip/rockchip_drm_vop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/rockchip/rockchip_drm_vop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/rockchip/rockchip_drm_vop.c</a></div><div class='hunk'>@@ -541,6 +541,18 @@ static void vop_core_clks_disable(struct vop *vop)</div><div class='ctx'> 	clk_disable(vop-&gt;hclk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vop_win_disable(struct vop *vop, const struct vop_win_data *win)</div><div class='add'>+{</div><div class='add'>+	if (win-&gt;phy-&gt;scl &amp;&amp; win-&gt;phy-&gt;scl-&gt;ext) {</div><div class='add'>+		VOP_SCL_SET_EXT(vop, win, yrgb_hor_scl_mode, SCALE_NONE);</div><div class='add'>+		VOP_SCL_SET_EXT(vop, win, yrgb_ver_scl_mode, SCALE_NONE);</div><div class='add'>+		VOP_SCL_SET_EXT(vop, win, cbcr_hor_scl_mode, SCALE_NONE);</div><div class='add'>+		VOP_SCL_SET_EXT(vop, win, cbcr_ver_scl_mode, SCALE_NONE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	VOP_WIN_SET(vop, win, enable, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vop_enable(struct drm_crtc *crtc)</div><div class='ctx'> {</div><div class='ctx'> 	struct vop *vop = to_vop(crtc);</div><div class='hunk'>@@ -586,7 +598,7 @@ static int vop_enable(struct drm_crtc *crtc)</div><div class='ctx'> 		struct vop_win *vop_win = &amp;vop-&gt;win[i];</div><div class='ctx'> 		const struct vop_win_data *win = vop_win-&gt;data;</div><div class='ctx'> </div><div class='del'>-		VOP_WIN_SET(vop, win, enable, 0);</div><div class='add'>+		vop_win_disable(vop, win);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;vop-&gt;reg_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -735,7 +747,7 @@ static void vop_plane_atomic_disable(struct drm_plane *plane,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;vop-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	VOP_WIN_SET(vop, win, enable, 0);</div><div class='add'>+	vop_win_disable(vop, win);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;vop-&gt;reg_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1622,7 +1634,7 @@ static int vop_initial(struct vop *vop)</div><div class='ctx'> 		int channel = i * 2 + 1;</div><div class='ctx'> </div><div class='ctx'> 		VOP_WIN_SET(vop, win, channel, (channel + 1) &lt;&lt; 4 | channel);</div><div class='del'>-		VOP_WIN_SET(vop, win, enable, 0);</div><div class='add'>+		vop_win_disable(vop, win);</div><div class='ctx'> 		VOP_WIN_SET(vop, win, gate, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c<br/>index 19fc601c9eeb..a1bec2779e76 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/scheduler/sched_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/scheduler/sched_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/scheduler/sched_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/scheduler/sched_main.c</a></div><div class='hunk'>@@ -366,10 +366,9 @@ void drm_sched_increase_karma(struct drm_sched_job *bad)</div><div class='ctx'> EXPORT_SYMBOL(drm_sched_increase_karma);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_sched_hw_job_reset - stop the scheduler if it contains the bad job</div><div class='add'>+ * drm_sched_stop - stop the scheduler</div><div class='ctx'>  *</div><div class='ctx'>  * @sched: scheduler instance</div><div class='del'>- * @bad: bad scheduler job</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> void drm_sched_stop(struct drm_gpu_scheduler *sched)</div><div class='head'>diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c<br/>index 3ebd9f5e2719..29258b404e54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/sun4i/sun4i_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/sun4i/sun4i_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/sun4i/sun4i_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/sun4i/sun4i_drv.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/of_reserved_mem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm_atomic_helper.h&gt;</div><div class='ctx'> #include &lt;drm/drm_fb_cma_helper.h&gt;</div><div class='ctx'> #include &lt;drm/drm_fb_helper.h&gt;</div><div class='ctx'> #include &lt;drm/drm_gem_cma_helper.h&gt;</div><div class='hunk'>@@ -85,6 +86,8 @@ static int sun4i_drv_bind(struct device *dev)</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto free_drm;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, drm);</div><div class='ctx'> 	drm-&gt;dev_private = drv;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;drv-&gt;frontend_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;drv-&gt;engine_list);</div><div class='hunk'>@@ -144,8 +147,12 @@ static void sun4i_drv_unbind(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	drm_dev_unregister(drm);</div><div class='ctx'> 	drm_kms_helper_poll_fini(drm);</div><div class='add'>+	drm_atomic_helper_shutdown(drm);</div><div class='ctx'> 	drm_mode_config_cleanup(drm);</div><div class='add'>+</div><div class='add'>+	component_unbind_all(dev, NULL);</div><div class='ctx'> 	of_reserved_mem_device_release(dev);</div><div class='add'>+</div><div class='ctx'> 	drm_dev_put(drm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,6 +402,8 @@ static int sun4i_drv_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static int sun4i_drv_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	component_master_del(&amp;pdev-&gt;dev, &amp;sun4i_drv_master_ops);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c<br/>index dc47720c99ba..39d8509d96a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c</a></div><div class='hunk'>@@ -48,8 +48,13 @@ static enum drm_mode_status</div><div class='ctx'> sun8i_dw_hdmi_mode_valid_h6(struct drm_connector *connector,</div><div class='ctx'> 			    const struct drm_display_mode *mode)</div><div class='ctx'> {</div><div class='del'>-	/* This is max for HDMI 2.0b (4K@60Hz) */</div><div class='del'>-	if (mode-&gt;clock &gt; 594000)</div><div class='add'>+	/*</div><div class='add'>+	 * Controller support maximum of 594 MHz, which correlates to</div><div class='add'>+	 * 4K@60Hz 4:4:4 or RGB. However, for frequencies greater than</div><div class='add'>+	 * 340 MHz scrambling has to be enabled. Because scrambling is</div><div class='add'>+	 * not yet implemented, just limit to 340 MHz for now.</div><div class='add'>+	 */</div><div class='add'>+	if (mode-&gt;clock &gt; 340000)</div><div class='ctx'> 		return MODE_CLOCK_HIGH;</div><div class='ctx'> </div><div class='ctx'> 	return MODE_OK;</div><div class='head'>diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c<br/>index fc36e0c10a37..b1e7c76e9c17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/sun4i/sun8i_tcon_top.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/sun4i/sun8i_tcon_top.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/sun4i/sun8i_tcon_top.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/sun4i/sun8i_tcon_top.c</a></div><div class='hunk'>@@ -227,7 +227,7 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master,</div><div class='ctx'> </div><div class='ctx'> err_unregister_gates:</div><div class='ctx'> 	for (i = 0; i &lt; CLK_NUM; i++)</div><div class='del'>-		if (clk_data-&gt;hws[i])</div><div class='add'>+		if (!IS_ERR_OR_NULL(clk_data-&gt;hws[i]))</div><div class='ctx'> 			clk_hw_unregister_gate(clk_data-&gt;hws[i]);</div><div class='ctx'> 	clk_disable_unprepare(tcon_top-&gt;bus);</div><div class='ctx'> err_assert_reset:</div><div class='hunk'>@@ -245,7 +245,8 @@ static void sun8i_tcon_top_unbind(struct device *dev, struct device *master,</div><div class='ctx'> </div><div class='ctx'> 	of_clk_del_provider(dev-&gt;of_node);</div><div class='ctx'> 	for (i = 0; i &lt; CLK_NUM; i++)</div><div class='del'>-		clk_hw_unregister_gate(clk_data-&gt;hws[i]);</div><div class='add'>+		if (clk_data-&gt;hws[i])</div><div class='add'>+			clk_hw_unregister_gate(clk_data-&gt;hws[i]);</div><div class='ctx'> </div><div class='ctx'> 	clk_disable_unprepare(tcon_top-&gt;bus);</div><div class='ctx'> 	reset_control_assert(tcon_top-&gt;rst);</div><div class='head'>diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c<br/>index 47c55974756d..d23c4bfde790 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/tegra/hdmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/tegra/hdmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/tegra/hdmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/tegra/hdmi.c</a></div><div class='hunk'>@@ -1260,9 +1260,15 @@ static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder)</div><div class='ctx'> </div><div class='ctx'> 	hdmi-&gt;dvi = !tegra_output_is_hdmi(output);</div><div class='ctx'> 	if (!hdmi-&gt;dvi) {</div><div class='del'>-		err = tegra_hdmi_setup_audio(hdmi);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			hdmi-&gt;dvi = true;</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure that the audio format has been configured before</div><div class='add'>+		 * enabling audio, otherwise we may try to divide by zero.</div><div class='add'>+		*/</div><div class='add'>+		if (hdmi-&gt;format.sample_rate &gt; 0) {</div><div class='add'>+			err = tegra_hdmi_setup_audio(hdmi);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				hdmi-&gt;dvi = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdmi-&gt;config-&gt;has_hda)</div><div class='head'>diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c<br/>index ba9b3cfb8c3d..b3436c2aed68 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/tegra/hub.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/tegra/hub.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/tegra/hub.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/tegra/hub.c</a></div><div class='hunk'>@@ -378,14 +378,16 @@ static int tegra_shared_plane_atomic_check(struct drm_plane *plane,</div><div class='ctx'> static void tegra_shared_plane_atomic_disable(struct drm_plane *plane,</div><div class='ctx'> 					      struct drm_plane_state *old_state)</div><div class='ctx'> {</div><div class='del'>-	struct tegra_dc *dc = to_tegra_dc(old_state-&gt;crtc);</div><div class='ctx'> 	struct tegra_plane *p = to_tegra_plane(plane);</div><div class='add'>+	struct tegra_dc *dc;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='ctx'> 	/* rien ne va plus */</div><div class='ctx'> 	if (!old_state || !old_state-&gt;crtc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	dc = to_tegra_dc(old_state-&gt;crtc);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * XXX Legacy helpers seem to sometimes call -&gt;atomic_disable() even</div><div class='ctx'> 	 * on planes that are already disabled. Make sure we fallback to the</div><div class='head'>diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c<br/>index 39bfed9623de..982ce37ecde1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/tegra/vic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/tegra/vic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/tegra/vic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/tegra/vic.c</a></div><div class='hunk'>@@ -106,6 +106,7 @@ static int vic_boot(struct vic *vic)</div><div class='ctx'> 	if (vic-&gt;booted)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IOMMU_API</div><div class='ctx'> 	if (vic-&gt;config-&gt;supports_sid) {</div><div class='ctx'> 		struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic-&gt;dev);</div><div class='ctx'> 		u32 value;</div><div class='hunk'>@@ -121,6 +122,7 @@ static int vic_boot(struct vic *vic)</div><div class='ctx'> 			vic_writel(vic, value, VIC_THI_STREAMID1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* setup clockgating registers */</div><div class='ctx'> 	vic_writel(vic, CG_IDLE_CG_DLY_CNT(4) |</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c<br/>index 3f56647cdb35..1a01669b159a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/ttm/ttm_bo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/ttm/ttm_bo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/ttm/ttm_bo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/ttm/ttm_bo.c</a></div><div class='hunk'>@@ -49,9 +49,8 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj);</div><div class='ctx'>  * ttm_global_mutex - protecting the global BO state</div><div class='ctx'>  */</div><div class='ctx'> DEFINE_MUTEX(ttm_global_mutex);</div><div class='del'>-struct ttm_bo_global ttm_bo_glob = {</div><div class='del'>-	.use_count = 0</div><div class='del'>-};</div><div class='add'>+unsigned ttm_bo_glob_use_count;</div><div class='add'>+struct ttm_bo_global ttm_bo_glob;</div><div class='ctx'> </div><div class='ctx'> static struct attribute ttm_bo_count = {</div><div class='ctx'> 	.name = "bo_count",</div><div class='hunk'>@@ -876,8 +875,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,</div><div class='ctx'> 		reservation_object_add_shared_fence(bo-&gt;resv, fence);</div><div class='ctx'> </div><div class='ctx'> 		ret = reservation_object_reserve_shared(bo-&gt;resv, 1);</div><div class='del'>-		if (unlikely(ret))</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			dma_fence_put(fence);</div><div class='ctx'> 			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		dma_fence_put(bo-&gt;moving);</div><div class='ctx'> 		bo-&gt;moving = fence;</div><div class='hunk'>@@ -1529,12 +1530,13 @@ static void ttm_bo_global_release(void)</div><div class='ctx'> 	struct ttm_bo_global *glob = &amp;ttm_bo_glob;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ttm_global_mutex);</div><div class='del'>-	if (--glob-&gt;use_count &gt; 0)</div><div class='add'>+	if (--ttm_bo_glob_use_count &gt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	kobject_del(&amp;glob-&gt;kobj);</div><div class='ctx'> 	kobject_put(&amp;glob-&gt;kobj);</div><div class='ctx'> 	ttm_mem_global_release(&amp;ttm_mem_glob);</div><div class='add'>+	memset(glob, 0, sizeof(*glob));</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;ttm_global_mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -1546,7 +1548,7 @@ static int ttm_bo_global_init(void)</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ttm_global_mutex);</div><div class='del'>-	if (++glob-&gt;use_count &gt; 1)</div><div class='add'>+	if (++ttm_bo_glob_use_count &gt; 1)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = ttm_mem_global_init(&amp;ttm_mem_glob);</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c<br/>index f1567c353b54..9a0909decb36 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/ttm/ttm_memory.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/ttm/ttm_memory.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/ttm/ttm_memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/ttm/ttm_memory.c</a></div><div class='hunk'>@@ -461,8 +461,8 @@ out_no_zone:</div><div class='ctx'> </div><div class='ctx'> void ttm_mem_global_release(struct ttm_mem_global *glob)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='ctx'> 	struct ttm_mem_zone *zone;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/* let the page allocator first stop the shrink work. */</div><div class='ctx'> 	ttm_page_alloc_fini();</div><div class='hunk'>@@ -475,9 +475,10 @@ void ttm_mem_global_release(struct ttm_mem_global *glob)</div><div class='ctx'> 		zone = glob-&gt;zones[i];</div><div class='ctx'> 		kobject_del(&amp;zone-&gt;kobj);</div><div class='ctx'> 		kobject_put(&amp;zone-&gt;kobj);</div><div class='del'>-			}</div><div class='add'>+	}</div><div class='ctx'> 	kobject_del(&amp;glob-&gt;kobj);</div><div class='ctx'> 	kobject_put(&amp;glob-&gt;kobj);</div><div class='add'>+	memset(glob, 0, sizeof(*glob));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ttm_check_swapping(struct ttm_mem_global *glob)</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c<br/>index f841accc2c00..627f8dc91d0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/ttm/ttm_page_alloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/ttm/ttm_page_alloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/ttm/ttm_page_alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/ttm/ttm_page_alloc.c</a></div><div class='hunk'>@@ -730,9 +730,10 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-			if (!(flags &amp; TTM_PAGE_FLAG_DMA32)) {</div><div class='del'>-				for (j = 0; j &lt; HPAGE_PMD_NR; ++j)</div><div class='del'>-					if (p++ != pages[i + j])</div><div class='add'>+			if (!(flags &amp; TTM_PAGE_FLAG_DMA32) &amp;&amp;</div><div class='add'>+			    (npages - i) &gt;= HPAGE_PMD_NR) {</div><div class='add'>+				for (j = 1; j &lt; HPAGE_PMD_NR; ++j)</div><div class='add'>+					if (++p != pages[i + j])</div><div class='ctx'> 					    break;</div><div class='ctx'> </div><div class='ctx'> 				if (j == HPAGE_PMD_NR)</div><div class='hunk'>@@ -759,15 +760,15 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,</div><div class='ctx'> 		unsigned max_size, n2free;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;huge-&gt;lock, irq_flags);</div><div class='del'>-		while (i &lt; npages) {</div><div class='add'>+		while ((npages - i) &gt;= HPAGE_PMD_NR) {</div><div class='ctx'> 			struct page *p = pages[i];</div><div class='ctx'> 			unsigned j;</div><div class='ctx'> </div><div class='ctx'> 			if (!p)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			for (j = 0; j &lt; HPAGE_PMD_NR; ++j)</div><div class='del'>-				if (p++ != pages[i + j])</div><div class='add'>+			for (j = 1; j &lt; HPAGE_PMD_NR; ++j)</div><div class='add'>+				if (++p != pages[i + j])</div><div class='ctx'> 				    break;</div><div class='ctx'> </div><div class='ctx'> 			if (j != HPAGE_PMD_NR)</div><div class='head'>diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c<br/>index 66885c24590f..c1bd5e3d9e4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_connector.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_connector.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_connector.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/udl/udl_connector.c</a></div><div class='hunk'>@@ -18,18 +18,19 @@</div><div class='ctx'> #include "udl_connector.h"</div><div class='ctx'> #include "udl_drv.h"</div><div class='ctx'> </div><div class='del'>-static bool udl_get_edid_block(struct udl_device *udl, int block_idx,</div><div class='del'>-							   u8 *buff)</div><div class='add'>+static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,</div><div class='add'>+			       size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u8 *read_buff;</div><div class='add'>+	struct udl_device *udl = data;</div><div class='ctx'> </div><div class='ctx'> 	read_buff = kmalloc(2, GFP_KERNEL);</div><div class='ctx'> 	if (!read_buff)</div><div class='del'>-		return false;</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; EDID_LENGTH; i++) {</div><div class='del'>-		int bval = (i + block_idx * EDID_LENGTH) &lt;&lt; 8;</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		int bval = (i + block * EDID_LENGTH) &lt;&lt; 8;</div><div class='ctx'> 		ret = usb_control_msg(udl-&gt;udev,</div><div class='ctx'> 				      usb_rcvctrlpipe(udl-&gt;udev, 0),</div><div class='ctx'> 					  (0x02), (0x80 | (0x02 &lt;&lt; 5)), bval,</div><div class='hunk'>@@ -37,60 +38,13 @@ static bool udl_get_edid_block(struct udl_device *udl, int block_idx,</div><div class='ctx'> 		if (ret &lt; 1) {</div><div class='ctx'> 			DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);</div><div class='ctx'> 			kfree(read_buff);</div><div class='del'>-			return false;</div><div class='add'>+			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		buff[i] = read_buff[1];</div><div class='add'>+		buf[i] = read_buff[1];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(read_buff);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool udl_get_edid(struct udl_device *udl, u8 **result_buff,</div><div class='del'>-			 int *result_buff_size)</div><div class='del'>-{</div><div class='del'>-	int i, extensions;</div><div class='del'>-	u8 *block_buff = NULL, *buff_ptr;</div><div class='del'>-</div><div class='del'>-	block_buff = kmalloc(EDID_LENGTH, GFP_KERNEL);</div><div class='del'>-	if (block_buff == NULL)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (udl_get_edid_block(udl, 0, block_buff) &amp;&amp;</div><div class='del'>-	    memchr_inv(block_buff, 0, EDID_LENGTH)) {</div><div class='del'>-		extensions = ((struct edid *)block_buff)-&gt;extensions;</div><div class='del'>-		if (extensions &gt; 0) {</div><div class='del'>-			/* we have to read all extensions one by one */</div><div class='del'>-			*result_buff_size = EDID_LENGTH * (extensions + 1);</div><div class='del'>-			*result_buff = kmalloc(*result_buff_size, GFP_KERNEL);</div><div class='del'>-			buff_ptr = *result_buff;</div><div class='del'>-			if (buff_ptr == NULL) {</div><div class='del'>-				kfree(block_buff);</div><div class='del'>-				return false;</div><div class='del'>-			}</div><div class='del'>-			memcpy(buff_ptr, block_buff, EDID_LENGTH);</div><div class='del'>-			kfree(block_buff);</div><div class='del'>-			buff_ptr += EDID_LENGTH;</div><div class='del'>-			for (i = 1; i &lt; extensions; ++i) {</div><div class='del'>-				if (udl_get_edid_block(udl, i, buff_ptr)) {</div><div class='del'>-					buff_ptr += EDID_LENGTH;</div><div class='del'>-				} else {</div><div class='del'>-					kfree(*result_buff);</div><div class='del'>-					*result_buff = NULL;</div><div class='del'>-					return false;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		/* we have only base edid block */</div><div class='del'>-		*result_buff = block_buff;</div><div class='del'>-		*result_buff_size = EDID_LENGTH;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(block_buff);</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='ctx'> static int udl_get_modes(struct drm_connector *connector)</div><div class='hunk'>@@ -122,8 +76,6 @@ static enum drm_mode_status udl_mode_valid(struct drm_connector *connector,</div><div class='ctx'> static enum drm_connector_status</div><div class='ctx'> udl_detect(struct drm_connector *connector, bool force)</div><div class='ctx'> {</div><div class='del'>-	u8 *edid_buff = NULL;</div><div class='del'>-	int edid_buff_size = 0;</div><div class='ctx'> 	struct udl_device *udl = connector-&gt;dev-&gt;dev_private;</div><div class='ctx'> 	struct udl_drm_connector *udl_connector =</div><div class='ctx'> 					container_of(connector,</div><div class='hunk'>@@ -136,12 +88,10 @@ udl_detect(struct drm_connector *connector, bool force)</div><div class='ctx'> 		udl_connector-&gt;edid = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	if (!udl_get_edid(udl, &amp;edid_buff, &amp;edid_buff_size))</div><div class='add'>+	udl_connector-&gt;edid = drm_do_get_edid(connector, udl_get_edid_block, udl);</div><div class='add'>+	if (!udl_connector-&gt;edid)</div><div class='ctx'> 		return connector_status_disconnected;</div><div class='ctx'> </div><div class='del'>-	udl_connector-&gt;edid = (struct edid *)edid_buff;</div><div class='del'>-	</div><div class='ctx'> 	return connector_status_connected;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c<br/>index 22cd2d13e272..ff47f890e6ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/udl/udl_drv.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,</div><div class='ctx'> 	.load = udl_driver_load,</div><div class='ctx'> 	.unload = udl_driver_unload,</div><div class='add'>+	.release = udl_driver_release,</div><div class='ctx'> </div><div class='ctx'> 	/* gem hooks */</div><div class='ctx'> 	.gem_free_object_unlocked = udl_gem_free_object,</div><div class='head'>diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h<br/>index e9e9b1ff678e..4ae67d882eae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_drv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_drv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/udl/udl_drv.h</a></div><div class='hunk'>@@ -104,6 +104,7 @@ void udl_urb_completion(struct urb *urb);</div><div class='ctx'> </div><div class='ctx'> int udl_driver_load(struct drm_device *dev, unsigned long flags);</div><div class='ctx'> void udl_driver_unload(struct drm_device *dev);</div><div class='add'>+void udl_driver_release(struct drm_device *dev);</div><div class='ctx'> </div><div class='ctx'> int udl_fbdev_init(struct drm_device *dev);</div><div class='ctx'> void udl_fbdev_cleanup(struct drm_device *dev);</div><div class='head'>diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c<br/>index d5a23295dd80..bb7b58407039 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_gem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_gem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/udl/udl_gem.c</a></div><div class='hunk'>@@ -224,7 +224,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,</div><div class='ctx'> 	*offset = drm_vma_node_offset_addr(&amp;gobj-&gt;base.vma_node);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	drm_gem_object_put(&amp;gobj-&gt;base);</div><div class='add'>+	drm_gem_object_put_unlocked(&amp;gobj-&gt;base);</div><div class='ctx'> unlock:</div><div class='ctx'> 	mutex_unlock(&amp;udl-&gt;gem_lock);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c<br/>index 9086d0d1b880..1f8ef34ade24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/udl/udl_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/udl/udl_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/udl/udl_main.c</a></div><div class='hunk'>@@ -379,6 +379,12 @@ void udl_driver_unload(struct drm_device *dev)</div><div class='ctx'> 		udl_free_urb_list(dev);</div><div class='ctx'> </div><div class='ctx'> 	udl_fbdev_cleanup(dev);</div><div class='del'>-	udl_modeset_cleanup(dev);</div><div class='ctx'> 	kfree(udl);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void udl_driver_release(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	udl_modeset_cleanup(dev);</div><div class='add'>+	drm_dev_fini(dev);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c<br/>index 730008d3da76..1baa10e94484 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vc4/vc4_crtc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vc4/vc4_crtc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vc4/vc4_crtc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/vc4/vc4_crtc.c</a></div><div class='hunk'>@@ -1042,7 +1042,7 @@ static void</div><div class='ctx'> vc4_crtc_reset(struct drm_crtc *crtc)</div><div class='ctx'> {</div><div class='ctx'> 	if (crtc-&gt;state)</div><div class='del'>-		__drm_atomic_helper_crtc_destroy_state(crtc-&gt;state);</div><div class='add'>+		vc4_crtc_destroy_state(crtc, crtc-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	crtc-&gt;state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL);</div><div class='ctx'> 	if (crtc-&gt;state)</div><div class='head'>diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c<br/>index 5930facd6d2d..11a8f99ba18c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vgem/vgem_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vgem/vgem_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vgem/vgem_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/vgem/vgem_drv.c</a></div><div class='hunk'>@@ -191,13 +191,9 @@ static struct drm_gem_object *vgem_gem_create(struct drm_device *dev,</div><div class='ctx'> 	ret = drm_gem_handle_create(file, &amp;obj-&gt;base, handle);</div><div class='ctx'> 	drm_gem_object_put_unlocked(&amp;obj-&gt;base);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err;</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;obj-&gt;base;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	__vgem_gem_destroy(obj);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vgem_gem_dumb_create(struct drm_file *file, struct drm_device *dev,</div><div class='head'>diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c<br/>index b996ac1d4fcc..af92964b6889 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/virtio/virtgpu_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/virtio/virtgpu_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/virtio/virtgpu_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/virtio/virtgpu_drv.c</a></div><div class='hunk'>@@ -205,10 +205,14 @@ static struct drm_driver driver = {</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> 	.debugfs_init = virtio_gpu_debugfs_init,</div><div class='ctx'> #endif</div><div class='add'>+	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,</div><div class='add'>+	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,</div><div class='ctx'> 	.gem_prime_export = drm_gem_prime_export,</div><div class='ctx'> 	.gem_prime_import = drm_gem_prime_import,</div><div class='ctx'> 	.gem_prime_pin = virtgpu_gem_prime_pin,</div><div class='ctx'> 	.gem_prime_unpin = virtgpu_gem_prime_unpin,</div><div class='add'>+	.gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table,</div><div class='add'>+	.gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,</div><div class='ctx'> 	.gem_prime_vmap = virtgpu_gem_prime_vmap,</div><div class='ctx'> 	.gem_prime_vunmap = virtgpu_gem_prime_vunmap,</div><div class='ctx'> 	.gem_prime_mmap = virtgpu_gem_prime_mmap,</div><div class='head'>diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h<br/>index 3238fdf58eb4..d577cb76f5ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/virtio/virtgpu_drv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/virtio/virtgpu_drv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/virtio/virtgpu_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/virtio/virtgpu_drv.h</a></div><div class='hunk'>@@ -354,6 +354,10 @@ int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait);</div><div class='ctx'> /* virtgpu_prime.c */</div><div class='ctx'> int virtgpu_gem_prime_pin(struct drm_gem_object *obj);</div><div class='ctx'> void virtgpu_gem_prime_unpin(struct drm_gem_object *obj);</div><div class='add'>+struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);</div><div class='add'>+struct drm_gem_object *virtgpu_gem_prime_import_sg_table(</div><div class='add'>+	struct drm_device *dev, struct dma_buf_attachment *attach,</div><div class='add'>+	struct sg_table *sgt);</div><div class='ctx'> void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj);</div><div class='ctx'> void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);</div><div class='ctx'> int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,</div><div class='head'>diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c<br/>index c59ec34c80a5..eb51a78e1199 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/virtio/virtgpu_prime.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/virtio/virtgpu_prime.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/virtio/virtgpu_prime.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/virtio/virtgpu_prime.c</a></div><div class='hunk'>@@ -39,6 +39,18 @@ void virtgpu_gem_prime_unpin(struct drm_gem_object *obj)</div><div class='ctx'> 	WARN_ONCE(1, "not implemented");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drm_gem_object *virtgpu_gem_prime_import_sg_table(</div><div class='add'>+	struct drm_device *dev, struct dma_buf_attachment *attach,</div><div class='add'>+	struct sg_table *table)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);</div><div class='head'>diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c<br/>index 138b0bb325cf..69048e73377d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vkms/vkms_gem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vkms/vkms_gem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vkms/vkms_gem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/vkms/vkms_gem.c</a></div><div class='hunk'>@@ -111,11 +111,8 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	ret = drm_gem_handle_create(file, &amp;obj-&gt;gem, handle);</div><div class='ctx'> 	drm_gem_object_put_unlocked(&amp;obj-&gt;gem);</div><div class='del'>-	if (ret) {</div><div class='del'>-		drm_gem_object_release(&amp;obj-&gt;gem);</div><div class='del'>-		kfree(obj);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return &amp;obj-&gt;gem;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c<br/>index 6165fe2c4504..1bfa353d995c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.c</a></div><div class='hunk'>@@ -546,29 +546,13 @@ static void vmw_get_initial_size(struct vmw_private *dev_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vmw_assume_iommu - Figure out whether coherent dma-remapping might be</div><div class='del'>- * taking place.</div><div class='del'>- * @dev: Pointer to the struct drm_device.</div><div class='del'>- *</div><div class='del'>- * Return: true if iommu present, false otherwise.</div><div class='del'>- */</div><div class='del'>-static bool vmw_assume_iommu(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	const struct dma_map_ops *ops = get_dma_ops(dev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return !dma_is_direct(ops) &amp;&amp; ops &amp;&amp;</div><div class='del'>-		ops-&gt;map_page != dma_direct_map_page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * vmw_dma_select_mode - Determine how DMA mappings should be set up for this</div><div class='ctx'>  * system.</div><div class='ctx'>  *</div><div class='ctx'>  * @dev_priv: Pointer to a struct vmw_private</div><div class='ctx'>  *</div><div class='del'>- * This functions tries to determine the IOMMU setup and what actions</div><div class='del'>- * need to be taken by the driver to make system pages visible to the</div><div class='del'>- * device.</div><div class='add'>+ * This functions tries to determine what actions need to be taken by the</div><div class='add'>+ * driver to make system pages visible to the device.</div><div class='ctx'>  * If this function decides that DMA is not possible, it returns -EINVAL.</div><div class='ctx'>  * The driver may then try to disable features of the device that require</div><div class='ctx'>  * DMA.</div><div class='hunk'>@@ -578,23 +562,16 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv)</div><div class='ctx'> 	static const char *names[vmw_dma_map_max] = {</div><div class='ctx'> 		[vmw_dma_phys] = "Using physical TTM page addresses.",</div><div class='ctx'> 		[vmw_dma_alloc_coherent] = "Using coherent TTM pages.",</div><div class='del'>-		[vmw_dma_map_populate] = "Keeping DMA mappings.",</div><div class='add'>+		[vmw_dma_map_populate] = "Caching DMA mappings.",</div><div class='ctx'> 		[vmw_dma_map_bind] = "Giving up DMA mappings early."};</div><div class='ctx'> </div><div class='ctx'> 	if (vmw_force_coherent)</div><div class='ctx'> 		dev_priv-&gt;map_mode = vmw_dma_alloc_coherent;</div><div class='del'>-	else if (vmw_assume_iommu(dev_priv-&gt;dev))</div><div class='del'>-		dev_priv-&gt;map_mode = vmw_dma_map_populate;</div><div class='del'>-	else if (!vmw_force_iommu)</div><div class='del'>-		dev_priv-&gt;map_mode = vmw_dma_phys;</div><div class='del'>-	else if (IS_ENABLED(CONFIG_SWIOTLB) &amp;&amp; swiotlb_nr_tbl())</div><div class='del'>-		dev_priv-&gt;map_mode = vmw_dma_alloc_coherent;</div><div class='add'>+	else if (vmw_restrict_iommu)</div><div class='add'>+		dev_priv-&gt;map_mode = vmw_dma_map_bind;</div><div class='ctx'> 	else</div><div class='ctx'> 		dev_priv-&gt;map_mode = vmw_dma_map_populate;</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;map_mode == vmw_dma_map_populate &amp;&amp; vmw_restrict_iommu)</div><div class='del'>-		dev_priv-&gt;map_mode = vmw_dma_map_bind;</div><div class='del'>-</div><div class='ctx'> 	/* No TTM coherent page pool? FIXME: Ask TTM instead! */</div><div class='ctx'>         if (!(IS_ENABLED(CONFIG_SWIOTLB) || IS_ENABLED(CONFIG_INTEL_IOMMU)) &amp;&amp;</div><div class='ctx'> 	    (dev_priv-&gt;map_mode == vmw_dma_alloc_coherent))</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c<br/>index b913a56f3426..2a9112515f46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vmwgfx/vmwgfx_fb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/vmwgfx/vmwgfx_fb.c</a></div><div class='hunk'>@@ -564,11 +564,9 @@ static int vmw_fb_set_par(struct fb_info *info)</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC)</div><div class='ctx'> 	};</div><div class='del'>-	struct drm_display_mode *old_mode;</div><div class='ctx'> 	struct drm_display_mode *mode;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	old_mode = par-&gt;set_mode;</div><div class='ctx'> 	mode = drm_mode_duplicate(vmw_priv-&gt;dev, &amp;new_mode);</div><div class='ctx'> 	if (!mode) {</div><div class='ctx'> 		DRM_ERROR("Could not create new fb mode.\n");</div><div class='hunk'>@@ -579,11 +577,7 @@ static int vmw_fb_set_par(struct fb_info *info)</div><div class='ctx'> 	mode-&gt;vdisplay = var-&gt;yres;</div><div class='ctx'> 	vmw_guess_mode_timing(mode);</div><div class='ctx'> </div><div class='del'>-	if (old_mode &amp;&amp; drm_mode_equal(old_mode, mode)) {</div><div class='del'>-		drm_mode_destroy(vmw_priv-&gt;dev, mode);</div><div class='del'>-		mode = old_mode;</div><div class='del'>-		old_mode = NULL;</div><div class='del'>-	} else if (!vmw_kms_validate_mode_vram(vmw_priv,</div><div class='add'>+	if (!vmw_kms_validate_mode_vram(vmw_priv,</div><div class='ctx'> 					mode-&gt;hdisplay *</div><div class='ctx'> 					DIV_ROUND_UP(var-&gt;bits_per_pixel, 8),</div><div class='ctx'> 					mode-&gt;vdisplay)) {</div><div class='hunk'>@@ -620,8 +614,8 @@ static int vmw_fb_set_par(struct fb_info *info)</div><div class='ctx'> 	schedule_delayed_work(&amp;par-&gt;local_work, 0);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	if (old_mode)</div><div class='del'>-		drm_mode_destroy(vmw_priv-&gt;dev, old_mode);</div><div class='add'>+	if (par-&gt;set_mode)</div><div class='add'>+		drm_mode_destroy(vmw_priv-&gt;dev, par-&gt;set_mode);</div><div class='ctx'> 	par-&gt;set_mode = mode;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;par-&gt;bo_mutex);</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c<br/>index b93c558dd86e..7da752ca1c34 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,</div><div class='ctx'> </div><div class='ctx'> 	id = ida_alloc_max(&amp;gman-&gt;gmr_ida, gman-&gt;max_gmr_ids - 1, GFP_KERNEL);</div><div class='ctx'> 	if (id &lt; 0)</div><div class='del'>-		return id;</div><div class='add'>+		return (id != -ENOMEM ? 0 : id);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gman-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c<br/>index 27101c04a827..0c0eb43abf65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/host1x/hw/channel_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/host1x/hw/channel_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/host1x/hw/channel_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/host1x/hw/channel_hw.c</a></div><div class='hunk'>@@ -115,8 +115,12 @@ static inline void synchronize_syncpt_base(struct host1x_job *job)</div><div class='ctx'> static void host1x_channel_set_streamid(struct host1x_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> #if HOST1X_HW &gt;= 6</div><div class='add'>+	u32 sid = 0x7f;</div><div class='add'>+#ifdef CONFIG_IOMMU_API</div><div class='ctx'> 	struct iommu_fwspec *spec = dev_iommu_fwspec_get(channel-&gt;dev-&gt;parent);</div><div class='del'>-	u32 sid = spec ? spec-&gt;ids[0] &amp; 0xffff : 0x7f;</div><div class='add'>+	if (spec)</div><div class='add'>+		sid = spec-&gt;ids[0] &amp; 0xffff;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	host1x_ch_writel(channel, sid, HOST1X_CHANNEL_SMMU_STREAMID);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/ipu-v3/ipu-dp.c b/drivers/gpu/ipu-v3/ipu-dp.c<br/>index 9b2b3fa479c4..5e44ff1f2085 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/ipu-v3/ipu-dp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/gpu/ipu-v3/ipu-dp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/gpu/ipu-v3/ipu-dp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/gpu/ipu-v3/ipu-dp.c</a></div><div class='hunk'>@@ -195,7 +195,8 @@ int ipu_dp_setup_channel(struct ipu_dp *dp,</div><div class='ctx'> 		ipu_dp_csc_init(flow, flow-&gt;foreground.in_cs, flow-&gt;out_cs,</div><div class='ctx'> 				DP_COM_CONF_CSC_DEF_BOTH);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (flow-&gt;foreground.in_cs == flow-&gt;out_cs)</div><div class='add'>+		if (flow-&gt;foreground.in_cs == IPUV3_COLORSPACE_UNKNOWN ||</div><div class='add'>+		    flow-&gt;foreground.in_cs == flow-&gt;out_cs)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * foreground identical to output, apply color</div><div class='ctx'> 			 * conversion on background</div><div class='hunk'>@@ -261,6 +262,8 @@ void ipu_dp_disable_channel(struct ipu_dp *dp, bool sync)</div><div class='ctx'> 	struct ipu_dp_priv *priv = flow-&gt;priv;</div><div class='ctx'> 	u32 reg, csc;</div><div class='ctx'> </div><div class='add'>+	dp-&gt;in_cs = IPUV3_COLORSPACE_UNKNOWN;</div><div class='add'>+</div><div class='ctx'> 	if (!dp-&gt;foreground)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -268,8 +271,9 @@ void ipu_dp_disable_channel(struct ipu_dp *dp, bool sync)</div><div class='ctx'> </div><div class='ctx'> 	reg = readl(flow-&gt;base + DP_COM_CONF);</div><div class='ctx'> 	csc = reg &amp; DP_COM_CONF_CSC_DEF_MASK;</div><div class='del'>-	if (csc == DP_COM_CONF_CSC_DEF_FG)</div><div class='del'>-		reg &amp;= ~DP_COM_CONF_CSC_DEF_MASK;</div><div class='add'>+	reg &amp;= ~DP_COM_CONF_CSC_DEF_MASK;</div><div class='add'>+	if (csc == DP_COM_CONF_CSC_DEF_BOTH || csc == DP_COM_CONF_CSC_DEF_BG)</div><div class='add'>+		reg |= DP_COM_CONF_CSC_DEF_BG;</div><div class='ctx'> </div><div class='ctx'> 	reg &amp;= ~DP_COM_CONF_FG_EN;</div><div class='ctx'> 	writel(reg, flow-&gt;base + DP_COM_CONF);</div><div class='hunk'>@@ -347,6 +351,8 @@ int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, unsigned long base)</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IPUV3_NUM_FLOWS; i++) {</div><div class='add'>+		priv-&gt;flow[i].background.in_cs = IPUV3_COLORSPACE_UNKNOWN;</div><div class='add'>+		priv-&gt;flow[i].foreground.in_cs = IPUV3_COLORSPACE_UNKNOWN;</div><div class='ctx'> 		priv-&gt;flow[i].foreground.foreground = true;</div><div class='ctx'> 		priv-&gt;flow[i].base = priv-&gt;base + ipu_dp_flow_base[i];</div><div class='ctx'> 		priv-&gt;flow[i].priv = priv;</div><div class='head'>diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig<br/>index 6ca8d322b487..c3c390ca3690 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/Kconfig</a></div><div class='hunk'>@@ -150,6 +150,7 @@ config HID_ASUS</div><div class='ctx'> 	tristate "Asus"</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='ctx'> 	depends on ASUS_WMI || ASUS_WMI=n</div><div class='add'>+	select POWER_SUPPLY</div><div class='ctx'> 	---help---</div><div class='ctx'> 	Support for Asus notebook built-in keyboard and touchpad via i2c, and</div><div class='ctx'> 	the Asus Republic of Gamers laptop keyboard special keys.</div><div class='hunk'>@@ -230,6 +231,16 @@ config HID_COUGAR</div><div class='ctx'> 	Supported devices:</div><div class='ctx'> 	- Cougar 500k Gaming Keyboard</div><div class='ctx'> </div><div class='add'>+config HID_MACALLY</div><div class='add'>+	tristate "Macally devices"</div><div class='add'>+	depends on HID</div><div class='add'>+	help</div><div class='add'>+	Support for Macally devices that are not fully compliant with the</div><div class='add'>+	HID standard.</div><div class='add'>+</div><div class='add'>+	supported devices:</div><div class='add'>+	- Macally ikey keyboard</div><div class='add'>+</div><div class='ctx'> config HID_PRODIKEYS</div><div class='ctx'> 	tristate "Prodikeys PC-MIDI Keyboard support"</div><div class='ctx'> 	depends on HID &amp;&amp; SND</div><div class='hunk'>@@ -510,6 +521,7 @@ config HID_LOGITECH</div><div class='ctx'> </div><div class='ctx'> config HID_LOGITECH_DJ</div><div class='ctx'> 	tristate "Logitech Unifying receivers full support"</div><div class='add'>+	depends on USB_HID</div><div class='ctx'> 	depends on HIDRAW</div><div class='ctx'> 	depends on HID_LOGITECH</div><div class='ctx'> 	select HID_LOGITECH_HIDPP</div><div class='hunk'>@@ -1002,6 +1014,22 @@ config HID_UDRAW_PS3</div><div class='ctx'> 	  Say Y here if you want to use the THQ uDraw gaming tablet for</div><div class='ctx'> 	  the PS3.</div><div class='ctx'> </div><div class='add'>+config HID_U2FZERO</div><div class='add'>+	tristate "U2F Zero LED and RNG support"</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	depends on LEDS_CLASS</div><div class='add'>+	depends on HW_RANDOM</div><div class='add'>+	help</div><div class='add'>+	  Support for the LED of the U2F Zero device.</div><div class='add'>+</div><div class='add'>+	  U2F Zero supports custom commands for blinking the LED</div><div class='add'>+	  and getting data from the internal hardware RNG.</div><div class='add'>+	  The internal hardware can be used to feed the enthropy pool.</div><div class='add'>+</div><div class='add'>+	  U2F Zero only supports blinking its LED, so this driver doesn't</div><div class='add'>+	  allow setting the brightness to anything but 1, which will</div><div class='add'>+	  trigger a single blink and immediately reset to back 0.</div><div class='add'>+</div><div class='ctx'> config HID_WACOM</div><div class='ctx'> 	tristate "Wacom Intuos/Graphire tablet support (USB)"</div><div class='ctx'> 	depends on USB_HID</div><div class='head'>diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile<br/>index 170163b41303..cc5d827c9164 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/Makefile</a></div><div class='hunk'>@@ -65,6 +65,7 @@ obj-$(CONFIG_HID_LENOVO)	+= hid-lenovo.o</div><div class='ctx'> obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o</div><div class='ctx'> obj-$(CONFIG_HID_LOGITECH_DJ)	+= hid-logitech-dj.o</div><div class='ctx'> obj-$(CONFIG_HID_LOGITECH_HIDPP)	+= hid-logitech-hidpp.o</div><div class='add'>+obj-$(CONFIG_HID_MACALLY)	+= hid-macally.o</div><div class='ctx'> obj-$(CONFIG_HID_MAGICMOUSE)	+= hid-magicmouse.o</div><div class='ctx'> obj-$(CONFIG_HID_MALTRON)	+= hid-maltron.o</div><div class='ctx'> obj-$(CONFIG_HID_MAYFLASH)	+= hid-mf.o</div><div class='hunk'>@@ -109,6 +110,7 @@ obj-$(CONFIG_HID_THRUSTMASTER)	+= hid-tmff.o</div><div class='ctx'> obj-$(CONFIG_HID_TIVO)		+= hid-tivo.o</div><div class='ctx'> obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o</div><div class='ctx'> obj-$(CONFIG_HID_TWINHAN)	+= hid-twinhan.o</div><div class='add'>+obj-$(CONFIG_HID_U2FZERO)	+= hid-u2fzero.o</div><div class='ctx'> hid-uclogic-objs		:= hid-uclogic-core.o \</div><div class='ctx'> 				   hid-uclogic-rdesc.o \</div><div class='ctx'> 				   hid-uclogic-params.o</div><div class='hunk'>@@ -134,3 +136,4 @@ obj-$(CONFIG_USB_KBD)		+= usbhid/</div><div class='ctx'> obj-$(CONFIG_I2C_HID)		+= i2c-hid/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_INTEL_ISH_HID)	+= intel-ish-hid/</div><div class='add'>+obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER)	+= intel-ish-hid/</div><div class='head'>diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c<br/>index 9993b692598f..92387fc0bf18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-core.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/async.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/hiddev.h&gt;</div><div class='hunk'>@@ -218,13 +219,14 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)</div><div class='ctx'>  * Add a usage to the temporary parser table.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int hid_add_usage(struct hid_parser *parser, unsigned usage)</div><div class='add'>+static int hid_add_usage(struct hid_parser *parser, unsigned usage, u8 size)</div><div class='ctx'> {</div><div class='ctx'> 	if (parser-&gt;local.usage_index &gt;= HID_MAX_USAGES) {</div><div class='ctx'> 		hid_err(parser-&gt;device, "usage index exceeded\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	parser-&gt;local.usage[parser-&gt;local.usage_index] = usage;</div><div class='add'>+	parser-&gt;local.usage_size[parser-&gt;local.usage_index] = size;</div><div class='ctx'> 	parser-&gt;local.collection_index[parser-&gt;local.usage_index] =</div><div class='ctx'> 		parser-&gt;collection_stack_ptr ?</div><div class='ctx'> 		parser-&gt;collection_stack[parser-&gt;collection_stack_ptr - 1] : 0;</div><div class='hunk'>@@ -486,10 +488,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (item-&gt;size &lt;= 2)</div><div class='del'>-			data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='del'>-</div><div class='del'>-		return hid_add_usage(parser, data);</div><div class='add'>+		return hid_add_usage(parser, data, item-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:</div><div class='ctx'> </div><div class='hunk'>@@ -498,9 +497,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (item-&gt;size &lt;= 2)</div><div class='del'>-			data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='del'>-</div><div class='ctx'> 		parser-&gt;local.usage_minimum = data;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -511,9 +507,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (item-&gt;size &lt;= 2)</div><div class='del'>-			data = (parser-&gt;global.usage_page &lt;&lt; 16) + data;</div><div class='del'>-</div><div class='ctx'> 		count = data - parser-&gt;local.usage_minimum;</div><div class='ctx'> 		if (count + parser-&gt;local.usage_index &gt;= HID_MAX_USAGES) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -533,7 +526,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (n = parser-&gt;local.usage_minimum; n &lt;= data; n++)</div><div class='del'>-			if (hid_add_usage(parser, n)) {</div><div class='add'>+			if (hid_add_usage(parser, n, item-&gt;size)) {</div><div class='ctx'> 				dbg_hid("hid_add_usage failed\n");</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -548,6 +541,22 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Concatenate Usage Pages into Usages where relevant:</div><div class='add'>+ * As per specification, 6.2.2.8: "When the parser encounters a main item it</div><div class='add'>+ * concatenates the last declared Usage Page with a Usage to form a complete</div><div class='add'>+ * usage value."</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void hid_concatenate_usage_page(struct hid_parser *parser)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; parser-&gt;local.usage_index; i++)</div><div class='add'>+		if (parser-&gt;local.usage_size[i] &lt;= 2)</div><div class='add'>+			parser-&gt;local.usage[i] += parser-&gt;global.usage_page &lt;&lt; 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Process a main item.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -556,6 +565,8 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	__u32 data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	hid_concatenate_usage_page(parser);</div><div class='add'>+</div><div class='ctx'> 	data = item_udata(item);</div><div class='ctx'> </div><div class='ctx'> 	switch (item-&gt;tag) {</div><div class='hunk'>@@ -765,6 +776,8 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	__u32 data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	hid_concatenate_usage_page(parser);</div><div class='add'>+</div><div class='ctx'> 	data = item_udata(item);</div><div class='ctx'> </div><div class='ctx'> 	switch (item-&gt;tag) {</div><div class='hunk'>@@ -1301,10 +1314,10 @@ static u32 __extract(u8 *report, unsigned offset, int n)</div><div class='ctx'> u32 hid_field_extract(const struct hid_device *hid, u8 *report,</div><div class='ctx'> 			unsigned offset, unsigned n)</div><div class='ctx'> {</div><div class='del'>-	if (n &gt; 32) {</div><div class='del'>-		hid_warn(hid, "hid_field_extract() called with n (%d) &gt; 32! (%s)\n",</div><div class='add'>+	if (n &gt; 256) {</div><div class='add'>+		hid_warn(hid, "hid_field_extract() called with n (%d) &gt; 256! (%s)\n",</div><div class='ctx'> 			 n, current-&gt;comm);</div><div class='del'>-		n = 32;</div><div class='add'>+		n = 256;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return __extract(report, offset, n);</div><div class='hunk'>@@ -1624,7 +1637,7 @@ static struct hid_report *hid_get_report(struct hid_report_enum *report_enum,</div><div class='ctx'>  * Implement a generic .request() callback, using .raw_request()</div><div class='ctx'>  * DO NOT USE in hid drivers directly, but through hid_hw_request instead.</div><div class='ctx'>  */</div><div class='del'>-void __hid_request(struct hid_device *hid, struct hid_report *report,</div><div class='add'>+int __hid_request(struct hid_device *hid, struct hid_report *report,</div><div class='ctx'> 		int reqtype)</div><div class='ctx'> {</div><div class='ctx'> 	char *buf;</div><div class='hunk'>@@ -1633,7 +1646,7 @@ void __hid_request(struct hid_device *hid, struct hid_report *report,</div><div class='ctx'> </div><div class='ctx'> 	buf = hid_alloc_report_buf(report, GFP_KERNEL);</div><div class='ctx'> 	if (!buf)</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	len = hid_report_len(report);</div><div class='ctx'> </div><div class='hunk'>@@ -1650,8 +1663,11 @@ void __hid_request(struct hid_device *hid, struct hid_report *report,</div><div class='ctx'> 	if (reqtype == HID_REQ_GET_REPORT)</div><div class='ctx'> 		hid_input_report(hid, report-&gt;type, buf, ret, 0);</div><div class='ctx'> </div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(buf);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__hid_request);</div><div class='ctx'> </div><div class='hunk'>@@ -2349,6 +2365,15 @@ int hid_add_device(struct hid_device *hdev)</div><div class='ctx'> 	dev_set_name(&amp;hdev-&gt;dev, "%04X:%04X:%04X.%04X", hdev-&gt;bus,</div><div class='ctx'> 		     hdev-&gt;vendor, hdev-&gt;product, atomic_inc_return(&amp;id));</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Try loading the module for the device before the add, so that we do</div><div class='add'>+	 * not first have hid-generic binding only to have it replaced</div><div class='add'>+	 * immediately afterwards with a specialized driver.</div><div class='add'>+	 */</div><div class='add'>+	if (!current_is_async())</div><div class='add'>+		request_module("hid:b%04Xg%04Xv%08Xp%08X", hdev-&gt;bus,</div><div class='add'>+			       hdev-&gt;group, hdev-&gt;vendor, hdev-&gt;product);</div><div class='add'>+</div><div class='ctx'> 	hid_debug_register(hdev, dev_name(&amp;hdev-&gt;dev));</div><div class='ctx'> 	ret = device_add(&amp;hdev-&gt;dev);</div><div class='ctx'> 	if (!ret)</div><div class='head'>diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c<br/>index ac9fda1b5a72..1384e57182af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-debug.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-debug.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-debug.c</a></div><div class='hunk'>@@ -1060,10 +1060,15 @@ static int hid_debug_rdesc_show(struct seq_file *f, void *p)</div><div class='ctx'> 	seq_printf(f, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	/* dump parsed data and input mappings */</div><div class='add'>+	if (down_interruptible(&amp;hdev-&gt;driver_input_lock))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	hid_dump_device(hdev, f);</div><div class='ctx'> 	seq_printf(f, "\n");</div><div class='ctx'> 	hid_dump_input_mapping(hdev, f);</div><div class='ctx'> </div><div class='add'>+	up(&amp;hdev-&gt;driver_input_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h<br/>index b6d93f4ad037..1c8c72093b5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-ids.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-ids.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-ids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-ids.h</a></div><div class='hunk'>@@ -323,6 +323,7 @@</div><div class='ctx'> #define USB_DEVICE_ID_CYGNAL_RADIO_SI470X	0x818a</div><div class='ctx'> #define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH	0x81b9</div><div class='ctx'> #define USB_DEVICE_ID_CYGNAL_CP2112	0xea90</div><div class='add'>+#define USB_DEVICE_ID_U2F_ZERO		0x8acf</div><div class='ctx'> </div><div class='ctx'> #define USB_DEVICE_ID_CYGNAL_RADIO_SI4713       0x8244</div><div class='ctx'> </div><div class='hunk'>@@ -762,8 +763,12 @@</div><div class='ctx'> #define USB_DEVICE_ID_S510_RECEIVER_2	0xc517</div><div class='ctx'> #define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500	0xc512</div><div class='ctx'> #define USB_DEVICE_ID_MX3000_RECEIVER	0xc513</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_27MHZ_MOUSE_RECEIVER	0xc51b</div><div class='ctx'> #define USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER	0xc52b</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER		0xc52f</div><div class='ctx'> #define USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2	0xc532</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2		0xc534</div><div class='add'>+#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_GAMING	0xc539</div><div class='ctx'> #define USB_DEVICE_ID_SPACETRAVELLER	0xc623</div><div class='ctx'> #define USB_DEVICE_ID_SPACENAVIGATOR	0xc626</div><div class='ctx'> #define USB_DEVICE_ID_DINOVO_DESKTOP	0xc704</div><div class='hunk'>@@ -1034,6 +1039,7 @@</div><div class='ctx'> #define USB_DEVICE_ID_SINO_LITE_CONTROLLER	0x3008</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_SOLID_YEAR			0x060b</div><div class='add'>+#define USB_DEVICE_ID_MACALLY_IKEY_KEYBOARD		0x0001</div><div class='ctx'> #define USB_DEVICE_ID_COUGAR_500K_GAMING_KEYBOARD	0x500a</div><div class='ctx'> #define USB_DEVICE_ID_COUGAR_700K_GAMING_KEYBOARD	0x700a</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c<br/>index b10b1922c5bd..46c6efea1404 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-input.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-input.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-input.c</a></div><div class='hunk'>@@ -680,6 +680,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if ((usage-&gt;hid &amp; 0xf0) == 0xb0) {	/* SC - Display */</div><div class='add'>+			switch (usage-&gt;hid &amp; 0xf) {</div><div class='add'>+			case 0x05: map_key_clear(KEY_SWITCHVIDEOMODE); break;</div><div class='add'>+			default: goto ignore;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Some lazy vendors declare 255 usages for System Control,</div><div class='ctx'> 		 * leading to the creation of ABS_X|Y axis and too many others.</div><div class='hunk'>@@ -902,7 +910,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		case 0x06a: map_key_clear(KEY_GREEN);		break;</div><div class='ctx'> 		case 0x06b: map_key_clear(KEY_BLUE);		break;</div><div class='ctx'> 		case 0x06c: map_key_clear(KEY_YELLOW);		break;</div><div class='del'>-		case 0x06d: map_key_clear(KEY_ZOOM);		break;</div><div class='add'>+		case 0x06d: map_key_clear(KEY_ASPECT_RATIO);	break;</div><div class='ctx'> </div><div class='ctx'> 		case 0x06f: map_key_clear(KEY_BRIGHTNESSUP);		break;</div><div class='ctx'> 		case 0x070: map_key_clear(KEY_BRIGHTNESSDOWN);		break;</div><div class='hunk'>@@ -911,6 +919,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		case 0x074: map_key_clear(KEY_BRIGHTNESS_MAX);		break;</div><div class='ctx'> 		case 0x075: map_key_clear(KEY_BRIGHTNESS_AUTO);		break;</div><div class='ctx'> </div><div class='add'>+		case 0x079: map_key_clear(KEY_KBDILLUMUP);	break;</div><div class='add'>+		case 0x07a: map_key_clear(KEY_KBDILLUMDOWN);	break;</div><div class='add'>+		case 0x07c: map_key_clear(KEY_KBDILLUMTOGGLE);	break;</div><div class='add'>+</div><div class='ctx'> 		case 0x082: map_key_clear(KEY_VIDEO_NEXT);	break;</div><div class='ctx'> 		case 0x083: map_key_clear(KEY_LAST);		break;</div><div class='ctx'> 		case 0x084: map_key_clear(KEY_ENTER);		break;</div><div class='hunk'>@@ -998,6 +1010,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		case 0x1b8: map_key_clear(KEY_VIDEO);		break;</div><div class='ctx'> 		case 0x1bc: map_key_clear(KEY_MESSENGER);	break;</div><div class='ctx'> 		case 0x1bd: map_key_clear(KEY_INFO);		break;</div><div class='add'>+		case 0x1cb: map_key_clear(KEY_ASSISTANT);	break;</div><div class='ctx'> 		case 0x201: map_key_clear(KEY_NEW);		break;</div><div class='ctx'> 		case 0x202: map_key_clear(KEY_OPEN);		break;</div><div class='ctx'> 		case 0x203: map_key_clear(KEY_CLOSE);		break;</div><div class='hunk'>@@ -1021,6 +1034,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		case 0x22d: map_key_clear(KEY_ZOOMIN);		break;</div><div class='ctx'> 		case 0x22e: map_key_clear(KEY_ZOOMOUT);		break;</div><div class='ctx'> 		case 0x22f: map_key_clear(KEY_ZOOMRESET);	break;</div><div class='add'>+		case 0x232: map_key_clear(KEY_FULL_SCREEN);	break;</div><div class='ctx'> 		case 0x233: map_key_clear(KEY_SCROLLUP);	break;</div><div class='ctx'> 		case 0x234: map_key_clear(KEY_SCROLLDOWN);	break;</div><div class='ctx'> 		case 0x238: /* AC Pan */</div><div class='hunk'>@@ -1044,6 +1058,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);	break;</div><div class='ctx'> 		case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);	break;</div><div class='ctx'> </div><div class='add'>+		case 0x29f: map_key_clear(KEY_SCALE);		break;</div><div class='add'>+</div><div class='ctx'> 		default: map_key_clear(KEY_UNKNOWN);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1541,52 +1557,71 @@ static void hidinput_close(struct input_dev *dev)</div><div class='ctx'> 	hid_hw_close(hid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hidinput_change_resolution_multipliers(struct hid_device *hid)</div><div class='add'>+static bool __hidinput_change_resolution_multipliers(struct hid_device *hid,</div><div class='add'>+		struct hid_report *report, bool use_logical_max)</div><div class='ctx'> {</div><div class='del'>-	struct hid_report_enum *rep_enum;</div><div class='del'>-	struct hid_report *rep;</div><div class='ctx'> 	struct hid_usage *usage;</div><div class='add'>+	bool update_needed = false;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	rep_enum = &amp;hid-&gt;report_enum[HID_FEATURE_REPORT];</div><div class='del'>-	list_for_each_entry(rep, &amp;rep_enum-&gt;report_list, list) {</div><div class='del'>-		bool update_needed = false;</div><div class='add'>+	if (report-&gt;maxfield == 0)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-		if (rep-&gt;maxfield == 0)</div><div class='del'>-			continue;</div><div class='add'>+	/*</div><div class='add'>+	 * If we have more than one feature within this report we</div><div class='add'>+	 * need to fill in the bits from the others before we can</div><div class='add'>+	 * overwrite the ones for the Resolution Multiplier.</div><div class='add'>+	 */</div><div class='add'>+	if (report-&gt;maxfield &gt; 1) {</div><div class='add'>+		hid_hw_request(hid, report, HID_REQ_GET_REPORT);</div><div class='add'>+		hid_hw_wait(hid);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If we have more than one feature within this report we</div><div class='del'>-		 * need to fill in the bits from the others before we can</div><div class='del'>-		 * overwrite the ones for the Resolution Multiplier.</div><div class='add'>+	for (i = 0; i &lt; report-&gt;maxfield; i++) {</div><div class='add'>+		__s32 value = use_logical_max ?</div><div class='add'>+			      report-&gt;field[i]-&gt;logical_maximum :</div><div class='add'>+			      report-&gt;field[i]-&gt;logical_minimum;</div><div class='add'>+</div><div class='add'>+		/* There is no good reason for a Resolution</div><div class='add'>+		 * Multiplier to have a count other than 1.</div><div class='add'>+		 * Ignore that case.</div><div class='ctx'> 		 */</div><div class='del'>-		if (rep-&gt;maxfield &gt; 1) {</div><div class='del'>-			hid_hw_request(hid, rep, HID_REQ_GET_REPORT);</div><div class='del'>-			hid_hw_wait(hid);</div><div class='del'>-		}</div><div class='add'>+		if (report-&gt;field[i]-&gt;report_count != 1)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; rep-&gt;maxfield; i++) {</div><div class='del'>-			__s32 logical_max = rep-&gt;field[i]-&gt;logical_maximum;</div><div class='add'>+		for (j = 0; j &lt; report-&gt;field[i]-&gt;maxusage; j++) {</div><div class='add'>+			usage = &amp;report-&gt;field[i]-&gt;usage[j];</div><div class='ctx'> </div><div class='del'>-			/* There is no good reason for a Resolution</div><div class='del'>-			 * Multiplier to have a count other than 1.</div><div class='del'>-			 * Ignore that case.</div><div class='del'>-			 */</div><div class='del'>-			if (rep-&gt;field[i]-&gt;report_count != 1)</div><div class='add'>+			if (usage-&gt;hid != HID_GD_RESOLUTION_MULTIPLIER)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			for (j = 0; j &lt; rep-&gt;field[i]-&gt;maxusage; j++) {</div><div class='del'>-				usage = &amp;rep-&gt;field[i]-&gt;usage[j];</div><div class='add'>+			report-&gt;field[i]-&gt;value[j] = value;</div><div class='add'>+			update_needed = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-				if (usage-&gt;hid != HID_GD_RESOLUTION_MULTIPLIER)</div><div class='del'>-					continue;</div><div class='add'>+	return update_needed;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-				*rep-&gt;field[i]-&gt;value = logical_max;</div><div class='del'>-				update_needed = true;</div><div class='add'>+static void hidinput_change_resolution_multipliers(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+	struct hid_report_enum *rep_enum;</div><div class='add'>+	struct hid_report *rep;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rep_enum = &amp;hid-&gt;report_enum[HID_FEATURE_REPORT];</div><div class='add'>+	list_for_each_entry(rep, &amp;rep_enum-&gt;report_list, list) {</div><div class='add'>+		bool update_needed = __hidinput_change_resolution_multipliers(hid,</div><div class='add'>+								     rep, true);</div><div class='add'>+</div><div class='add'>+		if (update_needed) {</div><div class='add'>+			ret = __hid_request(hid, rep, HID_REQ_SET_REPORT);</div><div class='add'>+			if (ret) {</div><div class='add'>+				__hidinput_change_resolution_multipliers(hid,</div><div class='add'>+								    rep, false);</div><div class='add'>+				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (update_needed)</div><div class='del'>-			hid_hw_request(hid, rep, HID_REQ_SET_REPORT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* refresh our structs */</div><div class='head'>diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c<br/>index 5d419a95b6c2..36d725fdb199 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-lg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-lg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-lg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-lg.c</a></div><div class='hunk'>@@ -876,8 +876,6 @@ static const struct hid_device_id lg_devices[] = {</div><div class='ctx'> 		.driver_data = LG_RDESC | LG_WIRELESS },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER),</div><div class='ctx'> 		.driver_data = LG_RDESC | LG_WIRELESS },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2),</div><div class='del'>-		.driver_data = LG_RDESC | LG_WIRELESS },</div><div class='ctx'> </div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER),</div><div class='ctx'> 		.driver_data = LG_BAD_RELATIVE_KEYS },</div><div class='head'>diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c<br/>index 826fa1e1c8d9..b1e894618eed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-logitech-dj.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-logitech-dj.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-logitech-dj.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-logitech-dj.c</a></div><div class='hunk'>@@ -25,13 +25,14 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/kfifo.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt; /* For to_usb_interface for kvm extra intf check */</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include "hid-ids.h"</div><div class='ctx'> </div><div class='ctx'> #define DJ_MAX_PAIRED_DEVICES			6</div><div class='del'>-#define DJ_MAX_NUMBER_NOTIFICATIONS		8</div><div class='add'>+#define DJ_MAX_NUMBER_NOTIFS			8</div><div class='ctx'> #define DJ_RECEIVER_INDEX			0</div><div class='ctx'> #define DJ_DEVICE_INDEX_MIN			1</div><div class='ctx'> #define DJ_DEVICE_INDEX_MAX			6</div><div class='hunk'>@@ -74,7 +75,6 @@</div><div class='ctx'> /* Device Un-Paired Notification */</div><div class='ctx'> #define REPORT_TYPE_NOTIF_DEVICE_UNPAIRED	0x40</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Connection Status Notification */</div><div class='ctx'> #define REPORT_TYPE_NOTIF_CONNECTION_STATUS	0x42</div><div class='ctx'> #define CONNECTION_STATUS_PARAM_STATUS		0x00</div><div class='hunk'>@@ -94,12 +94,43 @@</div><div class='ctx'> #define REPORT_TYPE_LEDS			0x0E</div><div class='ctx'> </div><div class='ctx'> /* RF Report types bitfield */</div><div class='del'>-#define STD_KEYBOARD				0x00000002</div><div class='del'>-#define STD_MOUSE				0x00000004</div><div class='del'>-#define MULTIMEDIA				0x00000008</div><div class='del'>-#define POWER_KEYS				0x00000010</div><div class='del'>-#define MEDIA_CENTER				0x00000100</div><div class='del'>-#define KBD_LEDS				0x00004000</div><div class='add'>+#define STD_KEYBOARD				BIT(1)</div><div class='add'>+#define STD_MOUSE				BIT(2)</div><div class='add'>+#define MULTIMEDIA				BIT(3)</div><div class='add'>+#define POWER_KEYS				BIT(4)</div><div class='add'>+#define MEDIA_CENTER				BIT(8)</div><div class='add'>+#define KBD_LEDS				BIT(14)</div><div class='add'>+/* Fake (bitnr &gt; NUMBER_OF_HID_REPORTS) bit to track HID++ capability */</div><div class='add'>+#define HIDPP					BIT_ULL(63)</div><div class='add'>+</div><div class='add'>+/* HID++ Device Connected Notification */</div><div class='add'>+#define REPORT_TYPE_NOTIF_DEVICE_CONNECTED	0x41</div><div class='add'>+#define HIDPP_PARAM_PROTO_TYPE			0x00</div><div class='add'>+#define HIDPP_PARAM_DEVICE_INFO			0x01</div><div class='add'>+#define HIDPP_PARAM_EQUAD_LSB			0x02</div><div class='add'>+#define HIDPP_PARAM_EQUAD_MSB			0x03</div><div class='add'>+#define HIDPP_PARAM_27MHZ_DEVID			0x03</div><div class='add'>+#define HIDPP_DEVICE_TYPE_MASK			GENMASK(3, 0)</div><div class='add'>+#define HIDPP_LINK_STATUS_MASK			BIT(6)</div><div class='add'>+#define HIDPP_MANUFACTURER_MASK			BIT(7)</div><div class='add'>+</div><div class='add'>+#define HIDPP_DEVICE_TYPE_KEYBOARD		1</div><div class='add'>+#define HIDPP_DEVICE_TYPE_MOUSE			2</div><div class='add'>+</div><div class='add'>+#define HIDPP_SET_REGISTER			0x80</div><div class='add'>+#define HIDPP_GET_LONG_REGISTER			0x83</div><div class='add'>+#define HIDPP_REG_CONNECTION_STATE		0x02</div><div class='add'>+#define HIDPP_REG_PAIRING_INFORMATION		0xB5</div><div class='add'>+#define HIDPP_PAIRING_INFORMATION		0x20</div><div class='add'>+#define HIDPP_FAKE_DEVICE_ARRIVAL		0x02</div><div class='add'>+</div><div class='add'>+enum recvr_type {</div><div class='add'>+	recvr_type_dj,</div><div class='add'>+	recvr_type_hidpp,</div><div class='add'>+	recvr_type_gaming_hidpp,</div><div class='add'>+	recvr_type_27mhz,</div><div class='add'>+	recvr_type_bluetooth,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct dj_report {</div><div class='ctx'> 	u8 report_id;</div><div class='hunk'>@@ -108,23 +139,51 @@ struct dj_report {</div><div class='ctx'> 	u8 report_params[DJREPORT_SHORT_LENGTH - 3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hidpp_event {</div><div class='add'>+	u8 report_id;</div><div class='add'>+	u8 device_index;</div><div class='add'>+	u8 sub_id;</div><div class='add'>+	u8 params[HIDPP_REPORT_LONG_LENGTH - 3U];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct dj_receiver_dev {</div><div class='del'>-	struct hid_device *hdev;</div><div class='add'>+	struct hid_device *mouse;</div><div class='add'>+	struct hid_device *keyboard;</div><div class='add'>+	struct hid_device *hidpp;</div><div class='ctx'> 	struct dj_device *paired_dj_devices[DJ_MAX_PAIRED_DEVICES +</div><div class='ctx'> 					    DJ_DEVICE_INDEX_MIN];</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct kref kref;</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	struct kfifo notif_fifo;</div><div class='add'>+	unsigned long last_query; /* in jiffies */</div><div class='add'>+	bool ready;</div><div class='add'>+	enum recvr_type type;</div><div class='add'>+	unsigned int unnumbered_application;</div><div class='ctx'> 	spinlock_t lock;</div><div class='del'>-	bool querying_devices;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dj_device {</div><div class='ctx'> 	struct hid_device *hdev;</div><div class='ctx'> 	struct dj_receiver_dev *dj_receiver_dev;</div><div class='del'>-	u32 reports_supported;</div><div class='add'>+	u64 reports_supported;</div><div class='ctx'> 	u8 device_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define WORKITEM_TYPE_EMPTY	0</div><div class='add'>+#define WORKITEM_TYPE_PAIRED	1</div><div class='add'>+#define WORKITEM_TYPE_UNPAIRED	2</div><div class='add'>+#define WORKITEM_TYPE_UNKNOWN	255</div><div class='add'>+</div><div class='add'>+struct dj_workitem {</div><div class='add'>+	u8 type;		/* WORKITEM_TYPE_* */</div><div class='add'>+	u8 device_index;</div><div class='add'>+	u8 device_type;</div><div class='add'>+	u8 quad_id_msb;</div><div class='add'>+	u8 quad_id_lsb;</div><div class='add'>+	u64 reports_supported;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Keyboard descriptor (1) */</div><div class='ctx'> static const char kbd_descriptor[] = {</div><div class='ctx'> 	0x05, 0x01,		/* USAGE_PAGE (generic Desktop)     */</div><div class='hunk'>@@ -200,6 +259,131 @@ static const char mse_descriptor[] = {</div><div class='ctx'> 	0xC0,			/*  END_COLLECTION                      */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Mouse descriptor (2) for 27 MHz receiver, only 8 buttons */</div><div class='add'>+static const char mse_27mhz_descriptor[] = {</div><div class='add'>+	0x05, 0x01,		/*  USAGE_PAGE (Generic Desktop)        */</div><div class='add'>+	0x09, 0x02,		/*  USAGE (Mouse)                       */</div><div class='add'>+	0xA1, 0x01,		/*  COLLECTION (Application)            */</div><div class='add'>+	0x85, 0x02,		/*    REPORT_ID = 2                     */</div><div class='add'>+	0x09, 0x01,		/*    USAGE (pointer)                   */</div><div class='add'>+	0xA1, 0x00,		/*    COLLECTION (physical)             */</div><div class='add'>+	0x05, 0x09,		/*      USAGE_PAGE (buttons)            */</div><div class='add'>+	0x19, 0x01,		/*      USAGE_MIN (1)                   */</div><div class='add'>+	0x29, 0x08,		/*      USAGE_MAX (8)                   */</div><div class='add'>+	0x15, 0x00,		/*      LOGICAL_MIN (0)                 */</div><div class='add'>+	0x25, 0x01,		/*      LOGICAL_MAX (1)                 */</div><div class='add'>+	0x95, 0x08,		/*      REPORT_COUNT (8)                */</div><div class='add'>+	0x75, 0x01,		/*      REPORT_SIZE (1)                 */</div><div class='add'>+	0x81, 0x02,		/*      INPUT (data var abs)            */</div><div class='add'>+	0x05, 0x01,		/*      USAGE_PAGE (generic desktop)    */</div><div class='add'>+	0x16, 0x01, 0xF8,	/*      LOGICAL_MIN (-2047)             */</div><div class='add'>+	0x26, 0xFF, 0x07,	/*      LOGICAL_MAX (2047)              */</div><div class='add'>+	0x75, 0x0C,		/*      REPORT_SIZE (12)                */</div><div class='add'>+	0x95, 0x02,		/*      REPORT_COUNT (2)                */</div><div class='add'>+	0x09, 0x30,		/*      USAGE (X)                       */</div><div class='add'>+	0x09, 0x31,		/*      USAGE (Y)                       */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x15, 0x81,		/*      LOGICAL_MIN (-127)              */</div><div class='add'>+	0x25, 0x7F,		/*      LOGICAL_MAX (127)               */</div><div class='add'>+	0x75, 0x08,		/*      REPORT_SIZE (8)                 */</div><div class='add'>+	0x95, 0x01,		/*      REPORT_COUNT (1)                */</div><div class='add'>+	0x09, 0x38,		/*      USAGE (wheel)                   */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x05, 0x0C,		/*      USAGE_PAGE(consumer)            */</div><div class='add'>+	0x0A, 0x38, 0x02,	/*      USAGE(AC Pan)                   */</div><div class='add'>+	0x95, 0x01,		/*      REPORT_COUNT (1)                */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0xC0,			/*    END_COLLECTION                    */</div><div class='add'>+	0xC0,			/*  END_COLLECTION                      */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Mouse descriptor (2) for Bluetooth receiver, low-res hwheel, 12 buttons */</div><div class='add'>+static const char mse_bluetooth_descriptor[] = {</div><div class='add'>+	0x05, 0x01,		/*  USAGE_PAGE (Generic Desktop)        */</div><div class='add'>+	0x09, 0x02,		/*  USAGE (Mouse)                       */</div><div class='add'>+	0xA1, 0x01,		/*  COLLECTION (Application)            */</div><div class='add'>+	0x85, 0x02,		/*    REPORT_ID = 2                     */</div><div class='add'>+	0x09, 0x01,		/*    USAGE (pointer)                   */</div><div class='add'>+	0xA1, 0x00,		/*    COLLECTION (physical)             */</div><div class='add'>+	0x05, 0x09,		/*      USAGE_PAGE (buttons)            */</div><div class='add'>+	0x19, 0x01,		/*      USAGE_MIN (1)                   */</div><div class='add'>+	0x29, 0x08,		/*      USAGE_MAX (8)                   */</div><div class='add'>+	0x15, 0x00,		/*      LOGICAL_MIN (0)                 */</div><div class='add'>+	0x25, 0x01,		/*      LOGICAL_MAX (1)                 */</div><div class='add'>+	0x95, 0x08,		/*      REPORT_COUNT (8)                */</div><div class='add'>+	0x75, 0x01,		/*      REPORT_SIZE (1)                 */</div><div class='add'>+	0x81, 0x02,		/*      INPUT (data var abs)            */</div><div class='add'>+	0x05, 0x01,		/*      USAGE_PAGE (generic desktop)    */</div><div class='add'>+	0x16, 0x01, 0xF8,	/*      LOGICAL_MIN (-2047)             */</div><div class='add'>+	0x26, 0xFF, 0x07,	/*      LOGICAL_MAX (2047)              */</div><div class='add'>+	0x75, 0x0C,		/*      REPORT_SIZE (12)                */</div><div class='add'>+	0x95, 0x02,		/*      REPORT_COUNT (2)                */</div><div class='add'>+	0x09, 0x30,		/*      USAGE (X)                       */</div><div class='add'>+	0x09, 0x31,		/*      USAGE (Y)                       */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x15, 0x81,		/*      LOGICAL_MIN (-127)              */</div><div class='add'>+	0x25, 0x7F,		/*      LOGICAL_MAX (127)               */</div><div class='add'>+	0x75, 0x08,		/*      REPORT_SIZE (8)                 */</div><div class='add'>+	0x95, 0x01,		/*      REPORT_COUNT (1)                */</div><div class='add'>+	0x09, 0x38,		/*      USAGE (wheel)                   */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x05, 0x0C,		/*      USAGE_PAGE(consumer)            */</div><div class='add'>+	0x0A, 0x38, 0x02,	/*      USAGE(AC Pan)                   */</div><div class='add'>+	0x15, 0xF9,		/*      LOGICAL_MIN (-7)                */</div><div class='add'>+	0x25, 0x07,		/*      LOGICAL_MAX (7)                 */</div><div class='add'>+	0x75, 0x04,		/*      REPORT_SIZE (4)                 */</div><div class='add'>+	0x95, 0x01,		/*      REPORT_COUNT (1)                */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x05, 0x09,		/*      USAGE_PAGE (buttons)            */</div><div class='add'>+	0x19, 0x09,		/*      USAGE_MIN (9)                   */</div><div class='add'>+	0x29, 0x0C,		/*      USAGE_MAX (12)                  */</div><div class='add'>+	0x15, 0x00,		/*      LOGICAL_MIN (0)                 */</div><div class='add'>+	0x25, 0x01,		/*      LOGICAL_MAX (1)                 */</div><div class='add'>+	0x75, 0x01,		/*      REPORT_SIZE (1)                 */</div><div class='add'>+	0x95, 0x04,		/*      REPORT_COUNT (4)                */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0xC0,			/*    END_COLLECTION                    */</div><div class='add'>+	0xC0,			/*  END_COLLECTION                      */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Gaming Mouse descriptor (2) */</div><div class='add'>+static const char mse_high_res_descriptor[] = {</div><div class='add'>+	0x05, 0x01,		/*  USAGE_PAGE (Generic Desktop)        */</div><div class='add'>+	0x09, 0x02,		/*  USAGE (Mouse)                       */</div><div class='add'>+	0xA1, 0x01,		/*  COLLECTION (Application)            */</div><div class='add'>+	0x85, 0x02,		/*    REPORT_ID = 2                     */</div><div class='add'>+	0x09, 0x01,		/*    USAGE (pointer)                   */</div><div class='add'>+	0xA1, 0x00,		/*    COLLECTION (physical)             */</div><div class='add'>+	0x05, 0x09,		/*      USAGE_PAGE (buttons)            */</div><div class='add'>+	0x19, 0x01,		/*      USAGE_MIN (1)                   */</div><div class='add'>+	0x29, 0x10,		/*      USAGE_MAX (16)                  */</div><div class='add'>+	0x15, 0x00,		/*      LOGICAL_MIN (0)                 */</div><div class='add'>+	0x25, 0x01,		/*      LOGICAL_MAX (1)                 */</div><div class='add'>+	0x95, 0x10,		/*      REPORT_COUNT (16)               */</div><div class='add'>+	0x75, 0x01,		/*      REPORT_SIZE (1)                 */</div><div class='add'>+	0x81, 0x02,		/*      INPUT (data var abs)            */</div><div class='add'>+	0x05, 0x01,		/*      USAGE_PAGE (generic desktop)    */</div><div class='add'>+	0x16, 0x01, 0x80,	/*      LOGICAL_MIN (-32767)            */</div><div class='add'>+	0x26, 0xFF, 0x7F,	/*      LOGICAL_MAX (32767)             */</div><div class='add'>+	0x75, 0x10,		/*      REPORT_SIZE (16)                */</div><div class='add'>+	0x95, 0x02,		/*      REPORT_COUNT (2)                */</div><div class='add'>+	0x09, 0x30,		/*      USAGE (X)                       */</div><div class='add'>+	0x09, 0x31,		/*      USAGE (Y)                       */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x15, 0x81,		/*      LOGICAL_MIN (-127)              */</div><div class='add'>+	0x25, 0x7F,		/*      LOGICAL_MAX (127)               */</div><div class='add'>+	0x75, 0x08,		/*      REPORT_SIZE (8)                 */</div><div class='add'>+	0x95, 0x01,		/*      REPORT_COUNT (1)                */</div><div class='add'>+	0x09, 0x38,		/*      USAGE (wheel)                   */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0x05, 0x0C,		/*      USAGE_PAGE(consumer)            */</div><div class='add'>+	0x0A, 0x38, 0x02,	/*      USAGE(AC Pan)                   */</div><div class='add'>+	0x95, 0x01,		/*      REPORT_COUNT (1)                */</div><div class='add'>+	0x81, 0x06,		/*      INPUT                           */</div><div class='add'>+	0xC0,			/*    END_COLLECTION                    */</div><div class='add'>+	0xC0,			/*  END_COLLECTION                      */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Consumer Control descriptor (3) */</div><div class='ctx'> static const char consumer_descriptor[] = {</div><div class='ctx'> 	0x05, 0x0C,		/* USAGE_PAGE (Consumer Devices)       */</div><div class='hunk'>@@ -308,7 +492,7 @@ static const char hidpp_descriptor[] = {</div><div class='ctx'> /* Make sure all descriptors are present here */</div><div class='ctx'> #define MAX_RDESC_SIZE				\</div><div class='ctx'> 	(sizeof(kbd_descriptor) +		\</div><div class='del'>-	 sizeof(mse_descriptor) +		\</div><div class='add'>+	 sizeof(mse_bluetooth_descriptor) +	\</div><div class='ctx'> 	 sizeof(consumer_descriptor) +		\</div><div class='ctx'> 	 sizeof(syscontrol_descriptor) +	\</div><div class='ctx'> 	 sizeof(media_descriptor) +	\</div><div class='hunk'>@@ -341,51 +525,160 @@ static const u8 hid_reportid_size_map[NUMBER_OF_HID_REPORTS] = {</div><div class='ctx'> static struct hid_ll_driver logi_dj_ll_driver;</div><div class='ctx'> </div><div class='ctx'> static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev);</div><div class='add'>+static void delayedwork_callback(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(dj_hdev_list);</div><div class='add'>+static DEFINE_MUTEX(dj_hdev_list_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dj/HID++ receivers are really a single logical entity, but for BIOS/Windows</div><div class='add'>+ * compatibility they have multiple USB interfaces. On HID++ receivers we need</div><div class='add'>+ * to listen for input reports on both interfaces. The functions below are used</div><div class='add'>+ * to create a single struct dj_receiver_dev for all interfaces belonging to</div><div class='add'>+ * a single USB-device / receiver.</div><div class='add'>+ */</div><div class='add'>+static struct dj_receiver_dev *dj_find_receiver_dev(struct hid_device *hdev,</div><div class='add'>+						    enum recvr_type type)</div><div class='add'>+{</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev;</div><div class='add'>+	char sep;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The bluetooth receiver contains a built-in hub and has separate</div><div class='add'>+	 * USB-devices for the keyboard and mouse interfaces.</div><div class='add'>+	 */</div><div class='add'>+	sep = (type == recvr_type_bluetooth) ? '.' : '/';</div><div class='add'>+</div><div class='add'>+	/* Try to find an already-probed interface from the same device */</div><div class='add'>+	list_for_each_entry(djrcv_dev, &amp;dj_hdev_list, list) {</div><div class='add'>+		if (djrcv_dev-&gt;mouse &amp;&amp;</div><div class='add'>+		    hid_compare_device_paths(hdev, djrcv_dev-&gt;mouse, sep)) {</div><div class='add'>+			kref_get(&amp;djrcv_dev-&gt;kref);</div><div class='add'>+			return djrcv_dev;</div><div class='add'>+		}</div><div class='add'>+		if (djrcv_dev-&gt;keyboard &amp;&amp;</div><div class='add'>+		    hid_compare_device_paths(hdev, djrcv_dev-&gt;keyboard, sep)) {</div><div class='add'>+			kref_get(&amp;djrcv_dev-&gt;kref);</div><div class='add'>+			return djrcv_dev;</div><div class='add'>+		}</div><div class='add'>+		if (djrcv_dev-&gt;hidpp &amp;&amp;</div><div class='add'>+		    hid_compare_device_paths(hdev, djrcv_dev-&gt;hidpp, sep)) {</div><div class='add'>+			kref_get(&amp;djrcv_dev-&gt;kref);</div><div class='add'>+			return djrcv_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 void dj_release_receiver_dev(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev = container_of(kref, struct dj_receiver_dev, kref);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;djrcv_dev-&gt;list);</div><div class='add'>+	kfifo_free(&amp;djrcv_dev-&gt;notif_fifo);</div><div class='add'>+	kfree(djrcv_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dj_put_receiver_dev(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dj_hdev_list_lock);</div><div class='add'>+</div><div class='add'>+	if (djrcv_dev-&gt;mouse == hdev)</div><div class='add'>+		djrcv_dev-&gt;mouse = NULL;</div><div class='add'>+	if (djrcv_dev-&gt;keyboard == hdev)</div><div class='add'>+		djrcv_dev-&gt;keyboard = NULL;</div><div class='add'>+	if (djrcv_dev-&gt;hidpp == hdev)</div><div class='add'>+		djrcv_dev-&gt;hidpp = NULL;</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;djrcv_dev-&gt;kref, dj_release_receiver_dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dj_hdev_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dj_receiver_dev *dj_get_receiver_dev(struct hid_device *hdev,</div><div class='add'>+						   enum recvr_type type,</div><div class='add'>+						   unsigned int application,</div><div class='add'>+						   bool is_hidpp)</div><div class='add'>+{</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dj_hdev_list_lock);</div><div class='add'>+</div><div class='add'>+	djrcv_dev = dj_find_receiver_dev(hdev, type);</div><div class='add'>+	if (!djrcv_dev) {</div><div class='add'>+		djrcv_dev = kzalloc(sizeof(*djrcv_dev), GFP_KERNEL);</div><div class='add'>+		if (!djrcv_dev)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;djrcv_dev-&gt;work, delayedwork_callback);</div><div class='add'>+		spin_lock_init(&amp;djrcv_dev-&gt;lock);</div><div class='add'>+		if (kfifo_alloc(&amp;djrcv_dev-&gt;notif_fifo,</div><div class='add'>+			    DJ_MAX_NUMBER_NOTIFS * sizeof(struct dj_workitem),</div><div class='add'>+			    GFP_KERNEL)) {</div><div class='add'>+			kfree(djrcv_dev);</div><div class='add'>+			djrcv_dev = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		kref_init(&amp;djrcv_dev-&gt;kref);</div><div class='add'>+		list_add_tail(&amp;djrcv_dev-&gt;list, &amp;dj_hdev_list);</div><div class='add'>+		djrcv_dev-&gt;last_query = jiffies;</div><div class='add'>+		djrcv_dev-&gt;type = type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (application == HID_GD_KEYBOARD)</div><div class='add'>+		djrcv_dev-&gt;keyboard = hdev;</div><div class='add'>+	if (application == HID_GD_MOUSE)</div><div class='add'>+		djrcv_dev-&gt;mouse = hdev;</div><div class='add'>+	if (is_hidpp)</div><div class='add'>+		djrcv_dev-&gt;hidpp = hdev;</div><div class='add'>+</div><div class='add'>+	hid_set_drvdata(hdev, djrcv_dev);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dj_hdev_list_lock);</div><div class='add'>+	return djrcv_dev;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev,</div><div class='del'>-						struct dj_report *dj_report)</div><div class='add'>+					      struct dj_workitem *workitem)</div><div class='ctx'> {</div><div class='ctx'> 	/* Called in delayed work context */</div><div class='ctx'> 	struct dj_device *dj_dev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='del'>-	dj_dev = djrcv_dev-&gt;paired_dj_devices[dj_report-&gt;device_index];</div><div class='del'>-	djrcv_dev-&gt;paired_dj_devices[dj_report-&gt;device_index] = NULL;</div><div class='add'>+	dj_dev = djrcv_dev-&gt;paired_dj_devices[workitem-&gt;device_index];</div><div class='add'>+	djrcv_dev-&gt;paired_dj_devices[workitem-&gt;device_index] = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (dj_dev != NULL) {</div><div class='ctx'> 		hid_destroy_device(dj_dev-&gt;hdev);</div><div class='ctx'> 		kfree(dj_dev);</div><div class='ctx'> 	} else {</div><div class='del'>-		dev_err(&amp;djrcv_dev-&gt;hdev-&gt;dev, "%s: can't destroy a NULL device\n",</div><div class='add'>+		hid_err(djrcv_dev-&gt;hidpp, "%s: can't destroy a NULL device\n",</div><div class='ctx'> 			__func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,</div><div class='del'>-					  struct dj_report *dj_report)</div><div class='add'>+					  struct dj_workitem *workitem)</div><div class='ctx'> {</div><div class='ctx'> 	/* Called in delayed work context */</div><div class='del'>-	struct hid_device *djrcv_hdev = djrcv_dev-&gt;hdev;</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(djrcv_hdev-&gt;dev.parent);</div><div class='del'>-	struct usb_device *usbdev = interface_to_usbdev(intf);</div><div class='add'>+	struct hid_device *djrcv_hdev = djrcv_dev-&gt;hidpp;</div><div class='ctx'> 	struct hid_device *dj_hiddev;</div><div class='ctx'> 	struct dj_device *dj_dev;</div><div class='add'>+	u8 device_index = workitem-&gt;device_index;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Device index goes from 1 to 6, we need 3 bytes to store the</div><div class='ctx'> 	 * semicolon, the index, and a null terminator</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned char tmpstr[3];</div><div class='ctx'> </div><div class='del'>-	if (dj_report-&gt;report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] &amp;</div><div class='del'>-	    SPFUNCTION_DEVICE_LIST_EMPTY) {</div><div class='del'>-		dbg_hid("%s: device list is empty\n", __func__);</div><div class='del'>-		djrcv_dev-&gt;querying_devices = false;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (djrcv_dev-&gt;paired_dj_devices[dj_report-&gt;device_index]) {</div><div class='add'>+	/* We are the only one ever adding a device, no need to lock */</div><div class='add'>+	if (djrcv_dev-&gt;paired_dj_devices[device_index]) {</div><div class='ctx'> 		/* The device is already known. No need to reallocate it. */</div><div class='ctx'> 		dbg_hid("%s: device is already known\n", __func__);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -393,8 +686,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> </div><div class='ctx'> 	dj_hiddev = hid_allocate_device();</div><div class='ctx'> 	if (IS_ERR(dj_hiddev)) {</div><div class='del'>-		dev_err(&amp;djrcv_hdev-&gt;dev, "%s: hid_allocate_device failed\n",</div><div class='del'>-			__func__);</div><div class='add'>+		hid_err(djrcv_hdev, "%s: hid_allocate_dev failed\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -402,48 +694,67 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> </div><div class='ctx'> 	dj_hiddev-&gt;dev.parent = &amp;djrcv_hdev-&gt;dev;</div><div class='ctx'> 	dj_hiddev-&gt;bus = BUS_USB;</div><div class='del'>-	dj_hiddev-&gt;vendor = le16_to_cpu(usbdev-&gt;descriptor.idVendor);</div><div class='del'>-	dj_hiddev-&gt;product =</div><div class='del'>-		(dj_report-&gt;report_params[DEVICE_PAIRED_PARAM_EQUAD_ID_MSB]</div><div class='del'>-									&lt;&lt; 8) |</div><div class='del'>-		dj_report-&gt;report_params[DEVICE_PAIRED_PARAM_EQUAD_ID_LSB];</div><div class='del'>-	snprintf(dj_hiddev-&gt;name, sizeof(dj_hiddev-&gt;name),</div><div class='del'>-		"Logitech Unifying Device. Wireless PID:%04x",</div><div class='del'>-		dj_hiddev-&gt;product);</div><div class='del'>-</div><div class='del'>-	dj_hiddev-&gt;group = HID_GROUP_LOGITECH_DJ_DEVICE;</div><div class='del'>-</div><div class='del'>-	usb_make_path(usbdev, dj_hiddev-&gt;phys, sizeof(dj_hiddev-&gt;phys));</div><div class='del'>-	snprintf(tmpstr, sizeof(tmpstr), ":%d", dj_report-&gt;device_index);</div><div class='add'>+	dj_hiddev-&gt;vendor = djrcv_hdev-&gt;vendor;</div><div class='add'>+	dj_hiddev-&gt;product = (workitem-&gt;quad_id_msb &lt;&lt; 8) |</div><div class='add'>+			      workitem-&gt;quad_id_lsb;</div><div class='add'>+	if (workitem-&gt;device_type) {</div><div class='add'>+		const char *type_str = "Device";</div><div class='add'>+</div><div class='add'>+		switch (workitem-&gt;device_type) {</div><div class='add'>+		case 0x01: type_str = "Keyboard";	break;</div><div class='add'>+		case 0x02: type_str = "Mouse";		break;</div><div class='add'>+		case 0x03: type_str = "Numpad";		break;</div><div class='add'>+		case 0x04: type_str = "Presenter";	break;</div><div class='add'>+		case 0x07: type_str = "Remote Control";	break;</div><div class='add'>+		case 0x08: type_str = "Trackball";	break;</div><div class='add'>+		case 0x09: type_str = "Touchpad";	break;</div><div class='add'>+		}</div><div class='add'>+		snprintf(dj_hiddev-&gt;name, sizeof(dj_hiddev-&gt;name),</div><div class='add'>+			"Logitech Wireless %s PID:%04x",</div><div class='add'>+			type_str, dj_hiddev-&gt;product);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(dj_hiddev-&gt;name, sizeof(dj_hiddev-&gt;name),</div><div class='add'>+			"Logitech Unifying Device. Wireless PID:%04x",</div><div class='add'>+			dj_hiddev-&gt;product);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (djrcv_dev-&gt;type == recvr_type_27mhz)</div><div class='add'>+		dj_hiddev-&gt;group = HID_GROUP_LOGITECH_27MHZ_DEVICE;</div><div class='add'>+	else</div><div class='add'>+		dj_hiddev-&gt;group = HID_GROUP_LOGITECH_DJ_DEVICE;</div><div class='add'>+</div><div class='add'>+	memcpy(dj_hiddev-&gt;phys, djrcv_hdev-&gt;phys, sizeof(djrcv_hdev-&gt;phys));</div><div class='add'>+	snprintf(tmpstr, sizeof(tmpstr), ":%d", device_index);</div><div class='ctx'> 	strlcat(dj_hiddev-&gt;phys, tmpstr, sizeof(dj_hiddev-&gt;phys));</div><div class='ctx'> </div><div class='ctx'> 	dj_dev = kzalloc(sizeof(struct dj_device), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!dj_dev) {</div><div class='del'>-		dev_err(&amp;djrcv_hdev-&gt;dev, "%s: failed allocating dj_device\n",</div><div class='del'>-			__func__);</div><div class='add'>+		hid_err(djrcv_hdev, "%s: failed allocating dj_dev\n", __func__);</div><div class='ctx'> 		goto dj_device_allocate_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dj_dev-&gt;reports_supported = get_unaligned_le32(</div><div class='del'>-		dj_report-&gt;report_params + DEVICE_PAIRED_RF_REPORT_TYPE);</div><div class='add'>+	dj_dev-&gt;reports_supported = workitem-&gt;reports_supported;</div><div class='ctx'> 	dj_dev-&gt;hdev = dj_hiddev;</div><div class='ctx'> 	dj_dev-&gt;dj_receiver_dev = djrcv_dev;</div><div class='del'>-	dj_dev-&gt;device_index = dj_report-&gt;device_index;</div><div class='add'>+	dj_dev-&gt;device_index = device_index;</div><div class='ctx'> 	dj_hiddev-&gt;driver_data = dj_dev;</div><div class='ctx'> </div><div class='del'>-	djrcv_dev-&gt;paired_dj_devices[dj_report-&gt;device_index] = dj_dev;</div><div class='add'>+	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+	djrcv_dev-&gt;paired_dj_devices[device_index] = dj_dev;</div><div class='add'>+	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (hid_add_device(dj_hiddev)) {</div><div class='del'>-		dev_err(&amp;djrcv_hdev-&gt;dev, "%s: failed adding dj_device\n",</div><div class='del'>-			__func__);</div><div class='add'>+		hid_err(djrcv_hdev, "%s: failed adding dj_device\n", __func__);</div><div class='ctx'> 		goto hid_add_device_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> hid_add_device_fail:</div><div class='del'>-	djrcv_dev-&gt;paired_dj_devices[dj_report-&gt;device_index] = NULL;</div><div class='add'>+	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+	djrcv_dev-&gt;paired_dj_devices[device_index] = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> 	kfree(dj_dev);</div><div class='ctx'> dj_device_allocate_fail:</div><div class='ctx'> 	hid_destroy_device(dj_hiddev);</div><div class='hunk'>@@ -454,7 +765,7 @@ static void delayedwork_callback(struct work_struct *work)</div><div class='ctx'> 	struct dj_receiver_dev *djrcv_dev =</div><div class='ctx'> 		container_of(work, struct dj_receiver_dev, work);</div><div class='ctx'> </div><div class='del'>-	struct dj_report dj_report;</div><div class='add'>+	struct dj_workitem workitem;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int count;</div><div class='ctx'> 	int retval;</div><div class='hunk'>@@ -463,69 +774,231 @@ static void delayedwork_callback(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	count = kfifo_out(&amp;djrcv_dev-&gt;notif_fifo, &amp;dj_report,</div><div class='del'>-				sizeof(struct dj_report));</div><div class='del'>-</div><div class='del'>-	if (count != sizeof(struct dj_report)) {</div><div class='del'>-		dev_err(&amp;djrcv_dev-&gt;hdev-&gt;dev, "%s: workitem triggered without "</div><div class='del'>-			"notifications available\n", __func__);</div><div class='add'>+	/*</div><div class='add'>+	 * Since we attach to multiple interfaces, we may get scheduled before</div><div class='add'>+	 * we are bound to the HID++ interface, catch this.</div><div class='add'>+	 */</div><div class='add'>+	if (!djrcv_dev-&gt;ready) {</div><div class='add'>+		pr_warn("%s: delayedwork queued before hidpp interface was enumerated\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!kfifo_is_empty(&amp;djrcv_dev-&gt;notif_fifo)) {</div><div class='del'>-		if (schedule_work(&amp;djrcv_dev-&gt;work) == 0) {</div><div class='del'>-			dbg_hid("%s: did not schedule the work item, was "</div><div class='del'>-				"already queued\n", __func__);</div><div class='del'>-		}</div><div class='add'>+	count = kfifo_out(&amp;djrcv_dev-&gt;notif_fifo, &amp;workitem, sizeof(workitem));</div><div class='add'>+</div><div class='add'>+	if (count != sizeof(workitem)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!kfifo_is_empty(&amp;djrcv_dev-&gt;notif_fifo))</div><div class='add'>+		schedule_work(&amp;djrcv_dev-&gt;work);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	switch (dj_report.report_type) {</div><div class='del'>-	case REPORT_TYPE_NOTIF_DEVICE_PAIRED:</div><div class='del'>-		logi_dj_recv_add_djhid_device(djrcv_dev, &amp;dj_report);</div><div class='add'>+	switch (workitem.type) {</div><div class='add'>+	case WORKITEM_TYPE_PAIRED:</div><div class='add'>+		logi_dj_recv_add_djhid_device(djrcv_dev, &amp;workitem);</div><div class='ctx'> 		break;</div><div class='del'>-	case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED:</div><div class='del'>-		logi_dj_recv_destroy_djhid_device(djrcv_dev, &amp;dj_report);</div><div class='add'>+	case WORKITEM_TYPE_UNPAIRED:</div><div class='add'>+		logi_dj_recv_destroy_djhid_device(djrcv_dev, &amp;workitem);</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-	/* A normal report (i. e. not belonging to a pair/unpair notification)</div><div class='del'>-	 * arriving here, means that the report arrived but we did not have a</div><div class='del'>-	 * paired dj_device associated to the report's device_index, this</div><div class='del'>-	 * means that the original "device paired" notification corresponding</div><div class='del'>-	 * to this dj_device never arrived to this driver. The reason is that</div><div class='del'>-	 * hid-core discards all packets coming from a device while probe() is</div><div class='del'>-	 * executing. */</div><div class='del'>-	if (!djrcv_dev-&gt;paired_dj_devices[dj_report.device_index]) {</div><div class='del'>-		/* ok, we don't know the device, just re-ask the</div><div class='del'>-		 * receiver for the list of connected devices. */</div><div class='add'>+	case WORKITEM_TYPE_UNKNOWN:</div><div class='ctx'> 		retval = logi_dj_recv_query_paired_devices(djrcv_dev);</div><div class='del'>-		if (!retval) {</div><div class='del'>-			/* everything went fine, so just leave */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		dev_err(&amp;djrcv_dev-&gt;hdev-&gt;dev,</div><div class='del'>-			"%s:logi_dj_recv_query_paired_devices "</div><div class='del'>-			"error:%d\n", __func__, retval);</div><div class='add'>+		if (retval) {</div><div class='add'>+			hid_err(djrcv_dev-&gt;hidpp, "%s: logi_dj_recv_query_paired_devices error: %d\n",</div><div class='add'>+				__func__, retval);</div><div class='ctx'> 		}</div><div class='del'>-		dbg_hid("%s: unexpected report type\n", __func__);</div><div class='add'>+		break;</div><div class='add'>+	case WORKITEM_TYPE_EMPTY:</div><div class='add'>+		dbg_hid("%s: device list is empty\n", __func__);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Sometimes we receive reports for which we do not have a paired dj_device</div><div class='add'>+ * associated with the device_index or report-type to forward the report to.</div><div class='add'>+ * This means that the original "device paired" notification corresponding</div><div class='add'>+ * to the dj_device never arrived to this driver. Possible reasons for this are:</div><div class='add'>+ * 1) hid-core discards all packets coming from a device during probe().</div><div class='add'>+ * 2) if the receiver is plugged into a KVM switch then the pairing reports</div><div class='add'>+ * are only forwarded to it if the focus is on this PC.</div><div class='add'>+ * This function deals with this by re-asking the receiver for the list of</div><div class='add'>+ * connected devices in the delayed work callback.</div><div class='add'>+ * This function MUST be called with djrcv-&gt;lock held.</div><div class='add'>+ */</div><div class='add'>+static void logi_dj_recv_queue_unknown_work(struct dj_receiver_dev *djrcv_dev)</div><div class='add'>+{</div><div class='add'>+	struct dj_workitem workitem = { .type = WORKITEM_TYPE_UNKNOWN };</div><div class='add'>+</div><div class='add'>+	/* Rate limit queries done because of unhandeled reports to 2/sec */</div><div class='add'>+	if (time_before(jiffies, djrcv_dev-&gt;last_query + HZ / 2))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kfifo_in(&amp;djrcv_dev-&gt;notif_fifo, &amp;workitem, sizeof(workitem));</div><div class='add'>+	schedule_work(&amp;djrcv_dev-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void logi_dj_recv_queue_notification(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 					   struct dj_report *dj_report)</div><div class='ctx'> {</div><div class='ctx'> 	/* We are called from atomic context (tasklet &amp;&amp; djrcv-&gt;lock held) */</div><div class='add'>+	struct dj_workitem workitem = {</div><div class='add'>+		.device_index = dj_report-&gt;device_index,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (dj_report-&gt;report_type) {</div><div class='add'>+	case REPORT_TYPE_NOTIF_DEVICE_PAIRED:</div><div class='add'>+		workitem.type = WORKITEM_TYPE_PAIRED;</div><div class='add'>+		if (dj_report-&gt;report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] &amp;</div><div class='add'>+		    SPFUNCTION_DEVICE_LIST_EMPTY) {</div><div class='add'>+			workitem.type = WORKITEM_TYPE_EMPTY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* fall-through */</div><div class='add'>+	case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED:</div><div class='add'>+		workitem.quad_id_msb =</div><div class='add'>+			dj_report-&gt;report_params[DEVICE_PAIRED_PARAM_EQUAD_ID_MSB];</div><div class='add'>+		workitem.quad_id_lsb =</div><div class='add'>+			dj_report-&gt;report_params[DEVICE_PAIRED_PARAM_EQUAD_ID_LSB];</div><div class='add'>+		workitem.reports_supported = get_unaligned_le32(</div><div class='add'>+						dj_report-&gt;report_params +</div><div class='add'>+						DEVICE_PAIRED_RF_REPORT_TYPE);</div><div class='add'>+		workitem.reports_supported |= HIDPP;</div><div class='add'>+		if (dj_report-&gt;report_type == REPORT_TYPE_NOTIF_DEVICE_UNPAIRED)</div><div class='add'>+			workitem.type = WORKITEM_TYPE_UNPAIRED;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		logi_dj_recv_queue_unknown_work(djrcv_dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	kfifo_in(&amp;djrcv_dev-&gt;notif_fifo, dj_report, sizeof(struct dj_report));</div><div class='add'>+	kfifo_in(&amp;djrcv_dev-&gt;notif_fifo, &amp;workitem, sizeof(workitem));</div><div class='add'>+	schedule_work(&amp;djrcv_dev-&gt;work);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (schedule_work(&amp;djrcv_dev-&gt;work) == 0) {</div><div class='del'>-		dbg_hid("%s: did not schedule the work item, was already "</div><div class='del'>-			"queued\n", __func__);</div><div class='add'>+static void logi_hidpp_dev_conn_notif_equad(struct hidpp_event *hidpp_report,</div><div class='add'>+					    struct dj_workitem *workitem)</div><div class='add'>+{</div><div class='add'>+	workitem-&gt;type = WORKITEM_TYPE_PAIRED;</div><div class='add'>+	workitem-&gt;device_type = hidpp_report-&gt;params[HIDPP_PARAM_DEVICE_INFO] &amp;</div><div class='add'>+				HIDPP_DEVICE_TYPE_MASK;</div><div class='add'>+	workitem-&gt;quad_id_msb = hidpp_report-&gt;params[HIDPP_PARAM_EQUAD_MSB];</div><div class='add'>+	workitem-&gt;quad_id_lsb = hidpp_report-&gt;params[HIDPP_PARAM_EQUAD_LSB];</div><div class='add'>+	switch (workitem-&gt;device_type) {</div><div class='add'>+	case REPORT_TYPE_KEYBOARD:</div><div class='add'>+		workitem-&gt;reports_supported |= STD_KEYBOARD | MULTIMEDIA |</div><div class='add'>+					       POWER_KEYS | MEDIA_CENTER |</div><div class='add'>+					       HIDPP;</div><div class='add'>+		break;</div><div class='add'>+	case REPORT_TYPE_MOUSE:</div><div class='add'>+		workitem-&gt;reports_supported |= STD_MOUSE | HIDPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void logi_hidpp_dev_conn_notif_27mhz(struct hid_device *hdev,</div><div class='add'>+					    struct hidpp_event *hidpp_report,</div><div class='add'>+					    struct dj_workitem *workitem)</div><div class='add'>+{</div><div class='add'>+	workitem-&gt;type = WORKITEM_TYPE_PAIRED;</div><div class='add'>+	workitem-&gt;quad_id_lsb = hidpp_report-&gt;params[HIDPP_PARAM_27MHZ_DEVID];</div><div class='add'>+	switch (hidpp_report-&gt;device_index) {</div><div class='add'>+	case 1: /* Index 1 is always a mouse */</div><div class='add'>+	case 2: /* Index 2 is always a mouse */</div><div class='add'>+		workitem-&gt;device_type = HIDPP_DEVICE_TYPE_MOUSE;</div><div class='add'>+		workitem-&gt;reports_supported |= STD_MOUSE | HIDPP;</div><div class='add'>+		break;</div><div class='add'>+	case 3: /* Index 3 is always the keyboard */</div><div class='add'>+	case 4: /* Index 4 is used for an optional separate numpad */</div><div class='add'>+		workitem-&gt;device_type = HIDPP_DEVICE_TYPE_KEYBOARD;</div><div class='add'>+		workitem-&gt;reports_supported |= STD_KEYBOARD | MULTIMEDIA |</div><div class='add'>+					       POWER_KEYS | HIDPP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		hid_warn(hdev, "%s: unexpected device-index %d", __func__,</div><div class='add'>+			 hidpp_report-&gt;device_index);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void logi_hidpp_recv_queue_notif(struct hid_device *hdev,</div><div class='add'>+					struct hidpp_event *hidpp_report)</div><div class='add'>+{</div><div class='add'>+	/* We are called from atomic context (tasklet &amp;&amp; djrcv-&gt;lock held) */</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='add'>+	const char *device_type = "UNKNOWN";</div><div class='add'>+	struct dj_workitem workitem = {</div><div class='add'>+		.type = WORKITEM_TYPE_EMPTY,</div><div class='add'>+		.device_index = hidpp_report-&gt;device_index,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (hidpp_report-&gt;params[HIDPP_PARAM_PROTO_TYPE]) {</div><div class='add'>+	case 0x01:</div><div class='add'>+		device_type = "Bluetooth";</div><div class='add'>+		/* Bluetooth connect packet contents is the same as (e)QUAD */</div><div class='add'>+		logi_hidpp_dev_conn_notif_equad(hidpp_report, &amp;workitem);</div><div class='add'>+		if (!(hidpp_report-&gt;params[HIDPP_PARAM_DEVICE_INFO] &amp;</div><div class='add'>+						HIDPP_MANUFACTURER_MASK)) {</div><div class='add'>+			hid_info(hdev, "Non Logitech device connected on slot %d\n",</div><div class='add'>+				 hidpp_report-&gt;device_index);</div><div class='add'>+			workitem.reports_supported &amp;= ~HIDPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 0x02:</div><div class='add'>+		device_type = "27 Mhz";</div><div class='add'>+		logi_hidpp_dev_conn_notif_27mhz(hdev, hidpp_report, &amp;workitem);</div><div class='add'>+		break;</div><div class='add'>+	case 0x03:</div><div class='add'>+		device_type = "QUAD or eQUAD";</div><div class='add'>+		logi_hidpp_dev_conn_notif_equad(hidpp_report, &amp;workitem);</div><div class='add'>+		break;</div><div class='add'>+	case 0x04:</div><div class='add'>+		device_type = "eQUAD step 4 DJ";</div><div class='add'>+		logi_hidpp_dev_conn_notif_equad(hidpp_report, &amp;workitem);</div><div class='add'>+		break;</div><div class='add'>+	case 0x05:</div><div class='add'>+		device_type = "DFU Lite";</div><div class='add'>+		break;</div><div class='add'>+	case 0x06:</div><div class='add'>+		device_type = "eQUAD step 4 Lite";</div><div class='add'>+		logi_hidpp_dev_conn_notif_equad(hidpp_report, &amp;workitem);</div><div class='add'>+		break;</div><div class='add'>+	case 0x07:</div><div class='add'>+		device_type = "eQUAD step 4 Gaming";</div><div class='add'>+		break;</div><div class='add'>+	case 0x08:</div><div class='add'>+		device_type = "eQUAD step 4 for gamepads";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0a:</div><div class='add'>+		device_type = "eQUAD nano Lite";</div><div class='add'>+		logi_hidpp_dev_conn_notif_equad(hidpp_report, &amp;workitem);</div><div class='add'>+		break;</div><div class='add'>+	case 0x0c:</div><div class='add'>+		device_type = "eQUAD Lightspeed";</div><div class='add'>+		logi_hidpp_dev_conn_notif_equad(hidpp_report, &amp;workitem);</div><div class='add'>+		workitem.reports_supported |= STD_KEYBOARD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (workitem.type == WORKITEM_TYPE_EMPTY) {</div><div class='add'>+		hid_warn(hdev,</div><div class='add'>+			 "unusable device of type %s (0x%02x) connected on slot %d",</div><div class='add'>+			 device_type,</div><div class='add'>+			 hidpp_report-&gt;params[HIDPP_PARAM_PROTO_TYPE],</div><div class='add'>+			 hidpp_report-&gt;device_index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hid_info(hdev, "device of type %s (0x%02x) connected on slot %d",</div><div class='add'>+		 device_type, hidpp_report-&gt;params[HIDPP_PARAM_PROTO_TYPE],</div><div class='add'>+		 hidpp_report-&gt;device_index);</div><div class='add'>+</div><div class='add'>+	kfifo_in(&amp;djrcv_dev-&gt;notif_fifo, &amp;workitem, sizeof(workitem));</div><div class='add'>+	schedule_work(&amp;djrcv_dev-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 					     struct dj_report *dj_report)</div><div class='ctx'> {</div><div class='hunk'>@@ -552,8 +1025,8 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,</div><div class='del'>-					struct dj_report *dj_report)</div><div class='add'>+static void logi_dj_recv_forward_dj(struct dj_receiver_dev *djrcv_dev,</div><div class='add'>+				    struct dj_report *dj_report)</div><div class='ctx'> {</div><div class='ctx'> 	/* We are called from atomic context (tasklet &amp;&amp; djrcv-&gt;lock held) */</div><div class='ctx'> 	struct dj_device *dj_device;</div><div class='hunk'>@@ -573,18 +1046,48 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void logi_dj_recv_forward_hidpp(struct dj_device *dj_dev, u8 *data,</div><div class='del'>-				       int size)</div><div class='add'>+static void logi_dj_recv_forward_report(struct dj_device *dj_dev, u8 *data,</div><div class='add'>+					int size)</div><div class='ctx'> {</div><div class='ctx'> 	/* We are called from atomic context (tasklet &amp;&amp; djrcv-&gt;lock held) */</div><div class='ctx'> 	if (hid_input_report(dj_dev-&gt;hdev, HID_INPUT_REPORT, data, size, 1))</div><div class='ctx'> 		dbg_hid("hid_input_report error\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void logi_dj_recv_forward_input_report(struct hid_device *hdev,</div><div class='add'>+					      u8 *data, int size)</div><div class='add'>+{</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='add'>+	struct dj_device *dj_dev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 report = data[0];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (report &gt; REPORT_TYPE_RFREPORT_LAST) {</div><div class='add'>+		hid_err(hdev, "Unexpected input report number %d\n", report);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+	for (i = 0; i &lt; (DJ_MAX_PAIRED_DEVICES + DJ_DEVICE_INDEX_MIN); i++) {</div><div class='add'>+		dj_dev = djrcv_dev-&gt;paired_dj_devices[i];</div><div class='add'>+		if (dj_dev &amp;&amp; (dj_dev-&gt;reports_supported &amp; BIT(report))) {</div><div class='add'>+			logi_dj_recv_forward_report(dj_dev, data, size);</div><div class='add'>+			spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	logi_dj_recv_queue_unknown_work(djrcv_dev);</div><div class='add'>+	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dbg_hid("No dj-devs handling input report number %d\n", report);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 				    struct dj_report *dj_report)</div><div class='ctx'> {</div><div class='del'>-	struct hid_device *hdev = djrcv_dev-&gt;hdev;</div><div class='add'>+	struct hid_device *hdev = djrcv_dev-&gt;hidpp;</div><div class='ctx'> 	struct hid_report *report;</div><div class='ctx'> 	struct hid_report_enum *output_report_enum;</div><div class='ctx'> 	u8 *data = (u8 *)(&amp;dj_report-&gt;device_index);</div><div class='hunk'>@@ -594,7 +1097,7 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 	report = output_report_enum-&gt;report_id_hash[REPORT_ID_DJ_SHORT];</div><div class='ctx'> </div><div class='ctx'> 	if (!report) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev, "%s: unable to find dj report\n", __func__);</div><div class='add'>+		hid_err(hdev, "%s: unable to find dj report\n", __func__);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -606,14 +1109,40 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int logi_dj_recv_query_hidpp_devices(struct dj_receiver_dev *djrcv_dev)</div><div class='add'>+{</div><div class='add'>+	const u8 template[] = {REPORT_ID_HIDPP_SHORT,</div><div class='add'>+			       HIDPP_RECEIVER_INDEX,</div><div class='add'>+			       HIDPP_SET_REGISTER,</div><div class='add'>+			       HIDPP_REG_CONNECTION_STATE,</div><div class='add'>+			       HIDPP_FAKE_DEVICE_ARRIVAL,</div><div class='add'>+			       0x00, 0x00};</div><div class='add'>+	u8 *hidpp_report;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	hidpp_report = kmemdup(template, sizeof(template), GFP_KERNEL);</div><div class='add'>+	if (!hidpp_report)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	retval = hid_hw_raw_request(djrcv_dev-&gt;hidpp,</div><div class='add'>+				    REPORT_ID_HIDPP_SHORT,</div><div class='add'>+				    hidpp_report, sizeof(template),</div><div class='add'>+				    HID_OUTPUT_REPORT,</div><div class='add'>+				    HID_REQ_SET_REPORT);</div><div class='add'>+</div><div class='add'>+	kfree(hidpp_report);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dj_report *dj_report;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	/* no need to protect djrcv_dev-&gt;querying_devices */</div><div class='del'>-	if (djrcv_dev-&gt;querying_devices)</div><div class='del'>-		return 0;</div><div class='add'>+	djrcv_dev-&gt;last_query = jiffies;</div><div class='add'>+</div><div class='add'>+	if (djrcv_dev-&gt;type != recvr_type_dj)</div><div class='add'>+		return logi_dj_recv_query_hidpp_devices(djrcv_dev);</div><div class='ctx'> </div><div class='ctx'> 	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);</div><div class='ctx'> 	if (!dj_report)</div><div class='hunk'>@@ -630,27 +1159,33 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)</div><div class='ctx'> static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> 					  unsigned timeout)</div><div class='ctx'> {</div><div class='del'>-	struct hid_device *hdev = djrcv_dev-&gt;hdev;</div><div class='add'>+	struct hid_device *hdev = djrcv_dev-&gt;hidpp;</div><div class='ctx'> 	struct dj_report *dj_report;</div><div class='ctx'> 	u8 *buf;</div><div class='del'>-	int retval;</div><div class='add'>+	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);</div><div class='ctx'> 	if (!dj_report)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	dj_report-&gt;report_id = REPORT_ID_DJ_SHORT;</div><div class='del'>-	dj_report-&gt;device_index = 0xFF;</div><div class='del'>-	dj_report-&gt;report_type = REPORT_TYPE_CMD_SWITCH;</div><div class='del'>-	dj_report-&gt;report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;</div><div class='del'>-	dj_report-&gt;report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;</div><div class='del'>-	retval = logi_dj_recv_send_report(djrcv_dev, dj_report);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Ugly sleep to work around a USB 3.0 bug when the receiver is still</div><div class='del'>-	 * processing the "switch-to-dj" command while we send an other command.</div><div class='del'>-	 * 50 msec should gives enough time to the receiver to be ready.</div><div class='del'>-	 */</div><div class='del'>-	msleep(50);</div><div class='add'>+	if (djrcv_dev-&gt;type == recvr_type_dj) {</div><div class='add'>+		dj_report-&gt;report_id = REPORT_ID_DJ_SHORT;</div><div class='add'>+		dj_report-&gt;device_index = 0xFF;</div><div class='add'>+		dj_report-&gt;report_type = REPORT_TYPE_CMD_SWITCH;</div><div class='add'>+		dj_report-&gt;report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;</div><div class='add'>+		dj_report-&gt;report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] =</div><div class='add'>+								(u8)timeout;</div><div class='add'>+</div><div class='add'>+		retval = logi_dj_recv_send_report(djrcv_dev, dj_report);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Ugly sleep to work around a USB 3.0 bug when the receiver is</div><div class='add'>+		 * still processing the "switch-to-dj" command while we send an</div><div class='add'>+		 * other command.</div><div class='add'>+		 * 50 msec should gives enough time to the receiver to be ready.</div><div class='add'>+		 */</div><div class='add'>+		msleep(50);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Magical bits to set up hidpp notifications when the dj devices</div><div class='hunk'>@@ -682,22 +1217,28 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,</div><div class='ctx'> </div><div class='ctx'> static int logi_dj_ll_open(struct hid_device *hid)</div><div class='ctx'> {</div><div class='del'>-	dbg_hid("%s:%s\n", __func__, hid-&gt;phys);</div><div class='add'>+	dbg_hid("%s: %s\n", __func__, hid-&gt;phys);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void logi_dj_ll_close(struct hid_device *hid)</div><div class='ctx'> {</div><div class='del'>-	dbg_hid("%s:%s\n", __func__, hid-&gt;phys);</div><div class='add'>+	dbg_hid("%s: %s\n", __func__, hid-&gt;phys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register 0xB5 is "pairing information". It is solely intended for the</div><div class='ctx'>  * receiver, so do not overwrite the device index.</div><div class='ctx'>  */</div><div class='del'>-static u8 unifying_pairing_query[]  = {0x10, 0xff, 0x83, 0xb5};</div><div class='del'>-static u8 unifying_pairing_answer[] = {0x11, 0xff, 0x83, 0xb5};</div><div class='add'>+static u8 unifying_pairing_query[]  = { REPORT_ID_HIDPP_SHORT,</div><div class='add'>+					HIDPP_RECEIVER_INDEX,</div><div class='add'>+					HIDPP_GET_LONG_REGISTER,</div><div class='add'>+					HIDPP_REG_PAIRING_INFORMATION };</div><div class='add'>+static u8 unifying_pairing_answer[] = { REPORT_ID_HIDPP_LONG,</div><div class='add'>+					HIDPP_RECEIVER_INDEX,</div><div class='add'>+					HIDPP_GET_LONG_REGISTER,</div><div class='add'>+					HIDPP_REG_PAIRING_INFORMATION };</div><div class='ctx'> </div><div class='ctx'> static int logi_dj_ll_raw_request(struct hid_device *hid,</div><div class='ctx'> 				  unsigned char reportnum, __u8 *buf,</div><div class='hunk'>@@ -721,13 +1262,23 @@ static int logi_dj_ll_raw_request(struct hid_device *hid,</div><div class='ctx'> 			buf[4] = (buf[4] &amp; 0xf0) | (djdev-&gt;device_index - 1);</div><div class='ctx'> 		else</div><div class='ctx'> 			buf[1] = djdev-&gt;device_index;</div><div class='del'>-		return hid_hw_raw_request(djrcv_dev-&gt;hdev, reportnum, buf,</div><div class='add'>+		return hid_hw_raw_request(djrcv_dev-&gt;hidpp, reportnum, buf,</div><div class='ctx'> 				count, report_type, reqtype);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (buf[0] != REPORT_TYPE_LEDS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (djrcv_dev-&gt;type != recvr_type_dj &amp;&amp; count &gt;= 2) {</div><div class='add'>+		if (!djrcv_dev-&gt;keyboard) {</div><div class='add'>+			hid_warn(hid, "Received REPORT_TYPE_LEDS request before the keyboard interface was enumerated\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		/* usbhid overrides the report ID and ignores the first byte */</div><div class='add'>+		return hid_hw_raw_request(djrcv_dev-&gt;keyboard, 0, buf, count,</div><div class='add'>+					  report_type, reqtype);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	out_buf = kzalloc(DJREPORT_SHORT_LENGTH, GFP_ATOMIC);</div><div class='ctx'> 	if (!out_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -739,7 +1290,7 @@ static int logi_dj_ll_raw_request(struct hid_device *hid,</div><div class='ctx'> 	out_buf[1] = djdev-&gt;device_index;</div><div class='ctx'> 	memcpy(out_buf + 2, buf, count);</div><div class='ctx'> </div><div class='del'>-	ret = hid_hw_raw_request(djrcv_dev-&gt;hdev, out_buf[0], out_buf,</div><div class='add'>+	ret = hid_hw_raw_request(djrcv_dev-&gt;hidpp, out_buf[0], out_buf,</div><div class='ctx'> 		DJREPORT_SHORT_LENGTH, report_type, reqtype);</div><div class='ctx'> </div><div class='ctx'> 	kfree(out_buf);</div><div class='hunk'>@@ -769,41 +1320,55 @@ static int logi_dj_ll_parse(struct hid_device *hid)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (djdev-&gt;reports_supported &amp; STD_KEYBOARD) {</div><div class='del'>-		dbg_hid("%s: sending a kbd descriptor, reports_supported: %x\n",</div><div class='add'>+		dbg_hid("%s: sending a kbd descriptor, reports_supported: %llx\n",</div><div class='ctx'> 			__func__, djdev-&gt;reports_supported);</div><div class='ctx'> 		rdcat(rdesc, &amp;rsize, kbd_descriptor, sizeof(kbd_descriptor));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (djdev-&gt;reports_supported &amp; STD_MOUSE) {</div><div class='del'>-		dbg_hid("%s: sending a mouse descriptor, reports_supported: "</div><div class='del'>-			"%x\n", __func__, djdev-&gt;reports_supported);</div><div class='del'>-		rdcat(rdesc, &amp;rsize, mse_descriptor, sizeof(mse_descriptor));</div><div class='add'>+		dbg_hid("%s: sending a mouse descriptor, reports_supported: %llx\n",</div><div class='add'>+			__func__, djdev-&gt;reports_supported);</div><div class='add'>+		if (djdev-&gt;dj_receiver_dev-&gt;type == recvr_type_gaming_hidpp)</div><div class='add'>+			rdcat(rdesc, &amp;rsize, mse_high_res_descriptor,</div><div class='add'>+			      sizeof(mse_high_res_descriptor));</div><div class='add'>+		else if (djdev-&gt;dj_receiver_dev-&gt;type == recvr_type_27mhz)</div><div class='add'>+			rdcat(rdesc, &amp;rsize, mse_27mhz_descriptor,</div><div class='add'>+			      sizeof(mse_27mhz_descriptor));</div><div class='add'>+		else if (djdev-&gt;dj_receiver_dev-&gt;type == recvr_type_bluetooth)</div><div class='add'>+			rdcat(rdesc, &amp;rsize, mse_bluetooth_descriptor,</div><div class='add'>+			      sizeof(mse_bluetooth_descriptor));</div><div class='add'>+		else</div><div class='add'>+			rdcat(rdesc, &amp;rsize, mse_descriptor,</div><div class='add'>+			      sizeof(mse_descriptor));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (djdev-&gt;reports_supported &amp; MULTIMEDIA) {</div><div class='del'>-		dbg_hid("%s: sending a multimedia report descriptor: %x\n",</div><div class='add'>+		dbg_hid("%s: sending a multimedia report descriptor: %llx\n",</div><div class='ctx'> 			__func__, djdev-&gt;reports_supported);</div><div class='ctx'> 		rdcat(rdesc, &amp;rsize, consumer_descriptor, sizeof(consumer_descriptor));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (djdev-&gt;reports_supported &amp; POWER_KEYS) {</div><div class='del'>-		dbg_hid("%s: sending a power keys report descriptor: %x\n",</div><div class='add'>+		dbg_hid("%s: sending a power keys report descriptor: %llx\n",</div><div class='ctx'> 			__func__, djdev-&gt;reports_supported);</div><div class='ctx'> 		rdcat(rdesc, &amp;rsize, syscontrol_descriptor, sizeof(syscontrol_descriptor));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (djdev-&gt;reports_supported &amp; MEDIA_CENTER) {</div><div class='del'>-		dbg_hid("%s: sending a media center report descriptor: %x\n",</div><div class='add'>+		dbg_hid("%s: sending a media center report descriptor: %llx\n",</div><div class='ctx'> 			__func__, djdev-&gt;reports_supported);</div><div class='ctx'> 		rdcat(rdesc, &amp;rsize, media_descriptor, sizeof(media_descriptor));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (djdev-&gt;reports_supported &amp; KBD_LEDS) {</div><div class='del'>-		dbg_hid("%s: need to send kbd leds report descriptor: %x\n",</div><div class='add'>+		dbg_hid("%s: need to send kbd leds report descriptor: %llx\n",</div><div class='ctx'> 			__func__, djdev-&gt;reports_supported);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rdcat(rdesc, &amp;rsize, hidpp_descriptor, sizeof(hidpp_descriptor));</div><div class='add'>+	if (djdev-&gt;reports_supported &amp; HIDPP) {</div><div class='add'>+		rdcat(rdesc, &amp;rsize, hidpp_descriptor,</div><div class='add'>+		      sizeof(hidpp_descriptor));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	retval = hid_parse_report(hid, rdesc, rsize);</div><div class='ctx'> 	kfree(rdesc);</div><div class='hunk'>@@ -866,7 +1431,7 @@ static int logi_dj_dj_event(struct hid_device *hdev,</div><div class='ctx'> 		 * so ignore those reports too.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dj_report-&gt;device_index != DJ_RECEIVER_INDEX)</div><div class='del'>-			dev_err(&amp;hdev-&gt;dev, "%s: invalid device index:%d\n",</div><div class='add'>+			hid_err(hdev, "%s: invalid device index:%d\n",</div><div class='ctx'> 				__func__, dj_report-&gt;device_index);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -893,7 +1458,7 @@ static int logi_dj_dj_event(struct hid_device *hdev,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		logi_dj_recv_forward_report(djrcv_dev, dj_report);</div><div class='add'>+		logi_dj_recv_forward_dj(djrcv_dev, dj_report);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -907,9 +1472,10 @@ static int logi_dj_hidpp_event(struct hid_device *hdev,</div><div class='ctx'> 			     int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='del'>-	struct dj_report *dj_report = (struct dj_report *) data;</div><div class='add'>+	struct hidpp_event *hidpp_report = (struct hidpp_event *) data;</div><div class='add'>+	struct dj_device *dj_dev;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u8 device_index = dj_report-&gt;device_index;</div><div class='add'>+	u8 device_index = hidpp_report-&gt;device_index;</div><div class='ctx'> </div><div class='ctx'> 	if (device_index == HIDPP_RECEIVER_INDEX) {</div><div class='ctx'> 		/* special case were the device wants to know its unifying</div><div class='hunk'>@@ -937,21 +1503,42 @@ static int logi_dj_hidpp_event(struct hid_device *hdev,</div><div class='ctx'> 		 * This driver can ignore safely the receiver notifications,</div><div class='ctx'> 		 * so ignore those reports too.</div><div class='ctx'> 		 */</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev, "%s: invalid device index:%d\n",</div><div class='del'>-				__func__, dj_report-&gt;device_index);</div><div class='add'>+		hid_err(hdev, "%s: invalid device index:%d\n", __func__,</div><div class='add'>+			hidpp_report-&gt;device_index);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!djrcv_dev-&gt;paired_dj_devices[device_index])</div><div class='del'>-		/* received an event for an unknown device, bail out */</div><div class='del'>-		goto out;</div><div class='add'>+	dj_dev = djrcv_dev-&gt;paired_dj_devices[device_index];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * With 27 MHz receivers, we do not get an explicit unpair event,</div><div class='add'>+	 * remove the old device if the user has paired a *different* device.</div><div class='add'>+	 */</div><div class='add'>+	if (djrcv_dev-&gt;type == recvr_type_27mhz &amp;&amp; dj_dev &amp;&amp;</div><div class='add'>+	    hidpp_report-&gt;sub_id == REPORT_TYPE_NOTIF_DEVICE_CONNECTED &amp;&amp;</div><div class='add'>+	    hidpp_report-&gt;params[HIDPP_PARAM_PROTO_TYPE] == 0x02 &amp;&amp;</div><div class='add'>+	    hidpp_report-&gt;params[HIDPP_PARAM_27MHZ_DEVID] !=</div><div class='add'>+						dj_dev-&gt;hdev-&gt;product) {</div><div class='add'>+		struct dj_workitem workitem = {</div><div class='add'>+			.device_index = hidpp_report-&gt;device_index,</div><div class='add'>+			.type = WORKITEM_TYPE_UNPAIRED,</div><div class='add'>+		};</div><div class='add'>+		kfifo_in(&amp;djrcv_dev-&gt;notif_fifo, &amp;workitem, sizeof(workitem));</div><div class='add'>+		/* logi_hidpp_recv_queue_notif will queue the work */</div><div class='add'>+		dj_dev = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	logi_dj_recv_forward_hidpp(djrcv_dev-&gt;paired_dj_devices[device_index],</div><div class='del'>-				   data, size);</div><div class='add'>+	if (dj_dev) {</div><div class='add'>+		logi_dj_recv_forward_report(dj_dev, data, size);</div><div class='add'>+	} else {</div><div class='add'>+		if (hidpp_report-&gt;sub_id == REPORT_TYPE_NOTIF_DEVICE_CONNECTED)</div><div class='add'>+			logi_hidpp_recv_queue_notif(hdev, hidpp_report);</div><div class='add'>+		else</div><div class='add'>+			logi_dj_recv_queue_unknown_work(djrcv_dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -961,112 +1548,176 @@ static int logi_dj_raw_event(struct hid_device *hdev,</div><div class='ctx'> 			     struct hid_report *report, u8 *data,</div><div class='ctx'> 			     int size)</div><div class='ctx'> {</div><div class='add'>+	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='ctx'> 	dbg_hid("%s, size:%d\n", __func__, size);</div><div class='ctx'> </div><div class='add'>+	if (!djrcv_dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;report_enum[HID_INPUT_REPORT].numbered) {</div><div class='add'>+</div><div class='add'>+		if (djrcv_dev-&gt;unnumbered_application == HID_GD_KEYBOARD) {</div><div class='add'>+			/*</div><div class='add'>+			 * For the keyboard, we can reuse the same report by</div><div class='add'>+			 * using the second byte which is constant in the USB</div><div class='add'>+			 * HID report descriptor.</div><div class='add'>+			 */</div><div class='add'>+			data[1] = data[0];</div><div class='add'>+			data[0] = REPORT_TYPE_KEYBOARD;</div><div class='add'>+</div><div class='add'>+			logi_dj_recv_forward_input_report(hdev, data, size);</div><div class='add'>+</div><div class='add'>+			/* restore previous state */</div><div class='add'>+			data[0] = data[1];</div><div class='add'>+			data[1] = 0;</div><div class='add'>+		}</div><div class='add'>+		/* The 27 MHz mouse-only receiver sends unnumbered mouse data */</div><div class='add'>+		if (djrcv_dev-&gt;unnumbered_application == HID_GD_MOUSE &amp;&amp;</div><div class='add'>+		    size == 6) {</div><div class='add'>+			u8 mouse_report[7];</div><div class='add'>+</div><div class='add'>+			/* Prepend report id */</div><div class='add'>+			mouse_report[0] = REPORT_TYPE_MOUSE;</div><div class='add'>+			memcpy(mouse_report + 1, data, 6);</div><div class='add'>+			logi_dj_recv_forward_input_report(hdev, mouse_report, 7);</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'> 	switch (data[0]) {</div><div class='ctx'> 	case REPORT_ID_DJ_SHORT:</div><div class='ctx'> 		if (size != DJREPORT_SHORT_LENGTH) {</div><div class='del'>-			dev_err(&amp;hdev-&gt;dev, "DJ report of bad size (%d)", size);</div><div class='add'>+			hid_err(hdev, "Short DJ report bad size (%d)", size);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		return logi_dj_dj_event(hdev, report, data, size);</div><div class='add'>+	case REPORT_ID_DJ_LONG:</div><div class='add'>+		if (size != DJREPORT_LONG_LENGTH) {</div><div class='add'>+			hid_err(hdev, "Long DJ report bad size (%d)", size);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		return logi_dj_dj_event(hdev, report, data, size);</div><div class='ctx'> 	case REPORT_ID_HIDPP_SHORT:</div><div class='ctx'> 		if (size != HIDPP_REPORT_SHORT_LENGTH) {</div><div class='del'>-			dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-				"Short HID++ report of bad size (%d)", size);</div><div class='add'>+			hid_err(hdev, "Short HID++ report bad size (%d)", size);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		return logi_dj_hidpp_event(hdev, report, data, size);</div><div class='ctx'> 	case REPORT_ID_HIDPP_LONG:</div><div class='ctx'> 		if (size != HIDPP_REPORT_LONG_LENGTH) {</div><div class='del'>-			dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-				"Long HID++ report of bad size (%d)", size);</div><div class='add'>+			hid_err(hdev, "Long HID++ report bad size (%d)", size);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		return logi_dj_hidpp_event(hdev, report, data, size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	logi_dj_recv_forward_input_report(hdev, data, size);</div><div class='add'>+</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int logi_dj_probe(struct hid_device *hdev,</div><div class='ctx'> 			 const struct hid_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(hdev-&gt;dev.parent);</div><div class='add'>+	struct hid_report_enum *rep_enum;</div><div class='add'>+	struct hid_report *rep;</div><div class='ctx'> 	struct dj_receiver_dev *djrcv_dev;</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+	unsigned int no_dj_interfaces = 0;</div><div class='add'>+	bool has_hidpp = false;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	dbg_hid("%s called for ifnum %d\n", __func__,</div><div class='del'>-		intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='add'>+	/*</div><div class='add'>+	 * Call to usbhid to fetch the HID descriptors of the current</div><div class='add'>+	 * interface subsequently call to the hid/hid-core to parse the</div><div class='add'>+	 * fetched descriptors.</div><div class='add'>+	 */</div><div class='add'>+	retval = hid_parse(hdev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		hid_err(hdev, "%s: parse failed\n", __func__);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Ignore interfaces 0 and 1, they will not carry any data, dont create</div><div class='del'>-	 * any hid_device for them */</div><div class='del'>-	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber !=</div><div class='del'>-	    LOGITECH_DJ_INTERFACE_NUMBER) {</div><div class='del'>-		dbg_hid("%s: ignoring ifnum %d\n", __func__,</div><div class='del'>-			intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='add'>+	/*</div><div class='add'>+	 * Some KVMs add an extra interface for e.g. mouse emulation. If we</div><div class='add'>+	 * treat these as logitech-dj interfaces then this causes input events</div><div class='add'>+	 * reported through this extra interface to not be reported correctly.</div><div class='add'>+	 * To avoid this, we treat these as generic-hid devices.</div><div class='add'>+	 */</div><div class='add'>+	switch (id-&gt;driver_data) {</div><div class='add'>+	case recvr_type_dj:		no_dj_interfaces = 3; break;</div><div class='add'>+	case recvr_type_hidpp:		no_dj_interfaces = 2; break;</div><div class='add'>+	case recvr_type_gaming_hidpp:	no_dj_interfaces = 3; break;</div><div class='add'>+	case recvr_type_27mhz:		no_dj_interfaces = 2; break;</div><div class='add'>+	case recvr_type_bluetooth:	no_dj_interfaces = 2; break;</div><div class='add'>+	}</div><div class='add'>+	if (hid_is_using_ll_driver(hdev, &amp;usb_hid_driver)) {</div><div class='add'>+		intf = to_usb_interface(hdev-&gt;dev.parent);</div><div class='add'>+		if (intf &amp;&amp; intf-&gt;altsetting-&gt;desc.bInterfaceNumber &gt;=</div><div class='add'>+							no_dj_interfaces) {</div><div class='add'>+			hdev-&gt;quirks |= HID_QUIRK_INPUT_PER_APP;</div><div class='add'>+			return hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rep_enum = &amp;hdev-&gt;report_enum[HID_INPUT_REPORT];</div><div class='add'>+</div><div class='add'>+	/* no input reports, bail out */</div><div class='add'>+	if (list_empty(&amp;rep_enum-&gt;report_list))</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for the HID++ application.</div><div class='add'>+	 * Note: we should theoretically check for HID++ and DJ</div><div class='add'>+	 * collections, but this will do.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(rep, &amp;rep_enum-&gt;report_list, list) {</div><div class='add'>+		if (rep-&gt;application == 0xff000001)</div><div class='add'>+			has_hidpp = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Treat interface 2 */</div><div class='add'>+	/*</div><div class='add'>+	 * Ignore interfaces without DJ/HID++ collection, they will not carry</div><div class='add'>+	 * any data, dont create any hid_device for them.</div><div class='add'>+	 */</div><div class='add'>+	if (!has_hidpp &amp;&amp; id-&gt;driver_data == recvr_type_dj)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	djrcv_dev = kzalloc(sizeof(struct dj_receiver_dev), GFP_KERNEL);</div><div class='add'>+	/* get the current application attached to the node */</div><div class='add'>+	rep = list_first_entry(&amp;rep_enum-&gt;report_list, struct hid_report, list);</div><div class='add'>+	djrcv_dev = dj_get_receiver_dev(hdev, id-&gt;driver_data,</div><div class='add'>+					rep-&gt;application, has_hidpp);</div><div class='ctx'> 	if (!djrcv_dev) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-			"%s:failed allocating dj_receiver_dev\n", __func__);</div><div class='add'>+		hid_err(hdev, "%s: dj_get_receiver_dev failed\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	djrcv_dev-&gt;hdev = hdev;</div><div class='del'>-	INIT_WORK(&amp;djrcv_dev-&gt;work, delayedwork_callback);</div><div class='del'>-	spin_lock_init(&amp;djrcv_dev-&gt;lock);</div><div class='del'>-	if (kfifo_alloc(&amp;djrcv_dev-&gt;notif_fifo,</div><div class='del'>-			DJ_MAX_NUMBER_NOTIFICATIONS * sizeof(struct dj_report),</div><div class='del'>-			GFP_KERNEL)) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-			"%s:failed allocating notif_fifo\n", __func__);</div><div class='del'>-		kfree(djrcv_dev);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	hid_set_drvdata(hdev, djrcv_dev);</div><div class='ctx'> </div><div class='del'>-	/* Call  to usbhid to fetch the HID descriptors of interface 2 and</div><div class='del'>-	 * subsequently call to the hid/hid-core to parse the fetched</div><div class='del'>-	 * descriptors, this will in turn create the hidraw and hiddev nodes</div><div class='del'>-	 * for interface 2 of the receiver */</div><div class='del'>-	retval = hid_parse(hdev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-			"%s:parse of interface 2 failed\n", __func__);</div><div class='del'>-		goto hid_parse_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, REPORT_ID_DJ_SHORT,</div><div class='del'>-				 0, DJREPORT_SHORT_LENGTH - 1)) {</div><div class='del'>-		retval = -ENODEV;</div><div class='del'>-		goto hid_parse_fail;</div><div class='del'>-	}</div><div class='add'>+	if (!rep_enum-&gt;numbered)</div><div class='add'>+		djrcv_dev-&gt;unnumbered_application = rep-&gt;application;</div><div class='ctx'> </div><div class='ctx'> 	/* Starts the usb device and connects to upper interfaces hiddev and</div><div class='ctx'> 	 * hidraw */</div><div class='del'>-	retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	retval = hid_hw_start(hdev, HID_CONNECT_HIDRAW|HID_CONNECT_HIDDEV);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-			"%s:hid_hw_start returned error\n", __func__);</div><div class='add'>+		hid_err(hdev, "%s: hid_hw_start returned error\n", __func__);</div><div class='ctx'> 		goto hid_hw_start_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-			"%s:logi_dj_recv_switch_to_dj_mode returned error:%d\n",</div><div class='del'>-			__func__, retval);</div><div class='del'>-		goto switch_to_dj_mode_fail;</div><div class='add'>+	if (has_hidpp) {</div><div class='add'>+		retval = logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			hid_err(hdev, "%s: logi_dj_recv_switch_to_dj_mode returned error:%d\n",</div><div class='add'>+				__func__, retval);</div><div class='add'>+			goto switch_to_dj_mode_fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This is enabling the polling urb on the IN endpoint */</div><div class='ctx'> 	retval = hid_hw_open(hdev);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev, "%s:hid_hw_open returned error:%d\n",</div><div class='add'>+		hid_err(hdev, "%s: hid_hw_open returned error:%d\n",</div><div class='ctx'> 			__func__, retval);</div><div class='ctx'> 		goto llopen_failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1074,11 +1725,16 @@ static int logi_dj_probe(struct hid_device *hdev,</div><div class='ctx'> 	/* Allow incoming packets to arrive: */</div><div class='ctx'> 	hid_device_io_start(hdev);</div><div class='ctx'> </div><div class='del'>-	retval = logi_dj_recv_query_paired_devices(djrcv_dev);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev, "%s:logi_dj_recv_query_paired_devices "</div><div class='del'>-			"error:%d\n", __func__, retval);</div><div class='del'>-		goto logi_dj_recv_query_paired_devices_failed;</div><div class='add'>+	if (has_hidpp) {</div><div class='add'>+		spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+		djrcv_dev-&gt;ready = true;</div><div class='add'>+		spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+		retval = logi_dj_recv_query_paired_devices(djrcv_dev);</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			hid_err(hdev, "%s: logi_dj_recv_query_paired_devices error:%d\n",</div><div class='add'>+				__func__, retval);</div><div class='add'>+			goto logi_dj_recv_query_paired_devices_failed;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -1091,12 +1747,8 @@ switch_to_dj_mode_fail:</div><div class='ctx'> 	hid_hw_stop(hdev);</div><div class='ctx'> </div><div class='ctx'> hid_hw_start_fail:</div><div class='del'>-hid_parse_fail:</div><div class='del'>-	kfifo_free(&amp;djrcv_dev-&gt;notif_fifo);</div><div class='del'>-	kfree(djrcv_dev);</div><div class='del'>-	hid_set_drvdata(hdev, NULL);</div><div class='add'>+	dj_put_receiver_dev(hdev);</div><div class='ctx'> 	return retval;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -1105,10 +1757,12 @@ static int logi_dj_reset_resume(struct hid_device *hdev)</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='ctx'> </div><div class='add'>+	if (!djrcv_dev || djrcv_dev-&gt;hidpp != hdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	retval = logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='del'>-		dev_err(&amp;hdev-&gt;dev,</div><div class='del'>-			"%s:logi_dj_recv_switch_to_dj_mode returned error:%d\n",</div><div class='add'>+		hid_err(hdev, "%s: logi_dj_recv_switch_to_dj_mode returned error:%d\n",</div><div class='ctx'> 			__func__, retval);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1120,39 +1774,83 @@ static void logi_dj_remove(struct hid_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);</div><div class='ctx'> 	struct dj_device *dj_dev;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dbg_hid("%s\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (!djrcv_dev)</div><div class='add'>+		return hid_hw_stop(hdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This ensures that if the work gets requeued from another</div><div class='add'>+	 * interface of the same receiver it will be a no-op.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+	djrcv_dev-&gt;ready = false;</div><div class='add'>+	spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	cancel_work_sync(&amp;djrcv_dev-&gt;work);</div><div class='ctx'> </div><div class='ctx'> 	hid_hw_close(hdev);</div><div class='ctx'> 	hid_hw_stop(hdev);</div><div class='ctx'> </div><div class='del'>-	/* I suppose that at this point the only context that can access</div><div class='del'>-	 * the djrecv_data is this thread as the work item is guaranteed to</div><div class='del'>-	 * have finished and no more raw_event callbacks should arrive after</div><div class='del'>-	 * the remove callback was triggered so no locks are put around the</div><div class='del'>-	 * code below */</div><div class='add'>+	/*</div><div class='add'>+	 * For proper operation we need access to all interfaces, so we destroy</div><div class='add'>+	 * the paired devices when we're unbound from any interface.</div><div class='add'>+	 *</div><div class='add'>+	 * Note we may still be bound to other interfaces, sharing the same</div><div class='add'>+	 * djrcv_dev, so we need locking here.</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; (DJ_MAX_PAIRED_DEVICES + DJ_DEVICE_INDEX_MIN); i++) {</div><div class='add'>+		spin_lock_irqsave(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> 		dj_dev = djrcv_dev-&gt;paired_dj_devices[i];</div><div class='add'>+		djrcv_dev-&gt;paired_dj_devices[i] = NULL;</div><div class='add'>+		spin_unlock_irqrestore(&amp;djrcv_dev-&gt;lock, flags);</div><div class='ctx'> 		if (dj_dev != NULL) {</div><div class='ctx'> 			hid_destroy_device(dj_dev-&gt;hdev);</div><div class='ctx'> 			kfree(dj_dev);</div><div class='del'>-			djrcv_dev-&gt;paired_dj_devices[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfifo_free(&amp;djrcv_dev-&gt;notif_fifo);</div><div class='del'>-	kfree(djrcv_dev);</div><div class='del'>-	hid_set_drvdata(hdev, NULL);</div><div class='add'>+	dj_put_receiver_dev(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct hid_device_id logi_dj_receivers[] = {</div><div class='ctx'> 	{HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='del'>-		USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER)},</div><div class='add'>+		USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER),</div><div class='add'>+	 .driver_data = recvr_type_dj},</div><div class='ctx'> 	{HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='del'>-		USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2)},</div><div class='add'>+		USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2),</div><div class='add'>+	 .driver_data = recvr_type_dj},</div><div class='add'>+	{ /* Logitech Nano (non DJ) receiver */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+			 USB_DEVICE_ID_LOGITECH_NANO_RECEIVER),</div><div class='add'>+	 .driver_data = recvr_type_hidpp},</div><div class='add'>+	{ /* Logitech Nano (non DJ) receiver */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+			 USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2),</div><div class='add'>+	 .driver_data = recvr_type_hidpp},</div><div class='add'>+	{ /* Logitech gaming receiver (0xc539) */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_GAMING),</div><div class='add'>+	 .driver_data = recvr_type_gaming_hidpp},</div><div class='add'>+	{ /* Logitech 27 MHz HID++ 1.0 receiver (0xc517) */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+		USB_DEVICE_ID_S510_RECEIVER_2),</div><div class='add'>+	 .driver_data = recvr_type_27mhz},</div><div class='add'>+	{ /* Logitech 27 MHz HID++ 1.0 mouse-only receiver (0xc51b) */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+		USB_DEVICE_ID_LOGITECH_27MHZ_MOUSE_RECEIVER),</div><div class='add'>+	 .driver_data = recvr_type_27mhz},</div><div class='add'>+	{ /* Logitech MX5000 HID++ / bluetooth receiver keyboard intf. */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+		0xc70e),</div><div class='add'>+	 .driver_data = recvr_type_bluetooth},</div><div class='add'>+	{ /* Logitech MX5000 HID++ / bluetooth receiver mouse intf. */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,</div><div class='add'>+		0xc70a),</div><div class='add'>+	 .driver_data = recvr_type_bluetooth},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c<br/>index 15ed6177a7a3..72fc9c0566db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-logitech-hidpp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-logitech-hidpp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-logitech-hidpp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-logitech-hidpp.c</a></div><div class='hunk'>@@ -51,7 +51,11 @@ MODULE_PARM_DESC(disable_tap_to_click,</div><div class='ctx'> </div><div class='ctx'> #define HIDPP_REPORT_SHORT_LENGTH		7</div><div class='ctx'> #define HIDPP_REPORT_LONG_LENGTH		20</div><div class='del'>-#define HIDPP_REPORT_VERY_LONG_LENGTH		64</div><div class='add'>+#define HIDPP_REPORT_VERY_LONG_MAX_LENGTH	64</div><div class='add'>+</div><div class='add'>+#define HIDPP_SUB_ID_CONSUMER_VENDOR_KEYS	0x03</div><div class='add'>+#define HIDPP_SUB_ID_ROLLER			0x05</div><div class='add'>+#define HIDPP_SUB_ID_MOUSE_EXTRA_BTNS		0x06</div><div class='ctx'> </div><div class='ctx'> #define HIDPP_QUIRK_CLASS_WTP			BIT(0)</div><div class='ctx'> #define HIDPP_QUIRK_CLASS_M560			BIT(1)</div><div class='hunk'>@@ -68,6 +72,13 @@ MODULE_PARM_DESC(disable_tap_to_click,</div><div class='ctx'> #define HIDPP_QUIRK_HI_RES_SCROLL_1P0		BIT(26)</div><div class='ctx'> #define HIDPP_QUIRK_HI_RES_SCROLL_X2120		BIT(27)</div><div class='ctx'> #define HIDPP_QUIRK_HI_RES_SCROLL_X2121		BIT(28)</div><div class='add'>+#define HIDPP_QUIRK_HIDPP_WHEELS		BIT(29)</div><div class='add'>+#define HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS	BIT(30)</div><div class='add'>+#define HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS	BIT(31)</div><div class='add'>+</div><div class='add'>+/* These are just aliases for now */</div><div class='add'>+#define HIDPP_QUIRK_KBD_SCROLL_WHEEL HIDPP_QUIRK_HIDPP_WHEELS</div><div class='add'>+#define HIDPP_QUIRK_KBD_ZOOM_WHEEL   HIDPP_QUIRK_HIDPP_WHEELS</div><div class='ctx'> </div><div class='ctx'> /* Convenience constant to check for any high-res support. */</div><div class='ctx'> #define HIDPP_QUIRK_HI_RES_SCROLL	(HIDPP_QUIRK_HI_RES_SCROLL_1P0 | \</div><div class='hunk'>@@ -106,13 +117,13 @@ MODULE_PARM_DESC(disable_tap_to_click,</div><div class='ctx'> struct fap {</div><div class='ctx'> 	u8 feature_index;</div><div class='ctx'> 	u8 funcindex_clientid;</div><div class='del'>-	u8 params[HIDPP_REPORT_VERY_LONG_LENGTH - 4U];</div><div class='add'>+	u8 params[HIDPP_REPORT_VERY_LONG_MAX_LENGTH - 4U];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rap {</div><div class='ctx'> 	u8 sub_id;</div><div class='ctx'> 	u8 reg_address;</div><div class='del'>-	u8 params[HIDPP_REPORT_VERY_LONG_LENGTH - 4U];</div><div class='add'>+	u8 params[HIDPP_REPORT_VERY_LONG_MAX_LENGTH - 4U];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hidpp_report {</div><div class='hunk'>@@ -149,7 +160,6 @@ struct hidpp_battery {</div><div class='ctx'>  * @last_time: last event time, used to reset remainder after inactivity</div><div class='ctx'>  */</div><div class='ctx'> struct hidpp_scroll_counter {</div><div class='del'>-	struct input_dev *dev;</div><div class='ctx'> 	int wheel_multiplier;</div><div class='ctx'> 	int remainder;</div><div class='ctx'> 	int direction;</div><div class='hunk'>@@ -158,10 +168,12 @@ struct hidpp_scroll_counter {</div><div class='ctx'> </div><div class='ctx'> struct hidpp_device {</div><div class='ctx'> 	struct hid_device *hid_dev;</div><div class='add'>+	struct input_dev *input;</div><div class='ctx'> 	struct mutex send_mutex;</div><div class='ctx'> 	void *send_receive_buf;</div><div class='ctx'> 	char *name;		/* will never be NULL and should not be freed */</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='add'>+	int very_long_report_length;</div><div class='ctx'> 	bool answer_available;</div><div class='ctx'> 	u8 protocol_major;</div><div class='ctx'> 	u8 protocol_minor;</div><div class='hunk'>@@ -206,8 +218,6 @@ static int __hidpp_send_report(struct hid_device *hdev,</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='ctx'> 	int fields_count, ret;</div><div class='ctx'> </div><div class='del'>-	hidpp = hid_get_drvdata(hdev);</div><div class='del'>-</div><div class='ctx'> 	switch (hidpp_report-&gt;report_id) {</div><div class='ctx'> 	case REPORT_ID_HIDPP_SHORT:</div><div class='ctx'> 		fields_count = HIDPP_REPORT_SHORT_LENGTH;</div><div class='hunk'>@@ -216,7 +226,7 @@ static int __hidpp_send_report(struct hid_device *hdev,</div><div class='ctx'> 		fields_count = HIDPP_REPORT_LONG_LENGTH;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REPORT_ID_HIDPP_VERY_LONG:</div><div class='del'>-		fields_count = HIDPP_REPORT_VERY_LONG_LENGTH;</div><div class='add'>+		fields_count = hidpp-&gt;very_long_report_length;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -342,7 +352,7 @@ static int hidpp_send_rap_command_sync(struct hidpp_device *hidpp_dev,</div><div class='ctx'> 		max_count = HIDPP_REPORT_LONG_LENGTH - 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REPORT_ID_HIDPP_VERY_LONG:</div><div class='del'>-		max_count = HIDPP_REPORT_VERY_LONG_LENGTH - 4;</div><div class='add'>+		max_count = hidpp_dev-&gt;very_long_report_length - 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -434,14 +444,15 @@ static void hidpp_prefix_name(char **name, int name_length)</div><div class='ctx'>  * emit low-resolution scroll events when appropriate for</div><div class='ctx'>  * backwards-compatibility with userspace input libraries.</div><div class='ctx'>  */</div><div class='del'>-static void hidpp_scroll_counter_handle_scroll(struct hidpp_scroll_counter *counter,</div><div class='add'>+static void hidpp_scroll_counter_handle_scroll(struct input_dev *input_dev,</div><div class='add'>+					       struct hidpp_scroll_counter *counter,</div><div class='ctx'> 					       int hi_res_value)</div><div class='ctx'> {</div><div class='ctx'> 	int low_res_value, remainder, direction;</div><div class='ctx'> 	unsigned long long now, previous;</div><div class='ctx'> </div><div class='ctx'> 	hi_res_value = hi_res_value * 120/counter-&gt;wheel_multiplier;</div><div class='del'>-	input_report_rel(counter-&gt;dev, REL_WHEEL_HI_RES, hi_res_value);</div><div class='add'>+	input_report_rel(input_dev, REL_WHEEL_HI_RES, hi_res_value);</div><div class='ctx'> </div><div class='ctx'> 	remainder = counter-&gt;remainder;</div><div class='ctx'> 	direction = hi_res_value &gt; 0 ? 1 : -1;</div><div class='hunk'>@@ -475,7 +486,7 @@ static void hidpp_scroll_counter_handle_scroll(struct hidpp_scroll_counter *coun</div><div class='ctx'> 		low_res_value = remainder / 120;</div><div class='ctx'> 		if (low_res_value == 0)</div><div class='ctx'> 			low_res_value = (hi_res_value &gt; 0 ? 1 : -1);</div><div class='del'>-		input_report_rel(counter-&gt;dev, REL_WHEEL, low_res_value);</div><div class='add'>+		input_report_rel(input_dev, REL_WHEEL, low_res_value);</div><div class='ctx'> 		remainder -= low_res_value * 120;</div><div class='ctx'> 	}</div><div class='ctx'> 	counter-&gt;remainder = remainder;</div><div class='hunk'>@@ -491,14 +502,16 @@ static void hidpp_scroll_counter_handle_scroll(struct hidpp_scroll_counter *coun</div><div class='ctx'> #define HIDPP_GET_LONG_REGISTER				0x83</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * hidpp10_set_register_bit() - Sets a single bit in a HID++ 1.0 register.</div><div class='add'>+ * hidpp10_set_register - Modify a HID++ 1.0 register.</div><div class='ctx'>  * @hidpp_dev: the device to set the register on.</div><div class='ctx'>  * @register_address: the address of the register to modify.</div><div class='ctx'>  * @byte: the byte of the register to modify. Should be less than 3.</div><div class='add'>+ * @mask: mask of the bits to modify</div><div class='add'>+ * @value: new values for the bits in mask</div><div class='ctx'>  * Return: 0 if successful, otherwise a negative error code.</div><div class='ctx'>  */</div><div class='del'>-static int hidpp10_set_register_bit(struct hidpp_device *hidpp_dev,</div><div class='del'>-	u8 register_address, u8 byte, u8 bit)</div><div class='add'>+static int hidpp10_set_register(struct hidpp_device *hidpp_dev,</div><div class='add'>+	u8 register_address, u8 byte, u8 mask, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct hidpp_report response;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -514,7 +527,8 @@ static int hidpp10_set_register_bit(struct hidpp_device *hidpp_dev,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(params, response.rap.params, 3);</div><div class='ctx'> </div><div class='del'>-	params[byte] |= BIT(bit);</div><div class='add'>+	params[byte] &amp;= ~mask;</div><div class='add'>+	params[byte] |= value &amp; mask;</div><div class='ctx'> </div><div class='ctx'> 	return hidpp_send_rap_command_sync(hidpp_dev,</div><div class='ctx'> 					   REPORT_ID_HIDPP_SHORT,</div><div class='hunk'>@@ -523,20 +537,28 @@ static int hidpp10_set_register_bit(struct hidpp_device *hidpp_dev,</div><div class='ctx'> 					   params, 3, &amp;response);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define HIDPP_REG_GENERAL				0x00</div><div class='add'>+#define HIDPP_REG_ENABLE_REPORTS			0x00</div><div class='add'>+#define HIDPP_ENABLE_CONSUMER_REPORT			BIT(0)</div><div class='add'>+#define HIDPP_ENABLE_WHEEL_REPORT			BIT(2)</div><div class='add'>+#define HIDPP_ENABLE_MOUSE_EXTRA_BTN_REPORT		BIT(3)</div><div class='add'>+#define HIDPP_ENABLE_BAT_REPORT				BIT(4)</div><div class='add'>+#define HIDPP_ENABLE_HWHEEL_REPORT			BIT(5)</div><div class='ctx'> </div><div class='ctx'> static int hidpp10_enable_battery_reporting(struct hidpp_device *hidpp_dev)</div><div class='ctx'> {</div><div class='del'>-	return hidpp10_set_register_bit(hidpp_dev, HIDPP_REG_GENERAL, 0, 4);</div><div class='add'>+	return hidpp10_set_register(hidpp_dev, HIDPP_REG_ENABLE_REPORTS, 0,</div><div class='add'>+			  HIDPP_ENABLE_BAT_REPORT, HIDPP_ENABLE_BAT_REPORT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define HIDPP_REG_FEATURES				0x01</div><div class='add'>+#define HIDPP_ENABLE_SPECIAL_BUTTON_FUNC		BIT(1)</div><div class='add'>+#define HIDPP_ENABLE_FAST_SCROLL			BIT(6)</div><div class='ctx'> </div><div class='ctx'> /* On HID++ 1.0 devices, high-res scroll was called "scrolling acceleration". */</div><div class='ctx'> static int hidpp10_enable_scrolling_acceleration(struct hidpp_device *hidpp_dev)</div><div class='ctx'> {</div><div class='del'>-	return hidpp10_set_register_bit(hidpp_dev, HIDPP_REG_FEATURES, 0, 6);</div><div class='add'>+	return hidpp10_set_register(hidpp_dev, HIDPP_REG_FEATURES, 0,</div><div class='add'>+			  HIDPP_ENABLE_FAST_SCROLL, HIDPP_ENABLE_FAST_SCROLL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define HIDPP_REG_BATTERY_STATUS			0x07</div><div class='hunk'>@@ -741,6 +763,9 @@ static char *hidpp_unifying_get_name(struct hidpp_device *hidpp_dev)</div><div class='ctx'> 	if (2 + len &gt; sizeof(response.rap.params))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (len &lt; 4) /* logitech devices are usually at least Xddd */</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	name = kzalloc(len + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!name)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -836,18 +861,21 @@ static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,</div><div class='ctx'> </div><div class='ctx'> static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)</div><div class='ctx'> {</div><div class='add'>+	const u8 ping_byte = 0x5a;</div><div class='add'>+	u8 ping_data[3] = { 0, 0, ping_byte };</div><div class='ctx'> 	struct hidpp_report response;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = hidpp_send_fap_command_sync(hidpp,</div><div class='add'>+	ret = hidpp_send_rap_command_sync(hidpp,</div><div class='add'>+			REPORT_ID_HIDPP_SHORT,</div><div class='ctx'> 			HIDPP_PAGE_ROOT_IDX,</div><div class='ctx'> 			CMD_ROOT_GET_PROTOCOL_VERSION,</div><div class='del'>-			NULL, 0, &amp;response);</div><div class='add'>+			ping_data, sizeof(ping_data), &amp;response);</div><div class='ctx'> </div><div class='ctx'> 	if (ret == HIDPP_ERROR_INVALID_SUBID) {</div><div class='ctx'> 		hidpp-&gt;protocol_major = 1;</div><div class='ctx'> 		hidpp-&gt;protocol_minor = 0;</div><div class='del'>-		return 0;</div><div class='add'>+		goto print_version;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* the device might not be connected */</div><div class='hunk'>@@ -862,21 +890,19 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	hidpp-&gt;protocol_major = response.fap.params[0];</div><div class='del'>-	hidpp-&gt;protocol_minor = response.fap.params[1];</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	if (response.rap.params[2] != ping_byte) {</div><div class='add'>+		hid_err(hidpp-&gt;hid_dev, "%s: ping mismatch 0x%02x != 0x%02x\n",</div><div class='add'>+			__func__, response.rap.params[2], ping_byte);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static bool hidpp_is_connected(struct hidpp_device *hidpp)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='add'>+	hidpp-&gt;protocol_major = response.rap.params[0];</div><div class='add'>+	hidpp-&gt;protocol_minor = response.rap.params[1];</div><div class='ctx'> </div><div class='del'>-	ret = hidpp_root_get_protocol_version(hidpp);</div><div class='del'>-	if (!ret)</div><div class='del'>-		hid_dbg(hidpp-&gt;hid_dev, "HID++ %u.%u device connected.\n",</div><div class='del'>-			hidpp-&gt;protocol_major, hidpp-&gt;protocol_minor);</div><div class='del'>-	return ret == 0;</div><div class='add'>+print_version:</div><div class='add'>+	hid_info(hidpp-&gt;hid_dev, "HID++ %u.%u device connected.\n",</div><div class='add'>+		 hidpp-&gt;protocol_major, hidpp-&gt;protocol_minor);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -------------------------------------------------------------------------- */</div><div class='hunk'>@@ -932,7 +958,7 @@ static int hidpp_devicenametype_get_device_name(struct hidpp_device *hidpp,</div><div class='ctx'> </div><div class='ctx'> 	switch (response.report_id) {</div><div class='ctx'> 	case REPORT_ID_HIDPP_VERY_LONG:</div><div class='del'>-		count = HIDPP_REPORT_VERY_LONG_LENGTH - 4;</div><div class='add'>+		count = hidpp-&gt;very_long_report_length - 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REPORT_ID_HIDPP_LONG:</div><div class='ctx'> 		count = HIDPP_REPORT_LONG_LENGTH - 4;</div><div class='hunk'>@@ -1012,7 +1038,11 @@ static int hidpp_map_battery_level(int capacity)</div><div class='ctx'> {</div><div class='ctx'> 	if (capacity &lt; 11)</div><div class='ctx'> 		return POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;</div><div class='del'>-	else if (capacity &lt; 31)</div><div class='add'>+	/*</div><div class='add'>+	 * The spec says this should be &lt; 31 but some devices report 30</div><div class='add'>+	 * with brand new batteries and Windows reports 30 as "Good".</div><div class='add'>+	 */</div><div class='add'>+	else if (capacity &lt; 30)</div><div class='ctx'> 		return POWER_SUPPLY_CAPACITY_LEVEL_LOW;</div><div class='ctx'> 	else if (capacity &lt; 81)</div><div class='ctx'> 		return POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;</div><div class='hunk'>@@ -2111,6 +2141,13 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	data-&gt;wq = create_singlethread_workqueue("hidpp-ff-sendqueue");</div><div class='add'>+	if (!data-&gt;wq) {</div><div class='add'>+		kfree(data-&gt;effect_ids);</div><div class='add'>+		kfree(data);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	data-&gt;hidpp = hidpp;</div><div class='ctx'> 	data-&gt;feature_index = feature_index;</div><div class='ctx'> 	data-&gt;version = version;</div><div class='hunk'>@@ -2155,7 +2192,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)</div><div class='ctx'> 	/* ignore boost value at response.fap.params[2] */</div><div class='ctx'> </div><div class='ctx'> 	/* init the hardware command queue */</div><div class='del'>-	data-&gt;wq = create_singlethread_workqueue("hidpp-ff-sendqueue");</div><div class='ctx'> 	atomic_set(&amp;data-&gt;workqueue_size, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize with zero autocenter to get wheel in usable state */</div><div class='hunk'>@@ -2205,7 +2241,6 @@ static int hidpp_ff_deinit(struct hid_device *hid)</div><div class='ctx'> #define WTP_MANUAL_RESOLUTION				39</div><div class='ctx'> </div><div class='ctx'> struct wtp_data {</div><div class='del'>-	struct input_dev *input;</div><div class='ctx'> 	u16 x_size, y_size;</div><div class='ctx'> 	u8 finger_count;</div><div class='ctx'> 	u8 mt_feature_index;</div><div class='hunk'>@@ -2223,7 +2258,7 @@ static int wtp_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wtp_populate_input(struct hidpp_device *hidpp,</div><div class='del'>-		struct input_dev *input_dev, bool origin_is_hid_core)</div><div class='add'>+			       struct input_dev *input_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wtp_data *wd = hidpp-&gt;private_data;</div><div class='ctx'> </div><div class='hunk'>@@ -2249,31 +2284,30 @@ static void wtp_populate_input(struct hidpp_device *hidpp,</div><div class='ctx'> </div><div class='ctx'> 	input_mt_init_slots(input_dev, wd-&gt;maxcontacts, INPUT_MT_POINTER |</div><div class='ctx'> 		INPUT_MT_DROP_UNUSED);</div><div class='del'>-</div><div class='del'>-	wd-&gt;input = input_dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wtp_touch_event(struct wtp_data *wd,</div><div class='add'>+static void wtp_touch_event(struct hidpp_device *hidpp,</div><div class='ctx'> 	struct hidpp_touchpad_raw_xy_finger *touch_report)</div><div class='ctx'> {</div><div class='add'>+	struct wtp_data *wd = hidpp-&gt;private_data;</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='ctx'> 	if (!touch_report-&gt;finger_id || touch_report-&gt;contact_type)</div><div class='ctx'> 		/* no actual data */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	slot = input_mt_get_slot_by_key(wd-&gt;input, touch_report-&gt;finger_id);</div><div class='add'>+	slot = input_mt_get_slot_by_key(hidpp-&gt;input, touch_report-&gt;finger_id);</div><div class='ctx'> </div><div class='del'>-	input_mt_slot(wd-&gt;input, slot);</div><div class='del'>-	input_mt_report_slot_state(wd-&gt;input, MT_TOOL_FINGER,</div><div class='add'>+	input_mt_slot(hidpp-&gt;input, slot);</div><div class='add'>+	input_mt_report_slot_state(hidpp-&gt;input, MT_TOOL_FINGER,</div><div class='ctx'> 					touch_report-&gt;contact_status);</div><div class='ctx'> 	if (touch_report-&gt;contact_status) {</div><div class='del'>-		input_event(wd-&gt;input, EV_ABS, ABS_MT_POSITION_X,</div><div class='add'>+		input_event(hidpp-&gt;input, EV_ABS, ABS_MT_POSITION_X,</div><div class='ctx'> 				touch_report-&gt;x);</div><div class='del'>-		input_event(wd-&gt;input, EV_ABS, ABS_MT_POSITION_Y,</div><div class='add'>+		input_event(hidpp-&gt;input, EV_ABS, ABS_MT_POSITION_Y,</div><div class='ctx'> 				wd-&gt;flip_y ? wd-&gt;y_size - touch_report-&gt;y :</div><div class='ctx'> 					     touch_report-&gt;y);</div><div class='del'>-		input_event(wd-&gt;input, EV_ABS, ABS_MT_PRESSURE,</div><div class='add'>+		input_event(hidpp-&gt;input, EV_ABS, ABS_MT_PRESSURE,</div><div class='ctx'> 				touch_report-&gt;area);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2281,19 +2315,18 @@ static void wtp_touch_event(struct wtp_data *wd,</div><div class='ctx'> static void wtp_send_raw_xy_event(struct hidpp_device *hidpp,</div><div class='ctx'> 		struct hidpp_touchpad_raw_xy *raw)</div><div class='ctx'> {</div><div class='del'>-	struct wtp_data *wd = hidpp-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++)</div><div class='del'>-		wtp_touch_event(wd, &amp;(raw-&gt;fingers[i]));</div><div class='add'>+		wtp_touch_event(hidpp, &amp;(raw-&gt;fingers[i]));</div><div class='ctx'> </div><div class='ctx'> 	if (raw-&gt;end_of_frame &amp;&amp;</div><div class='ctx'> 	    !(hidpp-&gt;quirks &amp; HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS))</div><div class='del'>-		input_event(wd-&gt;input, EV_KEY, BTN_LEFT, raw-&gt;button);</div><div class='add'>+		input_event(hidpp-&gt;input, EV_KEY, BTN_LEFT, raw-&gt;button);</div><div class='ctx'> </div><div class='ctx'> 	if (raw-&gt;end_of_frame || raw-&gt;finger_count &lt;= 2) {</div><div class='del'>-		input_mt_sync_frame(wd-&gt;input);</div><div class='del'>-		input_sync(wd-&gt;input);</div><div class='add'>+		input_mt_sync_frame(hidpp-&gt;input);</div><div class='add'>+		input_sync(hidpp-&gt;input);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2343,7 +2376,7 @@ static int wtp_raw_event(struct hid_device *hdev, u8 *data, int size)</div><div class='ctx'> 	struct hidpp_report *report = (struct hidpp_report *)data;</div><div class='ctx'> 	struct hidpp_touchpad_raw_xy raw;</div><div class='ctx'> </div><div class='del'>-	if (!wd || !wd-&gt;input)</div><div class='add'>+	if (!wd || !hidpp-&gt;input)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	switch (data[0]) {</div><div class='hunk'>@@ -2354,11 +2387,11 @@ static int wtp_raw_event(struct hid_device *hdev, u8 *data, int size)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS) {</div><div class='del'>-			input_event(wd-&gt;input, EV_KEY, BTN_LEFT,</div><div class='add'>+			input_event(hidpp-&gt;input, EV_KEY, BTN_LEFT,</div><div class='ctx'> 					!!(data[1] &amp; 0x01));</div><div class='del'>-			input_event(wd-&gt;input, EV_KEY, BTN_RIGHT,</div><div class='add'>+			input_event(hidpp-&gt;input, EV_KEY, BTN_RIGHT,</div><div class='ctx'> 					!!(data[1] &amp; 0x02));</div><div class='del'>-			input_sync(wd-&gt;input);</div><div class='add'>+			input_sync(hidpp-&gt;input);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (size &lt; 21)</div><div class='hunk'>@@ -2476,10 +2509,6 @@ static int wtp_connect(struct hid_device *hdev, bool connected)</div><div class='ctx'> </div><div class='ctx'> static const u8 m560_config_parameter[] = {0x00, 0xaf, 0x03};</div><div class='ctx'> </div><div class='del'>-struct m560_private_data {</div><div class='del'>-	struct input_dev *input;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* how buttons are mapped in the report */</div><div class='ctx'> #define M560_MOUSE_BTN_LEFT		0x01</div><div class='ctx'> #define M560_MOUSE_BTN_RIGHT		0x02</div><div class='hunk'>@@ -2507,28 +2536,12 @@ static int m560_send_config_command(struct hid_device *hdev, bool connected)</div><div class='ctx'> 	);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int m560_allocate(struct hid_device *hdev)</div><div class='del'>-{</div><div class='del'>-	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='del'>-	struct m560_private_data *d;</div><div class='del'>-</div><div class='del'>-	d = devm_kzalloc(&amp;hdev-&gt;dev, sizeof(struct m560_private_data),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!d)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	hidpp-&gt;private_data = d;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int m560_raw_event(struct hid_device *hdev, u8 *data, int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='del'>-	struct m560_private_data *mydata = hidpp-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* sanity check */</div><div class='del'>-	if (!mydata || !mydata-&gt;input) {</div><div class='add'>+	if (!hidpp-&gt;input) {</div><div class='ctx'> 		hid_err(hdev, "error in parameter\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2555,24 +2568,24 @@ static int m560_raw_event(struct hid_device *hdev, u8 *data, int size)</div><div class='ctx'> </div><div class='ctx'> 		switch (data[5]) {</div><div class='ctx'> 		case 0xaf:</div><div class='del'>-			input_report_key(mydata-&gt;input, BTN_MIDDLE, 1);</div><div class='add'>+			input_report_key(hidpp-&gt;input, BTN_MIDDLE, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0xb0:</div><div class='del'>-			input_report_key(mydata-&gt;input, BTN_FORWARD, 1);</div><div class='add'>+			input_report_key(hidpp-&gt;input, BTN_FORWARD, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0xae:</div><div class='del'>-			input_report_key(mydata-&gt;input, BTN_BACK, 1);</div><div class='add'>+			input_report_key(hidpp-&gt;input, BTN_BACK, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x00:</div><div class='del'>-			input_report_key(mydata-&gt;input, BTN_BACK, 0);</div><div class='del'>-			input_report_key(mydata-&gt;input, BTN_FORWARD, 0);</div><div class='del'>-			input_report_key(mydata-&gt;input, BTN_MIDDLE, 0);</div><div class='add'>+			input_report_key(hidpp-&gt;input, BTN_BACK, 0);</div><div class='add'>+			input_report_key(hidpp-&gt;input, BTN_FORWARD, 0);</div><div class='add'>+			input_report_key(hidpp-&gt;input, BTN_MIDDLE, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			hid_err(hdev, "error in report\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		input_sync(mydata-&gt;input);</div><div class='add'>+		input_sync(hidpp-&gt;input);</div><div class='ctx'> </div><div class='ctx'> 	} else if (data[0] == 0x02) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2586,58 +2599,55 @@ static int m560_raw_event(struct hid_device *hdev, u8 *data, int size)</div><div class='ctx'> </div><div class='ctx'> 		int v;</div><div class='ctx'> </div><div class='del'>-		input_report_key(mydata-&gt;input, BTN_LEFT,</div><div class='add'>+		input_report_key(hidpp-&gt;input, BTN_LEFT,</div><div class='ctx'> 			!!(data[1] &amp; M560_MOUSE_BTN_LEFT));</div><div class='del'>-		input_report_key(mydata-&gt;input, BTN_RIGHT,</div><div class='add'>+		input_report_key(hidpp-&gt;input, BTN_RIGHT,</div><div class='ctx'> 			!!(data[1] &amp; M560_MOUSE_BTN_RIGHT));</div><div class='ctx'> </div><div class='ctx'> 		if (data[1] &amp; M560_MOUSE_BTN_WHEEL_LEFT) {</div><div class='del'>-			input_report_rel(mydata-&gt;input, REL_HWHEEL, -1);</div><div class='del'>-			input_report_rel(mydata-&gt;input, REL_HWHEEL_HI_RES,</div><div class='add'>+			input_report_rel(hidpp-&gt;input, REL_HWHEEL, -1);</div><div class='add'>+			input_report_rel(hidpp-&gt;input, REL_HWHEEL_HI_RES,</div><div class='ctx'> 					 -120);</div><div class='ctx'> 		} else if (data[1] &amp; M560_MOUSE_BTN_WHEEL_RIGHT) {</div><div class='del'>-			input_report_rel(mydata-&gt;input, REL_HWHEEL, 1);</div><div class='del'>-			input_report_rel(mydata-&gt;input, REL_HWHEEL_HI_RES,</div><div class='add'>+			input_report_rel(hidpp-&gt;input, REL_HWHEEL, 1);</div><div class='add'>+			input_report_rel(hidpp-&gt;input, REL_HWHEEL_HI_RES,</div><div class='ctx'> 					 120);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		v = hid_snto32(hid_field_extract(hdev, data+3, 0, 12), 12);</div><div class='del'>-		input_report_rel(mydata-&gt;input, REL_X, v);</div><div class='add'>+		input_report_rel(hidpp-&gt;input, REL_X, v);</div><div class='ctx'> </div><div class='ctx'> 		v = hid_snto32(hid_field_extract(hdev, data+3, 12, 12), 12);</div><div class='del'>-		input_report_rel(mydata-&gt;input, REL_Y, v);</div><div class='add'>+		input_report_rel(hidpp-&gt;input, REL_Y, v);</div><div class='ctx'> </div><div class='ctx'> 		v = hid_snto32(data[6], 8);</div><div class='del'>-		hidpp_scroll_counter_handle_scroll(</div><div class='del'>-				&amp;hidpp-&gt;vertical_wheel_counter, v);</div><div class='add'>+		if (v != 0)</div><div class='add'>+			hidpp_scroll_counter_handle_scroll(hidpp-&gt;input,</div><div class='add'>+					&amp;hidpp-&gt;vertical_wheel_counter, v);</div><div class='ctx'> </div><div class='del'>-		input_sync(mydata-&gt;input);</div><div class='add'>+		input_sync(hidpp-&gt;input);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void m560_populate_input(struct hidpp_device *hidpp,</div><div class='del'>-		struct input_dev *input_dev, bool origin_is_hid_core)</div><div class='add'>+				struct input_dev *input_dev)</div><div class='ctx'> {</div><div class='del'>-	struct m560_private_data *mydata = hidpp-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	mydata-&gt;input = input_dev;</div><div class='del'>-</div><div class='del'>-	__set_bit(EV_KEY, mydata-&gt;input-&gt;evbit);</div><div class='del'>-	__set_bit(BTN_MIDDLE, mydata-&gt;input-&gt;keybit);</div><div class='del'>-	__set_bit(BTN_RIGHT, mydata-&gt;input-&gt;keybit);</div><div class='del'>-	__set_bit(BTN_LEFT, mydata-&gt;input-&gt;keybit);</div><div class='del'>-	__set_bit(BTN_BACK, mydata-&gt;input-&gt;keybit);</div><div class='del'>-	__set_bit(BTN_FORWARD, mydata-&gt;input-&gt;keybit);</div><div class='add'>+	__set_bit(EV_KEY, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(BTN_MIDDLE, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_RIGHT, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_LEFT, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_BACK, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_FORWARD, input_dev-&gt;keybit);</div><div class='ctx'> </div><div class='del'>-	__set_bit(EV_REL, mydata-&gt;input-&gt;evbit);</div><div class='del'>-	__set_bit(REL_X, mydata-&gt;input-&gt;relbit);</div><div class='del'>-	__set_bit(REL_Y, mydata-&gt;input-&gt;relbit);</div><div class='del'>-	__set_bit(REL_WHEEL, mydata-&gt;input-&gt;relbit);</div><div class='del'>-	__set_bit(REL_HWHEEL, mydata-&gt;input-&gt;relbit);</div><div class='del'>-	__set_bit(REL_WHEEL_HI_RES, mydata-&gt;input-&gt;relbit);</div><div class='del'>-	__set_bit(REL_HWHEEL_HI_RES, mydata-&gt;input-&gt;relbit);</div><div class='add'>+	__set_bit(EV_REL, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(REL_X, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_Y, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_WHEEL, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_HWHEEL, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_WHEEL_HI_RES, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_HWHEEL_HI_RES, input_dev-&gt;relbit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m560_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='hunk'>@@ -2740,6 +2750,175 @@ static int g920_get_config(struct hidpp_device *hidpp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -------------------------------------------------------------------------- */</div><div class='add'>+/* HID++1.0 devices which use HID++ reports for their wheels                  */</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+static int hidpp10_wheel_connect(struct hidpp_device *hidpp)</div><div class='add'>+{</div><div class='add'>+	return hidpp10_set_register(hidpp, HIDPP_REG_ENABLE_REPORTS, 0,</div><div class='add'>+			HIDPP_ENABLE_WHEEL_REPORT | HIDPP_ENABLE_HWHEEL_REPORT,</div><div class='add'>+			HIDPP_ENABLE_WHEEL_REPORT | HIDPP_ENABLE_HWHEEL_REPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hidpp10_wheel_raw_event(struct hidpp_device *hidpp,</div><div class='add'>+				   u8 *data, int size)</div><div class='add'>+{</div><div class='add'>+	s8 value, hvalue;</div><div class='add'>+</div><div class='add'>+	if (!hidpp-&gt;input)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size &lt; 7)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (data[0] != REPORT_ID_HIDPP_SHORT || data[2] != HIDPP_SUB_ID_ROLLER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	value = data[3];</div><div class='add'>+	hvalue = data[4];</div><div class='add'>+</div><div class='add'>+	input_report_rel(hidpp-&gt;input, REL_WHEEL, value);</div><div class='add'>+	input_report_rel(hidpp-&gt;input, REL_WHEEL_HI_RES, value * 120);</div><div class='add'>+	input_report_rel(hidpp-&gt;input, REL_HWHEEL, hvalue);</div><div class='add'>+	input_report_rel(hidpp-&gt;input, REL_HWHEEL_HI_RES, hvalue * 120);</div><div class='add'>+	input_sync(hidpp-&gt;input);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hidpp10_wheel_populate_input(struct hidpp_device *hidpp,</div><div class='add'>+					 struct input_dev *input_dev)</div><div class='add'>+{</div><div class='add'>+	__set_bit(EV_REL, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(REL_WHEEL, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_WHEEL_HI_RES, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_HWHEEL, input_dev-&gt;relbit);</div><div class='add'>+	__set_bit(REL_HWHEEL_HI_RES, input_dev-&gt;relbit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+/* HID++1.0 mice which use HID++ reports for extra mouse buttons              */</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+static int hidpp10_extra_mouse_buttons_connect(struct hidpp_device *hidpp)</div><div class='add'>+{</div><div class='add'>+	return hidpp10_set_register(hidpp, HIDPP_REG_ENABLE_REPORTS, 0,</div><div class='add'>+				    HIDPP_ENABLE_MOUSE_EXTRA_BTN_REPORT,</div><div class='add'>+				    HIDPP_ENABLE_MOUSE_EXTRA_BTN_REPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hidpp10_extra_mouse_buttons_raw_event(struct hidpp_device *hidpp,</div><div class='add'>+				    u8 *data, int size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!hidpp-&gt;input)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size &lt; 7)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (data[0] != REPORT_ID_HIDPP_SHORT ||</div><div class='add'>+	    data[2] != HIDPP_SUB_ID_MOUSE_EXTRA_BTNS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Buttons are either delivered through the regular mouse report *or*</div><div class='add'>+	 * through the extra buttons report. At least for button 6 how it is</div><div class='add'>+	 * delivered differs per receiver firmware version. Even receivers with</div><div class='add'>+	 * the same usb-id show different behavior, so we handle both cases.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		input_report_key(hidpp-&gt;input, BTN_MOUSE + i,</div><div class='add'>+				 (data[3] &amp; (1 &lt;&lt; i)));</div><div class='add'>+</div><div class='add'>+	/* Some mice report events on button 9+, use BTN_MISC */</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		input_report_key(hidpp-&gt;input, BTN_MISC + i,</div><div class='add'>+				 (data[4] &amp; (1 &lt;&lt; i)));</div><div class='add'>+</div><div class='add'>+	input_sync(hidpp-&gt;input);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hidpp10_extra_mouse_buttons_populate_input(</div><div class='add'>+			struct hidpp_device *hidpp, struct input_dev *input_dev)</div><div class='add'>+{</div><div class='add'>+	/* BTN_MOUSE - BTN_MOUSE+7 are set already by the descriptor */</div><div class='add'>+	__set_bit(BTN_0, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_1, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_2, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_3, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_4, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_5, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_6, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_7, input_dev-&gt;keybit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+/* HID++1.0 kbds which only report 0x10xx consumer usages through sub-id 0x03 */</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* Find the consumer-page input report desc and change Maximums to 0x107f */</div><div class='add'>+static u8 *hidpp10_consumer_keys_report_fixup(struct hidpp_device *hidpp,</div><div class='add'>+					      u8 *_rdesc, unsigned int *rsize)</div><div class='add'>+{</div><div class='add'>+	/* Note 0 terminated so we can use strnstr to search for this. */</div><div class='add'>+	const char consumer_rdesc_start[] = {</div><div class='add'>+		0x05, 0x0C,	/* USAGE_PAGE (Consumer Devices)       */</div><div class='add'>+		0x09, 0x01,	/* USAGE (Consumer Control)            */</div><div class='add'>+		0xA1, 0x01,	/* COLLECTION (Application)            */</div><div class='add'>+		0x85, 0x03,	/* REPORT_ID = 3                       */</div><div class='add'>+		0x75, 0x10,	/* REPORT_SIZE (16)                    */</div><div class='add'>+		0x95, 0x02,	/* REPORT_COUNT (2)                    */</div><div class='add'>+		0x15, 0x01,	/* LOGICAL_MIN (1)                     */</div><div class='add'>+		0x26, 0x00	/* LOGICAL_MAX (...                    */</div><div class='add'>+	};</div><div class='add'>+	char *consumer_rdesc, *rdesc = (char *)_rdesc;</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	consumer_rdesc = strnstr(rdesc, consumer_rdesc_start, *rsize);</div><div class='add'>+	size = *rsize - (consumer_rdesc - rdesc);</div><div class='add'>+	if (consumer_rdesc &amp;&amp; size &gt;= 25) {</div><div class='add'>+		consumer_rdesc[15] = 0x7f;</div><div class='add'>+		consumer_rdesc[16] = 0x10;</div><div class='add'>+		consumer_rdesc[20] = 0x7f;</div><div class='add'>+		consumer_rdesc[21] = 0x10;</div><div class='add'>+	}</div><div class='add'>+	return _rdesc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hidpp10_consumer_keys_connect(struct hidpp_device *hidpp)</div><div class='add'>+{</div><div class='add'>+	return hidpp10_set_register(hidpp, HIDPP_REG_ENABLE_REPORTS, 0,</div><div class='add'>+				    HIDPP_ENABLE_CONSUMER_REPORT,</div><div class='add'>+				    HIDPP_ENABLE_CONSUMER_REPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hidpp10_consumer_keys_raw_event(struct hidpp_device *hidpp,</div><div class='add'>+					   u8 *data, int size)</div><div class='add'>+{</div><div class='add'>+	u8 consumer_report[5];</div><div class='add'>+</div><div class='add'>+	if (size &lt; 7)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (data[0] != REPORT_ID_HIDPP_SHORT ||</div><div class='add'>+	    data[2] != HIDPP_SUB_ID_CONSUMER_VENDOR_KEYS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Build a normal consumer report (3) out of the data, this detour</div><div class='add'>+	 * is necessary to get some keyboards to report their 0x10xx usages.</div><div class='add'>+	 */</div><div class='add'>+	consumer_report[0] = 0x03;</div><div class='add'>+	memcpy(&amp;consumer_report[1], &amp;data[3], 4);</div><div class='add'>+	/* We are called from atomic context */</div><div class='add'>+	hid_report_raw_event(hidpp-&gt;hid_dev, HID_INPUT_REPORT,</div><div class='add'>+			     consumer_report, 5, 1);</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='ctx'> /* High-resolution scroll wheels                                              */</div><div class='ctx'> /* -------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='hunk'>@@ -2774,12 +2953,31 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp)</div><div class='ctx'> /* Generic HID++ devices                                                      */</div><div class='ctx'> /* -------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+static u8 *hidpp_report_fixup(struct hid_device *hdev, u8 *rdesc,</div><div class='add'>+			      unsigned int *rsize)</div><div class='add'>+{</div><div class='add'>+	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return rdesc;</div><div class='add'>+</div><div class='add'>+	/* For 27 MHz keyboards the quirk gets set after hid_parse. */</div><div class='add'>+	if (hdev-&gt;group == HID_GROUP_LOGITECH_27MHZ_DEVICE ||</div><div class='add'>+	    (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS))</div><div class='add'>+		rdesc = hidpp10_consumer_keys_report_fixup(hidpp, rdesc, rsize);</div><div class='add'>+</div><div class='add'>+	return rdesc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hidpp_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 		struct hid_field *field, struct hid_usage *usage,</div><div class='ctx'> 		unsigned long **bit, int *max)</div><div class='ctx'> {</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='ctx'> </div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_WTP)</div><div class='ctx'> 		return wtp_input_mapping(hdev, hi, field, usage, bit, max);</div><div class='ctx'> 	else if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_M560 &amp;&amp;</div><div class='hunk'>@@ -2795,6 +2993,9 @@ static int hidpp_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> {</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='ctx'> </div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Ensure that Logitech G920 is not given a default fuzz/flat value */</div><div class='ctx'> 	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920) {</div><div class='ctx'> 		if (usage-&gt;type == EV_ABS &amp;&amp; (usage-&gt;code == ABS_X ||</div><div class='hunk'>@@ -2809,15 +3010,20 @@ static int hidpp_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void hidpp_populate_input(struct hidpp_device *hidpp,</div><div class='del'>-		struct input_dev *input, bool origin_is_hid_core)</div><div class='add'>+				 struct input_dev *input)</div><div class='ctx'> {</div><div class='add'>+	hidpp-&gt;input = input;</div><div class='add'>+</div><div class='ctx'> 	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_WTP)</div><div class='del'>-		wtp_populate_input(hidpp, input, origin_is_hid_core);</div><div class='add'>+		wtp_populate_input(hidpp, input);</div><div class='ctx'> 	else if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_M560)</div><div class='del'>-		m560_populate_input(hidpp, input, origin_is_hid_core);</div><div class='add'>+		m560_populate_input(hidpp, input);</div><div class='ctx'> </div><div class='del'>-	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HI_RES_SCROLL)</div><div class='del'>-		hidpp-&gt;vertical_wheel_counter.dev = input;</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_WHEELS)</div><div class='add'>+		hidpp10_wheel_populate_input(hidpp, input);</div><div class='add'>+</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS)</div><div class='add'>+		hidpp10_extra_mouse_buttons_populate_input(hidpp, input);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hidpp_input_configured(struct hid_device *hdev,</div><div class='hunk'>@@ -2826,7 +3032,10 @@ static int hidpp_input_configured(struct hid_device *hdev,</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='ctx'> 	struct input_dev *input = hidinput-&gt;input;</div><div class='ctx'> </div><div class='del'>-	hidpp_populate_input(hidpp, input, true);</div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hidpp_populate_input(hidpp, input);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2886,6 +3095,24 @@ static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_WHEELS) {</div><div class='add'>+		ret = hidpp10_wheel_raw_event(hidpp, data, size);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS) {</div><div class='add'>+		ret = hidpp10_extra_mouse_buttons_raw_event(hidpp, data, size);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS) {</div><div class='add'>+		ret = hidpp10_consumer_keys_raw_event(hidpp, data, size);</div><div class='add'>+		if (ret != 0)</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='hunk'>@@ -2895,10 +3122,13 @@ static int hidpp_raw_event(struct hid_device *hdev, struct hid_report *report,</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Generic HID++ processing. */</div><div class='ctx'> 	switch (data[0]) {</div><div class='ctx'> 	case REPORT_ID_HIDPP_VERY_LONG:</div><div class='del'>-		if (size != HIDPP_REPORT_VERY_LONG_LENGTH) {</div><div class='add'>+		if (size != hidpp-&gt;very_long_report_length) {</div><div class='ctx'> 			hid_err(hdev, "received hid++ report of bad size (%d)",</div><div class='ctx'> 				size);</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -2943,17 +3173,22 @@ static int hidpp_event(struct hid_device *hdev, struct hid_field *field,</div><div class='ctx'> 	 * restriction imposed in hidpp_usages.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='del'>-	struct hidpp_scroll_counter *counter = &amp;hidpp-&gt;vertical_wheel_counter;</div><div class='add'>+	struct hidpp_scroll_counter *counter;</div><div class='add'>+</div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	counter = &amp;hidpp-&gt;vertical_wheel_counter;</div><div class='ctx'> 	/* A scroll event may occur before the multiplier has been retrieved or</div><div class='ctx'> 	 * the input device set, or high-res scroll enabling may fail. In such</div><div class='ctx'> 	 * cases we must return early (falling back to default behaviour) to</div><div class='ctx'> 	 * avoid a crash in hidpp_scroll_counter_handle_scroll.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(hidpp-&gt;quirks &amp; HIDPP_QUIRK_HI_RES_SCROLL) || value == 0</div><div class='del'>-	    || counter-&gt;dev == NULL || counter-&gt;wheel_multiplier == 0)</div><div class='add'>+	    || hidpp-&gt;input == NULL || counter-&gt;wheel_multiplier == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	hidpp_scroll_counter_handle_scroll(counter, value);</div><div class='add'>+	hidpp_scroll_counter_handle_scroll(hidpp-&gt;input, counter, value);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3125,32 +3360,45 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_WHEELS) {</div><div class='add'>+		ret = hidpp10_wheel_connect(hidpp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS) {</div><div class='add'>+		ret = hidpp10_extra_mouse_buttons_connect(hidpp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS) {</div><div class='add'>+		ret = hidpp10_consumer_keys_connect(hidpp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* the device is already connected, we can ask for its name and</div><div class='ctx'> 	 * protocol */</div><div class='ctx'> 	if (!hidpp-&gt;protocol_major) {</div><div class='del'>-		ret = !hidpp_is_connected(hidpp);</div><div class='add'>+		ret = hidpp_root_get_protocol_version(hidpp);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			hid_err(hdev, "Can not get the protocol version.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		hid_info(hdev, "HID++ %u.%u device connected.\n",</div><div class='del'>-			 hidpp-&gt;protocol_major, hidpp-&gt;protocol_minor);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hidpp-&gt;name == hdev-&gt;name &amp;&amp; hidpp-&gt;protocol_major &gt;= 2) {</div><div class='ctx'> 		name = hidpp_get_device_name(hidpp);</div><div class='del'>-		if (!name) {</div><div class='del'>-			hid_err(hdev,</div><div class='del'>-				"unable to retrieve the name of the device");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		devm_name = devm_kasprintf(&amp;hdev-&gt;dev, GFP_KERNEL, "%s", name);</div><div class='del'>-		kfree(name);</div><div class='del'>-		if (!devm_name)</div><div class='del'>-			return;</div><div class='add'>+		if (name) {</div><div class='add'>+			devm_name = devm_kasprintf(&amp;hdev-&gt;dev, GFP_KERNEL,</div><div class='add'>+						   "%s", name);</div><div class='add'>+			kfree(name);</div><div class='add'>+			if (!devm_name)</div><div class='add'>+				return;</div><div class='ctx'> </div><div class='del'>-		hidpp-&gt;name = devm_name;</div><div class='add'>+			hidpp-&gt;name = devm_name;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hidpp_initialize_battery(hidpp);</div><div class='hunk'>@@ -3181,7 +3429,7 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hidpp_populate_input(hidpp, input, false);</div><div class='add'>+	hidpp_populate_input(hidpp, input);</div><div class='ctx'> </div><div class='ctx'> 	ret = input_register_device(input);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3201,6 +3449,60 @@ static const struct attribute_group ps_attribute_group = {</div><div class='ctx'> 	.attrs = sysfs_attrs</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int hidpp_get_report_length(struct hid_device *hdev, int id)</div><div class='add'>+{</div><div class='add'>+	struct hid_report_enum *re;</div><div class='add'>+	struct hid_report *report;</div><div class='add'>+</div><div class='add'>+	re = &amp;(hdev-&gt;report_enum[HID_OUTPUT_REPORT]);</div><div class='add'>+	report = re-&gt;report_id_hash[id];</div><div class='add'>+	if (!report)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return report-&gt;field[0]-&gt;report_count + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hidpp_validate_report(struct hid_device *hdev, int id,</div><div class='add'>+				  int expected_length, bool optional)</div><div class='add'>+{</div><div class='add'>+	int report_length;</div><div class='add'>+</div><div class='add'>+	if (id &gt;= HID_MAX_IDS || id &lt; 0) {</div><div class='add'>+		hid_err(hdev, "invalid HID report id %u\n", id);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	report_length = hidpp_get_report_length(hdev, id);</div><div class='add'>+	if (!report_length)</div><div class='add'>+		return optional;</div><div class='add'>+</div><div class='add'>+	if (report_length &lt; expected_length) {</div><div class='add'>+		hid_warn(hdev, "not enough values in hidpp report %d\n", id);</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 hidpp_validate_device(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	return hidpp_validate_report(hdev, REPORT_ID_HIDPP_SHORT,</div><div class='add'>+				     HIDPP_REPORT_SHORT_LENGTH, false) &amp;&amp;</div><div class='add'>+	       hidpp_validate_report(hdev, REPORT_ID_HIDPP_LONG,</div><div class='add'>+				     HIDPP_REPORT_LONG_LENGTH, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hidpp_application_equals(struct hid_device *hdev,</div><div class='add'>+				     unsigned int application)</div><div class='add'>+{</div><div class='add'>+	struct list_head *report_list;</div><div class='add'>+	struct hid_report *report;</div><div class='add'>+</div><div class='add'>+	report_list = &amp;hdev-&gt;report_enum[HID_INPUT_REPORT].report_list;</div><div class='add'>+	report = list_first_entry_or_null(report_list, struct hid_report, list);</div><div class='add'>+	return report &amp;&amp; report-&gt;application == application;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct hidpp_device *hidpp;</div><div class='hunk'>@@ -3208,20 +3510,48 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='ctx'> 	bool connected;</div><div class='ctx'> 	unsigned int connect_mask = HID_CONNECT_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	hidpp = devm_kzalloc(&amp;hdev-&gt;dev, sizeof(struct hidpp_device),</div><div class='del'>-			GFP_KERNEL);</div><div class='add'>+	/* report_fixup needs drvdata to be set before we call hid_parse */</div><div class='add'>+	hidpp = devm_kzalloc(&amp;hdev-&gt;dev, sizeof(*hidpp), GFP_KERNEL);</div><div class='ctx'> 	if (!hidpp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	hidpp-&gt;hid_dev = hdev;</div><div class='ctx'> 	hidpp-&gt;name = hdev-&gt;name;</div><div class='add'>+	hidpp-&gt;quirks = id-&gt;driver_data;</div><div class='ctx'> 	hid_set_drvdata(hdev, hidpp);</div><div class='ctx'> </div><div class='del'>-	hidpp-&gt;quirks = id-&gt;driver_data;</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		hid_err(hdev, "%s:parse failed\n", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the device is HID++ capable, otherwise treat as generic HID</div><div class='add'>+	 */</div><div class='add'>+	if (!hidpp_validate_device(hdev)) {</div><div class='add'>+		hid_set_drvdata(hdev, NULL);</div><div class='add'>+		devm_kfree(&amp;hdev-&gt;dev, hidpp);</div><div class='add'>+		return hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hidpp-&gt;very_long_report_length =</div><div class='add'>+		hidpp_get_report_length(hdev, REPORT_ID_HIDPP_VERY_LONG);</div><div class='add'>+	if (hidpp-&gt;very_long_report_length &gt; HIDPP_REPORT_VERY_LONG_MAX_LENGTH)</div><div class='add'>+		hidpp-&gt;very_long_report_length = HIDPP_REPORT_VERY_LONG_MAX_LENGTH;</div><div class='ctx'> </div><div class='ctx'> 	if (id-&gt;group == HID_GROUP_LOGITECH_DJ_DEVICE)</div><div class='ctx'> 		hidpp-&gt;quirks |= HIDPP_QUIRK_UNIFYING;</div><div class='ctx'> </div><div class='add'>+	if (id-&gt;group == HID_GROUP_LOGITECH_27MHZ_DEVICE &amp;&amp;</div><div class='add'>+	    hidpp_application_equals(hdev, HID_GD_MOUSE))</div><div class='add'>+		hidpp-&gt;quirks |= HIDPP_QUIRK_HIDPP_WHEELS |</div><div class='add'>+				 HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS;</div><div class='add'>+</div><div class='add'>+	if (id-&gt;group == HID_GROUP_LOGITECH_27MHZ_DEVICE &amp;&amp;</div><div class='add'>+	    hidpp_application_equals(hdev, HID_GD_KEYBOARD))</div><div class='add'>+		hidpp-&gt;quirks |= HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS;</div><div class='add'>+</div><div class='ctx'> 	if (disable_raw_mode) {</div><div class='ctx'> 		hidpp-&gt;quirks &amp;= ~HIDPP_QUIRK_CLASS_WTP;</div><div class='ctx'> 		hidpp-&gt;quirks &amp;= ~HIDPP_QUIRK_NO_HIDINPUT;</div><div class='hunk'>@@ -3230,15 +3560,11 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='ctx'> 	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_WTP) {</div><div class='ctx'> 		ret = wtp_allocate(hdev, id);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto allocate_fail;</div><div class='del'>-	} else if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_M560) {</div><div class='del'>-		ret = m560_allocate(hdev);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto allocate_fail;</div><div class='add'>+			return ret;</div><div class='ctx'> 	} else if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_K400) {</div><div class='ctx'> 		ret = k400_allocate(hdev);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto allocate_fail;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;hidpp-&gt;work, delayed_work_cb);</div><div class='hunk'>@@ -3251,93 +3577,79 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='ctx'> 		hid_warn(hdev, "Cannot allocate sysfs group for %s\n",</div><div class='ctx'> 			 hdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	ret = hid_parse(hdev);</div><div class='add'>+	/*</div><div class='add'>+	 * Plain USB connections need to actually call start and open</div><div class='add'>+	 * on the transport driver to allow incoming data.</div><div class='add'>+	 */</div><div class='add'>+	ret = hid_hw_start(hdev, 0);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		hid_err(hdev, "%s:parse failed\n", __func__);</div><div class='del'>-		goto hid_parse_fail;</div><div class='add'>+		hid_err(hdev, "hw start failed\n");</div><div class='add'>+		goto hid_hw_start_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_NO_HIDINPUT)</div><div class='del'>-		connect_mask &amp;= ~HID_CONNECT_HIDINPUT;</div><div class='del'>-</div><div class='del'>-	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920) {</div><div class='del'>-		ret = hid_hw_start(hdev, connect_mask);</div><div class='del'>-		if (ret) {</div><div class='del'>-			hid_err(hdev, "hw start failed\n");</div><div class='del'>-			goto hid_hw_start_fail;</div><div class='del'>-		}</div><div class='del'>-		ret = hid_hw_open(hdev);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;hdev-&gt;dev, "%s:hid_hw_open returned error:%d\n",</div><div class='del'>-				__func__, ret);</div><div class='del'>-			hid_hw_stop(hdev);</div><div class='del'>-			goto hid_hw_start_fail;</div><div class='del'>-		}</div><div class='add'>+	ret = hid_hw_open(hdev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;dev, "%s:hid_hw_open returned error:%d\n",</div><div class='add'>+			__func__, ret);</div><div class='add'>+		hid_hw_stop(hdev);</div><div class='add'>+		goto hid_hw_open_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* Allow incoming packets */</div><div class='ctx'> 	hid_device_io_start(hdev);</div><div class='ctx'> </div><div class='ctx'> 	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_UNIFYING)</div><div class='ctx'> 		hidpp_unifying_init(hidpp);</div><div class='ctx'> </div><div class='del'>-	connected = hidpp_is_connected(hidpp);</div><div class='add'>+	connected = hidpp_root_get_protocol_version(hidpp) == 0;</div><div class='ctx'> 	atomic_set(&amp;hidpp-&gt;connected, connected);</div><div class='ctx'> 	if (!(hidpp-&gt;quirks &amp; HIDPP_QUIRK_UNIFYING)) {</div><div class='ctx'> 		if (!connected) {</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			hid_err(hdev, "Device not connected");</div><div class='del'>-			goto hid_hw_open_failed;</div><div class='add'>+			goto hid_hw_init_fail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hid_info(hdev, "HID++ %u.%u device connected.\n",</div><div class='del'>-			 hidpp-&gt;protocol_major, hidpp-&gt;protocol_minor);</div><div class='del'>-</div><div class='ctx'> 		hidpp_overwrite_name(hdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (connected &amp;&amp; (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_WTP)) {</div><div class='ctx'> 		ret = wtp_get_config(hidpp);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto hid_hw_open_failed;</div><div class='add'>+			goto hid_hw_init_fail;</div><div class='ctx'> 	} else if (connected &amp;&amp; (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920)) {</div><div class='ctx'> 		ret = g920_get_config(hidpp);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto hid_hw_open_failed;</div><div class='add'>+			goto hid_hw_init_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Block incoming packets */</div><div class='del'>-	hid_device_io_stop(hdev);</div><div class='add'>+	hidpp_connect_event(hidpp);</div><div class='ctx'> </div><div class='del'>-	if (!(hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920)) {</div><div class='del'>-		ret = hid_hw_start(hdev, connect_mask);</div><div class='del'>-		if (ret) {</div><div class='del'>-			hid_err(hdev, "%s:hid_hw_start returned error\n", __func__);</div><div class='del'>-			goto hid_hw_start_fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Reset the HID node state */</div><div class='add'>+	hid_device_io_stop(hdev);</div><div class='add'>+	hid_hw_close(hdev);</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='ctx'> </div><div class='del'>-	/* Allow incoming packets */</div><div class='del'>-	hid_device_io_start(hdev);</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_NO_HIDINPUT)</div><div class='add'>+		connect_mask &amp;= ~HID_CONNECT_HIDINPUT;</div><div class='ctx'> </div><div class='del'>-	hidpp_connect_event(hidpp);</div><div class='add'>+	/* Now export the actual inputs and hidraw nodes to the world */</div><div class='add'>+	ret = hid_hw_start(hdev, connect_mask);</div><div class='add'>+	if (ret) {</div><div class='add'>+		hid_err(hdev, "%s:hid_hw_start returned error\n", __func__);</div><div class='add'>+		goto hid_hw_start_fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='del'>-hid_hw_open_failed:</div><div class='del'>-	hid_device_io_stop(hdev);</div><div class='del'>-	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920) {</div><div class='del'>-		hid_hw_close(hdev);</div><div class='del'>-		hid_hw_stop(hdev);</div><div class='del'>-	}</div><div class='add'>+hid_hw_init_fail:</div><div class='add'>+	hid_hw_close(hdev);</div><div class='add'>+hid_hw_open_fail:</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='ctx'> hid_hw_start_fail:</div><div class='del'>-hid_parse_fail:</div><div class='ctx'> 	sysfs_remove_group(&amp;hdev-&gt;dev.kobj, &amp;ps_attribute_group);</div><div class='ctx'> 	cancel_work_sync(&amp;hidpp-&gt;work);</div><div class='ctx'> 	mutex_destroy(&amp;hidpp-&gt;send_mutex);</div><div class='del'>-allocate_fail:</div><div class='del'>-	hid_set_drvdata(hdev, NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3345,12 +3657,14 @@ static void hidpp_remove(struct hid_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hidpp_device *hidpp = hid_get_drvdata(hdev);</div><div class='ctx'> </div><div class='add'>+	if (!hidpp)</div><div class='add'>+		return hid_hw_stop(hdev);</div><div class='add'>+</div><div class='ctx'> 	sysfs_remove_group(&amp;hdev-&gt;dev.kobj, &amp;ps_attribute_group);</div><div class='ctx'> </div><div class='del'>-	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920) {</div><div class='add'>+	if (hidpp-&gt;quirks &amp; HIDPP_QUIRK_CLASS_G920)</div><div class='ctx'> 		hidpp_ff_deinit(hdev);</div><div class='del'>-		hid_hw_close(hdev);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	hid_hw_stop(hdev);</div><div class='ctx'> 	cancel_work_sync(&amp;hidpp-&gt;work);</div><div class='ctx'> 	mutex_destroy(&amp;hidpp-&gt;send_mutex);</div><div class='hunk'>@@ -3360,6 +3674,10 @@ static void hidpp_remove(struct hid_device *hdev)</div><div class='ctx'> 	HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, \</div><div class='ctx'> 		   USB_VENDOR_ID_LOGITECH, (product))</div><div class='ctx'> </div><div class='add'>+#define L27MHZ_DEVICE(product) \</div><div class='add'>+	HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_27MHZ_DEVICE, \</div><div class='add'>+		   USB_VENDOR_ID_LOGITECH, (product))</div><div class='add'>+</div><div class='ctx'> static const struct hid_device_id hidpp_devices[] = {</div><div class='ctx'> 	{ /* wireless touchpad */</div><div class='ctx'> 	  LDJ_DEVICE(0x4011),</div><div class='hunk'>@@ -3411,11 +3729,37 @@ static const struct hid_device_id hidpp_devices[] = {</div><div class='ctx'> 	{ /* Solar Keyboard Logitech K750 */</div><div class='ctx'> 	  LDJ_DEVICE(0x4002),</div><div class='ctx'> 	  .driver_data = HIDPP_QUIRK_CLASS_K750 },</div><div class='add'>+	{ /* Keyboard MX5000 (Bluetooth-receiver in HID proxy mode) */</div><div class='add'>+	  LDJ_DEVICE(0xb305),</div><div class='add'>+	  .driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },</div><div class='ctx'> </div><div class='ctx'> 	{ LDJ_DEVICE(HID_ANY_ID) },</div><div class='ctx'> </div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G920_WHEEL),</div><div class='add'>+	{ /* Keyboard LX501 (Y-RR53) */</div><div class='add'>+	  L27MHZ_DEVICE(0x0049),</div><div class='add'>+	  .driver_data = HIDPP_QUIRK_KBD_ZOOM_WHEEL },</div><div class='add'>+	{ /* Keyboard MX3000 (Y-RAM74) */</div><div class='add'>+	  L27MHZ_DEVICE(0x0057),</div><div class='add'>+	  .driver_data = HIDPP_QUIRK_KBD_SCROLL_WHEEL },</div><div class='add'>+	{ /* Keyboard MX3200 (Y-RAV80) */</div><div class='add'>+	  L27MHZ_DEVICE(0x005c),</div><div class='add'>+	  .driver_data = HIDPP_QUIRK_KBD_ZOOM_WHEEL },</div><div class='add'>+</div><div class='add'>+	{ L27MHZ_DEVICE(HID_ANY_ID) },</div><div class='add'>+</div><div class='add'>+	{ /* Logitech G403 Gaming Mouse over USB */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC082) },</div><div class='add'>+	{ /* Logitech G700 Gaming Mouse over USB */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC06B) },</div><div class='add'>+	{ /* Logitech G900 Gaming Mouse over USB */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC081) },</div><div class='add'>+	{ /* Logitech G920 Wheel over USB */</div><div class='add'>+	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G920_WHEEL),</div><div class='ctx'> 		.driver_data = HIDPP_QUIRK_CLASS_G920 | HIDPP_QUIRK_FORCE_OUTPUT_REPORTS},</div><div class='add'>+</div><div class='add'>+	{ /* MX5000 keyboard over Bluetooth */</div><div class='add'>+	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb305),</div><div class='add'>+	  .driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3429,6 +3773,7 @@ static const struct hid_usage_id hidpp_usages[] = {</div><div class='ctx'> static struct hid_driver hidpp_driver = {</div><div class='ctx'> 	.name = "logitech-hidpp-device",</div><div class='ctx'> 	.id_table = hidpp_devices,</div><div class='add'>+	.report_fixup = hidpp_report_fixup,</div><div class='ctx'> 	.probe = hidpp_probe,</div><div class='ctx'> 	.remove = hidpp_remove,</div><div class='ctx'> 	.raw_event = hidpp_raw_event,</div><div class='head'>diff --git a/drivers/hid/hid-macally.c b/drivers/hid/hid-macally.c<br/>new file mode 100644<br/>index 000000000000..9a4fc7dffb14<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-macally.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-macally.c</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'>+ *  HID driver for quirky Macally devices</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2019 Alex Henrie &lt;alexhenrie24@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Alex Henrie &lt;alexhenrie24@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Macally devices");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Macally ikey keyboard says that its logical and usage maximums are both</div><div class='add'>+ * 101, but the power key is 102 and the equals key is 103</div><div class='add'>+ */</div><div class='add'>+static __u8 *macally_report_fixup(struct hid_device *hdev, __u8 *rdesc,</div><div class='add'>+				 unsigned int *rsize)</div><div class='add'>+{</div><div class='add'>+	if (*rsize &gt;= 60 &amp;&amp; rdesc[53] == 0x65 &amp;&amp; rdesc[59] == 0x65) {</div><div class='add'>+		hid_info(hdev,</div><div class='add'>+			"fixing up Macally ikey keyboard report descriptor\n");</div><div class='add'>+		rdesc[53] = rdesc[59] = 0x67;</div><div class='add'>+	}</div><div class='add'>+	return rdesc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hid_device_id macally_id_table[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOLID_YEAR,</div><div class='add'>+			 USB_DEVICE_ID_MACALLY_IKEY_KEYBOARD) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, macally_id_table);</div><div class='add'>+</div><div class='add'>+static struct hid_driver macally_driver = {</div><div class='add'>+	.name			= "macally",</div><div class='add'>+	.id_table		= macally_id_table,</div><div class='add'>+	.report_fixup		= macally_report_fixup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hid_driver(macally_driver);</div><div class='head'>diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c<br/>index c1b29a9eb41a..482c24f0e078 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-picolcd_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-picolcd_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-picolcd_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-picolcd_core.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hid-picolcd.h"</div><div class='ctx'> </div><div class='hunk'>@@ -275,27 +276,20 @@ static ssize_t picolcd_operation_mode_store(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct picolcd_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct hid_report *report = NULL;</div><div class='del'>-	size_t cnt = count;</div><div class='ctx'> 	int timeout = data-&gt;opmode_delay;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (cnt &gt;= 3 &amp;&amp; strncmp("lcd", buf, 3) == 0) {</div><div class='add'>+	if (sysfs_streq(buf, "lcd")) {</div><div class='ctx'> 		if (data-&gt;status &amp; PICOLCD_BOOTLOADER)</div><div class='ctx'> 			report = picolcd_out_report(REPORT_EXIT_FLASHER, data-&gt;hdev);</div><div class='del'>-		buf += 3;</div><div class='del'>-		cnt -= 3;</div><div class='del'>-	} else if (cnt &gt;= 10 &amp;&amp; strncmp("bootloader", buf, 10) == 0) {</div><div class='add'>+	} else if (sysfs_streq(buf, "bootloader")) {</div><div class='ctx'> 		if (!(data-&gt;status &amp; PICOLCD_BOOTLOADER))</div><div class='ctx'> 			report = picolcd_out_report(REPORT_EXIT_KEYBOARD, data-&gt;hdev);</div><div class='del'>-		buf += 10;</div><div class='del'>-		cnt -= 10;</div><div class='del'>-	}</div><div class='del'>-	if (!report || report-&gt;maxfield != 1)</div><div class='add'>+	} else {</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	while (cnt &gt; 0 &amp;&amp; (buf[cnt-1] == '\n' || buf[cnt-1] == '\r'))</div><div class='del'>-		cnt--;</div><div class='del'>-	if (cnt != 0)</div><div class='add'>+	if (!report || report-&gt;maxfield != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;data-&gt;lock, flags);</div><div class='head'>diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c<br/>index 953908f2267c..fea7f7ff5ab1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-quirks.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-quirks.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-quirks.c</a></div><div class='hunk'>@@ -432,7 +432,6 @@ static const struct hid_device_id hid_have_special_driver[] = {</div><div class='ctx'> #if IS_ENABLED(CONFIG_HID_LOGITECH)</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },</div><div class='hunk'>@@ -464,13 +463,8 @@ static const struct hid_device_id hid_have_special_driver[] = {</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_HID_LOGITECH_HIDPP)</div><div class='del'>-	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_T651) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G920_WHEEL) },</div><div class='ctx'> #endif</div><div class='del'>-#if IS_ENABLED(CONFIG_HID_LOGITECH_DJ)</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2) },</div><div class='del'>-#endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_HID_MAGICMOUSE)</div><div class='ctx'> 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },</div><div class='ctx'> 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },</div><div class='hunk'>@@ -715,7 +709,6 @@ static const struct hid_device_id hid_ignore_list[] = {</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },</div><div class='del'>-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },</div><div class='hunk'>@@ -855,7 +848,7 @@ static const struct hid_device_id hid_ignore_list[] = {</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer</div><div class='ctx'>  *</div><div class='ctx'>  * There are composite devices for which we want to ignore only a certain</div><div class='hunk'>@@ -996,6 +989,10 @@ bool hid_ignore(struct hid_device *hdev)</div><div class='ctx'> 		if (hdev-&gt;product == 0x0401 &amp;&amp;</div><div class='ctx'> 		    strncmp(hdev-&gt;name, "ELAN0800", 8) != 0)</div><div class='ctx'> 			return true;</div><div class='add'>+		/* Same with product id 0x0400 */</div><div class='add'>+		if (hdev-&gt;product == 0x0400 &amp;&amp;</div><div class='add'>+		    strncmp(hdev-&gt;name, "QTEC0001", 8) != 0)</div><div class='add'>+			return true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1042,7 +1039,7 @@ static struct hid_device_id *hid_exists_dquirk(const struct hid_device *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bl_entry != NULL)</div><div class='del'>-		dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%hx:0x%hx\n",</div><div class='add'>+		dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%04x:0x%04x\n",</div><div class='ctx'> 			bl_entry-&gt;driver_data, bl_entry-&gt;vendor,</div><div class='ctx'> 			bl_entry-&gt;product);</div><div class='ctx'> </div><div class='hunk'>@@ -1209,7 +1206,7 @@ static unsigned long hid_gets_squirk(const struct hid_device *hdev)</div><div class='ctx'> 		quirks |= bl_entry-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (quirks)</div><div class='del'>-		dbg_hid("Found squirk 0x%lx for HID device 0x%hx:0x%hx\n",</div><div class='add'>+		dbg_hid("Found squirk 0x%lx for HID device 0x%04x:0x%04x\n",</div><div class='ctx'> 			quirks, hdev-&gt;vendor, hdev-&gt;product);</div><div class='ctx'> 	return quirks;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c<br/>index bb012bc032e0..462e653a7bbb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-sensor-custom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-sensor-custom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-sensor-custom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-sensor-custom.c</a></div><div class='hunk'>@@ -157,8 +157,7 @@ static int usage_id_cmp(const void *p1, const void *p2)</div><div class='ctx'> static ssize_t enable_sensor_show(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct hid_sensor_custom *sensor_inst = platform_get_drvdata(pdev);</div><div class='add'>+	struct hid_sensor_custom *sensor_inst = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%d\n", sensor_inst-&gt;enable);</div><div class='ctx'> }</div><div class='hunk'>@@ -237,8 +236,7 @@ static ssize_t enable_sensor_store(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr,</div><div class='ctx'> 				   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct hid_sensor_custom *sensor_inst = platform_get_drvdata(pdev);</div><div class='add'>+	struct hid_sensor_custom *sensor_inst = dev_get_drvdata(dev);</div><div class='ctx'> 	int value;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +281,7 @@ static const struct attribute_group enable_sensor_attr_group = {</div><div class='ctx'> static ssize_t show_value(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct hid_sensor_custom *sensor_inst = platform_get_drvdata(pdev);</div><div class='add'>+	struct hid_sensor_custom *sensor_inst = dev_get_drvdata(dev);</div><div class='ctx'> 	struct hid_sensor_hub_attribute_info *attribute;</div><div class='ctx'> 	int index, usage, field_index;</div><div class='ctx'> 	char name[HID_CUSTOM_NAME_LENGTH];</div><div class='hunk'>@@ -392,8 +389,7 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static ssize_t store_value(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct hid_sensor_custom *sensor_inst = platform_get_drvdata(pdev);</div><div class='add'>+	struct hid_sensor_custom *sensor_inst = dev_get_drvdata(dev);</div><div class='ctx'> 	int index, field_index, usage;</div><div class='ctx'> 	char name[HID_CUSTOM_NAME_LENGTH];</div><div class='ctx'> 	int value;</div><div class='head'>diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c<br/>index 8141cadfca0e..8dae0f9b819e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-steam.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-steam.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-steam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-steam.c</a></div><div class='hunk'>@@ -499,6 +499,7 @@ static void steam_battery_unregister(struct steam_device *steam)</div><div class='ctx'> static int steam_register(struct steam_device *steam)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool client_opened;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function can be called several times in a row with the</div><div class='hunk'>@@ -511,9 +512,11 @@ static int steam_register(struct steam_device *steam)</div><div class='ctx'> 		 * Unlikely, but getting the serial could fail, and it is not so</div><div class='ctx'> 		 * important, so make up a serial number and go on.</div><div class='ctx'> 		 */</div><div class='add'>+		mutex_lock(&amp;steam-&gt;mutex);</div><div class='ctx'> 		if (steam_get_serial(steam) &lt; 0)</div><div class='ctx'> 			strlcpy(steam-&gt;serial_no, "XXXXXXXXXX",</div><div class='ctx'> 					sizeof(steam-&gt;serial_no));</div><div class='add'>+		mutex_unlock(&amp;steam-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 		hid_info(steam-&gt;hdev, "Steam Controller '%s' connected",</div><div class='ctx'> 				steam-&gt;serial_no);</div><div class='hunk'>@@ -528,13 +531,15 @@ static int steam_register(struct steam_device *steam)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;steam-&gt;mutex);</div><div class='del'>-	if (!steam-&gt;client_opened) {</div><div class='add'>+	client_opened = steam-&gt;client_opened;</div><div class='add'>+	if (!client_opened)</div><div class='ctx'> 		steam_set_lizard_mode(steam, lizard_mode);</div><div class='add'>+	mutex_unlock(&amp;steam-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!client_opened)</div><div class='ctx'> 		ret = steam_input_register(steam);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		ret = 0;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;steam-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -630,14 +635,21 @@ static void steam_client_ll_close(struct hid_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct steam_device *steam = hdev-&gt;driver_data;</div><div class='ctx'> </div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool connected;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;steam-&gt;lock, flags);</div><div class='add'>+	connected = steam-&gt;connected;</div><div class='add'>+	spin_unlock_irqrestore(&amp;steam-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;steam-&gt;mutex);</div><div class='ctx'> 	steam-&gt;client_opened = false;</div><div class='add'>+	if (connected)</div><div class='add'>+		steam_set_lizard_mode(steam, lizard_mode);</div><div class='ctx'> 	mutex_unlock(&amp;steam-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (steam-&gt;connected) {</div><div class='del'>-		steam_set_lizard_mode(steam, lizard_mode);</div><div class='add'>+	if (connected)</div><div class='ctx'> 		steam_input_register(steam);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int steam_client_ll_raw_request(struct hid_device *hdev,</div><div class='head'>diff --git a/drivers/hid/hid-u2fzero.c b/drivers/hid/hid-u2fzero.c<br/>new file mode 100644<br/>index 000000000000..95e0807878c7<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-u2fzero.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-u2fzero.c</a></div><div class='hunk'>@@ -0,0 +1,374 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * U2F Zero LED and RNG driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2018 Andrej Shadura &lt;andrew@shadura.me&gt;</div><div class='add'>+ * Loosely based on drivers/hid/hid-led.c</div><div class='add'>+ *              and drivers/usb/misc/chaoskey.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation, version 2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/hidraw.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "usbhid/usbhid.h"</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='add'>+#define DRIVER_SHORT		"u2fzero"</div><div class='add'>+</div><div class='add'>+#define HID_REPORT_SIZE		64</div><div class='add'>+</div><div class='add'>+/* We only use broadcast (CID-less) messages */</div><div class='add'>+#define CID_BROADCAST		0xffffffff</div><div class='add'>+</div><div class='add'>+struct u2f_hid_msg {</div><div class='add'>+	u32 cid;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 cmd;</div><div class='add'>+			u8 bcnth;</div><div class='add'>+			u8 bcntl;</div><div class='add'>+			u8 data[HID_REPORT_SIZE - 7];</div><div class='add'>+		} init;</div><div class='add'>+		struct {</div><div class='add'>+			u8 seq;</div><div class='add'>+			u8 data[HID_REPORT_SIZE - 5];</div><div class='add'>+		} cont;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct u2f_hid_report {</div><div class='add'>+	u8 report_type;</div><div class='add'>+	struct u2f_hid_msg msg;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define U2F_HID_MSG_LEN(f)	(size_t)(((f).init.bcnth &lt;&lt; 8) + (f).init.bcntl)</div><div class='add'>+</div><div class='add'>+/* Custom extensions to the U2FHID protocol */</div><div class='add'>+#define U2F_CUSTOM_GET_RNG	0x21</div><div class='add'>+#define U2F_CUSTOM_WINK		0x24</div><div class='add'>+</div><div class='add'>+struct u2fzero_device {</div><div class='add'>+	struct hid_device	*hdev;</div><div class='add'>+	struct urb		*urb;	    /* URB for the RNG data */</div><div class='add'>+	struct led_classdev	ldev;	    /* Embedded struct for led */</div><div class='add'>+	struct hwrng		hwrng;	    /* Embedded struct for hwrng */</div><div class='add'>+	char			*led_name;</div><div class='add'>+	char			*rng_name;</div><div class='add'>+	u8			*buf_out;</div><div class='add'>+	u8			*buf_in;</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+	bool			present;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int u2fzero_send(struct u2fzero_device *dev, struct u2f_hid_report *req)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;buf_out, req, sizeof(struct u2f_hid_report));</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_output_report(dev-&gt;hdev, dev-&gt;buf_out,</div><div class='add'>+				   sizeof(struct u2f_hid_msg));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&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'>+	return ret == sizeof(struct u2f_hid_msg) ? 0 : -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct u2fzero_transfer_context {</div><div class='add'>+	struct completion done;</div><div class='add'>+	int status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void u2fzero_read_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct u2fzero_transfer_context *ctx = urb-&gt;context;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;status = urb-&gt;status;</div><div class='add'>+	complete(&amp;ctx-&gt;done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_recv(struct u2fzero_device *dev,</div><div class='add'>+			struct u2f_hid_report *req,</div><div class='add'>+			struct u2f_hid_msg *resp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hid_device *hdev = dev-&gt;hdev;</div><div class='add'>+	struct u2fzero_transfer_context ctx;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;buf_out, req, sizeof(struct u2f_hid_report));</div><div class='add'>+</div><div class='add'>+	dev-&gt;urb-&gt;context = &amp;ctx;</div><div class='add'>+	init_completion(&amp;ctx.done);</div><div class='add'>+</div><div class='add'>+	ret = usb_submit_urb(dev-&gt;urb, GFP_NOIO);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		hid_err(hdev, "usb_submit_urb failed: %d", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_output_report(dev-&gt;hdev, dev-&gt;buf_out,</div><div class='add'>+				   sizeof(struct u2f_hid_msg));</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		hid_err(hdev, "hid_hw_output_report failed: %d", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = (wait_for_completion_timeout(</div><div class='add'>+		&amp;ctx.done, msecs_to_jiffies(USB_CTRL_SET_TIMEOUT)));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		usb_kill_urb(dev-&gt;urb);</div><div class='add'>+		hid_err(hdev, "urb submission timed out");</div><div class='add'>+	} else {</div><div class='add'>+		ret = dev-&gt;urb-&gt;actual_length;</div><div class='add'>+		memcpy(resp, dev-&gt;buf_in, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;dev-&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 u2fzero_blink(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct u2fzero_device *dev = container_of(ldev,</div><div class='add'>+		struct u2fzero_device, ldev);</div><div class='add'>+	struct u2f_hid_report req = {</div><div class='add'>+		.report_type = 0,</div><div class='add'>+		.msg.cid = CID_BROADCAST,</div><div class='add'>+		.msg.init = {</div><div class='add'>+			.cmd = U2F_CUSTOM_WINK,</div><div class='add'>+			.bcnth = 0,</div><div class='add'>+			.bcntl = 0,</div><div class='add'>+			.data  = {0},</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	return u2fzero_send(dev, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_brightness_set(struct led_classdev *ldev,</div><div class='add'>+				  enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	ldev-&gt;brightness = LED_OFF;</div><div class='add'>+	if (brightness)</div><div class='add'>+		return u2fzero_blink(ldev);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_rng_read(struct hwrng *rng, void *data,</div><div class='add'>+			    size_t max, bool wait)</div><div class='add'>+{</div><div class='add'>+	struct u2fzero_device *dev = container_of(rng,</div><div class='add'>+		struct u2fzero_device, hwrng);</div><div class='add'>+	struct u2f_hid_report req = {</div><div class='add'>+		.report_type = 0,</div><div class='add'>+		.msg.cid = CID_BROADCAST,</div><div class='add'>+		.msg.init = {</div><div class='add'>+			.cmd = U2F_CUSTOM_GET_RNG,</div><div class='add'>+			.bcnth = 0,</div><div class='add'>+			.bcntl = 0,</div><div class='add'>+			.data  = {0},</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	struct u2f_hid_msg resp;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t actual_length;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;present) {</div><div class='add'>+		hid_dbg(dev-&gt;hdev, "device not present");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = u2fzero_recv(dev, &amp;req, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* only take the minimum amount of data it is safe to take */</div><div class='add'>+	actual_length = min3((size_t)ret - offsetof(struct u2f_hid_msg,</div><div class='add'>+		init.data), U2F_HID_MSG_LEN(resp), max);</div><div class='add'>+</div><div class='add'>+	memcpy(data, resp.init.data, actual_length);</div><div class='add'>+</div><div class='add'>+	return actual_length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_init_led(struct u2fzero_device *dev,</div><div class='add'>+			    unsigned int minor)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;led_name = devm_kasprintf(&amp;dev-&gt;hdev-&gt;dev, GFP_KERNEL,</div><div class='add'>+		"%s%u", DRIVER_SHORT, minor);</div><div class='add'>+	if (dev-&gt;led_name == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ldev.name = dev-&gt;led_name;</div><div class='add'>+	dev-&gt;ldev.max_brightness = LED_ON;</div><div class='add'>+	dev-&gt;ldev.flags = LED_HW_PLUGGABLE;</div><div class='add'>+	dev-&gt;ldev.brightness_set_blocking = u2fzero_brightness_set;</div><div class='add'>+</div><div class='add'>+	return devm_led_classdev_register(&amp;dev-&gt;hdev-&gt;dev, &amp;dev-&gt;ldev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_init_hwrng(struct u2fzero_device *dev,</div><div class='add'>+			      unsigned int minor)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;rng_name = devm_kasprintf(&amp;dev-&gt;hdev-&gt;dev, GFP_KERNEL,</div><div class='add'>+		"%s-rng%u", DRIVER_SHORT, minor);</div><div class='add'>+	if (dev-&gt;rng_name == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;hwrng.name = dev-&gt;rng_name;</div><div class='add'>+	dev-&gt;hwrng.read = u2fzero_rng_read;</div><div class='add'>+	dev-&gt;hwrng.quality = 1;</div><div class='add'>+</div><div class='add'>+	return devm_hwrng_register(&amp;dev-&gt;hdev-&gt;dev, &amp;dev-&gt;hwrng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_fill_in_urb(struct u2fzero_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *hdev = dev-&gt;hdev;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct usbhid_device *usbhid = hdev-&gt;driver_data;</div><div class='add'>+	unsigned int pipe_in;</div><div class='add'>+	struct usb_host_endpoint *ep;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hdev-&gt;bus != BUS_USB)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	udev = hid_to_usb_dev(hdev);</div><div class='add'>+</div><div class='add'>+	if (!usbhid-&gt;urbout || !usbhid-&gt;urbin)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ep = usb_pipe_endpoint(udev, usbhid-&gt;urbin-&gt;pipe);</div><div class='add'>+	if (!ep)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dev-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;urb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pipe_in = (usbhid-&gt;urbin-&gt;pipe &amp; ~(3 &lt;&lt; 30)) | (PIPE_INTERRUPT &lt;&lt; 30);</div><div class='add'>+</div><div class='add'>+	usb_fill_int_urb(dev-&gt;urb,</div><div class='add'>+		udev,</div><div class='add'>+		pipe_in,</div><div class='add'>+		dev-&gt;buf_in,</div><div class='add'>+		HID_REPORT_SIZE,</div><div class='add'>+		u2fzero_read_callback,</div><div class='add'>+		NULL,</div><div class='add'>+		ep-&gt;desc.bInterval);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u2fzero_probe(struct hid_device *hdev,</div><div class='add'>+			 const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct u2fzero_device *dev;</div><div class='add'>+	unsigned int minor;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!hid_is_using_ll_driver(hdev, &amp;usb_hid_driver))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev = devm_kzalloc(&amp;hdev-&gt;dev, sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (dev == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;buf_out = devm_kmalloc(&amp;hdev-&gt;dev,</div><div class='add'>+		sizeof(struct u2f_hid_report), GFP_KERNEL);</div><div class='add'>+	if (dev-&gt;buf_out == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;buf_in = devm_kmalloc(&amp;hdev-&gt;dev,</div><div class='add'>+		sizeof(struct u2f_hid_msg), GFP_KERNEL);</div><div class='add'>+	if (dev-&gt;buf_in == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse(hdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;hdev = hdev;</div><div class='add'>+	hid_set_drvdata(hdev, dev);</div><div class='add'>+	mutex_init(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	u2fzero_fill_in_urb(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;present = true;</div><div class='add'>+</div><div class='add'>+	minor = ((struct hidraw *) hdev-&gt;hidraw)-&gt;minor;</div><div class='add'>+</div><div class='add'>+	ret = u2fzero_init_led(dev, minor);</div><div class='add'>+	if (ret) {</div><div class='add'>+		hid_hw_stop(hdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hid_info(hdev, "U2F Zero LED initialised\n");</div><div class='add'>+</div><div class='add'>+	ret = u2fzero_init_hwrng(dev, minor);</div><div class='add'>+	if (ret) {</div><div class='add'>+		hid_hw_stop(hdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hid_info(hdev, "U2F Zero RNG initialised\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 u2fzero_remove(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct u2fzero_device *dev = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+	dev-&gt;present = false;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='add'>+	usb_poison_urb(dev-&gt;urb);</div><div class='add'>+	usb_free_urb(dev-&gt;urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id u2fzero_table[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL,</div><div class='add'>+	  USB_DEVICE_ID_U2F_ZERO) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hid, u2fzero_table);</div><div class='add'>+</div><div class='add'>+static struct hid_driver u2fzero_driver = {</div><div class='add'>+	.name = "hid-" DRIVER_SHORT,</div><div class='add'>+	.probe = u2fzero_probe,</div><div class='add'>+	.remove = u2fzero_remove,</div><div class='add'>+	.id_table = u2fzero_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hid_driver(u2fzero_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Andrej Shadura &lt;andrew@shadura.me&gt;");</div><div class='add'>+MODULE_DESCRIPTION("U2F Zero LED and RNG driver");</div><div class='head'>diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c<br/>index 7710d9f957da..0187c9f8fc22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-uclogic-params.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/hid-uclogic-params.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/hid-uclogic-params.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/hid-uclogic-params.c</a></div><div class='hunk'>@@ -735,10 +735,6 @@ static int uclogic_params_huion_init(struct uclogic_params *params,</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = usb_string(udev, 201, ver_ptr, ver_len);</div><div class='del'>-	if (ver_ptr == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='ctx'> 	if (rc == -EPIPE) {</div><div class='ctx'> 		*ver_ptr = '\0';</div><div class='ctx'> 	} else if (rc &lt; 0) {</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/Kconfig b/drivers/hid/intel-ish-hid/Kconfig<br/>index 519e4c8b53c4..786adbc97ac5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/Kconfig</a></div><div class='hunk'>@@ -14,4 +14,19 @@ config INTEL_ISH_HID</div><div class='ctx'> 	  Broxton and Kaby Lake.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y here if you want to support Intel ISH. If unsure, say N.</div><div class='add'>+</div><div class='add'>+config INTEL_ISH_FIRMWARE_DOWNLOADER</div><div class='add'>+	tristate "Host Firmware Load feature for Intel ISH"</div><div class='add'>+	depends on INTEL_ISH_HID</div><div class='add'>+	depends on X86</div><div class='add'>+	help</div><div class='add'>+	  The Integrated Sensor Hub (ISH) enables the kernel to offload</div><div class='add'>+	  sensor polling and algorithm processing to a dedicated low power</div><div class='add'>+	  processor in the chipset.</div><div class='add'>+</div><div class='add'>+	  The Host Firmware Load feature adds support to load the ISH</div><div class='add'>+	  firmware from host file system at boot.</div><div class='add'>+</div><div class='add'>+	  Say M here if you want to support Host Firmware Loading feature</div><div class='add'>+	  for Intel ISH. If unsure, say N.</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/Makefile b/drivers/hid/intel-ish-hid/Makefile<br/>index 825b70af672f..2de97e4b7740 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/Makefile</a></div><div class='hunk'>@@ -20,4 +20,7 @@ obj-$(CONFIG_INTEL_ISH_HID) += intel-ishtp-hid.o</div><div class='ctx'> intel-ishtp-hid-objs := ishtp-hid.o</div><div class='ctx'> intel-ishtp-hid-objs += ishtp-hid-client.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ishtp-loader.o</div><div class='add'>+intel-ishtp-loader-objs += ishtp-fw-loader.o</div><div class='add'>+</div><div class='ctx'> ccflags-y += -Idrivers/hid/intel-ish-hid/ishtp</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h<br/>index 08a8327dfd22..523c0cbd44a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ipc/hw-ish.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ipc/hw-ish.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ipc/hw-ish.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ipc/hw-ish.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #define CNL_H_DEVICE_ID		0xA37C</div><div class='ctx'> #define ICL_MOBILE_DEVICE_ID	0x34FC</div><div class='ctx'> #define SPT_H_DEVICE_ID		0xA135</div><div class='add'>+#define CML_LP_DEVICE_ID	0x02FC</div><div class='ctx'> </div><div class='ctx'> #define	REVISION_ID_CHT_A0	0x6</div><div class='ctx'> #define	REVISION_ID_CHT_Ax_SI	0x0</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c<br/>index a6e1ee744f4d..ac0a179daf23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ipc/pci-ish.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ipc/pci-ish.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ipc/pci-ish.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ipc/pci-ish.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@ static const struct pci_device_id ish_pci_tbl[] = {</div><div class='ctx'> 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)},</div><div class='ctx'> 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)},</div><div class='ctx'> 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)},</div><div class='ctx'> 	{0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ish_pci_tbl);</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c<br/>new file mode 100644<br/>index 000000000000..22ba21457035<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-fw-loader.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp-fw-loader.c</a></div><div class='hunk'>@@ -0,0 +1,1085 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * ISH-TP client driver for ISH firmware loading</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019, Intel Corporation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firmware.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/intel-ish-client-if.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+/* Number of times we attempt to load the firmware before giving up */</div><div class='add'>+#define MAX_LOAD_ATTEMPTS			3</div><div class='add'>+</div><div class='add'>+/* ISH TX/RX ring buffer pool size */</div><div class='add'>+#define LOADER_CL_RX_RING_SIZE			1</div><div class='add'>+#define LOADER_CL_TX_RING_SIZE			1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ISH Shim firmware loader reserves 4 Kb buffer in SRAM. The buffer is</div><div class='add'>+ * used to temporarily hold the data transferred from host to Shim</div><div class='add'>+ * firmware loader. Reason for the odd size of 3968 bytes? Each IPC</div><div class='add'>+ * transfer is 128 bytes (= 4 bytes header + 124 bytes payload). So the</div><div class='add'>+ * 4 Kb buffer can hold maximum of 32 IPC transfers, which means we can</div><div class='add'>+ * have a max payload of 3968 bytes (= 32 x 124 payload).</div><div class='add'>+ */</div><div class='add'>+#define LOADER_SHIM_IPC_BUF_SIZE		3968</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ish_loader_commands -	ISH loader host commands.</div><div class='add'>+ * LOADER_CMD_XFER_QUERY	Query the Shim firmware loader for</div><div class='add'>+ *				capabilities</div><div class='add'>+ * LOADER_CMD_XFER_FRAGMENT	Transfer one firmware image fragment at a</div><div class='add'>+ *				time. The command may be executed</div><div class='add'>+ *				multiple times until the entire firmware</div><div class='add'>+ *				image is downloaded to SRAM.</div><div class='add'>+ * LOADER_CMD_START		Start executing the main firmware.</div><div class='add'>+ */</div><div class='add'>+enum ish_loader_commands {</div><div class='add'>+	LOADER_CMD_XFER_QUERY = 0,</div><div class='add'>+	LOADER_CMD_XFER_FRAGMENT,</div><div class='add'>+	LOADER_CMD_START,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command bit mask */</div><div class='add'>+#define	CMD_MASK				GENMASK(6, 0)</div><div class='add'>+#define	IS_RESPONSE				BIT(7)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ISH firmware max delay for one transmit failure is 1 Hz,</div><div class='add'>+ * and firmware will retry 2 times, so 3 Hz is used for timeout.</div><div class='add'>+ */</div><div class='add'>+#define ISHTP_SEND_TIMEOUT			(3 * HZ)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Loader transfer modes:</div><div class='add'>+ *</div><div class='add'>+ * LOADER_XFER_MODE_ISHTP mode uses the existing ISH-TP mechanism to</div><div class='add'>+ * transfer data. This may use IPC or DMA if supported in firmware.</div><div class='add'>+ * The buffer size is limited to 4 Kb by the IPC/ISH-TP protocol for</div><div class='add'>+ * both IPC &amp; DMA (legacy).</div><div class='add'>+ *</div><div class='add'>+ * LOADER_XFER_MODE_DIRECT_DMA - firmware loading is a bit different</div><div class='add'>+ * from the sensor data streaming. Here we download a large (300+ Kb)</div><div class='add'>+ * image directly to ISH SRAM memory. There is limited benefit of</div><div class='add'>+ * DMA'ing 300 Kb image in 4 Kb chucks limit. Hence, we introduce</div><div class='add'>+ * this "direct dma" mode, where we do not use ISH-TP for DMA, but</div><div class='add'>+ * instead manage the DMA directly in kernel driver and Shim firmware</div><div class='add'>+ * loader (allocate buffer, break in chucks and transfer). This allows</div><div class='add'>+ * to overcome 4 Kb limit, and optimize the data flow path in firmware.</div><div class='add'>+ */</div><div class='add'>+#define LOADER_XFER_MODE_DIRECT_DMA		BIT(0)</div><div class='add'>+#define LOADER_XFER_MODE_ISHTP			BIT(1)</div><div class='add'>+</div><div class='add'>+/* ISH Transport Loader client unique GUID */</div><div class='add'>+static const guid_t loader_ishtp_guid =</div><div class='add'>+	GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7,</div><div class='add'>+		  0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc);</div><div class='add'>+</div><div class='add'>+#define FILENAME_SIZE				256</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The firmware loading latency will be minimum if we can DMA the</div><div class='add'>+ * entire ISH firmware image in one go. This requires that we allocate</div><div class='add'>+ * a large DMA buffer in kernel, which could be problematic on some</div><div class='add'>+ * platforms. So here we limit the DMA buffer size via a module_param.</div><div class='add'>+ * We default to 4 pages, but a customer can set it to higher limit if</div><div class='add'>+ * deemed appropriate for his platform.</div><div class='add'>+ */</div><div class='add'>+static int dma_buf_size_limit = 4 * PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct loader_msg_hdr - Header for ISH Loader commands.</div><div class='add'>+ * @command:		LOADER_CMD* commands. Bit 7 is the response.</div><div class='add'>+ * @status:		Command response status. Non 0, is error</div><div class='add'>+ *			condition.</div><div class='add'>+ *</div><div class='add'>+ * This structure is used as header for every command/data sent/received</div><div class='add'>+ * between Host driver and ISH Shim firmware loader.</div><div class='add'>+ */</div><div class='add'>+struct loader_msg_hdr {</div><div class='add'>+	u8 command;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	u8 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_xfer_query {</div><div class='add'>+	struct loader_msg_hdr hdr;</div><div class='add'>+	u32 image_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ish_fw_version {</div><div class='add'>+	u16 major;</div><div class='add'>+	u16 minor;</div><div class='add'>+	u16 hotfix;</div><div class='add'>+	u16 build;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union loader_version {</div><div class='add'>+	u32 value;</div><div class='add'>+	struct {</div><div class='add'>+		u8 major;</div><div class='add'>+		u8 minor;</div><div class='add'>+		u8 hotfix;</div><div class='add'>+		u8 build;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_capability {</div><div class='add'>+	u32 max_fw_image_size;</div><div class='add'>+	u32 xfer_mode;</div><div class='add'>+	u32 max_dma_buf_size; /* only for dma mode, multiples of cacheline */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct shim_fw_info {</div><div class='add'>+	struct ish_fw_version ish_fw_version;</div><div class='add'>+	u32 protocol_version;</div><div class='add'>+	union loader_version ldr_version;</div><div class='add'>+	struct loader_capability ldr_capability;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_xfer_query_response {</div><div class='add'>+	struct loader_msg_hdr hdr;</div><div class='add'>+	struct shim_fw_info fw_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_xfer_fragment {</div><div class='add'>+	struct loader_msg_hdr hdr;</div><div class='add'>+	u32 xfer_mode;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 is_last;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_xfer_ipc_fragment {</div><div class='add'>+	struct loader_xfer_fragment fragment;</div><div class='add'>+	u8 data[] ____cacheline_aligned; /* variable length payload here */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_xfer_dma_fragment {</div><div class='add'>+	struct loader_xfer_fragment fragment;</div><div class='add'>+	u64 ddr_phys_addr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct loader_start {</div><div class='add'>+	struct loader_msg_hdr hdr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct response_info - Encapsulate firmware response related</div><div class='add'>+ *			information for passing between function</div><div class='add'>+ *			loader_cl_send() and process_recv() callback.</div><div class='add'>+ * @data		Copy the data received from firmware here.</div><div class='add'>+ * @max_size		Max size allocated for the @data buffer. If the</div><div class='add'>+ *			received data exceeds this value, we log an</div><div class='add'>+ *			error.</div><div class='add'>+ * @size		Actual size of data received from firmware.</div><div class='add'>+ * @error		Returns 0 for success, negative error code for a</div><div class='add'>+ *			failure in function process_recv().</div><div class='add'>+ * @received		Set to true on receiving a valid firmware</div><div class='add'>+ *			response to host command</div><div class='add'>+ * @wait_queue		Wait queue for Host firmware loading where the</div><div class='add'>+ *			client sends message to ISH firmware and waits</div><div class='add'>+ *			for response</div><div class='add'>+ */</div><div class='add'>+struct response_info {</div><div class='add'>+	void *data;</div><div class='add'>+	size_t max_size;</div><div class='add'>+	size_t size;</div><div class='add'>+	int error;</div><div class='add'>+	bool received;</div><div class='add'>+	wait_queue_head_t wait_queue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ishtp_cl_data - Encapsulate per ISH-TP Client Data.</div><div class='add'>+ * @work_ishtp_reset:	Work queue for reset handling.</div><div class='add'>+ * @work_fw_load:	Work queue for host firmware loading.</div><div class='add'>+ * @flag_retry		Flag for indicating host firmware loading should</div><div class='add'>+ *			be retried.</div><div class='add'>+ * @retry_count		Count the number of retries.</div><div class='add'>+ *</div><div class='add'>+ * This structure is used to store data per client.</div><div class='add'>+ */</div><div class='add'>+struct ishtp_cl_data {</div><div class='add'>+	struct ishtp_cl *loader_ishtp_cl;</div><div class='add'>+	struct ishtp_cl_device *cl_device;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Used for passing firmware response information between</div><div class='add'>+	 * loader_cl_send() and process_recv() callback.</div><div class='add'>+	 */</div><div class='add'>+	struct response_info response;</div><div class='add'>+</div><div class='add'>+	struct work_struct work_ishtp_reset;</div><div class='add'>+	struct work_struct work_fw_load;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In certain failure scenrios, it makes sense to reset the ISH</div><div class='add'>+	 * subsystem and retry Host firmware loading (e.g. bad message</div><div class='add'>+	 * packet, ENOMEM, etc.). On the other hand, failures due to</div><div class='add'>+	 * protocol mismatch, etc., are not recoverable. We do not</div><div class='add'>+	 * retry them.</div><div class='add'>+	 *</div><div class='add'>+	 * If set, the flag indicates that we should re-try the</div><div class='add'>+	 * particular failure.</div><div class='add'>+	 */</div><div class='add'>+	bool flag_retry;</div><div class='add'>+	int retry_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IPC_FRAGMENT_DATA_PREAMBLE				\</div><div class='add'>+	offsetof(struct loader_xfer_ipc_fragment, data)</div><div class='add'>+</div><div class='add'>+#define cl_data_to_dev(client_data) ishtp_device((client_data)-&gt;cl_device)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_firmware_variant() - Gets the filename of firmware image to be</div><div class='add'>+ *			loaded based on platform variant.</div><div class='add'>+ * @client_data		Client data instance.</div><div class='add'>+ * @filename		Returns firmware filename.</div><div class='add'>+ *</div><div class='add'>+ * Queries the firmware-name device property string.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure.</div><div class='add'>+ */</div><div class='add'>+static int get_firmware_variant(struct ishtp_cl_data *client_data,</div><div class='add'>+				char *filename)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	const char *val;</div><div class='add'>+	struct device *devc = ishtp_get_pci_device(client_data-&gt;cl_device);</div><div class='add'>+</div><div class='add'>+	rv = device_property_read_string(devc, "firmware-name", &amp;val);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(devc,</div><div class='add'>+			"Error: ISH firmware-name device property required\n");</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+	return snprintf(filename, FILENAME_SIZE, "intel/%s", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * loader_cl_send()	Send message from host to firmware</div><div class='add'>+ * @client_data:	Client data instance</div><div class='add'>+ * @out_msg		Message buffer to be sent to firmware</div><div class='add'>+ * @out_size		Size of out going message</div><div class='add'>+ * @in_msg		Message buffer where the incoming data copied.</div><div class='add'>+ *			This buffer is allocated by calling</div><div class='add'>+ * @in_size		Max size of incoming message</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of bytes copied in the in_msg on success, negative</div><div class='add'>+ * error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int loader_cl_send(struct ishtp_cl_data *client_data,</div><div class='add'>+			  u8 *out_msg, size_t out_size,</div><div class='add'>+			  u8 *in_msg, size_t in_size)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	struct loader_msg_hdr *out_hdr = (struct loader_msg_hdr *)out_msg;</div><div class='add'>+	struct ishtp_cl *loader_ishtp_cl = client_data-&gt;loader_ishtp_cl;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data),</div><div class='add'>+		"%s: command=%02lx is_response=%u status=%02x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		out_hdr-&gt;command &amp; CMD_MASK,</div><div class='add'>+		out_hdr-&gt;command &amp; IS_RESPONSE ? 1 : 0,</div><div class='add'>+		out_hdr-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Setup in coming buffer &amp; size */</div><div class='add'>+	client_data-&gt;response.data = in_msg;</div><div class='add'>+	client_data-&gt;response.max_size = in_size;</div><div class='add'>+	client_data-&gt;response.error = 0;</div><div class='add'>+	client_data-&gt;response.received = false;</div><div class='add'>+</div><div class='add'>+	rv = ishtp_cl_send(loader_ishtp_cl, out_msg, out_size);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"ishtp_cl_send error %d\n", rv);</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_event_interruptible_timeout(client_data-&gt;response.wait_queue,</div><div class='add'>+					 client_data-&gt;response.received,</div><div class='add'>+					 ISHTP_SEND_TIMEOUT);</div><div class='add'>+	if (!client_data-&gt;response.received) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Timed out for response to command=%02lx",</div><div class='add'>+			out_hdr-&gt;command &amp; CMD_MASK);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (client_data-&gt;response.error &lt; 0)</div><div class='add'>+		return client_data-&gt;response.error;</div><div class='add'>+</div><div class='add'>+	return client_data-&gt;response.size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * process_recv() -	Receive and parse incoming packet</div><div class='add'>+ * @loader_ishtp_cl:	Client instance to get stats</div><div class='add'>+ * @rb_in_proc:		ISH received message buffer</div><div class='add'>+ *</div><div class='add'>+ * Parse the incoming packet. If it is a response packet then it will</div><div class='add'>+ * update received and wake up the caller waiting to for the response.</div><div class='add'>+ */</div><div class='add'>+static void process_recv(struct ishtp_cl *loader_ishtp_cl,</div><div class='add'>+			 struct ishtp_cl_rb *rb_in_proc)</div><div class='add'>+{</div><div class='add'>+	struct loader_msg_hdr *hdr;</div><div class='add'>+	size_t data_len = rb_in_proc-&gt;buf_idx;</div><div class='add'>+	struct ishtp_cl_data *client_data =</div><div class='add'>+		ishtp_get_client_data(loader_ishtp_cl);</div><div class='add'>+</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	if (!client_data-&gt;response.data) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Receiving buffer is null. Should be allocated by calling function\n");</div><div class='add'>+		client_data-&gt;response.error = -EINVAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (client_data-&gt;response.received) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Previous firmware message not yet processed\n");</div><div class='add'>+		client_data-&gt;response.error = -EINVAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * All firmware messages have a header. Check buffer size</div><div class='add'>+	 * before accessing elements inside.</div><div class='add'>+	 */</div><div class='add'>+	if (!rb_in_proc-&gt;buffer.data) {</div><div class='add'>+		dev_warn(cl_data_to_dev(client_data),</div><div class='add'>+			 "rb_in_proc-&gt;buffer.data returned null");</div><div class='add'>+		client_data-&gt;response.error = -EBADMSG;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data_len &lt; sizeof(struct loader_msg_hdr)) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"data size %zu is less than header %zu\n",</div><div class='add'>+			data_len, sizeof(struct loader_msg_hdr));</div><div class='add'>+		client_data-&gt;response.error = -EMSGSIZE;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct loader_msg_hdr *)rb_in_proc-&gt;buffer.data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data),</div><div class='add'>+		"%s: command=%02lx is_response=%u status=%02x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		hdr-&gt;command &amp; CMD_MASK,</div><div class='add'>+		hdr-&gt;command &amp; IS_RESPONSE ? 1 : 0,</div><div class='add'>+		hdr-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (((hdr-&gt;command &amp; CMD_MASK) != LOADER_CMD_XFER_QUERY) &amp;&amp;</div><div class='add'>+	    ((hdr-&gt;command &amp; CMD_MASK) != LOADER_CMD_XFER_FRAGMENT) &amp;&amp;</div><div class='add'>+	    ((hdr-&gt;command &amp; CMD_MASK) != LOADER_CMD_START)) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Invalid command=%02lx\n",</div><div class='add'>+			hdr-&gt;command &amp; CMD_MASK);</div><div class='add'>+		client_data-&gt;response.error = -EPROTO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data_len &gt; client_data-&gt;response.max_size) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Received buffer size %zu is larger than allocated buffer %zu\n",</div><div class='add'>+			data_len, client_data-&gt;response.max_size);</div><div class='add'>+		client_data-&gt;response.error = -EMSGSIZE;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We expect only "response" messages from firmware */</div><div class='add'>+	if (!(hdr-&gt;command &amp; IS_RESPONSE)) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Invalid response to command\n");</div><div class='add'>+		client_data-&gt;response.error = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;status) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Loader returned status %d\n",</div><div class='add'>+			hdr-&gt;status);</div><div class='add'>+		client_data-&gt;response.error = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update the actual received buffer size */</div><div class='add'>+	client_data-&gt;response.size = data_len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Copy the buffer received in firmware response for the</div><div class='add'>+	 * calling thread.</div><div class='add'>+	 */</div><div class='add'>+	memcpy(client_data-&gt;response.data,</div><div class='add'>+	       rb_in_proc-&gt;buffer.data, data_len);</div><div class='add'>+</div><div class='add'>+	/* Set flag before waking up the caller */</div><div class='add'>+	client_data-&gt;response.received = true;</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	/* Free the buffer */</div><div class='add'>+	ishtp_cl_io_rb_recycle(rb_in_proc);</div><div class='add'>+	rb_in_proc = NULL;</div><div class='add'>+</div><div class='add'>+	/* Wake the calling thread */</div><div class='add'>+	wake_up_interruptible(&amp;client_data-&gt;response.wait_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * loader_cl_event_cb() - bus driver callback for incoming message</div><div class='add'>+ * @device:		Pointer to the ishtp client device for which this</div><div class='add'>+ *			message is targeted</div><div class='add'>+ *</div><div class='add'>+ * Remove the packet from the list and process the message by calling</div><div class='add'>+ * process_recv</div><div class='add'>+ */</div><div class='add'>+static void loader_cl_event_cb(struct ishtp_cl_device *cl_device)</div><div class='add'>+{</div><div class='add'>+	struct ishtp_cl_rb *rb_in_proc;</div><div class='add'>+	struct ishtp_cl	*loader_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='add'>+</div><div class='add'>+	while ((rb_in_proc = ishtp_cl_rx_get_rb(loader_ishtp_cl)) != NULL) {</div><div class='add'>+		/* Process the data packet from firmware */</div><div class='add'>+		process_recv(loader_ishtp_cl, rb_in_proc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ish_query_loader_prop() -  Query ISH Shim firmware loader</div><div class='add'>+ * @client_data:	Client data instance</div><div class='add'>+ * @fw:			Poiner to firmware data struct in host memory</div><div class='add'>+ * @fw_info:		Loader firmware properties</div><div class='add'>+ *</div><div class='add'>+ * This function queries the ISH Shim firmware loader for capabilities.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure.</div><div class='add'>+ */</div><div class='add'>+static int ish_query_loader_prop(struct ishtp_cl_data *client_data,</div><div class='add'>+				 const struct firmware *fw,</div><div class='add'>+				 struct shim_fw_info *fw_info)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	struct loader_xfer_query ldr_xfer_query;</div><div class='add'>+	struct loader_xfer_query_response ldr_xfer_query_resp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ldr_xfer_query, 0, sizeof(ldr_xfer_query));</div><div class='add'>+	ldr_xfer_query.hdr.command = LOADER_CMD_XFER_QUERY;</div><div class='add'>+	ldr_xfer_query.image_size = fw-&gt;size;</div><div class='add'>+	rv = loader_cl_send(client_data,</div><div class='add'>+			    (u8 *)&amp;ldr_xfer_query,</div><div class='add'>+			    sizeof(ldr_xfer_query),</div><div class='add'>+			    (u8 *)&amp;ldr_xfer_query_resp,</div><div class='add'>+			    sizeof(ldr_xfer_query_resp));</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		client_data-&gt;flag_retry = true;</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* On success, the return value is the received buffer size */</div><div class='add'>+	if (rv != sizeof(struct loader_xfer_query_response)) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"data size %d is not equal to size of loader_xfer_query_response %zu\n",</div><div class='add'>+			rv, sizeof(struct loader_xfer_query_response));</div><div class='add'>+		client_data-&gt;flag_retry = true;</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save fw_info for use outside this function */</div><div class='add'>+	*fw_info = ldr_xfer_query_resp.fw_info;</div><div class='add'>+</div><div class='add'>+	/* Loader firmware properties */</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data),</div><div class='add'>+		"ish_fw_version: major=%d minor=%d hotfix=%d build=%d protocol_version=0x%x loader_version=%d\n",</div><div class='add'>+		fw_info-&gt;ish_fw_version.major,</div><div class='add'>+		fw_info-&gt;ish_fw_version.minor,</div><div class='add'>+		fw_info-&gt;ish_fw_version.hotfix,</div><div class='add'>+		fw_info-&gt;ish_fw_version.build,</div><div class='add'>+		fw_info-&gt;protocol_version,</div><div class='add'>+		fw_info-&gt;ldr_version.value);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data),</div><div class='add'>+		"loader_capability: max_fw_image_size=0x%x xfer_mode=%d max_dma_buf_size=0x%x dma_buf_size_limit=0x%x\n",</div><div class='add'>+		fw_info-&gt;ldr_capability.max_fw_image_size,</div><div class='add'>+		fw_info-&gt;ldr_capability.xfer_mode,</div><div class='add'>+		fw_info-&gt;ldr_capability.max_dma_buf_size,</div><div class='add'>+		dma_buf_size_limit);</div><div class='add'>+</div><div class='add'>+	/* Sanity checks */</div><div class='add'>+	if (fw_info-&gt;ldr_capability.max_fw_image_size &lt; fw-&gt;size) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"ISH firmware size %zu is greater than Shim firmware loader max supported %d\n",</div><div class='add'>+			fw-&gt;size,</div><div class='add'>+			fw_info-&gt;ldr_capability.max_fw_image_size);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For DMA the buffer size should be multiple of cacheline size */</div><div class='add'>+	if ((fw_info-&gt;ldr_capability.xfer_mode &amp; LOADER_XFER_MODE_DIRECT_DMA) &amp;&amp;</div><div class='add'>+	    (fw_info-&gt;ldr_capability.max_dma_buf_size % L1_CACHE_BYTES)) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"Shim firmware loader buffer size %d should be multiple of cacheline\n",</div><div class='add'>+			fw_info-&gt;ldr_capability.max_dma_buf_size);</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'>+/**</div><div class='add'>+ * ish_fw_xfer_ishtp()	Loads ISH firmware using ishtp interface</div><div class='add'>+ * @client_data:	Client data instance</div><div class='add'>+ * @fw:			Pointer to firmware data struct in host memory</div><div class='add'>+ *</div><div class='add'>+ * This function uses ISH-TP to transfer ISH firmware from host to</div><div class='add'>+ * ISH SRAM. Lower layers may use IPC or DMA depending on firmware</div><div class='add'>+ * support.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure.</div><div class='add'>+ */</div><div class='add'>+static int ish_fw_xfer_ishtp(struct ishtp_cl_data *client_data,</div><div class='add'>+			     const struct firmware *fw)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	u32 fragment_offset, fragment_size, payload_max_size;</div><div class='add'>+	struct loader_xfer_ipc_fragment *ldr_xfer_ipc_frag;</div><div class='add'>+	struct loader_msg_hdr ldr_xfer_ipc_ack;</div><div class='add'>+</div><div class='add'>+	payload_max_size =</div><div class='add'>+		LOADER_SHIM_IPC_BUF_SIZE - IPC_FRAGMENT_DATA_PREAMBLE;</div><div class='add'>+</div><div class='add'>+	ldr_xfer_ipc_frag = kzalloc(LOADER_SHIM_IPC_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!ldr_xfer_ipc_frag) {</div><div class='add'>+		client_data-&gt;flag_retry = true;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ldr_xfer_ipc_frag-&gt;fragment.hdr.command = LOADER_CMD_XFER_FRAGMENT;</div><div class='add'>+	ldr_xfer_ipc_frag-&gt;fragment.xfer_mode = LOADER_XFER_MODE_ISHTP;</div><div class='add'>+</div><div class='add'>+	/* Break the firmware image into fragments and send as ISH-TP payload */</div><div class='add'>+	fragment_offset = 0;</div><div class='add'>+	while (fragment_offset &lt; fw-&gt;size) {</div><div class='add'>+		if (fragment_offset + payload_max_size &lt; fw-&gt;size) {</div><div class='add'>+			fragment_size = payload_max_size;</div><div class='add'>+			ldr_xfer_ipc_frag-&gt;fragment.is_last = 0;</div><div class='add'>+		} else {</div><div class='add'>+			fragment_size = fw-&gt;size - fragment_offset;</div><div class='add'>+			ldr_xfer_ipc_frag-&gt;fragment.is_last = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ldr_xfer_ipc_frag-&gt;fragment.offset = fragment_offset;</div><div class='add'>+		ldr_xfer_ipc_frag-&gt;fragment.size = fragment_size;</div><div class='add'>+		memcpy(ldr_xfer_ipc_frag-&gt;data,</div><div class='add'>+		       &amp;fw-&gt;data[fragment_offset],</div><div class='add'>+		       fragment_size);</div><div class='add'>+</div><div class='add'>+		dev_dbg(cl_data_to_dev(client_data),</div><div class='add'>+			"xfer_mode=ipc offset=0x%08x size=0x%08x is_last=%d\n",</div><div class='add'>+			ldr_xfer_ipc_frag-&gt;fragment.offset,</div><div class='add'>+			ldr_xfer_ipc_frag-&gt;fragment.size,</div><div class='add'>+			ldr_xfer_ipc_frag-&gt;fragment.is_last);</div><div class='add'>+</div><div class='add'>+		rv = loader_cl_send(client_data,</div><div class='add'>+				    (u8 *)ldr_xfer_ipc_frag,</div><div class='add'>+				    IPC_FRAGMENT_DATA_PREAMBLE + fragment_size,</div><div class='add'>+				    (u8 *)&amp;ldr_xfer_ipc_ack,</div><div class='add'>+				    sizeof(ldr_xfer_ipc_ack));</div><div class='add'>+		if (rv &lt; 0) {</div><div class='add'>+			client_data-&gt;flag_retry = true;</div><div class='add'>+			goto end_err_resp_buf_release;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fragment_offset += fragment_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(ldr_xfer_ipc_frag);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+end_err_resp_buf_release:</div><div class='add'>+	/* Free ISH buffer if not done already, in error case */</div><div class='add'>+	kfree(ldr_xfer_ipc_frag);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ish_fw_xfer_direct_dma() - Loads ISH firmware using direct dma</div><div class='add'>+ * @client_data:	Client data instance</div><div class='add'>+ * @fw:			Pointer to firmware data struct in host memory</div><div class='add'>+ * @fw_info:		Loader firmware properties</div><div class='add'>+ *</div><div class='add'>+ * Host firmware load is a unique case where we need to download</div><div class='add'>+ * a large firmware image (200+ Kb). This function implements</div><div class='add'>+ * direct DMA transfer in kernel and ISH firmware. This allows</div><div class='add'>+ * us to overcome the ISH-TP 4 Kb limit, and allows us to DMA</div><div class='add'>+ * directly to ISH UMA at location of choice.</div><div class='add'>+ * Function depends on corresponding support in ISH firmware.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure.</div><div class='add'>+ */</div><div class='add'>+static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data,</div><div class='add'>+				  const struct firmware *fw,</div><div class='add'>+				  const struct shim_fw_info fw_info)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	void *dma_buf;</div><div class='add'>+	dma_addr_t dma_buf_phy;</div><div class='add'>+	u32 fragment_offset, fragment_size, payload_max_size;</div><div class='add'>+	struct loader_msg_hdr ldr_xfer_dma_frag_ack;</div><div class='add'>+	struct loader_xfer_dma_fragment ldr_xfer_dma_frag;</div><div class='add'>+	struct device *devc = ishtp_get_pci_device(client_data-&gt;cl_device);</div><div class='add'>+	u32 shim_fw_buf_size =</div><div class='add'>+		fw_info.ldr_capability.max_dma_buf_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * payload_max_size should be set to minimum of</div><div class='add'>+	 *  (1) Size of firmware to be loaded,</div><div class='add'>+	 *  (2) Max DMA buffer size supported by Shim firmware,</div><div class='add'>+	 *  (3) DMA buffer size limit set by boot_param dma_buf_size_limit.</div><div class='add'>+	 */</div><div class='add'>+	payload_max_size = min3(fw-&gt;size,</div><div class='add'>+				(size_t)shim_fw_buf_size,</div><div class='add'>+				(size_t)dma_buf_size_limit);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Buffer size should be multiple of cacheline size</div><div class='add'>+	 * if it's not, select the previous cacheline boundary.</div><div class='add'>+	 */</div><div class='add'>+	payload_max_size &amp;= ~(L1_CACHE_BYTES - 1);</div><div class='add'>+</div><div class='add'>+	dma_buf = kmalloc(payload_max_size, GFP_KERNEL | GFP_DMA32);</div><div class='add'>+	if (!dma_buf) {</div><div class='add'>+		client_data-&gt;flag_retry = true;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_buf_phy = dma_map_single(devc, dma_buf, payload_max_size,</div><div class='add'>+				     DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(devc, dma_buf_phy)) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data), "DMA map failed\n");</div><div class='add'>+		client_data-&gt;flag_retry = true;</div><div class='add'>+		rv = -ENOMEM;</div><div class='add'>+		goto end_err_dma_buf_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ldr_xfer_dma_frag.fragment.hdr.command = LOADER_CMD_XFER_FRAGMENT;</div><div class='add'>+	ldr_xfer_dma_frag.fragment.xfer_mode = LOADER_XFER_MODE_DIRECT_DMA;</div><div class='add'>+	ldr_xfer_dma_frag.ddr_phys_addr = (u64)dma_buf_phy;</div><div class='add'>+</div><div class='add'>+	/* Send the firmware image in chucks of payload_max_size */</div><div class='add'>+	fragment_offset = 0;</div><div class='add'>+	while (fragment_offset &lt; fw-&gt;size) {</div><div class='add'>+		if (fragment_offset + payload_max_size &lt; fw-&gt;size) {</div><div class='add'>+			fragment_size = payload_max_size;</div><div class='add'>+			ldr_xfer_dma_frag.fragment.is_last = 0;</div><div class='add'>+		} else {</div><div class='add'>+			fragment_size = fw-&gt;size - fragment_offset;</div><div class='add'>+			ldr_xfer_dma_frag.fragment.is_last = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ldr_xfer_dma_frag.fragment.offset = fragment_offset;</div><div class='add'>+		ldr_xfer_dma_frag.fragment.size = fragment_size;</div><div class='add'>+		memcpy(dma_buf, &amp;fw-&gt;data[fragment_offset], fragment_size);</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_device(devc, dma_buf_phy,</div><div class='add'>+					   payload_max_size,</div><div class='add'>+					   DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Flush cache here because the dma_sync_single_for_device()</div><div class='add'>+		 * does not do for x86.</div><div class='add'>+		 */</div><div class='add'>+		clflush_cache_range(dma_buf, payload_max_size);</div><div class='add'>+</div><div class='add'>+		dev_dbg(cl_data_to_dev(client_data),</div><div class='add'>+			"xfer_mode=dma offset=0x%08x size=0x%x is_last=%d ddr_phys_addr=0x%016llx\n",</div><div class='add'>+			ldr_xfer_dma_frag.fragment.offset,</div><div class='add'>+			ldr_xfer_dma_frag.fragment.size,</div><div class='add'>+			ldr_xfer_dma_frag.fragment.is_last,</div><div class='add'>+			ldr_xfer_dma_frag.ddr_phys_addr);</div><div class='add'>+</div><div class='add'>+		rv = loader_cl_send(client_data,</div><div class='add'>+				    (u8 *)&amp;ldr_xfer_dma_frag,</div><div class='add'>+				    sizeof(ldr_xfer_dma_frag),</div><div class='add'>+				    (u8 *)&amp;ldr_xfer_dma_frag_ack,</div><div class='add'>+				    sizeof(ldr_xfer_dma_frag_ack));</div><div class='add'>+		if (rv &lt; 0) {</div><div class='add'>+			client_data-&gt;flag_retry = true;</div><div class='add'>+			goto end_err_resp_buf_release;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fragment_offset += fragment_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(devc, dma_buf_phy, payload_max_size, DMA_TO_DEVICE);</div><div class='add'>+	kfree(dma_buf);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+end_err_resp_buf_release:</div><div class='add'>+	/* Free ISH buffer if not done already, in error case */</div><div class='add'>+	dma_unmap_single(devc, dma_buf_phy, payload_max_size, DMA_TO_DEVICE);</div><div class='add'>+end_err_dma_buf_release:</div><div class='add'>+	kfree(dma_buf);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ish_fw_start()	Start executing ISH main firmware</div><div class='add'>+ * @client_data:	client data instance</div><div class='add'>+ *</div><div class='add'>+ * This function sends message to Shim firmware loader to start</div><div class='add'>+ * the execution of ISH main firmware.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure.</div><div class='add'>+ */</div><div class='add'>+static int ish_fw_start(struct ishtp_cl_data *client_data)</div><div class='add'>+{</div><div class='add'>+	struct loader_start ldr_start;</div><div class='add'>+	struct loader_msg_hdr ldr_start_ack;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ldr_start, 0, sizeof(ldr_start));</div><div class='add'>+	ldr_start.hdr.command = LOADER_CMD_START;</div><div class='add'>+	return loader_cl_send(client_data,</div><div class='add'>+			    (u8 *)&amp;ldr_start,</div><div class='add'>+			    sizeof(ldr_start),</div><div class='add'>+			    (u8 *)&amp;ldr_start_ack,</div><div class='add'>+			    sizeof(ldr_start_ack));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * load_fw_from_host()	Loads ISH firmware from host</div><div class='add'>+ * @client_data:	Client data instance</div><div class='add'>+ *</div><div class='add'>+ * This function loads the ISH firmware to ISH SRAM and starts execution</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure.</div><div class='add'>+ */</div><div class='add'>+static int load_fw_from_host(struct ishtp_cl_data *client_data)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	u32 xfer_mode;</div><div class='add'>+	char *filename;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	struct shim_fw_info fw_info;</div><div class='add'>+	struct ishtp_cl *loader_ishtp_cl = client_data-&gt;loader_ishtp_cl;</div><div class='add'>+</div><div class='add'>+	client_data-&gt;flag_retry = false;</div><div class='add'>+</div><div class='add'>+	filename = kzalloc(FILENAME_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!filename) {</div><div class='add'>+		client_data-&gt;flag_retry = true;</div><div class='add'>+		rv = -ENOMEM;</div><div class='add'>+		goto end_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get filename of the ISH firmware to be loaded */</div><div class='add'>+	rv = get_firmware_variant(client_data, filename);</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		goto end_err_filename_buf_release;</div><div class='add'>+</div><div class='add'>+	rv = request_firmware(&amp;fw, filename, cl_data_to_dev(client_data));</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		goto end_err_filename_buf_release;</div><div class='add'>+</div><div class='add'>+	/* Step 1: Query Shim firmware loader properties */</div><div class='add'>+</div><div class='add'>+	rv = ish_query_loader_prop(client_data, fw, &amp;fw_info);</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		goto end_err_fw_release;</div><div class='add'>+</div><div class='add'>+	/* Step 2: Send the main firmware image to be loaded, to ISH SRAM */</div><div class='add'>+</div><div class='add'>+	xfer_mode = fw_info.ldr_capability.xfer_mode;</div><div class='add'>+	if (xfer_mode &amp; LOADER_XFER_MODE_DIRECT_DMA) {</div><div class='add'>+		rv = ish_fw_xfer_direct_dma(client_data, fw, fw_info);</div><div class='add'>+	} else if (xfer_mode &amp; LOADER_XFER_MODE_ISHTP) {</div><div class='add'>+		rv = ish_fw_xfer_ishtp(client_data, fw);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"No transfer mode selected in firmware\n");</div><div class='add'>+		rv = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		goto end_err_fw_release;</div><div class='add'>+</div><div class='add'>+	/* Step 3: Start ISH main firmware exeuction */</div><div class='add'>+</div><div class='add'>+	rv = ish_fw_start(client_data);</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		goto end_err_fw_release;</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	kfree(filename);</div><div class='add'>+	dev_info(cl_data_to_dev(client_data), "ISH firmware %s loaded\n",</div><div class='add'>+		 filename);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+end_err_fw_release:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+end_err_filename_buf_release:</div><div class='add'>+	kfree(filename);</div><div class='add'>+end_error:</div><div class='add'>+	/* Keep a count of retries, and give up after 3 attempts */</div><div class='add'>+	if (client_data-&gt;flag_retry &amp;&amp;</div><div class='add'>+	    client_data-&gt;retry_count++ &lt; MAX_LOAD_ATTEMPTS) {</div><div class='add'>+		dev_warn(cl_data_to_dev(client_data),</div><div class='add'>+			 "ISH host firmware load failed %d. Resetting ISH, and trying again..\n",</div><div class='add'>+			 rv);</div><div class='add'>+		ish_hw_reset(ishtp_get_ishtp_device(loader_ishtp_cl));</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"ISH host firmware load failed %d\n", rv);</div><div class='add'>+	}</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void load_fw_from_host_handler(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ishtp_cl_data *client_data;</div><div class='add'>+</div><div class='add'>+	client_data = container_of(work, struct ishtp_cl_data,</div><div class='add'>+				   work_fw_load);</div><div class='add'>+	load_fw_from_host(client_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * loader_init() -	Init function for ISH-TP client</div><div class='add'>+ * @loader_ishtp_cl:	ISH-TP client instance</div><div class='add'>+ * @reset:		true if called for init after reset</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure</div><div class='add'>+ */</div><div class='add'>+static int loader_init(struct ishtp_cl *loader_ishtp_cl, int reset)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	struct ishtp_fw_client *fw_client;</div><div class='add'>+	struct ishtp_cl_data *client_data =</div><div class='add'>+		ishtp_get_client_data(loader_ishtp_cl);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data), "reset flag: %d\n", reset);</div><div class='add'>+</div><div class='add'>+	rv = ishtp_cl_link(loader_ishtp_cl);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data), "ishtp_cl_link failed\n");</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Connect to firmware client */</div><div class='add'>+	ishtp_set_tx_ring_size(loader_ishtp_cl, LOADER_CL_TX_RING_SIZE);</div><div class='add'>+	ishtp_set_rx_ring_size(loader_ishtp_cl, LOADER_CL_RX_RING_SIZE);</div><div class='add'>+</div><div class='add'>+	fw_client =</div><div class='add'>+		ishtp_fw_cl_get_client(ishtp_get_ishtp_device(loader_ishtp_cl),</div><div class='add'>+				       &amp;loader_ishtp_guid);</div><div class='add'>+	if (!fw_client) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='add'>+			"ISH client uuid not found\n");</div><div class='add'>+		rv = -ENOENT;</div><div class='add'>+		goto err_cl_unlink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ishtp_cl_set_fw_client_id(loader_ishtp_cl,</div><div class='add'>+				  ishtp_get_fw_client_id(fw_client));</div><div class='add'>+	ishtp_set_connection_state(loader_ishtp_cl, ISHTP_CL_CONNECTING);</div><div class='add'>+</div><div class='add'>+	rv = ishtp_cl_connect(loader_ishtp_cl);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(cl_data_to_dev(client_data), "Client connect fail\n");</div><div class='add'>+		goto err_cl_unlink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data), "Client connected\n");</div><div class='add'>+</div><div class='add'>+	ishtp_register_event_cb(client_data-&gt;cl_device, loader_cl_event_cb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cl_unlink:</div><div class='add'>+	ishtp_cl_unlink(loader_ishtp_cl);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loader_deinit(struct ishtp_cl *loader_ishtp_cl)</div><div class='add'>+{</div><div class='add'>+	ishtp_set_connection_state(loader_ishtp_cl, ISHTP_CL_DISCONNECTING);</div><div class='add'>+	ishtp_cl_disconnect(loader_ishtp_cl);</div><div class='add'>+	ishtp_cl_unlink(loader_ishtp_cl);</div><div class='add'>+	ishtp_cl_flush_queues(loader_ishtp_cl);</div><div class='add'>+</div><div class='add'>+	/* Disband and free all Tx and Rx client-level rings */</div><div class='add'>+	ishtp_cl_free(loader_ishtp_cl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_handler(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	struct ishtp_cl_data *client_data;</div><div class='add'>+	struct ishtp_cl *loader_ishtp_cl;</div><div class='add'>+	struct ishtp_cl_device *cl_device;</div><div class='add'>+</div><div class='add'>+	client_data = container_of(work, struct ishtp_cl_data,</div><div class='add'>+				   work_ishtp_reset);</div><div class='add'>+</div><div class='add'>+	loader_ishtp_cl = client_data-&gt;loader_ishtp_cl;</div><div class='add'>+	cl_device = client_data-&gt;cl_device;</div><div class='add'>+</div><div class='add'>+	/* Unlink, flush queues &amp; start again */</div><div class='add'>+	ishtp_cl_unlink(loader_ishtp_cl);</div><div class='add'>+	ishtp_cl_flush_queues(loader_ishtp_cl);</div><div class='add'>+	ishtp_cl_free(loader_ishtp_cl);</div><div class='add'>+</div><div class='add'>+	loader_ishtp_cl = ishtp_cl_allocate(cl_device);</div><div class='add'>+	if (!loader_ishtp_cl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ishtp_set_drvdata(cl_device, loader_ishtp_cl);</div><div class='add'>+	ishtp_set_client_data(loader_ishtp_cl, client_data);</div><div class='add'>+	client_data-&gt;loader_ishtp_cl = loader_ishtp_cl;</div><div class='add'>+	client_data-&gt;cl_device = cl_device;</div><div class='add'>+</div><div class='add'>+	rv = loader_init(loader_ishtp_cl, 1);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(ishtp_device(cl_device), "Reset Failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ISH firmware loading from host */</div><div class='add'>+	load_fw_from_host(client_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * loader_ishtp_cl_probe() - ISH-TP client driver probe</div><div class='add'>+ * @cl_device:		ISH-TP client device instance</div><div class='add'>+ *</div><div class='add'>+ * This function gets called on device create on ISH-TP bus</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, negative error code for failure</div><div class='add'>+ */</div><div class='add'>+static int loader_ishtp_cl_probe(struct ishtp_cl_device *cl_device)</div><div class='add'>+{</div><div class='add'>+	struct ishtp_cl *loader_ishtp_cl;</div><div class='add'>+	struct ishtp_cl_data *client_data;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	client_data = devm_kzalloc(ishtp_device(cl_device),</div><div class='add'>+				   sizeof(*client_data),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!client_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	loader_ishtp_cl = ishtp_cl_allocate(cl_device);</div><div class='add'>+	if (!loader_ishtp_cl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ishtp_set_drvdata(cl_device, loader_ishtp_cl);</div><div class='add'>+	ishtp_set_client_data(loader_ishtp_cl, client_data);</div><div class='add'>+	client_data-&gt;loader_ishtp_cl = loader_ishtp_cl;</div><div class='add'>+	client_data-&gt;cl_device = cl_device;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;client_data-&gt;response.wait_queue);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;client_data-&gt;work_ishtp_reset,</div><div class='add'>+		  reset_handler);</div><div class='add'>+	INIT_WORK(&amp;client_data-&gt;work_fw_load,</div><div class='add'>+		  load_fw_from_host_handler);</div><div class='add'>+</div><div class='add'>+	rv = loader_init(loader_ishtp_cl, 0);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		ishtp_cl_free(loader_ishtp_cl);</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+	ishtp_get_device(cl_device);</div><div class='add'>+</div><div class='add'>+	client_data-&gt;retry_count = 0;</div><div class='add'>+</div><div class='add'>+	/* ISH firmware loading from host */</div><div class='add'>+	schedule_work(&amp;client_data-&gt;work_fw_load);</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'>+ * loader_ishtp_cl_remove() - ISH-TP client driver remove</div><div class='add'>+ * @cl_device:		ISH-TP client device instance</div><div class='add'>+ *</div><div class='add'>+ * This function gets called on device remove on ISH-TP bus</div><div class='add'>+ *</div><div class='add'>+ * Return: 0</div><div class='add'>+ */</div><div class='add'>+static int loader_ishtp_cl_remove(struct ishtp_cl_device *cl_device)</div><div class='add'>+{</div><div class='add'>+	struct ishtp_cl_data *client_data;</div><div class='add'>+	struct ishtp_cl	*loader_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='add'>+</div><div class='add'>+	client_data = ishtp_get_client_data(loader_ishtp_cl);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The sequence of the following two cancel_work_sync() is</div><div class='add'>+	 * important. The work_fw_load can in turn schedue</div><div class='add'>+	 * work_ishtp_reset, so first cancel work_fw_load then</div><div class='add'>+	 * cancel work_ishtp_reset.</div><div class='add'>+	 */</div><div class='add'>+	cancel_work_sync(&amp;client_data-&gt;work_fw_load);</div><div class='add'>+	cancel_work_sync(&amp;client_data-&gt;work_ishtp_reset);</div><div class='add'>+	loader_deinit(loader_ishtp_cl);</div><div class='add'>+	ishtp_put_device(cl_device);</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'>+ * loader_ishtp_cl_reset() - ISH-TP client driver reset</div><div class='add'>+ * @cl_device:		ISH-TP client device instance</div><div class='add'>+ *</div><div class='add'>+ * This function gets called on device reset on ISH-TP bus</div><div class='add'>+ *</div><div class='add'>+ * Return: 0</div><div class='add'>+ */</div><div class='add'>+static int loader_ishtp_cl_reset(struct ishtp_cl_device *cl_device)</div><div class='add'>+{</div><div class='add'>+	struct ishtp_cl_data *client_data;</div><div class='add'>+	struct ishtp_cl	*loader_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='add'>+</div><div class='add'>+	client_data = ishtp_get_client_data(loader_ishtp_cl);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;client_data-&gt;work_ishtp_reset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ishtp_cl_driver	loader_ishtp_cl_driver = {</div><div class='add'>+	.name = "ish-loader",</div><div class='add'>+	.guid = &amp;loader_ishtp_guid,</div><div class='add'>+	.probe = loader_ishtp_cl_probe,</div><div class='add'>+	.remove = loader_ishtp_cl_remove,</div><div class='add'>+	.reset = loader_ishtp_cl_reset,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ish_loader_init(void)</div><div class='add'>+{</div><div class='add'>+	return ishtp_cl_driver_register(&amp;loader_ishtp_cl_driver, THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ish_loader_exit(void)</div><div class='add'>+{</div><div class='add'>+	ishtp_cl_driver_unregister(&amp;loader_ishtp_cl_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(ish_loader_init);</div><div class='add'>+module_exit(ish_loader_exit);</div><div class='add'>+</div><div class='add'>+module_param(dma_buf_size_limit, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(dma_buf_size_limit, "Limit the DMA buf size to this value in bytes");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("ISH ISH-TP Host firmware Loader Client Driver");</div><div class='add'>+MODULE_AUTHOR("Rushikesh S Kadam &lt;rushikesh.s.kadam@intel.com&gt;");</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("ishtp:*");</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp-hid-client.c b/drivers/hid/intel-ish-hid/ishtp-hid-client.c<br/>index 30fe0c5e6fad..56777a43e69c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-hid-client.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-hid-client.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-hid-client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp-hid-client.c</a></div><div class='hunk'>@@ -15,15 +15,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/intel-ish-client-if.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include "ishtp/ishtp-dev.h"</div><div class='del'>-#include "ishtp/client.h"</div><div class='ctx'> #include "ishtp-hid.h"</div><div class='ctx'> </div><div class='ctx'> /* Rx ring buffer pool size */</div><div class='ctx'> #define HID_CL_RX_RING_SIZE	32</div><div class='ctx'> #define HID_CL_TX_RING_SIZE	16</div><div class='ctx'> </div><div class='add'>+#define cl_data_to_dev(client_data) ishtp_device(client_data-&gt;cl_device)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * report_bad_packets() - Report bad packets</div><div class='ctx'>  * @hid_ishtp_cl:	Client instance to get stats</div><div class='hunk'>@@ -37,9 +38,9 @@ static void report_bad_packet(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 			      size_t cur_pos,  size_t payload_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct hostif_msg *recv_msg = recv_buf;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> </div><div class='del'>-	dev_err(&amp;client_data-&gt;cl_device-&gt;dev, "[hid-ish]: BAD packet %02X\n"</div><div class='add'>+	dev_err(cl_data_to_dev(client_data), "[hid-ish]: BAD packet %02X\n"</div><div class='ctx'> 		"total_bad=%u cur_pos=%u\n"</div><div class='ctx'> 		"[%02X %02X %02X %02X]\n"</div><div class='ctx'> 		"payload_len=%u\n"</div><div class='hunk'>@@ -69,13 +70,15 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 	unsigned char *payload;</div><div class='ctx'> 	struct device_info *dev_info;</div><div class='ctx'> 	int i, j;</div><div class='del'>-	size_t	payload_len, total_len, cur_pos;</div><div class='add'>+	size_t	payload_len, total_len, cur_pos, raw_len;</div><div class='ctx'> 	int report_type;</div><div class='ctx'> 	struct report_list *reports_list;</div><div class='ctx'> 	char *reports;</div><div class='ctx'> 	size_t report_len;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> 	int curr_hid_dev = client_data-&gt;cur_hid_dev;</div><div class='add'>+	struct ishtp_hid_data *hid_data = NULL;</div><div class='add'>+	struct hid_device *hid = NULL;</div><div class='ctx'> </div><div class='ctx'> 	payload = recv_buf + sizeof(struct hostif_msg_hdr);</div><div class='ctx'> 	total_len = data_len;</div><div class='hunk'>@@ -83,12 +86,12 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if (cur_pos + sizeof(struct hostif_msg) &gt; total_len) {</div><div class='del'>-			dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+			dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 				"[hid-ish]: error, received %u which is less than data header %u\n",</div><div class='ctx'> 				(unsigned int)data_len,</div><div class='ctx'> 				(unsigned int)sizeof(struct hostif_msg_hdr));</div><div class='ctx'> 			++client_data-&gt;bad_recv_cnt;</div><div class='del'>-			ish_hw_reset(hid_ishtp_cl-&gt;dev);</div><div class='add'>+			ish_hw_reset(ishtp_get_ishtp_device(hid_ishtp_cl));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +104,7 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 			++client_data-&gt;bad_recv_cnt;</div><div class='ctx'> 			report_bad_packet(hid_ishtp_cl, recv_msg, cur_pos,</div><div class='ctx'> 					  payload_len);</div><div class='del'>-			ish_hw_reset(hid_ishtp_cl-&gt;dev);</div><div class='add'>+			ish_hw_reset(ishtp_get_ishtp_device(hid_ishtp_cl));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -116,18 +119,18 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 				report_bad_packet(hid_ishtp_cl, recv_msg,</div><div class='ctx'> 						  cur_pos,</div><div class='ctx'> 						  payload_len);</div><div class='del'>-				ish_hw_reset(hid_ishtp_cl-&gt;dev);</div><div class='add'>+				ish_hw_reset(ishtp_get_ishtp_device(hid_ishtp_cl));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			client_data-&gt;hid_dev_count = (unsigned int)*payload;</div><div class='ctx'> 			if (!client_data-&gt;hid_devices)</div><div class='ctx'> 				client_data-&gt;hid_devices = devm_kcalloc(</div><div class='del'>-						&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+						cl_data_to_dev(client_data),</div><div class='ctx'> 						client_data-&gt;hid_dev_count,</div><div class='ctx'> 						sizeof(struct device_info),</div><div class='ctx'> 						GFP_KERNEL);</div><div class='ctx'> 			if (!client_data-&gt;hid_devices) {</div><div class='del'>-				dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+				dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 				"Mem alloc failed for hid device info\n");</div><div class='ctx'> 				wake_up_interruptible(&amp;client_data-&gt;init_wait);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -135,7 +138,7 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 			for (i = 0; i &lt; client_data-&gt;hid_dev_count; ++i) {</div><div class='ctx'> 				if (1 + sizeof(struct device_info) * i &gt;=</div><div class='ctx'> 						payload_len) {</div><div class='del'>-					dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+					dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 						"[hid-ish]: [ENUM_DEVICES]: content size %zu is bigger than payload_len %zu\n",</div><div class='ctx'> 						1 + sizeof(struct device_info)</div><div class='ctx'> 						* i, payload_len);</div><div class='hunk'>@@ -165,12 +168,12 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 				report_bad_packet(hid_ishtp_cl, recv_msg,</div><div class='ctx'> 						  cur_pos,</div><div class='ctx'> 						  payload_len);</div><div class='del'>-				ish_hw_reset(hid_ishtp_cl-&gt;dev);</div><div class='add'>+				ish_hw_reset(ishtp_get_ishtp_device(hid_ishtp_cl));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!client_data-&gt;hid_descr[curr_hid_dev])</div><div class='ctx'> 				client_data-&gt;hid_descr[curr_hid_dev] =</div><div class='del'>-				devm_kmalloc(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+				devm_kmalloc(cl_data_to_dev(client_data),</div><div class='ctx'> 					     payload_len, GFP_KERNEL);</div><div class='ctx'> 			if (client_data-&gt;hid_descr[curr_hid_dev]) {</div><div class='ctx'> 				memcpy(client_data-&gt;hid_descr[curr_hid_dev],</div><div class='hunk'>@@ -190,12 +193,12 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,</div><div class='ctx'> 				report_bad_packet(hid_ishtp_cl, recv_msg,</div><div class='ctx'> 						  cur_pos,</div><div class='ctx'> 						  payload_len);</div><div class='del'>-				ish_hw_reset(hid_ishtp_cl-&gt;dev);</div><div class='add'>+				ish_hw_reset(ishtp_get_ishtp_device(hid_ishtp_cl));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!client_data-&gt;report_descr[curr_hid_dev])</div><div class='ctx'> 				client_data-&gt;report_descr[curr_hid_dev] =</div><div class='del'>-				devm_kmalloc(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+				devm_kmalloc(cl_data_to_dev(client_data),</div><div class='ctx'> 					     payload_len, GFP_KERNEL);</div><div class='ctx'> 			if (client_data-&gt;report_descr[curr_hid_dev])  {</div><div class='ctx'> 				memcpy(client_data-&gt;report_descr[curr_hid_dev],</div><div class='hunk'>@@ -219,18 +222,31 @@ do_get_report:</div><div class='ctx'> 			/* Get index of device that matches this id */</div><div class='ctx'> 			for (i = 0; i &lt; client_data-&gt;num_hid_devices; ++i) {</div><div class='ctx'> 				if (recv_msg-&gt;hdr.device_id ==</div><div class='del'>-					client_data-&gt;hid_devices[i].dev_id)</div><div class='del'>-					if (client_data-&gt;hid_sensor_hubs[i]) {</div><div class='del'>-						hid_input_report(</div><div class='del'>-						client_data-&gt;hid_sensor_hubs[</div><div class='del'>-									i],</div><div class='del'>-						report_type, payload,</div><div class='del'>-						payload_len, 0);</div><div class='del'>-						ishtp_hid_wakeup(</div><div class='del'>-						client_data-&gt;hid_sensor_hubs[</div><div class='del'>-							i]);</div><div class='add'>+					  client_data-&gt;hid_devices[i].dev_id) {</div><div class='add'>+					hid = client_data-&gt;hid_sensor_hubs[i];</div><div class='add'>+					if (!hid)</div><div class='ctx'> 						break;</div><div class='add'>+</div><div class='add'>+					hid_data = hid-&gt;driver_data;</div><div class='add'>+					if (hid_data-&gt;raw_get_req) {</div><div class='add'>+						raw_len =</div><div class='add'>+						  (hid_data-&gt;raw_buf_size &lt;</div><div class='add'>+								payload_len) ?</div><div class='add'>+						  hid_data-&gt;raw_buf_size :</div><div class='add'>+						  payload_len;</div><div class='add'>+</div><div class='add'>+						memcpy(hid_data-&gt;raw_buf,</div><div class='add'>+						       payload, raw_len);</div><div class='add'>+					} else {</div><div class='add'>+						hid_input_report</div><div class='add'>+							(hid, report_type,</div><div class='add'>+							 payload, payload_len,</div><div class='add'>+							 0);</div><div class='ctx'> 					}</div><div class='add'>+</div><div class='add'>+					ishtp_hid_wakeup(hid);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +311,7 @@ do_get_report:</div><div class='ctx'> 			++client_data-&gt;bad_recv_cnt;</div><div class='ctx'> 			report_bad_packet(hid_ishtp_cl, recv_msg, cur_pos,</div><div class='ctx'> 					  payload_len);</div><div class='del'>-			ish_hw_reset(hid_ishtp_cl-&gt;dev);</div><div class='add'>+			ish_hw_reset(ishtp_get_ishtp_device(hid_ishtp_cl));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='hunk'>@@ -475,7 +491,7 @@ int ishtp_hid_link_ready_wait(struct ishtp_cl_data *client_data)</div><div class='ctx'> static int ishtp_enum_enum_devices(struct ishtp_cl *hid_ishtp_cl)</div><div class='ctx'> {</div><div class='ctx'> 	struct hostif_msg msg;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> 	int retry_count;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='hunk'>@@ -501,18 +517,18 @@ static int ishtp_enum_enum_devices(struct ishtp_cl *hid_ishtp_cl)</div><div class='ctx'> 					   sizeof(struct hostif_msg));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!client_data-&gt;enum_devices_done) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 			"[hid-ish]: timed out waiting for enum_devices\n");</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!client_data-&gt;hid_devices) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 			"[hid-ish]: failed to allocate HID dev structures\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	client_data-&gt;num_hid_devices = client_data-&gt;hid_dev_count;</div><div class='del'>-	dev_info(&amp;hid_ishtp_cl-&gt;device-&gt;dev,</div><div class='add'>+	dev_info(ishtp_device(client_data-&gt;cl_device),</div><div class='ctx'> 		"[hid-ish]: enum_devices_done OK, num_hid_devices=%d\n",</div><div class='ctx'> 		client_data-&gt;num_hid_devices);</div><div class='ctx'> </div><div class='hunk'>@@ -531,7 +547,7 @@ static int ishtp_enum_enum_devices(struct ishtp_cl *hid_ishtp_cl)</div><div class='ctx'> static int ishtp_get_hid_descriptor(struct ishtp_cl *hid_ishtp_cl, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hostif_msg msg;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='ctx'> 	/* Get HID descriptor */</div><div class='hunk'>@@ -549,13 +565,13 @@ static int ishtp_get_hid_descriptor(struct ishtp_cl *hid_ishtp_cl, int index)</div><div class='ctx'> 						 client_data-&gt;hid_descr_done,</div><div class='ctx'> 						 3 * HZ);</div><div class='ctx'> 		if (!client_data-&gt;hid_descr_done) {</div><div class='del'>-			dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+			dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 				"[hid-ish]: timed out for hid_descr_done\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!client_data-&gt;hid_descr[index]) {</div><div class='del'>-			dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+			dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 				"[hid-ish]: allocation HID desc fail\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -578,7 +594,7 @@ static int ishtp_get_report_descriptor(struct ishtp_cl *hid_ishtp_cl,</div><div class='ctx'> 				       int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hostif_msg msg;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='ctx'> 	/* Get report descriptor */</div><div class='hunk'>@@ -596,12 +612,12 @@ static int ishtp_get_report_descriptor(struct ishtp_cl *hid_ishtp_cl,</div><div class='ctx'> 					 client_data-&gt;report_descr_done,</div><div class='ctx'> 					 3 * HZ);</div><div class='ctx'> 	if (!client_data-&gt;report_descr_done) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 				"[hid-ish]: timed out for report descr\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!client_data-&gt;report_descr[index]) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 			"[hid-ish]: failed to alloc report descr\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -626,42 +642,42 @@ static int ishtp_get_report_descriptor(struct ishtp_cl *hid_ishtp_cl,</div><div class='ctx'> static int hid_ishtp_cl_init(struct ishtp_cl *hid_ishtp_cl, int reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ishtp_device *dev;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> 	struct ishtp_fw_client *fw_client;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;client_data-&gt;cl_device-&gt;dev, "%s\n", __func__);</div><div class='add'>+	dev_dbg(cl_data_to_dev(client_data), "%s\n", __func__);</div><div class='ctx'> 	hid_ishtp_trace(client_data,  "%s reset flag: %d\n", __func__, reset);</div><div class='ctx'> </div><div class='del'>-	rv = ishtp_cl_link(hid_ishtp_cl, ISHTP_HOST_CLIENT_ID_ANY);</div><div class='add'>+	rv = ishtp_cl_link(hid_ishtp_cl);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 			"ishtp_cl_link failed\n");</div><div class='ctx'> 		return	-ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	client_data-&gt;init_done = 0;</div><div class='ctx'> </div><div class='del'>-	dev = hid_ishtp_cl-&gt;dev;</div><div class='add'>+	dev = ishtp_get_ishtp_device(hid_ishtp_cl);</div><div class='ctx'> </div><div class='ctx'> 	/* Connect to FW client */</div><div class='del'>-	hid_ishtp_cl-&gt;rx_ring_size = HID_CL_RX_RING_SIZE;</div><div class='del'>-	hid_ishtp_cl-&gt;tx_ring_size = HID_CL_TX_RING_SIZE;</div><div class='add'>+	ishtp_set_tx_ring_size(hid_ishtp_cl, HID_CL_TX_RING_SIZE);</div><div class='add'>+	ishtp_set_rx_ring_size(hid_ishtp_cl, HID_CL_RX_RING_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	fw_client = ishtp_fw_cl_get_client(dev, &amp;hid_ishtp_guid);</div><div class='ctx'> 	if (!fw_client) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 			"ish client uuid not found\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hid_ishtp_cl-&gt;fw_client_id = fw_client-&gt;client_id;</div><div class='del'>-	hid_ishtp_cl-&gt;state = ISHTP_CL_CONNECTING;</div><div class='add'>+	ishtp_cl_set_fw_client_id(hid_ishtp_cl,</div><div class='add'>+				  ishtp_get_fw_client_id(fw_client));</div><div class='add'>+	ishtp_set_connection_state(hid_ishtp_cl, ISHTP_CL_CONNECTING);</div><div class='ctx'> </div><div class='ctx'> 	rv = ishtp_cl_connect(hid_ishtp_cl);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+		dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 			"client connect fail\n");</div><div class='ctx'> 		goto err_cl_unlink;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -669,7 +685,7 @@ static int hid_ishtp_cl_init(struct ishtp_cl *hid_ishtp_cl, int reset)</div><div class='ctx'> 	hid_ishtp_trace(client_data,  "%s client connected\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Register read callback */</div><div class='del'>-	ishtp_register_event_cb(hid_ishtp_cl-&gt;device, ish_cl_event_cb);</div><div class='add'>+	ishtp_register_event_cb(client_data-&gt;cl_device, ish_cl_event_cb);</div><div class='ctx'> </div><div class='ctx'> 	rv = ishtp_enum_enum_devices(hid_ishtp_cl);</div><div class='ctx'> 	if (rv)</div><div class='hunk'>@@ -692,7 +708,7 @@ static int hid_ishtp_cl_init(struct ishtp_cl *hid_ishtp_cl, int reset)</div><div class='ctx'> 		if (!reset) {</div><div class='ctx'> 			rv = ishtp_hid_probe(i, client_data);</div><div class='ctx'> 			if (rv) {</div><div class='del'>-				dev_err(&amp;client_data-&gt;cl_device-&gt;dev,</div><div class='add'>+				dev_err(cl_data_to_dev(client_data),</div><div class='ctx'> 				"[hid-ish]: HID probe for #%u failed: %d\n",</div><div class='ctx'> 				i, rv);</div><div class='ctx'> 				goto err_cl_disconnect;</div><div class='hunk'>@@ -707,7 +723,7 @@ static int hid_ishtp_cl_init(struct ishtp_cl *hid_ishtp_cl, int reset)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_cl_disconnect:</div><div class='del'>-	hid_ishtp_cl-&gt;state = ISHTP_CL_DISCONNECTING;</div><div class='add'>+	ishtp_set_connection_state(hid_ishtp_cl, ISHTP_CL_DISCONNECTING);</div><div class='ctx'> 	ishtp_cl_disconnect(hid_ishtp_cl);</div><div class='ctx'> err_cl_unlink:</div><div class='ctx'> 	ishtp_cl_unlink(hid_ishtp_cl);</div><div class='hunk'>@@ -744,16 +760,16 @@ static void hid_ishtp_cl_reset_handler(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_trace(client_data, "%s hid_ishtp_cl %p\n", __func__,</div><div class='ctx'> 			hid_ishtp_cl);</div><div class='del'>-	dev_dbg(&amp;cl_device-&gt;dev, "%s\n", __func__);</div><div class='add'>+	dev_dbg(ishtp_device(client_data-&gt;cl_device), "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_cl_deinit(hid_ishtp_cl);</div><div class='ctx'> </div><div class='del'>-	hid_ishtp_cl = ishtp_cl_allocate(cl_device-&gt;ishtp_dev);</div><div class='add'>+	hid_ishtp_cl = ishtp_cl_allocate(cl_device);</div><div class='ctx'> 	if (!hid_ishtp_cl)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ishtp_set_drvdata(cl_device, hid_ishtp_cl);</div><div class='del'>-	hid_ishtp_cl-&gt;client_data = client_data;</div><div class='add'>+	ishtp_set_client_data(hid_ishtp_cl, client_data);</div><div class='ctx'> 	client_data-&gt;hid_ishtp_cl = hid_ishtp_cl;</div><div class='ctx'> </div><div class='ctx'> 	client_data-&gt;num_hid_devices = 0;</div><div class='hunk'>@@ -762,15 +778,17 @@ static void hid_ishtp_cl_reset_handler(struct work_struct *work)</div><div class='ctx'> 		rv = hid_ishtp_cl_init(hid_ishtp_cl, 1);</div><div class='ctx'> 		if (!rv)</div><div class='ctx'> 			break;</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev, "Retry reset init\n");</div><div class='add'>+		dev_err(cl_data_to_dev(client_data), "Retry reset init\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		dev_err(&amp;client_data-&gt;cl_device-&gt;dev, "Reset Failed\n");</div><div class='add'>+		dev_err(cl_data_to_dev(client_data), "Reset Failed\n");</div><div class='ctx'> 		hid_ishtp_trace(client_data, "%s Failed hid_ishtp_cl %p\n",</div><div class='ctx'> 				__func__, hid_ishtp_cl);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void (*hid_print_trace)(void *unused, const char *format, ...);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * hid_ishtp_cl_probe() - ISHTP client driver probe</div><div class='ctx'>  * @cl_device:		ISHTP client device instance</div><div class='hunk'>@@ -788,21 +806,18 @@ static int hid_ishtp_cl_probe(struct ishtp_cl_device *cl_device)</div><div class='ctx'> 	if (!cl_device)</div><div class='ctx'> 		return	-ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!guid_equal(&amp;hid_ishtp_guid,</div><div class='del'>-			&amp;cl_device-&gt;fw_client-&gt;props.protocol_name))</div><div class='del'>-		return	-ENODEV;</div><div class='del'>-</div><div class='del'>-	client_data = devm_kzalloc(&amp;cl_device-&gt;dev, sizeof(*client_data),</div><div class='add'>+	client_data = devm_kzalloc(ishtp_device(cl_device),</div><div class='add'>+				   sizeof(*client_data),</div><div class='ctx'> 				   GFP_KERNEL);</div><div class='ctx'> 	if (!client_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	hid_ishtp_cl = ishtp_cl_allocate(cl_device-&gt;ishtp_dev);</div><div class='add'>+	hid_ishtp_cl = ishtp_cl_allocate(cl_device);</div><div class='ctx'> 	if (!hid_ishtp_cl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ishtp_set_drvdata(cl_device, hid_ishtp_cl);</div><div class='del'>-	hid_ishtp_cl-&gt;client_data = client_data;</div><div class='add'>+	ishtp_set_client_data(hid_ishtp_cl, client_data);</div><div class='ctx'> 	client_data-&gt;hid_ishtp_cl = hid_ishtp_cl;</div><div class='ctx'> 	client_data-&gt;cl_device = cl_device;</div><div class='ctx'> </div><div class='hunk'>@@ -811,6 +826,8 @@ static int hid_ishtp_cl_probe(struct ishtp_cl_device *cl_device)</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;client_data-&gt;work, hid_ishtp_cl_reset_handler);</div><div class='ctx'> </div><div class='add'>+	hid_print_trace = ishtp_trace_callback(cl_device);</div><div class='add'>+</div><div class='ctx'> 	rv = hid_ishtp_cl_init(hid_ishtp_cl, 0);</div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		ishtp_cl_free(hid_ishtp_cl);</div><div class='hunk'>@@ -832,13 +849,13 @@ static int hid_ishtp_cl_probe(struct ishtp_cl_device *cl_device)</div><div class='ctx'> static int hid_ishtp_cl_remove(struct ishtp_cl_device *cl_device)</div><div class='ctx'> {</div><div class='ctx'> 	struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_trace(client_data, "%s hid_ishtp_cl %p\n", __func__,</div><div class='ctx'> 			hid_ishtp_cl);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;cl_device-&gt;dev, "%s\n", __func__);</div><div class='del'>-	hid_ishtp_cl-&gt;state = ISHTP_CL_DISCONNECTING;</div><div class='add'>+	dev_dbg(ishtp_device(cl_device), "%s\n", __func__);</div><div class='add'>+	ishtp_set_connection_state(hid_ishtp_cl, ISHTP_CL_DISCONNECTING);</div><div class='ctx'> 	ishtp_cl_disconnect(hid_ishtp_cl);</div><div class='ctx'> 	ishtp_put_device(cl_device);</div><div class='ctx'> 	ishtp_hid_remove(client_data);</div><div class='hunk'>@@ -862,7 +879,7 @@ static int hid_ishtp_cl_remove(struct ishtp_cl_device *cl_device)</div><div class='ctx'> static int hid_ishtp_cl_reset(struct ishtp_cl_device *cl_device)</div><div class='ctx'> {</div><div class='ctx'> 	struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_trace(client_data, "%s hid_ishtp_cl %p\n", __func__,</div><div class='ctx'> 			hid_ishtp_cl);</div><div class='hunk'>@@ -872,8 +889,6 @@ static int hid_ishtp_cl_reset(struct ishtp_cl_device *cl_device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define to_ishtp_cl_device(d) container_of(d, struct ishtp_cl_device, dev)</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * hid_ishtp_cl_suspend() - ISHTP client driver suspend</div><div class='ctx'>  * @device:	device instance</div><div class='hunk'>@@ -884,9 +899,9 @@ static int hid_ishtp_cl_reset(struct ishtp_cl_device *cl_device)</div><div class='ctx'>  */</div><div class='ctx'> static int hid_ishtp_cl_suspend(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct ishtp_cl_device *cl_device = to_ishtp_cl_device(device);</div><div class='add'>+	struct ishtp_cl_device *cl_device = dev_get_drvdata(device);</div><div class='ctx'> 	struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_trace(client_data, "%s hid_ishtp_cl %p\n", __func__,</div><div class='ctx'> 			hid_ishtp_cl);</div><div class='hunk'>@@ -905,9 +920,9 @@ static int hid_ishtp_cl_suspend(struct device *device)</div><div class='ctx'>  */</div><div class='ctx'> static int hid_ishtp_cl_resume(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct ishtp_cl_device *cl_device = to_ishtp_cl_device(device);</div><div class='add'>+	struct ishtp_cl_device *cl_device = dev_get_drvdata(device);</div><div class='ctx'> 	struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device);</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_ishtp_cl-&gt;client_data;</div><div class='add'>+	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_trace(client_data, "%s hid_ishtp_cl %p\n", __func__,</div><div class='ctx'> 			hid_ishtp_cl);</div><div class='hunk'>@@ -922,6 +937,7 @@ static const struct dev_pm_ops hid_ishtp_pm_ops = {</div><div class='ctx'> </div><div class='ctx'> static struct ishtp_cl_driver	hid_ishtp_cl_driver = {</div><div class='ctx'> 	.name = "ish-hid",</div><div class='add'>+	.guid = &amp;hid_ishtp_guid,</div><div class='ctx'> 	.probe = hid_ishtp_cl_probe,</div><div class='ctx'> 	.remove = hid_ishtp_cl_remove,</div><div class='ctx'> 	.reset = hid_ishtp_cl_reset,</div><div class='hunk'>@@ -933,7 +949,7 @@ static int __init ish_hid_init(void)</div><div class='ctx'> 	int	rv;</div><div class='ctx'> </div><div class='ctx'> 	/* Register ISHTP client device driver with ISHTP Bus */</div><div class='del'>-	rv = ishtp_cl_driver_register(&amp;hid_ishtp_cl_driver);</div><div class='add'>+	rv = ishtp_cl_driver_register(&amp;hid_ishtp_cl_driver, THIS_MODULE);</div><div class='ctx'> </div><div class='ctx'> 	return rv;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c<br/>index bc4c536f3c0d..62c03561adaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-hid.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-hid.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-hid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp-hid.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/intel-ish-client-if.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/input.h&gt;</div><div class='del'>-#include "ishtp/client.h"</div><div class='ctx'> #include "ishtp-hid.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -59,10 +59,46 @@ static void ishtp_hid_close(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ishtp_raw_request(struct hid_device *hdev, unsigned char reportnum,</div><div class='del'>-	__u8 *buf, size_t len, unsigned char rtype, int reqtype)</div><div class='add'>+static int ishtp_raw_request(struct hid_device *hid, unsigned char reportnum,</div><div class='add'>+			     __u8 *buf, size_t len, unsigned char rtype,</div><div class='add'>+			     int reqtype)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	struct ishtp_hid_data *hid_data =  hid-&gt;driver_data;</div><div class='add'>+	char *ishtp_buf = NULL;</div><div class='add'>+	size_t ishtp_buf_len;</div><div class='add'>+	unsigned int header_size = sizeof(struct hostif_msg);</div><div class='add'>+</div><div class='add'>+	if (rtype == HID_OUTPUT_REPORT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hid_data-&gt;request_done = false;</div><div class='add'>+	switch (reqtype) {</div><div class='add'>+	case HID_REQ_GET_REPORT:</div><div class='add'>+		hid_data-&gt;raw_buf = buf;</div><div class='add'>+		hid_data-&gt;raw_buf_size = len;</div><div class='add'>+		hid_data-&gt;raw_get_req = true;</div><div class='add'>+</div><div class='add'>+		hid_ishtp_get_report(hid, reportnum, rtype);</div><div class='add'>+		break;</div><div class='add'>+	case HID_REQ_SET_REPORT:</div><div class='add'>+		/*</div><div class='add'>+		 * Spare 7 bytes for 64b accesses through</div><div class='add'>+		 * get/put_unaligned_le64()</div><div class='add'>+		 */</div><div class='add'>+		ishtp_buf_len = len + header_size;</div><div class='add'>+		ishtp_buf = kzalloc(ishtp_buf_len + 7, GFP_KERNEL);</div><div class='add'>+		if (!ishtp_buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		memcpy(ishtp_buf + header_size, buf, len);</div><div class='add'>+		hid_ishtp_set_feature(hid, ishtp_buf, ishtp_buf_len, reportnum);</div><div class='add'>+		kfree(ishtp_buf);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hid_hw_wait(hid);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -87,6 +123,7 @@ static void ishtp_hid_request(struct hid_device *hid, struct hid_report *rep,</div><div class='ctx'> 	hid_data-&gt;request_done = false;</div><div class='ctx'> 	switch (reqtype) {</div><div class='ctx'> 	case HID_REQ_GET_REPORT:</div><div class='add'>+		hid_data-&gt;raw_get_req = false;</div><div class='ctx'> 		hid_ishtp_get_report(hid, rep-&gt;id, rep-&gt;type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HID_REQ_SET_REPORT:</div><div class='hunk'>@@ -116,7 +153,6 @@ static void ishtp_hid_request(struct hid_device *hid, struct hid_report *rep,</div><div class='ctx'> static int ishtp_wait_for_response(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ishtp_hid_data *hid_data =  hid-&gt;driver_data;</div><div class='del'>-	struct ishtp_cl_data *client_data = hid_data-&gt;client_data;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='ctx'> 	hid_ishtp_trace(client_data,  "%s hid %p\n", __func__, hid);</div><div class='hunk'>@@ -204,7 +240,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,</div><div class='ctx'> </div><div class='ctx'> 	hid-&gt;ll_driver = &amp;ishtp_hid_ll_driver;</div><div class='ctx'> 	hid-&gt;bus = BUS_INTEL_ISHTP;</div><div class='del'>-	hid-&gt;dev.parent = &amp;client_data-&gt;cl_device-&gt;dev;</div><div class='add'>+	hid-&gt;dev.parent = ishtp_device(client_data-&gt;cl_device);</div><div class='add'>+</div><div class='ctx'> 	hid-&gt;version = le16_to_cpu(ISH_HID_VERSION);</div><div class='ctx'> 	hid-&gt;vendor = le16_to_cpu(client_data-&gt;hid_devices[cur_hid_dev].vid);</div><div class='ctx'> 	hid-&gt;product = le16_to_cpu(client_data-&gt;hid_devices[cur_hid_dev].pid);</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.h b/drivers/hid/intel-ish-hid/ishtp-hid.h<br/>index 1cd07a441cd4..e27d3d6c1920 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-hid.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp-hid.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp-hid.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp-hid.h</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #define	IS_RESPONSE	0x80</div><div class='ctx'> </div><div class='ctx'> /* Used to dump to Linux trace buffer, if enabled */</div><div class='del'>-#define hid_ishtp_trace(client, ...)	\</div><div class='del'>-	client-&gt;cl_device-&gt;ishtp_dev-&gt;print_log(\</div><div class='del'>-		client-&gt;cl_device-&gt;ishtp_dev, __VA_ARGS__)</div><div class='add'>+extern void (*hid_print_trace)(void *unused, const char *format, ...);</div><div class='add'>+#define hid_ishtp_trace(client, ...) \</div><div class='add'>+		(hid_print_trace)(NULL, __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /* ISH Transport protocol (ISHTP in short) GUID */</div><div class='ctx'> static const guid_t hid_ishtp_guid =</div><div class='hunk'>@@ -159,6 +159,9 @@ struct ishtp_cl_data {</div><div class='ctx'>  * @client_data:	Link to the client instance</div><div class='ctx'>  * @hid_wait:		Completion waitq</div><div class='ctx'>  *</div><div class='add'>+ * @raw_get_req:	Flag indicating raw get request ongoing</div><div class='add'>+ * @raw_buf:		raw request buffer filled on receiving get report</div><div class='add'>+ * @raw_buf_size:	raw request buffer size</div><div class='ctx'>  * Used to tie hid hid-&gt;driver data to driver client instance</div><div class='ctx'>  */</div><div class='ctx'> struct ishtp_hid_data {</div><div class='hunk'>@@ -166,6 +169,11 @@ struct ishtp_hid_data {</div><div class='ctx'> 	bool request_done;</div><div class='ctx'> 	struct ishtp_cl_data *client_data;</div><div class='ctx'> 	wait_queue_head_t hid_wait;</div><div class='add'>+</div><div class='add'>+	/* raw request */</div><div class='add'>+	bool raw_get_req;</div><div class='add'>+	u8 *raw_buf;</div><div class='add'>+	size_t raw_buf_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Interface functions between HID LL driver and ISH TP client */</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c b/drivers/hid/intel-ish-hid/ishtp/bus.c<br/>index d5f4b6438d86..fb8ca12955b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp/bus.c</a></div><div class='hunk'>@@ -171,6 +171,19 @@ struct ishtp_fw_client *ishtp_fw_cl_get_client(struct ishtp_device *dev,</div><div class='ctx'> EXPORT_SYMBOL(ishtp_fw_cl_get_client);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ishtp_get_fw_client_id() - Get fw client id</div><div class='add'>+ *</div><div class='add'>+ * This interface is used to reset HW get FW client id.</div><div class='add'>+ *</div><div class='add'>+ * Return: firmware client id.</div><div class='add'>+ */</div><div class='add'>+int ishtp_get_fw_client_id(struct ishtp_fw_client *fw_client)</div><div class='add'>+{</div><div class='add'>+	return fw_client-&gt;client_id;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_get_fw_client_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ishtp_fw_cl_by_id() - return index to fw_clients for client_id</div><div class='ctx'>  * @dev: the ishtp device structure</div><div class='ctx'>  * @client_id: fw client id to search</div><div class='hunk'>@@ -220,6 +233,26 @@ static int ishtp_cl_device_probe(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ishtp_cl_bus_match() - Bus match() callback</div><div class='add'>+ * @dev: the device structure</div><div class='add'>+ * @drv: the driver structure</div><div class='add'>+ *</div><div class='add'>+ * This is a bus match callback, called when a new ishtp_cl_device is</div><div class='add'>+ * registered during ishtp bus client enumeration. Use the guid_t in</div><div class='add'>+ * drv and dev to decide whether they match or not.</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if dev &amp; drv matches, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int ishtp_cl_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct ishtp_cl_device *device = to_ishtp_cl_device(dev);</div><div class='add'>+	struct ishtp_cl_driver *driver = to_ishtp_cl_driver(drv);</div><div class='add'>+</div><div class='add'>+	return guid_equal(driver-&gt;guid,</div><div class='add'>+			  &amp;device-&gt;fw_client-&gt;props.protocol_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ishtp_cl_device_remove() - Bus remove() callback</div><div class='ctx'>  * @dev: the device structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -372,6 +405,7 @@ static struct bus_type ishtp_cl_bus_type = {</div><div class='ctx'> 	.name		= "ishtp",</div><div class='ctx'> 	.dev_groups	= ishtp_cl_dev_groups,</div><div class='ctx'> 	.probe		= ishtp_cl_device_probe,</div><div class='add'>+	.match		= ishtp_cl_bus_match,</div><div class='ctx'> 	.remove		= ishtp_cl_device_remove,</div><div class='ctx'> 	.pm		= &amp;ishtp_cl_bus_dev_pm_ops,</div><div class='ctx'> 	.uevent		= ishtp_cl_uevent,</div><div class='hunk'>@@ -445,6 +479,7 @@ static struct ishtp_cl_device *ishtp_bus_add_device(struct ishtp_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ishtp_device_ready = true;</div><div class='add'>+	dev_set_drvdata(&amp;device-&gt;dev, device);</div><div class='ctx'> </div><div class='ctx'> 	return device;</div><div class='ctx'> }</div><div class='hunk'>@@ -464,7 +499,7 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __ishtp_cl_driver_register() - Client driver register</div><div class='add'>+ * ishtp_cl_driver_register() - Client driver register</div><div class='ctx'>  * @driver:	the client driver instance</div><div class='ctx'>  * @owner:	Owner of this driver module</div><div class='ctx'>  *</div><div class='hunk'>@@ -473,8 +508,8 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Return value of driver_register or -ENODEV if not ready</div><div class='ctx'>  */</div><div class='del'>-int __ishtp_cl_driver_register(struct ishtp_cl_driver *driver,</div><div class='del'>-			       struct module *owner)</div><div class='add'>+int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,</div><div class='add'>+			     struct module *owner)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -491,7 +526,7 @@ int __ishtp_cl_driver_register(struct ishtp_cl_driver *driver,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__ishtp_cl_driver_register);</div><div class='add'>+EXPORT_SYMBOL(ishtp_cl_driver_register);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ishtp_cl_driver_unregister() - Client driver unregister</div><div class='hunk'>@@ -807,6 +842,59 @@ int ishtp_use_dma_transfer(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ishtp_device() - Return device pointer</div><div class='add'>+ *</div><div class='add'>+ * This interface is used to return device pointer from ishtp_cl_device</div><div class='add'>+ * instance.</div><div class='add'>+ *</div><div class='add'>+ * Return: device *.</div><div class='add'>+ */</div><div class='add'>+struct device *ishtp_device(struct ishtp_cl_device *device)</div><div class='add'>+{</div><div class='add'>+	return &amp;device-&gt;dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ishtp_get_pci_device() - Return PCI device dev pointer</div><div class='add'>+ * This interface is used to return PCI device pointer</div><div class='add'>+ * from ishtp_cl_device instance.</div><div class='add'>+ *</div><div class='add'>+ * Return: device *.</div><div class='add'>+ */</div><div class='add'>+struct device *ishtp_get_pci_device(struct ishtp_cl_device *device)</div><div class='add'>+{</div><div class='add'>+	return device-&gt;ishtp_dev-&gt;devc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_get_pci_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ishtp_trace_callback() - Return trace callback</div><div class='add'>+ *</div><div class='add'>+ * This interface is used to return trace callback function pointer.</div><div class='add'>+ *</div><div class='add'>+ * Return: void *.</div><div class='add'>+ */</div><div class='add'>+void *ishtp_trace_callback(struct ishtp_cl_device *cl_device)</div><div class='add'>+{</div><div class='add'>+	return cl_device-&gt;ishtp_dev-&gt;print_log;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_trace_callback);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ish_hw_reset() - Call HW reset IPC callback</div><div class='add'>+ *</div><div class='add'>+ * This interface is used to reset HW in case of error.</div><div class='add'>+ *</div><div class='add'>+ * Return: value from IPC hw_reset callback</div><div class='add'>+ */</div><div class='add'>+int ish_hw_reset(struct ishtp_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;ops-&gt;hw_reset(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ish_hw_reset);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ishtp_bus_register() - Function to register bus</div><div class='ctx'>  *</div><div class='ctx'>  * This register ishtp bus</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.h b/drivers/hid/intel-ish-hid/ishtp/bus.h<br/>index 4cf7ad586c37..93d516f5a853 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/bus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/bus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp/bus.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/intel-ish-client-if.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ishtp_cl;</div><div class='ctx'> struct ishtp_cl_device;</div><div class='hunk'>@@ -52,25 +53,6 @@ struct ishtp_cl_device {</div><div class='ctx'> 	void (*event_cb)(struct ishtp_cl_device *device);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct ishtp_cl_device - ISHTP device handle</div><div class='del'>- * @driver:	driver instance on a bus</div><div class='del'>- * @name:	Name of the device for probe</div><div class='del'>- * @probe:	driver callback for device probe</div><div class='del'>- * @remove:	driver callback on device removal</div><div class='del'>- *</div><div class='del'>- * Client drivers defines to get probed/removed for ISHTP client device.</div><div class='del'>- */</div><div class='del'>-struct ishtp_cl_driver {</div><div class='del'>-	struct device_driver driver;</div><div class='del'>-	const char *name;</div><div class='del'>-	int (*probe)(struct ishtp_cl_device *dev);</div><div class='del'>-	int (*remove)(struct ishtp_cl_device *dev);</div><div class='del'>-	int (*reset)(struct ishtp_cl_device *dev);</div><div class='del'>-	const struct dev_pm_ops *pm;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> int	ishtp_bus_new_client(struct ishtp_device *dev);</div><div class='ctx'> void	ishtp_remove_all_clients(struct ishtp_device *dev);</div><div class='ctx'> int	ishtp_cl_device_bind(struct ishtp_cl *cl);</div><div class='hunk'>@@ -98,22 +80,5 @@ void	ishtp_recv(struct ishtp_device *dev);</div><div class='ctx'> void	ishtp_reset_handler(struct ishtp_device *dev);</div><div class='ctx'> void	ishtp_reset_compl_handler(struct ishtp_device *dev);</div><div class='ctx'> </div><div class='del'>-void	ishtp_put_device(struct ishtp_cl_device *);</div><div class='del'>-void	ishtp_get_device(struct ishtp_cl_device *);</div><div class='del'>-</div><div class='del'>-void	ishtp_set_drvdata(struct ishtp_cl_device *cl_device, void *data);</div><div class='del'>-void	*ishtp_get_drvdata(struct ishtp_cl_device *cl_device);</div><div class='del'>-</div><div class='del'>-int	__ishtp_cl_driver_register(struct ishtp_cl_driver *driver,</div><div class='del'>-				   struct module *owner);</div><div class='del'>-#define ishtp_cl_driver_register(driver)		\</div><div class='del'>-	__ishtp_cl_driver_register(driver, THIS_MODULE)</div><div class='del'>-void	ishtp_cl_driver_unregister(struct ishtp_cl_driver *driver);</div><div class='del'>-</div><div class='del'>-int	ishtp_register_event_cb(struct ishtp_cl_device *device,</div><div class='del'>-				void (*read_cb)(struct ishtp_cl_device *));</div><div class='ctx'> int	ishtp_fw_cl_by_uuid(struct ishtp_device *dev, const guid_t *cuuid);</div><div class='del'>-struct	ishtp_fw_client *ishtp_fw_cl_get_client(struct ishtp_device *dev,</div><div class='del'>-						const guid_t *uuid);</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_ISHTP_CL_BUS_H */</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp/client.c b/drivers/hid/intel-ish-hid/ishtp/client.c<br/>index faeccdb1475b..b7ac5e3b1e82 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/client.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/client.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp/client.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static void ishtp_cl_init(struct ishtp_cl *cl, struct ishtp_device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: The allocated client instance or NULL on failure</div><div class='ctx'>  */</div><div class='del'>-struct ishtp_cl *ishtp_cl_allocate(struct ishtp_device *dev)</div><div class='add'>+struct ishtp_cl *ishtp_cl_allocate(struct ishtp_cl_device *cl_device)</div><div class='ctx'> {</div><div class='ctx'> 	struct ishtp_cl *cl;</div><div class='ctx'> </div><div class='hunk'>@@ -134,7 +134,7 @@ struct ishtp_cl *ishtp_cl_allocate(struct ishtp_device *dev)</div><div class='ctx'> 	if (!cl)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	ishtp_cl_init(cl, dev);</div><div class='add'>+	ishtp_cl_init(cl, cl_device-&gt;ishtp_dev);</div><div class='ctx'> 	return cl;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ishtp_cl_allocate);</div><div class='hunk'>@@ -168,9 +168,6 @@ EXPORT_SYMBOL(ishtp_cl_free);</div><div class='ctx'> /**</div><div class='ctx'>  * ishtp_cl_link() - Reserve a host id and link the client instance</div><div class='ctx'>  * @cl: client device instance</div><div class='del'>- * @id: host client id to use. It can be ISHTP_HOST_CLIENT_ID_ANY if any</div><div class='del'>- *	id from the available can be used</div><div class='del'>- *</div><div class='ctx'>  *</div><div class='ctx'>  * This allocates a single bit in the hostmap. This function will make sure</div><div class='ctx'>  * that not many client sessions are opened at the same time. Once allocated</div><div class='hunk'>@@ -179,11 +176,11 @@ EXPORT_SYMBOL(ishtp_cl_free);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 or error code on failure</div><div class='ctx'>  */</div><div class='del'>-int ishtp_cl_link(struct ishtp_cl *cl, int id)</div><div class='add'>+int ishtp_cl_link(struct ishtp_cl *cl)</div><div class='ctx'> {</div><div class='ctx'> 	struct ishtp_device *dev;</div><div class='del'>-	unsigned long	flags, flags_cl;</div><div class='del'>-	int	ret = 0;</div><div class='add'>+	unsigned long flags, flags_cl;</div><div class='add'>+	int id, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!cl || !cl-&gt;dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -197,10 +194,7 @@ int ishtp_cl_link(struct ishtp_cl *cl, int id)</div><div class='ctx'> 		goto unlock_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If Id is not assigned get one*/</div><div class='del'>-	if (id == ISHTP_HOST_CLIENT_ID_ANY)</div><div class='del'>-		id = find_first_zero_bit(dev-&gt;host_clients_map,</div><div class='del'>-			ISHTP_CLIENTS_MAX);</div><div class='add'>+	id = find_first_zero_bit(dev-&gt;host_clients_map, ISHTP_CLIENTS_MAX);</div><div class='ctx'> </div><div class='ctx'> 	if (id &gt;= ISHTP_CLIENTS_MAX) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;dev-&gt;device_lock, flags);</div><div class='hunk'>@@ -1069,3 +1063,45 @@ void recv_ishtp_cl_msg_dma(struct ishtp_device *dev, void *msg,</div><div class='ctx'> eoi:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void *ishtp_get_client_data(struct ishtp_cl *cl)</div><div class='add'>+{</div><div class='add'>+	return cl-&gt;client_data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_get_client_data);</div><div class='add'>+</div><div class='add'>+void ishtp_set_client_data(struct ishtp_cl *cl, void *data)</div><div class='add'>+{</div><div class='add'>+	cl-&gt;client_data = data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_set_client_data);</div><div class='add'>+</div><div class='add'>+struct ishtp_device *ishtp_get_ishtp_device(struct ishtp_cl *cl)</div><div class='add'>+{</div><div class='add'>+	return cl-&gt;dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_get_ishtp_device);</div><div class='add'>+</div><div class='add'>+void ishtp_set_tx_ring_size(struct ishtp_cl *cl, int size)</div><div class='add'>+{</div><div class='add'>+	cl-&gt;tx_ring_size = size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_set_tx_ring_size);</div><div class='add'>+</div><div class='add'>+void ishtp_set_rx_ring_size(struct ishtp_cl *cl, int size)</div><div class='add'>+{</div><div class='add'>+	cl-&gt;rx_ring_size = size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_set_rx_ring_size);</div><div class='add'>+</div><div class='add'>+void ishtp_set_connection_state(struct ishtp_cl *cl, int state)</div><div class='add'>+{</div><div class='add'>+	cl-&gt;state = state;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_set_connection_state);</div><div class='add'>+</div><div class='add'>+void ishtp_cl_set_fw_client_id(struct ishtp_cl *cl, int fw_client_id)</div><div class='add'>+{</div><div class='add'>+	cl-&gt;fw_client_id = fw_client_id;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ishtp_cl_set_fw_client_id);</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp/client.h b/drivers/hid/intel-ish-hid/ishtp/client.h<br/>index e0df3eb611e6..6ed00947d6bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/client.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/client.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp/client.h</a></div><div class='hunk'>@@ -19,15 +19,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include "ishtp-dev.h"</div><div class='ctx'> </div><div class='del'>-/* Client state */</div><div class='del'>-enum cl_state {</div><div class='del'>-	ISHTP_CL_INITIALIZING = 0,</div><div class='del'>-	ISHTP_CL_CONNECTING,</div><div class='del'>-	ISHTP_CL_CONNECTED,</div><div class='del'>-	ISHTP_CL_DISCONNECTING,</div><div class='del'>-	ISHTP_CL_DISCONNECTED</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Tx and Rx ring size */</div><div class='ctx'> #define	CL_DEF_RX_RING_SIZE	2</div><div class='ctx'> #define	CL_DEF_TX_RING_SIZE	2</div><div class='hunk'>@@ -169,19 +160,4 @@ static inline bool ishtp_cl_cmp_id(const struct ishtp_cl *cl1,</div><div class='ctx'> 		(cl1-&gt;fw_client_id == cl2-&gt;fw_client_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* exported functions from ISHTP under client management scope */</div><div class='del'>-struct ishtp_cl	*ishtp_cl_allocate(struct ishtp_device *dev);</div><div class='del'>-void ishtp_cl_free(struct ishtp_cl *cl);</div><div class='del'>-int ishtp_cl_link(struct ishtp_cl *cl, int id);</div><div class='del'>-void ishtp_cl_unlink(struct ishtp_cl *cl);</div><div class='del'>-int ishtp_cl_disconnect(struct ishtp_cl *cl);</div><div class='del'>-int ishtp_cl_connect(struct ishtp_cl *cl);</div><div class='del'>-int ishtp_cl_send(struct ishtp_cl *cl, uint8_t *buf, size_t length);</div><div class='del'>-int ishtp_cl_flush_queues(struct ishtp_cl *cl);</div><div class='del'>-</div><div class='del'>-/* exported functions from ISHTP client buffer management scope */</div><div class='del'>-int ishtp_cl_io_rb_recycle(struct ishtp_cl_rb *rb);</div><div class='del'>-bool ishtp_cl_tx_empty(struct ishtp_cl *cl);</div><div class='del'>-struct ishtp_cl_rb *ishtp_cl_rx_get_rb(struct ishtp_cl *cl);</div><div class='del'>-</div><div class='ctx'> #endif /* _ISHTP_CLIENT_H_ */</div><div class='head'>diff --git a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h<br/>index e54ce1ef27dd..3cfef084b9fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h</a></div><div class='hunk'>@@ -79,32 +79,6 @@ struct ishtp_fw_client {</div><div class='ctx'> 	uint8_t client_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct ishtp_msg_data - ISHTP message data struct</div><div class='del'>- * @size:	Size of data in the *data</div><div class='del'>- * @data:	Pointer to data</div><div class='del'>- */</div><div class='del'>-struct ishtp_msg_data {</div><div class='del'>-	uint32_t size;</div><div class='del'>-	unsigned char *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * struct ishtp_cl_rb - request block structure</div><div class='del'>- * @list:	Link to list members</div><div class='del'>- * @cl:		ISHTP client instance</div><div class='del'>- * @buffer:	message header</div><div class='del'>- * @buf_idx:	Index into buffer</div><div class='del'>- * @read_time:	 unused at this time</div><div class='del'>- */</div><div class='del'>-struct ishtp_cl_rb {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct ishtp_cl *cl;</div><div class='del'>-	struct ishtp_msg_data buffer;</div><div class='del'>-	unsigned long buf_idx;</div><div class='del'>-	unsigned long read_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Control info for IPC messages ISHTP/IPC sending FIFO -</div><div class='ctx'>  * list with inline data buffer</div><div class='hunk'>@@ -264,11 +238,6 @@ static inline int ish_ipc_reset(struct ishtp_device *dev)</div><div class='ctx'> 	return dev-&gt;ops-&gt;ipc_reset(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ish_hw_reset(struct ishtp_device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;ops-&gt;hw_reset(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Exported function */</div><div class='ctx'> void	ishtp_device_init(struct ishtp_device *dev);</div><div class='ctx'> int	ishtp_start(struct ishtp_device *dev);</div><div class='head'>diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c<br/>index 840634e0f1e3..dbaead0a5371 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/uhid.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hid/uhid.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hid/uhid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hid/uhid.c</a></div><div class='hunk'>@@ -632,7 +632,7 @@ static int uhid_char_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	INIT_WORK(&amp;uhid-&gt;worker, uhid_device_add_worker);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = uhid;</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c<br/>index 62703b354d6d..3fc0b247a807 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/channel_mgmt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/channel_mgmt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/channel_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hv/channel_mgmt.c</a></div><div class='hunk'>@@ -336,6 +336,8 @@ static struct vmbus_channel *alloc_channel(void)</div><div class='ctx'> 	tasklet_init(&amp;channel-&gt;callback_event,</div><div class='ctx'> 		     vmbus_on_event, (unsigned long)channel);</div><div class='ctx'> </div><div class='add'>+	hv_ringbuffer_pre_init(channel);</div><div class='add'>+</div><div class='ctx'> 	return channel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,6 +347,7 @@ static struct vmbus_channel *alloc_channel(void)</div><div class='ctx'> static void free_channel(struct vmbus_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	tasklet_kill(&amp;channel-&gt;callback_event);</div><div class='add'>+	vmbus_remove_channel_attr_group(channel);</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(&amp;channel-&gt;kobj);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c<br/>index 632d25674e7f..45653029ee18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/hv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/hv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/hv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hv/hv.c</a></div><div class='hunk'>@@ -408,7 +408,6 @@ int hv_synic_cleanup(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 		clockevents_unbind_device(hv_cpu-&gt;clk_evt, cpu);</div><div class='ctx'> 		hv_ce_shutdown(hv_cpu-&gt;clk_evt);</div><div class='del'>-		put_cpu_ptr(hv_cpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hv_get_synint_state(VMBUS_MESSAGE_SINT, shared_sint.as_uint64);</div><div class='head'>diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h<br/>index cb86b133eb4d..e5467b821f41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/hyperv_vmbus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/hyperv_vmbus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/hyperv_vmbus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hv/hyperv_vmbus.h</a></div><div class='hunk'>@@ -193,6 +193,7 @@ extern void hv_synic_clockevents_cleanup(void);</div><div class='ctx'> </div><div class='ctx'> /* Interface */</div><div class='ctx'> </div><div class='add'>+void hv_ringbuffer_pre_init(struct vmbus_channel *channel);</div><div class='ctx'> </div><div class='ctx'> int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> 		       struct page *pages, u32 pagecnt);</div><div class='hunk'>@@ -321,6 +322,8 @@ void vmbus_device_unregister(struct hv_device *device_obj);</div><div class='ctx'> int vmbus_add_channel_kobj(struct hv_device *device_obj,</div><div class='ctx'> 			   struct vmbus_channel *channel);</div><div class='ctx'> </div><div class='add'>+void vmbus_remove_channel_attr_group(struct vmbus_channel *channel);</div><div class='add'>+</div><div class='ctx'> struct vmbus_channel *relid2channel(u32 relid);</div><div class='ctx'> </div><div class='ctx'> void vmbus_free_channels(void);</div><div class='head'>diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c<br/>index 9e8b31ccc142..121a01c43298 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/ring_buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/ring_buffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/ring_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hv/ring_buffer.c</a></div><div class='hunk'>@@ -166,14 +166,18 @@ hv_get_ringbuffer_availbytes(const struct hv_ring_buffer_info *rbi,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get various debug metrics for the specified ring buffer. */</div><div class='del'>-int hv_ringbuffer_get_debuginfo(const struct hv_ring_buffer_info *ring_info,</div><div class='add'>+int hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> 				struct hv_ring_buffer_debug_info *debug_info)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bytes_avail_towrite;</div><div class='ctx'> 	u32 bytes_avail_toread;</div><div class='ctx'> </div><div class='del'>-	if (!ring_info-&gt;ring_buffer)</div><div class='add'>+	mutex_lock(&amp;ring_info-&gt;ring_buffer_mutex);</div><div class='add'>+</div><div class='add'>+	if (!ring_info-&gt;ring_buffer) {</div><div class='add'>+		mutex_unlock(&amp;ring_info-&gt;ring_buffer_mutex);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hv_get_ringbuffer_availbytes(ring_info,</div><div class='ctx'> 				     &amp;bytes_avail_toread,</div><div class='hunk'>@@ -184,10 +188,19 @@ int hv_ringbuffer_get_debuginfo(const struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> 	debug_info-&gt;current_write_index = ring_info-&gt;ring_buffer-&gt;write_index;</div><div class='ctx'> 	debug_info-&gt;current_interrupt_mask</div><div class='ctx'> 		= ring_info-&gt;ring_buffer-&gt;interrupt_mask;</div><div class='add'>+	mutex_unlock(&amp;ring_info-&gt;ring_buffer_mutex);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hv_ringbuffer_get_debuginfo);</div><div class='ctx'> </div><div class='add'>+/* Initialize a channel's ring buffer info mutex locks */</div><div class='add'>+void hv_ringbuffer_pre_init(struct vmbus_channel *channel)</div><div class='add'>+{</div><div class='add'>+	mutex_init(&amp;channel-&gt;inbound.ring_buffer_mutex);</div><div class='add'>+	mutex_init(&amp;channel-&gt;outbound.ring_buffer_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Initialize the ring buffer. */</div><div class='ctx'> int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> 		       struct page *pages, u32 page_cnt)</div><div class='hunk'>@@ -197,8 +210,6 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON((sizeof(struct hv_ring_buffer) != PAGE_SIZE));</div><div class='ctx'> </div><div class='del'>-	memset(ring_info, 0, sizeof(struct hv_ring_buffer_info));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First page holds struct hv_ring_buffer, do wraparound mapping for</div><div class='ctx'> 	 * the rest.</div><div class='hunk'>@@ -232,6 +243,7 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> 		reciprocal_value(ring_info-&gt;ring_size / 10);</div><div class='ctx'> 	ring_info-&gt;ring_datasize = ring_info-&gt;ring_size -</div><div class='ctx'> 		sizeof(struct hv_ring_buffer);</div><div class='add'>+	ring_info-&gt;priv_read_index = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ring_info-&gt;ring_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -241,8 +253,10 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,</div><div class='ctx'> /* Cleanup the ring buffer. */</div><div class='ctx'> void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)</div><div class='ctx'> {</div><div class='add'>+	mutex_lock(&amp;ring_info-&gt;ring_buffer_mutex);</div><div class='ctx'> 	vunmap(ring_info-&gt;ring_buffer);</div><div class='ctx'> 	ring_info-&gt;ring_buffer = NULL;</div><div class='add'>+	mutex_unlock(&amp;ring_info-&gt;ring_buffer_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write to the ring buffer. */</div><div class='head'>diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c<br/>index 000b53e5a17a..aa25f3bcbdea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/vmbus_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hv/vmbus_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hv/vmbus_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hv/vmbus_drv.c</a></div><div class='hunk'>@@ -630,7 +630,36 @@ static struct attribute *vmbus_dev_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_driver_override.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='del'>-ATTRIBUTE_GROUPS(vmbus_dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device-level attribute_group callback function. Returns the permission for</div><div class='add'>+ * each attribute, and returns 0 if an attribute is not visible.</div><div class='add'>+ */</div><div class='add'>+static umode_t vmbus_dev_attr_is_visible(struct kobject *kobj,</div><div class='add'>+					 struct attribute *attr, int idx)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = kobj_to_dev(kobj);</div><div class='add'>+	const struct hv_device *hv_dev = device_to_hv_device(dev);</div><div class='add'>+</div><div class='add'>+	/* Hide the monitor attributes if the monitor mechanism is not used. */</div><div class='add'>+	if (!hv_dev-&gt;channel-&gt;offermsg.monitor_allocated &amp;&amp;</div><div class='add'>+	    (attr == &amp;dev_attr_monitor_id.attr ||</div><div class='add'>+	     attr == &amp;dev_attr_server_monitor_pending.attr ||</div><div class='add'>+	     attr == &amp;dev_attr_client_monitor_pending.attr ||</div><div class='add'>+	     attr == &amp;dev_attr_server_monitor_latency.attr ||</div><div class='add'>+	     attr == &amp;dev_attr_client_monitor_latency.attr ||</div><div class='add'>+	     attr == &amp;dev_attr_server_monitor_conn_id.attr ||</div><div class='add'>+	     attr == &amp;dev_attr_client_monitor_conn_id.attr))</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 vmbus_dev_group = {</div><div class='add'>+	.attrs = vmbus_dev_attrs,</div><div class='add'>+	.is_visible = vmbus_dev_attr_is_visible</div><div class='add'>+};</div><div class='add'>+__ATTRIBUTE_GROUPS(vmbus_dev);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * vmbus_uevent - add uevent for our device</div><div class='hunk'>@@ -1381,7 +1410,7 @@ static void vmbus_chan_release(struct kobject *kobj)</div><div class='ctx'> </div><div class='ctx'> struct vmbus_chan_attribute {</div><div class='ctx'> 	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(const struct vmbus_channel *chan, char *buf);</div><div class='add'>+	ssize_t (*show)(struct vmbus_channel *chan, char *buf);</div><div class='ctx'> 	ssize_t (*store)(struct vmbus_channel *chan,</div><div class='ctx'> 			 const char *buf, size_t count);</div><div class='ctx'> };</div><div class='hunk'>@@ -1400,15 +1429,12 @@ static ssize_t vmbus_chan_attr_show(struct kobject *kobj,</div><div class='ctx'> {</div><div class='ctx'> 	const struct vmbus_chan_attribute *attribute</div><div class='ctx'> 		= container_of(attr, struct vmbus_chan_attribute, attr);</div><div class='del'>-	const struct vmbus_channel *chan</div><div class='add'>+	struct vmbus_channel *chan</div><div class='ctx'> 		= container_of(kobj, struct vmbus_channel, kobj);</div><div class='ctx'> </div><div class='ctx'> 	if (!attribute-&gt;show)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (chan-&gt;state != CHANNEL_OPENED_STATE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	return attribute-&gt;show(chan, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1416,45 +1442,81 @@ static const struct sysfs_ops vmbus_chan_sysfs_ops = {</div><div class='ctx'> 	.show = vmbus_chan_attr_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t out_mask_show(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t out_mask_show(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='del'>-	const struct hv_ring_buffer_info *rbi = &amp;channel-&gt;outbound;</div><div class='add'>+	struct hv_ring_buffer_info *rbi = &amp;channel-&gt;outbound;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	if (!rbi-&gt;ring_buffer) {</div><div class='add'>+		mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", rbi-&gt;ring_buffer-&gt;interrupt_mask);</div><div class='add'>+	ret = sprintf(buf, "%u\n", rbi-&gt;ring_buffer-&gt;interrupt_mask);</div><div class='add'>+	mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR_RO(out_mask);</div><div class='ctx'> </div><div class='del'>-static ssize_t in_mask_show(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t in_mask_show(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='del'>-	const struct hv_ring_buffer_info *rbi = &amp;channel-&gt;inbound;</div><div class='add'>+	struct hv_ring_buffer_info *rbi = &amp;channel-&gt;inbound;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	if (!rbi-&gt;ring_buffer) {</div><div class='add'>+		mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", rbi-&gt;ring_buffer-&gt;interrupt_mask);</div><div class='add'>+	ret = sprintf(buf, "%u\n", rbi-&gt;ring_buffer-&gt;interrupt_mask);</div><div class='add'>+	mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR_RO(in_mask);</div><div class='ctx'> </div><div class='del'>-static ssize_t read_avail_show(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t read_avail_show(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='del'>-	const struct hv_ring_buffer_info *rbi = &amp;channel-&gt;inbound;</div><div class='add'>+	struct hv_ring_buffer_info *rbi = &amp;channel-&gt;inbound;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	if (!rbi-&gt;ring_buffer) {</div><div class='add'>+		mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", hv_get_bytes_to_read(rbi));</div><div class='add'>+	ret = sprintf(buf, "%u\n", hv_get_bytes_to_read(rbi));</div><div class='add'>+	mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR_RO(read_avail);</div><div class='ctx'> </div><div class='del'>-static ssize_t write_avail_show(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t write_avail_show(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='del'>-	const struct hv_ring_buffer_info *rbi = &amp;channel-&gt;outbound;</div><div class='add'>+	struct hv_ring_buffer_info *rbi = &amp;channel-&gt;outbound;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	if (!rbi-&gt;ring_buffer) {</div><div class='add'>+		mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", hv_get_bytes_to_write(rbi));</div><div class='add'>+	ret = sprintf(buf, "%u\n", hv_get_bytes_to_write(rbi));</div><div class='add'>+	mutex_unlock(&amp;rbi-&gt;ring_buffer_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR_RO(write_avail);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_target_cpu(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t show_target_cpu(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%u\n", channel-&gt;target_cpu);</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(cpu, S_IRUGO, show_target_cpu, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_pending_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t channel_pending_show(struct vmbus_channel *channel,</div><div class='ctx'> 				    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n",</div><div class='hunk'>@@ -1463,7 +1525,7 @@ static ssize_t channel_pending_show(const struct vmbus_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(pending, S_IRUGO, channel_pending_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_latency_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t channel_latency_show(struct vmbus_channel *channel,</div><div class='ctx'> 				    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n",</div><div class='hunk'>@@ -1472,19 +1534,19 @@ static ssize_t channel_latency_show(const struct vmbus_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(latency, S_IRUGO, channel_latency_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_interrupts_show(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t channel_interrupts_show(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llu\n", channel-&gt;interrupts);</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(interrupts, S_IRUGO, channel_interrupts_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_events_show(const struct vmbus_channel *channel, char *buf)</div><div class='add'>+static ssize_t channel_events_show(struct vmbus_channel *channel, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llu\n", channel-&gt;sig_events);</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(events, S_IRUGO, channel_events_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_intr_in_full_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t channel_intr_in_full_show(struct vmbus_channel *channel,</div><div class='ctx'> 					 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llu\n",</div><div class='hunk'>@@ -1492,7 +1554,7 @@ static ssize_t channel_intr_in_full_show(const struct vmbus_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(intr_in_full, 0444, channel_intr_in_full_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_intr_out_empty_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t channel_intr_out_empty_show(struct vmbus_channel *channel,</div><div class='ctx'> 					   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llu\n",</div><div class='hunk'>@@ -1500,7 +1562,7 @@ static ssize_t channel_intr_out_empty_show(const struct vmbus_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(intr_out_empty, 0444, channel_intr_out_empty_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_out_full_first_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t channel_out_full_first_show(struct vmbus_channel *channel,</div><div class='ctx'> 					   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llu\n",</div><div class='hunk'>@@ -1508,7 +1570,7 @@ static ssize_t channel_out_full_first_show(const struct vmbus_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(out_full_first, 0444, channel_out_full_first_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t channel_out_full_total_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t channel_out_full_total_show(struct vmbus_channel *channel,</div><div class='ctx'> 					   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llu\n",</div><div class='hunk'>@@ -1516,14 +1578,14 @@ static ssize_t channel_out_full_total_show(const struct vmbus_channel *channel,</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(out_full_total, 0444, channel_out_full_total_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t subchannel_monitor_id_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t subchannel_monitor_id_show(struct vmbus_channel *channel,</div><div class='ctx'> 					  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%u\n", channel-&gt;offermsg.monitorid);</div><div class='ctx'> }</div><div class='ctx'> static VMBUS_CHAN_ATTR(monitor_id, S_IRUGO, subchannel_monitor_id_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t subchannel_id_show(const struct vmbus_channel *channel,</div><div class='add'>+static ssize_t subchannel_id_show(struct vmbus_channel *channel,</div><div class='ctx'> 				  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%u\n",</div><div class='hunk'>@@ -1550,10 +1612,34 @@ static struct attribute *vmbus_chan_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Channel-level attribute_group callback function. Returns the permission for</div><div class='add'>+ * each attribute, and returns 0 if an attribute is not visible.</div><div class='add'>+ */</div><div class='add'>+static umode_t vmbus_chan_attr_is_visible(struct kobject *kobj,</div><div class='add'>+					  struct attribute *attr, int idx)</div><div class='add'>+{</div><div class='add'>+	const struct vmbus_channel *channel =</div><div class='add'>+		container_of(kobj, struct vmbus_channel, kobj);</div><div class='add'>+</div><div class='add'>+	/* Hide the monitor attributes if the monitor mechanism is not used. */</div><div class='add'>+	if (!channel-&gt;offermsg.monitor_allocated &amp;&amp;</div><div class='add'>+	    (attr == &amp;chan_attr_pending.attr ||</div><div class='add'>+	     attr == &amp;chan_attr_latency.attr ||</div><div class='add'>+	     attr == &amp;chan_attr_monitor_id.attr))</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 struct attribute_group vmbus_chan_group = {</div><div class='add'>+	.attrs = vmbus_chan_attrs,</div><div class='add'>+	.is_visible = vmbus_chan_attr_is_visible</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct kobj_type vmbus_chan_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;vmbus_chan_sysfs_ops,</div><div class='ctx'> 	.release = vmbus_chan_release,</div><div class='del'>-	.default_attrs = vmbus_chan_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1561,6 +1647,7 @@ static struct kobj_type vmbus_chan_ktype = {</div><div class='ctx'>  */</div><div class='ctx'> int vmbus_add_channel_kobj(struct hv_device *dev, struct vmbus_channel *channel)</div><div class='ctx'> {</div><div class='add'>+	const struct device *device = &amp;dev-&gt;device;</div><div class='ctx'> 	struct kobject *kobj = &amp;channel-&gt;kobj;</div><div class='ctx'> 	u32 relid = channel-&gt;offermsg.child_relid;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1571,12 +1658,31 @@ int vmbus_add_channel_kobj(struct hv_device *dev, struct vmbus_channel *channel)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = sysfs_create_group(kobj, &amp;vmbus_chan_group);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		/*</div><div class='add'>+		 * The calling functions' error handling paths will cleanup the</div><div class='add'>+		 * empty channel directory.</div><div class='add'>+		 */</div><div class='add'>+		dev_err(device, "Unable to set up channel sysfs files\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	kobject_uevent(kobj, KOBJ_ADD);</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='add'>+ * vmbus_remove_channel_attr_group - remove the channel's attribute group</div><div class='add'>+ */</div><div class='add'>+void vmbus_remove_channel_attr_group(struct vmbus_channel *channel)</div><div class='add'>+{</div><div class='add'>+	sysfs_remove_group(&amp;channel-&gt;kobj, &amp;vmbus_chan_group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * vmbus_device_create - Creates and registers a new child device</div><div class='ctx'>  * on the vmbus.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig<br/>index 6f929bfa9fcd..1915a18b537b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/Kconfig</a></div><div class='hunk'>@@ -17,7 +17,7 @@ menuconfig HWMON</div><div class='ctx'> </div><div class='ctx'> 	  To find out which specific driver(s) you need, use the</div><div class='ctx'> 	  sensors-detect script from the lm_sensors package.  Read</div><div class='del'>-	  &lt;file:Documentation/hwmon/userspace-tools&gt; for details.</div><div class='add'>+	  &lt;file:Documentation/hwmon/userspace-tools.rst&gt; for details.</div><div class='ctx'> </div><div class='ctx'> 	  This support can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called hwmon.</div><div class='hunk'>@@ -59,7 +59,7 @@ config SENSORS_ABITUGURU</div><div class='ctx'> 	  chip can be found on Abit uGuru featuring motherboards (most modern</div><div class='ctx'> 	  Abit motherboards from before end 2005). For more info and a list</div><div class='ctx'> 	  of which motherboards have which revision see</div><div class='del'>-	  Documentation/hwmon/abituguru</div><div class='add'>+	  Documentation/hwmon/abituguru.rst</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called abituguru.</div><div class='hunk'>@@ -73,7 +73,7 @@ config SENSORS_ABITUGURU3</div><div class='ctx'> 	  and their settings is supported. The third revision of the Abit</div><div class='ctx'> 	  uGuru chip can be found on recent Abit motherboards (since end</div><div class='ctx'> 	  2005). For more info and a list of which motherboards have which</div><div class='del'>-	  revision see Documentation/hwmon/abituguru3</div><div class='add'>+	  revision see Documentation/hwmon/abituguru3.rst</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called abituguru3.</div><div class='hunk'>@@ -643,7 +643,7 @@ config SENSORS_CORETEMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the temperature</div><div class='ctx'> 	  sensor inside your CPU. Most of the family 6 CPUs</div><div class='del'>-	  are supported. Check Documentation/hwmon/coretemp for details.</div><div class='add'>+	  are supported. Check Documentation/hwmon/coretemp.rst for details.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_IT87</div><div class='ctx'> 	tristate "ITE IT87xx and compatibles"</div><div class='hunk'>@@ -705,6 +705,16 @@ config SENSORS_LINEAGE</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called lineage-pem.</div><div class='ctx'> </div><div class='add'>+config SENSORS_LOCHNAGAR</div><div class='add'>+	tristate "Lochnagar Hardware Monitor"</div><div class='add'>+	depends on MFD_LOCHNAGAR</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for Lochnagar 2 temperature,</div><div class='add'>+	  voltage and current sensors abilities.</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 lochnagar-hwmon.</div><div class='add'>+</div><div class='ctx'> config SENSORS_LTC2945</div><div class='ctx'> 	tristate "Linear Technology LTC2945"</div><div class='ctx'> 	depends on I2C</div><div class='hunk'>@@ -898,6 +908,7 @@ config SENSORS_MAX6642</div><div class='ctx'> config SENSORS_MAX6650</div><div class='ctx'> 	tristate "Maxim MAX6650 sensor chip"</div><div class='ctx'> 	depends on I2C</div><div class='add'>+	depends on THERMAL || THERMAL=n</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the MAX6650 / MAX6651</div><div class='ctx'> 	  sensor chips.</div><div class='hunk'>@@ -1759,6 +1770,7 @@ config SENSORS_VT8231</div><div class='ctx'> config SENSORS_W83773G</div><div class='ctx'> 	tristate "Nuvoton W83773G"</div><div class='ctx'> 	depends on I2C</div><div class='add'>+	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the Nuvoton W83773G hardware</div><div class='ctx'> 	  monitoring chip.</div><div class='head'>diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile<br/>index f5c7b442e69e..8db472ea04f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/Makefile</a></div><div class='hunk'>@@ -89,6 +89,7 @@ obj-$(CONFIG_SENSORS_JZ4740)	+= jz4740-hwmon.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_K8TEMP)	+= k8temp.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_K10TEMP)	+= k10temp.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LINEAGE)	+= lineage-pem.o</div><div class='add'>+obj-$(CONFIG_SENSORS_LOCHNAGAR)	+= lochnagar-hwmon.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM63)	+= lm63.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM70)	+= lm70.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM73)	+= lm73.o</div><div class='head'>diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c<br/>index f13806d731fa..b176da8e92a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ad7414.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ad7414.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ad7414.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ad7414.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ static const struct i2c_device_id ad7414_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ad7414_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ad7414_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ad7414_of_match[] = {</div><div class='ctx'> 	{ .compatible = "ad,ad7414" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/adc128d818.c b/drivers/hwmon/adc128d818.c<br/>index ca794bf904de..e640be442dae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adc128d818.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adc128d818.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adc128d818.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adc128d818.c</a></div><div class='hunk'>@@ -521,7 +521,7 @@ static const struct i2c_device_id adc128_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, adc128_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id adc128_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused adc128_of_match[] = {</div><div class='ctx'> 	{ .compatible = "ti,adc128d818" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c<br/>index 1e4dad36f5ef..ec437cc9e739 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1025.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1025.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1025.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adm1025.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ static struct adm1025_data *adm1025_update_device(struct device *dev)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_in(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+in_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='hunk'>@@ -183,7 +183,7 @@ show_in(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_in_min(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+in_min_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='hunk'>@@ -192,7 +192,7 @@ show_in_min(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_in_max(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+in_max_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='hunk'>@@ -201,7 +201,7 @@ show_in_max(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+temp_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='hunk'>@@ -209,7 +209,7 @@ show_temp(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp_min(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+temp_min_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='hunk'>@@ -217,15 +217,15 @@ show_temp_min(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp_max(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+temp_max_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -245,8 +245,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -266,22 +266,28 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define set_in(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \</div><div class='del'>-	show_in, NULL, offset); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \</div><div class='del'>-	show_in_min, set_in_min, offset); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \</div><div class='del'>-	show_in_max, set_in_max, offset)</div><div class='del'>-set_in(0);</div><div class='del'>-set_in(1);</div><div class='del'>-set_in(2);</div><div class='del'>-set_in(3);</div><div class='del'>-set_in(4);</div><div class='del'>-set_in(5);</div><div class='del'>-</div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -301,8 +307,9 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-	const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -322,15 +329,12 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define set_temp(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \</div><div class='del'>-	show_temp, NULL, offset - 1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \</div><div class='del'>-	show_temp_min, set_temp_min, offset - 1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \</div><div class='del'>-	show_temp_max, set_temp_max, offset - 1)</div><div class='del'>-set_temp(1);</div><div class='del'>-set_temp(2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> alarms_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -341,21 +345,21 @@ alarms_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_alarm(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+alarm_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1025_data *data = adm1025_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_alarm, NULL, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_fault, alarm, 14);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='head'>diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c<br/>index e43f09a07cd0..d34a68a11036 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1026.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1026.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1026.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adm1026.c</a></div><div class='hunk'>@@ -477,24 +477,24 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in_min[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -513,16 +513,16 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in_max[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -542,48 +542,72 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define in_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in,	\</div><div class='del'>-		NULL, offset);					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, offset);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-in_reg(0);</div><div class='del'>-in_reg(1);</div><div class='del'>-in_reg(2);</div><div class='del'>-in_reg(3);</div><div class='del'>-in_reg(4);</div><div class='del'>-in_reg(5);</div><div class='del'>-in_reg(6);</div><div class='del'>-in_reg(7);</div><div class='del'>-in_reg(8);</div><div class='del'>-in_reg(9);</div><div class='del'>-in_reg(10);</div><div class='del'>-in_reg(11);</div><div class='del'>-in_reg(12);</div><div class='del'>-in_reg(13);</div><div class='del'>-in_reg(14);</div><div class='del'>-in_reg(15);</div><div class='del'>-</div><div class='del'>-static ssize_t show_in16(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_input, in, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_input, in, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_min, in_min, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_max, in_max, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in8_input, in, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in8_min, in_min, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in8_max, in_max, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in9_input, in, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in9_min, in_min, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in9_max, in_max, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in10_input, in, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in10_min, in_min, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in10_max, in_max, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in11_input, in, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in11_min, in_min, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in11_max, in_max, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in12_input, in, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in12_min, in_min, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in12_max, in_max, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in13_input, in, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in13_min, in_min, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in13_max, in_max, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in14_input, in, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in14_min, in_min, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in14_max, in_max, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in15_input, in, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in15_min, in_min, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in15_max, in_max, 15);</div><div class='add'>+</div><div class='add'>+static ssize_t in16_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(16, data-&gt;in[16]) -</div><div class='ctx'> 		NEG12_OFFSET);</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_in16_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t in16_min_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(16, data-&gt;in_min[16])</div><div class='ctx'> 		- NEG12_OFFSET);</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t in16_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -603,15 +627,16 @@ static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t in16_max_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(16, data-&gt;in_max[16])</div><div class='ctx'> 			- NEG12_OFFSET);</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t in16_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -632,17 +657,14 @@ static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL, 16);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min,</div><div class='del'>-			  set_in16_min, 16);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max,</div><div class='del'>-			  set_in16_max, 16);</div><div class='del'>-</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in16_input, in16, 16);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in16_min, in16_min, 16);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in16_max, in16_max, 16);</div><div class='ctx'> </div><div class='ctx'> /* Now add fan read/write functions */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -650,8 +672,8 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan[nr],</div><div class='ctx'> 		data-&gt;fan_div[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -659,8 +681,9 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan_min[nr],</div><div class='ctx'> 		data-&gt;fan_div[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -681,20 +704,22 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define fan_offset(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL,	\</div><div class='del'>-		offset - 1);						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1);</div><div class='del'>-</div><div class='del'>-fan_offset(1);</div><div class='del'>-fan_offset(2);</div><div class='del'>-fan_offset(3);</div><div class='del'>-fan_offset(4);</div><div class='del'>-fan_offset(5);</div><div class='del'>-fan_offset(6);</div><div class='del'>-fan_offset(7);</div><div class='del'>-fan_offset(8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_input, fan, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_min, fan_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan4_input, fan, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan4_min, fan_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan5_input, fan, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan5_min, fan_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan6_input, fan, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan6_min, fan_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan7_input, fan, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan7_min, fan_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan8_input, fan, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan8_min, fan_min, 7);</div><div class='ctx'> </div><div class='ctx'> /* Adjust fan_min to account for new fan divisor */</div><div class='ctx'> static void fixup_fan_min(struct device *dev, int fan, int old_div)</div><div class='hunk'>@@ -715,16 +740,17 @@ static void fixup_fan_min(struct device *dev, int fan, int old_div)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Now add fan_div read/write functions */</div><div class='del'>-static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;fan_div[nr]);</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -765,38 +791,35 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define fan_offset_div(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_div, set_fan_div, offset - 1);</div><div class='del'>-</div><div class='del'>-fan_offset_div(1);</div><div class='del'>-fan_offset_div(2);</div><div class='del'>-fan_offset_div(3);</div><div class='del'>-fan_offset_div(4);</div><div class='del'>-fan_offset_div(5);</div><div class='del'>-fan_offset_div(6);</div><div class='del'>-fan_offset_div(7);</div><div class='del'>-fan_offset_div(8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_div, fan_div, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan4_div, fan_div, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan5_div, fan_div, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan6_div, fan_div, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan7_div, fan_div, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan8_div, fan_div, 7);</div><div class='ctx'> </div><div class='ctx'> /* Temps */</div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_min_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -816,16 +839,17 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_max_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -846,30 +870,27 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,	\</div><div class='del'>-		NULL, offset - 1);					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_min, set_temp_min, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_max, set_temp_max, offset - 1);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-temp_reg(1);</div><div class='del'>-temp_reg(2);</div><div class='del'>-temp_reg(3);</div><div class='del'>-</div><div class='del'>-static ssize_t show_temp_offset(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='add'>+</div><div class='add'>+static ssize_t temp_offset_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_offset[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_offset(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf,</div><div class='del'>-		size_t count)</div><div class='add'>+static ssize_t temp_offset_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 sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -890,16 +911,13 @@ static ssize_t set_temp_offset(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_offset_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_offset, set_temp_offset, offset - 1);</div><div class='del'>-</div><div class='del'>-temp_offset_reg(1);</div><div class='del'>-temp_offset_reg(2);</div><div class='del'>-temp_offset_reg(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_offset, temp_offset, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_offset, temp_offset, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_offset, temp_offset, 2);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_point1_temp_hyst_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 sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -907,8 +925,9 @@ static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(</div><div class='ctx'> 		ADM1026_FAN_ACTIVATION_TEMP_HYST + data-&gt;temp_tmin[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_auto_point2_temp(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_point2_temp_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 sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -916,16 +935,18 @@ static ssize_t show_temp_auto_point2_temp(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_tmin[nr] +</div><div class='ctx'> 		ADM1026_FAN_CONTROL_TEMP_RANGE));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_auto_point1_temp(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_point1_temp_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 sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_tmin[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_auto_point1_temp(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_auto_point1_temp_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 sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -946,18 +967,18 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_auto_point(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp,		\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_temp_auto_point1_temp,		\</div><div class='del'>-		set_temp_auto_point1_temp, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO,\</div><div class='del'>-		show_temp_auto_point1_temp_hyst, NULL, offset - 1);	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO,	\</div><div class='del'>-		show_temp_auto_point2_temp, NULL, offset - 1);</div><div class='del'>-</div><div class='del'>-temp_auto_point(1);</div><div class='del'>-temp_auto_point(2);</div><div class='del'>-temp_auto_point(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_auto_point1_temp, temp_auto_point1_temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_auto_point1_temp_hyst,</div><div class='add'>+			     temp_auto_point1_temp_hyst, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_auto_point2_temp, temp_auto_point2_temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_auto_point1_temp, temp_auto_point1_temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_auto_point1_temp_hyst,</div><div class='add'>+			     temp_auto_point1_temp_hyst, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_auto_point2_temp, temp_auto_point2_temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_auto_point1_temp, temp_auto_point1_temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_auto_point1_temp_hyst,</div><div class='add'>+			     temp_auto_point1_temp_hyst, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_auto_point2_temp, temp_auto_point2_temp, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_temp_crit_enable(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -988,24 +1009,24 @@ static ssize_t set_temp_crit_enable(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_crit_enable(offset)				\</div><div class='del'>-static DEVICE_ATTR(temp##offset##_crit_enable, S_IRUGO | S_IWUSR, \</div><div class='del'>-	show_temp_crit_enable, set_temp_crit_enable);</div><div class='add'>+static DEVICE_ATTR(temp1_crit_enable, 0644, show_temp_crit_enable,</div><div class='add'>+		   set_temp_crit_enable);</div><div class='add'>+static DEVICE_ATTR(temp2_crit_enable, 0644, show_temp_crit_enable,</div><div class='add'>+		   set_temp_crit_enable);</div><div class='add'>+static DEVICE_ATTR(temp3_crit_enable, 0644, show_temp_crit_enable,</div><div class='add'>+		   set_temp_crit_enable);</div><div class='ctx'> </div><div class='del'>-temp_crit_enable(1);</div><div class='del'>-temp_crit_enable(2);</div><div class='del'>-temp_crit_enable(3);</div><div class='del'>-</div><div class='del'>-static ssize_t show_temp_crit(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_crit_show(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_crit[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_crit_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, const char *buf,</div><div class='add'>+			       size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -1026,13 +1047,9 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_crit_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_crit, set_temp_crit, offset - 1);</div><div class='del'>-</div><div class='del'>-temp_crit_reg(1);</div><div class='del'>-temp_crit_reg(2);</div><div class='del'>-temp_crit_reg(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_crit, temp_crit, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_crit, temp_crit, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_crit, temp_crit, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t analog_out_show(struct device *dev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -1110,7 +1127,7 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1026_data *data = adm1026_update_device(dev);</div><div class='hunk'>@@ -1118,34 +1135,34 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%ld\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in9_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in11_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in12_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in13_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in14_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in15_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in16_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 10);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 12);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 13);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 14);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 15);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 16);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 17);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 18);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 19);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 20);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan6_alarm, S_IRUGO, show_alarm, NULL, 21);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan7_alarm, S_IRUGO, show_alarm, NULL, 22);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan8_alarm, S_IRUGO, show_alarm, NULL, 23);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 24);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in10_alarm, S_IRUGO, show_alarm, NULL, 25);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 26);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in9_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in11_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in12_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in13_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in14_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in15_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in16_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 16);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 17);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_alarm, alarm, 18);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan4_alarm, alarm, 19);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan5_alarm, alarm, 20);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan6_alarm, alarm, 21);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan7_alarm, alarm, 22);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan8_alarm, alarm, 23);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 24);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in10_alarm, alarm, 25);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in8_alarm, alarm, 26);</div><div class='ctx'> </div><div class='ctx'> static ssize_t alarm_mask_show(struct device *dev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -1188,7 +1205,6 @@ static ssize_t alarm_mask_store(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RW(alarm_mask);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static ssize_t gpio_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1371,23 +1387,23 @@ static ssize_t pwm1_enable_store(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> /* enable PWM fan control */</div><div class='ctx'> static DEVICE_ATTR_RW(pwm1);</div><div class='del'>-static DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, pwm1_show, pwm1_store);</div><div class='del'>-static DEVICE_ATTR(pwm3, S_IRUGO | S_IWUSR, pwm1_show, pwm1_store);</div><div class='add'>+static DEVICE_ATTR(pwm2, 0644, pwm1_show, pwm1_store);</div><div class='add'>+static DEVICE_ATTR(pwm3, 0644, pwm1_show, pwm1_store);</div><div class='ctx'> static DEVICE_ATTR_RW(pwm1_enable);</div><div class='del'>-static DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR, pwm1_enable_show,</div><div class='add'>+static DEVICE_ATTR(pwm2_enable, 0644, pwm1_enable_show,</div><div class='ctx'> 		   pwm1_enable_store);</div><div class='del'>-static DEVICE_ATTR(pwm3_enable, S_IRUGO | S_IWUSR, pwm1_enable_show,</div><div class='add'>+static DEVICE_ATTR(pwm3_enable, 0644, pwm1_enable_show,</div><div class='ctx'> 		   pwm1_enable_store);</div><div class='ctx'> static DEVICE_ATTR_RW(temp1_auto_point1_pwm);</div><div class='del'>-static DEVICE_ATTR(temp2_auto_point1_pwm, S_IRUGO | S_IWUSR,</div><div class='del'>-	temp1_auto_point1_pwm_show, temp1_auto_point1_pwm_store);</div><div class='del'>-static DEVICE_ATTR(temp3_auto_point1_pwm, S_IRUGO | S_IWUSR,</div><div class='del'>-	temp1_auto_point1_pwm_show, temp1_auto_point1_pwm_store);</div><div class='add'>+static DEVICE_ATTR(temp2_auto_point1_pwm, 0644,</div><div class='add'>+		   temp1_auto_point1_pwm_show, temp1_auto_point1_pwm_store);</div><div class='add'>+static DEVICE_ATTR(temp3_auto_point1_pwm, 0644,</div><div class='add'>+		   temp1_auto_point1_pwm_show, temp1_auto_point1_pwm_store);</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(temp1_auto_point2_pwm);</div><div class='del'>-static DEVICE_ATTR(temp2_auto_point2_pwm, S_IRUGO, temp1_auto_point2_pwm_show,</div><div class='add'>+static DEVICE_ATTR(temp2_auto_point2_pwm, 0444, temp1_auto_point2_pwm_show,</div><div class='ctx'> 		   NULL);</div><div class='del'>-static DEVICE_ATTR(temp3_auto_point2_pwm, S_IRUGO, temp1_auto_point2_pwm_show,</div><div class='add'>+static DEVICE_ATTR(temp3_auto_point2_pwm, 0444, temp1_auto_point2_pwm_show,</div><div class='ctx'> 		   NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *adm1026_attributes[] = {</div><div class='head'>diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c<br/>index e561279aea21..388060ff85e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1029.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1029.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1029.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adm1029.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ static struct adm1029_data *adm1029_update_device(struct device *dev)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+temp_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm1029_data *data = adm1029_update_device(dev);</div><div class='hunk'>@@ -175,7 +175,7 @@ show_temp(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_fan(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+fan_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm1029_data *data = adm1029_update_device(dev);</div><div class='hunk'>@@ -193,7 +193,7 @@ show_fan(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+fan_div_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm1029_data *data = adm1029_update_device(dev);</div><div class='hunk'>@@ -203,8 +203,9 @@ show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> 	return sprintf(buf, "%d\n", DIV_FROM_REG(data-&gt;fan_div[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *devattr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *devattr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1029_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -254,26 +255,26 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Access rights on sysfs. */</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_input, 0444, show_temp, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_input, 0444, show_temp, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_input, 0444, show_temp, NULL, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_max, 0444, show_temp, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_max, 0444, show_temp, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_max, 0444, show_temp, NULL, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_max, temp, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_max, temp, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_max, temp, 5);</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_min, 0444, show_temp, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_min, 0444, show_temp, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_min, 0444, show_temp, NULL, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_min, temp, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_min, temp, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_min, temp, 8);</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_input, 0444, show_fan, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_input, 0444, show_fan, NULL, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_min, 0444, show_fan, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_min, 0444, show_fan, NULL, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_min, fan, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_min, fan, 3);</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_div, 0644, show_fan_div, set_fan_div, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_div, 0644, show_fan_div, set_fan_div, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *adm1029_attrs[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='head'>diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c<br/>index bcf508269fd6..6b46d8eaa775 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1031.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm1031.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm1031.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adm1031.c</a></div><div class='hunk'>@@ -331,7 +331,7 @@ get_fan_auto_nearest(struct adm1031_data *data, int chan, u8 val, u8 reg)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_auto_channel(struct device *dev,</div><div class='add'>+static ssize_t fan_auto_channel_show(struct device *dev,</div><div class='ctx'> 				     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -340,8 +340,8 @@ static ssize_t show_fan_auto_channel(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-set_fan_auto_channel(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		     const char *buf, size_t count)</div><div class='add'>+fan_auto_channel_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -392,13 +392,11 @@ set_fan_auto_channel(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_fan1_channel, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_fan_auto_channel, set_fan_auto_channel, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_fan2_channel, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_fan_auto_channel, set_fan_auto_channel, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_fan1_channel, fan_auto_channel, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_fan2_channel, fan_auto_channel, 1);</div><div class='ctx'> </div><div class='ctx'> /* Auto Temps */</div><div class='del'>-static ssize_t show_auto_temp_off(struct device *dev,</div><div class='add'>+static ssize_t auto_temp_off_show(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -406,7 +404,7 @@ static ssize_t show_auto_temp_off(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n",</div><div class='ctx'> 		       AUTO_TEMP_OFF_FROM_REG(data-&gt;auto_temp[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_auto_temp_min(struct device *dev,</div><div class='add'>+static ssize_t auto_temp_min_show(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -415,8 +413,8 @@ static ssize_t show_auto_temp_min(struct device *dev,</div><div class='ctx'> 		       AUTO_TEMP_MIN_FROM_REG(data-&gt;auto_temp[nr]));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-set_auto_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		  const char *buf, size_t count)</div><div class='add'>+auto_temp_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -436,7 +434,7 @@ set_auto_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_auto_temp_max(struct device *dev,</div><div class='add'>+static ssize_t auto_temp_max_show(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -445,8 +443,8 @@ static ssize_t show_auto_temp_max(struct device *dev,</div><div class='ctx'> 		       AUTO_TEMP_MAX_FROM_REG(data-&gt;auto_temp[nr]));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-set_auto_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		  const char *buf, size_t count)</div><div class='add'>+auto_temp_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -468,28 +466,26 @@ set_auto_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define auto_temp_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO,		\</div><div class='del'>-		show_auto_temp_off, NULL, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_temp##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_auto_temp_min, set_auto_temp_min, offset - 1);	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_auto_temp_max, set_auto_temp_max, offset - 1)</div><div class='del'>-</div><div class='del'>-auto_temp_reg(1);</div><div class='del'>-auto_temp_reg(2);</div><div class='del'>-auto_temp_reg(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(auto_temp1_off, auto_temp_off, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_temp1_min, auto_temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_temp1_max, auto_temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(auto_temp2_off, auto_temp_off, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_temp2_min, auto_temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_temp2_max, auto_temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(auto_temp3_off, auto_temp_off, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_temp3_min, auto_temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_temp3_max, auto_temp_max, 2);</div><div class='ctx'> </div><div class='ctx'> /* pwm */</div><div class='del'>-static ssize_t show_pwm(struct device *dev,</div><div class='del'>-			struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pwm_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", PWM_FROM_REG(data-&gt;pwm[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		       const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -517,12 +513,10 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_fan1_min_pwm, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_pwm, set_pwm, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(auto_fan2_min_pwm, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_pwm, set_pwm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_fan1_min_pwm, pwm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(auto_fan2_min_pwm, pwm, 1);</div><div class='ctx'> </div><div class='ctx'> /* Fans */</div><div class='ctx'> </div><div class='hunk'>@@ -572,9 +566,8 @@ static int trust_fan_readings(struct adm1031_data *data, int chan)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static ssize_t show_fan(struct device *dev,</div><div class='del'>-			struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='hunk'>@@ -585,15 +578,15 @@ static ssize_t show_fan(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_div(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_fan_min(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='hunk'>@@ -601,8 +594,9 @@ static ssize_t show_fan_min(struct device *dev,</div><div class='ctx'> 		       FAN_FROM_REG(data-&gt;fan_min[nr],</div><div class='ctx'> 				    FAN_DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -625,8 +619,9 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -673,21 +668,16 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define fan_offset(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\</div><div class='del'>-		show_fan, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_div, set_fan_div, offset - 1)</div><div class='del'>-</div><div class='del'>-fan_offset(1);</div><div class='del'>-fan_offset(2);</div><div class='del'>-</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> /* Temps */</div><div class='del'>-static ssize_t show_temp(struct device *dev,</div><div class='del'>-			 struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='hunk'>@@ -697,7 +687,7 @@ static ssize_t show_temp(struct device *dev,</div><div class='ctx'> 	    (((data-&gt;ext_temp[nr] &gt;&gt; ((nr - 1) * 3)) &amp; 7));</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG_EXT(data-&gt;temp[nr], ext));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_offset(struct device *dev,</div><div class='add'>+static ssize_t temp_offset_show(struct device *dev,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -705,30 +695,30 @@ static ssize_t show_temp_offset(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n",</div><div class='ctx'> 		       TEMP_OFFSET_FROM_REG(data-&gt;temp_offset[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_min(struct device *dev,</div><div class='add'>+static ssize_t temp_min_show(struct device *dev,</div><div class='ctx'> 			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_max(struct device *dev,</div><div class='add'>+static ssize_t temp_max_show(struct device *dev,</div><div class='ctx'> 			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_crit(struct device *dev,</div><div class='add'>+static ssize_t temp_crit_show(struct device *dev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_crit[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_offset(struct device *dev,</div><div class='del'>-			       struct device_attribute *attr, const char *buf,</div><div class='del'>-			       size_t count)</div><div class='add'>+static ssize_t temp_offset_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 adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -748,8 +738,9 @@ static ssize_t set_temp_offset(struct device *dev,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -769,8 +760,9 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -790,8 +782,9 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_crit_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, const char *buf,</div><div class='add'>+			       size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -812,21 +805,21 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_temp, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_offset, set_temp_offset, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_min, set_temp_min, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_max, set_temp_max, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_crit, set_temp_crit, offset - 1)</div><div class='del'>-</div><div class='del'>-temp_reg(1);</div><div class='del'>-temp_reg(2);</div><div class='del'>-temp_reg(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_offset, temp_offset, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_crit, temp_crit, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_offset, temp_offset, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_crit, temp_crit, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_offset, temp_offset, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_crit, temp_crit, 2);</div><div class='ctx'> </div><div class='ctx'> /* Alarms */</div><div class='ctx'> static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -838,29 +831,29 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev,</div><div class='del'>-			  struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", (data-&gt;alarm &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_fault, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 10);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_min_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 12);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 13);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_fault, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_max_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_min_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_min_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_fault, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_max_alarm, alarm, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_min_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_crit_alarm, alarm, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 14);</div><div class='ctx'> </div><div class='ctx'> /* Update Interval */</div><div class='ctx'> static const unsigned int update_intervals[] = {</div><div class='head'>diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c<br/>index 255413fdbde9..000b20f1db71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm9240.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adm9240.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adm9240.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adm9240.c</a></div><div class='hunk'>@@ -269,16 +269,16 @@ static ssize_t temp1_input_show(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;temp / 128 * 500); /* 9-bit value */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_max(struct device *dev, struct device_attribute *devattr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t max_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;temp_max[attr-&gt;index] * 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_max(struct device *dev, struct device_attribute *devattr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t max_store(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -299,14 +299,12 @@ static ssize_t set_max(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(temp1_input);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,</div><div class='del'>-		show_max, set_max, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,</div><div class='del'>-		show_max, set_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max_hyst, max, 1);</div><div class='ctx'> </div><div class='ctx'> /* voltage */</div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *devattr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='hunk'>@@ -314,8 +312,8 @@ static ssize_t show_in(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 				attr-&gt;index));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr, char *buf)</div><div class='add'>+static ssize_t in_min_show(struct device *dev,</div><div class='add'>+			   struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='hunk'>@@ -323,8 +321,8 @@ static ssize_t show_in_min(struct device *dev,</div><div class='ctx'> 				attr-&gt;index));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr, char *buf)</div><div class='add'>+static ssize_t in_max_show(struct device *dev,</div><div class='add'>+			   struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='hunk'>@@ -332,9 +330,9 @@ static ssize_t show_in_max(struct device *dev,</div><div class='ctx'> 				attr-&gt;index));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, const char *buf,</div><div class='add'>+			    size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -354,9 +352,9 @@ static ssize_t set_in_min(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, const char *buf,</div><div class='add'>+			    size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -376,24 +374,28 @@ static ssize_t set_in_max(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define vin(nr)							\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##nr##_input, S_IRUGO,		\</div><div class='del'>-		show_in, NULL, nr);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##nr##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, nr);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##nr##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, nr);</div><div class='del'>-</div><div class='del'>-vin(0);</div><div class='del'>-vin(1);</div><div class='del'>-vin(2);</div><div class='del'>-vin(3);</div><div class='del'>-vin(4);</div><div class='del'>-vin(5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='ctx'> </div><div class='ctx'> /* fans */</div><div class='del'>-static ssize_t show_fan(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr, char *buf)</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='hunk'>@@ -401,8 +403,8 @@ static ssize_t show_fan(struct device *dev,</div><div class='ctx'> 				1 &lt;&lt; data-&gt;fan_div[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_min(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr, char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='hunk'>@@ -410,8 +412,8 @@ static ssize_t show_fan_min(struct device *dev,</div><div class='ctx'> 				1 &lt;&lt; data-&gt;fan_div[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_div(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr, char *buf)</div><div class='add'>+static ssize_t fan_div_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='hunk'>@@ -429,9 +431,9 @@ static ssize_t show_fan_div(struct device *dev,</div><div class='ctx'>  * - otherwise: select fan clock divider to suit fan speed low limit,</div><div class='ctx'>  *   measurement code may adjust registers to ensure fan speed reading</div><div class='ctx'>  */</div><div class='del'>-static ssize_t set_fan_min(struct device *dev,</div><div class='del'>-		struct device_attribute *devattr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *devattr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct adm9240_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -489,16 +491,12 @@ static ssize_t set_fan_min(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define fan(nr)							\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##nr##_input, S_IRUGO,		\</div><div class='del'>-		show_fan, NULL, nr - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##nr##_div, S_IRUGO,		\</div><div class='del'>-		show_fan_div, NULL, nr - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##nr##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_fan_min, set_fan_min, nr - 1);</div><div class='del'>-</div><div class='del'>-fan(1);</div><div class='del'>-fan(2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> /* alarms */</div><div class='ctx'> static ssize_t alarms_show(struct device *dev,</div><div class='hunk'>@@ -509,22 +507,22 @@ static ssize_t alarms_show(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct adm9240_data *data = adm9240_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='ctx'> </div><div class='ctx'> /* vid */</div><div class='ctx'> static ssize_t cpu0_vid_show(struct device *dev,</div><div class='hunk'>@@ -564,9 +562,8 @@ static ssize_t aout_output_store(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(aout_output);</div><div class='ctx'> </div><div class='del'>-static ssize_t chassis_clear(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 alarm_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm9240_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -583,8 +580,7 @@ static ssize_t chassis_clear(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IRUGO | S_IWUSR, show_alarm,</div><div class='del'>-		chassis_clear, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(intrusion0_alarm, alarm, 12);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *adm9240_attrs[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='hunk'>@@ -632,7 +628,6 @@ static struct attribute *adm9240_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> ATTRIBUTE_GROUPS(adm9240);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*** sensor chip detect and driver install ***/</div><div class='ctx'> </div><div class='ctx'> /* Return 0 if detection is successful, -ENODEV otherwise */</div><div class='head'>diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c<br/>index c21b0529adb2..412ab7015d75 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ads1015.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ads1015.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ads1015.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ads1015.c</a></div><div class='hunk'>@@ -307,7 +307,7 @@ static const struct i2c_device_id ads1015_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ads1015_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ads1015_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ads1015_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,ads1015",</div><div class='ctx'> 		.data = (void *)ads1015</div><div class='head'>diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c<br/>index 12c56d3783ed..03d6e782777a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ads7828.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ads7828.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ads7828.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ads7828.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * ADS7830 support, by Guillaume Roguez &lt;guillaume.roguez@savoirfairelinux.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * For further information, see the Documentation/hwmon/ads7828 file.</div><div class='add'>+ * For further information, see the Documentation/hwmon/ads7828.rst file.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -200,7 +200,7 @@ static const struct i2c_device_id ads7828_device_ids[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ads7828_device_ids);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ads7828_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ads7828_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,ads7828",</div><div class='ctx'> 		.data = (void *)ads7828</div><div class='head'>diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c<br/>index b939f8a115ba..44a827b031cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adt7411.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adt7411.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adt7411.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adt7411.c</a></div><div class='hunk'>@@ -639,40 +639,22 @@ static int adt7411_init_device(struct adt7411_data *data)</div><div class='ctx'> 	return i2c_smbus_write_byte_data(data-&gt;client, ADT7411_REG_CFG1, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 adt7411_in_config[] = {</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info adt7411_in = {</div><div class='del'>-	.type = hwmon_in,</div><div class='del'>-	.config = adt7411_in_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 adt7411_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |</div><div class='del'>-		HWMON_T_MAX | HWMON_T_MAX_ALARM,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |</div><div class='del'>-		HWMON_T_MAX | HWMON_T_MAX_ALARM | HWMON_T_FAULT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info adt7411_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = adt7411_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *adt7411_info[] = {</div><div class='del'>-	&amp;adt7411_in,</div><div class='del'>-	&amp;adt7411_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(in,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |</div><div class='add'>+			   HWMON_T_MAX | HWMON_T_MAX_ALARM,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |</div><div class='add'>+			   HWMON_T_MAX | HWMON_T_MAX_ALARM | HWMON_T_FAULT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c<br/>index 0dbb8df74e44..7caec127df86 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adt7475.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/adt7475.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/adt7475.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/adt7475.c</a></div><div class='hunk'>@@ -168,7 +168,7 @@ static const struct i2c_device_id adt7475_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, adt7475_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id adt7475_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused adt7475_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "adi,adt7473",</div><div class='ctx'> 		.data = (void *)adt7473</div><div class='head'>diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c<br/>index 73c681162653..623736d2a7c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/f71805f.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/f71805f.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/f71805f.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/f71805f.c</a></div><div class='hunk'>@@ -96,17 +96,23 @@ superio_select(int base, int ld)</div><div class='ctx'> 	outb(ld, base + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static inline int</div><div class='ctx'> superio_enter(int base)</div><div class='ctx'> {</div><div class='add'>+	if (!request_muxed_region(base, 2, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	outb(0x87, base);</div><div class='ctx'> 	outb(0x87, base);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> superio_exit(int base)</div><div class='ctx'> {</div><div class='ctx'> 	outb(0xaa, base);</div><div class='add'>+	release_region(base, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1561,7 +1567,7 @@ exit:</div><div class='ctx'> static int __init f71805f_find(int sioaddr, unsigned short *address,</div><div class='ctx'> 			       struct f71805f_sio_data *sio_data)</div><div class='ctx'> {</div><div class='del'>-	int err = -ENODEV;</div><div class='add'>+	int err;</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> </div><div class='ctx'> 	static const char * const names[] = {</div><div class='hunk'>@@ -1569,8 +1575,11 @@ static int __init f71805f_find(int sioaddr, unsigned short *address,</div><div class='ctx'> 		"F71872F/FG or F71806F/FG",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	superio_enter(sioaddr);</div><div class='add'>+	err = superio_enter(sioaddr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	err = -ENODEV;</div><div class='ctx'> 	devid = superio_inw(sioaddr, SIO_REG_MANID);</div><div class='ctx'> 	if (devid != SIO_FINTEK_ID)</div><div class='ctx'> 		goto exit;</div><div class='head'>diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c<br/>index 042a166e1858..8fb54079fac8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/fschmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/fschmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/fschmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/fschmd.c</a></div><div class='hunk'>@@ -837,7 +837,7 @@ static int watchdog_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	watchdog_trigger(data);</div><div class='ctx'> 	filp-&gt;private_data = data;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int watchdog_release(struct inode *inode, struct file *filp)</div><div class='head'>diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c<br/>index d167fcfec765..2bf9599b34a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/hih6130.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/hih6130.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/hih6130.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/hih6130.c</a></div><div class='hunk'>@@ -252,7 +252,7 @@ static const struct i2c_device_id hih6130_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, hih6130_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id hih6130_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused hih6130_of_match[] = {</div><div class='ctx'> 	{ .compatible = "honeywell,hih6130", },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c<br/>index c22dc1e07911..cd91510a5387 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/hwmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/hwmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/hwmon.c</a></div><div class='hunk'>@@ -324,6 +324,11 @@ static const char * const hwmon_chip_attrs[] = {</div><div class='ctx'> 	[hwmon_chip_power_reset_history] = "power_reset_history",</div><div class='ctx'> 	[hwmon_chip_update_interval] = "update_interval",</div><div class='ctx'> 	[hwmon_chip_alarms] = "alarms",</div><div class='add'>+	[hwmon_chip_samples] = "samples",</div><div class='add'>+	[hwmon_chip_curr_samples] = "curr_samples",</div><div class='add'>+	[hwmon_chip_in_samples] = "in_samples",</div><div class='add'>+	[hwmon_chip_power_samples] = "power_samples",</div><div class='add'>+	[hwmon_chip_temp_samples] = "temp_samples",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char * const hwmon_temp_attr_templates[] = {</div><div class='head'>diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c<br/>index 5c3c08449de7..1770423f7a80 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/iio_hwmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/iio_hwmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/iio_hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/iio_hwmon.c</a></div><div class='hunk'>@@ -92,6 +92,9 @@ static int iio_hwmon_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; st-&gt;num_channels; i++) {</div><div class='add'>+		const char *prefix;</div><div class='add'>+		int n;</div><div class='add'>+</div><div class='ctx'> 		a = devm_kzalloc(dev, sizeof(*a), GFP_KERNEL);</div><div class='ctx'> 		if (a == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -103,28 +106,28 @@ static int iio_hwmon_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case IIO_VOLTAGE:</div><div class='del'>-			a-&gt;dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,</div><div class='del'>-							       "in%d_input",</div><div class='del'>-							       in_i++);</div><div class='add'>+			n = in_i++;</div><div class='add'>+			prefix = "in";</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IIO_TEMP:</div><div class='del'>-			a-&gt;dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,</div><div class='del'>-							       "temp%d_input",</div><div class='del'>-							       temp_i++);</div><div class='add'>+			n = temp_i++;</div><div class='add'>+			prefix = "temp";</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IIO_CURRENT:</div><div class='del'>-			a-&gt;dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,</div><div class='del'>-							       "curr%d_input",</div><div class='del'>-							       curr_i++);</div><div class='add'>+			n = curr_i++;</div><div class='add'>+			prefix = "curr";</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IIO_HUMIDITYRELATIVE:</div><div class='del'>-			a-&gt;dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,</div><div class='del'>-							       "humidity%d_input",</div><div class='del'>-							       humidity_i++);</div><div class='add'>+			n = humidity_i++;</div><div class='add'>+			prefix = "humidity";</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		a-&gt;dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,</div><div class='add'>+						       "%s%d_input",</div><div class='add'>+						       prefix, n);</div><div class='ctx'> 		if (a-&gt;dev_attr.attr.name == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/ina209.c b/drivers/hwmon/ina209.c<br/>index e3854463db84..6a4ec2f2ddb2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ina209.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ina209.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ina209.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ina209.c</a></div><div class='hunk'>@@ -587,7 +587,7 @@ static const struct i2c_device_id ina209_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ina209_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ina209_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ina209_of_match[] = {</div><div class='ctx'> 	{ .compatible = "ti,ina209" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c<br/>index 290379c49be9..42df51f8cdf2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ina2xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ina2xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ina2xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ina2xx.c</a></div><div class='hunk'>@@ -507,7 +507,7 @@ static const struct i2c_device_id ina2xx_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ina2xx_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ina2xx_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ina2xx_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,ina219",</div><div class='ctx'> 		.data = (void *)ina219</div><div class='head'>diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c<br/>index 3626b87a5fd2..e0637fed9585 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ina3221.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ina3221.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ina3221.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ina3221.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define INA3221_DRIVER_NAME		"ina3221"</div><div class='ctx'> </div><div class='hunk'>@@ -51,6 +52,9 @@</div><div class='ctx'> #define INA3221_CONFIG_VBUS_CT_SHIFT	6</div><div class='ctx'> #define INA3221_CONFIG_VBUS_CT_MASK	GENMASK(8, 6)</div><div class='ctx'> #define INA3221_CONFIG_VBUS_CT(x)	(((x) &amp; GENMASK(8, 6)) &gt;&gt; 6)</div><div class='add'>+#define INA3221_CONFIG_AVG_SHIFT	9</div><div class='add'>+#define INA3221_CONFIG_AVG_MASK		GENMASK(11, 9)</div><div class='add'>+#define INA3221_CONFIG_AVG(x)		(((x) &amp; GENMASK(11, 9)) &gt;&gt; 9)</div><div class='ctx'> #define INA3221_CONFIG_CHs_EN_MASK	GENMASK(14, 12)</div><div class='ctx'> #define INA3221_CONFIG_CHx_EN(x)	BIT(14 - (x))</div><div class='ctx'> </div><div class='hunk'>@@ -135,17 +139,42 @@ static const u16 ina3221_conv_time[] = {</div><div class='ctx'> 	140, 204, 332, 588, 1100, 2116, 4156, 8244,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int ina3221_wait_for_data(struct ina3221_data *ina)</div><div class='add'>+/* Lookup table for number of samples using in averaging mode */</div><div class='add'>+static const int ina3221_avg_samples[] = {</div><div class='add'>+	1, 4, 16, 64, 128, 256, 512, 1024,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Converting update_interval in msec to conversion time in usec */</div><div class='add'>+static inline u32 ina3221_interval_ms_to_conv_time(u16 config, int interval)</div><div class='add'>+{</div><div class='add'>+	u32 channels = hweight16(config &amp; INA3221_CONFIG_CHs_EN_MASK);</div><div class='add'>+	u32 samples_idx = INA3221_CONFIG_AVG(config);</div><div class='add'>+	u32 samples = ina3221_avg_samples[samples_idx];</div><div class='add'>+</div><div class='add'>+	/* Bisect the result to Bus and Shunt conversion times */</div><div class='add'>+	return DIV_ROUND_CLOSEST(interval * 1000 / 2, channels * samples);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Converting CONFIG register value to update_interval in usec */</div><div class='add'>+static inline u32 ina3221_reg_to_interval_us(u16 config)</div><div class='ctx'> {</div><div class='del'>-	u32 channels = hweight16(ina-&gt;reg_config &amp; INA3221_CONFIG_CHs_EN_MASK);</div><div class='del'>-	u32 vbus_ct_idx = INA3221_CONFIG_VBUS_CT(ina-&gt;reg_config);</div><div class='del'>-	u32 vsh_ct_idx = INA3221_CONFIG_VSH_CT(ina-&gt;reg_config);</div><div class='add'>+	u32 channels = hweight16(config &amp; INA3221_CONFIG_CHs_EN_MASK);</div><div class='add'>+	u32 vbus_ct_idx = INA3221_CONFIG_VBUS_CT(config);</div><div class='add'>+	u32 vsh_ct_idx = INA3221_CONFIG_VSH_CT(config);</div><div class='add'>+	u32 samples_idx = INA3221_CONFIG_AVG(config);</div><div class='add'>+	u32 samples = ina3221_avg_samples[samples_idx];</div><div class='ctx'> 	u32 vbus_ct = ina3221_conv_time[vbus_ct_idx];</div><div class='ctx'> 	u32 vsh_ct = ina3221_conv_time[vsh_ct_idx];</div><div class='del'>-	u32 wait, cvrf;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate total conversion time */</div><div class='del'>-	wait = channels * (vbus_ct + vsh_ct);</div><div class='add'>+	return channels * (vbus_ct + vsh_ct) * samples;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ina3221_wait_for_data(struct ina3221_data *ina)</div><div class='add'>+{</div><div class='add'>+	u32 wait, cvrf;</div><div class='add'>+</div><div class='add'>+	wait = ina3221_reg_to_interval_us(ina-&gt;reg_config);</div><div class='ctx'> </div><div class='ctx'> 	/* Polling the CVRF bit to make sure read data is ready */</div><div class='ctx'> 	return regmap_field_read_poll_timeout(ina-&gt;fields[F_CVRF],</div><div class='hunk'>@@ -176,6 +205,26 @@ static const u8 ina3221_in_reg[] = {</div><div class='ctx'> 	INA3221_SHUNT3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ina3221_read_chip(struct device *dev, u32 attr, long *val)</div><div class='add'>+{</div><div class='add'>+	struct ina3221_data *ina = dev_get_drvdata(dev);</div><div class='add'>+	int regval;</div><div class='add'>+</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case hwmon_chip_samples:</div><div class='add'>+		regval = INA3221_CONFIG_AVG(ina-&gt;reg_config);</div><div class='add'>+		*val = ina3221_avg_samples[regval];</div><div class='add'>+		return 0;</div><div class='add'>+	case hwmon_chip_update_interval:</div><div class='add'>+		/* Return in msec */</div><div class='add'>+		*val = ina3221_reg_to_interval_us(ina-&gt;reg_config);</div><div class='add'>+		*val = DIV_ROUND_CLOSEST(*val, 1000);</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='ctx'> static int ina3221_read_in(struct device *dev, u32 attr, int channel, long *val)</div><div class='ctx'> {</div><div class='ctx'> 	const bool is_shunt = channel &gt; INA3221_CHANNEL3;</div><div class='hunk'>@@ -279,6 +328,48 @@ static int ina3221_read_curr(struct device *dev, u32 attr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ina3221_write_chip(struct device *dev, u32 attr, long val)</div><div class='add'>+{</div><div class='add'>+	struct ina3221_data *ina = dev_get_drvdata(dev);</div><div class='add'>+	int ret, idx;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case hwmon_chip_samples:</div><div class='add'>+		idx = find_closest(val, ina3221_avg_samples,</div><div class='add'>+				   ARRAY_SIZE(ina3221_avg_samples));</div><div class='add'>+</div><div class='add'>+		tmp = (ina-&gt;reg_config &amp; ~INA3221_CONFIG_AVG_MASK) |</div><div class='add'>+		      (idx &lt;&lt; INA3221_CONFIG_AVG_SHIFT);</div><div class='add'>+		ret = regmap_write(ina-&gt;regmap, INA3221_CONFIG, tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Update reg_config accordingly */</div><div class='add'>+		ina-&gt;reg_config = tmp;</div><div class='add'>+		return 0;</div><div class='add'>+	case hwmon_chip_update_interval:</div><div class='add'>+		tmp = ina3221_interval_ms_to_conv_time(ina-&gt;reg_config, val);</div><div class='add'>+		idx = find_closest(tmp, ina3221_conv_time,</div><div class='add'>+				   ARRAY_SIZE(ina3221_conv_time));</div><div class='add'>+</div><div class='add'>+		/* Update Bus and Shunt voltage conversion times */</div><div class='add'>+		tmp = INA3221_CONFIG_VBUS_CT_MASK | INA3221_CONFIG_VSH_CT_MASK;</div><div class='add'>+		tmp = (ina-&gt;reg_config &amp; ~tmp) |</div><div class='add'>+		      (idx &lt;&lt; INA3221_CONFIG_VBUS_CT_SHIFT) |</div><div class='add'>+		      (idx &lt;&lt; INA3221_CONFIG_VSH_CT_SHIFT);</div><div class='add'>+		ret = regmap_write(ina-&gt;regmap, INA3221_CONFIG, tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Update reg_config accordingly */</div><div class='add'>+		ina-&gt;reg_config = tmp;</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='ctx'> static int ina3221_write_curr(struct device *dev, u32 attr,</div><div class='ctx'> 			      int channel, long val)</div><div class='ctx'> {</div><div class='hunk'>@@ -309,6 +400,7 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)</div><div class='ctx'> 	struct ina3221_data *ina = dev_get_drvdata(dev);</div><div class='ctx'> 	u16 config, mask = INA3221_CONFIG_CHx_EN(channel);</div><div class='ctx'> 	u16 config_old = ina-&gt;reg_config &amp; mask;</div><div class='add'>+	u32 tmp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	config = enable ? mask : 0;</div><div class='hunk'>@@ -327,14 +419,13 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable or disable the channel */</div><div class='del'>-	ret = regmap_update_bits(ina-&gt;regmap, INA3221_CONFIG, mask, config);</div><div class='add'>+	tmp = (ina-&gt;reg_config &amp; ~mask) | (config &amp; mask);</div><div class='add'>+	ret = regmap_write(ina-&gt;regmap, INA3221_CONFIG, tmp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* Cache the latest config register value */</div><div class='del'>-	ret = regmap_read(ina-&gt;regmap, INA3221_CONFIG, &amp;ina-&gt;reg_config);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto fail;</div><div class='add'>+	ina-&gt;reg_config = tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* For disabling routine, decrease refcount or suspend() at last */</div><div class='ctx'> 	if (!enable)</div><div class='hunk'>@@ -361,6 +452,9 @@ static int ina3221_read(struct device *dev, enum hwmon_sensor_types type,</div><div class='ctx'> 	mutex_lock(&amp;ina-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='add'>+	case hwmon_chip:</div><div class='add'>+		ret = ina3221_read_chip(dev, attr, val);</div><div class='add'>+		break;</div><div class='ctx'> 	case hwmon_in:</div><div class='ctx'> 		/* 0-align channel ID */</div><div class='ctx'> 		ret = ina3221_read_in(dev, attr, channel - 1, val);</div><div class='hunk'>@@ -387,6 +481,9 @@ static int ina3221_write(struct device *dev, enum hwmon_sensor_types type,</div><div class='ctx'> 	mutex_lock(&amp;ina-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='add'>+	case hwmon_chip:</div><div class='add'>+		ret = ina3221_write_chip(dev, attr, val);</div><div class='add'>+		break;</div><div class='ctx'> 	case hwmon_in:</div><div class='ctx'> 		/* 0-align channel ID */</div><div class='ctx'> 		ret = ina3221_write_enable(dev, channel - 1, val);</div><div class='hunk'>@@ -423,6 +520,14 @@ static umode_t ina3221_is_visible(const void *drvdata,</div><div class='ctx'> 	const struct ina3221_input *input = NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='add'>+	case hwmon_chip:</div><div class='add'>+		switch (attr) {</div><div class='add'>+		case hwmon_chip_samples:</div><div class='add'>+		case hwmon_chip_update_interval:</div><div class='add'>+			return 0644;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case hwmon_in:</div><div class='ctx'> 		/* Ignore in0_ */</div><div class='ctx'> 		if (channel == 0)</div><div class='hunk'>@@ -458,44 +563,29 @@ static umode_t ina3221_is_visible(const void *drvdata,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 ina3221_in_config[] = {</div><div class='del'>-	/* 0: dummy, skipped in is_visible */</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	/* 1-3: input voltage Channels */</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,</div><div class='del'>-	/* 4-6: shunt voltage Channels */</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ina3221_in = {</div><div class='del'>-	.type = hwmon_in,</div><div class='del'>-	.config = ina3221_in_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define INA3221_HWMON_CURR_CONFIG (HWMON_C_INPUT | \</div><div class='ctx'> 				   HWMON_C_CRIT | HWMON_C_CRIT_ALARM | \</div><div class='ctx'> 				   HWMON_C_MAX | HWMON_C_MAX_ALARM)</div><div class='ctx'> </div><div class='del'>-static const u32 ina3221_curr_config[] = {</div><div class='del'>-	INA3221_HWMON_CURR_CONFIG,</div><div class='del'>-	INA3221_HWMON_CURR_CONFIG,</div><div class='del'>-	INA3221_HWMON_CURR_CONFIG,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ina3221_curr = {</div><div class='del'>-	.type = hwmon_curr,</div><div class='del'>-	.config = ina3221_curr_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *ina3221_info[] = {</div><div class='del'>-	&amp;ina3221_in,</div><div class='del'>-	&amp;ina3221_curr,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_SAMPLES,</div><div class='add'>+			   HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+	HWMON_CHANNEL_INFO(in,</div><div class='add'>+			   /* 0: dummy, skipped in is_visible */</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   /* 1-3: input voltage Channels */</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,</div><div class='add'>+			   /* 4-6: shunt voltage Channels */</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT),</div><div class='add'>+	HWMON_CHANNEL_INFO(curr,</div><div class='add'>+			   INA3221_HWMON_CURR_CONFIG,</div><div class='add'>+			   INA3221_HWMON_CURR_CONFIG,</div><div class='add'>+			   INA3221_HWMON_CURR_CONFIG),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c<br/>index 4fa482ae0eb5..6b57a6d4e626 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/jc42.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/jc42.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/jc42.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/jc42.c</a></div><div class='hunk'>@@ -451,20 +451,12 @@ static int jc42_detect(struct i2c_client *client, struct i2c_board_info *info)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 jc42_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | HWMON_T_CRIT |</div><div class='del'>-	HWMON_T_MAX_HYST | HWMON_T_CRIT_HYST |</div><div class='del'>-	HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info jc42_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = jc42_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *jc42_info[] = {</div><div class='del'>-	&amp;jc42_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX |</div><div class='add'>+			   HWMON_T_CRIT | HWMON_T_MAX_HYST |</div><div class='add'>+			   HWMON_T_CRIT_HYST | HWMON_T_MIN_ALARM |</div><div class='add'>+			   HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c<br/>index 2d40a2e771d7..7d5947595b45 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/jz4740-hwmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/jz4740-hwmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/jz4740-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/jz4740-hwmon.c</a></div><div class='hunk'>@@ -94,7 +94,6 @@ static int jz4740_hwmon_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct jz4740_hwmon *hwmon;</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='del'>-	struct resource *mem;</div><div class='ctx'> </div><div class='ctx'> 	hwmon = devm_kzalloc(dev, sizeof(*hwmon), GFP_KERNEL);</div><div class='ctx'> 	if (!hwmon)</div><div class='hunk'>@@ -109,8 +108,7 @@ static int jz4740_hwmon_probe(struct platform_device *pdev)</div><div class='ctx'> 		return hwmon-&gt;irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	hwmon-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='add'>+	hwmon-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(hwmon-&gt;base))</div><div class='ctx'> 		return PTR_ERR(hwmon-&gt;base);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c<br/>index eac54b9cdeec..8848fbe5fd16 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm63.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm63.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm63.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm63.c</a></div><div class='hunk'>@@ -1153,7 +1153,7 @@ static const struct i2c_device_id lm63_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lm63_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id lm63_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused lm63_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "national,lm63",</div><div class='ctx'> 		.data = (void *)lm63</div><div class='head'>diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c<br/>index 447af07450f1..423a382420b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm75.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm75.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm75.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm75.c</a></div><div class='hunk'>@@ -59,6 +59,7 @@ enum lm75_type {		/* keep sorted in alphabetical order */</div><div class='ctx'> 	tmp175,</div><div class='ctx'> 	tmp275,</div><div class='ctx'> 	tmp75,</div><div class='add'>+	tmp75b,</div><div class='ctx'> 	tmp75c,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -194,35 +195,11 @@ static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type,</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='del'>-/* device probe and removal */</div><div class='del'>-</div><div class='del'>-/* chip configuration */</div><div class='del'>-</div><div class='del'>-static const u32 lm75_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm75_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = lm75_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 lm75_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm75_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = lm75_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *lm75_info[] = {</div><div class='del'>-	&amp;lm75_chip,</div><div class='del'>-	&amp;lm75_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -378,6 +355,11 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> 		data-&gt;resolution = 12;</div><div class='ctx'> 		data-&gt;sample_time = MSEC_PER_SEC / 2;</div><div class='ctx'> 		break;</div><div class='add'>+	case tmp75b:  /* not one-shot mode, Conversion rate 37Hz */</div><div class='add'>+		clr_mask |= 1 &lt;&lt; 15 | 0x3 &lt;&lt; 13;</div><div class='add'>+		data-&gt;resolution = 12;</div><div class='add'>+		data-&gt;sample_time = MSEC_PER_SEC / 37;</div><div class='add'>+		break;</div><div class='ctx'> 	case tmp75c:</div><div class='ctx'> 		clr_mask |= 1 &lt;&lt; 5;		/* not one-shot mode */</div><div class='ctx'> 		data-&gt;resolution = 12;</div><div class='hunk'>@@ -438,12 +420,13 @@ static const struct i2c_device_id lm75_ids[] = {</div><div class='ctx'> 	{ "tmp175", tmp175, },</div><div class='ctx'> 	{ "tmp275", tmp275, },</div><div class='ctx'> 	{ "tmp75", tmp75, },</div><div class='add'>+	{ "tmp75b", tmp75b, },</div><div class='ctx'> 	{ "tmp75c", tmp75c, },</div><div class='ctx'> 	{ /* LIST END */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lm75_ids);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id lm75_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused lm75_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "adi,adt75",</div><div class='ctx'> 		.data = (void *)adt75</div><div class='hunk'>@@ -537,6 +520,10 @@ static const struct of_device_id lm75_of_match[] = {</div><div class='ctx'> 		.data = (void *)tmp75</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.compatible = "ti,tmp75b",</div><div class='add'>+		.data = (void *)tmp75b</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.compatible = "ti,tmp75c",</div><div class='ctx'> 		.data = (void *)tmp75c</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c<br/>index 0cb7ff613b80..eb95947673de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm78.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm78.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm78.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm78.c</a></div><div class='hunk'>@@ -73,7 +73,6 @@ enum chips { lm78, lm79 };</div><div class='ctx'> #define LM78_REG_CHIPID 0x49</div><div class='ctx'> #define LM78_REG_I2C_ADDR 0x48</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Conversions. Rounding and limit checking is only done on the TO_REG</div><div class='ctx'>  * variants.</div><div class='hunk'>@@ -147,15 +146,13 @@ struct lm78_data {</div><div class='ctx'> 	u16 alarms;		/* Register encoding, combined */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int lm78_read_value(struct lm78_data *data, u8 reg);</div><div class='ctx'> static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value);</div><div class='ctx'> static struct lm78_data *lm78_update_device(struct device *dev);</div><div class='ctx'> static void lm78_init_device(struct lm78_data *data);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* 7 Voltages */</div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -163,7 +160,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -171,7 +168,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_min[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -179,8 +176,8 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_max[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	struct lm78_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -199,8 +196,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *da,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	struct lm78_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -219,21 +216,27 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_in_offset(offset)					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_in, NULL, offset);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, offset);</div><div class='del'>-</div><div class='del'>-show_in_offset(0);</div><div class='del'>-show_in_offset(1);</div><div class='del'>-show_in_offset(2);</div><div class='del'>-show_in_offset(3);</div><div class='del'>-show_in_offset(4);</div><div class='del'>-show_in_offset(5);</div><div class='del'>-show_in_offset(6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_input, in, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);</div><div class='ctx'> </div><div class='ctx'> /* Temperature */</div><div class='ctx'> static ssize_t temp1_input_show(struct device *dev,</div><div class='hunk'>@@ -300,7 +303,7 @@ static DEVICE_ATTR_RW(temp1_max);</div><div class='ctx'> static DEVICE_ATTR_RW(temp1_max_hyst);</div><div class='ctx'> </div><div class='ctx'> /* 3 Fans */</div><div class='del'>-static ssize_t show_fan(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -310,7 +313,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -320,8 +323,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	struct lm78_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -340,7 +343,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -354,8 +357,8 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,</div><div class='ctx'>  * least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>  * because the divisor changed.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	struct lm78_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -413,22 +416,17 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_fan_offset(offset)				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_fan, NULL, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1);</div><div class='del'>-</div><div class='del'>-show_fan_offset(1);</div><div class='del'>-show_fan_offset(2);</div><div class='del'>-show_fan_offset(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_input, fan, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_min, fan_min, 2);</div><div class='ctx'> </div><div class='ctx'> /* Fan 3 divisor is locked in H/W */</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_fan_div, set_fan_div, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,</div><div class='del'>-		show_fan_div, set_fan_div, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_div, NULL, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_div, fan_div, 2);</div><div class='ctx'> </div><div class='ctx'> /* VID */</div><div class='ctx'> static ssize_t cpu0_vid_show(struct device *dev, struct device_attribute *da,</div><div class='hunk'>@@ -448,24 +446,24 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm78_data *data = lm78_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(da)-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; nr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 10);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *lm78_attrs[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='head'>diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c<br/>index a95d48316f06..80db367b4c54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm85.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm85.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm85.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm85.c</a></div><div class='hunk'>@@ -165,7 +165,6 @@ static inline u16 FAN_TO_REG(unsigned long val)</div><div class='ctx'> #define PWM_TO_REG(val)			clamp_val(val, 0, 255)</div><div class='ctx'> #define PWM_FROM_REG(val)		(val)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * ZONEs have the following parameters:</div><div class='ctx'>  *    Limit (low) temp,           1. degC</div><div class='hunk'>@@ -563,24 +562,25 @@ static struct lm85_data *lm85_update_device(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 4 Fans */</div><div class='del'>-static ssize_t show_fan(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -599,16 +599,14 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_fan_offset(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\</div><div class='del'>-		show_fan, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1)</div><div class='del'>-</div><div class='del'>-show_fan_offset(1);</div><div class='del'>-show_fan_offset(2);</div><div class='del'>-show_fan_offset(3);</div><div class='del'>-show_fan_offset(4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_input, fan, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_min, fan_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan4_input, fan, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan4_min, fan_min, 3);</div><div class='ctx'> </div><div class='ctx'> /* vid, vrm, alarms */</div><div class='ctx'> </div><div class='hunk'>@@ -667,44 +665,44 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; nr) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 18);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 16);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 17);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_alarm, NULL, 14);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 15);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 10);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 12);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 18);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 16);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 17);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_fault, alarm, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_alarm, alarm, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan4_alarm, alarm, 13);</div><div class='ctx'> </div><div class='ctx'> /* pwm */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t pwm_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", PWM_FROM_REG(data-&gt;pwm[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -723,8 +721,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm_enable(struct device *dev, struct device_attribute</div><div class='del'>-		*attr, char *buf)</div><div class='add'>+static ssize_t pwm_enable_show(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='hunk'>@@ -745,8 +743,9 @@ static ssize_t show_pwm_enable(struct device *dev, struct device_attribute</div><div class='ctx'> 	return sprintf(buf, "%d\n", enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm_enable(struct device *dev, struct device_attribute</div><div class='del'>-		*attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_enable_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -788,8 +787,8 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm_freq(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pwm_freq_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='hunk'>@@ -804,8 +803,9 @@ static ssize_t show_pwm_freq(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", freq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm_freq(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_freq_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -841,22 +841,20 @@ static ssize_t set_pwm_freq(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_pwm_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_pwm, set_pwm, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_pwm_enable, set_pwm_enable, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_freq, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_pwm_freq, set_pwm_freq, offset - 1)</div><div class='del'>-</div><div class='del'>-show_pwm_reg(1);</div><div class='del'>-show_pwm_reg(2);</div><div class='del'>-show_pwm_reg(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_enable, pwm_enable, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_freq, pwm_freq, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_enable, pwm_enable, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_freq, pwm_freq, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3, pwm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_enable, pwm_enable, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_freq, pwm_freq, 2);</div><div class='ctx'> </div><div class='ctx'> /* Voltages */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='hunk'>@@ -864,16 +862,16 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 						    data-&gt;in_ext[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -892,16 +890,16 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", INS_FROM_REG(nr, data-&gt;in_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -920,27 +918,35 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_in_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,			\</div><div class='del'>-		show_in, NULL, offset);					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_in_min, set_in_min, offset);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_in_max, set_in_max, offset)</div><div class='del'>-</div><div class='del'>-show_in_reg(0);</div><div class='del'>-show_in_reg(1);</div><div class='del'>-show_in_reg(2);</div><div class='del'>-show_in_reg(3);</div><div class='del'>-show_in_reg(4);</div><div class='del'>-show_in_reg(5);</div><div class='del'>-show_in_reg(6);</div><div class='del'>-show_in_reg(7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_input, in, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_input, in, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_min, in_min, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_max, in_max, 7);</div><div class='ctx'> </div><div class='ctx'> /* Temps */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='hunk'>@@ -948,16 +954,17 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 						     data-&gt;temp_ext[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_min_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -979,16 +986,17 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_max_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1010,31 +1018,30 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_temp_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_temp, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_min, set_temp_min, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_max, set_temp_max, offset - 1);</div><div class='del'>-</div><div class='del'>-show_temp_reg(1);</div><div class='del'>-show_temp_reg(2);</div><div class='del'>-show_temp_reg(3);</div><div class='del'>-</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='ctx'> </div><div class='ctx'> /* Automatic PWM control */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm_auto_channels(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pwm_auto_channels_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", ZONE_FROM_REG(data-&gt;autofan[nr].config));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm_auto_channels(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_auto_channels_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1055,16 +1062,17 @@ static ssize_t set_pwm_auto_channels(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm_auto_pwm_min(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pwm_auto_pwm_min_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", PWM_FROM_REG(data-&gt;autofan[nr].min_pwm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm_auto_pwm_min(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_auto_pwm_min_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1084,16 +1092,18 @@ static ssize_t set_pwm_auto_pwm_min(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm_auto_pwm_minctl(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pwm_auto_pwm_minctl_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;autofan[nr].min_off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm_auto_pwm_minctl(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_auto_pwm_minctl_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1117,25 +1127,21 @@ static ssize_t set_pwm_auto_pwm_minctl(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define pwm_auto(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_auto_channels,			\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_pwm_auto_channels,		\</div><div class='del'>-		set_pwm_auto_channels, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_min,			\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_pwm_auto_pwm_min,		\</div><div class='del'>-		set_pwm_auto_pwm_min, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_minctl,		\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_pwm_auto_pwm_minctl,		\</div><div class='del'>-		set_pwm_auto_pwm_minctl, offset - 1)</div><div class='del'>-</div><div class='del'>-pwm_auto(1);</div><div class='del'>-pwm_auto(2);</div><div class='del'>-pwm_auto(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_auto_channels, pwm_auto_channels, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_auto_pwm_min, pwm_auto_pwm_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_auto_pwm_minctl, pwm_auto_pwm_minctl, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_auto_channels, pwm_auto_channels, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_auto_pwm_min, pwm_auto_pwm_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_auto_pwm_minctl, pwm_auto_pwm_minctl, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_auto_channels, pwm_auto_channels, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_auto_pwm_min, pwm_auto_pwm_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_auto_pwm_minctl, pwm_auto_pwm_minctl, 2);</div><div class='ctx'> </div><div class='ctx'> /* Temperature settings for automatic PWM control */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_auto_temp_off(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_temp_off_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='hunk'>@@ -1143,8 +1149,9 @@ static ssize_t show_temp_auto_temp_off(struct device *dev,</div><div class='ctx'> 		HYST_FROM_REG(data-&gt;zone[nr].hyst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_auto_temp_off(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_auto_temp_off_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1172,16 +1179,18 @@ static ssize_t set_temp_auto_temp_off(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_auto_temp_min(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_temp_min_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;zone[nr].limit));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_auto_temp_min(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_auto_temp_min_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1210,8 +1219,9 @@ static ssize_t set_temp_auto_temp_min(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_auto_temp_max(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_temp_max_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='hunk'>@@ -1219,8 +1229,9 @@ static ssize_t show_temp_auto_temp_max(struct device *dev,</div><div class='ctx'> 		RANGE_FROM_REG(data-&gt;zone[nr].range));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_auto_temp_max(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_auto_temp_max_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1245,16 +1256,18 @@ static ssize_t set_temp_auto_temp_max(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_auto_temp_crit(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t temp_auto_temp_crit_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = lm85_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;zone[nr].critical));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_auto_temp_crit(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_auto_temp_crit_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'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct lm85_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1274,23 +1287,18 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_auto(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_off,			\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_temp_auto_temp_off,		\</div><div class='del'>-		set_temp_auto_temp_off, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_min,			\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_temp_auto_temp_min,		\</div><div class='del'>-		set_temp_auto_temp_min, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_max,			\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_temp_auto_temp_max,		\</div><div class='del'>-		set_temp_auto_temp_max, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_crit,		\</div><div class='del'>-		S_IRUGO | S_IWUSR, show_temp_auto_temp_crit,		\</div><div class='del'>-		set_temp_auto_temp_crit, offset - 1);</div><div class='del'>-</div><div class='del'>-temp_auto(1);</div><div class='del'>-temp_auto(2);</div><div class='del'>-temp_auto(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_off, temp_auto_temp_off, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_min, temp_auto_temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_max, temp_auto_temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_crit, temp_auto_temp_crit, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_off, temp_auto_temp_off, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_min, temp_auto_temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_max, temp_auto_temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_crit, temp_auto_temp_crit, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_off, temp_auto_temp_off, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_min, temp_auto_temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_max, temp_auto_temp_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_crit, temp_auto_temp_crit, 2);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *lm85_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_fan1_input.dev_attr.attr,</div><div class='hunk'>@@ -1642,7 +1650,7 @@ static const struct i2c_device_id lm85_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lm85_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id lm85_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused lm85_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "adi,adm1027",</div><div class='ctx'> 		.data = (void *)adm1027</div><div class='head'>diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c<br/>index b48d30760388..644e61eae574 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm87.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm87.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm87.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm87.c</a></div><div class='hunk'>@@ -276,8 +276,8 @@ static struct lm87_data *lm87_update_device(struct device *dev)</div><div class='ctx'>  * Sysfs stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_input(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t in_input_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -286,8 +286,8 @@ static ssize_t show_in_input(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       data-&gt;in_scale[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev,</div><div class='del'>-				     struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -296,8 +296,8 @@ static ssize_t show_in_min(struct device *dev,</div><div class='ctx'> 		       data-&gt;in_scale[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev,</div><div class='del'>-				     struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -306,8 +306,8 @@ static ssize_t show_in_max(struct device *dev,</div><div class='ctx'> 		       data-&gt;in_scale[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='hunk'>@@ -327,8 +327,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev,  struct device_attribute *attr,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='hunk'>@@ -348,23 +348,32 @@ static ssize_t set_in_max(struct device *dev,  struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define set_in(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \</div><div class='del'>-		show_in_input, NULL, offset); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \</div><div class='del'>-		show_in_min, set_in_min, offset); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \</div><div class='del'>-		show_in_max, set_in_max, offset)</div><div class='del'>-set_in(0);</div><div class='del'>-set_in(1);</div><div class='del'>-set_in(2);</div><div class='del'>-set_in(3);</div><div class='del'>-set_in(4);</div><div class='del'>-set_in(5);</div><div class='del'>-set_in(6);</div><div class='del'>-set_in(7);</div><div class='del'>-</div><div class='del'>-static ssize_t show_temp_input(struct device *dev,</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in_input, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in_input, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in_input, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in_input, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in_input, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in_input, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_input, in_input, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_input, in_input, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_min, in_min, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_max, in_max, 7);</div><div class='add'>+</div><div class='add'>+static ssize_t temp_input_show(struct device *dev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='hunk'>@@ -373,7 +382,7 @@ static ssize_t show_temp_input(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_low(struct device *dev,</div><div class='add'>+static ssize_t temp_low_show(struct device *dev,</div><div class='ctx'> 			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='hunk'>@@ -383,7 +392,7 @@ static ssize_t show_temp_low(struct device *dev,</div><div class='ctx'> 		       TEMP_FROM_REG(data-&gt;temp_low[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_high(struct device *dev,</div><div class='add'>+static ssize_t temp_high_show(struct device *dev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='hunk'>@@ -393,8 +402,9 @@ static ssize_t show_temp_high(struct device *dev,</div><div class='ctx'> 		       TEMP_FROM_REG(data-&gt;temp_high[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_low(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_low_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='hunk'>@@ -413,8 +423,9 @@ static ssize_t set_temp_low(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_high(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_high_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, const char *buf,</div><div class='add'>+			       size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='hunk'>@@ -433,16 +444,15 @@ static ssize_t set_temp_high(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define set_temp(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \</div><div class='del'>-		show_temp_input, NULL, offset - 1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \</div><div class='del'>-		show_temp_high, set_temp_high, offset - 1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \</div><div class='del'>-		show_temp_low, set_temp_low, offset - 1)</div><div class='del'>-set_temp(1);</div><div class='del'>-set_temp(2);</div><div class='del'>-set_temp(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp_input, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_low, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_high, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp_input, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_low, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_high, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp_input, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_low, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_high, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t temp1_crit_show(struct device *dev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -460,9 +470,9 @@ static ssize_t temp2_crit_show(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(temp1_crit);</div><div class='ctx'> static DEVICE_ATTR_RO(temp2_crit);</div><div class='del'>-static DEVICE_ATTR(temp3_crit, S_IRUGO, temp2_crit_show, NULL);</div><div class='add'>+static DEVICE_ATTR(temp3_crit, 0444, temp2_crit_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_input(struct device *dev,</div><div class='add'>+static ssize_t fan_input_show(struct device *dev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='hunk'>@@ -472,8 +482,8 @@ static ssize_t show_fan_input(struct device *dev,</div><div class='ctx'> 		       FAN_DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_min(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -482,8 +492,8 @@ static ssize_t show_fan_min(struct device *dev,</div><div class='ctx'> 		       FAN_DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_div(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -492,8 +502,9 @@ static ssize_t show_fan_div(struct device *dev,</div><div class='ctx'> 		       FAN_DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='hunk'>@@ -519,8 +530,9 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'>  * of least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>  * because the divider changed.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm87_data *data = i2c_get_clientdata(client);</div><div class='hunk'>@@ -575,15 +587,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define set_fan(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, \</div><div class='del'>-		show_fan_input, NULL, offset - 1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1); \</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \</div><div class='del'>-		show_fan_div, set_fan_div, offset - 1)</div><div class='del'>-set_fan(1);</div><div class='del'>-set_fan(2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan_input, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan_input, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			   char *buf)</div><div class='hunk'>@@ -653,28 +662,28 @@ static ssize_t aout_output_store(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RW(aout_output);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm87_data *data = lm87_update_device(dev);</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 14);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 15);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Real code</div><div class='head'>diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c<br/>index 480d70a51778..b99eda01696e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm90.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm90.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm90.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm90.c</a></div><div class='hunk'>@@ -236,7 +236,7 @@ static const struct i2c_device_id lm90_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lm90_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id lm90_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused lm90_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "adi,adm1032",</div><div class='ctx'> 		.data = (void *)adm1032</div><div class='hunk'>@@ -1720,16 +1720,6 @@ static void lm90_regulator_disable(void *regulator)</div><div class='ctx'> 	regulator_disable(regulator);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 lm90_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL | HWMON_C_ALARMS,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm90_chip_info = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = lm90_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static const struct hwmon_ops lm90_ops = {</div><div class='ctx'> 	.is_visible = lm90_is_visible,</div><div class='hunk'>@@ -1792,7 +1782,8 @@ static int lm90_probe(struct i2c_client *client,</div><div class='ctx'> 	data-&gt;chip.ops = &amp;lm90_ops;</div><div class='ctx'> 	data-&gt;chip.info = data-&gt;info;</div><div class='ctx'> </div><div class='del'>-	data-&gt;info[0] = &amp;lm90_chip_info;</div><div class='add'>+	data-&gt;info[0] = HWMON_CHANNEL_INFO(chip,</div><div class='add'>+		HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL | HWMON_C_ALARMS);</div><div class='ctx'> 	data-&gt;info[1] = &amp;data-&gt;temp_info;</div><div class='ctx'> </div><div class='ctx'> 	info = &amp;data-&gt;temp_info;</div><div class='head'>diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c<br/>index 3ff188937158..6c5215e6d448 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm95241.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm95241.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm95241.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm95241.c</a></div><div class='hunk'>@@ -418,33 +418,15 @@ static void lm95241_init_client(struct i2c_client *client,</div><div class='ctx'> 				  data-&gt;model);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 lm95241_chip_config[] = {</div><div class='del'>-	HWMON_C_UPDATE_INTERVAL,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm95241_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = lm95241_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 lm95241_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | HWMON_T_TYPE |</div><div class='del'>-		HWMON_T_FAULT,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | HWMON_T_TYPE |</div><div class='del'>-		HWMON_T_FAULT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm95241_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = lm95241_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *lm95241_info[] = {</div><div class='del'>-	&amp;lm95241_chip,</div><div class='del'>-	&amp;lm95241_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN |</div><div class='add'>+			   HWMON_T_TYPE | HWMON_T_FAULT,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN |</div><div class='add'>+			   HWMON_T_TYPE | HWMON_T_FAULT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/lm95245.c b/drivers/hwmon/lm95245.c<br/>index e4cac3a04536..8d08ca8bbdf8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm95245.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/lm95245.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lm95245.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lm95245.c</a></div><div class='hunk'>@@ -92,19 +92,6 @@ static const unsigned short normal_i2c[] = {</div><div class='ctx'> #define LM95235_REVISION	0xB1</div><div class='ctx'> #define LM95245_REVISION	0xB3</div><div class='ctx'> </div><div class='del'>-static const u8 lm95245_reg_address[] = {</div><div class='del'>-	LM95245_REG_R_LOCAL_TEMPH_S,</div><div class='del'>-	LM95245_REG_R_LOCAL_TEMPL_S,</div><div class='del'>-	LM95245_REG_R_REMOTE_TEMPH_S,</div><div class='del'>-	LM95245_REG_R_REMOTE_TEMPL_S,</div><div class='del'>-	LM95245_REG_R_REMOTE_TEMPH_U,</div><div class='del'>-	LM95245_REG_R_REMOTE_TEMPL_U,</div><div class='del'>-	LM95245_REG_RW_LOCAL_OS_TCRIT_LIMIT,</div><div class='del'>-	LM95245_REG_RW_REMOTE_TCRIT_LIMIT,</div><div class='del'>-	LM95245_REG_RW_COMMON_HYSTERESIS,</div><div class='del'>-	LM95245_REG_R_STATUS1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Client data (each client gets its own) */</div><div class='ctx'> struct lm95245_data {</div><div class='ctx'> 	struct regmap *regmap;</div><div class='hunk'>@@ -545,32 +532,16 @@ static const struct regmap_config lm95245_regmap_config = {</div><div class='ctx'> 	.use_single_write = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 lm95245_chip_config[] = {</div><div class='del'>-	HWMON_C_UPDATE_INTERVAL,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm95245_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = lm95245_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 lm95245_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_CRIT_ALARM,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST | HWMON_T_CRIT |</div><div class='del'>-		HWMON_T_CRIT_HYST | HWMON_T_FAULT | HWMON_T_MAX_ALARM |</div><div class='del'>-		HWMON_T_CRIT_ALARM | HWMON_T_TYPE | HWMON_T_OFFSET,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info lm95245_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = lm95245_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *lm95245_info[] = {</div><div class='del'>-	&amp;lm95245_chip,</div><div class='del'>-	&amp;lm95245_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_HYST |</div><div class='add'>+			   HWMON_T_CRIT_ALARM,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |</div><div class='add'>+			   HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_FAULT |</div><div class='add'>+			   HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM |</div><div class='add'>+			   HWMON_T_TYPE | HWMON_T_OFFSET),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -623,7 +594,7 @@ static const struct i2c_device_id lm95245_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lm95245_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id lm95245_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused lm95245_of_match[] = {</div><div class='ctx'> 	{ .compatible = "national,lm95235" },</div><div class='ctx'> 	{ .compatible = "national,lm95245" },</div><div class='ctx'> 	{ },</div><div class='head'>diff --git a/drivers/hwmon/lochnagar-hwmon.c b/drivers/hwmon/lochnagar-hwmon.c<br/>new file mode 100644<br/>index 000000000000..8b19adf2eeb0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/lochnagar-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/lochnagar-hwmon.c</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Lochnagar hardware monitoring features</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016-2019 Cirrus Logic, Inc. and</div><div class='add'>+ *                         Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Lucas Tanure &lt;tanureal@opensource.cirrus.com&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/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/mfd/lochnagar.h&gt;</div><div class='add'>+#include &lt;linux/mfd/lochnagar2_regs.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/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define LN2_MAX_NSAMPLE 1023</div><div class='add'>+#define LN2_SAMPLE_US   1670</div><div class='add'>+</div><div class='add'>+#define LN2_CURR_UNITS  1000</div><div class='add'>+#define LN2_VOLT_UNITS  1000</div><div class='add'>+#define LN2_TEMP_UNITS  1000</div><div class='add'>+#define LN2_PWR_UNITS   1000000</div><div class='add'>+</div><div class='add'>+static const char * const lochnagar_chan_names[] = {</div><div class='add'>+	"DBVDD1",</div><div class='add'>+	"1V8 DSP",</div><div class='add'>+	"1V8 CDC",</div><div class='add'>+	"VDDCORE DSP",</div><div class='add'>+	"AVDD 1V8",</div><div class='add'>+	"SYSVDD",</div><div class='add'>+	"VDDCORE CDC",</div><div class='add'>+	"MICVDD",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lochnagar_hwmon {</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+</div><div class='add'>+	long power_nsamples[ARRAY_SIZE(lochnagar_chan_names)];</div><div class='add'>+</div><div class='add'>+	/* Lock to ensure only a single sensor is read at a time */</div><div class='add'>+	struct mutex sensor_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum lochnagar_measure_mode {</div><div class='add'>+	LN2_CURR = 0,</div><div class='add'>+	LN2_VOLT,</div><div class='add'>+	LN2_TEMP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * float_to_long - Convert ieee754 reading from hardware to an integer</div><div class='add'>+ *</div><div class='add'>+ * @data: Value read from the hardware</div><div class='add'>+ * @precision: Units to multiply up to eg. 1000 = milli, 1000000 = micro</div><div class='add'>+ *</div><div class='add'>+ * Return: Converted integer reading</div><div class='add'>+ *</div><div class='add'>+ * Depending on the measurement type the hardware returns an ieee754</div><div class='add'>+ * floating point value in either volts, amps or celsius. This function</div><div class='add'>+ * will convert that into an integer in a smaller unit such as micro-amps</div><div class='add'>+ * or milli-celsius. The hardware does not return NaN, so consideration of</div><div class='add'>+ * that is not required.</div><div class='add'>+ */</div><div class='add'>+static long float_to_long(u32 data, u32 precision)</div><div class='add'>+{</div><div class='add'>+	u64 man = data &amp; 0x007FFFFF;</div><div class='add'>+	int exp = ((data &amp; 0x7F800000) &gt;&gt; 23) - 127 - 23;</div><div class='add'>+	bool negative = data &amp; 0x80000000;</div><div class='add'>+	long result;</div><div class='add'>+</div><div class='add'>+	man = (man + (1 &lt;&lt; 23)) * precision;</div><div class='add'>+</div><div class='add'>+	if (fls64(man) + exp &gt; (int)sizeof(long) * 8 - 1)</div><div class='add'>+		result = LONG_MAX;</div><div class='add'>+	else if (exp &lt; 0)</div><div class='add'>+		result = (man + (1ull &lt;&lt; (-exp - 1))) &gt;&gt; -exp;</div><div class='add'>+	else</div><div class='add'>+		result = man &lt;&lt; exp;</div><div class='add'>+</div><div class='add'>+	return negative ? -result : result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_measurement(struct regmap *regmap, int chan,</div><div class='add'>+			  enum lochnagar_measure_mode mode, int nsamples)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	chan = 1 &lt;&lt; (chan + LOCHNAGAR2_IMON_MEASURED_CHANNELS_SHIFT);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, LOCHNAGAR2_IMON_CTRL1,</div><div class='add'>+			   LOCHNAGAR2_IMON_ENA_MASK | chan | mode);</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(regmap, LOCHNAGAR2_IMON_CTRL2, nsamples);</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(regmap, LOCHNAGAR2_IMON_CTRL3,</div><div class='add'>+			   LOCHNAGAR2_IMON_CONFIGURE_MASK);</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(regmap, LOCHNAGAR2_IMON_CTRL3, val,</div><div class='add'>+					val &amp; LOCHNAGAR2_IMON_DONE_MASK,</div><div class='add'>+					1000, 10000);</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(regmap, LOCHNAGAR2_IMON_CTRL3,</div><div class='add'>+			   LOCHNAGAR2_IMON_MEASURE_MASK);</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'>+	 * Actual measurement time is ~1.67mS per sample, approximate this</div><div class='add'>+	 * with a 1.5mS per sample msleep and then poll for success up to</div><div class='add'>+	 * ~0.17mS * 1023 (LN2_MAX_NSAMPLES). Normally for smaller values</div><div class='add'>+	 * of nsamples the poll will complete on the first loop due to</div><div class='add'>+	 * other latency in the system.</div><div class='add'>+	 */</div><div class='add'>+	msleep((nsamples * 3) / 2);</div><div class='add'>+</div><div class='add'>+	ret =  regmap_read_poll_timeout(regmap, LOCHNAGAR2_IMON_CTRL3, val,</div><div class='add'>+					val &amp; LOCHNAGAR2_IMON_DONE_MASK,</div><div class='add'>+					5000, 200000);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_write(regmap, LOCHNAGAR2_IMON_CTRL3, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int request_data(struct regmap *regmap, int chan, u32 *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, LOCHNAGAR2_IMON_CTRL4,</div><div class='add'>+			   LOCHNAGAR2_IMON_DATA_REQ_MASK |</div><div class='add'>+			   chan &lt;&lt; LOCHNAGAR2_IMON_CH_SEL_SHIFT);</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(regmap, LOCHNAGAR2_IMON_CTRL4, val,</div><div class='add'>+					val &amp; LOCHNAGAR2_IMON_DATA_RDY_MASK,</div><div class='add'>+					1000, 10000);</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(regmap, LOCHNAGAR2_IMON_DATA1, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*data = val &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, LOCHNAGAR2_IMON_DATA2, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*data |= val;</div><div class='add'>+</div><div class='add'>+	return regmap_write(regmap, LOCHNAGAR2_IMON_CTRL4, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_sensor(struct device *dev, int chan,</div><div class='add'>+		       enum lochnagar_measure_mode mode, int nsamples,</div><div class='add'>+		       unsigned int precision, long *val)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_hwmon *priv = dev_get_drvdata(dev);</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	u32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;sensor_lock);</div><div class='add'>+</div><div class='add'>+	ret = do_measurement(regmap, chan, mode, nsamples);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to perform measurement: %d\n", ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_data(regmap, chan, &amp;data);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to read measurement: %d\n", ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = float_to_long(data, precision);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;sensor_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 read_power(struct device *dev, int chan, long *val)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_hwmon *priv = dev_get_drvdata(dev);</div><div class='add'>+	int nsamples = priv-&gt;power_nsamples[chan];</div><div class='add'>+	u64 power;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!strcmp("SYSVDD", lochnagar_chan_names[chan])) {</div><div class='add'>+		power = 5 * LN2_PWR_UNITS;</div><div class='add'>+	} else {</div><div class='add'>+		ret = read_sensor(dev, chan, LN2_VOLT, 1, LN2_PWR_UNITS, val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		power = abs(*val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = read_sensor(dev, chan, LN2_CURR, nsamples, LN2_PWR_UNITS, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	power *= abs(*val);</div><div class='add'>+	power = DIV_ROUND_CLOSEST_ULL(power, LN2_PWR_UNITS);</div><div class='add'>+</div><div class='add'>+	if (power &gt; LONG_MAX)</div><div class='add'>+		*val = LONG_MAX;</div><div class='add'>+	else</div><div class='add'>+		*val = power;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static umode_t lochnagar_is_visible(const void *drvdata,</div><div class='add'>+				    enum hwmon_sensor_types type,</div><div class='add'>+				    u32 attr, int chan)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case hwmon_in:</div><div class='add'>+		if (!strcmp("SYSVDD", lochnagar_chan_names[chan]))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case hwmon_power:</div><div class='add'>+		if (attr == hwmon_power_average_interval)</div><div class='add'>+			return 0644;</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 0444;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar_read(struct device *dev, enum hwmon_sensor_types type,</div><div class='add'>+			  u32 attr, int chan, long *val)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_hwmon *priv = dev_get_drvdata(dev);</div><div class='add'>+	int interval;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case hwmon_in:</div><div class='add'>+		return read_sensor(dev, chan, LN2_VOLT, 1, LN2_VOLT_UNITS, val);</div><div class='add'>+	case hwmon_curr:</div><div class='add'>+		return read_sensor(dev, chan, LN2_CURR, 1, LN2_CURR_UNITS, val);</div><div class='add'>+	case hwmon_temp:</div><div class='add'>+		return read_sensor(dev, chan, LN2_TEMP, 1, LN2_TEMP_UNITS, val);</div><div class='add'>+	case hwmon_power:</div><div class='add'>+		switch (attr) {</div><div class='add'>+		case hwmon_power_average:</div><div class='add'>+			return read_power(dev, chan, val);</div><div class='add'>+		case hwmon_power_average_interval:</div><div class='add'>+			interval = priv-&gt;power_nsamples[chan] * LN2_SAMPLE_US;</div><div class='add'>+			*val = DIV_ROUND_CLOSEST(interval, 1000);</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'>+	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 lochnagar_read_string(struct device *dev,</div><div class='add'>+				 enum hwmon_sensor_types type, u32 attr,</div><div class='add'>+				 int chan, const char **str)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case hwmon_in:</div><div class='add'>+	case hwmon_curr:</div><div class='add'>+	case hwmon_power:</div><div class='add'>+		*str = lochnagar_chan_names[chan];</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 lochnagar_write(struct device *dev, enum hwmon_sensor_types type,</div><div class='add'>+			   u32 attr, int chan, long val)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_hwmon *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (type != hwmon_power || attr != hwmon_power_average_interval)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	val = clamp_t(long, val, 1, (LN2_MAX_NSAMPLE * LN2_SAMPLE_US) / 1000);</div><div class='add'>+	val = DIV_ROUND_CLOSEST(val * 1000, LN2_SAMPLE_US);</div><div class='add'>+</div><div class='add'>+	priv-&gt;power_nsamples[chan] = 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 hwmon_ops lochnagar_ops = {</div><div class='add'>+	.is_visible = lochnagar_is_visible,</div><div class='add'>+	.read = lochnagar_read,</div><div class='add'>+	.read_string = lochnagar_read_string,</div><div class='add'>+	.write = lochnagar_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_channel_info *lochnagar_info[] = {</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,  HWMON_T_INPUT),</div><div class='add'>+	HWMON_CHANNEL_INFO(in,    HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL,</div><div class='add'>+				  HWMON_I_INPUT | HWMON_I_LABEL),</div><div class='add'>+	HWMON_CHANNEL_INFO(curr,  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL,</div><div class='add'>+				  HWMON_C_INPUT | HWMON_C_LABEL),</div><div class='add'>+	HWMON_CHANNEL_INFO(power, HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL,</div><div class='add'>+				  HWMON_P_AVERAGE | HWMON_P_AVERAGE_INTERVAL |</div><div class='add'>+				  HWMON_P_LABEL),</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_chip_info lochnagar_chip_info = {</div><div class='add'>+	.ops = &amp;lochnagar_ops,</div><div class='add'>+	.info = lochnagar_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id lochnagar_of_match[] = {</div><div class='add'>+	{ .compatible = "cirrus,lochnagar2-hwmon" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, lochnagar_of_match);</div><div class='add'>+</div><div class='add'>+static int lochnagar_hwmon_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 *hwmon_dev;</div><div class='add'>+	struct lochnagar_hwmon *priv;</div><div class='add'>+	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'>+	mutex_init(&amp;priv-&gt;sensor_lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = dev_get_regmap(dev-&gt;parent, NULL);</div><div class='add'>+	if (!priv-&gt;regmap) {</div><div class='add'>+		dev_err(dev, "No register map found\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;power_nsamples); i++)</div><div class='add'>+		priv-&gt;power_nsamples[i] = 96;</div><div class='add'>+</div><div class='add'>+	hwmon_dev = devm_hwmon_device_register_with_info(dev, "Lochnagar", priv,</div><div class='add'>+							 &amp;lochnagar_chip_info,</div><div class='add'>+							 NULL);</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(hwmon_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver lochnagar_hwmon_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "lochnagar-hwmon",</div><div class='add'>+		.of_match_table = lochnagar_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = lochnagar_hwmon_probe,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(lochnagar_hwmon_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Lochnagar hardware monitoring features");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/ltc4151.c b/drivers/hwmon/ltc4151.c<br/>index 76c6fda76d95..2b5cd37e6dc3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ltc4151.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ltc4151.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ltc4151.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ltc4151.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ static const struct i2c_device_id ltc4151_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ltc4151_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ltc4151_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ltc4151_match[] = {</div><div class='ctx'> 	{ .compatible = "lltc,ltc4151" },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c<br/>index 34d0653ca607..26542635de9b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ltc4245.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ltc4245.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ltc4245.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ltc4245.c</a></div><div class='hunk'>@@ -390,57 +390,30 @@ static umode_t ltc4245_is_visible(const void *_data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 ltc4245_in_config[] = {</div><div class='del'>-	HWMON_I_INPUT,			/* dummy, skipped in is_visible */</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ltc4245_in = {</div><div class='del'>-	.type = hwmon_in,</div><div class='del'>-	.config = ltc4245_in_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 ltc4245_curr_config[] = {</div><div class='del'>-	HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='del'>-	HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='del'>-	HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='del'>-	HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ltc4245_curr = {</div><div class='del'>-	.type = hwmon_curr,</div><div class='del'>-	.config = ltc4245_curr_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 ltc4245_power_config[] = {</div><div class='del'>-	HWMON_P_INPUT,</div><div class='del'>-	HWMON_P_INPUT,</div><div class='del'>-	HWMON_P_INPUT,</div><div class='del'>-	HWMON_P_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ltc4245_power = {</div><div class='del'>-	.type = hwmon_power,</div><div class='del'>-	.config = ltc4245_power_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *ltc4245_info[] = {</div><div class='del'>-	&amp;ltc4245_in,</div><div class='del'>-	&amp;ltc4245_curr,</div><div class='del'>-	&amp;ltc4245_power,</div><div class='add'>+	HWMON_CHANNEL_INFO(in,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT | HWMON_I_MIN_ALARM,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT),</div><div class='add'>+	HWMON_CHANNEL_INFO(curr,</div><div class='add'>+			   HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='add'>+			   HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='add'>+			   HWMON_C_INPUT | HWMON_C_MAX_ALARM,</div><div class='add'>+			   HWMON_C_INPUT | HWMON_C_MAX_ALARM),</div><div class='add'>+	HWMON_CHANNEL_INFO(power,</div><div class='add'>+			   HWMON_P_INPUT,</div><div class='add'>+			   HWMON_P_INPUT,</div><div class='add'>+			   HWMON_P_INPUT,</div><div class='add'>+			   HWMON_P_INPUT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/ltq-cputemp.c b/drivers/hwmon/ltq-cputemp.c<br/>index 1d33f94594c1..570791f0e024 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ltq-cputemp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ltq-cputemp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ltq-cputemp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ltq-cputemp.c</a></div><div class='hunk'>@@ -77,29 +77,11 @@ static umode_t ltq_is_visible(const void *_data, enum hwmon_sensor_types type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 ltq_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ltq_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = ltq_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 ltq_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ltq_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = ltq_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *ltq_info[] = {</div><div class='del'>-	&amp;ltq_chip,</div><div class='del'>-	&amp;ltq_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_REGISTER_TZ),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c<br/>index 3d9e210beedf..dd6a35219a18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max197.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max197.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max197.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/max197.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- * For further information, see the Documentation/hwmon/max197 file.</div><div class='add'>+ * For further information, see the Documentation/hwmon/max197.rst file.</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/hwmon/max31790.c b/drivers/hwmon/max31790.c<br/>index 722bcbb9865a..0b0b04d36931 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max31790.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max31790.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max31790.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/max31790.c</a></div><div class='hunk'>@@ -400,45 +400,27 @@ static umode_t max31790_is_visible(const void *data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 max31790_fan_config[] = {</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info max31790_fan = {</div><div class='del'>-	.type = hwmon_fan,</div><div class='del'>-	.config = max31790_fan_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 max31790_pwm_config[] = {</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info max31790_pwm = {</div><div class='del'>-	.type = hwmon_pwm,</div><div class='del'>-	.config = max31790_pwm_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *max31790_info[] = {</div><div class='del'>-	&amp;max31790_fan,</div><div class='del'>-	&amp;max31790_pwm,</div><div class='add'>+	HWMON_CHANNEL_INFO(fan,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT),</div><div class='add'>+	HWMON_CHANNEL_INFO(pwm,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max6621.c b/drivers/hwmon/max6621.c<br/>index 35555f0eefb9..1810a753f1a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max6621.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max6621.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max6621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/max6621.c</a></div><div class='hunk'>@@ -458,37 +458,19 @@ static const struct regmap_config max6621_regmap_config = {</div><div class='ctx'> 	.num_reg_defaults = ARRAY_SIZE(max6621_regmap_default),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 max6621_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info max6621_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = max6621_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 max6621_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_OFFSET,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_LABEL,</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 max6621_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = max6621_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *max6621_info[] = {</div><div class='del'>-	&amp;max6621_chip,</div><div class='del'>-	&amp;max6621_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_REGISTER_TZ),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_OFFSET,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='add'>+			   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='hunk'>@@ -570,7 +552,7 @@ static const struct i2c_device_id max6621_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, max6621_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id max6621_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused max6621_of_match[] = {</div><div class='ctx'> 	{ .compatible = "maxim,max6621" },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c<br/>index 61135a2d0cff..939953240827 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max6650.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max6650.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max6650.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/max6650.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/hwmon-sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Insmod parameters</div><div class='hunk'>@@ -113,6 +114,7 @@ module_param(clock, int, 0444);</div><div class='ctx'> struct max6650_data {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	const struct attribute_group *groups[3];</div><div class='add'>+	struct thermal_cooling_device *cooling_dev;</div><div class='ctx'> 	struct mutex update_lock;</div><div class='ctx'> 	int nr_fans;</div><div class='ctx'> 	char valid; /* zero until following fields are valid */</div><div class='hunk'>@@ -125,6 +127,7 @@ struct max6650_data {</div><div class='ctx'> 	u8 count;</div><div class='ctx'> 	u8 dac;</div><div class='ctx'> 	u8 alarm;</div><div class='add'>+	unsigned long cooling_dev_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u8 tach_reg[] = {</div><div class='hunk'>@@ -134,7 +137,7 @@ static const u8 tach_reg[] = {</div><div class='ctx'> 	MAX6650_REG_TACH3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id max6650_dt_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused max6650_dt_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "maxim,max6650",</div><div class='ctx'> 		.data = (void *)1</div><div class='hunk'>@@ -694,6 +697,63 @@ static int max6650_init_client(struct max6650_data *data,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_THERMAL)</div><div class='add'>+</div><div class='add'>+static int max6650_get_max_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				 unsigned long *state)</div><div class='add'>+{</div><div class='add'>+	*state = 255;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6650_get_cur_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				 unsigned long *state)</div><div class='add'>+{</div><div class='add'>+	struct max6650_data *data = cdev-&gt;devdata;</div><div class='add'>+</div><div class='add'>+	*state = data-&gt;cooling_dev_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 max6650_set_cur_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				 unsigned long state)</div><div class='add'>+{</div><div class='add'>+	struct max6650_data *data = cdev-&gt;devdata;</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	state = clamp_val(state, 0, 255);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;config &amp; MAX6650_CFG_V12)</div><div class='add'>+		data-&gt;dac = 180 - (180 * state)/255;</div><div class='add'>+	else</div><div class='add'>+		data-&gt;dac = 76 - (76 * state)/255;</div><div class='add'>+</div><div class='add'>+	err = i2c_smbus_write_byte_data(client, MAX6650_REG_DAC, data-&gt;dac);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		max6650_set_operating_mode(data, state ?</div><div class='add'>+						   MAX6650_CFG_MODE_OPEN_LOOP :</div><div class='add'>+						   MAX6650_CFG_MODE_OFF);</div><div class='add'>+		data-&gt;cooling_dev_state = state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return err &lt; 0 ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct thermal_cooling_device_ops max6650_cooling_ops = {</div><div class='add'>+	.get_max_state = max6650_get_max_state,</div><div class='add'>+	.get_cur_state = max6650_get_cur_state,</div><div class='add'>+	.set_cur_state = max6650_set_cur_state,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int max6650_probe(struct i2c_client *client,</div><div class='ctx'> 			 const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -709,6 +769,7 @@ static int max6650_probe(struct i2c_client *client,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;client = client;</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='ctx'> 	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;nr_fans = of_id ? (int)(uintptr_t)of_id-&gt;data : id-&gt;driver_data;</div><div class='ctx'> </div><div class='hunk'>@@ -727,7 +788,31 @@ static int max6650_probe(struct i2c_client *client,</div><div class='ctx'> 	hwmon_dev = devm_hwmon_device_register_with_groups(dev,</div><div class='ctx'> 							   client-&gt;name, data,</div><div class='ctx'> 							   data-&gt;groups);</div><div class='del'>-	return PTR_ERR_OR_ZERO(hwmon_dev);</div><div class='add'>+	err = PTR_ERR_OR_ZERO(hwmon_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_THERMAL)</div><div class='add'>+	data-&gt;cooling_dev =</div><div class='add'>+		thermal_of_cooling_device_register(client-&gt;dev.of_node,</div><div class='add'>+						   client-&gt;name, data,</div><div class='add'>+						   &amp;max6650_cooling_ops);</div><div class='add'>+	if (IS_ERR(data-&gt;cooling_dev))</div><div class='add'>+		dev_warn(&amp;client-&gt;dev,</div><div class='add'>+			 "thermal cooling device register failed: %ld\n",</div><div class='add'>+			 PTR_ERR(data-&gt;cooling_dev));</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6650_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct max6650_data *data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(data-&gt;cooling_dev))</div><div class='add'>+		thermal_cooling_device_unregister(data-&gt;cooling_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 i2c_device_id max6650_id[] = {</div><div class='hunk'>@@ -743,6 +828,7 @@ static struct i2c_driver max6650_driver = {</div><div class='ctx'> 		.of_match_table = of_match_ptr(max6650_dt_match),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= max6650_probe,</div><div class='add'>+	.remove		= max6650_remove,</div><div class='ctx'> 	.id_table	= max6650_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max6697.c b/drivers/hwmon/max6697.c<br/>index da43f7ae3de1..328793eaee3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max6697.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/max6697.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/max6697.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/max6697.c</a></div><div class='hunk'>@@ -650,7 +650,7 @@ static const struct i2c_device_id max6697_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, max6697_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id max6697_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused max6697_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "maxim,max6581",</div><div class='ctx'> 		.data = (void *)max6581</div><div class='head'>diff --git a/drivers/hwmon/menf21bmc_hwmon.c b/drivers/hwmon/menf21bmc_hwmon.c<br/>index c29a4c3c6b9e..f540f938fcd9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/menf21bmc_hwmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/menf21bmc_hwmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/menf21bmc_hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/menf21bmc_hwmon.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ static int menf21bmc_hwmon_get_volt_limits(struct menf21bmc_hwmon *drv_data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_label(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+label_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +109,7 @@ show_label(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_in(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+in_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct menf21bmc_hwmon *drv_data = menf21bmc_hwmon_update(dev);</div><div class='hunk'>@@ -121,7 +121,7 @@ show_in(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_min(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+min_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct menf21bmc_hwmon *drv_data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -130,7 +130,7 @@ show_min(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_max(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+max_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct menf21bmc_hwmon *drv_data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -138,21 +138,26 @@ show_max(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> 	return sprintf(buf, "%d\n", drv_data-&gt;in_max[attr-&gt;index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define create_voltage_sysfs(idx)			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##idx##_input, S_IRUGO,	\</div><div class='del'>-			show_in, NULL, idx);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##idx##_min, S_IRUGO,	\</div><div class='del'>-			show_min, NULL, idx);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##idx##_max, S_IRUGO,	\</div><div class='del'>-			show_max, NULL, idx);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##idx##_label, S_IRUGO,	\</div><div class='del'>-			show_label, NULL, idx);</div><div class='del'>-</div><div class='del'>-create_voltage_sysfs(0);</div><div class='del'>-create_voltage_sysfs(1);</div><div class='del'>-create_voltage_sysfs(2);</div><div class='del'>-create_voltage_sysfs(3);</div><div class='del'>-create_voltage_sysfs(4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_min, min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_max, max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_label, label, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_min, min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_max, max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_label, label, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_min, min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_max, max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_label, label, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_min, min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_max, max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_label, label, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_min, min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_max, max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_label, label, 4);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *menf21bmc_hwmon_attrs[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='head'>diff --git a/drivers/hwmon/mlxreg-fan.c b/drivers/hwmon/mlxreg-fan.c<br/>index db8c6de0b6a0..f816d2ae1e58 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/mlxreg-fan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/mlxreg-fan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/mlxreg-fan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/mlxreg-fan.c</a></div><div class='hunk'>@@ -27,7 +27,9 @@</div><div class='ctx'> #define MLXREG_FAN_SPEED_MAX			(MLXREG_FAN_MAX_STATE * 2)</div><div class='ctx'> #define MLXREG_FAN_SPEED_MIN_LEVEL		2	/* 20 percent */</div><div class='ctx'> #define MLXREG_FAN_TACHO_SAMPLES_PER_PULSE_DEF	44</div><div class='del'>-#define MLXREG_FAN_TACHO_DIVIDER_DEF		1132</div><div class='add'>+#define MLXREG_FAN_TACHO_DIV_MIN		283</div><div class='add'>+#define MLXREG_FAN_TACHO_DIV_DEF		(MLXREG_FAN_TACHO_DIV_MIN * 4)</div><div class='add'>+#define MLXREG_FAN_TACHO_DIV_SCALE_MAX	64</div><div class='ctx'> /*</div><div class='ctx'>  * FAN datasheet defines the formula for RPM calculations as RPM = 15/t-high.</div><div class='ctx'>  * The logic in a programmable device measures the time t-high by sampling the</div><div class='hunk'>@@ -227,40 +229,22 @@ mlxreg_fan_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 mlxreg_fan_hwmon_fan_config[] = {</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info mlxreg_fan_hwmon_fan = {</div><div class='del'>-	.type = hwmon_fan,</div><div class='del'>-	.config = mlxreg_fan_hwmon_fan_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 mlxreg_fan_hwmon_pwm_config[] = {</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info mlxreg_fan_hwmon_pwm = {</div><div class='del'>-	.type = hwmon_pwm,</div><div class='del'>-	.config = mlxreg_fan_hwmon_pwm_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *mlxreg_fan_hwmon_info[] = {</div><div class='del'>-	&amp;mlxreg_fan_hwmon_fan,</div><div class='del'>-	&amp;mlxreg_fan_hwmon_pwm,</div><div class='add'>+	HWMON_CHANNEL_INFO(fan,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT,</div><div class='add'>+			   HWMON_F_INPUT | HWMON_F_FAULT),</div><div class='add'>+	HWMON_CHANNEL_INFO(pwm,</div><div class='add'>+			   HWMON_PWM_INPUT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -360,15 +344,57 @@ static const struct thermal_cooling_device_ops mlxreg_fan_cooling_ops = {</div><div class='ctx'> 	.set_cur_state	= mlxreg_fan_set_cur_state,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int mlxreg_fan_connect_verify(struct mlxreg_fan *fan,</div><div class='add'>+				     struct mlxreg_core_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 regval;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(fan-&gt;regmap, data-&gt;capability, &amp;regval);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(fan-&gt;dev, "Failed to query capability register 0x%08x\n",</div><div class='add'>+			data-&gt;capability);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !!(regval &amp; data-&gt;bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlxreg_fan_speed_divider_get(struct mlxreg_fan *fan,</div><div class='add'>+					struct mlxreg_core_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 regval;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(fan-&gt;regmap, data-&gt;capability, &amp;regval);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(fan-&gt;dev, "Failed to query capability register 0x%08x\n",</div><div class='add'>+			data-&gt;capability);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set divider value according to the capability register, in case it</div><div class='add'>+	 * contains valid value. Otherwise use default value. The purpose of</div><div class='add'>+	 * this validation is to protect against the old hardware, in which</div><div class='add'>+	 * this register can return zero.</div><div class='add'>+	 */</div><div class='add'>+	if (regval &gt; 0 &amp;&amp; regval &lt;= MLXREG_FAN_TACHO_DIV_SCALE_MAX)</div><div class='add'>+		fan-&gt;divider = regval * MLXREG_FAN_TACHO_DIV_MIN;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mlxreg_fan_config(struct mlxreg_fan *fan,</div><div class='ctx'> 			     struct mlxreg_core_platform_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxreg_core_data *data = pdata-&gt;data;</div><div class='ctx'> 	bool configured = false;</div><div class='ctx'> 	int tacho_num = 0, i;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	fan-&gt;samples = MLXREG_FAN_TACHO_SAMPLES_PER_PULSE_DEF;</div><div class='del'>-	fan-&gt;divider = MLXREG_FAN_TACHO_DIVIDER_DEF;</div><div class='add'>+	fan-&gt;divider = MLXREG_FAN_TACHO_DIV_DEF;</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;counter; i++, data++) {</div><div class='ctx'> 		if (strnstr(data-&gt;label, "tacho", sizeof(data-&gt;label))) {</div><div class='ctx'> 			if (tacho_num == MLXREG_FAN_MAX_TACHO) {</div><div class='hunk'>@@ -376,6 +402,17 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,</div><div class='ctx'> 					data-&gt;label);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			if (data-&gt;capability) {</div><div class='add'>+				err = mlxreg_fan_connect_verify(fan, data);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					return err;</div><div class='add'>+				else if (!err) {</div><div class='add'>+					tacho_num++;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			fan-&gt;tacho[tacho_num].reg = data-&gt;reg;</div><div class='ctx'> 			fan-&gt;tacho[tacho_num].mask = data-&gt;mask;</div><div class='ctx'> 			fan-&gt;tacho[tacho_num++].connected = true;</div><div class='hunk'>@@ -394,13 +431,21 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Validate that conf parameters are not zeros. */</div><div class='del'>-			if (!data-&gt;mask || !data-&gt;bit) {</div><div class='add'>+			if (!data-&gt;mask &amp;&amp; !data-&gt;bit &amp;&amp; !data-&gt;capability) {</div><div class='ctx'> 				dev_err(fan-&gt;dev, "invalid conf entry params: %s\n",</div><div class='ctx'> 					data-&gt;label);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			fan-&gt;samples = data-&gt;mask;</div><div class='del'>-			fan-&gt;divider = data-&gt;bit;</div><div class='add'>+			if (data-&gt;capability) {</div><div class='add'>+				err = mlxreg_fan_speed_divider_get(fan, data);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			} else {</div><div class='add'>+				if (data-&gt;mask)</div><div class='add'>+					fan-&gt;samples = data-&gt;mask;</div><div class='add'>+				if (data-&gt;bit)</div><div class='add'>+					fan-&gt;divider = data-&gt;bit;</div><div class='add'>+			}</div><div class='ctx'> 			configured = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_err(fan-&gt;dev, "invalid label: %s\n", data-&gt;label);</div><div class='head'>diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c<br/>index 82c7de7b4639..04516789b070 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/nct7904.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/nct7904.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/nct7904.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/nct7904.c</a></div><div class='hunk'>@@ -400,89 +400,53 @@ static int nct7904_detect(struct i2c_client *client,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 nct7904_in_config[] = {</div><div class='del'>-	HWMON_I_INPUT,                  /* dummy, skipped in is_visible */</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	HWMON_I_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info nct7904_in = {</div><div class='del'>-	.type = hwmon_in,</div><div class='del'>-	.config = nct7904_in_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 nct7904_fan_config[] = {</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info nct7904_fan = {</div><div class='del'>-	.type = hwmon_fan,</div><div class='del'>-	.config = nct7904_fan_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 nct7904_pwm_config[] = {</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info nct7904_pwm = {</div><div class='del'>-	.type = hwmon_pwm,</div><div class='del'>-	.config = nct7904_pwm_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 nct7904_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info nct7904_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = nct7904_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *nct7904_info[] = {</div><div class='del'>-	&amp;nct7904_in,</div><div class='del'>-	&amp;nct7904_fan,</div><div class='del'>-	&amp;nct7904_pwm,</div><div class='del'>-	&amp;nct7904_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(in,</div><div class='add'>+			   HWMON_I_INPUT, /* dummy, skipped in is_visible */</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT,</div><div class='add'>+			   HWMON_I_INPUT),</div><div class='add'>+	HWMON_CHANNEL_INFO(fan,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT),</div><div class='add'>+	HWMON_CHANNEL_INFO(pwm,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,</div><div class='add'>+			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/npcm750-pwm-fan.c b/drivers/hwmon/npcm750-pwm-fan.c<br/>index b3b907bdfb63..1dc0cd452498 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/npcm750-pwm-fan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/npcm750-pwm-fan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/npcm750-pwm-fan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/npcm750-pwm-fan.c</a></div><div class='hunk'>@@ -629,51 +629,33 @@ static umode_t npcm7xx_is_visible(const void *data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 npcm7xx_pwm_config[] = {</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	HWMON_PWM_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info npcm7xx_pwm = {</div><div class='del'>-	.type = hwmon_pwm,</div><div class='del'>-	.config = npcm7xx_pwm_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 npcm7xx_fan_config[] = {</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	HWMON_F_INPUT,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info npcm7xx_fan = {</div><div class='del'>-	.type = hwmon_fan,</div><div class='del'>-	.config = npcm7xx_fan_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *npcm7xx_info[] = {</div><div class='del'>-	&amp;npcm7xx_pwm,</div><div class='del'>-	&amp;npcm7xx_fan,</div><div class='add'>+	HWMON_CHANNEL_INFO(pwm,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT,</div><div class='add'>+			   HWMON_PWM_INPUT),</div><div class='add'>+	HWMON_CHANNEL_INFO(fan,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT,</div><div class='add'>+			   HWMON_F_INPUT),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c<br/>index e4f9f7ce92fa..fd47c36a52bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ntc_thermistor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/ntc_thermistor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/ntc_thermistor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/ntc_thermistor.c</a></div><div class='hunk'>@@ -629,29 +629,9 @@ static umode_t ntc_is_visible(const void *data, enum hwmon_sensor_types type,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 ntc_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ntc_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = ntc_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 ntc_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT, HWMON_T_TYPE,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info ntc_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = ntc_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *ntc_info[] = {</div><div class='del'>-	&amp;ntc_chip,</div><div class='del'>-	&amp;ntc_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_TYPE),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/occ/Kconfig b/drivers/hwmon/occ/Kconfig<br/>index 66686628fb53..1658634a053e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/occ/Kconfig</a></div><div class='hunk'>@@ -5,11 +5,14 @@</div><div class='ctx'> config SENSORS_OCC_P8_I2C</div><div class='ctx'> 	tristate "POWER8 OCC through I2C"</div><div class='ctx'> 	depends on I2C</div><div class='add'>+	depends on ARM || ARM64 || COMPILE_TEST</div><div class='ctx'> 	select SENSORS_OCC</div><div class='ctx'> 	help</div><div class='ctx'> 	 This option enables support for monitoring sensors provided by the</div><div class='del'>-	 On-Chip Controller (OCC) on a POWER8 processor. Communications with</div><div class='del'>-	 the OCC are established through I2C bus.</div><div class='add'>+	 On-Chip Controller (OCC) on a POWER8 processor. However, this driver</div><div class='add'>+	 can only run on a baseboard management controller (BMC) connected to</div><div class='add'>+	 the P8, not the POWER processor itself. Communications with the OCC are</div><div class='add'>+	 established through I2C bus.</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 occ-p8-hwmon.</div><div class='hunk'>@@ -17,15 +20,17 @@ config SENSORS_OCC_P8_I2C</div><div class='ctx'> config SENSORS_OCC_P9_SBE</div><div class='ctx'> 	tristate "POWER9 OCC through SBE"</div><div class='ctx'> 	depends on FSI_OCC</div><div class='add'>+	depends on ARM || ARM64 || COMPILE_TEST</div><div class='ctx'> 	select SENSORS_OCC</div><div class='ctx'> 	help</div><div class='ctx'> 	 This option enables support for monitoring sensors provided by the</div><div class='del'>-	 On-Chip Controller (OCC) on a POWER9 processor. Communications with</div><div class='del'>-	 the OCC are established through SBE fifo on an FSI bus.</div><div class='add'>+	 On-Chip Controller (OCC) on a POWER9 processor. However, this driver</div><div class='add'>+	 can only run on a baseboard management controller (BMC) connected to</div><div class='add'>+	 the P9, not the POWER processor itself. Communications with the OCC are</div><div class='add'>+	 established through SBE fifo on an FSI bus.</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 occ-p9-hwmon.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_OCC</div><div class='del'>-	bool "POWER On-Chip Controller"</div><div class='del'>-	depends on SENSORS_OCC_P8_I2C || SENSORS_OCC_P9_SBE</div><div class='add'>+	tristate</div><div class='head'>diff --git a/drivers/hwmon/occ/Makefile b/drivers/hwmon/occ/Makefile<br/>index 3fec12ddc7e7..493588d5a9d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/occ/Makefile</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='del'>-occ-p8-hwmon-objs := common.o sysfs.o p8_i2c.o</div><div class='del'>-occ-p9-hwmon-objs := common.o sysfs.o p9_sbe.o</div><div class='add'>+occ-hwmon-common-objs := common.o sysfs.o</div><div class='add'>+occ-p8-hwmon-objs := p8_i2c.o</div><div class='add'>+occ-p9-hwmon-objs := p9_sbe.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_SENSORS_OCC) += occ-hwmon-common.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_OCC_P8_I2C) += occ-p8-hwmon.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_OCC_P9_SBE) += occ-p9-hwmon.o</div><div class='head'>diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c<br/>index b91a80abf724..13a6290c8d25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/occ/common.c</a></div><div class='hunk'>@@ -2,11 +2,13 @@</div><div class='ctx'> // Copyright IBM Corp 2019</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/export.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='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='hunk'>@@ -139,6 +141,7 @@ static int occ_poll(struct occ *occ)</div><div class='ctx'> 	/* mutex should already be locked if necessary */</div><div class='ctx'> 	rc = occ-&gt;send_cmd(occ, cmd);</div><div class='ctx'> 	if (rc) {</div><div class='add'>+		occ-&gt;last_error = rc;</div><div class='ctx'> 		if (occ-&gt;error_count++ &gt; OCC_ERROR_COUNT_THRESHOLD)</div><div class='ctx'> 			occ-&gt;error = rc;</div><div class='ctx'> </div><div class='hunk'>@@ -147,6 +150,7 @@ static int occ_poll(struct occ *occ)</div><div class='ctx'> </div><div class='ctx'> 	/* clear error since communication was successful */</div><div class='ctx'> 	occ-&gt;error_count = 0;</div><div class='add'>+	occ-&gt;last_error = 0;</div><div class='ctx'> 	occ-&gt;error = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check for safe state */</div><div class='hunk'>@@ -208,6 +212,8 @@ int occ_update_response(struct occ *occ)</div><div class='ctx'> 	if (time_after(jiffies, occ-&gt;last_update + OCC_UPDATE_FREQUENCY)) {</div><div class='ctx'> 		rc = occ_poll(occ);</div><div class='ctx'> 		occ-&gt;last_update = jiffies;</div><div class='add'>+	} else {</div><div class='add'>+		rc = occ-&gt;last_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;occ-&gt;lock);</div><div class='hunk'>@@ -890,6 +896,8 @@ static int occ_setup_sensor_attrs(struct occ *occ)</div><div class='ctx'> 				s++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		s = (sensors-&gt;power.num_sensors * 4) + 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i = 0; i &lt; sensors-&gt;power.num_sensors; ++i) {</div><div class='ctx'> 			s = i + 1;</div><div class='hunk'>@@ -918,11 +926,11 @@ static int occ_setup_sensor_attrs(struct occ *occ)</div><div class='ctx'> 						     show_power, NULL, 3, i);</div><div class='ctx'> 			attr++;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (sensors-&gt;caps.num_sensors &gt;= 1) {</div><div class='ctx'> 		s = sensors-&gt;power.num_sensors + 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (sensors-&gt;caps.num_sensors &gt;= 1) {</div><div class='ctx'> 		snprintf(attr-&gt;name, sizeof(attr-&gt;name), "power%d_label", s);</div><div class='ctx'> 		attr-&gt;sensor = OCC_INIT_ATTR(attr-&gt;name, 0444, show_caps, NULL,</div><div class='ctx'> 					     0, 0);</div><div class='hunk'>@@ -1097,3 +1105,8 @@ int occ_setup(struct occ *occ, const char *name)</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(occ_setup);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eddie James &lt;eajames@linux.ibm.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Common OCC hwmon code");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/occ/common.h b/drivers/hwmon/occ/common.h<br/>index ed2cf4245295..fc13f3c73c47 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/occ/common.h</a></div><div class='hunk'>@@ -106,7 +106,8 @@ struct occ {</div><div class='ctx'> 	struct attribute_group group;</div><div class='ctx'> 	const struct attribute_group *groups[2];</div><div class='ctx'> </div><div class='del'>-	int error;                      /* latest transfer error */</div><div class='add'>+	int error;                      /* final transfer error after retry */</div><div class='add'>+	int last_error;			/* latest transfer error */</div><div class='ctx'> 	unsigned int error_count;       /* number of xfr errors observed */</div><div class='ctx'> 	unsigned long last_safe;        /* time OCC entered "safe" state */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/occ/sysfs.c b/drivers/hwmon/occ/sysfs.c<br/>index fe3d15e416e7..c73be0747e66 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/occ/sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/occ/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/occ/sysfs.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='hunk'>@@ -42,16 +43,16 @@ static ssize_t occ_sysfs_show(struct device *dev,</div><div class='ctx'> 		val = !!(header-&gt;status &amp; OCC_STAT_ACTIVE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		val = !!(header-&gt;status &amp; OCC_EXT_STAT_DVFS_OT);</div><div class='add'>+		val = !!(header-&gt;ext_status &amp; OCC_EXT_STAT_DVFS_OT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		val = !!(header-&gt;status &amp; OCC_EXT_STAT_DVFS_POWER);</div><div class='add'>+		val = !!(header-&gt;ext_status &amp; OCC_EXT_STAT_DVFS_POWER);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		val = !!(header-&gt;status &amp; OCC_EXT_STAT_MEM_THROTTLE);</div><div class='add'>+		val = !!(header-&gt;ext_status &amp; OCC_EXT_STAT_MEM_THROTTLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:</div><div class='del'>-		val = !!(header-&gt;status &amp; OCC_EXT_STAT_QUICK_DROP);</div><div class='add'>+		val = !!(header-&gt;ext_status &amp; OCC_EXT_STAT_QUICK_DROP);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		val = header-&gt;occ_state;</div><div class='hunk'>@@ -62,9 +63,6 @@ static ssize_t occ_sysfs_show(struct device *dev,</div><div class='ctx'> 		else</div><div class='ctx'> 			val = 1;</div><div class='ctx'> 		break;</div><div class='del'>-	case 8:</div><div class='del'>-		val = occ-&gt;error;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -72,6 +70,16 @@ static ssize_t occ_sysfs_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE - 1, "%d\n", val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t occ_error_show(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct occ *occ = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	occ_update_response(occ);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE - 1, "%d\n", occ-&gt;error);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static SENSOR_DEVICE_ATTR(occ_master, 0444, occ_sysfs_show, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(occ_active, 0444, occ_sysfs_show, NULL, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(occ_dvfs_overtemp, 0444, occ_sysfs_show, NULL, 2);</div><div class='hunk'>@@ -80,7 +88,7 @@ static SENSOR_DEVICE_ATTR(occ_mem_throttle, 0444, occ_sysfs_show, NULL, 4);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(occ_quick_pwr_drop, 0444, occ_sysfs_show, NULL, 5);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(occ_state, 0444, occ_sysfs_show, NULL, 6);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(occs_present, 0444, occ_sysfs_show, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(occ_error, 0444, occ_sysfs_show, NULL, 8);</div><div class='add'>+static DEVICE_ATTR_RO(occ_error);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *occ_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_occ_master.dev_attr.attr,</div><div class='hunk'>@@ -91,7 +99,7 @@ static struct attribute *occ_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_occ_quick_pwr_drop.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_occ_state.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_occs_present.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_occ_error.dev_attr.attr,</div><div class='add'>+	&amp;dev_attr_occ_error.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -155,7 +163,7 @@ void occ_sysfs_poll_done(struct occ *occ)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (occ-&gt;error &amp;&amp; occ-&gt;error != occ-&gt;prev_error) {</div><div class='del'>-		name = sensor_dev_attr_occ_error.dev_attr.attr.name;</div><div class='add'>+		name = dev_attr_occ_error.attr.name;</div><div class='ctx'> 		sysfs_notify(&amp;occ-&gt;bus_dev-&gt;kobj, NULL, name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -177,3 +185,4 @@ void occ_shutdown(struct occ *occ)</div><div class='ctx'> {</div><div class='ctx'> 	sysfs_remove_group(&amp;occ-&gt;bus_dev-&gt;kobj, &amp;occ_sysfs);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(occ_shutdown);</div><div class='head'>diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c<br/>index d1a3f2040c00..58eee8fa3e6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pc87427.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pc87427.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pc87427.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pc87427.c</a></div><div class='hunk'>@@ -106,6 +106,13 @@ static const char *logdev_str[2] = { DRVNAME " FMC", DRVNAME " HMC" };</div><div class='ctx'> #define LD_IN		1</div><div class='ctx'> #define LD_TEMP		1</div><div class='ctx'> </div><div class='add'>+static inline int superio_enter(int sioaddr)</div><div class='add'>+{</div><div class='add'>+	if (!request_muxed_region(sioaddr, 2, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void superio_outb(int sioaddr, int reg, int val)</div><div class='ctx'> {</div><div class='ctx'> 	outb(reg, sioaddr);</div><div class='hunk'>@@ -122,6 +129,7 @@ static inline void superio_exit(int sioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	outb(0x02, sioaddr);</div><div class='ctx'> 	outb(0x02, sioaddr + 1);</div><div class='add'>+	release_region(sioaddr, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1195,7 +1203,11 @@ static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	u8 cfg, cfg_b;</div><div class='del'>-	int i, err = 0;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = superio_enter(sioaddr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Identify device */</div><div class='ctx'> 	val = force_id ? force_id : superio_inb(sioaddr, SIOREG_DEVID);</div><div class='head'>diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig<br/>index 629cb45f8557..7edab7e30eaf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/Kconfig</a></div><div class='hunk'>@@ -54,6 +54,24 @@ config SENSORS_IR35221</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module will</div><div class='ctx'> 	  be called ir35521.</div><div class='ctx'> </div><div class='add'>+config SENSORS_IR38064</div><div class='add'>+	tristate "Infineon IR38064"</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get hardware monitoring support for Infineon</div><div class='add'>+	  IR38064.</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 ir38064.</div><div class='add'>+</div><div class='add'>+config SENSORS_ISL68137</div><div class='add'>+	tristate "Intersil ISL68137"</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get hardware monitoring support for Intersil</div><div class='add'>+	  ISL68137.</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 isl68137.</div><div class='add'>+</div><div class='ctx'> config SENSORS_LM25066</div><div class='ctx'> 	tristate "National Semiconductor LM25066 and compatibles"</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile<br/>index ea0e39518c21..2219b9300316 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/Makefile</a></div><div class='hunk'>@@ -8,6 +8,8 @@ obj-$(CONFIG_SENSORS_PMBUS)	+= pmbus.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1275)	+= adm1275.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_IBM_CFFPS)	+= ibm-cffps.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_IR35221)	+= ir35221.o</div><div class='add'>+obj-$(CONFIG_SENSORS_IR38064)	+= ir38064.o</div><div class='add'>+obj-$(CONFIG_SENSORS_ISL68137)	+= isl68137.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM25066)	+= lm25066.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LTC2978)	+= ltc2978.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LTC3815)	+= ltc3815.o</div><div class='head'>diff --git a/drivers/hwmon/pmbus/ir38064.c b/drivers/hwmon/pmbus/ir38064.c<br/>new file mode 100644<br/>index 000000000000..1820f5077f66<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/ir38064.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/ir38064.c</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Hardware monitoring driver for Infineon IR38064</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Google Inc</div><div class='add'>+ *</div><div class='add'>+ * VOUT_MODE is not supported by the device. The driver fakes VOUT linear16</div><div class='add'>+ * mode with exponent value -8 as direct mode with m=256/b=0/R=0.</div><div class='add'>+ *          </div><div class='add'>+ * The device supports VOUT_PEAK, IOUT_PEAK, and TEMPERATURE_PEAK, however</div><div class='add'>+ * this driver does not currently support them.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/i2c.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 "pmbus.h"</div><div class='add'>+</div><div class='add'>+static struct pmbus_driver_info ir38064_info = {</div><div class='add'>+	.pages = 1,</div><div class='add'>+	.format[PSC_VOLTAGE_IN] = linear,</div><div class='add'>+	.format[PSC_VOLTAGE_OUT] = direct,</div><div class='add'>+	.format[PSC_CURRENT_OUT] = linear,</div><div class='add'>+	.format[PSC_POWER] = linear,</div><div class='add'>+	.format[PSC_TEMPERATURE] = linear,</div><div class='add'>+	.m[PSC_VOLTAGE_OUT] = 256,</div><div class='add'>+	.b[PSC_VOLTAGE_OUT] = 0,</div><div class='add'>+	.R[PSC_VOLTAGE_OUT] = 0,</div><div class='add'>+	.func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_STATUS_INPUT</div><div class='add'>+	    | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP</div><div class='add'>+	    | PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT</div><div class='add'>+	    | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT</div><div class='add'>+	    | PMBUS_HAVE_POUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ir38064_probe(struct i2c_client *client,</div><div class='add'>+			 const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return pmbus_do_probe(client, id, &amp;ir38064_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id ir38064_id[] = {</div><div class='add'>+	{"ir38064", 0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, ir38064_id);</div><div class='add'>+</div><div class='add'>+/* This is the driver that will be inserted */</div><div class='add'>+static struct i2c_driver ir38064_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "ir38064",</div><div class='add'>+		   },</div><div class='add'>+	.probe = ir38064_probe,</div><div class='add'>+	.remove = pmbus_do_remove,</div><div class='add'>+	.id_table = ir38064_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_i2c_driver(ir38064_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Maxim Sloyko &lt;maxims@google.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("PMBus driver for Infineon IR38064");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c<br/>new file mode 100644<br/>index 000000000000..515596c92fe1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/isl68137.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/isl68137.c</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Hardware monitoring driver for Intersil ISL68137</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Google Inc</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/i2c.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/string.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include "pmbus.h"</div><div class='add'>+</div><div class='add'>+#define ISL68137_VOUT_AVS	0x30</div><div class='add'>+</div><div class='add'>+static ssize_t isl68137_avs_enable_show_page(struct i2c_client *client,</div><div class='add'>+					     int page,</div><div class='add'>+					     char *buf)</div><div class='add'>+{</div><div class='add'>+	int val = pmbus_read_byte_data(client, page, PMBUS_OPERATION);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n",</div><div class='add'>+		       (val &amp; ISL68137_VOUT_AVS) == ISL68137_VOUT_AVS ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isl68137_avs_enable_store_page(struct i2c_client *client,</div><div class='add'>+					      int page,</div><div class='add'>+					      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int rc, op_val;</div><div class='add'>+	bool result;</div><div class='add'>+</div><div class='add'>+	rc = kstrtobool(buf, &amp;result);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	op_val = result ? ISL68137_VOUT_AVS : 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Writes to VOUT setpoint over AVSBus will persist after the VRM is</div><div class='add'>+	 * switched to PMBus control. Switching back to AVSBus control</div><div class='add'>+	 * restores this persisted setpoint rather than re-initializing to</div><div class='add'>+	 * PMBus VOUT_COMMAND. Writing VOUT_COMMAND first over PMBus before</div><div class='add'>+	 * enabling AVS control is the workaround.</div><div class='add'>+	 */</div><div class='add'>+	if (op_val == ISL68137_VOUT_AVS) {</div><div class='add'>+		rc = pmbus_read_word_data(client, page, PMBUS_VOUT_COMMAND);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		rc = pmbus_write_word_data(client, page, PMBUS_VOUT_COMMAND,</div><div class='add'>+					   rc);</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'>+	rc = pmbus_update_byte_data(client, page, PMBUS_OPERATION,</div><div class='add'>+				    ISL68137_VOUT_AVS, op_val);</div><div class='add'>+</div><div class='add'>+	return (rc &lt; 0) ? rc : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isl68137_avs_enable_show(struct device *dev,</div><div class='add'>+					struct device_attribute *devattr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev-&gt;parent);</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+</div><div class='add'>+	return isl68137_avs_enable_show_page(client, attr-&gt;index, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isl68137_avs_enable_store(struct device *dev,</div><div class='add'>+				struct device_attribute *devattr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev-&gt;parent);</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+</div><div class='add'>+	return isl68137_avs_enable_store_page(client, attr-&gt;index, buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(avs0_enable, isl68137_avs_enable, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(avs1_enable, isl68137_avs_enable, 1);</div><div class='add'>+</div><div class='add'>+static struct attribute *enable_attrs[] = {</div><div class='add'>+	&amp;sensor_dev_attr_avs0_enable.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_avs1_enable.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group enable_group = {</div><div class='add'>+	.attrs = enable_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *attribute_groups[] = {</div><div class='add'>+	&amp;enable_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pmbus_driver_info isl68137_info = {</div><div class='add'>+	.pages = 2,</div><div class='add'>+	.format[PSC_VOLTAGE_IN] = direct,</div><div class='add'>+	.format[PSC_VOLTAGE_OUT] = direct,</div><div class='add'>+	.format[PSC_CURRENT_IN] = direct,</div><div class='add'>+	.format[PSC_CURRENT_OUT] = direct,</div><div class='add'>+	.format[PSC_POWER] = direct,</div><div class='add'>+	.format[PSC_TEMPERATURE] = direct,</div><div class='add'>+	.m[PSC_VOLTAGE_IN] = 1,</div><div class='add'>+	.b[PSC_VOLTAGE_IN] = 0,</div><div class='add'>+	.R[PSC_VOLTAGE_IN] = 3,</div><div class='add'>+	.m[PSC_VOLTAGE_OUT] = 1,</div><div class='add'>+	.b[PSC_VOLTAGE_OUT] = 0,</div><div class='add'>+	.R[PSC_VOLTAGE_OUT] = 3,</div><div class='add'>+	.m[PSC_CURRENT_IN] = 1,</div><div class='add'>+	.b[PSC_CURRENT_IN] = 0,</div><div class='add'>+	.R[PSC_CURRENT_IN] = 2,</div><div class='add'>+	.m[PSC_CURRENT_OUT] = 1,</div><div class='add'>+	.b[PSC_CURRENT_OUT] = 0,</div><div class='add'>+	.R[PSC_CURRENT_OUT] = 1,</div><div class='add'>+	.m[PSC_POWER] = 1,</div><div class='add'>+	.b[PSC_POWER] = 0,</div><div class='add'>+	.R[PSC_POWER] = 0,</div><div class='add'>+	.m[PSC_TEMPERATURE] = 1,</div><div class='add'>+	.b[PSC_TEMPERATURE] = 0,</div><div class='add'>+	.R[PSC_TEMPERATURE] = 0,</div><div class='add'>+	.func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_PIN</div><div class='add'>+	    | PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2</div><div class='add'>+	    | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_TEMP</div><div class='add'>+	    | PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT</div><div class='add'>+	    | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT,</div><div class='add'>+	.func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT</div><div class='add'>+	    | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT,</div><div class='add'>+	.groups = attribute_groups,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int isl68137_probe(struct i2c_client *client,</div><div class='add'>+			  const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return pmbus_do_probe(client, id, &amp;isl68137_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id isl68137_id[] = {</div><div class='add'>+	{"isl68137", 0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, isl68137_id);</div><div class='add'>+</div><div class='add'>+/* This is the driver that will be inserted */</div><div class='add'>+static struct i2c_driver isl68137_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "isl68137",</div><div class='add'>+		   },</div><div class='add'>+	.probe = isl68137_probe,</div><div class='add'>+	.remove = pmbus_do_remove,</div><div class='add'>+	.id_table = isl68137_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_i2c_driver(isl68137_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Maxim Sloyko &lt;maxims@google.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("PMBus driver for Intersil ISL68137");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c<br/>index 53db78753a0d..715d4ab57516 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/lm25066.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/lm25066.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/lm25066.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/lm25066.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='ctx'> #include "pmbus.h"</div><div class='ctx'> </div><div class='ctx'> enum chips { lm25056, lm25066, lm5064, lm5066, lm5066i };</div><div class='hunk'>@@ -39,12 +40,15 @@ enum chips { lm25056, lm25066, lm5064, lm5066, lm5066i };</div><div class='ctx'> #define LM25066_CLEAR_PIN_PEAK		0xd6</div><div class='ctx'> #define LM25066_DEVICE_SETUP		0xd9</div><div class='ctx'> #define LM25066_READ_AVG_VIN		0xdc</div><div class='add'>+#define LM25066_SAMPLES_FOR_AVG		0xdb</div><div class='ctx'> #define LM25066_READ_AVG_VOUT		0xdd</div><div class='ctx'> #define LM25066_READ_AVG_IIN		0xde</div><div class='ctx'> #define LM25066_READ_AVG_PIN		0xdf</div><div class='ctx'> </div><div class='ctx'> #define LM25066_DEV_SETUP_CL		BIT(4)	/* Current limit */</div><div class='ctx'> </div><div class='add'>+#define LM25066_SAMPLES_FOR_AVG_MAX	4096</div><div class='add'>+</div><div class='ctx'> /* LM25056 only */</div><div class='ctx'> </div><div class='ctx'> #define LM25056_VAUX_OV_WARN_LIMIT	0xe3</div><div class='hunk'>@@ -284,6 +288,12 @@ static int lm25066_read_word_data(struct i2c_client *client, int page, int reg)</div><div class='ctx'> 	case PMBUS_VIRT_RESET_PIN_HISTORY:</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		break;</div><div class='add'>+	case PMBUS_VIRT_SAMPLES:</div><div class='add'>+		ret = pmbus_read_byte_data(client, 0, LM25066_SAMPLES_FOR_AVG);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		ret = 1 &lt;&lt; ret;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENODATA;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -398,6 +408,11 @@ static int lm25066_write_word_data(struct i2c_client *client, int page, int reg,</div><div class='ctx'> 	case PMBUS_VIRT_RESET_PIN_HISTORY:</div><div class='ctx'> 		ret = pmbus_write_byte(client, 0, LM25066_CLEAR_PIN_PEAK);</div><div class='ctx'> 		break;</div><div class='add'>+	case PMBUS_VIRT_SAMPLES:</div><div class='add'>+		word = clamp_val(word, 1, LM25066_SAMPLES_FOR_AVG_MAX);</div><div class='add'>+		ret = pmbus_write_byte_data(client, 0, LM25066_SAMPLES_FOR_AVG,</div><div class='add'>+					    ilog2(word));</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENODATA;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -438,7 +453,7 @@ static int lm25066_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VMON</div><div class='ctx'> 	  | PMBUS_HAVE_PIN | PMBUS_HAVE_IIN | PMBUS_HAVE_STATUS_INPUT</div><div class='del'>-	  | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP;</div><div class='add'>+	  | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_SAMPLES;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;id == lm25056) {</div><div class='ctx'> 		info-&gt;func[0] |= PMBUS_HAVE_STATUS_VMON;</div><div class='head'>diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h<br/>index 1d24397d36ec..59f85658313c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/pmbus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/pmbus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/pmbus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/pmbus.h</a></div><div class='hunk'>@@ -217,6 +217,20 @@ enum pmbus_regs {</div><div class='ctx'> 	PMBUS_VIRT_PWM_ENABLE_2,</div><div class='ctx'> 	PMBUS_VIRT_PWM_ENABLE_3,</div><div class='ctx'> 	PMBUS_VIRT_PWM_ENABLE_4,</div><div class='add'>+</div><div class='add'>+	/* Samples for average</div><div class='add'>+	 *</div><div class='add'>+	 * Drivers wanting to expose functionality for changing the number of</div><div class='add'>+	 * samples used for average values should implement support in</div><div class='add'>+	 * {read,write}_word_data callback for either PMBUS_VIRT_SAMPLES if it</div><div class='add'>+	 * applies to all types of measurements, or any number of specific</div><div class='add'>+	 * PMBUS_VIRT_*_SAMPLES registers to allow for individual control.</div><div class='add'>+	 */</div><div class='add'>+	PMBUS_VIRT_SAMPLES,</div><div class='add'>+	PMBUS_VIRT_IN_SAMPLES,</div><div class='add'>+	PMBUS_VIRT_CURR_SAMPLES,</div><div class='add'>+	PMBUS_VIRT_POWER_SAMPLES,</div><div class='add'>+	PMBUS_VIRT_TEMP_SAMPLES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -371,6 +385,7 @@ enum pmbus_sensor_classes {</div><div class='ctx'> #define PMBUS_HAVE_STATUS_VMON	BIT(19)</div><div class='ctx'> #define PMBUS_HAVE_PWM12	BIT(20)</div><div class='ctx'> #define PMBUS_HAVE_PWM34	BIT(21)</div><div class='add'>+#define PMBUS_HAVE_SAMPLES	BIT(22)</div><div class='ctx'> </div><div class='ctx'> #define PMBUS_PAGE_VIRTUAL	BIT(31)</div><div class='ctx'> </div><div class='hunk'>@@ -417,6 +432,9 @@ struct pmbus_driver_info {</div><div class='ctx'> 	/* Regulator functionality, if supported by this chip driver. */</div><div class='ctx'> 	int num_regulators;</div><div class='ctx'> 	const struct regulator_desc *reg_desc;</div><div class='add'>+</div><div class='add'>+	/* custom attributes */</div><div class='add'>+	const struct attribute_group **groups;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Regulator ops */</div><div class='head'>diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c<br/>index 2e2b5851139c..32a74b8be6bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/pmbus_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/pmbus_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/pmbus_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/pmbus_core.c</a></div><div class='hunk'>@@ -103,7 +103,7 @@ struct pmbus_data {</div><div class='ctx'> 	int max_attributes;</div><div class='ctx'> 	int num_attributes;</div><div class='ctx'> 	struct attribute_group group;</div><div class='del'>-	const struct attribute_group *groups[2];</div><div class='add'>+	const struct attribute_group **groups;</div><div class='ctx'> 	struct dentry *debugfs;		/* debugfs device directory */</div><div class='ctx'> </div><div class='ctx'> 	struct pmbus_sensor *sensors;</div><div class='hunk'>@@ -1073,7 +1073,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,</div><div class='ctx'> 		 name, seq, type);</div><div class='ctx'> 	boolean-&gt;s1 = s1;</div><div class='ctx'> 	boolean-&gt;s2 = s2;</div><div class='del'>-	pmbus_attr_init(a, boolean-&gt;name, S_IRUGO, pmbus_show_boolean, NULL,</div><div class='add'>+	pmbus_attr_init(a, boolean-&gt;name, 0444, pmbus_show_boolean, NULL,</div><div class='ctx'> 			(reg &lt;&lt; 16) | mask);</div><div class='ctx'> </div><div class='ctx'> 	return pmbus_add_attribute(data, &amp;a-&gt;dev_attr.attr);</div><div class='hunk'>@@ -1107,7 +1107,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,</div><div class='ctx'> 	sensor-&gt;update = update;</div><div class='ctx'> 	sensor-&gt;convert = convert;</div><div class='ctx'> 	pmbus_dev_attr_init(a, sensor-&gt;name,</div><div class='del'>-			    readonly ? S_IRUGO : S_IRUGO | S_IWUSR,</div><div class='add'>+			    readonly ? 0444 : 0644,</div><div class='ctx'> 			    pmbus_show_sensor, pmbus_set_sensor);</div><div class='ctx'> </div><div class='ctx'> 	if (pmbus_add_attribute(data, &amp;a-&gt;attr))</div><div class='hunk'>@@ -1139,7 +1139,7 @@ static int pmbus_add_label(struct pmbus_data *data,</div><div class='ctx'> 		snprintf(label-&gt;label, sizeof(label-&gt;label), "%s%d", lstring,</div><div class='ctx'> 			 index);</div><div class='ctx'> </div><div class='del'>-	pmbus_dev_attr_init(a, label-&gt;name, S_IRUGO, pmbus_show_label, NULL);</div><div class='add'>+	pmbus_dev_attr_init(a, label-&gt;name, 0444, pmbus_show_label, NULL);</div><div class='ctx'> 	return pmbus_add_attribute(data, &amp;a-&gt;attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1901,6 +1901,112 @@ static int pmbus_add_fan_attributes(struct i2c_client *client,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct pmbus_samples_attr {</div><div class='add'>+	int reg;</div><div class='add'>+	char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmbus_samples_reg {</div><div class='add'>+	int page;</div><div class='add'>+	struct pmbus_samples_attr *attr;</div><div class='add'>+	struct device_attribute dev_attr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pmbus_samples_attr pmbus_samples_registers[] = {</div><div class='add'>+	{</div><div class='add'>+		.reg = PMBUS_VIRT_SAMPLES,</div><div class='add'>+		.name = "samples",</div><div class='add'>+	}, {</div><div class='add'>+		.reg = PMBUS_VIRT_IN_SAMPLES,</div><div class='add'>+		.name = "in_samples",</div><div class='add'>+	}, {</div><div class='add'>+		.reg = PMBUS_VIRT_CURR_SAMPLES,</div><div class='add'>+		.name = "curr_samples",</div><div class='add'>+	}, {</div><div class='add'>+		.reg = PMBUS_VIRT_POWER_SAMPLES,</div><div class='add'>+		.name = "power_samples",</div><div class='add'>+	}, {</div><div class='add'>+		.reg = PMBUS_VIRT_TEMP_SAMPLES,</div><div class='add'>+		.name = "temp_samples",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_samples_reg(x) container_of(x, struct pmbus_samples_reg, dev_attr)</div><div class='add'>+</div><div class='add'>+static ssize_t pmbus_show_samples(struct device *dev,</div><div class='add'>+				  struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev-&gt;parent);</div><div class='add'>+	struct pmbus_samples_reg *reg = to_samples_reg(devattr);</div><div class='add'>+</div><div class='add'>+	val = _pmbus_read_word_data(client, reg-&gt;page, reg-&gt;attr-&gt;reg);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pmbus_set_samples(struct device *dev,</div><div class='add'>+				 struct device_attribute *devattr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	long val;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev-&gt;parent);</div><div class='add'>+	struct pmbus_samples_reg *reg = to_samples_reg(devattr);</div><div class='add'>+</div><div class='add'>+	if (kstrtol(buf, 0, &amp;val) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = _pmbus_write_word_data(client, reg-&gt;page, reg-&gt;attr-&gt;reg, val);</div><div class='add'>+</div><div class='add'>+	return ret ? : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmbus_add_samples_attr(struct pmbus_data *data, int page,</div><div class='add'>+				  struct pmbus_samples_attr *attr)</div><div class='add'>+{</div><div class='add'>+	struct pmbus_samples_reg *reg;</div><div class='add'>+</div><div class='add'>+	reg = devm_kzalloc(data-&gt;dev, sizeof(*reg), GFP_KERNEL);</div><div class='add'>+	if (!reg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	reg-&gt;attr = attr;</div><div class='add'>+	reg-&gt;page = page;</div><div class='add'>+</div><div class='add'>+	pmbus_dev_attr_init(&amp;reg-&gt;dev_attr, attr-&gt;name, 0644,</div><div class='add'>+			    pmbus_show_samples, pmbus_set_samples);</div><div class='add'>+</div><div class='add'>+	return pmbus_add_attribute(data, &amp;reg-&gt;dev_attr.attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmbus_add_samples_attributes(struct i2c_client *client,</div><div class='add'>+					struct pmbus_data *data)</div><div class='add'>+{</div><div class='add'>+	const struct pmbus_driver_info *info = data-&gt;info;</div><div class='add'>+	int s;</div><div class='add'>+</div><div class='add'>+	if (!(info-&gt;func[0] &amp; PMBUS_HAVE_SAMPLES))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (s = 0; s &lt; ARRAY_SIZE(pmbus_samples_registers); s++) {</div><div class='add'>+		struct pmbus_samples_attr *attr;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		attr = &amp;pmbus_samples_registers[s];</div><div class='add'>+		if (!pmbus_check_word_register(client, 0, attr-&gt;reg))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = pmbus_add_samples_attr(data, 0, attr);</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='ctx'> static int pmbus_find_attributes(struct i2c_client *client,</div><div class='ctx'> 				 struct pmbus_data *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1932,6 +2038,10 @@ static int pmbus_find_attributes(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	/* Fans */</div><div class='ctx'> 	ret = pmbus_add_fan_attributes(client, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pmbus_add_samples_attributes(client, data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2305,6 +2415,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,</div><div class='ctx'> 	struct device *dev = &amp;client-&gt;dev;</div><div class='ctx'> 	const struct pmbus_platform_data *pdata = dev_get_platdata(dev);</div><div class='ctx'> 	struct pmbus_data *data;</div><div class='add'>+	size_t groups_num = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!info)</div><div class='hunk'>@@ -2319,6 +2430,15 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (info-&gt;groups)</div><div class='add'>+		while (info-&gt;groups[groups_num])</div><div class='add'>+			groups_num++;</div><div class='add'>+</div><div class='add'>+	data-&gt;groups = devm_kcalloc(dev, groups_num + 2, sizeof(void *),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!data-&gt;groups)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	i2c_set_clientdata(client, data);</div><div class='ctx'> 	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;dev = dev;</div><div class='hunk'>@@ -2346,6 +2466,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;groups[0] = &amp;data-&gt;group;</div><div class='add'>+	memcpy(data-&gt;groups + 1, info-&gt;groups, sizeof(void *) * groups_num);</div><div class='ctx'> 	data-&gt;hwmon_dev = hwmon_device_register_with_groups(dev, client-&gt;name,</div><div class='ctx'> 							    data, data-&gt;groups);</div><div class='ctx'> 	if (IS_ERR(data-&gt;hwmon_dev)) {</div><div class='head'>diff --git a/drivers/hwmon/pmbus/tps53679.c b/drivers/hwmon/pmbus/tps53679.c<br/>index 2bc352c5357f..3fd5105ee9ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/tps53679.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/tps53679.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/tps53679.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/tps53679.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ static const struct i2c_device_id tps53679_id[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, tps53679_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id tps53679_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused tps53679_of_match[] = {</div><div class='ctx'> 	{.compatible = "ti,tps53679"},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c<br/>index ae93885fccd8..40a3e3d0e661 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/ucd9000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/ucd9000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/ucd9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/ucd9000.c</a></div><div class='hunk'>@@ -151,7 +151,7 @@ static const struct i2c_device_id ucd9000_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ucd9000_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ucd9000_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ucd9000_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,ucd9000",</div><div class='ctx'> 		.data = (void *)ucd9000</div><div class='head'>diff --git a/drivers/hwmon/pmbus/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c<br/>index 3ed94585837a..fec7656700db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/ucd9200.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pmbus/ucd9200.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pmbus/ucd9200.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pmbus/ucd9200.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static const struct i2c_device_id ucd9200_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, ucd9200_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ucd9200_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused ucd9200_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,cd9200",</div><div class='ctx'> 		.data = (void *)ucd9200</div><div class='head'>diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c<br/>index 167221c7628a..eead8afe6447 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pwm-fan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/pwm-fan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/pwm-fan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/pwm-fan.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hwmon.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -26,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/thermal.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_PWM 255</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +35,14 @@ struct pwm_fan_ctx {</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	struct pwm_device *pwm;</div><div class='ctx'> 	struct regulator *reg_en;</div><div class='add'>+</div><div class='add'>+	int irq;</div><div class='add'>+	atomic_t pulses;</div><div class='add'>+	unsigned int rpm;</div><div class='add'>+	u8 pulses_per_revolution;</div><div class='add'>+	ktime_t sample_start;</div><div class='add'>+	struct timer_list rpm_timer;</div><div class='add'>+</div><div class='ctx'> 	unsigned int pwm_value;</div><div class='ctx'> 	unsigned int pwm_fan_state;</div><div class='ctx'> 	unsigned int pwm_fan_max_state;</div><div class='hunk'>@@ -40,6 +50,32 @@ struct pwm_fan_ctx {</div><div class='ctx'> 	struct thermal_cooling_device *cdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* This handler assumes self resetting edge triggered interrupt. */</div><div class='add'>+static irqreturn_t pulse_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct pwm_fan_ctx *ctx = dev_id;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ctx-&gt;pulses);</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 sample_timer(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct pwm_fan_ctx *ctx = from_timer(ctx, t, rpm_timer);</div><div class='add'>+	int pulses;</div><div class='add'>+	u64 tmp;</div><div class='add'>+</div><div class='add'>+	pulses = atomic_read(&amp;ctx-&gt;pulses);</div><div class='add'>+	atomic_sub(pulses, &amp;ctx-&gt;pulses);</div><div class='add'>+	tmp = (u64)pulses * ktime_ms_delta(ktime_get(), ctx-&gt;sample_start) * 60;</div><div class='add'>+	do_div(tmp, ctx-&gt;pulses_per_revolution * 1000);</div><div class='add'>+	ctx-&gt;rpm = tmp;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;sample_start = ktime_get();</div><div class='add'>+	mod_timer(&amp;ctx-&gt;rpm_timer, jiffies + HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int  __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long period;</div><div class='hunk'>@@ -100,15 +136,45 @@ static ssize_t pwm_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%u\n", ctx-&gt;pwm_value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t rpm_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pwm_fan_ctx *ctx = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", ctx-&gt;rpm);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, rpm, 0);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *pwm_fan_attrs[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_input.dev_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-ATTRIBUTE_GROUPS(pwm_fan);</div><div class='add'>+static umode_t pwm_fan_attrs_visible(struct kobject *kobj, struct attribute *a,</div><div class='add'>+				     int n)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	struct pwm_fan_ctx *ctx = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/* Hide fan_input in case no interrupt is available  */</div><div class='add'>+	if (n == 1 &amp;&amp; ctx-&gt;irq &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return a-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct attribute_group pwm_fan_group = {</div><div class='add'>+	.attrs = pwm_fan_attrs,</div><div class='add'>+	.is_visible = pwm_fan_attrs_visible,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *pwm_fan_groups[] = {</div><div class='add'>+	&amp;pwm_fan_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* thermal cooling device callbacks */</div><div class='ctx'> static int pwm_fan_get_max_state(struct thermal_cooling_device *cdev,</div><div class='hunk'>@@ -214,6 +280,7 @@ static int pwm_fan_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *hwmon;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct pwm_state state = { };</div><div class='add'>+	u32 ppr = 2;</div><div class='ctx'> </div><div class='ctx'> 	ctx = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*ctx), GFP_KERNEL);</div><div class='ctx'> 	if (!ctx)</div><div class='hunk'>@@ -233,6 +300,10 @@ static int pwm_fan_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, ctx);</div><div class='ctx'> </div><div class='add'>+	ctx-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ctx-&gt;irq == -EPROBE_DEFER)</div><div class='add'>+		return ctx-&gt;irq;</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;reg_en = devm_regulator_get_optional(&amp;pdev-&gt;dev, "fan");</div><div class='ctx'> 	if (IS_ERR(ctx-&gt;reg_en)) {</div><div class='ctx'> 		if (PTR_ERR(ctx-&gt;reg_en) != -ENODEV)</div><div class='hunk'>@@ -257,21 +328,44 @@ static int pwm_fan_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ret = pwm_apply_state(ctx-&gt;pwm, &amp;state);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to configure PWM\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to configure PWM: %d\n", ret);</div><div class='ctx'> 		goto err_reg_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	timer_setup(&amp;ctx-&gt;rpm_timer, sample_timer, 0);</div><div class='add'>+</div><div class='add'>+	of_property_read_u32(pdev-&gt;dev.of_node, "pulses-per-revolution", &amp;ppr);</div><div class='add'>+	ctx-&gt;pulses_per_revolution = ppr;</div><div class='add'>+	if (!ctx-&gt;pulses_per_revolution) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "pulses-per-revolution can't be zero.\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_pwm_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;irq &gt; 0) {</div><div class='add'>+		ret = devm_request_irq(&amp;pdev-&gt;dev, ctx-&gt;irq, pulse_handler, 0,</div><div class='add'>+				       pdev-&gt;name, ctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Failed to request interrupt: %d\n", ret);</div><div class='add'>+			goto err_pwm_disable;</div><div class='add'>+		}</div><div class='add'>+		ctx-&gt;sample_start = ktime_get();</div><div class='add'>+		mod_timer(&amp;ctx-&gt;rpm_timer, jiffies + HZ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hwmon = devm_hwmon_device_register_with_groups(&amp;pdev-&gt;dev, "pwmfan",</div><div class='ctx'> 						       ctx, pwm_fan_groups);</div><div class='ctx'> 	if (IS_ERR(hwmon)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to register hwmon device\n");</div><div class='ctx'> 		ret = PTR_ERR(hwmon);</div><div class='del'>-		goto err_pwm_disable;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Failed to register hwmon device: %d\n", ret);</div><div class='add'>+		goto err_del_timer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pwm_fan_of_get_cooling_data(&amp;pdev-&gt;dev, ctx);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_del_timer;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;pwm_fan_state = ctx-&gt;pwm_fan_max_state;</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_THERMAL)) {</div><div class='hunk'>@@ -279,10 +373,11 @@ static int pwm_fan_probe(struct platform_device *pdev)</div><div class='ctx'> 							  "pwm-fan", ctx,</div><div class='ctx'> 							  &amp;pwm_fan_cooling_ops);</div><div class='ctx'> 		if (IS_ERR(cdev)) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"Failed to register pwm-fan as cooling device");</div><div class='ctx'> 			ret = PTR_ERR(cdev);</div><div class='del'>-			goto err_pwm_disable;</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Failed to register pwm-fan as cooling device: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto err_del_timer;</div><div class='ctx'> 		}</div><div class='ctx'> 		ctx-&gt;cdev = cdev;</div><div class='ctx'> 		thermal_cdev_update(cdev);</div><div class='hunk'>@@ -290,6 +385,9 @@ static int pwm_fan_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_del_timer:</div><div class='add'>+	del_timer_sync(&amp;ctx-&gt;rpm_timer);</div><div class='add'>+</div><div class='ctx'> err_pwm_disable:</div><div class='ctx'> 	state.enabled = false;</div><div class='ctx'> 	pwm_apply_state(ctx-&gt;pwm, &amp;state);</div><div class='hunk'>@@ -306,6 +404,8 @@ static int pwm_fan_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct pwm_fan_ctx *ctx = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	thermal_cooling_device_unregister(ctx-&gt;cdev);</div><div class='add'>+	del_timer_sync(&amp;ctx-&gt;rpm_timer);</div><div class='add'>+</div><div class='ctx'> 	if (ctx-&gt;pwm_value)</div><div class='ctx'> 		pwm_disable(ctx-&gt;pwm);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c<br/>index 0d0457245e7d..efe4bb1ff221 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/raspberrypi-hwmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/raspberrypi-hwmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/raspberrypi-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/raspberrypi-hwmon.c</a></div><div class='hunk'>@@ -86,18 +86,9 @@ static umode_t rpi_is_visible(const void *_data, enum hwmon_sensor_types type,</div><div class='ctx'> 	return 0444;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 rpi_in_config[] = {</div><div class='del'>-	HWMON_I_LCRIT_ALARM,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info rpi_in = {</div><div class='del'>-	.type = hwmon_in,</div><div class='del'>-	.config = rpi_in_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *rpi_info[] = {</div><div class='del'>-	&amp;rpi_in,</div><div class='add'>+	HWMON_CHANNEL_INFO(in,</div><div class='add'>+			   HWMON_I_LCRIT_ALARM),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c<br/>index 0c4710d35d16..0d65aa5985e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/s3c-hwmon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/s3c-hwmon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/s3c-hwmon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/s3c-hwmon.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static int s3c_hwmon_read_ch(struct device *dev,</div><div class='ctx'> static ssize_t s3c_hwmon_show_raw(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct s3c_hwmon *adc = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	struct s3c_hwmon *adc = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *sa = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +164,7 @@ static ssize_t s3c_hwmon_ch_show(struct device *dev,</div><div class='ctx'> 				 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sen_attr = to_sensor_dev_attr(attr);</div><div class='del'>-	struct s3c_hwmon *hwmon = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	struct s3c_hwmon *hwmon = dev_get_drvdata(dev);</div><div class='ctx'> 	struct s3c_hwmon_pdata *pdata = dev_get_platdata(dev);</div><div class='ctx'> 	struct s3c_hwmon_chcfg *cfg;</div><div class='ctx'> 	int ret;</div><div class='head'>diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c<br/>index 39b41e35c2bf..7f4a63959730 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/sht15.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/sht15.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/sht15.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/sht15.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2007 Wouter Horre</div><div class='ctx'>  *</div><div class='del'>- * For further information, see the Documentation/hwmon/sht15 file.</div><div class='add'>+ * For further information, see the Documentation/hwmon/sht15.rst file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c<br/>index 6d789aab54c9..44451b913292 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/sis5595.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/sis5595.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/sis5595.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/sis5595.c</a></div><div class='hunk'>@@ -67,7 +67,6 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * If force_addr is set to anything different from 0, we forcibly enable</div><div class='ctx'>  * the device at the given address.</div><div class='hunk'>@@ -222,7 +221,7 @@ static struct platform_driver sis5595_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 4 Voltages */</div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='hunk'>@@ -231,7 +230,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='hunk'>@@ -240,7 +239,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='hunk'>@@ -249,8 +248,8 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -269,8 +268,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *da,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -289,19 +288,21 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_in_offset(offset)					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_in, NULL, offset);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, offset);</div><div class='del'>-</div><div class='del'>-show_in_offset(0);</div><div class='del'>-show_in_offset(1);</div><div class='del'>-show_in_offset(2);</div><div class='del'>-show_in_offset(3);</div><div class='del'>-show_in_offset(4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='ctx'> </div><div class='ctx'> /* Temperature */</div><div class='ctx'> static ssize_t temp1_input_show(struct device *dev,</div><div class='hunk'>@@ -368,7 +369,7 @@ static DEVICE_ATTR_RW(temp1_max);</div><div class='ctx'> static DEVICE_ATTR_RW(temp1_max_hyst);</div><div class='ctx'> </div><div class='ctx'> /* 2 Fans */</div><div class='del'>-static ssize_t show_fan(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='hunk'>@@ -378,7 +379,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='hunk'>@@ -388,8 +389,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -408,7 +409,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='hunk'>@@ -423,8 +424,8 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,</div><div class='ctx'>  * least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>  * because the divisor changed.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='hunk'>@@ -480,16 +481,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_fan_offset(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\</div><div class='del'>-		show_fan, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_div, set_fan_div, offset - 1);</div><div class='del'>-</div><div class='del'>-show_fan_offset(1);</div><div class='del'>-show_fan_offset(2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> /* Alarms */</div><div class='ctx'> static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -500,21 +497,21 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *da,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sis5595_data *data = sis5595_update_device(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(da)-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; nr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 15);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 15);</div><div class='ctx'> </div><div class='ctx'> static ssize_t name_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			 char *buf)</div><div class='hunk'>@@ -673,7 +670,6 @@ static int sis5595_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* ISA access must be locked explicitly. */</div><div class='ctx'> static int sis5595_read_value(struct sis5595_data *data, u8 reg)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c<br/>index c0775084dde0..60e193f2e970 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/smsc47b397.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/smsc47b397.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/smsc47b397.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/smsc47b397.c</a></div><div class='hunk'>@@ -72,14 +72,19 @@ static inline void superio_select(int ld)</div><div class='ctx'> 	superio_outb(0x07, ld);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void superio_enter(void)</div><div class='add'>+static inline int superio_enter(void)</div><div class='ctx'> {</div><div class='add'>+	if (!request_muxed_region(REG, 2, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	outb(0x55, REG);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void superio_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	outb(0xAA, REG);</div><div class='add'>+	release_region(REG, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SUPERIO_REG_DEVID	0x20</div><div class='hunk'>@@ -300,8 +305,12 @@ static int __init smsc47b397_find(void)</div><div class='ctx'> 	u8 id, rev;</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	unsigned short addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = superio_enter();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	superio_enter();</div><div class='ctx'> 	id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);</div><div class='ctx'> </div><div class='ctx'> 	switch (id) {</div><div class='head'>diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c<br/>index c7b6a425e2c0..5f92eab24c62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/smsc47m1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/smsc47m1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/smsc47m1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/smsc47m1.c</a></div><div class='hunk'>@@ -73,16 +73,21 @@ superio_inb(int reg)</div><div class='ctx'> /* logical device for fans is 0x0A */</div><div class='ctx'> #define superio_select() superio_outb(0x07, 0x0A)</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static inline int</div><div class='ctx'> superio_enter(void)</div><div class='ctx'> {</div><div class='add'>+	if (!request_muxed_region(REG, 2, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	outb(0x55, REG);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> superio_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	outb(0xAA, REG);</div><div class='add'>+	release_region(REG, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SUPERIO_REG_ACT		0x30</div><div class='hunk'>@@ -202,8 +207,8 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_fan(struct device *dev, struct device_attribute</div><div class='del'>-		       *devattr, char *buf)</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);</div><div class='hunk'>@@ -221,8 +226,8 @@ static ssize_t get_fan(struct device *dev, struct device_attribute</div><div class='ctx'> 	return sprintf(buf, "%d\n", rpm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_fan_min(struct device *dev, struct device_attribute</div><div class='del'>-			   *devattr, char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);</div><div class='hunk'>@@ -232,32 +237,32 @@ static ssize_t get_fan_min(struct device *dev, struct device_attribute</div><div class='ctx'> 	return sprintf(buf, "%d\n", rpm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_fan_div(struct device *dev, struct device_attribute</div><div class='del'>-			   *devattr, char *buf)</div><div class='add'>+static ssize_t fan_div_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);</div><div class='ctx'> 	return sprintf(buf, "%d\n", DIV_FROM_REG(data-&gt;fan_div[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_fan_alarm(struct device *dev, struct device_attribute</div><div class='del'>-			     *devattr, char *buf)</div><div class='add'>+static ssize_t fan_alarm_show(struct device *dev,</div><div class='add'>+			      struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_pwm(struct device *dev, struct device_attribute</div><div class='del'>-		       *devattr, char *buf)</div><div class='add'>+static ssize_t pwm_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);</div><div class='ctx'> 	return sprintf(buf, "%d\n", PWM_FROM_REG(data-&gt;pwm[attr-&gt;index]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_pwm_en(struct device *dev, struct device_attribute</div><div class='del'>-			  *devattr, char *buf)</div><div class='add'>+static ssize_t pwm_en_show(struct device *dev,</div><div class='add'>+			   struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);</div><div class='hunk'>@@ -271,8 +276,9 @@ static ssize_t alarms_show(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;alarms);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute</div><div class='del'>-			   *devattr, const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *devattr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -307,8 +313,9 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute</div><div class='ctx'>  * of least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>  * because the divider changed.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute</div><div class='del'>-			   *devattr, const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *devattr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -370,8 +377,8 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm(struct device *dev, struct device_attribute</div><div class='del'>-		       *devattr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_store(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -396,8 +403,9 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_pwm_en(struct device *dev, struct device_attribute</div><div class='del'>-			  *devattr, const char *buf, size_t count)</div><div class='add'>+static ssize_t pwm_en_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *devattr, const char *buf,</div><div class='add'>+			    size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct smsc47m1_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -422,23 +430,24 @@ static ssize_t set_pwm_en(struct device *dev, struct device_attribute</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define fan_present(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan,	\</div><div class='del'>-		NULL, offset - 1);					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		get_fan_min, set_fan_min, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		get_fan_div, set_fan_div, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_alarm, S_IRUGO, get_fan_alarm,	\</div><div class='del'>-		NULL, offset - 1);					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		get_pwm, set_pwm, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		get_pwm_en, set_pwm_en, offset - 1)</div><div class='del'>-</div><div class='del'>-fan_present(1);</div><div class='del'>-fan_present(2);</div><div class='del'>-fan_present(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, fan_alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_enable, pwm_en, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, fan_alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_enable, pwm_en, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_input, fan, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_min, fan_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_div, fan_div, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_alarm, fan_alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3, pwm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_enable, pwm_en, 2);</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='hunk'>@@ -531,8 +540,12 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	unsigned short addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = superio_enter();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	superio_enter();</div><div class='ctx'> 	val = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -608,13 +621,14 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)</div><div class='ctx'> static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)</div><div class='ctx'> {</div><div class='ctx'> 	if ((sio_data-&gt;activate &amp; 0x01) == 0) {</div><div class='del'>-		superio_enter();</div><div class='del'>-		superio_select();</div><div class='del'>-</div><div class='del'>-		pr_info("Disabling device\n");</div><div class='del'>-		superio_outb(SUPERIO_REG_ACT, sio_data-&gt;activate);</div><div class='del'>-</div><div class='del'>-		superio_exit();</div><div class='add'>+		if (!superio_enter()) {</div><div class='add'>+			superio_select();</div><div class='add'>+			pr_info("Disabling device\n");</div><div class='add'>+			superio_outb(SUPERIO_REG_ACT, sio_data-&gt;activate);</div><div class='add'>+			superio_exit();</div><div class='add'>+		} else {</div><div class='add'>+			pr_warn("Failed to disable device\n");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c<br/>index 6989408033ec..e5d9222b22f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/smsc47m192.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/smsc47m192.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/smsc47m192.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/smsc47m192.c</a></div><div class='hunk'>@@ -179,8 +179,8 @@ static struct smsc47m192_data *smsc47m192_update_device(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Voltages */</div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -188,8 +188,8 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in[nr], nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -197,8 +197,8 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_min[nr], nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -206,8 +206,8 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_max[nr], nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -228,8 +228,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -250,26 +250,34 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_in_offset(offset)					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_in, NULL, offset);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, offset);</div><div class='del'>-</div><div class='del'>-show_in_offset(0)</div><div class='del'>-show_in_offset(1)</div><div class='del'>-show_in_offset(2)</div><div class='del'>-show_in_offset(3)</div><div class='del'>-show_in_offset(4)</div><div class='del'>-show_in_offset(5)</div><div class='del'>-show_in_offset(6)</div><div class='del'>-show_in_offset(7)</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_input, in, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_input, in, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_min, in_min, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_max, in_max, 7);</div><div class='ctx'> </div><div class='ctx'> /* Temperatures */</div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -277,8 +285,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_min_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -286,8 +294,8 @@ static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_max_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -295,8 +303,9 @@ static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -317,8 +326,9 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -339,8 +349,8 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_offset(struct device *dev, struct device_attribute</div><div class='del'>-		*attr, char *buf)</div><div class='add'>+static ssize_t temp_offset_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -348,8 +358,9 @@ static ssize_t show_temp_offset(struct device *dev, struct device_attribute</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_offset[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_offset(struct device *dev, struct device_attribute</div><div class='del'>-		*attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_offset_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 sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -385,19 +396,18 @@ static ssize_t set_temp_offset(struct device *dev, struct device_attribute</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_temp_index(index)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##index##_input, S_IRUGO,			\</div><div class='del'>-		show_temp, NULL, index-1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##index##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_temp_min, set_temp_min, index-1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##index##_max, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_temp_max, set_temp_max, index-1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##index##_offset, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_offset, set_temp_offset, index-1);</div><div class='del'>-</div><div class='del'>-show_temp_index(1)</div><div class='del'>-show_temp_index(2)</div><div class='del'>-show_temp_index(3)</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_offset, temp_offset, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_offset, temp_offset, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_offset, temp_offset, 2);</div><div class='ctx'> </div><div class='ctx'> /* VID */</div><div class='ctx'> static ssize_t cpu0_vid_show(struct device *dev,</div><div class='hunk'>@@ -434,8 +444,8 @@ static ssize_t vrm_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static DEVICE_ATTR_RW(vrm);</div><div class='ctx'> </div><div class='ctx'> /* Alarms */</div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -443,19 +453,19 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &amp; nr) ? 1 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 0x0010);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 0x0020);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0x0040);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 0x4000);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 0x8000);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0x0001);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0x0002);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 0x0004);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 0x0008);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 0x0100);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 0x0200);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 0x0400);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 0x0800);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 0x0010);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 0x0020);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 0x0040);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 0x4000);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 0x8000);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0x0001);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 0x0002);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 0x0004);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 0x0008);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 0x0100);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 0x0200);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 0x0400);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 0x0800);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *smsc47m192_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='head'>diff --git a/drivers/hwmon/stts751.c b/drivers/hwmon/stts751.c<br/>index 90b60297f2f7..f670796b609a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/stts751.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/stts751.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/stts751.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/stts751.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static const struct i2c_device_id stts751_id[] = {</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id stts751_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused stts751_of_match[] = {</div><div class='ctx'> 	{ .compatible = "stts751" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c<br/>index 6a0ee903127e..ae9942331cae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/thmc50.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/thmc50.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/thmc50.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/thmc50.c</a></div><div class='hunk'>@@ -128,16 +128,16 @@ static struct thmc50_data *thmc50_update_device(struct device *dev)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_analog_out(struct device *dev,</div><div class='add'>+static ssize_t analog_out_show(struct device *dev,</div><div class='ctx'> 			       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct thmc50_data *data = thmc50_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;analog_out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_analog_out(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 analog_out_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 thmc50_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct i2c_client *client = data-&gt;client;</div><div class='hunk'>@@ -166,14 +166,14 @@ static ssize_t set_analog_out(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* There is only one PWM mode = DC */</div><div class='del'>-static ssize_t show_pwm_mode(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t pwm_mode_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "0\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Temperatures */</div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -181,16 +181,17 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;temp_input[nr] * 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t temp_min_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct thmc50_data *data = thmc50_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;temp_min[nr] * 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct thmc50_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -210,16 +211,17 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     char *buf)</div><div class='add'>+static ssize_t temp_max_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct thmc50_data *data = thmc50_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;temp_max[nr] * 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct thmc50_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -239,16 +241,15 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_critical(struct device *dev,</div><div class='del'>-				  struct device_attribute *attr,</div><div class='del'>-				  char *buf)</div><div class='add'>+static ssize_t temp_critical_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct thmc50_data *data = thmc50_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;temp_critical[nr] * 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -257,29 +258,27 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; index) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define temp_reg(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,	\</div><div class='del'>-			NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-			show_temp_min, set_temp_min, offset - 1);	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-			show_temp_max, set_temp_max, offset - 1);	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO,			\</div><div class='del'>-			show_temp_critical, NULL, offset - 1);</div><div class='del'>-</div><div class='del'>-temp_reg(1);</div><div class='del'>-temp_reg(2);</div><div class='del'>-temp_reg(3);</div><div class='del'>-</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_analog_out,</div><div class='del'>-			  set_analog_out, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO, show_pwm_mode, NULL, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_crit, temp_critical, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_crit, temp_critical, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_crit, temp_critical, 2);</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 2);</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1, analog_out, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(pwm1_mode, pwm_mode, 0);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *thmc50_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='head'>diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c<br/>index 35523d315f25..f4ee55615dea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp102.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp102.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp102.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/tmp102.c</a></div><div class='hunk'>@@ -150,29 +150,11 @@ static umode_t tmp102_is_visible(const void *data, enum hwmon_sensor_types type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 tmp102_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info tmp102_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = tmp102_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 tmp102_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info tmp102_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = tmp102_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *tmp102_info[] = {</div><div class='del'>-	&amp;tmp102_chip,</div><div class='del'>-	&amp;tmp102_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_REGISTER_TZ),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -321,7 +303,7 @@ static const struct i2c_device_id tmp102_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, tmp102_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id tmp102_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused tmp102_of_match[] = {</div><div class='ctx'> 	{ .compatible = "ti,tmp102" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/tmp103.c b/drivers/hwmon/tmp103.c<br/>index bda0fdc1eb53..a91726d33da8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp103.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp103.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp103.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/tmp103.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static const struct i2c_device_id tmp103_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, tmp103_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id tmp103_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused tmp103_of_match[] = {</div><div class='ctx'> 	{ .compatible = "ti,tmp103" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwmon/tmp108.c b/drivers/hwmon/tmp108.c<br/>index 429bfeae4ca8..2447af704424 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp108.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp108.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp108.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/tmp108.c</a></div><div class='hunk'>@@ -281,30 +281,13 @@ static umode_t tmp108_is_visible(const void *data, enum hwmon_sensor_types type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 tmp108_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info tmp108_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = tmp108_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 tmp108_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | HWMON_T_MIN_HYST</div><div class='del'>-		| HWMON_T_MAX_HYST | HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info tmp108_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = tmp108_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *tmp108_info[] = {</div><div class='del'>-	&amp;tmp108_chip,</div><div class='del'>-	&amp;tmp108_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN |</div><div class='add'>+			   HWMON_T_MIN_HYST | HWMON_T_MAX_HYST |</div><div class='add'>+			   HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c<br/>index 2732a71f3b39..5e63010dd3a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp421.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/tmp421.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/tmp421.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/tmp421.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ static const struct i2c_device_id tmp421_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, tmp421_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id tmp421_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused tmp421_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,tmp421",</div><div class='ctx'> 		.data = (void *)2</div><div class='head'>diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c<br/>index 81f35e3a06b8..259725dec37e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/via686a.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/via686a.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/via686a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/via686a.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * If force_addr is set to anything different from 0, we forcibly enable</div><div class='ctx'>  * the device at the given address.</div><div class='hunk'>@@ -355,32 +354,32 @@ static void via686a_init_device(struct via686a_data *data);</div><div class='ctx'> /* following are the sysfs callback functions */</div><div class='ctx'> </div><div class='ctx'> /* 7 voltage sensors */</div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+		       char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%ld\n", IN_FROM_REG(data-&gt;in[nr], nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			   char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%ld\n", IN_FROM_REG(data-&gt;in_min[nr], nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			   char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%ld\n", IN_FROM_REG(data-&gt;in_max[nr], nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-		const char *buf, size_t count) {</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    const char *buf, size_t count) {</div><div class='ctx'> 	struct via686a_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -398,8 +397,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *da,</div><div class='del'>-		const char *buf, size_t count) {</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    const char *buf, size_t count) {</div><div class='ctx'> 	struct via686a_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -417,44 +416,48 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-#define show_in_offset(offset)					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_in, NULL, offset);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, offset);</div><div class='ctx'> </div><div class='del'>-show_in_offset(0);</div><div class='del'>-show_in_offset(1);</div><div class='del'>-show_in_offset(2);</div><div class='del'>-show_in_offset(3);</div><div class='del'>-show_in_offset(4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='ctx'> </div><div class='ctx'> /* 3 temperatures */</div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			 char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%ld\n", TEMP_FROM_REG10(data-&gt;temp[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_over(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t temp_over_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			      char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%ld\n", TEMP_FROM_REG(data-&gt;temp_over[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t temp_hyst_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			      char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%ld\n", TEMP_FROM_REG(data-&gt;temp_hyst[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_over(struct device *dev, struct device_attribute *da,</div><div class='del'>-		const char *buf, size_t count) {</div><div class='add'>+static ssize_t temp_over_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *da, const char *buf,</div><div class='add'>+			       size_t count) {</div><div class='ctx'> 	struct via686a_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -472,8 +475,9 @@ static ssize_t set_temp_over(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *da,</div><div class='del'>-		const char *buf, size_t count) {</div><div class='add'>+static ssize_t temp_hyst_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *da, const char *buf,</div><div class='add'>+			       size_t count) {</div><div class='ctx'> 	struct via686a_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -491,29 +495,28 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-#define show_temp_offset(offset)					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_temp, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_over, set_temp_over, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_hyst, set_temp_hyst, offset - 1);</div><div class='ctx'> </div><div class='del'>-show_temp_offset(1);</div><div class='del'>-show_temp_offset(2);</div><div class='del'>-show_temp_offset(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_over, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max_hyst, temp_hyst, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_over, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max_hyst, temp_hyst, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_over, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max_hyst, temp_hyst, 2);</div><div class='ctx'> </div><div class='ctx'> /* 2 Fans */</div><div class='del'>-static ssize_t show_fan(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%d\n", FAN_FROM_REG(data-&gt;fan[nr],</div><div class='ctx'> 				DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -521,15 +524,15 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 		FAN_FROM_REG(data-&gt;fan_min[nr],</div><div class='ctx'> 			     DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,</div><div class='del'>-		char *buf) {</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *da,</div><div class='add'>+			    char *buf) {</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%d\n", DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,</div><div class='del'>-		const char *buf, size_t count) {</div><div class='add'>+static ssize_t fan_min_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			     const char *buf, size_t count) {</div><div class='ctx'> 	struct via686a_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -546,8 +549,8 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='del'>-		const char *buf, size_t count) {</div><div class='add'>+static ssize_t fan_div_store(struct device *dev, struct device_attribute *da,</div><div class='add'>+			     const char *buf, size_t count) {</div><div class='ctx'> 	struct via686a_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='hunk'>@@ -568,16 +571,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define show_fan_offset(offset)						\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\</div><div class='del'>-		show_fan, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_div, set_fan_div, offset - 1);</div><div class='del'>-</div><div class='del'>-show_fan_offset(1);</div><div class='del'>-show_fan_offset(2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> /* Alarms */</div><div class='ctx'> static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -589,23 +588,23 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct via686a_data *data = via686a_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 15);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='ctx'> </div><div class='ctx'> static ssize_t name_show(struct device *dev, struct device_attribute</div><div class='ctx'> 			 *devattr, char *buf)</div><div class='hunk'>@@ -676,7 +675,6 @@ static struct platform_driver via686a_driver = {</div><div class='ctx'> 	.remove		= via686a_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* This is called when the module is loaded */</div><div class='ctx'> static int via686a_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c<br/>index 3a6bfa51cb94..95d5e8ec8b7f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/vt1211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/vt1211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/vt1211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/vt1211.c</a></div><div class='hunk'>@@ -226,15 +226,21 @@ static inline void superio_select(int sio_cip, int ldn)</div><div class='ctx'> 	outb(ldn, sio_cip + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void superio_enter(int sio_cip)</div><div class='add'>+static inline int superio_enter(int sio_cip)</div><div class='ctx'> {</div><div class='add'>+	if (!request_muxed_region(sio_cip, 2, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	outb(0x87, sio_cip);</div><div class='ctx'> 	outb(0x87, sio_cip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void superio_exit(int sio_cip)</div><div class='ctx'> {</div><div class='ctx'> 	outb(0xaa, sio_cip);</div><div class='add'>+	release_region(sio_cip, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------</div><div class='hunk'>@@ -1282,11 +1288,14 @@ EXIT:</div><div class='ctx'> </div><div class='ctx'> static int __init vt1211_find(int sio_cip, unsigned short *address)</div><div class='ctx'> {</div><div class='del'>-	int err = -ENODEV;</div><div class='add'>+	int err;</div><div class='ctx'> 	int devid;</div><div class='ctx'> </div><div class='del'>-	superio_enter(sio_cip);</div><div class='add'>+	err = superio_enter(sio_cip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	err = -ENODEV;</div><div class='ctx'> 	devid = force_id ? force_id : superio_inb(sio_cip, SIO_VT1211_DEVID);</div><div class='ctx'> 	if (devid != SIO_VT1211_ID)</div><div class='ctx'> 		goto EXIT;</div><div class='head'>diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c<br/>index 367b5eb53fb6..e2f1a80367e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/vt8231.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/vt8231.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/vt8231.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/vt8231.c</a></div><div class='hunk'>@@ -192,8 +192,8 @@ static inline void vt8231_write_value(struct vt8231_data *data, u8 reg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* following are the sysfs callback functions */</div><div class='del'>-static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -202,8 +202,8 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", ((data-&gt;in[nr] - 3) * 10000) / 958);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -212,8 +212,8 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", ((data-&gt;in_min[nr] - 3) * 10000) / 958);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t in_max_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -222,8 +222,8 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", (((data-&gt;in_max[nr] - 3) * 10000) / 958));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -242,8 +242,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -330,19 +330,21 @@ static ssize_t in5_max_store(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define define_voltage_sysfs(offset)				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_in, NULL, offset);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_min, set_in_min, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_in_max, set_in_max, offset)</div><div class='del'>-</div><div class='del'>-define_voltage_sysfs(0);</div><div class='del'>-define_voltage_sysfs(1);</div><div class='del'>-define_voltage_sysfs(2);</div><div class='del'>-define_voltage_sysfs(3);</div><div class='del'>-define_voltage_sysfs(4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(in5_input);</div><div class='ctx'> static DEVICE_ATTR_RW(in5_min);</div><div class='hunk'>@@ -407,8 +409,8 @@ static ssize_t temp1_max_hyst_store(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -416,8 +418,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_max_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -425,8 +427,8 @@ static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_MAXMIN_FROM_REG(data-&gt;temp_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t temp_min_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -434,8 +436,9 @@ static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_MAXMIN_FROM_REG(data-&gt;temp_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_max_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -453,8 +456,9 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t temp_min_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='add'>+			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -477,27 +481,30 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'>  * Note that these map the Linux temperature sensor numbering (1-6) to the VIA</div><div class='ctx'>  * temperature sensor numbering (0-5)</div><div class='ctx'>  */</div><div class='del'>-#define define_temperature_sysfs(offset)				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,		\</div><div class='del'>-		show_temp, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_max, set_temp_max, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,	\</div><div class='del'>-		show_temp_min, set_temp_min, offset - 1)</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(temp1_input);</div><div class='ctx'> static DEVICE_ATTR_RW(temp1_max);</div><div class='ctx'> static DEVICE_ATTR_RW(temp1_max_hyst);</div><div class='ctx'> </div><div class='del'>-define_temperature_sysfs(2);</div><div class='del'>-define_temperature_sysfs(3);</div><div class='del'>-define_temperature_sysfs(4);</div><div class='del'>-define_temperature_sysfs(5);</div><div class='del'>-define_temperature_sysfs(6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max_hyst, temp_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max_hyst, temp_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp4_input, temp, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp4_max, temp_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp4_max_hyst, temp_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp5_input, temp, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp5_max, temp_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp5_max_hyst, temp_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp6_input, temp, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp6_max, temp_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp6_max_hyst, temp_min, 5);</div><div class='ctx'> </div><div class='ctx'> /* Fans */</div><div class='del'>-static ssize_t show_fan(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -506,8 +513,8 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 				DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -516,8 +523,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		char *buf)</div><div class='add'>+static ssize_t fan_div_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -525,8 +532,9 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_min_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='hunk'>@@ -545,8 +553,9 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+static ssize_t fan_div_store(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, const char *buf,</div><div class='add'>+			     size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct vt8231_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='hunk'>@@ -593,17 +602,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define define_fan_sysfs(offset)					\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\</div><div class='del'>-		show_fan, NULL, offset - 1);				\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_div, set_fan_div, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-		show_fan_min, set_fan_min, offset - 1)</div><div class='del'>-</div><div class='del'>-define_fan_sysfs(1);</div><div class='del'>-define_fan_sysfs(2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='ctx'> </div><div class='ctx'> /* Alarms */</div><div class='ctx'> static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -614,27 +618,27 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct vt8231_data *data = vt8231_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp4_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp5_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp6_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp4_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp5_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp6_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='ctx'> </div><div class='ctx'> static ssize_t name_show(struct device *dev, struct device_attribute</div><div class='ctx'> 			 *devattr, char *buf)</div><div class='head'>diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c<br/>index 8ac89d0781cc..7ca53a28c305 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/w83627hf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/w83627hf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/w83627hf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/w83627hf.c</a></div><div class='hunk'>@@ -130,17 +130,23 @@ superio_select(struct w83627hf_sio_data *sio, int ld)</div><div class='ctx'> 	outb(ld,  sio-&gt;sioaddr + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static inline int</div><div class='ctx'> superio_enter(struct w83627hf_sio_data *sio)</div><div class='ctx'> {</div><div class='add'>+	if (!request_muxed_region(sio-&gt;sioaddr, 2, DRVNAME))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	outb(0x87, sio-&gt;sioaddr);</div><div class='ctx'> 	outb(0x87, sio-&gt;sioaddr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> superio_exit(struct w83627hf_sio_data *sio)</div><div class='ctx'> {</div><div class='ctx'> 	outb(0xAA, sio-&gt;sioaddr);</div><div class='add'>+	release_region(sio-&gt;sioaddr, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define W627_DEVID 0x52</div><div class='hunk'>@@ -396,7 +402,6 @@ struct w83627hf_data {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int w83627hf_probe(struct platform_device *pdev);</div><div class='ctx'> static int w83627hf_remove(struct platform_device *pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -482,28 +487,28 @@ static struct platform_driver w83627hf_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_in_input(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+in_input_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%ld\n", (long)IN_FROM_REG(data-&gt;in[nr]));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-show_in_min(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+in_min_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%ld\n", (long)IN_FROM_REG(data-&gt;in_min[nr]));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-show_in_max(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+in_max_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%ld\n", (long)IN_FROM_REG(data-&gt;in_max[nr]));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-store_in_min(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+in_min_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -522,7 +527,7 @@ store_in_min(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-store_in_max(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+in_max_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -540,22 +545,31 @@ store_in_max(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-#define sysfs_vin_decl(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='del'>-			  show_in_input, NULL, offset);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO|S_IWUSR,	\</div><div class='del'>-			  show_in_min, store_in_min, offset);	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO|S_IWUSR,	\</div><div class='del'>-			  show_in_max, store_in_max, offset);</div><div class='del'>-</div><div class='del'>-sysfs_vin_decl(1);</div><div class='del'>-sysfs_vin_decl(2);</div><div class='del'>-sysfs_vin_decl(3);</div><div class='del'>-sysfs_vin_decl(4);</div><div class='del'>-sysfs_vin_decl(5);</div><div class='del'>-sysfs_vin_decl(6);</div><div class='del'>-sysfs_vin_decl(7);</div><div class='del'>-sysfs_vin_decl(8);</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_input, in_input, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_input, in_input, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_input, in_input, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_input, in_input, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_input, in_input, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_input, in_input, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_input, in_input, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_min, in_min, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_max, in_max, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in8_input, in_input, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in8_min, in_min, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in8_max, in_max, 8);</div><div class='ctx'> </div><div class='ctx'> /* use a different set of functions for in0 */</div><div class='ctx'> static ssize_t show_in_0(struct w83627hf_data *data, char *buf, u8 reg)</div><div class='hunk'>@@ -661,7 +675,8 @@ static DEVICE_ATTR_RW(in0_min);</div><div class='ctx'> static DEVICE_ATTR_RW(in0_max);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_fan_input(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+fan_input_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+	       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -669,7 +684,7 @@ show_fan_input(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> 				(long)DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-show_fan_min(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+fan_min_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -677,7 +692,7 @@ show_fan_min(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> 				(long)DIV_FROM_REG(data-&gt;fan_div[nr])));</div><div class='ctx'> }</div><div class='ctx'> static ssize_t</div><div class='del'>-store_fan_min(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+fan_min_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -697,18 +712,16 @@ store_fan_min(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-#define sysfs_fan_decl(offset)	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\</div><div class='del'>-			  show_fan_input, NULL, offset - 1);		\</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\</div><div class='del'>-			  show_fan_min, store_fan_min, offset - 1);</div><div class='ctx'> </div><div class='del'>-sysfs_fan_decl(1);</div><div class='del'>-sysfs_fan_decl(2);</div><div class='del'>-sysfs_fan_decl(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_input, fan_input, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_input, fan_input, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_input, fan_input, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_min, fan_min, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+temp_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -719,8 +732,7 @@ show_temp(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp_max(struct device *dev, struct device_attribute *devattr,</div><div class='del'>-	      char *buf)</div><div class='add'>+temp_max_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -731,7 +743,7 @@ show_temp_max(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp_max_hyst(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+temp_max_hyst_show(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 		   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -743,7 +755,7 @@ show_temp_max_hyst(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_temp_max(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+temp_max_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -765,7 +777,7 @@ store_temp_max(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_temp_max_hyst(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+temp_max_hyst_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 		    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -786,17 +798,15 @@ store_temp_max_hyst(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define sysfs_temp_decl(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,		\</div><div class='del'>-			  show_temp, NULL, offset - 1);			\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO|S_IWUSR,	 	\</div><div class='del'>-			  show_temp_max, store_temp_max, offset - 1);	\</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO|S_IWUSR,	\</div><div class='del'>-			  show_temp_max_hyst, store_temp_max_hyst, offset - 1);</div><div class='del'>-</div><div class='del'>-sysfs_temp_decl(1);</div><div class='del'>-sysfs_temp_decl(2);</div><div class='del'>-sysfs_temp_decl(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max_hyst, temp_max_hyst, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_max_hyst, temp_max_hyst, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_max_hyst, temp_max_hyst, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -841,27 +851,27 @@ alarms_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> static DEVICE_ATTR_RO(alarms);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_alarm(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+alarm_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; bitnr) &amp; 1);</div><div class='ctx'> }</div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 10);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 16);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 17);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 16);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(in8_alarm, alarm, 17);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(fan3_alarm, alarm, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 13);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> beep_mask_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -902,7 +912,7 @@ beep_mask_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static DEVICE_ATTR_RW(beep_mask);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_beep(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+beep_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -910,8 +920,8 @@ show_beep(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_beep(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		const char *buf, size_t count)</div><div class='add'>+beep_store(struct device *dev, struct device_attribute *attr, const char *buf,</div><div class='add'>+	   size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct w83627hf_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	int bitnr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='hunk'>@@ -959,41 +969,25 @@ store_beep(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(in0_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in1_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in2_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 2);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in3_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in4_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 8);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in5_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 9);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in6_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 10);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in7_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 16);</div><div class='del'>-static SENSOR_DEVICE_ATTR(in8_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 17);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 6);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 7);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 11);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 4);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 5);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp3_beep, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 13);</div><div class='del'>-static SENSOR_DEVICE_ATTR(beep_enable, S_IRUGO | S_IWUSR,</div><div class='del'>-			show_beep, store_beep, 15);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in0_beep, beep, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in1_beep, beep, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in2_beep, beep, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in3_beep, beep, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in4_beep, beep, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in5_beep, beep, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in6_beep, beep, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in7_beep, beep, 16);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(in8_beep, beep, 17);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_beep, beep, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_beep, beep, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_beep, beep, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_beep, beep, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_beep, beep, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_beep, beep, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(beep_enable, beep, 15);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+fan_div_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -1007,7 +1001,7 @@ show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'>  * because the divisor changed.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='del'>-store_fan_div(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+fan_div_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -1047,15 +1041,12 @@ store_fan_div(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO|S_IWUSR,</div><div class='del'>-			  show_fan_div, store_fan_div, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO|S_IWUSR,</div><div class='del'>-			  show_fan_div, store_fan_div, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan3_div, S_IRUGO|S_IWUSR,</div><div class='del'>-			  show_fan_div, store_fan_div, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(fan3_div, fan_div, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+pwm_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -1063,7 +1054,7 @@ show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_pwm(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+pwm_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -1096,12 +1087,13 @@ store_pwm(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3, pwm, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_pwm_enable(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+pwm_enable_show(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+		char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -1109,8 +1101,8 @@ show_pwm_enable(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_pwm_enable(struct device *dev, struct device_attribute *devattr,</div><div class='del'>-	  const char *buf, size_t count)</div><div class='add'>+pwm_enable_store(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+		 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = dev_get_drvdata(dev);</div><div class='hunk'>@@ -1134,15 +1126,12 @@ store_pwm_enable(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable,</div><div class='del'>-						  store_pwm_enable, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable,</div><div class='del'>-						  store_pwm_enable, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,</div><div class='del'>-						  store_pwm_enable, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_enable, pwm_enable, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_enable, pwm_enable, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_enable, pwm_enable, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_pwm_freq(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='add'>+pwm_freq_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	struct w83627hf_data *data = w83627hf_update_device(dev);</div><div class='hunk'>@@ -1155,7 +1144,7 @@ show_pwm_freq(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_pwm_freq(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+pwm_freq_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -1186,15 +1175,12 @@ store_pwm_freq(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm1_freq, S_IRUGO|S_IWUSR,</div><div class='del'>-			  show_pwm_freq, store_pwm_freq, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm2_freq, S_IRUGO|S_IWUSR,</div><div class='del'>-			  show_pwm_freq, store_pwm_freq, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(pwm3_freq, S_IRUGO|S_IWUSR,</div><div class='del'>-			  show_pwm_freq, store_pwm_freq, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm1_freq, pwm_freq, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm2_freq, pwm_freq, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(pwm3_freq, pwm_freq, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_temp_type(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+temp_type_show(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -1203,7 +1189,7 @@ show_temp_type(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_temp_type(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+temp_type_store(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 		const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='hunk'>@@ -1258,13 +1244,9 @@ store_temp_type(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define sysfs_temp_type(offset) \</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR, \</div><div class='del'>-			  show_temp_type, store_temp_type, offset - 1);</div><div class='del'>-</div><div class='del'>-sysfs_temp_type(1);</div><div class='del'>-sysfs_temp_type(2);</div><div class='del'>-sysfs_temp_type(3);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_type, temp_type, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp2_type, temp_type, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp3_type, temp_type, 2);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> name_show(struct device *dev, struct device_attribute *devattr, char *buf)</div><div class='hunk'>@@ -1278,7 +1260,7 @@ static DEVICE_ATTR_RO(name);</div><div class='ctx'> static int __init w83627hf_find(int sioaddr, unsigned short *addr,</div><div class='ctx'> 				struct w83627hf_sio_data *sio_data)</div><div class='ctx'> {</div><div class='del'>-	int err = -ENODEV;</div><div class='add'>+	int err;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='ctx'> 	static __initconst char *const names[] = {</div><div class='hunk'>@@ -1290,7 +1272,11 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sio_data-&gt;sioaddr = sioaddr;</div><div class='del'>-	superio_enter(sio_data);</div><div class='add'>+	err = superio_enter(sio_data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='ctx'> 	val = force_id ? force_id : superio_inb(sio_data, DEVID);</div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case W627_DEVID:</div><div class='hunk'>@@ -1595,7 +1581,6 @@ static int w83627hf_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Registers 0x50-0x5f are banked */</div><div class='ctx'> static inline void w83627hf_set_bank(struct w83627hf_data *data, u16 reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -1644,9 +1629,21 @@ static int w83627thf_read_gpio5(struct platform_device *pdev)</div><div class='ctx'> 	struct w83627hf_sio_data *sio_data = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	int res = 0xff, sel;</div><div class='ctx'> </div><div class='del'>-	superio_enter(sio_data);</div><div class='add'>+	if (superio_enter(sio_data)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Some other driver reserved the address space for itself.</div><div class='add'>+		 * We don't want to fail driver instantiation because of that,</div><div class='add'>+		 * so display a warning and keep going.</div><div class='add'>+		 */</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+			 "Can not read VID data: Failed to enable SuperIO access\n");</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	superio_select(sio_data, W83627HF_LD_GPIO5);</div><div class='ctx'> </div><div class='add'>+	res = 0xff;</div><div class='add'>+</div><div class='ctx'> 	/* Make sure these GPIO pins are enabled */</div><div class='ctx'> 	if (!(superio_inb(sio_data, W83627THF_GPIO5_EN) &amp; (1&lt;&lt;3))) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "GPIO5 disabled, no VID function\n");</div><div class='hunk'>@@ -1677,7 +1674,17 @@ static int w83687thf_read_vid(struct platform_device *pdev)</div><div class='ctx'> 	struct w83627hf_sio_data *sio_data = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	int res = 0xff;</div><div class='ctx'> </div><div class='del'>-	superio_enter(sio_data);</div><div class='add'>+	if (superio_enter(sio_data)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Some other driver reserved the address space for itself.</div><div class='add'>+		 * We don't want to fail driver instantiation because of that,</div><div class='add'>+		 * so display a warning and keep going.</div><div class='add'>+		 */</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+			 "Can not read VID data: Failed to enable SuperIO access\n");</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	superio_select(sio_data, W83627HF_LD_HWM);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure these GPIO pins are enabled */</div><div class='head'>diff --git a/drivers/hwmon/w83773g.c b/drivers/hwmon/w83773g.c<br/>index e858093ac806..d4105321e462 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/w83773g.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/w83773g.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/w83773g.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/w83773g.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static const struct i2c_device_id w83773_id[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, w83773_id);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id w83773_of_match[] = {</div><div class='add'>+static const struct of_device_id __maybe_unused w83773_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "nuvoton,w83773g"</div><div class='ctx'> 	},</div><div class='hunk'>@@ -237,31 +237,13 @@ static umode_t w83773_is_visible(const void *data, enum hwmon_sensor_types type,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u32 w83773_chip_config[] = {</div><div class='del'>-	HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info w83773_chip = {</div><div class='del'>-	.type = hwmon_chip,</div><div class='del'>-	.config = w83773_chip_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 w83773_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET,</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info w83773_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = w83773_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct hwmon_channel_info *w83773_info[] = {</div><div class='del'>-	&amp;w83773_chip,</div><div class='del'>-	&amp;w83773_temp,</div><div class='add'>+	HWMON_CHANNEL_INFO(chip,</div><div class='add'>+			   HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),</div><div class='add'>+	HWMON_CHANNEL_INFO(temp,</div><div class='add'>+			   HWMON_T_INPUT,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET),</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c<br/>index 0af0f6283b35..e94ae1bb3cf0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/w83793.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwmon/w83793.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwmon/w83793.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwmon/w83793.c</a></div><div class='hunk'>@@ -1341,7 +1341,7 @@ static int watchdog_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	/* Store pointer to data into filp's private data */</div><div class='ctx'> 	filp-&gt;private_data = data;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int watchdog_close(struct inode *inode, struct file *filp)</div><div class='head'>diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig<br/>index ad34380cac49..18e8d03321d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/Kconfig</a></div><div class='hunk'>@@ -75,20 +75,13 @@ config CORESIGHT_SOURCE_ETM4X</div><div class='ctx'> 	bool "CoreSight Embedded Trace Macrocell 4.x driver"</div><div class='ctx'> 	depends on ARM64</div><div class='ctx'> 	select CORESIGHT_LINKS_AND_SINKS</div><div class='add'>+	select PID_IN_CONTEXTIDR</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver provides support for the ETM4.x tracer module, tracing the</div><div class='ctx'> 	  instructions that a processor is executing. This is primarily useful</div><div class='ctx'> 	  for instruction level tracing. Depending on the implemented version</div><div class='ctx'> 	  data tracing may also be available.</div><div class='ctx'> </div><div class='del'>-config CORESIGHT_DYNAMIC_REPLICATOR</div><div class='del'>-	bool "CoreSight Programmable Replicator driver"</div><div class='del'>-	depends on CORESIGHT_LINKS_AND_SINKS</div><div class='del'>-	help</div><div class='del'>-	  This enables support for dynamic CoreSight replicator link driver.</div><div class='del'>-	  The programmable ATB replicator allows independent filtering of the</div><div class='del'>-	  trace data based on the traceid.</div><div class='del'>-</div><div class='ctx'> config CORESIGHT_STM</div><div class='ctx'> 	bool "CoreSight System Trace Macrocell driver"</div><div class='ctx'> 	depends on (ARM &amp;&amp; !(CPU_32v3 || CPU_32v4 || CPU_32v4T)) || ARM64</div><div class='head'>diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile<br/>index 41870ded51a3..3b435aa42af5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/Makefile</a></div><div class='hunk'>@@ -15,7 +15,6 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \</div><div class='ctx'> 					coresight-etm3x-sysfs.o</div><div class='ctx'> obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \</div><div class='ctx'> 					coresight-etm4x-sysfs.o</div><div class='del'>-obj-$(CONFIG_CORESIGHT_DYNAMIC_REPLICATOR) += coresight-dynamic-replicator.o</div><div class='ctx'> obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o</div><div class='ctx'> obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o</div><div class='ctx'> obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c<br/>index 170fbb66bda2..4ea68a3522e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-catu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-catu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-catu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-catu.c</a></div><div class='hunk'>@@ -485,12 +485,12 @@ static int catu_disable(struct coresight_device *csdev, void *__unused)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct coresight_ops_helper catu_helper_ops = {</div><div class='add'>+static const struct coresight_ops_helper catu_helper_ops = {</div><div class='ctx'> 	.enable = catu_enable,</div><div class='ctx'> 	.disable = catu_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct coresight_ops catu_ops = {</div><div class='add'>+static const struct coresight_ops catu_ops = {</div><div class='ctx'> 	.helper_ops = &amp;catu_helper_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -557,8 +557,9 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	drvdata-&gt;csdev = coresight_register(&amp;catu_desc);</div><div class='ctx'> 	if (IS_ERR(drvdata-&gt;csdev))</div><div class='ctx'> 		ret = PTR_ERR(drvdata-&gt;csdev);</div><div class='add'>+	else</div><div class='add'>+		pm_runtime_put(&amp;adev-&gt;dev);</div><div class='ctx'> out:</div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h<br/>index 1b281f0dcccc..1d2ad183fd92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-catu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-catu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-catu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-catu.h</a></div><div class='hunk'>@@ -109,11 +109,6 @@ static inline bool coresight_is_catu_device(struct coresight_device *csdev)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CORESIGHT_CATU</div><div class='ctx'> extern const struct etr_buf_operations etr_catu_buf_ops;</div><div class='del'>-#else</div><div class='del'>-/* Dummy declaration for the CATU ops */</div><div class='del'>-static const struct etr_buf_operations etr_catu_buf_ops;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c b/drivers/hwtracing/coresight/coresight-dynamic-replicator.c<br/>deleted file mode 100644<br/>index 299667b887fc..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-dynamic-replicator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-dynamic-replicator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,255 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/amba/bus.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/coresight.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "coresight-priv.h"</div><div class='del'>-</div><div class='del'>-#define REPLICATOR_IDFILTER0		0x000</div><div class='del'>-#define REPLICATOR_IDFILTER1		0x004</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct replicator_state - specifics associated to a replicator component</div><div class='del'>- * @base:	memory mapped base address for this component.</div><div class='del'>- * @dev:	the device entity associated with this component</div><div class='del'>- * @atclk:	optional clock for the core parts of the replicator.</div><div class='del'>- * @csdev:	component vitals needed by the framework</div><div class='del'>- */</div><div class='del'>-struct replicator_state {</div><div class='del'>-	void __iomem		*base;</div><div class='del'>-	struct device		*dev;</div><div class='del'>-	struct clk		*atclk;</div><div class='del'>-	struct coresight_device	*csdev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * replicator_reset : Reset the replicator configuration to sane values.</div><div class='del'>- */</div><div class='del'>-static void replicator_reset(struct replicator_state *drvdata)</div><div class='del'>-{</div><div class='del'>-	CS_UNLOCK(drvdata-&gt;base);</div><div class='del'>-</div><div class='del'>-	if (!coresight_claim_device_unlocked(drvdata-&gt;base)) {</div><div class='del'>-		writel_relaxed(0xff, drvdata-&gt;base + REPLICATOR_IDFILTER0);</div><div class='del'>-		writel_relaxed(0xff, drvdata-&gt;base + REPLICATOR_IDFILTER1);</div><div class='del'>-		coresight_disclaim_device_unlocked(drvdata-&gt;base);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CS_LOCK(drvdata-&gt;base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int replicator_enable(struct coresight_device *csdev, int inport,</div><div class='del'>-			      int outport)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	u32 reg;</div><div class='del'>-	struct replicator_state *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='del'>-</div><div class='del'>-	switch (outport) {</div><div class='del'>-	case 0:</div><div class='del'>-		reg = REPLICATOR_IDFILTER0;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		reg = REPLICATOR_IDFILTER1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CS_UNLOCK(drvdata-&gt;base);</div><div class='del'>-</div><div class='del'>-	if ((readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER0) == 0xff) &amp;&amp;</div><div class='del'>-	    (readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER1) == 0xff))</div><div class='del'>-		rc = coresight_claim_device_unlocked(drvdata-&gt;base);</div><div class='del'>-</div><div class='del'>-	/* Ensure that the outport is enabled. */</div><div class='del'>-	if (!rc) {</div><div class='del'>-		writel_relaxed(0x00, drvdata-&gt;base + reg);</div><div class='del'>-		dev_dbg(drvdata-&gt;dev, "REPLICATOR enabled\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CS_LOCK(drvdata-&gt;base);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void replicator_disable(struct coresight_device *csdev, int inport,</div><div class='del'>-				int outport)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	struct replicator_state *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='del'>-</div><div class='del'>-	switch (outport) {</div><div class='del'>-	case 0:</div><div class='del'>-		reg = REPLICATOR_IDFILTER0;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		reg = REPLICATOR_IDFILTER1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CS_UNLOCK(drvdata-&gt;base);</div><div class='del'>-</div><div class='del'>-	/* disable the flow of ATB data through port */</div><div class='del'>-	writel_relaxed(0xff, drvdata-&gt;base + reg);</div><div class='del'>-</div><div class='del'>-	if ((readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER0) == 0xff) &amp;&amp;</div><div class='del'>-	    (readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER1) == 0xff))</div><div class='del'>-		coresight_disclaim_device_unlocked(drvdata-&gt;base);</div><div class='del'>-	CS_LOCK(drvdata-&gt;base);</div><div class='del'>-</div><div class='del'>-	dev_dbg(drvdata-&gt;dev, "REPLICATOR disabled\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct coresight_ops_link replicator_link_ops = {</div><div class='del'>-	.enable		= replicator_enable,</div><div class='del'>-	.disable	= replicator_disable,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct coresight_ops replicator_cs_ops = {</div><div class='del'>-	.link_ops	= &amp;replicator_link_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define coresight_replicator_reg(name, offset) \</div><div class='del'>-	coresight_simple_reg32(struct replicator_state, name, offset)</div><div class='del'>-</div><div class='del'>-coresight_replicator_reg(idfilter0, REPLICATOR_IDFILTER0);</div><div class='del'>-coresight_replicator_reg(idfilter1, REPLICATOR_IDFILTER1);</div><div class='del'>-</div><div class='del'>-static struct attribute *replicator_mgmt_attrs[] = {</div><div class='del'>-	&amp;dev_attr_idfilter0.attr,</div><div class='del'>-	&amp;dev_attr_idfilter1.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group replicator_mgmt_group = {</div><div class='del'>-	.attrs = replicator_mgmt_attrs,</div><div class='del'>-	.name = "mgmt",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group *replicator_groups[] = {</div><div class='del'>-	&amp;replicator_mgmt_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int replicator_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct device *dev = &amp;adev-&gt;dev;</div><div class='del'>-	struct resource *res = &amp;adev-&gt;res;</div><div class='del'>-	struct coresight_platform_data *pdata = NULL;</div><div class='del'>-	struct replicator_state *drvdata;</div><div class='del'>-	struct coresight_desc desc = { 0 };</div><div class='del'>-	struct device_node *np = adev-&gt;dev.of_node;</div><div class='del'>-	void __iomem *base;</div><div class='del'>-</div><div class='del'>-	if (np) {</div><div class='del'>-		pdata = of_get_coresight_platform_data(dev, np);</div><div class='del'>-		if (IS_ERR(pdata))</div><div class='del'>-			return PTR_ERR(pdata);</div><div class='del'>-		adev-&gt;dev.platform_data = pdata;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);</div><div class='del'>-	if (!drvdata)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	drvdata-&gt;dev = &amp;adev-&gt;dev;</div><div class='del'>-	drvdata-&gt;atclk = devm_clk_get(&amp;adev-&gt;dev, "atclk"); /* optional */</div><div class='del'>-	if (!IS_ERR(drvdata-&gt;atclk)) {</div><div class='del'>-		ret = clk_prepare_enable(drvdata-&gt;atclk);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Validity for the resource is already checked by the AMBA core */</div><div class='del'>-	base = devm_ioremap_resource(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'>-	drvdata-&gt;base = base;</div><div class='del'>-	dev_set_drvdata(dev, drvdata);</div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	desc.type = CORESIGHT_DEV_TYPE_LINK;</div><div class='del'>-	desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;</div><div class='del'>-	desc.ops = &amp;replicator_cs_ops;</div><div class='del'>-	desc.pdata = adev-&gt;dev.platform_data;</div><div class='del'>-	desc.dev = &amp;adev-&gt;dev;</div><div class='del'>-	desc.groups = replicator_groups;</div><div class='del'>-	drvdata-&gt;csdev = coresight_register(&amp;desc);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(drvdata-&gt;csdev)) {</div><div class='del'>-		replicator_reset(drvdata);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return PTR_ERR(drvdata-&gt;csdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int replicator_runtime_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct replicator_state *drvdata = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	if (drvdata &amp;&amp; !IS_ERR(drvdata-&gt;atclk))</div><div class='del'>-		clk_disable_unprepare(drvdata-&gt;atclk);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int replicator_runtime_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct replicator_state *drvdata = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	if (drvdata &amp;&amp; !IS_ERR(drvdata-&gt;atclk))</div><div class='del'>-		clk_prepare_enable(drvdata-&gt;atclk);</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'>-static const struct dev_pm_ops replicator_dev_pm_ops = {</div><div class='del'>-	SET_RUNTIME_PM_OPS(replicator_runtime_suspend,</div><div class='del'>-			   replicator_runtime_resume,</div><div class='del'>-			   NULL)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct amba_id replicator_ids[] = {</div><div class='del'>-	{</div><div class='del'>-		.id     = 0x000bb909,</div><div class='del'>-		.mask   = 0x000fffff,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* Coresight SoC-600 */</div><div class='del'>-		.id     = 0x000bb9ec,</div><div class='del'>-		.mask   = 0x000fffff,</div><div class='del'>-	},</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct amba_driver replicator_driver = {</div><div class='del'>-	.drv = {</div><div class='del'>-		.name	= "coresight-dynamic-replicator",</div><div class='del'>-		.pm	= &amp;replicator_dev_pm_ops,</div><div class='del'>-		.suppress_bind_attrs = true,</div><div class='del'>-	},</div><div class='del'>-	.probe		= replicator_probe,</div><div class='del'>-	.id_table	= replicator_ids,</div><div class='del'>-};</div><div class='del'>-builtin_amba_driver(replicator_driver);</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c<br/>index 105782ea64c7..4ee4c80a4354 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-etb10.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-etb10.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-etb10.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-etb10.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * Description: CoreSight Embedded Trace Buffer driver</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -71,6 +72,8 @@</div><div class='ctx'>  * @miscdev:	specifics to handle "/dev/xyz.etb" entry.</div><div class='ctx'>  * @spinlock:	only one at a time pls.</div><div class='ctx'>  * @reading:	synchronise user space access to etb buffer.</div><div class='add'>+ * @pid:	Process ID of the process being monitored by the session</div><div class='add'>+ *		that is using this component.</div><div class='ctx'>  * @buf:	area of memory where ETB buffer content gets sent.</div><div class='ctx'>  * @mode:	this ETB is being used.</div><div class='ctx'>  * @buffer_depth: size of @buf.</div><div class='hunk'>@@ -84,6 +87,7 @@ struct etb_drvdata {</div><div class='ctx'> 	struct miscdevice	miscdev;</div><div class='ctx'> 	spinlock_t		spinlock;</div><div class='ctx'> 	local_t			reading;</div><div class='add'>+	pid_t			pid;</div><div class='ctx'> 	u8			*buf;</div><div class='ctx'> 	u32			mode;</div><div class='ctx'> 	u32			buffer_depth;</div><div class='hunk'>@@ -93,17 +97,9 @@ struct etb_drvdata {</div><div class='ctx'> static int etb_set_buffer(struct coresight_device *csdev,</div><div class='ctx'> 			  struct perf_output_handle *handle);</div><div class='ctx'> </div><div class='del'>-static unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata)</div><div class='add'>+static inline unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata)</div><div class='ctx'> {</div><div class='del'>-	u32 depth = 0;</div><div class='del'>-</div><div class='del'>-	pm_runtime_get_sync(drvdata-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* RO registers don't need locking */</div><div class='del'>-	depth = readl_relaxed(drvdata-&gt;base + ETB_RAM_DEPTH_REG);</div><div class='del'>-</div><div class='del'>-	pm_runtime_put(drvdata-&gt;dev);</div><div class='del'>-	return depth;</div><div class='add'>+	return readl_relaxed(drvdata-&gt;base + ETB_RAM_DEPTH_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __etb_enable_hw(struct etb_drvdata *drvdata)</div><div class='hunk'>@@ -159,14 +155,15 @@ static int etb_enable_sysfs(struct coresight_device *csdev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Nothing to do, the tracer is already enabled. */</div><div class='del'>-	if (drvdata-&gt;mode == CS_MODE_SYSFS)</div><div class='del'>-		goto out;</div><div class='add'>+	if (drvdata-&gt;mode == CS_MODE_DISABLED) {</div><div class='add'>+		ret = etb_enable_hw(drvdata);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-	ret = etb_enable_hw(drvdata);</div><div class='del'>-	if (!ret)</div><div class='ctx'> 		drvdata-&gt;mode = CS_MODE_SYSFS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	atomic_inc(csdev-&gt;refcnt);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -175,29 +172,52 @@ out:</div><div class='ctx'> static int etb_enable_perf(struct coresight_device *csdev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	pid_t pid;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct etb_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='add'>+	struct perf_output_handle *handle = data;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='del'>-	/* No need to continue if the component is already in use. */</div><div class='del'>-	if (drvdata-&gt;mode != CS_MODE_DISABLED) {</div><div class='add'>+	/* No need to continue if the component is already in used by sysFS. */</div><div class='add'>+	if (drvdata-&gt;mode == CS_MODE_SYSFS) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get a handle on the pid of the process to monitor */</div><div class='add'>+	pid = task_pid_nr(handle-&gt;event-&gt;owner);</div><div class='add'>+</div><div class='add'>+	if (drvdata-&gt;pid != -1 &amp;&amp; drvdata-&gt;pid != pid) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * No HW configuration is needed if the sink is already in</div><div class='add'>+	 * use for this session.</div><div class='add'>+	 */</div><div class='add'>+	if (drvdata-&gt;pid == pid) {</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * We don't have an internal state to clean up if we fail to setup</div><div class='ctx'> 	 * the perf buffer. So we can perform the step before we turn the</div><div class='ctx'> 	 * ETB on and leave without cleaning up.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = etb_set_buffer(csdev, (struct perf_output_handle *)data);</div><div class='add'>+	ret = etb_set_buffer(csdev, handle);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = etb_enable_hw(drvdata);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* Associate with monitored process. */</div><div class='add'>+		drvdata-&gt;pid = pid;</div><div class='ctx'> 		drvdata-&gt;mode = CS_MODE_PERF;</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='hunk'>@@ -325,27 +345,35 @@ static void etb_disable_hw(struct etb_drvdata *drvdata)</div><div class='ctx'> 	coresight_disclaim_device(drvdata-&gt;base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void etb_disable(struct coresight_device *csdev)</div><div class='add'>+static int etb_disable(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct etb_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='del'>-	/* Disable the ETB only if it needs to */</div><div class='del'>-	if (drvdata-&gt;mode != CS_MODE_DISABLED) {</div><div class='del'>-		etb_disable_hw(drvdata);</div><div class='del'>-		drvdata-&gt;mode = CS_MODE_DISABLED;</div><div class='add'>+	if (atomic_dec_return(csdev-&gt;refcnt)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Complain if we (somehow) got out of sync */</div><div class='add'>+	WARN_ON_ONCE(drvdata-&gt;mode == CS_MODE_DISABLED);</div><div class='add'>+	etb_disable_hw(drvdata);</div><div class='add'>+	/* Dissociate from monitored process. */</div><div class='add'>+	drvdata-&gt;pid = -1;</div><div class='add'>+	drvdata-&gt;mode = CS_MODE_DISABLED;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "ETB disabled\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *etb_alloc_buffer(struct coresight_device *csdev, int cpu,</div><div class='del'>-			      void **pages, int nr_pages, bool overwrite)</div><div class='add'>+static void *etb_alloc_buffer(struct coresight_device *csdev,</div><div class='add'>+			      struct perf_event *event, void **pages,</div><div class='add'>+			      int nr_pages, bool overwrite)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='add'>+	int node, cpu = event-&gt;cpu;</div><div class='ctx'> 	struct cs_buffers *buf;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu == -1)</div><div class='hunk'>@@ -404,7 +432,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,</div><div class='ctx'> 	const u32 *barrier;</div><div class='ctx'> 	u32 read_ptr, write_ptr, capacity;</div><div class='ctx'> 	u32 status, read_data;</div><div class='del'>-	unsigned long offset, to_read;</div><div class='add'>+	unsigned long offset, to_read = 0, flags;</div><div class='ctx'> 	struct cs_buffers *buf = sink_config;</div><div class='ctx'> 	struct etb_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='hunk'>@@ -413,6 +441,12 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,</div><div class='ctx'> </div><div class='ctx'> 	capacity = drvdata-&gt;buffer_depth * ETB_FRAME_SIZE_WORDS;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	/* Don't do anything if another tracer is using this sink */</div><div class='add'>+	if (atomic_read(csdev-&gt;refcnt) != 1)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	__etb_disable_hw(drvdata);</div><div class='ctx'> 	CS_UNLOCK(drvdata-&gt;base);</div><div class='ctx'> </div><div class='hunk'>@@ -523,6 +557,8 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	__etb_enable_hw(drvdata);</div><div class='ctx'> 	CS_LOCK(drvdata-&gt;base);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return to_read;</div><div class='ctx'> }</div><div class='hunk'>@@ -720,7 +756,6 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	spin_lock_init(&amp;drvdata-&gt;spinlock);</div><div class='ctx'> </div><div class='ctx'> 	drvdata-&gt;buffer_depth = etb_get_buffer_depth(drvdata);</div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (drvdata-&gt;buffer_depth &amp; 0x80000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -730,6 +765,9 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	if (!drvdata-&gt;buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	/* This device is not associated with a session */</div><div class='add'>+	drvdata-&gt;pid = -1;</div><div class='add'>+</div><div class='ctx'> 	desc.type = CORESIGHT_DEV_TYPE_SINK;</div><div class='ctx'> 	desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_BUFFER;</div><div class='ctx'> 	desc.ops = &amp;etb_cs_ops;</div><div class='hunk'>@@ -747,6 +785,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_misc_register;</div><div class='ctx'> </div><div class='add'>+	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_misc_register:</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c<br/>index 4d5a2b9f9d6a..3c6294432748 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-etm-perf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-etm-perf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-etm-perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-etm-perf.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@ static DEFINE_PER_CPU(struct coresight_device *, csdev_src);</div><div class='ctx'> </div><div class='ctx'> /* ETMv3.5/PTM's ETMCR is 'config' */</div><div class='ctx'> PMU_FORMAT_ATTR(cycacc,		"config:" __stringify(ETM_OPT_CYCACC));</div><div class='add'>+PMU_FORMAT_ATTR(contextid,	"config:" __stringify(ETM_OPT_CTXTID));</div><div class='ctx'> PMU_FORMAT_ATTR(timestamp,	"config:" __stringify(ETM_OPT_TS));</div><div class='ctx'> PMU_FORMAT_ATTR(retstack,	"config:" __stringify(ETM_OPT_RETSTK));</div><div class='ctx'> /* Sink ID - same for all ETMs */</div><div class='hunk'>@@ -36,6 +37,7 @@ PMU_FORMAT_ATTR(sinkid,		"config2:0-31");</div><div class='ctx'> </div><div class='ctx'> static struct attribute *etm_config_formats_attr[] = {</div><div class='ctx'> 	&amp;format_attr_cycacc.attr,</div><div class='add'>+	&amp;format_attr_contextid.attr,</div><div class='ctx'> 	&amp;format_attr_timestamp.attr,</div><div class='ctx'> 	&amp;format_attr_retstack.attr,</div><div class='ctx'> 	&amp;format_attr_sinkid.attr,</div><div class='hunk'>@@ -118,23 +120,34 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void free_sink_buffer(struct etm_event_data *event_data)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+	cpumask_t *mask = &amp;event_data-&gt;mask;</div><div class='add'>+	struct coresight_device *sink;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(cpumask_empty(mask)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!event_data-&gt;snk_config)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpu = cpumask_first(mask);</div><div class='add'>+	sink = coresight_get_sink(etm_event_cpu_path(event_data, cpu));</div><div class='add'>+	sink_ops(sink)-&gt;free_buffer(event_data-&gt;snk_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void free_event_data(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	cpumask_t *mask;</div><div class='ctx'> 	struct etm_event_data *event_data;</div><div class='del'>-	struct coresight_device *sink;</div><div class='ctx'> </div><div class='ctx'> 	event_data = container_of(work, struct etm_event_data, work);</div><div class='ctx'> 	mask = &amp;event_data-&gt;mask;</div><div class='ctx'> </div><div class='ctx'> 	/* Free the sink buffers, if there are any */</div><div class='del'>-	if (event_data-&gt;snk_config &amp;&amp; !WARN_ON(cpumask_empty(mask))) {</div><div class='del'>-		cpu = cpumask_first(mask);</div><div class='del'>-		sink = coresight_get_sink(etm_event_cpu_path(event_data, cpu));</div><div class='del'>-		if (sink_ops(sink)-&gt;free_buffer)</div><div class='del'>-			sink_ops(sink)-&gt;free_buffer(event_data-&gt;snk_config);</div><div class='del'>-	}</div><div class='add'>+	free_sink_buffer(event_data);</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(cpu, mask) {</div><div class='ctx'> 		struct list_head **ppath;</div><div class='hunk'>@@ -213,7 +226,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,</div><div class='ctx'> 		sink = coresight_get_enabled_sink(true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sink || !sink_ops(sink)-&gt;alloc_buffer)</div><div class='add'>+	if (!sink)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	mask = &amp;event_data-&gt;mask;</div><div class='hunk'>@@ -259,9 +272,12 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,</div><div class='ctx'> 	if (cpu &gt;= nr_cpu_ids)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	if (!sink_ops(sink)-&gt;alloc_buffer || !sink_ops(sink)-&gt;free_buffer)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	/* Allocate the sink buffer for this session */</div><div class='ctx'> 	event_data-&gt;snk_config =</div><div class='del'>-			sink_ops(sink)-&gt;alloc_buffer(sink, cpu, pages,</div><div class='add'>+			sink_ops(sink)-&gt;alloc_buffer(sink, event, pages,</div><div class='ctx'> 						     nr_pages, overwrite);</div><div class='ctx'> 	if (!event_data-&gt;snk_config)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -566,7 +582,8 @@ static int __init etm_perf_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	etm_pmu.capabilities		= PERF_PMU_CAP_EXCLUSIVE;</div><div class='add'>+	etm_pmu.capabilities		= (PERF_PMU_CAP_EXCLUSIVE |</div><div class='add'>+					   PERF_PMU_CAP_ITRACE);</div><div class='ctx'> </div><div class='ctx'> 	etm_pmu.attr_groups		= etm_pmu_attr_groups;</div><div class='ctx'> 	etm_pmu.task_ctx_nr		= perf_sw_context;</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c<br/>index 08ce37c9475d..8bb0092c7ec2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-etm4x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-etm4x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-etm4x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-etm4x.c</a></div><div class='hunk'>@@ -138,8 +138,11 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)</div><div class='ctx'> 			       drvdata-&gt;base + TRCCNTVRn(i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Resource selector pair 0 is always implemented and reserved */</div><div class='del'>-	for (i = 0; i &lt; drvdata-&gt;nr_resource * 2; i++)</div><div class='add'>+	/*</div><div class='add'>+	 * Resource selector pair 0 is always implemented and reserved.  As</div><div class='add'>+	 * such start at 2.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 2; i &lt; drvdata-&gt;nr_resource * 2; i++)</div><div class='ctx'> 		writel_relaxed(config-&gt;res_ctrl[i],</div><div class='ctx'> 			       drvdata-&gt;base + TRCRSCTLRn(i));</div><div class='ctx'> </div><div class='hunk'>@@ -201,6 +204,91 @@ static void etm4_enable_hw_smp_call(void *info)</div><div class='ctx'> 	arg-&gt;rc = etm4_enable_hw(arg-&gt;drvdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The goal of function etm4_config_timestamp_event() is to configure a</div><div class='add'>+ * counter that will tell the tracer to emit a timestamp packet when it</div><div class='add'>+ * reaches zero.  This is done in order to get a more fine grained idea</div><div class='add'>+ * of when instructions are executed so that they can be correlated</div><div class='add'>+ * with execution on other CPUs.</div><div class='add'>+ *</div><div class='add'>+ * To do this the counter itself is configured to self reload and</div><div class='add'>+ * TRCRSCTLR1 (always true) used to get the counter to decrement.  From</div><div class='add'>+ * there a resource selector is configured with the counter and the</div><div class='add'>+ * timestamp control register to use the resource selector to trigger the</div><div class='add'>+ * event that will insert a timestamp packet in the stream.</div><div class='add'>+ */</div><div class='add'>+static int etm4_config_timestamp_event(struct etmv4_drvdata *drvdata)</div><div class='add'>+{</div><div class='add'>+	int ctridx, ret = -EINVAL;</div><div class='add'>+	int counter, rselector;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	struct etmv4_config *config = &amp;drvdata-&gt;config;</div><div class='add'>+</div><div class='add'>+	/* No point in trying if we don't have at least one counter */</div><div class='add'>+	if (!drvdata-&gt;nr_cntr)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Find a counter that hasn't been initialised */</div><div class='add'>+	for (ctridx = 0; ctridx &lt; drvdata-&gt;nr_cntr; ctridx++)</div><div class='add'>+		if (config-&gt;cntr_val[ctridx] == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	/* All the counters have been configured already, bail out */</div><div class='add'>+	if (ctridx == drvdata-&gt;nr_cntr) {</div><div class='add'>+		pr_debug("%s: no available counter found\n", __func__);</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Searching for an available resource selector to use, starting at</div><div class='add'>+	 * '2' since every implementation has at least 2 resource selector.</div><div class='add'>+	 * ETMIDR4 gives the number of resource selector _pairs_,</div><div class='add'>+	 * hence multiply by 2.</div><div class='add'>+	 */</div><div class='add'>+	for (rselector = 2; rselector &lt; drvdata-&gt;nr_resource * 2; rselector++)</div><div class='add'>+		if (!config-&gt;res_ctrl[rselector])</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (rselector == drvdata-&gt;nr_resource * 2) {</div><div class='add'>+		pr_debug("%s: no available resource selector found\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remember what counter we used */</div><div class='add'>+	counter = 1 &lt;&lt; ctridx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialise original and reload counter value to the smallest</div><div class='add'>+	 * possible value in order to get as much precision as we can.</div><div class='add'>+	 */</div><div class='add'>+	config-&gt;cntr_val[ctridx] = 1;</div><div class='add'>+	config-&gt;cntrldvr[ctridx] = 1;</div><div class='add'>+</div><div class='add'>+	/* Set the trace counter control register */</div><div class='add'>+	val =  0x1 &lt;&lt; 16	|  /* Bit 16, reload counter automatically */</div><div class='add'>+	       0x0 &lt;&lt; 7		|  /* Select single resource selector */</div><div class='add'>+	       0x1;		   /* Resource selector 1, i.e always true */</div><div class='add'>+</div><div class='add'>+	config-&gt;cntr_ctrl[ctridx] = val;</div><div class='add'>+</div><div class='add'>+	val = 0x2 &lt;&lt; 16		| /* Group 0b0010 - Counter and sequencers */</div><div class='add'>+	      counter &lt;&lt; 0;	  /* Counter to use */</div><div class='add'>+</div><div class='add'>+	config-&gt;res_ctrl[rselector] = val;</div><div class='add'>+</div><div class='add'>+	val = 0x0 &lt;&lt; 7		| /* Select single resource selector */</div><div class='add'>+	      rselector;	  /* Resource selector */</div><div class='add'>+</div><div class='add'>+	config-&gt;ts_ctrl = val;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int etm4_parse_event_config(struct etmv4_drvdata *drvdata,</div><div class='ctx'> 				   struct perf_event *event)</div><div class='ctx'> {</div><div class='hunk'>@@ -236,9 +324,29 @@ static int etm4_parse_event_config(struct etmv4_drvdata *drvdata,</div><div class='ctx'> 		/* TRM: Must program this for cycacc to work */</div><div class='ctx'> 		config-&gt;ccctlr = ETM_CYC_THRESHOLD_DEFAULT;</div><div class='ctx'> 	}</div><div class='del'>-	if (attr-&gt;config &amp; BIT(ETM_OPT_TS))</div><div class='add'>+	if (attr-&gt;config &amp; BIT(ETM_OPT_TS)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Configure timestamps to be emitted at regular intervals in</div><div class='add'>+		 * order to correlate instructions executed on different CPUs</div><div class='add'>+		 * (CPU-wide trace scenarios).</div><div class='add'>+		 */</div><div class='add'>+		ret = etm4_config_timestamp_event(drvdata);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * No need to go further if timestamp intervals can't</div><div class='add'>+		 * be configured.</div><div class='add'>+		 */</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 		/* bit[11], Global timestamp tracing bit */</div><div class='ctx'> 		config-&gt;cfg |= BIT(11);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;config &amp; BIT(ETM_OPT_CTXTID))</div><div class='add'>+		/* bit[6], Context ID tracing bit */</div><div class='add'>+		config-&gt;cfg |= BIT(ETM4_CFG_BIT_CTXTID);</div><div class='add'>+</div><div class='ctx'> 	/* return stack - enable if selected and supported */</div><div class='ctx'> 	if ((attr-&gt;config &amp; BIT(ETM_OPT_RETSTK)) &amp;&amp; drvdata-&gt;retstack)</div><div class='ctx'> 		/* bit[12], Return stack enable bit */</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c<br/>index 927925151509..16b0c0e1e43a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-funnel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-funnel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-funnel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-funnel.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.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='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/coresight.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='hunk'>@@ -43,7 +45,7 @@ struct funnel_drvdata {</div><div class='ctx'> 	unsigned long		priority;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int funnel_enable_hw(struct funnel_drvdata *drvdata, int port)</div><div class='add'>+static int dynamic_funnel_enable_hw(struct funnel_drvdata *drvdata, int port)</div><div class='ctx'> {</div><div class='ctx'> 	u32 functl;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -71,17 +73,19 @@ done:</div><div class='ctx'> static int funnel_enable(struct coresight_device *csdev, int inport,</div><div class='ctx'> 			 int outport)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> 	struct funnel_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	rc = funnel_enable_hw(drvdata, inport);</div><div class='add'>+	if (drvdata-&gt;base)</div><div class='add'>+		rc = dynamic_funnel_enable_hw(drvdata, inport);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		dev_dbg(drvdata-&gt;dev, "FUNNEL inport %d enabled\n", inport);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void funnel_disable_hw(struct funnel_drvdata *drvdata, int inport)</div><div class='add'>+static void dynamic_funnel_disable_hw(struct funnel_drvdata *drvdata,</div><div class='add'>+				      int inport)</div><div class='ctx'> {</div><div class='ctx'> 	u32 functl;</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +107,8 @@ static void funnel_disable(struct coresight_device *csdev, int inport,</div><div class='ctx'> {</div><div class='ctx'> 	struct funnel_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	funnel_disable_hw(drvdata, inport);</div><div class='add'>+	if (drvdata-&gt;base)</div><div class='add'>+		dynamic_funnel_disable_hw(drvdata, inport);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "FUNNEL inport %d disabled\n", inport);</div><div class='ctx'> }</div><div class='hunk'>@@ -177,54 +182,70 @@ static struct attribute *coresight_funnel_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(coresight_funnel);</div><div class='ctx'> </div><div class='del'>-static int funnel_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='add'>+static int funnel_probe(struct device *dev, struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	void __iomem *base;</div><div class='del'>-	struct device *dev = &amp;adev-&gt;dev;</div><div class='ctx'> 	struct coresight_platform_data *pdata = NULL;</div><div class='ctx'> 	struct funnel_drvdata *drvdata;</div><div class='del'>-	struct resource *res = &amp;adev-&gt;res;</div><div class='ctx'> 	struct coresight_desc desc = { 0 };</div><div class='del'>-	struct device_node *np = adev-&gt;dev.of_node;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='ctx'> </div><div class='ctx'> 	if (np) {</div><div class='ctx'> 		pdata = of_get_coresight_platform_data(dev, np);</div><div class='ctx'> 		if (IS_ERR(pdata))</div><div class='ctx'> 			return PTR_ERR(pdata);</div><div class='del'>-		adev-&gt;dev.platform_data = pdata;</div><div class='add'>+		dev-&gt;platform_data = pdata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (of_device_is_compatible(np, "arm,coresight-funnel"))</div><div class='add'>+		pr_warn_once("Uses OBSOLETE CoreSight funnel binding\n");</div><div class='add'>+</div><div class='ctx'> 	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);</div><div class='ctx'> 	if (!drvdata)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	drvdata-&gt;dev = &amp;adev-&gt;dev;</div><div class='del'>-	drvdata-&gt;atclk = devm_clk_get(&amp;adev-&gt;dev, "atclk"); /* optional */</div><div class='add'>+	drvdata-&gt;dev = dev;</div><div class='add'>+	drvdata-&gt;atclk = devm_clk_get(dev, "atclk"); /* optional */</div><div class='ctx'> 	if (!IS_ERR(drvdata-&gt;atclk)) {</div><div class='ctx'> 		ret = clk_prepare_enable(drvdata-&gt;atclk);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	dev_set_drvdata(dev, drvdata);</div><div class='ctx'> </div><div class='del'>-	/* Validity for the resource is already checked by the AMBA core */</div><div class='del'>-	base = devm_ioremap_resource(dev, res);</div><div class='del'>-	if (IS_ERR(base))</div><div class='del'>-		return PTR_ERR(base);</div><div class='add'>+	/*</div><div class='add'>+	 * Map the device base for dynamic-funnel, which has been</div><div class='add'>+	 * validated by AMBA core.</div><div class='add'>+	 */</div><div class='add'>+	if (res) {</div><div class='add'>+		base = devm_ioremap_resource(dev, res);</div><div class='add'>+		if (IS_ERR(base)) {</div><div class='add'>+			ret = PTR_ERR(base);</div><div class='add'>+			goto out_disable_clk;</div><div class='add'>+		}</div><div class='add'>+		drvdata-&gt;base = base;</div><div class='add'>+		desc.groups = coresight_funnel_groups;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	drvdata-&gt;base = base;</div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='add'>+	dev_set_drvdata(dev, drvdata);</div><div class='ctx'> </div><div class='ctx'> 	desc.type = CORESIGHT_DEV_TYPE_LINK;</div><div class='ctx'> 	desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_MERG;</div><div class='ctx'> 	desc.ops = &amp;funnel_cs_ops;</div><div class='ctx'> 	desc.pdata = pdata;</div><div class='ctx'> 	desc.dev = dev;</div><div class='del'>-	desc.groups = coresight_funnel_groups;</div><div class='ctx'> 	drvdata-&gt;csdev = coresight_register(&amp;desc);</div><div class='add'>+	if (IS_ERR(drvdata-&gt;csdev)) {</div><div class='add'>+		ret = PTR_ERR(drvdata-&gt;csdev);</div><div class='add'>+		goto out_disable_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(dev);</div><div class='ctx'> </div><div class='del'>-	return PTR_ERR_OR_ZERO(drvdata-&gt;csdev);</div><div class='add'>+out_disable_clk:</div><div class='add'>+	if (ret &amp;&amp; !IS_ERR_OR_NULL(drvdata-&gt;atclk))</div><div class='add'>+		clk_disable_unprepare(drvdata-&gt;atclk);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -253,7 +274,48 @@ static const struct dev_pm_ops funnel_dev_pm_ops = {</div><div class='ctx'> 	SET_RUNTIME_PM_OPS(funnel_runtime_suspend, funnel_runtime_resume, NULL)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct amba_id funnel_ids[] = {</div><div class='add'>+static int static_funnel_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</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='add'>+</div><div class='add'>+	/* Static funnel do not have programming base */</div><div class='add'>+	ret = funnel_probe(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	if (ret) {</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'>+	}</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 static_funnel_match[] = {</div><div class='add'>+	{.compatible = "arm,coresight-static-funnel"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver static_funnel_driver = {</div><div class='add'>+	.probe          = static_funnel_probe,</div><div class='add'>+	.driver         = {</div><div class='add'>+		.name   = "coresight-static-funnel",</div><div class='add'>+		.of_match_table = static_funnel_match,</div><div class='add'>+		.pm	= &amp;funnel_dev_pm_ops,</div><div class='add'>+		.suppress_bind_attrs = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(static_funnel_driver);</div><div class='add'>+</div><div class='add'>+static int dynamic_funnel_probe(struct amba_device *adev,</div><div class='add'>+				const struct amba_id *id)</div><div class='add'>+{</div><div class='add'>+	return funnel_probe(&amp;adev-&gt;dev, &amp;adev-&gt;res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct amba_id dynamic_funnel_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id     = 0x000bb908,</div><div class='ctx'> 		.mask   = 0x000fffff,</div><div class='hunk'>@@ -266,14 +328,14 @@ static const struct amba_id funnel_ids[] = {</div><div class='ctx'> 	{ 0, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct amba_driver funnel_driver = {</div><div class='add'>+static struct amba_driver dynamic_funnel_driver = {</div><div class='ctx'> 	.drv = {</div><div class='del'>-		.name	= "coresight-funnel",</div><div class='add'>+		.name	= "coresight-dynamic-funnel",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;funnel_dev_pm_ops,</div><div class='ctx'> 		.suppress_bind_attrs = true,</div><div class='ctx'> 	},</div><div class='del'>-	.probe		= funnel_probe,</div><div class='del'>-	.id_table	= funnel_ids,</div><div class='add'>+	.probe		= dynamic_funnel_probe,</div><div class='add'>+	.id_table	= dynamic_funnel_ids,</div><div class='ctx'> };</div><div class='del'>-builtin_amba_driver(funnel_driver);</div><div class='add'>+builtin_amba_driver(dynamic_funnel_driver);</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c<br/>index feac98315471..8c9ce74498e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-replicator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-replicator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-replicator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-replicator.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Description: CoreSight Replicator driver</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -18,25 +19,117 @@</div><div class='ctx'> </div><div class='ctx'> #include "coresight-priv.h"</div><div class='ctx'> </div><div class='add'>+#define REPLICATOR_IDFILTER0		0x000</div><div class='add'>+#define REPLICATOR_IDFILTER1		0x004</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct replicator_drvdata - specifics associated to a replicator component</div><div class='add'>+ * @base:	memory mapped base address for this component. Also indicates</div><div class='add'>+ *		whether this one is programmable or not.</div><div class='ctx'>  * @dev:	the device entity associated with this component</div><div class='ctx'>  * @atclk:	optional clock for the core parts of the replicator.</div><div class='ctx'>  * @csdev:	component vitals needed by the framework</div><div class='ctx'>  */</div><div class='ctx'> struct replicator_drvdata {</div><div class='add'>+	void __iomem		*base;</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	struct clk		*atclk;</div><div class='ctx'> 	struct coresight_device	*csdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void dynamic_replicator_reset(struct replicator_drvdata *drvdata)</div><div class='add'>+{</div><div class='add'>+	CS_UNLOCK(drvdata-&gt;base);</div><div class='add'>+</div><div class='add'>+	if (!coresight_claim_device_unlocked(drvdata-&gt;base)) {</div><div class='add'>+		writel_relaxed(0xff, drvdata-&gt;base + REPLICATOR_IDFILTER0);</div><div class='add'>+		writel_relaxed(0xff, drvdata-&gt;base + REPLICATOR_IDFILTER1);</div><div class='add'>+		coresight_disclaim_device_unlocked(drvdata-&gt;base);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CS_LOCK(drvdata-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * replicator_reset : Reset the replicator configuration to sane values.</div><div class='add'>+ */</div><div class='add'>+static inline void replicator_reset(struct replicator_drvdata *drvdata)</div><div class='add'>+{</div><div class='add'>+	if (drvdata-&gt;base)</div><div class='add'>+		dynamic_replicator_reset(drvdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dynamic_replicator_enable(struct replicator_drvdata *drvdata,</div><div class='add'>+				     int inport, int outport)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	switch (outport) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg = REPLICATOR_IDFILTER0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		reg = REPLICATOR_IDFILTER1;</div><div class='add'>+		break;</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'>+	CS_UNLOCK(drvdata-&gt;base);</div><div class='add'>+</div><div class='add'>+	if ((readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER0) == 0xff) &amp;&amp;</div><div class='add'>+	    (readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER1) == 0xff))</div><div class='add'>+		rc = coresight_claim_device_unlocked(drvdata-&gt;base);</div><div class='add'>+</div><div class='add'>+	/* Ensure that the outport is enabled. */</div><div class='add'>+	if (!rc)</div><div class='add'>+		writel_relaxed(0x00, drvdata-&gt;base + reg);</div><div class='add'>+	CS_LOCK(drvdata-&gt;base);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int replicator_enable(struct coresight_device *csdev, int inport,</div><div class='ctx'> 			     int outport)</div><div class='ctx'> {</div><div class='add'>+	int rc = 0;</div><div class='ctx'> 	struct replicator_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(drvdata-&gt;dev, "REPLICATOR enabled\n");</div><div class='del'>-	return 0;</div><div class='add'>+	if (drvdata-&gt;base)</div><div class='add'>+		rc = dynamic_replicator_enable(drvdata, inport, outport);</div><div class='add'>+	if (!rc)</div><div class='add'>+		dev_dbg(drvdata-&gt;dev, "REPLICATOR enabled\n");</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dynamic_replicator_disable(struct replicator_drvdata *drvdata,</div><div class='add'>+				       int inport, int outport)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	switch (outport) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg = REPLICATOR_IDFILTER0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		reg = REPLICATOR_IDFILTER1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CS_UNLOCK(drvdata-&gt;base);</div><div class='add'>+</div><div class='add'>+	/* disable the flow of ATB data through port */</div><div class='add'>+	writel_relaxed(0xff, drvdata-&gt;base + reg);</div><div class='add'>+</div><div class='add'>+	if ((readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER0) == 0xff) &amp;&amp;</div><div class='add'>+	    (readl_relaxed(drvdata-&gt;base + REPLICATOR_IDFILTER1) == 0xff))</div><div class='add'>+		coresight_disclaim_device_unlocked(drvdata-&gt;base);</div><div class='add'>+	CS_LOCK(drvdata-&gt;base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void replicator_disable(struct coresight_device *csdev, int inport,</div><div class='hunk'>@@ -44,6 +137,8 @@ static void replicator_disable(struct coresight_device *csdev, int inport,</div><div class='ctx'> {</div><div class='ctx'> 	struct replicator_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='add'>+	if (drvdata-&gt;base)</div><div class='add'>+		dynamic_replicator_disable(drvdata, inport, outport);</div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "REPLICATOR disabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -56,58 +151,110 @@ static const struct coresight_ops replicator_cs_ops = {</div><div class='ctx'> 	.link_ops	= &amp;replicator_link_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int replicator_probe(struct platform_device *pdev)</div><div class='add'>+#define coresight_replicator_reg(name, offset) \</div><div class='add'>+	coresight_simple_reg32(struct replicator_drvdata, name, offset)</div><div class='add'>+</div><div class='add'>+coresight_replicator_reg(idfilter0, REPLICATOR_IDFILTER0);</div><div class='add'>+coresight_replicator_reg(idfilter1, REPLICATOR_IDFILTER1);</div><div class='add'>+</div><div class='add'>+static struct attribute *replicator_mgmt_attrs[] = {</div><div class='add'>+	&amp;dev_attr_idfilter0.attr,</div><div class='add'>+	&amp;dev_attr_idfilter1.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group replicator_mgmt_group = {</div><div class='add'>+	.attrs = replicator_mgmt_attrs,</div><div class='add'>+	.name = "mgmt",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *replicator_groups[] = {</div><div class='add'>+	&amp;replicator_mgmt_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int replicator_probe(struct device *dev, struct resource *res)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	struct coresight_platform_data *pdata = NULL;</div><div class='ctx'> 	struct replicator_drvdata *drvdata;</div><div class='ctx'> 	struct coresight_desc desc = { 0 };</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	void __iomem *base;</div><div class='ctx'> </div><div class='ctx'> 	if (np) {</div><div class='ctx'> 		pdata = of_get_coresight_platform_data(dev, np);</div><div class='ctx'> 		if (IS_ERR(pdata))</div><div class='ctx'> 			return PTR_ERR(pdata);</div><div class='del'>-		pdev-&gt;dev.platform_data = pdata;</div><div class='add'>+		dev-&gt;platform_data = pdata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (of_device_is_compatible(np, "arm,coresight-replicator"))</div><div class='add'>+		pr_warn_once("Uses OBSOLETE CoreSight replicator binding\n");</div><div class='add'>+</div><div class='ctx'> 	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);</div><div class='ctx'> 	if (!drvdata)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	drvdata-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	drvdata-&gt;atclk = devm_clk_get(&amp;pdev-&gt;dev, "atclk"); /* optional */</div><div class='add'>+	drvdata-&gt;dev = dev;</div><div class='add'>+	drvdata-&gt;atclk = devm_clk_get(dev, "atclk"); /* optional */</div><div class='ctx'> 	if (!IS_ERR(drvdata-&gt;atclk)) {</div><div class='ctx'> 		ret = clk_prepare_enable(drvdata-&gt;atclk);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	pm_runtime_get_noresume(&amp;pdev-&gt;dev);</div><div class='del'>-	pm_runtime_set_active(&amp;pdev-&gt;dev);</div><div class='del'>-	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='del'>-	platform_set_drvdata(pdev, drvdata);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Map the device base for dynamic-replicator, which has been</div><div class='add'>+	 * validated by AMBA core</div><div class='add'>+	 */</div><div class='add'>+	if (res) {</div><div class='add'>+		base = devm_ioremap_resource(dev, res);</div><div class='add'>+		if (IS_ERR(base)) {</div><div class='add'>+			ret = PTR_ERR(base);</div><div class='add'>+			goto out_disable_clk;</div><div class='add'>+		}</div><div class='add'>+		drvdata-&gt;base = base;</div><div class='add'>+		desc.groups = replicator_groups;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, drvdata);</div><div class='ctx'> </div><div class='ctx'> 	desc.type = CORESIGHT_DEV_TYPE_LINK;</div><div class='ctx'> 	desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;</div><div class='ctx'> 	desc.ops = &amp;replicator_cs_ops;</div><div class='del'>-	desc.pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-	desc.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	desc.pdata = dev-&gt;platform_data;</div><div class='add'>+	desc.dev = dev;</div><div class='ctx'> 	drvdata-&gt;csdev = coresight_register(&amp;desc);</div><div class='ctx'> 	if (IS_ERR(drvdata-&gt;csdev)) {</div><div class='ctx'> 		ret = PTR_ERR(drvdata-&gt;csdev);</div><div class='del'>-		goto out_disable_pm;</div><div class='add'>+		goto out_disable_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	replicator_reset(drvdata);</div><div class='add'>+	pm_runtime_put(dev);</div><div class='ctx'> </div><div class='del'>-out_disable_pm:</div><div class='del'>-	if (!IS_ERR(drvdata-&gt;atclk))</div><div class='add'>+out_disable_clk:</div><div class='add'>+	if (ret &amp;&amp; !IS_ERR_OR_NULL(drvdata-&gt;atclk))</div><div class='ctx'> 		clk_disable_unprepare(drvdata-&gt;atclk);</div><div class='del'>-	pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='del'>-	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int static_replicator_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</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='add'>+</div><div class='add'>+	/* Static replicators do not have programming base */</div><div class='add'>+	ret = replicator_probe(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	if (ret) {</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'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -139,18 +286,49 @@ static const struct dev_pm_ops replicator_dev_pm_ops = {</div><div class='ctx'> 			   replicator_runtime_resume, NULL)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id replicator_match[] = {</div><div class='add'>+static const struct of_device_id static_replicator_match[] = {</div><div class='ctx'> 	{.compatible = "arm,coresight-replicator"},</div><div class='add'>+	{.compatible = "arm,coresight-static-replicator"},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_driver replicator_driver = {</div><div class='del'>-	.probe          = replicator_probe,</div><div class='add'>+static struct platform_driver static_replicator_driver = {</div><div class='add'>+	.probe          = static_replicator_probe,</div><div class='ctx'> 	.driver         = {</div><div class='del'>-		.name   = "coresight-replicator",</div><div class='del'>-		.of_match_table = replicator_match,</div><div class='add'>+		.name   = "coresight-static-replicator",</div><div class='add'>+		.of_match_table = static_replicator_match,</div><div class='add'>+		.pm	= &amp;replicator_dev_pm_ops,</div><div class='add'>+		.suppress_bind_attrs = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(static_replicator_driver);</div><div class='add'>+</div><div class='add'>+static int dynamic_replicator_probe(struct amba_device *adev,</div><div class='add'>+				    const struct amba_id *id)</div><div class='add'>+{</div><div class='add'>+	return replicator_probe(&amp;adev-&gt;dev, &amp;adev-&gt;res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct amba_id dynamic_replicator_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.id     = 0x000bb909,</div><div class='add'>+		.mask   = 0x000fffff,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* Coresight SoC-600 */</div><div class='add'>+		.id     = 0x000bb9ec,</div><div class='add'>+		.mask   = 0x000fffff,</div><div class='add'>+	},</div><div class='add'>+	{ 0, 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct amba_driver dynamic_replicator_driver = {</div><div class='add'>+	.drv = {</div><div class='add'>+		.name	= "coresight-dynamic-replicator",</div><div class='ctx'> 		.pm	= &amp;replicator_dev_pm_ops,</div><div class='ctx'> 		.suppress_bind_attrs = true,</div><div class='ctx'> 	},</div><div class='add'>+	.probe		= dynamic_replicator_probe,</div><div class='add'>+	.id_table	= dynamic_replicator_ids,</div><div class='ctx'> };</div><div class='del'>-builtin_platform_driver(replicator_driver);</div><div class='add'>+builtin_amba_driver(dynamic_replicator_driver);</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c<br/>index a5f053f2db2c..2527b5d3b65e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc-etf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc-etf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc-etf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-tmc-etf.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  * Author: Mathieu Poirier &lt;mathieu.poirier@linaro.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/circ_buf.h&gt;</div><div class='ctx'> #include &lt;linux/coresight.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='hunk'>@@ -180,8 +181,10 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev)</div><div class='ctx'> 	 * sink is already enabled no memory is needed and the HW need not be</div><div class='ctx'> 	 * touched.</div><div class='ctx'> 	 */</div><div class='del'>-	if (drvdata-&gt;mode == CS_MODE_SYSFS)</div><div class='add'>+	if (drvdata-&gt;mode == CS_MODE_SYSFS) {</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If drvdata::buf isn't NULL, memory was allocated for a previous</div><div class='hunk'>@@ -200,11 +203,13 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = tmc_etb_enable_hw(drvdata);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		drvdata-&gt;mode = CS_MODE_SYSFS;</div><div class='del'>-	else</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+	} else {</div><div class='ctx'> 		/* Free up the buffer if we failed to enable */</div><div class='ctx'> 		used = false;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +223,7 @@ out:</div><div class='ctx'> static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	pid_t pid;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> 	struct perf_output_handle *handle = data;</div><div class='hunk'>@@ -228,19 +234,42 @@ static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, void *data)</div><div class='ctx'> 		if (drvdata-&gt;reading)</div><div class='ctx'> 			break;</div><div class='ctx'> 		/*</div><div class='del'>-		 * In Perf mode there can be only one writer per sink.  There</div><div class='del'>-		 * is also no need to continue if the ETB/ETF is already</div><div class='del'>-		 * operated from sysFS.</div><div class='add'>+		 * No need to continue if the ETB/ETF is already operated</div><div class='add'>+		 * from sysFS.</div><div class='ctx'> 		 */</div><div class='del'>-		if (drvdata-&gt;mode != CS_MODE_DISABLED)</div><div class='add'>+		if (drvdata-&gt;mode == CS_MODE_SYSFS) {</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get a handle on the pid of the process to monitor */</div><div class='add'>+		pid = task_pid_nr(handle-&gt;event-&gt;owner);</div><div class='add'>+</div><div class='add'>+		if (drvdata-&gt;pid != -1 &amp;&amp; drvdata-&gt;pid != pid) {</div><div class='add'>+			ret = -EBUSY;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = tmc_set_etf_buffer(csdev, handle);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * No HW configuration is needed if the sink is already in</div><div class='add'>+		 * use for this session.</div><div class='add'>+		 */</div><div class='add'>+		if (drvdata-&gt;pid == pid) {</div><div class='add'>+			atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ret  = tmc_etb_enable_hw(drvdata);</div><div class='del'>-		if (!ret)</div><div class='add'>+		if (!ret) {</div><div class='add'>+			/* Associate with monitored process. */</div><div class='add'>+			drvdata-&gt;pid = pid;</div><div class='ctx'> 			drvdata-&gt;mode = CS_MODE_PERF;</div><div class='add'>+			atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+		}</div><div class='ctx'> 	} while (0);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -273,26 +302,34 @@ static int tmc_enable_etf_sink(struct coresight_device *csdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tmc_disable_etf_sink(struct coresight_device *csdev)</div><div class='add'>+static int tmc_disable_etf_sink(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (drvdata-&gt;reading) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='del'>-		return;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable the TMC only if it needs to */</div><div class='del'>-	if (drvdata-&gt;mode != CS_MODE_DISABLED) {</div><div class='del'>-		tmc_etb_disable_hw(drvdata);</div><div class='del'>-		drvdata-&gt;mode = CS_MODE_DISABLED;</div><div class='add'>+	if (atomic_dec_return(csdev-&gt;refcnt)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Complain if we (somehow) got out of sync */</div><div class='add'>+	WARN_ON_ONCE(drvdata-&gt;mode == CS_MODE_DISABLED);</div><div class='add'>+	tmc_etb_disable_hw(drvdata);</div><div class='add'>+	/* Dissociate from monitored process. */</div><div class='add'>+	drvdata-&gt;pid = -1;</div><div class='add'>+	drvdata-&gt;mode = CS_MODE_DISABLED;</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "TMC-ETB/ETF disabled\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tmc_enable_etf_link(struct coresight_device *csdev,</div><div class='hunk'>@@ -337,10 +374,11 @@ static void tmc_disable_etf_link(struct coresight_device *csdev,</div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "TMC-ETF disabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *tmc_alloc_etf_buffer(struct coresight_device *csdev, int cpu,</div><div class='del'>-				  void **pages, int nr_pages, bool overwrite)</div><div class='add'>+static void *tmc_alloc_etf_buffer(struct coresight_device *csdev,</div><div class='add'>+				  struct perf_event *event, void **pages,</div><div class='add'>+				  int nr_pages, bool overwrite)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='add'>+	int node, cpu = event-&gt;cpu;</div><div class='ctx'> 	struct cs_buffers *buf;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu == -1)</div><div class='hunk'>@@ -400,7 +438,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,</div><div class='ctx'> 	u32 *buf_ptr;</div><div class='ctx'> 	u64 read_ptr, write_ptr;</div><div class='ctx'> 	u32 status;</div><div class='del'>-	unsigned long offset, to_read;</div><div class='add'>+	unsigned long offset, to_read = 0, flags;</div><div class='ctx'> 	struct cs_buffers *buf = sink_config;</div><div class='ctx'> 	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='hunk'>@@ -411,6 +449,12 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,</div><div class='ctx'> 	if (WARN_ON_ONCE(drvdata-&gt;mode != CS_MODE_PERF))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	/* Don't do anything if another tracer is using this sink */</div><div class='add'>+	if (atomic_read(csdev-&gt;refcnt) != 1)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	CS_UNLOCK(drvdata-&gt;base);</div><div class='ctx'> </div><div class='ctx'> 	tmc_flush_and_stop(drvdata);</div><div class='hunk'>@@ -504,6 +548,8 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,</div><div class='ctx'> 		to_read = buf-&gt;nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> 	CS_LOCK(drvdata-&gt;base);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return to_read;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c<br/>index f684283890d3..df6e4b0b84e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc-etr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc-etr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc-etr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-tmc-etr.c</a></div><div class='hunk'>@@ -4,10 +4,15 @@</div><div class='ctx'>  * Author: Mathieu Poirier &lt;mathieu.poirier@linaro.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/coresight.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/iommu.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include "coresight-catu.h"</div><div class='ctx'> #include "coresight-etm-perf.h"</div><div class='hunk'>@@ -23,14 +28,18 @@ struct etr_flat_buf {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * etr_perf_buffer - Perf buffer used for ETR</div><div class='add'>+ * @drvdata		- The ETR drvdaga this buffer has been allocated for.</div><div class='ctx'>  * @etr_buf		- Actual buffer used by the ETR</div><div class='add'>+ * @pid			- The PID this etr_perf_buffer belongs to.</div><div class='ctx'>  * @snaphost		- Perf session mode</div><div class='ctx'>  * @head		- handle-&gt;head at the beginning of the session.</div><div class='ctx'>  * @nr_pages		- Number of pages in the ring buffer.</div><div class='ctx'>  * @pages		- Array of Pages in the ring buffer.</div><div class='ctx'>  */</div><div class='ctx'> struct etr_perf_buffer {</div><div class='add'>+	struct tmc_drvdata	*drvdata;</div><div class='ctx'> 	struct etr_buf		*etr_buf;</div><div class='add'>+	pid_t			pid;</div><div class='ctx'> 	bool			snapshot;</div><div class='ctx'> 	unsigned long		head;</div><div class='ctx'> 	int			nr_pages;</div><div class='hunk'>@@ -772,7 +781,8 @@ static inline void tmc_etr_disable_catu(struct tmc_drvdata *drvdata)</div><div class='ctx'> static const struct etr_buf_operations *etr_buf_ops[] = {</div><div class='ctx'> 	[ETR_MODE_FLAT] = &amp;etr_flat_buf_ops,</div><div class='ctx'> 	[ETR_MODE_ETR_SG] = &amp;etr_sg_buf_ops,</div><div class='del'>-	[ETR_MODE_CATU] = &amp;etr_catu_buf_ops,</div><div class='add'>+	[ETR_MODE_CATU] = IS_ENABLED(CONFIG_CORESIGHT_CATU)</div><div class='add'>+						? &amp;etr_catu_buf_ops : NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int tmc_etr_mode_alloc_buf(int mode,</div><div class='hunk'>@@ -786,7 +796,7 @@ static inline int tmc_etr_mode_alloc_buf(int mode,</div><div class='ctx'> 	case ETR_MODE_FLAT:</div><div class='ctx'> 	case ETR_MODE_ETR_SG:</div><div class='ctx'> 	case ETR_MODE_CATU:</div><div class='del'>-		if (etr_buf_ops[mode]-&gt;alloc)</div><div class='add'>+		if (etr_buf_ops[mode] &amp;&amp; etr_buf_ops[mode]-&gt;alloc)</div><div class='ctx'> 			rc = etr_buf_ops[mode]-&gt;alloc(drvdata, etr_buf,</div><div class='ctx'> 						      node, pages);</div><div class='ctx'> 		if (!rc)</div><div class='hunk'>@@ -1124,8 +1134,10 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)</div><div class='ctx'> 	 * sink is already enabled no memory is needed and the HW need not be</div><div class='ctx'> 	 * touched, even if the buffer size has changed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (drvdata-&gt;mode == CS_MODE_SYSFS)</div><div class='add'>+	if (drvdata-&gt;mode == CS_MODE_SYSFS) {</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we don't have a buffer or it doesn't match the requested size,</div><div class='hunk'>@@ -1138,8 +1150,10 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = tmc_etr_enable_hw(drvdata, drvdata-&gt;sysfs_buf);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		drvdata-&gt;mode = CS_MODE_SYSFS;</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1154,23 +1168,23 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * tmc_etr_setup_perf_buf: Allocate ETR buffer for use by perf.</div><div class='add'>+ * alloc_etr_buf: Allocate ETR buffer for use by perf.</div><div class='ctx'>  * The size of the hardware buffer is dependent on the size configured</div><div class='ctx'>  * via sysfs and the perf ring buffer size. We prefer to allocate the</div><div class='ctx'>  * largest possible size, scaling down the size by half until it</div><div class='ctx'>  * reaches a minimum limit (1M), beyond which we give up.</div><div class='ctx'>  */</div><div class='del'>-static struct etr_perf_buffer *</div><div class='del'>-tmc_etr_setup_perf_buf(struct tmc_drvdata *drvdata, int node, int nr_pages,</div><div class='del'>-		       void **pages, bool snapshot)</div><div class='add'>+static struct etr_buf *</div><div class='add'>+alloc_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event,</div><div class='add'>+	      int nr_pages, void **pages, bool snapshot)</div><div class='ctx'> {</div><div class='add'>+	int node, cpu = event-&gt;cpu;</div><div class='ctx'> 	struct etr_buf *etr_buf;</div><div class='del'>-	struct etr_perf_buffer *etr_perf;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> </div><div class='del'>-	etr_perf = kzalloc_node(sizeof(*etr_perf), GFP_KERNEL, node);</div><div class='del'>-	if (!etr_perf)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	if (cpu == -1)</div><div class='add'>+		cpu = smp_processor_id();</div><div class='add'>+	node = cpu_to_node(cpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to match the perf ring buffer size if it is larger</div><div class='hunk'>@@ -1195,32 +1209,160 @@ tmc_etr_setup_perf_buf(struct tmc_drvdata *drvdata, int node, int nr_pages,</div><div class='ctx'> 		size /= 2;</div><div class='ctx'> 	} while (size &gt;= TMC_ETR_PERF_MIN_BUF_SIZE);</div><div class='ctx'> </div><div class='add'>+	return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return etr_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct etr_buf *</div><div class='add'>+get_perf_etr_buf_cpu_wide(struct tmc_drvdata *drvdata,</div><div class='add'>+			  struct perf_event *event, int nr_pages,</div><div class='add'>+			  void **pages, bool snapshot)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	pid_t pid = task_pid_nr(event-&gt;owner);</div><div class='add'>+	struct etr_buf *etr_buf;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	/*</div><div class='add'>+	 * An etr_perf_buffer is associated with an event and holds a reference</div><div class='add'>+	 * to the AUX ring buffer that was created for that event.  In CPU-wide</div><div class='add'>+	 * N:1 mode multiple events (one per CPU), each with its own AUX ring</div><div class='add'>+	 * buffer, share a sink.  As such an etr_perf_buffer is created for each</div><div class='add'>+	 * event but a single etr_buf associated with the ETR is shared between</div><div class='add'>+	 * them.  The last event in a trace session will copy the content of the</div><div class='add'>+	 * etr_buf to its AUX ring buffer.  Ring buffer associated to other</div><div class='add'>+	 * events are simply not used an freed as events are destoyed.  We still</div><div class='add'>+	 * need to allocate a ring buffer for each event since we don't know</div><div class='add'>+	 * which event will be last.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The first thing to do here is check if an etr_buf has already been</div><div class='add'>+	 * allocated for this session.  If so it is shared with this event,</div><div class='add'>+	 * otherwise it is created.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+	etr_buf = idr_find(&amp;drvdata-&gt;idr, pid);</div><div class='add'>+	if (etr_buf) {</div><div class='add'>+		refcount_inc(&amp;etr_buf-&gt;refcount);</div><div class='add'>+		mutex_unlock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+		return etr_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we made it here no buffer has been allocated, do so now. */</div><div class='add'>+	mutex_unlock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+</div><div class='add'>+	etr_buf = alloc_etr_buf(drvdata, event, nr_pages, pages, snapshot);</div><div class='add'>+	if (IS_ERR(etr_buf))</div><div class='add'>+		return etr_buf;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;etr_buf-&gt;refcount, 1);</div><div class='add'>+</div><div class='add'>+	/* Now that we have a buffer, add it to the IDR. */</div><div class='add'>+	mutex_lock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+	ret = idr_alloc(&amp;drvdata-&gt;idr, etr_buf, pid, pid + 1, GFP_KERNEL);</div><div class='add'>+	mutex_unlock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+</div><div class='add'>+	/* Another event with this session ID has allocated this buffer. */</div><div class='add'>+	if (ret == -ENOSPC) {</div><div class='add'>+		tmc_free_etr_buf(etr_buf);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The IDR can't allocate room for a new session, abandon ship. */</div><div class='add'>+	if (ret == -ENOMEM) {</div><div class='add'>+		tmc_free_etr_buf(etr_buf);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return etr_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct etr_buf *</div><div class='add'>+get_perf_etr_buf_per_thread(struct tmc_drvdata *drvdata,</div><div class='add'>+			    struct perf_event *event, int nr_pages,</div><div class='add'>+			    void **pages, bool snapshot)</div><div class='add'>+{</div><div class='add'>+	struct etr_buf *etr_buf;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In per-thread mode the etr_buf isn't shared, so just go ahead</div><div class='add'>+	 * with memory allocation.</div><div class='add'>+	 */</div><div class='add'>+	etr_buf = alloc_etr_buf(drvdata, event, nr_pages, pages, snapshot);</div><div class='add'>+	if (IS_ERR(etr_buf))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;etr_buf-&gt;refcount, 1);</div><div class='add'>+out:</div><div class='add'>+	return etr_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct etr_buf *</div><div class='add'>+get_perf_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event,</div><div class='add'>+		 int nr_pages, void **pages, bool snapshot)</div><div class='add'>+{</div><div class='add'>+	if (event-&gt;cpu == -1)</div><div class='add'>+		return get_perf_etr_buf_per_thread(drvdata, event, nr_pages,</div><div class='add'>+						   pages, snapshot);</div><div class='add'>+</div><div class='add'>+	return get_perf_etr_buf_cpu_wide(drvdata, event, nr_pages,</div><div class='add'>+					 pages, snapshot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct etr_perf_buffer *</div><div class='add'>+tmc_etr_setup_perf_buf(struct tmc_drvdata *drvdata, struct perf_event *event,</div><div class='add'>+		       int nr_pages, void **pages, bool snapshot)</div><div class='add'>+{</div><div class='add'>+	int node, cpu = event-&gt;cpu;</div><div class='add'>+	struct etr_buf *etr_buf;</div><div class='add'>+	struct etr_perf_buffer *etr_perf;</div><div class='add'>+</div><div class='add'>+	if (cpu == -1)</div><div class='add'>+		cpu = smp_processor_id();</div><div class='add'>+	node = cpu_to_node(cpu);</div><div class='add'>+</div><div class='add'>+	etr_perf = kzalloc_node(sizeof(*etr_perf), GFP_KERNEL, node);</div><div class='add'>+	if (!etr_perf)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	etr_buf = get_perf_etr_buf(drvdata, event, nr_pages, pages, snapshot);</div><div class='add'>+	if (!IS_ERR(etr_buf))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='ctx'> 	kfree(etr_perf);</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='add'>+	/*</div><div class='add'>+	 * Keep a reference to the ETR this buffer has been allocated for</div><div class='add'>+	 * in order to have access to the IDR in tmc_free_etr_buffer().</div><div class='add'>+	 */</div><div class='add'>+	etr_perf-&gt;drvdata = drvdata;</div><div class='ctx'> 	etr_perf-&gt;etr_buf = etr_buf;</div><div class='add'>+</div><div class='ctx'> 	return etr_perf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void *tmc_alloc_etr_buffer(struct coresight_device *csdev,</div><div class='del'>-				  int cpu, void **pages, int nr_pages,</div><div class='del'>-				  bool snapshot)</div><div class='add'>+				  struct perf_event *event, void **pages,</div><div class='add'>+				  int nr_pages, bool snapshot)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_perf_buffer *etr_perf;</div><div class='ctx'> 	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	if (cpu == -1)</div><div class='del'>-		cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	etr_perf = tmc_etr_setup_perf_buf(drvdata, cpu_to_node(cpu),</div><div class='add'>+	etr_perf = tmc_etr_setup_perf_buf(drvdata, event,</div><div class='ctx'> 					  nr_pages, pages, snapshot);</div><div class='ctx'> 	if (IS_ERR(etr_perf)) {</div><div class='ctx'> 		dev_dbg(drvdata-&gt;dev, "Unable to allocate ETR buffer\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	etr_perf-&gt;pid = task_pid_nr(event-&gt;owner);</div><div class='ctx'> 	etr_perf-&gt;snapshot = snapshot;</div><div class='ctx'> 	etr_perf-&gt;nr_pages = nr_pages;</div><div class='ctx'> 	etr_perf-&gt;pages = pages;</div><div class='hunk'>@@ -1231,9 +1373,33 @@ static void *tmc_alloc_etr_buffer(struct coresight_device *csdev,</div><div class='ctx'> static void tmc_free_etr_buffer(void *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_perf_buffer *etr_perf = config;</div><div class='add'>+	struct tmc_drvdata *drvdata = etr_perf-&gt;drvdata;</div><div class='add'>+	struct etr_buf *buf, *etr_buf = etr_perf-&gt;etr_buf;</div><div class='add'>+</div><div class='add'>+	if (!etr_buf)</div><div class='add'>+		goto free_etr_perf_buffer;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+	/* If we are not the last one to use the buffer, don't touch it. */</div><div class='add'>+	if (!refcount_dec_and_test(&amp;etr_buf-&gt;refcount)) {</div><div class='add'>+		mutex_unlock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+		goto free_etr_perf_buffer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We are the last one, remove from the IDR and free the buffer. */</div><div class='add'>+	buf = idr_remove(&amp;drvdata-&gt;idr, etr_perf-&gt;pid);</div><div class='add'>+	mutex_unlock(&amp;drvdata-&gt;idr_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Something went very wrong if the buffer associated with this ID</div><div class='add'>+	 * is not the same in the IDR.  Leak to avoid use after free.</div><div class='add'>+	 */</div><div class='add'>+	if (buf &amp;&amp; WARN_ON(buf != etr_buf))</div><div class='add'>+		goto free_etr_perf_buffer;</div><div class='add'>+</div><div class='add'>+	tmc_free_etr_buf(etr_perf-&gt;etr_buf);</div><div class='ctx'> </div><div class='del'>-	if (etr_perf-&gt;etr_buf)</div><div class='del'>-		tmc_free_etr_buf(etr_perf-&gt;etr_buf);</div><div class='add'>+free_etr_perf_buffer:</div><div class='ctx'> 	kfree(etr_perf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1308,6 +1474,13 @@ tmc_update_etr_buffer(struct coresight_device *csdev,</div><div class='ctx'> 	struct etr_buf *etr_buf = etr_perf-&gt;etr_buf;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	/* Don't do anything if another tracer is using this sink */</div><div class='add'>+	if (atomic_read(csdev-&gt;refcnt) != 1) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(drvdata-&gt;perf_data != etr_perf)) {</div><div class='ctx'> 		lost = true;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='hunk'>@@ -1347,17 +1520,15 @@ out:</div><div class='ctx'> static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='add'>+	pid_t pid;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> 	struct perf_output_handle *handle = data;</div><div class='ctx'> 	struct etr_perf_buffer *etr_perf = etm_perf_sink_config(handle);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * There can be only one writer per sink in perf mode. If the sink</div><div class='del'>-	 * is already open in SYSFS mode, we can't use it.</div><div class='del'>-	 */</div><div class='del'>-	if (drvdata-&gt;mode != CS_MODE_DISABLED || WARN_ON(drvdata-&gt;perf_data)) {</div><div class='add'>+	 /* Don't use this sink if it is already claimed by sysFS */</div><div class='add'>+	if (drvdata-&gt;mode == CS_MODE_SYSFS) {</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1367,11 +1538,34 @@ static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, void *data)</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Get a handle on the pid of the process to monitor */</div><div class='add'>+	pid = etr_perf-&gt;pid;</div><div class='add'>+</div><div class='add'>+	/* Do not proceed if this device is associated with another session */</div><div class='add'>+	if (drvdata-&gt;pid != -1 &amp;&amp; drvdata-&gt;pid != pid) {</div><div class='add'>+		rc = -EBUSY;</div><div class='add'>+		goto unlock_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	etr_perf-&gt;head = PERF_IDX2OFF(handle-&gt;head, etr_perf);</div><div class='ctx'> 	drvdata-&gt;perf_data = etr_perf;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No HW configuration is needed if the sink is already in</div><div class='add'>+	 * use for this session.</div><div class='add'>+	 */</div><div class='add'>+	if (drvdata-&gt;pid == pid) {</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+		goto unlock_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = tmc_etr_enable_hw(drvdata, etr_perf-&gt;etr_buf);</div><div class='del'>-	if (!rc)</div><div class='add'>+	if (!rc) {</div><div class='add'>+		/* Associate with monitored process. */</div><div class='add'>+		drvdata-&gt;pid = pid;</div><div class='ctx'> 		drvdata-&gt;mode = CS_MODE_PERF;</div><div class='add'>+		atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> unlock_out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='hunk'>@@ -1392,26 +1586,34 @@ static int tmc_enable_etr_sink(struct coresight_device *csdev,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tmc_disable_etr_sink(struct coresight_device *csdev)</div><div class='add'>+static int tmc_disable_etr_sink(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (drvdata-&gt;reading) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='del'>-		return;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable the TMC only if it needs to */</div><div class='del'>-	if (drvdata-&gt;mode != CS_MODE_DISABLED) {</div><div class='del'>-		tmc_etr_disable_hw(drvdata);</div><div class='del'>-		drvdata-&gt;mode = CS_MODE_DISABLED;</div><div class='add'>+	if (atomic_dec_return(csdev-&gt;refcnt)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Complain if we (somehow) got out of sync */</div><div class='add'>+	WARN_ON_ONCE(drvdata-&gt;mode == CS_MODE_DISABLED);</div><div class='add'>+	tmc_etr_disable_hw(drvdata);</div><div class='add'>+	/* Dissociate from monitored process. */</div><div class='add'>+	drvdata-&gt;pid = -1;</div><div class='add'>+	drvdata-&gt;mode = CS_MODE_DISABLED;</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drvdata-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "TMC-ETR disabled\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct coresight_ops_sink tmc_etr_sink_ops = {</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c<br/>index 2a02da3d630f..3f718729d741 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-tmc.c</a></div><div class='hunk'>@@ -8,10 +8,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -340,6 +342,8 @@ static inline bool tmc_etr_can_use_sg(struct tmc_drvdata *drvdata)</div><div class='ctx'> static int tmc_etr_setup_caps(struct tmc_drvdata *drvdata,</div><div class='ctx'> 			     u32 devid, void *dev_caps)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	u32 dma_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the unadvertised capabilities */</div><div class='hunk'>@@ -369,7 +373,10 @@ static int tmc_etr_setup_caps(struct tmc_drvdata *drvdata,</div><div class='ctx'> 		dma_mask = 40;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return dma_set_mask_and_coherent(drvdata-&gt;dev, DMA_BIT_MASK(dma_mask));</div><div class='add'>+	rc = dma_set_mask_and_coherent(drvdata-&gt;dev, DMA_BIT_MASK(dma_mask));</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(drvdata-&gt;dev, "Failed to setup DMA mask: %d\n", rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tmc_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='hunk'>@@ -415,6 +422,8 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	devid = readl_relaxed(drvdata-&gt;base + CORESIGHT_DEVID);</div><div class='ctx'> 	drvdata-&gt;config_type = BMVAL(devid, 6, 7);</div><div class='ctx'> 	drvdata-&gt;memwidth = tmc_get_memwidth(devid);</div><div class='add'>+	/* This device is not associated with a session */</div><div class='add'>+	drvdata-&gt;pid = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (drvdata-&gt;config_type == TMC_CONFIG_TYPE_ETR) {</div><div class='ctx'> 		if (np)</div><div class='hunk'>@@ -427,8 +436,6 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 		drvdata-&gt;size = readl_relaxed(drvdata-&gt;base + TMC_RSZ) * 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	desc.pdata = pdata;</div><div class='ctx'> 	desc.dev = dev;</div><div class='ctx'> 	desc.groups = coresight_tmc_groups;</div><div class='hunk'>@@ -447,6 +454,8 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 					 coresight_get_uci_data(id));</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='add'>+		idr_init(&amp;drvdata-&gt;idr);</div><div class='add'>+		mutex_init(&amp;drvdata-&gt;idr_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TMC_CONFIG_TYPE_ETF:</div><div class='ctx'> 		desc.type = CORESIGHT_DEV_TYPE_LINKSINK;</div><div class='hunk'>@@ -471,6 +480,8 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	ret = misc_register(&amp;drvdata-&gt;miscdev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		coresight_unregister(drvdata-&gt;csdev);</div><div class='add'>+	else</div><div class='add'>+		pm_runtime_put(&amp;adev-&gt;dev);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h<br/>index 487c53701e9c..503f1b3a3741 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tmc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tmc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-tmc.h</a></div><div class='hunk'>@@ -8,7 +8,10 @@</div><div class='ctx'> #define _CORESIGHT_TMC_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TMC_RSZ			0x004</div><div class='ctx'> #define TMC_STS			0x00c</div><div class='hunk'>@@ -133,6 +136,7 @@ struct etr_buf_operations;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct etr_buf - Details of the buffer used by ETR</div><div class='add'>+ * refcount	; Number of sources currently using this etr_buf.</div><div class='ctx'>  * @mode	: Mode of the ETR buffer, contiguous, Scatter Gather etc.</div><div class='ctx'>  * @full	: Trace data overflow</div><div class='ctx'>  * @size	: Size of the buffer.</div><div class='hunk'>@@ -143,6 +147,7 @@ struct etr_buf_operations;</div><div class='ctx'>  * @private	: Backend specific information for the buf</div><div class='ctx'>  */</div><div class='ctx'> struct etr_buf {</div><div class='add'>+	refcount_t			refcount;</div><div class='ctx'> 	enum etr_mode			mode;</div><div class='ctx'> 	bool				full;</div><div class='ctx'> 	ssize_t				size;</div><div class='hunk'>@@ -160,6 +165,8 @@ struct etr_buf {</div><div class='ctx'>  * @csdev:	component vitals needed by the framework.</div><div class='ctx'>  * @miscdev:	specifics to handle "/dev/xyz.tmc" entry.</div><div class='ctx'>  * @spinlock:	only one at a time pls.</div><div class='add'>+ * @pid:	Process ID of the process being monitored by the session</div><div class='add'>+ *		that is using this component.</div><div class='ctx'>  * @buf:	Snapshot of the trace data for ETF/ETB.</div><div class='ctx'>  * @etr_buf:	details of buffer used in TMC-ETR</div><div class='ctx'>  * @len:	size of the available trace for ETF/ETB.</div><div class='hunk'>@@ -170,6 +177,8 @@ struct etr_buf {</div><div class='ctx'>  * @trigger_cntr: amount of words to store after a trigger.</div><div class='ctx'>  * @etr_caps:	Bitmask of capabilities of the TMC ETR, inferred from the</div><div class='ctx'>  *		device configuration register (DEVID)</div><div class='add'>+ * @idr:	Holds etr_bufs allocated for this ETR.</div><div class='add'>+ * @idr_mutex:	Access serialisation for idr.</div><div class='ctx'>  * @perf_data:	PERF buffer for ETR.</div><div class='ctx'>  * @sysfs_data:	SYSFS buffer for ETR.</div><div class='ctx'>  */</div><div class='hunk'>@@ -179,6 +188,7 @@ struct tmc_drvdata {</div><div class='ctx'> 	struct coresight_device	*csdev;</div><div class='ctx'> 	struct miscdevice	miscdev;</div><div class='ctx'> 	spinlock_t		spinlock;</div><div class='add'>+	pid_t			pid;</div><div class='ctx'> 	bool			reading;</div><div class='ctx'> 	union {</div><div class='ctx'> 		char		*buf;		/* TMC ETB */</div><div class='hunk'>@@ -191,6 +201,8 @@ struct tmc_drvdata {</div><div class='ctx'> 	enum tmc_mem_intf_width	memwidth;</div><div class='ctx'> 	u32			trigger_cntr;</div><div class='ctx'> 	u32			etr_caps;</div><div class='add'>+	struct idr		idr;</div><div class='add'>+	struct mutex		idr_mutex;</div><div class='ctx'> 	struct etr_buf		*sysfs_buf;</div><div class='ctx'> 	void			*perf_data;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c<br/>index b2f72a1fa402..63d9af31f57f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tpiu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight-tpiu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight-tpiu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight-tpiu.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * Description: CoreSight Trace Port Interface Unit driver</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -73,7 +74,7 @@ static int tpiu_enable(struct coresight_device *csdev, u32 mode, void *__unused)</div><div class='ctx'> 	struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	tpiu_enable_hw(drvdata);</div><div class='del'>-</div><div class='add'>+	atomic_inc(csdev-&gt;refcnt);</div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "TPIU enabled\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -94,13 +95,17 @@ static void tpiu_disable_hw(struct tpiu_drvdata *drvdata)</div><div class='ctx'> 	CS_LOCK(drvdata-&gt;base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tpiu_disable(struct coresight_device *csdev)</div><div class='add'>+static int tpiu_disable(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='add'>+	if (atomic_dec_return(csdev-&gt;refcnt))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	tpiu_disable_hw(drvdata);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(drvdata-&gt;dev, "TPIU disabled\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct coresight_ops_sink tpiu_sink_ops = {</div><div class='hunk'>@@ -153,8 +158,6 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	/* Disable tpiu to support older devices */</div><div class='ctx'> 	tpiu_disable_hw(drvdata);</div><div class='ctx'> </div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	desc.type = CORESIGHT_DEV_TYPE_SINK;</div><div class='ctx'> 	desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_PORT;</div><div class='ctx'> 	desc.ops = &amp;tpiu_cs_ops;</div><div class='hunk'>@@ -162,7 +165,12 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	desc.dev = dev;</div><div class='ctx'> 	drvdata-&gt;csdev = coresight_register(&amp;desc);</div><div class='ctx'> </div><div class='del'>-	return PTR_ERR_OR_ZERO(drvdata-&gt;csdev);</div><div class='add'>+	if (!IS_ERR(drvdata-&gt;csdev)) {</div><div class='add'>+		pm_runtime_put(&amp;adev-&gt;dev);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PTR_ERR(drvdata-&gt;csdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='head'>diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c<br/>index 29cef898afba..4b130281236a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/coresight/coresight.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/coresight/coresight.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/coresight/coresight.c</a></div><div class='hunk'>@@ -225,26 +225,28 @@ static int coresight_enable_sink(struct coresight_device *csdev,</div><div class='ctx'> 	 * We need to make sure the "new" session is compatible with the</div><div class='ctx'> 	 * existing "mode" of operation.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sink_ops(csdev)-&gt;enable) {</div><div class='del'>-		ret = sink_ops(csdev)-&gt;enable(csdev, mode, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		csdev-&gt;enable = true;</div><div class='del'>-	}</div><div class='add'>+	if (!sink_ops(csdev)-&gt;enable)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(csdev-&gt;refcnt);</div><div class='add'>+	ret = sink_ops(csdev)-&gt;enable(csdev, mode, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	csdev-&gt;enable = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void coresight_disable_sink(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_dec_return(csdev-&gt;refcnt) == 0) {</div><div class='del'>-		if (sink_ops(csdev)-&gt;disable) {</div><div class='del'>-			sink_ops(csdev)-&gt;disable(csdev);</div><div class='del'>-			csdev-&gt;enable = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!sink_ops(csdev)-&gt;disable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = sink_ops(csdev)-&gt;disable(csdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+	csdev-&gt;enable = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int coresight_enable_link(struct coresight_device *csdev,</div><div class='hunk'>@@ -973,7 +975,6 @@ static void coresight_device_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct coresight_device *csdev = to_coresight_device(dev);</div><div class='ctx'> </div><div class='del'>-	kfree(csdev-&gt;conns);</div><div class='ctx'> 	kfree(csdev-&gt;refcnt);</div><div class='ctx'> 	kfree(csdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/acpi.c b/drivers/hwtracing/intel_th/acpi.c<br/>index 87bc3744755f..87f9024e4bbb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/acpi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/acpi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/acpi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/acpi.c</a></div><div class='hunk'>@@ -37,15 +37,21 @@ MODULE_DEVICE_TABLE(acpi, intel_th_acpi_ids);</div><div class='ctx'> static int intel_th_acpi_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_device *adev = ACPI_COMPANION(&amp;pdev-&gt;dev);</div><div class='add'>+	struct resource resource[TH_MMIO_END];</div><div class='ctx'> 	const struct acpi_device_id *id;</div><div class='ctx'> 	struct intel_th *th;</div><div class='add'>+	int i, r;</div><div class='ctx'> </div><div class='ctx'> 	id = acpi_match_device(intel_th_acpi_ids, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!id)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	th = intel_th_alloc(&amp;pdev-&gt;dev, (void *)id-&gt;driver_data,</div><div class='del'>-			    pdev-&gt;resource, pdev-&gt;num_resources, -1);</div><div class='add'>+	for (i = 0, r = 0; i &lt; pdev-&gt;num_resources &amp;&amp; r &lt; TH_MMIO_END; i++)</div><div class='add'>+		if (pdev-&gt;resource[i].flags &amp;</div><div class='add'>+		    (IORESOURCE_IRQ | IORESOURCE_MEM))</div><div class='add'>+			resource[r++] = pdev-&gt;resource[i];</div><div class='add'>+</div><div class='add'>+	th = intel_th_alloc(&amp;pdev-&gt;dev, (void *)id-&gt;driver_data, resource, r);</div><div class='ctx'> 	if (IS_ERR(th))</div><div class='ctx'> 		return PTR_ERR(th);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c<br/>index 7c1acc2f801c..033dce563c99 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/core.c</a></div><div class='hunk'>@@ -430,9 +430,9 @@ static const struct intel_th_subdevice {</div><div class='ctx'> 		.nres	= 1,</div><div class='ctx'> 		.res	= {</div><div class='ctx'> 			{</div><div class='del'>-				/* Handle TSCU from GTH driver */</div><div class='add'>+				/* Handle TSCU and CTS from GTH driver */</div><div class='ctx'> 				.start	= REG_GTH_OFFSET,</div><div class='del'>-				.end	= REG_TSCU_OFFSET + REG_TSCU_LENGTH - 1,</div><div class='add'>+				.end	= REG_CTS_OFFSET + REG_CTS_LENGTH - 1,</div><div class='ctx'> 				.flags	= IORESOURCE_MEM,</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='hunk'>@@ -491,7 +491,7 @@ static const struct intel_th_subdevice {</div><div class='ctx'> 				.flags	= IORESOURCE_MEM,</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='del'>-				.start	= 1, /* use resource[1] */</div><div class='add'>+				.start	= TH_MMIO_SW,</div><div class='ctx'> 				.end	= 0,</div><div class='ctx'> 				.flags	= IORESOURCE_MEM,</div><div class='ctx'> 			},</div><div class='hunk'>@@ -501,6 +501,24 @@ static const struct intel_th_subdevice {</div><div class='ctx'> 		.type	= INTEL_TH_SOURCE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.nres	= 2,</div><div class='add'>+		.res	= {</div><div class='add'>+			{</div><div class='add'>+				.start	= REG_STH_OFFSET,</div><div class='add'>+				.end	= REG_STH_OFFSET + REG_STH_LENGTH - 1,</div><div class='add'>+				.flags	= IORESOURCE_MEM,</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.start	= TH_MMIO_RTIT,</div><div class='add'>+				.end	= 0,</div><div class='add'>+				.flags	= IORESOURCE_MEM,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.id	= -1,</div><div class='add'>+		.name	= "rtit",</div><div class='add'>+		.type	= INTEL_TH_SOURCE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.nres	= 1,</div><div class='ctx'> 		.res	= {</div><div class='ctx'> 			{</div><div class='hunk'>@@ -584,7 +602,6 @@ intel_th_subdevice_alloc(struct intel_th *th,</div><div class='ctx'> 	struct intel_th_device *thdev;</div><div class='ctx'> 	struct resource res[3];</div><div class='ctx'> 	unsigned int req = 0;</div><div class='del'>-	bool is64bit = false;</div><div class='ctx'> 	int r, err;</div><div class='ctx'> </div><div class='ctx'> 	thdev = intel_th_device_alloc(th, subdev-&gt;type, subdev-&gt;name,</div><div class='hunk'>@@ -594,18 +611,12 @@ intel_th_subdevice_alloc(struct intel_th *th,</div><div class='ctx'> </div><div class='ctx'> 	thdev-&gt;drvdata = th-&gt;drvdata;</div><div class='ctx'> </div><div class='del'>-	for (r = 0; r &lt; th-&gt;num_resources; r++)</div><div class='del'>-		if (th-&gt;resource[r].flags &amp; IORESOURCE_MEM_64) {</div><div class='del'>-			is64bit = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 	memcpy(res, subdev-&gt;res,</div><div class='ctx'> 	       sizeof(struct resource) * subdev-&gt;nres);</div><div class='ctx'> </div><div class='ctx'> 	for (r = 0; r &lt; subdev-&gt;nres; r++) {</div><div class='ctx'> 		struct resource *devres = th-&gt;resource;</div><div class='del'>-		int bar = 0; /* cut subdevices' MMIO from resource[0] */</div><div class='add'>+		int bar = TH_MMIO_CONFIG;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Take .end == 0 to mean 'take the whole bar',</div><div class='hunk'>@@ -614,8 +625,9 @@ intel_th_subdevice_alloc(struct intel_th *th,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!res[r].end &amp;&amp; res[r].flags == IORESOURCE_MEM) {</div><div class='ctx'> 			bar = res[r].start;</div><div class='del'>-			if (is64bit)</div><div class='del'>-				bar *= 2;</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			if (bar &gt;= th-&gt;num_resources)</div><div class='add'>+				goto fail_put_device;</div><div class='ctx'> 			res[r].start = 0;</div><div class='ctx'> 			res[r].end = resource_size(&amp;devres[bar]) - 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -627,7 +639,12 @@ intel_th_subdevice_alloc(struct intel_th *th,</div><div class='ctx'> 			dev_dbg(th-&gt;dev, "%s:%d @ %pR\n",</div><div class='ctx'> 				subdev-&gt;name, r, &amp;res[r]);</div><div class='ctx'> 		} else if (res[r].flags &amp; IORESOURCE_IRQ) {</div><div class='del'>-			res[r].start	= th-&gt;irq;</div><div class='add'>+			/*</div><div class='add'>+			 * Only pass on the IRQ if we have useful interrupts:</div><div class='add'>+			 * the ones that can be configured via MINTCTL.</div><div class='add'>+			 */</div><div class='add'>+			if (INTEL_TH_CAP(th, has_mintctl) &amp;&amp; th-&gt;irq != -1)</div><div class='add'>+				res[r].start = th-&gt;irq;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -758,8 +775,13 @@ static int intel_th_populate(struct intel_th *th)</div><div class='ctx'> </div><div class='ctx'> 		thdev = intel_th_subdevice_alloc(th, subdev);</div><div class='ctx'> 		/* note: caller should free subdevices from th::thdev[] */</div><div class='del'>-		if (IS_ERR(thdev))</div><div class='add'>+		if (IS_ERR(thdev)) {</div><div class='add'>+			/* ENODEV for individual subdevices is allowed */</div><div class='add'>+			if (PTR_ERR(thdev) == -ENODEV)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			return PTR_ERR(thdev);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		th-&gt;thdev[th-&gt;num_thdevs++] = thdev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -809,26 +831,40 @@ static const struct file_operations intel_th_output_fops = {</div><div class='ctx'> 	.llseek	= noop_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static irqreturn_t intel_th_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct intel_th *th = data;</div><div class='add'>+	irqreturn_t ret = IRQ_NONE;</div><div class='add'>+	struct intel_th_driver *d;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; th-&gt;num_thdevs; i++) {</div><div class='add'>+		if (th-&gt;thdev[i]-&gt;type != INTEL_TH_OUTPUT)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		d = to_intel_th_driver(th-&gt;thdev[i]-&gt;dev.driver);</div><div class='add'>+		if (d &amp;&amp; d-&gt;irq)</div><div class='add'>+			ret |= d-&gt;irq(th-&gt;thdev[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == IRQ_NONE)</div><div class='add'>+		pr_warn_ratelimited("nobody cared for irq\n");</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'>  * intel_th_alloc() - allocate a new Intel TH device and its subdevices</div><div class='ctx'>  * @dev:	parent device</div><div class='del'>- * @devres:	parent's resources</div><div class='del'>- * @ndevres:	number of resources</div><div class='add'>+ * @devres:	resources indexed by th_mmio_idx</div><div class='ctx'>  * @irq:	irq number</div><div class='ctx'>  */</div><div class='ctx'> struct intel_th *</div><div class='ctx'> intel_th_alloc(struct device *dev, struct intel_th_drvdata *drvdata,</div><div class='del'>-	       struct resource *devres, unsigned int ndevres, int irq)</div><div class='add'>+	       struct resource *devres, unsigned int ndevres)</div><div class='ctx'> {</div><div class='add'>+	int err, r, nr_mmios = 0;</div><div class='ctx'> 	struct intel_th *th;</div><div class='del'>-	int err, r;</div><div class='del'>-</div><div class='del'>-	if (irq == -1)</div><div class='del'>-		for (r = 0; r &lt; ndevres; r++)</div><div class='del'>-			if (devres[r].flags &amp; IORESOURCE_IRQ) {</div><div class='del'>-				irq = devres[r].start;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='ctx'> 	th = kzalloc(sizeof(*th), GFP_KERNEL);</div><div class='ctx'> 	if (!th)</div><div class='hunk'>@@ -846,12 +882,32 @@ intel_th_alloc(struct device *dev, struct intel_th_drvdata *drvdata,</div><div class='ctx'> 		err = th-&gt;major;</div><div class='ctx'> 		goto err_ida;</div><div class='ctx'> 	}</div><div class='add'>+	th-&gt;irq = -1;</div><div class='ctx'> 	th-&gt;dev = dev;</div><div class='ctx'> 	th-&gt;drvdata = drvdata;</div><div class='ctx'> </div><div class='del'>-	th-&gt;resource = devres;</div><div class='del'>-	th-&gt;num_resources = ndevres;</div><div class='del'>-	th-&gt;irq = irq;</div><div class='add'>+	for (r = 0; r &lt; ndevres; r++)</div><div class='add'>+		switch (devres[r].flags &amp; IORESOURCE_TYPE_BITS) {</div><div class='add'>+		case IORESOURCE_MEM:</div><div class='add'>+			th-&gt;resource[nr_mmios++] = devres[r];</div><div class='add'>+			break;</div><div class='add'>+		case IORESOURCE_IRQ:</div><div class='add'>+			err = devm_request_irq(dev, devres[r].start,</div><div class='add'>+					       intel_th_irq, IRQF_SHARED,</div><div class='add'>+					       dev_name(dev), th);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_chrdev;</div><div class='add'>+</div><div class='add'>+			if (th-&gt;irq == -1)</div><div class='add'>+				th-&gt;irq = devres[r].start;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_warn(dev, "Unknown resource type %lx\n",</div><div class='add'>+				 devres[r].flags);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	th-&gt;num_resources = nr_mmios;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, th);</div><div class='ctx'> </div><div class='hunk'>@@ -868,6 +924,10 @@ intel_th_alloc(struct device *dev, struct intel_th_drvdata *drvdata,</div><div class='ctx'> </div><div class='ctx'> 	return th;</div><div class='ctx'> </div><div class='add'>+err_chrdev:</div><div class='add'>+	__unregister_chrdev(th-&gt;major, 0, TH_POSSIBLE_OUTPUTS,</div><div class='add'>+			    "intel_th/output");</div><div class='add'>+</div><div class='ctx'> err_ida:</div><div class='ctx'> 	ida_simple_remove(&amp;intel_th_ida, th-&gt;id);</div><div class='ctx'> </div><div class='hunk'>@@ -928,6 +988,27 @@ int intel_th_trace_enable(struct intel_th_device *thdev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(intel_th_trace_enable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * intel_th_trace_switch() - execute a switch sequence</div><div class='add'>+ * @thdev:	output device that requests tracing switch</div><div class='add'>+ */</div><div class='add'>+int intel_th_trace_switch(struct intel_th_device *thdev)</div><div class='add'>+{</div><div class='add'>+	struct intel_th_device *hub = to_intel_th_device(thdev-&gt;dev.parent);</div><div class='add'>+	struct intel_th_driver *hubdrv = to_intel_th_driver(hub-&gt;dev.driver);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(hub-&gt;type != INTEL_TH_SWITCH))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(thdev-&gt;type != INTEL_TH_OUTPUT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hubdrv-&gt;trig_switch(hub, &amp;thdev-&gt;output);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_th_trace_switch);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * intel_th_trace_disable() - disable tracing for an output device</div><div class='ctx'>  * @thdev:	output device that requests tracing be disabled</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c<br/>index edc52d75e6bd..fa9d34af87ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/gth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/gth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/gth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/gth.c</a></div><div class='hunk'>@@ -308,6 +308,11 @@ static int intel_th_gth_reset(struct gth_device *gth)</div><div class='ctx'> 	iowrite32(0, gth-&gt;base + REG_GTH_SCR);</div><div class='ctx'> 	iowrite32(0xfc, gth-&gt;base + REG_GTH_SCR2);</div><div class='ctx'> </div><div class='add'>+	/* setup CTS for single trigger */</div><div class='add'>+	iowrite32(CTS_EVENT_ENABLE_IF_ANYTHING, gth-&gt;base + REG_CTS_C0S0_EN);</div><div class='add'>+	iowrite32(CTS_ACTION_CONTROL_SET_STATE(CTS_STATE_IDLE) |</div><div class='add'>+		  CTS_ACTION_CONTROL_TRIGGER, gth-&gt;base + REG_CTS_C0S0_ACT);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -457,6 +462,68 @@ static int intel_th_output_attributes(struct gth_device *gth)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * intel_th_gth_stop() - stop tracing to an output device</div><div class='add'>+ * @gth:		GTH device</div><div class='add'>+ * @output:		output device's descriptor</div><div class='add'>+ * @capture_done:	set when no more traces will be captured</div><div class='add'>+ *</div><div class='add'>+ * This will stop tracing using force storeEn off signal and wait for the</div><div class='add'>+ * pipelines to be empty for the corresponding output port.</div><div class='add'>+ */</div><div class='add'>+static void intel_th_gth_stop(struct gth_device *gth,</div><div class='add'>+			      struct intel_th_output *output,</div><div class='add'>+			      bool capture_done)</div><div class='add'>+{</div><div class='add'>+	struct intel_th_device *outdev =</div><div class='add'>+		container_of(output, struct intel_th_device, output);</div><div class='add'>+	struct intel_th_driver *outdrv =</div><div class='add'>+		to_intel_th_driver(outdev-&gt;dev.driver);</div><div class='add'>+	unsigned long count;</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 scr2 = 0xfc | (capture_done ? 1 : 0);</div><div class='add'>+</div><div class='add'>+	iowrite32(0, gth-&gt;base + REG_GTH_SCR);</div><div class='add'>+	iowrite32(scr2, gth-&gt;base + REG_GTH_SCR2);</div><div class='add'>+</div><div class='add'>+	/* wait on pipeline empty for the given port */</div><div class='add'>+	for (reg = 0, count = GTH_PLE_WAITLOOP_DEPTH;</div><div class='add'>+	     count &amp;&amp; !(reg &amp; BIT(output-&gt;port)); count--) {</div><div class='add'>+		reg = ioread32(gth-&gt;base + REG_GTH_STAT);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		dev_dbg(gth-&gt;dev, "timeout waiting for GTH[%d] PLE\n",</div><div class='add'>+			output-&gt;port);</div><div class='add'>+</div><div class='add'>+	/* wait on output piepline empty */</div><div class='add'>+	if (outdrv-&gt;wait_empty)</div><div class='add'>+		outdrv-&gt;wait_empty(outdev);</div><div class='add'>+</div><div class='add'>+	/* clear force capture done for next captures */</div><div class='add'>+	iowrite32(0xfc, gth-&gt;base + REG_GTH_SCR2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * intel_th_gth_start() - start tracing to an output device</div><div class='add'>+ * @gth:	GTH device</div><div class='add'>+ * @output:	output device's descriptor</div><div class='add'>+ *</div><div class='add'>+ * This will start tracing using force storeEn signal.</div><div class='add'>+ */</div><div class='add'>+static void intel_th_gth_start(struct gth_device *gth,</div><div class='add'>+			       struct intel_th_output *output)</div><div class='add'>+{</div><div class='add'>+	u32 scr = 0xfc0000;</div><div class='add'>+</div><div class='add'>+	if (output-&gt;multiblock)</div><div class='add'>+		scr |= 0xff;</div><div class='add'>+</div><div class='add'>+	iowrite32(scr, gth-&gt;base + REG_GTH_SCR);</div><div class='add'>+	iowrite32(0, gth-&gt;base + REG_GTH_SCR2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * intel_th_gth_disable() - disable tracing to an output device</div><div class='ctx'>  * @thdev:	GTH device</div><div class='ctx'>  * @output:	output device's descriptor</div><div class='hunk'>@@ -469,7 +536,6 @@ static void intel_th_gth_disable(struct intel_th_device *thdev,</div><div class='ctx'> 				 struct intel_th_output *output)</div><div class='ctx'> {</div><div class='ctx'> 	struct gth_device *gth = dev_get_drvdata(&amp;thdev-&gt;dev);</div><div class='del'>-	unsigned long count;</div><div class='ctx'> 	int master;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='hunk'>@@ -482,22 +548,7 @@ static void intel_th_gth_disable(struct intel_th_device *thdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;gth-&gt;gth_lock);</div><div class='ctx'> </div><div class='del'>-	iowrite32(0, gth-&gt;base + REG_GTH_SCR);</div><div class='del'>-	iowrite32(0xfd, gth-&gt;base + REG_GTH_SCR2);</div><div class='del'>-</div><div class='del'>-	/* wait on pipeline empty for the given port */</div><div class='del'>-	for (reg = 0, count = GTH_PLE_WAITLOOP_DEPTH;</div><div class='del'>-	     count &amp;&amp; !(reg &amp; BIT(output-&gt;port)); count--) {</div><div class='del'>-		reg = ioread32(gth-&gt;base + REG_GTH_STAT);</div><div class='del'>-		cpu_relax();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* clear force capture done for next captures */</div><div class='del'>-	iowrite32(0xfc, gth-&gt;base + REG_GTH_SCR2);</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		dev_dbg(&amp;thdev-&gt;dev, "timeout waiting for GTH[%d] PLE\n",</div><div class='del'>-			output-&gt;port);</div><div class='add'>+	intel_th_gth_stop(gth, output, true);</div><div class='ctx'> </div><div class='ctx'> 	reg = ioread32(gth-&gt;base + REG_GTH_SCRPD0);</div><div class='ctx'> 	reg &amp;= ~output-&gt;scratchpad;</div><div class='hunk'>@@ -526,8 +577,8 @@ static void intel_th_gth_enable(struct intel_th_device *thdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gth_device *gth = dev_get_drvdata(&amp;thdev-&gt;dev);</div><div class='ctx'> 	struct intel_th *th = to_intel_th(thdev);</div><div class='del'>-	u32 scr = 0xfc0000, scrpd;</div><div class='ctx'> 	int master;</div><div class='add'>+	u32 scrpd;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gth-&gt;gth_lock);</div><div class='ctx'> 	for_each_set_bit(master, gth-&gt;output[output-&gt;port].master,</div><div class='hunk'>@@ -535,9 +586,6 @@ static void intel_th_gth_enable(struct intel_th_device *thdev,</div><div class='ctx'> 		gth_master_set(gth, master, output-&gt;port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (output-&gt;multiblock)</div><div class='del'>-		scr |= 0xff;</div><div class='del'>-</div><div class='ctx'> 	output-&gt;active = true;</div><div class='ctx'> 	spin_unlock(&amp;gth-&gt;gth_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -548,8 +596,38 @@ static void intel_th_gth_enable(struct intel_th_device *thdev,</div><div class='ctx'> 	scrpd |= output-&gt;scratchpad;</div><div class='ctx'> 	iowrite32(scrpd, gth-&gt;base + REG_GTH_SCRPD0);</div><div class='ctx'> </div><div class='del'>-	iowrite32(scr, gth-&gt;base + REG_GTH_SCR);</div><div class='del'>-	iowrite32(0, gth-&gt;base + REG_GTH_SCR2);</div><div class='add'>+	intel_th_gth_start(gth, output);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * intel_th_gth_switch() - execute a switch sequence</div><div class='add'>+ * @thdev:	GTH device</div><div class='add'>+ * @output:	output device's descriptor</div><div class='add'>+ *</div><div class='add'>+ * This will execute a switch sequence that will trigger a switch window</div><div class='add'>+ * when tracing to MSC in multi-block mode.</div><div class='add'>+ */</div><div class='add'>+static void intel_th_gth_switch(struct intel_th_device *thdev,</div><div class='add'>+				struct intel_th_output *output)</div><div class='add'>+{</div><div class='add'>+	struct gth_device *gth = dev_get_drvdata(&amp;thdev-&gt;dev);</div><div class='add'>+	unsigned long count;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* trigger */</div><div class='add'>+	iowrite32(0, gth-&gt;base + REG_CTS_CTL);</div><div class='add'>+	iowrite32(CTS_CTL_SEQUENCER_ENABLE, gth-&gt;base + REG_CTS_CTL);</div><div class='add'>+	/* wait on trigger status */</div><div class='add'>+	for (reg = 0, count = CTS_TRIG_WAITLOOP_DEPTH;</div><div class='add'>+	     count &amp;&amp; !(reg &amp; BIT(4)); count--) {</div><div class='add'>+		reg = ioread32(gth-&gt;base + REG_CTS_STAT);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+	if (!count)</div><div class='add'>+		dev_dbg(&amp;thdev-&gt;dev, "timeout waiting for CTS Trigger\n");</div><div class='add'>+</div><div class='add'>+	intel_th_gth_stop(gth, output, false);</div><div class='add'>+	intel_th_gth_start(gth, output);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -735,6 +813,7 @@ static struct intel_th_driver intel_th_gth_driver = {</div><div class='ctx'> 	.unassign	= intel_th_gth_unassign,</div><div class='ctx'> 	.set_output	= intel_th_gth_set_output,</div><div class='ctx'> 	.enable		= intel_th_gth_enable,</div><div class='add'>+	.trig_switch	= intel_th_gth_switch,</div><div class='ctx'> 	.disable	= intel_th_gth_disable,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "gth",</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/gth.h b/drivers/hwtracing/intel_th/gth.h<br/>index 6f2b0b930875..bfcc0fd01177 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/gth.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/gth.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/gth.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/gth.h</a></div><div class='hunk'>@@ -49,6 +49,12 @@ enum {</div><div class='ctx'> 	REG_GTH_SCRPD3		= 0xec, /* ScratchPad[3] */</div><div class='ctx'> 	REG_TSCU_TSUCTRL	= 0x2000, /* TSCU control register */</div><div class='ctx'> 	REG_TSCU_TSCUSTAT	= 0x2004, /* TSCU status register */</div><div class='add'>+</div><div class='add'>+	/* Common Capture Sequencer (CTS) registers */</div><div class='add'>+	REG_CTS_C0S0_EN		= 0x30c0, /* clause_event_enable_c0s0 */</div><div class='add'>+	REG_CTS_C0S0_ACT	= 0x3180, /* clause_action_control_c0s0 */</div><div class='add'>+	REG_CTS_STAT		= 0x32a0, /* cts_status */</div><div class='add'>+	REG_CTS_CTL		= 0x32a4, /* cts_control */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* waiting for Pipeline Empty bit(s) to assert for GTH */</div><div class='hunk'>@@ -57,4 +63,17 @@ enum {</div><div class='ctx'> #define TSUCTRL_CTCRESYNC	BIT(0)</div><div class='ctx'> #define TSCUSTAT_CTCSYNCING	BIT(1)</div><div class='ctx'> </div><div class='add'>+/* waiting for Trigger status to assert for CTS */</div><div class='add'>+#define CTS_TRIG_WAITLOOP_DEPTH	10000</div><div class='add'>+</div><div class='add'>+#define CTS_EVENT_ENABLE_IF_ANYTHING	BIT(31)</div><div class='add'>+#define CTS_ACTION_CONTROL_STATE_OFF	27</div><div class='add'>+#define CTS_ACTION_CONTROL_SET_STATE(x)	\</div><div class='add'>+	(((x) &amp; 0x1f) &lt;&lt; CTS_ACTION_CONTROL_STATE_OFF)</div><div class='add'>+#define CTS_ACTION_CONTROL_TRIGGER	BIT(4)</div><div class='add'>+</div><div class='add'>+#define CTS_STATE_IDLE			0x10u</div><div class='add'>+</div><div class='add'>+#define CTS_CTL_SEQUENCER_ENABLE	BIT(0)</div><div class='add'>+</div><div class='ctx'> #endif /* __INTEL_TH_GTH_H__ */</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h<br/>index 780206dc9012..0df480072b6c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/intel_th.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/intel_th.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/intel_th.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/intel_th.h</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> #ifndef __INTEL_TH_H__</div><div class='ctx'> #define __INTEL_TH_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/irqreturn.h&gt;</div><div class='add'>+</div><div class='ctx'> /* intel_th_device device types */</div><div class='ctx'> enum {</div><div class='ctx'> 	/* Devices that generate trace data */</div><div class='hunk'>@@ -18,6 +20,8 @@ enum {</div><div class='ctx'> 	INTEL_TH_SWITCH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct intel_th_device;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct intel_th_output - descriptor INTEL_TH_OUTPUT type devices</div><div class='ctx'>  * @port:	output port number, assigned by the switch</div><div class='hunk'>@@ -25,6 +29,7 @@ enum {</div><div class='ctx'>  * @scratchpad:	scratchpad bits to flag when this output is enabled</div><div class='ctx'>  * @multiblock:	true for multiblock output configuration</div><div class='ctx'>  * @active:	true when this output is enabled</div><div class='add'>+ * @wait_empty:	wait for device pipeline to be empty</div><div class='ctx'>  *</div><div class='ctx'>  * Output port descriptor, used by switch driver to tell which output</div><div class='ctx'>  * port this output device corresponds to. Filled in at output device's</div><div class='hunk'>@@ -42,10 +47,12 @@ struct intel_th_output {</div><div class='ctx'> /**</div><div class='ctx'>  * struct intel_th_drvdata - describes hardware capabilities and quirks</div><div class='ctx'>  * @tscu_enable:	device needs SW to enable time stamping unit</div><div class='add'>+ * @has_mintctl:	device has interrupt control (MINTCTL) register</div><div class='ctx'>  * @host_mode_only:	device can only operate in 'host debugger' mode</div><div class='ctx'>  */</div><div class='ctx'> struct intel_th_drvdata {</div><div class='ctx'> 	unsigned int	tscu_enable        : 1,</div><div class='add'>+			has_mintctl        : 1,</div><div class='ctx'> 			host_mode_only     : 1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -157,10 +164,13 @@ struct intel_th_driver {</div><div class='ctx'> 					    struct intel_th_device *othdev);</div><div class='ctx'> 	void			(*enable)(struct intel_th_device *thdev,</div><div class='ctx'> 					  struct intel_th_output *output);</div><div class='add'>+	void			(*trig_switch)(struct intel_th_device *thdev,</div><div class='add'>+					       struct intel_th_output *output);</div><div class='ctx'> 	void			(*disable)(struct intel_th_device *thdev,</div><div class='ctx'> 					   struct intel_th_output *output);</div><div class='ctx'> 	/* output ops */</div><div class='del'>-	void			(*irq)(struct intel_th_device *thdev);</div><div class='add'>+	irqreturn_t		(*irq)(struct intel_th_device *thdev);</div><div class='add'>+	void			(*wait_empty)(struct intel_th_device *thdev);</div><div class='ctx'> 	int			(*activate)(struct intel_th_device *thdev);</div><div class='ctx'> 	void			(*deactivate)(struct intel_th_device *thdev);</div><div class='ctx'> 	/* file_operations for those who want a device node */</div><div class='hunk'>@@ -213,21 +223,23 @@ static inline struct intel_th *to_intel_th(struct intel_th_device *thdev)</div><div class='ctx'> </div><div class='ctx'> struct intel_th *</div><div class='ctx'> intel_th_alloc(struct device *dev, struct intel_th_drvdata *drvdata,</div><div class='del'>-	       struct resource *devres, unsigned int ndevres, int irq);</div><div class='add'>+	       struct resource *devres, unsigned int ndevres);</div><div class='ctx'> void intel_th_free(struct intel_th *th);</div><div class='ctx'> </div><div class='ctx'> int intel_th_driver_register(struct intel_th_driver *thdrv);</div><div class='ctx'> void intel_th_driver_unregister(struct intel_th_driver *thdrv);</div><div class='ctx'> </div><div class='ctx'> int intel_th_trace_enable(struct intel_th_device *thdev);</div><div class='add'>+int intel_th_trace_switch(struct intel_th_device *thdev);</div><div class='ctx'> int intel_th_trace_disable(struct intel_th_device *thdev);</div><div class='ctx'> int intel_th_set_output(struct intel_th_device *thdev,</div><div class='ctx'> 			unsigned int master);</div><div class='ctx'> int intel_th_output_enable(struct intel_th *th, unsigned int otype);</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+enum th_mmio_idx {</div><div class='ctx'> 	TH_MMIO_CONFIG = 0,</div><div class='del'>-	TH_MMIO_SW = 2,</div><div class='add'>+	TH_MMIO_SW = 1,</div><div class='add'>+	TH_MMIO_RTIT = 2,</div><div class='ctx'> 	TH_MMIO_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +249,9 @@ enum {</div><div class='ctx'> #define TH_CONFIGURABLE_MASTERS 256</div><div class='ctx'> #define TH_MSC_MAX		2</div><div class='ctx'> </div><div class='add'>+/* Maximum IRQ vectors */</div><div class='add'>+#define TH_NVEC_MAX		8</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct intel_th - Intel TH controller</div><div class='ctx'>  * @dev:	driver core's device</div><div class='hunk'>@@ -244,7 +259,7 @@ enum {</div><div class='ctx'>  * @hub:	"switch" subdevice (GTH)</div><div class='ctx'>  * @resource:	resources of the entire controller</div><div class='ctx'>  * @num_thdevs:	number of devices in the @thdev array</div><div class='del'>- * @num_resources:	number or resources in the @resource array</div><div class='add'>+ * @num_resources:	number of resources in the @resource array</div><div class='ctx'>  * @irq:	irq number</div><div class='ctx'>  * @id:		this Intel TH controller's device ID in the system</div><div class='ctx'>  * @major:	device node major for output devices</div><div class='hunk'>@@ -256,7 +271,7 @@ struct intel_th {</div><div class='ctx'> 	struct intel_th_device	*hub;</div><div class='ctx'> 	struct intel_th_drvdata	*drvdata;</div><div class='ctx'> </div><div class='del'>-	struct resource		*resource;</div><div class='add'>+	struct resource		resource[TH_MMIO_END];</div><div class='ctx'> 	int			(*activate)(struct intel_th *);</div><div class='ctx'> 	void			(*deactivate)(struct intel_th *);</div><div class='ctx'> 	unsigned int		num_thdevs;</div><div class='hunk'>@@ -296,6 +311,9 @@ enum {</div><div class='ctx'> 	REG_TSCU_OFFSET		= 0x2000,</div><div class='ctx'> 	REG_TSCU_LENGTH		= 0x1000,</div><div class='ctx'> </div><div class='add'>+	REG_CTS_OFFSET		= 0x3000,</div><div class='add'>+	REG_CTS_LENGTH		= 0x1000,</div><div class='add'>+</div><div class='ctx'> 	/* Software Trace Hub (STH) [0x4000..0x4fff] */</div><div class='ctx'> 	REG_STH_OFFSET		= 0x4000,</div><div class='ctx'> 	REG_STH_LENGTH		= 0x2000,</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c<br/>index ba7aaf421f36..81bb54fa3ce8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/msu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/msu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/msu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/msu.c</a></div><div class='hunk'>@@ -29,28 +29,18 @@</div><div class='ctx'> #define msc_dev(x) (&amp;(x)-&gt;thdev-&gt;dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct msc_block - multiblock mode block descriptor</div><div class='del'>- * @bdesc:	pointer to hardware descriptor (beginning of the block)</div><div class='del'>- * @addr:	physical address of the block</div><div class='del'>- */</div><div class='del'>-struct msc_block {</div><div class='del'>-	struct msc_block_desc	*bdesc;</div><div class='del'>-	dma_addr_t		addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct msc_window - multiblock mode window descriptor</div><div class='ctx'>  * @entry:	window list linkage (msc::win_list)</div><div class='ctx'>  * @pgoff:	page offset into the buffer that this window starts at</div><div class='ctx'>  * @nr_blocks:	number of blocks (pages) in this window</div><div class='del'>- * @block:	array of block descriptors</div><div class='add'>+ * @sgt:	array of block descriptors</div><div class='ctx'>  */</div><div class='ctx'> struct msc_window {</div><div class='ctx'> 	struct list_head	entry;</div><div class='ctx'> 	unsigned long		pgoff;</div><div class='ctx'> 	unsigned int		nr_blocks;</div><div class='ctx'> 	struct msc		*msc;</div><div class='del'>-	struct msc_block	block[0];</div><div class='add'>+	struct sg_table		sgt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -84,6 +74,8 @@ struct msc_iter {</div><div class='ctx'>  * @reg_base:		register window base address</div><div class='ctx'>  * @thdev:		intel_th_device pointer</div><div class='ctx'>  * @win_list:		list of windows in multiblock mode</div><div class='add'>+ * @single_sgt:		single mode buffer</div><div class='add'>+ * @cur_win:		current window</div><div class='ctx'>  * @nr_pages:		total number of pages allocated for this buffer</div><div class='ctx'>  * @single_sz:		amount of data in single mode</div><div class='ctx'>  * @single_wrap:	single mode wrap occurred</div><div class='hunk'>@@ -101,9 +93,12 @@ struct msc_iter {</div><div class='ctx'>  */</div><div class='ctx'> struct msc {</div><div class='ctx'> 	void __iomem		*reg_base;</div><div class='add'>+	void __iomem		*msu_base;</div><div class='ctx'> 	struct intel_th_device	*thdev;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	win_list;</div><div class='add'>+	struct sg_table		single_sgt;</div><div class='add'>+	struct msc_window	*cur_win;</div><div class='ctx'> 	unsigned long		nr_pages;</div><div class='ctx'> 	unsigned long		single_sz;</div><div class='ctx'> 	unsigned int		single_wrap : 1;</div><div class='hunk'>@@ -120,7 +115,8 @@ struct msc {</div><div class='ctx'> </div><div class='ctx'> 	/* config */</div><div class='ctx'> 	unsigned int		enabled : 1,</div><div class='del'>-				wrap	: 1;</div><div class='add'>+				wrap	: 1,</div><div class='add'>+				do_irq	: 1;</div><div class='ctx'> 	unsigned int		mode;</div><div class='ctx'> 	unsigned int		burst_len;</div><div class='ctx'> 	unsigned int		index;</div><div class='hunk'>@@ -139,6 +135,49 @@ static inline bool msc_block_is_empty(struct msc_block_desc *bdesc)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct msc_block_desc *</div><div class='add'>+msc_win_block(struct msc_window *win, unsigned int block)</div><div class='add'>+{</div><div class='add'>+	return sg_virt(&amp;win-&gt;sgt.sgl[block]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t</div><div class='add'>+msc_win_baddr(struct msc_window *win, unsigned int block)</div><div class='add'>+{</div><div class='add'>+	return sg_dma_address(&amp;win-&gt;sgt.sgl[block]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+msc_win_bpfn(struct msc_window *win, unsigned int block)</div><div class='add'>+{</div><div class='add'>+	return msc_win_baddr(win, block) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * msc_is_last_win() - check if a window is the last one for a given MSC</div><div class='add'>+ * @win:	window</div><div class='add'>+ * Return:	true if @win is the last window in MSC's multiblock buffer</div><div class='add'>+ */</div><div class='add'>+static inline bool msc_is_last_win(struct msc_window *win)</div><div class='add'>+{</div><div class='add'>+	return win-&gt;entry.next == &amp;win-&gt;msc-&gt;win_list;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * msc_next_window() - return next window in the multiblock buffer</div><div class='add'>+ * @win:	current window</div><div class='add'>+ *</div><div class='add'>+ * Return:	window following the current one</div><div class='add'>+ */</div><div class='add'>+static struct msc_window *msc_next_window(struct msc_window *win)</div><div class='add'>+{</div><div class='add'>+	if (msc_is_last_win(win))</div><div class='add'>+		return list_first_entry(&amp;win-&gt;msc-&gt;win_list, struct msc_window,</div><div class='add'>+					entry);</div><div class='add'>+</div><div class='add'>+	return list_next_entry(win, entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * msc_oldest_window() - locate the window with oldest data</div><div class='ctx'>  * @msc:	MSC device</div><div class='hunk'>@@ -150,9 +189,7 @@ static inline bool msc_block_is_empty(struct msc_block_desc *bdesc)</div><div class='ctx'>  */</div><div class='ctx'> static struct msc_window *msc_oldest_window(struct msc *msc)</div><div class='ctx'> {</div><div class='del'>-	struct msc_window *win;</div><div class='del'>-	u32 reg = ioread32(msc-&gt;reg_base + REG_MSU_MSC0NWSA);</div><div class='del'>-	unsigned long win_addr = (unsigned long)reg &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	struct msc_window *win, *next = msc_next_window(msc-&gt;cur_win);</div><div class='ctx'> 	unsigned int found = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;msc-&gt;win_list))</div><div class='hunk'>@@ -164,18 +201,18 @@ static struct msc_window *msc_oldest_window(struct msc *msc)</div><div class='ctx'> 	 * something like 2, in which case we're good</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(win, &amp;msc-&gt;win_list, entry) {</div><div class='del'>-		if (win-&gt;block[0].addr == win_addr)</div><div class='add'>+		if (win == next)</div><div class='ctx'> 			found++;</div><div class='ctx'> </div><div class='ctx'> 		/* skip the empty ones */</div><div class='del'>-		if (msc_block_is_empty(win-&gt;block[0].bdesc))</div><div class='add'>+		if (msc_block_is_empty(msc_win_block(win, 0)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (found)</div><div class='ctx'> 			return win;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return list_entry(msc-&gt;win_list.next, struct msc_window, entry);</div><div class='add'>+	return list_first_entry(&amp;msc-&gt;win_list, struct msc_window, entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -187,7 +224,7 @@ static struct msc_window *msc_oldest_window(struct msc *msc)</div><div class='ctx'> static unsigned int msc_win_oldest_block(struct msc_window *win)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int blk;</div><div class='del'>-	struct msc_block_desc *bdesc = win-&gt;block[0].bdesc;</div><div class='add'>+	struct msc_block_desc *bdesc = msc_win_block(win, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* without wrapping, first block is the oldest */</div><div class='ctx'> 	if (!msc_block_wrapped(bdesc))</div><div class='hunk'>@@ -198,7 +235,7 @@ static unsigned int msc_win_oldest_block(struct msc_window *win)</div><div class='ctx'> 	 * oldest data for this window.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (blk = 0; blk &lt; win-&gt;nr_blocks; blk++) {</div><div class='del'>-		bdesc = win-&gt;block[blk].bdesc;</div><div class='add'>+		bdesc = msc_win_block(win, blk);</div><div class='ctx'> </div><div class='ctx'> 		if (msc_block_last_written(bdesc))</div><div class='ctx'> 			return blk;</div><div class='hunk'>@@ -207,34 +244,9 @@ static unsigned int msc_win_oldest_block(struct msc_window *win)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * msc_is_last_win() - check if a window is the last one for a given MSC</div><div class='del'>- * @win:	window</div><div class='del'>- * Return:	true if @win is the last window in MSC's multiblock buffer</div><div class='del'>- */</div><div class='del'>-static inline bool msc_is_last_win(struct msc_window *win)</div><div class='del'>-{</div><div class='del'>-	return win-&gt;entry.next == &amp;win-&gt;msc-&gt;win_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * msc_next_window() - return next window in the multiblock buffer</div><div class='del'>- * @win:	current window</div><div class='del'>- *</div><div class='del'>- * Return:	window following the current one</div><div class='del'>- */</div><div class='del'>-static struct msc_window *msc_next_window(struct msc_window *win)</div><div class='del'>-{</div><div class='del'>-	if (msc_is_last_win(win))</div><div class='del'>-		return list_entry(win-&gt;msc-&gt;win_list.next, struct msc_window,</div><div class='del'>-				  entry);</div><div class='del'>-</div><div class='del'>-	return list_entry(win-&gt;entry.next, struct msc_window, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct msc_block_desc *msc_iter_bdesc(struct msc_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	return iter-&gt;win-&gt;block[iter-&gt;block].bdesc;</div><div class='add'>+	return msc_win_block(iter-&gt;win, iter-&gt;block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void msc_iter_init(struct msc_iter *iter)</div><div class='hunk'>@@ -467,13 +479,47 @@ static void msc_buffer_clear_hw_header(struct msc *msc)</div><div class='ctx'> 			offsetof(struct msc_block_desc, hw_tag);</div><div class='ctx'> </div><div class='ctx'> 		for (blk = 0; blk &lt; win-&gt;nr_blocks; blk++) {</div><div class='del'>-			struct msc_block_desc *bdesc = win-&gt;block[blk].bdesc;</div><div class='add'>+			struct msc_block_desc *bdesc = msc_win_block(win, blk);</div><div class='ctx'> </div><div class='ctx'> 			memset(&amp;bdesc-&gt;hw_tag, 0, hw_sz);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int intel_th_msu_init(struct msc *msc)</div><div class='add'>+{</div><div class='add'>+	u32 mintctl, msusts;</div><div class='add'>+</div><div class='add'>+	if (!msc-&gt;do_irq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mintctl = ioread32(msc-&gt;msu_base + REG_MSU_MINTCTL);</div><div class='add'>+	mintctl |= msc-&gt;index ? M1BLIE : M0BLIE;</div><div class='add'>+	iowrite32(mintctl, msc-&gt;msu_base + REG_MSU_MINTCTL);</div><div class='add'>+	if (mintctl != ioread32(msc-&gt;msu_base + REG_MSU_MINTCTL)) {</div><div class='add'>+		dev_info(msc_dev(msc), "MINTCTL ignores writes: no usable interrupts\n");</div><div class='add'>+		msc-&gt;do_irq = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msusts = ioread32(msc-&gt;msu_base + REG_MSU_MSUSTS);</div><div class='add'>+	iowrite32(msusts, msc-&gt;msu_base + REG_MSU_MSUSTS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_th_msu_deinit(struct msc *msc)</div><div class='add'>+{</div><div class='add'>+	u32 mintctl;</div><div class='add'>+</div><div class='add'>+	if (!msc-&gt;do_irq)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mintctl = ioread32(msc-&gt;msu_base + REG_MSU_MINTCTL);</div><div class='add'>+	mintctl &amp;= msc-&gt;index ? ~M1BLIE : ~M0BLIE;</div><div class='add'>+	iowrite32(mintctl, msc-&gt;msu_base + REG_MSU_MINTCTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * msc_configure() - set up MSC hardware</div><div class='ctx'>  * @msc:	the MSC device to configure</div><div class='hunk'>@@ -531,23 +577,14 @@ static int msc_configure(struct msc *msc)</div><div class='ctx'>  */</div><div class='ctx'> static void msc_disable(struct msc *msc)</div><div class='ctx'> {</div><div class='del'>-	unsigned long count;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;msc-&gt;buf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	intel_th_trace_disable(msc-&gt;thdev);</div><div class='ctx'> </div><div class='del'>-	for (reg = 0, count = MSC_PLE_WAITLOOP_DEPTH;</div><div class='del'>-	     count &amp;&amp; !(reg &amp; MSCSTS_PLE); count--) {</div><div class='del'>-		reg = ioread32(msc-&gt;reg_base + REG_MSU_MSC0STS);</div><div class='del'>-		cpu_relax();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		dev_dbg(msc_dev(msc), "timeout waiting for MSC0 PLE\n");</div><div class='del'>-</div><div class='ctx'> 	if (msc-&gt;mode == MSC_MODE_SINGLE) {</div><div class='add'>+		reg = ioread32(msc-&gt;reg_base + REG_MSU_MSC0STS);</div><div class='ctx'> 		msc-&gt;single_wrap = !!(reg &amp; MSCSTS_WRAPSTAT);</div><div class='ctx'> </div><div class='ctx'> 		reg = ioread32(msc-&gt;reg_base + REG_MSU_MSC0MWP);</div><div class='hunk'>@@ -617,22 +654,45 @@ static void intel_th_msc_deactivate(struct intel_th_device *thdev)</div><div class='ctx'>  */</div><div class='ctx'> static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size)</div><div class='ctx'> {</div><div class='add'>+	unsigned long nr_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned int order = get_order(size);</div><div class='ctx'> 	struct page *page;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ret = sg_alloc_table(&amp;msc-&gt;single_sgt, 1, GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='ctx'> 	page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);</div><div class='ctx'> 	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		goto err_free_sgt;</div><div class='ctx'> </div><div class='ctx'> 	split_page(page, order);</div><div class='del'>-	msc-&gt;nr_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	sg_set_buf(msc-&gt;single_sgt.sgl, page_address(page), size);</div><div class='add'>+</div><div class='add'>+	ret = dma_map_sg(msc_dev(msc)-&gt;parent-&gt;parent, msc-&gt;single_sgt.sgl, 1,</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_pages;</div><div class='add'>+</div><div class='add'>+	msc-&gt;nr_pages = nr_pages;</div><div class='ctx'> 	msc-&gt;base = page_address(page);</div><div class='del'>-	msc-&gt;base_addr = page_to_phys(page);</div><div class='add'>+	msc-&gt;base_addr = sg_dma_address(msc-&gt;single_sgt.sgl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_free_pages:</div><div class='add'>+	__free_pages(page, order);</div><div class='add'>+</div><div class='add'>+err_free_sgt:</div><div class='add'>+	sg_free_table(&amp;msc-&gt;single_sgt);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -643,6 +703,10 @@ static void msc_buffer_contig_free(struct msc *msc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long off;</div><div class='ctx'> </div><div class='add'>+	dma_unmap_sg(msc_dev(msc)-&gt;parent-&gt;parent, msc-&gt;single_sgt.sgl,</div><div class='add'>+		     1, DMA_FROM_DEVICE);</div><div class='add'>+	sg_free_table(&amp;msc-&gt;single_sgt);</div><div class='add'>+</div><div class='ctx'> 	for (off = 0; off &lt; msc-&gt;nr_pages &lt;&lt; PAGE_SHIFT; off += PAGE_SIZE) {</div><div class='ctx'> 		struct page *page = virt_to_page(msc-&gt;base + off);</div><div class='ctx'> </div><div class='hunk'>@@ -669,6 +733,40 @@ static struct page *msc_buffer_contig_get_page(struct msc *msc,</div><div class='ctx'> 	return virt_to_page(msc-&gt;base + (pgoff &lt;&lt; PAGE_SHIFT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __msc_buffer_win_alloc(struct msc_window *win,</div><div class='add'>+				  unsigned int nr_blocks)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg_ptr;</div><div class='add'>+	void *block;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = sg_alloc_table(&amp;win-&gt;sgt, nr_blocks, GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for_each_sg(win-&gt;sgt.sgl, sg_ptr, nr_blocks, i) {</div><div class='add'>+		block = dma_alloc_coherent(msc_dev(win-&gt;msc)-&gt;parent-&gt;parent,</div><div class='add'>+					  PAGE_SIZE, &amp;sg_dma_address(sg_ptr),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+		if (!block)</div><div class='add'>+			goto err_nomem;</div><div class='add'>+</div><div class='add'>+		sg_set_buf(sg_ptr, block, PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nr_blocks;</div><div class='add'>+</div><div class='add'>+err_nomem:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		dma_free_coherent(msc_dev(win-&gt;msc)-&gt;parent-&gt;parent, PAGE_SIZE,</div><div class='add'>+				  msc_win_block(win, i),</div><div class='add'>+				  msc_win_baddr(win, i));</div><div class='add'>+</div><div class='add'>+	sg_free_table(&amp;win-&gt;sgt);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * msc_buffer_win_alloc() - alloc a window for a multiblock mode</div><div class='ctx'>  * @msc:	MSC device</div><div class='hunk'>@@ -682,44 +780,49 @@ static struct page *msc_buffer_contig_get_page(struct msc *msc,</div><div class='ctx'> static int msc_buffer_win_alloc(struct msc *msc, unsigned int nr_blocks)</div><div class='ctx'> {</div><div class='ctx'> 	struct msc_window *win;</div><div class='del'>-	unsigned long size = PAGE_SIZE;</div><div class='del'>-	int i, ret = -ENOMEM;</div><div class='add'>+	int ret = -ENOMEM, i;</div><div class='ctx'> </div><div class='ctx'> 	if (!nr_blocks)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	win = kzalloc(offsetof(struct msc_window, block[nr_blocks]),</div><div class='del'>-		      GFP_KERNEL);</div><div class='add'>+	/*</div><div class='add'>+	 * This limitation hold as long as we need random access to the</div><div class='add'>+	 * block. When that changes, this can go away.</div><div class='add'>+	 */</div><div class='add'>+	if (nr_blocks &gt; SG_MAX_SINGLE_ALLOC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	win = kzalloc(sizeof(*win), GFP_KERNEL);</div><div class='ctx'> 	if (!win)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	win-&gt;msc = msc;</div><div class='add'>+</div><div class='ctx'> 	if (!list_empty(&amp;msc-&gt;win_list)) {</div><div class='del'>-		struct msc_window *prev = list_entry(msc-&gt;win_list.prev,</div><div class='del'>-						     struct msc_window, entry);</div><div class='add'>+		struct msc_window *prev = list_last_entry(&amp;msc-&gt;win_list,</div><div class='add'>+							  struct msc_window,</div><div class='add'>+							  entry);</div><div class='ctx'> </div><div class='add'>+		/* This works as long as blocks are page-sized */</div><div class='ctx'> 		win-&gt;pgoff = prev-&gt;pgoff + prev-&gt;nr_blocks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_blocks; i++) {</div><div class='del'>-		win-&gt;block[i].bdesc =</div><div class='del'>-			dma_alloc_coherent(msc_dev(msc)-&gt;parent-&gt;parent, size,</div><div class='del'>-					   &amp;win-&gt;block[i].addr, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (!win-&gt;block[i].bdesc)</div><div class='del'>-			goto err_nomem;</div><div class='add'>+	ret = __msc_buffer_win_alloc(win, nr_blocks);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_nomem;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86</div><div class='add'>+	for (i = 0; i &lt; ret; i++)</div><div class='ctx'> 		/* Set the page as uncached */</div><div class='del'>-		set_memory_uc((unsigned long)win-&gt;block[i].bdesc, 1);</div><div class='add'>+		set_memory_uc((unsigned long)msc_win_block(win, i), 1);</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	win-&gt;msc = msc;</div><div class='del'>-	win-&gt;nr_blocks = nr_blocks;</div><div class='add'>+	win-&gt;nr_blocks = ret;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;msc-&gt;win_list)) {</div><div class='del'>-		msc-&gt;base = win-&gt;block[0].bdesc;</div><div class='del'>-		msc-&gt;base_addr = win-&gt;block[0].addr;</div><div class='add'>+		msc-&gt;base = msc_win_block(win, 0);</div><div class='add'>+		msc-&gt;base_addr = msc_win_baddr(win, 0);</div><div class='add'>+		msc-&gt;cur_win = win;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;win-&gt;entry, &amp;msc-&gt;win_list);</div><div class='hunk'>@@ -728,19 +831,25 @@ static int msc_buffer_win_alloc(struct msc *msc, unsigned int nr_blocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_nomem:</div><div class='del'>-	for (i--; i &gt;= 0; i--) {</div><div class='del'>-#ifdef CONFIG_X86</div><div class='del'>-		/* Reset the page to write-back before releasing */</div><div class='del'>-		set_memory_wb((unsigned long)win-&gt;block[i].bdesc, 1);</div><div class='del'>-#endif</div><div class='del'>-		dma_free_coherent(msc_dev(msc)-&gt;parent-&gt;parent, size,</div><div class='del'>-				  win-&gt;block[i].bdesc, win-&gt;block[i].addr);</div><div class='del'>-	}</div><div class='ctx'> 	kfree(win);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __msc_buffer_win_free(struct msc *msc, struct msc_window *win)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; win-&gt;nr_blocks; i++) {</div><div class='add'>+		struct page *page = sg_page(&amp;win-&gt;sgt.sgl[i]);</div><div class='add'>+</div><div class='add'>+		page-&gt;mapping = NULL;</div><div class='add'>+		dma_free_coherent(msc_dev(win-&gt;msc)-&gt;parent-&gt;parent, PAGE_SIZE,</div><div class='add'>+				  msc_win_block(win, i), msc_win_baddr(win, i));</div><div class='add'>+	}</div><div class='add'>+	sg_free_table(&amp;win-&gt;sgt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * msc_buffer_win_free() - free a window from MSC's window list</div><div class='ctx'>  * @msc:	MSC device</div><div class='hunk'>@@ -761,17 +870,13 @@ static void msc_buffer_win_free(struct msc *msc, struct msc_window *win)</div><div class='ctx'> 		msc-&gt;base_addr = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; win-&gt;nr_blocks; i++) {</div><div class='del'>-		struct page *page = virt_to_page(win-&gt;block[i].bdesc);</div><div class='del'>-</div><div class='del'>-		page-&gt;mapping = NULL;</div><div class='ctx'> #ifdef CONFIG_X86</div><div class='del'>-		/* Reset the page to write-back before releasing */</div><div class='del'>-		set_memory_wb((unsigned long)win-&gt;block[i].bdesc, 1);</div><div class='add'>+	for (i = 0; i &lt; win-&gt;nr_blocks; i++)</div><div class='add'>+		/* Reset the page to write-back */</div><div class='add'>+		set_memory_wb((unsigned long)msc_win_block(win, i), 1);</div><div class='ctx'> #endif</div><div class='del'>-		dma_free_coherent(msc_dev(win-&gt;msc)-&gt;parent-&gt;parent, PAGE_SIZE,</div><div class='del'>-				  win-&gt;block[i].bdesc, win-&gt;block[i].addr);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	__msc_buffer_win_free(msc, win);</div><div class='ctx'> </div><div class='ctx'> 	kfree(win);</div><div class='ctx'> }</div><div class='hunk'>@@ -798,19 +903,18 @@ static void msc_buffer_relink(struct msc *msc)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (msc_is_last_win(win)) {</div><div class='ctx'> 			sw_tag |= MSC_SW_TAG_LASTWIN;</div><div class='del'>-			next_win = list_entry(msc-&gt;win_list.next,</div><div class='del'>-					      struct msc_window, entry);</div><div class='add'>+			next_win = list_first_entry(&amp;msc-&gt;win_list,</div><div class='add'>+						    struct msc_window, entry);</div><div class='ctx'> 		} else {</div><div class='del'>-			next_win = list_entry(win-&gt;entry.next,</div><div class='del'>-					      struct msc_window, entry);</div><div class='add'>+			next_win = list_next_entry(win, entry);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (blk = 0; blk &lt; win-&gt;nr_blocks; blk++) {</div><div class='del'>-			struct msc_block_desc *bdesc = win-&gt;block[blk].bdesc;</div><div class='add'>+			struct msc_block_desc *bdesc = msc_win_block(win, blk);</div><div class='ctx'> </div><div class='ctx'> 			memset(bdesc, 0, sizeof(*bdesc));</div><div class='ctx'> </div><div class='del'>-			bdesc-&gt;next_win = next_win-&gt;block[0].addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			bdesc-&gt;next_win = msc_win_bpfn(next_win, 0);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Similarly to last window, last block should point</div><div class='hunk'>@@ -818,11 +922,9 @@ static void msc_buffer_relink(struct msc *msc)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (blk == win-&gt;nr_blocks - 1) {</div><div class='ctx'> 				sw_tag |= MSC_SW_TAG_LASTBLK;</div><div class='del'>-				bdesc-&gt;next_blk =</div><div class='del'>-					win-&gt;block[0].addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+				bdesc-&gt;next_blk = msc_win_bpfn(win, 0);</div><div class='ctx'> 			} else {</div><div class='del'>-				bdesc-&gt;next_blk =</div><div class='del'>-					win-&gt;block[blk + 1].addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+				bdesc-&gt;next_blk = msc_win_bpfn(win, blk + 1);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			bdesc-&gt;sw_tag = sw_tag;</div><div class='hunk'>@@ -997,7 +1099,7 @@ static struct page *msc_buffer_get_page(struct msc *msc, unsigned long pgoff)</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='ctx'> 	pgoff -= win-&gt;pgoff;</div><div class='del'>-	return virt_to_page(win-&gt;block[pgoff].bdesc);</div><div class='add'>+	return sg_page(&amp;win-&gt;sgt.sgl[pgoff]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1250,6 +1352,22 @@ static const struct file_operations intel_th_msc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void intel_th_msc_wait_empty(struct intel_th_device *thdev)</div><div class='add'>+{</div><div class='add'>+	struct msc *msc = dev_get_drvdata(&amp;thdev-&gt;dev);</div><div class='add'>+	unsigned long count;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	for (reg = 0, count = MSC_PLE_WAITLOOP_DEPTH;</div><div class='add'>+	     count &amp;&amp; !(reg &amp; MSCSTS_PLE); count--) {</div><div class='add'>+		reg = __raw_readl(msc-&gt;reg_base + REG_MSU_MSC0STS);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		dev_dbg(msc_dev(msc), "timeout waiting for MSC0 PLE\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int intel_th_msc_init(struct msc *msc)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_set(&amp;msc-&gt;user_count, -1);</div><div class='hunk'>@@ -1266,6 +1384,39 @@ static int intel_th_msc_init(struct msc *msc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void msc_win_switch(struct msc *msc)</div><div class='add'>+{</div><div class='add'>+	struct msc_window *last, *first;</div><div class='add'>+</div><div class='add'>+	first = list_first_entry(&amp;msc-&gt;win_list, struct msc_window, entry);</div><div class='add'>+	last = list_last_entry(&amp;msc-&gt;win_list, struct msc_window, entry);</div><div class='add'>+</div><div class='add'>+	if (msc_is_last_win(msc-&gt;cur_win))</div><div class='add'>+		msc-&gt;cur_win = first;</div><div class='add'>+	else</div><div class='add'>+		msc-&gt;cur_win = list_next_entry(msc-&gt;cur_win, entry);</div><div class='add'>+</div><div class='add'>+	msc-&gt;base = msc_win_block(msc-&gt;cur_win, 0);</div><div class='add'>+	msc-&gt;base_addr = msc_win_baddr(msc-&gt;cur_win, 0);</div><div class='add'>+</div><div class='add'>+	intel_th_trace_switch(msc-&gt;thdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t intel_th_msc_interrupt(struct intel_th_device *thdev)</div><div class='add'>+{</div><div class='add'>+	struct msc *msc = dev_get_drvdata(&amp;thdev-&gt;dev);</div><div class='add'>+	u32 msusts = ioread32(msc-&gt;msu_base + REG_MSU_MSUSTS);</div><div class='add'>+	u32 mask = msc-&gt;index ? MSUSTS_MSC1BLAST : MSUSTS_MSC0BLAST;</div><div class='add'>+</div><div class='add'>+	if (!(msusts &amp; mask)) {</div><div class='add'>+		if (msc-&gt;enabled)</div><div class='add'>+			return IRQ_HANDLED;</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 const char * const msc_mode[] = {</div><div class='ctx'> 	[MSC_MODE_SINGLE]	= "single",</div><div class='ctx'> 	[MSC_MODE_MULTI]	= "multi",</div><div class='hunk'>@@ -1440,10 +1591,38 @@ free_win:</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RW(nr_pages);</div><div class='ctx'> </div><div class='add'>+static ssize_t</div><div class='add'>+win_switch_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		 const char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct msc *msc = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (val != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;msc-&gt;buf_mutex);</div><div class='add'>+	if (msc-&gt;mode != MSC_MODE_MULTI)</div><div class='add'>+		ret = -ENOTSUPP;</div><div class='add'>+	else</div><div class='add'>+		msc_win_switch(msc);</div><div class='add'>+	mutex_unlock(&amp;msc-&gt;buf_mutex);</div><div class='add'>+</div><div class='add'>+	return ret ? ret : size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_WO(win_switch);</div><div class='add'>+</div><div class='ctx'> static struct attribute *msc_output_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_wrap.attr,</div><div class='ctx'> 	&amp;dev_attr_mode.attr,</div><div class='ctx'> 	&amp;dev_attr_nr_pages.attr,</div><div class='add'>+	&amp;dev_attr_win_switch.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1471,10 +1650,19 @@ static int intel_th_msc_probe(struct intel_th_device *thdev)</div><div class='ctx'> 	if (!msc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	res = intel_th_device_get_resource(thdev, IORESOURCE_IRQ, 1);</div><div class='add'>+	if (!res)</div><div class='add'>+		msc-&gt;do_irq = 1;</div><div class='add'>+</div><div class='ctx'> 	msc-&gt;index = thdev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	msc-&gt;thdev = thdev;</div><div class='ctx'> 	msc-&gt;reg_base = base + msc-&gt;index * 0x100;</div><div class='add'>+	msc-&gt;msu_base = base;</div><div class='add'>+</div><div class='add'>+	err = intel_th_msu_init(msc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = intel_th_msc_init(msc);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1491,6 +1679,7 @@ static void intel_th_msc_remove(struct intel_th_device *thdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	intel_th_msc_deactivate(thdev);</div><div class='add'>+	intel_th_msu_deinit(msc);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Buffers should not be used at this point except if the</div><div class='hunk'>@@ -1504,6 +1693,8 @@ static void intel_th_msc_remove(struct intel_th_device *thdev)</div><div class='ctx'> static struct intel_th_driver intel_th_msc_driver = {</div><div class='ctx'> 	.probe	= intel_th_msc_probe,</div><div class='ctx'> 	.remove	= intel_th_msc_remove,</div><div class='add'>+	.irq		= intel_th_msc_interrupt,</div><div class='add'>+	.wait_empty	= intel_th_msc_wait_empty,</div><div class='ctx'> 	.activate	= intel_th_msc_activate,</div><div class='ctx'> 	.deactivate	= intel_th_msc_deactivate,</div><div class='ctx'> 	.fops	= &amp;intel_th_msc_fops,</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/msu.h b/drivers/hwtracing/intel_th/msu.h<br/>index 9cc8aced6116..574c16004cb2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/msu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/msu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/msu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/msu.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> enum {</div><div class='ctx'> 	REG_MSU_MSUPARAMS	= 0x0000,</div><div class='ctx'> 	REG_MSU_MSUSTS		= 0x0008,</div><div class='add'>+	REG_MSU_MINTCTL		= 0x0004, /* MSU-global interrupt control */</div><div class='ctx'> 	REG_MSU_MSC0CTL		= 0x0100, /* MSC0 control */</div><div class='ctx'> 	REG_MSU_MSC0STS		= 0x0104, /* MSC0 status */</div><div class='ctx'> 	REG_MSU_MSC0BAR		= 0x0108, /* MSC0 output base address */</div><div class='hunk'>@@ -28,6 +29,8 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /* MSUSTS bits */</div><div class='ctx'> #define MSUSTS_MSU_INT	BIT(0)</div><div class='add'>+#define MSUSTS_MSC0BLAST	BIT(16)</div><div class='add'>+#define MSUSTS_MSC1BLAST	BIT(24)</div><div class='ctx'> </div><div class='ctx'> /* MSCnCTL bits */</div><div class='ctx'> #define MSC_EN		BIT(0)</div><div class='hunk'>@@ -36,6 +39,11 @@ enum {</div><div class='ctx'> #define MSC_MODE	(BIT(4) | BIT(5))</div><div class='ctx'> #define MSC_LEN		(BIT(8) | BIT(9) | BIT(10))</div><div class='ctx'> </div><div class='add'>+/* MINTCTL bits */</div><div class='add'>+#define MICDE		BIT(0)</div><div class='add'>+#define M0BLIE		BIT(16)</div><div class='add'>+#define M1BLIE		BIT(24)</div><div class='add'>+</div><div class='ctx'> /* MSC operating modes (MSC_MODE) */</div><div class='ctx'> enum {</div><div class='ctx'> 	MSC_MODE_SINGLE	= 0,</div><div class='hunk'>@@ -87,7 +95,7 @@ static inline unsigned long msc_data_sz(struct msc_block_desc *bdesc)</div><div class='ctx'> </div><div class='ctx'> static inline bool msc_block_wrapped(struct msc_block_desc *bdesc)</div><div class='ctx'> {</div><div class='del'>-	if (bdesc-&gt;hw_tag &amp; MSC_HW_TAG_BLOCKWRAP)</div><div class='add'>+	if (bdesc-&gt;hw_tag &amp; (MSC_HW_TAG_BLOCKWRAP | MSC_HW_TAG_WINWRAP))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='head'>diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c<br/>index 1cf6290d6435..f1228708f2a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/intel_th/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/intel_th/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/intel_th/pci.c</a></div><div class='hunk'>@@ -17,7 +17,13 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "intel_th_pci"</div><div class='ctx'> </div><div class='del'>-#define BAR_MASK (BIT(TH_MMIO_CONFIG) | BIT(TH_MMIO_SW))</div><div class='add'>+enum {</div><div class='add'>+	TH_PCI_CONFIG_BAR	= 0,</div><div class='add'>+	TH_PCI_STH_SW_BAR	= 2,</div><div class='add'>+	TH_PCI_RTIT_BAR		= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BAR_MASK (BIT(TH_PCI_CONFIG_BAR) | BIT(TH_PCI_STH_SW_BAR))</div><div class='ctx'> </div><div class='ctx'> #define PCI_REG_NPKDSC	0x80</div><div class='ctx'> #define NPKDSC_TSACT	BIT(5)</div><div class='hunk'>@@ -66,8 +72,12 @@ static int intel_th_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			      const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel_th_drvdata *drvdata = (void *)id-&gt;driver_data;</div><div class='add'>+	struct resource resource[TH_MMIO_END + TH_NVEC_MAX] = {</div><div class='add'>+		[TH_MMIO_CONFIG]	= pdev-&gt;resource[TH_PCI_CONFIG_BAR],</div><div class='add'>+		[TH_MMIO_SW]		= pdev-&gt;resource[TH_PCI_STH_SW_BAR],</div><div class='add'>+	};</div><div class='add'>+	int err, r = TH_MMIO_SW + 1, i;</div><div class='ctx'> 	struct intel_th *th;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = pcim_enable_device(pdev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -77,8 +87,19 @@ static int intel_th_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	th = intel_th_alloc(&amp;pdev-&gt;dev, drvdata, pdev-&gt;resource,</div><div class='del'>-			    DEVICE_COUNT_RESOURCE, pdev-&gt;irq);</div><div class='add'>+	if (pdev-&gt;resource[TH_PCI_RTIT_BAR].start) {</div><div class='add'>+		resource[TH_MMIO_RTIT] = pdev-&gt;resource[TH_PCI_RTIT_BAR];</div><div class='add'>+		r++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_alloc_irq_vectors(pdev, 1, 8, PCI_IRQ_ALL_TYPES);</div><div class='add'>+	if (err &gt; 0)</div><div class='add'>+		for (i = 0; i &lt; err; i++, r++) {</div><div class='add'>+			resource[r].flags = IORESOURCE_IRQ;</div><div class='add'>+			resource[r].start = pci_irq_vector(pdev, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	th = intel_th_alloc(&amp;pdev-&gt;dev, drvdata, resource, r);</div><div class='ctx'> 	if (IS_ERR(th))</div><div class='ctx'> 		return PTR_ERR(th);</div><div class='ctx'> </div><div class='hunk'>@@ -95,10 +116,13 @@ static void intel_th_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct intel_th *th = pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	intel_th_free(th);</div><div class='add'>+</div><div class='add'>+	pci_free_irq_vectors(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct intel_th_drvdata intel_th_2x = {</div><div class='ctx'> 	.tscu_enable	= 1,</div><div class='add'>+	.has_mintctl	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id intel_th_pci_id_table[] = {</div><div class='hunk'>@@ -165,6 +189,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6),</div><div class='ctx'> 		.driver_data = (kernel_ulong_t)&amp;intel_th_2x,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		/* Comet Lake */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x02a6),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;intel_th_2x,</div><div class='add'>+	},</div><div class='ctx'> 	{ 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c<br/>index c7ba8acfd4d5..e55b902560de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/stm/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/hwtracing/stm/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/hwtracing/stm/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/hwtracing/stm/core.c</a></div><div class='hunk'>@@ -166,11 +166,10 @@ stm_master(struct stm_device *stm, unsigned int idx)</div><div class='ctx'> static int stp_master_alloc(struct stm_device *stm, unsigned int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct stp_master *master;</div><div class='del'>-	size_t size;</div><div class='ctx'> </div><div class='del'>-	size = ALIGN(stm-&gt;data-&gt;sw_nchannels, 8) / 8;</div><div class='del'>-	size += sizeof(struct stp_master);</div><div class='del'>-	master = kzalloc(size, GFP_ATOMIC);</div><div class='add'>+	master = kzalloc(struct_size(master, chan_map,</div><div class='add'>+				     BITS_TO_LONGS(stm-&gt;data-&gt;sw_nchannels)),</div><div class='add'>+			 GFP_ATOMIC);</div><div class='ctx'> 	if (!master)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -218,8 +217,8 @@ stm_output_disclaim(struct stm_device *stm, struct stm_output *output)</div><div class='ctx'> 	bitmap_release_region(&amp;master-&gt;chan_map[0], output-&gt;channel,</div><div class='ctx'> 			      ilog2(output-&gt;nr_chans));</div><div class='ctx'> </div><div class='del'>-	output-&gt;nr_chans = 0;</div><div class='ctx'> 	master-&gt;nr_free += output-&gt;nr_chans;</div><div class='add'>+	output-&gt;nr_chans = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig<br/>index f2c681971201..f8979abb9a19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/busses/Kconfig</a></div><div class='hunk'>@@ -131,6 +131,7 @@ config I2C_I801</div><div class='ctx'> 	    Cannon Lake (PCH)</div><div class='ctx'> 	    Cedar Fork (PCH)</div><div class='ctx'> 	    Ice Lake (PCH)</div><div class='add'>+	    Comet Lake (PCH)</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called i2c-i801.</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c<br/>index bb8e3f149979..d464799e40a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-designware-master.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-designware-master.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-designware-master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/busses/i2c-designware-master.c</a></div><div class='hunk'>@@ -426,8 +426,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_get_sync(dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;suspended) {</div><div class='del'>-		dev_err(dev-&gt;dev, "Error %s call while suspended\n", __func__);</div><div class='add'>+	if (dev_WARN_ONCE(dev-&gt;dev, dev-&gt;suspended, "Transfer while suspended\n")) {</div><div class='ctx'> 		ret = -ESHUTDOWN;</div><div class='ctx'> 		goto done_nolock;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c<br/>index c91e145ef5a5..679c6c41f64b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-i801.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-i801.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-i801.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/busses/i2c-i801.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@</div><div class='ctx'>  * Cannon Lake-LP (PCH)		0x9da3	32	hard	yes	yes	yes</div><div class='ctx'>  * Cedar Fork (PCH)		0x18df	32	hard	yes	yes	yes</div><div class='ctx'>  * Ice Lake-LP (PCH)		0x34a3	32	hard	yes	yes	yes</div><div class='add'>+ * Comet Lake (PCH)		0x02a3	32	hard	yes	yes	yes</div><div class='ctx'>  *</div><div class='ctx'>  * Features supported by this driver:</div><div class='ctx'>  * Software PEC				no</div><div class='hunk'>@@ -240,6 +241,7 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS	0xa223</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS	0xa2a3</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS		0xa323</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS		0x02a3</div><div class='ctx'> </div><div class='ctx'> struct i801_mux_config {</div><div class='ctx'> 	char *gpio_chip;</div><div class='hunk'>@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1534,6 +1537,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_DNV_SMBUS:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS:</div><div class='ctx'> 		priv-&gt;features |= FEATURE_I2C_BLOCK_READ;</div><div class='ctx'> 		priv-&gt;features |= FEATURE_IRQ;</div><div class='ctx'> 		priv-&gt;features |= FEATURE_SMBUS_PEC;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c<br/>index 42fed40198a0..fd70b110e8f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-imx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-imx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/busses/i2c-imx.c</a></div><div class='hunk'>@@ -515,9 +515,9 @@ static int i2c_imx_clk_notifier_call(struct notifier_block *nb,</div><div class='ctx'> 				     unsigned long action, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_notifier_data *ndata = data;</div><div class='del'>-	struct imx_i2c_struct *i2c_imx = container_of(&amp;ndata-&gt;clk,</div><div class='add'>+	struct imx_i2c_struct *i2c_imx = container_of(nb,</div><div class='ctx'> 						      struct imx_i2c_struct,</div><div class='del'>-						      clk);</div><div class='add'>+						      clk_change_nb);</div><div class='ctx'> </div><div class='ctx'> 	if (action &amp; POST_RATE_CHANGE)</div><div class='ctx'> 		i2c_imx_set_clk(i2c_imx, ndata-&gt;new_rate);</div><div class='hunk'>@@ -1169,11 +1169,13 @@ static int i2c_imx_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Init DMA config if supported */</div><div class='ctx'> 	ret = i2c_imx_dma_request(i2c_imx, phy_addr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto clk_notifier_unregister;</div><div class='add'>+		goto del_adapter;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;i2c_imx-&gt;adapter.dev, "IMX I2C adapter registered\n");</div><div class='ctx'> 	return 0;   /* Return OK */</div><div class='ctx'> </div><div class='add'>+del_adapter:</div><div class='add'>+	i2c_del_adapter(&amp;i2c_imx-&gt;adapter);</div><div class='ctx'> clk_notifier_unregister:</div><div class='ctx'> 	clk_notifier_unregister(i2c_imx-&gt;clk, &amp;i2c_imx-&gt;clk_change_nb);</div><div class='ctx'> rpm_disable:</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c<br/>index 4e67d5ed480e..1c8f708f212b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-nvidia-gpu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-nvidia-gpu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-nvidia-gpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/busses/i2c-nvidia-gpu.c</a></div><div class='hunk'>@@ -253,6 +253,12 @@ static const struct pci_device_id gpu_i2c_ids[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, gpu_i2c_ids);</div><div class='ctx'> </div><div class='add'>+static const struct property_entry ccgx_props[] = {</div><div class='add'>+	/* Use FW built for NVIDIA (nv) only */</div><div class='add'>+	PROPERTY_ENTRY_U16("ccgx,firmware-build", ('n' &lt;&lt; 8) | 'v'),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *ccgx_client;</div><div class='hunk'>@@ -267,6 +273,7 @@ static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq)</div><div class='ctx'> 		sizeof(i2cd-&gt;gpu_ccgx_ucsi-&gt;type));</div><div class='ctx'> 	i2cd-&gt;gpu_ccgx_ucsi-&gt;addr = 0x8;</div><div class='ctx'> 	i2cd-&gt;gpu_ccgx_ucsi-&gt;irq = irq;</div><div class='add'>+	i2cd-&gt;gpu_ccgx_ucsi-&gt;properties = ccgx_props;</div><div class='ctx'> 	ccgx_client = i2c_new_device(&amp;i2cd-&gt;adapter, i2cd-&gt;gpu_ccgx_ucsi);</div><div class='ctx'> 	if (!ccgx_client)</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c<br/>index d18b0941b71a..f14d4b3fab44 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-synquacer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/busses/i2c-synquacer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/busses/i2c-synquacer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/busses/i2c-synquacer.c</a></div><div class='hunk'>@@ -597,6 +597,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 	i2c-&gt;adapter = synquacer_i2c_ops;</div><div class='ctx'> 	i2c_set_adapdata(&amp;i2c-&gt;adapter, i2c);</div><div class='ctx'> 	i2c-&gt;adapter.dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	i2c-&gt;adapter.dev.of_node = pdev-&gt;dev.of_node;</div><div class='add'>+	ACPI_COMPANION_SET(&amp;i2c-&gt;adapter.dev, ACPI_COMPANION(&amp;pdev-&gt;dev));</div><div class='ctx'> 	i2c-&gt;adapter.nr = pdev-&gt;id;</div><div class='ctx'> 	init_completion(&amp;i2c-&gt;completion);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c<br/>index 38af18645133..688aa3b5f3ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/i2c-core-base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i2c/i2c-core-base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i2c/i2c-core-base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i2c/i2c-core-base.c</a></div><div class='hunk'>@@ -185,7 +185,7 @@ static int i2c_generic_bus_free(struct i2c_adapter *adap)</div><div class='ctx'> int i2c_generic_scl_recovery(struct i2c_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_bus_recovery_info *bri = adap-&gt;bus_recovery_info;</div><div class='del'>-	int i = 0, scl = 1, ret;</div><div class='add'>+	int i = 0, scl = 1, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (bri-&gt;prepare_recovery)</div><div class='ctx'> 		bri-&gt;prepare_recovery(adap);</div><div class='hunk'>@@ -327,6 +327,8 @@ static int i2c_device_probe(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		if (client-&gt;flags &amp; I2C_CLIENT_HOST_NOTIFY) {</div><div class='ctx'> 			dev_dbg(dev, "Using Host Notify IRQ\n");</div><div class='add'>+			/* Keep adapter active when Host Notify is required */</div><div class='add'>+			pm_runtime_get_sync(&amp;client-&gt;adapter-&gt;dev);</div><div class='ctx'> 			irq = i2c_smbus_host_notify_to_irq(client);</div><div class='ctx'> 		} else if (dev-&gt;of_node) {</div><div class='ctx'> 			irq = of_irq_get_byname(dev-&gt;of_node, "irq");</div><div class='hunk'>@@ -431,6 +433,8 @@ static int i2c_device_remove(struct device *dev)</div><div class='ctx'> 	device_init_wakeup(&amp;client-&gt;dev, false);</div><div class='ctx'> </div><div class='ctx'> 	client-&gt;irq = client-&gt;init_irq;</div><div class='add'>+	if (client-&gt;flags &amp; I2C_CLIENT_HOST_NOTIFY)</div><div class='add'>+		pm_runtime_put(&amp;client-&gt;adapter-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c<br/>index 2dc628d4f1ae..5f4bd52121fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i3c/master.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i3c/master.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i3c/master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i3c/master.c</a></div><div class='hunk'>@@ -385,8 +385,9 @@ static void i3c_bus_set_addr_slot_status(struct i3c_bus *bus, u16 addr,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ptr = bus-&gt;addrslots + (bitpos / BITS_PER_LONG);</div><div class='del'>-	*ptr &amp;= ~(I3C_ADDR_SLOT_STATUS_MASK &lt;&lt; (bitpos % BITS_PER_LONG));</div><div class='del'>-	*ptr |= status &lt;&lt; (bitpos % BITS_PER_LONG);</div><div class='add'>+	*ptr &amp;= ~((unsigned long)I3C_ADDR_SLOT_STATUS_MASK &lt;&lt;</div><div class='add'>+						(bitpos % BITS_PER_LONG));</div><div class='add'>+	*ptr |= (unsigned long)status &lt;&lt; (bitpos % BITS_PER_LONG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool i3c_bus_dev_addr_is_avail(struct i3c_bus *bus, u8 addr)</div><div class='hunk'>@@ -1980,7 +1981,6 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master,</div><div class='ctx'> {</div><div class='ctx'> 	struct i3c_dev_boardinfo *boardinfo;</div><div class='ctx'> 	struct device *dev = &amp;master-&gt;dev;</div><div class='del'>-	struct i3c_device_info info = { };</div><div class='ctx'> 	enum i3c_addr_slot_status addrstatus;</div><div class='ctx'> 	u32 init_dyn_addr = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2012,8 +2012,8 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master,</div><div class='ctx'> </div><div class='ctx'> 	boardinfo-&gt;pid = ((u64)reg[1] &lt;&lt; 32) | reg[2];</div><div class='ctx'> </div><div class='del'>-	if ((info.pid &amp; GENMASK_ULL(63, 48)) ||</div><div class='del'>-	    I3C_PID_RND_LOWER_32BITS(info.pid))</div><div class='add'>+	if ((boardinfo-&gt;pid &amp; GENMASK_ULL(63, 48)) ||</div><div class='add'>+	    I3C_PID_RND_LOWER_32BITS(boardinfo-&gt;pid))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	boardinfo-&gt;init_dyn_addr = init_dyn_addr;</div><div class='head'>diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c<br/>index 59279224e07f..1d83c97431c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i3c/master/dw-i3c-master.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/i3c/master/dw-i3c-master.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/i3c/master/dw-i3c-master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/i3c/master/dw-i3c-master.c</a></div><div class='hunk'>@@ -300,7 +300,7 @@ to_dw_i3c_master(struct i3c_master_controller *master)</div><div class='ctx'> </div><div class='ctx'> static void dw_i3c_master_disable(struct dw_i3c_master *master)</div><div class='ctx'> {</div><div class='del'>-	writel(readl(master-&gt;regs + DEVICE_CTRL) &amp; DEV_CTRL_ENABLE,</div><div class='add'>+	writel(readl(master-&gt;regs + DEVICE_CTRL) &amp; ~DEV_CTRL_ENABLE,</div><div class='ctx'> 	       master-&gt;regs + DEVICE_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -841,11 +841,6 @@ static int dw_i3c_master_priv_xfers(struct i3c_dev_desc *dev,</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; i3c_nxfers; i++) {</div><div class='del'>-		if (i3c_xfers[i].len &gt; COMMAND_PORT_ARG_DATA_LEN_MAX)</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; i3c_nxfers; i++) {</div><div class='ctx'> 		if (i3c_xfers[i].rnw)</div><div class='ctx'> 			nrxwords += DIV_ROUND_UP(i3c_xfers[i].len, 4);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -974,11 +969,6 @@ static int dw_i3c_master_i2c_xfers(struct i2c_dev_desc *dev,</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; i2c_nxfers; i++) {</div><div class='del'>-		if (i2c_xfers[i].len &gt; COMMAND_PORT_ARG_DATA_LEN_MAX)</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; i2c_nxfers; i++) {</div><div class='ctx'> 		if (i2c_xfers[i].flags &amp; I2C_M_RD)</div><div class='ctx'> 			nrxwords += DIV_ROUND_UP(i2c_xfers[i].len, 4);</div><div class='ctx'> 		else</div><div class='head'>diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c<br/>index 1f03884a6808..3b15adc6ce98 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/ide-cd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/ide-cd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/ide-cd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ide/ide-cd.c</a></div><div class='hunk'>@@ -1797,6 +1797,7 @@ static int ide_cd_probe(ide_drive_t *drive)</div><div class='ctx'> 	ide_cd_read_toc(drive);</div><div class='ctx'> 	g-&gt;fops = &amp;idecd_ops;</div><div class='ctx'> 	g-&gt;flags |= GENHD_FL_REMOVABLE | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;</div><div class='add'>+	g-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	device_add_disk(&amp;drive-&gt;gendev, g, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c<br/>index 4a6e1a413ead..46f2df288c6a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/ide-cd_ioctl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/ide-cd_ioctl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/ide-cd_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ide/ide-cd_ioctl.c</a></div><div class='hunk'>@@ -82,8 +82,9 @@ int ide_cdrom_drive_status(struct cdrom_device_info *cdi, int slot_nr)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ide-cd always generates media changed event if media is missing, which</div><div class='del'>- * makes it impossible to use for proper event reporting, so disk-&gt;events</div><div class='del'>- * is cleared to 0 and the following function is used only to trigger</div><div class='add'>+ * makes it impossible to use for proper event reporting, so</div><div class='add'>+ * DISK_EVENT_FLAG_UEVENT is cleared in disk-&gt;event_flags</div><div class='add'>+ * and the following function is used only to trigger</div><div class='ctx'>  * revalidation and never propagated to userland.</div><div class='ctx'>  */</div><div class='ctx'> unsigned int ide_cdrom_check_events_real(struct cdrom_device_info *cdi,</div><div class='head'>diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c<br/>index 04e008e8f6f9..f233b34ea0c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/ide-gd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/ide-gd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/ide-gd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ide/ide-gd.c</a></div><div class='hunk'>@@ -299,8 +299,9 @@ static unsigned int ide_gd_check_events(struct gendisk *disk,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The following is used to force revalidation on the first open on</div><div class='ctx'> 	 * removeable devices, and never gets reported to userland as</div><div class='del'>-	 * genhd-&gt;events is 0.  This is intended as removeable ide disk</div><div class='del'>-	 * can't really detect MEDIA_CHANGE events.</div><div class='add'>+	 * DISK_EVENT_FLAG_UEVENT isn't set in genhd-&gt;event_flags.</div><div class='add'>+	 * This is intended as removable ide disk can't really detect</div><div class='add'>+	 * MEDIA_CHANGE events.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = drive-&gt;dev_flags &amp; IDE_DFLAG_MEDIA_CHANGED;</div><div class='ctx'> 	drive-&gt;dev_flags &amp;= ~IDE_DFLAG_MEDIA_CHANGED;</div><div class='hunk'>@@ -416,6 +417,7 @@ static int ide_gd_probe(ide_drive_t *drive)</div><div class='ctx'> 	if (drive-&gt;dev_flags &amp; IDE_DFLAG_REMOVABLE)</div><div class='ctx'> 		g-&gt;flags = GENHD_FL_REMOVABLE;</div><div class='ctx'> 	g-&gt;fops = &amp;ide_gd_ops;</div><div class='add'>+	g-&gt;events = DISK_EVENT_MEDIA_CHANGE;</div><div class='ctx'> 	device_add_disk(&amp;drive-&gt;gendev, g, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c<br/>index 67d4a7d4acc8..88d132edc4e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/tx4939ide.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ide/tx4939ide.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ide/tx4939ide.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ide/tx4939ide.c</a></div><div class='hunk'>@@ -156,7 +156,6 @@ static u16 tx4939ide_check_error_ints(ide_hwif_t *hwif)</div><div class='ctx'> 		u16 sysctl = tx4939ide_readw(base, TX4939IDE_Sys_Ctl);</div><div class='ctx'> </div><div class='ctx'> 		tx4939ide_writew(sysctl | 0x4000, base, TX4939IDE_Sys_Ctl);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		/* wait 12GBUSCLK (typ. 60ns @ GBUS200MHz, max 270ns) */</div><div class='ctx'> 		ndelay(270);</div><div class='ctx'> 		tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl);</div><div class='hunk'>@@ -396,7 +395,6 @@ static void tx4939ide_init_hwif(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> 	/* Soft Reset */</div><div class='ctx'> 	tx4939ide_writew(0x8000, base, TX4939IDE_Sys_Ctl);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	/* at least 20 GBUSCLK (typ. 100ns @ GBUS200MHz, max 450ns) */</div><div class='ctx'> 	ndelay(450);</div><div class='ctx'> 	tx4939ide_writew(0x0000, base, TX4939IDE_Sys_Ctl);</div><div class='head'>diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig<br/>index d08aeb41cd07..a22cbee593fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> menuconfig IIO</div><div class='ctx'> 	tristate "Industrial I/O support"</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	help</div><div class='ctx'> 	  The industrial I/O subsystem provides a unified framework for</div><div class='ctx'> 	  drivers for many different types of embedded sensors using a</div><div class='hunk'>@@ -39,28 +38,28 @@ config IIO_TRIGGER</div><div class='ctx'> 	  data now' interrupt.</div><div class='ctx'> </div><div class='ctx'> config IIO_CONSUMERS_PER_TRIGGER</div><div class='del'>-       int "Maximum number of consumers per trigger"</div><div class='del'>-       depends on IIO_TRIGGER</div><div class='del'>-       default "2"</div><div class='del'>-       help</div><div class='del'>-	This value controls the maximum number of consumers that a</div><div class='del'>-	given trigger may handle. Default is 2.</div><div class='add'>+	int "Maximum number of consumers per trigger"</div><div class='add'>+	depends on IIO_TRIGGER</div><div class='add'>+	default "2"</div><div class='add'>+	help</div><div class='add'>+	  This value controls the maximum number of consumers that a</div><div class='add'>+	  given trigger may handle. Default is 2.</div><div class='ctx'> </div><div class='ctx'> config IIO_SW_DEVICE</div><div class='ctx'> 	tristate "Enable software IIO device support"</div><div class='ctx'> 	select IIO_CONFIGFS</div><div class='ctx'> 	help</div><div class='del'>-	 Provides IIO core support for software devices. A software</div><div class='del'>-	 device can be created via configfs or directly by a driver</div><div class='del'>-	 using the API provided.</div><div class='add'>+	  Provides IIO core support for software devices. A software</div><div class='add'>+	  device can be created via configfs or directly by a driver</div><div class='add'>+	  using the API provided.</div><div class='ctx'> </div><div class='ctx'> config IIO_SW_TRIGGER</div><div class='ctx'> 	tristate "Enable software triggers support"</div><div class='ctx'> 	select IIO_CONFIGFS</div><div class='ctx'> 	help</div><div class='del'>-	 Provides IIO core support for software triggers. A software</div><div class='del'>-	 trigger can be created via configfs or directly by a driver</div><div class='del'>-	 using the API provided.</div><div class='add'>+	  Provides IIO core support for software triggers. A software</div><div class='add'>+	  trigger can be created via configfs or directly by a driver</div><div class='add'>+	  using the API provided.</div><div class='ctx'> </div><div class='ctx'> config IIO_TRIGGERED_EVENT</div><div class='ctx'> 	tristate</div><div class='hunk'>@@ -74,7 +73,6 @@ source "drivers/iio/afe/Kconfig"</div><div class='ctx'> source "drivers/iio/amplifiers/Kconfig"</div><div class='ctx'> source "drivers/iio/chemical/Kconfig"</div><div class='ctx'> source "drivers/iio/common/Kconfig"</div><div class='del'>-source "drivers/iio/counter/Kconfig"</div><div class='ctx'> source "drivers/iio/dac/Kconfig"</div><div class='ctx'> source "drivers/iio/dummy/Kconfig"</div><div class='ctx'> source "drivers/iio/frequency/Kconfig"</div><div class='head'>diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile<br/>index cb5993251381..bff682ad1cfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/Makefile</a></div><div class='hunk'>@@ -20,7 +20,6 @@ obj-y += amplifiers/</div><div class='ctx'> obj-y += buffer/</div><div class='ctx'> obj-y += chemical/</div><div class='ctx'> obj-y += common/</div><div class='del'>-obj-y += counter/</div><div class='ctx'> obj-y += dac/</div><div class='ctx'> obj-y += dummy/</div><div class='ctx'> obj-y += gyro/</div><div class='head'>diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig<br/>index 898839ca164a..62a970a20219 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/Kconfig</a></div><div class='hunk'>@@ -6,28 +6,28 @@</div><div class='ctx'> menu "Accelerometers"</div><div class='ctx'> </div><div class='ctx'> config ADIS16201</div><div class='del'>-        tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"</div><div class='del'>-        depends on SPI</div><div class='del'>-        select IIO_ADIS_LIB</div><div class='del'>-        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER</div><div class='del'>-        help</div><div class='del'>-          Say Y here to build support for Analog Devices adis16201 dual-axis</div><div class='del'>-          digital inclinometer and accelerometer.</div><div class='add'>+	tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"</div><div class='add'>+	depends on SPI</div><div class='add'>+	select IIO_ADIS_LIB</div><div class='add'>+	select IIO_ADIS_LIB_BUFFER if IIO_BUFFER</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to build support for Analog Devices adis16201 dual-axis</div><div class='add'>+	  digital inclinometer and accelerometer.</div><div class='ctx'> </div><div class='del'>-          To compile this driver as a module, say M here: the module will</div><div class='del'>-          be called adis16201.</div><div class='add'>+	  To compile this driver as a module, say M here: the module will</div><div class='add'>+	  be called adis16201.</div><div class='ctx'> </div><div class='ctx'> config ADIS16209</div><div class='del'>-        tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer"</div><div class='del'>-        depends on SPI</div><div class='del'>-        select IIO_ADIS_LIB</div><div class='del'>-        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER</div><div class='del'>-        help</div><div class='del'>-          Say Y here to build support for Analog Devices adis16209 dual-axis digital inclinometer</div><div class='del'>-          and accelerometer.</div><div class='add'>+	tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer"</div><div class='add'>+	depends on SPI</div><div class='add'>+	select IIO_ADIS_LIB</div><div class='add'>+	select IIO_ADIS_LIB_BUFFER if IIO_BUFFER</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to build support for Analog Devices adis16209 dual-axis digital inclinometer</div><div class='add'>+	  and accelerometer.</div><div class='ctx'> </div><div class='del'>-          To compile this driver as a module, say M here: the module will be</div><div class='del'>-          called adis16209.</div><div class='add'>+	  To compile this driver as a module, say M here: the module will be</div><div class='add'>+	  called adis16209.</div><div class='ctx'> </div><div class='ctx'> config ADXL345</div><div class='ctx'> 	tristate</div><div class='hunk'>@@ -100,16 +100,16 @@ config BMA180</div><div class='ctx'> 	  module will be called bma180.</div><div class='ctx'> </div><div class='ctx'> config BMA220</div><div class='del'>-    tristate "Bosch BMA220 3-Axis Accelerometer Driver"</div><div class='add'>+	tristate "Bosch BMA220 3-Axis Accelerometer Driver"</div><div class='ctx'> 	depends on SPI</div><div class='ctx'> 	select IIO_BUFFER</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='del'>-    help</div><div class='del'>-      Say yes here to add support for the Bosch BMA220 triaxial</div><div class='del'>-      acceleration sensor.</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to add support for the Bosch BMA220 triaxial</div><div class='add'>+	  acceleration sensor.</div><div class='ctx'> </div><div class='del'>-      To compile this driver as a module, choose M here: the</div><div class='del'>-      module will be called bma220_spi.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called bma220_spi.</div><div class='ctx'> </div><div class='ctx'> config BMC150_ACCEL</div><div class='ctx'> 	tristate "Bosch BMC150 Accelerometer Driver"</div><div class='hunk'>@@ -223,7 +223,7 @@ config IIO_ST_ACCEL_3AXIS</div><div class='ctx'> 	  Say yes here to build support for STMicroelectronics accelerometers:</div><div class='ctx'> 	  LSM303DLH, LSM303DLHC, LIS3DH, LSM330D, LSM330DL, LSM330DLC,</div><div class='ctx'> 	  LIS331DLH, LSM303DL, LSM303DLM, LSM330, LIS2DH12, H3LIS331DL,</div><div class='del'>-	  LNG2DM, LIS3DE</div><div class='add'>+	  LNG2DM, LIS3DE, LIS2DE12</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, these modules</div><div class='ctx'> 	  will be created:</div><div class='head'>diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c<br/>index cb9765a3de60..f9720a1e8a7c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/bma180.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/bma180.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/bma180.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/bma180.c</a></div><div class='hunk'>@@ -116,6 +116,7 @@ struct bma180_data {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	struct iio_trigger *trig;</div><div class='ctx'> 	const struct bma180_part_info *part_info;</div><div class='add'>+	struct iio_mount_matrix orientation;</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> 	bool sleep_state;</div><div class='ctx'> 	int scale;</div><div class='hunk'>@@ -561,6 +562,15 @@ static int bma180_set_power_mode(struct iio_dev *indio_dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iio_mount_matrix *</div><div class='add'>+bma180_accel_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='add'>+				const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct bma180_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct iio_enum bma180_power_mode_enum = {</div><div class='ctx'> 	.items = bma180_power_modes,</div><div class='ctx'> 	.num_items = ARRAY_SIZE(bma180_power_modes),</div><div class='hunk'>@@ -571,7 +581,8 @@ static const struct iio_enum bma180_power_mode_enum = {</div><div class='ctx'> static const struct iio_chan_spec_ext_info bma180_ext_info[] = {</div><div class='ctx'> 	IIO_ENUM("power_mode", true, &amp;bma180_power_mode_enum),</div><div class='ctx'> 	IIO_ENUM_AVAILABLE("power_mode", &amp;bma180_power_mode_enum),</div><div class='del'>-	{ },</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bma180_accel_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BMA180_ACC_CHANNEL(_axis, _bits) {				\</div><div class='hunk'>@@ -722,6 +733,11 @@ static int bma180_probe(struct i2c_client *client,</div><div class='ctx'> 		chip = id-&gt;driver_data;</div><div class='ctx'> 	data-&gt;part_info = &amp;bma180_part_info[chip];</div><div class='ctx'> </div><div class='add'>+	ret = iio_read_mount_matrix(&amp;client-&gt;dev, "mount-matrix",</div><div class='add'>+				&amp;data-&gt;orientation);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = data-&gt;part_info-&gt;chip_config(data);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_chip_disable;</div><div class='head'>diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c<br/>index 383c802eb5b8..44d7c49fe2a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/bmc150-accel-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/bmc150-accel-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/bmc150-accel-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/bmc150-accel-core.c</a></div><div class='hunk'>@@ -204,6 +204,7 @@ struct bmc150_accel_data {</div><div class='ctx'> 	int ev_enable_state;</div><div class='ctx'> 	int64_t timestamp, old_timestamp; /* Only used in hw fifo mode. */</div><div class='ctx'> 	const struct bmc150_accel_chip_info *chip_info;</div><div class='add'>+	struct iio_mount_matrix orientation;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='hunk'>@@ -393,7 +394,7 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(dev,</div><div class='del'>-			"Failed: bmc150_accel_set_power_state for %d\n", on);</div><div class='add'>+			"Failed: %s for %d\n", __func__, on);</div><div class='ctx'> 		if (on)</div><div class='ctx'> 			pm_runtime_put_noidle(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -796,6 +797,20 @@ static ssize_t bmc150_accel_get_fifo_state(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iio_mount_matrix *</div><div class='add'>+bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='add'>+				const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct bmc150_accel_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = {</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static IIO_CONST_ATTR(hwfifo_watermark_min, "1");</div><div class='ctx'> static IIO_CONST_ATTR(hwfifo_watermark_max,</div><div class='ctx'> 		      __stringify(BMC150_ACCEL_FIFO_LENGTH));</div><div class='hunk'>@@ -978,6 +993,7 @@ static const struct iio_event_spec bmc150_accel_event = {</div><div class='ctx'> 		.shift = 16 - (bits),					\</div><div class='ctx'> 		.endianness = IIO_LE,					\</div><div class='ctx'> 	},								\</div><div class='add'>+	.ext_info = bmc150_accel_ext_info,				\</div><div class='ctx'> 	.event_spec = &amp;bmc150_accel_event,				\</div><div class='ctx'> 	.num_event_specs = 1						\</div><div class='ctx'> }</div><div class='hunk'>@@ -1555,6 +1571,11 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;regmap = regmap;</div><div class='ctx'> </div><div class='add'>+	ret = iio_read_mount_matrix(dev, "mount-matrix",</div><div class='add'>+				     &amp;data-&gt;orientation);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = bmc150_accel_chip_init(data);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c<br/>index 063e89eff791..46bb2e421bb9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/cros_ec_accel_legacy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/cros_ec_accel_legacy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/cros_ec_accel_legacy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/cros_ec_accel_legacy.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for older Chrome OS EC accelerometer</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2017 Google, Inc</div><div class='ctx'>  *</div><div class='del'>- * This software is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2, as published by the Free Software Foundation, and</div><div class='del'>- * may be copied, distributed, and modified under those terms.</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'>  * This driver uses the memory mapper cros-ec interface to communicate</div><div class='ctx'>  * with the Chrome OS EC about accelerometer data.</div><div class='ctx'>  * Accelerometer access is presented through iio sysfs.</div><div class='hunk'>@@ -29,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/mfd/cros_ec_commands.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"cros-ec-accel-legacy"</div><div class='hunk'>@@ -353,7 +344,7 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);</div><div class='ctx'> 	struct iio_dev *indio_dev;</div><div class='ctx'> 	struct cros_ec_accel_legacy_state *state;</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ec || !ec-&gt;ec_dev) {</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "No EC device found.\n");</div><div class='hunk'>@@ -381,20 +372,17 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * Present the channel using HTML5 standard:</div><div class='ctx'> 	 * need to invert X and Y and invert some lid axis.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = X ; i &lt; MAX_AXIS; i++) {</div><div class='del'>-		switch (i) {</div><div class='del'>-		case X:</div><div class='del'>-			ec_accel_channels[X].scan_index = Y;</div><div class='del'>-		case Y:</div><div class='del'>-			ec_accel_channels[Y].scan_index = X;</div><div class='del'>-		case Z:</div><div class='del'>-			ec_accel_channels[Z].scan_index = Z;</div><div class='del'>-		}</div><div class='del'>-		if (state-&gt;sensor_num == MOTIONSENSE_LOC_LID &amp;&amp; i != Y)</div><div class='del'>-			state-&gt;sign[i] = -1;</div><div class='del'>-		else</div><div class='del'>-			state-&gt;sign[i] = 1;</div><div class='del'>-	}</div><div class='add'>+	ec_accel_channels[X].scan_index = Y;</div><div class='add'>+	ec_accel_channels[Y].scan_index = X;</div><div class='add'>+	ec_accel_channels[Z].scan_index = Z;</div><div class='add'>+</div><div class='add'>+	state-&gt;sign[Y] = 1;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;sensor_num == MOTIONSENSE_LOC_LID)</div><div class='add'>+		state-&gt;sign[X] = state-&gt;sign[Z] = -1;</div><div class='add'>+	else</div><div class='add'>+		state-&gt;sign[X] = state-&gt;sign[Z] = 1;</div><div class='add'>+</div><div class='ctx'> 	indio_dev-&gt;num_channels = ARRAY_SIZE(ec_accel_channels);</div><div class='ctx'> 	indio_dev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 	indio_dev-&gt;info = &amp;cros_ec_accel_legacy_info;</div><div class='hunk'>@@ -419,5 +407,5 @@ module_platform_driver(cros_ec_accel_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("ChromeOS EC legacy accelerometer driver");</div><div class='ctx'> MODULE_AUTHOR("Gwendal Grignou &lt;gwendal@chromium.org&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_ALIAS("platform:" DRV_NAME);</div><div class='head'>diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c<br/>index 7096e577b23f..2922a2e88a1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/kxcjk-1013.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/kxcjk-1013.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/kxcjk-1013.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/kxcjk-1013.c</a></div><div class='hunk'>@@ -451,7 +451,7 @@ static int kxcjk1013_set_power_state(struct kxcjk1013_data *data, bool on)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;data-&gt;client-&gt;dev,</div><div class='del'>-			"Failed: kxcjk1013_set_power_state for %d\n", on);</div><div class='add'>+			"Failed: %s for %d\n", __func__, on);</div><div class='ctx'> 		if (on)</div><div class='ctx'> 			pm_runtime_put_noidle(&amp;data-&gt;client-&gt;dev);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1437,6 +1437,8 @@ static int kxcjk1013_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;mutex);</div><div class='ctx'> 	ret = kxcjk1013_set_mode(data, OPERATION);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = kxcjk1013_set_range(data, data-&gt;range);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1489,6 +1491,7 @@ static const struct acpi_device_id kx_acpi_match[] = {</div><div class='ctx'> 	{"KXCJ1013", KXCJK1013},</div><div class='ctx'> 	{"KXCJ1008", KXCJ91008},</div><div class='ctx'> 	{"KXCJ9000", KXCJ91008},</div><div class='add'>+	{"KIOX0008", KXCJ91008},</div><div class='ctx'> 	{"KIOX0009", KXTJ21009},</div><div class='ctx'> 	{"KIOX000A", KXCJ91008},</div><div class='ctx'> 	{"KIOX010A", KXCJ91008}, /* KXCJ91008 inside the display of a 2-in-1 */</div><div class='hunk'>@@ -1510,10 +1513,20 @@ static const struct i2c_device_id kxcjk1013_id[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, kxcjk1013_id);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id kxcjk1013_of_match[] = {</div><div class='add'>+	{ .compatible = "kionix,kxcjk1013", },</div><div class='add'>+	{ .compatible = "kionix,kxcj91008", },</div><div class='add'>+	{ .compatible = "kionix,kxtj21009", },</div><div class='add'>+	{ .compatible = "kionix,kxtf9", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, kxcjk1013_of_match);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver kxcjk1013_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= KXCJK1013_DRV_NAME,</div><div class='ctx'> 		.acpi_match_table = ACPI_PTR(kx_acpi_match),</div><div class='add'>+		.of_match_table = kxcjk1013_of_match,</div><div class='ctx'> 		.pm	= &amp;kxcjk1013_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= kxcjk1013_probe,</div><div class='head'>diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c<br/>index 0c0df4fce420..70c60db62247 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/kxsd9.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/kxsd9.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/kxsd9.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/kxsd9.c</a></div><div class='hunk'>@@ -420,9 +420,7 @@ int kxsd9_common_probe(struct device *dev,</div><div class='ctx'> 	indio_dev-&gt;available_scan_masks = kxsd9_scan_masks;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the mounting matrix, if present */</div><div class='del'>-	ret = of_iio_read_mount_matrix(dev,</div><div class='del'>-				       "mount-matrix",</div><div class='del'>-				       &amp;st-&gt;orientation);</div><div class='add'>+	ret = iio_read_mount_matrix(dev, "mount-matrix", &amp;st-&gt;orientation);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c<br/>index 302781126bc6..00e100fc845a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/mma8452.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/mma8452.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/mma8452.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/mma8452.c</a></div><div class='hunk'>@@ -1580,7 +1580,7 @@ static int mma8452_probe(struct i2c_client *client,</div><div class='ctx'> 	case FXLS8471_DEVICE_ID:</div><div class='ctx'> 		if (ret == data-&gt;chip_info-&gt;chip_id)</div><div class='ctx'> 			break;</div><div class='del'>-		/* else: fall through */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto disable_regulators;</div><div class='head'>diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h<br/>index fd53258656ca..9d25955af58e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/st_accel.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/st_accel.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/st_accel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/st_accel.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ enum st_accel_type {</div><div class='ctx'> 	LIS3LV02DL,</div><div class='ctx'> 	LIS2DW12,</div><div class='ctx'> 	LIS3DHH,</div><div class='add'>+	LIS2DE12,</div><div class='ctx'> 	ST_ACCEL_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -57,6 +58,7 @@ enum st_accel_type {</div><div class='ctx'> #define LIS2DW12_ACCEL_DEV_NAME		"lis2dw12"</div><div class='ctx'> #define LIS3DHH_ACCEL_DEV_NAME		"lis3dhh"</div><div class='ctx'> #define LIS3DE_ACCEL_DEV_NAME		"lis3de"</div><div class='add'>+#define LIS2DE12_ACCEL_DEV_NAME		"lis2de12"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'> * struct st_sensors_platform_data - default accel platform data</div><div class='head'>diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c<br/>index a3c0916479fa..5ff04d9755d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/st_accel_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/st_accel_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/st_accel_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/st_accel_core.c</a></div><div class='hunk'>@@ -831,6 +831,82 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {</div><div class='ctx'> 		.multi_read_bit = false,</div><div class='ctx'> 		.bootime = 2,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.wai = 0x33,</div><div class='add'>+		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,</div><div class='add'>+		.sensors_supported = {</div><div class='add'>+			[0] = LIS2DE12_ACCEL_DEV_NAME,</div><div class='add'>+		},</div><div class='add'>+		.ch = (struct iio_chan_spec *)st_accel_8bit_channels,</div><div class='add'>+		.odr = {</div><div class='add'>+			.addr = 0x20,</div><div class='add'>+			.mask = 0xf0,</div><div class='add'>+			.odr_avl = {</div><div class='add'>+				{ .hz = 1, .value = 0x01, },</div><div class='add'>+				{ .hz = 10, .value = 0x02, },</div><div class='add'>+				{ .hz = 25, .value = 0x03, },</div><div class='add'>+				{ .hz = 50, .value = 0x04, },</div><div class='add'>+				{ .hz = 100, .value = 0x05, },</div><div class='add'>+				{ .hz = 200, .value = 0x06, },</div><div class='add'>+				{ .hz = 400, .value = 0x07, },</div><div class='add'>+				{ .hz = 1620, .value = 0x08, },</div><div class='add'>+				{ .hz = 5376, .value = 0x09, },</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.pw = {</div><div class='add'>+			.addr = 0x20,</div><div class='add'>+			.mask = 0xf0,</div><div class='add'>+			.value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,</div><div class='add'>+		},</div><div class='add'>+		.enable_axis = {</div><div class='add'>+			.addr = ST_SENSORS_DEFAULT_AXIS_ADDR,</div><div class='add'>+			.mask = ST_SENSORS_DEFAULT_AXIS_MASK,</div><div class='add'>+		},</div><div class='add'>+		.fs = {</div><div class='add'>+			.addr = 0x23,</div><div class='add'>+			.mask = 0x30,</div><div class='add'>+			.fs_avl = {</div><div class='add'>+				[0] = {</div><div class='add'>+					.num = ST_ACCEL_FS_AVL_2G,</div><div class='add'>+					.value = 0x00,</div><div class='add'>+					.gain = IIO_G_TO_M_S_2(15600),</div><div class='add'>+				},</div><div class='add'>+				[1] = {</div><div class='add'>+					.num = ST_ACCEL_FS_AVL_4G,</div><div class='add'>+					.value = 0x01,</div><div class='add'>+					.gain = IIO_G_TO_M_S_2(31200),</div><div class='add'>+				},</div><div class='add'>+				[2] = {</div><div class='add'>+					.num = ST_ACCEL_FS_AVL_8G,</div><div class='add'>+					.value = 0x02,</div><div class='add'>+					.gain = IIO_G_TO_M_S_2(62500),</div><div class='add'>+				},</div><div class='add'>+				[3] = {</div><div class='add'>+					.num = ST_ACCEL_FS_AVL_16G,</div><div class='add'>+					.value = 0x03,</div><div class='add'>+					.gain = IIO_G_TO_M_S_2(187500),</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.drdy_irq = {</div><div class='add'>+			.int1 = {</div><div class='add'>+				.addr = 0x22,</div><div class='add'>+				.mask = 0x10,</div><div class='add'>+			},</div><div class='add'>+			.addr_ihl = 0x25,</div><div class='add'>+			.mask_ihl = 0x02,</div><div class='add'>+			.stat_drdy = {</div><div class='add'>+				.addr = ST_SENSORS_DEFAULT_STAT_ADDR,</div><div class='add'>+				.mask = 0x07,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.sim = {</div><div class='add'>+			.addr = 0x23,</div><div class='add'>+			.value = BIT(0),</div><div class='add'>+		},</div><div class='add'>+		.multi_read_bit = true,</div><div class='add'>+		.bootime = 2,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int st_accel_read_raw(struct iio_dev *indio_dev,</div><div class='hunk'>@@ -992,7 +1068,7 @@ static int apply_acpi_orientation(struct iio_dev *indio_dev,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		val = elements[i].integer.value;</div><div class='del'>-		if (val &lt; 0 || val &gt; 2)</div><div class='add'>+		if (val &gt; 2)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* Avoiding full matrix multiplication, we simply reorder the</div><div class='head'>diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c<br/>index de8ae4327094..4e54477ccf24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/st_accel_i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/accel/st_accel_i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/accel/st_accel_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/accel/st_accel_i2c.c</a></div><div class='hunk'>@@ -102,6 +102,10 @@ static const struct of_device_id st_accel_of_match[] = {</div><div class='ctx'> 		.compatible = "st,lis3de",</div><div class='ctx'> 		.data = LIS3DE_ACCEL_DEV_NAME,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,lis2de12",</div><div class='add'>+		.data = LIS2DE12_ACCEL_DEV_NAME,</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, st_accel_of_match);</div><div class='hunk'>@@ -140,6 +144,7 @@ static const struct i2c_device_id st_accel_id_table[] = {</div><div class='ctx'> 	{ LIS3LV02DL_ACCEL_DEV_NAME },</div><div class='ctx'> 	{ LIS2DW12_ACCEL_DEV_NAME },</div><div class='ctx'> 	{ LIS3DE_ACCEL_DEV_NAME },</div><div class='add'>+	{ LIS2DE12_ACCEL_DEV_NAME },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, st_accel_id_table);</div><div class='head'>diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig<br/>index 76db6e5cc296..2036eca546fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/Kconfig</a></div><div class='hunk'>@@ -124,6 +124,18 @@ config AD7768_1</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='ctx'> 	  called ad7768-1.</div><div class='ctx'> </div><div class='add'>+config AD7780</div><div class='add'>+	tristate "Analog Devices AD7780 and similar ADCs driver"</div><div class='add'>+	depends on SPI</div><div class='add'>+	depends on GPIOLIB || COMPILE_TEST</div><div class='add'>+	select AD_SIGMA_DELTA</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to build support for Analog Devices AD7170, AD7171,</div><div class='add'>+	  AD7780 and AD7781 SPI analog to digital converters (ADC).</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called ad7780.</div><div class='add'>+</div><div class='ctx'> config AD7791</div><div class='ctx'> 	tristate "Analog Devices AD7791 ADC driver"</div><div class='ctx'> 	depends on SPI</div><div class='hunk'>@@ -390,7 +402,7 @@ config HX711</div><div class='ctx'> </div><div class='ctx'> 	  This driver uses two GPIOs, one acts as the clock and controls the</div><div class='ctx'> 	  channel selection and gain, the other one is used for the measurement</div><div class='del'>-          data</div><div class='add'>+	  data</div><div class='ctx'> </div><div class='ctx'> 	  Currently the raw value is read from the chip and delivered.</div><div class='ctx'> 	  To get an actual weight one needs to subtract the</div><div class='hunk'>@@ -541,7 +553,7 @@ config MAX1363</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='ctx'> 	  called max1363.</div><div class='ctx'> </div><div class='del'>-config	MAX9611</div><div class='add'>+config MAX9611</div><div class='ctx'> 	tristate "Maxim max9611/max9612 ADC driver"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='hunk'>@@ -585,17 +597,17 @@ config MCP3911</div><div class='ctx'> 	  called mcp3911.</div><div class='ctx'> </div><div class='ctx'> config MEDIATEK_MT6577_AUXADC</div><div class='del'>-        tristate "MediaTek AUXADC driver"</div><div class='del'>-        depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='del'>-        depends on HAS_IOMEM</div><div class='del'>-        help</div><div class='del'>-          Say yes here to enable support for MediaTek mt65xx AUXADC.</div><div class='add'>+	tristate "MediaTek AUXADC driver"</div><div class='add'>+	depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to enable support for MediaTek mt65xx AUXADC.</div><div class='ctx'> </div><div class='del'>-          The driver supports immediate mode operation to read from one of sixteen</div><div class='del'>-          channels (external or internal).</div><div class='add'>+	  The driver supports immediate mode operation to read from one of sixteen</div><div class='add'>+	  channels (external or internal).</div><div class='ctx'> </div><div class='del'>-          This driver can also be built as a module. If so, the module will be</div><div class='del'>-          called mt6577_auxadc.</div><div class='add'>+	  This driver can also be built as a module. If so, the module will be</div><div class='add'>+	  called mt6577_auxadc.</div><div class='ctx'> </div><div class='ctx'> config MEN_Z188_ADC</div><div class='ctx'> 	tristate "MEN 16z188 ADC IP Core support"</div><div class='hunk'>@@ -809,7 +821,9 @@ config STM32_DFSDM_ADC</div><div class='ctx'> 	depends on (ARCH_STM32 &amp;&amp; OF) || COMPILE_TEST</div><div class='ctx'> 	select STM32_DFSDM_CORE</div><div class='ctx'> 	select REGMAP_MMIO</div><div class='add'>+	select IIO_BUFFER</div><div class='ctx'> 	select IIO_BUFFER_HW_CONSUMER</div><div class='add'>+	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this option to support ADCSigma delta modulator for</div><div class='ctx'> 	  STMicroelectronics STM32 digital filter for sigma delta converter.</div><div class='hunk'>@@ -956,7 +970,7 @@ config TI_ADS1015</div><div class='ctx'> </div><div class='ctx'> config TI_ADS7950</div><div class='ctx'> 	tristate "Texas Instruments ADS7950 ADC driver"</div><div class='del'>-	depends on SPI</div><div class='add'>+	depends on SPI &amp;&amp; GPIOLIB</div><div class='ctx'> 	select IIO_BUFFER</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='hunk'>@@ -967,6 +981,16 @@ config TI_ADS7950</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called ti-ads7950.</div><div class='ctx'> </div><div class='add'>+config TI_ADS8344</div><div class='add'>+	tristate "Texas Instruments ADS8344"</div><div class='add'>+	depends on SPI &amp;&amp; OF</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for Texas Instruments ADS8344</div><div class='add'>+	  ADC chips</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module will be</div><div class='add'>+	  called ti-ads8344.</div><div class='add'>+</div><div class='ctx'> config TI_ADS8688</div><div class='ctx'> 	tristate "Texas Instruments ADS8688"</div><div class='ctx'> 	depends on SPI &amp;&amp; OF</div><div class='head'>diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile<br/>index 6fcebd167524..ef9cc485fb67 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/Makefile</a></div><div class='hunk'>@@ -16,6 +16,7 @@ obj-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o</div><div class='ctx'> obj-$(CONFIG_AD7606) += ad7606.o</div><div class='ctx'> obj-$(CONFIG_AD7766) += ad7766.o</div><div class='ctx'> obj-$(CONFIG_AD7768_1) += ad7768-1.o</div><div class='add'>+obj-$(CONFIG_AD7780) += ad7780.o</div><div class='ctx'> obj-$(CONFIG_AD7791) += ad7791.o</div><div class='ctx'> obj-$(CONFIG_AD7793) += ad7793.o</div><div class='ctx'> obj-$(CONFIG_AD7887) += ad7887.o</div><div class='hunk'>@@ -87,6 +88,7 @@ obj-$(CONFIG_TI_ADC128S052) += ti-adc128s052.o</div><div class='ctx'> obj-$(CONFIG_TI_ADC161S626) += ti-adc161s626.o</div><div class='ctx'> obj-$(CONFIG_TI_ADS1015) += ti-ads1015.o</div><div class='ctx'> obj-$(CONFIG_TI_ADS7950) += ti-ads7950.o</div><div class='add'>+obj-$(CONFIG_TI_ADS8344) += ti-ads8344.o</div><div class='ctx'> obj-$(CONFIG_TI_ADS8688) += ti-ads8688.o</div><div class='ctx'> obj-$(CONFIG_TI_ADS124S08) += ti-ads124s08.o</div><div class='ctx'> obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o</div><div class='head'>diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c<br/>index 7d5e5311d8de..659ef37d5fe8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7124.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7124.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7124.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad7124.c</a></div><div class='hunk'>@@ -411,7 +411,7 @@ static int ad7124_init_channel_vref(struct ad7124_state *st,</div><div class='ctx'> 			dev_err(&amp;st-&gt;sd.spi-&gt;dev,</div><div class='ctx'> 				"Error, trying to use external voltage reference without a %s regulator.\n",</div><div class='ctx'> 				ad7124_ref_names[refsel]);</div><div class='del'>-				return PTR_ERR(st-&gt;vref[refsel]);</div><div class='add'>+			return PTR_ERR(st-&gt;vref[refsel]);</div><div class='ctx'> 		}</div><div class='ctx'> 		st-&gt;channel_config[channel_number].vref_mv =</div><div class='ctx'> 			regulator_get_voltage(st-&gt;vref[refsel]);</div><div class='head'>diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c<br/>index ebb8de03bbce..24c70c3cefb4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7606.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7606.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7606.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad7606.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Scales are computed as 5000/32768 and 10000/32768 respectively,</div><div class='ctx'>  * so that when applied to the raw values they provide mV values</div><div class='ctx'>  */</div><div class='del'>-static const unsigned int scale_avail[2] = {</div><div class='add'>+static const unsigned int ad7606_scale_avail[2] = {</div><div class='ctx'> 	152588, 305176</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -39,6 +39,10 @@ static const unsigned int ad7606_oversampling_avail[7] = {</div><div class='ctx'> 	1, 2, 4, 8, 16, 32, 64,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const unsigned int ad7616_oversampling_avail[8] = {</div><div class='add'>+	1, 2, 4, 8, 16, 32, 64, 128,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int ad7606_reset(struct ad7606_state *st)</div><div class='ctx'> {</div><div class='ctx'> 	if (st-&gt;gpio_reset) {</div><div class='hunk'>@@ -154,7 +158,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='ctx'> 	case IIO_CHAN_INFO_SCALE:</div><div class='ctx'> 		*val = 0;</div><div class='del'>-		*val2 = scale_avail[st-&gt;range];</div><div class='add'>+		*val2 = st-&gt;scale_avail[st-&gt;range];</div><div class='ctx'> 		return IIO_VAL_INT_PLUS_MICRO;</div><div class='ctx'> 	case IIO_CHAN_INFO_OVERSAMPLING_RATIO:</div><div class='ctx'> 		*val = st-&gt;oversampling;</div><div class='hunk'>@@ -163,21 +167,31 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t in_voltage_scale_available_show(struct device *dev,</div><div class='del'>-					       struct device_attribute *attr,</div><div class='del'>-					       char *buf)</div><div class='add'>+static ssize_t ad7606_show_avail(char *buf, const unsigned int *vals,</div><div class='add'>+				 unsigned int n, bool micros)</div><div class='ctx'> {</div><div class='del'>-	int i, len = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(scale_avail); i++)</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",</div><div class='del'>-				 scale_avail[i]);</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			micros ? "0.%06u " : "%u ", vals[i]);</div><div class='add'>+	}</div><div class='ctx'> 	buf[len - 1] = '\n';</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t in_voltage_scale_available_show(struct device *dev,</div><div class='add'>+					       struct device_attribute *attr,</div><div class='add'>+					       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);</div><div class='add'>+	struct ad7606_state *st = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return ad7606_show_avail(buf, st-&gt;scale_avail, st-&gt;num_scales, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static IIO_DEVICE_ATTR_RO(in_voltage_scale_available, 0);</div><div class='ctx'> </div><div class='ctx'> static int ad7606_write_raw(struct iio_dev *indio_dev,</div><div class='hunk'>@@ -193,7 +207,7 @@ static int ad7606_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	switch (mask) {</div><div class='ctx'> 	case IIO_CHAN_INFO_SCALE:</div><div class='ctx'> 		mutex_lock(&amp;st-&gt;lock);</div><div class='del'>-		i = find_closest(val2, scale_avail, ARRAY_SIZE(scale_avail));</div><div class='add'>+		i = find_closest(val2, st-&gt;scale_avail, st-&gt;num_scales);</div><div class='ctx'> 		gpiod_set_value(st-&gt;gpio_range, i);</div><div class='ctx'> 		st-&gt;range = i;</div><div class='ctx'> 		mutex_unlock(&amp;st-&gt;lock);</div><div class='hunk'>@@ -202,15 +216,20 @@ static int ad7606_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	case IIO_CHAN_INFO_OVERSAMPLING_RATIO:</div><div class='ctx'> 		if (val2)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		i = find_closest(val, ad7606_oversampling_avail,</div><div class='del'>-				 ARRAY_SIZE(ad7606_oversampling_avail));</div><div class='add'>+		i = find_closest(val, st-&gt;oversampling_avail,</div><div class='add'>+				 st-&gt;num_os_ratios);</div><div class='ctx'> </div><div class='ctx'> 		values[0] = i;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;st-&gt;lock);</div><div class='ctx'> 		gpiod_set_array_value(ARRAY_SIZE(values), st-&gt;gpio_os-&gt;desc,</div><div class='ctx'> 				      st-&gt;gpio_os-&gt;info, values);</div><div class='del'>-		st-&gt;oversampling = ad7606_oversampling_avail[i];</div><div class='add'>+</div><div class='add'>+		/* AD7616 requires a reset to update value */</div><div class='add'>+		if (st-&gt;chip_info-&gt;os_req_reset)</div><div class='add'>+			ad7606_reset(st);</div><div class='add'>+</div><div class='add'>+		st-&gt;oversampling = st-&gt;oversampling_avail[i];</div><div class='ctx'> 		mutex_unlock(&amp;st-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -219,11 +238,23 @@ static int ad7606_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static IIO_CONST_ATTR(oversampling_ratio_available, "1 2 4 8 16 32 64");</div><div class='add'>+static ssize_t ad7606_oversampling_ratio_avail(struct device *dev,</div><div class='add'>+					       struct device_attribute *attr,</div><div class='add'>+					       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);</div><div class='add'>+	struct ad7606_state *st = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return ad7606_show_avail(buf, st-&gt;oversampling_avail,</div><div class='add'>+				 st-&gt;num_os_ratios, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static IIO_DEVICE_ATTR(oversampling_ratio_available, 0444,</div><div class='add'>+		       ad7606_oversampling_ratio_avail, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ad7606_attributes_os_and_range[] = {</div><div class='ctx'> 	&amp;iio_dev_attr_in_voltage_scale_available.dev_attr.attr,</div><div class='del'>-	&amp;iio_const_attr_oversampling_ratio_available.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_oversampling_ratio_available.dev_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +263,7 @@ static const struct attribute_group ad7606_attribute_group_os_and_range = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ad7606_attributes_os[] = {</div><div class='del'>-	&amp;iio_const_attr_oversampling_ratio_available.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_oversampling_ratio_available.dev_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -292,6 +323,36 @@ static const struct iio_chan_spec ad7606_channels[] = {</div><div class='ctx'> 	AD7606_CHANNEL(7),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The current assumption that this driver makes for AD7616, is that it's</div><div class='add'>+ * working in Hardware Mode with Serial, Burst and Sequencer modes activated.</div><div class='add'>+ * To activate them, following pins must be pulled high:</div><div class='add'>+ *	-SER/PAR</div><div class='add'>+ *	-SEQEN</div><div class='add'>+ * And following pins must be pulled low:</div><div class='add'>+ *	-WR/BURST</div><div class='add'>+ *	-DB4/SER1W</div><div class='add'>+ */</div><div class='add'>+static const struct iio_chan_spec ad7616_channels[] = {</div><div class='add'>+	IIO_CHAN_SOFT_TIMESTAMP(16),</div><div class='add'>+	AD7606_CHANNEL(0),</div><div class='add'>+	AD7606_CHANNEL(1),</div><div class='add'>+	AD7606_CHANNEL(2),</div><div class='add'>+	AD7606_CHANNEL(3),</div><div class='add'>+	AD7606_CHANNEL(4),</div><div class='add'>+	AD7606_CHANNEL(5),</div><div class='add'>+	AD7606_CHANNEL(6),</div><div class='add'>+	AD7606_CHANNEL(7),</div><div class='add'>+	AD7606_CHANNEL(8),</div><div class='add'>+	AD7606_CHANNEL(9),</div><div class='add'>+	AD7606_CHANNEL(10),</div><div class='add'>+	AD7606_CHANNEL(11),</div><div class='add'>+	AD7606_CHANNEL(12),</div><div class='add'>+	AD7606_CHANNEL(13),</div><div class='add'>+	AD7606_CHANNEL(14),</div><div class='add'>+	AD7606_CHANNEL(15),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {</div><div class='ctx'> 	/* More devices added in future */</div><div class='ctx'> 	[ID_AD7605_4] = {</div><div class='hunk'>@@ -301,17 +362,27 @@ static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {</div><div class='ctx'> 	[ID_AD7606_8] = {</div><div class='ctx'> 		.channels = ad7606_channels,</div><div class='ctx'> 		.num_channels = 9,</div><div class='del'>-		.has_oversampling = true,</div><div class='add'>+		.oversampling_avail = ad7606_oversampling_avail,</div><div class='add'>+		.oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),</div><div class='ctx'> 	},</div><div class='ctx'> 	[ID_AD7606_6] = {</div><div class='ctx'> 		.channels = ad7606_channels,</div><div class='ctx'> 		.num_channels = 7,</div><div class='del'>-		.has_oversampling = true,</div><div class='add'>+		.oversampling_avail = ad7606_oversampling_avail,</div><div class='add'>+		.oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),</div><div class='ctx'> 	},</div><div class='ctx'> 	[ID_AD7606_4] = {</div><div class='ctx'> 		.channels = ad7606_channels,</div><div class='ctx'> 		.num_channels = 5,</div><div class='del'>-		.has_oversampling = true,</div><div class='add'>+		.oversampling_avail = ad7606_oversampling_avail,</div><div class='add'>+		.oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),</div><div class='add'>+	},</div><div class='add'>+	[ID_AD7616] = {</div><div class='add'>+		.channels = ad7616_channels,</div><div class='add'>+		.num_channels = 17,</div><div class='add'>+		.oversampling_avail = ad7616_oversampling_avail,</div><div class='add'>+		.oversampling_num = ARRAY_SIZE(ad7616_oversampling_avail),</div><div class='add'>+		.os_req_reset = true,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -343,7 +414,7 @@ static int ad7606_request_gpios(struct ad7606_state *st)</div><div class='ctx'> 	if (IS_ERR(st-&gt;gpio_frstdata))</div><div class='ctx'> 		return PTR_ERR(st-&gt;gpio_frstdata);</div><div class='ctx'> </div><div class='del'>-	if (!st-&gt;chip_info-&gt;has_oversampling)</div><div class='add'>+	if (!st-&gt;chip_info-&gt;oversampling_num)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;gpio_os = devm_gpiod_get_array_optional(dev,</div><div class='hunk'>@@ -467,6 +538,8 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,</div><div class='ctx'> 	/* tied to logic low, analog input range is +/- 5V */</div><div class='ctx'> 	st-&gt;range = 0;</div><div class='ctx'> 	st-&gt;oversampling = 1;</div><div class='add'>+	st-&gt;scale_avail = ad7606_scale_avail;</div><div class='add'>+	st-&gt;num_scales = ARRAY_SIZE(ad7606_scale_avail);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;reg = devm_regulator_get(dev, "avcc");</div><div class='ctx'> 	if (IS_ERR(st-&gt;reg))</div><div class='hunk'>@@ -484,6 +557,11 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;chip_info = &amp;ad7606_chip_info_tbl[id];</div><div class='ctx'> </div><div class='add'>+	if (st-&gt;chip_info-&gt;oversampling_num) {</div><div class='add'>+		st-&gt;oversampling_avail = st-&gt;chip_info-&gt;oversampling_avail;</div><div class='add'>+		st-&gt;num_os_ratios = st-&gt;chip_info-&gt;oversampling_num;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ad7606_request_gpios(st);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h<br/>index 5d12410f68e1..f9ef52131e74 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7606.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7606.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7606.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad7606.h</a></div><div class='hunk'>@@ -12,12 +12,17 @@</div><div class='ctx'>  * struct ad7606_chip_info - chip specific information</div><div class='ctx'>  * @channels:		channel specification</div><div class='ctx'>  * @num_channels:	number of channels</div><div class='del'>- * @has_oversampling:   whether the device has oversampling support</div><div class='add'>+ * @oversampling_avail	pointer to the array which stores the available</div><div class='add'>+ *			oversampling ratios.</div><div class='add'>+ * @oversampling_num	number of elements stored in oversampling_avail array</div><div class='add'>+ * @os_req_reset	some devices require a reset to update oversampling</div><div class='ctx'>  */</div><div class='ctx'> struct ad7606_chip_info {</div><div class='ctx'> 	const struct iio_chan_spec	*channels;</div><div class='ctx'> 	unsigned int			num_channels;</div><div class='del'>-	bool				has_oversampling;</div><div class='add'>+	const unsigned int		*oversampling_avail;</div><div class='add'>+	unsigned int			oversampling_num;</div><div class='add'>+	bool				os_req_reset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -29,6 +34,11 @@ struct ad7606_chip_info {</div><div class='ctx'>  * @range		voltage range selection, selects which scale to apply</div><div class='ctx'>  * @oversampling	oversampling selection</div><div class='ctx'>  * @base_address	address from where to read data in parallel operation</div><div class='add'>+ * @scale_avail		pointer to the array which stores the available scales</div><div class='add'>+ * @num_scales		number of elements stored in the scale_avail array</div><div class='add'>+ * @oversampling_avail	pointer to the array which stores the available</div><div class='add'>+ *			oversampling ratios.</div><div class='add'>+ * @num_os_ratios	number of elements stored in oversampling_avail array</div><div class='ctx'>  * @lock		protect sensor state from concurrent accesses to GPIOs</div><div class='ctx'>  * @gpio_convst	GPIO descriptor for conversion start signal (CONVST)</div><div class='ctx'>  * @gpio_reset		GPIO descriptor for device hard-reset</div><div class='hunk'>@@ -50,6 +60,10 @@ struct ad7606_state {</div><div class='ctx'> 	unsigned int			range;</div><div class='ctx'> 	unsigned int			oversampling;</div><div class='ctx'> 	void __iomem			*base_address;</div><div class='add'>+	const unsigned int		*scale_avail;</div><div class='add'>+	unsigned int			num_scales;</div><div class='add'>+	const unsigned int		*oversampling_avail;</div><div class='add'>+	unsigned int			num_os_ratios;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex			lock; /* protect sensor state */</div><div class='ctx'> 	struct gpio_desc		*gpio_convst;</div><div class='hunk'>@@ -64,9 +78,9 @@ struct ad7606_state {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * DMA (thus cache coherency maintenance) requires the</div><div class='ctx'> 	 * transfer buffers to live in their own cache lines.</div><div class='del'>-	 * 8 * 16-bit samples + 64-bit timestamp</div><div class='add'>+	 * 16 * 16-bit samples + 64-bit timestamp</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned short			data[12] ____cacheline_aligned;</div><div class='add'>+	unsigned short			data[20] ____cacheline_aligned;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -86,7 +100,8 @@ enum ad7606_supported_device_ids {</div><div class='ctx'> 	ID_AD7605_4,</div><div class='ctx'> 	ID_AD7606_8,</div><div class='ctx'> 	ID_AD7606_6,</div><div class='del'>-	ID_AD7606_4</div><div class='add'>+	ID_AD7606_4,</div><div class='add'>+	ID_AD7616,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='head'>diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c<br/>index 4fd0ec36a086..b7faef69a58f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7606_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7606_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7606_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad7606_spi.c</a></div><div class='hunk'>@@ -53,6 +53,7 @@ static const struct spi_device_id ad7606_id_table[] = {</div><div class='ctx'> 	{ "ad7606-4", ID_AD7606_4 },</div><div class='ctx'> 	{ "ad7606-6", ID_AD7606_6 },</div><div class='ctx'> 	{ "ad7606-8", ID_AD7606_8 },</div><div class='add'>+	{ "ad7616",   ID_AD7616 },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(spi, ad7606_id_table);</div><div class='hunk'>@@ -62,6 +63,7 @@ static const struct of_device_id ad7606_of_match[] = {</div><div class='ctx'> 	{ .compatible = "adi,ad7606-4" },</div><div class='ctx'> 	{ .compatible = "adi,ad7606-6" },</div><div class='ctx'> 	{ .compatible = "adi,ad7606-8" },</div><div class='add'>+	{ .compatible = "adi,ad7616" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, ad7606_of_match);</div><div class='head'>diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/iio/adc/ad7780.c<br/>index c4a85789c2db..217a5a5c3c6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7780.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7780.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7780.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad7780.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD7170/AD7171 and AD7780/AD7781 SPI ADC driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='add'>+ * Copyright 2019 Renato Lui Geh</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/iio/iio.h&gt;</div><div class='ctx'> #include &lt;linux/iio/sysfs.h&gt;</div><div class='hunk'>@@ -28,16 +29,25 @@</div><div class='ctx'> #define AD7780_ID1		BIT(4)</div><div class='ctx'> #define AD7780_ID0		BIT(3)</div><div class='ctx'> #define AD7780_GAIN		BIT(2)</div><div class='del'>-#define AD7780_PAT1		BIT(1)</div><div class='del'>-#define AD7780_PAT0		BIT(0)</div><div class='ctx'> </div><div class='del'>-#define AD7780_PATTERN		(AD7780_PAT0)</div><div class='del'>-#define AD7780_PATTERN_MASK	(AD7780_PAT0 | AD7780_PAT1)</div><div class='add'>+#define AD7170_ID		0</div><div class='add'>+#define AD7171_ID		1</div><div class='add'>+#define AD7780_ID		1</div><div class='add'>+#define AD7781_ID		0</div><div class='add'>+</div><div class='add'>+#define AD7780_ID_MASK		(AD7780_ID0 | AD7780_ID1)</div><div class='add'>+</div><div class='add'>+#define AD7780_PATTERN_GOOD	1</div><div class='add'>+#define AD7780_PATTERN_MASK	GENMASK(1, 0)</div><div class='ctx'> </div><div class='del'>-#define AD7170_PAT2		BIT(2)</div><div class='add'>+#define AD7170_PATTERN_GOOD	5</div><div class='add'>+#define AD7170_PATTERN_MASK	GENMASK(2, 0)</div><div class='ctx'> </div><div class='del'>-#define AD7170_PATTERN		(AD7780_PAT0 | AD7170_PAT2)</div><div class='del'>-#define AD7170_PATTERN_MASK	(AD7780_PAT0 | AD7780_PAT1 | AD7170_PAT2)</div><div class='add'>+#define AD7780_GAIN_MIDPOINT	64</div><div class='add'>+#define AD7780_FILTER_MIDPOINT	13350</div><div class='add'>+</div><div class='add'>+static const unsigned int ad778x_gain[2]      = { 1, 128 };</div><div class='add'>+static const unsigned int ad778x_odr_avail[2] = { 10000, 16700 };</div><div class='ctx'> </div><div class='ctx'> struct ad7780_chip_info {</div><div class='ctx'> 	struct iio_chan_spec	channel;</div><div class='hunk'>@@ -50,7 +60,11 @@ struct ad7780_state {</div><div class='ctx'> 	const struct ad7780_chip_info	*chip_info;</div><div class='ctx'> 	struct regulator		*reg;</div><div class='ctx'> 	struct gpio_desc		*powerdown_gpio;</div><div class='del'>-	unsigned int	gain;</div><div class='add'>+	struct gpio_desc		*gain_gpio;</div><div class='add'>+	struct gpio_desc		*filter_gpio;</div><div class='add'>+	unsigned int			gain;</div><div class='add'>+	unsigned int			odr;</div><div class='add'>+	unsigned int			int_vref_mv;</div><div class='ctx'> </div><div class='ctx'> 	struct ad_sigma_delta sd;</div><div class='ctx'> };</div><div class='hunk'>@@ -104,17 +118,69 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 		voltage_uv = regulator_get_voltage(st-&gt;reg);</div><div class='ctx'> 		if (voltage_uv &lt; 0)</div><div class='ctx'> 			return voltage_uv;</div><div class='del'>-		*val = (voltage_uv / 1000) * st-&gt;gain;</div><div class='add'>+		voltage_uv /= 1000;</div><div class='add'>+		*val = voltage_uv * st-&gt;gain;</div><div class='ctx'> 		*val2 = chan-&gt;scan_type.realbits - 1;</div><div class='add'>+		st-&gt;int_vref_mv = voltage_uv;</div><div class='ctx'> 		return IIO_VAL_FRACTIONAL_LOG2;</div><div class='ctx'> 	case IIO_CHAN_INFO_OFFSET:</div><div class='ctx'> 		*val = -(1 &lt;&lt; (chan-&gt;scan_type.realbits - 1));</div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='add'>+	case IIO_CHAN_INFO_SAMP_FREQ:</div><div class='add'>+		*val = st-&gt;odr;</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ad7780_write_raw(struct iio_dev *indio_dev,</div><div class='add'>+			    struct iio_chan_spec const *chan,</div><div class='add'>+			    int val,</div><div class='add'>+			    int val2,</div><div class='add'>+			    long m)</div><div class='add'>+{</div><div class='add'>+	struct ad7780_state *st = iio_priv(indio_dev);</div><div class='add'>+	const struct ad7780_chip_info *chip_info = st-&gt;chip_info;</div><div class='add'>+	unsigned long long vref;</div><div class='add'>+	unsigned int full_scale, gain;</div><div class='add'>+</div><div class='add'>+	if (!chip_info-&gt;is_ad778x)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (m) {</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		if (val != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		vref = st-&gt;int_vref_mv * 1000000LL;</div><div class='add'>+		full_scale = 1 &lt;&lt; (chip_info-&gt;channel.scan_type.realbits - 1);</div><div class='add'>+		gain = DIV_ROUND_CLOSEST_ULL(vref, full_scale);</div><div class='add'>+		gain = DIV_ROUND_CLOSEST(gain, val2);</div><div class='add'>+		st-&gt;gain = gain;</div><div class='add'>+		if (gain &lt; AD7780_GAIN_MIDPOINT)</div><div class='add'>+			gain = 0;</div><div class='add'>+		else</div><div class='add'>+			gain = 1;</div><div class='add'>+		gpiod_set_value(st-&gt;gain_gpio, gain);</div><div class='add'>+		break;</div><div class='add'>+	case IIO_CHAN_INFO_SAMP_FREQ:</div><div class='add'>+		if (1000*val + val2/1000 &lt; AD7780_FILTER_MIDPOINT)</div><div class='add'>+			val = 0;</div><div class='add'>+		else</div><div class='add'>+			val = 1;</div><div class='add'>+		st-&gt;odr = ad778x_odr_avail[val];</div><div class='add'>+		gpiod_set_value(st-&gt;filter_gpio, val);</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='ctx'> static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta,</div><div class='ctx'> 				     unsigned int raw_sample)</div><div class='ctx'> {</div><div class='hunk'>@@ -126,10 +192,8 @@ static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (chip_info-&gt;is_ad778x) {</div><div class='del'>-		if (raw_sample &amp; AD7780_GAIN)</div><div class='del'>-			st-&gt;gain = 1;</div><div class='del'>-		else</div><div class='del'>-			st-&gt;gain = 128;</div><div class='add'>+		st-&gt;gain = ad778x_gain[raw_sample &amp; AD7780_GAIN];</div><div class='add'>+		st-&gt;odr = ad778x_odr_avail[raw_sample &amp; AD7780_FILTER];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -142,30 +206,32 @@ static const struct ad_sigma_delta_info ad7780_sigma_delta_info = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AD7780_CHANNEL(bits, wordsize) \</div><div class='del'>-	AD_SD_CHANNEL_NO_SAMP_FREQ(1, 0, 0, bits, 32, wordsize - bits)</div><div class='add'>+	AD_SD_CHANNEL(1, 0, 0, bits, 32, (wordsize) - (bits))</div><div class='add'>+#define AD7170_CHANNEL(bits, wordsize) \</div><div class='add'>+	AD_SD_CHANNEL_NO_SAMP_FREQ(1, 0, 0, bits, 32, (wordsize) - (bits))</div><div class='ctx'> </div><div class='ctx'> static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {</div><div class='ctx'> 	[ID_AD7170] = {</div><div class='del'>-		.channel = AD7780_CHANNEL(12, 24),</div><div class='del'>-		.pattern = AD7170_PATTERN,</div><div class='add'>+		.channel = AD7170_CHANNEL(12, 24),</div><div class='add'>+		.pattern = AD7170_PATTERN_GOOD,</div><div class='ctx'> 		.pattern_mask = AD7170_PATTERN_MASK,</div><div class='ctx'> 		.is_ad778x = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	[ID_AD7171] = {</div><div class='del'>-		.channel = AD7780_CHANNEL(16, 24),</div><div class='del'>-		.pattern = AD7170_PATTERN,</div><div class='add'>+		.channel = AD7170_CHANNEL(16, 24),</div><div class='add'>+		.pattern = AD7170_PATTERN_GOOD,</div><div class='ctx'> 		.pattern_mask = AD7170_PATTERN_MASK,</div><div class='ctx'> 		.is_ad778x = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	[ID_AD7780] = {</div><div class='ctx'> 		.channel = AD7780_CHANNEL(24, 32),</div><div class='del'>-		.pattern = AD7780_PATTERN,</div><div class='add'>+		.pattern = AD7780_PATTERN_GOOD,</div><div class='ctx'> 		.pattern_mask = AD7780_PATTERN_MASK,</div><div class='ctx'> 		.is_ad778x = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	[ID_AD7781] = {</div><div class='ctx'> 		.channel = AD7780_CHANNEL(20, 32),</div><div class='del'>-		.pattern = AD7780_PATTERN,</div><div class='add'>+		.pattern = AD7780_PATTERN_GOOD,</div><div class='ctx'> 		.pattern_mask = AD7780_PATTERN_MASK,</div><div class='ctx'> 		.is_ad778x = true,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -173,8 +239,47 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct iio_info ad7780_info = {</div><div class='ctx'> 	.read_raw = ad7780_read_raw,</div><div class='add'>+	.write_raw = ad7780_write_raw,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ad7780_init_gpios(struct device *dev, struct ad7780_state *st)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	st-&gt;powerdown_gpio = devm_gpiod_get_optional(dev,</div><div class='add'>+						     "powerdown",</div><div class='add'>+						     GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(st-&gt;powerdown_gpio)) {</div><div class='add'>+		ret = PTR_ERR(st-&gt;powerdown_gpio);</div><div class='add'>+		dev_err(dev, "Failed to request powerdown GPIO: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!st-&gt;chip_info-&gt;is_ad778x)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	st-&gt;gain_gpio = devm_gpiod_get_optional(dev,</div><div class='add'>+						"adi,gain",</div><div class='add'>+						GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(st-&gt;gain_gpio)) {</div><div class='add'>+		ret = PTR_ERR(st-&gt;gain_gpio);</div><div class='add'>+		dev_err(dev, "Failed to request gain GPIO: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	st-&gt;filter_gpio = devm_gpiod_get_optional(dev,</div><div class='add'>+						  "adi,filter",</div><div class='add'>+						  GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(st-&gt;filter_gpio)) {</div><div class='add'>+		ret = PTR_ERR(st-&gt;filter_gpio);</div><div class='add'>+		dev_err(dev, "Failed to request filter GPIO: %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='ctx'> static int ad7780_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7780_state *st;</div><div class='hunk'>@@ -190,16 +295,6 @@ static int ad7780_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	ad_sd_init(&amp;st-&gt;sd, indio_dev, spi, &amp;ad7780_sigma_delta_info);</div><div class='ctx'> </div><div class='del'>-	st-&gt;reg = devm_regulator_get(&amp;spi-&gt;dev, "avdd");</div><div class='del'>-	if (IS_ERR(st-&gt;reg))</div><div class='del'>-		return PTR_ERR(st-&gt;reg);</div><div class='del'>-</div><div class='del'>-	ret = regulator_enable(st-&gt;reg);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "Failed to enable specified AVdd supply\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	st-&gt;chip_info =</div><div class='ctx'> 		&amp;ad7780_chip_info_tbl[spi_get_device_id(spi)-&gt;driver_data];</div><div class='ctx'> </div><div class='hunk'>@@ -212,14 +307,18 @@ static int ad7780_probe(struct spi_device *spi)</div><div class='ctx'> 	indio_dev-&gt;num_channels = 1;</div><div class='ctx'> 	indio_dev-&gt;info = &amp;ad7780_info;</div><div class='ctx'> </div><div class='del'>-	st-&gt;powerdown_gpio = devm_gpiod_get_optional(&amp;spi-&gt;dev,</div><div class='del'>-						     "powerdown",</div><div class='del'>-						     GPIOD_OUT_LOW);</div><div class='del'>-	if (IS_ERR(st-&gt;powerdown_gpio)) {</div><div class='del'>-		ret = PTR_ERR(st-&gt;powerdown_gpio);</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "Failed to request powerdown GPIO: %d\n",</div><div class='del'>-			ret);</div><div class='del'>-		goto error_disable_reg;</div><div class='add'>+	ret = ad7780_init_gpios(&amp;spi-&gt;dev, st);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_cleanup_buffer_and_trigger;</div><div class='add'>+</div><div class='add'>+	st-&gt;reg = devm_regulator_get(&amp;spi-&gt;dev, "avdd");</div><div class='add'>+	if (IS_ERR(st-&gt;reg))</div><div class='add'>+		return PTR_ERR(st-&gt;reg);</div><div class='add'>+</div><div class='add'>+	ret = regulator_enable(st-&gt;reg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Failed to enable specified AVdd supply\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ad_sd_setup_buffer_and_trigger(indio_dev);</div><div class='head'>diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c<br/>index d62dbb62be45..cb7b854df00c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7923.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad7923.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad7923.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad7923.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #include &lt;linux/iio/trigger_consumer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/triggered_buffer.h&gt;</div><div class='ctx'> </div><div class='del'>-#define AD7923_WRITE_CR		(1 &lt;&lt; 11)	/* write control register */</div><div class='del'>-#define AD7923_RANGE		(1 &lt;&lt; 1)	/* range to REFin */</div><div class='del'>-#define AD7923_CODING		(1 &lt;&lt; 0)	/* coding is straight binary */</div><div class='add'>+#define AD7923_WRITE_CR		BIT(11)		/* write control register */</div><div class='add'>+#define AD7923_RANGE		BIT(1)		/* range to REFin */</div><div class='add'>+#define AD7923_CODING		BIT(0)		/* coding is straight binary */</div><div class='ctx'> #define AD7923_PM_MODE_AS	(1)		/* auto shutdown */</div><div class='ctx'> #define AD7923_PM_MODE_FS	(2)		/* full shutdown */</div><div class='ctx'> #define AD7923_PM_MODE_OPS	(3)		/* normal operation */</div><div class='hunk'>@@ -40,16 +40,16 @@</div><div class='ctx'> </div><div class='ctx'> #define AD7923_MAX_CHAN		4</div><div class='ctx'> </div><div class='del'>-#define AD7923_PM_MODE_WRITE(mode)	(mode &lt;&lt; 4)	/* write mode */</div><div class='del'>-#define AD7923_CHANNEL_WRITE(channel)	(channel &lt;&lt; 6)	/* write channel */</div><div class='del'>-#define AD7923_SEQUENCE_WRITE(sequence)	(((sequence &amp; 1) &lt;&lt; 3) \</div><div class='del'>-					+ ((sequence &amp; 2) &lt;&lt; 9))</div><div class='add'>+#define AD7923_PM_MODE_WRITE(mode)	((mode) &lt;&lt; 4)	 /* write mode */</div><div class='add'>+#define AD7923_CHANNEL_WRITE(channel)	((channel) &lt;&lt; 6) /* write channel */</div><div class='add'>+#define AD7923_SEQUENCE_WRITE(sequence)	((((sequence) &amp; 1) &lt;&lt; 3) \</div><div class='add'>+					+ (((sequence) &amp; 2) &lt;&lt; 9))</div><div class='ctx'> 						/* write sequence fonction */</div><div class='ctx'> /* left shift for CR : bit 11 transmit in first */</div><div class='ctx'> #define AD7923_SHIFT_REGISTER	4</div><div class='ctx'> </div><div class='ctx'> /* val = value, dec = left shift, bits = number of bits of the mask */</div><div class='del'>-#define EXTRACT(val, dec, bits)		((val &gt;&gt; dec) &amp; ((1 &lt;&lt; bits) - 1))</div><div class='add'>+#define EXTRACT(val, dec, bits)		(((val) &gt;&gt; (dec)) &amp; ((1 &lt;&lt; (bits)) - 1))</div><div class='ctx'> </div><div class='ctx'> struct ad7923_state {</div><div class='ctx'> 	struct spi_device		*spi;</div><div class='hunk'>@@ -130,7 +130,7 @@ static const struct ad7923_chip_info ad7923_chip_info[] = {</div><div class='ctx'>  * ad7923_update_scan_mode() setup the spi transfer buffer for the new scan mask</div><div class='ctx'>  **/</div><div class='ctx'> static int ad7923_update_scan_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const unsigned long *active_scan_mask)</div><div class='add'>+				   const unsigned long *active_scan_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7923_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	int i, cmd, len;</div><div class='hunk'>@@ -181,7 +181,7 @@ static irqreturn_t ad7923_trigger_handler(int irq, void *p)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	iio_push_to_buffers_with_timestamp(indio_dev, st-&gt;rx_buf,</div><div class='del'>-		iio_get_time_ns(indio_dev));</div><div class='add'>+					   iio_get_time_ns(indio_dev));</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	iio_trigger_notify_done(indio_dev-&gt;trig);</div><div class='hunk'>@@ -272,7 +272,7 @@ static int ad7923_probe(struct spi_device *spi)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	indio_dev = devm_iio_device_alloc(&amp;spi-&gt;dev, sizeof(*st));</div><div class='del'>-	if (indio_dev == NULL)</div><div class='add'>+	if (!indio_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	st = iio_priv(indio_dev);</div><div class='hunk'>@@ -314,7 +314,7 @@ static int ad7923_probe(struct spi_device *spi)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = iio_triggered_buffer_setup(indio_dev, NULL,</div><div class='del'>-			&amp;ad7923_trigger_handler, NULL);</div><div class='add'>+					 &amp;ad7923_trigger_handler, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_disable_reg;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c<br/>index ff5f2da2e1b1..a4310600a853 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad_sigma_delta.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ad_sigma_delta.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ad_sigma_delta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ad_sigma_delta.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ int ad_sd_write_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg,</div><div class='ctx'> 	struct spi_transfer t = {</div><div class='ctx'> 		.tx_buf		= data,</div><div class='ctx'> 		.len		= size + 1,</div><div class='del'>-		.cs_change	= sigma_delta-&gt;bus_locked,</div><div class='add'>+		.cs_change	= sigma_delta-&gt;keep_cs_asserted,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -121,6 +121,7 @@ static int ad_sd_read_reg_raw(struct ad_sigma_delta *sigma_delta,</div><div class='ctx'> 	if (sigma_delta-&gt;info-&gt;has_registers) {</div><div class='ctx'> 		data[0] = reg &lt;&lt; sigma_delta-&gt;info-&gt;addr_shift;</div><div class='ctx'> 		data[0] |= sigma_delta-&gt;info-&gt;read_mask;</div><div class='add'>+		data[0] |= sigma_delta-&gt;comm;</div><div class='ctx'> 		spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='ctx'> 	}</div><div class='ctx'> 	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='hunk'>@@ -217,6 +218,7 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,</div><div class='ctx'> </div><div class='ctx'> 	spi_bus_lock(sigma_delta-&gt;spi-&gt;master);</div><div class='ctx'> 	sigma_delta-&gt;bus_locked = true;</div><div class='add'>+	sigma_delta-&gt;keep_cs_asserted = true;</div><div class='ctx'> 	reinit_completion(&amp;sigma_delta-&gt;completion);</div><div class='ctx'> </div><div class='ctx'> 	ret = ad_sigma_delta_set_mode(sigma_delta, mode);</div><div class='hunk'>@@ -234,9 +236,10 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	sigma_delta-&gt;keep_cs_asserted = false;</div><div class='add'>+	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);</div><div class='ctx'> 	sigma_delta-&gt;bus_locked = false;</div><div class='ctx'> 	spi_bus_unlock(sigma_delta-&gt;spi-&gt;master);</div><div class='del'>-	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -289,6 +292,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,</div><div class='ctx'> </div><div class='ctx'> 	spi_bus_lock(sigma_delta-&gt;spi-&gt;master);</div><div class='ctx'> 	sigma_delta-&gt;bus_locked = true;</div><div class='add'>+	sigma_delta-&gt;keep_cs_asserted = true;</div><div class='ctx'> 	reinit_completion(&amp;sigma_delta-&gt;completion);</div><div class='ctx'> </div><div class='ctx'> 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_SINGLE);</div><div class='hunk'>@@ -298,9 +302,6 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,</div><div class='ctx'> 	ret = wait_for_completion_interruptible_timeout(</div><div class='ctx'> 			&amp;sigma_delta-&gt;completion, HZ);</div><div class='ctx'> </div><div class='del'>-	sigma_delta-&gt;bus_locked = false;</div><div class='del'>-	spi_bus_unlock(sigma_delta-&gt;spi-&gt;master);</div><div class='del'>-</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -321,7 +322,10 @@ out:</div><div class='ctx'> 		sigma_delta-&gt;irq_dis = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sigma_delta-&gt;keep_cs_asserted = false;</div><div class='ctx'> 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);</div><div class='add'>+	sigma_delta-&gt;bus_locked = false;</div><div class='add'>+	spi_bus_unlock(sigma_delta-&gt;spi-&gt;master);</div><div class='ctx'> 	mutex_unlock(&amp;indio_dev-&gt;mlock);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -358,6 +362,8 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)</div><div class='ctx'> </div><div class='ctx'> 	spi_bus_lock(sigma_delta-&gt;spi-&gt;master);</div><div class='ctx'> 	sigma_delta-&gt;bus_locked = true;</div><div class='add'>+	sigma_delta-&gt;keep_cs_asserted = true;</div><div class='add'>+</div><div class='ctx'> 	ret = ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_CONTINUOUS);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_unlock;</div><div class='hunk'>@@ -386,6 +392,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev)</div><div class='ctx'> 		sigma_delta-&gt;irq_dis = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sigma_delta-&gt;keep_cs_asserted = false;</div><div class='ctx'> 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);</div><div class='ctx'> </div><div class='ctx'> 	sigma_delta-&gt;bus_locked = false;</div><div class='head'>diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c<br/>index 75d2f73582a3..596841a3c4db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/at91_adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/at91_adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/at91_adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/at91_adc.c</a></div><div class='hunk'>@@ -704,23 +704,29 @@ static int at91_adc_read_raw(struct iio_dev *idev,</div><div class='ctx'> 		ret = wait_event_interruptible_timeout(st-&gt;wq_data_avail,</div><div class='ctx'> 						       st-&gt;done,</div><div class='ctx'> 						       msecs_to_jiffies(1000));</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			ret = -ETIMEDOUT;</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			mutex_unlock(&amp;st-&gt;lock);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*val = st-&gt;last_value;</div><div class='ctx'> </div><div class='add'>+		/* Disable interrupts, regardless if adc conversion was</div><div class='add'>+		 * successful or not</div><div class='add'>+		 */</div><div class='ctx'> 		at91_adc_writel(st, AT91_ADC_CHDR,</div><div class='ctx'> 				AT91_ADC_CH(chan-&gt;channel));</div><div class='ctx'> 		at91_adc_writel(st, AT91_ADC_IDR, BIT(chan-&gt;channel));</div><div class='ctx'> </div><div class='del'>-		st-&gt;last_value = 0;</div><div class='del'>-		st-&gt;done = false;</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			/* a valid conversion took place */</div><div class='add'>+			*val = st-&gt;last_value;</div><div class='add'>+			st-&gt;last_value = 0;</div><div class='add'>+			st-&gt;done = false;</div><div class='add'>+			ret = IIO_VAL_INT;</div><div class='add'>+		} else if (ret == 0) {</div><div class='add'>+			/* conversion timeout */</div><div class='add'>+			dev_err(&amp;idev-&gt;dev, "ADC Channel %d timeout.\n",</div><div class='add'>+				chan-&gt;channel);</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		mutex_unlock(&amp;st-&gt;lock);</div><div class='del'>-		return IIO_VAL_INT;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	case IIO_CHAN_INFO_SCALE:</div><div class='ctx'> 		*val = st-&gt;vref_mv;</div><div class='head'>diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c<br/>index ad6764fb2a23..958a34dd88ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/imx7d_adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/imx7d_adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/imx7d_adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/imx7d_adc.c</a></div><div class='hunk'>@@ -388,8 +388,9 @@ static irqreturn_t imx7d_adc_isr(int irq, void *dev_id)</div><div class='ctx'> 	 * timeout flags.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (status &amp; IMX7D_REG_ADC_INT_STATUS_CHANNEL_CONV_TIME_OUT) {</div><div class='del'>-		pr_err("%s: ADC got conversion time out interrupt: 0x%08x\n",</div><div class='del'>-			dev_name(info-&gt;dev), status);</div><div class='add'>+		dev_err(info-&gt;dev,</div><div class='add'>+			"ADC got conversion time out interrupt: 0x%08x\n",</div><div class='add'>+			status);</div><div class='ctx'> 		status &amp;= ~IMX7D_REG_ADC_INT_STATUS_CHANNEL_CONV_TIME_OUT;</div><div class='ctx'> 		writel(status, info-&gt;regs + IMX7D_REG_ADC_INT_STATUS);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -433,167 +434,139 @@ static void imx7d_adc_power_down(struct imx7d_adc *info)</div><div class='ctx'> 	writel(adc_cfg, info-&gt;regs + IMX7D_REG_ADC_ADC_CFG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int imx7d_adc_enable(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_get_drvdata(dev);</div><div class='add'>+	struct imx7d_adc *info = iio_priv(indio_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regulator_enable(info-&gt;vref);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev,</div><div class='add'>+			"Can't enable adc reference top voltage, err = %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 = clk_prepare_enable(info-&gt;clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev,</div><div class='add'>+			"Could not prepare or enable clock.\n");</div><div class='add'>+		regulator_disable(info-&gt;vref);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	imx7d_adc_hw_init(info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int imx7d_adc_disable(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_get_drvdata(dev);</div><div class='add'>+	struct imx7d_adc *info = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	imx7d_adc_power_down(info);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(info-&gt;clk);</div><div class='add'>+	regulator_disable(info-&gt;vref);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __imx7d_adc_disable(void *data)</div><div class='add'>+{</div><div class='add'>+	imx7d_adc_disable(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int imx7d_adc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct imx7d_adc *info;</div><div class='ctx'> 	struct iio_dev *indio_dev;</div><div class='del'>-	struct resource *mem;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	indio_dev = devm_iio_device_alloc(&amp;pdev-&gt;dev, sizeof(*info));</div><div class='add'>+	indio_dev = devm_iio_device_alloc(dev, sizeof(*info));</div><div class='ctx'> 	if (!indio_dev) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed allocating iio device\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = iio_priv(indio_dev);</div><div class='del'>-	info-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	info-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	info-&gt;regs = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='add'>+	info-&gt;regs = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(info-&gt;regs)) {</div><div class='ctx'> 		ret = PTR_ERR(info-&gt;regs);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Failed to remap adc memory, err = %d\n", ret);</div><div class='add'>+		dev_err(dev, "Failed to remap adc memory, err = %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</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='add'>+		dev_err(dev, "No irq resource?\n");</div><div class='ctx'> 		return irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, "adc");</div><div class='add'>+	info-&gt;clk = devm_clk_get(dev, "adc");</div><div class='ctx'> 	if (IS_ERR(info-&gt;clk)) {</div><div class='ctx'> 		ret = PTR_ERR(info-&gt;clk);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed getting clock, err = %d\n", ret);</div><div class='add'>+		dev_err(dev, "Failed getting clock, err = %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info-&gt;vref = devm_regulator_get(&amp;pdev-&gt;dev, "vref");</div><div class='add'>+	info-&gt;vref = devm_regulator_get(dev, "vref");</div><div class='ctx'> 	if (IS_ERR(info-&gt;vref)) {</div><div class='ctx'> 		ret = PTR_ERR(info-&gt;vref);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+		dev_err(dev,</div><div class='ctx'> 			"Failed getting reference voltage, err = %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = regulator_enable(info-&gt;vref);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Can't enable adc reference top voltage, err = %d\n",</div><div class='del'>-			ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	platform_set_drvdata(pdev, indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;info-&gt;completion);</div><div class='ctx'> </div><div class='del'>-	indio_dev-&gt;name = dev_name(&amp;pdev-&gt;dev);</div><div class='del'>-	indio_dev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	indio_dev-&gt;name = dev_name(dev);</div><div class='add'>+	indio_dev-&gt;dev.parent = dev;</div><div class='ctx'> 	indio_dev-&gt;info = &amp;imx7d_adc_iio_info;</div><div class='ctx'> 	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='ctx'> 	indio_dev-&gt;channels = imx7d_adc_iio_channels;</div><div class='ctx'> 	indio_dev-&gt;num_channels = ARRAY_SIZE(imx7d_adc_iio_channels);</div><div class='ctx'> </div><div class='del'>-	ret = clk_prepare_enable(info-&gt;clk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Could not prepare or enable the clock.\n");</div><div class='del'>-		goto error_adc_clk_enable;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = devm_request_irq(info-&gt;dev, irq,</div><div class='del'>-				imx7d_adc_isr, 0,</div><div class='del'>-				dev_name(&amp;pdev-&gt;dev), info);</div><div class='add'>+	ret = devm_request_irq(dev, irq,</div><div class='add'>+			       imx7d_adc_isr, 0,</div><div class='add'>+			       dev_name(dev), info);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed requesting irq, irq = %d\n", irq);</div><div class='del'>-		goto error_iio_device_register;</div><div class='add'>+		dev_err(dev, "Failed requesting irq, irq = %d\n", irq);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	imx7d_adc_feature_config(info);</div><div class='del'>-	imx7d_adc_hw_init(info);</div><div class='del'>-</div><div class='del'>-	ret = iio_device_register(indio_dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		imx7d_adc_power_down(info);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Couldn't register the device.\n");</div><div class='del'>-		goto error_iio_device_register;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error_iio_device_register:</div><div class='del'>-	clk_disable_unprepare(info-&gt;clk);</div><div class='del'>-error_adc_clk_enable:</div><div class='del'>-	regulator_disable(info-&gt;vref);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int imx7d_adc_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct iio_dev *indio_dev = platform_get_drvdata(pdev);</div><div class='del'>-	struct imx7d_adc *info = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	iio_device_unregister(indio_dev);</div><div class='del'>-</div><div class='del'>-	imx7d_adc_power_down(info);</div><div class='del'>-</div><div class='del'>-	clk_disable_unprepare(info-&gt;clk);</div><div class='del'>-	regulator_disable(info-&gt;vref);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused imx7d_adc_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct iio_dev *indio_dev = dev_get_drvdata(dev);</div><div class='del'>-	struct imx7d_adc *info = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	imx7d_adc_power_down(info);</div><div class='del'>-</div><div class='del'>-	clk_disable_unprepare(info-&gt;clk);</div><div class='del'>-	regulator_disable(info-&gt;vref);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int __maybe_unused imx7d_adc_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct iio_dev *indio_dev = dev_get_drvdata(dev);</div><div class='del'>-	struct imx7d_adc *info = iio_priv(indio_dev);</div><div class='del'>-	int ret;</div><div class='add'>+	ret = imx7d_adc_enable(&amp;indio_dev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = regulator_enable(info-&gt;vref);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(info-&gt;dev,</div><div class='del'>-			"Can't enable adc reference top voltage, err = %d\n",</div><div class='del'>-			ret);</div><div class='add'>+	ret = devm_add_action_or_reset(dev, __imx7d_adc_disable,</div><div class='add'>+				       &amp;indio_dev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	ret = clk_prepare_enable(info-&gt;clk);</div><div class='add'>+	ret = devm_iio_device_register(dev, indio_dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(info-&gt;dev,</div><div class='del'>-			"Could not prepare or enable clock.\n");</div><div class='del'>-		regulator_disable(info-&gt;vref);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Couldn't register the device.\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	imx7d_adc_hw_init(info);</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(imx7d_adc_pm_ops, imx7d_adc_suspend, imx7d_adc_resume);</div><div class='add'>+static SIMPLE_DEV_PM_OPS(imx7d_adc_pm_ops, imx7d_adc_disable, imx7d_adc_enable);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver imx7d_adc_driver = {</div><div class='ctx'> 	.probe		= imx7d_adc_probe,</div><div class='del'>-	.remove		= imx7d_adc_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "imx7d_adc",</div><div class='ctx'> 		.of_match_table = imx7d_adc_match,</div><div class='head'>diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c<br/>index 6ee1673deb0d..92b1d5037ac9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ingenic-adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ingenic-adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ingenic-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ingenic-adc.c</a></div><div class='hunk'>@@ -302,10 +302,8 @@ static int ingenic_adc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mem_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	adc-&gt;base = devm_ioremap_resource(dev, mem_base);</div><div class='del'>-	if (IS_ERR(adc-&gt;base)) {</div><div class='del'>-		dev_err(dev, "Unable to ioremap mmio resource\n");</div><div class='add'>+	if (IS_ERR(adc-&gt;base))</div><div class='ctx'> 		return PTR_ERR(adc-&gt;base);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	adc-&gt;clk = devm_clk_get(dev, "adc");</div><div class='ctx'> 	if (IS_ERR(adc-&gt;clk)) {</div><div class='head'>diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c<br/>index e361c1532a75..a6ee1c3a9064 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/lpc32xx_adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/lpc32xx_adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/lpc32xx_adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/lpc32xx_adc.c</a></div><div class='hunk'>@@ -7,20 +7,15 @@</div><div class='ctx'>  *  Copyright (C) 2011, 2012 Roland Stigge &lt;stigge@antcom.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.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/io.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/iio/iio.h&gt;</div><div class='del'>-#include &lt;linux/iio/sysfs.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/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * LPC32XX registers definitions</div><div class='hunk'>@@ -52,6 +47,7 @@ struct lpc32xx_adc_state {</div><div class='ctx'> 	void __iomem *adc_base;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	struct completion completion;</div><div class='add'>+	struct regulator *vref;</div><div class='ctx'> </div><div class='ctx'> 	u32 value;</div><div class='ctx'> };</div><div class='hunk'>@@ -64,7 +60,9 @@ static int lpc32xx_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct lpc32xx_adc_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	int ret;</div><div class='del'>-	if (mask == IIO_CHAN_INFO_RAW) {</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='ctx'> 		mutex_lock(&amp;indio_dev-&gt;mlock);</div><div class='ctx'> 		ret = clk_prepare_enable(st-&gt;clk);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -84,22 +82,36 @@ static int lpc32xx_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 		mutex_unlock(&amp;indio_dev-&gt;mlock);</div><div class='ctx'> </div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		*val = regulator_get_voltage(st-&gt;vref) / 1000;</div><div class='add'>+		*val2 =  10;</div><div class='add'>+</div><div class='add'>+		return IIO_VAL_FRACTIONAL_LOG2;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iio_info lpc32xx_adc_iio_info = {</div><div class='ctx'> 	.read_raw = &amp;lpc32xx_read_raw,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define LPC32XX_ADC_CHANNEL(_index) {			\</div><div class='add'>+#define LPC32XX_ADC_CHANNEL_BASE(_index)		\</div><div class='ctx'> 	.type = IIO_VOLTAGE,				\</div><div class='ctx'> 	.indexed = 1,					\</div><div class='ctx'> 	.channel = _index,				\</div><div class='ctx'> 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\</div><div class='ctx'> 	.address = LPC32XXAD_IN * _index,		\</div><div class='del'>-	.scan_index = _index,				\</div><div class='add'>+	.scan_index = _index,</div><div class='add'>+</div><div class='add'>+#define LPC32XX_ADC_CHANNEL(_index) {		\</div><div class='add'>+	LPC32XX_ADC_CHANNEL_BASE(_index)	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LPC32XX_ADC_SCALE_CHANNEL(_index) {			\</div><div class='add'>+	LPC32XX_ADC_CHANNEL_BASE(_index)			\</div><div class='add'>+	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE)	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iio_chan_spec lpc32xx_adc_iio_channels[] = {</div><div class='hunk'>@@ -108,6 +120,12 @@ static const struct iio_chan_spec lpc32xx_adc_iio_channels[] = {</div><div class='ctx'> 	LPC32XX_ADC_CHANNEL(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct iio_chan_spec lpc32xx_adc_iio_scale_channels[] = {</div><div class='add'>+	LPC32XX_ADC_SCALE_CHANNEL(0),</div><div class='add'>+	LPC32XX_ADC_SCALE_CHANNEL(1),</div><div class='add'>+	LPC32XX_ADC_SCALE_CHANNEL(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static irqreturn_t lpc32xx_adc_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpc32xx_adc_state *st = dev_id;</div><div class='hunk'>@@ -166,6 +184,15 @@ static int lpc32xx_adc_probe(struct platform_device *pdev)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	st-&gt;vref = devm_regulator_get(&amp;pdev-&gt;dev, "vref");</div><div class='add'>+	if (IS_ERR(st-&gt;vref)) {</div><div class='add'>+		iodev-&gt;channels = lpc32xx_adc_iio_channels;</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+			 "Missing vref regulator: No scaling available\n");</div><div class='add'>+	} else {</div><div class='add'>+		iodev-&gt;channels = lpc32xx_adc_iio_scale_channels;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	platform_set_drvdata(pdev, iodev);</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;st-&gt;completion);</div><div class='hunk'>@@ -174,7 +201,6 @@ static int lpc32xx_adc_probe(struct platform_device *pdev)</div><div class='ctx'> 	iodev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 	iodev-&gt;info = &amp;lpc32xx_adc_iio_info;</div><div class='ctx'> 	iodev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='del'>-	iodev-&gt;channels = lpc32xx_adc_iio_channels;</div><div class='ctx'> 	iodev-&gt;num_channels = ARRAY_SIZE(lpc32xx_adc_iio_channels);</div><div class='ctx'> </div><div class='ctx'> 	retval = devm_iio_device_register(&amp;pdev-&gt;dev, iodev);</div><div class='head'>diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c<br/>index f8600fbcdfe3..510d8b7ef3a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/meson_saradc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/meson_saradc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/meson_saradc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/meson_saradc.c</a></div><div class='hunk'>@@ -1150,6 +1150,11 @@ static const struct meson_sar_adc_data meson_sar_adc_axg_data = {</div><div class='ctx'> 	.name = "meson-axg-saradc",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct meson_sar_adc_data meson_sar_adc_g12a_data = {</div><div class='add'>+	.param = &amp;meson_sar_adc_gxl_param,</div><div class='add'>+	.name = "meson-g12a-saradc",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id meson_sar_adc_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "amlogic,meson8-saradc",</div><div class='hunk'>@@ -1175,6 +1180,9 @@ static const struct of_device_id meson_sar_adc_of_match[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.compatible = "amlogic,meson-axg-saradc",</div><div class='ctx'> 		.data = &amp;meson_sar_adc_axg_data,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "amlogic,meson-g12a-saradc",</div><div class='add'>+		.data = &amp;meson_sar_adc_g12a_data,</div><div class='ctx'> 	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c<br/>index c627513d9f0f..5384472b6c4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/mxs-lradc-adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/mxs-lradc-adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/mxs-lradc-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/mxs-lradc-adc.c</a></div><div class='hunk'>@@ -465,6 +465,8 @@ static int mxs_lradc_adc_trigger_init(struct iio_dev *iio)</div><div class='ctx'> </div><div class='ctx'> 	trig = devm_iio_trigger_alloc(&amp;iio-&gt;dev, "%s-dev%i", iio-&gt;name,</div><div class='ctx'> 				      iio-&gt;id);</div><div class='add'>+	if (!trig)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	trig-&gt;dev.parent = adc-&gt;dev;</div><div class='ctx'> 	iio_trigger_set_drvdata(trig, iio);</div><div class='head'>diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c<br/>index 6a866cc187f7..21fdcde77883 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/qcom-spmi-adc5.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/qcom-spmi-adc5.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/qcom-spmi-adc5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/qcom-spmi-adc5.c</a></div><div class='hunk'>@@ -664,6 +664,7 @@ static const struct of_device_id adc5_match_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(of, adc5_match_table);</div><div class='ctx'> </div><div class='ctx'> static int adc5_get_dt_data(struct adc5_chip *adc, struct device_node *node)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c<br/>index fcd4a1c00ca0..19adc2b23472 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/stm32-dfsdm-adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/stm32-dfsdm-adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/stm32-dfsdm-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/stm32-dfsdm-adc.c</a></div><div class='hunk'>@@ -12,6 +12,11 @@</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/hw-consumer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/iio/timer/stm32-lptim-trigger.h&gt;</div><div class='add'>+#include &lt;linux/iio/timer/stm32-timer-trigger.h&gt;</div><div class='add'>+#include &lt;linux/iio/trigger.h&gt;</div><div class='add'>+#include &lt;linux/iio/trigger_consumer.h&gt;</div><div class='add'>+#include &lt;linux/iio/triggered_buffer.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='hunk'>@@ -38,6 +43,11 @@</div><div class='ctx'> #define DFSDM_MAX_RES BIT(31)</div><div class='ctx'> #define DFSDM_DATA_RES BIT(23)</div><div class='ctx'> </div><div class='add'>+/* Filter configuration */</div><div class='add'>+#define DFSDM_CR1_CFG_MASK (DFSDM_CR1_RCH_MASK | DFSDM_CR1_RCONT_MASK | \</div><div class='add'>+			    DFSDM_CR1_RSYNC_MASK | DFSDM_CR1_JSYNC_MASK | \</div><div class='add'>+			    DFSDM_CR1_JSCAN_MASK)</div><div class='add'>+</div><div class='ctx'> enum sd_converter_type {</div><div class='ctx'> 	DFSDM_AUDIO,</div><div class='ctx'> 	DFSDM_IIO,</div><div class='hunk'>@@ -54,6 +64,8 @@ struct stm32_dfsdm_adc {</div><div class='ctx'> 	struct stm32_dfsdm *dfsdm;</div><div class='ctx'> 	const struct stm32_dfsdm_dev_data *dev_data;</div><div class='ctx'> 	unsigned int fl_id;</div><div class='add'>+	unsigned int nconv;</div><div class='add'>+	unsigned long smask;</div><div class='ctx'> </div><div class='ctx'> 	/* ADC specific */</div><div class='ctx'> 	unsigned int oversamp;</div><div class='hunk'>@@ -114,6 +126,61 @@ static int stm32_dfsdm_str2val(const char *str,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct stm32_dfsdm_trig_info - DFSDM trigger info</div><div class='add'>+ * @name:		name of the trigger, corresponding to its source</div><div class='add'>+ * @jextsel:		trigger signal selection</div><div class='add'>+ */</div><div class='add'>+struct stm32_dfsdm_trig_info {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int jextsel;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hardware injected trigger enable, edge selection */</div><div class='add'>+enum stm32_dfsdm_jexten {</div><div class='add'>+	STM32_DFSDM_JEXTEN_DISABLED,</div><div class='add'>+	STM32_DFSDM_JEXTEN_RISING_EDGE,</div><div class='add'>+	STM32_DFSDM_JEXTEN_FALLING_EDGE,</div><div class='add'>+	STM32_DFSDM_EXTEN_BOTH_EDGES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32_dfsdm_trig_info stm32_dfsdm_trigs[] = {</div><div class='add'>+	{ TIM1_TRGO, 0 },</div><div class='add'>+	{ TIM1_TRGO2, 1 },</div><div class='add'>+	{ TIM8_TRGO, 2 },</div><div class='add'>+	{ TIM8_TRGO2, 3 },</div><div class='add'>+	{ TIM3_TRGO, 4 },</div><div class='add'>+	{ TIM4_TRGO, 5 },</div><div class='add'>+	{ TIM16_OC1, 6 },</div><div class='add'>+	{ TIM6_TRGO, 7 },</div><div class='add'>+	{ TIM7_TRGO, 8 },</div><div class='add'>+	{ LPTIM1_OUT, 26 },</div><div class='add'>+	{ LPTIM2_OUT, 27 },</div><div class='add'>+	{ LPTIM3_OUT, 28 },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_dfsdm_get_jextsel(struct iio_dev *indio_dev,</div><div class='add'>+				   struct iio_trigger *trig)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* lookup triggers registered by stm32 timer trigger driver */</div><div class='add'>+	for (i = 0; stm32_dfsdm_trigs[i].name; i++) {</div><div class='add'>+		/**</div><div class='add'>+		 * Checking both stm32 timer trigger type and trig name</div><div class='add'>+		 * should be safe against arbitrary trigger names.</div><div class='add'>+		 */</div><div class='add'>+		if ((is_stm32_timer_trigger(trig) ||</div><div class='add'>+		     is_stm32_lptim_trigger(trig)) &amp;&amp;</div><div class='add'>+		    !strcmp(stm32_dfsdm_trigs[i].name, trig-&gt;name)) {</div><div class='add'>+			return stm32_dfsdm_trigs[i].jextsel;</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='ctx'> static int stm32_dfsdm_set_osrs(struct stm32_dfsdm_filter *fl,</div><div class='ctx'> 				unsigned int fast, unsigned int oversamp)</div><div class='ctx'> {</div><div class='hunk'>@@ -200,19 +267,39 @@ static int stm32_dfsdm_set_osrs(struct stm32_dfsdm_filter *fl,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stm32_dfsdm_start_channel(struct stm32_dfsdm *dfsdm,</div><div class='del'>-				     unsigned int ch_id)</div><div class='add'>+static int stm32_dfsdm_start_channel(struct stm32_dfsdm_adc *adc)</div><div class='ctx'> {</div><div class='del'>-	return regmap_update_bits(dfsdm-&gt;regmap, DFSDM_CHCFGR1(ch_id),</div><div class='del'>-				  DFSDM_CHCFGR1_CHEN_MASK,</div><div class='del'>-				  DFSDM_CHCFGR1_CHEN(1));</div><div class='add'>+	struct iio_dev *indio_dev = iio_priv_to_dev(adc);</div><div class='add'>+	struct regmap *regmap = adc-&gt;dfsdm-&gt;regmap;</div><div class='add'>+	const struct iio_chan_spec *chan;</div><div class='add'>+	unsigned int bit;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, &amp;adc-&gt;smask, sizeof(adc-&gt;smask) * BITS_PER_BYTE) {</div><div class='add'>+		chan = indio_dev-&gt;channels + bit;</div><div class='add'>+		ret = regmap_update_bits(regmap, DFSDM_CHCFGR1(chan-&gt;channel),</div><div class='add'>+					 DFSDM_CHCFGR1_CHEN_MASK,</div><div class='add'>+					 DFSDM_CHCFGR1_CHEN(1));</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='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stm32_dfsdm_stop_channel(struct stm32_dfsdm *dfsdm,</div><div class='del'>-				     unsigned int ch_id)</div><div class='add'>+static void stm32_dfsdm_stop_channel(struct stm32_dfsdm_adc *adc)</div><div class='ctx'> {</div><div class='del'>-	regmap_update_bits(dfsdm-&gt;regmap, DFSDM_CHCFGR1(ch_id),</div><div class='del'>-			   DFSDM_CHCFGR1_CHEN_MASK, DFSDM_CHCFGR1_CHEN(0));</div><div class='add'>+	struct iio_dev *indio_dev = iio_priv_to_dev(adc);</div><div class='add'>+	struct regmap *regmap = adc-&gt;dfsdm-&gt;regmap;</div><div class='add'>+	const struct iio_chan_spec *chan;</div><div class='add'>+	unsigned int bit;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, &amp;adc-&gt;smask, sizeof(adc-&gt;smask) * BITS_PER_BYTE) {</div><div class='add'>+		chan = indio_dev-&gt;channels + bit;</div><div class='add'>+		regmap_update_bits(regmap, DFSDM_CHCFGR1(chan-&gt;channel),</div><div class='add'>+				   DFSDM_CHCFGR1_CHEN_MASK,</div><div class='add'>+				   DFSDM_CHCFGR1_CHEN(0));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_dfsdm_chan_configure(struct stm32_dfsdm *dfsdm,</div><div class='hunk'>@@ -237,9 +324,11 @@ static int stm32_dfsdm_chan_configure(struct stm32_dfsdm *dfsdm,</div><div class='ctx'> 				  DFSDM_CHCFGR1_CHINSEL(ch-&gt;alt_si));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stm32_dfsdm_start_filter(struct stm32_dfsdm *dfsdm,</div><div class='del'>-				    unsigned int fl_id)</div><div class='add'>+static int stm32_dfsdm_start_filter(struct stm32_dfsdm_adc *adc,</div><div class='add'>+				    unsigned int fl_id,</div><div class='add'>+				    struct iio_trigger *trig)</div><div class='ctx'> {</div><div class='add'>+	struct stm32_dfsdm *dfsdm = adc-&gt;dfsdm;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable filter */</div><div class='hunk'>@@ -248,7 +337,11 @@ static int stm32_dfsdm_start_filter(struct stm32_dfsdm *dfsdm,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Start conversion */</div><div class='add'>+	/* Nothing more to do for injected (scan mode/triggered) conversions */</div><div class='add'>+	if (adc-&gt;nconv &gt; 1 || trig)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Software start (single or continuous) regular conversion */</div><div class='ctx'> 	return regmap_update_bits(dfsdm-&gt;regmap, DFSDM_CR1(fl_id),</div><div class='ctx'> 				  DFSDM_CR1_RSWSTART_MASK,</div><div class='ctx'> 				  DFSDM_CR1_RSWSTART(1));</div><div class='hunk'>@@ -262,11 +355,45 @@ static void stm32_dfsdm_stop_filter(struct stm32_dfsdm *dfsdm,</div><div class='ctx'> 			   DFSDM_CR1_DFEN_MASK, DFSDM_CR1_DFEN(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stm32_dfsdm_filter_configure(struct stm32_dfsdm *dfsdm,</div><div class='del'>-					unsigned int fl_id, unsigned int ch_id)</div><div class='add'>+static int stm32_dfsdm_filter_set_trig(struct stm32_dfsdm_adc *adc,</div><div class='add'>+				       unsigned int fl_id,</div><div class='add'>+				       struct iio_trigger *trig)</div><div class='ctx'> {</div><div class='del'>-	struct regmap *regmap = dfsdm-&gt;regmap;</div><div class='del'>-	struct stm32_dfsdm_filter *fl = &amp;dfsdm-&gt;fl_list[fl_id];</div><div class='add'>+	struct iio_dev *indio_dev = iio_priv_to_dev(adc);</div><div class='add'>+	struct regmap *regmap = adc-&gt;dfsdm-&gt;regmap;</div><div class='add'>+	u32 jextsel = 0, jexten = STM32_DFSDM_JEXTEN_DISABLED;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (trig) {</div><div class='add'>+		ret = stm32_dfsdm_get_jextsel(indio_dev, trig);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* set trigger source and polarity (default to rising edge) */</div><div class='add'>+		jextsel = ret;</div><div class='add'>+		jexten = STM32_DFSDM_JEXTEN_RISING_EDGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, DFSDM_CR1(fl_id),</div><div class='add'>+				 DFSDM_CR1_JEXTSEL_MASK | DFSDM_CR1_JEXTEN_MASK,</div><div class='add'>+				 DFSDM_CR1_JEXTSEL(jextsel) |</div><div class='add'>+				 DFSDM_CR1_JEXTEN(jexten));</div><div class='add'>+	if (ret &lt; 0)</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 stm32_dfsdm_filter_configure(struct stm32_dfsdm_adc *adc,</div><div class='add'>+					unsigned int fl_id,</div><div class='add'>+					struct iio_trigger *trig)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = iio_priv_to_dev(adc);</div><div class='add'>+	struct regmap *regmap = adc-&gt;dfsdm-&gt;regmap;</div><div class='add'>+	struct stm32_dfsdm_filter *fl = &amp;adc-&gt;dfsdm-&gt;fl_list[fl_id];</div><div class='add'>+	u32 cr1;</div><div class='add'>+	const struct iio_chan_spec *chan;</div><div class='add'>+	unsigned int bit, jchg = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Average integrator oversampling */</div><div class='hunk'>@@ -286,15 +413,68 @@ static int stm32_dfsdm_filter_configure(struct stm32_dfsdm *dfsdm,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* No scan mode supported for the moment */</div><div class='del'>-	ret = regmap_update_bits(regmap, DFSDM_CR1(fl_id), DFSDM_CR1_RCH_MASK,</div><div class='del'>-				 DFSDM_CR1_RCH(ch_id));</div><div class='add'>+	ret = stm32_dfsdm_filter_set_trig(adc, fl_id, trig);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(regmap, DFSDM_CR1(fl_id),</div><div class='del'>-				  DFSDM_CR1_RSYNC_MASK,</div><div class='del'>-				  DFSDM_CR1_RSYNC(fl-&gt;sync_mode));</div><div class='add'>+	/*</div><div class='add'>+	 * DFSDM modes configuration W.R.T audio/iio type modes</div><div class='add'>+	 * ----------------------------------------------------------------</div><div class='add'>+	 * Modes         | regular |  regular     | injected | injected   |</div><div class='add'>+	 *               |         |  continuous  |          | + scan     |</div><div class='add'>+	 * --------------|---------|--------------|----------|------------|</div><div class='add'>+	 * single conv   |    x    |              |          |            |</div><div class='add'>+	 * (1 chan)      |         |              |          |            |</div><div class='add'>+	 * --------------|---------|--------------|----------|------------|</div><div class='add'>+	 * 1 Audio chan	 |         | sample freq  |          |            |</div><div class='add'>+	 *               |         | or sync_mode |          |            |</div><div class='add'>+	 * --------------|---------|--------------|----------|------------|</div><div class='add'>+	 * 1 IIO chan	 |         | sample freq  | trigger  |            |</div><div class='add'>+	 *               |         | or sync_mode |          |            |</div><div class='add'>+	 * --------------|---------|--------------|----------|------------|</div><div class='add'>+	 * 2+ IIO chans  |         |              |          | trigger or |</div><div class='add'>+	 *               |         |              |          | sync_mode  |</div><div class='add'>+	 * ----------------------------------------------------------------</div><div class='add'>+	 */</div><div class='add'>+	if (adc-&gt;nconv == 1 &amp;&amp; !trig) {</div><div class='add'>+		bit = __ffs(adc-&gt;smask);</div><div class='add'>+		chan = indio_dev-&gt;channels + bit;</div><div class='add'>+</div><div class='add'>+		/* Use regular conversion for single channel without trigger */</div><div class='add'>+		cr1 = DFSDM_CR1_RCH(chan-&gt;channel);</div><div class='add'>+</div><div class='add'>+		/* Continuous conversions triggered by SPI clk in buffer mode */</div><div class='add'>+		if (indio_dev-&gt;currentmode &amp; INDIO_BUFFER_SOFTWARE)</div><div class='add'>+			cr1 |= DFSDM_CR1_RCONT(1);</div><div class='add'>+</div><div class='add'>+		cr1 |= DFSDM_CR1_RSYNC(fl-&gt;sync_mode);</div><div class='add'>+	} else {</div><div class='add'>+		/* Use injected conversion for multiple channels */</div><div class='add'>+		for_each_set_bit(bit, &amp;adc-&gt;smask,</div><div class='add'>+				 sizeof(adc-&gt;smask) * BITS_PER_BYTE) {</div><div class='add'>+			chan = indio_dev-&gt;channels + bit;</div><div class='add'>+			jchg |= BIT(chan-&gt;channel);</div><div class='add'>+		}</div><div class='add'>+		ret = regmap_write(regmap, DFSDM_JCHGR(fl_id), jchg);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Use scan mode for multiple channels */</div><div class='add'>+		cr1 = DFSDM_CR1_JSCAN((adc-&gt;nconv &gt; 1) ? 1 : 0);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Continuous conversions not supported in injected mode,</div><div class='add'>+		 * either use:</div><div class='add'>+		 * - conversions in sync with filter 0</div><div class='add'>+		 * - triggered conversions</div><div class='add'>+		 */</div><div class='add'>+		if (!fl-&gt;sync_mode &amp;&amp; !trig)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		cr1 |= DFSDM_CR1_JSYNC(fl-&gt;sync_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(regmap, DFSDM_CR1(fl_id), DFSDM_CR1_CFG_MASK,</div><div class='add'>+				  cr1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,</div><div class='hunk'>@@ -378,13 +558,38 @@ static ssize_t dfsdm_adc_audio_get_spiclk(struct iio_dev *indio_dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", adc-&gt;spi_freq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dfsdm_adc_set_samp_freq(struct iio_dev *indio_dev,</div><div class='add'>+				   unsigned int sample_freq,</div><div class='add'>+				   unsigned int spi_freq)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='add'>+	struct stm32_dfsdm_filter *fl = &amp;adc-&gt;dfsdm-&gt;fl_list[adc-&gt;fl_id];</div><div class='add'>+	unsigned int oversamp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	oversamp = DIV_ROUND_CLOSEST(spi_freq, sample_freq);</div><div class='add'>+	if (spi_freq % sample_freq)</div><div class='add'>+		dev_dbg(&amp;indio_dev-&gt;dev,</div><div class='add'>+			"Rate not accurate. requested (%u), actual (%u)\n",</div><div class='add'>+			sample_freq, spi_freq / oversamp);</div><div class='add'>+</div><div class='add'>+	ret = stm32_dfsdm_set_osrs(fl, 0, oversamp);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;indio_dev-&gt;dev, "No filter parameters that match!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	adc-&gt;sample_freq = spi_freq / oversamp;</div><div class='add'>+	adc-&gt;oversamp = oversamp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t dfsdm_adc_audio_set_spiclk(struct iio_dev *indio_dev,</div><div class='ctx'> 					  uintptr_t priv,</div><div class='ctx'> 					  const struct iio_chan_spec *chan,</div><div class='ctx'> 					  const char *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='del'>-	struct stm32_dfsdm_filter *fl = &amp;adc-&gt;dfsdm-&gt;fl_list[adc-&gt;fl_id];</div><div class='ctx'> 	struct stm32_dfsdm_channel *ch = &amp;adc-&gt;dfsdm-&gt;ch_list[chan-&gt;channel];</div><div class='ctx'> 	unsigned int sample_freq = adc-&gt;sample_freq;</div><div class='ctx'> 	unsigned int spi_freq;</div><div class='hunk'>@@ -403,17 +608,9 @@ static ssize_t dfsdm_adc_audio_set_spiclk(struct iio_dev *indio_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (sample_freq) {</div><div class='del'>-		if (spi_freq % sample_freq)</div><div class='del'>-			dev_warn(&amp;indio_dev-&gt;dev,</div><div class='del'>-				 "Sampling rate not accurate (%d)\n",</div><div class='del'>-				 spi_freq / (spi_freq / sample_freq));</div><div class='del'>-</div><div class='del'>-		ret = stm32_dfsdm_set_osrs(fl, 0, (spi_freq / sample_freq));</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;indio_dev-&gt;dev,</div><div class='del'>-				"No filter parameters that match!\n");</div><div class='add'>+		ret = dfsdm_adc_set_samp_freq(indio_dev, sample_freq, spi_freq);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	adc-&gt;spi_freq = spi_freq;</div><div class='ctx'> </div><div class='hunk'>@@ -421,72 +618,44 @@ static ssize_t dfsdm_adc_audio_set_spiclk(struct iio_dev *indio_dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_dfsdm_start_conv(struct stm32_dfsdm_adc *adc,</div><div class='del'>-				  const struct iio_chan_spec *chan,</div><div class='del'>-				  bool dma)</div><div class='add'>+				  struct iio_trigger *trig)</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap = adc-&gt;dfsdm-&gt;regmap;</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned int dma_en = 0, cont_en = 0;</div><div class='ctx'> </div><div class='del'>-	ret = stm32_dfsdm_start_channel(adc-&gt;dfsdm, chan-&gt;channel);</div><div class='add'>+	ret = stm32_dfsdm_start_channel(adc);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = stm32_dfsdm_filter_configure(adc-&gt;dfsdm, adc-&gt;fl_id,</div><div class='del'>-					   chan-&gt;channel);</div><div class='add'>+	ret = stm32_dfsdm_filter_configure(adc, adc-&gt;fl_id, trig);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto stop_channels;</div><div class='ctx'> </div><div class='del'>-	if (dma) {</div><div class='del'>-		/* Enable DMA transfer*/</div><div class='del'>-		dma_en =  DFSDM_CR1_RDMAEN(1);</div><div class='del'>-		/* Enable conversion triggered by SPI clock*/</div><div class='del'>-		cont_en = DFSDM_CR1_RCONT(1);</div><div class='del'>-	}</div><div class='del'>-	/* Enable DMA transfer*/</div><div class='del'>-	ret = regmap_update_bits(regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='del'>-				 DFSDM_CR1_RDMAEN_MASK, dma_en);</div><div class='add'>+	ret = stm32_dfsdm_start_filter(adc, adc-&gt;fl_id, trig);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto stop_channels;</div><div class='del'>-</div><div class='del'>-	/* Enable conversion triggered by SPI clock*/</div><div class='del'>-	ret = regmap_update_bits(regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='del'>-				 DFSDM_CR1_RCONT_MASK, cont_en);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto stop_channels;</div><div class='del'>-</div><div class='del'>-	ret = stm32_dfsdm_start_filter(adc-&gt;dfsdm, adc-&gt;fl_id);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto stop_channels;</div><div class='add'>+		goto filter_unconfigure;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-stop_channels:</div><div class='del'>-	regmap_update_bits(regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='del'>-			   DFSDM_CR1_RDMAEN_MASK, 0);</div><div class='del'>-</div><div class='add'>+filter_unconfigure:</div><div class='ctx'> 	regmap_update_bits(regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='del'>-			   DFSDM_CR1_RCONT_MASK, 0);</div><div class='del'>-	stm32_dfsdm_stop_channel(adc-&gt;dfsdm, chan-&gt;channel);</div><div class='add'>+			   DFSDM_CR1_CFG_MASK, 0);</div><div class='add'>+stop_channels:</div><div class='add'>+	stm32_dfsdm_stop_channel(adc);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stm32_dfsdm_stop_conv(struct stm32_dfsdm_adc *adc,</div><div class='del'>-				  const struct iio_chan_spec *chan)</div><div class='add'>+static void stm32_dfsdm_stop_conv(struct stm32_dfsdm_adc *adc)</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap = adc-&gt;dfsdm-&gt;regmap;</div><div class='ctx'> </div><div class='ctx'> 	stm32_dfsdm_stop_filter(adc-&gt;dfsdm, adc-&gt;fl_id);</div><div class='ctx'> </div><div class='del'>-	/* Clean conversion options */</div><div class='del'>-	regmap_update_bits(regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='del'>-			   DFSDM_CR1_RDMAEN_MASK, 0);</div><div class='del'>-</div><div class='ctx'> 	regmap_update_bits(regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='del'>-			   DFSDM_CR1_RCONT_MASK, 0);</div><div class='add'>+			   DFSDM_CR1_CFG_MASK, 0);</div><div class='ctx'> </div><div class='del'>-	stm32_dfsdm_stop_channel(adc-&gt;dfsdm, chan-&gt;channel);</div><div class='add'>+	stm32_dfsdm_stop_channel(adc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_dfsdm_set_watermark(struct iio_dev *indio_dev,</div><div class='hunk'>@@ -494,6 +663,7 @@ static int stm32_dfsdm_set_watermark(struct iio_dev *indio_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='ctx'> 	unsigned int watermark = DFSDM_DMA_BUFFER_SIZE / 2;</div><div class='add'>+	unsigned int rx_buf_sz = DFSDM_DMA_BUFFER_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * DMA cyclic transfers are used, buffer is split into two periods.</div><div class='hunk'>@@ -502,7 +672,7 @@ static int stm32_dfsdm_set_watermark(struct iio_dev *indio_dev,</div><div class='ctx'> 	 * - one buffer (period) driver pushed to ASoC side.</div><div class='ctx'> 	 */</div><div class='ctx'> 	watermark = min(watermark, val * (unsigned int)(sizeof(u32)));</div><div class='del'>-	adc-&gt;buf_sz = watermark * 2;</div><div class='add'>+	adc-&gt;buf_sz = min(rx_buf_sz, watermark * 2 * adc-&gt;nconv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -532,13 +702,41 @@ static unsigned int stm32_dfsdm_adc_dma_residue(struct stm32_dfsdm_adc *adc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stm32_dfsdm_audio_dma_buffer_done(void *data)</div><div class='add'>+static irqreturn_t stm32_dfsdm_adc_trigger_handler(int irq, void *p)</div><div class='add'>+{</div><div class='add'>+	struct iio_poll_func *pf = p;</div><div class='add'>+	struct iio_dev *indio_dev = pf-&gt;indio_dev;</div><div class='add'>+	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='add'>+	int available = stm32_dfsdm_adc_dma_residue(adc);</div><div class='add'>+</div><div class='add'>+	while (available &gt;= indio_dev-&gt;scan_bytes) {</div><div class='add'>+		u32 *buffer = (u32 *)&amp;adc-&gt;rx_buf[adc-&gt;bufi];</div><div class='add'>+</div><div class='add'>+		iio_push_to_buffers_with_timestamp(indio_dev, buffer,</div><div class='add'>+						   pf-&gt;timestamp);</div><div class='add'>+		available -= indio_dev-&gt;scan_bytes;</div><div class='add'>+		adc-&gt;bufi += indio_dev-&gt;scan_bytes;</div><div class='add'>+		if (adc-&gt;bufi &gt;= adc-&gt;buf_sz)</div><div class='add'>+			adc-&gt;bufi = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iio_trigger_notify_done(indio_dev-&gt;trig);</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 stm32_dfsdm_dma_buffer_done(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iio_dev *indio_dev = data;</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='ctx'> 	int available = stm32_dfsdm_adc_dma_residue(adc);</div><div class='ctx'> 	size_t old_pos;</div><div class='ctx'> </div><div class='add'>+	if (indio_dev-&gt;currentmode &amp; INDIO_BUFFER_TRIGGERED) {</div><div class='add'>+		iio_trigger_poll_chained(indio_dev-&gt;trig);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME: In Kernel interface does not support cyclic DMA buffer,and</div><div class='ctx'> 	 * offers only an interface to push data samples per samples.</div><div class='hunk'>@@ -566,6 +764,9 @@ static void stm32_dfsdm_audio_dma_buffer_done(void *data)</div><div class='ctx'> 			adc-&gt;bufi = 0;</div><div class='ctx'> 			old_pos = 0;</div><div class='ctx'> 		}</div><div class='add'>+		/* regular iio buffer without trigger */</div><div class='add'>+		if (adc-&gt;dev_data-&gt;type == DFSDM_IIO)</div><div class='add'>+			iio_push_to_buffers(indio_dev, buffer);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (adc-&gt;cb)</div><div class='ctx'> 		adc-&gt;cb(&amp;adc-&gt;rx_buf[old_pos], adc-&gt;bufi - old_pos,</div><div class='hunk'>@@ -575,6 +776,10 @@ static void stm32_dfsdm_audio_dma_buffer_done(void *data)</div><div class='ctx'> static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='add'>+	struct dma_slave_config config = {</div><div class='add'>+		.src_addr = (dma_addr_t)adc-&gt;dfsdm-&gt;phys_base,</div><div class='add'>+		.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,</div><div class='add'>+	};</div><div class='ctx'> 	struct dma_async_tx_descriptor *desc;</div><div class='ctx'> 	dma_cookie_t cookie;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -585,6 +790,14 @@ static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev)</div><div class='ctx'> 	dev_dbg(&amp;indio_dev-&gt;dev, "%s size=%d watermark=%d\n", __func__,</div><div class='ctx'> 		adc-&gt;buf_sz, adc-&gt;buf_sz / 2);</div><div class='ctx'> </div><div class='add'>+	if (adc-&gt;nconv == 1 &amp;&amp; !indio_dev-&gt;trig)</div><div class='add'>+		config.src_addr += DFSDM_RDATAR(adc-&gt;fl_id);</div><div class='add'>+	else</div><div class='add'>+		config.src_addr += DFSDM_JDATAR(adc-&gt;fl_id);</div><div class='add'>+	ret = dmaengine_slave_config(adc-&gt;dma_chan, &amp;config);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* Prepare a DMA cyclic transaction */</div><div class='ctx'> 	desc = dmaengine_prep_dma_cyclic(adc-&gt;dma_chan,</div><div class='ctx'> 					 adc-&gt;dma_buf,</div><div class='hunk'>@@ -594,71 +807,154 @@ static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev)</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;callback = stm32_dfsdm_audio_dma_buffer_done;</div><div class='add'>+	desc-&gt;callback = stm32_dfsdm_dma_buffer_done;</div><div class='ctx'> 	desc-&gt;callback_param = indio_dev;</div><div class='ctx'> </div><div class='ctx'> 	cookie = dmaengine_submit(desc);</div><div class='ctx'> 	ret = dma_submit_error(cookie);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dmaengine_terminate_all(adc-&gt;dma_chan);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_stop_dma;</div><div class='ctx'> </div><div class='ctx'> 	/* Issue pending DMA requests */</div><div class='ctx'> 	dma_async_issue_pending(adc-&gt;dma_chan);</div><div class='ctx'> </div><div class='add'>+	if (adc-&gt;nconv == 1 &amp;&amp; !indio_dev-&gt;trig) {</div><div class='add'>+		/* Enable regular DMA transfer*/</div><div class='add'>+		ret = regmap_update_bits(adc-&gt;dfsdm-&gt;regmap,</div><div class='add'>+					 DFSDM_CR1(adc-&gt;fl_id),</div><div class='add'>+					 DFSDM_CR1_RDMAEN_MASK,</div><div class='add'>+					 DFSDM_CR1_RDMAEN_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		/* Enable injected DMA transfer*/</div><div class='add'>+		ret = regmap_update_bits(adc-&gt;dfsdm-&gt;regmap,</div><div class='add'>+					 DFSDM_CR1(adc-&gt;fl_id),</div><div class='add'>+					 DFSDM_CR1_JDMAEN_MASK,</div><div class='add'>+					 DFSDM_CR1_JDMAEN_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_stop_dma;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_stop_dma:</div><div class='add'>+	dmaengine_terminate_all(adc-&gt;dma_chan);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stm32_dfsdm_postenable(struct iio_dev *indio_dev)</div><div class='add'>+static void stm32_dfsdm_adc_dma_stop(struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	if (!adc-&gt;dma_chan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(adc-&gt;dfsdm-&gt;regmap, DFSDM_CR1(adc-&gt;fl_id),</div><div class='add'>+			   DFSDM_CR1_RDMAEN_MASK | DFSDM_CR1_JDMAEN_MASK, 0);</div><div class='add'>+	dmaengine_terminate_all(adc-&gt;dma_chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_dfsdm_update_scan_mode(struct iio_dev *indio_dev,</div><div class='add'>+					const unsigned long *scan_mask)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	adc-&gt;nconv = bitmap_weight(scan_mask, indio_dev-&gt;masklength);</div><div class='add'>+	adc-&gt;smask = *scan_mask;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;indio_dev-&gt;dev, "nconv=%d mask=%lx\n", adc-&gt;nconv, *scan_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 __stm32_dfsdm_postenable(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='del'>-	const struct iio_chan_spec *chan = &amp;indio_dev-&gt;channels[0];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset adc buffer index */</div><div class='ctx'> 	adc-&gt;bufi = 0;</div><div class='ctx'> </div><div class='add'>+	if (adc-&gt;hwc) {</div><div class='add'>+		ret = iio_hw_consumer_enable(adc-&gt;hwc);</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='ctx'> 	ret = stm32_dfsdm_start_dfsdm(adc-&gt;dfsdm);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_stop_hwc;</div><div class='ctx'> </div><div class='del'>-	ret = stm32_dfsdm_start_conv(adc, chan, true);</div><div class='add'>+	ret = stm32_dfsdm_adc_dma_start(indio_dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(&amp;indio_dev-&gt;dev, "Can't start conversion\n");</div><div class='add'>+		dev_err(&amp;indio_dev-&gt;dev, "Can't start DMA\n");</div><div class='ctx'> 		goto stop_dfsdm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (adc-&gt;dma_chan) {</div><div class='del'>-		ret = stm32_dfsdm_adc_dma_start(indio_dev);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(&amp;indio_dev-&gt;dev, "Can't start DMA\n");</div><div class='del'>-			goto err_stop_conv;</div><div class='del'>-		}</div><div class='add'>+	ret = stm32_dfsdm_start_conv(adc, indio_dev-&gt;trig);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;indio_dev-&gt;dev, "Can't start conversion\n");</div><div class='add'>+		goto err_stop_dma;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_stop_conv:</div><div class='del'>-	stm32_dfsdm_stop_conv(adc, chan);</div><div class='add'>+err_stop_dma:</div><div class='add'>+	stm32_dfsdm_adc_dma_stop(indio_dev);</div><div class='ctx'> stop_dfsdm:</div><div class='ctx'> 	stm32_dfsdm_stop_dfsdm(adc-&gt;dfsdm);</div><div class='add'>+err_stop_hwc:</div><div class='add'>+	if (adc-&gt;hwc)</div><div class='add'>+		iio_hw_consumer_disable(adc-&gt;hwc);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stm32_dfsdm_predisable(struct iio_dev *indio_dev)</div><div class='add'>+static int stm32_dfsdm_postenable(struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (indio_dev-&gt;currentmode == INDIO_BUFFER_TRIGGERED) {</div><div class='add'>+		ret = iio_triggered_buffer_postenable(indio_dev);</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'>+	ret = __stm32_dfsdm_postenable(indio_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_predisable;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_predisable:</div><div class='add'>+	if (indio_dev-&gt;currentmode == INDIO_BUFFER_TRIGGERED)</div><div class='add'>+		iio_triggered_buffer_predisable(indio_dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __stm32_dfsdm_predisable(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='del'>-	const struct iio_chan_spec *chan = &amp;indio_dev-&gt;channels[0];</div><div class='ctx'> </div><div class='del'>-	if (adc-&gt;dma_chan)</div><div class='del'>-		dmaengine_terminate_all(adc-&gt;dma_chan);</div><div class='add'>+	stm32_dfsdm_stop_conv(adc);</div><div class='ctx'> </div><div class='del'>-	stm32_dfsdm_stop_conv(adc, chan);</div><div class='add'>+	stm32_dfsdm_adc_dma_stop(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	stm32_dfsdm_stop_dfsdm(adc-&gt;dfsdm);</div><div class='ctx'> </div><div class='add'>+	if (adc-&gt;hwc)</div><div class='add'>+		iio_hw_consumer_disable(adc-&gt;hwc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_dfsdm_predisable(struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	__stm32_dfsdm_predisable(indio_dev);</div><div class='add'>+</div><div class='add'>+	if (indio_dev-&gt;currentmode == INDIO_BUFFER_TRIGGERED)</div><div class='add'>+		iio_triggered_buffer_predisable(indio_dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -736,7 +1032,9 @@ static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto stop_dfsdm;</div><div class='ctx'> </div><div class='del'>-	ret = stm32_dfsdm_start_conv(adc, chan, false);</div><div class='add'>+	adc-&gt;nconv = 1;</div><div class='add'>+	adc-&gt;smask = BIT(chan-&gt;scan_index);</div><div class='add'>+	ret = stm32_dfsdm_start_conv(adc, NULL);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		regmap_update_bits(adc-&gt;dfsdm-&gt;regmap, DFSDM_CR2(adc-&gt;fl_id),</div><div class='ctx'> 				   DFSDM_CR2_REOCIE_MASK, DFSDM_CR2_REOCIE(0));</div><div class='hunk'>@@ -757,7 +1055,7 @@ static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = IIO_VAL_INT;</div><div class='ctx'> </div><div class='del'>-	stm32_dfsdm_stop_conv(adc, chan);</div><div class='add'>+	stm32_dfsdm_stop_conv(adc);</div><div class='ctx'> </div><div class='ctx'> stop_dfsdm:</div><div class='ctx'> 	stm32_dfsdm_stop_dfsdm(adc-&gt;dfsdm);</div><div class='hunk'>@@ -777,16 +1075,23 @@ static int stm32_dfsdm_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (mask) {</div><div class='ctx'> 	case IIO_CHAN_INFO_OVERSAMPLING_RATIO:</div><div class='add'>+		ret = iio_device_claim_direct_mode(indio_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = stm32_dfsdm_set_osrs(fl, 0, val);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			adc-&gt;oversamp = val;</div><div class='del'>-</div><div class='add'>+		iio_device_release_direct_mode(indio_dev);</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	case IIO_CHAN_INFO_SAMP_FREQ:</div><div class='ctx'> 		if (!val)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='add'>+		ret = iio_device_claim_direct_mode(indio_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='ctx'> 		switch (ch-&gt;src) {</div><div class='ctx'> 		case DFSDM_CHANNEL_SPI_CLOCK_INTERNAL:</div><div class='ctx'> 			spi_freq = adc-&gt;dfsdm-&gt;spi_master_freq;</div><div class='hunk'>@@ -799,20 +1104,9 @@ static int stm32_dfsdm_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 			spi_freq = adc-&gt;spi_freq;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (spi_freq % val)</div><div class='del'>-			dev_warn(&amp;indio_dev-&gt;dev,</div><div class='del'>-				 "Sampling rate not accurate (%d)\n",</div><div class='del'>-				 spi_freq / (spi_freq / val));</div><div class='del'>-</div><div class='del'>-		ret = stm32_dfsdm_set_osrs(fl, 0, (spi_freq / val));</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;indio_dev-&gt;dev,</div><div class='del'>-				"Not able to find parameter that match!\n");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		adc-&gt;sample_freq = val;</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='add'>+		ret = dfsdm_adc_set_samp_freq(indio_dev, val, spi_freq);</div><div class='add'>+		iio_device_release_direct_mode(indio_dev);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -827,11 +1121,15 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (mask) {</div><div class='ctx'> 	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		ret = iio_device_claim_direct_mode(indio_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = iio_hw_consumer_enable(adc-&gt;hwc);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(&amp;indio_dev-&gt;dev,</div><div class='ctx'> 				"%s: IIO enable failed (channel %d)\n",</div><div class='ctx'> 				__func__, chan-&gt;channel);</div><div class='add'>+			iio_device_release_direct_mode(indio_dev);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = stm32_dfsdm_single_conv(indio_dev, chan, val);</div><div class='hunk'>@@ -840,8 +1138,10 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 			dev_err(&amp;indio_dev-&gt;dev,</div><div class='ctx'> 				"%s: Conversion failed (channel %d)\n",</div><div class='ctx'> 				__func__, chan-&gt;channel);</div><div class='add'>+			iio_device_release_direct_mode(indio_dev);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		iio_device_release_direct_mode(indio_dev);</div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='ctx'> </div><div class='ctx'> 	case IIO_CHAN_INFO_OVERSAMPLING_RATIO:</div><div class='hunk'>@@ -858,15 +1158,25 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int stm32_dfsdm_validate_trigger(struct iio_dev *indio_dev,</div><div class='add'>+					struct iio_trigger *trig)</div><div class='add'>+{</div><div class='add'>+	return stm32_dfsdm_get_jextsel(indio_dev, trig) &lt; 0 ? -EINVAL : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct iio_info stm32_dfsdm_info_audio = {</div><div class='ctx'> 	.hwfifo_set_watermark = stm32_dfsdm_set_watermark,</div><div class='ctx'> 	.read_raw = stm32_dfsdm_read_raw,</div><div class='ctx'> 	.write_raw = stm32_dfsdm_write_raw,</div><div class='add'>+	.update_scan_mode = stm32_dfsdm_update_scan_mode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct iio_info stm32_dfsdm_info_adc = {</div><div class='add'>+	.hwfifo_set_watermark = stm32_dfsdm_set_watermark,</div><div class='ctx'> 	.read_raw = stm32_dfsdm_read_raw,</div><div class='ctx'> 	.write_raw = stm32_dfsdm_write_raw,</div><div class='add'>+	.update_scan_mode = stm32_dfsdm_update_scan_mode,</div><div class='add'>+	.validate_trigger = stm32_dfsdm_validate_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t stm32_dfsdm_irq(int irq, void *arg)</div><div class='hunk'>@@ -926,12 +1236,6 @@ static void stm32_dfsdm_dma_release(struct iio_dev *indio_dev)</div><div class='ctx'> static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);</div><div class='del'>-	struct dma_slave_config config = {</div><div class='del'>-		.src_addr = (dma_addr_t)adc-&gt;dfsdm-&gt;phys_base +</div><div class='del'>-			DFSDM_RDATAR(adc-&gt;fl_id),</div><div class='del'>-		.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	adc-&gt;dma_chan = dma_request_slave_channel(&amp;indio_dev-&gt;dev, "rx");</div><div class='ctx'> 	if (!adc-&gt;dma_chan)</div><div class='hunk'>@@ -941,23 +1245,14 @@ static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev)</div><div class='ctx'> 					 DFSDM_DMA_BUFFER_SIZE,</div><div class='ctx'> 					 &amp;adc-&gt;dma_buf, GFP_KERNEL);</div><div class='ctx'> 	if (!adc-&gt;rx_buf) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_release;</div><div class='add'>+		dma_release_channel(adc-&gt;dma_chan);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = dmaengine_slave_config(adc-&gt;dma_chan, &amp;config);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free;</div><div class='add'>+	indio_dev-&gt;modes |= INDIO_BUFFER_SOFTWARE;</div><div class='add'>+	indio_dev-&gt;setup_ops = &amp;stm32_dfsdm_buffer_setup_ops;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_free:</div><div class='del'>-	dma_free_coherent(adc-&gt;dma_chan-&gt;device-&gt;dev, DFSDM_DMA_BUFFER_SIZE,</div><div class='del'>-			  adc-&gt;rx_buf, adc-&gt;dma_buf);</div><div class='del'>-err_release:</div><div class='del'>-	dma_release_channel(adc-&gt;dma_chan);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev,</div><div class='hunk'>@@ -978,7 +1273,8 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev,</div><div class='ctx'> 	 * IIO_CHAN_INFO_OVERSAMPLING_RATIO: used to set oversampling</div><div class='ctx'> 	 */</div><div class='ctx'> 	ch-&gt;info_mask_separate = BIT(IIO_CHAN_INFO_RAW);</div><div class='del'>-	ch-&gt;info_mask_shared_by_all = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO);</div><div class='add'>+	ch-&gt;info_mask_shared_by_all = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO) |</div><div class='add'>+					BIT(IIO_CHAN_INFO_SAMP_FREQ);</div><div class='ctx'> </div><div class='ctx'> 	if (adc-&gt;dev_data-&gt;type == DFSDM_AUDIO) {</div><div class='ctx'> 		ch-&gt;scan_type.sign = 's';</div><div class='hunk'>@@ -1000,9 +1296,6 @@ static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev)</div><div class='ctx'> 	struct stm32_dfsdm_channel *d_ch;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	indio_dev-&gt;modes |= INDIO_BUFFER_SOFTWARE;</div><div class='del'>-	indio_dev-&gt;setup_ops = &amp;stm32_dfsdm_buffer_setup_ops;</div><div class='del'>-</div><div class='ctx'> 	ch = devm_kzalloc(&amp;indio_dev-&gt;dev, sizeof(*ch), GFP_KERNEL);</div><div class='ctx'> 	if (!ch)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1070,6 +1363,25 @@ static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev)</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;adc-&gt;completion);</div><div class='ctx'> </div><div class='add'>+	/* Optionally request DMA */</div><div class='add'>+	if (stm32_dfsdm_dma_request(indio_dev)) {</div><div class='add'>+		dev_dbg(&amp;indio_dev-&gt;dev, "No DMA support\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iio_triggered_buffer_setup(indio_dev,</div><div class='add'>+					 &amp;iio_pollfunc_store_time,</div><div class='add'>+					 &amp;stm32_dfsdm_adc_trigger_handler,</div><div class='add'>+					 &amp;stm32_dfsdm_buffer_setup_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		stm32_dfsdm_dma_release(indio_dev);</div><div class='add'>+		dev_err(&amp;indio_dev-&gt;dev, "buffer setup failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* lptimer/timer hardware triggers */</div><div class='add'>+	indio_dev-&gt;modes |= INDIO_HARDWARE_TRIGGERED;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1117,7 +1429,7 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	iio-&gt;dev.parent = dev;</div><div class='ctx'> 	iio-&gt;dev.of_node = np;</div><div class='del'>-	iio-&gt;modes = INDIO_DIRECT_MODE | INDIO_BUFFER_SOFTWARE;</div><div class='add'>+	iio-&gt;modes = INDIO_DIRECT_MODE;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, adc);</div><div class='ctx'> </div><div class='hunk'>@@ -1203,10 +1515,48 @@ static int stm32_dfsdm_adc_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __maybe_unused stm32_dfsdm_adc_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm_adc *adc = dev_get_drvdata(dev);</div><div class='add'>+	struct iio_dev *indio_dev = iio_priv_to_dev(adc);</div><div class='add'>+</div><div class='add'>+	if (iio_buffer_enabled(indio_dev))</div><div class='add'>+		__stm32_dfsdm_predisable(indio_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 __maybe_unused stm32_dfsdm_adc_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm_adc *adc = dev_get_drvdata(dev);</div><div class='add'>+	struct iio_dev *indio_dev = iio_priv_to_dev(adc);</div><div class='add'>+	const struct iio_chan_spec *chan;</div><div class='add'>+	struct stm32_dfsdm_channel *ch;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* restore channels configuration */</div><div class='add'>+	for (i = 0; i &lt; indio_dev-&gt;num_channels; i++) {</div><div class='add'>+		chan = indio_dev-&gt;channels + i;</div><div class='add'>+		ch = &amp;adc-&gt;dfsdm-&gt;ch_list[chan-&gt;channel];</div><div class='add'>+		ret = stm32_dfsdm_chan_configure(adc-&gt;dfsdm, ch);</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 (iio_buffer_enabled(indio_dev))</div><div class='add'>+		__stm32_dfsdm_postenable(indio_dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(stm32_dfsdm_adc_pm_ops,</div><div class='add'>+			 stm32_dfsdm_adc_suspend, stm32_dfsdm_adc_resume);</div><div class='add'>+</div><div class='ctx'> static struct platform_driver stm32_dfsdm_adc_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "stm32-dfsdm-adc",</div><div class='ctx'> 		.of_match_table = stm32_dfsdm_adc_match,</div><div class='add'>+		.pm = &amp;stm32_dfsdm_adc_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = stm32_dfsdm_adc_probe,</div><div class='ctx'> 	.remove = stm32_dfsdm_adc_remove,</div><div class='head'>diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c<br/>index bf089f5d6225..0a4d3746d21c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/stm32-dfsdm-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/stm32-dfsdm-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/stm32-dfsdm-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/stm32-dfsdm-core.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.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='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +92,36 @@ struct dfsdm_priv {</div><div class='ctx'> 	struct clk *aclk; /* audio clock */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline struct dfsdm_priv *to_stm32_dfsdm_priv(struct stm32_dfsdm *dfsdm)</div><div class='add'>+{</div><div class='add'>+	return container_of(dfsdm, struct dfsdm_priv, dfsdm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_dfsdm_clk_prepare_enable(struct stm32_dfsdm *dfsdm)</div><div class='add'>+{</div><div class='add'>+	struct dfsdm_priv *priv = to_stm32_dfsdm_priv(dfsdm);</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 || !priv-&gt;aclk)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;aclk);</div><div class='add'>+	if (ret)</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 void stm32_dfsdm_clk_disable_unprepare(struct stm32_dfsdm *dfsdm)</div><div class='add'>+{</div><div class='add'>+	struct dfsdm_priv *priv = to_stm32_dfsdm_priv(dfsdm);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;aclk)</div><div class='add'>+		clk_disable_unprepare(priv-&gt;aclk);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * stm32_dfsdm_start_dfsdm - start global dfsdm interface.</div><div class='ctx'>  *</div><div class='hunk'>@@ -98,24 +130,17 @@ struct dfsdm_priv {</div><div class='ctx'>  */</div><div class='ctx'> int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)</div><div class='ctx'> {</div><div class='del'>-	struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);</div><div class='add'>+	struct dfsdm_priv *priv = to_stm32_dfsdm_priv(dfsdm);</div><div class='ctx'> 	struct device *dev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	unsigned int clk_div = priv-&gt;spi_clk_out_div, clk_src;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_inc_return(&amp;priv-&gt;n_active_ch) == 1) {</div><div class='del'>-		ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+		ret = pm_runtime_get_sync(dev);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(dev, "Failed to start clock\n");</div><div class='add'>+			pm_runtime_put_noidle(dev);</div><div class='ctx'> 			goto error_ret;</div><div class='ctx'> 		}</div><div class='del'>-		if (priv-&gt;aclk) {</div><div class='del'>-			ret = clk_prepare_enable(priv-&gt;aclk);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				dev_err(dev, "Failed to start audio clock\n");</div><div class='del'>-				goto disable_clk;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* select clock source, e.g. 0 for "dfsdm" or 1 for "audio" */</div><div class='ctx'> 		clk_src = priv-&gt;aclk ? 1 : 0;</div><div class='hunk'>@@ -123,21 +148,21 @@ int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)</div><div class='ctx'> 					 DFSDM_CHCFGR1_CKOUTSRC_MASK,</div><div class='ctx'> 					 DFSDM_CHCFGR1_CKOUTSRC(clk_src));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto disable_aclk;</div><div class='add'>+			goto pm_put;</div><div class='ctx'> </div><div class='ctx'> 		/* Output the SPI CLKOUT (if clk_div == 0 clock if OFF) */</div><div class='ctx'> 		ret = regmap_update_bits(dfsdm-&gt;regmap, DFSDM_CHCFGR1(0),</div><div class='ctx'> 					 DFSDM_CHCFGR1_CKOUTDIV_MASK,</div><div class='ctx'> 					 DFSDM_CHCFGR1_CKOUTDIV(clk_div));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto disable_aclk;</div><div class='add'>+			goto pm_put;</div><div class='ctx'> </div><div class='ctx'> 		/* Global enable of DFSDM interface */</div><div class='ctx'> 		ret = regmap_update_bits(dfsdm-&gt;regmap, DFSDM_CHCFGR1(0),</div><div class='ctx'> 					 DFSDM_CHCFGR1_DFSDMEN_MASK,</div><div class='ctx'> 					 DFSDM_CHCFGR1_DFSDMEN(1));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto disable_aclk;</div><div class='add'>+			goto pm_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s: n_active_ch %d\n", __func__,</div><div class='hunk'>@@ -145,11 +170,8 @@ int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-disable_aclk:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;aclk);</div><div class='del'>-disable_clk:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk);</div><div class='del'>-</div><div class='add'>+pm_put:</div><div class='add'>+	pm_runtime_put_sync(dev);</div><div class='ctx'> error_ret:</div><div class='ctx'> 	atomic_dec(&amp;priv-&gt;n_active_ch);</div><div class='ctx'> </div><div class='hunk'>@@ -165,7 +187,7 @@ EXPORT_SYMBOL_GPL(stm32_dfsdm_start_dfsdm);</div><div class='ctx'>  */</div><div class='ctx'> int stm32_dfsdm_stop_dfsdm(struct stm32_dfsdm *dfsdm)</div><div class='ctx'> {</div><div class='del'>-	struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);</div><div class='add'>+	struct dfsdm_priv *priv = to_stm32_dfsdm_priv(dfsdm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_and_test(&amp;priv-&gt;n_active_ch)) {</div><div class='hunk'>@@ -183,9 +205,7 @@ int stm32_dfsdm_stop_dfsdm(struct stm32_dfsdm *dfsdm)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk);</div><div class='del'>-		if (priv-&gt;aclk)</div><div class='del'>-			clk_disable_unprepare(priv-&gt;aclk);</div><div class='add'>+		pm_runtime_put_sync(&amp;priv-&gt;pdev-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(&amp;priv-&gt;pdev-&gt;dev, "%s: n_active_ch %d\n", __func__,</div><div class='ctx'> 		atomic_read(&amp;priv-&gt;n_active_ch));</div><div class='hunk'>@@ -199,7 +219,7 @@ static int stm32_dfsdm_parse_of(struct platform_device *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	unsigned long clk_freq;</div><div class='add'>+	unsigned long clk_freq, divider;</div><div class='ctx'> 	unsigned int spi_freq, rem;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -243,13 +263,20 @@ static int stm32_dfsdm_parse_of(struct platform_device *pdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;spi_clk_out_div = div_u64_rem(clk_freq, spi_freq, &amp;rem) - 1;</div><div class='del'>-	if (!priv-&gt;spi_clk_out_div) {</div><div class='del'>-		/* spi_clk_out_div == 0 means ckout is OFF */</div><div class='add'>+	divider = div_u64_rem(clk_freq, spi_freq, &amp;rem);</div><div class='add'>+	/* Round up divider when ckout isn't precise, not to exceed spi_freq */</div><div class='add'>+	if (rem)</div><div class='add'>+		divider++;</div><div class='add'>+</div><div class='add'>+	/* programmable divider is in range of [2:256] */</div><div class='add'>+	if (divider &lt; 2 || divider &gt; 256) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "spi-max-frequency not achievable\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	priv-&gt;dfsdm.spi_master_freq = spi_freq;</div><div class='add'>+</div><div class='add'>+	/* SPI clock output divider is: divider = CKOUTDIV + 1 */</div><div class='add'>+	priv-&gt;spi_clk_out_div = divider - 1;</div><div class='add'>+	priv-&gt;dfsdm.spi_master_freq = clk_freq / (priv-&gt;spi_clk_out_div + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (rem) {</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "SPI clock not accurate\n");</div><div class='hunk'>@@ -318,14 +345,111 @@ static int stm32_dfsdm_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dfsdm);</div><div class='ctx'> </div><div class='del'>-	return devm_of_platform_populate(&amp;pdev-&gt;dev);</div><div class='add'>+	ret = stm32_dfsdm_clk_prepare_enable(dfsdm);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to start clock\n");</div><div class='add'>+		return ret;</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='add'>+</div><div class='add'>+	ret = of_platform_populate(pdev-&gt;dev.of_node, NULL, NULL, &amp;pdev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto pm_put;</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+pm_put:</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_set_suspended(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='add'>+	stm32_dfsdm_clk_disable_unprepare(dfsdm);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_dfsdm_core_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm *dfsdm = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='add'>+	of_platform_depopulate(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_set_suspended(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='add'>+	stm32_dfsdm_clk_disable_unprepare(dfsdm);</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 stm32_dfsdm_core_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm *dfsdm = dev_get_drvdata(dev);</div><div class='add'>+	struct dfsdm_priv *priv = to_stm32_dfsdm_priv(dfsdm);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_force_suspend(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Balance devm_regmap_init_mmio_clk() clk_prepare() */</div><div class='add'>+	clk_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return pinctrl_pm_select_sleep_state(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __maybe_unused stm32_dfsdm_core_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm *dfsdm = dev_get_drvdata(dev);</div><div class='add'>+	struct dfsdm_priv *priv = to_stm32_dfsdm_priv(dfsdm);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pinctrl_pm_select_default_state(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare(priv-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return pm_runtime_force_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused stm32_dfsdm_core_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm *dfsdm = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	stm32_dfsdm_clk_disable_unprepare(dfsdm);</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 stm32_dfsdm_core_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_dfsdm *dfsdm = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return stm32_dfsdm_clk_prepare_enable(dfsdm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops stm32_dfsdm_core_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(stm32_dfsdm_core_suspend,</div><div class='add'>+				stm32_dfsdm_core_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(stm32_dfsdm_core_runtime_suspend,</div><div class='add'>+			   stm32_dfsdm_core_runtime_resume,</div><div class='add'>+			   NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_driver stm32_dfsdm_driver = {</div><div class='ctx'> 	.probe = stm32_dfsdm_probe,</div><div class='add'>+	.remove = stm32_dfsdm_core_remove,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "stm32-dfsdm",</div><div class='ctx'> 		.of_match_table = stm32_dfsdm_of_match,</div><div class='add'>+		.pm = &amp;stm32_dfsdm_core_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c<br/>index 37f4b74a5d32..7921f827c6ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/stmpe-adc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/stmpe-adc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/stmpe-adc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/stmpe-adc.c</a></div><div class='hunk'>@@ -184,9 +184,6 @@ static irqreturn_t stmpe_adc_isr(int irq, void *dev_id)</div><div class='ctx'> 	struct stmpe_adc *info = (struct stmpe_adc *)dev_id;</div><div class='ctx'> 	u16 data;</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;channel &gt; STMPE_TEMP_CHANNEL)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='ctx'> 	if (info-&gt;channel &lt;= STMPE_ADC_LAST_NR) {</div><div class='ctx'> 		int int_sta;</div><div class='ctx'> </div><div class='hunk'>@@ -205,6 +202,8 @@ static irqreturn_t stmpe_adc_isr(int irq, void *dev_id)</div><div class='ctx'> 		/* Read value */</div><div class='ctx'> 		stmpe_block_read(info-&gt;stmpe, STMPE_REG_TEMP_DATA, 2,</div><div class='ctx'> 				(u8 *) &amp;data);</div><div class='add'>+	} else {</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;value = (u32) be16_to_cpu(data);</div><div class='head'>diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c<br/>index 0ad63592cc3c..2e66e4d586ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ti-ads7950.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ti-ads7950.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ti-ads7950.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ti-ads7950.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.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/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -36,12 +37,15 @@</div><div class='ctx'>  */</div><div class='ctx'> #define TI_ADS7950_VA_MV_ACPI_DEFAULT	5000</div><div class='ctx'> </div><div class='add'>+#define TI_ADS7950_CR_GPIO	BIT(14)</div><div class='ctx'> #define TI_ADS7950_CR_MANUAL	BIT(12)</div><div class='ctx'> #define TI_ADS7950_CR_WRITE	BIT(11)</div><div class='ctx'> #define TI_ADS7950_CR_CHAN(ch)	((ch) &lt;&lt; 7)</div><div class='ctx'> #define TI_ADS7950_CR_RANGE_5V	BIT(6)</div><div class='add'>+#define TI_ADS7950_CR_GPIO_DATA	BIT(4)</div><div class='ctx'> </div><div class='ctx'> #define TI_ADS7950_MAX_CHAN	16</div><div class='add'>+#define TI_ADS7950_NUM_GPIOS	4</div><div class='ctx'> </div><div class='ctx'> #define TI_ADS7950_TIMESTAMP_SIZE (sizeof(int64_t) / sizeof(__be16))</div><div class='ctx'> </div><div class='hunk'>@@ -49,6 +53,16 @@</div><div class='ctx'> #define TI_ADS7950_EXTRACT(val, dec, bits) \</div><div class='ctx'> 	(((val) &gt;&gt; (dec)) &amp; ((1 &lt;&lt; (bits)) - 1))</div><div class='ctx'> </div><div class='add'>+#define TI_ADS7950_MAN_CMD(cmd)         (TI_ADS7950_CR_MANUAL | (cmd))</div><div class='add'>+#define TI_ADS7950_GPIO_CMD(cmd)        (TI_ADS7950_CR_GPIO | (cmd))</div><div class='add'>+</div><div class='add'>+/* Manual mode configuration */</div><div class='add'>+#define TI_ADS7950_MAN_CMD_SETTINGS(st) \</div><div class='add'>+	(TI_ADS7950_MAN_CMD(TI_ADS7950_CR_WRITE | st-&gt;cmd_settings_bitmask))</div><div class='add'>+/* GPIO mode configuration */</div><div class='add'>+#define TI_ADS7950_GPIO_CMD_SETTINGS(st) \</div><div class='add'>+	(TI_ADS7950_GPIO_CMD(st-&gt;gpio_cmd_settings_bitmask))</div><div class='add'>+</div><div class='ctx'> struct ti_ads7950_state {</div><div class='ctx'> 	struct spi_device	*spi;</div><div class='ctx'> 	struct spi_transfer	ring_xfer;</div><div class='hunk'>@@ -56,10 +70,36 @@ struct ti_ads7950_state {</div><div class='ctx'> 	struct spi_message	ring_msg;</div><div class='ctx'> 	struct spi_message	scan_single_msg;</div><div class='ctx'> </div><div class='add'>+	/* Lock to protect the spi xfer buffers */</div><div class='add'>+	struct mutex		slock;</div><div class='add'>+	struct gpio_chip	chip;</div><div class='add'>+</div><div class='ctx'> 	struct regulator	*reg;</div><div class='ctx'> 	unsigned int		vref_mv;</div><div class='ctx'> </div><div class='del'>-	unsigned int		settings;</div><div class='add'>+	/*</div><div class='add'>+	 * Bitmask of lower 7 bits used for configuration</div><div class='add'>+	 * These bits only can be written when TI_ADS7950_CR_WRITE</div><div class='add'>+	 * is set, otherwise it retains its original state.</div><div class='add'>+	 * [0-3] GPIO signal</div><div class='add'>+	 * [4]   Set following frame to return GPIO signal values</div><div class='add'>+	 * [5]   Powers down device</div><div class='add'>+	 * [6]   Sets Vref range1(2.5v) or range2(5v)</div><div class='add'>+	 *</div><div class='add'>+	 * Bits present on Manual/Auto1/Auto2 commands</div><div class='add'>+	 */</div><div class='add'>+	unsigned int		cmd_settings_bitmask;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Bitmask of GPIO command</div><div class='add'>+	 * [0-3] GPIO direction</div><div class='add'>+	 * [4-6] Different GPIO alarm mode configurations</div><div class='add'>+	 * [7]   GPIO 2 as device range input</div><div class='add'>+	 * [8]   GPIO 3 as device power down input</div><div class='add'>+	 * [9]   Reset all registers</div><div class='add'>+	 * [10-11] N/A</div><div class='add'>+	 */</div><div class='add'>+	unsigned int		gpio_cmd_settings_bitmask;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * DMA (thus cache coherency maintenance) requires the</div><div class='hunk'>@@ -248,7 +288,7 @@ static int ti_ads7950_update_scan_mode(struct iio_dev *indio_dev,</div><div class='ctx'> </div><div class='ctx'> 	len = 0;</div><div class='ctx'> 	for_each_set_bit(i, active_scan_mask, indio_dev-&gt;num_channels) {</div><div class='del'>-		cmd = TI_ADS7950_CR_WRITE | TI_ADS7950_CR_CHAN(i) | st-&gt;settings;</div><div class='add'>+		cmd = TI_ADS7950_MAN_CMD(TI_ADS7950_CR_CHAN(i));</div><div class='ctx'> 		st-&gt;tx_buf[len++] = cmd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -268,6 +308,7 @@ static irqreturn_t ti_ads7950_trigger_handler(int irq, void *p)</div><div class='ctx'> 	struct ti_ads7950_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;st-&gt;slock);</div><div class='ctx'> 	ret = spi_sync(st-&gt;spi, &amp;st-&gt;ring_msg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -276,6 +317,7 @@ static irqreturn_t ti_ads7950_trigger_handler(int irq, void *p)</div><div class='ctx'> 					   iio_get_time_ns(indio_dev));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	mutex_unlock(&amp;st-&gt;slock);</div><div class='ctx'> 	iio_trigger_notify_done(indio_dev-&gt;trig);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -286,9 +328,8 @@ static int ti_ads7950_scan_direct(struct iio_dev *indio_dev, unsigned int ch)</div><div class='ctx'> 	struct ti_ads7950_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	int ret, cmd;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;indio_dev-&gt;mlock);</div><div class='del'>-</div><div class='del'>-	cmd = TI_ADS7950_CR_WRITE | TI_ADS7950_CR_CHAN(ch) | st-&gt;settings;</div><div class='add'>+	mutex_lock(&amp;st-&gt;slock);</div><div class='add'>+	cmd = TI_ADS7950_MAN_CMD(TI_ADS7950_CR_CHAN(ch));</div><div class='ctx'> 	st-&gt;single_tx = cmd;</div><div class='ctx'> </div><div class='ctx'> 	ret = spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</div><div class='hunk'>@@ -298,7 +339,7 @@ static int ti_ads7950_scan_direct(struct iio_dev *indio_dev, unsigned int ch)</div><div class='ctx'> 	ret = st-&gt;single_rx;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+	mutex_unlock(&amp;st-&gt;slock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -317,7 +358,7 @@ static int ti_ads7950_get_range(struct ti_ads7950_state *st)</div><div class='ctx'> 		vref /= 1000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (st-&gt;settings &amp; TI_ADS7950_CR_RANGE_5V)</div><div class='add'>+	if (st-&gt;cmd_settings_bitmask &amp; TI_ADS7950_CR_RANGE_5V)</div><div class='ctx'> 		vref *= 2;</div><div class='ctx'> </div><div class='ctx'> 	return vref;</div><div class='hunk'>@@ -362,6 +403,132 @@ static const struct iio_info ti_ads7950_info = {</div><div class='ctx'> 	.update_scan_mode	= ti_ads7950_update_scan_mode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void ti_ads7950_set(struct gpio_chip *chip, unsigned int offset,</div><div class='add'>+			   int value)</div><div class='add'>+{</div><div class='add'>+	struct ti_ads7950_state *st = gpiochip_get_data(chip);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		st-&gt;cmd_settings_bitmask |= BIT(offset);</div><div class='add'>+	else</div><div class='add'>+		st-&gt;cmd_settings_bitmask &amp;= ~BIT(offset);</div><div class='add'>+</div><div class='add'>+	st-&gt;single_tx = TI_ADS7950_MAN_CMD_SETTINGS(st);</div><div class='add'>+	spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;st-&gt;slock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ti_ads7950_get(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct ti_ads7950_state *st = gpiochip_get_data(chip);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	/* If set as output, return the output */</div><div class='add'>+	if (st-&gt;gpio_cmd_settings_bitmask &amp; BIT(offset)) {</div><div class='add'>+		ret = st-&gt;cmd_settings_bitmask &amp; BIT(offset);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* GPIO data bit sets SDO bits 12-15 to GPIO input */</div><div class='add'>+	st-&gt;cmd_settings_bitmask |= TI_ADS7950_CR_GPIO_DATA;</div><div class='add'>+	st-&gt;single_tx = TI_ADS7950_MAN_CMD_SETTINGS(st);</div><div class='add'>+	ret = spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = ((st-&gt;single_rx &gt;&gt; 12) &amp; BIT(offset)) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Revert back to original settings */</div><div class='add'>+	st-&gt;cmd_settings_bitmask &amp;= ~TI_ADS7950_CR_GPIO_DATA;</div><div class='add'>+	st-&gt;single_tx = TI_ADS7950_MAN_CMD_SETTINGS(st);</div><div class='add'>+	ret = spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</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'>+	mutex_unlock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ti_ads7950_get_direction(struct gpio_chip *chip,</div><div class='add'>+				    unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct ti_ads7950_state *st = gpiochip_get_data(chip);</div><div class='add'>+</div><div class='add'>+	/* Bitmask is inverted from GPIO framework 0=input/1=output */</div><div class='add'>+	return !(st-&gt;gpio_cmd_settings_bitmask &amp; BIT(offset));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _ti_ads7950_set_direction(struct gpio_chip *chip, int offset,</div><div class='add'>+				     int input)</div><div class='add'>+{</div><div class='add'>+	struct ti_ads7950_state *st = gpiochip_get_data(chip);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	/* Only change direction if needed */</div><div class='add'>+	if (input &amp;&amp; (st-&gt;gpio_cmd_settings_bitmask &amp; BIT(offset)))</div><div class='add'>+		st-&gt;gpio_cmd_settings_bitmask &amp;= ~BIT(offset);</div><div class='add'>+	else if (!input &amp;&amp; !(st-&gt;gpio_cmd_settings_bitmask &amp; BIT(offset)))</div><div class='add'>+		st-&gt;gpio_cmd_settings_bitmask |= BIT(offset);</div><div class='add'>+	else</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	st-&gt;single_tx = TI_ADS7950_GPIO_CMD_SETTINGS(st);</div><div class='add'>+	ret = spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ti_ads7950_direction_input(struct gpio_chip *chip,</div><div class='add'>+				      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return _ti_ads7950_set_direction(chip, offset, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ti_ads7950_direction_output(struct gpio_chip *chip,</div><div class='add'>+				       unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	ti_ads7950_set(chip, offset, value);</div><div class='add'>+</div><div class='add'>+	return _ti_ads7950_set_direction(chip, offset, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ti_ads7950_init_hw(struct ti_ads7950_state *st)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	/* Settings for Manual/Auto1/Auto2 commands */</div><div class='add'>+	/* Default to 5v ref */</div><div class='add'>+	st-&gt;cmd_settings_bitmask = TI_ADS7950_CR_RANGE_5V;</div><div class='add'>+	st-&gt;single_tx = TI_ADS7950_MAN_CMD_SETTINGS(st);</div><div class='add'>+	ret = spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Settings for GPIO command */</div><div class='add'>+	st-&gt;gpio_cmd_settings_bitmask = 0x0;</div><div class='add'>+	st-&gt;single_tx = TI_ADS7950_GPIO_CMD_SETTINGS(st);</div><div class='add'>+	ret = spi_sync(st-&gt;spi, &amp;st-&gt;scan_single_msg);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ti_ads7950_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ti_ads7950_state *st;</div><div class='hunk'>@@ -386,7 +553,6 @@ static int ti_ads7950_probe(struct spi_device *spi)</div><div class='ctx'> 	spi_set_drvdata(spi, indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;spi = spi;</div><div class='del'>-	st-&gt;settings = TI_ADS7950_CR_MANUAL | TI_ADS7950_CR_RANGE_5V;</div><div class='ctx'> </div><div class='ctx'> 	info = &amp;ti_ads7950_chip_info[spi_get_device_id(spi)-&gt;driver_data];</div><div class='ctx'> </div><div class='hunk'>@@ -432,16 +598,19 @@ static int ti_ads7950_probe(struct spi_device *spi)</div><div class='ctx'> 	if (ACPI_COMPANION(&amp;spi-&gt;dev))</div><div class='ctx'> 		st-&gt;vref_mv = TI_ADS7950_VA_MV_ACPI_DEFAULT;</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;st-&gt;slock);</div><div class='add'>+</div><div class='ctx'> 	st-&gt;reg = devm_regulator_get(&amp;spi-&gt;dev, "vref");</div><div class='ctx'> 	if (IS_ERR(st-&gt;reg)) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "Failed get get regulator \"vref\"\n");</div><div class='del'>-		return PTR_ERR(st-&gt;reg);</div><div class='add'>+		ret = PTR_ERR(st-&gt;reg);</div><div class='add'>+		goto error_destroy_mutex;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = regulator_enable(st-&gt;reg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "Failed to enable regulator \"vref\"\n");</div><div class='del'>-		return ret;</div><div class='add'>+		goto error_destroy_mutex;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iio_triggered_buffer_setup(indio_dev, NULL,</div><div class='hunk'>@@ -451,18 +620,46 @@ static int ti_ads7950_probe(struct spi_device *spi)</div><div class='ctx'> 		goto error_disable_reg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = ti_ads7950_init_hw(st);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Failed to init adc chip\n");</div><div class='add'>+		goto error_cleanup_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = iio_device_register(indio_dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "Failed to register iio device\n");</div><div class='ctx'> 		goto error_cleanup_ring;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Add GPIO chip */</div><div class='add'>+	st-&gt;chip.label = dev_name(&amp;st-&gt;spi-&gt;dev);</div><div class='add'>+	st-&gt;chip.parent = &amp;st-&gt;spi-&gt;dev;</div><div class='add'>+	st-&gt;chip.owner = THIS_MODULE;</div><div class='add'>+	st-&gt;chip.base = -1;</div><div class='add'>+	st-&gt;chip.ngpio = TI_ADS7950_NUM_GPIOS;</div><div class='add'>+	st-&gt;chip.get_direction = ti_ads7950_get_direction;</div><div class='add'>+	st-&gt;chip.direction_input = ti_ads7950_direction_input;</div><div class='add'>+	st-&gt;chip.direction_output = ti_ads7950_direction_output;</div><div class='add'>+	st-&gt;chip.get = ti_ads7950_get;</div><div class='add'>+	st-&gt;chip.set = ti_ads7950_set;</div><div class='add'>+</div><div class='add'>+	ret = gpiochip_add_data(&amp;st-&gt;chip, st);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Failed to init GPIOs\n");</div><div class='add'>+		goto error_iio_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+error_iio_device:</div><div class='add'>+	iio_device_unregister(indio_dev);</div><div class='ctx'> error_cleanup_ring:</div><div class='ctx'> 	iio_triggered_buffer_cleanup(indio_dev);</div><div class='ctx'> error_disable_reg:</div><div class='ctx'> 	regulator_disable(st-&gt;reg);</div><div class='add'>+error_destroy_mutex:</div><div class='add'>+	mutex_destroy(&amp;st-&gt;slock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -472,9 +669,11 @@ static int ti_ads7950_remove(struct spi_device *spi)</div><div class='ctx'> 	struct iio_dev *indio_dev = spi_get_drvdata(spi);</div><div class='ctx'> 	struct ti_ads7950_state *st = iio_priv(indio_dev);</div><div class='ctx'> </div><div class='add'>+	gpiochip_remove(&amp;st-&gt;chip);</div><div class='ctx'> 	iio_device_unregister(indio_dev);</div><div class='ctx'> 	iio_triggered_buffer_cleanup(indio_dev);</div><div class='ctx'> 	regulator_disable(st-&gt;reg);</div><div class='add'>+	mutex_destroy(&amp;st-&gt;slock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/iio/adc/ti-ads8344.c b/drivers/iio/adc/ti-ads8344.c<br/>new file mode 100644<br/>index 000000000000..9a460807d46d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ti-ads8344.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ti-ads8344.c</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * ADS8344 16-bit 8-Channel ADC driver</div><div class='add'>+ *</div><div class='add'>+ * Author: Gregory CLEMENT &lt;gregory.clement@bootlin.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Datasheet: http://www.ti.com/lit/ds/symlink/ads8344.pdf</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/iio/buffer.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/module.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'>+#define ADS8344_START BIT(7)</div><div class='add'>+#define ADS8344_SINGLE_END BIT(2)</div><div class='add'>+#define ADS8344_CHANNEL(channel) ((channel) &lt;&lt; 4)</div><div class='add'>+#define ADS8344_CLOCK_INTERNAL 0x2 /* PD1 = 1 and PD0 = 0 */</div><div class='add'>+</div><div class='add'>+struct ads8344 {</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+	struct regulator *reg;</div><div class='add'>+	/*</div><div class='add'>+	 * Lock protecting access to adc-&gt;tx_buff and rx_buff,</div><div class='add'>+	 * especially from concurrent read on sysfs file.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	u8 tx_buf ____cacheline_aligned;</div><div class='add'>+	u16 rx_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ADS8344_VOLTAGE_CHANNEL(chan, si)				\</div><div class='add'>+	{								\</div><div class='add'>+		.type = IIO_VOLTAGE,					\</div><div class='add'>+		.indexed = 1,						\</div><div class='add'>+		.channel = chan,					\</div><div class='add'>+		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),		\</div><div class='add'>+		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define ADS8344_VOLTAGE_CHANNEL_DIFF(chan1, chan2, si)			\</div><div class='add'>+	{								\</div><div class='add'>+		.type = IIO_VOLTAGE,					\</div><div class='add'>+		.indexed = 1,						\</div><div class='add'>+		.channel = (chan1),					\</div><div class='add'>+		.channel2 = (chan2),					\</div><div class='add'>+		.differential = 1,					\</div><div class='add'>+		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),		\</div><div class='add'>+		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec ads8344_channels[] = {</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(0, 0),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(1, 4),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(2, 1),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(3, 5),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(4, 2),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(5, 6),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(6, 3),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL(7, 7),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(0, 1, 8),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(2, 3, 9),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(4, 5, 10),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(6, 7, 11),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(1, 0, 12),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(3, 2, 13),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(5, 4, 14),</div><div class='add'>+	ADS8344_VOLTAGE_CHANNEL_DIFF(7, 6, 15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ads8344_adc_conversion(struct ads8344 *adc, int channel,</div><div class='add'>+				  bool differential)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = adc-&gt;spi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	adc-&gt;tx_buf = ADS8344_START;</div><div class='add'>+	if (!differential)</div><div class='add'>+		adc-&gt;tx_buf |= ADS8344_SINGLE_END;</div><div class='add'>+	adc-&gt;tx_buf |= ADS8344_CHANNEL(channel);</div><div class='add'>+	adc-&gt;tx_buf |= ADS8344_CLOCK_INTERNAL;</div><div class='add'>+</div><div class='add'>+	ret = spi_write(spi, &amp;adc-&gt;tx_buf, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	udelay(9);</div><div class='add'>+</div><div class='add'>+	ret = spi_read(spi, &amp;adc-&gt;rx_buf, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return adc-&gt;rx_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ads8344_read_raw(struct iio_dev *iio,</div><div class='add'>+			    struct iio_chan_spec const *channel, int *value,</div><div class='add'>+			    int *shift, long mask)</div><div class='add'>+{</div><div class='add'>+	struct ads8344 *adc = iio_priv(iio);</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		mutex_lock(&amp;adc-&gt;lock);</div><div class='add'>+		*value = ads8344_adc_conversion(adc, channel-&gt;scan_index,</div><div class='add'>+						channel-&gt;differential);</div><div class='add'>+		mutex_unlock(&amp;adc-&gt;lock);</div><div class='add'>+		if (*value &lt; 0)</div><div class='add'>+			return *value;</div><div class='add'>+</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		*value = regulator_get_voltage(adc-&gt;reg);</div><div class='add'>+		if (*value &lt; 0)</div><div class='add'>+			return *value;</div><div class='add'>+</div><div class='add'>+		/* convert regulator output voltage to mV */</div><div class='add'>+		*value /= 1000;</div><div class='add'>+		*shift = 16;</div><div class='add'>+</div><div class='add'>+		return IIO_VAL_FRACTIONAL_LOG2;</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 iio_info ads8344_info = {</div><div class='add'>+	.read_raw = ads8344_read_raw,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ads8344_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev;</div><div class='add'>+	struct ads8344 *adc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	indio_dev = devm_iio_device_alloc(&amp;spi-&gt;dev, sizeof(*adc));</div><div class='add'>+	if (!indio_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	adc = iio_priv(indio_dev);</div><div class='add'>+	adc-&gt;spi = spi;</div><div class='add'>+	mutex_init(&amp;adc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	indio_dev-&gt;name = dev_name(&amp;spi-&gt;dev);</div><div class='add'>+	indio_dev-&gt;dev.parent = &amp;spi-&gt;dev;</div><div class='add'>+	indio_dev-&gt;dev.of_node = spi-&gt;dev.of_node;</div><div class='add'>+	indio_dev-&gt;info = &amp;ads8344_info;</div><div class='add'>+	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='add'>+	indio_dev-&gt;channels = ads8344_channels;</div><div class='add'>+	indio_dev-&gt;num_channels = ARRAY_SIZE(ads8344_channels);</div><div class='add'>+</div><div class='add'>+	adc-&gt;reg = devm_regulator_get(&amp;spi-&gt;dev, "vref");</div><div class='add'>+	if (IS_ERR(adc-&gt;reg))</div><div class='add'>+		return PTR_ERR(adc-&gt;reg);</div><div class='add'>+</div><div class='add'>+	ret = regulator_enable(adc-&gt;reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, indio_dev);</div><div class='add'>+</div><div class='add'>+	ret = iio_device_register(indio_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		regulator_disable(adc-&gt;reg);</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 ads8344_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = spi_get_drvdata(spi);</div><div class='add'>+	struct ads8344 *adc = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	iio_device_unregister(indio_dev);</div><div class='add'>+	regulator_disable(adc-&gt;reg);</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 of_device_id ads8344_of_match[] = {</div><div class='add'>+	{ .compatible = "ti,ads8344", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ads8344_of_match);</div><div class='add'>+</div><div class='add'>+static struct spi_driver ads8344_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ads8344",</div><div class='add'>+		.of_match_table = ads8344_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = ads8344_probe,</div><div class='add'>+	.remove = ads8344_remove,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(ads8344_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Gregory CLEMENT &lt;gregory.clement@bootlin.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("ADS8344 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c<br/>index 8b4568edd5cb..f9461070a74a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ti-ads8688.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/ti-ads8688.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/ti-ads8688.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/ti-ads8688.c</a></div><div class='hunk'>@@ -523,6 +523,6 @@ static struct spi_driver ads8688_driver = {</div><div class='ctx'> };</div><div class='ctx'> module_spi_driver(ads8688_driver);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Sean Nyekjaer &lt;sean.nyekjaer@prevas.dk&gt;");</div><div class='add'>+MODULE_AUTHOR("Sean Nyekjaer &lt;sean@geanix.dk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Texas Instruments ADS8688 driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c<br/>index b13c61539d46..6401ca7a9a20 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/xilinx-xadc-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/adc/xilinx-xadc-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/adc/xilinx-xadc-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/adc/xilinx-xadc-core.c</a></div><div class='hunk'>@@ -1292,6 +1292,7 @@ static int xadc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='ctx'> 	free_irq(xadc-&gt;irq, indio_dev);</div><div class='add'>+	cancel_delayed_work_sync(&amp;xadc-&gt;zynq_unmask_work);</div><div class='ctx'> err_clk_disable_unprepare:</div><div class='ctx'> 	clk_disable_unprepare(xadc-&gt;clk);</div><div class='ctx'> err_free_samplerate_trigger:</div><div class='hunk'>@@ -1321,8 +1322,8 @@ static int xadc_remove(struct platform_device *pdev)</div><div class='ctx'> 		iio_triggered_buffer_cleanup(indio_dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	free_irq(xadc-&gt;irq, indio_dev);</div><div class='add'>+	cancel_delayed_work_sync(&amp;xadc-&gt;zynq_unmask_work);</div><div class='ctx'> 	clk_disable_unprepare(xadc-&gt;clk);</div><div class='del'>-	cancel_delayed_work(&amp;xadc-&gt;zynq_unmask_work);</div><div class='ctx'> 	kfree(xadc-&gt;data);</div><div class='ctx'> 	kfree(indio_dev-&gt;channels);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/buffer/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c<br/>index ea63c838eeae..df21e7dbec40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/buffer/industrialio-buffer-cb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/buffer/industrialio-buffer-cb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/buffer/industrialio-buffer-cb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/buffer/industrialio-buffer-cb.c</a></div><div class='hunk'>@@ -36,7 +36,8 @@ static int iio_buffer_cb_store_to(struct iio_buffer *buffer, const void *data)</div><div class='ctx'> static void iio_buffer_cb_release(struct iio_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct iio_cb_buffer *cb_buff = buffer_to_cb_buffer(buffer);</div><div class='del'>-	kfree(cb_buff-&gt;buffer.scan_mask);</div><div class='add'>+</div><div class='add'>+	bitmap_free(cb_buff-&gt;buffer.scan_mask);</div><div class='ctx'> 	kfree(cb_buff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -74,9 +75,8 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cb_buff-&gt;indio_dev = cb_buff-&gt;channels[0].indio_dev;</div><div class='del'>-	cb_buff-&gt;buffer.scan_mask</div><div class='del'>-		= kcalloc(BITS_TO_LONGS(cb_buff-&gt;indio_dev-&gt;masklength),</div><div class='del'>-			  sizeof(long), GFP_KERNEL);</div><div class='add'>+	cb_buff-&gt;buffer.scan_mask = bitmap_zalloc(cb_buff-&gt;indio_dev-&gt;masklength,</div><div class='add'>+						  GFP_KERNEL);</div><div class='ctx'> 	if (cb_buff-&gt;buffer.scan_mask == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto error_release_channels;</div><div class='hunk'>@@ -95,7 +95,7 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,</div><div class='ctx'> 	return cb_buff;</div><div class='ctx'> </div><div class='ctx'> error_free_scan_mask:</div><div class='del'>-	kfree(cb_buff-&gt;buffer.scan_mask);</div><div class='add'>+	bitmap_free(cb_buff-&gt;buffer.scan_mask);</div><div class='ctx'> error_release_channels:</div><div class='ctx'> 	iio_channel_release_all(cb_buff-&gt;channels);</div><div class='ctx'> error_free_cb_buff:</div><div class='head'>diff --git a/drivers/iio/chemical/Kconfig b/drivers/iio/chemical/Kconfig<br/>index d5d146e9e372..5dc11a359444 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/chemical/Kconfig</a></div><div class='hunk'>@@ -12,14 +12,14 @@ config ATLAS_PH_SENSOR</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	select IRQ_WORK</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here to build I2C interface support for the following</div><div class='del'>-	 Atlas Scientific OEM SM sensors:</div><div class='add'>+	  Say Y here to build I2C interface support for the following</div><div class='add'>+	  Atlas Scientific OEM SM sensors:</div><div class='ctx'> 	    * pH SM sensor</div><div class='ctx'> 	    * EC SM sensor</div><div class='ctx'> 	    * ORP SM sensor</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as module, choose M here: the</div><div class='del'>-	 module will be called atlas-ph-sensor.</div><div class='add'>+	  To compile this driver as module, choose M here: the</div><div class='add'>+	  module will be called atlas-ph-sensor.</div><div class='ctx'> </div><div class='ctx'> config BME680</div><div class='ctx'> 	tristate "Bosch Sensortec BME680 sensor driver"</div><div class='hunk'>@@ -47,8 +47,8 @@ config BME680_SPI</div><div class='ctx'> config CCS811</div><div class='ctx'> 	tristate "AMS CCS811 VOC sensor"</div><div class='ctx'> 	depends on I2C</div><div class='del'>-    select IIO_BUFFER</div><div class='del'>-    select IIO_TRIGGERED_BUFFER</div><div class='add'>+	select IIO_BUFFER</div><div class='add'>+	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to build I2C interface support for the AMS</div><div class='ctx'> 	  CCS811 VOC (Volatile Organic Compounds) sensor</div><div class='hunk'>@@ -64,6 +64,7 @@ config IAQCORE</div><div class='ctx'> config PMS7003</div><div class='ctx'> 	tristate "Plantower PMS7003 particulate matter sensor"</div><div class='ctx'> 	depends on SERIAL_DEV_BUS</div><div class='add'>+	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to build support for the Plantower PMS7003 particulate</div><div class='ctx'> 	  matter sensor.</div><div class='hunk'>@@ -71,6 +72,19 @@ config PMS7003</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will</div><div class='ctx'> 	  be called pms7003.</div><div class='ctx'> </div><div class='add'>+config SENSIRION_SGP30</div><div class='add'>+	tristate "Sensirion SGPxx gas sensors"</div><div class='add'>+	depends on I2C</div><div class='add'>+	select CRC8</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to build I2C interface support for the following</div><div class='add'>+	  Sensirion SGP gas sensors:</div><div class='add'>+	    * SGP30 gas sensor</div><div class='add'>+	    * SGPC3 low power gas sensor</div><div class='add'>+</div><div class='add'>+	  To compile this driver as module, choose M here: the</div><div class='add'>+	  module will be called sgp30.</div><div class='add'>+</div><div class='ctx'> config SPS30</div><div class='ctx'> 	tristate "SPS30 particulate matter sensor"</div><div class='ctx'> 	depends on I2C</div><div class='head'>diff --git a/drivers/iio/chemical/bme680.h b/drivers/iio/chemical/bme680.h<br/>index 0ae89b87e2d6..4edc5d21cb9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/chemical/bme680.h</a></div><div class='hunk'>@@ -2,11 +2,9 @@</div><div class='ctx'> #ifndef BME680_H_</div><div class='ctx'> #define BME680_H_</div><div class='ctx'> </div><div class='del'>-#define BME680_REG_CHIP_I2C_ID			0xD0</div><div class='del'>-#define BME680_REG_CHIP_SPI_ID			0x50</div><div class='add'>+#define BME680_REG_CHIP_ID			0xD0</div><div class='ctx'> #define   BME680_CHIP_ID_VAL			0x61</div><div class='del'>-#define BME680_REG_SOFT_RESET_I2C		0xE0</div><div class='del'>-#define BME680_REG_SOFT_RESET_SPI		0x60</div><div class='add'>+#define BME680_REG_SOFT_RESET			0xE0</div><div class='ctx'> #define   BME680_CMD_SOFTRESET			0xB6</div><div class='ctx'> #define BME680_REG_STATUS			0x73</div><div class='ctx'> #define   BME680_SPI_MEM_PAGE_BIT		BIT(4)</div><div class='head'>diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c<br/>index 70c1fe4366f4..ccde4c65ff93 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/chemical/bme680_core.c</a></div><div class='hunk'>@@ -63,9 +63,23 @@ struct bme680_data {</div><div class='ctx'> 	s32 t_fine;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct regmap_range bme680_volatile_ranges[] = {</div><div class='add'>+	regmap_reg_range(BME680_REG_MEAS_STAT_0, BME680_REG_GAS_R_LSB),</div><div class='add'>+	regmap_reg_range(BME680_REG_STATUS, BME680_REG_STATUS),</div><div class='add'>+	regmap_reg_range(BME680_T2_LSB_REG, BME680_GH3_REG),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table bme680_volatile_table = {</div><div class='add'>+	.yes_ranges	= bme680_volatile_ranges,</div><div class='add'>+	.n_yes_ranges	= ARRAY_SIZE(bme680_volatile_ranges),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> const struct regmap_config bme680_regmap_config = {</div><div class='ctx'> 	.reg_bits = 8,</div><div class='ctx'> 	.val_bits = 8,</div><div class='add'>+	.max_register = 0xef,</div><div class='add'>+	.volatile_table = &amp;bme680_volatile_table,</div><div class='add'>+	.cache_type = REGCACHE_RBTREE,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(bme680_regmap_config);</div><div class='ctx'> </div><div class='hunk'>@@ -316,6 +330,10 @@ static s16 bme680_compensate_temp(struct bme680_data *data,</div><div class='ctx'> 	s64 var1, var2, var3;</div><div class='ctx'> 	s16 calc_temp;</div><div class='ctx'> </div><div class='add'>+	/* If the calibration is invalid, attempt to reload it */</div><div class='add'>+	if (!calib-&gt;par_t2)</div><div class='add'>+		bme680_read_calib(data, calib);</div><div class='add'>+</div><div class='ctx'> 	var1 = (adc_temp &gt;&gt; 3) - (calib-&gt;par_t1 &lt;&lt; 1);</div><div class='ctx'> 	var2 = (var1 * calib-&gt;par_t2) &gt;&gt; 11;</div><div class='ctx'> 	var3 = ((var1 &gt;&gt; 1) * (var1 &gt;&gt; 1)) &gt;&gt; 12;</div><div class='hunk'>@@ -583,8 +601,7 @@ static int bme680_gas_config(struct bme680_data *data)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bme680_read_temp(struct bme680_data *data,</div><div class='del'>-			    int *val, int *val2)</div><div class='add'>+static int bme680_read_temp(struct bme680_data *data, int *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -617,10 +634,9 @@ static int bme680_read_temp(struct bme680_data *data,</div><div class='ctx'> 	 * compensate_press/compensate_humid to get compensated</div><div class='ctx'> 	 * pressure/humidity readings.</div><div class='ctx'> 	 */</div><div class='del'>-	if (val &amp;&amp; val2) {</div><div class='del'>-		*val = comp_temp;</div><div class='del'>-		*val2 = 100;</div><div class='del'>-		return IIO_VAL_FRACTIONAL;</div><div class='add'>+	if (val) {</div><div class='add'>+		*val = comp_temp * 10; /* Centidegrees to millidegrees */</div><div class='add'>+		return IIO_VAL_INT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -635,7 +651,7 @@ static int bme680_read_press(struct bme680_data *data,</div><div class='ctx'> 	s32 adc_press;</div><div class='ctx'> </div><div class='ctx'> 	/* Read and compensate temperature to get a reading of t_fine */</div><div class='del'>-	ret = bme680_read_temp(data, NULL, NULL);</div><div class='add'>+	ret = bme680_read_temp(data, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -668,7 +684,7 @@ static int bme680_read_humid(struct bme680_data *data,</div><div class='ctx'> 	u32 comp_humidity;</div><div class='ctx'> </div><div class='ctx'> 	/* Read and compensate temperature to get a reading of t_fine */</div><div class='del'>-	ret = bme680_read_temp(data, NULL, NULL);</div><div class='add'>+	ret = bme680_read_temp(data, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -761,7 +777,7 @@ static int bme680_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	case IIO_CHAN_INFO_PROCESSED:</div><div class='ctx'> 		switch (chan-&gt;type) {</div><div class='ctx'> 		case IIO_TEMP:</div><div class='del'>-			return bme680_read_temp(data, val, val2);</div><div class='add'>+			return bme680_read_temp(data, val);</div><div class='ctx'> 		case IIO_PRESSURE:</div><div class='ctx'> 			return bme680_read_press(data, val, val2);</div><div class='ctx'> 		case IIO_HUMIDITYRELATIVE:</div><div class='hunk'>@@ -867,8 +883,28 @@ int bme680_core_probe(struct device *dev, struct regmap *regmap,</div><div class='ctx'> {</div><div class='ctx'> 	struct iio_dev *indio_dev;</div><div class='ctx'> 	struct bme680_data *data;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = regmap_write(regmap, BME680_REG_SOFT_RESET,</div><div class='add'>+			   BME680_CMD_SOFTRESET);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to reset chip\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, BME680_REG_CHIP_ID, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Error reading chip ID\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val != BME680_CHIP_ID_VAL) {</div><div class='add'>+		dev_err(dev, "Wrong chip ID, got %x expected %x\n",</div><div class='add'>+				val, BME680_CHIP_ID_VAL);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));</div><div class='ctx'> 	if (!indio_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/iio/chemical/bme680_i2c.c b/drivers/iio/chemical/bme680_i2c.c<br/>index b2f805b6b36a..de9c9e3d23ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680_i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680_i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/chemical/bme680_i2c.c</a></div><div class='hunk'>@@ -23,8 +23,6 @@ static int bme680_i2c_probe(struct i2c_client *client,</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	const char *name = NULL;</div><div class='del'>-	unsigned int val;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	regmap = devm_regmap_init_i2c(client, &amp;bme680_regmap_config);</div><div class='ctx'> 	if (IS_ERR(regmap)) {</div><div class='hunk'>@@ -33,25 +31,6 @@ static int bme680_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 		return PTR_ERR(regmap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = regmap_write(regmap, BME680_REG_SOFT_RESET_I2C,</div><div class='del'>-			   BME680_CMD_SOFTRESET);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Failed to reset chip\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(regmap, BME680_REG_CHIP_I2C_ID, &amp;val);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Error reading I2C chip ID\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (val != BME680_CHIP_ID_VAL) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Wrong chip ID, got %x expected %x\n",</div><div class='del'>-				val, BME680_CHIP_ID_VAL);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (id)</div><div class='ctx'> 		name = id-&gt;name;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/chemical/bme680_spi.c b/drivers/iio/chemical/bme680_spi.c<br/>index d0b7bdd3f066..3b838068a7e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/bme680_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/bme680_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/chemical/bme680_spi.c</a></div><div class='hunk'>@@ -12,28 +12,93 @@</div><div class='ctx'> </div><div class='ctx'> #include "bme680.h"</div><div class='ctx'> </div><div class='add'>+struct bme680_spi_bus_context {</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+	u8 current_page;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In SPI mode there are only 7 address bits, a "page" register determines</div><div class='add'>+ * which part of the 8-bit range is active. This function looks at the address</div><div class='add'>+ * and writes the page selection bit if needed</div><div class='add'>+ */</div><div class='add'>+static int bme680_regmap_spi_select_page(</div><div class='add'>+	struct bme680_spi_bus_context *ctx, u8 reg)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = ctx-&gt;spi;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+	u8 page = (reg &amp; 0x80) ? 0 : 1; /* Page "1" is low range */</div><div class='add'>+</div><div class='add'>+	if (page == ctx-&gt;current_page)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Data sheet claims we're only allowed to change bit 4, so we must do</div><div class='add'>+	 * a read-modify-write on each and every page select</div><div class='add'>+	 */</div><div class='add'>+	buf[0] = BME680_REG_STATUS;</div><div class='add'>+	ret = spi_write_then_read(spi, buf, 1, buf + 1, 1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to set page %u\n", page);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[0] = BME680_REG_STATUS;</div><div class='add'>+	if (page)</div><div class='add'>+		buf[1] |= BME680_SPI_MEM_PAGE_BIT;</div><div class='add'>+	else</div><div class='add'>+		buf[1] &amp;= ~BME680_SPI_MEM_PAGE_BIT;</div><div class='add'>+</div><div class='add'>+	ret = spi_write(spi, buf, 2);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to set page %u\n", page);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;current_page = page;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bme680_regmap_spi_write(void *context, const void *data,</div><div class='ctx'> 				   size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct spi_device *spi = context;</div><div class='add'>+	struct bme680_spi_bus_context *ctx = context;</div><div class='add'>+	struct spi_device *spi = ctx-&gt;spi;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 buf[2];</div><div class='ctx'> </div><div class='ctx'> 	memcpy(buf, data, 2);</div><div class='add'>+</div><div class='add'>+	ret = bme680_regmap_spi_select_page(ctx, buf[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The SPI register address (= full register address without bit 7)</div><div class='ctx'> 	 * and the write command (bit7 = RW = '0')</div><div class='ctx'> 	 */</div><div class='ctx'> 	buf[0] &amp;= ~0x80;</div><div class='ctx'> </div><div class='del'>-	return spi_write_then_read(spi, buf, 2, NULL, 0);</div><div class='add'>+	return spi_write(spi, buf, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bme680_regmap_spi_read(void *context, const void *reg,</div><div class='ctx'> 				  size_t reg_size, void *val, size_t val_size)</div><div class='ctx'> {</div><div class='del'>-	struct spi_device *spi = context;</div><div class='add'>+	struct bme680_spi_bus_context *ctx = context;</div><div class='add'>+	struct spi_device *spi = ctx-&gt;spi;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 addr = *(const u8 *)reg;</div><div class='add'>+</div><div class='add'>+	ret = bme680_regmap_spi_select_page(ctx, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	return spi_write_then_read(spi, reg, reg_size, val, val_size);</div><div class='add'>+	addr |= 0x80; /* bit7 = RW = '1' */</div><div class='add'>+</div><div class='add'>+	return spi_write_then_read(spi, &amp;addr, 1, val, val_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct regmap_bus bme680_regmap_bus = {</div><div class='hunk'>@@ -46,8 +111,8 @@ static struct regmap_bus bme680_regmap_bus = {</div><div class='ctx'> static int bme680_spi_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='add'>+	struct bme680_spi_bus_context *bus_context;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='del'>-	unsigned int val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spi-&gt;bits_per_word = 8;</div><div class='hunk'>@@ -57,45 +122,21 @@ static int bme680_spi_probe(struct spi_device *spi)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bus_context = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*bus_context), GFP_KERNEL);</div><div class='add'>+	if (!bus_context)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bus_context-&gt;spi = spi;</div><div class='add'>+	bus_context-&gt;current_page = 0xff; /* Undefined on warm boot */</div><div class='add'>+</div><div class='ctx'> 	regmap = devm_regmap_init(&amp;spi-&gt;dev, &amp;bme680_regmap_bus,</div><div class='del'>-				  &amp;spi-&gt;dev, &amp;bme680_regmap_config);</div><div class='add'>+				  bus_context, &amp;bme680_regmap_config);</div><div class='ctx'> 	if (IS_ERR(regmap)) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "Failed to register spi regmap %d\n",</div><div class='ctx'> 				(int)PTR_ERR(regmap));</div><div class='ctx'> 		return PTR_ERR(regmap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = regmap_write(regmap, BME680_REG_SOFT_RESET_SPI,</div><div class='del'>-			   BME680_CMD_SOFTRESET);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "Failed to reset chip\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* after power-on reset, Page 0(0x80-0xFF) of spi_mem_page is active */</div><div class='del'>-	ret = regmap_read(regmap, BME680_REG_CHIP_SPI_ID, &amp;val);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "Error reading SPI chip ID\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (val != BME680_CHIP_ID_VAL) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "Wrong chip ID, got %x expected %x\n",</div><div class='del'>-				val, BME680_CHIP_ID_VAL);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * select Page 1 of spi_mem_page to enable access to</div><div class='del'>-	 * to registers from address 0x00 to 0x7F.</div><div class='del'>-	 */</div><div class='del'>-	ret = regmap_write_bits(regmap, BME680_REG_STATUS,</div><div class='del'>-				BME680_SPI_MEM_PAGE_BIT,</div><div class='del'>-				BME680_SPI_MEM_PAGE_1_VAL);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "failed to set page 1 of spi_mem_page\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return bme680_core_probe(&amp;spi-&gt;dev, regmap, id-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/chemical/pms7003.c b/drivers/iio/chemical/pms7003.c<br/>index db8e7b2327b3..23c9ab252470 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/pms7003.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/chemical/pms7003.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/chemical/pms7003.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/chemical/pms7003.c</a></div><div class='hunk'>@@ -321,7 +321,12 @@ static int pms7003_probe(struct serdev_device *serdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id pms7003_of_match[] = {</div><div class='add'>+	{ .compatible = "plantower,pms1003" },</div><div class='add'>+	{ .compatible = "plantower,pms3003" },</div><div class='add'>+	{ .compatible = "plantower,pms5003" },</div><div class='add'>+	{ .compatible = "plantower,pms6003" },</div><div class='ctx'> 	{ .compatible = "plantower,pms7003" },</div><div class='add'>+	{ .compatible = "plantower,pmsa003" },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, pms7003_of_match);</div><div class='head'>diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c<br/>index 89cb0066a6e0..17af4e0fd5f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c</a></div><div class='hunk'>@@ -1,22 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * cros_ec_sensors - Driver for Chrome OS Embedded Controller sensors.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2016 Google, Inc</div><div class='ctx'>  *</div><div class='del'>- * This software is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2, as published by the Free Software Foundation, and</div><div class='del'>- * may be copied, distributed, and modified under those terms.</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'>  * This driver uses the cros-ec interface to communicate with the Chrome OS</div><div class='ctx'>  * EC about sensors data. Data access is presented through iio sysfs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/common/cros_ec_sensors_core.h&gt;</div><div class='hunk'>@@ -30,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CROS_EC_SENSORS_MAX_CHANNELS 4</div><div class='ctx'> </div><div class='hunk'>@@ -103,9 +93,10 @@ static int cros_ec_sensors_read(struct iio_dev *indio_dev,</div><div class='ctx'> 			 * Do not use IIO_DEGREE_TO_RAD to avoid precision</div><div class='ctx'> 			 * loss. Round to the nearest integer.</div><div class='ctx'> 			 */</div><div class='del'>-			*val = div_s64(val64 * 314159 + 9000000ULL, 1000);</div><div class='del'>-			*val2 = 18000 &lt;&lt; (CROS_EC_SENSOR_BITS - 1);</div><div class='del'>-			ret = IIO_VAL_FRACTIONAL;</div><div class='add'>+			*val = 0;</div><div class='add'>+			*val2 = div_s64(val64 * 3141592653ULL,</div><div class='add'>+					180 &lt;&lt; (CROS_EC_SENSOR_BITS - 1));</div><div class='add'>+			ret = IIO_VAL_INT_PLUS_NANO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MOTIONSENSE_TYPE_MAG:</div><div class='ctx'> 			/*</div><div class='head'>diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c<br/>index 414cc43c287e..719a0df5aeeb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * cros_ec_sensors_core - Common function for Chrome OS EC sensor driver.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2016 Google, Inc</div><div class='del'>- *</div><div class='del'>- * This software is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2, as published by the Free Software Foundation, and</div><div class='del'>- * may be copied, distributed, and modified under those terms.</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/delay.h&gt;</div><div class='hunk'>@@ -25,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/mfd/cros_ec_commands.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> static char *cros_ec_loc[] = {</div><div class='hunk'>@@ -269,6 +260,17 @@ static int cros_ec_sensors_read_data_unsafe(struct iio_dev *indio_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cros_ec_sensors_read_lpc() - read acceleration data from EC shared memory.</div><div class='add'>+ * @indio_dev: pointer to IIO device.</div><div class='add'>+ * @scan_mask: bitmap of the sensor indices to scan.</div><div class='add'>+ * @data: location to store data.</div><div class='add'>+ *</div><div class='add'>+ * Note: this is the safe function for reading the EC data. It guarantees</div><div class='add'>+ * that the data sampled was not modified by the EC while being read.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='ctx'> int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev,</div><div class='ctx'> 			     unsigned long scan_mask, s16 *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/iio/common/ms_sensors/Kconfig b/drivers/iio/common/ms_sensors/Kconfig<br/>index b28a92b97cf9..89398d0afc0d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/ms_sensors/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/ms_sensors/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/ms_sensors/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/common/ms_sensors/Kconfig</a></div><div class='hunk'>@@ -3,4 +3,4 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> config IIO_MS_SENSORS_I2C</div><div class='del'>-        tristate</div><div class='add'>+	tristate</div><div class='head'>diff --git a/drivers/iio/common/ssp_sensors/ssp_iio.c b/drivers/iio/common/ssp_sensors/ssp_iio.c<br/>index 645f2e3975db..e38f704d88b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/ssp_sensors/ssp_iio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/common/ssp_sensors/ssp_iio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/common/ssp_sensors/ssp_iio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/common/ssp_sensors/ssp_iio.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ int ssp_common_process_data(struct iio_dev *indio_dev, void *buf,</div><div class='ctx'> 			    unsigned int len, int64_t timestamp)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 time;</div><div class='del'>-	int64_t calculated_time;</div><div class='add'>+	int64_t calculated_time = 0;</div><div class='ctx'> 	struct ssp_sensor_data *spd = iio_priv(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (indio_dev-&gt;scan_bytes == 0)</div><div class='head'>diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c<br/>deleted file mode 100644<br/>index 92be8d0f7735..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/counter/104-quad-8.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/104-quad-8.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,631 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * IIO driver for the ACCES 104-QUAD-8</div><div class='del'>- * Copyright (C) 2016 William Breathitt Gray</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'>- * 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'>- * This driver supports the ACCES 104-QUAD-8 and ACCES 104-QUAD-4.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/iio/iio.h&gt;</div><div class='del'>-#include &lt;linux/iio/types.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/isa.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/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define QUAD8_EXTENT 32</div><div class='del'>-</div><div class='del'>-static unsigned int base[max_num_isa_dev(QUAD8_EXTENT)];</div><div class='del'>-static unsigned int num_quad8;</div><div class='del'>-module_param_array(base, uint, &amp;num_quad8, 0);</div><div class='del'>-MODULE_PARM_DESC(base, "ACCES 104-QUAD-8 base addresses");</div><div class='del'>-</div><div class='del'>-#define QUAD8_NUM_COUNTERS 8</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct quad8_iio - IIO device private data structure</div><div class='del'>- * @preset:		array of preset values</div><div class='del'>- * @count_mode:		array of count mode configurations</div><div class='del'>- * @quadrature_mode:	array of quadrature mode configurations</div><div class='del'>- * @quadrature_scale:	array of quadrature mode scale configurations</div><div class='del'>- * @ab_enable:		array of A and B inputs enable configurations</div><div class='del'>- * @preset_enable:	array of set_to_preset_on_index attribute configurations</div><div class='del'>- * @synchronous_mode:	array of index function synchronous mode configurations</div><div class='del'>- * @index_polarity:	array of index function polarity configurations</div><div class='del'>- * @base:		base port address of the IIO device</div><div class='del'>- */</div><div class='del'>-struct quad8_iio {</div><div class='del'>-	unsigned int preset[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int count_mode[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int quadrature_mode[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int quadrature_scale[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int ab_enable[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int preset_enable[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int synchronous_mode[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int index_polarity[QUAD8_NUM_COUNTERS];</div><div class='del'>-	unsigned int base;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define QUAD8_REG_CHAN_OP 0x11</div><div class='del'>-#define QUAD8_REG_INDEX_INPUT_LEVELS 0x16</div><div class='del'>-/* Borrow Toggle flip-flop */</div><div class='del'>-#define QUAD8_FLAG_BT BIT(0)</div><div class='del'>-/* Carry Toggle flip-flop */</div><div class='del'>-#define QUAD8_FLAG_CT BIT(1)</div><div class='del'>-/* Error flag */</div><div class='del'>-#define QUAD8_FLAG_E BIT(4)</div><div class='del'>-/* Up/Down flag */</div><div class='del'>-#define QUAD8_FLAG_UD BIT(5)</div><div class='del'>-/* Reset and Load Signal Decoders */</div><div class='del'>-#define QUAD8_CTR_RLD 0x00</div><div class='del'>-/* Counter Mode Register */</div><div class='del'>-#define QUAD8_CTR_CMR 0x20</div><div class='del'>-/* Input / Output Control Register */</div><div class='del'>-#define QUAD8_CTR_IOR 0x40</div><div class='del'>-/* Index Control Register */</div><div class='del'>-#define QUAD8_CTR_IDR 0x60</div><div class='del'>-/* Reset Byte Pointer (three byte data pointer) */</div><div class='del'>-#define QUAD8_RLD_RESET_BP 0x01</div><div class='del'>-/* Reset Counter */</div><div class='del'>-#define QUAD8_RLD_RESET_CNTR 0x02</div><div class='del'>-/* Reset Borrow Toggle, Carry Toggle, Compare Toggle, and Sign flags */</div><div class='del'>-#define QUAD8_RLD_RESET_FLAGS 0x04</div><div class='del'>-/* Reset Error flag */</div><div class='del'>-#define QUAD8_RLD_RESET_E 0x06</div><div class='del'>-/* Preset Register to Counter */</div><div class='del'>-#define QUAD8_RLD_PRESET_CNTR 0x08</div><div class='del'>-/* Transfer Counter to Output Latch */</div><div class='del'>-#define QUAD8_RLD_CNTR_OUT 0x10</div><div class='del'>-#define QUAD8_CHAN_OP_ENABLE_COUNTERS 0x00</div><div class='del'>-#define QUAD8_CHAN_OP_RESET_COUNTERS 0x01</div><div class='del'>-</div><div class='del'>-static int quad8_read_raw(struct iio_dev *indio_dev,</div><div class='del'>-	struct iio_chan_spec const *chan, int *val, int *val2, long mask)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	unsigned int borrow;</div><div class='del'>-	unsigned int carry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (mask) {</div><div class='del'>-	case IIO_CHAN_INFO_RAW:</div><div class='del'>-		if (chan-&gt;type == IIO_INDEX) {</div><div class='del'>-			*val = !!(inb(priv-&gt;base + QUAD8_REG_INDEX_INPUT_LEVELS)</div><div class='del'>-				&amp; BIT(chan-&gt;channel));</div><div class='del'>-			return IIO_VAL_INT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		flags = inb(base_offset + 1);</div><div class='del'>-		borrow = flags &amp; QUAD8_FLAG_BT;</div><div class='del'>-		carry = !!(flags &amp; QUAD8_FLAG_CT);</div><div class='del'>-</div><div class='del'>-		/* Borrow XOR Carry effectively doubles count range */</div><div class='del'>-		*val = (borrow ^ carry) &lt;&lt; 24;</div><div class='del'>-</div><div class='del'>-		/* Reset Byte Pointer; transfer Counter to Output Latch */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP | QUAD8_RLD_CNTR_OUT,</div><div class='del'>-		     base_offset + 1);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			*val |= (unsigned int)inb(base_offset) &lt;&lt; (8 * i);</div><div class='del'>-</div><div class='del'>-		return IIO_VAL_INT;</div><div class='del'>-	case IIO_CHAN_INFO_ENABLE:</div><div class='del'>-		*val = priv-&gt;ab_enable[chan-&gt;channel];</div><div class='del'>-		return IIO_VAL_INT;</div><div class='del'>-	case IIO_CHAN_INFO_SCALE:</div><div class='del'>-		*val = 1;</div><div class='del'>-		*val2 = priv-&gt;quadrature_scale[chan-&gt;channel];</div><div class='del'>-		return IIO_VAL_FRACTIONAL_LOG2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quad8_write_raw(struct iio_dev *indio_dev,</div><div class='del'>-	struct iio_chan_spec const *chan, int val, int val2, long mask)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int ior_cfg;</div><div class='del'>-</div><div class='del'>-	switch (mask) {</div><div class='del'>-	case IIO_CHAN_INFO_RAW:</div><div class='del'>-		if (chan-&gt;type == IIO_INDEX)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* Only 24-bit values are supported */</div><div class='del'>-		if ((unsigned int)val &gt; 0xFFFFFF)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* Reset Byte Pointer */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='del'>-</div><div class='del'>-		/* Counter can only be set via Preset Register */</div><div class='del'>-		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			outb(val &gt;&gt; (8 * i), base_offset);</div><div class='del'>-</div><div class='del'>-		/* Transfer Preset Register to Counter */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_PRESET_CNTR, base_offset + 1);</div><div class='del'>-</div><div class='del'>-		/* Reset Byte Pointer */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='del'>-</div><div class='del'>-		/* Set Preset Register back to original value */</div><div class='del'>-		val = priv-&gt;preset[chan-&gt;channel];</div><div class='del'>-		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			outb(val &gt;&gt; (8 * i), base_offset);</div><div class='del'>-</div><div class='del'>-		/* Reset Borrow, Carry, Compare, and Sign flags */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_FLAGS, base_offset + 1);</div><div class='del'>-		/* Reset Error flag */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_E, base_offset + 1);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	case IIO_CHAN_INFO_ENABLE:</div><div class='del'>-		/* only boolean values accepted */</div><div class='del'>-		if (val &lt; 0 || val &gt; 1)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		priv-&gt;ab_enable[chan-&gt;channel] = val;</div><div class='del'>-</div><div class='del'>-		ior_cfg = val | priv-&gt;preset_enable[chan-&gt;channel] &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-		/* Load I/O control configuration */</div><div class='del'>-		outb(QUAD8_CTR_IOR | ior_cfg, base_offset + 1);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	case IIO_CHAN_INFO_SCALE:</div><div class='del'>-		/* Quadrature scaling only available in quadrature mode */</div><div class='del'>-		if (!priv-&gt;quadrature_mode[chan-&gt;channel] &amp;&amp; (val2 || val != 1))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* Only three gain states (1, 0.5, 0.25) */</div><div class='del'>-		if (val == 1 &amp;&amp; !val2)</div><div class='del'>-			priv-&gt;quadrature_scale[chan-&gt;channel] = 0;</div><div class='del'>-		else if (!val)</div><div class='del'>-			switch (val2) {</div><div class='del'>-			case 500000:</div><div class='del'>-				priv-&gt;quadrature_scale[chan-&gt;channel] = 1;</div><div class='del'>-				break;</div><div class='del'>-			case 250000:</div><div class='del'>-				priv-&gt;quadrature_scale[chan-&gt;channel] = 2;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		else</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'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_info quad8_info = {</div><div class='del'>-	.read_raw = quad8_read_raw,</div><div class='del'>-	.write_raw = quad8_write_raw</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t quad8_read_preset(struct iio_dev *indio_dev, uintptr_t private,</div><div class='del'>-	const struct iio_chan_spec *chan, char *buf)</div><div class='del'>-{</div><div class='del'>-	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n", priv-&gt;preset[chan-&gt;channel]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t quad8_write_preset(struct iio_dev *indio_dev, uintptr_t private,</div><div class='del'>-	const struct iio_chan_spec *chan, const char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel;</div><div class='del'>-	unsigned int preset;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ret = kstrtouint(buf, 0, &amp;preset);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Only 24-bit values are supported */</div><div class='del'>-	if (preset &gt; 0xFFFFFF)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;preset[chan-&gt;channel] = preset;</div><div class='del'>-</div><div class='del'>-	/* Reset Byte Pointer */</div><div class='del'>-	outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='del'>-</div><div class='del'>-	/* Set Preset Register */</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		outb(preset &gt;&gt; (8 * i), base_offset);</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t quad8_read_set_to_preset_on_index(struct iio_dev *indio_dev,</div><div class='del'>-	uintptr_t private, const struct iio_chan_spec *chan, char *buf)</div><div class='del'>-{</div><div class='del'>-	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n",</div><div class='del'>-		!priv-&gt;preset_enable[chan-&gt;channel]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,</div><div class='del'>-	uintptr_t private, const struct iio_chan_spec *chan, const char *buf,</div><div class='del'>-	size_t len)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-	bool preset_enable;</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int ior_cfg;</div><div class='del'>-</div><div class='del'>-	ret = kstrtobool(buf, &amp;preset_enable);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Preset enable is active low in Input/Output Control register */</div><div class='del'>-	preset_enable = !preset_enable;</div><div class='del'>-</div><div class='del'>-	priv-&gt;preset_enable[chan-&gt;channel] = preset_enable;</div><div class='del'>-</div><div class='del'>-	ior_cfg = priv-&gt;ab_enable[chan-&gt;channel] |</div><div class='del'>-		(unsigned int)preset_enable &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-	/* Load I/O control configuration to Input / Output Control Register */</div><div class='del'>-	outb(QUAD8_CTR_IOR | ior_cfg, base_offset);</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *const quad8_noise_error_states[] = {</div><div class='del'>-	"No excessive noise is present at the count inputs",</div><div class='del'>-	"Excessive noise is present at the count inputs"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_get_noise_error(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-</div><div class='del'>-	return !!(inb(base_offset) &amp; QUAD8_FLAG_E);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_enum quad8_noise_error_enum = {</div><div class='del'>-	.items = quad8_noise_error_states,</div><div class='del'>-	.num_items = ARRAY_SIZE(quad8_noise_error_states),</div><div class='del'>-	.get = quad8_get_noise_error</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const quad8_count_direction_states[] = {</div><div class='del'>-	"down",</div><div class='del'>-	"up"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_get_count_direction(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-</div><div class='del'>-	return !!(inb(base_offset) &amp; QUAD8_FLAG_UD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_enum quad8_count_direction_enum = {</div><div class='del'>-	.items = quad8_count_direction_states,</div><div class='del'>-	.num_items = ARRAY_SIZE(quad8_count_direction_states),</div><div class='del'>-	.get = quad8_get_count_direction</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const quad8_count_modes[] = {</div><div class='del'>-	"normal",</div><div class='del'>-	"range limit",</div><div class='del'>-	"non-recycle",</div><div class='del'>-	"modulo-n"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_set_count_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan, unsigned int count_mode)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	unsigned int mode_cfg = count_mode &lt;&lt; 1;</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-</div><div class='del'>-	priv-&gt;count_mode[chan-&gt;channel] = count_mode;</div><div class='del'>-</div><div class='del'>-	/* Add quadrature mode configuration */</div><div class='del'>-	if (priv-&gt;quadrature_mode[chan-&gt;channel])</div><div class='del'>-		mode_cfg |= (priv-&gt;quadrature_scale[chan-&gt;channel] + 1) &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	/* Load mode configuration to Counter Mode Register */</div><div class='del'>-	outb(QUAD8_CTR_CMR | mode_cfg, base_offset);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quad8_get_count_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;count_mode[chan-&gt;channel];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_enum quad8_count_mode_enum = {</div><div class='del'>-	.items = quad8_count_modes,</div><div class='del'>-	.num_items = ARRAY_SIZE(quad8_count_modes),</div><div class='del'>-	.set = quad8_set_count_mode,</div><div class='del'>-	.get = quad8_get_count_mode</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const quad8_synchronous_modes[] = {</div><div class='del'>-	"non-synchronous",</div><div class='del'>-	"synchronous"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_set_synchronous_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan, unsigned int synchronous_mode)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const unsigned int idr_cfg = synchronous_mode |</div><div class='del'>-		priv-&gt;index_polarity[chan-&gt;channel] &lt;&lt; 1;</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-</div><div class='del'>-	/* Index function must be non-synchronous in non-quadrature mode */</div><div class='del'>-	if (synchronous_mode &amp;&amp; !priv-&gt;quadrature_mode[chan-&gt;channel])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;synchronous_mode[chan-&gt;channel] = synchronous_mode;</div><div class='del'>-</div><div class='del'>-	/* Load Index Control configuration to Index Control Register */</div><div class='del'>-	outb(QUAD8_CTR_IDR | idr_cfg, base_offset);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quad8_get_synchronous_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;synchronous_mode[chan-&gt;channel];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_enum quad8_synchronous_mode_enum = {</div><div class='del'>-	.items = quad8_synchronous_modes,</div><div class='del'>-	.num_items = ARRAY_SIZE(quad8_synchronous_modes),</div><div class='del'>-	.set = quad8_set_synchronous_mode,</div><div class='del'>-	.get = quad8_get_synchronous_mode</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const quad8_quadrature_modes[] = {</div><div class='del'>-	"non-quadrature",</div><div class='del'>-	"quadrature"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_set_quadrature_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan, unsigned int quadrature_mode)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	unsigned int mode_cfg = priv-&gt;count_mode[chan-&gt;channel] &lt;&lt; 1;</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-</div><div class='del'>-	if (quadrature_mode)</div><div class='del'>-		mode_cfg |= (priv-&gt;quadrature_scale[chan-&gt;channel] + 1) &lt;&lt; 3;</div><div class='del'>-	else {</div><div class='del'>-		/* Quadrature scaling only available in quadrature mode */</div><div class='del'>-		priv-&gt;quadrature_scale[chan-&gt;channel] = 0;</div><div class='del'>-</div><div class='del'>-		/* Synchronous function not supported in non-quadrature mode */</div><div class='del'>-		if (priv-&gt;synchronous_mode[chan-&gt;channel])</div><div class='del'>-			quad8_set_synchronous_mode(indio_dev, chan, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;quadrature_mode[chan-&gt;channel] = quadrature_mode;</div><div class='del'>-</div><div class='del'>-	/* Load mode configuration to Counter Mode Register */</div><div class='del'>-	outb(QUAD8_CTR_CMR | mode_cfg, base_offset);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quad8_get_quadrature_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;quadrature_mode[chan-&gt;channel];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_enum quad8_quadrature_mode_enum = {</div><div class='del'>-	.items = quad8_quadrature_modes,</div><div class='del'>-	.num_items = ARRAY_SIZE(quad8_quadrature_modes),</div><div class='del'>-	.set = quad8_set_quadrature_mode,</div><div class='del'>-	.get = quad8_get_quadrature_mode</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const quad8_index_polarity_modes[] = {</div><div class='del'>-	"negative",</div><div class='del'>-	"positive"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_set_index_polarity(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan, unsigned int index_polarity)</div><div class='del'>-{</div><div class='del'>-	struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-	const unsigned int idr_cfg = priv-&gt;synchronous_mode[chan-&gt;channel] |</div><div class='del'>-		index_polarity &lt;&lt; 1;</div><div class='del'>-	const int base_offset = priv-&gt;base + 2 * chan-&gt;channel + 1;</div><div class='del'>-</div><div class='del'>-	priv-&gt;index_polarity[chan-&gt;channel] = index_polarity;</div><div class='del'>-</div><div class='del'>-	/* Load Index Control configuration to Index Control Register */</div><div class='del'>-	outb(QUAD8_CTR_IDR | idr_cfg, base_offset);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quad8_get_index_polarity(struct iio_dev *indio_dev,</div><div class='del'>-	const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	const struct quad8_iio *const priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;index_polarity[chan-&gt;channel];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_enum quad8_index_polarity_enum = {</div><div class='del'>-	.items = quad8_index_polarity_modes,</div><div class='del'>-	.num_items = ARRAY_SIZE(quad8_index_polarity_modes),</div><div class='del'>-	.set = quad8_set_index_polarity,</div><div class='del'>-	.get = quad8_get_index_polarity</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iio_chan_spec_ext_info quad8_count_ext_info[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "preset",</div><div class='del'>-		.shared = IIO_SEPARATE,</div><div class='del'>-		.read = quad8_read_preset,</div><div class='del'>-		.write = quad8_write_preset</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "set_to_preset_on_index",</div><div class='del'>-		.shared = IIO_SEPARATE,</div><div class='del'>-		.read = quad8_read_set_to_preset_on_index,</div><div class='del'>-		.write = quad8_write_set_to_preset_on_index</div><div class='del'>-	},</div><div class='del'>-	IIO_ENUM("noise_error", IIO_SEPARATE, &amp;quad8_noise_error_enum),</div><div class='del'>-	IIO_ENUM_AVAILABLE("noise_error", &amp;quad8_noise_error_enum),</div><div class='del'>-	IIO_ENUM("count_direction", IIO_SEPARATE, &amp;quad8_count_direction_enum),</div><div class='del'>-	IIO_ENUM_AVAILABLE("count_direction", &amp;quad8_count_direction_enum),</div><div class='del'>-	IIO_ENUM("count_mode", IIO_SEPARATE, &amp;quad8_count_mode_enum),</div><div class='del'>-	IIO_ENUM_AVAILABLE("count_mode", &amp;quad8_count_mode_enum),</div><div class='del'>-	IIO_ENUM("quadrature_mode", IIO_SEPARATE, &amp;quad8_quadrature_mode_enum),</div><div class='del'>-	IIO_ENUM_AVAILABLE("quadrature_mode", &amp;quad8_quadrature_mode_enum),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iio_chan_spec_ext_info quad8_index_ext_info[] = {</div><div class='del'>-	IIO_ENUM("synchronous_mode", IIO_SEPARATE,</div><div class='del'>-		&amp;quad8_synchronous_mode_enum),</div><div class='del'>-	IIO_ENUM_AVAILABLE("synchronous_mode", &amp;quad8_synchronous_mode_enum),</div><div class='del'>-	IIO_ENUM("index_polarity", IIO_SEPARATE, &amp;quad8_index_polarity_enum),</div><div class='del'>-	IIO_ENUM_AVAILABLE("index_polarity", &amp;quad8_index_polarity_enum),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define QUAD8_COUNT_CHAN(_chan) {					\</div><div class='del'>-	.type = IIO_COUNT,						\</div><div class='del'>-	.channel = (_chan),						\</div><div class='del'>-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |			\</div><div class='del'>-		BIT(IIO_CHAN_INFO_ENABLE) | BIT(IIO_CHAN_INFO_SCALE),	\</div><div class='del'>-	.ext_info = quad8_count_ext_info,				\</div><div class='del'>-	.indexed = 1							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define QUAD8_INDEX_CHAN(_chan) {			\</div><div class='del'>-	.type = IIO_INDEX,				\</div><div class='del'>-	.channel = (_chan),				\</div><div class='del'>-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\</div><div class='del'>-	.ext_info = quad8_index_ext_info,		\</div><div class='del'>-	.indexed = 1					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iio_chan_spec quad8_channels[] = {</div><div class='del'>-	QUAD8_COUNT_CHAN(0), QUAD8_INDEX_CHAN(0),</div><div class='del'>-	QUAD8_COUNT_CHAN(1), QUAD8_INDEX_CHAN(1),</div><div class='del'>-	QUAD8_COUNT_CHAN(2), QUAD8_INDEX_CHAN(2),</div><div class='del'>-	QUAD8_COUNT_CHAN(3), QUAD8_INDEX_CHAN(3),</div><div class='del'>-	QUAD8_COUNT_CHAN(4), QUAD8_INDEX_CHAN(4),</div><div class='del'>-	QUAD8_COUNT_CHAN(5), QUAD8_INDEX_CHAN(5),</div><div class='del'>-	QUAD8_COUNT_CHAN(6), QUAD8_INDEX_CHAN(6),</div><div class='del'>-	QUAD8_COUNT_CHAN(7), QUAD8_INDEX_CHAN(7)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quad8_probe(struct device *dev, unsigned int id)</div><div class='del'>-{</div><div class='del'>-	struct iio_dev *indio_dev;</div><div class='del'>-	struct quad8_iio *priv;</div><div class='del'>-	int i, j;</div><div class='del'>-	unsigned int base_offset;</div><div class='del'>-</div><div class='del'>-	indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));</div><div class='del'>-	if (!indio_dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!devm_request_region(dev, base[id], QUAD8_EXTENT,</div><div class='del'>-		dev_name(dev))) {</div><div class='del'>-		dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",</div><div class='del'>-			base[id], base[id] + QUAD8_EXTENT);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	indio_dev-&gt;info = &amp;quad8_info;</div><div class='del'>-	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='del'>-	indio_dev-&gt;num_channels = ARRAY_SIZE(quad8_channels);</div><div class='del'>-	indio_dev-&gt;channels = quad8_channels;</div><div class='del'>-	indio_dev-&gt;name = dev_name(dev);</div><div class='del'>-	indio_dev-&gt;dev.parent = dev;</div><div class='del'>-</div><div class='del'>-	priv = iio_priv(indio_dev);</div><div class='del'>-	priv-&gt;base = base[id];</div><div class='del'>-</div><div class='del'>-	/* Reset all counters and disable interrupt function */</div><div class='del'>-	outb(QUAD8_CHAN_OP_RESET_COUNTERS, base[id] + QUAD8_REG_CHAN_OP);</div><div class='del'>-	/* Set initial configuration for all counters */</div><div class='del'>-	for (i = 0; i &lt; QUAD8_NUM_COUNTERS; i++) {</div><div class='del'>-		base_offset = base[id] + 2 * i;</div><div class='del'>-		/* Reset Byte Pointer */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_BP, base_offset + 1);</div><div class='del'>-		/* Reset Preset Register */</div><div class='del'>-		for (j = 0; j &lt; 3; j++)</div><div class='del'>-			outb(0x00, base_offset);</div><div class='del'>-		/* Reset Borrow, Carry, Compare, and Sign flags */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_FLAGS, base_offset + 1);</div><div class='del'>-		/* Reset Error flag */</div><div class='del'>-		outb(QUAD8_CTR_RLD | QUAD8_RLD_RESET_E, base_offset + 1);</div><div class='del'>-		/* Binary encoding; Normal count; non-quadrature mode */</div><div class='del'>-		outb(QUAD8_CTR_CMR, base_offset + 1);</div><div class='del'>-		/* Disable A and B inputs; preset on index; FLG1 as Carry */</div><div class='del'>-		outb(QUAD8_CTR_IOR, base_offset + 1);</div><div class='del'>-		/* Disable index function; negative index polarity */</div><div class='del'>-		outb(QUAD8_CTR_IDR, base_offset + 1);</div><div class='del'>-	}</div><div class='del'>-	/* Enable all counters */</div><div class='del'>-	outb(QUAD8_CHAN_OP_ENABLE_COUNTERS, base[id] + QUAD8_REG_CHAN_OP);</div><div class='del'>-</div><div class='del'>-	return devm_iio_device_register(dev, indio_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct isa_driver quad8_driver = {</div><div class='del'>-	.probe = quad8_probe,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "104-quad-8"</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_isa_driver(quad8_driver, num_quad8);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("ACCES 104-QUAD-8 IIO driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/iio/counter/Kconfig b/drivers/iio/counter/Kconfig<br/>deleted file mode 100644<br/>index bf1e559ad7cd..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/counter/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Counter devices</div><div class='del'>-#</div><div class='del'>-# When adding new entries keep the list in alphabetical order</div><div class='del'>-</div><div class='del'>-menu "Counters"</div><div class='del'>-</div><div class='del'>-config 104_QUAD_8</div><div class='del'>-	tristate "ACCES 104-QUAD-8 driver"</div><div class='del'>-	depends on PC104 &amp;&amp; X86</div><div class='del'>-	select ISA_BUS_API</div><div class='del'>-	help</div><div class='del'>-	  Say yes here to build support for the ACCES 104-QUAD-8 quadrature</div><div class='del'>-	  encoder counter/interface device family (104-QUAD-8, 104-QUAD-4).</div><div class='del'>-</div><div class='del'>-	  Performing a write to a counter's IIO_CHAN_INFO_RAW sets the counter and</div><div class='del'>-	  also clears the counter's respective error flag. Although the counters</div><div class='del'>-	  have a 25-bit range, only the lower 24 bits may be set, either directly</div><div class='del'>-	  or via a counter's preset attribute. Interrupts are not supported by</div><div class='del'>-	  this driver.</div><div class='del'>-</div><div class='del'>-	  The base port addresses for the devices may be configured via the base</div><div class='del'>-	  array module parameter.</div><div class='del'>-</div><div class='del'>-config STM32_LPTIMER_CNT</div><div class='del'>-	tristate "STM32 LP Timer encoder counter driver"</div><div class='del'>-	depends on MFD_STM32_LPTIMER || COMPILE_TEST</div><div class='del'>-	help</div><div class='del'>-	  Select this option to enable STM32 Low-Power Timer quadrature encoder</div><div class='del'>-	  and counter driver.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called stm32-lptimer-cnt.</div><div class='del'>-endmenu</div><div class='head'>diff --git a/drivers/iio/counter/Makefile b/drivers/iio/counter/Makefile<br/>deleted file mode 100644<br/>index 1b9a896eb488..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/counter/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for IIO counter devices</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-# When adding new entries keep the list in alphabetical order</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_104_QUAD_8)	+= 104-quad-8.o</div><div class='del'>-obj-$(CONFIG_STM32_LPTIMER_CNT)	+= stm32-lptimer-cnt.o</div><div class='head'>diff --git a/drivers/iio/counter/stm32-lptimer-cnt.c b/drivers/iio/counter/stm32-lptimer-cnt.c<br/>deleted file mode 100644<br/>index 42fb8ba67090..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/counter/stm32-lptimer-cnt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/counter/stm32-lptimer-cnt.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,382 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * STM32 Low-Power Timer Encoder and Counter driver</div><div class='del'>- *</div><div class='del'>- * Copyright (C) STMicroelectronics 2017</div><div class='del'>- *</div><div class='del'>- * Author: Fabrice Gasnier &lt;fabrice.gasnier@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * Inspired by 104-quad-8 and stm32-timer-trigger drivers.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitfield.h&gt;</div><div class='del'>-#include &lt;linux/iio/iio.h&gt;</div><div class='del'>-#include &lt;linux/mfd/stm32-lptimer.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-struct stm32_lptim_cnt {</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct regmap *regmap;</div><div class='del'>-	struct clk *clk;</div><div class='del'>-	u32 preset;</div><div class='del'>-	u32 polarity;</div><div class='del'>-	u32 quadrature_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_is_enabled(struct stm32_lptim_cnt *priv)</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 = regmap_read(priv-&gt;regmap, STM32_LPTIM_CR, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return FIELD_GET(STM32_LPTIM_ENABLE, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_set_enable_state(struct stm32_lptim_cnt *priv,</div><div class='del'>-					int enable)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(STM32_LPTIM_ENABLE, enable);</div><div class='del'>-	ret = regmap_write(priv-&gt;regmap, STM32_LPTIM_CR, val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!enable) {</div><div class='del'>-		clk_disable(priv-&gt;clk);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* LP timer must be enabled before writing CMP &amp; ARR */</div><div class='del'>-	ret = regmap_write(priv-&gt;regmap, STM32_LPTIM_ARR, priv-&gt;preset);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(priv-&gt;regmap, STM32_LPTIM_CMP, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* ensure CMP &amp; ARR registers are properly written */</div><div class='del'>-	ret = regmap_read_poll_timeout(priv-&gt;regmap, STM32_LPTIM_ISR, val,</div><div class='del'>-				       (val &amp; STM32_LPTIM_CMPOK_ARROK),</div><div class='del'>-				       100, 1000);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(priv-&gt;regmap, STM32_LPTIM_ICR,</div><div class='del'>-			   STM32_LPTIM_CMPOKCF_ARROKCF);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = clk_enable(priv-&gt;clk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		regmap_write(priv-&gt;regmap, STM32_LPTIM_CR, 0);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Start LP timer in continuous mode */</div><div class='del'>-	return regmap_update_bits(priv-&gt;regmap, STM32_LPTIM_CR,</div><div class='del'>-				  STM32_LPTIM_CNTSTRT, STM32_LPTIM_CNTSTRT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_setup(struct stm32_lptim_cnt *priv, int enable)</div><div class='del'>-{</div><div class='del'>-	u32 mask = STM32_LPTIM_ENC | STM32_LPTIM_COUNTMODE |</div><div class='del'>-		   STM32_LPTIM_CKPOL | STM32_LPTIM_PRESC;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* Setup LP timer encoder/counter and polarity, without prescaler */</div><div class='del'>-	if (priv-&gt;quadrature_mode)</div><div class='del'>-		val = enable ? STM32_LPTIM_ENC : 0;</div><div class='del'>-	else</div><div class='del'>-		val = enable ? STM32_LPTIM_COUNTMODE : 0;</div><div class='del'>-	val |= FIELD_PREP(STM32_LPTIM_CKPOL, enable ? priv-&gt;polarity : 0);</div><div class='del'>-</div><div class='del'>-	return regmap_update_bits(priv-&gt;regmap, STM32_LPTIM_CFGR, mask, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_write_raw(struct iio_dev *indio_dev,</div><div class='del'>-				 struct iio_chan_spec const *chan,</div><div class='del'>-				 int val, int val2, long mask)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (mask) {</div><div class='del'>-	case IIO_CHAN_INFO_ENABLE:</div><div class='del'>-		if (val &lt; 0 || val &gt; 1)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* Check nobody uses the timer, or already disabled/enabled */</div><div class='del'>-		ret = stm32_lptim_is_enabled(priv);</div><div class='del'>-		if ((ret &lt; 0) || (!ret &amp;&amp; !val))</div><div class='del'>-			return ret;</div><div class='del'>-		if (val &amp;&amp; ret)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		ret = stm32_lptim_setup(priv, val);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		return stm32_lptim_set_enable_state(priv, val);</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 int stm32_lptim_read_raw(struct iio_dev *indio_dev,</div><div class='del'>-				struct iio_chan_spec const *chan,</div><div class='del'>-				int *val, int *val2, long mask)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-	u32 dat;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (mask) {</div><div class='del'>-	case IIO_CHAN_INFO_RAW:</div><div class='del'>-		ret = regmap_read(priv-&gt;regmap, STM32_LPTIM_CNT, &amp;dat);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		*val = dat;</div><div class='del'>-		return IIO_VAL_INT;</div><div class='del'>-</div><div class='del'>-	case IIO_CHAN_INFO_ENABLE:</div><div class='del'>-		ret = stm32_lptim_is_enabled(priv);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		*val = ret;</div><div class='del'>-		return IIO_VAL_INT;</div><div class='del'>-</div><div class='del'>-	case IIO_CHAN_INFO_SCALE:</div><div class='del'>-		/* Non-quadrature mode: scale = 1 */</div><div class='del'>-		*val = 1;</div><div class='del'>-		*val2 = 0;</div><div class='del'>-		if (priv-&gt;quadrature_mode) {</div><div class='del'>-			/*</div><div class='del'>-			 * Quadrature encoder mode:</div><div class='del'>-			 * - both edges, quarter cycle, scale is 0.25</div><div class='del'>-			 * - either rising/falling edge scale is 0.5</div><div class='del'>-			 */</div><div class='del'>-			if (priv-&gt;polarity &gt; 1)</div><div class='del'>-				*val2 = 2;</div><div class='del'>-			else</div><div class='del'>-				*val2 = 1;</div><div class='del'>-		}</div><div class='del'>-		return IIO_VAL_FRACTIONAL_LOG2;</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 const struct iio_info stm32_lptim_cnt_iio_info = {</div><div class='del'>-	.read_raw = stm32_lptim_read_raw,</div><div class='del'>-	.write_raw = stm32_lptim_write_raw,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const stm32_lptim_quadrature_modes[] = {</div><div class='del'>-	"non-quadrature",</div><div class='del'>-	"quadrature",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_get_quadrature_mode(struct iio_dev *indio_dev,</div><div class='del'>-					   const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;quadrature_mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_set_quadrature_mode(struct iio_dev *indio_dev,</div><div class='del'>-					   const struct iio_chan_spec *chan,</div><div class='del'>-					   unsigned int type)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	if (stm32_lptim_is_enabled(priv))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;quadrature_mode = type;</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 iio_enum stm32_lptim_quadrature_mode_en = {</div><div class='del'>-	.items = stm32_lptim_quadrature_modes,</div><div class='del'>-	.num_items = ARRAY_SIZE(stm32_lptim_quadrature_modes),</div><div class='del'>-	.get = stm32_lptim_get_quadrature_mode,</div><div class='del'>-	.set = stm32_lptim_set_quadrature_mode,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char * const stm32_lptim_cnt_polarity[] = {</div><div class='del'>-	"rising-edge", "falling-edge", "both-edges",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_cnt_get_polarity(struct iio_dev *indio_dev,</div><div class='del'>-					const struct iio_chan_spec *chan)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;polarity;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_cnt_set_polarity(struct iio_dev *indio_dev,</div><div class='del'>-					const struct iio_chan_spec *chan,</div><div class='del'>-					unsigned int type)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	if (stm32_lptim_is_enabled(priv))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;polarity = type;</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 iio_enum stm32_lptim_cnt_polarity_en = {</div><div class='del'>-	.items = stm32_lptim_cnt_polarity,</div><div class='del'>-	.num_items = ARRAY_SIZE(stm32_lptim_cnt_polarity),</div><div class='del'>-	.get = stm32_lptim_cnt_get_polarity,</div><div class='del'>-	.set = stm32_lptim_cnt_set_polarity,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t stm32_lptim_cnt_get_preset(struct iio_dev *indio_dev,</div><div class='del'>-					  uintptr_t private,</div><div class='del'>-					  const struct iio_chan_spec *chan,</div><div class='del'>-					  char *buf)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n", priv-&gt;preset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t stm32_lptim_cnt_set_preset(struct iio_dev *indio_dev,</div><div class='del'>-					  uintptr_t private,</div><div class='del'>-					  const struct iio_chan_spec *chan,</div><div class='del'>-					  const char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptim_cnt *priv = iio_priv(indio_dev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (stm32_lptim_is_enabled(priv))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	ret = kstrtouint(buf, 0, &amp;priv-&gt;preset);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;preset &gt; STM32_LPTIM_MAX_ARR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* LP timer with encoder */</div><div class='del'>-static const struct iio_chan_spec_ext_info stm32_lptim_enc_ext_info[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "preset",</div><div class='del'>-		.shared = IIO_SEPARATE,</div><div class='del'>-		.read = stm32_lptim_cnt_get_preset,</div><div class='del'>-		.write = stm32_lptim_cnt_set_preset,</div><div class='del'>-	},</div><div class='del'>-	IIO_ENUM("polarity", IIO_SEPARATE, &amp;stm32_lptim_cnt_polarity_en),</div><div class='del'>-	IIO_ENUM_AVAILABLE("polarity", &amp;stm32_lptim_cnt_polarity_en),</div><div class='del'>-	IIO_ENUM("quadrature_mode", IIO_SEPARATE,</div><div class='del'>-		 &amp;stm32_lptim_quadrature_mode_en),</div><div class='del'>-	IIO_ENUM_AVAILABLE("quadrature_mode", &amp;stm32_lptim_quadrature_mode_en),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iio_chan_spec stm32_lptim_enc_channels = {</div><div class='del'>-	.type = IIO_COUNT,</div><div class='del'>-	.channel = 0,</div><div class='del'>-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |</div><div class='del'>-			      BIT(IIO_CHAN_INFO_ENABLE) |</div><div class='del'>-			      BIT(IIO_CHAN_INFO_SCALE),</div><div class='del'>-	.ext_info = stm32_lptim_enc_ext_info,</div><div class='del'>-	.indexed = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* LP timer without encoder (counter only) */</div><div class='del'>-static const struct iio_chan_spec_ext_info stm32_lptim_cnt_ext_info[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "preset",</div><div class='del'>-		.shared = IIO_SEPARATE,</div><div class='del'>-		.read = stm32_lptim_cnt_get_preset,</div><div class='del'>-		.write = stm32_lptim_cnt_set_preset,</div><div class='del'>-	},</div><div class='del'>-	IIO_ENUM("polarity", IIO_SEPARATE, &amp;stm32_lptim_cnt_polarity_en),</div><div class='del'>-	IIO_ENUM_AVAILABLE("polarity", &amp;stm32_lptim_cnt_polarity_en),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iio_chan_spec stm32_lptim_cnt_channels = {</div><div class='del'>-	.type = IIO_COUNT,</div><div class='del'>-	.channel = 0,</div><div class='del'>-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |</div><div class='del'>-			      BIT(IIO_CHAN_INFO_ENABLE) |</div><div class='del'>-			      BIT(IIO_CHAN_INFO_SCALE),</div><div class='del'>-	.ext_info = stm32_lptim_cnt_ext_info,</div><div class='del'>-	.indexed = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stm32_lptim_cnt_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct stm32_lptimer *ddata = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='del'>-	struct stm32_lptim_cnt *priv;</div><div class='del'>-	struct iio_dev *indio_dev;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_OR_NULL(ddata))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	indio_dev = devm_iio_device_alloc(&amp;pdev-&gt;dev, sizeof(*priv));</div><div class='del'>-	if (!indio_dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	priv = iio_priv(indio_dev);</div><div class='del'>-	priv-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	priv-&gt;regmap = ddata-&gt;regmap;</div><div class='del'>-	priv-&gt;clk = ddata-&gt;clk;</div><div class='del'>-	priv-&gt;preset = STM32_LPTIM_MAX_ARR;</div><div class='del'>-</div><div class='del'>-	indio_dev-&gt;name = dev_name(&amp;pdev-&gt;dev);</div><div class='del'>-	indio_dev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='del'>-	indio_dev-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='del'>-	indio_dev-&gt;info = &amp;stm32_lptim_cnt_iio_info;</div><div class='del'>-	if (ddata-&gt;has_encoder)</div><div class='del'>-		indio_dev-&gt;channels = &amp;stm32_lptim_enc_channels;</div><div class='del'>-	else</div><div class='del'>-		indio_dev-&gt;channels = &amp;stm32_lptim_cnt_channels;</div><div class='del'>-	indio_dev-&gt;num_channels = 1;</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	return devm_iio_device_register(&amp;pdev-&gt;dev, indio_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id stm32_lptim_cnt_of_match[] = {</div><div class='del'>-	{ .compatible = "st,stm32-lptimer-counter", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, stm32_lptim_cnt_of_match);</div><div class='del'>-</div><div class='del'>-static struct platform_driver stm32_lptim_cnt_driver = {</div><div class='del'>-	.probe = stm32_lptim_cnt_probe,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "stm32-lptimer-counter",</div><div class='del'>-		.of_match_table = stm32_lptim_cnt_of_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-module_platform_driver(stm32_lptim_cnt_driver);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Fabrice Gasnier &lt;fabrice.gasnier@st.com&gt;");</div><div class='del'>-MODULE_ALIAS("platform:stm32-lptimer-counter");</div><div class='del'>-MODULE_DESCRIPTION("STMicroelectronics STM32 LPTIM counter driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c<br/>index 2f98cb2a3b96..6c3ba143839b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/ad5064.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/ad5064.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/ad5064.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/dac/ad5064.c</a></div><div class='hunk'>@@ -112,6 +112,8 @@ struct ad5064_state {</div><div class='ctx'> 	bool				use_internal_vref;</div><div class='ctx'> </div><div class='ctx'> 	ad5064_write_func		write;</div><div class='add'>+	/* Lock used to maintain consistency between cached and dev state */</div><div class='add'>+	struct mutex lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * DMA (thus cache coherency maintenance) requires the</div><div class='hunk'>@@ -248,11 +250,11 @@ static int ad5064_set_powerdown_mode(struct iio_dev *indio_dev,</div><div class='ctx'> 	struct ad5064_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+	mutex_lock(&amp;st-&gt;lock);</div><div class='ctx'> 	st-&gt;pwr_down_mode[chan-&gt;channel] = mode + 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad5064_sync_powerdown_mode(st, chan);</div><div class='del'>-	mutex_unlock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+	mutex_unlock(&amp;st-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -291,11 +293,11 @@ static ssize_t ad5064_write_dac_powerdown(struct iio_dev *indio_dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+	mutex_lock(&amp;st-&gt;lock);</div><div class='ctx'> 	st-&gt;pwr_down[chan-&gt;channel] = pwr_down;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad5064_sync_powerdown_mode(st, chan);</div><div class='del'>-	mutex_unlock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+	mutex_unlock(&amp;st-&gt;lock);</div><div class='ctx'> 	return ret ? ret : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -349,12 +351,12 @@ static int ad5064_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 		if (val &gt;= (1 &lt;&lt; chan-&gt;scan_type.realbits) || val &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+		mutex_lock(&amp;st-&gt;lock);</div><div class='ctx'> 		ret = ad5064_write(st, AD5064_CMD_WRITE_INPUT_N_UPDATE_N,</div><div class='ctx'> 				chan-&gt;address, val, chan-&gt;scan_type.shift);</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			st-&gt;dac_cache[chan-&gt;channel] = val;</div><div class='del'>-		mutex_unlock(&amp;indio_dev-&gt;mlock);</div><div class='add'>+		mutex_unlock(&amp;st-&gt;lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -856,6 +858,7 @@ static int ad5064_probe(struct device *dev, enum ad5064_type type,</div><div class='ctx'> 		return  -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	st = iio_priv(indio_dev);</div><div class='add'>+	mutex_init(&amp;st-&gt;lock);</div><div class='ctx'> 	dev_set_drvdata(dev, indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;chip_info = &amp;ad5064_chip_info_tbl[type];</div><div class='head'>diff --git a/drivers/iio/dac/ad5758.c b/drivers/iio/dac/ad5758.c<br/>index 2bdf1b0aee06..a513c70faefa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/ad5758.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/ad5758.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/ad5758.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/dac/ad5758.c</a></div><div class='hunk'>@@ -72,8 +72,6 @@</div><div class='ctx'> #define AD5758_DCDC_CONFIG1_DCDC_VPROG_MODE(x)	(((x) &amp; 0x1F) &lt;&lt; 0)</div><div class='ctx'> #define AD5758_DCDC_CONFIG1_DCDC_MODE_MSK	GENMASK(6, 5)</div><div class='ctx'> #define AD5758_DCDC_CONFIG1_DCDC_MODE_MODE(x)	(((x) &amp; 0x3) &lt;&lt; 5)</div><div class='del'>-#define AD5758_DCDC_CONFIG1_PROT_SW_EN_MSK	BIT(7)</div><div class='del'>-#define AD5758_DCDC_CONFIG1_PROT_SW_EN_MODE(x)	(((x) &amp; 0x1) &lt;&lt; 7)</div><div class='ctx'> </div><div class='ctx'> /* AD5758_DCDC_CONFIG2 */</div><div class='ctx'> #define AD5758_DCDC_CONFIG2_ILIMIT_MSK		GENMASK(3, 1)</div><div class='hunk'>@@ -84,6 +82,10 @@</div><div class='ctx'> /* AD5758_DIGITAL_DIAG_RESULTS */</div><div class='ctx'> #define AD5758_CAL_MEM_UNREFRESHED_MSK		BIT(15)</div><div class='ctx'> </div><div class='add'>+/* AD5758_ADC_CONFIG */</div><div class='add'>+#define AD5758_ADC_CONFIG_PPC_BUF_EN(x)		(((x) &amp; 0x1) &lt;&lt; 11)</div><div class='add'>+#define AD5758_ADC_CONFIG_PPC_BUF_MSK		BIT(11)</div><div class='add'>+</div><div class='ctx'> #define AD5758_WR_FLAG_MSK(x)		(0x80 | ((x) &amp; 0x1F))</div><div class='ctx'> </div><div class='ctx'> #define AD5758_FULL_SCALE_MICRO	65535000000ULL</div><div class='hunk'>@@ -315,6 +317,18 @@ static int ad5758_set_dc_dc_conv_mode(struct ad5758_state *st,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The ENABLE_PPC_BUFFERS bit must be set prior to enabling PPC current</div><div class='add'>+	 * mode.</div><div class='add'>+	 */</div><div class='add'>+	if (mode == AD5758_DCDC_MODE_PPC_CURRENT) {</div><div class='add'>+		ret  = ad5758_spi_write_mask(st, AD5758_ADC_CONFIG,</div><div class='add'>+				    AD5758_ADC_CONFIG_PPC_BUF_MSK,</div><div class='add'>+				    AD5758_ADC_CONFIG_PPC_BUF_EN(1));</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='ctx'> 	ret = ad5758_spi_write_mask(st, AD5758_DCDC_CONFIG1,</div><div class='ctx'> 				    AD5758_DCDC_CONFIG1_DCDC_MODE_MSK,</div><div class='ctx'> 				    AD5758_DCDC_CONFIG1_DCDC_MODE_MODE(mode));</div><div class='hunk'>@@ -444,23 +458,6 @@ static int ad5758_set_out_range(struct ad5758_state *st, int range)</div><div class='ctx'> 					     AD5758_CAL_MEM_UNREFRESHED_MSK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ad5758_fault_prot_switch_en(struct ad5758_state *st, bool enable)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = ad5758_spi_write_mask(st, AD5758_DCDC_CONFIG1,</div><div class='del'>-			AD5758_DCDC_CONFIG1_PROT_SW_EN_MSK,</div><div class='del'>-			AD5758_DCDC_CONFIG1_PROT_SW_EN_MODE(enable));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	/*</div><div class='del'>-	 * Poll the BUSY_3WI bit in the DCDC_CONFIG2 register until it is 0.</div><div class='del'>-	 * This allows the 3-wire interface communication to complete.</div><div class='del'>-	 */</div><div class='del'>-	return ad5758_wait_for_task_complete(st, AD5758_DCDC_CONFIG2,</div><div class='del'>-					     AD5758_DCDC_CONFIG2_BUSY_3WI_MSK);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ad5758_internal_buffers_en(struct ad5758_state *st, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -585,8 +582,8 @@ static ssize_t ad5758_write_powerdown(struct iio_dev *indio_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ad5758_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	bool pwr_down;</div><div class='del'>-	unsigned int dcdc_config1_mode, dc_dc_mode, dac_config_mode, val;</div><div class='del'>-	unsigned long int dcdc_config1_msk, dac_config_msk;</div><div class='add'>+	unsigned int dc_dc_mode, dac_config_mode, val;</div><div class='add'>+	unsigned long int dac_config_msk;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = kstrtobool(buf, &amp;pwr_down);</div><div class='hunk'>@@ -602,17 +599,6 @@ static ssize_t ad5758_write_powerdown(struct iio_dev *indio_dev,</div><div class='ctx'> 		val = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dcdc_config1_mode = AD5758_DCDC_CONFIG1_DCDC_MODE_MODE(dc_dc_mode) |</div><div class='del'>-			    AD5758_DCDC_CONFIG1_PROT_SW_EN_MODE(val);</div><div class='del'>-	dcdc_config1_msk = AD5758_DCDC_CONFIG1_DCDC_MODE_MSK |</div><div class='del'>-			   AD5758_DCDC_CONFIG1_PROT_SW_EN_MSK;</div><div class='del'>-</div><div class='del'>-	ret = ad5758_spi_write_mask(st, AD5758_DCDC_CONFIG1,</div><div class='del'>-				    dcdc_config1_msk,</div><div class='del'>-				    dcdc_config1_mode);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err_unlock;</div><div class='del'>-</div><div class='ctx'> 	dac_config_mode = AD5758_DAC_CONFIG_OUT_EN_MODE(val) |</div><div class='ctx'> 			  AD5758_DAC_CONFIG_INT_EN_MODE(val);</div><div class='ctx'> 	dac_config_msk = AD5758_DAC_CONFIG_OUT_EN_MSK |</div><div class='hunk'>@@ -841,11 +827,6 @@ static int ad5758_init(struct ad5758_state *st)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable the VIOUT fault protection switch (FPS is closed) */</div><div class='del'>-	ret = ad5758_fault_prot_switch_en(st, 1);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	/* Power up the DAC and internal (INT) amplifiers */</div><div class='ctx'> 	ret = ad5758_internal_buffers_en(st, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c<br/>index 6d71fd905e29..c701a45469f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/mcp4725.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/mcp4725.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/mcp4725.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/dac/mcp4725.c</a></div><div class='hunk'>@@ -92,6 +92,7 @@ static ssize_t mcp4725_store_eeprom(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	inoutbuf[0] = 0x60; /* write EEPROM */</div><div class='ctx'> 	inoutbuf[0] |= data-&gt;ref_mode &lt;&lt; 3;</div><div class='add'>+	inoutbuf[0] |= data-&gt;powerdown ? ((data-&gt;powerdown_mode + 1) &lt;&lt; 1) : 0;</div><div class='ctx'> 	inoutbuf[1] = data-&gt;dac_value &gt;&gt; 4;</div><div class='ctx'> 	inoutbuf[2] = (data-&gt;dac_value &amp; 0xf) &lt;&lt; 4;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/dac/ti-dac5571.c b/drivers/iio/dac/ti-dac5571.c<br/>index f6dcd8bce2b0..891e9cac019e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/ti-dac5571.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dac/ti-dac5571.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dac/ti-dac5571.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/dac/ti-dac5571.c</a></div><div class='hunk'>@@ -429,6 +429,6 @@ static struct i2c_driver dac5571_driver = {</div><div class='ctx'> };</div><div class='ctx'> module_i2c_driver(dac5571_driver);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Sean Nyekjaer &lt;sean.nyekjaer@prevas.dk&gt;");</div><div class='add'>+MODULE_AUTHOR("Sean Nyekjaer &lt;sean@geanix.dk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Texas Instruments 8/10/12-bit 1/4-channel DAC driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/iio/dummy/iio_dummy_evgen.c b/drivers/iio/dummy/iio_dummy_evgen.c<br/>index efd0005f59b4..c6033e341963 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dummy/iio_dummy_evgen.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/dummy/iio_dummy_evgen.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/dummy/iio_dummy_evgen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/dummy/iio_dummy_evgen.c</a></div><div class='hunk'>@@ -196,7 +196,10 @@ static __init int iio_dummy_evgen_init(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	device_initialize(&amp;iio_evgen_dev);</div><div class='ctx'> 	dev_set_name(&amp;iio_evgen_dev, "iio_evgen");</div><div class='del'>-	return device_add(&amp;iio_evgen_dev);</div><div class='add'>+	ret = device_add(&amp;iio_evgen_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		put_device(&amp;iio_evgen_dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> module_init(iio_dummy_evgen_init);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/frequency/ad9523.c b/drivers/iio/frequency/ad9523.c<br/>index 3f9be69499ec..9b9eee27176c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/frequency/ad9523.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/frequency/ad9523.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/frequency/ad9523.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/frequency/ad9523.c</a></div><div class='hunk'>@@ -872,22 +872,22 @@ static int ad9523_setup(struct iio_dev *indio_dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9523_write(indio_dev, AD9523_PLL2_VCO_DIVIDER,</div><div class='del'>-		AD9523_PLL2_VCO_DIV_M1(pdata-&gt;pll2_vco_diff_m1) |</div><div class='del'>-		AD9523_PLL2_VCO_DIV_M2(pdata-&gt;pll2_vco_diff_m2) |</div><div class='del'>-		AD_IFE(pll2_vco_diff_m1, 0,</div><div class='add'>+		AD9523_PLL2_VCO_DIV_M1(pdata-&gt;pll2_vco_div_m1) |</div><div class='add'>+		AD9523_PLL2_VCO_DIV_M2(pdata-&gt;pll2_vco_div_m2) |</div><div class='add'>+		AD_IFE(pll2_vco_div_m1, 0,</div><div class='ctx'> 		       AD9523_PLL2_VCO_DIV_M1_PWR_DOWN_EN) |</div><div class='del'>-		AD_IFE(pll2_vco_diff_m2, 0,</div><div class='add'>+		AD_IFE(pll2_vco_div_m2, 0,</div><div class='ctx'> 		       AD9523_PLL2_VCO_DIV_M2_PWR_DOWN_EN));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;pll2_vco_diff_m1)</div><div class='add'>+	if (pdata-&gt;pll2_vco_div_m1)</div><div class='ctx'> 		st-&gt;vco_out_freq[AD9523_VCO1] =</div><div class='del'>-			st-&gt;vco_freq / pdata-&gt;pll2_vco_diff_m1;</div><div class='add'>+			st-&gt;vco_freq / pdata-&gt;pll2_vco_div_m1;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;pll2_vco_diff_m2)</div><div class='add'>+	if (pdata-&gt;pll2_vco_div_m2)</div><div class='ctx'> 		st-&gt;vco_out_freq[AD9523_VCO2] =</div><div class='del'>-			st-&gt;vco_freq / pdata-&gt;pll2_vco_diff_m2;</div><div class='add'>+			st-&gt;vco_freq / pdata-&gt;pll2_vco_div_m2;</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;vco_out_freq[AD9523_VCXO] = pdata-&gt;vcxo_freq;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig<br/>index 3126cf05e6b9..61c00cee037d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/Kconfig</a></div><div class='hunk'>@@ -73,6 +73,28 @@ config BMG160_SPI</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select REGMAP_SPI</div><div class='ctx'> </div><div class='add'>+config FXAS21002C</div><div class='add'>+       tristate "NXP FXAS21002C Gyro Sensor"</div><div class='add'>+       select IIO_BUFFER</div><div class='add'>+       select IIO_TRIGGERED_BUFFER</div><div class='add'>+       select FXAS21002C_I2C if (I2C)</div><div class='add'>+       select FXAS21002C_SPI if (SPI)</div><div class='add'>+       depends on (I2C || SPI_MASTER)</div><div class='add'>+       help</div><div class='add'>+         Say yes here to build support for NXP FXAS21002C Tri-axis Gyro</div><div class='add'>+         Sensor driver connected via I2C or SPI.</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 fxas21002c_i2c or fxas21002c_spi.</div><div class='add'>+</div><div class='add'>+config FXAS21002C_I2C</div><div class='add'>+       tristate</div><div class='add'>+       select REGMAP_I2C</div><div class='add'>+</div><div class='add'>+config FXAS21002C_SPI</div><div class='add'>+       tristate</div><div class='add'>+       select REGMAP_SPI</div><div class='add'>+</div><div class='ctx'> config HID_SENSOR_GYRO_3D</div><div class='ctx'> 	depends on HID_SENSOR_HUB</div><div class='ctx'> 	select IIO_BUFFER</div><div class='head'>diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile<br/>index 295ec780c4eb..45cbd5dc644e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/Makefile</a></div><div class='hunk'>@@ -12,6 +12,9 @@ obj-$(CONFIG_ADXRS450) += adxrs450.o</div><div class='ctx'> obj-$(CONFIG_BMG160) += bmg160_core.o</div><div class='ctx'> obj-$(CONFIG_BMG160_I2C) += bmg160_i2c.o</div><div class='ctx'> obj-$(CONFIG_BMG160_SPI) += bmg160_spi.o</div><div class='add'>+obj-$(CONFIG_FXAS21002C) += fxas21002c_core.o</div><div class='add'>+obj-$(CONFIG_FXAS21002C_I2C) += fxas21002c_i2c.o</div><div class='add'>+obj-$(CONFIG_FXAS21002C_SPI) += fxas21002c_spi.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c<br/>index 63ca31628a93..f26041e26c65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/bmg160_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/bmg160_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/bmg160_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/bmg160_core.c</a></div><div class='hunk'>@@ -102,6 +102,7 @@ struct bmg160_data {</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	struct iio_trigger *dready_trig;</div><div class='ctx'> 	struct iio_trigger *motion_trig;</div><div class='add'>+	struct iio_mount_matrix orientation;</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> 	s16 buffer[8];</div><div class='ctx'> 	u32 dps_range;</div><div class='hunk'>@@ -582,11 +583,10 @@ static int bmg160_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:</div><div class='ctx'> 		return bmg160_get_filter(data, val);</div><div class='ctx'> 	case IIO_CHAN_INFO_SCALE:</div><div class='del'>-		*val = 0;</div><div class='ctx'> 		switch (chan-&gt;type) {</div><div class='ctx'> 		case IIO_TEMP:</div><div class='del'>-			*val2 = 500000;</div><div class='del'>-			return IIO_VAL_INT_PLUS_MICRO;</div><div class='add'>+			*val = 500;</div><div class='add'>+			return IIO_VAL_INT;</div><div class='ctx'> 		case IIO_ANGL_VEL:</div><div class='ctx'> 		{</div><div class='ctx'> 			int i;</div><div class='hunk'>@@ -594,6 +594,7 @@ static int bmg160_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 			for (i = 0; i &lt; ARRAY_SIZE(bmg160_scale_table); ++i) {</div><div class='ctx'> 				if (bmg160_scale_table[i].dps_range ==</div><div class='ctx'> 							data-&gt;dps_range) {</div><div class='add'>+					*val = 0;</div><div class='ctx'> 					*val2 = bmg160_scale_table[i].scale;</div><div class='ctx'> 					return IIO_VAL_INT_PLUS_MICRO;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -794,6 +795,20 @@ static int bmg160_write_event_config(struct iio_dev *indio_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iio_mount_matrix *</div><div class='add'>+bmg160_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='add'>+			 const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct bmg160_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec_ext_info bmg160_ext_info[] = {</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmg160_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("100 200 400 1000 2000");</div><div class='ctx'> </div><div class='ctx'> static IIO_CONST_ATTR(in_anglvel_scale_available,</div><div class='hunk'>@@ -831,6 +846,7 @@ static const struct iio_event_spec bmg160_event = {</div><div class='ctx'> 		.storagebits = 16,					\</div><div class='ctx'> 		.endianness = IIO_LE,					\</div><div class='ctx'> 	},								\</div><div class='add'>+	.ext_info = bmg160_ext_info,					\</div><div class='ctx'> 	.event_spec = &amp;bmg160_event,					\</div><div class='ctx'> 	.num_event_specs = 1						\</div><div class='ctx'> }</div><div class='hunk'>@@ -1075,6 +1091,11 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,</div><div class='ctx'> 	data-&gt;irq = irq;</div><div class='ctx'> 	data-&gt;regmap = regmap;</div><div class='ctx'> </div><div class='add'>+	ret = iio_read_mount_matrix(dev, "mount-matrix",</div><div class='add'>+				&amp;data-&gt;orientation);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = bmg160_chip_init(data);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/iio/gyro/bmg160_i2c.c b/drivers/iio/gyro/bmg160_i2c.c<br/>index 90126a5a7663..934a092134f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/bmg160_i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/bmg160_i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/bmg160_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/bmg160_i2c.c</a></div><div class='hunk'>@@ -54,10 +54,19 @@ static const struct i2c_device_id bmg160_i2c_id[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, bmg160_i2c_id);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id bmg160_of_match[] = {</div><div class='add'>+	{ .compatible = "bosch,bmg160" },</div><div class='add'>+	{ .compatible = "bosch,bmi055_gyro" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, bmg160_of_match);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver bmg160_i2c_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "bmg160_i2c",</div><div class='ctx'> 		.acpi_match_table = ACPI_PTR(bmg160_acpi_match),</div><div class='add'>+		.of_match_table = bmg160_of_match,</div><div class='ctx'> 		.pm	= &amp;bmg160_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= bmg160_i2c_probe,</div><div class='head'>diff --git a/drivers/iio/gyro/fxas21002c.h b/drivers/iio/gyro/fxas21002c.h<br/>new file mode 100644<br/>index 000000000000..566d92de2676<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/fxas21002c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/fxas21002c.h</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Driver for NXP FXAS21002C Gyroscope - Header</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef FXAS21002C_H_</div><div class='add'>+#define FXAS21002C_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_REG_STATUS		0x00</div><div class='add'>+#define FXAS21002C_REG_OUT_X_MSB	0x01</div><div class='add'>+#define FXAS21002C_REG_OUT_X_LSB	0x02</div><div class='add'>+#define FXAS21002C_REG_OUT_Y_MSB	0x03</div><div class='add'>+#define FXAS21002C_REG_OUT_Y_LSB	0x04</div><div class='add'>+#define FXAS21002C_REG_OUT_Z_MSB	0x05</div><div class='add'>+#define FXAS21002C_REG_OUT_Z_LSB	0x06</div><div class='add'>+#define FXAS21002C_REG_DR_STATUS	0x07</div><div class='add'>+#define FXAS21002C_REG_F_STATUS		0x08</div><div class='add'>+#define FXAS21002C_REG_F_SETUP		0x09</div><div class='add'>+#define FXAS21002C_REG_F_EVENT		0x0A</div><div class='add'>+#define FXAS21002C_REG_INT_SRC_FLAG	0x0B</div><div class='add'>+#define FXAS21002C_REG_WHO_AM_I		0x0C</div><div class='add'>+#define FXAS21002C_REG_CTRL0		0x0D</div><div class='add'>+#define FXAS21002C_REG_RT_CFG		0x0E</div><div class='add'>+#define FXAS21002C_REG_RT_SRC		0x0F</div><div class='add'>+#define FXAS21002C_REG_RT_THS		0x10</div><div class='add'>+#define FXAS21002C_REG_RT_COUNT		0x11</div><div class='add'>+#define FXAS21002C_REG_TEMP		0x12</div><div class='add'>+#define FXAS21002C_REG_CTRL1		0x13</div><div class='add'>+#define FXAS21002C_REG_CTRL2		0x14</div><div class='add'>+#define FXAS21002C_REG_CTRL3		0x15</div><div class='add'>+</div><div class='add'>+enum fxas21002c_fields {</div><div class='add'>+	F_DR_STATUS,</div><div class='add'>+	F_OUT_X_MSB,</div><div class='add'>+	F_OUT_X_LSB,</div><div class='add'>+	F_OUT_Y_MSB,</div><div class='add'>+	F_OUT_Y_LSB,</div><div class='add'>+	F_OUT_Z_MSB,</div><div class='add'>+	F_OUT_Z_LSB,</div><div class='add'>+	/* DR_STATUS */</div><div class='add'>+	F_ZYX_OW, F_Z_OW, F_Y_OW, F_X_OW, F_ZYX_DR, F_Z_DR, F_Y_DR, F_X_DR,</div><div class='add'>+	/* F_STATUS */</div><div class='add'>+	F_OVF, F_WMKF, F_CNT,</div><div class='add'>+	/* F_SETUP */</div><div class='add'>+	F_MODE, F_WMRK,</div><div class='add'>+	/* F_EVENT */</div><div class='add'>+	F_EVENT, FE_TIME,</div><div class='add'>+	/* INT_SOURCE_FLAG */</div><div class='add'>+	F_BOOTEND, F_SRC_FIFO, F_SRC_RT, F_SRC_DRDY,</div><div class='add'>+	/* WHO_AM_I */</div><div class='add'>+	F_WHO_AM_I,</div><div class='add'>+	/* CTRL_REG0 */</div><div class='add'>+	F_BW, F_SPIW, F_SEL, F_HPF_EN, F_FS,</div><div class='add'>+	/* RT_CFG */</div><div class='add'>+	F_ELE, F_ZTEFE, F_YTEFE, F_XTEFE,</div><div class='add'>+	/* RT_SRC */</div><div class='add'>+	F_EA, F_ZRT, F_ZRT_POL, F_YRT, F_YRT_POL, F_XRT, F_XRT_POL,</div><div class='add'>+	/* RT_THS */</div><div class='add'>+	F_DBCNTM, F_THS,</div><div class='add'>+	/* RT_COUNT */</div><div class='add'>+	F_RT_COUNT,</div><div class='add'>+	/* TEMP */</div><div class='add'>+	F_TEMP,</div><div class='add'>+	/* CTRL_REG1 */</div><div class='add'>+	F_RST, F_ST, F_DR, F_ACTIVE, F_READY,</div><div class='add'>+	/* CTRL_REG2 */</div><div class='add'>+	F_INT_CFG_FIFO, F_INT_EN_FIFO, F_INT_CFG_RT, F_INT_EN_RT,</div><div class='add'>+	F_INT_CFG_DRDY, F_INT_EN_DRDY, F_IPOL, F_PP_OD,</div><div class='add'>+	/* CTRL_REG3 */</div><div class='add'>+	F_WRAPTOONE, F_EXTCTRLEN, F_FS_DOUBLE,</div><div class='add'>+	/* MAX FIELDS */</div><div class='add'>+	F_MAX_FIELDS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_field fxas21002c_reg_fields[] = {</div><div class='add'>+	[F_DR_STATUS]		= REG_FIELD(FXAS21002C_REG_STATUS, 0, 7),</div><div class='add'>+	[F_OUT_X_MSB]		= REG_FIELD(FXAS21002C_REG_OUT_X_MSB, 0, 7),</div><div class='add'>+	[F_OUT_X_LSB]		= REG_FIELD(FXAS21002C_REG_OUT_X_LSB, 0, 7),</div><div class='add'>+	[F_OUT_Y_MSB]		= REG_FIELD(FXAS21002C_REG_OUT_Y_MSB, 0, 7),</div><div class='add'>+	[F_OUT_Y_LSB]		= REG_FIELD(FXAS21002C_REG_OUT_Y_LSB, 0, 7),</div><div class='add'>+	[F_OUT_Z_MSB]		= REG_FIELD(FXAS21002C_REG_OUT_Z_MSB, 0, 7),</div><div class='add'>+	[F_OUT_Z_LSB]		= REG_FIELD(FXAS21002C_REG_OUT_Z_LSB, 0, 7),</div><div class='add'>+	[F_ZYX_OW]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 7, 7),</div><div class='add'>+	[F_Z_OW]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 6, 6),</div><div class='add'>+	[F_Y_OW]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 5, 5),</div><div class='add'>+	[F_X_OW]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 4, 4),</div><div class='add'>+	[F_ZYX_DR]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 3, 3),</div><div class='add'>+	[F_Z_DR]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 2, 2),</div><div class='add'>+	[F_Y_DR]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 1, 1),</div><div class='add'>+	[F_X_DR]		= REG_FIELD(FXAS21002C_REG_DR_STATUS, 0, 0),</div><div class='add'>+	[F_OVF]			= REG_FIELD(FXAS21002C_REG_F_STATUS, 7, 7),</div><div class='add'>+	[F_WMKF]		= REG_FIELD(FXAS21002C_REG_F_STATUS, 6, 6),</div><div class='add'>+	[F_CNT]			= REG_FIELD(FXAS21002C_REG_F_STATUS, 0, 5),</div><div class='add'>+	[F_MODE]		= REG_FIELD(FXAS21002C_REG_F_SETUP, 6, 7),</div><div class='add'>+	[F_WMRK]		= REG_FIELD(FXAS21002C_REG_F_SETUP, 0, 5),</div><div class='add'>+	[F_EVENT]		= REG_FIELD(FXAS21002C_REG_F_EVENT, 5, 5),</div><div class='add'>+	[FE_TIME]		= REG_FIELD(FXAS21002C_REG_F_EVENT, 0, 4),</div><div class='add'>+	[F_BOOTEND]		= REG_FIELD(FXAS21002C_REG_INT_SRC_FLAG, 3, 3),</div><div class='add'>+	[F_SRC_FIFO]		= REG_FIELD(FXAS21002C_REG_INT_SRC_FLAG, 2, 2),</div><div class='add'>+	[F_SRC_RT]		= REG_FIELD(FXAS21002C_REG_INT_SRC_FLAG, 1, 1),</div><div class='add'>+	[F_SRC_DRDY]		= REG_FIELD(FXAS21002C_REG_INT_SRC_FLAG, 0, 0),</div><div class='add'>+	[F_WHO_AM_I]		= REG_FIELD(FXAS21002C_REG_WHO_AM_I, 0, 7),</div><div class='add'>+	[F_BW]			= REG_FIELD(FXAS21002C_REG_CTRL0, 6, 7),</div><div class='add'>+	[F_SPIW]		= REG_FIELD(FXAS21002C_REG_CTRL0, 5, 5),</div><div class='add'>+	[F_SEL]			= REG_FIELD(FXAS21002C_REG_CTRL0, 3, 4),</div><div class='add'>+	[F_HPF_EN]		= REG_FIELD(FXAS21002C_REG_CTRL0, 2, 2),</div><div class='add'>+	[F_FS]			= REG_FIELD(FXAS21002C_REG_CTRL0, 0, 1),</div><div class='add'>+	[F_ELE]			= REG_FIELD(FXAS21002C_REG_RT_CFG, 3, 3),</div><div class='add'>+	[F_ZTEFE]		= REG_FIELD(FXAS21002C_REG_RT_CFG, 2, 2),</div><div class='add'>+	[F_YTEFE]		= REG_FIELD(FXAS21002C_REG_RT_CFG, 1, 1),</div><div class='add'>+	[F_XTEFE]		= REG_FIELD(FXAS21002C_REG_RT_CFG, 0, 0),</div><div class='add'>+	[F_EA]			= REG_FIELD(FXAS21002C_REG_RT_SRC, 6, 6),</div><div class='add'>+	[F_ZRT]			= REG_FIELD(FXAS21002C_REG_RT_SRC, 5, 5),</div><div class='add'>+	[F_ZRT_POL]		= REG_FIELD(FXAS21002C_REG_RT_SRC, 4, 4),</div><div class='add'>+	[F_YRT]			= REG_FIELD(FXAS21002C_REG_RT_SRC, 3, 3),</div><div class='add'>+	[F_YRT_POL]		= REG_FIELD(FXAS21002C_REG_RT_SRC, 2, 2),</div><div class='add'>+	[F_XRT]			= REG_FIELD(FXAS21002C_REG_RT_SRC, 1, 1),</div><div class='add'>+	[F_XRT_POL]		= REG_FIELD(FXAS21002C_REG_RT_SRC, 0, 0),</div><div class='add'>+	[F_DBCNTM]		= REG_FIELD(FXAS21002C_REG_RT_THS, 7, 7),</div><div class='add'>+	[F_THS]			= REG_FIELD(FXAS21002C_REG_RT_SRC, 0, 6),</div><div class='add'>+	[F_RT_COUNT]		= REG_FIELD(FXAS21002C_REG_RT_COUNT, 0, 7),</div><div class='add'>+	[F_TEMP]		= REG_FIELD(FXAS21002C_REG_TEMP, 0, 7),</div><div class='add'>+	[F_RST]			= REG_FIELD(FXAS21002C_REG_CTRL1, 6, 6),</div><div class='add'>+	[F_ST]			= REG_FIELD(FXAS21002C_REG_CTRL1, 5, 5),</div><div class='add'>+	[F_DR]			= REG_FIELD(FXAS21002C_REG_CTRL1, 2, 4),</div><div class='add'>+	[F_ACTIVE]		= REG_FIELD(FXAS21002C_REG_CTRL1, 1, 1),</div><div class='add'>+	[F_READY]		= REG_FIELD(FXAS21002C_REG_CTRL1, 0, 0),</div><div class='add'>+	[F_INT_CFG_FIFO]	= REG_FIELD(FXAS21002C_REG_CTRL2, 7, 7),</div><div class='add'>+	[F_INT_EN_FIFO]		= REG_FIELD(FXAS21002C_REG_CTRL2, 6, 6),</div><div class='add'>+	[F_INT_CFG_RT]		= REG_FIELD(FXAS21002C_REG_CTRL2, 5, 5),</div><div class='add'>+	[F_INT_EN_RT]		= REG_FIELD(FXAS21002C_REG_CTRL2, 4, 4),</div><div class='add'>+	[F_INT_CFG_DRDY]	= REG_FIELD(FXAS21002C_REG_CTRL2, 3, 3),</div><div class='add'>+	[F_INT_EN_DRDY]		= REG_FIELD(FXAS21002C_REG_CTRL2, 2, 2),</div><div class='add'>+	[F_IPOL]		= REG_FIELD(FXAS21002C_REG_CTRL2, 1, 1),</div><div class='add'>+	[F_PP_OD]		= REG_FIELD(FXAS21002C_REG_CTRL2, 0, 0),</div><div class='add'>+	[F_WRAPTOONE]		= REG_FIELD(FXAS21002C_REG_CTRL3, 3, 3),</div><div class='add'>+	[F_EXTCTRLEN]		= REG_FIELD(FXAS21002C_REG_CTRL3, 2, 2),</div><div class='add'>+	[F_FS_DOUBLE]		= REG_FIELD(FXAS21002C_REG_CTRL3, 0, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct dev_pm_ops fxas21002c_pm_ops;</div><div class='add'>+</div><div class='add'>+int fxas21002c_core_probe(struct device *dev, struct regmap *regmap, int irq,</div><div class='add'>+			  const char *name);</div><div class='add'>+void fxas21002c_core_remove(struct device *dev);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/iio/gyro/fxas21002c_core.c b/drivers/iio/gyro/fxas21002c_core.c<br/>new file mode 100644<br/>index 000000000000..89d2bb2282ea<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/fxas21002c_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/fxas21002c_core.c</a></div><div class='hunk'>@@ -0,0 +1,1004 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Driver for NXP FXAS21002C Gyroscope - Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</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_irq.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.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'>+</div><div class='add'>+#include &lt;linux/iio/events.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/iio/buffer.h&gt;</div><div class='add'>+#include &lt;linux/iio/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/iio/trigger.h&gt;</div><div class='add'>+#include &lt;linux/iio/trigger_consumer.h&gt;</div><div class='add'>+#include &lt;linux/iio/triggered_buffer.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fxas21002c.h"</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_CHIP_ID_1	0xD6</div><div class='add'>+#define FXAS21002C_CHIP_ID_2	0xD7</div><div class='add'>+</div><div class='add'>+enum fxas21002c_mode_state {</div><div class='add'>+	FXAS21002C_MODE_STANDBY,</div><div class='add'>+	FXAS21002C_MODE_READY,</div><div class='add'>+	FXAS21002C_MODE_ACTIVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_STANDBY_ACTIVE_TIME_MS	62</div><div class='add'>+#define FXAS21002C_READY_ACTIVE_TIME_MS		7</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_ODR_LIST_MAX		10</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_SCALE_FRACTIONAL	32</div><div class='add'>+#define FXAS21002C_RANGE_LIMIT_DOUBLE	2000</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_AXIS_TO_REG(axis) (FXAS21002C_REG_OUT_X_MSB + ((axis) * 2))</div><div class='add'>+</div><div class='add'>+static const int fxas21002c_odr_values[] = {</div><div class='add'>+	800, 400, 200, 100, 50, 25, 12, 12</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These values are taken from the low-pass filter cutoff frequency calculated</div><div class='add'>+ * ODR * 0.lpf_values. So, for ODR = 800Hz with a lpf value = 0.32</div><div class='add'>+ * =&gt; LPF cutoff frequency = 800 * 0.32 = 256 Hz</div><div class='add'>+ */</div><div class='add'>+static const int fxas21002c_lpf_values[] = {</div><div class='add'>+	32, 16, 8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These values are taken from the high-pass filter cutoff frequency calculated</div><div class='add'>+ * ODR * 0.0hpf_values. So, for ODR = 800Hz with a hpf value = 0.018750</div><div class='add'>+ * =&gt; HPF cutoff frequency = 800 * 0.018750 = 15 Hz</div><div class='add'>+ */</div><div class='add'>+static const int fxas21002c_hpf_values[] = {</div><div class='add'>+	18750, 9625, 4875, 2475</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int fxas21002c_range_values[] = {</div><div class='add'>+	4000, 2000, 1000, 500, 250</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fxas21002c_data {</div><div class='add'>+	u8 chip_id;</div><div class='add'>+	enum fxas21002c_mode_state mode;</div><div class='add'>+	enum fxas21002c_mode_state prev_mode;</div><div class='add'>+</div><div class='add'>+	struct mutex lock;		/* serialize data access */</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct regmap_field *regmap_fields[F_MAX_FIELDS];</div><div class='add'>+	struct iio_trigger *dready_trig;</div><div class='add'>+	s64 timestamp;</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	struct regulator *vdd;</div><div class='add'>+	struct regulator *vddio;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * DMA (thus cache coherency maintenance) requires the</div><div class='add'>+	 * transfer buffers to live in their own cache lines.</div><div class='add'>+	 */</div><div class='add'>+	s16 buffer[8] ____cacheline_aligned;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum fxas21002c_channel_index {</div><div class='add'>+	CHANNEL_SCAN_INDEX_X,</div><div class='add'>+	CHANNEL_SCAN_INDEX_Y,</div><div class='add'>+	CHANNEL_SCAN_INDEX_Z,</div><div class='add'>+	CHANNEL_SCAN_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fxas21002c_odr_hz_from_value(struct fxas21002c_data *data, u8 value)</div><div class='add'>+{</div><div class='add'>+	int odr_value_max = ARRAY_SIZE(fxas21002c_odr_values) - 1;</div><div class='add'>+</div><div class='add'>+	value = min_t(u8, value, odr_value_max);</div><div class='add'>+</div><div class='add'>+	return fxas21002c_odr_values[value];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_odr_value_from_hz(struct fxas21002c_data *data,</div><div class='add'>+					unsigned int hz)</div><div class='add'>+{</div><div class='add'>+	int odr_table_size = ARRAY_SIZE(fxas21002c_odr_values);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; odr_table_size; i++)</div><div class='add'>+		if (fxas21002c_odr_values[i] == hz)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_lpf_bw_from_value(struct fxas21002c_data *data, u8 value)</div><div class='add'>+{</div><div class='add'>+	int lpf_value_max = ARRAY_SIZE(fxas21002c_lpf_values) - 1;</div><div class='add'>+</div><div class='add'>+	value = min_t(u8, value, lpf_value_max);</div><div class='add'>+</div><div class='add'>+	return fxas21002c_lpf_values[value];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_lpf_value_from_bw(struct fxas21002c_data *data,</div><div class='add'>+					unsigned int hz)</div><div class='add'>+{</div><div class='add'>+	int lpf_table_size = ARRAY_SIZE(fxas21002c_lpf_values);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; lpf_table_size; i++)</div><div class='add'>+		if (fxas21002c_lpf_values[i] == hz)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_hpf_sel_from_value(struct fxas21002c_data *data, u8 value)</div><div class='add'>+{</div><div class='add'>+	int hpf_value_max = ARRAY_SIZE(fxas21002c_hpf_values) - 1;</div><div class='add'>+</div><div class='add'>+	value = min_t(u8, value, hpf_value_max);</div><div class='add'>+</div><div class='add'>+	return fxas21002c_hpf_values[value];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_hpf_value_from_sel(struct fxas21002c_data *data,</div><div class='add'>+					 unsigned int hz)</div><div class='add'>+{</div><div class='add'>+	int hpf_table_size = ARRAY_SIZE(fxas21002c_hpf_values);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hpf_table_size; i++)</div><div class='add'>+		if (fxas21002c_hpf_values[i] == hz)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_range_fs_from_value(struct fxas21002c_data *data,</div><div class='add'>+					  u8 value)</div><div class='add'>+{</div><div class='add'>+	int range_value_max = ARRAY_SIZE(fxas21002c_range_values) - 1;</div><div class='add'>+	unsigned int fs_double;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We need to check if FS_DOUBLE is enabled to offset the value */</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_FS_DOUBLE], &amp;fs_double);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fs_double)</div><div class='add'>+		value += 1;</div><div class='add'>+</div><div class='add'>+	value = min_t(u8, value, range_value_max);</div><div class='add'>+</div><div class='add'>+	return fxas21002c_range_values[value];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_range_value_from_fs(struct fxas21002c_data *data,</div><div class='add'>+					  unsigned int range)</div><div class='add'>+{</div><div class='add'>+	int range_table_size = ARRAY_SIZE(fxas21002c_range_values);</div><div class='add'>+	bool found = false;</div><div class='add'>+	int fs_double = 0;</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; range_table_size; i++)</div><div class='add'>+		if (fxas21002c_range_values[i] == range) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (!found)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (range &gt; FXAS21002C_RANGE_LIMIT_DOUBLE)</div><div class='add'>+		fs_double = 1;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(data-&gt;regmap_fields[F_FS_DOUBLE], fs_double);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_mode_get(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int active;</div><div class='add'>+	unsigned int ready;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_ACTIVE], &amp;active);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (active)</div><div class='add'>+		return FXAS21002C_MODE_ACTIVE;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_READY], &amp;ready);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ready)</div><div class='add'>+		return FXAS21002C_MODE_READY;</div><div class='add'>+</div><div class='add'>+	return FXAS21002C_MODE_STANDBY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_mode_set(struct fxas21002c_data *data,</div><div class='add'>+			       enum fxas21002c_mode_state mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mode == data-&gt;mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mode == FXAS21002C_MODE_READY)</div><div class='add'>+		ret = regmap_field_write(data-&gt;regmap_fields[F_READY], 1);</div><div class='add'>+	else</div><div class='add'>+		ret = regmap_field_write(data-&gt;regmap_fields[F_READY], 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mode == FXAS21002C_MODE_ACTIVE)</div><div class='add'>+		ret = regmap_field_write(data-&gt;regmap_fields[F_ACTIVE], 1);</div><div class='add'>+	else</div><div class='add'>+		ret = regmap_field_write(data-&gt;regmap_fields[F_ACTIVE], 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* if going to active wait the setup times */</div><div class='add'>+	if (mode == FXAS21002C_MODE_ACTIVE &amp;&amp;</div><div class='add'>+	    data-&gt;mode == FXAS21002C_MODE_STANDBY)</div><div class='add'>+		msleep_interruptible(FXAS21002C_STANDBY_ACTIVE_TIME_MS);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;mode == FXAS21002C_MODE_READY)</div><div class='add'>+		msleep_interruptible(FXAS21002C_READY_ACTIVE_TIME_MS);</div><div class='add'>+</div><div class='add'>+	data-&gt;prev_mode = data-&gt;mode;</div><div class='add'>+	data-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_write(struct fxas21002c_data *data,</div><div class='add'>+			    enum fxas21002c_fields field, int bits)</div><div class='add'>+{</div><div class='add'>+	int actual_mode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	actual_mode = fxas21002c_mode_get(data);</div><div class='add'>+	if (actual_mode &lt; 0) {</div><div class='add'>+		ret = actual_mode;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_mode_set(data, FXAS21002C_MODE_READY);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(data-&gt;regmap_fields[field], bits);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_mode_set(data, data-&gt;prev_mode);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;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  fxas21002c_pm_get(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pm_runtime_put_noidle(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int  fxas21002c_pm_put(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	pm_runtime_mark_last_busy(dev);</div><div class='add'>+</div><div class='add'>+	return pm_runtime_put_autosuspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_temp_get(struct fxas21002c_data *data, int *val)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+	unsigned int temp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = fxas21002c_pm_get(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_TEMP], &amp;temp);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to read temp: %d\n", ret);</div><div class='add'>+		goto data_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = sign_extend32(temp, 7);</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_pm_put(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	ret = IIO_VAL_INT;</div><div class='add'>+</div><div class='add'>+data_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 fxas21002c_axis_get(struct fxas21002c_data *data,</div><div class='add'>+			       int index, int *val)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+	__be16 axis_be;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = fxas21002c_pm_get(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	ret = regmap_bulk_read(data-&gt;regmap, FXAS21002C_AXIS_TO_REG(index),</div><div class='add'>+			       &amp;axis_be, sizeof(axis_be));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to read axis: %d: %d\n", index, ret);</div><div class='add'>+		goto data_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = sign_extend32(be16_to_cpu(axis_be), 15);</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_pm_put(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	ret = IIO_VAL_INT;</div><div class='add'>+</div><div class='add'>+data_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 fxas21002c_odr_get(struct fxas21002c_data *data, int *odr)</div><div class='add'>+{</div><div class='add'>+	unsigned int odr_bits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_DR], &amp;odr_bits);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	*odr = fxas21002c_odr_hz_from_value(data, odr_bits);</div><div class='add'>+</div><div class='add'>+	ret = IIO_VAL_INT;</div><div class='add'>+</div><div class='add'>+data_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 fxas21002c_odr_set(struct fxas21002c_data *data, int odr)</div><div class='add'>+{</div><div class='add'>+	int odr_bits;</div><div class='add'>+</div><div class='add'>+	odr_bits = fxas21002c_odr_value_from_hz(data, odr);</div><div class='add'>+	if (odr_bits &lt; 0)</div><div class='add'>+		return odr_bits;</div><div class='add'>+</div><div class='add'>+	return fxas21002c_write(data, F_DR, odr_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_lpf_get(struct fxas21002c_data *data, int *val2)</div><div class='add'>+{</div><div class='add'>+	unsigned int bw_bits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_BW], &amp;bw_bits);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	*val2 = fxas21002c_lpf_bw_from_value(data, bw_bits) * 10000;</div><div class='add'>+</div><div class='add'>+	ret = IIO_VAL_INT_PLUS_MICRO;</div><div class='add'>+</div><div class='add'>+data_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 fxas21002c_lpf_set(struct fxas21002c_data *data, int bw)</div><div class='add'>+{</div><div class='add'>+	int bw_bits;</div><div class='add'>+	int odr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bw_bits = fxas21002c_lpf_value_from_bw(data, bw);</div><div class='add'>+	if (bw_bits &lt; 0)</div><div class='add'>+		return bw_bits;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * From table 33 of the device spec, for ODR = 25Hz and 12.5 value 0.08</div><div class='add'>+	 * is not allowed and for ODR = 12.5 value 0.16 is also not allowed</div><div class='add'>+	 */</div><div class='add'>+	ret = fxas21002c_odr_get(data, &amp;odr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((odr == 25 &amp;&amp; bw_bits &gt; 0x01) || (odr == 12 &amp;&amp; bw_bits &gt; 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return fxas21002c_write(data, F_BW, bw_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_hpf_get(struct fxas21002c_data *data, int *val2)</div><div class='add'>+{</div><div class='add'>+	unsigned int sel_bits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_SEL], &amp;sel_bits);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	*val2 = fxas21002c_hpf_sel_from_value(data, sel_bits);</div><div class='add'>+</div><div class='add'>+	ret = IIO_VAL_INT_PLUS_MICRO;</div><div class='add'>+</div><div class='add'>+data_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 fxas21002c_hpf_set(struct fxas21002c_data *data, int sel)</div><div class='add'>+{</div><div class='add'>+	int sel_bits;</div><div class='add'>+</div><div class='add'>+	sel_bits = fxas21002c_hpf_value_from_sel(data, sel);</div><div class='add'>+	if (sel_bits &lt; 0)</div><div class='add'>+		return sel_bits;</div><div class='add'>+</div><div class='add'>+	return fxas21002c_write(data, F_SEL, sel_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_scale_get(struct fxas21002c_data *data, int *val)</div><div class='add'>+{</div><div class='add'>+	int fs_bits;</div><div class='add'>+	int scale;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_FS], &amp;fs_bits);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto data_unlock;</div><div class='add'>+</div><div class='add'>+	scale = fxas21002c_range_fs_from_value(data, fs_bits);</div><div class='add'>+	if (scale &lt; 0) {</div><div class='add'>+		ret = scale;</div><div class='add'>+		goto data_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = scale;</div><div class='add'>+</div><div class='add'>+data_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 fxas21002c_scale_set(struct fxas21002c_data *data, int range)</div><div class='add'>+{</div><div class='add'>+	int fs_bits;</div><div class='add'>+</div><div class='add'>+	fs_bits = fxas21002c_range_value_from_fs(data, range);</div><div class='add'>+	if (fs_bits &lt; 0)</div><div class='add'>+		return fs_bits;</div><div class='add'>+</div><div class='add'>+	return fxas21002c_write(data, F_FS, fs_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_read_raw(struct iio_dev *indio_dev,</div><div class='add'>+			       struct iio_chan_spec const *chan, int *val,</div><div class='add'>+			       int *val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(indio_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		switch (chan-&gt;type) {</div><div class='add'>+		case IIO_TEMP:</div><div class='add'>+			return fxas21002c_temp_get(data, val);</div><div class='add'>+		case IIO_ANGL_VEL:</div><div class='add'>+			return fxas21002c_axis_get(data, chan-&gt;scan_index, val);</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		switch (chan-&gt;type) {</div><div class='add'>+		case IIO_ANGL_VEL:</div><div class='add'>+			*val2 = FXAS21002C_SCALE_FRACTIONAL;</div><div class='add'>+			ret = fxas21002c_scale_get(data, val);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			return IIO_VAL_FRACTIONAL;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:</div><div class='add'>+		*val = 0;</div><div class='add'>+		return fxas21002c_lpf_get(data, val2);</div><div class='add'>+	case IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY:</div><div class='add'>+		*val = 0;</div><div class='add'>+		return fxas21002c_hpf_get(data, val2);</div><div class='add'>+	case IIO_CHAN_INFO_SAMP_FREQ:</div><div class='add'>+		*val2 = 0;</div><div class='add'>+		return fxas21002c_odr_get(data, val);</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 fxas21002c_write_raw(struct iio_dev *indio_dev,</div><div class='add'>+				struct iio_chan_spec const *chan, int val,</div><div class='add'>+				int val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(indio_dev);</div><div class='add'>+	int range;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_SAMP_FREQ:</div><div class='add'>+		if (val2)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		return fxas21002c_odr_set(data, val);</div><div class='add'>+	case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:</div><div class='add'>+		if (val)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		val2 = val2 / 10000;</div><div class='add'>+		return fxas21002c_lpf_set(data, val2);</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		switch (chan-&gt;type) {</div><div class='add'>+		case IIO_ANGL_VEL:</div><div class='add'>+			range = (((val * 1000 + val2 / 1000) *</div><div class='add'>+				  FXAS21002C_SCALE_FRACTIONAL) / 1000);</div><div class='add'>+			return fxas21002c_scale_set(data, range);</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	case IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY:</div><div class='add'>+		return fxas21002c_hpf_set(data, val2);</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 IIO_CONST_ATTR_SAMP_FREQ_AVAIL("12.5 25 50 100 200 400 800");</div><div class='add'>+</div><div class='add'>+static IIO_CONST_ATTR(in_anglvel_filter_low_pass_3db_frequency_available,</div><div class='add'>+		      "0.32 0.16 0.08");</div><div class='add'>+</div><div class='add'>+static IIO_CONST_ATTR(in_anglvel_filter_high_pass_3db_frequency_available,</div><div class='add'>+		      "0.018750 0.009625 0.004875 0.002475");</div><div class='add'>+</div><div class='add'>+static IIO_CONST_ATTR(in_anglvel_scale_available,</div><div class='add'>+		      "125.0 62.5 31.25 15.625 7.8125");</div><div class='add'>+</div><div class='add'>+static struct attribute *fxas21002c_attributes[] = {</div><div class='add'>+	&amp;iio_const_attr_sampling_frequency_available.dev_attr.attr,</div><div class='add'>+	&amp;iio_const_attr_in_anglvel_filter_low_pass_3db_frequency_available.dev_attr.attr,</div><div class='add'>+	&amp;iio_const_attr_in_anglvel_filter_high_pass_3db_frequency_available.dev_attr.attr,</div><div class='add'>+	&amp;iio_const_attr_in_anglvel_scale_available.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group fxas21002c_attrs_group = {</div><div class='add'>+	.attrs = fxas21002c_attributes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FXAS21002C_CHANNEL(_axis) {					\</div><div class='add'>+	.type = IIO_ANGL_VEL,						\</div><div class='add'>+	.modified = 1,							\</div><div class='add'>+	.channel2 = IIO_MOD_##_axis,					\</div><div class='add'>+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\</div><div class='add'>+	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |		\</div><div class='add'>+		BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY) |	\</div><div class='add'>+		BIT(IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY) |	\</div><div class='add'>+		BIT(IIO_CHAN_INFO_SAMP_FREQ),				\</div><div class='add'>+	.scan_index = CHANNEL_SCAN_INDEX_##_axis,			\</div><div class='add'>+	.scan_type = {							\</div><div class='add'>+		.sign = 's',						\</div><div class='add'>+		.realbits = 16,						\</div><div class='add'>+		.storagebits = 16,					\</div><div class='add'>+		.endianness = IIO_BE,					\</div><div class='add'>+	},								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec fxas21002c_channels[] = {</div><div class='add'>+	{</div><div class='add'>+		.type = IIO_TEMP,</div><div class='add'>+		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='add'>+		.scan_index = -1,</div><div class='add'>+	},</div><div class='add'>+	FXAS21002C_CHANNEL(X),</div><div class='add'>+	FXAS21002C_CHANNEL(Y),</div><div class='add'>+	FXAS21002C_CHANNEL(Z),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_info fxas21002c_info = {</div><div class='add'>+	.attrs			= &amp;fxas21002c_attrs_group,</div><div class='add'>+	.read_raw		= &amp;fxas21002c_read_raw,</div><div class='add'>+	.write_raw		= &amp;fxas21002c_write_raw,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t fxas21002c_trigger_handler(int irq, void *p)</div><div class='add'>+{</div><div class='add'>+	struct iio_poll_func *pf = p;</div><div class='add'>+	struct iio_dev *indio_dev = pf-&gt;indio_dev;</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(indio_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+	ret = regmap_bulk_read(data-&gt;regmap, FXAS21002C_REG_OUT_X_MSB,</div><div class='add'>+			       data-&gt;buffer, CHANNEL_SCAN_MAX * sizeof(s16));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	iio_push_to_buffers_with_timestamp(indio_dev, data-&gt;buffer,</div><div class='add'>+					   data-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	iio_trigger_notify_done(indio_dev-&gt;trig);</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 fxas21002c_chip_init(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+	unsigned int chip_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_WHO_AM_I], &amp;chip_id);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (chip_id != FXAS21002C_CHIP_ID_1 &amp;&amp;</div><div class='add'>+	    chip_id != FXAS21002C_CHIP_ID_2) {</div><div class='add'>+		dev_err(dev, "chip id 0x%02x is not supported\n", chip_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;chip_id = chip_id;</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_mode_set(data, FXAS21002C_MODE_STANDBY);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set ODR to 200HZ as default */</div><div class='add'>+	ret = fxas21002c_odr_set(data, 200);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(dev, "failed to set ODR: %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 fxas21002c_data_rdy_trigger_set_state(struct iio_trigger *trig,</div><div class='add'>+						 bool state)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return regmap_field_write(data-&gt;regmap_fields[F_INT_EN_DRDY], state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_trigger_ops fxas21002c_trigger_ops = {</div><div class='add'>+	.set_trigger_state = &amp;fxas21002c_data_rdy_trigger_set_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t fxas21002c_data_rdy_handler(int irq, void *private)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = private;</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	data-&gt;timestamp = iio_get_time_ns(indio_dev);</div><div class='add'>+</div><div class='add'>+	return IRQ_WAKE_THREAD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t fxas21002c_data_rdy_thread(int irq, void *private)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = private;</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(indio_dev);</div><div class='add'>+	unsigned int data_ready;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_read(data-&gt;regmap_fields[F_SRC_DRDY], &amp;data_ready);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (!data_ready)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	iio_trigger_poll_chained(data-&gt;dready_trig);</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 fxas21002c_trigger_probe(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+	struct iio_dev *indio_dev = dev_get_drvdata(dev);</div><div class='add'>+	struct device_node *np = indio_dev-&gt;dev.of_node;</div><div class='add'>+	unsigned long irq_trig;</div><div class='add'>+	bool irq_open_drain;</div><div class='add'>+	int irq1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;irq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	irq1 = of_irq_get_byname(np, "INT1");</div><div class='add'>+</div><div class='add'>+	if (irq1 == data-&gt;irq) {</div><div class='add'>+		dev_info(dev, "using interrupt line INT1\n");</div><div class='add'>+		ret = regmap_field_write(data-&gt;regmap_fields[F_INT_CFG_DRDY],</div><div class='add'>+					 1);</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'>+	dev_info(dev, "using interrupt line INT2\n");</div><div class='add'>+</div><div class='add'>+	irq_open_drain = of_property_read_bool(np, "drive-open-drain");</div><div class='add'>+</div><div class='add'>+	data-&gt;dready_trig = devm_iio_trigger_alloc(dev, "%s-dev%d",</div><div class='add'>+						   indio_dev-&gt;name,</div><div class='add'>+						   indio_dev-&gt;id);</div><div class='add'>+	if (!data-&gt;dready_trig)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	irq_trig = irqd_get_trigger_type(irq_get_irq_data(data-&gt;irq));</div><div class='add'>+</div><div class='add'>+	if (irq_trig == IRQF_TRIGGER_RISING) {</div><div class='add'>+		ret = regmap_field_write(data-&gt;regmap_fields[F_IPOL], 1);</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'>+	if (irq_open_drain)</div><div class='add'>+		irq_trig |= IRQF_SHARED;</div><div class='add'>+</div><div class='add'>+	ret = devm_request_threaded_irq(dev, data-&gt;irq,</div><div class='add'>+					fxas21002c_data_rdy_handler,</div><div class='add'>+					fxas21002c_data_rdy_thread,</div><div class='add'>+					irq_trig, "fxas21002c_data_ready",</div><div class='add'>+					indio_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data-&gt;dready_trig-&gt;dev.parent = dev;</div><div class='add'>+	data-&gt;dready_trig-&gt;ops = &amp;fxas21002c_trigger_ops;</div><div class='add'>+	iio_trigger_set_drvdata(data-&gt;dready_trig, indio_dev);</div><div class='add'>+</div><div class='add'>+	return devm_iio_trigger_register(dev, data-&gt;dready_trig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_power_enable(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regulator_enable(data-&gt;vdd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regulator_enable(data-&gt;vddio);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		regulator_disable(data-&gt;vdd);</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 fxas21002c_power_disable(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	regulator_disable(data-&gt;vdd);</div><div class='add'>+	regulator_disable(data-&gt;vddio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fxas21002c_power_disable_action(void *_data)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = _data;</div><div class='add'>+</div><div class='add'>+	fxas21002c_power_disable(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_regulators_get(struct fxas21002c_data *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = regmap_get_device(data-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	data-&gt;vdd = devm_regulator_get(dev-&gt;parent, "vdd");</div><div class='add'>+	if (IS_ERR(data-&gt;vdd))</div><div class='add'>+		return PTR_ERR(data-&gt;vdd);</div><div class='add'>+</div><div class='add'>+	data-&gt;vddio = devm_regulator_get(dev-&gt;parent, "vddio");</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(data-&gt;vddio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fxas21002c_core_probe(struct device *dev, struct regmap *regmap, int irq,</div><div class='add'>+			  const char *name)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data;</div><div class='add'>+	struct iio_dev *indio_dev;</div><div class='add'>+	struct regmap_field *f;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));</div><div class='add'>+	if (!indio_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data = iio_priv(indio_dev);</div><div class='add'>+	dev_set_drvdata(dev, indio_dev);</div><div class='add'>+	data-&gt;irq = irq;</div><div class='add'>+	data-&gt;regmap = regmap;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; F_MAX_FIELDS; i++) {</div><div class='add'>+		f = devm_regmap_field_alloc(dev, data-&gt;regmap,</div><div class='add'>+					    fxas21002c_reg_fields[i]);</div><div class='add'>+		if (IS_ERR(f))</div><div class='add'>+			return PTR_ERR(f);</div><div class='add'>+</div><div class='add'>+		data-&gt;regmap_fields[i] = f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_regulators_get(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_power_enable(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = devm_add_action_or_reset(dev, fxas21002c_power_disable_action,</div><div class='add'>+				       data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_chip_init(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	indio_dev-&gt;dev.parent = dev;</div><div class='add'>+	indio_dev-&gt;channels = fxas21002c_channels;</div><div class='add'>+	indio_dev-&gt;num_channels = ARRAY_SIZE(fxas21002c_channels);</div><div class='add'>+	indio_dev-&gt;name = name;</div><div class='add'>+	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='add'>+	indio_dev-&gt;info = &amp;fxas21002c_info;</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_trigger_probe(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,</div><div class='add'>+					      fxas21002c_trigger_handler, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_set_active(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+	pm_runtime_set_autosuspend_delay(dev, 2000);</div><div class='add'>+	pm_runtime_use_autosuspend(dev);</div><div class='add'>+</div><div class='add'>+	ret = iio_device_register(indio_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto pm_disable;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+pm_disable:</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+	pm_runtime_set_suspended(dev);</div><div class='add'>+	pm_runtime_put_noidle(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fxas21002c_core_probe);</div><div class='add'>+</div><div class='add'>+void fxas21002c_core_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	iio_device_unregister(indio_dev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+	pm_runtime_set_suspended(dev);</div><div class='add'>+	pm_runtime_put_noidle(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fxas21002c_core_remove);</div><div class='add'>+</div><div class='add'>+static int __maybe_unused fxas21002c_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(dev_get_drvdata(dev));</div><div class='add'>+</div><div class='add'>+	fxas21002c_mode_set(data, FXAS21002C_MODE_STANDBY);</div><div class='add'>+	fxas21002c_power_disable(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 __maybe_unused fxas21002c_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(dev_get_drvdata(dev));</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fxas21002c_power_enable(data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return fxas21002c_mode_set(data, data-&gt;prev_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused fxas21002c_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(dev_get_drvdata(dev));</div><div class='add'>+</div><div class='add'>+	return fxas21002c_mode_set(data, FXAS21002C_MODE_READY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused fxas21002c_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fxas21002c_data *data = iio_priv(dev_get_drvdata(dev));</div><div class='add'>+</div><div class='add'>+	return fxas21002c_mode_set(data, FXAS21002C_MODE_ACTIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct dev_pm_ops fxas21002c_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(fxas21002c_suspend, fxas21002c_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(fxas21002c_runtime_suspend,</div><div class='add'>+			   fxas21002c_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(fxas21002c_pm_ops);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rui Miguel Silva &lt;rui.silva@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("FXAS21002C Gyro driver");</div><div class='head'>diff --git a/drivers/iio/gyro/fxas21002c_i2c.c b/drivers/iio/gyro/fxas21002c_i2c.c<br/>new file mode 100644<br/>index 000000000000..a7807fd97483<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/fxas21002c_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/fxas21002c_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Driver for NXP FXAS21002C Gyroscope - I2C</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/i2c.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/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fxas21002c.h"</div><div class='add'>+</div><div class='add'>+static const struct regmap_config fxas21002c_regmap_i2c_conf = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.max_register = FXAS21002C_REG_CTRL3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fxas21002c_i2c_probe(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+</div><div class='add'>+	regmap = devm_regmap_init_i2c(i2c, &amp;fxas21002c_regmap_i2c_conf);</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='add'>+		dev_err(&amp;i2c-&gt;dev, "Failed to register i2c regmap: %ld\n",</div><div class='add'>+			PTR_ERR(regmap));</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fxas21002c_core_probe(&amp;i2c-&gt;dev, regmap, i2c-&gt;irq, i2c-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	fxas21002c_core_remove(&amp;i2c-&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 i2c_device_id fxas21002c_i2c_id[] = {</div><div class='add'>+	{ "fxas21002c", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, fxas21002c_i2c_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id fxas21002c_i2c_of_match[] = {</div><div class='add'>+	{ .compatible = "nxp,fxas21002c", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, fxas21002c_i2c_of_match);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver fxas21002c_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "fxas21002c_i2c",</div><div class='add'>+		.pm = &amp;fxas21002c_pm_ops,</div><div class='add'>+		.of_match_table = fxas21002c_i2c_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe_new	= fxas21002c_i2c_probe,</div><div class='add'>+	.remove		= fxas21002c_i2c_remove,</div><div class='add'>+	.id_table	= fxas21002c_i2c_id,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(fxas21002c_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rui Miguel Silva &lt;rui.silva@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("FXAS21002C I2C Gyro driver");</div><div class='head'>diff --git a/drivers/iio/gyro/fxas21002c_spi.c b/drivers/iio/gyro/fxas21002c_spi.c<br/>new file mode 100644<br/>index 000000000000..77ceebef4e34<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/fxas21002c_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/fxas21002c_spi.c</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'>+ * Driver for NXP Fxas21002c Gyroscope - SPI</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.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/regmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fxas21002c.h"</div><div class='add'>+</div><div class='add'>+static const struct regmap_config fxas21002c_regmap_spi_conf = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.max_register = FXAS21002C_REG_CTRL3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fxas21002c_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+</div><div class='add'>+	regmap = devm_regmap_init_spi(spi, &amp;fxas21002c_regmap_spi_conf);</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Failed to register spi regmap: %ld\n",</div><div class='add'>+			PTR_ERR(regmap));</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fxas21002c_core_probe(&amp;spi-&gt;dev, regmap, spi-&gt;irq, id-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxas21002c_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	fxas21002c_core_remove(&amp;spi-&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 spi_device_id fxas21002c_spi_id[] = {</div><div class='add'>+	{ "fxas21002c", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, fxas21002c_spi_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id fxas21002c_spi_of_match[] = {</div><div class='add'>+	{ .compatible = "nxp,fxas21002c", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, fxas21002c_spi_of_match);</div><div class='add'>+</div><div class='add'>+static struct spi_driver fxas21002c_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "fxas21002c_spi",</div><div class='add'>+		.pm = &amp;fxas21002c_pm_ops,</div><div class='add'>+		.of_match_table = fxas21002c_spi_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe		= fxas21002c_spi_probe,</div><div class='add'>+	.remove		= fxas21002c_spi_remove,</div><div class='add'>+	.id_table	= fxas21002c_spi_id,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(fxas21002c_spi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rui Miguel Silva &lt;rui.silva@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("FXAS21002C SPI Gyro driver");</div><div class='head'>diff --git a/drivers/iio/gyro/itg3200_core.c b/drivers/iio/gyro/itg3200_core.c<br/>index 7adecb562c81..203a6be33b70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/itg3200_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/itg3200_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/itg3200_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/itg3200_core.c</a></div><div class='hunk'>@@ -242,6 +242,20 @@ err_ret:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iio_mount_matrix *</div><div class='add'>+itg3200_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='add'>+			  const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct itg3200 *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec_ext_info itg3200_ext_info[] = {</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, itg3200_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define ITG3200_ST						\</div><div class='ctx'> 	{ .sign = 's', .realbits = 16, .storagebits = 16, .endianness = IIO_BE }</div><div class='ctx'> </div><div class='hunk'>@@ -255,6 +269,7 @@ err_ret:</div><div class='ctx'> 	.address = ITG3200_REG_GYRO_ ## _mod ## OUT_H, \</div><div class='ctx'> 	.scan_index = ITG3200_SCAN_GYRO_ ## _mod, \</div><div class='ctx'> 	.scan_type = ITG3200_ST, \</div><div class='add'>+	.ext_info = itg3200_ext_info, \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iio_chan_spec itg3200_channels[] = {</div><div class='hunk'>@@ -297,6 +312,11 @@ static int itg3200_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	st = iio_priv(indio_dev);</div><div class='ctx'> </div><div class='add'>+	ret = iio_read_mount_matrix(&amp;client-&gt;dev, "mount-matrix",</div><div class='add'>+				&amp;st-&gt;orientation);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	i2c_set_clientdata(client, indio_dev);</div><div class='ctx'> 	st-&gt;i2c = client;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c<br/>index 77fac81a3adc..0a406163d775 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/mpu3050-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/gyro/mpu3050-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/gyro/mpu3050-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/gyro/mpu3050-core.c</a></div><div class='hunk'>@@ -29,7 +29,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "mpu3050.h"</div><div class='ctx'> </div><div class='del'>-#define MPU3050_CHIP_ID		0x69</div><div class='add'>+#define MPU3050_CHIP_ID		0x68</div><div class='add'>+#define MPU3050_CHIP_ID_MASK	0x7E</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register map: anything suffixed *_H is a big-endian high byte and always</div><div class='hunk'>@@ -864,7 +865,7 @@ static int mpu3050_power_up(struct mpu3050 *mpu3050)</div><div class='ctx'> 		dev_err(mpu3050-&gt;dev, "error setting power mode\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	msleep(10);</div><div class='add'>+	usleep_range(10000, 20000);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1149,8 +1150,7 @@ int mpu3050_common_probe(struct device *dev,</div><div class='ctx'> 	mpu3050-&gt;divisor = 99;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the mounting matrix, if present */</div><div class='del'>-	ret = of_iio_read_mount_matrix(dev, "mount-matrix",</div><div class='del'>-				       &amp;mpu3050-&gt;orientation);</div><div class='add'>+	ret = iio_read_mount_matrix(dev, "mount-matrix", &amp;mpu3050-&gt;orientation);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1176,8 +1176,9 @@ int mpu3050_common_probe(struct device *dev,</div><div class='ctx'> 		goto err_power_down;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (val != MPU3050_CHIP_ID) {</div><div class='del'>-		dev_err(dev, "unsupported chip id %02x\n", (u8)val);</div><div class='add'>+	if ((val &amp; MPU3050_CHIP_ID_MASK) != MPU3050_CHIP_ID) {</div><div class='add'>+		dev_err(dev, "unsupported chip id %02x\n",</div><div class='add'>+				(u8)(val &amp; MPU3050_CHIP_ID_MASK));</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err_power_down;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/iio/humidity/Kconfig b/drivers/iio/humidity/Kconfig<br/>index 1a0d458e4f4e..f1a8ec9d637b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/humidity/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/humidity/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/humidity/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/humidity/Kconfig</a></div><div class='hunk'>@@ -4,16 +4,16 @@</div><div class='ctx'> menu "Humidity sensors"</div><div class='ctx'> </div><div class='ctx'> config AM2315</div><div class='del'>-    tristate "Aosong AM2315 relative humidity and temperature sensor"</div><div class='del'>-    depends on I2C</div><div class='del'>-    select IIO_BUFFER</div><div class='del'>-    select IIO_TRIGGERED_BUFFER</div><div class='del'>-    help</div><div class='del'>-      If you say yes here you get support for the Aosong AM2315</div><div class='del'>-      relative humidity and ambient temperature sensor.</div><div class='add'>+	tristate "Aosong AM2315 relative humidity and temperature sensor"</div><div class='add'>+	depends on I2C</div><div class='add'>+	select IIO_BUFFER</div><div class='add'>+	select IIO_TRIGGERED_BUFFER</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the Aosong AM2315</div><div class='add'>+	  relative humidity and ambient temperature sensor.</div><div class='ctx'> </div><div class='del'>-      This driver can also be built as a module. If so, the module will</div><div class='del'>-      be called am2315.</div><div class='add'>+	  This driver can also be built as a module. If so, the module will</div><div class='add'>+	  be called am2315.</div><div class='ctx'> </div><div class='ctx'> config DHT11</div><div class='ctx'> 	tristate "DHT11 (and compatible sensors) driver"</div><div class='hunk'>@@ -78,7 +78,7 @@ config HTS221_SPI</div><div class='ctx'> config HTU21</div><div class='ctx'> 	tristate "Measurement Specialties HTU21 humidity &amp; temperature sensor"</div><div class='ctx'> 	depends on I2C</div><div class='del'>-        select IIO_MS_SENSORS_I2C</div><div class='add'>+	select IIO_MS_SENSORS_I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the Measurement Specialties</div><div class='ctx'> 	  HTU21 humidity and temperature sensor.</div><div class='head'>diff --git a/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile<br/>index 68629c68b19b..9e452fce1aaf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/Makefile</a></div><div class='hunk'>@@ -4,8 +4,6 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> # When adding new entries keep the list in alphabetical order</div><div class='del'>-adis16400-y             := adis16400_core.o</div><div class='del'>-adis16400-$(CONFIG_IIO_BUFFER) += adis16400_buffer.o</div><div class='ctx'> obj-$(CONFIG_ADIS16400) += adis16400.o</div><div class='ctx'> obj-$(CONFIG_ADIS16480) += adis16480.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400.c<br/>index 46a569005a13..beb6919e7180 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis16400_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16400_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis16400.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/adis16400.c</a></div><div class='hunk'>@@ -31,8 +31,183 @@</div><div class='ctx'> #include &lt;linux/iio/iio.h&gt;</div><div class='ctx'> #include &lt;linux/iio/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='add'>+#include &lt;linux/iio/trigger_consumer.h&gt;</div><div class='add'>+#include &lt;linux/iio/imu/adis.h&gt;</div><div class='add'>+</div><div class='add'>+#define ADIS16400_STARTUP_DELAY	290 /* ms */</div><div class='add'>+#define ADIS16400_MTEST_DELAY 90 /* ms */</div><div class='add'>+</div><div class='add'>+#define ADIS16400_FLASH_CNT  0x00 /* Flash memory write count */</div><div class='add'>+#define ADIS16400_SUPPLY_OUT 0x02 /* Power supply measurement */</div><div class='add'>+#define ADIS16400_XGYRO_OUT 0x04 /* X-axis gyroscope output */</div><div class='add'>+#define ADIS16400_YGYRO_OUT 0x06 /* Y-axis gyroscope output */</div><div class='add'>+#define ADIS16400_ZGYRO_OUT 0x08 /* Z-axis gyroscope output */</div><div class='add'>+#define ADIS16400_XACCL_OUT 0x0A /* X-axis accelerometer output */</div><div class='add'>+#define ADIS16400_YACCL_OUT 0x0C /* Y-axis accelerometer output */</div><div class='add'>+#define ADIS16400_ZACCL_OUT 0x0E /* Z-axis accelerometer output */</div><div class='add'>+#define ADIS16400_XMAGN_OUT 0x10 /* X-axis magnetometer measurement */</div><div class='add'>+#define ADIS16400_YMAGN_OUT 0x12 /* Y-axis magnetometer measurement */</div><div class='add'>+#define ADIS16400_ZMAGN_OUT 0x14 /* Z-axis magnetometer measurement */</div><div class='add'>+#define ADIS16400_TEMP_OUT  0x16 /* Temperature output */</div><div class='add'>+#define ADIS16400_AUX_ADC   0x18 /* Auxiliary ADC measurement */</div><div class='add'>+</div><div class='add'>+#define ADIS16350_XTEMP_OUT 0x10 /* X-axis gyroscope temperature measurement */</div><div class='add'>+#define ADIS16350_YTEMP_OUT 0x12 /* Y-axis gyroscope temperature measurement */</div><div class='add'>+#define ADIS16350_ZTEMP_OUT 0x14 /* Z-axis gyroscope temperature measurement */</div><div class='add'>+</div><div class='add'>+#define ADIS16300_PITCH_OUT 0x12 /* X axis inclinometer output measurement */</div><div class='add'>+#define ADIS16300_ROLL_OUT  0x14 /* Y axis inclinometer output measurement */</div><div class='add'>+#define ADIS16300_AUX_ADC   0x16 /* Auxiliary ADC measurement */</div><div class='add'>+</div><div class='add'>+#define ADIS16448_BARO_OUT	0x16 /* Barometric pressure output */</div><div class='add'>+#define ADIS16448_TEMP_OUT  0x18 /* Temperature output */</div><div class='add'>+</div><div class='add'>+/* Calibration parameters */</div><div class='add'>+#define ADIS16400_XGYRO_OFF 0x1A /* X-axis gyroscope bias offset factor */</div><div class='add'>+#define ADIS16400_YGYRO_OFF 0x1C /* Y-axis gyroscope bias offset factor */</div><div class='add'>+#define ADIS16400_ZGYRO_OFF 0x1E /* Z-axis gyroscope bias offset factor */</div><div class='add'>+#define ADIS16400_XACCL_OFF 0x20 /* X-axis acceleration bias offset factor */</div><div class='add'>+#define ADIS16400_YACCL_OFF 0x22 /* Y-axis acceleration bias offset factor */</div><div class='add'>+#define ADIS16400_ZACCL_OFF 0x24 /* Z-axis acceleration bias offset factor */</div><div class='add'>+#define ADIS16400_XMAGN_HIF 0x26 /* X-axis magnetometer, hard-iron factor */</div><div class='add'>+#define ADIS16400_YMAGN_HIF 0x28 /* Y-axis magnetometer, hard-iron factor */</div><div class='add'>+#define ADIS16400_ZMAGN_HIF 0x2A /* Z-axis magnetometer, hard-iron factor */</div><div class='add'>+#define ADIS16400_XMAGN_SIF 0x2C /* X-axis magnetometer, soft-iron factor */</div><div class='add'>+#define ADIS16400_YMAGN_SIF 0x2E /* Y-axis magnetometer, soft-iron factor */</div><div class='add'>+#define ADIS16400_ZMAGN_SIF 0x30 /* Z-axis magnetometer, soft-iron factor */</div><div class='add'>+</div><div class='add'>+#define ADIS16400_GPIO_CTRL 0x32 /* Auxiliary digital input/output control */</div><div class='add'>+#define ADIS16400_MSC_CTRL  0x34 /* Miscellaneous control */</div><div class='add'>+#define ADIS16400_SMPL_PRD  0x36 /* Internal sample period (rate) control */</div><div class='add'>+#define ADIS16400_SENS_AVG  0x38 /* Dynamic range and digital filter control */</div><div class='add'>+#define ADIS16400_SLP_CNT   0x3A /* Sleep mode control */</div><div class='add'>+#define ADIS16400_DIAG_STAT 0x3C /* System status */</div><div class='add'>+</div><div class='add'>+/* Alarm functions */</div><div class='add'>+#define ADIS16400_GLOB_CMD  0x3E /* System command */</div><div class='add'>+#define ADIS16400_ALM_MAG1  0x40 /* Alarm 1 amplitude threshold */</div><div class='add'>+#define ADIS16400_ALM_MAG2  0x42 /* Alarm 2 amplitude threshold */</div><div class='add'>+#define ADIS16400_ALM_SMPL1 0x44 /* Alarm 1 sample size */</div><div class='add'>+#define ADIS16400_ALM_SMPL2 0x46 /* Alarm 2 sample size */</div><div class='add'>+#define ADIS16400_ALM_CTRL  0x48 /* Alarm control */</div><div class='add'>+#define ADIS16400_AUX_DAC   0x4A /* Auxiliary DAC data */</div><div class='add'>+</div><div class='add'>+#define ADIS16334_LOT_ID1   0x52 /* Lot identification code 1 */</div><div class='add'>+#define ADIS16334_LOT_ID2   0x54 /* Lot identification code 2 */</div><div class='add'>+#define ADIS16400_PRODUCT_ID 0x56 /* Product identifier */</div><div class='add'>+#define ADIS16334_SERIAL_NUMBER 0x58 /* Serial number, lot specific */</div><div class='add'>+</div><div class='add'>+#define ADIS16400_ERROR_ACTIVE			(1&lt;&lt;14)</div><div class='add'>+#define ADIS16400_NEW_DATA			(1&lt;&lt;14)</div><div class='add'>+</div><div class='add'>+/* MSC_CTRL */</div><div class='add'>+#define ADIS16400_MSC_CTRL_MEM_TEST		(1&lt;&lt;11)</div><div class='add'>+#define ADIS16400_MSC_CTRL_INT_SELF_TEST	(1&lt;&lt;10)</div><div class='add'>+#define ADIS16400_MSC_CTRL_NEG_SELF_TEST	(1&lt;&lt;9)</div><div class='add'>+#define ADIS16400_MSC_CTRL_POS_SELF_TEST	(1&lt;&lt;8)</div><div class='add'>+#define ADIS16400_MSC_CTRL_GYRO_BIAS		(1&lt;&lt;7)</div><div class='add'>+#define ADIS16400_MSC_CTRL_ACCL_ALIGN		(1&lt;&lt;6)</div><div class='add'>+#define ADIS16400_MSC_CTRL_DATA_RDY_EN		(1&lt;&lt;2)</div><div class='add'>+#define ADIS16400_MSC_CTRL_DATA_RDY_POL_HIGH	(1&lt;&lt;1)</div><div class='add'>+#define ADIS16400_MSC_CTRL_DATA_RDY_DIO2	(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+/* SMPL_PRD */</div><div class='add'>+#define ADIS16400_SMPL_PRD_TIME_BASE	(1&lt;&lt;7)</div><div class='add'>+#define ADIS16400_SMPL_PRD_DIV_MASK	0x7F</div><div class='add'>+</div><div class='add'>+/* DIAG_STAT */</div><div class='add'>+#define ADIS16400_DIAG_STAT_ZACCL_FAIL	15</div><div class='add'>+#define ADIS16400_DIAG_STAT_YACCL_FAIL	14</div><div class='add'>+#define ADIS16400_DIAG_STAT_XACCL_FAIL	13</div><div class='add'>+#define ADIS16400_DIAG_STAT_XGYRO_FAIL	12</div><div class='add'>+#define ADIS16400_DIAG_STAT_YGYRO_FAIL	11</div><div class='add'>+#define ADIS16400_DIAG_STAT_ZGYRO_FAIL	10</div><div class='add'>+#define ADIS16400_DIAG_STAT_ALARM2	9</div><div class='add'>+#define ADIS16400_DIAG_STAT_ALARM1	8</div><div class='add'>+#define ADIS16400_DIAG_STAT_FLASH_CHK	6</div><div class='add'>+#define ADIS16400_DIAG_STAT_SELF_TEST	5</div><div class='add'>+#define ADIS16400_DIAG_STAT_OVERFLOW	4</div><div class='add'>+#define ADIS16400_DIAG_STAT_SPI_FAIL	3</div><div class='add'>+#define ADIS16400_DIAG_STAT_FLASH_UPT	2</div><div class='add'>+#define ADIS16400_DIAG_STAT_POWER_HIGH	1</div><div class='add'>+#define ADIS16400_DIAG_STAT_POWER_LOW	0</div><div class='add'>+</div><div class='add'>+/* GLOB_CMD */</div><div class='add'>+#define ADIS16400_GLOB_CMD_SW_RESET	(1&lt;&lt;7)</div><div class='add'>+#define ADIS16400_GLOB_CMD_P_AUTO_NULL	(1&lt;&lt;4)</div><div class='add'>+#define ADIS16400_GLOB_CMD_FLASH_UPD	(1&lt;&lt;3)</div><div class='add'>+#define ADIS16400_GLOB_CMD_DAC_LATCH	(1&lt;&lt;2)</div><div class='add'>+#define ADIS16400_GLOB_CMD_FAC_CALIB	(1&lt;&lt;1)</div><div class='add'>+#define ADIS16400_GLOB_CMD_AUTO_NULL	(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+/* SLP_CNT */</div><div class='add'>+#define ADIS16400_SLP_CNT_POWER_OFF	(1&lt;&lt;8)</div><div class='add'>+</div><div class='add'>+#define ADIS16334_RATE_DIV_SHIFT 8</div><div class='add'>+#define ADIS16334_RATE_INT_CLK BIT(0)</div><div class='add'>+</div><div class='add'>+#define ADIS16400_SPI_SLOW	(u32)(300 * 1000)</div><div class='add'>+#define ADIS16400_SPI_BURST	(u32)(1000 * 1000)</div><div class='add'>+#define ADIS16400_SPI_FAST	(u32)(2000 * 1000)</div><div class='add'>+</div><div class='add'>+#define ADIS16400_HAS_PROD_ID		BIT(0)</div><div class='add'>+#define ADIS16400_NO_BURST		BIT(1)</div><div class='add'>+#define ADIS16400_HAS_SLOW_MODE		BIT(2)</div><div class='add'>+#define ADIS16400_HAS_SERIAL_NUMBER	BIT(3)</div><div class='add'>+#define ADIS16400_BURST_DIAG_STAT	BIT(4)</div><div class='add'>+</div><div class='add'>+struct adis16400_state;</div><div class='add'>+</div><div class='add'>+struct adis16400_chip_info {</div><div class='add'>+	const struct iio_chan_spec *channels;</div><div class='add'>+	const int num_channels;</div><div class='add'>+	const long flags;</div><div class='add'>+	unsigned int gyro_scale_micro;</div><div class='add'>+	unsigned int accel_scale_micro;</div><div class='add'>+	int temp_scale_nano;</div><div class='add'>+	int temp_offset;</div><div class='add'>+	int (*set_freq)(struct adis16400_state *st, unsigned int freq);</div><div class='add'>+	int (*get_freq)(struct adis16400_state *st);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct adis16400_state - device instance specific data</div><div class='add'>+ * @variant:	chip variant info</div><div class='add'>+ * @filt_int:	integer part of requested filter frequency</div><div class='add'>+ * @adis:	adis device</div><div class='add'>+ **/</div><div class='add'>+struct adis16400_state {</div><div class='add'>+	struct adis16400_chip_info	*variant;</div><div class='add'>+	int				filt_int;</div><div class='add'>+</div><div class='add'>+	struct adis adis;</div><div class='add'>+	unsigned long avail_scan_mask[2];</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#include "adis16400.h"</div><div class='add'>+/* At the moment triggers are only used for ring buffer</div><div class='add'>+ * filling. This may change!</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ADIS16400_SCAN_SUPPLY,</div><div class='add'>+	ADIS16400_SCAN_GYRO_X,</div><div class='add'>+	ADIS16400_SCAN_GYRO_Y,</div><div class='add'>+	ADIS16400_SCAN_GYRO_Z,</div><div class='add'>+	ADIS16400_SCAN_ACC_X,</div><div class='add'>+	ADIS16400_SCAN_ACC_Y,</div><div class='add'>+	ADIS16400_SCAN_ACC_Z,</div><div class='add'>+	ADIS16400_SCAN_MAGN_X,</div><div class='add'>+	ADIS16400_SCAN_MAGN_Y,</div><div class='add'>+	ADIS16400_SCAN_MAGN_Z,</div><div class='add'>+	ADIS16400_SCAN_BARO,</div><div class='add'>+	ADIS16350_SCAN_TEMP_X,</div><div class='add'>+	ADIS16350_SCAN_TEMP_Y,</div><div class='add'>+	ADIS16350_SCAN_TEMP_Z,</div><div class='add'>+	ADIS16300_SCAN_INCLI_X,</div><div class='add'>+	ADIS16300_SCAN_INCLI_Y,</div><div class='add'>+	ADIS16400_SCAN_ADC,</div><div class='add'>+	ADIS16400_SCAN_TIMESTAMP,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> </div><div class='hunk'>@@ -145,6 +320,11 @@ enum adis16400_chip_variant {</div><div class='ctx'> 	ADIS16448,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct adis_burst adis16400_burst = {</div><div class='add'>+	.en = true,</div><div class='add'>+	.reg_cmd = ADIS16400_GLOB_CMD,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int adis16334_get_freq(struct adis16400_state *st)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -465,6 +645,51 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IIO_BUFFER)</div><div class='add'>+static irqreturn_t adis16400_trigger_handler(int irq, void *p)</div><div class='add'>+{</div><div class='add'>+	struct iio_poll_func *pf = p;</div><div class='add'>+	struct iio_dev *indio_dev = pf-&gt;indio_dev;</div><div class='add'>+	struct adis16400_state *st = iio_priv(indio_dev);</div><div class='add'>+	struct adis *adis = &amp;st-&gt;adis;</div><div class='add'>+	u32 old_speed_hz = st-&gt;adis.spi-&gt;max_speed_hz;</div><div class='add'>+	void *buffer;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!adis-&gt;buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!(st-&gt;variant-&gt;flags &amp; ADIS16400_NO_BURST) &amp;&amp;</div><div class='add'>+		st-&gt;adis.spi-&gt;max_speed_hz &gt; ADIS16400_SPI_BURST) {</div><div class='add'>+		st-&gt;adis.spi-&gt;max_speed_hz = ADIS16400_SPI_BURST;</div><div class='add'>+		spi_setup(st-&gt;adis.spi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = spi_sync(adis-&gt;spi, &amp;adis-&gt;msg);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;adis-&gt;spi-&gt;dev, "Failed to read data: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	if (!(st-&gt;variant-&gt;flags &amp; ADIS16400_NO_BURST)) {</div><div class='add'>+		st-&gt;adis.spi-&gt;max_speed_hz = old_speed_hz;</div><div class='add'>+		spi_setup(st-&gt;adis.spi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (st-&gt;variant-&gt;flags &amp; ADIS16400_BURST_DIAG_STAT)</div><div class='add'>+		buffer = adis-&gt;buffer + sizeof(u16);</div><div class='add'>+	else</div><div class='add'>+		buffer = adis-&gt;buffer;</div><div class='add'>+</div><div class='add'>+	iio_push_to_buffers_with_timestamp(indio_dev, buffer,</div><div class='add'>+		pf-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+	iio_trigger_notify_done(indio_dev-&gt;trig);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define adis16400_trigger_handler	NULL</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IIO_BUFFER) */</div><div class='add'>+</div><div class='ctx'> #define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \</div><div class='ctx'> 	.type = IIO_VOLTAGE, \</div><div class='ctx'> 	.indexed = 1, \</div><div class='hunk'>@@ -835,7 +1060,7 @@ static struct adis16400_chip_info adis16400_chips[] = {</div><div class='ctx'> static const struct iio_info adis16400_info = {</div><div class='ctx'> 	.read_raw = &amp;adis16400_read_raw,</div><div class='ctx'> 	.write_raw = &amp;adis16400_write_raw,</div><div class='del'>-	.update_scan_mode = adis16400_update_scan_mode,</div><div class='add'>+	.update_scan_mode = adis_update_scan_mode,</div><div class='ctx'> 	.debugfs_reg_access = adis_debugfs_reg_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -926,6 +1151,9 @@ static int adis16400_probe(struct spi_device *spi)</div><div class='ctx'> 	if (!(st-&gt;variant-&gt;flags &amp; ADIS16400_NO_BURST)) {</div><div class='ctx'> 		adis16400_setup_chan_mask(st);</div><div class='ctx'> 		indio_dev-&gt;available_scan_masks = st-&gt;avail_scan_mask;</div><div class='add'>+		st-&gt;adis.burst = &amp;adis16400_burst;</div><div class='add'>+		if (st-&gt;variant-&gt;flags &amp; ADIS16400_BURST_DIAG_STAT)</div><div class='add'>+			st-&gt;adis.burst-&gt;extra_len = sizeof(u16);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = adis_init(&amp;st-&gt;adis, indio_dev, spi, &amp;adis16400_data);</div><div class='head'>diff --git a/drivers/iio/imu/adis16400.h b/drivers/iio/imu/adis16400.h<br/>deleted file mode 100644<br/>index 73b189c1c0fb..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis16400.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16400.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,215 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * adis16400.h	support Analog Devices ADIS16400</div><div class='del'>- *		3d 18g accelerometers,</div><div class='del'>- *		3d gyroscopes,</div><div class='del'>- *		3d 2.5gauss magnetometers via SPI</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009 Manuel Stahl &lt;manuel.stahl@iis.fraunhofer.de&gt;</div><div class='del'>- * Copyright (c) 2007 Jonathan Cameron &lt;jic23@kernel.org&gt;</div><div class='del'>- *</div><div class='del'>- * Loosely based upon lis3l02dq.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 SPI_ADIS16400_H_</div><div class='del'>-#define SPI_ADIS16400_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/iio/imu/adis.h&gt;</div><div class='del'>-</div><div class='del'>-#define ADIS16400_STARTUP_DELAY	290 /* ms */</div><div class='del'>-#define ADIS16400_MTEST_DELAY 90 /* ms */</div><div class='del'>-</div><div class='del'>-#define ADIS16400_FLASH_CNT  0x00 /* Flash memory write count */</div><div class='del'>-#define ADIS16400_SUPPLY_OUT 0x02 /* Power supply measurement */</div><div class='del'>-#define ADIS16400_XGYRO_OUT 0x04 /* X-axis gyroscope output */</div><div class='del'>-#define ADIS16400_YGYRO_OUT 0x06 /* Y-axis gyroscope output */</div><div class='del'>-#define ADIS16400_ZGYRO_OUT 0x08 /* Z-axis gyroscope output */</div><div class='del'>-#define ADIS16400_XACCL_OUT 0x0A /* X-axis accelerometer output */</div><div class='del'>-#define ADIS16400_YACCL_OUT 0x0C /* Y-axis accelerometer output */</div><div class='del'>-#define ADIS16400_ZACCL_OUT 0x0E /* Z-axis accelerometer output */</div><div class='del'>-#define ADIS16400_XMAGN_OUT 0x10 /* X-axis magnetometer measurement */</div><div class='del'>-#define ADIS16400_YMAGN_OUT 0x12 /* Y-axis magnetometer measurement */</div><div class='del'>-#define ADIS16400_ZMAGN_OUT 0x14 /* Z-axis magnetometer measurement */</div><div class='del'>-#define ADIS16400_TEMP_OUT  0x16 /* Temperature output */</div><div class='del'>-#define ADIS16400_AUX_ADC   0x18 /* Auxiliary ADC measurement */</div><div class='del'>-</div><div class='del'>-#define ADIS16350_XTEMP_OUT 0x10 /* X-axis gyroscope temperature measurement */</div><div class='del'>-#define ADIS16350_YTEMP_OUT 0x12 /* Y-axis gyroscope temperature measurement */</div><div class='del'>-#define ADIS16350_ZTEMP_OUT 0x14 /* Z-axis gyroscope temperature measurement */</div><div class='del'>-</div><div class='del'>-#define ADIS16300_PITCH_OUT 0x12 /* X axis inclinometer output measurement */</div><div class='del'>-#define ADIS16300_ROLL_OUT  0x14 /* Y axis inclinometer output measurement */</div><div class='del'>-#define ADIS16300_AUX_ADC   0x16 /* Auxiliary ADC measurement */</div><div class='del'>-</div><div class='del'>-#define ADIS16448_BARO_OUT	0x16 /* Barometric pressure output */</div><div class='del'>-#define ADIS16448_TEMP_OUT  0x18 /* Temperature output */</div><div class='del'>-</div><div class='del'>-/* Calibration parameters */</div><div class='del'>-#define ADIS16400_XGYRO_OFF 0x1A /* X-axis gyroscope bias offset factor */</div><div class='del'>-#define ADIS16400_YGYRO_OFF 0x1C /* Y-axis gyroscope bias offset factor */</div><div class='del'>-#define ADIS16400_ZGYRO_OFF 0x1E /* Z-axis gyroscope bias offset factor */</div><div class='del'>-#define ADIS16400_XACCL_OFF 0x20 /* X-axis acceleration bias offset factor */</div><div class='del'>-#define ADIS16400_YACCL_OFF 0x22 /* Y-axis acceleration bias offset factor */</div><div class='del'>-#define ADIS16400_ZACCL_OFF 0x24 /* Z-axis acceleration bias offset factor */</div><div class='del'>-#define ADIS16400_XMAGN_HIF 0x26 /* X-axis magnetometer, hard-iron factor */</div><div class='del'>-#define ADIS16400_YMAGN_HIF 0x28 /* Y-axis magnetometer, hard-iron factor */</div><div class='del'>-#define ADIS16400_ZMAGN_HIF 0x2A /* Z-axis magnetometer, hard-iron factor */</div><div class='del'>-#define ADIS16400_XMAGN_SIF 0x2C /* X-axis magnetometer, soft-iron factor */</div><div class='del'>-#define ADIS16400_YMAGN_SIF 0x2E /* Y-axis magnetometer, soft-iron factor */</div><div class='del'>-#define ADIS16400_ZMAGN_SIF 0x30 /* Z-axis magnetometer, soft-iron factor */</div><div class='del'>-</div><div class='del'>-#define ADIS16400_GPIO_CTRL 0x32 /* Auxiliary digital input/output control */</div><div class='del'>-#define ADIS16400_MSC_CTRL  0x34 /* Miscellaneous control */</div><div class='del'>-#define ADIS16400_SMPL_PRD  0x36 /* Internal sample period (rate) control */</div><div class='del'>-#define ADIS16400_SENS_AVG  0x38 /* Dynamic range and digital filter control */</div><div class='del'>-#define ADIS16400_SLP_CNT   0x3A /* Sleep mode control */</div><div class='del'>-#define ADIS16400_DIAG_STAT 0x3C /* System status */</div><div class='del'>-</div><div class='del'>-/* Alarm functions */</div><div class='del'>-#define ADIS16400_GLOB_CMD  0x3E /* System command */</div><div class='del'>-#define ADIS16400_ALM_MAG1  0x40 /* Alarm 1 amplitude threshold */</div><div class='del'>-#define ADIS16400_ALM_MAG2  0x42 /* Alarm 2 amplitude threshold */</div><div class='del'>-#define ADIS16400_ALM_SMPL1 0x44 /* Alarm 1 sample size */</div><div class='del'>-#define ADIS16400_ALM_SMPL2 0x46 /* Alarm 2 sample size */</div><div class='del'>-#define ADIS16400_ALM_CTRL  0x48 /* Alarm control */</div><div class='del'>-#define ADIS16400_AUX_DAC   0x4A /* Auxiliary DAC data */</div><div class='del'>-</div><div class='del'>-#define ADIS16334_LOT_ID1   0x52 /* Lot identification code 1 */</div><div class='del'>-#define ADIS16334_LOT_ID2   0x54 /* Lot identification code 2 */</div><div class='del'>-#define ADIS16400_PRODUCT_ID 0x56 /* Product identifier */</div><div class='del'>-#define ADIS16334_SERIAL_NUMBER 0x58 /* Serial number, lot specific */</div><div class='del'>-</div><div class='del'>-#define ADIS16400_ERROR_ACTIVE			(1&lt;&lt;14)</div><div class='del'>-#define ADIS16400_NEW_DATA			(1&lt;&lt;14)</div><div class='del'>-</div><div class='del'>-/* MSC_CTRL */</div><div class='del'>-#define ADIS16400_MSC_CTRL_MEM_TEST		(1&lt;&lt;11)</div><div class='del'>-#define ADIS16400_MSC_CTRL_INT_SELF_TEST	(1&lt;&lt;10)</div><div class='del'>-#define ADIS16400_MSC_CTRL_NEG_SELF_TEST	(1&lt;&lt;9)</div><div class='del'>-#define ADIS16400_MSC_CTRL_POS_SELF_TEST	(1&lt;&lt;8)</div><div class='del'>-#define ADIS16400_MSC_CTRL_GYRO_BIAS		(1&lt;&lt;7)</div><div class='del'>-#define ADIS16400_MSC_CTRL_ACCL_ALIGN		(1&lt;&lt;6)</div><div class='del'>-#define ADIS16400_MSC_CTRL_DATA_RDY_EN		(1&lt;&lt;2)</div><div class='del'>-#define ADIS16400_MSC_CTRL_DATA_RDY_POL_HIGH	(1&lt;&lt;1)</div><div class='del'>-#define ADIS16400_MSC_CTRL_DATA_RDY_DIO2	(1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-/* SMPL_PRD */</div><div class='del'>-#define ADIS16400_SMPL_PRD_TIME_BASE	(1&lt;&lt;7)</div><div class='del'>-#define ADIS16400_SMPL_PRD_DIV_MASK	0x7F</div><div class='del'>-</div><div class='del'>-/* DIAG_STAT */</div><div class='del'>-#define ADIS16400_DIAG_STAT_ZACCL_FAIL	15</div><div class='del'>-#define ADIS16400_DIAG_STAT_YACCL_FAIL	14</div><div class='del'>-#define ADIS16400_DIAG_STAT_XACCL_FAIL	13</div><div class='del'>-#define ADIS16400_DIAG_STAT_XGYRO_FAIL	12</div><div class='del'>-#define ADIS16400_DIAG_STAT_YGYRO_FAIL	11</div><div class='del'>-#define ADIS16400_DIAG_STAT_ZGYRO_FAIL	10</div><div class='del'>-#define ADIS16400_DIAG_STAT_ALARM2	9</div><div class='del'>-#define ADIS16400_DIAG_STAT_ALARM1	8</div><div class='del'>-#define ADIS16400_DIAG_STAT_FLASH_CHK	6</div><div class='del'>-#define ADIS16400_DIAG_STAT_SELF_TEST	5</div><div class='del'>-#define ADIS16400_DIAG_STAT_OVERFLOW	4</div><div class='del'>-#define ADIS16400_DIAG_STAT_SPI_FAIL	3</div><div class='del'>-#define ADIS16400_DIAG_STAT_FLASH_UPT	2</div><div class='del'>-#define ADIS16400_DIAG_STAT_POWER_HIGH	1</div><div class='del'>-#define ADIS16400_DIAG_STAT_POWER_LOW	0</div><div class='del'>-</div><div class='del'>-/* GLOB_CMD */</div><div class='del'>-#define ADIS16400_GLOB_CMD_SW_RESET	(1&lt;&lt;7)</div><div class='del'>-#define ADIS16400_GLOB_CMD_P_AUTO_NULL	(1&lt;&lt;4)</div><div class='del'>-#define ADIS16400_GLOB_CMD_FLASH_UPD	(1&lt;&lt;3)</div><div class='del'>-#define ADIS16400_GLOB_CMD_DAC_LATCH	(1&lt;&lt;2)</div><div class='del'>-#define ADIS16400_GLOB_CMD_FAC_CALIB	(1&lt;&lt;1)</div><div class='del'>-#define ADIS16400_GLOB_CMD_AUTO_NULL	(1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-/* SLP_CNT */</div><div class='del'>-#define ADIS16400_SLP_CNT_POWER_OFF	(1&lt;&lt;8)</div><div class='del'>-</div><div class='del'>-#define ADIS16334_RATE_DIV_SHIFT 8</div><div class='del'>-#define ADIS16334_RATE_INT_CLK BIT(0)</div><div class='del'>-</div><div class='del'>-#define ADIS16400_SPI_SLOW	(u32)(300 * 1000)</div><div class='del'>-#define ADIS16400_SPI_BURST	(u32)(1000 * 1000)</div><div class='del'>-#define ADIS16400_SPI_FAST	(u32)(2000 * 1000)</div><div class='del'>-</div><div class='del'>-#define ADIS16400_HAS_PROD_ID		BIT(0)</div><div class='del'>-#define ADIS16400_NO_BURST		BIT(1)</div><div class='del'>-#define ADIS16400_HAS_SLOW_MODE		BIT(2)</div><div class='del'>-#define ADIS16400_HAS_SERIAL_NUMBER	BIT(3)</div><div class='del'>-#define ADIS16400_BURST_DIAG_STAT	BIT(4)</div><div class='del'>-</div><div class='del'>-struct adis16400_state;</div><div class='del'>-</div><div class='del'>-struct adis16400_chip_info {</div><div class='del'>-	const struct iio_chan_spec *channels;</div><div class='del'>-	const int num_channels;</div><div class='del'>-	const long flags;</div><div class='del'>-	unsigned int gyro_scale_micro;</div><div class='del'>-	unsigned int accel_scale_micro;</div><div class='del'>-	int temp_scale_nano;</div><div class='del'>-	int temp_offset;</div><div class='del'>-	int (*set_freq)(struct adis16400_state *st, unsigned int freq);</div><div class='del'>-	int (*get_freq)(struct adis16400_state *st);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct adis16400_state - device instance specific data</div><div class='del'>- * @variant:	chip variant info</div><div class='del'>- * @filt_int:	integer part of requested filter frequency</div><div class='del'>- * @adis:	adis device</div><div class='del'>- **/</div><div class='del'>-struct adis16400_state {</div><div class='del'>-	struct adis16400_chip_info	*variant;</div><div class='del'>-	int				filt_int;</div><div class='del'>-</div><div class='del'>-	struct adis adis;</div><div class='del'>-	unsigned long avail_scan_mask[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* At the moment triggers are only used for ring buffer</div><div class='del'>- * filling. This may change!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ADIS16400_SCAN_SUPPLY,</div><div class='del'>-	ADIS16400_SCAN_GYRO_X,</div><div class='del'>-	ADIS16400_SCAN_GYRO_Y,</div><div class='del'>-	ADIS16400_SCAN_GYRO_Z,</div><div class='del'>-	ADIS16400_SCAN_ACC_X,</div><div class='del'>-	ADIS16400_SCAN_ACC_Y,</div><div class='del'>-	ADIS16400_SCAN_ACC_Z,</div><div class='del'>-	ADIS16400_SCAN_MAGN_X,</div><div class='del'>-	ADIS16400_SCAN_MAGN_Y,</div><div class='del'>-	ADIS16400_SCAN_MAGN_Z,</div><div class='del'>-	ADIS16400_SCAN_BARO,</div><div class='del'>-	ADIS16350_SCAN_TEMP_X,</div><div class='del'>-	ADIS16350_SCAN_TEMP_Y,</div><div class='del'>-	ADIS16350_SCAN_TEMP_Z,</div><div class='del'>-	ADIS16300_SCAN_INCLI_X,</div><div class='del'>-	ADIS16300_SCAN_INCLI_Y,</div><div class='del'>-	ADIS16400_SCAN_ADC,</div><div class='del'>-	ADIS16400_SCAN_TIMESTAMP,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IIO_BUFFER</div><div class='del'>-</div><div class='del'>-ssize_t adis16400_read_data_from_ring(struct device *dev,</div><div class='del'>-				      struct device_attribute *attr,</div><div class='del'>-				      char *buf);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int adis16400_update_scan_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const unsigned long *scan_mask);</div><div class='del'>-irqreturn_t adis16400_trigger_handler(int irq, void *p);</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_IIO_BUFFER */</div><div class='del'>-</div><div class='del'>-#define adis16400_update_scan_mode NULL</div><div class='del'>-#define adis16400_trigger_handler NULL</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_IIO_BUFFER */</div><div class='del'>-</div><div class='del'>-#endif /* SPI_ADIS16400_H_ */</div><div class='head'>diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c<br/>deleted file mode 100644<br/>index e70a5339acb1..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis16400_buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16400_buffer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/spi/spi.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/iio/iio.h&gt;</div><div class='del'>-#include &lt;linux/iio/buffer.h&gt;</div><div class='del'>-#include &lt;linux/iio/triggered_buffer.h&gt;</div><div class='del'>-#include &lt;linux/iio/trigger_consumer.h&gt;</div><div class='del'>-</div><div class='del'>-#include "adis16400.h"</div><div class='del'>-</div><div class='del'>-int adis16400_update_scan_mode(struct iio_dev *indio_dev,</div><div class='del'>-	const unsigned long *scan_mask)</div><div class='del'>-{</div><div class='del'>-	struct adis16400_state *st = iio_priv(indio_dev);</div><div class='del'>-	struct adis *adis = &amp;st-&gt;adis;</div><div class='del'>-	unsigned int burst_length;</div><div class='del'>-	u8 *tx;</div><div class='del'>-</div><div class='del'>-	if (st-&gt;variant-&gt;flags &amp; ADIS16400_NO_BURST)</div><div class='del'>-		return adis_update_scan_mode(indio_dev, scan_mask);</div><div class='del'>-</div><div class='del'>-	kfree(adis-&gt;xfer);</div><div class='del'>-	kfree(adis-&gt;buffer);</div><div class='del'>-</div><div class='del'>-	/* All but the timestamp channel */</div><div class='del'>-	burst_length = (indio_dev-&gt;num_channels - 1) * sizeof(u16);</div><div class='del'>-	if (st-&gt;variant-&gt;flags &amp; ADIS16400_BURST_DIAG_STAT)</div><div class='del'>-		burst_length += sizeof(u16);</div><div class='del'>-</div><div class='del'>-	adis-&gt;xfer = kcalloc(2, sizeof(*adis-&gt;xfer), GFP_KERNEL);</div><div class='del'>-	if (!adis-&gt;xfer)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	adis-&gt;buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL);</div><div class='del'>-	if (!adis-&gt;buffer)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	tx = adis-&gt;buffer + burst_length;</div><div class='del'>-	tx[0] = ADIS_READ_REG(ADIS16400_GLOB_CMD);</div><div class='del'>-	tx[1] = 0;</div><div class='del'>-</div><div class='del'>-	adis-&gt;xfer[0].tx_buf = tx;</div><div class='del'>-	adis-&gt;xfer[0].bits_per_word = 8;</div><div class='del'>-	adis-&gt;xfer[0].len = 2;</div><div class='del'>-	adis-&gt;xfer[1].rx_buf = adis-&gt;buffer;</div><div class='del'>-	adis-&gt;xfer[1].bits_per_word = 8;</div><div class='del'>-	adis-&gt;xfer[1].len = burst_length;</div><div class='del'>-</div><div class='del'>-	spi_message_init(&amp;adis-&gt;msg);</div><div class='del'>-	spi_message_add_tail(&amp;adis-&gt;xfer[0], &amp;adis-&gt;msg);</div><div class='del'>-	spi_message_add_tail(&amp;adis-&gt;xfer[1], &amp;adis-&gt;msg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t adis16400_trigger_handler(int irq, void *p)</div><div class='del'>-{</div><div class='del'>-	struct iio_poll_func *pf = p;</div><div class='del'>-	struct iio_dev *indio_dev = pf-&gt;indio_dev;</div><div class='del'>-	struct adis16400_state *st = iio_priv(indio_dev);</div><div class='del'>-	struct adis *adis = &amp;st-&gt;adis;</div><div class='del'>-	u32 old_speed_hz = st-&gt;adis.spi-&gt;max_speed_hz;</div><div class='del'>-	void *buffer;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!adis-&gt;buffer)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!(st-&gt;variant-&gt;flags &amp; ADIS16400_NO_BURST) &amp;&amp;</div><div class='del'>-		st-&gt;adis.spi-&gt;max_speed_hz &gt; ADIS16400_SPI_BURST) {</div><div class='del'>-		st-&gt;adis.spi-&gt;max_speed_hz = ADIS16400_SPI_BURST;</div><div class='del'>-		spi_setup(st-&gt;adis.spi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = spi_sync(adis-&gt;spi, &amp;adis-&gt;msg);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(&amp;adis-&gt;spi-&gt;dev, "Failed to read data: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	if (!(st-&gt;variant-&gt;flags &amp; ADIS16400_NO_BURST)) {</div><div class='del'>-		st-&gt;adis.spi-&gt;max_speed_hz = old_speed_hz;</div><div class='del'>-		spi_setup(st-&gt;adis.spi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (st-&gt;variant-&gt;flags &amp; ADIS16400_BURST_DIAG_STAT)</div><div class='del'>-		buffer = adis-&gt;buffer + sizeof(u16);</div><div class='del'>-	else</div><div class='del'>-		buffer = adis-&gt;buffer;</div><div class='del'>-</div><div class='del'>-	iio_push_to_buffers_with_timestamp(indio_dev, buffer,</div><div class='del'>-		pf-&gt;timestamp);</div><div class='del'>-</div><div class='del'>-	iio_trigger_notify_done(indio_dev-&gt;trig);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c<br/>index a27fe208f3ae..ab137c1bbe7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis16480.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis16480.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis16480.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/adis16480.c</a></div><div class='hunk'>@@ -9,6 +9,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.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='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -97,6 +100,12 @@</div><div class='ctx'> #define ADIS16480_REG_FIRM_DM			ADIS16480_REG(0x03, 0x7A)</div><div class='ctx'> #define ADIS16480_REG_FIRM_Y			ADIS16480_REG(0x03, 0x7C)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * External clock scaling in PPS mode.</div><div class='add'>+ * Available only for ADIS1649x devices</div><div class='add'>+ */</div><div class='add'>+#define ADIS16495_REG_SYNC_SCALE		ADIS16480_REG(0x03, 0x10)</div><div class='add'>+</div><div class='ctx'> #define ADIS16480_REG_SERIAL_NUM		ADIS16480_REG(0x04, 0x20)</div><div class='ctx'> </div><div class='ctx'> /* Each filter coefficent bank spans two pages */</div><div class='hunk'>@@ -107,6 +116,20 @@</div><div class='ctx'> #define ADIS16480_FIR_COEF_C(x)			ADIS16480_FIR_COEF(0x09, (x))</div><div class='ctx'> #define ADIS16480_FIR_COEF_D(x)			ADIS16480_FIR_COEF(0x0B, (x))</div><div class='ctx'> </div><div class='add'>+/* ADIS16480_REG_FNCTIO_CTRL */</div><div class='add'>+#define ADIS16480_DRDY_SEL_MSK		GENMASK(1, 0)</div><div class='add'>+#define ADIS16480_DRDY_SEL(x)		FIELD_PREP(ADIS16480_DRDY_SEL_MSK, x)</div><div class='add'>+#define ADIS16480_DRDY_POL_MSK		BIT(2)</div><div class='add'>+#define ADIS16480_DRDY_POL(x)		FIELD_PREP(ADIS16480_DRDY_POL_MSK, x)</div><div class='add'>+#define ADIS16480_DRDY_EN_MSK		BIT(3)</div><div class='add'>+#define ADIS16480_DRDY_EN(x)		FIELD_PREP(ADIS16480_DRDY_EN_MSK, x)</div><div class='add'>+#define ADIS16480_SYNC_SEL_MSK		GENMASK(5, 4)</div><div class='add'>+#define ADIS16480_SYNC_SEL(x)		FIELD_PREP(ADIS16480_SYNC_SEL_MSK, x)</div><div class='add'>+#define ADIS16480_SYNC_EN_MSK		BIT(7)</div><div class='add'>+#define ADIS16480_SYNC_EN(x)		FIELD_PREP(ADIS16480_SYNC_EN_MSK, x)</div><div class='add'>+#define ADIS16480_SYNC_MODE_MSK		BIT(8)</div><div class='add'>+#define ADIS16480_SYNC_MODE(x)		FIELD_PREP(ADIS16480_SYNC_MODE_MSK, x)</div><div class='add'>+</div><div class='ctx'> struct adis16480_chip_info {</div><div class='ctx'> 	unsigned int num_channels;</div><div class='ctx'> 	const struct iio_chan_spec *channels;</div><div class='hunk'>@@ -114,12 +137,40 @@ struct adis16480_chip_info {</div><div class='ctx'> 	unsigned int gyro_max_scale;</div><div class='ctx'> 	unsigned int accel_max_val;</div><div class='ctx'> 	unsigned int accel_max_scale;</div><div class='add'>+	unsigned int temp_scale;</div><div class='add'>+	unsigned int int_clk;</div><div class='add'>+	unsigned int max_dec_rate;</div><div class='add'>+	const unsigned int *filter_freqs;</div><div class='add'>+	bool has_pps_clk_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum adis16480_int_pin {</div><div class='add'>+	ADIS16480_PIN_DIO1,</div><div class='add'>+	ADIS16480_PIN_DIO2,</div><div class='add'>+	ADIS16480_PIN_DIO3,</div><div class='add'>+	ADIS16480_PIN_DIO4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum adis16480_clock_mode {</div><div class='add'>+	ADIS16480_CLK_SYNC,</div><div class='add'>+	ADIS16480_CLK_PPS,</div><div class='add'>+	ADIS16480_CLK_INT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct adis16480 {</div><div class='ctx'> 	const struct adis16480_chip_info *chip_info;</div><div class='ctx'> </div><div class='ctx'> 	struct adis adis;</div><div class='add'>+	struct clk *ext_clk;</div><div class='add'>+	enum adis16480_clock_mode clk_mode;</div><div class='add'>+	unsigned int clk_freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const adis16480_int_pin_names[4] = {</div><div class='add'>+	[ADIS16480_PIN_DIO1] = "DIO1",</div><div class='add'>+	[ADIS16480_PIN_DIO2] = "DIO2",</div><div class='add'>+	[ADIS16480_PIN_DIO3] = "DIO3",</div><div class='add'>+	[ADIS16480_PIN_DIO4] = "DIO4",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='hunk'>@@ -268,20 +319,34 @@ static int adis16480_debugfs_init(struct iio_dev *indio_dev)</div><div class='ctx'> static int adis16480_set_freq(struct iio_dev *indio_dev, int val, int val2)</div><div class='ctx'> {</div><div class='ctx'> 	struct adis16480 *st = iio_priv(indio_dev);</div><div class='del'>-	unsigned int t;</div><div class='add'>+	unsigned int t, reg;</div><div class='ctx'> </div><div class='ctx'> 	t =  val * 1000 + val2 / 1000;</div><div class='ctx'> 	if (t &lt;= 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	t = 2460000 / t;</div><div class='del'>-	if (t &gt; 2048)</div><div class='del'>-		t = 2048;</div><div class='add'>+	/*</div><div class='add'>+	 * When using PPS mode, the rate of data collection is equal to the</div><div class='add'>+	 * product of the external clock frequency and the scale factor in the</div><div class='add'>+	 * SYNC_SCALE register.</div><div class='add'>+	 * When using sync mode, or internal clock, the output data rate is</div><div class='add'>+	 * equal with  the clock frequency divided by DEC_RATE + 1.</div><div class='add'>+	 */</div><div class='add'>+	if (st-&gt;clk_mode == ADIS16480_CLK_PPS) {</div><div class='add'>+		t = t / st-&gt;clk_freq;</div><div class='add'>+		reg = ADIS16495_REG_SYNC_SCALE;</div><div class='add'>+	} else {</div><div class='add'>+		t = st-&gt;clk_freq / t;</div><div class='add'>+		reg = ADIS16480_REG_DEC_RATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (t &gt; st-&gt;chip_info-&gt;max_dec_rate)</div><div class='add'>+		t = st-&gt;chip_info-&gt;max_dec_rate;</div><div class='ctx'> </div><div class='del'>-	if (t != 0)</div><div class='add'>+	if ((t != 0) &amp;&amp; (st-&gt;clk_mode != ADIS16480_CLK_PPS))</div><div class='ctx'> 		t--;</div><div class='ctx'> </div><div class='del'>-	return adis_write_reg_16(&amp;st-&gt;adis, ADIS16480_REG_DEC_RATE, t);</div><div class='add'>+	return adis_write_reg_16(&amp;st-&gt;adis, reg, t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int adis16480_get_freq(struct iio_dev *indio_dev, int *val, int *val2)</div><div class='hunk'>@@ -290,12 +355,29 @@ static int adis16480_get_freq(struct iio_dev *indio_dev, int *val, int *val2)</div><div class='ctx'> 	uint16_t t;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned freq;</div><div class='add'>+	unsigned int reg;</div><div class='ctx'> </div><div class='del'>-	ret = adis_read_reg_16(&amp;st-&gt;adis, ADIS16480_REG_DEC_RATE, &amp;t);</div><div class='add'>+	if (st-&gt;clk_mode == ADIS16480_CLK_PPS)</div><div class='add'>+		reg = ADIS16495_REG_SYNC_SCALE;</div><div class='add'>+	else</div><div class='add'>+		reg = ADIS16480_REG_DEC_RATE;</div><div class='add'>+</div><div class='add'>+	ret = adis_read_reg_16(&amp;st-&gt;adis, reg, &amp;t);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	freq = 2460000 / (t + 1);</div><div class='add'>+	/*</div><div class='add'>+	 * When using PPS mode, the rate of data collection is equal to the</div><div class='add'>+	 * product of the external clock frequency and the scale factor in the</div><div class='add'>+	 * SYNC_SCALE register.</div><div class='add'>+	 * When using sync mode, or internal clock, the output data rate is</div><div class='add'>+	 * equal with  the clock frequency divided by DEC_RATE + 1.</div><div class='add'>+	 */</div><div class='add'>+	if (st-&gt;clk_mode == ADIS16480_CLK_PPS)</div><div class='add'>+		freq = st-&gt;clk_freq * t;</div><div class='add'>+	else</div><div class='add'>+		freq = st-&gt;clk_freq / (t + 1);</div><div class='add'>+</div><div class='ctx'> 	*val = freq / 1000;</div><div class='ctx'> 	*val2 = (freq % 1000) * 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -425,6 +507,13 @@ static const unsigned int adis16480_def_filter_freqs[] = {</div><div class='ctx'> 	63,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const unsigned int adis16495_def_filter_freqs[] = {</div><div class='add'>+	300,</div><div class='add'>+	100,</div><div class='add'>+	300,</div><div class='add'>+	100,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const unsigned int ad16480_filter_data[][2] = {</div><div class='ctx'> 	[ADIS16480_SCAN_GYRO_X]		= { ADIS16480_REG_FILTER_BNK0, 0 },</div><div class='ctx'> 	[ADIS16480_SCAN_GYRO_Y]		= { ADIS16480_REG_FILTER_BNK0, 3 },</div><div class='hunk'>@@ -456,7 +545,7 @@ static int adis16480_get_filter_freq(struct iio_dev *indio_dev,</div><div class='ctx'> 	if (!(val &amp; enable_mask))</div><div class='ctx'> 		*freq = 0;</div><div class='ctx'> 	else</div><div class='del'>-		*freq = adis16480_def_filter_freqs[(val &gt;&gt; offset) &amp; 0x3];</div><div class='add'>+		*freq = st-&gt;chip_info-&gt;filter_freqs[(val &gt;&gt; offset) &amp; 0x3];</div><div class='ctx'> </div><div class='ctx'> 	return IIO_VAL_INT;</div><div class='ctx'> }</div><div class='hunk'>@@ -483,10 +572,10 @@ static int adis16480_set_filter_freq(struct iio_dev *indio_dev,</div><div class='ctx'> 		val &amp;= ~enable_mask;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		best_freq = 0;</div><div class='del'>-		best_diff = 310;</div><div class='add'>+		best_diff = st-&gt;chip_info-&gt;filter_freqs[0];</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(adis16480_def_filter_freqs); i++) {</div><div class='del'>-			if (adis16480_def_filter_freqs[i] &gt;= freq) {</div><div class='del'>-				diff = adis16480_def_filter_freqs[i] - freq;</div><div class='add'>+			if (st-&gt;chip_info-&gt;filter_freqs[i] &gt;= freq) {</div><div class='add'>+				diff = st-&gt;chip_info-&gt;filter_freqs[i] - freq;</div><div class='ctx'> 				if (diff &lt; best_diff) {</div><div class='ctx'> 					best_diff = diff;</div><div class='ctx'> 					best_freq = i;</div><div class='hunk'>@@ -506,6 +595,7 @@ static int adis16480_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 	const struct iio_chan_spec *chan, int *val, int *val2, long info)</div><div class='ctx'> {</div><div class='ctx'> 	struct adis16480 *st = iio_priv(indio_dev);</div><div class='add'>+	unsigned int temp;</div><div class='ctx'> </div><div class='ctx'> 	switch (info) {</div><div class='ctx'> 	case IIO_CHAN_INFO_RAW:</div><div class='hunk'>@@ -525,8 +615,13 @@ static int adis16480_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 			*val2 = 100; /* 0.0001 gauss */</div><div class='ctx'> 			return IIO_VAL_INT_PLUS_MICRO;</div><div class='ctx'> 		case IIO_TEMP:</div><div class='del'>-			*val = 5;</div><div class='del'>-			*val2 = 650000; /* 5.65 milli degree Celsius */</div><div class='add'>+			/*</div><div class='add'>+			 * +85 degrees Celsius = temp_max_scale</div><div class='add'>+			 * +25 degrees Celsius = 0</div><div class='add'>+			 * LSB, 25 degrees Celsius  = 60 / temp_max_scale</div><div class='add'>+			 */</div><div class='add'>+			*val = st-&gt;chip_info-&gt;temp_scale / 1000;</div><div class='add'>+			*val2 = (st-&gt;chip_info-&gt;temp_scale % 1000) * 1000;</div><div class='ctx'> 			return IIO_VAL_INT_PLUS_MICRO;</div><div class='ctx'> 		case IIO_PRESSURE:</div><div class='ctx'> 			*val = 0;</div><div class='hunk'>@@ -537,7 +632,8 @@ static int adis16480_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	case IIO_CHAN_INFO_OFFSET:</div><div class='ctx'> 		/* Only the temperature channel has a offset */</div><div class='del'>-		*val = 4425; /* 25 degree Celsius = 0x0000 */</div><div class='add'>+		temp = 25 * 1000000LL; /* 25 degree Celsius = 0x0000 */</div><div class='add'>+		*val = DIV_ROUND_CLOSEST_ULL(temp, st-&gt;chip_info-&gt;temp_scale);</div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='ctx'> 	case IIO_CHAN_INFO_CALIBBIAS:</div><div class='ctx'> 		return adis16480_get_calibbias(indio_dev, chan, val);</div><div class='hunk'>@@ -678,6 +774,12 @@ enum adis16480_variant {</div><div class='ctx'> 	ADIS16480,</div><div class='ctx'> 	ADIS16485,</div><div class='ctx'> 	ADIS16488,</div><div class='add'>+	ADIS16495_1,</div><div class='add'>+	ADIS16495_2,</div><div class='add'>+	ADIS16495_3,</div><div class='add'>+	ADIS16497_1,</div><div class='add'>+	ADIS16497_2,</div><div class='add'>+	ADIS16497_3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct adis16480_chip_info adis16480_chip_info[] = {</div><div class='hunk'>@@ -693,6 +795,10 @@ static const struct adis16480_chip_info adis16480_chip_info[] = {</div><div class='ctx'> 		.gyro_max_scale = 300,</div><div class='ctx'> 		.accel_max_val = IIO_M_S_2_TO_G(21973),</div><div class='ctx'> 		.accel_max_scale = 18,</div><div class='add'>+		.temp_scale = 5650, /* 5.65 milli degree Celsius */</div><div class='add'>+		.int_clk = 2460000,</div><div class='add'>+		.max_dec_rate = 2048,</div><div class='add'>+		.filter_freqs = adis16480_def_filter_freqs,</div><div class='ctx'> 	},</div><div class='ctx'> 	[ADIS16480] = {</div><div class='ctx'> 		.channels = adis16480_channels,</div><div class='hunk'>@@ -701,6 +807,10 @@ static const struct adis16480_chip_info adis16480_chip_info[] = {</div><div class='ctx'> 		.gyro_max_scale = 450,</div><div class='ctx'> 		.accel_max_val = IIO_M_S_2_TO_G(12500),</div><div class='ctx'> 		.accel_max_scale = 10,</div><div class='add'>+		.temp_scale = 5650, /* 5.65 milli degree Celsius */</div><div class='add'>+		.int_clk = 2460000,</div><div class='add'>+		.max_dec_rate = 2048,</div><div class='add'>+		.filter_freqs = adis16480_def_filter_freqs,</div><div class='ctx'> 	},</div><div class='ctx'> 	[ADIS16485] = {</div><div class='ctx'> 		.channels = adis16485_channels,</div><div class='hunk'>@@ -709,6 +819,10 @@ static const struct adis16480_chip_info adis16480_chip_info[] = {</div><div class='ctx'> 		.gyro_max_scale = 450,</div><div class='ctx'> 		.accel_max_val = IIO_M_S_2_TO_G(20000),</div><div class='ctx'> 		.accel_max_scale = 5,</div><div class='add'>+		.temp_scale = 5650, /* 5.65 milli degree Celsius */</div><div class='add'>+		.int_clk = 2460000,</div><div class='add'>+		.max_dec_rate = 2048,</div><div class='add'>+		.filter_freqs = adis16480_def_filter_freqs,</div><div class='ctx'> 	},</div><div class='ctx'> 	[ADIS16488] = {</div><div class='ctx'> 		.channels = adis16480_channels,</div><div class='hunk'>@@ -717,6 +831,88 @@ static const struct adis16480_chip_info adis16480_chip_info[] = {</div><div class='ctx'> 		.gyro_max_scale = 450,</div><div class='ctx'> 		.accel_max_val = IIO_M_S_2_TO_G(22500),</div><div class='ctx'> 		.accel_max_scale = 18,</div><div class='add'>+		.temp_scale = 5650, /* 5.65 milli degree Celsius */</div><div class='add'>+		.int_clk = 2460000,</div><div class='add'>+		.max_dec_rate = 2048,</div><div class='add'>+		.filter_freqs = adis16480_def_filter_freqs,</div><div class='add'>+	},</div><div class='add'>+	[ADIS16495_1] = {</div><div class='add'>+		.channels = adis16485_channels,</div><div class='add'>+		.num_channels = ARRAY_SIZE(adis16485_channels),</div><div class='add'>+		.gyro_max_val = IIO_RAD_TO_DEGREE(20000),</div><div class='add'>+		.gyro_max_scale = 125,</div><div class='add'>+		.accel_max_val = IIO_M_S_2_TO_G(32000),</div><div class='add'>+		.accel_max_scale = 8,</div><div class='add'>+		.temp_scale = 12500, /* 12.5 milli degree Celsius */</div><div class='add'>+		.int_clk = 4250000,</div><div class='add'>+		.max_dec_rate = 4250,</div><div class='add'>+		.filter_freqs = adis16495_def_filter_freqs,</div><div class='add'>+		.has_pps_clk_mode = true,</div><div class='add'>+	},</div><div class='add'>+	[ADIS16495_2] = {</div><div class='add'>+		.channels = adis16485_channels,</div><div class='add'>+		.num_channels = ARRAY_SIZE(adis16485_channels),</div><div class='add'>+		.gyro_max_val = IIO_RAD_TO_DEGREE(18000),</div><div class='add'>+		.gyro_max_scale = 450,</div><div class='add'>+		.accel_max_val = IIO_M_S_2_TO_G(32000),</div><div class='add'>+		.accel_max_scale = 8,</div><div class='add'>+		.temp_scale = 12500, /* 12.5 milli degree Celsius */</div><div class='add'>+		.int_clk = 4250000,</div><div class='add'>+		.max_dec_rate = 4250,</div><div class='add'>+		.filter_freqs = adis16495_def_filter_freqs,</div><div class='add'>+		.has_pps_clk_mode = true,</div><div class='add'>+	},</div><div class='add'>+	[ADIS16495_3] = {</div><div class='add'>+		.channels = adis16485_channels,</div><div class='add'>+		.num_channels = ARRAY_SIZE(adis16485_channels),</div><div class='add'>+		.gyro_max_val = IIO_RAD_TO_DEGREE(20000),</div><div class='add'>+		.gyro_max_scale = 2000,</div><div class='add'>+		.accel_max_val = IIO_M_S_2_TO_G(32000),</div><div class='add'>+		.accel_max_scale = 8,</div><div class='add'>+		.temp_scale = 12500, /* 12.5 milli degree Celsius */</div><div class='add'>+		.int_clk = 4250000,</div><div class='add'>+		.max_dec_rate = 4250,</div><div class='add'>+		.filter_freqs = adis16495_def_filter_freqs,</div><div class='add'>+		.has_pps_clk_mode = true,</div><div class='add'>+	},</div><div class='add'>+	[ADIS16497_1] = {</div><div class='add'>+		.channels = adis16485_channels,</div><div class='add'>+		.num_channels = ARRAY_SIZE(adis16485_channels),</div><div class='add'>+		.gyro_max_val = IIO_RAD_TO_DEGREE(20000),</div><div class='add'>+		.gyro_max_scale = 125,</div><div class='add'>+		.accel_max_val = IIO_M_S_2_TO_G(32000),</div><div class='add'>+		.accel_max_scale = 40,</div><div class='add'>+		.temp_scale = 12500, /* 12.5 milli degree Celsius */</div><div class='add'>+		.int_clk = 4250000,</div><div class='add'>+		.max_dec_rate = 4250,</div><div class='add'>+		.filter_freqs = adis16495_def_filter_freqs,</div><div class='add'>+		.has_pps_clk_mode = true,</div><div class='add'>+	},</div><div class='add'>+	[ADIS16497_2] = {</div><div class='add'>+		.channels = adis16485_channels,</div><div class='add'>+		.num_channels = ARRAY_SIZE(adis16485_channels),</div><div class='add'>+		.gyro_max_val = IIO_RAD_TO_DEGREE(18000),</div><div class='add'>+		.gyro_max_scale = 450,</div><div class='add'>+		.accel_max_val = IIO_M_S_2_TO_G(32000),</div><div class='add'>+		.accel_max_scale = 40,</div><div class='add'>+		.temp_scale = 12500, /* 12.5 milli degree Celsius */</div><div class='add'>+		.int_clk = 4250000,</div><div class='add'>+		.max_dec_rate = 4250,</div><div class='add'>+		.filter_freqs = adis16495_def_filter_freqs,</div><div class='add'>+		.has_pps_clk_mode = true,</div><div class='add'>+	},</div><div class='add'>+	[ADIS16497_3] = {</div><div class='add'>+		.channels = adis16485_channels,</div><div class='add'>+		.num_channels = ARRAY_SIZE(adis16485_channels),</div><div class='add'>+		.gyro_max_val = IIO_RAD_TO_DEGREE(20000),</div><div class='add'>+		.gyro_max_scale = 2000,</div><div class='add'>+		.accel_max_val = IIO_M_S_2_TO_G(32000),</div><div class='add'>+		.accel_max_scale = 40,</div><div class='add'>+		.temp_scale = 12500, /* 12.5 milli degree Celsius */</div><div class='add'>+		.int_clk = 4250000,</div><div class='add'>+		.max_dec_rate = 4250,</div><div class='add'>+		.filter_freqs = adis16495_def_filter_freqs,</div><div class='add'>+		.has_pps_clk_mode = true,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -741,8 +937,17 @@ static int adis16480_stop_device(struct iio_dev *indio_dev)</div><div class='ctx'> </div><div class='ctx'> static int adis16480_enable_irq(struct adis *adis, bool enable)</div><div class='ctx'> {</div><div class='del'>-	return adis_write_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL,</div><div class='del'>-		enable ? BIT(3) : 0);</div><div class='add'>+	uint16_t val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adis_read_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~ADIS16480_DRDY_EN_MSK;</div><div class='add'>+	val |= ADIS16480_DRDY_EN(enable);</div><div class='add'>+</div><div class='add'>+	return adis_write_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int adis16480_initial_setup(struct iio_dev *indio_dev)</div><div class='hunk'>@@ -826,6 +1031,156 @@ static const struct adis_data adis16480_data = {</div><div class='ctx'> 	.enable_irq = adis16480_enable_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int adis16480_config_irq_pin(struct device_node *of_node,</div><div class='add'>+				    struct adis16480 *st)</div><div class='add'>+{</div><div class='add'>+	struct irq_data *desc;</div><div class='add'>+	enum adis16480_int_pin pin;</div><div class='add'>+	unsigned int irq_type;</div><div class='add'>+	uint16_t val;</div><div class='add'>+	int i, irq = 0;</div><div class='add'>+</div><div class='add'>+	desc = irq_get_irq_data(st-&gt;adis.spi-&gt;irq);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		dev_err(&amp;st-&gt;adis.spi-&gt;dev, "Could not find IRQ %d\n", irq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable data ready since the default after reset is on */</div><div class='add'>+	val = ADIS16480_DRDY_EN(0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the interrupt from the devicetre by reading the interrupt-names</div><div class='add'>+	 * property. If it is not specified, use DIO1 pin as default.</div><div class='add'>+	 * According to the datasheet, the factory default assigns DIO2 as data</div><div class='add'>+	 * ready signal. However, in the previous versions of the driver, DIO1</div><div class='add'>+	 * pin was used. So, we should leave it as is since some devices might</div><div class='add'>+	 * be expecting the interrupt on the wrong physical pin.</div><div class='add'>+	 */</div><div class='add'>+	pin = ADIS16480_PIN_DIO1;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(adis16480_int_pin_names); i++) {</div><div class='add'>+		irq = of_irq_get_byname(of_node, adis16480_int_pin_names[i]);</div><div class='add'>+		if (irq &gt; 0) {</div><div class='add'>+			pin = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val |= ADIS16480_DRDY_SEL(pin);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get the interrupt line behaviour. The data ready polarity can be</div><div class='add'>+	 * configured as positive or negative, corresponding to</div><div class='add'>+	 * IRQF_TRIGGER_RISING or IRQF_TRIGGER_FALLING respectively.</div><div class='add'>+	 */</div><div class='add'>+	irq_type = irqd_get_trigger_type(desc);</div><div class='add'>+	if (irq_type == IRQF_TRIGGER_RISING) { /* Default */</div><div class='add'>+		val |= ADIS16480_DRDY_POL(1);</div><div class='add'>+	} else if (irq_type == IRQF_TRIGGER_FALLING) {</div><div class='add'>+		val |= ADIS16480_DRDY_POL(0);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(&amp;st-&gt;adis.spi-&gt;dev,</div><div class='add'>+			"Invalid interrupt type 0x%x specified\n", irq_type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* Write the data ready configuration to the FNCTIO_CTRL register */</div><div class='add'>+	return adis_write_reg_16(&amp;st-&gt;adis, ADIS16480_REG_FNCTIO_CTRL, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adis16480_of_get_ext_clk_pin(struct adis16480 *st,</div><div class='add'>+					struct device_node *of_node)</div><div class='add'>+{</div><div class='add'>+	const char *ext_clk_pin;</div><div class='add'>+	enum adis16480_int_pin pin;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pin = ADIS16480_PIN_DIO2;</div><div class='add'>+	if (of_property_read_string(of_node, "adi,ext-clk-pin", &amp;ext_clk_pin))</div><div class='add'>+		goto clk_input_not_found;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(adis16480_int_pin_names); i++) {</div><div class='add'>+		if (strcasecmp(ext_clk_pin, adis16480_int_pin_names[i]) == 0)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+clk_input_not_found:</div><div class='add'>+	dev_info(&amp;st-&gt;adis.spi-&gt;dev,</div><div class='add'>+		"clk input line not specified, using DIO2\n");</div><div class='add'>+	return pin;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adis16480_ext_clk_config(struct adis16480 *st,</div><div class='add'>+				    struct device_node *of_node,</div><div class='add'>+				    bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int mode, mask;</div><div class='add'>+	enum adis16480_int_pin pin;</div><div class='add'>+	uint16_t val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adis_read_reg_16(&amp;st-&gt;adis, ADIS16480_REG_FNCTIO_CTRL, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pin = adis16480_of_get_ext_clk_pin(st, of_node);</div><div class='add'>+	/*</div><div class='add'>+	 * Each DIOx pin supports only one function at a time. When a single pin</div><div class='add'>+	 * has two assignments, the enable bit for a lower priority function</div><div class='add'>+	 * automatically resets to zero (disabling the lower priority function).</div><div class='add'>+	 */</div><div class='add'>+	if (pin == ADIS16480_DRDY_SEL(val))</div><div class='add'>+		dev_warn(&amp;st-&gt;adis.spi-&gt;dev,</div><div class='add'>+			"DIO%x pin supports only one function at a time\n",</div><div class='add'>+			pin + 1);</div><div class='add'>+</div><div class='add'>+	mode = ADIS16480_SYNC_EN(enable) | ADIS16480_SYNC_SEL(pin);</div><div class='add'>+	mask = ADIS16480_SYNC_EN_MSK | ADIS16480_SYNC_SEL_MSK;</div><div class='add'>+	/* Only ADIS1649x devices support pps ext clock mode */</div><div class='add'>+	if (st-&gt;chip_info-&gt;has_pps_clk_mode) {</div><div class='add'>+		mode |= ADIS16480_SYNC_MODE(st-&gt;clk_mode);</div><div class='add'>+		mask |= ADIS16480_SYNC_MODE_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+	val |= mode;</div><div class='add'>+</div><div class='add'>+	ret = adis_write_reg_16(&amp;st-&gt;adis, ADIS16480_REG_FNCTIO_CTRL, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return clk_prepare_enable(st-&gt;ext_clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adis16480_get_ext_clocks(struct adis16480 *st)</div><div class='add'>+{</div><div class='add'>+	st-&gt;clk_mode = ADIS16480_CLK_INT;</div><div class='add'>+	st-&gt;ext_clk = devm_clk_get(&amp;st-&gt;adis.spi-&gt;dev, "sync");</div><div class='add'>+	if (!IS_ERR_OR_NULL(st-&gt;ext_clk)) {</div><div class='add'>+		st-&gt;clk_mode = ADIS16480_CLK_SYNC;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (PTR_ERR(st-&gt;ext_clk) != -ENOENT) {</div><div class='add'>+		dev_err(&amp;st-&gt;adis.spi-&gt;dev, "failed to get ext clk\n");</div><div class='add'>+		return PTR_ERR(st-&gt;ext_clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (st-&gt;chip_info-&gt;has_pps_clk_mode) {</div><div class='add'>+		st-&gt;ext_clk = devm_clk_get(&amp;st-&gt;adis.spi-&gt;dev, "pps");</div><div class='add'>+		if (!IS_ERR_OR_NULL(st-&gt;ext_clk)) {</div><div class='add'>+			st-&gt;clk_mode = ADIS16480_CLK_PPS;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (PTR_ERR(st-&gt;ext_clk) != -ENOENT) {</div><div class='add'>+			dev_err(&amp;st-&gt;adis.spi-&gt;dev, "failed to get ext clk\n");</div><div class='add'>+			return PTR_ERR(st-&gt;ext_clk);</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='ctx'> static int adis16480_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='hunk'>@@ -853,10 +1208,29 @@ static int adis16480_probe(struct spi_device *spi)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = adis_setup_buffer_and_trigger(&amp;st-&gt;adis, indio_dev, NULL);</div><div class='add'>+	ret = adis16480_config_irq_pin(spi-&gt;dev.of_node, st);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = adis16480_get_ext_clocks(st);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (!IS_ERR_OR_NULL(st-&gt;ext_clk)) {</div><div class='add'>+		ret = adis16480_ext_clk_config(st, spi-&gt;dev.of_node, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		st-&gt;clk_freq = clk_get_rate(st-&gt;ext_clk);</div><div class='add'>+		st-&gt;clk_freq *= 1000; /* micro */</div><div class='add'>+	} else {</div><div class='add'>+		st-&gt;clk_freq = st-&gt;chip_info-&gt;int_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = adis_setup_buffer_and_trigger(&amp;st-&gt;adis, indio_dev, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_clk_disable_unprepare;</div><div class='add'>+</div><div class='ctx'> 	ret = adis16480_initial_setup(indio_dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_cleanup_buffer;</div><div class='hunk'>@@ -873,6 +1247,8 @@ error_stop_device:</div><div class='ctx'> 	adis16480_stop_device(indio_dev);</div><div class='ctx'> error_cleanup_buffer:</div><div class='ctx'> 	adis_cleanup_buffer_and_trigger(&amp;st-&gt;adis, indio_dev);</div><div class='add'>+error_clk_disable_unprepare:</div><div class='add'>+	clk_disable_unprepare(st-&gt;ext_clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -885,6 +1261,7 @@ static int adis16480_remove(struct spi_device *spi)</div><div class='ctx'> 	adis16480_stop_device(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	adis_cleanup_buffer_and_trigger(&amp;st-&gt;adis, indio_dev);</div><div class='add'>+	clk_disable_unprepare(st-&gt;ext_clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -894,13 +1271,35 @@ static const struct spi_device_id adis16480_ids[] = {</div><div class='ctx'> 	{ "adis16480", ADIS16480 },</div><div class='ctx'> 	{ "adis16485", ADIS16485 },</div><div class='ctx'> 	{ "adis16488", ADIS16488 },</div><div class='add'>+	{ "adis16495-1", ADIS16495_1 },</div><div class='add'>+	{ "adis16495-2", ADIS16495_2 },</div><div class='add'>+	{ "adis16495-3", ADIS16495_3 },</div><div class='add'>+	{ "adis16497-1", ADIS16497_1 },</div><div class='add'>+	{ "adis16497-2", ADIS16497_2 },</div><div class='add'>+	{ "adis16497-3", ADIS16497_3 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(spi, adis16480_ids);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id adis16480_of_match[] = {</div><div class='add'>+	{ .compatible = "adi,adis16375" },</div><div class='add'>+	{ .compatible = "adi,adis16480" },</div><div class='add'>+	{ .compatible = "adi,adis16485" },</div><div class='add'>+	{ .compatible = "adi,adis16488" },</div><div class='add'>+	{ .compatible = "adi,adis16495-1" },</div><div class='add'>+	{ .compatible = "adi,adis16495-2" },</div><div class='add'>+	{ .compatible = "adi,adis16495-3" },</div><div class='add'>+	{ .compatible = "adi,adis16497-1" },</div><div class='add'>+	{ .compatible = "adi,adis16497-2" },</div><div class='add'>+	{ .compatible = "adi,adis16497-3" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, adis16480_of_match);</div><div class='add'>+</div><div class='ctx'> static struct spi_driver adis16480_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "adis16480",</div><div class='add'>+		.of_match_table = adis16480_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table = adis16480_ids,</div><div class='ctx'> 	.probe = adis16480_probe,</div><div class='head'>diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c<br/>index 76643c5571aa..3a7c970568dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis_buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/adis_buffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/adis_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/adis_buffer.c</a></div><div class='hunk'>@@ -20,6 +20,43 @@</div><div class='ctx'> #include &lt;linux/iio/triggered_buffer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/imu/adis.h&gt;</div><div class='ctx'> </div><div class='add'>+static int adis_update_scan_mode_burst(struct iio_dev *indio_dev,</div><div class='add'>+	const unsigned long *scan_mask)</div><div class='add'>+{</div><div class='add'>+	struct adis *adis = iio_device_get_drvdata(indio_dev);</div><div class='add'>+	unsigned int burst_length;</div><div class='add'>+	u8 *tx;</div><div class='add'>+</div><div class='add'>+	/* All but the timestamp channel */</div><div class='add'>+	burst_length = (indio_dev-&gt;num_channels - 1) * sizeof(u16);</div><div class='add'>+	burst_length += adis-&gt;burst-&gt;extra_len;</div><div class='add'>+</div><div class='add'>+	adis-&gt;xfer = kcalloc(2, sizeof(*adis-&gt;xfer), GFP_KERNEL);</div><div class='add'>+	if (!adis-&gt;xfer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	adis-&gt;buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (!adis-&gt;buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tx = adis-&gt;buffer + burst_length;</div><div class='add'>+	tx[0] = ADIS_READ_REG(adis-&gt;burst-&gt;reg_cmd);</div><div class='add'>+	tx[1] = 0;</div><div class='add'>+</div><div class='add'>+	adis-&gt;xfer[0].tx_buf = tx;</div><div class='add'>+	adis-&gt;xfer[0].bits_per_word = 8;</div><div class='add'>+	adis-&gt;xfer[0].len = 2;</div><div class='add'>+	adis-&gt;xfer[1].rx_buf = adis-&gt;buffer;</div><div class='add'>+	adis-&gt;xfer[1].bits_per_word = 8;</div><div class='add'>+	adis-&gt;xfer[1].len = burst_length;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;adis-&gt;msg);</div><div class='add'>+	spi_message_add_tail(&amp;adis-&gt;xfer[0], &amp;adis-&gt;msg);</div><div class='add'>+	spi_message_add_tail(&amp;adis-&gt;xfer[1], &amp;adis-&gt;msg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int adis_update_scan_mode(struct iio_dev *indio_dev,</div><div class='ctx'> 	const unsigned long *scan_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -32,6 +69,9 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,</div><div class='ctx'> 	kfree(adis-&gt;xfer);</div><div class='ctx'> 	kfree(adis-&gt;buffer);</div><div class='ctx'> </div><div class='add'>+	if (adis-&gt;burst &amp;&amp; adis-&gt;burst-&gt;en)</div><div class='add'>+		return adis_update_scan_mode_burst(indio_dev, scan_mask);</div><div class='add'>+</div><div class='ctx'> 	scan_count = indio_dev-&gt;scan_bytes / 2;</div><div class='ctx'> </div><div class='ctx'> 	adis-&gt;xfer = kcalloc(scan_count + 1, sizeof(*adis-&gt;xfer), GFP_KERNEL);</div><div class='head'>diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c<br/>index 650de0fefb7b..6138a6d86afb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/inv_mpu6050/inv_mpu_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/inv_mpu6050/inv_mpu_core.c</a></div><div class='hunk'>@@ -796,12 +796,14 @@ static const struct iio_mount_matrix *</div><div class='ctx'> inv_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='ctx'> 		     const struct iio_chan_spec *chan)</div><div class='ctx'> {</div><div class='del'>-	return &amp;((struct inv_mpu6050_state *)iio_priv(indio_dev))-&gt;orientation;</div><div class='add'>+	struct inv_mpu6050_state *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iio_chan_spec_ext_info inv_ext_info[] = {</div><div class='ctx'> 	IIO_MOUNT_MATRIX(IIO_SHARED_BY_TYPE, inv_get_mount_matrix),</div><div class='del'>-	{ },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define INV_MPU6050_CHAN(_type, _channel2, _index)                    \</div><div class='hunk'>@@ -1021,8 +1023,8 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,</div><div class='ctx'> </div><div class='ctx'> 	pdata = dev_get_platdata(dev);</div><div class='ctx'> 	if (!pdata) {</div><div class='del'>-		result = of_iio_read_mount_matrix(dev, "mount-matrix",</div><div class='del'>-						  &amp;st-&gt;orientation);</div><div class='add'>+		result = iio_read_mount_matrix(dev, "mount-matrix",</div><div class='add'>+					       &amp;st-&gt;orientation);</div><div class='ctx'> 		if (result) {</div><div class='ctx'> 			dev_err(dev, "Failed to retrieve mounting matrix %d\n",</div><div class='ctx'> 				result);</div><div class='head'>diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig<br/>index 094fd006b63d..9e592973a8a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/st_lsm6dsx/Kconfig</a></div><div class='hunk'>@@ -9,7 +9,7 @@ config IIO_ST_LSM6DSX</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say yes here to build support for STMicroelectronics LSM6DSx imu</div><div class='ctx'> 	  sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm,</div><div class='del'>-	  ism330dlc, lsm6dso</div><div class='add'>+	  ism330dlc, lsm6dso, lsm6dsox, asm330lhh, lsm6dsr</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 st_lsm6dsx.</div><div class='head'>diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h<br/>index d1d8d07a0714..004a8a1a0027 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h</a></div><div class='hunk'>@@ -20,6 +20,9 @@</div><div class='ctx'> #define ST_LSM6DSM_DEV_NAME	"lsm6dsm"</div><div class='ctx'> #define ST_ISM330DLC_DEV_NAME	"ism330dlc"</div><div class='ctx'> #define ST_LSM6DSO_DEV_NAME	"lsm6dso"</div><div class='add'>+#define ST_ASM330LHH_DEV_NAME	"asm330lhh"</div><div class='add'>+#define ST_LSM6DSOX_DEV_NAME	"lsm6dsox"</div><div class='add'>+#define ST_LSM6DSR_DEV_NAME	"lsm6dsr"</div><div class='ctx'> </div><div class='ctx'> enum st_lsm6dsx_hw_id {</div><div class='ctx'> 	ST_LSM6DS3_ID,</div><div class='hunk'>@@ -28,6 +31,9 @@ enum st_lsm6dsx_hw_id {</div><div class='ctx'> 	ST_LSM6DSM_ID,</div><div class='ctx'> 	ST_ISM330DLC_ID,</div><div class='ctx'> 	ST_LSM6DSO_ID,</div><div class='add'>+	ST_ASM330LHH_ID,</div><div class='add'>+	ST_LSM6DSOX_ID,</div><div class='add'>+	ST_LSM6DSR_ID,</div><div class='ctx'> 	ST_LSM6DSX_MAX_ID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c<br/>index 2c0d3763405a..793598ee960a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'>  * (e.g. Gx, Gy, Gz, Ax, Ay, Az), then data are repeated depending on the</div><div class='ctx'>  * value of the decimation factor and ODR set for each FIFO data set.</div><div class='ctx'>  *</div><div class='del'>- * LSM6DSO: The FIFO buffer can be configured to store data from gyroscope and</div><div class='del'>- * accelerometer. Each sample is queued with a tag (1B) indicating data source</div><div class='del'>- * (gyroscope, accelerometer, hw timer).</div><div class='add'>+ * LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR: The FIFO buffer can be configured to</div><div class='add'>+ * store data from gyroscope and accelerometer. Each sample is queued with</div><div class='add'>+ * a tag (1B) indicating data source (gyroscope, accelerometer, hw timer).</div><div class='ctx'>  *</div><div class='ctx'>  * FIFO supported modes:</div><div class='ctx'>  *  - BYPASS: FIFO disabled</div><div class='hunk'>@@ -506,7 +506,7 @@ st_lsm6dsx_push_tagged_data(struct st_lsm6dsx_hw *hw, u8 tag,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * st_lsm6dsx_read_tagged_fifo() - LSM6DSO read FIFO routine</div><div class='add'>+ * st_lsm6dsx_read_tagged_fifo() - tagged hw FIFO read routine</div><div class='ctx'>  * @hw: Pointer to instance of struct st_lsm6dsx_hw.</div><div class='ctx'>  *</div><div class='ctx'>  * Read samples from the hw FIFO and push them to IIO buffers.</div><div class='hunk'>@@ -517,7 +517,6 @@ int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u16 pattern_len = hw-&gt;sip * ST_LSM6DSX_TAGGED_SAMPLE_SIZE;</div><div class='ctx'> 	u16 fifo_len, fifo_diff_mask;</div><div class='del'>-	struct st_lsm6dsx_sensor *acc_sensor, *gyro_sensor;</div><div class='ctx'> 	u8 iio_buff[ST_LSM6DSX_IIO_BUFF_SIZE], tag;</div><div class='ctx'> 	bool reset_ts = false;</div><div class='ctx'> 	int i, err, read_len;</div><div class='hunk'>@@ -539,9 +538,6 @@ int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw)</div><div class='ctx'> 	if (!fifo_len)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	acc_sensor = iio_priv(hw-&gt;iio_devs[ST_LSM6DSX_ID_ACC]);</div><div class='del'>-	gyro_sensor = iio_priv(hw-&gt;iio_devs[ST_LSM6DSX_ID_GYRO]);</div><div class='del'>-</div><div class='ctx'> 	for (read_len = 0; read_len &lt; fifo_len; read_len += pattern_len) {</div><div class='ctx'> 		err = st_lsm6dsx_read_block(hw,</div><div class='ctx'> 					    ST_LSM6DSX_REG_FIFO_OUT_TAG_ADDR,</div><div class='head'>diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c<br/>index 12e29dda9b98..cf82c9049945 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  *   - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000</div><div class='ctx'>  *   - FIFO size: 4KB</div><div class='ctx'>  *</div><div class='del'>- * - LSM6DSO</div><div class='add'>+ * - LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR</div><div class='ctx'>  *   - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416</div><div class='ctx'>  *   - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16</div><div class='ctx'>  *   - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000</div><div class='hunk'>@@ -62,37 +62,19 @@</div><div class='ctx'> #define ST_LSM6DSX_REG_INT2_ON_INT1_ADDR	0x13</div><div class='ctx'> #define ST_LSM6DSX_REG_INT2_ON_INT1_MASK	BIT(5)</div><div class='ctx'> </div><div class='del'>-#define ST_LSM6DSX_REG_ACC_ODR_ADDR		0x10</div><div class='del'>-#define ST_LSM6DSX_REG_ACC_ODR_MASK		GENMASK(7, 4)</div><div class='del'>-#define ST_LSM6DSX_REG_ACC_FS_ADDR		0x10</div><div class='del'>-#define ST_LSM6DSX_REG_ACC_FS_MASK		GENMASK(3, 2)</div><div class='ctx'> #define ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR		0x28</div><div class='ctx'> #define ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR		0x2a</div><div class='ctx'> #define ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR		0x2c</div><div class='ctx'> </div><div class='del'>-#define ST_LSM6DSX_REG_GYRO_ODR_ADDR		0x11</div><div class='del'>-#define ST_LSM6DSX_REG_GYRO_ODR_MASK		GENMASK(7, 4)</div><div class='del'>-#define ST_LSM6DSX_REG_GYRO_FS_ADDR		0x11</div><div class='del'>-#define ST_LSM6DSX_REG_GYRO_FS_MASK		GENMASK(3, 2)</div><div class='ctx'> #define ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR	0x22</div><div class='ctx'> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR	0x24</div><div class='ctx'> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR	0x26</div><div class='ctx'> </div><div class='del'>-#define ST_LSM6DSX_ACC_FS_2G_GAIN		IIO_G_TO_M_S_2(61)</div><div class='del'>-#define ST_LSM6DSX_ACC_FS_4G_GAIN		IIO_G_TO_M_S_2(122)</div><div class='del'>-#define ST_LSM6DSX_ACC_FS_8G_GAIN		IIO_G_TO_M_S_2(244)</div><div class='del'>-#define ST_LSM6DSX_ACC_FS_16G_GAIN		IIO_G_TO_M_S_2(488)</div><div class='del'>-</div><div class='del'>-#define ST_LSM6DSX_GYRO_FS_245_GAIN		IIO_DEGREE_TO_RAD(8750)</div><div class='del'>-#define ST_LSM6DSX_GYRO_FS_500_GAIN		IIO_DEGREE_TO_RAD(17500)</div><div class='del'>-#define ST_LSM6DSX_GYRO_FS_1000_GAIN		IIO_DEGREE_TO_RAD(35000)</div><div class='del'>-#define ST_LSM6DSX_GYRO_FS_2000_GAIN		IIO_DEGREE_TO_RAD(70000)</div><div class='del'>-</div><div class='ctx'> static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {</div><div class='ctx'> 	[ST_LSM6DSX_ID_ACC] = {</div><div class='ctx'> 		.reg = {</div><div class='del'>-			.addr = ST_LSM6DSX_REG_ACC_ODR_ADDR,</div><div class='del'>-			.mask = ST_LSM6DSX_REG_ACC_ODR_MASK,</div><div class='add'>+			.addr = 0x10,</div><div class='add'>+			.mask = GENMASK(7, 4),</div><div class='ctx'> 		},</div><div class='ctx'> 		.odr_avl[0] = {  13, 0x01 },</div><div class='ctx'> 		.odr_avl[1] = {  26, 0x02 },</div><div class='hunk'>@@ -103,8 +85,8 @@ static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[ST_LSM6DSX_ID_GYRO] = {</div><div class='ctx'> 		.reg = {</div><div class='del'>-			.addr = ST_LSM6DSX_REG_GYRO_ODR_ADDR,</div><div class='del'>-			.mask = ST_LSM6DSX_REG_GYRO_ODR_MASK,</div><div class='add'>+			.addr = 0x11,</div><div class='add'>+			.mask = GENMASK(7, 4),</div><div class='ctx'> 		},</div><div class='ctx'> 		.odr_avl[0] = {  13, 0x01 },</div><div class='ctx'> 		.odr_avl[1] = {  26, 0x02 },</div><div class='hunk'>@@ -118,23 +100,23 @@ static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {</div><div class='ctx'> static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {</div><div class='ctx'> 	[ST_LSM6DSX_ID_ACC] = {</div><div class='ctx'> 		.reg = {</div><div class='del'>-			.addr = ST_LSM6DSX_REG_ACC_FS_ADDR,</div><div class='del'>-			.mask = ST_LSM6DSX_REG_ACC_FS_MASK,</div><div class='add'>+			.addr = 0x10,</div><div class='add'>+			.mask = GENMASK(3, 2),</div><div class='ctx'> 		},</div><div class='del'>-		.fs_avl[0] = {  ST_LSM6DSX_ACC_FS_2G_GAIN, 0x0 },</div><div class='del'>-		.fs_avl[1] = {  ST_LSM6DSX_ACC_FS_4G_GAIN, 0x2 },</div><div class='del'>-		.fs_avl[2] = {  ST_LSM6DSX_ACC_FS_8G_GAIN, 0x3 },</div><div class='del'>-		.fs_avl[3] = { ST_LSM6DSX_ACC_FS_16G_GAIN, 0x1 },</div><div class='add'>+		.fs_avl[0] = {  IIO_G_TO_M_S_2(61), 0x0 },</div><div class='add'>+		.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },</div><div class='add'>+		.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },</div><div class='add'>+		.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },</div><div class='ctx'> 	},</div><div class='ctx'> 	[ST_LSM6DSX_ID_GYRO] = {</div><div class='ctx'> 		.reg = {</div><div class='del'>-			.addr = ST_LSM6DSX_REG_GYRO_FS_ADDR,</div><div class='del'>-			.mask = ST_LSM6DSX_REG_GYRO_FS_MASK,</div><div class='add'>+			.addr = 0x11,</div><div class='add'>+			.mask = GENMASK(3, 2),</div><div class='ctx'> 		},</div><div class='del'>-		.fs_avl[0] = {  ST_LSM6DSX_GYRO_FS_245_GAIN, 0x0 },</div><div class='del'>-		.fs_avl[1] = {  ST_LSM6DSX_GYRO_FS_500_GAIN, 0x1 },</div><div class='del'>-		.fs_avl[2] = { ST_LSM6DSX_GYRO_FS_1000_GAIN, 0x2 },</div><div class='del'>-		.fs_avl[3] = { ST_LSM6DSX_GYRO_FS_2000_GAIN, 0x3 },</div><div class='add'>+		.fs_avl[0] = {  IIO_DEGREE_TO_RAD(8750), 0x0 },</div><div class='add'>+		.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },</div><div class='add'>+		.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },</div><div class='add'>+		.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -287,6 +269,111 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {</div><div class='ctx'> 		.max_fifo_size = 512,</div><div class='ctx'> 		.id = {</div><div class='ctx'> 			[0] = ST_LSM6DSO_ID,</div><div class='add'>+			[1] = ST_LSM6DSOX_ID,</div><div class='add'>+		},</div><div class='add'>+		.batch = {</div><div class='add'>+			[ST_LSM6DSX_ID_ACC] = {</div><div class='add'>+				.addr = 0x09,</div><div class='add'>+				.mask = GENMASK(3, 0),</div><div class='add'>+			},</div><div class='add'>+			[ST_LSM6DSX_ID_GYRO] = {</div><div class='add'>+				.addr = 0x09,</div><div class='add'>+				.mask = GENMASK(7, 4),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.fifo_ops = {</div><div class='add'>+			.read_fifo = st_lsm6dsx_read_tagged_fifo,</div><div class='add'>+			.fifo_th = {</div><div class='add'>+				.addr = 0x07,</div><div class='add'>+				.mask = GENMASK(8, 0),</div><div class='add'>+			},</div><div class='add'>+			.fifo_diff = {</div><div class='add'>+				.addr = 0x3a,</div><div class='add'>+				.mask = GENMASK(8, 0),</div><div class='add'>+			},</div><div class='add'>+			.th_wl = 1,</div><div class='add'>+		},</div><div class='add'>+		.ts_settings = {</div><div class='add'>+			.timer_en = {</div><div class='add'>+				.addr = 0x19,</div><div class='add'>+				.mask = BIT(5),</div><div class='add'>+			},</div><div class='add'>+			.decimator = {</div><div class='add'>+				.addr = 0x0a,</div><div class='add'>+				.mask = GENMASK(7, 6),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.shub_settings = {</div><div class='add'>+			.page_mux = {</div><div class='add'>+				.addr = 0x01,</div><div class='add'>+				.mask = BIT(6),</div><div class='add'>+			},</div><div class='add'>+			.master_en = {</div><div class='add'>+				.addr = 0x14,</div><div class='add'>+				.mask = BIT(2),</div><div class='add'>+			},</div><div class='add'>+			.pullup_en = {</div><div class='add'>+				.addr = 0x14,</div><div class='add'>+				.mask = BIT(3),</div><div class='add'>+			},</div><div class='add'>+			.aux_sens = {</div><div class='add'>+				.addr = 0x14,</div><div class='add'>+				.mask = GENMASK(1, 0),</div><div class='add'>+			},</div><div class='add'>+			.wr_once = {</div><div class='add'>+				.addr = 0x14,</div><div class='add'>+				.mask = BIT(6),</div><div class='add'>+			},</div><div class='add'>+			.shub_out = 0x02,</div><div class='add'>+			.slv0_addr = 0x15,</div><div class='add'>+			.dw_slv0_addr = 0x21,</div><div class='add'>+			.batch_en = BIT(3),</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wai = 0x6b,</div><div class='add'>+		.max_fifo_size = 512,</div><div class='add'>+		.id = {</div><div class='add'>+			[0] = ST_ASM330LHH_ID,</div><div class='add'>+		},</div><div class='add'>+		.batch = {</div><div class='add'>+			[ST_LSM6DSX_ID_ACC] = {</div><div class='add'>+				.addr = 0x09,</div><div class='add'>+				.mask = GENMASK(3, 0),</div><div class='add'>+			},</div><div class='add'>+			[ST_LSM6DSX_ID_GYRO] = {</div><div class='add'>+				.addr = 0x09,</div><div class='add'>+				.mask = GENMASK(7, 4),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.fifo_ops = {</div><div class='add'>+			.read_fifo = st_lsm6dsx_read_tagged_fifo,</div><div class='add'>+			.fifo_th = {</div><div class='add'>+				.addr = 0x07,</div><div class='add'>+				.mask = GENMASK(8, 0),</div><div class='add'>+			},</div><div class='add'>+			.fifo_diff = {</div><div class='add'>+				.addr = 0x3a,</div><div class='add'>+				.mask = GENMASK(8, 0),</div><div class='add'>+			},</div><div class='add'>+			.th_wl = 1,</div><div class='add'>+		},</div><div class='add'>+		.ts_settings = {</div><div class='add'>+			.timer_en = {</div><div class='add'>+				.addr = 0x19,</div><div class='add'>+				.mask = BIT(5),</div><div class='add'>+			},</div><div class='add'>+			.decimator = {</div><div class='add'>+				.addr = 0x0a,</div><div class='add'>+				.mask = GENMASK(7, 6),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wai = 0x6b,</div><div class='add'>+		.max_fifo_size = 512,</div><div class='add'>+		.id = {</div><div class='add'>+			[0] = ST_LSM6DSR_ID,</div><div class='ctx'> 		},</div><div class='ctx'> 		.batch = {</div><div class='ctx'> 			[ST_LSM6DSX_ID_ACC] = {</div><div class='head'>diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c<br/>index 448b7bc1e578..f54370196098 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c</a></div><div class='hunk'>@@ -65,6 +65,18 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = {</div><div class='ctx'> 		.compatible = "st,lsm6dso",</div><div class='ctx'> 		.data = (void *)ST_LSM6DSO_ID,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,asm330lhh",</div><div class='add'>+		.data = (void *)ST_ASM330LHH_ID,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,lsm6dsox",</div><div class='add'>+		.data = (void *)ST_LSM6DSOX_ID,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,lsm6dsr",</div><div class='add'>+		.data = (void *)ST_LSM6DSR_ID,</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);</div><div class='hunk'>@@ -76,6 +88,9 @@ static const struct i2c_device_id st_lsm6dsx_i2c_id_table[] = {</div><div class='ctx'> 	{ ST_LSM6DSM_DEV_NAME, ST_LSM6DSM_ID },</div><div class='ctx'> 	{ ST_ISM330DLC_DEV_NAME, ST_ISM330DLC_ID },</div><div class='ctx'> 	{ ST_LSM6DSO_DEV_NAME, ST_LSM6DSO_ID },</div><div class='add'>+	{ ST_ASM330LHH_DEV_NAME, ST_ASM330LHH_ID },</div><div class='add'>+	{ ST_LSM6DSOX_DEV_NAME, ST_LSM6DSOX_ID },</div><div class='add'>+	{ ST_LSM6DSR_DEV_NAME, ST_LSM6DSR_ID },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, st_lsm6dsx_i2c_id_table);</div><div class='head'>diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c<br/>index b1df8a6973e6..4a4abb2935da 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c</a></div><div class='hunk'>@@ -65,6 +65,18 @@ static const struct of_device_id st_lsm6dsx_spi_of_match[] = {</div><div class='ctx'> 		.compatible = "st,lsm6dso",</div><div class='ctx'> 		.data = (void *)ST_LSM6DSO_ID,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,asm330lhh",</div><div class='add'>+		.data = (void *)ST_ASM330LHH_ID,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,lsm6dsox",</div><div class='add'>+		.data = (void *)ST_LSM6DSOX_ID,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,lsm6dsr",</div><div class='add'>+		.data = (void *)ST_LSM6DSR_ID,</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, st_lsm6dsx_spi_of_match);</div><div class='hunk'>@@ -76,6 +88,9 @@ static const struct spi_device_id st_lsm6dsx_spi_id_table[] = {</div><div class='ctx'> 	{ ST_LSM6DSM_DEV_NAME, ST_LSM6DSM_ID },</div><div class='ctx'> 	{ ST_ISM330DLC_DEV_NAME, ST_ISM330DLC_ID },</div><div class='ctx'> 	{ ST_LSM6DSO_DEV_NAME, ST_LSM6DSO_ID },</div><div class='add'>+	{ ST_ASM330LHH_DEV_NAME, ST_ASM330LHH_ID },</div><div class='add'>+	{ ST_LSM6DSOX_DEV_NAME, ST_LSM6DSOX_ID },</div><div class='add'>+	{ ST_LSM6DSR_DEV_NAME, ST_LSM6DSR_ID },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(spi, st_lsm6dsx_spi_id_table);</div><div class='head'>diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c<br/>index cd5bfe39591b..4fa273002c03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/industrialio-buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/industrialio-buffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/industrialio-buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/industrialio-buffer.c</a></div><div class='hunk'>@@ -320,9 +320,8 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev,</div><div class='ctx'> 	const unsigned long *mask;</div><div class='ctx'> 	unsigned long *trialmask;</div><div class='ctx'> </div><div class='del'>-	trialmask = kmalloc_array(BITS_TO_LONGS(indio_dev-&gt;masklength),</div><div class='del'>-				  sizeof(*trialmask),</div><div class='del'>-				  GFP_KERNEL);</div><div class='add'>+	trialmask = kcalloc(BITS_TO_LONGS(indio_dev-&gt;masklength),</div><div class='add'>+			    sizeof(*trialmask), GFP_KERNEL);</div><div class='ctx'> 	if (trialmask == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (!indio_dev-&gt;masklength) {</div><div class='hunk'>@@ -344,12 +343,12 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	bitmap_copy(buffer-&gt;scan_mask, trialmask, indio_dev-&gt;masklength);</div><div class='ctx'> </div><div class='del'>-	kfree(trialmask);</div><div class='add'>+	bitmap_free(trialmask);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_invalid_mask:</div><div class='del'>-	kfree(trialmask);</div><div class='add'>+	bitmap_free(trialmask);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -666,7 +665,7 @@ static void iio_free_scan_mask(struct iio_dev *indio_dev,</div><div class='ctx'> {</div><div class='ctx'> 	/* If the mask is dynamically allocated free it, otherwise do nothing */</div><div class='ctx'> 	if (!indio_dev-&gt;available_scan_masks)</div><div class='del'>-		kfree(mask);</div><div class='add'>+		bitmap_free(mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iio_device_config {</div><div class='hunk'>@@ -736,8 +735,7 @@ static int iio_verify_update(struct iio_dev *indio_dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* What scan mask do we actually have? */</div><div class='del'>-	compound_mask = kcalloc(BITS_TO_LONGS(indio_dev-&gt;masklength),</div><div class='del'>-				sizeof(long), GFP_KERNEL);</div><div class='add'>+	compound_mask = bitmap_zalloc(indio_dev-&gt;masklength, GFP_KERNEL);</div><div class='ctx'> 	if (compound_mask == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -762,7 +760,7 @@ static int iio_verify_update(struct iio_dev *indio_dev,</div><div class='ctx'> 				    indio_dev-&gt;masklength,</div><div class='ctx'> 				    compound_mask,</div><div class='ctx'> 				    strict_scanmask);</div><div class='del'>-		kfree(compound_mask);</div><div class='add'>+		bitmap_free(compound_mask);</div><div class='ctx'> 		if (scan_mask == NULL)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1303,9 +1301,8 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev)</div><div class='ctx'> 					channels[i].scan_index;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (indio_dev-&gt;masklength &amp;&amp; buffer-&gt;scan_mask == NULL) {</div><div class='del'>-			buffer-&gt;scan_mask = kcalloc(BITS_TO_LONGS(indio_dev-&gt;masklength),</div><div class='del'>-						    sizeof(*buffer-&gt;scan_mask),</div><div class='del'>-						    GFP_KERNEL);</div><div class='add'>+			buffer-&gt;scan_mask = bitmap_zalloc(indio_dev-&gt;masklength,</div><div class='add'>+							  GFP_KERNEL);</div><div class='ctx'> 			if (buffer-&gt;scan_mask == NULL) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='ctx'> 				goto error_cleanup_dynamic;</div><div class='hunk'>@@ -1334,7 +1331,7 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error_free_scan_mask:</div><div class='del'>-	kfree(buffer-&gt;scan_mask);</div><div class='add'>+	bitmap_free(buffer-&gt;scan_mask);</div><div class='ctx'> error_cleanup_dynamic:</div><div class='ctx'> 	iio_free_chan_devattr_list(&amp;buffer-&gt;scan_el_dev_attr_list);</div><div class='ctx'> 	kfree(indio_dev-&gt;buffer-&gt;buffer_group.attrs);</div><div class='hunk'>@@ -1347,7 +1344,7 @@ void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev)</div><div class='ctx'> 	if (!indio_dev-&gt;buffer)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	kfree(indio_dev-&gt;buffer-&gt;scan_mask);</div><div class='add'>+	bitmap_free(indio_dev-&gt;buffer-&gt;scan_mask);</div><div class='ctx'> 	kfree(indio_dev-&gt;buffer-&gt;buffer_group.attrs);</div><div class='ctx'> 	kfree(indio_dev-&gt;buffer-&gt;scan_el_group.attrs);</div><div class='ctx'> 	iio_free_chan_devattr_list(&amp;indio_dev-&gt;buffer-&gt;scan_el_dev_attr_list);</div><div class='head'>diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c<br/>index 4700fd5d8c90..f5a4581302f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/industrialio-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/industrialio-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/industrialio-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/industrialio-core.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='hunk'>@@ -530,8 +531,8 @@ ssize_t iio_show_mount_matrix(struct iio_dev *indio_dev, uintptr_t priv,</div><div class='ctx'> EXPORT_SYMBOL_GPL(iio_show_mount_matrix);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * of_iio_read_mount_matrix() - retrieve iio device mounting matrix from</div><div class='del'>- *                              device-tree "mount-matrix" property</div><div class='add'>+ * iio_read_mount_matrix() - retrieve iio device mounting matrix from</div><div class='add'>+ *                           device "mount-matrix" property</div><div class='ctx'>  * @dev:	device the mounting matrix property is assigned to</div><div class='ctx'>  * @propname:	device specific mounting matrix property name</div><div class='ctx'>  * @matrix:	where to store retrieved matrix</div><div class='hunk'>@@ -541,40 +542,29 @@ EXPORT_SYMBOL_GPL(iio_show_mount_matrix);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-int of_iio_read_mount_matrix(const struct device *dev,</div><div class='del'>-			     const char *propname,</div><div class='del'>-			     struct iio_mount_matrix *matrix)</div><div class='add'>+int iio_read_mount_matrix(struct device *dev, const char *propname,</div><div class='add'>+			  struct iio_mount_matrix *matrix)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;of_node) {</div><div class='del'>-		int err = of_property_read_string_array(dev-&gt;of_node,</div><div class='del'>-				propname, matrix-&gt;rotation,</div><div class='del'>-				ARRAY_SIZE(iio_mount_idmatrix.rotation));</div><div class='add'>+	size_t len = ARRAY_SIZE(iio_mount_idmatrix.rotation);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		if (err == ARRAY_SIZE(iio_mount_idmatrix.rotation))</div><div class='del'>-			return 0;</div><div class='add'>+	err = device_property_read_string_array(dev, propname,</div><div class='add'>+						matrix-&gt;rotation, len);</div><div class='add'>+	if (err == len)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (err &gt;= 0)</div><div class='del'>-			/* Invalid number of matrix entries. */</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		/* Invalid number of matrix entries. */</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (err != -EINVAL)</div><div class='del'>-			/* Invalid matrix declaration format. */</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	if (err != -EINVAL)</div><div class='add'>+		/* Invalid matrix declaration format. */</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Matrix was not declared at all: fallback to identity. */</div><div class='ctx'> 	return iio_setup_mount_idmatrix(dev, matrix);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-int of_iio_read_mount_matrix(const struct device *dev,</div><div class='del'>-			     const char *propname,</div><div class='del'>-			     struct iio_mount_matrix *matrix)</div><div class='del'>-{</div><div class='del'>-	return iio_setup_mount_idmatrix(dev, matrix);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-EXPORT_SYMBOL(of_iio_read_mount_matrix);</div><div class='add'>+EXPORT_SYMBOL(iio_read_mount_matrix);</div><div class='ctx'> </div><div class='ctx'> static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,</div><div class='ctx'> 				  int size, const int *vals)</div><div class='hunk'>@@ -1743,10 +1733,10 @@ EXPORT_SYMBOL(__iio_device_register);</div><div class='ctx'>  **/</div><div class='ctx'> void iio_device_unregister(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;indio_dev-&gt;info_exist_lock);</div><div class='del'>-</div><div class='ctx'> 	cdev_device_del(&amp;indio_dev-&gt;chrdev, &amp;indio_dev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;indio_dev-&gt;info_exist_lock);</div><div class='add'>+</div><div class='ctx'> 	iio_device_unregister_debugfs(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	iio_disable_all_buffers(indio_dev);</div><div class='head'>diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c<br/>index ce66699c7fcc..e5b538379ed1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/industrialio-trigger.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/industrialio-trigger.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/industrialio-trigger.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/industrialio-trigger.c</a></div><div class='hunk'>@@ -254,8 +254,11 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,</div><div class='ctx'> </div><div class='ctx'> 	/* Get irq number */</div><div class='ctx'> 	pf-&gt;irq = iio_trigger_get_irq(trig);</div><div class='del'>-	if (pf-&gt;irq &lt; 0)</div><div class='add'>+	if (pf-&gt;irq &lt; 0) {</div><div class='add'>+		pr_err("Could not find an available irq for trigger %s, CONFIG_IIO_CONSUMERS_PER_TRIGGER=%d limit might be exceeded\n",</div><div class='add'>+			trig-&gt;name, CONFIG_IIO_CONSUMERS_PER_TRIGGER);</div><div class='ctx'> 		goto out_put_module;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Request irq */</div><div class='ctx'> 	ret = request_threaded_irq(pf-&gt;irq, pf-&gt;h, pf-&gt;thread,</div><div class='head'>diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig<br/>index 5190eacfeb0a..954c958cfc43 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/light/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/light/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/light/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/light/Kconfig</a></div><div class='hunk'>@@ -13,11 +13,11 @@ config ACPI_ALS</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	select IIO_KFIFO_BUF</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the ACPI0008</div><div class='del'>-	 Ambient Light Sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the ACPI0008</div><div class='add'>+	  Ambient Light Sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the module will</div><div class='del'>-	 be called acpi-als.</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will</div><div class='add'>+	  be called acpi-als.</div><div class='ctx'> </div><div class='ctx'> config ADJD_S311</div><div class='ctx'> 	tristate "ADJD-S311-CR999 digital color sensor"</div><div class='hunk'>@@ -25,31 +25,31 @@ config ADJD_S311</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for the Avago ADJD-S311-CR999</div><div class='del'>-	 digital color light sensor.</div><div class='add'>+	  If you say yes here you get support for the Avago ADJD-S311-CR999</div><div class='add'>+	  digital color light sensor.</div><div class='ctx'> </div><div class='del'>-	 This driver can also be built as a module.  If so, the module</div><div class='del'>-	 will be called adjd_s311.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called adjd_s311.</div><div class='ctx'> </div><div class='ctx'> config AL3320A</div><div class='ctx'> 	tristate "AL3320A ambient light sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the Dyna Image AL3320A</div><div class='del'>-	 ambient light sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the Dyna Image AL3320A</div><div class='add'>+	  ambient light sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called al3320a.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called al3320a.</div><div class='ctx'> </div><div class='ctx'> config APDS9300</div><div class='ctx'> 	tristate "APDS9300 ambient light sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the Avago APDS9300</div><div class='del'>-	 ambient light sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the Avago APDS9300</div><div class='add'>+	  ambient light sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called apds9300.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called apds9300.</div><div class='ctx'> </div><div class='ctx'> config APDS9960</div><div class='ctx'> 	tristate "Avago APDS9960 gesture/RGB/ALS/proximity sensor"</div><div class='hunk'>@@ -68,74 +68,74 @@ config BH1750</div><div class='ctx'> 	tristate "ROHM BH1750 ambient light sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here to build support for the ROHM BH1710, BH1715, BH1721,</div><div class='del'>-	 BH1750, BH1751 ambient light sensors.</div><div class='add'>+	  Say Y here to build support for the ROHM BH1710, BH1715, BH1721,</div><div class='add'>+	  BH1750, BH1751 ambient light sensors.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the module will</div><div class='del'>-	 be called bh1750.</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will</div><div class='add'>+	  be called bh1750.</div><div class='ctx'> </div><div class='ctx'> config BH1780</div><div class='ctx'> 	tristate "ROHM BH1780 ambient light sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here to build support for the ROHM BH1780GLI ambient</div><div class='del'>-	 light sensor.</div><div class='add'>+	  Say Y here to build support for the ROHM BH1780GLI ambient</div><div class='add'>+	  light sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the module will</div><div class='del'>-	 be called bh1780.</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will</div><div class='add'>+	  be called bh1780.</div><div class='ctx'> </div><div class='ctx'> config CM32181</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	tristate "CM32181 driver"</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you use cm32181.</div><div class='del'>-	 This option enables ambient light sensor using</div><div class='del'>-	 Capella cm32181 device driver.</div><div class='add'>+	  Say Y here if you use cm32181.</div><div class='add'>+	  This option enables ambient light sensor using</div><div class='add'>+	  Capella cm32181 device driver.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called cm32181.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called cm32181.</div><div class='ctx'> </div><div class='ctx'> config CM3232</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	tristate "CM3232 ambient light sensor"</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you use cm3232.</div><div class='del'>-	 This option enables ambient light sensor using</div><div class='del'>-	 Capella Microsystems cm3232 device driver.</div><div class='add'>+	  Say Y here if you use cm3232.</div><div class='add'>+	  This option enables ambient light sensor using</div><div class='add'>+	  Capella Microsystems cm3232 device driver.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called cm3232.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called cm3232.</div><div class='ctx'> </div><div class='ctx'> config CM3323</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	tristate "Capella CM3323 color light sensor"</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for Capella CM3323</div><div class='del'>-	 color sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for Capella CM3323</div><div class='add'>+	  color sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the module will</div><div class='del'>-	 be called cm3323.</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will</div><div class='add'>+	  be called cm3323.</div><div class='ctx'> </div><div class='ctx'> config CM3605</div><div class='ctx'> 	tristate "Capella CM3605 ambient light and proximity sensor"</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for Capella CM3605</div><div class='del'>-	 ambient light and short range proximity sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for Capella CM3605</div><div class='add'>+	  ambient light and short range proximity sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the module will</div><div class='del'>-	 be called cm3605.</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will</div><div class='add'>+	  be called cm3605.</div><div class='ctx'> </div><div class='ctx'> config CM36651</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	tristate "CM36651 driver"</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you use cm36651.</div><div class='del'>-	 This option enables proximity &amp; RGB sensor using</div><div class='del'>-	 Capella cm36651 device driver.</div><div class='add'>+	  Say Y here if you use cm36651.</div><div class='add'>+	  This option enables proximity &amp; RGB sensor using</div><div class='add'>+	  Capella cm36651 device driver.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called cm36651.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called cm36651.</div><div class='ctx'> </div><div class='ctx'> config IIO_CROS_EC_LIGHT_PROX</div><div class='ctx'> 	tristate "ChromeOS EC Light and Proximity Sensors"</div><div class='hunk'>@@ -167,21 +167,21 @@ config SENSORS_ISL29018</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for ambient light sensing and</div><div class='del'>-	 proximity infrared sensing from Intersil ISL29018.</div><div class='del'>-	 This driver will provide the measurements of ambient light intensity</div><div class='del'>-	 in lux, proximity infrared sensing and normal infrared sensing.</div><div class='del'>-	 Data from sensor is accessible via sysfs.</div><div class='add'>+	  If you say yes here you get support for ambient light sensing and</div><div class='add'>+	  proximity infrared sensing from Intersil ISL29018.</div><div class='add'>+	  This driver will provide the measurements of ambient light intensity</div><div class='add'>+	  in lux, proximity infrared sensing and normal infrared sensing.</div><div class='add'>+	  Data from sensor is accessible via sysfs.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_ISL29028</div><div class='ctx'> 	tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Provides driver for the Intersil's ISL29028 device.</div><div class='del'>-	 This driver supports the sysfs interface to get the ALS, IR intensity,</div><div class='del'>-	 Proximity value via iio. The ISL29028 provides the concurrent sensing</div><div class='del'>-	 of ambient light and proximity.</div><div class='add'>+	  Provides driver for the Intersil's ISL29028 device.</div><div class='add'>+	  This driver supports the sysfs interface to get the ALS, IR intensity,</div><div class='add'>+	  Proximity value via iio. The ISL29028 provides the concurrent sensing</div><div class='add'>+	  of ambient light and proximity.</div><div class='ctx'> </div><div class='ctx'> config ISL29125</div><div class='ctx'> 	tristate "Intersil ISL29125 digital color light sensor"</div><div class='hunk'>@@ -228,22 +228,22 @@ config JSA1212</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a IIO driver for JSA1212</div><div class='del'>-	 proximity &amp; ALS sensor device.</div><div class='add'>+	  Say Y here if you want to build a IIO driver for JSA1212</div><div class='add'>+	  proximity &amp; ALS sensor device.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called jsa1212.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called jsa1212.</div><div class='ctx'> </div><div class='ctx'> config RPR0521</div><div class='ctx'> 	tristate "ROHM RPR0521 ALS and proximity sensor driver"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build support for ROHM's RPR0521</div><div class='del'>-	 ambient light and proximity sensor device.</div><div class='add'>+	  Say Y here if you want to build support for ROHM's RPR0521</div><div class='add'>+	  ambient light and proximity sensor device.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called rpr0521.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called rpr0521.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_LM3533</div><div class='ctx'> 	tristate "LM3533 ambient light sensor"</div><div class='hunk'>@@ -269,22 +269,22 @@ config LTR501</div><div class='ctx'> 	select IIO_BUFFER</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for the Lite-On LTR-501ALS-01</div><div class='del'>-	 ambient light and proximity sensor. This driver also supports LTR-559</div><div class='del'>-	 ALS/PS or LTR-301 ALS sensors.</div><div class='add'>+	  If you say yes here you get support for the Lite-On LTR-501ALS-01</div><div class='add'>+	  ambient light and proximity sensor. This driver also supports LTR-559</div><div class='add'>+	  ALS/PS or LTR-301 ALS sensors.</div><div class='ctx'> </div><div class='del'>-	 This driver can also be built as a module.  If so, the module</div><div class='del'>-         will be called ltr501.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called ltr501.</div><div class='ctx'> </div><div class='ctx'> config LV0104CS</div><div class='ctx'> 	tristate "LV0104CS Ambient Light Sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build support for the On Semiconductor</div><div class='del'>-	 LV0104CS ambient light sensor.</div><div class='add'>+	  Say Y here if you want to build support for the On Semiconductor</div><div class='add'>+	  LV0104CS ambient light sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called lv0104cs.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called lv0104cs.</div><div class='ctx'> </div><div class='ctx'> config MAX44000</div><div class='ctx'> 	tristate "MAX44000 Ambient and Infrared Proximity Sensor"</div><div class='hunk'>@@ -293,11 +293,11 @@ config MAX44000</div><div class='ctx'> 	select IIO_BUFFER</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build support for Maxim Integrated's</div><div class='del'>-	 MAX44000 ambient and infrared proximity sensor device.</div><div class='add'>+	  Say Y here if you want to build support for Maxim Integrated's</div><div class='add'>+	  MAX44000 ambient and infrared proximity sensor device.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here:</div><div class='del'>-	 the module will be called max44000.</div><div class='add'>+	  To compile this driver as a module, choose M here:</div><div class='add'>+	  the module will be called max44000.</div><div class='ctx'> </div><div class='ctx'> config MAX44009</div><div class='ctx'> 	tristate "MAX44009 Ambient Light Sensor"</div><div class='hunk'>@@ -320,15 +320,15 @@ config OPT3001</div><div class='ctx'> 	  opt3001.</div><div class='ctx'> </div><div class='ctx'> config PA12203001</div><div class='del'>-        tristate "TXC PA12203001 light and proximity sensor"</div><div class='del'>-        depends on I2C</div><div class='del'>-        select REGMAP_I2C</div><div class='del'>-        help</div><div class='del'>-         If you say yes here you get support for the TXC PA12203001</div><div class='del'>-         ambient light and proximity sensor.</div><div class='add'>+	tristate "TXC PA12203001 light and proximity sensor"</div><div class='add'>+	depends on I2C</div><div class='add'>+	select REGMAP_I2C</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the TXC PA12203001</div><div class='add'>+	  ambient light and proximity sensor.</div><div class='ctx'> </div><div class='del'>-         This driver can also be built as a module.  If so, the module</div><div class='del'>-         will be called pa12203001.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called pa12203001.</div><div class='ctx'> </div><div class='ctx'> config SI1133</div><div class='ctx'> 	tristate "SI1133 UV Index Sensor and Ambient Light Sensor"</div><div class='hunk'>@@ -359,12 +359,12 @@ config STK3310</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say yes here to get support for the Sensortek STK3310 ambient light</div><div class='del'>-	 and proximity sensor. The STK3311 model is also supported by this</div><div class='del'>-	 driver.</div><div class='add'>+	  Say yes here to get support for the Sensortek STK3310 ambient light</div><div class='add'>+	  and proximity sensor. The STK3311 model is also supported by this</div><div class='add'>+	  driver.</div><div class='ctx'> </div><div class='del'>-	 Choosing M will build the driver as a module. If so, the module</div><div class='del'>-	 will be called stk3310.</div><div class='add'>+	  Choosing M will build the driver as a module. If so, the module</div><div class='add'>+	  will be called stk3310.</div><div class='ctx'> </div><div class='ctx'> config ST_UVIS25</div><div class='ctx'> 	tristate "STMicroelectronics UVIS25 sensor driver"</div><div class='hunk'>@@ -396,11 +396,11 @@ config TCS3414</div><div class='ctx'> 	select IIO_BUFFER</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for the TAOS TCS3414</div><div class='del'>-	 family of digital color sensors.</div><div class='add'>+	  If you say yes here you get support for the TAOS TCS3414</div><div class='add'>+	  family of digital color sensors.</div><div class='ctx'> </div><div class='del'>-	 This driver can also be built as a module.  If so, the module</div><div class='del'>-	 will be called tcs3414.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called tcs3414.</div><div class='ctx'> </div><div class='ctx'> config TCS3472</div><div class='ctx'> 	tristate "TAOS TCS3472 color light-to-digital converter"</div><div class='hunk'>@@ -408,67 +408,67 @@ config TCS3472</div><div class='ctx'> 	select IIO_BUFFER</div><div class='ctx'> 	select IIO_TRIGGERED_BUFFER</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for the TAOS TCS3472</div><div class='del'>-	 family of color light-to-digital converters with IR filter.</div><div class='add'>+	  If you say yes here you get support for the TAOS TCS3472</div><div class='add'>+	  family of color light-to-digital converters with IR filter.</div><div class='ctx'> </div><div class='del'>-	 This driver can also be built as a module.  If so, the module</div><div class='del'>-	 will be called tcs3472.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called tcs3472.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_TSL2563</div><div class='ctx'> 	tristate "TAOS TSL2560, TSL2561, TSL2562 and TSL2563 ambient light sensors"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for the Taos TSL2560,</div><div class='del'>-	 TSL2561, TSL2562 and TSL2563 ambient light sensors.</div><div class='add'>+	  If you say yes here you get support for the Taos TSL2560,</div><div class='add'>+	  TSL2561, TSL2562 and TSL2563 ambient light sensors.</div><div class='ctx'> </div><div class='del'>-	 This driver can also be built as a module.  If so, the module</div><div class='del'>-	 will be called tsl2563.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called tsl2563.</div><div class='ctx'> </div><div class='ctx'> config TSL2583</div><div class='ctx'> 	tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.</div><div class='del'>-	 Access ALS data via iio, sysfs.</div><div class='add'>+	  Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.</div><div class='add'>+	  Access ALS data via iio, sysfs.</div><div class='ctx'> </div><div class='ctx'> config TSL2772</div><div class='ctx'> 	tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Support for: tsl2571, tsl2671, tmd2671, tsl2771, tmd2771, tsl2572, tsl2672,</div><div class='del'>-	 tmd2672, tsl2772, tmd2772 devices.</div><div class='del'>-	 Provides iio_events and direct access via sysfs.</div><div class='add'>+	  Support for: tsl2571, tsl2671, tmd2671, tsl2771, tmd2771, tsl2572, tsl2672,</div><div class='add'>+	  tmd2672, tsl2772, tmd2772 devices.</div><div class='add'>+	  Provides iio_events and direct access via sysfs.</div><div class='ctx'> </div><div class='ctx'> config TSL4531</div><div class='ctx'> 	tristate "TAOS TSL4531 ambient light sensors"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the TAOS TSL4531 family</div><div class='del'>-	 of ambient light sensors with direct lux output.</div><div class='add'>+	  Say Y here if you want to build a driver for the TAOS TSL4531 family</div><div class='add'>+	  of ambient light sensors with direct lux output.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called tsl4531.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called tsl4531.</div><div class='ctx'> </div><div class='ctx'> config US5182D</div><div class='ctx'> 	tristate "UPISEMI light and proximity sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 If you say yes here you get support for the UPISEMI US5182D</div><div class='del'>-	 ambient light and proximity sensor.</div><div class='add'>+	  If you say yes here you get support for the UPISEMI US5182D</div><div class='add'>+	  ambient light and proximity sensor.</div><div class='ctx'> </div><div class='del'>-	 This driver can also be built as a module.  If so, the module</div><div class='del'>-	 will be called us5182d.</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called us5182d.</div><div class='ctx'> </div><div class='ctx'> config VCNL4000</div><div class='ctx'> 	tristate "VCNL4000/4010/4020/4200 combined ALS and proximity sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the Vishay VCNL4000,</div><div class='del'>-	 VCNL4010, VCNL4020, VCNL4200 combined ambient light and proximity</div><div class='del'>-	 sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the Vishay VCNL4000,</div><div class='add'>+	  VCNL4010, VCNL4020, VCNL4200 combined ambient light and proximity</div><div class='add'>+	  sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called vcnl4000.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called vcnl4000.</div><div class='ctx'> </div><div class='ctx'> config VCNL4035</div><div class='ctx'> 	tristate "VCNL4035 combined ALS and proximity sensor"</div><div class='hunk'>@@ -476,41 +476,41 @@ config VCNL4035</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the Vishay VCNL4035,</div><div class='del'>-	 combined ambient light (ALS) and proximity sensor. Currently only ALS</div><div class='del'>-	 function is available.</div><div class='add'>+	  Say Y here if you want to build a driver for the Vishay VCNL4035,</div><div class='add'>+	  combined ambient light (ALS) and proximity sensor. Currently only ALS</div><div class='add'>+	  function is available.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called vcnl4035.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called vcnl4035.</div><div class='ctx'> </div><div class='ctx'> config VEML6070</div><div class='ctx'> 	tristate "VEML6070 UV A light sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the Vishay VEML6070 UV A</div><div class='del'>-	 light sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the Vishay VEML6070 UV A</div><div class='add'>+	  light sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called veml6070.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called veml6070.</div><div class='ctx'> </div><div class='ctx'> config VL6180</div><div class='ctx'> 	tristate "VL6180 ALS, range and proximity sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the STMicroelectronics</div><div class='del'>-	 VL6180 combined ambient light, range and proximity sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the STMicroelectronics</div><div class='add'>+	  VL6180 combined ambient light, range and proximity sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called vl6180.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called vl6180.</div><div class='ctx'> </div><div class='ctx'> config ZOPT2201</div><div class='ctx'> 	tristate "ZOPT2201 ALS and UV B sensor"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='del'>-	 Say Y here if you want to build a driver for the IDT</div><div class='del'>-	 ZOPT2201 ambient light and UV B sensor.</div><div class='add'>+	  Say Y here if you want to build a driver for the IDT</div><div class='add'>+	  ZOPT2201 ambient light and UV B sensor.</div><div class='ctx'> </div><div class='del'>-	 To compile this driver as a module, choose M here: the</div><div class='del'>-	 module will be called zopt2201.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called zopt2201.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c<br/>index fd1609e975ab..308ee6ff2e22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/light/cros_ec_light_prox.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/light/cros_ec_light_prox.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/light/cros_ec_light_prox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/light/cros_ec_light_prox.c</a></div><div class='hunk'>@@ -1,19 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * cros_ec_light_prox - Driver for light and prox sensors behing CrosEC.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 Google, Inc</div><div class='del'>- *</div><div class='del'>- * This software is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2, as published by the Free Software Foundation, and</div><div class='del'>- * may be copied, distributed, and modified under those terms.</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='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/common/cros_ec_sensors_core.h&gt;</div><div class='hunk'>@@ -28,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We only represent one entry for light or proximity. EC is merging different</div><div class='head'>diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c<br/>index 04fd0d4b6f19..b19e6559b980 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/light/vcnl4000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/light/vcnl4000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/light/vcnl4000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/light/vcnl4000.c</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * vcnl4000.c - Support for Vishay VCNL4000/4010/4020/4200 combined ambient</div><div class='add'>+ * vcnl4000.c - Support for Vishay VCNL4000/4010/4020/4040/4200 combined ambient</div><div class='ctx'>  * light and proximity sensor</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2012 Peter Meerwald &lt;pmeerw@pmeerw.net&gt;</div><div class='add'>+ * Copyright 2019 Pursim SPC</div><div class='ctx'>  *</div><div class='ctx'>  * This file is subject to the terms and conditions of version 2 of</div><div class='ctx'>  * the GNU General Public License.  See the file COPYING in the main</div><div class='hunk'>@@ -10,13 +11,14 @@</div><div class='ctx'>  *</div><div class='ctx'>  * IIO driver for:</div><div class='ctx'>  *   VCNL4000/10/20 (7-bit I2C slave address 0x13)</div><div class='add'>+ *   VCNL4040 (7-bit I2C slave address 0x60)</div><div class='ctx'>  *   VCNL4200 (7-bit I2C slave address 0x51)</div><div class='ctx'>  *</div><div class='ctx'>  * TODO:</div><div class='ctx'>  *   allow to adjust IR current</div><div class='ctx'>  *   proximity threshold and event handling</div><div class='ctx'>  *   periodic ALS/proximity measurement (VCNL4010/20)</div><div class='del'>- *   interrupts (VCNL4010/20, VCNL4200)</div><div class='add'>+ *   interrupts (VCNL4010/20/40, VCNL4200)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -30,6 +32,7 @@</div><div class='ctx'> #define VCNL4000_DRV_NAME "vcnl4000"</div><div class='ctx'> #define VCNL4000_PROD_ID	0x01</div><div class='ctx'> #define VCNL4010_PROD_ID	0x02 /* for VCNL4020, VCNL4010 */</div><div class='add'>+#define VCNL4040_PROD_ID	0x86</div><div class='ctx'> #define VCNL4200_PROD_ID	0x58</div><div class='ctx'> </div><div class='ctx'> #define VCNL4000_COMMAND	0x80 /* Command register */</div><div class='hunk'>@@ -49,6 +52,8 @@</div><div class='ctx'> #define VCNL4200_AL_DATA	0x09 /* Ambient light data */</div><div class='ctx'> #define VCNL4200_DEV_ID		0x0e /* Device ID, slave address and version */</div><div class='ctx'> </div><div class='add'>+#define VCNL4040_DEV_ID		0x0c /* Device ID and version */</div><div class='add'>+</div><div class='ctx'> /* Bit masks for COMMAND register */</div><div class='ctx'> #define VCNL4000_AL_RDY		BIT(6) /* ALS data ready? */</div><div class='ctx'> #define VCNL4000_PS_RDY		BIT(5) /* proximity data ready? */</div><div class='hunk'>@@ -58,6 +63,7 @@</div><div class='ctx'> enum vcnl4000_device_ids {</div><div class='ctx'> 	VCNL4000,</div><div class='ctx'> 	VCNL4010,</div><div class='add'>+	VCNL4040,</div><div class='ctx'> 	VCNL4200,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +96,7 @@ static const struct i2c_device_id vcnl4000_id[] = {</div><div class='ctx'> 	{ "vcnl4000", VCNL4000 },</div><div class='ctx'> 	{ "vcnl4010", VCNL4010 },</div><div class='ctx'> 	{ "vcnl4020", VCNL4010 },</div><div class='add'>+	{ "vcnl4040", VCNL4040 },</div><div class='ctx'> 	{ "vcnl4200", VCNL4200 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='hunk'>@@ -128,31 +135,53 @@ static int vcnl4000_init(struct vcnl4000_data *data)</div><div class='ctx'> </div><div class='ctx'> static int vcnl4200_init(struct vcnl4000_data *data)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, id;</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_smbus_read_word_data(data-&gt;client, VCNL4200_DEV_ID);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if ((ret &amp; 0xff) != VCNL4200_PROD_ID)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	id = ret &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (id != VCNL4200_PROD_ID) {</div><div class='add'>+		ret = i2c_smbus_read_word_data(data-&gt;client, VCNL4040_DEV_ID);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		id = ret &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		if (id != VCNL4040_PROD_ID)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;data-&gt;client-&gt;dev, "device id 0x%x", id);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;rev = (ret &gt;&gt; 8) &amp; 0xf;</div><div class='ctx'> </div><div class='ctx'> 	/* Set defaults and enable both channels */</div><div class='del'>-	ret = i2c_smbus_write_byte_data(data-&gt;client, VCNL4200_AL_CONF, 0x00);</div><div class='add'>+	ret = i2c_smbus_write_word_data(data-&gt;client, VCNL4200_AL_CONF, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = i2c_smbus_write_byte_data(data-&gt;client, VCNL4200_PS_CONF1, 0x00);</div><div class='add'>+	ret = i2c_smbus_write_word_data(data-&gt;client, VCNL4200_PS_CONF1, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;al_scale = 24000;</div><div class='ctx'> 	data-&gt;vcnl4200_al.reg = VCNL4200_AL_DATA;</div><div class='ctx'> 	data-&gt;vcnl4200_ps.reg = VCNL4200_PS_DATA;</div><div class='del'>-	/* Integration time is 50ms, but the experiments show 54ms in total. */</div><div class='del'>-	data-&gt;vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000);</div><div class='del'>-	data-&gt;vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000);</div><div class='add'>+	switch (id) {</div><div class='add'>+	case VCNL4200_PROD_ID:</div><div class='add'>+		/* Integration time is 50ms, but the experiments */</div><div class='add'>+		/* show 54ms in total. */</div><div class='add'>+		data-&gt;vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000);</div><div class='add'>+		data-&gt;vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000);</div><div class='add'>+		break;</div><div class='add'>+	case VCNL4040_PROD_ID:</div><div class='add'>+		/* Integration time is 80ms, add 10ms. */</div><div class='add'>+		data-&gt;vcnl4200_al.sampling_rate = ktime_set(0, 100000 * 1000);</div><div class='add'>+		data-&gt;vcnl4200_ps.sampling_rate = ktime_set(0, 100000 * 1000);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	data-&gt;vcnl4200_al.last_measurement = ktime_set(0, 0);</div><div class='ctx'> 	data-&gt;vcnl4200_ps.last_measurement = ktime_set(0, 0);</div><div class='ctx'> 	mutex_init(&amp;data-&gt;vcnl4200_al.lock);</div><div class='hunk'>@@ -271,6 +300,12 @@ static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = {</div><div class='ctx'> 		.measure_light = vcnl4000_measure_light,</div><div class='ctx'> 		.measure_proximity = vcnl4000_measure_proximity,</div><div class='ctx'> 	},</div><div class='add'>+	[VCNL4040] = {</div><div class='add'>+		.prod = "VCNL4040",</div><div class='add'>+		.init = vcnl4200_init,</div><div class='add'>+		.measure_light = vcnl4200_measure_light,</div><div class='add'>+		.measure_proximity = vcnl4200_measure_proximity,</div><div class='add'>+	},</div><div class='ctx'> 	[VCNL4200] = {</div><div class='ctx'> 		.prod = "VCNL4200",</div><div class='ctx'> 		.init = vcnl4200_init,</div><div class='hunk'>@@ -363,9 +398,31 @@ static int vcnl4000_probe(struct i2c_client *client,</div><div class='ctx'> 	return devm_iio_device_register(&amp;client-&gt;dev, indio_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id vcnl_4000_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vishay,vcnl4000",</div><div class='add'>+		.data = "VCNL4000",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vishay,vcnl4010",</div><div class='add'>+		.data = "VCNL4010",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vishay,vcnl4010",</div><div class='add'>+		.data = "VCNL4020",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vishay,vcnl4200",</div><div class='add'>+		.data = "VCNL4200",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, vcnl_4000_of_match);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver vcnl4000_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name   = VCNL4000_DRV_NAME,</div><div class='add'>+		.of_match_table = vcnl_4000_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe  = vcnl4000_probe,</div><div class='ctx'> 	.id_table = vcnl4000_id,</div><div class='head'>diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c<br/>index 93be1f4c0f27..f4d0a6c0fde7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/ak8974.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/ak8974.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/ak8974.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/ak8974.c</a></div><div class='hunk'>@@ -733,9 +733,8 @@ static int ak8974_probe(struct i2c_client *i2c,</div><div class='ctx'> 	ak8974-&gt;i2c = i2c;</div><div class='ctx'> 	mutex_init(&amp;ak8974-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	ret = of_iio_read_mount_matrix(&amp;i2c-&gt;dev,</div><div class='del'>-				       "mount-matrix",</div><div class='del'>-				       &amp;ak8974-&gt;orientation);</div><div class='add'>+	ret = iio_read_mount_matrix(&amp;i2c-&gt;dev, "mount-matrix",</div><div class='add'>+				    &amp;ak8974-&gt;orientation);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c<br/>index d430b80808ef..43d08c089792 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/ak8975.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/ak8975.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/ak8975.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/ak8975.c</a></div><div class='hunk'>@@ -746,12 +746,14 @@ static const struct iio_mount_matrix *</div><div class='ctx'> ak8975_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='ctx'> 			const struct iio_chan_spec *chan)</div><div class='ctx'> {</div><div class='del'>-	return &amp;((struct ak8975_data *)iio_priv(indio_dev))-&gt;orientation;</div><div class='add'>+	struct ak8975_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iio_chan_spec_ext_info ak8975_ext_info[] = {</div><div class='ctx'> 	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, ak8975_get_mount_matrix),</div><div class='del'>-	{ },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AK8975_CHANNEL(axis, index)					\</div><div class='hunk'>@@ -792,7 +794,7 @@ static const struct acpi_device_id ak_acpi_match[] = {</div><div class='ctx'> 	{"AK09911", AK09911},</div><div class='ctx'> 	{"AKM9911", AK09911},</div><div class='ctx'> 	{"AK09912", AK09912},</div><div class='del'>-	{ },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(acpi, ak_acpi_match);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -911,9 +913,8 @@ static int ak8975_probe(struct i2c_client *client,</div><div class='ctx'> 	data-&gt;eoc_irq = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata) {</div><div class='del'>-		err = of_iio_read_mount_matrix(&amp;client-&gt;dev,</div><div class='del'>-					       "mount-matrix",</div><div class='del'>-					       &amp;data-&gt;orientation);</div><div class='add'>+		err = iio_read_mount_matrix(&amp;client-&gt;dev, "mount-matrix",</div><div class='add'>+					    &amp;data-&gt;orientation);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	} else</div><div class='head'>diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c<br/>index d91cb845e3d6..b0d8b036d9bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/bmc150_magn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/bmc150_magn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/bmc150_magn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/bmc150_magn.c</a></div><div class='hunk'>@@ -143,6 +143,7 @@ struct bmc150_magn_data {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='add'>+	struct iio_mount_matrix orientation;</div><div class='ctx'> 	/* 4 x 32 bits for x, y z, 4 bytes align, 64 bits timestamp */</div><div class='ctx'> 	s32 buffer[6];</div><div class='ctx'> 	struct iio_trigger *dready_trig;</div><div class='hunk'>@@ -612,6 +613,20 @@ static ssize_t bmc150_magn_show_samp_freq_avail(struct device *dev,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iio_mount_matrix *</div><div class='add'>+bmc150_magn_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='add'>+			      const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct bmc150_magn_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec_ext_info bmc150_magn_ext_info[] = {</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_magn_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(bmc150_magn_show_samp_freq_avail);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *bmc150_magn_attributes[] = {</div><div class='hunk'>@@ -638,6 +653,7 @@ static const struct attribute_group bmc150_magn_attrs_group = {</div><div class='ctx'> 		.storagebits = 32,					\</div><div class='ctx'> 		.endianness = IIO_LE					\</div><div class='ctx'> 	},								\</div><div class='add'>+	.ext_info = bmc150_magn_ext_info,				\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iio_chan_spec bmc150_magn_channels[] = {</div><div class='hunk'>@@ -861,6 +877,11 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,</div><div class='ctx'> 	data-&gt;irq = irq;</div><div class='ctx'> 	data-&gt;dev = dev;</div><div class='ctx'> </div><div class='add'>+	ret = iio_read_mount_matrix(dev, "mount-matrix",</div><div class='add'>+				&amp;data-&gt;orientation);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	if (!name &amp;&amp; ACPI_HANDLE(dev))</div><div class='ctx'> 		name = bmc150_magn_match_acpi_device(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/magnetometer/hmc5843.h b/drivers/iio/magnetometer/hmc5843.h<br/>index a75224cf99df..e3e22d2508d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/hmc5843.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@ struct hmc5843_data {</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	const struct hmc5843_chip_info *variant;</div><div class='add'>+	struct iio_mount_matrix orientation;</div><div class='ctx'> 	__be16 buffer[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/magnetometer/hmc5843_core.c b/drivers/iio/magnetometer/hmc5843_core.c<br/>index ada142fb7aa3..05629ec56d80 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/hmc5843_core.c</a></div><div class='hunk'>@@ -237,6 +237,15 @@ int hmc5843_set_measurement_configuration(struct iio_dev *indio_dev,</div><div class='ctx'> 	return hmc5843_set_meas_conf(data, meas_conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iio_mount_matrix *</div><div class='add'>+hmc5843_get_mount_matrix(const struct iio_dev *indio_dev,</div><div class='add'>+			  const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	struct hmc5843_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	return &amp;data-&gt;orientation;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct iio_enum hmc5843_meas_conf_enum = {</div><div class='ctx'> 	.items = hmc5843_meas_conf_modes,</div><div class='ctx'> 	.num_items = ARRAY_SIZE(hmc5843_meas_conf_modes),</div><div class='hunk'>@@ -247,7 +256,8 @@ static const struct iio_enum hmc5843_meas_conf_enum = {</div><div class='ctx'> static const struct iio_chan_spec_ext_info hmc5843_ext_info[] = {</div><div class='ctx'> 	IIO_ENUM("meas_conf", true, &amp;hmc5843_meas_conf_enum),</div><div class='ctx'> 	IIO_ENUM_AVAILABLE("meas_conf", &amp;hmc5843_meas_conf_enum),</div><div class='del'>-	{ },</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, hmc5843_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct iio_enum hmc5983_meas_conf_enum = {</div><div class='hunk'>@@ -260,7 +270,8 @@ static const struct iio_enum hmc5983_meas_conf_enum = {</div><div class='ctx'> static const struct iio_chan_spec_ext_info hmc5983_ext_info[] = {</div><div class='ctx'> 	IIO_ENUM("meas_conf", true, &amp;hmc5983_meas_conf_enum),</div><div class='ctx'> 	IIO_ENUM_AVAILABLE("meas_conf", &amp;hmc5983_meas_conf_enum),</div><div class='del'>-	{ },</div><div class='add'>+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, hmc5843_get_mount_matrix),</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static</div><div class='hunk'>@@ -635,6 +646,11 @@ int hmc5843_common_probe(struct device *dev, struct regmap *regmap,</div><div class='ctx'> 	data-&gt;variant = &amp;hmc5843_chip_info_tbl[id];</div><div class='ctx'> 	mutex_init(&amp;data-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	ret = iio_read_mount_matrix(dev, "mount-matrix",</div><div class='add'>+				&amp;data-&gt;orientation);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	indio_dev-&gt;dev.parent = dev;</div><div class='ctx'> 	indio_dev-&gt;name = name;</div><div class='ctx'> 	indio_dev-&gt;info = &amp;hmc5843_info;</div><div class='head'>diff --git a/drivers/iio/magnetometer/hmc5843_i2c.c b/drivers/iio/magnetometer/hmc5843_i2c.c<br/>index 3de7f4426ac4..86abba5827a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843_i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843_i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/hmc5843_i2c.c</a></div><div class='hunk'>@@ -58,8 +58,13 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {</div><div class='ctx'> static int hmc5843_i2c_probe(struct i2c_client *cli,</div><div class='ctx'> 			     const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='add'>+	struct regmap *regmap = devm_regmap_init_i2c(cli,</div><div class='add'>+			&amp;hmc5843_i2c_regmap_config);</div><div class='add'>+	if (IS_ERR(regmap))</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+</div><div class='ctx'> 	return hmc5843_common_probe(&amp;cli-&gt;dev,</div><div class='del'>-			devm_regmap_init_i2c(cli, &amp;hmc5843_i2c_regmap_config),</div><div class='add'>+			regmap,</div><div class='ctx'> 			id-&gt;driver_data, id-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/magnetometer/hmc5843_spi.c b/drivers/iio/magnetometer/hmc5843_spi.c<br/>index 535f03a70d63..79b2b707f90e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/magnetometer/hmc5843_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/magnetometer/hmc5843_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/magnetometer/hmc5843_spi.c</a></div><div class='hunk'>@@ -58,6 +58,7 @@ static const struct regmap_config hmc5843_spi_regmap_config = {</div><div class='ctx'> static int hmc5843_spi_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct regmap *regmap;</div><div class='ctx'> 	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='ctx'> </div><div class='ctx'> 	spi-&gt;mode = SPI_MODE_3;</div><div class='hunk'>@@ -67,8 +68,12 @@ static int hmc5843_spi_probe(struct spi_device *spi)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	regmap = devm_regmap_init_spi(spi, &amp;hmc5843_spi_regmap_config);</div><div class='add'>+	if (IS_ERR(regmap))</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+</div><div class='ctx'> 	return hmc5843_common_probe(&amp;spi-&gt;dev,</div><div class='del'>-			devm_regmap_init_spi(spi, &amp;hmc5843_spi_regmap_config),</div><div class='add'>+			regmap,</div><div class='ctx'> 			id-&gt;driver_data, id-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iio/potentiometer/Kconfig b/drivers/iio/potentiometer/Kconfig<br/>index 6303cbe79903..a81a3a1b4dc8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/potentiometer/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/potentiometer/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/potentiometer/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/potentiometer/Kconfig</a></div><div class='hunk'>@@ -26,26 +26,26 @@ config DS1803</div><div class='ctx'> 	  module will be called ds1803.</div><div class='ctx'> </div><div class='ctx'> config MAX5481</div><div class='del'>-        tristate "Maxim MAX5481-MAX5484 Digital Potentiometer driver"</div><div class='del'>-        depends on SPI</div><div class='del'>-        help</div><div class='del'>-          Say yes here to build support for the Maxim</div><div class='del'>-          MAX5481, MAX5482, MAX5483, MAX5484 digital potentiometer</div><div class='del'>-          chips.</div><div class='add'>+	tristate "Maxim MAX5481-MAX5484 Digital Potentiometer driver"</div><div class='add'>+	depends on SPI</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to build support for the Maxim</div><div class='add'>+	  MAX5481, MAX5482, MAX5483, MAX5484 digital potentiometer</div><div class='add'>+	  chips.</div><div class='ctx'> </div><div class='del'>-          To compile this driver as a module, choose M here: the</div><div class='del'>-          module will be called max5481.</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called max5481.</div><div class='ctx'> </div><div class='ctx'> config MAX5487</div><div class='del'>-        tristate "Maxim MAX5487/MAX5488/MAX5489 Digital Potentiometer driver"</div><div class='del'>-        depends on SPI</div><div class='del'>-        help</div><div class='del'>-          Say yes here to build support for the Maxim</div><div class='del'>-          MAX5487, MAX5488, MAX5489 digital potentiometer</div><div class='del'>-          chips.</div><div class='del'>-</div><div class='del'>-          To compile this driver as a module, choose M here: the</div><div class='del'>-          module will be called max5487.</div><div class='add'>+	tristate "Maxim MAX5487/MAX5488/MAX5489 Digital Potentiometer driver"</div><div class='add'>+	depends on SPI</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to build support for the Maxim</div><div class='add'>+	  MAX5487, MAX5488, MAX5489 digital potentiometer</div><div class='add'>+	  chips.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called max5487.</div><div class='ctx'> </div><div class='ctx'> config MCP4018</div><div class='ctx'> 	tristate "Microchip MCP4017/18/19 Digital Potentiometer driver"</div><div class='head'>diff --git a/drivers/iio/potentiostat/lmp91000.c b/drivers/iio/potentiostat/lmp91000.c<br/>index 90e895adf997..a0e5f530faa9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/potentiostat/lmp91000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/potentiostat/lmp91000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/potentiostat/lmp91000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/potentiostat/lmp91000.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static int lmp91000_read(struct lmp91000_data *data, int channel, int *val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* delay till first temperature reading is complete */</div><div class='del'>-	if ((state != channel) &amp;&amp; (channel == LMP91000_REG_MODECN_TEMP))</div><div class='add'>+	if (state != channel &amp;&amp; channel == LMP91000_REG_MODECN_TEMP)</div><div class='ctx'> 		usleep_range(3000, 4000);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;chan_select = channel != LMP91000_REG_MODECN_3LEAD;</div><div class='hunk'>@@ -211,12 +211,11 @@ static int lmp91000_read_config(struct lmp91000_data *data)</div><div class='ctx'> </div><div class='ctx'> 	ret = of_property_read_u32(np, "ti,tia-gain-ohm", &amp;val);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		if (of_property_read_bool(np, "ti,external-tia-resistor"))</div><div class='del'>-			val = 0;</div><div class='del'>-		else {</div><div class='del'>-			dev_err(dev, "no ti,tia-gain-ohm defined");</div><div class='add'>+		if (!of_property_read_bool(np, "ti,external-tia-resistor")) {</div><div class='add'>+			dev_err(dev, "no ti,tia-gain-ohm defined and external resistor not specified\n");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		val = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='hunk'>@@ -255,8 +254,8 @@ static int lmp91000_read_config(struct lmp91000_data *data)</div><div class='ctx'> </div><div class='ctx'> 	regmap_write(data-&gt;regmap, LMP91000_REG_LOCK, 0);</div><div class='ctx'> 	regmap_write(data-&gt;regmap, LMP91000_REG_TIACN, reg);</div><div class='del'>-	regmap_write(data-&gt;regmap, LMP91000_REG_REFCN, LMP91000_REG_REFCN_EXT_REF</div><div class='del'>-					| LMP91000_REG_REFCN_50_ZERO);</div><div class='add'>+	regmap_write(data-&gt;regmap, LMP91000_REG_REFCN,</div><div class='add'>+		     LMP91000_REG_REFCN_EXT_REF | LMP91000_REG_REFCN_50_ZERO);</div><div class='ctx'> 	regmap_write(data-&gt;regmap, LMP91000_REG_LOCK, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -276,7 +275,6 @@ static int lmp91000_buffer_cb(const void *val, void *private)</div><div class='ctx'> static const struct iio_trigger_ops lmp91000_trigger_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int lmp91000_buffer_preenable(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lmp91000_data *data = iio_priv(indio_dev);</div><div class='head'>diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c<br/>index fe87d27779d9..3329d740c86c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/pressure/bmp280-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/pressure/bmp280-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/pressure/bmp280-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/pressure/bmp280-core.c</a></div><div class='hunk'>@@ -164,6 +164,9 @@ static int bmp280_read_calib(struct bmp280_data *data,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Toss the temperature calibration data into the entropy pool */</div><div class='add'>+	add_device_randomness(t_buf, sizeof(t_buf));</div><div class='add'>+</div><div class='ctx'> 	calib-&gt;T1 = le16_to_cpu(t_buf[T1]);</div><div class='ctx'> 	calib-&gt;T2 = le16_to_cpu(t_buf[T2]);</div><div class='ctx'> 	calib-&gt;T3 = le16_to_cpu(t_buf[T3]);</div><div class='hunk'>@@ -177,6 +180,9 @@ static int bmp280_read_calib(struct bmp280_data *data,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Toss the pressure calibration data into the entropy pool */</div><div class='add'>+	add_device_randomness(p_buf, sizeof(p_buf));</div><div class='add'>+</div><div class='ctx'> 	calib-&gt;P1 = le16_to_cpu(p_buf[P1]);</div><div class='ctx'> 	calib-&gt;P2 = le16_to_cpu(p_buf[P2]);</div><div class='ctx'> 	calib-&gt;P3 = le16_to_cpu(p_buf[P3]);</div><div class='head'>diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c<br/>index 87c07af9181f..034ce98d6e97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/pressure/cros_ec_baro.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/pressure/cros_ec_baro.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/pressure/cros_ec_baro.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/pressure/cros_ec_baro.c</a></div><div class='hunk'>@@ -1,19 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * cros_ec_baro - Driver for barometer sensor behind CrosEC.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 Google, Inc</div><div class='del'>- *</div><div class='del'>- * This software is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2, as published by the Free Software Foundation, and</div><div class='del'>- * may be copied, distributed, and modified under those terms.</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='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/common/cros_ec_sensors_core.h&gt;</div><div class='head'>diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig<br/>index b99367a89f81..e9f254ae3892 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/proximity/Kconfig</a></div><div class='hunk'>@@ -45,6 +45,18 @@ config LIDAR_LITE_V2</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called pulsedlight-lite-v2</div><div class='ctx'> </div><div class='add'>+config MB1232</div><div class='add'>+	tristate "MaxSonar I2CXL family ultrasonic sensors"</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  Say Y to build a driver for the ultrasonic sensors I2CXL of</div><div class='add'>+	  MaxBotix which have an i2c interface. It can be used to measure</div><div class='add'>+	  the distance of objects. Supported types are mb1202, mb1212,</div><div class='add'>+	  mb1222, mb1232, mb1242, mb7040, mb7137</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called mb1232.</div><div class='add'>+</div><div class='ctx'> config RFD77402</div><div class='ctx'> 	tristate "RFD77402 ToF sensor"</div><div class='ctx'> 	depends on I2C</div><div class='hunk'>@@ -56,12 +68,19 @@ config RFD77402</div><div class='ctx'> 	  module will be called rfd77402.</div><div class='ctx'> </div><div class='ctx'> config SRF04</div><div class='del'>-	tristate "Devantech SRF04 ultrasonic ranger sensor"</div><div class='add'>+	tristate "GPIO bitbanged ultrasonic ranger sensor (SRF04, MB1000)"</div><div class='ctx'> 	depends on GPIOLIB</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here to build a driver for Devantech SRF04 ultrasonic</div><div class='add'>+	  Say Y here to build a driver for GPIO bitbanged ultrasonic</div><div class='ctx'> 	  ranger sensor. This driver can be used to measure the distance</div><div class='ctx'> 	  of objects. It is using two GPIOs.</div><div class='add'>+	  Actually Supported types are:</div><div class='add'>+	  - Devantech SRF04</div><div class='add'>+	  - Maxbotix mb1000</div><div class='add'>+	  - Maxbotix mb1010</div><div class='add'>+	  - Maxbotix mb1020</div><div class='add'>+	  - Maxbotix mb1030</div><div class='add'>+	  - Maxbotix mb1040</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called srf04.</div><div class='head'>diff --git a/drivers/iio/proximity/Makefile b/drivers/iio/proximity/Makefile<br/>index 6d031f903c4c..0bb5f9de13d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/proximity/Makefile</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> obj-$(CONFIG_AS3935)		+= as3935.o</div><div class='ctx'> obj-$(CONFIG_ISL29501)		+= isl29501.o</div><div class='ctx'> obj-$(CONFIG_LIDAR_LITE_V2)	+= pulsedlight-lidar-lite-v2.o</div><div class='add'>+obj-$(CONFIG_MB1232)		+= mb1232.o</div><div class='ctx'> obj-$(CONFIG_RFD77402)		+= rfd77402.o</div><div class='ctx'> obj-$(CONFIG_SRF04)		+= srf04.o</div><div class='ctx'> obj-$(CONFIG_SRF08)		+= srf08.o</div><div class='head'>diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c<br/>index f130388a16a0..b591c63bd6c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/as3935.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/as3935.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/as3935.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/proximity/as3935.c</a></div><div class='hunk'>@@ -345,6 +345,14 @@ static SIMPLE_DEV_PM_OPS(as3935_pm_ops, as3935_suspend, as3935_resume);</div><div class='ctx'> #define AS3935_PM_OPS NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void as3935_stop_work(void *data)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = data;</div><div class='add'>+	struct as3935_state *st = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;st-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int as3935_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct iio_dev *indio_dev;</div><div class='hunk'>@@ -368,7 +376,6 @@ static int as3935_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	spi_set_drvdata(spi, indio_dev);</div><div class='ctx'> 	mutex_init(&amp;st-&gt;lock);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;st-&gt;work, as3935_event_work);</div><div class='ctx'> </div><div class='ctx'> 	ret = of_property_read_u32(np,</div><div class='ctx'> 			"ams,tuning-capacitor-pf", &amp;st-&gt;tune_cap);</div><div class='hunk'>@@ -414,22 +421,28 @@ static int as3935_probe(struct spi_device *spi)</div><div class='ctx'> 	iio_trigger_set_drvdata(trig, indio_dev);</div><div class='ctx'> 	trig-&gt;ops = &amp;iio_interrupt_trigger_ops;</div><div class='ctx'> </div><div class='del'>-	ret = iio_trigger_register(trig);</div><div class='add'>+	ret = devm_iio_trigger_register(&amp;spi-&gt;dev, trig);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "failed to register trigger\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time,</div><div class='del'>-		&amp;as3935_trigger_handler, NULL);</div><div class='add'>+	ret = devm_iio_triggered_buffer_setup(&amp;spi-&gt;dev, indio_dev,</div><div class='add'>+					      iio_pollfunc_store_time,</div><div class='add'>+					      as3935_trigger_handler, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "cannot setup iio trigger\n");</div><div class='del'>-		goto unregister_trigger;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	calibrate_as3935(st);</div><div class='ctx'> </div><div class='add'>+	INIT_DELAYED_WORK(&amp;st-&gt;work, as3935_event_work);</div><div class='add'>+	ret = devm_add_action(&amp;spi-&gt;dev, as3935_stop_work, indio_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = devm_request_irq(&amp;spi-&gt;dev, spi-&gt;irq,</div><div class='ctx'> 				&amp;as3935_interrupt_handler,</div><div class='ctx'> 				IRQF_TRIGGER_RISING,</div><div class='hunk'>@@ -438,35 +451,15 @@ static int as3935_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "unable to request irq\n");</div><div class='del'>-		goto unregister_buffer;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iio_device_register(indio_dev);</div><div class='add'>+	ret = devm_iio_device_register(&amp;spi-&gt;dev, indio_dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "unable to register device\n");</div><div class='del'>-		goto unregister_buffer;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-unregister_buffer:</div><div class='del'>-	iio_triggered_buffer_cleanup(indio_dev);</div><div class='del'>-</div><div class='del'>-unregister_trigger:</div><div class='del'>-	iio_trigger_unregister(st-&gt;trig);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int as3935_remove(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct iio_dev *indio_dev = spi_get_drvdata(spi);</div><div class='del'>-	struct as3935_state *st = iio_priv(indio_dev);</div><div class='del'>-</div><div class='del'>-	iio_device_unregister(indio_dev);</div><div class='del'>-	iio_triggered_buffer_cleanup(indio_dev);</div><div class='del'>-	iio_trigger_unregister(st-&gt;trig);</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 as3935_of_match[] = {</div><div class='hunk'>@@ -488,7 +481,6 @@ static struct spi_driver as3935_driver = {</div><div class='ctx'> 		.pm	= AS3935_PM_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= as3935_probe,</div><div class='del'>-	.remove		= as3935_remove,</div><div class='ctx'> 	.id_table	= as3935_id,</div><div class='ctx'> };</div><div class='ctx'> module_spi_driver(as3935_driver);</div><div class='head'>diff --git a/drivers/iio/proximity/mb1232.c b/drivers/iio/proximity/mb1232.c<br/>new file mode 100644<br/>index 000000000000..166b3e6d7db8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/mb1232.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/proximity/mb1232.c</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * mb1232.c - Support for MaxBotix I2CXL-MaxSonar-EZ series ultrasonic</div><div class='add'>+ *   ranger with i2c interface</div><div class='add'>+ * actually tested with mb1232 type</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Andreas Klinger &lt;ak@it-klinger.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * For details about the device see:</div><div class='add'>+ * https://www.maxbotix.com/documents/I2CXL-MaxSonar-EZ_Datasheet.pdf</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.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/bitops.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/iio/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/iio/buffer.h&gt;</div><div class='add'>+#include &lt;linux/iio/trigger_consumer.h&gt;</div><div class='add'>+#include &lt;linux/iio/triggered_buffer.h&gt;</div><div class='add'>+</div><div class='add'>+/* registers of MaxSonar device */</div><div class='add'>+#define MB1232_RANGE_COMMAND	0x51	/* Command for reading range */</div><div class='add'>+#define MB1232_ADDR_UNLOCK_1	0xAA	/* Command 1 for changing address */</div><div class='add'>+#define MB1232_ADDR_UNLOCK_2	0xA5	/* Command 2 for changing address */</div><div class='add'>+</div><div class='add'>+struct mb1232_data {</div><div class='add'>+	struct i2c_client	*client;</div><div class='add'>+</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * optionally a gpio can be used to announce when ranging has</div><div class='add'>+	 * finished</div><div class='add'>+	 * since we are just using the falling trigger of it we request</div><div class='add'>+	 * only the interrupt for announcing when data is ready to be read</div><div class='add'>+	 */</div><div class='add'>+	struct completion	ranging;</div><div class='add'>+	int			irqnr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t mb1232_handle_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_id;</div><div class='add'>+	struct mb1232_data *data = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	complete(&amp;data-&gt;ranging);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s16 mb1232_read_distance(struct mb1232_data *data)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = data-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+	s16 distance;</div><div class='add'>+	__be16 buf;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;data-&gt;ranging);</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_write_byte(client, MB1232_RANGE_COMMAND);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "write command - err: %d\n", ret);</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;irqnr &gt;= 0) {</div><div class='add'>+		/* it cannot take more than 100 ms */</div><div class='add'>+		ret = wait_for_completion_killable_timeout(&amp;data-&gt;ranging,</div><div class='add'>+									HZ/10);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error_unlock;</div><div class='add'>+		else if (ret == 0) {</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+			goto error_unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* use simple sleep if announce irq is not connected */</div><div class='add'>+		msleep(15);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_recv(client, (char *)&amp;buf, sizeof(buf));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "i2c_master_recv: ret=%d\n", ret);</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	distance = __be16_to_cpu(buf);</div><div class='add'>+	/* check for not returning misleading error codes */</div><div class='add'>+	if (distance &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "distance=%d\n", distance);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return distance;</div><div class='add'>+</div><div class='add'>+error_unlock:</div><div class='add'>+	mutex_unlock(&amp;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 irqreturn_t mb1232_trigger_handler(int irq, void *p)</div><div class='add'>+{</div><div class='add'>+	struct iio_poll_func *pf = p;</div><div class='add'>+	struct iio_dev *indio_dev = pf-&gt;indio_dev;</div><div class='add'>+	struct mb1232_data *data = iio_priv(indio_dev);</div><div class='add'>+	/*</div><div class='add'>+	 * triggered buffer</div><div class='add'>+	 * 16-bit channel + 48-bit padding + 64-bit timestamp</div><div class='add'>+	 */</div><div class='add'>+	s16 buffer[8] = { 0 };</div><div class='add'>+</div><div class='add'>+	buffer[0] = mb1232_read_distance(data);</div><div class='add'>+	if (buffer[0] &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	iio_push_to_buffers_with_timestamp(indio_dev, buffer, pf-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	iio_trigger_notify_done(indio_dev-&gt;trig);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mb1232_read_raw(struct iio_dev *indio_dev,</div><div class='add'>+			    struct iio_chan_spec const *channel, int *val,</div><div class='add'>+			    int *val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct mb1232_data *data = iio_priv(indio_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (channel-&gt;type != IIO_DISTANCE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		ret = mb1232_read_distance(data);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		*val = ret;</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		/* 1 LSB is 1 cm */</div><div class='add'>+		*val = 0;</div><div class='add'>+		*val2 = 10000;</div><div class='add'>+		return IIO_VAL_INT_PLUS_MICRO;</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 iio_chan_spec mb1232_channels[] = {</div><div class='add'>+	{</div><div class='add'>+		.type = IIO_DISTANCE,</div><div class='add'>+		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |</div><div class='add'>+				      BIT(IIO_CHAN_INFO_SCALE),</div><div class='add'>+		.scan_index = 0,</div><div class='add'>+		.scan_type = {</div><div class='add'>+			.sign = 's',</div><div class='add'>+			.realbits = 16,</div><div class='add'>+			.storagebits = 16,</div><div class='add'>+			.endianness = IIO_CPU,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	IIO_CHAN_SOFT_TIMESTAMP(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_info mb1232_info = {</div><div class='add'>+	.read_raw = mb1232_read_raw,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mb1232_probe(struct i2c_client *client,</div><div class='add'>+					 const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev;</div><div class='add'>+	struct mb1232_data *data;</div><div class='add'>+	int ret;</div><div class='add'>+	struct device *dev = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+					I2C_FUNC_SMBUS_READ_BYTE |</div><div class='add'>+					I2C_FUNC_SMBUS_WRITE_BYTE))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));</div><div class='add'>+	if (!indio_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data = iio_priv(indio_dev);</div><div class='add'>+	i2c_set_clientdata(client, indio_dev);</div><div class='add'>+	data-&gt;client = client;</div><div class='add'>+</div><div class='add'>+	indio_dev-&gt;info = &amp;mb1232_info;</div><div class='add'>+	indio_dev-&gt;name = id-&gt;name;</div><div class='add'>+	indio_dev-&gt;dev.parent = dev;</div><div class='add'>+	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='add'>+	indio_dev-&gt;channels = mb1232_channels;</div><div class='add'>+	indio_dev-&gt;num_channels = ARRAY_SIZE(mb1232_channels);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;data-&gt;ranging);</div><div class='add'>+</div><div class='add'>+	data-&gt;irqnr = irq_of_parse_and_map(dev-&gt;of_node, 0);</div><div class='add'>+	if (data-&gt;irqnr &lt;= 0) {</div><div class='add'>+		/* usage of interrupt is optional */</div><div class='add'>+		data-&gt;irqnr = -1;</div><div class='add'>+	} else {</div><div class='add'>+		ret = devm_request_irq(dev, data-&gt;irqnr, mb1232_handle_irq,</div><div class='add'>+				IRQF_TRIGGER_FALLING, id-&gt;name, indio_dev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(dev, "request_irq: %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'>+	ret = devm_iio_triggered_buffer_setup(dev, indio_dev,</div><div class='add'>+			iio_pollfunc_store_time, mb1232_trigger_handler, NULL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "setup of iio triggered buffer failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return devm_iio_device_register(dev, indio_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_mb1232_match[] = {</div><div class='add'>+	{ .compatible = "maxbotix,mb1202", },</div><div class='add'>+	{ .compatible = "maxbotix,mb1212", },</div><div class='add'>+	{ .compatible = "maxbotix,mb1222", },</div><div class='add'>+	{ .compatible = "maxbotix,mb1232", },</div><div class='add'>+	{ .compatible = "maxbotix,mb1242", },</div><div class='add'>+	{ .compatible = "maxbotix,mb7040", },</div><div class='add'>+	{ .compatible = "maxbotix,mb7137", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, of_mb1232_match);</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id mb1232_id[] = {</div><div class='add'>+	{ "maxbotix-mb1202", },</div><div class='add'>+	{ "maxbotix-mb1212", },</div><div class='add'>+	{ "maxbotix-mb1222", },</div><div class='add'>+	{ "maxbotix-mb1232", },</div><div class='add'>+	{ "maxbotix-mb1242", },</div><div class='add'>+	{ "maxbotix-mb7040", },</div><div class='add'>+	{ "maxbotix-mb7137", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, mb1232_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver mb1232_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "maxbotix-mb1232",</div><div class='add'>+		.of_match_table	= of_mb1232_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = mb1232_probe,</div><div class='add'>+	.id_table = mb1232_id,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(mb1232_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Andreas Klinger &lt;ak@it-klinger.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Maxbotix I2CXL-MaxSonar i2c ultrasonic ranger driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/iio/proximity/srf04.c b/drivers/iio/proximity/srf04.c<br/>index 09c7b9c095b0..1bad4018d1aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/srf04.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/proximity/srf04.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/proximity/srf04.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/proximity/srf04.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  * trig:  --+   +------------------------------------------------------</div><div class='ctx'>  *          ^   ^</div><div class='ctx'>  *          |&lt;-&gt;|</div><div class='del'>- *         udelay(10)</div><div class='add'>+ *         udelay(trigger_pulse_us)</div><div class='ctx'>  *</div><div class='ctx'>  * ultra           +-+ +-+ +-+</div><div class='ctx'>  * sonic           | | | | | |</div><div class='hunk'>@@ -48,6 +48,7 @@</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/of.h&gt;</div><div class='add'>+#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/property.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -56,6 +57,10 @@</div><div class='ctx'> #include &lt;linux/iio/iio.h&gt;</div><div class='ctx'> #include &lt;linux/iio/sysfs.h&gt;</div><div class='ctx'> </div><div class='add'>+struct srf04_cfg {</div><div class='add'>+	unsigned long trigger_pulse_us;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct srf04_data {</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	struct gpio_desc	*gpiod_trig;</div><div class='hunk'>@@ -66,6 +71,15 @@ struct srf04_data {</div><div class='ctx'> 	ktime_t			ts_falling;</div><div class='ctx'> 	struct completion	rising;</div><div class='ctx'> 	struct completion	falling;</div><div class='add'>+	const struct srf04_cfg	*cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct srf04_cfg srf04_cfg = {</div><div class='add'>+	.trigger_pulse_us = 10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct srf04_cfg mb_lv_cfg = {</div><div class='add'>+	.trigger_pulse_us = 20,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t srf04_handle_irq(int irq, void *dev_id)</div><div class='hunk'>@@ -102,7 +116,7 @@ static int srf04_read(struct srf04_data *data)</div><div class='ctx'> 	reinit_completion(&amp;data-&gt;falling);</div><div class='ctx'> </div><div class='ctx'> 	gpiod_set_value(data-&gt;gpiod_trig, 1);</div><div class='del'>-	udelay(10);</div><div class='add'>+	udelay(data-&gt;cfg-&gt;trigger_pulse_us);</div><div class='ctx'> 	gpiod_set_value(data-&gt;gpiod_trig, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* it cannot take more than 20 ms */</div><div class='hunk'>@@ -215,6 +229,18 @@ static const struct iio_chan_spec srf04_chan_spec[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id of_srf04_match[] = {</div><div class='add'>+	{ .compatible = "devantech,srf04", .data = &amp;srf04_cfg},</div><div class='add'>+	{ .compatible = "maxbotix,mb1000", .data = &amp;mb_lv_cfg},</div><div class='add'>+	{ .compatible = "maxbotix,mb1010", .data = &amp;mb_lv_cfg},</div><div class='add'>+	{ .compatible = "maxbotix,mb1020", .data = &amp;mb_lv_cfg},</div><div class='add'>+	{ .compatible = "maxbotix,mb1030", .data = &amp;mb_lv_cfg},</div><div class='add'>+	{ .compatible = "maxbotix,mb1040", .data = &amp;mb_lv_cfg},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, of_srf04_match);</div><div class='add'>+</div><div class='ctx'> static int srf04_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -230,6 +256,7 @@ static int srf04_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	data = iio_priv(indio_dev);</div><div class='ctx'> 	data-&gt;dev = dev;</div><div class='add'>+	data-&gt;cfg = of_match_device(of_srf04_match, dev)-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;data-&gt;lock);</div><div class='ctx'> 	init_completion(&amp;data-&gt;rising);</div><div class='hunk'>@@ -280,13 +307,6 @@ static int srf04_probe(struct platform_device *pdev)</div><div class='ctx'> 	return devm_iio_device_register(dev, indio_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id of_srf04_match[] = {</div><div class='del'>-	{ .compatible = "devantech,srf04", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(of, of_srf04_match);</div><div class='del'>-</div><div class='ctx'> static struct platform_driver srf04_driver = {</div><div class='ctx'> 	.probe		= srf04_probe,</div><div class='ctx'> 	.driver		= {</div><div class='head'>diff --git a/drivers/iio/temperature/Kconfig b/drivers/iio/temperature/Kconfig<br/>index 82e4a62745e2..c185cbee25c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/temperature/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/temperature/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/temperature/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/temperature/Kconfig</a></div><div class='hunk'>@@ -66,14 +66,14 @@ config TMP006</div><div class='ctx'> 	  be called tmp006.</div><div class='ctx'> </div><div class='ctx'> config TMP007</div><div class='del'>-        tristate "TMP007 infrared thermopile sensor with Integrated Math Engine"</div><div class='del'>-        depends on I2C</div><div class='del'>-        help</div><div class='del'>-          If you say yes here you get support for the Texas Instruments</div><div class='del'>-          TMP007 infrared thermopile sensor with Integrated Math Engine.</div><div class='add'>+	tristate "TMP007 infrared thermopile sensor with Integrated Math Engine"</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the Texas Instruments</div><div class='add'>+	  TMP007 infrared thermopile sensor with Integrated Math Engine.</div><div class='ctx'> </div><div class='del'>-          This driver can also be built as a module. If so, the module will</div><div class='del'>-          be called tmp007.</div><div class='add'>+	  This driver can also be built as a module. If so, the module will</div><div class='add'>+	  be called tmp007.</div><div class='ctx'> </div><div class='ctx'> config TSYS01</div><div class='ctx'> 	tristate "Measurement Specialties TSYS01 temperature sensor using I2C bus connection"</div><div class='hunk'>@@ -97,4 +97,14 @@ config TSYS02D</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module will</div><div class='ctx'> 	  be called tsys02d.</div><div class='ctx'> </div><div class='add'>+config MAX31856</div><div class='add'>+	tristate "MAX31856 thermocouple sensor"</div><div class='add'>+	depends on SPI</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for MAX31856</div><div class='add'>+	  thermocouple sensor chip connected via SPI.</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 max31856.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/iio/temperature/Makefile b/drivers/iio/temperature/Makefile<br/>index 34a31db0bb63..baca4776ca0d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/temperature/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/temperature/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/temperature/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/temperature/Makefile</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HID_SENSOR_TEMP) += hid-sensor-temperature.o</div><div class='ctx'> obj-$(CONFIG_MAXIM_THERMOCOUPLE) += maxim_thermocouple.o</div><div class='add'>+obj-$(CONFIG_MAX31856) += max31856.o</div><div class='ctx'> obj-$(CONFIG_MLX90614) += mlx90614.o</div><div class='ctx'> obj-$(CONFIG_MLX90632) += mlx90632.o</div><div class='ctx'> obj-$(CONFIG_TMP006) += tmp006.o</div><div class='head'>diff --git a/drivers/iio/temperature/max31856.c b/drivers/iio/temperature/max31856.c<br/>new file mode 100644<br/>index 000000000000..f184ba5601d9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/temperature/max31856.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/temperature/max31856.c</a></div><div class='hunk'>@@ -0,0 +1,356 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* max31856.c</div><div class='add'>+ *</div><div class='add'>+ * Maxim MAX31856 thermocouple sensor driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018-2019 Rockwell Collins</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/init.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+#include &lt;linux/iio/sysfs.h&gt;</div><div class='add'>+#include &lt;dt-bindings/iio/temperature/thermocouple.h&gt;</div><div class='add'>+/*</div><div class='add'>+ * The MSB of the register value determines whether the following byte will</div><div class='add'>+ * be written or read. If it is 0, one or more byte reads will follow.</div><div class='add'>+ */</div><div class='add'>+#define MAX31856_RD_WR_BIT         BIT(7)</div><div class='add'>+</div><div class='add'>+#define MAX31856_CR0_AUTOCONVERT   BIT(7)</div><div class='add'>+#define MAX31856_CR0_1SHOT         BIT(6)</div><div class='add'>+#define MAX31856_CR0_OCFAULT       BIT(4)</div><div class='add'>+#define MAX31856_CR0_OCFAULT_MASK  GENMASK(5, 4)</div><div class='add'>+#define MAX31856_TC_TYPE_MASK      GENMASK(3, 0)</div><div class='add'>+#define MAX31856_FAULT_OVUV        BIT(1)</div><div class='add'>+#define MAX31856_FAULT_OPEN        BIT(0)</div><div class='add'>+</div><div class='add'>+/* The MAX31856 registers */</div><div class='add'>+#define MAX31856_CR0_REG           0x00</div><div class='add'>+#define MAX31856_CR1_REG           0x01</div><div class='add'>+#define MAX31856_MASK_REG          0x02</div><div class='add'>+#define MAX31856_CJHF_REG          0x03</div><div class='add'>+#define MAX31856_CJLF_REG          0x04</div><div class='add'>+#define MAX31856_LTHFTH_REG        0x05</div><div class='add'>+#define MAX31856_LTHFTL_REG        0x06</div><div class='add'>+#define MAX31856_LTLFTH_REG        0x07</div><div class='add'>+#define MAX31856_LTLFTL_REG        0x08</div><div class='add'>+#define MAX31856_CJTO_REG          0x09</div><div class='add'>+#define MAX31856_CJTH_REG          0x0A</div><div class='add'>+#define MAX31856_CJTL_REG          0x0B</div><div class='add'>+#define MAX31856_LTCBH_REG         0x0C</div><div class='add'>+#define MAX31856_LTCBM_REG         0x0D</div><div class='add'>+#define MAX31856_LTCBL_REG         0x0E</div><div class='add'>+#define MAX31856_SR_REG            0x0F</div><div class='add'>+</div><div class='add'>+static const struct iio_chan_spec max31856_channels[] = {</div><div class='add'>+	{	/* Thermocouple Temperature */</div><div class='add'>+		.type = IIO_TEMP,</div><div class='add'>+		.info_mask_separate =</div><div class='add'>+			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),</div><div class='add'>+	},</div><div class='add'>+	{	/* Cold Junction Temperature */</div><div class='add'>+		.type = IIO_TEMP,</div><div class='add'>+		.channel2 = IIO_MOD_TEMP_AMBIENT,</div><div class='add'>+		.modified = 1,</div><div class='add'>+		.info_mask_separate =</div><div class='add'>+			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct max31856_data {</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+	u32 thermocouple_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int max31856_read(struct max31856_data *data, u8 reg,</div><div class='add'>+			 u8 val[], unsigned int read_size)</div><div class='add'>+{</div><div class='add'>+	return spi_write_then_read(data-&gt;spi, &amp;reg, 1, val, read_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max31856_write(struct max31856_data *data, u8 reg,</div><div class='add'>+			  unsigned int val)</div><div class='add'>+{</div><div class='add'>+	u8 buf[2];</div><div class='add'>+</div><div class='add'>+	buf[0] = reg | (MAX31856_RD_WR_BIT);</div><div class='add'>+	buf[1] = val;</div><div class='add'>+</div><div class='add'>+	return spi_write(data-&gt;spi, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max31856_init(struct max31856_data *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reg_cr0_val, reg_cr1_val;</div><div class='add'>+</div><div class='add'>+	/* Start by changing to Off mode before making changes as</div><div class='add'>+	 * some settings are recommended to be set only when the device</div><div class='add'>+	 * is off</div><div class='add'>+	 */</div><div class='add'>+	ret = max31856_read(data, MAX31856_CR0_REG, &amp;reg_cr0_val, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reg_cr0_val &amp;= ~MAX31856_CR0_AUTOCONVERT;</div><div class='add'>+	ret = max31856_write(data, MAX31856_CR0_REG, reg_cr0_val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set thermocouple type based on dts property */</div><div class='add'>+	ret = max31856_read(data, MAX31856_CR1_REG, &amp;reg_cr1_val, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reg_cr1_val &amp;= ~MAX31856_TC_TYPE_MASK;</div><div class='add'>+	reg_cr1_val |= data-&gt;thermocouple_type;</div><div class='add'>+	ret = max31856_write(data, MAX31856_CR1_REG, reg_cr1_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'>+	 * Enable Open circuit fault detection</div><div class='add'>+	 * Read datasheet for more information: Table 4.</div><div class='add'>+	 * Value 01 means : Enabled (Once every 16 conversions)</div><div class='add'>+	 */</div><div class='add'>+	reg_cr0_val &amp;= ~MAX31856_CR0_OCFAULT_MASK;</div><div class='add'>+	reg_cr0_val |= MAX31856_CR0_OCFAULT;</div><div class='add'>+</div><div class='add'>+	/* Set Auto Conversion Mode */</div><div class='add'>+	reg_cr0_val &amp;= ~MAX31856_CR0_1SHOT;</div><div class='add'>+	reg_cr0_val |= MAX31856_CR0_AUTOCONVERT;</div><div class='add'>+</div><div class='add'>+	return max31856_write(data, MAX31856_CR0_REG, reg_cr0_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max31856_thermocouple_read(struct max31856_data *data,</div><div class='add'>+				      struct iio_chan_spec const *chan,</div><div class='add'>+				      int *val)</div><div class='add'>+{</div><div class='add'>+	int ret, offset_cjto;</div><div class='add'>+	u8 reg_val[3];</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;channel2) {</div><div class='add'>+	case IIO_NO_MOD:</div><div class='add'>+		/*</div><div class='add'>+		 * Multibyte Read</div><div class='add'>+		 * MAX31856_LTCBH_REG, MAX31856_LTCBM_REG, MAX31856_LTCBL_REG</div><div class='add'>+		 */</div><div class='add'>+		ret = max31856_read(data, MAX31856_LTCBH_REG, reg_val, 3);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		/* Skip last 5 dead bits of LTCBL */</div><div class='add'>+		*val = (reg_val[0] &lt;&lt; 16 | reg_val[1] &lt;&lt; 8 | reg_val[2]) &gt;&gt; 5;</div><div class='add'>+		/* Check 7th bit of LTCBH reg. value for sign*/</div><div class='add'>+		if (reg_val[0] &amp; 0x80)</div><div class='add'>+			*val -= 0x80000;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IIO_MOD_TEMP_AMBIENT:</div><div class='add'>+		/*</div><div class='add'>+		 * Multibyte Read</div><div class='add'>+		 * MAX31856_CJTO_REG, MAX31856_CJTH_REG, MAX31856_CJTL_REG</div><div class='add'>+		 */</div><div class='add'>+		ret = max31856_read(data, MAX31856_CJTO_REG, reg_val, 3);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		/* Get Cold Junction Temp. offset register value */</div><div class='add'>+		offset_cjto = reg_val[0];</div><div class='add'>+		/* Get CJTH and CJTL value and skip last 2 dead bits of CJTL */</div><div class='add'>+		*val = (reg_val[1] &lt;&lt; 8 | reg_val[2]) &gt;&gt; 2;</div><div class='add'>+		/* As per datasheet add offset into CJTH and CJTL */</div><div class='add'>+		*val += offset_cjto;</div><div class='add'>+		/* Check 7th bit of CJTH reg. value for sign */</div><div class='add'>+		if (reg_val[1] &amp; 0x80)</div><div class='add'>+			*val -= 0x4000;</div><div class='add'>+		break;</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'>+	ret = max31856_read(data, MAX31856_SR_REG, reg_val, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	/* Check for over/under voltage or open circuit fault */</div><div class='add'>+	if (reg_val[0] &amp; (MAX31856_FAULT_OVUV | MAX31856_FAULT_OPEN))</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 max31856_read_raw(struct iio_dev *indio_dev,</div><div class='add'>+			     struct iio_chan_spec const *chan,</div><div class='add'>+			     int *val, int *val2, long mask)</div><div class='add'>+{</div><div class='add'>+	struct max31856_data *data = iio_priv(indio_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_RAW:</div><div class='add'>+		ret = max31856_thermocouple_read(data, chan, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		return IIO_VAL_INT;</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		switch (chan-&gt;channel2) {</div><div class='add'>+		case IIO_MOD_TEMP_AMBIENT:</div><div class='add'>+			/* Cold junction Temp. Data resolution is 0.015625 */</div><div class='add'>+			*val = 15;</div><div class='add'>+			*val2 = 625000; /* 1000 * 0.015625 */</div><div class='add'>+			ret = IIO_VAL_INT_PLUS_MICRO;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* Thermocouple Temp. Data resolution is 0.0078125 */</div><div class='add'>+			*val = 7;</div><div class='add'>+			*val2 = 812500; /* 1000 * 0.0078125) */</div><div class='add'>+			return IIO_VAL_INT_PLUS_MICRO;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</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 ssize_t show_fault(struct device *dev, u8 faultbit, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);</div><div class='add'>+	struct max31856_data *data = iio_priv(indio_dev);</div><div class='add'>+	u8 reg_val;</div><div class='add'>+	int ret;</div><div class='add'>+	bool fault;</div><div class='add'>+</div><div class='add'>+	ret = max31856_read(data, MAX31856_SR_REG, &amp;reg_val, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	fault = reg_val &amp; faultbit;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", fault);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_fault_ovuv(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='add'>+			       char *buf)</div><div class='add'>+{</div><div class='add'>+	return show_fault(dev, MAX31856_FAULT_OVUV, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_fault_oc(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr,</div><div class='add'>+			     char *buf)</div><div class='add'>+{</div><div class='add'>+	return show_fault(dev, MAX31856_FAULT_OPEN, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static IIO_DEVICE_ATTR(fault_ovuv, 0444, show_fault_ovuv, NULL, 0);</div><div class='add'>+static IIO_DEVICE_ATTR(fault_oc, 0444, show_fault_oc, NULL, 0);</div><div class='add'>+</div><div class='add'>+static struct attribute *max31856_attributes[] = {</div><div class='add'>+	&amp;iio_dev_attr_fault_ovuv.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_fault_oc.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group max31856_group = {</div><div class='add'>+	.attrs = max31856_attributes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iio_info max31856_info = {</div><div class='add'>+	.read_raw = max31856_read_raw,</div><div class='add'>+	.attrs = &amp;max31856_group,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int max31856_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='add'>+	struct iio_dev *indio_dev;</div><div class='add'>+	struct max31856_data *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	indio_dev = devm_iio_device_alloc(&amp;spi-&gt;dev, sizeof(*data));</div><div class='add'>+	if (!indio_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data = iio_priv(indio_dev);</div><div class='add'>+	data-&gt;spi = spi;</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, indio_dev);</div><div class='add'>+</div><div class='add'>+	indio_dev-&gt;info = &amp;max31856_info;</div><div class='add'>+	indio_dev-&gt;name = id-&gt;name;</div><div class='add'>+	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='add'>+	indio_dev-&gt;channels = max31856_channels;</div><div class='add'>+	indio_dev-&gt;num_channels = ARRAY_SIZE(max31856_channels);</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(spi-&gt;dev.of_node, "thermocouple-type",</div><div class='add'>+				   &amp;data-&gt;thermocouple_type);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_info(&amp;spi-&gt;dev,</div><div class='add'>+			 "Could not read thermocouple type DT property, configuring as a K-Type\n");</div><div class='add'>+		data-&gt;thermocouple_type = THERMOCOUPLE_TYPE_K;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * no need to translate values as the supported types</div><div class='add'>+	 * have the same value as the #defines</div><div class='add'>+	 */</div><div class='add'>+	switch (data-&gt;thermocouple_type) {</div><div class='add'>+	case THERMOCOUPLE_TYPE_B:</div><div class='add'>+	case THERMOCOUPLE_TYPE_E:</div><div class='add'>+	case THERMOCOUPLE_TYPE_J:</div><div class='add'>+	case THERMOCOUPLE_TYPE_K:</div><div class='add'>+	case THERMOCOUPLE_TYPE_N:</div><div class='add'>+	case THERMOCOUPLE_TYPE_R:</div><div class='add'>+	case THERMOCOUPLE_TYPE_S:</div><div class='add'>+	case THERMOCOUPLE_TYPE_T:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;spi-&gt;dev,</div><div class='add'>+			"error: thermocouple-type %u not supported by max31856\n"</div><div class='add'>+			, data-&gt;thermocouple_type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = max31856_init(data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "error: Failed to configure max31856\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return devm_iio_device_register(&amp;spi-&gt;dev, indio_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id max31856_id[] = {</div><div class='add'>+	{ "max31856", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, max31856_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id max31856_of_match[] = {</div><div class='add'>+	{ .compatible = "maxim,max31856" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, max31856_of_match);</div><div class='add'>+</div><div class='add'>+static struct spi_driver max31856_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "max31856",</div><div class='add'>+		.of_match_table = max31856_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = max31856_probe,</div><div class='add'>+	.id_table = max31856_id,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(max31856_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Paresh Chaudhary &lt;paresh.chaudhary@rockwellcollins.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Patrick Havelange &lt;patrick.havelange@essensium.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Maxim MAX31856 thermocouple sensor driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/iio/trigger/iio-trig-loop.c b/drivers/iio/trigger/iio-trig-loop.c<br/>index 94a90e0a3fdb..9258d3cf149b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/trigger/iio-trig-loop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iio/trigger/iio-trig-loop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iio/trigger/iio-trig-loop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iio/trigger/iio-trig-loop.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static int iio_loop_trigger_set_state(struct iio_trigger *trig, bool state)</div><div class='ctx'> 	if (state) {</div><div class='ctx'> 		loop_trig-&gt;task = kthread_run(iio_loop_thread,</div><div class='ctx'> 					      trig, trig-&gt;name);</div><div class='del'>-		if (unlikely(IS_ERR(loop_trig-&gt;task))) {</div><div class='add'>+		if (IS_ERR(loop_trig-&gt;task)) {</div><div class='ctx'> 			dev_err(&amp;trig-&gt;dev,</div><div class='ctx'> 				"failed to create trigger loop thread\n");</div><div class='ctx'> 			return PTR_ERR(loop_trig-&gt;task);</div><div class='head'>diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig<br/>index a1fb840de45d..d318bab25860 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/Kconfig</a></div><div class='hunk'>@@ -25,7 +25,6 @@ config INFINIBAND_USER_MAD</div><div class='ctx'> </div><div class='ctx'> config INFINIBAND_USER_ACCESS</div><div class='ctx'> 	tristate "InfiniBand userspace access (verbs and CM)"</div><div class='del'>-	select ANON_INODES</div><div class='ctx'> 	depends on MMU</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Userspace InfiniBand access support.  This enables the</div><div class='head'>diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c<br/>index 0dce94e3c495..744b6ec0acb0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/addr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/addr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/addr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/addr.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #include &lt;net/neighbour.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_addr.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_sa.h&gt;</div><div class='hunk'>@@ -86,8 +86,8 @@ static inline bool ib_nl_is_good_ip_resp(const struct nlmsghdr *nlh)</div><div class='ctx'> 	if (nlh-&gt;nlmsg_flags &amp; RDMA_NL_LS_F_ERR)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),</div><div class='del'>-			nlmsg_len(nlh), ib_nl_addr_policy, NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),</div><div class='add'>+				   nlmsg_len(nlh), ib_nl_addr_policy, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +351,7 @@ static bool has_gateway(const struct dst_entry *dst, sa_family_t family)</div><div class='ctx'> </div><div class='ctx'> 	if (family == AF_INET) {</div><div class='ctx'> 		rt = container_of(dst, struct rtable, dst);</div><div class='del'>-		return rt-&gt;rt_uses_gateway;</div><div class='add'>+		return rt-&gt;rt_gw_family == AF_INET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rt6 = container_of(dst, struct rt6_info, dst);</div><div class='head'>diff --git a/drivers/infiniband/core/iwpm_util.c b/drivers/infiniband/core/iwpm_util.c<br/>index a5d2a20ee697..41929bb83739 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/iwpm_util.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/iwpm_util.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/iwpm_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/iwpm_util.c</a></div><div class='hunk'>@@ -506,14 +506,14 @@ int iwpm_parse_nlmsg(struct netlink_callback *cb, int policy_max,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	const char *err_str = "";</div><div class='ctx'> </div><div class='del'>-	ret = nlmsg_validate(cb-&gt;nlh, nlh_len, policy_max - 1, nlmsg_policy,</div><div class='del'>-			     NULL);</div><div class='add'>+	ret = nlmsg_validate_deprecated(cb-&gt;nlh, nlh_len, policy_max - 1,</div><div class='add'>+					nlmsg_policy, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		err_str = "Invalid attribute";</div><div class='ctx'> 		goto parse_nlmsg_error;</div><div class='ctx'> 	}</div><div class='del'>-	ret = nlmsg_parse(cb-&gt;nlh, nlh_len, nltb, policy_max - 1,</div><div class='del'>-			  nlmsg_policy, NULL);</div><div class='add'>+	ret = nlmsg_parse_deprecated(cb-&gt;nlh, nlh_len, nltb, policy_max - 1,</div><div class='add'>+				     nlmsg_policy, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		err_str = "Unable to parse the nlmsg";</div><div class='ctx'> 		goto parse_nlmsg_error;</div><div class='head'>diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c<br/>index 11ed58d3fce5..85324012bf07 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/nldev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/nldev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/nldev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/nldev.c</a></div><div class='hunk'>@@ -292,7 +292,8 @@ static int fill_res_info_entry(struct sk_buff *msg,</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *entry_attr;</div><div class='ctx'> </div><div class='del'>-	entry_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY);</div><div class='add'>+	entry_attr = nla_nest_start_noflag(msg,</div><div class='add'>+					   RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY);</div><div class='ctx'> 	if (!entry_attr)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -327,7 +328,7 @@ static int fill_res_info(struct sk_buff *msg, struct ib_device *device)</div><div class='ctx'> 	if (fill_nldev_handle(msg, device))</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='del'>-	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_RES_SUMMARY);</div><div class='add'>+	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_RES_SUMMARY);</div><div class='ctx'> 	if (!table_attr)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -607,8 +608,8 @@ static int nldev_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (err || !tb[RDMA_NLDEV_ATTR_DEV_INDEX])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -652,8 +653,8 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1, nldev_policy,</div><div class='del'>-			  extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (err || !tb[RDMA_NLDEV_ATTR_DEV_INDEX])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -721,8 +722,8 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 port;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (err ||</div><div class='ctx'> 	    !tb[RDMA_NLDEV_ATTR_DEV_INDEX] ||</div><div class='ctx'> 	    !tb[RDMA_NLDEV_ATTR_PORT_INDEX])</div><div class='hunk'>@@ -777,8 +778,8 @@ static int nldev_port_get_dumpit(struct sk_buff *skb,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int p;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(cb-&gt;nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, NULL);</div><div class='add'>+	err = nlmsg_parse_deprecated(cb-&gt;nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, NULL);</div><div class='ctx'> 	if (err || !tb[RDMA_NLDEV_ATTR_DEV_INDEX])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -832,8 +833,8 @@ static int nldev_res_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, extack);</div><div class='add'>+	ret = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (ret || !tb[RDMA_NLDEV_ATTR_DEV_INDEX])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -981,8 +982,8 @@ static int res_get_common_doit(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	struct sk_buff *msg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, extack);</div><div class='add'>+	ret = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (ret || !tb[RDMA_NLDEV_ATTR_DEV_INDEX] || !fe-&gt;id || !tb[fe-&gt;id])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1070,8 +1071,8 @@ static int res_get_common_dumpit(struct sk_buff *skb,</div><div class='ctx'> 	u32 index, port = 0;</div><div class='ctx'> 	bool filled = false;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(cb-&gt;nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, NULL);</div><div class='add'>+	err = nlmsg_parse_deprecated(cb-&gt;nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, NULL);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Right now, we are expecting the device index to get res information,</div><div class='ctx'> 	 * but it is possible to extend this code to return all devices in</div><div class='hunk'>@@ -1108,7 +1109,7 @@ static int res_get_common_dumpit(struct sk_buff *skb,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table_attr = nla_nest_start(skb, fe-&gt;nldev_attr);</div><div class='add'>+	table_attr = nla_nest_start_noflag(skb, fe-&gt;nldev_attr);</div><div class='ctx'> 	if (!table_attr) {</div><div class='ctx'> 		ret = -EMSGSIZE;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -1134,7 +1135,7 @@ static int res_get_common_dumpit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		filled = true;</div><div class='ctx'> </div><div class='del'>-		entry_attr = nla_nest_start(skb, fe-&gt;entry);</div><div class='add'>+		entry_attr = nla_nest_start_noflag(skb, fe-&gt;entry);</div><div class='ctx'> 		if (!entry_attr) {</div><div class='ctx'> 			ret = -EMSGSIZE;</div><div class='ctx'> 			rdma_restrack_put(res);</div><div class='hunk'>@@ -1249,8 +1250,8 @@ static int nldev_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	char type[IFNAMSIZ];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (err || !tb[RDMA_NLDEV_ATTR_DEV_NAME] ||</div><div class='ctx'> 	    !tb[RDMA_NLDEV_ATTR_LINK_TYPE] || !tb[RDMA_NLDEV_ATTR_NDEV_NAME])</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1293,8 +1294,8 @@ static int nldev_dellink(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='del'>-			  nldev_policy, extack);</div><div class='add'>+	err = nlmsg_parse_deprecated(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,</div><div class='add'>+				     nldev_policy, extack);</div><div class='ctx'> 	if (err || !tb[RDMA_NLDEV_ATTR_DEV_INDEX])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c<br/>index 7925e45ea88a..bb534959abf0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/sa_query.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/sa_query.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/sa_query.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/sa_query.c</a></div><div class='hunk'>@@ -1028,8 +1028,8 @@ int ib_nl_handle_set_timeout(struct sk_buff *skb,</div><div class='ctx'> 	    !(NETLINK_CB(skb).sk))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),</div><div class='del'>-			nlmsg_len(nlh), ib_nl_policy, NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),</div><div class='add'>+				   nlmsg_len(nlh), ib_nl_policy, NULL);</div><div class='ctx'> 	attr = (const struct nlattr *)tb[LS_NLA_TYPE_TIMEOUT];</div><div class='ctx'> 	if (ret || !attr)</div><div class='ctx'> 		goto settimeout_out;</div><div class='hunk'>@@ -1080,8 +1080,8 @@ static inline int ib_nl_is_good_resolve_resp(const struct nlmsghdr *nlh)</div><div class='ctx'> 	if (nlh-&gt;nlmsg_flags &amp; RDMA_NL_LS_F_ERR)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),</div><div class='del'>-			nlmsg_len(nlh), ib_nl_policy, NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),</div><div class='add'>+				   nlmsg_len(nlh), ib_nl_policy, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c<br/>index 7541fbaf58a3..65c3230f5663 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/ucm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/ucm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/ucm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/ucm.c</a></div><div class='hunk'>@@ -1175,7 +1175,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	file-&gt;filp = filp;</div><div class='ctx'> 	file-&gt;device = container_of(inode-&gt;i_cdev, struct ib_ucm_device, cdev);</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ib_ucm_close(struct inode *inode, struct file *filp)</div><div class='head'>diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c<br/>index 7468b26b8a01..140a338a135f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/ucma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/ucma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/ucma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/ucma.c</a></div><div class='hunk'>@@ -1744,7 +1744,7 @@ static int ucma_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	filp-&gt;private_data = file;</div><div class='ctx'> 	file-&gt;filp = filp;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ucma_close(struct inode *inode, struct file *filp)</div><div class='head'>diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c<br/>index 02b7947ab215..b58b07c03cfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/user_mad.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/user_mad.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/user_mad.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/user_mad.c</a></div><div class='hunk'>@@ -985,7 +985,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;file-&gt;port_list, &amp;port-&gt;file_list);</div><div class='ctx'> </div><div class='del'>-	nonseekable_open(inode, filp);</div><div class='add'>+	stream_open(inode, filp);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;port-&gt;file_mutex);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h<br/>index ea0bc6885517..32cc8fe7902f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/uverbs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/uverbs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/uverbs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/uverbs.h</a></div><div class='hunk'>@@ -160,6 +160,7 @@ struct ib_uverbs_file {</div><div class='ctx'> </div><div class='ctx'> 	struct mutex umap_lock;</div><div class='ctx'> 	struct list_head umaps;</div><div class='add'>+	struct page *disassociate_page;</div><div class='ctx'> </div><div class='ctx'> 	struct idr		idr;</div><div class='ctx'> 	/* spinlock protects write access to idr */</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c<br/>index 70b7d80431a9..8b43dd96d3b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/uverbs_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/core/uverbs_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/core/uverbs_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/core/uverbs_main.c</a></div><div class='hunk'>@@ -208,6 +208,9 @@ void ib_uverbs_release_file(struct kref *ref)</div><div class='ctx'> 		kref_put(&amp;file-&gt;async_file-&gt;ref,</div><div class='ctx'> 			 ib_uverbs_release_async_event_file);</div><div class='ctx'> 	put_device(&amp;file-&gt;device-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (file-&gt;disassociate_page)</div><div class='add'>+		__free_pages(file-&gt;disassociate_page, 0);</div><div class='ctx'> 	kfree(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -877,9 +880,50 @@ static void rdma_umap_close(struct vm_area_struct *vma)</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Once the zap_vma_ptes has been called touches to the VMA will come here and</div><div class='add'>+ * we return a dummy writable zero page for all the pfns.</div><div class='add'>+ */</div><div class='add'>+static vm_fault_t rdma_umap_fault(struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct ib_uverbs_file *ufile = vmf-&gt;vma-&gt;vm_file-&gt;private_data;</div><div class='add'>+	struct rdma_umap_priv *priv = vmf-&gt;vma-&gt;vm_private_data;</div><div class='add'>+	vm_fault_t ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return VM_FAULT_SIGBUS;</div><div class='add'>+</div><div class='add'>+	/* Read only pages can just use the system zero page. */</div><div class='add'>+	if (!(vmf-&gt;vma-&gt;vm_flags &amp; (VM_WRITE | VM_MAYWRITE))) {</div><div class='add'>+		vmf-&gt;page = ZERO_PAGE(vmf-&gt;address);</div><div class='add'>+		get_page(vmf-&gt;page);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ufile-&gt;umap_lock);</div><div class='add'>+	if (!ufile-&gt;disassociate_page)</div><div class='add'>+		ufile-&gt;disassociate_page =</div><div class='add'>+			alloc_pages(vmf-&gt;gfp_mask | __GFP_ZERO, 0);</div><div class='add'>+</div><div class='add'>+	if (ufile-&gt;disassociate_page) {</div><div class='add'>+		/*</div><div class='add'>+		 * This VMA is forced to always be shared so this doesn't have</div><div class='add'>+		 * to worry about COW.</div><div class='add'>+		 */</div><div class='add'>+		vmf-&gt;page = ufile-&gt;disassociate_page;</div><div class='add'>+		get_page(vmf-&gt;page);</div><div class='add'>+	} else {</div><div class='add'>+		ret = VM_FAULT_SIGBUS;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ufile-&gt;umap_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct vm_operations_struct rdma_umap_ops = {</div><div class='ctx'> 	.open = rdma_umap_open,</div><div class='ctx'> 	.close = rdma_umap_close,</div><div class='add'>+	.fault = rdma_umap_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rdma_umap_priv *rdma_user_mmap_pre(struct ib_ucontext *ucontext,</div><div class='hunk'>@@ -889,6 +933,9 @@ static struct rdma_umap_priv *rdma_user_mmap_pre(struct ib_ucontext *ucontext,</div><div class='ctx'> 	struct ib_uverbs_file *ufile = ucontext-&gt;ufile;</div><div class='ctx'> 	struct rdma_umap_priv *priv;</div><div class='ctx'> </div><div class='add'>+	if (!(vma-&gt;vm_flags &amp; VM_SHARED))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='ctx'> 	if (vma-&gt;vm_end - vma-&gt;vm_start != size)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='hunk'>@@ -992,7 +1039,9 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile)</div><div class='ctx'> 		 * at a time to get the lock ordering right. Typically there</div><div class='ctx'> 		 * will only be one mm, so no big deal.</div><div class='ctx'> 		 */</div><div class='del'>-		down_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		down_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		if (!mmget_still_valid(mm))</div><div class='add'>+			goto skip_mm;</div><div class='ctx'> 		mutex_lock(&amp;ufile-&gt;umap_lock);</div><div class='ctx'> 		list_for_each_entry_safe (priv, next_priv, &amp;ufile-&gt;umaps,</div><div class='ctx'> 					  list) {</div><div class='hunk'>@@ -1004,10 +1053,10 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile)</div><div class='ctx'> </div><div class='ctx'> 			zap_vma_ptes(vma, vma-&gt;vm_start,</div><div class='ctx'> 				     vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='del'>-			vma-&gt;vm_flags &amp;= ~(VM_SHARED | VM_MAYSHARE);</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;ufile-&gt;umap_lock);</div><div class='del'>-		up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	skip_mm:</div><div class='add'>+		up_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 		mmput(mm);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1083,7 +1132,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	setup_ufile_idr_uobject(file);</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> </div><div class='ctx'> err_module:</div><div class='ctx'> 	module_put(ib_dev-&gt;owner);</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb4/restrack.c b/drivers/infiniband/hw/cxgb4/restrack.c<br/>index 9a7520ee41e0..f82d46ed969d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/cxgb4/restrack.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/cxgb4/restrack.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/cxgb4/restrack.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/cxgb4/restrack.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ static int fill_res_qp_entry(struct sk_buff *msg,</div><div class='ctx'> 	if (qhp-&gt;ucontext)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='add'>+	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='ctx'> 	if (!table_attr)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +216,7 @@ static int fill_res_ep_entry(struct sk_buff *msg,</div><div class='ctx'> 	if (!uep)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='add'>+	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='ctx'> 	if (!table_attr)</div><div class='ctx'> 		goto err_free_uep;</div><div class='ctx'> </div><div class='hunk'>@@ -387,7 +387,7 @@ static int fill_res_cq_entry(struct sk_buff *msg,</div><div class='ctx'> 	if (ibcq-&gt;uobject)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='add'>+	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='ctx'> 	if (!table_attr)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -447,7 +447,7 @@ static int fill_res_mr_entry(struct sk_buff *msg,</div><div class='ctx'> 	if (!stag)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='add'>+	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);</div><div class='ctx'> 	if (!table_attr)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c<br/>index 612f04190ed8..addefae16c9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/chip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/chip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/chip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hfi1/chip.c</a></div><div class='hunk'>@@ -8365,7 +8365,6 @@ static inline void clear_recv_intr(struct hfi1_ctxtdata *rcd)</div><div class='ctx'> 	struct hfi1_devdata *dd = rcd-&gt;dd;</div><div class='ctx'> 	u32 addr = CCE_INT_CLEAR + (8 * rcd-&gt;ireg);</div><div class='ctx'> </div><div class='del'>-	mmiowb();	/* make sure everything before is written */</div><div class='ctx'> 	write_csr(dd, addr, rcd-&gt;imask);</div><div class='ctx'> 	/* force the above write on the chip and get a value back */</div><div class='ctx'> 	(void)read_csr(dd, addr);</div><div class='hunk'>@@ -11803,12 +11802,10 @@ void update_usrhead(struct hfi1_ctxtdata *rcd, u32 hd, u32 updegr, u32 egrhd,</div><div class='ctx'> 			&lt;&lt; RCV_EGR_INDEX_HEAD_HEAD_SHIFT;</div><div class='ctx'> 		write_uctxt_csr(dd, ctxt, RCV_EGR_INDEX_HEAD, reg);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	reg = ((u64)rcv_intr_count &lt;&lt; RCV_HDR_HEAD_COUNTER_SHIFT) |</div><div class='ctx'> 		(((u64)hd &amp; RCV_HDR_HEAD_HEAD_MASK)</div><div class='ctx'> 			&lt;&lt; RCV_HDR_HEAD_HEAD_SHIFT);</div><div class='ctx'> 	write_uctxt_csr(dd, ctxt, RCV_HDR_HEAD, reg);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 hdrqempty(struct hfi1_ctxtdata *rcd)</div><div class='hunk'>@@ -13232,7 +13229,7 @@ static int set_up_context_variables(struct hfi1_devdata *dd)</div><div class='ctx'> 	int total_contexts;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned ngroups;</div><div class='del'>-	int qos_rmt_count;</div><div class='add'>+	int rmt_count;</div><div class='ctx'> 	int user_rmt_reduced;</div><div class='ctx'> 	u32 n_usr_ctxts;</div><div class='ctx'> 	u32 send_contexts = chip_send_contexts(dd);</div><div class='hunk'>@@ -13294,10 +13291,20 @@ static int set_up_context_variables(struct hfi1_devdata *dd)</div><div class='ctx'> 		n_usr_ctxts = rcv_contexts - total_contexts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* each user context requires an entry in the RMT */</div><div class='del'>-	qos_rmt_count = qos_rmt_entries(dd, NULL, NULL);</div><div class='del'>-	if (qos_rmt_count + n_usr_ctxts &gt; NUM_MAP_ENTRIES) {</div><div class='del'>-		user_rmt_reduced = NUM_MAP_ENTRIES - qos_rmt_count;</div><div class='add'>+	/*</div><div class='add'>+	 * The RMT entries are currently allocated as shown below:</div><div class='add'>+	 * 1. QOS (0 to 128 entries);</div><div class='add'>+	 * 2. FECN for PSM (num_user_contexts + num_vnic_contexts);</div><div class='add'>+	 * 3. VNIC (num_vnic_contexts).</div><div class='add'>+	 * It should be noted that PSM FECN oversubscribe num_vnic_contexts</div><div class='add'>+	 * entries of RMT because both VNIC and PSM could allocate any receive</div><div class='add'>+	 * context between dd-&gt;first_dyn_alloc_text and dd-&gt;num_rcv_contexts,</div><div class='add'>+	 * and PSM FECN must reserve an RMT entry for each possible PSM receive</div><div class='add'>+	 * context.</div><div class='add'>+	 */</div><div class='add'>+	rmt_count = qos_rmt_entries(dd, NULL, NULL) + (num_vnic_contexts * 2);</div><div class='add'>+	if (rmt_count + n_usr_ctxts &gt; NUM_MAP_ENTRIES) {</div><div class='add'>+		user_rmt_reduced = NUM_MAP_ENTRIES - rmt_count;</div><div class='ctx'> 		dd_dev_err(dd,</div><div class='ctx'> 			   "RMT size is reducing the number of user receive contexts from %u to %d\n",</div><div class='ctx'> 			   n_usr_ctxts,</div><div class='hunk'>@@ -14285,9 +14292,11 @@ static void init_user_fecn_handling(struct hfi1_devdata *dd,</div><div class='ctx'> 	u64 reg;</div><div class='ctx'> 	int i, idx, regoff, regidx;</div><div class='ctx'> 	u8 offset;</div><div class='add'>+	u32 total_cnt;</div><div class='ctx'> </div><div class='ctx'> 	/* there needs to be enough room in the map table */</div><div class='del'>-	if (rmt-&gt;used + dd-&gt;num_user_contexts &gt;= NUM_MAP_ENTRIES) {</div><div class='add'>+	total_cnt = dd-&gt;num_rcv_contexts - dd-&gt;first_dyn_alloc_ctxt;</div><div class='add'>+	if (rmt-&gt;used + total_cnt &gt;= NUM_MAP_ENTRIES) {</div><div class='ctx'> 		dd_dev_err(dd, "User FECN handling disabled - too many user contexts allocated\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -14341,7 +14350,7 @@ static void init_user_fecn_handling(struct hfi1_devdata *dd,</div><div class='ctx'> 	/* add rule 1 */</div><div class='ctx'> 	add_rsm_rule(dd, RSM_INS_FECN, &amp;rrd);</div><div class='ctx'> </div><div class='del'>-	rmt-&gt;used += dd-&gt;num_user_contexts;</div><div class='add'>+	rmt-&gt;used += total_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize RSM for VNIC */</div><div class='head'>diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c<br/>index a1de566fe95e..16ba9d52e1b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/pio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/pio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/pio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hfi1/pio.c</a></div><div class='hunk'>@@ -1578,7 +1578,6 @@ void hfi1_sc_wantpiobuf_intr(struct send_context *sc, u32 needint)</div><div class='ctx'> 		sc_del_credit_return_intr(sc);</div><div class='ctx'> 	trace_hfi1_wantpiointr(sc, needint, sc-&gt;credit_ctrl);</div><div class='ctx'> 	if (needint) {</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		sc_return_credits(sc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/hfi1/qp.c b/drivers/infiniband/hw/hfi1/qp.c<br/>index 9b643c2409cf..eba300330a02 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/qp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/qp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hfi1/qp.c</a></div><div class='hunk'>@@ -898,7 +898,9 @@ void notify_error_qp(struct rvt_qp *qp)</div><div class='ctx'> 		if (!list_empty(&amp;priv-&gt;s_iowait.list) &amp;&amp;</div><div class='ctx'> 		    !(qp-&gt;s_flags &amp; RVT_S_BUSY) &amp;&amp;</div><div class='ctx'> 		    !(priv-&gt;s_flags &amp; RVT_S_BUSY)) {</div><div class='del'>-			qp-&gt;s_flags &amp;= ~RVT_S_ANY_WAIT_IO;</div><div class='add'>+			qp-&gt;s_flags &amp;= ~HFI1_S_ANY_WAIT_IO;</div><div class='add'>+			iowait_clear_flag(&amp;priv-&gt;s_iowait, IOWAIT_PENDING_IB);</div><div class='add'>+			iowait_clear_flag(&amp;priv-&gt;s_iowait, IOWAIT_PENDING_TID);</div><div class='ctx'> 			list_del_init(&amp;priv-&gt;s_iowait.list);</div><div class='ctx'> 			priv-&gt;s_iowait.lock = NULL;</div><div class='ctx'> 			rvt_put_qp(qp);</div><div class='head'>diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c<br/>index e6726c1ab866..5991211d72bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/rc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/rc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/rc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hfi1/rc.c</a></div><div class='hunk'>@@ -3088,7 +3088,7 @@ send_last:</div><div class='ctx'> 			update_ack_queue(qp, next);</div><div class='ctx'> 		}</div><div class='ctx'> 		e = &amp;qp-&gt;s_ack_queue[qp-&gt;r_head_ack_queue];</div><div class='del'>-		if (e-&gt;opcode == OP(RDMA_READ_REQUEST) &amp;&amp; e-&gt;rdma_sge.mr) {</div><div class='add'>+		if (e-&gt;rdma_sge.mr) {</div><div class='ctx'> 			rvt_put_mr(e-&gt;rdma_sge.mr);</div><div class='ctx'> 			e-&gt;rdma_sge.mr = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3166,7 +3166,7 @@ send_last:</div><div class='ctx'> 			update_ack_queue(qp, next);</div><div class='ctx'> 		}</div><div class='ctx'> 		e = &amp;qp-&gt;s_ack_queue[qp-&gt;r_head_ack_queue];</div><div class='del'>-		if (e-&gt;opcode == OP(RDMA_READ_REQUEST) &amp;&amp; e-&gt;rdma_sge.mr) {</div><div class='add'>+		if (e-&gt;rdma_sge.mr) {</div><div class='ctx'> 			rvt_put_mr(e-&gt;rdma_sge.mr);</div><div class='ctx'> 			e-&gt;rdma_sge.mr = NULL;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/infiniband/hw/hfi1/tid_rdma.c b/drivers/infiniband/hw/hfi1/tid_rdma.c<br/>index fdda33aca77f..43cbce7a19ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/tid_rdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/tid_rdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/tid_rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hfi1/tid_rdma.c</a></div><div class='hunk'>@@ -5017,24 +5017,14 @@ int hfi1_make_tid_rdma_pkt(struct rvt_qp *qp, struct hfi1_pkt_state *ps)</div><div class='ctx'> 	    make_tid_rdma_ack(qp, ohdr, ps))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (!(ib_rvt_state_ops[qp-&gt;state] &amp; RVT_PROCESS_SEND_OK)) {</div><div class='del'>-		if (!(ib_rvt_state_ops[qp-&gt;state] &amp; RVT_FLUSH_SEND))</div><div class='del'>-			goto bail;</div><div class='del'>-		/* We are in the error state, flush the work request. */</div><div class='del'>-		if (qp-&gt;s_last == READ_ONCE(qp-&gt;s_head))</div><div class='del'>-			goto bail;</div><div class='del'>-		/* If DMAs are in progress, we can't flush immediately. */</div><div class='del'>-		if (iowait_sdma_pending(&amp;priv-&gt;s_iowait)) {</div><div class='del'>-			qp-&gt;s_flags |= RVT_S_WAIT_DMA;</div><div class='del'>-			goto bail;</div><div class='del'>-		}</div><div class='del'>-		clear_ahg(qp);</div><div class='del'>-		wqe = rvt_get_swqe_ptr(qp, qp-&gt;s_last);</div><div class='del'>-		hfi1_trdma_send_complete(qp, wqe, qp-&gt;s_last != qp-&gt;s_acked ?</div><div class='del'>-					 IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);</div><div class='del'>-		/* will get called again */</div><div class='del'>-		goto done_free_tx;</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Bail out if we can't send data.</div><div class='add'>+	 * Be reminded that this check must been done after the call to</div><div class='add'>+	 * make_tid_rdma_ack() because the responding QP could be in</div><div class='add'>+	 * RTR state where it can send TID RDMA ACK, not TID RDMA WRITE DATA.</div><div class='add'>+	 */</div><div class='add'>+	if (!(ib_rvt_state_ops[qp-&gt;state] &amp; RVT_PROCESS_SEND_OK))</div><div class='add'>+		goto bail;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;s_flags &amp; RVT_S_WAIT_ACK)</div><div class='ctx'> 		goto bail;</div><div class='hunk'>@@ -5144,11 +5134,6 @@ int hfi1_make_tid_rdma_pkt(struct rvt_qp *qp, struct hfi1_pkt_state *ps)</div><div class='ctx'> 	hfi1_make_ruc_header(qp, ohdr, (opcode &lt;&lt; 24), bth1, bth2,</div><div class='ctx'> 			     middle, ps);</div><div class='ctx'> 	return 1;</div><div class='del'>-done_free_tx:</div><div class='del'>-	hfi1_put_txreq(ps-&gt;s_txreq);</div><div class='del'>-	ps-&gt;s_txreq = NULL;</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='ctx'> bail:</div><div class='ctx'> 	hfi1_put_txreq(ps-&gt;s_txreq);</div><div class='ctx'> bail_no_tx:</div><div class='head'>diff --git a/drivers/infiniband/hw/hfi1/vnic_main.c b/drivers/infiniband/hw/hfi1/vnic_main.c<br/>index a922db58be14..2b07032dbdda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/vnic_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hfi1/vnic_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hfi1/vnic_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hfi1/vnic_main.c</a></div><div class='hunk'>@@ -423,8 +423,7 @@ tx_finish:</div><div class='ctx'> </div><div class='ctx'> static u16 hfi1_vnic_select_queue(struct net_device *netdev,</div><div class='ctx'> 				  struct sk_buff *skb,</div><div class='del'>-				  struct net_device *sb_dev,</div><div class='del'>-				  select_queue_fallback_t fallback)</div><div class='add'>+				  struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);</div><div class='ctx'> 	struct opa_vnic_skb_mdata *mdata;</div><div class='head'>diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c<br/>index f1fec56f3ff4..8e29dbb5b5fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_hem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_hem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_hem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hns/hns_roce_hem.c</a></div><div class='hunk'>@@ -792,6 +792,8 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev,</div><div class='ctx'> 		idx_offset = (obj &amp; (table-&gt;num_obj - 1)) % obj_per_chunk;</div><div class='ctx'> 		dma_offset = offset = idx_offset * table-&gt;obj_size;</div><div class='ctx'> 	} else {</div><div class='add'>+		u32 seg_size = 64; /* 8 bytes per BA and 8 BA per segment */</div><div class='add'>+</div><div class='ctx'> 		hns_roce_calc_hem_mhop(hr_dev, table, &amp;mhop_obj, &amp;mhop);</div><div class='ctx'> 		/* mtt mhop */</div><div class='ctx'> 		i = mhop.l0_idx;</div><div class='hunk'>@@ -803,8 +805,8 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev,</div><div class='ctx'> 			hem_idx = i;</div><div class='ctx'> </div><div class='ctx'> 		hem = table-&gt;hem[hem_idx];</div><div class='del'>-		dma_offset = offset = (obj &amp; (table-&gt;num_obj - 1)) *</div><div class='del'>-				       table-&gt;obj_size % mhop.bt_chunk_size;</div><div class='add'>+		dma_offset = offset = (obj &amp; (table-&gt;num_obj - 1)) * seg_size %</div><div class='add'>+				       mhop.bt_chunk_size;</div><div class='ctx'> 		if (mhop.hop_num == 2)</div><div class='ctx'> 			dma_offset = offset = 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c<br/>index 97515c340134..c8555f7704d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_hw_v1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_hw_v1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_hw_v1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hns/hns_roce_hw_v1.c</a></div><div class='hunk'>@@ -1750,8 +1750,6 @@ static int hns_roce_v1_post_mbox(struct hns_roce_dev *hr_dev, u64 in_param,</div><div class='ctx'> </div><div class='ctx'> 	writel(val, hcr + 5);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</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/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c<br/>index b09f1cde2ff5..08be0e4eabcd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_mr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_mr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hns/hns_roce_mr.c</a></div><div class='hunk'>@@ -746,7 +746,6 @@ static int hns_roce_write_mtt_chunk(struct hns_roce_dev *hr_dev,</div><div class='ctx'> 	struct hns_roce_hem_table *table;</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='ctx'> 	__le64 *mtts;</div><div class='del'>-	u32 s = start_index * sizeof(u64);</div><div class='ctx'> 	u32 bt_page_size;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='hunk'>@@ -780,7 +779,8 @@ static int hns_roce_write_mtt_chunk(struct hns_roce_dev *hr_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mtts = hns_roce_table_find(hr_dev, table,</div><div class='del'>-				mtt-&gt;first_seg + s / hr_dev-&gt;caps.mtt_entry_sz,</div><div class='add'>+				mtt-&gt;first_seg +</div><div class='add'>+				start_index / HNS_ROCE_MTT_ENTRY_PER_SEG,</div><div class='ctx'> 				&amp;dma_handle);</div><div class='ctx'> 	if (!mtts)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c<br/>index 57c76eafef2f..60cf9f03e941 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_qp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/hns/hns_roce_qp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/hns/hns_roce_qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/hns/hns_roce_qp.c</a></div><div class='hunk'>@@ -274,9 +274,6 @@ void hns_roce_qp_free(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)</div><div class='ctx'> 	wait_for_completion(&amp;hr_qp-&gt;free);</div><div class='ctx'> </div><div class='ctx'> 	if ((hr_qp-&gt;ibqp.qp_type) != IB_QPT_GSI) {</div><div class='del'>-		if (hr_dev-&gt;caps.sccc_entry_sz)</div><div class='del'>-			hns_roce_table_put(hr_dev, &amp;qp_table-&gt;sccc_table,</div><div class='del'>-					   hr_qp-&gt;qpn);</div><div class='ctx'> 		if (hr_dev-&gt;caps.trrl_entry_sz)</div><div class='ctx'> 			hns_roce_table_put(hr_dev, &amp;qp_table-&gt;trrl_table,</div><div class='ctx'> 					   hr_qp-&gt;qpn);</div><div class='hunk'>@@ -536,7 +533,7 @@ static int hns_roce_set_kernel_sq_size(struct hns_roce_dev *hr_dev,</div><div class='ctx'> </div><div class='ctx'> static int hns_roce_qp_has_sq(struct ib_qp_init_attr *attr)</div><div class='ctx'> {</div><div class='del'>-	if (attr-&gt;qp_type == IB_QPT_XRC_TGT)</div><div class='add'>+	if (attr-&gt;qp_type == IB_QPT_XRC_TGT || !attr-&gt;cap.max_send_wr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/drivers/infiniband/hw/i40iw/i40iw_osdep.h b/drivers/infiniband/hw/i40iw/i40iw_osdep.h<br/>index f27be3e7830b..d474aad62a81 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/i40iw/i40iw_osdep.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/i40iw/i40iw_osdep.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/i40iw/i40iw_osdep.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/i40iw/i40iw_osdep.h</a></div><div class='hunk'>@@ -211,7 +211,7 @@ enum i40iw_status_code i40iw_hw_manage_vf_pble_bp(struct i40iw_device *iwdev,</div><div class='ctx'> struct i40iw_sc_vsi;</div><div class='ctx'> void i40iw_hw_stats_start_timer(struct i40iw_sc_vsi *vsi);</div><div class='ctx'> void i40iw_hw_stats_stop_timer(struct i40iw_sc_vsi *vsi);</div><div class='del'>-#define i40iw_mmiowb() mmiowb()</div><div class='add'>+#define i40iw_mmiowb() do { } while (0)</div><div class='ctx'> void i40iw_wr32(struct i40iw_hw *hw, u32 reg, u32 value);</div><div class='ctx'> u32  i40iw_rd32(struct i40iw_hw *hw, u32 reg);</div><div class='ctx'> #endif				/* _I40IW_OSDEP_H_ */</div><div class='head'>diff --git a/drivers/infiniband/hw/i40iw/i40iw_utils.c b/drivers/infiniband/hw/i40iw/i40iw_utils.c<br/>index c5a881172524..337410f40860 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/i40iw/i40iw_utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/i40iw/i40iw_utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/i40iw/i40iw_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/i40iw/i40iw_utils.c</a></div><div class='hunk'>@@ -173,7 +173,12 @@ int i40iw_inetaddr_event(struct notifier_block *notifier,</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		in = __in_dev_get_rcu(upper_dev);</div><div class='del'>-		local_ipaddr = ntohl(in-&gt;ifa_list-&gt;ifa_address);</div><div class='add'>+</div><div class='add'>+		if (!in-&gt;ifa_list)</div><div class='add'>+			local_ipaddr = 0;</div><div class='add'>+		else</div><div class='add'>+			local_ipaddr = ntohl(in-&gt;ifa_list-&gt;ifa_address);</div><div class='add'>+</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		local_ipaddr = ntohl(ifa-&gt;ifa_address);</div><div class='hunk'>@@ -185,6 +190,11 @@ int i40iw_inetaddr_event(struct notifier_block *notifier,</div><div class='ctx'> 	case NETDEV_UP:</div><div class='ctx'> 		/* Fall through */</div><div class='ctx'> 	case NETDEV_CHANGEADDR:</div><div class='add'>+</div><div class='add'>+		/* Just skip if no need to handle ARP cache */</div><div class='add'>+		if (!local_ipaddr)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		i40iw_manage_arp_cache(iwdev,</div><div class='ctx'> 				       netdev-&gt;dev_addr,</div><div class='ctx'> 				       &amp;local_ipaddr,</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c<br/>index 782499abcd98..2a0b59a4b6eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx4/alias_GUID.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx4/alias_GUID.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx4/alias_GUID.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx4/alias_GUID.c</a></div><div class='hunk'>@@ -804,8 +804,8 @@ void mlx4_ib_destroy_alias_guid_service(struct mlx4_ib_dev *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; dev-&gt;num_ports; i++) {</div><div class='del'>-		cancel_delayed_work(&amp;dev-&gt;sriov.alias_guid.ports_guid[i].alias_guid_work);</div><div class='ctx'> 		det = &amp;sriov-&gt;alias_guid.ports_guid[i];</div><div class='add'>+		cancel_delayed_work_sync(&amp;det-&gt;alias_guid_work);</div><div class='ctx'> 		spin_lock_irqsave(&amp;sriov-&gt;alias_guid.ag_work_lock, flags);</div><div class='ctx'> 		while (!list_empty(&amp;det-&gt;cb_list)) {</div><div class='ctx'> 			cb_ctx = list_entry(det-&gt;cb_list.next,</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c<br/>index 429a59c5801c..9426936460f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx4/qp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx4/qp.c</a></div><div class='hunk'>@@ -3744,12 +3744,6 @@ out:</div><div class='ctx'> 		writel_relaxed(qp-&gt;doorbell_qpn,</div><div class='ctx'> 			to_mdev(ibqp-&gt;device)-&gt;uar_map + MLX4_SEND_DOORBELL);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Make sure doorbells don't leak out of SQ spinlock</div><div class='del'>-		 * and reach the HCA out of order.</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='del'>-</div><div class='ctx'> 		stamp_send_wqe(qp, ind + qp-&gt;sq_spare_wqes - 1);</div><div class='ctx'> </div><div class='ctx'> 		qp-&gt;sq_next_wqe = ind;</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx5/cmd.c b/drivers/infiniband/hw/mlx5/cmd.c<br/>index 6bcc63aaa50b..be95ac5aeb30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx5/cmd.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ int mlx5_cmd_alloc_memic(struct mlx5_memic *memic, phys_addr_t *addr,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*addr = pci_resource_start(dev-&gt;pdev, 0) +</div><div class='add'>+		*addr = dev-&gt;bar_addr +</div><div class='ctx'> 			MLX5_GET64(alloc_memic_out, out, memic_start_addr);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -167,7 +167,7 @@ int mlx5_cmd_dealloc_memic(struct mlx5_memic *memic, u64 addr, u64 length)</div><div class='ctx'> 	u64 start_page_idx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	addr -= pci_resource_start(dev-&gt;pdev, 0);</div><div class='add'>+	addr -= dev-&gt;bar_addr;</div><div class='ctx'> 	start_page_idx = (addr - hw_start_addr) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(dealloc_memic_in, in, opcode, MLX5_CMD_OP_DEALLOC_MEMIC);</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c<br/>index eaa055007f28..9e08df7914aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/devx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/devx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/devx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx5/devx.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> enum devx_obj_flags {</div><div class='ctx'> 	DEVX_OBJ_FLAGS_INDIRECT_MKEY = 1 &lt;&lt; 0,</div><div class='add'>+	DEVX_OBJ_FLAGS_DCT = 1 &lt;&lt; 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct devx_async_data {</div><div class='hunk'>@@ -39,7 +40,10 @@ struct devx_obj {</div><div class='ctx'> 	u32			dinlen; /* destroy inbox length */</div><div class='ctx'> 	u32			dinbox[MLX5_MAX_DESTROY_INBOX_SIZE_DW];</div><div class='ctx'> 	u32			flags;</div><div class='del'>-	struct mlx5_ib_devx_mr	devx_mr;</div><div class='add'>+	union {</div><div class='add'>+		struct mlx5_ib_devx_mr	devx_mr;</div><div class='add'>+		struct mlx5_core_dct	core_dct;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct devx_umem {</div><div class='hunk'>@@ -347,7 +351,6 @@ static u64 devx_get_obj_id(const void *in)</div><div class='ctx'> 		obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_RQ,</div><div class='ctx'> 					MLX5_GET(arm_rq_in, in, srq_number));</div><div class='ctx'> 		break;</div><div class='del'>-	case MLX5_CMD_OP_DRAIN_DCT:</div><div class='ctx'> 	case MLX5_CMD_OP_ARM_DCT_FOR_KEY_VIOLATION:</div><div class='ctx'> 		obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_DCT,</div><div class='ctx'> 					MLX5_GET(drain_dct_in, in, dctn));</div><div class='hunk'>@@ -618,7 +621,6 @@ static bool devx_is_obj_modify_cmd(const void *in)</div><div class='ctx'> 	case MLX5_CMD_OP_2RST_QP:</div><div class='ctx'> 	case MLX5_CMD_OP_ARM_XRC_SRQ:</div><div class='ctx'> 	case MLX5_CMD_OP_ARM_RQ:</div><div class='del'>-	case MLX5_CMD_OP_DRAIN_DCT:</div><div class='ctx'> 	case MLX5_CMD_OP_ARM_DCT_FOR_KEY_VIOLATION:</div><div class='ctx'> 	case MLX5_CMD_OP_ARM_XRQ:</div><div class='ctx'> 	case MLX5_CMD_OP_SET_XRQ_DC_PARAMS_ENTRY:</div><div class='hunk'>@@ -1124,7 +1126,11 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,</div><div class='ctx'> 	if (obj-&gt;flags &amp; DEVX_OBJ_FLAGS_INDIRECT_MKEY)</div><div class='ctx'> 		devx_cleanup_mkey(obj);</div><div class='ctx'> </div><div class='del'>-	ret = mlx5_cmd_exec(obj-&gt;mdev, obj-&gt;dinbox, obj-&gt;dinlen, out, sizeof(out));</div><div class='add'>+	if (obj-&gt;flags &amp; DEVX_OBJ_FLAGS_DCT)</div><div class='add'>+		ret = mlx5_core_destroy_dct(obj-&gt;mdev, &amp;obj-&gt;core_dct);</div><div class='add'>+	else</div><div class='add'>+		ret = mlx5_cmd_exec(obj-&gt;mdev, obj-&gt;dinbox, obj-&gt;dinlen, out,</div><div class='add'>+				    sizeof(out));</div><div class='ctx'> 	if (ib_is_destroy_retryable(ret, why, uobject))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1185,9 +1191,17 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(</div><div class='ctx'> 		devx_set_umem_valid(cmd_in);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mlx5_cmd_exec(dev-&gt;mdev, cmd_in,</div><div class='del'>-			    cmd_in_len,</div><div class='del'>-			    cmd_out, cmd_out_len);</div><div class='add'>+	if (opcode == MLX5_CMD_OP_CREATE_DCT) {</div><div class='add'>+		obj-&gt;flags |= DEVX_OBJ_FLAGS_DCT;</div><div class='add'>+		err = mlx5_core_create_dct(dev-&gt;mdev, &amp;obj-&gt;core_dct,</div><div class='add'>+					   cmd_in, cmd_in_len,</div><div class='add'>+					   cmd_out, cmd_out_len);</div><div class='add'>+	} else {</div><div class='add'>+		err = mlx5_cmd_exec(dev-&gt;mdev, cmd_in,</div><div class='add'>+				    cmd_in_len,</div><div class='add'>+				    cmd_out, cmd_out_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto obj_free;</div><div class='ctx'> </div><div class='hunk'>@@ -1214,7 +1228,11 @@ err_copy:</div><div class='ctx'> 	if (obj-&gt;flags &amp; DEVX_OBJ_FLAGS_INDIRECT_MKEY)</div><div class='ctx'> 		devx_cleanup_mkey(obj);</div><div class='ctx'> obj_destroy:</div><div class='del'>-	mlx5_cmd_exec(obj-&gt;mdev, obj-&gt;dinbox, obj-&gt;dinlen, out, sizeof(out));</div><div class='add'>+	if (obj-&gt;flags &amp; DEVX_OBJ_FLAGS_DCT)</div><div class='add'>+		mlx5_core_destroy_dct(obj-&gt;mdev, &amp;obj-&gt;core_dct);</div><div class='add'>+	else</div><div class='add'>+		mlx5_cmd_exec(obj-&gt;mdev, obj-&gt;dinbox, obj-&gt;dinlen, out,</div><div class='add'>+			      sizeof(out));</div><div class='ctx'> obj_free:</div><div class='ctx'> 	kfree(obj);</div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c<br/>index 994c19d01211..1aaa2056d188 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx5/main.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static int mlx5_netdev_event(struct notifier_block *this,</div><div class='ctx'> 							  ibdev-&gt;rep-&gt;vport);</div><div class='ctx'> 			if (rep_ndev == ndev)</div><div class='ctx'> 				roce-&gt;netdev = ndev;</div><div class='del'>-		} else if (ndev-&gt;dev.parent == &amp;mdev-&gt;pdev-&gt;dev) {</div><div class='add'>+		} else if (ndev-&gt;dev.parent == mdev-&gt;device) {</div><div class='ctx'> 			roce-&gt;netdev = ndev;</div><div class='ctx'> 		}</div><div class='ctx'> 		write_unlock(&amp;roce-&gt;netdev_lock);</div><div class='hunk'>@@ -415,10 +415,17 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u8 *active_speed,</div><div class='ctx'> 		*active_speed = IB_SPEED_EDR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MLX5E_PROT_MASK(MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2):</div><div class='add'>+		*active_width = IB_WIDTH_2X;</div><div class='add'>+		*active_speed = IB_SPEED_EDR;</div><div class='add'>+		break;</div><div class='ctx'> 	case MLX5E_PROT_MASK(MLX5E_50GAUI_1_LAUI_1_50GBASE_CR_KR):</div><div class='ctx'> 		*active_width = IB_WIDTH_1X;</div><div class='ctx'> 		*active_speed = IB_SPEED_HDR;</div><div class='ctx'> 		break;</div><div class='add'>+	case MLX5E_PROT_MASK(MLX5E_CAUI_4_100GBASE_CR4_KR4):</div><div class='add'>+		*active_width = IB_WIDTH_4X;</div><div class='add'>+		*active_speed = IB_SPEED_EDR;</div><div class='add'>+		break;</div><div class='ctx'> 	case MLX5E_PROT_MASK(MLX5E_100GAUI_2_100GBASE_CR2_KR2):</div><div class='ctx'> 		*active_width = IB_WIDTH_2X;</div><div class='ctx'> 		*active_speed = IB_SPEED_HDR;</div><div class='hunk'>@@ -1112,6 +1119,8 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,</div><div class='ctx'> 		if (MLX5_CAP_GEN(mdev, qp_packet_based))</div><div class='ctx'> 			resp.flags |=</div><div class='ctx'> 				MLX5_IB_QUERY_DEV_RESP_PACKET_BASED_CREDIT_MODE;</div><div class='add'>+</div><div class='add'>+		resp.flags |= MLX5_IB_QUERY_DEV_RESP_FLAGS_SCAT2CQE_DCT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (field_avail(typeof(resp), sw_parsing_caps,</div><div class='hunk'>@@ -2002,7 +2011,7 @@ static phys_addr_t uar_index2pfn(struct mlx5_ib_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	fw_uars_per_page = MLX5_CAP_GEN(dev-&gt;mdev, uar_4k) ? MLX5_UARS_IN_PAGE : 1;</div><div class='ctx'> </div><div class='del'>-	return (pci_resource_start(dev-&gt;mdev-&gt;pdev, 0) &gt;&gt; PAGE_SHIFT) + uar_idx / fw_uars_per_page;</div><div class='add'>+	return (dev-&gt;mdev-&gt;bar_addr &gt;&gt; PAGE_SHIFT) + uar_idx / fw_uars_per_page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_command(unsigned long offset)</div><div class='hunk'>@@ -2059,6 +2068,7 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_WRITE)</div><div class='ctx'> 		return -EPERM;</div><div class='add'>+	vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;mdev-&gt;clock_info_page)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -2192,7 +2202,7 @@ static int dm_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)</div><div class='ctx'> 	    page_idx + npages)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pfn = ((pci_resource_start(dev-&gt;mdev-&gt;pdev, 0) +</div><div class='add'>+	pfn = ((dev-&gt;mdev-&gt;bar_addr +</div><div class='ctx'> 	      MLX5_CAP64_DEV_MEM(dev-&gt;mdev, memic_bar_start_addr)) &gt;&gt;</div><div class='ctx'> 	      PAGE_SHIFT) +</div><div class='ctx'> 	      page_idx;</div><div class='hunk'>@@ -2224,19 +2234,18 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm</div><div class='ctx'> </div><div class='ctx'> 		if (vma-&gt;vm_flags &amp; VM_WRITE)</div><div class='ctx'> 			return -EPERM;</div><div class='add'>+		vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='ctx'> </div><div class='ctx'> 		/* Don't expose to user-space information it shouldn't have */</div><div class='ctx'> 		if (PAGE_SIZE &gt; 4096)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-		vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='ctx'> 		pfn = (dev-&gt;mdev-&gt;iseg_base +</div><div class='ctx'> 		       offsetof(struct mlx5_init_seg, internal_timer_h)) &gt;&gt;</div><div class='ctx'> 			PAGE_SHIFT;</div><div class='del'>-		if (io_remap_pfn_range(vma, vma-&gt;vm_start, pfn,</div><div class='del'>-				       PAGE_SIZE, vma-&gt;vm_page_prot))</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		break;</div><div class='add'>+		return rdma_user_mmap_io(&amp;context-&gt;ibucontext, vma, pfn,</div><div class='add'>+					 PAGE_SIZE,</div><div class='add'>+					 pgprot_noncached(vma-&gt;vm_page_prot));</div><div class='ctx'> 	case MLX5_IB_MMAP_CLOCK_INFO:</div><div class='ctx'> 		return mlx5_ib_mmap_clock_info_page(dev, vma, context);</div><div class='ctx'> </div><div class='hunk'>@@ -2276,7 +2285,7 @@ struct ib_dm *mlx5_ib_alloc_dm(struct ib_device *ibdev,</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='ctx'> 	start_offset = memic_addr &amp; ~PAGE_MASK;</div><div class='del'>-	page_idx = (memic_addr - pci_resource_start(memic-&gt;dev-&gt;pdev, 0) -</div><div class='add'>+	page_idx = (memic_addr - memic-&gt;dev-&gt;bar_addr -</div><div class='ctx'> 		    MLX5_CAP64_DEV_MEM(memic-&gt;dev, memic_bar_start_addr)) &gt;&gt;</div><div class='ctx'> 		    PAGE_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -2319,7 +2328,7 @@ int mlx5_ib_dealloc_dm(struct ib_dm *ibdm)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	page_idx = (dm-&gt;dev_addr - pci_resource_start(memic-&gt;dev-&gt;pdev, 0) -</div><div class='add'>+	page_idx = (dm-&gt;dev_addr - memic-&gt;dev-&gt;bar_addr -</div><div class='ctx'> 		    MLX5_CAP64_DEV_MEM(memic-&gt;dev, memic_bar_start_addr)) &gt;&gt;</div><div class='ctx'> 		    PAGE_SHIFT;</div><div class='ctx'> 	bitmap_clear(to_mucontext(ibdm-&gt;uobject-&gt;context)-&gt;dm_pages,</div><div class='hunk'>@@ -4347,9 +4356,13 @@ static void delay_drop_handler(struct work_struct *work)</div><div class='ctx'> static void handle_general_event(struct mlx5_ib_dev *ibdev, struct mlx5_eqe *eqe,</div><div class='ctx'> 				 struct ib_event *ibev)</div><div class='ctx'> {</div><div class='add'>+	u8 port = (eqe-&gt;data.port.port &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+</div><div class='ctx'> 	switch (eqe-&gt;sub_type) {</div><div class='ctx'> 	case MLX5_GENERAL_SUBTYPE_DELAY_DROP_TIMEOUT:</div><div class='del'>-		schedule_work(&amp;ibdev-&gt;delay_drop.delay_drop_work);</div><div class='add'>+		if (mlx5_ib_port_link_layer(&amp;ibdev-&gt;ib_dev, port) ==</div><div class='add'>+					    IB_LINK_LAYER_ETHERNET)</div><div class='add'>+			schedule_work(&amp;ibdev-&gt;delay_drop.delay_drop_work);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default: /* do nothing */</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -5666,7 +5679,8 @@ static int mlx5_ib_init_multiport_master(struct mlx5_ib_dev *dev)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (bound) {</div><div class='del'>-				dev_dbg(&amp;mpi-&gt;mdev-&gt;pdev-&gt;dev, "removing port from unaffiliated list.\n");</div><div class='add'>+				dev_dbg(mpi-&gt;mdev-&gt;device,</div><div class='add'>+					"removing port from unaffiliated list.\n");</div><div class='ctx'> 				mlx5_ib_dbg(dev, "port %d bound\n", i + 1);</div><div class='ctx'> 				list_del(&amp;mpi-&gt;list);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -5865,7 +5879,7 @@ int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev)</div><div class='ctx'> 	dev-&gt;ib_dev.local_dma_lkey	= 0 /* not supported for now */;</div><div class='ctx'> 	dev-&gt;ib_dev.phys_port_cnt	= dev-&gt;num_ports;</div><div class='ctx'> 	dev-&gt;ib_dev.num_comp_vectors    = mlx5_comp_vectors_count(mdev);</div><div class='del'>-	dev-&gt;ib_dev.dev.parent		= &amp;mdev-&gt;pdev-&gt;dev;</div><div class='add'>+	dev-&gt;ib_dev.dev.parent		= mdev-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;dev-&gt;cap_mask_mutex);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;qp_list);</div><div class='hunk'>@@ -6554,7 +6568,8 @@ static void *mlx5_ib_add_slave_port(struct mlx5_core_dev *mdev)</div><div class='ctx'> </div><div class='ctx'> 	if (!bound) {</div><div class='ctx'> 		list_add_tail(&amp;mpi-&gt;list, &amp;mlx5_ib_unaffiliated_port_list);</div><div class='del'>-		dev_dbg(&amp;mdev-&gt;pdev-&gt;dev, "no suitable IB device found to bind to, added to unaffiliated list.\n");</div><div class='add'>+		dev_dbg(mdev-&gt;device,</div><div class='add'>+			"no suitable IB device found to bind to, added to unaffiliated list.\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;mlx5_ib_multiport_mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c<br/>index c85f00255884..ca921fd40499 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/mr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/mr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx5/mr.c</a></div><div class='hunk'>@@ -1194,8 +1194,7 @@ static struct ib_mr *mlx5_ib_get_memic_mr(struct ib_pd *pd, u64 memic_addr,</div><div class='ctx'> 	MLX5_SET64(mkc, mkc, len, length);</div><div class='ctx'> 	MLX5_SET(mkc, mkc, pd, to_mpd(pd)-&gt;pdn);</div><div class='ctx'> 	MLX5_SET(mkc, mkc, qpn, 0xffffff);</div><div class='del'>-	MLX5_SET64(mkc, mkc, start_addr,</div><div class='del'>-		   memic_addr - pci_resource_start(dev-&gt;mdev-&gt;pdev, 0));</div><div class='add'>+	MLX5_SET64(mkc, mkc, start_addr, memic_addr - dev-&gt;mdev-&gt;bar_addr);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_core_create_mkey(mdev, &amp;mr-&gt;mmkey, in, inlen);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c<br/>index c20bfc41ecf1..0aa10ebda5d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/odp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/odp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/odp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx5/odp.c</a></div><div class='hunk'>@@ -585,7 +585,7 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr,</div><div class='ctx'> 	struct ib_umem_odp *odp_mr = to_ib_umem_odp(mr-&gt;umem);</div><div class='ctx'> 	bool downgrade = flags &amp; MLX5_PF_FLAGS_DOWNGRADE;</div><div class='ctx'> 	bool prefetch = flags &amp; MLX5_PF_FLAGS_PREFETCH;</div><div class='del'>-	u64 access_mask = ODP_READ_ALLOWED_BIT;</div><div class='add'>+	u64 access_mask;</div><div class='ctx'> 	u64 start_idx, page_mask;</div><div class='ctx'> 	struct ib_umem_odp *odp;</div><div class='ctx'> 	size_t size;</div><div class='hunk'>@@ -607,6 +607,7 @@ next_mr:</div><div class='ctx'> 	page_shift = mr-&gt;umem-&gt;page_shift;</div><div class='ctx'> 	page_mask = ~(BIT(page_shift) - 1);</div><div class='ctx'> 	start_idx = (io_virt - (mr-&gt;mmkey.iova &amp; page_mask)) &gt;&gt; page_shift;</div><div class='add'>+	access_mask = ODP_READ_ALLOWED_BIT;</div><div class='ctx'> </div><div class='ctx'> 	if (prefetch &amp;&amp; !downgrade &amp;&amp; !mr-&gt;umem-&gt;writable) {</div><div class='ctx'> 		/* prefetch with write-access must</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c<br/>index 6b1f0e76900b..581144e224e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/qp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mlx5/qp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mlx5/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mlx5/qp.c</a></div><div class='hunk'>@@ -1818,13 +1818,16 @@ static void configure_responder_scat_cqe(struct ib_qp_init_attr *init_attr,</div><div class='ctx'> </div><div class='ctx'> 	rcqe_sz = mlx5_ib_get_cqe_size(init_attr-&gt;recv_cq);</div><div class='ctx'> </div><div class='del'>-	if (rcqe_sz == 128) {</div><div class='del'>-		MLX5_SET(qpc, qpc, cs_res, MLX5_RES_SCAT_DATA64_CQE);</div><div class='add'>+	if (init_attr-&gt;qp_type == MLX5_IB_QPT_DCT) {</div><div class='add'>+		if (rcqe_sz == 128)</div><div class='add'>+			MLX5_SET(dctc, qpc, cs_res, MLX5_RES_SCAT_DATA64_CQE);</div><div class='add'>+</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (init_attr-&gt;qp_type != MLX5_IB_QPT_DCT)</div><div class='del'>-		MLX5_SET(qpc, qpc, cs_res, MLX5_RES_SCAT_DATA32_CQE);</div><div class='add'>+	MLX5_SET(qpc, qpc, cs_res,</div><div class='add'>+		 rcqe_sz == 128 ? MLX5_RES_SCAT_DATA64_CQE :</div><div class='add'>+				  MLX5_RES_SCAT_DATA32_CQE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void configure_requester_scat_cqe(struct mlx5_ib_dev *dev,</div><div class='hunk'>@@ -3729,6 +3732,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'> </div><div class='ctx'> 	} else if (cur_state == IB_QPS_INIT &amp;&amp; new_state == IB_QPS_RTR) {</div><div class='ctx'> 		struct mlx5_ib_modify_qp_resp resp = {};</div><div class='add'>+		u32 out[MLX5_ST_SZ_DW(create_dct_out)] = {0};</div><div class='ctx'> 		u32 min_resp_len = offsetof(typeof(resp), dctn) +</div><div class='ctx'> 				   sizeof(resp.dctn);</div><div class='ctx'> </div><div class='hunk'>@@ -3747,7 +3751,8 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'> 		MLX5_SET(dctc, dctc, hop_limit, attr-&gt;ah_attr.grh.hop_limit);</div><div class='ctx'> </div><div class='ctx'> 		err = mlx5_core_create_dct(dev-&gt;mdev, &amp;qp-&gt;dct.mdct, qp-&gt;dct.in,</div><div class='del'>-					   MLX5_ST_SZ_BYTES(create_dct_in));</div><div class='add'>+					   MLX5_ST_SZ_BYTES(create_dct_in), out,</div><div class='add'>+					   sizeof(out));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		resp.dctn = qp-&gt;dct.mdct.mqp.qpn;</div><div class='hunk'>@@ -5117,11 +5122,10 @@ out:</div><div class='ctx'> 		wmb();</div><div class='ctx'> </div><div class='ctx'> 		/* currently we support only regular doorbells */</div><div class='del'>-		mlx5_write64((__be32 *)ctrl, bf-&gt;bfreg-&gt;map + bf-&gt;offset, NULL);</div><div class='add'>+		mlx5_write64((__be32 *)ctrl, bf-&gt;bfreg-&gt;map + bf-&gt;offset);</div><div class='ctx'> 		/* Make sure doorbells don't leak out of SQ spinlock</div><div class='ctx'> 		 * and reach the HCA out of order.</div><div class='ctx'> 		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		bf-&gt;offset ^= bf-&gt;buf_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c<br/>index 83aa47eb81a9..bdf5ed38de22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mthca/mthca_cmd.c</a></div><div class='hunk'>@@ -292,12 +292,6 @@ static int mthca_cmd_post(struct mthca_dev *dev,</div><div class='ctx'> 		err = mthca_cmd_post_hcr(dev, in_param, out_param, in_modifier,</div><div class='ctx'> 					 op_modifier, op, token, event);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure that our HCR writes don't get mixed in with</div><div class='del'>-	 * writes from another CPU starting a FW command.</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;cmd.hcr_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c<br/>index a6531ffe29a6..877a6daffa98 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_cq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_cq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_cq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mthca/mthca_cq.c</a></div><div class='hunk'>@@ -211,11 +211,6 @@ static inline void update_cons_index(struct mthca_dev *dev, struct mthca_cq *cq,</div><div class='ctx'> 		mthca_write64(MTHCA_TAVOR_CQ_DB_INC_CI | cq-&gt;cqn, incr - 1,</div><div class='ctx'> 			      dev-&gt;kar + MTHCA_CQ_DOORBELL,</div><div class='ctx'> 			      MTHCA_GET_DOORBELL_LOCK(&amp;dev-&gt;doorbell_lock));</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure doorbells don't leak out of CQ spinlock</div><div class='del'>-		 * and reach the HCA out of order:</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c<br/>index 7a5b25d13faa..d65b189f20ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_qp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_qp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mthca/mthca_qp.c</a></div><div class='hunk'>@@ -1809,11 +1809,6 @@ out:</div><div class='ctx'> 			      (qp-&gt;qpn &lt;&lt; 8) | size0,</div><div class='ctx'> 			      dev-&gt;kar + MTHCA_SEND_DOORBELL,</div><div class='ctx'> 			      MTHCA_GET_DOORBELL_LOCK(&amp;dev-&gt;doorbell_lock));</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure doorbells don't leak out of SQ spinlock</div><div class='del'>-		 * and reach the HCA out of order:</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qp-&gt;sq.next_ind = ind;</div><div class='hunk'>@@ -1924,12 +1919,6 @@ out:</div><div class='ctx'> 	qp-&gt;rq.next_ind = ind;</div><div class='ctx'> 	qp-&gt;rq.head    += nreq;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure doorbells don't leak out of RQ spinlock and reach</div><div class='del'>-	 * the HCA out of order:</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;qp-&gt;rq.lock, flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2164,12 +2153,6 @@ out:</div><div class='ctx'> 			      MTHCA_GET_DOORBELL_LOCK(&amp;dev-&gt;doorbell_lock));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure doorbells don't leak out of SQ spinlock and reach</div><div class='del'>-	 * the HCA out of order:</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;qp-&gt;sq.lock, flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c<br/>index 06b920385512..a85935ccce88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_srq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/mthca/mthca_srq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/mthca/mthca_srq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/mthca/mthca_srq.c</a></div><div class='hunk'>@@ -570,12 +570,6 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr,</div><div class='ctx'> 			      MTHCA_GET_DOORBELL_LOCK(&amp;dev-&gt;doorbell_lock));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure doorbells don't leak out of SRQ spinlock and</div><div class='del'>-	 * reach the HCA out of order:</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;srq-&gt;lock, flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c<br/>index 032883180f65..0010a3ed64f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/nes/nes_cm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/nes/nes_cm.c</a></div><div class='hunk'>@@ -1407,7 +1407,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi</div><div class='ctx'> 		if (neigh-&gt;nud_state &amp; NUD_VALID) {</div><div class='ctx'> 			nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"</div><div class='ctx'> 				  " is %pM, Gateway is 0x%08X \n", dst_ip,</div><div class='del'>-				  neigh-&gt;ha, ntohl(rt-&gt;rt_gateway));</div><div class='add'>+				  neigh-&gt;ha, ntohl(rt-&gt;rt_gw4));</div><div class='ctx'> </div><div class='ctx'> 			if (arpindex &gt;= 0) {</div><div class='ctx'> 				if (ether_addr_equal(nesadapter-&gt;arp_table[arpindex].mac_addr, neigh-&gt;ha)) {</div><div class='head'>diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c<br/>index 59ad4202422c..8686a98e113d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qedr/verbs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qedr/verbs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qedr/verbs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/qedr/verbs.c</a></div><div class='hunk'>@@ -773,9 +773,6 @@ static void doorbell_cq(struct qedr_cq *cq, u32 cons, u8 flags)</div><div class='ctx'> 	cq-&gt;db.data.agg_flags = flags;</div><div class='ctx'> 	cq-&gt;db.data.value = cpu_to_le32(cons);</div><div class='ctx'> 	writeq(cq-&gt;db.raw, cq-&gt;db_addr);</div><div class='del'>-</div><div class='del'>-	/* Make sure write would stick */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qedr_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)</div><div class='hunk'>@@ -2084,8 +2081,6 @@ static int qedr_update_qp_state(struct qedr_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 			if (rdma_protocol_roce(&amp;dev-&gt;ibdev, 1)) {</div><div class='ctx'> 				writel(qp-&gt;rq.db_data.raw, qp-&gt;rq.db);</div><div class='del'>-				/* Make sure write takes effect */</div><div class='del'>-				mmiowb();</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QED_ROCE_QP_STATE_ERR:</div><div class='hunk'>@@ -3502,9 +3497,6 @@ int qedr_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	writel(qp-&gt;sq.db_data.raw, qp-&gt;sq.db);</div><div class='ctx'> </div><div class='del'>-	/* Make sure write sticks */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;qp-&gt;q_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -3695,12 +3687,8 @@ int qedr_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,</div><div class='ctx'> </div><div class='ctx'> 		writel(qp-&gt;rq.db_data.raw, qp-&gt;rq.db);</div><div class='ctx'> </div><div class='del'>-		/* Make sure write sticks */</div><div class='del'>-		mmiowb();</div><div class='del'>-</div><div class='ctx'> 		if (rdma_protocol_iwarp(&amp;dev-&gt;ibdev, 1)) {</div><div class='ctx'> 			writel(qp-&gt;rq.iwarp_db2_data.raw, qp-&gt;rq.iwarp_db2);</div><div class='del'>-			mmiowb();	/* for second doorbell */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		wr = wr-&gt;next;</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c<br/>index cdbf707fa267..531d8a1db2c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_iba6120.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_iba6120.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_iba6120.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/qib/qib_iba6120.c</a></div><div class='hunk'>@@ -1884,7 +1884,6 @@ static void qib_6120_put_tid(struct qib_devdata *dd, u64 __iomem *tidptr,</div><div class='ctx'> 	qib_write_kreg(dd, kr_scratch, 0xfeeddeaf);</div><div class='ctx'> 	writel(pa, tidp32);</div><div class='ctx'> 	qib_write_kreg(dd, kr_scratch, 0xdeadbeef);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(tidlockp, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1928,7 +1927,6 @@ static void qib_6120_put_tid_2(struct qib_devdata *dd, u64 __iomem *tidptr,</div><div class='ctx'> 			pa |= 2 &lt;&lt; 29;</div><div class='ctx'> 	}</div><div class='ctx'> 	writel(pa, tidp32);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2053,9 +2051,7 @@ static void qib_update_6120_usrhead(struct qib_ctxtdata *rcd, u64 hd,</div><div class='ctx'> {</div><div class='ctx'> 	if (updegr)</div><div class='ctx'> 		qib_write_ureg(rcd-&gt;dd, ur_rcvegrindexhead, egrhd, rcd-&gt;ctxt);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 qib_6120_hdrqempty(struct qib_ctxtdata *rcd)</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c<br/>index 9fde45538f6e..ea3ddb05cbad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_iba7220.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_iba7220.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_iba7220.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/qib/qib_iba7220.c</a></div><div class='hunk'>@@ -2175,7 +2175,6 @@ static void qib_7220_put_tid(struct qib_devdata *dd, u64 __iomem *tidptr,</div><div class='ctx'> 		pa = chippa;</div><div class='ctx'> 	}</div><div class='ctx'> 	writeq(pa, tidptr);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2704,9 +2703,7 @@ static void qib_update_7220_usrhead(struct qib_ctxtdata *rcd, u64 hd,</div><div class='ctx'> {</div><div class='ctx'> 	if (updegr)</div><div class='ctx'> 		qib_write_ureg(rcd-&gt;dd, ur_rcvegrindexhead, egrhd, rcd-&gt;ctxt);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 qib_7220_hdrqempty(struct qib_ctxtdata *rcd)</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c<br/>index 17d6b24b3473..ac6a84f11ad0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_iba7322.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_iba7322.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_iba7322.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/qib/qib_iba7322.c</a></div><div class='hunk'>@@ -3793,7 +3793,6 @@ static void qib_7322_put_tid(struct qib_devdata *dd, u64 __iomem *tidptr,</div><div class='ctx'> 		pa = chippa;</div><div class='ctx'> 	}</div><div class='ctx'> 	writeq(pa, tidptr);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4440,10 +4439,8 @@ static void qib_update_7322_usrhead(struct qib_ctxtdata *rcd, u64 hd,</div><div class='ctx'> 		adjust_rcv_timeout(rcd, npkts);</div><div class='ctx'> 	if (updegr)</div><div class='ctx'> 		qib_write_ureg(rcd-&gt;dd, ur_rcvegrindexhead, egrhd, rcd-&gt;ctxt);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='ctx'> 	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 qib_7322_hdrqempty(struct qib_ctxtdata *rcd)</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c<br/>index 12caf3db8c34..4f4a09c2dbcd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_sd7220.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/qib/qib_sd7220.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/qib/qib_sd7220.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/qib/qib_sd7220.c</a></div><div class='hunk'>@@ -1068,7 +1068,6 @@ static int qib_sd_setvals(struct qib_devdata *dd)</div><div class='ctx'> 	for (idx = 0; idx &lt; NUM_DDS_REGS; ++idx) {</div><div class='ctx'> 		data = ((dds_reg_map &amp; 0xF) &lt;&lt; 4) | TX_FAST_ELT;</div><div class='ctx'> 		writeq(data, iaddr + idx);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		qib_read_kreg32(dd, kr_scratch);</div><div class='ctx'> 		dds_reg_map &gt;&gt;= 4;</div><div class='ctx'> 		for (midx = 0; midx &lt; DDS_ROWS; ++midx) {</div><div class='hunk'>@@ -1076,7 +1075,6 @@ static int qib_sd_setvals(struct qib_devdata *dd)</div><div class='ctx'> </div><div class='ctx'> 			data = dds_init_vals[midx].reg_vals[idx];</div><div class='ctx'> 			writeq(data, daddr);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			qib_read_kreg32(dd, kr_scratch);</div><div class='ctx'> 		} /* End inner for (vals for this reg, each row) */</div><div class='ctx'> 	} /* end outer for (regs to be stored) */</div><div class='hunk'>@@ -1098,13 +1096,11 @@ static int qib_sd_setvals(struct qib_devdata *dd)</div><div class='ctx'> 		didx = idx + min_idx;</div><div class='ctx'> 		/* Store the next RXEQ register address */</div><div class='ctx'> 		writeq(rxeq_init_vals[idx].rdesc, iaddr + didx);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		qib_read_kreg32(dd, kr_scratch);</div><div class='ctx'> 		/* Iterate through RXEQ values */</div><div class='ctx'> 		for (vidx = 0; vidx &lt; 4; vidx++) {</div><div class='ctx'> 			data = rxeq_init_vals[idx].rdata[vidx];</div><div class='ctx'> 			writeq(data, taddr + (vidx &lt;&lt; 6) + idx);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			qib_read_kreg32(dd, kr_scratch);</div><div class='ctx'> 		}</div><div class='ctx'> 	} /* end outer for (Reg-writes for RXEQ) */</div><div class='head'>diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c<br/>index 6d8b3e0de57a..ec41400fec0c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c</a></div><div class='hunk'>@@ -1131,6 +1131,8 @@ static void pvrdma_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pvrdma_page_dir_cleanup(dev, &amp;dev-&gt;cq_pdir);</div><div class='ctx'> 	pvrdma_page_dir_cleanup(dev, &amp;dev-&gt;async_pdir);</div><div class='ctx'> 	pvrdma_free_slots(dev);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(*dev-&gt;dsr), dev-&gt;dsr,</div><div class='add'>+			  dev-&gt;dsrbase);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(dev-&gt;regs);</div><div class='ctx'> 	kfree(dev-&gt;sgid_tbl);</div><div class='head'>diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c<br/>index 728795043496..0bb6e39dd03a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/sw/rdmavt/mr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/sw/rdmavt/mr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/sw/rdmavt/mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/sw/rdmavt/mr.c</a></div><div class='hunk'>@@ -608,11 +608,6 @@ static int rvt_set_page(struct ib_mr *ibmr, u64 addr)</div><div class='ctx'> 	if (unlikely(mapped_segs == mr-&gt;mr.max_segs))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (mr-&gt;mr.length == 0) {</div><div class='del'>-		mr-&gt;mr.user_base = addr;</div><div class='del'>-		mr-&gt;mr.iova = addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	m = mapped_segs / RVT_SEGSZ;</div><div class='ctx'> 	n = mapped_segs % RVT_SEGSZ;</div><div class='ctx'> 	mr-&gt;mr.map[m]-&gt;segs[n].vaddr = (void *)addr;</div><div class='hunk'>@@ -630,17 +625,24 @@ static int rvt_set_page(struct ib_mr *ibmr, u64 addr)</div><div class='ctx'>  * @sg_nents: number of entries in sg</div><div class='ctx'>  * @sg_offset: offset in bytes into sg</div><div class='ctx'>  *</div><div class='add'>+ * Overwrite rvt_mr length with mr length calculated by ib_sg_to_pages.</div><div class='add'>+ *</div><div class='ctx'>  * Return: number of sg elements mapped to the memory region</div><div class='ctx'>  */</div><div class='ctx'> int rvt_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,</div><div class='ctx'> 		  int sg_nents, unsigned int *sg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct rvt_mr *mr = to_imr(ibmr);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mr-&gt;mr.length = 0;</div><div class='ctx'> 	mr-&gt;mr.page_shift = PAGE_SHIFT;</div><div class='del'>-	return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset,</div><div class='del'>-			      rvt_set_page);</div><div class='add'>+	ret = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, rvt_set_page);</div><div class='add'>+	mr-&gt;mr.user_base = ibmr-&gt;iova;</div><div class='add'>+	mr-&gt;mr.iova = ibmr-&gt;iova;</div><div class='add'>+	mr-&gt;mr.offset = ibmr-&gt;iova - (u64)mr-&gt;mr.map[0]-&gt;segs[0].vaddr;</div><div class='add'>+	mr-&gt;mr.length = (size_t)ibmr-&gt;length;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -671,6 +673,7 @@ int rvt_fast_reg_mr(struct rvt_qp *qp, struct ib_mr *ibmr, u32 key,</div><div class='ctx'> 	ibmr-&gt;rkey = key;</div><div class='ctx'> 	mr-&gt;mr.lkey = key;</div><div class='ctx'> 	mr-&gt;mr.access_flags = access;</div><div class='add'>+	mr-&gt;mr.iova = ibmr-&gt;iova;</div><div class='ctx'> 	atomic_set(&amp;mr-&gt;mr.lkey_invalid, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/infiniband/sw/rxe/rxe.h b/drivers/infiniband/sw/rxe/rxe.h<br/>index 2e2dff478833..ecf6e659c0da 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/sw/rxe/rxe.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/sw/rxe/rxe.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/sw/rxe/rxe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/sw/rxe/rxe.h</a></div><div class='hunk'>@@ -80,7 +80,6 @@ static inline u32 rxe_crc32(struct rxe_dev *rxe,</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, rxe-&gt;tfm);</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = rxe-&gt;tfm;</div><div class='del'>-	shash-&gt;flags = 0;</div><div class='ctx'> 	*(u32 *)shash_desc_ctx(shash) = crc;</div><div class='ctx'> 	err = crypto_shash_update(shash, next, len);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='head'>diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c<br/>index ae70cd18903e..aeff68f582d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c</a></div><div class='hunk'>@@ -95,8 +95,7 @@ static netdev_tx_t opa_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb,</div><div class='del'>-				 struct net_device *sb_dev,</div><div class='del'>-				 select_queue_fallback_t fallback)</div><div class='add'>+				 struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);</div><div class='ctx'> 	struct opa_vnic_skb_mdata *mdata;</div><div class='hunk'>@@ -106,8 +105,7 @@ static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb,</div><div class='ctx'> 	mdata = skb_push(skb, sizeof(*mdata));</div><div class='ctx'> 	mdata-&gt;entropy = opa_vnic_calc_entropy(skb);</div><div class='ctx'> 	mdata-&gt;vl = opa_vnic_get_vl(adapter, skb);</div><div class='del'>-	rc = adapter-&gt;rn_ops-&gt;ndo_select_queue(netdev, skb,</div><div class='del'>-					       sb_dev, fallback);</div><div class='add'>+	rc = adapter-&gt;rn_ops-&gt;ndo_select_queue(netdev, skb, sb_dev);</div><div class='ctx'> 	skb_pull(skb, sizeof(*mdata));</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c<br/>index f48369d6f3a0..f040d8881ff2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/evdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/evdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/evdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/evdev.c</a></div><div class='hunk'>@@ -524,7 +524,7 @@ static int evdev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		goto err_free_client;</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = client;</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c<br/>index 4c1e427dfabb..d806f6be4788 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/joydev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/joydev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/joydev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/joydev.c</a></div><div class='hunk'>@@ -279,7 +279,7 @@ static int joydev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		goto err_free_client;</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = client;</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig<br/>index a878351f1643..52d7f55fca32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/keyboard/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/keyboard/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/keyboard/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/keyboard/Kconfig</a></div><div class='hunk'>@@ -420,7 +420,7 @@ config KEYBOARD_MPR121</div><div class='ctx'> </div><div class='ctx'> config KEYBOARD_SNVS_PWRKEY</div><div class='ctx'> 	tristate "IMX SNVS Power Key Driver"</div><div class='del'>-	depends on SOC_IMX6SX || SOC_IMX7D</div><div class='add'>+	depends on ARCH_MXC || COMPILE_TEST</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the snvs powerkey driver for the Freescale i.MX application</div><div class='head'>diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c<br/>index effb63205d3d..4c67cf30a5d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/keyboard/snvs_pwrkey.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/keyboard/snvs_pwrkey.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/keyboard/snvs_pwrkey.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/keyboard/snvs_pwrkey.c</a></div><div class='hunk'>@@ -148,6 +148,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pdata-&gt;input = input;</div><div class='add'>+	platform_set_drvdata(pdev, pdata);</div><div class='add'>+</div><div class='ctx'> 	error = devm_request_irq(&amp;pdev-&gt;dev, pdata-&gt;irq,</div><div class='ctx'> 			       imx_snvs_pwrkey_interrupt,</div><div class='ctx'> 			       0, pdev-&gt;name, pdev);</div><div class='hunk'>@@ -163,9 +166,6 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;input = input;</div><div class='del'>-	platform_set_drvdata(pdev, pdata);</div><div class='del'>-</div><div class='ctx'> 	device_init_wakeup(&amp;pdev-&gt;dev, pdata-&gt;wakeup);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c<br/>index 26ec603fe220..1a6762fc38f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/misc/uinput.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/misc/uinput.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/misc/uinput.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/misc/uinput.c</a></div><div class='hunk'>@@ -398,7 +398,7 @@ static int uinput_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	newdev-&gt;state = UIST_NEW_DEVICE;</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = newdev;</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c<br/>index 628ef617bb2f..f9525d6f0bfe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/mouse/elan_i2c_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/mouse/elan_i2c_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/mouse/elan_i2c_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/mouse/elan_i2c_core.c</a></div><div class='hunk'>@@ -1339,21 +1339,46 @@ static const struct acpi_device_id elan_acpi_id[] = {</div><div class='ctx'> 	{ "ELAN0600", 0 },</div><div class='ctx'> 	{ "ELAN0601", 0 },</div><div class='ctx'> 	{ "ELAN0602", 0 },</div><div class='add'>+	{ "ELAN0603", 0 },</div><div class='add'>+	{ "ELAN0604", 0 },</div><div class='ctx'> 	{ "ELAN0605", 0 },</div><div class='add'>+	{ "ELAN0606", 0 },</div><div class='add'>+	{ "ELAN0607", 0 },</div><div class='ctx'> 	{ "ELAN0608", 0 },</div><div class='ctx'> 	{ "ELAN0609", 0 },</div><div class='ctx'> 	{ "ELAN060B", 0 },</div><div class='ctx'> 	{ "ELAN060C", 0 },</div><div class='add'>+	{ "ELAN060F", 0 },</div><div class='add'>+	{ "ELAN0610", 0 },</div><div class='ctx'> 	{ "ELAN0611", 0 },</div><div class='ctx'> 	{ "ELAN0612", 0 },</div><div class='add'>+	{ "ELAN0615", 0 },</div><div class='add'>+	{ "ELAN0616", 0 },</div><div class='ctx'> 	{ "ELAN0617", 0 },</div><div class='ctx'> 	{ "ELAN0618", 0 },</div><div class='add'>+	{ "ELAN0619", 0 },</div><div class='add'>+	{ "ELAN061A", 0 },</div><div class='add'>+	{ "ELAN061B", 0 },</div><div class='ctx'> 	{ "ELAN061C", 0 },</div><div class='ctx'> 	{ "ELAN061D", 0 },</div><div class='ctx'> 	{ "ELAN061E", 0 },</div><div class='add'>+	{ "ELAN061F", 0 },</div><div class='ctx'> 	{ "ELAN0620", 0 },</div><div class='ctx'> 	{ "ELAN0621", 0 },</div><div class='ctx'> 	{ "ELAN0622", 0 },</div><div class='add'>+	{ "ELAN0623", 0 },</div><div class='add'>+	{ "ELAN0624", 0 },</div><div class='add'>+	{ "ELAN0625", 0 },</div><div class='add'>+	{ "ELAN0626", 0 },</div><div class='add'>+	{ "ELAN0627", 0 },</div><div class='add'>+	{ "ELAN0628", 0 },</div><div class='add'>+	{ "ELAN0629", 0 },</div><div class='add'>+	{ "ELAN062A", 0 },</div><div class='add'>+	{ "ELAN062B", 0 },</div><div class='add'>+	{ "ELAN062C", 0 },</div><div class='add'>+	{ "ELAN062D", 0 },</div><div class='add'>+	{ "ELAN0631", 0 },</div><div class='add'>+	{ "ELAN0632", 0 },</div><div class='ctx'> 	{ "ELAN1000", 0 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c<br/>index fc3ab93b7aea..7fb358f96195 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/rmi4/rmi_driver.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/rmi4/rmi_driver.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/rmi4/rmi_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/rmi4/rmi_driver.c</a></div><div class='hunk'>@@ -860,7 +860,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev,</div><div class='ctx'> </div><div class='ctx'> 	error = rmi_register_function(fn);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto err_put_fn;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (pdt-&gt;function_number == 0x01)</div><div class='ctx'> 		data-&gt;f01_container = fn;</div><div class='hunk'>@@ -870,10 +870,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev,</div><div class='ctx'> 	list_add_tail(&amp;fn-&gt;node, &amp;data-&gt;function_list);</div><div class='ctx'> </div><div class='ctx'> 	return RMI_SCAN_CONTINUE;</div><div class='del'>-</div><div class='del'>-err_put_fn:</div><div class='del'>-	put_device(&amp;fn-&gt;dev);</div><div class='del'>-	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)</div><div class='head'>diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c<br/>index df64d6aed4f7..93901ebd122a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/rmi4/rmi_f11.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/input/rmi4/rmi_f11.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/input/rmi4/rmi_f11.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/input/rmi4/rmi_f11.c</a></div><div class='hunk'>@@ -1230,7 +1230,7 @@ static int rmi_f11_initialize(struct rmi_function *fn)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = f11_write_control_regs(fn, &amp;f11-&gt;sens_query,</div><div class='del'>-			   &amp;f11-&gt;dev_controls, fn-&gt;fd.query_base_addr);</div><div class='add'>+			   &amp;f11-&gt;dev_controls, fn-&gt;fd.control_base_addr);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		dev_warn(&amp;fn-&gt;dev, "Failed to write control registers\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c<br/>index 6005a1c189f6..871eb4bc4efc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/interconnect/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/interconnect/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/interconnect/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/interconnect/core.c</a></div><div class='hunk'>@@ -90,18 +90,7 @@ static int icc_summary_show(struct seq_file *s, void *data)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int icc_summary_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, icc_summary_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations icc_summary_fops = {</div><div class='del'>-	.open		= icc_summary_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(icc_summary);</div><div class='ctx'> </div><div class='ctx'> static struct icc_node *node_find(const int id)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c<br/>index b319e51c379b..f7cdd2ab7f11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/amd_iommu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/amd_iommu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/amd_iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/amd_iommu.c</a></div><div class='hunk'>@@ -2608,7 +2608,12 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 	/* Everything is mapped - write the right values into s-&gt;dma_address */</div><div class='ctx'> 	for_each_sg(sglist, s, nelems, i) {</div><div class='del'>-		s-&gt;dma_address += address + s-&gt;offset;</div><div class='add'>+		/*</div><div class='add'>+		 * Add in the remaining piece of the scatter-gather offset that</div><div class='add'>+		 * was masked out when we were determining the physical address</div><div class='add'>+		 * via (sg_phys(s) &amp; PAGE_MASK) earlier.</div><div class='add'>+		 */</div><div class='add'>+		s-&gt;dma_address += address + (s-&gt;offset &amp; ~PAGE_MASK);</div><div class='ctx'> 		s-&gt;dma_length   = s-&gt;length;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3164,21 +3169,24 @@ static void amd_iommu_get_resv_regions(struct device *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;amd_iommu_unity_map, list) {</div><div class='add'>+		int type, prot = 0;</div><div class='ctx'> 		size_t length;</div><div class='del'>-		int prot = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (devid &lt; entry-&gt;devid_start || devid &gt; entry-&gt;devid_end)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		type   = IOMMU_RESV_DIRECT;</div><div class='ctx'> 		length = entry-&gt;address_end - entry-&gt;address_start;</div><div class='ctx'> 		if (entry-&gt;prot &amp; IOMMU_PROT_IR)</div><div class='ctx'> 			prot |= IOMMU_READ;</div><div class='ctx'> 		if (entry-&gt;prot &amp; IOMMU_PROT_IW)</div><div class='ctx'> 			prot |= IOMMU_WRITE;</div><div class='add'>+		if (entry-&gt;prot &amp; IOMMU_UNITY_MAP_FLAG_EXCL_RANGE)</div><div class='add'>+			/* Exclusion range */</div><div class='add'>+			type = IOMMU_RESV_RESERVED;</div><div class='ctx'> </div><div class='ctx'> 		region = iommu_alloc_resv_region(entry-&gt;address_start,</div><div class='del'>-						 length, prot,</div><div class='del'>-						 IOMMU_RESV_DIRECT);</div><div class='add'>+						 length, prot, type);</div><div class='ctx'> 		if (!region) {</div><div class='ctx'> 			dev_err(dev, "Out of memory allocating dm-regions\n");</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c<br/>index f773792d77fd..ff40ba758cf3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/amd_iommu_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/amd_iommu_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/amd_iommu_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/amd_iommu_init.c</a></div><div class='hunk'>@@ -359,7 +359,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val)</div><div class='ctx'> static void iommu_set_exclusion_range(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start = iommu-&gt;exclusion_start &amp; PAGE_MASK;</div><div class='del'>-	u64 limit = (start + iommu-&gt;exclusion_length) &amp; PAGE_MASK;</div><div class='add'>+	u64 limit = (start + iommu-&gt;exclusion_length - 1) &amp; PAGE_MASK;</div><div class='ctx'> 	u64 entry;</div><div class='ctx'> </div><div class='ctx'> 	if (!iommu-&gt;exclusion_start)</div><div class='hunk'>@@ -2013,6 +2013,9 @@ static int __init init_unity_map_range(struct ivmd_header *m)</div><div class='ctx'> 	if (e == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (m-&gt;flags &amp; IVMD_FLAG_EXCL_RANGE)</div><div class='add'>+		init_exclusion_range(m);</div><div class='add'>+</div><div class='ctx'> 	switch (m-&gt;type) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		kfree(e);</div><div class='hunk'>@@ -2059,9 +2062,7 @@ static int __init init_memory_definitions(struct acpi_table_header *table)</div><div class='ctx'> </div><div class='ctx'> 	while (p &lt; end) {</div><div class='ctx'> 		m = (struct ivmd_header *)p;</div><div class='del'>-		if (m-&gt;flags &amp; IVMD_FLAG_EXCL_RANGE)</div><div class='del'>-			init_exclusion_range(m);</div><div class='del'>-		else if (m-&gt;flags &amp; IVMD_FLAG_UNITY_MAP)</div><div class='add'>+		if (m-&gt;flags &amp; (IVMD_FLAG_UNITY_MAP | IVMD_FLAG_EXCL_RANGE))</div><div class='ctx'> 			init_unity_map_range(m);</div><div class='ctx'> </div><div class='ctx'> 		p += m-&gt;length;</div><div class='head'>diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h<br/>index eae0741f72dc..87965e4d9647 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/amd_iommu_types.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/amd_iommu_types.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/amd_iommu_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/amd_iommu_types.h</a></div><div class='hunk'>@@ -374,6 +374,8 @@</div><div class='ctx'> #define IOMMU_PROT_IR 0x01</div><div class='ctx'> #define IOMMU_PROT_IW 0x02</div><div class='ctx'> </div><div class='add'>+#define IOMMU_UNITY_MAP_FLAG_EXCL_RANGE	(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='ctx'> /* IOMMU capabilities */</div><div class='ctx'> #define IOMMU_CAP_IOTLB   24</div><div class='ctx'> #define IOMMU_CAP_NPCACHE 26</div><div class='head'>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c<br/>index 87274b54febd..28cb713d728c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/intel-iommu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/intel-iommu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/intel-iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/intel-iommu.c</a></div><div class='hunk'>@@ -1538,6 +1538,9 @@ static void iommu_disable_protect_mem_regions(struct intel_iommu *iommu)</div><div class='ctx'> 	u32 pmen;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (!cap_plmr(iommu-&gt;cap) &amp;&amp; !cap_phmr(iommu-&gt;cap))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	raw_spin_lock_irqsave(&amp;iommu-&gt;register_lock, flags);</div><div class='ctx'> 	pmen = readl(iommu-&gt;reg + DMAR_PMEN_REG);</div><div class='ctx'> 	pmen &amp;= ~DMA_PMEN_EPM;</div><div class='hunk'>@@ -5332,7 +5335,7 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct intel_svm_dev *sd</div><div class='ctx'> </div><div class='ctx'> 	ctx_lo = context[0].lo;</div><div class='ctx'> </div><div class='del'>-	sdev-&gt;did = domain-&gt;iommu_did[iommu-&gt;seq_id];</div><div class='add'>+	sdev-&gt;did = FLPT_DEFAULT_DID;</div><div class='ctx'> 	sdev-&gt;sid = PCI_DEVID(info-&gt;bus, info-&gt;devfn);</div><div class='ctx'> </div><div class='ctx'> 	if (!(ctx_lo &amp; CONTEXT_PASIDE)) {</div><div class='head'>diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c<br/>index f101afc315ab..9a8a8870e267 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/io-pgtable-arm-v7s.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/io-pgtable-arm-v7s.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/io-pgtable-arm-v7s.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/io-pgtable-arm-v7s.c</a></div><div class='hunk'>@@ -160,6 +160,14 @@</div><div class='ctx'> </div><div class='ctx'> #define ARM_V7S_TCR_PD1			BIT(5)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ZONE_DMA32</div><div class='add'>+#define ARM_V7S_TABLE_GFP_DMA GFP_DMA32</div><div class='add'>+#define ARM_V7S_TABLE_SLAB_FLAGS SLAB_CACHE_DMA32</div><div class='add'>+#else</div><div class='add'>+#define ARM_V7S_TABLE_GFP_DMA GFP_DMA</div><div class='add'>+#define ARM_V7S_TABLE_SLAB_FLAGS SLAB_CACHE_DMA</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> typedef u32 arm_v7s_iopte;</div><div class='ctx'> </div><div class='ctx'> static bool selftest_running;</div><div class='hunk'>@@ -197,13 +205,16 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,</div><div class='ctx'> 	void *table = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (lvl == 1)</div><div class='del'>-		table = (void *)__get_dma_pages(__GFP_ZERO, get_order(size));</div><div class='add'>+		table = (void *)__get_free_pages(</div><div class='add'>+			__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));</div><div class='ctx'> 	else if (lvl == 2)</div><div class='del'>-		table = kmem_cache_zalloc(data-&gt;l2_tables, gfp | GFP_DMA);</div><div class='add'>+		table = kmem_cache_zalloc(data-&gt;l2_tables, gfp);</div><div class='ctx'> 	phys = virt_to_phys(table);</div><div class='del'>-	if (phys != (arm_v7s_iopte)phys)</div><div class='add'>+	if (phys != (arm_v7s_iopte)phys) {</div><div class='ctx'> 		/* Doesn't fit in PTE */</div><div class='add'>+		dev_err(dev, "Page table does not fit in PTE: %pa", &amp;phys);</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> 	if (table &amp;&amp; !(cfg-&gt;quirks &amp; IO_PGTABLE_QUIRK_NO_DMA)) {</div><div class='ctx'> 		dma = dma_map_single(dev, table, size, DMA_TO_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(dev, dma))</div><div class='hunk'>@@ -733,7 +744,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,</div><div class='ctx'> 	data-&gt;l2_tables = kmem_cache_create("io-pgtable_armv7s_l2",</div><div class='ctx'> 					    ARM_V7S_TABLE_SIZE(2),</div><div class='ctx'> 					    ARM_V7S_TABLE_SIZE(2),</div><div class='del'>-					    SLAB_CACHE_DMA, NULL);</div><div class='add'>+					    ARM_V7S_TABLE_SLAB_FLAGS, NULL);</div><div class='ctx'> 	if (!data-&gt;l2_tables)</div><div class='ctx'> 		goto out_free_data;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c<br/>index 33a982e33716..109de67d5d72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/iommu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/iommu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/iommu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/iommu.c</a></div><div class='hunk'>@@ -1105,10 +1105,12 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		dom = __iommu_domain_alloc(dev-&gt;bus, iommu_def_domain_type);</div><div class='ctx'> 		if (!dom &amp;&amp; iommu_def_domain_type != IOMMU_DOMAIN_DMA) {</div><div class='del'>-			dev_warn(dev,</div><div class='del'>-				 "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA",</div><div class='del'>-				 iommu_def_domain_type);</div><div class='ctx'> 			dom = __iommu_domain_alloc(dev-&gt;bus, IOMMU_DOMAIN_DMA);</div><div class='add'>+			if (dom) {</div><div class='add'>+				dev_warn(dev,</div><div class='add'>+					 "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA",</div><div class='add'>+					 iommu_def_domain_type);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		group-&gt;default_domain = dom;</div><div class='head'>diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c<br/>index f8d3ba247523..2de8122e218f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/iova.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/iommu/iova.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/iommu/iova.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/iommu/iova.c</a></div><div class='hunk'>@@ -207,8 +207,10 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,</div><div class='ctx'> 		curr_iova = rb_entry(curr, struct iova, node);</div><div class='ctx'> 	} while (curr &amp;&amp; new_pfn &lt;= curr_iova-&gt;pfn_hi);</div><div class='ctx'> </div><div class='del'>-	if (limit_pfn &lt; size || new_pfn &lt; iovad-&gt;start_pfn)</div><div class='add'>+	if (limit_pfn &lt; size || new_pfn &lt; iovad-&gt;start_pfn) {</div><div class='add'>+		iovad-&gt;max32_alloc_size = size;</div><div class='ctx'> 		goto iova32_full;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* pfn_lo will point to size aligned address if size_aligned is set */</div><div class='ctx'> 	new-&gt;pfn_lo = new_pfn;</div><div class='hunk'>@@ -222,7 +224,6 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> iova32_full:</div><div class='del'>-	iovad-&gt;max32_alloc_size = size;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iovad-&gt;iova_rbtree_lock, flags);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/irqchip/irq-ath79-misc.c b/drivers/irqchip/irq-ath79-misc.c<br/>index aa7290784636..0390603170b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-ath79-misc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-ath79-misc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-ath79-misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-ath79-misc.c</a></div><div class='hunk'>@@ -22,6 +22,15 @@</div><div class='ctx'> #define AR71XX_RESET_REG_MISC_INT_ENABLE	4</div><div class='ctx'> </div><div class='ctx'> #define ATH79_MISC_IRQ_COUNT			32</div><div class='add'>+#define ATH79_MISC_PERF_IRQ			5</div><div class='add'>+</div><div class='add'>+static int ath79_perfcount_irq;</div><div class='add'>+</div><div class='add'>+int get_c0_perfcount_int(void)</div><div class='add'>+{</div><div class='add'>+	return ath79_perfcount_irq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(get_c0_perfcount_int);</div><div class='ctx'> </div><div class='ctx'> static void ath79_misc_irq_handler(struct irq_desc *desc)</div><div class='ctx'> {</div><div class='hunk'>@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domain_init(</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = domain-&gt;host_data;</div><div class='ctx'> </div><div class='add'>+	ath79_perfcount_irq = irq_create_mapping(domain, ATH79_MISC_PERF_IRQ);</div><div class='add'>+</div><div class='ctx'> 	/* Disable and clear all interrupts */</div><div class='ctx'> 	__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE);</div><div class='ctx'> 	__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS);</div><div class='head'>diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c<br/>index 83364fedbf0a..5e4ca139e4ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-brcmstb-l2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-brcmstb-l2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-brcmstb-l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-brcmstb-l2.c</a></div><div class='hunk'>@@ -275,14 +275,14 @@ out_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init brcmstb_l2_edge_intc_of_init(struct device_node *np,</div><div class='add'>+static int __init brcmstb_l2_edge_intc_of_init(struct device_node *np,</div><div class='ctx'> 	struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	return brcmstb_l2_intc_of_init(np, parent, &amp;l2_edge_intc_init);</div><div class='ctx'> }</div><div class='ctx'> IRQCHIP_DECLARE(brcmstb_l2_intc, "brcm,l2-intc", brcmstb_l2_edge_intc_of_init);</div><div class='ctx'> </div><div class='del'>-int __init brcmstb_l2_lvl_intc_of_init(struct device_node *np,</div><div class='add'>+static int __init brcmstb_l2_lvl_intc_of_init(struct device_node *np,</div><div class='ctx'> 	struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	return brcmstb_l2_intc_of_init(np, parent, &amp;l2_lvl_intc_init);</div><div class='head'>diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c<br/>index f5fe0100f9ff..de14e06fd9ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v2m.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v2m.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v2m.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-gic-v2m.c</a></div><div class='hunk'>@@ -446,7 +446,7 @@ static struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-acpi_parse_madt_msi(struct acpi_subtable_header *header,</div><div class='add'>+acpi_parse_madt_msi(union acpi_subtable_headers *header,</div><div class='ctx'> 		    const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='head'>diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c<br/>index 8d6d009d1d58..c81d5b81da56 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3-its-pci-msi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3-its-pci-msi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3-its-pci-msi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-gic-v3-its-pci-msi.c</a></div><div class='hunk'>@@ -159,7 +159,7 @@ static int __init its_pci_of_msi_init(void)</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-its_pci_msi_parse_madt(struct acpi_subtable_header *header,</div><div class='add'>+its_pci_msi_parse_madt(union acpi_subtable_headers *header,</div><div class='ctx'> 		       const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_translator *its_entry;</div><div class='head'>diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c<br/>index 7b8e87b493fe..9cdcda5bb3bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3-its-platform-msi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3-its-platform-msi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3-its-platform-msi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-gic-v3-its-platform-msi.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static int __init its_pmsi_init_one(struct fwnode_handle *fwnode,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> static int __init</div><div class='del'>-its_pmsi_parse_madt(struct acpi_subtable_header *header,</div><div class='add'>+its_pmsi_parse_madt(union acpi_subtable_headers *header,</div><div class='ctx'> 			const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_translator *its_entry;</div><div class='head'>diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c<br/>index 2dd1ff0cf558..128ac893d7e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3-its.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3-its.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3-its.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-gic-v3-its.c</a></div><div class='hunk'>@@ -1482,7 +1482,7 @@ static int lpi_range_cmp(void *priv, struct list_head *a, struct list_head *b)</div><div class='ctx'> 	ra = container_of(a, struct lpi_range, entry);</div><div class='ctx'> 	rb = container_of(b, struct lpi_range, entry);</div><div class='ctx'> </div><div class='del'>-	return rb-&gt;base_id - ra-&gt;base_id;</div><div class='add'>+	return ra-&gt;base_id - rb-&gt;base_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void merge_lpi_ranges(void)</div><div class='hunk'>@@ -3830,13 +3830,13 @@ static int __init acpi_get_its_numa_node(u32 its_id)</div><div class='ctx'> 	return NUMA_NO_NODE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init gic_acpi_match_srat_its(struct acpi_subtable_header *header,</div><div class='add'>+static int __init gic_acpi_match_srat_its(union acpi_subtable_headers *header,</div><div class='ctx'> 					  const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header,</div><div class='add'>+static int __init gic_acpi_parse_srat_its(union acpi_subtable_headers *header,</div><div class='ctx'> 			 const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	int node;</div><div class='hunk'>@@ -3903,7 +3903,7 @@ static int __init acpi_get_its_numa_node(u32 its_id) { return NUMA_NO_NODE; }</div><div class='ctx'> static void __init acpi_its_srat_maps_free(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init gic_acpi_parse_madt_its(struct acpi_subtable_header *header,</div><div class='add'>+static int __init gic_acpi_parse_madt_its(union acpi_subtable_headers *header,</div><div class='ctx'> 					  const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_translator *its_entry;</div><div class='head'>diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c<br/>index 15e55d327505..f44cd89cfc40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic-v3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic-v3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-gic-v3.c</a></div><div class='hunk'>@@ -1593,7 +1593,7 @@ gic_acpi_register_redist(phys_addr_t phys_base, void __iomem *redist_base)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-gic_acpi_parse_madt_redist(struct acpi_subtable_header *header,</div><div class='add'>+gic_acpi_parse_madt_redist(union acpi_subtable_headers *header,</div><div class='ctx'> 			   const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_redistributor *redist =</div><div class='hunk'>@@ -1611,7 +1611,7 @@ gic_acpi_parse_madt_redist(struct acpi_subtable_header *header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-gic_acpi_parse_madt_gicc(struct acpi_subtable_header *header,</div><div class='add'>+gic_acpi_parse_madt_gicc(union acpi_subtable_headers *header,</div><div class='ctx'> 			 const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_interrupt *gicc =</div><div class='hunk'>@@ -1653,14 +1653,14 @@ static int __init gic_acpi_collect_gicr_base(void)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init gic_acpi_match_gicr(struct acpi_subtable_header *header,</div><div class='add'>+static int __init gic_acpi_match_gicr(union acpi_subtable_headers *header,</div><div class='ctx'> 				  const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	/* Subtable presence means that redist exists, that's it */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init gic_acpi_match_gicc(struct acpi_subtable_header *header,</div><div class='add'>+static int __init gic_acpi_match_gicc(union acpi_subtable_headers *header,</div><div class='ctx'> 				      const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_interrupt *gicc =</div><div class='hunk'>@@ -1726,7 +1726,7 @@ static bool __init acpi_validate_gic_table(struct acpi_subtable_header *header,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init gic_acpi_parse_virt_madt_gicc(struct acpi_subtable_header *header,</div><div class='add'>+static int __init gic_acpi_parse_virt_madt_gicc(union acpi_subtable_headers *header,</div><div class='ctx'> 						const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_interrupt *gicc =</div><div class='head'>diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c<br/>index ba2a37a27a54..c6dbe5018972 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-gic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-gic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-gic.c</a></div><div class='hunk'>@@ -1089,11 +1089,10 @@ static void gic_init_chip(struct gic_chip_data *gic, struct device *dev,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gic_init_bases(struct gic_chip_data *gic, int irq_start,</div><div class='add'>+static int gic_init_bases(struct gic_chip_data *gic,</div><div class='ctx'> 			  struct fwnode_handle *handle)</div><div class='ctx'> {</div><div class='del'>-	irq_hw_number_t hwirq_base;</div><div class='del'>-	int gic_irqs, irq_base, ret;</div><div class='add'>+	int gic_irqs, ret;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_GIC_NON_BANKED) &amp;&amp; gic-&gt;percpu_offset) {</div><div class='ctx'> 		/* Frankein-GIC without banked registers... */</div><div class='hunk'>@@ -1145,28 +1144,21 @@ static int gic_init_bases(struct gic_chip_data *gic, int irq_start,</div><div class='ctx'> 	} else {		/* Legacy support */</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For primary GICs, skip over SGIs.</div><div class='del'>-		 * For secondary GICs, skip over PPIs, too.</div><div class='add'>+		 * No secondary GIC support whatsoever.</div><div class='ctx'> 		 */</div><div class='del'>-		if (gic == &amp;gic_data[0] &amp;&amp; (irq_start &amp; 31) &gt; 0) {</div><div class='del'>-			hwirq_base = 16;</div><div class='del'>-			if (irq_start != -1)</div><div class='del'>-				irq_start = (irq_start &amp; ~31) + 16;</div><div class='del'>-		} else {</div><div class='del'>-			hwirq_base = 32;</div><div class='del'>-		}</div><div class='add'>+		int irq_base;</div><div class='ctx'> </div><div class='del'>-		gic_irqs -= hwirq_base; /* calculate # of irqs to allocate */</div><div class='add'>+		gic_irqs -= 16; /* calculate # of irqs to allocate */</div><div class='ctx'> </div><div class='del'>-		irq_base = irq_alloc_descs(irq_start, 16, gic_irqs,</div><div class='add'>+		irq_base = irq_alloc_descs(16, 16, gic_irqs,</div><div class='ctx'> 					   numa_node_id());</div><div class='ctx'> 		if (irq_base &lt; 0) {</div><div class='del'>-			WARN(1, "Cannot allocate irq_descs @ IRQ%d, assuming pre-allocated\n",</div><div class='del'>-			     irq_start);</div><div class='del'>-			irq_base = irq_start;</div><div class='add'>+			WARN(1, "Cannot allocate irq_descs @ IRQ16, assuming pre-allocated\n");</div><div class='add'>+			irq_base = 16;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		gic-&gt;domain = irq_domain_add_legacy(NULL, gic_irqs, irq_base,</div><div class='del'>-					hwirq_base, &amp;gic_irq_domain_ops, gic);</div><div class='add'>+						    16, &amp;gic_irq_domain_ops, gic);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!gic-&gt;domain)) {</div><div class='hunk'>@@ -1195,7 +1187,6 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init __gic_init_bases(struct gic_chip_data *gic,</div><div class='del'>-				   int irq_start,</div><div class='ctx'> 				   struct fwnode_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	char *name;</div><div class='hunk'>@@ -1231,32 +1222,28 @@ static int __init __gic_init_bases(struct gic_chip_data *gic,</div><div class='ctx'> 		gic_init_chip(gic, NULL, name, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = gic_init_bases(gic, irq_start, handle);</div><div class='add'>+	ret = gic_init_bases(gic, handle);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		kfree(name);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init gic_init(unsigned int gic_nr, int irq_start,</div><div class='del'>-		     void __iomem *dist_base, void __iomem *cpu_base)</div><div class='add'>+void __init gic_init(void __iomem *dist_base, void __iomem *cpu_base)</div><div class='ctx'> {</div><div class='ctx'> 	struct gic_chip_data *gic;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(gic_nr &gt;= CONFIG_ARM_GIC_MAX_NR))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Non-DT/ACPI systems won't run a hypervisor, so let's not</div><div class='ctx'> 	 * bother with these...</div><div class='ctx'> 	 */</div><div class='ctx'> 	static_branch_disable(&amp;supports_deactivate_key);</div><div class='ctx'> </div><div class='del'>-	gic = &amp;gic_data[gic_nr];</div><div class='add'>+	gic = &amp;gic_data[0];</div><div class='ctx'> 	gic-&gt;raw_dist_base = dist_base;</div><div class='ctx'> 	gic-&gt;raw_cpu_base = cpu_base;</div><div class='ctx'> </div><div class='del'>-	__gic_init_bases(gic, irq_start, NULL);</div><div class='add'>+	__gic_init_bases(gic, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gic_teardown(struct gic_chip_data *gic)</div><div class='hunk'>@@ -1399,7 +1386,7 @@ int gic_of_init_child(struct device *dev, struct gic_chip_data **gic, int irq)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = gic_init_bases(*gic, -1, &amp;dev-&gt;of_node-&gt;fwnode);</div><div class='add'>+	ret = gic_init_bases(*gic, &amp;dev-&gt;of_node-&gt;fwnode);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		gic_teardown(*gic);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1459,7 +1446,7 @@ gic_of_init(struct device_node *node, struct device_node *parent)</div><div class='ctx'> 	if (gic_cnt == 0 &amp;&amp; !gic_check_eoimode(node, &amp;gic-&gt;raw_cpu_base))</div><div class='ctx'> 		static_branch_disable(&amp;supports_deactivate_key);</div><div class='ctx'> </div><div class='del'>-	ret = __gic_init_bases(gic, -1, &amp;node-&gt;fwnode);</div><div class='add'>+	ret = __gic_init_bases(gic, &amp;node-&gt;fwnode);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		gic_teardown(gic);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1508,7 +1495,7 @@ static struct</div><div class='ctx'> } acpi_data __initdata;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='del'>-gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,</div><div class='add'>+gic_acpi_parse_madt_cpu(union acpi_subtable_headers *header,</div><div class='ctx'> 			const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_madt_generic_interrupt *processor;</div><div class='hunk'>@@ -1540,7 +1527,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The things you have to do to just *count* something... */</div><div class='del'>-static int __init acpi_dummy_func(struct acpi_subtable_header *header,</div><div class='add'>+static int __init acpi_dummy_func(union acpi_subtable_headers *header,</div><div class='ctx'> 				  const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1650,7 +1637,7 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __gic_init_bases(gic, -1, domain_handle);</div><div class='add'>+	ret = __gic_init_bases(gic, domain_handle);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("Failed to initialise GIC\n");</div><div class='ctx'> 		irq_domain_free_fwnode(domain_handle);</div><div class='head'>diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c<br/>index d1098f4da6a4..88df3d00052c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-imx-irqsteer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-imx-irqsteer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-imx-irqsteer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-imx-irqsteer.c</a></div><div class='hunk'>@@ -169,8 +169,12 @@ static int imx_irqsteer_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_lock_init(&amp;data-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	of_property_read_u32(np, "fsl,num-irqs", &amp;irqs_num);</div><div class='del'>-	of_property_read_u32(np, "fsl,channel", &amp;data-&gt;channel);</div><div class='add'>+	ret = of_property_read_u32(np, "fsl,num-irqs", &amp;irqs_num);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = of_property_read_u32(np, "fsl,channel", &amp;data-&gt;channel);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There is one output irq for each group of 64 inputs.</div><div class='head'>diff --git a/drivers/irqchip/irq-ls1x.c b/drivers/irqchip/irq-ls1x.c<br/>index 86b72fbd3b45..353111a10413 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-ls1x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-ls1x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-ls1x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-ls1x.c</a></div><div class='hunk'>@@ -130,6 +130,7 @@ static int __init ls1x_intc_of_init(struct device_node *node,</div><div class='ctx'> 					     NULL);</div><div class='ctx'> 	if (!priv-&gt;domain) {</div><div class='ctx'> 		pr_err("ls1x-irq: cannot add IRQ domain\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c<br/>index 567b29c47608..98b6e1d4b1a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-mbigen.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-mbigen.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-mbigen.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-mbigen.c</a></div><div class='hunk'>@@ -161,6 +161,9 @@ static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg)</div><div class='ctx'> 	void __iomem *base = d-&gt;chip_data;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	if (!msg-&gt;address_lo &amp;&amp; !msg-&gt;address_hi)</div><div class='add'>+		return;</div><div class='add'>+ </div><div class='ctx'> 	base += get_mbigen_vec_reg(d-&gt;hwirq);</div><div class='ctx'> 	val = readl_relaxed(base);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c<br/>index 3496b61a312a..8eed478f3b7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-mmp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-mmp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-mmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-mmp.c</a></div><div class='hunk'>@@ -179,7 +179,7 @@ static int mmp_irq_domain_xlate(struct irq_domain *d, struct device_node *node,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct irq_domain_ops mmp_irq_domain_ops = {</div><div class='add'>+static const struct irq_domain_ops mmp_irq_domain_ops = {</div><div class='ctx'> 	.map		= mmp_irq_domain_map,</div><div class='ctx'> 	.xlate		= mmp_irq_domain_xlate,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/irqchip/irq-mvebu-sei.c b/drivers/irqchip/irq-mvebu-sei.c<br/>index add4c9c934c8..18832ccc8ff8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-mvebu-sei.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-mvebu-sei.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-mvebu-sei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-mvebu-sei.c</a></div><div class='hunk'>@@ -478,7 +478,7 @@ dispose_irq:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mvebu_sei_caps mvebu_sei_ap806_caps = {</div><div class='add'>+static struct mvebu_sei_caps mvebu_sei_ap806_caps = {</div><div class='ctx'> 	.ap_range = {</div><div class='ctx'> 		.first = 0,</div><div class='ctx'> 		.size = 21,</div><div class='head'>diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c<br/>index a93296b9b45d..7bd1d4cb2e19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-stm32-exti.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/irqchip/irq-stm32-exti.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/irqchip/irq-stm32-exti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/irqchip/irq-stm32-exti.c</a></div><div class='hunk'>@@ -716,7 +716,6 @@ stm32_exti_chip_data *stm32_exti_chip_init(struct stm32_exti_host_data *h_data,</div><div class='ctx'> 	const struct stm32_exti_bank *stm32_bank;</div><div class='ctx'> 	struct stm32_exti_chip_data *chip_data;</div><div class='ctx'> 	void __iomem *base = h_data-&gt;base;</div><div class='del'>-	u32 irqs_mask;</div><div class='ctx'> </div><div class='ctx'> 	stm32_bank = h_data-&gt;drv_data-&gt;exti_banks[bank_idx];</div><div class='ctx'> 	chip_data = &amp;h_data-&gt;chips_data[bank_idx];</div><div class='hunk'>@@ -725,21 +724,12 @@ stm32_exti_chip_data *stm32_exti_chip_init(struct stm32_exti_host_data *h_data,</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_lock_init(&amp;chip_data-&gt;rlock);</div><div class='ctx'> </div><div class='del'>-	/* Determine number of irqs supported */</div><div class='del'>-	writel_relaxed(~0UL, base + stm32_bank-&gt;rtsr_ofst);</div><div class='del'>-	irqs_mask = readl_relaxed(base + stm32_bank-&gt;rtsr_ofst);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This IP has no reset, so after hot reboot we should</div><div class='ctx'> 	 * clear registers to avoid residue</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel_relaxed(0, base + stm32_bank-&gt;imr_ofst);</div><div class='ctx'> 	writel_relaxed(0, base + stm32_bank-&gt;emr_ofst);</div><div class='del'>-	writel_relaxed(0, base + stm32_bank-&gt;rtsr_ofst);</div><div class='del'>-	writel_relaxed(0, base + stm32_bank-&gt;ftsr_ofst);</div><div class='del'>-	writel_relaxed(~0UL, base + stm32_bank-&gt;rpr_ofst);</div><div class='del'>-	if (stm32_bank-&gt;fpr_ofst != UNDEF_REG)</div><div class='del'>-		writel_relaxed(~0UL, base + stm32_bank-&gt;fpr_ofst);</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%pOF: bank%d\n", h_data-&gt;node, bank_idx);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c<br/>index e1da70a9530c..3c3ad42f22bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/capi/capi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/capi/capi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/capi/capi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/capi/capi.c</a></div><div class='hunk'>@@ -960,7 +960,7 @@ static int capi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	list_add_tail(&amp;cdev-&gt;list, &amp;capidev_list);</div><div class='ctx'> 	mutex_unlock(&amp;capidev_list_lock);</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int capi_release(struct inode *inode, struct file *file)</div><div class='head'>diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c<br/>index ecdeb89645d0..149b1aca52a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/gigaset/bas-gigaset.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/gigaset/bas-gigaset.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/gigaset/bas-gigaset.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/gigaset/bas-gigaset.c</a></div><div class='hunk'>@@ -958,6 +958,7 @@ static void write_iso_callback(struct urb *urb)</div><div class='ctx'>  */</div><div class='ctx'> static int starturbs(struct bc_state *bcs)</div><div class='ctx'> {</div><div class='add'>+	struct usb_device *udev = bcs-&gt;cs-&gt;hw.bas-&gt;udev;</div><div class='ctx'> 	struct bas_bc_state *ubc = bcs-&gt;hw.bas;</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	int j, k;</div><div class='hunk'>@@ -975,8 +976,8 @@ static int starturbs(struct bc_state *bcs)</div><div class='ctx'> 			rc = -EFAULT;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		usb_fill_int_urb(urb, bcs-&gt;cs-&gt;hw.bas-&gt;udev,</div><div class='del'>-				 usb_rcvisocpipe(urb-&gt;dev, 3 + 2 * bcs-&gt;channel),</div><div class='add'>+		usb_fill_int_urb(urb, udev,</div><div class='add'>+				 usb_rcvisocpipe(udev, 3 + 2 * bcs-&gt;channel),</div><div class='ctx'> 				 ubc-&gt;isoinbuf + k * BAS_INBUFSIZE,</div><div class='ctx'> 				 BAS_INBUFSIZE, read_iso_callback, bcs,</div><div class='ctx'> 				 BAS_FRAMETIME);</div><div class='hunk'>@@ -1006,8 +1007,8 @@ static int starturbs(struct bc_state *bcs)</div><div class='ctx'> 			rc = -EFAULT;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		usb_fill_int_urb(urb, bcs-&gt;cs-&gt;hw.bas-&gt;udev,</div><div class='del'>-				 usb_sndisocpipe(urb-&gt;dev, 4 + 2 * bcs-&gt;channel),</div><div class='add'>+		usb_fill_int_urb(urb, udev,</div><div class='add'>+				 usb_sndisocpipe(udev, 4 + 2 * bcs-&gt;channel),</div><div class='ctx'> 				 ubc-&gt;isooutbuf-&gt;data,</div><div class='ctx'> 				 sizeof(ubc-&gt;isooutbuf-&gt;data),</div><div class='ctx'> 				 write_iso_callback, &amp;ubc-&gt;isoouturbs[k],</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c<br/>index 4d85645c87f7..0928fd1f0e0c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/hardware/mISDN/hfcmulti.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/hardware/mISDN/hfcmulti.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/hardware/mISDN/hfcmulti.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/hardware/mISDN/hfcmulti.c</a></div><div class='hunk'>@@ -4365,7 +4365,8 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev,</div><div class='ctx'> 	if (m-&gt;clock2)</div><div class='ctx'> 		test_and_set_bit(HFC_CHIP_CLOCK2, &amp;hc-&gt;chip);</div><div class='ctx'> </div><div class='del'>-	if (ent-&gt;device == 0xB410) {</div><div class='add'>+	if (ent-&gt;vendor == PCI_VENDOR_ID_DIGIUM &amp;&amp;</div><div class='add'>+	    ent-&gt;device == PCI_DEVICE_ID_DIGIUM_HFC4S) {</div><div class='ctx'> 		test_and_set_bit(HFC_CHIP_B410P, &amp;hc-&gt;chip);</div><div class='ctx'> 		test_and_set_bit(HFC_CHIP_PCM_MASTER, &amp;hc-&gt;chip);</div><div class='ctx'> 		test_and_clear_bit(HFC_CHIP_PCM_SLAVE, &amp;hc-&gt;chip);</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c<br/>index 362aa5450a5e..29c22d74afe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/hardware/mISDN/hfcpci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/hardware/mISDN/hfcpci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/hardware/mISDN/hfcpci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/hardware/mISDN/hfcpci.c</a></div><div class='hunk'>@@ -2041,9 +2041,9 @@ setup_hw(struct hfc_pci *hc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO</div><div class='del'>-	       "HFC-PCI: defined at mem %#lx fifo %#lx(%#lx) IRQ %d HZ %d\n",</div><div class='del'>-	       (u_long) hc-&gt;hw.pci_io, (u_long) hc-&gt;hw.fifos,</div><div class='del'>-	       (u_long) hc-&gt;hw.dmahandle, hc-&gt;irq, HZ);</div><div class='add'>+	       "HFC-PCI: defined at mem %#lx fifo %p(%pad) IRQ %d HZ %d\n",</div><div class='add'>+	       (u_long) hc-&gt;hw.pci_io, hc-&gt;hw.fifos,</div><div class='add'>+	       &amp;hc-&gt;hw.dmahandle, hc-&gt;irq, HZ);</div><div class='ctx'> </div><div class='ctx'> 	/* enable memory mapped ports, disable busmaster */</div><div class='ctx'> 	pci_write_config_word(hc-&gt;pdev, PCI_COMMAND, PCI_ENA_MEMIO);</div><div class='head'>diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c<br/>index b12e6cae26c2..de965115a183 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/hisax/config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/hisax/config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/hisax/config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/hisax/config.c</a></div><div class='hunk'>@@ -1294,9 +1294,9 @@ void HiSax_reportcard(int cardnr, int sel)</div><div class='ctx'> 	printk(KERN_DEBUG "HiSax: reportcard No %d\n", cardnr + 1);</div><div class='ctx'> 	printk(KERN_DEBUG "HiSax: Type %s\n", CardType[cs-&gt;typ]);</div><div class='ctx'> 	printk(KERN_DEBUG "HiSax: debuglevel %x\n", cs-&gt;debug);</div><div class='del'>-	printk(KERN_DEBUG "HiSax: HiSax_reportcard address 0x%lX\n",</div><div class='del'>-	       (ulong) &amp; HiSax_reportcard);</div><div class='del'>-	printk(KERN_DEBUG "HiSax: cs 0x%lX\n", (ulong) cs);</div><div class='add'>+	printk(KERN_DEBUG "HiSax: HiSax_reportcard address 0x%px\n",</div><div class='add'>+		HiSax_reportcard);</div><div class='add'>+	printk(KERN_DEBUG "HiSax: cs 0x%px\n", cs);</div><div class='ctx'> 	printk(KERN_DEBUG "HiSax: HW_Flags %lx bc0 flg %lx bc1 flg %lx\n",</div><div class='ctx'> 	       cs-&gt;HW_Flags, cs-&gt;bcs[0].Flag, cs-&gt;bcs[1].Flag);</div><div class='ctx'> 	printk(KERN_DEBUG "HiSax: bcs 0 mode %d ch%d\n",</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c<br/>index a7b275ea5de1..7e0f419c14f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/i4l/isdn_ppp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/i4l/isdn_ppp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/i4l/isdn_ppp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/i4l/isdn_ppp.c</a></div><div class='hunk'>@@ -1888,8 +1888,9 @@ static u32 isdn_ppp_mp_get_seq(int short_seq,</div><div class='ctx'> 	return seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *isdn_ppp_mp_discard(ippp_bundle *mp,</div><div class='del'>-				    struct sk_buff *from, struct sk_buff *to)</div><div class='add'>+static struct sk_buff *isdn_ppp_mp_discard(ippp_bundle *mp,</div><div class='add'>+					   struct sk_buff *from,</div><div class='add'>+					   struct sk_buff *to)</div><div class='ctx'> {</div><div class='ctx'> 	if (from)</div><div class='ctx'> 		while (from != to) {</div><div class='hunk'>@@ -1900,8 +1901,8 @@ struct sk_buff *isdn_ppp_mp_discard(ippp_bundle *mp,</div><div class='ctx'> 	return from;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void isdn_ppp_mp_reassembly(isdn_net_dev *net_dev, isdn_net_local *lp,</div><div class='del'>-			    struct sk_buff *from, struct sk_buff *to)</div><div class='add'>+static void isdn_ppp_mp_reassembly(isdn_net_dev *net_dev, isdn_net_local *lp,</div><div class='add'>+				   struct sk_buff *from, struct sk_buff *to)</div><div class='ctx'> {</div><div class='ctx'> 	ippp_bundle *mp = net_dev-&gt;pb;</div><div class='ctx'> 	int proto;</div><div class='head'>diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c<br/>index 4ab8b1b6608f..a14e35d40538 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/mISDN/socket.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/isdn/mISDN/socket.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/isdn/mISDN/socket.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/isdn/mISDN/socket.c</a></div><div class='hunk'>@@ -710,10 +710,10 @@ base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)</div><div class='ctx'> 	struct sock *sk = sock-&gt;sk;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!maddr || maddr-&gt;family != AF_ISDN)</div><div class='add'>+	if (addr_len &lt; sizeof(struct sockaddr_mISDN))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (addr_len &lt; sizeof(struct sockaddr_mISDN))</div><div class='add'>+	if (!maddr || maddr-&gt;family != AF_ISDN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	lock_sock(sk);</div><div class='head'>diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig<br/>index a72f97fca57b..f3000ccb8d35 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/Kconfig</a></div><div class='hunk'>@@ -23,8 +23,8 @@ config LEDS_CLASS_FLASH</div><div class='ctx'> 	tristate "LED Flash Class Support"</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='ctx'> 	help</div><div class='del'>-	  This option enables the flash led sysfs class in /sys/class/leds.</div><div class='del'>-	  It wrapps LED Class and adds flash LEDs specific sysfs attributes</div><div class='add'>+	  This option enables the flash LED sysfs class in /sys/class/leds.</div><div class='add'>+	  It wraps LED Class and adds flash LEDs specific sysfs attributes</div><div class='ctx'> 	  and kernel internal API to it. You'll need this to provide support</div><div class='ctx'> 	  for the flash related features of a LED device. It can be built</div><div class='ctx'> 	  as a module.</div><div class='hunk'>@@ -56,7 +56,7 @@ config LEDS_AAT1290</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	depends on PINCTRL</div><div class='ctx'> 	help</div><div class='del'>-	 This option enables support for the LEDs on the AAT1290.</div><div class='add'>+	  This option enables support for the LEDs on the AAT1290.</div><div class='ctx'> </div><div class='ctx'> config LEDS_AN30259A</div><div class='ctx'> 	tristate "LED support for Panasonic AN30259A"</div><div class='hunk'>@@ -138,6 +138,16 @@ config LEDS_LM3530</div><div class='ctx'> 	  controlled manually or using PWM input or using ambient</div><div class='ctx'> 	  light automatically.</div><div class='ctx'> </div><div class='add'>+config LEDS_LM3532</div><div class='add'>+	tristate "LCD Backlight driver for LM3532"</div><div class='add'>+	depends on LEDS_CLASS</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the LCD backlight using</div><div class='add'>+	  LM3532 ambient light sensor chip. This ALS chip can be</div><div class='add'>+	  controlled manually or using PWM input or using ambient</div><div class='add'>+	  light automatically.</div><div class='add'>+</div><div class='ctx'> config LEDS_LM3533</div><div class='ctx'> 	tristate "LED support for LM3533"</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='hunk'>@@ -413,13 +423,13 @@ config LEDS_CLEVO_MAIL</div><div class='ctx'> </div><div class='ctx'> 	  This module can drive the mail LED for the following notebooks:</div><div class='ctx'> </div><div class='del'>-	  	Clevo D400P</div><div class='del'>-	  	Clevo D410J</div><div class='del'>-	  	Clevo D410V</div><div class='del'>-	  	Clevo D400V/D470V (not tested, but might work)</div><div class='del'>-	  	Clevo M540N</div><div class='del'>-	  	Clevo M5x0N (not tested, but might work)</div><div class='del'>-	  	Positivo Mobile (Clevo M5x0V)</div><div class='add'>+	        Clevo D400P</div><div class='add'>+	        Clevo D410J</div><div class='add'>+	        Clevo D410V</div><div class='add'>+	        Clevo D400V/D470V (not tested, but might work)</div><div class='add'>+	        Clevo M540N</div><div class='add'>+	        Clevo M5x0N (not tested, but might work)</div><div class='add'>+	        Positivo Mobile (Clevo M5x0V)</div><div class='ctx'> </div><div class='ctx'> 	  If your model is not listed here you can try the "nodetect"</div><div class='ctx'> 	  module parameter.</div><div class='hunk'>@@ -462,7 +472,7 @@ config LEDS_WM831X_STATUS</div><div class='ctx'> 	depends on MFD_WM831X</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the status LEDs of the WM831x</div><div class='del'>-          series of PMICs.</div><div class='add'>+	  series of PMICs.</div><div class='ctx'> </div><div class='ctx'> config LEDS_WM8350</div><div class='ctx'> 	tristate "LED Support for WM8350 AudioPlus PMIC"</div><div class='hunk'>@@ -533,6 +543,7 @@ config LEDS_LT3593</div><div class='ctx'> 	tristate "LED driver for LT3593 controllers"</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='ctx'> 	depends on GPIOLIB || COMPILE_TEST</div><div class='add'>+	depends on OF</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for LEDs driven by a Linear Technology</div><div class='ctx'> 	  LT3593 controller. This controller uses a special one-wire pulse</div><div class='head'>diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile<br/>index 4c1b0054f379..7a8b1f55d459 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/Makefile</a></div><div class='hunk'>@@ -18,6 +18,7 @@ obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o</div><div class='ctx'> obj-$(CONFIG_LEDS_CPCAP)		+= leds-cpcap.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o</div><div class='add'>+obj-$(CONFIG_LEDS_LM3532)		+= leds-lm3532.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LM3533)		+= leds-lm3533.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LM3642)		+= leds-lm3642.o</div><div class='ctx'> obj-$(CONFIG_LEDS_MIKROTIK_RB532)	+= leds-rb532.o</div><div class='head'>diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c<br/>index 3c7e3487b373..85848c5da705 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/led-class.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/led-class.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/led-class.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/led-class.c</a></div><div class='hunk'>@@ -57,6 +57,7 @@ static ssize_t brightness_store(struct device *dev,</div><div class='ctx'> 	if (state == LED_OFF)</div><div class='ctx'> 		led_trigger_remove(led_cdev);</div><div class='ctx'> 	led_set_brightness(led_cdev, state);</div><div class='add'>+	flush_work(&amp;led_cdev-&gt;set_brightness_work);</div><div class='ctx'> </div><div class='ctx'> 	ret = size;</div><div class='ctx'> unlock:</div><div class='head'>diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c<br/>index e3da7c03da1b..e9ae7f87ab90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/led-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/led-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/led-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/led-core.c</a></div><div class='hunk'>@@ -164,6 +164,11 @@ static void led_blink_setup(struct led_classdev *led_cdev,</div><div class='ctx'> 		     unsigned long *delay_on,</div><div class='ctx'> 		     unsigned long *delay_off)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * If "set brightness to 0" is pending in workqueue, we don't</div><div class='add'>+	 * want that to be reordered after blink_set()</div><div class='add'>+	 */</div><div class='add'>+	flush_work(&amp;led_cdev-&gt;set_brightness_work);</div><div class='ctx'> 	if (!test_bit(LED_BLINK_ONESHOT, &amp;led_cdev-&gt;work_flags) &amp;&amp;</div><div class='ctx'> 	    led_cdev-&gt;blink_set &amp;&amp;</div><div class='ctx'> 	    !led_cdev-&gt;blink_set(led_cdev, delay_on, delay_off))</div><div class='head'>diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c<br/>index 98a69b1a43f9..b0df514992e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-as3645a.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-as3645a.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-as3645a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-as3645a.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/v4l2-flash-led-class.h&gt;</div><div class='hunk'>@@ -148,8 +148,8 @@ struct as3645a {</div><div class='ctx'> 	struct v4l2_flash *vf;</div><div class='ctx'> 	struct v4l2_flash *vfind;</div><div class='ctx'> </div><div class='del'>-	struct device_node *flash_node;</div><div class='del'>-	struct device_node *indicator_node;</div><div class='add'>+	struct fwnode_handle *flash_node;</div><div class='add'>+	struct fwnode_handle *indicator_node;</div><div class='ctx'> </div><div class='ctx'> 	struct as3645a_config cfg;</div><div class='ctx'> </div><div class='hunk'>@@ -493,30 +493,31 @@ static int as3645a_detect(struct as3645a *flash)</div><div class='ctx'> </div><div class='ctx'> static int as3645a_parse_node(struct as3645a *flash,</div><div class='ctx'> 			      struct as3645a_names *names,</div><div class='del'>-			      struct device_node *node)</div><div class='add'>+			      struct fwnode_handle *fwnode)</div><div class='ctx'> {</div><div class='ctx'> 	struct as3645a_config *cfg = &amp;flash-&gt;cfg;</div><div class='del'>-	struct device_node *child;</div><div class='add'>+	struct fwnode_handle *child;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='del'>-	for_each_child_of_node(node, child) {</div><div class='add'>+	fwnode_for_each_child_node(fwnode, child) {</div><div class='ctx'> 		u32 id = 0;</div><div class='ctx'> </div><div class='del'>-		of_property_read_u32(child, "reg", &amp;id);</div><div class='add'>+		fwnode_property_read_u32(child, "reg", &amp;id);</div><div class='ctx'> </div><div class='ctx'> 		switch (id) {</div><div class='ctx'> 		case AS_LED_FLASH:</div><div class='del'>-			flash-&gt;flash_node = of_node_get(child);</div><div class='add'>+			flash-&gt;flash_node = child;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AS_LED_INDICATOR:</div><div class='del'>-			flash-&gt;indicator_node = of_node_get(child);</div><div class='add'>+			flash-&gt;indicator_node = child;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_warn(&amp;flash-&gt;client-&gt;dev,</div><div class='ctx'> 				 "unknown LED %u encountered, ignoring\n", id);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fwnode_handle_get(child);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!flash-&gt;flash_node) {</div><div class='hunk'>@@ -524,42 +525,46 @@ static int as3645a_parse_node(struct as3645a *flash,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rval = of_property_read_string(flash-&gt;flash_node, "label", &amp;name);</div><div class='del'>-	if (!rval)</div><div class='add'>+	rval = fwnode_property_read_string(flash-&gt;flash_node, "label", &amp;name);</div><div class='add'>+	if (!rval) {</div><div class='ctx'> 		strlcpy(names-&gt;flash, name, sizeof(names-&gt;flash));</div><div class='del'>-	else</div><div class='add'>+	} else if (is_of_node(fwnode)) {</div><div class='ctx'> 		snprintf(names-&gt;flash, sizeof(names-&gt;flash),</div><div class='del'>-			 "%pOFn:flash", node);</div><div class='add'>+			 "%pOFn:flash", to_of_node(fwnode));</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(&amp;flash-&gt;client-&gt;dev, "flash node has no label!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rval = of_property_read_u32(flash-&gt;flash_node, "flash-timeout-us",</div><div class='del'>-				    &amp;cfg-&gt;flash_timeout_us);</div><div class='add'>+	rval = fwnode_property_read_u32(flash-&gt;flash_node, "flash-timeout-us",</div><div class='add'>+					&amp;cfg-&gt;flash_timeout_us);</div><div class='ctx'> 	if (rval &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;flash-&gt;client-&gt;dev,</div><div class='ctx'> 			"can't read flash-timeout-us property for flash\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rval = of_property_read_u32(flash-&gt;flash_node, "flash-max-microamp",</div><div class='del'>-				    &amp;cfg-&gt;flash_max_ua);</div><div class='add'>+	rval = fwnode_property_read_u32(flash-&gt;flash_node, "flash-max-microamp",</div><div class='add'>+					&amp;cfg-&gt;flash_max_ua);</div><div class='ctx'> 	if (rval &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;flash-&gt;client-&gt;dev,</div><div class='ctx'> 			"can't read flash-max-microamp property for flash\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rval = of_property_read_u32(flash-&gt;flash_node, "led-max-microamp",</div><div class='del'>-				    &amp;cfg-&gt;assist_max_ua);</div><div class='add'>+	rval = fwnode_property_read_u32(flash-&gt;flash_node, "led-max-microamp",</div><div class='add'>+					&amp;cfg-&gt;assist_max_ua);</div><div class='ctx'> 	if (rval &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;flash-&gt;client-&gt;dev,</div><div class='ctx'> 			"can't read led-max-microamp property for flash\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	of_property_read_u32(flash-&gt;flash_node, "voltage-reference",</div><div class='del'>-			     &amp;cfg-&gt;voltage_reference);</div><div class='add'>+	fwnode_property_read_u32(flash-&gt;flash_node, "voltage-reference",</div><div class='add'>+				 &amp;cfg-&gt;voltage_reference);</div><div class='ctx'> </div><div class='del'>-	of_property_read_u32(flash-&gt;flash_node, "ams,input-max-microamp",</div><div class='del'>-			     &amp;cfg-&gt;peak);</div><div class='add'>+	fwnode_property_read_u32(flash-&gt;flash_node, "ams,input-max-microamp",</div><div class='add'>+				 &amp;cfg-&gt;peak);</div><div class='ctx'> 	cfg-&gt;peak = AS_PEAK_mA_TO_REG(cfg-&gt;peak);</div><div class='ctx'> </div><div class='ctx'> 	if (!flash-&gt;indicator_node) {</div><div class='hunk'>@@ -568,15 +573,21 @@ static int as3645a_parse_node(struct as3645a *flash,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rval = of_property_read_string(flash-&gt;indicator_node, "label", &amp;name);</div><div class='del'>-	if (!rval)</div><div class='add'>+	rval = fwnode_property_read_string(flash-&gt;indicator_node, "label",</div><div class='add'>+					   &amp;name);</div><div class='add'>+	if (!rval) {</div><div class='ctx'> 		strlcpy(names-&gt;indicator, name, sizeof(names-&gt;indicator));</div><div class='del'>-	else</div><div class='add'>+	} else if (is_of_node(fwnode)) {</div><div class='ctx'> 		snprintf(names-&gt;indicator, sizeof(names-&gt;indicator),</div><div class='del'>-			 "%pOFn:indicator", node);</div><div class='add'>+			 "%pOFn:indicator", to_of_node(fwnode));</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(&amp;flash-&gt;client-&gt;dev, "indicator node has no label!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rval = of_property_read_u32(flash-&gt;indicator_node, "led-max-microamp",</div><div class='del'>-				    &amp;cfg-&gt;indicator_max_ua);</div><div class='add'>+	rval = fwnode_property_read_u32(flash-&gt;indicator_node,</div><div class='add'>+					"led-max-microamp",</div><div class='add'>+					&amp;cfg-&gt;indicator_max_ua);</div><div class='ctx'> 	if (rval &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;flash-&gt;client-&gt;dev,</div><div class='ctx'> 			"can't read led-max-microamp property for indicator\n");</div><div class='hunk'>@@ -586,8 +597,8 @@ static int as3645a_parse_node(struct as3645a *flash,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='del'>-	of_node_put(flash-&gt;flash_node);</div><div class='del'>-	of_node_put(flash-&gt;indicator_node);</div><div class='add'>+	fwnode_handle_put(flash-&gt;flash_node);</div><div class='add'>+	fwnode_handle_put(flash-&gt;indicator_node);</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='hunk'>@@ -668,14 +679,14 @@ static int as3645a_v4l2_setup(struct as3645a *flash)</div><div class='ctx'> 	strlcpy(cfgind.dev_name, flash-&gt;iled_cdev.name, sizeof(cfg.dev_name));</div><div class='ctx'> </div><div class='ctx'> 	flash-&gt;vf = v4l2_flash_init(</div><div class='del'>-		&amp;flash-&gt;client-&gt;dev, of_fwnode_handle(flash-&gt;flash_node),</div><div class='del'>-		&amp;flash-&gt;fled, NULL, &amp;cfg);</div><div class='add'>+		&amp;flash-&gt;client-&gt;dev, flash-&gt;flash_node, &amp;flash-&gt;fled, NULL,</div><div class='add'>+		&amp;cfg);</div><div class='ctx'> 	if (IS_ERR(flash-&gt;vf))</div><div class='ctx'> 		return PTR_ERR(flash-&gt;vf);</div><div class='ctx'> </div><div class='ctx'> 	flash-&gt;vfind = v4l2_flash_indicator_init(</div><div class='del'>-		&amp;flash-&gt;client-&gt;dev, of_fwnode_handle(flash-&gt;indicator_node),</div><div class='del'>-		&amp;flash-&gt;iled_cdev, &amp;cfgind);</div><div class='add'>+		&amp;flash-&gt;client-&gt;dev, flash-&gt;indicator_node, &amp;flash-&gt;iled_cdev,</div><div class='add'>+		&amp;cfgind);</div><div class='ctx'> 	if (IS_ERR(flash-&gt;vfind)) {</div><div class='ctx'> 		v4l2_flash_release(flash-&gt;vf);</div><div class='ctx'> 		return PTR_ERR(flash-&gt;vfind);</div><div class='hunk'>@@ -690,7 +701,7 @@ static int as3645a_probe(struct i2c_client *client)</div><div class='ctx'> 	struct as3645a *flash;</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='del'>-	if (client-&gt;dev.of_node == NULL)</div><div class='add'>+	if (!dev_fwnode(&amp;client-&gt;dev))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	flash = devm_kzalloc(&amp;client-&gt;dev, sizeof(*flash), GFP_KERNEL);</div><div class='hunk'>@@ -699,7 +710,7 @@ static int as3645a_probe(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	flash-&gt;client = client;</div><div class='ctx'> </div><div class='del'>-	rval = as3645a_parse_node(flash, &amp;names, client-&gt;dev.of_node);</div><div class='add'>+	rval = as3645a_parse_node(flash, &amp;names, dev_fwnode(&amp;client-&gt;dev));</div><div class='ctx'> 	if (rval &lt; 0)</div><div class='ctx'> 		return rval;</div><div class='ctx'> </div><div class='hunk'>@@ -731,8 +742,8 @@ out_mutex_destroy:</div><div class='ctx'> 	mutex_destroy(&amp;flash-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> out_put_nodes:</div><div class='del'>-	of_node_put(flash-&gt;flash_node);</div><div class='del'>-	of_node_put(flash-&gt;indicator_node);</div><div class='add'>+	fwnode_handle_put(flash-&gt;flash_node);</div><div class='add'>+	fwnode_handle_put(flash-&gt;indicator_node);</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='hunk'>@@ -751,8 +762,8 @@ static int as3645a_remove(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	mutex_destroy(&amp;flash-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	of_node_put(flash-&gt;flash_node);</div><div class='del'>-	of_node_put(flash-&gt;indicator_node);</div><div class='add'>+	fwnode_handle_put(flash-&gt;flash_node);</div><div class='add'>+	fwnode_handle_put(flash-&gt;indicator_node);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c<br/>index 851c1920b63c..11b771fb933b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-blinkm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-blinkm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-blinkm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-blinkm.c</a></div><div class='hunk'>@@ -594,7 +594,6 @@ static int blinkm_probe(struct i2c_client *client,</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	data-&gt;i2c_addr = 0x09;</div><div class='ctx'> 	data-&gt;i2c_addr = 0x08;</div><div class='ctx'> 	/* i2c addr  - use fake addr of 0x08 initially (real is 0x09) */</div><div class='ctx'> 	data-&gt;fw_ver = 0xfe;</div><div class='head'>diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c<br/>new file mode 100644<br/>index 000000000000..180895b83b88<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-lm3532.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-lm3532.c</a></div><div class='hunk'>@@ -0,0 +1,683 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// TI LM3532 LED driver</div><div class='add'>+// Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;uapi/linux/uleds.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+</div><div class='add'>+#define LM3532_NAME "lm3532-led"</div><div class='add'>+#define LM3532_BL_MODE_MANUAL	0x00</div><div class='add'>+#define LM3532_BL_MODE_ALS	0x01</div><div class='add'>+</div><div class='add'>+#define LM3532_REG_OUTPUT_CFG	0x10</div><div class='add'>+#define LM3532_REG_STARTSHUT_RAMP	0x11</div><div class='add'>+#define LM3532_REG_RT_RAMP	0x12</div><div class='add'>+#define LM3532_REG_PWM_A_CFG	0x13</div><div class='add'>+#define LM3532_REG_PWM_B_CFG	0x14</div><div class='add'>+#define LM3532_REG_PWM_C_CFG	0x15</div><div class='add'>+#define LM3532_REG_ZONE_CFG_A	0x16</div><div class='add'>+#define LM3532_REG_CTRL_A_BRT	0x17</div><div class='add'>+#define LM3532_REG_ZONE_CFG_B	0x18</div><div class='add'>+#define LM3532_REG_CTRL_B_BRT	0x19</div><div class='add'>+#define LM3532_REG_ZONE_CFG_C	0x1a</div><div class='add'>+#define LM3532_REG_CTRL_C_BRT	0x1b</div><div class='add'>+#define LM3532_REG_ENABLE	0x1d</div><div class='add'>+#define LM3532_ALS_CONFIG	0x23</div><div class='add'>+#define LM3532_REG_ZN_0_HI	0x60</div><div class='add'>+#define LM3532_REG_ZN_0_LO	0x61</div><div class='add'>+#define LM3532_REG_ZN_1_HI	0x62</div><div class='add'>+#define LM3532_REG_ZN_1_LO	0x63</div><div class='add'>+#define LM3532_REG_ZN_2_HI	0x64</div><div class='add'>+#define LM3532_REG_ZN_2_LO	0x65</div><div class='add'>+#define LM3532_REG_ZN_3_HI	0x66</div><div class='add'>+#define LM3532_REG_ZN_3_LO	0x67</div><div class='add'>+#define LM3532_REG_MAX		0x7e</div><div class='add'>+</div><div class='add'>+/* Contorl Enable */</div><div class='add'>+#define LM3532_CTRL_A_ENABLE	BIT(0)</div><div class='add'>+#define LM3532_CTRL_B_ENABLE	BIT(1)</div><div class='add'>+#define LM3532_CTRL_C_ENABLE	BIT(2)</div><div class='add'>+</div><div class='add'>+/* PWM Zone Control */</div><div class='add'>+#define LM3532_PWM_ZONE_MASK	0x7c</div><div class='add'>+#define LM3532_PWM_ZONE_0_EN	BIT(2)</div><div class='add'>+#define LM3532_PWM_ZONE_1_EN	BIT(3)</div><div class='add'>+#define LM3532_PWM_ZONE_2_EN	BIT(4)</div><div class='add'>+#define LM3532_PWM_ZONE_3_EN	BIT(5)</div><div class='add'>+#define LM3532_PWM_ZONE_4_EN	BIT(6)</div><div class='add'>+</div><div class='add'>+/* Brightness Configuration */</div><div class='add'>+#define LM3532_I2C_CTRL		BIT(0)</div><div class='add'>+#define LM3532_ALS_CTRL		0</div><div class='add'>+#define LM3532_LINEAR_MAP	BIT(1)</div><div class='add'>+#define LM3532_ZONE_MASK	(BIT(2) | BIT(3) | BIT(4))</div><div class='add'>+#define LM3532_ZONE_0		0</div><div class='add'>+#define LM3532_ZONE_1		BIT(2)</div><div class='add'>+#define LM3532_ZONE_2		BIT(3)</div><div class='add'>+#define LM3532_ZONE_3		(BIT(2) | BIT(3))</div><div class='add'>+#define LM3532_ZONE_4		BIT(4)</div><div class='add'>+</div><div class='add'>+#define LM3532_ENABLE_ALS	BIT(3)</div><div class='add'>+#define LM3532_ALS_SEL_SHIFT	6</div><div class='add'>+</div><div class='add'>+/* Zone Boundary Register */</div><div class='add'>+#define LM3532_ALS_WINDOW_mV	2000</div><div class='add'>+#define LM3532_ALS_ZB_MAX	4</div><div class='add'>+#define LM3532_ALS_OFFSET_mV	2</div><div class='add'>+</div><div class='add'>+#define LM3532_CONTROL_A	0</div><div class='add'>+#define LM3532_CONTROL_B	1</div><div class='add'>+#define LM3532_CONTROL_C	2</div><div class='add'>+#define LM3532_MAX_CONTROL_BANKS 3</div><div class='add'>+#define LM3532_MAX_LED_STRINGS	3</div><div class='add'>+</div><div class='add'>+#define LM3532_OUTPUT_CFG_MASK	0x3</div><div class='add'>+#define LM3532_BRT_VAL_ADJUST	8</div><div class='add'>+#define LM3532_RAMP_DOWN_SHIFT	3</div><div class='add'>+</div><div class='add'>+#define LM3532_NUM_RAMP_VALS	8</div><div class='add'>+#define LM3532_NUM_AVG_VALS	8</div><div class='add'>+#define LM3532_NUM_IMP_VALS	32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct lm3532_als_data</div><div class='add'>+ * @config - value of ALS configuration register</div><div class='add'>+ * @als1_imp_sel - value of ALS1 resistor select register</div><div class='add'>+ * @als2_imp_sel - value of ALS2 resistor select register</div><div class='add'>+ * @als_avrg_time - ALS averaging time</div><div class='add'>+ * @als_input_mode - ALS input mode for brightness control</div><div class='add'>+ * @als_vmin - Minimum ALS voltage</div><div class='add'>+ * @als_vmax - Maximum ALS voltage</div><div class='add'>+ * @zone_lo - values of ALS lo ZB(Zone Boundary) registers</div><div class='add'>+ * @zone_hi - values of ALS hi ZB(Zone Boundary) registers</div><div class='add'>+ */</div><div class='add'>+struct lm3532_als_data {</div><div class='add'>+	u8 config;</div><div class='add'>+	u8 als1_imp_sel;</div><div class='add'>+	u8 als2_imp_sel;</div><div class='add'>+	u8 als_avrg_time;</div><div class='add'>+	u8 als_input_mode;</div><div class='add'>+	u32 als_vmin;</div><div class='add'>+	u32 als_vmax;</div><div class='add'>+	u8 zones_lo[LM3532_ALS_ZB_MAX];</div><div class='add'>+	u8 zones_hi[LM3532_ALS_ZB_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct lm3532_led</div><div class='add'>+ * @led_dev: led class device</div><div class='add'>+ * @priv - Pointer the device data structure</div><div class='add'>+ * @control_bank - Control bank the LED is associated to</div><div class='add'>+ * @mode - Mode of the LED string</div><div class='add'>+ * @num_leds - Number of LED strings are supported in this array</div><div class='add'>+ * @led_strings - The LED strings supported in this array</div><div class='add'>+ * @label - LED label</div><div class='add'>+ */</div><div class='add'>+struct lm3532_led {</div><div class='add'>+	struct led_classdev led_dev;</div><div class='add'>+	struct lm3532_data *priv;</div><div class='add'>+</div><div class='add'>+	int control_bank;</div><div class='add'>+	int mode;</div><div class='add'>+	int num_leds;</div><div class='add'>+	u32 led_strings[LM3532_MAX_CONTROL_BANKS];</div><div class='add'>+	char label[LED_MAX_NAME_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct lm3532_data</div><div class='add'>+ * @enable_gpio - Hardware enable gpio</div><div class='add'>+ * @regulator: regulator</div><div class='add'>+ * @client: i2c client</div><div class='add'>+ * @regmap - Devices register map</div><div class='add'>+ * @dev - Pointer to the devices device struct</div><div class='add'>+ * @lock - Lock for reading/writing the device</div><div class='add'>+ * @als_data - Pointer to the als data struct</div><div class='add'>+ * @runtime_ramp_up - Runtime ramp up setting</div><div class='add'>+ * @runtime_ramp_down - Runtime ramp down setting</div><div class='add'>+ * @leds - Array of LED strings</div><div class='add'>+ */</div><div class='add'>+struct lm3532_data {</div><div class='add'>+	struct gpio_desc *enable_gpio;</div><div class='add'>+	struct regulator *regulator;</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	struct lm3532_als_data *als_data;</div><div class='add'>+</div><div class='add'>+	u32 runtime_ramp_up;</div><div class='add'>+	u32 runtime_ramp_down;</div><div class='add'>+</div><div class='add'>+	struct lm3532_led leds[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_default lm3532_reg_defs[] = {</div><div class='add'>+	{LM3532_REG_OUTPUT_CFG, 0xe4},</div><div class='add'>+	{LM3532_REG_STARTSHUT_RAMP, 0xc0},</div><div class='add'>+	{LM3532_REG_RT_RAMP, 0xc0},</div><div class='add'>+	{LM3532_REG_PWM_A_CFG, 0x82},</div><div class='add'>+	{LM3532_REG_PWM_B_CFG, 0x82},</div><div class='add'>+	{LM3532_REG_PWM_C_CFG, 0x82},</div><div class='add'>+	{LM3532_REG_ZONE_CFG_A, 0xf1},</div><div class='add'>+	{LM3532_REG_CTRL_A_BRT, 0xf3},</div><div class='add'>+	{LM3532_REG_ZONE_CFG_B, 0xf1},</div><div class='add'>+	{LM3532_REG_CTRL_B_BRT, 0xf3},</div><div class='add'>+	{LM3532_REG_ZONE_CFG_C, 0xf1},</div><div class='add'>+	{LM3532_REG_CTRL_C_BRT, 0xf3},</div><div class='add'>+	{LM3532_REG_ENABLE, 0xf8},</div><div class='add'>+	{LM3532_ALS_CONFIG, 0x44},</div><div class='add'>+	{LM3532_REG_ZN_0_HI, 0x35},</div><div class='add'>+	{LM3532_REG_ZN_0_LO, 0x33},</div><div class='add'>+	{LM3532_REG_ZN_1_HI, 0x6a},</div><div class='add'>+	{LM3532_REG_ZN_1_LO, 0x66},</div><div class='add'>+	{LM3532_REG_ZN_2_HI, 0xa1},</div><div class='add'>+	{LM3532_REG_ZN_2_LO, 0x99},</div><div class='add'>+	{LM3532_REG_ZN_3_HI, 0xdc},</div><div class='add'>+	{LM3532_REG_ZN_3_LO, 0xcc},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config lm3532_regmap_config = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+</div><div class='add'>+	.max_register = LM3532_REG_MAX,</div><div class='add'>+	.reg_defaults = lm3532_reg_defs,</div><div class='add'>+	.num_reg_defaults = ARRAY_SIZE(lm3532_reg_defs),</div><div class='add'>+	.cache_type = REGCACHE_FLAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const static int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,</div><div class='add'>+						       92500, 7400, 6170, 5290,</div><div class='add'>+						       4630, 4110, 3700, 3360,</div><div class='add'>+						       3080, 2850, 2640, 2440,</div><div class='add'>+						       2310, 2180, 2060, 1950,</div><div class='add'>+						       1850, 1760, 1680, 1610,</div><div class='add'>+						       1540, 1480, 1420, 1370,</div><div class='add'>+						       1320, 1280, 1230, 1190};</div><div class='add'>+static int lm3532_get_als_imp_index(int als_imped)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (als_imped &gt; als_imp_table[1])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (als_imped &lt; als_imp_table[LM3532_NUM_IMP_VALS - 1])</div><div class='add'>+		return LM3532_NUM_IMP_VALS - 1;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; LM3532_NUM_IMP_VALS; i++) {</div><div class='add'>+		if (als_imped == als_imp_table[i])</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+		/* Find an approximate index by looking up the table */</div><div class='add'>+		if (als_imped &lt; als_imp_table[i - 1] &amp;&amp;</div><div class='add'>+		    als_imped &gt; als_imp_table[i]) {</div><div class='add'>+			if (als_imped - als_imp_table[i - 1] &lt;</div><div class='add'>+			    als_imp_table[i] - als_imped)</div><div class='add'>+				return i + 1;</div><div class='add'>+			else</div><div class='add'>+				return i;</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'>+static int lm3532_get_index(const int table[], int size, int value)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; size; i++) {</div><div class='add'>+		if (value == table[i])</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+		/* Find an approximate index by looking up the table */</div><div class='add'>+		if (value &gt; table[i - 1] &amp;&amp;</div><div class='add'>+		    value &lt; table[i]) {</div><div class='add'>+			if (value - table[i - 1] &lt; table[i] - value)</div><div class='add'>+				return i - 1;</div><div class='add'>+			else</div><div class='add'>+				return i;</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'>+const static int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,</div><div class='add'>+							1433360, 286720, 573440,</div><div class='add'>+							1146880, 2293760};</div><div class='add'>+static int lm3532_get_als_avg_index(int avg_time)</div><div class='add'>+{</div><div class='add'>+	if (avg_time &lt;= als_avrg_table[0])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (avg_time &gt; als_avrg_table[LM3532_NUM_AVG_VALS - 1])</div><div class='add'>+		return LM3532_NUM_AVG_VALS - 1;</div><div class='add'>+</div><div class='add'>+	return lm3532_get_index(&amp;als_avrg_table[0], LM3532_NUM_AVG_VALS,</div><div class='add'>+				avg_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const static int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,</div><div class='add'>+						     16384, 32768, 65536};</div><div class='add'>+static int lm3532_get_ramp_index(int ramp_time)</div><div class='add'>+{</div><div class='add'>+	if (ramp_time &lt;= ramp_table[0])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ramp_time &gt; ramp_table[LM3532_NUM_RAMP_VALS - 1])</div><div class='add'>+		return LM3532_NUM_RAMP_VALS - 1;</div><div class='add'>+</div><div class='add'>+	return lm3532_get_index(&amp;ramp_table[0], LM3532_NUM_RAMP_VALS,</div><div class='add'>+				ramp_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_led_enable(struct lm3532_led *led_data)</div><div class='add'>+{</div><div class='add'>+	int ctrl_en_val = BIT(led_data-&gt;control_bank);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(led_data-&gt;priv-&gt;regmap, LM3532_REG_ENABLE,</div><div class='add'>+					 ctrl_en_val, ctrl_en_val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(led_data-&gt;priv-&gt;dev, "Failed to set ctrl:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regulator_enable(led_data-&gt;priv-&gt;regulator);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_led_disable(struct lm3532_led *led_data)</div><div class='add'>+{</div><div class='add'>+	int ctrl_en_val = BIT(led_data-&gt;control_bank);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(led_data-&gt;priv-&gt;regmap, LM3532_REG_ENABLE,</div><div class='add'>+					 ctrl_en_val, ~ctrl_en_val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(led_data-&gt;priv-&gt;dev, "Failed to set ctrl:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regulator_disable(led_data-&gt;priv-&gt;regulator);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_brightness_set(struct led_classdev *led_cdev,</div><div class='add'>+				 enum led_brightness brt_val)</div><div class='add'>+{</div><div class='add'>+	struct lm3532_led *led =</div><div class='add'>+			container_of(led_cdev, struct lm3532_led, led_dev);</div><div class='add'>+	u8 brightness_reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;led-&gt;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (led-&gt;mode == LM3532_BL_MODE_ALS) {</div><div class='add'>+		if (brt_val &gt; LED_OFF)</div><div class='add'>+			ret = lm3532_led_enable(led);</div><div class='add'>+		else</div><div class='add'>+			ret = lm3532_led_disable(led);</div><div class='add'>+</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (brt_val == LED_OFF) {</div><div class='add'>+		ret = lm3532_led_disable(led);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = lm3532_led_enable(led);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	brightness_reg = LM3532_REG_CTRL_A_BRT + led-&gt;control_bank * 2;</div><div class='add'>+	brt_val = brt_val / LM3532_BRT_VAL_ADJUST;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(led-&gt;priv-&gt;regmap, brightness_reg, brt_val);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;led-&gt;priv-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_init_registers(struct lm3532_led *led)</div><div class='add'>+{</div><div class='add'>+	struct lm3532_data *drvdata = led-&gt;priv;</div><div class='add'>+	unsigned int runtime_ramp_val;</div><div class='add'>+	unsigned int output_cfg_val = 0;</div><div class='add'>+	unsigned int output_cfg_shift = 0;</div><div class='add'>+	unsigned int output_cfg_mask = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; led-&gt;num_leds; i++) {</div><div class='add'>+		output_cfg_shift = led-&gt;led_strings[i] * 2;</div><div class='add'>+		output_cfg_val |= (led-&gt;control_bank &lt;&lt; output_cfg_shift);</div><div class='add'>+		output_cfg_mask |= LM3532_OUTPUT_CFG_MASK &lt;&lt; output_cfg_shift;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(drvdata-&gt;regmap, LM3532_REG_OUTPUT_CFG,</div><div class='add'>+				 output_cfg_mask, output_cfg_val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	runtime_ramp_val = drvdata-&gt;runtime_ramp_up |</div><div class='add'>+			 (drvdata-&gt;runtime_ramp_down &lt;&lt; LM3532_RAMP_DOWN_SHIFT);</div><div class='add'>+</div><div class='add'>+	return regmap_write(drvdata-&gt;regmap, LM3532_REG_RT_RAMP,</div><div class='add'>+			    runtime_ramp_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_als_configure(struct lm3532_data *priv,</div><div class='add'>+				struct lm3532_led *led)</div><div class='add'>+{</div><div class='add'>+	struct lm3532_als_data *als = priv-&gt;als_data;</div><div class='add'>+	u32 als_vmin, als_vmax, als_vstep;</div><div class='add'>+	int zone_reg = LM3532_REG_ZN_0_HI;</div><div class='add'>+	int brightnes_config_reg;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	als_vmin = als-&gt;als_vmin;</div><div class='add'>+	als_vmax = als-&gt;als_vmax;</div><div class='add'>+</div><div class='add'>+	als_vstep = (als_vmax - als_vmin) / ((LM3532_ALS_ZB_MAX + 1) * 2);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LM3532_ALS_ZB_MAX; i++) {</div><div class='add'>+		als-&gt;zones_lo[i] = ((als_vmin + als_vstep + (i * als_vstep)) *</div><div class='add'>+				LED_FULL) / 1000;</div><div class='add'>+		als-&gt;zones_hi[i] = ((als_vmin + LM3532_ALS_OFFSET_mV +</div><div class='add'>+				als_vstep + (i * als_vstep)) * LED_FULL) / 1000;</div><div class='add'>+</div><div class='add'>+		zone_reg = LM3532_REG_ZN_0_HI + i * 2;</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, zone_reg, als-&gt;zones_lo[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		zone_reg += 1;</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, zone_reg, als-&gt;zones_hi[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'>+	als-&gt;config = (als-&gt;als_avrg_time | (LM3532_ENABLE_ALS) |</div><div class='add'>+		(als-&gt;als_input_mode &lt;&lt; LM3532_ALS_SEL_SHIFT));</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, LM3532_ALS_CONFIG, als-&gt;config);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	brightnes_config_reg = LM3532_REG_ZONE_CFG_A + led-&gt;control_bank * 2;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, brightnes_config_reg,</div><div class='add'>+				  LM3532_I2C_CTRL, LM3532_ALS_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_parse_als(struct lm3532_data *priv)</div><div class='add'>+{</div><div class='add'>+	struct lm3532_als_data *als;</div><div class='add'>+	int als_avg_time;</div><div class='add'>+	int als_impedance;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	als = devm_kzalloc(priv-&gt;dev, sizeof(*als), GFP_KERNEL);</div><div class='add'>+	if (als == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ti,als-vmin",</div><div class='add'>+				       &amp;als-&gt;als_vmin);</div><div class='add'>+	if (ret)</div><div class='add'>+		als-&gt;als_vmin = 0;</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ti,als-vmax",</div><div class='add'>+				       &amp;als-&gt;als_vmax);</div><div class='add'>+	if (ret)</div><div class='add'>+		als-&gt;als_vmax = LM3532_ALS_WINDOW_mV;</div><div class='add'>+</div><div class='add'>+	if (als-&gt;als_vmax &gt; LM3532_ALS_WINDOW_mV) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ti,als1-imp-sel",</div><div class='add'>+				      &amp;als_impedance);</div><div class='add'>+	if (ret)</div><div class='add'>+		als-&gt;als1_imp_sel = 0;</div><div class='add'>+	else</div><div class='add'>+		als-&gt;als1_imp_sel = lm3532_get_als_imp_index(als_impedance);</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ti,als2-imp-sel",</div><div class='add'>+				      &amp;als_impedance);</div><div class='add'>+	if (ret)</div><div class='add'>+		als-&gt;als2_imp_sel = 0;</div><div class='add'>+	else</div><div class='add'>+		als-&gt;als2_imp_sel = lm3532_get_als_imp_index(als_impedance);</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ti,als-avrg-time-us",</div><div class='add'>+				      &amp;als_avg_time);</div><div class='add'>+	if (ret)</div><div class='add'>+		als-&gt;als_avrg_time = 0;</div><div class='add'>+	else</div><div class='add'>+		als-&gt;als_avrg_time = lm3532_get_als_avg_index(als_avg_time);</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u8(&amp;priv-&gt;client-&gt;dev, "ti,als-input-mode",</div><div class='add'>+				      &amp;als-&gt;als_input_mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		als-&gt;als_input_mode = 0;</div><div class='add'>+</div><div class='add'>+	if (als-&gt;als_input_mode &gt; LM3532_BL_MODE_ALS) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;als_data = als;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_parse_node(struct lm3532_data *priv)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *child = NULL;</div><div class='add'>+	struct lm3532_led *led;</div><div class='add'>+	const char *name;</div><div class='add'>+	int control_bank;</div><div class='add'>+	u32 ramp_time;</div><div class='add'>+	size_t i = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;enable_gpio = devm_gpiod_get_optional(&amp;priv-&gt;client-&gt;dev,</div><div class='add'>+						   "enable", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(priv-&gt;enable_gpio))</div><div class='add'>+		priv-&gt;enable_gpio = NULL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;regulator = devm_regulator_get(&amp;priv-&gt;client-&gt;dev, "vin");</div><div class='add'>+	if (IS_ERR(priv-&gt;regulator))</div><div class='add'>+		priv-&gt;regulator = NULL;</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ramp-up-us",</div><div class='add'>+				       &amp;ramp_time);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_info(&amp;priv-&gt;client-&gt;dev, "ramp-up-ms property missing\n");</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;runtime_ramp_up = lm3532_get_ramp_index(ramp_time);</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(&amp;priv-&gt;client-&gt;dev, "ramp-down-us",</div><div class='add'>+				       &amp;ramp_time);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_info(&amp;priv-&gt;client-&gt;dev, "ramp-down-ms property missing\n");</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;runtime_ramp_down = lm3532_get_ramp_index(ramp_time);</div><div class='add'>+</div><div class='add'>+	device_for_each_child_node(priv-&gt;dev, child) {</div><div class='add'>+		led = &amp;priv-&gt;leds[i];</div><div class='add'>+</div><div class='add'>+		ret = fwnode_property_read_u32(child, "reg", &amp;control_bank);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;priv-&gt;client-&gt;dev, "reg property missing\n");</div><div class='add'>+			fwnode_handle_put(child);</div><div class='add'>+			goto child_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (control_bank &gt; LM3532_CONTROL_C) {</div><div class='add'>+			dev_err(&amp;priv-&gt;client-&gt;dev, "Control bank invalid\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		led-&gt;control_bank = control_bank;</div><div class='add'>+</div><div class='add'>+		ret = fwnode_property_read_u32(child, "ti,led-mode",</div><div class='add'>+					       &amp;led-&gt;mode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;priv-&gt;client-&gt;dev, "ti,led-mode property missing\n");</div><div class='add'>+			fwnode_handle_put(child);</div><div class='add'>+			goto child_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (led-&gt;mode == LM3532_BL_MODE_ALS) {</div><div class='add'>+			ret = lm3532_parse_als(priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				dev_err(&amp;priv-&gt;client-&gt;dev, "Failed to parse als\n");</div><div class='add'>+			else</div><div class='add'>+				lm3532_als_configure(priv, led);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		led-&gt;num_leds = fwnode_property_read_u32_array(child,</div><div class='add'>+							       "led-sources",</div><div class='add'>+							       NULL, 0);</div><div class='add'>+</div><div class='add'>+		if (led-&gt;num_leds &gt; LM3532_MAX_LED_STRINGS) {</div><div class='add'>+			dev_err(&amp;priv-&gt;client-&gt;dev, "To many LED string defined\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = fwnode_property_read_u32_array(child, "led-sources",</div><div class='add'>+						    led-&gt;led_strings,</div><div class='add'>+						    led-&gt;num_leds);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;priv-&gt;client-&gt;dev, "led-sources property missing\n");</div><div class='add'>+			fwnode_handle_put(child);</div><div class='add'>+			goto child_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fwnode_property_read_string(child, "linux,default-trigger",</div><div class='add'>+					    &amp;led-&gt;led_dev.default_trigger);</div><div class='add'>+</div><div class='add'>+		ret = fwnode_property_read_string(child, "label", &amp;name);</div><div class='add'>+		if (ret)</div><div class='add'>+			snprintf(led-&gt;label, sizeof(led-&gt;label),</div><div class='add'>+				"%s::", priv-&gt;client-&gt;name);</div><div class='add'>+		else</div><div class='add'>+			snprintf(led-&gt;label, sizeof(led-&gt;label),</div><div class='add'>+				 "%s:%s", priv-&gt;client-&gt;name, name);</div><div class='add'>+</div><div class='add'>+		led-&gt;priv = priv;</div><div class='add'>+		led-&gt;led_dev.name = led-&gt;label;</div><div class='add'>+		led-&gt;led_dev.brightness_set_blocking = lm3532_brightness_set;</div><div class='add'>+</div><div class='add'>+		ret = devm_led_classdev_register(priv-&gt;dev, &amp;led-&gt;led_dev);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;priv-&gt;client-&gt;dev, "led register err: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			fwnode_handle_put(child);</div><div class='add'>+			goto child_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lm3532_init_registers(led);</div><div class='add'>+</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+child_out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_probe(struct i2c_client *client,</div><div class='add'>+			   const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct lm3532_data *drvdata;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	count = device_get_child_node_count(&amp;client-&gt;dev);</div><div class='add'>+	if (!count) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "LEDs are not defined in device tree!");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drvdata = devm_kzalloc(&amp;client-&gt;dev, struct_size(drvdata, leds, count),</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+	if (drvdata == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	drvdata-&gt;client = client;</div><div class='add'>+	drvdata-&gt;dev = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	drvdata-&gt;regmap = devm_regmap_init_i2c(client, &amp;lm3532_regmap_config);</div><div class='add'>+	if (IS_ERR(drvdata-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(drvdata-&gt;regmap);</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to allocate register map: %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'>+	mutex_init(&amp;drvdata-&gt;lock);</div><div class='add'>+	i2c_set_clientdata(client, drvdata);</div><div class='add'>+</div><div class='add'>+	ret = lm3532_parse_node(drvdata);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to parse node\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (drvdata-&gt;enable_gpio)</div><div class='add'>+		gpiod_direction_output(drvdata-&gt;enable_gpio, 1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lm3532_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct lm3532_data *drvdata = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;drvdata-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (drvdata-&gt;enable_gpio)</div><div class='add'>+		gpiod_direction_output(drvdata-&gt;enable_gpio, 0);</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 of_device_id of_lm3532_leds_match[] = {</div><div class='add'>+	{ .compatible = "ti,lm3532", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, of_lm3532_leds_match);</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id lm3532_id[] = {</div><div class='add'>+	{LM3532_NAME, 0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, lm3532_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver lm3532_i2c_driver = {</div><div class='add'>+	.probe = lm3532_probe,</div><div class='add'>+	.remove = lm3532_remove,</div><div class='add'>+	.id_table = lm3532_id,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = LM3532_NAME,</div><div class='add'>+		.of_match_table = of_lm3532_leds_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(lm3532_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Back Light driver for LM3532");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Dan Murphy &lt;dmurphy@ti.com&gt;");</div><div class='head'>diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c<br/>index de3623e0d094..83e8e58d81cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-lt3593.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-lt3593.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-lt3593.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-lt3593.c</a></div><div class='hunk'>@@ -60,67 +60,14 @@ static int lt3593_led_set(struct led_classdev *led_cdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct lt3593_led_data *lt3593_led_probe_pdata(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct gpio_led_platform_data *pdata = dev_get_platdata(dev);</div><div class='del'>-	const struct gpio_led *template = &amp;pdata-&gt;leds[0];</div><div class='del'>-	struct lt3593_led_data *led_data;</div><div class='del'>-	int ret, state;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;num_leds != 1)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	led_data = devm_kzalloc(dev, sizeof(*led_data), GFP_KERNEL);</div><div class='del'>-	if (!led_data)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	led_data-&gt;cdev.name = template-&gt;name;</div><div class='del'>-	led_data-&gt;cdev.default_trigger = template-&gt;default_trigger;</div><div class='del'>-	led_data-&gt;cdev.brightness_set_blocking = lt3593_led_set;</div><div class='del'>-</div><div class='del'>-	state = (template-&gt;default_state == LEDS_GPIO_DEFSTATE_ON);</div><div class='del'>-	led_data-&gt;cdev.brightness = state ? LED_FULL : LED_OFF;</div><div class='del'>-</div><div class='del'>-	if (!template-&gt;retain_state_suspended)</div><div class='del'>-		led_data-&gt;cdev.flags |= LED_CORE_SUSPENDRESUME;</div><div class='del'>-</div><div class='del'>-	ret = devm_gpio_request_one(dev, template-&gt;gpio, state ?</div><div class='del'>-				    GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,</div><div class='del'>-				    template-&gt;name);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	led_data-&gt;gpiod = gpio_to_desc(template-&gt;gpio);</div><div class='del'>-	if (!led_data-&gt;gpiod)</div><div class='del'>-		return ERR_PTR(-EPROBE_DEFER);</div><div class='del'>-</div><div class='del'>-	ret = devm_led_classdev_register(dev, &amp;led_data-&gt;cdev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	dev_info(dev, "registered LT3593 LED '%s' at GPIO %d\n",</div><div class='del'>-		 template-&gt;name, template-&gt;gpio);</div><div class='del'>-</div><div class='del'>-	return led_data;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int lt3593_led_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct lt3593_led_data *led_data;</div><div class='ctx'> 	struct fwnode_handle *child;</div><div class='ctx'> 	int ret, state = LEDS_GPIO_DEFSTATE_OFF;</div><div class='del'>-	enum gpiod_flags flags = GPIOD_OUT_LOW;</div><div class='ctx'> 	const char *tmp;</div><div class='ctx'> </div><div class='del'>-	if (dev_get_platdata(dev)) {</div><div class='del'>-		led_data = lt3593_led_probe_pdata(dev);</div><div class='del'>-		if (IS_ERR(led_data))</div><div class='del'>-			return PTR_ERR(led_data);</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!dev-&gt;of_node)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -151,13 +98,8 @@ static int lt3593_led_probe(struct platform_device *pdev)</div><div class='ctx'> 				    &amp;led_data-&gt;cdev.default_trigger);</div><div class='ctx'> </div><div class='ctx'> 	if (!fwnode_property_read_string(child, "default-state", &amp;tmp)) {</div><div class='del'>-		if (!strcmp(tmp, "keep")) {</div><div class='del'>-			state = LEDS_GPIO_DEFSTATE_KEEP;</div><div class='del'>-			flags = GPIOD_ASIS;</div><div class='del'>-		} else if (!strcmp(tmp, "on")) {</div><div class='add'>+		if (!strcmp(tmp, "on"))</div><div class='ctx'> 			state = LEDS_GPIO_DEFSTATE_ON;</div><div class='del'>-			flags = GPIOD_OUT_HIGH;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	led_data-&gt;cdev.name = led_data-&gt;name;</div><div class='hunk'>@@ -171,20 +113,16 @@ static int lt3593_led_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	led_data-&gt;cdev.dev-&gt;of_node = dev-&gt;of_node;</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	platform_set_drvdata(pdev, led_data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='ctx'> static const struct of_device_id of_lt3593_leds_match[] = {</div><div class='ctx'> 	{ .compatible = "lltc,lt3593", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, of_lt3593_leds_match);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver lt3593_led_driver = {</div><div class='ctx'> 	.probe		= lt3593_led_probe,</div><div class='head'>diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c<br/>index 7fea18b0c15d..7cb4d685a1f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-pca9532.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-pca9532.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-pca9532.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-pca9532.c</a></div><div class='hunk'>@@ -513,6 +513,7 @@ static int pca9532_probe(struct i2c_client *client,</div><div class='ctx'> 	const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int devid;</div><div class='add'>+	const struct of_device_id *of_id;</div><div class='ctx'> 	struct pca9532_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	struct pca9532_platform_data *pca9532_pdata =</div><div class='ctx'> 			dev_get_platdata(&amp;client-&gt;dev);</div><div class='hunk'>@@ -528,8 +529,11 @@ static int pca9532_probe(struct i2c_client *client,</div><div class='ctx'> 			dev_err(&amp;client-&gt;dev, "no platform data\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		devid = (int)(uintptr_t)of_match_device(</div><div class='del'>-			of_pca9532_leds_match, &amp;client-&gt;dev)-&gt;data;</div><div class='add'>+		of_id = of_match_device(of_pca9532_leds_match,</div><div class='add'>+				&amp;client-&gt;dev);</div><div class='add'>+		if (unlikely(!of_id))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		devid = (int)(uintptr_t) of_id-&gt;data;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		devid = id-&gt;driver_data;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c<br/>index f51b356d4426..a9f5dad55956 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-pca955x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-pca955x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-pca955x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-pca955x.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'>  *  bits the chip supports.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -48,8 +47,8 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/leds.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='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -110,15 +109,6 @@ static const struct i2c_device_id pca955x_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, pca955x_id);</div><div class='ctx'> </div><div class='del'>-static const struct acpi_device_id pca955x_acpi_ids[] = {</div><div class='del'>-	{ "PCA9550",  pca9550 },</div><div class='del'>-	{ "PCA9551",  pca9551 },</div><div class='del'>-	{ "PCA9552",  pca9552 },</div><div class='del'>-	{ "PCA9553",  pca9553 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids);</div><div class='del'>-</div><div class='ctx'> struct pca955x {</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	struct pca955x_led *leds;</div><div class='hunk'>@@ -373,16 +363,14 @@ static int pca955x_gpio_direction_output(struct gpio_chip *gc,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_LEDS_PCA955X_GPIO */</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_OF)</div><div class='ctx'> static struct pca955x_platform_data *</div><div class='del'>-pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip)</div><div class='add'>+pca955x_get_pdata(struct i2c_client *client, struct pca955x_chipdef *chip)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np = client-&gt;dev.of_node;</div><div class='del'>-	struct device_node *child;</div><div class='ctx'> 	struct pca955x_platform_data *pdata;</div><div class='add'>+	struct fwnode_handle *child;</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='del'>-	count = of_get_child_count(np);</div><div class='add'>+	count = device_get_child_node_count(&amp;client-&gt;dev);</div><div class='ctx'> 	if (!count || count &gt; chip-&gt;bits)</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='hunk'>@@ -396,24 +384,25 @@ pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip)</div><div class='ctx'> 	if (!pdata-&gt;leds)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	for_each_child_of_node(np, child) {</div><div class='add'>+	device_for_each_child_node(&amp;client-&gt;dev, child) {</div><div class='ctx'> 		const char *name;</div><div class='ctx'> 		u32 reg;</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='del'>-		res = of_property_read_u32(child, "reg", &amp;reg);</div><div class='add'>+		res = fwnode_property_read_u32(child, "reg", &amp;reg);</div><div class='ctx'> 		if ((res != 0) || (reg &gt;= chip-&gt;bits))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (of_property_read_string(child, "label", &amp;name))</div><div class='del'>-			name = child-&gt;name;</div><div class='add'>+		res = fwnode_property_read_string(child, "label", &amp;name);</div><div class='add'>+		if ((res != 0) &amp;&amp; is_of_node(child))</div><div class='add'>+			name = to_of_node(child)-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 		snprintf(pdata-&gt;leds[reg].name, sizeof(pdata-&gt;leds[reg].name),</div><div class='ctx'> 			 "%s", name);</div><div class='ctx'> </div><div class='ctx'> 		pdata-&gt;leds[reg].type = PCA955X_TYPE_LED;</div><div class='del'>-		of_property_read_u32(child, "type", &amp;pdata-&gt;leds[reg].type);</div><div class='del'>-		of_property_read_string(child, "linux,default-trigger",</div><div class='add'>+		fwnode_property_read_u32(child, "type", &amp;pdata-&gt;leds[reg].type);</div><div class='add'>+		fwnode_property_read_string(child, "linux,default-trigger",</div><div class='ctx'> 					&amp;pdata-&gt;leds[reg].default_trigger);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -429,15 +418,7 @@ static const struct of_device_id of_pca955x_match[] = {</div><div class='ctx'> 	{ .compatible = "nxp,pca9553", .data = (void *)pca9553 },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE(of, of_pca955x_match);</div><div class='del'>-#else</div><div class='del'>-static struct pca955x_platform_data *</div><div class='del'>-pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int pca955x_probe(struct i2c_client *client,</div><div class='ctx'> 					const struct i2c_device_id *id)</div><div class='hunk'>@@ -450,20 +431,11 @@ static int pca955x_probe(struct i2c_client *client,</div><div class='ctx'> 	struct pca955x_platform_data *pdata;</div><div class='ctx'> 	int ngpios = 0;</div><div class='ctx'> </div><div class='del'>-	if (id) {</div><div class='del'>-		chip = &amp;pca955x_chipdefs[id-&gt;driver_data];</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(pca955x_acpi_ids, &amp;client-&gt;dev);</div><div class='del'>-		if (!acpi_id)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		chip = &amp;pca955x_chipdefs[acpi_id-&gt;driver_data];</div><div class='del'>-	}</div><div class='add'>+	chip = &amp;pca955x_chipdefs[id-&gt;driver_data];</div><div class='ctx'> 	adapter = to_i2c_adapter(client-&gt;dev.parent);</div><div class='ctx'> 	pdata = dev_get_platdata(&amp;client-&gt;dev);</div><div class='ctx'> 	if (!pdata) {</div><div class='del'>-		pdata =	pca955x_pdata_of_init(client, chip);</div><div class='add'>+		pdata =	pca955x_get_pdata(client, chip);</div><div class='ctx'> 		if (IS_ERR(pdata))</div><div class='ctx'> 			return PTR_ERR(pdata);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -602,8 +574,7 @@ static int pca955x_probe(struct i2c_client *client,</div><div class='ctx'> static struct i2c_driver pca955x_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "leds-pca955x",</div><div class='del'>-		.acpi_match_table = ACPI_PTR(pca955x_acpi_ids),</div><div class='del'>-		.of_match_table = of_match_ptr(of_pca955x_match),</div><div class='add'>+		.of_match_table = of_pca955x_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= pca955x_probe,</div><div class='ctx'> 	.id_table = pca955x_id,</div><div class='head'>diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c<br/>index 5c0908113e38..9b4ef070d956 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-pca963x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/leds-pca963x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/leds-pca963x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/leds-pca963x.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * or by adding the 'nxp,hw-blink' property to the DTS.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -33,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/leds-pca963x.h&gt;</div><div class='hunk'>@@ -97,15 +97,6 @@ static const struct i2c_device_id pca963x_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, pca963x_id);</div><div class='ctx'> </div><div class='del'>-static const struct acpi_device_id pca963x_acpi_ids[] = {</div><div class='del'>-	{ "PCA9632", pca9633 },</div><div class='del'>-	{ "PCA9633", pca9633 },</div><div class='del'>-	{ "PCA9634", pca9634 },</div><div class='del'>-	{ "PCA9635", pca9635 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(acpi, pca963x_acpi_ids);</div><div class='del'>-</div><div class='ctx'> struct pca963x_led;</div><div class='ctx'> </div><div class='ctx'> struct pca963x {</div><div class='hunk'>@@ -287,16 +278,15 @@ static int pca963x_blink_set(struct led_classdev *led_cdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_OF)</div><div class='ctx'> static struct pca963x_platform_data *</div><div class='del'>-pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip)</div><div class='add'>+pca963x_get_pdata(struct i2c_client *client, struct pca963x_chipdef *chip)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np = client-&gt;dev.of_node, *child;</div><div class='ctx'> 	struct pca963x_platform_data *pdata;</div><div class='ctx'> 	struct led_info *pca963x_leds;</div><div class='add'>+	struct fwnode_handle *child;</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='del'>-	count = of_get_child_count(np);</div><div class='add'>+	count = device_get_child_node_count(&amp;client-&gt;dev);</div><div class='ctx'> 	if (!count || count &gt; chip-&gt;n_leds)</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='hunk'>@@ -305,18 +295,22 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip)</div><div class='ctx'> 	if (!pca963x_leds)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	for_each_child_of_node(np, child) {</div><div class='add'>+	device_for_each_child_node(&amp;client-&gt;dev, child) {</div><div class='ctx'> 		struct led_info led = {};</div><div class='ctx'> 		u32 reg;</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='del'>-		res = of_property_read_u32(child, "reg", &amp;reg);</div><div class='add'>+		res = fwnode_property_read_u32(child, "reg", &amp;reg);</div><div class='ctx'> 		if ((res != 0) || (reg &gt;= chip-&gt;n_leds))</div><div class='ctx'> 			continue;</div><div class='del'>-		led.name =</div><div class='del'>-			of_get_property(child, "label", NULL) ? : child-&gt;name;</div><div class='del'>-		led.default_trigger =</div><div class='del'>-			of_get_property(child, "linux,default-trigger", NULL);</div><div class='add'>+</div><div class='add'>+		res = fwnode_property_read_string(child, "label", &amp;led.name);</div><div class='add'>+		if ((res != 0) &amp;&amp; is_of_node(child))</div><div class='add'>+			led.name = to_of_node(child)-&gt;name;</div><div class='add'>+</div><div class='add'>+		fwnode_property_read_string(child, "linux,default-trigger",</div><div class='add'>+					    &amp;led.default_trigger);</div><div class='add'>+</div><div class='ctx'> 		pca963x_leds[reg] = led;</div><div class='ctx'> 	}</div><div class='ctx'> 	pdata = devm_kzalloc(&amp;client-&gt;dev,</div><div class='hunk'>@@ -328,22 +322,23 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip)</div><div class='ctx'> 	pdata-&gt;leds.num_leds = chip-&gt;n_leds;</div><div class='ctx'> </div><div class='ctx'> 	/* default to open-drain unless totem pole (push-pull) is specified */</div><div class='del'>-	if (of_property_read_bool(np, "nxp,totem-pole"))</div><div class='add'>+	if (device_property_read_bool(&amp;client-&gt;dev, "nxp,totem-pole"))</div><div class='ctx'> 		pdata-&gt;outdrv = PCA963X_TOTEM_POLE;</div><div class='ctx'> 	else</div><div class='ctx'> 		pdata-&gt;outdrv = PCA963X_OPEN_DRAIN;</div><div class='ctx'> </div><div class='ctx'> 	/* default to software blinking unless hardware blinking is specified */</div><div class='del'>-	if (of_property_read_bool(np, "nxp,hw-blink"))</div><div class='add'>+	if (device_property_read_bool(&amp;client-&gt;dev, "nxp,hw-blink"))</div><div class='ctx'> 		pdata-&gt;blink_type = PCA963X_HW_BLINK;</div><div class='ctx'> 	else</div><div class='ctx'> 		pdata-&gt;blink_type = PCA963X_SW_BLINK;</div><div class='ctx'> </div><div class='del'>-	if (of_property_read_u32(np, "nxp,period-scale", &amp;chip-&gt;scaling))</div><div class='add'>+	if (device_property_read_u32(&amp;client-&gt;dev, "nxp,period-scale",</div><div class='add'>+				     &amp;chip-&gt;scaling))</div><div class='ctx'> 		chip-&gt;scaling = 1000;</div><div class='ctx'> </div><div class='ctx'> 	/* default to non-inverted output, unless inverted is specified */</div><div class='del'>-	if (of_property_read_bool(np, "nxp,inverted-out"))</div><div class='add'>+	if (device_property_read_bool(&amp;client-&gt;dev, "nxp,inverted-out"))</div><div class='ctx'> 		pdata-&gt;dir = PCA963X_INVERTED;</div><div class='ctx'> 	else</div><div class='ctx'> 		pdata-&gt;dir = PCA963X_NORMAL;</div><div class='hunk'>@@ -359,13 +354,6 @@ static const struct of_device_id of_pca963x_match[] = {</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, of_pca963x_match);</div><div class='del'>-#else</div><div class='del'>-static struct pca963x_platform_data *</div><div class='del'>-pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int pca963x_probe(struct i2c_client *client,</div><div class='ctx'> 					const struct i2c_device_id *id)</div><div class='hunk'>@@ -376,20 +364,11 @@ static int pca963x_probe(struct i2c_client *client,</div><div class='ctx'> 	struct pca963x_chipdef *chip;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	if (id) {</div><div class='del'>-		chip = &amp;pca963x_chipdefs[id-&gt;driver_data];</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(pca963x_acpi_ids, &amp;client-&gt;dev);</div><div class='del'>-		if (!acpi_id)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		chip = &amp;pca963x_chipdefs[acpi_id-&gt;driver_data];</div><div class='del'>-	}</div><div class='add'>+	chip = &amp;pca963x_chipdefs[id-&gt;driver_data];</div><div class='ctx'> 	pdata = dev_get_platdata(&amp;client-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata) {</div><div class='del'>-		pdata = pca963x_dt_init(client, chip);</div><div class='add'>+		pdata = pca963x_get_pdata(client, chip);</div><div class='ctx'> 		if (IS_ERR(pdata)) {</div><div class='ctx'> 			dev_warn(&amp;client-&gt;dev, "could not parse configuration\n");</div><div class='ctx'> 			pdata = NULL;</div><div class='hunk'>@@ -495,8 +474,7 @@ static int pca963x_remove(struct i2c_client *client)</div><div class='ctx'> static struct i2c_driver pca963x_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "leds-pca963x",</div><div class='del'>-		.of_match_table = of_match_ptr(of_pca963x_match),</div><div class='del'>-		.acpi_match_table = ACPI_PTR(pca963x_acpi_ids),</div><div class='add'>+		.of_match_table = of_pca963x_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= pca963x_probe,</div><div class='ctx'> 	.remove	= pca963x_remove,</div><div class='head'>diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c<br/>index 3dd3ed46d473..136f86a1627d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/trigger/ledtrig-netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/trigger/ledtrig-netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/trigger/ledtrig-netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/trigger/ledtrig-netdev.c</a></div><div class='hunk'>@@ -122,7 +122,8 @@ static ssize_t device_name_store(struct device *dev,</div><div class='ctx'> 		trigger_data-&gt;net_dev = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(trigger_data-&gt;device_name, buf, size);</div><div class='add'>+	memcpy(trigger_data-&gt;device_name, buf, size);</div><div class='add'>+	trigger_data-&gt;device_name[size] = 0;</div><div class='ctx'> 	if (size &gt; 0 &amp;&amp; trigger_data-&gt;device_name[size - 1] == '\n')</div><div class='ctx'> 		trigger_data-&gt;device_name[size - 1] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -301,11 +302,11 @@ static int netdev_trig_notify(struct notifier_block *nb,</div><div class='ctx'> 		container_of(nb, struct led_netdev_data, notifier);</div><div class='ctx'> </div><div class='ctx'> 	if (evt != NETDEV_UP &amp;&amp; evt != NETDEV_DOWN &amp;&amp; evt != NETDEV_CHANGE</div><div class='del'>-	    &amp;&amp; evt != NETDEV_REGISTER &amp;&amp; evt != NETDEV_UNREGISTER</div><div class='del'>-	    &amp;&amp; evt != NETDEV_CHANGENAME)</div><div class='add'>+	    &amp;&amp; evt != NETDEV_REGISTER &amp;&amp; evt != NETDEV_UNREGISTER)</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='del'>-	if (strcmp(dev-&gt;name, trigger_data-&gt;device_name))</div><div class='add'>+	if (!(dev == trigger_data-&gt;net_dev ||</div><div class='add'>+	      (evt == NETDEV_REGISTER &amp;&amp; !strcmp(dev-&gt;name, trigger_data-&gt;device_name))))</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;trigger_data-&gt;work);</div><div class='hunk'>@@ -320,12 +321,9 @@ static int netdev_trig_notify(struct notifier_block *nb,</div><div class='ctx'> 		dev_hold(dev);</div><div class='ctx'> 		trigger_data-&gt;net_dev = dev;</div><div class='ctx'> 		break;</div><div class='del'>-	case NETDEV_CHANGENAME:</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='del'>-		if (trigger_data-&gt;net_dev) {</div><div class='del'>-			dev_put(trigger_data-&gt;net_dev);</div><div class='del'>-			trigger_data-&gt;net_dev = NULL;</div><div class='del'>-		}</div><div class='add'>+		dev_put(trigger_data-&gt;net_dev);</div><div class='add'>+		trigger_data-&gt;net_dev = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_UP:</div><div class='ctx'> 	case NETDEV_CHANGE:</div><div class='head'>diff --git a/drivers/leds/uleds.c b/drivers/leds/uleds.c<br/>index 0c43bfac9598..08b6a769ff8f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/uleds.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/leds/uleds.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/leds/uleds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/leds/uleds.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static int uleds_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	udev-&gt;state = ULEDS_STATE_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = udev;</div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c<br/>index 3789185144da..0b7d5fb4548d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/lightnvm/pblk-read.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/lightnvm/pblk-read.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/lightnvm/pblk-read.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/lightnvm/pblk-read.c</a></div><div class='hunk'>@@ -231,14 +231,14 @@ static void pblk_end_partial_read(struct nvm_rq *rqd)</div><div class='ctx'> 	struct pblk_sec_meta *meta;</div><div class='ctx'> 	struct bio *new_bio = rqd-&gt;bio;</div><div class='ctx'> 	struct bio *bio = pr_ctx-&gt;orig_bio;</div><div class='del'>-	struct bio_vec src_bv, dst_bv;</div><div class='ctx'> 	void *meta_list = rqd-&gt;meta_list;</div><div class='del'>-	int bio_init_idx = pr_ctx-&gt;bio_init_idx;</div><div class='ctx'> 	unsigned long *read_bitmap = pr_ctx-&gt;bitmap;</div><div class='add'>+	struct bvec_iter orig_iter = BVEC_ITER_ALL_INIT;</div><div class='add'>+	struct bvec_iter new_iter = BVEC_ITER_ALL_INIT;</div><div class='ctx'> 	int nr_secs = pr_ctx-&gt;orig_nr_secs;</div><div class='ctx'> 	int nr_holes = nr_secs - bitmap_weight(read_bitmap, nr_secs);</div><div class='ctx'> 	void *src_p, *dst_p;</div><div class='del'>-	int hole, i;</div><div class='add'>+	int bit, i;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(nr_holes == 1)) {</div><div class='ctx'> 		struct ppa_addr ppa;</div><div class='hunk'>@@ -257,33 +257,39 @@ static void pblk_end_partial_read(struct nvm_rq *rqd)</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the holes in the original bio */</div><div class='ctx'> 	i = 0;</div><div class='del'>-	hole = find_first_zero_bit(read_bitmap, nr_secs);</div><div class='del'>-	do {</div><div class='del'>-		struct pblk_line *line;</div><div class='add'>+	for (bit = 0; bit &lt; nr_secs; bit++) {</div><div class='add'>+		if (!test_bit(bit, read_bitmap)) {</div><div class='add'>+			struct bio_vec dst_bv, src_bv;</div><div class='add'>+			struct pblk_line *line;</div><div class='ctx'> </div><div class='del'>-		line = pblk_ppa_to_line(pblk, rqd-&gt;ppa_list[i]);</div><div class='del'>-		kref_put(&amp;line-&gt;ref, pblk_line_put);</div><div class='add'>+			line = pblk_ppa_to_line(pblk, rqd-&gt;ppa_list[i]);</div><div class='add'>+			kref_put(&amp;line-&gt;ref, pblk_line_put);</div><div class='ctx'> </div><div class='del'>-		meta = pblk_get_meta(pblk, meta_list, hole);</div><div class='del'>-		meta-&gt;lba = cpu_to_le64(pr_ctx-&gt;lba_list_media[i]);</div><div class='add'>+			meta = pblk_get_meta(pblk, meta_list, bit);</div><div class='add'>+			meta-&gt;lba = cpu_to_le64(pr_ctx-&gt;lba_list_media[i]);</div><div class='ctx'> </div><div class='del'>-		src_bv = new_bio-&gt;bi_io_vec[i++];</div><div class='del'>-		dst_bv = bio-&gt;bi_io_vec[bio_init_idx + hole];</div><div class='add'>+			dst_bv = bio_iter_iovec(bio, orig_iter);</div><div class='add'>+			src_bv = bio_iter_iovec(new_bio, new_iter);</div><div class='ctx'> </div><div class='del'>-		src_p = kmap_atomic(src_bv.bv_page);</div><div class='del'>-		dst_p = kmap_atomic(dst_bv.bv_page);</div><div class='add'>+			src_p = kmap_atomic(src_bv.bv_page);</div><div class='add'>+			dst_p = kmap_atomic(dst_bv.bv_page);</div><div class='ctx'> </div><div class='del'>-		memcpy(dst_p + dst_bv.bv_offset,</div><div class='del'>-			src_p + src_bv.bv_offset,</div><div class='del'>-			PBLK_EXPOSED_PAGE_SIZE);</div><div class='add'>+			memcpy(dst_p + dst_bv.bv_offset,</div><div class='add'>+				src_p + src_bv.bv_offset,</div><div class='add'>+				PBLK_EXPOSED_PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-		kunmap_atomic(src_p);</div><div class='del'>-		kunmap_atomic(dst_p);</div><div class='add'>+			kunmap_atomic(src_p);</div><div class='add'>+			kunmap_atomic(dst_p);</div><div class='ctx'> </div><div class='del'>-		mempool_free(src_bv.bv_page, &amp;pblk-&gt;page_bio_pool);</div><div class='add'>+			flush_dcache_page(dst_bv.bv_page);</div><div class='add'>+			mempool_free(src_bv.bv_page, &amp;pblk-&gt;page_bio_pool);</div><div class='ctx'> </div><div class='del'>-		hole = find_next_zero_bit(read_bitmap, nr_secs, hole + 1);</div><div class='del'>-	} while (hole &lt; nr_secs);</div><div class='add'>+			bio_advance_iter(new_bio, &amp;new_iter,</div><div class='add'>+					PBLK_EXPOSED_PAGE_SIZE);</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		bio_advance_iter(bio, &amp;orig_iter, PBLK_EXPOSED_PAGE_SIZE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bio_put(new_bio);</div><div class='ctx'> 	kfree(pr_ctx);</div><div class='head'>diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c<br/>index 256f18b67e8a..08a0a3517138 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mailbox/pcc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mailbox/pcc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mailbox/pcc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mailbox/pcc.c</a></div><div class='hunk'>@@ -382,7 +382,7 @@ static const struct mbox_chan_ops pcc_chan_ops = {</div><div class='ctx'>  *</div><div class='ctx'>  * This gets called for each entry in the PCC table.</div><div class='ctx'>  */</div><div class='del'>-static int parse_pcc_subspace(struct acpi_subtable_header *header,</div><div class='add'>+static int parse_pcc_subspace(union acpi_subtable_headers *header,</div><div class='ctx'> 		const unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_pcct_subspace *ss = (struct acpi_pcct_subspace *) header;</div><div class='head'>diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c<br/>index 5002838ea476..f8986effcb50 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/alloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/alloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/alloc.c</a></div><div class='hunk'>@@ -327,10 +327,11 @@ static int bch_allocator_thread(void *arg)</div><div class='ctx'> 		 * possibly issue discards to them, then we add the bucket to</div><div class='ctx'> 		 * the free list:</div><div class='ctx'> 		 */</div><div class='del'>-		while (!fifo_empty(&amp;ca-&gt;free_inc)) {</div><div class='add'>+		while (1) {</div><div class='ctx'> 			long bucket;</div><div class='ctx'> </div><div class='del'>-			fifo_pop(&amp;ca-&gt;free_inc, bucket);</div><div class='add'>+			if (!fifo_pop(&amp;ca-&gt;free_inc, bucket))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='ctx'> 			if (ca-&gt;discard) {</div><div class='ctx'> 				mutex_unlock(&amp;ca-&gt;set-&gt;bucket_lock);</div><div class='head'>diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c<br/>index 64def336f053..773f5fdad25f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/btree.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/btree.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/btree.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/btree.c</a></div><div class='hunk'>@@ -429,14 +429,14 @@ static void do_btree_node_write(struct btree *b)</div><div class='ctx'> 		       bset_sector_offset(&amp;b-&gt;keys, i));</div><div class='ctx'> </div><div class='ctx'> 	if (!bch_bio_alloc_pages(b-&gt;bio, __GFP_NOWARN|GFP_NOWAIT)) {</div><div class='del'>-		int j;</div><div class='ctx'> 		struct bio_vec *bv;</div><div class='del'>-		void *base = (void *) ((unsigned long) i &amp; ~(PAGE_SIZE - 1));</div><div class='add'>+		void *addr = (void *) ((unsigned long) i &amp; ~(PAGE_SIZE - 1));</div><div class='ctx'> 		struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-		bio_for_each_segment_all(bv, b-&gt;bio, j, iter_all)</div><div class='del'>-			memcpy(page_address(bv-&gt;bv_page),</div><div class='del'>-			       base + j * PAGE_SIZE, PAGE_SIZE);</div><div class='add'>+		bio_for_each_segment_all(bv, b-&gt;bio, iter_all) {</div><div class='add'>+			memcpy(page_address(bv-&gt;bv_page), addr, PAGE_SIZE);</div><div class='add'>+			addr += PAGE_SIZE;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		bch_submit_bbio(b-&gt;bio, b-&gt;c, &amp;k.key, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1476,11 +1476,11 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op,</div><div class='ctx'> </div><div class='ctx'> out_nocoalesce:</div><div class='ctx'> 	closure_sync(&amp;cl);</div><div class='del'>-	bch_keylist_free(&amp;keylist);</div><div class='ctx'> </div><div class='ctx'> 	while ((k = bch_keylist_pop(&amp;keylist)))</div><div class='ctx'> 		if (!bkey_cmp(k, &amp;ZERO_KEY))</div><div class='ctx'> 			atomic_dec(&amp;b-&gt;c-&gt;prio_blocked);</div><div class='add'>+	bch_keylist_free(&amp;keylist);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nodes; i++)</div><div class='ctx'> 		if (!IS_ERR_OR_NULL(new_nodes[i])) {</div><div class='head'>diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c<br/>index b2fd412715b1..12dae9348147 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/journal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/journal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/journal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/journal.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> #define read_bucket(b)							\</div><div class='ctx'> 	({								\</div><div class='del'>-		int ret = journal_read_bucket(ca, list, b);		\</div><div class='add'>+		ret = journal_read_bucket(ca, list, b);			\</div><div class='ctx'> 		__set_bit(b, bitmap);					\</div><div class='ctx'> 		if (ret &lt; 0)						\</div><div class='ctx'> 			return ret;					\</div><div class='hunk'>@@ -156,6 +156,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)</div><div class='ctx'> </div><div class='ctx'> 	struct cache *ca;</div><div class='ctx'> 	unsigned int iter;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_cache(ca, c, iter) {</div><div class='ctx'> 		struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='hunk'>@@ -267,7 +268,7 @@ bsearch:</div><div class='ctx'> 					    struct journal_replay,</div><div class='ctx'> 					    list)-&gt;j.seq;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> #undef read_bucket</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -317,6 +318,18 @@ void bch_journal_mark(struct cache_set *c, struct list_head *list)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_discard_enabled(struct cache_set *s)</div><div class='add'>+{</div><div class='add'>+	struct cache *ca;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for_each_cache(ca, s, i)</div><div class='add'>+		if (ca-&gt;discard)</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='ctx'> int bch_journal_replay(struct cache_set *s, struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, keys = 0, entries = 0;</div><div class='hunk'>@@ -330,9 +343,17 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list)</div><div class='ctx'> 	list_for_each_entry(i, list, list) {</div><div class='ctx'> 		BUG_ON(i-&gt;pin &amp;&amp; atomic_read(i-&gt;pin) != 1);</div><div class='ctx'> </div><div class='del'>-		cache_set_err_on(n != i-&gt;j.seq, s,</div><div class='del'>-"bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)",</div><div class='del'>-				 n, i-&gt;j.seq - 1, start, end);</div><div class='add'>+		if (n != i-&gt;j.seq) {</div><div class='add'>+			if (n == start &amp;&amp; is_discard_enabled(s))</div><div class='add'>+				pr_info("bcache: journal entries %llu-%llu may be discarded! (replaying %llu-%llu)",</div><div class='add'>+					n, i-&gt;j.seq - 1, start, end);</div><div class='add'>+			else {</div><div class='add'>+				pr_err("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)",</div><div class='add'>+					n, i-&gt;j.seq - 1, start, end);</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		for (k = i-&gt;j.start;</div><div class='ctx'> 		     k &lt; bset_bkey_last(&amp;i-&gt;j);</div><div class='hunk'>@@ -540,11 +561,11 @@ static void journal_reclaim(struct cache_set *c)</div><div class='ctx'> 				  ca-&gt;sb.nr_this_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bkey_init(k);</div><div class='del'>-	SET_KEY_PTRS(k, n);</div><div class='del'>-</div><div class='del'>-	if (n)</div><div class='add'>+	if (n) {</div><div class='add'>+		bkey_init(k);</div><div class='add'>+		SET_KEY_PTRS(k, n);</div><div class='ctx'> 		c-&gt;journal.blocks_free = c-&gt;sb.bucket_size &gt;&gt; c-&gt;block_bits;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (!journal_full(&amp;c-&gt;journal))</div><div class='ctx'> 		__closure_wake_up(&amp;c-&gt;journal.wait);</div><div class='hunk'>@@ -671,6 +692,9 @@ static void journal_write_unlocked(struct closure *cl)</div><div class='ctx'> 		ca-&gt;journal.seq[ca-&gt;journal.cur_idx] = w-&gt;data-&gt;seq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If KEY_PTRS(k) == 0, this jset gets lost in air */</div><div class='add'>+	BUG_ON(i == 0);</div><div class='add'>+</div><div class='ctx'> 	atomic_dec_bug(&amp;fifo_back(&amp;c-&gt;journal.pin));</div><div class='ctx'> 	bch_journal_next(&amp;c-&gt;journal);</div><div class='ctx'> 	journal_reclaim(c);</div><div class='head'>diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c<br/>index f101bfe8657a..41adcd1546f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/request.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/request.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/request.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/request.c</a></div><div class='hunk'>@@ -329,12 +329,13 @@ void bch_data_insert(struct closure *cl)</div><div class='ctx'> 	bch_data_insert_start(cl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Congested? */</div><div class='del'>-</div><div class='del'>-unsigned int bch_get_congested(struct cache_set *c)</div><div class='add'>+/*</div><div class='add'>+ * Congested?  Return 0 (not congested) or the limit (in sectors)</div><div class='add'>+ * beyond which we should bypass the cache due to congestion.</div><div class='add'>+ */</div><div class='add'>+unsigned int bch_get_congested(const struct cache_set *c)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	long rand;</div><div class='ctx'> </div><div class='ctx'> 	if (!c-&gt;congested_read_threshold_us &amp;&amp;</div><div class='ctx'> 	    !c-&gt;congested_write_threshold_us)</div><div class='hunk'>@@ -353,8 +354,7 @@ unsigned int bch_get_congested(struct cache_set *c)</div><div class='ctx'> 	if (i &gt; 0)</div><div class='ctx'> 		i = fract_exp_two(i, 6);</div><div class='ctx'> </div><div class='del'>-	rand = get_random_int();</div><div class='del'>-	i -= bitmap_weight(&amp;rand, BITS_PER_LONG);</div><div class='add'>+	i -= hweight32(get_random_u32());</div><div class='ctx'> </div><div class='ctx'> 	return i &gt; 0 ? i : 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -376,7 +376,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct cache_set *c = dc-&gt;disk.c;</div><div class='ctx'> 	unsigned int mode = cache_mode(dc);</div><div class='del'>-	unsigned int sectors, congested = bch_get_congested(c);</div><div class='add'>+	unsigned int sectors, congested;</div><div class='ctx'> 	struct task_struct *task = current;</div><div class='ctx'> 	struct io *i;</div><div class='ctx'> </div><div class='hunk'>@@ -412,6 +412,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)</div><div class='ctx'> 			goto rescale;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	congested = bch_get_congested(c);</div><div class='ctx'> 	if (!congested &amp;&amp; !dc-&gt;sequential_cutoff)</div><div class='ctx'> 		goto rescale;</div><div class='ctx'> </div><div class='hunk'>@@ -706,14 +707,14 @@ static void search_free(struct closure *cl)</div><div class='ctx'> {</div><div class='ctx'> 	struct search *s = container_of(cl, struct search, cl);</div><div class='ctx'> </div><div class='del'>-	atomic_dec(&amp;s-&gt;d-&gt;c-&gt;search_inflight);</div><div class='add'>+	atomic_dec(&amp;s-&gt;iop.c-&gt;search_inflight);</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;iop.bio)</div><div class='ctx'> 		bio_put(s-&gt;iop.bio);</div><div class='ctx'> </div><div class='ctx'> 	bio_complete(s);</div><div class='ctx'> 	closure_debug_destroy(cl);</div><div class='del'>-	mempool_free(s, &amp;s-&gt;d-&gt;c-&gt;search);</div><div class='add'>+	mempool_free(s, &amp;s-&gt;iop.c-&gt;search);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct search *search_alloc(struct bio *bio,</div><div class='hunk'>@@ -756,13 +757,13 @@ static void cached_dev_bio_complete(struct closure *cl)</div><div class='ctx'> 	struct search *s = container_of(cl, struct search, cl);</div><div class='ctx'> 	struct cached_dev *dc = container_of(s-&gt;d, struct cached_dev, disk);</div><div class='ctx'> </div><div class='del'>-	search_free(cl);</div><div class='ctx'> 	cached_dev_put(dc);</div><div class='add'>+	search_free(cl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Process reads */</div><div class='ctx'> </div><div class='del'>-static void cached_dev_cache_miss_done(struct closure *cl)</div><div class='add'>+static void cached_dev_read_error_done(struct closure *cl)</div><div class='ctx'> {</div><div class='ctx'> 	struct search *s = container_of(cl, struct search, cl);</div><div class='ctx'> </div><div class='hunk'>@@ -800,7 +801,22 @@ static void cached_dev_read_error(struct closure *cl)</div><div class='ctx'> 		closure_bio_submit(s-&gt;iop.c, bio, cl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	continue_at(cl, cached_dev_cache_miss_done, NULL);</div><div class='add'>+	continue_at(cl, cached_dev_read_error_done, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cached_dev_cache_miss_done(struct closure *cl)</div><div class='add'>+{</div><div class='add'>+	struct search *s = container_of(cl, struct search, cl);</div><div class='add'>+	struct bcache_device *d = s-&gt;d;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;iop.replace_collision)</div><div class='add'>+		bch_mark_cache_miss_collision(s-&gt;iop.c, s-&gt;d);</div><div class='add'>+</div><div class='add'>+	if (s-&gt;iop.bio)</div><div class='add'>+		bio_free_pages(s-&gt;iop.bio);</div><div class='add'>+</div><div class='add'>+	cached_dev_bio_complete(cl);</div><div class='add'>+	closure_put(&amp;d-&gt;cl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cached_dev_read_done(struct closure *cl)</div><div class='hunk'>@@ -833,6 +849,7 @@ static void cached_dev_read_done(struct closure *cl)</div><div class='ctx'> 	if (verify(dc) &amp;&amp; s-&gt;recoverable &amp;&amp; !s-&gt;read_dirty_data)</div><div class='ctx'> 		bch_data_verify(dc, s-&gt;orig_bio);</div><div class='ctx'> </div><div class='add'>+	closure_get(&amp;dc-&gt;disk.cl);</div><div class='ctx'> 	bio_complete(s);</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;iop.bio &amp;&amp;</div><div class='head'>diff --git a/drivers/md/bcache/request.h b/drivers/md/bcache/request.h<br/>index 721bf336ed1a..c64dbd7a91aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/request.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/request.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/request.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/request.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@ struct data_insert_op {</div><div class='ctx'> 	BKEY_PADDED(replace_key);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-unsigned int bch_get_congested(struct cache_set *c);</div><div class='add'>+unsigned int bch_get_congested(const struct cache_set *c);</div><div class='ctx'> void bch_data_insert(struct closure *cl);</div><div class='ctx'> </div><div class='ctx'> void bch_cached_dev_request_init(struct cached_dev *dc);</div><div class='head'>diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c<br/>index a697a3a923cd..1b63ac876169 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/super.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/super.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/super.c</a></div><div class='hunk'>@@ -662,6 +662,11 @@ static const struct block_device_operations bcache_ops = {</div><div class='ctx'> void bcache_device_stop(struct bcache_device *d)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_and_set_bit(BCACHE_DEV_CLOSING, &amp;d-&gt;flags))</div><div class='add'>+		/*</div><div class='add'>+		 * closure_fn set to</div><div class='add'>+		 * - cached device: cached_dev_flush()</div><div class='add'>+		 * - flash dev: flash_dev_flush()</div><div class='add'>+		 */</div><div class='ctx'> 		closure_queue(&amp;d-&gt;cl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -906,21 +911,18 @@ static int cached_dev_status_update(void *arg)</div><div class='ctx'> void bch_cached_dev_run(struct cached_dev *dc)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcache_device *d = &amp;dc-&gt;disk;</div><div class='del'>-	char buf[SB_LABEL_SIZE + 1];</div><div class='add'>+	char *buf = kmemdup_nul(dc-&gt;sb.label, SB_LABEL_SIZE, GFP_KERNEL);</div><div class='ctx'> 	char *env[] = {</div><div class='ctx'> 		"DRIVER=bcache",</div><div class='ctx'> 		kasprintf(GFP_KERNEL, "CACHED_UUID=%pU", dc-&gt;sb.uuid),</div><div class='del'>-		NULL,</div><div class='add'>+		kasprintf(GFP_KERNEL, "CACHED_LABEL=%s", buf ? : ""),</div><div class='ctx'> 		NULL,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, dc-&gt;sb.label, SB_LABEL_SIZE);</div><div class='del'>-	buf[SB_LABEL_SIZE] = '\0';</div><div class='del'>-	env[2] = kasprintf(GFP_KERNEL, "CACHED_LABEL=%s", buf);</div><div class='del'>-</div><div class='ctx'> 	if (atomic_xchg(&amp;dc-&gt;running, 1)) {</div><div class='ctx'> 		kfree(env[1]);</div><div class='ctx'> 		kfree(env[2]);</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -944,6 +946,7 @@ void bch_cached_dev_run(struct cached_dev *dc)</div><div class='ctx'> 	kobject_uevent_env(&amp;disk_to_dev(d-&gt;disk)-&gt;kobj, KOBJ_CHANGE, env);</div><div class='ctx'> 	kfree(env[1]);</div><div class='ctx'> 	kfree(env[2]);</div><div class='add'>+	kfree(buf);</div><div class='ctx'> </div><div class='ctx'> 	if (sysfs_create_link(&amp;d-&gt;kobj, &amp;disk_to_dev(d-&gt;disk)-&gt;kobj, "dev") ||</div><div class='ctx'> 	    sysfs_create_link(&amp;disk_to_dev(d-&gt;disk)-&gt;kobj, &amp;d-&gt;kobj, "bcache"))</div><div class='hunk'>@@ -1174,6 +1177,7 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* when dc-&gt;disk.kobj released */</div><div class='ctx'> void bch_cached_dev_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct cached_dev *dc = container_of(kobj, struct cached_dev,</div><div class='hunk'>@@ -1280,7 +1284,7 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size)</div><div class='ctx'> </div><div class='ctx'> /* Cached device - bcache superblock */</div><div class='ctx'> </div><div class='del'>-static void register_bdev(struct cache_sb *sb, struct page *sb_page,</div><div class='add'>+static int register_bdev(struct cache_sb *sb, struct page *sb_page,</div><div class='ctx'> 				 struct block_device *bdev,</div><div class='ctx'> 				 struct cached_dev *dc)</div><div class='ctx'> {</div><div class='hunk'>@@ -1318,14 +1322,16 @@ static void register_bdev(struct cache_sb *sb, struct page *sb_page,</div><div class='ctx'> 	    BDEV_STATE(&amp;dc-&gt;sb) == BDEV_STATE_STALE)</div><div class='ctx'> 		bch_cached_dev_run(dc);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	pr_notice("error %s: %s", dc-&gt;backing_dev_name, err);</div><div class='ctx'> 	bcache_device_stop(&amp;dc-&gt;disk);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Flash only volumes */</div><div class='ctx'> </div><div class='add'>+/* When d-&gt;kobj released */</div><div class='ctx'> void bch_flash_dev_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcache_device *d = container_of(kobj, struct bcache_device,</div><div class='hunk'>@@ -1496,6 +1502,7 @@ bool bch_cache_set_error(struct cache_set *c, const char *fmt, ...)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* When c-&gt;kobj released */</div><div class='ctx'> void bch_cache_set_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct cache_set *c = container_of(kobj, struct cache_set, kobj);</div><div class='hunk'>@@ -1516,6 +1523,7 @@ static void cache_set_free(struct closure *cl)</div><div class='ctx'> 	bch_btree_cache_free(c);</div><div class='ctx'> 	bch_journal_free(c);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;bch_register_lock);</div><div class='ctx'> 	for_each_cache(ca, c, i)</div><div class='ctx'> 		if (ca) {</div><div class='ctx'> 			ca-&gt;set = NULL;</div><div class='hunk'>@@ -1534,7 +1542,6 @@ static void cache_set_free(struct closure *cl)</div><div class='ctx'> 	mempool_exit(&amp;c-&gt;search);</div><div class='ctx'> 	kfree(c-&gt;devices);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bch_register_lock);</div><div class='ctx'> 	list_del(&amp;c-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;bch_register_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1673,6 +1680,7 @@ static void __cache_set_unregister(struct closure *cl)</div><div class='ctx'> void bch_cache_set_stop(struct cache_set *c)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_and_set_bit(CACHE_SET_STOPPING, &amp;c-&gt;flags))</div><div class='add'>+		/* closure_fn set to __cache_set_unregister() */</div><div class='ctx'> 		closure_queue(&amp;c-&gt;caching);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1775,13 +1783,15 @@ err:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void run_cache_set(struct cache_set *c)</div><div class='add'>+static int run_cache_set(struct cache_set *c)</div><div class='ctx'> {</div><div class='ctx'> 	const char *err = "cannot allocate memory";</div><div class='ctx'> 	struct cached_dev *dc, *t;</div><div class='ctx'> 	struct cache *ca;</div><div class='ctx'> 	struct closure cl;</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	LIST_HEAD(journal);</div><div class='add'>+	struct journal_replay *l;</div><div class='ctx'> </div><div class='ctx'> 	closure_init_stack(&amp;cl);</div><div class='ctx'> </div><div class='hunk'>@@ -1790,7 +1800,6 @@ static void run_cache_set(struct cache_set *c)</div><div class='ctx'> 	set_gc_sectors(c);</div><div class='ctx'> </div><div class='ctx'> 	if (CACHE_SYNC(&amp;c-&gt;sb)) {</div><div class='del'>-		LIST_HEAD(journal);</div><div class='ctx'> 		struct bkey *k;</div><div class='ctx'> 		struct jset *j;</div><div class='ctx'> </div><div class='hunk'>@@ -1869,7 +1878,9 @@ static void run_cache_set(struct cache_set *c)</div><div class='ctx'> 		if (j-&gt;version &lt; BCACHE_JSET_VERSION_UUID)</div><div class='ctx'> 			__uuid_write(c);</div><div class='ctx'> </div><div class='del'>-		bch_journal_replay(c, &amp;journal);</div><div class='add'>+		err = "bcache: replay journal failed";</div><div class='add'>+		if (bch_journal_replay(c, &amp;journal))</div><div class='add'>+			goto err;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_notice("invalidating existing data");</div><div class='ctx'> </div><div class='hunk'>@@ -1937,11 +1948,19 @@ static void run_cache_set(struct cache_set *c)</div><div class='ctx'> 	flash_devs_run(c);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(CACHE_SET_RUNNING, &amp;c-&gt;flags);</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> err:</div><div class='add'>+	while (!list_empty(&amp;journal)) {</div><div class='add'>+		l = list_first_entry(&amp;journal, struct journal_replay, list);</div><div class='add'>+		list_del(&amp;l-&gt;list);</div><div class='add'>+		kfree(l);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	closure_sync(&amp;cl);</div><div class='ctx'> 	/* XXX: test this, it's broken */</div><div class='ctx'> 	bch_cache_set_error(c, "%s", err);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool can_attach_cache(struct cache *ca, struct cache_set *c)</div><div class='hunk'>@@ -2005,8 +2024,11 @@ found:</div><div class='ctx'> 	ca-&gt;set-&gt;cache[ca-&gt;sb.nr_this_dev] = ca;</div><div class='ctx'> 	c-&gt;cache_by_alloc[c-&gt;caches_loaded++] = ca;</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;caches_loaded == c-&gt;sb.nr_in_set)</div><div class='del'>-		run_cache_set(c);</div><div class='add'>+	if (c-&gt;caches_loaded == c-&gt;sb.nr_in_set) {</div><div class='add'>+		err = "failed to run cache set";</div><div class='add'>+		if (run_cache_set(c) &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> err:</div><div class='hunk'>@@ -2016,6 +2038,7 @@ err:</div><div class='ctx'> </div><div class='ctx'> /* Cache device */</div><div class='ctx'> </div><div class='add'>+/* When ca-&gt;kobj released */</div><div class='ctx'> void bch_cache_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct cache *ca = container_of(kobj, struct cache, kobj);</div><div class='hunk'>@@ -2179,6 +2202,12 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page,</div><div class='ctx'> </div><div class='ctx'> 	ret = cache_alloc(ca);</div><div class='ctx'> 	if (ret != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we failed here, it means ca-&gt;kobj is not initialized yet,</div><div class='add'>+		 * kobject_put() won't be called and there is no chance to</div><div class='add'>+		 * call blkdev_put() to bdev in bch_cache_release(). So we</div><div class='add'>+		 * explicitly call blkdev_put() here.</div><div class='add'>+		 */</div><div class='ctx'> 		blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);</div><div class='ctx'> 		if (ret == -ENOMEM)</div><div class='ctx'> 			err = "cache_alloc(): -ENOMEM";</div><div class='hunk'>@@ -2262,7 +2291,7 @@ static bool bch_is_open(struct block_device *bdev)</div><div class='ctx'> static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,</div><div class='ctx'> 			       const char *buffer, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ssize_t ret = size;</div><div class='add'>+	ssize_t ret = -EINVAL;</div><div class='ctx'> 	const char *err = "cannot allocate memory";</div><div class='ctx'> 	char *path = NULL;</div><div class='ctx'> 	struct cache_sb *sb = NULL;</div><div class='hunk'>@@ -2296,7 +2325,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,</div><div class='ctx'> 			if (!IS_ERR(bdev))</div><div class='ctx'> 				bdput(bdev);</div><div class='ctx'> 			if (attr == &amp;ksysfs_register_quiet)</div><div class='del'>-				goto out;</div><div class='add'>+				goto quiet_out;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2317,17 +2346,23 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,</div><div class='ctx'> 			goto err_close;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;bch_register_lock);</div><div class='del'>-		register_bdev(sb, sb_page, bdev, dc);</div><div class='add'>+		ret = register_bdev(sb, sb_page, bdev, dc);</div><div class='ctx'> 		mutex_unlock(&amp;bch_register_lock);</div><div class='add'>+		/* blkdev_put() will be called in cached_dev_free() */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct cache *ca = kzalloc(sizeof(*ca), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!ca)</div><div class='ctx'> 			goto err_close;</div><div class='ctx'> </div><div class='add'>+		/* blkdev_put() will be called in bch_cache_release() */</div><div class='ctx'> 		if (register_cache(sb, sb_page, bdev, ca) != 0)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='add'>+quiet_out:</div><div class='add'>+	ret = size;</div><div class='ctx'> out:</div><div class='ctx'> 	if (sb_page)</div><div class='ctx'> 		put_page(sb_page);</div><div class='hunk'>@@ -2340,7 +2375,6 @@ err_close:</div><div class='ctx'> 	blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);</div><div class='ctx'> err:</div><div class='ctx'> 	pr_info("error %s: %s", path, err);</div><div class='del'>-	ret = -EINVAL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2370,10 +2404,19 @@ static int bcache_reboot(struct notifier_block *n, unsigned long code, void *x)</div><div class='ctx'> 		list_for_each_entry_safe(dc, tdc, &amp;uncached_devices, list)</div><div class='ctx'> 			bcache_device_stop(&amp;dc-&gt;disk);</div><div class='ctx'> </div><div class='add'>+		mutex_unlock(&amp;bch_register_lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Give an early chance for other kthreads and</div><div class='add'>+		 * kworkers to stop themselves</div><div class='add'>+		 */</div><div class='add'>+		schedule();</div><div class='add'>+</div><div class='ctx'> 		/* What's a condition variable? */</div><div class='ctx'> 		while (1) {</div><div class='del'>-			long timeout = start + 2 * HZ - jiffies;</div><div class='add'>+			long timeout = start + 10 * HZ - jiffies;</div><div class='ctx'> </div><div class='add'>+			mutex_lock(&amp;bch_register_lock);</div><div class='ctx'> 			stopped = list_empty(&amp;bch_cache_sets) &amp;&amp;</div><div class='ctx'> 				list_empty(&amp;uncached_devices);</div><div class='ctx'> </div><div class='hunk'>@@ -2385,7 +2428,6 @@ static int bcache_reboot(struct notifier_block *n, unsigned long code, void *x)</div><div class='ctx'> </div><div class='ctx'> 			mutex_unlock(&amp;bch_register_lock);</div><div class='ctx'> 			schedule_timeout(timeout);</div><div class='del'>-			mutex_lock(&amp;bch_register_lock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		finish_wait(&amp;unregister_wait, &amp;wait);</div><div class='head'>diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c<br/>index 17bae9c14ca0..6cd44d3cf906 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/sysfs.c</a></div><div class='hunk'>@@ -996,8 +996,6 @@ SHOW(__bch_cache)</div><div class='ctx'> 		       !cached[n - 1])</div><div class='ctx'> 			--n;</div><div class='ctx'> </div><div class='del'>-		unused = ca-&gt;sb.nbuckets - n;</div><div class='del'>-</div><div class='ctx'> 		while (cached &lt; p + n &amp;&amp;</div><div class='ctx'> 		       *cached == BTREE_PRIO)</div><div class='ctx'> 			cached++, n--;</div><div class='head'>diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h<br/>index 00aab6abcfe4..1fbced94e4cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/util.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/bcache/util.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/bcache/util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/bcache/util.h</a></div><div class='hunk'>@@ -560,17 +560,29 @@ static inline uint64_t bch_crc64_update(uint64_t crc,</div><div class='ctx'> 	return crc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Does linear interpolation between powers of two */</div><div class='add'>+/*</div><div class='add'>+ * A stepwise-linear pseudo-exponential.  This returns 1 &lt;&lt; (x &gt;&gt;</div><div class='add'>+ * frac_bits), with the less-significant bits filled in by linear</div><div class='add'>+ * interpolation.</div><div class='add'>+ *</div><div class='add'>+ * This can also be interpreted as a floating-point number format,</div><div class='add'>+ * where the low frac_bits are the mantissa (with implicit leading</div><div class='add'>+ * 1 bit), and the more significant bits are the exponent.</div><div class='add'>+ * The return value is 1.mantissa * 2^exponent.</div><div class='add'>+ *</div><div class='add'>+ * The way this is used, fract_bits is 6 and the largest possible</div><div class='add'>+ * input is CONGESTED_MAX-1 = 1023 (exponent 16, mantissa 0x1.fc),</div><div class='add'>+ * so the maximum output is 0x1fc00.</div><div class='add'>+ */</div><div class='ctx'> static inline unsigned int fract_exp_two(unsigned int x,</div><div class='ctx'> 					 unsigned int fract_bits)</div><div class='ctx'> {</div><div class='del'>-	unsigned int fract = x &amp; ~(~0 &lt;&lt; fract_bits);</div><div class='del'>-</div><div class='del'>-	x &gt;&gt;= fract_bits;</div><div class='del'>-	x   = 1 &lt;&lt; x;</div><div class='del'>-	x  += (x * fract) &gt;&gt; fract_bits;</div><div class='add'>+	unsigned int mantissa = 1 &lt;&lt; fract_bits;	/* Implicit bit */</div><div class='ctx'> </div><div class='del'>-	return x;</div><div class='add'>+	mantissa += x &amp; (mantissa - 1);</div><div class='add'>+	x &gt;&gt;= fract_bits;	/* The exponent */</div><div class='add'>+	/* Largest intermediate value 0x7f0000 */</div><div class='add'>+	return mantissa &lt;&lt; x &gt;&gt; fract_bits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bch_bio_map(struct bio *bio, void *base);</div><div class='head'>diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c<br/>index 1ecef76225a1..2a48ea3f1b30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-bufio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-bufio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-bufio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-bufio.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ struct dm_buffer {</div><div class='ctx'> 	void (*end_io)(struct dm_buffer *, blk_status_t);</div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='ctx'> #define MAX_STACK 10</div><div class='del'>-	struct stack_trace stack_trace;</div><div class='add'>+	unsigned int stack_len;</div><div class='ctx'> 	unsigned long stack_entries[MAX_STACK];</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -232,11 +232,7 @@ static DEFINE_MUTEX(dm_bufio_clients_lock);</div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='ctx'> static void buffer_record_stack(struct dm_buffer *b)</div><div class='ctx'> {</div><div class='del'>-	b-&gt;stack_trace.nr_entries = 0;</div><div class='del'>-	b-&gt;stack_trace.max_entries = MAX_STACK;</div><div class='del'>-	b-&gt;stack_trace.entries = b-&gt;stack_entries;</div><div class='del'>-	b-&gt;stack_trace.skip = 2;</div><div class='del'>-	save_stack_trace(&amp;b-&gt;stack_trace);</div><div class='add'>+	b-&gt;stack_len = stack_trace_save(b-&gt;stack_entries, MAX_STACK, 2);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -438,7 +434,7 @@ static struct dm_buffer *alloc_buffer(struct dm_bufio_client *c, gfp_t gfp_mask)</div><div class='ctx'> 	adjust_total_allocated(b-&gt;data_mode, (long)c-&gt;block_size);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='del'>-	memset(&amp;b-&gt;stack_trace, 0, sizeof(b-&gt;stack_trace));</div><div class='add'>+	b-&gt;stack_len = 0;</div><div class='ctx'> #endif</div><div class='ctx'> 	return b;</div><div class='ctx'> }</div><div class='hunk'>@@ -1520,8 +1516,9 @@ static void drop_buffers(struct dm_bufio_client *c)</div><div class='ctx'> 			DMERR("leaked buffer %llx, hold count %u, list %d",</div><div class='ctx'> 			      (unsigned long long)b-&gt;block, b-&gt;hold_count, i);</div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='del'>-			print_stack_trace(&amp;b-&gt;stack_trace, 1);</div><div class='del'>-			b-&gt;hold_count = 0; /* mark unclaimed to avoid BUG_ON below */</div><div class='add'>+			stack_trace_print(b-&gt;stack_entries, b-&gt;stack_len, 1);</div><div class='add'>+			/* mark unclaimed to avoid BUG_ON below */</div><div class='add'>+			b-&gt;hold_count = 0;</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h<br/>index 95c6d86ab5e8..c4ef1fceead6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-core.h</a></div><div class='hunk'>@@ -115,6 +115,7 @@ struct mapped_device {</div><div class='ctx'> 	struct srcu_struct io_barrier;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void disable_discard(struct mapped_device *md);</div><div class='ctx'> void disable_write_same(struct mapped_device *md);</div><div class='ctx'> void disable_write_zeroes(struct mapped_device *md);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c<br/>index dd6565798778..7f6462f74ac8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-crypt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-crypt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-crypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-crypt.c</a></div><div class='hunk'>@@ -332,7 +332,6 @@ static int crypt_iv_essiv_init(struct crypt_config *cc)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = essiv-&gt;hash_tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_shash_digest(desc, cc-&gt;key, cc-&gt;key_size, essiv-&gt;salt);</div><div class='ctx'> 	shash_desc_zero(desc);</div><div class='hunk'>@@ -606,7 +605,6 @@ static int crypt_iv_lmk_one(struct crypt_config *cc, u8 *iv,</div><div class='ctx'> 	int i, r;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = lmk-&gt;hash_tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	r = crypto_shash_init(desc);</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -768,7 +766,6 @@ static int crypt_iv_tcw_whitening(struct crypt_config *cc,</div><div class='ctx'> </div><div class='ctx'> 	/* calculate crc32 for every 32bit part and xor it */</div><div class='ctx'> 	desc-&gt;tfm = tcw-&gt;crc32_tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		r = crypto_shash_init(desc);</div><div class='ctx'> 		if (r)</div><div class='hunk'>@@ -1445,11 +1442,10 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='ctx'> 	struct bio_vec *bv;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bv, clone, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bv, clone, iter_all) {</div><div class='ctx'> 		BUG_ON(!bv-&gt;bv_page);</div><div class='ctx'> 		mempool_free(bv-&gt;bv_page, &amp;cc-&gt;page_pool);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h<br/>index 12b5216c2cfe..721efc493942 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-exception-store.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-exception-store.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-exception-store.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-exception-store.h</a></div><div class='hunk'>@@ -135,9 +135,8 @@ struct dm_dev *dm_snap_cow(struct dm_snapshot *snap);</div><div class='ctx'> /*</div><div class='ctx'>  * Funtions to manipulate consecutive chunks</div><div class='ctx'>  */</div><div class='del'>-#  if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64)</div><div class='del'>-#    define DM_CHUNK_CONSECUTIVE_BITS 8</div><div class='del'>-#    define DM_CHUNK_NUMBER_BITS 56</div><div class='add'>+#define DM_CHUNK_CONSECUTIVE_BITS 8</div><div class='add'>+#define DM_CHUNK_NUMBER_BITS 56</div><div class='ctx'> </div><div class='ctx'> static inline chunk_t dm_chunk_number(chunk_t chunk)</div><div class='ctx'> {</div><div class='hunk'>@@ -163,29 +162,6 @@ static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e)</div><div class='ctx'> 	e-&gt;new_chunk -= (1ULL &lt;&lt; DM_CHUNK_NUMBER_BITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#  else</div><div class='del'>-#    define DM_CHUNK_CONSECUTIVE_BITS 0</div><div class='del'>-</div><div class='del'>-static inline chunk_t dm_chunk_number(chunk_t chunk)</div><div class='del'>-{</div><div class='del'>-	return chunk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e)</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 dm_consecutive_chunk_count_inc(struct dm_exception *e)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#  endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Return the number of sectors in the device.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/md/dm-init.c b/drivers/md/dm-init.c<br/>index b53f30f16b4d..4b76f84424c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-init.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ struct dm_device {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *dm_allowed_targets[] __initconst = {</div><div class='add'>+const char * const dm_allowed_targets[] __initconst = {</div><div class='ctx'> 	"crypt",</div><div class='ctx'> 	"delay",</div><div class='ctx'> 	"linear",</div><div class='head'>diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c<br/>index d57d997a52c8..c27c32cf4a30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-integrity.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-integrity.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-integrity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-integrity.c</a></div><div class='hunk'>@@ -88,14 +88,10 @@ struct journal_entry {</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='ctx'> #define journal_entry_set_sector(je, x)		do { smp_wmb(); WRITE_ONCE((je)-&gt;u.sector, cpu_to_le64(x)); } while (0)</div><div class='del'>-#define journal_entry_get_sector(je)		le64_to_cpu((je)-&gt;u.sector)</div><div class='del'>-#elif defined(CONFIG_LBDAF)</div><div class='del'>-#define journal_entry_set_sector(je, x)		do { (je)-&gt;u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)-&gt;u.s.sector_hi, cpu_to_le32((x) &gt;&gt; 32)); } while (0)</div><div class='del'>-#define journal_entry_get_sector(je)		le64_to_cpu((je)-&gt;u.sector)</div><div class='ctx'> #else</div><div class='del'>-#define journal_entry_set_sector(je, x)		do { (je)-&gt;u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)-&gt;u.s.sector_hi, cpu_to_le32(0)); } while (0)</div><div class='del'>-#define journal_entry_get_sector(je)		le32_to_cpu((je)-&gt;u.s.sector_lo)</div><div class='add'>+#define journal_entry_set_sector(je, x)		do { (je)-&gt;u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)-&gt;u.s.sector_hi, cpu_to_le32((x) &gt;&gt; 32)); } while (0)</div><div class='ctx'> #endif</div><div class='add'>+#define journal_entry_get_sector(je)		le64_to_cpu((je)-&gt;u.sector)</div><div class='ctx'> #define journal_entry_is_unused(je)		((je)-&gt;u.s.sector_hi == cpu_to_le32(-1))</div><div class='ctx'> #define journal_entry_set_unused(je)		do { ((je)-&gt;u.s.sector_hi = cpu_to_le32(-1)); } while (0)</div><div class='ctx'> #define journal_entry_is_inprogress(je)		((je)-&gt;u.s.sector_hi == cpu_to_le32(-2))</div><div class='hunk'>@@ -532,7 +528,6 @@ static void section_mac(struct dm_integrity_c *ic, unsigned section, __u8 result</div><div class='ctx'> 	unsigned j, size;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = ic-&gt;journal_mac;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	r = crypto_shash_init(desc);</div><div class='ctx'> 	if (unlikely(r)) {</div><div class='hunk'>@@ -913,7 +908,7 @@ static void copy_from_journal(struct dm_integrity_c *ic, unsigned section, unsig</div><div class='ctx'> static bool ranges_overlap(struct dm_integrity_range *range1, struct dm_integrity_range *range2)</div><div class='ctx'> {</div><div class='ctx'> 	return range1-&gt;logical_sector &lt; range2-&gt;logical_sector + range2-&gt;n_sectors &amp;&amp;</div><div class='del'>-	       range2-&gt;logical_sector + range2-&gt;n_sectors &gt; range2-&gt;logical_sector;</div><div class='add'>+	       range1-&gt;logical_sector + range1-&gt;n_sectors &gt; range2-&gt;logical_sector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool add_new_range(struct dm_integrity_c *ic, struct dm_integrity_range *new_range, bool check_waiting)</div><div class='hunk'>@@ -959,8 +954,6 @@ static void remove_range_unlocked(struct dm_integrity_c *ic, struct dm_integrity</div><div class='ctx'> 		struct dm_integrity_range *last_range =</div><div class='ctx'> 			list_first_entry(&amp;ic-&gt;wait_list, struct dm_integrity_range, wait_entry);</div><div class='ctx'> 		struct task_struct *last_range_task;</div><div class='del'>-		if (!ranges_overlap(range, last_range))</div><div class='del'>-			break;</div><div class='ctx'> 		last_range_task = last_range-&gt;task;</div><div class='ctx'> 		list_del(&amp;last_range-&gt;wait_entry);</div><div class='ctx'> 		if (!add_new_range(ic, last_range, false)) {</div><div class='hunk'>@@ -1278,7 +1271,6 @@ static void integrity_sector_checksum(struct dm_integrity_c *ic, sector_t sector</div><div class='ctx'> 	unsigned digest_size;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;tfm = ic-&gt;internal_hash;</div><div class='del'>-	req-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	r = crypto_shash_init(req);</div><div class='ctx'> 	if (unlikely(r &lt; 0)) {</div><div class='hunk'>@@ -3185,7 +3177,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)</div><div class='ctx'> 			journal_watermark = val;</div><div class='ctx'> 		else if (sscanf(opt_string, "commit_time:%u%c", &amp;val, &amp;dummy) == 1)</div><div class='ctx'> 			sync_msec = val;</div><div class='del'>-		else if (!memcmp(opt_string, "meta_device:", strlen("meta_device:"))) {</div><div class='add'>+		else if (!strncmp(opt_string, "meta_device:", strlen("meta_device:"))) {</div><div class='ctx'> 			if (ic-&gt;meta_dev) {</div><div class='ctx'> 				dm_put_device(ti, ic-&gt;meta_dev);</div><div class='ctx'> 				ic-&gt;meta_dev = NULL;</div><div class='hunk'>@@ -3204,17 +3196,17 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)</div><div class='ctx'> 				goto bad;</div><div class='ctx'> 			}</div><div class='ctx'> 			ic-&gt;sectors_per_block = val &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-		} else if (!memcmp(opt_string, "internal_hash:", strlen("internal_hash:"))) {</div><div class='add'>+		} else if (!strncmp(opt_string, "internal_hash:", strlen("internal_hash:"))) {</div><div class='ctx'> 			r = get_alg_and_key(opt_string, &amp;ic-&gt;internal_hash_alg, &amp;ti-&gt;error,</div><div class='ctx'> 					    "Invalid internal_hash argument");</div><div class='ctx'> 			if (r)</div><div class='ctx'> 				goto bad;</div><div class='del'>-		} else if (!memcmp(opt_string, "journal_crypt:", strlen("journal_crypt:"))) {</div><div class='add'>+		} else if (!strncmp(opt_string, "journal_crypt:", strlen("journal_crypt:"))) {</div><div class='ctx'> 			r = get_alg_and_key(opt_string, &amp;ic-&gt;journal_crypt_alg, &amp;ti-&gt;error,</div><div class='ctx'> 					    "Invalid journal_crypt argument");</div><div class='ctx'> 			if (r)</div><div class='ctx'> 				goto bad;</div><div class='del'>-		} else if (!memcmp(opt_string, "journal_mac:", strlen("journal_mac:"))) {</div><div class='add'>+		} else if (!strncmp(opt_string, "journal_mac:", strlen("journal_mac:"))) {</div><div class='ctx'> 			r = get_alg_and_key(opt_string, &amp;ic-&gt;journal_mac_alg,  &amp;ti-&gt;error,</div><div class='ctx'> 					    "Invalid journal_mac argument");</div><div class='ctx'> 			if (r)</div><div class='hunk'>@@ -3616,7 +3608,7 @@ static struct target_type integrity_target = {</div><div class='ctx'> 	.io_hints		= dm_integrity_io_hints,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init dm_integrity_init(void)</div><div class='add'>+static int __init dm_integrity_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -3635,7 +3627,7 @@ int __init dm_integrity_init(void)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dm_integrity_exit(void)</div><div class='add'>+static void __exit dm_integrity_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	dm_unregister_target(&amp;integrity_target);</div><div class='ctx'> 	kmem_cache_destroy(journal_io_cache);</div><div class='head'>diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c<br/>index 09773636602d..b66745bd08bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-rq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-rq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-rq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-rq.c</a></div><div class='hunk'>@@ -222,11 +222,14 @@ static void dm_done(struct request *clone, blk_status_t error, bool mapped)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(error == BLK_STS_TARGET)) {</div><div class='del'>-		if (req_op(clone) == REQ_OP_WRITE_SAME &amp;&amp;</div><div class='del'>-		    !clone-&gt;q-&gt;limits.max_write_same_sectors)</div><div class='add'>+		if (req_op(clone) == REQ_OP_DISCARD &amp;&amp;</div><div class='add'>+		    !clone-&gt;q-&gt;limits.max_discard_sectors)</div><div class='add'>+			disable_discard(tio-&gt;md);</div><div class='add'>+		else if (req_op(clone) == REQ_OP_WRITE_SAME &amp;&amp;</div><div class='add'>+			 !clone-&gt;q-&gt;limits.max_write_same_sectors)</div><div class='ctx'> 			disable_write_same(tio-&gt;md);</div><div class='del'>-		if (req_op(clone) == REQ_OP_WRITE_ZEROES &amp;&amp;</div><div class='del'>-		    !clone-&gt;q-&gt;limits.max_write_zeroes_sectors)</div><div class='add'>+		else if (req_op(clone) == REQ_OP_WRITE_ZEROES &amp;&amp;</div><div class='add'>+			 !clone-&gt;q-&gt;limits.max_write_zeroes_sectors)</div><div class='ctx'> 			disable_write_zeroes(tio-&gt;md);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c<br/>index ba9481f1bf3c..cde3b49b2a91 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-table.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm-table.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm-table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm-table.c</a></div><div class='hunk'>@@ -1844,6 +1844,36 @@ static bool dm_table_supports_secure_erase(struct dm_table *t)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int device_requires_stable_pages(struct dm_target *ti,</div><div class='add'>+					struct dm_dev *dev, sector_t start,</div><div class='add'>+					sector_t len, void *data)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = bdev_get_queue(dev-&gt;bdev);</div><div class='add'>+</div><div class='add'>+	return q &amp;&amp; bdi_cap_stable_pages_required(q-&gt;backing_dev_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If any underlying device requires stable pages, a table must require</div><div class='add'>+ * them as well.  Only targets that support iterate_devices are considered:</div><div class='add'>+ * don't want error, zero, etc to require stable pages.</div><div class='add'>+ */</div><div class='add'>+static bool dm_table_requires_stable_pages(struct dm_table *t)</div><div class='add'>+{</div><div class='add'>+	struct dm_target *ti;</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dm_table_get_num_targets(t); i++) {</div><div class='add'>+		ti = dm_table_get_target(t, i);</div><div class='add'>+</div><div class='add'>+		if (ti-&gt;type-&gt;iterate_devices &amp;&amp;</div><div class='add'>+		    ti-&gt;type-&gt;iterate_devices(ti, device_requires_stable_pages, NULL))</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'> void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,</div><div class='ctx'> 			       struct queue_limits *limits)</div><div class='ctx'> {</div><div class='hunk'>@@ -1897,6 +1927,15 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,</div><div class='ctx'> 	dm_table_verify_integrity(t);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Some devices don't use blk_integrity but still want stable pages</div><div class='add'>+	 * because they do their own checksumming.</div><div class='add'>+	 */</div><div class='add'>+	if (dm_table_requires_stable_pages(t))</div><div class='add'>+		q-&gt;backing_dev_info-&gt;capabilities |= BDI_CAP_STABLE_WRITES;</div><div class='add'>+	else</div><div class='add'>+		q-&gt;backing_dev_info-&gt;capabilities &amp;= ~BDI_CAP_STABLE_WRITES;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Determine whether or not this queue's I/O timings contribute</div><div class='ctx'> 	 * to the entropy pool, Only request-based targets use this.</div><div class='ctx'> 	 * Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not</div><div class='head'>diff --git a/drivers/md/dm.c b/drivers/md/dm.c<br/>index 68d24056d0b1..043f0761e4a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/dm.c</a></div><div class='hunk'>@@ -945,6 +945,15 @@ static void dec_pending(struct dm_io *io, blk_status_t error)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void disable_discard(struct mapped_device *md)</div><div class='add'>+{</div><div class='add'>+	struct queue_limits *limits = dm_get_queue_limits(md);</div><div class='add'>+</div><div class='add'>+	/* device doesn't really support DISCARD, disable it */</div><div class='add'>+	limits-&gt;max_discard_sectors = 0;</div><div class='add'>+	blk_queue_flag_clear(QUEUE_FLAG_DISCARD, md-&gt;queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void disable_write_same(struct mapped_device *md)</div><div class='ctx'> {</div><div class='ctx'> 	struct queue_limits *limits = dm_get_queue_limits(md);</div><div class='hunk'>@@ -970,11 +979,14 @@ static void clone_endio(struct bio *bio)</div><div class='ctx'> 	dm_endio_fn endio = tio-&gt;ti-&gt;type-&gt;end_io;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(error == BLK_STS_TARGET) &amp;&amp; md-&gt;type != DM_TYPE_NVME_BIO_BASED) {</div><div class='del'>-		if (bio_op(bio) == REQ_OP_WRITE_SAME &amp;&amp;</div><div class='del'>-		    !bio-&gt;bi_disk-&gt;queue-&gt;limits.max_write_same_sectors)</div><div class='add'>+		if (bio_op(bio) == REQ_OP_DISCARD &amp;&amp;</div><div class='add'>+		    !bio-&gt;bi_disk-&gt;queue-&gt;limits.max_discard_sectors)</div><div class='add'>+			disable_discard(md);</div><div class='add'>+		else if (bio_op(bio) == REQ_OP_WRITE_SAME &amp;&amp;</div><div class='add'>+			 !bio-&gt;bi_disk-&gt;queue-&gt;limits.max_write_same_sectors)</div><div class='ctx'> 			disable_write_same(md);</div><div class='del'>-		if (bio_op(bio) == REQ_OP_WRITE_ZEROES &amp;&amp;</div><div class='del'>-		    !bio-&gt;bi_disk-&gt;queue-&gt;limits.max_write_zeroes_sectors)</div><div class='add'>+		else if (bio_op(bio) == REQ_OP_WRITE_ZEROES &amp;&amp;</div><div class='add'>+			 !bio-&gt;bi_disk-&gt;queue-&gt;limits.max_write_zeroes_sectors)</div><div class='ctx'> 			disable_write_zeroes(md);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1042,15 +1054,7 @@ int dm_set_target_max_io_len(struct dm_target *ti, sector_t len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * BIO based queue uses its own splitting. When multipage bvecs</div><div class='del'>-	 * is switched on, size of the incoming bio may be too big to</div><div class='del'>-	 * be handled in some targets, such as crypt.</div><div class='del'>-	 *</div><div class='del'>-	 * When these targets are ready for the big bio, we can remove</div><div class='del'>-	 * the limit.</div><div class='del'>-	 */</div><div class='del'>-	ti-&gt;max_io_len = min_t(uint32_t, len, BIO_MAX_PAGES * PAGE_SIZE);</div><div class='add'>+	ti-&gt;max_io_len = (uint32_t) len;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c<br/>index 1cd4f991792c..3a62a46b75c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/md-bitmap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/md-bitmap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/md-bitmap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/md-bitmap.c</a></div><div class='hunk'>@@ -490,10 +490,10 @@ void md_bitmap_print_sb(struct bitmap *bitmap)</div><div class='ctx'> 	pr_debug("         magic: %08x\n", le32_to_cpu(sb-&gt;magic));</div><div class='ctx'> 	pr_debug("       version: %d\n", le32_to_cpu(sb-&gt;version));</div><div class='ctx'> 	pr_debug("          uuid: %08x.%08x.%08x.%08x\n",</div><div class='del'>-		 le32_to_cpu(*(__u32 *)(sb-&gt;uuid+0)),</div><div class='del'>-		 le32_to_cpu(*(__u32 *)(sb-&gt;uuid+4)),</div><div class='del'>-		 le32_to_cpu(*(__u32 *)(sb-&gt;uuid+8)),</div><div class='del'>-		 le32_to_cpu(*(__u32 *)(sb-&gt;uuid+12)));</div><div class='add'>+		 le32_to_cpu(*(__le32 *)(sb-&gt;uuid+0)),</div><div class='add'>+		 le32_to_cpu(*(__le32 *)(sb-&gt;uuid+4)),</div><div class='add'>+		 le32_to_cpu(*(__le32 *)(sb-&gt;uuid+8)),</div><div class='add'>+		 le32_to_cpu(*(__le32 *)(sb-&gt;uuid+12)));</div><div class='ctx'> 	pr_debug("        events: %llu\n",</div><div class='ctx'> 		 (unsigned long long) le64_to_cpu(sb-&gt;events));</div><div class='ctx'> 	pr_debug("events cleared: %llu\n",</div><div class='head'>diff --git a/drivers/md/md.c b/drivers/md/md.c<br/>index 05ffffb8b769..45ffa23fa85d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/md.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/md.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/md.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/md.c</a></div><div class='hunk'>@@ -88,8 +88,7 @@ static struct kobj_type md_ktype;</div><div class='ctx'> </div><div class='ctx'> struct md_cluster_operations *md_cluster_ops;</div><div class='ctx'> EXPORT_SYMBOL(md_cluster_ops);</div><div class='del'>-struct module *md_cluster_mod;</div><div class='del'>-EXPORT_SYMBOL(md_cluster_mod);</div><div class='add'>+static struct module *md_cluster_mod;</div><div class='ctx'> </div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(resync_wait);</div><div class='ctx'> static struct workqueue_struct *md_wq;</div><div class='hunk'>@@ -132,24 +131,6 @@ static inline int speed_max(struct mddev *mddev)</div><div class='ctx'> 		mddev-&gt;sync_speed_max : sysctl_speed_limit_max;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void * flush_info_alloc(gfp_t gfp_flags, void *data)</div><div class='del'>-{</div><div class='del'>-        return kzalloc(sizeof(struct flush_info), gfp_flags);</div><div class='del'>-}</div><div class='del'>-static void flush_info_free(void *flush_info, void *data)</div><div class='del'>-{</div><div class='del'>-        kfree(flush_info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void * flush_bio_alloc(gfp_t gfp_flags, void *data)</div><div class='del'>-{</div><div class='del'>-	return kzalloc(sizeof(struct flush_bio), gfp_flags);</div><div class='del'>-}</div><div class='del'>-static void flush_bio_free(void *flush_bio, void *data)</div><div class='del'>-{</div><div class='del'>-	kfree(flush_bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct ctl_table_header *raid_table_header;</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table raid_table[] = {</div><div class='hunk'>@@ -423,54 +404,31 @@ static int md_congested(void *data, int bits)</div><div class='ctx'> /*</div><div class='ctx'>  * Generic flush handling for md</div><div class='ctx'>  */</div><div class='del'>-static void submit_flushes(struct work_struct *ws)</div><div class='del'>-{</div><div class='del'>-	struct flush_info *fi = container_of(ws, struct flush_info, flush_work);</div><div class='del'>-	struct mddev *mddev = fi-&gt;mddev;</div><div class='del'>-	struct bio *bio = fi-&gt;bio;</div><div class='del'>-</div><div class='del'>-	bio-&gt;bi_opf &amp;= ~REQ_PREFLUSH;</div><div class='del'>-	md_handle_request(mddev, bio);</div><div class='del'>-</div><div class='del'>-	mempool_free(fi, mddev-&gt;flush_pool);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void md_end_flush(struct bio *fbio)</div><div class='add'>+static void md_end_flush(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct flush_bio *fb = fbio-&gt;bi_private;</div><div class='del'>-	struct md_rdev *rdev = fb-&gt;rdev;</div><div class='del'>-	struct flush_info *fi = fb-&gt;fi;</div><div class='del'>-	struct bio *bio = fi-&gt;bio;</div><div class='del'>-	struct mddev *mddev = fi-&gt;mddev;</div><div class='add'>+	struct md_rdev *rdev = bio-&gt;bi_private;</div><div class='add'>+	struct mddev *mddev = rdev-&gt;mddev;</div><div class='ctx'> </div><div class='ctx'> 	rdev_dec_pending(rdev, mddev);</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_and_test(&amp;fi-&gt;flush_pending)) {</div><div class='del'>-		if (bio-&gt;bi_iter.bi_size == 0) {</div><div class='del'>-			/* an empty barrier - all done */</div><div class='del'>-			bio_endio(bio);</div><div class='del'>-			mempool_free(fi, mddev-&gt;flush_pool);</div><div class='del'>-		} else {</div><div class='del'>-			INIT_WORK(&amp;fi-&gt;flush_work, submit_flushes);</div><div class='del'>-			queue_work(md_wq, &amp;fi-&gt;flush_work);</div><div class='del'>-		}</div><div class='add'>+	if (atomic_dec_and_test(&amp;mddev-&gt;flush_pending)) {</div><div class='add'>+		/* The pre-request flush has finished */</div><div class='add'>+		queue_work(md_wq, &amp;mddev-&gt;flush_work);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mempool_free(fb, mddev-&gt;flush_bio_pool);</div><div class='del'>-	bio_put(fbio);</div><div class='add'>+	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void md_flush_request(struct mddev *mddev, struct bio *bio)</div><div class='add'>+static void md_submit_flush_data(struct work_struct *ws);</div><div class='add'>+</div><div class='add'>+static void submit_flushes(struct work_struct *ws)</div><div class='ctx'> {</div><div class='add'>+	struct mddev *mddev = container_of(ws, struct mddev, flush_work);</div><div class='ctx'> 	struct md_rdev *rdev;</div><div class='del'>-	struct flush_info *fi;</div><div class='del'>-</div><div class='del'>-	fi = mempool_alloc(mddev-&gt;flush_pool, GFP_NOIO);</div><div class='del'>-</div><div class='del'>-	fi-&gt;bio = bio;</div><div class='del'>-	fi-&gt;mddev = mddev;</div><div class='del'>-	atomic_set(&amp;fi-&gt;flush_pending, 1);</div><div class='ctx'> </div><div class='add'>+	mddev-&gt;start_flush = ktime_get_boottime();</div><div class='add'>+	INIT_WORK(&amp;mddev-&gt;flush_work, md_submit_flush_data);</div><div class='add'>+	atomic_set(&amp;mddev-&gt;flush_pending, 1);</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	rdev_for_each_rcu(rdev, mddev)</div><div class='ctx'> 		if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='hunk'>@@ -480,37 +438,74 @@ void md_flush_request(struct mddev *mddev, struct bio *bio)</div><div class='ctx'> 			 * we reclaim rcu_read_lock</div><div class='ctx'> 			 */</div><div class='ctx'> 			struct bio *bi;</div><div class='del'>-			struct flush_bio *fb;</div><div class='ctx'> 			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='ctx'> 			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='ctx'> 			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			fb = mempool_alloc(mddev-&gt;flush_bio_pool, GFP_NOIO);</div><div class='del'>-			fb-&gt;fi = fi;</div><div class='del'>-			fb-&gt;rdev = rdev;</div><div class='del'>-</div><div class='ctx'> 			bi = bio_alloc_mddev(GFP_NOIO, 0, mddev);</div><div class='del'>-			bio_set_dev(bi, rdev-&gt;bdev);</div><div class='ctx'> 			bi-&gt;bi_end_io = md_end_flush;</div><div class='del'>-			bi-&gt;bi_private = fb;</div><div class='add'>+			bi-&gt;bi_private = rdev;</div><div class='add'>+			bio_set_dev(bi, rdev-&gt;bdev);</div><div class='ctx'> 			bi-&gt;bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;</div><div class='del'>-</div><div class='del'>-			atomic_inc(&amp;fi-&gt;flush_pending);</div><div class='add'>+			atomic_inc(&amp;mddev-&gt;flush_pending);</div><div class='ctx'> 			submit_bio(bi);</div><div class='del'>-</div><div class='ctx'> 			rcu_read_lock();</div><div class='ctx'> 			rdev_dec_pending(rdev, mddev);</div><div class='ctx'> 		}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='add'>+	if (atomic_dec_and_test(&amp;mddev-&gt;flush_pending))</div><div class='add'>+		queue_work(md_wq, &amp;mddev-&gt;flush_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void md_submit_flush_data(struct work_struct *ws)</div><div class='add'>+{</div><div class='add'>+	struct mddev *mddev = container_of(ws, struct mddev, flush_work);</div><div class='add'>+	struct bio *bio = mddev-&gt;flush_bio;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * must reset flush_bio before calling into md_handle_request to avoid a</div><div class='add'>+	 * deadlock, because other bios passed md_handle_request suspend check</div><div class='add'>+	 * could wait for this and below md_handle_request could wait for those</div><div class='add'>+	 * bios because of suspend check</div><div class='add'>+	 */</div><div class='add'>+	mddev-&gt;last_flush = mddev-&gt;start_flush;</div><div class='add'>+	mddev-&gt;flush_bio = NULL;</div><div class='add'>+	wake_up(&amp;mddev-&gt;sb_wait);</div><div class='add'>+</div><div class='add'>+	if (bio-&gt;bi_iter.bi_size == 0) {</div><div class='add'>+		/* an empty barrier - all done */</div><div class='add'>+		bio_endio(bio);</div><div class='add'>+	} else {</div><div class='add'>+		bio-&gt;bi_opf &amp;= ~REQ_PREFLUSH;</div><div class='add'>+		md_handle_request(mddev, bio);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_and_test(&amp;fi-&gt;flush_pending)) {</div><div class='del'>-		if (bio-&gt;bi_iter.bi_size == 0) {</div><div class='add'>+void md_flush_request(struct mddev *mddev, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	ktime_t start = ktime_get_boottime();</div><div class='add'>+	spin_lock_irq(&amp;mddev-&gt;lock);</div><div class='add'>+	wait_event_lock_irq(mddev-&gt;sb_wait,</div><div class='add'>+			    !mddev-&gt;flush_bio ||</div><div class='add'>+			    ktime_after(mddev-&gt;last_flush, start),</div><div class='add'>+			    mddev-&gt;lock);</div><div class='add'>+	if (!ktime_after(mddev-&gt;last_flush, start)) {</div><div class='add'>+		WARN_ON(mddev-&gt;flush_bio);</div><div class='add'>+		mddev-&gt;flush_bio = bio;</div><div class='add'>+		bio = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;mddev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!bio) {</div><div class='add'>+		INIT_WORK(&amp;mddev-&gt;flush_work, submit_flushes);</div><div class='add'>+		queue_work(md_wq, &amp;mddev-&gt;flush_work);</div><div class='add'>+	} else {</div><div class='add'>+		/* flush was performed for some other bio while we waited. */</div><div class='add'>+		if (bio-&gt;bi_iter.bi_size == 0)</div><div class='ctx'> 			/* an empty barrier - all done */</div><div class='ctx'> 			bio_endio(bio);</div><div class='del'>-			mempool_free(fi, mddev-&gt;flush_pool);</div><div class='del'>-		} else {</div><div class='del'>-			INIT_WORK(&amp;fi-&gt;flush_work, submit_flushes);</div><div class='del'>-			queue_work(md_wq, &amp;fi-&gt;flush_work);</div><div class='add'>+		else {</div><div class='add'>+			bio-&gt;bi_opf &amp;= ~REQ_PREFLUSH;</div><div class='add'>+			mddev-&gt;pers-&gt;make_request(mddev, bio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -560,6 +555,7 @@ void mddev_init(struct mddev *mddev)</div><div class='ctx'> 	atomic_set(&amp;mddev-&gt;openers, 0);</div><div class='ctx'> 	atomic_set(&amp;mddev-&gt;active_io, 0);</div><div class='ctx'> 	spin_lock_init(&amp;mddev-&gt;lock);</div><div class='add'>+	atomic_set(&amp;mddev-&gt;flush_pending, 0);</div><div class='ctx'> 	init_waitqueue_head(&amp;mddev-&gt;sb_wait);</div><div class='ctx'> 	init_waitqueue_head(&amp;mddev-&gt;recovery_wait);</div><div class='ctx'> 	mddev-&gt;reshape_position = MaxSector;</div><div class='hunk'>@@ -1109,8 +1105,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor</div><div class='ctx'> 	 * (not needed for Linear and RAID0 as metadata doesn't</div><div class='ctx'> 	 * record this size)</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_LBDAF) &amp;&amp; (u64)rdev-&gt;sectors &gt;= (2ULL &lt;&lt; 32) &amp;&amp;</div><div class='del'>-	    sb-&gt;level &gt;= 1)</div><div class='add'>+	if ((u64)rdev-&gt;sectors &gt;= (2ULL &lt;&lt; 32) &amp;&amp; sb-&gt;level &gt;= 1)</div><div class='ctx'> 		rdev-&gt;sectors = (sector_t)(2ULL &lt;&lt; 32) - 2;</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;sectors &lt; ((sector_t)sb-&gt;size) * 2 &amp;&amp; sb-&gt;level &gt;= 1)</div><div class='hunk'>@@ -1408,8 +1403,7 @@ super_90_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors)</div><div class='ctx'> 	/* Limit to 4TB as metadata cannot record more than that.</div><div class='ctx'> 	 * 4TB == 2^32 KB, or 2*2^32 sectors.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_LBDAF) &amp;&amp; (u64)num_sectors &gt;= (2ULL &lt;&lt; 32) &amp;&amp;</div><div class='del'>-	    rdev-&gt;mddev-&gt;level &gt;= 1)</div><div class='add'>+	if ((u64)num_sectors &gt;= (2ULL &lt;&lt; 32) &amp;&amp; rdev-&gt;mddev-&gt;level &gt;= 1)</div><div class='ctx'> 		num_sectors = (sector_t)(2ULL &lt;&lt; 32) - 2;</div><div class='ctx'> 	do {</div><div class='ctx'> 		md_super_write(rdev-&gt;mddev, rdev, rdev-&gt;sb_start, rdev-&gt;sb_size,</div><div class='hunk'>@@ -1553,7 +1547,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_</div><div class='ctx'> 		 */</div><div class='ctx'> 		s32 offset;</div><div class='ctx'> 		sector_t bb_sector;</div><div class='del'>-		u64 *bbp;</div><div class='add'>+		__le64 *bbp;</div><div class='ctx'> 		int i;</div><div class='ctx'> 		int sectors = le16_to_cpu(sb-&gt;bblog_size);</div><div class='ctx'> 		if (sectors &gt; (PAGE_SIZE / 512))</div><div class='hunk'>@@ -1565,7 +1559,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_</div><div class='ctx'> 		if (!sync_page_io(rdev, bb_sector, sectors &lt;&lt; 9,</div><div class='ctx'> 				  rdev-&gt;bb_page, REQ_OP_READ, 0, true))</div><div class='ctx'> 			return -EIO;</div><div class='del'>-		bbp = (u64 *)page_address(rdev-&gt;bb_page);</div><div class='add'>+		bbp = (__le64 *)page_address(rdev-&gt;bb_page);</div><div class='ctx'> 		rdev-&gt;badblocks.shift = sb-&gt;bblog_shift;</div><div class='ctx'> 		for (i = 0 ; i &lt; (sectors &lt;&lt; (9-3)) ; i++, bbp++) {</div><div class='ctx'> 			u64 bb = le64_to_cpu(*bbp);</div><div class='hunk'>@@ -1877,7 +1871,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 		md_error(mddev, rdev);</div><div class='ctx'> 	else {</div><div class='ctx'> 		struct badblocks *bb = &amp;rdev-&gt;badblocks;</div><div class='del'>-		u64 *bbp = (u64 *)page_address(rdev-&gt;bb_page);</div><div class='add'>+		__le64 *bbp = (__le64 *)page_address(rdev-&gt;bb_page);</div><div class='ctx'> 		u64 *p = bb-&gt;page;</div><div class='ctx'> 		sb-&gt;feature_map |= cpu_to_le32(MD_FEATURE_BAD_BLOCKS);</div><div class='ctx'> 		if (bb-&gt;changed) {</div><div class='hunk'>@@ -2855,8 +2849,10 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (cmd_match(buf, "re-add")) {</div><div class='del'>-		if (test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp; (rdev-&gt;raid_disk == -1) &amp;&amp;</div><div class='del'>-			rdev-&gt;saved_raid_disk &gt;= 0) {</div><div class='add'>+		if (!rdev-&gt;mddev-&gt;pers)</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		else if (test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp; (rdev-&gt;raid_disk == -1) &amp;&amp;</div><div class='add'>+				rdev-&gt;saved_raid_disk &gt;= 0) {</div><div class='ctx'> 			/* clear_bit is performed _after_ all the devices</div><div class='ctx'> 			 * have their local Faulty bit cleared. If any writes</div><div class='ctx'> 			 * happen in the meantime in the local node, they</div><div class='hunk'>@@ -3384,10 +3380,10 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EACCES;</div><div class='del'>-	rv = mddev ? mddev_lock(mddev): -EBUSY;</div><div class='add'>+	rv = mddev ? mddev_lock(mddev) : -ENODEV;</div><div class='ctx'> 	if (!rv) {</div><div class='ctx'> 		if (rdev-&gt;mddev == NULL)</div><div class='del'>-			rv = -EBUSY;</div><div class='add'>+			rv = -ENODEV;</div><div class='ctx'> 		else</div><div class='ctx'> 			rv = entry-&gt;store(rdev, page, length);</div><div class='ctx'> 		mddev_unlock(mddev);</div><div class='hunk'>@@ -5511,22 +5507,6 @@ int md_run(struct mddev *mddev)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (mddev-&gt;flush_pool == NULL) {</div><div class='del'>-		mddev-&gt;flush_pool = mempool_create(NR_FLUSH_INFOS, flush_info_alloc,</div><div class='del'>-						flush_info_free, mddev);</div><div class='del'>-		if (!mddev-&gt;flush_pool) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (mddev-&gt;flush_bio_pool == NULL) {</div><div class='del'>-		mddev-&gt;flush_bio_pool = mempool_create(NR_FLUSH_BIOS, flush_bio_alloc,</div><div class='del'>-						flush_bio_free, mddev);</div><div class='del'>-		if (!mddev-&gt;flush_bio_pool) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;pers_lock);</div><div class='ctx'> 	pers = find_pers(mddev-&gt;level, mddev-&gt;clevel);</div><div class='hunk'>@@ -5686,11 +5666,8 @@ int md_run(struct mddev *mddev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> abort:</div><div class='del'>-	mempool_destroy(mddev-&gt;flush_bio_pool);</div><div class='del'>-	mddev-&gt;flush_bio_pool = NULL;</div><div class='del'>-	mempool_destroy(mddev-&gt;flush_pool);</div><div class='del'>-	mddev-&gt;flush_pool = NULL;</div><div class='del'>-</div><div class='add'>+	bioset_exit(&amp;mddev-&gt;bio_set);</div><div class='add'>+	bioset_exit(&amp;mddev-&gt;sync_set);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(md_run);</div><div class='hunk'>@@ -5894,14 +5871,6 @@ static void __md_stop(struct mddev *mddev)</div><div class='ctx'> 		mddev-&gt;to_remove = &amp;md_redundancy_group;</div><div class='ctx'> 	module_put(pers-&gt;owner);</div><div class='ctx'> 	clear_bit(MD_RECOVERY_FROZEN, &amp;mddev-&gt;recovery);</div><div class='del'>-	if (mddev-&gt;flush_bio_pool) {</div><div class='del'>-		mempool_destroy(mddev-&gt;flush_bio_pool);</div><div class='del'>-		mddev-&gt;flush_bio_pool = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (mddev-&gt;flush_pool) {</div><div class='del'>-		mempool_destroy(mddev-&gt;flush_pool);</div><div class='del'>-		mddev-&gt;flush_pool = NULL;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void md_stop(struct mddev *mddev)</div><div class='hunk'>@@ -9257,7 +9226,7 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 		 * reshape is happening in the remote node, we need to</div><div class='ctx'> 		 * update reshape_position and call start_reshape.</div><div class='ctx'> 		 */</div><div class='del'>-		mddev-&gt;reshape_position = sb-&gt;reshape_position;</div><div class='add'>+		mddev-&gt;reshape_position = le64_to_cpu(sb-&gt;reshape_position);</div><div class='ctx'> 		if (mddev-&gt;pers-&gt;update_reshape_pos)</div><div class='ctx'> 			mddev-&gt;pers-&gt;update_reshape_pos(mddev);</div><div class='ctx'> 		if (mddev-&gt;pers-&gt;start_reshape)</div><div class='head'>diff --git a/drivers/md/md.h b/drivers/md/md.h<br/>index c52afb52c776..257cb4c9e22b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/md.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/md.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/md.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/md.h</a></div><div class='hunk'>@@ -252,19 +252,6 @@ enum mddev_sb_flags {</div><div class='ctx'> 	MD_SB_NEED_REWRITE,	/* metadata write needs to be repeated */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NR_FLUSH_INFOS 8</div><div class='del'>-#define NR_FLUSH_BIOS 64</div><div class='del'>-struct flush_info {</div><div class='del'>-	struct bio			*bio;</div><div class='del'>-	struct mddev			*mddev;</div><div class='del'>-	struct work_struct		flush_work;</div><div class='del'>-	atomic_t			flush_pending;</div><div class='del'>-};</div><div class='del'>-struct flush_bio {</div><div class='del'>-	struct flush_info *fi;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mddev {</div><div class='ctx'> 	void				*private;</div><div class='ctx'> 	struct md_personality		*pers;</div><div class='hunk'>@@ -470,8 +457,16 @@ struct mddev {</div><div class='ctx'> 						   * metadata and bitmap writes</div><div class='ctx'> 						   */</div><div class='ctx'> </div><div class='del'>-	mempool_t			*flush_pool;</div><div class='del'>-	mempool_t			*flush_bio_pool;</div><div class='add'>+	/* Generic flush handling.</div><div class='add'>+	 * The last to finish preflush schedules a worker to submit</div><div class='add'>+	 * the rest of the request (without the REQ_PREFLUSH flag).</div><div class='add'>+	 */</div><div class='add'>+	struct bio *flush_bio;</div><div class='add'>+	atomic_t flush_pending;</div><div class='add'>+	ktime_t start_flush, last_flush; /* last_flush is when the last completed</div><div class='add'>+					  * flush was started.</div><div class='add'>+					  */</div><div class='add'>+	struct work_struct flush_work;</div><div class='ctx'> 	struct work_struct event_work;	/* used by dm to report failure event */</div><div class='ctx'> 	void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);</div><div class='ctx'> 	struct md_cluster_info		*cluster_info;</div><div class='head'>diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c<br/>index 3972232b8037..749ec268d957 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/persistent-data/dm-block-manager.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/persistent-data/dm-block-manager.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/persistent-data/dm-block-manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/persistent-data/dm-block-manager.c</a></div><div class='hunk'>@@ -35,7 +35,10 @@</div><div class='ctx'> #define MAX_HOLDERS 4</div><div class='ctx'> #define MAX_STACK 10</div><div class='ctx'> </div><div class='del'>-typedef unsigned long stack_entries[MAX_STACK];</div><div class='add'>+struct stack_store {</div><div class='add'>+	unsigned int	nr_entries;</div><div class='add'>+	unsigned long	entries[MAX_STACK];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct block_lock {</div><div class='ctx'> 	spinlock_t lock;</div><div class='hunk'>@@ -44,8 +47,7 @@ struct block_lock {</div><div class='ctx'> 	struct task_struct *holders[MAX_HOLDERS];</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='del'>-	struct stack_trace traces[MAX_HOLDERS];</div><div class='del'>-	stack_entries entries[MAX_HOLDERS];</div><div class='add'>+	struct stack_store traces[MAX_HOLDERS];</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +75,7 @@ static void __add_holder(struct block_lock *lock, struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned h = __find_holder(lock, NULL);</div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='del'>-	struct stack_trace *t;</div><div class='add'>+	struct stack_store *t;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	get_task_struct(task);</div><div class='hunk'>@@ -81,11 +83,7 @@ static void __add_holder(struct block_lock *lock, struct task_struct *task)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='ctx'> 	t = lock-&gt;traces + h;</div><div class='del'>-	t-&gt;nr_entries = 0;</div><div class='del'>-	t-&gt;max_entries = MAX_STACK;</div><div class='del'>-	t-&gt;entries = lock-&gt;entries[h];</div><div class='del'>-	t-&gt;skip = 2;</div><div class='del'>-	save_stack_trace(t);</div><div class='add'>+	t-&gt;nr_entries = stack_trace_save(t-&gt;entries, MAX_STACK, 2);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +104,8 @@ static int __check_holder(struct block_lock *lock)</div><div class='ctx'> 			DMERR("recursive lock detected in metadata");</div><div class='ctx'> #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING</div><div class='ctx'> 			DMERR("previously held here:");</div><div class='del'>-			print_stack_trace(lock-&gt;traces + i, 4);</div><div class='add'>+			stack_trace_print(lock-&gt;traces[i].entries,</div><div class='add'>+					  lock-&gt;traces[i].nr_entries, 4);</div><div class='ctx'> </div><div class='ctx'> 			DMERR("subsequent acquisition attempted here:");</div><div class='ctx'> 			dump_stack();</div><div class='head'>diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c<br/>index fdf451aac369..0c8a098d220e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/raid1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/raid1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/raid1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/raid1.c</a></div><div class='hunk'>@@ -2110,7 +2110,7 @@ static void process_checks(struct r1bio *r1_bio)</div><div class='ctx'> 		}</div><div class='ctx'> 	r1_bio-&gt;read_disk = primary;</div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='del'>-		int j;</div><div class='add'>+		int j = 0;</div><div class='ctx'> 		struct bio *pbio = r1_bio-&gt;bios[primary];</div><div class='ctx'> 		struct bio *sbio = r1_bio-&gt;bios[i];</div><div class='ctx'> 		blk_status_t status = sbio-&gt;bi_status;</div><div class='hunk'>@@ -2125,8 +2125,8 @@ static void process_checks(struct r1bio *r1_bio)</div><div class='ctx'> 		/* Now we can 'fixup' the error value */</div><div class='ctx'> 		sbio-&gt;bi_status = 0;</div><div class='ctx'> </div><div class='del'>-		bio_for_each_segment_all(bi, sbio, j, iter_all)</div><div class='del'>-			page_len[j] = bi-&gt;bv_len;</div><div class='add'>+		bio_for_each_segment_all(bi, sbio, iter_all)</div><div class='add'>+			page_len[j++] = bi-&gt;bv_len;</div><div class='ctx'> </div><div class='ctx'> 		if (!status) {</div><div class='ctx'> 			for (j = vcnt; j-- ; ) {</div><div class='head'>diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c<br/>index c033bfcb209e..7fde645d2e90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/raid5.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/md/raid5.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/md/raid5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/md/raid5.c</a></div><div class='hunk'>@@ -711,6 +711,8 @@ static bool is_full_stripe_write(struct stripe_head *sh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lock_two_stripes(struct stripe_head *sh1, struct stripe_head *sh2)</div><div class='add'>+		__acquires(&amp;sh1-&gt;stripe_lock)</div><div class='add'>+		__acquires(&amp;sh2-&gt;stripe_lock)</div><div class='ctx'> {</div><div class='ctx'> 	if (sh1 &gt; sh2) {</div><div class='ctx'> 		spin_lock_irq(&amp;sh2-&gt;stripe_lock);</div><div class='hunk'>@@ -722,6 +724,8 @@ static void lock_two_stripes(struct stripe_head *sh1, struct stripe_head *sh2)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void unlock_two_stripes(struct stripe_head *sh1, struct stripe_head *sh2)</div><div class='add'>+		__releases(&amp;sh1-&gt;stripe_lock)</div><div class='add'>+		__releases(&amp;sh2-&gt;stripe_lock)</div><div class='ctx'> {</div><div class='ctx'> 	spin_unlock(&amp;sh1-&gt;stripe_lock);</div><div class='ctx'> 	spin_unlock_irq(&amp;sh2-&gt;stripe_lock);</div><div class='hunk'>@@ -4187,7 +4191,7 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh,</div><div class='ctx'> 		/* now write out any block on a failed drive,</div><div class='ctx'> 		 * or P or Q if they were recomputed</div><div class='ctx'> 		 */</div><div class='del'>-		BUG_ON(s-&gt;uptodate &lt; disks - 1); /* We don't need Q to recover */</div><div class='add'>+		dev = NULL;</div><div class='ctx'> 		if (s-&gt;failed == 2) {</div><div class='ctx'> 			dev = &amp;sh-&gt;dev[s-&gt;failed_num[1]];</div><div class='ctx'> 			s-&gt;locked++;</div><div class='hunk'>@@ -4212,6 +4216,14 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh,</div><div class='ctx'> 			set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='ctx'> 			set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='ctx'> 		}</div><div class='add'>+		if (WARN_ONCE(dev &amp;&amp; !test_bit(R5_UPTODATE, &amp;dev-&gt;flags),</div><div class='add'>+			      "%s: disk%td not up to date\n",</div><div class='add'>+			      mdname(conf-&gt;mddev),</div><div class='add'>+			      dev - (struct r5dev *) &amp;sh-&gt;dev)) {</div><div class='add'>+			clear_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+			clear_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='add'>+			s-&gt;locked--;</div><div class='add'>+		}</div><div class='ctx'> 		clear_bit(STRIPE_DEGRADED, &amp;sh-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 		set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='hunk'>@@ -6166,6 +6178,8 @@ static int  retry_aligned_read(struct r5conf *conf, struct bio *raid_bio,</div><div class='ctx'> static int handle_active_stripes(struct r5conf *conf, int group,</div><div class='ctx'> 				 struct r5worker *worker,</div><div class='ctx'> 				 struct list_head *temp_inactive_list)</div><div class='add'>+		__releases(&amp;conf-&gt;device_lock)</div><div class='add'>+		__acquires(&amp;conf-&gt;device_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct stripe_head *batch[MAX_STRIPE_BATCH], *sh;</div><div class='ctx'> 	int i, batch_size = 0, hash;</div><div class='head'>diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig<br/>index 102eb35fcf3f..8efaf99243e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/Kconfig</a></div><div class='hunk'>@@ -31,14 +31,14 @@ comment "Multimedia core support"</div><div class='ctx'> #</div><div class='ctx'> config MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	bool "Cameras/video grabbers support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for webcams and video grabbers.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y when you have a webcam or a video capture grabber board.</div><div class='ctx'> </div><div class='ctx'> config MEDIA_ANALOG_TV_SUPPORT</div><div class='ctx'> 	bool "Analog TV support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable analog TV support.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y when you have a TV board with analog support or with a</div><div class='hunk'>@@ -50,7 +50,7 @@ config MEDIA_ANALOG_TV_SUPPORT</div><div class='ctx'> </div><div class='ctx'> config MEDIA_DIGITAL_TV_SUPPORT</div><div class='ctx'> 	bool "Digital TV support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable digital TV support.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y when you have a board with digital support or a board with</div><div class='hunk'>@@ -58,7 +58,7 @@ config MEDIA_DIGITAL_TV_SUPPORT</div><div class='ctx'> </div><div class='ctx'> config MEDIA_RADIO_SUPPORT</div><div class='ctx'> 	bool "AM/FM radio receivers/transmitters support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable AM/FM radio support.</div><div class='ctx'> </div><div class='ctx'> 	  Additional info and docs are available on the web at</div><div class='hunk'>@@ -72,14 +72,14 @@ config MEDIA_RADIO_SUPPORT</div><div class='ctx'> </div><div class='ctx'> config MEDIA_SDR_SUPPORT</div><div class='ctx'> 	bool "Software defined radio support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable software defined radio support.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y when you have a software defined radio device.</div><div class='ctx'> </div><div class='ctx'> config MEDIA_CEC_SUPPORT</div><div class='ctx'> 	bool "HDMI CEC support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for HDMI CEC (Consumer Electronics Control),</div><div class='ctx'> 	  which is an optional HDMI feature.</div><div class='ctx'> </div><div class='hunk'>@@ -96,7 +96,7 @@ source "drivers/media/cec/Kconfig"</div><div class='ctx'> config MEDIA_CONTROLLER</div><div class='ctx'> 	bool "Media Controller API"</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable the media controller API used to query media devices internal</div><div class='ctx'> 	  topology and configure it dynamically.</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +105,7 @@ config MEDIA_CONTROLLER</div><div class='ctx'> config MEDIA_CONTROLLER_DVB</div><div class='ctx'> 	bool "Enable Media controller for DVB (EXPERIMENTAL)"</div><div class='ctx'> 	depends on MEDIA_CONTROLLER &amp;&amp; DVB_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable the media controller API support for DVB.</div><div class='ctx'> </div><div class='ctx'> 	  This is currently experimental.</div><div class='hunk'>@@ -114,7 +114,7 @@ config MEDIA_CONTROLLER_REQUEST_API</div><div class='ctx'> 	bool "Enable Media controller Request API (EXPERIMENTAL)"</div><div class='ctx'> 	depends on MEDIA_CONTROLLER &amp;&amp; STAGING_MEDIA</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING.</div><div class='ctx'> </div><div class='ctx'> 	  This option enables the Request API for the Media controller and V4L2</div><div class='hunk'>@@ -137,7 +137,7 @@ config VIDEO_DEV</div><div class='ctx'> config VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	bool "V4L2 sub-device userspace API"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; MEDIA_CONTROLLER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables the V4L2 sub-device pad-level userspace API used to configure</div><div class='ctx'> 	  video format, size and frame rate between hardware blocks.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/Makefile b/drivers/media/Makefile<br/>index 985d35ec6b29..4a330d0e5e40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/Makefile</a></div><div class='hunk'>@@ -6,6 +6,12 @@</div><div class='ctx'> media-objs	:= media-device.o media-devnode.o media-entity.o \</div><div class='ctx'> 		   media-request.o</div><div class='ctx'> </div><div class='add'>+ifeq ($(CONFIG_MEDIA_CONTROLLER),y)</div><div class='add'>+	ifeq ($(CONFIG_USB),y)</div><div class='add'>+		media-objs += media-dev-allocator.o</div><div class='add'>+	endif</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # I2C drivers should come before other drivers, otherwise they'll fail</div><div class='ctx'> # when compiled as builtin drivers</div><div class='head'>diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig<br/>index 9c2b108c613a..b5aadacf335a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/cec/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/cec/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/cec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/cec/Kconfig</a></div><div class='hunk'>@@ -2,11 +2,11 @@ config MEDIA_CEC_RC</div><div class='ctx'> 	bool "HDMI CEC RC integration"</div><div class='ctx'> 	depends on CEC_CORE &amp;&amp; RC_CORE</div><div class='ctx'> 	depends on CEC_CORE=m || RC_CORE=y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Pass on CEC remote control messages to the RC framework.</div><div class='ctx'> </div><div class='ctx'> config CEC_PIN_ERROR_INJ</div><div class='ctx'> 	bool "Enable CEC error injection support"</div><div class='ctx'> 	depends on CEC_PIN &amp;&amp; DEBUG_FS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables CEC error injection using debugfs.</div><div class='head'>diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c<br/>index cc875dabd765..f5d1578e256a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/cec/cec-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/cec/cec-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/cec/cec-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/cec/cec-core.c</a></div><div class='hunk'>@@ -126,6 +126,7 @@ static int __must_check cec_devnode_register(struct cec_devnode *devnode,</div><div class='ctx'> 	/* Part 2: Initialize and register the character device */</div><div class='ctx'> 	cdev_init(&amp;devnode-&gt;cdev, &amp;cec_devnode_fops);</div><div class='ctx'> 	devnode-&gt;cdev.owner = owner;</div><div class='add'>+	kobject_set_name(&amp;devnode-&gt;cdev.kobj, "cec%d", devnode-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	ret = cdev_device_add(&amp;devnode-&gt;cdev, &amp;devnode-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/cec-notifier.c<br/>index dd2078b27a41..9598c7778871 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/cec/cec-notifier.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/cec/cec-notifier.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/cec/cec-notifier.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/cec/cec-notifier.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/cec.h&gt;</div><div class='ctx'> #include &lt;media/cec-notifier.h&gt;</div><div class='hunk'>@@ -127,3 +128,32 @@ void cec_notifier_unregister(struct cec_notifier *n)</div><div class='ctx'> 	cec_notifier_put(n);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cec_notifier_unregister);</div><div class='add'>+</div><div class='add'>+struct device *cec_notifier_parse_hdmi_phandle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *hdmi_pdev;</div><div class='add'>+	struct device *hdmi_dev = NULL;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = of_parse_phandle(dev-&gt;of_node, "hdmi-phandle", 0);</div><div class='add'>+</div><div class='add'>+	if (!np) {</div><div class='add'>+		dev_err(dev, "Failed to find HDMI node in device tree\n");</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+	hdmi_pdev = of_find_device_by_node(np);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (hdmi_pdev) {</div><div class='add'>+		hdmi_dev = &amp;hdmi_pdev-&gt;dev;</div><div class='add'>+		/*</div><div class='add'>+		 * Note that the device struct is only used as a key into the</div><div class='add'>+		 * cec_notifiers list, it is never actually accessed.</div><div class='add'>+		 * So we decrement the reference here so we don't leak</div><div class='add'>+		 * memory.</div><div class='add'>+		 */</div><div class='add'>+		put_device(hdmi_dev);</div><div class='add'>+		return hdmi_dev;</div><div class='add'>+	}</div><div class='add'>+	return ERR_PTR(-EPROBE_DEFER);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cec_notifier_parse_hdmi_phandle);</div><div class='head'>diff --git a/drivers/media/common/cx2341x.c b/drivers/media/common/cx2341x.c<br/>index 1dcc39b87bb7..121cda73ff88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/cx2341x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/cx2341x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/cx2341x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/common/cx2341x.c</a></div><div class='hunk'>@@ -1028,7 +1028,7 @@ static int cx2341x_api(void *priv, cx2341x_mbox_func func,</div><div class='ctx'> 	return func(priv, cmd, args, 0, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define NEQ(field) (old-&gt;field != new-&gt;field)</div><div class='add'>+#define CMP_FIELD(__old, __new, __field) (__old-&gt;__field != __new-&gt;__field)</div><div class='ctx'> </div><div class='ctx'> int cx2341x_update(void *priv, cx2341x_mbox_func func,</div><div class='ctx'> 		   const struct cx2341x_mpeg_params *old,</div><div class='hunk'>@@ -1042,20 +1042,22 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func,</div><div class='ctx'> 		11,	/* VCD */</div><div class='ctx'> 		12,	/* SVCD */</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	int err = 0;</div><div class='del'>-	int force = (old == NULL);</div><div class='del'>-	u16 temporal = new-&gt;video_temporal_filter;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 2, new-&gt;port, 0);</div><div class='ctx'> </div><div class='del'>-	if (force || NEQ(is_50hz)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, is_50hz)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1,</div><div class='ctx'> 				  new-&gt;is_50hz);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (force || NEQ(width) || NEQ(height) || NEQ(video_encoding)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, width) ||</div><div class='add'>+	    CMP_FIELD(old, new, height) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_encoding)) {</div><div class='ctx'> 		u16 w = new-&gt;width;</div><div class='ctx'> 		u16 h = new-&gt;height;</div><div class='ctx'> </div><div class='hunk'>@@ -1065,94 +1067,127 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func,</div><div class='ctx'> 		}</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_SIZE, 2,</div><div class='ctx'> 				  h, w);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(stream_type)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, stream_type)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_STREAM_TYPE, 1,</div><div class='ctx'> 				  mpeg_stream_type[new-&gt;stream_type]);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_aspect)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_aspect)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_ASPECT_RATIO, 1,</div><div class='ctx'> 				  1 + new-&gt;video_aspect);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_b_frames) || NEQ(video_gop_size)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_b_frames) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_gop_size)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_GOP_PROPERTIES, 2,</div><div class='del'>-				new-&gt;video_gop_size, new-&gt;video_b_frames + 1);</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  new-&gt;video_gop_size, new-&gt;video_b_frames + 1);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_gop_closure)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_gop_closure)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_GOP_CLOSURE, 1,</div><div class='ctx'> 				  new-&gt;video_gop_closure);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(audio_properties)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, audio_properties)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_AUDIO_PROPERTIES,</div><div class='ctx'> 				  1, new-&gt;audio_properties);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(audio_mute)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, audio_mute)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_MUTE_AUDIO, 1,</div><div class='ctx'> 				  new-&gt;audio_mute);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_bitrate_mode) || NEQ(video_bitrate) ||</div><div class='del'>-						NEQ(video_bitrate_peak)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_bitrate_mode) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_bitrate) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_bitrate_peak)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_BIT_RATE, 5,</div><div class='del'>-				new-&gt;video_bitrate_mode, new-&gt;video_bitrate,</div><div class='del'>-				new-&gt;video_bitrate_peak / 400, 0, 0);</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  new-&gt;video_bitrate_mode, new-&gt;video_bitrate,</div><div class='add'>+				  new-&gt;video_bitrate_peak / 400, 0, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_spatial_filter_mode) ||</div><div class='del'>-		     NEQ(video_temporal_filter_mode) ||</div><div class='del'>-		     NEQ(video_median_filter_type)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_spatial_filter_mode) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_temporal_filter_mode) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_median_filter_type)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_DNR_FILTER_MODE,</div><div class='del'>-				  2, new-&gt;video_spatial_filter_mode |</div><div class='add'>+				  2,</div><div class='add'>+				  new-&gt;video_spatial_filter_mode |</div><div class='ctx'> 					(new-&gt;video_temporal_filter_mode &lt;&lt; 1),</div><div class='del'>-				new-&gt;video_median_filter_type);</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  new-&gt;video_median_filter_type);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_luma_median_filter_bottom) ||</div><div class='del'>-		     NEQ(video_luma_median_filter_top) ||</div><div class='del'>-		     NEQ(video_chroma_median_filter_bottom) ||</div><div class='del'>-		     NEQ(video_chroma_median_filter_top)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_luma_median_filter_bottom) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_luma_median_filter_top) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_chroma_median_filter_bottom) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_chroma_median_filter_top)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_CORING_LEVELS, 4,</div><div class='del'>-				new-&gt;video_luma_median_filter_bottom,</div><div class='del'>-				new-&gt;video_luma_median_filter_top,</div><div class='del'>-				new-&gt;video_chroma_median_filter_bottom,</div><div class='del'>-				new-&gt;video_chroma_median_filter_top);</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  new-&gt;video_luma_median_filter_bottom,</div><div class='add'>+				  new-&gt;video_luma_median_filter_top,</div><div class='add'>+				  new-&gt;video_chroma_median_filter_bottom,</div><div class='add'>+				  new-&gt;video_chroma_median_filter_top);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_luma_spatial_filter_type) ||</div><div class='del'>-		     NEQ(video_chroma_spatial_filter_type)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_luma_spatial_filter_type) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_chroma_spatial_filter_type)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func,</div><div class='ctx'> 				  CX2341X_ENC_SET_SPATIAL_FILTER_TYPE,</div><div class='ctx'> 				  2, new-&gt;video_luma_spatial_filter_type,</div><div class='ctx'> 				  new-&gt;video_chroma_spatial_filter_type);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_spatial_filter) ||</div><div class='del'>-		     old-&gt;video_temporal_filter != temporal) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_spatial_filter) ||</div><div class='add'>+	    CMP_FIELD(old, new, video_temporal_filter)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_DNR_FILTER_PROPS,</div><div class='del'>-				  2, new-&gt;video_spatial_filter, temporal);</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  2, new-&gt;video_spatial_filter,</div><div class='add'>+				  new-&gt;video_temporal_filter);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_temporal_decimation)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_temporal_decimation)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_DROP_RATE,</div><div class='ctx'> 				  1, new-&gt;video_temporal_decimation);</div><div class='del'>-		if (err) return err;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(video_mute) ||</div><div class='del'>-		(new-&gt;video_mute &amp;&amp; NEQ(video_mute_yuv))) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, video_mute) ||</div><div class='add'>+	    (new-&gt;video_mute &amp;&amp; CMP_FIELD(old, new, video_mute_yuv))) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_MUTE_VIDEO, 1,</div><div class='del'>-				new-&gt;video_mute | (new-&gt;video_mute_yuv &lt;&lt; 8));</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  new-&gt;video_mute | (new-&gt;video_mute_yuv &lt;&lt; 8));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (force || NEQ(stream_insert_nav_packets)) {</div><div class='add'>+	if (!old ||</div><div class='add'>+	    CMP_FIELD(old, new, stream_insert_nav_packets)) {</div><div class='ctx'> 		err = cx2341x_api(priv, func, CX2341X_ENC_MISC, 2,</div><div class='del'>-				7, new-&gt;stream_insert_nav_packets);</div><div class='del'>-		if (err) return err;</div><div class='add'>+				  7, new-&gt;stream_insert_nav_packets);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig<br/>index 4bfbd5f463d1..577880b133eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/siano/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/siano/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/siano/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/common/siano/Kconfig</a></div><div class='hunk'>@@ -15,7 +15,7 @@ config SMS_SIANO_RC</div><div class='ctx'> 	depends on SMS_USB_DRV || SMS_SDIO_DRV</div><div class='ctx'> 	depends on MEDIA_COMMON_OPTIONS</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y to select Remote Controller support for Siano driver.</div><div class='ctx'> </div><div class='ctx'> config SMS_SIANO_DEBUGFS</div><div class='hunk'>@@ -24,7 +24,7 @@ config SMS_SIANO_DEBUGFS</div><div class='ctx'> 	depends on DEBUG_FS</div><div class='ctx'> 	depends on SMS_USB_DRV = SMS_SDIO_DRV</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y to enable visualizing a dump of the frontend</div><div class='ctx'> 	  statistics response packets via debugfs. Currently, works</div><div class='ctx'> 	  only with Siano USB devices.</div><div class='head'>diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c<br/>index 15b6b9c0a2e4..7ebd58a1c431 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/videobuf2/videobuf2-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/videobuf2/videobuf2-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/videobuf2/videobuf2-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/common/videobuf2/videobuf2-core.c</a></div><div class='hunk'>@@ -672,6 +672,11 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;waiting_in_dqbuf &amp;&amp; *count) {</div><div class='add'>+		dprintk(1, "another dup()ped fd is waiting for a buffer\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (*count == 0 || q-&gt;num_buffers != 0 ||</div><div class='ctx'> 	    (q-&gt;memory != VB2_MEMORY_UNKNOWN &amp;&amp; q-&gt;memory != memory)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -807,6 +812,10 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!q-&gt;num_buffers) {</div><div class='add'>+		if (q-&gt;waiting_in_dqbuf &amp;&amp; *count) {</div><div class='add'>+			dprintk(1, "another dup()ped fd is waiting for a buffer\n");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='ctx'> 		memset(q-&gt;alloc_devs, 0, sizeof(q-&gt;alloc_devs));</div><div class='ctx'> 		q-&gt;memory = memory;</div><div class='ctx'> 		q-&gt;waiting_for_buffers = !q-&gt;is_output;</div><div class='hunk'>@@ -915,8 +924,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(state != VB2_BUF_STATE_DONE &amp;&amp;</div><div class='ctx'> 		    state != VB2_BUF_STATE_ERROR &amp;&amp;</div><div class='del'>-		    state != VB2_BUF_STATE_QUEUED &amp;&amp;</div><div class='del'>-		    state != VB2_BUF_STATE_REQUEUEING))</div><div class='add'>+		    state != VB2_BUF_STATE_QUEUED))</div><div class='ctx'> 		state = VB2_BUF_STATE_ERROR;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='hunk'>@@ -929,8 +937,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)</div><div class='ctx'> 	dprintk(4, "done processing on buffer %d, state: %d\n",</div><div class='ctx'> 			vb-&gt;index, state);</div><div class='ctx'> </div><div class='del'>-	if (state != VB2_BUF_STATE_QUEUED &amp;&amp;</div><div class='del'>-	    state != VB2_BUF_STATE_REQUEUEING) {</div><div class='add'>+	if (state != VB2_BUF_STATE_QUEUED) {</div><div class='ctx'> 		/* sync buffers */</div><div class='ctx'> 		for (plane = 0; plane &lt; vb-&gt;num_planes; ++plane)</div><div class='ctx'> 			call_void_memop(vb, finish, vb-&gt;planes[plane].mem_priv);</div><div class='hunk'>@@ -938,8 +945,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;done_lock, flags);</div><div class='del'>-	if (state == VB2_BUF_STATE_QUEUED ||</div><div class='del'>-	    state == VB2_BUF_STATE_REQUEUEING) {</div><div class='add'>+	if (state == VB2_BUF_STATE_QUEUED) {</div><div class='ctx'> 		vb-&gt;state = VB2_BUF_STATE_QUEUED;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Add the buffer to the done buffers list */</div><div class='hunk'>@@ -949,8 +955,6 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)</div><div class='ctx'> 	atomic_dec(&amp;q-&gt;owned_by_drv_count);</div><div class='ctx'> </div><div class='ctx'> 	if (state != VB2_BUF_STATE_QUEUED &amp;&amp; vb-&gt;req_obj.req) {</div><div class='del'>-		/* This is not supported at the moment */</div><div class='del'>-		WARN_ON(state == VB2_BUF_STATE_REQUEUEING);</div><div class='ctx'> 		media_request_object_unbind(&amp;vb-&gt;req_obj);</div><div class='ctx'> 		media_request_object_put(&amp;vb-&gt;req_obj);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -962,10 +966,6 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case VB2_BUF_STATE_QUEUED:</div><div class='ctx'> 		return;</div><div class='del'>-	case VB2_BUF_STATE_REQUEUEING:</div><div class='del'>-		if (q-&gt;start_streaming_called)</div><div class='del'>-			__enqueue_in_driver(vb);</div><div class='del'>-		return;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Inform any processes that may be waiting for buffers */</div><div class='ctx'> 		wake_up(&amp;q-&gt;done_wq);</div><div class='hunk'>@@ -1516,6 +1516,12 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb,</div><div class='ctx'> </div><div class='ctx'> 	vb = q-&gt;bufs[index];</div><div class='ctx'> </div><div class='add'>+	if (!req &amp;&amp; vb-&gt;state != VB2_BUF_STATE_IN_REQUEST &amp;&amp;</div><div class='add'>+	    q-&gt;requires_requests) {</div><div class='add'>+		dprintk(1, "qbuf requires a request\n");</div><div class='add'>+		return -EBADR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((req &amp;&amp; q-&gt;uses_qbuf) ||</div><div class='ctx'> 	    (!req &amp;&amp; vb-&gt;state != VB2_BUF_STATE_IN_REQUEST &amp;&amp;</div><div class='ctx'> 	     q-&gt;uses_requests)) {</div><div class='hunk'>@@ -1659,6 +1665,11 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='add'>+		if (q-&gt;waiting_in_dqbuf) {</div><div class='add'>+			dprintk(1, "another dup()ped fd is waiting for a buffer\n");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!q-&gt;streaming) {</div><div class='ctx'> 			dprintk(1, "streaming off, will not wait for buffers\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1686,6 +1697,7 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		q-&gt;waiting_in_dqbuf = 1;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We are streaming and blocking, wait for another buffer to</div><div class='ctx'> 		 * become ready or for streamoff. Driver's lock is released to</div><div class='hunk'>@@ -1706,6 +1718,7 @@ static int __vb2_wait_for_done_vb(struct vb2_queue *q, int nonblocking)</div><div class='ctx'> 		 * the locks or return an error if one occurred.</div><div class='ctx'> 		 */</div><div class='ctx'> 		call_void_qop(q, wait_finish, q);</div><div class='add'>+		q-&gt;waiting_in_dqbuf = 0;</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dprintk(1, "sleep was interrupted\n");</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -2247,6 +2260,9 @@ int vb2_core_queue_init(struct vb2_queue *q)</div><div class='ctx'> 	    WARN_ON(!q-&gt;ops-&gt;buf_queue))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(q-&gt;requires_requests &amp;&amp; !q-&gt;supports_requests))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;queued_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;done_list);</div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;done_lock);</div><div class='hunk'>@@ -2585,6 +2601,12 @@ static size_t __vb2_perform_fileio(struct vb2_queue *q, char __user *data, size_</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;waiting_in_dqbuf) {</div><div class='add'>+		dprintk(3, "another dup()ped fd is %s\n",</div><div class='add'>+			read ? "reading" : "writing");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize emulator on first call.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c<br/>index d09dee20e421..fb9ac7696fc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/videobuf2/videobuf2-v4l2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/videobuf2/videobuf2-v4l2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/videobuf2/videobuf2-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/common/videobuf2/videobuf2-v4l2.c</a></div><div class='hunk'>@@ -122,9 +122,9 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * __init_v4l2_vb2_buffer() - initialize the v4l2_vb2_buffer struct</div><div class='add'>+ * __init_vb2_v4l2_buffer() - initialize the vb2_v4l2_buffer struct</div><div class='ctx'>  */</div><div class='del'>-static void __init_v4l2_vb2_buffer(struct vb2_buffer *vb)</div><div class='add'>+static void __init_vb2_v4l2_buffer(struct vb2_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);</div><div class='ctx'> </div><div class='hunk'>@@ -368,6 +368,12 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (!is_prepare &amp;&amp; (b-&gt;flags &amp; V4L2_BUF_FLAG_REQUEST_FD) &amp;&amp;</div><div class='add'>+	    vb-&gt;state != VB2_BUF_STATE_DEQUEUED) {</div><div class='add'>+		dprintk(1, "%s: buffer is not in dequeued state\n", opname);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!vb-&gt;prepared) {</div><div class='ctx'> 		/* Copy relevant information provided by the userspace */</div><div class='ctx'> 		memset(vbuf-&gt;planes, 0,</div><div class='hunk'>@@ -381,6 +387,10 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(b-&gt;flags &amp; V4L2_BUF_FLAG_REQUEST_FD)) {</div><div class='add'>+		if (q-&gt;requires_requests) {</div><div class='add'>+			dprintk(1, "%s: queue requires requests\n", opname);</div><div class='add'>+			return -EBADR;</div><div class='add'>+		}</div><div class='ctx'> 		if (q-&gt;uses_requests) {</div><div class='ctx'> 			dprintk(1, "%s: queue uses requests\n", opname);</div><div class='ctx'> 			return -EBUSY;</div><div class='hunk'>@@ -388,7 +398,7 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else if (!q-&gt;supports_requests) {</div><div class='ctx'> 		dprintk(1, "%s: queue does not support requests\n", opname);</div><div class='del'>-		return -EACCES;</div><div class='add'>+		return -EBADR;</div><div class='ctx'> 	} else if (q-&gt;uses_qbuf) {</div><div class='ctx'> 		dprintk(1, "%s: queue does not use requests\n", opname);</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -419,11 +429,6 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md</div><div class='ctx'> 		    !q-&gt;ops-&gt;buf_out_validate))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (vb-&gt;state != VB2_BUF_STATE_DEQUEUED) {</div><div class='del'>-		dprintk(1, "%s: buffer is not in dequeued state\n", opname);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (b-&gt;request_fd &lt; 0) {</div><div class='ctx'> 		dprintk(1, "%s: request_fd &lt; 0\n", opname);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -543,7 +548,6 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VB2_BUF_STATE_PREPARING:</div><div class='ctx'> 	case VB2_BUF_STATE_DEQUEUED:</div><div class='del'>-	case VB2_BUF_STATE_REQUEUEING:</div><div class='ctx'> 		/* nothing */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -592,7 +596,7 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, struct vb2_plane *planes)</div><div class='ctx'> </div><div class='ctx'> static const struct vb2_buf_ops v4l2_buf_ops = {</div><div class='ctx'> 	.verify_planes_array	= __verify_planes_array_core,</div><div class='del'>-	.init_buffer		= __init_v4l2_vb2_buffer,</div><div class='add'>+	.init_buffer		= __init_vb2_v4l2_buffer,</div><div class='ctx'> 	.fill_user_buffer	= __fill_v4l2_buffer,</div><div class='ctx'> 	.fill_vb2_buffer	= __fill_vb2_buffer,</div><div class='ctx'> 	.copy_timestamp		= __copy_timestamp,</div><div class='head'>diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c<br/>index 6dfbd5b05907..1c6659f7c394 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/videobuf2/videobuf2-vmalloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/common/videobuf2/videobuf2-vmalloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/common/videobuf2/videobuf2-vmalloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/common/videobuf2/videobuf2-vmalloc.c</a></div><div class='hunk'>@@ -46,17 +46,17 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;size = size;</div><div class='ctx'> 	buf-&gt;vaddr = vmalloc_user(buf-&gt;size);</div><div class='del'>-	buf-&gt;dma_dir = dma_dir;</div><div class='del'>-	buf-&gt;handler.refcount = &amp;buf-&gt;refcount;</div><div class='del'>-	buf-&gt;handler.put = vb2_vmalloc_put;</div><div class='del'>-	buf-&gt;handler.arg = buf;</div><div class='del'>-</div><div class='ctx'> 	if (!buf-&gt;vaddr) {</div><div class='ctx'> 		pr_debug("vmalloc of size %ld failed\n", buf-&gt;size);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	buf-&gt;dma_dir = dma_dir;</div><div class='add'>+	buf-&gt;handler.refcount = &amp;buf-&gt;refcount;</div><div class='add'>+	buf-&gt;handler.put = vb2_vmalloc_put;</div><div class='add'>+	buf-&gt;handler.arg = buf;</div><div class='add'>+</div><div class='ctx'> 	refcount_set(&amp;buf-&gt;refcount, 1);</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c<br/>index 4a5834a1c3b7..a3393cd4e584 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-core/dvbdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-core/dvbdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-core/dvbdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-core/dvbdev.c</a></div><div class='hunk'>@@ -526,7 +526,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,</div><div class='ctx'> 		dvb_media_device_free(dvbdev);</div><div class='ctx'> 		kfree(dvbdevfops);</div><div class='ctx'> 		kfree(dvbdev);</div><div class='del'>-		up_write(&amp;minor_rwsem);</div><div class='ctx'> 		mutex_unlock(&amp;dvbdev_register_lock);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb-frontends/as102_fe.c b/drivers/media/dvb-frontends/as102_fe.c<br/>index f59a102b0a64..9ba8f39fe310 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/as102_fe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/as102_fe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/as102_fe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/as102_fe.c</a></div><div class='hunk'>@@ -467,7 +467,7 @@ struct dvb_frontend *as102_attach(const char *name,</div><div class='ctx'> </div><div class='ctx'> 	/* init frontend callback ops */</div><div class='ctx'> 	memcpy(&amp;fe-&gt;ops, &amp;as102_fe_ops, sizeof(struct dvb_frontend_ops));</div><div class='del'>-	strncpy(fe-&gt;ops.info.name, name, sizeof(fe-&gt;ops.info.name));</div><div class='add'>+	strscpy(fe-&gt;ops.info.name, name, sizeof(fe-&gt;ops.info.name));</div><div class='ctx'> </div><div class='ctx'> 	return fe;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c<br/>index f8040f6def62..d869029ca87d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dib7000p.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dib7000p.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dib7000p.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/dib7000p.c</a></div><div class='hunk'>@@ -2774,7 +2774,8 @@ static struct dvb_frontend *dib7000p_init(struct i2c_adapter *i2c_adap, u8 i2c_a</div><div class='ctx'> 	dibx000_init_i2c_master(&amp;st-&gt;i2c_master, DIB7000P, st-&gt;i2c_adap, st-&gt;i2c_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* init 7090 tuner adapter */</div><div class='del'>-	strncpy(st-&gt;dib7090_tuner_adap.name, "DiB7090 tuner interface", sizeof(st-&gt;dib7090_tuner_adap.name));</div><div class='add'>+	strscpy(st-&gt;dib7090_tuner_adap.name, "DiB7090 tuner interface",</div><div class='add'>+		sizeof(st-&gt;dib7090_tuner_adap.name));</div><div class='ctx'> 	st-&gt;dib7090_tuner_adap.algo = &amp;dib7090_tuner_xfer_algo;</div><div class='ctx'> 	st-&gt;dib7090_tuner_adap.algo_data = NULL;</div><div class='ctx'> 	st-&gt;dib7090_tuner_adap.dev.parent = st-&gt;i2c_adap-&gt;dev.parent;</div><div class='head'>diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c<br/>index 85c429cce23e..564669338dc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dib8000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dib8000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dib8000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/dib8000.c</a></div><div class='hunk'>@@ -4458,8 +4458,8 @@ static struct dvb_frontend *dib8000_init(struct i2c_adapter *i2c_adap, u8 i2c_ad</div><div class='ctx'> 	dibx000_init_i2c_master(&amp;state-&gt;i2c_master, DIB8000, state-&gt;i2c.adap, state-&gt;i2c.addr);</div><div class='ctx'> </div><div class='ctx'> 	/* init 8096p tuner adapter */</div><div class='del'>-	strncpy(state-&gt;dib8096p_tuner_adap.name, "DiB8096P tuner interface",</div><div class='del'>-			sizeof(state-&gt;dib8096p_tuner_adap.name));</div><div class='add'>+	strscpy(state-&gt;dib8096p_tuner_adap.name, "DiB8096P tuner interface",</div><div class='add'>+		sizeof(state-&gt;dib8096p_tuner_adap.name));</div><div class='ctx'> 	state-&gt;dib8096p_tuner_adap.algo = &amp;dib8096p_tuner_xfer_algo;</div><div class='ctx'> 	state-&gt;dib8096p_tuner_adap.algo_data = NULL;</div><div class='ctx'> 	state-&gt;dib8096p_tuner_adap.dev.parent = state-&gt;i2c.adap-&gt;dev.parent;</div><div class='head'>diff --git a/drivers/media/dvb-frontends/dib9000.c b/drivers/media/dvb-frontends/dib9000.c<br/>index 1875da07c150..e7838926e6bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dib9000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dib9000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dib9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/dib9000.c</a></div><div class='hunk'>@@ -2521,7 +2521,8 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c</div><div class='ctx'> 	dibx000_init_i2c_master(&amp;st-&gt;i2c_master, DIB7000MC, st-&gt;i2c.i2c_adap, st-&gt;i2c.i2c_addr);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;tuner_adap.dev.parent = i2c_adap-&gt;dev.parent;</div><div class='del'>-	strncpy(st-&gt;tuner_adap.name, "DIB9000_FW TUNER ACCESS", sizeof(st-&gt;tuner_adap.name));</div><div class='add'>+	strscpy(st-&gt;tuner_adap.name, "DIB9000_FW TUNER ACCESS",</div><div class='add'>+		sizeof(st-&gt;tuner_adap.name));</div><div class='ctx'> 	st-&gt;tuner_adap.algo = &amp;dib9000_tuner_algo;</div><div class='ctx'> 	st-&gt;tuner_adap.algo_data = NULL;</div><div class='ctx'> 	i2c_set_adapdata(&amp;st-&gt;tuner_adap, st);</div><div class='hunk'>@@ -2529,7 +2530,8 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;component_bus.dev.parent = i2c_adap-&gt;dev.parent;</div><div class='del'>-	strncpy(st-&gt;component_bus.name, "DIB9000_FW COMPONENT BUS ACCESS", sizeof(st-&gt;component_bus.name));</div><div class='add'>+	strscpy(st-&gt;component_bus.name, "DIB9000_FW COMPONENT BUS ACCESS",</div><div class='add'>+		sizeof(st-&gt;component_bus.name));</div><div class='ctx'> 	st-&gt;component_bus.algo = &amp;dib9000_component_bus_algo;</div><div class='ctx'> 	st-&gt;component_bus.algo_data = NULL;</div><div class='ctx'> 	st-&gt;component_bus_speed = 340;</div><div class='head'>diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c<br/>index 0a5b15bee1d7..c597d6fc3046 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/drxd_hard.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/drxd_hard.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/drxd_hard.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/drxd_hard.c</a></div><div class='hunk'>@@ -2263,61 +2263,41 @@ static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> 		case DRX_CHANNEL_LOW:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_PRIO_LO;</div><div class='ctx'> 			status = Write16(state, EC_SB_REG_PRIOR__A, EC_SB_REG_PRIOR_LO, 0x0000);</div><div class='del'>-			if (status &lt; 0)</div><div class='del'>-				break;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DRX_CHANNEL_HIGH:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_PRIO_HI;</div><div class='ctx'> 			status = Write16(state, EC_SB_REG_PRIOR__A, EC_SB_REG_PRIOR_HI, 0x0000);</div><div class='del'>-			if (status &lt; 0)</div><div class='del'>-				break;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (p-&gt;code_rate_HP) {</div><div class='ctx'> 		case FEC_1_2:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_RATE_1_2;</div><div class='del'>-			if (state-&gt;type_A) {</div><div class='add'>+			if (state-&gt;type_A)</div><div class='ctx'> 				status = Write16(state, EC_VD_REG_SET_CODERATE__A, EC_VD_REG_SET_CODERATE_C1_2, 0x0000);</div><div class='del'>-				if (status &lt; 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			operationMode |= SC_RA_RAM_OP_AUTO_RATE__M;</div><div class='ctx'> 			/* fall through */</div><div class='ctx'> 		case FEC_2_3:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_RATE_2_3;</div><div class='del'>-			if (state-&gt;type_A) {</div><div class='add'>+			if (state-&gt;type_A)</div><div class='ctx'> 				status = Write16(state, EC_VD_REG_SET_CODERATE__A, EC_VD_REG_SET_CODERATE_C2_3, 0x0000);</div><div class='del'>-				if (status &lt; 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FEC_3_4:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_RATE_3_4;</div><div class='del'>-			if (state-&gt;type_A) {</div><div class='add'>+			if (state-&gt;type_A)</div><div class='ctx'> 				status = Write16(state, EC_VD_REG_SET_CODERATE__A, EC_VD_REG_SET_CODERATE_C3_4, 0x0000);</div><div class='del'>-				if (status &lt; 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FEC_5_6:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_RATE_5_6;</div><div class='del'>-			if (state-&gt;type_A) {</div><div class='add'>+			if (state-&gt;type_A)</div><div class='ctx'> 				status = Write16(state, EC_VD_REG_SET_CODERATE__A, EC_VD_REG_SET_CODERATE_C5_6, 0x0000);</div><div class='del'>-				if (status &lt; 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FEC_7_8:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_RATE_7_8;</div><div class='del'>-			if (state-&gt;type_A) {</div><div class='add'>+			if (state-&gt;type_A)</div><div class='ctx'> 				status = Write16(state, EC_VD_REG_SET_CODERATE__A, EC_VD_REG_SET_CODERATE_C7_8, 0x0000);</div><div class='del'>-				if (status &lt; 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (status &lt; 0)</div><div class='head'>diff --git a/drivers/media/dvb-frontends/dvb-pll.c b/drivers/media/dvb-frontends/dvb-pll.c<br/>index 29836c1a40e9..da1b48a18515 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dvb-pll.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/dvb-pll.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/dvb-pll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/dvb-pll.c</a></div><div class='hunk'>@@ -839,7 +839,7 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,</div><div class='ctx'> 	memcpy(&amp;fe-&gt;ops.tuner_ops, &amp;dvb_pll_tuner_ops,</div><div class='ctx'> 	       sizeof(struct dvb_tuner_ops));</div><div class='ctx'> </div><div class='del'>-	strncpy(fe-&gt;ops.tuner_ops.info.name, desc-&gt;name,</div><div class='add'>+	strscpy(fe-&gt;ops.tuner_ops.info.name, desc-&gt;name,</div><div class='ctx'> 		sizeof(fe-&gt;ops.tuner_ops.info.name));</div><div class='ctx'> </div><div class='ctx'> 	fe-&gt;ops.tuner_ops.info.frequency_min_hz = desc-&gt;min;</div><div class='head'>diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c<br/>index 123f2a33738b..b543e1c4c4f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/m88ds3103.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/m88ds3103.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/m88ds3103.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/m88ds3103.c</a></div><div class='hunk'>@@ -309,6 +309,9 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> 	u16 u16tmp;</div><div class='ctx'> 	u32 tuner_frequency_khz, target_mclk;</div><div class='ctx'> 	s32 s32tmp;</div><div class='add'>+	static const struct reg_sequence reset_buf[] = {</div><div class='add'>+		{0x07, 0x80}, {0x07, 0x00}</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev,</div><div class='ctx'> 		"delivery_system=%d modulation=%d frequency=%u symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",</div><div class='hunk'>@@ -321,11 +324,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reset */</div><div class='del'>-	ret = regmap_write(dev-&gt;regmap, 0x07, 0x80);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(dev-&gt;regmap, 0x07, 0x00);</div><div class='add'>+	ret = regmap_multi_reg_write(dev-&gt;regmap, reset_buf, 2);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -1470,7 +1469,7 @@ static int m88ds3103_probe(struct i2c_client *client,</div><div class='ctx'> 	/* create dvb_frontend */</div><div class='ctx'> 	memcpy(&amp;dev-&gt;fe.ops, &amp;m88ds3103_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	if (dev-&gt;chip_id == M88RS6000_CHIP_ID)</div><div class='del'>-		strncpy(dev-&gt;fe.ops.info.name, "Montage Technology M88RS6000",</div><div class='add'>+		strscpy(dev-&gt;fe.ops.info.name, "Montage Technology M88RS6000",</div><div class='ctx'> 			sizeof(dev-&gt;fe.ops.info.name));</div><div class='ctx'> 	if (!pdata-&gt;attach_in_use)</div><div class='ctx'> 		dev-&gt;fe.ops.release = NULL;</div><div class='head'>diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c<br/>index feacd8da421d..c9bcd2e95417 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/si2165.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/si2165.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/si2165.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/si2165.c</a></div><div class='hunk'>@@ -275,18 +275,20 @@ static u32 si2165_get_fe_clk(struct si2165_state *state)</div><div class='ctx'> </div><div class='ctx'> static int si2165_wait_init_done(struct si2165_state *state)</div><div class='ctx'> {</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 val = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; ++i) {</div><div class='del'>-		si2165_readreg8(state, REG_INIT_DONE, &amp;val);</div><div class='add'>+		ret = si2165_readreg8(state, REG_INIT_DONE, &amp;val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (val == 0x01)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		usleep_range(1000, 50000);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_err(&amp;state-&gt;client-&gt;dev, "init_done was not set\n");</div><div class='del'>-	return ret;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int si2165_upload_firmware_block(struct si2165_state *state,</div><div class='hunk'>@@ -1299,7 +1301,6 @@ MODULE_DEVICE_TABLE(i2c, si2165_id_table);</div><div class='ctx'> </div><div class='ctx'> static struct i2c_driver si2165_driver = {</div><div class='ctx'> 	.driver = {</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='ctx'> 		.name	= "si2165",</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= si2165_probe,</div><div class='head'>diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c<br/>index e5cd2cd414f4..0af9b335be12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/ts2020.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/dvb-frontends/ts2020.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/dvb-frontends/ts2020.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/dvb-frontends/ts2020.c</a></div><div class='hunk'>@@ -180,6 +180,9 @@ static int ts2020_set_tuner_rf(struct dvb_frontend *fe)</div><div class='ctx'> 	unsigned int utmp;</div><div class='ctx'> </div><div class='ctx'> 	ret = regmap_read(dev-&gt;regmap, 0x3d, &amp;utmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	utmp &amp;= 0x7f;</div><div class='ctx'> 	if (utmp &lt; 0x16)</div><div class='ctx'> 		utmp = 0xa1;</div><div class='head'>diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig<br/>index 6d32f8dcf83b..7793358ab8b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ config VIDEO_IR_I2C</div><div class='ctx'> 	tristate "I2C module for IR" if !MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	depends on I2C &amp;&amp; RC_CORE</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Most boards have an IR chip directly connected via GPIO. However,</div><div class='ctx'> 	  some video boards have the IR connected via I2C bus.</div><div class='ctx'> </div><div class='hunk'>@@ -29,7 +29,7 @@ comment "Audio decoders, processors and mixers"</div><div class='ctx'> config VIDEO_TVAUDIO</div><div class='ctx'> 	tristate "Simple audio decoder chips"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for several audio decoder chips found on some bt8xx boards:</div><div class='ctx'> 	  Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300,</div><div class='ctx'> 		   tea6320, tea6420, tda8425, ta8874z.</div><div class='hunk'>@@ -41,7 +41,7 @@ config VIDEO_TVAUDIO</div><div class='ctx'> config VIDEO_TDA7432</div><div class='ctx'> 	tristate "Philips TDA7432 audio processor"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for tda7432 audio decoder chip found on some bt8xx boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -50,7 +50,7 @@ config VIDEO_TDA7432</div><div class='ctx'> config VIDEO_TDA9840</div><div class='ctx'> 	tristate "Philips TDA9840 audio processor"</div><div class='ctx'> 	depends on I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for tda9840 audio decoder chip found on some Zoran boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -60,9 +60,10 @@ config VIDEO_TDA1997X</div><div class='ctx'> 	tristate "NXP TDA1997x HDMI receiver"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on SND_SOC</div><div class='del'>-	select SND_PCM</div><div class='ctx'> 	select HDMI</div><div class='del'>-	---help---</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select V4L2_FWNODE</div><div class='add'>+	help</div><div class='ctx'> 	  V4L2 subdevice driver for the NXP TDA1997x HDMI receivers.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -71,7 +72,7 @@ config VIDEO_TDA1997X</div><div class='ctx'> config VIDEO_TEA6415C</div><div class='ctx'> 	tristate "Philips TEA6415C audio processor"</div><div class='ctx'> 	depends on I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for tea6415c audio decoder chip found on some bt8xx boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -80,7 +81,7 @@ config VIDEO_TEA6415C</div><div class='ctx'> config VIDEO_TEA6420</div><div class='ctx'> 	tristate "Philips TEA6420 audio processor"</div><div class='ctx'> 	depends on I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for tea6420 audio decoder chip found on some bt8xx boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -89,7 +90,7 @@ config VIDEO_TEA6420</div><div class='ctx'> config VIDEO_MSP3400</div><div class='ctx'> 	tristate "Micronas MSP34xx audio decoders"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Micronas MSP34xx series of audio decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -98,7 +99,7 @@ config VIDEO_MSP3400</div><div class='ctx'> config VIDEO_CS3308</div><div class='ctx'> 	tristate "Cirrus Logic CS3308 audio ADC"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Cirrus Logic CS3308 High Performance 8-Channel</div><div class='ctx'> 	  Analog Volume Control</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +109,7 @@ config VIDEO_CS3308</div><div class='ctx'> config VIDEO_CS5345</div><div class='ctx'> 	tristate "Cirrus Logic CS5345 audio ADC"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Cirrus Logic CS5345 24-bit, 192 kHz</div><div class='ctx'> 	  stereo A/D converter.</div><div class='ctx'> </div><div class='hunk'>@@ -118,7 +119,7 @@ config VIDEO_CS5345</div><div class='ctx'> config VIDEO_CS53L32A</div><div class='ctx'> 	tristate "Cirrus Logic CS53L32A audio ADC"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Cirrus Logic CS53L32A low voltage</div><div class='ctx'> 	  stereo A/D converter.</div><div class='ctx'> </div><div class='hunk'>@@ -128,7 +129,7 @@ config VIDEO_CS53L32A</div><div class='ctx'> config VIDEO_TLV320AIC23B</div><div class='ctx'> 	tristate "Texas Instruments TLV320AIC23B audio codec"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Texas Instruments TLV320AIC23B audio codec.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -137,7 +138,7 @@ config VIDEO_TLV320AIC23B</div><div class='ctx'> config VIDEO_UDA1342</div><div class='ctx'> 	tristate "Philips UDA1342 audio codec"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips UDA1342 audio codec.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -146,7 +147,7 @@ config VIDEO_UDA1342</div><div class='ctx'> config VIDEO_WM8775</div><div class='ctx'> 	tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Wolfson Microelectronics WM8775 high</div><div class='ctx'> 	  performance stereo A/D Converter with a 4 channel input mixer.</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +157,7 @@ config VIDEO_WM8775</div><div class='ctx'> config VIDEO_WM8739</div><div class='ctx'> 	tristate "Wolfson Microelectronics WM8739 stereo audio ADC"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Wolfson Microelectronics WM8739</div><div class='ctx'> 	  stereo A/D Converter.</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +167,7 @@ config VIDEO_WM8739</div><div class='ctx'> config VIDEO_VP27SMPX</div><div class='ctx'> 	tristate "Panasonic VP27's internal MPX"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the internal MPX of the Panasonic VP27s tuner.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -200,7 +201,7 @@ comment "Video decoders"</div><div class='ctx'> config VIDEO_ADV7180</div><div class='ctx'> 	tristate "Analog Devices ADV7180 decoder"</div><div class='ctx'> 	depends on GPIOLIB &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices ADV7180 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -209,7 +210,7 @@ config VIDEO_ADV7180</div><div class='ctx'> config VIDEO_ADV7183</div><div class='ctx'> 	tristate "Analog Devices ADV7183 decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  V4l2 subdevice driver for the Analog Devices</div><div class='ctx'> 	  ADV7183 video decoder.</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +222,8 @@ config VIDEO_ADV748X</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	select REGMAP_I2C</div><div class='del'>-	---help---</div><div class='add'>+	select V4L2_FWNODE</div><div class='add'>+	help</div><div class='ctx'> 	  V4L2 subdevice driver for the Analog Devices</div><div class='ctx'> 	  ADV7481 and ADV7482 HDMI/Analog video decoders.</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +236,7 @@ config VIDEO_ADV7604</div><div class='ctx'> 	depends on GPIOLIB || COMPILE_TEST</div><div class='ctx'> 	select HDMI</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices ADV7604 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  This is a Analog Devices Component/Graphics Digitizer</div><div class='hunk'>@@ -247,7 +249,7 @@ config VIDEO_ADV7604_CEC</div><div class='ctx'> 	bool "Enable Analog Devices ADV7604 CEC support"</div><div class='ctx'> 	depends on VIDEO_ADV7604</div><div class='ctx'> 	select CEC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  When selected the adv7604 will support the optional</div><div class='ctx'> 	  HDMI CEC feature.</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +257,7 @@ config VIDEO_ADV7842</div><div class='ctx'> 	tristate "Analog Devices ADV7842 decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select HDMI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices ADV7842 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  This is a Analog Devices Component/Graphics/SD Digitizer</div><div class='hunk'>@@ -268,14 +270,14 @@ config VIDEO_ADV7842_CEC</div><div class='ctx'> 	bool "Enable Analog Devices ADV7842 CEC support"</div><div class='ctx'> 	depends on VIDEO_ADV7842</div><div class='ctx'> 	select CEC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  When selected the adv7842 will support the optional</div><div class='ctx'> 	  HDMI CEC feature.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_BT819</div><div class='ctx'> 	tristate "BT819A VideoStream decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for BT819A video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -284,7 +286,7 @@ config VIDEO_BT819</div><div class='ctx'> config VIDEO_BT856</div><div class='ctx'> 	tristate "BT856 VideoStream decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for BT856 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -293,7 +295,7 @@ config VIDEO_BT856</div><div class='ctx'> config VIDEO_BT866</div><div class='ctx'> 	tristate "BT866 VideoStream decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for BT866 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -302,7 +304,7 @@ config VIDEO_BT866</div><div class='ctx'> config VIDEO_KS0127</div><div class='ctx'> 	tristate "KS0127 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for KS0127 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  This chip is used on AverMedia AVS6EYES Zoran-based MJPEG</div><div class='hunk'>@@ -314,53 +316,16 @@ config VIDEO_KS0127</div><div class='ctx'> config VIDEO_ML86V7667</div><div class='ctx'> 	tristate "OKI ML86V7667 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the OKI Semiconductor ML86V7667 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called ml86v7667.</div><div class='ctx'> </div><div class='del'>-config VIDEO_AD5820</div><div class='del'>-	tristate "AD5820 lens voice coil support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='del'>-	---help---</div><div class='del'>-	  This is a driver for the AD5820 camera lens voice coil.</div><div class='del'>-	  It is used for example in Nokia N900 (RX-51).</div><div class='del'>-</div><div class='del'>-config VIDEO_AK7375</div><div class='del'>-	tristate "AK7375 lens voice coil support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='del'>-	depends on VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	help</div><div class='del'>-	  This is a driver for the AK7375 camera lens voice coil.</div><div class='del'>-	  AK7375 is a 12 bit DAC with 120mA output current sink</div><div class='del'>-	  capability. This is designed for linear control of</div><div class='del'>-	  voice coil motors, controlled via I2C serial interface.</div><div class='del'>-</div><div class='del'>-config VIDEO_DW9714</div><div class='del'>-	tristate "DW9714 lens voice coil support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='del'>-	depends on VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='del'>-	  This is a driver for the DW9714 camera lens voice coil.</div><div class='del'>-	  DW9714 is a 10 bit DAC with 120mA output current sink</div><div class='del'>-	  capability. This is designed for linear control of</div><div class='del'>-	  voice coil motors, controlled via I2C serial interface.</div><div class='del'>-</div><div class='del'>-config VIDEO_DW9807_VCM</div><div class='del'>-	tristate "DW9807 lens voice coil support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='del'>-	depends on VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='del'>-	  This is a driver for the DW9807 camera lens voice coil.</div><div class='del'>-	  DW9807 is a 10 bit DAC with 100mA output current sink</div><div class='del'>-	  capability. This is designed for linear control of</div><div class='del'>-	  voice coil motors, controlled via I2C serial interface.</div><div class='del'>-</div><div class='ctx'> config VIDEO_SAA7110</div><div class='ctx'> 	tristate "Philips SAA7110 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips SAA7110 video decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -369,7 +334,7 @@ config VIDEO_SAA7110</div><div class='ctx'> config VIDEO_SAA711X</div><div class='ctx'> 	tristate "Philips SAA7111/3/4/5 video decoders"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips SAA7111/3/4/5 video decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -380,7 +345,7 @@ config VIDEO_TC358743</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select HDMI</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Toshiba TC358743 HDMI to MIPI CSI-2 bridge.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -390,7 +355,7 @@ config VIDEO_TC358743_CEC</div><div class='ctx'> 	bool "Enable Toshiba TC358743 CEC support"</div><div class='ctx'> 	depends on VIDEO_TC358743</div><div class='ctx'> 	select CEC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  When selected the tc358743 will support the optional</div><div class='ctx'> 	  HDMI CEC feature.</div><div class='ctx'> </div><div class='hunk'>@@ -398,7 +363,7 @@ config VIDEO_TVP514X</div><div class='ctx'> 	tristate "Texas Instruments TVP514x video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the TI TVP5146/47</div><div class='ctx'> 	  decoder. It is currently working with the TI OMAP3 camera</div><div class='ctx'> 	  controller.</div><div class='hunk'>@@ -410,7 +375,7 @@ config VIDEO_TVP5150</div><div class='ctx'> 	tristate "Texas Instruments TVP5150 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Texas Instruments TVP5150 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -420,7 +385,7 @@ config VIDEO_TVP7002</div><div class='ctx'> 	tristate "Texas Instruments TVP7002 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Texas Instruments TVP7002 video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -429,7 +394,7 @@ config VIDEO_TVP7002</div><div class='ctx'> config VIDEO_TW2804</div><div class='ctx'> 	tristate "Techwell TW2804 multiple video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Techwell tw2804 multiple video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -438,7 +403,7 @@ config VIDEO_TW2804</div><div class='ctx'> config VIDEO_TW9903</div><div class='ctx'> 	tristate "Techwell TW9903 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Techwell tw9903 multi-standard video decoder</div><div class='ctx'> 	  with high quality down scaler.</div><div class='ctx'> </div><div class='hunk'>@@ -448,7 +413,7 @@ config VIDEO_TW9903</div><div class='ctx'> config VIDEO_TW9906</div><div class='ctx'> 	tristate "Techwell TW9906 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Techwell tw9906 enhanced multi-standard comb filter</div><div class='ctx'> 	  video decoder with YCbCr input support.</div><div class='ctx'> </div><div class='hunk'>@@ -458,7 +423,7 @@ config VIDEO_TW9906</div><div class='ctx'> config VIDEO_TW9910</div><div class='ctx'> 	tristate "Techwell TW9910 video decoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Techwell TW9910 NTSC/PAL/SECAM video decoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -467,7 +432,7 @@ config VIDEO_TW9910</div><div class='ctx'> config VIDEO_VPX3220</div><div class='ctx'> 	tristate "vpx3220a, vpx3216b &amp; vpx3214c video decoders"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for VPX322x video decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -478,7 +443,7 @@ comment "Video and audio decoders"</div><div class='ctx'> config VIDEO_SAA717X</div><div class='ctx'> 	tristate "Philips SAA7171/3/4 audio/video decoders"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips SAA7171/3/4 audio/video decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -491,7 +456,7 @@ comment "Video encoders"</div><div class='ctx'> config VIDEO_SAA7127</div><div class='ctx'> 	tristate "Philips SAA7127/9 digital video encoders"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips SAA7127/9 digital video encoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -500,7 +465,7 @@ config VIDEO_SAA7127</div><div class='ctx'> config VIDEO_SAA7185</div><div class='ctx'> 	tristate "Philips SAA7185 video encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips SAA7185 video encoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -509,7 +474,7 @@ config VIDEO_SAA7185</div><div class='ctx'> config VIDEO_ADV7170</div><div class='ctx'> 	tristate "Analog Devices ADV7170 video encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices ADV7170 video encoder driver</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -518,7 +483,7 @@ config VIDEO_ADV7170</div><div class='ctx'> config VIDEO_ADV7175</div><div class='ctx'> 	tristate "Analog Devices ADV7175 video encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices ADV7175 video encoder driver</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -546,7 +511,7 @@ config VIDEO_ADV7511</div><div class='ctx'> 	tristate "Analog Devices ADV7511 encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select HDMI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices ADV7511 video encoder.</div><div class='ctx'> </div><div class='ctx'> 	  This is a Analog Devices HDMI transmitter.</div><div class='hunk'>@@ -558,14 +523,14 @@ config VIDEO_ADV7511_CEC</div><div class='ctx'> 	bool "Enable Analog Devices ADV7511 CEC support"</div><div class='ctx'> 	depends on VIDEO_ADV7511</div><div class='ctx'> 	select CEC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  When selected the adv7511 will support the optional</div><div class='ctx'> 	  HDMI CEC feature.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_AD9389B</div><div class='ctx'> 	tristate "Analog Devices AD9389B encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Analog Devices AD9389B video encoder.</div><div class='ctx'> </div><div class='ctx'> 	  This is a Analog Devices HDMI transmitter.</div><div class='hunk'>@@ -582,7 +547,7 @@ config VIDEO_AK881X</div><div class='ctx'> config VIDEO_THS8200</div><div class='ctx'> 	tristate "Texas Instruments THS8200 video encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Texas Instruments THS8200 video encoder.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -612,7 +577,7 @@ config VIDEO_IMX258</div><div class='ctx'> 	tristate "Sony IMX258 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Sony</div><div class='ctx'> 	  IMX258 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -624,7 +589,7 @@ config VIDEO_IMX274</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select REGMAP_I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for the Sony IMX274</div><div class='ctx'> 	  CMOS image sensor.</div><div class='ctx'> </div><div class='hunk'>@@ -666,7 +631,7 @@ config VIDEO_OV2659</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV2659 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -678,7 +643,7 @@ config VIDEO_OV2680</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; MEDIA_CONTROLLER</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV2680 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -690,7 +655,7 @@ config VIDEO_OV2685</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; MEDIA_CONTROLLER</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV2685 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -703,7 +668,7 @@ config VIDEO_OV5640</div><div class='ctx'> 	depends on GPIOLIB &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Omnivision</div><div class='ctx'> 	  OV5640 camera sensor with a MIPI CSI-2 interface.</div><div class='ctx'> </div><div class='hunk'>@@ -713,7 +678,7 @@ config VIDEO_OV5645</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV5645 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -725,7 +690,7 @@ config VIDEO_OV5647</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV5647 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -736,7 +701,7 @@ config VIDEO_OV6650</div><div class='ctx'> 	tristate "OmniVision OV6650 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV6650 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -749,7 +714,7 @@ config VIDEO_OV5670</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	depends on MEDIA_CONTROLLER</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV5670 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -760,7 +725,7 @@ config VIDEO_OV5695</div><div class='ctx'> 	tristate "OmniVision OV5695 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV5695 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -784,7 +749,7 @@ config VIDEO_OV772X</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select REGMAP_SCCB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV772x camera.</div><div class='ctx'> </div><div class='hunk'>@@ -795,7 +760,7 @@ config VIDEO_OV7640</div><div class='ctx'> 	tristate "OmniVision OV7640 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV7640 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -807,7 +772,7 @@ config VIDEO_OV7670</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV7670 VGA camera.  It currently only works with the M88ALP01</div><div class='ctx'> 	  controller.</div><div class='hunk'>@@ -816,7 +781,7 @@ config VIDEO_OV7740</div><div class='ctx'> 	tristate "OmniVision OV7740 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV7740 VGA camera sensor.</div><div class='ctx'> </div><div class='hunk'>@@ -843,7 +808,7 @@ config VIDEO_OV9650</div><div class='ctx'> 	tristate "OmniVision OV9650/OV9652 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select REGMAP_SCCB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for the Omnivision</div><div class='ctx'> 	  OV9650 and OV9652 camera sensors.</div><div class='ctx'> </div><div class='hunk'>@@ -852,7 +817,7 @@ config VIDEO_OV13858</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the OmniVision</div><div class='ctx'> 	  OV13858 camera.</div><div class='ctx'> </div><div class='hunk'>@@ -860,7 +825,7 @@ config VIDEO_VS6624</div><div class='ctx'> 	tristate "ST VS6624 sensor support"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the ST VS6624</div><div class='ctx'> 	  camera.</div><div class='ctx'> </div><div class='hunk'>@@ -880,7 +845,7 @@ config VIDEO_MT9M032</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select VIDEO_APTINA_PLL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports MT9M032 camera sensors from Aptina, monochrome</div><div class='ctx'> 	  models only.</div><div class='ctx'> </div><div class='hunk'>@@ -897,7 +862,7 @@ config VIDEO_MT9P031</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select VIDEO_APTINA_PLL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Aptina</div><div class='ctx'> 	  (Micron) mt9p031 5 Mpixel camera.</div><div class='ctx'> </div><div class='hunk'>@@ -905,7 +870,7 @@ config VIDEO_MT9T001</div><div class='ctx'> 	tristate "Aptina MT9T001 support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Aptina</div><div class='ctx'> 	  (Micron) mt0t001 3 Mpixel camera.</div><div class='ctx'> </div><div class='hunk'>@@ -913,7 +878,7 @@ config VIDEO_MT9T112</div><div class='ctx'> 	tristate "Aptina MT9T111/MT9T112 support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Aptina</div><div class='ctx'> 	  (Micron) MT9T111 and MT9T112 3 Mpixel camera.</div><div class='ctx'> </div><div class='hunk'>@@ -924,7 +889,7 @@ config VIDEO_MT9V011</div><div class='ctx'> 	tristate "Micron mt9v011 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Micron</div><div class='ctx'> 	  mt0v011 1.3 Mpixel camera.  It currently only works with the</div><div class='ctx'> 	  em28xx driver.</div><div class='hunk'>@@ -935,7 +900,7 @@ config VIDEO_MT9V032</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 sensor driver for the Micron</div><div class='ctx'> 	  MT9V032 752x480 CMOS sensor.</div><div class='ctx'> </div><div class='hunk'>@@ -954,14 +919,14 @@ config VIDEO_SR030PC30</div><div class='ctx'> 	tristate "Siliconfile SR030PC30 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports SR030PC30 VGA camera from Siliconfile</div><div class='ctx'> </div><div class='ctx'> config VIDEO_NOON010PC30</div><div class='ctx'> 	tristate "Siliconfile NOON010PC30 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports NOON010PC30 CIF camera from Siliconfile</div><div class='ctx'> </div><div class='ctx'> source "drivers/media/i2c/m5mols/Kconfig"</div><div class='hunk'>@@ -981,7 +946,7 @@ config VIDEO_S5K6AA</div><div class='ctx'> 	tristate "Samsung S5K6AAFX sensor support"</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for Samsung S5K6AA(FX) 1.3M</div><div class='ctx'> 	  camera sensor with an embedded SoC image signal processor.</div><div class='ctx'> </div><div class='hunk'>@@ -989,7 +954,7 @@ config VIDEO_S5K6A3</div><div class='ctx'> 	tristate "Samsung S5K6A3 sensor support"</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for Samsung S5K6A3 raw</div><div class='ctx'> 	  camera sensor.</div><div class='ctx'> </div><div class='hunk'>@@ -997,7 +962,7 @@ config VIDEO_S5K4ECGX</div><div class='ctx'> 	tristate "Samsung S5K4ECGX sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for Samsung S5K4ECGX 5M</div><div class='ctx'> 	  camera sensor with an embedded SoC image signal processor.</div><div class='ctx'> </div><div class='hunk'>@@ -1005,7 +970,7 @@ config VIDEO_S5K5BAF</div><div class='ctx'> 	tristate "Samsung S5K5BAF sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for Samsung S5K5BAF 2M</div><div class='ctx'> 	  camera sensor with an embedded SoC image signal processor.</div><div class='ctx'> </div><div class='hunk'>@@ -1016,17 +981,56 @@ config VIDEO_S5C73M3</div><div class='ctx'> 	tristate "Samsung S5C73M3 sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; SPI &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 sensor driver for Samsung S5C73M3</div><div class='ctx'> 	  8 Mpixel camera.</div><div class='ctx'> </div><div class='add'>+comment "Lens drivers"</div><div class='add'>+</div><div class='add'>+config VIDEO_AD5820</div><div class='add'>+	tristate "AD5820 lens voice coil support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='add'>+	help</div><div class='add'>+	  This is a driver for the AD5820 camera lens voice coil.</div><div class='add'>+	  It is used for example in Nokia N900 (RX-51).</div><div class='add'>+</div><div class='add'>+config VIDEO_AK7375</div><div class='add'>+	tristate "AK7375 lens voice coil support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='add'>+	depends on VIDEO_V4L2_SUBDEV_API</div><div class='add'>+	help</div><div class='add'>+	  This is a driver for the AK7375 camera lens voice coil.</div><div class='add'>+	  AK7375 is a 12 bit DAC with 120mA output current sink</div><div class='add'>+	  capability. This is designed for linear control of</div><div class='add'>+	  voice coil motors, controlled via I2C serial interface.</div><div class='add'>+</div><div class='add'>+config VIDEO_DW9714</div><div class='add'>+	tristate "DW9714 lens voice coil support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='add'>+	depends on VIDEO_V4L2_SUBDEV_API</div><div class='add'>+	help</div><div class='add'>+	  This is a driver for the DW9714 camera lens voice coil.</div><div class='add'>+	  DW9714 is a 10 bit DAC with 120mA output current sink</div><div class='add'>+	  capability. This is designed for linear control of</div><div class='add'>+	  voice coil motors, controlled via I2C serial interface.</div><div class='add'>+</div><div class='add'>+config VIDEO_DW9807_VCM</div><div class='add'>+	tristate "DW9807 lens voice coil support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='add'>+	depends on VIDEO_V4L2_SUBDEV_API</div><div class='add'>+	help</div><div class='add'>+	  This is a driver for the DW9807 camera lens voice coil.</div><div class='add'>+	  DW9807 is a 10 bit DAC with 100mA output current sink</div><div class='add'>+	  capability. This is designed for linear control of</div><div class='add'>+	  voice coil motors, controlled via I2C serial interface.</div><div class='add'>+</div><div class='ctx'> comment "Flash devices"</div><div class='ctx'> </div><div class='ctx'> config VIDEO_ADP1653</div><div class='ctx'> 	tristate "ADP1653 flash support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for the ADP1653 flash controller. It is used for</div><div class='ctx'> 	  example in Nokia N900.</div><div class='ctx'> </div><div class='hunk'>@@ -1035,7 +1039,7 @@ config VIDEO_LM3560</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select REGMAP_I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for the lm3560 dual flash controllers. It controls</div><div class='ctx'> 	  flash, torch LEDs.</div><div class='ctx'> </div><div class='hunk'>@@ -1044,7 +1048,7 @@ config VIDEO_LM3646</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select REGMAP_I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for the lm3646 dual flash controllers. It controls</div><div class='ctx'> 	  flash, torch LEDs.</div><div class='ctx'> </div><div class='hunk'>@@ -1053,7 +1057,7 @@ comment "Video improvement chips"</div><div class='ctx'> config VIDEO_UPD64031A</div><div class='ctx'> 	tristate "NEC Electronics uPD64031A Ghost Reduction"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the NEC Electronics uPD64031A Ghost Reduction</div><div class='ctx'> 	  video chip. It is most often found in NTSC TV cards made for</div><div class='ctx'> 	  Japan and is used to reduce the 'ghosting' effect that can</div><div class='hunk'>@@ -1065,7 +1069,7 @@ config VIDEO_UPD64031A</div><div class='ctx'> config VIDEO_UPD64083</div><div class='ctx'> 	tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the NEC Electronics uPD64083 3-Dimensional Y/C</div><div class='ctx'> 	  separation video chip. It is used to improve the quality of</div><div class='ctx'> 	  the colors of a composite signal.</div><div class='hunk'>@@ -1079,7 +1083,7 @@ config VIDEO_SAA6752HS</div><div class='ctx'> 	tristate "Philips SAA6752HS MPEG-2 Audio/Video Encoder"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Philips SAA6752HS MPEG-2 video and MPEG-audio/AC-3</div><div class='ctx'> 	  audio encoder with multiplexer.</div><div class='ctx'> </div><div class='hunk'>@@ -1091,7 +1095,7 @@ comment "SDR tuner chips"</div><div class='ctx'> config SDR_MAX2175</div><div class='ctx'> 	tristate "Maxim 2175 RF to Bits tuner"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; MEDIA_SDR_SUPPORT &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Maxim 2175 tuner. It is an advanced analog/digital</div><div class='ctx'> 	  radio receiver with RF-to-Bits front-end designed for SDR solutions.</div><div class='ctx'> </div><div class='hunk'>@@ -1112,7 +1116,7 @@ config VIDEO_THS7303</div><div class='ctx'> config VIDEO_M52790</div><div class='ctx'> 	tristate "Mitsubishi M52790 A/V switch"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	 Support for the Mitsubishi M52790 A/V switch.</div><div class='ctx'> </div><div class='ctx'> 	 To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -1123,7 +1127,7 @@ config VIDEO_I2C</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	imply HWMON</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable the I2C transport video support which supports the</div><div class='ctx'> 	  following:</div><div class='ctx'> 	   * Panasonic AMG88xx Grid-Eye Sensors</div><div class='hunk'>@@ -1132,6 +1136,19 @@ config VIDEO_I2C</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called video-i2c</div><div class='ctx'> </div><div class='add'>+config VIDEO_ST_MIPID02</div><div class='add'>+	tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='add'>+	depends on MEDIA_CAMERA_SUPPORT</div><div class='add'>+	select V4L2_FWNODE</div><div class='add'>+	help</div><div class='add'>+	  Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge.</div><div class='add'>+	  It is used to allow usage of CSI-2 sensor with PARALLEL port</div><div class='add'>+	  controller.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called st-mipid02.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile<br/>index a64fca82e0c4..d8ad9dad495d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/Makefile</a></div><div class='hunk'>@@ -113,5 +113,6 @@ obj-$(CONFIG_VIDEO_IMX258)	+= imx258.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_IMX274)	+= imx274.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_IMX319)	+= imx319.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_IMX355)	+= imx355.o</div><div class='add'>+obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SDR_MAX2175) += max2175.o</div><div class='head'>diff --git a/drivers/media/i2c/cx25840/Kconfig b/drivers/media/i2c/cx25840/Kconfig<br/>index 451133ad41ff..f4b31d7cb440 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/cx25840/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/cx25840/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/cx25840/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/cx25840/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> config VIDEO_CX25840</div><div class='ctx'> 	tristate "Conexant CX2584x audio/video decoders"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the Conexant CX2584x audio/video decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/i2c/et8ek8/Kconfig b/drivers/media/i2c/et8ek8/Kconfig<br/>index 9fe409e95666..ab23b41bf353 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/et8ek8/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/et8ek8/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/et8ek8/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/et8ek8/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,6 @@ config VIDEO_ET8EK8</div><div class='ctx'> 	tristate "ET8EK8 camera sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for the Toshiba ET8EK8 5 MP camera sensor.</div><div class='ctx'> 	  It is used for example in Nokia N900 (RX-51).</div><div class='head'>diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c<br/>index 9857e151db46..83e9961b0505 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/imx214.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/imx214.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/imx214.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/imx214.c</a></div><div class='hunk'>@@ -588,12 +588,10 @@ static int imx214_set_format(struct v4l2_subdev *sd,</div><div class='ctx'> </div><div class='ctx'> 	__crop = __imx214_get_pad_crop(imx214, cfg, format-&gt;pad, format-&gt;which);</div><div class='ctx'> </div><div class='del'>-	if (format)</div><div class='del'>-		mode = v4l2_find_nearest_size(imx214_modes,</div><div class='del'>-				ARRAY_SIZE(imx214_modes), width, height,</div><div class='del'>-				format-&gt;format.width, format-&gt;format.height);</div><div class='del'>-	else</div><div class='del'>-		mode = &amp;imx214_modes[0];</div><div class='add'>+	mode = v4l2_find_nearest_size(imx214_modes,</div><div class='add'>+				      ARRAY_SIZE(imx214_modes), width, height,</div><div class='add'>+				      format-&gt;format.width,</div><div class='add'>+				      format-&gt;format.height);</div><div class='ctx'> </div><div class='ctx'> 	__crop-&gt;width = mode-&gt;width;</div><div class='ctx'> 	__crop-&gt;height = mode-&gt;height;</div><div class='head'>diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig<br/>index dc8c2505907e..be0bb3f1bc22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/m5mols/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/m5mols/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/m5mols/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/m5mols/Kconfig</a></div><div class='hunk'>@@ -2,5 +2,5 @@ config VIDEO_M5MOLS</div><div class='ctx'> 	tristate "Fujitsu M-5MOLS 8MP sensor support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Fujitsu M-5MOLS camera sensor with ISP</div><div class='head'>diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c<br/>index 799acce803fe..5ed2413eac8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov2659.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov2659.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov2659.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/ov2659.c</a></div><div class='hunk'>@@ -1117,8 +1117,10 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 		if (ov2659_formats[index].code == mf-&gt;code)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (index &lt; 0) {</div><div class='add'>+		index = 0;</div><div class='add'>+		mf-&gt;code = ov2659_formats[index].code;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mf-&gt;colorspace = V4L2_COLORSPACE_SRGB;</div><div class='ctx'> 	mf-&gt;field = V4L2_FIELD_NONE;</div><div class='hunk'>@@ -1130,7 +1132,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 		mf = v4l2_subdev_get_try_format(sd, cfg, fmt-&gt;pad);</div><div class='ctx'> 		*mf = fmt-&gt;format;</div><div class='ctx'> #else</div><div class='del'>-		return -ENOTTY;</div><div class='add'>+		ret = -ENOTTY;</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		s64 val;</div><div class='head'>diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c<br/>index c33fd584cb44..1b972e591b48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov6650.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov6650.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov6650.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/ov6650.c</a></div><div class='hunk'>@@ -804,15 +804,25 @@ static int ov6650_prog_dflt(struct i2c_client *client)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ov6650_video_probe(struct i2c_client *client)</div><div class='add'>+static int ov6650_video_probe(struct v4l2_subdev *sd)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='ctx'> 	struct ov6650 *priv = to_ov6650(client);</div><div class='ctx'> 	u8		pidh, pidl, midh, midl;</div><div class='ctx'> 	int		ret;</div><div class='ctx'> </div><div class='del'>-	ret = ov6650_s_power(&amp;priv-&gt;subdev, 1);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	priv-&gt;clk = v4l2_clk_get(&amp;client-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(priv-&gt;clk)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;clk);</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "v4l2_clk request err: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ov6650_s_power(sd, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto eclkput;</div><div class='add'>+</div><div class='add'>+	msleep(20);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * check and show product ID and manufacturer ID</div><div class='hunk'>@@ -846,7 +856,12 @@ static int ov6650_video_probe(struct i2c_client *client)</div><div class='ctx'> 		ret = v4l2_ctrl_handler_setup(&amp;priv-&gt;hdl);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	ov6650_s_power(&amp;priv-&gt;subdev, 0);</div><div class='add'>+	ov6650_s_power(sd, 0);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+eclkput:</div><div class='add'>+	v4l2_clk_put(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -929,6 +944,10 @@ static const struct v4l2_subdev_ops ov6650_subdev_ops = {</div><div class='ctx'> 	.pad	= &amp;ov6650_pad_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct v4l2_subdev_internal_ops ov6650_internal_ops = {</div><div class='add'>+	.registered = ov6650_video_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * i2c_driver function</div><div class='ctx'>  */</div><div class='hunk'>@@ -989,18 +1008,12 @@ static int ov6650_probe(struct i2c_client *client,</div><div class='ctx'> 	priv-&gt;code	  = MEDIA_BUS_FMT_YUYV8_2X8;</div><div class='ctx'> 	priv-&gt;colorspace  = V4L2_COLORSPACE_JPEG;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk = v4l2_clk_get(&amp;client-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(priv-&gt;clk)) {</div><div class='del'>-		ret = PTR_ERR(priv-&gt;clk);</div><div class='del'>-		goto eclkget;</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;subdev.internal_ops = &amp;ov6650_internal_ops;</div><div class='add'>+	priv-&gt;subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;</div><div class='ctx'> </div><div class='del'>-	ret = ov6650_video_probe(client);</div><div class='del'>-	if (ret) {</div><div class='del'>-		v4l2_clk_put(priv-&gt;clk);</div><div class='del'>-eclkget:</div><div class='add'>+	ret = v4l2_async_register_subdev(&amp;priv-&gt;subdev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		v4l2_ctrl_handler_free(&amp;priv-&gt;hdl);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1010,7 +1023,7 @@ static int ov6650_remove(struct i2c_client *client)</div><div class='ctx'> 	struct ov6650 *priv = to_ov6650(client);</div><div class='ctx'> </div><div class='ctx'> 	v4l2_clk_put(priv-&gt;clk);</div><div class='del'>-	v4l2_device_unregister_subdev(&amp;priv-&gt;subdev);</div><div class='add'>+	v4l2_async_unregister_subdev(&amp;priv-&gt;subdev);</div><div class='ctx'> 	v4l2_ctrl_handler_free(&amp;priv-&gt;hdl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c<br/>index a7d26b294eb5..44c3eed8a858 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov7670.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov7670.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov7670.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/ov7670.c</a></div><div class='hunk'>@@ -864,7 +864,15 @@ static int ov7675_set_framerate(struct v4l2_subdev *sd,</div><div class='ctx'> 	/* Recalculate frame rate */</div><div class='ctx'> 	ov7675_get_framerate(sd, tpf);</div><div class='ctx'> </div><div class='del'>-	return ov7675_apply_framerate(sd);</div><div class='add'>+	/*</div><div class='add'>+	 * If the device is not powered up by the host driver do</div><div class='add'>+	 * not apply any changes to H/W at this time. Instead</div><div class='add'>+	 * the framerate will be restored right after power-up.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;on)</div><div class='add'>+		return ov7675_apply_framerate(sd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ov7670_get_framerate_legacy(struct v4l2_subdev *sd,</div><div class='hunk'>@@ -895,7 +903,16 @@ static int ov7670_set_framerate_legacy(struct v4l2_subdev *sd,</div><div class='ctx'> 	info-&gt;clkrc = (info-&gt;clkrc &amp; 0x80) | div;</div><div class='ctx'> 	tpf-&gt;numerator = 1;</div><div class='ctx'> 	tpf-&gt;denominator = info-&gt;clock_speed / div;</div><div class='del'>-	return ov7670_write(sd, REG_CLKRC, info-&gt;clkrc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the device is not powered up by the host driver do</div><div class='add'>+	 * not apply any changes to H/W at this time. Instead</div><div class='add'>+	 * the framerate will be restored right after power-up.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;on)</div><div class='add'>+		return ov7670_write(sd, REG_CLKRC, info-&gt;clkrc);</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'>@@ -1105,9 +1122,13 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = ov7670_apply_fmt(sd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * If the device is not powered up by the host driver do</div><div class='add'>+	 * not apply any changes to H/W at this time. Instead</div><div class='add'>+	 * the frame format will be restored right after power-up.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;on)</div><div class='add'>+		return ov7670_apply_fmt(sd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1664,6 +1685,7 @@ static int ov7670_s_power(struct v4l2_subdev *sd, int on)</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		ov7670_power_on (sd);</div><div class='add'>+		ov7670_init(sd, 0);</div><div class='ctx'> 		ov7670_apply_fmt(sd);</div><div class='ctx'> 		ov7675_apply_framerate(sd);</div><div class='ctx'> 		v4l2_ctrl_handler_setup(&amp;info-&gt;hdl);</div><div class='head'>diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c<br/>index dfece91ce96b..54e80a60aa57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov7740.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/ov7740.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/ov7740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/ov7740.c</a></div><div class='hunk'>@@ -448,6 +448,27 @@ static int ov7740_get_gain(struct ov7740 *ov7740, struct v4l2_ctrl *ctrl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ov7740_get_exp(struct ov7740 *ov7740, struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = ov7740-&gt;regmap;</div><div class='add'>+	unsigned int value0, value1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ctrl-&gt;val == V4L2_EXPOSURE_MANUAL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, REG_AEC, &amp;value0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_read(regmap, REG_HAEC, &amp;value1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ov7740-&gt;exposure-&gt;val = (value1 &lt;&lt; 8) | (value0 &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ov7740_set_exp(struct regmap *regmap, int value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -494,6 +515,9 @@ static int ov7740_get_volatile_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> 	case V4L2_CID_AUTOGAIN:</div><div class='ctx'> 		ret = ov7740_get_gain(ov7740, ctrl);</div><div class='ctx'> 		break;</div><div class='add'>+	case V4L2_CID_EXPOSURE_AUTO:</div><div class='add'>+		ret = ov7740_get_exp(ov7740, ctrl);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -991,8 +1015,6 @@ static int ov7740_init_controls(struct ov7740 *ov7740)</div><div class='ctx'> </div><div class='ctx'> 	ov7740-&gt;exposure = v4l2_ctrl_new_std(ctrl_hdlr, &amp;ov7740_ctrl_ops,</div><div class='ctx'> 					   V4L2_CID_EXPOSURE, 0, 65535, 1, 500);</div><div class='del'>-	if (ov7740-&gt;exposure)</div><div class='del'>-		ov7740-&gt;exposure-&gt;flags |= V4L2_CTRL_FLAG_VOLATILE;</div><div class='ctx'> </div><div class='ctx'> 	ov7740-&gt;auto_exposure = v4l2_ctrl_new_std_menu(ctrl_hdlr,</div><div class='ctx'> 					&amp;ov7740_ctrl_ops,</div><div class='hunk'>@@ -1003,7 +1025,7 @@ static int ov7740_init_controls(struct ov7740 *ov7740)</div><div class='ctx'> 	v4l2_ctrl_auto_cluster(3, &amp;ov7740-&gt;auto_wb, 0, false);</div><div class='ctx'> 	v4l2_ctrl_auto_cluster(2, &amp;ov7740-&gt;auto_gain, 0, true);</div><div class='ctx'> 	v4l2_ctrl_auto_cluster(2, &amp;ov7740-&gt;auto_exposure,</div><div class='del'>-			       V4L2_EXPOSURE_MANUAL, false);</div><div class='add'>+			       V4L2_EXPOSURE_MANUAL, true);</div><div class='ctx'> 	v4l2_ctrl_cluster(2, &amp;ov7740-&gt;hflip);</div><div class='ctx'> </div><div class='ctx'> 	if (ctrl_hdlr-&gt;error) {</div><div class='head'>diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig<br/>index f59718d8e51e..26b54f2aa95b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/smiapp/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/i2c/smiapp/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/smiapp/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/smiapp/Kconfig</a></div><div class='hunk'>@@ -4,5 +4,5 @@ config VIDEO_SMIAPP</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select VIDEO_SMIAPP_PLL</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a generic driver for SMIA++/SMIA camera modules.</div><div class='head'>diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c<br/>new file mode 100644<br/>index 000000000000..9369f38dbf3d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/i2c/st-mipid02.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/i2c/st-mipid02.c</a></div><div class='hunk'>@@ -0,0 +1,1033 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Driver for ST MIPID02 CSI-2 to PARALLEL bridge</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) STMicroelectronics SA 2019</div><div class='add'>+ * Authors: Mickael Guene &lt;mickael.guene@st.com&gt;</div><div class='add'>+ *          for STMicroelectronics.</div><div class='add'>+ *</div><div class='add'>+ *</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/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.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 &lt;linux/of_graph.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;media/v4l2-async.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ctrls.h&gt;</div><div class='add'>+#include &lt;media/v4l2-device.h&gt;</div><div class='add'>+#include &lt;media/v4l2-fwnode.h&gt;</div><div class='add'>+#include &lt;media/v4l2-subdev.h&gt;</div><div class='add'>+</div><div class='add'>+#define MIPID02_CLK_LANE_WR_REG1			0x01</div><div class='add'>+#define MIPID02_CLK_LANE_REG1				0x02</div><div class='add'>+#define MIPID02_CLK_LANE_REG3				0x04</div><div class='add'>+#define MIPID02_DATA_LANE0_REG1				0x05</div><div class='add'>+#define MIPID02_DATA_LANE0_REG2				0x06</div><div class='add'>+#define MIPID02_DATA_LANE1_REG1				0x09</div><div class='add'>+#define MIPID02_DATA_LANE1_REG2				0x0a</div><div class='add'>+#define MIPID02_MODE_REG1				0x14</div><div class='add'>+#define MIPID02_MODE_REG2				0x15</div><div class='add'>+#define MIPID02_DATA_ID_RREG				0x17</div><div class='add'>+#define MIPID02_DATA_SELECTION_CTRL			0x19</div><div class='add'>+#define MIPID02_PIX_WIDTH_CTRL				0x1e</div><div class='add'>+#define MIPID02_PIX_WIDTH_CTRL_EMB			0x1f</div><div class='add'>+</div><div class='add'>+/* Bits definition for MIPID02_CLK_LANE_REG1 */</div><div class='add'>+#define CLK_ENABLE					BIT(0)</div><div class='add'>+/* Bits definition for MIPID02_CLK_LANE_REG3 */</div><div class='add'>+#define CLK_MIPI_CSI					BIT(1)</div><div class='add'>+/* Bits definition for MIPID02_DATA_LANE0_REG1 */</div><div class='add'>+#define DATA_ENABLE					BIT(0)</div><div class='add'>+/* Bits definition for MIPID02_DATA_LANEx_REG2 */</div><div class='add'>+#define DATA_MIPI_CSI					BIT(0)</div><div class='add'>+/* Bits definition for MIPID02_MODE_REG1 */</div><div class='add'>+#define MODE_DATA_SWAP					BIT(2)</div><div class='add'>+#define MODE_NO_BYPASS					BIT(6)</div><div class='add'>+/* Bits definition for MIPID02_MODE_REG2 */</div><div class='add'>+#define MODE_HSYNC_ACTIVE_HIGH				BIT(1)</div><div class='add'>+#define MODE_VSYNC_ACTIVE_HIGH				BIT(2)</div><div class='add'>+/* Bits definition for MIPID02_DATA_SELECTION_CTRL */</div><div class='add'>+#define SELECTION_MANUAL_DATA				BIT(2)</div><div class='add'>+#define SELECTION_MANUAL_WIDTH				BIT(3)</div><div class='add'>+</div><div class='add'>+static const u32 mipid02_supported_fmt_codes[] = {</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR8_1X8, MEDIA_BUS_FMT_SGBRG8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_1X10, MEDIA_BUS_FMT_SGBRG10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SRGGB10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR12_1X12, MEDIA_BUS_FMT_SGBRG12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG12_1X12, MEDIA_BUS_FMT_SRGGB12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_BGR888_1X24</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* regulator supplies */</div><div class='add'>+static const char * const mipid02_supply_name[] = {</div><div class='add'>+	"VDDE", /* 1.8V digital I/O supply */</div><div class='add'>+	"VDDIN", /* 1V8 voltage regulator supply */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MIPID02_NUM_SUPPLIES		ARRAY_SIZE(mipid02_supply_name)</div><div class='add'>+</div><div class='add'>+#define MIPID02_SINK_0			0</div><div class='add'>+#define MIPID02_SINK_1			1</div><div class='add'>+#define MIPID02_SOURCE			2</div><div class='add'>+#define MIPID02_PAD_NB			3</div><div class='add'>+</div><div class='add'>+struct mipid02_dev {</div><div class='add'>+	struct i2c_client *i2c_client;</div><div class='add'>+	struct regulator_bulk_data supplies[MIPID02_NUM_SUPPLIES];</div><div class='add'>+	struct v4l2_subdev sd;</div><div class='add'>+	struct media_pad pad[MIPID02_PAD_NB];</div><div class='add'>+	struct clk *xclk;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	/* endpoints info */</div><div class='add'>+	struct v4l2_fwnode_endpoint rx;</div><div class='add'>+	u64 link_frequency;</div><div class='add'>+	struct v4l2_fwnode_endpoint tx;</div><div class='add'>+	/* remote source */</div><div class='add'>+	struct v4l2_async_subdev asd;</div><div class='add'>+	struct v4l2_async_notifier notifier;</div><div class='add'>+	struct v4l2_subdev *s_subdev;</div><div class='add'>+	/* registers */</div><div class='add'>+	struct {</div><div class='add'>+		u8 clk_lane_reg1;</div><div class='add'>+		u8 data_lane0_reg1;</div><div class='add'>+		u8 data_lane1_reg1;</div><div class='add'>+		u8 mode_reg1;</div><div class='add'>+		u8 mode_reg2;</div><div class='add'>+		u8 data_id_rreg;</div><div class='add'>+		u8 pix_width_ctrl;</div><div class='add'>+		u8 pix_width_ctrl_emb;</div><div class='add'>+	} r;</div><div class='add'>+	/* lock to protect all members below */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	bool streaming;</div><div class='add'>+	struct v4l2_mbus_framefmt fmt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bpp_from_code(__u32 code)</div><div class='add'>+{</div><div class='add'>+	switch (code) {</div><div class='add'>+	case MEDIA_BUS_FMT_SBGGR8_1X8:</div><div class='add'>+	case MEDIA_BUS_FMT_SGBRG8_1X8:</div><div class='add'>+	case MEDIA_BUS_FMT_SGRBG8_1X8:</div><div class='add'>+	case MEDIA_BUS_FMT_SRGGB8_1X8:</div><div class='add'>+		return 8;</div><div class='add'>+	case MEDIA_BUS_FMT_SBGGR10_1X10:</div><div class='add'>+	case MEDIA_BUS_FMT_SGBRG10_1X10:</div><div class='add'>+	case MEDIA_BUS_FMT_SGRBG10_1X10:</div><div class='add'>+	case MEDIA_BUS_FMT_SRGGB10_1X10:</div><div class='add'>+		return 10;</div><div class='add'>+	case MEDIA_BUS_FMT_SBGGR12_1X12:</div><div class='add'>+	case MEDIA_BUS_FMT_SGBRG12_1X12:</div><div class='add'>+	case MEDIA_BUS_FMT_SGRBG12_1X12:</div><div class='add'>+	case MEDIA_BUS_FMT_SRGGB12_1X12:</div><div class='add'>+		return 12;</div><div class='add'>+	case MEDIA_BUS_FMT_UYVY8_1X16:</div><div class='add'>+		return 16;</div><div class='add'>+	case MEDIA_BUS_FMT_BGR888_1X24:</div><div class='add'>+		return 24;</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 u8 data_type_from_code(__u32 code)</div><div class='add'>+{</div><div class='add'>+	switch (code) {</div><div class='add'>+	case MEDIA_BUS_FMT_SBGGR8_1X8:</div><div class='add'>+	case MEDIA_BUS_FMT_SGBRG8_1X8:</div><div class='add'>+	case MEDIA_BUS_FMT_SGRBG8_1X8:</div><div class='add'>+	case MEDIA_BUS_FMT_SRGGB8_1X8:</div><div class='add'>+		return 0x2a;</div><div class='add'>+	case MEDIA_BUS_FMT_SBGGR10_1X10:</div><div class='add'>+	case MEDIA_BUS_FMT_SGBRG10_1X10:</div><div class='add'>+	case MEDIA_BUS_FMT_SGRBG10_1X10:</div><div class='add'>+	case MEDIA_BUS_FMT_SRGGB10_1X10:</div><div class='add'>+		return 0x2b;</div><div class='add'>+	case MEDIA_BUS_FMT_SBGGR12_1X12:</div><div class='add'>+	case MEDIA_BUS_FMT_SGBRG12_1X12:</div><div class='add'>+	case MEDIA_BUS_FMT_SGRBG12_1X12:</div><div class='add'>+	case MEDIA_BUS_FMT_SRGGB12_1X12:</div><div class='add'>+		return 0x2c;</div><div class='add'>+	case MEDIA_BUS_FMT_UYVY8_1X16:</div><div class='add'>+		return 0x1e;</div><div class='add'>+	case MEDIA_BUS_FMT_BGR888_1X24:</div><div class='add'>+		return 0x24;</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 void init_format(struct v4l2_mbus_framefmt *fmt)</div><div class='add'>+{</div><div class='add'>+	fmt-&gt;code = MEDIA_BUS_FMT_SBGGR8_1X8;</div><div class='add'>+	fmt-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+	fmt-&gt;colorspace = V4L2_COLORSPACE_SRGB;</div><div class='add'>+	fmt-&gt;ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(V4L2_COLORSPACE_SRGB);</div><div class='add'>+	fmt-&gt;quantization = V4L2_QUANTIZATION_FULL_RANGE;</div><div class='add'>+	fmt-&gt;xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(V4L2_COLORSPACE_SRGB);</div><div class='add'>+	fmt-&gt;width = 640;</div><div class='add'>+	fmt-&gt;height = 480;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u32 get_fmt_code(__u32 code)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mipid02_supported_fmt_codes); i++) {</div><div class='add'>+		if (code == mipid02_supported_fmt_codes[i])</div><div class='add'>+			return code;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mipid02_supported_fmt_codes[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u32 serial_to_parallel_code(__u32 serial)</div><div class='add'>+{</div><div class='add'>+	if (serial == MEDIA_BUS_FMT_UYVY8_1X16)</div><div class='add'>+		return MEDIA_BUS_FMT_UYVY8_2X8;</div><div class='add'>+	if (serial == MEDIA_BUS_FMT_BGR888_1X24)</div><div class='add'>+		return MEDIA_BUS_FMT_BGR888_3X8;</div><div class='add'>+</div><div class='add'>+	return serial;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mipid02_dev *to_mipid02_dev(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	return container_of(sd, struct mipid02_dev, sd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_read_reg(struct mipid02_dev *bridge, u16 reg, u8 *val)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct i2c_msg msg[2];</div><div class='add'>+	u8 buf[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf[0] = reg &gt;&gt; 8;</div><div class='add'>+	buf[1] = reg &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	msg[0].addr = client-&gt;addr;</div><div class='add'>+	msg[0].flags = client-&gt;flags;</div><div class='add'>+	msg[0].buf = buf;</div><div class='add'>+	msg[0].len = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	msg[1].addr = client-&gt;addr;</div><div class='add'>+	msg[1].flags = client-&gt;flags | I2C_M_RD;</div><div class='add'>+	msg[1].buf = val;</div><div class='add'>+	msg[1].len = 1;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(client-&gt;adapter, msg, 2);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "%s: %x i2c_transfer, reg: %x =&gt; %d\n",</div><div class='add'>+			    __func__, client-&gt;addr, reg, 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 mipid02_write_reg(struct mipid02_dev *bridge, u16 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+	u8 buf[3];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf[0] = reg &gt;&gt; 8;</div><div class='add'>+	buf[1] = reg &amp; 0xff;</div><div class='add'>+	buf[2] = val;</div><div class='add'>+</div><div class='add'>+	msg.addr = client-&gt;addr;</div><div class='add'>+	msg.flags = client-&gt;flags;</div><div class='add'>+	msg.buf = buf;</div><div class='add'>+	msg.len = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(client-&gt;adapter, &amp;msg, 1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "%s: i2c_transfer, reg: %x =&gt; %d\n",</div><div class='add'>+			    __func__, reg, 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 mipid02_get_regulators(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MIPID02_NUM_SUPPLIES; i++)</div><div class='add'>+		bridge-&gt;supplies[i].supply = mipid02_supply_name[i];</div><div class='add'>+</div><div class='add'>+	return devm_regulator_bulk_get(&amp;bridge-&gt;i2c_client-&gt;dev,</div><div class='add'>+				       MIPID02_NUM_SUPPLIES,</div><div class='add'>+				       bridge-&gt;supplies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mipid02_apply_reset(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	gpiod_set_value_cansleep(bridge-&gt;reset_gpio, 0);</div><div class='add'>+	usleep_range(5000, 10000);</div><div class='add'>+	gpiod_set_value_cansleep(bridge-&gt;reset_gpio, 1);</div><div class='add'>+	usleep_range(5000, 10000);</div><div class='add'>+	gpiod_set_value_cansleep(bridge-&gt;reset_gpio, 0);</div><div class='add'>+	usleep_range(5000, 10000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_set_power_on(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(bridge-&gt;xclk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: failed to enable clock\n", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regulator_bulk_enable(MIPID02_NUM_SUPPLIES,</div><div class='add'>+				    bridge-&gt;supplies);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: failed to enable regulators\n",</div><div class='add'>+			    __func__);</div><div class='add'>+		goto xclk_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bridge-&gt;reset_gpio) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "apply reset");</div><div class='add'>+		mipid02_apply_reset(bridge);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "don't apply reset");</div><div class='add'>+		usleep_range(5000, 10000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+xclk_off:</div><div class='add'>+	clk_disable_unprepare(bridge-&gt;xclk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mipid02_set_power_off(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	regulator_bulk_disable(MIPID02_NUM_SUPPLIES, bridge-&gt;supplies);</div><div class='add'>+	clk_disable_unprepare(bridge-&gt;xclk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_detect(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There is no version registers. Just try to read register</div><div class='add'>+	 * MIPID02_CLK_LANE_WR_REG1.</div><div class='add'>+	 */</div><div class='add'>+	return mipid02_read_reg(bridge, MIPID02_CLK_LANE_WR_REG1, &amp;reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mipid02_get_link_freq_from_cid_pixel_rate(struct mipid02_dev *bridge,</div><div class='add'>+						     struct v4l2_subdev *subdev)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_fwnode_endpoint *ep = &amp;bridge-&gt;rx;</div><div class='add'>+	struct v4l2_ctrl *ctrl;</div><div class='add'>+	u32 pixel_clock;</div><div class='add'>+	u32 bpp = bpp_from_code(bridge-&gt;fmt.code);</div><div class='add'>+</div><div class='add'>+	ctrl = v4l2_ctrl_find(subdev-&gt;ctrl_handler, V4L2_CID_PIXEL_RATE);</div><div class='add'>+	if (!ctrl)</div><div class='add'>+		return 0;</div><div class='add'>+	pixel_clock = v4l2_ctrl_g_ctrl_int64(ctrl);</div><div class='add'>+</div><div class='add'>+	return pixel_clock * bpp / (2 * ep-&gt;bus.mipi_csi2.num_data_lanes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We need to know link frequency to setup clk_lane_reg1 timings. Link frequency</div><div class='add'>+ * will be computed using connected device V4L2_CID_PIXEL_RATE, bit per pixel</div><div class='add'>+ * and number of lanes.</div><div class='add'>+ */</div><div class='add'>+static int mipid02_configure_from_rx_speed(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct v4l2_subdev *subdev = bridge-&gt;s_subdev;</div><div class='add'>+	u32 link_freq;</div><div class='add'>+</div><div class='add'>+	link_freq = mipid02_get_link_freq_from_cid_pixel_rate(bridge, subdev);</div><div class='add'>+	if (!link_freq) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to detect link frequency");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "detect link_freq = %d Hz", link_freq);</div><div class='add'>+	bridge-&gt;r.clk_lane_reg1 |= (2000000000 / link_freq) &lt;&lt; 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 mipid02_configure_clk_lane(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct v4l2_fwnode_endpoint *ep = &amp;bridge-&gt;rx;</div><div class='add'>+	bool *polarities = ep-&gt;bus.mipi_csi2.lane_polarities;</div><div class='add'>+</div><div class='add'>+	/* midid02 doesn't support clock lane remapping */</div><div class='add'>+	if (ep-&gt;bus.mipi_csi2.clock_lane != 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "clk lane must be map to lane 0\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	bridge-&gt;r.clk_lane_reg1 |= (polarities[0] &lt;&lt; 1) | CLK_ENABLE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_configure_data0_lane(struct mipid02_dev *bridge, int nb,</div><div class='add'>+					bool are_lanes_swap, bool *polarities)</div><div class='add'>+{</div><div class='add'>+	bool are_pin_swap = are_lanes_swap ? polarities[2] : polarities[1];</div><div class='add'>+</div><div class='add'>+	if (nb == 1 &amp;&amp; are_lanes_swap)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * data lane 0 as pin swap polarity reversed compared to clock and</div><div class='add'>+	 * data lane 1</div><div class='add'>+	 */</div><div class='add'>+	if (!are_pin_swap)</div><div class='add'>+		bridge-&gt;r.data_lane0_reg1 = 1 &lt;&lt; 1;</div><div class='add'>+	bridge-&gt;r.data_lane0_reg1 |= DATA_ENABLE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_configure_data1_lane(struct mipid02_dev *bridge, int nb,</div><div class='add'>+					bool are_lanes_swap, bool *polarities)</div><div class='add'>+{</div><div class='add'>+	bool are_pin_swap = are_lanes_swap ? polarities[1] : polarities[2];</div><div class='add'>+</div><div class='add'>+	if (nb == 1 &amp;&amp; !are_lanes_swap)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (are_pin_swap)</div><div class='add'>+		bridge-&gt;r.data_lane1_reg1 = 1 &lt;&lt; 1;</div><div class='add'>+	bridge-&gt;r.data_lane1_reg1 |= DATA_ENABLE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_configure_from_rx(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_fwnode_endpoint *ep = &amp;bridge-&gt;rx;</div><div class='add'>+	bool are_lanes_swap = ep-&gt;bus.mipi_csi2.data_lanes[0] == 2;</div><div class='add'>+	bool *polarities = ep-&gt;bus.mipi_csi2.lane_polarities;</div><div class='add'>+	int nb = ep-&gt;bus.mipi_csi2.num_data_lanes;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mipid02_configure_clk_lane(bridge);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mipid02_configure_data0_lane(bridge, nb, are_lanes_swap,</div><div class='add'>+					   polarities);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mipid02_configure_data1_lane(bridge, nb, are_lanes_swap,</div><div class='add'>+					   polarities);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;r.mode_reg1 |= are_lanes_swap ? MODE_DATA_SWAP : 0;</div><div class='add'>+	bridge-&gt;r.mode_reg1 |= (nb - 1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	return mipid02_configure_from_rx_speed(bridge);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_configure_from_tx(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_fwnode_endpoint *ep = &amp;bridge-&gt;tx;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;r.pix_width_ctrl = ep-&gt;bus.parallel.bus_width;</div><div class='add'>+	bridge-&gt;r.pix_width_ctrl_emb = ep-&gt;bus.parallel.bus_width;</div><div class='add'>+	if (ep-&gt;bus.parallel.flags &amp; V4L2_MBUS_HSYNC_ACTIVE_HIGH)</div><div class='add'>+		bridge-&gt;r.mode_reg2 |= MODE_HSYNC_ACTIVE_HIGH;</div><div class='add'>+	if (ep-&gt;bus.parallel.flags &amp; V4L2_MBUS_VSYNC_ACTIVE_HIGH)</div><div class='add'>+		bridge-&gt;r.mode_reg2 |= MODE_VSYNC_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_configure_from_code(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	u8 data_type;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;r.data_id_rreg = 0;</div><div class='add'>+	data_type = data_type_from_code(bridge-&gt;fmt.code);</div><div class='add'>+	if (!data_type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	bridge-&gt;r.data_id_rreg = data_type;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_stream_disable(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Disable all lanes */</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_CLK_LANE_REG1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_LANE0_REG1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_LANE1_REG1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+error:</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to stream off %d", 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 mipid02_stream_enable(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!bridge-&gt;s_subdev)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	memset(&amp;bridge-&gt;r, 0, sizeof(bridge-&gt;r));</div><div class='add'>+	/* build registers content */</div><div class='add'>+	ret = mipid02_configure_from_rx(bridge);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_configure_from_tx(bridge);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_configure_from_code(bridge);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* write mipi registers */</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_CLK_LANE_REG1,</div><div class='add'>+		bridge-&gt;r.clk_lane_reg1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_CLK_LANE_REG3, CLK_MIPI_CSI);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_LANE0_REG1,</div><div class='add'>+		bridge-&gt;r.data_lane0_reg1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_LANE0_REG2,</div><div class='add'>+		DATA_MIPI_CSI);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_LANE1_REG1,</div><div class='add'>+		bridge-&gt;r.data_lane1_reg1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_LANE1_REG2,</div><div class='add'>+		DATA_MIPI_CSI);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_MODE_REG1,</div><div class='add'>+		MODE_NO_BYPASS | bridge-&gt;r.mode_reg1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_MODE_REG2,</div><div class='add'>+		bridge-&gt;r.mode_reg2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_ID_RREG,</div><div class='add'>+		bridge-&gt;r.data_id_rreg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_DATA_SELECTION_CTRL,</div><div class='add'>+		SELECTION_MANUAL_DATA | SELECTION_MANUAL_WIDTH);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_PIX_WIDTH_CTRL,</div><div class='add'>+		bridge-&gt;r.pix_width_ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = mipid02_write_reg(bridge, MIPID02_PIX_WIDTH_CTRL_EMB,</div><div class='add'>+		bridge-&gt;r.pix_width_ctrl_emb);</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'>+</div><div class='add'>+error:</div><div class='add'>+	dev_err(&amp;client-&gt;dev, "failed to stream on %d", ret);</div><div class='add'>+	mipid02_stream_disable(bridge);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s : requested %d / current = %d", __func__,</div><div class='add'>+		    enable, bridge-&gt;streaming);</div><div class='add'>+	mutex_lock(&amp;bridge-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (bridge-&gt;streaming == enable)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = enable ? mipid02_stream_enable(bridge) :</div><div class='add'>+		       mipid02_stream_disable(bridge);</div><div class='add'>+	if (!ret)</div><div class='add'>+		bridge-&gt;streaming = enable;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s current now = %d / %d", __func__,</div><div class='add'>+		    bridge-&gt;streaming, ret);</div><div class='add'>+	mutex_unlock(&amp;bridge-&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 mipid02_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='add'>+				 struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+				 struct v4l2_subdev_mbus_code_enum *code)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (code-&gt;pad) {</div><div class='add'>+	case MIPID02_SINK_0:</div><div class='add'>+		if (code-&gt;index &gt;= ARRAY_SIZE(mipid02_supported_fmt_codes))</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			code-&gt;code = mipid02_supported_fmt_codes[code-&gt;index];</div><div class='add'>+		break;</div><div class='add'>+	case MIPID02_SOURCE:</div><div class='add'>+		if (code-&gt;index == 0)</div><div class='add'>+			code-&gt;code = serial_to_parallel_code(bridge-&gt;fmt.code);</div><div class='add'>+		else</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</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 mipid02_get_fmt(struct v4l2_subdev *sd,</div><div class='add'>+			   struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+			   struct v4l2_subdev_format *format)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_mbus_framefmt *mbus_fmt = &amp;format-&gt;format;</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct v4l2_mbus_framefmt *fmt;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s probe %d", __func__, format-&gt;pad);</div><div class='add'>+</div><div class='add'>+	if (format-&gt;pad &gt;= MIPID02_PAD_NB)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* second CSI-2 pad not yet supported */</div><div class='add'>+	if (format-&gt;pad == MIPID02_SINK_1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (format-&gt;which == V4L2_SUBDEV_FORMAT_TRY)</div><div class='add'>+		fmt = v4l2_subdev_get_try_format(&amp;bridge-&gt;sd, cfg, format-&gt;pad);</div><div class='add'>+	else</div><div class='add'>+		fmt = &amp;bridge-&gt;fmt;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bridge-&gt;lock);</div><div class='add'>+</div><div class='add'>+	*mbus_fmt = *fmt;</div><div class='add'>+	/* code may need to be converted for source */</div><div class='add'>+	if (format-&gt;pad == MIPID02_SOURCE)</div><div class='add'>+		mbus_fmt-&gt;code = serial_to_parallel_code(mbus_fmt-&gt;code);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;bridge-&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 mipid02_set_fmt_source(struct v4l2_subdev *sd,</div><div class='add'>+				   struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+				   struct v4l2_subdev_format *format)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+</div><div class='add'>+	/* source pad mirror active sink pad */</div><div class='add'>+	format-&gt;format = bridge-&gt;fmt;</div><div class='add'>+	/* but code may need to be converted */</div><div class='add'>+	format-&gt;format.code = serial_to_parallel_code(format-&gt;format.code);</div><div class='add'>+</div><div class='add'>+	/* only apply format for V4L2_SUBDEV_FORMAT_TRY case */</div><div class='add'>+	if (format-&gt;which != V4L2_SUBDEV_FORMAT_TRY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*v4l2_subdev_get_try_format(sd, cfg, format-&gt;pad) = format-&gt;format;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mipid02_set_fmt_sink(struct v4l2_subdev *sd,</div><div class='add'>+				 struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+				 struct v4l2_subdev_format *format)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+	struct v4l2_mbus_framefmt *fmt;</div><div class='add'>+</div><div class='add'>+	format-&gt;format.code = get_fmt_code(format-&gt;format.code);</div><div class='add'>+</div><div class='add'>+	if (format-&gt;which == V4L2_SUBDEV_FORMAT_TRY)</div><div class='add'>+		fmt = v4l2_subdev_get_try_format(sd, cfg, format-&gt;pad);</div><div class='add'>+	else</div><div class='add'>+		fmt = &amp;bridge-&gt;fmt;</div><div class='add'>+</div><div class='add'>+	*fmt = format-&gt;format;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_set_fmt(struct v4l2_subdev *sd,</div><div class='add'>+			   struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+			   struct v4l2_subdev_format *format)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s for %d", __func__, format-&gt;pad);</div><div class='add'>+</div><div class='add'>+	if (format-&gt;pad &gt;= MIPID02_PAD_NB)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* second CSI-2 pad not yet supported */</div><div class='add'>+	if (format-&gt;pad == MIPID02_SINK_1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bridge-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (bridge-&gt;streaming) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format-&gt;pad == MIPID02_SOURCE)</div><div class='add'>+		mipid02_set_fmt_source(sd, cfg, format);</div><div class='add'>+	else</div><div class='add'>+		mipid02_set_fmt_sink(sd, cfg, format);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mutex_unlock(&amp;bridge-&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 const struct v4l2_subdev_video_ops mipid02_video_ops = {</div><div class='add'>+	.s_stream = mipid02_s_stream,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_pad_ops mipid02_pad_ops = {</div><div class='add'>+	.enum_mbus_code = mipid02_enum_mbus_code,</div><div class='add'>+	.get_fmt = mipid02_get_fmt,</div><div class='add'>+	.set_fmt = mipid02_set_fmt,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_ops mipid02_subdev_ops = {</div><div class='add'>+	.video = &amp;mipid02_video_ops,</div><div class='add'>+	.pad = &amp;mipid02_pad_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct media_entity_operations mipid02_subdev_entity_ops = {</div><div class='add'>+	.link_validate = v4l2_subdev_link_validate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mipid02_async_bound(struct v4l2_async_notifier *notifier,</div><div class='add'>+			       struct v4l2_subdev *s_subdev,</div><div class='add'>+			       struct v4l2_async_subdev *asd)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(notifier-&gt;sd);</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	int source_pad;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "sensor_async_bound call %p", s_subdev);</div><div class='add'>+</div><div class='add'>+	source_pad = media_entity_get_fwnode_pad(&amp;s_subdev-&gt;entity,</div><div class='add'>+						 s_subdev-&gt;fwnode,</div><div class='add'>+						 MEDIA_PAD_FL_SOURCE);</div><div class='add'>+	if (source_pad &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Couldn't find output pad for subdev %s\n",</div><div class='add'>+			s_subdev-&gt;name);</div><div class='add'>+		return source_pad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = media_create_pad_link(&amp;s_subdev-&gt;entity, source_pad,</div><div class='add'>+				    &amp;bridge-&gt;sd.entity, 0,</div><div class='add'>+				    MEDIA_LNK_FL_ENABLED |</div><div class='add'>+				    MEDIA_LNK_FL_IMMUTABLE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Couldn't create media link %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bridge-&gt;s_subdev = s_subdev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mipid02_async_unbind(struct v4l2_async_notifier *notifier,</div><div class='add'>+				 struct v4l2_subdev *s_subdev,</div><div class='add'>+				 struct v4l2_async_subdev *asd)</div><div class='add'>+{</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(notifier-&gt;sd);</div><div class='add'>+</div><div class='add'>+	bridge-&gt;s_subdev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_async_notifier_operations mipid02_notifier_ops = {</div><div class='add'>+	.bound		= mipid02_async_bound,</div><div class='add'>+	.unbind		= mipid02_async_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mipid02_parse_rx_ep(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_fwnode_endpoint ep = { .bus_type = V4L2_MBUS_CSI2_DPHY };</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct device_node *ep_node;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* parse rx (endpoint 0) */</div><div class='add'>+	ep_node = of_graph_get_endpoint_by_regs(bridge-&gt;i2c_client-&gt;dev.of_node,</div><div class='add'>+						0, 0);</div><div class='add'>+	if (!ep_node) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to find port0 ep");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), &amp;ep);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Could not parse v4l2 endpoint %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		goto error_of_node_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* do some sanity checks */</div><div class='add'>+	if (ep.bus.mipi_csi2.num_data_lanes &gt; 2) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "max supported data lanes is 2 / got %d",</div><div class='add'>+			ep.bus.mipi_csi2.num_data_lanes);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error_of_node_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register it for later use */</div><div class='add'>+	bridge-&gt;rx = ep;</div><div class='add'>+</div><div class='add'>+	/* register async notifier so we get noticed when sensor is connected */</div><div class='add'>+	bridge-&gt;asd.match.fwnode =</div><div class='add'>+		fwnode_graph_get_remote_port_parent(of_fwnode_handle(ep_node));</div><div class='add'>+	bridge-&gt;asd.match_type = V4L2_ASYNC_MATCH_FWNODE;</div><div class='add'>+	of_node_put(ep_node);</div><div class='add'>+</div><div class='add'>+	v4l2_async_notifier_init(&amp;bridge-&gt;notifier);</div><div class='add'>+	ret = v4l2_async_notifier_add_subdev(&amp;bridge-&gt;notifier, &amp;bridge-&gt;asd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "fail to register asd to notifier %d",</div><div class='add'>+			ret);</div><div class='add'>+		fwnode_handle_put(bridge-&gt;asd.match.fwnode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	bridge-&gt;notifier.ops = &amp;mipid02_notifier_ops;</div><div class='add'>+</div><div class='add'>+	ret = v4l2_async_subdev_notifier_register(&amp;bridge-&gt;sd,</div><div class='add'>+						  &amp;bridge-&gt;notifier);</div><div class='add'>+	if (ret)</div><div class='add'>+		v4l2_async_notifier_cleanup(&amp;bridge-&gt;notifier);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error_of_node_put:</div><div class='add'>+	of_node_put(ep_node);</div><div class='add'>+error:</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_parse_tx_ep(struct mipid02_dev *bridge)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_fwnode_endpoint ep = { .bus_type = V4L2_MBUS_PARALLEL };</div><div class='add'>+	struct i2c_client *client = bridge-&gt;i2c_client;</div><div class='add'>+	struct device_node *ep_node;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* parse tx (endpoint 2) */</div><div class='add'>+	ep_node = of_graph_get_endpoint_by_regs(bridge-&gt;i2c_client-&gt;dev.of_node,</div><div class='add'>+						2, 0);</div><div class='add'>+	if (!ep_node) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to find port1 ep");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), &amp;ep);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Could not parse v4l2 endpoint\n");</div><div class='add'>+		goto error_of_node_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_node_put(ep_node);</div><div class='add'>+	bridge-&gt;tx = ep;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error_of_node_put:</div><div class='add'>+	of_node_put(ep_node);</div><div class='add'>+error:</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mipid02_probe(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;client-&gt;dev;</div><div class='add'>+	struct mipid02_dev *bridge;</div><div class='add'>+	u32 clk_freq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bridge = devm_kzalloc(dev, sizeof(*bridge), GFP_KERNEL);</div><div class='add'>+	if (!bridge)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_format(&amp;bridge-&gt;fmt);</div><div class='add'>+</div><div class='add'>+	bridge-&gt;i2c_client = client;</div><div class='add'>+	v4l2_i2c_subdev_init(&amp;bridge-&gt;sd, client, &amp;mipid02_subdev_ops);</div><div class='add'>+</div><div class='add'>+	/* got and check clock */</div><div class='add'>+	bridge-&gt;xclk = devm_clk_get(dev, "xclk");</div><div class='add'>+	if (IS_ERR(bridge-&gt;xclk)) {</div><div class='add'>+		dev_err(dev, "failed to get xclk\n");</div><div class='add'>+		return PTR_ERR(bridge-&gt;xclk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_freq = clk_get_rate(bridge-&gt;xclk);</div><div class='add'>+	if (clk_freq &lt; 6000000 || clk_freq &gt; 27000000) {</div><div class='add'>+		dev_err(dev, "xclk freq must be in 6-27 Mhz range. got %d Hz\n",</div><div class='add'>+			clk_freq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bridge-&gt;reset_gpio = devm_gpiod_get_optional(dev, "reset",</div><div class='add'>+						     GPIOD_OUT_HIGH);</div><div class='add'>+</div><div class='add'>+	ret = mipid02_get_regulators(bridge);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to get regulators %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;bridge-&gt;lock);</div><div class='add'>+	bridge-&gt;sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;</div><div class='add'>+	bridge-&gt;sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;</div><div class='add'>+	bridge-&gt;sd.entity.ops = &amp;mipid02_subdev_entity_ops;</div><div class='add'>+	bridge-&gt;pad[0].flags = MEDIA_PAD_FL_SINK;</div><div class='add'>+	bridge-&gt;pad[1].flags = MEDIA_PAD_FL_SINK;</div><div class='add'>+	bridge-&gt;pad[2].flags = MEDIA_PAD_FL_SOURCE;</div><div class='add'>+	ret = media_entity_pads_init(&amp;bridge-&gt;sd.entity, MIPID02_PAD_NB,</div><div class='add'>+				     bridge-&gt;pad);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "pads init failed %d", ret);</div><div class='add'>+		goto mutex_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable clock, power and reset device if available */</div><div class='add'>+	ret = mipid02_set_power_on(bridge);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto entity_cleanup;</div><div class='add'>+</div><div class='add'>+	ret = mipid02_detect(bridge);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to detect mipid02 %d", ret);</div><div class='add'>+		goto power_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mipid02_parse_tx_ep(bridge);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to parse tx %d", ret);</div><div class='add'>+		goto power_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mipid02_parse_rx_ep(bridge);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to parse rx %d", ret);</div><div class='add'>+		goto power_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = v4l2_async_register_subdev(&amp;bridge-&gt;sd);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "v4l2_async_register_subdev failed %d",</div><div class='add'>+			    ret);</div><div class='add'>+		goto unregister_notifier;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "mipid02 device probe successfully");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unregister_notifier:</div><div class='add'>+	v4l2_async_notifier_unregister(&amp;bridge-&gt;notifier);</div><div class='add'>+	v4l2_async_notifier_cleanup(&amp;bridge-&gt;notifier);</div><div class='add'>+power_off:</div><div class='add'>+	mipid02_set_power_off(bridge);</div><div class='add'>+entity_cleanup:</div><div class='add'>+	media_entity_cleanup(&amp;bridge-&gt;sd.entity);</div><div class='add'>+mutex_cleanup:</div><div class='add'>+	mutex_destroy(&amp;bridge-&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 mipid02_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_subdev *sd = i2c_get_clientdata(client);</div><div class='add'>+	struct mipid02_dev *bridge = to_mipid02_dev(sd);</div><div class='add'>+</div><div class='add'>+	v4l2_async_notifier_unregister(&amp;bridge-&gt;notifier);</div><div class='add'>+	v4l2_async_notifier_cleanup(&amp;bridge-&gt;notifier);</div><div class='add'>+	v4l2_async_unregister_subdev(&amp;bridge-&gt;sd);</div><div class='add'>+	mipid02_set_power_off(bridge);</div><div class='add'>+	media_entity_cleanup(&amp;bridge-&gt;sd.entity);</div><div class='add'>+	mutex_destroy(&amp;bridge-&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 const struct of_device_id mipid02_dt_ids[] = {</div><div class='add'>+	{ .compatible = "st,st-mipid02" },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, mipid02_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver mipid02_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name  = "st-mipid02",</div><div class='add'>+		.of_match_table = mipid02_dt_ids,</div><div class='add'>+	},</div><div class='add'>+	.probe_new = mipid02_probe,</div><div class='add'>+	.remove = mipid02_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_i2c_driver(mipid02_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mickael Guene &lt;mickael.guene@st.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("STMicroelectronics MIPID02 CSI-2 bridge driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/media/media-dev-allocator.c b/drivers/media/media-dev-allocator.c<br/>new file mode 100644<br/>index 000000000000..ae17887dec59<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-dev-allocator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/media-dev-allocator.c</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * media-dev-allocator.c - Media Controller Device Allocator API</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Shuah Khan &lt;shuah@kernel.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Credits: Suggested by Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file adds a global refcounted Media Controller Device Instance API.</div><div class='add'>+ * A system wide global media device list is managed and each media device</div><div class='add'>+ * includes a kref count. The last put on the media device releases the media</div><div class='add'>+ * device instance.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;media/media-device.h&gt;</div><div class='add'>+#include &lt;media/media-dev-allocator.h&gt;</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(media_device_list);</div><div class='add'>+static DEFINE_MUTEX(media_device_lock);</div><div class='add'>+</div><div class='add'>+struct media_device_instance {</div><div class='add'>+	struct media_device mdev;</div><div class='add'>+	struct module *owner;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct kref refcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct media_device_instance *</div><div class='add'>+to_media_device_instance(struct media_device *mdev)</div><div class='add'>+{</div><div class='add'>+	return container_of(mdev, struct media_device_instance, mdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void media_device_instance_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct media_device_instance *mdi =</div><div class='add'>+		container_of(kref, struct media_device_instance, refcount);</div><div class='add'>+</div><div class='add'>+	dev_dbg(mdi-&gt;mdev.dev, "%s: releasing Media Device\n", __func__);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;media_device_lock);</div><div class='add'>+</div><div class='add'>+	media_device_unregister(&amp;mdi-&gt;mdev);</div><div class='add'>+	media_device_cleanup(&amp;mdi-&gt;mdev);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;mdi-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;media_device_lock);</div><div class='add'>+</div><div class='add'>+	kfree(mdi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Callers should hold media_device_lock when calling this function */</div><div class='add'>+static struct media_device *__media_device_get(struct device *dev,</div><div class='add'>+						const char *module_name,</div><div class='add'>+						struct module *owner)</div><div class='add'>+{</div><div class='add'>+	struct media_device_instance *mdi;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mdi, &amp;media_device_list, list) {</div><div class='add'>+		if (mdi-&gt;mdev.dev != dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		kref_get(&amp;mdi-&gt;refcount);</div><div class='add'>+</div><div class='add'>+		/* get module reference for the media_device owner */</div><div class='add'>+		if (owner != mdi-&gt;owner &amp;&amp; !try_module_get(mdi-&gt;owner))</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"%s: module %s get owner reference error\n",</div><div class='add'>+					__func__, module_name);</div><div class='add'>+		else</div><div class='add'>+			dev_dbg(dev, "%s: module %s got owner reference\n",</div><div class='add'>+					__func__, module_name);</div><div class='add'>+		return &amp;mdi-&gt;mdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdi = kzalloc(sizeof(*mdi), GFP_KERNEL);</div><div class='add'>+	if (!mdi)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mdi-&gt;owner = owner;</div><div class='add'>+	kref_init(&amp;mdi-&gt;refcount);</div><div class='add'>+	list_add_tail(&amp;mdi-&gt;list, &amp;media_device_list);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s: Allocated media device for owner %s\n",</div><div class='add'>+			__func__, module_name);</div><div class='add'>+	return &amp;mdi-&gt;mdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct media_device *media_device_usb_allocate(struct usb_device *udev,</div><div class='add'>+					       const char *module_name,</div><div class='add'>+					       struct module *owner)</div><div class='add'>+{</div><div class='add'>+	struct media_device *mdev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;media_device_lock);</div><div class='add'>+	mdev = __media_device_get(&amp;udev-&gt;dev, module_name, owner);</div><div class='add'>+	if (!mdev) {</div><div class='add'>+		mutex_unlock(&amp;media_device_lock);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if media device is already initialized */</div><div class='add'>+	if (!mdev-&gt;dev)</div><div class='add'>+		__media_device_usb_init(mdev, udev, udev-&gt;product,</div><div class='add'>+					module_name);</div><div class='add'>+	mutex_unlock(&amp;media_device_lock);</div><div class='add'>+	return mdev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(media_device_usb_allocate);</div><div class='add'>+</div><div class='add'>+void media_device_delete(struct media_device *mdev, const char *module_name,</div><div class='add'>+			 struct module *owner)</div><div class='add'>+{</div><div class='add'>+	struct media_device_instance *mdi = to_media_device_instance(mdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;media_device_lock);</div><div class='add'>+	/* put module reference for the media_device owner */</div><div class='add'>+	if (mdi-&gt;owner != owner) {</div><div class='add'>+		module_put(mdi-&gt;owner);</div><div class='add'>+		dev_dbg(mdi-&gt;mdev.dev,</div><div class='add'>+			"%s: module %s put owner module reference\n",</div><div class='add'>+			__func__, module_name);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;media_device_lock);</div><div class='add'>+	kref_put(&amp;mdi-&gt;refcount, media_device_instance_release);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(media_device_delete);</div><div class='head'>diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c<br/>index 6b87a721dc49..d5aa30eeff4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-devnode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-devnode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-devnode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/media-devnode.c</a></div><div class='hunk'>@@ -251,6 +251,7 @@ int __must_check media_devnode_register(struct media_device *mdev,</div><div class='ctx'> 	/* Part 2: Initialize the character device */</div><div class='ctx'> 	cdev_init(&amp;devnode-&gt;cdev, &amp;media_devnode_fops);</div><div class='ctx'> 	devnode-&gt;cdev.owner = owner;</div><div class='add'>+	kobject_set_name(&amp;devnode-&gt;cdev.kobj, "media%d", devnode-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	/* Part 3: Add the media and char device */</div><div class='ctx'> 	ret = cdev_device_add(&amp;devnode-&gt;cdev, &amp;devnode-&gt;dev);</div><div class='hunk'>@@ -290,8 +291,9 @@ void media_devnode_unregister(struct media_devnode *devnode)</div><div class='ctx'> 	mutex_lock(&amp;media_devnode_lock);</div><div class='ctx'> 	/* Delete the cdev on this minor as well */</div><div class='ctx'> 	cdev_device_del(&amp;devnode-&gt;cdev, &amp;devnode-&gt;dev);</div><div class='del'>-	mutex_unlock(&amp;media_devnode_lock);</div><div class='ctx'> 	devnode-&gt;media_dev = NULL;</div><div class='add'>+	mutex_unlock(&amp;media_devnode_lock);</div><div class='add'>+</div><div class='ctx'> 	put_device(&amp;devnode-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c<br/>index 0b1cb3559140..a998a2e0ea1d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-entity.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-entity.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-entity.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/media-entity.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;media/media-entity.h&gt;</div><div class='hunk'>@@ -436,7 +435,10 @@ __must_check int __media_pipeline_start(struct media_entity *entity,</div><div class='ctx'> </div><div class='ctx'> 		entity-&gt;stream_count++;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(entity-&gt;pipe &amp;&amp; entity-&gt;pipe != pipe)) {</div><div class='add'>+		if (entity-&gt;pipe &amp;&amp; entity-&gt;pipe != pipe) {</div><div class='add'>+			pr_err("Pipe active for %s. Can't start for %s\n",</div><div class='add'>+				entity-&gt;name,</div><div class='add'>+				entity_err-&gt;name);</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -588,33 +590,6 @@ void media_pipeline_stop(struct media_entity *entity)</div><div class='ctx'> EXPORT_SYMBOL_GPL(media_pipeline_stop);</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------------------</div><div class='del'>- * Module use count</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct media_entity *media_entity_get(struct media_entity *entity)</div><div class='del'>-{</div><div class='del'>-	if (entity == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (entity-&gt;graph_obj.mdev-&gt;dev &amp;&amp;</div><div class='del'>-	    !try_module_get(entity-&gt;graph_obj.mdev-&gt;dev-&gt;driver-&gt;owner))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return entity;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(media_entity_get);</div><div class='del'>-</div><div class='del'>-void media_entity_put(struct media_entity *entity)</div><div class='del'>-{</div><div class='del'>-	if (entity == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (entity-&gt;graph_obj.mdev-&gt;dev)</div><div class='del'>-		module_put(entity-&gt;graph_obj.mdev-&gt;dev-&gt;driver-&gt;owner);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(media_entity_put);</div><div class='del'>-</div><div class='del'>-/* -----------------------------------------------------------------------------</div><div class='ctx'>  * Links management</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/media-request.c b/drivers/media/media-request.c<br/>index eec2e2b2f6ec..e3fca436c75b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-request.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/media-request.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/media-request.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/media-request.c</a></div><div class='hunk'>@@ -246,38 +246,38 @@ static const struct file_operations request_fops = {</div><div class='ctx'> struct media_request *</div><div class='ctx'> media_request_get_by_fd(struct media_device *mdev, int request_fd)</div><div class='ctx'> {</div><div class='del'>-	struct file *filp;</div><div class='add'>+	struct fd f;</div><div class='ctx'> 	struct media_request *req;</div><div class='ctx'> </div><div class='ctx'> 	if (!mdev || !mdev-&gt;ops ||</div><div class='ctx'> 	    !mdev-&gt;ops-&gt;req_validate || !mdev-&gt;ops-&gt;req_queue)</div><div class='del'>-		return ERR_PTR(-EACCES);</div><div class='add'>+		return ERR_PTR(-EBADR);</div><div class='ctx'> </div><div class='del'>-	filp = fget(request_fd);</div><div class='del'>-	if (!filp)</div><div class='add'>+	f = fdget(request_fd);</div><div class='add'>+	if (!f.file)</div><div class='ctx'> 		goto err_no_req_fd;</div><div class='ctx'> </div><div class='del'>-	if (filp-&gt;f_op != &amp;request_fops)</div><div class='add'>+	if (f.file-&gt;f_op != &amp;request_fops)</div><div class='ctx'> 		goto err_fput;</div><div class='del'>-	req = filp-&gt;private_data;</div><div class='add'>+	req = f.file-&gt;private_data;</div><div class='ctx'> 	if (req-&gt;mdev != mdev)</div><div class='ctx'> 		goto err_fput;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: as long as someone has an open filehandle of the request,</div><div class='del'>-	 * the request can never be released. The fget() above ensures that</div><div class='add'>+	 * the request can never be released. The fdget() above ensures that</div><div class='ctx'> 	 * even if userspace closes the request filehandle, the release()</div><div class='ctx'> 	 * fop won't be called, so the media_request_get() always succeeds</div><div class='ctx'> 	 * and there is no race condition where the request was released</div><div class='ctx'> 	 * before media_request_get() is called.</div><div class='ctx'> 	 */</div><div class='ctx'> 	media_request_get(req);</div><div class='del'>-	fput(filp);</div><div class='add'>+	fdput(f);</div><div class='ctx'> </div><div class='ctx'> 	return req;</div><div class='ctx'> </div><div class='ctx'> err_fput:</div><div class='del'>-	fput(filp);</div><div class='add'>+	fdput(f);</div><div class='ctx'> </div><div class='ctx'> err_no_req_fd:</div><div class='ctx'> 	dev_dbg(mdev-&gt;dev, "cannot find request_fd %d\n", request_fd);</div><div class='hunk'>@@ -407,7 +407,7 @@ int media_request_object_bind(struct media_request *req,</div><div class='ctx'> 	int ret = -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!ops-&gt;release))</div><div class='del'>-		return -EACCES;</div><div class='add'>+		return -EBADR;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;req-&gt;lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/mmc/siano/Kconfig b/drivers/media/mmc/siano/Kconfig<br/>index 7693487e2f63..3941ee8352bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/mmc/siano/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/mmc/siano/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/mmc/siano/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/mmc/siano/Kconfig</a></div><div class='hunk'>@@ -9,5 +9,5 @@ config SMS_SDIO_DRV</div><div class='ctx'> 	depends on !RC_CORE || RC_CORE</div><div class='ctx'> 	select MEDIA_COMMON_OPTIONS</div><div class='ctx'> 	select SMS_SIANO_MDTV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose if you would like to have Siano's support for SDIO interface</div><div class='head'>diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig<br/>index bc89e37608cd..0f46db7d5ffc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/bt8xx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/bt8xx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/bt8xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/bt8xx/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,7 @@ config VIDEO_BT848</div><div class='ctx'> 	select VIDEO_SAA6588 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select RADIO_ADAPTERS</div><div class='ctx'> 	select RADIO_TEA575X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for BT848 based frame grabber/overlay boards. This includes</div><div class='ctx'> 	  the Miro, Hauppauge and STB boards. Please read the material in</div><div class='ctx'> 	  &lt;file:Documentation/media/v4l-drivers/bttv.rst&gt; for more information.</div><div class='head'>diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c<br/>index c94318c71a0c..e929797206f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/bt8xx/dst.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/bt8xx/dst.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/bt8xx/dst.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/bt8xx/dst.c</a></div><div class='hunk'>@@ -1100,7 +1100,8 @@ static int dst_get_device_id(struct dst_state *state)</div><div class='ctx'> 			/*	Card capabilities	*/</div><div class='ctx'> 			state-&gt;dst_hw_cap = p_dst_type-&gt;dst_feature;</div><div class='ctx'> 			pr_err("Recognise [%s]\n", p_dst_type-&gt;device_id);</div><div class='del'>-			strncpy(&amp;state-&gt;fw_name[0], p_dst_type-&gt;device_id, 6);</div><div class='add'>+			strscpy(state-&gt;fw_name, p_dst_type-&gt;device_id,</div><div class='add'>+			        sizeof(state-&gt;fw_name));</div><div class='ctx'> 			/*	Multiple tuners		*/</div><div class='ctx'> 			if (p_dst_type-&gt;tuner_type &amp; TUNER_TYPE_MULTI) {</div><div class='ctx'> 				switch (use_dst_type) {</div><div class='head'>diff --git a/drivers/media/pci/bt8xx/dst_common.h b/drivers/media/pci/bt8xx/dst_common.h<br/>index 6a2cfdd44e3e..79dec1b1722c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/bt8xx/dst_common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/bt8xx/dst_common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/bt8xx/dst_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/bt8xx/dst_common.h</a></div><div class='hunk'>@@ -138,7 +138,7 @@ struct dst_state {</div><div class='ctx'> 	u32 tuner_type;</div><div class='ctx'> 	char *tuner_name;</div><div class='ctx'> 	struct mutex dst_mutex;</div><div class='del'>-	u8 fw_name[8];</div><div class='add'>+	char fw_name[8];</div><div class='ctx'> 	struct dvb_device *dst_ca;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/cobalt/Kconfig b/drivers/media/pci/cobalt/Kconfig<br/>index aa35cbc0a904..9a544bab3178 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cobalt/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cobalt/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cobalt/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cobalt/Kconfig</a></div><div class='hunk'>@@ -11,7 +11,7 @@ config VIDEO_COBALT</div><div class='ctx'> 	select VIDEO_ADV7511</div><div class='ctx'> 	select VIDEO_ADV7842</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the Cisco PCIe Cobalt card.</div><div class='ctx'> </div><div class='ctx'> 	  This board is sadly not available outside of Cisco, but it is</div><div class='head'>diff --git a/drivers/media/pci/cobalt/cobalt-irq.c b/drivers/media/pci/cobalt/cobalt-irq.c<br/>index 04783e78cc12..a518927abae1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cobalt/cobalt-irq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cobalt/cobalt-irq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cobalt/cobalt-irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cobalt/cobalt-irq.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ done:</div><div class='ctx'> 	cb-&gt;vb.sequence = s-&gt;sequence++;</div><div class='ctx'> 	vb2_buffer_done(&amp;cb-&gt;vb.vb2_buf,</div><div class='ctx'> 			(skip || s-&gt;unstable_frame) ?</div><div class='del'>-			VB2_BUF_STATE_REQUEUEING : VB2_BUF_STATE_DONE);</div><div class='add'>+			VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t cobalt_irq_handler(int irq, void *dev_id)</div><div class='head'>diff --git a/drivers/media/pci/cx18/Kconfig b/drivers/media/pci/cx18/Kconfig<br/>index c675b83c43a9..96477bba0d5c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx18/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx18/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx18/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cx18/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,7 @@ config VIDEO_CX18</div><div class='ctx'> 	select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant cx23418 based</div><div class='ctx'> 	  PCI combo video recorder devices.</div><div class='ctx'> </div><div class='hunk'>@@ -27,7 +27,7 @@ config VIDEO_CX18_ALSA</div><div class='ctx'> 	tristate "Conexant 23418 DMA audio support"</div><div class='ctx'> 	depends on VIDEO_CX18 &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for direct (DMA) audio on</div><div class='ctx'> 	  Conexant 23418 based TV cards using ALSA.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/cx18/cx18-fileops.c b/drivers/media/pci/cx18/cx18-fileops.c<br/>index f778965a2eb8..59e78fb17575 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx18/cx18-fileops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx18/cx18-fileops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx18/cx18-fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cx18/cx18-fileops.c</a></div><div class='hunk'>@@ -484,7 +484,7 @@ static ssize_t cx18_read_pos(struct cx18_stream *s, char __user *ubuf,</div><div class='ctx'> </div><div class='ctx'> 	CX18_DEBUG_HI_FILE("read %zd from %s, got %zd\n", count, s-&gt;name, rc);</div><div class='ctx'> 	if (rc &gt; 0)</div><div class='del'>-		pos += rc;</div><div class='add'>+		*pos += rc;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig<br/>index 3435bbaa3167..1bba9e497915 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx23885/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx23885/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx23885/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cx23885/Kconfig</a></div><div class='hunk'>@@ -43,7 +43,7 @@ config VIDEO_CX23885</div><div class='ctx'> 	select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_TUNER_DIB0070 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant 23885 based</div><div class='ctx'> 	  TV cards.</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +54,7 @@ config MEDIA_ALTERA_CI</div><div class='ctx'> 	tristate "Altera FPGA based CI module"</div><div class='ctx'> 	depends on VIDEO_CX23885 &amp;&amp; DVB_CORE</div><div class='ctx'> 	select ALTERA_STAPL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  An Altera FPGA CI module for NetUP Dual DVB-T/C RF CI card.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c<br/>index 0d0929c54f93..e2e63f05645e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx23885/cx23885-dvb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx23885/cx23885-dvb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx23885/cx23885-dvb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cx23885/cx23885-dvb.c</a></div><div class='hunk'>@@ -1474,8 +1474,9 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='ctx'> 			struct i2c_adapter *tun_i2c;</div><div class='ctx'> </div><div class='del'>-			fe0-&gt;dvb.frontend-&gt;sec_priv = kmalloc(sizeof(dib7000p_ops), GFP_KERNEL);</div><div class='del'>-			memcpy(fe0-&gt;dvb.frontend-&gt;sec_priv, &amp;dib7000p_ops, sizeof(dib7000p_ops));</div><div class='add'>+			fe0-&gt;dvb.frontend-&gt;sec_priv = kmemdup(&amp;dib7000p_ops, sizeof(dib7000p_ops), GFP_KERNEL);</div><div class='add'>+			if (!fe0-&gt;dvb.frontend-&gt;sec_priv)</div><div class='add'>+				return -ENOMEM;</div><div class='ctx'> 			tun_i2c = dib7000p_ops.get_i2c_master(fe0-&gt;dvb.frontend, DIBX000_I2C_INTERFACE_TUNER, 1);</div><div class='ctx'> 			if (!dvb_attach(dib0070_attach, fe0-&gt;dvb.frontend, tun_i2c, &amp;dib7070p_dib0070_config))</div><div class='ctx'> 				return -ENODEV;</div><div class='head'>diff --git a/drivers/media/pci/cx25821/Kconfig b/drivers/media/pci/cx25821/Kconfig<br/>index 1755d3d2feaa..a64fa9a6d5d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx25821/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx25821/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx25821/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cx25821/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@ config VIDEO_CX25821</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; PCI &amp;&amp; I2C</div><div class='ctx'> 	select I2C_ALGOBIT</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant 25821 based</div><div class='ctx'> 	  TV cards.</div><div class='ctx'> </div><div class='hunk'>@@ -14,7 +14,7 @@ config VIDEO_CX25821_ALSA</div><div class='ctx'> 	tristate "Conexant 25821 DMA audio support"</div><div class='ctx'> 	depends on VIDEO_CX25821 &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for direct (DMA) audio on</div><div class='ctx'> 	  Conexant 25821 based capture cards using ALSA.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig<br/>index 14b813d634a8..fbb17ddb6bc3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx88/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/cx88/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/cx88/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/cx88/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@ config VIDEO_CX88</div><div class='ctx'> 	select VIDEO_TUNER</div><div class='ctx'> 	select VIDEO_TVEEPROM</div><div class='ctx'> 	select VIDEO_WM8775 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant 2388x based</div><div class='ctx'> 	  TV cards.</div><div class='ctx'> </div><div class='hunk'>@@ -17,7 +17,7 @@ config VIDEO_CX88_ALSA</div><div class='ctx'> 	tristate "Conexant 2388x DMA audio support"</div><div class='ctx'> 	depends on VIDEO_CX88 &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for direct (DMA) audio on</div><div class='ctx'> 	  Conexant 2388x based TV cards using ALSA.</div><div class='ctx'> </div><div class='hunk'>@@ -33,7 +33,7 @@ config VIDEO_CX88_BLACKBIRD</div><div class='ctx'> 	tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"</div><div class='ctx'> 	depends on VIDEO_CX88</div><div class='ctx'> 	select VIDEO_CX2341X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for MPEG encoder cards based on the</div><div class='ctx'> 	  Blackbird reference design, using the Conexant 2388x</div><div class='ctx'> 	  and 23416 chips.</div><div class='hunk'>@@ -64,7 +64,7 @@ config VIDEO_CX88_DVB</div><div class='ctx'> 	select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for DVB/ATSC cards based on the</div><div class='ctx'> 	  Conexant 2388x chip.</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +75,7 @@ config VIDEO_CX88_ENABLE_VP3054</div><div class='ctx'> 	bool "VP-3054 Secondary I2C Bus Support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on VIDEO_CX88_DVB &amp;&amp; DVB_MT352</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds DVB-T support for cards based on the</div><div class='ctx'> 	  Conexant 2388x chip and the MT352 demodulator,</div><div class='ctx'> 	  which also require support for the VP-3054</div><div class='head'>diff --git a/drivers/media/pci/ddbridge/Kconfig b/drivers/media/pci/ddbridge/Kconfig<br/>index 16faef265e97..fc98b6d575d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ddbridge/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ddbridge/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ddbridge/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/ddbridge/Kconfig</a></div><div class='hunk'>@@ -15,7 +15,7 @@ config DVB_DDBRIDGE</div><div class='ctx'> 	select DVB_MXL5XX if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_CXD2099 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_DUMMY_FE if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for cards with the Digital Devices PCI express bridge:</div><div class='ctx'> 	  - Octopus PCIe Bridge</div><div class='ctx'> 	  - Octopus mini PCIe Bridge</div><div class='hunk'>@@ -36,7 +36,7 @@ config DVB_DDBRIDGE_MSIENABLE</div><div class='ctx'> 	depends on DVB_DDBRIDGE</div><div class='ctx'> 	depends on PCI_MSI</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Use PCI MSI (Message Signaled Interrupts) per default. Enabling this</div><div class='ctx'> 	  might lead to I2C errors originating from the bridge in conjunction</div><div class='ctx'> 	  with certain SATA controllers, requiring a reload of the ddbridge</div><div class='head'>diff --git a/drivers/media/pci/dt3155/Kconfig b/drivers/media/pci/dt3155/Kconfig<br/>index 858b0f2f15be..d770eec541d4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/dt3155/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/dt3155/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/dt3155/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/dt3155/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@ config VIDEO_DT3155</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_DEV &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables dt3155 device driver for the DataTranslation DT3155 frame grabber.</div><div class='ctx'> 	  Say Y here if you have this hardware.</div><div class='ctx'> 	  In doubt, say N.</div><div class='head'>diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c<br/>index 17d69bd5d7f1..49677ee889e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/dt3155/dt3155.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/dt3155/dt3155.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/dt3155/dt3155.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/dt3155/dt3155.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@ static int read_i2c_reg(void __iomem *addr, u8 index, u8 *data)</div><div class='ctx'> 	u32 tmp = index;</div><div class='ctx'> </div><div class='ctx'> 	iowrite32((tmp &lt;&lt; 17) | IIC_READ, addr + IIC_CSR2);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	udelay(45); /* wait at least 43 usec for NEW_CYCLE to clear */</div><div class='ctx'> 	if (ioread32(addr + IIC_CSR2) &amp; NEW_CYCLE)</div><div class='ctx'> 		return -EIO; /* error: NEW_CYCLE not cleared */</div><div class='hunk'>@@ -77,7 +76,6 @@ static int write_i2c_reg(void __iomem *addr, u8 index, u8 data)</div><div class='ctx'> 	u32 tmp = index;</div><div class='ctx'> </div><div class='ctx'> 	iowrite32((tmp &lt;&lt; 17) | IIC_WRITE | data, addr + IIC_CSR2);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	udelay(65); /* wait at least 63 usec for NEW_CYCLE to clear */</div><div class='ctx'> 	if (ioread32(addr + IIC_CSR2) &amp; NEW_CYCLE)</div><div class='ctx'> 		return -EIO; /* error: NEW_CYCLE not cleared */</div><div class='hunk'>@@ -104,7 +102,6 @@ static void write_i2c_reg_nowait(void __iomem *addr, u8 index, u8 data)</div><div class='ctx'> 	u32 tmp = index;</div><div class='ctx'> </div><div class='ctx'> 	iowrite32((tmp &lt;&lt; 17) | IIC_WRITE | data, addr + IIC_CSR2);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -264,7 +261,6 @@ static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)</div><div class='ctx'> 						FLD_DN_ODD | FLD_DN_EVEN |</div><div class='ctx'> 						CAP_CONT_EVEN | CAP_CONT_ODD,</div><div class='ctx'> 							ipd-&gt;regs + CSR1);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ipd-&gt;lock);</div><div class='hunk'>@@ -282,7 +278,6 @@ static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)</div><div class='ctx'> 		iowrite32(dma_addr + ipd-&gt;width, ipd-&gt;regs + ODD_DMA_START);</div><div class='ctx'> 		iowrite32(ipd-&gt;width, ipd-&gt;regs + EVEN_DMA_STRIDE);</div><div class='ctx'> 		iowrite32(ipd-&gt;width, ipd-&gt;regs + ODD_DMA_STRIDE);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable interrupts, clear all irq flags */</div><div class='hunk'>@@ -437,12 +432,10 @@ static int dt3155_init_board(struct dt3155_priv *pd)</div><div class='ctx'> 	/*  resetting the adapter  */</div><div class='ctx'> 	iowrite32(ADDR_ERR_ODD | ADDR_ERR_EVEN | FLD_CRPT_ODD | FLD_CRPT_EVEN |</div><div class='ctx'> 			FLD_DN_ODD | FLD_DN_EVEN, pd-&gt;regs + CSR1);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	msleep(20);</div><div class='ctx'> </div><div class='ctx'> 	/*  initializing adapter registers  */</div><div class='ctx'> 	iowrite32(FIFO_EN | SRST, pd-&gt;regs + CSR1);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	iowrite32(0xEEEEEE01, pd-&gt;regs + EVEN_PIXEL_FMT);</div><div class='ctx'> 	iowrite32(0xEEEEEE01, pd-&gt;regs + ODD_PIXEL_FMT);</div><div class='ctx'> 	iowrite32(0x00000020, pd-&gt;regs + FIFO_TRIGER);</div><div class='hunk'>@@ -454,7 +447,6 @@ static int dt3155_init_board(struct dt3155_priv *pd)</div><div class='ctx'> 	iowrite32(0, pd-&gt;regs + MASK_LENGTH);</div><div class='ctx'> 	iowrite32(0x0005007C, pd-&gt;regs + FIFO_FLAG_CNT);</div><div class='ctx'> 	iowrite32(0x01010101, pd-&gt;regs + IIC_CLK_DUR);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	/* verifying that we have a DT3155 board (not just a SAA7116 chip) */</div><div class='ctx'> 	read_i2c_reg(pd-&gt;regs, DT_ID, &amp;tmp);</div><div class='head'>diff --git a/drivers/media/pci/intel/ipu3/Kconfig b/drivers/media/pci/intel/ipu3/Kconfig<br/>index 715f77651482..bd518bdc9f5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/intel/ipu3/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/intel/ipu3/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/intel/ipu3/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/intel/ipu3/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config VIDEO_IPU3_CIO2</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the Intel IPU3 CIO2 CSI-2 receiver unit, found in Intel</div><div class='ctx'> 	  Skylake and Kaby Lake SoCs and used for capturing images and</div><div class='ctx'> 	  video from a camera sensor.</div><div class='head'>diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c<br/>index f8020ebe9f05..2a52a393fe74 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/intel/ipu3/ipu3-cio2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/intel/ipu3/ipu3-cio2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/intel/ipu3/ipu3-cio2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/intel/ipu3/ipu3-cio2.c</a></div><div class='hunk'>@@ -1601,6 +1601,7 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q)</div><div class='ctx'> 	subdev-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	snprintf(subdev-&gt;name, sizeof(subdev-&gt;name),</div><div class='ctx'> 		 CIO2_ENTITY_NAME " %td", q - cio2-&gt;queue);</div><div class='add'>+	subdev-&gt;entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;</div><div class='ctx'> 	v4l2_set_subdevdata(subdev, cio2);</div><div class='ctx'> 	r = v4l2_device_register_subdev(&amp;cio2-&gt;v4l2_dev, subdev);</div><div class='ctx'> 	if (r) {</div><div class='head'>diff --git a/drivers/media/pci/ivtv/Kconfig b/drivers/media/pci/ivtv/Kconfig<br/>index 06ca4e23f9fb..e96b3c182a2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ivtv/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ivtv/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ivtv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/ivtv/Kconfig</a></div><div class='hunk'>@@ -18,7 +18,7 @@ config VIDEO_IVTV</div><div class='ctx'> 	select VIDEO_VP27SMPX</div><div class='ctx'> 	select VIDEO_UPD64031A</div><div class='ctx'> 	select VIDEO_UPD64083</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant cx23416 or cx23415 based</div><div class='ctx'> 	  PCI personal video recorder devices.</div><div class='ctx'> </div><div class='hunk'>@@ -32,7 +32,7 @@ config VIDEO_IVTV_DEPRECATED_IOCTLS</div><div class='ctx'> 	bool "enable the DVB ioctls abuse on ivtv driver"</div><div class='ctx'> 	depends on VIDEO_IVTV</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable the usage of the a DVB set of ioctls that were abused by</div><div class='ctx'> 	  IVTV driver for a while.</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +45,7 @@ config VIDEO_IVTV_ALSA</div><div class='ctx'> 	tristate "Conexant cx23415/cx23416 ALSA interface for PCM audio capture"</div><div class='ctx'> 	depends on VIDEO_IVTV &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver provides an ALSA interface as another method for user</div><div class='ctx'> 	  applications to obtain PCM audio data from Conexant cx23415/cx23416</div><div class='ctx'> 	  based PCI TV cards supported by the ivtv driver.</div><div class='hunk'>@@ -63,7 +63,7 @@ config VIDEO_FB_IVTV</div><div class='ctx'> 	select FB_CFB_FILLRECT</div><div class='ctx'> 	select FB_CFB_COPYAREA</div><div class='ctx'> 	select FB_CFB_IMAGEBLIT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a framebuffer driver for the Conexant cx23415 MPEG</div><div class='ctx'> 	  encoder/decoder.</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +77,7 @@ config VIDEO_FB_IVTV_FORCE_PAT</div><div class='ctx'> 	bool "force cx23415 framebuffer init with x86 PAT enabled"</div><div class='ctx'> 	depends on VIDEO_FB_IVTV &amp;&amp; X86_PAT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  With PAT enabled, the cx23415 framebuffer driver does not</div><div class='ctx'> 	  utilize write-combined caching on the framebuffer memory.</div><div class='ctx'> 	  For this reason, the driver will by default disable itself</div><div class='head'>diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c<br/>index 6196daae4b3e..043ac0ae9ed0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ivtv/ivtv-fileops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ivtv/ivtv-fileops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ivtv/ivtv-fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/ivtv/ivtv-fileops.c</a></div><div class='hunk'>@@ -420,7 +420,7 @@ static ssize_t ivtv_read_pos(struct ivtv_stream *s, char __user *ubuf, size_t co</div><div class='ctx'> </div><div class='ctx'> 	IVTV_DEBUG_HI_FILE("read %zd from %s, got %zd\n", count, s-&gt;name, rc);</div><div class='ctx'> 	if (rc &gt; 0)</div><div class='del'>-		pos += rc;</div><div class='add'>+		*pos += rc;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/mantis/mantis_i2c.c b/drivers/media/pci/mantis/mantis_i2c.c<br/>index 6528a2180119..f8b503ef42bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/mantis/mantis_i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/mantis/mantis_i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/mantis/mantis_i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/mantis/mantis_i2c.c</a></div><div class='hunk'>@@ -225,7 +225,7 @@ int mantis_i2c_init(struct mantis_pci *mantis)</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;mantis-&gt;i2c_wq);</div><div class='ctx'> 	mutex_init(&amp;mantis-&gt;i2c_lock);</div><div class='del'>-	strncpy(i2c_adapter-&gt;name, "Mantis I2C", sizeof(i2c_adapter-&gt;name));</div><div class='add'>+	strscpy(i2c_adapter-&gt;name, "Mantis I2C", sizeof(i2c_adapter-&gt;name));</div><div class='ctx'> 	i2c_set_adapdata(i2c_adapter, mantis);</div><div class='ctx'> </div><div class='ctx'> 	i2c_adapter-&gt;owner	= THIS_MODULE;</div><div class='head'>diff --git a/drivers/media/pci/meye/Kconfig b/drivers/media/pci/meye/Kconfig<br/>index 9a50f54231ad..ce0463c81886 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/meye/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/meye/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/meye/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/meye/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config VIDEO_MEYE</div><div class='ctx'> 	tristate "Sony Vaio Picturebook Motion Eye Video For Linux"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on SONY_LAPTOP || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the video4linux driver for the Motion Eye camera found</div><div class='ctx'> 	  in the Vaio Picturebook laptops. Please read the material in</div><div class='ctx'> 	  &lt;file:Documentation/media/v4l-drivers/meye.rst&gt; for more information.</div><div class='head'>diff --git a/drivers/media/pci/netup_unidvb/Kconfig b/drivers/media/pci/netup_unidvb/Kconfig<br/>index b663154d0cc4..60057585f04c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/netup_unidvb/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/netup_unidvb/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/netup_unidvb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/netup_unidvb/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ config DVB_NETUP_UNIDVB</div><div class='ctx'> 	select DVB_HELENE if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_LNBH25 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for NetUP PCI express Universal DVB card.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y when you want to support NetUP Dual Universal DVB card.</div><div class='head'>diff --git a/drivers/media/pci/ngene/Kconfig b/drivers/media/pci/ngene/Kconfig<br/>index e06d019996f3..8a80a5bab8e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ngene/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/ngene/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/ngene/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/ngene/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,6 @@ config DVB_NGENE</div><div class='ctx'> 	select DVB_STV6111 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_LNBH25 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_CXD2099 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Micronas PCI express cards with nGene bridge.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/saa7134/Kconfig b/drivers/media/pci/saa7134/Kconfig<br/>index b44e0d70907e..8b28783b3fcd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7134/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7134/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7134/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/saa7134/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config VIDEO_SAA7134</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select VIDEO_SAA6588 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select VIDEO_SAA6752HS if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Philips SAA713x based</div><div class='ctx'> 	  TV cards.</div><div class='ctx'> </div><div class='hunk'>@@ -18,7 +18,7 @@ config VIDEO_SAA7134_ALSA</div><div class='ctx'> 	tristate "Philips SAA7134 DMA audio support"</div><div class='ctx'> 	depends on VIDEO_SAA7134 &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for direct (DMA) audio in</div><div class='ctx'> 	  Philips SAA713x based TV cards using ALSA</div><div class='ctx'> </div><div class='hunk'>@@ -31,7 +31,7 @@ config VIDEO_SAA7134_RC</div><div class='ctx'> 	depends on VIDEO_SAA7134</div><div class='ctx'> 	depends on !(RC_CORE=m &amp;&amp; VIDEO_SAA7134=y)</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables Remote Controller support on saa7134 driver.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_SAA7134_DVB</div><div class='hunk'>@@ -57,7 +57,7 @@ config VIDEO_SAA7134_DVB</div><div class='ctx'> 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_ZL10039 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for DVB cards based on the</div><div class='ctx'> 	  Philips saa7134 chip.</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +68,6 @@ config VIDEO_SAA7134_GO7007</div><div class='ctx'> 	tristate "go7007 support for saa7134 based TV cards"</div><div class='ctx'> 	depends on VIDEO_SAA7134</div><div class='ctx'> 	depends on VIDEO_GO7007</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables saa7134 driver support for boards with go7007</div><div class='ctx'> 	  MPEG encoder (WIS Voyager or compatible).</div><div class='head'>diff --git a/drivers/media/pci/saa7134/saa7134-go7007.c b/drivers/media/pci/saa7134/saa7134-go7007.c<br/>index 275c5e151818..626e130a9770 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7134/saa7134-go7007.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7134/saa7134-go7007.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7134/saa7134-go7007.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/saa7134/saa7134-go7007.c</a></div><div class='hunk'>@@ -444,7 +444,7 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)</div><div class='ctx'> 	sd = &amp;saa-&gt;sd;</div><div class='ctx'> 	v4l2_subdev_init(sd, &amp;saa7134_go7007_sd_ops);</div><div class='ctx'> 	v4l2_set_subdevdata(sd, saa);</div><div class='del'>-	strncpy(sd-&gt;name, "saa7134-go7007", sizeof(sd-&gt;name));</div><div class='add'>+	strscpy(sd-&gt;name, "saa7134-go7007", sizeof(sd-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a couple pages for receiving the compressed stream */</div><div class='ctx'> 	saa-&gt;top = (u8 *)get_zeroed_page(GFP_KERNEL);</div><div class='head'>diff --git a/drivers/media/pci/saa7146/Kconfig b/drivers/media/pci/saa7146/Kconfig<br/>index da88b77a916c..60d9862580ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7146/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7146/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7146/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/saa7146/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config VIDEO_HEXIUM_GEMINI</div><div class='ctx'> 	tristate "Hexium Gemini frame grabber"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select VIDEO_SAA7146_VV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the Hexium Gemini frame</div><div class='ctx'> 	  grabber card by Hexium. Please note that the Gemini Dual</div><div class='ctx'> 	  card is *not* fully supported.</div><div class='hunk'>@@ -14,7 +14,7 @@ config VIDEO_HEXIUM_ORION</div><div class='ctx'> 	tristate "Hexium HV-PCI6 and Orion frame grabber"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='ctx'> 	select VIDEO_SAA7146_VV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the Hexium HV-PCI6 and</div><div class='ctx'> 	  Orion frame grabber cards by Hexium.</div><div class='ctx'> </div><div class='hunk'>@@ -30,7 +30,7 @@ config VIDEO_MXB</div><div class='ctx'> 	select VIDEO_TDA9840 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select VIDEO_TEA6415C if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select VIDEO_TEA6420 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the 'Multimedia eXtension Board'</div><div class='ctx'> 	  TV card by Siemens-Nixdorf.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c<br/>index 5817d9cde4d0..6d8e4afe9673 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7146/hexium_gemini.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7146/hexium_gemini.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7146/hexium_gemini.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/saa7146/hexium_gemini.c</a></div><div class='hunk'>@@ -270,9 +270,8 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d</div><div class='ctx'> 	/* enable i2c-port pins */</div><div class='ctx'> 	saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));</div><div class='ctx'> </div><div class='del'>-	hexium-&gt;i2c_adapter = (struct i2c_adapter) {</div><div class='del'>-		.name = "hexium gemini",</div><div class='del'>-	};</div><div class='add'>+	strscpy(hexium-&gt;i2c_adapter.name, "hexium gemini",</div><div class='add'>+		sizeof(hexium-&gt;i2c_adapter.name));</div><div class='ctx'> 	saa7146_i2c_adapter_prepare(dev, &amp;hexium-&gt;i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);</div><div class='ctx'> 	if (i2c_add_adapter(&amp;hexium-&gt;i2c_adapter) &lt; 0) {</div><div class='ctx'> 		DEB_S("cannot register i2c-device. skipping.\n");</div><div class='head'>diff --git a/drivers/media/pci/saa7146/hexium_orion.c b/drivers/media/pci/saa7146/hexium_orion.c<br/>index 0a05176c18ab..a794f9e5f990 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7146/hexium_orion.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7146/hexium_orion.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7146/hexium_orion.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/saa7146/hexium_orion.c</a></div><div class='hunk'>@@ -231,9 +231,8 @@ static int hexium_probe(struct saa7146_dev *dev)</div><div class='ctx'> 	saa7146_write(dev, DD1_STREAM_B, 0x00000000);</div><div class='ctx'> 	saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));</div><div class='ctx'> </div><div class='del'>-	hexium-&gt;i2c_adapter = (struct i2c_adapter) {</div><div class='del'>-		.name = "hexium orion",</div><div class='del'>-	};</div><div class='add'>+	strscpy(hexium-&gt;i2c_adapter.name, "hexium orion",</div><div class='add'>+		sizeof(hexium-&gt;i2c_adapter.name));</div><div class='ctx'> 	saa7146_i2c_adapter_prepare(dev, &amp;hexium-&gt;i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);</div><div class='ctx'> 	if (i2c_add_adapter(&amp;hexium-&gt;i2c_adapter) &lt; 0) {</div><div class='ctx'> 		DEB_S("cannot register i2c-device. skipping.\n");</div><div class='head'>diff --git a/drivers/media/pci/saa7164/Kconfig b/drivers/media/pci/saa7164/Kconfig<br/>index 9098ef5feca4..265c5a4fd823 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7164/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/saa7164/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/saa7164/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/saa7164/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ config VIDEO_SAA7164</div><div class='ctx'> 	select DVB_TDA10048 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for NXP SAA7164 based</div><div class='ctx'> 	  TV cards.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/solo6x10/Kconfig b/drivers/media/pci/solo6x10/Kconfig<br/>index d9e06a6bf1eb..2061d02a82d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/solo6x10/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/solo6x10/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/solo6x10/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/solo6x10/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ config VIDEO_SOLO6X10</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select FONT_8x16</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Bluecherry H.264 and MPEG-4 hardware</div><div class='ctx'> 	  compression capture cards and other Softlogic-based ones.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/pci/tw5864/Kconfig b/drivers/media/pci/tw5864/Kconfig<br/>index 760fb11dfeae..e5d52f076232 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/tw5864/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/tw5864/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/tw5864/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/tw5864/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config VIDEO_TW5864</div><div class='ctx'> 	tristate "Techwell TW5864 video/audio grabber and encoder"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; PCI &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for boards based on Techwell TW5864 chip which provides</div><div class='ctx'> 	  multichannel video &amp; audio grabbing and encoding (H.264, MJPEG,</div><div class='ctx'> 	  ADPCM G.726).</div><div class='head'>diff --git a/drivers/media/pci/tw5864/tw5864-video.c b/drivers/media/pci/tw5864/tw5864-video.c<br/>index 5a1f3aa4101a..434d313a3c15 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/tw5864/tw5864-video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/tw5864/tw5864-video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/tw5864/tw5864-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/tw5864/tw5864-video.c</a></div><div class='hunk'>@@ -1395,13 +1395,13 @@ static void tw5864_handle_frame(struct tw5864_h264_frame *frame)</div><div class='ctx'> 	input-&gt;vb = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;input-&gt;slock, flags);</div><div class='ctx'> </div><div class='del'>-	v4l2_buf = to_vb2_v4l2_buffer(&amp;vb-&gt;vb.vb2_buf);</div><div class='del'>-</div><div class='ctx'> 	if (!vb) { /* Gone because of disabling */</div><div class='ctx'> 		dev_dbg(&amp;dev-&gt;pci-&gt;dev, "vb is empty, dropping frame\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	v4l2_buf = to_vb2_v4l2_buffer(&amp;vb-&gt;vb.vb2_buf);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for space.</div><div class='ctx'> 	 * Mind the overhead of startcode emulation prevention.</div><div class='head'>diff --git a/drivers/media/pci/tw68/Kconfig b/drivers/media/pci/tw68/Kconfig<br/>index 95d5d5202048..4bfc4fa416e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/tw68/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/pci/tw68/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/pci/tw68/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/pci/tw68/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config VIDEO_TW68</div><div class='ctx'> 	tristate "Techwell tw68x Video For Linux"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; PCI &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Techwell tw68xx based frame grabber boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig<br/>index 4acbed189644..011c1c2fcf19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@ menuconfig V4L_PLATFORM_DRIVERS</div><div class='ctx'> 	bool "V4L platform devices"</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable support for platform-specific V4L drivers.</div><div class='ctx'> </div><div class='ctx'> if V4L_PLATFORM_DRIVERS</div><div class='hunk'>@@ -55,7 +55,7 @@ config VIDEO_VIU</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; (PPC_MPC512x || COMPILE_TEST) &amp;&amp; I2C</div><div class='ctx'> 	select VIDEOBUF_DMA_CONTIG</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Freescale VIU video driver. This device captures</div><div class='ctx'> 	  video data, or overlays video on DIU frame buffer.</div><div class='ctx'> </div><div class='hunk'>@@ -80,13 +80,13 @@ config VIDEO_OMAP3</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select MFD_SYSCON</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for an OMAP 3 camera controller.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_OMAP3_DEBUG</div><div class='ctx'> 	bool "OMAP 3 Camera debug messages"</div><div class='ctx'> 	depends on VIDEO_OMAP3</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable debug messages on OMAP 3 camera controller driver.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_PXA27x</div><div class='hunk'>@@ -96,7 +96,7 @@ config VIDEO_PXA27x</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='ctx'> 	select SG_SPLIT</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a v4l2 driver for the PXA27x Quick Capture Interface</div><div class='ctx'> </div><div class='ctx'> config VIDEO_QCOM_CAMSS</div><div class='hunk'>@@ -112,7 +112,7 @@ config VIDEO_S3C_CAMIF</div><div class='ctx'> 	depends on PM</div><div class='ctx'> 	depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera</div><div class='ctx'> 	  host interface (CAMIF).</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +125,7 @@ config VIDEO_STM32_DCMI</div><div class='ctx'> 	depends on ARCH_STM32 || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This module makes the STM32 Digital Camera Memory Interface (DCMI)</div><div class='ctx'> 	  available as a v4l2 device.</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +138,7 @@ config VIDEO_RENESAS_CEU</div><div class='ctx'> 	depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a v4l2 driver for the Renesas CEU Interface</div><div class='ctx'> </div><div class='ctx'> source "drivers/media/platform/exynos4-is/Kconfig"</div><div class='hunk'>@@ -155,7 +155,7 @@ config VIDEO_TI_CAL</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the TI CAL (Camera Adaptation Layer) block</div><div class='ctx'> 	  found on DRA72X SoC.</div><div class='ctx'> 	  In TI Technical Reference Manual this module is referred as</div><div class='hunk'>@@ -168,7 +168,7 @@ menuconfig V4L_MEM2MEM_DRIVERS</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable selecting drivers for V4L devices that</div><div class='ctx'> 	  use system memory for both source and destination buffers, as opposed</div><div class='ctx'> 	  to capture and output drivers, which use memory buffers for just</div><div class='hunk'>@@ -184,7 +184,7 @@ config VIDEO_CODA</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='ctx'> 	select GENERIC_ALLOCATOR</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Coda is a range of video codec IPs that supports</div><div class='ctx'> 	   H.264, MPEG-4, and other video formats.</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +207,7 @@ config VIDEO_MEDIATEK_JPEG</div><div class='ctx'> 	depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Mediatek jpeg codec driver provides HW capability to decode</div><div class='ctx'> 	  JPEG format</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +218,7 @@ config VIDEO_MEDIATEK_VPU</div><div class='ctx'> 	tristate "Mediatek Video Processor Unit"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	    This driver provides downloading VPU firmware and</div><div class='ctx'> 	    communicating with VPU. This driver for hw video</div><div class='ctx'> 	    codec embedded in Mediatek's MT8173 SOCs. It is able</div><div class='hunk'>@@ -236,7 +236,7 @@ config VIDEO_MEDIATEK_MDP</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='ctx'> 	select VIDEO_MEDIATEK_VPU</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	    It is a v4l2 driver and present in Mediatek MT8173 SoCs.</div><div class='ctx'> 	    The driver supports for scaling and color space conversion.</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +252,7 @@ config VIDEO_MEDIATEK_VCODEC</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='ctx'> 	select VIDEO_MEDIATEK_VPU</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	    Mediatek video codec driver provides HW capability to</div><div class='ctx'> 	    encode and decode in a range of video formats</div><div class='ctx'> 	    This driver rely on VPU driver to communicate with VPU.</div><div class='hunk'>@@ -276,7 +276,7 @@ config VIDEO_SAMSUNG_S5P_G2D</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D</div><div class='ctx'> 	  2d graphics accelerator.</div><div class='ctx'> </div><div class='hunk'>@@ -286,7 +286,7 @@ config VIDEO_SAMSUNG_S5P_JPEG</div><div class='ctx'> 	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a v4l2 driver for Samsung S5P, EXYNOS3250</div><div class='ctx'> 	  and EXYNOS4 JPEG codec</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +407,7 @@ config VIDEO_RENESAS_FDP1</div><div class='ctx'> 	depends on (!ARM64 &amp;&amp; !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 driver for the Renesas Fine Display Processor</div><div class='ctx'> 	  providing colour space conversion, and de-interlacing features.</div><div class='ctx'> </div><div class='hunk'>@@ -420,7 +420,7 @@ config VIDEO_RENESAS_JPU</div><div class='ctx'> 	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 driver for the Renesas JPEG Processing Unit.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -430,7 +430,7 @@ config VIDEO_RENESAS_FCP</div><div class='ctx'> 	tristate "Renesas Frame Compression Processor"</div><div class='ctx'> 	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='ctx'> 	depends on OF</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for the Renesas Frame Compression Processor (FCP).</div><div class='ctx'> 	  The FCP is a companion module of video processing modules in the</div><div class='ctx'> 	  Renesas R-Car Gen3 SoCs. It handles memory access for the codec,</div><div class='hunk'>@@ -446,7 +446,7 @@ config VIDEO_RENESAS_VSP1</div><div class='ctx'> 	depends on (!ARM64 &amp;&amp; !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 driver for the Renesas VSP1 video processing engine.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -459,7 +459,7 @@ config VIDEO_ROCKCHIP_RGA</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator.</div><div class='ctx'> 	  Rockchip RGA is a separate 2D raster graphic acceleration unit.</div><div class='ctx'> 	  It accelerates 2D graphics operations, such as point/line drawing,</div><div class='hunk'>@@ -477,14 +477,14 @@ config VIDEO_TI_VPE</div><div class='ctx'> 	select VIDEO_TI_SC</div><div class='ctx'> 	select VIDEO_TI_CSC</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the TI VPE(Video Processing Engine) block</div><div class='ctx'> 	  found on DRA7XX SoC.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_TI_VPE_DEBUG</div><div class='ctx'> 	bool "VPE debug messages"</div><div class='ctx'> 	depends on VIDEO_TI_VPE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable debug messages on VPE driver.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_QCOM_VENUS</div><div class='hunk'>@@ -495,7 +495,7 @@ config VIDEO_QCOM_VENUS</div><div class='ctx'> 	select QCOM_SCM if ARCH_QCOM</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a V4L2 driver for Qualcomm Venus video accelerator</div><div class='ctx'> 	  hardware. It accelerates encoding and decoding operations</div><div class='ctx'> 	  on various Qualcomm SoCs.</div><div class='hunk'>@@ -530,7 +530,7 @@ config VIDEO_VIM2M</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a virtual test device for the memory-to-memory driver</div><div class='ctx'> 	  framework.</div><div class='ctx'> </div><div class='hunk'>@@ -542,7 +542,7 @@ menuconfig DVB_PLATFORM_DRIVERS</div><div class='ctx'> 	bool "DVB platform devices"</div><div class='ctx'> 	depends on MEDIA_DIGITAL_TV_SUPPORT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable support for platform-specific Digital TV drivers.</div><div class='ctx'> </div><div class='ctx'> if DVB_PLATFORM_DRIVERS</div><div class='hunk'>@@ -562,7 +562,7 @@ config VIDEO_CROS_EC_CEC</div><div class='ctx'> 	select CEC_NOTIFIER</div><div class='ctx'> 	select CHROME_PLATFORMS</div><div class='ctx'> 	select CROS_EC_PROTO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you say yes here you will get support for the</div><div class='ctx'> 	  ChromeOS Embedded Controller's CEC.</div><div class='ctx'> 	  The CEC bus is present in the HDMI connector and enables communication</div><div class='hunk'>@@ -573,18 +573,34 @@ config VIDEO_MESON_AO_CEC</div><div class='ctx'> 	depends on ARCH_MESON || COMPILE_TEST</div><div class='ctx'> 	select CEC_CORE</div><div class='ctx'> 	select CEC_NOTIFIER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for Amlogic Meson SoCs AO CEC interface. It uses the</div><div class='ctx'> 	  generic CEC framework interface.</div><div class='ctx'> 	  CEC bus is present in the HDMI connector and enables communication</div><div class='ctx'> </div><div class='add'>+config VIDEO_MESON_G12A_AO_CEC</div><div class='add'>+	tristate "Amlogic Meson G12A AO CEC driver"</div><div class='add'>+	depends on ARCH_MESON || COMPILE_TEST</div><div class='add'>+	depends on COMMON_CLK &amp;&amp; OF</div><div class='add'>+	select REGMAP</div><div class='add'>+	select REGMAP_MMIO</div><div class='add'>+	select CEC_CORE</div><div class='add'>+	select CEC_NOTIFIER</div><div class='add'>+	---help---</div><div class='add'>+	  This is a driver for Amlogic Meson G12A SoCs AO CEC interface.</div><div class='add'>+	  This driver if for the new AO-CEC module found in G12A SoCs,</div><div class='add'>+	  usually named AO_CEC_B in documentation.</div><div class='add'>+	  It uses the generic CEC framework interface.</div><div class='add'>+	  CEC bus is present in the HDMI connector and enables communication</div><div class='add'>+	  between compatible devices.</div><div class='add'>+</div><div class='ctx'> config CEC_GPIO</div><div class='ctx'> 	tristate "Generic GPIO-based CEC driver"</div><div class='ctx'> 	depends on PREEMPT || COMPILE_TEST</div><div class='ctx'> 	select CEC_CORE</div><div class='ctx'> 	select CEC_PIN</div><div class='ctx'> 	select GPIOLIB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a generic GPIO-based CEC driver.</div><div class='ctx'> 	  The CEC bus is present in the HDMI connector and enables communication</div><div class='ctx'> 	  between compatible devices.</div><div class='hunk'>@@ -594,7 +610,7 @@ config VIDEO_SAMSUNG_S5P_CEC</div><div class='ctx'>        depends on ARCH_EXYNOS || COMPILE_TEST</div><div class='ctx'>        select CEC_CORE</div><div class='ctx'>        select CEC_NOTIFIER</div><div class='del'>-       ---help---</div><div class='add'>+       help</div><div class='ctx'> 	 This is a driver for Samsung S5P HDMI CEC interface. It uses the</div><div class='ctx'> 	 generic CEC framework interface.</div><div class='ctx'> 	 CEC bus is present in the HDMI connector and enables communication</div><div class='hunk'>@@ -605,7 +621,7 @@ config VIDEO_STI_HDMI_CEC</div><div class='ctx'>        depends on ARCH_STI || COMPILE_TEST</div><div class='ctx'>        select CEC_CORE</div><div class='ctx'>        select CEC_NOTIFIER</div><div class='del'>-       ---help---</div><div class='add'>+       help</div><div class='ctx'> 	 This is a driver for STIH4xx HDMI CEC interface. It uses the</div><div class='ctx'> 	 generic CEC framework interface.</div><div class='ctx'> 	 CEC bus is present in the HDMI connector and enables communication</div><div class='hunk'>@@ -617,7 +633,7 @@ config VIDEO_STM32_HDMI_CEC</div><div class='ctx'>        select REGMAP</div><div class='ctx'>        select REGMAP_MMIO</div><div class='ctx'>        select CEC_CORE</div><div class='del'>-       ---help---</div><div class='add'>+       help</div><div class='ctx'> 	 This is a driver for STM32 interface. It uses the</div><div class='ctx'> 	 generic CEC framework interface.</div><div class='ctx'> 	 CEC bus is present in the HDMI connector and enables communication</div><div class='hunk'>@@ -628,7 +644,7 @@ config VIDEO_TEGRA_HDMI_CEC</div><div class='ctx'>        depends on ARCH_TEGRA || COMPILE_TEST</div><div class='ctx'>        select CEC_CORE</div><div class='ctx'>        select CEC_NOTIFIER</div><div class='del'>-       ---help---</div><div class='add'>+       help</div><div class='ctx'> 	 This is a driver for the Tegra HDMI CEC interface. It uses the</div><div class='ctx'> 	 generic CEC framework interface.</div><div class='ctx'> 	 The CEC bus is present in the HDMI connector and enables communication</div><div class='hunk'>@@ -649,7 +665,7 @@ config VIDEO_SECO_CEC</div><div class='ctx'> config VIDEO_SECO_RC</div><div class='ctx'> 	bool "SECO Boards IR RC5 support"</div><div class='ctx'> 	depends on VIDEO_SECO_CEC</div><div class='del'>-	depends on RC_CORE</div><div class='add'>+	depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you will get support for the</div><div class='ctx'> 	  SECO Boards Consumer-IR in seco-cec driver.</div><div class='hunk'>@@ -662,7 +678,7 @@ menuconfig SDR_PLATFORM_DRIVERS</div><div class='ctx'> 	bool "SDR platform devices"</div><div class='ctx'> 	depends on MEDIA_SDR_SUPPORT</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable support for platform-specific SDR Drivers.</div><div class='ctx'> </div><div class='ctx'> if SDR_PLATFORM_DRIVERS</div><div class='hunk'>@@ -672,7 +688,7 @@ config VIDEO_RCAR_DRIF</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y if you want to enable R-Car Gen3 DRIF support. DRIF is Digital</div><div class='ctx'> 	  Radio Interface that interfaces with an RF front end chip. It is a</div><div class='ctx'> 	  receiver of digital data which uses DMA to transfer received data to</div><div class='head'>diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c<br/>index 5c17624aaade..fe7b937eb5f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/am437x/am437x-vpfe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/am437x/am437x-vpfe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/am437x/am437x-vpfe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/am437x/am437x-vpfe.c</a></div><div class='hunk'>@@ -1540,7 +1540,7 @@ static int vpfe_enum_fmt(struct file *file, void  *priv,</div><div class='ctx'> 	if (!fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strncpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description) - 1);</div><div class='add'>+	strscpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description));</div><div class='ctx'> 	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='ctx'> 	f-&gt;type = vpfe-&gt;fmt.type;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c<br/>index 692e08ef38c0..8144fe36ad48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/aspeed-video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/aspeed-video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/aspeed-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/aspeed-video.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_reserved_mem.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/sched.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='hunk'>@@ -208,7 +207,6 @@ struct aspeed_video {</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	struct clk *eclk;</div><div class='ctx'> 	struct clk *vclk;</div><div class='del'>-	struct reset_control *rst;</div><div class='ctx'> </div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct v4l2_ctrl_handler ctrl_handler;</div><div class='hunk'>@@ -483,19 +481,10 @@ static void aspeed_video_enable_mode_detect(struct aspeed_video *video)</div><div class='ctx'> 	aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_TRIG_MODE_DET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void aspeed_video_reset(struct aspeed_video *video)</div><div class='del'>-{</div><div class='del'>-	/* Reset the engine */</div><div class='del'>-	reset_control_assert(video-&gt;rst);</div><div class='del'>-</div><div class='del'>-	/* Don't usleep here; function may be called in interrupt context */</div><div class='del'>-	udelay(100);</div><div class='del'>-	reset_control_deassert(video-&gt;rst);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void aspeed_video_off(struct aspeed_video *video)</div><div class='ctx'> {</div><div class='del'>-	aspeed_video_reset(video);</div><div class='add'>+	/* Disable interrupts */</div><div class='add'>+	aspeed_video_write(video, VE_INTERRUPT_CTRL, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off the relevant clocks */</div><div class='ctx'> 	clk_disable_unprepare(video-&gt;vclk);</div><div class='hunk'>@@ -507,8 +496,6 @@ static void aspeed_video_on(struct aspeed_video *video)</div><div class='ctx'> 	/* Turn on the relevant clocks */</div><div class='ctx'> 	clk_prepare_enable(video-&gt;eclk);</div><div class='ctx'> 	clk_prepare_enable(video-&gt;vclk);</div><div class='del'>-</div><div class='del'>-	aspeed_video_reset(video);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aspeed_video_bufs_done(struct aspeed_video *video,</div><div class='hunk'>@@ -1464,7 +1451,9 @@ static void aspeed_video_stop_streaming(struct vb2_queue *q)</div><div class='ctx'> 		 * Need to force stop any DMA and try and get HW into a good</div><div class='ctx'> 		 * state for future calls to start streaming again.</div><div class='ctx'> 		 */</div><div class='del'>-		aspeed_video_reset(video);</div><div class='add'>+		aspeed_video_off(video);</div><div class='add'>+		aspeed_video_on(video);</div><div class='add'>+</div><div class='ctx'> 		aspeed_video_init_regs(video);</div><div class='ctx'> </div><div class='ctx'> 		aspeed_video_get_resolution(video);</div><div class='hunk'>@@ -1619,17 +1608,7 @@ static int aspeed_video_init(struct aspeed_video *video)</div><div class='ctx'> 		return PTR_ERR(video-&gt;vclk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	video-&gt;rst = devm_reset_control_get_exclusive(dev, NULL);</div><div class='del'>-	if (IS_ERR(video-&gt;rst)) {</div><div class='del'>-		dev_err(dev, "Unable to get VE reset\n");</div><div class='del'>-		return PTR_ERR(video-&gt;rst);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = of_reserved_mem_device_init(dev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(dev, "Unable to reserve memory\n");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+	of_reserved_mem_device_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (rc) {</div><div class='head'>diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig<br/>index a211ef20f77e..c3f6a47cdc0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/atmel/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/atmel/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/atmel/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/atmel/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,6 @@ config VIDEO_ATMEL_ISI</div><div class='ctx'> 	depends on ARCH_AT91 || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This module makes the ATMEL Image Sensor Interface available</div><div class='ctx'> 	  as a v4l2 device.</div><div class='head'>diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h<br/>index 2aadc19235ea..d730693f299c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/atmel/atmel-isc-regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/atmel/atmel-isc-regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/atmel/atmel-isc-regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/atmel/atmel-isc-regs.h</a></div><div class='hunk'>@@ -24,6 +24,8 @@</div><div class='ctx'> #define ISC_PFE_CFG0_HPOL_LOW   BIT(0)</div><div class='ctx'> #define ISC_PFE_CFG0_VPOL_LOW   BIT(1)</div><div class='ctx'> #define ISC_PFE_CFG0_PPOL_LOW   BIT(2)</div><div class='add'>+#define ISC_PFE_CFG0_CCIR656    BIT(9)</div><div class='add'>+#define ISC_PFE_CFG0_CCIR_CRC   BIT(10)</div><div class='ctx'> </div><div class='ctx'> #define ISC_PFE_CFG0_MODE_PROGRESSIVE   (0x0 &lt;&lt; 4)</div><div class='ctx'> #define ISC_PFE_CFG0_MODE_MASK          GENMASK(6, 4)</div><div class='head'>diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c<br/>index 50178968b8a6..4bba9da206e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/atmel/atmel-isc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/atmel/atmel-isc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/atmel/atmel-isc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/atmel/atmel-isc.c</a></div><div class='hunk'>@@ -89,35 +89,25 @@ struct isc_subdev_entity {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Indicate the format is generated by the sensor */</div><div class='del'>-#define FMT_FLAG_FROM_SENSOR		BIT(0)</div><div class='del'>-/* Indicate the format is produced by ISC itself */</div><div class='del'>-#define FMT_FLAG_FROM_CONTROLLER	BIT(1)</div><div class='del'>-/* Indicate a Raw Bayer format */</div><div class='del'>-#define FMT_FLAG_RAW_FORMAT		BIT(2)</div><div class='del'>-</div><div class='del'>-#define FMT_FLAG_RAW_FROM_SENSOR	(FMT_FLAG_FROM_SENSOR | \</div><div class='del'>-					 FMT_FLAG_RAW_FORMAT)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * struct isc_format - ISC media bus format information</div><div class='add'>+			This structure represents the interface between the ISC</div><div class='add'>+			and the sensor. It's the input format received by</div><div class='add'>+			the ISC.</div><div class='ctx'>  * @fourcc:		Fourcc code for this format</div><div class='ctx'>  * @mbus_code:		V4L2 media bus format code.</div><div class='del'>- * flags:		Indicate format from sensor or converted by controller</div><div class='del'>- * @bpp:		Bits per pixel (when stored in memory)</div><div class='del'>- *			(when transferred over a bus)</div><div class='del'>- * @sd_support:		Subdev supports this format</div><div class='del'>- * @isc_support:	ISC can convert raw format to this format</div><div class='add'>+ * @cfa_baycfg:		If this format is RAW BAYER, indicate the type of bayer.</div><div class='add'>+			this is either BGBG, RGRG, etc.</div><div class='add'>+ * @pfe_cfg0_bps:	Number of hardware data lines connected to the ISC</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct isc_format {</div><div class='ctx'> 	u32	fourcc;</div><div class='ctx'> 	u32	mbus_code;</div><div class='del'>-	u32	flags;</div><div class='del'>-	u8	bpp;</div><div class='add'>+	u32	cfa_baycfg;</div><div class='ctx'> </div><div class='ctx'> 	bool	sd_support;</div><div class='del'>-	bool	isc_support;</div><div class='add'>+	u32	pfe_cfg0_bps;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Pipeline bitmap */</div><div class='hunk'>@@ -135,16 +125,31 @@ struct isc_format {</div><div class='ctx'> </div><div class='ctx'> #define GAM_ENABLES	(GAM_RENABLE | GAM_GENABLE | GAM_BENABLE | GAM_ENABLE)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * struct fmt_config - ISC format configuration and internal pipeline</div><div class='add'>+			This structure represents the internal configuration</div><div class='add'>+			of the ISC.</div><div class='add'>+			It also holds the format that ISC will present to v4l2.</div><div class='add'>+ * @sd_format:		Pointer to an isc_format struct that holds the sensor</div><div class='add'>+			configuration.</div><div class='add'>+ * @fourcc:		Fourcc code for this format.</div><div class='add'>+ * @bpp:		Bytes per pixel in the current format.</div><div class='add'>+ * @rlp_cfg_mode:	Configuration of the RLP (rounding, limiting packaging)</div><div class='add'>+ * @dcfg_imode:		Configuration of the input of the DMA module</div><div class='add'>+ * @dctrl_dview:	Configuration of the output of the DMA module</div><div class='add'>+ * @bits_pipeline:	Configuration of the pipeline, which modules are enabled</div><div class='add'>+ */</div><div class='ctx'> struct fmt_config {</div><div class='del'>-	u32	fourcc;</div><div class='add'>+	struct isc_format	*sd_format;</div><div class='ctx'> </div><div class='del'>-	u32	pfe_cfg0_bps;</div><div class='del'>-	u32	cfa_baycfg;</div><div class='del'>-	u32	rlp_cfg_mode;</div><div class='del'>-	u32	dcfg_imode;</div><div class='del'>-	u32	dctrl_dview;</div><div class='add'>+	u32			fourcc;</div><div class='add'>+	u8			bpp;</div><div class='ctx'> </div><div class='del'>-	u32	bits_pipeline;</div><div class='add'>+	u32			rlp_cfg_mode;</div><div class='add'>+	u32			dcfg_imode;</div><div class='add'>+	u32			dctrl_dview;</div><div class='add'>+</div><div class='add'>+	u32			bits_pipeline;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HIST_ENTRIES		512</div><div class='hunk'>@@ -196,8 +201,9 @@ struct isc_device {</div><div class='ctx'> 	struct v4l2_format	fmt;</div><div class='ctx'> 	struct isc_format	**user_formats;</div><div class='ctx'> 	unsigned int		num_user_formats;</div><div class='del'>-	const struct isc_format	*current_fmt;</div><div class='del'>-	const struct isc_format	*raw_fmt;</div><div class='add'>+</div><div class='add'>+	struct fmt_config	config;</div><div class='add'>+	struct fmt_config	try_config;</div><div class='ctx'> </div><div class='ctx'> 	struct isc_ctrls	ctrls;</div><div class='ctx'> 	struct work_struct	awb_work;</div><div class='hunk'>@@ -210,319 +216,125 @@ struct isc_device {</div><div class='ctx'> 	struct list_head		subdev_entities;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct isc_format formats_list[] = {</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SBGGR8,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SBGGR8_1X8,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 8,</div><div class='del'>-	},</div><div class='add'>+/* This is a list of the formats that the ISC can *output* */</div><div class='add'>+static struct isc_format controller_formats[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SGBRG8,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SGBRG8_1X8,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 8,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SGRBG8,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SGRBG8_1X8,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 8,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SRGGB8,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 8,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SBGGR10,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SBGGR10_1X10,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SGBRG10,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SGBRG10_1X10,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SGRBG10,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SGRBG10_1X10,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_ARGB444,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SRGGB10,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SRGGB10_1X10,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_ARGB555,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SBGGR12,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SBGGR12_1X12,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SGBRG12,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SGBRG12_1X12,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_ABGR32,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SGRBG12,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SGRBG12_1X12,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_XBGR32,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_SRGGB12,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_SRGGB12_1X12,</div><div class='del'>-		.flags		= FMT_FLAG_RAW_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUV420,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_YUV420,</div><div class='del'>-		.mbus_code	= 0x0,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER,</div><div class='del'>-		.bpp		= 12,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_YUV422P,</div><div class='del'>-		.mbus_code	= 0x0,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER,</div><div class='del'>-		.bpp		= 16,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_GREY,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_Y8_1X8,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER |</div><div class='del'>-				  FMT_FLAG_FROM_SENSOR,</div><div class='del'>-		.bpp		= 8,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_ARGB444,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER,</div><div class='del'>-		.bpp		= 16,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_ARGB555,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER,</div><div class='del'>-		.bpp		= 16,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_RGB565,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_RGB565_2X8_LE,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER,</div><div class='del'>-		.bpp		= 16,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_ARGB32,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER,</div><div class='del'>-		.bpp		= 32,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='del'>-		.mbus_code	= MEDIA_BUS_FMT_YUYV8_2X8,</div><div class='del'>-		.flags		= FMT_FLAG_FROM_CONTROLLER |</div><div class='del'>-				  FMT_FLAG_FROM_SENSOR,</div><div class='del'>-		.bpp		= 16,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct fmt_config fmt_configs_list[] = {</div><div class='add'>+/* This is a list of formats that the ISC can receive as *input* */</div><div class='add'>+static struct isc_format formats_list[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SBGGR8_1X8,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT8,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED8,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SGBRG8,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SGBRG8_1X8,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_GBGB,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT8,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED8,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SGRBG8,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SGRBG8_1X8,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_GRGR,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT8,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED8,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SRGGB8,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_RGRG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT8,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED8,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SBGGR10,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SBGGR10_1X10,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TEN,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT10,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='add'>+		.cfa_baycfg	= ISC_BAY_CFG_RGRG,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SGBRG10,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SGBRG10_1X10,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TEN,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_GBGB,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT10,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SGRBG10,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SGRBG10_1X10,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TEN,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_GRGR,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT10,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SRGGB10,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SRGGB10_1X10,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TEN,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_RGRG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT10,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SBGGR12,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SBGGR12_1X12,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TWELVE,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT12,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SGBRG12,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SGBRG12_1X12,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TWELVE,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_GBGB,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT12,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SGRBG12,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SGRBG12_1X12,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TWELVE,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_GRGR,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT12,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_SRGGB12,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_SRGGB12_1X12,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFG_CFG0_BPS_TWELVE,</div><div class='ctx'> 		.cfa_baycfg	= ISC_BAY_CFG_RGRG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT12,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_YUV420,</div><div class='del'>-		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_YYCC,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_YC420P,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PLANAR,</div><div class='del'>-		.bits_pipeline	= SUB420_ENABLE | SUB422_ENABLE |</div><div class='del'>-				  CBC_ENABLE | CSC_ENABLE |</div><div class='del'>-				  GAM_ENABLES |</div><div class='del'>-				  CFA_ENABLE | WB_ENABLE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_YUV422P,</div><div class='del'>-		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_YYCC,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_YC422P,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PLANAR,</div><div class='del'>-		.bits_pipeline	= SUB422_ENABLE |</div><div class='del'>-				  CBC_ENABLE | CSC_ENABLE |</div><div class='del'>-				  GAM_ENABLES |</div><div class='del'>-				  CFA_ENABLE | WB_ENABLE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_GREY,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_Y8_1X8,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DATY8,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED8,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= CBC_ENABLE | CSC_ENABLE |</div><div class='del'>-				  GAM_ENABLES |</div><div class='del'>-				  CFA_ENABLE | WB_ENABLE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_ARGB444,</div><div class='del'>-		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_ARGB444,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= GAM_ENABLES | CFA_ENABLE | WB_ENABLE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_ARGB555,</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_YUYV8_2X8,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_ARGB555,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= GAM_ENABLES | CFA_ENABLE | WB_ENABLE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_RGB565,</div><div class='add'>+		.mbus_code	= MEDIA_BUS_FMT_RGB565_2X8_LE,</div><div class='ctx'> 		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_RGB565,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED16,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= GAM_ENABLES | CFA_ENABLE | WB_ENABLE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_ARGB32,</div><div class='del'>-		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_ARGB32,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED32,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= GAM_ENABLES | CFA_ENABLE | WB_ENABLE,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='del'>-		.pfe_cfg0_bps	= ISC_PFE_CFG0_BPS_EIGHT,</div><div class='del'>-		.cfa_baycfg	= ISC_BAY_CFG_BGBG,</div><div class='del'>-		.rlp_cfg_mode	= ISC_RLP_CFG_MODE_DAT8,</div><div class='del'>-		.dcfg_imode	= ISC_DCFG_IMODE_PACKED8,</div><div class='del'>-		.dctrl_dview	= ISC_DCTRL_DVIEW_PACKED,</div><div class='del'>-		.bits_pipeline	= 0x0</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -571,6 +383,13 @@ static const u32 isc_gamma_table[GAMMA_MAX + 1][GAMMA_ENTRIES] = {</div><div class='ctx'> 	  0x3E20007, 0x3E90007, 0x3F00008, 0x3F80007 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ISC_IS_FORMAT_RAW(mbus_code) \</div><div class='add'>+	(((mbus_code) &amp; 0xf000) == 0x3000)</div><div class='add'>+</div><div class='add'>+static unsigned int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "debug level (0-2)");</div><div class='add'>+</div><div class='ctx'> static unsigned int sensor_preferred = 1;</div><div class='ctx'> module_param(sensor_preferred, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(sensor_preferred,</div><div class='hunk'>@@ -896,40 +715,17 @@ static int isc_buffer_prepare(struct vb2_buffer *vb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool sensor_is_preferred(const struct isc_format *isc_fmt)</div><div class='del'>-{</div><div class='del'>-	return (sensor_preferred &amp;&amp; isc_fmt-&gt;sd_support) ||</div><div class='del'>-		!isc_fmt-&gt;isc_support;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct fmt_config *get_fmt_config(u32 fourcc)</div><div class='del'>-{</div><div class='del'>-	struct fmt_config *config;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	config = &amp;fmt_configs_list[0];</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(fmt_configs_list); i++) {</div><div class='del'>-		if (config-&gt;fourcc == fourcc)</div><div class='del'>-			return config;</div><div class='del'>-</div><div class='del'>-		config++;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void isc_start_dma(struct isc_device *isc)</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap = isc-&gt;regmap;</div><div class='del'>-	struct v4l2_pix_format *pixfmt = &amp;isc-&gt;fmt.fmt.pix;</div><div class='del'>-	u32 sizeimage = pixfmt-&gt;sizeimage;</div><div class='del'>-	struct fmt_config *config = get_fmt_config(isc-&gt;current_fmt-&gt;fourcc);</div><div class='add'>+	u32 sizeimage = isc-&gt;fmt.fmt.pix.sizeimage;</div><div class='ctx'> 	u32 dctrl_dview;</div><div class='ctx'> 	dma_addr_t addr0;</div><div class='ctx'> </div><div class='ctx'> 	addr0 = vb2_dma_contig_plane_dma_addr(&amp;isc-&gt;cur_frm-&gt;vb.vb2_buf, 0);</div><div class='ctx'> 	regmap_write(regmap, ISC_DAD0, addr0);</div><div class='ctx'> </div><div class='del'>-	switch (pixfmt-&gt;pixelformat) {</div><div class='add'>+	switch (isc-&gt;config.fourcc) {</div><div class='ctx'> 	case V4L2_PIX_FMT_YUV420:</div><div class='ctx'> 		regmap_write(regmap, ISC_DAD1, addr0 + (sizeimage * 2) / 3);</div><div class='ctx'> 		regmap_write(regmap, ISC_DAD2, addr0 + (sizeimage * 5) / 6);</div><div class='hunk'>@@ -942,10 +738,7 @@ static void isc_start_dma(struct isc_device *isc)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sensor_is_preferred(isc-&gt;current_fmt))</div><div class='del'>-		dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='del'>-	else</div><div class='del'>-		dctrl_dview = config-&gt;dctrl_dview;</div><div class='add'>+	dctrl_dview = isc-&gt;config.dctrl_dview;</div><div class='ctx'> </div><div class='ctx'> 	regmap_write(regmap, ISC_DCTRL, dctrl_dview | ISC_DCTRL_IE_IS);</div><div class='ctx'> 	regmap_write(regmap, ISC_CTRLEN, ISC_CTRL_CAPTURE);</div><div class='hunk'>@@ -955,7 +748,6 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap = isc-&gt;regmap;</div><div class='ctx'> 	struct isc_ctrls *ctrls = &amp;isc-&gt;ctrls;</div><div class='del'>-	struct fmt_config *config = get_fmt_config(isc-&gt;raw_fmt-&gt;fourcc);</div><div class='ctx'> 	u32 val, bay_cfg;</div><div class='ctx'> 	const u32 *gamma;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -969,7 +761,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)</div><div class='ctx'> 	if (!pipeline)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bay_cfg = config-&gt;cfa_baycfg;</div><div class='add'>+	bay_cfg = isc-&gt;config.sd_format-&gt;cfa_baycfg;</div><div class='ctx'> </div><div class='ctx'> 	regmap_write(regmap, ISC_WB_CFG, bay_cfg);</div><div class='ctx'> 	regmap_write(regmap, ISC_WB_O_RGR, 0x0);</div><div class='hunk'>@@ -1011,24 +803,24 @@ static int isc_update_profile(struct isc_device *isc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (counter &lt; 0) {</div><div class='del'>-		v4l2_warn(&amp;isc-&gt;v4l2_dev, "Time out to update profie\n");</div><div class='add'>+		v4l2_warn(&amp;isc-&gt;v4l2_dev, "Time out to update profile\n");</div><div class='ctx'> 		return -ETIMEDOUT;</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 void isc_set_histogram(struct isc_device *isc)</div><div class='add'>+static void isc_set_histogram(struct isc_device *isc, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap = isc-&gt;regmap;</div><div class='ctx'> 	struct isc_ctrls *ctrls = &amp;isc-&gt;ctrls;</div><div class='del'>-	struct fmt_config *config = get_fmt_config(isc-&gt;raw_fmt-&gt;fourcc);</div><div class='ctx'> </div><div class='del'>-	if (ctrls-&gt;awb &amp;&amp; (ctrls-&gt;hist_stat != HIST_ENABLED)) {</div><div class='add'>+	if (enable) {</div><div class='ctx'> 		regmap_write(regmap, ISC_HIS_CFG,</div><div class='ctx'> 			     ISC_HIS_CFG_MODE_R |</div><div class='del'>-			     (config-&gt;cfa_baycfg &lt;&lt; ISC_HIS_CFG_BAYSEL_SHIFT) |</div><div class='del'>-			     ISC_HIS_CFG_RAR);</div><div class='add'>+			     (isc-&gt;config.sd_format-&gt;cfa_baycfg</div><div class='add'>+					&lt;&lt; ISC_HIS_CFG_BAYSEL_SHIFT) |</div><div class='add'>+					ISC_HIS_CFG_RAR);</div><div class='ctx'> 		regmap_write(regmap, ISC_HIS_CTRL, ISC_HIS_CTRL_EN);</div><div class='ctx'> 		regmap_write(regmap, ISC_INTEN, ISC_INT_HISDONE);</div><div class='ctx'> 		ctrls-&gt;hist_id = ISC_HIS_CFG_MODE_R;</div><div class='hunk'>@@ -1036,7 +828,7 @@ static void isc_set_histogram(struct isc_device *isc)</div><div class='ctx'> 		regmap_write(regmap, ISC_CTRLEN, ISC_CTRL_HISREQ);</div><div class='ctx'> </div><div class='ctx'> 		ctrls-&gt;hist_stat = HIST_ENABLED;</div><div class='del'>-	} else if (!ctrls-&gt;awb &amp;&amp; (ctrls-&gt;hist_stat != HIST_DISABLED)) {</div><div class='add'>+	} else {</div><div class='ctx'> 		regmap_write(regmap, ISC_INTDIS, ISC_INT_HISDONE);</div><div class='ctx'> 		regmap_write(regmap, ISC_HIS_CTRL, ISC_HIS_CTRL_DIS);</div><div class='ctx'> </div><div class='hunk'>@@ -1044,58 +836,24 @@ static void isc_set_histogram(struct isc_device *isc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void isc_get_param(const struct isc_format *fmt,</div><div class='del'>-				 u32 *rlp_mode, u32 *dcfg)</div><div class='del'>-{</div><div class='del'>-	struct fmt_config *config = get_fmt_config(fmt-&gt;fourcc);</div><div class='del'>-</div><div class='del'>-	*dcfg = ISC_DCFG_YMBSIZE_BEATS8;</div><div class='del'>-</div><div class='del'>-	switch (fmt-&gt;fourcc) {</div><div class='del'>-	case V4L2_PIX_FMT_SBGGR10:</div><div class='del'>-	case V4L2_PIX_FMT_SGBRG10:</div><div class='del'>-	case V4L2_PIX_FMT_SGRBG10:</div><div class='del'>-	case V4L2_PIX_FMT_SRGGB10:</div><div class='del'>-	case V4L2_PIX_FMT_SBGGR12:</div><div class='del'>-	case V4L2_PIX_FMT_SGBRG12:</div><div class='del'>-	case V4L2_PIX_FMT_SGRBG12:</div><div class='del'>-	case V4L2_PIX_FMT_SRGGB12:</div><div class='del'>-		*rlp_mode = config-&gt;rlp_cfg_mode;</div><div class='del'>-		*dcfg |= config-&gt;dcfg_imode;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*rlp_mode = ISC_RLP_CFG_MODE_DAT8;</div><div class='del'>-		*dcfg |= ISC_DCFG_IMODE_PACKED8;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int isc_configure(struct isc_device *isc)</div><div class='ctx'> {</div><div class='ctx'> 	struct regmap *regmap = isc-&gt;regmap;</div><div class='del'>-	const struct isc_format *current_fmt = isc-&gt;current_fmt;</div><div class='del'>-	struct fmt_config *curfmt_config = get_fmt_config(current_fmt-&gt;fourcc);</div><div class='del'>-	struct fmt_config *rawfmt_config = get_fmt_config(isc-&gt;raw_fmt-&gt;fourcc);</div><div class='del'>-	struct isc_subdev_entity *subdev = isc-&gt;current_subdev;</div><div class='ctx'> 	u32 pfe_cfg0, rlp_mode, dcfg, mask, pipeline;</div><div class='add'>+	struct isc_subdev_entity *subdev = isc-&gt;current_subdev;</div><div class='ctx'> </div><div class='del'>-	if (sensor_is_preferred(current_fmt)) {</div><div class='del'>-		pfe_cfg0 = curfmt_config-&gt;pfe_cfg0_bps;</div><div class='del'>-		pipeline = 0x0;</div><div class='del'>-		isc_get_param(current_fmt, &amp;rlp_mode, &amp;dcfg);</div><div class='del'>-		isc-&gt;ctrls.hist_stat = HIST_INIT;</div><div class='del'>-	} else {</div><div class='del'>-		pfe_cfg0 = rawfmt_config-&gt;pfe_cfg0_bps;</div><div class='del'>-		pipeline = curfmt_config-&gt;bits_pipeline;</div><div class='del'>-		rlp_mode = curfmt_config-&gt;rlp_cfg_mode;</div><div class='del'>-		dcfg = curfmt_config-&gt;dcfg_imode |</div><div class='add'>+	pfe_cfg0 = isc-&gt;config.sd_format-&gt;pfe_cfg0_bps;</div><div class='add'>+	rlp_mode = isc-&gt;config.rlp_cfg_mode;</div><div class='add'>+	pipeline = isc-&gt;config.bits_pipeline;</div><div class='add'>+</div><div class='add'>+	dcfg = isc-&gt;config.dcfg_imode |</div><div class='ctx'> 		       ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pfe_cfg0  |= subdev-&gt;pfe_cfg0 | ISC_PFE_CFG0_MODE_PROGRESSIVE;</div><div class='ctx'> 	mask = ISC_PFE_CFG0_BPS_MASK | ISC_PFE_CFG0_HPOL_LOW |</div><div class='ctx'> 	       ISC_PFE_CFG0_VPOL_LOW | ISC_PFE_CFG0_PPOL_LOW |</div><div class='del'>-	       ISC_PFE_CFG0_MODE_MASK;</div><div class='add'>+	       ISC_PFE_CFG0_MODE_MASK | ISC_PFE_CFG0_CCIR_CRC |</div><div class='add'>+		   ISC_PFE_CFG0_CCIR656;</div><div class='ctx'> </div><div class='ctx'> 	regmap_update_bits(regmap, ISC_PFE_CFG0, mask, pfe_cfg0);</div><div class='ctx'> </div><div class='hunk'>@@ -1107,8 +865,15 @@ static int isc_configure(struct isc_device *isc)</div><div class='ctx'> 	/* Set the pipeline */</div><div class='ctx'> 	isc_set_pipeline(isc, pipeline);</div><div class='ctx'> </div><div class='del'>-	if (pipeline)</div><div class='del'>-		isc_set_histogram(isc);</div><div class='add'>+	/*</div><div class='add'>+	 * The current implemented histogram is available for RAW R, B, GB</div><div class='add'>+	 * channels. We need to check if sensor is outputting RAW BAYER</div><div class='add'>+	 */</div><div class='add'>+	if (isc-&gt;ctrls.awb &amp;&amp;</div><div class='add'>+	    ISC_IS_FORMAT_RAW(isc-&gt;config.sd_format-&gt;mbus_code))</div><div class='add'>+		isc_set_histogram(isc, true);</div><div class='add'>+	else</div><div class='add'>+		isc_set_histogram(isc, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Update profile */</div><div class='ctx'> 	return isc_update_profile(isc);</div><div class='hunk'>@@ -1125,7 +890,8 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> 	/* Enable stream on the sub device */</div><div class='ctx'> 	ret = v4l2_subdev_call(isc-&gt;current_subdev-&gt;sd, video, s_stream, 1);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -ENOIOCTLCMD) {</div><div class='del'>-		v4l2_err(&amp;isc-&gt;v4l2_dev, "stream on failed in subdev\n");</div><div class='add'>+		v4l2_err(&amp;isc-&gt;v4l2_dev, "stream on failed in subdev %d\n",</div><div class='add'>+			 ret);</div><div class='ctx'> 		goto err_start_stream;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1223,6 +989,22 @@ static void isc_buffer_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;isc-&gt;dma_queue_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct isc_format *find_format_by_fourcc(struct isc_device *isc,</div><div class='add'>+						 unsigned int fourcc)</div><div class='add'>+{</div><div class='add'>+	unsigned int num_formats = isc-&gt;num_user_formats;</div><div class='add'>+	struct isc_format *fmt;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_formats; i++) {</div><div class='add'>+		fmt = isc-&gt;user_formats[i];</div><div class='add'>+		if (fmt-&gt;fourcc == fourcc)</div><div class='add'>+			return fmt;</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='ctx'> static const struct vb2_ops isc_vb2_ops = {</div><div class='ctx'> 	.queue_setup		= isc_queue_setup,</div><div class='ctx'> 	.wait_prepare		= vb2_ops_wait_prepare,</div><div class='hunk'>@@ -1249,15 +1031,31 @@ static int isc_querycap(struct file *file, void *priv,</div><div class='ctx'> static int isc_enum_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 				 struct v4l2_fmtdesc *f)</div><div class='ctx'> {</div><div class='del'>-	struct isc_device *isc = video_drvdata(file);</div><div class='ctx'> 	u32 index = f-&gt;index;</div><div class='add'>+	u32 i, supported_index;</div><div class='ctx'> </div><div class='del'>-	if (index &gt;= isc-&gt;num_user_formats)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (index &lt; ARRAY_SIZE(controller_formats)) {</div><div class='add'>+		f-&gt;pixelformat = controller_formats[index].fourcc;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	f-&gt;pixelformat = isc-&gt;user_formats[index]-&gt;fourcc;</div><div class='add'>+	index -= ARRAY_SIZE(controller_formats);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	i = 0;</div><div class='add'>+	supported_index = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(formats_list); i++) {</div><div class='add'>+		if (!ISC_IS_FORMAT_RAW(formats_list[i].mbus_code) ||</div><div class='add'>+		    !formats_list[i].sd_support)</div><div class='add'>+			continue;</div><div class='add'>+		if (supported_index == index) {</div><div class='add'>+			f-&gt;pixelformat = formats_list[i].fourcc;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		supported_index++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int isc_g_fmt_vid_cap(struct file *file, void *priv,</div><div class='hunk'>@@ -1270,26 +1068,238 @@ static int isc_g_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct isc_format *find_format_by_fourcc(struct isc_device *isc,</div><div class='del'>-						 unsigned int fourcc)</div><div class='add'>+/*</div><div class='add'>+ * Checks the current configured format, if ISC can output it,</div><div class='add'>+ * considering which type of format the ISC receives from the sensor</div><div class='add'>+ */</div><div class='add'>+static int isc_try_validate_formats(struct isc_device *isc)</div><div class='ctx'> {</div><div class='del'>-	unsigned int num_formats = isc-&gt;num_user_formats;</div><div class='del'>-	struct isc_format *fmt;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+	bool bayer = false, yuv = false, rgb = false, grey = false;</div><div class='add'>+</div><div class='add'>+	/* all formats supported by the RLP module are OK */</div><div class='add'>+	switch (isc-&gt;try_config.fourcc) {</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR8:</div><div class='add'>+	case V4L2_PIX_FMT_SGBRG8:</div><div class='add'>+	case V4L2_PIX_FMT_SGRBG8:</div><div class='add'>+	case V4L2_PIX_FMT_SRGGB8:</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR10:</div><div class='add'>+	case V4L2_PIX_FMT_SGBRG10:</div><div class='add'>+	case V4L2_PIX_FMT_SGRBG10:</div><div class='add'>+	case V4L2_PIX_FMT_SRGGB10:</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR12:</div><div class='add'>+	case V4L2_PIX_FMT_SGBRG12:</div><div class='add'>+	case V4L2_PIX_FMT_SGRBG12:</div><div class='add'>+	case V4L2_PIX_FMT_SRGGB12:</div><div class='add'>+		ret = 0;</div><div class='add'>+		bayer = true;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_formats; i++) {</div><div class='del'>-		fmt = isc-&gt;user_formats[i];</div><div class='del'>-		if (fmt-&gt;fourcc == fourcc)</div><div class='del'>-			return fmt;</div><div class='add'>+	case V4L2_PIX_FMT_YUV420:</div><div class='add'>+	case V4L2_PIX_FMT_YUV422P:</div><div class='add'>+	case V4L2_PIX_FMT_YUYV:</div><div class='add'>+		ret = 0;</div><div class='add'>+		yuv = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case V4L2_PIX_FMT_RGB565:</div><div class='add'>+	case V4L2_PIX_FMT_ABGR32:</div><div class='add'>+	case V4L2_PIX_FMT_XBGR32:</div><div class='add'>+	case V4L2_PIX_FMT_ARGB444:</div><div class='add'>+	case V4L2_PIX_FMT_ARGB555:</div><div class='add'>+		ret = 0;</div><div class='add'>+		rgb = true;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_GREY:</div><div class='add'>+		ret = 0;</div><div class='add'>+		grey = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+	/* any other different formats are not supported */</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	/* we cannot output RAW/Grey if we do not receive RAW */</div><div class='add'>+	if ((bayer || grey) &amp;&amp;</div><div class='add'>+	    !ISC_IS_FORMAT_RAW(isc-&gt;try_config.sd_format-&gt;mbus_code))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	v4l2_dbg(1, debug, &amp;isc-&gt;v4l2_dev,</div><div class='add'>+		 "Format validation, requested rgb=%u, yuv=%u, grey=%u, bayer=%u\n",</div><div class='add'>+		 rgb, yuv, grey, bayer);</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'>+ * Configures the RLP and DMA modules, depending on the output format</div><div class='add'>+ * configured for the ISC.</div><div class='add'>+ * If direct_dump == true, just dump raw data 8 bits.</div><div class='add'>+ */</div><div class='add'>+static int isc_try_configure_rlp_dma(struct isc_device *isc, bool direct_dump)</div><div class='add'>+{</div><div class='add'>+	if (direct_dump) {</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DAT8;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED8;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (isc-&gt;try_config.fourcc) {</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR8:</div><div class='add'>+	case V4L2_PIX_FMT_SGBRG8:</div><div class='add'>+	case V4L2_PIX_FMT_SGRBG8:</div><div class='add'>+	case V4L2_PIX_FMT_SRGGB8:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DAT8;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED8;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 8;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR10:</div><div class='add'>+	case V4L2_PIX_FMT_SGBRG10:</div><div class='add'>+	case V4L2_PIX_FMT_SGRBG10:</div><div class='add'>+	case V4L2_PIX_FMT_SRGGB10:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DAT10;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED16;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_SBGGR12:</div><div class='add'>+	case V4L2_PIX_FMT_SGBRG12:</div><div class='add'>+	case V4L2_PIX_FMT_SGRBG12:</div><div class='add'>+	case V4L2_PIX_FMT_SRGGB12:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DAT12;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED16;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_RGB565:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_RGB565;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED16;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_ARGB444:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_ARGB444;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED16;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_ARGB555:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_ARGB555;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED16;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_ABGR32:</div><div class='add'>+	case V4L2_PIX_FMT_XBGR32:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_ARGB32;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED32;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 32;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUV420:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YYCC;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_YC420P;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PLANAR;</div><div class='add'>+		isc-&gt;try_config.bpp = 12;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUV422P:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YYCC;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_YC422P;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PLANAR;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUYV:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YYCC;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED32;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_GREY:</div><div class='add'>+		isc-&gt;try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DATY8;</div><div class='add'>+		isc-&gt;try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED8;</div><div class='add'>+		isc-&gt;try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;</div><div class='add'>+		isc-&gt;try_config.bpp = 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'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configuring pipeline modules, depending on which format the ISC outputs</div><div class='add'>+ * and considering which format it has as input from the sensor.</div><div class='add'>+ */</div><div class='add'>+static int isc_try_configure_pipeline(struct isc_device *isc)</div><div class='add'>+{</div><div class='add'>+	switch (isc-&gt;try_config.fourcc) {</div><div class='add'>+	case V4L2_PIX_FMT_RGB565:</div><div class='add'>+	case V4L2_PIX_FMT_ARGB555:</div><div class='add'>+	case V4L2_PIX_FMT_ARGB444:</div><div class='add'>+	case V4L2_PIX_FMT_ABGR32:</div><div class='add'>+	case V4L2_PIX_FMT_XBGR32:</div><div class='add'>+		/* if sensor format is RAW, we convert inside ISC */</div><div class='add'>+		if (ISC_IS_FORMAT_RAW(isc-&gt;try_config.sd_format-&gt;mbus_code)) {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = CFA_ENABLE |</div><div class='add'>+				WB_ENABLE | GAM_ENABLES;</div><div class='add'>+		} else {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = 0x0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUV420:</div><div class='add'>+		/* if sensor format is RAW, we convert inside ISC */</div><div class='add'>+		if (ISC_IS_FORMAT_RAW(isc-&gt;try_config.sd_format-&gt;mbus_code)) {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = CFA_ENABLE |</div><div class='add'>+				CSC_ENABLE | WB_ENABLE | GAM_ENABLES |</div><div class='add'>+				SUB420_ENABLE | SUB422_ENABLE | CBC_ENABLE;</div><div class='add'>+		} else {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = 0x0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUV422P:</div><div class='add'>+		/* if sensor format is RAW, we convert inside ISC */</div><div class='add'>+		if (ISC_IS_FORMAT_RAW(isc-&gt;try_config.sd_format-&gt;mbus_code)) {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = CFA_ENABLE |</div><div class='add'>+				CSC_ENABLE | WB_ENABLE | GAM_ENABLES |</div><div class='add'>+				SUB422_ENABLE | CBC_ENABLE;</div><div class='add'>+		} else {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = 0x0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_YUYV:</div><div class='add'>+		/* if sensor format is RAW, we convert inside ISC */</div><div class='add'>+		if (ISC_IS_FORMAT_RAW(isc-&gt;try_config.sd_format-&gt;mbus_code)) {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = CFA_ENABLE |</div><div class='add'>+				CSC_ENABLE | WB_ENABLE | GAM_ENABLES |</div><div class='add'>+				SUB422_ENABLE | CBC_ENABLE;</div><div class='add'>+		} else {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = 0x0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_PIX_FMT_GREY:</div><div class='add'>+		if (ISC_IS_FORMAT_RAW(isc-&gt;try_config.sd_format-&gt;mbus_code)) {</div><div class='add'>+		/* if sensor format is RAW, we convert inside ISC */</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = CFA_ENABLE |</div><div class='add'>+				CSC_ENABLE | WB_ENABLE | GAM_ENABLES |</div><div class='add'>+				CBC_ENABLE;</div><div class='add'>+		} else {</div><div class='add'>+			isc-&gt;try_config.bits_pipeline = 0x0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		isc-&gt;try_config.bits_pipeline = 0x0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,</div><div class='del'>-			struct isc_format **current_fmt, u32 *code)</div><div class='add'>+			u32 *code)</div><div class='ctx'> {</div><div class='del'>-	struct isc_format *isc_fmt;</div><div class='add'>+	int i;</div><div class='add'>+	struct isc_format *sd_fmt = NULL, *direct_fmt = NULL;</div><div class='ctx'> 	struct v4l2_pix_format *pixfmt = &amp;f-&gt;fmt.pix;</div><div class='ctx'> 	struct v4l2_subdev_pad_config pad_cfg;</div><div class='ctx'> 	struct v4l2_subdev_format format = {</div><div class='hunk'>@@ -1297,48 +1307,119 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,</div><div class='ctx'> 	};</div><div class='ctx'> 	u32 mbus_code;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool rlp_dma_direct_dump = false;</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	isc_fmt = find_format_by_fourcc(isc, pixfmt-&gt;pixelformat);</div><div class='del'>-	if (!isc_fmt) {</div><div class='del'>-		v4l2_warn(&amp;isc-&gt;v4l2_dev, "Format 0x%x not found\n",</div><div class='del'>-			  pixfmt-&gt;pixelformat);</div><div class='del'>-		isc_fmt = isc-&gt;user_formats[isc-&gt;num_user_formats - 1];</div><div class='del'>-		pixfmt-&gt;pixelformat = isc_fmt-&gt;fourcc;</div><div class='add'>+	/* Step 1: find a RAW format that is supported */</div><div class='add'>+	for (i = 0; i &lt; isc-&gt;num_user_formats; i++) {</div><div class='add'>+		if (ISC_IS_FORMAT_RAW(isc-&gt;user_formats[i]-&gt;mbus_code)) {</div><div class='add'>+			sd_fmt = isc-&gt;user_formats[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Step 2: We can continue with this RAW format, or we can look</div><div class='add'>+	 * for better: maybe sensor supports directly what we need.</div><div class='add'>+	 */</div><div class='add'>+	direct_fmt = find_format_by_fourcc(isc, pixfmt-&gt;pixelformat);</div><div class='add'>+</div><div class='add'>+	/* Step 3: We have both. We decide given the module parameter which</div><div class='add'>+	 * one to use.</div><div class='add'>+	 */</div><div class='add'>+	if (direct_fmt &amp;&amp; sd_fmt &amp;&amp; sensor_preferred)</div><div class='add'>+		sd_fmt = direct_fmt;</div><div class='add'>+</div><div class='add'>+	/* Step 4: we do not have RAW but we have a direct format. Use it. */</div><div class='add'>+	if (direct_fmt &amp;&amp; !sd_fmt)</div><div class='add'>+		sd_fmt = direct_fmt;</div><div class='add'>+</div><div class='add'>+	/* Step 5: if we are using a direct format, we need to package</div><div class='add'>+	 * everything as 8 bit data and just dump it</div><div class='add'>+	 */</div><div class='add'>+	if (sd_fmt == direct_fmt)</div><div class='add'>+		rlp_dma_direct_dump = true;</div><div class='add'>+</div><div class='add'>+	/* Step 6: We have no format. This can happen if the userspace</div><div class='add'>+	 * requests some weird/invalid format.</div><div class='add'>+	 * In this case, default to whatever we have</div><div class='add'>+	 */</div><div class='add'>+	if (!sd_fmt &amp;&amp; !direct_fmt) {</div><div class='add'>+		sd_fmt = isc-&gt;user_formats[isc-&gt;num_user_formats - 1];</div><div class='add'>+		v4l2_dbg(1, debug, &amp;isc-&gt;v4l2_dev,</div><div class='add'>+			 "Sensor not supporting %.4s, using %.4s\n",</div><div class='add'>+			 (char *)&amp;pixfmt-&gt;pixelformat, (char *)&amp;sd_fmt-&gt;fourcc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sd_fmt) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto isc_try_fmt_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Step 7: Print out what we decided for debugging */</div><div class='add'>+	v4l2_dbg(1, debug, &amp;isc-&gt;v4l2_dev,</div><div class='add'>+		 "Preferring to have sensor using format %.4s\n",</div><div class='add'>+		 (char *)&amp;sd_fmt-&gt;fourcc);</div><div class='add'>+</div><div class='add'>+	/* Step 8: at this moment we decided which format the subdev will use */</div><div class='add'>+	isc-&gt;try_config.sd_format = sd_fmt;</div><div class='add'>+</div><div class='ctx'> 	/* Limit to Atmel ISC hardware capabilities */</div><div class='ctx'> 	if (pixfmt-&gt;width &gt; ISC_MAX_SUPPORT_WIDTH)</div><div class='ctx'> 		pixfmt-&gt;width = ISC_MAX_SUPPORT_WIDTH;</div><div class='ctx'> 	if (pixfmt-&gt;height &gt; ISC_MAX_SUPPORT_HEIGHT)</div><div class='ctx'> 		pixfmt-&gt;height = ISC_MAX_SUPPORT_HEIGHT;</div><div class='ctx'> </div><div class='del'>-	if (sensor_is_preferred(isc_fmt))</div><div class='del'>-		mbus_code = isc_fmt-&gt;mbus_code;</div><div class='del'>-	else</div><div class='del'>-		mbus_code = isc-&gt;raw_fmt-&gt;mbus_code;</div><div class='add'>+	/*</div><div class='add'>+	 * The mbus format is the one the subdev outputs.</div><div class='add'>+	 * The pixels will be transferred in this format Sensor -&gt; ISC</div><div class='add'>+	 */</div><div class='add'>+	mbus_code = sd_fmt-&gt;mbus_code;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Validate formats. If the required format is not OK, default to raw.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	isc-&gt;try_config.fourcc = pixfmt-&gt;pixelformat;</div><div class='add'>+</div><div class='add'>+	if (isc_try_validate_formats(isc)) {</div><div class='add'>+		pixfmt-&gt;pixelformat = isc-&gt;try_config.fourcc = sd_fmt-&gt;fourcc;</div><div class='add'>+		/* Re-try to validate the new format */</div><div class='add'>+		ret = isc_try_validate_formats(isc);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto isc_try_fmt_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = isc_try_configure_rlp_dma(isc, rlp_dma_direct_dump);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto isc_try_fmt_err;</div><div class='add'>+</div><div class='add'>+	ret = isc_try_configure_pipeline(isc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto isc_try_fmt_err;</div><div class='ctx'> </div><div class='ctx'> 	v4l2_fill_mbus_format(&amp;format.format, pixfmt, mbus_code);</div><div class='ctx'> 	ret = v4l2_subdev_call(isc-&gt;current_subdev-&gt;sd, pad, set_fmt,</div><div class='ctx'> 			       &amp;pad_cfg, &amp;format);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+		goto isc_try_fmt_err;</div><div class='ctx'> </div><div class='ctx'> 	v4l2_fill_pix_format(pixfmt, &amp;format.format);</div><div class='ctx'> </div><div class='ctx'> 	pixfmt-&gt;field = V4L2_FIELD_NONE;</div><div class='del'>-	pixfmt-&gt;bytesperline = (pixfmt-&gt;width * isc_fmt-&gt;bpp) &gt;&gt; 3;</div><div class='add'>+	pixfmt-&gt;bytesperline = (pixfmt-&gt;width * isc-&gt;try_config.bpp) &gt;&gt; 3;</div><div class='ctx'> 	pixfmt-&gt;sizeimage = pixfmt-&gt;bytesperline * pixfmt-&gt;height;</div><div class='ctx'> </div><div class='del'>-	if (current_fmt)</div><div class='del'>-		*current_fmt = isc_fmt;</div><div class='del'>-</div><div class='ctx'> 	if (code)</div><div class='ctx'> 		*code = mbus_code;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+isc_try_fmt_err:</div><div class='add'>+	v4l2_err(&amp;isc-&gt;v4l2_dev, "Could not find any possible format for a working pipeline\n");</div><div class='add'>+	memset(&amp;isc-&gt;try_config, 0, sizeof(isc-&gt;try_config));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int isc_set_fmt(struct isc_device *isc, struct v4l2_format *f)</div><div class='hunk'>@@ -1346,11 +1427,10 @@ static int isc_set_fmt(struct isc_device *isc, struct v4l2_format *f)</div><div class='ctx'> 	struct v4l2_subdev_format format = {</div><div class='ctx'> 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,</div><div class='ctx'> 	};</div><div class='del'>-	struct isc_format *current_fmt;</div><div class='del'>-	u32 mbus_code;</div><div class='add'>+	u32 mbus_code = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = isc_try_fmt(isc, f, &amp;current_fmt, &amp;mbus_code);</div><div class='add'>+	ret = isc_try_fmt(isc, f, &amp;mbus_code);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1361,7 +1441,10 @@ static int isc_set_fmt(struct isc_device *isc, struct v4l2_format *f)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	isc-&gt;fmt = *f;</div><div class='del'>-	isc-&gt;current_fmt = current_fmt;</div><div class='add'>+	/* make the try configuration active */</div><div class='add'>+	isc-&gt;config = isc-&gt;try_config;</div><div class='add'>+</div><div class='add'>+	v4l2_dbg(1, debug, &amp;isc-&gt;v4l2_dev, "New ISC configuration in place\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1382,7 +1465,7 @@ static int isc_try_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct isc_device *isc = video_drvdata(file);</div><div class='ctx'> </div><div class='del'>-	return isc_try_fmt(isc, f, NULL, NULL);</div><div class='add'>+	return isc_try_fmt(isc, f, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int isc_enum_input(struct file *file, void *priv,</div><div class='hunk'>@@ -1431,27 +1514,31 @@ static int isc_enum_framesizes(struct file *file, void *fh,</div><div class='ctx'> 			       struct v4l2_frmsizeenum *fsize)</div><div class='ctx'> {</div><div class='ctx'> 	struct isc_device *isc = video_drvdata(file);</div><div class='del'>-	const struct isc_format *isc_fmt;</div><div class='ctx'> 	struct v4l2_subdev_frame_size_enum fse = {</div><div class='ctx'> 		.index = fsize-&gt;index,</div><div class='ctx'> 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,</div><div class='ctx'> 	};</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	isc_fmt = find_format_by_fourcc(isc, fsize-&gt;pixel_format);</div><div class='del'>-	if (!isc_fmt)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; isc-&gt;num_user_formats; i++)</div><div class='add'>+		if (isc-&gt;user_formats[i]-&gt;fourcc == fsize-&gt;pixel_format)</div><div class='add'>+			ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (sensor_is_preferred(isc_fmt))</div><div class='del'>-		fse.code = isc_fmt-&gt;mbus_code;</div><div class='del'>-	else</div><div class='del'>-		fse.code = isc-&gt;raw_fmt-&gt;mbus_code;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(controller_formats); i++)</div><div class='add'>+		if (controller_formats[i].fourcc == fsize-&gt;pixel_format)</div><div class='add'>+			ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = v4l2_subdev_call(isc-&gt;current_subdev-&gt;sd, pad, enum_frame_size,</div><div class='ctx'> 			       NULL, &amp;fse);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	fse.code = isc-&gt;config.sd_format-&gt;mbus_code;</div><div class='add'>+</div><div class='ctx'> 	fsize-&gt;type = V4L2_FRMSIZE_TYPE_DISCRETE;</div><div class='ctx'> 	fsize-&gt;discrete.width = fse.max_width;</div><div class='ctx'> 	fsize-&gt;discrete.height = fse.max_height;</div><div class='hunk'>@@ -1463,29 +1550,32 @@ static int isc_enum_frameintervals(struct file *file, void *fh,</div><div class='ctx'> 				    struct v4l2_frmivalenum *fival)</div><div class='ctx'> {</div><div class='ctx'> 	struct isc_device *isc = video_drvdata(file);</div><div class='del'>-	const struct isc_format *isc_fmt;</div><div class='ctx'> 	struct v4l2_subdev_frame_interval_enum fie = {</div><div class='ctx'> 		.index = fival-&gt;index,</div><div class='ctx'> 		.width = fival-&gt;width,</div><div class='ctx'> 		.height = fival-&gt;height,</div><div class='ctx'> 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,</div><div class='ctx'> 	};</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	isc_fmt = find_format_by_fourcc(isc, fival-&gt;pixel_format);</div><div class='del'>-	if (!isc_fmt)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; isc-&gt;num_user_formats; i++)</div><div class='add'>+		if (isc-&gt;user_formats[i]-&gt;fourcc == fival-&gt;pixel_format)</div><div class='add'>+			ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (sensor_is_preferred(isc_fmt))</div><div class='del'>-		fie.code = isc_fmt-&gt;mbus_code;</div><div class='del'>-	else</div><div class='del'>-		fie.code = isc-&gt;raw_fmt-&gt;mbus_code;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(controller_formats); i++)</div><div class='add'>+		if (controller_formats[i].fourcc == fival-&gt;pixel_format)</div><div class='add'>+			ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = v4l2_subdev_call(isc-&gt;current_subdev-&gt;sd, pad,</div><div class='ctx'> 			       enum_frame_interval, NULL, &amp;fie);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	fie.code = isc-&gt;config.sd_format-&gt;mbus_code;</div><div class='ctx'> 	fival-&gt;type = V4L2_FRMIVAL_TYPE_DISCRETE;</div><div class='ctx'> 	fival-&gt;discrete = fie.interval;</div><div class='ctx'> </div><div class='hunk'>@@ -1668,7 +1758,6 @@ static void isc_awb_work(struct work_struct *w)</div><div class='ctx'> 	struct isc_device *isc =</div><div class='ctx'> 		container_of(w, struct isc_device, awb_work);</div><div class='ctx'> 	struct regmap *regmap = isc-&gt;regmap;</div><div class='del'>-	struct fmt_config *config = get_fmt_config(isc-&gt;raw_fmt-&gt;fourcc);</div><div class='ctx'> 	struct isc_ctrls *ctrls = &amp;isc-&gt;ctrls;</div><div class='ctx'> 	u32 hist_id = ctrls-&gt;hist_id;</div><div class='ctx'> 	u32 baysel;</div><div class='hunk'>@@ -1686,7 +1775,7 @@ static void isc_awb_work(struct work_struct *w)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctrls-&gt;hist_id = hist_id;</div><div class='del'>-	baysel = config-&gt;cfa_baycfg &lt;&lt; ISC_HIS_CFG_BAYSEL_SHIFT;</div><div class='add'>+	baysel = isc-&gt;config.sd_format-&gt;cfa_baycfg &lt;&lt; ISC_HIS_CFG_BAYSEL_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_get_sync(isc-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1754,7 +1843,6 @@ static int isc_ctrl_init(struct isc_device *isc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int isc_async_bound(struct v4l2_async_notifier *notifier,</div><div class='ctx'> 			    struct v4l2_subdev *subdev,</div><div class='ctx'> 			    struct v4l2_async_subdev *asd)</div><div class='hunk'>@@ -1812,35 +1900,20 @@ static int isc_formats_init(struct isc_device *isc)</div><div class='ctx'> 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	num_fmts = 0;</div><div class='ctx'> 	while (!v4l2_subdev_call(subdev, pad, enum_mbus_code,</div><div class='ctx'> 	       NULL, &amp;mbus_code)) {</div><div class='ctx'> 		mbus_code.index++;</div><div class='ctx'> </div><div class='ctx'> 		fmt = find_format_by_code(mbus_code.code, &amp;i);</div><div class='del'>-		if ((!fmt) || (!(fmt-&gt;flags &amp; FMT_FLAG_FROM_SENSOR)))</div><div class='add'>+		if (!fmt) {</div><div class='add'>+			v4l2_warn(&amp;isc-&gt;v4l2_dev, "Mbus code %x not supported\n",</div><div class='add'>+				  mbus_code.code);</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		fmt-&gt;sd_support = true;</div><div class='del'>-</div><div class='del'>-		if (fmt-&gt;flags &amp; FMT_FLAG_RAW_FORMAT)</div><div class='del'>-			isc-&gt;raw_fmt = fmt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fmt = &amp;formats_list[0];</div><div class='del'>-	for (i = 0; i &lt; list_size; i++) {</div><div class='del'>-		if (fmt-&gt;flags &amp; FMT_FLAG_FROM_CONTROLLER)</div><div class='del'>-			fmt-&gt;isc_support = true;</div><div class='del'>-</div><div class='del'>-		fmt++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fmt = &amp;formats_list[0];</div><div class='del'>-	num_fmts = 0;</div><div class='del'>-	for (i = 0; i &lt; list_size; i++) {</div><div class='del'>-		if (fmt-&gt;isc_support || fmt-&gt;sd_support)</div><div class='del'>-			num_fmts++;</div><div class='del'>-</div><div class='del'>-		fmt++;</div><div class='add'>+		num_fmts++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!num_fmts)</div><div class='hunk'>@@ -1855,9 +1928,8 @@ static int isc_formats_init(struct isc_device *isc)</div><div class='ctx'> </div><div class='ctx'> 	fmt = &amp;formats_list[0];</div><div class='ctx'> 	for (i = 0, j = 0; i &lt; list_size; i++) {</div><div class='del'>-		if (fmt-&gt;isc_support || fmt-&gt;sd_support)</div><div class='add'>+		if (fmt-&gt;sd_support)</div><div class='ctx'> 			isc-&gt;user_formats[j++] = fmt;</div><div class='del'>-</div><div class='ctx'> 		fmt++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1877,13 +1949,11 @@ static int isc_set_default_fmt(struct isc_device *isc)</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = isc_try_fmt(isc, &amp;f, NULL, NULL);</div><div class='add'>+	ret = isc_try_fmt(isc, &amp;f, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	isc-&gt;current_fmt = isc-&gt;user_formats[0];</div><div class='ctx'> 	isc-&gt;fmt = f;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2084,6 +2154,10 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc)</div><div class='ctx'> 		if (flags &amp; V4L2_MBUS_PCLK_SAMPLE_FALLING)</div><div class='ctx'> 			subdev_entity-&gt;pfe_cfg0 |= ISC_PFE_CFG0_PPOL_LOW;</div><div class='ctx'> </div><div class='add'>+		if (v4l2_epn.bus_type == V4L2_MBUS_BT656)</div><div class='add'>+			subdev_entity-&gt;pfe_cfg0 |= ISC_PFE_CFG0_CCIR_CRC |</div><div class='add'>+					ISC_PFE_CFG0_CCIR656;</div><div class='add'>+</div><div class='ctx'> 		subdev_entity-&gt;asd-&gt;match_type = V4L2_ASYNC_MATCH_FWNODE;</div><div class='ctx'> 		subdev_entity-&gt;asd-&gt;match.fwnode =</div><div class='ctx'> 			of_fwnode_handle(rem);</div><div class='head'>diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c<br/>index b4f396c2e72c..eaa86737fa04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/coda/coda-bit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/coda/coda-bit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/coda/coda-bit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/coda/coda-bit.c</a></div><div class='hunk'>@@ -2010,6 +2010,9 @@ static int coda_prepare_decode(struct coda_ctx *ctx)</div><div class='ctx'> 	/* Clear decode success flag */</div><div class='ctx'> 	coda_write(dev, 0, CODA_RET_DEC_PIC_SUCCESS);</div><div class='ctx'> </div><div class='add'>+	/* Clear error return value */</div><div class='add'>+	coda_write(dev, 0, CODA_RET_DEC_PIC_ERR_MB);</div><div class='add'>+</div><div class='ctx'> 	trace_coda_dec_pic_run(ctx, meta);</div><div class='ctx'> </div><div class='ctx'> 	coda_command_async(ctx, CODA_COMMAND_PIC_RUN);</div><div class='head'>diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c<br/>index fa0b22fb7991..3ce58dee4422 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/coda/coda-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/coda/coda-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/coda/coda-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/coda/coda-common.c</a></div><div class='hunk'>@@ -764,6 +764,7 @@ static int coda_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct coda_ctx *ctx = fh_to_ctx(priv);</div><div class='ctx'> 	struct coda_q_data *q_data_src;</div><div class='add'>+	const struct coda_codec *codec;</div><div class='ctx'> 	struct v4l2_rect r;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -784,6 +785,15 @@ static int coda_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 	if (ctx-&gt;inst_type != CODA_INST_ENCODER)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Setting the coded format determines the selected codec */</div><div class='add'>+	codec = coda_find_codec(ctx-&gt;dev, q_data_src-&gt;fourcc,</div><div class='add'>+				f-&gt;fmt.pix.pixelformat);</div><div class='add'>+	if (!codec) {</div><div class='add'>+		v4l2_err(&amp;ctx-&gt;dev-&gt;v4l2_dev, "failed to determine codec\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;codec = codec;</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;colorspace = f-&gt;fmt.pix.colorspace;</div><div class='ctx'> 	ctx-&gt;xfer_func = f-&gt;fmt.pix.xfer_func;</div><div class='ctx'> 	ctx-&gt;ycbcr_enc = f-&gt;fmt.pix.ycbcr_enc;</div><div class='hunk'>@@ -796,6 +806,7 @@ static int coda_s_fmt_vid_out(struct file *file, void *priv,</div><div class='ctx'> 			      struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct coda_ctx *ctx = fh_to_ctx(priv);</div><div class='add'>+	const struct coda_codec *codec;</div><div class='ctx'> 	struct v4l2_format f_cap;</div><div class='ctx'> 	struct vb2_queue *dst_vq;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -808,14 +819,23 @@ static int coda_s_fmt_vid_out(struct file *file, void *priv,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;inst_type != CODA_INST_DECODER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	ctx-&gt;colorspace = f-&gt;fmt.pix.colorspace;</div><div class='ctx'> 	ctx-&gt;xfer_func = f-&gt;fmt.pix.xfer_func;</div><div class='ctx'> 	ctx-&gt;ycbcr_enc = f-&gt;fmt.pix.ycbcr_enc;</div><div class='ctx'> 	ctx-&gt;quantization = f-&gt;fmt.pix.quantization;</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;inst_type != CODA_INST_DECODER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Setting the coded format determines the selected codec */</div><div class='add'>+	codec = coda_find_codec(ctx-&gt;dev, f-&gt;fmt.pix.pixelformat,</div><div class='add'>+				V4L2_PIX_FMT_YUV420);</div><div class='add'>+	if (!codec) {</div><div class='add'>+		v4l2_err(&amp;ctx-&gt;dev-&gt;v4l2_dev, "failed to determine codec\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;codec = codec;</div><div class='add'>+</div><div class='ctx'> 	dst_vq = v4l2_m2m_get_vq(ctx-&gt;fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='ctx'> 	if (!dst_vq)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -980,6 +1000,11 @@ static int coda_s_selection(struct file *file, void *fh,</div><div class='ctx'> static int coda_try_encoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 				struct v4l2_encoder_cmd *ec)</div><div class='ctx'> {</div><div class='add'>+	struct coda_ctx *ctx = fh_to_ctx(fh);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;inst_type != CODA_INST_ENCODER)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='ctx'> 	if (ec-&gt;cmd != V4L2_ENC_CMD_STOP)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1000,10 +1025,6 @@ static int coda_encoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Ignore encoder stop command silently in decoder context */</div><div class='del'>-	if (ctx-&gt;inst_type != CODA_INST_ENCODER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* Set the stream-end flag on this context */</div><div class='ctx'> 	ctx-&gt;bit_stream_param |= CODA_BIT_STREAM_END_FLAG;</div><div class='ctx'> </div><div class='hunk'>@@ -1021,6 +1042,11 @@ static int coda_encoder_cmd(struct file *file, void *fh,</div><div class='ctx'> static int coda_try_decoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 				struct v4l2_decoder_cmd *dc)</div><div class='ctx'> {</div><div class='add'>+	struct coda_ctx *ctx = fh_to_ctx(fh);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;inst_type != CODA_INST_DECODER)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='ctx'> 	if (dc-&gt;cmd != V4L2_DEC_CMD_STOP)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1043,10 +1069,6 @@ static int coda_decoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Ignore decoder stop command silently in encoder context */</div><div class='del'>-	if (ctx-&gt;inst_type != CODA_INST_DECODER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* Set the stream-end flag on this context */</div><div class='ctx'> 	coda_bit_stream_end_flag(ctx);</div><div class='ctx'> 	ctx-&gt;hold = false;</div><div class='hunk'>@@ -1055,6 +1077,42 @@ static int coda_decoder_cmd(struct file *file, void *fh,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int coda_enum_framesizes(struct file *file, void *fh,</div><div class='add'>+				struct v4l2_frmsizeenum *fsize)</div><div class='add'>+{</div><div class='add'>+	struct coda_ctx *ctx = fh_to_ctx(fh);</div><div class='add'>+	struct coda_q_data *q_data_dst;</div><div class='add'>+	const struct coda_codec *codec;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;inst_type != CODA_INST_ENCODER)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	if (fsize-&gt;index)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (coda_format_normalize_yuv(fsize-&gt;pixel_format) ==</div><div class='add'>+	    V4L2_PIX_FMT_YUV420) {</div><div class='add'>+		q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='add'>+		codec = coda_find_codec(ctx-&gt;dev, fsize-&gt;pixel_format,</div><div class='add'>+					q_data_dst-&gt;fourcc);</div><div class='add'>+	} else {</div><div class='add'>+		codec = coda_find_codec(ctx-&gt;dev, V4L2_PIX_FMT_YUV420,</div><div class='add'>+					fsize-&gt;pixel_format);</div><div class='add'>+	}</div><div class='add'>+	if (!codec)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fsize-&gt;type = V4L2_FRMSIZE_TYPE_CONTINUOUS;</div><div class='add'>+	fsize-&gt;stepwise.min_width = MIN_W;</div><div class='add'>+	fsize-&gt;stepwise.max_width = codec-&gt;max_w;</div><div class='add'>+	fsize-&gt;stepwise.step_width = 1;</div><div class='add'>+	fsize-&gt;stepwise.min_height = MIN_H;</div><div class='add'>+	fsize-&gt;stepwise.max_height = codec-&gt;max_h;</div><div class='add'>+	fsize-&gt;stepwise.step_height = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int coda_enum_frameintervals(struct file *file, void *fh,</div><div class='ctx'> 				    struct v4l2_frmivalenum *f)</div><div class='ctx'> {</div><div class='hunk'>@@ -1233,6 +1291,7 @@ static const struct v4l2_ioctl_ops coda_ioctl_ops = {</div><div class='ctx'> 	.vidioc_g_parm		= coda_g_parm,</div><div class='ctx'> 	.vidioc_s_parm		= coda_s_parm,</div><div class='ctx'> </div><div class='add'>+	.vidioc_enum_framesizes	= coda_enum_framesizes,</div><div class='ctx'> 	.vidioc_enum_frameintervals = coda_enum_frameintervals,</div><div class='ctx'> </div><div class='ctx'> 	.vidioc_subscribe_event = coda_subscribe_event,</div><div class='hunk'>@@ -1442,6 +1501,9 @@ static int coda_queue_setup(struct vb2_queue *vq,</div><div class='ctx'> 	q_data = get_q_data(ctx, vq-&gt;type);</div><div class='ctx'> 	size = q_data-&gt;sizeimage;</div><div class='ctx'> </div><div class='add'>+	if (*nplanes)</div><div class='add'>+		return sizes[0] &lt; size ? -EINVAL : 0;</div><div class='add'>+</div><div class='ctx'> 	*nplanes = 1;</div><div class='ctx'> 	sizes[0] = size;</div><div class='ctx'> </div><div class='hunk'>@@ -1680,14 +1742,6 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;gopcounter = ctx-&gt;params.gop_size - 1;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;codec = coda_find_codec(ctx-&gt;dev, q_data_src-&gt;fourcc,</div><div class='del'>-				     q_data_dst-&gt;fourcc);</div><div class='del'>-	if (!ctx-&gt;codec) {</div><div class='del'>-		v4l2_err(v4l2_dev, "couldn't tell instance type.\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (q_data_dst-&gt;fourcc == V4L2_PIX_FMT_JPEG)</div><div class='ctx'> 		ctx-&gt;params.gop_size = 1;</div><div class='ctx'> 	ctx-&gt;gopcounter = ctx-&gt;params.gop_size - 1;</div><div class='hunk'>@@ -2015,7 +2069,6 @@ static void coda_jpeg_encode_ctrls(struct coda_ctx *ctx)</div><div class='ctx'> </div><div class='ctx'> static void coda_decode_ctrls(struct coda_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	u64 mask;</div><div class='ctx'> 	u8 max;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;h264_profile_ctrl = v4l2_ctrl_new_std_menu(&amp;ctx-&gt;ctrls,</div><div class='hunk'>@@ -2029,27 +2082,14 @@ static void coda_decode_ctrls(struct coda_ctx *ctx)</div><div class='ctx'> 		ctx-&gt;h264_profile_ctrl-&gt;flags |= V4L2_CTRL_FLAG_READ_ONLY;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;dev-&gt;devtype-&gt;product == CODA_HX4 ||</div><div class='del'>-	    ctx-&gt;dev-&gt;devtype-&gt;product == CODA_7541) {</div><div class='add'>+	    ctx-&gt;dev-&gt;devtype-&gt;product == CODA_7541)</div><div class='ctx'> 		max = V4L2_MPEG_VIDEO_H264_LEVEL_4_0;</div><div class='del'>-		mask = ~((1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_4_0));</div><div class='del'>-	} else if (ctx-&gt;dev-&gt;devtype-&gt;product == CODA_960) {</div><div class='add'>+	else if (ctx-&gt;dev-&gt;devtype-&gt;product == CODA_960)</div><div class='ctx'> 		max = V4L2_MPEG_VIDEO_H264_LEVEL_4_1;</div><div class='del'>-		mask = ~((1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |</div><div class='del'>-			 (1 &lt;&lt; V4L2_MPEG_VIDEO_H264_LEVEL_4_1));</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	ctx-&gt;h264_level_ctrl = v4l2_ctrl_new_std_menu(&amp;ctx-&gt;ctrls,</div><div class='del'>-		&amp;coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_LEVEL, max, mask,</div><div class='del'>-		max);</div><div class='add'>+		&amp;coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_LEVEL, max, 0, max);</div><div class='ctx'> 	if (ctx-&gt;h264_level_ctrl)</div><div class='ctx'> 		ctx-&gt;h264_level_ctrl-&gt;flags |= V4L2_CTRL_FLAG_READ_ONLY;</div><div class='ctx'> }</div><div class='hunk'>@@ -2063,11 +2103,17 @@ static int coda_ctrls_setup(struct coda_ctx *ctx)</div><div class='ctx'> 	v4l2_ctrl_new_std(&amp;ctx-&gt;ctrls, &amp;coda_ctrl_ops,</div><div class='ctx'> 		V4L2_CID_VFLIP, 0, 1, 1, 0);</div><div class='ctx'> 	if (ctx-&gt;inst_type == CODA_INST_ENCODER) {</div><div class='add'>+		v4l2_ctrl_new_std(&amp;ctx-&gt;ctrls, &amp;coda_ctrl_ops,</div><div class='add'>+				  V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,</div><div class='add'>+				  1, 1, 1, 1);</div><div class='ctx'> 		if (ctx-&gt;cvd-&gt;dst_formats[0] == V4L2_PIX_FMT_JPEG)</div><div class='ctx'> 			coda_jpeg_encode_ctrls(ctx);</div><div class='ctx'> 		else</div><div class='ctx'> 			coda_encode_ctrls(ctx);</div><div class='ctx'> 	} else {</div><div class='add'>+		v4l2_ctrl_new_std(&amp;ctx-&gt;ctrls, &amp;coda_ctrl_ops,</div><div class='add'>+				  V4L2_CID_MIN_BUFFERS_FOR_CAPTURE,</div><div class='add'>+				  1, 1, 1, 1);</div><div class='ctx'> 		if (ctx-&gt;cvd-&gt;src_formats[0] == V4L2_PIX_FMT_H264)</div><div class='ctx'> 			coda_decode_ctrls(ctx);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c<br/>index 7bc4d8a9af28..068df9888dbf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/cros-ec-cec/cros-ec-cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/cros-ec-cec/cros-ec-cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/cros-ec-cec/cros-ec-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/cros-ec-cec/cros-ec-cec.c</a></div><div class='hunk'>@@ -236,6 +236,7 @@ static int cros_ec_cec_get_notifier(struct device *dev,</div><div class='ctx'> 				return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='ctx'> 			*notify = cec_notifier_get_conn(d, m-&gt;conn);</div><div class='add'>+			put_device(d);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c<br/>index 47cecd10eb9f..2dee9af6d413 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/isif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/isif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/isif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/davinci/isif.c</a></div><div class='hunk'>@@ -884,9 +884,7 @@ static int isif_set_hw_if_params(struct vpfe_hw_if_param *params)</div><div class='ctx'> static int isif_config_ycbcr(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct isif_ycbcr_config *params = &amp;isif_cfg.ycbcr;</div><div class='del'>-	struct vpss_pg_frame_size frame_size;</div><div class='ctx'> 	u32 modeset = 0, ccdcfg = 0;</div><div class='del'>-	struct vpss_sync_pol sync;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(isif_cfg.dev, "\nStarting isif_config_ycbcr...");</div><div class='ctx'> </div><div class='hunk'>@@ -974,13 +972,6 @@ static int isif_config_ycbcr(void)</div><div class='ctx'> 		/* two fields are interleaved in memory */</div><div class='ctx'> 		regw(0x00000249, SDOFST);</div><div class='ctx'> </div><div class='del'>-	/* Setup test pattern if enabled */</div><div class='del'>-	if (isif_cfg.bayer.config_params.test_pat_gen) {</div><div class='del'>-		sync.ccdpg_hdpol = params-&gt;hd_pol;</div><div class='del'>-		sync.ccdpg_vdpol = params-&gt;vd_pol;</div><div class='del'>-		dm365_vpss_set_sync_pol(sync);</div><div class='del'>-		dm365_vpss_set_pg_frame_size(frame_size);</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/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c<br/>index 26dadbba930f..1e3a13830544 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/vpfe_capture.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/vpfe_capture.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/vpfe_capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/davinci/vpfe_capture.c</a></div><div class='hunk'>@@ -1759,7 +1759,7 @@ static int vpfe_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ccdc_lock);</div><div class='ctx'> </div><div class='del'>-	strncpy(ccdc_cfg-&gt;name, vpfe_cfg-&gt;ccdc, 32);</div><div class='add'>+	strscpy(ccdc_cfg-&gt;name, vpfe_cfg-&gt;ccdc, sizeof(ccdc_cfg-&gt;name));</div><div class='ctx'> 	/* Get VINT0 irq resource */</div><div class='ctx'> 	res1 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='ctx'> 	if (!res1) {</div><div class='head'>diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c<br/>index 6216b7ac6875..b5aacb0fb96b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/vpif_capture.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/vpif_capture.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/vpif_capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/davinci/vpif_capture.c</a></div><div class='hunk'>@@ -1254,7 +1254,8 @@ static int vpif_s_dv_timings(struct file *file, void *priv,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		std_info-&gt;l5 = std_info-&gt;vsize - (bt-&gt;vfrontporch - 1);</div><div class='ctx'> 	}</div><div class='del'>-	strncpy(std_info-&gt;name, "Custom timings BT656/1120", VPIF_MAX_NAME);</div><div class='add'>+	strscpy(std_info-&gt;name, "Custom timings BT656/1120",</div><div class='add'>+		sizeof(std_info-&gt;name));</div><div class='ctx'> 	std_info-&gt;width = bt-&gt;width;</div><div class='ctx'> 	std_info-&gt;height = bt-&gt;height;</div><div class='ctx'> 	std_info-&gt;frm_fmt = bt-&gt;interlaced ? 0 : 1;</div><div class='head'>diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c<br/>index f4b4f2a1dfc0..a69897c68a50 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/vpif_display.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/davinci/vpif_display.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/davinci/vpif_display.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/davinci/vpif_display.c</a></div><div class='hunk'>@@ -987,8 +987,8 @@ static int vpif_s_dv_timings(struct file *file, void *priv,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		std_info-&gt;l5 = std_info-&gt;vsize - (bt-&gt;vfrontporch - 1);</div><div class='ctx'> 	}</div><div class='del'>-	strncpy(std_info-&gt;name, "Custom timings BT656/1120",</div><div class='del'>-			VPIF_MAX_NAME);</div><div class='add'>+	strscpy(std_info-&gt;name, "Custom timings BT656/1120",</div><div class='add'>+		sizeof(std_info-&gt;name));</div><div class='ctx'> 	std_info-&gt;width = bt-&gt;width;</div><div class='ctx'> 	std_info-&gt;height = bt-&gt;height;</div><div class='ctx'> 	std_info-&gt;frm_fmt = bt-&gt;interlaced ? 0 : 1;</div><div class='head'>diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c<br/>index 3e9fcf4f8a13..de4af0357a3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/exynos4-is/fimc-capture.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/exynos4-is/fimc-capture.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/exynos4-is/fimc-capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/exynos4-is/fimc-capture.c</a></div><div class='hunk'>@@ -742,7 +742,7 @@ static int fimc_cap_enum_fmt_mplane(struct file *file, void *priv,</div><div class='ctx'> 			       f-&gt;index);</div><div class='ctx'> 	if (!fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	strncpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description) - 1);</div><div class='add'>+	strscpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description));</div><div class='ctx'> 	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='ctx'> 	if (fmt-&gt;fourcc == MEDIA_BUS_FMT_JPEG_1X8)</div><div class='ctx'> 		f-&gt;flags |= V4L2_FMT_FLAG_COMPRESSED;</div><div class='head'>diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c<br/>index 61c8177409cf..1bea1ce4091e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/exynos4-is/fimc-m2m.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/exynos4-is/fimc-m2m.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/exynos4-is/fimc-m2m.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/exynos4-is/fimc-m2m.c</a></div><div class='hunk'>@@ -252,7 +252,7 @@ static int fimc_m2m_enum_fmt_mplane(struct file *file, void *priv,</div><div class='ctx'> 	if (!fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strncpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description) - 1);</div><div class='add'>+	strscpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description));</div><div class='ctx'> 	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c<br/>index 0bcfc5aa8f3d..8e7ef23b9a7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/imx-pxp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/imx-pxp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/imx-pxp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/imx-pxp.c</a></div><div class='hunk'>@@ -1025,8 +1025,8 @@ static irqreturn_t pxp_irq_handler(int irq, void *dev_id)</div><div class='ctx'> static int pxp_querycap(struct file *file, void *priv,</div><div class='ctx'> 			   struct v4l2_capability *cap)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(cap-&gt;driver, MEM2MEM_NAME, sizeof(cap-&gt;driver));</div><div class='del'>-	strlcpy(cap-&gt;card, MEM2MEM_NAME, sizeof(cap-&gt;card));</div><div class='add'>+	strscpy(cap-&gt;driver, MEM2MEM_NAME, sizeof(cap-&gt;driver));</div><div class='add'>+	strscpy(cap-&gt;card, MEM2MEM_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info),</div><div class='ctx'> 			"platform:%s", MEM2MEM_NAME);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig<br/>index cf12e077203a..cd88e2eed749 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/marvell-ccic/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/marvell-ccic/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/marvell-ccic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/marvell-ccic/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,7 @@ config VIDEO_CAFE_CCIC</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux2 driver for the Marvell 88ALP01 integrated</div><div class='ctx'> 	  CMOS camera controller.  This is the controller found on first-</div><div class='ctx'> 	  generation OLPC systems.</div><div class='hunk'>@@ -19,7 +19,7 @@ config VIDEO_MMP_CAMERA</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a Video4Linux2 driver for the integrated camera</div><div class='ctx'> 	  controller found on Marvell Armada 610 application</div><div class='ctx'> 	  processors (and likely beyond).  This is the controller found</div><div class='head'>diff --git a/drivers/media/platform/meson/Makefile b/drivers/media/platform/meson/Makefile<br/>index 597beb8f34d1..f611c23c3718 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/meson/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/meson/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/meson/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/meson/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='ctx'> obj-$(CONFIG_VIDEO_MESON_AO_CEC)	+= ao-cec.o</div><div class='add'>+obj-$(CONFIG_VIDEO_MESON_G12A_AO_CEC)	+= ao-cec-g12a.o</div><div class='head'>diff --git a/drivers/media/platform/meson/ao-cec-g12a.c b/drivers/media/platform/meson/ao-cec-g12a.c<br/>new file mode 100644<br/>index 000000000000..3620a1e310f5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/meson/ao-cec-g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/meson/ao-cec-g12a.c</a></div><div class='hunk'>@@ -0,0 +1,779 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Driver for Amlogic Meson AO CEC G12A Controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved</div><div class='add'>+ * Copyright (C) 2019 BayLibre, SAS</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.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/clk.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</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/of.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/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.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/regmap.h&gt;</div><div class='add'>+#include &lt;media/cec.h&gt;</div><div class='add'>+#include &lt;media/cec-notifier.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+</div><div class='add'>+/* CEC Registers */</div><div class='add'>+</div><div class='add'>+#define CECB_CLK_CNTL_REG0		0x00</div><div class='add'>+</div><div class='add'>+#define CECB_CLK_CNTL_N1		GENMASK(11, 0)</div><div class='add'>+#define CECB_CLK_CNTL_N2		GENMASK(23, 12)</div><div class='add'>+#define CECB_CLK_CNTL_DUAL_EN		BIT(28)</div><div class='add'>+#define CECB_CLK_CNTL_OUTPUT_EN		BIT(30)</div><div class='add'>+#define CECB_CLK_CNTL_INPUT_EN		BIT(31)</div><div class='add'>+</div><div class='add'>+#define CECB_CLK_CNTL_REG1		0x04</div><div class='add'>+</div><div class='add'>+#define CECB_CLK_CNTL_M1		GENMASK(11, 0)</div><div class='add'>+#define CECB_CLK_CNTL_M2		GENMASK(23, 12)</div><div class='add'>+#define CECB_CLK_CNTL_BYPASS_EN		BIT(24)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [14:12] Filter_del. For glitch-filtering CEC line, ignore signal</div><div class='add'>+ *       change pulse width &lt; filter_del * T(filter_tick) * 3.</div><div class='add'>+ * [9:8] Filter_tick_sel: Select which periodical pulse for</div><div class='add'>+ *       glitch-filtering CEC line signal.</div><div class='add'>+ *  - 0=Use T(xtal)*3 = 125ns;</div><div class='add'>+ *  - 1=Use once-per-1us pulse;</div><div class='add'>+ *  - 2=Use once-per-10us pulse;</div><div class='add'>+ *  - 3=Use once-per-100us pulse.</div><div class='add'>+ * [3]   Sysclk_en. 0=Disable system clock; 1=Enable system clock.</div><div class='add'>+ * [2:1] cntl_clk</div><div class='add'>+ *  - 0 = Disable clk (Power-off mode)</div><div class='add'>+ *  - 1 = Enable gated clock (Normal mode)</div><div class='add'>+ *  - 2 = Enable free-run clk (Debug mode)</div><div class='add'>+ * [0] SW_RESET 1=Apply reset; 0=No reset.</div><div class='add'>+ */</div><div class='add'>+#define CECB_GEN_CNTL_REG		0x08</div><div class='add'>+</div><div class='add'>+#define CECB_GEN_CNTL_RESET		BIT(0)</div><div class='add'>+#define CECB_GEN_CNTL_CLK_DISABLE	0</div><div class='add'>+#define CECB_GEN_CNTL_CLK_ENABLE	1</div><div class='add'>+#define CECB_GEN_CNTL_CLK_ENABLE_DBG	2</div><div class='add'>+#define CECB_GEN_CNTL_CLK_CTRL_MASK	GENMASK(2, 1)</div><div class='add'>+#define CECB_GEN_CNTL_SYS_CLK_EN	BIT(3)</div><div class='add'>+#define CECB_GEN_CNTL_FILTER_TICK_125NS	0</div><div class='add'>+#define CECB_GEN_CNTL_FILTER_TICK_1US	1</div><div class='add'>+#define CECB_GEN_CNTL_FILTER_TICK_10US	2</div><div class='add'>+#define CECB_GEN_CNTL_FILTER_TICK_100US	3</div><div class='add'>+#define CECB_GEN_CNTL_FILTER_TICK_SEL	GENMASK(9, 8)</div><div class='add'>+#define CECB_GEN_CNTL_FILTER_DEL	GENMASK(14, 12)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [7:0] cec_reg_addr</div><div class='add'>+ * [15:8] cec_reg_wrdata</div><div class='add'>+ * [16] cec_reg_wr</div><div class='add'>+ *  - 0 = Read</div><div class='add'>+ *  - 1 = Write</div><div class='add'>+ * [31:24] cec_reg_rddata</div><div class='add'>+ */</div><div class='add'>+#define CECB_RW_REG			0x0c</div><div class='add'>+</div><div class='add'>+#define CECB_RW_ADDR			GENMASK(7, 0)</div><div class='add'>+#define CECB_RW_WR_DATA			GENMASK(15, 8)</div><div class='add'>+#define CECB_RW_WRITE_EN		BIT(16)</div><div class='add'>+#define CECB_RW_BUS_BUSY		BIT(23)</div><div class='add'>+#define CECB_RW_RD_DATA			GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [0] DONE Interrupt</div><div class='add'>+ * [1] End Of Message Interrupt</div><div class='add'>+ * [2] Not Acknowlegde Interrupt</div><div class='add'>+ * [3] Arbitration Loss Interrupt</div><div class='add'>+ * [4] Initiator Error Interrupt</div><div class='add'>+ * [5] Follower Error Interrupt</div><div class='add'>+ * [6] Wake-Up Interrupt</div><div class='add'>+ */</div><div class='add'>+#define CECB_INTR_MASKN_REG		0x10</div><div class='add'>+#define CECB_INTR_CLR_REG		0x14</div><div class='add'>+#define CECB_INTR_STAT_REG		0x18</div><div class='add'>+</div><div class='add'>+#define CECB_INTR_DONE			BIT(0)</div><div class='add'>+#define CECB_INTR_EOM			BIT(1)</div><div class='add'>+#define CECB_INTR_NACK			BIT(2)</div><div class='add'>+#define CECB_INTR_ARB_LOSS		BIT(3)</div><div class='add'>+#define CECB_INTR_INITIATOR_ERR		BIT(4)</div><div class='add'>+#define CECB_INTR_FOLLOWER_ERR		BIT(5)</div><div class='add'>+#define CECB_INTR_WAKE_UP		BIT(6)</div><div class='add'>+</div><div class='add'>+/* CEC Commands */</div><div class='add'>+</div><div class='add'>+#define CECB_CTRL		0x00</div><div class='add'>+</div><div class='add'>+#define CECB_CTRL_SEND		BIT(0)</div><div class='add'>+#define CECB_CTRL_TYPE		GENMASK(2, 1)</div><div class='add'>+#define CECB_CTRL_TYPE_RETRY	0</div><div class='add'>+#define CECB_CTRL_TYPE_NEW	1</div><div class='add'>+#define CECB_CTRL_TYPE_NEXT	2</div><div class='add'>+</div><div class='add'>+#define CECB_CTRL2		0x01</div><div class='add'>+#define CECB_INTR_MASK		0x02</div><div class='add'>+#define CECB_LADD_LOW		0x05</div><div class='add'>+#define CECB_LADD_HIGH		0x06</div><div class='add'>+#define CECB_TX_CNT		0x07</div><div class='add'>+#define CECB_RX_CNT		0x08</div><div class='add'>+#define CECB_STAT0		0x09</div><div class='add'>+#define CECB_TX_DATA00		0x10</div><div class='add'>+#define CECB_TX_DATA01		0x11</div><div class='add'>+#define CECB_TX_DATA02		0x12</div><div class='add'>+#define CECB_TX_DATA03		0x13</div><div class='add'>+#define CECB_TX_DATA04		0x14</div><div class='add'>+#define CECB_TX_DATA05		0x15</div><div class='add'>+#define CECB_TX_DATA06		0x16</div><div class='add'>+#define CECB_TX_DATA07		0x17</div><div class='add'>+#define CECB_TX_DATA08		0x18</div><div class='add'>+#define CECB_TX_DATA09		0x19</div><div class='add'>+#define CECB_TX_DATA10		0x1A</div><div class='add'>+#define CECB_TX_DATA11		0x1B</div><div class='add'>+#define CECB_TX_DATA12		0x1C</div><div class='add'>+#define CECB_TX_DATA13		0x1D</div><div class='add'>+#define CECB_TX_DATA14		0x1E</div><div class='add'>+#define CECB_TX_DATA15		0x1F</div><div class='add'>+#define CECB_RX_DATA00		0x20</div><div class='add'>+#define CECB_RX_DATA01		0x21</div><div class='add'>+#define CECB_RX_DATA02		0x22</div><div class='add'>+#define CECB_RX_DATA03		0x23</div><div class='add'>+#define CECB_RX_DATA04		0x24</div><div class='add'>+#define CECB_RX_DATA05		0x25</div><div class='add'>+#define CECB_RX_DATA06		0x26</div><div class='add'>+#define CECB_RX_DATA07		0x27</div><div class='add'>+#define CECB_RX_DATA08		0x28</div><div class='add'>+#define CECB_RX_DATA09		0x29</div><div class='add'>+#define CECB_RX_DATA10		0x2A</div><div class='add'>+#define CECB_RX_DATA11		0x2B</div><div class='add'>+#define CECB_RX_DATA12		0x2C</div><div class='add'>+#define CECB_RX_DATA13		0x2D</div><div class='add'>+#define CECB_RX_DATA14		0x2E</div><div class='add'>+#define CECB_RX_DATA15		0x2F</div><div class='add'>+#define CECB_LOCK_BUF		0x30</div><div class='add'>+</div><div class='add'>+#define CECB_LOCK_BUF_EN	BIT(0)</div><div class='add'>+</div><div class='add'>+#define CECB_WAKEUPCTRL		0x31</div><div class='add'>+</div><div class='add'>+struct meson_ao_cec_g12a_device {</div><div class='add'>+	struct platform_device		*pdev;</div><div class='add'>+	struct regmap			*regmap;</div><div class='add'>+	struct regmap			*regmap_cec;</div><div class='add'>+	spinlock_t			cec_reg_lock;</div><div class='add'>+	struct cec_notifier		*notify;</div><div class='add'>+	struct cec_adapter		*adap;</div><div class='add'>+	struct cec_msg			rx_msg;</div><div class='add'>+	struct clk			*oscin;</div><div class='add'>+	struct clk			*core;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config meson_ao_cec_g12a_regmap_conf = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = CECB_INTR_STAT_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The AO-CECB embeds a dual/divider to generate a more precise</div><div class='add'>+ * 32,768KHz clock for CEC core clock.</div><div class='add'>+ *                      ______   ______</div><div class='add'>+ *                     |      | |      |</div><div class='add'>+ *         ______      | Div1 |-| Cnt1 |       ______</div><div class='add'>+ *        |      |    /|______| |______|\     |      |</div><div class='add'>+ * Xtal--&gt;| Gate |---|  ______   ______  X-X--| Gate |--&gt;</div><div class='add'>+ *        |______| |  \|      | |      |/  |  |______|</div><div class='add'>+ *                 |   | Div2 |-| Cnt2 |   |</div><div class='add'>+ *                 |   |______| |______|   |</div><div class='add'>+ *                 |_______________________|</div><div class='add'>+ *</div><div class='add'>+ * The dividing can be switched to single or dual, with a counter</div><div class='add'>+ * for each divider to set when the switching is done.</div><div class='add'>+ * The entire dividing mechanism can be also bypassed.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct meson_ao_cec_g12a_dualdiv_clk {</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define hw_to_meson_ao_cec_g12a_dualdiv_clk(_hw)			\</div><div class='add'>+	container_of(_hw, struct meson_ao_cec_g12a_dualdiv_clk, hw)	\</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+meson_ao_cec_g12a_dualdiv_clk_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					  unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_dualdiv_clk *dualdiv_clk =</div><div class='add'>+		hw_to_meson_ao_cec_g12a_dualdiv_clk(hw);</div><div class='add'>+	unsigned long n1;</div><div class='add'>+	u32 reg0, reg1;</div><div class='add'>+</div><div class='add'>+	regmap_read(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0, &amp;reg0);</div><div class='add'>+	regmap_read(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0, &amp;reg1);</div><div class='add'>+</div><div class='add'>+	if (reg1 &amp; CECB_CLK_CNTL_BYPASS_EN)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='add'>+	if (reg0 &amp; CECB_CLK_CNTL_DUAL_EN) {</div><div class='add'>+		unsigned long n2, m1, m2, f1, f2, p1, p2;</div><div class='add'>+</div><div class='add'>+		n1 = FIELD_GET(CECB_CLK_CNTL_N1, reg0) + 1;</div><div class='add'>+		n2 = FIELD_GET(CECB_CLK_CNTL_N2, reg0) + 1;</div><div class='add'>+</div><div class='add'>+		m1 = FIELD_GET(CECB_CLK_CNTL_M1, reg1) + 1;</div><div class='add'>+		m2 = FIELD_GET(CECB_CLK_CNTL_M1, reg1) + 1;</div><div class='add'>+</div><div class='add'>+		f1 = DIV_ROUND_CLOSEST(parent_rate, n1);</div><div class='add'>+		f2 = DIV_ROUND_CLOSEST(parent_rate, n2);</div><div class='add'>+</div><div class='add'>+		p1 = DIV_ROUND_CLOSEST(100000000 * m1, f1 * (m1 + m2));</div><div class='add'>+		p2 = DIV_ROUND_CLOSEST(100000000 * m2, f2 * (m1 + m2));</div><div class='add'>+</div><div class='add'>+		return DIV_ROUND_UP(100000000, p1 + p2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n1 = FIELD_GET(CECB_CLK_CNTL_N1, reg0) + 1;</div><div class='add'>+</div><div class='add'>+	return DIV_ROUND_CLOSEST(parent_rate, n1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int meson_ao_cec_g12a_dualdiv_clk_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_dualdiv_clk *dualdiv_clk =</div><div class='add'>+		hw_to_meson_ao_cec_g12a_dualdiv_clk(hw);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Disable Input &amp; Output */</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0,</div><div class='add'>+			   CECB_CLK_CNTL_INPUT_EN | CECB_CLK_CNTL_OUTPUT_EN,</div><div class='add'>+			   0);</div><div class='add'>+</div><div class='add'>+	/* Set N1 &amp; N2 */</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0,</div><div class='add'>+			   CECB_CLK_CNTL_N1,</div><div class='add'>+			   FIELD_PREP(CECB_CLK_CNTL_N1, 733 - 1));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0,</div><div class='add'>+			   CECB_CLK_CNTL_N2,</div><div class='add'>+			   FIELD_PREP(CECB_CLK_CNTL_N2, 732 - 1));</div><div class='add'>+</div><div class='add'>+	/* Set M1 &amp; M2 */</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG1,</div><div class='add'>+			   CECB_CLK_CNTL_M1,</div><div class='add'>+			   FIELD_PREP(CECB_CLK_CNTL_M1, 8 - 1));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG1,</div><div class='add'>+			   CECB_CLK_CNTL_M2,</div><div class='add'>+			   FIELD_PREP(CECB_CLK_CNTL_M2, 11 - 1));</div><div class='add'>+</div><div class='add'>+	/* Enable Dual divisor */</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0,</div><div class='add'>+			   CECB_CLK_CNTL_DUAL_EN, CECB_CLK_CNTL_DUAL_EN);</div><div class='add'>+</div><div class='add'>+	/* Disable divisor bypass */</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG1,</div><div class='add'>+			   CECB_CLK_CNTL_BYPASS_EN, 0);</div><div class='add'>+</div><div class='add'>+	/* Enable Input &amp; Output */</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0,</div><div class='add'>+			   CECB_CLK_CNTL_INPUT_EN | CECB_CLK_CNTL_OUTPUT_EN,</div><div class='add'>+			   CECB_CLK_CNTL_INPUT_EN | CECB_CLK_CNTL_OUTPUT_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 meson_ao_cec_g12a_dualdiv_clk_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_dualdiv_clk *dualdiv_clk =</div><div class='add'>+		hw_to_meson_ao_cec_g12a_dualdiv_clk(hw);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0,</div><div class='add'>+			   CECB_CLK_CNTL_INPUT_EN | CECB_CLK_CNTL_OUTPUT_EN,</div><div class='add'>+			   0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int meson_ao_cec_g12a_dualdiv_clk_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_dualdiv_clk *dualdiv_clk =</div><div class='add'>+		hw_to_meson_ao_cec_g12a_dualdiv_clk(hw);</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	regmap_read(dualdiv_clk-&gt;regmap, CECB_CLK_CNTL_REG0, &amp;val);</div><div class='add'>+</div><div class='add'>+	return !!(val &amp; (CECB_CLK_CNTL_INPUT_EN | CECB_CLK_CNTL_OUTPUT_EN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops meson_ao_cec_g12a_dualdiv_clk_ops = {</div><div class='add'>+	.recalc_rate	= meson_ao_cec_g12a_dualdiv_clk_recalc_rate,</div><div class='add'>+	.is_enabled	= meson_ao_cec_g12a_dualdiv_clk_is_enabled,</div><div class='add'>+	.enable		= meson_ao_cec_g12a_dualdiv_clk_enable,</div><div class='add'>+	.disable	= meson_ao_cec_g12a_dualdiv_clk_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int meson_ao_cec_g12a_setup_clk(struct meson_ao_cec_g12a_device *ao_cec)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_dualdiv_clk *dualdiv_clk;</div><div class='add'>+	struct device *dev = &amp;ao_cec-&gt;pdev-&gt;dev;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	const char *parent_name;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	dualdiv_clk = devm_kzalloc(dev, sizeof(*dualdiv_clk), GFP_KERNEL);</div><div class='add'>+	if (!dualdiv_clk)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	name = kasprintf(GFP_KERNEL, "%s#dualdiv_clk", dev_name(dev));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	parent_name = __clk_get_name(ao_cec-&gt;oscin);</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;meson_ao_cec_g12a_dualdiv_clk_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	init.parent_names = &amp;parent_name;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+	dualdiv_clk-&gt;regmap = ao_cec-&gt;regmap;</div><div class='add'>+	dualdiv_clk-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_register(dev, &amp;dualdiv_clk-&gt;hw);</div><div class='add'>+	kfree(name);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		dev_err(dev, "failed to register clock\n");</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;core = clk;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int meson_ao_cec_g12a_read(void *context, unsigned int addr,</div><div class='add'>+				  unsigned int *data)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = context;</div><div class='add'>+	u32 reg = FIELD_PREP(CECB_RW_ADDR, addr);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_cec-&gt;cec_reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(ao_cec-&gt;regmap, CECB_RW_REG, reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto read_out;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(ao_cec-&gt;regmap, CECB_RW_REG, reg,</div><div class='add'>+				       !(reg &amp; CECB_RW_BUS_BUSY),</div><div class='add'>+				       5, 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto read_out;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(ao_cec-&gt;regmap, CECB_RW_REG, &amp;reg);</div><div class='add'>+</div><div class='add'>+	*data = FIELD_GET(CECB_RW_RD_DATA, reg);</div><div class='add'>+</div><div class='add'>+read_out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_cec-&gt;cec_reg_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 meson_ao_cec_g12a_write(void *context, unsigned int addr,</div><div class='add'>+				   unsigned int data)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = context;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 reg = FIELD_PREP(CECB_RW_ADDR, addr) |</div><div class='add'>+		  FIELD_PREP(CECB_RW_WR_DATA, data) |</div><div class='add'>+		  CECB_RW_WRITE_EN;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ao_cec-&gt;cec_reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(ao_cec-&gt;regmap, CECB_RW_REG, reg);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ao_cec-&gt;cec_reg_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 const struct regmap_config meson_ao_cec_g12a_cec_regmap_conf = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.reg_read = meson_ao_cec_g12a_read,</div><div class='add'>+	.reg_write = meson_ao_cec_g12a_write,</div><div class='add'>+	.max_register = 0xffff,</div><div class='add'>+	.fast_io = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+meson_ao_cec_g12a_irq_setup(struct meson_ao_cec_g12a_device *ao_cec,</div><div class='add'>+			    bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 cfg = CECB_INTR_DONE | CECB_INTR_EOM | CECB_INTR_NACK |</div><div class='add'>+		  CECB_INTR_ARB_LOSS | CECB_INTR_INITIATOR_ERR |</div><div class='add'>+		  CECB_INTR_FOLLOWER_ERR;</div><div class='add'>+</div><div class='add'>+	regmap_write(ao_cec-&gt;regmap, CECB_INTR_MASKN_REG,</div><div class='add'>+		     enable ? cfg : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void meson_ao_cec_g12a_irq_rx(struct meson_ao_cec_g12a_device *ao_cec)</div><div class='add'>+{</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(ao_cec-&gt;regmap_cec, CECB_RX_CNT, &amp;val);</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;rx_msg.len = val;</div><div class='add'>+	if (ao_cec-&gt;rx_msg.len &gt; CEC_MAX_MSG_SIZE)</div><div class='add'>+		ao_cec-&gt;rx_msg.len = CEC_MAX_MSG_SIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ao_cec-&gt;rx_msg.len; i++) {</div><div class='add'>+		ret |= regmap_read(ao_cec-&gt;regmap_cec,</div><div class='add'>+				   CECB_RX_DATA00 + i, &amp;val);</div><div class='add'>+</div><div class='add'>+		ao_cec-&gt;rx_msg.msg[i] = val &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret |= regmap_write(ao_cec-&gt;regmap_cec, CECB_LOCK_BUF, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cec_received_msg(ao_cec-&gt;adap, &amp;ao_cec-&gt;rx_msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t meson_ao_cec_g12a_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = data;</div><div class='add'>+	u32 stat;</div><div class='add'>+</div><div class='add'>+	regmap_read(ao_cec-&gt;regmap, CECB_INTR_STAT_REG, &amp;stat);</div><div class='add'>+	if (stat)</div><div class='add'>+		return IRQ_WAKE_THREAD;</div><div class='add'>+</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t meson_ao_cec_g12a_irq_thread(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = data;</div><div class='add'>+	u32 stat;</div><div class='add'>+</div><div class='add'>+	regmap_read(ao_cec-&gt;regmap, CECB_INTR_STAT_REG, &amp;stat);</div><div class='add'>+	regmap_write(ao_cec-&gt;regmap, CECB_INTR_CLR_REG, stat);</div><div class='add'>+</div><div class='add'>+	if (stat &amp; CECB_INTR_DONE)</div><div class='add'>+		cec_transmit_attempt_done(ao_cec-&gt;adap, CEC_TX_STATUS_OK);</div><div class='add'>+</div><div class='add'>+	if (stat &amp; CECB_INTR_EOM)</div><div class='add'>+		meson_ao_cec_g12a_irq_rx(ao_cec);</div><div class='add'>+</div><div class='add'>+	if (stat &amp; CECB_INTR_NACK)</div><div class='add'>+		cec_transmit_attempt_done(ao_cec-&gt;adap, CEC_TX_STATUS_NACK);</div><div class='add'>+</div><div class='add'>+	if (stat &amp; CECB_INTR_ARB_LOSS) {</div><div class='add'>+		regmap_write(ao_cec-&gt;regmap_cec, CECB_TX_CNT, 0);</div><div class='add'>+		regmap_update_bits(ao_cec-&gt;regmap_cec, CECB_CTRL,</div><div class='add'>+				   CECB_CTRL_SEND | CECB_CTRL_TYPE, 0);</div><div class='add'>+		cec_transmit_attempt_done(ao_cec-&gt;adap, CEC_TX_STATUS_ARB_LOST);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initiator reports an error on the CEC bus */</div><div class='add'>+	if (stat &amp; CECB_INTR_INITIATOR_ERR)</div><div class='add'>+		cec_transmit_attempt_done(ao_cec-&gt;adap, CEC_TX_STATUS_ERROR);</div><div class='add'>+</div><div class='add'>+	/* Follower reports a receive error, just reset RX buffer */</div><div class='add'>+	if (stat &amp; CECB_INTR_FOLLOWER_ERR)</div><div class='add'>+		regmap_write(ao_cec-&gt;regmap_cec, CECB_LOCK_BUF, 0);</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</div><div class='add'>+meson_ao_cec_g12a_set_log_addr(struct cec_adapter *adap, u8 logical_addr)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = adap-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (logical_addr == CEC_LOG_ADDR_INVALID) {</div><div class='add'>+		/* Assume this will allways succeed */</div><div class='add'>+		regmap_write(ao_cec-&gt;regmap_cec, CECB_LADD_LOW, 0);</div><div class='add'>+		regmap_write(ao_cec-&gt;regmap_cec, CECB_LADD_HIGH, 0);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (logical_addr &lt; 8) {</div><div class='add'>+		ret = regmap_update_bits(ao_cec-&gt;regmap_cec, CECB_LADD_LOW,</div><div class='add'>+					 BIT(logical_addr),</div><div class='add'>+					 BIT(logical_addr));</div><div class='add'>+	} else {</div><div class='add'>+		ret = regmap_update_bits(ao_cec-&gt;regmap_cec, CECB_LADD_HIGH,</div><div class='add'>+					 BIT(logical_addr - 8),</div><div class='add'>+					 BIT(logical_addr - 8));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Always set Broadcast/Unregistered 15 address */</div><div class='add'>+	ret |= regmap_update_bits(ao_cec-&gt;regmap_cec, CECB_LADD_HIGH,</div><div class='add'>+				  BIT(CEC_LOG_ADDR_UNREGISTERED - 8),</div><div class='add'>+				  BIT(CEC_LOG_ADDR_UNREGISTERED - 8));</div><div class='add'>+</div><div class='add'>+	return ret ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int meson_ao_cec_g12a_transmit(struct cec_adapter *adap, u8 attempts,</div><div class='add'>+				 u32 signal_free_time, struct cec_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = adap-&gt;priv;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Check if RX is in progress */</div><div class='add'>+	ret = regmap_read(ao_cec-&gt;regmap_cec, CECB_LOCK_BUF, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val &amp; CECB_LOCK_BUF_EN)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* Check if TX Busy */</div><div class='add'>+	ret = regmap_read(ao_cec-&gt;regmap_cec, CECB_CTRL, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val &amp; CECB_CTRL_SEND)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	switch (signal_free_time) {</div><div class='add'>+	case CEC_SIGNAL_FREE_TIME_RETRY:</div><div class='add'>+		type = CECB_CTRL_TYPE_RETRY;</div><div class='add'>+		break;</div><div class='add'>+	case CEC_SIGNAL_FREE_TIME_NEXT_XFER:</div><div class='add'>+		type = CECB_CTRL_TYPE_NEXT;</div><div class='add'>+		break;</div><div class='add'>+	case CEC_SIGNAL_FREE_TIME_NEW_INITIATOR:</div><div class='add'>+	default:</div><div class='add'>+		type = CECB_CTRL_TYPE_NEW;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; msg-&gt;len; i++)</div><div class='add'>+		ret |= regmap_write(ao_cec-&gt;regmap_cec, CECB_TX_DATA00 + i,</div><div class='add'>+				    msg-&gt;msg[i]);</div><div class='add'>+</div><div class='add'>+	ret |= regmap_write(ao_cec-&gt;regmap_cec, CECB_TX_CNT, msg-&gt;len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(ao_cec-&gt;regmap_cec, CECB_CTRL,</div><div class='add'>+				 CECB_CTRL_SEND |</div><div class='add'>+				 CECB_CTRL_TYPE,</div><div class='add'>+				 CECB_CTRL_SEND |</div><div class='add'>+				 FIELD_PREP(CECB_CTRL_TYPE, 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 meson_ao_cec_g12a_adap_enable(struct cec_adapter *adap, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = adap-&gt;priv;</div><div class='add'>+</div><div class='add'>+	meson_ao_cec_g12a_irq_setup(ao_cec, false);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(ao_cec-&gt;regmap, CECB_GEN_CNTL_REG,</div><div class='add'>+			   CECB_GEN_CNTL_RESET, CECB_GEN_CNTL_RESET);</div><div class='add'>+</div><div class='add'>+	if (!enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Setup Filter */</div><div class='add'>+	regmap_update_bits(ao_cec-&gt;regmap, CECB_GEN_CNTL_REG,</div><div class='add'>+			   CECB_GEN_CNTL_FILTER_TICK_SEL |</div><div class='add'>+			   CECB_GEN_CNTL_FILTER_DEL,</div><div class='add'>+			   FIELD_PREP(CECB_GEN_CNTL_FILTER_TICK_SEL,</div><div class='add'>+				      CECB_GEN_CNTL_FILTER_TICK_1US) |</div><div class='add'>+			   FIELD_PREP(CECB_GEN_CNTL_FILTER_DEL, 7));</div><div class='add'>+</div><div class='add'>+	/* Enable System Clock */</div><div class='add'>+	regmap_update_bits(ao_cec-&gt;regmap, CECB_GEN_CNTL_REG,</div><div class='add'>+			   CECB_GEN_CNTL_SYS_CLK_EN,</div><div class='add'>+			   CECB_GEN_CNTL_SYS_CLK_EN);</div><div class='add'>+</div><div class='add'>+	/* Enable gated clock (Normal mode). */</div><div class='add'>+	regmap_update_bits(ao_cec-&gt;regmap, CECB_GEN_CNTL_REG,</div><div class='add'>+			   CECB_GEN_CNTL_CLK_CTRL_MASK,</div><div class='add'>+			    FIELD_PREP(CECB_GEN_CNTL_CLK_CTRL_MASK,</div><div class='add'>+				       CECB_GEN_CNTL_CLK_ENABLE));</div><div class='add'>+</div><div class='add'>+	/* Release Reset */</div><div class='add'>+	regmap_update_bits(ao_cec-&gt;regmap, CECB_GEN_CNTL_REG,</div><div class='add'>+			   CECB_GEN_CNTL_RESET, 0);</div><div class='add'>+</div><div class='add'>+	meson_ao_cec_g12a_irq_setup(ao_cec, true);</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 cec_adap_ops meson_ao_cec_g12a_ops = {</div><div class='add'>+	.adap_enable = meson_ao_cec_g12a_adap_enable,</div><div class='add'>+	.adap_log_addr = meson_ao_cec_g12a_set_log_addr,</div><div class='add'>+	.adap_transmit = meson_ao_cec_g12a_transmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int meson_ao_cec_g12a_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec;</div><div class='add'>+	struct device *hdmi_dev;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int ret, irq;</div><div class='add'>+</div><div class='add'>+	hdmi_dev = cec_notifier_parse_hdmi_phandle(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(hdmi_dev))</div><div class='add'>+		return PTR_ERR(hdmi_dev);</div><div class='add'>+</div><div class='add'>+	ao_cec = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*ao_cec), GFP_KERNEL);</div><div class='add'>+	if (!ao_cec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ao_cec-&gt;cec_reg_lock);</div><div class='add'>+	ao_cec-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;notify = cec_notifier_get(hdmi_dev);</div><div class='add'>+	if (!ao_cec-&gt;notify)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;adap = cec_allocate_adapter(&amp;meson_ao_cec_g12a_ops, ao_cec,</div><div class='add'>+					    "meson_g12a_ao_cec",</div><div class='add'>+					    CEC_CAP_DEFAULTS,</div><div class='add'>+					    CEC_MAX_LOG_ADDRS);</div><div class='add'>+	if (IS_ERR(ao_cec-&gt;adap)) {</div><div class='add'>+		ret = PTR_ERR(ao_cec-&gt;adap);</div><div class='add'>+		goto out_probe_notify;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;adap-&gt;owner = THIS_MODULE;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(base)) {</div><div class='add'>+		ret = PTR_ERR(base);</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;regmap = devm_regmap_init_mmio(&amp;pdev-&gt;dev, base,</div><div class='add'>+					       &amp;meson_ao_cec_g12a_regmap_conf);</div><div class='add'>+	if (IS_ERR(ao_cec-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(ao_cec-&gt;regmap);</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;regmap_cec = devm_regmap_init(&amp;pdev-&gt;dev, NULL, ao_cec,</div><div class='add'>+					   &amp;meson_ao_cec_g12a_cec_regmap_conf);</div><div class='add'>+	if (IS_ERR(ao_cec-&gt;regmap_cec)) {</div><div class='add'>+		ret = PTR_ERR(ao_cec-&gt;regmap_cec);</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	ret = devm_request_threaded_irq(&amp;pdev-&gt;dev, irq,</div><div class='add'>+					meson_ao_cec_g12a_irq,</div><div class='add'>+					meson_ao_cec_g12a_irq_thread,</div><div class='add'>+					0, NULL, ao_cec);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "irq request failed\n");</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ao_cec-&gt;oscin = devm_clk_get(&amp;pdev-&gt;dev, "oscin");</div><div class='add'>+	if (IS_ERR(ao_cec-&gt;oscin)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "oscin clock request failed\n");</div><div class='add'>+		ret = PTR_ERR(ao_cec-&gt;oscin);</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = meson_ao_cec_g12a_setup_clk(ao_cec);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(ao_cec-&gt;core);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "core clock enable failed\n");</div><div class='add'>+		goto out_probe_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_reset_optional(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, ao_cec);</div><div class='add'>+</div><div class='add'>+	ret = cec_register_adapter(ao_cec-&gt;adap, &amp;pdev-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		cec_notifier_put(ao_cec-&gt;notify);</div><div class='add'>+		goto out_probe_core_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup Hardware */</div><div class='add'>+	regmap_write(ao_cec-&gt;regmap, CECB_GEN_CNTL_REG, CECB_GEN_CNTL_RESET);</div><div class='add'>+</div><div class='add'>+	cec_register_cec_notifier(ao_cec-&gt;adap, ao_cec-&gt;notify);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_probe_core_clk:</div><div class='add'>+	clk_disable_unprepare(ao_cec-&gt;core);</div><div class='add'>+</div><div class='add'>+out_probe_adapter:</div><div class='add'>+	cec_delete_adapter(ao_cec-&gt;adap);</div><div class='add'>+</div><div class='add'>+out_probe_notify:</div><div class='add'>+	cec_notifier_put(ao_cec-&gt;notify);</div><div class='add'>+</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "CEC controller registration failed\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 meson_ao_cec_g12a_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct meson_ao_cec_g12a_device *ao_cec = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(ao_cec-&gt;core);</div><div class='add'>+</div><div class='add'>+	cec_unregister_adapter(ao_cec-&gt;adap);</div><div class='add'>+</div><div class='add'>+	cec_notifier_put(ao_cec-&gt;notify);</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 of_device_id meson_ao_cec_g12a_of_match[] = {</div><div class='add'>+	{ .compatible = "amlogic,meson-g12a-ao-cec", },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, meson_ao_cec_g12a_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver meson_ao_cec_g12a_driver = {</div><div class='add'>+	.probe   = meson_ao_cec_g12a_probe,</div><div class='add'>+	.remove  = meson_ao_cec_g12a_remove,</div><div class='add'>+	.driver  = {</div><div class='add'>+		.name = "meson-ao-cec-g12a",</div><div class='add'>+		.of_match_table = of_match_ptr(meson_ao_cec_g12a_of_match),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(meson_ao_cec_g12a_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Meson AO CEC G12A Controller driver");</div><div class='add'>+MODULE_AUTHOR("Neil Armstrong &lt;narmstrong@baylibre.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/platform/meson/ao-cec.c b/drivers/media/platform/meson/ao-cec.c<br/>index cd4be38ab5ac..facf9b029e79 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/meson/ao-cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/meson/ao-cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/meson/ao-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/meson/ao-cec.c</a></div><div class='hunk'>@@ -601,20 +601,14 @@ static const struct cec_adap_ops meson_ao_cec_ops = {</div><div class='ctx'> static int meson_ao_cec_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct meson_ao_cec_device *ao_cec;</div><div class='del'>-	struct platform_device *hdmi_dev;</div><div class='del'>-	struct device_node *np;</div><div class='add'>+	struct device *hdmi_dev;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int ret, irq;</div><div class='ctx'> </div><div class='del'>-	np = of_parse_phandle(pdev-&gt;dev.of_node, "hdmi-phandle", 0);</div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to find hdmi node\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	hdmi_dev = cec_notifier_parse_hdmi_phandle(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	hdmi_dev = of_find_device_by_node(np);</div><div class='del'>-	if (hdmi_dev == NULL)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='add'>+	if (IS_ERR(hdmi_dev))</div><div class='add'>+		return PTR_ERR(hdmi_dev);</div><div class='ctx'> </div><div class='ctx'> 	ao_cec = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*ao_cec), GFP_KERNEL);</div><div class='ctx'> 	if (!ao_cec)</div><div class='hunk'>@@ -622,7 +616,7 @@ static int meson_ao_cec_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ao_cec-&gt;cec_reg_lock);</div><div class='ctx'> </div><div class='del'>-	ao_cec-&gt;notify = cec_notifier_get(&amp;hdmi_dev-&gt;dev);</div><div class='add'>+	ao_cec-&gt;notify = cec_notifier_get(hdmi_dev);</div><div class='ctx'> 	if (!ao_cec-&gt;notify)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c<br/>index d022c65bb34c..851903867bc9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c</a></div><div class='hunk'>@@ -129,11 +129,9 @@ static struct vb2_buffer *get_display_buffer(struct mtk_vcodec_ctx *ctx)</div><div class='ctx'> 	mutex_lock(&amp;ctx-&gt;lock);</div><div class='ctx'> 	if (dstbuf-&gt;used) {</div><div class='ctx'> 		vb2_set_plane_payload(&amp;dstbuf-&gt;vb.vb2_buf, 0,</div><div class='del'>-					ctx-&gt;picinfo.y_bs_sz);</div><div class='add'>+					ctx-&gt;picinfo.fb_sz[0]);</div><div class='ctx'> 		vb2_set_plane_payload(&amp;dstbuf-&gt;vb.vb2_buf, 1,</div><div class='del'>-					ctx-&gt;picinfo.c_bs_sz);</div><div class='del'>-</div><div class='del'>-		dstbuf-&gt;ready_to_display = true;</div><div class='add'>+					ctx-&gt;picinfo.fb_sz[1]);</div><div class='ctx'> </div><div class='ctx'> 		mtk_v4l2_debug(2,</div><div class='ctx'> 				"[%d]status=%x queue id=%d to done_list %d",</div><div class='hunk'>@@ -278,6 +276,27 @@ static void mtk_vdec_flush_decoder(struct mtk_vcodec_ctx *ctx)</div><div class='ctx'> 	clean_free_buffer(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mtk_vdec_update_fmt(struct mtk_vcodec_ctx *ctx,</div><div class='add'>+				unsigned int pixelformat)</div><div class='add'>+{</div><div class='add'>+	struct mtk_video_fmt *fmt;</div><div class='add'>+	struct mtk_q_data *dst_q_data;</div><div class='add'>+	unsigned int k;</div><div class='add'>+</div><div class='add'>+	dst_q_data = &amp;ctx-&gt;q_data[MTK_Q_DATA_DST];</div><div class='add'>+	for (k = 0; k &lt; NUM_FORMATS; k++) {</div><div class='add'>+		fmt = &amp;mtk_video_formats[k];</div><div class='add'>+		if (fmt-&gt;fourcc == pixelformat) {</div><div class='add'>+			mtk_v4l2_debug(1, "Update cap fourcc(%d -&gt; %d)",</div><div class='add'>+				dst_q_data-&gt;fmt.fourcc, pixelformat);</div><div class='add'>+			dst_q_data-&gt;fmt = fmt;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_v4l2_err("Cannot get fourcc(%d), using init value", pixelformat);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mtk_vdec_pic_info_update(struct mtk_vcodec_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int dpbsize = 0;</div><div class='hunk'>@@ -299,6 +318,10 @@ static int mtk_vdec_pic_info_update(struct mtk_vcodec_ctx *ctx)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;last_decoded_picinfo.cap_fourcc != ctx-&gt;picinfo.cap_fourcc &amp;&amp;</div><div class='add'>+		ctx-&gt;picinfo.cap_fourcc != 0)</div><div class='add'>+		mtk_vdec_update_fmt(ctx, ctx-&gt;picinfo.cap_fourcc);</div><div class='add'>+</div><div class='ctx'> 	if ((ctx-&gt;last_decoded_picinfo.pic_w == ctx-&gt;picinfo.pic_w) ||</div><div class='ctx'> 	    (ctx-&gt;last_decoded_picinfo.pic_h == ctx-&gt;picinfo.pic_h))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -352,11 +375,11 @@ static void mtk_vdec_worker(struct work_struct *work)</div><div class='ctx'> 	pfb = &amp;dst_buf_info-&gt;frame_buffer;</div><div class='ctx'> 	pfb-&gt;base_y.va = vb2_plane_vaddr(&amp;dst_buf-&gt;vb2_buf, 0);</div><div class='ctx'> 	pfb-&gt;base_y.dma_addr = vb2_dma_contig_plane_dma_addr(&amp;dst_buf-&gt;vb2_buf, 0);</div><div class='del'>-	pfb-&gt;base_y.size = ctx-&gt;picinfo.y_bs_sz + ctx-&gt;picinfo.y_len_sz;</div><div class='add'>+	pfb-&gt;base_y.size = ctx-&gt;picinfo.fb_sz[0];</div><div class='ctx'> </div><div class='ctx'> 	pfb-&gt;base_c.va = vb2_plane_vaddr(&amp;dst_buf-&gt;vb2_buf, 1);</div><div class='ctx'> 	pfb-&gt;base_c.dma_addr = vb2_dma_contig_plane_dma_addr(&amp;dst_buf-&gt;vb2_buf, 1);</div><div class='del'>-	pfb-&gt;base_c.size = ctx-&gt;picinfo.c_bs_sz + ctx-&gt;picinfo.c_len_sz;</div><div class='add'>+	pfb-&gt;base_c.size = ctx-&gt;picinfo.fb_sz[1];</div><div class='ctx'> 	pfb-&gt;status = 0;</div><div class='ctx'> 	mtk_v4l2_debug(3, "===&gt;[%d] vdec_if_decode() ===&gt;", ctx-&gt;id);</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +411,7 @@ static void mtk_vdec_worker(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> 	buf.va = vb2_plane_vaddr(&amp;src_buf-&gt;vb2_buf, 0);</div><div class='ctx'> 	buf.dma_addr = vb2_dma_contig_plane_dma_addr(&amp;src_buf-&gt;vb2_buf, 0);</div><div class='del'>-	buf.size = (size_t)src_buf-&gt;planes[0].bytesused;</div><div class='add'>+	buf.size = (size_t)src_buf-&gt;vb2_buf.planes[0].bytesused;</div><div class='ctx'> 	if (!buf.va) {</div><div class='ctx'> 		v4l2_m2m_job_finish(dev-&gt;m2m_dev_dec, ctx-&gt;m2m_ctx);</div><div class='ctx'> 		mtk_v4l2_err("[%d] id=%d src_addr is NULL!!",</div><div class='hunk'>@@ -976,14 +999,13 @@ static int vidioc_vdec_g_fmt(struct file *file, void *priv,</div><div class='ctx'> 		 * So we just return picinfo yet, and update picinfo in</div><div class='ctx'> 		 * stop_streaming hook function</div><div class='ctx'> 		 */</div><div class='del'>-		q_data-&gt;sizeimage[0] = ctx-&gt;picinfo.y_bs_sz +</div><div class='del'>-					ctx-&gt;picinfo.y_len_sz;</div><div class='del'>-		q_data-&gt;sizeimage[1] = ctx-&gt;picinfo.c_bs_sz +</div><div class='del'>-					ctx-&gt;picinfo.c_len_sz;</div><div class='add'>+		q_data-&gt;sizeimage[0] = ctx-&gt;picinfo.fb_sz[0];</div><div class='add'>+		q_data-&gt;sizeimage[1] = ctx-&gt;picinfo.fb_sz[1];</div><div class='ctx'> 		q_data-&gt;bytesperline[0] = ctx-&gt;last_decoded_picinfo.buf_w;</div><div class='ctx'> 		q_data-&gt;bytesperline[1] = ctx-&gt;last_decoded_picinfo.buf_w;</div><div class='ctx'> 		q_data-&gt;coded_width = ctx-&gt;picinfo.buf_w;</div><div class='ctx'> 		q_data-&gt;coded_height = ctx-&gt;picinfo.buf_h;</div><div class='add'>+		ctx-&gt;last_decoded_picinfo.cap_fourcc = q_data-&gt;fmt-&gt;fourcc;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Width and height are set to the dimensions</div><div class='hunk'>@@ -1103,10 +1125,11 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	struct mtk_vcodec_mem src_mem;</div><div class='ctx'> 	bool res_chg = false;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	unsigned int dpbsize = 1;</div><div class='add'>+	unsigned int dpbsize = 1, i = 0;</div><div class='ctx'> 	struct mtk_vcodec_ctx *ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='ctx'> 	struct vb2_v4l2_buffer *vb2_v4l2 = NULL;</div><div class='ctx'> 	struct mtk_video_dec_buf *buf = NULL;</div><div class='add'>+	struct mtk_q_data *dst_q_data;</div><div class='ctx'> </div><div class='ctx'> 	mtk_v4l2_debug(3, "[%d] (%d) id=%d, vb=%p",</div><div class='ctx'> 			ctx-&gt;id, vb-&gt;vb2_queue-&gt;type,</div><div class='hunk'>@@ -1122,11 +1145,9 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 			v4l2_m2m_buf_queue(ctx-&gt;m2m_ctx, vb2_v4l2);</div><div class='ctx'> 			buf-&gt;queued_in_vb2 = true;</div><div class='ctx'> 			buf-&gt;queued_in_v4l2 = true;</div><div class='del'>-			buf-&gt;ready_to_display = false;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			buf-&gt;queued_in_vb2 = false;</div><div class='ctx'> 			buf-&gt;queued_in_v4l2 = true;</div><div class='del'>-			buf-&gt;ready_to_display = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;ctx-&gt;lock);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1155,10 +1176,10 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> </div><div class='ctx'> 	src_mem.va = vb2_plane_vaddr(&amp;src_buf-&gt;vb2_buf, 0);</div><div class='ctx'> 	src_mem.dma_addr = vb2_dma_contig_plane_dma_addr(&amp;src_buf-&gt;vb2_buf, 0);</div><div class='del'>-	src_mem.size = (size_t)src_buf-&gt;planes[0].bytesused;</div><div class='add'>+	src_mem.size = (size_t)src_buf-&gt;vb2_buf.planes[0].bytesused;</div><div class='ctx'> 	mtk_v4l2_debug(2,</div><div class='ctx'> 			"[%d] buf id=%d va=%p dma=%pad size=%zx",</div><div class='del'>-			ctx-&gt;id, src_buf-&gt;index,</div><div class='add'>+			ctx-&gt;id, src_buf-&gt;vb2_buf.index,</div><div class='ctx'> 			src_mem.va, &amp;src_mem.dma_addr,</div><div class='ctx'> 			src_mem.size);</div><div class='ctx'> </div><div class='hunk'>@@ -1182,7 +1203,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 		}</div><div class='ctx'> 		mtk_v4l2_debug(ret ? 0 : 1,</div><div class='ctx'> 			       "[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d",</div><div class='del'>-			       ctx-&gt;id, src_buf-&gt;index,</div><div class='add'>+			       ctx-&gt;id, src_buf-&gt;vb2_buf.index,</div><div class='ctx'> 			       src_mem.size, ret, res_chg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1194,21 +1215,18 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;last_decoded_picinfo = ctx-&gt;picinfo;</div><div class='del'>-	ctx-&gt;q_data[MTK_Q_DATA_DST].sizeimage[0] =</div><div class='del'>-						ctx-&gt;picinfo.y_bs_sz +</div><div class='del'>-						ctx-&gt;picinfo.y_len_sz;</div><div class='del'>-	ctx-&gt;q_data[MTK_Q_DATA_DST].bytesperline[0] =</div><div class='del'>-						ctx-&gt;picinfo.buf_w;</div><div class='del'>-	ctx-&gt;q_data[MTK_Q_DATA_DST].sizeimage[1] =</div><div class='del'>-						ctx-&gt;picinfo.c_bs_sz +</div><div class='del'>-						ctx-&gt;picinfo.c_len_sz;</div><div class='del'>-	ctx-&gt;q_data[MTK_Q_DATA_DST].bytesperline[1] = ctx-&gt;picinfo.buf_w;</div><div class='add'>+	dst_q_data = &amp;ctx-&gt;q_data[MTK_Q_DATA_DST];</div><div class='add'>+	for (i = 0; i &lt; dst_q_data-&gt;fmt-&gt;num_planes; i++) {</div><div class='add'>+		dst_q_data-&gt;sizeimage[i] = ctx-&gt;picinfo.fb_sz[i];</div><div class='add'>+		dst_q_data-&gt;bytesperline[i] = ctx-&gt;picinfo.buf_w;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mtk_v4l2_debug(2, "[%d] vdec_if_init() OK wxh=%dx%d pic wxh=%dx%d sz[0]=0x%x sz[1]=0x%x",</div><div class='ctx'> 			ctx-&gt;id,</div><div class='ctx'> 			ctx-&gt;picinfo.buf_w, ctx-&gt;picinfo.buf_h,</div><div class='ctx'> 			ctx-&gt;picinfo.pic_w, ctx-&gt;picinfo.pic_h,</div><div class='del'>-			ctx-&gt;q_data[MTK_Q_DATA_DST].sizeimage[0],</div><div class='del'>-			ctx-&gt;q_data[MTK_Q_DATA_DST].sizeimage[1]);</div><div class='add'>+			dst_q_data-&gt;sizeimage[0],</div><div class='add'>+			dst_q_data-&gt;sizeimage[1]);</div><div class='ctx'> </div><div class='ctx'> 	ret = vdec_if_get_param(ctx, GET_PARAM_DPB_SIZE, &amp;dpbsize);</div><div class='ctx'> 	if (dpbsize == 0)</div><div class='hunk'>@@ -1253,7 +1271,6 @@ static int vb2ops_vdec_buf_init(struct vb2_buffer *vb)</div><div class='ctx'> </div><div class='ctx'> 	if (vb-&gt;vb2_queue-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {</div><div class='ctx'> 		buf-&gt;used = false;</div><div class='del'>-		buf-&gt;ready_to_display = false;</div><div class='ctx'> 		buf-&gt;queued_in_v4l2 = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buf-&gt;lastframe = false;</div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h<br/>index dc4fc1df63c5..e4984edec4f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h</a></div><div class='hunk'>@@ -45,7 +45,6 @@ struct vdec_fb {</div><div class='ctx'>  * @list:	link list</div><div class='ctx'>  * @used:	Capture buffer contain decoded frame data and keep in</div><div class='ctx'>  *			codec data structure</div><div class='del'>- * @ready_to_display:	Capture buffer not display yet</div><div class='ctx'>  * @queued_in_vb2:	Capture buffer is queue in vb2</div><div class='ctx'>  * @queued_in_v4l2:	Capture buffer is in v4l2 driver, but not in vb2</div><div class='ctx'>  *			queue yet</div><div class='hunk'>@@ -60,7 +59,6 @@ struct mtk_video_dec_buf {</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> </div><div class='ctx'> 	bool	used;</div><div class='del'>-	bool	ready_to_display;</div><div class='ctx'> 	bool	queued_in_vb2;</div><div class='ctx'> 	bool	queued_in_v4l2;</div><div class='ctx'> 	bool	lastframe;</div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h<br/>index e7e2a108def9..662a84b822af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h</a></div><div class='hunk'>@@ -211,24 +211,20 @@ struct mtk_vcodec_pm {</div><div class='ctx'>  * @pic_h: picture height</div><div class='ctx'>  * @buf_w: picture buffer width (64 aligned up from pic_w)</div><div class='ctx'>  * @buf_h: picture buffer heiht (64 aligned up from pic_h)</div><div class='del'>- * @y_bs_sz: Y bitstream size</div><div class='del'>- * @c_bs_sz: CbCr bitstream size</div><div class='del'>- * @y_len_sz: additional size required to store decompress information for y</div><div class='del'>- *		plane</div><div class='del'>- * @c_len_sz: additional size required to store decompress information for cbcr</div><div class='del'>- *		plane</div><div class='add'>+ * @fb_sz: bitstream size of each plane</div><div class='ctx'>  * E.g. suppose picture size is 176x144,</div><div class='ctx'>  *      buffer size will be aligned to 176x160.</div><div class='add'>+ * @cap_fourcc: fourcc number(may changed when resolution change)</div><div class='add'>+ * @reserved: align struct to 64-bit in order to adjust 32-bit and 64-bit os.</div><div class='ctx'>  */</div><div class='ctx'> struct vdec_pic_info {</div><div class='ctx'> 	unsigned int pic_w;</div><div class='ctx'> 	unsigned int pic_h;</div><div class='ctx'> 	unsigned int buf_w;</div><div class='ctx'> 	unsigned int buf_h;</div><div class='del'>-	unsigned int y_bs_sz;</div><div class='del'>-	unsigned int c_bs_sz;</div><div class='del'>-	unsigned int y_len_sz;</div><div class='del'>-	unsigned int c_len_sz;</div><div class='add'>+	unsigned int fb_sz[VIDEO_MAX_PLANES];</div><div class='add'>+	unsigned int cap_fourcc;</div><div class='add'>+	unsigned int reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c<br/>index c6b48b5925fb..50351adafc47 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c</a></div><div class='hunk'>@@ -894,7 +894,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {</div><div class='ctx'> 		while ((dst_buf = v4l2_m2m_dst_buf_remove(ctx-&gt;m2m_ctx))) {</div><div class='del'>-			dst_buf-&gt;planes[0].bytesused = 0;</div><div class='add'>+			dst_buf-&gt;vb2_buf.planes[0].bytesused = 0;</div><div class='ctx'> 			v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -947,7 +947,7 @@ static int mtk_venc_encode_header(void *priv)</div><div class='ctx'> </div><div class='ctx'> 	bs_buf.va = vb2_plane_vaddr(&amp;dst_buf-&gt;vb2_buf, 0);</div><div class='ctx'> 	bs_buf.dma_addr = vb2_dma_contig_plane_dma_addr(&amp;dst_buf-&gt;vb2_buf, 0);</div><div class='del'>-	bs_buf.size = (size_t)dst_buf-&gt;planes[0].length;</div><div class='add'>+	bs_buf.size = (size_t)dst_buf-&gt;vb2_buf.planes[0].length;</div><div class='ctx'> </div><div class='ctx'> 	mtk_v4l2_debug(1,</div><div class='ctx'> 			"[%d] buf id=%d va=0x%p dma_addr=0x%llx size=%zu",</div><div class='hunk'>@@ -976,7 +976,7 @@ static int mtk_venc_encode_header(void *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;state = MTK_STATE_HEADER;</div><div class='del'>-	dst_buf-&gt;planes[0].bytesused = enc_result.bs_size;</div><div class='add'>+	dst_buf-&gt;vb2_buf.planes[0].bytesused = enc_result.bs_size;</div><div class='ctx'> 	v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1107,12 +1107,12 @@ static void mtk_venc_worker(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);</div><div class='del'>-		dst_buf-&gt;planes[0].bytesused = 0;</div><div class='add'>+		dst_buf-&gt;vb2_buf.planes[0].bytesused = 0;</div><div class='ctx'> 		v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);</div><div class='ctx'> 		mtk_v4l2_err("venc_if_encode failed=%d", ret);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);</div><div class='del'>-		dst_buf-&gt;planes[0].bytesused = enc_result.bs_size;</div><div class='add'>+		dst_buf-&gt;vb2_buf.planes[0].bytesused = enc_result.bs_size;</div><div class='ctx'> 		v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);</div><div class='ctx'> 		mtk_v4l2_debug(2, "venc_if_encode bs size=%d",</div><div class='ctx'> 				 enc_result.bs_size);</div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c<br/>index 02c960c63ac0..cdbcd6909728 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c</a></div><div class='hunk'>@@ -253,8 +253,8 @@ static void get_pic_info(struct vdec_h264_inst *inst,</div><div class='ctx'> 	*pic = inst-&gt;vsi-&gt;pic;</div><div class='ctx'> 	mtk_vcodec_debug(inst, "pic(%d, %d), buf(%d, %d)",</div><div class='ctx'> 			 pic-&gt;pic_w, pic-&gt;pic_h, pic-&gt;buf_w, pic-&gt;buf_h);</div><div class='del'>-	mtk_vcodec_debug(inst, "Y(%d, %d), C(%d, %d)", pic-&gt;y_bs_sz,</div><div class='del'>-			 pic-&gt;y_len_sz, pic-&gt;c_bs_sz, pic-&gt;c_len_sz);</div><div class='add'>+	mtk_vcodec_debug(inst, "fb size: Y(%d), C(%d)",</div><div class='add'>+			 pic-&gt;fb_sz[0], pic-&gt;fb_sz[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void get_crop_info(struct vdec_h264_inst *inst, struct v4l2_rect *cr)</div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c<br/>index bac3723038de..ba79136421ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c</a></div><div class='hunk'>@@ -294,8 +294,8 @@ static void get_pic_info(struct vdec_vp8_inst *inst, struct vdec_pic_info *pic)</div><div class='ctx'> </div><div class='ctx'> 	mtk_vcodec_debug(inst, "pic(%d, %d), buf(%d, %d)",</div><div class='ctx'> 			 pic-&gt;pic_w, pic-&gt;pic_h, pic-&gt;buf_w, pic-&gt;buf_h);</div><div class='del'>-	mtk_vcodec_debug(inst, "Y(%d, %d), C(%d, %d)", pic-&gt;y_bs_sz,</div><div class='del'>-			 pic-&gt;y_len_sz, pic-&gt;c_bs_sz, pic-&gt;c_len_sz);</div><div class='add'>+	mtk_vcodec_debug(inst, "fb size: Y(%d), C(%d)",</div><div class='add'>+			 pic-&gt;fb_sz[0], pic-&gt;fb_sz[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vp8_dec_finish(struct vdec_vp8_inst *inst)</div><div class='head'>diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c<br/>index bc8349bc2e80..939ea14bf6c5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c</a></div><div class='hunk'>@@ -481,15 +481,15 @@ static void vp9_swap_frm_bufs(struct vdec_vp9_inst *inst)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((frm_to_show-&gt;fb != NULL) &amp;&amp;</div><div class='ctx'> 			(inst-&gt;cur_fb-&gt;base_y.size &gt;=</div><div class='del'>-			frm_to_show-&gt;fb-&gt;base_y.size)) {</div><div class='add'>+			frm_to_show-&gt;fb-&gt;base_y.size) &amp;&amp;</div><div class='add'>+			(inst-&gt;cur_fb-&gt;base_c.size &gt;=</div><div class='add'>+			frm_to_show-&gt;fb-&gt;base_c.size)) {</div><div class='ctx'> 			memcpy((void *)inst-&gt;cur_fb-&gt;base_y.va,</div><div class='ctx'> 				(void *)frm_to_show-&gt;fb-&gt;base_y.va,</div><div class='del'>-				vsi-&gt;buf_w *</div><div class='del'>-				vsi-&gt;buf_h);</div><div class='add'>+				frm_to_show-&gt;fb-&gt;base_y.size);</div><div class='ctx'> 			memcpy((void *)inst-&gt;cur_fb-&gt;base_c.va,</div><div class='ctx'> 				(void *)frm_to_show-&gt;fb-&gt;base_c.va,</div><div class='del'>-				vsi-&gt;buf_w *</div><div class='del'>-				vsi-&gt;buf_h / 2);</div><div class='add'>+				frm_to_show-&gt;fb-&gt;base_c.size);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* After resolution change case, current CAPTURE buffer</div><div class='ctx'> 			 * may have less buffer size than frm_to_show buffer</div><div class='hunk'>@@ -702,10 +702,8 @@ static void init_all_fb_lists(struct vdec_vp9_inst *inst)</div><div class='ctx'> </div><div class='ctx'> static void get_pic_info(struct vdec_vp9_inst *inst, struct vdec_pic_info *pic)</div><div class='ctx'> {</div><div class='del'>-	pic-&gt;y_bs_sz = inst-&gt;vsi-&gt;buf_sz_y_bs;</div><div class='del'>-	pic-&gt;c_bs_sz = inst-&gt;vsi-&gt;buf_sz_c_bs;</div><div class='del'>-	pic-&gt;y_len_sz = inst-&gt;vsi-&gt;buf_len_sz_y;</div><div class='del'>-	pic-&gt;c_len_sz = inst-&gt;vsi-&gt;buf_len_sz_c;</div><div class='add'>+	pic-&gt;fb_sz[0] = inst-&gt;vsi-&gt;buf_sz_y_bs + inst-&gt;vsi-&gt;buf_len_sz_y;</div><div class='add'>+	pic-&gt;fb_sz[1] = inst-&gt;vsi-&gt;buf_sz_c_bs + inst-&gt;vsi-&gt;buf_len_sz_c;</div><div class='ctx'> </div><div class='ctx'> 	pic-&gt;pic_w = inst-&gt;vsi-&gt;pic_w;</div><div class='ctx'> 	pic-&gt;pic_h = inst-&gt;vsi-&gt;pic_h;</div><div class='hunk'>@@ -714,8 +712,9 @@ static void get_pic_info(struct vdec_vp9_inst *inst, struct vdec_pic_info *pic)</div><div class='ctx'> </div><div class='ctx'> 	mtk_vcodec_debug(inst, "pic(%d, %d), buf(%d, %d)",</div><div class='ctx'> 		 pic-&gt;pic_w, pic-&gt;pic_h, pic-&gt;buf_w, pic-&gt;buf_h);</div><div class='del'>-	mtk_vcodec_debug(inst, "Y(%d, %d), C(%d, %d)", pic-&gt;y_bs_sz,</div><div class='del'>-		 pic-&gt;y_len_sz, pic-&gt;c_bs_sz, pic-&gt;c_len_sz);</div><div class='add'>+	mtk_vcodec_debug(inst, "fb size: Y(%d), C(%d)",</div><div class='add'>+		pic-&gt;fb_sz[0],</div><div class='add'>+		pic-&gt;fb_sz[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void get_disp_fb(struct vdec_vp9_inst *inst, struct vdec_fb **out_fb)</div><div class='hunk'>@@ -895,7 +894,7 @@ static int vdec_vp9_decode(unsigned long h_vdec, struct mtk_vcodec_mem *bs,</div><div class='ctx'> </div><div class='ctx'> 		if (vsi-&gt;resolution_changed) {</div><div class='ctx'> 			if (!vp9_alloc_work_buf(inst)) {</div><div class='del'>-				ret = -EINVAL;</div><div class='add'>+				ret = -EIO;</div><div class='ctx'> 				goto DECODE_ERROR;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -924,14 +923,12 @@ static int vdec_vp9_decode(unsigned long h_vdec, struct mtk_vcodec_mem *bs,</div><div class='ctx'> </div><div class='ctx'> 		if (vsi-&gt;show_existing_frame &amp;&amp; (vsi-&gt;frm_to_show_idx &lt;</div><div class='ctx'> 					VP9_MAX_FRM_BUF_NUM)) {</div><div class='del'>-			mtk_vcodec_err(inst,</div><div class='add'>+			mtk_vcodec_debug(inst,</div><div class='ctx'> 				"Skip Decode drv-&gt;new_fb_idx=%d, drv-&gt;frm_to_show_idx=%d",</div><div class='ctx'> 				vsi-&gt;new_fb_idx, vsi-&gt;frm_to_show_idx);</div><div class='ctx'> </div><div class='ctx'> 			vp9_ref_cnt_fb(inst, &amp;vsi-&gt;new_fb_idx,</div><div class='ctx'> 					vsi-&gt;frm_to_show_idx);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto DECODE_ERROR;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* VPU assign the buffer pointer in its address space,</div><div class='head'>diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c<br/>index b6602490a247..46c45f93c977 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vpu/mtk_vpu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mtk-vpu/mtk_vpu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mtk-vpu/mtk_vpu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mtk-vpu/mtk_vpu.c</a></div><div class='hunk'>@@ -614,7 +614,7 @@ static void vpu_init_ipi_handler(void *data, unsigned int len, void *priv)</div><div class='ctx'> 	struct vpu_run *run = (struct vpu_run *)data;</div><div class='ctx'> </div><div class='ctx'> 	vpu-&gt;run.signaled = run-&gt;signaled;</div><div class='del'>-	strncpy(vpu-&gt;run.fw_ver, run-&gt;fw_ver, VPU_FW_VER_LEN);</div><div class='add'>+	strscpy(vpu-&gt;run.fw_ver, run-&gt;fw_ver, sizeof(vpu-&gt;run.fw_ver));</div><div class='ctx'> 	vpu-&gt;run.dec_capability = run-&gt;dec_capability;</div><div class='ctx'> 	vpu-&gt;run.enc_capability = run-&gt;enc_capability;</div><div class='ctx'> 	wake_up_interruptible(&amp;vpu-&gt;run.wq);</div><div class='head'>diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c<br/>index f60f499c596b..e100b30bb6f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mx2_emmaprp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/mx2_emmaprp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/mx2_emmaprp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/mx2_emmaprp.c</a></div><div class='hunk'>@@ -385,8 +385,8 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)</div><div class='ctx'> static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> 			   struct v4l2_capability *cap)</div><div class='ctx'> {</div><div class='del'>-	strncpy(cap-&gt;driver, MEM2MEM_NAME, sizeof(cap-&gt;driver) - 1);</div><div class='del'>-	strncpy(cap-&gt;card, MEM2MEM_NAME, sizeof(cap-&gt;card) - 1);</div><div class='add'>+	strscpy(cap-&gt;driver, MEM2MEM_NAME, sizeof(cap-&gt;driver));</div><div class='add'>+	strscpy(cap-&gt;card, MEM2MEM_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	cap-&gt;device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;</div><div class='ctx'> 	cap-&gt;capabilities = cap-&gt;device_caps | V4L2_CAP_DEVICE_CAPS;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig<br/>index 4b5e55d41ad4..30ce2ba120a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/omap/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/omap/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/omap/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/omap/Kconfig</a></div><div class='hunk'>@@ -14,5 +14,5 @@ config VIDEO_OMAP2_VOUT</div><div class='ctx'> 	select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3</div><div class='ctx'> 	select FRAME_VECTOR</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  V4L2 Display driver support for OMAP2/3 based boards.</div><div class='head'>diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c<br/>index 4fe228752a43..a632f06d9fff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/pxa_camera.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/pxa_camera.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/pxa_camera.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/pxa_camera.c</a></div><div class='hunk'>@@ -2350,7 +2350,7 @@ static int pxa_camera_pdata_from_dt(struct device *dev,</div><div class='ctx'> 		pcdev-&gt;platform_flags |= PXA_CAMERA_PCLK_EN;</div><div class='ctx'> </div><div class='ctx'> 	asd-&gt;match_type = V4L2_ASYNC_MATCH_FWNODE;</div><div class='del'>-	remote = of_graph_get_remote_port(np);</div><div class='add'>+	remote = of_graph_get_remote_port_parent(np);</div><div class='ctx'> 	if (remote)</div><div class='ctx'> 		asd-&gt;match.fwnode = of_fwnode_handle(remote);</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h<br/>index 15804ad7e65d..34ea503a9842 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/qcom/venus/hfi_helper.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/qcom/venus/hfi_helper.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/qcom/venus/hfi_helper.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/qcom/venus/hfi_helper.h</a></div><div class='hunk'>@@ -569,7 +569,7 @@ struct hfi_capability {</div><div class='ctx'> </div><div class='ctx'> struct hfi_capabilities {</div><div class='ctx'> 	u32 num_capabilities;</div><div class='del'>-	struct hfi_capability data[1];</div><div class='add'>+	struct hfi_capability *data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HFI_DEBUG_MSG_LOW	0x01</div><div class='hunk'>@@ -726,7 +726,7 @@ struct hfi_profile_level {</div><div class='ctx'> </div><div class='ctx'> struct hfi_profile_level_supported {</div><div class='ctx'> 	u32 profile_count;</div><div class='del'>-	struct hfi_profile_level profile_level[1];</div><div class='add'>+	struct hfi_profile_level *profile_level;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hfi_quality_vs_speed {</div><div class='head'>diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/rcar-vin/Kconfig<br/>index e3eb8fee2536..240ac3f3c941 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/rcar-vin/Kconfig</a></div><div class='hunk'>@@ -3,6 +3,7 @@ config VIDEO_RCAR_CSI2</div><div class='ctx'> 	tristate "R-Car MIPI CSI-2 Receiver"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API &amp;&amp; OF</div><div class='ctx'> 	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='add'>+	select RESET_CONTROLLER</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Renesas R-Car MIPI CSI-2 receiver.</div><div class='hunk'>@@ -17,7 +18,7 @@ config VIDEO_RCAR_VIN</div><div class='ctx'> 	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Renesas R-Car Video Input (VIN) driver.</div><div class='ctx'> 	  Supports R-Car Gen2 and Gen3 SoCs.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c<br/>index 594d80434004..64f9cf790445 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/rcar-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/rcar-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/rcar-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/rcar-vin/rcar-core.c</a></div><div class='hunk'>@@ -546,7 +546,9 @@ static void rvin_parallel_notify_unbind(struct v4l2_async_notifier *notifier,</div><div class='ctx'> </div><div class='ctx'> 	vin_dbg(vin, "unbind parallel subdev %s\n", subdev-&gt;name);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;vin-&gt;lock);</div><div class='ctx'> 	rvin_parallel_subdevice_detach(vin);</div><div class='add'>+	mutex_unlock(&amp;vin-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rvin_parallel_notify_bound(struct v4l2_async_notifier *notifier,</div><div class='hunk'>@@ -556,7 +558,9 @@ static int rvin_parallel_notify_bound(struct v4l2_async_notifier *notifier,</div><div class='ctx'> 	struct rvin_dev *vin = v4l2_dev_to_vin(notifier-&gt;v4l2_dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;vin-&gt;lock);</div><div class='ctx'> 	ret = rvin_parallel_subdevice_attach(vin, subdev);</div><div class='add'>+	mutex_unlock(&amp;vin-&gt;lock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -664,6 +668,7 @@ static int rvin_group_notify_complete(struct v4l2_async_notifier *notifier)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create all media device links between VINs and CSI-2's. */</div><div class='add'>+	mutex_lock(&amp;vin-&gt;group-&gt;lock);</div><div class='ctx'> 	for (route = vin-&gt;info-&gt;routes; route-&gt;mask; route++) {</div><div class='ctx'> 		struct media_pad *source_pad, *sink_pad;</div><div class='ctx'> 		struct media_entity *source, *sink;</div><div class='hunk'>@@ -699,6 +704,7 @@ static int rvin_group_notify_complete(struct v4l2_async_notifier *notifier)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -714,6 +720,8 @@ static void rvin_group_notify_unbind(struct v4l2_async_notifier *notifier,</div><div class='ctx'> 		if (vin-&gt;group-&gt;vin[i])</div><div class='ctx'> 			rvin_v4l2_unregister(vin-&gt;group-&gt;vin[i]);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;vin-&gt;group-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; RVIN_CSI_MAX; i++) {</div><div class='ctx'> 		if (vin-&gt;group-&gt;csi[i].fwnode != asd-&gt;match.fwnode)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -721,6 +729,8 @@ static void rvin_group_notify_unbind(struct v4l2_async_notifier *notifier,</div><div class='ctx'> 		vin_dbg(vin, "Unbind CSI-2 %s from slot %u\n", subdev-&gt;name, i);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rvin_group_notify_bound(struct v4l2_async_notifier *notifier,</div><div class='hunk'>@@ -730,6 +740,8 @@ static int rvin_group_notify_bound(struct v4l2_async_notifier *notifier,</div><div class='ctx'> 	struct rvin_dev *vin = v4l2_dev_to_vin(notifier-&gt;v4l2_dev);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;vin-&gt;group-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; RVIN_CSI_MAX; i++) {</div><div class='ctx'> 		if (vin-&gt;group-&gt;csi[i].fwnode != asd-&gt;match.fwnode)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -738,6 +750,8 @@ static int rvin_group_notify_bound(struct v4l2_async_notifier *notifier,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -752,6 +766,7 @@ static int rvin_mc_parse_of_endpoint(struct device *dev,</div><div class='ctx'> 				     struct v4l2_async_subdev *asd)</div><div class='ctx'> {</div><div class='ctx'> 	struct rvin_dev *vin = dev_get_drvdata(dev);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (vep-&gt;base.port != 1 || vep-&gt;base.id &gt;= RVIN_CSI_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -762,38 +777,48 @@ static int rvin_mc_parse_of_endpoint(struct device *dev,</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;vin-&gt;group-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	if (vin-&gt;group-&gt;csi[vep-&gt;base.id].fwnode) {</div><div class='ctx'> 		vin_dbg(vin, "OF device %pOF already handled\n",</div><div class='ctx'> 			to_of_node(asd-&gt;match.fwnode));</div><div class='del'>-		return -ENOTCONN;</div><div class='add'>+		ret = -ENOTCONN;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vin-&gt;group-&gt;csi[vep-&gt;base.id].fwnode = asd-&gt;match.fwnode;</div><div class='ctx'> </div><div class='ctx'> 	vin_dbg(vin, "Add group OF device %pOF to slot %u\n",</div><div class='ctx'> 		to_of_node(asd-&gt;match.fwnode), vep-&gt;base.id);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;vin-&gt;group-&gt;lock);</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'> static int rvin_mc_parse_of_graph(struct rvin_dev *vin)</div><div class='ctx'> {</div><div class='del'>-	unsigned int count = 0;</div><div class='add'>+	unsigned int count = 0, vin_mask = 0;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;vin-&gt;group-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* If not all VIN's are registered don't register the notifier. */</div><div class='del'>-	for (i = 0; i &lt; RCAR_VIN_NUM; i++)</div><div class='del'>-		if (vin-&gt;group-&gt;vin[i])</div><div class='add'>+	for (i = 0; i &lt; RCAR_VIN_NUM; i++) {</div><div class='add'>+		if (vin-&gt;group-&gt;vin[i]) {</div><div class='ctx'> 			count++;</div><div class='add'>+			vin_mask |= BIT(i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (vin-&gt;group-&gt;count != count) {</div><div class='ctx'> 		mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	v4l2_async_notifier_init(&amp;vin-&gt;group-&gt;notifier);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -802,21 +827,17 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)</div><div class='ctx'> 	 * will only be registered once with the group notifier.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; RCAR_VIN_NUM; i++) {</div><div class='del'>-		if (!vin-&gt;group-&gt;vin[i])</div><div class='add'>+		if (!(vin_mask &amp; BIT(i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		ret = v4l2_async_notifier_parse_fwnode_endpoints_by_port(</div><div class='ctx'> 				vin-&gt;group-&gt;vin[i]-&gt;dev, &amp;vin-&gt;group-&gt;notifier,</div><div class='ctx'> 				sizeof(struct v4l2_async_subdev), 1,</div><div class='ctx'> 				rvin_mc_parse_of_endpoint);</div><div class='del'>-		if (ret) {</div><div class='del'>-			mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;vin-&gt;group-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	if (list_empty(&amp;vin-&gt;group-&gt;notifier.asd_list))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1136,6 +1157,10 @@ static const struct rvin_info rcar_info_r8a77995 = {</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id rvin_of_id_table[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.compatible = "renesas,vin-r8a774a1",</div><div class='add'>+		.data = &amp;rcar_info_r8a7796,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.compatible = "renesas,vin-r8a774c0",</div><div class='ctx'> 		.data = &amp;rcar_info_r8a77990,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c<br/>index f64528d2be3c..799e526fd3df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/rcar-csi2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/rcar-csi2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/rcar-csi2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/rcar-vin/rcar-csi2.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/of_graph.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='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/sys_soc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/v4l2-ctrls.h&gt;</div><div class='hunk'>@@ -350,6 +351,7 @@ struct rcar_csi2 {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	const struct rcar_csi2_info *info;</div><div class='add'>+	struct reset_control *rstc;</div><div class='ctx'> </div><div class='ctx'> 	struct v4l2_subdev subdev;</div><div class='ctx'> 	struct media_pad pads[NR_OF_RCAR_CSI2_PAD];</div><div class='hunk'>@@ -387,11 +389,19 @@ static void rcsi2_write(struct rcar_csi2 *priv, unsigned int reg, u32 data)</div><div class='ctx'> 	iowrite32(data, priv-&gt;base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rcsi2_reset(struct rcar_csi2 *priv)</div><div class='add'>+static void rcsi2_enter_standby(struct rcar_csi2 *priv)</div><div class='ctx'> {</div><div class='del'>-	rcsi2_write(priv, SRST_REG, SRST_SRST);</div><div class='add'>+	rcsi2_write(priv, PHYCNT_REG, 0);</div><div class='add'>+	rcsi2_write(priv, PHTC_REG, PHTC_TESTCLR);</div><div class='add'>+	reset_control_assert(priv-&gt;rstc);</div><div class='ctx'> 	usleep_range(100, 150);</div><div class='del'>-	rcsi2_write(priv, SRST_REG, 0);</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcsi2_exit_standby(struct rcar_csi2 *priv)</div><div class='add'>+{</div><div class='add'>+	pm_runtime_get_sync(priv-&gt;dev);</div><div class='add'>+	reset_control_deassert(priv-&gt;rstc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rcsi2_wait_phy_start(struct rcar_csi2 *priv)</div><div class='hunk'>@@ -462,7 +472,7 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv, unsigned int bpp)</div><div class='ctx'> 	return mbps;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rcsi2_start(struct rcar_csi2 *priv)</div><div class='add'>+static int rcsi2_start_receiver(struct rcar_csi2 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rcar_csi2_format *format;</div><div class='ctx'> 	u32 phycnt, vcdt = 0, vcdt2 = 0;</div><div class='hunk'>@@ -506,12 +516,9 @@ static int rcsi2_start(struct rcar_csi2 *priv)</div><div class='ctx'> </div><div class='ctx'> 	/* Init */</div><div class='ctx'> 	rcsi2_write(priv, TREF_REG, TREF_TREF);</div><div class='del'>-	rcsi2_reset(priv);</div><div class='ctx'> 	rcsi2_write(priv, PHTC_REG, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure */</div><div class='del'>-	rcsi2_write(priv, FLD_REG, FLD_FLD_NUM(2) | FLD_FLD_EN4 |</div><div class='del'>-		    FLD_FLD_EN3 | FLD_FLD_EN2 | FLD_FLD_EN);</div><div class='ctx'> 	rcsi2_write(priv, VCDT_REG, vcdt);</div><div class='ctx'> 	if (vcdt2)</div><div class='ctx'> 		rcsi2_write(priv, VCDT2_REG, vcdt2);</div><div class='hunk'>@@ -542,6 +549,8 @@ static int rcsi2_start(struct rcar_csi2 *priv)</div><div class='ctx'> 	rcsi2_write(priv, PHYCNT_REG, phycnt);</div><div class='ctx'> 	rcsi2_write(priv, LINKCNT_REG, LINKCNT_MONITOR_EN |</div><div class='ctx'> 		    LINKCNT_REG_MONI_PACT_EN | LINKCNT_ICLK_NONSTOP);</div><div class='add'>+	rcsi2_write(priv, FLD_REG, FLD_FLD_NUM(2) | FLD_FLD_EN4 |</div><div class='add'>+		    FLD_FLD_EN3 | FLD_FLD_EN2 | FLD_FLD_EN);</div><div class='ctx'> 	rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ);</div><div class='ctx'> 	rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ | PHYCNT_RSTZ);</div><div class='ctx'> </div><div class='hunk'>@@ -564,19 +573,36 @@ static int rcsi2_start(struct rcar_csi2 *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rcsi2_stop(struct rcar_csi2 *priv)</div><div class='add'>+static int rcsi2_start(struct rcar_csi2 *priv)</div><div class='ctx'> {</div><div class='del'>-	rcsi2_write(priv, PHYCNT_REG, 0);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	rcsi2_reset(priv);</div><div class='add'>+	rcsi2_exit_standby(priv);</div><div class='ctx'> </div><div class='del'>-	rcsi2_write(priv, PHTC_REG, PHTC_TESTCLR);</div><div class='add'>+	ret = rcsi2_start_receiver(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rcsi2_enter_standby(priv);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = v4l2_subdev_call(priv-&gt;remote, video, s_stream, 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rcsi2_enter_standby(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 void rcsi2_stop(struct rcar_csi2 *priv)</div><div class='add'>+{</div><div class='add'>+	rcsi2_enter_standby(priv);</div><div class='add'>+	v4l2_subdev_call(priv-&gt;remote, video, s_stream, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rcsi2_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_csi2 *priv = sd_to_csi2(sd);</div><div class='del'>-	struct v4l2_subdev *nextsd;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='hunk'>@@ -586,27 +612,12 @@ static int rcsi2_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nextsd = priv-&gt;remote;</div><div class='del'>-</div><div class='ctx'> 	if (enable &amp;&amp; priv-&gt;stream_count == 0) {</div><div class='del'>-		pm_runtime_get_sync(priv-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 		ret = rcsi2_start(priv);</div><div class='del'>-		if (ret) {</div><div class='del'>-			pm_runtime_put(priv-&gt;dev);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = v4l2_subdev_call(nextsd, video, s_stream, 1);</div><div class='del'>-		if (ret) {</div><div class='del'>-			rcsi2_stop(priv);</div><div class='del'>-			pm_runtime_put(priv-&gt;dev);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> 	} else if (!enable &amp;&amp; priv-&gt;stream_count == 1) {</div><div class='ctx'> 		rcsi2_stop(priv);</div><div class='del'>-		v4l2_subdev_call(nextsd, video, s_stream, 0);</div><div class='del'>-		pm_runtime_put(priv-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;stream_count += enable ? 1 : -1;</div><div class='hunk'>@@ -854,7 +865,8 @@ static int rcsi2_phtw_write_mbps(struct rcar_csi2 *priv, unsigned int mbps,</div><div class='ctx'> 	return rcsi2_phtw_write(priv, value-&gt;reg, code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='add'>+static int __rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv,</div><div class='add'>+					unsigned int mbps)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct phtw_value step1[] = {</div><div class='ctx'> 		{ .data = 0xcc, .code = 0xe2 },</div><div class='hunk'>@@ -880,7 +892,7 @@ static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (mbps &lt;= 250) {</div><div class='add'>+	if (mbps != 0 &amp;&amp; mbps &lt;= 250) {</div><div class='ctx'> 		ret = rcsi2_phtw_write(priv, 0x39, 0x05);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -894,6 +906,16 @@ static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='ctx'> 	return rcsi2_phtw_write_array(priv, step2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rcsi2_init_phtw_h3_v3h_m3n(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='add'>+{</div><div class='add'>+	return __rcsi2_init_phtw_h3_v3h_m3n(priv, mbps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rcsi2_init_phtw_h3es2(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='add'>+{</div><div class='add'>+	return __rcsi2_init_phtw_h3_v3h_m3n(priv, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rcsi2_init_phtw_v3m_e3(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='ctx'> {</div><div class='ctx'> 	return rcsi2_phtw_write_mbps(priv, mbps, phtw_mbps_v3m_e3, 0x44);</div><div class='hunk'>@@ -902,11 +924,11 @@ static int rcsi2_init_phtw_v3m_e3(struct rcar_csi2 *priv, unsigned int mbps)</div><div class='ctx'> static int rcsi2_confirm_start_v3m_e3(struct rcar_csi2 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct phtw_value step1[] = {</div><div class='del'>-		{ .data = 0xed, .code = 0x34 },</div><div class='del'>-		{ .data = 0xed, .code = 0x44 },</div><div class='del'>-		{ .data = 0xed, .code = 0x54 },</div><div class='del'>-		{ .data = 0xed, .code = 0x84 },</div><div class='del'>-		{ .data = 0xed, .code = 0x94 },</div><div class='add'>+		{ .data = 0xee, .code = 0x34 },</div><div class='add'>+		{ .data = 0xee, .code = 0x44 },</div><div class='add'>+		{ .data = 0xee, .code = 0x54 },</div><div class='add'>+		{ .data = 0xee, .code = 0x84 },</div><div class='add'>+		{ .data = 0xee, .code = 0x94 },</div><div class='ctx'> 		{ /* sentinel */ },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -936,6 +958,10 @@ static int rcsi2_probe_resources(struct rcar_csi2 *priv,</div><div class='ctx'> 	if (irq &lt; 0)</div><div class='ctx'> 		return irq;</div><div class='ctx'> </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'>+		return PTR_ERR(priv-&gt;rstc);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -952,6 +978,14 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7795es1 = {</div><div class='ctx'> 	.num_channels = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rcar_csi2_info rcar_csi2_info_r8a7795es2 = {</div><div class='add'>+	.init_phtw = rcsi2_init_phtw_h3es2,</div><div class='add'>+	.hsfreqrange = hsfreqrange_h3_v3h_m3n,</div><div class='add'>+	.csi0clkfreqrange = 0x20,</div><div class='add'>+	.num_channels = 4,</div><div class='add'>+	.clear_ulps = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = {</div><div class='ctx'> 	.hsfreqrange = hsfreqrange_m3w_h3es1,</div><div class='ctx'> 	.num_channels = 4,</div><div class='hunk'>@@ -986,6 +1020,10 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77990 = {</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id rcar_csi2_of_table[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.compatible = "renesas,r8a774a1-csi2",</div><div class='add'>+		.data = &amp;rcar_csi2_info_r8a7796,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.compatible = "renesas,r8a774c0-csi2",</div><div class='ctx'> 		.data = &amp;rcar_csi2_info_r8a77990,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1017,11 +1055,15 @@ static const struct of_device_id rcar_csi2_of_table[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, rcar_csi2_of_table);</div><div class='ctx'> </div><div class='del'>-static const struct soc_device_attribute r8a7795es1[] = {</div><div class='add'>+static const struct soc_device_attribute r8a7795[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.soc_id = "r8a7795", .revision = "ES1.*",</div><div class='ctx'> 		.data = &amp;rcar_csi2_info_r8a7795es1,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.soc_id = "r8a7795", .revision = "ES2.*",</div><div class='add'>+		.data = &amp;rcar_csi2_info_r8a7795es2,</div><div class='add'>+	},</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1039,10 +1081,10 @@ static int rcsi2_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;info = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * r8a7795 ES1.x behaves differently than the ES2.0+ but doesn't</div><div class='del'>-	 * have it's own compatible string.</div><div class='add'>+	 * The different ES versions of r8a7795 (H3) behave differently but</div><div class='add'>+	 * share the same compatible string.</div><div class='ctx'> 	 */</div><div class='del'>-	attr = soc_device_match(r8a7795es1);</div><div class='add'>+	attr = soc_device_match(r8a7795);</div><div class='ctx'> 	if (attr)</div><div class='ctx'> 		priv-&gt;info = attr-&gt;data;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c<br/>index 2207a31d355e..91ab064404a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/rcar-dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar-vin/rcar-dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar-vin/rcar-dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/rcar-vin/rcar-dma.c</a></div><div class='hunk'>@@ -486,7 +486,7 @@ static void rvin_set_coeff(struct rvin_dev *vin, unsigned short xs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Use previous value if its XS value is closer */</div><div class='del'>-	if (p_prev_set &amp;&amp; p_set &amp;&amp;</div><div class='add'>+	if (p_prev_set &amp;&amp;</div><div class='ctx'> 	    xs - p_prev_set-&gt;xs_value &lt; p_set-&gt;xs_value - xs)</div><div class='ctx'> 		p_set = p_prev_set;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c<br/>index c417ff8f6fe5..608e5217ccd5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar_drif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar_drif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar_drif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/rcar_drif.c</a></div><div class='hunk'>@@ -1405,11 +1405,9 @@ static int rcar_drif_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Register map */</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	ch-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(ch-&gt;base)) {</div><div class='del'>-		ret = PTR_ERR(ch-&gt;base);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "ioremap failed (%d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(ch-&gt;base))</div><div class='add'>+		return PTR_ERR(ch-&gt;base);</div><div class='add'>+</div><div class='ctx'> 	ch-&gt;start = res-&gt;start;</div><div class='ctx'> 	platform_set_drvdata(pdev, ch);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c<br/>index 6bda1eee9170..6a90bc4c476e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar_fdp1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/rcar_fdp1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/rcar_fdp1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/rcar_fdp1.c</a></div><div class='hunk'>@@ -945,7 +945,7 @@ static void fdp1_configure_wpf(struct fdp1_ctx *ctx,</div><div class='ctx'> 	u32 rndctl;</div><div class='ctx'> </div><div class='ctx'> 	pstride = q_data-&gt;format.plane_fmt[0].bytesperline</div><div class='del'>-			&lt;&lt; FD1_WPF_PSTRIDE_Y_SHIFT;</div><div class='add'>+		&lt;&lt; FD1_WPF_PSTRIDE_Y_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (q_data-&gt;format.num_planes &gt; 1)</div><div class='ctx'> 		pstride |= q_data-&gt;format.plane_fmt[1].bytesperline</div><div class='hunk'>@@ -1139,8 +1139,8 @@ static int fdp1_m2m_job_ready(void *priv)</div><div class='ctx'> 	int dstbufs = 1;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(ctx-&gt;fdp1, "+ Src: %d : Dst: %d\n",</div><div class='del'>-			v4l2_m2m_num_src_bufs_ready(ctx-&gt;fh.m2m_ctx),</div><div class='del'>-			v4l2_m2m_num_dst_bufs_ready(ctx-&gt;fh.m2m_ctx));</div><div class='add'>+		v4l2_m2m_num_src_bufs_ready(ctx-&gt;fh.m2m_ctx),</div><div class='add'>+		v4l2_m2m_num_dst_bufs_ready(ctx-&gt;fh.m2m_ctx));</div><div class='ctx'> </div><div class='ctx'> 	/* One output buffer is required for each field */</div><div class='ctx'> 	if (V4L2_FIELD_HAS_BOTH(src_q_data-&gt;format.field))</div><div class='hunk'>@@ -1278,7 +1278,7 @@ static void fdp1_m2m_device_run(void *priv)</div><div class='ctx'> </div><div class='ctx'> 		fdp1_queue_field(ctx, fbuf);</div><div class='ctx'> 		dprintk(fdp1, "Queued Buffer [%d] last_field:%d\n",</div><div class='del'>-				i, fbuf-&gt;last_field);</div><div class='add'>+			i, fbuf-&gt;last_field);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Queue as many jobs as our data provides for */</div><div class='hunk'>@@ -1337,7 +1337,7 @@ static void device_frame_end(struct fdp1_dev *fdp1,</div><div class='ctx'> 	fdp1_job_free(fdp1, job);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(fdp1, "curr_ctx-&gt;num_processed %d curr_ctx-&gt;translen %d\n",</div><div class='del'>-			ctx-&gt;num_processed, ctx-&gt;translen);</div><div class='add'>+		ctx-&gt;num_processed, ctx-&gt;translen);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;num_processed == ctx-&gt;translen ||</div><div class='ctx'> 			ctx-&gt;aborting) {</div><div class='hunk'>@@ -1362,7 +1362,7 @@ static int fdp1_vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> 	strscpy(cap-&gt;driver, DRIVER_NAME, sizeof(cap-&gt;driver));</div><div class='ctx'> 	strscpy(cap-&gt;card, DRIVER_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info),</div><div class='del'>-			"platform:%s", DRIVER_NAME);</div><div class='add'>+		 "platform:%s", DRIVER_NAME);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1993,13 +1993,13 @@ static void fdp1_stop_streaming(struct vb2_queue *q)</div><div class='ctx'> 		/* Free smsk_data */</div><div class='ctx'> 		if (ctx-&gt;smsk_cpu) {</div><div class='ctx'> 			dma_free_coherent(ctx-&gt;fdp1-&gt;dev, ctx-&gt;smsk_size,</div><div class='del'>-					ctx-&gt;smsk_cpu, ctx-&gt;smsk_addr[0]);</div><div class='add'>+					  ctx-&gt;smsk_cpu, ctx-&gt;smsk_addr[0]);</div><div class='ctx'> 			ctx-&gt;smsk_addr[0] = ctx-&gt;smsk_addr[1] = 0;</div><div class='ctx'> 			ctx-&gt;smsk_cpu = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		WARN(!list_empty(&amp;ctx-&gt;fields_queue),</div><div class='del'>-				"Buffer queue not empty");</div><div class='add'>+		     "Buffer queue not empty");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Empty Capture queues (Jobs) */</div><div class='ctx'> 		struct fdp1_job *job;</div><div class='hunk'>@@ -2021,10 +2021,10 @@ static void fdp1_stop_streaming(struct vb2_queue *q)</div><div class='ctx'> 		fdp1_field_complete(ctx, ctx-&gt;previous);</div><div class='ctx'> </div><div class='ctx'> 		WARN(!list_empty(&amp;ctx-&gt;fdp1-&gt;queued_job_list),</div><div class='del'>-				"Queued Job List not empty");</div><div class='add'>+		     "Queued Job List not empty");</div><div class='ctx'> </div><div class='ctx'> 		WARN(!list_empty(&amp;ctx-&gt;fdp1-&gt;hw_job_list),</div><div class='del'>-				"HW Job list not empty");</div><div class='add'>+		     "HW Job list not empty");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2110,7 +2110,7 @@ static int fdp1_open(struct file *file)</div><div class='ctx'> 				     fdp1_ctrl_deint_menu);</div><div class='ctx'> </div><div class='ctx'> 	ctrl = v4l2_ctrl_new_std(&amp;ctx-&gt;hdl, &amp;fdp1_ctrl_ops,</div><div class='del'>-			V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);</div><div class='add'>+				 V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);</div><div class='ctx'> 	if (ctrl)</div><div class='ctx'> 		ctrl-&gt;flags |= V4L2_CTRL_FLAG_VOLATILE;</div><div class='ctx'> </div><div class='hunk'>@@ -2347,8 +2347,8 @@ static int fdp1_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto release_m2m;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	v4l2_info(&amp;fdp1-&gt;v4l2_dev,</div><div class='del'>-			"Device registered as /dev/video%d\n", vfd-&gt;num);</div><div class='add'>+	v4l2_info(&amp;fdp1-&gt;v4l2_dev, "Device registered as /dev/video%d\n",</div><div class='add'>+		  vfd-&gt;num);</div><div class='ctx'> </div><div class='ctx'> 	/* Power up the cells to read HW */</div><div class='ctx'> 	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='hunk'>@@ -2367,7 +2367,7 @@ static int fdp1_probe(struct platform_device *pdev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(fdp1-&gt;dev, "FDP1 Unidentifiable (0x%08x)\n",</div><div class='del'>-				hw_version);</div><div class='add'>+			hw_version);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allow the hw to sleep until an open call puts it to use */</div><div class='head'>diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c<br/>index 8837e2678bde..7f62f5ef0086 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/s5p-cec/s5p_cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/s5p-cec/s5p_cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/s5p-cec/s5p_cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/s5p-cec/s5p_cec.c</a></div><div class='hunk'>@@ -178,22 +178,16 @@ static const struct cec_adap_ops s5p_cec_adap_ops = {</div><div class='ctx'> static int s5p_cec_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	struct platform_device *hdmi_dev;</div><div class='add'>+	struct device *hdmi_dev;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct s5p_cec_dev *cec;</div><div class='ctx'> 	bool needs_hpd = of_property_read_bool(pdev-&gt;dev.of_node, "needs-hpd");</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	np = of_parse_phandle(pdev-&gt;dev.of_node, "hdmi-phandle", 0);</div><div class='add'>+	hdmi_dev = cec_notifier_parse_hdmi_phandle(dev);</div><div class='ctx'> </div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to find hdmi node in device tree\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	hdmi_dev = of_find_device_by_node(np);</div><div class='del'>-	if (hdmi_dev == NULL)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='add'>+	if (IS_ERR(hdmi_dev))</div><div class='add'>+		return PTR_ERR(hdmi_dev);</div><div class='ctx'> </div><div class='ctx'> 	cec = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*cec), GFP_KERNEL);</div><div class='ctx'> 	if (!cec)</div><div class='hunk'>@@ -224,7 +218,7 @@ static int s5p_cec_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(cec-&gt;reg))</div><div class='ctx'> 		return PTR_ERR(cec-&gt;reg);</div><div class='ctx'> </div><div class='del'>-	cec-&gt;notifier = cec_notifier_get(&amp;hdmi_dev-&gt;dev);</div><div class='add'>+	cec-&gt;notifier = cec_notifier_get(hdmi_dev);</div><div class='ctx'> 	if (cec-&gt;notifier == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c<br/>index 971c47165010..c8f394e1aff4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/s5p-g2d/g2d.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/s5p-g2d/g2d.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/s5p-g2d/g2d.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/s5p-g2d/g2d.c</a></div><div class='hunk'>@@ -297,8 +297,8 @@ static int g2d_release(struct file *file)</div><div class='ctx'> static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> 				struct v4l2_capability *cap)</div><div class='ctx'> {</div><div class='del'>-	strncpy(cap-&gt;driver, G2D_NAME, sizeof(cap-&gt;driver) - 1);</div><div class='del'>-	strncpy(cap-&gt;card, G2D_NAME, sizeof(cap-&gt;card) - 1);</div><div class='add'>+	strscpy(cap-&gt;driver, G2D_NAME, sizeof(cap-&gt;driver));</div><div class='add'>+	strscpy(cap-&gt;card, G2D_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	cap-&gt;bus_info[0] = 0;</div><div class='ctx'> 	cap-&gt;device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;</div><div class='ctx'> 	cap-&gt;capabilities = cap-&gt;device_caps | V4L2_CAP_DEVICE_CAPS;</div><div class='hunk'>@@ -312,7 +312,7 @@ static int vidioc_enum_fmt(struct file *file, void *prv, struct v4l2_fmtdesc *f)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	fmt = &amp;formats[f-&gt;index];</div><div class='ctx'> 	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='del'>-	strncpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description) - 1);</div><div class='add'>+	strscpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/seco-cec/seco-cec.c b/drivers/media/platform/seco-cec/seco-cec.c<br/>index a425a10540c1..e5080d6f5b2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/seco-cec/seco-cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/seco-cec/seco-cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/seco-cec/seco-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/seco-cec/seco-cec.c</a></div><div class='hunk'>@@ -536,6 +536,7 @@ static int secocec_cec_get_notifier(struct cec_notifier **notify)</div><div class='ctx'> 				return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='ctx'> 			*notify = cec_notifier_get_conn(d, m-&gt;conn);</div><div class='add'>+			put_device(d);</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c<br/>index d277cc674349..5a9ba05c996e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sh_veu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sh_veu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sh_veu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/sh_veu.c</a></div><div class='hunk'>@@ -493,9 +493,6 @@ static int sh_veu_try_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 	const struct sh_veu_format *fmt;</div><div class='ctx'> </div><div class='ctx'> 	fmt = sh_veu_find_fmt(f);</div><div class='del'>-	if (!fmt)</div><div class='del'>-		/* wrong buffer type */</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return sh_veu_try_fmt(f, fmt);</div><div class='ctx'> }</div><div class='hunk'>@@ -506,9 +503,6 @@ static int sh_veu_try_fmt_vid_out(struct file *file, void *priv,</div><div class='ctx'> 	const struct sh_veu_format *fmt;</div><div class='ctx'> </div><div class='ctx'> 	fmt = sh_veu_find_fmt(f);</div><div class='del'>-	if (!fmt)</div><div class='del'>-		/* wrong buffer type */</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return sh_veu_try_fmt(f, fmt);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig<br/>index 7420a50572d3..93eaabfd5437 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sti/c8sectpfe/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sti/c8sectpfe/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sti/c8sectpfe/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/sti/c8sectpfe/Kconfig</a></div><div class='hunk'>@@ -12,7 +12,7 @@ config DVB_C8SECTPFE</div><div class='ctx'> 	select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA18212 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for DVB front-end cards connected</div><div class='ctx'> 	  to TS inputs of STiH407/410 SoC.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/platform/sti/cec/stih-cec.c<br/>index d34099f75990..fc37efe1d554 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sti/cec/stih-cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sti/cec/stih-cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sti/cec/stih-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/sti/cec/stih-cec.c</a></div><div class='hunk'>@@ -301,26 +301,19 @@ static int stih_cec_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct stih_cec *cec;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	struct platform_device *hdmi_dev;</div><div class='add'>+	struct device *hdmi_dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	hdmi_dev = cec_notifier_parse_hdmi_phandle(dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(hdmi_dev))</div><div class='add'>+		return PTR_ERR(hdmi_dev);</div><div class='add'>+</div><div class='ctx'> 	cec = devm_kzalloc(dev, sizeof(*cec), GFP_KERNEL);</div><div class='ctx'> 	if (!cec)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	np = of_parse_phandle(pdev-&gt;dev.of_node, "hdmi-phandle", 0);</div><div class='del'>-</div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to find hdmi node in device tree\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdmi_dev = of_find_device_by_node(np);</div><div class='del'>-	if (!hdmi_dev)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-	cec-&gt;notifier = cec_notifier_get(&amp;hdmi_dev-&gt;dev);</div><div class='add'>+	cec-&gt;notifier = cec_notifier_get(hdmi_dev);</div><div class='ctx'> 	if (!cec-&gt;notifier)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/sti/delta/delta-ipc.c b/drivers/media/platform/sti/delta/delta-ipc.c<br/>index a4603d573c34..186d88f02ecd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sti/delta/delta-ipc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sti/delta/delta-ipc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sti/delta/delta-ipc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/sti/delta/delta-ipc.c</a></div><div class='hunk'>@@ -220,10 +220,8 @@ int delta_ipc_open(struct delta_ctx *pctx, const char *name,</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	pctx-&gt;sys_errors++;</div><div class='del'>-	if (ctx-&gt;ipc_buf) {</div><div class='del'>-		hw_free(pctx, ctx-&gt;ipc_buf);</div><div class='del'>-		ctx-&gt;ipc_buf = NULL;</div><div class='del'>-	}</div><div class='add'>+	hw_free(pctx, ctx-&gt;ipc_buf);</div><div class='add'>+	ctx-&gt;ipc_buf = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/platform/stm32/stm32-cec.c b/drivers/media/platform/stm32/stm32-cec.c<br/>index 7c496bc1cf38..8a86b2cc22fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/stm32/stm32-cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/stm32/stm32-cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/stm32/stm32-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/stm32/stm32-cec.c</a></div><div class='hunk'>@@ -56,6 +56,13 @@</div><div class='ctx'> #define ALL_TX_IT	(TXEND | TXBR | TXACKE | TXERR | TXUDR | ARBLST)</div><div class='ctx'> #define ALL_RX_IT	(RXEND | RXBR | RXACKE | RXOVR)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * 400 ms is the time it takes for one 16 byte message to be</div><div class='add'>+ * transferred and 5 is the maximum number of retries. Add</div><div class='add'>+ * another 100 ms as a margin.</div><div class='add'>+ */</div><div class='add'>+#define CEC_XFER_TIMEOUT_MS (5 * 400 + 100)</div><div class='add'>+</div><div class='ctx'> struct stm32_cec {</div><div class='ctx'> 	struct cec_adapter	*adap;</div><div class='ctx'> 	struct device		*dev;</div><div class='hunk'>@@ -188,7 +195,11 @@ static int stm32_cec_adap_log_addr(struct cec_adapter *adap, u8 logical_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct stm32_cec *cec = adap-&gt;priv;</div><div class='ctx'> 	u32 oar = (1 &lt;&lt; logical_addr) &lt;&lt; 16;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='add'>+	/* Poll every 100µs the register CEC_CR to wait end of transmission */</div><div class='add'>+	regmap_read_poll_timeout(cec-&gt;regmap, CEC_CR, val, !(val &amp; TXSOM),</div><div class='add'>+				 100, CEC_XFER_TIMEOUT_MS * 1000);</div><div class='ctx'> 	regmap_update_bits(cec-&gt;regmap, CEC_CR, CECEN, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (logical_addr == CEC_LOG_ADDR_INVALID)</div><div class='head'>diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c<br/>index 5fe5b38fa901..b9dad0accd1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/stm32/stm32-dcmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/stm32/stm32-dcmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/stm32/stm32-dcmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/stm32/stm32-dcmi.c</a></div><div class='hunk'>@@ -97,6 +97,8 @@ enum state {</div><div class='ctx'> </div><div class='ctx'> #define TIMEOUT_MS	1000</div><div class='ctx'> </div><div class='add'>+#define OVERRUN_ERROR_THRESHOLD	3</div><div class='add'>+</div><div class='ctx'> struct dcmi_graph_entity {</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> </div><div class='hunk'>@@ -164,6 +166,9 @@ struct stm32_dcmi {</div><div class='ctx'> 	int				errors_count;</div><div class='ctx'> 	int				overrun_count;</div><div class='ctx'> 	int				buffers_count;</div><div class='add'>+</div><div class='add'>+	/* Ensure DMA operations atomicity */</div><div class='add'>+	struct mutex			dma_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct stm32_dcmi *notifier_to_dcmi(struct v4l2_async_notifier *n)</div><div class='hunk'>@@ -314,6 +319,13 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Avoid call of dmaengine_terminate_all() between</div><div class='add'>+	 * dmaengine_prep_slave_single() and dmaengine_submit()</div><div class='add'>+	 * by locking the whole DMA submission sequence</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;dcmi-&gt;dma_lock);</div><div class='add'>+</div><div class='ctx'> 	/* Prepare a DMA transaction */</div><div class='ctx'> 	desc = dmaengine_prep_slave_single(dcmi-&gt;dma_chan, buf-&gt;paddr,</div><div class='ctx'> 					   buf-&gt;size,</div><div class='hunk'>@@ -322,6 +334,7 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi,</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		dev_err(dcmi-&gt;dev, "%s: DMA dmaengine_prep_slave_single failed for buffer phy=%pad size=%zu\n",</div><div class='ctx'> 			__func__, &amp;buf-&gt;paddr, buf-&gt;size);</div><div class='add'>+		mutex_unlock(&amp;dcmi-&gt;dma_lock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -333,9 +346,12 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi,</div><div class='ctx'> 	dcmi-&gt;dma_cookie = dmaengine_submit(desc);</div><div class='ctx'> 	if (dma_submit_error(dcmi-&gt;dma_cookie)) {</div><div class='ctx'> 		dev_err(dcmi-&gt;dev, "%s: DMA submission failed\n", __func__);</div><div class='add'>+		mutex_unlock(&amp;dcmi-&gt;dma_lock);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;dcmi-&gt;dma_lock);</div><div class='add'>+</div><div class='ctx'> 	dma_async_issue_pending(dcmi-&gt;dma_chan);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -432,11 +448,13 @@ static irqreturn_t dcmi_irq_thread(int irq, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;dcmi-&gt;irqlock);</div><div class='ctx'> </div><div class='del'>-	if ((dcmi-&gt;misr &amp; IT_OVR) || (dcmi-&gt;misr &amp; IT_ERR)) {</div><div class='del'>-		dcmi-&gt;errors_count++;</div><div class='del'>-		if (dcmi-&gt;misr &amp; IT_OVR)</div><div class='del'>-			dcmi-&gt;overrun_count++;</div><div class='add'>+	if (dcmi-&gt;misr &amp; IT_OVR) {</div><div class='add'>+		dcmi-&gt;overrun_count++;</div><div class='add'>+		if (dcmi-&gt;overrun_count &gt; OVERRUN_ERROR_THRESHOLD)</div><div class='add'>+			dcmi-&gt;errors_count++;</div><div class='ctx'> 	}</div><div class='add'>+	if (dcmi-&gt;misr &amp; IT_ERR)</div><div class='add'>+		dcmi-&gt;errors_count++;</div><div class='ctx'> </div><div class='ctx'> 	if (dcmi-&gt;sd_format-&gt;fourcc == V4L2_PIX_FMT_JPEG &amp;&amp;</div><div class='ctx'> 	    dcmi-&gt;misr &amp; IT_FRAME) {</div><div class='hunk'>@@ -570,9 +588,9 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = pm_runtime_get_sync(dcmi-&gt;dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dcmi-&gt;dev, "%s: Failed to start streaming, cannot get sync\n",</div><div class='del'>-			__func__);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dcmi-&gt;dev, "%s: Failed to start streaming, cannot get sync (%d)\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> 		goto err_release_buffers;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -720,7 +738,9 @@ static void dcmi_stop_streaming(struct vb2_queue *vq)</div><div class='ctx'> 	spin_unlock_irq(&amp;dcmi-&gt;irqlock);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop all pending DMA operations */</div><div class='add'>+	mutex_lock(&amp;dcmi-&gt;dma_lock);</div><div class='ctx'> 	dmaengine_terminate_all(dcmi-&gt;dma_chan);</div><div class='add'>+	mutex_unlock(&amp;dcmi-&gt;dma_lock);</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_put(dcmi-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -811,6 +831,9 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f,</div><div class='ctx'> </div><div class='ctx'> 	sd_fmt = find_format_by_fourcc(dcmi, pix-&gt;pixelformat);</div><div class='ctx'> 	if (!sd_fmt) {</div><div class='add'>+		if (!dcmi-&gt;num_of_sd_formats)</div><div class='add'>+			return -ENODATA;</div><div class='add'>+</div><div class='ctx'> 		sd_fmt = dcmi-&gt;sd_formats[dcmi-&gt;num_of_sd_formats - 1];</div><div class='ctx'> 		pix-&gt;pixelformat = sd_fmt-&gt;fourcc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -989,6 +1012,9 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi,</div><div class='ctx'> </div><div class='ctx'> 	sd_fmt = find_format_by_fourcc(dcmi, pix-&gt;pixelformat);</div><div class='ctx'> 	if (!sd_fmt) {</div><div class='add'>+		if (!dcmi-&gt;num_of_sd_formats)</div><div class='add'>+			return -ENODATA;</div><div class='add'>+</div><div class='ctx'> 		sd_fmt = dcmi-&gt;sd_formats[dcmi-&gt;num_of_sd_formats - 1];</div><div class='ctx'> 		pix-&gt;pixelformat = sd_fmt-&gt;fourcc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1595,7 +1621,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)</div><div class='ctx'> 	/* Parse the graph to extract a list of subdevice DT nodes. */</div><div class='ctx'> 	ret = dcmi_graph_parse(dcmi, dcmi-&gt;dev-&gt;of_node);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dcmi-&gt;dev, "Graph parsing failed\n");</div><div class='add'>+		dev_err(dcmi-&gt;dev, "Failed to parse graph\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1604,6 +1630,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)</div><div class='ctx'> 	ret = v4l2_async_notifier_add_subdev(&amp;dcmi-&gt;notifier,</div><div class='ctx'> 					     &amp;dcmi-&gt;entity.asd);</div><div class='ctx'> 	if (ret) {</div><div class='add'>+		dev_err(dcmi-&gt;dev, "Failed to add subdev notifier\n");</div><div class='ctx'> 		of_node_put(dcmi-&gt;entity.node);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1612,7 +1639,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)</div><div class='ctx'> </div><div class='ctx'> 	ret = v4l2_async_notifier_register(&amp;dcmi-&gt;v4l2_dev, &amp;dcmi-&gt;notifier);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dcmi-&gt;dev, "Notifier registration failed\n");</div><div class='add'>+		dev_err(dcmi-&gt;dev, "Failed to register notifier\n");</div><div class='ctx'> 		v4l2_async_notifier_cleanup(&amp;dcmi-&gt;notifier);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1645,7 +1672,7 @@ static int dcmi_probe(struct platform_device *pdev)</div><div class='ctx'> 	dcmi-&gt;rstc = devm_reset_control_get_exclusive(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> 	if (IS_ERR(dcmi-&gt;rstc)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Could not get reset control\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return PTR_ERR(dcmi-&gt;rstc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get bus characteristics from devicetree */</div><div class='hunk'>@@ -1660,7 +1687,7 @@ static int dcmi_probe(struct platform_device *pdev)</div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Could not parse the endpoint\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ep.bus_type == V4L2_MBUS_CSI2_DPHY) {</div><div class='hunk'>@@ -1673,8 +1700,9 @@ static int dcmi_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 irq\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		if (irq != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Could not get irq\n");</div><div class='add'>+		return irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dcmi-&gt;res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -1694,12 +1722,13 @@ static int dcmi_probe(struct platform_device *pdev)</div><div class='ctx'> 					dev_name(&amp;pdev-&gt;dev), dcmi);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to request irq %d\n", irq);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mclk = devm_clk_get(&amp;pdev-&gt;dev, "mclk");</div><div class='ctx'> 	if (IS_ERR(mclk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Unable to get mclk\n");</div><div class='add'>+		if (PTR_ERR(mclk) != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Unable to get mclk\n");</div><div class='ctx'> 		return PTR_ERR(mclk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1711,6 +1740,7 @@ static int dcmi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;dcmi-&gt;irqlock);</div><div class='ctx'> 	mutex_init(&amp;dcmi-&gt;lock);</div><div class='add'>+	mutex_init(&amp;dcmi-&gt;dma_lock);</div><div class='ctx'> 	init_completion(&amp;dcmi-&gt;complete);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dcmi-&gt;buffers);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c<br/>index 1fd16861f111..f0dfe68486d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c</a></div><div class='hunk'>@@ -412,7 +412,7 @@ static int vidioc_enum_input(struct file *file, void *fh,</div><div class='ctx'> 	if (inp-&gt;index != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strlcpy(inp-&gt;name, "camera", sizeof(inp-&gt;name));</div><div class='add'>+	strscpy(inp-&gt;name, "camera", sizeof(inp-&gt;name));</div><div class='ctx'> 	inp-&gt;type = V4L2_INPUT_TYPE_CAMERA;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -644,7 +644,7 @@ int sun6i_video_init(struct sun6i_video *video, struct sun6i_csi *csi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register video device */</div><div class='del'>-	strlcpy(vdev-&gt;name, name, sizeof(vdev-&gt;name));</div><div class='add'>+	strscpy(vdev-&gt;name, name, sizeof(vdev-&gt;name));</div><div class='ctx'> 	vdev-&gt;release		= video_device_release_empty;</div><div class='ctx'> 	vdev-&gt;fops		= &amp;sun6i_video_fops;</div><div class='ctx'> 	vdev-&gt;ioctl_ops		= &amp;sun6i_video_ioctl_ops;</div><div class='head'>diff --git a/drivers/media/platform/tegra-cec/tegra_cec.c b/drivers/media/platform/tegra-cec/tegra_cec.c<br/>index aba488cd0e64..7fb3a4fa07c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/tegra-cec/tegra_cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/tegra-cec/tegra_cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/tegra-cec/tegra_cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/tegra-cec/tegra_cec.c</a></div><div class='hunk'>@@ -327,21 +327,15 @@ static const struct cec_adap_ops tegra_cec_ops = {</div><div class='ctx'> </div><div class='ctx'> static int tegra_cec_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *hdmi_dev;</div><div class='del'>-	struct device_node *np;</div><div class='add'>+	struct device *hdmi_dev;</div><div class='ctx'> 	struct tegra_cec *cec;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	np = of_parse_phandle(pdev-&gt;dev.of_node, "hdmi-phandle", 0);</div><div class='add'>+	hdmi_dev = cec_notifier_parse_hdmi_phandle(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to find hdmi node in device tree\n");</div><div class='add'>+	if (!hdmi_dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	hdmi_dev = of_find_device_by_node(np);</div><div class='del'>-	if (hdmi_dev == NULL)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='ctx'> 	cec = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct tegra_cec), GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -400,7 +394,7 @@ static int tegra_cec_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto clk_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cec-&gt;notifier = cec_notifier_get(&amp;hdmi_dev-&gt;dev);</div><div class='add'>+	cec-&gt;notifier = cec_notifier_get(hdmi_dev);</div><div class='ctx'> 	if (!cec-&gt;notifier) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto clk_error;</div><div class='head'>diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c<br/>index fc3c212b96e1..8d075683e448 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/ti-vpe/cal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/ti-vpe/cal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/ti-vpe/cal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/ti-vpe/cal.c</a></div><div class='hunk'>@@ -1643,8 +1643,7 @@ of_get_next_endpoint(const struct device_node *parent,</div><div class='ctx'> static int of_cal_create_instance(struct cal_ctx *ctx, int inst)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev = ctx-&gt;dev-&gt;pdev;</div><div class='del'>-	struct device_node *ep_node, *port, *remote_ep,</div><div class='del'>-			*sensor_node, *parent;</div><div class='add'>+	struct device_node *ep_node, *port, *sensor_node, *parent;</div><div class='ctx'> 	struct v4l2_fwnode_endpoint *endpoint;</div><div class='ctx'> 	struct v4l2_async_subdev *asd;</div><div class='ctx'> 	u32 regval = 0;</div><div class='hunk'>@@ -1657,7 +1656,6 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)</div><div class='ctx'> </div><div class='ctx'> 	ep_node = NULL;</div><div class='ctx'> 	port = NULL;</div><div class='del'>-	remote_ep = NULL;</div><div class='ctx'> 	sensor_node = NULL;</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1703,12 +1701,7 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)</div><div class='ctx'> 	asd-&gt;match_type = V4L2_ASYNC_MATCH_FWNODE;</div><div class='ctx'> 	asd-&gt;match.fwnode = of_fwnode_handle(sensor_node);</div><div class='ctx'> </div><div class='del'>-	remote_ep = of_graph_get_remote_endpoint(ep_node);</div><div class='del'>-	if (!remote_ep) {</div><div class='del'>-		ctx_dbg(3, ctx, "can't get remote-endpoint\n");</div><div class='del'>-		goto cleanup_exit;</div><div class='del'>-	}</div><div class='del'>-	v4l2_fwnode_endpoint_parse(of_fwnode_handle(remote_ep), endpoint);</div><div class='add'>+	v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), endpoint);</div><div class='ctx'> </div><div class='ctx'> 	if (endpoint-&gt;bus_type != V4L2_MBUS_CSI2_DPHY) {</div><div class='ctx'> 		ctx_err(ctx, "Port:%d sub-device %pOFn is not a CSI2 device\n",</div><div class='hunk'>@@ -1759,7 +1752,6 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)</div><div class='ctx'> 	sensor_node = NULL;</div><div class='ctx'> </div><div class='ctx'> cleanup_exit:</div><div class='del'>-	of_node_put(remote_ep);</div><div class='ctx'> 	of_node_put(sensor_node);</div><div class='ctx'> 	of_node_put(ep_node);</div><div class='ctx'> 	of_node_put(port);</div><div class='head'>diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c<br/>index 207e7e76c048..1e40eafec284 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/ti-vpe/vpe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/ti-vpe/vpe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/ti-vpe/vpe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/ti-vpe/vpe.c</a></div><div class='hunk'>@@ -1491,8 +1491,8 @@ handled:</div><div class='ctx'> static int vpe_querycap(struct file *file, void *priv,</div><div class='ctx'> 			struct v4l2_capability *cap)</div><div class='ctx'> {</div><div class='del'>-	strncpy(cap-&gt;driver, VPE_MODULE_NAME, sizeof(cap-&gt;driver) - 1);</div><div class='del'>-	strncpy(cap-&gt;card, VPE_MODULE_NAME, sizeof(cap-&gt;card) - 1);</div><div class='add'>+	strscpy(cap-&gt;driver, VPE_MODULE_NAME, sizeof(cap-&gt;driver));</div><div class='add'>+	strscpy(cap-&gt;card, VPE_MODULE_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info), "platform:%s",</div><div class='ctx'> 		VPE_MODULE_NAME);</div><div class='ctx'> 	cap-&gt;device_caps  = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;</div><div class='hunk'>@@ -1519,7 +1519,7 @@ static int __enum_fmt(struct v4l2_fmtdesc *f, u32 type)</div><div class='ctx'> 	if (!fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strncpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description) - 1);</div><div class='add'>+	strscpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description));</div><div class='ctx'> 	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c<br/>index d1d6085da9f1..31faf319e508 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-fwht.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-fwht.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-fwht.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vicodec/codec-fwht.c</a></div><div class='hunk'>@@ -46,8 +46,12 @@ static const uint8_t zigzag[64] = {</div><div class='ctx'> 	63,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int rlc(const s16 *in, __be16 *output, int blocktype)</div><div class='add'>+/*</div><div class='add'>+ * noinline_for_stack to work around</div><div class='add'>+ * https://bugs.llvm.org/show_bug.cgi?id=38809</div><div class='add'>+ */</div><div class='add'>+static int noinline_for_stack</div><div class='add'>+rlc(const s16 *in, __be16 *output, int blocktype)</div><div class='ctx'> {</div><div class='ctx'> 	s16 block[8 * 8];</div><div class='ctx'> 	s16 *wp = block;</div><div class='hunk'>@@ -106,8 +110,8 @@ static int rlc(const s16 *in, __be16 *output, int blocktype)</div><div class='ctx'>  * This function will worst-case increase rlc_in by 65*2 bytes:</div><div class='ctx'>  * one s16 value for the header and 8 * 8 coefficients of type s16.</div><div class='ctx'>  */</div><div class='del'>-static u16 derlc(const __be16 **rlc_in, s16 *dwht_out,</div><div class='del'>-		 const __be16 *end_of_input)</div><div class='add'>+static noinline_for_stack u16</div><div class='add'>+derlc(const __be16 **rlc_in, s16 *dwht_out, const __be16 *end_of_input)</div><div class='ctx'> {</div><div class='ctx'> 	/* header */</div><div class='ctx'> 	const __be16 *input = *rlc_in;</div><div class='hunk'>@@ -240,8 +244,9 @@ static void dequantize_inter(s16 *coeff)</div><div class='ctx'> 			*coeff &lt;&lt;= *quant;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fwht(const u8 *block, s16 *output_block, unsigned int stride,</div><div class='del'>-		 unsigned int input_step, bool intra)</div><div class='add'>+static void noinline_for_stack fwht(const u8 *block, s16 *output_block,</div><div class='add'>+				    unsigned int stride,</div><div class='add'>+				    unsigned int input_step, bool intra)</div><div class='ctx'> {</div><div class='ctx'> 	/* we'll need more than 8 bits for the transformed coefficients */</div><div class='ctx'> 	s32 workspace1[8], workspace2[8];</div><div class='hunk'>@@ -373,7 +378,8 @@ static void fwht(const u8 *block, s16 *output_block, unsigned int stride,</div><div class='ctx'>  * Furthermore values can be negative... This is just a version that</div><div class='ctx'>  * works with 16 signed data</div><div class='ctx'>  */</div><div class='del'>-static void fwht16(const s16 *block, s16 *output_block, int stride, int intra)</div><div class='add'>+static void noinline_for_stack</div><div class='add'>+fwht16(const s16 *block, s16 *output_block, int stride, int intra)</div><div class='ctx'> {</div><div class='ctx'> 	/* we'll need more than 8 bits for the transformed coefficients */</div><div class='ctx'> 	s32 workspace1[8], workspace2[8];</div><div class='hunk'>@@ -456,7 +462,8 @@ static void fwht16(const s16 *block, s16 *output_block, int stride, int intra)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ifwht(const s16 *block, s16 *output_block, int intra)</div><div class='add'>+static noinline_for_stack void</div><div class='add'>+ifwht(const s16 *block, s16 *output_block, int intra)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we'll need more than 8 bits for the transformed coefficients</div><div class='hunk'>@@ -604,9 +611,9 @@ static int var_inter(const s16 *old, const s16 *new)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decide_blocktype(const u8 *cur, const u8 *reference,</div><div class='del'>-			    s16 *deltablock, unsigned int stride,</div><div class='del'>-			    unsigned int input_step)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+decide_blocktype(const u8 *cur, const u8 *reference, s16 *deltablock,</div><div class='add'>+		 unsigned int stride, unsigned int input_step)</div><div class='ctx'> {</div><div class='ctx'> 	s16 tmp[64];</div><div class='ctx'> 	s16 old[64];</div><div class='hunk'>@@ -632,12 +639,13 @@ static int decide_blocktype(const u8 *cur, const u8 *reference,</div><div class='ctx'> 	return vari &lt;= vard ? IBLOCK : PBLOCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fill_decoder_block(u8 *dst, const s16 *input, int stride)</div><div class='add'>+static void fill_decoder_block(u8 *dst, const s16 *input, int stride,</div><div class='add'>+			       unsigned int dst_step)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		for (j = 0; j &lt; 8; j++, input++, dst++) {</div><div class='add'>+		for (j = 0; j &lt; 8; j++, input++, dst += dst_step) {</div><div class='ctx'> 			if (*input &lt; 0)</div><div class='ctx'> 				*dst = 0;</div><div class='ctx'> 			else if (*input &gt; 255)</div><div class='hunk'>@@ -645,17 +653,19 @@ static void fill_decoder_block(u8 *dst, const s16 *input, int stride)</div><div class='ctx'> 			else</div><div class='ctx'> 				*dst = *input;</div><div class='ctx'> 		}</div><div class='del'>-		dst += stride - 8;</div><div class='add'>+		dst += stride - (8 * dst_step);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_deltas(s16 *deltas, const u8 *ref, int stride)</div><div class='add'>+static void add_deltas(s16 *deltas, const u8 *ref, int stride,</div><div class='add'>+		       unsigned int ref_step)</div><div class='ctx'> {</div><div class='ctx'> 	int k, l;</div><div class='ctx'> </div><div class='ctx'> 	for (k = 0; k &lt; 8; k++) {</div><div class='ctx'> 		for (l = 0; l &lt; 8; l++) {</div><div class='del'>-			*deltas += *ref++;</div><div class='add'>+			*deltas += *ref;</div><div class='add'>+			ref += ref_step;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Due to quantizing, it might possible that the</div><div class='ctx'> 			 * decoded coefficients are slightly out of range</div><div class='hunk'>@@ -666,7 +676,7 @@ static void add_deltas(s16 *deltas, const u8 *ref, int stride)</div><div class='ctx'> 				*deltas = 255;</div><div class='ctx'> 			deltas++;</div><div class='ctx'> 		}</div><div class='del'>-		ref += stride - 8;</div><div class='add'>+		ref += stride - (8 * ref_step);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -711,8 +721,8 @@ static u32 encode_plane(u8 *input, u8 *refp, __be16 **rlco, __be16 *rlco_max,</div><div class='ctx'> 				ifwht(cf-&gt;de_coeffs, cf-&gt;de_fwht, blocktype);</div><div class='ctx'> </div><div class='ctx'> 				if (blocktype == PBLOCK)</div><div class='del'>-					add_deltas(cf-&gt;de_fwht, refp, 8);</div><div class='del'>-				fill_decoder_block(refp, cf-&gt;de_fwht, 8);</div><div class='add'>+					add_deltas(cf-&gt;de_fwht, refp, 8, 1);</div><div class='add'>+				fill_decoder_block(refp, cf-&gt;de_fwht, 8, 1);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			input += 8 * input_step;</div><div class='hunk'>@@ -821,23 +831,31 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm,</div><div class='ctx'> 	return encoding;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref,</div><div class='del'>-			 u32 height, u32 width, u32 coded_width,</div><div class='add'>+static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco,</div><div class='add'>+			 u32 height, u32 width, const u8 *ref, u32 ref_stride,</div><div class='add'>+			 unsigned int ref_step, u8 *dst,</div><div class='add'>+			 unsigned int dst_stride, unsigned int dst_step,</div><div class='ctx'> 			 bool uncompressed, const __be16 *end_of_rlco_buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int copies = 0;</div><div class='ctx'> 	s16 copy[8 * 8];</div><div class='ctx'> 	u16 stat;</div><div class='ctx'> 	unsigned int i, j;</div><div class='add'>+	bool is_intra = !ref;</div><div class='ctx'> </div><div class='ctx'> 	width = round_up(width, 8);</div><div class='ctx'> 	height = round_up(height, 8);</div><div class='ctx'> </div><div class='ctx'> 	if (uncompressed) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='ctx'> 		if (end_of_rlco_buf + 1 &lt; *rlco + width * height / 2)</div><div class='ctx'> 			return false;</div><div class='del'>-		memcpy(ref, *rlco, width * height);</div><div class='del'>-		*rlco += width * height / 2;</div><div class='add'>+		for (i = 0; i &lt; height; i++) {</div><div class='add'>+			memcpy(dst, *rlco, width);</div><div class='add'>+			dst += dst_stride;</div><div class='add'>+			*rlco += width / 2;</div><div class='add'>+		}</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -849,15 +867,17 @@ static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (j = 0; j &lt; height / 8; j++) {</div><div class='ctx'> 		for (i = 0; i &lt; width / 8; i++) {</div><div class='del'>-			u8 *refp = ref + j * 8 * coded_width + i * 8;</div><div class='add'>+			const u8 *refp = ref + j * 8 * ref_stride +</div><div class='add'>+				i * 8 * ref_step;</div><div class='add'>+			u8 *dstp = dst + j * 8 * dst_stride + i * 8 * dst_step;</div><div class='ctx'> </div><div class='ctx'> 			if (copies) {</div><div class='ctx'> 				memcpy(cf-&gt;de_fwht, copy, sizeof(copy));</div><div class='del'>-				if (stat &amp; PFRAME_BIT)</div><div class='add'>+				if ((stat &amp; PFRAME_BIT) &amp;&amp; !is_intra)</div><div class='ctx'> 					add_deltas(cf-&gt;de_fwht, refp,</div><div class='del'>-						   coded_width);</div><div class='del'>-				fill_decoder_block(refp, cf-&gt;de_fwht,</div><div class='del'>-						   coded_width);</div><div class='add'>+						   ref_stride, ref_step);</div><div class='add'>+				fill_decoder_block(dstp, cf-&gt;de_fwht,</div><div class='add'>+						   dst_stride, dst_step);</div><div class='ctx'> 				copies--;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -865,35 +885,41 @@ static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref,</div><div class='ctx'> 			stat = derlc(rlco, cf-&gt;coeffs, end_of_rlco_buf);</div><div class='ctx'> 			if (stat &amp; OVERFLOW_BIT)</div><div class='ctx'> 				return false;</div><div class='del'>-			if (stat &amp; PFRAME_BIT)</div><div class='add'>+			if ((stat &amp; PFRAME_BIT) &amp;&amp; !is_intra)</div><div class='ctx'> 				dequantize_inter(cf-&gt;coeffs);</div><div class='ctx'> 			else</div><div class='ctx'> 				dequantize_intra(cf-&gt;coeffs);</div><div class='ctx'> </div><div class='ctx'> 			ifwht(cf-&gt;coeffs, cf-&gt;de_fwht,</div><div class='del'>-			      (stat &amp; PFRAME_BIT) ? 0 : 1);</div><div class='add'>+			      ((stat &amp; PFRAME_BIT) &amp;&amp; !is_intra) ? 0 : 1);</div><div class='ctx'> </div><div class='ctx'> 			copies = (stat &amp; DUPS_MASK) &gt;&gt; 1;</div><div class='ctx'> 			if (copies)</div><div class='ctx'> 				memcpy(copy, cf-&gt;de_fwht, sizeof(copy));</div><div class='del'>-			if (stat &amp; PFRAME_BIT)</div><div class='del'>-				add_deltas(cf-&gt;de_fwht, refp, coded_width);</div><div class='del'>-			fill_decoder_block(refp, cf-&gt;de_fwht, coded_width);</div><div class='add'>+			if ((stat &amp; PFRAME_BIT) &amp;&amp; !is_intra)</div><div class='add'>+				add_deltas(cf-&gt;de_fwht, refp,</div><div class='add'>+					   ref_stride, ref_step);</div><div class='add'>+			fill_decoder_block(dstp, cf-&gt;de_fwht, dst_stride,</div><div class='add'>+					   dst_step);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref,</div><div class='del'>-		       u32 hdr_flags, unsigned int components_num,</div><div class='del'>-		       unsigned int width, unsigned int height,</div><div class='del'>-		       unsigned int coded_width)</div><div class='add'>+bool fwht_decode_frame(struct fwht_cframe *cf, u32 hdr_flags,</div><div class='add'>+		       unsigned int components_num, unsigned int width,</div><div class='add'>+		       unsigned int height, const struct fwht_raw_frame *ref,</div><div class='add'>+		       unsigned int ref_stride, unsigned int ref_chroma_stride,</div><div class='add'>+		       struct fwht_raw_frame *dst, unsigned int dst_stride,</div><div class='add'>+		       unsigned int dst_chroma_stride)</div><div class='ctx'> {</div><div class='ctx'> 	const __be16 *rlco = cf-&gt;rlc_data;</div><div class='ctx'> 	const __be16 *end_of_rlco_buf = cf-&gt;rlc_data +</div><div class='ctx'> 			(cf-&gt;size / sizeof(*rlco)) - 1;</div><div class='ctx'> </div><div class='del'>-	if (!decode_plane(cf, &amp;rlco, ref-&gt;luma, height, width, coded_width,</div><div class='add'>+	if (!decode_plane(cf, &amp;rlco, height, width, ref-&gt;luma, ref_stride,</div><div class='add'>+			  ref-&gt;luma_alpha_step, dst-&gt;luma, dst_stride,</div><div class='add'>+			  dst-&gt;luma_alpha_step,</div><div class='ctx'> 			  hdr_flags &amp; FWHT_FL_LUMA_IS_UNCOMPRESSED,</div><div class='ctx'> 			  end_of_rlco_buf))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -901,27 +927,30 @@ bool fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref,</div><div class='ctx'> 	if (components_num &gt;= 3) {</div><div class='ctx'> 		u32 h = height;</div><div class='ctx'> 		u32 w = width;</div><div class='del'>-		u32 c = coded_width;</div><div class='ctx'> </div><div class='ctx'> 		if (!(hdr_flags &amp; FWHT_FL_CHROMA_FULL_HEIGHT))</div><div class='ctx'> 			h /= 2;</div><div class='del'>-		if (!(hdr_flags &amp; FWHT_FL_CHROMA_FULL_WIDTH)) {</div><div class='add'>+		if (!(hdr_flags &amp; FWHT_FL_CHROMA_FULL_WIDTH))</div><div class='ctx'> 			w /= 2;</div><div class='del'>-			c /= 2;</div><div class='del'>-		}</div><div class='del'>-		if (!decode_plane(cf, &amp;rlco, ref-&gt;cb, h, w, c,</div><div class='add'>+</div><div class='add'>+		if (!decode_plane(cf, &amp;rlco, h, w, ref-&gt;cb, ref_chroma_stride,</div><div class='add'>+				  ref-&gt;chroma_step, dst-&gt;cb, dst_chroma_stride,</div><div class='add'>+				  dst-&gt;chroma_step,</div><div class='ctx'> 				  hdr_flags &amp; FWHT_FL_CB_IS_UNCOMPRESSED,</div><div class='ctx'> 				  end_of_rlco_buf))</div><div class='ctx'> 			return false;</div><div class='del'>-		if (!decode_plane(cf, &amp;rlco, ref-&gt;cr, h, w, c,</div><div class='add'>+		if (!decode_plane(cf, &amp;rlco, h, w, ref-&gt;cr, ref_chroma_stride,</div><div class='add'>+				  ref-&gt;chroma_step, dst-&gt;cr, dst_chroma_stride,</div><div class='add'>+				  dst-&gt;chroma_step,</div><div class='ctx'> 				  hdr_flags &amp; FWHT_FL_CR_IS_UNCOMPRESSED,</div><div class='ctx'> 				  end_of_rlco_buf))</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (components_num == 4)</div><div class='del'>-		if (!decode_plane(cf, &amp;rlco, ref-&gt;alpha, height, width,</div><div class='del'>-				  coded_width,</div><div class='add'>+		if (!decode_plane(cf, &amp;rlco, height, width, ref-&gt;alpha, ref_stride,</div><div class='add'>+				  ref-&gt;luma_alpha_step, dst-&gt;alpha, dst_stride,</div><div class='add'>+				  dst-&gt;luma_alpha_step,</div><div class='ctx'> 				  hdr_flags &amp; FWHT_FL_ALPHA_IS_UNCOMPRESSED,</div><div class='ctx'> 				  end_of_rlco_buf))</div><div class='ctx'> 			return false;</div><div class='head'>diff --git a/drivers/media/platform/vicodec/codec-fwht.h b/drivers/media/platform/vicodec/codec-fwht.h<br/>index c410512d47c5..b6fec2b1cbca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-fwht.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-fwht.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-fwht.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vicodec/codec-fwht.h</a></div><div class='hunk'>@@ -124,6 +124,7 @@ struct fwht_raw_frame {</div><div class='ctx'> 	unsigned int luma_alpha_step;</div><div class='ctx'> 	unsigned int chroma_step;</div><div class='ctx'> 	unsigned int components_num;</div><div class='add'>+	u8 *buf;</div><div class='ctx'> 	u8 *luma, *cb, *cr, *alpha;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -140,9 +141,10 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm,</div><div class='ctx'> 		      bool is_intra, bool next_is_intra,</div><div class='ctx'> 		      unsigned int width, unsigned int height,</div><div class='ctx'> 		      unsigned int stride, unsigned int chroma_stride);</div><div class='del'>-bool fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref,</div><div class='del'>-		       u32 hdr_flags, unsigned int components_num,</div><div class='del'>-		       unsigned int width, unsigned int height,</div><div class='del'>-		       unsigned int coded_width);</div><div class='del'>-</div><div class='add'>+bool fwht_decode_frame(struct fwht_cframe *cf, u32 hdr_flags,</div><div class='add'>+		unsigned int components_num, unsigned int width,</div><div class='add'>+		unsigned int height, const struct fwht_raw_frame *ref,</div><div class='add'>+		unsigned int ref_stride, unsigned int ref_chroma_stride,</div><div class='add'>+		struct fwht_raw_frame *dst, unsigned int dst_stride,</div><div class='add'>+		unsigned int dst_chroma_stride);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/platform/vicodec/codec-v4l2-fwht.c b/drivers/media/platform/vicodec/codec-v4l2-fwht.c<br/>index 6573a471c5ca..01e7f09efc4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-v4l2-fwht.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-v4l2-fwht.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-v4l2-fwht.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vicodec/codec-v4l2-fwht.c</a></div><div class='hunk'>@@ -37,7 +37,19 @@ static const struct v4l2_fwht_pixfmt_info v4l2_fwht_pixfmts[] = {</div><div class='ctx'> 	{ V4L2_PIX_FMT_GREY,    1, 1, 1, 1, 0, 1, 1, 1, 1, FWHT_FL_PIXENC_RGB},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct v4l2_fwht_pixfmt_info *v4l2_fwht_default_fmt(u32 width_div,</div><div class='add'>+bool v4l2_fwht_validate_fmt(const struct v4l2_fwht_pixfmt_info *info,</div><div class='add'>+			    u32 width_div, u32 height_div, u32 components_num,</div><div class='add'>+			    u32 pixenc)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;width_div == width_div &amp;&amp;</div><div class='add'>+	    info-&gt;height_div == height_div &amp;&amp;</div><div class='add'>+	    (!pixenc || info-&gt;pixenc == pixenc) &amp;&amp;</div><div class='add'>+	    info-&gt;components_num == components_num)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_nth_fmt(u32 width_div,</div><div class='ctx'> 							  u32 height_div,</div><div class='ctx'> 							  u32 components_num,</div><div class='ctx'> 							  u32 pixenc,</div><div class='hunk'>@@ -46,10 +58,10 @@ const struct v4l2_fwht_pixfmt_info *v4l2_fwht_default_fmt(u32 width_div,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(v4l2_fwht_pixfmts); i++) {</div><div class='del'>-		if (v4l2_fwht_pixfmts[i].width_div == width_div &amp;&amp;</div><div class='del'>-		    v4l2_fwht_pixfmts[i].height_div == height_div &amp;&amp;</div><div class='del'>-		    (!pixenc || v4l2_fwht_pixfmts[i].pixenc == pixenc) &amp;&amp;</div><div class='del'>-		    v4l2_fwht_pixfmts[i].components_num == components_num) {</div><div class='add'>+		bool is_valid = v4l2_fwht_validate_fmt(&amp;v4l2_fwht_pixfmts[i],</div><div class='add'>+						       width_div, height_div,</div><div class='add'>+						       components_num, pixenc);</div><div class='add'>+		if (is_valid) {</div><div class='ctx'> 			if (start_idx == 0)</div><div class='ctx'> 				return v4l2_fwht_pixfmts + i;</div><div class='ctx'> 			start_idx--;</div><div class='hunk'>@@ -75,117 +87,141 @@ const struct v4l2_fwht_pixfmt_info *v4l2_fwht_get_pixfmt(u32 idx)</div><div class='ctx'> 	return v4l2_fwht_pixfmts + idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int v4l2_fwht_encode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)</div><div class='add'>+static int prepare_raw_frame(struct fwht_raw_frame *rf,</div><div class='add'>+			 const struct v4l2_fwht_pixfmt_info *info, u8 *buf,</div><div class='add'>+			 unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size = state-&gt;stride * state-&gt;coded_height;</div><div class='del'>-	unsigned int chroma_stride = state-&gt;stride;</div><div class='del'>-	const struct v4l2_fwht_pixfmt_info *info = state-&gt;info;</div><div class='del'>-	struct fwht_cframe_hdr *p_hdr;</div><div class='del'>-	struct fwht_cframe cf;</div><div class='del'>-	struct fwht_raw_frame rf;</div><div class='del'>-	u32 encoding;</div><div class='del'>-	u32 flags = 0;</div><div class='del'>-</div><div class='del'>-	if (!info)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	rf.luma = p_in;</div><div class='del'>-	rf.width_div = info-&gt;width_div;</div><div class='del'>-	rf.height_div = info-&gt;height_div;</div><div class='del'>-	rf.luma_alpha_step = info-&gt;luma_alpha_step;</div><div class='del'>-	rf.chroma_step = info-&gt;chroma_step;</div><div class='del'>-	rf.alpha = NULL;</div><div class='del'>-	rf.components_num = info-&gt;components_num;</div><div class='add'>+	rf-&gt;luma = buf;</div><div class='add'>+	rf-&gt;width_div = info-&gt;width_div;</div><div class='add'>+	rf-&gt;height_div = info-&gt;height_div;</div><div class='add'>+	rf-&gt;luma_alpha_step = info-&gt;luma_alpha_step;</div><div class='add'>+	rf-&gt;chroma_step = info-&gt;chroma_step;</div><div class='add'>+	rf-&gt;alpha = NULL;</div><div class='add'>+	rf-&gt;components_num = info-&gt;components_num;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The buffer is NULL if it is the reference</div><div class='add'>+	 * frame of an I-frame in the stateless decoder</div><div class='add'>+	 */</div><div class='add'>+	if (!buf) {</div><div class='add'>+		rf-&gt;luma = NULL;</div><div class='add'>+		rf-&gt;cb = NULL;</div><div class='add'>+		rf-&gt;cr = NULL;</div><div class='add'>+		rf-&gt;alpha = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	switch (info-&gt;id) {</div><div class='ctx'> 	case V4L2_PIX_FMT_GREY:</div><div class='del'>-		rf.cb = NULL;</div><div class='del'>-		rf.cr = NULL;</div><div class='add'>+		rf-&gt;cb = NULL;</div><div class='add'>+		rf-&gt;cr = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_YUV420:</div><div class='del'>-		rf.cb = rf.luma + size;</div><div class='del'>-		rf.cr = rf.cb + size / 4;</div><div class='del'>-		chroma_stride /= 2;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma + size;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + size / 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_YVU420:</div><div class='del'>-		rf.cr = rf.luma + size;</div><div class='del'>-		rf.cb = rf.cr + size / 4;</div><div class='del'>-		chroma_stride /= 2;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma + size;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + size / 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_YUV422P:</div><div class='del'>-		rf.cb = rf.luma + size;</div><div class='del'>-		rf.cr = rf.cb + size / 2;</div><div class='del'>-		chroma_stride /= 2;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma + size;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + size / 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_NV12:</div><div class='ctx'> 	case V4L2_PIX_FMT_NV16:</div><div class='ctx'> 	case V4L2_PIX_FMT_NV24:</div><div class='del'>-		rf.cb = rf.luma + size;</div><div class='del'>-		rf.cr = rf.cb + 1;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma + size;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_NV21:</div><div class='ctx'> 	case V4L2_PIX_FMT_NV61:</div><div class='ctx'> 	case V4L2_PIX_FMT_NV42:</div><div class='del'>-		rf.cr = rf.luma + size;</div><div class='del'>-		rf.cb = rf.cr + 1;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma + size;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_YUYV:</div><div class='del'>-		rf.cb = rf.luma + 1;</div><div class='del'>-		rf.cr = rf.cb + 2;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma + 1;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_YVYU:</div><div class='del'>-		rf.cr = rf.luma + 1;</div><div class='del'>-		rf.cb = rf.cr + 2;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma + 1;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_UYVY:</div><div class='del'>-		rf.cb = rf.luma;</div><div class='del'>-		rf.cr = rf.cb + 2;</div><div class='del'>-		rf.luma++;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + 2;</div><div class='add'>+		rf-&gt;luma++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_VYUY:</div><div class='del'>-		rf.cr = rf.luma;</div><div class='del'>-		rf.cb = rf.cr + 2;</div><div class='del'>-		rf.luma++;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + 2;</div><div class='add'>+		rf-&gt;luma++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_RGB24:</div><div class='ctx'> 	case V4L2_PIX_FMT_HSV24:</div><div class='del'>-		rf.cr = rf.luma;</div><div class='del'>-		rf.cb = rf.cr + 2;</div><div class='del'>-		rf.luma++;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + 2;</div><div class='add'>+		rf-&gt;luma++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_BGR24:</div><div class='del'>-		rf.cb = rf.luma;</div><div class='del'>-		rf.cr = rf.cb + 2;</div><div class='del'>-		rf.luma++;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + 2;</div><div class='add'>+		rf-&gt;luma++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_RGB32:</div><div class='ctx'> 	case V4L2_PIX_FMT_XRGB32:</div><div class='ctx'> 	case V4L2_PIX_FMT_HSV32:</div><div class='del'>-		rf.cr = rf.luma + 1;</div><div class='del'>-		rf.cb = rf.cr + 2;</div><div class='del'>-		rf.luma += 2;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma + 1;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + 2;</div><div class='add'>+		rf-&gt;luma += 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_BGR32:</div><div class='ctx'> 	case V4L2_PIX_FMT_XBGR32:</div><div class='del'>-		rf.cb = rf.luma;</div><div class='del'>-		rf.cr = rf.cb + 2;</div><div class='del'>-		rf.luma++;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + 2;</div><div class='add'>+		rf-&gt;luma++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_ARGB32:</div><div class='del'>-		rf.alpha = rf.luma;</div><div class='del'>-		rf.cr = rf.luma + 1;</div><div class='del'>-		rf.cb = rf.cr + 2;</div><div class='del'>-		rf.luma += 2;</div><div class='add'>+		rf-&gt;alpha = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cr = rf-&gt;luma + 1;</div><div class='add'>+		rf-&gt;cb = rf-&gt;cr + 2;</div><div class='add'>+		rf-&gt;luma += 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_ABGR32:</div><div class='del'>-		rf.cb = rf.luma;</div><div class='del'>-		rf.cr = rf.cb + 2;</div><div class='del'>-		rf.luma++;</div><div class='del'>-		rf.alpha = rf.cr + 1;</div><div class='add'>+		rf-&gt;cb = rf-&gt;luma;</div><div class='add'>+		rf-&gt;cr = rf-&gt;cb + 2;</div><div class='add'>+		rf-&gt;luma++;</div><div class='add'>+		rf-&gt;alpha = rf-&gt;cr + 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int v4l2_fwht_encode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)</div><div class='add'>+{</div><div class='add'>+	unsigned int size = state-&gt;stride * state-&gt;coded_height;</div><div class='add'>+	unsigned int chroma_stride = state-&gt;stride;</div><div class='add'>+	const struct v4l2_fwht_pixfmt_info *info = state-&gt;info;</div><div class='add'>+	struct fwht_cframe_hdr *p_hdr;</div><div class='add'>+	struct fwht_cframe cf;</div><div class='add'>+	struct fwht_raw_frame rf;</div><div class='add'>+	u32 encoding;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (!info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (prepare_raw_frame(&amp;rf, info, p_in, size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;planes_num == 3)</div><div class='add'>+		chroma_stride /= 2;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;id == V4L2_PIX_FMT_NV24 ||</div><div class='add'>+	    info-&gt;id == V4L2_PIX_FMT_NV42)</div><div class='add'>+		chroma_stride *= 2;</div><div class='ctx'> </div><div class='ctx'> 	cf.i_frame_qp = state-&gt;i_frame_qp;</div><div class='ctx'> 	cf.p_frame_qp = state-&gt;p_frame_qp;</div><div class='hunk'>@@ -235,14 +271,17 @@ int v4l2_fwht_encode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)</div><div class='ctx'> </div><div class='ctx'> int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i, j, k;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	struct fwht_cframe cf;</div><div class='del'>-	u8 *p, *ref_p;</div><div class='ctx'> 	unsigned int components_num = 3;</div><div class='ctx'> 	unsigned int version;</div><div class='ctx'> 	const struct v4l2_fwht_pixfmt_info *info;</div><div class='ctx'> 	unsigned int hdr_width_div, hdr_height_div;</div><div class='add'>+	struct fwht_raw_frame dst_rf;</div><div class='add'>+	unsigned int dst_chroma_stride = state-&gt;stride;</div><div class='add'>+	unsigned int ref_chroma_stride = state-&gt;ref_stride;</div><div class='add'>+	unsigned int dst_size = state-&gt;stride * state-&gt;coded_height;</div><div class='add'>+	unsigned int ref_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!state-&gt;info)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -290,241 +329,29 @@ int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)</div><div class='ctx'> 	    hdr_height_div != info-&gt;height_div)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!fwht_decode_frame(&amp;cf, &amp;state-&gt;ref_frame, flags, components_num,</div><div class='del'>-			       state-&gt;visible_width, state-&gt;visible_height,</div><div class='del'>-			       state-&gt;coded_width))</div><div class='add'>+	if (prepare_raw_frame(&amp;dst_rf, info, p_out, dst_size))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (info-&gt;planes_num == 3) {</div><div class='add'>+		dst_chroma_stride /= 2;</div><div class='add'>+		ref_chroma_stride /= 2;</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;id == V4L2_PIX_FMT_NV24 ||</div><div class='add'>+	    info-&gt;id == V4L2_PIX_FMT_NV42) {</div><div class='add'>+		dst_chroma_stride *= 2;</div><div class='add'>+		ref_chroma_stride *= 2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TODO - handle the case where the compressed stream encodes a</div><div class='del'>-	 * different format than the requested decoded format.</div><div class='del'>-	 */</div><div class='del'>-	switch (state-&gt;info-&gt;id) {</div><div class='del'>-	case V4L2_PIX_FMT_GREY:</div><div class='del'>-		ref_p = state-&gt;ref_frame.luma;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width);</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-			ref_p += state-&gt;coded_width;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_YUV420:</div><div class='del'>-	case V4L2_PIX_FMT_YUV422P:</div><div class='del'>-		ref_p = state-&gt;ref_frame.luma;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width);</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-			ref_p += state-&gt;coded_width;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		ref_p = state-&gt;ref_frame.cb;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height / 2; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width / 2);</div><div class='del'>-			p_out += state-&gt;stride / 2;</div><div class='del'>-			ref_p += state-&gt;coded_width / 2;</div><div class='del'>-		}</div><div class='del'>-		ref_p = state-&gt;ref_frame.cr;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height / 2; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width / 2);</div><div class='del'>-			p_out += state-&gt;stride / 2;</div><div class='del'>-			ref_p += state-&gt;coded_width / 2;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_YVU420:</div><div class='del'>-		ref_p = state-&gt;ref_frame.luma;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width);</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-			ref_p += state-&gt;coded_width;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ref_p = state-&gt;ref_frame.cr;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height / 2; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width / 2);</div><div class='del'>-			p_out += state-&gt;stride / 2;</div><div class='del'>-			ref_p += state-&gt;coded_width / 2;</div><div class='del'>-		}</div><div class='del'>-		ref_p = state-&gt;ref_frame.cb;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height / 2; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width / 2);</div><div class='del'>-			p_out += state-&gt;stride / 2;</div><div class='del'>-			ref_p += state-&gt;coded_width / 2;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_NV12:</div><div class='del'>-	case V4L2_PIX_FMT_NV16:</div><div class='del'>-	case V4L2_PIX_FMT_NV24:</div><div class='del'>-		ref_p = state-&gt;ref_frame.luma;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width);</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-			ref_p += state-&gt;coded_width;</div><div class='del'>-		}</div><div class='add'>+	ref_size = state-&gt;ref_stride * state-&gt;coded_height;</div><div class='ctx'> </div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height / 2; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width / 2; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_NV21:</div><div class='del'>-	case V4L2_PIX_FMT_NV61:</div><div class='del'>-	case V4L2_PIX_FMT_NV42:</div><div class='del'>-		ref_p = state-&gt;ref_frame.luma;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++)  {</div><div class='del'>-			memcpy(p_out, ref_p, state-&gt;visible_width);</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-			ref_p += state-&gt;coded_width;</div><div class='del'>-		}</div><div class='add'>+	if (prepare_raw_frame(&amp;state-&gt;ref_frame, info, state-&gt;ref_frame.buf,</div><div class='add'>+			      ref_size))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height / 2; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width / 2; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_YUYV:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width / 2; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k / 2];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k + 1];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k / 2];</div><div class='del'>-				k += 2;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_YVYU:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width / 2; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k / 2];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k + 1];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k / 2];</div><div class='del'>-				k += 2;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_UYVY:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width / 2; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k / 2];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k / 2];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k + 1];</div><div class='del'>-				k += 2;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_VYUY:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width / 2; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k / 2];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k / 2];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k + 1];</div><div class='del'>-				k += 2;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_RGB24:</div><div class='del'>-	case V4L2_PIX_FMT_HSV24:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_BGR24:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_RGB32:</div><div class='del'>-	case V4L2_PIX_FMT_XRGB32:</div><div class='del'>-	case V4L2_PIX_FMT_HSV32:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width; j++) {</div><div class='del'>-				*p++ = 0;</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_BGR32:</div><div class='del'>-	case V4L2_PIX_FMT_XBGR32:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				*p++ = 0;</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_ARGB32:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.alpha[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_ABGR32:</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = 0; i &lt; state-&gt;coded_height; i++) {</div><div class='del'>-			for (j = 0, p = p_out; j &lt; state-&gt;coded_width; j++) {</div><div class='del'>-				*p++ = state-&gt;ref_frame.cb[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.luma[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.cr[k];</div><div class='del'>-				*p++ = state-&gt;ref_frame.alpha[k];</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-			p_out += state-&gt;stride;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	if (!fwht_decode_frame(&amp;cf, flags, components_num,</div><div class='add'>+			state-&gt;visible_width, state-&gt;visible_height,</div><div class='add'>+			&amp;state-&gt;ref_frame, state-&gt;ref_stride, ref_chroma_stride,</div><div class='add'>+			&amp;dst_rf, state-&gt;stride, dst_chroma_stride))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/platform/vicodec/codec-v4l2-fwht.h b/drivers/media/platform/vicodec/codec-v4l2-fwht.h<br/>index aa6fa90a48be..1a0d2a9f931a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-v4l2-fwht.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/codec-v4l2-fwht.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/codec-v4l2-fwht.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vicodec/codec-v4l2-fwht.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@ struct v4l2_fwht_state {</div><div class='ctx'> 	unsigned int coded_width;</div><div class='ctx'> 	unsigned int coded_height;</div><div class='ctx'> 	unsigned int stride;</div><div class='add'>+	unsigned int ref_stride;</div><div class='ctx'> 	unsigned int gop_size;</div><div class='ctx'> 	unsigned int gop_cnt;</div><div class='ctx'> 	u16 i_frame_qp;</div><div class='hunk'>@@ -43,11 +44,15 @@ struct v4l2_fwht_state {</div><div class='ctx'> 	struct fwht_raw_frame ref_frame;</div><div class='ctx'> 	struct fwht_cframe_hdr header;</div><div class='ctx'> 	u8 *compressed_frame;</div><div class='add'>+	u64 ref_frame_ts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_pixfmt(u32 pixelformat);</div><div class='ctx'> const struct v4l2_fwht_pixfmt_info *v4l2_fwht_get_pixfmt(u32 idx);</div><div class='del'>-const struct v4l2_fwht_pixfmt_info *v4l2_fwht_default_fmt(u32 width_div,</div><div class='add'>+bool v4l2_fwht_validate_fmt(const struct v4l2_fwht_pixfmt_info *info,</div><div class='add'>+			    u32 width_div, u32 height_div, u32 components_num,</div><div class='add'>+			    u32 pixenc);</div><div class='add'>+const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_nth_fmt(u32 width_div,</div><div class='ctx'> 							  u32 height_div,</div><div class='ctx'> 							  u32 components_num,</div><div class='ctx'> 							  u32 pixenc,</div><div class='head'>diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c<br/>index d7636fe9e174..bd01a9206aa6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/vicodec-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vicodec/vicodec-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vicodec/vicodec-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vicodec/vicodec-core.c</a></div><div class='hunk'>@@ -64,6 +64,10 @@ static const struct v4l2_fwht_pixfmt_info pixfmt_fwht = {</div><div class='ctx'> 	V4L2_PIX_FMT_FWHT, 0, 3, 1, 1, 1, 1, 1, 0, 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct v4l2_fwht_pixfmt_info pixfmt_stateless_fwht = {</div><div class='add'>+	V4L2_PIX_FMT_FWHT_STATELESS, 0, 3, 1, 1, 1, 1, 1, 0, 1</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void vicodec_dev_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -89,27 +93,29 @@ enum {</div><div class='ctx'> 	V4L2_M2M_DST = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct vicodec_dev_instance {</div><div class='add'>+	struct video_device     vfd;</div><div class='add'>+	struct mutex            mutex;</div><div class='add'>+	spinlock_t              lock;</div><div class='add'>+	struct v4l2_m2m_dev     *m2m_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct vicodec_dev {</div><div class='ctx'> 	struct v4l2_device	v4l2_dev;</div><div class='del'>-	struct video_device	enc_vfd;</div><div class='del'>-	struct video_device	dec_vfd;</div><div class='add'>+	struct vicodec_dev_instance stateful_enc;</div><div class='add'>+	struct vicodec_dev_instance stateful_dec;</div><div class='add'>+	struct vicodec_dev_instance stateless_dec;</div><div class='ctx'> #ifdef CONFIG_MEDIA_CONTROLLER</div><div class='ctx'> 	struct media_device	mdev;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	struct mutex		enc_mutex;</div><div class='del'>-	struct mutex		dec_mutex;</div><div class='del'>-	spinlock_t		enc_lock;</div><div class='del'>-	spinlock_t		dec_lock;</div><div class='del'>-</div><div class='del'>-	struct v4l2_m2m_dev	*enc_dev;</div><div class='del'>-	struct v4l2_m2m_dev	*dec_dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vicodec_ctx {</div><div class='ctx'> 	struct v4l2_fh		fh;</div><div class='ctx'> 	struct vicodec_dev	*dev;</div><div class='ctx'> 	bool			is_enc;</div><div class='add'>+	bool			is_stateless;</div><div class='ctx'> 	spinlock_t		*lock;</div><div class='ctx'> </div><div class='ctx'> 	struct v4l2_ctrl_handler hdl;</div><div class='hunk'>@@ -148,27 +154,149 @@ static struct vicodec_q_data *get_q_data(struct vicodec_ctx *ctx,</div><div class='ctx'> 	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:</div><div class='ctx'> 		return &amp;ctx-&gt;q_data[V4L2_M2M_DST];</div><div class='ctx'> 	default:</div><div class='del'>-		WARN_ON(1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void copy_cap_to_ref(const u8 *cap, const struct v4l2_fwht_pixfmt_info *info,</div><div class='add'>+		struct v4l2_fwht_state *state)</div><div class='add'>+{</div><div class='add'>+	int plane_idx;</div><div class='add'>+	u8 *p_ref = state-&gt;ref_frame.buf;</div><div class='add'>+	unsigned int cap_stride = state-&gt;stride;</div><div class='add'>+	unsigned int ref_stride = state-&gt;ref_stride;</div><div class='add'>+</div><div class='add'>+	for (plane_idx = 0; plane_idx &lt; info-&gt;planes_num; plane_idx++) {</div><div class='add'>+		int i;</div><div class='add'>+		unsigned int h_div = (plane_idx == 1 || plane_idx == 2) ?</div><div class='add'>+			info-&gt;height_div : 1;</div><div class='add'>+		const u8 *row_cap = cap;</div><div class='add'>+		u8 *row_ref = p_ref;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;planes_num == 3 &amp;&amp; plane_idx == 1) {</div><div class='add'>+			cap_stride /= 2;</div><div class='add'>+			ref_stride /= 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (plane_idx == 1 &amp;&amp;</div><div class='add'>+		    (info-&gt;id == V4L2_PIX_FMT_NV24 ||</div><div class='add'>+		     info-&gt;id == V4L2_PIX_FMT_NV42)) {</div><div class='add'>+			cap_stride *= 2;</div><div class='add'>+			ref_stride *= 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; state-&gt;visible_height / h_div; i++) {</div><div class='add'>+			memcpy(row_ref, row_cap, ref_stride);</div><div class='add'>+			row_ref += ref_stride;</div><div class='add'>+			row_cap += cap_stride;</div><div class='add'>+		}</div><div class='add'>+		cap += cap_stride * (state-&gt;coded_height / h_div);</div><div class='add'>+		p_ref += ref_stride * (state-&gt;coded_height / h_div);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool validate_by_version(unsigned int flags, unsigned int version)</div><div class='add'>+{</div><div class='add'>+	if (!version || version &gt; FWHT_VERSION)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (version &gt;= 2) {</div><div class='add'>+		unsigned int components_num = 1 +</div><div class='add'>+			((flags &amp; FWHT_FL_COMPONENTS_NUM_MSK) &gt;&gt;</div><div class='add'>+			 FWHT_FL_COMPONENTS_NUM_OFFSET);</div><div class='add'>+		unsigned int pixenc = flags &amp; FWHT_FL_PIXENC_MSK;</div><div class='add'>+</div><div class='add'>+		if (components_num == 0 || components_num &gt; 4 || !pixenc)</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 validate_stateless_params_flags(const struct v4l2_ctrl_fwht_params *params,</div><div class='add'>+					    const struct v4l2_fwht_pixfmt_info *cur_info)</div><div class='add'>+{</div><div class='add'>+	unsigned int width_div =</div><div class='add'>+		(params-&gt;flags &amp; FWHT_FL_CHROMA_FULL_WIDTH) ? 1 : 2;</div><div class='add'>+	unsigned int height_div =</div><div class='add'>+		(params-&gt;flags &amp; FWHT_FL_CHROMA_FULL_HEIGHT) ? 1 : 2;</div><div class='add'>+	unsigned int components_num = 3;</div><div class='add'>+	unsigned int pixenc = 0;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;version &lt; 3)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	components_num = 1 + ((params-&gt;flags &amp; FWHT_FL_COMPONENTS_NUM_MSK) &gt;&gt;</div><div class='add'>+			      FWHT_FL_COMPONENTS_NUM_OFFSET);</div><div class='add'>+	pixenc = (params-&gt;flags &amp; FWHT_FL_PIXENC_MSK);</div><div class='add'>+	if (v4l2_fwht_validate_fmt(cur_info, width_div, height_div,</div><div class='add'>+				    components_num, pixenc))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void update_state_from_header(struct vicodec_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct fwht_cframe_hdr *p_hdr = &amp;ctx-&gt;state.header;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;state.visible_width = ntohl(p_hdr-&gt;width);</div><div class='add'>+	ctx-&gt;state.visible_height = ntohl(p_hdr-&gt;height);</div><div class='add'>+	ctx-&gt;state.colorspace = ntohl(p_hdr-&gt;colorspace);</div><div class='add'>+	ctx-&gt;state.xfer_func = ntohl(p_hdr-&gt;xfer_func);</div><div class='add'>+	ctx-&gt;state.ycbcr_enc = ntohl(p_hdr-&gt;ycbcr_enc);</div><div class='add'>+	ctx-&gt;state.quantization = ntohl(p_hdr-&gt;quantization);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int device_process(struct vicodec_ctx *ctx,</div><div class='ctx'> 			  struct vb2_v4l2_buffer *src_vb,</div><div class='ctx'> 			  struct vb2_v4l2_buffer *dst_vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct vicodec_dev *dev = ctx-&gt;dev;</div><div class='del'>-	struct vicodec_q_data *q_dst;</div><div class='ctx'> 	struct v4l2_fwht_state *state = &amp;ctx-&gt;state;</div><div class='ctx'> 	u8 *p_src, *p_dst;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	q_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='del'>-	if (ctx-&gt;is_enc)</div><div class='add'>+	if (ctx-&gt;is_enc || ctx-&gt;is_stateless)</div><div class='ctx'> 		p_src = vb2_plane_vaddr(&amp;src_vb-&gt;vb2_buf, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		p_src = state-&gt;compressed_frame;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;is_stateless) {</div><div class='add'>+		struct media_request *src_req = src_vb-&gt;vb2_buf.req_obj.req;</div><div class='add'>+</div><div class='add'>+		ret = v4l2_ctrl_request_setup(src_req, &amp;ctx-&gt;hdl);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		update_state_from_header(ctx);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;state.header.size =</div><div class='add'>+			htonl(vb2_get_plane_payload(&amp;src_vb-&gt;vb2_buf, 0));</div><div class='add'>+		/*</div><div class='add'>+		 * set the reference buffer from the reference timestamp</div><div class='add'>+		 * only if this is a P-frame</div><div class='add'>+		 */</div><div class='add'>+		if (!(ntohl(ctx-&gt;state.header.flags) &amp; FWHT_FL_I_FRAME)) {</div><div class='add'>+			struct vb2_buffer *ref_vb2_buf;</div><div class='add'>+			int ref_buf_idx;</div><div class='add'>+			struct vb2_queue *vq_cap =</div><div class='add'>+				v4l2_m2m_get_vq(ctx-&gt;fh.m2m_ctx,</div><div class='add'>+						V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='add'>+</div><div class='add'>+			ref_buf_idx = vb2_find_timestamp(vq_cap,</div><div class='add'>+							 ctx-&gt;state.ref_frame_ts, 0);</div><div class='add'>+			if (ref_buf_idx &lt; 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			ref_vb2_buf = vq_cap-&gt;bufs[ref_buf_idx];</div><div class='add'>+			if (ref_vb2_buf-&gt;state == VB2_BUF_STATE_ERROR)</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+			ctx-&gt;state.ref_frame.buf =</div><div class='add'>+				vb2_plane_vaddr(ref_vb2_buf, 0);</div><div class='add'>+		} else {</div><div class='add'>+			ctx-&gt;state.ref_frame.buf = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	p_dst = vb2_plane_vaddr(&amp;dst_vb-&gt;vb2_buf, 0);</div><div class='ctx'> 	if (!p_src || !p_dst) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev,</div><div class='hunk'>@@ -178,30 +306,31 @@ static int device_process(struct vicodec_ctx *ctx,</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;is_enc) {</div><div class='ctx'> 		struct vicodec_q_data *q_src;</div><div class='add'>+		int comp_sz_or_errcode;</div><div class='ctx'> </div><div class='ctx'> 		q_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);</div><div class='ctx'> 		state-&gt;info = q_src-&gt;info;</div><div class='del'>-		ret = v4l2_fwht_encode(state, p_src, p_dst);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		vb2_set_plane_payload(&amp;dst_vb-&gt;vb2_buf, 0, ret);</div><div class='add'>+		comp_sz_or_errcode = v4l2_fwht_encode(state, p_src, p_dst);</div><div class='add'>+		if (comp_sz_or_errcode &lt; 0)</div><div class='add'>+			return comp_sz_or_errcode;</div><div class='add'>+		vb2_set_plane_payload(&amp;dst_vb-&gt;vb2_buf, 0, comp_sz_or_errcode);</div><div class='ctx'> 	} else {</div><div class='add'>+		struct vicodec_q_data *q_dst;</div><div class='ctx'> 		unsigned int comp_frame_size = ntohl(ctx-&gt;state.header.size);</div><div class='ctx'> </div><div class='add'>+		q_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='ctx'> 		if (comp_frame_size &gt; ctx-&gt;comp_max_size)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		state-&gt;info = q_dst-&gt;info;</div><div class='ctx'> 		ret = v4l2_fwht_decode(state, p_src, p_dst);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='add'>+		if (!ctx-&gt;is_stateless)</div><div class='add'>+			copy_cap_to_ref(p_dst, ctx-&gt;state.info, &amp;ctx-&gt;state);</div><div class='add'>+</div><div class='ctx'> 		vb2_set_plane_payload(&amp;dst_vb-&gt;vb2_buf, 0, q_dst-&gt;sizeimage);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	dst_vb-&gt;sequence = q_dst-&gt;sequence++;</div><div class='del'>-	dst_vb-&gt;flags &amp;= ~V4L2_BUF_FLAG_LAST;</div><div class='del'>-	v4l2_m2m_buf_copy_metadata(src_vb, dst_vb, !ctx-&gt;is_enc);</div><div class='del'>-</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='hunk'>@@ -274,16 +403,26 @@ static void device_run(void *priv)</div><div class='ctx'> 	struct vicodec_ctx *ctx = priv;</div><div class='ctx'> 	struct vicodec_dev *dev = ctx-&gt;dev;</div><div class='ctx'> 	struct vb2_v4l2_buffer *src_buf, *dst_buf;</div><div class='del'>-	struct vicodec_q_data *q_src;</div><div class='add'>+	struct vicodec_q_data *q_src, *q_dst;</div><div class='ctx'> 	u32 state;</div><div class='add'>+	struct media_request *src_req;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	src_buf = v4l2_m2m_next_src_buf(ctx-&gt;fh.m2m_ctx);</div><div class='ctx'> 	dst_buf = v4l2_m2m_dst_buf_remove(ctx-&gt;fh.m2m_ctx);</div><div class='add'>+	src_req = src_buf-&gt;vb2_buf.req_obj.req;</div><div class='add'>+</div><div class='ctx'> 	q_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);</div><div class='add'>+	q_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='ctx'> </div><div class='ctx'> 	state = VB2_BUF_STATE_DONE;</div><div class='ctx'> 	if (device_process(ctx, src_buf, dst_buf))</div><div class='ctx'> 		state = VB2_BUF_STATE_ERROR;</div><div class='add'>+	else</div><div class='add'>+		dst_buf-&gt;sequence = q_dst-&gt;sequence++;</div><div class='add'>+	dst_buf-&gt;flags &amp;= ~V4L2_BUF_FLAG_LAST;</div><div class='add'>+	v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, !ctx-&gt;is_enc);</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;last_dst_buf = dst_buf;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(ctx-&gt;lock);</div><div class='hunk'>@@ -291,7 +430,7 @@ static void device_run(void *priv)</div><div class='ctx'> 		dst_buf-&gt;flags |= V4L2_BUF_FLAG_LAST;</div><div class='ctx'> 		v4l2_event_queue_fh(&amp;ctx-&gt;fh, &amp;eos_event);</div><div class='ctx'> 	}</div><div class='del'>-	if (ctx-&gt;is_enc) {</div><div class='add'>+	if (ctx-&gt;is_enc || ctx-&gt;is_stateless) {</div><div class='ctx'> 		src_buf-&gt;sequence = q_src-&gt;sequence++;</div><div class='ctx'> 		src_buf = v4l2_m2m_src_buf_remove(ctx-&gt;fh.m2m_ctx);</div><div class='ctx'> 		v4l2_m2m_buf_done(src_buf, state);</div><div class='hunk'>@@ -303,6 +442,9 @@ static void device_run(void *priv)</div><div class='ctx'> 		ctx-&gt;comp_has_next_frame = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	v4l2_m2m_buf_done(dst_buf, state);</div><div class='add'>+	if (ctx-&gt;is_stateless &amp;&amp; src_req)</div><div class='add'>+		v4l2_ctrl_request_complete(src_req, &amp;ctx-&gt;hdl);</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;comp_size = 0;</div><div class='ctx'> 	ctx-&gt;header_size = 0;</div><div class='ctx'> 	ctx-&gt;comp_magic_cnt = 0;</div><div class='hunk'>@@ -310,9 +452,12 @@ static void device_run(void *priv)</div><div class='ctx'> 	spin_unlock(ctx-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;is_enc)</div><div class='del'>-		v4l2_m2m_job_finish(dev-&gt;enc_dev, ctx-&gt;fh.m2m_ctx);</div><div class='add'>+		v4l2_m2m_job_finish(dev-&gt;stateful_enc.m2m_dev, ctx-&gt;fh.m2m_ctx);</div><div class='add'>+	else if (ctx-&gt;is_stateless)</div><div class='add'>+		v4l2_m2m_job_finish(dev-&gt;stateless_dec.m2m_dev,</div><div class='add'>+				    ctx-&gt;fh.m2m_ctx);</div><div class='ctx'> 	else</div><div class='del'>-		v4l2_m2m_job_finish(dev-&gt;dec_dev, ctx-&gt;fh.m2m_ctx);</div><div class='add'>+		v4l2_m2m_job_finish(dev-&gt;stateful_dec.m2m_dev, ctx-&gt;fh.m2m_ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void job_remove_src_buf(struct vicodec_ctx *ctx, u32 state)</div><div class='hunk'>@@ -344,7 +489,7 @@ info_from_header(const struct fwht_cframe_hdr *p_hdr)</div><div class='ctx'> 				FWHT_FL_COMPONENTS_NUM_OFFSET);</div><div class='ctx'> 		pixenc = (flags &amp; FWHT_FL_PIXENC_MSK);</div><div class='ctx'> 	}</div><div class='del'>-	return v4l2_fwht_default_fmt(width_div, height_div,</div><div class='add'>+	return v4l2_fwht_find_nth_fmt(width_div, height_div,</div><div class='ctx'> 				     components_num, pixenc, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -356,21 +501,11 @@ static bool is_header_valid(const struct fwht_cframe_hdr *p_hdr)</div><div class='ctx'> 	unsigned int version = ntohl(p_hdr-&gt;version);</div><div class='ctx'> 	unsigned int flags = ntohl(p_hdr-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (!version || version &gt; FWHT_VERSION)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	if (w &lt; MIN_WIDTH || w &gt; MAX_WIDTH || h &lt; MIN_HEIGHT || h &gt; MAX_HEIGHT)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (version &gt;= 2) {</div><div class='del'>-		unsigned int components_num = 1 +</div><div class='del'>-			((flags &amp; FWHT_FL_COMPONENTS_NUM_MSK) &gt;&gt;</div><div class='del'>-			FWHT_FL_COMPONENTS_NUM_OFFSET);</div><div class='del'>-		unsigned int pixenc = flags &amp; FWHT_FL_PIXENC_MSK;</div><div class='del'>-</div><div class='del'>-		if (components_num == 0 || components_num &gt; 4 || !pixenc)</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='add'>+	if (!validate_by_version(flags, version))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	info = info_from_header(p_hdr);</div><div class='ctx'> 	if (!info)</div><div class='hunk'>@@ -388,6 +523,12 @@ static void update_capture_data_from_header(struct vicodec_ctx *ctx)</div><div class='ctx'> 	unsigned int hdr_width_div = (flags &amp; FWHT_FL_CHROMA_FULL_WIDTH) ? 1 : 2;</div><div class='ctx'> 	unsigned int hdr_height_div = (flags &amp; FWHT_FL_CHROMA_FULL_HEIGHT) ? 1 : 2;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * This function should not be used by a stateless codec since</div><div class='add'>+	 * it changes values in q_data that are not request specific</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(ctx-&gt;is_stateless);</div><div class='add'>+</div><div class='ctx'> 	q_dst-&gt;info = info;</div><div class='ctx'> 	q_dst-&gt;visible_width = ntohl(p_hdr-&gt;width);</div><div class='ctx'> 	q_dst-&gt;visible_height = ntohl(p_hdr-&gt;height);</div><div class='hunk'>@@ -440,7 +581,7 @@ static int job_ready(void *priv)</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;source_changed)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (ctx-&gt;is_enc || ctx-&gt;comp_has_frame)</div><div class='add'>+	if (ctx-&gt;is_stateless || ctx-&gt;is_enc || ctx-&gt;comp_has_frame)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> restart:</div><div class='hunk'>@@ -551,8 +692,8 @@ static const struct v4l2_fwht_pixfmt_info *find_fmt(u32 fmt)</div><div class='ctx'> static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> 			   struct v4l2_capability *cap)</div><div class='ctx'> {</div><div class='del'>-	strncpy(cap-&gt;driver, VICODEC_NAME, sizeof(cap-&gt;driver) - 1);</div><div class='del'>-	strncpy(cap-&gt;card, VICODEC_NAME, sizeof(cap-&gt;card) - 1);</div><div class='add'>+	strscpy(cap-&gt;driver, VICODEC_NAME, sizeof(cap-&gt;driver));</div><div class='add'>+	strscpy(cap-&gt;card, VICODEC_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info),</div><div class='ctx'> 			"platform:%s", VICODEC_NAME);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -575,7 +716,7 @@ static int enum_fmt(struct v4l2_fmtdesc *f, struct vicodec_ctx *ctx,</div><div class='ctx'> 		if (!info || ctx-&gt;is_enc)</div><div class='ctx'> 			info = v4l2_fwht_get_pixfmt(f-&gt;index);</div><div class='ctx'> 		else</div><div class='del'>-			info = v4l2_fwht_default_fmt(info-&gt;width_div,</div><div class='add'>+			info = v4l2_fwht_find_nth_fmt(info-&gt;width_div,</div><div class='ctx'> 						     info-&gt;height_div,</div><div class='ctx'> 						     info-&gt;components_num,</div><div class='ctx'> 						     info-&gt;pixenc,</div><div class='hunk'>@@ -586,7 +727,8 @@ static int enum_fmt(struct v4l2_fmtdesc *f, struct vicodec_ctx *ctx,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (f-&gt;index)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		f-&gt;pixelformat = V4L2_PIX_FMT_FWHT;</div><div class='add'>+		f-&gt;pixelformat = ctx-&gt;is_stateless ?</div><div class='add'>+			V4L2_PIX_FMT_FWHT_STATELESS : V4L2_PIX_FMT_FWHT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -688,13 +830,15 @@ static int vidioc_try_fmt(struct vicodec_ctx *ctx, struct v4l2_format *f)</div><div class='ctx'> 	struct v4l2_pix_format_mplane *pix_mp;</div><div class='ctx'> 	struct v4l2_pix_format *pix;</div><div class='ctx'> 	struct v4l2_plane_pix_format *plane;</div><div class='del'>-	const struct v4l2_fwht_pixfmt_info *info = &amp;pixfmt_fwht;</div><div class='add'>+	const struct v4l2_fwht_pixfmt_info *info = ctx-&gt;is_stateless ?</div><div class='add'>+		&amp;pixfmt_stateless_fwht : &amp;pixfmt_fwht;</div><div class='ctx'> </div><div class='ctx'> 	switch (f-&gt;type) {</div><div class='ctx'> 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='ctx'> 	case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='ctx'> 		pix = &amp;f-&gt;fmt.pix;</div><div class='del'>-		if (pix-&gt;pixelformat != V4L2_PIX_FMT_FWHT)</div><div class='add'>+		if (pix-&gt;pixelformat != V4L2_PIX_FMT_FWHT &amp;&amp;</div><div class='add'>+		    pix-&gt;pixelformat != V4L2_PIX_FMT_FWHT_STATELESS)</div><div class='ctx'> 			info = find_fmt(pix-&gt;pixelformat);</div><div class='ctx'> </div><div class='ctx'> 		pix-&gt;width = clamp(pix-&gt;width, MIN_WIDTH, MAX_WIDTH);</div><div class='hunk'>@@ -715,7 +859,8 @@ static int vidioc_try_fmt(struct vicodec_ctx *ctx, struct v4l2_format *f)</div><div class='ctx'> 	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:</div><div class='ctx'> 		pix_mp = &amp;f-&gt;fmt.pix_mp;</div><div class='ctx'> 		plane = pix_mp-&gt;plane_fmt;</div><div class='del'>-		if (pix_mp-&gt;pixelformat != V4L2_PIX_FMT_FWHT)</div><div class='add'>+		if (pix_mp-&gt;pixelformat != V4L2_PIX_FMT_FWHT &amp;&amp;</div><div class='add'>+		    pix_mp-&gt;pixelformat != V4L2_PIX_FMT_FWHT_STATELESS)</div><div class='ctx'> 			info = find_fmt(pix_mp-&gt;pixelformat);</div><div class='ctx'> 		pix_mp-&gt;num_planes = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -792,8 +937,12 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,</div><div class='ctx'> 		if (multiplanar)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		pix = &amp;f-&gt;fmt.pix;</div><div class='del'>-		pix-&gt;pixelformat = !ctx-&gt;is_enc ? V4L2_PIX_FMT_FWHT :</div><div class='del'>-				   find_fmt(pix-&gt;pixelformat)-&gt;id;</div><div class='add'>+		if (ctx-&gt;is_enc)</div><div class='add'>+			pix-&gt;pixelformat = find_fmt(pix-&gt;pixelformat)-&gt;id;</div><div class='add'>+		else if (ctx-&gt;is_stateless)</div><div class='add'>+			pix-&gt;pixelformat = V4L2_PIX_FMT_FWHT_STATELESS;</div><div class='add'>+		else</div><div class='add'>+			pix-&gt;pixelformat = V4L2_PIX_FMT_FWHT;</div><div class='ctx'> 		if (!pix-&gt;colorspace)</div><div class='ctx'> 			pix-&gt;colorspace = V4L2_COLORSPACE_REC709;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -801,8 +950,12 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,</div><div class='ctx'> 		if (!multiplanar)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		pix_mp = &amp;f-&gt;fmt.pix_mp;</div><div class='del'>-		pix_mp-&gt;pixelformat = !ctx-&gt;is_enc ? V4L2_PIX_FMT_FWHT :</div><div class='del'>-				      find_fmt(pix_mp-&gt;pixelformat)-&gt;id;</div><div class='add'>+		if (ctx-&gt;is_enc)</div><div class='add'>+			pix_mp-&gt;pixelformat = find_fmt(pix_mp-&gt;pixelformat)-&gt;id;</div><div class='add'>+		else if (ctx-&gt;is_stateless)</div><div class='add'>+			pix_mp-&gt;pixelformat = V4L2_PIX_FMT_FWHT_STATELESS;</div><div class='add'>+		else</div><div class='add'>+			pix_mp-&gt;pixelformat = V4L2_PIX_FMT_FWHT;</div><div class='ctx'> 		if (!pix_mp-&gt;colorspace)</div><div class='ctx'> 			pix_mp-&gt;colorspace = V4L2_COLORSPACE_REC709;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -845,6 +998,8 @@ static int vidioc_s_fmt(struct vicodec_ctx *ctx, struct v4l2_format *f)</div><div class='ctx'> </div><div class='ctx'> 		if (pix-&gt;pixelformat == V4L2_PIX_FMT_FWHT)</div><div class='ctx'> 			q_data-&gt;info = &amp;pixfmt_fwht;</div><div class='add'>+		else if (pix-&gt;pixelformat == V4L2_PIX_FMT_FWHT_STATELESS)</div><div class='add'>+			q_data-&gt;info = &amp;pixfmt_stateless_fwht;</div><div class='ctx'> 		else</div><div class='ctx'> 			q_data-&gt;info = find_fmt(pix-&gt;pixelformat);</div><div class='ctx'> 		q_data-&gt;coded_width = pix-&gt;width;</div><div class='hunk'>@@ -866,6 +1021,8 @@ static int vidioc_s_fmt(struct vicodec_ctx *ctx, struct v4l2_format *f)</div><div class='ctx'> </div><div class='ctx'> 		if (pix_mp-&gt;pixelformat == V4L2_PIX_FMT_FWHT)</div><div class='ctx'> 			q_data-&gt;info = &amp;pixfmt_fwht;</div><div class='add'>+		else if (pix_mp-&gt;pixelformat == V4L2_PIX_FMT_FWHT_STATELESS)</div><div class='add'>+			q_data-&gt;info = &amp;pixfmt_stateless_fwht;</div><div class='ctx'> 		else</div><div class='ctx'> 			q_data-&gt;info = find_fmt(pix_mp-&gt;pixelformat);</div><div class='ctx'> 		q_data-&gt;coded_width = pix_mp-&gt;width;</div><div class='hunk'>@@ -945,16 +1102,6 @@ static int vidioc_g_selection(struct file *file, void *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct vicodec_ctx *ctx = file2ctx(file);</div><div class='ctx'> 	struct vicodec_q_data *q_data;</div><div class='del'>-	enum v4l2_buf_type valid_cap_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='del'>-	enum v4l2_buf_type valid_out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='del'>-</div><div class='del'>-	if (multiplanar) {</div><div class='del'>-		valid_cap_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;</div><div class='del'>-		valid_out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (s-&gt;type != valid_cap_type &amp;&amp; s-&gt;type != valid_out_type)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	q_data = get_q_data(ctx, s-&gt;type);</div><div class='ctx'> 	if (!q_data)</div><div class='hunk'>@@ -963,18 +1110,14 @@ static int vidioc_g_selection(struct file *file, void *priv,</div><div class='ctx'> 	 * encoder supports only cropping on the OUTPUT buffer</div><div class='ctx'> 	 * decoder supports only composing on the CAPTURE buffer</div><div class='ctx'> 	 */</div><div class='del'>-	if ((ctx-&gt;is_enc &amp;&amp; s-&gt;type == valid_out_type) ||</div><div class='del'>-	    (!ctx-&gt;is_enc &amp;&amp; s-&gt;type == valid_cap_type)) {</div><div class='add'>+	if (ctx-&gt;is_enc &amp;&amp; s-&gt;type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {</div><div class='ctx'> 		switch (s-&gt;target) {</div><div class='del'>-		case V4L2_SEL_TGT_COMPOSE:</div><div class='ctx'> 		case V4L2_SEL_TGT_CROP:</div><div class='ctx'> 			s-&gt;r.left = 0;</div><div class='ctx'> 			s-&gt;r.top = 0;</div><div class='ctx'> 			s-&gt;r.width = q_data-&gt;visible_width;</div><div class='ctx'> 			s-&gt;r.height = q_data-&gt;visible_height;</div><div class='ctx'> 			return 0;</div><div class='del'>-		case V4L2_SEL_TGT_COMPOSE_DEFAULT:</div><div class='del'>-		case V4L2_SEL_TGT_COMPOSE_BOUNDS:</div><div class='ctx'> 		case V4L2_SEL_TGT_CROP_DEFAULT:</div><div class='ctx'> 		case V4L2_SEL_TGT_CROP_BOUNDS:</div><div class='ctx'> 			s-&gt;r.left = 0;</div><div class='hunk'>@@ -983,6 +1126,22 @@ static int vidioc_g_selection(struct file *file, void *priv,</div><div class='ctx'> 			s-&gt;r.height = q_data-&gt;coded_height;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='add'>+	} else if (!ctx-&gt;is_enc &amp;&amp; s-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='add'>+		switch (s-&gt;target) {</div><div class='add'>+		case V4L2_SEL_TGT_COMPOSE:</div><div class='add'>+			s-&gt;r.left = 0;</div><div class='add'>+			s-&gt;r.top = 0;</div><div class='add'>+			s-&gt;r.width = q_data-&gt;visible_width;</div><div class='add'>+			s-&gt;r.height = q_data-&gt;visible_height;</div><div class='add'>+			return 0;</div><div class='add'>+		case V4L2_SEL_TGT_COMPOSE_DEFAULT:</div><div class='add'>+		case V4L2_SEL_TGT_COMPOSE_BOUNDS:</div><div class='add'>+			s-&gt;r.left = 0;</div><div class='add'>+			s-&gt;r.top = 0;</div><div class='add'>+			s-&gt;r.width = q_data-&gt;coded_width;</div><div class='add'>+			s-&gt;r.height = q_data-&gt;coded_height;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -992,12 +1151,8 @@ static int vidioc_s_selection(struct file *file, void *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct vicodec_ctx *ctx = file2ctx(file);</div><div class='ctx'> 	struct vicodec_q_data *q_data;</div><div class='del'>-	enum v4l2_buf_type out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='del'>-</div><div class='del'>-	if (multiplanar)</div><div class='del'>-		out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;</div><div class='ctx'> </div><div class='del'>-	if (s-&gt;type != out_type)</div><div class='add'>+	if (s-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	q_data = get_q_data(ctx, s-&gt;type);</div><div class='hunk'>@@ -1092,6 +1247,8 @@ static int vicodec_enum_framesizes(struct file *file, void *fh,</div><div class='ctx'> 				   struct v4l2_frmsizeenum *fsize)</div><div class='ctx'> {</div><div class='ctx'> 	switch (fsize-&gt;pixel_format) {</div><div class='add'>+	case V4L2_PIX_FMT_FWHT_STATELESS:</div><div class='add'>+		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_FWHT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1200,6 +1357,14 @@ static int vicodec_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vicodec_buf_out_validate(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);</div><div class='add'>+</div><div class='add'>+	vbuf-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vicodec_buf_prepare(struct vb2_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);</div><div class='hunk'>@@ -1263,10 +1428,11 @@ static void vicodec_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * source change event is relevant only for the decoder</div><div class='add'>+	 * source change event is relevant only for the stateful decoder</div><div class='ctx'> 	 * in the compressed stream</div><div class='ctx'> 	 */</div><div class='del'>-	if (ctx-&gt;is_enc || !V4L2_TYPE_IS_OUTPUT(vb-&gt;vb2_queue-&gt;type)) {</div><div class='add'>+	if (ctx-&gt;is_stateless || ctx-&gt;is_enc ||</div><div class='add'>+	    !V4L2_TYPE_IS_OUTPUT(vb-&gt;vb2_queue-&gt;type)) {</div><div class='ctx'> 		v4l2_m2m_buf_queue(ctx-&gt;fh.m2m_ctx, vbuf);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1314,12 +1480,33 @@ static void vicodec_return_bufs(struct vb2_queue *q, u32 state)</div><div class='ctx'> 			vbuf = v4l2_m2m_dst_buf_remove(ctx-&gt;fh.m2m_ctx);</div><div class='ctx'> 		if (vbuf == NULL)</div><div class='ctx'> 			return;</div><div class='add'>+		v4l2_ctrl_request_complete(vbuf-&gt;vb2_buf.req_obj.req,</div><div class='add'>+					   &amp;ctx-&gt;hdl);</div><div class='ctx'> 		spin_lock(ctx-&gt;lock);</div><div class='ctx'> 		v4l2_m2m_buf_done(vbuf, state);</div><div class='ctx'> 		spin_unlock(ctx-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int total_frame_size(struct vicodec_q_data *q_data)</div><div class='add'>+{</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int chroma_div;</div><div class='add'>+</div><div class='add'>+	if (!q_data-&gt;info) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	size = q_data-&gt;coded_width * q_data-&gt;coded_height;</div><div class='add'>+	chroma_div = q_data-&gt;info-&gt;width_div * q_data-&gt;info-&gt;height_div;</div><div class='add'>+</div><div class='add'>+	if (q_data-&gt;info-&gt;components_num == 4)</div><div class='add'>+		return 2 * size + 2 * (size / chroma_div);</div><div class='add'>+	else if (q_data-&gt;info-&gt;components_num == 3)</div><div class='add'>+		return size + 2 * (size / chroma_div);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vicodec_start_streaming(struct vb2_queue *q,</div><div class='ctx'> 				   unsigned int count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1330,7 +1517,7 @@ static int vicodec_start_streaming(struct vb2_queue *q,</div><div class='ctx'> 	unsigned int size = q_data-&gt;coded_width * q_data-&gt;coded_height;</div><div class='ctx'> 	unsigned int chroma_div;</div><div class='ctx'> 	unsigned int total_planes_size;</div><div class='del'>-	u8 *new_comp_frame;</div><div class='add'>+	u8 *new_comp_frame = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!info)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1338,24 +1525,24 @@ static int vicodec_start_streaming(struct vb2_queue *q,</div><div class='ctx'> 	chroma_div = info-&gt;width_div * info-&gt;height_div;</div><div class='ctx'> 	q_data-&gt;sequence = 0;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;last_src_buf = NULL;</div><div class='del'>-	ctx-&gt;last_dst_buf = NULL;</div><div class='add'>+	if (V4L2_TYPE_IS_OUTPUT(q-&gt;type))</div><div class='add'>+		ctx-&gt;last_src_buf = NULL;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;last_dst_buf = NULL;</div><div class='add'>+</div><div class='ctx'> 	state-&gt;gop_cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((V4L2_TYPE_IS_OUTPUT(q-&gt;type) &amp;&amp; !ctx-&gt;is_enc) ||</div><div class='ctx'> 	    (!V4L2_TYPE_IS_OUTPUT(q-&gt;type) &amp;&amp; ctx-&gt;is_enc))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;id == V4L2_PIX_FMT_FWHT) {</div><div class='add'>+	if (info-&gt;id == V4L2_PIX_FMT_FWHT ||</div><div class='add'>+	    info-&gt;id == V4L2_PIX_FMT_FWHT_STATELESS) {</div><div class='ctx'> 		vicodec_return_bufs(q, VB2_BUF_STATE_QUEUED);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (info-&gt;components_num == 4)</div><div class='del'>-		total_planes_size = 2 * size + 2 * (size / chroma_div);</div><div class='del'>-	else if (info-&gt;components_num == 3)</div><div class='del'>-		total_planes_size = size + 2 * (size / chroma_div);</div><div class='del'>-	else</div><div class='del'>-		total_planes_size = size;</div><div class='add'>+	total_planes_size = total_frame_size(q_data);</div><div class='add'>+	ctx-&gt;comp_max_size = total_planes_size;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;visible_width = q_data-&gt;visible_width;</div><div class='ctx'> 	state-&gt;visible_height = q_data-&gt;visible_height;</div><div class='hunk'>@@ -1364,8 +1551,14 @@ static int vicodec_start_streaming(struct vb2_queue *q,</div><div class='ctx'> 	state-&gt;stride = q_data-&gt;coded_width *</div><div class='ctx'> 				info-&gt;bytesperline_mult;</div><div class='ctx'> </div><div class='del'>-	state-&gt;ref_frame.luma = kvmalloc(total_planes_size, GFP_KERNEL);</div><div class='del'>-	ctx-&gt;comp_max_size = total_planes_size;</div><div class='add'>+	if (ctx-&gt;is_stateless) {</div><div class='add'>+		state-&gt;ref_stride = state-&gt;stride;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	state-&gt;ref_stride = q_data-&gt;coded_width * info-&gt;luma_alpha_step;</div><div class='add'>+</div><div class='add'>+	state-&gt;ref_frame.buf = kvmalloc(total_planes_size, GFP_KERNEL);</div><div class='add'>+	state-&gt;ref_frame.luma = state-&gt;ref_frame.buf;</div><div class='ctx'> 	new_comp_frame = kvmalloc(ctx-&gt;comp_max_size, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!state-&gt;ref_frame.luma || !new_comp_frame) {</div><div class='hunk'>@@ -1413,7 +1606,10 @@ static void vicodec_stop_streaming(struct vb2_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	if ((!V4L2_TYPE_IS_OUTPUT(q-&gt;type) &amp;&amp; !ctx-&gt;is_enc) ||</div><div class='ctx'> 	    (V4L2_TYPE_IS_OUTPUT(q-&gt;type) &amp;&amp; ctx-&gt;is_enc)) {</div><div class='del'>-		kvfree(ctx-&gt;state.ref_frame.luma);</div><div class='add'>+		if (!ctx-&gt;is_stateless)</div><div class='add'>+			kvfree(ctx-&gt;state.ref_frame.buf);</div><div class='add'>+		ctx-&gt;state.ref_frame.buf = NULL;</div><div class='add'>+		ctx-&gt;state.ref_frame.luma = NULL;</div><div class='ctx'> 		ctx-&gt;comp_max_size = 0;</div><div class='ctx'> 		ctx-&gt;source_changed = false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1427,14 +1623,24 @@ static void vicodec_stop_streaming(struct vb2_queue *q)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vicodec_buf_request_complete(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct vicodec_ctx *ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_request_complete(vb-&gt;req_obj.req, &amp;ctx-&gt;hdl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static const struct vb2_ops vicodec_qops = {</div><div class='del'>-	.queue_setup	 = vicodec_queue_setup,</div><div class='del'>-	.buf_prepare	 = vicodec_buf_prepare,</div><div class='del'>-	.buf_queue	 = vicodec_buf_queue,</div><div class='del'>-	.start_streaming = vicodec_start_streaming,</div><div class='del'>-	.stop_streaming  = vicodec_stop_streaming,</div><div class='del'>-	.wait_prepare	 = vb2_ops_wait_prepare,</div><div class='del'>-	.wait_finish	 = vb2_ops_wait_finish,</div><div class='add'>+	.queue_setup		= vicodec_queue_setup,</div><div class='add'>+	.buf_out_validate	= vicodec_buf_out_validate,</div><div class='add'>+	.buf_prepare		= vicodec_buf_prepare,</div><div class='add'>+	.buf_queue		= vicodec_buf_queue,</div><div class='add'>+	.buf_request_complete	= vicodec_buf_request_complete,</div><div class='add'>+	.start_streaming	= vicodec_start_streaming,</div><div class='add'>+	.stop_streaming		= vicodec_stop_streaming,</div><div class='add'>+	.wait_prepare		= vb2_ops_wait_prepare,</div><div class='add'>+	.wait_finish		= vb2_ops_wait_finish,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='hunk'>@@ -1452,9 +1658,14 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='ctx'> 	src_vq-&gt;ops = &amp;vicodec_qops;</div><div class='ctx'> 	src_vq-&gt;mem_ops = &amp;vb2_vmalloc_memops;</div><div class='ctx'> 	src_vq-&gt;timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;</div><div class='del'>-	src_vq-&gt;lock = ctx-&gt;is_enc ? &amp;ctx-&gt;dev-&gt;enc_mutex :</div><div class='del'>-		&amp;ctx-&gt;dev-&gt;dec_mutex;</div><div class='del'>-</div><div class='add'>+	if (ctx-&gt;is_enc)</div><div class='add'>+		src_vq-&gt;lock = &amp;ctx-&gt;dev-&gt;stateful_enc.mutex;</div><div class='add'>+	else if (ctx-&gt;is_stateless)</div><div class='add'>+		src_vq-&gt;lock = &amp;ctx-&gt;dev-&gt;stateless_dec.mutex;</div><div class='add'>+	else</div><div class='add'>+		src_vq-&gt;lock = &amp;ctx-&gt;dev-&gt;stateful_dec.mutex;</div><div class='add'>+	src_vq-&gt;supports_requests = ctx-&gt;is_stateless;</div><div class='add'>+	src_vq-&gt;requires_requests = ctx-&gt;is_stateless;</div><div class='ctx'> 	ret = vb2_queue_init(src_vq);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1473,53 +1684,86 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='ctx'> 	return vb2_queue_init(dst_vq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define VICODEC_CID_CUSTOM_BASE		(V4L2_CID_MPEG_BASE | 0xf000)</div><div class='del'>-#define VICODEC_CID_I_FRAME_QP		(VICODEC_CID_CUSTOM_BASE + 0)</div><div class='del'>-#define VICODEC_CID_P_FRAME_QP		(VICODEC_CID_CUSTOM_BASE + 1)</div><div class='add'>+static int vicodec_try_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct vicodec_ctx *ctx = container_of(ctrl-&gt;handler,</div><div class='add'>+			struct vicodec_ctx, hdl);</div><div class='add'>+	const struct v4l2_ctrl_fwht_params *params;</div><div class='add'>+	struct vicodec_q_data *q_dst = get_q_data(ctx,</div><div class='add'>+			V4L2_BUF_TYPE_VIDEO_CAPTURE);</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS:</div><div class='add'>+		if (!q_dst-&gt;info)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		params = ctrl-&gt;p_new.p_fwht_params;</div><div class='add'>+		if (params-&gt;width &gt; q_dst-&gt;coded_width ||</div><div class='add'>+		    params-&gt;width &lt; MIN_WIDTH ||</div><div class='add'>+		    params-&gt;height &gt; q_dst-&gt;coded_height ||</div><div class='add'>+		    params-&gt;height &lt; MIN_HEIGHT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!validate_by_version(params-&gt;flags, params-&gt;version))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!validate_stateless_params_flags(params, q_dst-&gt;info))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return 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 update_header_from_stateless_params(struct vicodec_ctx *ctx,</div><div class='add'>+						const struct v4l2_ctrl_fwht_params *params)</div><div class='add'>+{</div><div class='add'>+	struct fwht_cframe_hdr *p_hdr = &amp;ctx-&gt;state.header;</div><div class='add'>+</div><div class='add'>+	p_hdr-&gt;magic1 = FWHT_MAGIC1;</div><div class='add'>+	p_hdr-&gt;magic2 = FWHT_MAGIC2;</div><div class='add'>+	p_hdr-&gt;version = htonl(params-&gt;version);</div><div class='add'>+	p_hdr-&gt;width = htonl(params-&gt;width);</div><div class='add'>+	p_hdr-&gt;height = htonl(params-&gt;height);</div><div class='add'>+	p_hdr-&gt;flags = htonl(params-&gt;flags);</div><div class='add'>+	p_hdr-&gt;colorspace = htonl(params-&gt;colorspace);</div><div class='add'>+	p_hdr-&gt;xfer_func = htonl(params-&gt;xfer_func);</div><div class='add'>+	p_hdr-&gt;ycbcr_enc = htonl(params-&gt;ycbcr_enc);</div><div class='add'>+	p_hdr-&gt;quantization = htonl(params-&gt;quantization);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int vicodec_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct vicodec_ctx *ctx = container_of(ctrl-&gt;handler,</div><div class='ctx'> 					       struct vicodec_ctx, hdl);</div><div class='add'>+	const struct v4l2_ctrl_fwht_params *params;</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_GOP_SIZE:</div><div class='ctx'> 		ctx-&gt;state.gop_size = ctrl-&gt;val;</div><div class='ctx'> 		return 0;</div><div class='del'>-	case VICODEC_CID_I_FRAME_QP:</div><div class='add'>+	case V4L2_CID_FWHT_I_FRAME_QP:</div><div class='ctx'> 		ctx-&gt;state.i_frame_qp = ctrl-&gt;val;</div><div class='ctx'> 		return 0;</div><div class='del'>-	case VICODEC_CID_P_FRAME_QP:</div><div class='add'>+	case V4L2_CID_FWHT_P_FRAME_QP:</div><div class='ctx'> 		ctx-&gt;state.p_frame_qp = ctrl-&gt;val;</div><div class='ctx'> 		return 0;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS:</div><div class='add'>+		params = ctrl-&gt;p_new.p_fwht_params;</div><div class='add'>+		update_header_from_stateless_params(ctx, params);</div><div class='add'>+		ctx-&gt;state.ref_frame_ts = params-&gt;backward_ref_ts;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_ctrl_ops vicodec_ctrl_ops = {</div><div class='ctx'> 	.s_ctrl = vicodec_s_ctrl,</div><div class='add'>+	.try_ctrl = vicodec_try_ctrl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct v4l2_ctrl_config vicodec_ctrl_i_frame = {</div><div class='del'>-	.ops = &amp;vicodec_ctrl_ops,</div><div class='del'>-	.id = VICODEC_CID_I_FRAME_QP,</div><div class='del'>-	.name = "FWHT I-Frame QP Value",</div><div class='del'>-	.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	.min = 1,</div><div class='del'>-	.max = 31,</div><div class='del'>-	.def = 20,</div><div class='del'>-	.step = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = {</div><div class='del'>-	.ops = &amp;vicodec_ctrl_ops,</div><div class='del'>-	.id = VICODEC_CID_P_FRAME_QP,</div><div class='del'>-	.name = "FWHT P-Frame QP Value",</div><div class='del'>-	.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	.min = 1,</div><div class='del'>-	.max = 31,</div><div class='del'>-	.def = 20,</div><div class='del'>-	.step = 1,</div><div class='add'>+static const struct v4l2_ctrl_config vicodec_ctrl_stateless_state = {</div><div class='add'>+	.ops		= &amp;vicodec_ctrl_ops,</div><div class='add'>+	.id		= V4L2_CID_MPEG_VIDEO_FWHT_PARAMS,</div><div class='add'>+	.elem_size      = sizeof(struct v4l2_ctrl_fwht_params),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1542,8 +1786,10 @@ static int vicodec_open(struct file *file)</div><div class='ctx'> 		goto open_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vfd == &amp;dev-&gt;enc_vfd)</div><div class='add'>+	if (vfd == &amp;dev-&gt;stateful_enc.vfd)</div><div class='ctx'> 		ctx-&gt;is_enc = true;</div><div class='add'>+	else if (vfd == &amp;dev-&gt;stateless_dec.vfd)</div><div class='add'>+		ctx-&gt;is_stateless = true;</div><div class='ctx'> </div><div class='ctx'> 	v4l2_fh_init(&amp;ctx-&gt;fh, video_devdata(file));</div><div class='ctx'> 	file-&gt;private_data = &amp;ctx-&gt;fh;</div><div class='hunk'>@@ -1552,8 +1798,12 @@ static int vicodec_open(struct file *file)</div><div class='ctx'> 	v4l2_ctrl_handler_init(hdl, 4);</div><div class='ctx'> 	v4l2_ctrl_new_std(hdl, &amp;vicodec_ctrl_ops, V4L2_CID_MPEG_VIDEO_GOP_SIZE,</div><div class='ctx'> 			  1, 16, 1, 10);</div><div class='del'>-	v4l2_ctrl_new_custom(hdl, &amp;vicodec_ctrl_i_frame, NULL);</div><div class='del'>-	v4l2_ctrl_new_custom(hdl, &amp;vicodec_ctrl_p_frame, NULL);</div><div class='add'>+	v4l2_ctrl_new_std(hdl, &amp;vicodec_ctrl_ops, V4L2_CID_FWHT_I_FRAME_QP,</div><div class='add'>+			  1, 31, 1, 20);</div><div class='add'>+	v4l2_ctrl_new_std(hdl, &amp;vicodec_ctrl_ops, V4L2_CID_FWHT_P_FRAME_QP,</div><div class='add'>+			  1, 31, 1, 20);</div><div class='add'>+	if (ctx-&gt;is_stateless)</div><div class='add'>+		v4l2_ctrl_new_custom(hdl, &amp;vicodec_ctrl_stateless_state, NULL);</div><div class='ctx'> 	if (hdl-&gt;error) {</div><div class='ctx'> 		rc = hdl-&gt;error;</div><div class='ctx'> 		v4l2_ctrl_handler_free(hdl);</div><div class='hunk'>@@ -1563,15 +1813,19 @@ static int vicodec_open(struct file *file)</div><div class='ctx'> 	ctx-&gt;fh.ctrl_handler = hdl;</div><div class='ctx'> 	v4l2_ctrl_handler_setup(hdl);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;q_data[V4L2_M2M_SRC].info =</div><div class='del'>-		ctx-&gt;is_enc ? v4l2_fwht_get_pixfmt(0) : &amp;pixfmt_fwht;</div><div class='add'>+	if (ctx-&gt;is_enc)</div><div class='add'>+		ctx-&gt;q_data[V4L2_M2M_SRC].info = v4l2_fwht_get_pixfmt(0);</div><div class='add'>+	else if (ctx-&gt;is_stateless)</div><div class='add'>+		ctx-&gt;q_data[V4L2_M2M_SRC].info = &amp;pixfmt_stateless_fwht;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;q_data[V4L2_M2M_SRC].info = &amp;pixfmt_fwht;</div><div class='ctx'> 	ctx-&gt;q_data[V4L2_M2M_SRC].coded_width = 1280;</div><div class='ctx'> 	ctx-&gt;q_data[V4L2_M2M_SRC].coded_height = 720;</div><div class='ctx'> 	ctx-&gt;q_data[V4L2_M2M_SRC].visible_width = 1280;</div><div class='ctx'> 	ctx-&gt;q_data[V4L2_M2M_SRC].visible_height = 720;</div><div class='ctx'> 	size = 1280 * 720 * ctx-&gt;q_data[V4L2_M2M_SRC].info-&gt;sizeimage_mult /</div><div class='ctx'> 		ctx-&gt;q_data[V4L2_M2M_SRC].info-&gt;sizeimage_div;</div><div class='del'>-	if (ctx-&gt;is_enc)</div><div class='add'>+	if (ctx-&gt;is_enc || ctx-&gt;is_stateless)</div><div class='ctx'> 		ctx-&gt;q_data[V4L2_M2M_SRC].sizeimage = size;</div><div class='ctx'> 	else</div><div class='ctx'> 		ctx-&gt;q_data[V4L2_M2M_SRC].sizeimage =</div><div class='hunk'>@@ -1590,13 +1844,17 @@ static int vicodec_open(struct file *file)</div><div class='ctx'> 	ctx-&gt;state.colorspace = V4L2_COLORSPACE_REC709;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;is_enc) {</div><div class='del'>-		ctx-&gt;fh.m2m_ctx = v4l2_m2m_ctx_init(dev-&gt;enc_dev, ctx,</div><div class='del'>-						    &amp;queue_init);</div><div class='del'>-		ctx-&gt;lock = &amp;dev-&gt;enc_lock;</div><div class='add'>+		ctx-&gt;fh.m2m_ctx = v4l2_m2m_ctx_init(dev-&gt;stateful_enc.m2m_dev,</div><div class='add'>+						    ctx, &amp;queue_init);</div><div class='add'>+		ctx-&gt;lock = &amp;dev-&gt;stateful_enc.lock;</div><div class='add'>+	} else if (ctx-&gt;is_stateless) {</div><div class='add'>+		ctx-&gt;fh.m2m_ctx = v4l2_m2m_ctx_init(dev-&gt;stateless_dec.m2m_dev,</div><div class='add'>+						    ctx, &amp;queue_init);</div><div class='add'>+		ctx-&gt;lock = &amp;dev-&gt;stateless_dec.lock;</div><div class='ctx'> 	} else {</div><div class='del'>-		ctx-&gt;fh.m2m_ctx = v4l2_m2m_ctx_init(dev-&gt;dec_dev, ctx,</div><div class='del'>-						    &amp;queue_init);</div><div class='del'>-		ctx-&gt;lock = &amp;dev-&gt;dec_lock;</div><div class='add'>+		ctx-&gt;fh.m2m_ctx = v4l2_m2m_ctx_init(dev-&gt;stateful_dec.m2m_dev,</div><div class='add'>+						    ctx, &amp;queue_init);</div><div class='add'>+		ctx-&gt;lock = &amp;dev-&gt;stateful_dec.lock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(ctx-&gt;fh.m2m_ctx)) {</div><div class='hunk'>@@ -1620,17 +1878,71 @@ static int vicodec_release(struct file *file)</div><div class='ctx'> 	struct video_device *vfd = video_devdata(file);</div><div class='ctx'> 	struct vicodec_ctx *ctx = file2ctx(file);</div><div class='ctx'> </div><div class='del'>-	v4l2_fh_del(&amp;ctx-&gt;fh);</div><div class='del'>-	v4l2_fh_exit(&amp;ctx-&gt;fh);</div><div class='del'>-	v4l2_ctrl_handler_free(&amp;ctx-&gt;hdl);</div><div class='ctx'> 	mutex_lock(vfd-&gt;lock);</div><div class='ctx'> 	v4l2_m2m_ctx_release(ctx-&gt;fh.m2m_ctx);</div><div class='ctx'> 	mutex_unlock(vfd-&gt;lock);</div><div class='add'>+	v4l2_fh_del(&amp;ctx-&gt;fh);</div><div class='add'>+	v4l2_fh_exit(&amp;ctx-&gt;fh);</div><div class='add'>+	v4l2_ctrl_handler_free(&amp;ctx-&gt;hdl);</div><div class='add'>+	kvfree(ctx-&gt;state.compressed_frame);</div><div class='ctx'> 	kfree(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 vicodec_request_validate(struct media_request *req)</div><div class='add'>+{</div><div class='add'>+	struct media_request_object *obj;</div><div class='add'>+	struct v4l2_ctrl_handler *parent_hdl, *hdl;</div><div class='add'>+	struct vicodec_ctx *ctx = NULL;</div><div class='add'>+	struct v4l2_ctrl *ctrl;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(obj, &amp;req-&gt;objects, list) {</div><div class='add'>+		struct vb2_buffer *vb;</div><div class='add'>+</div><div class='add'>+		if (vb2_request_object_is_buffer(obj)) {</div><div class='add'>+			vb = container_of(obj, struct vb2_buffer, req_obj);</div><div class='add'>+			ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</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 (!ctx) {</div><div class='add'>+		pr_err("No buffer was provided with the request\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = vb2_request_buffer_cnt(req);</div><div class='add'>+	if (!count) {</div><div class='add'>+		v4l2_info(&amp;ctx-&gt;dev-&gt;v4l2_dev,</div><div class='add'>+			  "No buffer was provided with the request\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	} else if (count &gt; 1) {</div><div class='add'>+		v4l2_info(&amp;ctx-&gt;dev-&gt;v4l2_dev,</div><div class='add'>+			  "More than one buffer was provided with the request\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	parent_hdl = &amp;ctx-&gt;hdl;</div><div class='add'>+</div><div class='add'>+	hdl = v4l2_ctrl_request_hdl_find(req, parent_hdl);</div><div class='add'>+	if (!hdl) {</div><div class='add'>+		v4l2_info(&amp;ctx-&gt;dev-&gt;v4l2_dev, "Missing codec control\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	ctrl = v4l2_ctrl_request_hdl_ctrl_find(hdl,</div><div class='add'>+					       vicodec_ctrl_stateless_state.id);</div><div class='add'>+	if (!ctrl) {</div><div class='add'>+		v4l2_info(&amp;ctx-&gt;dev-&gt;v4l2_dev,</div><div class='add'>+			  "Missing required codec control\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vb2_request_validate(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct v4l2_file_operations vicodec_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= vicodec_open,</div><div class='hunk'>@@ -1649,24 +1961,67 @@ static const struct video_device vicodec_videodev = {</div><div class='ctx'> 	.release	= video_device_release_empty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct media_device_ops vicodec_m2m_media_ops = {</div><div class='add'>+	.req_validate	= vicodec_request_validate,</div><div class='add'>+	.req_queue	= v4l2_m2m_request_queue,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct v4l2_m2m_ops m2m_ops = {</div><div class='ctx'> 	.device_run	= device_run,</div><div class='ctx'> 	.job_ready	= job_ready,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int register_instance(struct vicodec_dev *dev,</div><div class='add'>+			     struct vicodec_dev_instance *dev_instance,</div><div class='add'>+			     const char *name, bool is_enc)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vfd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev_instance-&gt;lock);</div><div class='add'>+	mutex_init(&amp;dev_instance-&gt;mutex);</div><div class='add'>+	dev_instance-&gt;m2m_dev = v4l2_m2m_init(&amp;m2m_ops);</div><div class='add'>+	if (IS_ERR(dev_instance-&gt;m2m_dev)) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init vicodec enc device\n");</div><div class='add'>+		return PTR_ERR(dev_instance-&gt;m2m_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_instance-&gt;vfd = vicodec_videodev;</div><div class='add'>+	vfd = &amp;dev_instance-&gt;vfd;</div><div class='add'>+	vfd-&gt;lock = &amp;dev_instance-&gt;mutex;</div><div class='add'>+	vfd-&gt;v4l2_dev = &amp;dev-&gt;v4l2_dev;</div><div class='add'>+	strscpy(vfd-&gt;name, name, sizeof(vfd-&gt;name));</div><div class='add'>+	vfd-&gt;device_caps = V4L2_CAP_STREAMING |</div><div class='add'>+		(multiplanar ? V4L2_CAP_VIDEO_M2M_MPLANE : V4L2_CAP_VIDEO_M2M);</div><div class='add'>+	if (is_enc) {</div><div class='add'>+		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);</div><div class='add'>+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);</div><div class='add'>+	} else {</div><div class='add'>+		v4l2_disable_ioctl(vfd, VIDIOC_ENCODER_CMD);</div><div class='add'>+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_ENCODER_CMD);</div><div class='add'>+	}</div><div class='add'>+	video_set_drvdata(vfd, dev);</div><div class='add'>+</div><div class='add'>+	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register video device '%s'\n", name);</div><div class='add'>+		v4l2_m2m_release(dev_instance-&gt;m2m_dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	v4l2_info(&amp;dev-&gt;v4l2_dev, "Device '%s' registered as /dev/video%d\n",</div><div class='add'>+		  name, vfd-&gt;num);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vicodec_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vicodec_dev *dev;</div><div class='del'>-	struct video_device *vfd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*dev), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;dev-&gt;enc_lock);</div><div class='del'>-	spin_lock_init(&amp;dev-&gt;dec_lock);</div><div class='del'>-</div><div class='ctx'> 	ret = v4l2_device_register(&amp;pdev-&gt;dev, &amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1677,103 +2032,74 @@ static int vicodec_probe(struct platform_device *pdev)</div><div class='ctx'> 	strscpy(dev-&gt;mdev.bus_info, "platform:vicodec",</div><div class='ctx'> 		sizeof(dev-&gt;mdev.bus_info));</div><div class='ctx'> 	media_device_init(&amp;dev-&gt;mdev);</div><div class='add'>+	dev-&gt;mdev.ops = &amp;vicodec_m2m_media_ops;</div><div class='ctx'> 	dev-&gt;v4l2_dev.mdev = &amp;dev-&gt;mdev;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;dev-&gt;enc_mutex);</div><div class='del'>-	mutex_init(&amp;dev-&gt;dec_mutex);</div><div class='del'>-</div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;enc_dev = v4l2_m2m_init(&amp;m2m_ops);</div><div class='del'>-	if (IS_ERR(dev-&gt;enc_dev)) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init vicodec device\n");</div><div class='del'>-		ret = PTR_ERR(dev-&gt;enc_dev);</div><div class='add'>+	if (register_instance(dev, &amp;dev-&gt;stateful_enc,</div><div class='add'>+			      "stateful-encoder", true))</div><div class='ctx'> 		goto unreg_dev;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dec_dev = v4l2_m2m_init(&amp;m2m_ops);</div><div class='del'>-	if (IS_ERR(dev-&gt;dec_dev)) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init vicodec device\n");</div><div class='del'>-		ret = PTR_ERR(dev-&gt;dec_dev);</div><div class='del'>-		goto err_enc_m2m;</div><div class='del'>-	}</div><div class='add'>+	if (register_instance(dev, &amp;dev-&gt;stateful_dec,</div><div class='add'>+			      "stateful-decoder", false))</div><div class='add'>+		goto unreg_sf_enc;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;enc_vfd = vicodec_videodev;</div><div class='del'>-	vfd = &amp;dev-&gt;enc_vfd;</div><div class='del'>-	vfd-&gt;lock = &amp;dev-&gt;enc_mutex;</div><div class='del'>-	vfd-&gt;v4l2_dev = &amp;dev-&gt;v4l2_dev;</div><div class='del'>-	strscpy(vfd-&gt;name, "vicodec-enc", sizeof(vfd-&gt;name));</div><div class='del'>-	vfd-&gt;device_caps = V4L2_CAP_STREAMING |</div><div class='del'>-		(multiplanar ? V4L2_CAP_VIDEO_M2M_MPLANE : V4L2_CAP_VIDEO_M2M);</div><div class='del'>-	v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);</div><div class='del'>-	v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);</div><div class='del'>-	video_set_drvdata(vfd, dev);</div><div class='del'>-</div><div class='del'>-	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register video device\n");</div><div class='del'>-		goto err_dec_m2m;</div><div class='del'>-	}</div><div class='del'>-	v4l2_info(&amp;dev-&gt;v4l2_dev,</div><div class='del'>-			"Device registered as /dev/video%d\n", vfd-&gt;num);</div><div class='add'>+	if (register_instance(dev, &amp;dev-&gt;stateless_dec,</div><div class='add'>+			      "stateless-decoder", false))</div><div class='add'>+		goto unreg_sf_dec;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dec_vfd = vicodec_videodev;</div><div class='del'>-	vfd = &amp;dev-&gt;dec_vfd;</div><div class='del'>-	vfd-&gt;lock = &amp;dev-&gt;dec_mutex;</div><div class='del'>-	vfd-&gt;v4l2_dev = &amp;dev-&gt;v4l2_dev;</div><div class='del'>-	vfd-&gt;device_caps = V4L2_CAP_STREAMING |</div><div class='del'>-		(multiplanar ? V4L2_CAP_VIDEO_M2M_MPLANE : V4L2_CAP_VIDEO_M2M);</div><div class='del'>-	strscpy(vfd-&gt;name, "vicodec-dec", sizeof(vfd-&gt;name));</div><div class='del'>-	v4l2_disable_ioctl(vfd, VIDIOC_ENCODER_CMD);</div><div class='del'>-	v4l2_disable_ioctl(vfd, VIDIOC_TRY_ENCODER_CMD);</div><div class='del'>-	video_set_drvdata(vfd, dev);</div><div class='del'>-</div><div class='del'>-	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);</div><div class='add'>+#ifdef CONFIG_MEDIA_CONTROLLER</div><div class='add'>+	ret = v4l2_m2m_register_media_controller(dev-&gt;stateful_enc.m2m_dev,</div><div class='add'>+						 &amp;dev-&gt;stateful_enc.vfd,</div><div class='add'>+						 MEDIA_ENT_F_PROC_VIDEO_ENCODER);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register video device\n");</div><div class='del'>-		goto unreg_enc;</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem media controller for enc\n");</div><div class='add'>+		goto unreg_m2m;</div><div class='ctx'> 	}</div><div class='del'>-	v4l2_info(&amp;dev-&gt;v4l2_dev,</div><div class='del'>-			"Device registered as /dev/video%d\n", vfd-&gt;num);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEDIA_CONTROLLER</div><div class='del'>-	ret = v4l2_m2m_register_media_controller(dev-&gt;enc_dev,</div><div class='del'>-			&amp;dev-&gt;enc_vfd, MEDIA_ENT_F_PROC_VIDEO_ENCODER);</div><div class='add'>+	ret = v4l2_m2m_register_media_controller(dev-&gt;stateful_dec.m2m_dev,</div><div class='add'>+						 &amp;dev-&gt;stateful_dec.vfd,</div><div class='add'>+						 MEDIA_ENT_F_PROC_VIDEO_DECODER);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem media controller\n");</div><div class='del'>-		goto unreg_m2m;</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem media controller for dec\n");</div><div class='add'>+		goto unreg_m2m_sf_enc_mc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = v4l2_m2m_register_media_controller(dev-&gt;dec_dev,</div><div class='del'>-			&amp;dev-&gt;dec_vfd, MEDIA_ENT_F_PROC_VIDEO_DECODER);</div><div class='add'>+	ret = v4l2_m2m_register_media_controller(dev-&gt;stateless_dec.m2m_dev,</div><div class='add'>+						 &amp;dev-&gt;stateless_dec.vfd,</div><div class='add'>+						 MEDIA_ENT_F_PROC_VIDEO_DECODER);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem media controller\n");</div><div class='del'>-		goto unreg_m2m_enc_mc;</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem media controller for stateless dec\n");</div><div class='add'>+		goto unreg_m2m_sf_dec_mc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = media_device_register(&amp;dev-&gt;mdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register mem2mem media device\n");</div><div class='del'>-		goto unreg_m2m_dec_mc;</div><div class='add'>+		goto unreg_m2m_sl_dec_mc;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEDIA_CONTROLLER</div><div class='del'>-unreg_m2m_dec_mc:</div><div class='del'>-	v4l2_m2m_unregister_media_controller(dev-&gt;dec_dev);</div><div class='del'>-unreg_m2m_enc_mc:</div><div class='del'>-	v4l2_m2m_unregister_media_controller(dev-&gt;enc_dev);</div><div class='add'>+unreg_m2m_sl_dec_mc:</div><div class='add'>+	v4l2_m2m_unregister_media_controller(dev-&gt;stateless_dec.m2m_dev);</div><div class='add'>+unreg_m2m_sf_dec_mc:</div><div class='add'>+	v4l2_m2m_unregister_media_controller(dev-&gt;stateful_dec.m2m_dev);</div><div class='add'>+unreg_m2m_sf_enc_mc:</div><div class='add'>+	v4l2_m2m_unregister_media_controller(dev-&gt;stateful_enc.m2m_dev);</div><div class='ctx'> unreg_m2m:</div><div class='del'>-	video_unregister_device(&amp;dev-&gt;dec_vfd);</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;stateless_dec.vfd);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;stateless_dec.m2m_dev);</div><div class='ctx'> #endif</div><div class='del'>-unreg_enc:</div><div class='del'>-	video_unregister_device(&amp;dev-&gt;enc_vfd);</div><div class='del'>-err_dec_m2m:</div><div class='del'>-	v4l2_m2m_release(dev-&gt;dec_dev);</div><div class='del'>-err_enc_m2m:</div><div class='del'>-	v4l2_m2m_release(dev-&gt;enc_dev);</div><div class='add'>+unreg_sf_dec:</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;stateful_dec.vfd);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;stateful_dec.m2m_dev);</div><div class='add'>+unreg_sf_enc:</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;stateful_enc.vfd);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;stateful_enc.m2m_dev);</div><div class='ctx'> unreg_dev:</div><div class='ctx'> 	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1788,15 +2114,17 @@ static int vicodec_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEDIA_CONTROLLER</div><div class='ctx'> 	media_device_unregister(&amp;dev-&gt;mdev);</div><div class='del'>-	v4l2_m2m_unregister_media_controller(dev-&gt;enc_dev);</div><div class='del'>-	v4l2_m2m_unregister_media_controller(dev-&gt;dec_dev);</div><div class='add'>+	v4l2_m2m_unregister_media_controller(dev-&gt;stateful_enc.m2m_dev);</div><div class='add'>+	v4l2_m2m_unregister_media_controller(dev-&gt;stateful_dec.m2m_dev);</div><div class='add'>+	v4l2_m2m_unregister_media_controller(dev-&gt;stateless_dec.m2m_dev);</div><div class='ctx'> 	media_device_cleanup(&amp;dev-&gt;mdev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	v4l2_m2m_release(dev-&gt;enc_dev);</div><div class='del'>-	v4l2_m2m_release(dev-&gt;dec_dev);</div><div class='del'>-	video_unregister_device(&amp;dev-&gt;enc_vfd);</div><div class='del'>-	video_unregister_device(&amp;dev-&gt;dec_vfd);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;stateful_enc.m2m_dev);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;stateful_dec.m2m_dev);</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;stateful_enc.vfd);</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;stateful_dec.vfd);</div><div class='add'>+	video_unregister_device(&amp;dev-&gt;stateless_dec.vfd);</div><div class='ctx'> 	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c<br/>index 0ba30756e1e4..d8cd5f5cb10d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/video-mux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/video-mux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/video-mux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/video-mux.c</a></div><div class='hunk'>@@ -419,9 +419,14 @@ static int video_mux_probe(struct platform_device *pdev)</div><div class='ctx'> 	vmux-&gt;active = -1;</div><div class='ctx'> 	vmux-&gt;pads = devm_kcalloc(dev, num_pads, sizeof(*vmux-&gt;pads),</div><div class='ctx'> 				  GFP_KERNEL);</div><div class='add'>+	if (!vmux-&gt;pads)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	vmux-&gt;format_mbus = devm_kcalloc(dev, num_pads,</div><div class='ctx'> 					 sizeof(*vmux-&gt;format_mbus),</div><div class='ctx'> 					 GFP_KERNEL);</div><div class='add'>+	if (!vmux-&gt;format_mbus)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_pads; i++) {</div><div class='ctx'> 		vmux-&gt;pads[i].flags = (i &lt; num_pads - 1) ? MEDIA_PAD_FL_SINK</div><div class='head'>diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c<br/>index 34dcaca45d8b..243c82b5d537 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vim2m.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vim2m.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vim2m.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vim2m.c</a></div><div class='hunk'>@@ -302,7 +302,7 @@ static void copy_two_pixels(struct vim2m_q_data *q_data_in,</div><div class='ctx'> 	switch (in-&gt;fourcc) {</div><div class='ctx'> 	case V4L2_PIX_FMT_RGB565: /* rrrrrggg gggbbbbb */</div><div class='ctx'> 		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			u16 pix = *(u16 *)(src[i]);</div><div class='add'>+			u16 pix = le16_to_cpu(*(__le16 *)(src[i]));</div><div class='ctx'> </div><div class='ctx'> 			*r++ = (u8)(((pix &amp; 0xf800) &gt;&gt; 11) &lt;&lt; 3) | 0x07;</div><div class='ctx'> 			*g++ = (u8)((((pix &amp; 0x07e0) &gt;&gt; 5)) &lt;&lt; 2) | 0x03;</div><div class='hunk'>@@ -311,12 +311,11 @@ static void copy_two_pixels(struct vim2m_q_data *q_data_in,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_PIX_FMT_RGB565X: /* gggbbbbb rrrrrggg */</div><div class='ctx'> 		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			u16 pix = *(u16 *)(src[i]);</div><div class='add'>+			u16 pix = be16_to_cpu(*(__be16 *)(src[i]));</div><div class='ctx'> </div><div class='del'>-			*r++ = (u8)(((0x00f8 &amp; pix) &gt;&gt; 3) &lt;&lt; 3) | 0x07;</div><div class='del'>-			*g++ = (u8)(((pix &amp; 0x7) &lt;&lt; 2) |</div><div class='del'>-				    ((pix &amp; 0xe000) &gt;&gt; 5)) | 0x03;</div><div class='del'>-			*b++ = (u8)(((pix &amp; 0x1f00) &gt;&gt; 8) &lt;&lt; 3) | 0x07;</div><div class='add'>+			*r++ = (u8)(((pix &amp; 0xf800) &gt;&gt; 11) &lt;&lt; 3) | 0x07;</div><div class='add'>+			*g++ = (u8)((((pix &amp; 0x07e0) &gt;&gt; 5)) &lt;&lt; 2) | 0x03;</div><div class='add'>+			*b++ = (u8)((pix &amp; 0x1f) &lt;&lt; 3) | 0x07;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -345,21 +344,26 @@ static void copy_two_pixels(struct vim2m_q_data *q_data_in,</div><div class='ctx'> 	switch (out-&gt;fourcc) {</div><div class='ctx'> 	case V4L2_PIX_FMT_RGB565: /* rrrrrggg gggbbbbb */</div><div class='ctx'> 		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			u16 *pix = (u16 *)*dst;</div><div class='add'>+			u16 pix;</div><div class='add'>+			__le16 *dst_pix = (__le16 *)*dst;</div><div class='add'>+</div><div class='add'>+			pix = ((*r &lt;&lt; 8) &amp; 0xf800) | ((*g &lt;&lt; 3) &amp; 0x07e0) |</div><div class='add'>+			      (*b &gt;&gt; 3);</div><div class='ctx'> </div><div class='del'>-			*pix = ((*r &lt;&lt; 8) &amp; 0xf800) | ((*g &lt;&lt; 3) &amp; 0x07e0) |</div><div class='del'>-			       (*b &gt;&gt; 3);</div><div class='add'>+			*dst_pix = cpu_to_le16(pix);</div><div class='ctx'> </div><div class='ctx'> 			*dst += 2;</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	case V4L2_PIX_FMT_RGB565X: /* gggbbbbb rrrrrggg */</div><div class='ctx'> 		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			u16 *pix = (u16 *)*dst;</div><div class='del'>-			u8 green = *g++ &gt;&gt; 2;</div><div class='add'>+			u16 pix;</div><div class='add'>+			__be16 *dst_pix = (__be16 *)*dst;</div><div class='ctx'> </div><div class='del'>-			*pix = ((green &lt;&lt; 8) &amp; 0xe000) | (green &amp; 0x07) |</div><div class='del'>-			       ((*b++ &lt;&lt; 5) &amp; 0x1f00) | ((*r++ &amp; 0xf8));</div><div class='add'>+			pix = ((*r &lt;&lt; 8) &amp; 0xf800) | ((*g &lt;&lt; 3) &amp; 0x07e0) |</div><div class='add'>+			      (*b &gt;&gt; 3);</div><div class='add'>+</div><div class='add'>+			*dst_pix = cpu_to_be16(pix);</div><div class='ctx'> </div><div class='ctx'> 			*dst += 2;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -655,8 +659,8 @@ static void device_work(struct work_struct *w)</div><div class='ctx'> static int vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> 			   struct v4l2_capability *cap)</div><div class='ctx'> {</div><div class='del'>-	strncpy(cap-&gt;driver, MEM2MEM_NAME, sizeof(cap-&gt;driver) - 1);</div><div class='del'>-	strncpy(cap-&gt;card, MEM2MEM_NAME, sizeof(cap-&gt;card) - 1);</div><div class='add'>+	strscpy(cap-&gt;driver, MEM2MEM_NAME, sizeof(cap-&gt;driver));</div><div class='add'>+	strscpy(cap-&gt;card, MEM2MEM_NAME, sizeof(cap-&gt;card));</div><div class='ctx'> 	snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info),</div><div class='ctx'> 		 "platform:%s", MEM2MEM_NAME);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1262,6 +1266,15 @@ static int vim2m_release(struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vim2m_device_release(struct video_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct vim2m_dev *dev = container_of(vdev, struct vim2m_dev, vfd);</div><div class='add'>+</div><div class='add'>+	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;m2m_dev);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct v4l2_file_operations vim2m_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= vim2m_open,</div><div class='hunk'>@@ -1277,7 +1290,7 @@ static const struct video_device vim2m_videodev = {</div><div class='ctx'> 	.fops		= &amp;vim2m_fops,</div><div class='ctx'> 	.ioctl_ops	= &amp;vim2m_ioctl_ops,</div><div class='ctx'> 	.minor		= -1,</div><div class='del'>-	.release	= video_device_release_empty,</div><div class='add'>+	.release	= vim2m_device_release,</div><div class='ctx'> 	.device_caps	= V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1298,13 +1311,13 @@ static int vim2m_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct video_device *vfd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dev = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = v4l2_device_register(&amp;pdev-&gt;dev, &amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto error_free;</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;dev-&gt;num_inst, 0);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;dev_mutex);</div><div class='hunk'>@@ -1317,7 +1330,7 @@ static int vim2m_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register video device\n");</div><div class='del'>-		goto unreg_v4l2;</div><div class='add'>+		goto error_v4l2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	video_set_drvdata(vfd, dev);</div><div class='hunk'>@@ -1330,7 +1343,7 @@ static int vim2m_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(dev-&gt;m2m_dev)) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem device\n");</div><div class='ctx'> 		ret = PTR_ERR(dev-&gt;m2m_dev);</div><div class='del'>-		goto unreg_dev;</div><div class='add'>+		goto error_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEDIA_CONTROLLER</div><div class='hunk'>@@ -1346,27 +1359,29 @@ static int vim2m_probe(struct platform_device *pdev)</div><div class='ctx'> 						 MEDIA_ENT_F_PROC_VIDEO_SCALER);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem media controller\n");</div><div class='del'>-		goto unreg_m2m;</div><div class='add'>+		goto error_m2m;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = media_device_register(&amp;dev-&gt;mdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register mem2mem media device\n");</div><div class='del'>-		goto unreg_m2m_mc;</div><div class='add'>+		goto error_m2m_mc;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEDIA_CONTROLLER</div><div class='del'>-unreg_m2m_mc:</div><div class='add'>+error_m2m_mc:</div><div class='ctx'> 	v4l2_m2m_unregister_media_controller(dev-&gt;m2m_dev);</div><div class='del'>-unreg_m2m:</div><div class='add'>+error_m2m:</div><div class='ctx'> 	v4l2_m2m_release(dev-&gt;m2m_dev);</div><div class='ctx'> #endif</div><div class='del'>-unreg_dev:</div><div class='add'>+error_dev:</div><div class='ctx'> 	video_unregister_device(&amp;dev-&gt;vfd);</div><div class='del'>-unreg_v4l2:</div><div class='add'>+error_v4l2:</div><div class='ctx'> 	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='add'>+error_free:</div><div class='add'>+	kfree(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1382,9 +1397,7 @@ static int vim2m_remove(struct platform_device *pdev)</div><div class='ctx'> 	v4l2_m2m_unregister_media_controller(dev-&gt;m2m_dev);</div><div class='ctx'> 	media_device_cleanup(&amp;dev-&gt;mdev);</div><div class='ctx'> #endif</div><div class='del'>-	v4l2_m2m_release(dev-&gt;m2m_dev);</div><div class='ctx'> 	video_unregister_device(&amp;dev-&gt;vfd);</div><div class='del'>-	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/platform/vimc/Kconfig b/drivers/media/platform/vimc/Kconfig<br/>index 71c9fe7d3370..1de9bc9aa49b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ config VIDEO_VIMC</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	select VIDEO_V4L2_TPG</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Skeleton driver for Virtual Media Controller</div><div class='ctx'> </div><div class='ctx'> 	  This driver can be compared to the vivid driver for emulating</div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c<br/>index ea869631a3f6..e7d0fc2228a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-capture.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-capture.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-capture.c</a></div><div class='hunk'>@@ -28,6 +28,32 @@</div><div class='ctx'> </div><div class='ctx'> #define VIMC_CAP_DRV_NAME "vimc-capture"</div><div class='ctx'> </div><div class='add'>+static const u32 vimc_cap_supported_pixfmt[] = {</div><div class='add'>+	V4L2_PIX_FMT_BGR24,</div><div class='add'>+	V4L2_PIX_FMT_RGB24,</div><div class='add'>+	V4L2_PIX_FMT_ARGB32,</div><div class='add'>+	V4L2_PIX_FMT_SBGGR8,</div><div class='add'>+	V4L2_PIX_FMT_SGBRG8,</div><div class='add'>+	V4L2_PIX_FMT_SGRBG8,</div><div class='add'>+	V4L2_PIX_FMT_SRGGB8,</div><div class='add'>+	V4L2_PIX_FMT_SBGGR10,</div><div class='add'>+	V4L2_PIX_FMT_SGBRG10,</div><div class='add'>+	V4L2_PIX_FMT_SGRBG10,</div><div class='add'>+	V4L2_PIX_FMT_SRGGB10,</div><div class='add'>+	V4L2_PIX_FMT_SBGGR10ALAW8,</div><div class='add'>+	V4L2_PIX_FMT_SGBRG10ALAW8,</div><div class='add'>+	V4L2_PIX_FMT_SGRBG10ALAW8,</div><div class='add'>+	V4L2_PIX_FMT_SRGGB10ALAW8,</div><div class='add'>+	V4L2_PIX_FMT_SBGGR10DPCM8,</div><div class='add'>+	V4L2_PIX_FMT_SGBRG10DPCM8,</div><div class='add'>+	V4L2_PIX_FMT_SGRBG10DPCM8,</div><div class='add'>+	V4L2_PIX_FMT_SRGGB10DPCM8,</div><div class='add'>+	V4L2_PIX_FMT_SBGGR12,</div><div class='add'>+	V4L2_PIX_FMT_SGBRG12,</div><div class='add'>+	V4L2_PIX_FMT_SGRBG12,</div><div class='add'>+	V4L2_PIX_FMT_SRGGB12,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct vimc_cap_device {</div><div class='ctx'> 	struct vimc_ent_device ved;</div><div class='ctx'> 	struct video_device vdev;</div><div class='hunk'>@@ -101,29 +127,25 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 				    struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_pix_format *format = &amp;f-&gt;fmt.pix;</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='ctx'> </div><div class='ctx'> 	format-&gt;width = clamp_t(u32, format-&gt;width, VIMC_FRAME_MIN_WIDTH,</div><div class='ctx'> 				VIMC_FRAME_MAX_WIDTH) &amp; ~1;</div><div class='ctx'> 	format-&gt;height = clamp_t(u32, format-&gt;height, VIMC_FRAME_MIN_HEIGHT,</div><div class='ctx'> 				 VIMC_FRAME_MAX_HEIGHT) &amp; ~1;</div><div class='ctx'> </div><div class='del'>-	/* Don't accept a pixelformat that is not on the table */</div><div class='del'>-	vpix = vimc_pix_map_by_pixelformat(format-&gt;pixelformat);</div><div class='del'>-	if (!vpix) {</div><div class='del'>-		format-&gt;pixelformat = fmt_default.pixelformat;</div><div class='del'>-		vpix = vimc_pix_map_by_pixelformat(format-&gt;pixelformat);</div><div class='del'>-	}</div><div class='del'>-	/* TODO: Add support for custom bytesperline values */</div><div class='del'>-	format-&gt;bytesperline = format-&gt;width * vpix-&gt;bpp;</div><div class='del'>-	format-&gt;sizeimage = format-&gt;bytesperline * format-&gt;height;</div><div class='add'>+	vimc_colorimetry_clamp(format);</div><div class='ctx'> </div><div class='ctx'> 	if (format-&gt;field == V4L2_FIELD_ANY)</div><div class='ctx'> 		format-&gt;field = fmt_default.field;</div><div class='ctx'> </div><div class='del'>-	vimc_colorimetry_clamp(format);</div><div class='add'>+	/* TODO: Add support for custom bytesperline values */</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Don't accept a pixelformat that is not on the table */</div><div class='add'>+	if (!v4l2_format_info(format-&gt;pixelformat))</div><div class='add'>+		format-&gt;pixelformat = fmt_default.pixelformat;</div><div class='add'>+</div><div class='add'>+	return v4l2_fill_pixfmt(format, format-&gt;pixelformat,</div><div class='add'>+				format-&gt;width, format-&gt;height);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='hunk'>@@ -159,27 +181,31 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> static int vimc_cap_enum_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 				     struct v4l2_fmtdesc *f)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix = vimc_pix_map_by_index(f-&gt;index);</div><div class='del'>-</div><div class='del'>-	if (!vpix)</div><div class='add'>+	if (f-&gt;index &gt;= ARRAY_SIZE(vimc_cap_supported_pixfmt))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f-&gt;pixelformat = vpix-&gt;pixelformat;</div><div class='add'>+	f-&gt;pixelformat = vimc_cap_supported_pixfmt[f-&gt;index];</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool vimc_cap_is_pixfmt_supported(u32 pixelformat)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vimc_cap_supported_pixfmt); i++)</div><div class='add'>+		if (vimc_cap_supported_pixfmt[i] == pixelformat)</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 vimc_cap_enum_framesizes(struct file *file, void *fh,</div><div class='ctx'> 				    struct v4l2_frmsizeenum *fsize)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='del'>-</div><div class='ctx'> 	if (fsize-&gt;index)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Only accept code in the pix map table */</div><div class='del'>-	vpix = vimc_pix_map_by_code(fsize-&gt;pixel_format);</div><div class='del'>-	if (!vpix)</div><div class='add'>+	if (!vimc_cap_is_pixfmt_supported(fsize-&gt;pixel_format))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fsize-&gt;type = V4L2_FRMSIZE_TYPE_CONTINUOUS;</div><div class='hunk'>@@ -187,8 +213,8 @@ static int vimc_cap_enum_framesizes(struct file *file, void *fh,</div><div class='ctx'> 	fsize-&gt;stepwise.max_width = VIMC_FRAME_MAX_WIDTH;</div><div class='ctx'> 	fsize-&gt;stepwise.min_height = VIMC_FRAME_MIN_HEIGHT;</div><div class='ctx'> 	fsize-&gt;stepwise.max_height = VIMC_FRAME_MAX_HEIGHT;</div><div class='del'>-	fsize-&gt;stepwise.step_width = 2;</div><div class='del'>-	fsize-&gt;stepwise.step_height = 2;</div><div class='add'>+	fsize-&gt;stepwise.step_width = 1;</div><div class='add'>+	fsize-&gt;stepwise.step_height = 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -253,6 +279,7 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	vcap-&gt;stream.producer_pixfmt = vcap-&gt;format.pixelformat;</div><div class='ctx'> 	ret = vimc_streamer_s_stream(&amp;vcap-&gt;stream, &amp;vcap-&gt;ved, 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		media_pipeline_stop(entity);</div><div class='hunk'>@@ -338,6 +365,15 @@ static const struct media_entity_operations vimc_cap_mops = {</div><div class='ctx'> 	.link_validate		= vimc_link_validate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void vimc_cap_release(struct video_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct vimc_cap_device *vcap =</div><div class='add'>+		container_of(vdev, struct vimc_cap_device, vdev);</div><div class='add'>+</div><div class='add'>+	vimc_pads_cleanup(vcap-&gt;ved.pads);</div><div class='add'>+	kfree(vcap);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void vimc_cap_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 				 void *master_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -348,8 +384,6 @@ static void vimc_cap_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 	vb2_queue_release(&amp;vcap-&gt;queue);</div><div class='ctx'> 	media_entity_cleanup(ved-&gt;ent);</div><div class='ctx'> 	video_unregister_device(&amp;vcap-&gt;vdev);</div><div class='del'>-	vimc_pads_cleanup(vcap-&gt;ved.pads);</div><div class='del'>-	kfree(vcap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *vimc_cap_process_frame(struct vimc_ent_device *ved,</div><div class='hunk'>@@ -396,7 +430,6 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_device *v4l2_dev = master_data;</div><div class='ctx'> 	struct vimc_platform_data *pdata = comp-&gt;platform_data;</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='ctx'> 	struct vimc_cap_device *vcap;</div><div class='ctx'> 	struct video_device *vdev;</div><div class='ctx'> 	struct vb2_queue *q;</div><div class='hunk'>@@ -451,10 +484,8 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> </div><div class='ctx'> 	/* Set default frame format */</div><div class='ctx'> 	vcap-&gt;format = fmt_default;</div><div class='del'>-	vpix = vimc_pix_map_by_pixelformat(vcap-&gt;format.pixelformat);</div><div class='del'>-	vcap-&gt;format.bytesperline = vcap-&gt;format.width * vpix-&gt;bpp;</div><div class='del'>-	vcap-&gt;format.sizeimage = vcap-&gt;format.bytesperline *</div><div class='del'>-				 vcap-&gt;format.height;</div><div class='add'>+	v4l2_fill_pixfmt(&amp;vcap-&gt;format, vcap-&gt;format.pixelformat,</div><div class='add'>+			 vcap-&gt;format.width, vcap-&gt;format.height);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the vimc_ent_device struct */</div><div class='ctx'> 	vcap-&gt;ved.ent = &amp;vcap-&gt;vdev.entity;</div><div class='hunk'>@@ -467,7 +498,7 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> 	vdev = &amp;vcap-&gt;vdev;</div><div class='ctx'> 	vdev-&gt;device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;</div><div class='ctx'> 	vdev-&gt;entity.ops = &amp;vimc_cap_mops;</div><div class='del'>-	vdev-&gt;release = video_device_release_empty;</div><div class='add'>+	vdev-&gt;release = vimc_cap_release;</div><div class='ctx'> 	vdev-&gt;fops = &amp;vimc_cap_fops;</div><div class='ctx'> 	vdev-&gt;ioctl_ops = &amp;vimc_cap_ioctl_ops;</div><div class='ctx'> 	vdev-&gt;lock = &amp;vcap-&gt;lock;</div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c<br/>index c1a74bb2df58..fad7c7c6de93 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-common.c</a></div><div class='hunk'>@@ -20,192 +20,139 @@</div><div class='ctx'> </div><div class='ctx'> #include "vimc-common.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * NOTE: non-bayer formats need to come first (necessary for enum_mbus_code</div><div class='del'>- * in the scaler)</div><div class='del'>- */</div><div class='del'>-static const struct vimc_pix_map vimc_pix_map_list[] = {</div><div class='del'>-	/* TODO: add all missing formats */</div><div class='del'>-</div><div class='del'>-	/* RGB formats */</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_BGR888_1X24,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_BGR24,</div><div class='del'>-		.bpp = 3,</div><div class='del'>-		.bayer = false,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_RGB888_1X24,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_RGB24,</div><div class='del'>-		.bpp = 3,</div><div class='del'>-		.bayer = false,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_ARGB32,</div><div class='del'>-		.bpp = 4,</div><div class='del'>-		.bayer = false,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* Bayer formats */</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SBGGR8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SBGGR8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGBRG8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGBRG8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGRBG8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGRBG8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SRGGB8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SBGGR10_1X10,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SBGGR10,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGBRG10_1X10,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGBRG10,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGRBG10_1X10,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGRBG10,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SRGGB10_1X10,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SRGGB10,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* 10bit raw bayer a-law compressed to 8 bits */</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SBGGR10ALAW8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGBRG10ALAW8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGRBG10ALAW8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SRGGB10ALAW8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* 10bit raw bayer DPCM compressed to 8 bits */</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SBGGR10DPCM8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGBRG10DPCM8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGRBG10DPCM8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SRGGB10DPCM8,</div><div class='del'>-		.bpp = 1,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SBGGR12_1X12,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SBGGR12,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGBRG12_1X12,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGBRG12,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SGRBG12_1X12,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SGRBG12,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.code = MEDIA_BUS_FMT_SRGGB12_1X12,</div><div class='del'>-		.pixelformat = V4L2_PIX_FMT_SRGGB12,</div><div class='del'>-		.bpp = 2,</div><div class='del'>-		.bayer = true,</div><div class='del'>-	},</div><div class='add'>+static const __u32 vimc_mbus_list[] = {</div><div class='add'>+	MEDIA_BUS_FMT_FIXED,</div><div class='add'>+	MEDIA_BUS_FMT_RGB444_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB565_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_BGR565_2X8_BE,</div><div class='add'>+	MEDIA_BUS_FMT_BGR565_2X8_LE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB565_2X8_BE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB565_2X8_LE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB666_1X18,</div><div class='add'>+	MEDIA_BUS_FMT_RBG888_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_RGB666_1X24_CPADHI,</div><div class='add'>+	MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,</div><div class='add'>+	MEDIA_BUS_FMT_BGR888_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_GBR888_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_RGB888_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_RGB888_2X12_BE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB888_2X12_LE,</div><div class='add'>+	MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,</div><div class='add'>+	MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA,</div><div class='add'>+	MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	MEDIA_BUS_FMT_RGB888_1X32_PADHI,</div><div class='add'>+	MEDIA_BUS_FMT_RGB101010_1X30,</div><div class='add'>+	MEDIA_BUS_FMT_RGB121212_1X36,</div><div class='add'>+	MEDIA_BUS_FMT_RGB161616_1X48,</div><div class='add'>+	MEDIA_BUS_FMT_Y8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_UV8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY8_1_5X8,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY8_1_5X8,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV8_1_5X8,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU8_1_5X8,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY8_2X8,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY8_2X8,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV8_2X8,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU8_2X8,</div><div class='add'>+	MEDIA_BUS_FMT_Y10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY10_2X10,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY10_2X10,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV10_2X10,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU10_2X10,</div><div class='add'>+	MEDIA_BUS_FMT_Y12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY12_2X12,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY12_2X12,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV12_2X12,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU12_2X12,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY8_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY8_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV8_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU8_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_YDYUYDYV8_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY10_1X20,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY10_1X20,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV10_1X20,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU10_1X20,</div><div class='add'>+	MEDIA_BUS_FMT_VUY8_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_YUV8_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_UYYVYY8_0_5X24,</div><div class='add'>+	MEDIA_BUS_FMT_UYVY12_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_VYUY12_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_YUYV12_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_YVYU12_1X24,</div><div class='add'>+	MEDIA_BUS_FMT_YUV10_1X30,</div><div class='add'>+	MEDIA_BUS_FMT_UYYVYY10_0_5X30,</div><div class='add'>+	MEDIA_BUS_FMT_AYUV8_1X32,</div><div class='add'>+	MEDIA_BUS_FMT_UYYVYY12_0_5X36,</div><div class='add'>+	MEDIA_BUS_FMT_YUV12_1X36,</div><div class='add'>+	MEDIA_BUS_FMT_YUV16_1X48,</div><div class='add'>+	MEDIA_BUS_FMT_UYYVYY16_0_5X48,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB10_1X10,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB12_1X12,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR14_1X14,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG14_1X14,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG14_1X14,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB14_1X14,</div><div class='add'>+	MEDIA_BUS_FMT_SBGGR16_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_SGBRG16_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_SGRBG16_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_SRGGB16_1X16,</div><div class='add'>+	MEDIA_BUS_FMT_JPEG_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8,</div><div class='add'>+	MEDIA_BUS_FMT_AHSV8888_1X32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct vimc_pix_map *vimc_pix_map_by_index(unsigned int i)</div><div class='del'>-{</div><div class='del'>-	if (i &gt;= ARRAY_SIZE(vimc_pix_map_list))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return &amp;vimc_pix_map_list[i];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(vimc_pix_map_by_index);</div><div class='del'>-</div><div class='del'>-const struct vimc_pix_map *vimc_pix_map_by_code(u32 code)</div><div class='add'>+/* Helper function to check mbus codes */</div><div class='add'>+bool vimc_mbus_code_supported(__u32 code)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(vimc_pix_map_list); i++) {</div><div class='del'>-		if (vimc_pix_map_list[i].code == code)</div><div class='del'>-			return &amp;vimc_pix_map_list[i];</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vimc_mbus_list); i++)</div><div class='add'>+		if (code == vimc_mbus_list[i])</div><div class='add'>+			return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(vimc_pix_map_by_code);</div><div class='add'>+EXPORT_SYMBOL_GPL(vimc_mbus_code_supported);</div><div class='ctx'> </div><div class='del'>-const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat)</div><div class='add'>+/* Helper function to enumerate mbus codes */</div><div class='add'>+int vimc_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='add'>+			struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+			struct v4l2_subdev_mbus_code_enum *code)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='add'>+	if (code-&gt;index &gt;= ARRAY_SIZE(vimc_mbus_list))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(vimc_pix_map_list); i++) {</div><div class='del'>-		if (vimc_pix_map_list[i].pixelformat == pixelformat)</div><div class='del'>-			return &amp;vimc_pix_map_list[i];</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	code-&gt;code = vimc_mbus_list[code-&gt;index];</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(vimc_pix_map_by_pixelformat);</div><div class='add'>+EXPORT_SYMBOL_GPL(vimc_enum_mbus_code);</div><div class='ctx'> </div><div class='ctx'> /* Helper function to allocate and initialize pads */</div><div class='ctx'> struct media_pad *vimc_pads_init(u16 num_pads, const unsigned long *pads_flag)</div><div class='hunk'>@@ -277,15 +224,13 @@ static int vimc_get_mbus_format(struct media_pad *pad,</div><div class='ctx'> 							 struct video_device,</div><div class='ctx'> 							 entity);</div><div class='ctx'> 		struct vimc_ent_device *ved = video_get_drvdata(vdev);</div><div class='del'>-		const struct vimc_pix_map *vpix;</div><div class='ctx'> 		struct v4l2_pix_format vdev_fmt;</div><div class='ctx'> </div><div class='ctx'> 		if (!ved-&gt;vdev_get_format)</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='ctx'> </div><div class='ctx'> 		ved-&gt;vdev_get_format(ved, &amp;vdev_fmt);</div><div class='del'>-		vpix = vimc_pix_map_by_pixelformat(vdev_fmt.pixelformat);</div><div class='del'>-		v4l2_fill_mbus_format(&amp;fmt-&gt;format, &amp;vdev_fmt, vpix-&gt;code);</div><div class='add'>+		v4l2_fill_mbus_format(&amp;fmt-&gt;format, &amp;vdev_fmt, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -325,8 +270,12 @@ int vimc_link_validate(struct media_link *link)</div><div class='ctx'> 	/* The width, height and code must match. */</div><div class='ctx'> 	if (source_fmt.format.width != sink_fmt.format.width</div><div class='ctx'> 	    || source_fmt.format.height != sink_fmt.format.height</div><div class='del'>-	    || source_fmt.format.code != sink_fmt.format.code)</div><div class='add'>+	    || (source_fmt.format.code &amp;&amp; sink_fmt.format.code &amp;&amp;</div><div class='add'>+		source_fmt.format.code != sink_fmt.format.code)) {</div><div class='add'>+		pr_err("vimc: format doesn't match in link %s-&gt;%s\n",</div><div class='add'>+			link-&gt;source-&gt;entity-&gt;name, link-&gt;sink-&gt;entity-&gt;name);</div><div class='ctx'> 		return -EPIPE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The field order must match, or the sink field order must be NONE</div><div class='hunk'>@@ -380,6 +329,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,</div><div class='ctx'> 			 u32 function,</div><div class='ctx'> 			 u16 num_pads,</div><div class='ctx'> 			 const unsigned long *pads_flag,</div><div class='add'>+			 const struct v4l2_subdev_internal_ops *sd_int_ops,</div><div class='ctx'> 			 const struct v4l2_subdev_ops *sd_ops)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -394,6 +344,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the subdev */</div><div class='ctx'> 	v4l2_subdev_init(sd, sd_ops);</div><div class='add'>+	sd-&gt;internal_ops = sd_int_ops;</div><div class='ctx'> 	sd-&gt;entity.function = function;</div><div class='ctx'> 	sd-&gt;entity.ops = &amp;vimc_ent_sd_mops;</div><div class='ctx'> 	sd-&gt;owner = THIS_MODULE;</div><div class='hunk'>@@ -431,9 +382,9 @@ EXPORT_SYMBOL_GPL(vimc_ent_sd_register);</div><div class='ctx'> </div><div class='ctx'> void vimc_ent_sd_unregister(struct vimc_ent_device *ved, struct v4l2_subdev *sd)</div><div class='ctx'> {</div><div class='del'>-	v4l2_device_unregister_subdev(sd);</div><div class='ctx'> 	media_entity_cleanup(ved-&gt;ent);</div><div class='ctx'> 	vimc_pads_cleanup(ved-&gt;pads);</div><div class='add'>+	v4l2_device_unregister_subdev(sd);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vimc_ent_sd_unregister);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/platform/vimc/vimc-common.h<br/>index 84539430b5e7..142ddfa69b3d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-common.h</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;media/media-device.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-device.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "vimc-streamer.h"</div><div class='add'>+</div><div class='ctx'> #define VIMC_PDEV_NAME "vimc"</div><div class='ctx'> </div><div class='ctx'> /* VIMC-specific controls */</div><div class='hunk'>@@ -78,23 +80,6 @@ struct vimc_platform_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct vimc_pix_map - maps media bus code with v4l2 pixel format</div><div class='del'>- *</div><div class='del'>- * @code:		media bus format code defined by MEDIA_BUS_FMT_* macros</div><div class='del'>- * @bbp:		number of bytes each pixel occupies</div><div class='del'>- * @pixelformat:	pixel format devined by V4L2_PIX_FMT_* macros</div><div class='del'>- *</div><div class='del'>- * Struct which matches the MEDIA_BUS_FMT_* codes with the corresponding</div><div class='del'>- * V4L2_PIX_FMT_* fourcc pixelformat and its bytes per pixel (bpp)</div><div class='del'>- */</div><div class='del'>-struct vimc_pix_map {</div><div class='del'>-	unsigned int code;</div><div class='del'>-	unsigned int bpp;</div><div class='del'>-	u32 pixelformat;</div><div class='del'>-	bool bayer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct vimc_ent_device - core struct that represents a node in the topology</div><div class='ctx'>  *</div><div class='ctx'>  * @ent:		the pointer to struct media_entity for the node</div><div class='hunk'>@@ -115,6 +100,7 @@ struct vimc_pix_map {</div><div class='ctx'> struct vimc_ent_device {</div><div class='ctx'> 	struct media_entity *ent;</div><div class='ctx'> 	struct media_pad *pads;</div><div class='add'>+	struct vimc_stream *stream;</div><div class='ctx'> 	void * (*process_frame)(struct vimc_ent_device *ved,</div><div class='ctx'> 				const void *frame);</div><div class='ctx'> 	void (*vdev_get_format)(struct vimc_ent_device *ved,</div><div class='hunk'>@@ -122,6 +108,23 @@ struct vimc_ent_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * vimc_mbus_code_supported - helper to check supported mbus codes</div><div class='add'>+ *</div><div class='add'>+ * Helper function to check if mbus code is enumerated by vimc_enum_mbus_code()</div><div class='add'>+ */</div><div class='add'>+bool vimc_mbus_code_supported(__u32 code);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vimc_enum_mbus_code - enumerate mbus codes</div><div class='add'>+ *</div><div class='add'>+ * Helper function to be pluged in .enum_mbus_code from</div><div class='add'>+ * struct v4l2_subdev_pad_ops.</div><div class='add'>+ */</div><div class='add'>+int vimc_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='add'>+			struct v4l2_subdev_pad_config *cfg,</div><div class='add'>+			struct v4l2_subdev_mbus_code_enum *code);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * vimc_pads_init - initialize pads</div><div class='ctx'>  *</div><div class='ctx'>  * @num_pads:	number of pads to initialize</div><div class='hunk'>@@ -156,27 +159,6 @@ static inline void vimc_pads_cleanup(struct media_pad *pads)</div><div class='ctx'> int vimc_pipeline_s_stream(struct media_entity *ent, int enable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vimc_pix_map_by_index - get vimc_pix_map struct by its index</div><div class='del'>- *</div><div class='del'>- * @i:			index of the vimc_pix_map struct in vimc_pix_map_list</div><div class='del'>- */</div><div class='del'>-const struct vimc_pix_map *vimc_pix_map_by_index(unsigned int i);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vimc_pix_map_by_code - get vimc_pix_map struct by media bus code</div><div class='del'>- *</div><div class='del'>- * @code:		media bus format code defined by MEDIA_BUS_FMT_* macros</div><div class='del'>- */</div><div class='del'>-const struct vimc_pix_map *vimc_pix_map_by_code(u32 code);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vimc_pix_map_by_pixelformat - get vimc_pix_map struct by v4l2 pixel format</div><div class='del'>- *</div><div class='del'>- * @pixelformat:	pixel format devined by V4L2_PIX_FMT_* macros</div><div class='del'>- */</div><div class='del'>-const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * vimc_ent_sd_register - initialize and register a subdev node</div><div class='ctx'>  *</div><div class='ctx'>  * @ved:	the vimc_ent_device struct to be initialize</div><div class='hunk'>@@ -187,6 +169,7 @@ const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat);</div><div class='ctx'>  * @function:	media entity function defined by MEDIA_ENT_F_* macros</div><div class='ctx'>  * @num_pads:	number of pads to initialize</div><div class='ctx'>  * @pads_flag:	flags to use in each pad</div><div class='add'>+ * @sd_int_ops:	pointer to &amp;struct v4l2_subdev_internal_ops</div><div class='ctx'>  * @sd_ops:	pointer to &amp;struct v4l2_subdev_ops.</div><div class='ctx'>  *</div><div class='ctx'>  * Helper function initialize and register the struct vimc_ent_device and struct</div><div class='hunk'>@@ -199,6 +182,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,</div><div class='ctx'> 			 u32 function,</div><div class='ctx'> 			 u16 num_pads,</div><div class='ctx'> 			 const unsigned long *pads_flag,</div><div class='add'>+			 const struct v4l2_subdev_internal_ops *sd_int_ops,</div><div class='ctx'> 			 const struct v4l2_subdev_ops *sd_ops);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c<br/>index 0fbb7914098f..3aa62d7e3d0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-core.c</a></div><div class='hunk'>@@ -304,6 +304,8 @@ static int vimc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "probe");</div><div class='ctx'> </div><div class='add'>+	memset(&amp;vimc-&gt;mdev, 0, sizeof(vimc-&gt;mdev));</div><div class='add'>+</div><div class='ctx'> 	/* Create platform_device for each entity in the topology*/</div><div class='ctx'> 	vimc-&gt;subdevs = devm_kcalloc(&amp;vimc-&gt;pdev.dev, vimc-&gt;pipe_cfg-&gt;num_ents,</div><div class='ctx'> 				     sizeof(*vimc-&gt;subdevs), GFP_KERNEL);</div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c<br/>index 7d77c63b99d2..281f9c1a7249 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-debayer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-debayer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-debayer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-debayer.c</a></div><div class='hunk'>@@ -26,6 +26,9 @@</div><div class='ctx'> #include "vimc-common.h"</div><div class='ctx'> </div><div class='ctx'> #define VIMC_DEB_DRV_NAME "vimc-debayer"</div><div class='add'>+/* This module only supports tranforming a bayer format to V4L2_PIX_FMT_RGB24 */</div><div class='add'>+#define VIMC_DEB_SRC_PIXFMT V4L2_PIX_FMT_RGB24</div><div class='add'>+#define VIMC_DEB_SRC_MBUS_FMT_DEFAULT MEDIA_BUS_FMT_RGB888_1X24</div><div class='ctx'> </div><div class='ctx'> static unsigned int deb_mean_win_size = 3;</div><div class='ctx'> module_param(deb_mean_win_size, uint, 0000);</div><div class='hunk'>@@ -44,6 +47,7 @@ enum vimc_deb_rgb_colors {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vimc_deb_pix_map {</div><div class='add'>+	u32 pixelformat;</div><div class='ctx'> 	u32 code;</div><div class='ctx'> 	enum vimc_deb_rgb_colors order[2][2];</div><div class='ctx'> };</div><div class='hunk'>@@ -66,68 +70,80 @@ struct vimc_deb_device {</div><div class='ctx'> static const struct v4l2_mbus_framefmt sink_fmt_default = {</div><div class='ctx'> 	.width = 640,</div><div class='ctx'> 	.height = 480,</div><div class='del'>-	.code = MEDIA_BUS_FMT_RGB888_1X24,</div><div class='add'>+	.code = MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='ctx'> 	.field = V4L2_FIELD_NONE,</div><div class='ctx'> 	.colorspace = V4L2_COLORSPACE_DEFAULT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct vimc_deb_pix_map vimc_deb_pix_map_list[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SBGGR8,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SBGGR8_1X8,</div><div class='ctx'> 		.order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN },</div><div class='ctx'> 			   { VIMC_DEB_GREEN, VIMC_DEB_RED } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SGBRG8,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SGBRG8_1X8,</div><div class='ctx'> 		.order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE },</div><div class='ctx'> 			   { VIMC_DEB_RED, VIMC_DEB_GREEN } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SGRBG8,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SGRBG8_1X8,</div><div class='ctx'> 		.order = { { VIMC_DEB_GREEN, VIMC_DEB_RED },</div><div class='ctx'> 			   { VIMC_DEB_BLUE, VIMC_DEB_GREEN } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SRGGB8,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SRGGB8_1X8,</div><div class='ctx'> 		.order = { { VIMC_DEB_RED, VIMC_DEB_GREEN },</div><div class='ctx'> 			   { VIMC_DEB_GREEN, VIMC_DEB_BLUE } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SBGGR10,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SBGGR10_1X10,</div><div class='ctx'> 		.order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN },</div><div class='ctx'> 			   { VIMC_DEB_GREEN, VIMC_DEB_RED } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SGBRG10,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SGBRG10_1X10,</div><div class='ctx'> 		.order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE },</div><div class='ctx'> 			   { VIMC_DEB_RED, VIMC_DEB_GREEN } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SGRBG10,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SGRBG10_1X10,</div><div class='ctx'> 		.order = { { VIMC_DEB_GREEN, VIMC_DEB_RED },</div><div class='ctx'> 			   { VIMC_DEB_BLUE, VIMC_DEB_GREEN } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SRGGB10,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SRGGB10_1X10,</div><div class='ctx'> 		.order = { { VIMC_DEB_RED, VIMC_DEB_GREEN },</div><div class='ctx'> 			   { VIMC_DEB_GREEN, VIMC_DEB_BLUE } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SBGGR12,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SBGGR12_1X12,</div><div class='ctx'> 		.order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN },</div><div class='ctx'> 			   { VIMC_DEB_GREEN, VIMC_DEB_RED } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SGBRG12,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SGBRG12_1X12,</div><div class='ctx'> 		.order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE },</div><div class='ctx'> 			   { VIMC_DEB_RED, VIMC_DEB_GREEN } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SGRBG12,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SGRBG12_1X12,</div><div class='ctx'> 		.order = { { VIMC_DEB_GREEN, VIMC_DEB_RED },</div><div class='ctx'> 			   { VIMC_DEB_BLUE, VIMC_DEB_GREEN } }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_SRGGB12,</div><div class='ctx'> 		.code = MEDIA_BUS_FMT_SRGGB12_1X12,</div><div class='ctx'> 		.order = { { VIMC_DEB_RED, VIMC_DEB_GREEN },</div><div class='ctx'> 			   { VIMC_DEB_GREEN, VIMC_DEB_BLUE } }</div><div class='hunk'>@@ -168,41 +184,32 @@ static int vimc_deb_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='ctx'> 				   struct v4l2_subdev_pad_config *cfg,</div><div class='ctx'> 				   struct v4l2_subdev_mbus_code_enum *code)</div><div class='ctx'> {</div><div class='del'>-	/* We only support one format for source pads */</div><div class='del'>-	if (IS_SRC(code-&gt;pad)) {</div><div class='del'>-		struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);</div><div class='del'>-</div><div class='del'>-		if (code-&gt;index)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		code-&gt;code = vdeb-&gt;src_code;</div><div class='del'>-	} else {</div><div class='add'>+	/* For the sink pad we only support codes in the map_list */</div><div class='add'>+	if (IS_SINK(code-&gt;pad)) {</div><div class='ctx'> 		if (code-&gt;index &gt;= ARRAY_SIZE(vimc_deb_pix_map_list))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		code-&gt;code = vimc_deb_pix_map_list[code-&gt;index].code;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return vimc_enum_mbus_code(sd, cfg, code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vimc_deb_enum_frame_size(struct v4l2_subdev *sd,</div><div class='ctx'> 				    struct v4l2_subdev_pad_config *cfg,</div><div class='ctx'> 				    struct v4l2_subdev_frame_size_enum *fse)</div><div class='ctx'> {</div><div class='del'>-	struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);</div><div class='del'>-</div><div class='ctx'> 	if (fse-&gt;index)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* For the sink pad we only support codes in the map_list */</div><div class='ctx'> 	if (IS_SINK(fse-&gt;pad)) {</div><div class='ctx'> 		const struct vimc_deb_pix_map *vpix =</div><div class='ctx'> 			vimc_deb_pix_map_by_code(fse-&gt;code);</div><div class='ctx'> </div><div class='ctx'> 		if (!vpix)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-	} else if (fse-&gt;code != vdeb-&gt;src_code) {</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fse-&gt;min_width = VIMC_FRAME_MIN_WIDTH;</div><div class='hunk'>@@ -258,6 +265,9 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 	struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);</div><div class='ctx'> 	struct v4l2_mbus_framefmt *sink_fmt;</div><div class='ctx'> </div><div class='add'>+	if (!vimc_mbus_code_supported(fmt-&gt;format.code))</div><div class='add'>+		fmt-&gt;format.code = sink_fmt_default.code;</div><div class='add'>+</div><div class='ctx'> 	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_ACTIVE) {</div><div class='ctx'> 		/* Do not change the format while stream is on */</div><div class='ctx'> 		if (vdeb-&gt;src_frame)</div><div class='hunk'>@@ -270,11 +280,11 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do not change the format of the source pad,</div><div class='del'>-	 * it is propagated from the sink</div><div class='add'>+	 * it is propagated from the sink (except for the code)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (IS_SRC(fmt-&gt;pad)) {</div><div class='add'>+		vdeb-&gt;src_code = fmt-&gt;format.code;</div><div class='ctx'> 		fmt-&gt;format = *sink_fmt;</div><div class='del'>-		/* TODO: Add support for other formats */</div><div class='ctx'> 		fmt-&gt;format.code = vdeb-&gt;src_code;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Set the new format in the sink pad */</div><div class='hunk'>@@ -306,7 +316,7 @@ static const struct v4l2_subdev_pad_ops vimc_deb_pad_ops = {</div><div class='ctx'> 	.set_fmt		= vimc_deb_set_fmt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void vimc_deb_set_rgb_mbus_fmt_rgb888_1x24(struct vimc_deb_device *vdeb,</div><div class='add'>+static void vimc_deb_set_rgb_pix_rgb24(struct vimc_deb_device *vdeb,</div><div class='ctx'> 						  unsigned int lin,</div><div class='ctx'> 						  unsigned int col,</div><div class='ctx'> 						  unsigned int rgb[3])</div><div class='hunk'>@@ -323,25 +333,38 @@ static int vimc_deb_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 	struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='del'>-		const struct vimc_pix_map *vpix;</div><div class='add'>+		u32 src_pixelformat = vdeb-&gt;ved.stream-&gt;producer_pixfmt;</div><div class='add'>+		const struct v4l2_format_info *pix_info;</div><div class='ctx'> 		unsigned int frame_size;</div><div class='ctx'> </div><div class='ctx'> 		if (vdeb-&gt;src_frame)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		/* Calculate the frame size of the source pad */</div><div class='del'>-		vpix = vimc_pix_map_by_code(vdeb-&gt;src_code);</div><div class='del'>-		frame_size = vdeb-&gt;sink_fmt.width * vdeb-&gt;sink_fmt.height *</div><div class='del'>-				vpix-&gt;bpp;</div><div class='del'>-</div><div class='del'>-		/* Save the bytes per pixel of the sink */</div><div class='del'>-		vpix = vimc_pix_map_by_code(vdeb-&gt;sink_fmt.code);</div><div class='del'>-		vdeb-&gt;sink_bpp = vpix-&gt;bpp;</div><div class='add'>+		/* We only support translating bayer to RGB24 */</div><div class='add'>+		if (src_pixelformat != V4L2_PIX_FMT_RGB24) {</div><div class='add'>+			dev_err(vdeb-&gt;dev,</div><div class='add'>+				"translating to pixfmt (0x%08x) is not supported\n",</div><div class='add'>+				src_pixelformat);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Get the corresponding pixel map from the table */</div><div class='ctx'> 		vdeb-&gt;sink_pix_map =</div><div class='ctx'> 			vimc_deb_pix_map_by_code(vdeb-&gt;sink_fmt.code);</div><div class='ctx'> </div><div class='add'>+		/* Request bayer format from the pipeline for the sink pad */</div><div class='add'>+		vdeb-&gt;ved.stream-&gt;producer_pixfmt =</div><div class='add'>+			vdeb-&gt;sink_pix_map-&gt;pixelformat;</div><div class='add'>+</div><div class='add'>+		/* Calculate frame_size of the source */</div><div class='add'>+		pix_info = v4l2_format_info(src_pixelformat);</div><div class='add'>+		frame_size = vdeb-&gt;sink_fmt.width * vdeb-&gt;sink_fmt.height *</div><div class='add'>+			     pix_info-&gt;bpp[0];</div><div class='add'>+</div><div class='add'>+		/* Get bpp from the sink */</div><div class='add'>+		pix_info = v4l2_format_info(vdeb-&gt;sink_pix_map-&gt;pixelformat);</div><div class='add'>+		vdeb-&gt;sink_bpp = pix_info-&gt;bpp[0];</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Allocate the frame buffer. Use vmalloc to be able to</div><div class='ctx'> 		 * allocate a large amount of memory</div><div class='hunk'>@@ -489,6 +512,18 @@ static void *vimc_deb_process_frame(struct vimc_ent_device *ved,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vimc_deb_release(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct vimc_deb_device *vdeb =</div><div class='add'>+				container_of(sd, struct vimc_deb_device, sd);</div><div class='add'>+</div><div class='add'>+	kfree(vdeb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_internal_ops vimc_deb_int_ops = {</div><div class='add'>+	.release = vimc_deb_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void vimc_deb_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 				 void *master_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -497,7 +532,6 @@ static void vimc_deb_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 						    ved);</div><div class='ctx'> </div><div class='ctx'> 	vimc_ent_sd_unregister(ved, &amp;vdeb-&gt;sd);</div><div class='del'>-	kfree(vdeb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vimc_deb_comp_bind(struct device *comp, struct device *master,</div><div class='hunk'>@@ -519,7 +553,7 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> 				   MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV, 2,</div><div class='ctx'> 				   (const unsigned long[2]) {MEDIA_PAD_FL_SINK,</div><div class='ctx'> 				   MEDIA_PAD_FL_SOURCE},</div><div class='del'>-				   &amp;vimc_deb_ops);</div><div class='add'>+				   &amp;vimc_deb_int_ops, &amp;vimc_deb_ops);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(vdeb);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -531,14 +565,14 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the frame format */</div><div class='ctx'> 	vdeb-&gt;sink_fmt = sink_fmt_default;</div><div class='add'>+	vdeb-&gt;src_code = VIMC_DEB_SRC_MBUS_FMT_DEFAULT;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO: Add support for more output formats, we only support</div><div class='del'>-	 * RGB888 for now</div><div class='add'>+	 * RGB24 for now.</div><div class='ctx'> 	 * NOTE: the src format is always the same as the sink, except</div><div class='ctx'> 	 * for the code</div><div class='ctx'> 	 */</div><div class='del'>-	vdeb-&gt;src_code = MEDIA_BUS_FMT_RGB888_1X24;</div><div class='del'>-	vdeb-&gt;set_rgb_src = vimc_deb_set_rgb_mbus_fmt_rgb888_1x24;</div><div class='add'>+	vdeb-&gt;set_rgb_src = vimc_deb_set_rgb_pix_rgb24;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c<br/>index 39b2a73dfcc1..8aecf8e92031 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-scaler.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-scaler.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-scaler.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-scaler.c</a></div><div class='hunk'>@@ -35,6 +35,12 @@ MODULE_PARM_DESC(sca_mult, " the image size multiplier");</div><div class='ctx'> #define IS_SRC(pad)	(pad)</div><div class='ctx'> #define MAX_ZOOM	8</div><div class='ctx'> </div><div class='add'>+static const u32 vimc_sca_supported_pixfmt[] = {</div><div class='add'>+	V4L2_PIX_FMT_BGR24,</div><div class='add'>+	V4L2_PIX_FMT_RGB24,</div><div class='add'>+	V4L2_PIX_FMT_ARGB32,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct vimc_sca_device {</div><div class='ctx'> 	struct vimc_ent_device ved;</div><div class='ctx'> 	struct v4l2_subdev sd;</div><div class='hunk'>@@ -57,6 +63,16 @@ static const struct v4l2_mbus_framefmt sink_fmt_default = {</div><div class='ctx'> 	.colorspace = V4L2_COLORSPACE_DEFAULT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool vimc_sca_is_pixfmt_supported(u32 pixelformat)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vimc_sca_supported_pixfmt); i++)</div><div class='add'>+		if (vimc_sca_supported_pixfmt[i] == pixelformat)</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 vimc_sca_init_cfg(struct v4l2_subdev *sd,</div><div class='ctx'> 			     struct v4l2_subdev_pad_config *cfg)</div><div class='ctx'> {</div><div class='hunk'>@@ -76,35 +92,13 @@ static int vimc_sca_init_cfg(struct v4l2_subdev *sd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vimc_sca_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='del'>-				   struct v4l2_subdev_pad_config *cfg,</div><div class='del'>-				   struct v4l2_subdev_mbus_code_enum *code)</div><div class='del'>-{</div><div class='del'>-	const struct vimc_pix_map *vpix = vimc_pix_map_by_index(code-&gt;index);</div><div class='del'>-</div><div class='del'>-	/* We don't support bayer format */</div><div class='del'>-	if (!vpix || vpix-&gt;bayer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	code-&gt;code = vpix-&gt;code;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int vimc_sca_enum_frame_size(struct v4l2_subdev *sd,</div><div class='ctx'> 				    struct v4l2_subdev_pad_config *cfg,</div><div class='ctx'> 				    struct v4l2_subdev_frame_size_enum *fse)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='del'>-</div><div class='ctx'> 	if (fse-&gt;index)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Only accept code in the pix map table in non bayer format */</div><div class='del'>-	vpix = vimc_pix_map_by_code(fse-&gt;code);</div><div class='del'>-	if (!vpix || vpix-&gt;bayer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	fse-&gt;min_width = VIMC_FRAME_MIN_WIDTH;</div><div class='ctx'> 	fse-&gt;min_height = VIMC_FRAME_MIN_HEIGHT;</div><div class='ctx'> </div><div class='hunk'>@@ -141,13 +135,6 @@ static int vimc_sca_get_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> </div><div class='ctx'> static void vimc_sca_adjust_sink_fmt(struct v4l2_mbus_framefmt *fmt)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='del'>-</div><div class='del'>-	/* Only accept code in the pix map table in non bayer format */</div><div class='del'>-	vpix = vimc_pix_map_by_code(fmt-&gt;code);</div><div class='del'>-	if (!vpix || vpix-&gt;bayer)</div><div class='del'>-		fmt-&gt;code = sink_fmt_default.code;</div><div class='del'>-</div><div class='ctx'> 	fmt-&gt;width = clamp_t(u32, fmt-&gt;width, VIMC_FRAME_MIN_WIDTH,</div><div class='ctx'> 			     VIMC_FRAME_MAX_WIDTH) &amp; ~1;</div><div class='ctx'> 	fmt-&gt;height = clamp_t(u32, fmt-&gt;height, VIMC_FRAME_MIN_HEIGHT,</div><div class='hunk'>@@ -166,6 +153,9 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 	struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);</div><div class='ctx'> 	struct v4l2_mbus_framefmt *sink_fmt;</div><div class='ctx'> </div><div class='add'>+	if (!vimc_mbus_code_supported(fmt-&gt;format.code))</div><div class='add'>+		fmt-&gt;format.code = sink_fmt_default.code;</div><div class='add'>+</div><div class='ctx'> 	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_ACTIVE) {</div><div class='ctx'> 		/* Do not change the format while stream is on */</div><div class='ctx'> 		if (vsca-&gt;src_frame)</div><div class='hunk'>@@ -208,7 +198,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_subdev_pad_ops vimc_sca_pad_ops = {</div><div class='ctx'> 	.init_cfg		= vimc_sca_init_cfg,</div><div class='del'>-	.enum_mbus_code		= vimc_sca_enum_mbus_code,</div><div class='add'>+	.enum_mbus_code		= vimc_enum_mbus_code,</div><div class='ctx'> 	.enum_frame_size	= vimc_sca_enum_frame_size,</div><div class='ctx'> 	.get_fmt		= vimc_sca_get_fmt,</div><div class='ctx'> 	.set_fmt		= vimc_sca_set_fmt,</div><div class='hunk'>@@ -219,15 +209,22 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 	struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='del'>-		const struct vimc_pix_map *vpix;</div><div class='add'>+		u32 pixelformat = vsca-&gt;ved.stream-&gt;producer_pixfmt;</div><div class='add'>+		const struct v4l2_format_info *pix_info;</div><div class='ctx'> 		unsigned int frame_size;</div><div class='ctx'> </div><div class='ctx'> 		if (vsca-&gt;src_frame)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='add'>+		if (!vimc_sca_is_pixfmt_supported(pixelformat)) {</div><div class='add'>+			dev_err(vsca-&gt;dev, "pixfmt (0x%08x) is not supported\n",</div><div class='add'>+				pixelformat);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Save the bytes per pixel of the sink */</div><div class='del'>-		vpix = vimc_pix_map_by_code(vsca-&gt;sink_fmt.code);</div><div class='del'>-		vsca-&gt;bpp = vpix-&gt;bpp;</div><div class='add'>+		pix_info = v4l2_format_info(pixelformat);</div><div class='add'>+		vsca-&gt;bpp = pix_info-&gt;bpp[0];</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate the width in bytes of the src frame */</div><div class='ctx'> 		vsca-&gt;src_line_size = vsca-&gt;sink_fmt.width *</div><div class='hunk'>@@ -348,6 +345,18 @@ static void *vimc_sca_process_frame(struct vimc_ent_device *ved,</div><div class='ctx'> 	return vsca-&gt;src_frame;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void vimc_sca_release(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct vimc_sca_device *vsca =</div><div class='add'>+				container_of(sd, struct vimc_sca_device, sd);</div><div class='add'>+</div><div class='add'>+	kfree(vsca);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_internal_ops vimc_sca_int_ops = {</div><div class='add'>+	.release = vimc_sca_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void vimc_sca_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 				 void *master_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -356,7 +365,6 @@ static void vimc_sca_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 						    ved);</div><div class='ctx'> </div><div class='ctx'> 	vimc_ent_sd_unregister(ved, &amp;vsca-&gt;sd);</div><div class='del'>-	kfree(vsca);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -379,7 +387,7 @@ static int vimc_sca_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> 				   MEDIA_ENT_F_PROC_VIDEO_SCALER, 2,</div><div class='ctx'> 				   (const unsigned long[2]) {MEDIA_PAD_FL_SINK,</div><div class='ctx'> 				   MEDIA_PAD_FL_SOURCE},</div><div class='del'>-				   &amp;vimc_sca_ops);</div><div class='add'>+				   &amp;vimc_sca_int_ops, &amp;vimc_sca_ops);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(vsca);</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c<br/>index 59195f262623..081e54204c9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-sensor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-sensor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-sensor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-sensor.c</a></div><div class='hunk'>@@ -65,34 +65,13 @@ static int vimc_sen_init_cfg(struct v4l2_subdev *sd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vimc_sen_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='del'>-				   struct v4l2_subdev_pad_config *cfg,</div><div class='del'>-				   struct v4l2_subdev_mbus_code_enum *code)</div><div class='del'>-{</div><div class='del'>-	const struct vimc_pix_map *vpix = vimc_pix_map_by_index(code-&gt;index);</div><div class='del'>-</div><div class='del'>-	if (!vpix)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	code-&gt;code = vpix-&gt;code;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int vimc_sen_enum_frame_size(struct v4l2_subdev *sd,</div><div class='ctx'> 				    struct v4l2_subdev_pad_config *cfg,</div><div class='ctx'> 				    struct v4l2_subdev_frame_size_enum *fse)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='del'>-</div><div class='ctx'> 	if (fse-&gt;index)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Only accept code in the pix map table */</div><div class='del'>-	vpix = vimc_pix_map_by_code(fse-&gt;code);</div><div class='del'>-	if (!vpix)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	fse-&gt;min_width = VIMC_FRAME_MIN_WIDTH;</div><div class='ctx'> 	fse-&gt;max_width = VIMC_FRAME_MAX_WIDTH;</div><div class='ctx'> 	fse-&gt;min_height = VIMC_FRAME_MIN_HEIGHT;</div><div class='hunk'>@@ -117,14 +96,17 @@ static int vimc_sen_get_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> </div><div class='ctx'> static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix =</div><div class='del'>-				vimc_pix_map_by_code(vsen-&gt;mbus_format.code);</div><div class='add'>+	u32 pixelformat = vsen-&gt;ved.stream-&gt;producer_pixfmt;</div><div class='add'>+	const struct v4l2_format_info *pix_info;</div><div class='add'>+</div><div class='add'>+	pix_info = v4l2_format_info(pixelformat);</div><div class='ctx'> </div><div class='ctx'> 	tpg_reset_source(&amp;vsen-&gt;tpg, vsen-&gt;mbus_format.width,</div><div class='ctx'> 			 vsen-&gt;mbus_format.height, vsen-&gt;mbus_format.field);</div><div class='del'>-	tpg_s_bytesperline(&amp;vsen-&gt;tpg, 0, vsen-&gt;mbus_format.width * vpix-&gt;bpp);</div><div class='add'>+	tpg_s_bytesperline(&amp;vsen-&gt;tpg, 0,</div><div class='add'>+			   vsen-&gt;mbus_format.width * pix_info-&gt;bpp[0]);</div><div class='ctx'> 	tpg_s_buf_height(&amp;vsen-&gt;tpg, vsen-&gt;mbus_format.height);</div><div class='del'>-	tpg_s_fourcc(&amp;vsen-&gt;tpg, vpix-&gt;pixelformat);</div><div class='add'>+	tpg_s_fourcc(&amp;vsen-&gt;tpg, pixelformat);</div><div class='ctx'> 	/* TODO: add support for V4L2_FIELD_ALTERNATE */</div><div class='ctx'> 	tpg_s_field(&amp;vsen-&gt;tpg, vsen-&gt;mbus_format.field, false);</div><div class='ctx'> 	tpg_s_colorspace(&amp;vsen-&gt;tpg, vsen-&gt;mbus_format.colorspace);</div><div class='hunk'>@@ -135,13 +117,6 @@ static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen)</div><div class='ctx'> </div><div class='ctx'> static void vimc_sen_adjust_fmt(struct v4l2_mbus_framefmt *fmt)</div><div class='ctx'> {</div><div class='del'>-	const struct vimc_pix_map *vpix;</div><div class='del'>-</div><div class='del'>-	/* Only accept code in the pix map table */</div><div class='del'>-	vpix = vimc_pix_map_by_code(fmt-&gt;code);</div><div class='del'>-	if (!vpix)</div><div class='del'>-		fmt-&gt;code = fmt_default.code;</div><div class='del'>-</div><div class='ctx'> 	fmt-&gt;width = clamp_t(u32, fmt-&gt;width, VIMC_FRAME_MIN_WIDTH,</div><div class='ctx'> 			     VIMC_FRAME_MAX_WIDTH) &amp; ~1;</div><div class='ctx'> 	fmt-&gt;height = clamp_t(u32, fmt-&gt;height, VIMC_FRAME_MIN_HEIGHT,</div><div class='hunk'>@@ -161,6 +136,9 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 	struct vimc_sen_device *vsen = v4l2_get_subdevdata(sd);</div><div class='ctx'> 	struct v4l2_mbus_framefmt *mf;</div><div class='ctx'> </div><div class='add'>+	if (!vimc_mbus_code_supported(fmt-&gt;format.code))</div><div class='add'>+		fmt-&gt;format.code = fmt_default.code;</div><div class='add'>+</div><div class='ctx'> 	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_ACTIVE) {</div><div class='ctx'> 		/* Do not change the format while stream is on */</div><div class='ctx'> 		if (vsen-&gt;frame)</div><div class='hunk'>@@ -193,7 +171,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_subdev_pad_ops vimc_sen_pad_ops = {</div><div class='ctx'> 	.init_cfg		= vimc_sen_init_cfg,</div><div class='del'>-	.enum_mbus_code		= vimc_sen_enum_mbus_code,</div><div class='add'>+	.enum_mbus_code		= vimc_enum_mbus_code,</div><div class='ctx'> 	.enum_frame_size	= vimc_sen_enum_frame_size,</div><div class='ctx'> 	.get_fmt		= vimc_sen_get_fmt,</div><div class='ctx'> 	.set_fmt		= vimc_sen_set_fmt,</div><div class='hunk'>@@ -215,7 +193,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 				container_of(sd, struct vimc_sen_device, sd);</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='del'>-		const struct vimc_pix_map *vpix;</div><div class='add'>+		u32 pixelformat = vsen-&gt;ved.stream-&gt;producer_pixfmt;</div><div class='add'>+		const struct v4l2_format_info *pix_info;</div><div class='ctx'> 		unsigned int frame_size;</div><div class='ctx'> </div><div class='ctx'> 		if (vsen-&gt;kthread_sen)</div><div class='hunk'>@@ -223,8 +202,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate the frame size */</div><div class='del'>-		vpix = vimc_pix_map_by_code(vsen-&gt;mbus_format.code);</div><div class='del'>-		frame_size = vsen-&gt;mbus_format.width * vpix-&gt;bpp *</div><div class='add'>+		pix_info = v4l2_format_info(pixelformat);</div><div class='add'>+		frame_size = vsen-&gt;mbus_format.width * pix_info-&gt;bpp[0] *</div><div class='ctx'> 			     vsen-&gt;mbus_format.height;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -301,6 +280,20 @@ static const struct v4l2_ctrl_ops vimc_sen_ctrl_ops = {</div><div class='ctx'> 	.s_ctrl = vimc_sen_s_ctrl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void vimc_sen_release(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct vimc_sen_device *vsen =</div><div class='add'>+				container_of(sd, struct vimc_sen_device, sd);</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_handler_free(&amp;vsen-&gt;hdl);</div><div class='add'>+	tpg_free(&amp;vsen-&gt;tpg);</div><div class='add'>+	kfree(vsen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_internal_ops vimc_sen_int_ops = {</div><div class='add'>+	.release = vimc_sen_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void vimc_sen_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 				 void *master_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -309,9 +302,6 @@ static void vimc_sen_comp_unbind(struct device *comp, struct device *master,</div><div class='ctx'> 				container_of(ved, struct vimc_sen_device, ved);</div><div class='ctx'> </div><div class='ctx'> 	vimc_ent_sd_unregister(ved, &amp;vsen-&gt;sd);</div><div class='del'>-	v4l2_ctrl_handler_free(&amp;vsen-&gt;hdl);</div><div class='del'>-	tpg_free(&amp;vsen-&gt;tpg);</div><div class='del'>-	kfree(vsen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Image Processing Controls */</div><div class='hunk'>@@ -371,7 +361,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master,</div><div class='ctx'> 				   pdata-&gt;entity_name,</div><div class='ctx'> 				   MEDIA_ENT_F_CAM_SENSOR, 1,</div><div class='ctx'> 				   (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE},</div><div class='del'>-				   &amp;vimc_sen_ops);</div><div class='add'>+				   &amp;vimc_sen_int_ops, &amp;vimc_sen_ops);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_hdl;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-streamer.c b/drivers/media/platform/vimc/vimc-streamer.c<br/>index fcc897fb247b..26b674259489 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-streamer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-streamer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-streamer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-streamer.c</a></div><div class='hunk'>@@ -46,19 +46,19 @@ static struct media_entity *vimc_get_source_entity(struct media_entity *ent)</div><div class='ctx'>  */</div><div class='ctx'> static void vimc_streamer_pipeline_terminate(struct vimc_stream *stream)</div><div class='ctx'> {</div><div class='del'>-	struct media_entity *entity;</div><div class='add'>+	struct vimc_ent_device *ved;</div><div class='ctx'> 	struct v4l2_subdev *sd;</div><div class='ctx'> </div><div class='ctx'> 	while (stream-&gt;pipe_size) {</div><div class='ctx'> 		stream-&gt;pipe_size--;</div><div class='del'>-		entity = stream-&gt;ved_pipeline[stream-&gt;pipe_size]-&gt;ent;</div><div class='del'>-		entity = vimc_get_source_entity(entity);</div><div class='add'>+		ved = stream-&gt;ved_pipeline[stream-&gt;pipe_size];</div><div class='add'>+		ved-&gt;stream = NULL;</div><div class='ctx'> 		stream-&gt;ved_pipeline[stream-&gt;pipe_size] = NULL;</div><div class='ctx'> </div><div class='del'>-		if (!is_media_entity_v4l2_subdev(entity))</div><div class='add'>+		if (!is_media_entity_v4l2_subdev(ved-&gt;ent))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sd = media_entity_to_v4l2_subdev(entity);</div><div class='add'>+		sd = media_entity_to_v4l2_subdev(ved-&gt;ent);</div><div class='ctx'> 		v4l2_subdev_call(sd, video, s_stream, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -88,19 +88,27 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		stream-&gt;ved_pipeline[stream-&gt;pipe_size++] = ved;</div><div class='add'>+		ved-&gt;stream = stream;</div><div class='add'>+</div><div class='add'>+		if (is_media_entity_v4l2_subdev(ved-&gt;ent)) {</div><div class='add'>+			sd = media_entity_to_v4l2_subdev(ved-&gt;ent);</div><div class='add'>+			ret = v4l2_subdev_call(sd, video, s_stream, 1);</div><div class='add'>+			if (ret &amp;&amp; ret != -ENOIOCTLCMD) {</div><div class='add'>+				pr_err("subdev_call error %s\n",</div><div class='add'>+				       ved-&gt;ent-&gt;name);</div><div class='add'>+				vimc_streamer_pipeline_terminate(stream);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		entity = vimc_get_source_entity(ved-&gt;ent);</div><div class='ctx'> 		/* Check if the end of the pipeline was reached*/</div><div class='ctx'> 		if (!entity)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='add'>+		/* Get the next device in the pipeline */</div><div class='ctx'> 		if (is_media_entity_v4l2_subdev(entity)) {</div><div class='ctx'> 			sd = media_entity_to_v4l2_subdev(entity);</div><div class='del'>-			ret = v4l2_subdev_call(sd, video, s_stream, 1);</div><div class='del'>-			if (ret &amp;&amp; ret != -ENOIOCTLCMD) {</div><div class='del'>-				vimc_streamer_pipeline_terminate(stream);</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='ctx'> 			ved = v4l2_get_subdevdata(sd);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			vdev = container_of(entity,</div><div class='hunk'>@@ -117,10 +125,10 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream,</div><div class='ctx'> static int vimc_streamer_thread(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct vimc_stream *stream = data;</div><div class='add'>+	u8 *frame = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	set_freezable();</div><div class='del'>-	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		try_to_freeze();</div><div class='hunk'>@@ -128,15 +136,13 @@ static int vimc_streamer_thread(void *data)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		for (i = stream-&gt;pipe_size - 1; i &gt;= 0; i--) {</div><div class='del'>-			stream-&gt;frame = stream-&gt;ved_pipeline[i]-&gt;process_frame(</div><div class='del'>-					stream-&gt;ved_pipeline[i],</div><div class='del'>-					stream-&gt;frame);</div><div class='del'>-			if (!stream-&gt;frame)</div><div class='del'>-				break;</div><div class='del'>-			if (IS_ERR(stream-&gt;frame))</div><div class='add'>+			frame = stream-&gt;ved_pipeline[i]-&gt;process_frame(</div><div class='add'>+					stream-&gt;ved_pipeline[i], frame);</div><div class='add'>+			if (!frame || IS_ERR(frame))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		//wait for 60hz</div><div class='add'>+		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 		schedule_timeout(HZ / 60);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/platform/vimc/vimc-streamer.h b/drivers/media/platform/vimc/vimc-streamer.h<br/>index 752af2e2d5a2..2b3667408794 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-streamer.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vimc/vimc-streamer.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vimc/vimc-streamer.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vimc/vimc-streamer.h</a></div><div class='hunk'>@@ -15,12 +15,32 @@</div><div class='ctx'> </div><div class='ctx'> #define VIMC_STREAMER_PIPELINE_MAX_SIZE 16</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct vimc_stream - struct that represents a stream in the pipeline</div><div class='add'>+ *</div><div class='add'>+ * @pipe:		the media pipeline object associated with this stream</div><div class='add'>+ * @ved_pipeline:	array containing all the entities participating in the</div><div class='add'>+ * stream. The order is from a video device (usually a capture device) where</div><div class='add'>+ * stream_on was called, to the entity generating the first base image to be</div><div class='add'>+ * processed in the pipeline.</div><div class='add'>+ * @pipe_size:		size of @ved_pipeline</div><div class='add'>+ * @kthread:		thread that generates the frames of the stream.</div><div class='add'>+ * @producer_pixfmt:	the pixel format requested from the pipeline. This must</div><div class='add'>+ * be set just before calling vimc_streamer_s_stream(ent, 1). This value is</div><div class='add'>+ * propagated up to the source of the base image (usually a sensor node) and</div><div class='add'>+ * can be modified by entities during s_stream callback to request a different</div><div class='add'>+ * format from rest of the pipeline.</div><div class='add'>+ *</div><div class='add'>+ * When the user call stream_on in a video device, struct vimc_stream is</div><div class='add'>+ * used to keep track of all entities and subdevices that generates and</div><div class='add'>+ * process frames for the stream.</div><div class='add'>+ */</div><div class='ctx'> struct vimc_stream {</div><div class='ctx'> 	struct media_pipeline pipe;</div><div class='ctx'> 	struct vimc_ent_device *ved_pipeline[VIMC_STREAMER_PIPELINE_MAX_SIZE];</div><div class='ctx'> 	unsigned int pipe_size;</div><div class='del'>-	u8 *frame;</div><div class='ctx'> 	struct task_struct *kthread;</div><div class='add'>+	u32 producer_pixfmt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/media/platform/vivid/Kconfig b/drivers/media/platform/vivid/Kconfig<br/>index 154de92dd809..4b51d4d6cf93 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vivid/Kconfig</a></div><div class='hunk'>@@ -11,7 +11,7 @@ config VIDEO_VIVID</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select VIDEO_V4L2_TPG</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables a virtual video driver. This driver emulates a webcam,</div><div class='ctx'> 	  TV, S-Video and HDMI capture hardware, including VBI support for</div><div class='ctx'> 	  the SDTV inputs. Also video output, VBI output, radio receivers,</div><div class='hunk'>@@ -28,7 +28,7 @@ config VIDEO_VIVID_CEC</div><div class='ctx'> 	bool "Enable CEC emulation support"</div><div class='ctx'> 	depends on VIDEO_VIVID</div><div class='ctx'> 	select CEC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  When selected the vivid module will emulate the optional</div><div class='ctx'> 	  HDMI CEC feature.</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +36,6 @@ config VIDEO_VIVID_MAX_DEVS</div><div class='ctx'> 	int "Maximum number of devices"</div><div class='ctx'> 	depends on VIDEO_VIVID</div><div class='ctx'> 	default "64"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This allows you to specify the maximum number of devices supported</div><div class='ctx'> 	  by the vivid driver.</div><div class='head'>diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c<br/>index 342e0e6c103b..7047df6f0e0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/vivid-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/vivid-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/vivid-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vivid/vivid-core.c</a></div><div class='hunk'>@@ -681,7 +681,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)</div><div class='ctx'> 	dev-&gt;v4l2_dev.mdev = &amp;dev-&gt;mdev;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize media device */</div><div class='del'>-	strlcpy(dev-&gt;mdev.model, VIVID_MODULE_NAME, sizeof(dev-&gt;mdev.model));</div><div class='add'>+	strscpy(dev-&gt;mdev.model, VIVID_MODULE_NAME, sizeof(dev-&gt;mdev.model));</div><div class='ctx'> 	snprintf(dev-&gt;mdev.bus_info, sizeof(dev-&gt;mdev.bus_info),</div><div class='ctx'> 		 "platform:%s-%03d", VIVID_MODULE_NAME, inst);</div><div class='ctx'> 	dev-&gt;mdev.dev = &amp;pdev-&gt;dev;</div><div class='head'>diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c<br/>index 52eeda624d7e..530ac8decb25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/vivid-vid-cap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/vivid-vid-cap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/vivid-vid-cap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vivid/vivid-vid-cap.c</a></div><div class='hunk'>@@ -1007,7 +1007,7 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection</div><div class='ctx'> 		v4l2_rect_map_inside(&amp;s-&gt;r, &amp;dev-&gt;fmt_cap_rect);</div><div class='ctx'> 		if (dev-&gt;bitmap_cap &amp;&amp; (compose-&gt;width != s-&gt;r.width ||</div><div class='ctx'> 					compose-&gt;height != s-&gt;r.height)) {</div><div class='del'>-			kfree(dev-&gt;bitmap_cap);</div><div class='add'>+			vfree(dev-&gt;bitmap_cap);</div><div class='ctx'> 			dev-&gt;bitmap_cap = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		*compose = s-&gt;r;</div><div class='head'>diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c<br/>index e61b91b414f9..9350ca65dd91 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/vivid-vid-out.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vivid/vivid-vid-out.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vivid/vivid-vid-out.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vivid/vivid-vid-out.c</a></div><div class='hunk'>@@ -798,7 +798,7 @@ int vivid_vid_out_s_selection(struct file *file, void *fh, struct v4l2_selection</div><div class='ctx'> 		s-&gt;r.height *= factor;</div><div class='ctx'> 		if (dev-&gt;bitmap_out &amp;&amp; (compose-&gt;width != s-&gt;r.width ||</div><div class='ctx'> 					compose-&gt;height != s-&gt;r.height)) {</div><div class='del'>-			kfree(dev-&gt;bitmap_out);</div><div class='add'>+			vfree(dev-&gt;bitmap_out);</div><div class='ctx'> 			dev-&gt;bitmap_out = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		*compose = s-&gt;r;</div><div class='hunk'>@@ -941,15 +941,19 @@ int vidioc_s_fmt_vid_out_overlay(struct file *file, void *priv,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (win-&gt;bitmap) {</div><div class='del'>-		new_bitmap = memdup_user(win-&gt;bitmap, bitmap_size);</div><div class='add'>+		new_bitmap = vzalloc(bitmap_size);</div><div class='ctx'> </div><div class='del'>-		if (IS_ERR(new_bitmap))</div><div class='del'>-			return PTR_ERR(new_bitmap);</div><div class='add'>+		if (!new_bitmap)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		if (copy_from_user(new_bitmap, win-&gt;bitmap, bitmap_size)) {</div><div class='add'>+			vfree(new_bitmap);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;overlay_out_top = win-&gt;w.top;</div><div class='ctx'> 	dev-&gt;overlay_out_left = win-&gt;w.left;</div><div class='del'>-	kfree(dev-&gt;bitmap_out);</div><div class='add'>+	vfree(dev-&gt;bitmap_out);</div><div class='ctx'> 	dev-&gt;bitmap_out = new_bitmap;</div><div class='ctx'> 	dev-&gt;clipcount_out = win-&gt;clipcount;</div><div class='ctx'> 	if (dev-&gt;clipcount_out)</div><div class='head'>diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c<br/>index 54ff539ffea0..f72ac01c21ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vsp1/vsp1_pipe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/vsp1/vsp1_pipe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/vsp1/vsp1_pipe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/vsp1/vsp1_pipe.c</a></div><div class='hunk'>@@ -42,6 +42,30 @@ static const struct vsp1_format_info vsp1_video_formats[] = {</div><div class='ctx'> 	  VI6_FMT_XRGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='ctx'> 	  VI6_RPF_DSWAP_P_WDS,</div><div class='ctx'> 	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_RGBA444, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBA_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_RGBX444, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBX_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_ABGR444, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_ABGR_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_XBGR444, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_ABGR_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_BGRA444, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_BGRA_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_BGRX444, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_BGRA_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='ctx'> 	{ V4L2_PIX_FMT_ARGB555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='ctx'> 	  VI6_FMT_ARGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='ctx'> 	  VI6_RPF_DSWAP_P_WDS,</div><div class='hunk'>@@ -50,6 +74,30 @@ static const struct vsp1_format_info vsp1_video_formats[] = {</div><div class='ctx'> 	  VI6_FMT_XRGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='ctx'> 	  VI6_RPF_DSWAP_P_WDS,</div><div class='ctx'> 	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_RGBA555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBA_5551, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_RGBX555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBX_5551, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_ABGR555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_ABGR_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_XBGR555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_ABGR_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_BGRA555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_BGRA_5551, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_BGRX555, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_BGRA_5551, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS,</div><div class='add'>+	  1, { 16, 0, 0 }, false, false, 1, 1, false },</div><div class='ctx'> 	{ V4L2_PIX_FMT_RGB565, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='ctx'> 	  VI6_FMT_RGB_565, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='ctx'> 	  VI6_RPF_DSWAP_P_WDS,</div><div class='hunk'>@@ -68,6 +116,20 @@ static const struct vsp1_format_info vsp1_video_formats[] = {</div><div class='ctx'> 	{ V4L2_PIX_FMT_XBGR32, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='ctx'> 	  VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,</div><div class='ctx'> 	  1, { 32, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_BGRA32, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBA_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,</div><div class='add'>+	  1, { 32, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_BGRX32, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBA_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,</div><div class='add'>+	  1, { 32, 0, 0 }, false, false, 1, 1, false },</div><div class='add'>+	{ V4L2_PIX_FMT_RGBA32, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBA_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,</div><div class='add'>+	  1, { 32, 0, 0 }, false, false, 1, 1, true },</div><div class='add'>+	{ V4L2_PIX_FMT_RGBX32, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='add'>+	  VI6_FMT_RGBA_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='add'>+	  VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,</div><div class='add'>+	  1, { 32, 0, 0 }, false, false, 1, 1, false },</div><div class='ctx'> 	{ V4L2_PIX_FMT_ARGB32, MEDIA_BUS_FMT_ARGB8888_1X32,</div><div class='ctx'> 	  VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |</div><div class='ctx'> 	  VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,</div><div class='head'>diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig<br/>index 74ec8aaa5ae0..a2773ad7c185 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/xilinx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/platform/xilinx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/platform/xilinx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/platform/xilinx/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,7 @@ config VIDEO_XILINX</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API &amp;&amp; OF &amp;&amp; HAS_DMA</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for Xilinx Video IP Pipelines</div><div class='ctx'> </div><div class='ctx'> if VIDEO_XILINX</div><div class='hunk'>@@ -14,13 +14,13 @@ config VIDEO_XILINX_TPG</div><div class='ctx'> 	tristate "Xilinx Video Test Pattern Generator"</div><div class='ctx'> 	depends on VIDEO_XILINX</div><div class='ctx'> 	select VIDEO_XILINX_VTC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Driver for the Xilinx Video Test Pattern Generator</div><div class='ctx'> </div><div class='ctx'> config VIDEO_XILINX_VTC</div><div class='ctx'> 	tristate "Xilinx Video Timing Controller"</div><div class='ctx'> 	depends on VIDEO_XILINX</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Driver for the Xilinx Video Timing Controller</div><div class='ctx'> </div><div class='ctx'> endif #VIDEO_XILINX</div><div class='head'>diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig<br/>index 9b99dfb2d0c6..9cd00f64af32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/radio/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ menuconfig RADIO_ADAPTERS</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	depends on MEDIA_RADIO_SUPPORT</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable selecting AM/FM radio adapters.</div><div class='ctx'> </div><div class='ctx'> if RADIO_ADAPTERS &amp;&amp; VIDEO_V4L2</div><div class='hunk'>@@ -29,7 +29,7 @@ config RADIO_SI476X</div><div class='ctx'> 	depends on MFD_SI476X_CORE</div><div class='ctx'> 	depends on SND_SOC</div><div class='ctx'> 	select SND_SOC_SI476X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this FM radio chip.</div><div class='ctx'> </div><div class='ctx'> 	  In order to control your radio card, you will need to use programs</div><div class='hunk'>@@ -43,7 +43,7 @@ config RADIO_SI476X</div><div class='ctx'> config USB_MR800</div><div class='ctx'> 	tristate "AverMedia MR 800 USB FM radio support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect this type of radio to your</div><div class='ctx'> 	  computer's USB port. Note that the audio is not digital, and</div><div class='ctx'> 	  you must connect the line out connector to a sound card or a</div><div class='hunk'>@@ -55,7 +55,7 @@ config USB_MR800</div><div class='ctx'> config USB_DSBR</div><div class='ctx'> 	tristate "D-Link/GemTek USB FM radio support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect this type of radio to your</div><div class='ctx'> 	  computer's USB port. Note that the audio is not digital, and</div><div class='ctx'> 	  you must connect the line out connector to a sound card or a</div><div class='hunk'>@@ -68,7 +68,7 @@ config RADIO_MAXIRADIO</div><div class='ctx'> 	tristate "Guillemot MAXI Radio FM 2000 radio"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; PCI</div><div class='ctx'> 	select RADIO_TEA575X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this radio card.  This card may also be</div><div class='ctx'> 	  found as Gemtek PCI FM.</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ config RADIO_SHARK</div><div class='ctx'> 	tristate "Griffin radioSHARK USB radio receiver"</div><div class='ctx'> 	depends on USB</div><div class='ctx'> 	select RADIO_TEA575X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this radio receiver.</div><div class='ctx'> </div><div class='ctx'> 	  There are 2 versions of this device, this driver is for version 1,</div><div class='hunk'>@@ -101,7 +101,7 @@ config RADIO_SHARK</div><div class='ctx'> config RADIO_SHARK2</div><div class='ctx'> 	tristate "Griffin radioSHARK2 USB radio receiver"</div><div class='ctx'> 	depends on USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this radio receiver.</div><div class='ctx'> </div><div class='ctx'> 	  There are 2 versions of this device, this driver is for version 2,</div><div class='hunk'>@@ -118,7 +118,7 @@ config RADIO_SHARK2</div><div class='ctx'> config USB_KEENE</div><div class='ctx'> 	tristate "Keene FM Transmitter USB support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect this type of FM transmitter</div><div class='ctx'> 	  to your computer's USB port.</div><div class='ctx'> </div><div class='hunk'>@@ -128,7 +128,7 @@ config USB_KEENE</div><div class='ctx'> config USB_RAREMONO</div><div class='ctx'> 	tristate "Thanko's Raremono AM/FM/SW radio support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The 'Thanko's Raremono' device contains the Si4734 chip from Silicon Labs Inc.</div><div class='ctx'> 	  It is one of the very few or perhaps the only consumer USB radio device</div><div class='ctx'> 	  to receive the AM/FM/SW bands.</div><div class='hunk'>@@ -142,7 +142,7 @@ config USB_RAREMONO</div><div class='ctx'> config USB_MA901</div><div class='ctx'> 	tristate "Masterkit MA901 USB FM radio support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect this type of radio to your</div><div class='ctx'> 	  computer's USB port. Note that the audio is not digital, and</div><div class='ctx'> 	  you must connect the line out connector to a sound card or a</div><div class='hunk'>@@ -154,7 +154,7 @@ config USB_MA901</div><div class='ctx'> config RADIO_TEA5764</div><div class='ctx'> 	tristate "TEA5764 I2C FM radio support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the TEA5764 FM chip found in</div><div class='ctx'> 	  EZX phones. This FM chip is present in EZX phones from Motorola,</div><div class='ctx'> 	  connected to internal pxa I2C bus.</div><div class='hunk'>@@ -173,7 +173,7 @@ config RADIO_TEA5764_XTAL</div><div class='ctx'> config RADIO_SAA7706H</div><div class='ctx'> 	tristate "SAA7706H Car Radio DSP"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the SAA7706H Car radio Digital</div><div class='ctx'> 	  Signal Processor, found for instance on the Russellville development</div><div class='ctx'> 	  board. On the russellville the device is connected to internal</div><div class='hunk'>@@ -185,7 +185,7 @@ config RADIO_SAA7706H</div><div class='ctx'> config RADIO_TEF6862</div><div class='ctx'> 	tristate "TEF6862 Car Radio Enhanced Selectivity Tuner"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the TEF6862 Car Radio Enhanced</div><div class='ctx'> 	  Selectivity Tuner, found for instance on the Russellville development</div><div class='ctx'> 	  board. On the russellville the device is connected to internal</div><div class='hunk'>@@ -200,7 +200,7 @@ config RADIO_TIMBERDALE</div><div class='ctx'> 	depends on I2C	# for RADIO_SAA7706H</div><div class='ctx'> 	select RADIO_TEF6862</div><div class='ctx'> 	select RADIO_SAA7706H</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a kind of umbrella driver for the Radio Tuner and DSP</div><div class='ctx'> 	  found behind the Timberdale FPGA on the Russellville board.</div><div class='ctx'> 	  Enabling this driver will automatically select the DSP and tuner.</div><div class='hunk'>@@ -211,7 +211,7 @@ config RADIO_WL1273</div><div class='ctx'> 	select MFD_CORE</div><div class='ctx'> 	select MFD_WL1273_CORE</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this FM radio chip.</div><div class='ctx'> </div><div class='ctx'> 	  In order to control your radio card, you will need to use programs</div><div class='hunk'>@@ -233,7 +233,7 @@ menuconfig V4L_RADIO_ISA_DRIVERS</div><div class='ctx'> 	bool "ISA radio devices"</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable support for these ISA drivers.</div><div class='ctx'> </div><div class='ctx'> if V4L_RADIO_ISA_DRIVERS</div><div class='hunk'>@@ -246,7 +246,7 @@ config RADIO_CADET</div><div class='ctx'> 	tristate "ADS Cadet AM/FM Tuner"</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these AM/FM radio cards, and then</div><div class='ctx'> 	  fill in the port address below.</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +258,7 @@ config RADIO_RTRACK</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these FM radio cards, and then fill</div><div class='ctx'> 	  in the port address below.</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +290,7 @@ config RADIO_RTRACK2</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this FM radio card, and then fill in the</div><div class='ctx'> 	  port address below.</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +314,7 @@ config RADIO_AZTECH</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these FM radio cards, and then fill</div><div class='ctx'> 	  in the port address below.</div><div class='ctx'> </div><div class='hunk'>@@ -335,7 +335,7 @@ config RADIO_GEMTEK</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this FM radio card, and then fill in the</div><div class='ctx'> 	  I/O port address and settings below. The following cards either have</div><div class='ctx'> 	  GemTek Radio tuner or are rebranded GemTek Radio cards:</div><div class='hunk'>@@ -377,7 +377,7 @@ config RADIO_MIROPCM20</div><div class='ctx'> 	depends on ISA_DMA_API &amp;&amp; VIDEO_V4L2 &amp;&amp; SND</div><div class='ctx'> 	select SND_ISA</div><div class='ctx'> 	select SND_MIRO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this FM radio card. You also need to enable</div><div class='ctx'> 	  the ALSA sound system. This choice automatically selects the ALSA</div><div class='ctx'> 	  sound card driver "Miro miroSOUND PCM1pro/PCM12/PCM20radio" as this</div><div class='hunk'>@@ -390,7 +390,7 @@ config RADIO_SF16FMI</div><div class='ctx'> 	tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio"</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these FM radio cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -401,7 +401,7 @@ config RADIO_SF16FMR2</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_TEA575X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these FM radio cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -412,7 +412,7 @@ config RADIO_TERRATEC</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have this FM radio card.</div><div class='ctx'> </div><div class='ctx'> 	  Note: this driver hasn't been tested since a long time due to lack</div><div class='hunk'>@@ -451,7 +451,7 @@ config RADIO_TYPHOON</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these FM radio cards, and then fill</div><div class='ctx'> 	  in the port address and the frequency used for muting below.</div><div class='ctx'> </div><div class='hunk'>@@ -486,7 +486,7 @@ config RADIO_ZOLTRIX</div><div class='ctx'> 	depends on ISA || COMPILE_TEST</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select RADIO_ISA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose Y here if you have one of these FM radio cards, and then fill</div><div class='ctx'> 	  in the port address below.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/si470x/Kconfig b/drivers/media/radio/si470x/Kconfig<br/>index 6dbb158cd2a0..21026488de90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/si470x/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/si470x/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/si470x/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/radio/si470x/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> config RADIO_SI470X</div><div class='ctx'>         tristate "Silicon Labs Si470x FM Radio Receiver support"</div><div class='ctx'>         depends on VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for devices with the Silicon Labs SI470x</div><div class='ctx'> 	  chip (either via USB or I2C buses).</div><div class='ctx'> </div><div class='hunk'>@@ -15,7 +15,7 @@ config RADIO_SI470X</div><div class='ctx'> config USB_SI470X</div><div class='ctx'> 	tristate "Silicon Labs Si470x FM Radio Receiver support with USB"</div><div class='ctx'> 	depends on USB &amp;&amp; RADIO_SI470X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for USB devices with the Silicon Labs SI470x</div><div class='ctx'> 	  chip. Currently these devices are known to work:</div><div class='ctx'> 	  - 10c4:818a: Silicon Labs USB FM Radio Reference Design</div><div class='hunk'>@@ -40,7 +40,7 @@ config USB_SI470X</div><div class='ctx'> config I2C_SI470X</div><div class='ctx'> 	tristate "Silicon Labs Si470x FM Radio Receiver support with I2C"</div><div class='ctx'> 	depends on I2C &amp;&amp; RADIO_SI470X</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for I2C devices with the Silicon Labs SI470x</div><div class='ctx'> 	  chip.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/si4713/Kconfig b/drivers/media/radio/si4713/Kconfig<br/>index 9c8b887cff75..17567c917554 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/si4713/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/si4713/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/si4713/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/radio/si4713/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config USB_SI4713</div><div class='ctx'> 	tristate "Silicon Labs Si4713 FM Radio Transmitter support with USB"</div><div class='ctx'> 	depends on USB &amp;&amp; I2C &amp;&amp; RADIO_SI4713</div><div class='ctx'> 	select I2C_SI4713</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for USB devices with the Silicon Labs SI4713</div><div class='ctx'> 	  chip. Currently these devices are known to work.</div><div class='ctx'> 	  - 10c4:8244: Silicon Labs FM Transmitter USB device.</div><div class='hunk'>@@ -17,7 +17,7 @@ config PLATFORM_SI4713</div><div class='ctx'> 	tristate "Silicon Labs Si4713 FM Radio Transmitter support with I2C"</div><div class='ctx'> 	depends on I2C &amp;&amp; RADIO_SI4713</div><div class='ctx'> 	select I2C_SI4713</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for I2C devices with the Silicon Labs SI4713</div><div class='ctx'> 	  chip.</div><div class='ctx'> </div><div class='hunk'>@@ -30,7 +30,7 @@ config PLATFORM_SI4713</div><div class='ctx'> config I2C_SI4713</div><div class='ctx'> 	tristate "Silicon Labs Si4713 FM Radio Transmitter support"</div><div class='ctx'> 	depends on I2C &amp;&amp; RADIO_SI4713</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want support to Si4713 FM Radio Transmitter.</div><div class='ctx'> 	  This device can transmit audio through FM. It can transmit</div><div class='ctx'> 	  RDS and RBDS signals as well. This module is the v4l2 radio</div><div class='head'>diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c<br/>index f4a53f1e856e..a8584371a32d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/si4713/si4713.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/si4713/si4713.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/si4713/si4713.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/radio/si4713/si4713.c</a></div><div class='hunk'>@@ -1272,7 +1272,7 @@ static int si4713_g_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)</div><div class='ctx'> 	if (vm-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strncpy(vm-&gt;name, "FM Modulator", 32);</div><div class='add'>+	strscpy(vm-&gt;name, "FM Modulator", sizeof(vm-&gt;name));</div><div class='ctx'> 	vm-&gt;capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW |</div><div class='ctx'> 		V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_CONTROLS;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c<br/>index 3c8987af3772..053d51a5890a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/wl128x/fmdrv_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/radio/wl128x/fmdrv_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/radio/wl128x/fmdrv_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/radio/wl128x/fmdrv_common.c</a></div><div class='hunk'>@@ -489,7 +489,8 @@ int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Send response data to caller */</div><div class='del'>-	if (response != NULL &amp;&amp; response_len != NULL &amp;&amp; evt_hdr-&gt;dlen) {</div><div class='add'>+	if (response != NULL &amp;&amp; response_len != NULL &amp;&amp; evt_hdr-&gt;dlen &amp;&amp;</div><div class='add'>+	    evt_hdr-&gt;dlen &lt;= payload_len) {</div><div class='ctx'> 		/* Skip header info and copy only response data */</div><div class='ctx'> 		skb_pull(skb, sizeof(struct fm_event_msg_hdr));</div><div class='ctx'> 		memcpy(response, skb-&gt;data, evt_hdr-&gt;dlen);</div><div class='hunk'>@@ -583,6 +584,8 @@ static void fm_irq_handle_flag_getcmd_resp(struct fmdev *fmdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	fm_evt_hdr = (void *)skb-&gt;data;</div><div class='add'>+	if (fm_evt_hdr-&gt;dlen &gt; sizeof(fmdev-&gt;irq_info.flag))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Skip header info and copy only response data */</div><div class='ctx'> 	skb_pull(skb, sizeof(struct fm_event_msg_hdr));</div><div class='hunk'>@@ -1268,8 +1271,9 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name)</div><div class='ctx'> </div><div class='ctx'> 		switch (action-&gt;type) {</div><div class='ctx'> 		case ACTION_SEND_COMMAND:	/* Send */</div><div class='del'>-			if (fmc_send_cmd(fmdev, 0, 0, action-&gt;data,</div><div class='del'>-						action-&gt;size, NULL, NULL))</div><div class='add'>+			ret = fmc_send_cmd(fmdev, 0, 0, action-&gt;data,</div><div class='add'>+					   action-&gt;size, NULL, NULL);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				goto rel_fw;</div><div class='ctx'> </div><div class='ctx'> 			cmd_cnt++;</div><div class='hunk'>@@ -1308,7 +1312,7 @@ static int load_default_rx_configuration(struct fmdev *fmdev)</div><div class='ctx'> static int fm_power_up(struct fmdev *fmdev, u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	__be16 asic_id, asic_ver;</div><div class='add'>+	__be16 asic_id = 0, asic_ver = 0;</div><div class='ctx'> 	int resp_len, ret;</div><div class='ctx'> 	u8 fw_name[50];</div><div class='ctx'> </div><div class='hunk'>@@ -1520,7 +1524,7 @@ int fmc_prepare(struct fmdev *fmdev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = 0;</div><div class='del'>-	} else if (ret == -1) {</div><div class='add'>+	} else if (ret &lt; 0) {</div><div class='ctx'> 		fmerr("st_register failed %d\n", ret);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig<br/>index 96ce3e5524e0..3fc6ac15c66d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> menuconfig RC_CORE</div><div class='ctx'> 	tristate "Remote Controller support"</div><div class='ctx'> 	depends on INPUT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Remote Controllers on Linux. This is</div><div class='ctx'> 	  needed in order to support several video capture adapters,</div><div class='ctx'> 	  standalone IR receivers/transmitters, and RF receivers.</div><div class='hunk'>@@ -19,7 +19,7 @@ source "drivers/media/rc/keymaps/Kconfig"</div><div class='ctx'> config LIRC</div><div class='ctx'> 	bool "LIRC user interface"</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option to enable the Linux Infrared Remote</div><div class='ctx'> 	   Control user interface (e.g. /dev/lirc*). This interface</div><div class='ctx'> 	   passes raw IR to and from userspace, which is needed for</div><div class='hunk'>@@ -48,7 +48,7 @@ config IR_NEC_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have IR with NEC protocol, and</div><div class='ctx'> 	   if the IR is decoded in software</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +57,7 @@ config IR_RC5_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have IR with RC-5 protocol, and</div><div class='ctx'> 	   if the IR is decoded in software</div><div class='ctx'> </div><div class='hunk'>@@ -66,7 +66,7 @@ config IR_RC6_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have an infrared remote control which</div><div class='ctx'> 	   uses the RC6 protocol, and you need software decoding support.</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +75,7 @@ config IR_JVC_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have an infrared remote control which</div><div class='ctx'> 	   uses the JVC protocol, and you need software decoding support.</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ config IR_SONY_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have an infrared remote control which</div><div class='ctx'> 	   uses the Sony protocol, and you need software decoding support.</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +92,7 @@ config IR_SANYO_DECODER</div><div class='ctx'> 	tristate "Enable IR raw decoder for the Sanyo protocol"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have an infrared remote control which</div><div class='ctx'> 	   uses the Sanyo protocol (Sanyo, Aiwa, Chinon remotes),</div><div class='ctx'> 	   and you need software decoding support.</div><div class='hunk'>@@ -101,7 +101,7 @@ config IR_SHARP_DECODER</div><div class='ctx'> 	tristate "Enable IR raw decoder for the Sharp protocol"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have an infrared remote control which</div><div class='ctx'> 	   uses the Sharp protocol (Sharp, Denon), and you need software</div><div class='ctx'> 	   decoding support.</div><div class='hunk'>@@ -111,7 +111,7 @@ config IR_MCE_KBD_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have a Microsoft Remote Keyboard for</div><div class='ctx'> 	   Windows Media Center Edition, which you would like to use with</div><div class='ctx'> 	   a raw IR receiver in your system.</div><div class='hunk'>@@ -121,14 +121,14 @@ config IR_XMP_DECODER</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have IR with XMP protocol, and</div><div class='ctx'> 	   if the IR is decoded in software</div><div class='ctx'> </div><div class='ctx'> config IR_IMON_DECODER</div><div class='ctx'> 	tristate "Enable IR raw decoder for the iMON protocol"</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enable this option if you have iMON PAD or Antec Veris infrared</div><div class='ctx'> 	   remote control and you would like to use it with a raw IR</div><div class='ctx'> 	   receiver, or if you wish to use an encoder to transmit this IR.</div><div class='hunk'>@@ -177,7 +177,7 @@ config IR_ENE</div><div class='ctx'> 	tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)"</div><div class='ctx'> 	depends on PNP || COMPILE_TEST</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here to enable support for integrated infrared receiver</div><div class='ctx'> 	   /transceiver made by ENE.</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +203,7 @@ config IR_IMON</div><div class='ctx'> 	depends on USB_ARCH_HAS_HCD</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use a SoundGraph iMON (aka Antec Veris)</div><div class='ctx'> 	   IR Receiver and/or LCD/VFD/VGA display.</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +215,7 @@ config IR_IMON_RAW</div><div class='ctx'> 	depends on USB_ARCH_HAS_HCD</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use a SoundGraph iMON IR Receiver,</div><div class='ctx'> 	   early raw models.</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +227,7 @@ config IR_MCEUSB</div><div class='ctx'> 	depends on USB_ARCH_HAS_HCD</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use a Windows Media Center Edition</div><div class='ctx'> 	   eHome Infrared Transceiver.</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +238,7 @@ config IR_ITE_CIR</div><div class='ctx'> 	tristate "ITE Tech Inc. IT8712/IT8512 Consumer Infrared Transceiver"</div><div class='ctx'> 	depends on PNP || COMPILE_TEST</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here to enable support for integrated infrared receivers</div><div class='ctx'> 	   /transceivers made by ITE Tech Inc. These are found in</div><div class='ctx'> 	   several ASUS devices, like the ASUS Digimatrix or the ASUS</div><div class='hunk'>@@ -251,7 +251,7 @@ config IR_FINTEK</div><div class='ctx'> 	tristate "Fintek Consumer Infrared Transceiver"</div><div class='ctx'> 	depends on PNP || COMPILE_TEST</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here to enable support for integrated infrared receiver</div><div class='ctx'> 	   /transceiver made by Fintek. This chip is found on assorted</div><div class='ctx'> 	   Jetway motherboards (and of course, possibly others).</div><div class='hunk'>@@ -263,7 +263,7 @@ config IR_MESON</div><div class='ctx'> 	tristate "Amlogic Meson IR remote receiver"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on ARCH_MESON || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use the IR remote receiver available</div><div class='ctx'> 	   on Amlogic Meson SoCs.</div><div class='ctx'> </div><div class='hunk'>@@ -274,7 +274,7 @@ config IR_MTK</div><div class='ctx'> 	tristate "Mediatek IR remote receiver"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use the IR remote receiver available</div><div class='ctx'> 	   on Mediatek SoCs.</div><div class='ctx'> </div><div class='hunk'>@@ -285,7 +285,7 @@ config IR_NUVOTON</div><div class='ctx'> 	tristate "Nuvoton w836x7hg Consumer Infrared Transceiver"</div><div class='ctx'> 	depends on PNP || COMPILE_TEST</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here to enable support for integrated infrared receiver</div><div class='ctx'> 	   /transceiver made by Nuvoton (formerly Winbond). This chip is</div><div class='ctx'> 	   found in the ASRock ION 330HT, as well as assorted Intel</div><div class='hunk'>@@ -301,7 +301,7 @@ config IR_REDRAT3</div><div class='ctx'> 	select NEW_LEDS</div><div class='ctx'> 	select LEDS_CLASS</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use a RedRat3 Infrared Transceiver.</div><div class='ctx'> </div><div class='ctx'> 	   To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -311,7 +311,7 @@ config IR_SPI</div><div class='ctx'> 	tristate "SPI connected IR LED"</div><div class='ctx'> 	depends on SPI &amp;&amp; LIRC</div><div class='ctx'> 	depends on OF || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y if you want to use an IR LED connected through SPI bus.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -322,7 +322,7 @@ config IR_STREAMZAP</div><div class='ctx'> 	depends on USB_ARCH_HAS_HCD</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use a Streamzap PC Remote</div><div class='ctx'> 	   Infrared Receiver.</div><div class='ctx'> </div><div class='hunk'>@@ -336,7 +336,7 @@ config IR_WINBOND_CIR</div><div class='ctx'> 	select NEW_LEDS</div><div class='ctx'> 	select LEDS_CLASS</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 IR remote functionality found</div><div class='ctx'> 	   in some Winbond SuperI/O chips. Currently only the WPCD376I</div><div class='ctx'> 	   chip is supported (included in some Intel Media series</div><div class='hunk'>@@ -350,7 +350,7 @@ config IR_IGORPLUGUSB</div><div class='ctx'> 	depends on USB_ARCH_HAS_HCD</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use the IgorPlug-USB IR Receiver by</div><div class='ctx'> 	   Igor Cesko. This device is included on the Fit-PC2.</div><div class='ctx'> </div><div class='hunk'>@@ -365,7 +365,7 @@ config IR_IGUANA</div><div class='ctx'> 	depends on USB_ARCH_HAS_HCD</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	select USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use the IguanaWorks USB IR Transceiver.</div><div class='ctx'> 	   Both infrared receive and send are supported. If you want to</div><div class='ctx'> 	   change the ID or the pin config, use the user space driver from</div><div class='hunk'>@@ -383,7 +383,7 @@ config IR_TTUSBIR</div><div class='ctx'> 	select USB</div><div class='ctx'> 	select NEW_LEDS</div><div class='ctx'> 	select LEDS_CLASS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want to use the TechnoTrend USB IR Receiver. The</div><div class='ctx'> 	   driver can control the led.</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +393,7 @@ config IR_TTUSBIR</div><div class='ctx'> config IR_RX51</div><div class='ctx'> 	tristate "Nokia N900 IR transmitter diode"</div><div class='ctx'> 	depends on (OMAP_DM_TIMER &amp;&amp; PWM_OMAP_DMTIMER &amp;&amp; ARCH_OMAP2PLUS || COMPILE_TEST) &amp;&amp; RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y or M here if you want to enable support for the IR</div><div class='ctx'> 	   transmitter diode built in the Nokia N900 (RX51) device.</div><div class='ctx'> </div><div class='hunk'>@@ -405,7 +405,7 @@ source "drivers/media/rc/img-ir/Kconfig"</div><div class='ctx'> config RC_LOOPBACK</div><div class='ctx'> 	tristate "Remote Control Loopback Driver"</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want support for the remote control loopback</div><div class='ctx'> 	   driver which allows TX data to be sent back as RX data.</div><div class='ctx'> 	   This is mostly useful for debugging purposes.</div><div class='hunk'>@@ -419,7 +419,7 @@ config IR_GPIO_CIR</div><div class='ctx'> 	tristate "GPIO IR remote control"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on (OF &amp;&amp; GPIOLIB) || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use GPIO based IR Receiver.</div><div class='ctx'> </div><div class='ctx'> 	   To compile this driver as a module, choose M here: the module will</div><div class='hunk'>@@ -430,7 +430,7 @@ config IR_GPIO_TX</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on LIRC</div><div class='ctx'> 	depends on (OF &amp;&amp; GPIOLIB) || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to a GPIO based IR transmitter. This is a</div><div class='ctx'> 	   bit banging driver.</div><div class='ctx'> </div><div class='hunk'>@@ -443,7 +443,7 @@ config IR_PWM_TX</div><div class='ctx'> 	depends on LIRC</div><div class='ctx'> 	depends on PWM</div><div class='ctx'> 	depends on OF || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use a PWM based IR transmitter. This is</div><div class='ctx'> 	   more power efficient than the bit banging gpio driver.</div><div class='ctx'> </div><div class='hunk'>@@ -454,7 +454,7 @@ config RC_ST</div><div class='ctx'> 	tristate "ST remote control receiver"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on ARCH_STI || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y here if you want support for ST remote control driver</div><div class='ctx'> 	   which allows both IR and UHF RX.</div><div class='ctx'> 	   The driver passes raw pulse and space information to the LIRC decoder.</div><div class='hunk'>@@ -465,7 +465,7 @@ config IR_SUNXI</div><div class='ctx'> 	tristate "SUNXI IR remote control"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on ARCH_SUNXI || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use sunXi internal IR Controller</div><div class='ctx'> </div><div class='ctx'> 	   To compile this driver as a module, choose M here: the module will</div><div class='hunk'>@@ -474,7 +474,7 @@ config IR_SUNXI</div><div class='ctx'> config IR_SERIAL</div><div class='ctx'> 	tristate "Homebrew Serial Port Receiver"</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use Homebrew Serial Port Receivers and</div><div class='ctx'> 	   Transceivers.</div><div class='ctx'> </div><div class='hunk'>@@ -484,13 +484,13 @@ config IR_SERIAL</div><div class='ctx'> config IR_SERIAL_TRANSMITTER</div><div class='ctx'> 	bool "Serial Port Transmitter"</div><div class='ctx'> 	depends on IR_SERIAL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Serial Port Transmitter support</div><div class='ctx'> </div><div class='ctx'> config IR_SIR</div><div class='ctx'> 	tristate "Built-in SIR IrDA port"</div><div class='ctx'> 	depends on RC_CORE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use a IrDA SIR port Transceivers.</div><div class='ctx'> </div><div class='ctx'> 	   To compile this driver as a module, choose M here: the module will</div><div class='hunk'>@@ -500,7 +500,7 @@ config IR_TANGO</div><div class='ctx'> 	tristate "Sigma Designs SMP86xx IR decoder"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on ARCH_TANGO || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Adds support for the HW IR decoder embedded on Sigma Designs</div><div class='ctx'> 	   Tango-based systems (SMP86xx, SMP87xx).</div><div class='ctx'> 	   The HW decoder supports NEC, RC-5, RC-6 IR protocols.</div><div class='hunk'>@@ -522,7 +522,7 @@ config IR_ZX</div><div class='ctx'> 	tristate "ZTE ZX IR remote control"</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on ARCH_ZX || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Say Y if you want to use the IR remote control available</div><div class='ctx'> 	   on ZTE ZX family SoCs.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/rc/bpf-lirc.c b/drivers/media/rc/bpf-lirc.c<br/>index 390a722e6211..ee657003c1a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/bpf-lirc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/bpf-lirc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/bpf-lirc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/bpf-lirc.c</a></div><div class='hunk'>@@ -97,6 +97,12 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 		return &amp;bpf_map_update_elem_proto;</div><div class='ctx'> 	case BPF_FUNC_map_delete_elem:</div><div class='ctx'> 		return &amp;bpf_map_delete_elem_proto;</div><div class='add'>+	case BPF_FUNC_map_push_elem:</div><div class='add'>+		return &amp;bpf_map_push_elem_proto;</div><div class='add'>+	case BPF_FUNC_map_pop_elem:</div><div class='add'>+		return &amp;bpf_map_pop_elem_proto;</div><div class='add'>+	case BPF_FUNC_map_peek_elem:</div><div class='add'>+		return &amp;bpf_map_peek_elem_proto;</div><div class='ctx'> 	case BPF_FUNC_ktime_get_ns:</div><div class='ctx'> 		return &amp;bpf_ktime_get_ns_proto;</div><div class='ctx'> 	case BPF_FUNC_tail_call:</div><div class='head'>diff --git a/drivers/media/rc/ir-rcmm-decoder.c b/drivers/media/rc/ir-rcmm-decoder.c<br/>index f1096ac1e5c5..64fb65a9a19f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/ir-rcmm-decoder.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/ir-rcmm-decoder.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/ir-rcmm-decoder.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/ir-rcmm-decoder.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "rc-core-priv.h"</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define RCMM_UNIT		166667	/* nanosecs */</div><div class='ctx'> #define RCMM_PREFIX_PULSE	416666  /* 166666.666666666*2.5 */</div><div class='head'>diff --git a/drivers/media/rc/keymaps/Kconfig b/drivers/media/rc/keymaps/Kconfig<br/>index 767423bbbdd0..f459096d8e9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/keymaps/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/keymaps/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/keymaps/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/keymaps/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@ config RC_MAP</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   This option enables the compilation of lots of Remote</div><div class='ctx'> 	   Controller tables. They are short tables, but if you</div><div class='ctx'> 	   don't use a remote controller, or prefer to load the</div><div class='head'>diff --git a/drivers/media/rc/keymaps/rc-xbox-dvd.c b/drivers/media/rc/keymaps/rc-xbox-dvd.c<br/>index af387244636b..42815ab57bff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/keymaps/rc-xbox-dvd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/keymaps/rc-xbox-dvd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/keymaps/rc-xbox-dvd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/keymaps/rc-xbox-dvd.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static struct rc_map_list xbox_dvd_map = {</div><div class='ctx'> 	.map = {</div><div class='ctx'> 		.scan     = xbox_dvd,</div><div class='ctx'> 		.size     = ARRAY_SIZE(xbox_dvd),</div><div class='del'>-		.rc_proto = RC_PROTO_UNKNOWN,</div><div class='add'>+		.rc_proto = RC_PROTO_XBOX_DVD,</div><div class='ctx'> 		.name     = RC_MAP_XBOX_DVD,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c<br/>index f862f1b7f996..92db1e83c192 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/lirc_dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/lirc_dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/lirc_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/lirc_dev.c</a></div><div class='hunk'>@@ -195,7 +195,7 @@ static int ir_lirc_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	list_add(&amp;fh-&gt;list, &amp;dev-&gt;lirc_fh);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;lirc_fh_lock, flags);</div><div class='ctx'> </div><div class='del'>-	nonseekable_open(inode, file);</div><div class='add'>+	stream_open(inode, file);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_kfifo:</div><div class='head'>diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c<br/>index e8fa28e20192..be5fd129d728 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/rc-main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/rc-main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/rc-main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/rc-main.c</a></div><div class='hunk'>@@ -76,6 +76,7 @@ static const struct {</div><div class='ctx'> 		.scancode_bits = 0x00ffffff, .repeat_period = 114 },</div><div class='ctx'> 	[RC_PROTO_RCMM32] = { .name = "rc-mm-32",</div><div class='ctx'> 		.scancode_bits = 0xffffffff, .repeat_period = 114 },</div><div class='add'>+	[RC_PROTO_XBOX_DVD] = { .name = "xbox-dvd", .repeat_period = 64 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Used to keep track of known keymaps */</div><div class='hunk'>@@ -1027,6 +1028,7 @@ static const struct {</div><div class='ctx'> 	{ RC_PROTO_BIT_RCMM12 |</div><div class='ctx'> 	  RC_PROTO_BIT_RCMM24 |</div><div class='ctx'> 	  RC_PROTO_BIT_RCMM32,	"rc-mm",	"ir-rcmm-decoder"	},</div><div class='add'>+	{ RC_PROTO_BIT_XBOX_DVD, "xbox-dvd",	NULL			},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/media/rc/serial_ir.c b/drivers/media/rc/serial_ir.c<br/>index ffe2c672d105..3998ba29beb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/serial_ir.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/serial_ir.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/serial_ir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/serial_ir.c</a></div><div class='hunk'>@@ -773,8 +773,6 @@ static void serial_ir_exit(void)</div><div class='ctx'> </div><div class='ctx'> static int __init serial_ir_init_module(void)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case IR_HOMEBREW:</div><div class='ctx'> 	case IR_IRDEO:</div><div class='hunk'>@@ -802,12 +800,7 @@ static int __init serial_ir_init_module(void)</div><div class='ctx'> 	if (sense != -1)</div><div class='ctx'> 		sense = !!sense;</div><div class='ctx'> </div><div class='del'>-	result = serial_ir_init();</div><div class='del'>-	if (!result)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	serial_ir_exit();</div><div class='del'>-	return result;</div><div class='add'>+	return serial_ir_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit serial_ir_exit_module(void)</div><div class='head'>diff --git a/drivers/media/rc/xbox_remote.c b/drivers/media/rc/xbox_remote.c<br/>index f959cbb94744..4a3f2cc4ef18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/xbox_remote.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/rc/xbox_remote.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/rc/xbox_remote.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/rc/xbox_remote.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static void xbox_remote_input_report(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc_keydown(xbox_remote-&gt;rdev, RC_PROTO_UNKNOWN,</div><div class='add'>+	rc_keydown(xbox_remote-&gt;rdev, RC_PROTO_XBOX_DVD,</div><div class='ctx'> 		   le16_to_cpup((__le16 *)(data + 2)), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +148,7 @@ static void xbox_remote_rc_init(struct xbox_remote *xbox_remote)</div><div class='ctx'> 	struct rc_dev *rdev = xbox_remote-&gt;rdev;</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;priv = xbox_remote;</div><div class='del'>-	rdev-&gt;allowed_protocols = RC_PROTO_BIT_UNKNOWN;</div><div class='add'>+	rdev-&gt;allowed_protocols = RC_PROTO_BIT_XBOX_DVD;</div><div class='ctx'> 	rdev-&gt;driver_name = "xbox_remote";</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;open = xbox_remote_rc_open;</div><div class='hunk'>@@ -157,6 +157,8 @@ static void xbox_remote_rc_init(struct xbox_remote *xbox_remote)</div><div class='ctx'> 	rdev-&gt;device_name = xbox_remote-&gt;rc_name;</div><div class='ctx'> 	rdev-&gt;input_phys = xbox_remote-&gt;rc_phys;</div><div class='ctx'> </div><div class='add'>+	rdev-&gt;timeout = MS_TO_NS(10);</div><div class='add'>+</div><div class='ctx'> 	usb_to_input_id(xbox_remote-&gt;udev, &amp;rdev-&gt;input_id);</div><div class='ctx'> 	rdev-&gt;dev.parent = &amp;xbox_remote-&gt;interface-&gt;dev;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig<br/>index b07ac86fc53c..df169ecf0c27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/spi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/spi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/spi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/spi/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@ menu "SPI helper chips"</div><div class='ctx'> config VIDEO_GS1662</div><div class='ctx'> 	tristate "Gennum Serializers video"</div><div class='ctx'> 	depends on SPI &amp;&amp; VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable the GS1662 driver which serializes video streams.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/media/usb/airspy/Kconfig b/drivers/media/usb/airspy/Kconfig<br/>index 10b204cf4dbc..67578511bb9a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/airspy/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/airspy/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/airspy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/airspy/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config USB_AIRSPY</div><div class='ctx'> 	tristate "AirSpy"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux2 driver for AirSpy SDR device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/au0828/Kconfig b/drivers/media/usb/au0828/Kconfig<br/>index 65fc067eb864..0ad985542c60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/au0828/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> config VIDEO_AU0828</div><div class='ctx'> 	tristate "Auvitek AU0828 support"</div><div class='ctx'> 	depends on I2C &amp;&amp; INPUT &amp;&amp; DVB_CORE &amp;&amp; USB &amp;&amp; VIDEO_V4L2</div><div class='add'>+	select MEDIA_CONTROLLER</div><div class='add'>+	select MEDIA_CONTROLLER_DVB</div><div class='ctx'> 	select I2C_ALGOBIT</div><div class='ctx'> 	select VIDEO_TVEEPROM</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC if VIDEO_V4L2</div><div class='hunk'>@@ -9,7 +11,7 @@ config VIDEO_AU0828</div><div class='ctx'> 	select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_MXL5007T if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a hybrid analog/digital tv capture driver for</div><div class='ctx'> 	  Auvitek's AU0828 USB device.</div><div class='ctx'> </div><div class='hunk'>@@ -23,7 +25,7 @@ config VIDEO_AU0828_V4L2</div><div class='ctx'> 	select DVB_AU8522_V4L if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select VIDEO_TUNER</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Auvitek's USB device.</div><div class='ctx'> </div><div class='ctx'> 	  Choose Y here to include support for v4l2 analog video</div><div class='hunk'>@@ -34,5 +36,5 @@ config VIDEO_AU0828_RC</div><div class='ctx'> 	depends on RC_CORE</div><div class='ctx'> 	depends on !(RC_CORE=m &amp;&amp; VIDEO_AU0828=y)</div><div class='ctx'> 	depends on VIDEO_AU0828</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   Enables Remote Controller support on au0828 driver.</div><div class='head'>diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c<br/>index 3f8c92a70116..925a80437822 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/au0828-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/au0828-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/au0828-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/au0828/au0828-core.c</a></div><div class='hunk'>@@ -155,9 +155,7 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)</div><div class='ctx'> 	dev-&gt;media_dev-&gt;disable_source = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;mdev-&gt;graph_mutex);</div><div class='ctx'> </div><div class='del'>-	media_device_unregister(dev-&gt;media_dev);</div><div class='del'>-	media_device_cleanup(dev-&gt;media_dev);</div><div class='del'>-	kfree(dev-&gt;media_dev);</div><div class='add'>+	media_device_delete(dev-&gt;media_dev, KBUILD_MODNAME, THIS_MODULE);</div><div class='ctx'> 	dev-&gt;media_dev = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -210,14 +208,10 @@ static int au0828_media_device_init(struct au0828_dev *dev,</div><div class='ctx'> #ifdef CONFIG_MEDIA_CONTROLLER</div><div class='ctx'> 	struct media_device *mdev;</div><div class='ctx'> </div><div class='del'>-	mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);</div><div class='add'>+	mdev = media_device_usb_allocate(udev, KBUILD_MODNAME, THIS_MODULE);</div><div class='ctx'> 	if (!mdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* check if media device is already initialized */</div><div class='del'>-	if (!mdev-&gt;dev)</div><div class='del'>-		media_device_usb_init(mdev, udev, udev-&gt;product);</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;media_dev = mdev;</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -278,6 +272,28 @@ create_link:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool au0828_is_link_shareable(struct media_entity *owner,</div><div class='add'>+				     struct media_entity *entity)</div><div class='add'>+{</div><div class='add'>+	bool shareable = false;</div><div class='add'>+</div><div class='add'>+	/* Tuner link can be shared by audio, video, and VBI */</div><div class='add'>+	switch (owner-&gt;function) {</div><div class='add'>+	case MEDIA_ENT_F_IO_V4L:</div><div class='add'>+	case MEDIA_ENT_F_AUDIO_CAPTURE:</div><div class='add'>+	case MEDIA_ENT_F_IO_VBI:</div><div class='add'>+		if (entity-&gt;function == MEDIA_ENT_F_IO_V4L ||</div><div class='add'>+		    entity-&gt;function == MEDIA_ENT_F_AUDIO_CAPTURE ||</div><div class='add'>+		    entity-&gt;function == MEDIA_ENT_F_IO_VBI)</div><div class='add'>+			shareable = true;</div><div class='add'>+		break;</div><div class='add'>+	case MEDIA_ENT_F_DTV_DEMOD:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return shareable;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Callers should hold graph_mutex */</div><div class='ctx'> static int au0828_enable_source(struct media_entity *entity,</div><div class='ctx'> 				struct media_pipeline *pipe)</div><div class='hunk'>@@ -320,18 +336,20 @@ static int au0828_enable_source(struct media_entity *entity,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Default input is tuner and default input_type</div><div class='ctx'> 		 * is AU0828_VMUX_TELEVISION.</div><div class='del'>-		 * FIXME:</div><div class='add'>+		 *</div><div class='ctx'> 		 * There is a problem when s_input is called to</div><div class='ctx'> 		 * change the default input. s_input will try to</div><div class='ctx'> 		 * enable_source before attempting to change the</div><div class='ctx'> 		 * input on the device, and will end up enabling</div><div class='ctx'> 		 * default source which is tuner.</div><div class='ctx'> 		 *</div><div class='del'>-		 * Additional logic is necessary in au0828</div><div class='del'>-		 * to detect that the input has changed and</div><div class='del'>-		 * enable the right source.</div><div class='add'>+		 * Additional logic is necessary in au0828 to detect</div><div class='add'>+		 * that the input has changed and enable the right</div><div class='add'>+		 * source. au0828 handles this case in its s_input.</div><div class='add'>+		 * It will disable the old source and enable the new</div><div class='add'>+		 * source.</div><div class='add'>+		 *</div><div class='ctx'> 		*/</div><div class='del'>-</div><div class='ctx'> 		if (dev-&gt;input_type == AU0828_VMUX_TELEVISION)</div><div class='ctx'> 			find_source = dev-&gt;tuner;</div><div class='ctx'> 		else if (dev-&gt;input_type == AU0828_VMUX_SVIDEO ||</div><div class='hunk'>@@ -344,27 +362,33 @@ static int au0828_enable_source(struct media_entity *entity,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Is an active link between sink and source */</div><div class='add'>+	/* Is there an active link between sink and source */</div><div class='ctx'> 	if (dev-&gt;active_link) {</div><div class='del'>-		/*</div><div class='del'>-		 * If DVB is using the tuner and calling entity is</div><div class='del'>-		 * audio/video, the following check will be false,</div><div class='del'>-		 * since sink is different. Result is Busy.</div><div class='del'>-		 */</div><div class='del'>-		if (dev-&gt;active_link-&gt;sink-&gt;entity == sink &amp;&amp;</div><div class='del'>-		    dev-&gt;active_link-&gt;source-&gt;entity == find_source) {</div><div class='del'>-			/*</div><div class='del'>-			 * Either ALSA or Video own tuner. sink is</div><div class='del'>-			 * the same for both. Prevent Video stepping</div><div class='del'>-			 * on ALSA when ALSA owns the source.</div><div class='add'>+		if (dev-&gt;active_link_owner == entity) {</div><div class='add'>+			/* This check is necessary to handle multiple</div><div class='add'>+			 * enable_source calls from v4l_ioctls during</div><div class='add'>+			 * the course of video/vbi application run-time.</div><div class='ctx'> 			*/</div><div class='del'>-			if (dev-&gt;active_link_owner != entity &amp;&amp;</div><div class='del'>-			    dev-&gt;active_link_owner-&gt;function ==</div><div class='del'>-						MEDIA_ENT_F_AUDIO_CAPTURE) {</div><div class='del'>-				pr_debug("ALSA has the tuner\n");</div><div class='del'>-				ret = -EBUSY;</div><div class='del'>-				goto end;</div><div class='del'>-			}</div><div class='add'>+			pr_debug("%s already owns the tuner\n", entity-&gt;name);</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto end;</div><div class='add'>+		} else if (au0828_is_link_shareable(dev-&gt;active_link_owner,</div><div class='add'>+			   entity)) {</div><div class='add'>+			/* Either ALSA or Video own tuner. Sink is the same</div><div class='add'>+			 * for both. Allow sharing the active link between</div><div class='add'>+			 * their common source (tuner) and sink (decoder).</div><div class='add'>+			 * Starting pipeline between sharing entity and sink</div><div class='add'>+			 * will fail with pipe mismatch, while owner has an</div><div class='add'>+			 * active pipeline. Switch pipeline ownership from</div><div class='add'>+			 * user to owner when owner disables the source.</div><div class='add'>+			 */</div><div class='add'>+			dev-&gt;active_link_shared = true;</div><div class='add'>+			/* save the user info to use from disable */</div><div class='add'>+			dev-&gt;active_link_user = entity;</div><div class='add'>+			dev-&gt;active_link_user_pipe = pipe;</div><div class='add'>+			pr_debug("%s owns the tuner %s can share!\n",</div><div class='add'>+				 dev-&gt;active_link_owner-&gt;name,</div><div class='add'>+				 entity-&gt;name);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto end;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -391,7 +415,7 @@ static int au0828_enable_source(struct media_entity *entity,</div><div class='ctx'> 	source = found_link-&gt;source-&gt;entity;</div><div class='ctx'> 	ret = __media_entity_setup_link(found_link, MEDIA_LNK_FL_ENABLED);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		pr_err("Activate tuner link %s-&gt;%s. Error %d\n",</div><div class='add'>+		pr_err("Activate link from %s-&gt;%s. Error %d\n",</div><div class='ctx'> 			source-&gt;name, sink-&gt;name, ret);</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -401,25 +425,26 @@ static int au0828_enable_source(struct media_entity *entity,</div><div class='ctx'> 		pr_err("Start Pipeline: %s-&gt;%s Error %d\n",</div><div class='ctx'> 			source-&gt;name, entity-&gt;name, ret);</div><div class='ctx'> 		ret = __media_entity_setup_link(found_link, 0);</div><div class='del'>-		pr_err("Deactivate link Error %d\n", ret);</div><div class='add'>+		if (ret)</div><div class='add'>+			pr_err("Deactivate link Error %d\n", ret);</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * save active link and active link owner to avoid audio</div><div class='del'>-	 * deactivating video owned link from disable_source and</div><div class='del'>-	 * vice versa</div><div class='add'>+</div><div class='add'>+	/* save link state to allow audio and video share the link</div><div class='add'>+	 * and not disable the link while the other is using it.</div><div class='add'>+	 * active_link_owner is used to deactivate the link.</div><div class='ctx'> 	*/</div><div class='ctx'> 	dev-&gt;active_link = found_link;</div><div class='ctx'> 	dev-&gt;active_link_owner = entity;</div><div class='ctx'> 	dev-&gt;active_source = source;</div><div class='ctx'> 	dev-&gt;active_sink = sink;</div><div class='ctx'> </div><div class='del'>-	pr_debug("Enabled Source: %s-&gt;%s-&gt;%s Ret %d\n",</div><div class='add'>+	pr_info("Enabled Source: %s-&gt;%s-&gt;%s Ret %d\n",</div><div class='ctx'> 		 dev-&gt;active_source-&gt;name, dev-&gt;active_sink-&gt;name,</div><div class='ctx'> 		 dev-&gt;active_link_owner-&gt;name, ret);</div><div class='ctx'> end:</div><div class='del'>-	pr_debug("au0828_enable_source() end %s %d %d\n",</div><div class='del'>-		 entity-&gt;name, entity-&gt;function, ret);</div><div class='add'>+	pr_debug("%s end: ent:%s fnc:%d ret %d\n",</div><div class='add'>+		 __func__, entity-&gt;name, entity-&gt;function, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -438,21 +463,95 @@ static void au0828_disable_source(struct media_entity *entity)</div><div class='ctx'> 	if (!dev-&gt;active_link)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* link is active - stop pipeline from source (tuner) */</div><div class='add'>+	/* link is active - stop pipeline from source</div><div class='add'>+	 * (tuner/s-video/Composite) to the entity</div><div class='add'>+	 * When DVB/s-video/Composite owns tuner, it won't be in</div><div class='add'>+	 * shared state.</div><div class='add'>+	 */</div><div class='ctx'> 	if (dev-&gt;active_link-&gt;sink-&gt;entity == dev-&gt;active_sink &amp;&amp;</div><div class='ctx'> 	    dev-&gt;active_link-&gt;source-&gt;entity == dev-&gt;active_source) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * prevent video from deactivating link when audio</div><div class='del'>-		 * has active pipeline</div><div class='add'>+		 * Prevent video from deactivating link when audio</div><div class='add'>+		 * has active pipeline and vice versa. In addition</div><div class='add'>+		 * handle the case when more than one video/vbi</div><div class='add'>+		 * application is sharing the link.</div><div class='ctx'> 		*/</div><div class='add'>+		bool owner_is_audio = false;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;active_link_owner-&gt;function ==</div><div class='add'>+		    MEDIA_ENT_F_AUDIO_CAPTURE)</div><div class='add'>+			owner_is_audio = true;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;active_link_shared) {</div><div class='add'>+			pr_debug("Shared link owner %s user %s %d\n",</div><div class='add'>+				 dev-&gt;active_link_owner-&gt;name,</div><div class='add'>+				 entity-&gt;name, dev-&gt;users);</div><div class='add'>+</div><div class='add'>+			/* Handle video device users &gt; 1</div><div class='add'>+			 * When audio owns the shared link with</div><div class='add'>+			 * more than one video users, avoid</div><div class='add'>+			 * disabling the source and/or switching</div><div class='add'>+			 * the owner until the last disable_source</div><div class='add'>+			 * call from video _close(). Use dev-&gt;users to</div><div class='add'>+			 * determine when to switch/disable.</div><div class='add'>+			 */</div><div class='add'>+			if (dev-&gt;active_link_owner != entity) {</div><div class='add'>+				/* video device has users &gt; 1 */</div><div class='add'>+				if (owner_is_audio &amp;&amp; dev-&gt;users &gt; 1)</div><div class='add'>+					return;</div><div class='add'>+</div><div class='add'>+				dev-&gt;active_link_user = NULL;</div><div class='add'>+				dev-&gt;active_link_user_pipe = NULL;</div><div class='add'>+				dev-&gt;active_link_shared = false;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* video owns the link and has users &gt; 1 */</div><div class='add'>+			if (!owner_is_audio &amp;&amp; dev-&gt;users &gt; 1)</div><div class='add'>+				return;</div><div class='add'>+</div><div class='add'>+			/* stop pipeline */</div><div class='add'>+			__media_pipeline_stop(dev-&gt;active_link_owner);</div><div class='add'>+			pr_debug("Pipeline stop for %s\n",</div><div class='add'>+				dev-&gt;active_link_owner-&gt;name);</div><div class='add'>+</div><div class='add'>+			ret = __media_pipeline_start(</div><div class='add'>+					dev-&gt;active_link_user,</div><div class='add'>+					dev-&gt;active_link_user_pipe);</div><div class='add'>+			if (ret) {</div><div class='add'>+				pr_err("Start Pipeline: %s-&gt;%s %d\n",</div><div class='add'>+					dev-&gt;active_source-&gt;name,</div><div class='add'>+					dev-&gt;active_link_user-&gt;name,</div><div class='add'>+					ret);</div><div class='add'>+				goto deactivate_link;</div><div class='add'>+			}</div><div class='add'>+			/* link user is now the owner */</div><div class='add'>+			dev-&gt;active_link_owner = dev-&gt;active_link_user;</div><div class='add'>+			dev-&gt;active_link_user = NULL;</div><div class='add'>+			dev-&gt;active_link_user_pipe = NULL;</div><div class='add'>+			dev-&gt;active_link_shared = false;</div><div class='add'>+</div><div class='add'>+			pr_debug("Pipeline started for %s\n",</div><div class='add'>+				dev-&gt;active_link_owner-&gt;name);</div><div class='add'>+			return;</div><div class='add'>+		} else if (!owner_is_audio &amp;&amp; dev-&gt;users &gt; 1)</div><div class='add'>+			/* video/vbi owns the link and has users &gt; 1 */</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		if (dev-&gt;active_link_owner != entity)</div><div class='ctx'> 			return;</div><div class='del'>-		__media_pipeline_stop(entity);</div><div class='add'>+</div><div class='add'>+		/* stop pipeline */</div><div class='add'>+		__media_pipeline_stop(dev-&gt;active_link_owner);</div><div class='add'>+		pr_debug("Pipeline stop for %s\n",</div><div class='add'>+			dev-&gt;active_link_owner-&gt;name);</div><div class='add'>+</div><div class='add'>+deactivate_link:</div><div class='ctx'> 		ret = __media_entity_setup_link(dev-&gt;active_link, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			pr_err("Deactivate link Error %d\n", ret);</div><div class='ctx'> </div><div class='del'>-		pr_debug("Disabled Source: %s-&gt;%s-&gt;%s Ret %d\n",</div><div class='add'>+		pr_info("Disabled Source: %s-&gt;%s-&gt;%s Ret %d\n",</div><div class='ctx'> 			 dev-&gt;active_source-&gt;name, dev-&gt;active_sink-&gt;name,</div><div class='ctx'> 			 dev-&gt;active_link_owner-&gt;name, ret);</div><div class='ctx'> </div><div class='hunk'>@@ -460,6 +559,8 @@ static void au0828_disable_source(struct media_entity *entity)</div><div class='ctx'> 		dev-&gt;active_link_owner = NULL;</div><div class='ctx'> 		dev-&gt;active_source = NULL;</div><div class='ctx'> 		dev-&gt;active_sink = NULL;</div><div class='add'>+		dev-&gt;active_link_shared = false;</div><div class='add'>+		dev-&gt;active_link_user = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -480,6 +581,9 @@ static int au0828_media_device_register(struct au0828_dev *dev,</div><div class='ctx'> 		/* register media device */</div><div class='ctx'> 		ret = media_device_register(dev-&gt;media_dev);</div><div class='ctx'> 		if (ret) {</div><div class='add'>+			media_device_delete(dev-&gt;media_dev, KBUILD_MODNAME,</div><div class='add'>+					    THIS_MODULE);</div><div class='add'>+			dev-&gt;media_dev = NULL;</div><div class='ctx'> 			dev_err(&amp;udev-&gt;dev,</div><div class='ctx'> 				"Media Device Register Error: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='head'>diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c<br/>index 7876c897cc1d..4bde3db83aa2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/au0828-video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/au0828-video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/au0828-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/au0828/au0828-video.c</a></div><div class='hunk'>@@ -758,6 +758,9 @@ static int au0828_analog_stream_enable(struct au0828_dev *d)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "au0828_analog_stream_enable called\n");</div><div class='ctx'> </div><div class='add'>+	if (test_bit(DEV_DISCONNECTED, &amp;d-&gt;dev_state))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	iface = usb_ifnum_to_if(d-&gt;usbdev, 0);</div><div class='ctx'> 	if (iface &amp;&amp; iface-&gt;cur_altsetting-&gt;desc.bAlternateSetting != 5) {</div><div class='ctx'> 		dprintk(1, "Changing intf#0 to alt 5\n");</div><div class='hunk'>@@ -839,9 +842,9 @@ int au0828_start_analog_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		v4l2_device_call_all(&amp;dev-&gt;v4l2_dev, 0, video, s_stream, 1);</div><div class='add'>+</div><div class='ctx'> 		if (vq-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			v4l2_device_call_all(&amp;dev-&gt;v4l2_dev, 0, video,</div><div class='del'>-						s_stream, 1);</div><div class='ctx'> 			dev-&gt;vid_timeout_running = 1;</div><div class='ctx'> 			mod_timer(&amp;dev-&gt;vid_timeout, jiffies + (HZ / 10));</div><div class='ctx'> 		} else if (vq-&gt;type == V4L2_BUF_TYPE_VBI_CAPTURE) {</div><div class='hunk'>@@ -861,10 +864,11 @@ static void au0828_stop_streaming(struct vb2_queue *vq)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "au0828_stop_streaming called %d\n", dev-&gt;streaming_users);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;streaming_users-- == 1)</div><div class='add'>+	if (dev-&gt;streaming_users-- == 1) {</div><div class='ctx'> 		au0828_uninit_isoc(dev);</div><div class='add'>+		v4l2_device_call_all(&amp;dev-&gt;v4l2_dev, 0, video, s_stream, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	v4l2_device_call_all(&amp;dev-&gt;v4l2_dev, 0, video, s_stream, 0);</div><div class='ctx'> 	dev-&gt;vid_timeout_running = 0;</div><div class='ctx'> 	del_timer_sync(&amp;dev-&gt;vid_timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -893,8 +897,10 @@ void au0828_stop_vbi_streaming(struct vb2_queue *vq)</div><div class='ctx'> 	dprintk(1, "au0828_stop_vbi_streaming called %d\n",</div><div class='ctx'> 		dev-&gt;streaming_users);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;streaming_users-- == 1)</div><div class='add'>+	if (dev-&gt;streaming_users-- == 1) {</div><div class='ctx'> 		au0828_uninit_isoc(dev);</div><div class='add'>+		v4l2_device_call_all(&amp;dev-&gt;v4l2_dev, 0, video, s_stream, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;slock, flags);</div><div class='ctx'> 	if (dev-&gt;isoc_ctl.vbi_buf != NULL) {</div><div class='hunk'>@@ -1065,7 +1071,7 @@ static int au0828_v4l2_close(struct file *filp)</div><div class='ctx'> 		 * streaming.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * On most USB devices  like au0828 the tuner can</div><div class='del'>-		 * be safely put in sleep stare here if ALSA isn't</div><div class='add'>+		 * be safely put in sleep state here if ALSA isn't</div><div class='ctx'> 		 * streaming. Exceptions are some very old USB tuner</div><div class='ctx'> 		 * models such as em28xx-based WinTV USB2 which have</div><div class='ctx'> 		 * a separate audio output jack. The devices that have</div><div class='hunk'>@@ -1074,7 +1080,7 @@ static int au0828_v4l2_close(struct file *filp)</div><div class='ctx'> 		 * so the s_power callback are silently ignored.</div><div class='ctx'> 		 * So, the current logic here does the following:</div><div class='ctx'> 		 * Disable (put tuner to sleep) when</div><div class='del'>-		 * - ALSA and DVB aren't not streaming;</div><div class='add'>+		 * - ALSA and DVB aren't streaming.</div><div class='ctx'> 		 * - the last V4L2 file handler is closed.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * FIXME:</div><div class='head'>diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h<br/>index 425c35d16057..b47ecc9affd8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/au0828.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/au0828/au0828.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/au0828/au0828.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/au0828/au0828.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;media/v4l2-ctrls.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-fh.h&gt;</div><div class='ctx'> #include &lt;media/media-device.h&gt;</div><div class='add'>+#include &lt;media/media-dev-allocator.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* DVB */</div><div class='ctx'> #include &lt;media/demux.h&gt;</div><div class='hunk'>@@ -283,9 +284,12 @@ struct au0828_dev {</div><div class='ctx'> 	struct media_entity_notify entity_notify;</div><div class='ctx'> 	struct media_entity *tuner;</div><div class='ctx'> 	struct media_link *active_link;</div><div class='del'>-	struct media_entity *active_link_owner;</div><div class='ctx'> 	struct media_entity *active_source;</div><div class='ctx'> 	struct media_entity *active_sink;</div><div class='add'>+	struct media_entity *active_link_owner;</div><div class='add'>+	struct media_entity *active_link_user;</div><div class='add'>+	struct media_pipeline *active_link_user_pipe;</div><div class='add'>+	bool active_link_shared;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/cpia2/Kconfig b/drivers/media/usb/cpia2/Kconfig<br/>index 66e9283f5993..7029a04f3ffd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/cpia2/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/cpia2/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/cpia2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/cpia2/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> config VIDEO_CPIA2</div><div class='ctx'> 	tristate "CPiA2 Video For Linux"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the video4linux driver for cameras based on Vision's CPiA2</div><div class='ctx'> 	  (Colour Processor Interface ASIC), such as the Digital Blue QX5</div><div class='ctx'> 	  Microscope. If you have one of these cameras, say Y here</div><div class='head'>diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c<br/>index 95c0bd4a19dc..45caf78119c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/cpia2/cpia2_v4l.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/cpia2/cpia2_v4l.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/cpia2/cpia2_v4l.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/cpia2/cpia2_v4l.c</a></div><div class='hunk'>@@ -1240,8 +1240,7 @@ static int __init cpia2_init(void)</div><div class='ctx'> 	LOG("%s v%s\n",</div><div class='ctx'> 	    ABOUT, CPIA_VERSION);</div><div class='ctx'> 	check_parameters();</div><div class='del'>-	cpia2_usb_init();</div><div class='del'>-	return 0;</div><div class='add'>+	return cpia2_usb_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig<br/>index 9e5b3e7c3ef5..9262d0d7439a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/cx231xx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/cx231xx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/cx231xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/cx231xx/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config VIDEO_CX231XX</div><div class='ctx'> 	select VIDEO_CX25840</div><div class='ctx'> 	select VIDEO_CX2341X</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant 231xx USB based TV cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -18,7 +18,7 @@ config VIDEO_CX231XX_RC</div><div class='ctx'> 	depends on RC_CORE=y || RC_CORE=VIDEO_CX231XX</div><div class='ctx'> 	depends on VIDEO_CX231XX</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  cx231xx hardware has a builtin RX/TX support. However, a few</div><div class='ctx'> 	  designs opted to not use it, but, instead, some other hardware.</div><div class='ctx'> 	  This module enables the usage of those other hardware, like the</div><div class='hunk'>@@ -31,7 +31,7 @@ config VIDEO_CX231XX_ALSA</div><div class='ctx'> 	depends on VIDEO_CX231XX &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is an ALSA driver for Cx231xx USB based TV cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -52,6 +52,6 @@ config VIDEO_CX231XX_DVB</div><div class='ctx'> 	select DVB_MN88473 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_R820T if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for DVB cards based on the</div><div class='ctx'> 	  Conexant cx231xx chips.</div><div class='head'>diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c<br/>index 80d3bd3a0f24..1b7f1af399fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/dvb-usb-v2/af9035.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/dvb-usb-v2/af9035.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/dvb-usb-v2/af9035.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/dvb-usb-v2/af9035.c</a></div><div class='hunk'>@@ -846,6 +846,7 @@ static int af9035_read_config(struct dvb_usb_device *d)</div><div class='ctx'> 	state-&gt;af9033_config[1].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;</div><div class='ctx'> 	state-&gt;af9033_config[0].ts_mode = AF9033_TS_MODE_USB;</div><div class='ctx'> 	state-&gt;af9033_config[1].ts_mode = AF9033_TS_MODE_SERIAL;</div><div class='add'>+	state-&gt;it930x_addresses = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;chip_type == 0x9135) {</div><div class='ctx'> 		/* feed clock for integrated RF tuner */</div><div class='hunk'>@@ -872,6 +873,10 @@ static int af9035_read_config(struct dvb_usb_device *d)</div><div class='ctx'> 		 * IT930x is an USB bridge, only single demod-single tuner</div><div class='ctx'> 		 * configurations seen so far.</div><div class='ctx'> 		 */</div><div class='add'>+		if ((le16_to_cpu(d-&gt;udev-&gt;descriptor.idVendor) == USB_VID_AVERMEDIA) &amp;&amp;</div><div class='add'>+		    (le16_to_cpu(d-&gt;udev-&gt;descriptor.idProduct) == USB_PID_AVERMEDIA_TD310)) {</div><div class='add'>+			state-&gt;it930x_addresses = 1;</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1218,6 +1223,48 @@ static int it930x_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;intf-&gt;dev, "adap-&gt;id=%d\n", adap-&gt;id);</div><div class='ctx'> </div><div class='add'>+	/* I2C master bus 2 clock speed 300k */</div><div class='add'>+	ret = af9035_wr_reg(d, 0x00f6a7, 0x07);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* I2C master bus 1,3 clock speed 300k */</div><div class='add'>+	ret = af9035_wr_reg(d, 0x00f103, 0x07);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* set gpio11 low */</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8d4, 0x01, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8d5, 0x01, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8d3, 0x01, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* Tuner enable using gpiot2_en, gpiot2_on and gpiot2_o (reset) */</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8b8, 0x01, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8b9, 0x01, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8b7, 0x00, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	ret = af9035_wr_reg_mask(d, 0xd8b7, 0x01, 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;si2168_config, 0, sizeof(si2168_config));</div><div class='ctx'> 	si2168_config.i2c_adapter = &amp;adapter;</div><div class='ctx'> 	si2168_config.fe = &amp;adap-&gt;fe[0];</div><div class='hunk'>@@ -1225,8 +1272,9 @@ static int it930x_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;af9033_config[adap-&gt;id].fe = &amp;adap-&gt;fe[0];</div><div class='ctx'> 	state-&gt;af9033_config[adap-&gt;id].ops = &amp;state-&gt;ops;</div><div class='del'>-	ret = af9035_add_i2c_dev(d, "si2168", 0x67, &amp;si2168_config,</div><div class='del'>-				&amp;d-&gt;i2c_adap);</div><div class='add'>+	ret = af9035_add_i2c_dev(d, "si2168",</div><div class='add'>+				 it930x_addresses_table[state-&gt;it930x_addresses].frontend_i2c_addr,</div><div class='add'>+				 &amp;si2168_config, &amp;d-&gt;i2c_adap);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -1575,54 +1623,12 @@ static int it930x_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;intf-&gt;dev, "adap-&gt;id=%d\n", adap-&gt;id);</div><div class='ctx'> </div><div class='del'>-	/* I2C master bus 2 clock speed 300k */</div><div class='del'>-	ret = af9035_wr_reg(d, 0x00f6a7, 0x07);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* I2C master bus 1,3 clock speed 300k */</div><div class='del'>-	ret = af9035_wr_reg(d, 0x00f103, 0x07);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* set gpio11 low */</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8d4, 0x01, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8d5, 0x01, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8d3, 0x01, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* Tuner enable using gpiot2_en, gpiot2_on and gpiot2_o (reset) */</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8b8, 0x01, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8b9, 0x01, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8b7, 0x00, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	msleep(200);</div><div class='del'>-</div><div class='del'>-	ret = af9035_wr_reg_mask(d, 0xd8b7, 0x01, 0x01);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='ctx'> 	memset(&amp;si2157_config, 0, sizeof(si2157_config));</div><div class='ctx'> 	si2157_config.fe = adap-&gt;fe[0];</div><div class='del'>-	si2157_config.if_port = 1;</div><div class='del'>-	ret = af9035_add_i2c_dev(d, "si2157", 0x63,</div><div class='del'>-			&amp;si2157_config, state-&gt;i2c_adapter_demod);</div><div class='del'>-</div><div class='add'>+	si2157_config.if_port = it930x_addresses_table[state-&gt;it930x_addresses].tuner_if_port;</div><div class='add'>+	ret = af9035_add_i2c_dev(d, "si2157",</div><div class='add'>+				 it930x_addresses_table[state-&gt;it930x_addresses].tuner_i2c_addr,</div><div class='add'>+				 &amp;si2157_config, state-&gt;i2c_adapter_demod);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -2128,6 +2134,8 @@ static const struct usb_device_id af9035_id_table[] = {</div><div class='ctx'> 	/* IT930x devices */</div><div class='ctx'> 	{ DVB_USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9303,</div><div class='ctx'> 		&amp;it930x_props, "ITE 9303 Generic", NULL) },</div><div class='add'>+	{ DVB_USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_TD310,</div><div class='add'>+		&amp;it930x_props, "AVerMedia TD310 DVB-T2", NULL) },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, af9035_id_table);</div><div class='head'>diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h<br/>index a76e6bf0ab1e..bc41c16f9727 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/dvb-usb-v2/af9035.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/dvb-usb-v2/af9035.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/dvb-usb-v2/af9035.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/dvb-usb-v2/af9035.h</a></div><div class='hunk'>@@ -69,6 +69,7 @@ struct state {</div><div class='ctx'> 	u8 dual_mode:1;</div><div class='ctx'> 	u8 no_read:1;</div><div class='ctx'> 	u8 af9033_i2c_addr[2];</div><div class='add'>+	u8 it930x_addresses;</div><div class='ctx'> 	struct af9033_config af9033_config[2];</div><div class='ctx'> 	struct af9033_ops ops;</div><div class='ctx'> 	#define AF9035_I2C_CLIENT_MAX 4</div><div class='hunk'>@@ -77,6 +78,17 @@ struct state {</div><div class='ctx'> 	struct platform_device *platform_device_tuner[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct address_table {</div><div class='add'>+	u8 frontend_i2c_addr;</div><div class='add'>+	u8 tuner_i2c_addr;</div><div class='add'>+	u8 tuner_if_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct address_table it930x_addresses_table[] = {</div><div class='add'>+	{ 0x67, 0x63, 1 },</div><div class='add'>+	{ 0x64, 0x60, 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const u32 clock_lut_af9035[] = {</div><div class='ctx'> 	20480000, /*      FPGA */</div><div class='ctx'> 	16384000, /* 16.38 MHz */</div><div class='head'>diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c<br/>index e28bd8836751..ae0814dd202a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/dvb-usb-v2/dvbsky.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/dvb-usb-v2/dvbsky.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/dvb-usb-v2/dvbsky.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/dvb-usb-v2/dvbsky.c</a></div><div class='hunk'>@@ -615,16 +615,18 @@ static int dvbsky_init(struct dvb_usb_device *d)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dvbsky_exit(struct dvb_usb_device *d)</div><div class='add'>+static int dvbsky_frontend_detach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='add'>+	struct dvb_usb_device *d = adap_to_d(adap);</div><div class='ctx'> 	struct dvbsky_state *state = d_to_priv(d);</div><div class='del'>-	struct dvb_usb_adapter *adap = &amp;d-&gt;adapter[0];</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;d-&gt;udev-&gt;dev, "%s: adap=%d\n", __func__, adap-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	dvb_module_release(state-&gt;i2c_client_tuner);</div><div class='ctx'> 	dvb_module_release(state-&gt;i2c_client_demod);</div><div class='ctx'> 	dvb_module_release(state-&gt;i2c_client_ci);</div><div class='ctx'> </div><div class='del'>-	adap-&gt;fe[0] = NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* DVB USB Driver stuff */</div><div class='hunk'>@@ -640,11 +642,11 @@ static struct dvb_usb_device_properties dvbsky_s960_props = {</div><div class='ctx'> </div><div class='ctx'> 	.i2c_algo         = &amp;dvbsky_i2c_algo,</div><div class='ctx'> 	.frontend_attach  = dvbsky_s960_attach,</div><div class='add'>+	.frontend_detach  = dvbsky_frontend_detach,</div><div class='ctx'> 	.init             = dvbsky_init,</div><div class='ctx'> 	.get_rc_config    = dvbsky_get_rc_config,</div><div class='ctx'> 	.streaming_ctrl   = dvbsky_streaming_ctrl,</div><div class='ctx'> 	.identify_state	  = dvbsky_identify_state,</div><div class='del'>-	.exit             = dvbsky_exit,</div><div class='ctx'> 	.read_mac_address = dvbsky_read_mac_addr,</div><div class='ctx'> </div><div class='ctx'> 	.num_adapters = 1,</div><div class='hunk'>@@ -667,11 +669,11 @@ static struct dvb_usb_device_properties dvbsky_s960c_props = {</div><div class='ctx'> </div><div class='ctx'> 	.i2c_algo         = &amp;dvbsky_i2c_algo,</div><div class='ctx'> 	.frontend_attach  = dvbsky_s960c_attach,</div><div class='add'>+	.frontend_detach  = dvbsky_frontend_detach,</div><div class='ctx'> 	.init             = dvbsky_init,</div><div class='ctx'> 	.get_rc_config    = dvbsky_get_rc_config,</div><div class='ctx'> 	.streaming_ctrl   = dvbsky_streaming_ctrl,</div><div class='ctx'> 	.identify_state	  = dvbsky_identify_state,</div><div class='del'>-	.exit             = dvbsky_exit,</div><div class='ctx'> 	.read_mac_address = dvbsky_read_mac_addr,</div><div class='ctx'> </div><div class='ctx'> 	.num_adapters = 1,</div><div class='hunk'>@@ -694,11 +696,11 @@ static struct dvb_usb_device_properties dvbsky_t680c_props = {</div><div class='ctx'> </div><div class='ctx'> 	.i2c_algo         = &amp;dvbsky_i2c_algo,</div><div class='ctx'> 	.frontend_attach  = dvbsky_t680c_attach,</div><div class='add'>+	.frontend_detach  = dvbsky_frontend_detach,</div><div class='ctx'> 	.init             = dvbsky_init,</div><div class='ctx'> 	.get_rc_config    = dvbsky_get_rc_config,</div><div class='ctx'> 	.streaming_ctrl   = dvbsky_streaming_ctrl,</div><div class='ctx'> 	.identify_state	  = dvbsky_identify_state,</div><div class='del'>-	.exit             = dvbsky_exit,</div><div class='ctx'> 	.read_mac_address = dvbsky_read_mac_addr,</div><div class='ctx'> </div><div class='ctx'> 	.num_adapters = 1,</div><div class='hunk'>@@ -721,11 +723,11 @@ static struct dvb_usb_device_properties dvbsky_t330_props = {</div><div class='ctx'> </div><div class='ctx'> 	.i2c_algo         = &amp;dvbsky_i2c_algo,</div><div class='ctx'> 	.frontend_attach  = dvbsky_t330_attach,</div><div class='add'>+	.frontend_detach  = dvbsky_frontend_detach,</div><div class='ctx'> 	.init             = dvbsky_init,</div><div class='ctx'> 	.get_rc_config    = dvbsky_get_rc_config,</div><div class='ctx'> 	.streaming_ctrl   = dvbsky_streaming_ctrl,</div><div class='ctx'> 	.identify_state	  = dvbsky_identify_state,</div><div class='del'>-	.exit             = dvbsky_exit,</div><div class='ctx'> 	.read_mac_address = dvbsky_read_mac_addr,</div><div class='ctx'> </div><div class='ctx'> 	.num_adapters = 1,</div><div class='hunk'>@@ -748,11 +750,11 @@ static struct dvb_usb_device_properties mygica_t230c_props = {</div><div class='ctx'> </div><div class='ctx'> 	.i2c_algo         = &amp;dvbsky_i2c_algo,</div><div class='ctx'> 	.frontend_attach  = dvbsky_mygica_t230c_attach,</div><div class='add'>+	.frontend_detach  = dvbsky_frontend_detach,</div><div class='ctx'> 	.init             = dvbsky_init,</div><div class='ctx'> 	.get_rc_config    = dvbsky_get_rc_config,</div><div class='ctx'> 	.streaming_ctrl   = dvbsky_streaming_ctrl,</div><div class='ctx'> 	.identify_state	  = dvbsky_identify_state,</div><div class='del'>-	.exit             = dvbsky_exit,</div><div class='ctx'> </div><div class='ctx'> 	.num_adapters = 1,</div><div class='ctx'> 	.adapter = {</div><div class='head'>diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig<br/>index 451e076525d3..639da7e24066 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/em28xx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/em28xx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/em28xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/em28xx/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,7 @@ config VIDEO_EM28XX_V4L2</div><div class='ctx'> 	select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT &amp;&amp; MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT &amp;&amp; MEDIA_CAMERA_SUPPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Empia 28xx based TV cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -23,7 +23,7 @@ config VIDEO_EM28XX_ALSA</div><div class='ctx'> 	depends on VIDEO_EM28XX &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	tristate "Empia EM28xx ALSA audio module"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is an ALSA driver for some Empia 28xx based TV cards.</div><div class='ctx'> </div><div class='ctx'> 	  This is not required for em2800/em2820/em2821 boards. However,</div><div class='hunk'>@@ -66,7 +66,7 @@ config VIDEO_EM28XX_DVB</div><div class='ctx'> 	select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for DVB cards based on the</div><div class='ctx'> 	  Empiatech em28xx chips.</div><div class='ctx'> </div><div class='hunk'>@@ -76,5 +76,5 @@ config VIDEO_EM28XX_RC</div><div class='ctx'> 	depends on VIDEO_EM28XX</div><div class='ctx'> 	depends on !(RC_CORE=m &amp;&amp; VIDEO_EM28XX=y)</div><div class='ctx'> 	default VIDEO_EM28XX</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables Remote Controller support on em28xx driver.</div><div class='head'>diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c<br/>index f84a1208d5d3..d85ea1af6aa1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/em28xx/em28xx-input.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/em28xx/em28xx-input.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/em28xx/em28xx-input.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/em28xx/em28xx-input.c</a></div><div class='hunk'>@@ -499,7 +499,7 @@ static int em28xx_probe_i2c_ir(struct em28xx *dev)</div><div class='ctx'> 	 * at address 0x18, so if that address is needed for another board in</div><div class='ctx'> 	 * the future, please put it after 0x1f.</div><div class='ctx'> 	 */</div><div class='del'>-	const unsigned short addr_list[] = {</div><div class='add'>+	static const unsigned short addr_list[] = {</div><div class='ctx'> 		 0x1f, 0x30, 0x47, I2C_CLIENT_END</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig<br/>index af1d02430931..beab257c092f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/go7007/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,7 @@ config VIDEO_GO7007</div><div class='ctx'> 	select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT &amp;&amp; MEDIA_CAMERA_SUPPORT</div><div class='ctx'> 	select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the WIS GO7007 MPEG</div><div class='ctx'> 	  encoder chip.</div><div class='ctx'> </div><div class='hunk'>@@ -23,7 +23,7 @@ config VIDEO_GO7007</div><div class='ctx'> config VIDEO_GO7007_USB</div><div class='ctx'> 	tristate "WIS GO7007 USB support"</div><div class='ctx'> 	depends on VIDEO_GO7007 &amp;&amp; USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the WIS GO7007 MPEG</div><div class='ctx'> 	  encoder chip over USB.</div><div class='ctx'> </div><div class='hunk'>@@ -34,7 +34,7 @@ config VIDEO_GO7007_LOADER</div><div class='ctx'> 	tristate "WIS GO7007 Loader support"</div><div class='ctx'> 	depends on VIDEO_GO7007</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a go7007 firmware loader driver for the WIS GO7007</div><div class='ctx'> 	  MPEG encoder chip over USB.</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,7 @@ config VIDEO_GO7007_LOADER</div><div class='ctx'> config VIDEO_GO7007_USB_S2250_BOARD</div><div class='ctx'> 	tristate "Sensoray 2250/2251 support"</div><div class='ctx'> 	depends on VIDEO_GO7007_USB &amp;&amp; USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for the Sensoray 2250/2251 device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/go7007/go7007-fw.c b/drivers/media/usb/go7007/go7007-fw.c<br/>index 24f5b615dc7a..dfa9f899d0c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/go7007-fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/go7007-fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/go7007-fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/go7007/go7007-fw.c</a></div><div class='hunk'>@@ -1499,8 +1499,8 @@ static int modet_to_package(struct go7007 *go, __le16 *code, int space)</div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_special(struct go7007 *go, u16 type, __le16 *code, int space,</div><div class='del'>-			int *framelen)</div><div class='add'>+static noinline_for_stack int do_special(struct go7007 *go, u16 type,</div><div class='add'>+					 __le16 *code, int space, int *framelen)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case SPECIAL_FRM_HEAD:</div><div class='head'>diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c<br/>index 19c6a0354ce0..abe98488be23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/go7007-usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/go7007-usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/go7007-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/go7007/go7007-usb.c</a></div><div class='hunk'>@@ -1132,7 +1132,7 @@ static int go7007_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	usb-&gt;usbdev = usbdev;</div><div class='ctx'> 	usb_make_path(usbdev, go-&gt;bus_info, sizeof(go-&gt;bus_info));</div><div class='ctx'> 	go-&gt;board_id = id-&gt;driver_info;</div><div class='del'>-	strncpy(go-&gt;name, name, sizeof(go-&gt;name));</div><div class='add'>+	strscpy(go-&gt;name, name, sizeof(go-&gt;name));</div><div class='ctx'> 	if (board-&gt;flags &amp; GO7007_USB_EZUSB)</div><div class='ctx'> 		go-&gt;hpi_ops = &amp;go7007_usb_ezusb_hpi_ops;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1198,7 +1198,7 @@ static int go7007_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 				go-&gt;board_id = GO7007_BOARDID_ENDURA;</div><div class='ctx'> 				usb-&gt;board = board = &amp;board_endura;</div><div class='ctx'> 				go-&gt;board_info = &amp;board-&gt;main_info;</div><div class='del'>-				strncpy(go-&gt;name, "Pelco Endura",</div><div class='add'>+				strscpy(go-&gt;name, "Pelco Endura",</div><div class='ctx'> 					sizeof(go-&gt;name));</div><div class='ctx'> 			} else {</div><div class='ctx'> 				u16 channel;</div><div class='hunk'>@@ -1232,21 +1232,21 @@ static int go7007_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			go-&gt;tuner_type = TUNER_SONY_BTF_PG472Z;</div><div class='ctx'> 			go-&gt;std = V4L2_STD_PAL;</div><div class='del'>-			strncpy(go-&gt;name, "Plextor PX-TV402U-EU",</div><div class='del'>-					sizeof(go-&gt;name));</div><div class='add'>+			strscpy(go-&gt;name, "Plextor PX-TV402U-EU",</div><div class='add'>+				sizeof(go-&gt;name));</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			go-&gt;tuner_type = TUNER_SONY_BTF_PK467Z;</div><div class='ctx'> 			go-&gt;std = V4L2_STD_NTSC_M_JP;</div><div class='ctx'> 			num_i2c_devs -= 2;</div><div class='del'>-			strncpy(go-&gt;name, "Plextor PX-TV402U-JP",</div><div class='del'>-					sizeof(go-&gt;name));</div><div class='add'>+			strscpy(go-&gt;name, "Plextor PX-TV402U-JP",</div><div class='add'>+				sizeof(go-&gt;name));</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 3:</div><div class='ctx'> 			go-&gt;tuner_type = TUNER_SONY_BTF_PB463Z;</div><div class='ctx'> 			num_i2c_devs -= 2;</div><div class='del'>-			strncpy(go-&gt;name, "Plextor PX-TV402U-NA",</div><div class='del'>-					sizeof(go-&gt;name));</div><div class='add'>+			strscpy(go-&gt;name, "Plextor PX-TV402U-NA",</div><div class='add'>+				sizeof(go-&gt;name));</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			pr_debug("unable to detect tuner type!\n");</div><div class='head'>diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c<br/>index 7a2781fa83e7..bebdfcecf600 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/go7007-v4l2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/go7007/go7007-v4l2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/go7007/go7007-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/go7007/go7007-v4l2.c</a></div><div class='hunk'>@@ -327,7 +327,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,</div><div class='ctx'> 	fmt-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='ctx'> 	fmt-&gt;flags = V4L2_FMT_FLAG_COMPRESSED;</div><div class='ctx'> </div><div class='del'>-	strncpy(fmt-&gt;description, desc, sizeof(fmt-&gt;description));</div><div class='add'>+	strscpy(fmt-&gt;description, desc, sizeof(fmt-&gt;description));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig<br/>index 088566e88467..0e6f36cb46e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/gspca/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/gspca/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/gspca/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/gspca/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ menuconfig USB_GSPCA</div><div class='ctx'> 	depends on INPUT || INPUT=n</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	default m</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to enable selecting webcams based</div><div class='ctx'> 	  on the GSPCA framework.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c<br/>index ac70b36d67b7..4d7517411cc2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/gspca/gspca.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/gspca/gspca.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/gspca/gspca.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/gspca/gspca.c</a></div><div class='hunk'>@@ -294,7 +294,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		/* check the packet status and length */</div><div class='ctx'> 		st = urb-&gt;iso_frame_desc[i].status;</div><div class='ctx'> 		if (st) {</div><div class='del'>-			pr_err("ISOC data error: [%d] len=%d, status=%d\n",</div><div class='add'>+			gspca_dbg(gspca_dev, D_PACK, "ISOC data error: [%d] len=%d, status=%d\n",</div><div class='ctx'> 			       i, len, st);</div><div class='ctx'> 			gspca_dev-&gt;last_packet_type = DISCARD_PACKET;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -314,6 +314,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> resubmit:</div><div class='add'>+	if (!gspca_dev-&gt;streaming)</div><div class='add'>+		return;</div><div class='ctx'> 	/* resubmit the URB */</div><div class='ctx'> 	st = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (st &lt; 0)</div><div class='hunk'>@@ -330,7 +332,7 @@ static void isoc_irq(struct urb *urb)</div><div class='ctx'> 	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	gspca_dbg(gspca_dev, D_PACK, "isoc irq\n");</div><div class='del'>-	if (!vb2_start_streaming_called(&amp;gspca_dev-&gt;queue))</div><div class='add'>+	if (!gspca_dev-&gt;streaming)</div><div class='ctx'> 		return;</div><div class='ctx'> 	fill_frame(gspca_dev, urb);</div><div class='ctx'> }</div><div class='hunk'>@@ -344,7 +346,7 @@ static void bulk_irq(struct urb *urb)</div><div class='ctx'> 	int st;</div><div class='ctx'> </div><div class='ctx'> 	gspca_dbg(gspca_dev, D_PACK, "bulk irq\n");</div><div class='del'>-	if (!vb2_start_streaming_called(&amp;gspca_dev-&gt;queue))</div><div class='add'>+	if (!gspca_dev-&gt;streaming)</div><div class='ctx'> 		return;</div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -367,6 +369,8 @@ static void bulk_irq(struct urb *urb)</div><div class='ctx'> 				urb-&gt;actual_length);</div><div class='ctx'> </div><div class='ctx'> resubmit:</div><div class='add'>+	if (!gspca_dev-&gt;streaming)</div><div class='add'>+		return;</div><div class='ctx'> 	/* resubmit the URB */</div><div class='ctx'> 	if (gspca_dev-&gt;cam.bulk_nurbs != 0) {</div><div class='ctx'> 		st = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='hunk'>@@ -1638,6 +1642,8 @@ void gspca_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='ctx'> 	gspca_dev-&gt;present = false;</div><div class='add'>+	destroy_urbs(gspca_dev);</div><div class='add'>+	gspca_input_destroy_urb(gspca_dev);</div><div class='ctx'> </div><div class='ctx'> 	vb2_queue_error(&amp;gspca_dev-&gt;queue);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/hackrf/Kconfig b/drivers/media/usb/hackrf/Kconfig<br/>index 937e6f5c1e8e..072e186018f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/hackrf/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/hackrf/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/hackrf/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/hackrf/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config USB_HACKRF</div><div class='ctx'> 	tristate "HackRF"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux2 driver for HackRF SDR device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/hdpvr/Kconfig b/drivers/media/usb/hdpvr/Kconfig<br/>index d73d9a1952b4..9e78c0c32651 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/hdpvr/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/hdpvr/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/hdpvr/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/hdpvr/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> config VIDEO_HDPVR</div><div class='ctx'> 	tristate "Hauppauge HD PVR support"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Hauppauge's HD PVR USB device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c<br/>index e082086428a4..3804aa3fb50f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/hdpvr/hdpvr-video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/hdpvr/hdpvr-video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/hdpvr/hdpvr-video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/hdpvr/hdpvr-video.c</a></div><div class='hunk'>@@ -769,8 +769,7 @@ static int vidioc_enum_input(struct file *file, void *_fh, struct v4l2_input *i)</div><div class='ctx'> </div><div class='ctx'> 	i-&gt;type = V4L2_INPUT_TYPE_CAMERA;</div><div class='ctx'> </div><div class='del'>-	strncpy(i-&gt;name, iname[n], sizeof(i-&gt;name) - 1);</div><div class='del'>-	i-&gt;name[sizeof(i-&gt;name) - 1] = '\0';</div><div class='add'>+	strscpy(i-&gt;name, iname[n], sizeof(i-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	i-&gt;audioset = 1&lt;&lt;HDPVR_RCA_FRONT | 1&lt;&lt;HDPVR_RCA_BACK | 1&lt;&lt;HDPVR_SPDIF;</div><div class='ctx'> </div><div class='hunk'>@@ -841,8 +840,7 @@ static int vidioc_enumaudio(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> 	audio-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='ctx'> </div><div class='del'>-	strncpy(audio-&gt;name, audio_iname[n], sizeof(audio-&gt;name) - 1);</div><div class='del'>-	audio-&gt;name[sizeof(audio-&gt;name) - 1] = '\0';</div><div class='add'>+	strscpy(audio-&gt;name, audio_iname[n], sizeof(audio-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -874,7 +872,6 @@ static int vidioc_g_audio(struct file *file, void *private_data,</div><div class='ctx'> 	audio-&gt;index = dev-&gt;options.audio_input;</div><div class='ctx'> 	audio-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='ctx'> 	strscpy(audio-&gt;name, audio_iname[audio-&gt;index], sizeof(audio-&gt;name));</div><div class='del'>-	audio-&gt;name[sizeof(audio-&gt;name) - 1] = '\0';</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -991,7 +988,8 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *private_data,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;flags = V4L2_FMT_FLAG_COMPRESSED;</div><div class='del'>-	strncpy(f-&gt;description, "MPEG2-TS with AVC/AAC streams", 32);</div><div class='add'>+	strscpy(f-&gt;description, "MPEG2-TS with AVC/AAC streams",</div><div class='add'>+		sizeof(f-&gt;description));</div><div class='ctx'> 	f-&gt;pixelformat = V4L2_PIX_FMT_MPEG;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/usb/pulse8-cec/Kconfig b/drivers/media/usb/pulse8-cec/Kconfig<br/>index 18ead44824ba..11f1b75d3efd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pulse8-cec/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pulse8-cec/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pulse8-cec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pulse8-cec/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ config USB_PULSE8_CEC</div><div class='ctx'> 	select CEC_CORE</div><div class='ctx'> 	select SERIO</div><div class='ctx'> 	select SERIO_SERPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a cec driver for the Pulse Eight HDMI CEC device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/usb/pulse8-cec/pulse8-cec.c<br/>index b085b14f3f87..ea9ee74fa336 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pulse8-cec/pulse8-cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pulse8-cec/pulse8-cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pulse8-cec/pulse8-cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pulse8-cec/pulse8-cec.c</a></div><div class='hunk'>@@ -435,7 +435,7 @@ static int pulse8_setup(struct pulse8 *pulse8, struct serio *serio,</div><div class='ctx'> 	err = pulse8_send_and_wait(pulse8, cmd, 1, cmd[0], 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	strncpy(log_addrs-&gt;osd_name, data, 13);</div><div class='add'>+	strscpy(log_addrs-&gt;osd_name, data, sizeof(log_addrs-&gt;osd_name));</div><div class='ctx'> 	dev_dbg(pulse8-&gt;dev, "OSD name: %s\n", log_addrs-&gt;osd_name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -566,7 +566,7 @@ static int pulse8_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)</div><div class='ctx'> 		char *osd_str = cmd + 1;</div><div class='ctx'> </div><div class='ctx'> 		cmd[0] = MSGCODE_SET_OSD_NAME;</div><div class='del'>-		strncpy(cmd + 1, adap-&gt;log_addrs.osd_name, 13);</div><div class='add'>+		strscpy(cmd + 1, adap-&gt;log_addrs.osd_name, sizeof(cmd) - 1);</div><div class='ctx'> 		if (osd_len &lt; 4) {</div><div class='ctx'> 			memset(osd_str + osd_len, ' ', 4 - osd_len);</div><div class='ctx'> 			osd_len = 4;</div><div class='head'>diff --git a/drivers/media/usb/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/Kconfig<br/>index 1ad913fc30bf..ac6612cf1bec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pvrusb2/Kconfig</a></div><div class='hunk'>@@ -9,7 +9,7 @@ config VIDEO_PVRUSB2</div><div class='ctx'> 	select VIDEO_MSP3400</div><div class='ctx'> 	select VIDEO_WM8775</div><div class='ctx'> 	select VIDEO_CS53L32A</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for Conexant 23416 based</div><div class='ctx'> 	  usb2 personal video recorder devices.</div><div class='ctx'> </div><div class='hunk'>@@ -20,7 +20,7 @@ config VIDEO_PVRUSB2_SYSFS</div><div class='ctx'> 	bool "pvrusb2 sysfs support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on VIDEO_PVRUSB2 &amp;&amp; SYSFS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables the operation of a sysfs based</div><div class='ctx'> 	  interface for query and control of the pvrusb2 driver.</div><div class='ctx'> </div><div class='hunk'>@@ -43,7 +43,7 @@ config VIDEO_PVRUSB2_DVB</div><div class='ctx'> 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT</div><div class='ctx'> 	select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables a DVB interface for the pvrusb2 driver.</div><div class='ctx'> 	  If your device does not support digital television, this</div><div class='ctx'> 	  feature will have no affect on the driver's operation.</div><div class='hunk'>@@ -53,7 +53,7 @@ config VIDEO_PVRUSB2_DVB</div><div class='ctx'> config VIDEO_PVRUSB2_DEBUGIFC</div><div class='ctx'> 	bool "pvrusb2 debug interface"</div><div class='ctx'> 	depends on VIDEO_PVRUSB2_SYSFS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables the inclusion of a debug interface</div><div class='ctx'> 	  in the pvrusb2 driver, hosted through sysfs.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c<br/>index 446a999dd2ce..816c85786c2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/pvrusb2-hdw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/pvrusb2-hdw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/pvrusb2-hdw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pvrusb2/pvrusb2-hdw.c</a></div><div class='hunk'>@@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)</div><div class='ctx'> </div><div class='ctx'> static int ctrl_check_input(struct pvr2_ctrl *cptr,int v)</div><div class='ctx'> {</div><div class='add'>+	if (v &lt; 0 || v &gt; PVR2_CVAL_INPUT_MAX)</div><div class='add'>+		return 0;</div><div class='ctx'> 	return ((1 &lt;&lt; v) &amp; cptr-&gt;hdw-&gt;input_allowed_mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2459,9 +2461,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='ctx'> 		if (!(qctrl.flags &amp; V4L2_CTRL_FLAG_READ_ONLY)) {</div><div class='ctx'> 			ciptr-&gt;set_value = ctrl_cx2341x_set;</div><div class='ctx'> 		}</div><div class='del'>-		strncpy(hdw-&gt;mpeg_ctrl_info[idx].desc,qctrl.name,</div><div class='del'>-			PVR2_CTLD_INFO_DESC_SIZE);</div><div class='del'>-		hdw-&gt;mpeg_ctrl_info[idx].desc[PVR2_CTLD_INFO_DESC_SIZE-1] = 0;</div><div class='add'>+		strscpy(hdw-&gt;mpeg_ctrl_info[idx].desc, qctrl.name,</div><div class='add'>+			sizeof(hdw-&gt;mpeg_ctrl_info[idx].desc));</div><div class='ctx'> 		ciptr-&gt;default_value = qctrl.default_value;</div><div class='ctx'> 		switch (qctrl.type) {</div><div class='ctx'> 		default:</div><div class='head'>diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.h b/drivers/media/usb/pvrusb2/pvrusb2-hdw.h<br/>index 25648add77e5..bd2b7a67b732 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/pvrusb2-hdw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/pvrusb2-hdw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/pvrusb2-hdw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pvrusb2/pvrusb2-hdw.h</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #define PVR2_CVAL_INPUT_COMPOSITE 2</div><div class='ctx'> #define PVR2_CVAL_INPUT_SVIDEO 3</div><div class='ctx'> #define PVR2_CVAL_INPUT_RADIO 4</div><div class='add'>+#define PVR2_CVAL_INPUT_MAX PVR2_CVAL_INPUT_RADIO</div><div class='ctx'> </div><div class='ctx'> enum pvr2_config {</div><div class='ctx'> 	pvr2_config_empty,    /* No configuration */</div><div class='head'>diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c<br/>index 08d5b7aa3537..cb6668580d77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pvrusb2/pvrusb2-v4l2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pvrusb2/pvrusb2-v4l2.c</a></div><div class='hunk'>@@ -284,7 +284,7 @@ static int pvr2_enumaudio(struct file *file, void *priv, struct v4l2_audio *vin)</div><div class='ctx'> </div><div class='ctx'> 	if (vin-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	strncpy(vin-&gt;name, "PVRUSB2 Audio", 14);</div><div class='add'>+	strscpy(vin-&gt;name, "PVRUSB2 Audio", sizeof(vin-&gt;name));</div><div class='ctx'> 	vin-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -293,7 +293,7 @@ static int pvr2_g_audio(struct file *file, void *priv, struct v4l2_audio *vin)</div><div class='ctx'> {</div><div class='ctx'> 	/* pkt: FIXME: see above comment (VIDIOC_ENUMAUDIO) */</div><div class='ctx'> 	vin-&gt;index = 0;</div><div class='del'>-	strncpy(vin-&gt;name, "PVRUSB2 Audio", 14);</div><div class='add'>+	strscpy(vin-&gt;name, "PVRUSB2 Audio", sizeof(vin-&gt;name));</div><div class='ctx'> 	vin-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/usb/pwc/Kconfig b/drivers/media/usb/pwc/Kconfig<br/>index d63d0a850035..5f6d91edca41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pwc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pwc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pwc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pwc/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config USB_PWC</div><div class='ctx'> 	tristate "USB Philips Cameras"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y or M here if you want to use one of these Philips &amp; OEM</div><div class='ctx'> 	  webcams:</div><div class='ctx'> 	   * Philips PCA645, PCA646</div><div class='hunk'>@@ -41,7 +41,7 @@ config USB_PWC_INPUT_EVDEV</div><div class='ctx'> 	bool "USB Philips Cameras input events device support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on USB_PWC &amp;&amp; (USB_PWC=INPUT || INPUT=y)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option makes USB Philips cameras register the snapshot button as</div><div class='ctx'> 	  an input device to report button events.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/pwc/pwc-ctrl.c b/drivers/media/usb/pwc/pwc-ctrl.c<br/>index 655cef39eb3d..b681a184ef87 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pwc/pwc-ctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/pwc/pwc-ctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/pwc/pwc-ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/pwc/pwc-ctrl.c</a></div><div class='hunk'>@@ -242,14 +242,14 @@ static int set_video_mode_Timon(struct pwc_device *pdev, int size, int pixfmt,</div><div class='ctx'> 	fps = (frames / 5) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Find a supported framerate with progressively higher compression */</div><div class='del'>-	pChoose = NULL;</div><div class='del'>-	while (*compression &lt;= 3) {</div><div class='add'>+	do {</div><div class='ctx'> 		pChoose = &amp;Timon_table[size][fps][*compression];</div><div class='ctx'> 		if (pChoose-&gt;alternate != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		(*compression)++;</div><div class='del'>-	}</div><div class='del'>-	if (pChoose == NULL || pChoose-&gt;alternate == 0)</div><div class='add'>+	} while (*compression &lt;= 3);</div><div class='add'>+</div><div class='add'>+	if (pChoose-&gt;alternate == 0)</div><div class='ctx'> 		return -ENOENT; /* Not supported. */</div><div class='ctx'> </div><div class='ctx'> 	if (send_to_cam)</div><div class='hunk'>@@ -279,7 +279,7 @@ static int set_video_mode_Timon(struct pwc_device *pdev, int size, int pixfmt,</div><div class='ctx'> static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int pixfmt,</div><div class='ctx'> 				int frames, int *compression, int send_to_cam)</div><div class='ctx'> {</div><div class='del'>-	const struct Kiara_table_entry *pChoose = NULL;</div><div class='add'>+	const struct Kiara_table_entry *pChoose;</div><div class='ctx'> 	int fps, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (size &gt;= PSZ_MAX || *compression &lt; 0 || *compression &gt; 3)</div><div class='hunk'>@@ -293,13 +293,14 @@ static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int pixfmt,</div><div class='ctx'> 	fps = (frames / 5) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Find a supported framerate with progressively higher compression */</div><div class='del'>-	while (*compression &lt;= 3) {</div><div class='add'>+	do {</div><div class='ctx'> 		pChoose = &amp;Kiara_table[size][fps][*compression];</div><div class='ctx'> 		if (pChoose-&gt;alternate != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		(*compression)++;</div><div class='del'>-	}</div><div class='del'>-	if (pChoose == NULL || pChoose-&gt;alternate == 0)</div><div class='add'>+	} while (*compression &lt;= 3);</div><div class='add'>+</div><div class='add'>+	if (pChoose-&gt;alternate == 0)</div><div class='ctx'> 		return -ENOENT; /* Not supported. */</div><div class='ctx'> </div><div class='ctx'> 	/* Firmware bug: video endpoint is 5, but commands are sent to endpoint 4 */</div><div class='head'>diff --git a/drivers/media/usb/rainshadow-cec/Kconfig b/drivers/media/usb/rainshadow-cec/Kconfig<br/>index 030ef01b1ff0..6b00be618db8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/rainshadow-cec/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/rainshadow-cec/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/rainshadow-cec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/rainshadow-cec/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ config USB_RAINSHADOW_CEC</div><div class='ctx'> 	select CEC_CORE</div><div class='ctx'> 	select SERIO</div><div class='ctx'> 	select SERIO_SERPORT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a cec driver for the RainShadow Tech HDMI CEC device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/siano/Kconfig b/drivers/media/usb/siano/Kconfig<br/>index d37b742d4f7a..cc5e5aa3c93a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/siano/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/siano/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/siano/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/siano/Kconfig</a></div><div class='hunk'>@@ -8,6 +8,6 @@ config SMS_USB_DRV</div><div class='ctx'> 	depends on !RC_CORE || RC_CORE</div><div class='ctx'> 	select MEDIA_COMMON_OPTIONS</div><div class='ctx'> 	select SMS_SIANO_MDTV</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Choose if you would like to have Siano's support for USB interface</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/stk1160/Kconfig b/drivers/media/usb/stk1160/Kconfig<br/>index 425ed00e2599..03426e4437ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/stk1160/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/stk1160/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/stk1160/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/stk1160/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config VIDEO_STK1160_COMMON</div><div class='ctx'> 	tristate "STK1160 USB video capture support"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; I2C</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for STK1160 based video capture devices.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/stkwebcam/Kconfig b/drivers/media/usb/stkwebcam/Kconfig<br/>index a6a00aa4fce6..ea9e04b3caaf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/stkwebcam/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/stkwebcam/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/stkwebcam/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/stkwebcam/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> config USB_STKWEBCAM</div><div class='ctx'> 	tristate "USB Syntek DC1125 Camera support"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use this type of camera.</div><div class='ctx'> 	  Supported devices are typically found in some Asus laptops,</div><div class='ctx'> 	  with USB id 174f:a311 and 05e1:0501. Other Syntek cameras</div><div class='head'>diff --git a/drivers/media/usb/tm6000/Kconfig b/drivers/media/usb/tm6000/Kconfig<br/>index a43b77abd931..321ae691f4d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/tm6000/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/tm6000/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/tm6000/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/tm6000/Kconfig</a></div><div class='hunk'>@@ -18,7 +18,7 @@ config VIDEO_TM6000_ALSA</div><div class='ctx'> 	tristate "TV Master TM5600/6000/6010 audio support"</div><div class='ctx'> 	depends on VIDEO_TM6000 &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux driver for direct (DMA) audio for</div><div class='ctx'> 	  TM5600/TM6000/TM6010 USB Devices.</div><div class='ctx'> </div><div class='hunk'>@@ -29,5 +29,5 @@ config VIDEO_TM6000_DVB</div><div class='ctx'> 	tristate "DVB Support for tm6000 based TV cards"</div><div class='ctx'> 	depends on VIDEO_TM6000 &amp;&amp; DVB_CORE &amp;&amp; USB</div><div class='ctx'> 	select DVB_ZL10353</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds support for DVB cards based on the tm5600/tm6000 chip.</div><div class='head'>diff --git a/drivers/media/usb/usbtv/Kconfig b/drivers/media/usb/usbtv/Kconfig<br/>index 14a0941fa0d0..2b4ac0848469 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/usbtv/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/usbtv/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/usbtv/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/usbtv/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ config VIDEO_USBTV</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is a video4linux2 driver for USBTV007 based video capture devices.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/media/usb/usbvision/Kconfig b/drivers/media/usb/usbvision/Kconfig<br/>index 6b6afc5d8f7e..7aa080cb9884 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/usbvision/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/usbvision/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/usbvision/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/usbvision/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@ config VIDEO_USBVISION</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='ctx'> 	select VIDEO_TUNER</div><div class='ctx'> 	select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  There are more than 50 different USB video devices based on</div><div class='ctx'> 	  NT1003/1004/1005 USB Bridges. This driver enables using those</div><div class='ctx'> 	  devices.</div><div class='head'>diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c<br/>index 92d166bf8c12..abc4eed832a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/usbvision/usbvision-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/usbvision/usbvision-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/usbvision/usbvision-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/usbvision/usbvision-core.c</a></div><div class='hunk'>@@ -2302,6 +2302,9 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)</div><div class='ctx'> 					   sb_size,</div><div class='ctx'> 					   GFP_KERNEL,</div><div class='ctx'> 					   &amp;urb-&gt;transfer_dma);</div><div class='add'>+		if (!usbvision-&gt;sbuf[buf_idx].data)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 		urb-&gt;dev = dev;</div><div class='ctx'> 		urb-&gt;context = usbvision;</div><div class='ctx'> 		urb-&gt;pipe = usb_rcvisocpipe(dev, usbvision-&gt;video_endp);</div><div class='head'>diff --git a/drivers/media/usb/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig<br/>index 6ed85efabcaa..94937d0cc2e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/uvc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/uvc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/uvc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/uvc/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@ config USB_VIDEO_CLASS</div><div class='ctx'> 	tristate "USB Video Class (UVC)"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the USB Video Class (UVC).  Currently only video</div><div class='ctx'> 	  input devices, such as webcams, are supported.</div><div class='ctx'> </div><div class='hunk'>@@ -13,7 +13,7 @@ config USB_VIDEO_CLASS_INPUT_EVDEV</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on USB_VIDEO_CLASS</div><div class='ctx'> 	depends on USB_VIDEO_CLASS=INPUT || INPUT=y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option makes USB Video Class devices register an input device</div><div class='ctx'> 	  to report button events.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/media/usb/zr364xx/Kconfig<br/>index ac429bca70e8..979b1d4f3f68 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/zr364xx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/usb/zr364xx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/usb/zr364xx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/usb/zr364xx/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@ config USB_ZR364XX</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='ctx'> 	select VIDEOBUF_GEN</div><div class='ctx'> 	select VIDEOBUF_VMALLOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect this type of camera to your</div><div class='ctx'> 	  computer's USB port.</div><div class='ctx'> 	  See &lt;file:Documentation/media/v4l-drivers/zr364xx.rst&gt; for more info</div><div class='head'>diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig<br/>index c0940f5c69b4..8402096f7796 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,7 @@ config VIDEO_V4L2</div><div class='ctx'> config VIDEO_ADV_DEBUG</div><div class='ctx'> 	bool "Enable advanced debug functionality on V4L2 drivers"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable advanced debugging functionality on some</div><div class='ctx'> 	  V4L devices.</div><div class='ctx'> 	  In doubt, say N.</div><div class='hunk'>@@ -21,7 +21,7 @@ config VIDEO_ADV_DEBUG</div><div class='ctx'> config VIDEO_FIXED_MINOR_RANGES</div><div class='ctx'> 	bool "Enable old-style fixed minor ranges on drivers/video devices"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable the old-style fixed-range minor assignments.</div><div class='ctx'> 	  Only useful if you rely on the old behavior and use mknod instead of udev.</div><div class='ctx'> </div><div class='hunk'>@@ -33,7 +33,7 @@ config VIDEO_PCI_SKELETON</div><div class='ctx'> 	depends on SAMPLES</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; VIDEOBUF2_CORE</div><div class='ctx'> 	depends on VIDEOBUF2_MEMOPS &amp;&amp; VIDEOBUF2_DMA_CONTIG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable build of the skeleton PCI driver, used as a reference</div><div class='ctx'> 	  when developing new drivers.</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +51,7 @@ config V4L2_FLASH_LED_CLASS</div><div class='ctx'> 	tristate "V4L2 flash API for LED flash class devices"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on LEDS_CLASS_FLASH</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable V4L2 flash API support for LED flash</div><div class='ctx'> 	  class drivers.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c<br/>index 663730f088cd..b5778b2ffa27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/v4l2-common.c</a></div><div class='hunk'>@@ -445,3 +445,189 @@ int v4l2_s_parm_cap(struct video_device *vdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(v4l2_s_parm_cap);</div><div class='add'>+</div><div class='add'>+const struct v4l2_format_info *v4l2_format_info(u32 format)</div><div class='add'>+{</div><div class='add'>+	static const struct v4l2_format_info formats[] = {</div><div class='add'>+		/* RGB formats */</div><div class='add'>+		{ .format = V4L2_PIX_FMT_BGR24,   .mem_planes = 1, .comp_planes = 1, .bpp = { 3, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_RGB24,   .mem_planes = 1, .comp_planes = 1, .bpp = { 3, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_HSV24,   .mem_planes = 1, .comp_planes = 1, .bpp = { 3, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_BGR32,   .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_XBGR32,  .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_RGB32,   .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_XRGB32,  .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_HSV32,   .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_ARGB32,  .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_ABGR32,  .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_GREY,    .mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+</div><div class='add'>+		/* YUV packed formats */</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUYV,    .mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YVYU,    .mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_UYVY,    .mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_VYUY,    .mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+</div><div class='add'>+		/* YUV planar formats */</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV12,    .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV21,    .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV16,    .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV61,    .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV24,    .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV42,    .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV410,  .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 4, .vdiv = 4 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YVU410,  .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 4, .vdiv = 4 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV411P, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 4, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV420,  .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YVU420,  .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV422P, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+</div><div class='add'>+		/* YUV planar formats, non contiguous variant */</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV420M, .mem_planes = 3, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YVU420M, .mem_planes = 3, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV422M, .mem_planes = 3, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YVU422M, .mem_planes = 3, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YUV444M, .mem_planes = 3, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_YVU444M, .mem_planes = 3, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV12M,   .mem_planes = 2, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV21M,   .mem_planes = 2, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 2 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV16M,   .mem_planes = 2, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_NV61M,   .mem_planes = 2, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .hdiv = 2, .vdiv = 1 },</div><div class='add'>+</div><div class='add'>+		/* Bayer RGB formats */</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SBGGR8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGBRG8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGRBG8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SRGGB8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SBGGR10,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGBRG10,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGRBG10,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SRGGB10,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SBGGR10ALAW8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGBRG10ALAW8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGRBG10ALAW8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SRGGB10ALAW8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SBGGR10DPCM8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGBRG10DPCM8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGRBG10DPCM8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SRGGB10DPCM8,	.mem_planes = 1, .comp_planes = 1, .bpp = { 1, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SBGGR12,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGBRG12,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SGRBG12,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+		{ .format = V4L2_PIX_FMT_SRGGB12,	.mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 1, .vdiv = 1 },</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(formats); ++i)</div><div class='add'>+		if (formats[i].format == format)</div><div class='add'>+			return &amp;formats[i];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(v4l2_format_info);</div><div class='add'>+</div><div class='add'>+static inline unsigned int v4l2_format_block_width(const struct v4l2_format_info *info, int plane)</div><div class='add'>+{</div><div class='add'>+	if (!info-&gt;block_w[plane])</div><div class='add'>+		return 1;</div><div class='add'>+	return info-&gt;block_w[plane];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int v4l2_format_block_height(const struct v4l2_format_info *info, int plane)</div><div class='add'>+{</div><div class='add'>+	if (!info-&gt;block_h[plane])</div><div class='add'>+		return 1;</div><div class='add'>+	return info-&gt;block_h[plane];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt,</div><div class='add'>+			 int pixelformat, int width, int height)</div><div class='add'>+{</div><div class='add'>+	const struct v4l2_format_info *info;</div><div class='add'>+	struct v4l2_plane_pix_format *plane;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	info = v4l2_format_info(pixelformat);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pixfmt-&gt;width = width;</div><div class='add'>+	pixfmt-&gt;height = height;</div><div class='add'>+	pixfmt-&gt;pixelformat = pixelformat;</div><div class='add'>+	pixfmt-&gt;num_planes = info-&gt;mem_planes;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;mem_planes == 1) {</div><div class='add'>+		plane = &amp;pixfmt-&gt;plane_fmt[0];</div><div class='add'>+		plane-&gt;bytesperline = ALIGN(width, v4l2_format_block_width(info, 0)) * info-&gt;bpp[0];</div><div class='add'>+		plane-&gt;sizeimage = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; info-&gt;comp_planes; i++) {</div><div class='add'>+			unsigned int hdiv = (i == 0) ? 1 : info-&gt;hdiv;</div><div class='add'>+			unsigned int vdiv = (i == 0) ? 1 : info-&gt;vdiv;</div><div class='add'>+			unsigned int aligned_width;</div><div class='add'>+			unsigned int aligned_height;</div><div class='add'>+</div><div class='add'>+			aligned_width = ALIGN(width, v4l2_format_block_width(info, i));</div><div class='add'>+			aligned_height = ALIGN(height, v4l2_format_block_height(info, i));</div><div class='add'>+</div><div class='add'>+			plane-&gt;sizeimage += info-&gt;bpp[i] *</div><div class='add'>+				DIV_ROUND_UP(aligned_width, hdiv) *</div><div class='add'>+				DIV_ROUND_UP(aligned_height, vdiv);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; info-&gt;comp_planes; i++) {</div><div class='add'>+			unsigned int hdiv = (i == 0) ? 1 : info-&gt;hdiv;</div><div class='add'>+			unsigned int vdiv = (i == 0) ? 1 : info-&gt;vdiv;</div><div class='add'>+			unsigned int aligned_width;</div><div class='add'>+			unsigned int aligned_height;</div><div class='add'>+</div><div class='add'>+			aligned_width = ALIGN(width, v4l2_format_block_width(info, i));</div><div class='add'>+			aligned_height = ALIGN(height, v4l2_format_block_height(info, i));</div><div class='add'>+</div><div class='add'>+			plane = &amp;pixfmt-&gt;plane_fmt[i];</div><div class='add'>+			plane-&gt;bytesperline =</div><div class='add'>+				info-&gt;bpp[i] * DIV_ROUND_UP(aligned_width, hdiv);</div><div class='add'>+			plane-&gt;sizeimage =</div><div class='add'>+				plane-&gt;bytesperline * DIV_ROUND_UP(aligned_height, vdiv);</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(v4l2_fill_pixfmt_mp);</div><div class='add'>+</div><div class='add'>+int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, int pixelformat, int width, int height)</div><div class='add'>+{</div><div class='add'>+	const struct v4l2_format_info *info;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	info = v4l2_format_info(pixelformat);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Single planar API cannot be used for multi plane formats. */</div><div class='add'>+	if (info-&gt;mem_planes &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pixfmt-&gt;width = width;</div><div class='add'>+	pixfmt-&gt;height = height;</div><div class='add'>+	pixfmt-&gt;pixelformat = pixelformat;</div><div class='add'>+	pixfmt-&gt;bytesperline = ALIGN(width, v4l2_format_block_width(info, 0)) * info-&gt;bpp[0];</div><div class='add'>+	pixfmt-&gt;sizeimage = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;comp_planes; i++) {</div><div class='add'>+		unsigned int hdiv = (i == 0) ? 1 : info-&gt;hdiv;</div><div class='add'>+		unsigned int vdiv = (i == 0) ? 1 : info-&gt;vdiv;</div><div class='add'>+		unsigned int aligned_width;</div><div class='add'>+		unsigned int aligned_height;</div><div class='add'>+</div><div class='add'>+		aligned_width = ALIGN(width, v4l2_format_block_width(info, i));</div><div class='add'>+		aligned_height = ALIGN(height, v4l2_format_block_height(info, i));</div><div class='add'>+</div><div class='add'>+		pixfmt-&gt;sizeimage += info-&gt;bpp[i] *</div><div class='add'>+			DIV_ROUND_UP(aligned_width, hdiv) *</div><div class='add'>+			DIV_ROUND_UP(aligned_height, vdiv);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt);</div><div class='head'>diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c<br/>index b79d3bbd8350..89a1fe564675 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-ctrls.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-ctrls.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-ctrls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/v4l2-ctrls.c</a></div><div class='hunk'>@@ -828,6 +828,10 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION:</div><div class='ctx'> 								return "H264 Constrained Intra Pred";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET:	return "H264 Chroma QP Index Offset";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP:		return "H264 I-Frame Minimum QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP:		return "H264 I-Frame Maximum QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP:		return "H264 P-Frame Minimum QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP:		return "H264 P-Frame Maximum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP:		return "MPEG4 I-Frame QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP:		return "MPEG4 P-Frame QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP:		return "MPEG4 B-Frame QP Value";</div><div class='hunk'>@@ -849,6 +853,9 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:		return "Force Key Frame";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS:		return "MPEG-2 Slice Parameters";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION:		return "MPEG-2 Quantization Matrices";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS:			return "FWHT Stateless Parameters";</div><div class='add'>+	case V4L2_CID_FWHT_I_FRAME_QP:				return "FWHT I-Frame QP Value";</div><div class='add'>+	case V4L2_CID_FWHT_P_FRAME_QP:				return "FWHT P-Frame QP Value";</div><div class='ctx'> </div><div class='ctx'> 	/* VPX controls */</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS:		return "VPX Number of Partitions";</div><div class='hunk'>@@ -1303,6 +1310,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION:</div><div class='ctx'> 		*type = V4L2_CTRL_TYPE_MPEG2_QUANTIZATION;</div><div class='ctx'> 		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS:</div><div class='add'>+		*type = V4L2_CTRL_TYPE_FWHT_PARAMS;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		*type = V4L2_CTRL_TYPE_INTEGER;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1599,7 +1609,7 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,</div><div class='ctx'> 	case V4L2_CTRL_TYPE_INTEGER_MENU:</div><div class='ctx'> 		if (ptr.p_s32[idx] &lt; ctrl-&gt;minimum || ptr.p_s32[idx] &gt; ctrl-&gt;maximum)</div><div class='ctx'> 			return -ERANGE;</div><div class='del'>-		if (ctrl-&gt;menu_skip_mask &amp; (1 &lt;&lt; ptr.p_s32[idx]))</div><div class='add'>+		if (ctrl-&gt;menu_skip_mask &amp; (1ULL &lt;&lt; ptr.p_s32[idx]))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (ctrl-&gt;type == V4L2_CTRL_TYPE_MENU &amp;&amp;</div><div class='ctx'> 		    ctrl-&gt;qmenu[ptr.p_s32[idx]][0] == '\0')</div><div class='hunk'>@@ -1669,6 +1679,9 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,</div><div class='ctx'> 	case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION:</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	case V4L2_CTRL_TYPE_FWHT_PARAMS:</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2249,6 +2262,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,</div><div class='ctx'> 	case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION:</div><div class='ctx'> 		elem_size = sizeof(struct v4l2_ctrl_mpeg2_quantization);</div><div class='ctx'> 		break;</div><div class='add'>+	case V4L2_CTRL_TYPE_FWHT_PARAMS:</div><div class='add'>+		elem_size = sizeof(struct v4l2_ctrl_fwht_params);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (type &lt; V4L2_CTRL_COMPOUND_TYPES)</div><div class='ctx'> 			elem_size = sizeof(s32);</div><div class='hunk'>@@ -2918,7 +2934,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Use mask to see if this menu item should be skipped */</div><div class='del'>-	if (ctrl-&gt;menu_skip_mask &amp; (1 &lt;&lt; i))</div><div class='add'>+	if (ctrl-&gt;menu_skip_mask &amp; (1ULL &lt;&lt; i))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	/* Empty menu items should also be skipped */</div><div class='ctx'> 	if (ctrl-&gt;type == V4L2_CTRL_TYPE_MENU) {</div><div class='hunk'>@@ -3899,18 +3915,19 @@ void v4l2_ctrl_request_complete(struct media_request *req,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v4l2_ctrl_request_complete);</div><div class='ctx'> </div><div class='del'>-void v4l2_ctrl_request_setup(struct media_request *req,</div><div class='add'>+int v4l2_ctrl_request_setup(struct media_request *req,</div><div class='ctx'> 			     struct v4l2_ctrl_handler *main_hdl)</div><div class='ctx'> {</div><div class='ctx'> 	struct media_request_object *obj;</div><div class='ctx'> 	struct v4l2_ctrl_handler *hdl;</div><div class='ctx'> 	struct v4l2_ctrl_ref *ref;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!req || !main_hdl)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(req-&gt;state != MEDIA_REQUEST_STATE_QUEUED))</div><div class='del'>-		return;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that it is valid if nothing was found. It means</div><div class='hunk'>@@ -3919,10 +3936,10 @@ void v4l2_ctrl_request_setup(struct media_request *req,</div><div class='ctx'> 	 */</div><div class='ctx'> 	obj = media_request_object_find(req, &amp;req_ops, main_hdl);</div><div class='ctx'> 	if (!obj)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (obj-&gt;completed) {</div><div class='ctx'> 		media_request_object_put(obj);</div><div class='del'>-		return;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	hdl = container_of(obj, struct v4l2_ctrl_handler, req_obj);</div><div class='ctx'> </div><div class='hunk'>@@ -3990,12 +4007,15 @@ void v4l2_ctrl_request_setup(struct media_request *req,</div><div class='ctx'> 				update_from_auto_cluster(master);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		try_or_set_cluster(NULL, master, true, 0);</div><div class='del'>-</div><div class='add'>+		ret = try_or_set_cluster(NULL, master, true, 0);</div><div class='ctx'> 		v4l2_ctrl_unlock(master);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	media_request_object_put(obj);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(v4l2_ctrl_request_setup);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c<br/>index e0ddb9a52bd1..7cca0de1b730 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/v4l2-device.c</a></div><div class='hunk'>@@ -216,10 +216,18 @@ error_module:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);</div><div class='ctx'> </div><div class='add'>+static void v4l2_subdev_release(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct module *owner = !sd-&gt;owner_v4l2_dev ? sd-&gt;owner : NULL;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;internal_ops &amp;&amp; sd-&gt;internal_ops-&gt;release)</div><div class='add'>+		sd-&gt;internal_ops-&gt;release(sd);</div><div class='add'>+	module_put(owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void v4l2_device_release_subdev_node(struct video_device *vdev)</div><div class='ctx'> {</div><div class='del'>-	struct v4l2_subdev *sd = video_get_drvdata(vdev);</div><div class='del'>-	sd-&gt;devnode = NULL;</div><div class='add'>+	v4l2_subdev_release(video_get_drvdata(vdev));</div><div class='ctx'> 	kfree(vdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -318,8 +326,9 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)</div><div class='ctx'> 		media_device_unregister_entity(&amp;sd-&gt;entity);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	video_unregister_device(sd-&gt;devnode);</div><div class='del'>-	if (!sd-&gt;owner_v4l2_dev)</div><div class='del'>-		module_put(sd-&gt;owner);</div><div class='add'>+	if (sd-&gt;devnode)</div><div class='add'>+		video_unregister_device(sd-&gt;devnode);</div><div class='add'>+	else</div><div class='add'>+		v4l2_subdev_release(sd);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(v4l2_device_unregister_subdev);</div><div class='head'>diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c<br/>index 20571846e636..ea1ed88f9dc8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-fwnode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-fwnode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-fwnode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/v4l2-fwnode.c</a></div><div class='hunk'>@@ -163,7 +163,7 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (use_default_lane_mapping)</div><div class='del'>-			pr_debug("using default lane mapping\n");</div><div class='add'>+			pr_debug("no lane mapping given, using defaults\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rval = fwnode_property_read_u32_array(fwnode, "data-lanes", NULL, 0);</div><div class='hunk'>@@ -175,6 +175,10 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,</div><div class='ctx'> 					       num_data_lanes);</div><div class='ctx'> </div><div class='ctx'> 		have_data_lanes = true;</div><div class='add'>+		if (use_default_lane_mapping) {</div><div class='add'>+			pr_debug("data-lanes property exists; disabling default mapping\n");</div><div class='add'>+			use_default_lane_mapping = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_data_lanes; i++) {</div><div class='hunk'>@@ -225,6 +229,10 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,</div><div class='ctx'> 	if (bus_type == V4L2_MBUS_CSI2_DPHY ||</div><div class='ctx'> 	    bus_type == V4L2_MBUS_CSI2_CPHY || lanes_used ||</div><div class='ctx'> 	    have_clk_lane || (flags &amp; ~V4L2_MBUS_CSI2_CONTINUOUS_CLOCK)) {</div><div class='add'>+		/* Only D-PHY has a clock lane. */</div><div class='add'>+		unsigned int dfl_data_lane_index =</div><div class='add'>+			bus_type == V4L2_MBUS_CSI2_DPHY;</div><div class='add'>+</div><div class='ctx'> 		bus-&gt;flags = flags;</div><div class='ctx'> 		if (bus_type == V4L2_MBUS_UNKNOWN)</div><div class='ctx'> 			vep-&gt;bus_type = V4L2_MBUS_CSI2_DPHY;</div><div class='hunk'>@@ -233,7 +241,7 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,</div><div class='ctx'> 		if (use_default_lane_mapping) {</div><div class='ctx'> 			bus-&gt;clock_lane = 0;</div><div class='ctx'> 			for (i = 0; i &lt; num_data_lanes; i++)</div><div class='del'>-				bus-&gt;data_lanes[i] = 1 + i;</div><div class='add'>+				bus-&gt;data_lanes[i] = dfl_data_lane_index + i;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			bus-&gt;clock_lane = clock_lane;</div><div class='ctx'> 			for (i = 0; i &lt; num_data_lanes; i++)</div><div class='hunk'>@@ -820,7 +828,10 @@ error:</div><div class='ctx'>  * underneath the fwnode identified by the previous tuple, etc. until you</div><div class='ctx'>  * reached the fwnode you need.</div><div class='ctx'>  *</div><div class='del'>- * An example with a graph, as defined in Documentation/acpi/dsd/graph.txt:</div><div class='add'>+ * THIS EXAMPLE EXISTS MERELY TO DOCUMENT THIS FUNCTION. DO NOT USE IT AS A</div><div class='add'>+ * REFERENCE IN HOW ACPI TABLES SHOULD BE WRITTEN!! See documentation under</div><div class='add'>+ * Documentation/acpi/dsd instead and especially graph.txt,</div><div class='add'>+ * data-node-references.txt and leds.txt .</div><div class='ctx'>  *</div><div class='ctx'>  *	Scope (\_SB.PCI0.I2C2)</div><div class='ctx'>  *	{</div><div class='head'>diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c<br/>index f6d663934648..ac87c3e37280 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-ioctl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-ioctl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/v4l2-ioctl.c</a></div><div class='hunk'>@@ -1337,6 +1337,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)</div><div class='ctx'> 		case V4L2_PIX_FMT_VP9:		descr = "VP9"; break;</div><div class='ctx'> 		case V4L2_PIX_FMT_HEVC:		descr = "HEVC"; break; /* aka H.265 */</div><div class='ctx'> 		case V4L2_PIX_FMT_FWHT:		descr = "FWHT"; break; /* used in vicodec */</div><div class='add'>+		case V4L2_PIX_FMT_FWHT_STATELESS:	descr = "FWHT Stateless"; break; /* used in vicodec */</div><div class='ctx'> 		case V4L2_PIX_FMT_CPIA1:	descr = "GSPCA CPiA YUV"; break;</div><div class='ctx'> 		case V4L2_PIX_FMT_WNVA:		descr = "WNVA"; break;</div><div class='ctx'> 		case V4L2_PIX_FMT_SN9C10X:	descr = "GSPCA SN9C10X"; break;</div><div class='hunk'>@@ -1373,7 +1374,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (descr)</div><div class='del'>-		WARN_ON(strscpy(fmt-&gt;description, descr, sz) &gt;= sz);</div><div class='add'>+		WARN_ON(strscpy(fmt-&gt;description, descr, sz) &lt; 0);</div><div class='ctx'> 	fmt-&gt;flags = flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c<br/>index f5f0d71ec745..d75815ab0d7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-subdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/media/v4l2-core/v4l2-subdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/media/v4l2-core/v4l2-subdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/media/v4l2-core/v4l2-subdev.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='hunk'>@@ -54,9 +55,6 @@ static int subdev_open(struct file *file)</div><div class='ctx'> 	struct video_device *vdev = video_devdata(file);</div><div class='ctx'> 	struct v4l2_subdev *sd = vdev_to_v4l2_subdev(vdev);</div><div class='ctx'> 	struct v4l2_subdev_fh *subdev_fh;</div><div class='del'>-#if defined(CONFIG_MEDIA_CONTROLLER)</div><div class='del'>-	struct media_entity *entity = NULL;</div><div class='del'>-#endif</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	subdev_fh = kzalloc(sizeof(*subdev_fh), GFP_KERNEL);</div><div class='hunk'>@@ -73,12 +71,15 @@ static int subdev_open(struct file *file)</div><div class='ctx'> 	v4l2_fh_add(&amp;subdev_fh-&gt;vfh);</div><div class='ctx'> 	file-&gt;private_data = &amp;subdev_fh-&gt;vfh;</div><div class='ctx'> #if defined(CONFIG_MEDIA_CONTROLLER)</div><div class='del'>-	if (sd-&gt;v4l2_dev-&gt;mdev) {</div><div class='del'>-		entity = media_entity_get(&amp;sd-&gt;entity);</div><div class='del'>-		if (!entity) {</div><div class='add'>+	if (sd-&gt;v4l2_dev-&gt;mdev &amp;&amp; sd-&gt;entity.graph_obj.mdev-&gt;dev) {</div><div class='add'>+		struct module *owner;</div><div class='add'>+</div><div class='add'>+		owner = sd-&gt;entity.graph_obj.mdev-&gt;dev-&gt;driver-&gt;owner;</div><div class='add'>+		if (!try_module_get(owner)) {</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='add'>+		subdev_fh-&gt;owner = owner;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -91,9 +92,7 @@ static int subdev_open(struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-#if defined(CONFIG_MEDIA_CONTROLLER)</div><div class='del'>-	media_entity_put(entity);</div><div class='del'>-#endif</div><div class='add'>+	module_put(subdev_fh-&gt;owner);</div><div class='ctx'> 	v4l2_fh_del(&amp;subdev_fh-&gt;vfh);</div><div class='ctx'> 	v4l2_fh_exit(&amp;subdev_fh-&gt;vfh);</div><div class='ctx'> 	subdev_fh_free(subdev_fh);</div><div class='hunk'>@@ -111,10 +110,7 @@ static int subdev_close(struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	if (sd-&gt;internal_ops &amp;&amp; sd-&gt;internal_ops-&gt;close)</div><div class='ctx'> 		sd-&gt;internal_ops-&gt;close(sd, subdev_fh);</div><div class='del'>-#if defined(CONFIG_MEDIA_CONTROLLER)</div><div class='del'>-	if (sd-&gt;v4l2_dev-&gt;mdev)</div><div class='del'>-		media_entity_put(&amp;sd-&gt;entity);</div><div class='del'>-#endif</div><div class='add'>+	module_put(subdev_fh-&gt;owner);</div><div class='ctx'> 	v4l2_fh_del(vfh);</div><div class='ctx'> 	v4l2_fh_exit(vfh);</div><div class='ctx'> 	subdev_fh_free(subdev_fh);</div><div class='head'>diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile<br/>index 90161dec6fa5..91ae4eb0e913 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memory/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memory/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memory/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/memory/Makefile</a></div><div class='hunk'>@@ -28,6 +28,9 @@ ti-emif-sram-objs		:= ti-emif-pm.o ti-emif-sram-pm.o</div><div class='ctx'> </div><div class='ctx'> AFLAGS_ti-emif-sram-pm.o	:=-Wa,-march=armv7-a</div><div class='ctx'> </div><div class='del'>-include drivers/memory/Makefile.asm-offsets</div><div class='del'>-</div><div class='ctx'> drivers/memory/ti-emif-sram-pm.o: include/generated/ti-emif-asm-offsets.h</div><div class='add'>+</div><div class='add'>+include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE</div><div class='add'>+	$(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__)</div><div class='add'>+</div><div class='add'>+targets += emif-asm-offsets.s</div><div class='head'>diff --git a/drivers/memory/Makefile.asm-offsets b/drivers/memory/Makefile.asm-offsets<br/>deleted file mode 100644<br/>index 0447e174c752..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memory/Makefile.asm-offsets?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memory/Makefile.asm-offsets</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE</div><div class='del'>-	$(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__)</div><div class='del'>-</div><div class='del'>-targets += emif-asm-offsets.s</div><div class='head'>diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c<br/>index bcdca9fbef51..5733e8fe1aef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memstick/host/jmb38x_ms.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memstick/host/jmb38x_ms.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memstick/host/jmb38x_ms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/memstick/host/jmb38x_ms.c</a></div><div class='hunk'>@@ -259,9 +259,11 @@ static unsigned int jmb38x_ms_write_data(struct jmb38x_ms_host *host,</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		host-&gt;io_word[0] |= buf[off + 2] &lt;&lt; 16;</div><div class='ctx'> 		host-&gt;io_pos++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		host-&gt;io_word[0] |= buf[off + 1] &lt;&lt; 8;</div><div class='ctx'> 		host-&gt;io_pos++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		host-&gt;io_word[0] |= buf[off];</div><div class='ctx'> 		host-&gt;io_pos++;</div><div class='hunk'>@@ -368,7 +370,6 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)</div><div class='ctx'> static int jmb38x_ms_issue_cmd(struct memstick_host *msh)</div><div class='ctx'> {</div><div class='ctx'> 	struct jmb38x_ms_host *host = memstick_priv(msh);</div><div class='del'>-	unsigned char *data;</div><div class='ctx'> 	unsigned int data_len, cmd, t_val;</div><div class='ctx'> </div><div class='ctx'> 	if (!(STATUS_HAS_MEDIA &amp; readl(host-&gt;addr + STATUS))) {</div><div class='hunk'>@@ -400,8 +401,6 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)</div><div class='ctx'> 			cmd |= TPC_WAIT_INT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	data = host-&gt;req-&gt;data;</div><div class='del'>-</div><div class='ctx'> 	if (!no_dma)</div><div class='ctx'> 		host-&gt;cmd_flags |= DMA_DATA;</div><div class='ctx'> </div><div class='hunk'>@@ -644,7 +643,6 @@ static int jmb38x_ms_reset(struct jmb38x_ms_host *host)</div><div class='ctx'> 	writel(HOST_CONTROL_RESET_REQ | HOST_CONTROL_CLOCK_EN</div><div class='ctx'> 	       | readl(host-&gt;addr + HOST_CONTROL),</div><div class='ctx'> 	       host-&gt;addr + HOST_CONTROL);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 0; cnt &lt; 20; ++cnt) {</div><div class='ctx'> 		if (!(HOST_CONTROL_RESET_REQ</div><div class='hunk'>@@ -659,7 +657,6 @@ reset_next:</div><div class='ctx'> 	writel(HOST_CONTROL_RESET | HOST_CONTROL_CLOCK_EN</div><div class='ctx'> 	       | readl(host-&gt;addr + HOST_CONTROL),</div><div class='ctx'> 	       host-&gt;addr + HOST_CONTROL);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 0; cnt &lt; 20; ++cnt) {</div><div class='ctx'> 		if (!(HOST_CONTROL_RESET</div><div class='hunk'>@@ -672,7 +669,6 @@ reset_next:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'> reset_ok:</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	writel(INT_STATUS_ALL, host-&gt;addr + INT_SIGNAL_ENABLE);</div><div class='ctx'> 	writel(INT_STATUS_ALL, host-&gt;addr + INT_STATUS_ENABLE);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1009,7 +1005,6 @@ static void jmb38x_ms_remove(struct pci_dev *dev)</div><div class='ctx'> 		tasklet_kill(&amp;host-&gt;notify);</div><div class='ctx'> 		writel(0, host-&gt;addr + INT_SIGNAL_ENABLE);</div><div class='ctx'> 		writel(0, host-&gt;addr + INT_STATUS_ENABLE);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		dev_dbg(&amp;jm-&gt;pdev-&gt;dev, "interrupts off\n");</div><div class='ctx'> 		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> 		if (host-&gt;req) {</div><div class='head'>diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c<br/>index bed205849d02..6b13ac56eb27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memstick/host/tifm_ms.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/memstick/host/tifm_ms.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/memstick/host/tifm_ms.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/memstick/host/tifm_ms.c</a></div><div class='hunk'>@@ -166,9 +166,11 @@ static unsigned int tifm_ms_write_data(struct tifm_ms *host,</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		host-&gt;io_word |= buf[off + 2] &lt;&lt; 16;</div><div class='ctx'> 		host-&gt;io_pos++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		host-&gt;io_word |= buf[off + 1] &lt;&lt; 8;</div><div class='ctx'> 		host-&gt;io_pos++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		host-&gt;io_word |= buf[off];</div><div class='ctx'> 		host-&gt;io_pos++;</div><div class='hunk'>@@ -254,7 +256,6 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)</div><div class='ctx'> static int tifm_ms_issue_cmd(struct tifm_ms *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct tifm_dev *sock = host-&gt;dev;</div><div class='del'>-	unsigned char *data;</div><div class='ctx'> 	unsigned int data_len, cmd, sys_param;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;cmd_flags = 0;</div><div class='hunk'>@@ -263,8 +264,6 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)</div><div class='ctx'> 	host-&gt;io_word = 0;</div><div class='ctx'> 	host-&gt;cmd_flags = 0;</div><div class='ctx'> </div><div class='del'>-	data = host-&gt;req-&gt;data;</div><div class='del'>-</div><div class='ctx'> 	host-&gt;use_dma = !no_dma;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;req-&gt;long_data) {</div><div class='head'>diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c<br/>index ba551d8dfba4..d8882b0a1338 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptbase.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptbase.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptbase.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/message/fusion/mptbase.c</a></div><div class='hunk'>@@ -642,7 +642,7 @@ mptbase_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)</div><div class='ctx'> 			freereq = 0;</div><div class='ctx'> 		if (event != MPI_EVENT_EVENT_CHANGE)</div><div class='ctx'> 			break;</div><div class='del'>-		/* else: fall through */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case MPI_FUNCTION_CONFIG:</div><div class='ctx'> 	case MPI_FUNCTION_SAS_IO_UNIT_CONTROL:</div><div class='ctx'> 		ioc-&gt;mptbase_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD;</div><div class='head'>diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c<br/>index 8d22d6134a89..f9ac22413000 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptctl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptctl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/message/fusion/mptctl.c</a></div><div class='hunk'>@@ -565,7 +565,7 @@ mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)</div><div class='ctx'> 	 * TODO - this define is not in MPI spec yet,</div><div class='ctx'> 	 * but they plan to set it to 0x21</div><div class='ctx'> 	 */</div><div class='del'>-	 if (event == 0x21 ) {</div><div class='add'>+	if (event == 0x21) {</div><div class='ctx'> 		ioc-&gt;aen_event_read_flag=1;</div><div class='ctx'> 		dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "Raised SIGIO to application\n",</div><div class='ctx'> 		    ioc-&gt;name));</div><div class='head'>diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c<br/>index 612cb5bc1333..6a79cd0ebe2b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptsas.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptsas.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptsas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/message/fusion/mptsas.c</a></div><div class='hunk'>@@ -2928,27 +2928,27 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc,</div><div class='ctx'> 	if (ioc-&gt;sas_mgmt.status &amp; MPT_MGMT_STATUS_RF_VALID) {</div><div class='ctx'> 		u8 *tmp;</div><div class='ctx'> </div><div class='del'>-	smprep = (SmpPassthroughReply_t *)ioc-&gt;sas_mgmt.reply;</div><div class='del'>-	if (le16_to_cpu(smprep-&gt;ResponseDataLength) !=</div><div class='del'>-		sizeof(struct rep_manu_reply))</div><div class='add'>+		smprep = (SmpPassthroughReply_t *)ioc-&gt;sas_mgmt.reply;</div><div class='add'>+		if (le16_to_cpu(smprep-&gt;ResponseDataLength) !=</div><div class='add'>+		    sizeof(struct rep_manu_reply))</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> </div><div class='del'>-	manufacture_reply = data_out + sizeof(struct rep_manu_request);</div><div class='del'>-	strncpy(edev-&gt;vendor_id, manufacture_reply-&gt;vendor_id,</div><div class='del'>-		SAS_EXPANDER_VENDOR_ID_LEN);</div><div class='del'>-	strncpy(edev-&gt;product_id, manufacture_reply-&gt;product_id,</div><div class='del'>-		SAS_EXPANDER_PRODUCT_ID_LEN);</div><div class='del'>-	strncpy(edev-&gt;product_rev, manufacture_reply-&gt;product_rev,</div><div class='del'>-		SAS_EXPANDER_PRODUCT_REV_LEN);</div><div class='del'>-	edev-&gt;level = manufacture_reply-&gt;sas_format;</div><div class='del'>-	if (manufacture_reply-&gt;sas_format) {</div><div class='del'>-		strncpy(edev-&gt;component_vendor_id,</div><div class='del'>-			manufacture_reply-&gt;component_vendor_id,</div><div class='add'>+		manufacture_reply = data_out + sizeof(struct rep_manu_request);</div><div class='add'>+		strncpy(edev-&gt;vendor_id, manufacture_reply-&gt;vendor_id,</div><div class='add'>+			SAS_EXPANDER_VENDOR_ID_LEN);</div><div class='add'>+		strncpy(edev-&gt;product_id, manufacture_reply-&gt;product_id,</div><div class='add'>+			SAS_EXPANDER_PRODUCT_ID_LEN);</div><div class='add'>+		strncpy(edev-&gt;product_rev, manufacture_reply-&gt;product_rev,</div><div class='add'>+			SAS_EXPANDER_PRODUCT_REV_LEN);</div><div class='add'>+		edev-&gt;level = manufacture_reply-&gt;sas_format;</div><div class='add'>+		if (manufacture_reply-&gt;sas_format) {</div><div class='add'>+			strncpy(edev-&gt;component_vendor_id,</div><div class='add'>+				manufacture_reply-&gt;component_vendor_id,</div><div class='ctx'> 				SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN);</div><div class='del'>-		tmp = (u8 *)&amp;manufacture_reply-&gt;component_id;</div><div class='del'>-		edev-&gt;component_id = tmp[0] &lt;&lt; 8 | tmp[1];</div><div class='del'>-		edev-&gt;component_revision_id =</div><div class='del'>-			manufacture_reply-&gt;component_revision_id;</div><div class='add'>+			tmp = (u8 *)&amp;manufacture_reply-&gt;component_id;</div><div class='add'>+			edev-&gt;component_id = tmp[0] &lt;&lt; 8 | tmp[1];</div><div class='add'>+			edev-&gt;component_revision_id =</div><div class='add'>+				manufacture_reply-&gt;component_revision_id;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(MYIOC_s_ERR_FMT</div><div class='head'>diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c<br/>index 6ba07c7feb92..f0737c57ed5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptscsih.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptscsih.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptscsih.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/message/fusion/mptscsih.c</a></div><div class='hunk'>@@ -786,6 +786,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Allow non-SAS &amp; non-NEXUS_LOSS to drop into below code</div><div class='ctx'> 			 */</div><div class='add'>+			/* Fall through */</div><div class='ctx'> </div><div class='ctx'> 		case MPI_IOCSTATUS_SCSI_TASK_TERMINATED:	/* 0x0048 */</div><div class='ctx'> 			/* Linux handles an unsolicited DID_RESET better</div><div class='hunk'>@@ -882,6 +883,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)</div><div class='ctx'> </div><div class='ctx'> 		case MPI_IOCSTATUS_SCSI_DATA_OVERRUN:		/* 0x0044 */</div><div class='ctx'> 			scsi_set_resid(sc, 0);</div><div class='add'>+			/* Fall through */</div><div class='ctx'> 		case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR:	/* 0x0040 */</div><div class='ctx'> 		case MPI_IOCSTATUS_SUCCESS:			/* 0x0000 */</div><div class='ctx'> 			sc-&gt;result = (DID_OK &lt;&lt; 16) | scsi_status;</div><div class='hunk'>@@ -1934,7 +1936,7 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)</div><div class='ctx'> 	/*  If our attempts to reset the host failed, then return a failed</div><div class='ctx'> 	 *  status.  The host will be taken off line by the SCSI mid-layer.</div><div class='ctx'> 	 */</div><div class='del'>-    retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);</div><div class='add'>+	retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		status = FAILED;</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c<br/>index 7172b0b16bdd..eabc4de5816c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptspi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/message/fusion/mptspi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/message/fusion/mptspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/message/fusion/mptspi.c</a></div><div class='hunk'>@@ -258,8 +258,6 @@ mptspi_writeIOCPage4(MPT_SCSI_HOST *hd, u8 channel , u8 id)</div><div class='ctx'> 	IOCPage4_t		*IOCPage4Ptr;</div><div class='ctx'> 	MPT_FRAME_HDR		*mf;</div><div class='ctx'> 	dma_addr_t		 dataDma;</div><div class='del'>-	u16			 req_idx;</div><div class='del'>-	u32			 frameOffset;</div><div class='ctx'> 	u32			 flagsLength;</div><div class='ctx'> 	int			 ii;</div><div class='ctx'> </div><div class='hunk'>@@ -276,9 +274,6 @@ mptspi_writeIOCPage4(MPT_SCSI_HOST *hd, u8 channel , u8 id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pReq = (Config_t *)mf;</div><div class='ctx'> </div><div class='del'>-	req_idx = le16_to_cpu(mf-&gt;u.frame.hwhdr.msgctxu.fld.req_idx);</div><div class='del'>-	frameOffset = ioc-&gt;req_sz - sizeof(IOCPage4_t);</div><div class='del'>-</div><div class='ctx'> 	/* Complete the request frame (same for all requests).</div><div class='ctx'> 	 */</div><div class='ctx'> 	pReq-&gt;Action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;</div><div class='head'>diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig<br/>index 0ce2d8dfc5f1..26ad6468d13a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/Kconfig</a></div><div class='hunk'>@@ -1246,7 +1246,7 @@ config MFD_STA2X11</div><div class='ctx'> </div><div class='ctx'> config MFD_SUN6I_PRCM</div><div class='ctx'> 	bool "Allwinner A31 PRCM controller"</div><div class='del'>-	depends on ARCH_SUNXI</div><div class='add'>+	depends on ARCH_SUNXI || COMPILE_TEST</div><div class='ctx'> 	select MFD_CORE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the PRCM (Power/Reset/Clock Management) unit available</div><div class='head'>diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c<br/>index 446713dbee27..93177d85e7a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/omap-usb-tll.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/omap-usb-tll.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/omap-usb-tll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/omap-usb-tll.c</a></div><div class='hunk'>@@ -459,7 +459,6 @@ EXPORT_SYMBOL_GPL(omap_tll_disable);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Keshava Munegowda &lt;keshava_mgowda@ti.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Roger Quadros &lt;rogerq@ti.com&gt;");</div><div class='del'>-MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/sprd-sc27xx-spi.c b/drivers/mfd/sprd-sc27xx-spi.c<br/>index 69df27769c21..43ac71691fe4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/sprd-sc27xx-spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/sprd-sc27xx-spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/sprd-sc27xx-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/sprd-sc27xx-spi.c</a></div><div class='hunk'>@@ -53,67 +53,67 @@ static const struct sprd_pmic_data sc2731_data = {</div><div class='ctx'> static const struct mfd_cell sprd_pmic_devs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "sc27xx-wdt",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-wdt",</div><div class='add'>+		.of_compatible = "sprd,sc2731-wdt",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-rtc",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-rtc",</div><div class='add'>+		.of_compatible = "sprd,sc2731-rtc",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-charger",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-charger",</div><div class='add'>+		.of_compatible = "sprd,sc2731-charger",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-chg-timer",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-chg-timer",</div><div class='add'>+		.of_compatible = "sprd,sc2731-chg-timer",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-fast-chg",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-fast-chg",</div><div class='add'>+		.of_compatible = "sprd,sc2731-fast-chg",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-chg-wdt",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-chg-wdt",</div><div class='add'>+		.of_compatible = "sprd,sc2731-chg-wdt",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-typec",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-typec",</div><div class='add'>+		.of_compatible = "sprd,sc2731-typec",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-flash",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-flash",</div><div class='add'>+		.of_compatible = "sprd,sc2731-flash",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-eic",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-eic",</div><div class='add'>+		.of_compatible = "sprd,sc2731-eic",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-efuse",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-efuse",</div><div class='add'>+		.of_compatible = "sprd,sc2731-efuse",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-thermal",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-thermal",</div><div class='add'>+		.of_compatible = "sprd,sc2731-thermal",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-adc",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-adc",</div><div class='add'>+		.of_compatible = "sprd,sc2731-adc",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-audio-codec",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-audio-codec",</div><div class='add'>+		.of_compatible = "sprd,sc2731-audio-codec",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-regulator",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-regulator",</div><div class='add'>+		.of_compatible = "sprd,sc2731-regulator",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-vibrator",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-vibrator",</div><div class='add'>+		.of_compatible = "sprd,sc2731-vibrator",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-keypad-led",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-keypad-led",</div><div class='add'>+		.of_compatible = "sprd,sc2731-keypad-led",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-bltc",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-bltc",</div><div class='add'>+		.of_compatible = "sprd,sc2731-bltc",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-fgu",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-fgu",</div><div class='add'>+		.of_compatible = "sprd,sc2731-fgu",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-7sreset",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-7sreset",</div><div class='add'>+		.of_compatible = "sprd,sc2731-7sreset",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-poweroff",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-poweroff",</div><div class='add'>+		.of_compatible = "sprd,sc2731-poweroff",</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sc27xx-syscon",</div><div class='del'>-		.of_compatible = "sprd,sc27xx-syscon",</div><div class='add'>+		.of_compatible = "sprd,sc2731-syscon",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/ti-lmu.c b/drivers/mfd/ti-lmu.c<br/>index 37d0bdb291c3..b06cb908d1aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/ti-lmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/ti-lmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/ti-lmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/ti-lmu.c</a></div><div class='hunk'>@@ -54,14 +54,6 @@ static void ti_lmu_disable_hw(void *data)</div><div class='ctx'> 		gpiod_set_value(lmu-&gt;en_gpio, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct mfd_cell lm3532_devices[] = {</div><div class='del'>-	{</div><div class='del'>-		.name          = "ti-lmu-backlight",</div><div class='del'>-		.id            = LM3532,</div><div class='del'>-		.of_compatible = "ti,lm3532-backlight",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define LM363X_REGULATOR(_id)			\</div><div class='ctx'> {						\</div><div class='ctx'> 	.name          = "lm363x-regulator",	\</div><div class='hunk'>@@ -141,7 +133,6 @@ static const struct ti_lmu_data chip##_data =	\</div><div class='ctx'> 	.max_register = max_reg,		\</div><div class='ctx'> }						\</div><div class='ctx'> </div><div class='del'>-TI_LMU_DATA(lm3532, LM3532_MAX_REG);</div><div class='ctx'> TI_LMU_DATA(lm3631, LM3631_MAX_REG);</div><div class='ctx'> TI_LMU_DATA(lm3632, LM3632_MAX_REG);</div><div class='ctx'> TI_LMU_DATA(lm3633, LM3633_MAX_REG);</div><div class='hunk'>@@ -211,7 +202,6 @@ static int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ti_lmu_of_match[] = {</div><div class='del'>-	{ .compatible = "ti,lm3532", .data = &amp;lm3532_data },</div><div class='ctx'> 	{ .compatible = "ti,lm3631", .data = &amp;lm3631_data },</div><div class='ctx'> 	{ .compatible = "ti,lm3632", .data = &amp;lm3632_data },</div><div class='ctx'> 	{ .compatible = "ti,lm3633", .data = &amp;lm3633_data },</div><div class='hunk'>@@ -222,7 +212,6 @@ static const struct of_device_id ti_lmu_of_match[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(of, ti_lmu_of_match);</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id ti_lmu_ids[] = {</div><div class='del'>-	{ "lm3532", LM3532 },</div><div class='ctx'> 	{ "lm3631", LM3631 },</div><div class='ctx'> 	{ "lm3632", LM3632 },</div><div class='ctx'> 	{ "lm3633", LM3633 },</div><div class='head'>diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c<br/>index 299016bc46d9..104477b512a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/twl-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/twl-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/twl-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/twl-core.c</a></div><div class='hunk'>@@ -1245,6 +1245,28 @@ free:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __maybe_unused twl_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+</div><div class='add'>+	if (client-&gt;irq)</div><div class='add'>+		disable_irq(client-&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 int __maybe_unused twl_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+</div><div class='add'>+	if (client-&gt;irq)</div><div class='add'>+		enable_irq(client-&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 SIMPLE_DEV_PM_OPS(twl_dev_pm_ops, twl_suspend, twl_resume);</div><div class='add'>+</div><div class='ctx'> static const struct i2c_device_id twl_ids[] = {</div><div class='ctx'> 	{ "twl4030", TWL4030_VAUX2 },	/* "Triton 2" */</div><div class='ctx'> 	{ "twl5030", 0 },		/* T2 updated */</div><div class='hunk'>@@ -1262,6 +1284,7 @@ static const struct i2c_device_id twl_ids[] = {</div><div class='ctx'> /* One Client Driver , 4 Clients */</div><div class='ctx'> static struct i2c_driver twl_driver = {</div><div class='ctx'> 	.driver.name	= DRIVER_NAME,</div><div class='add'>+	.driver.pm	= &amp;twl_dev_pm_ops,</div><div class='ctx'> 	.id_table	= twl_ids,</div><div class='ctx'> 	.probe		= twl_probe,</div><div class='ctx'> 	.remove		= twl_remove,</div><div class='head'>diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c<br/>index 25fbbaf39cb9..21bae64e0451 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/wm831x-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/wm831x-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/wm831x-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/wm831x-core.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> /* Current settings - values are 2*2^(reg_val/4) microamps.  These are</div><div class='ctx'>  * exported since they are used by multiple drivers.</div><div class='ctx'>  */</div><div class='del'>-int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = {</div><div class='add'>+const unsigned int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = {</div><div class='ctx'> 	2,</div><div class='ctx'> 	2,</div><div class='ctx'> 	3,</div><div class='head'>diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c<br/>index 79756c83f5f0..cf067424a156 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/wm8400-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mfd/wm8400-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mfd/wm8400-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mfd/wm8400-core.c</a></div><div class='hunk'>@@ -35,12 +35,6 @@ static bool wm8400_volatile(struct device *dev, unsigned int reg)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data)</div><div class='del'>-{</div><div class='del'>-	return regmap_bulk_read(wm8400-&gt;regmap, reg, data, count);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(wm8400_block_read);</div><div class='del'>-</div><div class='ctx'> static int wm8400_register_codec(struct wm8400 *wm8400)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mfd_cell cell = {</div><div class='head'>diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig<br/>index 42ab8ec92a04..3209ee020b15 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/Kconfig</a></div><div class='hunk'>@@ -496,6 +496,14 @@ config VEXPRESS_SYSCFG</div><div class='ctx'> 	  bus. System Configuration interface is one of the possible means</div><div class='ctx'> 	  of generating transactions on this bus.</div><div class='ctx'> </div><div class='add'>+config ASPEED_P2A_CTRL</div><div class='add'>+	depends on (ARCH_ASPEED || COMPILE_TEST) &amp;&amp; REGMAP &amp;&amp; MFD_SYSCON</div><div class='add'>+	tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control"</div><div class='add'>+	help</div><div class='add'>+	  Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through</div><div class='add'>+	  ioctl()s, the driver also provides an interface for userspace mappings to</div><div class='add'>+	  a pre-defined region.</div><div class='add'>+</div><div class='ctx'> config ASPEED_LPC_CTRL</div><div class='ctx'> 	depends on (ARCH_ASPEED || COMPILE_TEST) &amp;&amp; REGMAP &amp;&amp; MFD_SYSCON</div><div class='ctx'> 	tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"</div><div class='head'>diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile<br/>index d5b7d3404dc7..c36239573a5c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/Makefile</a></div><div class='hunk'>@@ -56,6 +56,7 @@ obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o</div><div class='ctx'> obj-$(CONFIG_CXL_BASE)		+= cxl/</div><div class='ctx'> obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o</div><div class='ctx'> obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o</div><div class='add'>+obj-$(CONFIG_ASPEED_P2A_CTRL)	+= aspeed-p2a-ctrl.o</div><div class='ctx'> obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o</div><div class='ctx'> obj-$(CONFIG_OCXL)		+= ocxl/</div><div class='ctx'> obj-y				+= cardreader/</div><div class='head'>diff --git a/drivers/misc/aspeed-p2a-ctrl.c b/drivers/misc/aspeed-p2a-ctrl.c<br/>new file mode 100644<br/>index 000000000000..b60fbeaffcbd<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/aspeed-p2a-ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/aspeed-p2a-ctrl.c</a></div><div class='hunk'>@@ -0,0 +1,444 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2019 Google Inc</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * Provides a simple driver to control the ASPEED P2A interface which allows</div><div class='add'>+ * the host to read and write to various regions of the BMC's memory.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/of_address.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/regmap.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'>+#include &lt;linux/aspeed-p2a-ctrl.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEVICE_NAME	"aspeed-p2a-ctrl"</div><div class='add'>+</div><div class='add'>+/* SCU2C is a Misc. Control Register. */</div><div class='add'>+#define SCU2C 0x2c</div><div class='add'>+/* SCU180 is the PCIe Configuration Setting Control Register. */</div><div class='add'>+#define SCU180 0x180</div><div class='add'>+/* Bit 1 controls the P2A bridge, while bit 0 controls the entire VGA device</div><div class='add'>+ * on the PCI bus.</div><div class='add'>+ */</div><div class='add'>+#define SCU180_ENP2A BIT(1)</div><div class='add'>+</div><div class='add'>+/* The ast2400/2500 both have six ranges. */</div><div class='add'>+#define P2A_REGION_COUNT 6</div><div class='add'>+</div><div class='add'>+struct region {</div><div class='add'>+	u64 min;</div><div class='add'>+	u64 max;</div><div class='add'>+	u32 bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aspeed_p2a_model_data {</div><div class='add'>+	/* min, max, bit */</div><div class='add'>+	struct region regions[P2A_REGION_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aspeed_p2a_ctrl {</div><div class='add'>+	struct miscdevice miscdev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+</div><div class='add'>+	const struct aspeed_p2a_model_data *config;</div><div class='add'>+</div><div class='add'>+	/* Access to these needs to be locked, held via probe, mapping ioctl,</div><div class='add'>+	 * and release, remove.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex tracking;</div><div class='add'>+	u32 readers;</div><div class='add'>+	u32 readerwriters[P2A_REGION_COUNT];</div><div class='add'>+</div><div class='add'>+	phys_addr_t mem_base;</div><div class='add'>+	resource_size_t mem_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aspeed_p2a_user {</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct aspeed_p2a_ctrl *parent;</div><div class='add'>+</div><div class='add'>+	/* The entire memory space is opened for reading once the bridge is</div><div class='add'>+	 * enabled, therefore this needs only to be tracked once per user.</div><div class='add'>+	 * If any user has it open for read, the bridge must stay enabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 read;</div><div class='add'>+</div><div class='add'>+	/* Each entry of the array corresponds to a P2A Region.  If the user</div><div class='add'>+	 * opens for read or readwrite, the reference goes up here.  On</div><div class='add'>+	 * release, this array is walked and references adjusted accordingly.</div><div class='add'>+	 */</div><div class='add'>+	u32 readwrite[P2A_REGION_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void aspeed_p2a_enable_bridge(struct aspeed_p2a_ctrl *p2a_ctrl)</div><div class='add'>+{</div><div class='add'>+	regmap_update_bits(p2a_ctrl-&gt;regmap,</div><div class='add'>+		SCU180, SCU180_ENP2A, SCU180_ENP2A);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aspeed_p2a_disable_bridge(struct aspeed_p2a_ctrl *p2a_ctrl)</div><div class='add'>+{</div><div class='add'>+	regmap_update_bits(p2a_ctrl-&gt;regmap, SCU180, SCU180_ENP2A, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	unsigned long vsize;</div><div class='add'>+	pgprot_t prot;</div><div class='add'>+	struct aspeed_p2a_user *priv = file-&gt;private_data;</div><div class='add'>+	struct aspeed_p2a_ctrl *ctrl = priv-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (ctrl-&gt;mem_base == 0 &amp;&amp; ctrl-&gt;mem_size == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vsize = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+	prot = vma-&gt;vm_page_prot;</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_pgoff + vsize &gt; ctrl-&gt;mem_base + ctrl-&gt;mem_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* ast2400/2500 AHB accesses are not cache coherent */</div><div class='add'>+	prot = pgprot_noncached(prot);</div><div class='add'>+</div><div class='add'>+	if (remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='add'>+		(ctrl-&gt;mem_base &gt;&gt; PAGE_SHIFT) + vma-&gt;vm_pgoff,</div><div class='add'>+		vsize, prot))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool aspeed_p2a_region_acquire(struct aspeed_p2a_user *priv,</div><div class='add'>+		struct aspeed_p2a_ctrl *ctrl,</div><div class='add'>+		struct aspeed_p2a_ctrl_mapping *map)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u64 base, end;</div><div class='add'>+	bool matched = false;</div><div class='add'>+</div><div class='add'>+	base = map-&gt;addr;</div><div class='add'>+	end = map-&gt;addr + (map-&gt;length - 1);</div><div class='add'>+</div><div class='add'>+	/* If the value is a legal u32, it will find a match. */</div><div class='add'>+	for (i = 0; i &lt; P2A_REGION_COUNT; i++) {</div><div class='add'>+		const struct region *curr = &amp;ctrl-&gt;config-&gt;regions[i];</div><div class='add'>+</div><div class='add'>+		/* If the top of this region is lower than your base, skip it.</div><div class='add'>+		 */</div><div class='add'>+		if (curr-&gt;max &lt; base)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* If the bottom of this region is higher than your end, bail.</div><div class='add'>+		 */</div><div class='add'>+		if (curr-&gt;min &gt; end)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Lock this and update it, therefore it someone else is</div><div class='add'>+		 * closing their file out, this'll preserve the increment.</div><div class='add'>+		 */</div><div class='add'>+		mutex_lock(&amp;ctrl-&gt;tracking);</div><div class='add'>+		ctrl-&gt;readerwriters[i] += 1;</div><div class='add'>+		mutex_unlock(&amp;ctrl-&gt;tracking);</div><div class='add'>+</div><div class='add'>+		/* Track with the user, so when they close their file, we can</div><div class='add'>+		 * decrement properly.</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;readwrite[i] += 1;</div><div class='add'>+</div><div class='add'>+		/* Enable the region as read-write. */</div><div class='add'>+		regmap_update_bits(ctrl-&gt;regmap, SCU2C, curr-&gt;bit, 0);</div><div class='add'>+		matched = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return matched;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long aspeed_p2a_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+		unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct aspeed_p2a_user *priv = file-&gt;private_data;</div><div class='add'>+	struct aspeed_p2a_ctrl *ctrl = priv-&gt;parent;</div><div class='add'>+	void __user *arg = (void __user *)data;</div><div class='add'>+	struct aspeed_p2a_ctrl_mapping map;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;map, arg, sizeof(map)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case ASPEED_P2A_CTRL_IOCTL_SET_WINDOW:</div><div class='add'>+		/* If they want a region to be read-only, since the entire</div><div class='add'>+		 * region is read-only once enabled, we just need to track this</div><div class='add'>+		 * user wants to read from the bridge, and if it's not enabled.</div><div class='add'>+		 * Enable it.</div><div class='add'>+		 */</div><div class='add'>+		if (map.flags == ASPEED_P2A_CTRL_READ_ONLY) {</div><div class='add'>+			mutex_lock(&amp;ctrl-&gt;tracking);</div><div class='add'>+			ctrl-&gt;readers += 1;</div><div class='add'>+			mutex_unlock(&amp;ctrl-&gt;tracking);</div><div class='add'>+</div><div class='add'>+			/* Track with the user, so when they close their file,</div><div class='add'>+			 * we can decrement properly.</div><div class='add'>+			 */</div><div class='add'>+			priv-&gt;read += 1;</div><div class='add'>+		} else if (map.flags == ASPEED_P2A_CTRL_READWRITE) {</div><div class='add'>+			/* If we don't acquire any region return error. */</div><div class='add'>+			if (!aspeed_p2a_region_acquire(priv, ctrl, &amp;map)) {</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* Invalid map flags. */</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		aspeed_p2a_enable_bridge(ctrl);</div><div class='add'>+		return 0;</div><div class='add'>+	case ASPEED_P2A_CTRL_IOCTL_GET_MEMORY_CONFIG:</div><div class='add'>+		/* This is a request for the memory-region and corresponding</div><div class='add'>+		 * length that is used by the driver for mmap.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		map.flags = 0;</div><div class='add'>+		map.addr = ctrl-&gt;mem_base;</div><div class='add'>+		map.length = ctrl-&gt;mem_size;</div><div class='add'>+</div><div class='add'>+		return copy_to_user(arg, &amp;map, sizeof(map)) ? -EFAULT : 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'>+</div><div class='add'>+/*</div><div class='add'>+ * When a user opens this file, we create a structure to track their mappings.</div><div class='add'>+ *</div><div class='add'>+ * A user can map a region as read-only (bridge enabled), or read-write (bit</div><div class='add'>+ * flipped, and bridge enabled).  Either way, this tracking is used, s.t. when</div><div class='add'>+ * they release the device references are handled.</div><div class='add'>+ *</div><div class='add'>+ * The bridge is not enabled until a user calls an ioctl to map a region,</div><div class='add'>+ * simply opening the device does not enable it.</div><div class='add'>+ */</div><div class='add'>+static int aspeed_p2a_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct aspeed_p2a_user *priv;</div><div class='add'>+</div><div class='add'>+	priv = kmalloc(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;file = file;</div><div class='add'>+	priv-&gt;read = 0;</div><div class='add'>+	memset(priv-&gt;readwrite, 0, sizeof(priv-&gt;readwrite));</div><div class='add'>+</div><div class='add'>+	/* The file's private_data is initialized to the p2a_ctrl. */</div><div class='add'>+	priv-&gt;parent = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* Set the file's private_data to the user's data. */</div><div class='add'>+	file-&gt;private_data = priv;</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'>+ * This will close the users mappings.  It will go through what they had opened</div><div class='add'>+ * for readwrite, and decrement those counts.  If at the end, this is the last</div><div class='add'>+ * user, it'll close the bridge.</div><div class='add'>+ */</div><div class='add'>+static int aspeed_p2a_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 bits = 0;</div><div class='add'>+	bool open_regions = false;</div><div class='add'>+	struct aspeed_p2a_user *priv = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* Lock others from changing these values until everything is updated</div><div class='add'>+	 * in one pass.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;parent-&gt;tracking);</div><div class='add'>+</div><div class='add'>+	priv-&gt;parent-&gt;readers -= priv-&gt;read;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; P2A_REGION_COUNT; i++) {</div><div class='add'>+		priv-&gt;parent-&gt;readerwriters[i] -= priv-&gt;readwrite[i];</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;parent-&gt;readerwriters[i] &gt; 0)</div><div class='add'>+			open_regions = true;</div><div class='add'>+		else</div><div class='add'>+			bits |= priv-&gt;parent-&gt;config-&gt;regions[i].bit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setting a bit to 1 disables the region, so let's just OR with the</div><div class='add'>+	 * above to disable any.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Note, if another user is trying to ioctl, they can't grab tracking,</div><div class='add'>+	 * and therefore can't grab either register mutex.</div><div class='add'>+	 * If another user is trying to close, they can't grab tracking either.</div><div class='add'>+	 */</div><div class='add'>+	regmap_update_bits(priv-&gt;parent-&gt;regmap, SCU2C, bits, bits);</div><div class='add'>+</div><div class='add'>+	/* If parent-&gt;readers is zero and open windows is 0, disable the</div><div class='add'>+	 * bridge.</div><div class='add'>+	 */</div><div class='add'>+	if (!open_regions &amp;&amp; priv-&gt;parent-&gt;readers == 0)</div><div class='add'>+		aspeed_p2a_disable_bridge(priv-&gt;parent);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;parent-&gt;tracking);</div><div class='add'>+</div><div class='add'>+	kfree(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 file_operations aspeed_p2a_ctrl_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.mmap = aspeed_p2a_mmap,</div><div class='add'>+	.unlocked_ioctl = aspeed_p2a_ioctl,</div><div class='add'>+	.open = aspeed_p2a_open,</div><div class='add'>+	.release = aspeed_p2a_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The regions are controlled by SCU2C */</div><div class='add'>+static void aspeed_p2a_disable_all(struct aspeed_p2a_ctrl *p2a_ctrl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; P2A_REGION_COUNT; i++)</div><div class='add'>+		value |= p2a_ctrl-&gt;config-&gt;regions[i].bit;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(p2a_ctrl-&gt;regmap, SCU2C, value, value);</div><div class='add'>+</div><div class='add'>+	/* Disable the bridge. */</div><div class='add'>+	aspeed_p2a_disable_bridge(p2a_ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aspeed_p2a_ctrl_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct aspeed_p2a_ctrl *misc_ctrl;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct resource resm;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	misc_ctrl = devm_kzalloc(dev, sizeof(*misc_ctrl), GFP_KERNEL);</div><div class='add'>+	if (!misc_ctrl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;misc_ctrl-&gt;tracking);</div><div class='add'>+</div><div class='add'>+	/* optional. */</div><div class='add'>+	node = of_parse_phandle(dev-&gt;of_node, "memory-region", 0);</div><div class='add'>+	if (node) {</div><div class='add'>+		rc = of_address_to_resource(node, 0, &amp;resm);</div><div class='add'>+		of_node_put(node);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(dev, "Couldn't address to resource for reserved memory\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		misc_ctrl-&gt;mem_size = resource_size(&amp;resm);</div><div class='add'>+		misc_ctrl-&gt;mem_base = resm.start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	misc_ctrl-&gt;regmap = syscon_node_to_regmap(pdev-&gt;dev.parent-&gt;of_node);</div><div class='add'>+	if (IS_ERR(misc_ctrl-&gt;regmap)) {</div><div class='add'>+		dev_err(dev, "Couldn't get regmap\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	misc_ctrl-&gt;config = of_device_get_match_data(dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, misc_ctrl);</div><div class='add'>+</div><div class='add'>+	aspeed_p2a_disable_all(misc_ctrl);</div><div class='add'>+</div><div class='add'>+	misc_ctrl-&gt;miscdev.minor = MISC_DYNAMIC_MINOR;</div><div class='add'>+	misc_ctrl-&gt;miscdev.name = DEVICE_NAME;</div><div class='add'>+	misc_ctrl-&gt;miscdev.fops = &amp;aspeed_p2a_ctrl_fops;</div><div class='add'>+	misc_ctrl-&gt;miscdev.parent = dev;</div><div class='add'>+</div><div class='add'>+	rc = misc_register(&amp;misc_ctrl-&gt;miscdev);</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(dev, "Unable to register device\n");</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aspeed_p2a_ctrl_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct aspeed_p2a_ctrl *p2a_ctrl = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	misc_deregister(&amp;p2a_ctrl-&gt;miscdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SCU2C_DRAM	BIT(25)</div><div class='add'>+#define SCU2C_SPI	BIT(24)</div><div class='add'>+#define SCU2C_SOC	BIT(23)</div><div class='add'>+#define SCU2C_FLASH	BIT(22)</div><div class='add'>+</div><div class='add'>+static const struct aspeed_p2a_model_data ast2400_model_data = {</div><div class='add'>+	.regions = {</div><div class='add'>+		{0x00000000, 0x17FFFFFF, SCU2C_FLASH},</div><div class='add'>+		{0x18000000, 0x1FFFFFFF, SCU2C_SOC},</div><div class='add'>+		{0x20000000, 0x2FFFFFFF, SCU2C_FLASH},</div><div class='add'>+		{0x30000000, 0x3FFFFFFF, SCU2C_SPI},</div><div class='add'>+		{0x40000000, 0x5FFFFFFF, SCU2C_DRAM},</div><div class='add'>+		{0x60000000, 0xFFFFFFFF, SCU2C_SOC},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct aspeed_p2a_model_data ast2500_model_data = {</div><div class='add'>+	.regions = {</div><div class='add'>+		{0x00000000, 0x0FFFFFFF, SCU2C_FLASH},</div><div class='add'>+		{0x10000000, 0x1FFFFFFF, SCU2C_SOC},</div><div class='add'>+		{0x20000000, 0x3FFFFFFF, SCU2C_FLASH},</div><div class='add'>+		{0x40000000, 0x5FFFFFFF, SCU2C_SOC},</div><div class='add'>+		{0x60000000, 0x7FFFFFFF, SCU2C_SPI},</div><div class='add'>+		{0x80000000, 0xFFFFFFFF, SCU2C_DRAM},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id aspeed_p2a_ctrl_match[] = {</div><div class='add'>+	{ .compatible = "aspeed,ast2400-p2a-ctrl",</div><div class='add'>+	  .data = &amp;ast2400_model_data },</div><div class='add'>+	{ .compatible = "aspeed,ast2500-p2a-ctrl",</div><div class='add'>+	  .data = &amp;ast2500_model_data },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver aspeed_p2a_ctrl_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= DEVICE_NAME,</div><div class='add'>+		.of_match_table = aspeed_p2a_ctrl_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = aspeed_p2a_ctrl_probe,</div><div class='add'>+	.remove = aspeed_p2a_ctrl_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(aspeed_p2a_ctrl_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, aspeed_p2a_ctrl_match);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Patrick Venture &lt;venture@google.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Control for aspeed 2400/2500 P2A VGA HOST to BMC mappings");</div><div class='head'>diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c<br/>index da22bcb62b04..4e285addbf2b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/cardreader/rts5260.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/cardreader/rts5260.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/cardreader/rts5260.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/cardreader/rts5260.c</a></div><div class='hunk'>@@ -451,17 +451,18 @@ static void rts5260_pwr_saving_setting(struct rtsx_pcr *pcr)</div><div class='ctx'> 	lss_l1_2 = rtsx_check_dev_flag(pcr, ASPM_L1_2_EN)</div><div class='ctx'> 			| rtsx_check_dev_flag(pcr, PM_L1_2_EN);</div><div class='ctx'> </div><div class='add'>+	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0xFF, 0);</div><div class='ctx'> 	if (lss_l1_2) {</div><div class='ctx'> 		pcr_dbg(pcr, "Set parameters for L1.2.");</div><div class='ctx'> 		rtsx_pci_write_register(pcr, PWR_GLOBAL_CTRL,</div><div class='ctx'> 					0xFF, PCIE_L1_2_EN);</div><div class='del'>-	rtsx_pci_write_register(pcr, RTS5260_DVCC_CTRL,</div><div class='add'>+		rtsx_pci_write_register(pcr, RTS5260_DVCC_CTRL,</div><div class='ctx'> 					RTS5260_DVCC_OCP_EN |</div><div class='ctx'> 					RTS5260_DVCC_OCP_CL_EN,</div><div class='ctx'> 					RTS5260_DVCC_OCP_EN |</div><div class='ctx'> 					RTS5260_DVCC_OCP_CL_EN);</div><div class='ctx'> </div><div class='del'>-	rtsx_pci_write_register(pcr, PWR_FE_CTL,</div><div class='add'>+		rtsx_pci_write_register(pcr, PWR_FE_CTL,</div><div class='ctx'> 					0xFF, PCIE_L1_2_PD_FE_EN);</div><div class='ctx'> 	} else if (lss_l1_1) {</div><div class='ctx'> 		pcr_dbg(pcr, "Set parameters for L1.1.");</div><div class='hunk'>@@ -573,10 +574,10 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)</div><div class='ctx'> 	 * to drive low, and we forcibly request clock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (option-&gt;force_clkreq_0)</div><div class='del'>-		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG,</div><div class='add'>+		rtsx_pci_write_register(pcr, PETXCFG,</div><div class='ctx'> 				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);</div><div class='ctx'> 	else</div><div class='del'>-		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG,</div><div class='add'>+		rtsx_pci_write_register(pcr, PETXCFG,</div><div class='ctx'> 				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -704,7 +705,7 @@ void rts5260_init_params(struct rtsx_pcr *pcr)</div><div class='ctx'> 	option-&gt;ocp_en = 1;</div><div class='ctx'> 	if (option-&gt;ocp_en)</div><div class='ctx'> 		hw_param-&gt;interrupt_en |= SD_OC_INT_EN;</div><div class='del'>-	hw_param-&gt;ocp_glitch =  SDVIO_OCP_GLITCH_800U | SDVIO_OCP_GLITCH_800U;</div><div class='add'>+	hw_param-&gt;ocp_glitch =  SD_OCP_GLITCH_100U | SDVIO_OCP_GLITCH_800U;</div><div class='ctx'> 	option-&gt;sd_400mA_ocp_thd = RTS5260_DVCC_OCP_THD_550;</div><div class='ctx'> 	option-&gt;sd_800mA_ocp_thd = RTS5260_DVCC_OCP_THD_970;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c<br/>index 39f832d27288..98603e235cf0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/fastrpc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/fastrpc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/fastrpc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/fastrpc.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/rpmsg.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='hunk'>@@ -31,7 +32,7 @@</div><div class='ctx'> #define FASTRPC_CTX_MAX (256)</div><div class='ctx'> #define FASTRPC_INIT_HANDLE	1</div><div class='ctx'> #define FASTRPC_CTXID_MASK (0xFF0)</div><div class='del'>-#define INIT_FILELEN_MAX (2 * 1024 * 1024)</div><div class='add'>+#define INIT_FILELEN_MAX (64 * 1024 * 1024)</div><div class='ctx'> #define INIT_MEMLEN_MAX  (8 * 1024 * 1024)</div><div class='ctx'> #define FASTRPC_DEVICE_NAME	"fastrpc"</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +105,15 @@ struct fastrpc_invoke_rsp {</div><div class='ctx'> 	int retval;		/* invoke return value */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct fastrpc_buf_overlap {</div><div class='add'>+	u64 start;</div><div class='add'>+	u64 end;</div><div class='add'>+	int raix;</div><div class='add'>+	u64 mstart;</div><div class='add'>+	u64 mend;</div><div class='add'>+	u64 offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct fastrpc_buf {</div><div class='ctx'> 	struct fastrpc_user *fl;</div><div class='ctx'> 	struct dma_buf *dmabuf;</div><div class='hunk'>@@ -149,12 +159,14 @@ struct fastrpc_invoke_ctx {</div><div class='ctx'> 	struct kref refcount;</div><div class='ctx'> 	struct list_head node; /* list of ctxs */</div><div class='ctx'> 	struct completion work;</div><div class='add'>+	struct work_struct put_work;</div><div class='ctx'> 	struct fastrpc_msg msg;</div><div class='ctx'> 	struct fastrpc_user *fl;</div><div class='ctx'> 	struct fastrpc_remote_arg *rpra;</div><div class='ctx'> 	struct fastrpc_map **maps;</div><div class='ctx'> 	struct fastrpc_buf *buf;</div><div class='ctx'> 	struct fastrpc_invoke_args *args;</div><div class='add'>+	struct fastrpc_buf_overlap *olaps;</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -282,6 +294,7 @@ static void fastrpc_context_free(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastrpc_invoke_ctx *ctx;</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	ctx = container_of(ref, struct fastrpc_invoke_ctx, refcount);</div><div class='hunk'>@@ -293,11 +306,12 @@ static void fastrpc_context_free(struct kref *ref)</div><div class='ctx'> 	if (ctx-&gt;buf)</div><div class='ctx'> 		fastrpc_buf_free(ctx-&gt;buf);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	idr_remove(&amp;cctx-&gt;ctx_idr, ctx-&gt;ctxid &gt;&gt; 4);</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ctx-&gt;maps);</div><div class='add'>+	kfree(ctx-&gt;olaps);</div><div class='ctx'> 	kfree(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -311,12 +325,70 @@ static void fastrpc_context_put(struct fastrpc_invoke_ctx *ctx)</div><div class='ctx'> 	kref_put(&amp;ctx-&gt;refcount, fastrpc_context_free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fastrpc_context_put_wq(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct fastrpc_invoke_ctx *ctx =</div><div class='add'>+			container_of(work, struct fastrpc_invoke_ctx, put_work);</div><div class='add'>+</div><div class='add'>+	fastrpc_context_put(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMP(aa, bb) ((aa) == (bb) ? 0 : (aa) &lt; (bb) ? -1 : 1)</div><div class='add'>+static int olaps_cmp(const void *a, const void *b)</div><div class='add'>+{</div><div class='add'>+	struct fastrpc_buf_overlap *pa = (struct fastrpc_buf_overlap *)a;</div><div class='add'>+	struct fastrpc_buf_overlap *pb = (struct fastrpc_buf_overlap *)b;</div><div class='add'>+	/* sort with lowest starting buffer first */</div><div class='add'>+	int st = CMP(pa-&gt;start, pb-&gt;start);</div><div class='add'>+	/* sort with highest ending buffer first */</div><div class='add'>+	int ed = CMP(pb-&gt;end, pa-&gt;end);</div><div class='add'>+</div><div class='add'>+	return st == 0 ? ed : st;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fastrpc_get_buff_overlaps(struct fastrpc_invoke_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	u64 max_end = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;nbufs; ++i) {</div><div class='add'>+		ctx-&gt;olaps[i].start = ctx-&gt;args[i].ptr;</div><div class='add'>+		ctx-&gt;olaps[i].end = ctx-&gt;olaps[i].start + ctx-&gt;args[i].length;</div><div class='add'>+		ctx-&gt;olaps[i].raix = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sort(ctx-&gt;olaps, ctx-&gt;nbufs, sizeof(*ctx-&gt;olaps), olaps_cmp, NULL);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;nbufs; ++i) {</div><div class='add'>+		/* Falling inside previous range */</div><div class='add'>+		if (ctx-&gt;olaps[i].start &lt; max_end) {</div><div class='add'>+			ctx-&gt;olaps[i].mstart = max_end;</div><div class='add'>+			ctx-&gt;olaps[i].mend = ctx-&gt;olaps[i].end;</div><div class='add'>+			ctx-&gt;olaps[i].offset = max_end - ctx-&gt;olaps[i].start;</div><div class='add'>+</div><div class='add'>+			if (ctx-&gt;olaps[i].end &gt; max_end) {</div><div class='add'>+				max_end = ctx-&gt;olaps[i].end;</div><div class='add'>+			} else {</div><div class='add'>+				ctx-&gt;olaps[i].mend = 0;</div><div class='add'>+				ctx-&gt;olaps[i].mstart = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else  {</div><div class='add'>+			ctx-&gt;olaps[i].mend = ctx-&gt;olaps[i].end;</div><div class='add'>+			ctx-&gt;olaps[i].mstart = ctx-&gt;olaps[i].start;</div><div class='add'>+			ctx-&gt;olaps[i].offset = 0;</div><div class='add'>+			max_end = ctx-&gt;olaps[i].end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct fastrpc_invoke_ctx *fastrpc_context_alloc(</div><div class='ctx'> 			struct fastrpc_user *user, u32 kernel, u32 sc,</div><div class='ctx'> 			struct fastrpc_invoke_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx = user-&gt;cctx;</div><div class='ctx'> 	struct fastrpc_invoke_ctx *ctx = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='hunk'>@@ -336,7 +408,15 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc(</div><div class='ctx'> 			kfree(ctx);</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		}</div><div class='add'>+		ctx-&gt;olaps = kcalloc(ctx-&gt;nscalars,</div><div class='add'>+				    sizeof(*ctx-&gt;olaps), GFP_KERNEL);</div><div class='add'>+		if (!ctx-&gt;olaps) {</div><div class='add'>+			kfree(ctx-&gt;maps);</div><div class='add'>+			kfree(ctx);</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='ctx'> 		ctx-&gt;args = args;</div><div class='add'>+		fastrpc_get_buff_overlaps(ctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;sc = sc;</div><div class='hunk'>@@ -345,20 +425,21 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc(</div><div class='ctx'> 	ctx-&gt;tgid = user-&gt;tgid;</div><div class='ctx'> 	ctx-&gt;cctx = cctx;</div><div class='ctx'> 	init_completion(&amp;ctx-&gt;work);</div><div class='add'>+	INIT_WORK(&amp;ctx-&gt;put_work, fastrpc_context_put_wq);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;user-&gt;lock);</div><div class='ctx'> 	list_add_tail(&amp;ctx-&gt;node, &amp;user-&gt;pending);</div><div class='ctx'> 	spin_unlock(&amp;user-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	ret = idr_alloc_cyclic(&amp;cctx-&gt;ctx_idr, ctx, 1,</div><div class='ctx'> 			       FASTRPC_CTX_MAX, GFP_ATOMIC);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 		goto err_idr;</div><div class='ctx'> 	}</div><div class='ctx'> 	ctx-&gt;ctxid = ret &lt;&lt; 4;</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	kref_init(&amp;ctx-&gt;refcount);</div><div class='ctx'> </div><div class='hunk'>@@ -368,6 +449,7 @@ err_idr:</div><div class='ctx'> 	list_del(&amp;ctx-&gt;node);</div><div class='ctx'> 	spin_unlock(&amp;user-&gt;lock);</div><div class='ctx'> 	kfree(ctx-&gt;maps);</div><div class='add'>+	kfree(ctx-&gt;olaps);</div><div class='ctx'> 	kfree(ctx);</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -586,8 +668,11 @@ static u64 fastrpc_get_payload_size(struct fastrpc_invoke_ctx *ctx, int metalen)</div><div class='ctx'> 	size = ALIGN(metalen, FASTRPC_ALIGN);</div><div class='ctx'> 	for (i = 0; i &lt; ctx-&gt;nscalars; i++) {</div><div class='ctx'> 		if (ctx-&gt;args[i].fd == 0 || ctx-&gt;args[i].fd == -1) {</div><div class='del'>-			size = ALIGN(size, FASTRPC_ALIGN);</div><div class='del'>-			size += ctx-&gt;args[i].length;</div><div class='add'>+</div><div class='add'>+			if (ctx-&gt;olaps[i].offset == 0)</div><div class='add'>+				size = ALIGN(size, FASTRPC_ALIGN);</div><div class='add'>+</div><div class='add'>+			size += (ctx-&gt;olaps[i].mend - ctx-&gt;olaps[i].mstart);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -625,12 +710,12 @@ static int fastrpc_get_args(u32 kernel, struct fastrpc_invoke_ctx *ctx)</div><div class='ctx'> 	struct fastrpc_remote_arg *rpra;</div><div class='ctx'> 	struct fastrpc_invoke_buf *list;</div><div class='ctx'> 	struct fastrpc_phy_page *pages;</div><div class='del'>-	int inbufs, i, err = 0;</div><div class='del'>-	u64 rlen, pkt_size;</div><div class='add'>+	int inbufs, i, oix, err = 0;</div><div class='add'>+	u64 len, rlen, pkt_size;</div><div class='add'>+	u64 pg_start, pg_end;</div><div class='ctx'> 	uintptr_t args;</div><div class='ctx'> 	int metalen;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	inbufs = REMOTE_SCALARS_INBUFS(ctx-&gt;sc);</div><div class='ctx'> 	metalen = fastrpc_get_meta_size(ctx);</div><div class='ctx'> 	pkt_size = fastrpc_get_payload_size(ctx, metalen);</div><div class='hunk'>@@ -653,8 +738,11 @@ static int fastrpc_get_args(u32 kernel, struct fastrpc_invoke_ctx *ctx)</div><div class='ctx'> 	rlen = pkt_size - metalen;</div><div class='ctx'> 	ctx-&gt;rpra = rpra;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ctx-&gt;nbufs; ++i) {</div><div class='del'>-		u64 len = ctx-&gt;args[i].length;</div><div class='add'>+	for (oix = 0; oix &lt; ctx-&gt;nbufs; ++oix) {</div><div class='add'>+		int mlen;</div><div class='add'>+</div><div class='add'>+		i = ctx-&gt;olaps[oix].raix;</div><div class='add'>+		len = ctx-&gt;args[i].length;</div><div class='ctx'> </div><div class='ctx'> 		rpra[i].pv = 0;</div><div class='ctx'> 		rpra[i].len = len;</div><div class='hunk'>@@ -664,22 +752,45 @@ static int fastrpc_get_args(u32 kernel, struct fastrpc_invoke_ctx *ctx)</div><div class='ctx'> 		if (!len)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		pages[i].size = roundup(len, PAGE_SIZE);</div><div class='del'>-</div><div class='ctx'> 		if (ctx-&gt;maps[i]) {</div><div class='add'>+			struct vm_area_struct *vma = NULL;</div><div class='add'>+</div><div class='ctx'> 			rpra[i].pv = (u64) ctx-&gt;args[i].ptr;</div><div class='ctx'> 			pages[i].addr = ctx-&gt;maps[i]-&gt;phys;</div><div class='add'>+</div><div class='add'>+			vma = find_vma(current-&gt;mm, ctx-&gt;args[i].ptr);</div><div class='add'>+			if (vma)</div><div class='add'>+				pages[i].addr += ctx-&gt;args[i].ptr -</div><div class='add'>+						 vma-&gt;vm_start;</div><div class='add'>+</div><div class='add'>+			pg_start = (ctx-&gt;args[i].ptr &amp; PAGE_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			pg_end = ((ctx-&gt;args[i].ptr + len - 1) &amp; PAGE_MASK) &gt;&gt;</div><div class='add'>+				  PAGE_SHIFT;</div><div class='add'>+			pages[i].size = (pg_end - pg_start + 1) * PAGE_SIZE;</div><div class='add'>+</div><div class='ctx'> 		} else {</div><div class='del'>-			rlen -= ALIGN(args, FASTRPC_ALIGN) - args;</div><div class='del'>-			args = ALIGN(args, FASTRPC_ALIGN);</div><div class='del'>-			if (rlen &lt; len)</div><div class='add'>+</div><div class='add'>+			if (ctx-&gt;olaps[oix].offset == 0) {</div><div class='add'>+				rlen -= ALIGN(args, FASTRPC_ALIGN) - args;</div><div class='add'>+				args = ALIGN(args, FASTRPC_ALIGN);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mlen = ctx-&gt;olaps[oix].mend - ctx-&gt;olaps[oix].mstart;</div><div class='add'>+</div><div class='add'>+			if (rlen &lt; mlen)</div><div class='ctx'> 				goto bail;</div><div class='ctx'> </div><div class='del'>-			rpra[i].pv = args;</div><div class='del'>-			pages[i].addr = ctx-&gt;buf-&gt;phys + (pkt_size - rlen);</div><div class='add'>+			rpra[i].pv = args - ctx-&gt;olaps[oix].offset;</div><div class='add'>+			pages[i].addr = ctx-&gt;buf-&gt;phys -</div><div class='add'>+					ctx-&gt;olaps[oix].offset +</div><div class='add'>+					(pkt_size - rlen);</div><div class='ctx'> 			pages[i].addr = pages[i].addr &amp;	PAGE_MASK;</div><div class='del'>-			args = args + len;</div><div class='del'>-			rlen -= len;</div><div class='add'>+</div><div class='add'>+			pg_start = (args &amp; PAGE_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			pg_end = ((args + len - 1) &amp; PAGE_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			pages[i].size = (pg_end - pg_start + 1) * PAGE_SIZE;</div><div class='add'>+			args = args + mlen;</div><div class='add'>+			rlen -= mlen;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (i &lt; inbufs &amp;&amp; !ctx-&gt;maps[i]) {</div><div class='hunk'>@@ -782,6 +893,9 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl,  u32 kernel,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* make sure that all CPU memory writes are seen by DSP */</div><div class='add'>+	dma_wmb();</div><div class='ctx'> 	/* Send invoke buffer to remote dsp */</div><div class='ctx'> 	err = fastrpc_invoke_send(fl-&gt;sctx, ctx, kernel, handle);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -798,6 +912,8 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl,  u32 kernel,</div><div class='ctx'> 		goto bail;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;nscalars) {</div><div class='add'>+		/* make sure that all memory writes by DSP are seen by CPU */</div><div class='add'>+		dma_rmb();</div><div class='ctx'> 		/* populate all the output buffers with results */</div><div class='ctx'> 		err = fastrpc_put_args(ctx, kernel);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -843,12 +959,12 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;init, argp, sizeof(init))) {</div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-		goto bail;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (init.filelen &gt; INIT_FILELEN_MAX) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		goto bail;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inbuf.pgid = fl-&gt;tgid;</div><div class='hunk'>@@ -862,17 +978,15 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,</div><div class='ctx'> 	if (init.filelen &amp;&amp; init.filefd) {</div><div class='ctx'> 		err = fastrpc_map_create(fl, init.filefd, init.filelen, &amp;map);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto bail;</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memlen = ALIGN(max(INIT_FILELEN_MAX, (int)init.filelen * 4),</div><div class='ctx'> 		       1024 * 1024);</div><div class='ctx'> 	err = fastrpc_buf_alloc(fl, fl-&gt;sctx-&gt;dev, memlen,</div><div class='ctx'> 				&amp;imem);</div><div class='del'>-	if (err) {</div><div class='del'>-		fastrpc_map_put(map);</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_alloc;</div><div class='ctx'> </div><div class='ctx'> 	fl-&gt;init_mem = imem;</div><div class='ctx'> 	args[0].ptr = (u64)(uintptr_t)&amp;inbuf;</div><div class='hunk'>@@ -908,13 +1022,24 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,</div><div class='ctx'> </div><div class='ctx'> 	err = fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE,</div><div class='ctx'> 				      sc, args);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_invoke;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='add'>+	kfree(args);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_invoke:</div><div class='add'>+	fl-&gt;init_mem = NULL;</div><div class='add'>+	fastrpc_buf_free(imem);</div><div class='add'>+err_alloc:</div><div class='add'>+	if (map) {</div><div class='add'>+		spin_lock(&amp;fl-&gt;lock);</div><div class='add'>+		list_del(&amp;map-&gt;node);</div><div class='add'>+		spin_unlock(&amp;fl-&gt;lock);</div><div class='ctx'> 		fastrpc_map_put(map);</div><div class='del'>-		fastrpc_buf_free(imem);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-bail:</div><div class='add'>+err:</div><div class='ctx'> 	kfree(args);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -924,9 +1049,10 @@ static struct fastrpc_session_ctx *fastrpc_session_alloc(</div><div class='ctx'> 					struct fastrpc_channel_ctx *cctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastrpc_session_ctx *session = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	for (i = 0; i &lt; cctx-&gt;sesscount; i++) {</div><div class='ctx'> 		if (!cctx-&gt;session[i].used &amp;&amp; cctx-&gt;session[i].valid) {</div><div class='ctx'> 			cctx-&gt;session[i].used = true;</div><div class='hunk'>@@ -934,7 +1060,7 @@ static struct fastrpc_session_ctx *fastrpc_session_alloc(</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return session;</div><div class='ctx'> }</div><div class='hunk'>@@ -942,9 +1068,11 @@ static struct fastrpc_session_ctx *fastrpc_session_alloc(</div><div class='ctx'> static void fastrpc_session_free(struct fastrpc_channel_ctx *cctx,</div><div class='ctx'> 				 struct fastrpc_session_ctx *session)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	session-&gt;used = false;</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fastrpc_release_current_dsp_process(struct fastrpc_user *fl)</div><div class='hunk'>@@ -970,12 +1098,13 @@ static int fastrpc_device_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx = fl-&gt;cctx;</div><div class='ctx'> 	struct fastrpc_invoke_ctx *ctx, *n;</div><div class='ctx'> 	struct fastrpc_map *map, *m;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	fastrpc_release_current_dsp_process(fl);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	list_del(&amp;fl-&gt;user);</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;init_mem)</div><div class='ctx'> 		fastrpc_buf_free(fl-&gt;init_mem);</div><div class='hunk'>@@ -1003,6 +1132,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx = miscdev_to_cctx(filp-&gt;private_data);</div><div class='ctx'> 	struct fastrpc_user *fl = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	fl = kzalloc(sizeof(*fl), GFP_KERNEL);</div><div class='ctx'> 	if (!fl)</div><div class='hunk'>@@ -1026,9 +1156,9 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	list_add_tail(&amp;fl-&gt;user, &amp;cctx-&gt;users);</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1184,6 +1314,8 @@ static int fastrpc_cb_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct fastrpc_session_ctx *sess;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	int i, sessions = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	cctx = dev_get_drvdata(dev-&gt;parent);</div><div class='ctx'> 	if (!cctx)</div><div class='hunk'>@@ -1191,7 +1323,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	of_property_read_u32(dev-&gt;of_node, "qcom,nsessions", &amp;sessions);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	sess = &amp;cctx-&gt;session[cctx-&gt;sesscount];</div><div class='ctx'> 	sess-&gt;used = false;</div><div class='ctx'> 	sess-&gt;valid = true;</div><div class='hunk'>@@ -1212,8 +1344,12 @@ static int fastrpc_cb_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	cctx-&gt;sesscount++;</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='del'>-	dma_set_mask(dev, DMA_BIT_MASK(32));</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='add'>+	rc = dma_set_mask(dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(dev, "32-bit DMA enable failed\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1222,16 +1358,17 @@ static int fastrpc_cb_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct fastrpc_session_ctx *sess = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	for (i = 1; i &lt; FASTRPC_MAX_SESSIONS; i++) {</div><div class='ctx'> 		if (cctx-&gt;session[i].sid == sess-&gt;sid) {</div><div class='ctx'> 			cctx-&gt;session[i].valid = false;</div><div class='ctx'> 			cctx-&gt;sesscount--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1313,11 +1450,12 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fastrpc_channel_ctx *cctx = dev_get_drvdata(&amp;rpdev-&gt;dev);</div><div class='ctx'> 	struct fastrpc_user *user;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> 	list_for_each_entry(user, &amp;cctx-&gt;users, user)</div><div class='ctx'> 		fastrpc_notify_users(user);</div><div class='del'>-	spin_unlock(&amp;cctx-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cctx-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	misc_deregister(&amp;cctx-&gt;miscdev);</div><div class='ctx'> 	of_platform_depopulate(&amp;rpdev-&gt;dev);</div><div class='hunk'>@@ -1349,7 +1487,13 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;retval = rsp-&gt;retval;</div><div class='ctx'> 	complete(&amp;ctx-&gt;work);</div><div class='del'>-	fastrpc_context_put(ctx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The DMA buffer associated with the context cannot be freed in</div><div class='add'>+	 * interrupt context so schedule it through a worker thread to</div><div class='add'>+	 * avoid a kernel BUG.</div><div class='add'>+	 */</div><div class='add'>+	schedule_work(&amp;ctx-&gt;put_work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/misc/genwqe/card_debugfs.c b/drivers/misc/genwqe/card_debugfs.c<br/>index 7c713e01d198..6f7e39f07811 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/genwqe/card_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/genwqe/card_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/genwqe/card_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/genwqe/card_debugfs.c</a></div><div class='hunk'>@@ -227,7 +227,7 @@ static int ddcb_info_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	seq_puts(s, "DDCB QUEUE:\n");</div><div class='ctx'> 	seq_printf(s, "  ddcb_max:            %d\n"</div><div class='ctx'> 		   "  ddcb_daddr:          %016llx - %016llx\n"</div><div class='del'>-		   "  ddcb_vaddr:          %016llx\n"</div><div class='add'>+		   "  ddcb_vaddr:          %p\n"</div><div class='ctx'> 		   "  ddcbs_in_flight:     %u\n"</div><div class='ctx'> 		   "  ddcbs_max_in_flight: %u\n"</div><div class='ctx'> 		   "  ddcbs_completed:     %u\n"</div><div class='hunk'>@@ -237,7 +237,7 @@ static int ddcb_info_show(struct seq_file *s, void *unused)</div><div class='ctx'> 		   queue-&gt;ddcb_max, (long long)queue-&gt;ddcb_daddr,</div><div class='ctx'> 		   (long long)queue-&gt;ddcb_daddr +</div><div class='ctx'> 		   (queue-&gt;ddcb_max * DDCB_LENGTH),</div><div class='del'>-		   (long long)queue-&gt;ddcb_vaddr, queue-&gt;ddcbs_in_flight,</div><div class='add'>+		   queue-&gt;ddcb_vaddr, queue-&gt;ddcbs_in_flight,</div><div class='ctx'> 		   queue-&gt;ddcbs_max_in_flight, queue-&gt;ddcbs_completed,</div><div class='ctx'> 		   queue-&gt;return_on_busy, queue-&gt;wait_on_busy,</div><div class='ctx'> 		   cd-&gt;irqs_processed);</div><div class='head'>diff --git a/drivers/misc/habanalabs/Makefile b/drivers/misc/habanalabs/Makefile<br/>index c6592db59b25..f8e85243d672 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/Makefile</a></div><div class='hunk'>@@ -6,7 +6,7 @@ obj-m	:= habanalabs.o</div><div class='ctx'> </div><div class='ctx'> habanalabs-y := habanalabs_drv.o device.o context.o asid.o habanalabs_ioctl.o \</div><div class='ctx'> 		command_buffer.o hw_queue.o irq.o sysfs.o hwmon.o memory.o \</div><div class='del'>-		command_submission.o mmu.o</div><div class='add'>+		command_submission.o mmu.o firmware_if.o pci.o</div><div class='ctx'> </div><div class='ctx'> habanalabs-$(CONFIG_DEBUG_FS) += debugfs.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/habanalabs/command_buffer.c b/drivers/misc/habanalabs/command_buffer.c<br/>index 85f75806a9a7..e495f44064fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/command_buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/command_buffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/command_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/command_buffer.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> static void cb_fini(struct hl_device *hdev, struct hl_cb *cb)</div><div class='ctx'> {</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, cb-&gt;size,</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_free_coherent(hdev, cb-&gt;size,</div><div class='ctx'> 			(void *) (uintptr_t) cb-&gt;kernel_address,</div><div class='ctx'> 			cb-&gt;bus_address);</div><div class='ctx'> 	kfree(cb);</div><div class='hunk'>@@ -66,10 +66,10 @@ static struct hl_cb *hl_cb_alloc(struct hl_device *hdev, u32 cb_size,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx_id == HL_KERNEL_ASID_ID)</div><div class='del'>-		p = hdev-&gt;asic_funcs-&gt;dma_alloc_coherent(hdev, cb_size,</div><div class='add'>+		p = hdev-&gt;asic_funcs-&gt;asic_dma_alloc_coherent(hdev, cb_size,</div><div class='ctx'> 						&amp;cb-&gt;bus_address, GFP_ATOMIC);</div><div class='ctx'> 	else</div><div class='del'>-		p = hdev-&gt;asic_funcs-&gt;dma_alloc_coherent(hdev, cb_size,</div><div class='add'>+		p = hdev-&gt;asic_funcs-&gt;asic_dma_alloc_coherent(hdev, cb_size,</div><div class='ctx'> 						&amp;cb-&gt;bus_address,</div><div class='ctx'> 						GFP_USER | __GFP_ZERO);</div><div class='ctx'> 	if (!p) {</div><div class='hunk'>@@ -214,6 +214,13 @@ int hl_cb_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> 	u64 handle;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (hl_device_disabled_or_in_reset(hdev)) {</div><div class='add'>+		dev_warn_ratelimited(hdev-&gt;dev,</div><div class='add'>+			"Device is %s. Can't execute CB IOCTL\n",</div><div class='add'>+			atomic_read(&amp;hdev-&gt;in_reset) ? "in_reset" : "disabled");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (args-&gt;in.op) {</div><div class='ctx'> 	case HL_CB_OP_CREATE:</div><div class='ctx'> 		rc = hl_cb_create(hdev, &amp;hpriv-&gt;cb_mgr, args-&gt;in.cb_size,</div><div class='head'>diff --git a/drivers/misc/habanalabs/command_submission.c b/drivers/misc/habanalabs/command_submission.c<br/>index 3525236ed8d9..6fe785e26859 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/command_submission.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/command_submission.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/command_submission.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/command_submission.c</a></div><div class='hunk'>@@ -93,7 +93,6 @@ static int cs_parser(struct hl_fpriv *hpriv, struct hl_cs_job *job)</div><div class='ctx'> 	parser.user_cb_size = job-&gt;user_cb_size;</div><div class='ctx'> 	parser.ext_queue = job-&gt;ext_queue;</div><div class='ctx'> 	job-&gt;patched_cb = NULL;</div><div class='del'>-	parser.use_virt_addr = hdev-&gt;mmu_enable;</div><div class='ctx'> </div><div class='ctx'> 	rc = hdev-&gt;asic_funcs-&gt;cs_parser(hdev, &amp;parser);</div><div class='ctx'> 	if (job-&gt;ext_queue) {</div><div class='hunk'>@@ -179,6 +178,12 @@ static void cs_do_release(struct kref *ref)</div><div class='ctx'> </div><div class='ctx'> 	/* We also need to update CI for internal queues */</div><div class='ctx'> 	if (cs-&gt;submitted) {</div><div class='add'>+		int cs_cnt = atomic_dec_return(&amp;hdev-&gt;cs_active_cnt);</div><div class='add'>+</div><div class='add'>+		WARN_ONCE((cs_cnt &lt; 0),</div><div class='add'>+			"hl%d: error in CS active cnt %d\n",</div><div class='add'>+			hdev-&gt;id, cs_cnt);</div><div class='add'>+</div><div class='ctx'> 		hl_int_hw_queue_update_ci(cs);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;hdev-&gt;hw_queues_mirror_lock);</div><div class='hunk'>@@ -255,7 +260,8 @@ static void cs_timedout(struct work_struct *work)</div><div class='ctx'> 	ctx_asid = cs-&gt;ctx-&gt;asid;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: add information about last signaled seq and last emitted seq */</div><div class='del'>-	dev_err(hdev-&gt;dev, "CS %d.%llu got stuck!\n", ctx_asid, cs-&gt;sequence);</div><div class='add'>+	dev_err(hdev-&gt;dev, "User %d command submission %llu got stuck!\n",</div><div class='add'>+		ctx_asid, cs-&gt;sequence);</div><div class='ctx'> </div><div class='ctx'> 	cs_put(cs);</div><div class='ctx'> </div><div class='hunk'>@@ -594,20 +600,20 @@ int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> 	void __user *chunks;</div><div class='ctx'> 	u32 num_chunks;</div><div class='ctx'> 	u64 cs_seq = ULONG_MAX;</div><div class='del'>-	int rc, do_restore;</div><div class='add'>+	int rc, do_ctx_switch;</div><div class='ctx'> 	bool need_soft_reset = false;</div><div class='ctx'> </div><div class='ctx'> 	if (hl_device_disabled_or_in_reset(hdev)) {</div><div class='del'>-		dev_warn(hdev-&gt;dev,</div><div class='add'>+		dev_warn_ratelimited(hdev-&gt;dev,</div><div class='ctx'> 			"Device is %s. Can't submit new CS\n",</div><div class='ctx'> 			atomic_read(&amp;hdev-&gt;in_reset) ? "in_reset" : "disabled");</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	do_restore = atomic_cmpxchg(&amp;ctx-&gt;thread_restore_token, 1, 0);</div><div class='add'>+	do_ctx_switch = atomic_cmpxchg(&amp;ctx-&gt;thread_ctx_switch_token, 1, 0);</div><div class='ctx'> </div><div class='del'>-	if (do_restore || (args-&gt;in.cs_flags &amp; HL_CS_FLAGS_FORCE_RESTORE)) {</div><div class='add'>+	if (do_ctx_switch || (args-&gt;in.cs_flags &amp; HL_CS_FLAGS_FORCE_RESTORE)) {</div><div class='ctx'> 		long ret;</div><div class='ctx'> </div><div class='ctx'> 		chunks = (void __user *)(uintptr_t)args-&gt;in.chunks_restore;</div><div class='hunk'>@@ -615,7 +621,7 @@ int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;hpriv-&gt;restore_phase_mutex);</div><div class='ctx'> </div><div class='del'>-		if (do_restore) {</div><div class='add'>+		if (do_ctx_switch) {</div><div class='ctx'> 			rc = hdev-&gt;asic_funcs-&gt;context_switch(hdev, ctx-&gt;asid);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				dev_err_ratelimited(hdev-&gt;dev,</div><div class='hunk'>@@ -671,18 +677,18 @@ int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ctx-&gt;thread_restore_wait_token = 1;</div><div class='del'>-	} else if (!ctx-&gt;thread_restore_wait_token) {</div><div class='add'>+		ctx-&gt;thread_ctx_switch_wait_token = 1;</div><div class='add'>+	} else if (!ctx-&gt;thread_ctx_switch_wait_token) {</div><div class='ctx'> 		u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 		rc = hl_poll_timeout_memory(hdev,</div><div class='del'>-			(u64) (uintptr_t) &amp;ctx-&gt;thread_restore_wait_token,</div><div class='add'>+			(u64) (uintptr_t) &amp;ctx-&gt;thread_ctx_switch_wait_token,</div><div class='ctx'> 			jiffies_to_usecs(hdev-&gt;timeout_jiffies),</div><div class='ctx'> 			&amp;tmp);</div><div class='ctx'> </div><div class='ctx'> 		if (rc || !tmp) {</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='del'>-				"restore phase hasn't finished in time\n");</div><div class='add'>+				"context switch phase didn't finish in time\n");</div><div class='ctx'> 			rc = -ETIMEDOUT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/misc/habanalabs/context.c b/drivers/misc/habanalabs/context.c<br/>index 619ace1c4ef7..4804cdcf4c48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/context.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/context.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/context.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/context.c</a></div><div class='hunk'>@@ -106,8 +106,8 @@ int hl_ctx_init(struct hl_device *hdev, struct hl_ctx *ctx, bool is_kernel_ctx)</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;cs_sequence = 1;</div><div class='ctx'> 	spin_lock_init(&amp;ctx-&gt;cs_lock);</div><div class='del'>-	atomic_set(&amp;ctx-&gt;thread_restore_token, 1);</div><div class='del'>-	ctx-&gt;thread_restore_wait_token = 0;</div><div class='add'>+	atomic_set(&amp;ctx-&gt;thread_ctx_switch_token, 1);</div><div class='add'>+	ctx-&gt;thread_ctx_switch_wait_token = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (is_kernel_ctx) {</div><div class='ctx'> 		ctx-&gt;asid = HL_KERNEL_ASID_ID; /* KMD gets ASID 0 */</div><div class='head'>diff --git a/drivers/misc/habanalabs/debugfs.c b/drivers/misc/habanalabs/debugfs.c<br/>index a53c12aff6ad..a4447699ff4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/debugfs.c</a></div><div class='hunk'>@@ -232,6 +232,7 @@ static int vm_show(struct seq_file *s, void *data)</div><div class='ctx'> 	struct hl_vm_phys_pg_pack *phys_pg_pack = NULL;</div><div class='ctx'> 	enum vm_type_t *vm_type;</div><div class='ctx'> 	bool once = true;</div><div class='add'>+	u64 j;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_entry-&gt;hdev-&gt;mmu_enable)</div><div class='hunk'>@@ -260,7 +261,7 @@ static int vm_show(struct seq_file *s, void *data)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				phys_pg_pack = hnode-&gt;ptr;</div><div class='ctx'> 				seq_printf(s,</div><div class='del'>-					"    0x%-14llx      %-10u       %-4u\n",</div><div class='add'>+					"    0x%-14llx      %-10llu       %-4u\n",</div><div class='ctx'> 					hnode-&gt;vaddr, phys_pg_pack-&gt;total_size,</div><div class='ctx'> 					phys_pg_pack-&gt;handle);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -282,9 +283,9 @@ static int vm_show(struct seq_file *s, void *data)</div><div class='ctx'> 						phys_pg_pack-&gt;page_size);</div><div class='ctx'> 			seq_puts(s, "   physical address\n");</div><div class='ctx'> 			seq_puts(s, "---------------------\n");</div><div class='del'>-			for (i = 0 ; i &lt; phys_pg_pack-&gt;npages ; i++) {</div><div class='add'>+			for (j = 0 ; j &lt; phys_pg_pack-&gt;npages ; j++) {</div><div class='ctx'> 				seq_printf(s, "    0x%-14llx\n",</div><div class='del'>-						phys_pg_pack-&gt;pages[i]);</div><div class='add'>+						phys_pg_pack-&gt;pages[j]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;vm-&gt;idr_lock);</div><div class='hunk'>@@ -504,22 +505,97 @@ err:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int device_va_to_pa(struct hl_device *hdev, u64 virt_addr,</div><div class='add'>+				u64 *phys_addr)</div><div class='add'>+{</div><div class='add'>+	struct hl_ctx *ctx = hdev-&gt;user_ctx;</div><div class='add'>+	u64 hop_addr, hop_pte_addr, hop_pte;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "no ctx available\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ctx-&gt;mmu_lock);</div><div class='add'>+</div><div class='add'>+	/* hop 0 */</div><div class='add'>+	hop_addr = get_hop0_addr(ctx);</div><div class='add'>+	hop_pte_addr = get_hop0_pte_addr(ctx, hop_addr, virt_addr);</div><div class='add'>+	hop_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop_pte_addr);</div><div class='add'>+</div><div class='add'>+	/* hop 1 */</div><div class='add'>+	hop_addr = get_next_hop_addr(hop_pte);</div><div class='add'>+	if (hop_addr == ULLONG_MAX)</div><div class='add'>+		goto not_mapped;</div><div class='add'>+	hop_pte_addr = get_hop1_pte_addr(ctx, hop_addr, virt_addr);</div><div class='add'>+	hop_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop_pte_addr);</div><div class='add'>+</div><div class='add'>+	/* hop 2 */</div><div class='add'>+	hop_addr = get_next_hop_addr(hop_pte);</div><div class='add'>+	if (hop_addr == ULLONG_MAX)</div><div class='add'>+		goto not_mapped;</div><div class='add'>+	hop_pte_addr = get_hop2_pte_addr(ctx, hop_addr, virt_addr);</div><div class='add'>+	hop_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop_pte_addr);</div><div class='add'>+</div><div class='add'>+	/* hop 3 */</div><div class='add'>+	hop_addr = get_next_hop_addr(hop_pte);</div><div class='add'>+	if (hop_addr == ULLONG_MAX)</div><div class='add'>+		goto not_mapped;</div><div class='add'>+	hop_pte_addr = get_hop3_pte_addr(ctx, hop_addr, virt_addr);</div><div class='add'>+	hop_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop_pte_addr);</div><div class='add'>+</div><div class='add'>+	if (!(hop_pte &amp; LAST_MASK)) {</div><div class='add'>+		/* hop 4 */</div><div class='add'>+		hop_addr = get_next_hop_addr(hop_pte);</div><div class='add'>+		if (hop_addr == ULLONG_MAX)</div><div class='add'>+			goto not_mapped;</div><div class='add'>+		hop_pte_addr = get_hop4_pte_addr(ctx, hop_addr, virt_addr);</div><div class='add'>+		hop_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop_pte_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(hop_pte &amp; PAGE_PRESENT_MASK))</div><div class='add'>+		goto not_mapped;</div><div class='add'>+</div><div class='add'>+	*phys_addr = (hop_pte &amp; PTE_PHYS_ADDR_MASK) | (virt_addr &amp; OFFSET_MASK);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+not_mapped:</div><div class='add'>+	dev_err(hdev-&gt;dev, "virt addr 0x%llx is not mapped to phys addr\n",</div><div class='add'>+			virt_addr);</div><div class='add'>+	rc = -EINVAL;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ctx-&gt;mmu_lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t hl_data_read32(struct file *f, char __user *buf,</div><div class='ctx'> 					size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_dbg_device_entry *entry = file_inode(f)-&gt;i_private;</div><div class='ctx'> 	struct hl_device *hdev = entry-&gt;hdev;</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	char tmp_buf[32];</div><div class='add'>+	u64 addr = entry-&gt;addr;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='ctx'> 	if (*ppos)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;debugfs_read32(hdev, entry-&gt;addr, &amp;val);</div><div class='add'>+	if (addr &gt;= prop-&gt;va_space_dram_start_address &amp;&amp;</div><div class='add'>+			addr &lt; prop-&gt;va_space_dram_end_address &amp;&amp;</div><div class='add'>+			hdev-&gt;mmu_enable &amp;&amp;</div><div class='add'>+			hdev-&gt;dram_supports_virtual_memory) {</div><div class='add'>+		rc = device_va_to_pa(hdev, entry-&gt;addr, &amp;addr);</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 = hdev-&gt;asic_funcs-&gt;debugfs_read32(hdev, addr, &amp;val);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to read from 0x%010llx\n",</div><div class='del'>-			entry-&gt;addr);</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to read from 0x%010llx\n", addr);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -535,6 +611,8 @@ static ssize_t hl_data_write32(struct file *f, const char __user *buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_dbg_device_entry *entry = file_inode(f)-&gt;i_private;</div><div class='ctx'> 	struct hl_device *hdev = entry-&gt;hdev;</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u64 addr = entry-&gt;addr;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='hunk'>@@ -542,10 +620,19 @@ static ssize_t hl_data_write32(struct file *f, const char __user *buf,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;debugfs_write32(hdev, entry-&gt;addr, value);</div><div class='add'>+	if (addr &gt;= prop-&gt;va_space_dram_start_address &amp;&amp;</div><div class='add'>+			addr &lt; prop-&gt;va_space_dram_end_address &amp;&amp;</div><div class='add'>+			hdev-&gt;mmu_enable &amp;&amp;</div><div class='add'>+			hdev-&gt;dram_supports_virtual_memory) {</div><div class='add'>+		rc = device_va_to_pa(hdev, entry-&gt;addr, &amp;addr);</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 = hdev-&gt;asic_funcs-&gt;debugfs_write32(hdev, addr, value);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Failed to write 0x%08x to 0x%010llx\n",</div><div class='del'>-			value, entry-&gt;addr);</div><div class='add'>+			value, addr);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/habanalabs/device.c b/drivers/misc/habanalabs/device.c<br/>index de46aa6ed154..91a9e47a3482 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/device.c</a></div><div class='hunk'>@@ -5,11 +5,16 @@</div><div class='ctx'>  * All Rights Reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt)			"habanalabs: " fmt</div><div class='add'>+</div><div class='ctx'> #include "habanalabs.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;uapi/misc/habanalabs.h&gt;</div><div class='add'>+</div><div class='add'>+#define HL_PLDM_PENDING_RESET_PER_SEC	(HL_PENDING_RESET_PER_SEC * 10)</div><div class='ctx'> </div><div class='ctx'> bool hl_device_disabled_or_in_reset(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -19,6 +24,20 @@ bool hl_device_disabled_or_in_reset(struct hl_device *hdev)</div><div class='ctx'> 		return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum hl_device_status hl_device_status(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	enum hl_device_status status;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;disabled)</div><div class='add'>+		status = HL_DEVICE_STATUS_MALFUNCTION;</div><div class='add'>+	else if (atomic_read(&amp;hdev-&gt;in_reset))</div><div class='add'>+		status = HL_DEVICE_STATUS_IN_RESET;</div><div class='add'>+	else</div><div class='add'>+		status = HL_DEVICE_STATUS_OPERATIONAL;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void hpriv_release(struct kref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_fpriv *hpriv;</div><div class='hunk'>@@ -216,6 +235,7 @@ static int device_early_init(struct hl_device *hdev)</div><div class='ctx'> 	spin_lock_init(&amp;hdev-&gt;hw_queues_mirror_lock);</div><div class='ctx'> 	atomic_set(&amp;hdev-&gt;in_reset, 0);</div><div class='ctx'> 	atomic_set(&amp;hdev-&gt;fd_open_cnt, 0);</div><div class='add'>+	atomic_set(&amp;hdev-&gt;cs_active_cnt, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -413,6 +433,27 @@ int hl_device_suspend(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_save_state(hdev-&gt;pdev);</div><div class='ctx'> </div><div class='add'>+	/* Block future CS/VM/JOB completion operations */</div><div class='add'>+	rc = atomic_cmpxchg(&amp;hdev-&gt;in_reset, 0, 1);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Can't suspend while in reset\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This blocks all other stuff that is not blocked by in_reset */</div><div class='add'>+	hdev-&gt;disabled = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Flush anyone that is inside the critical section of enqueue</div><div class='add'>+	 * jobs to the H/W</div><div class='add'>+	 */</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;hw_queues_lock(hdev);</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;hw_queues_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	/* Flush processes that are sending message to CPU */</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;send_cpu_message_lock);</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;send_cpu_message_lock);</div><div class='add'>+</div><div class='ctx'> 	rc = hdev-&gt;asic_funcs-&gt;suspend(hdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='hunk'>@@ -440,31 +481,52 @@ int hl_device_resume(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_power_state(hdev-&gt;pdev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(hdev-&gt;pdev);</div><div class='del'>-	rc = pci_enable_device(hdev-&gt;pdev);</div><div class='add'>+	rc = pci_enable_device_mem(hdev-&gt;pdev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='ctx'> 			"Failed to enable PCI device in resume\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pci_set_master(hdev-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	rc = hdev-&gt;asic_funcs-&gt;resume(hdev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to enable PCI access from device CPU\n");</div><div class='del'>-		return rc;</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to resume device after suspend\n");</div><div class='add'>+		goto disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	hdev-&gt;disabled = false;</div><div class='add'>+	atomic_set(&amp;hdev-&gt;in_reset, 0);</div><div class='add'>+</div><div class='add'>+	rc = hl_device_reset(hdev, true, false);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to reset device during resume\n");</div><div class='add'>+		goto disable_device;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+disable_device:</div><div class='add'>+	pci_clear_master(hdev-&gt;pdev);</div><div class='add'>+	pci_disable_device(hdev-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hl_device_hard_reset_pending(struct work_struct *work)</div><div class='add'>+static void device_kill_open_processes(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct hl_device_reset_work *device_reset_work =</div><div class='del'>-		container_of(work, struct hl_device_reset_work, reset_work);</div><div class='del'>-	struct hl_device *hdev = device_reset_work-&gt;hdev;</div><div class='del'>-	u16 pending_cnt = HL_PENDING_RESET_PER_SEC;</div><div class='add'>+	u16 pending_total, pending_cnt;</div><div class='ctx'> 	struct task_struct *task = NULL;</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;pldm)</div><div class='add'>+		pending_total = HL_PLDM_PENDING_RESET_PER_SEC;</div><div class='add'>+	else</div><div class='add'>+		pending_total = HL_PENDING_RESET_PER_SEC;</div><div class='add'>+</div><div class='add'>+	pending_cnt = pending_total;</div><div class='add'>+</div><div class='ctx'> 	/* Flush all processes that are inside hl_open */</div><div class='ctx'> 	mutex_lock(&amp;hdev-&gt;fd_open_cnt_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -489,8 +551,37 @@ static void hl_device_hard_reset_pending(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* We killed the open users, but because the driver cleans up after the</div><div class='add'>+	 * user contexts are closed (e.g. mmu mappings), we need to wait again</div><div class='add'>+	 * to make sure the cleaning phase is finished before continuing with</div><div class='add'>+	 * the reset</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pending_cnt = pending_total;</div><div class='add'>+</div><div class='add'>+	while ((atomic_read(&amp;hdev-&gt;fd_open_cnt)) &amp;&amp; (pending_cnt)) {</div><div class='add'>+</div><div class='add'>+		pending_cnt--;</div><div class='add'>+</div><div class='add'>+		ssleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;hdev-&gt;fd_open_cnt))</div><div class='add'>+		dev_crit(hdev-&gt;dev,</div><div class='add'>+			"Going to hard reset with open user contexts\n");</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;hdev-&gt;fd_open_cnt_lock);</div><div class='ctx'> </div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_hard_reset_pending(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hl_device_reset_work *device_reset_work =</div><div class='add'>+		container_of(work, struct hl_device_reset_work, reset_work);</div><div class='add'>+	struct hl_device *hdev = device_reset_work-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	device_kill_open_processes(hdev);</div><div class='add'>+</div><div class='ctx'> 	hl_device_reset(hdev, true, true);</div><div class='ctx'> </div><div class='ctx'> 	kfree(device_reset_work);</div><div class='hunk'>@@ -552,6 +643,8 @@ again:</div><div class='ctx'> 	if ((hard_reset) &amp;&amp; (!from_hard_reset_thread)) {</div><div class='ctx'> 		struct hl_device_reset_work *device_reset_work;</div><div class='ctx'> </div><div class='add'>+		hdev-&gt;hard_reset_pending = true;</div><div class='add'>+</div><div class='ctx'> 		if (!hdev-&gt;pdev) {</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='ctx'> 				"Reset action is NOT supported in simulator\n");</div><div class='hunk'>@@ -559,8 +652,6 @@ again:</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hdev-&gt;hard_reset_pending = true;</div><div class='del'>-</div><div class='ctx'> 		device_reset_work = kzalloc(sizeof(*device_reset_work),</div><div class='ctx'> 						GFP_ATOMIC);</div><div class='ctx'> 		if (!device_reset_work) {</div><div class='hunk'>@@ -574,7 +665,7 @@ again:</div><div class='ctx'> 		 * from a dedicated work</div><div class='ctx'> 		 */</div><div class='ctx'> 		INIT_WORK(&amp;device_reset_work-&gt;reset_work,</div><div class='del'>-				hl_device_hard_reset_pending);</div><div class='add'>+				device_hard_reset_pending);</div><div class='ctx'> 		device_reset_work-&gt;hdev = hdev;</div><div class='ctx'> 		schedule_work(&amp;device_reset_work-&gt;reset_work);</div><div class='ctx'> </div><div class='hunk'>@@ -602,17 +693,9 @@ again:</div><div class='ctx'> 	/* Go over all the queues, release all CS and their jobs */</div><div class='ctx'> 	hl_cs_rollback_all(hdev);</div><div class='ctx'> </div><div class='del'>-	if (hard_reset) {</div><div class='del'>-		/* Release kernel context */</div><div class='del'>-		if (hl_ctx_put(hdev-&gt;kernel_ctx) != 1) {</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"kernel ctx is alive during hard reset\n");</div><div class='del'>-			rc = -EBUSY;</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+	/* Release kernel context */</div><div class='add'>+	if ((hard_reset) &amp;&amp; (hl_ctx_put(hdev-&gt;kernel_ctx) == 1))</div><div class='ctx'> 		hdev-&gt;kernel_ctx = NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the H/W. It will be in idle state after this returns */</div><div class='ctx'> 	hdev-&gt;asic_funcs-&gt;hw_fini(hdev, hard_reset);</div><div class='hunk'>@@ -627,16 +710,24 @@ again:</div><div class='ctx'> 	for (i = 0 ; i &lt; hdev-&gt;asic_prop.completion_queues_count ; i++)</div><div class='ctx'> 		hl_cq_reset(hdev, &amp;hdev-&gt;completion_queue[i]);</div><div class='ctx'> </div><div class='del'>-	/* Make sure the setup phase for the user context will run again */</div><div class='add'>+	/* Make sure the context switch phase will run again */</div><div class='ctx'> 	if (hdev-&gt;user_ctx) {</div><div class='del'>-		atomic_set(&amp;hdev-&gt;user_ctx-&gt;thread_restore_token, 1);</div><div class='del'>-		hdev-&gt;user_ctx-&gt;thread_restore_wait_token = 0;</div><div class='add'>+		atomic_set(&amp;hdev-&gt;user_ctx-&gt;thread_ctx_switch_token, 1);</div><div class='add'>+		hdev-&gt;user_ctx-&gt;thread_ctx_switch_wait_token = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Finished tear-down, starting to re-initialize */</div><div class='ctx'> </div><div class='ctx'> 	if (hard_reset) {</div><div class='ctx'> 		hdev-&gt;device_cpu_disabled = false;</div><div class='add'>+		hdev-&gt;hard_reset_pending = false;</div><div class='add'>+</div><div class='add'>+		if (hdev-&gt;kernel_ctx) {</div><div class='add'>+			dev_crit(hdev-&gt;dev,</div><div class='add'>+				"kernel ctx was alive during hard reset, something is terribly wrong\n");</div><div class='add'>+			rc = -EBUSY;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate the kernel context */</div><div class='ctx'> 		hdev-&gt;kernel_ctx = kzalloc(sizeof(*hdev-&gt;kernel_ctx),</div><div class='hunk'>@@ -691,8 +782,6 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hl_set_max_power(hdev, hdev-&gt;max_power);</div><div class='del'>-</div><div class='del'>-		hdev-&gt;hard_reset_pending = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = hdev-&gt;asic_funcs-&gt;soft_reset_late_init(hdev);</div><div class='ctx'> 		if (rc) {</div><div class='hunk'>@@ -969,11 +1058,22 @@ void hl_device_fini(struct hl_device *hdev)</div><div class='ctx'> 			WARN(1, "Failed to remove device because reset function did not finish\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mark device as disabled */</div><div class='ctx'> 	hdev-&gt;disabled = true;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Flush anyone that is inside the critical section of enqueue</div><div class='add'>+	 * jobs to the H/W</div><div class='add'>+	 */</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;hw_queues_lock(hdev);</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;hw_queues_unlock(hdev);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;hard_reset_pending = true;</div><div class='add'>+</div><div class='add'>+	device_kill_open_processes(hdev);</div><div class='add'>+</div><div class='ctx'> 	hl_hwmon_fini(hdev);</div><div class='ctx'> </div><div class='ctx'> 	device_late_fini(hdev);</div><div class='hunk'>@@ -1047,7 +1147,13 @@ int hl_poll_timeout_memory(struct hl_device *hdev, u64 addr,</div><div class='ctx'> 	 * either by the direct access of the device or by another core</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 *paddr = (u32 *) (uintptr_t) addr;</div><div class='del'>-	ktime_t timeout = ktime_add_us(ktime_get(), timeout_us);</div><div class='add'>+	ktime_t timeout;</div><div class='add'>+</div><div class='add'>+	/* timeout should be longer when working with simulator */</div><div class='add'>+	if (!hdev-&gt;pdev)</div><div class='add'>+		timeout_us *= 10;</div><div class='add'>+</div><div class='add'>+	timeout = ktime_add_us(ktime_get(), timeout_us);</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/habanalabs/firmware_if.c b/drivers/misc/habanalabs/firmware_if.c<br/>new file mode 100644<br/>index 000000000000..eda5d7fcb79f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/firmware_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/firmware_if.c</a></div><div class='hunk'>@@ -0,0 +1,322 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016-2019 HabanaLabs, Ltd.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "habanalabs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/genalloc.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_fw_push_fw_to_device() - Push FW code to device.</div><div class='add'>+ * @hdev: pointer to hl_device structure.</div><div class='add'>+ *</div><div class='add'>+ * Copy fw code from firmware file to device memory.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, non-zero for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_fw_push_fw_to_device(struct hl_device *hdev, const char *fw_name,</div><div class='add'>+				void __iomem *dst)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const u64 *fw_data;</div><div class='add'>+	size_t fw_size, i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = request_firmware(&amp;fw, fw_name, hdev-&gt;dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to request %s\n", fw_name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_size = fw-&gt;size;</div><div class='add'>+	if ((fw_size % 4) != 0) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "illegal %s firmware size %zu\n",</div><div class='add'>+			fw_name, fw_size);</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(hdev-&gt;dev, "%s firmware size == %zu\n", fw_name, fw_size);</div><div class='add'>+</div><div class='add'>+	fw_data = (const u64 *) fw-&gt;data;</div><div class='add'>+</div><div class='add'>+	if ((fw-&gt;size % 8) != 0)</div><div class='add'>+		fw_size -= 8;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; fw_size ; i += 8, fw_data++, dst += 8) {</div><div class='add'>+		if (!(i &amp; (0x80000 - 1))) {</div><div class='add'>+			dev_dbg(hdev-&gt;dev,</div><div class='add'>+				"copied so far %zu out of %zu for %s firmware",</div><div class='add'>+				i, fw_size, fw_name);</div><div class='add'>+			usleep_range(20, 100);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		writeq(*fw_data, dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((fw-&gt;size % 8) != 0)</div><div class='add'>+		writel(*(const u32 *) fw_data, dst);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hl_fw_send_pci_access_msg(struct hl_device *hdev, u32 opcode)</div><div class='add'>+{</div><div class='add'>+	struct armcp_packet pkt = {};</div><div class='add'>+</div><div class='add'>+	pkt.ctl = cpu_to_le32(opcode &lt;&lt; ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='add'>+</div><div class='add'>+	return hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt,</div><div class='add'>+				sizeof(pkt), HL_DEVICE_TIMEOUT_USEC, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg,</div><div class='add'>+				u16 len, u32 timeout, long *result)</div><div class='add'>+{</div><div class='add'>+	struct armcp_packet *pkt;</div><div class='add'>+	dma_addr_t pkt_dma_addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (len &gt; HL_CPU_CB_SIZE) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Invalid CPU message size of %d bytes\n",</div><div class='add'>+			len);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkt = hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev, len,</div><div class='add'>+								&amp;pkt_dma_addr);</div><div class='add'>+	if (!pkt) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to allocate DMA memory for packet to CPU\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(pkt, msg, len);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdev-&gt;send_cpu_message_lock);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;disabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;device_cpu_disabled) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hl_hw_queue_send_cb_no_cmpl(hdev, hw_queue_id, len, pkt_dma_addr);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to send CB on CPU PQ (%d)\n", rc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hl_poll_timeout_memory(hdev, (u64) (uintptr_t) &amp;pkt-&gt;fence,</div><div class='add'>+					timeout, &amp;tmp);</div><div class='add'>+</div><div class='add'>+	hl_hw_queue_inc_ci_kernel(hdev, hw_queue_id);</div><div class='add'>+</div><div class='add'>+	if (rc == -ETIMEDOUT) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Timeout while waiting for device CPU\n");</div><div class='add'>+		hdev-&gt;device_cpu_disabled = true;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tmp == ARMCP_PACKET_FENCE_VAL) {</div><div class='add'>+		u32 ctl = le32_to_cpu(pkt-&gt;ctl);</div><div class='add'>+</div><div class='add'>+		rc = (ctl &amp; ARMCP_PKT_CTL_RC_MASK) &gt;&gt; ARMCP_PKT_CTL_RC_SHIFT;</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"F/W ERROR %d for CPU packet %d\n",</div><div class='add'>+				rc, (ctl &amp; ARMCP_PKT_CTL_OPCODE_MASK)</div><div class='add'>+						&gt;&gt; ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+		} else if (result) {</div><div class='add'>+			*result = (long) le64_to_cpu(pkt-&gt;result);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(hdev-&gt;dev, "CPU packet wrong fence value\n");</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;hdev-&gt;send_cpu_message_lock);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev, len, pkt);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hl_fw_test_cpu_queue(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct armcp_packet test_pkt = {};</div><div class='add'>+	long result;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	test_pkt.ctl = cpu_to_le32(ARMCP_PACKET_TEST &lt;&lt;</div><div class='add'>+					ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='add'>+	test_pkt.value = cpu_to_le64(ARMCP_PACKET_FENCE_VAL);</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;test_pkt,</div><div class='add'>+			sizeof(test_pkt), HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='add'>+</div><div class='add'>+	if (!rc) {</div><div class='add'>+		if (result == ARMCP_PACKET_FENCE_VAL)</div><div class='add'>+			dev_info(hdev-&gt;dev,</div><div class='add'>+				"queue test on CPU queue succeeded\n");</div><div class='add'>+		else</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"CPU queue test failed (0x%08lX)\n", result);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(hdev-&gt;dev, "CPU queue test failed, error %d\n", rc);</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'>+void *hl_fw_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size,</div><div class='add'>+						dma_addr_t *dma_handle)</div><div class='add'>+{</div><div class='add'>+	u64 kernel_addr;</div><div class='add'>+</div><div class='add'>+	/* roundup to HL_CPU_PKT_SIZE */</div><div class='add'>+	size = (size + (HL_CPU_PKT_SIZE - 1)) &amp; HL_CPU_PKT_MASK;</div><div class='add'>+</div><div class='add'>+	kernel_addr = gen_pool_alloc(hdev-&gt;cpu_accessible_dma_pool, size);</div><div class='add'>+</div><div class='add'>+	*dma_handle = hdev-&gt;cpu_accessible_dma_address +</div><div class='add'>+		(kernel_addr - (u64) (uintptr_t) hdev-&gt;cpu_accessible_dma_mem);</div><div class='add'>+</div><div class='add'>+	return (void *) (uintptr_t) kernel_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hl_fw_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,</div><div class='add'>+					void *vaddr)</div><div class='add'>+{</div><div class='add'>+	/* roundup to HL_CPU_PKT_SIZE */</div><div class='add'>+	size = (size + (HL_CPU_PKT_SIZE - 1)) &amp; HL_CPU_PKT_MASK;</div><div class='add'>+</div><div class='add'>+	gen_pool_free(hdev-&gt;cpu_accessible_dma_pool, (u64) (uintptr_t) vaddr,</div><div class='add'>+			size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hl_fw_send_heartbeat(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct armcp_packet hb_pkt = {};</div><div class='add'>+	long result;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hb_pkt.ctl = cpu_to_le32(ARMCP_PACKET_TEST &lt;&lt;</div><div class='add'>+					ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='add'>+	hb_pkt.value = cpu_to_le64(ARMCP_PACKET_FENCE_VAL);</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;hb_pkt,</div><div class='add'>+			sizeof(hb_pkt), HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='add'>+</div><div class='add'>+	if ((rc) || (result != ARMCP_PACKET_FENCE_VAL))</div><div class='add'>+		rc = -EIO;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hl_fw_armcp_info_get(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	struct armcp_packet pkt = {};</div><div class='add'>+	void *armcp_info_cpu_addr;</div><div class='add'>+	dma_addr_t armcp_info_dma_addr;</div><div class='add'>+	long result;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	armcp_info_cpu_addr =</div><div class='add'>+			hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev,</div><div class='add'>+					sizeof(struct armcp_info),</div><div class='add'>+					&amp;armcp_info_dma_addr);</div><div class='add'>+	if (!armcp_info_cpu_addr) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to allocate DMA memory for ArmCP info packet\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(armcp_info_cpu_addr, 0, sizeof(struct armcp_info));</div><div class='add'>+</div><div class='add'>+	pkt.ctl = cpu_to_le32(ARMCP_PACKET_INFO_GET &lt;&lt;</div><div class='add'>+				ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='add'>+	pkt.addr = cpu_to_le64(armcp_info_dma_addr);</div><div class='add'>+	pkt.data_max_size = cpu_to_le32(sizeof(struct armcp_info));</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt, sizeof(pkt),</div><div class='add'>+					HL_ARMCP_INFO_TIMEOUT_USEC, &amp;result);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to send armcp info pkt, error %d\n", rc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;prop-&gt;armcp_info, armcp_info_cpu_addr,</div><div class='add'>+			sizeof(prop-&gt;armcp_info));</div><div class='add'>+</div><div class='add'>+	rc = hl_build_hwmon_channel_info(hdev, prop-&gt;armcp_info.sensors);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to build hwmon channel info, error %d\n", 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'>+out:</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev,</div><div class='add'>+			sizeof(struct armcp_info), armcp_info_cpu_addr);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hl_fw_get_eeprom_data(struct hl_device *hdev, void *data, size_t max_size)</div><div class='add'>+{</div><div class='add'>+	struct armcp_packet pkt = {};</div><div class='add'>+	void *eeprom_info_cpu_addr;</div><div class='add'>+	dma_addr_t eeprom_info_dma_addr;</div><div class='add'>+	long result;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	eeprom_info_cpu_addr =</div><div class='add'>+			hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev,</div><div class='add'>+					max_size, &amp;eeprom_info_dma_addr);</div><div class='add'>+	if (!eeprom_info_cpu_addr) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to allocate DMA memory for EEPROM info packet\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(eeprom_info_cpu_addr, 0, max_size);</div><div class='add'>+</div><div class='add'>+	pkt.ctl = cpu_to_le32(ARMCP_PACKET_EEPROM_DATA_GET &lt;&lt;</div><div class='add'>+				ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='add'>+	pkt.addr = cpu_to_le64(eeprom_info_dma_addr);</div><div class='add'>+	pkt.data_max_size = cpu_to_le32(max_size);</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt, sizeof(pkt),</div><div class='add'>+			HL_ARMCP_EEPROM_TIMEOUT_USEC, &amp;result);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to send armcp EEPROM pkt, error %d\n", rc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* result contains the actual size */</div><div class='add'>+	memcpy(data, eeprom_info_cpu_addr, min((size_t)result, max_size));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev, max_size,</div><div class='add'>+			eeprom_info_cpu_addr);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/habanalabs/goya/Makefile b/drivers/misc/habanalabs/goya/Makefile<br/>index e458e5ba500b..131432f677e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/goya/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='ctx'> subdir-ccflags-y += -I$(src)</div><div class='ctx'> </div><div class='del'>-HL_GOYA_FILES :=  goya/goya.o goya/goya_security.o goya/goya_hwmgr.o</div><div class='add'>+HL_GOYA_FILES :=  goya/goya.o goya/goya_security.o goya/goya_hwmgr.o \</div><div class='add'>+	goya/goya_coresight.o</div><div class='head'>diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c<br/>index 238dd57c541b..a582e29c1ee4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goya.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goya.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goya.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/goya/goya.c</a></div><div class='hunk'>@@ -12,10 +12,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/genalloc.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon.h&gt;</div><div class='ctx'> #include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='del'>-#include &lt;linux/io-64-nonatomic-hi-lo.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * GOYA security scheme:</div><div class='hunk'>@@ -71,7 +69,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define GOYA_MMU_REGS_NUM		61</div><div class='add'>+#define GOYA_MMU_REGS_NUM		63</div><div class='ctx'> </div><div class='ctx'> #define GOYA_DMA_POOL_BLK_SIZE		0x100		/* 256 bytes */</div><div class='ctx'> </div><div class='hunk'>@@ -80,15 +78,12 @@</div><div class='ctx'> #define GOYA_RESET_WAIT_MSEC		1		/* 1ms */</div><div class='ctx'> #define GOYA_CPU_RESET_WAIT_MSEC	100		/* 100ms */</div><div class='ctx'> #define GOYA_PLDM_RESET_WAIT_MSEC	1000		/* 1s */</div><div class='del'>-#define GOYA_CPU_TIMEOUT_USEC		10000000	/* 10s */</div><div class='ctx'> #define GOYA_TEST_QUEUE_WAIT_USEC	100000		/* 100ms */</div><div class='ctx'> #define GOYA_PLDM_MMU_TIMEOUT_USEC	(MMU_CONFIG_TIMEOUT_USEC * 100)</div><div class='ctx'> #define GOYA_PLDM_QMAN0_TIMEOUT_USEC	(HL_DEVICE_TIMEOUT_USEC * 30)</div><div class='ctx'> </div><div class='ctx'> #define GOYA_QMAN0_FENCE_VAL		0xD169B243</div><div class='ctx'> </div><div class='del'>-#define GOYA_MAX_INITIATORS		20</div><div class='del'>-</div><div class='ctx'> #define GOYA_MAX_STRING_LEN		20</div><div class='ctx'> </div><div class='ctx'> #define GOYA_CB_POOL_CB_CNT		512</div><div class='hunk'>@@ -173,12 +168,12 @@ static u64 goya_mmu_regs[GOYA_MMU_REGS_NUM] = {</div><div class='ctx'> 	mmMME_SBA_CONTROL_DATA,</div><div class='ctx'> 	mmMME_SBB_CONTROL_DATA,</div><div class='ctx'> 	mmMME_SBC_CONTROL_DATA,</div><div class='del'>-	mmMME_WBC_CONTROL_DATA</div><div class='add'>+	mmMME_WBC_CONTROL_DATA,</div><div class='add'>+	mmPCIE_WRAP_PSOC_ARUSER,</div><div class='add'>+	mmPCIE_WRAP_PSOC_AWUSER</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define GOYA_ASYC_EVENT_GROUP_NON_FATAL_SIZE 121</div><div class='del'>-</div><div class='del'>-static u32 goya_non_fatal_events[GOYA_ASYC_EVENT_GROUP_NON_FATAL_SIZE] = {</div><div class='add'>+static u32 goya_all_events[] = {</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_IF,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC0_ECC,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC1_ECC,</div><div class='hunk'>@@ -302,14 +297,7 @@ static u32 goya_non_fatal_events[GOYA_ASYC_EVENT_GROUP_NON_FATAL_SIZE] = {</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_DMA_BM_CH4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int goya_armcp_info_get(struct hl_device *hdev);</div><div class='del'>-static void goya_mmu_prepare(struct hl_device *hdev, u32 asid);</div><div class='del'>-static int goya_mmu_clear_pgt_range(struct hl_device *hdev);</div><div class='del'>-static int goya_mmu_set_dram_default_page(struct hl_device *hdev);</div><div class='del'>-static int goya_mmu_update_asid_hop0_addr(struct hl_device *hdev, u32 asid,</div><div class='del'>-					u64 phys_addr);</div><div class='del'>-</div><div class='del'>-static void goya_get_fixed_properties(struct hl_device *hdev)</div><div class='add'>+void goya_get_fixed_properties(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -357,7 +345,6 @@ static void goya_get_fixed_properties(struct hl_device *hdev)</div><div class='ctx'> 	prop-&gt;mmu_hop0_tables_total_size = HOP0_TABLES_TOTAL_SIZE;</div><div class='ctx'> 	prop-&gt;dram_page_size = PAGE_SIZE_2MB;</div><div class='ctx'> </div><div class='del'>-	prop-&gt;host_phys_base_address = HOST_PHYS_BASE;</div><div class='ctx'> 	prop-&gt;va_space_host_start_address = VA_HOST_SPACE_START;</div><div class='ctx'> 	prop-&gt;va_space_host_end_address = VA_HOST_SPACE_END;</div><div class='ctx'> 	prop-&gt;va_space_dram_start_address = VA_DDR_SPACE_START;</div><div class='hunk'>@@ -367,24 +354,13 @@ static void goya_get_fixed_properties(struct hl_device *hdev)</div><div class='ctx'> 	prop-&gt;cfg_size = CFG_SIZE;</div><div class='ctx'> 	prop-&gt;max_asid = MAX_ASID;</div><div class='ctx'> 	prop-&gt;num_of_events = GOYA_ASYNC_EVENT_ID_SIZE;</div><div class='add'>+	prop-&gt;high_pll = PLL_HIGH_DEFAULT;</div><div class='ctx'> 	prop-&gt;cb_pool_cb_cnt = GOYA_CB_POOL_CB_CNT;</div><div class='ctx'> 	prop-&gt;cb_pool_cb_size = GOYA_CB_POOL_CB_SIZE;</div><div class='ctx'> 	prop-&gt;max_power_default = MAX_POWER_DEFAULT;</div><div class='ctx'> 	prop-&gt;tpc_enabled_mask = TPC_ENABLED_MASK;</div><div class='del'>-</div><div class='del'>-	prop-&gt;high_pll = PLL_HIGH_DEFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int goya_send_pci_access_msg(struct hl_device *hdev, u32 opcode)</div><div class='del'>-{</div><div class='del'>-	struct armcp_packet pkt;</div><div class='del'>-</div><div class='del'>-	memset(&amp;pkt, 0, sizeof(pkt));</div><div class='del'>-</div><div class='del'>-	pkt.ctl = cpu_to_le32(opcode &lt;&lt; ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='del'>-</div><div class='del'>-	return hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt,</div><div class='del'>-			sizeof(pkt), HL_DEVICE_TIMEOUT_USEC, NULL);</div><div class='add'>+	prop-&gt;pcie_dbi_base_address = mmPCIE_DBI_BASE;</div><div class='add'>+	prop-&gt;pcie_aux_dbi_reg_addr = CFG_BASE + mmPCIE_AUX_DBI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -398,199 +374,40 @@ int goya_send_pci_access_msg(struct hl_device *hdev, u32 opcode)</div><div class='ctx'>  */</div><div class='ctx'> static int goya_pci_bars_map(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	static const char * const name[] = {"SRAM_CFG", "MSIX", "DDR"};</div><div class='add'>+	bool is_wc[3] = {false, false, true};</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = pci_request_regions(pdev, HL_NAME);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Cannot obtain PCI resources\n");</div><div class='add'>+	rc = hl_pci_bars_map(hdev, name, is_wc);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID] =</div><div class='del'>-			pci_ioremap_bar(pdev, SRAM_CFG_BAR_ID);</div><div class='del'>-	if (!hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID]) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "pci_ioremap_bar failed for CFG\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_release_regions;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdev-&gt;pcie_bar[MSIX_BAR_ID] = pci_ioremap_bar(pdev, MSIX_BAR_ID);</div><div class='del'>-	if (!hdev-&gt;pcie_bar[MSIX_BAR_ID]) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "pci_ioremap_bar failed for MSIX\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_unmap_sram_cfg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdev-&gt;pcie_bar[DDR_BAR_ID] = pci_ioremap_wc_bar(pdev, DDR_BAR_ID);</div><div class='del'>-	if (!hdev-&gt;pcie_bar[DDR_BAR_ID]) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "pci_ioremap_bar failed for DDR\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_unmap_msix;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;rmmio = hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID] +</div><div class='del'>-				(CFG_BASE - SRAM_BASE_ADDR);</div><div class='add'>+			(CFG_BASE - SRAM_BASE_ADDR);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_unmap_msix:</div><div class='del'>-	iounmap(hdev-&gt;pcie_bar[MSIX_BAR_ID]);</div><div class='del'>-err_unmap_sram_cfg:</div><div class='del'>-	iounmap(hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID]);</div><div class='del'>-err_release_regions:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * goya_pci_bars_unmap - Unmap PCI BARS of Goya device</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to hl_device structure</div><div class='del'>- *</div><div class='del'>- * Release all PCI BARS and unmap their virtual addresses</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void goya_pci_bars_unmap(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='del'>-</div><div class='del'>-	iounmap(hdev-&gt;pcie_bar[DDR_BAR_ID]);</div><div class='del'>-	iounmap(hdev-&gt;pcie_bar[MSIX_BAR_ID]);</div><div class='del'>-	iounmap(hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID]);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * goya_elbi_write - Write through the ELBI interface</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to hl_device structure</div><div class='del'>- *</div><div class='del'>- * return 0 on success, -1 on failure</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int goya_elbi_write(struct hl_device *hdev, u64 addr, u32 data)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='del'>-	ktime_t timeout;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* Clear previous status */</div><div class='del'>-	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_STS, 0);</div><div class='del'>-</div><div class='del'>-	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_ADDR, (u32) addr);</div><div class='del'>-	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_DATA, data);</div><div class='del'>-	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_CTRL,</div><div class='del'>-				PCI_CONFIG_ELBI_CTRL_WRITE);</div><div class='del'>-</div><div class='del'>-	timeout = ktime_add_ms(ktime_get(), 10);</div><div class='del'>-	for (;;) {</div><div class='del'>-		pci_read_config_dword(pdev, mmPCI_CONFIG_ELBI_STS, &amp;val);</div><div class='del'>-		if (val &amp; PCI_CONFIG_ELBI_STS_MASK)</div><div class='del'>-			break;</div><div class='del'>-		if (ktime_compare(ktime_get(), timeout) &gt; 0) {</div><div class='del'>-			pci_read_config_dword(pdev, mmPCI_CONFIG_ELBI_STS,</div><div class='del'>-						&amp;val);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		usleep_range(300, 500);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((val &amp; PCI_CONFIG_ELBI_STS_MASK) == PCI_CONFIG_ELBI_STS_DONE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (val &amp; PCI_CONFIG_ELBI_STS_ERR) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Error writing to ELBI\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(val &amp; PCI_CONFIG_ELBI_STS_MASK)) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "ELBI write didn't finish in time\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_err(hdev-&gt;dev, "ELBI write has undefined bits in status\n");</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * goya_iatu_write - iatu write routine</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to hl_device structure</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int goya_iatu_write(struct hl_device *hdev, u32 addr, u32 data)</div><div class='del'>-{</div><div class='del'>-	u32 dbi_offset;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	dbi_offset = addr &amp; 0xFFF;</div><div class='del'>-</div><div class='del'>-	rc = goya_elbi_write(hdev, CFG_BASE + mmPCIE_AUX_DBI, 0x00300000);</div><div class='del'>-	rc |= goya_elbi_write(hdev, mmPCIE_DBI_BASE + dbi_offset, data);</div><div class='del'>-</div><div class='del'>-	if (rc)</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'>-static void goya_reset_link_through_bridge(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='del'>-	struct pci_dev *parent_port;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	parent_port = pdev-&gt;bus-&gt;self;</div><div class='del'>-	pci_read_config_word(parent_port, PCI_BRIDGE_CONTROL, &amp;val);</div><div class='del'>-	val |= PCI_BRIDGE_CTL_BUS_RESET;</div><div class='del'>-	pci_write_config_word(parent_port, PCI_BRIDGE_CONTROL, val);</div><div class='del'>-	ssleep(1);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~(PCI_BRIDGE_CTL_BUS_RESET);</div><div class='del'>-	pci_write_config_word(parent_port, PCI_BRIDGE_CONTROL, val);</div><div class='del'>-	ssleep(3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * goya_set_ddr_bar_base - set DDR bar to map specific device address</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to hl_device structure</div><div class='del'>- * @addr: address in DDR. Must be aligned to DDR bar size</div><div class='del'>- *</div><div class='del'>- * This function configures the iATU so that the DDR bar will start at the</div><div class='del'>- * specified addr.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int goya_set_ddr_bar_base(struct hl_device *hdev, u64 addr)</div><div class='add'>+static u64 goya_set_ddr_bar_base(struct hl_device *hdev, u64 addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='add'>+	u64 old_addr = addr;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((goya) &amp;&amp; (goya-&gt;ddr_bar_cur_addr == addr))</div><div class='del'>-		return 0;</div><div class='add'>+		return old_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* Inbound Region 1 - Bar 4 - Point to DDR */</div><div class='del'>-	rc = goya_iatu_write(hdev, 0x314, lower_32_bits(addr));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x318, upper_32_bits(addr));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x300, 0);</div><div class='del'>-	/* Enable + Bar match + match enable + Bar 4 */</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x304, 0xC0080400);</div><div class='del'>-</div><div class='del'>-	/* Return the DBI window to the default location */</div><div class='del'>-	rc |= goya_elbi_write(hdev, CFG_BASE + mmPCIE_AUX_DBI, 0);</div><div class='del'>-	rc |= goya_elbi_write(hdev, CFG_BASE + mmPCIE_AUX_DBI_32, 0);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "failed to map DDR bar to 0x%08llx\n", addr);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	rc = hl_pci_set_dram_bar_base(hdev, 1, 4, addr);</div><div class='add'>+	if (rc)</div><div class='add'>+		return U64_MAX;</div><div class='ctx'> </div><div class='del'>-	if (goya)</div><div class='add'>+	if (goya) {</div><div class='add'>+		old_addr = goya-&gt;ddr_bar_cur_addr;</div><div class='ctx'> 		goya-&gt;ddr_bar_cur_addr = addr;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return old_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -603,40 +420,8 @@ static int goya_set_ddr_bar_base(struct hl_device *hdev, u64 addr)</div><div class='ctx'>  */</div><div class='ctx'> static int goya_init_iatu(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* Inbound Region 0 - Bar 0 - Point to SRAM_BASE_ADDR */</div><div class='del'>-	rc  = goya_iatu_write(hdev, 0x114, lower_32_bits(SRAM_BASE_ADDR));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x118, upper_32_bits(SRAM_BASE_ADDR));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x100, 0);</div><div class='del'>-	/* Enable + Bar match + match enable */</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x104, 0xC0080000);</div><div class='del'>-</div><div class='del'>-	/* Inbound Region 1 - Bar 4 - Point to DDR */</div><div class='del'>-	rc |= goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE);</div><div class='del'>-</div><div class='del'>-	/* Outbound Region 0 - Point to Host */</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x008, lower_32_bits(HOST_PHYS_BASE));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x00C, upper_32_bits(HOST_PHYS_BASE));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x010,</div><div class='del'>-		lower_32_bits(HOST_PHYS_BASE + HOST_PHYS_SIZE - 1));</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x014, 0);</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x018, 0);</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x020,</div><div class='del'>-		upper_32_bits(HOST_PHYS_BASE + HOST_PHYS_SIZE - 1));</div><div class='del'>-	/* Increase region size */</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x000, 0x00002000);</div><div class='del'>-	/* Enable */</div><div class='del'>-	rc |= goya_iatu_write(hdev, 0x004, 0x80000000);</div><div class='del'>-</div><div class='del'>-	/* Return the DBI window to the default location */</div><div class='del'>-	rc |= goya_elbi_write(hdev, CFG_BASE + mmPCIE_AUX_DBI, 0);</div><div class='del'>-	rc |= goya_elbi_write(hdev, CFG_BASE + mmPCIE_AUX_DBI_32, 0);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return hl_pci_init_iatu(hdev, SRAM_BASE_ADDR, DRAM_PHYS_BASE,</div><div class='add'>+				HOST_PHYS_BASE, HOST_PHYS_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -682,52 +467,9 @@ static int goya_early_init(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	prop-&gt;dram_pci_bar_size = pci_resource_len(pdev, DDR_BAR_ID);</div><div class='ctx'> </div><div class='del'>-	/* set DMA mask for GOYA */</div><div class='del'>-	rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_warn(hdev-&gt;dev, "Unable to set pci dma mask to 39 bits\n");</div><div class='del'>-		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (rc) {</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"Unable to set pci dma mask to 32 bits\n");</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(39));</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_warn(hdev-&gt;dev,</div><div class='del'>-			"Unable to set pci consistent dma mask to 39 bits\n");</div><div class='del'>-		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (rc) {</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"Unable to set pci consistent dma mask to 32 bits\n");</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;reset_pcilink)</div><div class='del'>-		goya_reset_link_through_bridge(hdev);</div><div class='del'>-</div><div class='del'>-	rc = pci_enable_device_mem(pdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "can't enable PCI device\n");</div><div class='add'>+	rc = hl_pci_init(hdev, 39);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	rc = goya_init_iatu(hdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to initialize iATU\n");</div><div class='del'>-		goto disable_device;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = goya_pci_bars_map(hdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to initialize PCI BARS\n");</div><div class='del'>-		goto disable_device;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!hdev-&gt;pldm) {</div><div class='ctx'> 		val = RREG32(mmPSOC_GLOBAL_CONF_BOOT_STRAP_PINS);</div><div class='hunk'>@@ -737,12 +479,6 @@ static int goya_early_init(struct hl_device *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-disable_device:</div><div class='del'>-	pci_clear_master(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -755,14 +491,33 @@ disable_device:</div><div class='ctx'>  */</div><div class='ctx'> static int goya_early_fini(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	goya_pci_bars_unmap(hdev);</div><div class='del'>-</div><div class='del'>-	pci_clear_master(hdev-&gt;pdev);</div><div class='del'>-	pci_disable_device(hdev-&gt;pdev);</div><div class='add'>+	hl_pci_fini(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void goya_mmu_prepare_reg(struct hl_device *hdev, u64 reg, u32 asid)</div><div class='add'>+{</div><div class='add'>+	/* mask to zero the MMBP and ASID bits */</div><div class='add'>+	WREG32_AND(reg, ~0x7FF);</div><div class='add'>+	WREG32_OR(reg, asid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void goya_qman0_set_security(struct hl_device *hdev, bool secure)</div><div class='add'>+{</div><div class='add'>+	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='add'>+</div><div class='add'>+	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (secure)</div><div class='add'>+		WREG32(mmDMA_QM_0_GLBL_PROT, QMAN_DMA_FULLY_TRUSTED);</div><div class='add'>+	else</div><div class='add'>+		WREG32(mmDMA_QM_0_GLBL_PROT, QMAN_DMA_PARTLY_TRUSTED);</div><div class='add'>+</div><div class='add'>+	RREG32(mmDMA_QM_0_GLBL_PROT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * goya_fetch_psoc_frequency - Fetch PSOC frequency values</div><div class='ctx'>  *</div><div class='hunk'>@@ -779,20 +534,12 @@ static void goya_fetch_psoc_frequency(struct hl_device *hdev)</div><div class='ctx'> 	prop-&gt;psoc_pci_pll_div_factor = RREG32(mmPSOC_PCI_PLL_DIV_FACTOR_1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * goya_late_init - GOYA late initialization code</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to hl_device structure</div><div class='del'>- *</div><div class='del'>- * Get ArmCP info and send message to CPU to enable PCI access</div><div class='del'>- */</div><div class='del'>-static int goya_late_init(struct hl_device *hdev)</div><div class='add'>+int goya_late_init(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='del'>-	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = goya-&gt;armcp_info_get(hdev);</div><div class='add'>+	rc = goya_armcp_info_get(hdev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Failed to get armcp info\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -804,7 +551,7 @@ static int goya_late_init(struct hl_device *hdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	WREG32(mmMMU_LOG2_DDR_SIZE, ilog2(prop-&gt;dram_size));</div><div class='ctx'> </div><div class='del'>-	rc = goya_send_pci_access_msg(hdev, ARMCP_PACKET_ENABLE_PCI_ACCESS);</div><div class='add'>+	rc = hl_fw_send_pci_access_msg(hdev, ARMCP_PACKET_ENABLE_PCI_ACCESS);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Failed to enable PCI access from CPU\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -830,7 +577,7 @@ static int goya_late_init(struct hl_device *hdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> disable_pci_access:</div><div class='del'>-	goya_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);</div><div class='add'>+	hl_fw_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -879,9 +626,6 @@ static int goya_sw_init(struct hl_device *hdev)</div><div class='ctx'> 	if (!goya)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	goya-&gt;test_cpu_queue = goya_test_cpu_queue;</div><div class='del'>-	goya-&gt;armcp_info_get = goya_armcp_info_get;</div><div class='del'>-</div><div class='ctx'> 	/* according to goya_init_iatu */</div><div class='ctx'> 	goya-&gt;ddr_bar_cur_addr = DRAM_PHYS_BASE;</div><div class='ctx'> </div><div class='hunk'>@@ -901,45 +645,43 @@ static int goya_sw_init(struct hl_device *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;cpu_accessible_dma_mem =</div><div class='del'>-			hdev-&gt;asic_funcs-&gt;dma_alloc_coherent(hdev,</div><div class='del'>-					CPU_ACCESSIBLE_MEM_SIZE,</div><div class='add'>+			hdev-&gt;asic_funcs-&gt;asic_dma_alloc_coherent(hdev,</div><div class='add'>+					HL_CPU_ACCESSIBLE_MEM_SIZE,</div><div class='ctx'> 					&amp;hdev-&gt;cpu_accessible_dma_address,</div><div class='ctx'> 					GFP_KERNEL | __GFP_ZERO);</div><div class='ctx'> </div><div class='ctx'> 	if (!hdev-&gt;cpu_accessible_dma_mem) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"failed to allocate %d of dma memory for CPU accessible memory space\n",</div><div class='del'>-			CPU_ACCESSIBLE_MEM_SIZE);</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto free_dma_pool;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;cpu_accessible_dma_pool = gen_pool_create(CPU_PKT_SHIFT, -1);</div><div class='add'>+	hdev-&gt;cpu_accessible_dma_pool = gen_pool_create(HL_CPU_PKT_SHIFT, -1);</div><div class='ctx'> 	if (!hdev-&gt;cpu_accessible_dma_pool) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='ctx'> 			"Failed to create CPU accessible DMA pool\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='del'>-		goto free_cpu_pq_dma_mem;</div><div class='add'>+		goto free_cpu_dma_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = gen_pool_add(hdev-&gt;cpu_accessible_dma_pool,</div><div class='ctx'> 				(uintptr_t) hdev-&gt;cpu_accessible_dma_mem,</div><div class='del'>-				CPU_ACCESSIBLE_MEM_SIZE, -1);</div><div class='add'>+				HL_CPU_ACCESSIBLE_MEM_SIZE, -1);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='ctx'> 			"Failed to add memory to CPU accessible DMA pool\n");</div><div class='ctx'> 		rc = -EFAULT;</div><div class='del'>-		goto free_cpu_pq_pool;</div><div class='add'>+		goto free_cpu_accessible_dma_pool;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;goya-&gt;hw_queues_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-free_cpu_pq_pool:</div><div class='add'>+free_cpu_accessible_dma_pool:</div><div class='ctx'> 	gen_pool_destroy(hdev-&gt;cpu_accessible_dma_pool);</div><div class='del'>-free_cpu_pq_dma_mem:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, CPU_ACCESSIBLE_MEM_SIZE,</div><div class='add'>+free_cpu_dma_mem:</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_free_coherent(hdev,</div><div class='add'>+			HL_CPU_ACCESSIBLE_MEM_SIZE,</div><div class='ctx'> 			hdev-&gt;cpu_accessible_dma_mem,</div><div class='ctx'> 			hdev-&gt;cpu_accessible_dma_address);</div><div class='ctx'> free_dma_pool:</div><div class='hunk'>@@ -962,7 +704,8 @@ static int goya_sw_fini(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	gen_pool_destroy(hdev-&gt;cpu_accessible_dma_pool);</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, CPU_ACCESSIBLE_MEM_SIZE,</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_free_coherent(hdev,</div><div class='add'>+			HL_CPU_ACCESSIBLE_MEM_SIZE,</div><div class='ctx'> 			hdev-&gt;cpu_accessible_dma_mem,</div><div class='ctx'> 			hdev-&gt;cpu_accessible_dma_address);</div><div class='ctx'> </div><div class='hunk'>@@ -1056,11 +799,10 @@ static void goya_init_dma_ch(struct hl_device *hdev, int dma_id)</div><div class='ctx'>  * Initialize the H/W registers of the QMAN DMA channels</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static void goya_init_dma_qmans(struct hl_device *hdev)</div><div class='add'>+void goya_init_dma_qmans(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	struct hl_hw_queue *q;</div><div class='del'>-	dma_addr_t bus_address;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (goya-&gt;hw_cap_initialized &amp; HW_CAP_DMA)</div><div class='hunk'>@@ -1069,10 +811,7 @@ static void goya_init_dma_qmans(struct hl_device *hdev)</div><div class='ctx'> 	q = &amp;hdev-&gt;kernel_queues[0];</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; NUMBER_OF_EXT_HW_QUEUES ; i++, q++) {</div><div class='del'>-		bus_address = q-&gt;bus_address +</div><div class='del'>-				hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-</div><div class='del'>-		goya_init_dma_qman(hdev, i, bus_address);</div><div class='add'>+		goya_init_dma_qman(hdev, i, q-&gt;bus_address);</div><div class='ctx'> 		goya_init_dma_ch(hdev, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1201,15 +940,6 @@ static int goya_stop_external_queues(struct hl_device *hdev)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_resume_external_queues(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-	WREG32(mmDMA_QM_0_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmDMA_QM_1_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmDMA_QM_2_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmDMA_QM_3_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmDMA_QM_4_GLBL_CFG1, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * goya_init_cpu_queues - Initialize PQ/CQ/EQ of CPU</div><div class='ctx'>  *</div><div class='hunk'>@@ -1218,11 +948,10 @@ static void goya_resume_external_queues(struct hl_device *hdev)</div><div class='ctx'>  * Returns 0 on success</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int goya_init_cpu_queues(struct hl_device *hdev)</div><div class='add'>+int goya_init_cpu_queues(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	struct hl_eq *eq;</div><div class='del'>-	dma_addr_t bus_address;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	struct hl_hw_queue *cpu_pq = &amp;hdev-&gt;kernel_queues[GOYA_QUEUE_ID_CPU_PQ];</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1235,23 +964,22 @@ static int goya_init_cpu_queues(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	eq = &amp;hdev-&gt;event_queue;</div><div class='ctx'> </div><div class='del'>-	bus_address = cpu_pq-&gt;bus_address +</div><div class='del'>-			hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_0, lower_32_bits(bus_address));</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_1, upper_32_bits(bus_address));</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_0,</div><div class='add'>+			lower_32_bits(cpu_pq-&gt;bus_address));</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_1,</div><div class='add'>+			upper_32_bits(cpu_pq-&gt;bus_address));</div><div class='ctx'> </div><div class='del'>-	bus_address = eq-&gt;bus_address + hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_2, lower_32_bits(bus_address));</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_3, upper_32_bits(bus_address));</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_2, lower_32_bits(eq-&gt;bus_address));</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_3, upper_32_bits(eq-&gt;bus_address));</div><div class='ctx'> </div><div class='del'>-	bus_address = hdev-&gt;cpu_accessible_dma_address +</div><div class='del'>-			hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_8, lower_32_bits(bus_address));</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_9, upper_32_bits(bus_address));</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_8,</div><div class='add'>+			lower_32_bits(hdev-&gt;cpu_accessible_dma_address));</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_9,</div><div class='add'>+			upper_32_bits(hdev-&gt;cpu_accessible_dma_address));</div><div class='ctx'> </div><div class='ctx'> 	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_5, HL_QUEUE_SIZE_IN_BYTES);</div><div class='ctx'> 	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_4, HL_EQ_SIZE_IN_BYTES);</div><div class='del'>-	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_10, CPU_ACCESSIBLE_MEM_SIZE);</div><div class='add'>+	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_10, HL_CPU_ACCESSIBLE_MEM_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Used for EQ CI */</div><div class='ctx'> 	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_6, 0);</div><div class='hunk'>@@ -1697,14 +1425,15 @@ static void goya_init_golden_registers(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Workaround for H2 #HW-23 bug</div><div class='del'>-	 * Set DMA max outstanding read requests to 240 on DMA CH 1. Set it</div><div class='del'>-	 * to 16 on KMD DMA</div><div class='del'>-	 * We need to limit only these DMAs because the user can only read</div><div class='add'>+	 * Set DMA max outstanding read requests to 240 on DMA CH 1.</div><div class='add'>+	 * This limitation is still large enough to not affect Gen4 bandwidth.</div><div class='add'>+	 * We need to only limit that DMA channel because the user can only read</div><div class='ctx'> 	 * from Host using DMA CH 1</div><div class='ctx'> 	 */</div><div class='del'>-	WREG32(mmDMA_CH_0_CFG0, 0x0fff0010);</div><div class='ctx'> 	WREG32(mmDMA_CH_1_CFG0, 0x0fff00F0);</div><div class='ctx'> </div><div class='add'>+	WREG32(mmTPC_PLL_CLK_RLX_0, 0x200020);</div><div class='add'>+</div><div class='ctx'> 	goya-&gt;hw_cap_initialized |= HW_CAP_GOLDEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1798,7 +1527,7 @@ static void goya_init_mme_cmdq(struct hl_device *hdev)</div><div class='ctx'> 	WREG32(mmMME_CMDQ_GLBL_CFG0, CMDQ_MME_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_init_mme_qmans(struct hl_device *hdev)</div><div class='add'>+void goya_init_mme_qmans(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	u32 so_base_lo, so_base_hi;</div><div class='hunk'>@@ -1905,7 +1634,7 @@ static void goya_init_tpc_cmdq(struct hl_device *hdev, int tpc_id)</div><div class='ctx'> 	WREG32(mmTPC0_CMDQ_GLBL_CFG0 + reg_off, CMDQ_TPC_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_init_tpc_qmans(struct hl_device *hdev)</div><div class='add'>+void goya_init_tpc_qmans(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	u32 so_base_lo, so_base_hi;</div><div class='hunk'>@@ -2178,36 +1907,6 @@ static int goya_stop_internal_queues(struct hl_device *hdev)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_resume_internal_queues(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-	WREG32(mmMME_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmMME_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC0_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC0_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC1_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC1_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC2_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC2_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC3_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC3_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC4_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC4_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC5_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC5_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC6_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC6_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-</div><div class='del'>-	WREG32(mmTPC7_QM_GLBL_CFG1, 0);</div><div class='del'>-	WREG32(mmTPC7_CMDQ_GLBL_CFG1, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void goya_dma_stall(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	WREG32(mmDMA_QM_0_GLBL_CFG1, 1 &lt;&lt; DMA_QM_0_GLBL_CFG1_DMA_STOP_SHIFT);</div><div class='hunk'>@@ -2262,10 +1961,10 @@ static int goya_enable_msix(struct hl_device *hdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = pci_irq_vector(hdev-&gt;pdev, EVENT_QUEUE_MSIX_IDX);</div><div class='add'>+	irq = pci_irq_vector(hdev-&gt;pdev, GOYA_EVENT_QUEUE_MSIX_IDX);</div><div class='ctx'> </div><div class='ctx'> 	rc = request_irq(irq, hl_irq_handler_eq, 0,</div><div class='del'>-			goya_irq_name[EVENT_QUEUE_MSIX_IDX],</div><div class='add'>+			goya_irq_name[GOYA_EVENT_QUEUE_MSIX_IDX],</div><div class='ctx'> 			&amp;hdev-&gt;event_queue);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Failed to request IRQ %d", irq);</div><div class='hunk'>@@ -2296,7 +1995,7 @@ static void goya_sync_irqs(struct hl_device *hdev)</div><div class='ctx'> 	for (i = 0 ; i &lt; hdev-&gt;asic_prop.completion_queues_count ; i++)</div><div class='ctx'> 		synchronize_irq(pci_irq_vector(hdev-&gt;pdev, i));</div><div class='ctx'> </div><div class='del'>-	synchronize_irq(pci_irq_vector(hdev-&gt;pdev, EVENT_QUEUE_MSIX_IDX));</div><div class='add'>+	synchronize_irq(pci_irq_vector(hdev-&gt;pdev, GOYA_EVENT_QUEUE_MSIX_IDX));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void goya_disable_msix(struct hl_device *hdev)</div><div class='hunk'>@@ -2309,7 +2008,7 @@ static void goya_disable_msix(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 	goya_sync_irqs(hdev);</div><div class='ctx'> </div><div class='del'>-	irq = pci_irq_vector(hdev-&gt;pdev, EVENT_QUEUE_MSIX_IDX);</div><div class='add'>+	irq = pci_irq_vector(hdev-&gt;pdev, GOYA_EVENT_QUEUE_MSIX_IDX);</div><div class='ctx'> 	free_irq(irq, &amp;hdev-&gt;event_queue);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; hdev-&gt;asic_prop.completion_queues_count ; i++) {</div><div class='hunk'>@@ -2369,67 +2068,45 @@ static void goya_halt_engines(struct hl_device *hdev, bool hard_reset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * goya_push_fw_to_device - Push FW code to device</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to hl_device structure</div><div class='add'>+ * goya_push_uboot_to_device() - Push u-boot FW code to device.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='ctx'>  *</div><div class='del'>- * Copy fw code from firmware file to device memory.</div><div class='del'>- * Returns 0 on success</div><div class='add'>+ * Copy u-boot fw code from firmware file to SRAM BAR.</div><div class='ctx'>  *</div><div class='add'>+ * Return: 0 on success, non-zero for failure.</div><div class='ctx'>  */</div><div class='del'>-static int goya_push_fw_to_device(struct hl_device *hdev, const char *fw_name,</div><div class='del'>-					void __iomem *dst)</div><div class='add'>+static int goya_push_uboot_to_device(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	const u64 *fw_data;</div><div class='del'>-	size_t fw_size, i;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = request_firmware(&amp;fw, fw_name, hdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to request %s\n", fw_name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fw_size = fw-&gt;size;</div><div class='del'>-	if ((fw_size % 4) != 0) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "illegal %s firmware size %zu\n",</div><div class='del'>-			fw_name, fw_size);</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(hdev-&gt;dev, "%s firmware size == %zu\n", fw_name, fw_size);</div><div class='del'>-</div><div class='del'>-	fw_data = (const u64 *) fw-&gt;data;</div><div class='add'>+	char fw_name[200];</div><div class='add'>+	void __iomem *dst;</div><div class='ctx'> </div><div class='del'>-	if ((fw-&gt;size % 8) != 0)</div><div class='del'>-		fw_size -= 8;</div><div class='add'>+	snprintf(fw_name, sizeof(fw_name), "habanalabs/goya/goya-u-boot.bin");</div><div class='add'>+	dst = hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID] + UBOOT_FW_OFFSET;</div><div class='ctx'> </div><div class='del'>-	for (i = 0 ; i &lt; fw_size ; i += 8, fw_data++, dst += 8) {</div><div class='del'>-		if (!(i &amp; (0x80000 - 1))) {</div><div class='del'>-			dev_dbg(hdev-&gt;dev,</div><div class='del'>-				"copied so far %zu out of %zu for %s firmware",</div><div class='del'>-				i, fw_size, fw_name);</div><div class='del'>-			usleep_range(20, 100);</div><div class='del'>-		}</div><div class='add'>+	return hl_fw_push_fw_to_device(hdev, fw_name, dst);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		writeq(*fw_data, dst);</div><div class='del'>-	}</div><div class='add'>+/*</div><div class='add'>+ * goya_push_linux_to_device() - Push LINUX FW code to device.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ *</div><div class='add'>+ * Copy LINUX fw code from firmware file to HBM BAR.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, non-zero for failure.</div><div class='add'>+ */</div><div class='add'>+static int goya_push_linux_to_device(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	char fw_name[200];</div><div class='add'>+	void __iomem *dst;</div><div class='ctx'> </div><div class='del'>-	if ((fw-&gt;size % 8) != 0)</div><div class='del'>-		writel(*(const u32 *) fw_data, dst);</div><div class='add'>+	snprintf(fw_name, sizeof(fw_name), "habanalabs/goya/goya-fit.itb");</div><div class='add'>+	dst = hdev-&gt;pcie_bar[DDR_BAR_ID] + LINUX_FW_OFFSET;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-	return rc;</div><div class='add'>+	return hl_fw_push_fw_to_device(hdev, fw_name, dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int goya_pldm_init_cpu(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	char fw_name[200];</div><div class='del'>-	void __iomem *dst;</div><div class='ctx'> 	u32 val, unit_rst_val;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -2447,15 +2124,11 @@ static int goya_pldm_init_cpu(struct hl_device *hdev)</div><div class='ctx'> 	WREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N, unit_rst_val);</div><div class='ctx'> 	val = RREG32(mmPSOC_GLOBAL_CONF_UNIT_RST_N);</div><div class='ctx'> </div><div class='del'>-	snprintf(fw_name, sizeof(fw_name), "habanalabs/goya/goya-u-boot.bin");</div><div class='del'>-	dst = hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID] + UBOOT_FW_OFFSET;</div><div class='del'>-	rc = goya_push_fw_to_device(hdev, fw_name, dst);</div><div class='add'>+	rc = goya_push_uboot_to_device(hdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	snprintf(fw_name, sizeof(fw_name), "habanalabs/goya/goya-fit.itb");</div><div class='del'>-	dst = hdev-&gt;pcie_bar[DDR_BAR_ID] + LINUX_FW_OFFSET;</div><div class='del'>-	rc = goya_push_fw_to_device(hdev, fw_name, dst);</div><div class='add'>+	rc = goya_push_linux_to_device(hdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -2517,8 +2190,6 @@ static void goya_read_device_fw_version(struct hl_device *hdev,</div><div class='ctx'> static int goya_init_cpu(struct hl_device *hdev, u32 cpu_timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='del'>-	char fw_name[200];</div><div class='del'>-	void __iomem *dst;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -2532,11 +2203,10 @@ static int goya_init_cpu(struct hl_device *hdev, u32 cpu_timeout)</div><div class='ctx'> 	 * Before pushing u-boot/linux to device, need to set the ddr bar to</div><div class='ctx'> 	 * base address of dram</div><div class='ctx'> 	 */</div><div class='del'>-	rc = goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE);</div><div class='del'>-	if (rc) {</div><div class='add'>+	if (goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE) == U64_MAX) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='ctx'> 			"failed to map DDR bar to DRAM base address\n");</div><div class='del'>-		return rc;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;pldm) {</div><div class='hunk'>@@ -2589,6 +2259,11 @@ static int goya_init_cpu(struct hl_device *hdev, u32 cpu_timeout)</div><div class='ctx'> 				"ARM status %d - DDR initialization failed\n",</div><div class='ctx'> 				status);</div><div class='ctx'> 			break;</div><div class='add'>+		case CPU_BOOT_STATUS_UBOOT_NOT_READY:</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"ARM status %d - u-boot stopped by user\n",</div><div class='add'>+				status);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='ctx'> 				"ARM status %d - Invalid status code\n",</div><div class='hunk'>@@ -2610,9 +2285,7 @@ static int goya_init_cpu(struct hl_device *hdev, u32 cpu_timeout)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(fw_name, sizeof(fw_name), "habanalabs/goya/goya-fit.itb");</div><div class='del'>-	dst = hdev-&gt;pcie_bar[DDR_BAR_ID] + LINUX_FW_OFFSET;</div><div class='del'>-	rc = goya_push_fw_to_device(hdev, fw_name, dst);</div><div class='add'>+	rc = goya_push_linux_to_device(hdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -2645,7 +2318,39 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_mmu_init(struct hl_device *hdev)</div><div class='add'>+static int goya_mmu_update_asid_hop0_addr(struct hl_device *hdev, u32 asid,</div><div class='add'>+						u64 phys_addr)</div><div class='add'>+{</div><div class='add'>+	u32 status, timeout_usec;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;pldm)</div><div class='add'>+		timeout_usec = GOYA_PLDM_MMU_TIMEOUT_USEC;</div><div class='add'>+	else</div><div class='add'>+		timeout_usec = MMU_CONFIG_TIMEOUT_USEC;</div><div class='add'>+</div><div class='add'>+	WREG32(MMU_HOP0_PA43_12, phys_addr &gt;&gt; MMU_HOP0_PA43_12_SHIFT);</div><div class='add'>+	WREG32(MMU_HOP0_PA49_44, phys_addr &gt;&gt; MMU_HOP0_PA49_44_SHIFT);</div><div class='add'>+	WREG32(MMU_ASID_BUSY, 0x80000000 | asid);</div><div class='add'>+</div><div class='add'>+	rc = hl_poll_timeout(</div><div class='add'>+		hdev,</div><div class='add'>+		MMU_ASID_BUSY,</div><div class='add'>+		status,</div><div class='add'>+		!(status &amp; 0x80000000),</div><div class='add'>+		1000,</div><div class='add'>+		timeout_usec);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Timeout during MMU hop0 config of asid %d\n", asid);</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 goya_mmu_init(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='hunk'>@@ -2736,12 +2441,12 @@ static int goya_hw_init(struct hl_device *hdev)</div><div class='ctx'> 	 * After CPU initialization is finished, change DDR bar mapping inside</div><div class='ctx'> 	 * iATU to point to the start address of the MMU page tables</div><div class='ctx'> 	 */</div><div class='del'>-	rc = goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE +</div><div class='del'>-		(MMU_PAGE_TABLES_ADDR &amp; ~(prop-&gt;dram_pci_bar_size - 0x1ull)));</div><div class='del'>-	if (rc) {</div><div class='add'>+	if (goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE +</div><div class='add'>+			(MMU_PAGE_TABLES_ADDR &amp;</div><div class='add'>+			~(prop-&gt;dram_pci_bar_size - 0x1ull))) == U64_MAX) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='ctx'> 			"failed to map DDR bar to MMU page tables\n");</div><div class='del'>-		return rc;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = goya_mmu_init(hdev);</div><div class='hunk'>@@ -2768,28 +2473,16 @@ static int goya_hw_init(struct hl_device *hdev)</div><div class='ctx'> 		goto disable_msix;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* CPU initialization is finished, we can now move to 48 bit DMA mask */</div><div class='del'>-	rc = pci_set_dma_mask(hdev-&gt;pdev, DMA_BIT_MASK(48));</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_warn(hdev-&gt;dev, "Unable to set pci dma mask to 48 bits\n");</div><div class='del'>-		rc = pci_set_dma_mask(hdev-&gt;pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (rc) {</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"Unable to set pci dma mask to 32 bits\n");</div><div class='del'>-			goto disable_pci_access;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = pci_set_consistent_dma_mask(hdev-&gt;pdev, DMA_BIT_MASK(48));</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_warn(hdev-&gt;dev,</div><div class='del'>-			"Unable to set pci consistent dma mask to 48 bits\n");</div><div class='del'>-		rc = pci_set_consistent_dma_mask(hdev-&gt;pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (rc) {</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"Unable to set pci consistent dma mask to 32 bits\n");</div><div class='add'>+	/*</div><div class='add'>+	 * Check if we managed to set the DMA mask to more then 32 bits. If so,</div><div class='add'>+	 * let's try to increase it again because in Goya we set the initial</div><div class='add'>+	 * dma mask to less then 39 bits so that the allocation of the memory</div><div class='add'>+	 * area for the device's cpu will be under 39 bits</div><div class='add'>+	 */</div><div class='add'>+	if (hdev-&gt;dma_mask &gt; 32) {</div><div class='add'>+		rc = hl_pci_set_dma_mask(hdev, 48);</div><div class='add'>+		if (rc)</div><div class='ctx'> 			goto disable_pci_access;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Perform read from the device to flush all MSI-X configuration */</div><div class='hunk'>@@ -2798,7 +2491,7 @@ static int goya_hw_init(struct hl_device *hdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> disable_pci_access:</div><div class='del'>-	goya_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);</div><div class='add'>+	hl_fw_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);</div><div class='ctx'> disable_msix:</div><div class='ctx'> 	goya_disable_msix(hdev);</div><div class='ctx'> disable_queues:</div><div class='hunk'>@@ -2905,21 +2598,7 @@ int goya_suspend(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = goya_stop_internal_queues(hdev);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "failed to stop internal queues\n");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = goya_stop_external_queues(hdev);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "failed to stop external queues\n");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = goya_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);</div><div class='add'>+	rc = hl_fw_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Failed to disable PCI access from CPU\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2928,15 +2607,7 @@ int goya_suspend(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> int goya_resume(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	goya_resume_external_queues(hdev);</div><div class='del'>-	goya_resume_internal_queues(hdev);</div><div class='del'>-</div><div class='del'>-	rc = goya_send_pci_access_msg(hdev, ARMCP_PACKET_ENABLE_PCI_ACCESS);</div><div class='del'>-	if (rc)</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to enable PCI access from CPU\n");</div><div class='del'>-	return rc;</div><div class='add'>+	return goya_init_iatu(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,</div><div class='hunk'>@@ -2955,7 +2626,7 @@ static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi)</div><div class='add'>+void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi)</div><div class='ctx'> {</div><div class='ctx'> 	u32 db_reg_offset, db_value;</div><div class='ctx'> 	bool invalid_queue = false;</div><div class='hunk'>@@ -3053,13 +2724,23 @@ void goya_flush_pq_write(struct hl_device *hdev, u64 *pq, u64 exp_val)</div><div class='ctx'> static void *goya_dma_alloc_coherent(struct hl_device *hdev, size_t size,</div><div class='ctx'> 					dma_addr_t *dma_handle, gfp_t flags)</div><div class='ctx'> {</div><div class='del'>-	return dma_alloc_coherent(&amp;hdev-&gt;pdev-&gt;dev, size, dma_handle, flags);</div><div class='add'>+	void *kernel_addr = dma_alloc_coherent(&amp;hdev-&gt;pdev-&gt;dev, size,</div><div class='add'>+						dma_handle, flags);</div><div class='add'>+</div><div class='add'>+	/* Shift to the device's base physical address of host memory */</div><div class='add'>+	if (kernel_addr)</div><div class='add'>+		*dma_handle += HOST_PHYS_BASE;</div><div class='add'>+</div><div class='add'>+	return kernel_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void goya_dma_free_coherent(struct hl_device *hdev, size_t size,</div><div class='ctx'> 					void *cpu_addr, dma_addr_t dma_handle)</div><div class='ctx'> {</div><div class='del'>-	dma_free_coherent(&amp;hdev-&gt;pdev-&gt;dev, size, cpu_addr, dma_handle);</div><div class='add'>+	/* Cancel the device's base physical address of host memory */</div><div class='add'>+	dma_addr_t fixed_dma_handle = dma_handle - HOST_PHYS_BASE;</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;hdev-&gt;pdev-&gt;dev, size, cpu_addr, fixed_dma_handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *goya_get_int_queue_base(struct hl_device *hdev, u32 queue_id,</div><div class='hunk'>@@ -3070,7 +2751,7 @@ void *goya_get_int_queue_base(struct hl_device *hdev, u32 queue_id,</div><div class='ctx'> </div><div class='ctx'> 	*dma_handle = hdev-&gt;asic_prop.sram_base_address;</div><div class='ctx'> </div><div class='del'>-	base = hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID];</div><div class='add'>+	base = (void *) hdev-&gt;pcie_bar[SRAM_CFG_BAR_ID];</div><div class='ctx'> </div><div class='ctx'> 	switch (queue_id) {</div><div class='ctx'> 	case GOYA_QUEUE_ID_MME:</div><div class='hunk'>@@ -3122,12 +2803,12 @@ void *goya_get_int_queue_base(struct hl_device *hdev, u32 queue_id,</div><div class='ctx'> </div><div class='ctx'> static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)</div><div class='ctx'> {</div><div class='del'>-	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	struct packet_msg_prot *fence_pkt;</div><div class='ctx'> 	u32 *fence_ptr;</div><div class='ctx'> 	dma_addr_t fence_dma_addr;</div><div class='ctx'> 	struct hl_cb *cb;</div><div class='ctx'> 	u32 tmp, timeout;</div><div class='add'>+	char buf[16] = {};</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;pldm)</div><div class='hunk'>@@ -3135,13 +2816,14 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)</div><div class='ctx'> 	else</div><div class='ctx'> 		timeout = HL_DEVICE_TIMEOUT_USEC;</div><div class='ctx'> </div><div class='del'>-	if (!hdev-&gt;asic_funcs-&gt;is_device_idle(hdev)) {</div><div class='add'>+	if (!hdev-&gt;asic_funcs-&gt;is_device_idle(hdev, buf, sizeof(buf))) {</div><div class='ctx'> 		dev_err_ratelimited(hdev-&gt;dev,</div><div class='del'>-			"Can't send KMD job on QMAN0 if device is not idle\n");</div><div class='add'>+			"Can't send KMD job on QMAN0 because %s is busy\n",</div><div class='add'>+			buf);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fence_ptr = hdev-&gt;asic_funcs-&gt;dma_pool_zalloc(hdev, 4, GFP_KERNEL,</div><div class='add'>+	fence_ptr = hdev-&gt;asic_funcs-&gt;asic_dma_pool_zalloc(hdev, 4, GFP_KERNEL,</div><div class='ctx'> 							&amp;fence_dma_addr);</div><div class='ctx'> 	if (!fence_ptr) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='hunk'>@@ -3151,10 +2833,7 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)</div><div class='ctx'> </div><div class='ctx'> 	*fence_ptr = 0;</div><div class='ctx'> </div><div class='del'>-	if (goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU) {</div><div class='del'>-		WREG32(mmDMA_QM_0_GLBL_PROT, QMAN_DMA_FULLY_TRUSTED);</div><div class='del'>-		RREG32(mmDMA_QM_0_GLBL_PROT);</div><div class='del'>-	}</div><div class='add'>+	goya_qman0_set_security(hdev, true);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * goya cs parser saves space for 2xpacket_msg_prot at end of CB. For</div><div class='hunk'>@@ -3172,8 +2851,7 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)</div><div class='ctx'> 			(1 &lt;&lt; GOYA_PKT_CTL_MB_SHIFT);</div><div class='ctx'> 	fence_pkt-&gt;ctl = cpu_to_le32(tmp);</div><div class='ctx'> 	fence_pkt-&gt;value = cpu_to_le32(GOYA_QMAN0_FENCE_VAL);</div><div class='del'>-	fence_pkt-&gt;addr = cpu_to_le64(fence_dma_addr +</div><div class='del'>-					hdev-&gt;asic_prop.host_phys_base_address);</div><div class='add'>+	fence_pkt-&gt;addr = cpu_to_le64(fence_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	rc = hl_hw_queue_send_cb_no_cmpl(hdev, GOYA_QUEUE_ID_DMA_0,</div><div class='ctx'> 					job-&gt;job_cb_size, cb-&gt;bus_address);</div><div class='hunk'>@@ -3193,13 +2871,10 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> free_fence_ptr:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_pool_free(hdev, (void *) fence_ptr,</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_pool_free(hdev, (void *) fence_ptr,</div><div class='ctx'> 					fence_dma_addr);</div><div class='ctx'> </div><div class='del'>-	if (goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU) {</div><div class='del'>-		WREG32(mmDMA_QM_0_GLBL_PROT, QMAN_DMA_PARTLY_TRUSTED);</div><div class='del'>-		RREG32(mmDMA_QM_0_GLBL_PROT);</div><div class='del'>-	}</div><div class='add'>+	goya_qman0_set_security(hdev, false);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -3208,10 +2883,6 @@ int goya_send_cpu_message(struct hl_device *hdev, u32 *msg, u16 len,</div><div class='ctx'> 				u32 timeout, long *result)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='del'>-	struct armcp_packet *pkt;</div><div class='del'>-	dma_addr_t pkt_dma_addr;</div><div class='del'>-	u32 tmp;</div><div class='del'>-	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_CPU_Q)) {</div><div class='ctx'> 		if (result)</div><div class='hunk'>@@ -3219,74 +2890,8 @@ int goya_send_cpu_message(struct hl_device *hdev, u32 *msg, u16 len,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (len &gt; CPU_CB_SIZE) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Invalid CPU message size of %d bytes\n",</div><div class='del'>-			len);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkt = hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev, len,</div><div class='del'>-								&amp;pkt_dma_addr);</div><div class='del'>-	if (!pkt) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to allocate DMA memory for packet to CPU\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(pkt, msg, len);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;hdev-&gt;send_cpu_message_lock);</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;disabled)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;device_cpu_disabled) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = hl_hw_queue_send_cb_no_cmpl(hdev, GOYA_QUEUE_ID_CPU_PQ, len,</div><div class='del'>-			pkt_dma_addr);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to send CB on CPU PQ (%d)\n", rc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = hl_poll_timeout_memory(hdev, (u64) (uintptr_t) &amp;pkt-&gt;fence,</div><div class='del'>-					timeout, &amp;tmp);</div><div class='del'>-</div><div class='del'>-	hl_hw_queue_inc_ci_kernel(hdev, GOYA_QUEUE_ID_CPU_PQ);</div><div class='del'>-</div><div class='del'>-	if (rc == -ETIMEDOUT) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Timeout while waiting for device CPU\n");</div><div class='del'>-		hdev-&gt;device_cpu_disabled = true;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp == ARMCP_PACKET_FENCE_VAL) {</div><div class='del'>-		u32 ctl = le32_to_cpu(pkt-&gt;ctl);</div><div class='del'>-</div><div class='del'>-		rc = (ctl &amp; ARMCP_PKT_CTL_RC_MASK) &gt;&gt; ARMCP_PKT_CTL_RC_SHIFT;</div><div class='del'>-		if (rc) {</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"F/W ERROR %d for CPU packet %d\n",</div><div class='del'>-				rc, (ctl &amp; ARMCP_PKT_CTL_OPCODE_MASK)</div><div class='del'>-						&gt;&gt; ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-		} else if (result) {</div><div class='del'>-			*result = (long) le64_to_cpu(pkt-&gt;result);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(hdev-&gt;dev, "CPU packet wrong fence value\n");</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;hdev-&gt;send_cpu_message_lock);</div><div class='del'>-</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev, len, pkt);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	return hl_fw_send_cpu_message(hdev, GOYA_QUEUE_ID_CPU_PQ, msg, len,</div><div class='add'>+					timeout, result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id)</div><div class='hunk'>@@ -3300,7 +2905,7 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id)</div><div class='ctx'> </div><div class='ctx'> 	fence_val = GOYA_QMAN0_FENCE_VAL;</div><div class='ctx'> </div><div class='del'>-	fence_ptr = hdev-&gt;asic_funcs-&gt;dma_pool_zalloc(hdev, 4, GFP_KERNEL,</div><div class='add'>+	fence_ptr = hdev-&gt;asic_funcs-&gt;asic_dma_pool_zalloc(hdev, 4, GFP_KERNEL,</div><div class='ctx'> 							&amp;fence_dma_addr);</div><div class='ctx'> 	if (!fence_ptr) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='hunk'>@@ -3310,7 +2915,7 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id)</div><div class='ctx'> </div><div class='ctx'> 	*fence_ptr = 0;</div><div class='ctx'> </div><div class='del'>-	fence_pkt = hdev-&gt;asic_funcs-&gt;dma_pool_zalloc(hdev,</div><div class='add'>+	fence_pkt = hdev-&gt;asic_funcs-&gt;asic_dma_pool_zalloc(hdev,</div><div class='ctx'> 					sizeof(struct packet_msg_prot),</div><div class='ctx'> 					GFP_KERNEL, &amp;pkt_dma_addr);</div><div class='ctx'> 	if (!fence_pkt) {</div><div class='hunk'>@@ -3325,8 +2930,7 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id)</div><div class='ctx'> 			(1 &lt;&lt; GOYA_PKT_CTL_MB_SHIFT);</div><div class='ctx'> 	fence_pkt-&gt;ctl = cpu_to_le32(tmp);</div><div class='ctx'> 	fence_pkt-&gt;value = cpu_to_le32(fence_val);</div><div class='del'>-	fence_pkt-&gt;addr = cpu_to_le64(fence_dma_addr +</div><div class='del'>-					hdev-&gt;asic_prop.host_phys_base_address);</div><div class='add'>+	fence_pkt-&gt;addr = cpu_to_le64(fence_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	rc = hl_hw_queue_send_cb_no_cmpl(hdev, hw_queue_id,</div><div class='ctx'> 					sizeof(struct packet_msg_prot),</div><div class='hunk'>@@ -3354,48 +2958,30 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> free_pkt:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_pool_free(hdev, (void *) fence_pkt,</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_pool_free(hdev, (void *) fence_pkt,</div><div class='ctx'> 					pkt_dma_addr);</div><div class='ctx'> free_fence_ptr:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_pool_free(hdev, (void *) fence_ptr,</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_pool_free(hdev, (void *) fence_ptr,</div><div class='ctx'> 					fence_dma_addr);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int goya_test_cpu_queue(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct armcp_packet test_pkt;</div><div class='del'>-	long result;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* cpu_queues_enable flag is always checked in send cpu message */</div><div class='del'>-</div><div class='del'>-	memset(&amp;test_pkt, 0, sizeof(test_pkt));</div><div class='del'>-</div><div class='del'>-	test_pkt.ctl = cpu_to_le32(ARMCP_PACKET_TEST &lt;&lt;</div><div class='del'>-					ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='del'>-	test_pkt.value = cpu_to_le64(ARMCP_PACKET_FENCE_VAL);</div><div class='del'>-</div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;test_pkt,</div><div class='del'>-			sizeof(test_pkt), HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='add'>+	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> </div><div class='del'>-	if (!rc) {</div><div class='del'>-		if (result == ARMCP_PACKET_FENCE_VAL)</div><div class='del'>-			dev_info(hdev-&gt;dev,</div><div class='del'>-				"queue test on CPU queue succeeded\n");</div><div class='del'>-		else</div><div class='del'>-			dev_err(hdev-&gt;dev,</div><div class='del'>-				"CPU queue test failed (0x%08lX)\n", result);</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(hdev-&gt;dev, "CPU queue test failed, error %d\n", rc);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * check capability here as send_cpu_message() won't update the result</div><div class='add'>+	 * value if no capability</div><div class='add'>+	 */</div><div class='add'>+	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_CPU_Q))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return hl_fw_test_cpu_queue(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_test_queues(struct hl_device *hdev)</div><div class='add'>+int goya_test_queues(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='del'>-	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	int i, rc, ret_val = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; NUMBER_OF_EXT_HW_QUEUES ; i++) {</div><div class='hunk'>@@ -3405,7 +2991,7 @@ static int goya_test_queues(struct hl_device *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;cpu_queues_enable) {</div><div class='del'>-		rc = goya-&gt;test_cpu_queue(hdev);</div><div class='add'>+		rc = goya_test_cpu_queue(hdev);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			ret_val = -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3416,57 +3002,68 @@ static int goya_test_queues(struct hl_device *hdev)</div><div class='ctx'> static void *goya_dma_pool_zalloc(struct hl_device *hdev, size_t size,</div><div class='ctx'> 					gfp_t mem_flags, dma_addr_t *dma_handle)</div><div class='ctx'> {</div><div class='add'>+	void *kernel_addr;</div><div class='add'>+</div><div class='ctx'> 	if (size &gt; GOYA_DMA_POOL_BLK_SIZE)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return dma_pool_zalloc(hdev-&gt;dma_pool, mem_flags, dma_handle);</div><div class='add'>+	kernel_addr =  dma_pool_zalloc(hdev-&gt;dma_pool, mem_flags, dma_handle);</div><div class='add'>+</div><div class='add'>+	/* Shift to the device's base physical address of host memory */</div><div class='add'>+	if (kernel_addr)</div><div class='add'>+		*dma_handle += HOST_PHYS_BASE;</div><div class='add'>+</div><div class='add'>+	return kernel_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void goya_dma_pool_free(struct hl_device *hdev, void *vaddr,</div><div class='ctx'> 				dma_addr_t dma_addr)</div><div class='ctx'> {</div><div class='del'>-	dma_pool_free(hdev-&gt;dma_pool, vaddr, dma_addr);</div><div class='add'>+	/* Cancel the device's base physical address of host memory */</div><div class='add'>+	dma_addr_t fixed_dma_addr = dma_addr - HOST_PHYS_BASE;</div><div class='add'>+</div><div class='add'>+	dma_pool_free(hdev-&gt;dma_pool, vaddr, fixed_dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *goya_cpu_accessible_dma_pool_alloc(struct hl_device *hdev,</div><div class='del'>-					size_t size, dma_addr_t *dma_handle)</div><div class='add'>+void *goya_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size,</div><div class='add'>+					dma_addr_t *dma_handle)</div><div class='ctx'> {</div><div class='del'>-	u64 kernel_addr;</div><div class='del'>-</div><div class='del'>-	/* roundup to CPU_PKT_SIZE */</div><div class='del'>-	size = (size + (CPU_PKT_SIZE - 1)) &amp; CPU_PKT_MASK;</div><div class='del'>-</div><div class='del'>-	kernel_addr = gen_pool_alloc(hdev-&gt;cpu_accessible_dma_pool, size);</div><div class='del'>-</div><div class='del'>-	*dma_handle = hdev-&gt;cpu_accessible_dma_address +</div><div class='del'>-		(kernel_addr - (u64) (uintptr_t) hdev-&gt;cpu_accessible_dma_mem);</div><div class='del'>-</div><div class='del'>-	return (void *) (uintptr_t) kernel_addr;</div><div class='add'>+	return hl_fw_cpu_accessible_dma_pool_alloc(hdev, size, dma_handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_cpu_accessible_dma_pool_free(struct hl_device *hdev,</div><div class='del'>-						size_t size, void *vaddr)</div><div class='add'>+void goya_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,</div><div class='add'>+					void *vaddr)</div><div class='ctx'> {</div><div class='del'>-	/* roundup to CPU_PKT_SIZE */</div><div class='del'>-	size = (size + (CPU_PKT_SIZE - 1)) &amp; CPU_PKT_MASK;</div><div class='del'>-</div><div class='del'>-	gen_pool_free(hdev-&gt;cpu_accessible_dma_pool, (u64) (uintptr_t) vaddr,</div><div class='del'>-			size);</div><div class='add'>+	hl_fw_cpu_accessible_dma_pool_free(hdev, size, vaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_dma_map_sg(struct hl_device *hdev, struct scatterlist *sg,</div><div class='add'>+static int goya_dma_map_sg(struct hl_device *hdev, struct scatterlist *sgl,</div><div class='ctx'> 				int nents, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	if (!dma_map_sg(&amp;hdev-&gt;pdev-&gt;dev, sg, nents, dir))</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!dma_map_sg(&amp;hdev-&gt;pdev-&gt;dev, sgl, nents, dir))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	/* Shift to the device's base physical address of host memory */</div><div class='add'>+	for_each_sg(sgl, sg, nents, i)</div><div class='add'>+		sg-&gt;dma_address += HOST_PHYS_BASE;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_dma_unmap_sg(struct hl_device *hdev, struct scatterlist *sg,</div><div class='add'>+static void goya_dma_unmap_sg(struct hl_device *hdev, struct scatterlist *sgl,</div><div class='ctx'> 				int nents, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	dma_unmap_sg(&amp;hdev-&gt;pdev-&gt;dev, sg, nents, dir);</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Cancel the device's base physical address of host memory */</div><div class='add'>+	for_each_sg(sgl, sg, nents, i)</div><div class='add'>+		sg-&gt;dma_address -= HOST_PHYS_BASE;</div><div class='add'>+</div><div class='add'>+	dma_unmap_sg(&amp;hdev-&gt;pdev-&gt;dev, sgl, nents, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 goya_get_dma_desc_list_size(struct hl_device *hdev, struct sg_table *sgt)</div><div class='hunk'>@@ -3616,31 +3213,29 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (parser-&gt;ctx_id != HL_KERNEL_ASID_ID) {</div><div class='del'>-		if (sram_addr) {</div><div class='del'>-			if (!hl_mem_area_inside_range(device_memory_addr,</div><div class='del'>-					le32_to_cpu(user_dma_pkt-&gt;tsize),</div><div class='del'>-					hdev-&gt;asic_prop.sram_user_base_address,</div><div class='del'>-					hdev-&gt;asic_prop.sram_end_address)) {</div><div class='add'>+	if (sram_addr) {</div><div class='add'>+		if (!hl_mem_area_inside_range(device_memory_addr,</div><div class='add'>+				le32_to_cpu(user_dma_pkt-&gt;tsize),</div><div class='add'>+				hdev-&gt;asic_prop.sram_user_base_address,</div><div class='add'>+				hdev-&gt;asic_prop.sram_end_address)) {</div><div class='ctx'> </div><div class='del'>-				dev_err(hdev-&gt;dev,</div><div class='del'>-					"SRAM address 0x%llx + 0x%x is invalid\n",</div><div class='del'>-					device_memory_addr,</div><div class='del'>-					user_dma_pkt-&gt;tsize);</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (!hl_mem_area_inside_range(device_memory_addr,</div><div class='del'>-					le32_to_cpu(user_dma_pkt-&gt;tsize),</div><div class='del'>-					hdev-&gt;asic_prop.dram_user_base_address,</div><div class='del'>-					hdev-&gt;asic_prop.dram_end_address)) {</div><div class='del'>-</div><div class='del'>-				dev_err(hdev-&gt;dev,</div><div class='del'>-					"DRAM address 0x%llx + 0x%x is invalid\n",</div><div class='del'>-					device_memory_addr,</div><div class='del'>-					user_dma_pkt-&gt;tsize);</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			}</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"SRAM address 0x%llx + 0x%x is invalid\n",</div><div class='add'>+				device_memory_addr,</div><div class='add'>+				user_dma_pkt-&gt;tsize);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!hl_mem_area_inside_range(device_memory_addr,</div><div class='add'>+				le32_to_cpu(user_dma_pkt-&gt;tsize),</div><div class='add'>+				hdev-&gt;asic_prop.dram_user_base_address,</div><div class='add'>+				hdev-&gt;asic_prop.dram_end_address)) {</div><div class='add'>+</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"DRAM address 0x%llx + 0x%x is invalid\n",</div><div class='add'>+				device_memory_addr,</div><div class='add'>+				user_dma_pkt-&gt;tsize);</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3754,7 +3349,7 @@ static int goya_validate_dma_pkt_mmu(struct hl_device *hdev,</div><div class='ctx'> 	 * WA for HW-23.</div><div class='ctx'> 	 * We can't allow user to read from Host using QMANs other than 1.</div><div class='ctx'> 	 */</div><div class='del'>-	if (parser-&gt;hw_queue_id &gt; GOYA_QUEUE_ID_DMA_1 &amp;&amp;</div><div class='add'>+	if (parser-&gt;hw_queue_id != GOYA_QUEUE_ID_DMA_1 &amp;&amp;</div><div class='ctx'> 		hl_mem_area_inside_range(le64_to_cpu(user_dma_pkt-&gt;src_addr),</div><div class='ctx'> 				le32_to_cpu(user_dma_pkt-&gt;tsize),</div><div class='ctx'> 				hdev-&gt;asic_prop.va_space_host_start_address,</div><div class='hunk'>@@ -4018,8 +3613,6 @@ static int goya_patch_dma_packet(struct hl_device *hdev,</div><div class='ctx'> 		new_dma_pkt-&gt;ctl = cpu_to_le32(ctl);</div><div class='ctx'> 		new_dma_pkt-&gt;tsize = cpu_to_le32((u32) len);</div><div class='ctx'> </div><div class='del'>-		dma_addr += hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-</div><div class='ctx'> 		if (dir == DMA_TO_DEVICE) {</div><div class='ctx'> 			new_dma_pkt-&gt;src_addr = cpu_to_le64(dma_addr);</div><div class='ctx'> 			new_dma_pkt-&gt;dst_addr = cpu_to_le64(device_memory_addr);</div><div class='hunk'>@@ -4270,36 +3863,35 @@ free_userptr:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_parse_cb_no_ext_quque(struct hl_device *hdev,</div><div class='add'>+static int goya_parse_cb_no_ext_queue(struct hl_device *hdev,</div><div class='ctx'> 					struct hl_cs_parser *parser)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *asic_prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> </div><div class='del'>-	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU)) {</div><div class='del'>-		/* For internal queue jobs, just check if cb address is valid */</div><div class='del'>-		if (hl_mem_area_inside_range(</div><div class='del'>-				(u64) (uintptr_t) parser-&gt;user_cb,</div><div class='del'>-				parser-&gt;user_cb_size,</div><div class='del'>-				asic_prop-&gt;sram_user_base_address,</div><div class='del'>-				asic_prop-&gt;sram_end_address))</div><div class='del'>-			return 0;</div><div class='add'>+	if (goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (hl_mem_area_inside_range(</div><div class='del'>-				(u64) (uintptr_t) parser-&gt;user_cb,</div><div class='del'>-				parser-&gt;user_cb_size,</div><div class='del'>-				asic_prop-&gt;dram_user_base_address,</div><div class='del'>-				asic_prop-&gt;dram_end_address))</div><div class='del'>-			return 0;</div><div class='add'>+	/* For internal queue jobs, just check if CB address is valid */</div><div class='add'>+	if (hl_mem_area_inside_range(</div><div class='add'>+			(u64) (uintptr_t) parser-&gt;user_cb,</div><div class='add'>+			parser-&gt;user_cb_size,</div><div class='add'>+			asic_prop-&gt;sram_user_base_address,</div><div class='add'>+			asic_prop-&gt;sram_end_address))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Internal CB address %px + 0x%x is not in SRAM nor in DRAM\n",</div><div class='del'>-			parser-&gt;user_cb, parser-&gt;user_cb_size);</div><div class='add'>+	if (hl_mem_area_inside_range(</div><div class='add'>+			(u64) (uintptr_t) parser-&gt;user_cb,</div><div class='add'>+			parser-&gt;user_cb_size,</div><div class='add'>+			asic_prop-&gt;dram_user_base_address,</div><div class='add'>+			asic_prop-&gt;dram_end_address))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	dev_err(hdev-&gt;dev,</div><div class='add'>+		"Internal CB address %px + 0x%x is not in SRAM nor in DRAM\n",</div><div class='add'>+		parser-&gt;user_cb, parser-&gt;user_cb_size);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int goya_cs_parser(struct hl_device *hdev, struct hl_cs_parser *parser)</div><div class='hunk'>@@ -4307,9 +3899,9 @@ int goya_cs_parser(struct hl_device *hdev, struct hl_cs_parser *parser)</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> </div><div class='ctx'> 	if (!parser-&gt;ext_queue)</div><div class='del'>-		return goya_parse_cb_no_ext_quque(hdev, parser);</div><div class='add'>+		return goya_parse_cb_no_ext_queue(hdev, parser);</div><div class='ctx'> </div><div class='del'>-	if ((goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU) &amp;&amp; parser-&gt;use_virt_addr)</div><div class='add'>+	if (goya-&gt;hw_cap_initialized &amp; HW_CAP_MMU)</div><div class='ctx'> 		return goya_parse_cb_mmu(hdev, parser);</div><div class='ctx'> 	else</div><div class='ctx'> 		return goya_parse_cb_no_mmu(hdev, parser);</div><div class='hunk'>@@ -4340,12 +3932,12 @@ void goya_add_end_of_cb_packets(u64 kernel_address, u32 len, u64 cq_addr,</div><div class='ctx'> 	cq_pkt-&gt;addr = cpu_to_le64(CFG_BASE + mmPCIE_DBI_MSIX_DOORBELL_OFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_update_eq_ci(struct hl_device *hdev, u32 val)</div><div class='add'>+void goya_update_eq_ci(struct hl_device *hdev, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_6, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_restore_phase_topology(struct hl_device *hdev)</div><div class='add'>+void goya_restore_phase_topology(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, num_of_sob_in_longs, num_of_mon_in_longs;</div><div class='ctx'> </div><div class='hunk'>@@ -4382,6 +3974,7 @@ static void goya_restore_phase_topology(struct hl_device *hdev)</div><div class='ctx'> static int goya_debugfs_read32(struct hl_device *hdev, u64 addr, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u64 ddr_bar_addr;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((addr &gt;= CFG_BASE) &amp;&amp; (addr &lt; CFG_BASE + CFG_SIZE)) {</div><div class='hunk'>@@ -4399,15 +3992,16 @@ static int goya_debugfs_read32(struct hl_device *hdev, u64 addr, u32 *val)</div><div class='ctx'> 		u64 bar_base_addr = DRAM_PHYS_BASE +</div><div class='ctx'> 				(addr &amp; ~(prop-&gt;dram_pci_bar_size - 0x1ull));</div><div class='ctx'> </div><div class='del'>-		rc = goya_set_ddr_bar_base(hdev, bar_base_addr);</div><div class='del'>-		if (!rc) {</div><div class='add'>+		ddr_bar_addr = goya_set_ddr_bar_base(hdev, bar_base_addr);</div><div class='add'>+		if (ddr_bar_addr != U64_MAX) {</div><div class='ctx'> 			*val = readl(hdev-&gt;pcie_bar[DDR_BAR_ID] +</div><div class='ctx'> 						(addr - bar_base_addr));</div><div class='ctx'> </div><div class='del'>-			rc = goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE +</div><div class='del'>-				(MMU_PAGE_TABLES_ADDR &amp;</div><div class='del'>-					~(prop-&gt;dram_pci_bar_size - 0x1ull)));</div><div class='add'>+			ddr_bar_addr = goya_set_ddr_bar_base(hdev,</div><div class='add'>+							ddr_bar_addr);</div><div class='ctx'> 		}</div><div class='add'>+		if (ddr_bar_addr == U64_MAX)</div><div class='add'>+			rc = -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = -EFAULT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4432,6 +4026,7 @@ static int goya_debugfs_read32(struct hl_device *hdev, u64 addr, u32 *val)</div><div class='ctx'> static int goya_debugfs_write32(struct hl_device *hdev, u64 addr, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u64 ddr_bar_addr;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((addr &gt;= CFG_BASE) &amp;&amp; (addr &lt; CFG_BASE + CFG_SIZE)) {</div><div class='hunk'>@@ -4449,15 +4044,16 @@ static int goya_debugfs_write32(struct hl_device *hdev, u64 addr, u32 val)</div><div class='ctx'> 		u64 bar_base_addr = DRAM_PHYS_BASE +</div><div class='ctx'> 				(addr &amp; ~(prop-&gt;dram_pci_bar_size - 0x1ull));</div><div class='ctx'> </div><div class='del'>-		rc = goya_set_ddr_bar_base(hdev, bar_base_addr);</div><div class='del'>-		if (!rc) {</div><div class='add'>+		ddr_bar_addr = goya_set_ddr_bar_base(hdev, bar_base_addr);</div><div class='add'>+		if (ddr_bar_addr != U64_MAX) {</div><div class='ctx'> 			writel(val, hdev-&gt;pcie_bar[DDR_BAR_ID] +</div><div class='ctx'> 						(addr - bar_base_addr));</div><div class='ctx'> </div><div class='del'>-			rc = goya_set_ddr_bar_base(hdev, DRAM_PHYS_BASE +</div><div class='del'>-				(MMU_PAGE_TABLES_ADDR &amp;</div><div class='del'>-					~(prop-&gt;dram_pci_bar_size - 0x1ull)));</div><div class='add'>+			ddr_bar_addr = goya_set_ddr_bar_base(hdev,</div><div class='add'>+							ddr_bar_addr);</div><div class='ctx'> 		}</div><div class='add'>+		if (ddr_bar_addr == U64_MAX)</div><div class='add'>+			rc = -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = -EFAULT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4469,6 +4065,9 @@ static u64 goya_read_pte(struct hl_device *hdev, u64 addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;hard_reset_pending)</div><div class='add'>+		return U64_MAX;</div><div class='add'>+</div><div class='ctx'> 	return readq(hdev-&gt;pcie_bar[DDR_BAR_ID] +</div><div class='ctx'> 			(addr - goya-&gt;ddr_bar_cur_addr));</div><div class='ctx'> }</div><div class='hunk'>@@ -4477,6 +4076,9 @@ static void goya_write_pte(struct hl_device *hdev, u64 addr, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;hard_reset_pending)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	writeq(val, hdev-&gt;pcie_bar[DDR_BAR_ID] +</div><div class='ctx'> 			(addr - goya-&gt;ddr_bar_cur_addr));</div><div class='ctx'> }</div><div class='hunk'>@@ -4666,8 +4268,8 @@ static int goya_unmask_irq_arr(struct hl_device *hdev, u32 *irq_arr,</div><div class='ctx'> 	pkt-&gt;armcp_pkt.ctl = cpu_to_le32(ARMCP_PACKET_UNMASK_RAZWI_IRQ_ARRAY &lt;&lt;</div><div class='ctx'> 						ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) pkt,</div><div class='del'>-			total_pkt_size, HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='add'>+	rc = goya_send_cpu_message(hdev, (u32 *) pkt, total_pkt_size,</div><div class='add'>+			HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='ctx'> </div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "failed to unmask IRQ array\n");</div><div class='hunk'>@@ -4683,8 +4285,8 @@ static int goya_soft_reset_late_init(struct hl_device *hdev)</div><div class='ctx'> 	 * Unmask all IRQs since some could have been received</div><div class='ctx'> 	 * during the soft reset</div><div class='ctx'> 	 */</div><div class='del'>-	return goya_unmask_irq_arr(hdev, goya_non_fatal_events,</div><div class='del'>-			sizeof(goya_non_fatal_events));</div><div class='add'>+	return goya_unmask_irq_arr(hdev, goya_all_events,</div><div class='add'>+					sizeof(goya_all_events));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int goya_unmask_irq(struct hl_device *hdev, u16 event_type)</div><div class='hunk'>@@ -4699,7 +4301,7 @@ static int goya_unmask_irq(struct hl_device *hdev, u16 event_type)</div><div class='ctx'> 				ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='ctx'> 	pkt.value = cpu_to_le64(event_type);</div><div class='ctx'> </div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt, sizeof(pkt),</div><div class='add'>+	rc = goya_send_cpu_message(hdev, (u32 *) &amp;pkt, sizeof(pkt),</div><div class='ctx'> 			HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='ctx'> </div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -4820,7 +4422,6 @@ static int goya_memset_device_memory(struct hl_device *hdev, u64 addr, u32 size,</div><div class='ctx'> 				u64 val, bool is_dram)</div><div class='ctx'> {</div><div class='ctx'> 	struct packet_lin_dma *lin_dma_pkt;</div><div class='del'>-	struct hl_cs_parser parser;</div><div class='ctx'> 	struct hl_cs_job *job;</div><div class='ctx'> 	u32 cb_size, ctl;</div><div class='ctx'> 	struct hl_cb *cb;</div><div class='hunk'>@@ -4860,36 +4461,16 @@ static int goya_memset_device_memory(struct hl_device *hdev, u64 addr, u32 size,</div><div class='ctx'> 	job-&gt;user_cb-&gt;cs_cnt++;</div><div class='ctx'> 	job-&gt;user_cb_size = cb_size;</div><div class='ctx'> 	job-&gt;hw_queue_id = GOYA_QUEUE_ID_DMA_0;</div><div class='add'>+	job-&gt;patched_cb = job-&gt;user_cb;</div><div class='add'>+	job-&gt;job_cb_size = job-&gt;user_cb_size +</div><div class='add'>+			sizeof(struct packet_msg_prot) * 2;</div><div class='ctx'> </div><div class='ctx'> 	hl_debugfs_add_job(hdev, job);</div><div class='ctx'> </div><div class='del'>-	parser.ctx_id = HL_KERNEL_ASID_ID;</div><div class='del'>-	parser.cs_sequence = 0;</div><div class='del'>-	parser.job_id = job-&gt;id;</div><div class='del'>-	parser.hw_queue_id = job-&gt;hw_queue_id;</div><div class='del'>-	parser.job_userptr_list = &amp;job-&gt;userptr_list;</div><div class='del'>-	parser.user_cb = job-&gt;user_cb;</div><div class='del'>-	parser.user_cb_size = job-&gt;user_cb_size;</div><div class='del'>-	parser.ext_queue = job-&gt;ext_queue;</div><div class='del'>-	parser.use_virt_addr = hdev-&gt;mmu_enable;</div><div class='del'>-</div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;cs_parser(hdev, &amp;parser);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to parse kernel CB\n");</div><div class='del'>-		goto free_job;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	job-&gt;patched_cb = parser.patched_cb;</div><div class='del'>-	job-&gt;job_cb_size = parser.patched_cb_size;</div><div class='del'>-	job-&gt;patched_cb-&gt;cs_cnt++;</div><div class='del'>-</div><div class='ctx'> 	rc = goya_send_job_on_qman0(hdev, job);</div><div class='ctx'> </div><div class='del'>-	job-&gt;patched_cb-&gt;cs_cnt--;</div><div class='ctx'> 	hl_cb_put(job-&gt;patched_cb);</div><div class='ctx'> </div><div class='del'>-free_job:</div><div class='del'>-	hl_userptr_delete_list(hdev, &amp;job-&gt;userptr_list);</div><div class='ctx'> 	hl_debugfs_remove_job(hdev, job);</div><div class='ctx'> 	kfree(job);</div><div class='ctx'> 	cb-&gt;cs_cnt--;</div><div class='hunk'>@@ -4901,7 +4482,7 @@ release_cb:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_context_switch(struct hl_device *hdev, u32 asid)</div><div class='add'>+int goya_context_switch(struct hl_device *hdev, u32 asid)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	u64 addr = prop-&gt;sram_base_address;</div><div class='hunk'>@@ -4915,12 +4496,13 @@ static int goya_context_switch(struct hl_device *hdev, u32 asid)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	WREG32(mmTPC_PLL_CLK_RLX_0, 0x200020);</div><div class='ctx'> 	goya_mmu_prepare(hdev, asid);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_mmu_clear_pgt_range(struct hl_device *hdev)</div><div class='add'>+int goya_mmu_clear_pgt_range(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='hunk'>@@ -4934,7 +4516,7 @@ static int goya_mmu_clear_pgt_range(struct hl_device *hdev)</div><div class='ctx'> 	return goya_memset_device_memory(hdev, addr, size, 0, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_mmu_set_dram_default_page(struct hl_device *hdev)</div><div class='add'>+int goya_mmu_set_dram_default_page(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	u64 addr = hdev-&gt;asic_prop.mmu_dram_default_page_addr;</div><div class='hunk'>@@ -4947,7 +4529,7 @@ static int goya_mmu_set_dram_default_page(struct hl_device *hdev)</div><div class='ctx'> 	return goya_memset_device_memory(hdev, addr, size, val, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void goya_mmu_prepare(struct hl_device *hdev, u32 asid)</div><div class='add'>+void goya_mmu_prepare(struct hl_device *hdev, u32 asid)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -4961,10 +4543,8 @@ static void goya_mmu_prepare(struct hl_device *hdev, u32 asid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* zero the MMBP and ASID bits and then set the ASID */</div><div class='del'>-	for (i = 0 ; i &lt; GOYA_MMU_REGS_NUM ; i++) {</div><div class='del'>-		WREG32_AND(goya_mmu_regs[i], ~0x7FF);</div><div class='del'>-		WREG32_OR(goya_mmu_regs[i], asid);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0 ; i &lt; GOYA_MMU_REGS_NUM ; i++)</div><div class='add'>+		goya_mmu_prepare_reg(hdev, goya_mmu_regs[i], asid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void goya_mmu_invalidate_cache(struct hl_device *hdev, bool is_hard)</div><div class='hunk'>@@ -5055,107 +4635,29 @@ static void goya_mmu_invalidate_cache_range(struct hl_device *hdev,</div><div class='ctx'> 			"Timeout when waiting for MMU cache invalidation\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_mmu_update_asid_hop0_addr(struct hl_device *hdev, u32 asid,</div><div class='del'>-						u64 phys_addr)</div><div class='del'>-{</div><div class='del'>-	u32 status, timeout_usec;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (hdev-&gt;pldm)</div><div class='del'>-		timeout_usec = GOYA_PLDM_MMU_TIMEOUT_USEC;</div><div class='del'>-	else</div><div class='del'>-		timeout_usec = MMU_CONFIG_TIMEOUT_USEC;</div><div class='del'>-</div><div class='del'>-	WREG32(MMU_HOP0_PA43_12, phys_addr &gt;&gt; MMU_HOP0_PA43_12_SHIFT);</div><div class='del'>-	WREG32(MMU_HOP0_PA49_44, phys_addr &gt;&gt; MMU_HOP0_PA49_44_SHIFT);</div><div class='del'>-	WREG32(MMU_ASID_BUSY, 0x80000000 | asid);</div><div class='del'>-</div><div class='del'>-	rc = hl_poll_timeout(</div><div class='del'>-		hdev,</div><div class='del'>-		MMU_ASID_BUSY,</div><div class='del'>-		status,</div><div class='del'>-		!(status &amp; 0x80000000),</div><div class='del'>-		1000,</div><div class='del'>-		timeout_usec);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Timeout during MMU hop0 config of asid %d\n", asid);</div><div class='del'>-		return rc;</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='ctx'> int goya_send_heartbeat(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='del'>-	struct armcp_packet hb_pkt;</div><div class='del'>-	long result;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_CPU_Q))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;hb_pkt, 0, sizeof(hb_pkt));</div><div class='del'>-</div><div class='del'>-	hb_pkt.ctl = cpu_to_le32(ARMCP_PACKET_TEST &lt;&lt;</div><div class='del'>-					ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='del'>-	hb_pkt.value = cpu_to_le64(ARMCP_PACKET_FENCE_VAL);</div><div class='del'>-</div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;hb_pkt,</div><div class='del'>-			sizeof(hb_pkt), HL_DEVICE_TIMEOUT_USEC, &amp;result);</div><div class='del'>-</div><div class='del'>-	if ((rc) || (result != ARMCP_PACKET_FENCE_VAL))</div><div class='del'>-		rc = -EIO;</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	return hl_fw_send_heartbeat(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int goya_armcp_info_get(struct hl_device *hdev)</div><div class='add'>+int goya_armcp_info_get(struct hl_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='del'>-	struct armcp_packet pkt;</div><div class='del'>-	void *armcp_info_cpu_addr;</div><div class='del'>-	dma_addr_t armcp_info_dma_addr;</div><div class='ctx'> 	u64 dram_size;</div><div class='del'>-	long result;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_CPU_Q))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	armcp_info_cpu_addr =</div><div class='del'>-			hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev,</div><div class='del'>-			sizeof(struct armcp_info), &amp;armcp_info_dma_addr);</div><div class='del'>-	if (!armcp_info_cpu_addr) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to allocate DMA memory for ArmCP info packet\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(armcp_info_cpu_addr, 0, sizeof(struct armcp_info));</div><div class='del'>-</div><div class='del'>-	memset(&amp;pkt, 0, sizeof(pkt));</div><div class='del'>-</div><div class='del'>-	pkt.ctl = cpu_to_le32(ARMCP_PACKET_INFO_GET &lt;&lt;</div><div class='del'>-				ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='del'>-	pkt.addr = cpu_to_le64(armcp_info_dma_addr +</div><div class='del'>-				prop-&gt;host_phys_base_address);</div><div class='del'>-	pkt.data_max_size = cpu_to_le32(sizeof(struct armcp_info));</div><div class='del'>-</div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt, sizeof(pkt),</div><div class='del'>-			GOYA_ARMCP_INFO_TIMEOUT, &amp;result);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to send armcp info pkt, error %d\n", rc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;prop-&gt;armcp_info, armcp_info_cpu_addr,</div><div class='del'>-			sizeof(prop-&gt;armcp_info));</div><div class='add'>+	rc = hl_fw_armcp_info_get(hdev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	dram_size = le64_to_cpu(prop-&gt;armcp_info.dram_size);</div><div class='ctx'> 	if (dram_size) {</div><div class='hunk'>@@ -5171,32 +4673,10 @@ static int goya_armcp_info_get(struct hl_device *hdev)</div><div class='ctx'> 		prop-&gt;dram_end_address = prop-&gt;dram_base_address + dram_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = hl_build_hwmon_channel_info(hdev, prop-&gt;armcp_info.sensors);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to build hwmon channel info, error %d\n", rc);</div><div class='del'>-		rc = -EFAULT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev,</div><div class='del'>-			sizeof(struct armcp_info), armcp_info_cpu_addr);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void goya_init_clock_gating(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void goya_disable_clock_gating(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool goya_is_device_idle(struct hl_device *hdev)</div><div class='add'>+static bool goya_is_device_idle(struct hl_device *hdev, char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	u64 offset, dma_qm_reg, tpc_qm_reg, tpc_cmdq_reg, tpc_cfg_reg;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -5208,7 +4688,7 @@ static bool goya_is_device_idle(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 		if ((RREG32(dma_qm_reg) &amp; DMA_QM_IDLE_MASK) !=</div><div class='ctx'> 				DMA_QM_IDLE_MASK)</div><div class='del'>-			return false;</div><div class='add'>+			return HL_ENG_BUSY(buf, size, "DMA%d_QM", i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	offset = mmTPC1_QM_GLBL_STS0 - mmTPC0_QM_GLBL_STS0;</div><div class='hunk'>@@ -5220,31 +4700,31 @@ static bool goya_is_device_idle(struct hl_device *hdev)</div><div class='ctx'> </div><div class='ctx'> 		if ((RREG32(tpc_qm_reg) &amp; TPC_QM_IDLE_MASK) !=</div><div class='ctx'> 				TPC_QM_IDLE_MASK)</div><div class='del'>-			return false;</div><div class='add'>+			return HL_ENG_BUSY(buf, size, "TPC%d_QM", i);</div><div class='ctx'> </div><div class='ctx'> 		if ((RREG32(tpc_cmdq_reg) &amp; TPC_CMDQ_IDLE_MASK) !=</div><div class='ctx'> 				TPC_CMDQ_IDLE_MASK)</div><div class='del'>-			return false;</div><div class='add'>+			return HL_ENG_BUSY(buf, size, "TPC%d_CMDQ", i);</div><div class='ctx'> </div><div class='ctx'> 		if ((RREG32(tpc_cfg_reg) &amp; TPC_CFG_IDLE_MASK) !=</div><div class='ctx'> 				TPC_CFG_IDLE_MASK)</div><div class='del'>-			return false;</div><div class='add'>+			return HL_ENG_BUSY(buf, size, "TPC%d_CFG", i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((RREG32(mmMME_QM_GLBL_STS0) &amp; MME_QM_IDLE_MASK) !=</div><div class='ctx'> 			MME_QM_IDLE_MASK)</div><div class='del'>-		return false;</div><div class='add'>+		return HL_ENG_BUSY(buf, size, "MME_QM");</div><div class='ctx'> </div><div class='ctx'> 	if ((RREG32(mmMME_CMDQ_GLBL_STS0) &amp; MME_CMDQ_IDLE_MASK) !=</div><div class='ctx'> 			MME_CMDQ_IDLE_MASK)</div><div class='del'>-		return false;</div><div class='add'>+		return HL_ENG_BUSY(buf, size, "MME_CMDQ");</div><div class='ctx'> </div><div class='ctx'> 	if ((RREG32(mmMME_ARCH_STATUS) &amp; MME_ARCH_IDLE_MASK) !=</div><div class='ctx'> 			MME_ARCH_IDLE_MASK)</div><div class='del'>-		return false;</div><div class='add'>+		return HL_ENG_BUSY(buf, size, "MME_ARCH");</div><div class='ctx'> </div><div class='ctx'> 	if (RREG32(mmMME_SHADOW_0_STATUS) &amp; MME_SHADOW_IDLE_MASK)</div><div class='del'>-		return false;</div><div class='add'>+		return HL_ENG_BUSY(buf, size, "MME");</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -5272,52 +4752,11 @@ static int goya_get_eeprom_data(struct hl_device *hdev, void *data,</div><div class='ctx'> 				size_t max_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct goya_device *goya = hdev-&gt;asic_specific;</div><div class='del'>-	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='del'>-	struct armcp_packet pkt;</div><div class='del'>-	void *eeprom_info_cpu_addr;</div><div class='del'>-	dma_addr_t eeprom_info_dma_addr;</div><div class='del'>-	long result;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(goya-&gt;hw_cap_initialized &amp; HW_CAP_CPU_Q))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	eeprom_info_cpu_addr =</div><div class='del'>-			hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev,</div><div class='del'>-					max_size, &amp;eeprom_info_dma_addr);</div><div class='del'>-	if (!eeprom_info_cpu_addr) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to allocate DMA memory for EEPROM info packet\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(eeprom_info_cpu_addr, 0, max_size);</div><div class='del'>-</div><div class='del'>-	memset(&amp;pkt, 0, sizeof(pkt));</div><div class='del'>-</div><div class='del'>-	pkt.ctl = cpu_to_le32(ARMCP_PACKET_EEPROM_DATA_GET &lt;&lt;</div><div class='del'>-				ARMCP_PKT_CTL_OPCODE_SHIFT);</div><div class='del'>-	pkt.addr = cpu_to_le64(eeprom_info_dma_addr +</div><div class='del'>-				prop-&gt;host_phys_base_address);</div><div class='del'>-	pkt.data_max_size = cpu_to_le32(max_size);</div><div class='del'>-</div><div class='del'>-	rc = hdev-&gt;asic_funcs-&gt;send_cpu_message(hdev, (u32 *) &amp;pkt, sizeof(pkt),</div><div class='del'>-			GOYA_ARMCP_EEPROM_TIMEOUT, &amp;result);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Failed to send armcp EEPROM pkt, error %d\n", rc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* result contains the actual size */</div><div class='del'>-	memcpy(data, eeprom_info_cpu_addr, min((size_t)result, max_size));</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev, max_size,</div><div class='del'>-			eeprom_info_cpu_addr);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	return hl_fw_get_eeprom_data(hdev, data, max_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum hl_device_hw_state goya_get_hw_state(struct hl_device *hdev)</div><div class='hunk'>@@ -5340,12 +4779,12 @@ static const struct hl_asic_funcs goya_funcs = {</div><div class='ctx'> 	.cb_mmap = goya_cb_mmap,</div><div class='ctx'> 	.ring_doorbell = goya_ring_doorbell,</div><div class='ctx'> 	.flush_pq_write = goya_flush_pq_write,</div><div class='del'>-	.dma_alloc_coherent = goya_dma_alloc_coherent,</div><div class='del'>-	.dma_free_coherent = goya_dma_free_coherent,</div><div class='add'>+	.asic_dma_alloc_coherent = goya_dma_alloc_coherent,</div><div class='add'>+	.asic_dma_free_coherent = goya_dma_free_coherent,</div><div class='ctx'> 	.get_int_queue_base = goya_get_int_queue_base,</div><div class='ctx'> 	.test_queues = goya_test_queues,</div><div class='del'>-	.dma_pool_zalloc = goya_dma_pool_zalloc,</div><div class='del'>-	.dma_pool_free = goya_dma_pool_free,</div><div class='add'>+	.asic_dma_pool_zalloc = goya_dma_pool_zalloc,</div><div class='add'>+	.asic_dma_pool_free = goya_dma_pool_free,</div><div class='ctx'> 	.cpu_accessible_dma_pool_alloc = goya_cpu_accessible_dma_pool_alloc,</div><div class='ctx'> 	.cpu_accessible_dma_pool_free = goya_cpu_accessible_dma_pool_free,</div><div class='ctx'> 	.hl_dma_unmap_sg = goya_dma_unmap_sg,</div><div class='hunk'>@@ -5367,8 +4806,7 @@ static const struct hl_asic_funcs goya_funcs = {</div><div class='ctx'> 	.mmu_invalidate_cache = goya_mmu_invalidate_cache,</div><div class='ctx'> 	.mmu_invalidate_cache_range = goya_mmu_invalidate_cache_range,</div><div class='ctx'> 	.send_heartbeat = goya_send_heartbeat,</div><div class='del'>-	.enable_clock_gating = goya_init_clock_gating,</div><div class='del'>-	.disable_clock_gating = goya_disable_clock_gating,</div><div class='add'>+	.debug_coresight = goya_debug_coresight,</div><div class='ctx'> 	.is_device_idle = goya_is_device_idle,</div><div class='ctx'> 	.soft_reset_late_init = goya_soft_reset_late_init,</div><div class='ctx'> 	.hw_queues_lock = goya_hw_queues_lock,</div><div class='hunk'>@@ -5376,7 +4814,12 @@ static const struct hl_asic_funcs goya_funcs = {</div><div class='ctx'> 	.get_pci_id = goya_get_pci_id,</div><div class='ctx'> 	.get_eeprom_data = goya_get_eeprom_data,</div><div class='ctx'> 	.send_cpu_message = goya_send_cpu_message,</div><div class='del'>-	.get_hw_state = goya_get_hw_state</div><div class='add'>+	.get_hw_state = goya_get_hw_state,</div><div class='add'>+	.pci_bars_map = goya_pci_bars_map,</div><div class='add'>+	.set_dram_bar_base = goya_set_ddr_bar_base,</div><div class='add'>+	.init_iatu = goya_init_iatu,</div><div class='add'>+	.rreg = hl_rreg,</div><div class='add'>+	.wreg = hl_wreg</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/misc/habanalabs/goya/goyaP.h b/drivers/misc/habanalabs/goya/goyaP.h<br/>index 830551b6b062..14e216cb3668 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goyaP.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goyaP.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goyaP.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/goya/goyaP.h</a></div><div class='hunk'>@@ -39,9 +39,13 @@</div><div class='ctx'> #error "Number of MSIX interrupts must be smaller or equal to GOYA_MSIX_ENTRIES"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define QMAN_FENCE_TIMEOUT_USEC		10000	/* 10 ms */</div><div class='add'>+#define QMAN_FENCE_TIMEOUT_USEC		10000		/* 10 ms */</div><div class='ctx'> </div><div class='del'>-#define QMAN_STOP_TIMEOUT_USEC		100000	/* 100 ms */</div><div class='add'>+#define QMAN_STOP_TIMEOUT_USEC		100000		/* 100 ms */</div><div class='add'>+</div><div class='add'>+#define CORESIGHT_TIMEOUT_USEC		100000		/* 100 ms */</div><div class='add'>+</div><div class='add'>+#define GOYA_CPU_TIMEOUT_USEC		10000000	/* 10s */</div><div class='ctx'> </div><div class='ctx'> #define TPC_ENABLED_MASK		0xFF</div><div class='ctx'> </div><div class='hunk'>@@ -49,19 +53,14 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_POWER_DEFAULT		200000		/* 200W */</div><div class='ctx'> </div><div class='del'>-#define GOYA_ARMCP_INFO_TIMEOUT		10000000	/* 10s */</div><div class='del'>-#define GOYA_ARMCP_EEPROM_TIMEOUT	10000000	/* 10s */</div><div class='del'>-</div><div class='ctx'> #define DRAM_PHYS_DEFAULT_SIZE		0x100000000ull	/* 4GB */</div><div class='ctx'> </div><div class='ctx'> /* DRAM Memory Map */</div><div class='ctx'> </div><div class='ctx'> #define CPU_FW_IMAGE_SIZE		0x10000000	/* 256MB */</div><div class='del'>-#define MMU_PAGE_TABLES_SIZE		0x0DE00000	/* 222MB */</div><div class='add'>+#define MMU_PAGE_TABLES_SIZE		0x0FC00000	/* 252MB */</div><div class='ctx'> #define MMU_DRAM_DEFAULT_PAGE_SIZE	0x00200000	/* 2MB */</div><div class='ctx'> #define MMU_CACHE_MNG_SIZE		0x00001000	/* 4KB */</div><div class='del'>-#define CPU_PQ_PKT_SIZE			0x00001000	/* 4KB */</div><div class='del'>-#define CPU_PQ_DATA_SIZE		0x01FFE000	/* 32MB - 8KB  */</div><div class='ctx'> </div><div class='ctx'> #define CPU_FW_IMAGE_ADDR		DRAM_PHYS_BASE</div><div class='ctx'> #define MMU_PAGE_TABLES_ADDR		(CPU_FW_IMAGE_ADDR + CPU_FW_IMAGE_SIZE)</div><div class='hunk'>@@ -69,13 +68,13 @@</div><div class='ctx'> 						MMU_PAGE_TABLES_SIZE)</div><div class='ctx'> #define MMU_CACHE_MNG_ADDR		(MMU_DRAM_DEFAULT_PAGE_ADDR + \</div><div class='ctx'> 					MMU_DRAM_DEFAULT_PAGE_SIZE)</div><div class='del'>-#define CPU_PQ_PKT_ADDR			(MMU_CACHE_MNG_ADDR + \</div><div class='add'>+#define DRAM_KMD_END_ADDR		(MMU_CACHE_MNG_ADDR + \</div><div class='ctx'> 						MMU_CACHE_MNG_SIZE)</div><div class='del'>-#define CPU_PQ_DATA_ADDR		(CPU_PQ_PKT_ADDR + CPU_PQ_PKT_SIZE)</div><div class='del'>-#define DRAM_BASE_ADDR_USER		(CPU_PQ_DATA_ADDR + CPU_PQ_DATA_SIZE)</div><div class='ctx'> </div><div class='del'>-#if (DRAM_BASE_ADDR_USER != 0x20000000)</div><div class='del'>-#error "KMD must reserve 512MB"</div><div class='add'>+#define DRAM_BASE_ADDR_USER		0x20000000</div><div class='add'>+</div><div class='add'>+#if (DRAM_KMD_END_ADDR &gt; DRAM_BASE_ADDR_USER)</div><div class='add'>+#error "KMD must reserve no more than 512MB"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -142,22 +141,12 @@</div><div class='ctx'> #define HW_CAP_GOLDEN		0x00000400</div><div class='ctx'> #define HW_CAP_TPC		0x00000800</div><div class='ctx'> </div><div class='del'>-#define CPU_PKT_SHIFT		5</div><div class='del'>-#define CPU_PKT_SIZE		(1 &lt;&lt; CPU_PKT_SHIFT)</div><div class='del'>-#define CPU_PKT_MASK		(~((1 &lt;&lt; CPU_PKT_SHIFT) - 1))</div><div class='del'>-#define CPU_MAX_PKTS_IN_CB	32</div><div class='del'>-#define CPU_CB_SIZE		(CPU_PKT_SIZE * CPU_MAX_PKTS_IN_CB)</div><div class='del'>-#define CPU_ACCESSIBLE_MEM_SIZE	(HL_QUEUE_LENGTH * CPU_CB_SIZE)</div><div class='del'>-</div><div class='ctx'> enum goya_fw_component {</div><div class='ctx'> 	FW_COMP_UBOOT,</div><div class='ctx'> 	FW_COMP_PREBOOT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct goya_device {</div><div class='del'>-	int (*test_cpu_queue)(struct hl_device *hdev);</div><div class='del'>-	int (*armcp_info_get)(struct hl_device *hdev);</div><div class='del'>-</div><div class='ctx'> 	/* TODO: remove hw_queues_lock after moving to scheduler code */</div><div class='ctx'> 	spinlock_t	hw_queues_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -170,13 +159,34 @@ struct goya_device {</div><div class='ctx'> 	u32		hw_cap_initialized;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void goya_get_fixed_properties(struct hl_device *hdev);</div><div class='add'>+int goya_mmu_init(struct hl_device *hdev);</div><div class='add'>+void goya_init_dma_qmans(struct hl_device *hdev);</div><div class='add'>+void goya_init_mme_qmans(struct hl_device *hdev);</div><div class='add'>+void goya_init_tpc_qmans(struct hl_device *hdev);</div><div class='add'>+int goya_init_cpu_queues(struct hl_device *hdev);</div><div class='add'>+void goya_init_security(struct hl_device *hdev);</div><div class='add'>+int goya_late_init(struct hl_device *hdev);</div><div class='add'>+void goya_late_fini(struct hl_device *hdev);</div><div class='add'>+</div><div class='add'>+void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi);</div><div class='add'>+void goya_flush_pq_write(struct hl_device *hdev, u64 *pq, u64 exp_val);</div><div class='add'>+void goya_update_eq_ci(struct hl_device *hdev, u32 val);</div><div class='add'>+void goya_restore_phase_topology(struct hl_device *hdev);</div><div class='add'>+int goya_context_switch(struct hl_device *hdev, u32 asid);</div><div class='add'>+</div><div class='ctx'> int goya_debugfs_i2c_read(struct hl_device *hdev, u8 i2c_bus,</div><div class='ctx'> 			u8 i2c_addr, u8 i2c_reg, u32 *val);</div><div class='ctx'> int goya_debugfs_i2c_write(struct hl_device *hdev, u8 i2c_bus,</div><div class='ctx'> 			u8 i2c_addr, u8 i2c_reg, u32 val);</div><div class='add'>+void goya_debugfs_led_set(struct hl_device *hdev, u8 led, u8 state);</div><div class='add'>+</div><div class='add'>+int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id);</div><div class='add'>+int goya_test_queues(struct hl_device *hdev);</div><div class='ctx'> int goya_test_cpu_queue(struct hl_device *hdev);</div><div class='ctx'> int goya_send_cpu_message(struct hl_device *hdev, u32 *msg, u16 len,</div><div class='ctx'> 				u32 timeout, long *result);</div><div class='add'>+</div><div class='ctx'> long goya_get_temperature(struct hl_device *hdev, int sensor_index, u32 attr);</div><div class='ctx'> long goya_get_voltage(struct hl_device *hdev, int sensor_index, u32 attr);</div><div class='ctx'> long goya_get_current(struct hl_device *hdev, int sensor_index, u32 attr);</div><div class='hunk'>@@ -184,28 +194,35 @@ long goya_get_fan_speed(struct hl_device *hdev, int sensor_index, u32 attr);</div><div class='ctx'> long goya_get_pwm_info(struct hl_device *hdev, int sensor_index, u32 attr);</div><div class='ctx'> void goya_set_pwm_info(struct hl_device *hdev, int sensor_index, u32 attr,</div><div class='ctx'> 			long value);</div><div class='del'>-void goya_debugfs_led_set(struct hl_device *hdev, u8 led, u8 state);</div><div class='add'>+u64 goya_get_max_power(struct hl_device *hdev);</div><div class='add'>+void goya_set_max_power(struct hl_device *hdev, u64 value);</div><div class='add'>+</div><div class='ctx'> void goya_set_pll_profile(struct hl_device *hdev, enum hl_pll_frequency freq);</div><div class='ctx'> void goya_add_device_attr(struct hl_device *hdev,</div><div class='ctx'> 			struct attribute_group *dev_attr_grp);</div><div class='del'>-void goya_init_security(struct hl_device *hdev);</div><div class='del'>-u64 goya_get_max_power(struct hl_device *hdev);</div><div class='del'>-void goya_set_max_power(struct hl_device *hdev, u64 value);</div><div class='add'>+int goya_armcp_info_get(struct hl_device *hdev);</div><div class='add'>+int goya_debug_coresight(struct hl_device *hdev, void *data);</div><div class='add'>+</div><div class='add'>+void goya_mmu_prepare(struct hl_device *hdev, u32 asid);</div><div class='add'>+int goya_mmu_clear_pgt_range(struct hl_device *hdev);</div><div class='add'>+int goya_mmu_set_dram_default_page(struct hl_device *hdev);</div><div class='ctx'> </div><div class='del'>-int goya_send_pci_access_msg(struct hl_device *hdev, u32 opcode);</div><div class='del'>-void goya_late_fini(struct hl_device *hdev);</div><div class='ctx'> int goya_suspend(struct hl_device *hdev);</div><div class='ctx'> int goya_resume(struct hl_device *hdev);</div><div class='del'>-void goya_flush_pq_write(struct hl_device *hdev, u64 *pq, u64 exp_val);</div><div class='add'>+</div><div class='ctx'> void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry);</div><div class='ctx'> void *goya_get_events_stat(struct hl_device *hdev, u32 *size);</div><div class='add'>+</div><div class='ctx'> void goya_add_end_of_cb_packets(u64 kernel_address, u32 len, u64 cq_addr,</div><div class='ctx'> 				u32 cq_val, u32 msix_vec);</div><div class='ctx'> int goya_cs_parser(struct hl_device *hdev, struct hl_cs_parser *parser);</div><div class='ctx'> void *goya_get_int_queue_base(struct hl_device *hdev, u32 queue_id,</div><div class='del'>-		dma_addr_t *dma_handle,	u16 *queue_len);</div><div class='add'>+				dma_addr_t *dma_handle,	u16 *queue_len);</div><div class='ctx'> u32 goya_get_dma_desc_list_size(struct hl_device *hdev, struct sg_table *sgt);</div><div class='del'>-int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id);</div><div class='ctx'> int goya_send_heartbeat(struct hl_device *hdev);</div><div class='add'>+void *goya_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size,</div><div class='add'>+					dma_addr_t *dma_handle);</div><div class='add'>+void goya_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,</div><div class='add'>+					void *vaddr);</div><div class='ctx'> </div><div class='ctx'> #endif /* GOYAP_H_ */</div><div class='head'>diff --git a/drivers/misc/habanalabs/goya/goya_coresight.c b/drivers/misc/habanalabs/goya/goya_coresight.c<br/>new file mode 100644<br/>index 000000000000..1ac951f52d1e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goya_coresight.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/goya/goya_coresight.c</a></div><div class='hunk'>@@ -0,0 +1,628 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016-2019 HabanaLabs, Ltd.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "goyaP.h"</div><div class='add'>+#include "include/goya/goya_coresight.h"</div><div class='add'>+#include "include/goya/asic_reg/goya_regs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/misc/habanalabs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/coresight.h&gt;</div><div class='add'>+</div><div class='add'>+#define GOYA_PLDM_CORESIGHT_TIMEOUT_USEC	(CORESIGHT_TIMEOUT_USEC * 100)</div><div class='add'>+</div><div class='add'>+static u64 debug_stm_regs[GOYA_STM_LAST + 1] = {</div><div class='add'>+	[GOYA_STM_CPU]		= mmCPU_STM_BASE,</div><div class='add'>+	[GOYA_STM_DMA_CH_0_CS]	= mmDMA_CH_0_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_DMA_CH_1_CS]	= mmDMA_CH_1_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_DMA_CH_2_CS]	= mmDMA_CH_2_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_DMA_CH_3_CS]	= mmDMA_CH_3_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_DMA_CH_4_CS]	= mmDMA_CH_4_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_DMA_MACRO_CS]	= mmDMA_MACRO_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_MME1_SBA]	= mmMME1_SBA_STM_BASE,</div><div class='add'>+	[GOYA_STM_MME3_SBB]	= mmMME3_SBB_STM_BASE,</div><div class='add'>+	[GOYA_STM_MME4_WACS2]	= mmMME4_WACS2_STM_BASE,</div><div class='add'>+	[GOYA_STM_MME4_WACS]	= mmMME4_WACS_STM_BASE,</div><div class='add'>+	[GOYA_STM_MMU_CS]	= mmMMU_CS_STM_BASE,</div><div class='add'>+	[GOYA_STM_PCIE]		= mmPCIE_STM_BASE,</div><div class='add'>+	[GOYA_STM_PSOC]		= mmPSOC_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC0_EML]	= mmTPC0_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC1_EML]	= mmTPC1_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC2_EML]	= mmTPC2_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC3_EML]	= mmTPC3_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC4_EML]	= mmTPC4_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC5_EML]	= mmTPC5_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC6_EML]	= mmTPC6_EML_STM_BASE,</div><div class='add'>+	[GOYA_STM_TPC7_EML]	= mmTPC7_EML_STM_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 debug_etf_regs[GOYA_ETF_LAST + 1] = {</div><div class='add'>+	[GOYA_ETF_CPU_0]	= mmCPU_ETF_0_BASE,</div><div class='add'>+	[GOYA_ETF_CPU_1]	= mmCPU_ETF_1_BASE,</div><div class='add'>+	[GOYA_ETF_CPU_TRACE]	= mmCPU_ETF_TRACE_BASE,</div><div class='add'>+	[GOYA_ETF_DMA_CH_0_CS]	= mmDMA_CH_0_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_DMA_CH_1_CS]	= mmDMA_CH_1_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_DMA_CH_2_CS]	= mmDMA_CH_2_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_DMA_CH_3_CS]	= mmDMA_CH_3_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_DMA_CH_4_CS]	= mmDMA_CH_4_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_DMA_MACRO_CS]	= mmDMA_MACRO_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_MME1_SBA]	= mmMME1_SBA_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_MME3_SBB]	= mmMME3_SBB_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_MME4_WACS2]	= mmMME4_WACS2_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_MME4_WACS]	= mmMME4_WACS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_MMU_CS]	= mmMMU_CS_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_PCIE]		= mmPCIE_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_PSOC]		= mmPSOC_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC0_EML]	= mmTPC0_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC1_EML]	= mmTPC1_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC2_EML]	= mmTPC2_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC3_EML]	= mmTPC3_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC4_EML]	= mmTPC4_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC5_EML]	= mmTPC5_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC6_EML]	= mmTPC6_EML_ETF_BASE,</div><div class='add'>+	[GOYA_ETF_TPC7_EML]	= mmTPC7_EML_ETF_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 debug_funnel_regs[GOYA_FUNNEL_LAST + 1] = {</div><div class='add'>+	[GOYA_FUNNEL_CPU]		= mmCPU_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_DMA_CH_6_1]	= mmDMA_CH_FUNNEL_6_1_BASE,</div><div class='add'>+	[GOYA_FUNNEL_DMA_MACRO_3_1]	= mmDMA_MACRO_FUNNEL_3_1_BASE,</div><div class='add'>+	[GOYA_FUNNEL_MME0_RTR]		= mmMME0_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_MME1_RTR]		= mmMME1_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_MME2_RTR]		= mmMME2_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_MME3_RTR]		= mmMME3_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_MME4_RTR]		= mmMME4_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_MME5_RTR]		= mmMME5_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_PCIE]		= mmPCIE_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_PSOC]		= mmPSOC_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC0_EML]		= mmTPC0_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC1_EML]		= mmTPC1_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC1_RTR]		= mmTPC1_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC2_EML]		= mmTPC2_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC2_RTR]		= mmTPC2_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC3_EML]		= mmTPC3_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC3_RTR]		= mmTPC3_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC4_EML]		= mmTPC4_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC4_RTR]		= mmTPC4_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC5_EML]		= mmTPC5_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC5_RTR]		= mmTPC5_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC6_EML]		= mmTPC6_EML_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC6_RTR]		= mmTPC6_RTR_FUNNEL_BASE,</div><div class='add'>+	[GOYA_FUNNEL_TPC7_EML]		= mmTPC7_EML_FUNNEL_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 debug_bmon_regs[GOYA_BMON_LAST + 1] = {</div><div class='add'>+	[GOYA_BMON_CPU_RD]		= mmCPU_RD_BMON_BASE,</div><div class='add'>+	[GOYA_BMON_CPU_WR]		= mmCPU_WR_BMON_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_0_0]		= mmDMA_CH_0_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_0_1]		= mmDMA_CH_0_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_1_0]		= mmDMA_CH_1_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_1_1]		= mmDMA_CH_1_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_2_0]		= mmDMA_CH_2_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_2_1]		= mmDMA_CH_2_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_3_0]		= mmDMA_CH_3_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_3_1]		= mmDMA_CH_3_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_4_0]		= mmDMA_CH_4_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_CH_4_1]		= mmDMA_CH_4_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_0]		= mmDMA_MACRO_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_1]		= mmDMA_MACRO_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_2]		= mmDMA_MACRO_BMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_3]		= mmDMA_MACRO_BMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_4]		= mmDMA_MACRO_BMON_4_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_5]		= mmDMA_MACRO_BMON_5_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_6]		= mmDMA_MACRO_BMON_6_BASE,</div><div class='add'>+	[GOYA_BMON_DMA_MACRO_7]		= mmDMA_MACRO_BMON_7_BASE,</div><div class='add'>+	[GOYA_BMON_MME1_SBA_0]		= mmMME1_SBA_BMON0_BASE,</div><div class='add'>+	[GOYA_BMON_MME1_SBA_1]		= mmMME1_SBA_BMON1_BASE,</div><div class='add'>+	[GOYA_BMON_MME3_SBB_0]		= mmMME3_SBB_BMON0_BASE,</div><div class='add'>+	[GOYA_BMON_MME3_SBB_1]		= mmMME3_SBB_BMON1_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS2_0]	= mmMME4_WACS2_BMON0_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS2_1]	= mmMME4_WACS2_BMON1_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS2_2]	= mmMME4_WACS2_BMON2_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_0]		= mmMME4_WACS_BMON0_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_1]		= mmMME4_WACS_BMON1_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_2]		= mmMME4_WACS_BMON2_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_3]		= mmMME4_WACS_BMON3_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_4]		= mmMME4_WACS_BMON4_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_5]		= mmMME4_WACS_BMON5_BASE,</div><div class='add'>+	[GOYA_BMON_MME4_WACS_6]		= mmMME4_WACS_BMON6_BASE,</div><div class='add'>+	[GOYA_BMON_MMU_0]		= mmMMU_BMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_MMU_1]		= mmMMU_BMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_PCIE_MSTR_RD]	= mmPCIE_BMON_MSTR_RD_BASE,</div><div class='add'>+	[GOYA_BMON_PCIE_MSTR_WR]	= mmPCIE_BMON_MSTR_WR_BASE,</div><div class='add'>+	[GOYA_BMON_PCIE_SLV_RD]		= mmPCIE_BMON_SLV_RD_BASE,</div><div class='add'>+	[GOYA_BMON_PCIE_SLV_WR]		= mmPCIE_BMON_SLV_WR_BASE,</div><div class='add'>+	[GOYA_BMON_TPC0_EML_0]		= mmTPC0_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC0_EML_1]		= mmTPC0_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC0_EML_2]		= mmTPC0_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC0_EML_3]		= mmTPC0_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC1_EML_0]		= mmTPC1_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC1_EML_1]		= mmTPC1_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC1_EML_2]		= mmTPC1_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC1_EML_3]		= mmTPC1_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC2_EML_0]		= mmTPC2_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC2_EML_1]		= mmTPC2_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC2_EML_2]		= mmTPC2_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC2_EML_3]		= mmTPC2_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC3_EML_0]		= mmTPC3_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC3_EML_1]		= mmTPC3_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC3_EML_2]		= mmTPC3_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC3_EML_3]		= mmTPC3_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC4_EML_0]		= mmTPC4_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC4_EML_1]		= mmTPC4_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC4_EML_2]		= mmTPC4_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC4_EML_3]		= mmTPC4_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC5_EML_0]		= mmTPC5_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC5_EML_1]		= mmTPC5_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC5_EML_2]		= mmTPC5_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC5_EML_3]		= mmTPC5_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC6_EML_0]		= mmTPC6_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC6_EML_1]		= mmTPC6_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC6_EML_2]		= mmTPC6_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC6_EML_3]		= mmTPC6_EML_BUSMON_3_BASE,</div><div class='add'>+	[GOYA_BMON_TPC7_EML_0]		= mmTPC7_EML_BUSMON_0_BASE,</div><div class='add'>+	[GOYA_BMON_TPC7_EML_1]		= mmTPC7_EML_BUSMON_1_BASE,</div><div class='add'>+	[GOYA_BMON_TPC7_EML_2]		= mmTPC7_EML_BUSMON_2_BASE,</div><div class='add'>+	[GOYA_BMON_TPC7_EML_3]		= mmTPC7_EML_BUSMON_3_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 debug_spmu_regs[GOYA_SPMU_LAST + 1] = {</div><div class='add'>+	[GOYA_SPMU_DMA_CH_0_CS]		= mmDMA_CH_0_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_DMA_CH_1_CS]		= mmDMA_CH_1_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_DMA_CH_2_CS]		= mmDMA_CH_2_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_DMA_CH_3_CS]		= mmDMA_CH_3_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_DMA_CH_4_CS]		= mmDMA_CH_4_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_DMA_MACRO_CS]	= mmDMA_MACRO_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_MME1_SBA]		= mmMME1_SBA_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_MME3_SBB]		= mmMME3_SBB_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_MME4_WACS2]		= mmMME4_WACS2_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_MME4_WACS]		= mmMME4_WACS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_MMU_CS]		= mmMMU_CS_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_PCIE]		= mmPCIE_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC0_EML]		= mmTPC0_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC1_EML]		= mmTPC1_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC2_EML]		= mmTPC2_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC3_EML]		= mmTPC3_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC4_EML]		= mmTPC4_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC5_EML]		= mmTPC5_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC6_EML]		= mmTPC6_EML_SPMU_BASE,</div><div class='add'>+	[GOYA_SPMU_TPC7_EML]		= mmTPC7_EML_SPMU_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int goya_coresight_timeout(struct hl_device *hdev, u64 addr,</div><div class='add'>+		int position, bool up)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u32 val, timeout_usec;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;pldm)</div><div class='add'>+		timeout_usec = GOYA_PLDM_CORESIGHT_TIMEOUT_USEC;</div><div class='add'>+	else</div><div class='add'>+		timeout_usec = CORESIGHT_TIMEOUT_USEC;</div><div class='add'>+</div><div class='add'>+	rc = hl_poll_timeout(</div><div class='add'>+		hdev,</div><div class='add'>+		addr,</div><div class='add'>+		val,</div><div class='add'>+		up ? val &amp; BIT(position) : !(val &amp; BIT(position)),</div><div class='add'>+		1000,</div><div class='add'>+		timeout_usec);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Timeout while waiting for coresight, addr: 0x%llx, position: %d, up: %d\n",</div><div class='add'>+				addr, position, up);</div><div class='add'>+		return -EFAULT;</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 goya_config_stm(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_params_stm *input;</div><div class='add'>+	u64 base_reg = debug_stm_regs[params-&gt;reg_idx] - CFG_BASE;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	WREG32(base_reg + 0xFB0, CORESIGHT_UNLOCK);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;enable) {</div><div class='add'>+		input = params-&gt;input;</div><div class='add'>+</div><div class='add'>+		if (!input)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0xE80, 0x80004);</div><div class='add'>+		WREG32(base_reg + 0xD64, 7);</div><div class='add'>+		WREG32(base_reg + 0xD60, 0);</div><div class='add'>+		WREG32(base_reg + 0xD00, lower_32_bits(input-&gt;he_mask));</div><div class='add'>+		WREG32(base_reg + 0xD20, lower_32_bits(input-&gt;sp_mask));</div><div class='add'>+		WREG32(base_reg + 0xD60, 1);</div><div class='add'>+		WREG32(base_reg + 0xD00, upper_32_bits(input-&gt;he_mask));</div><div class='add'>+		WREG32(base_reg + 0xD20, upper_32_bits(input-&gt;sp_mask));</div><div class='add'>+		WREG32(base_reg + 0xE70, 0x10);</div><div class='add'>+		WREG32(base_reg + 0xE60, 0);</div><div class='add'>+		WREG32(base_reg + 0xE64, 0x420000);</div><div class='add'>+		WREG32(base_reg + 0xE00, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0xE20, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0xEF4, input-&gt;id);</div><div class='add'>+		WREG32(base_reg + 0xDF4, 0x80);</div><div class='add'>+		WREG32(base_reg + 0xE8C, input-&gt;frequency);</div><div class='add'>+		WREG32(base_reg + 0xE90, 0x7FF);</div><div class='add'>+		WREG32(base_reg + 0xE80, 0x7 | (input-&gt;id &lt;&lt; 16));</div><div class='add'>+	} else {</div><div class='add'>+		WREG32(base_reg + 0xE80, 4);</div><div class='add'>+		WREG32(base_reg + 0xD64, 0);</div><div class='add'>+		WREG32(base_reg + 0xD60, 1);</div><div class='add'>+		WREG32(base_reg + 0xD00, 0);</div><div class='add'>+		WREG32(base_reg + 0xD20, 0);</div><div class='add'>+		WREG32(base_reg + 0xD60, 0);</div><div class='add'>+		WREG32(base_reg + 0xE20, 0);</div><div class='add'>+		WREG32(base_reg + 0xE00, 0);</div><div class='add'>+		WREG32(base_reg + 0xDF4, 0x80);</div><div class='add'>+		WREG32(base_reg + 0xE70, 0);</div><div class='add'>+		WREG32(base_reg + 0xE60, 0);</div><div class='add'>+		WREG32(base_reg + 0xE64, 0);</div><div class='add'>+		WREG32(base_reg + 0xE8C, 0);</div><div class='add'>+</div><div class='add'>+		rc = goya_coresight_timeout(hdev, base_reg + 0xE80, 23, false);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"Failed to disable STM on timeout, error %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'>+		WREG32(base_reg + 0xE80, 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 goya_config_etf(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_params_etf *input;</div><div class='add'>+	u64 base_reg = debug_etf_regs[params-&gt;reg_idx] - CFG_BASE;</div><div class='add'>+	u32 val;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	WREG32(base_reg + 0xFB0, CORESIGHT_UNLOCK);</div><div class='add'>+</div><div class='add'>+	val = RREG32(base_reg + 0x304);</div><div class='add'>+	val |= 0x1000;</div><div class='add'>+	WREG32(base_reg + 0x304, val);</div><div class='add'>+	val |= 0x40;</div><div class='add'>+	WREG32(base_reg + 0x304, val);</div><div class='add'>+</div><div class='add'>+	rc = goya_coresight_timeout(hdev, base_reg + 0x304, 6, false);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to %s ETF on timeout, error %d\n",</div><div class='add'>+				params-&gt;enable ? "enable" : "disable", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = goya_coresight_timeout(hdev, base_reg + 0xC, 2, true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to %s ETF on timeout, error %d\n",</div><div class='add'>+				params-&gt;enable ? "enable" : "disable", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WREG32(base_reg + 0x20, 0);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;enable) {</div><div class='add'>+		input = params-&gt;input;</div><div class='add'>+</div><div class='add'>+		if (!input)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0x34, 0x3FFC);</div><div class='add'>+		WREG32(base_reg + 0x28, input-&gt;sink_mode);</div><div class='add'>+		WREG32(base_reg + 0x304, 0x4001);</div><div class='add'>+		WREG32(base_reg + 0x308, 0xA);</div><div class='add'>+		WREG32(base_reg + 0x20, 1);</div><div class='add'>+	} else {</div><div class='add'>+		WREG32(base_reg + 0x34, 0);</div><div class='add'>+		WREG32(base_reg + 0x28, 0);</div><div class='add'>+		WREG32(base_reg + 0x304, 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 goya_etr_validate_address(struct hl_device *hdev, u64 addr,</div><div class='add'>+		u32 size)</div><div class='add'>+{</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u64 range_start, range_end;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;mmu_enable) {</div><div class='add'>+		range_start = prop-&gt;va_space_dram_start_address;</div><div class='add'>+		range_end = prop-&gt;va_space_dram_end_address;</div><div class='add'>+	} else {</div><div class='add'>+		range_start = prop-&gt;dram_user_base_address;</div><div class='add'>+		range_end = prop-&gt;dram_end_address;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hl_mem_area_inside_range(addr, size, range_start, range_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int goya_config_etr(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_params_etr *input;</div><div class='add'>+	u64 base_reg = mmPSOC_ETR_BASE - CFG_BASE;</div><div class='add'>+	u32 val;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	WREG32(base_reg + 0xFB0, CORESIGHT_UNLOCK);</div><div class='add'>+</div><div class='add'>+	val = RREG32(base_reg + 0x304);</div><div class='add'>+	val |= 0x1000;</div><div class='add'>+	WREG32(base_reg + 0x304, val);</div><div class='add'>+	val |= 0x40;</div><div class='add'>+	WREG32(base_reg + 0x304, val);</div><div class='add'>+</div><div class='add'>+	rc = goya_coresight_timeout(hdev, base_reg + 0x304, 6, false);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to %s ETR on timeout, error %d\n",</div><div class='add'>+				params-&gt;enable ? "enable" : "disable", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = goya_coresight_timeout(hdev, base_reg + 0xC, 2, true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to %s ETR on timeout, error %d\n",</div><div class='add'>+				params-&gt;enable ? "enable" : "disable", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WREG32(base_reg + 0x20, 0);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;enable) {</div><div class='add'>+		input = params-&gt;input;</div><div class='add'>+</div><div class='add'>+		if (!input)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (input-&gt;buffer_size == 0) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"ETR buffer size should be bigger than 0\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!goya_etr_validate_address(hdev,</div><div class='add'>+				input-&gt;buffer_address, input-&gt;buffer_size)) {</div><div class='add'>+			dev_err(hdev-&gt;dev, "buffer address is not valid\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0x34, 0x3FFC);</div><div class='add'>+		WREG32(base_reg + 0x4, input-&gt;buffer_size);</div><div class='add'>+		WREG32(base_reg + 0x28, input-&gt;sink_mode);</div><div class='add'>+		WREG32(base_reg + 0x110, 0x700);</div><div class='add'>+		WREG32(base_reg + 0x118,</div><div class='add'>+				lower_32_bits(input-&gt;buffer_address));</div><div class='add'>+		WREG32(base_reg + 0x11C,</div><div class='add'>+				upper_32_bits(input-&gt;buffer_address));</div><div class='add'>+		WREG32(base_reg + 0x304, 3);</div><div class='add'>+		WREG32(base_reg + 0x308, 0xA);</div><div class='add'>+		WREG32(base_reg + 0x20, 1);</div><div class='add'>+	} else {</div><div class='add'>+		WREG32(base_reg + 0x34, 0);</div><div class='add'>+		WREG32(base_reg + 0x4, 0x400);</div><div class='add'>+		WREG32(base_reg + 0x118, 0);</div><div class='add'>+		WREG32(base_reg + 0x11C, 0);</div><div class='add'>+		WREG32(base_reg + 0x308, 0);</div><div class='add'>+		WREG32(base_reg + 0x28, 0);</div><div class='add'>+		WREG32(base_reg + 0x304, 0);</div><div class='add'>+</div><div class='add'>+		if (params-&gt;output_size &gt;= sizeof(u32))</div><div class='add'>+			*(u32 *) params-&gt;output = RREG32(base_reg + 0x18);</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 goya_config_funnel(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	WREG32(debug_funnel_regs[params-&gt;reg_idx] - CFG_BASE + 0xFB0,</div><div class='add'>+			CORESIGHT_UNLOCK);</div><div class='add'>+</div><div class='add'>+	WREG32(debug_funnel_regs[params-&gt;reg_idx] - CFG_BASE,</div><div class='add'>+			params-&gt;enable ? 0x33F : 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 goya_config_bmon(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_params_bmon *input;</div><div class='add'>+	u64 base_reg = debug_bmon_regs[params-&gt;reg_idx] - CFG_BASE;</div><div class='add'>+	u32 pcie_base = 0;</div><div class='add'>+</div><div class='add'>+	WREG32(base_reg + 0x104, 1);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;enable) {</div><div class='add'>+		input = params-&gt;input;</div><div class='add'>+</div><div class='add'>+		if (!input)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0x200, lower_32_bits(input-&gt;start_addr0));</div><div class='add'>+		WREG32(base_reg + 0x204, upper_32_bits(input-&gt;start_addr0));</div><div class='add'>+		WREG32(base_reg + 0x208, lower_32_bits(input-&gt;addr_mask0));</div><div class='add'>+		WREG32(base_reg + 0x20C, upper_32_bits(input-&gt;addr_mask0));</div><div class='add'>+		WREG32(base_reg + 0x240, lower_32_bits(input-&gt;start_addr1));</div><div class='add'>+		WREG32(base_reg + 0x244, upper_32_bits(input-&gt;start_addr1));</div><div class='add'>+		WREG32(base_reg + 0x248, lower_32_bits(input-&gt;addr_mask1));</div><div class='add'>+		WREG32(base_reg + 0x24C, upper_32_bits(input-&gt;addr_mask1));</div><div class='add'>+		WREG32(base_reg + 0x224, 0);</div><div class='add'>+		WREG32(base_reg + 0x234, 0);</div><div class='add'>+		WREG32(base_reg + 0x30C, input-&gt;bw_win);</div><div class='add'>+		WREG32(base_reg + 0x308, input-&gt;win_capture);</div><div class='add'>+</div><div class='add'>+		/* PCIE IF BMON bug WA */</div><div class='add'>+		if (params-&gt;reg_idx != GOYA_BMON_PCIE_MSTR_RD &amp;&amp;</div><div class='add'>+				params-&gt;reg_idx != GOYA_BMON_PCIE_MSTR_WR &amp;&amp;</div><div class='add'>+				params-&gt;reg_idx != GOYA_BMON_PCIE_SLV_RD &amp;&amp;</div><div class='add'>+				params-&gt;reg_idx != GOYA_BMON_PCIE_SLV_WR)</div><div class='add'>+			pcie_base = 0xA000000;</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0x700, pcie_base | 0xB00 | (input-&gt;id &lt;&lt; 12));</div><div class='add'>+		WREG32(base_reg + 0x708, pcie_base | 0xA00 | (input-&gt;id &lt;&lt; 12));</div><div class='add'>+		WREG32(base_reg + 0x70C, pcie_base | 0xC00 | (input-&gt;id &lt;&lt; 12));</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0x100, 0x11);</div><div class='add'>+		WREG32(base_reg + 0x304, 0x1);</div><div class='add'>+	} else {</div><div class='add'>+		WREG32(base_reg + 0x200, 0);</div><div class='add'>+		WREG32(base_reg + 0x204, 0);</div><div class='add'>+		WREG32(base_reg + 0x208, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0x20C, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0x240, 0);</div><div class='add'>+		WREG32(base_reg + 0x244, 0);</div><div class='add'>+		WREG32(base_reg + 0x248, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0x24C, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0x224, 0xFFFFFFFF);</div><div class='add'>+		WREG32(base_reg + 0x234, 0x1070F);</div><div class='add'>+		WREG32(base_reg + 0x30C, 0);</div><div class='add'>+		WREG32(base_reg + 0x308, 0xFFFF);</div><div class='add'>+		WREG32(base_reg + 0x700, 0xA000B00);</div><div class='add'>+		WREG32(base_reg + 0x708, 0xA000A00);</div><div class='add'>+		WREG32(base_reg + 0x70C, 0xA000C00);</div><div class='add'>+		WREG32(base_reg + 0x100, 1);</div><div class='add'>+		WREG32(base_reg + 0x304, 0);</div><div class='add'>+		WREG32(base_reg + 0x104, 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 goya_config_spmu(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	u64 base_reg = debug_spmu_regs[params-&gt;reg_idx] - CFG_BASE;</div><div class='add'>+	struct hl_debug_params_spmu *input = params-&gt;input;</div><div class='add'>+	u64 *output;</div><div class='add'>+	u32 output_arr_len;</div><div class='add'>+	u32 events_num;</div><div class='add'>+	u32 overflow_idx;</div><div class='add'>+	u32 cycle_cnt_idx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;enable) {</div><div class='add'>+		input = params-&gt;input;</div><div class='add'>+</div><div class='add'>+		if (!input)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (input-&gt;event_types_num &lt; 3) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"not enough values for SPMU enable\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0xE04, 0x41013046);</div><div class='add'>+		WREG32(base_reg + 0xE04, 0x41013040);</div><div class='add'>+</div><div class='add'>+		for (i = 0 ; i &lt; input-&gt;event_types_num ; i++)</div><div class='add'>+			WREG32(base_reg + 0x400 + i * 4, input-&gt;event_types[i]);</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0xE04, 0x41013041);</div><div class='add'>+		WREG32(base_reg + 0xC00, 0x8000003F);</div><div class='add'>+	} else {</div><div class='add'>+		output = params-&gt;output;</div><div class='add'>+		output_arr_len = params-&gt;output_size / 8;</div><div class='add'>+		events_num = output_arr_len - 2;</div><div class='add'>+		overflow_idx = output_arr_len - 2;</div><div class='add'>+		cycle_cnt_idx = output_arr_len - 1;</div><div class='add'>+</div><div class='add'>+		if (!output)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (output_arr_len &lt; 3) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"not enough values for SPMU disable\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0xE04, 0x41013040);</div><div class='add'>+</div><div class='add'>+		for (i = 0 ; i &lt; events_num ; i++)</div><div class='add'>+			output[i] = RREG32(base_reg + i * 8);</div><div class='add'>+</div><div class='add'>+		output[overflow_idx] = RREG32(base_reg + 0xCC0);</div><div class='add'>+</div><div class='add'>+		output[cycle_cnt_idx] = RREG32(base_reg + 0xFC);</div><div class='add'>+		output[cycle_cnt_idx] &lt;&lt;= 32;</div><div class='add'>+		output[cycle_cnt_idx] |= RREG32(base_reg + 0xF8);</div><div class='add'>+</div><div class='add'>+		WREG32(base_reg + 0xCC0, 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 goya_config_timestamp(struct hl_device *hdev,</div><div class='add'>+		struct hl_debug_params *params)</div><div class='add'>+{</div><div class='add'>+	WREG32(mmPSOC_TIMESTAMP_BASE - CFG_BASE, 0);</div><div class='add'>+	if (params-&gt;enable) {</div><div class='add'>+		WREG32(mmPSOC_TIMESTAMP_BASE - CFG_BASE + 0xC, 0);</div><div class='add'>+		WREG32(mmPSOC_TIMESTAMP_BASE - CFG_BASE + 0x8, 0);</div><div class='add'>+		WREG32(mmPSOC_TIMESTAMP_BASE - CFG_BASE, 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'>+int goya_debug_coresight(struct hl_device *hdev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_params *params = data;</div><div class='add'>+	u32 val;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;op) {</div><div class='add'>+	case HL_DEBUG_OP_STM:</div><div class='add'>+		rc = goya_config_stm(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+	case HL_DEBUG_OP_ETF:</div><div class='add'>+		rc = goya_config_etf(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+	case HL_DEBUG_OP_ETR:</div><div class='add'>+		rc = goya_config_etr(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+	case HL_DEBUG_OP_FUNNEL:</div><div class='add'>+		rc = goya_config_funnel(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+	case HL_DEBUG_OP_BMON:</div><div class='add'>+		rc = goya_config_bmon(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+	case HL_DEBUG_OP_SPMU:</div><div class='add'>+		rc = goya_config_spmu(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+	case HL_DEBUG_OP_TIMESTAMP:</div><div class='add'>+		rc = goya_config_timestamp(hdev, params);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(hdev-&gt;dev, "Unknown coresight id %d\n", params-&gt;op);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Perform read from the device to flush all configuration */</div><div class='add'>+	val = RREG32(mmPCIE_DBI_DEVICE_ID_VENDOR_ID_REG);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/habanalabs/goya/goya_security.c b/drivers/misc/habanalabs/goya/goya_security.c<br/>index 575003238401..d95d1b2f860d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goya_security.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/goya/goya_security.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/goya/goya_security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/goya/goya_security.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "goyaP.h"</div><div class='add'>+#include "include/goya/asic_reg/goya_regs.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * goya_set_block_as_protected - set the given block as protected</div><div class='hunk'>@@ -2159,6 +2160,8 @@ static void goya_init_protection_bits(struct hl_device *hdev)</div><div class='ctx'> 	 * Bits 7-11 represents the word offset inside the 128 bytes.</div><div class='ctx'> 	 * Bits 2-6 represents the bit location inside the word.</div><div class='ctx'> 	 */</div><div class='add'>+	u32 pb_addr, mask;</div><div class='add'>+	u8 word_offset;</div><div class='ctx'> </div><div class='ctx'> 	goya_pb_set_block(hdev, mmPCI_NRTR_BASE);</div><div class='ctx'> 	goya_pb_set_block(hdev, mmPCI_RD_REGULATOR_BASE);</div><div class='hunk'>@@ -2237,6 +2240,14 @@ static void goya_init_protection_bits(struct hl_device *hdev)</div><div class='ctx'> 	goya_pb_set_block(hdev, mmPCIE_AUX_BASE);</div><div class='ctx'> 	goya_pb_set_block(hdev, mmPCIE_DB_RSV_BASE);</div><div class='ctx'> 	goya_pb_set_block(hdev, mmPCIE_PHY_BASE);</div><div class='add'>+	goya_pb_set_block(hdev, mmTPC0_NRTR_BASE);</div><div class='add'>+	goya_pb_set_block(hdev, mmTPC_PLL_BASE);</div><div class='add'>+</div><div class='add'>+	pb_addr = (mmTPC_PLL_CLK_RLX_0 &amp; ~0xFFF) + PROT_BITS_OFFS;</div><div class='add'>+	word_offset = ((mmTPC_PLL_CLK_RLX_0 &amp; PROT_BITS_OFFS) &gt;&gt; 7) &lt;&lt; 2;</div><div class='add'>+	mask = 1 &lt;&lt; ((mmTPC_PLL_CLK_RLX_0 &amp; 0x7C) &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	WREG32(pb_addr + word_offset, mask);</div><div class='ctx'> </div><div class='ctx'> 	goya_init_mme_protection_bits(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2294,8 +2305,8 @@ void goya_init_security(struct hl_device *hdev)</div><div class='ctx'> 	u32 lbw_rng10_base = 0xFCC60000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='ctx'> 	u32 lbw_rng10_mask = 0xFFFE0000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='ctx'> </div><div class='del'>-	u32 lbw_rng11_base = 0xFCE00000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='del'>-	u32 lbw_rng11_mask = 0xFFFFC000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='add'>+	u32 lbw_rng11_base = 0xFCE02000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='add'>+	u32 lbw_rng11_mask = 0xFFFFE000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='ctx'> </div><div class='ctx'> 	u32 lbw_rng12_base = 0xFE484000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='ctx'> 	u32 lbw_rng12_mask = 0xFFFFF000 &amp; DMA_MACRO_LBW_RANGE_BASE_R_MASK;</div><div class='head'>diff --git a/drivers/misc/habanalabs/habanalabs.h b/drivers/misc/habanalabs/habanalabs.h<br/>index a7c95e9f9b9a..71243b319920 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/habanalabs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/habanalabs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/habanalabs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/habanalabs.h</a></div><div class='hunk'>@@ -11,8 +11,6 @@</div><div class='ctx'> #include "include/armcp_if.h"</div><div class='ctx'> #include "include/qman_if.h"</div><div class='ctx'> </div><div class='del'>-#define pr_fmt(fmt)			"habanalabs: " fmt</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='ctx'> #include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='hunk'>@@ -33,6 +31,9 @@</div><div class='ctx'> </div><div class='ctx'> #define HL_PLL_LOW_JOB_FREQ_USEC	5000000 /* 5 s */</div><div class='ctx'> </div><div class='add'>+#define HL_ARMCP_INFO_TIMEOUT_USEC	10000000 /* 10s */</div><div class='add'>+#define HL_ARMCP_EEPROM_TIMEOUT_USEC	10000000 /* 10s */</div><div class='add'>+</div><div class='ctx'> #define HL_MAX_QUEUES			128</div><div class='ctx'> </div><div class='ctx'> #define HL_MAX_JOBS_PER_CS		64</div><div class='hunk'>@@ -48,8 +49,9 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pgt_info - MMU hop page info.</div><div class='del'>- * @node: hash linked-list node for the pgts hash of pgts.</div><div class='del'>- * @addr: physical address of the pgt.</div><div class='add'>+ * @node: hash linked-list node for the pgts shadow hash of pgts.</div><div class='add'>+ * @phys_addr: physical address of the pgt.</div><div class='add'>+ * @shadow_addr: shadow hop in the host.</div><div class='ctx'>  * @ctx: pointer to the owner ctx.</div><div class='ctx'>  * @num_of_ptes: indicates how many ptes are used in the pgt.</div><div class='ctx'>  *</div><div class='hunk'>@@ -59,10 +61,11 @@</div><div class='ctx'>  * page, it is freed with its pgt_info structure.</div><div class='ctx'>  */</div><div class='ctx'> struct pgt_info {</div><div class='del'>-	struct hlist_node node;</div><div class='del'>-	u64 addr;</div><div class='del'>-	struct hl_ctx *ctx;</div><div class='del'>-	int num_of_ptes;</div><div class='add'>+	struct hlist_node	node;</div><div class='add'>+	u64			phys_addr;</div><div class='add'>+	u64			shadow_addr;</div><div class='add'>+	struct hl_ctx		*ctx;</div><div class='add'>+	int			num_of_ptes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hl_device;</div><div class='hunk'>@@ -132,8 +135,6 @@ enum hl_device_hw_state {</div><div class='ctx'>  * @dram_user_base_address: DRAM physical start address for user access.</div><div class='ctx'>  * @dram_size: DRAM total size.</div><div class='ctx'>  * @dram_pci_bar_size: size of PCI bar towards DRAM.</div><div class='del'>- * @host_phys_base_address: base physical address of host memory for</div><div class='del'>- *				transactions that the device generates.</div><div class='ctx'>  * @max_power_default: max power of the device after reset</div><div class='ctx'>  * @va_space_host_start_address: base address of virtual memory range for</div><div class='ctx'>  *                               mapping host memory.</div><div class='hunk'>@@ -145,6 +146,8 @@ enum hl_device_hw_state {</div><div class='ctx'>  *                             mapping DRAM memory.</div><div class='ctx'>  * @dram_size_for_default_page_mapping: DRAM size needed to map to avoid page</div><div class='ctx'>  *                                      fault.</div><div class='add'>+ * @pcie_dbi_base_address: Base address of the PCIE_DBI block.</div><div class='add'>+ * @pcie_aux_dbi_reg_addr: Address of the PCIE_AUX DBI register.</div><div class='ctx'>  * @mmu_pgt_addr: base physical address in DRAM of MMU page tables.</div><div class='ctx'>  * @mmu_dram_default_page_addr: DRAM default page physical address.</div><div class='ctx'>  * @mmu_pgt_size: MMU page tables total size.</div><div class='hunk'>@@ -179,13 +182,14 @@ struct asic_fixed_properties {</div><div class='ctx'> 	u64			dram_user_base_address;</div><div class='ctx'> 	u64			dram_size;</div><div class='ctx'> 	u64			dram_pci_bar_size;</div><div class='del'>-	u64			host_phys_base_address;</div><div class='ctx'> 	u64			max_power_default;</div><div class='ctx'> 	u64			va_space_host_start_address;</div><div class='ctx'> 	u64			va_space_host_end_address;</div><div class='ctx'> 	u64			va_space_dram_start_address;</div><div class='ctx'> 	u64			va_space_dram_end_address;</div><div class='ctx'> 	u64			dram_size_for_default_page_mapping;</div><div class='add'>+	u64			pcie_dbi_base_address;</div><div class='add'>+	u64			pcie_aux_dbi_reg_addr;</div><div class='ctx'> 	u64			mmu_pgt_addr;</div><div class='ctx'> 	u64			mmu_dram_default_page_addr;</div><div class='ctx'> 	u32			mmu_pgt_size;</div><div class='hunk'>@@ -314,6 +318,18 @@ struct hl_cs_job;</div><div class='ctx'> #define HL_EQ_LENGTH			64</div><div class='ctx'> #define HL_EQ_SIZE_IN_BYTES		(HL_EQ_LENGTH * HL_EQ_ENTRY_SIZE)</div><div class='ctx'> </div><div class='add'>+#define HL_CPU_PKT_SHIFT		5</div><div class='add'>+#define HL_CPU_PKT_SIZE			(1 &lt;&lt; HL_CPU_PKT_SHIFT)</div><div class='add'>+#define HL_CPU_PKT_MASK			(~((1 &lt;&lt; HL_CPU_PKT_SHIFT) - 1))</div><div class='add'>+#define HL_CPU_MAX_PKTS_IN_CB		32</div><div class='add'>+#define HL_CPU_CB_SIZE			(HL_CPU_PKT_SIZE * \</div><div class='add'>+					 HL_CPU_MAX_PKTS_IN_CB)</div><div class='add'>+#define HL_CPU_CB_QUEUE_SIZE		(HL_QUEUE_LENGTH * HL_CPU_CB_SIZE)</div><div class='add'>+</div><div class='add'>+/* KMD &lt;-&gt; ArmCP shared memory size (EQ + PQ + CPU CB queue) */</div><div class='add'>+#define HL_CPU_ACCESSIBLE_MEM_SIZE	(HL_EQ_SIZE_IN_BYTES + \</div><div class='add'>+					 HL_QUEUE_SIZE_IN_BYTES + \</div><div class='add'>+					 HL_CPU_CB_QUEUE_SIZE)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct hl_hw_queue - describes a H/W transport queue.</div><div class='hunk'>@@ -381,14 +397,12 @@ struct hl_eq {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum hl_asic_type - supported ASIC types.</div><div class='del'>- * @ASIC_AUTO_DETECT: ASIC type will be automatically set.</div><div class='del'>- * @ASIC_GOYA: Goya device.</div><div class='ctx'>  * @ASIC_INVALID: Invalid ASIC type.</div><div class='add'>+ * @ASIC_GOYA: Goya device.</div><div class='ctx'>  */</div><div class='ctx'> enum hl_asic_type {</div><div class='del'>-	ASIC_AUTO_DETECT,</div><div class='del'>-	ASIC_GOYA,</div><div class='del'>-	ASIC_INVALID</div><div class='add'>+	ASIC_INVALID,</div><div class='add'>+	ASIC_GOYA</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hl_cs_parser;</div><div class='hunk'>@@ -436,19 +450,19 @@ enum hl_pll_frequency {</div><div class='ctx'>  * @cb_mmap: maps a CB.</div><div class='ctx'>  * @ring_doorbell: increment PI on a given QMAN.</div><div class='ctx'>  * @flush_pq_write: flush PQ entry write if necessary, WARN if flushing failed.</div><div class='del'>- * @dma_alloc_coherent: Allocate coherent DMA memory by calling</div><div class='del'>- *                      dma_alloc_coherent(). This is ASIC function because its</div><div class='del'>- *                      implementation is not trivial when the driver is loaded</div><div class='del'>- *                      in simulation mode (not upstreamed).</div><div class='del'>- * @dma_free_coherent: Free coherent DMA memory by calling dma_free_coherent().</div><div class='del'>- *                     This is ASIC function because its implementation is not</div><div class='del'>- *                     trivial when the driver is loaded in simulation mode</div><div class='del'>- *                     (not upstreamed).</div><div class='add'>+ * @asic_dma_alloc_coherent: Allocate coherent DMA memory by calling</div><div class='add'>+ *                           dma_alloc_coherent(). This is ASIC function because</div><div class='add'>+ *                           its implementation is not trivial when the driver</div><div class='add'>+ *                           is loaded in simulation mode (not upstreamed).</div><div class='add'>+ * @asic_dma_free_coherent:  Free coherent DMA memory by calling</div><div class='add'>+ *                           dma_free_coherent(). This is ASIC function because</div><div class='add'>+ *                           its implementation is not trivial when the driver</div><div class='add'>+ *                           is loaded in simulation mode (not upstreamed).</div><div class='ctx'>  * @get_int_queue_base: get the internal queue base address.</div><div class='ctx'>  * @test_queues: run simple test on all queues for sanity check.</div><div class='del'>- * @dma_pool_zalloc: small DMA allocation of coherent memory from DMA pool.</div><div class='del'>- *                   size of allocation is HL_DMA_POOL_BLK_SIZE.</div><div class='del'>- * @dma_pool_free: free small DMA allocation from pool.</div><div class='add'>+ * @asic_dma_pool_zalloc: small DMA allocation of coherent memory from DMA pool.</div><div class='add'>+ *                        size of allocation is HL_DMA_POOL_BLK_SIZE.</div><div class='add'>+ * @asic_dma_pool_free: free small DMA allocation from pool.</div><div class='ctx'>  * @cpu_accessible_dma_pool_alloc: allocate CPU PQ packet from DMA pool.</div><div class='ctx'>  * @cpu_accessible_dma_pool_free: free CPU PQ packet from DMA pool.</div><div class='ctx'>  * @hl_dma_unmap_sg: DMA unmap scatter-gather list.</div><div class='hunk'>@@ -472,8 +486,7 @@ enum hl_pll_frequency {</div><div class='ctx'>  * @mmu_invalidate_cache_range: flush specific MMU STLB cache lines with</div><div class='ctx'>  *                              ASID-VA-size mask.</div><div class='ctx'>  * @send_heartbeat: send is-alive packet to ArmCP and verify response.</div><div class='del'>- * @enable_clock_gating: enable clock gating for reducing power consumption.</div><div class='del'>- * @disable_clock_gating: disable clock for accessing registers on HBW.</div><div class='add'>+ * @debug_coresight: perform certain actions on Coresight for debugging.</div><div class='ctx'>  * @is_device_idle: return true if device is idle, false otherwise.</div><div class='ctx'>  * @soft_reset_late_init: perform certain actions needed after soft reset.</div><div class='ctx'>  * @hw_queues_lock: acquire H/W queues lock.</div><div class='hunk'>@@ -482,6 +495,12 @@ enum hl_pll_frequency {</div><div class='ctx'>  * @get_eeprom_data: retrieve EEPROM data from F/W.</div><div class='ctx'>  * @send_cpu_message: send buffer to ArmCP.</div><div class='ctx'>  * @get_hw_state: retrieve the H/W state</div><div class='add'>+ * @pci_bars_map: Map PCI BARs.</div><div class='add'>+ * @set_dram_bar_base: Set DRAM BAR to map specific device address. Returns</div><div class='add'>+ *                     old address the bar pointed to or U64_MAX for failure</div><div class='add'>+ * @init_iatu: Initialize the iATU unit inside the PCI controller.</div><div class='add'>+ * @rreg: Read a register. Needed for simulator support.</div><div class='add'>+ * @wreg: Write a register. Needed for simulator support.</div><div class='ctx'>  */</div><div class='ctx'> struct hl_asic_funcs {</div><div class='ctx'> 	int (*early_init)(struct hl_device *hdev);</div><div class='hunk'>@@ -499,27 +518,27 @@ struct hl_asic_funcs {</div><div class='ctx'> 			u64 kaddress, phys_addr_t paddress, u32 size);</div><div class='ctx'> 	void (*ring_doorbell)(struct hl_device *hdev, u32 hw_queue_id, u32 pi);</div><div class='ctx'> 	void (*flush_pq_write)(struct hl_device *hdev, u64 *pq, u64 exp_val);</div><div class='del'>-	void* (*dma_alloc_coherent)(struct hl_device *hdev, size_t size,</div><div class='add'>+	void* (*asic_dma_alloc_coherent)(struct hl_device *hdev, size_t size,</div><div class='ctx'> 					dma_addr_t *dma_handle, gfp_t flag);</div><div class='del'>-	void (*dma_free_coherent)(struct hl_device *hdev, size_t size,</div><div class='add'>+	void (*asic_dma_free_coherent)(struct hl_device *hdev, size_t size,</div><div class='ctx'> 					void *cpu_addr, dma_addr_t dma_handle);</div><div class='ctx'> 	void* (*get_int_queue_base)(struct hl_device *hdev, u32 queue_id,</div><div class='ctx'> 				dma_addr_t *dma_handle, u16 *queue_len);</div><div class='ctx'> 	int (*test_queues)(struct hl_device *hdev);</div><div class='del'>-	void* (*dma_pool_zalloc)(struct hl_device *hdev, size_t size,</div><div class='add'>+	void* (*asic_dma_pool_zalloc)(struct hl_device *hdev, size_t size,</div><div class='ctx'> 				gfp_t mem_flags, dma_addr_t *dma_handle);</div><div class='del'>-	void (*dma_pool_free)(struct hl_device *hdev, void *vaddr,</div><div class='add'>+	void (*asic_dma_pool_free)(struct hl_device *hdev, void *vaddr,</div><div class='ctx'> 				dma_addr_t dma_addr);</div><div class='ctx'> 	void* (*cpu_accessible_dma_pool_alloc)(struct hl_device *hdev,</div><div class='ctx'> 				size_t size, dma_addr_t *dma_handle);</div><div class='ctx'> 	void (*cpu_accessible_dma_pool_free)(struct hl_device *hdev,</div><div class='ctx'> 				size_t size, void *vaddr);</div><div class='ctx'> 	void (*hl_dma_unmap_sg)(struct hl_device *hdev,</div><div class='del'>-				struct scatterlist *sg, int nents,</div><div class='add'>+				struct scatterlist *sgl, int nents,</div><div class='ctx'> 				enum dma_data_direction dir);</div><div class='ctx'> 	int (*cs_parser)(struct hl_device *hdev, struct hl_cs_parser *parser);</div><div class='ctx'> 	int (*asic_dma_map_sg)(struct hl_device *hdev,</div><div class='del'>-				struct scatterlist *sg, int nents,</div><div class='add'>+				struct scatterlist *sgl, int nents,</div><div class='ctx'> 				enum dma_data_direction dir);</div><div class='ctx'> 	u32 (*get_dma_desc_list_size)(struct hl_device *hdev,</div><div class='ctx'> 					struct sg_table *sgt);</div><div class='hunk'>@@ -543,9 +562,8 @@ struct hl_asic_funcs {</div><div class='ctx'> 	void (*mmu_invalidate_cache_range)(struct hl_device *hdev, bool is_hard,</div><div class='ctx'> 			u32 asid, u64 va, u64 size);</div><div class='ctx'> 	int (*send_heartbeat)(struct hl_device *hdev);</div><div class='del'>-	void (*enable_clock_gating)(struct hl_device *hdev);</div><div class='del'>-	void (*disable_clock_gating)(struct hl_device *hdev);</div><div class='del'>-	bool (*is_device_idle)(struct hl_device *hdev);</div><div class='add'>+	int (*debug_coresight)(struct hl_device *hdev, void *data);</div><div class='add'>+	bool (*is_device_idle)(struct hl_device *hdev, char *buf, size_t size);</div><div class='ctx'> 	int (*soft_reset_late_init)(struct hl_device *hdev);</div><div class='ctx'> 	void (*hw_queues_lock)(struct hl_device *hdev);</div><div class='ctx'> 	void (*hw_queues_unlock)(struct hl_device *hdev);</div><div class='hunk'>@@ -555,6 +573,11 @@ struct hl_asic_funcs {</div><div class='ctx'> 	int (*send_cpu_message)(struct hl_device *hdev, u32 *msg,</div><div class='ctx'> 				u16 len, u32 timeout, long *result);</div><div class='ctx'> 	enum hl_device_hw_state (*get_hw_state)(struct hl_device *hdev);</div><div class='add'>+	int (*pci_bars_map)(struct hl_device *hdev);</div><div class='add'>+	u64 (*set_dram_bar_base)(struct hl_device *hdev, u64 addr);</div><div class='add'>+	int (*init_iatu)(struct hl_device *hdev);</div><div class='add'>+	u32 (*rreg)(struct hl_device *hdev, u32 reg);</div><div class='add'>+	void (*wreg)(struct hl_device *hdev, u32 reg, u32 val);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -582,7 +605,8 @@ struct hl_va_range {</div><div class='ctx'>  * struct hl_ctx - user/kernel context.</div><div class='ctx'>  * @mem_hash: holds mapping from virtual address to virtual memory area</div><div class='ctx'>  *		descriptor (hl_vm_phys_pg_list or hl_userptr).</div><div class='del'>- * @mmu_hash: holds a mapping from virtual address to pgt_info structure.</div><div class='add'>+ * @mmu_phys_hash: holds a mapping from physical address to pgt_info structure.</div><div class='add'>+ * @mmu_shadow_hash: holds a mapping from shadow address to pgt_info structure.</div><div class='ctx'>  * @hpriv: pointer to the private (KMD) data of the process (fd).</div><div class='ctx'>  * @hdev: pointer to the device structure.</div><div class='ctx'>  * @refcount: reference counter for the context. Context is released only when</div><div class='hunk'>@@ -601,17 +625,19 @@ struct hl_va_range {</div><div class='ctx'>  *                     DRAM mapping.</div><div class='ctx'>  * @cs_lock: spinlock to protect cs_sequence.</div><div class='ctx'>  * @dram_phys_mem: amount of used physical DRAM memory by this context.</div><div class='del'>- * @thread_restore_token: token to prevent multiple threads of the same context</div><div class='del'>- *				from running the restore phase. Only one thread</div><div class='del'>- *				should run it.</div><div class='del'>- * @thread_restore_wait_token: token to prevent the threads that didn't run</div><div class='del'>- *				the restore phase from moving to their execution</div><div class='del'>- *				phase before the restore phase has finished.</div><div class='add'>+ * @thread_ctx_switch_token: token to prevent multiple threads of the same</div><div class='add'>+ *				context	from running the context switch phase.</div><div class='add'>+ *				Only a single thread should run it.</div><div class='add'>+ * @thread_ctx_switch_wait_token: token to prevent the threads that didn't run</div><div class='add'>+ *				the context switch phase from moving to their</div><div class='add'>+ *				execution phase before the context switch phase</div><div class='add'>+ *				has finished.</div><div class='ctx'>  * @asid: context's unique address space ID in the device's MMU.</div><div class='ctx'>  */</div><div class='ctx'> struct hl_ctx {</div><div class='ctx'> 	DECLARE_HASHTABLE(mem_hash, MEM_HASH_TABLE_BITS);</div><div class='del'>-	DECLARE_HASHTABLE(mmu_hash, MMU_HASH_TABLE_BITS);</div><div class='add'>+	DECLARE_HASHTABLE(mmu_phys_hash, MMU_HASH_TABLE_BITS);</div><div class='add'>+	DECLARE_HASHTABLE(mmu_shadow_hash, MMU_HASH_TABLE_BITS);</div><div class='ctx'> 	struct hl_fpriv		*hpriv;</div><div class='ctx'> 	struct hl_device	*hdev;</div><div class='ctx'> 	struct kref		refcount;</div><div class='hunk'>@@ -625,8 +651,8 @@ struct hl_ctx {</div><div class='ctx'> 	u64			*dram_default_hops;</div><div class='ctx'> 	spinlock_t		cs_lock;</div><div class='ctx'> 	atomic64_t		dram_phys_mem;</div><div class='del'>-	atomic_t		thread_restore_token;</div><div class='del'>-	u32			thread_restore_wait_token;</div><div class='add'>+	atomic_t		thread_ctx_switch_token;</div><div class='add'>+	u32			thread_ctx_switch_wait_token;</div><div class='ctx'> 	u32			asid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -753,8 +779,6 @@ struct hl_cs_job {</div><div class='ctx'>  * @patched_cb_size: the size of the CB after parsing.</div><div class='ctx'>  * @ext_queue: whether the job is for external queue or internal queue.</div><div class='ctx'>  * @job_id: the id of the related job inside the related CS.</div><div class='del'>- * @use_virt_addr: whether to treat the addresses in the CB as virtual during</div><div class='del'>- *			parsing.</div><div class='ctx'>  */</div><div class='ctx'> struct hl_cs_parser {</div><div class='ctx'> 	struct hl_cb		*user_cb;</div><div class='hunk'>@@ -767,7 +791,6 @@ struct hl_cs_parser {</div><div class='ctx'> 	u32			patched_cb_size;</div><div class='ctx'> 	u8			ext_queue;</div><div class='ctx'> 	u8			job_id;</div><div class='del'>-	u8			use_virt_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -793,11 +816,11 @@ struct hl_vm_hash_node {</div><div class='ctx'>  * struct hl_vm_phys_pg_pack - physical page pack.</div><div class='ctx'>  * @vm_type: describes the type of the virtual area descriptor.</div><div class='ctx'>  * @pages: the physical page array.</div><div class='add'>+ * @npages: num physical pages in the pack.</div><div class='add'>+ * @total_size: total size of all the pages in this list.</div><div class='ctx'>  * @mapping_cnt: number of shared mappings.</div><div class='ctx'>  * @asid: the context related to this list.</div><div class='del'>- * @npages: num physical pages in the pack.</div><div class='ctx'>  * @page_size: size of each page in the pack.</div><div class='del'>- * @total_size: total size of all the pages in this list.</div><div class='ctx'>  * @flags: HL_MEM_* flags related to this list.</div><div class='ctx'>  * @handle: the provided handle related to this list.</div><div class='ctx'>  * @offset: offset from the first page.</div><div class='hunk'>@@ -807,11 +830,11 @@ struct hl_vm_hash_node {</div><div class='ctx'> struct hl_vm_phys_pg_pack {</div><div class='ctx'> 	enum vm_type_t		vm_type; /* must be first */</div><div class='ctx'> 	u64			*pages;</div><div class='add'>+	u64			npages;</div><div class='add'>+	u64			total_size;</div><div class='ctx'> 	atomic_t		mapping_cnt;</div><div class='ctx'> 	u32			asid;</div><div class='del'>-	u32			npages;</div><div class='ctx'> 	u32			page_size;</div><div class='del'>-	u32			total_size;</div><div class='ctx'> 	u32			flags;</div><div class='ctx'> 	u32			handle;</div><div class='ctx'> 	u32			offset;</div><div class='hunk'>@@ -850,6 +873,29 @@ struct hl_vm {</div><div class='ctx'> 	u8			init_done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DEBUG, PROFILING STRUCTURE</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hl_debug_params - Coresight debug parameters.</div><div class='add'>+ * @input: pointer to component specific input parameters.</div><div class='add'>+ * @output: pointer to component specific output parameters.</div><div class='add'>+ * @output_size: size of output buffer.</div><div class='add'>+ * @reg_idx: relevant register ID.</div><div class='add'>+ * @op: component operation to execute.</div><div class='add'>+ * @enable: true if to enable component debugging, false otherwise.</div><div class='add'>+ */</div><div class='add'>+struct hl_debug_params {</div><div class='add'>+	void *input;</div><div class='add'>+	void *output;</div><div class='add'>+	u32 output_size;</div><div class='add'>+	u32 reg_idx;</div><div class='add'>+	u32 op;</div><div class='add'>+	bool enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * FILE PRIVATE STRUCTURE</div><div class='ctx'>  */</div><div class='hunk'>@@ -973,13 +1019,10 @@ struct hl_dbg_device_entry {</div><div class='ctx'> u32 hl_rreg(struct hl_device *hdev, u32 reg);</div><div class='ctx'> void hl_wreg(struct hl_device *hdev, u32 reg, u32 val);</div><div class='ctx'> </div><div class='del'>-#define hl_poll_timeout(hdev, addr, val, cond, sleep_us, timeout_us) \</div><div class='del'>-	readl_poll_timeout(hdev-&gt;rmmio + addr, val, cond, sleep_us, timeout_us)</div><div class='del'>-</div><div class='del'>-#define RREG32(reg) hl_rreg(hdev, (reg))</div><div class='del'>-#define WREG32(reg, v) hl_wreg(hdev, (reg), (v))</div><div class='add'>+#define RREG32(reg) hdev-&gt;asic_funcs-&gt;rreg(hdev, (reg))</div><div class='add'>+#define WREG32(reg, v) hdev-&gt;asic_funcs-&gt;wreg(hdev, (reg), (v))</div><div class='ctx'> #define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n",	\</div><div class='del'>-				hl_rreg(hdev, (reg)))</div><div class='add'>+			hdev-&gt;asic_funcs-&gt;rreg(hdev, (reg)))</div><div class='ctx'> </div><div class='ctx'> #define WREG32_P(reg, val, mask)				\</div><div class='ctx'> 	do {							\</div><div class='hunk'>@@ -997,6 +1040,36 @@ void hl_wreg(struct hl_device *hdev, u32 reg, u32 val);</div><div class='ctx'> 	WREG32(mm##reg, (RREG32(mm##reg) &amp; ~REG_FIELD_MASK(reg, field)) | \</div><div class='ctx'> 			(val) &lt;&lt; REG_FIELD_SHIFT(reg, field))</div><div class='ctx'> </div><div class='add'>+#define hl_poll_timeout(hdev, addr, val, cond, sleep_us, timeout_us) \</div><div class='add'>+({ \</div><div class='add'>+	ktime_t __timeout; \</div><div class='add'>+	/* timeout should be longer when working with simulator */ \</div><div class='add'>+	if (hdev-&gt;pdev) \</div><div class='add'>+		__timeout = ktime_add_us(ktime_get(), timeout_us); \</div><div class='add'>+	else \</div><div class='add'>+		__timeout = ktime_add_us(ktime_get(), (timeout_us * 10)); \</div><div class='add'>+	might_sleep_if(sleep_us); \</div><div class='add'>+	for (;;) { \</div><div class='add'>+		(val) = RREG32(addr); \</div><div class='add'>+		if (cond) \</div><div class='add'>+			break; \</div><div class='add'>+		if (timeout_us &amp;&amp; ktime_compare(ktime_get(), __timeout) &gt; 0) { \</div><div class='add'>+			(val) = RREG32(addr); \</div><div class='add'>+			break; \</div><div class='add'>+		} \</div><div class='add'>+		if (sleep_us) \</div><div class='add'>+			usleep_range((sleep_us &gt;&gt; 2) + 1, sleep_us); \</div><div class='add'>+	} \</div><div class='add'>+	(cond) ? 0 : -ETIMEDOUT; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HL_ENG_BUSY(buf, size, fmt, ...) ({ \</div><div class='add'>+		if (buf) \</div><div class='add'>+			snprintf(buf, size, fmt, ##__VA_ARGS__); \</div><div class='add'>+		false; \</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> struct hwmon_chip_info;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1047,7 +1120,8 @@ struct hl_device_reset_work {</div><div class='ctx'>  * @asic_specific: ASIC specific information to use only from ASIC files.</div><div class='ctx'>  * @mmu_pgt_pool: pool of available MMU hops.</div><div class='ctx'>  * @vm: virtual memory manager for MMU.</div><div class='del'>- * @mmu_cache_lock: protects MMU cache invalidation as it can serve one context</div><div class='add'>+ * @mmu_cache_lock: protects MMU cache invalidation as it can serve one context.</div><div class='add'>+ * @mmu_shadow_hop0: shadow mapping of the MMU hop 0 zone.</div><div class='ctx'>  * @hwmon_dev: H/W monitor device.</div><div class='ctx'>  * @pm_mng_profile: current power management profile.</div><div class='ctx'>  * @hl_chip_info: ASIC's sensors information.</div><div class='hunk'>@@ -1056,13 +1130,15 @@ struct hl_device_reset_work {</div><div class='ctx'>  * @cb_pool_lock: protects the CB pool.</div><div class='ctx'>  * @user_ctx: current user context executing.</div><div class='ctx'>  * @dram_used_mem: current DRAM memory consumption.</div><div class='del'>- * @in_reset: is device in reset flow.</div><div class='del'>- * @curr_pll_profile: current PLL profile.</div><div class='del'>- * @fd_open_cnt: number of open user processes.</div><div class='ctx'>  * @timeout_jiffies: device CS timeout value.</div><div class='ctx'>  * @max_power: the max power of the device, as configured by the sysadmin. This</div><div class='ctx'>  *             value is saved so in case of hard-reset, KMD will restore this</div><div class='ctx'>  *             value and update the F/W after the re-initialization</div><div class='add'>+ * @in_reset: is device in reset flow.</div><div class='add'>+ * @curr_pll_profile: current PLL profile.</div><div class='add'>+ * @fd_open_cnt: number of open user processes.</div><div class='add'>+ * @cs_active_cnt: number of active command submissions on this device (active</div><div class='add'>+ *                 means already in H/W queues)</div><div class='ctx'>  * @major: habanalabs KMD major.</div><div class='ctx'>  * @high_pll: high PLL profile frequency.</div><div class='ctx'>  * @soft_reset_cnt: number of soft reset since KMD loading.</div><div class='hunk'>@@ -1080,6 +1156,7 @@ struct hl_device_reset_work {</div><div class='ctx'>  * @init_done: is the initialization of the device done.</div><div class='ctx'>  * @mmu_enable: is MMU enabled.</div><div class='ctx'>  * @device_cpu_disabled: is the device CPU disabled (due to timeouts)</div><div class='add'>+ * @dma_mask: the dma mask that was set for this device</div><div class='ctx'>  */</div><div class='ctx'> struct hl_device {</div><div class='ctx'> 	struct pci_dev			*pdev;</div><div class='hunk'>@@ -1115,6 +1192,7 @@ struct hl_device {</div><div class='ctx'> 	struct gen_pool			*mmu_pgt_pool;</div><div class='ctx'> 	struct hl_vm			vm;</div><div class='ctx'> 	struct mutex			mmu_cache_lock;</div><div class='add'>+	void				*mmu_shadow_hop0;</div><div class='ctx'> 	struct device			*hwmon_dev;</div><div class='ctx'> 	enum hl_pm_mng_profile		pm_mng_profile;</div><div class='ctx'> 	struct hwmon_chip_info		*hl_chip_info;</div><div class='hunk'>@@ -1128,11 +1206,12 @@ struct hl_device {</div><div class='ctx'> 	struct hl_ctx			*user_ctx;</div><div class='ctx'> </div><div class='ctx'> 	atomic64_t			dram_used_mem;</div><div class='add'>+	u64				timeout_jiffies;</div><div class='add'>+	u64				max_power;</div><div class='ctx'> 	atomic_t			in_reset;</div><div class='ctx'> 	atomic_t			curr_pll_profile;</div><div class='ctx'> 	atomic_t			fd_open_cnt;</div><div class='del'>-	u64				timeout_jiffies;</div><div class='del'>-	u64				max_power;</div><div class='add'>+	atomic_t			cs_active_cnt;</div><div class='ctx'> 	u32				major;</div><div class='ctx'> 	u32				high_pll;</div><div class='ctx'> 	u32				soft_reset_cnt;</div><div class='hunk'>@@ -1148,6 +1227,7 @@ struct hl_device {</div><div class='ctx'> 	u8				dram_default_page_mapping;</div><div class='ctx'> 	u8				init_done;</div><div class='ctx'> 	u8				device_cpu_disabled;</div><div class='add'>+	u8				dma_mask;</div><div class='ctx'> </div><div class='ctx'> 	/* Parameters for bring-up */</div><div class='ctx'> 	u8				mmu_enable;</div><div class='hunk'>@@ -1242,6 +1322,7 @@ static inline bool hl_mem_area_crosses_range(u64 address, u32 size,</div><div class='ctx'> </div><div class='ctx'> int hl_device_open(struct inode *inode, struct file *filp);</div><div class='ctx'> bool hl_device_disabled_or_in_reset(struct hl_device *hdev);</div><div class='add'>+enum hl_device_status hl_device_status(struct hl_device *hdev);</div><div class='ctx'> int create_hdev(struct hl_device **dev, struct pci_dev *pdev,</div><div class='ctx'> 		enum hl_asic_type asic_type, int minor);</div><div class='ctx'> void destroy_hdev(struct hl_device *hdev);</div><div class='hunk'>@@ -1348,6 +1429,32 @@ int hl_mmu_unmap(struct hl_ctx *ctx, u64 virt_addr, u32 page_size);</div><div class='ctx'> void hl_mmu_swap_out(struct hl_ctx *ctx);</div><div class='ctx'> void hl_mmu_swap_in(struct hl_ctx *ctx);</div><div class='ctx'> </div><div class='add'>+int hl_fw_push_fw_to_device(struct hl_device *hdev, const char *fw_name,</div><div class='add'>+				void __iomem *dst);</div><div class='add'>+int hl_fw_send_pci_access_msg(struct hl_device *hdev, u32 opcode);</div><div class='add'>+int hl_fw_send_cpu_message(struct hl_device *hdev, u32 hw_queue_id, u32 *msg,</div><div class='add'>+				u16 len, u32 timeout, long *result);</div><div class='add'>+int hl_fw_test_cpu_queue(struct hl_device *hdev);</div><div class='add'>+void *hl_fw_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size,</div><div class='add'>+						dma_addr_t *dma_handle);</div><div class='add'>+void hl_fw_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,</div><div class='add'>+					void *vaddr);</div><div class='add'>+int hl_fw_send_heartbeat(struct hl_device *hdev);</div><div class='add'>+int hl_fw_armcp_info_get(struct hl_device *hdev);</div><div class='add'>+int hl_fw_get_eeprom_data(struct hl_device *hdev, void *data, size_t max_size);</div><div class='add'>+</div><div class='add'>+int hl_pci_bars_map(struct hl_device *hdev, const char * const name[3],</div><div class='add'>+			bool is_wc[3]);</div><div class='add'>+int hl_pci_iatu_write(struct hl_device *hdev, u32 addr, u32 data);</div><div class='add'>+int hl_pci_set_dram_bar_base(struct hl_device *hdev, u8 inbound_region, u8 bar,</div><div class='add'>+				u64 addr);</div><div class='add'>+int hl_pci_init_iatu(struct hl_device *hdev, u64 sram_base_address,</div><div class='add'>+			u64 dram_base_address, u64 host_phys_base_address,</div><div class='add'>+			u64 host_phys_size);</div><div class='add'>+int hl_pci_init(struct hl_device *hdev, u8 dma_mask);</div><div class='add'>+void hl_pci_fini(struct hl_device *hdev);</div><div class='add'>+int hl_pci_set_dma_mask(struct hl_device *hdev, u8 dma_mask);</div><div class='add'>+</div><div class='ctx'> long hl_get_frequency(struct hl_device *hdev, u32 pll_index, bool curr);</div><div class='ctx'> void hl_set_frequency(struct hl_device *hdev, u32 pll_index, u64 freq);</div><div class='ctx'> long hl_get_temperature(struct hl_device *hdev, int sensor_index, u32 attr);</div><div class='head'>diff --git a/drivers/misc/habanalabs/habanalabs_drv.c b/drivers/misc/habanalabs/habanalabs_drv.c<br/>index 748601463f11..5f4d155be767 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/habanalabs_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/habanalabs_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/habanalabs_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/habanalabs_drv.c</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt)		"habanalabs: " fmt</div><div class='add'>+</div><div class='ctx'> #include "habanalabs.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -218,7 +220,7 @@ int create_hdev(struct hl_device **dev, struct pci_dev *pdev,</div><div class='ctx'> 	hdev-&gt;disabled = true;</div><div class='ctx'> 	hdev-&gt;pdev = pdev; /* can be NULL in case of simulator device */</div><div class='ctx'> </div><div class='del'>-	if (asic_type == ASIC_AUTO_DETECT) {</div><div class='add'>+	if (pdev) {</div><div class='ctx'> 		hdev-&gt;asic_type = get_asic_type(pdev-&gt;device);</div><div class='ctx'> 		if (hdev-&gt;asic_type == ASIC_INVALID) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "Unsupported ASIC\n");</div><div class='hunk'>@@ -229,6 +231,9 @@ int create_hdev(struct hl_device **dev, struct pci_dev *pdev,</div><div class='ctx'> 		hdev-&gt;asic_type = asic_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Set default DMA mask to 32 bits */</div><div class='add'>+	hdev-&gt;dma_mask = 32;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;hl_devs_idr_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (minor == -1) {</div><div class='hunk'>@@ -334,7 +339,7 @@ static int hl_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		 " device found [%04x:%04x] (rev %x)\n",</div><div class='ctx'> 		 (int)pdev-&gt;vendor, (int)pdev-&gt;device, (int)pdev-&gt;revision);</div><div class='ctx'> </div><div class='del'>-	rc = create_hdev(&amp;hdev, pdev, ASIC_AUTO_DETECT, -1);</div><div class='add'>+	rc = create_hdev(&amp;hdev, pdev, ASIC_INVALID, -1);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/habanalabs/habanalabs_ioctl.c b/drivers/misc/habanalabs/habanalabs_ioctl.c<br/>index 2c2739a3c5ec..eeefb22023e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/habanalabs_ioctl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/habanalabs_ioctl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/habanalabs_ioctl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/habanalabs_ioctl.c</a></div><div class='hunk'>@@ -12,6 +12,32 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+static u32 hl_debug_struct_size[HL_DEBUG_OP_TIMESTAMP + 1] = {</div><div class='add'>+	[HL_DEBUG_OP_ETR] = sizeof(struct hl_debug_params_etr),</div><div class='add'>+	[HL_DEBUG_OP_ETF] = sizeof(struct hl_debug_params_etf),</div><div class='add'>+	[HL_DEBUG_OP_STM] = sizeof(struct hl_debug_params_stm),</div><div class='add'>+	[HL_DEBUG_OP_FUNNEL] = 0,</div><div class='add'>+	[HL_DEBUG_OP_BMON] = sizeof(struct hl_debug_params_bmon),</div><div class='add'>+	[HL_DEBUG_OP_SPMU] = sizeof(struct hl_debug_params_spmu),</div><div class='add'>+	[HL_DEBUG_OP_TIMESTAMP] = 0</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int device_status_info(struct hl_device *hdev, struct hl_info_args *args)</div><div class='add'>+{</div><div class='add'>+	struct hl_info_device_status dev_stat = {0};</div><div class='add'>+	u32 size = args-&gt;return_size;</div><div class='add'>+	void __user *out = (void __user *) (uintptr_t) args-&gt;return_pointer;</div><div class='add'>+</div><div class='add'>+	if ((!size) || (!out))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev_stat.status = hl_device_status(hdev);</div><div class='add'>+</div><div class='add'>+	return copy_to_user(out, &amp;dev_stat,</div><div class='add'>+			min((size_t)size, sizeof(dev_stat))) ? -EFAULT : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_info_hw_ip_info hw_ip = {0};</div><div class='hunk'>@@ -93,21 +119,91 @@ static int hw_idle(struct hl_device *hdev, struct hl_info_args *args)</div><div class='ctx'> 	if ((!max_size) || (!out))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	hw_idle.is_idle = hdev-&gt;asic_funcs-&gt;is_device_idle(hdev);</div><div class='add'>+	hw_idle.is_idle = hdev-&gt;asic_funcs-&gt;is_device_idle(hdev, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	return copy_to_user(out, &amp;hw_idle,</div><div class='ctx'> 		min((size_t) max_size, sizeof(hw_idle))) ? -EFAULT : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_params *params;</div><div class='add'>+	void *input = NULL, *output = NULL;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	params = kzalloc(sizeof(*params), GFP_KERNEL);</div><div class='add'>+	if (!params)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	params-&gt;reg_idx = args-&gt;reg_idx;</div><div class='add'>+	params-&gt;enable = args-&gt;enable;</div><div class='add'>+	params-&gt;op = args-&gt;op;</div><div class='add'>+</div><div class='add'>+	if (args-&gt;input_ptr &amp;&amp; args-&gt;input_size) {</div><div class='add'>+		input = memdup_user((const void __user *) args-&gt;input_ptr,</div><div class='add'>+					args-&gt;input_size);</div><div class='add'>+		if (IS_ERR(input)) {</div><div class='add'>+			rc = PTR_ERR(input);</div><div class='add'>+			input = NULL;</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"error %d when copying input debug data\n", rc);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		params-&gt;input = input;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args-&gt;output_ptr &amp;&amp; args-&gt;output_size) {</div><div class='add'>+		output = kzalloc(args-&gt;output_size, GFP_KERNEL);</div><div class='add'>+		if (!output) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		params-&gt;output = output;</div><div class='add'>+		params-&gt;output_size = args-&gt;output_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;debug_coresight(hdev, params);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"debug coresight operation failed %d\n", rc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (output) {</div><div class='add'>+		if (copy_to_user((void __user *) (uintptr_t) args-&gt;output_ptr,</div><div class='add'>+					output,</div><div class='add'>+					args-&gt;output_size)) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"copy to user failed in debug ioctl\n");</div><div class='add'>+			rc = -EFAULT;</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'>+	kfree(params);</div><div class='add'>+	kfree(output);</div><div class='add'>+	kfree(input);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hl_info_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_info_args *args = data;</div><div class='ctx'> 	struct hl_device *hdev = hpriv-&gt;hdev;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	/* We want to return device status even if it disabled or in reset */</div><div class='add'>+	if (args-&gt;op == HL_INFO_DEVICE_STATUS)</div><div class='add'>+		return device_status_info(hdev, args);</div><div class='add'>+</div><div class='ctx'> 	if (hl_device_disabled_or_in_reset(hdev)) {</div><div class='del'>-		dev_err(hdev-&gt;dev,</div><div class='del'>-			"Device is disabled or in reset. Can't execute INFO IOCTL\n");</div><div class='add'>+		dev_warn_ratelimited(hdev-&gt;dev,</div><div class='add'>+			"Device is %s. Can't execute INFO IOCTL\n",</div><div class='add'>+			atomic_read(&amp;hdev-&gt;in_reset) ? "in_reset" : "disabled");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -137,6 +233,40 @@ static int hl_info_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hl_debug_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hl_debug_args *args = data;</div><div class='add'>+	struct hl_device *hdev = hpriv-&gt;hdev;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (hl_device_disabled_or_in_reset(hdev)) {</div><div class='add'>+		dev_warn_ratelimited(hdev-&gt;dev,</div><div class='add'>+			"Device is %s. Can't execute DEBUG IOCTL\n",</div><div class='add'>+			atomic_read(&amp;hdev-&gt;in_reset) ? "in_reset" : "disabled");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (args-&gt;op) {</div><div class='add'>+	case HL_DEBUG_OP_ETR:</div><div class='add'>+	case HL_DEBUG_OP_ETF:</div><div class='add'>+	case HL_DEBUG_OP_STM:</div><div class='add'>+	case HL_DEBUG_OP_FUNNEL:</div><div class='add'>+	case HL_DEBUG_OP_BMON:</div><div class='add'>+	case HL_DEBUG_OP_SPMU:</div><div class='add'>+	case HL_DEBUG_OP_TIMESTAMP:</div><div class='add'>+		args-&gt;input_size =</div><div class='add'>+			min(args-&gt;input_size, hl_debug_struct_size[args-&gt;op]);</div><div class='add'>+		rc = debug_coresight(hdev, args);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(hdev-&gt;dev, "Invalid request %d\n", args-&gt;op);</div><div class='add'>+		rc = -ENOTTY;</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='ctx'> #define HL_IOCTL_DEF(ioctl, _func) \</div><div class='ctx'> 	[_IOC_NR(ioctl)] = {.cmd = ioctl, .func = _func}</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +275,8 @@ static const struct hl_ioctl_desc hl_ioctls[] = {</div><div class='ctx'> 	HL_IOCTL_DEF(HL_IOCTL_CB, hl_cb_ioctl),</div><div class='ctx'> 	HL_IOCTL_DEF(HL_IOCTL_CS, hl_cs_ioctl),</div><div class='ctx'> 	HL_IOCTL_DEF(HL_IOCTL_WAIT_CS, hl_cs_wait_ioctl),</div><div class='del'>-	HL_IOCTL_DEF(HL_IOCTL_MEMORY, hl_mem_ioctl)</div><div class='add'>+	HL_IOCTL_DEF(HL_IOCTL_MEMORY, hl_mem_ioctl),</div><div class='add'>+	HL_IOCTL_DEF(HL_IOCTL_DEBUG, hl_debug_ioctl)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HL_CORE_IOCTL_COUNT	ARRAY_SIZE(hl_ioctls)</div><div class='head'>diff --git a/drivers/misc/habanalabs/hw_queue.c b/drivers/misc/habanalabs/hw_queue.c<br/>index 67bece26417c..2894d8975933 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/hw_queue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/hw_queue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/hw_queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/hw_queue.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static void ext_queue_submit_bd(struct hl_device *hdev, struct hl_hw_queue *q,</div><div class='ctx'> 	bd += hl_pi_2_offset(q-&gt;pi);</div><div class='ctx'> 	bd-&gt;ctl = __cpu_to_le32(ctl);</div><div class='ctx'> 	bd-&gt;len = __cpu_to_le32(len);</div><div class='del'>-	bd-&gt;ptr = __cpu_to_le64(ptr + hdev-&gt;asic_prop.host_phys_base_address);</div><div class='add'>+	bd-&gt;ptr = __cpu_to_le64(ptr);</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;pi = hl_queue_inc_ptr(q-&gt;pi);</div><div class='ctx'> 	hdev-&gt;asic_funcs-&gt;ring_doorbell(hdev, q-&gt;hw_queue_id, q-&gt;pi);</div><div class='hunk'>@@ -263,9 +263,7 @@ static void ext_hw_queue_schedule_job(struct hl_cs_job *job)</div><div class='ctx'> 	 * checked in hl_queue_sanity_checks</div><div class='ctx'> 	 */</div><div class='ctx'> 	cq = &amp;hdev-&gt;completion_queue[q-&gt;hw_queue_id];</div><div class='del'>-	cq_addr = cq-&gt;bus_address +</div><div class='del'>-			hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-	cq_addr += cq-&gt;pi * sizeof(struct hl_cq_entry);</div><div class='add'>+	cq_addr = cq-&gt;bus_address + cq-&gt;pi * sizeof(struct hl_cq_entry);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;asic_funcs-&gt;add_end_of_cb_packets(cb-&gt;kernel_address, len,</div><div class='ctx'> 						cq_addr,</div><div class='hunk'>@@ -370,12 +368,13 @@ int hl_hw_queue_schedule_cs(struct hl_cs *cs)</div><div class='ctx'> 		spin_unlock(&amp;hdev-&gt;hw_queues_mirror_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(job, tmp, &amp;cs-&gt;job_list, cs_node) {</div><div class='add'>+	atomic_inc(&amp;hdev-&gt;cs_active_cnt);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(job, tmp, &amp;cs-&gt;job_list, cs_node)</div><div class='ctx'> 		if (job-&gt;ext_queue)</div><div class='ctx'> 			ext_hw_queue_schedule_job(job);</div><div class='ctx'> 		else</div><div class='ctx'> 			int_hw_queue_schedule_job(job);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	cs-&gt;submitted = true;</div><div class='ctx'> </div><div class='hunk'>@@ -414,14 +413,20 @@ void hl_hw_queue_inc_ci_kernel(struct hl_device *hdev, u32 hw_queue_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext_and_cpu_hw_queue_init(struct hl_device *hdev,</div><div class='del'>-					struct hl_hw_queue *q)</div><div class='add'>+				struct hl_hw_queue *q, bool is_cpu_queue)</div><div class='ctx'> {</div><div class='ctx'> 	void *p;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	p = hdev-&gt;asic_funcs-&gt;dma_alloc_coherent(hdev,</div><div class='del'>-				HL_QUEUE_SIZE_IN_BYTES,</div><div class='del'>-				&amp;q-&gt;bus_address, GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+	if (is_cpu_queue)</div><div class='add'>+		p = hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev,</div><div class='add'>+							HL_QUEUE_SIZE_IN_BYTES,</div><div class='add'>+							&amp;q-&gt;bus_address);</div><div class='add'>+	else</div><div class='add'>+		p = hdev-&gt;asic_funcs-&gt;asic_dma_alloc_coherent(hdev,</div><div class='add'>+						HL_QUEUE_SIZE_IN_BYTES,</div><div class='add'>+						&amp;q-&gt;bus_address,</div><div class='add'>+						GFP_KERNEL | __GFP_ZERO);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -445,8 +450,15 @@ static int ext_and_cpu_hw_queue_init(struct hl_device *hdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_queue:</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, HL_QUEUE_SIZE_IN_BYTES,</div><div class='del'>-			(void *) (uintptr_t) q-&gt;kernel_address, q-&gt;bus_address);</div><div class='add'>+	if (is_cpu_queue)</div><div class='add'>+		hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev,</div><div class='add'>+					HL_QUEUE_SIZE_IN_BYTES,</div><div class='add'>+					(void *) (uintptr_t) q-&gt;kernel_address);</div><div class='add'>+	else</div><div class='add'>+		hdev-&gt;asic_funcs-&gt;asic_dma_free_coherent(hdev,</div><div class='add'>+					HL_QUEUE_SIZE_IN_BYTES,</div><div class='add'>+					(void *) (uintptr_t) q-&gt;kernel_address,</div><div class='add'>+					q-&gt;bus_address);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -473,12 +485,12 @@ static int int_hw_queue_init(struct hl_device *hdev, struct hl_hw_queue *q)</div><div class='ctx'> </div><div class='ctx'> static int cpu_hw_queue_init(struct hl_device *hdev, struct hl_hw_queue *q)</div><div class='ctx'> {</div><div class='del'>-	return ext_and_cpu_hw_queue_init(hdev, q);</div><div class='add'>+	return ext_and_cpu_hw_queue_init(hdev, q, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext_hw_queue_init(struct hl_device *hdev, struct hl_hw_queue *q)</div><div class='ctx'> {</div><div class='del'>-	return ext_and_cpu_hw_queue_init(hdev, q);</div><div class='add'>+	return ext_and_cpu_hw_queue_init(hdev, q, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -568,8 +580,15 @@ static void hw_queue_fini(struct hl_device *hdev, struct hl_hw_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	kfree(q-&gt;shadow_queue);</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, HL_QUEUE_SIZE_IN_BYTES,</div><div class='del'>-			(void *) (uintptr_t) q-&gt;kernel_address, q-&gt;bus_address);</div><div class='add'>+	if (q-&gt;queue_type == QUEUE_TYPE_CPU)</div><div class='add'>+		hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev,</div><div class='add'>+					HL_QUEUE_SIZE_IN_BYTES,</div><div class='add'>+					(void *) (uintptr_t) q-&gt;kernel_address);</div><div class='add'>+	else</div><div class='add'>+		hdev-&gt;asic_funcs-&gt;asic_dma_free_coherent(hdev,</div><div class='add'>+					HL_QUEUE_SIZE_IN_BYTES,</div><div class='add'>+					(void *) (uintptr_t) q-&gt;kernel_address,</div><div class='add'>+					q-&gt;bus_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hl_hw_queues_create(struct hl_device *hdev)</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/armcp_if.h b/drivers/misc/habanalabs/include/armcp_if.h<br/>index 9dddb917e72c..1f1e35e86d84 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/armcp_if.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/armcp_if.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/armcp_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/armcp_if.h</a></div><div class='hunk'>@@ -32,8 +32,6 @@ struct hl_eq_entry {</div><div class='ctx'> #define EQ_CTL_EVENT_TYPE_SHIFT		16</div><div class='ctx'> #define EQ_CTL_EVENT_TYPE_MASK		0x03FF0000</div><div class='ctx'> </div><div class='del'>-#define EVENT_QUEUE_MSIX_IDX		5</div><div class='del'>-</div><div class='ctx'> enum pq_init_status {</div><div class='ctx'> 	PQ_INIT_STATUS_NA = 0,</div><div class='ctx'> 	PQ_INIT_STATUS_READY_FOR_CP,</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h<br/>index 2cf5c46b6e8e..4e0dbbbbde20 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h</a></div><div class='hunk'>@@ -188,4 +188,3 @@</div><div class='ctx'> #define CPU_CA53_CFG_ARM_PMU_EVENT_MASK                              0x3FFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_CPU_CA53_CFG_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h<br/>index 840ccffa1081..f3faf1aad91a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h</a></div><div class='hunk'>@@ -58,4 +58,3 @@</div><div class='ctx'> #define mmCPU_CA53_CFG_ARM_PMU_1                                     0x441214</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_CPU_CA53_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h<br/>index f23cb3e41c30..cf657918962a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h</a></div><div class='hunk'>@@ -46,4 +46,3 @@</div><div class='ctx'> #define mmCPU_IF_AXI_SPLIT_INTR                                      0x442130</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_CPU_IF_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h<br/>index 8fc97f838ada..8c8f9726d4b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmCPU_PLL_FREQ_CALC_EN                                       0x4A2440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_CPU_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h<br/>index 61c8cd9ce58b..0b246fe6ad04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define mmDMA_CH_0_MEM_INIT_BUSY                                     0x4011FC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_CH_0_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h<br/>index 92960ef5e308..5449031722f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define mmDMA_CH_1_MEM_INIT_BUSY                                     0x4091FC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_CH_1_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h<br/>index 4e37871a51bb..a4768521d18a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define mmDMA_CH_2_MEM_INIT_BUSY                                     0x4111FC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_CH_2_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h<br/>index a2d6aeb32a18..619d01897ff8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define mmDMA_CH_3_MEM_INIT_BUSY                                     0x4191FC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_CH_3_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h<br/>index 400d6fd3acf5..038617e163f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define mmDMA_CH_4_MEM_INIT_BUSY                                     0x4211FC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_CH_4_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h<br/>index 8d965443c51e..f43b564af1be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define DMA_MACRO_RAZWI_HBW_RD_ID_R_MASK                             0x1FFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_MACRO_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h<br/>index 8bfcb001189d..c3bfc1b8e3fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h</a></div><div class='hunk'>@@ -178,4 +178,3 @@</div><div class='ctx'> #define mmDMA_MACRO_RAZWI_HBW_RD_ID                                  0x4B0158</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_MACRO_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h<br/>index 9f33f351a3c1..bc977488c072 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define DMA_NRTR_NON_LIN_SCRAMB_EN_MASK                              0x1</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_NRTR_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h<br/>index d8293745a02b..c4abc7ff1fc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h</a></div><div class='hunk'>@@ -224,4 +224,3 @@</div><div class='ctx'> #define mmDMA_NRTR_NON_LIN_SCRAMB                                    0x1C0604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_NRTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h<br/>index 10619dbb9b17..b17f72c31ab6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h</a></div><div class='hunk'>@@ -462,4 +462,3 @@</div><div class='ctx'> #define DMA_QM_0_CQ_BUF_RDATA_VAL_MASK                               0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_QM_0_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h<br/>index c693bc5dcb22..bf360b301154 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmDMA_QM_0_CQ_BUF_RDATA                                      0x40030C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_QM_0_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h<br/>index da928390f89c..51d432d05ac4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmDMA_QM_1_CQ_BUF_RDATA                                      0x40830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_QM_1_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h<br/>index b4f06e9b71d6..18fc0c2b6cc2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmDMA_QM_2_CQ_BUF_RDATA                                      0x41030C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_QM_2_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h<br/>index 53e3cd78a06b..6cf7204bf5cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmDMA_QM_3_CQ_BUF_RDATA                                      0x41830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_QM_3_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h<br/>index e0eb5f260201..36fef2682875 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmDMA_QM_4_CQ_BUF_RDATA                                      0x42030C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_DMA_QM_4_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h<br/>index a161ecfe74de..8618891d5afa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h</a></div><div class='hunk'>@@ -189,18 +189,6 @@</div><div class='ctx'> 			1 &lt;&lt; CPU_CA53_CFG_ARM_RST_CONTROL_NL2RESET_SHIFT |\</div><div class='ctx'> 			1 &lt;&lt; CPU_CA53_CFG_ARM_RST_CONTROL_NMBISTRESET_SHIFT)</div><div class='ctx'> </div><div class='del'>-/* PCI CONFIGURATION SPACE */</div><div class='del'>-#define mmPCI_CONFIG_ELBI_ADDR		0xFF0</div><div class='del'>-#define mmPCI_CONFIG_ELBI_DATA		0xFF4</div><div class='del'>-#define mmPCI_CONFIG_ELBI_CTRL		0xFF8</div><div class='del'>-#define PCI_CONFIG_ELBI_CTRL_WRITE	(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-#define mmPCI_CONFIG_ELBI_STS		0xFFC</div><div class='del'>-#define PCI_CONFIG_ELBI_STS_ERR		(1 &lt;&lt; 30)</div><div class='del'>-#define PCI_CONFIG_ELBI_STS_DONE	(1 &lt;&lt; 31)</div><div class='del'>-#define PCI_CONFIG_ELBI_STS_MASK	(PCI_CONFIG_ELBI_STS_ERR | \</div><div class='del'>-					PCI_CONFIG_ELBI_STS_DONE)</div><div class='del'>-</div><div class='ctx'> #define GOYA_IRQ_HBW_ID_MASK			0x1FFF</div><div class='ctx'> #define GOYA_IRQ_HBW_ID_SHIFT			0</div><div class='ctx'> #define GOYA_IRQ_HBW_INTERNAL_ID_MASK		0xE000</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h<br/>index 6cb0b6e54d41..506e71e201e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2016-2018 HabanaLabs, Ltd.</div><div class='add'>+ * Copyright 2016-2019 HabanaLabs, Ltd.</div><div class='ctx'>  * All Rights Reserved.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include "stlb_regs.h"</div><div class='ctx'> #include "mmu_regs.h"</div><div class='ctx'> #include "pcie_aux_regs.h"</div><div class='add'>+#include "pcie_wrap_regs.h"</div><div class='ctx'> #include "psoc_global_conf_regs.h"</div><div class='ctx'> #include "psoc_spi_regs.h"</div><div class='ctx'> #include "psoc_mme_pll_regs.h"</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h<br/>index 0a743817aad7..4ae7fed8b18c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmIC_PLL_FREQ_CALC_EN                                        0x4A3440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_IC_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h<br/>index 4408188aa067..6d35d852798b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmMC_PLL_FREQ_CALC_EN                                        0x4A1440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MC_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h<br/>index 687bca5c5fe3..6c23f8b96e7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h</a></div><div class='hunk'>@@ -650,4 +650,3 @@</div><div class='ctx'> #define MME1_RTR_NON_LIN_SCRAMB_EN_MASK                              0x1</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME1_RTR_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h<br/>index c248339a1cbe..122e9d529939 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h</a></div><div class='hunk'>@@ -328,4 +328,3 @@</div><div class='ctx'> #define mmMME1_RTR_NON_LIN_SCRAMB                                    0x40604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME1_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h<br/>index 7a2b777bdc4f..00ce2252bbfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h</a></div><div class='hunk'>@@ -328,4 +328,3 @@</div><div class='ctx'> #define mmMME2_RTR_NON_LIN_SCRAMB                                    0x80604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME2_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h<br/>index b78f8bc387fc..8e3eb7fd2070 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h</a></div><div class='hunk'>@@ -328,4 +328,3 @@</div><div class='ctx'> #define mmMME3_RTR_NON_LIN_SCRAMB                                    0xC0604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME3_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h<br/>index d9a4a02cefa3..79b67bbc8567 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h</a></div><div class='hunk'>@@ -328,4 +328,3 @@</div><div class='ctx'> #define mmMME4_RTR_NON_LIN_SCRAMB                                    0x100604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME4_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h<br/>index 205adc988407..0ac3c37ce47f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h</a></div><div class='hunk'>@@ -328,4 +328,3 @@</div><div class='ctx'> #define mmMME5_RTR_NON_LIN_SCRAMB                                    0x140604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME5_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h<br/>index fcec68388278..50c49cce72a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h</a></div><div class='hunk'>@@ -328,4 +328,3 @@</div><div class='ctx'> #define mmMME6_RTR_NON_LIN_SCRAMB                                    0x180604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME6_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h<br/>index a0d4382fbbd0..fe7d95bdcef9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h</a></div><div class='hunk'>@@ -370,4 +370,3 @@</div><div class='ctx'> #define MME_CMDQ_CQ_BUF_RDATA_VAL_MASK                               0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME_CMDQ_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h<br/>index 5c2f6b870a58..5f8b85d2b4b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmMME_CMDQ_CQ_BUF_RDATA                                      0xD930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h<br/>index c7b1b0bb3384..1882c413cbe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h</a></div><div class='hunk'>@@ -1534,4 +1534,3 @@</div><div class='ctx'> #define MME_SHADOW_3_E_BUBBLES_PER_SPLIT_ID_MASK                     0xFF000000</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h<br/>index d4bfa58dce19..e464e381555c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h</a></div><div class='hunk'>@@ -462,4 +462,3 @@</div><div class='ctx'> #define MME_QM_CQ_BUF_RDATA_VAL_MASK                                 0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME_QM_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h<br/>index b5b1c776f6c3..538708beffc9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmMME_QM_CQ_BUF_RDATA                                        0xD830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h<br/>index 9436b1e2705a..0396cbfd5c89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h</a></div><div class='hunk'>@@ -1150,4 +1150,3 @@</div><div class='ctx'> #define mmMME_SHADOW_3_E_BUBBLES_PER_SPLIT                           0xD0BAC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MME_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h<br/>index 3a78078d3c4c..c3e69062b135 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h</a></div><div class='hunk'>@@ -140,4 +140,3 @@</div><div class='ctx'> #define MMU_ACCESS_ERROR_CAPTURE_VA_VA_31_0_MASK                     0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MMU_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h<br/>index bec6c014135c..7ec81f12031e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h</a></div><div class='hunk'>@@ -50,4 +50,3 @@</div><div class='ctx'> #define mmMMU_ACCESS_ERROR_CAPTURE_VA                                0x480040</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_MMU_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h<br/>index 209e41402a11..ceb59f2e28b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define PCI_NRTR_NON_LIN_SCRAMB_EN_MASK                              0x1</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PCI_NRTR_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h<br/>index 447e5d4e7dc8..dd067f301ac2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h</a></div><div class='hunk'>@@ -224,4 +224,3 @@</div><div class='ctx'> #define mmPCI_NRTR_NON_LIN_SCRAMB                                    0x604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PCI_NRTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h<br/>index daaf5d9079dc..35b1d8ac6f63 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h</a></div><div class='hunk'>@@ -240,4 +240,3 @@</div><div class='ctx'> #define mmPCIE_AUX_PERST                                             0xC079B8</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PCIE_AUX_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h<br/>new file mode 100644<br/>index 000000000000..d1e55aace4a0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h</a></div><div class='hunk'>@@ -0,0 +1,306 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016-2018 HabanaLabs, Ltd.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/************************************</div><div class='add'>+ ** This is an auto-generated file **</div><div class='add'>+ **       DO NOT EDIT BELOW        **</div><div class='add'>+ ************************************/</div><div class='add'>+</div><div class='add'>+#ifndef ASIC_REG_PCIE_WRAP_REGS_H_</div><div class='add'>+#define ASIC_REG_PCIE_WRAP_REGS_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *****************************************</div><div class='add'>+ *   PCIE_WRAP (Prototype: PCIE_WRAP)</div><div class='add'>+ *****************************************</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PHY_RST_N                                        0xC01300</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_OUTSTAND_TRANS                                   0xC01400</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_MASK_REQ                                         0xC01404</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWADDR_L                                     0xC01500</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWADDR_H                                     0xC01504</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWLEN                                        0xC01508</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWSIZE                                       0xC0150C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWBURST                                      0xC01510</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWLOCK                                       0xC01514</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWCACHE                                      0xC01518</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWPROT                                       0xC0151C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWVALID                                      0xC01520</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WDATA_0                                      0xC01524</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WDATA_1                                      0xC01528</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WDATA_2                                      0xC0152C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WDATA_3                                      0xC01530</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WSTRB                                        0xC01544</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WLAST                                        0xC01548</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_WVALID                                       0xC0154C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_BRESP                                        0xC01550</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_BVALID                                       0xC01554</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARADDR_0                                     0xC01558</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARADDR_1                                     0xC0155C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARLEN                                        0xC01560</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARSIZE                                       0xC01564</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARBURST                                      0xC01568</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARLOCK                                       0xC0156C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARCACHE                                      0xC01570</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARPROT                                       0xC01574</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARVALID                                      0xC01578</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RDATA_0                                      0xC0157C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RDATA_1                                      0xC01580</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RDATA_2                                      0xC01584</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RDATA_3                                      0xC01588</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RLAST                                        0xC0159C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RRESP                                        0xC015A0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_RVALID                                       0xC015A4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO                                  0xC015A8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_HDR_34DW_0                       0xC015AC</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_HDR_34DW_1                       0xC015B0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_P_TAG                            0xC015B4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_ATU_BYPAS                        0xC015B8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_FUNC_NUM                         0xC015BC</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_VFUNC_ACT                        0xC015C0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_VFUNC_NUM                        0xC015C4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_AWMISC_INFO_TLPPRFX                          0xC015C8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARMISC_INFO                                  0xC015CC</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARMISC_INFO_TLPPRFX                          0xC015D0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARMISC_INFO_ATU_BYP                          0xC015D4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARMISC_INFO_FUNC_NUM                         0xC015D8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARMISC_INFO_VFUNC_ACT                        0xC015DC</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_IND_ARMISC_INFO_VFUNC_NUM                        0xC015E0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO                                  0xC01800</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_HDR_34DW_0                       0xC01804</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_HDR_34DW_1                       0xC01808</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_P_TAG                            0xC0180C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_ATU_BYPAS                        0xC01810</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_FUNC_NUM                         0xC01814</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_VFUNC_ACT                        0xC01818</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_VFUNC_NUM                        0xC0181C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_AWMISC_INFO_TLPPRFX                          0xC01820</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_ARMISC_INFO                                  0xC01824</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_ARMISC_INFO_TLPPRFX                          0xC01828</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_ARMISC_INFO_ATU_BYP                          0xC0182C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_ARMISC_INFO_FUNC_NUM                         0xC01830</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_ARMISC_INFO_VFUNC_ACT                        0xC01834</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SLV_ARMISC_INFO_VFUNC_NUM                        0xC01838</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_MAX_QID                                          0xC01900</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_L_0                                 0xC01910</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_L_1                                 0xC01914</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_L_2                                 0xC01918</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_L_3                                 0xC0191C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_H_0                                 0xC01920</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_H_1                                 0xC01924</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_H_2                                 0xC01928</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_BASE_ADDR_H_3                                 0xC0192C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_MASK                                          0xC01940</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SQ_BASE_ADDR_H                                   0xC01A00</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SQ_BASE_ADDR_L                                   0xC01A04</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SQ_STRIDE_ACCRESS                                0xC01A08</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SQ_POP_CMD                                       0xC01A10</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SQ_POP_DATA                                      0xC01A14</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_0                                        0xC01A20</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_1                                        0xC01A24</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_2                                        0xC01A28</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_3                                        0xC01A2C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_4                                        0xC01A30</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_5                                        0xC01A34</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_6                                        0xC01A38</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_INTR_7                                        0xC01A3C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_MMU_BYPASS_DMA                                   0xC01A80</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_MMU_BYPASS_NON_DMA                               0xC01A84</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_NON_DMA                                     0xC01A90</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_0                                       0xC01AA0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_1                                       0xC01AA4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_2                                       0xC01AA8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_3                                       0xC01AAC</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_4                                       0xC01AB0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_5                                       0xC01AB4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_6                                       0xC01AB8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ASID_DMA_7                                       0xC01ABC</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_CPU_HOT_RST                                      0xC01AE0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_AXI_PROT_OVR                                     0xC01AE4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_CACHE_OVR                                        0xC01B00</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LOCK_OVR                                         0xC01B04</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PROT_OVR                                         0xC01B08</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ARUSER_OVR                                       0xC01B0C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_AWUSER_OVR                                       0xC01B10</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_ARUSER_OVR_EN                                    0xC01B14</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_AWUSER_OVR_EN                                    0xC01B18</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_MAX_OUTSTAND                                     0xC01B20</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_MST_IN                                           0xC01B24</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_RSP_OK                                           0xC01B28</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_CACHE_OVR                                    0xC01B40</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_LOCK_OVR                                     0xC01B44</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_PROT_OVR                                     0xC01B48</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_ARUSER_OVR                                   0xC01B4C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_AWUSER_OVR                                   0xC01B50</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_ARUSER_OVR_EN                                0xC01B58</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_AWUSER_OVR_EN                                0xC01B5C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_MAX_OUTSTAND                                 0xC01B60</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_MST_IN                                       0xC01B64</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_LBW_RSP_OK                                       0xC01B68</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_QUEUE_INIT                                       0xC01C00</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_AXI_SPLIT_INTR_0                                 0xC01C10</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_AXI_SPLIT_INTR_1                                 0xC01C14</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_AWUSER                                        0xC01D00</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_ARUSER                                        0xC01D04</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PCIE_AWUSER                                      0xC01D08</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PCIE_ARUSER                                      0xC01D0C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PSOC_AWUSER                                      0xC01D10</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PSOC_ARUSER                                      0xC01D14</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SCH_Q_AWUSER                                     0xC01D18</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SCH_Q_ARUSER                                     0xC01D1C</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PSOC2PCI_AWUSER                                  0xC01D40</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_PSOC2PCI_ARUSER                                  0xC01D44</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DRAIN_TIMEOUT                                    0xC01D50</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DRAIN_CFG                                        0xC01D54</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_DB_AXI_ERR                                       0xC01DE0</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_SPMU_INTR                                        0xC01DE4</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_AXI_INTR                                         0xC01DE8</div><div class='add'>+</div><div class='add'>+#define mmPCIE_WRAP_E2E_CTRL                                         0xC01DF0</div><div class='add'>+</div><div class='add'>+#endif /* ASIC_REG_PCIE_WRAP_REGS_H_ */</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h<br/>index 8eda4de58788..9271ea95ebe9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmPSOC_EMMC_PLL_FREQ_CALC_EN                                 0xC70440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PSOC_EMMC_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h<br/>index d4bf0e1db4df..324266653c9a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h</a></div><div class='hunk'>@@ -444,4 +444,3 @@</div><div class='ctx'> #define PSOC_GLOBAL_CONF_PAD_SEL_VAL_MASK                            0x3</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PSOC_GLOBAL_CONF_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h<br/>index cfbdd2c9c5c7..8141f422e712 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h</a></div><div class='hunk'>@@ -742,4 +742,3 @@</div><div class='ctx'> #define mmPSOC_GLOBAL_CONF_PAD_SEL_81                                0xC4BA44</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PSOC_GLOBAL_CONF_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h<br/>index 6723d8f76f30..4789ebb9c337 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmPSOC_MME_PLL_FREQ_CALC_EN                                  0xC71440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PSOC_MME_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h<br/>index abcded0531c9..27a296ea6c3d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmPSOC_PCI_PLL_FREQ_CALC_EN                                  0xC72440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PSOC_PCI_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h<br/>index 5925c7477c25..66aee7fa6b1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h</a></div><div class='hunk'>@@ -140,4 +140,3 @@</div><div class='ctx'> #define mmPSOC_SPI_RSVD_2                                            0xC430FC</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_PSOC_SPI_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h<br/>index d56c9fa0e7ba..2ea1770b078f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h</a></div><div class='hunk'>@@ -80,4 +80,3 @@</div><div class='ctx'> #define mmSRAM_Y0_X0_RTR_DBG_L_ARB_MAX                               0x201330</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_SRAM_Y0_X0_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h<br/>index 5624544303ca..37e0713efa73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h</a></div><div class='hunk'>@@ -80,4 +80,3 @@</div><div class='ctx'> #define mmSRAM_Y0_X1_RTR_DBG_L_ARB_MAX                               0x205330</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_SRAM_Y0_X1_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h<br/>index 3322bc0bd1df..d2572279a2b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h</a></div><div class='hunk'>@@ -80,4 +80,3 @@</div><div class='ctx'> #define mmSRAM_Y0_X2_RTR_DBG_L_ARB_MAX                               0x209330</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_SRAM_Y0_X2_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h<br/>index 81e393db2027..68c5b402c506 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h</a></div><div class='hunk'>@@ -80,4 +80,3 @@</div><div class='ctx'> #define mmSRAM_Y0_X3_RTR_DBG_L_ARB_MAX                               0x20D330</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_SRAM_Y0_X3_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h<br/>index b2e11b1de385..a42f1ba06d28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h</a></div><div class='hunk'>@@ -80,4 +80,3 @@</div><div class='ctx'> #define mmSRAM_Y0_X4_RTR_DBG_L_ARB_MAX                               0x211330</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_SRAM_Y0_X4_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h<br/>index b4ea8cae2757..94f2ed4a36bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h</a></div><div class='hunk'>@@ -114,4 +114,3 @@</div><div class='ctx'> #define STLB_SRAM_INIT_BUSY_DATA_MASK                                0x10</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_STLB_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h<br/>index 0f5281d3e65b..35013f65acd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h</a></div><div class='hunk'>@@ -52,4 +52,3 @@</div><div class='ctx'> #define mmSTLB_SRAM_INIT                                             0x49004C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_STLB_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h<br/>index e5587b49eecd..89c9507a512f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h</a></div><div class='hunk'>@@ -1604,4 +1604,3 @@</div><div class='ctx'> #define TPC0_CFG_FUNC_MBIST_MEM_LAST_FAILED_PATTERN_MASK             0x70000000</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_CFG_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h<br/>index 2be28a63c50a..7d71c4b73a5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC0_CFG_FUNC_MBIST_MEM_9                                  0xE06E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h<br/>index 9aa2d8b53207..9395f2458771 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h</a></div><div class='hunk'>@@ -370,4 +370,3 @@</div><div class='ctx'> #define TPC0_CMDQ_CQ_BUF_RDATA_VAL_MASK                              0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_CMDQ_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h<br/>index 3572752ba66e..bc51df573bf0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC0_CMDQ_CQ_BUF_RDATA                                     0xE0930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h<br/>index ed866d93c440..553c6b6bd5ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h</a></div><div class='hunk'>@@ -344,4 +344,3 @@</div><div class='ctx'> #define TPC0_EML_CFG_DBG_INST_INSERT_CTL_INSERT_MASK                 0x1</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_EML_CFG_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h<br/>index f1a1b4fa4841..8495479c3659 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h</a></div><div class='hunk'>@@ -310,4 +310,3 @@</div><div class='ctx'> #define mmTPC0_EML_CFG_DBG_INST_INSERT_CTL                           0x3040334</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_EML_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h<br/>index 7f86621179a5..43fafcf01041 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h</a></div><div class='hunk'>@@ -206,4 +206,3 @@</div><div class='ctx'> #define TPC0_NRTR_NON_LIN_SCRAMB_EN_MASK                             0x1</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_NRTR_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h<br/>index dc280f4e6608..ce3346dd2042 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h</a></div><div class='hunk'>@@ -224,4 +224,3 @@</div><div class='ctx'> #define mmTPC0_NRTR_NON_LIN_SCRAMB                                   0xE00604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_NRTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h<br/>index 80d97ee3d8d6..2e4b45947944 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h</a></div><div class='hunk'>@@ -462,4 +462,3 @@</div><div class='ctx'> #define TPC0_QM_CQ_BUF_RDATA_VAL_MASK                                0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_QM_MASKS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h<br/>index 7552d4ba61fe..4fa09eb88878 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC0_QM_CQ_BUF_RDATA                                       0xE0830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC0_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h<br/>index 19894413474a..928eef1808ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC1_CFG_FUNC_MBIST_MEM_9                                  0xE46E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC1_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h<br/>index 9099ebd7ab23..30ae0f307328 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC1_CMDQ_CQ_BUF_RDATA                                     0xE4930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC1_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h<br/>index bc8b9a10391f..b95de4f95ba9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC1_QM_CQ_BUF_RDATA                                       0xE4830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC1_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h<br/>index ae267f8f457e..0f91e307879e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h</a></div><div class='hunk'>@@ -320,4 +320,3 @@</div><div class='ctx'> #define mmTPC1_RTR_NON_LIN_SCRAMB                                    0xE40604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC1_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h<br/>index 9c33fc039036..73421227f35b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC2_CFG_FUNC_MBIST_MEM_9                                  0xE86E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC2_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h<br/>index 7a643887d6e1..27b66bf2da9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC2_CMDQ_CQ_BUF_RDATA                                     0xE8930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC2_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h<br/>index f3e32c018064..31e5b2f53905 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC2_QM_CQ_BUF_RDATA                                       0xE8830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC2_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h<br/>index 0eb0cd1fbd19..4eddeaa15d94 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h</a></div><div class='hunk'>@@ -320,4 +320,3 @@</div><div class='ctx'> #define mmTPC2_RTR_NON_LIN_SCRAMB                                    0xE80604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC2_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h<br/>index 0baf63c69b25..ce573a1a8361 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC3_CFG_FUNC_MBIST_MEM_9                                  0xEC6E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC3_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h<br/>index 82a5261e852f..11d81fca0a0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC3_CMDQ_CQ_BUF_RDATA                                     0xEC930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC3_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h<br/>index b05b1e18e664..e41595a19e69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC3_QM_CQ_BUF_RDATA                                       0xEC830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC3_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h<br/>index 5a2fd7652650..34a438b1efe5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h</a></div><div class='hunk'>@@ -320,4 +320,3 @@</div><div class='ctx'> #define mmTPC3_RTR_NON_LIN_SCRAMB                                    0xEC0604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC3_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h<br/>index d64a100075f2..d44caf0fc1bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC4_CFG_FUNC_MBIST_MEM_9                                  0xF06E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC4_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h<br/>index 565b42885b0d..f13a6532961f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC4_CMDQ_CQ_BUF_RDATA                                     0xF0930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC4_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h<br/>index 196da3f12710..db081fc17cfc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC4_QM_CQ_BUF_RDATA                                       0xF0830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC4_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h<br/>index 8b54041d144a..8c5372303b28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h</a></div><div class='hunk'>@@ -320,4 +320,3 @@</div><div class='ctx'> #define mmTPC4_RTR_NON_LIN_SCRAMB                                    0xF00604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC4_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h<br/>index 3f00954fcdba..5139fde71011 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC5_CFG_FUNC_MBIST_MEM_9                                  0xF46E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC5_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h<br/>index d8e72a8e18d7..1e7cd6e1e888 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC5_CMDQ_CQ_BUF_RDATA                                     0xF4930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC5_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h<br/>index be2e68624709..ac0d3820cd6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC5_QM_CQ_BUF_RDATA                                       0xF4830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC5_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h<br/>index 6f301c7bbc2f..57f83bc3b17d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h</a></div><div class='hunk'>@@ -320,4 +320,3 @@</div><div class='ctx'> #define mmTPC5_RTR_NON_LIN_SCRAMB                                    0xF40604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC5_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h<br/>index 1e1168601c41..94e0191c06c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC6_CFG_FUNC_MBIST_MEM_9                                  0xF86E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC6_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h<br/>index fbca6b47284e..7a1a0e87b225 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC6_CMDQ_CQ_BUF_RDATA                                     0xF8930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC6_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h<br/>index bf32465dabcb..80fa0fe0f60f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC6_QM_CQ_BUF_RDATA                                       0xF8830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC6_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h<br/>index 609bb90e1046..d6cae8b8af66 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h</a></div><div class='hunk'>@@ -320,4 +320,3 @@</div><div class='ctx'> #define mmTPC6_RTR_NON_LIN_SCRAMB                                    0xF80604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC6_RTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h<br/>index bf2fd0f73906..234147adb779 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h</a></div><div class='hunk'>@@ -884,4 +884,3 @@</div><div class='ctx'> #define mmTPC7_CFG_FUNC_MBIST_MEM_9                                  0xFC6E2C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC7_CFG_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h<br/>index 65d83043bf63..4c160632fe7d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h</a></div><div class='hunk'>@@ -136,4 +136,3 @@</div><div class='ctx'> #define mmTPC7_CMDQ_CQ_BUF_RDATA                                     0xFC930C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC7_CMDQ_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h<br/>index 3d5848d87304..0c13d4d167aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h</a></div><div class='hunk'>@@ -224,4 +224,3 @@</div><div class='ctx'> #define mmTPC7_NRTR_NON_LIN_SCRAMB                                   0xFC0604</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC7_NRTR_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h<br/>index 25f5095f68fb..cbe11425bfb0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h</a></div><div class='hunk'>@@ -176,4 +176,3 @@</div><div class='ctx'> #define mmTPC7_QM_CQ_BUF_RDATA                                       0xFC830C</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC7_QM_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h b/drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h<br/>index 920231d0afa5..e25e19660a9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h</a></div><div class='hunk'>@@ -102,4 +102,3 @@</div><div class='ctx'> #define mmTPC_PLL_FREQ_CALC_EN                                       0xE01440</div><div class='ctx'> </div><div class='ctx'> #endif /* ASIC_REG_TPC_PLL_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/goya.h b/drivers/misc/habanalabs/include/goya/goya.h<br/>index 614149efa412..3f02a52ba4ce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/goya.h</a></div><div class='hunk'>@@ -8,10 +8,6 @@</div><div class='ctx'> #ifndef GOYA_H</div><div class='ctx'> #define GOYA_H</div><div class='ctx'> </div><div class='del'>-#include "asic_reg/goya_regs.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='ctx'> #define SRAM_CFG_BAR_ID		0</div><div class='ctx'> #define MSIX_BAR_ID		2</div><div class='ctx'> #define DDR_BAR_ID		4</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/goya_async_events.h b/drivers/misc/habanalabs/include/goya/goya_async_events.h<br/>index 497937a17ee9..bb7a1aa3279e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya_async_events.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya_async_events.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya_async_events.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/goya_async_events.h</a></div><div class='hunk'>@@ -9,7 +9,9 @@</div><div class='ctx'> #define __GOYA_ASYNC_EVENTS_H_</div><div class='ctx'> </div><div class='ctx'> enum goya_async_event_id {</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_PCIE_CORE = 32,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_IF = 33,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_PCIE_PHY = 34,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC0_ECC = 36,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC1_ECC = 39,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC2_ECC = 42,</div><div class='hunk'>@@ -23,6 +25,8 @@ enum goya_async_event_id {</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_MMU_ECC = 63,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_DMA_MACRO = 64,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_DMA_ECC = 66,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_DDR0_PARITY = 69,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_DDR1_PARITY = 72,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_CPU_IF_ECC = 75,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_MEM = 78,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_CORESIGHT = 79,</div><div class='hunk'>@@ -72,6 +76,7 @@ enum goya_async_event_id {</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_MME_WACSD = 142,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PLL0 = 143,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PLL1 = 144,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_PLL2 = 145,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PLL3 = 146,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PLL4 = 147,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PLL5 = 148,</div><div class='hunk'>@@ -81,6 +86,7 @@ enum goya_async_event_id {</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC = 160,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_FLR = 171,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_HOT_RESET = 172,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_PCIE_PERST = 173,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_QID0_ENG0 = 174,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_QID0_ENG1 = 175,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PCIE_QID0_ENG2 = 176,</div><div class='hunk'>@@ -144,8 +150,11 @@ enum goya_async_event_id {</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_U16_0 = 330,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_U16_1 = 331,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_U16_2 = 332,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_U16_3 = 333,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_U16_4 = 334,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_05_SW_RESET = 356,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT = 361,</div><div class='add'>+	GOYA_ASYNC_EVENT_ID_FAN = 425,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC0_CMDQ = 430,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC1_CMDQ = 431,</div><div class='ctx'> 	GOYA_ASYNC_EVENT_ID_TPC2_CMDQ = 432,</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/goya_coresight.h b/drivers/misc/habanalabs/include/goya/goya_coresight.h<br/>new file mode 100644<br/>index 000000000000..6e933c0ca5cd<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya_coresight.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/goya_coresight.h</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016-2018 HabanaLabs, Ltd.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef GOYA_CORESIGHT_H</div><div class='add'>+#define GOYA_CORESIGHT_H</div><div class='add'>+</div><div class='add'>+enum goya_debug_stm_regs_index {</div><div class='add'>+	GOYA_STM_FIRST = 0,</div><div class='add'>+	GOYA_STM_CPU = GOYA_STM_FIRST,</div><div class='add'>+	GOYA_STM_DMA_CH_0_CS,</div><div class='add'>+	GOYA_STM_DMA_CH_1_CS,</div><div class='add'>+	GOYA_STM_DMA_CH_2_CS,</div><div class='add'>+	GOYA_STM_DMA_CH_3_CS,</div><div class='add'>+	GOYA_STM_DMA_CH_4_CS,</div><div class='add'>+	GOYA_STM_DMA_MACRO_CS,</div><div class='add'>+	GOYA_STM_MME1_SBA,</div><div class='add'>+	GOYA_STM_MME3_SBB,</div><div class='add'>+	GOYA_STM_MME4_WACS2,</div><div class='add'>+	GOYA_STM_MME4_WACS,</div><div class='add'>+	GOYA_STM_MMU_CS,</div><div class='add'>+	GOYA_STM_PCIE,</div><div class='add'>+	GOYA_STM_PSOC,</div><div class='add'>+	GOYA_STM_TPC0_EML,</div><div class='add'>+	GOYA_STM_TPC1_EML,</div><div class='add'>+	GOYA_STM_TPC2_EML,</div><div class='add'>+	GOYA_STM_TPC3_EML,</div><div class='add'>+	GOYA_STM_TPC4_EML,</div><div class='add'>+	GOYA_STM_TPC5_EML,</div><div class='add'>+	GOYA_STM_TPC6_EML,</div><div class='add'>+	GOYA_STM_TPC7_EML,</div><div class='add'>+	GOYA_STM_LAST = GOYA_STM_TPC7_EML</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum goya_debug_etf_regs_index {</div><div class='add'>+	GOYA_ETF_FIRST = 0,</div><div class='add'>+	GOYA_ETF_CPU_0 = GOYA_ETF_FIRST,</div><div class='add'>+	GOYA_ETF_CPU_1,</div><div class='add'>+	GOYA_ETF_CPU_TRACE,</div><div class='add'>+	GOYA_ETF_DMA_CH_0_CS,</div><div class='add'>+	GOYA_ETF_DMA_CH_1_CS,</div><div class='add'>+	GOYA_ETF_DMA_CH_2_CS,</div><div class='add'>+	GOYA_ETF_DMA_CH_3_CS,</div><div class='add'>+	GOYA_ETF_DMA_CH_4_CS,</div><div class='add'>+	GOYA_ETF_DMA_MACRO_CS,</div><div class='add'>+	GOYA_ETF_MME1_SBA,</div><div class='add'>+	GOYA_ETF_MME3_SBB,</div><div class='add'>+	GOYA_ETF_MME4_WACS2,</div><div class='add'>+	GOYA_ETF_MME4_WACS,</div><div class='add'>+	GOYA_ETF_MMU_CS,</div><div class='add'>+	GOYA_ETF_PCIE,</div><div class='add'>+	GOYA_ETF_PSOC,</div><div class='add'>+	GOYA_ETF_TPC0_EML,</div><div class='add'>+	GOYA_ETF_TPC1_EML,</div><div class='add'>+	GOYA_ETF_TPC2_EML,</div><div class='add'>+	GOYA_ETF_TPC3_EML,</div><div class='add'>+	GOYA_ETF_TPC4_EML,</div><div class='add'>+	GOYA_ETF_TPC5_EML,</div><div class='add'>+	GOYA_ETF_TPC6_EML,</div><div class='add'>+	GOYA_ETF_TPC7_EML,</div><div class='add'>+	GOYA_ETF_LAST = GOYA_ETF_TPC7_EML</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum goya_debug_funnel_regs_index {</div><div class='add'>+	GOYA_FUNNEL_FIRST = 0,</div><div class='add'>+	GOYA_FUNNEL_CPU = GOYA_FUNNEL_FIRST,</div><div class='add'>+	GOYA_FUNNEL_DMA_CH_6_1,</div><div class='add'>+	GOYA_FUNNEL_DMA_MACRO_3_1,</div><div class='add'>+	GOYA_FUNNEL_MME0_RTR,</div><div class='add'>+	GOYA_FUNNEL_MME1_RTR,</div><div class='add'>+	GOYA_FUNNEL_MME2_RTR,</div><div class='add'>+	GOYA_FUNNEL_MME3_RTR,</div><div class='add'>+	GOYA_FUNNEL_MME4_RTR,</div><div class='add'>+	GOYA_FUNNEL_MME5_RTR,</div><div class='add'>+	GOYA_FUNNEL_PCIE,</div><div class='add'>+	GOYA_FUNNEL_PSOC,</div><div class='add'>+	GOYA_FUNNEL_TPC0_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC1_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC1_RTR,</div><div class='add'>+	GOYA_FUNNEL_TPC2_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC2_RTR,</div><div class='add'>+	GOYA_FUNNEL_TPC3_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC3_RTR,</div><div class='add'>+	GOYA_FUNNEL_TPC4_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC4_RTR,</div><div class='add'>+	GOYA_FUNNEL_TPC5_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC5_RTR,</div><div class='add'>+	GOYA_FUNNEL_TPC6_EML,</div><div class='add'>+	GOYA_FUNNEL_TPC6_RTR,</div><div class='add'>+	GOYA_FUNNEL_TPC7_EML,</div><div class='add'>+	GOYA_FUNNEL_LAST = GOYA_FUNNEL_TPC7_EML</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum goya_debug_bmon_regs_index {</div><div class='add'>+	GOYA_BMON_FIRST = 0,</div><div class='add'>+	GOYA_BMON_CPU_RD = GOYA_BMON_FIRST,</div><div class='add'>+	GOYA_BMON_CPU_WR,</div><div class='add'>+	GOYA_BMON_DMA_CH_0_0,</div><div class='add'>+	GOYA_BMON_DMA_CH_0_1,</div><div class='add'>+	GOYA_BMON_DMA_CH_1_0,</div><div class='add'>+	GOYA_BMON_DMA_CH_1_1,</div><div class='add'>+	GOYA_BMON_DMA_CH_2_0,</div><div class='add'>+	GOYA_BMON_DMA_CH_2_1,</div><div class='add'>+	GOYA_BMON_DMA_CH_3_0,</div><div class='add'>+	GOYA_BMON_DMA_CH_3_1,</div><div class='add'>+	GOYA_BMON_DMA_CH_4_0,</div><div class='add'>+	GOYA_BMON_DMA_CH_4_1,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_0,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_1,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_2,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_3,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_4,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_5,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_6,</div><div class='add'>+	GOYA_BMON_DMA_MACRO_7,</div><div class='add'>+	GOYA_BMON_MME1_SBA_0,</div><div class='add'>+	GOYA_BMON_MME1_SBA_1,</div><div class='add'>+	GOYA_BMON_MME3_SBB_0,</div><div class='add'>+	GOYA_BMON_MME3_SBB_1,</div><div class='add'>+	GOYA_BMON_MME4_WACS2_0,</div><div class='add'>+	GOYA_BMON_MME4_WACS2_1,</div><div class='add'>+	GOYA_BMON_MME4_WACS2_2,</div><div class='add'>+	GOYA_BMON_MME4_WACS_0,</div><div class='add'>+	GOYA_BMON_MME4_WACS_1,</div><div class='add'>+	GOYA_BMON_MME4_WACS_2,</div><div class='add'>+	GOYA_BMON_MME4_WACS_3,</div><div class='add'>+	GOYA_BMON_MME4_WACS_4,</div><div class='add'>+	GOYA_BMON_MME4_WACS_5,</div><div class='add'>+	GOYA_BMON_MME4_WACS_6,</div><div class='add'>+	GOYA_BMON_MMU_0,</div><div class='add'>+	GOYA_BMON_MMU_1,</div><div class='add'>+	GOYA_BMON_PCIE_MSTR_RD,</div><div class='add'>+	GOYA_BMON_PCIE_MSTR_WR,</div><div class='add'>+	GOYA_BMON_PCIE_SLV_RD,</div><div class='add'>+	GOYA_BMON_PCIE_SLV_WR,</div><div class='add'>+	GOYA_BMON_TPC0_EML_0,</div><div class='add'>+	GOYA_BMON_TPC0_EML_1,</div><div class='add'>+	GOYA_BMON_TPC0_EML_2,</div><div class='add'>+	GOYA_BMON_TPC0_EML_3,</div><div class='add'>+	GOYA_BMON_TPC1_EML_0,</div><div class='add'>+	GOYA_BMON_TPC1_EML_1,</div><div class='add'>+	GOYA_BMON_TPC1_EML_2,</div><div class='add'>+	GOYA_BMON_TPC1_EML_3,</div><div class='add'>+	GOYA_BMON_TPC2_EML_0,</div><div class='add'>+	GOYA_BMON_TPC2_EML_1,</div><div class='add'>+	GOYA_BMON_TPC2_EML_2,</div><div class='add'>+	GOYA_BMON_TPC2_EML_3,</div><div class='add'>+	GOYA_BMON_TPC3_EML_0,</div><div class='add'>+	GOYA_BMON_TPC3_EML_1,</div><div class='add'>+	GOYA_BMON_TPC3_EML_2,</div><div class='add'>+	GOYA_BMON_TPC3_EML_3,</div><div class='add'>+	GOYA_BMON_TPC4_EML_0,</div><div class='add'>+	GOYA_BMON_TPC4_EML_1,</div><div class='add'>+	GOYA_BMON_TPC4_EML_2,</div><div class='add'>+	GOYA_BMON_TPC4_EML_3,</div><div class='add'>+	GOYA_BMON_TPC5_EML_0,</div><div class='add'>+	GOYA_BMON_TPC5_EML_1,</div><div class='add'>+	GOYA_BMON_TPC5_EML_2,</div><div class='add'>+	GOYA_BMON_TPC5_EML_3,</div><div class='add'>+	GOYA_BMON_TPC6_EML_0,</div><div class='add'>+	GOYA_BMON_TPC6_EML_1,</div><div class='add'>+	GOYA_BMON_TPC6_EML_2,</div><div class='add'>+	GOYA_BMON_TPC6_EML_3,</div><div class='add'>+	GOYA_BMON_TPC7_EML_0,</div><div class='add'>+	GOYA_BMON_TPC7_EML_1,</div><div class='add'>+	GOYA_BMON_TPC7_EML_2,</div><div class='add'>+	GOYA_BMON_TPC7_EML_3,</div><div class='add'>+	GOYA_BMON_LAST = GOYA_BMON_TPC7_EML_3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum goya_debug_spmu_regs_index {</div><div class='add'>+	GOYA_SPMU_FIRST = 0,</div><div class='add'>+	GOYA_SPMU_DMA_CH_0_CS = GOYA_SPMU_FIRST,</div><div class='add'>+	GOYA_SPMU_DMA_CH_1_CS,</div><div class='add'>+	GOYA_SPMU_DMA_CH_2_CS,</div><div class='add'>+	GOYA_SPMU_DMA_CH_3_CS,</div><div class='add'>+	GOYA_SPMU_DMA_CH_4_CS,</div><div class='add'>+	GOYA_SPMU_DMA_MACRO_CS,</div><div class='add'>+	GOYA_SPMU_MME1_SBA,</div><div class='add'>+	GOYA_SPMU_MME3_SBB,</div><div class='add'>+	GOYA_SPMU_MME4_WACS2,</div><div class='add'>+	GOYA_SPMU_MME4_WACS,</div><div class='add'>+	GOYA_SPMU_MMU_CS,</div><div class='add'>+	GOYA_SPMU_PCIE,</div><div class='add'>+	GOYA_SPMU_TPC0_EML,</div><div class='add'>+	GOYA_SPMU_TPC1_EML,</div><div class='add'>+	GOYA_SPMU_TPC2_EML,</div><div class='add'>+	GOYA_SPMU_TPC3_EML,</div><div class='add'>+	GOYA_SPMU_TPC4_EML,</div><div class='add'>+	GOYA_SPMU_TPC5_EML,</div><div class='add'>+	GOYA_SPMU_TPC6_EML,</div><div class='add'>+	GOYA_SPMU_TPC7_EML,</div><div class='add'>+	GOYA_SPMU_LAST = GOYA_SPMU_TPC7_EML</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* GOYA_CORESIGHT_H */</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/goya/goya_fw_if.h b/drivers/misc/habanalabs/include/goya/goya_fw_if.h<br/>index a9920cb4a07b..0fa80fe9f6cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya_fw_if.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/goya/goya_fw_if.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/goya/goya_fw_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/goya/goya_fw_if.h</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> #ifndef GOYA_FW_IF_H</div><div class='ctx'> #define GOYA_FW_IF_H</div><div class='ctx'> </div><div class='add'>+#define GOYA_EVENT_QUEUE_MSIX_IDX	5</div><div class='add'>+</div><div class='ctx'> #define CPU_BOOT_ADDR		0x7FF8040000ull</div><div class='ctx'> </div><div class='ctx'> #define UBOOT_FW_OFFSET		0x100000		/* 1MB in SRAM */</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/hl_boot_if.h b/drivers/misc/habanalabs/include/hl_boot_if.h<br/>index 7475732b9996..4cd04c090285 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/hl_boot_if.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/hl_boot_if.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/hl_boot_if.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/hl_boot_if.h</a></div><div class='hunk'>@@ -18,7 +18,8 @@ enum cpu_boot_status {</div><div class='ctx'> 	CPU_BOOT_STATUS_IN_SPL,</div><div class='ctx'> 	CPU_BOOT_STATUS_IN_UBOOT,</div><div class='ctx'> 	CPU_BOOT_STATUS_DRAM_INIT_FAIL,</div><div class='del'>-	CPU_BOOT_STATUS_FIT_CORRUPTED</div><div class='add'>+	CPU_BOOT_STATUS_FIT_CORRUPTED,</div><div class='add'>+	CPU_BOOT_STATUS_UBOOT_NOT_READY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum kmd_msg {</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h b/drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h<br/>index b680052ee3f0..71ea3c3e8ba3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h</a></div><div class='hunk'>@@ -14,16 +14,16 @@</div><div class='ctx'> #define PAGE_SIZE_4KB			(_AC(1, UL) &lt;&lt; PAGE_SHIFT_4KB)</div><div class='ctx'> #define PAGE_MASK_2MB			(~(PAGE_SIZE_2MB - 1))</div><div class='ctx'> </div><div class='del'>-#define PAGE_PRESENT_MASK		0x0000000000001</div><div class='del'>-#define SWAP_OUT_MASK			0x0000000000004</div><div class='del'>-#define LAST_MASK			0x0000000000800</div><div class='del'>-#define PHYS_ADDR_MASK			0x3FFFFFFFFF000ull</div><div class='add'>+#define PAGE_PRESENT_MASK		0x0000000000001ull</div><div class='add'>+#define SWAP_OUT_MASK			0x0000000000004ull</div><div class='add'>+#define LAST_MASK			0x0000000000800ull</div><div class='add'>+#define PHYS_ADDR_MASK			0xFFFFFFFFFFFFF000ull</div><div class='ctx'> #define HOP0_MASK			0x3000000000000ull</div><div class='ctx'> #define HOP1_MASK			0x0FF8000000000ull</div><div class='ctx'> #define HOP2_MASK			0x0007FC0000000ull</div><div class='del'>-#define HOP3_MASK			0x000003FE00000</div><div class='del'>-#define HOP4_MASK			0x00000001FF000</div><div class='del'>-#define OFFSET_MASK			0x0000000000FFF</div><div class='add'>+#define HOP3_MASK			0x000003FE00000ull</div><div class='add'>+#define HOP4_MASK			0x00000001FF000ull</div><div class='add'>+#define OFFSET_MASK			0x0000000000FFFull</div><div class='ctx'> </div><div class='ctx'> #define HOP0_SHIFT			48</div><div class='ctx'> #define HOP1_SHIFT			39</div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define HOP4_SHIFT			12</div><div class='ctx'> </div><div class='ctx'> #define PTE_PHYS_ADDR_SHIFT		12</div><div class='del'>-#define PTE_PHYS_ADDR_MASK		~0xFFF</div><div class='add'>+#define PTE_PHYS_ADDR_MASK		~OFFSET_MASK</div><div class='ctx'> </div><div class='ctx'> #define HL_PTE_SIZE			sizeof(u64)</div><div class='ctx'> #define HOP_TABLE_SIZE			PAGE_SIZE_4KB</div><div class='head'>diff --git a/drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h b/drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h<br/>new file mode 100644<br/>index 000000000000..d232081d4e0f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016-2019 HabanaLabs, Ltd.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef INCLUDE_PCI_GENERAL_H_</div><div class='add'>+#define INCLUDE_PCI_GENERAL_H_</div><div class='add'>+</div><div class='add'>+/* PCI CONFIGURATION SPACE */</div><div class='add'>+#define mmPCI_CONFIG_ELBI_ADDR		0xFF0</div><div class='add'>+#define mmPCI_CONFIG_ELBI_DATA		0xFF4</div><div class='add'>+#define mmPCI_CONFIG_ELBI_CTRL		0xFF8</div><div class='add'>+#define PCI_CONFIG_ELBI_CTRL_WRITE	(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define mmPCI_CONFIG_ELBI_STS		0xFFC</div><div class='add'>+#define PCI_CONFIG_ELBI_STS_ERR		(1 &lt;&lt; 30)</div><div class='add'>+#define PCI_CONFIG_ELBI_STS_DONE	(1 &lt;&lt; 31)</div><div class='add'>+#define PCI_CONFIG_ELBI_STS_MASK	(PCI_CONFIG_ELBI_STS_ERR | \</div><div class='add'>+					PCI_CONFIG_ELBI_STS_DONE)</div><div class='add'>+</div><div class='add'>+#endif /* INCLUDE_PCI_GENERAL_H_ */</div><div class='head'>diff --git a/drivers/misc/habanalabs/irq.c b/drivers/misc/habanalabs/irq.c<br/>index e69a09c10e3f..ea9f72ff456c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/irq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/irq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/irq.c</a></div><div class='hunk'>@@ -222,7 +222,7 @@ int hl_cq_init(struct hl_device *hdev, struct hl_cq *q, u32 hw_queue_id)</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(HL_CQ_SIZE_IN_BYTES &gt; HL_PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	p = hdev-&gt;asic_funcs-&gt;dma_alloc_coherent(hdev, HL_CQ_SIZE_IN_BYTES,</div><div class='add'>+	p = hdev-&gt;asic_funcs-&gt;asic_dma_alloc_coherent(hdev, HL_CQ_SIZE_IN_BYTES,</div><div class='ctx'> 				&amp;q-&gt;bus_address, GFP_KERNEL | __GFP_ZERO);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -248,7 +248,7 @@ int hl_cq_init(struct hl_device *hdev, struct hl_cq *q, u32 hw_queue_id)</div><div class='ctx'>  */</div><div class='ctx'> void hl_cq_fini(struct hl_device *hdev, struct hl_cq *q)</div><div class='ctx'> {</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, HL_CQ_SIZE_IN_BYTES,</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;asic_dma_free_coherent(hdev, HL_CQ_SIZE_IN_BYTES,</div><div class='ctx'> 			(void *) (uintptr_t) q-&gt;kernel_address, q-&gt;bus_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,8 +284,9 @@ int hl_eq_init(struct hl_device *hdev, struct hl_eq *q)</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(HL_EQ_SIZE_IN_BYTES &gt; HL_PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	p = hdev-&gt;asic_funcs-&gt;dma_alloc_coherent(hdev, HL_EQ_SIZE_IN_BYTES,</div><div class='del'>-				&amp;q-&gt;bus_address, GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+	p = hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_alloc(hdev,</div><div class='add'>+							HL_EQ_SIZE_IN_BYTES,</div><div class='add'>+							&amp;q-&gt;bus_address);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -308,8 +309,9 @@ void hl_eq_fini(struct hl_device *hdev, struct hl_eq *q)</div><div class='ctx'> {</div><div class='ctx'> 	flush_workqueue(hdev-&gt;eq_wq);</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;asic_funcs-&gt;dma_free_coherent(hdev, HL_EQ_SIZE_IN_BYTES,</div><div class='del'>-			(void *) (uintptr_t) q-&gt;kernel_address, q-&gt;bus_address);</div><div class='add'>+	hdev-&gt;asic_funcs-&gt;cpu_accessible_dma_pool_free(hdev,</div><div class='add'>+					HL_EQ_SIZE_IN_BYTES,</div><div class='add'>+					(void *) (uintptr_t) q-&gt;kernel_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hl_eq_reset(struct hl_device *hdev, struct hl_eq *q)</div><div class='head'>diff --git a/drivers/misc/habanalabs/memory.c b/drivers/misc/habanalabs/memory.c<br/>index 3a12fd1a5274..d67d24c13efd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/memory.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/memory.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/memory.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/memory.c</a></div><div class='hunk'>@@ -56,9 +56,9 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args,</div><div class='ctx'> 	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='ctx'> 	struct hl_vm *vm = &amp;hdev-&gt;vm;</div><div class='ctx'> 	struct hl_vm_phys_pg_pack *phys_pg_pack;</div><div class='del'>-	u64 paddr = 0;</div><div class='del'>-	u32 total_size, num_pgs, num_curr_pgs, page_size, page_shift;</div><div class='del'>-	int handle, rc, i;</div><div class='add'>+	u64 paddr = 0, total_size, num_pgs, i;</div><div class='add'>+	u32 num_curr_pgs, page_size, page_shift;</div><div class='add'>+	int handle, rc;</div><div class='ctx'> 	bool contiguous;</div><div class='ctx'> </div><div class='ctx'> 	num_curr_pgs = 0;</div><div class='hunk'>@@ -73,7 +73,7 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args,</div><div class='ctx'> 		paddr = (u64) gen_pool_alloc(vm-&gt;dram_pg_pool, total_size);</div><div class='ctx'> 		if (!paddr) {</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='del'>-				"failed to allocate %u huge contiguous pages\n",</div><div class='add'>+				"failed to allocate %llu huge contiguous pages\n",</div><div class='ctx'> 				num_pgs);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -93,7 +93,7 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args,</div><div class='ctx'> 	phys_pg_pack-&gt;flags = args-&gt;flags;</div><div class='ctx'> 	phys_pg_pack-&gt;contiguous = contiguous;</div><div class='ctx'> </div><div class='del'>-	phys_pg_pack-&gt;pages = kcalloc(num_pgs, sizeof(u64), GFP_KERNEL);</div><div class='add'>+	phys_pg_pack-&gt;pages = kvmalloc_array(num_pgs, sizeof(u64), GFP_KERNEL);</div><div class='ctx'> 	if (!phys_pg_pack-&gt;pages) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto pages_arr_err;</div><div class='hunk'>@@ -109,7 +109,7 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args,</div><div class='ctx'> 							page_size);</div><div class='ctx'> 			if (!phys_pg_pack-&gt;pages[i]) {</div><div class='ctx'> 				dev_err(hdev-&gt;dev,</div><div class='del'>-					"ioctl failed to allocate page\n");</div><div class='add'>+					"Failed to allocate device memory (out of memory)\n");</div><div class='ctx'> 				rc = -ENOMEM;</div><div class='ctx'> 				goto page_err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -148,7 +148,7 @@ page_err:</div><div class='ctx'> 			gen_pool_free(vm-&gt;dram_pg_pool, phys_pg_pack-&gt;pages[i],</div><div class='ctx'> 					page_size);</div><div class='ctx'> </div><div class='del'>-	kfree(phys_pg_pack-&gt;pages);</div><div class='add'>+	kvfree(phys_pg_pack-&gt;pages);</div><div class='ctx'> pages_arr_err:</div><div class='ctx'> 	kfree(phys_pg_pack);</div><div class='ctx'> pages_pack_err:</div><div class='hunk'>@@ -267,7 +267,7 @@ static void free_phys_pg_pack(struct hl_device *hdev,</div><div class='ctx'> 		struct hl_vm_phys_pg_pack *phys_pg_pack)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_vm *vm = &amp;hdev-&gt;vm;</div><div class='del'>-	int i;</div><div class='add'>+	u64 i;</div><div class='ctx'> </div><div class='ctx'> 	if (!phys_pg_pack-&gt;created_from_userptr) {</div><div class='ctx'> 		if (phys_pg_pack-&gt;contiguous) {</div><div class='hunk'>@@ -288,7 +288,7 @@ static void free_phys_pg_pack(struct hl_device *hdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(phys_pg_pack-&gt;pages);</div><div class='add'>+	kvfree(phys_pg_pack-&gt;pages);</div><div class='ctx'> 	kfree(phys_pg_pack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +519,7 @@ static inline int add_va_block(struct hl_device *hdev,</div><div class='ctx'>  * - Return the start address of the virtual block</div><div class='ctx'>  */</div><div class='ctx'> static u64 get_va_block(struct hl_device *hdev,</div><div class='del'>-		struct hl_va_range *va_range, u32 size, u64 hint_addr,</div><div class='add'>+		struct hl_va_range *va_range, u64 size, u64 hint_addr,</div><div class='ctx'> 		bool is_userptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_vm_va_block *va_block, *new_va_block = NULL;</div><div class='hunk'>@@ -577,7 +577,8 @@ static u64 get_va_block(struct hl_device *hdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!new_va_block) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "no available va block for size %u\n", size);</div><div class='add'>+		dev_err(hdev-&gt;dev, "no available va block for size %llu\n",</div><div class='add'>+				size);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -648,8 +649,8 @@ static int init_phys_pg_pack_from_userptr(struct hl_ctx *ctx,</div><div class='ctx'> 	struct hl_vm_phys_pg_pack *phys_pg_pack;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='del'>-	u64 page_mask;</div><div class='del'>-	u32 npages, total_npages, page_size = PAGE_SIZE;</div><div class='add'>+	u64 page_mask, total_npages;</div><div class='add'>+	u32 npages, page_size = PAGE_SIZE;</div><div class='ctx'> 	bool first = true, is_huge_page_opt = true;</div><div class='ctx'> 	int rc, i, j;</div><div class='ctx'> </div><div class='hunk'>@@ -691,7 +692,8 @@ static int init_phys_pg_pack_from_userptr(struct hl_ctx *ctx,</div><div class='ctx'> </div><div class='ctx'> 	page_mask = ~(((u64) page_size) - 1);</div><div class='ctx'> </div><div class='del'>-	phys_pg_pack-&gt;pages = kcalloc(total_npages, sizeof(u64), GFP_KERNEL);</div><div class='add'>+	phys_pg_pack-&gt;pages = kvmalloc_array(total_npages, sizeof(u64),</div><div class='add'>+						GFP_KERNEL);</div><div class='ctx'> 	if (!phys_pg_pack-&gt;pages) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto page_pack_arr_mem_err;</div><div class='hunk'>@@ -750,21 +752,17 @@ static int map_phys_page_pack(struct hl_ctx *ctx, u64 vaddr,</div><div class='ctx'> 		struct hl_vm_phys_pg_pack *phys_pg_pack)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='del'>-	u64 next_vaddr = vaddr, paddr;</div><div class='add'>+	u64 next_vaddr = vaddr, paddr, mapped_pg_cnt = 0, i;</div><div class='ctx'> 	u32 page_size = phys_pg_pack-&gt;page_size;</div><div class='del'>-	int i, rc = 0, mapped_pg_cnt = 0;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; phys_pg_pack-&gt;npages ; i++) {</div><div class='ctx'> 		paddr = phys_pg_pack-&gt;pages[i];</div><div class='ctx'> </div><div class='del'>-		/* For accessing the host we need to turn on bit 39 */</div><div class='del'>-		if (phys_pg_pack-&gt;created_from_userptr)</div><div class='del'>-			paddr += hdev-&gt;asic_prop.host_phys_base_address;</div><div class='del'>-</div><div class='ctx'> 		rc = hl_mmu_map(ctx, next_vaddr, paddr, page_size);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='del'>-				"map failed for handle %u, npages: %d, mapped: %d",</div><div class='add'>+				"map failed for handle %u, npages: %llu, mapped: %llu",</div><div class='ctx'> 				phys_pg_pack-&gt;handle, phys_pg_pack-&gt;npages,</div><div class='ctx'> 				mapped_pg_cnt);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -985,10 +983,10 @@ static int unmap_device_va(struct hl_ctx *ctx, u64 vaddr)</div><div class='ctx'> 	struct hl_vm_hash_node *hnode = NULL;</div><div class='ctx'> 	struct hl_userptr *userptr = NULL;</div><div class='ctx'> 	enum vm_type_t *vm_type;</div><div class='del'>-	u64 next_vaddr;</div><div class='add'>+	u64 next_vaddr, i;</div><div class='ctx'> 	u32 page_size;</div><div class='ctx'> 	bool is_userptr;</div><div class='del'>-	int i, rc;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* protect from double entrance */</div><div class='ctx'> 	mutex_lock(&amp;ctx-&gt;mem_hash_lock);</div><div class='hunk'>@@ -1044,10 +1042,17 @@ static int unmap_device_va(struct hl_ctx *ctx, u64 vaddr)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ctx-&gt;mmu_lock);</div><div class='ctx'> </div><div class='del'>-	for (i = 0 ; i &lt; phys_pg_pack-&gt;npages ; i++, next_vaddr += page_size)</div><div class='add'>+	for (i = 0 ; i &lt; phys_pg_pack-&gt;npages ; i++, next_vaddr += page_size) {</div><div class='ctx'> 		if (hl_mmu_unmap(ctx, next_vaddr, page_size))</div><div class='ctx'> 			dev_warn_ratelimited(hdev-&gt;dev,</div><div class='del'>-				"unmap failed for vaddr: 0x%llx\n", next_vaddr);</div><div class='add'>+			"unmap failed for vaddr: 0x%llx\n", next_vaddr);</div><div class='add'>+</div><div class='add'>+		/* unmapping on Palladium can be really long, so avoid a CPU</div><div class='add'>+		 * soft lockup bug by sleeping a little between unmapping pages</div><div class='add'>+		 */</div><div class='add'>+		if (hdev-&gt;pldm)</div><div class='add'>+			usleep_range(500, 1000);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;asic_funcs-&gt;mmu_invalidate_cache(hdev, true);</div><div class='ctx'> </div><div class='hunk'>@@ -1081,6 +1086,64 @@ vm_type_err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mem_ioctl_no_mmu(struct hl_fpriv *hpriv, union hl_mem_args *args)</div><div class='add'>+{</div><div class='add'>+	struct hl_device *hdev = hpriv-&gt;hdev;</div><div class='add'>+	struct hl_ctx *ctx = hpriv-&gt;ctx;</div><div class='add'>+	u64 device_addr = 0;</div><div class='add'>+	u32 handle = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	switch (args-&gt;in.op) {</div><div class='add'>+	case HL_MEM_OP_ALLOC:</div><div class='add'>+		if (args-&gt;in.alloc.mem_size == 0) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"alloc size must be larger than 0\n");</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Force contiguous as there are no real MMU</div><div class='add'>+		 * translations to overcome physical memory gaps</div><div class='add'>+		 */</div><div class='add'>+		args-&gt;in.flags |= HL_MEM_CONTIGUOUS;</div><div class='add'>+		rc = alloc_device_memory(ctx, &amp;args-&gt;in, &amp;handle);</div><div class='add'>+</div><div class='add'>+		memset(args, 0, sizeof(*args));</div><div class='add'>+		args-&gt;out.handle = (__u64) handle;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HL_MEM_OP_FREE:</div><div class='add'>+		rc = free_device_memory(ctx, args-&gt;in.free.handle);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HL_MEM_OP_MAP:</div><div class='add'>+		if (args-&gt;in.flags &amp; HL_MEM_USERPTR) {</div><div class='add'>+			device_addr = args-&gt;in.map_host.host_virt_addr;</div><div class='add'>+			rc = 0;</div><div class='add'>+		} else {</div><div class='add'>+			rc = get_paddr_from_handle(ctx, &amp;args-&gt;in,</div><div class='add'>+					&amp;device_addr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(args, 0, sizeof(*args));</div><div class='add'>+		args-&gt;out.device_virt_addr = device_addr;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HL_MEM_OP_UNMAP:</div><div class='add'>+		rc = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(hdev-&gt;dev, "Unknown opcode for memory IOCTL\n");</div><div class='add'>+		rc = -ENOTTY;</div><div class='add'>+		break;</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='ctx'> int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	union hl_mem_args *args = data;</div><div class='hunk'>@@ -1092,104 +1155,54 @@ int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (hl_device_disabled_or_in_reset(hdev)) {</div><div class='ctx'> 		dev_warn_ratelimited(hdev-&gt;dev,</div><div class='del'>-			"Device is disabled or in reset. Can't execute memory IOCTL\n");</div><div class='add'>+			"Device is %s. Can't execute MEMORY IOCTL\n",</div><div class='add'>+			atomic_read(&amp;hdev-&gt;in_reset) ? "in_reset" : "disabled");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;mmu_enable) {</div><div class='del'>-		switch (args-&gt;in.op) {</div><div class='del'>-		case HL_MEM_OP_ALLOC:</div><div class='del'>-			if (!hdev-&gt;dram_supports_virtual_memory) {</div><div class='del'>-				dev_err(hdev-&gt;dev,</div><div class='del'>-					"DRAM alloc is not supported\n");</div><div class='del'>-				rc = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			if (args-&gt;in.alloc.mem_size == 0) {</div><div class='del'>-				dev_err(hdev-&gt;dev,</div><div class='del'>-					"alloc size must be larger than 0\n");</div><div class='del'>-				rc = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			rc = alloc_device_memory(ctx, &amp;args-&gt;in, &amp;handle);</div><div class='del'>-</div><div class='del'>-			memset(args, 0, sizeof(*args));</div><div class='del'>-			args-&gt;out.handle = (__u64) handle;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case HL_MEM_OP_FREE:</div><div class='del'>-			if (!hdev-&gt;dram_supports_virtual_memory) {</div><div class='del'>-				dev_err(hdev-&gt;dev,</div><div class='del'>-					"DRAM free is not supported\n");</div><div class='del'>-				rc = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			rc = free_device_memory(ctx, args-&gt;in.free.handle);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case HL_MEM_OP_MAP:</div><div class='del'>-			rc = map_device_va(ctx, &amp;args-&gt;in, &amp;device_addr);</div><div class='del'>-</div><div class='del'>-			memset(args, 0, sizeof(*args));</div><div class='del'>-			args-&gt;out.device_virt_addr = device_addr;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case HL_MEM_OP_UNMAP:</div><div class='del'>-			rc = unmap_device_va(ctx,</div><div class='del'>-					args-&gt;in.unmap.device_virt_addr);</div><div class='del'>-			break;</div><div class='add'>+	if (!hdev-&gt;mmu_enable)</div><div class='add'>+		return mem_ioctl_no_mmu(hpriv, args);</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			dev_err(hdev-&gt;dev, "Unknown opcode for memory IOCTL\n");</div><div class='del'>-			rc = -ENOTTY;</div><div class='del'>-			break;</div><div class='add'>+	switch (args-&gt;in.op) {</div><div class='add'>+	case HL_MEM_OP_ALLOC:</div><div class='add'>+		if (!hdev-&gt;dram_supports_virtual_memory) {</div><div class='add'>+			dev_err(hdev-&gt;dev, "DRAM alloc is not supported\n");</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (args-&gt;in.op) {</div><div class='del'>-		case HL_MEM_OP_ALLOC:</div><div class='del'>-			if (args-&gt;in.alloc.mem_size == 0) {</div><div class='del'>-				dev_err(hdev-&gt;dev,</div><div class='del'>-					"alloc size must be larger than 0\n");</div><div class='del'>-				rc = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			/* Force contiguous as there are no real MMU</div><div class='del'>-			 * translations to overcome physical memory gaps</div><div class='del'>-			 */</div><div class='del'>-			args-&gt;in.flags |= HL_MEM_CONTIGUOUS;</div><div class='del'>-			rc = alloc_device_memory(ctx, &amp;args-&gt;in, &amp;handle);</div><div class='add'>+		if (args-&gt;in.alloc.mem_size == 0) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"alloc size must be larger than 0\n");</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		rc = alloc_device_memory(ctx, &amp;args-&gt;in, &amp;handle);</div><div class='ctx'> </div><div class='del'>-			memset(args, 0, sizeof(*args));</div><div class='del'>-			args-&gt;out.handle = (__u64) handle;</div><div class='del'>-			break;</div><div class='add'>+		memset(args, 0, sizeof(*args));</div><div class='add'>+		args-&gt;out.handle = (__u64) handle;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case HL_MEM_OP_FREE:</div><div class='del'>-			rc = free_device_memory(ctx, args-&gt;in.free.handle);</div><div class='del'>-			break;</div><div class='add'>+	case HL_MEM_OP_FREE:</div><div class='add'>+		rc = free_device_memory(ctx, args-&gt;in.free.handle);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case HL_MEM_OP_MAP:</div><div class='del'>-			if (args-&gt;in.flags &amp; HL_MEM_USERPTR) {</div><div class='del'>-				device_addr = args-&gt;in.map_host.host_virt_addr;</div><div class='del'>-				rc = 0;</div><div class='del'>-			} else {</div><div class='del'>-				rc = get_paddr_from_handle(ctx, &amp;args-&gt;in,</div><div class='del'>-						&amp;device_addr);</div><div class='del'>-			}</div><div class='add'>+	case HL_MEM_OP_MAP:</div><div class='add'>+		rc = map_device_va(ctx, &amp;args-&gt;in, &amp;device_addr);</div><div class='ctx'> </div><div class='del'>-			memset(args, 0, sizeof(*args));</div><div class='del'>-			args-&gt;out.device_virt_addr = device_addr;</div><div class='del'>-			break;</div><div class='add'>+		memset(args, 0, sizeof(*args));</div><div class='add'>+		args-&gt;out.device_virt_addr = device_addr;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case HL_MEM_OP_UNMAP:</div><div class='del'>-			rc = 0;</div><div class='del'>-			break;</div><div class='add'>+	case HL_MEM_OP_UNMAP:</div><div class='add'>+		rc = unmap_device_va(ctx,</div><div class='add'>+				args-&gt;in.unmap.device_virt_addr);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			dev_err(hdev-&gt;dev, "Unknown opcode for memory IOCTL\n");</div><div class='del'>-			rc = -ENOTTY;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	default:</div><div class='add'>+		dev_err(hdev-&gt;dev, "Unknown opcode for memory IOCTL\n");</div><div class='add'>+		rc = -ENOTTY;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/misc/habanalabs/mmu.c b/drivers/misc/habanalabs/mmu.c<br/>index 2f2e99cb2743..533d9315b6fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/mmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/habanalabs/mmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/mmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/mmu.c</a></div><div class='hunk'>@@ -11,13 +11,15 @@</div><div class='ctx'> #include &lt;linux/genalloc.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct pgt_info *get_pgt_info(struct hl_ctx *ctx, u64 addr)</div><div class='add'>+static inline u64 get_phys_addr(struct hl_ctx *ctx, u64 shadow_addr);</div><div class='add'>+</div><div class='add'>+static struct pgt_info *get_pgt_info(struct hl_ctx *ctx, u64 hop_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct pgt_info *pgt_info = NULL;</div><div class='ctx'> </div><div class='del'>-	hash_for_each_possible(ctx-&gt;mmu_hash, pgt_info, node,</div><div class='del'>-				(unsigned long) addr)</div><div class='del'>-		if (addr == pgt_info-&gt;addr)</div><div class='add'>+	hash_for_each_possible(ctx-&gt;mmu_shadow_hash, pgt_info, node,</div><div class='add'>+				(unsigned long) hop_addr)</div><div class='add'>+		if (hop_addr == pgt_info-&gt;shadow_addr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	return pgt_info;</div><div class='hunk'>@@ -25,45 +27,109 @@ static struct pgt_info *get_pgt_info(struct hl_ctx *ctx, u64 addr)</div><div class='ctx'> </div><div class='ctx'> static void free_hop(struct hl_ctx *ctx, u64 hop_addr)</div><div class='ctx'> {</div><div class='add'>+	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='ctx'> 	struct pgt_info *pgt_info = get_pgt_info(ctx, hop_addr);</div><div class='ctx'> </div><div class='del'>-	gen_pool_free(pgt_info-&gt;ctx-&gt;hdev-&gt;mmu_pgt_pool, pgt_info-&gt;addr,</div><div class='del'>-			ctx-&gt;hdev-&gt;asic_prop.mmu_hop_table_size);</div><div class='add'>+	gen_pool_free(hdev-&gt;mmu_pgt_pool, pgt_info-&gt;phys_addr,</div><div class='add'>+			hdev-&gt;asic_prop.mmu_hop_table_size);</div><div class='ctx'> 	hash_del(&amp;pgt_info-&gt;node);</div><div class='del'>-</div><div class='add'>+	kfree((u64 *) (uintptr_t) pgt_info-&gt;shadow_addr);</div><div class='ctx'> 	kfree(pgt_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 alloc_hop(struct hl_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	struct pgt_info *pgt_info;</div><div class='del'>-	u64 addr;</div><div class='add'>+	u64 phys_addr, shadow_addr;</div><div class='ctx'> </div><div class='ctx'> 	pgt_info = kmalloc(sizeof(*pgt_info), GFP_KERNEL);</div><div class='ctx'> 	if (!pgt_info)</div><div class='ctx'> 		return ULLONG_MAX;</div><div class='ctx'> </div><div class='del'>-	addr = (u64) gen_pool_alloc(hdev-&gt;mmu_pgt_pool,</div><div class='del'>-			hdev-&gt;asic_prop.mmu_hop_table_size);</div><div class='del'>-	if (!addr) {</div><div class='add'>+	phys_addr = (u64) gen_pool_alloc(hdev-&gt;mmu_pgt_pool,</div><div class='add'>+					prop-&gt;mmu_hop_table_size);</div><div class='add'>+	if (!phys_addr) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "failed to allocate page\n");</div><div class='del'>-		kfree(pgt_info);</div><div class='del'>-		return ULLONG_MAX;</div><div class='add'>+		goto pool_add_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pgt_info-&gt;addr = addr;</div><div class='add'>+	shadow_addr = (u64) (uintptr_t) kzalloc(prop-&gt;mmu_hop_table_size,</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+	if (!shadow_addr)</div><div class='add'>+		goto shadow_err;</div><div class='add'>+</div><div class='add'>+	pgt_info-&gt;phys_addr = phys_addr;</div><div class='add'>+	pgt_info-&gt;shadow_addr = shadow_addr;</div><div class='ctx'> 	pgt_info-&gt;ctx = ctx;</div><div class='ctx'> 	pgt_info-&gt;num_of_ptes = 0;</div><div class='del'>-	hash_add(ctx-&gt;mmu_hash, &amp;pgt_info-&gt;node, addr);</div><div class='add'>+	hash_add(ctx-&gt;mmu_shadow_hash, &amp;pgt_info-&gt;node, shadow_addr);</div><div class='add'>+</div><div class='add'>+	return shadow_addr;</div><div class='add'>+</div><div class='add'>+shadow_err:</div><div class='add'>+	gen_pool_free(hdev-&gt;mmu_pgt_pool, phys_addr, prop-&gt;mmu_hop_table_size);</div><div class='add'>+pool_add_err:</div><div class='add'>+	kfree(pgt_info);</div><div class='add'>+</div><div class='add'>+	return ULLONG_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 get_phys_hop0_addr(struct hl_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	return ctx-&gt;hdev-&gt;asic_prop.mmu_pgt_addr +</div><div class='add'>+			(ctx-&gt;asid * ctx-&gt;hdev-&gt;asic_prop.mmu_hop_table_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 get_hop0_addr(struct hl_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	return (u64) (uintptr_t) ctx-&gt;hdev-&gt;mmu_shadow_hop0 +</div><div class='add'>+			(ctx-&gt;asid * ctx-&gt;hdev-&gt;asic_prop.mmu_hop_table_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void flush(struct hl_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	/* flush all writes from all cores to reach PCI */</div><div class='add'>+	mb();</div><div class='add'>+	ctx-&gt;hdev-&gt;asic_funcs-&gt;read_pte(ctx-&gt;hdev, get_phys_hop0_addr(ctx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* transform the value to physical address when writing to H/W */</div><div class='add'>+static inline void write_pte(struct hl_ctx *ctx, u64 shadow_pte_addr, u64 val)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The value to write is actually the address of the next shadow hop +</div><div class='add'>+	 * flags at the 12 LSBs.</div><div class='add'>+	 * Hence in order to get the value to write to the physical PTE, we</div><div class='add'>+	 * clear the 12 LSBs and translate the shadow hop to its associated</div><div class='add'>+	 * physical hop, and add back the original 12 LSBs.</div><div class='add'>+	 */</div><div class='add'>+	u64 phys_val = get_phys_addr(ctx, val &amp; PTE_PHYS_ADDR_MASK) |</div><div class='add'>+				(val &amp; OFFSET_MASK);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;hdev-&gt;asic_funcs-&gt;write_pte(ctx-&gt;hdev,</div><div class='add'>+					get_phys_addr(ctx, shadow_pte_addr),</div><div class='add'>+					phys_val);</div><div class='add'>+</div><div class='add'>+	*(u64 *) (uintptr_t) shadow_pte_addr = val;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return addr;</div><div class='add'>+/* do not transform the value to physical address when writing to H/W */</div><div class='add'>+static inline void write_final_pte(struct hl_ctx *ctx, u64 shadow_pte_addr,</div><div class='add'>+					u64 val)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;hdev-&gt;asic_funcs-&gt;write_pte(ctx-&gt;hdev,</div><div class='add'>+					get_phys_addr(ctx, shadow_pte_addr),</div><div class='add'>+					val);</div><div class='add'>+	*(u64 *) (uintptr_t) shadow_pte_addr = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void clear_pte(struct hl_device *hdev, u64 pte_addr)</div><div class='add'>+/* clear the last and present bits */</div><div class='add'>+static inline void clear_pte(struct hl_ctx *ctx, u64 pte_addr)</div><div class='ctx'> {</div><div class='del'>-	/* clear the last and present bits */</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;write_pte(hdev, pte_addr, 0);</div><div class='add'>+	/* no need to transform the value to physical address */</div><div class='add'>+	write_final_pte(ctx, pte_addr, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void get_pte(struct hl_ctx *ctx, u64 hop_addr)</div><div class='hunk'>@@ -98,12 +164,6 @@ static inline int put_pte(struct hl_ctx *ctx, u64 hop_addr)</div><div class='ctx'> 	return num_of_ptes_left;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 get_hop0_addr(struct hl_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	return ctx-&gt;hdev-&gt;asic_prop.mmu_pgt_addr +</div><div class='del'>-			(ctx-&gt;asid * ctx-&gt;hdev-&gt;asic_prop.mmu_hop_table_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline u64 get_hopN_pte_addr(struct hl_ctx *ctx, u64 hop_addr,</div><div class='ctx'> 					u64 virt_addr, u64 mask, u64 shift)</div><div class='ctx'> {</div><div class='hunk'>@@ -136,7 +196,7 @@ static inline u64 get_hop4_pte_addr(struct hl_ctx *ctx, u64 hop_addr, u64 vaddr)</div><div class='ctx'> 	return get_hopN_pte_addr(ctx, hop_addr, vaddr, HOP4_MASK, HOP4_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 get_next_hop_addr(u64 curr_pte)</div><div class='add'>+static inline u64 get_next_hop_addr(struct hl_ctx *ctx, u64 curr_pte)</div><div class='ctx'> {</div><div class='ctx'> 	if (curr_pte &amp; PAGE_PRESENT_MASK)</div><div class='ctx'> 		return curr_pte &amp; PHYS_ADDR_MASK;</div><div class='hunk'>@@ -147,7 +207,7 @@ static inline u64 get_next_hop_addr(u64 curr_pte)</div><div class='ctx'> static inline u64 get_alloc_next_hop_addr(struct hl_ctx *ctx, u64 curr_pte,</div><div class='ctx'> 						bool *is_new_hop)</div><div class='ctx'> {</div><div class='del'>-	u64 hop_addr = get_next_hop_addr(curr_pte);</div><div class='add'>+	u64 hop_addr = get_next_hop_addr(ctx, curr_pte);</div><div class='ctx'> </div><div class='ctx'> 	if (hop_addr == ULLONG_MAX) {</div><div class='ctx'> 		hop_addr = alloc_hop(ctx);</div><div class='hunk'>@@ -157,106 +217,30 @@ static inline u64 get_alloc_next_hop_addr(struct hl_ctx *ctx, u64 curr_pte,</div><div class='ctx'> 	return hop_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * hl_mmu_init - init the mmu module</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to the habanalabs device structure</div><div class='del'>- *</div><div class='del'>- * This function does the following:</div><div class='del'>- * - Allocate max_asid zeroed hop0 pgts so no mapping is available</div><div class='del'>- * - Enable mmu in hw</div><div class='del'>- * - Invalidate the mmu cache</div><div class='del'>- * - Create a pool of pages for pgts</div><div class='del'>- * - Returns 0 on success</div><div class='del'>- *</div><div class='del'>- * This function depends on DMA QMAN to be working!</div><div class='del'>- */</div><div class='del'>-int hl_mmu_init(struct hl_device *hdev)</div><div class='add'>+/* translates shadow address inside hop to a physical address */</div><div class='add'>+static inline u64 get_phys_addr(struct hl_ctx *ctx, u64 shadow_addr)</div><div class='ctx'> {</div><div class='del'>-	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='del'>-	int rc;</div><div class='add'>+	u64 page_mask = (ctx-&gt;hdev-&gt;asic_prop.mmu_hop_table_size - 1);</div><div class='add'>+	u64 shadow_hop_addr = shadow_addr &amp; ~page_mask;</div><div class='add'>+	u64 pte_offset = shadow_addr &amp; page_mask;</div><div class='add'>+	u64 phys_hop_addr;</div><div class='ctx'> </div><div class='del'>-	if (!hdev-&gt;mmu_enable)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* MMU HW init was already done in device hw_init() */</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;hdev-&gt;mmu_cache_lock);</div><div class='del'>-</div><div class='del'>-	hdev-&gt;mmu_pgt_pool =</div><div class='del'>-			gen_pool_create(__ffs(prop-&gt;mmu_hop_table_size), -1);</div><div class='del'>-</div><div class='del'>-	if (!hdev-&gt;mmu_pgt_pool) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to create page gen pool\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto err_pool_create;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = gen_pool_add(hdev-&gt;mmu_pgt_pool, prop-&gt;mmu_pgt_addr +</div><div class='del'>-			prop-&gt;mmu_hop0_tables_total_size,</div><div class='del'>-			prop-&gt;mmu_pgt_size - prop-&gt;mmu_hop0_tables_total_size,</div><div class='del'>-			-1);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(hdev-&gt;dev, "Failed to add memory to page gen pool\n");</div><div class='del'>-		goto err_pool_add;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_pool_add:</div><div class='del'>-	gen_pool_destroy(hdev-&gt;mmu_pgt_pool);</div><div class='del'>-err_pool_create:</div><div class='del'>-	mutex_destroy(&amp;hdev-&gt;mmu_cache_lock);</div><div class='add'>+	if (shadow_hop_addr != get_hop0_addr(ctx))</div><div class='add'>+		phys_hop_addr = get_pgt_info(ctx, shadow_hop_addr)-&gt;phys_addr;</div><div class='add'>+	else</div><div class='add'>+		phys_hop_addr = get_phys_hop0_addr(ctx);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return phys_hop_addr + pte_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * hl_mmu_fini - release the mmu module.</div><div class='del'>- *</div><div class='del'>- * @hdev: pointer to the habanalabs device structure</div><div class='del'>- *</div><div class='del'>- * This function does the following:</div><div class='del'>- * - Disable mmu in hw</div><div class='del'>- * - free the pgts pool</div><div class='del'>- *</div><div class='del'>- * All ctxs should be freed before calling this func</div><div class='del'>- */</div><div class='del'>-void hl_mmu_fini(struct hl_device *hdev)</div><div class='del'>-{</div><div class='del'>-	if (!hdev-&gt;mmu_enable)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gen_pool_destroy(hdev-&gt;mmu_pgt_pool);</div><div class='del'>-</div><div class='del'>-	mutex_destroy(&amp;hdev-&gt;mmu_cache_lock);</div><div class='del'>-</div><div class='del'>-	/* MMU HW fini will be done in device hw_fini() */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hl_mmu_ctx_init() - initialize a context for using the MMU module.</div><div class='del'>- * @ctx: pointer to the context structure to initialize.</div><div class='del'>- *</div><div class='del'>- * Initialize a mutex to protect the concurrent mapping flow, a hash to hold all</div><div class='del'>- * page tables hops related to this context and an optional DRAM default page</div><div class='del'>- * mapping.</div><div class='del'>- * Return: 0 on success, non-zero otherwise.</div><div class='del'>- */</div><div class='del'>-int hl_mmu_ctx_init(struct hl_ctx *ctx)</div><div class='add'>+static int dram_default_mapping_init(struct hl_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='ctx'> 	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='del'>-	u64 num_of_hop3, total_hops, hop1_addr, hop2_addr, hop2_pte_addr,</div><div class='del'>-		hop3_pte_addr, pte_val;</div><div class='add'>+	u64 num_of_hop3, total_hops, hop0_addr, hop1_addr, hop2_addr,</div><div class='add'>+		hop2_pte_addr, hop3_pte_addr, pte_val;</div><div class='ctx'> 	int rc, i, j, hop3_allocated = 0;</div><div class='ctx'> </div><div class='del'>-	if (!hdev-&gt;mmu_enable)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;ctx-&gt;mmu_lock);</div><div class='del'>-	hash_init(ctx-&gt;mmu_hash);</div><div class='del'>-</div><div class='ctx'> 	if (!hdev-&gt;dram_supports_virtual_memory ||</div><div class='ctx'> 			!hdev-&gt;dram_default_page_mapping)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -269,10 +253,10 @@ int hl_mmu_ctx_init(struct hl_ctx *ctx)</div><div class='ctx'> 	total_hops = num_of_hop3 + 2;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;dram_default_hops = kzalloc(HL_PTE_SIZE * total_hops,  GFP_KERNEL);</div><div class='del'>-	if (!ctx-&gt;dram_default_hops) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto alloc_err;</div><div class='del'>-	}</div><div class='add'>+	if (!ctx-&gt;dram_default_hops)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hop0_addr = get_hop0_addr(ctx);</div><div class='ctx'> </div><div class='ctx'> 	hop1_addr = alloc_hop(ctx);</div><div class='ctx'> 	if (hop1_addr == ULLONG_MAX) {</div><div class='hunk'>@@ -304,17 +288,17 @@ int hl_mmu_ctx_init(struct hl_ctx *ctx)</div><div class='ctx'> </div><div class='ctx'> 	/* need only pte 0 in hops 0 and 1 */</div><div class='ctx'> 	pte_val = (hop1_addr &amp; PTE_PHYS_ADDR_MASK) | PAGE_PRESENT_MASK;</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;write_pte(hdev, get_hop0_addr(ctx), pte_val);</div><div class='add'>+	write_pte(ctx, hop0_addr, pte_val);</div><div class='ctx'> </div><div class='ctx'> 	pte_val = (hop2_addr &amp; PTE_PHYS_ADDR_MASK) | PAGE_PRESENT_MASK;</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;write_pte(hdev, hop1_addr, pte_val);</div><div class='add'>+	write_pte(ctx, hop1_addr, pte_val);</div><div class='ctx'> 	get_pte(ctx, hop1_addr);</div><div class='ctx'> </div><div class='ctx'> 	hop2_pte_addr = hop2_addr;</div><div class='ctx'> 	for (i = 0 ; i &lt; num_of_hop3 ; i++) {</div><div class='ctx'> 		pte_val = (ctx-&gt;dram_default_hops[i] &amp; PTE_PHYS_ADDR_MASK) |</div><div class='ctx'> 				PAGE_PRESENT_MASK;</div><div class='del'>-		hdev-&gt;asic_funcs-&gt;write_pte(hdev, hop2_pte_addr, pte_val);</div><div class='add'>+		write_pte(ctx, hop2_pte_addr, pte_val);</div><div class='ctx'> 		get_pte(ctx, hop2_addr);</div><div class='ctx'> 		hop2_pte_addr += HL_PTE_SIZE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -325,33 +309,183 @@ int hl_mmu_ctx_init(struct hl_ctx *ctx)</div><div class='ctx'> 	for (i = 0 ; i &lt; num_of_hop3 ; i++) {</div><div class='ctx'> 		hop3_pte_addr = ctx-&gt;dram_default_hops[i];</div><div class='ctx'> 		for (j = 0 ; j &lt; PTE_ENTRIES_IN_HOP ; j++) {</div><div class='del'>-			hdev-&gt;asic_funcs-&gt;write_pte(hdev, hop3_pte_addr,</div><div class='del'>-					pte_val);</div><div class='add'>+			write_final_pte(ctx, hop3_pte_addr, pte_val);</div><div class='ctx'> 			get_pte(ctx, ctx-&gt;dram_default_hops[i]);</div><div class='ctx'> 			hop3_pte_addr += HL_PTE_SIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* flush all writes to reach PCI */</div><div class='del'>-	mb();</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop2_addr);</div><div class='add'>+	flush(ctx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> hop3_err:</div><div class='ctx'> 	for (i = 0 ; i &lt; hop3_allocated ; i++)</div><div class='ctx'> 		free_hop(ctx, ctx-&gt;dram_default_hops[i]);</div><div class='add'>+</div><div class='ctx'> 	free_hop(ctx, hop2_addr);</div><div class='ctx'> hop2_err:</div><div class='ctx'> 	free_hop(ctx, hop1_addr);</div><div class='ctx'> hop1_err:</div><div class='ctx'> 	kfree(ctx-&gt;dram_default_hops);</div><div class='del'>-alloc_err:</div><div class='del'>-	mutex_destroy(&amp;ctx-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dram_default_mapping_fini(struct hl_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u64 num_of_hop3, total_hops, hop0_addr, hop1_addr, hop2_addr,</div><div class='add'>+		hop2_pte_addr, hop3_pte_addr;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;dram_supports_virtual_memory ||</div><div class='add'>+			!hdev-&gt;dram_default_page_mapping)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_of_hop3 = prop-&gt;dram_size_for_default_page_mapping;</div><div class='add'>+	do_div(num_of_hop3, prop-&gt;dram_page_size);</div><div class='add'>+	do_div(num_of_hop3, PTE_ENTRIES_IN_HOP);</div><div class='add'>+</div><div class='add'>+	hop0_addr = get_hop0_addr(ctx);</div><div class='add'>+	/* add hop1 and hop2 */</div><div class='add'>+	total_hops = num_of_hop3 + 2;</div><div class='add'>+	hop1_addr = ctx-&gt;dram_default_hops[total_hops - 1];</div><div class='add'>+	hop2_addr = ctx-&gt;dram_default_hops[total_hops - 2];</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; num_of_hop3 ; i++) {</div><div class='add'>+		hop3_pte_addr = ctx-&gt;dram_default_hops[i];</div><div class='add'>+		for (j = 0 ; j &lt; PTE_ENTRIES_IN_HOP ; j++) {</div><div class='add'>+			clear_pte(ctx, hop3_pte_addr);</div><div class='add'>+			put_pte(ctx, ctx-&gt;dram_default_hops[i]);</div><div class='add'>+			hop3_pte_addr += HL_PTE_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hop2_pte_addr = hop2_addr;</div><div class='add'>+	hop2_pte_addr = hop2_addr;</div><div class='add'>+	for (i = 0 ; i &lt; num_of_hop3 ; i++) {</div><div class='add'>+		clear_pte(ctx, hop2_pte_addr);</div><div class='add'>+		put_pte(ctx, hop2_addr);</div><div class='add'>+		hop2_pte_addr += HL_PTE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_pte(ctx, hop1_addr);</div><div class='add'>+	put_pte(ctx, hop1_addr);</div><div class='add'>+	clear_pte(ctx, hop0_addr);</div><div class='add'>+</div><div class='add'>+	kfree(ctx-&gt;dram_default_hops);</div><div class='add'>+</div><div class='add'>+	flush(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_mmu_init() - initialize the MMU module.</div><div class='add'>+ * @hdev: habanalabs device structure.</div><div class='add'>+ *</div><div class='add'>+ * This function does the following:</div><div class='add'>+ * - Allocate max_asid zeroed hop0 pgts so no mapping is available.</div><div class='add'>+ * - Enable MMU in H/W.</div><div class='add'>+ * - Invalidate the MMU cache.</div><div class='add'>+ * - Create a pool of pages for pgt_infos.</div><div class='add'>+ *</div><div class='add'>+ * This function depends on DMA QMAN to be working!</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, non-zero for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_mmu_init(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;mmu_enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* MMU H/W init was already done in device hw_init() */</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;hdev-&gt;mmu_cache_lock);</div><div class='add'>+</div><div class='add'>+	hdev-&gt;mmu_pgt_pool =</div><div class='add'>+			gen_pool_create(__ffs(prop-&gt;mmu_hop_table_size), -1);</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;mmu_pgt_pool) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to create page gen pool\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_pool_create;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = gen_pool_add(hdev-&gt;mmu_pgt_pool, prop-&gt;mmu_pgt_addr +</div><div class='add'>+			prop-&gt;mmu_hop0_tables_total_size,</div><div class='add'>+			prop-&gt;mmu_pgt_size - prop-&gt;mmu_hop0_tables_total_size,</div><div class='add'>+			-1);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to add memory to page gen pool\n");</div><div class='add'>+		goto err_pool_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;mmu_shadow_hop0 = kvmalloc_array(prop-&gt;max_asid,</div><div class='add'>+					prop-&gt;mmu_hop_table_size,</div><div class='add'>+					GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+	if (!hdev-&gt;mmu_shadow_hop0) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_pool_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pool_add:</div><div class='add'>+	gen_pool_destroy(hdev-&gt;mmu_pgt_pool);</div><div class='add'>+err_pool_create:</div><div class='add'>+	mutex_destroy(&amp;hdev-&gt;mmu_cache_lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_mmu_fini() - release the MMU module.</div><div class='add'>+ * @hdev: habanalabs device structure.</div><div class='add'>+ *</div><div class='add'>+ * This function does the following:</div><div class='add'>+ * - Disable MMU in H/W.</div><div class='add'>+ * - Free the pgt_infos pool.</div><div class='add'>+ *</div><div class='add'>+ * All contexts should be freed before calling this function.</div><div class='add'>+ */</div><div class='add'>+void hl_mmu_fini(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	if (!hdev-&gt;mmu_enable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kvfree(hdev-&gt;mmu_shadow_hop0);</div><div class='add'>+	gen_pool_destroy(hdev-&gt;mmu_pgt_pool);</div><div class='add'>+	mutex_destroy(&amp;hdev-&gt;mmu_cache_lock);</div><div class='add'>+</div><div class='add'>+	/* MMU H/W fini will be done in device hw_fini() */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_mmu_ctx_init() - initialize a context for using the MMU module.</div><div class='add'>+ * @ctx: pointer to the context structure to initialize.</div><div class='add'>+ *</div><div class='add'>+ * Initialize a mutex to protect the concurrent mapping flow, a hash to hold all</div><div class='add'>+ * page tables hops related to this context.</div><div class='add'>+ * Return: 0 on success, non-zero otherwise.</div><div class='add'>+ */</div><div class='add'>+int hl_mmu_ctx_init(struct hl_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='add'>+</div><div class='add'>+	if (!hdev-&gt;mmu_enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ctx-&gt;mmu_lock);</div><div class='add'>+	hash_init(ctx-&gt;mmu_phys_hash);</div><div class='add'>+	hash_init(ctx-&gt;mmu_shadow_hash);</div><div class='add'>+</div><div class='add'>+	return dram_default_mapping_init(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * hl_mmu_ctx_fini - disable a ctx from using the mmu module</div><div class='ctx'>  *</div><div class='hunk'>@@ -365,63 +499,23 @@ alloc_err:</div><div class='ctx'> void hl_mmu_ctx_fini(struct hl_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='del'>-	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='ctx'> 	struct pgt_info *pgt_info;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='del'>-	u64 num_of_hop3, total_hops, hop1_addr, hop2_addr, hop2_pte_addr,</div><div class='del'>-		hop3_pte_addr;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!ctx-&gt;hdev-&gt;mmu_enable)</div><div class='add'>+	if (!hdev-&gt;mmu_enable)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;dram_supports_virtual_memory &amp;&amp;</div><div class='del'>-			hdev-&gt;dram_default_page_mapping) {</div><div class='del'>-</div><div class='del'>-		num_of_hop3 = prop-&gt;dram_size_for_default_page_mapping;</div><div class='del'>-		do_div(num_of_hop3, prop-&gt;dram_page_size);</div><div class='del'>-		do_div(num_of_hop3, PTE_ENTRIES_IN_HOP);</div><div class='del'>-</div><div class='del'>-		/* add hop1 and hop2 */</div><div class='del'>-		total_hops = num_of_hop3 + 2;</div><div class='del'>-		hop1_addr = ctx-&gt;dram_default_hops[total_hops - 1];</div><div class='del'>-		hop2_addr = ctx-&gt;dram_default_hops[total_hops - 2];</div><div class='del'>-</div><div class='del'>-		for (i = 0 ; i &lt; num_of_hop3 ; i++) {</div><div class='del'>-			hop3_pte_addr = ctx-&gt;dram_default_hops[i];</div><div class='del'>-			for (j = 0 ; j &lt; PTE_ENTRIES_IN_HOP ; j++) {</div><div class='del'>-				clear_pte(hdev, hop3_pte_addr);</div><div class='del'>-				put_pte(ctx, ctx-&gt;dram_default_hops[i]);</div><div class='del'>-				hop3_pte_addr += HL_PTE_SIZE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	dram_default_mapping_fini(ctx);</div><div class='ctx'> </div><div class='del'>-		hop2_pte_addr = hop2_addr;</div><div class='del'>-		for (i = 0 ; i &lt; num_of_hop3 ; i++) {</div><div class='del'>-			clear_pte(hdev, hop2_pte_addr);</div><div class='del'>-			put_pte(ctx, hop2_addr);</div><div class='del'>-			hop2_pte_addr += HL_PTE_SIZE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		clear_pte(hdev, hop1_addr);</div><div class='del'>-		put_pte(ctx, hop1_addr);</div><div class='del'>-		clear_pte(hdev, get_hop0_addr(ctx));</div><div class='del'>-</div><div class='del'>-		kfree(ctx-&gt;dram_default_hops);</div><div class='del'>-</div><div class='del'>-		/* flush all writes to reach PCI */</div><div class='del'>-		mb();</div><div class='del'>-		hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop2_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hash_empty(ctx-&gt;mmu_hash))</div><div class='add'>+	if (!hash_empty(ctx-&gt;mmu_shadow_hash))</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "ctx is freed while it has pgts in use\n");</div><div class='ctx'> </div><div class='del'>-	hash_for_each_safe(ctx-&gt;mmu_hash, i, tmp, pgt_info, node) {</div><div class='add'>+	hash_for_each_safe(ctx-&gt;mmu_shadow_hash, i, tmp, pgt_info, node) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='ctx'> 			"pgt_info of addr 0x%llx of asid %d was not destroyed, num_ptes: %d\n",</div><div class='del'>-			pgt_info-&gt;addr, ctx-&gt;asid, pgt_info-&gt;num_of_ptes);</div><div class='del'>-		free_hop(ctx, pgt_info-&gt;addr);</div><div class='add'>+			pgt_info-&gt;phys_addr, ctx-&gt;asid, pgt_info-&gt;num_of_ptes);</div><div class='add'>+		free_hop(ctx, pgt_info-&gt;shadow_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_destroy(&amp;ctx-&gt;mmu_lock);</div><div class='hunk'>@@ -437,45 +531,43 @@ static int _hl_mmu_unmap(struct hl_ctx *ctx, u64 virt_addr)</div><div class='ctx'> 		hop3_addr = 0, hop3_pte_addr = 0,</div><div class='ctx'> 		hop4_addr = 0, hop4_pte_addr = 0,</div><div class='ctx'> 		curr_pte;</div><div class='del'>-	int clear_hop3 = 1;</div><div class='del'>-	bool is_dram_addr, is_huge, is_dram_default_page_mapping;</div><div class='add'>+	bool is_dram_addr, is_huge, clear_hop3 = true;</div><div class='ctx'> </div><div class='ctx'> 	is_dram_addr = hl_mem_area_inside_range(virt_addr, PAGE_SIZE_2MB,</div><div class='ctx'> 				prop-&gt;va_space_dram_start_address,</div><div class='ctx'> 				prop-&gt;va_space_dram_end_address);</div><div class='ctx'> </div><div class='ctx'> 	hop0_addr = get_hop0_addr(ctx);</div><div class='del'>-</div><div class='ctx'> 	hop0_pte_addr = get_hop0_pte_addr(ctx, hop0_addr, virt_addr);</div><div class='ctx'> </div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop0_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop0_pte_addr;</div><div class='ctx'> </div><div class='del'>-	hop1_addr = get_next_hop_addr(curr_pte);</div><div class='add'>+	hop1_addr = get_next_hop_addr(ctx, curr_pte);</div><div class='ctx'> </div><div class='ctx'> 	if (hop1_addr == ULLONG_MAX)</div><div class='ctx'> 		goto not_mapped;</div><div class='ctx'> </div><div class='ctx'> 	hop1_pte_addr = get_hop1_pte_addr(ctx, hop1_addr, virt_addr);</div><div class='ctx'> </div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop1_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop1_pte_addr;</div><div class='ctx'> </div><div class='del'>-	hop2_addr = get_next_hop_addr(curr_pte);</div><div class='add'>+	hop2_addr = get_next_hop_addr(ctx, curr_pte);</div><div class='ctx'> </div><div class='ctx'> 	if (hop2_addr == ULLONG_MAX)</div><div class='ctx'> 		goto not_mapped;</div><div class='ctx'> </div><div class='ctx'> 	hop2_pte_addr = get_hop2_pte_addr(ctx, hop2_addr, virt_addr);</div><div class='ctx'> </div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop2_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop2_pte_addr;</div><div class='ctx'> </div><div class='del'>-	hop3_addr = get_next_hop_addr(curr_pte);</div><div class='add'>+	hop3_addr = get_next_hop_addr(ctx, curr_pte);</div><div class='ctx'> </div><div class='ctx'> 	if (hop3_addr == ULLONG_MAX)</div><div class='ctx'> 		goto not_mapped;</div><div class='ctx'> </div><div class='ctx'> 	hop3_pte_addr = get_hop3_pte_addr(ctx, hop3_addr, virt_addr);</div><div class='ctx'> </div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop3_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop3_pte_addr;</div><div class='ctx'> </div><div class='ctx'> 	is_huge = curr_pte &amp; LAST_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -485,27 +577,24 @@ static int _hl_mmu_unmap(struct hl_ctx *ctx, u64 virt_addr)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	is_dram_default_page_mapping =</div><div class='del'>-			hdev-&gt;dram_default_page_mapping &amp;&amp; is_dram_addr;</div><div class='del'>-</div><div class='ctx'> 	if (!is_huge) {</div><div class='del'>-		hop4_addr = get_next_hop_addr(curr_pte);</div><div class='add'>+		hop4_addr = get_next_hop_addr(ctx, curr_pte);</div><div class='ctx'> </div><div class='ctx'> 		if (hop4_addr == ULLONG_MAX)</div><div class='ctx'> 			goto not_mapped;</div><div class='ctx'> </div><div class='ctx'> 		hop4_pte_addr = get_hop4_pte_addr(ctx, hop4_addr, virt_addr);</div><div class='ctx'> </div><div class='del'>-		curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop4_pte_addr);</div><div class='add'>+		curr_pte = *(u64 *) (uintptr_t) hop4_pte_addr;</div><div class='ctx'> </div><div class='del'>-		clear_hop3 = 0;</div><div class='add'>+		clear_hop3 = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_dram_default_page_mapping) {</div><div class='del'>-		u64 zero_pte = (prop-&gt;mmu_dram_default_page_addr &amp;</div><div class='add'>+	if (hdev-&gt;dram_default_page_mapping &amp;&amp; is_dram_addr) {</div><div class='add'>+		u64 default_pte = (prop-&gt;mmu_dram_default_page_addr &amp;</div><div class='ctx'> 				PTE_PHYS_ADDR_MASK) | LAST_MASK |</div><div class='ctx'> 					PAGE_PRESENT_MASK;</div><div class='del'>-		if (curr_pte == zero_pte) {</div><div class='add'>+		if (curr_pte == default_pte) {</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='ctx'> 				"DRAM: hop3 PTE points to zero page, can't unmap, va: 0x%llx\n",</div><div class='ctx'> 					virt_addr);</div><div class='hunk'>@@ -519,40 +608,43 @@ static int _hl_mmu_unmap(struct hl_ctx *ctx, u64 virt_addr)</div><div class='ctx'> 			goto not_mapped;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hdev-&gt;asic_funcs-&gt;write_pte(hdev, hop3_pte_addr, zero_pte);</div><div class='add'>+		write_final_pte(ctx, hop3_pte_addr, default_pte);</div><div class='ctx'> 		put_pte(ctx, hop3_addr);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(curr_pte &amp; PAGE_PRESENT_MASK))</div><div class='ctx'> 			goto not_mapped;</div><div class='ctx'> </div><div class='del'>-		clear_pte(hdev, hop4_addr ? hop4_pte_addr : hop3_pte_addr);</div><div class='add'>+		if (hop4_addr)</div><div class='add'>+			clear_pte(ctx, hop4_pte_addr);</div><div class='add'>+		else</div><div class='add'>+			clear_pte(ctx, hop3_pte_addr);</div><div class='ctx'> </div><div class='ctx'> 		if (hop4_addr &amp;&amp; !put_pte(ctx, hop4_addr))</div><div class='del'>-			clear_hop3 = 1;</div><div class='add'>+			clear_hop3 = true;</div><div class='ctx'> </div><div class='ctx'> 		if (!clear_hop3)</div><div class='ctx'> 			goto flush;</div><div class='del'>-		clear_pte(hdev, hop3_pte_addr);</div><div class='add'>+</div><div class='add'>+		clear_pte(ctx, hop3_pte_addr);</div><div class='ctx'> </div><div class='ctx'> 		if (put_pte(ctx, hop3_addr))</div><div class='ctx'> 			goto flush;</div><div class='del'>-		clear_pte(hdev, hop2_pte_addr);</div><div class='add'>+</div><div class='add'>+		clear_pte(ctx, hop2_pte_addr);</div><div class='ctx'> </div><div class='ctx'> 		if (put_pte(ctx, hop2_addr))</div><div class='ctx'> 			goto flush;</div><div class='del'>-		clear_pte(hdev, hop1_pte_addr);</div><div class='add'>+</div><div class='add'>+		clear_pte(ctx, hop1_pte_addr);</div><div class='ctx'> </div><div class='ctx'> 		if (put_pte(ctx, hop1_addr))</div><div class='ctx'> 			goto flush;</div><div class='del'>-		clear_pte(hdev, hop0_pte_addr);</div><div class='add'>+</div><div class='add'>+		clear_pte(ctx, hop0_pte_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> flush:</div><div class='del'>-	/* flush all writes from all cores to reach PCI */</div><div class='del'>-	mb();</div><div class='del'>-</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;read_pte(hdev,</div><div class='del'>-				hop4_addr ? hop4_pte_addr : hop3_pte_addr);</div><div class='add'>+	flush(ctx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -632,8 +724,7 @@ static int _hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,</div><div class='ctx'> 		hop4_addr = 0, hop4_pte_addr = 0,</div><div class='ctx'> 		curr_pte = 0;</div><div class='ctx'> 	bool hop1_new = false, hop2_new = false, hop3_new = false,</div><div class='del'>-		hop4_new = false, is_huge, is_dram_addr,</div><div class='del'>-		is_dram_default_page_mapping;</div><div class='add'>+		hop4_new = false, is_huge, is_dram_addr;</div><div class='ctx'> 	int rc = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -654,59 +745,46 @@ static int _hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	is_dram_default_page_mapping =</div><div class='del'>-			hdev-&gt;dram_default_page_mapping &amp;&amp; is_dram_addr;</div><div class='del'>-</div><div class='ctx'> 	hop0_addr = get_hop0_addr(ctx);</div><div class='del'>-</div><div class='ctx'> 	hop0_pte_addr = get_hop0_pte_addr(ctx, hop0_addr, virt_addr);</div><div class='del'>-</div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop0_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop0_pte_addr;</div><div class='ctx'> </div><div class='ctx'> 	hop1_addr = get_alloc_next_hop_addr(ctx, curr_pte, &amp;hop1_new);</div><div class='del'>-</div><div class='ctx'> 	if (hop1_addr == ULLONG_MAX)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	hop1_pte_addr = get_hop1_pte_addr(ctx, hop1_addr, virt_addr);</div><div class='del'>-</div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop1_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop1_pte_addr;</div><div class='ctx'> </div><div class='ctx'> 	hop2_addr = get_alloc_next_hop_addr(ctx, curr_pte, &amp;hop2_new);</div><div class='del'>-</div><div class='ctx'> 	if (hop2_addr == ULLONG_MAX)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	hop2_pte_addr = get_hop2_pte_addr(ctx, hop2_addr, virt_addr);</div><div class='del'>-</div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop2_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop2_pte_addr;</div><div class='ctx'> </div><div class='ctx'> 	hop3_addr = get_alloc_next_hop_addr(ctx, curr_pte, &amp;hop3_new);</div><div class='del'>-</div><div class='ctx'> 	if (hop3_addr == ULLONG_MAX)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	hop3_pte_addr = get_hop3_pte_addr(ctx, hop3_addr, virt_addr);</div><div class='del'>-</div><div class='del'>-	curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop3_pte_addr);</div><div class='add'>+	curr_pte = *(u64 *) (uintptr_t) hop3_pte_addr;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_huge) {</div><div class='ctx'> 		hop4_addr = get_alloc_next_hop_addr(ctx, curr_pte, &amp;hop4_new);</div><div class='del'>-</div><div class='ctx'> 		if (hop4_addr == ULLONG_MAX)</div><div class='ctx'> 			goto err;</div><div class='ctx'> </div><div class='ctx'> 		hop4_pte_addr = get_hop4_pte_addr(ctx, hop4_addr, virt_addr);</div><div class='del'>-</div><div class='del'>-		curr_pte = hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop4_pte_addr);</div><div class='add'>+		curr_pte = *(u64 *) (uintptr_t) hop4_pte_addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_dram_default_page_mapping) {</div><div class='del'>-		u64 zero_pte = (prop-&gt;mmu_dram_default_page_addr &amp;</div><div class='add'>+	if (hdev-&gt;dram_default_page_mapping &amp;&amp; is_dram_addr) {</div><div class='add'>+		u64 default_pte = (prop-&gt;mmu_dram_default_page_addr &amp;</div><div class='ctx'> 					PTE_PHYS_ADDR_MASK) | LAST_MASK |</div><div class='ctx'> 						PAGE_PRESENT_MASK;</div><div class='ctx'> </div><div class='del'>-		if (curr_pte != zero_pte) {</div><div class='add'>+		if (curr_pte != default_pte) {</div><div class='ctx'> 			dev_err(hdev-&gt;dev,</div><div class='ctx'> 				"DRAM: mapping already exists for virt_addr 0x%llx\n",</div><div class='ctx'> 					virt_addr);</div><div class='hunk'>@@ -722,27 +800,22 @@ static int _hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (curr_pte &amp; PAGE_PRESENT_MASK) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev,</div><div class='del'>-				"mapping already exists for virt_addr 0x%llx\n",</div><div class='del'>-					virt_addr);</div><div class='add'>+			"mapping already exists for virt_addr 0x%llx\n",</div><div class='add'>+				virt_addr);</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(hdev-&gt;dev, "hop0 pte: 0x%llx (0x%llx)\n",</div><div class='del'>-				hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop0_pte_addr),</div><div class='del'>-				hop0_pte_addr);</div><div class='add'>+			*(u64 *) (uintptr_t) hop0_pte_addr, hop0_pte_addr);</div><div class='ctx'> 		dev_dbg(hdev-&gt;dev, "hop1 pte: 0x%llx (0x%llx)\n",</div><div class='del'>-				hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop1_pte_addr),</div><div class='del'>-				hop1_pte_addr);</div><div class='add'>+			*(u64 *) (uintptr_t) hop1_pte_addr, hop1_pte_addr);</div><div class='ctx'> 		dev_dbg(hdev-&gt;dev, "hop2 pte: 0x%llx (0x%llx)\n",</div><div class='del'>-				hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop2_pte_addr),</div><div class='del'>-				hop2_pte_addr);</div><div class='add'>+			*(u64 *) (uintptr_t) hop2_pte_addr, hop2_pte_addr);</div><div class='ctx'> 		dev_dbg(hdev-&gt;dev, "hop3 pte: 0x%llx (0x%llx)\n",</div><div class='del'>-				hdev-&gt;asic_funcs-&gt;read_pte(hdev, hop3_pte_addr),</div><div class='del'>-				hop3_pte_addr);</div><div class='add'>+			*(u64 *) (uintptr_t) hop3_pte_addr, hop3_pte_addr);</div><div class='ctx'> </div><div class='ctx'> 		if (!is_huge)</div><div class='ctx'> 			dev_dbg(hdev-&gt;dev, "hop4 pte: 0x%llx (0x%llx)\n",</div><div class='del'>-				hdev-&gt;asic_funcs-&gt;read_pte(hdev,</div><div class='del'>-							hop4_pte_addr),</div><div class='del'>-							hop4_pte_addr);</div><div class='add'>+				*(u64 *) (uintptr_t) hop4_pte_addr,</div><div class='add'>+				hop4_pte_addr);</div><div class='ctx'> </div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -751,28 +824,26 @@ static int _hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,</div><div class='ctx'> 	curr_pte = (phys_addr &amp; PTE_PHYS_ADDR_MASK) | LAST_MASK</div><div class='ctx'> 			| PAGE_PRESENT_MASK;</div><div class='ctx'> </div><div class='del'>-	hdev-&gt;asic_funcs-&gt;write_pte(hdev,</div><div class='del'>-				is_huge ? hop3_pte_addr : hop4_pte_addr,</div><div class='del'>-				curr_pte);</div><div class='add'>+	if (is_huge)</div><div class='add'>+		write_final_pte(ctx, hop3_pte_addr, curr_pte);</div><div class='add'>+	else</div><div class='add'>+		write_final_pte(ctx, hop4_pte_addr, curr_pte);</div><div class='ctx'> </div><div class='ctx'> 	if (hop1_new) {</div><div class='del'>-		curr_pte = (hop1_addr &amp; PTE_PHYS_ADDR_MASK) |</div><div class='del'>-				PAGE_PRESENT_MASK;</div><div class='del'>-		ctx-&gt;hdev-&gt;asic_funcs-&gt;write_pte(ctx-&gt;hdev, hop0_pte_addr,</div><div class='del'>-				curr_pte);</div><div class='add'>+		curr_pte =</div><div class='add'>+			(hop1_addr &amp; PTE_PHYS_ADDR_MASK) | PAGE_PRESENT_MASK;</div><div class='add'>+		write_pte(ctx, hop0_pte_addr, curr_pte);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hop2_new) {</div><div class='del'>-		curr_pte = (hop2_addr &amp; PTE_PHYS_ADDR_MASK) |</div><div class='del'>-				PAGE_PRESENT_MASK;</div><div class='del'>-		ctx-&gt;hdev-&gt;asic_funcs-&gt;write_pte(ctx-&gt;hdev, hop1_pte_addr,</div><div class='del'>-				curr_pte);</div><div class='add'>+		curr_pte =</div><div class='add'>+			(hop2_addr &amp; PTE_PHYS_ADDR_MASK) | PAGE_PRESENT_MASK;</div><div class='add'>+		write_pte(ctx, hop1_pte_addr, curr_pte);</div><div class='ctx'> 		get_pte(ctx, hop1_addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hop3_new) {</div><div class='del'>-		curr_pte = (hop3_addr &amp; PTE_PHYS_ADDR_MASK) |</div><div class='del'>-				PAGE_PRESENT_MASK;</div><div class='del'>-		ctx-&gt;hdev-&gt;asic_funcs-&gt;write_pte(ctx-&gt;hdev, hop2_pte_addr,</div><div class='del'>-				curr_pte);</div><div class='add'>+		curr_pte =</div><div class='add'>+			(hop3_addr &amp; PTE_PHYS_ADDR_MASK) | PAGE_PRESENT_MASK;</div><div class='add'>+		write_pte(ctx, hop2_pte_addr, curr_pte);</div><div class='ctx'> 		get_pte(ctx, hop2_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -780,8 +851,7 @@ static int _hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,</div><div class='ctx'> 		if (hop4_new) {</div><div class='ctx'> 			curr_pte = (hop4_addr &amp; PTE_PHYS_ADDR_MASK) |</div><div class='ctx'> 					PAGE_PRESENT_MASK;</div><div class='del'>-			ctx-&gt;hdev-&gt;asic_funcs-&gt;write_pte(ctx-&gt;hdev,</div><div class='del'>-					hop3_pte_addr, curr_pte);</div><div class='add'>+			write_pte(ctx, hop3_pte_addr, curr_pte);</div><div class='ctx'> 			get_pte(ctx, hop3_addr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -790,11 +860,7 @@ static int _hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr,</div><div class='ctx'> 		get_pte(ctx, hop3_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* flush all writes from all cores to reach PCI */</div><div class='del'>-	mb();</div><div class='del'>-</div><div class='del'>-	hdev-&gt;asic_funcs-&gt;read_pte(hdev,</div><div class='del'>-				is_huge ? hop3_pte_addr : hop4_pte_addr);</div><div class='add'>+	flush(ctx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +898,7 @@ err:</div><div class='ctx'> int hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr, u32 page_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_device *hdev = ctx-&gt;hdev;</div><div class='del'>-	u64 real_virt_addr;</div><div class='add'>+	u64 real_virt_addr, real_phys_addr;</div><div class='ctx'> 	u32 real_page_size, npages;</div><div class='ctx'> 	int i, rc, mapped_cnt = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -857,14 +923,16 @@ int hl_mmu_map(struct hl_ctx *ctx, u64 virt_addr, u64 phys_addr, u32 page_size)</div><div class='ctx'> </div><div class='ctx'> 	npages = page_size / real_page_size;</div><div class='ctx'> 	real_virt_addr = virt_addr;</div><div class='add'>+	real_phys_addr = phys_addr;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; npages ; i++) {</div><div class='del'>-		rc = _hl_mmu_map(ctx, real_virt_addr, phys_addr,</div><div class='add'>+		rc = _hl_mmu_map(ctx, real_virt_addr, real_phys_addr,</div><div class='ctx'> 				real_page_size);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='ctx'> </div><div class='ctx'> 		real_virt_addr += real_page_size;</div><div class='add'>+		real_phys_addr += real_page_size;</div><div class='ctx'> 		mapped_cnt++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/habanalabs/pci.c b/drivers/misc/habanalabs/pci.c<br/>new file mode 100644<br/>index 000000000000..0e78a04d63f4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/habanalabs/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/habanalabs/pci.c</a></div><div class='hunk'>@@ -0,0 +1,408 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016-2019 HabanaLabs, Ltd.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "habanalabs.h"</div><div class='add'>+#include "include/hw_ip/pci/pci_general.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_pci_bars_map() - Map PCI BARs.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ * @bar_name: Array of BAR names.</div><div class='add'>+ * @is_wc: Array with flag per BAR whether a write-combined mapping is needed.</div><div class='add'>+ *</div><div class='add'>+ * Request PCI regions and map them to kernel virtual addresses.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, non-zero for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_pci_bars_map(struct hl_device *hdev, const char * const name[3],</div><div class='add'>+			bool is_wc[3])</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	int rc, i, bar;</div><div class='add'>+</div><div class='add'>+	rc = pci_request_regions(pdev, HL_NAME);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Cannot obtain PCI resources\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; 3 ; i++) {</div><div class='add'>+		bar = i * 2; /* 64-bit BARs */</div><div class='add'>+		hdev-&gt;pcie_bar[bar] = is_wc[i] ?</div><div class='add'>+				pci_ioremap_wc_bar(pdev, bar) :</div><div class='add'>+				pci_ioremap_bar(pdev, bar);</div><div class='add'>+		if (!hdev-&gt;pcie_bar[bar]) {</div><div class='add'>+			dev_err(hdev-&gt;dev, "pci_ioremap%s_bar failed for %s\n",</div><div class='add'>+					is_wc[i] ? "_wc" : "", name[i]);</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+			goto 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'>+err:</div><div class='add'>+	for (i = 2 ; i &gt;= 0 ; i--) {</div><div class='add'>+		bar = i * 2; /* 64-bit BARs */</div><div class='add'>+		if (hdev-&gt;pcie_bar[bar])</div><div class='add'>+			iounmap(hdev-&gt;pcie_bar[bar]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * hl_pci_bars_unmap() - Unmap PCI BARS.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ *</div><div class='add'>+ * Release all PCI BARs and unmap their virtual addresses.</div><div class='add'>+ */</div><div class='add'>+static void hl_pci_bars_unmap(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	int i, bar;</div><div class='add'>+</div><div class='add'>+	for (i = 2 ; i &gt;= 0 ; i--) {</div><div class='add'>+		bar = i * 2; /* 64-bit BARs */</div><div class='add'>+		iounmap(hdev-&gt;pcie_bar[bar]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * hl_pci_elbi_write() - Write through the ELBI interface.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative value for failure.</div><div class='add'>+ */</div><div class='add'>+static int hl_pci_elbi_write(struct hl_device *hdev, u64 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	ktime_t timeout;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Clear previous status */</div><div class='add'>+	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_STS, 0);</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_ADDR, (u32) addr);</div><div class='add'>+	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_DATA, data);</div><div class='add'>+	pci_write_config_dword(pdev, mmPCI_CONFIG_ELBI_CTRL,</div><div class='add'>+				PCI_CONFIG_ELBI_CTRL_WRITE);</div><div class='add'>+</div><div class='add'>+	timeout = ktime_add_ms(ktime_get(), 10);</div><div class='add'>+	for (;;) {</div><div class='add'>+		pci_read_config_dword(pdev, mmPCI_CONFIG_ELBI_STS, &amp;val);</div><div class='add'>+		if (val &amp; PCI_CONFIG_ELBI_STS_MASK)</div><div class='add'>+			break;</div><div class='add'>+		if (ktime_compare(ktime_get(), timeout) &gt; 0) {</div><div class='add'>+			pci_read_config_dword(pdev, mmPCI_CONFIG_ELBI_STS,</div><div class='add'>+						&amp;val);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		usleep_range(300, 500);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((val &amp; PCI_CONFIG_ELBI_STS_MASK) == PCI_CONFIG_ELBI_STS_DONE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (val &amp; PCI_CONFIG_ELBI_STS_ERR) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Error writing to ELBI\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; PCI_CONFIG_ELBI_STS_MASK)) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "ELBI write didn't finish in time\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(hdev-&gt;dev, "ELBI write has undefined bits in status\n");</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_pci_iatu_write() - iatu write routine.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative value for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_pci_iatu_write(struct hl_device *hdev, u32 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u32 dbi_offset;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dbi_offset = addr &amp; 0xFFF;</div><div class='add'>+</div><div class='add'>+	rc = hl_pci_elbi_write(hdev, prop-&gt;pcie_aux_dbi_reg_addr, 0x00300000);</div><div class='add'>+	rc |= hl_pci_elbi_write(hdev, prop-&gt;pcie_dbi_base_address + dbi_offset,</div><div class='add'>+				data);</div><div class='add'>+</div><div class='add'>+	if (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'>+/*</div><div class='add'>+ * hl_pci_reset_link_through_bridge() - Reset PCI link.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ */</div><div class='add'>+static void hl_pci_reset_link_through_bridge(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	struct pci_dev *parent_port;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	parent_port = pdev-&gt;bus-&gt;self;</div><div class='add'>+	pci_read_config_word(parent_port, PCI_BRIDGE_CONTROL, &amp;val);</div><div class='add'>+	val |= PCI_BRIDGE_CTL_BUS_RESET;</div><div class='add'>+	pci_write_config_word(parent_port, PCI_BRIDGE_CONTROL, val);</div><div class='add'>+	ssleep(1);</div><div class='add'>+</div><div class='add'>+	val &amp;= ~(PCI_BRIDGE_CTL_BUS_RESET);</div><div class='add'>+	pci_write_config_word(parent_port, PCI_BRIDGE_CONTROL, val);</div><div class='add'>+	ssleep(3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_pci_set_dram_bar_base() - Set DDR BAR to map specific device address.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ * @inbound_region: Inbound region number.</div><div class='add'>+ * @bar: PCI BAR number.</div><div class='add'>+ * @addr: Address in DRAM. Must be aligned to DRAM bar size.</div><div class='add'>+ *</div><div class='add'>+ * Configure the iATU so that the DRAM bar will start at the specified address.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative value for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_pci_set_dram_bar_base(struct hl_device *hdev, u8 inbound_region, u8 bar,</div><div class='add'>+				u64 addr)</div><div class='add'>+{</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u32 offset;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	switch (inbound_region) {</div><div class='add'>+	case 0:</div><div class='add'>+		offset = 0x100;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		offset = 0x300;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		offset = 0x500;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(hdev-&gt;dev, "Invalid inbound region %d\n",</div><div class='add'>+			inbound_region);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bar != 0 &amp;&amp; bar != 2 &amp;&amp; bar != 4) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Invalid PCI BAR %d\n", bar);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Point to the specified address */</div><div class='add'>+	rc = hl_pci_iatu_write(hdev, offset + 0x14, lower_32_bits(addr));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, offset + 0x18, upper_32_bits(addr));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, offset + 0x0, 0);</div><div class='add'>+	/* Enable + BAR match + match enable + BAR number */</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, offset + 0x4, 0xC0080000 | (bar &lt;&lt; 8));</div><div class='add'>+</div><div class='add'>+	/* Return the DBI window to the default location */</div><div class='add'>+	rc |= hl_pci_elbi_write(hdev, prop-&gt;pcie_aux_dbi_reg_addr, 0);</div><div class='add'>+	rc |= hl_pci_elbi_write(hdev, prop-&gt;pcie_aux_dbi_reg_addr + 4, 0);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(hdev-&gt;dev, "failed to map DRAM bar to 0x%08llx\n",</div><div class='add'>+			addr);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_pci_init_iatu() - Initialize the iATU unit inside the PCI controller.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ * @sram_base_address: SRAM base address.</div><div class='add'>+ * @dram_base_address: DRAM base address.</div><div class='add'>+ * @host_phys_base_address: Base physical address of host memory for device</div><div class='add'>+ *                          transactions.</div><div class='add'>+ * @host_phys_size: Size of host memory for device transactions.</div><div class='add'>+ *</div><div class='add'>+ * This is needed in case the firmware doesn't initialize the iATU.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative value for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_pci_init_iatu(struct hl_device *hdev, u64 sram_base_address,</div><div class='add'>+			u64 dram_base_address, u64 host_phys_base_address,</div><div class='add'>+			u64 host_phys_size)</div><div class='add'>+{</div><div class='add'>+	struct asic_fixed_properties *prop = &amp;hdev-&gt;asic_prop;</div><div class='add'>+	u64 host_phys_end_addr;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* Inbound Region 0 - Bar 0 - Point to SRAM base address */</div><div class='add'>+	rc  = hl_pci_iatu_write(hdev, 0x114, lower_32_bits(sram_base_address));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x118, upper_32_bits(sram_base_address));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x100, 0);</div><div class='add'>+	/* Enable + Bar match + match enable */</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x104, 0xC0080000);</div><div class='add'>+</div><div class='add'>+	/* Point to DRAM */</div><div class='add'>+	if (!hdev-&gt;asic_funcs-&gt;set_dram_bar_base)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (hdev-&gt;asic_funcs-&gt;set_dram_bar_base(hdev, dram_base_address) ==</div><div class='add'>+								U64_MAX)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Outbound Region 0 - Point to Host */</div><div class='add'>+	host_phys_end_addr = host_phys_base_address + host_phys_size - 1;</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x008,</div><div class='add'>+				lower_32_bits(host_phys_base_address));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x00C,</div><div class='add'>+				upper_32_bits(host_phys_base_address));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x010, lower_32_bits(host_phys_end_addr));</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x014, 0);</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x018, 0);</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x020, upper_32_bits(host_phys_end_addr));</div><div class='add'>+	/* Increase region size */</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x000, 0x00002000);</div><div class='add'>+	/* Enable */</div><div class='add'>+	rc |= hl_pci_iatu_write(hdev, 0x004, 0x80000000);</div><div class='add'>+</div><div class='add'>+	/* Return the DBI window to the default location */</div><div class='add'>+	rc |= hl_pci_elbi_write(hdev, prop-&gt;pcie_aux_dbi_reg_addr, 0);</div><div class='add'>+	rc |= hl_pci_elbi_write(hdev, prop-&gt;pcie_aux_dbi_reg_addr + 4, 0);</div><div class='add'>+</div><div class='add'>+	if (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'>+/**</div><div class='add'>+ * hl_pci_set_dma_mask() - Set DMA masks for the device.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ * @dma_mask: number of bits for the requested dma mask.</div><div class='add'>+ *</div><div class='add'>+ * This function sets the DMA masks (regular and consistent) for a specified</div><div class='add'>+ * value. If it doesn't succeed, it tries to set it to a fall-back value</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, non-zero for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_pci_set_dma_mask(struct hl_device *hdev, u8 dma_mask)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* set DMA mask */</div><div class='add'>+	rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(dma_mask));</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_warn(hdev-&gt;dev,</div><div class='add'>+			"Failed to set pci dma mask to %d bits, error %d\n",</div><div class='add'>+			dma_mask, rc);</div><div class='add'>+</div><div class='add'>+		dma_mask = hdev-&gt;dma_mask;</div><div class='add'>+</div><div class='add'>+		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(dma_mask));</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(hdev-&gt;dev,</div><div class='add'>+				"Failed to set pci dma mask to %d bits, error %d\n",</div><div class='add'>+				dma_mask, rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We managed to set the dma mask, so update the dma mask field. If</div><div class='add'>+	 * the set to the coherent mask will fail with that mask, we will</div><div class='add'>+	 * fail the entire function</div><div class='add'>+	 */</div><div class='add'>+	hdev-&gt;dma_mask = dma_mask;</div><div class='add'>+</div><div class='add'>+	rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(dma_mask));</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev,</div><div class='add'>+			"Failed to set pci consistent dma mask to %d bits, error %d\n",</div><div class='add'>+			dma_mask, 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'>+/**</div><div class='add'>+ * hl_pci_init() - PCI initialization code.</div><div class='add'>+ * @hdev: Pointer to hl_device structure.</div><div class='add'>+ * @dma_mask: number of bits for the requested dma mask.</div><div class='add'>+ *</div><div class='add'>+ * Set DMA masks, initialize the PCI controller and map the PCI BARs.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, non-zero for failure.</div><div class='add'>+ */</div><div class='add'>+int hl_pci_init(struct hl_device *hdev, u8 dma_mask)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hl_pci_set_dma_mask(hdev, dma_mask);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;reset_pcilink)</div><div class='add'>+		hl_pci_reset_link_through_bridge(hdev);</div><div class='add'>+</div><div class='add'>+	rc = pci_enable_device_mem(pdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "can't enable PCI device\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;init_iatu(hdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to initialize iATU\n");</div><div class='add'>+		goto disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hdev-&gt;asic_funcs-&gt;pci_bars_map(hdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(hdev-&gt;dev, "Failed to initialize PCI BARs\n");</div><div class='add'>+		goto disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+disable_device:</div><div class='add'>+	pci_clear_master(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hl_fw_fini() - PCI finalization code.</div><div class='add'>+ * @hdev: Pointer to hl_device structure</div><div class='add'>+ *</div><div class='add'>+ * Unmap PCI bars and disable PCI device.</div><div class='add'>+ */</div><div class='add'>+void hl_pci_fini(struct hl_device *hdev)</div><div class='add'>+{</div><div class='add'>+	hl_pci_bars_unmap(hdev);</div><div class='add'>+</div><div class='add'>+	pci_clear_master(hdev-&gt;pdev);</div><div class='add'>+	pci_disable_device(hdev-&gt;pdev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c<br/>index ec0832278170..9d0445a567db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/ioc4.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/ioc4.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/ioc4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/ioc4.c</a></div><div class='hunk'>@@ -156,7 +156,6 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)</div><div class='ctx'> </div><div class='ctx'> 	/* Reset to power-on state */</div><div class='ctx'> 	writel(0, &amp;idd-&gt;idd_misc_regs-&gt;int_out.raw);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	/* Set up square wave */</div><div class='ctx'> 	int_out.raw = 0;</div><div class='hunk'>@@ -164,7 +163,6 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)</div><div class='ctx'> 	int_out.fields.mode = IOC4_INT_OUT_MODE_TOGGLE;</div><div class='ctx'> 	int_out.fields.diag = 0;</div><div class='ctx'> 	writel(int_out.raw, &amp;idd-&gt;idd_misc_regs-&gt;int_out.raw);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	/* Check square wave period averaged over some number of cycles */</div><div class='ctx'> 	start = ktime_get_ns();</div><div class='head'>diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c<br/>index de20bdaa148d..8b01257783dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/kgdbts.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/kgdbts.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/kgdbts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/kgdbts.c</a></div><div class='hunk'>@@ -1135,7 +1135,7 @@ static void kgdbts_put_char(u8 chr)</div><div class='ctx'> static int param_set_kgdbts_var(const char *kmessage,</div><div class='ctx'> 				const struct kernel_param *kp)</div><div class='ctx'> {</div><div class='del'>-	int len = strlen(kmessage);</div><div class='add'>+	size_t len = strlen(kmessage);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= MAX_CONFIG_LEN) {</div><div class='ctx'> 		printk(KERN_ERR "kgdbts: config string too long\n");</div><div class='hunk'>@@ -1155,7 +1155,7 @@ static int param_set_kgdbts_var(const char *kmessage,</div><div class='ctx'> </div><div class='ctx'> 	strcpy(config, kmessage);</div><div class='ctx'> 	/* Chop out \n char as a result of echo */</div><div class='del'>-	if (config[len - 1] == '\n')</div><div class='add'>+	if (len &amp;&amp; config[len - 1] == '\n')</div><div class='ctx'> 		config[len - 1] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	/* Go and configure with the new params. */</div><div class='head'>diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig<br/>index 74e2c667dce0..9d7b3719bfa0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# Copyright (c) 2003-2019, Intel Corporation. All rights reserved.</div><div class='ctx'> config INTEL_MEI</div><div class='ctx'> 	tristate "Intel Management Engine Interface"</div><div class='ctx'> 	depends on X86 &amp;&amp; PCI</div><div class='hunk'>@@ -44,12 +46,4 @@ config INTEL_MEI_TXE</div><div class='ctx'> 	  Supported SoCs:</div><div class='ctx'> 	  Intel Bay Trail</div><div class='ctx'> </div><div class='del'>-config INTEL_MEI_HDCP</div><div class='del'>-	tristate "Intel HDCP2.2 services of ME Interface"</div><div class='del'>-	select INTEL_MEI_ME</div><div class='del'>-	depends on DRM_I915</div><div class='del'>-	help</div><div class='del'>-	  MEI Support for HDCP2.2 Services on Intel platforms.</div><div class='del'>-</div><div class='del'>-	  Enables the ME FW services required for HDCP2.2 support through</div><div class='del'>-	  I915 display driver of Intel.</div><div class='add'>+source "drivers/misc/mei/hdcp/Kconfig"</div><div class='head'>diff --git a/drivers/misc/mei/Makefile b/drivers/misc/mei/Makefile<br/>index 8c2d9565a4cb..f1c76f7ee804 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='add'>+# Copyright (c) 2010-2019, Intel Corporation. All rights reserved.</div><div class='ctx'> # Makefile - Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>-# Copyright (c) 2010-2014, Intel Corporation.</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_INTEL_MEI) += mei.o</div><div class='ctx'> mei-objs := init.o</div><div class='head'>diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c<br/>index 5fcac02233af..32e9b1aed2ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/bus-fixup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/bus-fixup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/bus-fixup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/bus-fixup.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2013-2019, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2018, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c<br/>index 65bec998eb6e..985bd4fd3328 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/bus.c</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2012-2019, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2012-2013, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c<br/>index ca4c9cc218a2..1e3edbbacb1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/client.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/client.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/client.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2019, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='hunk'>@@ -679,7 +669,7 @@ int mei_cl_unlink(struct mei_cl *cl)</div><div class='ctx'> </div><div class='ctx'> void mei_host_client_init(struct mei_device *dev)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_ENABLED;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_ENABLED);</div><div class='ctx'> 	dev-&gt;reset_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	schedule_work(&amp;dev-&gt;bus_rescan_work);</div><div class='head'>diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h<br/>index 64e318f589b4..c1f9e810cf81 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/client.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/client.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/client.h</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MEI_CLIENT_H_</div><div class='head'>diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c<br/>index 7b5df8fd6c5a..0970142bcace 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/debugfs.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2012-2016, Intel Corporation. All rights reserved</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2012-2013, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/dma-ring.c b/drivers/misc/mei/dma-ring.c<br/>index 795641b82181..ef56f849b251 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/dma-ring.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/dma-ring.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/dma-ring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/dma-ring.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- * Copyright(c) 2016 - 2018 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2016-2018 Intel Corporation. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/mei.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c<br/>index e6207f614816..a44094cdbc36 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hbm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hbm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hbm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hbm.c</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2019, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/hbm.h b/drivers/misc/mei/hbm.h<br/>index 0171a7e79bab..5aa58cffdd2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hbm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hbm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hbm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hbm.h</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MEI_HBM_H_</div><div class='head'>diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig<br/>new file mode 100644<br/>index 000000000000..95b2d6d37f10<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hdcp/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# Copyright (c) 2019, Intel Corporation. All rights reserved.</div><div class='add'>+#</div><div class='add'>+config INTEL_MEI_HDCP</div><div class='add'>+	tristate "Intel HDCP2.2 services of ME Interface"</div><div class='add'>+	select INTEL_MEI_ME</div><div class='add'>+	depends on DRM_I915</div><div class='add'>+	help</div><div class='add'>+	  MEI Support for HDCP2.2 Services on Intel platforms.</div><div class='add'>+</div><div class='add'>+	  Enables the ME FW services required for HDCP2.2 support through</div><div class='add'>+	  I915 display driver of Intel.</div><div class='head'>diff --git a/drivers/misc/mei/hdcp/Makefile b/drivers/misc/mei/hdcp/Makefile<br/>index adbe7506282d..3fbb56485ce8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hdcp/Makefile</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='del'>-# Copyright (c) 2019, Intel Corporation.</div><div class='add'>+# Copyright (c) 2019, Intel Corporation. All rights reserved.</div><div class='ctx'> #</div><div class='ctx'> # Makefile - HDCP client driver for Intel MEI Bus Driver.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c<br/>index 90b6ae8e9dae..b07000202d4a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/mei_hdcp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/mei_hdcp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/mei_hdcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hdcp/mei_hdcp.c</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 © 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h<br/>index 5f74b908e486..e4b1cd54c853 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/mei_hdcp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hdcp/mei_hdcp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hdcp/mei_hdcp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hdcp/mei_hdcp.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 © 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h<br/>index bb1ee9834a02..d74b182e19f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-me-regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-me-regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-me-regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw-me-regs.h</a></div><div class='hunk'>@@ -1,68 +1,8 @@</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='add'>+ * Copyright (c) 2003-2019, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Intel MEI Interface Header</div><div class='del'>- *</div><div class='del'>- * This file is provided under a dual BSD/GPLv2 license.  When using or</div><div class='del'>- * redistributing this file, you may do so under either license.</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License 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 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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,</div><div class='del'>- * USA</div><div class='del'>- *</div><div class='del'>- * The full GNU General Public License is included in this distribution</div><div class='del'>- * in the file called LICENSE.GPL.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *	Intel Corporation.</div><div class='del'>- *	linux-mei@linux.intel.com</div><div class='del'>- *	http://www.intel.com</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.</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</div><div class='del'>- * are met:</div><div class='del'>- *</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</div><div class='del'>- *    the documentation and/or other materials provided with the</div><div class='del'>- *    distribution.</div><div class='del'>- *  * Neither the name Intel Corporation nor the names of its</div><div class='del'>- *    contributors may be used to endorse or promote products derived</div><div class='del'>- *    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</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 DAMAGE.</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ */</div><div class='ctx'> #ifndef _MEI_HW_MEI_REGS_H_</div><div class='ctx'> #define _MEI_HW_MEI_REGS_H_</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c<br/>index 3fbbadfa2ae1..abe1b1f4362f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-me.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-me.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-me.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw-me.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -350,9 +340,6 @@ static void mei_me_hw_reset_release(struct mei_device *dev)</div><div class='ctx'> 	hcsr |= H_IG;</div><div class='ctx'> 	hcsr &amp;= ~H_RST;</div><div class='ctx'> 	mei_hcsr_set(dev, hcsr);</div><div class='del'>-</div><div class='del'>-	/* complete this write before we set host ready on another CPU */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/misc/mei/hw-me.h b/drivers/misc/mei/hw-me.h<br/>index bbcc5fc106cd..08c84a0de4a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-me.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-me.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-me.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw-me.h</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2012-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #ifndef _MEI_INTERFACE_H_</div><div class='ctx'> #define _MEI_INTERFACE_H_</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/mei/hw-txe-regs.h b/drivers/misc/mei/hw-txe-regs.h<br/>index f19229c4e655..a92b306dac8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-txe-regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-txe-regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-txe-regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw-txe-regs.h</a></div><div class='hunk'>@@ -1,63 +1,8 @@</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='add'>+ * Copyright (c) 2013-2014, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Intel MEI Interface Header</div><div class='del'>- *</div><div class='del'>- * This file is provided under a dual BSD/GPLv2 license.  When using or</div><div class='del'>- * redistributing this file, you may do so under either license.</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License 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 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'>- * The full GNU General Public License is included in this distribution</div><div class='del'>- * in the file called COPYING</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *	Intel Corporation.</div><div class='del'>- *	linux-mei@linux.intel.com</div><div class='del'>- *	http://www.intel.com</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.</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</div><div class='del'>- * are met:</div><div class='del'>- *</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</div><div class='del'>- *    the documentation and/or other materials provided with the</div><div class='del'>- *    distribution.</div><div class='del'>- *  * Neither the name Intel Corporation nor the names of its</div><div class='del'>- *    contributors may be used to endorse or promote products derived</div><div class='del'>- *    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</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 DAMAGE.</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ */</div><div class='ctx'> #ifndef _MEI_HW_TXE_REGS_H_</div><div class='ctx'> #define _MEI_HW_TXE_REGS_H_</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c<br/>index 8449fe0367ff..5e58656b8e19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-txe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-txe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-txe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw-txe.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2013-2014, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2013-2014, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/hw-txe.h b/drivers/misc/mei/hw-txe.h<br/>index e1e8b66d7648..96511b04bf88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-txe.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw-txe.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw-txe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw-txe.h</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2013-2016, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2013-2014, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MEI_HW_TXE_H_</div><div class='head'>diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h<br/>index b7d2487b8409..d025a5f8317e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/hw.h</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MEI_HW_TYPES_H_</div><div class='head'>diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c<br/>index eb026e2a0537..b9fef773e71b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/init.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2012-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='hunk'>@@ -133,12 +123,12 @@ int mei_reset(struct mei_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* enter reset flow */</div><div class='ctx'> 	interrupts_enabled = state != MEI_DEV_POWER_DOWN;</div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_RESETTING;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_RESETTING);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;reset_count++;</div><div class='ctx'> 	if (dev-&gt;reset_count &gt; MEI_MAX_CONSEC_RESET) {</div><div class='ctx'> 		dev_err(dev-&gt;dev, "reset: reached maximal consecutive resets: disabling the device\n");</div><div class='del'>-		dev-&gt;dev_state = MEI_DEV_DISABLED;</div><div class='add'>+		mei_set_devstate(dev, MEI_DEV_DISABLED);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +150,7 @@ int mei_reset(struct mei_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (state == MEI_DEV_POWER_DOWN) {</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "powering down: end of reset\n");</div><div class='del'>-		dev-&gt;dev_state = MEI_DEV_DISABLED;</div><div class='add'>+		mei_set_devstate(dev, MEI_DEV_DISABLED);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -172,11 +162,11 @@ int mei_reset(struct mei_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev-&gt;dev, "link is established start sending messages.\n");</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_INIT_CLIENTS;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_INIT_CLIENTS);</div><div class='ctx'> 	ret = mei_hbm_start_req(dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev-&gt;dev, "hbm_start failed ret = %d\n", ret);</div><div class='del'>-		dev-&gt;dev_state = MEI_DEV_RESETTING;</div><div class='add'>+		mei_set_devstate(dev, MEI_DEV_RESETTING);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -206,7 +196,7 @@ int mei_start(struct mei_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;reset_count = 0;</div><div class='ctx'> 	do {</div><div class='del'>-		dev-&gt;dev_state = MEI_DEV_INITIALIZING;</div><div class='add'>+		mei_set_devstate(dev, MEI_DEV_INITIALIZING);</div><div class='ctx'> 		ret = mei_reset(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (ret == -ENODEV || dev-&gt;dev_state == MEI_DEV_DISABLED) {</div><div class='hunk'>@@ -241,7 +231,7 @@ int mei_start(struct mei_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	dev_err(dev-&gt;dev, "link layer initialization failed.\n");</div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_DISABLED;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_DISABLED);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;device_lock);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='hunk'>@@ -260,7 +250,7 @@ int mei_restart(struct mei_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;device_lock);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_POWER_UP;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_POWER_UP);</div><div class='ctx'> 	dev-&gt;reset_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = mei_reset(dev);</div><div class='hunk'>@@ -311,7 +301,7 @@ void mei_stop(struct mei_device *dev)</div><div class='ctx'> 	dev_dbg(dev-&gt;dev, "stopping the device.\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;device_lock);</div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_POWER_DOWN;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_POWER_DOWN);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;device_lock);</div><div class='ctx'> 	mei_cl_bus_remove_devices(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +314,7 @@ void mei_stop(struct mei_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mei_reset(dev);</div><div class='ctx'> 	/* move device to disabled state unconditionally */</div><div class='del'>-	dev-&gt;dev_state = MEI_DEV_DISABLED;</div><div class='add'>+	mei_set_devstate(dev, MEI_DEV_DISABLED);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;device_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c<br/>index 055c2d89b310..c70a8c74cc57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/interrupt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/interrupt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/interrupt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/interrupt.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c<br/>index 87281b3695e6..ad02097d7fee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/main.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2018, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -37,6 +28,12 @@</div><div class='ctx'> #include "mei_dev.h"</div><div class='ctx'> #include "client.h"</div><div class='ctx'> </div><div class='add'>+static struct class *mei_class;</div><div class='add'>+static dev_t mei_devt;</div><div class='add'>+#define MEI_MAX_DEVS  MINORMASK</div><div class='add'>+static DEFINE_MUTEX(mei_minor_lock);</div><div class='add'>+static DEFINE_IDR(mei_idr);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * mei_open - the open function</div><div class='ctx'>  *</div><div class='hunk'>@@ -838,12 +835,65 @@ static ssize_t fw_ver_show(struct device *device,</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR_RO(fw_ver);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dev_state_show - display device state</div><div class='add'>+ *</div><div class='add'>+ * @device: device pointer</div><div class='add'>+ * @attr: attribute pointer</div><div class='add'>+ * @buf:  char out buffer</div><div class='add'>+ *</div><div class='add'>+ * Return: number of the bytes printed into buf or error</div><div class='add'>+ */</div><div class='add'>+static ssize_t dev_state_show(struct device *device,</div><div class='add'>+			      struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct mei_device *dev = dev_get_drvdata(device);</div><div class='add'>+	enum mei_dev_state dev_state;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;device_lock);</div><div class='add'>+	dev_state = dev-&gt;dev_state;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;device_lock);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s", mei_dev_state_str(dev_state));</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(dev_state);</div><div class='add'>+</div><div class='add'>+static int match_devt(struct device *dev, const void *data)</div><div class='add'>+{</div><div class='add'>+	const dev_t *devt = data;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;devt == *devt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_set_devstate: set to new device state and notify sysfs file.</div><div class='add'>+ *</div><div class='add'>+ * @dev: mei_device</div><div class='add'>+ * @state: new device state</div><div class='add'>+ */</div><div class='add'>+void mei_set_devstate(struct mei_device *dev, enum mei_dev_state state)</div><div class='add'>+{</div><div class='add'>+	struct device *clsdev;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_state == state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev_state = state;</div><div class='add'>+</div><div class='add'>+	clsdev = class_find_device(mei_class, NULL, &amp;dev-&gt;cdev.dev, match_devt);</div><div class='add'>+	if (clsdev) {</div><div class='add'>+		sysfs_notify(&amp;clsdev-&gt;kobj, NULL, "dev_state");</div><div class='add'>+		put_device(clsdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct attribute *mei_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_fw_status.attr,</div><div class='ctx'> 	&amp;dev_attr_hbm_ver.attr,</div><div class='ctx'> 	&amp;dev_attr_hbm_ver_drv.attr,</div><div class='ctx'> 	&amp;dev_attr_tx_queue_limit.attr,</div><div class='ctx'> 	&amp;dev_attr_fw_ver.attr,</div><div class='add'>+	&amp;dev_attr_dev_state.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(mei);</div><div class='hunk'>@@ -867,12 +917,6 @@ static const struct file_operations mei_fops = {</div><div class='ctx'> 	.llseek = no_llseek</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct class *mei_class;</div><div class='del'>-static dev_t mei_devt;</div><div class='del'>-#define MEI_MAX_DEVS  MINORMASK</div><div class='del'>-static DEFINE_MUTEX(mei_minor_lock);</div><div class='del'>-static DEFINE_IDR(mei_idr);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * mei_minor_get - obtain next free device minor number</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/misc/mei/mei-trace.c b/drivers/misc/mei/mei-trace.c<br/>index 374edde72a14..48d4c4fcefd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/mei-trace.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/mei-trace.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/mei-trace.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/mei-trace.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2015-2016, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2015, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/mei/mei-trace.h b/drivers/misc/mei/mei-trace.h<br/>index b52e9b97a7c0..df758033dc93 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/mei-trace.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/mei-trace.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/mei-trace.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/mei-trace.h</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2015-2016, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2015, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #if !defined(_MEI_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)</div><div class='head'>diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h<br/>index 685b78ce30a5..fca832fcac57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/mei_dev.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/mei_dev.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/mei_dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/mei_dev.h</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2018, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MEI_DEV_H_</div><div class='hunk'>@@ -535,7 +525,6 @@ struct mei_device {</div><div class='ctx'> 	struct dentry *dbgfs_dir;</div><div class='ctx'> #endif /* CONFIG_DEBUG_FS */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	const struct mei_hw_ops *ops;</div><div class='ctx'> 	char hw[0] __aligned(sizeof(void *));</div><div class='ctx'> };</div><div class='hunk'>@@ -594,6 +583,8 @@ int mei_restart(struct mei_device *dev);</div><div class='ctx'> void mei_stop(struct mei_device *dev);</div><div class='ctx'> void mei_cancel_work(struct mei_device *dev);</div><div class='ctx'> </div><div class='add'>+void mei_set_devstate(struct mei_device *dev, enum mei_dev_state state);</div><div class='add'>+</div><div class='ctx'> int mei_dmam_ring_alloc(struct mei_device *dev);</div><div class='ctx'> void mei_dmam_ring_free(struct mei_device *dev);</div><div class='ctx'> bool mei_dma_ring_is_allocated(struct mei_device *dev);</div><div class='head'>diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c<br/>index 3ab946ad3257..7a2b3545a7f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/pci-me.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/pci-me.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/pci-me.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/pci-me.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2003-2019, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2003-2012, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c<br/>index e1b909123fb0..2e37fc2e0fa8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/pci-txe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mei/pci-txe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mei/pci-txe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mei/pci-txe.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * Copyright (c) 2013-2017, Intel Corporation. All rights reserved.</div><div class='ctx'>  * Intel Management Engine Interface (Intel MEI) Linux driver</div><div class='del'>- * Copyright (c) 2013-2014, Intel Corporation.</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'>- * 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig<br/>index 242dcee14689..6736f72cc14a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mic/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/mic/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/mic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/mic/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver"</div><div class='ctx'> </div><div class='ctx'> config INTEL_MIC_BUS</div><div class='ctx'> 	tristate "Intel MIC Bus Driver"</div><div class='del'>-	depends on 64BIT &amp;&amp; PCI &amp;&amp; X86 &amp;&amp; X86_DEV_DMA_OPS</div><div class='add'>+	depends on 64BIT &amp;&amp; PCI &amp;&amp; X86</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option is selected by any driver which registers a</div><div class='ctx'> 	  device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,</div><div class='hunk'>@@ -21,7 +21,7 @@ comment "SCIF Bus Driver"</div><div class='ctx'> </div><div class='ctx'> config SCIF_BUS</div><div class='ctx'> 	tristate "SCIF Bus Driver"</div><div class='del'>-	depends on 64BIT &amp;&amp; PCI &amp;&amp; X86 &amp;&amp; X86_DEV_DMA_OPS</div><div class='add'>+	depends on 64BIT &amp;&amp; PCI &amp;&amp; X86</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option is selected by any driver which registers a</div><div class='ctx'> 	  device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c<br/>index 9e443df44b3b..0c6de97dd347 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/sgi-xp/xpc_uv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/sgi-xp/xpc_uv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/sgi-xp/xpc_uv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/sgi-xp/xpc_uv.c</a></div><div class='hunk'>@@ -572,6 +572,7 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,</div><div class='ctx'> </div><div class='ctx'> 		xpc_wakeup_channel_mgr(part);</div><div class='ctx'> 	}</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case XPC_ACTIVATE_MQ_MSG_MARK_ENGAGED_UV:</div><div class='ctx'> 		spin_lock_irqsave(&amp;part_uv-&gt;flags_lock, irq_flags);</div><div class='ctx'> 		part_uv-&gt;flags |= XPC_P_ENGAGED_UV;</div><div class='head'>diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c<br/>index 9ac95b48ef92..cc729f7ab32e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/tifm_7xx1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/misc/tifm_7xx1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/misc/tifm_7xx1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/misc/tifm_7xx1.c</a></div><div class='hunk'>@@ -403,7 +403,6 @@ static void tifm_7xx1_remove(struct pci_dev *dev)</div><div class='ctx'> 	fm-&gt;eject = tifm_7xx1_dummy_eject;</div><div class='ctx'> 	fm-&gt;has_ms_pif = tifm_7xx1_dummy_has_ms_pif;</div><div class='ctx'> 	writel(TIFM_IRQ_SETALL, fm-&gt;addr + FM_CLEAR_INTERRUPT_ENABLE);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	free_irq(dev-&gt;irq, fm);</div><div class='ctx'> </div><div class='ctx'> 	tifm_remove_adapter(fm);</div><div class='head'>diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c<br/>index 3a4402a79904..6a51f7a06ce7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/host.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/host.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/host.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/core/host.c</a></div><div class='hunk'>@@ -363,11 +363,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)</div><div class='ctx'> 	int num_ranges, i;</div><div class='ctx'> </div><div class='ctx'> 	voltage_ranges = of_get_property(np, "voltage-ranges", &amp;num_ranges);</div><div class='del'>-	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;</div><div class='ctx'> 	if (!voltage_ranges) {</div><div class='ctx'> 		pr_debug("%pOF: voltage-ranges unspecified\n", np);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;</div><div class='ctx'> 	if (!num_ranges) {</div><div class='ctx'> 		pr_err("%pOF: voltage-ranges empty\n", np);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -429,8 +429,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (mmc_gpio_alloc(host)) {</div><div class='ctx'> 		put_device(&amp;host-&gt;class_dev);</div><div class='del'>-		ida_simple_remove(&amp;mmc_host_ida, host-&gt;index);</div><div class='del'>-		kfree(host);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c<br/>index c5208fb312ae..a533cab8fccc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/mmc_ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/mmc_ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/mmc_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/core/mmc_ops.c</a></div><div class='hunk'>@@ -184,11 +184,7 @@ int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* if we're just probing, do a single pass */</div><div class='del'>-		if (ocr == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* otherwise wait until reset completes */</div><div class='add'>+		/* wait until reset completes */</div><div class='ctx'> 		if (mmc_host_is_spi(host)) {</div><div class='ctx'> 			if (!(cmd.resp[0] &amp; R1_SPI_IDLE))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -200,6 +196,16 @@ int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)</div><div class='ctx'> 		err = -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 		mmc_delay(10);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * According to eMMC specification v5.1 section 6.4.3, we</div><div class='add'>+		 * should issue CMD1 repeatedly in the idle state until</div><div class='add'>+		 * the eMMC is ready. Otherwise some eMMC devices seem to enter</div><div class='add'>+		 * the inactive mode after mmc_init_card() issued CMD0 when</div><div class='add'>+		 * the eMMC device is busy.</div><div class='add'>+		 */</div><div class='add'>+		if (!ocr &amp;&amp; !mmc_host_is_spi(host))</div><div class='add'>+			cmd.arg = cmd.resp[0] | BIT(30);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rocr &amp;&amp; !mmc_host_is_spi(host))</div><div class='head'>diff --git a/drivers/mmc/core/pwrseq_emmc.c b/drivers/mmc/core/pwrseq_emmc.c<br/>index efb8a7965dd4..154f4204d58c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/pwrseq_emmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/pwrseq_emmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/pwrseq_emmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/core/pwrseq_emmc.c</a></div><div class='hunk'>@@ -30,19 +30,14 @@ struct mmc_pwrseq_emmc {</div><div class='ctx'> </div><div class='ctx'> #define to_pwrseq_emmc(p) container_of(p, struct mmc_pwrseq_emmc, pwrseq)</div><div class='ctx'> </div><div class='del'>-static void __mmc_pwrseq_emmc_reset(struct mmc_pwrseq_emmc *pwrseq)</div><div class='del'>-{</div><div class='del'>-	gpiod_set_value(pwrseq-&gt;reset_gpio, 1);</div><div class='del'>-	udelay(1);</div><div class='del'>-	gpiod_set_value(pwrseq-&gt;reset_gpio, 0);</div><div class='del'>-	udelay(200);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mmc_pwrseq_emmc_reset(struct mmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_pwrseq_emmc *pwrseq =  to_pwrseq_emmc(host-&gt;pwrseq);</div><div class='ctx'> </div><div class='del'>-	__mmc_pwrseq_emmc_reset(pwrseq);</div><div class='add'>+	gpiod_set_value_cansleep(pwrseq-&gt;reset_gpio, 1);</div><div class='add'>+	udelay(1);</div><div class='add'>+	gpiod_set_value_cansleep(pwrseq-&gt;reset_gpio, 0);</div><div class='add'>+	udelay(200);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this,</div><div class='hunk'>@@ -50,8 +45,11 @@ static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this,</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_pwrseq_emmc *pwrseq = container_of(this,</div><div class='ctx'> 					struct mmc_pwrseq_emmc, reset_nb);</div><div class='add'>+	gpiod_set_value(pwrseq-&gt;reset_gpio, 1);</div><div class='add'>+	udelay(1);</div><div class='add'>+	gpiod_set_value(pwrseq-&gt;reset_gpio, 0);</div><div class='add'>+	udelay(200);</div><div class='ctx'> </div><div class='del'>-	__mmc_pwrseq_emmc_reset(pwrseq);</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -72,14 +70,18 @@ static int mmc_pwrseq_emmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(pwrseq-&gt;reset_gpio))</div><div class='ctx'> 		return PTR_ERR(pwrseq-&gt;reset_gpio);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * register reset handler to ensure emmc reset also from</div><div class='del'>-	 * emergency_reboot(), priority 255 is the highest priority</div><div class='del'>-	 * so it will be executed before any system reboot handler.</div><div class='del'>-	 */</div><div class='del'>-	pwrseq-&gt;reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb;</div><div class='del'>-	pwrseq-&gt;reset_nb.priority = 255;</div><div class='del'>-	register_restart_handler(&amp;pwrseq-&gt;reset_nb);</div><div class='add'>+	if (!gpiod_cansleep(pwrseq-&gt;reset_gpio)) {</div><div class='add'>+		/*</div><div class='add'>+		 * register reset handler to ensure emmc reset also from</div><div class='add'>+		 * emergency_reboot(), priority 255 is the highest priority</div><div class='add'>+		 * so it will be executed before any system reboot handler.</div><div class='add'>+		 */</div><div class='add'>+		pwrseq-&gt;reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb;</div><div class='add'>+		pwrseq-&gt;reset_nb.priority = 255;</div><div class='add'>+		register_restart_handler(&amp;pwrseq-&gt;reset_nb);</div><div class='add'>+	} else {</div><div class='add'>+		dev_notice(dev, "EMMC reset pin tied to a sleepy GPIO driver; reset on emergency-reboot disabled\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pwrseq-&gt;pwrseq.ops = &amp;mmc_pwrseq_emmc_ops;</div><div class='ctx'> 	pwrseq-&gt;pwrseq.dev = dev;</div><div class='head'>diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c<br/>index 7c364a9c4eeb..b5b9c6142f08 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/queue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/queue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/core/queue.c</a></div><div class='hunk'>@@ -472,6 +472,7 @@ void mmc_cleanup_queue(struct mmc_queue *mq)</div><div class='ctx'> 		blk_mq_unquiesce_queue(q);</div><div class='ctx'> </div><div class='ctx'> 	blk_cleanup_queue(q);</div><div class='add'>+	blk_mq_free_tag_set(&amp;mq-&gt;tag_set);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * A request can be completed before the next request, potentially</div><div class='head'>diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h<br/>index dd2f73af8f2c..2d2d9ea8be4f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/quirks.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/quirks.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/quirks.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/core/quirks.h</a></div><div class='hunk'>@@ -159,7 +159,7 @@ static inline void mmc_fixup_device(struct mmc_card *card,</div><div class='ctx'> 		    (f-&gt;ext_csd_rev == EXT_CSD_REV_ANY ||</div><div class='ctx'> 		     f-&gt;ext_csd_rev == card-&gt;ext_csd.rev) &amp;&amp;</div><div class='ctx'> 		    rev &gt;= f-&gt;rev_start &amp;&amp; rev &lt;= f-&gt;rev_end) {</div><div class='del'>-			dev_dbg(&amp;card-&gt;dev, "calling %pf\n", f-&gt;vendor_fixup);</div><div class='add'>+			dev_dbg(&amp;card-&gt;dev, "calling %ps\n", f-&gt;vendor_fixup);</div><div class='ctx'> 			f-&gt;vendor_fixup(card, f-&gt;data);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c<br/>index 265e1aeeb9d8..d3d32f9a2cb1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/sd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/core/sd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/core/sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/core/sd.c</a></div><div class='hunk'>@@ -221,6 +221,14 @@ static int mmc_decode_scr(struct mmc_card *card)</div><div class='ctx'> </div><div class='ctx'> 	if (scr-&gt;sda_spec3)</div><div class='ctx'> 		scr-&gt;cmds = UNSTUFF_BITS(resp, 32, 2);</div><div class='add'>+</div><div class='add'>+	/* SD Spec says: any SD Card shall set at least bits 0 and 2 */</div><div class='add'>+	if (!(scr-&gt;bus_widths &amp; SD_SCR_BUS_WIDTH_1) ||</div><div class='add'>+	    !(scr-&gt;bus_widths &amp; SD_SCR_BUS_WIDTH_4)) {</div><div class='add'>+		pr_err("%s: invalid bus width\n", mmc_hostname(card-&gt;host));</div><div class='add'>+		return -EINVAL;</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='head'>diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig<br/>index 28fcd8f580a1..0e86340536b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/Kconfig</a></div><div class='hunk'>@@ -92,6 +92,7 @@ config MMC_SDHCI_PCI</div><div class='ctx'> 	tristate "SDHCI support on PCI bus"</div><div class='ctx'> 	depends on MMC_SDHCI &amp;&amp; PCI</div><div class='ctx'> 	select MMC_CQHCI</div><div class='add'>+	select IOSF_MBI if X86</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects the PCI Secure Digital Host Controller Interface.</div><div class='ctx'> 	  Most controllers found today are PCI devices.</div><div class='hunk'>@@ -437,7 +438,7 @@ config MMC_WBSD</div><div class='ctx'> 	depends on ISA_DMA_API</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects the Winbond(R) W83L51xD Secure digital and</div><div class='del'>-          Multimedia card Interface.</div><div class='add'>+	  Multimedia card Interface.</div><div class='ctx'> 	  If you have a machine with a integrated W83L518D or W83L519D</div><div class='ctx'> 	  SD/MMC card reader, say Y or M here.</div><div class='ctx'> </div><div class='hunk'>@@ -515,7 +516,7 @@ config MMC_TIFM_SD</div><div class='ctx'> 	  'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support</div><div class='ctx'> 	  (TIFM_7XX1)'.</div><div class='ctx'> </div><div class='del'>-          To compile this driver as a module, choose M here: the</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called tifm_sd.</div><div class='ctx'> </div><div class='ctx'> config MMC_MVSDIO</div><div class='hunk'>@@ -531,12 +532,12 @@ config MMC_MVSDIO</div><div class='ctx'> 	  module will be called mvsdio.</div><div class='ctx'> </div><div class='ctx'> config MMC_DAVINCI</div><div class='del'>-        tristate "TI DAVINCI Multimedia Card Interface support"</div><div class='del'>-        depends on ARCH_DAVINCI</div><div class='del'>-        help</div><div class='del'>-          This selects the TI DAVINCI Multimedia card Interface.</div><div class='del'>-          If you have an DAVINCI board with a Multimedia Card slot,</div><div class='del'>-          say Y or M here.  If unsure, say N.</div><div class='add'>+	tristate "TI DAVINCI Multimedia Card Interface support"</div><div class='add'>+	depends on ARCH_DAVINCI</div><div class='add'>+	help</div><div class='add'>+	  This selects the TI DAVINCI Multimedia card Interface.</div><div class='add'>+	  If you have an DAVINCI board with a Multimedia Card slot,</div><div class='add'>+	  say Y or M here.  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config MMC_GOLDFISH</div><div class='ctx'> 	tristate "goldfish qemu Multimedia Card Interface support"</div><div class='hunk'>@@ -565,18 +566,18 @@ config MMC_S3C</div><div class='ctx'> 	depends on S3C24XX_DMAC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects a driver for the MCI interface found in</div><div class='del'>-          Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.</div><div class='add'>+	  Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.</div><div class='ctx'> 	  If you have a board based on one of those and a MMC/SD</div><div class='ctx'> 	  slot, say Y or M here.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config MMC_S3C_HW_SDIO_IRQ</div><div class='del'>-       bool "Hardware support for SDIO IRQ"</div><div class='del'>-       depends on MMC_S3C</div><div class='del'>-       help</div><div class='del'>-         Enable the hardware support for SDIO interrupts instead of using</div><div class='del'>-	 the generic polling code.</div><div class='add'>+	bool "Hardware support for SDIO IRQ"</div><div class='add'>+	depends on MMC_S3C</div><div class='add'>+	help</div><div class='add'>+	  Enable the hardware support for SDIO interrupts instead of using</div><div class='add'>+	  the generic polling code.</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Samsung S3C SD/MMC transfer code"</div><div class='hunk'>@@ -941,6 +942,7 @@ config MMC_BCM2835</div><div class='ctx'> config MMC_MTK</div><div class='ctx'> 	tristate "MediaTek SD/MMC Card Interface support"</div><div class='ctx'> 	depends on HAS_DMA</div><div class='add'>+	select REGULATOR</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects the MediaTek(R) Secure digital and Multimedia card Interface.</div><div class='ctx'> 	  If you have a machine with a integrated SD/MMC card reader, say Y or M here.</div><div class='hunk'>@@ -948,15 +950,16 @@ config MMC_MTK</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config MMC_SDHCI_MICROCHIP_PIC32</div><div class='del'>-        tristate "Microchip PIC32MZDA SDHCI support"</div><div class='del'>-        depends on MMC_SDHCI &amp;&amp; PIC32MZDA &amp;&amp; MMC_SDHCI_PLTFM</div><div class='del'>-        help</div><div class='del'>-          This selects the Secure Digital Host Controller Interface (SDHCI)</div><div class='del'>-          for PIC32MZDA platform.</div><div class='add'>+	tristate "Microchip PIC32MZDA SDHCI support"</div><div class='add'>+	depends on MMC_SDHCI &amp;&amp; PIC32MZDA &amp;&amp; MMC_SDHCI_PLTFM</div><div class='add'>+	help</div><div class='add'>+	  This selects the Secure Digital Host Controller Interface (SDHCI)</div><div class='add'>+	  for PIC32MZDA platform.</div><div class='ctx'> </div><div class='del'>-          If you have a controller with this interface, say Y or M here.</div><div class='add'>+	  If you have a controller with this interface, say Y or M here.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-          If unsure, say N.</div><div class='ctx'> config MMC_SDHCI_BRCMSTB</div><div class='ctx'> 	tristate "Broadcom SDIO/SD/MMC support"</div><div class='ctx'> 	depends on ARCH_BRCMSTB || BMIPS_GENERIC</div><div class='hunk'>@@ -993,6 +996,7 @@ config MMC_SDHCI_OMAP</div><div class='ctx'> config MMC_SDHCI_AM654</div><div class='ctx'> 	tristate "Support for the SDHCI Controller in TI's AM654 SOCs"</div><div class='ctx'> 	depends on MMC_SDHCI_PLTFM &amp;&amp; OF</div><div class='add'>+	select MMC_SDHCI_IO_ACCESSORS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects the Secure Digital Host Controller Interface (SDHCI)</div><div class='ctx'> 	  support present in TI's AM654 SOCs. The controller supports</div><div class='head'>diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c<br/>index c712b7deb3a9..e481535cba2b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/alcor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/alcor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/alcor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/alcor.c</a></div><div class='hunk'>@@ -43,12 +43,10 @@ struct alcor_sdmmc_host {</div><div class='ctx'> 	struct  device *dev;</div><div class='ctx'> 	struct alcor_pci_priv *alcor_pci;</div><div class='ctx'> </div><div class='del'>-	struct mmc_host *mmc;</div><div class='ctx'> 	struct mmc_request *mrq;</div><div class='ctx'> 	struct mmc_command *cmd;</div><div class='ctx'> 	struct mmc_data *data;</div><div class='ctx'> 	unsigned int dma_on:1;</div><div class='del'>-	unsigned int early_data:1;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex cmd_mutex;</div><div class='ctx'> </div><div class='hunk'>@@ -118,6 +116,9 @@ static void alcor_reset(struct alcor_sdmmc_host *host, u8 val)</div><div class='ctx'> 	dev_err(host-&gt;dev, "%s: timeout\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Perform DMA I/O of a single page.</div><div class='add'>+ */</div><div class='ctx'> static void alcor_data_set_dma(struct alcor_sdmmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct alcor_pci_priv *priv = host-&gt;alcor_pci;</div><div class='hunk'>@@ -144,8 +145,7 @@ static void alcor_data_set_dma(struct alcor_sdmmc_host *host)</div><div class='ctx'> 	host-&gt;sg_count--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void alcor_trigger_data_transfer(struct alcor_sdmmc_host *host,</div><div class='del'>-					bool early)</div><div class='add'>+static void alcor_trigger_data_transfer(struct alcor_sdmmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct alcor_pci_priv *priv = host-&gt;alcor_pci;</div><div class='ctx'> 	struct mmc_data *data = host-&gt;data;</div><div class='hunk'>@@ -155,19 +155,26 @@ static void alcor_trigger_data_transfer(struct alcor_sdmmc_host *host,</div><div class='ctx'> 		ctrl |= AU6601_DATA_WRITE;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;host_cookie == COOKIE_MAPPED) {</div><div class='del'>-		if (host-&gt;early_data) {</div><div class='del'>-			host-&gt;early_data = false;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		host-&gt;early_data = early;</div><div class='del'>-</div><div class='add'>+		/*</div><div class='add'>+		 * For DMA transfers, this function is called just once,</div><div class='add'>+		 * at the start of the operation. The hardware can only</div><div class='add'>+		 * perform DMA I/O on a single page at a time, so here</div><div class='add'>+		 * we kick off the transfer with the first page, and expect</div><div class='add'>+		 * subsequent pages to be transferred upon IRQ events</div><div class='add'>+		 * indicating that the single-page DMA was completed.</div><div class='add'>+		 */</div><div class='ctx'> 		alcor_data_set_dma(host);</div><div class='ctx'> 		ctrl |= AU6601_DATA_DMA_MODE;</div><div class='ctx'> 		host-&gt;dma_on = 1;</div><div class='ctx'> 		alcor_write32(priv, data-&gt;sg_count * 0x1000,</div><div class='ctx'> 			       AU6601_REG_BLOCK_SIZE);</div><div class='ctx'> 	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * For PIO transfers, we break down each operation</div><div class='add'>+		 * into several sector-sized transfers. When one sector has</div><div class='add'>+		 * complete, the IRQ handler will call this function again</div><div class='add'>+		 * to kick off the transfer of the next sector.</div><div class='add'>+		 */</div><div class='ctx'> 		alcor_write32(priv, data-&gt;blksz, AU6601_REG_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -231,6 +238,7 @@ static void alcor_prepare_sg_miter(struct alcor_sdmmc_host *host)</div><div class='ctx'> static void alcor_prepare_data(struct alcor_sdmmc_host *host,</div><div class='ctx'> 			       struct mmc_command *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct alcor_pci_priv *priv = host-&gt;alcor_pci;</div><div class='ctx'> 	struct mmc_data *data = cmd-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (!data)</div><div class='hunk'>@@ -248,7 +256,7 @@ static void alcor_prepare_data(struct alcor_sdmmc_host *host,</div><div class='ctx'> 	if (data-&gt;host_cookie != COOKIE_MAPPED)</div><div class='ctx'> 		alcor_prepare_sg_miter(host);</div><div class='ctx'> </div><div class='del'>-	alcor_trigger_data_transfer(host, true);</div><div class='add'>+	alcor_write8(priv, 0, AU6601_DATA_XFER_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alcor_send_cmd(struct alcor_sdmmc_host *host,</div><div class='hunk'>@@ -284,7 +292,7 @@ static void alcor_send_cmd(struct alcor_sdmmc_host *host,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(host-&gt;dev, "%s: cmd-&gt;flag (0x%02x) is not valid\n",</div><div class='del'>-			mmc_hostname(host-&gt;mmc), mmc_resp_type(cmd));</div><div class='add'>+			mmc_hostname(mmc_from_priv(host)), mmc_resp_type(cmd));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -325,7 +333,7 @@ static void alcor_request_complete(struct alcor_sdmmc_host *host,</div><div class='ctx'> 	host-&gt;data = NULL;</div><div class='ctx'> 	host-&gt;dma_on = 0;</div><div class='ctx'> </div><div class='del'>-	mmc_request_done(host-&gt;mmc, mrq);</div><div class='add'>+	mmc_request_done(mmc_from_priv(host), mrq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alcor_finish_data(struct alcor_sdmmc_host *host)</div><div class='hunk'>@@ -435,7 +443,7 @@ static int alcor_cmd_irq_done(struct alcor_sdmmc_host *host, u32 intmask)</div><div class='ctx'> 	if (!host-&gt;data)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	alcor_trigger_data_transfer(host, false);</div><div class='add'>+	alcor_trigger_data_transfer(host);</div><div class='ctx'> 	host-&gt;cmd = NULL;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -456,7 +464,7 @@ static void alcor_cmd_irq_thread(struct alcor_sdmmc_host *host, u32 intmask)</div><div class='ctx'> 	if (!host-&gt;data)</div><div class='ctx'> 		alcor_request_complete(host, 1);</div><div class='ctx'> 	else</div><div class='del'>-		alcor_trigger_data_transfer(host, false);</div><div class='add'>+		alcor_trigger_data_transfer(host);</div><div class='ctx'> 	host-&gt;cmd = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -487,15 +495,9 @@ static int alcor_data_irq_done(struct alcor_sdmmc_host *host, u32 intmask)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AU6601_INT_READ_BUF_RDY:</div><div class='ctx'> 		alcor_trf_block_pio(host, true);</div><div class='del'>-		if (!host-&gt;blocks)</div><div class='del'>-			break;</div><div class='del'>-		alcor_trigger_data_transfer(host, false);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	case AU6601_INT_WRITE_BUF_RDY:</div><div class='ctx'> 		alcor_trf_block_pio(host, false);</div><div class='del'>-		if (!host-&gt;blocks)</div><div class='del'>-			break;</div><div class='del'>-		alcor_trigger_data_transfer(host, false);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	case AU6601_INT_DMA_END:</div><div class='ctx'> 		if (!host-&gt;sg_count)</div><div class='hunk'>@@ -508,8 +510,14 @@ static int alcor_data_irq_done(struct alcor_sdmmc_host *host, u32 intmask)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (intmask &amp; AU6601_INT_DATA_END)</div><div class='del'>-		return 0;</div><div class='add'>+	if (intmask &amp; AU6601_INT_DATA_END) {</div><div class='add'>+		if (!host-&gt;dma_on &amp;&amp; host-&gt;blocks) {</div><div class='add'>+			alcor_trigger_data_transfer(host);</div><div class='add'>+			return 1;</div><div class='add'>+		} else {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -555,7 +563,7 @@ static void alcor_cd_irq(struct alcor_sdmmc_host *host, u32 intmask)</div><div class='ctx'> 		alcor_request_complete(host, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmc_detect_change(host-&gt;mmc, msecs_to_jiffies(1));</div><div class='add'>+	mmc_detect_change(mmc_from_priv(host), msecs_to_jiffies(1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t alcor_irq_thread(int irq, void *d)</div><div class='hunk'>@@ -779,12 +787,17 @@ static void alcor_pre_req(struct mmc_host *mmc,</div><div class='ctx'> 	data-&gt;host_cookie = COOKIE_UNMAPPED;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: looks like the DMA engine works only with CMD18 */</div><div class='del'>-	if (cmd-&gt;opcode != 18)</div><div class='add'>+	if (cmd-&gt;opcode != MMC_READ_MULTIPLE_BLOCK</div><div class='add'>+			&amp;&amp; cmd-&gt;opcode != MMC_WRITE_MULTIPLE_BLOCK)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't do DMA on "complex" transfers, i.e. with</div><div class='del'>-	 * non-word-aligned buffers or lengths. Also, we don't bother</div><div class='del'>-	 * with all the DMA setup overhead for short transfers.</div><div class='add'>+	 * non-word-aligned buffers or lengths. A future improvement</div><div class='add'>+	 * could be made to use temporary DMA bounce-buffers when these</div><div class='add'>+	 * requirements are not met.</div><div class='add'>+	 *</div><div class='add'>+	 * Also, we don't bother with all the DMA setup overhead for</div><div class='add'>+	 * short transfers.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (data-&gt;blocks * data-&gt;blksz &lt; AU6601_MAX_DMA_BLOCK_SIZE)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -795,6 +808,8 @@ static void alcor_pre_req(struct mmc_host *mmc,</div><div class='ctx'> 	for_each_sg(data-&gt;sg, sg, data-&gt;sg_len, i) {</div><div class='ctx'> 		if (sg-&gt;length != AU6601_MAX_DMA_BLOCK_SIZE)</div><div class='ctx'> 			return;</div><div class='add'>+		if (sg-&gt;offset != 0)</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This data might be unmapped at this time */</div><div class='hunk'>@@ -967,7 +982,6 @@ static void alcor_timeout_timer(struct work_struct *work)</div><div class='ctx'> 		alcor_request_complete(host, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;host-&gt;cmd_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1033,7 +1047,7 @@ static void alcor_hw_uninit(struct alcor_sdmmc_host *host)</div><div class='ctx'> </div><div class='ctx'> static void alcor_init_mmc(struct alcor_sdmmc_host *host)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_host *mmc = host-&gt;mmc;</div><div class='add'>+	struct mmc_host *mmc = mmc_from_priv(host);</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;f_min = AU6601_MIN_CLOCK;</div><div class='ctx'> 	mmc-&gt;f_max = AU6601_MAX_CLOCK;</div><div class='hunk'>@@ -1044,14 +1058,22 @@ static void alcor_init_mmc(struct alcor_sdmmc_host *host)</div><div class='ctx'> 	mmc-&gt;caps2 = MMC_CAP2_NO_SDIO;</div><div class='ctx'> 	mmc-&gt;ops = &amp;alcor_sdc_ops;</div><div class='ctx'> </div><div class='del'>-	/* Hardware cannot do scatter lists */</div><div class='add'>+	/* The hardware does DMA data transfer of 4096 bytes to/from a single</div><div class='add'>+	 * buffer address. Scatterlists are not supported at the hardware</div><div class='add'>+	 * level, however we can work with them at the driver level,</div><div class='add'>+	 * provided that each segment is exactly 4096 bytes in size.</div><div class='add'>+	 * Upon DMA completion of a single segment (signalled via IRQ), we</div><div class='add'>+	 * immediately proceed to transfer the next segment from the</div><div class='add'>+	 * scatterlist.</div><div class='add'>+	 *</div><div class='add'>+	 * The overall request is limited to 240 sectors, matching the</div><div class='add'>+	 * original vendor driver.</div><div class='add'>+	 */</div><div class='ctx'> 	mmc-&gt;max_segs = AU6601_MAX_DMA_SEGMENTS;</div><div class='ctx'> 	mmc-&gt;max_seg_size = AU6601_MAX_DMA_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	mmc-&gt;max_blk_size = mmc-&gt;max_seg_size;</div><div class='del'>-	mmc-&gt;max_blk_count = mmc-&gt;max_segs;</div><div class='del'>-</div><div class='del'>-	mmc-&gt;max_req_size = mmc-&gt;max_seg_size * mmc-&gt;max_segs;</div><div class='add'>+	mmc-&gt;max_blk_count = 240;</div><div class='add'>+	mmc-&gt;max_req_size = mmc-&gt;max_blk_count * mmc-&gt;max_blk_size;</div><div class='add'>+	dma_set_max_seg_size(host-&gt;dev, mmc-&gt;max_seg_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -1068,7 +1090,6 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	host = mmc_priv(mmc);</div><div class='del'>-	host-&gt;mmc = mmc;</div><div class='ctx'> 	host-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	host-&gt;cur_power_mode = MMC_POWER_UNDEFINED;</div><div class='ctx'> 	host-&gt;alcor_pci = priv;</div><div class='hunk'>@@ -1100,13 +1121,14 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)</div><div class='ctx'> static int alcor_pci_sdmmc_drv_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct alcor_sdmmc_host *host = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct mmc_host *mmc = mmc_from_priv(host);</div><div class='ctx'> </div><div class='ctx'> 	if (cancel_delayed_work_sync(&amp;host-&gt;timeout_work))</div><div class='ctx'> 		alcor_request_complete(host, 0);</div><div class='ctx'> </div><div class='ctx'> 	alcor_hw_uninit(host);</div><div class='del'>-	mmc_remove_host(host-&gt;mmc);</div><div class='del'>-	mmc_free_host(host-&gt;mmc);</div><div class='add'>+	mmc_remove_host(mmc);</div><div class='add'>+	mmc_free_host(mmc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c<br/>index a8af682a9182..d59cb0a51964 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/cqhci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/cqhci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/cqhci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/cqhci.c</a></div><div class='hunk'>@@ -537,6 +537,8 @@ static void cqhci_prep_dcmd_desc(struct mmc_host *mmc,</div><div class='ctx'> 		 CQHCI_ACT(0x5) |</div><div class='ctx'> 		 CQHCI_CMD_INDEX(mrq-&gt;cmd-&gt;opcode) |</div><div class='ctx'> 		 CQHCI_CMD_TIMING(timing) | CQHCI_RESP_TYPE(resp_type));</div><div class='add'>+	if (cq_host-&gt;ops-&gt;update_dcmd_desc)</div><div class='add'>+		cq_host-&gt;ops-&gt;update_dcmd_desc(mmc, mrq, &amp;data);</div><div class='ctx'> 	*task_desc |= data;</div><div class='ctx'> 	desc = (u8 *)task_desc;</div><div class='ctx'> 	pr_debug("%s: cqhci: dcmd: cmd: %d timing: %d resp: %d\n",</div><div class='head'>diff --git a/drivers/mmc/host/cqhci.h b/drivers/mmc/host/cqhci.h<br/>index 9e68286a07b4..1e8e01d81015 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/cqhci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/cqhci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/cqhci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/cqhci.h</a></div><div class='hunk'>@@ -88,6 +88,7 @@</div><div class='ctx'> </div><div class='ctx'> /* send status config 1 */</div><div class='ctx'> #define CQHCI_SSC1			0x40</div><div class='add'>+#define CQHCI_SSC1_CBC_MASK		GENMASK(19, 16)</div><div class='ctx'> </div><div class='ctx'> /* send status config 2 */</div><div class='ctx'> #define CQHCI_SSC2			0x44</div><div class='hunk'>@@ -147,6 +148,7 @@</div><div class='ctx'> </div><div class='ctx'> struct cqhci_host_ops;</div><div class='ctx'> struct mmc_host;</div><div class='add'>+struct mmc_request;</div><div class='ctx'> struct cqhci_slot;</div><div class='ctx'> </div><div class='ctx'> struct cqhci_host {</div><div class='hunk'>@@ -210,6 +212,8 @@ struct cqhci_host_ops {</div><div class='ctx'> 	u32 (*read_l)(struct cqhci_host *host, int reg);</div><div class='ctx'> 	void (*enable)(struct mmc_host *mmc);</div><div class='ctx'> 	void (*disable)(struct mmc_host *mmc, bool recovery);</div><div class='add'>+	void (*update_dcmd_desc)(struct mmc_host *mmc, struct mmc_request *mrq,</div><div class='add'>+				 u64 *data);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void cqhci_writel(struct cqhci_host *host, u32 val, int reg)</div><div class='head'>diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c<br/>index 49e0daf2ef5e..f37003df1e01 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/davinci_mmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/davinci_mmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/davinci_mmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/davinci_mmc.c</a></div><div class='hunk'>@@ -1117,7 +1117,7 @@ static inline void mmc_davinci_cpufreq_deregister(struct mmc_davinci_host *host)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-static void __init init_mmcsd_host(struct mmc_davinci_host *host)</div><div class='add'>+static void init_mmcsd_host(struct mmc_davinci_host *host)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	mmc_davinci_reset_ctrl(host, 1);</div><div class='head'>diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c<br/>index 2eba507790e4..c5a8af4ca76b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/meson-gx-mmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/meson-gx-mmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/meson-gx-mmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/meson-gx-mmc.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/init.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='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #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/ioport.h&gt;</div><div class='hunk'>@@ -48,6 +49,8 @@</div><div class='ctx'> #define   CLK_CORE_PHASE_MASK GENMASK(9, 8)</div><div class='ctx'> #define   CLK_TX_PHASE_MASK GENMASK(11, 10)</div><div class='ctx'> #define   CLK_RX_PHASE_MASK GENMASK(13, 12)</div><div class='add'>+#define   CLK_PHASE_0 0</div><div class='add'>+#define   CLK_PHASE_180 2</div><div class='ctx'> #define   CLK_V2_TX_DELAY_MASK GENMASK(19, 16)</div><div class='ctx'> #define   CLK_V2_RX_DELAY_MASK GENMASK(23, 20)</div><div class='ctx'> #define   CLK_V2_ALWAYS_ON BIT(24)</div><div class='hunk'>@@ -56,10 +59,6 @@</div><div class='ctx'> #define   CLK_V3_RX_DELAY_MASK GENMASK(27, 22)</div><div class='ctx'> #define   CLK_V3_ALWAYS_ON BIT(28)</div><div class='ctx'> </div><div class='del'>-#define   CLK_DELAY_STEP_PS 200</div><div class='del'>-#define   CLK_PHASE_STEP 30</div><div class='del'>-#define   CLK_PHASE_POINT_NUM (360 / CLK_PHASE_STEP)</div><div class='del'>-</div><div class='ctx'> #define   CLK_TX_DELAY_MASK(h)		(h-&gt;data-&gt;tx_delay_mask)</div><div class='ctx'> #define   CLK_RX_DELAY_MASK(h)		(h-&gt;data-&gt;rx_delay_mask)</div><div class='ctx'> #define   CLK_ALWAYS_ON(h)		(h-&gt;data-&gt;always_on)</div><div class='hunk'>@@ -164,10 +163,10 @@ struct meson_host {</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	struct clk *core_clk;</div><div class='add'>+	struct clk *mux_clk;</div><div class='ctx'> 	struct clk *mmc_clk;</div><div class='del'>-	struct clk *rx_clk;</div><div class='del'>-	struct clk *tx_clk;</div><div class='ctx'> 	unsigned long req_rate;</div><div class='add'>+	bool ddr;</div><div class='ctx'> </div><div class='ctx'> 	struct pinctrl *pinctrl;</div><div class='ctx'> 	struct pinctrl_state *pins_default;</div><div class='hunk'>@@ -207,90 +206,6 @@ struct meson_host {</div><div class='ctx'> #define CMD_RESP_MASK GENMASK(31, 1)</div><div class='ctx'> #define CMD_RESP_SRAM BIT(0)</div><div class='ctx'> </div><div class='del'>-struct meson_mmc_phase {</div><div class='del'>-	struct clk_hw hw;</div><div class='del'>-	void __iomem *reg;</div><div class='del'>-	unsigned long phase_mask;</div><div class='del'>-	unsigned long delay_mask;</div><div class='del'>-	unsigned int delay_step_ps;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define to_meson_mmc_phase(_hw) container_of(_hw, struct meson_mmc_phase, hw)</div><div class='del'>-</div><div class='del'>-static int meson_mmc_clk_get_phase(struct clk_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct meson_mmc_phase *mmc = to_meson_mmc_phase(hw);</div><div class='del'>-	unsigned int phase_num = 1 &lt;&lt;  hweight_long(mmc-&gt;phase_mask);</div><div class='del'>-	unsigned long period_ps, p, d;</div><div class='del'>-		int degrees;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = readl(mmc-&gt;reg);</div><div class='del'>-	p = (val &amp; mmc-&gt;phase_mask) &gt;&gt; __ffs(mmc-&gt;phase_mask);</div><div class='del'>-	degrees = p * 360 / phase_num;</div><div class='del'>-</div><div class='del'>-	if (mmc-&gt;delay_mask) {</div><div class='del'>-		period_ps = DIV_ROUND_UP((unsigned long)NSEC_PER_SEC * 1000,</div><div class='del'>-					 clk_get_rate(hw-&gt;clk));</div><div class='del'>-		d = (val &amp; mmc-&gt;delay_mask) &gt;&gt; __ffs(mmc-&gt;delay_mask);</div><div class='del'>-		degrees += d * mmc-&gt;delay_step_ps * 360 / period_ps;</div><div class='del'>-		degrees %= 360;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return degrees;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void meson_mmc_apply_phase_delay(struct meson_mmc_phase *mmc,</div><div class='del'>-					unsigned int phase,</div><div class='del'>-					unsigned int delay)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = readl(mmc-&gt;reg);</div><div class='del'>-	val &amp;= ~mmc-&gt;phase_mask;</div><div class='del'>-	val |= phase &lt;&lt; __ffs(mmc-&gt;phase_mask);</div><div class='del'>-</div><div class='del'>-	if (mmc-&gt;delay_mask) {</div><div class='del'>-		val &amp;= ~mmc-&gt;delay_mask;</div><div class='del'>-		val |= delay &lt;&lt; __ffs(mmc-&gt;delay_mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	writel(val, mmc-&gt;reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int meson_mmc_clk_set_phase(struct clk_hw *hw, int degrees)</div><div class='del'>-{</div><div class='del'>-	struct meson_mmc_phase *mmc = to_meson_mmc_phase(hw);</div><div class='del'>-	unsigned int phase_num = 1 &lt;&lt;  hweight_long(mmc-&gt;phase_mask);</div><div class='del'>-	unsigned long period_ps, d = 0, r;</div><div class='del'>-	uint64_t p;</div><div class='del'>-</div><div class='del'>-	p = degrees % 360;</div><div class='del'>-</div><div class='del'>-	if (!mmc-&gt;delay_mask) {</div><div class='del'>-		p = DIV_ROUND_CLOSEST_ULL(p, 360 / phase_num);</div><div class='del'>-	} else {</div><div class='del'>-		period_ps = DIV_ROUND_UP((unsigned long)NSEC_PER_SEC * 1000,</div><div class='del'>-					 clk_get_rate(hw-&gt;clk));</div><div class='del'>-</div><div class='del'>-		/* First compute the phase index (p), the remainder (r) is the</div><div class='del'>-		 * part we'll try to acheive using the delays (d).</div><div class='del'>-		 */</div><div class='del'>-		r = do_div(p, 360 / phase_num);</div><div class='del'>-		d = DIV_ROUND_CLOSEST(r * period_ps,</div><div class='del'>-				      360 * mmc-&gt;delay_step_ps);</div><div class='del'>-		d = min(d, mmc-&gt;delay_mask &gt;&gt; __ffs(mmc-&gt;delay_mask));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	meson_mmc_apply_phase_delay(mmc, p, d);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct clk_ops meson_mmc_clk_phase_ops = {</div><div class='del'>-	.get_phase = meson_mmc_clk_get_phase,</div><div class='del'>-	.set_phase = meson_mmc_clk_set_phase,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static unsigned int meson_mmc_get_timeout_msecs(struct mmc_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int timeout = data-&gt;timeout_ns / NSEC_PER_MSEC;</div><div class='hunk'>@@ -383,16 +298,6 @@ static void meson_mmc_post_req(struct mmc_host *mmc, struct mmc_request *mrq,</div><div class='ctx'> 			     mmc_get_dma_dir(data));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool meson_mmc_timing_is_ddr(struct mmc_ios *ios)</div><div class='del'>-{</div><div class='del'>-	if (ios-&gt;timing == MMC_TIMING_MMC_DDR52 ||</div><div class='del'>-	    ios-&gt;timing == MMC_TIMING_UHS_DDR50 ||</div><div class='del'>-	    ios-&gt;timing == MMC_TIMING_MMC_HS400)</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='ctx'> /*</div><div class='ctx'>  * Gating the clock on this controller is tricky.  It seems the mmc clock</div><div class='ctx'>  * is also used by the controller.  It may crash during some operation if the</div><div class='hunk'>@@ -429,36 +334,41 @@ static void meson_mmc_clk_ungate(struct meson_host *host)</div><div class='ctx'> 	writel(cfg, host-&gt;regs + SD_EMMC_CFG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int meson_mmc_clk_set(struct meson_host *host, struct mmc_ios *ios)</div><div class='add'>+static int meson_mmc_clk_set(struct meson_host *host, unsigned long rate,</div><div class='add'>+			     bool ddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_host *mmc = host-&gt;mmc;</div><div class='del'>-	unsigned long rate = ios-&gt;clock;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 cfg;</div><div class='ctx'> </div><div class='del'>-	/* DDR modes require higher module clock */</div><div class='del'>-	if (meson_mmc_timing_is_ddr(ios))</div><div class='del'>-		rate &lt;&lt;= 1;</div><div class='del'>-</div><div class='ctx'> 	/* Same request - bail-out */</div><div class='del'>-	if (host-&gt;req_rate == rate)</div><div class='add'>+	if (host-&gt;ddr == ddr &amp;&amp; host-&gt;req_rate == rate)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* stop clock */</div><div class='ctx'> 	meson_mmc_clk_gate(host);</div><div class='ctx'> 	host-&gt;req_rate = 0;</div><div class='add'>+	mmc-&gt;actual_clock = 0;</div><div class='ctx'> </div><div class='del'>-	if (!rate) {</div><div class='del'>-		mmc-&gt;actual_clock = 0;</div><div class='del'>-		/* return with clock being stopped */</div><div class='add'>+	/* return with clock being stopped */</div><div class='add'>+	if (!rate)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the clock during rate change to avoid glitches */</div><div class='ctx'> 	cfg = readl(host-&gt;regs + SD_EMMC_CFG);</div><div class='ctx'> 	cfg |= CFG_STOP_CLOCK;</div><div class='ctx'> 	writel(cfg, host-&gt;regs + SD_EMMC_CFG);</div><div class='ctx'> </div><div class='add'>+	if (ddr) {</div><div class='add'>+		/* DDR modes require higher module clock */</div><div class='add'>+		rate &lt;&lt;= 1;</div><div class='add'>+		cfg |= CFG_DDR;</div><div class='add'>+	} else {</div><div class='add'>+		cfg &amp;= ~CFG_DDR;</div><div class='add'>+	}</div><div class='add'>+	writel(cfg, host-&gt;regs + SD_EMMC_CFG);</div><div class='add'>+	host-&gt;ddr = ddr;</div><div class='add'>+</div><div class='ctx'> 	ret = clk_set_rate(host-&gt;mmc_clk, rate);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(host-&gt;dev, "Unable to set cfg_div_clk to %lu. ret=%d\n",</div><div class='hunk'>@@ -470,12 +380,14 @@ static int meson_mmc_clk_set(struct meson_host *host, struct mmc_ios *ios)</div><div class='ctx'> 	mmc-&gt;actual_clock = clk_get_rate(host-&gt;mmc_clk);</div><div class='ctx'> </div><div class='ctx'> 	/* We should report the real output frequency of the controller */</div><div class='del'>-	if (meson_mmc_timing_is_ddr(ios))</div><div class='add'>+	if (ddr) {</div><div class='add'>+		host-&gt;req_rate &gt;&gt;= 1;</div><div class='ctx'> 		mmc-&gt;actual_clock &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(host-&gt;dev, "clk rate: %u Hz\n", mmc-&gt;actual_clock);</div><div class='del'>-	if (ios-&gt;clock != mmc-&gt;actual_clock)</div><div class='del'>-		dev_dbg(host-&gt;dev, "requested rate was %u\n", ios-&gt;clock);</div><div class='add'>+	if (rate != mmc-&gt;actual_clock)</div><div class='add'>+		dev_dbg(host-&gt;dev, "requested rate was %lu\n", rate);</div><div class='ctx'> </div><div class='ctx'> 	/* (re)start clock */</div><div class='ctx'> 	meson_mmc_clk_ungate(host);</div><div class='hunk'>@@ -493,8 +405,6 @@ static int meson_mmc_clk_init(struct meson_host *host)</div><div class='ctx'> 	struct clk_init_data init;</div><div class='ctx'> 	struct clk_mux *mux;</div><div class='ctx'> 	struct clk_divider *div;</div><div class='del'>-	struct meson_mmc_phase *core, *tx, *rx;</div><div class='del'>-	struct clk *clk;</div><div class='ctx'> 	char clk_name[32];</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> 	const char *mux_parent_names[MUX_CLK_NUM_PARENTS];</div><div class='hunk'>@@ -502,9 +412,11 @@ static int meson_mmc_clk_init(struct meson_host *host)</div><div class='ctx'> 	u32 clk_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */</div><div class='del'>-	clk_reg = 0;</div><div class='del'>-	clk_reg |= CLK_ALWAYS_ON(host);</div><div class='add'>+	clk_reg = CLK_ALWAYS_ON(host);</div><div class='ctx'> 	clk_reg |= CLK_DIV_MASK;</div><div class='add'>+	clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, CLK_PHASE_180);</div><div class='add'>+	clk_reg |= FIELD_PREP(CLK_TX_PHASE_MASK, CLK_PHASE_0);</div><div class='add'>+	clk_reg |= FIELD_PREP(CLK_RX_PHASE_MASK, CLK_PHASE_0);</div><div class='ctx'> 	writel(clk_reg, host-&gt;regs + SD_EMMC_CLOCK);</div><div class='ctx'> </div><div class='ctx'> 	/* get the mux parents */</div><div class='hunk'>@@ -540,9 +452,9 @@ static int meson_mmc_clk_init(struct meson_host *host)</div><div class='ctx'> 	mux-&gt;mask = CLK_SRC_MASK &gt;&gt; mux-&gt;shift;</div><div class='ctx'> 	mux-&gt;hw.init = &amp;init;</div><div class='ctx'> </div><div class='del'>-	clk = devm_clk_register(host-&gt;dev, &amp;mux-&gt;hw);</div><div class='del'>-	if (WARN_ON(IS_ERR(clk)))</div><div class='del'>-		return PTR_ERR(clk);</div><div class='add'>+	host-&gt;mux_clk = devm_clk_register(host-&gt;dev, &amp;mux-&gt;hw);</div><div class='add'>+	if (WARN_ON(IS_ERR(host-&gt;mux_clk)))</div><div class='add'>+		return PTR_ERR(host-&gt;mux_clk);</div><div class='ctx'> </div><div class='ctx'> 	/* create the divider */</div><div class='ctx'> 	div = devm_kzalloc(host-&gt;dev, sizeof(*div), GFP_KERNEL);</div><div class='hunk'>@@ -553,7 +465,7 @@ static int meson_mmc_clk_init(struct meson_host *host)</div><div class='ctx'> 	init.name = clk_name;</div><div class='ctx'> 	init.ops = &amp;clk_divider_ops;</div><div class='ctx'> 	init.flags = CLK_SET_RATE_PARENT;</div><div class='del'>-	clk_parent[0] = __clk_get_name(clk);</div><div class='add'>+	clk_parent[0] = __clk_get_name(host-&gt;mux_clk);</div><div class='ctx'> 	init.parent_names = clk_parent;</div><div class='ctx'> 	init.num_parents = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -563,190 +475,104 @@ static int meson_mmc_clk_init(struct meson_host *host)</div><div class='ctx'> 	div-&gt;hw.init = &amp;init;</div><div class='ctx'> 	div-&gt;flags = CLK_DIVIDER_ONE_BASED;</div><div class='ctx'> </div><div class='del'>-	clk = devm_clk_register(host-&gt;dev, &amp;div-&gt;hw);</div><div class='del'>-	if (WARN_ON(IS_ERR(clk)))</div><div class='del'>-		return PTR_ERR(clk);</div><div class='del'>-</div><div class='del'>-	/* create the mmc core clock */</div><div class='del'>-	core = devm_kzalloc(host-&gt;dev, sizeof(*core), GFP_KERNEL);</div><div class='del'>-	if (!core)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	snprintf(clk_name, sizeof(clk_name), "%s#core", dev_name(host-&gt;dev));</div><div class='del'>-	init.name = clk_name;</div><div class='del'>-	init.ops = &amp;meson_mmc_clk_phase_ops;</div><div class='del'>-	init.flags = CLK_SET_RATE_PARENT;</div><div class='del'>-	clk_parent[0] = __clk_get_name(clk);</div><div class='del'>-	init.parent_names = clk_parent;</div><div class='del'>-	init.num_parents = 1;</div><div class='del'>-</div><div class='del'>-	core-&gt;reg = host-&gt;regs + SD_EMMC_CLOCK;</div><div class='del'>-	core-&gt;phase_mask = CLK_CORE_PHASE_MASK;</div><div class='del'>-	core-&gt;hw.init = &amp;init;</div><div class='del'>-</div><div class='del'>-	host-&gt;mmc_clk = devm_clk_register(host-&gt;dev, &amp;core-&gt;hw);</div><div class='del'>-	if (WARN_ON(PTR_ERR_OR_ZERO(host-&gt;mmc_clk)))</div><div class='add'>+	host-&gt;mmc_clk = devm_clk_register(host-&gt;dev, &amp;div-&gt;hw);</div><div class='add'>+	if (WARN_ON(IS_ERR(host-&gt;mmc_clk)))</div><div class='ctx'> 		return PTR_ERR(host-&gt;mmc_clk);</div><div class='ctx'> </div><div class='del'>-	/* create the mmc tx clock */</div><div class='del'>-	tx = devm_kzalloc(host-&gt;dev, sizeof(*tx), GFP_KERNEL);</div><div class='del'>-	if (!tx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	snprintf(clk_name, sizeof(clk_name), "%s#tx", dev_name(host-&gt;dev));</div><div class='del'>-	init.name = clk_name;</div><div class='del'>-	init.ops = &amp;meson_mmc_clk_phase_ops;</div><div class='del'>-	init.flags = 0;</div><div class='del'>-	clk_parent[0] = __clk_get_name(host-&gt;mmc_clk);</div><div class='del'>-	init.parent_names = clk_parent;</div><div class='del'>-	init.num_parents = 1;</div><div class='del'>-</div><div class='del'>-	tx-&gt;reg = host-&gt;regs + SD_EMMC_CLOCK;</div><div class='del'>-	tx-&gt;phase_mask = CLK_TX_PHASE_MASK;</div><div class='del'>-	tx-&gt;delay_mask = CLK_TX_DELAY_MASK(host);</div><div class='del'>-	tx-&gt;delay_step_ps = CLK_DELAY_STEP_PS;</div><div class='del'>-	tx-&gt;hw.init = &amp;init;</div><div class='del'>-</div><div class='del'>-	host-&gt;tx_clk = devm_clk_register(host-&gt;dev, &amp;tx-&gt;hw);</div><div class='del'>-	if (WARN_ON(PTR_ERR_OR_ZERO(host-&gt;tx_clk)))</div><div class='del'>-		return PTR_ERR(host-&gt;tx_clk);</div><div class='del'>-</div><div class='del'>-	/* create the mmc rx clock */</div><div class='del'>-	rx = devm_kzalloc(host-&gt;dev, sizeof(*rx), GFP_KERNEL);</div><div class='del'>-	if (!rx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	snprintf(clk_name, sizeof(clk_name), "%s#rx", dev_name(host-&gt;dev));</div><div class='del'>-	init.name = clk_name;</div><div class='del'>-	init.ops = &amp;meson_mmc_clk_phase_ops;</div><div class='del'>-	init.flags = 0;</div><div class='del'>-	clk_parent[0] = __clk_get_name(host-&gt;mmc_clk);</div><div class='del'>-	init.parent_names = clk_parent;</div><div class='del'>-	init.num_parents = 1;</div><div class='del'>-</div><div class='del'>-	rx-&gt;reg = host-&gt;regs + SD_EMMC_CLOCK;</div><div class='del'>-	rx-&gt;phase_mask = CLK_RX_PHASE_MASK;</div><div class='del'>-	rx-&gt;delay_mask = CLK_RX_DELAY_MASK(host);</div><div class='del'>-	rx-&gt;delay_step_ps = CLK_DELAY_STEP_PS;</div><div class='del'>-	rx-&gt;hw.init = &amp;init;</div><div class='del'>-</div><div class='del'>-	host-&gt;rx_clk = devm_clk_register(host-&gt;dev, &amp;rx-&gt;hw);</div><div class='del'>-	if (WARN_ON(PTR_ERR_OR_ZERO(host-&gt;rx_clk)))</div><div class='del'>-		return PTR_ERR(host-&gt;rx_clk);</div><div class='del'>-</div><div class='ctx'> 	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */</div><div class='ctx'> 	host-&gt;mmc-&gt;f_min = clk_round_rate(host-&gt;mmc_clk, 400000);</div><div class='ctx'> 	ret = clk_set_rate(host-&gt;mmc_clk, host-&gt;mmc-&gt;f_min);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	clk_set_phase(host-&gt;mmc_clk, 180);</div><div class='del'>-	clk_set_phase(host-&gt;tx_clk, 0);</div><div class='del'>-	clk_set_phase(host-&gt;rx_clk, 0);</div><div class='del'>-</div><div class='ctx'> 	return clk_prepare_enable(host-&gt;mmc_clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void meson_mmc_shift_map(unsigned long *map, unsigned long shift)</div><div class='add'>+static void meson_mmc_disable_resampling(struct meson_host *host)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_BITMAP(left, CLK_PHASE_POINT_NUM);</div><div class='del'>-	DECLARE_BITMAP(right, CLK_PHASE_POINT_NUM);</div><div class='add'>+	unsigned int val = readl(host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * shift the bitmap right and reintroduce the dropped bits on the left</div><div class='del'>-	 * of the bitmap</div><div class='del'>-	 */</div><div class='del'>-	bitmap_shift_right(right, map, shift, CLK_PHASE_POINT_NUM);</div><div class='del'>-	bitmap_shift_left(left, map, CLK_PHASE_POINT_NUM - shift,</div><div class='del'>-			  CLK_PHASE_POINT_NUM);</div><div class='del'>-	bitmap_or(map, left, right, CLK_PHASE_POINT_NUM);</div><div class='add'>+	val &amp;= ~ADJUST_ADJ_EN;</div><div class='add'>+	writel(val, host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void meson_mmc_find_next_region(unsigned long *map,</div><div class='del'>-				       unsigned long *start,</div><div class='del'>-				       unsigned long *stop)</div><div class='add'>+static void meson_mmc_reset_resampling(struct meson_host *host)</div><div class='ctx'> {</div><div class='del'>-	*start = find_next_bit(map, CLK_PHASE_POINT_NUM, *start);</div><div class='del'>-	*stop = find_next_zero_bit(map, CLK_PHASE_POINT_NUM, *start);</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	meson_mmc_disable_resampling(host);</div><div class='add'>+</div><div class='add'>+	val = readl(host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='add'>+	val &amp;= ~ADJUST_ADJ_DELAY_MASK;</div><div class='add'>+	writel(val, host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int meson_mmc_find_tuning_point(unsigned long *test)</div><div class='add'>+static int meson_mmc_resampling_tuning(struct mmc_host *mmc, u32 opcode)</div><div class='ctx'> {</div><div class='del'>-	unsigned long shift, stop, offset = 0, start = 0, size = 0;</div><div class='add'>+	struct meson_host *host = mmc_priv(mmc);</div><div class='add'>+	unsigned int val, dly, max_dly, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Get the all good/all bad situation out the way */</div><div class='del'>-	if (bitmap_full(test, CLK_PHASE_POINT_NUM))</div><div class='del'>-		return 0; /* All points are good so point 0 will do */</div><div class='del'>-	else if (bitmap_empty(test, CLK_PHASE_POINT_NUM))</div><div class='del'>-		return -EIO; /* No successful tuning point */</div><div class='add'>+	/* Resampling is done using the source clock */</div><div class='add'>+	max_dly = DIV_ROUND_UP(clk_get_rate(host-&gt;mux_clk),</div><div class='add'>+			       clk_get_rate(host-&gt;mmc_clk));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now we know there is a least one region find. Make sure it does</div><div class='del'>-	 * not wrap by the shifting the bitmap if necessary</div><div class='del'>-	 */</div><div class='del'>-	shift = find_first_zero_bit(test, CLK_PHASE_POINT_NUM);</div><div class='del'>-	if (shift != 0)</div><div class='del'>-		meson_mmc_shift_map(test, shift);</div><div class='add'>+	val = readl(host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='add'>+	val |= ADJUST_ADJ_EN;</div><div class='add'>+	writel(val, host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='ctx'> </div><div class='del'>-	while (start &lt; CLK_PHASE_POINT_NUM) {</div><div class='del'>-		meson_mmc_find_next_region(test, &amp;start, &amp;stop);</div><div class='add'>+	if (mmc-&gt;doing_retune)</div><div class='add'>+		dly = FIELD_GET(ADJUST_ADJ_DELAY_MASK, val) + 1;</div><div class='add'>+	else</div><div class='add'>+		dly = 0;</div><div class='ctx'> </div><div class='del'>-		if ((stop - start) &gt; size) {</div><div class='del'>-			offset = start;</div><div class='del'>-			size = stop - start;</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; max_dly; i++) {</div><div class='add'>+		val &amp;= ~ADJUST_ADJ_DELAY_MASK;</div><div class='add'>+		val |= FIELD_PREP(ADJUST_ADJ_DELAY_MASK, (dly + i) % max_dly);</div><div class='add'>+		writel(val, host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='ctx'> </div><div class='del'>-		start = stop;</div><div class='add'>+		ret = mmc_send_tuning(mmc, opcode, NULL);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			dev_dbg(mmc_dev(mmc), "resampling delay: %u\n",</div><div class='add'>+				(dly + i) % max_dly);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get the center point of the region */</div><div class='del'>-	offset += (size / 2);</div><div class='del'>-</div><div class='del'>-	/* Shift the result back */</div><div class='del'>-	offset = (offset + shift) % CLK_PHASE_POINT_NUM;</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='add'>+	meson_mmc_reset_resampling(host);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int meson_mmc_clk_phase_tuning(struct mmc_host *mmc, u32 opcode,</div><div class='del'>-				      struct clk *clk)</div><div class='add'>+static int meson_mmc_prepare_ios_clock(struct meson_host *host,</div><div class='add'>+				       struct mmc_ios *ios)</div><div class='ctx'> {</div><div class='del'>-	int point, ret;</div><div class='del'>-	DECLARE_BITMAP(test, CLK_PHASE_POINT_NUM);</div><div class='add'>+	bool ddr;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(mmc_dev(mmc), "%s phase/delay tunning...\n",</div><div class='del'>-		__clk_get_name(clk));</div><div class='del'>-	bitmap_zero(test, CLK_PHASE_POINT_NUM);</div><div class='add'>+	switch (ios-&gt;timing) {</div><div class='add'>+	case MMC_TIMING_MMC_DDR52:</div><div class='add'>+	case MMC_TIMING_UHS_DDR50:</div><div class='add'>+		ddr = true;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	/* Explore tuning points */</div><div class='del'>-	for (point = 0; point &lt; CLK_PHASE_POINT_NUM; point++) {</div><div class='del'>-		clk_set_phase(clk, point * CLK_PHASE_STEP);</div><div class='del'>-		ret = mmc_send_tuning(mmc, opcode, NULL);</div><div class='del'>-		if (!ret)</div><div class='del'>-			set_bit(point, test);</div><div class='add'>+	default:</div><div class='add'>+		ddr = false;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Find the optimal tuning point and apply it */</div><div class='del'>-	point = meson_mmc_find_tuning_point(test);</div><div class='del'>-	if (point &lt; 0)</div><div class='del'>-		return point; /* tuning failed */</div><div class='del'>-</div><div class='del'>-	clk_set_phase(clk, point * CLK_PHASE_STEP);</div><div class='del'>-	dev_dbg(mmc_dev(mmc), "success with phase: %d\n",</div><div class='del'>-		clk_get_phase(clk));</div><div class='del'>-	return 0;</div><div class='add'>+	return meson_mmc_clk_set(host, ios-&gt;clock, ddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int meson_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)</div><div class='add'>+static void meson_mmc_check_resampling(struct meson_host *host,</div><div class='add'>+				       struct mmc_ios *ios)</div><div class='ctx'> {</div><div class='del'>-	struct meson_host *host = mmc_priv(mmc);</div><div class='del'>-	int adj = 0;</div><div class='del'>-</div><div class='del'>-	/* enable signal resampling w/o delay */</div><div class='del'>-	adj = ADJUST_ADJ_EN;</div><div class='del'>-	writel(adj, host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='del'>-</div><div class='del'>-	return meson_mmc_clk_phase_tuning(mmc, opcode, host-&gt;rx_clk);</div><div class='add'>+	switch (ios-&gt;timing) {</div><div class='add'>+	case MMC_TIMING_LEGACY:</div><div class='add'>+	case MMC_TIMING_MMC_HS:</div><div class='add'>+	case MMC_TIMING_SD_HS:</div><div class='add'>+	case MMC_TIMING_MMC_DDR52:</div><div class='add'>+		meson_mmc_disable_resampling(host);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='hunk'>@@ -775,12 +601,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 		if (!IS_ERR(mmc-&gt;supply.vmmc))</div><div class='ctx'> 			mmc_regulator_set_ocr(mmc, mmc-&gt;supply.vmmc, ios-&gt;vdd);</div><div class='ctx'> </div><div class='del'>-		/* disable signal resampling */</div><div class='del'>-		writel(0, host-&gt;regs + host-&gt;data-&gt;adjust);</div><div class='del'>-</div><div class='del'>-		/* Reset rx phase */</div><div class='del'>-		clk_set_phase(host-&gt;rx_clk, 0);</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MMC_POWER_ON:</div><div class='hunk'>@@ -817,20 +637,13 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	val = readl(host-&gt;regs + SD_EMMC_CFG);</div><div class='ctx'> 	val &amp;= ~CFG_BUS_WIDTH_MASK;</div><div class='ctx'> 	val |= FIELD_PREP(CFG_BUS_WIDTH_MASK, bus_width);</div><div class='add'>+	writel(val, host-&gt;regs + SD_EMMC_CFG);</div><div class='ctx'> </div><div class='del'>-	val &amp;= ~CFG_DDR;</div><div class='del'>-	if (meson_mmc_timing_is_ddr(ios))</div><div class='del'>-		val |= CFG_DDR;</div><div class='del'>-</div><div class='del'>-	val &amp;= ~CFG_CHK_DS;</div><div class='del'>-	if (ios-&gt;timing == MMC_TIMING_MMC_HS400)</div><div class='del'>-		val |= CFG_CHK_DS;</div><div class='del'>-</div><div class='del'>-	err = meson_mmc_clk_set(host, ios);</div><div class='add'>+	meson_mmc_check_resampling(host, ios);</div><div class='add'>+	err = meson_mmc_prepare_ios_clock(host, ios);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		dev_err(host-&gt;dev, "Failed to set clock: %d\n,", err);</div><div class='ctx'> </div><div class='del'>-	writel(val, host-&gt;regs + SD_EMMC_CFG);</div><div class='ctx'> 	dev_dbg(host-&gt;dev, "SD_EMMC_CFG:  0x%08x\n", val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1081,9 +894,6 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	/* ack all enabled interrupts */</div><div class='del'>-	writel(irq_en, host-&gt;regs + SD_EMMC_STATUS);</div><div class='del'>-</div><div class='ctx'> 	if (cmd-&gt;error) {</div><div class='ctx'> 		/* Stop desc in case of errors */</div><div class='ctx'> 		u32 start = readl(host-&gt;regs + SD_EMMC_START);</div><div class='hunk'>@@ -1095,12 +905,14 @@ out:</div><div class='ctx'> 	if (ret == IRQ_HANDLED)</div><div class='ctx'> 		meson_mmc_request_done(host-&gt;mmc, cmd-&gt;mrq);</div><div class='ctx'> </div><div class='add'>+	/* ack all raised interrupts */</div><div class='add'>+	writel(status, host-&gt;regs + SD_EMMC_STATUS);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int meson_mmc_wait_desc_stop(struct meson_host *host)</div><div class='ctx'> {</div><div class='del'>-	int loop;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1110,20 +922,10 @@ static int meson_mmc_wait_desc_stop(struct meson_host *host)</div><div class='ctx'> 	 * If we don't confirm the descriptor is stopped, it might raise new</div><div class='ctx'> 	 * IRQs after we have called mmc_request_done() which is bad.</div><div class='ctx'> 	 */</div><div class='del'>-	for (loop = 50; loop; loop--) {</div><div class='del'>-		status = readl(host-&gt;regs + SD_EMMC_STATUS);</div><div class='del'>-		if (status &amp; (STATUS_BUSY | STATUS_DESC_BUSY))</div><div class='del'>-			udelay(100);</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status &amp; (STATUS_BUSY | STATUS_DESC_BUSY)) {</div><div class='del'>-		dev_err(host-&gt;dev, "Timed out waiting for host to stop\n");</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return readl_poll_timeout(host-&gt;regs + SD_EMMC_STATUS, status,</div><div class='add'>+				  !(status &amp; (STATUS_BUSY | STATUS_DESC_BUSY)),</div><div class='add'>+				  100, 5000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)</div><div class='hunk'>@@ -1227,7 +1029,7 @@ static const struct mmc_host_ops meson_mmc_ops = {</div><div class='ctx'> 	.get_cd         = meson_mmc_get_cd,</div><div class='ctx'> 	.pre_req	= meson_mmc_pre_req,</div><div class='ctx'> 	.post_req	= meson_mmc_post_req,</div><div class='del'>-	.execute_tuning = meson_mmc_execute_tuning,</div><div class='add'>+	.execute_tuning = meson_mmc_resampling_tuning,</div><div class='ctx'> 	.card_busy	= meson_mmc_card_busy,</div><div class='ctx'> 	.start_signal_voltage_switch = meson_mmc_voltage_switch,</div><div class='ctx'> };</div><div class='hunk'>@@ -1338,7 +1140,7 @@ static int meson_mmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	       host-&gt;regs + SD_EMMC_IRQ_EN);</div><div class='ctx'> </div><div class='ctx'> 	ret = request_threaded_irq(host-&gt;irq, meson_mmc_irq,</div><div class='del'>-				   meson_mmc_irq_thread, IRQF_SHARED,</div><div class='add'>+				   meson_mmc_irq_thread, IRQF_ONESHOT,</div><div class='ctx'> 				   dev_name(&amp;pdev-&gt;dev), host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_init_clk;</div><div class='hunk'>@@ -1349,6 +1151,13 @@ static int meson_mmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	mmc-&gt;max_segs = SD_EMMC_DESC_BUF_LEN / sizeof(struct sd_emmc_desc);</div><div class='ctx'> 	mmc-&gt;max_seg_size = mmc-&gt;max_req_size;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * At the moment, we don't know how to reliably enable HS400.</div><div class='add'>+	 * From the different datasheets, it is not even clear if this mode</div><div class='add'>+	 * is officially supported by any of the SoCs</div><div class='add'>+	 */</div><div class='add'>+	mmc-&gt;caps2 &amp;= ~MMC_CAP2_HS400;</div><div class='add'>+</div><div class='ctx'> 	/* data bounce buffer */</div><div class='ctx'> 	host-&gt;bounce_buf_size = mmc-&gt;max_req_size;</div><div class='ctx'> 	host-&gt;bounce_buf =</div><div class='head'>diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c<br/>index 1b1498805972..19544b121276 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmc_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmc_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmc_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mmc_spi.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- * mmc_spi.c - Access SD/MMC cards through SPI master controllers</div><div class='add'>+ * Access SD/MMC cards through SPI master controllers</div><div class='ctx'>  *</div><div class='ctx'>  * (C) Copyright 2005, Intec Automation,</div><div class='ctx'>  *		Mike Lavender (mike@steroidmicros)</div><div class='hunk'>@@ -8,21 +9,6 @@</div><div class='ctx'>  *		Hans-Peter Nilsson (hp@axis.com)</div><div class='ctx'>  * (C) Copyright 2007, ATRON electronic GmbH,</div><div class='ctx'>  *		Jan Nikitenko &lt;jan.nikitenko@gmail.com&gt;</div><div class='del'>- *</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, or</div><div class='del'>- * (at your option) any later version.</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -197,7 +183,7 @@ mmc_spi_readbytes(struct mmc_spi_host *host, unsigned len)</div><div class='ctx'> static int mmc_spi_skip(struct mmc_spi_host *host, unsigned long timeout,</div><div class='ctx'> 			unsigned n, u8 byte)</div><div class='ctx'> {</div><div class='del'>-	u8		*cp = host-&gt;data-&gt;status;</div><div class='add'>+	u8 *cp = host-&gt;data-&gt;status;</div><div class='ctx'> 	unsigned long start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -220,7 +206,7 @@ static int mmc_spi_skip(struct mmc_spi_host *host, unsigned long timeout,</div><div class='ctx'> 		 * We use jiffies here because we want to have a relation</div><div class='ctx'> 		 * between elapsed time and the blocking of the scheduler.</div><div class='ctx'> 		 */</div><div class='del'>-		if (time_is_before_jiffies(start+1))</div><div class='add'>+		if (time_is_before_jiffies(start + 1))</div><div class='ctx'> 			schedule();</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='hunk'>@@ -415,7 +401,7 @@ checkstatus:</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_dbg(&amp;host-&gt;spi-&gt;dev, "bad response type %04x\n",</div><div class='del'>-				mmc_spi_resp_type(cmd));</div><div class='add'>+			mmc_spi_resp_type(cmd));</div><div class='ctx'> 		if (value &gt;= 0)</div><div class='ctx'> 			value = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -467,8 +453,8 @@ mmc_spi_command_send(struct mmc_spi_host *host,</div><div class='ctx'> 	memset(cp, 0xff, sizeof(data-&gt;status));</div><div class='ctx'> </div><div class='ctx'> 	cp[1] = 0x40 | cmd-&gt;opcode;</div><div class='del'>-	put_unaligned_be32(cmd-&gt;arg, cp+2);</div><div class='del'>-	cp[6] = crc7_be(0, cp+1, 5) | 0x01;</div><div class='add'>+	put_unaligned_be32(cmd-&gt;arg, cp + 2);</div><div class='add'>+	cp[6] = crc7_be(0, cp + 1, 5) | 0x01;</div><div class='ctx'> 	cp += 7;</div><div class='ctx'> </div><div class='ctx'> 	/* Then, read up to 13 bytes (while writing all-ones):</div><div class='hunk'>@@ -642,9 +628,7 @@ mmc_spi_setup_data_message(</div><div class='ctx'> 	if (multiple || direction == DMA_TO_DEVICE) {</div><div class='ctx'> 		t = &amp;host-&gt;early_status;</div><div class='ctx'> 		memset(t, 0, sizeof(*t));</div><div class='del'>-		t-&gt;len = (direction == DMA_TO_DEVICE)</div><div class='del'>-				? sizeof(scratch-&gt;status)</div><div class='del'>-				: 1;</div><div class='add'>+		t-&gt;len = (direction == DMA_TO_DEVICE) ? sizeof(scratch-&gt;status) : 1;</div><div class='ctx'> 		t-&gt;tx_buf = host-&gt;ones;</div><div class='ctx'> 		t-&gt;tx_dma = host-&gt;ones_dma;</div><div class='ctx'> 		t-&gt;rx_buf = scratch-&gt;status;</div><div class='hunk'>@@ -677,8 +661,7 @@ mmc_spi_writeblock(struct mmc_spi_host *host, struct spi_transfer *t,</div><div class='ctx'> 	u32			pattern;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;mmc-&gt;use_spi_crc)</div><div class='del'>-		scratch-&gt;crc_val = cpu_to_be16(</div><div class='del'>-				crc_itu_t(0, t-&gt;tx_buf, t-&gt;len));</div><div class='add'>+		scratch-&gt;crc_val = cpu_to_be16(crc_itu_t(0, t-&gt;tx_buf, t-&gt;len));</div><div class='ctx'> 	if (host-&gt;dma_dev)</div><div class='ctx'> 		dma_sync_single_for_device(host-&gt;dma_dev,</div><div class='ctx'> 				host-&gt;data_dma, sizeof(*scratch),</div><div class='hunk'>@@ -819,6 +802,10 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = spi_sync_locked(spi, &amp;host-&gt;m);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "read error %d\n", status);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;dma_dev) {</div><div class='ctx'> 		dma_sync_single_for_cpu(host-&gt;dma_dev,</div><div class='hunk'>@@ -855,9 +842,9 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t,</div><div class='ctx'> </div><div class='ctx'> 		be16_to_cpus(&amp;scratch-&gt;crc_val);</div><div class='ctx'> 		if (scratch-&gt;crc_val != crc) {</div><div class='del'>-			dev_dbg(&amp;spi-&gt;dev, "read - crc error: crc_val=0x%04x, "</div><div class='del'>-					"computed=0x%04x len=%d\n",</div><div class='del'>-					scratch-&gt;crc_val, crc, t-&gt;len);</div><div class='add'>+			dev_dbg(&amp;spi-&gt;dev,</div><div class='add'>+				"read - crc error: crc_val=0x%04x, computed=0x%04x len=%d\n",</div><div class='add'>+				scratch-&gt;crc_val, crc, t-&gt;len);</div><div class='ctx'> 			return -EILSEQ;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -945,9 +932,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,</div><div class='ctx'> </div><div class='ctx'> 			dev_dbg(&amp;host-&gt;spi-&gt;dev,</div><div class='ctx'> 				"    mmc_spi: %s block, %d bytes\n",</div><div class='del'>-				(direction == DMA_TO_DEVICE)</div><div class='del'>-				? "write"</div><div class='del'>-				: "read",</div><div class='add'>+				(direction == DMA_TO_DEVICE) ? "write" : "read",</div><div class='ctx'> 				t-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 			if (direction == DMA_TO_DEVICE)</div><div class='hunk'>@@ -974,8 +959,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,</div><div class='ctx'> 		if (status &lt; 0) {</div><div class='ctx'> 			data-&gt;error = status;</div><div class='ctx'> 			dev_dbg(&amp;spi-&gt;dev, "%s status %d\n",</div><div class='del'>-				(direction == DMA_TO_DEVICE)</div><div class='del'>-					? "write" : "read",</div><div class='add'>+				(direction == DMA_TO_DEVICE) ? "write" : "read",</div><div class='ctx'> 				status);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1249,8 +1233,7 @@ static void mmc_spi_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 				mres = spi_setup(host-&gt;spi);</div><div class='ctx'> 				if (mres &lt; 0)</div><div class='ctx'> 					dev_dbg(&amp;host-&gt;spi-&gt;dev,</div><div class='del'>-						"switch back to SPI mode 3"</div><div class='del'>-						" failed\n");</div><div class='add'>+						"switch back to SPI mode 3 failed\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1470,7 +1453,7 @@ static int mmc_spi_probe(struct spi_device *spi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_add_host:</div><div class='del'>-	mmc_remove_host (mmc);</div><div class='add'>+	mmc_remove_host(mmc);</div><div class='ctx'> fail_glue_init:</div><div class='ctx'> 	if (host-&gt;dma_dev)</div><div class='ctx'> 		dma_unmap_single(host-&gt;dma_dev, host-&gt;data_dma,</div><div class='hunk'>@@ -1485,7 +1468,6 @@ fail_ones_dma:</div><div class='ctx'> fail_nobuf1:</div><div class='ctx'> 	mmc_free_host(mmc);</div><div class='ctx'> 	mmc_spi_put_pdata(spi);</div><div class='del'>-	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> nomem:</div><div class='ctx'> 	kfree(ones);</div><div class='hunk'>@@ -1496,32 +1478,27 @@ nomem:</div><div class='ctx'> static int mmc_spi_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_host		*mmc = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='del'>-	struct mmc_spi_host	*host;</div><div class='del'>-</div><div class='del'>-	if (mmc) {</div><div class='del'>-		host = mmc_priv(mmc);</div><div class='add'>+	struct mmc_spi_host	*host = mmc_priv(mmc);</div><div class='ctx'> </div><div class='del'>-		/* prevent new mmc_detect_change() calls */</div><div class='del'>-		if (host-&gt;pdata &amp;&amp; host-&gt;pdata-&gt;exit)</div><div class='del'>-			host-&gt;pdata-&gt;exit(&amp;spi-&gt;dev, mmc);</div><div class='add'>+	/* prevent new mmc_detect_change() calls */</div><div class='add'>+	if (host-&gt;pdata &amp;&amp; host-&gt;pdata-&gt;exit)</div><div class='add'>+		host-&gt;pdata-&gt;exit(&amp;spi-&gt;dev, mmc);</div><div class='ctx'> </div><div class='del'>-		mmc_remove_host(mmc);</div><div class='add'>+	mmc_remove_host(mmc);</div><div class='ctx'> </div><div class='del'>-		if (host-&gt;dma_dev) {</div><div class='del'>-			dma_unmap_single(host-&gt;dma_dev, host-&gt;ones_dma,</div><div class='del'>-				MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);</div><div class='del'>-			dma_unmap_single(host-&gt;dma_dev, host-&gt;data_dma,</div><div class='del'>-				sizeof(*host-&gt;data), DMA_BIDIRECTIONAL);</div><div class='del'>-		}</div><div class='add'>+	if (host-&gt;dma_dev) {</div><div class='add'>+		dma_unmap_single(host-&gt;dma_dev, host-&gt;ones_dma,</div><div class='add'>+			MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);</div><div class='add'>+		dma_unmap_single(host-&gt;dma_dev, host-&gt;data_dma,</div><div class='add'>+			sizeof(*host-&gt;data), DMA_BIDIRECTIONAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		kfree(host-&gt;data);</div><div class='del'>-		kfree(host-&gt;ones);</div><div class='add'>+	kfree(host-&gt;data);</div><div class='add'>+	kfree(host-&gt;ones);</div><div class='ctx'> </div><div class='del'>-		spi-&gt;max_speed_hz = mmc-&gt;f_max;</div><div class='del'>-		mmc_free_host(mmc);</div><div class='del'>-		mmc_spi_put_pdata(spi);</div><div class='del'>-		dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='del'>-	}</div><div class='add'>+	spi-&gt;max_speed_hz = mmc-&gt;f_max;</div><div class='add'>+	mmc_free_host(mmc);</div><div class='add'>+	mmc_spi_put_pdata(spi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1542,8 +1519,7 @@ static struct spi_driver mmc_spi_driver = {</div><div class='ctx'> </div><div class='ctx'> module_spi_driver(mmc_spi_driver);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Mike Lavender, David Brownell, "</div><div class='del'>-		"Hans-Peter Nilsson, Jan Nikitenko");</div><div class='add'>+MODULE_AUTHOR("Mike Lavender, David Brownell, Hans-Peter Nilsson, Jan Nikitenko");</div><div class='ctx'> MODULE_DESCRIPTION("SPI SD/MMC host driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("spi:mmc_spi");</div><div class='head'>diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c<br/>index 387ff14587b8..356833a606d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mmci.c</a></div><div class='hunk'>@@ -43,21 +43,11 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mmci.h"</div><div class='del'>-#include "mmci_qcom_dml.h"</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "mmci-pl18x"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DMA_ENGINE</div><div class='del'>-void mmci_variant_init(struct mmci_host *host);</div><div class='del'>-#else</div><div class='del'>-static inline void mmci_variant_init(struct mmci_host *host) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MMC_STM32_SDMMC</div><div class='del'>-void sdmmc_variant_init(struct mmci_host *host);</div><div class='del'>-#else</div><div class='del'>-static inline void sdmmc_variant_init(struct mmci_host *host) {}</div><div class='del'>-#endif</div><div class='add'>+static void mmci_variant_init(struct mmci_host *host);</div><div class='add'>+static void ux500v2_variant_init(struct mmci_host *host);</div><div class='ctx'> </div><div class='ctx'> static unsigned int fmax = 515633;</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +60,6 @@ static struct variant_data variant_arm = {</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.datalength_bits	= 16,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.pwrreg_powerup		= MCI_PWR_UP,</div><div class='ctx'> 	.f_max			= 100000000,</div><div class='ctx'> 	.reversed_irq_handling	= true,</div><div class='hunk'>@@ -90,7 +79,6 @@ static struct variant_data variant_arm_extended_fifo = {</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.datalength_bits	= 16,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.pwrreg_powerup		= MCI_PWR_UP,</div><div class='ctx'> 	.f_max			= 100000000,</div><div class='ctx'> 	.mmcimask1		= true,</div><div class='hunk'>@@ -110,7 +98,6 @@ static struct variant_data variant_arm_extended_fifo_hwfc = {</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.datalength_bits	= 16,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.pwrreg_powerup		= MCI_PWR_UP,</div><div class='ctx'> 	.f_max			= 100000000,</div><div class='ctx'> 	.mmcimask1		= true,</div><div class='hunk'>@@ -131,7 +118,6 @@ static struct variant_data variant_u300 = {</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.datalength_bits	= 16,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,</div><div class='ctx'> 	.st_sdio			= true,</div><div class='ctx'> 	.pwrreg_powerup		= MCI_PWR_ON,</div><div class='hunk'>@@ -157,7 +143,6 @@ static struct variant_data variant_nomadik = {</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.datalength_bits	= 24,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,</div><div class='ctx'> 	.st_sdio		= true,</div><div class='ctx'> 	.st_clkdiv		= true,</div><div class='hunk'>@@ -186,7 +171,6 @@ static struct variant_data variant_ux500 = {</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.datalength_bits	= 24,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,</div><div class='ctx'> 	.st_sdio		= true,</div><div class='ctx'> 	.st_clkdiv		= true,</div><div class='hunk'>@@ -220,11 +204,9 @@ static struct variant_data variant_ux500v2 = {</div><div class='ctx'> 	.datactrl_mask_ddrmode	= MCI_DPSM_ST_DDRMODE,</div><div class='ctx'> 	.datalength_bits	= 24,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,</div><div class='ctx'> 	.st_sdio		= true,</div><div class='ctx'> 	.st_clkdiv		= true,</div><div class='del'>-	.blksz_datactrl16	= true,</div><div class='ctx'> 	.pwrreg_powerup		= MCI_PWR_ON,</div><div class='ctx'> 	.f_max			= 100000000,</div><div class='ctx'> 	.signal_direction	= true,</div><div class='hunk'>@@ -238,7 +220,7 @@ static struct variant_data variant_ux500v2 = {</div><div class='ctx'> 	.irq_pio_mask		= MCI_IRQ_PIO_MASK,</div><div class='ctx'> 	.start_err		= MCI_STARTBITERR,</div><div class='ctx'> 	.opendrain		= MCI_OD,</div><div class='del'>-	.init			= mmci_variant_init,</div><div class='add'>+	.init			= ux500v2_variant_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct variant_data variant_stm32 = {</div><div class='hunk'>@@ -255,7 +237,6 @@ static struct variant_data variant_stm32 = {</div><div class='ctx'> 	.irq_pio_mask		= MCI_IRQ_PIO_MASK,</div><div class='ctx'> 	.datalength_bits	= 24,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,</div><div class='ctx'> 	.st_sdio		= true,</div><div class='ctx'> 	.st_clkdiv		= true,</div><div class='hunk'>@@ -299,10 +280,8 @@ static struct variant_data variant_qcom = {</div><div class='ctx'> 	.cmdreg_srsp_crc	= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.cmdreg_srsp		= MCI_CPSM_RESPONSE,</div><div class='ctx'> 	.data_cmd_enable	= MCI_CPSM_QCOM_DATCMD,</div><div class='del'>-	.blksz_datactrl4	= true,</div><div class='ctx'> 	.datalength_bits	= 24,</div><div class='ctx'> 	.datactrl_blocksz	= 11,</div><div class='del'>-	.datactrl_dpsm_enable	= MCI_DPSM_ENABLE,</div><div class='ctx'> 	.pwrreg_powerup		= MCI_PWR_UP,</div><div class='ctx'> 	.f_max			= 208000000,</div><div class='ctx'> 	.explicit_mclk_control	= true,</div><div class='hunk'>@@ -624,6 +603,16 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)</div><div class='ctx'> 	sg_miter_start(&amp;host-&gt;sg_miter, data-&gt;sg, data-&gt;sg_len, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 mmci_get_dctrl_cfg(struct mmci_host *host)</div><div class='add'>+{</div><div class='add'>+	return MCI_DPSM_ENABLE | mmci_dctrl_blksz(host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ux500v2_get_dctrl_cfg(struct mmci_host *host)</div><div class='add'>+{</div><div class='add'>+	return MCI_DPSM_ENABLE | (host-&gt;data-&gt;blksz &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * All the DMA operation mode stuff goes inside this ifdef.</div><div class='ctx'>  * This assumes that you have a generic DMA device interface,</div><div class='hunk'>@@ -886,15 +875,11 @@ int mmci_dmae_prep_data(struct mmci_host *host,</div><div class='ctx'> int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmci_dmae_priv *dmae = host-&gt;dma_priv;</div><div class='del'>-	struct mmc_data *data = host-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;dma_in_progress = true;</div><div class='ctx'> 	dmaengine_submit(dmae-&gt;desc_current);</div><div class='ctx'> 	dma_async_issue_pending(dmae-&gt;cur);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;variant-&gt;qcom_dml)</div><div class='del'>-		dml_start_xfer(host, data);</div><div class='del'>-</div><div class='ctx'> 	*datactrl |= MCI_DPSM_DMAENABLE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -952,6 +937,7 @@ void mmci_dmae_unprep_data(struct mmci_host *host,</div><div class='ctx'> static struct mmci_host_ops mmci_variant_ops = {</div><div class='ctx'> 	.prep_data = mmci_dmae_prep_data,</div><div class='ctx'> 	.unprep_data = mmci_dmae_unprep_data,</div><div class='add'>+	.get_datactrl_cfg = mmci_get_dctrl_cfg,</div><div class='ctx'> 	.get_next_data = mmci_dmae_get_next_data,</div><div class='ctx'> 	.dma_setup = mmci_dmae_setup,</div><div class='ctx'> 	.dma_release = mmci_dmae_release,</div><div class='hunk'>@@ -959,12 +945,22 @@ static struct mmci_host_ops mmci_variant_ops = {</div><div class='ctx'> 	.dma_finalize = mmci_dmae_finalize,</div><div class='ctx'> 	.dma_error = mmci_dmae_error,</div><div class='ctx'> };</div><div class='add'>+#else</div><div class='add'>+static struct mmci_host_ops mmci_variant_ops = {</div><div class='add'>+	.get_datactrl_cfg = mmci_get_dctrl_cfg,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void mmci_variant_init(struct mmci_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	host-&gt;ops = &amp;mmci_variant_ops;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+void ux500v2_variant_init(struct mmci_host *host)</div><div class='add'>+{</div><div class='add'>+	host-&gt;ops = &amp;mmci_variant_ops;</div><div class='add'>+	host-&gt;ops-&gt;get_datactrl_cfg = ux500v2_get_dctrl_cfg;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='hunk'>@@ -1000,7 +996,6 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)</div><div class='ctx'> 	unsigned int datactrl, timeout, irqmask;</div><div class='ctx'> 	unsigned long long clks;</div><div class='ctx'> 	void __iomem *base;</div><div class='del'>-	int blksz_bits;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(mmc_dev(host-&gt;mmc), "blksz %04x blks %04x flags %08x\n",</div><div class='ctx'> 		data-&gt;blksz, data-&gt;blocks, data-&gt;flags);</div><div class='hunk'>@@ -1018,18 +1013,8 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)</div><div class='ctx'> 	writel(timeout, base + MMCIDATATIMER);</div><div class='ctx'> 	writel(host-&gt;size, base + MMCIDATALENGTH);</div><div class='ctx'> </div><div class='del'>-	blksz_bits = ffs(data-&gt;blksz) - 1;</div><div class='del'>-	BUG_ON(1 &lt;&lt; blksz_bits != data-&gt;blksz);</div><div class='del'>-</div><div class='del'>-	if (variant-&gt;blksz_datactrl16)</div><div class='del'>-		datactrl = variant-&gt;datactrl_dpsm_enable | (data-&gt;blksz &lt;&lt; 16);</div><div class='del'>-	else if (variant-&gt;blksz_datactrl4)</div><div class='del'>-		datactrl = variant-&gt;datactrl_dpsm_enable | (data-&gt;blksz &lt;&lt; 4);</div><div class='del'>-	else</div><div class='del'>-		datactrl = variant-&gt;datactrl_dpsm_enable | blksz_bits &lt;&lt; 4;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-		datactrl |= MCI_DPSM_DIRECTION;</div><div class='add'>+	datactrl = host-&gt;ops-&gt;get_datactrl_cfg(host);</div><div class='add'>+	datactrl |= host-&gt;data-&gt;flags &amp; MMC_DATA_READ ? MCI_DPSM_DIRECTION : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;mmc-&gt;card &amp;&amp; mmc_card_sdio(host-&gt;mmc-&gt;card)) {</div><div class='ctx'> 		u32 clk;</div><div class='hunk'>@@ -1220,12 +1205,13 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,</div><div class='ctx'> 	     unsigned int status)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = host-&gt;base;</div><div class='del'>-	bool sbc;</div><div class='add'>+	bool sbc, busy_resp;</div><div class='ctx'> </div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	sbc = (cmd == host-&gt;mrq-&gt;sbc);</div><div class='add'>+	busy_resp = !!(cmd-&gt;flags &amp; MMC_RSP_BUSY);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to be one of these interrupts to be considered worth</div><div class='hunk'>@@ -1239,8 +1225,7 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ST Micro variant: handle busy detection.</div><div class='ctx'> 	 */</div><div class='del'>-	if (host-&gt;variant-&gt;busy_detect) {</div><div class='del'>-		bool busy_resp = !!(cmd-&gt;flags &amp; MMC_RSP_BUSY);</div><div class='add'>+	if (busy_resp &amp;&amp; host-&gt;variant-&gt;busy_detect) {</div><div class='ctx'> </div><div class='ctx'> 		/* We are busy with a command, return */</div><div class='ctx'> 		if (host-&gt;busy_status &amp;&amp;</div><div class='hunk'>@@ -1253,7 +1238,7 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,</div><div class='ctx'> 		 * that the special busy status bit is still set before</div><div class='ctx'> 		 * proceeding.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!host-&gt;busy_status &amp;&amp; busy_resp &amp;&amp;</div><div class='add'>+		if (!host-&gt;busy_status &amp;&amp;</div><div class='ctx'> 		    !(status &amp; (MCI_CMDCRCFAIL|MCI_CMDTIMEOUT)) &amp;&amp;</div><div class='ctx'> 		    (readl(base + MMCISTATUS) &amp; host-&gt;variant-&gt;busy_detect_flag)) {</div><div class='ctx'> </div><div class='hunk'>@@ -1550,9 +1535,10 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Don't poll for busy completion in irq context.</div><div class='add'>+		 * Busy detection has been handled by mmci_cmd_irq() above.</div><div class='add'>+		 * Clear the status bit to prevent polling in IRQ context.</div><div class='ctx'> 		 */</div><div class='del'>-		if (host-&gt;variant-&gt;busy_detect &amp;&amp; host-&gt;busy_status)</div><div class='add'>+		if (host-&gt;variant-&gt;busy_detect_flag)</div><div class='ctx'> 			status &amp;= ~host-&gt;variant-&gt;busy_detect_flag;</div><div class='ctx'> </div><div class='ctx'> 		ret = 1;</div><div class='head'>diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h<br/>index 14df81054438..4f071bd34e59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mmci.h</a></div><div class='hunk'>@@ -131,6 +131,11 @@</div><div class='ctx'> /* Control register extensions in the Qualcomm versions */</div><div class='ctx'> #define MCI_DPSM_QCOM_DATA_PEND	BIT(17)</div><div class='ctx'> #define MCI_DPSM_QCOM_RX_DATA_PEND BIT(20)</div><div class='add'>+/* Control register extensions in STM32 versions */</div><div class='add'>+#define MCI_DPSM_STM32_MODE_BLOCK	(0 &lt;&lt; 2)</div><div class='add'>+#define MCI_DPSM_STM32_MODE_SDIO	(1 &lt;&lt; 2)</div><div class='add'>+#define MCI_DPSM_STM32_MODE_STREAM	(2 &lt;&lt; 2)</div><div class='add'>+#define MCI_DPSM_STM32_MODE_BLOCK_STOP	(3 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> #define MMCIDATACNT		0x030</div><div class='ctx'> #define MMCISTATUS		0x034</div><div class='hunk'>@@ -275,12 +280,8 @@ struct mmci_host;</div><div class='ctx'>  * @st_clkdiv: true if using a ST-specific clock divider algorithm</div><div class='ctx'>  * @stm32_clkdiv: true if using a STM32-specific clock divider algorithm</div><div class='ctx'>  * @datactrl_mask_ddrmode: ddr mode mask in datactrl register.</div><div class='del'>- * @blksz_datactrl16: true if Block size is at b16..b30 position in datactrl register</div><div class='del'>- * @blksz_datactrl4: true if Block size is at b4..b16 position in datactrl</div><div class='del'>- *		     register</div><div class='ctx'>  * @datactrl_mask_sdio: SDIO enable mask in datactrl register</div><div class='ctx'>  * @datactrl_blksz: block size in power of two</div><div class='del'>- * @datactrl_dpsm_enable: enable value for DPSM</div><div class='ctx'>  * @datactrl_first: true if data must be setup before send command</div><div class='ctx'>  * @datacnt_useless: true if you could not use datacnt register to read</div><div class='ctx'>  *		     remaining data</div><div class='hunk'>@@ -325,14 +326,11 @@ struct variant_data {</div><div class='ctx'> 	unsigned int		datactrl_mask_ddrmode;</div><div class='ctx'> 	unsigned int		datactrl_mask_sdio;</div><div class='ctx'> 	unsigned int		datactrl_blocksz;</div><div class='del'>-	unsigned int		datactrl_dpsm_enable;</div><div class='ctx'> 	u8			datactrl_first:1;</div><div class='ctx'> 	u8			datacnt_useless:1;</div><div class='ctx'> 	u8			st_sdio:1;</div><div class='ctx'> 	u8			st_clkdiv:1;</div><div class='ctx'> 	u8			stm32_clkdiv:1;</div><div class='del'>-	u8			blksz_datactrl16:1;</div><div class='del'>-	u8			blksz_datactrl4:1;</div><div class='ctx'> 	u32			pwrreg_powerup;</div><div class='ctx'> 	u32			f_max;</div><div class='ctx'> 	u8			signal_direction:1;</div><div class='hunk'>@@ -362,6 +360,7 @@ struct mmci_host_ops {</div><div class='ctx'> 			 bool next);</div><div class='ctx'> 	void (*unprep_data)(struct mmci_host *host, struct mmc_data *data,</div><div class='ctx'> 			    int err);</div><div class='add'>+	u32 (*get_datactrl_cfg)(struct mmci_host *host);</div><div class='ctx'> 	void (*get_next_data)(struct mmci_host *host, struct mmc_data *data);</div><div class='ctx'> 	int (*dma_setup)(struct mmci_host *host);</div><div class='ctx'> 	void (*dma_release)(struct mmci_host *host);</div><div class='hunk'>@@ -429,6 +428,12 @@ struct mmci_host {</div><div class='ctx'> void mmci_write_clkreg(struct mmci_host *host, u32 clk);</div><div class='ctx'> void mmci_write_pwrreg(struct mmci_host *host, u32 pwr);</div><div class='ctx'> </div><div class='add'>+static inline u32 mmci_dctrl_blksz(struct mmci_host *host)</div><div class='add'>+{</div><div class='add'>+	return (ffs(host-&gt;data-&gt;blksz) - 1) &lt;&lt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMA_ENGINE</div><div class='ctx'> int mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data,</div><div class='ctx'> 			bool next);</div><div class='ctx'> void mmci_dmae_unprep_data(struct mmci_host *host, struct mmc_data *data,</div><div class='hunk'>@@ -439,3 +444,16 @@ void mmci_dmae_release(struct mmci_host *host);</div><div class='ctx'> int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl);</div><div class='ctx'> void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data);</div><div class='ctx'> void mmci_dmae_error(struct mmci_host *host);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMC_QCOM_DML</div><div class='add'>+void qcom_variant_init(struct mmci_host *host);</div><div class='add'>+#else</div><div class='add'>+static inline void qcom_variant_init(struct mmci_host *host) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMC_STM32_SDMMC</div><div class='add'>+void sdmmc_variant_init(struct mmci_host *host);</div><div class='add'>+#else</div><div class='add'>+static inline void sdmmc_variant_init(struct mmci_host *host) {}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c<br/>index 25d0a75533ea..3af396b3e0a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci_qcom_dml.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci_qcom_dml.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci_qcom_dml.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mmci_qcom_dml.c</a></div><div class='hunk'>@@ -54,10 +54,15 @@</div><div class='ctx'> </div><div class='ctx'> #define DML_OFFSET			0x800</div><div class='ctx'> </div><div class='del'>-void dml_start_xfer(struct mmci_host *host, struct mmc_data *data)</div><div class='add'>+static int qcom_dma_start(struct mmci_host *host, unsigned int *datactrl)</div><div class='ctx'> {</div><div class='ctx'> 	u32 config;</div><div class='ctx'> 	void __iomem *base = host-&gt;base + DML_OFFSET;</div><div class='add'>+	struct mmc_data *data = host-&gt;data;</div><div class='add'>+	int ret = mmci_dmae_start(host, datactrl);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='ctx'> 		/* Read operation: configure DML for producer operation */</div><div class='hunk'>@@ -96,6 +101,7 @@ void dml_start_xfer(struct mmci_host *host, struct mmc_data *data)</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the dml is configured before dma is triggered */</div><div class='ctx'> 	wmb();</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int of_get_dml_pipe_index(struct device_node *np, const char *name)</div><div class='hunk'>@@ -133,7 +139,6 @@ static int qcom_dma_setup(struct mmci_host *host)</div><div class='ctx'> 	producer_id = of_get_dml_pipe_index(np, "rx");</div><div class='ctx'> </div><div class='ctx'> 	if (producer_id &lt; 0 || consumer_id &lt; 0) {</div><div class='del'>-		host-&gt;variant-&gt;qcom_dml = false;</div><div class='ctx'> 		mmci_dmae_release(host);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -183,13 +188,19 @@ static int qcom_dma_setup(struct mmci_host *host)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 qcom_get_dctrl_cfg(struct mmci_host *host)</div><div class='add'>+{</div><div class='add'>+	return MCI_DPSM_ENABLE | (host-&gt;data-&gt;blksz &lt;&lt; 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mmci_host_ops qcom_variant_ops = {</div><div class='ctx'> 	.prep_data = mmci_dmae_prep_data,</div><div class='ctx'> 	.unprep_data = mmci_dmae_unprep_data,</div><div class='add'>+	.get_datactrl_cfg = qcom_get_dctrl_cfg,</div><div class='ctx'> 	.get_next_data = mmci_dmae_get_next_data,</div><div class='ctx'> 	.dma_setup = qcom_dma_setup,</div><div class='ctx'> 	.dma_release = mmci_dmae_release,</div><div class='del'>-	.dma_start = mmci_dmae_start,</div><div class='add'>+	.dma_start = qcom_dma_start,</div><div class='ctx'> 	.dma_finalize = mmci_dmae_finalize,</div><div class='ctx'> 	.dma_error = mmci_dmae_error,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h<br/>deleted file mode 100644<br/>index fa16f6f4d4ad..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci_qcom_dml.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci_qcom_dml.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2011, The Linux Foundation. All rights reserved.</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 and</div><div class='del'>- * only version 2 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'>- */</div><div class='del'>-#ifndef __MMC_QCOM_DML_H__</div><div class='del'>-#define __MMC_QCOM_DML_H__</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MMC_QCOM_DML</div><div class='del'>-void qcom_variant_init(struct mmci_host *host);</div><div class='del'>-void dml_start_xfer(struct mmci_host *host, struct mmc_data *data);</div><div class='del'>-#else</div><div class='del'>-static inline void qcom_variant_init(struct mmci_host *host)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void dml_start_xfer(struct mmci_host *host, struct mmc_data *data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_MMC_QCOM_DML */</div><div class='del'>-</div><div class='del'>-#endif /* __MMC_QCOM_DML_H__ */</div><div class='head'>diff --git a/drivers/mmc/host/mmci_stm32_sdmmc.c b/drivers/mmc/host/mmci_stm32_sdmmc.c<br/>index cfbfc6f1048f..8e83ae6920ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci_stm32_sdmmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mmci_stm32_sdmmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mmci_stm32_sdmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mmci_stm32_sdmmc.c</a></div><div class='hunk'>@@ -265,10 +265,28 @@ static void mmci_sdmmc_set_pwrreg(struct mmci_host *host, unsigned int pwr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 sdmmc_get_dctrl_cfg(struct mmci_host *host)</div><div class='add'>+{</div><div class='add'>+	u32 datactrl;</div><div class='add'>+</div><div class='add'>+	datactrl = mmci_dctrl_blksz(host);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;mmc-&gt;card &amp;&amp; mmc_card_sdio(host-&gt;mmc-&gt;card) &amp;&amp;</div><div class='add'>+	    host-&gt;data-&gt;blocks == 1)</div><div class='add'>+		datactrl |= MCI_DPSM_STM32_MODE_SDIO;</div><div class='add'>+	else if (host-&gt;data-&gt;stop &amp;&amp; !host-&gt;mrq-&gt;sbc)</div><div class='add'>+		datactrl |= MCI_DPSM_STM32_MODE_BLOCK_STOP;</div><div class='add'>+	else</div><div class='add'>+		datactrl |= MCI_DPSM_STM32_MODE_BLOCK;</div><div class='add'>+</div><div class='add'>+	return datactrl;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mmci_host_ops sdmmc_variant_ops = {</div><div class='ctx'> 	.validate_data = sdmmc_idma_validate_data,</div><div class='ctx'> 	.prep_data = sdmmc_idma_prep_data,</div><div class='ctx'> 	.unprep_data = sdmmc_idma_unprep_data,</div><div class='add'>+	.get_datactrl_cfg = sdmmc_get_dctrl_cfg,</div><div class='ctx'> 	.dma_setup = sdmmc_idma_setup,</div><div class='ctx'> 	.dma_start = sdmmc_idma_start,</div><div class='ctx'> 	.dma_finalize = sdmmc_idma_finalize,</div><div class='head'>diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c<br/>index 833ef0590af8..c518cc208a1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mtk-sd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mtk-sd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mtk-sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mtk-sd.c</a></div><div class='hunk'>@@ -300,6 +300,8 @@</div><div class='ctx'> #define CMD_TIMEOUT         (HZ/10 * 5)	/* 100ms x5 */</div><div class='ctx'> #define DAT_TIMEOUT         (HZ    * 5)	/* 1000ms x5 */</div><div class='ctx'> </div><div class='add'>+#define DEFAULT_DEBOUNCE	(8)	/* 8 cycles CD debounce */</div><div class='add'>+</div><div class='ctx'> #define PAD_DELAY_MAX	32 /* PAD delay cells */</div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> /* Descriptor Structure                                                     */</div><div class='hunk'>@@ -372,6 +374,7 @@ struct mtk_mmc_compatible {</div><div class='ctx'> 	bool stop_clk_fix;</div><div class='ctx'> 	bool enhance_rx;</div><div class='ctx'> 	bool support_64g;</div><div class='add'>+	bool use_internal_cd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct msdc_tune_para {</div><div class='hunk'>@@ -430,6 +433,7 @@ struct msdc_host {</div><div class='ctx'> 	bool hs400_cmd_resp_sel_rising;</div><div class='ctx'> 				 /* cmd response sample selection for HS400 */</div><div class='ctx'> 	bool hs400_mode;	/* current eMMC will run at hs400 mode */</div><div class='add'>+	bool internal_cd;	/* Use internal card-detect logic */</div><div class='ctx'> 	struct msdc_save_para save_para; /* used when gate HCLK */</div><div class='ctx'> 	struct msdc_tune_para def_tune_para; /* default tune setting */</div><div class='ctx'> 	struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */</div><div class='hunk'>@@ -507,6 +511,28 @@ static const struct mtk_mmc_compatible mt7622_compat = {</div><div class='ctx'> 	.support_64g = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct mtk_mmc_compatible mt8516_compat = {</div><div class='add'>+	.clk_div_bits = 12,</div><div class='add'>+	.hs400_tune = false,</div><div class='add'>+	.pad_tune_reg = MSDC_PAD_TUNE0,</div><div class='add'>+	.async_fifo = true,</div><div class='add'>+	.data_tune = true,</div><div class='add'>+	.busy_check = true,</div><div class='add'>+	.stop_clk_fix = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_mmc_compatible mt7620_compat = {</div><div class='add'>+	.clk_div_bits = 8,</div><div class='add'>+	.hs400_tune = false,</div><div class='add'>+	.pad_tune_reg = MSDC_PAD_TUNE,</div><div class='add'>+	.async_fifo = false,</div><div class='add'>+	.data_tune = false,</div><div class='add'>+	.busy_check = false,</div><div class='add'>+	.stop_clk_fix = false,</div><div class='add'>+	.enhance_rx = false,</div><div class='add'>+	.use_internal_cd = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id msdc_of_ids[] = {</div><div class='ctx'> 	{ .compatible = "mediatek,mt8135-mmc", .data = &amp;mt8135_compat},</div><div class='ctx'> 	{ .compatible = "mediatek,mt8173-mmc", .data = &amp;mt8173_compat},</div><div class='hunk'>@@ -514,6 +540,8 @@ static const struct of_device_id msdc_of_ids[] = {</div><div class='ctx'> 	{ .compatible = "mediatek,mt2701-mmc", .data = &amp;mt2701_compat},</div><div class='ctx'> 	{ .compatible = "mediatek,mt2712-mmc", .data = &amp;mt2712_compat},</div><div class='ctx'> 	{ .compatible = "mediatek,mt7622-mmc", .data = &amp;mt7622_compat},</div><div class='add'>+	{ .compatible = "mediatek,mt8516-mmc", .data = &amp;mt8516_compat},</div><div class='add'>+	{ .compatible = "mediatek,mt7620-mmc", .data = &amp;mt7620_compat},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, msdc_of_ids);</div><div class='hunk'>@@ -1407,6 +1435,12 @@ static irqreturn_t msdc_irq(int irq, void *dev_id)</div><div class='ctx'> 			sdio_signal_irq(host-&gt;mmc);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if ((events &amp; event_mask) &amp; MSDC_INT_CDSC) {</div><div class='add'>+			if (host-&gt;internal_cd)</div><div class='add'>+				mmc_detect_change(host-&gt;mmc, msecs_to_jiffies(20));</div><div class='add'>+			events &amp;= ~MSDC_INT_CDSC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!(events &amp; (event_mask &amp; ~MSDC_INT_SDIOIRQ)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1440,14 +1474,24 @@ static void msdc_init_hw(struct msdc_host *host)</div><div class='ctx'> 	/* Reset */</div><div class='ctx'> 	msdc_reset_hw(host);</div><div class='ctx'> </div><div class='del'>-	/* Disable card detection */</div><div class='del'>-	sdr_clr_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='del'>-</div><div class='ctx'> 	/* Disable and clear all interrupts */</div><div class='ctx'> 	writel(0, host-&gt;base + MSDC_INTEN);</div><div class='ctx'> 	val = readl(host-&gt;base + MSDC_INT);</div><div class='ctx'> 	writel(val, host-&gt;base + MSDC_INT);</div><div class='ctx'> </div><div class='add'>+	/* Configure card detection */</div><div class='add'>+	if (host-&gt;internal_cd) {</div><div class='add'>+		sdr_set_field(host-&gt;base + MSDC_PS, MSDC_PS_CDDEBOUNCE,</div><div class='add'>+			      DEFAULT_DEBOUNCE);</div><div class='add'>+		sdr_set_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='add'>+		sdr_set_bits(host-&gt;base + MSDC_INTEN, MSDC_INTEN_CDSC);</div><div class='add'>+		sdr_set_bits(host-&gt;base + SDC_CFG, SDC_CFG_INSWKUP);</div><div class='add'>+	} else {</div><div class='add'>+		sdr_clr_bits(host-&gt;base + SDC_CFG, SDC_CFG_INSWKUP);</div><div class='add'>+		sdr_clr_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='add'>+		sdr_clr_bits(host-&gt;base + MSDC_INTEN, MSDC_INTEN_CDSC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (host-&gt;top_base) {</div><div class='ctx'> 		writel(0, host-&gt;top_base + EMMC_TOP_CONTROL);</div><div class='ctx'> 		writel(0, host-&gt;top_base + EMMC_TOP_CMD);</div><div class='hunk'>@@ -1557,6 +1601,13 @@ static void msdc_init_hw(struct msdc_host *host)</div><div class='ctx'> static void msdc_deinit_hw(struct msdc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;internal_cd) {</div><div class='add'>+		/* Disabled card-detect */</div><div class='add'>+		sdr_clr_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='add'>+		sdr_clr_bits(host-&gt;base + SDC_CFG, SDC_CFG_INSWKUP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Disable and clear all interrupts */</div><div class='ctx'> 	writel(0, host-&gt;base + MSDC_INTEN);</div><div class='ctx'> </div><div class='hunk'>@@ -2055,13 +2106,31 @@ static void msdc_ack_sdio_irq(struct mmc_host *mmc)</div><div class='ctx'> 	__msdc_enable_sdio_irq(mmc, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int msdc_get_cd(struct mmc_host *mmc)</div><div class='add'>+{</div><div class='add'>+	struct msdc_host *host = mmc_priv(mmc);</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (mmc-&gt;caps &amp; MMC_CAP_NONREMOVABLE)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!host-&gt;internal_cd)</div><div class='add'>+		return mmc_gpio_get_cd(mmc);</div><div class='add'>+</div><div class='add'>+	val = readl(host-&gt;base + MSDC_PS) &amp; MSDC_PS_CDSTS;</div><div class='add'>+	if (mmc-&gt;caps2 &amp; MMC_CAP2_CD_ACTIVE_HIGH)</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='ctx'> static const struct mmc_host_ops mt_msdc_ops = {</div><div class='ctx'> 	.post_req = msdc_post_req,</div><div class='ctx'> 	.pre_req = msdc_pre_req,</div><div class='ctx'> 	.request = msdc_ops_request,</div><div class='ctx'> 	.set_ios = msdc_ops_set_ios,</div><div class='ctx'> 	.get_ro = mmc_gpio_get_ro,</div><div class='del'>-	.get_cd = mmc_gpio_get_cd,</div><div class='add'>+	.get_cd = msdc_get_cd,</div><div class='ctx'> 	.enable_sdio_irq = msdc_enable_sdio_irq,</div><div class='ctx'> 	.ack_sdio_irq = msdc_ack_sdio_irq,</div><div class='ctx'> 	.start_signal_voltage_switch = msdc_ops_switch_volt,</div><div class='hunk'>@@ -2123,9 +2192,11 @@ static int msdc_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	host-&gt;top_base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(host-&gt;top_base))</div><div class='del'>-		host-&gt;top_base = NULL;</div><div class='add'>+	if (res) {</div><div class='add'>+		host-&gt;top_base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+		if (IS_ERR(host-&gt;top_base))</div><div class='add'>+			host-&gt;top_base = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mmc_regulator_get_supply(mmc);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2191,6 +2262,16 @@ static int msdc_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	else</div><div class='ctx'> 		mmc-&gt;f_min = DIV_ROUND_UP(host-&gt;src_clk_freq, 4 * 4095);</div><div class='ctx'> </div><div class='add'>+	if (!(mmc-&gt;caps &amp; MMC_CAP_NONREMOVABLE) &amp;&amp;</div><div class='add'>+	    !mmc_can_gpio_cd(mmc) &amp;&amp;</div><div class='add'>+	    host-&gt;dev_comp-&gt;use_internal_cd) {</div><div class='add'>+		/*</div><div class='add'>+		 * Is removable but no GPIO declared, so</div><div class='add'>+		 * use internal functionality.</div><div class='add'>+		 */</div><div class='add'>+		host-&gt;internal_cd = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (mmc-&gt;caps &amp; MMC_CAP_SDIO_IRQ)</div><div class='ctx'> 		mmc-&gt;caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;</div><div class='ctx'> </div><div class='hunk'>@@ -2227,7 +2308,7 @@ static int msdc_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	msdc_init_hw(host);</div><div class='ctx'> </div><div class='ctx'> 	ret = devm_request_irq(&amp;pdev-&gt;dev, host-&gt;irq, msdc_irq,</div><div class='del'>-		IRQF_TRIGGER_LOW | IRQF_ONESHOT, pdev-&gt;name, host);</div><div class='add'>+			       IRQF_TRIGGER_NONE, pdev-&gt;name, host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto release;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c<br/>index d54612257b06..45f7b9b53d48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mxcmmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mxcmmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mxcmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mxcmmc.c</a></div><div class='hunk'>@@ -290,11 +290,8 @@ static void mxcmci_swap_buffers(struct mmc_data *data)</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for_each_sg(data-&gt;sg, sg, data-&gt;sg_len, i) {</div><div class='del'>-		void *buf = kmap_atomic(sg_page(sg) + sg-&gt;offset);</div><div class='del'>-		buffer_swap32(buf, sg-&gt;length);</div><div class='del'>-		kunmap_atomic(buf);</div><div class='del'>-	}</div><div class='add'>+	for_each_sg(data-&gt;sg, sg, data-&gt;sg_len, i)</div><div class='add'>+		buffer_swap32(sg_virt(sg), sg-&gt;length);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void mxcmci_swap_buffers(struct mmc_data *data) {}</div><div class='hunk'>@@ -611,7 +608,6 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_data *data = host-&gt;req-&gt;data;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='del'>-	void *buf;</div><div class='ctx'> 	int stat, i;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;data = data;</div><div class='hunk'>@@ -619,18 +615,14 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='ctx'> 		for_each_sg(data-&gt;sg, sg, data-&gt;sg_len, i) {</div><div class='del'>-			buf = kmap_atomic(sg_page(sg) + sg-&gt;offset);</div><div class='del'>-			stat = mxcmci_pull(host, buf, sg-&gt;length);</div><div class='del'>-			kunmap(buf);</div><div class='add'>+			stat = mxcmci_pull(host, sg_virt(sg), sg-&gt;length);</div><div class='ctx'> 			if (stat)</div><div class='ctx'> 				return stat;</div><div class='ctx'> 			host-&gt;datasize += sg-&gt;length;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for_each_sg(data-&gt;sg, sg, data-&gt;sg_len, i) {</div><div class='del'>-			buf = kmap_atomic(sg_page(sg) + sg-&gt;offset);</div><div class='del'>-			stat = mxcmci_push(host, buf, sg-&gt;length);</div><div class='del'>-			kunmap(buf);</div><div class='add'>+			stat = mxcmci_push(host, sg_virt(sg), sg-&gt;length);</div><div class='ctx'> 			if (stat)</div><div class='ctx'> 				return stat;</div><div class='ctx'> 			host-&gt;datasize += sg-&gt;length;</div><div class='head'>diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c<br/>index 4f06fb03c0a2..c021d433b04f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mxs-mmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/mxs-mmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/mxs-mmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/mxs-mmc.c</a></div><div class='hunk'>@@ -648,7 +648,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* set mmc core parameters */</div><div class='ctx'> 	mmc-&gt;ops = &amp;mxs_mmc_ops;</div><div class='ctx'> 	mmc-&gt;caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |</div><div class='del'>-		    MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL | MMC_CAP_CMD23;</div><div class='add'>+		    MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL | MMC_CAP_CMD23 |</div><div class='add'>+		    MMC_CAP_ERASE;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;broken_cd = of_property_read_bool(np, "broken-cd");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c<br/>index 8a274b91804e..3c4d950a4755 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/of_mmc_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/of_mmc_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/of_mmc_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/of_mmc_spi.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OpenFirmware bindings for the MMC-over-SPI driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) MontaVista Software, Inc. 2008.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Anton Vorontsov &lt;avorontsov@ru.mvista.com&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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c<br/>index 29a1ddaa7466..952fa4063ff8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/omap_hsmmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/omap_hsmmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/omap_hsmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/omap_hsmmc.c</a></div><div class='hunk'>@@ -2077,7 +2077,7 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	host = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	host = dev_get_drvdata(dev);</div><div class='ctx'> 	omap_hsmmc_context_save(host);</div><div class='ctx'> 	dev_dbg(dev, "disabled\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2118,7 +2118,7 @@ static int omap_hsmmc_runtime_resume(struct device *dev)</div><div class='ctx'> 	struct omap_hsmmc_host *host;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	host = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	host = dev_get_drvdata(dev);</div><div class='ctx'> 	omap_hsmmc_context_restore(host);</div><div class='ctx'> 	dev_dbg(dev, "enabled\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c<br/>index c907bf502a12..c1d3f0e38921 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/pxamci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/pxamci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/pxamci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/pxamci.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ static void pxamci_dma_irq(void *param);</div><div class='ctx'> static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_async_tx_descriptor *tx;</div><div class='del'>-	enum dma_data_direction direction;</div><div class='add'>+	enum dma_transfer_direction direction;</div><div class='ctx'> 	struct dma_slave_config	config;</div><div class='ctx'> 	struct dma_chan *chan;</div><div class='ctx'> 	unsigned int nob = data-&gt;blocks;</div><div class='head'>diff --git a/drivers/mmc/host/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h<br/>index 8394a7bb1fc1..c0504aa90857 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/renesas_sdhi.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * Renesas Mobile SDHI</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 Horms Solutions Ltd., Simon Horman</div><div class='del'>- * Copyright (C) 2017 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2017-19 Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef RENESAS_SDHI_H</div><div class='head'>diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c<br/>index 71e13844df6c..5e9e36ed2107 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/renesas_sdhi_core.c</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Renesas SDHI</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2015-17 Renesas Electronics Corporation</div><div class='del'>- * Copyright (C) 2016-17 Sang Engineering, Wolfram Sang</div><div class='add'>+ * Copyright (C) 2015-19 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2016-19 Sang Engineering, Wolfram Sang</div><div class='ctx'>  * Copyright (C) 2016-17 Horms Solutions, Simon Horman</div><div class='ctx'>  * Copyright (C) 2009 Magnus Damm</div><div class='ctx'>  *</div><div class='hunk'>@@ -641,6 +641,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,</div><div class='ctx'> 	struct renesas_sdhi *priv;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int irq, ret, i;</div><div class='add'>+	u16 ver;</div><div class='ctx'> </div><div class='ctx'> 	of_data = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -773,14 +774,19 @@ int renesas_sdhi_probe(struct platform_device *pdev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto efree;</div><div class='ctx'> </div><div class='del'>-	ret = tmio_mmc_host_probe(host);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto edisclk;</div><div class='add'>+	ver = sd_ctrl_read16(host, CTL_VERSION);</div><div class='add'>+	/* GEN2_SDR104 is first known SDHI to use 32bit block count */</div><div class='add'>+	if (ver &lt; SDHI_VER_GEN2_SDR104 &amp;&amp; mmc_data-&gt;max_blk_count &gt; U16_MAX)</div><div class='add'>+		mmc_data-&gt;max_blk_count = U16_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* One Gen2 SDHI incarnation does NOT have a CBSY bit */</div><div class='del'>-	if (sd_ctrl_read16(host, CTL_VERSION) == SDHI_VER_GEN2_SDR50)</div><div class='add'>+	if (ver == SDHI_VER_GEN2_SDR50)</div><div class='ctx'> 		mmc_data-&gt;flags &amp;= ~TMIO_MMC_HAVE_CBSY;</div><div class='ctx'> </div><div class='add'>+	ret = tmio_mmc_host_probe(host);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto edisclk;</div><div class='add'>+</div><div class='ctx'> 	/* Enable tuning iff we have an SCC and a supported mode */</div><div class='ctx'> 	if (of_data &amp;&amp; of_data-&gt;scc_offset &amp;&amp;</div><div class='ctx'> 	    (host-&gt;mmc-&gt;caps &amp; MMC_CAP_UHS_SDR104 ||</div><div class='head'>diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c<br/>index 9dfafa2a90a3..751fe91c7571 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi_internal_dmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi_internal_dmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi_internal_dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/renesas_sdhi_internal_dmac.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * DMA support for Internal DMAC with SDHI SD/SDIO controller</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2016-17 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2016-19 Renesas Electronics Corporation</div><div class='ctx'>  * Copyright (C) 2016-17 Horms Solutions, Simon Horman</div><div class='add'>+ * Copyright (C) 2018-19 Sang Engineering, Wolfram Sang</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -95,8 +96,8 @@ static const struct renesas_sdhi_of_data of_rza2_compatible = {</div><div class='ctx'> 	.scc_offset	= 0 - 0x1000,</div><div class='ctx'> 	.taps		= rcar_gen3_scc_taps,</div><div class='ctx'> 	.taps_num	= ARRAY_SIZE(rcar_gen3_scc_taps),</div><div class='del'>-	/* DMAC can handle 0xffffffff blk count but only 1 segment */</div><div class='del'>-	.max_blk_count	= 0xffffffff,</div><div class='add'>+	/* DMAC can handle 32bit blk count but only 1 segment */</div><div class='add'>+	.max_blk_count	= UINT_MAX / TMIO_MAX_BLK_SIZE,</div><div class='ctx'> 	.max_segs	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -110,8 +111,8 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {</div><div class='ctx'> 	.scc_offset	= 0x1000,</div><div class='ctx'> 	.taps		= rcar_gen3_scc_taps,</div><div class='ctx'> 	.taps_num	= ARRAY_SIZE(rcar_gen3_scc_taps),</div><div class='del'>-	/* DMAC can handle 0xffffffff blk count but only 1 segment */</div><div class='del'>-	.max_blk_count	= 0xffffffff,</div><div class='add'>+	/* DMAC can handle 32bit blk count but only 1 segment */</div><div class='add'>+	.max_blk_count	= UINT_MAX / TMIO_MAX_BLK_SIZE,</div><div class='ctx'> 	.max_segs	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c<br/>index 02cd878e209f..1d29b822efb8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi_sys_dmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/renesas_sdhi_sys_dmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/renesas_sdhi_sys_dmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/renesas_sdhi_sys_dmac.c</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * DMA support use of SYS DMAC with SDHI SD/SDIO controller</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2016-17 Renesas Electronics Corporation</div><div class='del'>- * Copyright (C) 2016-17 Sang Engineering, Wolfram Sang</div><div class='add'>+ * Copyright (C) 2016-19 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2016-19 Sang Engineering, Wolfram Sang</div><div class='ctx'>  * Copyright (C) 2017 Horms Solutions, Simon Horman</div><div class='ctx'>  * Copyright (C) 2010-2011 Guennadi Liakhovetski</div><div class='ctx'>  */</div><div class='hunk'>@@ -65,7 +65,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen2_compatible = {</div><div class='ctx'> 	.scc_offset	= 0x0300,</div><div class='ctx'> 	.taps		= rcar_gen2_scc_taps,</div><div class='ctx'> 	.taps_num	= ARRAY_SIZE(rcar_gen2_scc_taps),</div><div class='del'>-	.max_blk_count  = 0xffffffff,</div><div class='add'>+	.max_blk_count	= UINT_MAX / TMIO_MAX_BLK_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Definitions for sampling clocks */</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c<br/>index 8dbbc1f62b70..c391510e9ef4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-esdhc-imx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-esdhc-imx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-esdhc-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-esdhc-imx.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pm_qos.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/mmc.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio.h&gt;</div><div class='hunk'>@@ -73,6 +74,7 @@</div><div class='ctx'> #define ESDHC_STROBE_DLL_CTRL_ENABLE	(1 &lt;&lt; 0)</div><div class='ctx'> #define ESDHC_STROBE_DLL_CTRL_RESET	(1 &lt;&lt; 1)</div><div class='ctx'> #define ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_SHIFT	3</div><div class='add'>+#define ESDHC_STROBE_DLL_CTRL_SLV_UPDATE_INT_DEFAULT	(4 &lt;&lt; 20)</div><div class='ctx'> </div><div class='ctx'> #define ESDHC_STROBE_DLL_STATUS		0x74</div><div class='ctx'> #define ESDHC_STROBE_DLL_STS_REF_LOCK	(1 &lt;&lt; 1)</div><div class='hunk'>@@ -156,6 +158,8 @@</div><div class='ctx'> #define ESDHC_FLAG_HS400_ES		BIT(11)</div><div class='ctx'> /* The IP has Host Controller Interface for Command Queuing */</div><div class='ctx'> #define ESDHC_FLAG_CQHCI		BIT(12)</div><div class='add'>+/* need request pmqos during low power */</div><div class='add'>+#define ESDHC_FLAG_PMQOS		BIT(13)</div><div class='ctx'> </div><div class='ctx'> struct esdhc_soc_data {</div><div class='ctx'> 	u32 flags;</div><div class='hunk'>@@ -204,6 +208,12 @@ static const struct esdhc_soc_data usdhc_imx7d_data = {</div><div class='ctx'> 			| ESDHC_FLAG_HS400,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct esdhc_soc_data usdhc_imx7ulp_data = {</div><div class='add'>+	.flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING</div><div class='add'>+			| ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200</div><div class='add'>+			| ESDHC_FLAG_PMQOS | ESDHC_FLAG_HS400,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct esdhc_soc_data usdhc_imx8qxp_data = {</div><div class='ctx'> 	.flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING</div><div class='ctx'> 			| ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200</div><div class='hunk'>@@ -229,6 +239,7 @@ struct pltfm_imx_data {</div><div class='ctx'> 		WAIT_FOR_INT,        /* sent CMD12, waiting for response INT */</div><div class='ctx'> 	} multiblock_status;</div><div class='ctx'> 	u32 is_ddr;</div><div class='add'>+	struct pm_qos_request pm_qos_req;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct platform_device_id imx_esdhc_devtype[] = {</div><div class='hunk'>@@ -257,6 +268,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = {</div><div class='ctx'> 	{ .compatible = "fsl,imx6q-usdhc", .data = &amp;usdhc_imx6q_data, },</div><div class='ctx'> 	{ .compatible = "fsl,imx6ull-usdhc", .data = &amp;usdhc_imx6ull_data, },</div><div class='ctx'> 	{ .compatible = "fsl,imx7d-usdhc", .data = &amp;usdhc_imx7d_data, },</div><div class='add'>+	{ .compatible = "fsl,imx7ulp-usdhc", .data = &amp;usdhc_imx7ulp_data, },</div><div class='ctx'> 	{ .compatible = "fsl,imx8qxp-usdhc", .data = &amp;usdhc_imx8qxp_data, },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='hunk'>@@ -983,15 +995,19 @@ static void esdhc_set_strobe_dll(struct sdhci_host *host)</div><div class='ctx'> 	/* force a reset on strobe dll */</div><div class='ctx'> 	writel(ESDHC_STROBE_DLL_CTRL_RESET,</div><div class='ctx'> 		host-&gt;ioaddr + ESDHC_STROBE_DLL_CTRL);</div><div class='add'>+	/* clear the reset bit on strobe dll before any setting */</div><div class='add'>+	writel(0, host-&gt;ioaddr + ESDHC_STROBE_DLL_CTRL);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * enable strobe dll ctrl and adjust the delay target</div><div class='ctx'> 	 * for the uSDHC loopback read clock</div><div class='ctx'> 	 */</div><div class='ctx'> 	v = ESDHC_STROBE_DLL_CTRL_ENABLE |</div><div class='add'>+		ESDHC_STROBE_DLL_CTRL_SLV_UPDATE_INT_DEFAULT |</div><div class='ctx'> 		(7 &lt;&lt; ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_SHIFT);</div><div class='ctx'> 	writel(v, host-&gt;ioaddr + ESDHC_STROBE_DLL_CTRL);</div><div class='del'>-	/* wait 1us to make sure strobe dll status register stable */</div><div class='del'>-	udelay(1);</div><div class='add'>+	/* wait 5us to make sure strobe dll status register stable */</div><div class='add'>+	udelay(5);</div><div class='ctx'> 	v = readl(host-&gt;ioaddr + ESDHC_STROBE_DLL_STATUS);</div><div class='ctx'> 	if (!(v &amp; ESDHC_STROBE_DLL_STS_REF_LOCK))</div><div class='ctx'> 		dev_warn(mmc_dev(host-&gt;mmc),</div><div class='hunk'>@@ -1436,6 +1452,10 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)</div><div class='ctx'> 	imx_data-&gt;socdata = of_id ? of_id-&gt;data : (struct esdhc_soc_data *)</div><div class='ctx'> 						  pdev-&gt;id_entry-&gt;driver_data;</div><div class='ctx'> </div><div class='add'>+	if (imx_data-&gt;socdata-&gt;flags &amp; ESDHC_FLAG_PMQOS)</div><div class='add'>+		pm_qos_add_request(&amp;imx_data-&gt;pm_qos_req,</div><div class='add'>+			PM_QOS_CPU_DMA_LATENCY, 0);</div><div class='add'>+</div><div class='ctx'> 	imx_data-&gt;clk_ipg = devm_clk_get(&amp;pdev-&gt;dev, "ipg");</div><div class='ctx'> 	if (IS_ERR(imx_data-&gt;clk_ipg)) {</div><div class='ctx'> 		err = PTR_ERR(imx_data-&gt;clk_ipg);</div><div class='hunk'>@@ -1557,6 +1577,8 @@ disable_ipg_clk:</div><div class='ctx'> disable_per_clk:</div><div class='ctx'> 	clk_disable_unprepare(imx_data-&gt;clk_per);</div><div class='ctx'> free_sdhci:</div><div class='add'>+	if (imx_data-&gt;socdata-&gt;flags &amp; ESDHC_FLAG_PMQOS)</div><div class='add'>+		pm_qos_remove_request(&amp;imx_data-&gt;pm_qos_req);</div><div class='ctx'> 	sdhci_pltfm_free(pdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1578,6 +1600,9 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev)</div><div class='ctx'> 	clk_disable_unprepare(imx_data-&gt;clk_ipg);</div><div class='ctx'> 	clk_disable_unprepare(imx_data-&gt;clk_ahb);</div><div class='ctx'> </div><div class='add'>+	if (imx_data-&gt;socdata-&gt;flags &amp; ESDHC_FLAG_PMQOS)</div><div class='add'>+		pm_qos_remove_request(&amp;imx_data-&gt;pm_qos_req);</div><div class='add'>+</div><div class='ctx'> 	sdhci_pltfm_free(pdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1649,6 +1674,9 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	clk_disable_unprepare(imx_data-&gt;clk_ahb);</div><div class='ctx'> </div><div class='add'>+	if (imx_data-&gt;socdata-&gt;flags &amp; ESDHC_FLAG_PMQOS)</div><div class='add'>+		pm_qos_remove_request(&amp;imx_data-&gt;pm_qos_req);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1659,9 +1687,13 @@ static int sdhci_esdhc_runtime_resume(struct device *dev)</div><div class='ctx'> 	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (imx_data-&gt;socdata-&gt;flags &amp; ESDHC_FLAG_PMQOS)</div><div class='add'>+		pm_qos_add_request(&amp;imx_data-&gt;pm_qos_req,</div><div class='add'>+			PM_QOS_CPU_DMA_LATENCY, 0);</div><div class='add'>+</div><div class='ctx'> 	err = clk_prepare_enable(imx_data-&gt;clk_ahb);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto remove_pm_qos_request;</div><div class='ctx'> </div><div class='ctx'> 	if (!sdhci_sdio_irq_enabled(host)) {</div><div class='ctx'> 		err = clk_prepare_enable(imx_data-&gt;clk_per);</div><div class='hunk'>@@ -1690,6 +1722,9 @@ disable_per_clk:</div><div class='ctx'> 		clk_disable_unprepare(imx_data-&gt;clk_per);</div><div class='ctx'> disable_ahb_clk:</div><div class='ctx'> 	clk_disable_unprepare(imx_data-&gt;clk_ahb);</div><div class='add'>+remove_pm_qos_request:</div><div class='add'>+	if (imx_data-&gt;socdata-&gt;flags &amp; ESDHC_FLAG_PMQOS)</div><div class='add'>+		pm_qos_remove_request(&amp;imx_data-&gt;pm_qos_req);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c<br/>index c9e3e050ccc8..88dc3f00a5be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-of-arasan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-of-arasan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-of-arasan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-of-arasan.c</a></div><div class='hunk'>@@ -832,7 +832,10 @@ static int sdhci_arasan_probe(struct platform_device *pdev)</div><div class='ctx'> 		host-&gt;mmc_host_ops.start_signal_voltage_switch =</div><div class='ctx'> 					sdhci_arasan_voltage_switch;</div><div class='ctx'> 		sdhci_arasan-&gt;has_cqe = true;</div><div class='del'>-		host-&gt;mmc-&gt;caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD;</div><div class='add'>+		host-&gt;mmc-&gt;caps2 |= MMC_CAP2_CQE;</div><div class='add'>+</div><div class='add'>+		if (!of_property_read_bool(np, "disable-cqe-dcmd"))</div><div class='add'>+			host-&gt;mmc-&gt;caps2 |= MMC_CAP2_CQE_DCMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sdhci_arasan_add_host(sdhci_arasan);</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c<br/>index 4e669b4edfc1..e20c00f14109 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-of-esdhc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-of-esdhc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-of-esdhc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-of-esdhc.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/mmc/mmc.h&gt;</div><div class='ctx'> #include "sdhci-pltfm.h"</div><div class='ctx'> #include "sdhci-esdhc.h"</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +82,7 @@ struct sdhci_esdhc {</div><div class='ctx'> 	bool quirk_limited_clk_division;</div><div class='ctx'> 	bool quirk_unreliable_pulse_detection;</div><div class='ctx'> 	bool quirk_fixup_tuning;</div><div class='add'>+	bool quirk_ignore_data_inhibit;</div><div class='ctx'> 	unsigned int peripheral_clock;</div><div class='ctx'> 	const struct esdhc_clk_fixup *clk_fixup;</div><div class='ctx'> 	u32 div_ratio;</div><div class='hunk'>@@ -147,6 +149,19 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Some controllers have unreliable Data Line Active</div><div class='add'>+	 * bit for commands with busy signal. This affects</div><div class='add'>+	 * Command Inhibit (data) bit. Just ignore it since</div><div class='add'>+	 * MMC core driver has already polled card status</div><div class='add'>+	 * with CMD13 after any command with busy siganl.</div><div class='add'>+	 */</div><div class='add'>+	if ((spec_reg == SDHCI_PRESENT_STATE) &amp;&amp;</div><div class='add'>+	(esdhc-&gt;quirk_ignore_data_inhibit == true)) {</div><div class='add'>+		ret = value &amp; ~SDHCI_DATA_INHIBIT;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = value;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -694,6 +709,9 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)</div><div class='ctx'> 	sdhci_writel(host, host-&gt;ier, SDHCI_INT_ENABLE);</div><div class='ctx'> 	sdhci_writel(host, host-&gt;ier, SDHCI_SIGNAL_ENABLE);</div><div class='ctx'> </div><div class='add'>+	if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc"))</div><div class='add'>+		mdelay(5);</div><div class='add'>+</div><div class='ctx'> 	if (mask &amp; SDHCI_RESET_ALL) {</div><div class='ctx'> 		val = sdhci_readl(host, ESDHC_TBCTL);</div><div class='ctx'> 		val &amp;= ~ESDHC_TB_EN;</div><div class='hunk'>@@ -864,6 +882,25 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host,</div><div class='ctx'> 		sdhci_set_uhs_signaling(host, timing);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 esdhc_irq(struct sdhci_host *host, u32 intmask)</div><div class='add'>+{</div><div class='add'>+	u32 command;</div><div class='add'>+</div><div class='add'>+	if (of_find_compatible_node(NULL, NULL,</div><div class='add'>+				"fsl,p2020-esdhc")) {</div><div class='add'>+		command = SDHCI_GET_CMD(sdhci_readw(host,</div><div class='add'>+					SDHCI_COMMAND));</div><div class='add'>+		if (command == MMC_WRITE_MULTIPLE_BLOCK &amp;&amp;</div><div class='add'>+				sdhci_readw(host, SDHCI_BLOCK_COUNT) &amp;&amp;</div><div class='add'>+				intmask &amp; SDHCI_INT_DATA_END) {</div><div class='add'>+			intmask &amp;= ~SDHCI_INT_DATA_END;</div><div class='add'>+			sdhci_writel(host, SDHCI_INT_DATA_END,</div><div class='add'>+					SDHCI_INT_STATUS);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return intmask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static u32 esdhc_proctl;</div><div class='ctx'> static int esdhc_of_suspend(struct device *dev)</div><div class='hunk'>@@ -911,6 +948,7 @@ static const struct sdhci_ops sdhci_esdhc_be_ops = {</div><div class='ctx'> 	.set_bus_width = esdhc_pltfm_set_bus_width,</div><div class='ctx'> 	.reset = esdhc_reset,</div><div class='ctx'> 	.set_uhs_signaling = esdhc_set_uhs_signaling,</div><div class='add'>+	.irq = esdhc_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_ops sdhci_esdhc_le_ops = {</div><div class='hunk'>@@ -928,6 +966,7 @@ static const struct sdhci_ops sdhci_esdhc_le_ops = {</div><div class='ctx'> 	.set_bus_width = esdhc_pltfm_set_bus_width,</div><div class='ctx'> 	.reset = esdhc_reset,</div><div class='ctx'> 	.set_uhs_signaling = esdhc_set_uhs_signaling,</div><div class='add'>+	.irq = esdhc_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pltfm_data sdhci_esdhc_be_pdata = {</div><div class='hunk'>@@ -955,6 +994,7 @@ static struct soc_device_attribute soc_incorrect_hostver[] = {</div><div class='ctx'> </div><div class='ctx'> static struct soc_device_attribute soc_fixup_sdhc_clkdivs[] = {</div><div class='ctx'> 	{ .family = "QorIQ LX2160A", .revision = "1.0", },</div><div class='add'>+	{ .family = "QorIQ LX2160A", .revision = "2.0", },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1074,6 +1114,11 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (esdhc-&gt;vendor_ver &gt; VENDOR_V_22)</div><div class='ctx'> 		host-&gt;quirks &amp;= ~SDHCI_QUIRK_NO_BUSY_IRQ;</div><div class='ctx'> </div><div class='add'>+	if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc")) {</div><div class='add'>+		host-&gt;quirks2 |= SDHCI_QUIRK_RESET_AFTER_REQUEST;</div><div class='add'>+		host-&gt;quirks2 |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (of_device_is_compatible(np, "fsl,p5040-esdhc") ||</div><div class='ctx'> 	    of_device_is_compatible(np, "fsl,p5020-esdhc") ||</div><div class='ctx'> 	    of_device_is_compatible(np, "fsl,p4080-esdhc") ||</div><div class='hunk'>@@ -1084,12 +1129,14 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (of_device_is_compatible(np, "fsl,ls1021a-esdhc"))</div><div class='ctx'> 		host-&gt;quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;</div><div class='ctx'> </div><div class='add'>+	esdhc-&gt;quirk_ignore_data_inhibit = false;</div><div class='ctx'> 	if (of_device_is_compatible(np, "fsl,p2020-esdhc")) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Freescale messed up with P2020 as it has a non-standard</div><div class='ctx'> 		 * host control register</div><div class='ctx'> 		 */</div><div class='ctx'> 		host-&gt;quirks2 |= SDHCI_QUIRK2_BROKEN_HOST_CONTROL;</div><div class='add'>+		esdhc-&gt;quirk_ignore_data_inhibit = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* call to generic mmc_of_parse to support additional capabilities */</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c<br/>index b1a66ca3821a..bdb80c503fde 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-omap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-omap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-omap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-omap.c</a></div><div class='hunk'>@@ -785,7 +785,7 @@ static void sdhci_omap_set_uhs_signaling(struct sdhci_host *host,</div><div class='ctx'> 	sdhci_omap_start_clock(omap_host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sdhci_omap_reset(struct sdhci_host *host, u8 mask)</div><div class='add'>+static void sdhci_omap_reset(struct sdhci_host *host, u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);</div><div class='ctx'> 	struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);</div><div class='hunk'>@@ -797,6 +797,43 @@ void sdhci_omap_reset(struct sdhci_host *host, u8 mask)</div><div class='ctx'> 	sdhci_reset(host, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CMD_ERR_MASK (SDHCI_INT_CRC | SDHCI_INT_END_BIT | SDHCI_INT_INDEX |\</div><div class='add'>+		      SDHCI_INT_TIMEOUT)</div><div class='add'>+#define CMD_MASK (CMD_ERR_MASK | SDHCI_INT_RESPONSE)</div><div class='add'>+</div><div class='add'>+static u32 sdhci_omap_irq(struct sdhci_host *host, u32 intmask)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);</div><div class='add'>+	struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);</div><div class='add'>+</div><div class='add'>+	if (omap_host-&gt;is_tuning &amp;&amp; host-&gt;cmd &amp;&amp; !host-&gt;data_early &amp;&amp;</div><div class='add'>+	    (intmask &amp; CMD_ERR_MASK)) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Since we are not resetting data lines during tuning</div><div class='add'>+		 * operation, data error or data complete interrupts</div><div class='add'>+		 * might still arrive. Mark this request as a failure</div><div class='add'>+		 * but still wait for the data interrupt</div><div class='add'>+		 */</div><div class='add'>+		if (intmask &amp; SDHCI_INT_TIMEOUT)</div><div class='add'>+			host-&gt;cmd-&gt;error = -ETIMEDOUT;</div><div class='add'>+		else</div><div class='add'>+			host-&gt;cmd-&gt;error = -EILSEQ;</div><div class='add'>+</div><div class='add'>+		host-&gt;cmd = NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Sometimes command error interrupts and command complete</div><div class='add'>+		 * interrupt will arrive together. Clear all command related</div><div class='add'>+		 * interrupts here.</div><div class='add'>+		 */</div><div class='add'>+		sdhci_writel(host, intmask &amp; CMD_MASK, SDHCI_INT_STATUS);</div><div class='add'>+		intmask &amp;= ~CMD_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return intmask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sdhci_ops sdhci_omap_ops = {</div><div class='ctx'> 	.set_clock = sdhci_omap_set_clock,</div><div class='ctx'> 	.set_power = sdhci_omap_set_power,</div><div class='hunk'>@@ -807,6 +844,7 @@ static struct sdhci_ops sdhci_omap_ops = {</div><div class='ctx'> 	.platform_send_init_74_clocks = sdhci_omap_init_74_clocks,</div><div class='ctx'> 	.reset = sdhci_omap_reset,</div><div class='ctx'> 	.set_uhs_signaling = sdhci_omap_set_uhs_signaling,</div><div class='add'>+	.irq = sdhci_omap_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int sdhci_omap_set_capabilities(struct sdhci_omap_host *omap_host)</div><div class='hunk'>@@ -1056,6 +1094,9 @@ static int sdhci_omap_probe(struct platform_device *pdev)</div><div class='ctx'> 			mmc-&gt;f_max = 48000000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!mmc_can_gpio_ro(mmc))</div><div class='add'>+		mmc-&gt;caps2 |= MMC_CAP2_NO_WRITE_PROTECT;</div><div class='add'>+</div><div class='ctx'> 	pltfm_host-&gt;clk = devm_clk_get(dev, "fck");</div><div class='ctx'> 	if (IS_ERR(pltfm_host-&gt;clk)) {</div><div class='ctx'> 		ret = PTR_ERR(pltfm_host-&gt;clk);</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c<br/>index 99b0fec2836b..ab9e2b901094 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-pci-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-pci-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-pci-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-pci-core.c</a></div><div class='hunk'>@@ -31,6 +31,10 @@</div><div class='ctx'> #include &lt;linux/mmc/sdhci-pci-data.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+#include &lt;asm/iosf_mbi.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include "cqhci.h"</div><div class='ctx'> </div><div class='ctx'> #include "sdhci.h"</div><div class='hunk'>@@ -451,6 +455,50 @@ static const struct sdhci_pci_fixes sdhci_intel_pch_sdio = {</div><div class='ctx'> 	.probe_slot	= pch_hc_probe_slot,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+</div><div class='add'>+#define BYT_IOSF_SCCEP			0x63</div><div class='add'>+#define BYT_IOSF_OCP_NETCTRL0		0x1078</div><div class='add'>+#define BYT_IOSF_OCP_TIMEOUT_BASE	GENMASK(10, 8)</div><div class='add'>+</div><div class='add'>+static void byt_ocp_setting(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;device != PCI_DEVICE_ID_INTEL_BYT_EMMC &amp;&amp;</div><div class='add'>+	    pdev-&gt;device != PCI_DEVICE_ID_INTEL_BYT_SDIO &amp;&amp;</div><div class='add'>+	    pdev-&gt;device != PCI_DEVICE_ID_INTEL_BYT_SD &amp;&amp;</div><div class='add'>+	    pdev-&gt;device != PCI_DEVICE_ID_INTEL_BYT_EMMC2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (iosf_mbi_read(BYT_IOSF_SCCEP, MBI_CR_READ, BYT_IOSF_OCP_NETCTRL0,</div><div class='add'>+			  &amp;val)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "%s read error\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; BYT_IOSF_OCP_TIMEOUT_BASE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~BYT_IOSF_OCP_TIMEOUT_BASE;</div><div class='add'>+</div><div class='add'>+	if (iosf_mbi_write(BYT_IOSF_SCCEP, MBI_CR_WRITE, BYT_IOSF_OCP_NETCTRL0,</div><div class='add'>+			   val)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "%s write error\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "%s completed\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void byt_ocp_setting(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	INTEL_DSM_FNS		=  0,</div><div class='ctx'> 	INTEL_DSM_V18_SWITCH	=  3,</div><div class='hunk'>@@ -715,6 +763,8 @@ static void byt_probe_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> </div><div class='ctx'> 	byt_read_dsm(slot);</div><div class='ctx'> </div><div class='add'>+	byt_ocp_setting(slot-&gt;chip-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	ops-&gt;execute_tuning = intel_execute_tuning;</div><div class='ctx'> 	ops-&gt;start_signal_voltage_switch = intel_start_signal_voltage_switch;</div><div class='ctx'> </div><div class='hunk'>@@ -938,7 +988,35 @@ static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+</div><div class='add'>+static int byt_resume(struct sdhci_pci_chip *chip)</div><div class='add'>+{</div><div class='add'>+	byt_ocp_setting(chip-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	return sdhci_pci_resume_host(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int byt_runtime_resume(struct sdhci_pci_chip *chip)</div><div class='add'>+{</div><div class='add'>+	byt_ocp_setting(chip-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	return sdhci_pci_runtime_resume_host(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_byt_emmc = {</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.resume		= byt_resume,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.runtime_resume	= byt_runtime_resume,</div><div class='add'>+#endif</div><div class='ctx'> 	.allow_runtime_pm = true,</div><div class='ctx'> 	.probe_slot	= byt_emmc_probe_slot,</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |</div><div class='hunk'>@@ -972,6 +1050,12 @@ static const struct sdhci_pci_fixes sdhci_intel_glk_emmc = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_ni_byt_sdio = {</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.resume		= byt_resume,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.runtime_resume	= byt_runtime_resume,</div><div class='add'>+#endif</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |</div><div class='ctx'> 			  SDHCI_QUIRK_NO_LED,</div><div class='ctx'> 	.quirks2	= SDHCI_QUIRK2_HOST_OFF_CARD_ON |</div><div class='hunk'>@@ -983,6 +1067,12 @@ static const struct sdhci_pci_fixes sdhci_ni_byt_sdio = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.resume		= byt_resume,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.runtime_resume	= byt_runtime_resume,</div><div class='add'>+#endif</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |</div><div class='ctx'> 			  SDHCI_QUIRK_NO_LED,</div><div class='ctx'> 	.quirks2	= SDHCI_QUIRK2_HOST_OFF_CARD_ON |</div><div class='hunk'>@@ -994,6 +1084,12 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.resume		= byt_resume,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.runtime_resume	= byt_runtime_resume,</div><div class='add'>+#endif</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |</div><div class='ctx'> 			  SDHCI_QUIRK_NO_LED,</div><div class='ctx'> 	.quirks2	= SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |</div><div class='hunk'>@@ -1576,6 +1672,8 @@ static const struct pci_device_id pci_ids[] = {</div><div class='ctx'> 	SDHCI_PCI_DEVICE(INTEL, CNPH_SD,   intel_byt_sd),</div><div class='ctx'> 	SDHCI_PCI_DEVICE(INTEL, ICP_EMMC,  intel_glk_emmc),</div><div class='ctx'> 	SDHCI_PCI_DEVICE(INTEL, ICP_SD,    intel_byt_sd),</div><div class='add'>+	SDHCI_PCI_DEVICE(INTEL, CML_EMMC,  intel_glk_emmc),</div><div class='add'>+	SDHCI_PCI_DEVICE(INTEL, CML_SD,    intel_byt_sd),</div><div class='ctx'> 	SDHCI_PCI_DEVICE(O2, 8120,     o2),</div><div class='ctx'> 	SDHCI_PCI_DEVICE(O2, 8220,     o2),</div><div class='ctx'> 	SDHCI_PCI_DEVICE(O2, 8221,     o2),</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h<br/>index 4ddb69a15cd7..e5dc6e44c7a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-pci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-pci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-pci.h</a></div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_CNPH_SD	0xa375</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_ICP_EMMC	0x34c4</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_ICP_SD	0x34f8</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_CML_EMMC	0x02c4</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_CML_SD	0x02f5</div><div class='ctx'> </div><div class='ctx'> #define PCI_DEVICE_ID_SYSKONNECT_8000	0x8000</div><div class='ctx'> #define PCI_DEVICE_ID_VIA_95D0		0x95d0</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c<br/>index 32e62904c0d3..f608417ae967 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-tegra.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci-tegra.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci-tegra.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci-tegra.c</a></div><div class='hunk'>@@ -66,6 +66,22 @@</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_VNDR_TUN_CTRL0_0				0x1c0</div><div class='ctx'> #define SDHCI_VNDR_TUN_CTRL0_TUN_HW_TAP			0x20000</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_START_TAP_VAL_MASK		0x03fc0000</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_START_TAP_VAL_SHIFT	18</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_MUL_M_MASK			0x00001fc0</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_MUL_M_SHIFT		6</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_TUN_ITER_MASK		0x000e000</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_TUN_ITER_SHIFT		13</div><div class='add'>+#define TRIES_128					2</div><div class='add'>+#define TRIES_256					4</div><div class='add'>+#define SDHCI_VNDR_TUN_CTRL0_TUN_WORD_SEL_MASK		0x7</div><div class='add'>+</div><div class='add'>+#define SDHCI_TEGRA_VNDR_TUN_CTRL1_0			0x1c4</div><div class='add'>+#define SDHCI_TEGRA_VNDR_TUN_STATUS0			0x1C8</div><div class='add'>+#define SDHCI_TEGRA_VNDR_TUN_STATUS1			0x1CC</div><div class='add'>+#define SDHCI_TEGRA_VNDR_TUN_STATUS1_TAP_MASK		0xFF</div><div class='add'>+#define SDHCI_TEGRA_VNDR_TUN_STATUS1_END_TAP_SHIFT	0x8</div><div class='add'>+#define TUNING_WORD_BIT_SIZE				32</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_TEGRA_AUTO_CAL_CONFIG			0x1e4</div><div class='ctx'> #define SDHCI_AUTO_CAL_START				BIT(31)</div><div class='hunk'>@@ -90,6 +106,7 @@</div><div class='ctx'> #define NVQUIRK_HAS_PADCALIB				BIT(6)</div><div class='ctx'> #define NVQUIRK_NEEDS_PAD_CONTROL			BIT(7)</div><div class='ctx'> #define NVQUIRK_DIS_CARD_CLK_CONFIG_TAP			BIT(8)</div><div class='add'>+#define NVQUIRK_CQHCI_DCMD_R1B_CMD_TIMING		BIT(9)</div><div class='ctx'> </div><div class='ctx'> /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */</div><div class='ctx'> #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000</div><div class='hunk'>@@ -97,6 +114,8 @@</div><div class='ctx'> struct sdhci_tegra_soc_data {</div><div class='ctx'> 	const struct sdhci_pltfm_data *pdata;</div><div class='ctx'> 	u32 nvquirks;</div><div class='add'>+	u8 min_tap_delay;</div><div class='add'>+	u8 max_tap_delay;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Magic pull up and pull down pad calibration offsets */</div><div class='hunk'>@@ -136,6 +155,8 @@ struct sdhci_tegra {</div><div class='ctx'> 	u32 default_trim;</div><div class='ctx'> 	u32 dqs_trim;</div><div class='ctx'> 	bool enable_hwcq;</div><div class='add'>+	unsigned long curr_clk_rate;</div><div class='add'>+	u8 tuned_tap_delay;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)</div><div class='hunk'>@@ -241,6 +262,7 @@ static void tegra210_sdhci_writew(struct sdhci_host *host, u16 val, int reg)</div><div class='ctx'> </div><div class='ctx'> 	if (is_tuning_cmd) {</div><div class='ctx'> 		udelay(1);</div><div class='add'>+		sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);</div><div class='ctx'> 		tegra_sdhci_configure_card_clk(host, clk_enabled);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -722,6 +744,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> 	 */</div><div class='ctx'> 	host_clk = tegra_host-&gt;ddr_signaling ? clock * 2 : clock;</div><div class='ctx'> 	clk_set_rate(pltfm_host-&gt;clk, host_clk);</div><div class='add'>+	tegra_host-&gt;curr_clk_rate = host_clk;</div><div class='ctx'> 	if (tegra_host-&gt;ddr_signaling)</div><div class='ctx'> 		host-&gt;max_clk = host_clk;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -770,6 +793,159 @@ static void tegra_sdhci_hs400_dll_cal(struct sdhci_host *host)</div><div class='ctx'> 			"HS400 delay line calibration timed out\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tegra_sdhci_tap_correction(struct sdhci_host *host, u8 thd_up,</div><div class='add'>+				       u8 thd_low, u8 fixed_tap)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);</div><div class='add'>+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);</div><div class='add'>+	u32 val, tun_status;</div><div class='add'>+	u8 word, bit, edge1, tap, window;</div><div class='add'>+	bool tap_result;</div><div class='add'>+	bool start_fail = false;</div><div class='add'>+	bool start_pass = false;</div><div class='add'>+	bool end_pass = false;</div><div class='add'>+	bool first_fail = false;</div><div class='add'>+	bool first_pass = false;</div><div class='add'>+	u8 start_pass_tap = 0;</div><div class='add'>+	u8 end_pass_tap = 0;</div><div class='add'>+	u8 first_fail_tap = 0;</div><div class='add'>+	u8 first_pass_tap = 0;</div><div class='add'>+	u8 total_tuning_words = host-&gt;tuning_loop_count / TUNING_WORD_BIT_SIZE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read auto-tuned results and extract good valid passing window by</div><div class='add'>+	 * filtering out un-wanted bubble/partial/merged windows.</div><div class='add'>+	 */</div><div class='add'>+	for (word = 0; word &lt; total_tuning_words; word++) {</div><div class='add'>+		val = sdhci_readl(host, SDHCI_VNDR_TUN_CTRL0_0);</div><div class='add'>+		val &amp;= ~SDHCI_VNDR_TUN_CTRL0_TUN_WORD_SEL_MASK;</div><div class='add'>+		val |= word;</div><div class='add'>+		sdhci_writel(host, val, SDHCI_VNDR_TUN_CTRL0_0);</div><div class='add'>+		tun_status = sdhci_readl(host, SDHCI_TEGRA_VNDR_TUN_STATUS0);</div><div class='add'>+		bit = 0;</div><div class='add'>+		while (bit &lt; TUNING_WORD_BIT_SIZE) {</div><div class='add'>+			tap = word * TUNING_WORD_BIT_SIZE + bit;</div><div class='add'>+			tap_result = tun_status &amp; (1 &lt;&lt; bit);</div><div class='add'>+			if (!tap_result &amp;&amp; !start_fail) {</div><div class='add'>+				start_fail = true;</div><div class='add'>+				if (!first_fail) {</div><div class='add'>+					first_fail_tap = tap;</div><div class='add'>+					first_fail = true;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+			} else if (tap_result &amp;&amp; start_fail &amp;&amp; !start_pass) {</div><div class='add'>+				start_pass_tap = tap;</div><div class='add'>+				start_pass = true;</div><div class='add'>+				if (!first_pass) {</div><div class='add'>+					first_pass_tap = tap;</div><div class='add'>+					first_pass = true;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+			} else if (!tap_result &amp;&amp; start_fail &amp;&amp; start_pass &amp;&amp;</div><div class='add'>+				   !end_pass) {</div><div class='add'>+				end_pass_tap = tap - 1;</div><div class='add'>+				end_pass = true;</div><div class='add'>+			} else if (tap_result &amp;&amp; start_pass &amp;&amp; start_fail &amp;&amp;</div><div class='add'>+				   end_pass) {</div><div class='add'>+				window = end_pass_tap - start_pass_tap;</div><div class='add'>+				/* discard merged window and bubble window */</div><div class='add'>+				if (window &gt;= thd_up || window &lt; thd_low) {</div><div class='add'>+					start_pass_tap = tap;</div><div class='add'>+					end_pass = false;</div><div class='add'>+				} else {</div><div class='add'>+					/* set tap at middle of valid window */</div><div class='add'>+					tap = start_pass_tap + window / 2;</div><div class='add'>+					tegra_host-&gt;tuned_tap_delay = tap;</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			bit++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!first_fail) {</div><div class='add'>+		WARN_ON("no edge detected, continue with hw tuned delay.\n");</div><div class='add'>+	} else if (first_pass) {</div><div class='add'>+		/* set tap location at fixed tap relative to the first edge */</div><div class='add'>+		edge1 = first_fail_tap + (first_pass_tap - first_fail_tap) / 2;</div><div class='add'>+		if (edge1 - 1 &gt; fixed_tap)</div><div class='add'>+			tegra_host-&gt;tuned_tap_delay = edge1 - fixed_tap;</div><div class='add'>+		else</div><div class='add'>+			tegra_host-&gt;tuned_tap_delay = edge1 + fixed_tap;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_sdhci_post_tuning(struct sdhci_host *host)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);</div><div class='add'>+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);</div><div class='add'>+	const struct sdhci_tegra_soc_data *soc_data = tegra_host-&gt;soc_data;</div><div class='add'>+	u32 avg_tap_dly, val, min_tap_dly, max_tap_dly;</div><div class='add'>+	u8 fixed_tap, start_tap, end_tap, window_width;</div><div class='add'>+	u8 thdupper, thdlower;</div><div class='add'>+	u8 num_iter;</div><div class='add'>+	u32 clk_rate_mhz, period_ps, bestcase, worstcase;</div><div class='add'>+</div><div class='add'>+	/* retain HW tuned tap to use incase if no correction is needed */</div><div class='add'>+	val = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);</div><div class='add'>+	tegra_host-&gt;tuned_tap_delay = (val &amp; SDHCI_CLOCK_CTRL_TAP_MASK) &gt;&gt;</div><div class='add'>+				      SDHCI_CLOCK_CTRL_TAP_SHIFT;</div><div class='add'>+	if (soc_data-&gt;min_tap_delay &amp;&amp; soc_data-&gt;max_tap_delay) {</div><div class='add'>+		min_tap_dly = soc_data-&gt;min_tap_delay;</div><div class='add'>+		max_tap_dly = soc_data-&gt;max_tap_delay;</div><div class='add'>+		clk_rate_mhz = tegra_host-&gt;curr_clk_rate / USEC_PER_SEC;</div><div class='add'>+		period_ps = USEC_PER_SEC / clk_rate_mhz;</div><div class='add'>+		bestcase = period_ps / min_tap_dly;</div><div class='add'>+		worstcase = period_ps / max_tap_dly;</div><div class='add'>+		/*</div><div class='add'>+		 * Upper and Lower bound thresholds used to detect merged and</div><div class='add'>+		 * bubble windows</div><div class='add'>+		 */</div><div class='add'>+		thdupper = (2 * worstcase + bestcase) / 2;</div><div class='add'>+		thdlower = worstcase / 4;</div><div class='add'>+		/*</div><div class='add'>+		 * fixed tap is used when HW tuning result contains single edge</div><div class='add'>+		 * and tap is set at fixed tap delay relative to the first edge</div><div class='add'>+		 */</div><div class='add'>+		avg_tap_dly = (period_ps * 2) / (min_tap_dly + max_tap_dly);</div><div class='add'>+		fixed_tap = avg_tap_dly / 2;</div><div class='add'>+</div><div class='add'>+		val = sdhci_readl(host, SDHCI_TEGRA_VNDR_TUN_STATUS1);</div><div class='add'>+		start_tap = val &amp; SDHCI_TEGRA_VNDR_TUN_STATUS1_TAP_MASK;</div><div class='add'>+		end_tap = (val &gt;&gt; SDHCI_TEGRA_VNDR_TUN_STATUS1_END_TAP_SHIFT) &amp;</div><div class='add'>+			  SDHCI_TEGRA_VNDR_TUN_STATUS1_TAP_MASK;</div><div class='add'>+		window_width = end_tap - start_tap;</div><div class='add'>+		num_iter = host-&gt;tuning_loop_count;</div><div class='add'>+		/*</div><div class='add'>+		 * partial window includes edges of the tuning range.</div><div class='add'>+		 * merged window includes more taps so window width is higher</div><div class='add'>+		 * than upper threshold.</div><div class='add'>+		 */</div><div class='add'>+		if (start_tap == 0 || (end_tap == (num_iter - 1)) ||</div><div class='add'>+		    (end_tap == num_iter - 2) || window_width &gt;= thdupper) {</div><div class='add'>+			pr_debug("%s: Apply tuning correction\n",</div><div class='add'>+				 mmc_hostname(host-&gt;mmc));</div><div class='add'>+			tegra_sdhci_tap_correction(host, thdupper, thdlower,</div><div class='add'>+						   fixed_tap);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tegra_sdhci_set_tap(host, tegra_host-&gt;tuned_tap_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_sdhci_execute_hw_tuning(struct mmc_host *mmc, u32 opcode)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_host *host = mmc_priv(mmc);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = sdhci_execute_tuning(mmc, opcode);</div><div class='add'>+	if (!err &amp;&amp; !host-&gt;tuning_err)</div><div class='add'>+		tegra_sdhci_post_tuning(host);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,</div><div class='ctx'> 					  unsigned timing)</div><div class='ctx'> {</div><div class='hunk'>@@ -778,16 +954,22 @@ static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,</div><div class='ctx'> 	bool set_default_tap = false;</div><div class='ctx'> 	bool set_dqs_trim = false;</div><div class='ctx'> 	bool do_hs400_dll_cal = false;</div><div class='add'>+	u8 iter = TRIES_256;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='add'>+	tegra_host-&gt;ddr_signaling = false;</div><div class='ctx'> 	switch (timing) {</div><div class='ctx'> 	case MMC_TIMING_UHS_SDR50:</div><div class='add'>+		break;</div><div class='ctx'> 	case MMC_TIMING_UHS_SDR104:</div><div class='ctx'> 	case MMC_TIMING_MMC_HS200:</div><div class='ctx'> 		/* Don't set default tap on tunable modes. */</div><div class='add'>+		iter = TRIES_128;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MMC_TIMING_MMC_HS400:</div><div class='ctx'> 		set_dqs_trim = true;</div><div class='ctx'> 		do_hs400_dll_cal = true;</div><div class='add'>+		iter = TRIES_128;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MMC_TIMING_MMC_DDR52:</div><div class='ctx'> 	case MMC_TIMING_UHS_DDR50:</div><div class='hunk'>@@ -799,11 +981,25 @@ static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	val = sdhci_readl(host, SDHCI_VNDR_TUN_CTRL0_0);</div><div class='add'>+	val &amp;= ~(SDHCI_VNDR_TUN_CTRL0_TUN_ITER_MASK |</div><div class='add'>+		 SDHCI_VNDR_TUN_CTRL0_START_TAP_VAL_MASK |</div><div class='add'>+		 SDHCI_VNDR_TUN_CTRL0_MUL_M_MASK);</div><div class='add'>+	val |= (iter &lt;&lt; SDHCI_VNDR_TUN_CTRL0_TUN_ITER_SHIFT |</div><div class='add'>+		0 &lt;&lt; SDHCI_VNDR_TUN_CTRL0_START_TAP_VAL_SHIFT |</div><div class='add'>+		1 &lt;&lt; SDHCI_VNDR_TUN_CTRL0_MUL_M_SHIFT);</div><div class='add'>+	sdhci_writel(host, val, SDHCI_VNDR_TUN_CTRL0_0);</div><div class='add'>+	sdhci_writel(host, 0, SDHCI_TEGRA_VNDR_TUN_CTRL1_0);</div><div class='add'>+</div><div class='add'>+	host-&gt;tuning_loop_count = (iter == TRIES_128) ? 128 : 256;</div><div class='add'>+</div><div class='ctx'> 	sdhci_set_uhs_signaling(host, timing);</div><div class='ctx'> </div><div class='ctx'> 	tegra_sdhci_pad_autocalib(host);</div><div class='ctx'> </div><div class='del'>-	if (set_default_tap)</div><div class='add'>+	if (tegra_host-&gt;tuned_tap_delay &amp;&amp; !set_default_tap)</div><div class='add'>+		tegra_sdhci_set_tap(host, tegra_host-&gt;tuned_tap_delay);</div><div class='add'>+	else</div><div class='ctx'> 		tegra_sdhci_set_tap(host, tegra_host-&gt;default_tap);</div><div class='ctx'> </div><div class='ctx'> 	if (set_dqs_trim)</div><div class='hunk'>@@ -928,23 +1124,86 @@ static void tegra_sdhci_voltage_switch(struct sdhci_host *host)</div><div class='ctx'> 		tegra_host-&gt;pad_calib_required = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tegra_cqhci_writel(struct cqhci_host *cq_host, u32 val, int reg)</div><div class='add'>+{</div><div class='add'>+	struct mmc_host *mmc = cq_host-&gt;mmc;</div><div class='add'>+	u8 ctrl;</div><div class='add'>+	ktime_t timeout;</div><div class='add'>+	bool timed_out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * During CQE resume/unhalt, CQHCI driver unhalts CQE prior to</div><div class='add'>+	 * cqhci_host_ops enable where SDHCI DMA and BLOCK_SIZE registers need</div><div class='add'>+	 * to be re-configured.</div><div class='add'>+	 * Tegra CQHCI/SDHCI prevents write access to block size register when</div><div class='add'>+	 * CQE is unhalted. So handling CQE resume sequence here to configure</div><div class='add'>+	 * SDHCI block registers prior to exiting CQE halt state.</div><div class='add'>+	 */</div><div class='add'>+	if (reg == CQHCI_CTL &amp;&amp; !(val &amp; CQHCI_HALT) &amp;&amp;</div><div class='add'>+	    cqhci_readl(cq_host, CQHCI_CTL) &amp; CQHCI_HALT) {</div><div class='add'>+		sdhci_cqe_enable(mmc);</div><div class='add'>+		writel(val, cq_host-&gt;mmio + reg);</div><div class='add'>+		timeout = ktime_add_us(ktime_get(), 50);</div><div class='add'>+		while (1) {</div><div class='add'>+			timed_out = ktime_compare(ktime_get(), timeout) &gt; 0;</div><div class='add'>+			ctrl = cqhci_readl(cq_host, CQHCI_CTL);</div><div class='add'>+			if (!(ctrl &amp; CQHCI_HALT) || timed_out)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * CQE usually resumes very quick, but incase if Tegra CQE</div><div class='add'>+		 * doesn't resume retry unhalt.</div><div class='add'>+		 */</div><div class='add'>+		if (timed_out)</div><div class='add'>+			writel(val, cq_host-&gt;mmio + reg);</div><div class='add'>+	} else {</div><div class='add'>+		writel(val, cq_host-&gt;mmio + reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sdhci_tegra_update_dcmd_desc(struct mmc_host *mmc,</div><div class='add'>+					 struct mmc_request *mrq, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(mmc_priv(mmc));</div><div class='add'>+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);</div><div class='add'>+	const struct sdhci_tegra_soc_data *soc_data = tegra_host-&gt;soc_data;</div><div class='add'>+</div><div class='add'>+	if (soc_data-&gt;nvquirks &amp; NVQUIRK_CQHCI_DCMD_R1B_CMD_TIMING &amp;&amp;</div><div class='add'>+	    mrq-&gt;cmd-&gt;flags &amp; MMC_RSP_R1B)</div><div class='add'>+		*data |= CQHCI_CMD_TIMING(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sdhci_tegra_cqe_enable(struct mmc_host *mmc)</div><div class='ctx'> {</div><div class='ctx'> 	struct cqhci_host *cq_host = mmc-&gt;cqe_private;</div><div class='del'>-	u32 cqcfg = 0;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Tegra SDMMC Controller design prevents write access to BLOCK_COUNT</div><div class='del'>-	 * registers when CQE is enabled.</div><div class='add'>+	 * Tegra CQHCI/SDMMC design prevents write access to sdhci block size</div><div class='add'>+	 * register when CQE is enabled and unhalted.</div><div class='add'>+	 * CQHCI driver enables CQE prior to activation, so disable CQE before</div><div class='add'>+	 * programming block size in sdhci controller and enable it back.</div><div class='ctx'> 	 */</div><div class='del'>-	cqcfg = cqhci_readl(cq_host, CQHCI_CFG);</div><div class='del'>-	if (cqcfg &amp; CQHCI_ENABLE)</div><div class='del'>-		cqhci_writel(cq_host, (cqcfg &amp; ~CQHCI_ENABLE), CQHCI_CFG);</div><div class='del'>-</div><div class='del'>-	sdhci_cqe_enable(mmc);</div><div class='add'>+	if (!cq_host-&gt;activated) {</div><div class='add'>+		val = cqhci_readl(cq_host, CQHCI_CFG);</div><div class='add'>+		if (val &amp; CQHCI_ENABLE)</div><div class='add'>+			cqhci_writel(cq_host, (val &amp; ~CQHCI_ENABLE),</div><div class='add'>+				     CQHCI_CFG);</div><div class='add'>+		sdhci_cqe_enable(mmc);</div><div class='add'>+		if (val &amp; CQHCI_ENABLE)</div><div class='add'>+			cqhci_writel(cq_host, val, CQHCI_CFG);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (cqcfg &amp; CQHCI_ENABLE)</div><div class='del'>-		cqhci_writel(cq_host, cqcfg, CQHCI_CFG);</div><div class='add'>+	/*</div><div class='add'>+	 * CMD CRC errors are seen sometimes with some eMMC devices when status</div><div class='add'>+	 * command is sent during transfer of last data block which is the</div><div class='add'>+	 * default case as send status command block counter (CBC) is 1.</div><div class='add'>+	 * Recommended fix to set CBC to 0 allowing send status command only</div><div class='add'>+	 * when data lines are idle.</div><div class='add'>+	 */</div><div class='add'>+	val = cqhci_readl(cq_host, CQHCI_SSC1);</div><div class='add'>+	val &amp;= ~CQHCI_SSC1_CBC_MASK;</div><div class='add'>+	cqhci_writel(cq_host, val, CQHCI_SSC1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_tegra_dumpregs(struct mmc_host *mmc)</div><div class='hunk'>@@ -966,9 +1225,11 @@ static u32 sdhci_tegra_cqhci_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct cqhci_host_ops sdhci_tegra_cqhci_ops = {</div><div class='add'>+	.write_l    = tegra_cqhci_writel,</div><div class='ctx'> 	.enable	= sdhci_tegra_cqe_enable,</div><div class='ctx'> 	.disable = sdhci_cqe_disable,</div><div class='ctx'> 	.dumpregs = sdhci_tegra_dumpregs,</div><div class='add'>+	.update_dcmd_desc = sdhci_tegra_update_dcmd_desc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_ops tegra_sdhci_ops = {</div><div class='hunk'>@@ -1109,6 +1370,8 @@ static const struct sdhci_tegra_soc_data soc_data_tegra210 = {</div><div class='ctx'> 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |</div><div class='ctx'> 		    NVQUIRK_ENABLE_SDR50 |</div><div class='ctx'> 		    NVQUIRK_ENABLE_SDR104,</div><div class='add'>+	.min_tap_delay = 106,</div><div class='add'>+	.max_tap_delay = 185,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_ops tegra186_sdhci_ops = {</div><div class='hunk'>@@ -1148,10 +1411,25 @@ static const struct sdhci_tegra_soc_data soc_data_tegra186 = {</div><div class='ctx'> 		    NVQUIRK_HAS_PADCALIB |</div><div class='ctx'> 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |</div><div class='ctx'> 		    NVQUIRK_ENABLE_SDR50 |</div><div class='add'>+		    NVQUIRK_ENABLE_SDR104 |</div><div class='add'>+		    NVQUIRK_CQHCI_DCMD_R1B_CMD_TIMING,</div><div class='add'>+	.min_tap_delay = 84,</div><div class='add'>+	.max_tap_delay = 136,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sdhci_tegra_soc_data soc_data_tegra194 = {</div><div class='add'>+	.pdata = &amp;sdhci_tegra186_pdata,</div><div class='add'>+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |</div><div class='add'>+		    NVQUIRK_HAS_PADCALIB |</div><div class='add'>+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |</div><div class='add'>+		    NVQUIRK_ENABLE_SDR50 |</div><div class='ctx'> 		    NVQUIRK_ENABLE_SDR104,</div><div class='add'>+	.min_tap_delay = 96,</div><div class='add'>+	.max_tap_delay = 139,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id sdhci_tegra_dt_match[] = {</div><div class='add'>+	{ .compatible = "nvidia,tegra194-sdhci", .data = &amp;soc_data_tegra194 },</div><div class='ctx'> 	{ .compatible = "nvidia,tegra186-sdhci", .data = &amp;soc_data_tegra186 },</div><div class='ctx'> 	{ .compatible = "nvidia,tegra210-sdhci", .data = &amp;soc_data_tegra210 },</div><div class='ctx'> 	{ .compatible = "nvidia,tegra124-sdhci", .data = &amp;soc_data_tegra124 },</div><div class='hunk'>@@ -1250,6 +1528,10 @@ static int sdhci_tegra_probe(struct platform_device *pdev)</div><div class='ctx'> 	host-&gt;mmc_host_ops.hs400_enhanced_strobe =</div><div class='ctx'> 			tegra_sdhci_hs400_enhanced_strobe;</div><div class='ctx'> </div><div class='add'>+	if (!host-&gt;ops-&gt;platform_execute_tuning)</div><div class='add'>+		host-&gt;mmc_host_ops.execute_tuning =</div><div class='add'>+				tegra_sdhci_execute_hw_tuning;</div><div class='add'>+</div><div class='ctx'> 	rc = mmc_of_parse(host-&gt;mmc);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_parse_dt;</div><div class='hunk'>@@ -1329,11 +1611,67 @@ static int sdhci_tegra_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int __maybe_unused sdhci_tegra_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_host *host = dev_get_drvdata(dev);</div><div class='add'>+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;mmc-&gt;caps2 &amp; MMC_CAP2_CQE) {</div><div class='add'>+		ret = cqhci_suspend(host-&gt;mmc);</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 = sdhci_suspend_host(host);</div><div class='add'>+	if (ret) {</div><div class='add'>+		cqhci_resume(host-&gt;mmc);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(pltfm_host-&gt;clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused sdhci_tegra_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sdhci_host *host = dev_get_drvdata(dev);</div><div class='add'>+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(pltfm_host-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = sdhci_resume_host(host);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto disable_clk;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;mmc-&gt;caps2 &amp; MMC_CAP2_CQE) {</div><div class='add'>+		ret = cqhci_resume(host-&gt;mmc);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto suspend_host;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+suspend_host:</div><div class='add'>+	sdhci_suspend_host(host);</div><div class='add'>+disable_clk:</div><div class='add'>+	clk_disable_unprepare(pltfm_host-&gt;clk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(sdhci_tegra_dev_pm_ops, sdhci_tegra_suspend,</div><div class='add'>+			 sdhci_tegra_resume);</div><div class='add'>+</div><div class='ctx'> static struct platform_driver sdhci_tegra_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "sdhci-tegra",</div><div class='ctx'> 		.of_match_table = sdhci_tegra_dt_match,</div><div class='del'>-		.pm	= &amp;sdhci_pltfm_pmops,</div><div class='add'>+		.pm	= &amp;sdhci_tegra_dev_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= sdhci_tegra_probe,</div><div class='ctx'> 	.remove		= sdhci_tegra_remove,</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c<br/>index a8141ff9be03..97158344b862 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci.c</a></div><div class='hunk'>@@ -446,6 +446,28 @@ static inline void sdhci_led_deactivate(struct sdhci_host *host)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void sdhci_mod_timer(struct sdhci_host *host, struct mmc_request *mrq,</div><div class='add'>+			    unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	if (sdhci_data_line_cmd(mrq-&gt;cmd))</div><div class='add'>+		mod_timer(&amp;host-&gt;data_timer, timeout);</div><div class='add'>+	else</div><div class='add'>+		mod_timer(&amp;host-&gt;timer, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sdhci_del_timer(struct sdhci_host *host, struct mmc_request *mrq)</div><div class='add'>+{</div><div class='add'>+	if (sdhci_data_line_cmd(mrq-&gt;cmd))</div><div class='add'>+		del_timer(&amp;host-&gt;data_timer);</div><div class='add'>+	else</div><div class='add'>+		del_timer(&amp;host-&gt;timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool sdhci_has_requests(struct sdhci_host *host)</div><div class='add'>+{</div><div class='add'>+	return host-&gt;cmd || host-&gt;data_cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************\</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * Core functions                                                            *</div><div class='hunk'>@@ -1221,6 +1243,18 @@ static void __sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (host-&gt;cmd &amp;&amp; host-&gt;cmd-&gt;mrq == mrq)</div><div class='add'>+		host-&gt;cmd = NULL;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;data_cmd &amp;&amp; host-&gt;data_cmd-&gt;mrq == mrq)</div><div class='add'>+		host-&gt;data_cmd = NULL;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;data &amp;&amp; host-&gt;data-&gt;mrq == mrq)</div><div class='add'>+		host-&gt;data = NULL;</div><div class='add'>+</div><div class='add'>+	if (sdhci_needs_reset(host, mrq))</div><div class='add'>+		host-&gt;pending_reset = true;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; SDHCI_MAX_MRQS; i++) {</div><div class='ctx'> 		if (host-&gt;mrqs_done[i] == mrq) {</div><div class='ctx'> 			WARN_ON(1);</div><div class='hunk'>@@ -1237,24 +1271,17 @@ static void __sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(i &gt;= SDHCI_MAX_MRQS);</div><div class='ctx'> </div><div class='del'>-	tasklet_schedule(&amp;host-&gt;finish_tasklet);</div><div class='add'>+	sdhci_del_timer(host, mrq);</div><div class='add'>+</div><div class='add'>+	if (!sdhci_has_requests(host))</div><div class='add'>+		sdhci_led_deactivate(host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='del'>-	if (host-&gt;cmd &amp;&amp; host-&gt;cmd-&gt;mrq == mrq)</div><div class='del'>-		host-&gt;cmd = NULL;</div><div class='del'>-</div><div class='del'>-	if (host-&gt;data_cmd &amp;&amp; host-&gt;data_cmd-&gt;mrq == mrq)</div><div class='del'>-		host-&gt;data_cmd = NULL;</div><div class='del'>-</div><div class='del'>-	if (host-&gt;data &amp;&amp; host-&gt;data-&gt;mrq == mrq)</div><div class='del'>-		host-&gt;data = NULL;</div><div class='del'>-</div><div class='del'>-	if (sdhci_needs_reset(host, mrq))</div><div class='del'>-		host-&gt;pending_reset = true;</div><div class='del'>-</div><div class='ctx'> 	__sdhci_finish_mrq(host, mrq);</div><div class='add'>+</div><div class='add'>+	queue_work(host-&gt;complete_wq, &amp;host-&gt;complete_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_finish_data(struct sdhci_host *host)</div><div class='hunk'>@@ -1305,34 +1332,17 @@ static void sdhci_finish_data(struct sdhci_host *host)</div><div class='ctx'> 		 * responsibility to send the stop command if required.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (data-&gt;mrq-&gt;cap_cmd_during_tfr) {</div><div class='del'>-			sdhci_finish_mrq(host, data-&gt;mrq);</div><div class='add'>+			__sdhci_finish_mrq(host, data-&gt;mrq);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Avoid triggering warning in sdhci_send_command() */</div><div class='ctx'> 			host-&gt;cmd = NULL;</div><div class='ctx'> 			sdhci_send_command(host, data-&gt;stop);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		sdhci_finish_mrq(host, data-&gt;mrq);</div><div class='add'>+		__sdhci_finish_mrq(host, data-&gt;mrq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sdhci_mod_timer(struct sdhci_host *host, struct mmc_request *mrq,</div><div class='del'>-			    unsigned long timeout)</div><div class='del'>-{</div><div class='del'>-	if (sdhci_data_line_cmd(mrq-&gt;cmd))</div><div class='del'>-		mod_timer(&amp;host-&gt;data_timer, timeout);</div><div class='del'>-	else</div><div class='del'>-		mod_timer(&amp;host-&gt;timer, timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sdhci_del_timer(struct sdhci_host *host, struct mmc_request *mrq)</div><div class='del'>-{</div><div class='del'>-	if (sdhci_data_line_cmd(mrq-&gt;cmd))</div><div class='del'>-		del_timer(&amp;host-&gt;data_timer);</div><div class='del'>-	else</div><div class='del'>-		del_timer(&amp;host-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int flags;</div><div class='hunk'>@@ -1492,7 +1502,7 @@ static void sdhci_finish_command(struct sdhci_host *host)</div><div class='ctx'> 			sdhci_finish_data(host);</div><div class='ctx'> </div><div class='ctx'> 		if (!cmd-&gt;data)</div><div class='del'>-			sdhci_finish_mrq(host, cmd-&gt;mrq);</div><div class='add'>+			__sdhci_finish_mrq(host, cmd-&gt;mrq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1807,7 +1817,6 @@ void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 			sdhci_send_command(host, mrq-&gt;cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sdhci_request);</div><div class='hunk'>@@ -2010,8 +2019,6 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (host-&gt;quirks &amp; SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS)</div><div class='ctx'> 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);</div><div class='del'>-</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sdhci_set_ios);</div><div class='ctx'> </div><div class='hunk'>@@ -2105,7 +2112,6 @@ static void sdhci_enable_sdio_irq_nolock(struct sdhci_host *host, int enable)</div><div class='ctx'> </div><div class='ctx'> 		sdhci_writel(host, host-&gt;ier, SDHCI_INT_ENABLE);</div><div class='ctx'> 		sdhci_writel(host, host-&gt;ier, SDHCI_SIGNAL_ENABLE);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2353,7 +2359,6 @@ void sdhci_send_tuning(struct sdhci_host *host, u32 opcode)</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;tuning_done = 0;</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for Buffer Read Ready interrupt */</div><div class='hunk'>@@ -2369,9 +2374,9 @@ static int __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Issue opcode repeatedly till Execute Tuning is set to 0 or the number</div><div class='del'>-	 * of loops reaches 40 times.</div><div class='add'>+	 * of loops reaches tuning loop count.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; MAX_TUNING_LOOP; i++) {</div><div class='add'>+	for (i = 0; i &lt; host-&gt;tuning_loop_count; i++) {</div><div class='ctx'> 		u16 ctrl;</div><div class='ctx'> </div><div class='ctx'> 		sdhci_send_tuning(host, opcode);</div><div class='hunk'>@@ -2528,11 +2533,6 @@ static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 		sdhci_pre_dma_transfer(host, mrq-&gt;data, COOKIE_PRE_MAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool sdhci_has_requests(struct sdhci_host *host)</div><div class='del'>-{</div><div class='del'>-	return host-&gt;cmd || host-&gt;data_cmd;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void sdhci_error_out_mrqs(struct sdhci_host *host, int err)</div><div class='ctx'> {</div><div class='ctx'> 	if (host-&gt;data_cmd) {</div><div class='hunk'>@@ -2594,7 +2594,7 @@ static const struct mmc_host_ops sdhci_ops = {</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************\</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * Tasklets                                                                  *</div><div class='add'>+ * Request done                                                              *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'> \*****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -2617,8 +2617,6 @@ static bool sdhci_request_done(struct sdhci_host *host)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdhci_del_timer(host, mrq);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Always unmap the data buffers if they were mapped by</div><div class='ctx'> 	 * sdhci_prepare_data() whenever we finish with a request.</div><div class='hunk'>@@ -2700,12 +2698,8 @@ static bool sdhci_request_done(struct sdhci_host *host)</div><div class='ctx'> 		host-&gt;pending_reset = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sdhci_has_requests(host))</div><div class='del'>-		sdhci_led_deactivate(host);</div><div class='del'>-</div><div class='ctx'> 	host-&gt;mrqs_done[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	mmc_request_done(host-&gt;mmc, mrq);</div><div class='hunk'>@@ -2713,9 +2707,10 @@ static bool sdhci_request_done(struct sdhci_host *host)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sdhci_tasklet_finish(unsigned long param)</div><div class='add'>+static void sdhci_complete_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct sdhci_host *host = (struct sdhci_host *)param;</div><div class='add'>+	struct sdhci_host *host = container_of(work, struct sdhci_host,</div><div class='add'>+					       complete_work);</div><div class='ctx'> </div><div class='ctx'> 	while (!sdhci_request_done(host))</div><div class='ctx'> 		;</div><div class='hunk'>@@ -2739,7 +2734,6 @@ static void sdhci_timeout_timer(struct timer_list *t)</div><div class='ctx'> 		sdhci_finish_mrq(host, host-&gt;cmd-&gt;mrq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2761,6 +2755,7 @@ static void sdhci_timeout_data_timer(struct timer_list *t)</div><div class='ctx'> 		if (host-&gt;data) {</div><div class='ctx'> 			host-&gt;data-&gt;error = -ETIMEDOUT;</div><div class='ctx'> 			sdhci_finish_data(host);</div><div class='add'>+			queue_work(host-&gt;complete_wq, &amp;host-&gt;complete_work);</div><div class='ctx'> 		} else if (host-&gt;data_cmd) {</div><div class='ctx'> 			host-&gt;data_cmd-&gt;error = -ETIMEDOUT;</div><div class='ctx'> 			sdhci_finish_mrq(host, host-&gt;data_cmd-&gt;mrq);</div><div class='hunk'>@@ -2770,7 +2765,6 @@ static void sdhci_timeout_data_timer(struct timer_list *t)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2827,7 +2821,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *intmask_p)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sdhci_finish_mrq(host, host-&gt;cmd-&gt;mrq);</div><div class='add'>+		__sdhci_finish_mrq(host, host-&gt;cmd-&gt;mrq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2841,7 +2835,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *intmask_p)</div><div class='ctx'> </div><div class='ctx'> 		if (mrq-&gt;sbc &amp;&amp; (host-&gt;flags &amp; SDHCI_AUTO_CMD23)) {</div><div class='ctx'> 			mrq-&gt;sbc-&gt;error = err;</div><div class='del'>-			sdhci_finish_mrq(host, mrq);</div><div class='add'>+			__sdhci_finish_mrq(host, mrq);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2905,7 +2899,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> 			if (intmask &amp; SDHCI_INT_DATA_TIMEOUT) {</div><div class='ctx'> 				host-&gt;data_cmd = NULL;</div><div class='ctx'> 				data_cmd-&gt;error = -ETIMEDOUT;</div><div class='del'>-				sdhci_finish_mrq(host, data_cmd-&gt;mrq);</div><div class='add'>+				__sdhci_finish_mrq(host, data_cmd-&gt;mrq);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (intmask &amp; SDHCI_INT_DATA_END) {</div><div class='hunk'>@@ -2918,7 +2912,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> 				if (host-&gt;cmd == data_cmd)</div><div class='ctx'> 					return;</div><div class='ctx'> </div><div class='del'>-				sdhci_finish_mrq(host, data_cmd-&gt;mrq);</div><div class='add'>+				__sdhci_finish_mrq(host, data_cmd-&gt;mrq);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3001,12 +2995,24 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool sdhci_defer_done(struct sdhci_host *host,</div><div class='add'>+				    struct mmc_request *mrq)</div><div class='add'>+{</div><div class='add'>+	struct mmc_data *data = mrq-&gt;data;</div><div class='add'>+</div><div class='add'>+	return host-&gt;pending_reset ||</div><div class='add'>+	       ((host-&gt;flags &amp; SDHCI_REQ_USE_DMA) &amp;&amp; data &amp;&amp;</div><div class='add'>+		data-&gt;host_cookie == COOKIE_MAPPED);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t sdhci_irq(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='add'>+	struct mmc_request *mrqs_done[SDHCI_MAX_MRQS] = {0};</div><div class='ctx'> 	irqreturn_t result = IRQ_NONE;</div><div class='ctx'> 	struct sdhci_host *host = dev_id;</div><div class='ctx'> 	u32 intmask, mask, unexpected = 0;</div><div class='ctx'> 	int max_loops = 16;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3100,9 +3106,30 @@ cont:</div><div class='ctx'> </div><div class='ctx'> 		intmask = sdhci_readl(host, SDHCI_INT_STATUS);</div><div class='ctx'> 	} while (intmask &amp;&amp; --max_loops);</div><div class='add'>+</div><div class='add'>+	/* Determine if mrqs can be completed immediately */</div><div class='add'>+	for (i = 0; i &lt; SDHCI_MAX_MRQS; i++) {</div><div class='add'>+		struct mmc_request *mrq = host-&gt;mrqs_done[i];</div><div class='add'>+</div><div class='add'>+		if (!mrq)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (sdhci_defer_done(host, mrq)) {</div><div class='add'>+			result = IRQ_WAKE_THREAD;</div><div class='add'>+		} else {</div><div class='add'>+			mrqs_done[i] = mrq;</div><div class='add'>+			host-&gt;mrqs_done[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/* Process mrqs ready for immediate completion */</div><div class='add'>+	for (i = 0; i &lt; SDHCI_MAX_MRQS; i++) {</div><div class='add'>+		if (mrqs_done[i])</div><div class='add'>+			mmc_request_done(host-&gt;mmc, mrqs_done[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unexpected) {</div><div class='ctx'> 		pr_err("%s: Unexpected interrupt 0x%08x.\n",</div><div class='ctx'> 			   mmc_hostname(host-&gt;mmc), unexpected);</div><div class='hunk'>@@ -3118,6 +3145,9 @@ static irqreturn_t sdhci_thread_irq(int irq, void *dev_id)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 isr;</div><div class='ctx'> </div><div class='add'>+	while (!sdhci_request_done(host))</div><div class='add'>+		;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> 	isr = host-&gt;thread_isr;</div><div class='ctx'> 	host-&gt;thread_isr = 0;</div><div class='hunk'>@@ -3139,7 +3169,7 @@ static irqreturn_t sdhci_thread_irq(int irq, void *dev_id)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return isr ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************\</div><div class='hunk'>@@ -3251,7 +3281,6 @@ int sdhci_resume_host(struct sdhci_host *host)</div><div class='ctx'> 		mmc-&gt;ops-&gt;set_ios(mmc, &amp;mmc-&gt;ios);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sdhci_init(host, (host-&gt;mmc-&gt;pm_flags &amp; MMC_PM_KEEP_POWER));</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;irq_wake_enabled) {</div><div class='hunk'>@@ -3391,7 +3420,6 @@ void sdhci_cqe_enable(struct mmc_host *mmc)</div><div class='ctx'> 		 mmc_hostname(mmc), host-&gt;ier,</div><div class='ctx'> 		 sdhci_readl(host, SDHCI_INT_STATUS));</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sdhci_cqe_enable);</div><div class='hunk'>@@ -3416,7 +3444,6 @@ void sdhci_cqe_disable(struct mmc_host *mmc, bool recovery)</div><div class='ctx'> 		 mmc_hostname(mmc), host-&gt;ier,</div><div class='ctx'> 		 sdhci_readl(host, SDHCI_INT_STATUS));</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sdhci_cqe_disable);</div><div class='hunk'>@@ -3494,6 +3521,7 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,</div><div class='ctx'> 	host-&gt;cqe_err_ier = SDHCI_CQE_INT_ERR_MASK;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;tuning_delay = -1;</div><div class='add'>+	host-&gt;tuning_loop_count = MAX_TUNING_LOOP;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG;</div><div class='ctx'> </div><div class='hunk'>@@ -4224,14 +4252,15 @@ EXPORT_SYMBOL_GPL(sdhci_cleanup_host);</div><div class='ctx'> </div><div class='ctx'> int __sdhci_add_host(struct sdhci_host *host)</div><div class='ctx'> {</div><div class='add'>+	unsigned int flags = WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_HIGHPRI;</div><div class='ctx'> 	struct mmc_host *mmc = host-&gt;mmc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Init tasklets.</div><div class='del'>-	 */</div><div class='del'>-	tasklet_init(&amp;host-&gt;finish_tasklet,</div><div class='del'>-		sdhci_tasklet_finish, (unsigned long)host);</div><div class='add'>+	host-&gt;complete_wq = alloc_workqueue("sdhci", flags, 0);</div><div class='add'>+	if (!host-&gt;complete_wq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;host-&gt;complete_work, sdhci_complete_work);</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;host-&gt;timer, sdhci_timeout_timer, 0);</div><div class='ctx'> 	timer_setup(&amp;host-&gt;data_timer, sdhci_timeout_data_timer, 0);</div><div class='hunk'>@@ -4245,7 +4274,7 @@ int __sdhci_add_host(struct sdhci_host *host)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: Failed to request IRQ %d: %d\n",</div><div class='ctx'> 		       mmc_hostname(mmc), host-&gt;irq, ret);</div><div class='del'>-		goto untasklet;</div><div class='add'>+		goto unwq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sdhci_led_register(host);</div><div class='hunk'>@@ -4255,8 +4284,6 @@ int __sdhci_add_host(struct sdhci_host *host)</div><div class='ctx'> 		goto unirq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	ret = mmc_add_host(mmc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unled;</div><div class='hunk'>@@ -4278,8 +4305,8 @@ unirq:</div><div class='ctx'> 	sdhci_writel(host, 0, SDHCI_INT_ENABLE);</div><div class='ctx'> 	sdhci_writel(host, 0, SDHCI_SIGNAL_ENABLE);</div><div class='ctx'> 	free_irq(host-&gt;irq, host);</div><div class='del'>-untasklet:</div><div class='del'>-	tasklet_kill(&amp;host-&gt;finish_tasklet);</div><div class='add'>+unwq:</div><div class='add'>+	destroy_workqueue(host-&gt;complete_wq);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4341,7 +4368,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)</div><div class='ctx'> 	del_timer_sync(&amp;host-&gt;timer);</div><div class='ctx'> 	del_timer_sync(&amp;host-&gt;data_timer);</div><div class='ctx'> </div><div class='del'>-	tasklet_kill(&amp;host-&gt;finish_tasklet);</div><div class='add'>+	destroy_workqueue(host-&gt;complete_wq);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(mmc-&gt;supply.vqmmc))</div><div class='ctx'> 		regulator_disable(mmc-&gt;supply.vqmmc);</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h<br/>index 01002cba1359..d6bcc584c92b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci.h</a></div><div class='hunk'>@@ -560,7 +560,8 @@ struct sdhci_host {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int desc_sz;	/* ADMA descriptor size */</div><div class='ctx'> </div><div class='del'>-	struct tasklet_struct finish_tasklet;	/* Tasklet structures */</div><div class='add'>+	struct workqueue_struct *complete_wq;	/* Request completion wq */</div><div class='add'>+	struct work_struct	complete_work;	/* Request completion work */</div><div class='ctx'> </div><div class='ctx'> 	struct timer_list timer;	/* Timer for timeouts */</div><div class='ctx'> 	struct timer_list data_timer;	/* Timer for data timeouts */</div><div class='hunk'>@@ -596,6 +597,7 @@ struct sdhci_host {</div><div class='ctx'> #define SDHCI_TUNING_MODE_3	2</div><div class='ctx'> 	/* Delay (ms) between tuning commands */</div><div class='ctx'> 	int			tuning_delay;</div><div class='add'>+	int			tuning_loop_count;</div><div class='ctx'> </div><div class='ctx'> 	/* Host SDMA buffer boundary. */</div><div class='ctx'> 	u32			sdma_boundary;</div><div class='head'>diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c<br/>index eea183e90f1b..a91c0b45c48d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci_am654.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/sdhci_am654.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/sdhci_am654.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/sdhci_am654.c</a></div><div class='hunk'>@@ -158,6 +158,27 @@ static void sdhci_am654_set_power(struct sdhci_host *host, unsigned char mode,</div><div class='ctx'> 	sdhci_set_power_noreg(host, mode, vdd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg)</div><div class='add'>+{</div><div class='add'>+	unsigned char timing = host-&gt;mmc-&gt;ios.timing;</div><div class='add'>+</div><div class='add'>+	if (reg == SDHCI_HOST_CONTROL) {</div><div class='add'>+		switch (timing) {</div><div class='add'>+		/*</div><div class='add'>+		 * According to the data manual, HISPD bit</div><div class='add'>+		 * should not be set in these speed modes.</div><div class='add'>+		 */</div><div class='add'>+		case MMC_TIMING_SD_HS:</div><div class='add'>+		case MMC_TIMING_MMC_HS:</div><div class='add'>+		case MMC_TIMING_UHS_SDR12:</div><div class='add'>+		case MMC_TIMING_UHS_SDR25:</div><div class='add'>+			val &amp;= ~SDHCI_CTRL_HISPD;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writeb(val, host-&gt;ioaddr + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sdhci_ops sdhci_am654_ops = {</div><div class='ctx'> 	.get_max_clock = sdhci_pltfm_clk_get_max_clock,</div><div class='ctx'> 	.get_timeout_clock = sdhci_pltfm_clk_get_max_clock,</div><div class='hunk'>@@ -165,6 +186,7 @@ static struct sdhci_ops sdhci_am654_ops = {</div><div class='ctx'> 	.set_bus_width = sdhci_set_bus_width,</div><div class='ctx'> 	.set_power = sdhci_am654_set_power,</div><div class='ctx'> 	.set_clock = sdhci_am654_set_clock,</div><div class='add'>+	.write_b = sdhci_am654_write_b,</div><div class='ctx'> 	.reset = sdhci_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c<br/>index b6644ce296b2..35dd34b82a4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/tifm_sd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/tifm_sd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/tifm_sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/tifm_sd.c</a></div><div class='hunk'>@@ -889,7 +889,6 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)</div><div class='ctx'> 	struct tifm_dev *sock = host-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	writel(0, sock-&gt;addr + SOCK_MMCSD_INT_ENABLE);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	host-&gt;clk_div = 61;</div><div class='ctx'> 	host-&gt;clk_freq = 20000000;</div><div class='ctx'> 	writel(TIFM_MMCSD_RESET, sock-&gt;addr + SOCK_MMCSD_SYSTEM_CONTROL);</div><div class='hunk'>@@ -940,7 +939,6 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)</div><div class='ctx'> 	writel(TIFM_MMCSD_CERR | TIFM_MMCSD_BRS | TIFM_MMCSD_EOC</div><div class='ctx'> 	       | TIFM_MMCSD_ERRMASK,</div><div class='ctx'> 	       sock-&gt;addr + SOCK_MMCSD_INT_ENABLE);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1005,7 +1003,6 @@ static void tifm_sd_remove(struct tifm_dev *sock)</div><div class='ctx'> 	spin_lock_irqsave(&amp;sock-&gt;lock, flags);</div><div class='ctx'> 	host-&gt;eject = 1;</div><div class='ctx'> 	writel(0, sock-&gt;addr + SOCK_MMCSD_INT_ENABLE);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sock-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_kill(&amp;host-&gt;finish_tasklet);</div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h<br/>index 2adb0d24360f..c5ba13fae399 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/tmio_mmc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/tmio_mmc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/tmio_mmc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/tmio_mmc.h</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * TC6393XB TC6391XB TC6387XB T7L66XB ASIC3</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2015-17 Renesas Electronics Corporation</div><div class='del'>- * Copyright (C) 2016-17 Sang Engineering, Wolfram Sang</div><div class='add'>+ * Copyright (C) 2015-19 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2016-19 Sang Engineering, Wolfram Sang</div><div class='ctx'>  * Copyright (C) 2016-17 Horms Solutions, Simon Horman</div><div class='ctx'>  * Copyright (C) 2007 Ian Molton</div><div class='ctx'>  * Copyright (C) 2004 Ian Molton</div><div class='hunk'>@@ -105,6 +105,8 @@</div><div class='ctx'> 		TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT)</div><div class='ctx'> #define TMIO_MASK_IRQ     (TMIO_MASK_READOP | TMIO_MASK_WRITEOP | TMIO_MASK_CMD)</div><div class='ctx'> </div><div class='add'>+#define TMIO_MAX_BLK_SIZE 512</div><div class='add'>+</div><div class='ctx'> struct tmio_mmc_data;</div><div class='ctx'> struct tmio_mmc_host;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c<br/>index 595949f1f001..130b91cb0f8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/tmio_mmc_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/tmio_mmc_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/tmio_mmc_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/tmio_mmc_core.c</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * TC6393XB, TC6391XB, TC6387XB, T7L66XB, ASIC3, SH-Mobile SoCs</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2015-17 Renesas Electronics Corporation</div><div class='del'>- * Copyright (C) 2016-17 Sang Engineering, Wolfram Sang</div><div class='add'>+ * Copyright (C) 2015-19 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2016-19 Sang Engineering, Wolfram Sang</div><div class='ctx'>  * Copyright (C) 2017 Horms Solutions, Simon Horman</div><div class='ctx'>  * Copyright (C) 2011 Guennadi Liakhovetski</div><div class='ctx'>  * Copyright (C) 2007 Ian Molton</div><div class='hunk'>@@ -1186,7 +1186,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)</div><div class='ctx'> 	mmc-&gt;caps |= MMC_CAP_4_BIT_DATA | pdata-&gt;capabilities;</div><div class='ctx'> 	mmc-&gt;caps2 |= pdata-&gt;capabilities2;</div><div class='ctx'> 	mmc-&gt;max_segs = pdata-&gt;max_segs ? : 32;</div><div class='del'>-	mmc-&gt;max_blk_size = 512;</div><div class='add'>+	mmc-&gt;max_blk_size = TMIO_MAX_BLK_SIZE;</div><div class='ctx'> 	mmc-&gt;max_blk_count = pdata-&gt;max_blk_count ? :</div><div class='ctx'> 		(PAGE_SIZE / mmc-&gt;max_blk_size) * mmc-&gt;max_segs;</div><div class='ctx'> 	mmc-&gt;max_req_size = mmc-&gt;max_blk_size * mmc-&gt;max_blk_count;</div><div class='head'>diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c<br/>index cd8b1b9d4d8a..b11ac2314328 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/usdhi6rol0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/usdhi6rol0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/usdhi6rol0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/usdhi6rol0.c</a></div><div class='hunk'>@@ -1339,7 +1339,7 @@ static int usdhi6_stop_cmd(struct usdhi6_host *host)</div><div class='ctx'> 			host-&gt;wait = USDHI6_WAIT_FOR_STOP;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		/* Unsupported STOP command */</div><div class='add'>+		/* fall through - Unsupported STOP command. */</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(mmc_dev(host-&gt;mmc),</div><div class='ctx'> 			"unsupported stop CMD%d for CMD%d\n",</div><div class='hunk'>@@ -1687,7 +1687,7 @@ static void usdhi6_timeout_work(struct work_struct *work)</div><div class='ctx'> 	switch (host-&gt;wait) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(mmc_dev(host-&gt;mmc), "Invalid state %u\n", host-&gt;wait);</div><div class='del'>-		/* mrq can be NULL in this actually impossible case */</div><div class='add'>+		/* fall through - mrq can be NULL, but is impossible. */</div><div class='ctx'> 	case USDHI6_WAIT_FOR_CMD:</div><div class='ctx'> 		usdhi6_error_code(host);</div><div class='ctx'> 		if (mrq)</div><div class='hunk'>@@ -1709,10 +1709,7 @@ static void usdhi6_timeout_work(struct work_struct *work)</div><div class='ctx'> 			host-&gt;offset, data-&gt;blocks, data-&gt;blksz, data-&gt;sg_len,</div><div class='ctx'> 			sg_dma_len(sg), sg-&gt;offset);</div><div class='ctx'> 		usdhi6_sg_unmap(host, true);</div><div class='del'>-		/*</div><div class='del'>-		 * If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped</div><div class='del'>-		 * the page</div><div class='del'>-		 */</div><div class='add'>+		/* fall through - page unmapped in USDHI6_WAIT_FOR_DATA_END. */</div><div class='ctx'> 	case USDHI6_WAIT_FOR_DATA_END:</div><div class='ctx'> 		usdhi6_error_code(host);</div><div class='ctx'> 		data-&gt;error = -ETIMEDOUT;</div><div class='head'>diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c<br/>index 32c4211506fc..412395ac2935 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/via-sdmmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mmc/host/via-sdmmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mmc/host/via-sdmmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mmc/host/via-sdmmc.c</a></div><div class='hunk'>@@ -686,7 +686,6 @@ static void via_sdc_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 		via_sdc_send_command(host, mrq-&gt;cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +710,6 @@ static void via_sdc_set_power(struct via_crdr_mmc_host *host,</div><div class='ctx'> 		gatt &amp;= ~VIA_CRDR_PCICLKGATT_PAD_PWRON;</div><div class='ctx'> 	writeb(gatt, host-&gt;pcictrl_mmiobase + VIA_CRDR_PCICLKGATT);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	via_pwron_sleep(host);</div><div class='hunk'>@@ -770,7 +768,6 @@ static void via_sdc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	if (readb(addrbase + VIA_CRDR_PCISDCCLK) != clock)</div><div class='ctx'> 		writeb(clock, addrbase + VIA_CRDR_PCISDCCLK);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;power_mode != MMC_POWER_OFF)</div><div class='hunk'>@@ -830,7 +827,6 @@ static void via_reset_pcictrl(struct via_crdr_mmc_host *host)</div><div class='ctx'> 	via_restore_pcictrlreg(host);</div><div class='ctx'> 	via_restore_sdcreg(host);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -925,7 +921,6 @@ static irqreturn_t via_sdc_isr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	result = IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;sdhost-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -960,7 +955,6 @@ static void via_sdc_timeout(struct timer_list *t)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sdhost-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1012,7 +1006,6 @@ static void via_sdc_card_detect(struct work_struct *work)</div><div class='ctx'> 			tasklet_schedule(&amp;host-&gt;finish_tasklet);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mmiowb();</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		via_reset_pcictrl(host);</div><div class='hunk'>@@ -1020,7 +1013,6 @@ static void via_sdc_card_detect(struct work_struct *work)</div><div class='ctx'> 		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	via_print_pcictrl(host);</div><div class='hunk'>@@ -1188,7 +1180,6 @@ static void via_sd_remove(struct pci_dev *pcidev)</div><div class='ctx'> </div><div class='ctx'> 	/* Disable generating further interrupts */</div><div class='ctx'> 	writeb(0x0, sdhost-&gt;pcictrl_mmiobase + VIA_CRDR_PCIINTCTRL);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	if (sdhost-&gt;mrq) {</div><div class='ctx'> 		pr_err("%s: Controller removed during "</div><div class='hunk'>@@ -1197,7 +1188,6 @@ static void via_sd_remove(struct pci_dev *pcidev)</div><div class='ctx'> 		/* make sure all DMA is stopped */</div><div class='ctx'> 		writel(VIA_CRDR_DMACTRL_SFTRST,</div><div class='ctx'> 			sdhost-&gt;ddma_mmiobase + VIA_CRDR_DMACTRL);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		sdhost-&gt;mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='ctx'> 		if (sdhost-&gt;mrq-&gt;stop)</div><div class='ctx'> 			sdhost-&gt;mrq-&gt;stop-&gt;error = -ENOMEDIUM;</div><div class='head'>diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c<br/>index 72428b6bfc47..7b7286b4d81e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/chips/cfi_cmdset_0002.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/chips/cfi_cmdset_0002.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/chips/cfi_cmdset_0002.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mtd/chips/cfi_cmdset_0002.c</a></div><div class='hunk'>@@ -1876,7 +1876,11 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, timeo) &amp;&amp; !chip_ready(map, adr))</div><div class='add'>+		/*</div><div class='add'>+		 * We check "time_after" and "!chip_good" before checking "chip_good" to avoid</div><div class='add'>+		 * the failure due to scheduling.</div><div class='add'>+		 */</div><div class='add'>+		if (time_after(jiffies, timeo) &amp;&amp; !chip_good(map, adr, datum))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (chip_good(map, adr, datum)) {</div><div class='head'>diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c<br/>index f38e5c1b87e4..d984538980e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/nand/raw/marvell_nand.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/nand/raw/marvell_nand.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/nand/raw/marvell_nand.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mtd/nand/raw/marvell_nand.c</a></div><div class='hunk'>@@ -722,12 +722,6 @@ static void marvell_nfc_select_target(struct nand_chip *chip,</div><div class='ctx'> 	struct marvell_nfc *nfc = to_marvell_nfc(chip-&gt;controller);</div><div class='ctx'> 	u32 ndcr_generic;</div><div class='ctx'> </div><div class='del'>-	if (chip == nfc-&gt;selected_chip &amp;&amp; die_nr == marvell_nand-&gt;selected_die)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	writel_relaxed(marvell_nand-&gt;ndtr0, nfc-&gt;regs + NDTR0);</div><div class='del'>-	writel_relaxed(marvell_nand-&gt;ndtr1, nfc-&gt;regs + NDTR1);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset the NDCR register to a clean state for this particular chip,</div><div class='ctx'> 	 * also clear ND_RUN bit.</div><div class='hunk'>@@ -739,6 +733,12 @@ static void marvell_nfc_select_target(struct nand_chip *chip,</div><div class='ctx'> 	/* Also reset the interrupt status register */</div><div class='ctx'> 	marvell_nfc_clear_int(nfc, NDCR_ALL_INT);</div><div class='ctx'> </div><div class='add'>+	if (chip == nfc-&gt;selected_chip &amp;&amp; die_nr == marvell_nand-&gt;selected_die)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	writel_relaxed(marvell_nand-&gt;ndtr0, nfc-&gt;regs + NDTR0);</div><div class='add'>+	writel_relaxed(marvell_nand-&gt;ndtr1, nfc-&gt;regs + NDTR1);</div><div class='add'>+</div><div class='ctx'> 	nfc-&gt;selected_chip = chip;</div><div class='ctx'> 	marvell_nand-&gt;selected_die = die_nr;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/nand/raw/r852.c b/drivers/mtd/nand/raw/r852.c<br/>index 86456216fb93..7b99831aa046 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/nand/raw/r852.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/nand/raw/r852.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/nand/raw/r852.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mtd/nand/raw/r852.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@ static inline void r852_write_reg(struct r852_device *dev,</div><div class='ctx'> 						int address, uint8_t value)</div><div class='ctx'> {</div><div class='ctx'> 	writeb(value, dev-&gt;mmio + address);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +60,6 @@ static inline void r852_write_reg_dword(struct r852_device *dev,</div><div class='ctx'> 							int address, uint32_t value)</div><div class='ctx'> {</div><div class='ctx'> 	writel(cpu_to_le32(value), dev-&gt;mmio + address);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns pointer to our private structure */</div><div class='head'>diff --git a/drivers/mtd/nand/raw/txx9ndfmc.c b/drivers/mtd/nand/raw/txx9ndfmc.c<br/>index ddf0420c0997..97978227aa55 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/nand/raw/txx9ndfmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/mtd/nand/raw/txx9ndfmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/mtd/nand/raw/txx9ndfmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/mtd/nand/raw/txx9ndfmc.c</a></div><div class='hunk'>@@ -159,7 +159,6 @@ static void txx9ndfmc_cmd_ctrl(struct nand_chip *chip, int cmd,</div><div class='ctx'> 		if ((ctrl &amp; NAND_CTRL_CHANGE) &amp;&amp; cmd == NAND_CMD_NONE)</div><div class='ctx'> 			txx9ndfmc_write(dev, 0, TXX9_NDFDTR);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int txx9ndfmc_dev_ready(struct nand_chip *chip)</div><div class='head'>diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig<br/>index 5e4ca082cfcd..bc42f131f47c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/Kconfig</a></div><div class='hunk'>@@ -216,8 +216,8 @@ config GENEVE</div><div class='ctx'> </div><div class='ctx'> config GTP</div><div class='ctx'> 	tristate "GPRS Tunneling Protocol datapath (GTP-U)"</div><div class='del'>-	depends on INET &amp;&amp; NET_UDP_TUNNEL</div><div class='del'>-	select NET_IP_TUNNEL</div><div class='add'>+	depends on INET</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='ctx'> 	---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='hunk'>@@ -505,6 +505,7 @@ source "drivers/net/hyperv/Kconfig"</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'>+	select NET_DEVLINK</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='head'>diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c<br/>index 3d27616d9c85..51cf5eca9c7f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/appletalk/ipddp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/appletalk/ipddp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/appletalk/ipddp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/appletalk/ipddp.c</a></div><div class='hunk'>@@ -116,11 +116,15 @@ static struct net_device * __init ipddp_init(void)</div><div class='ctx'>  */</div><div class='ctx'> static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	__be32 paddr = skb_rtable(skb)-&gt;rt_gateway;</div><div class='add'>+        struct rtable *rtable = skb_rtable(skb);</div><div class='add'>+        __be32 paddr = 0;</div><div class='ctx'>         struct ddpehdr *ddp;</div><div class='ctx'>         struct ipddp_route *rt;</div><div class='ctx'>         struct atalk_addr *our_addr;</div><div class='ctx'> </div><div class='add'>+	if (rtable-&gt;rt_gw_family == AF_INET)</div><div class='add'>+		paddr = rtable-&gt;rt_gw4;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;ipddp_route_lock);</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 b59708c35faf..062fa7e3af4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/bonding/bond_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/bonding/bond_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/bonding/bond_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/bonding/bond_main.c</a></div><div class='hunk'>@@ -3213,8 +3213,12 @@ static int bond_netdev_event(struct notifier_block *this,</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='ctx'> 	if (event_dev-&gt;flags &amp; IFF_MASTER) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='ctx'> 		netdev_dbg(event_dev, "IFF_MASTER\n");</div><div class='del'>-		return bond_master_netdev_event(event, event_dev);</div><div class='add'>+		ret = bond_master_netdev_event(event, event_dev);</div><div class='add'>+		if (ret != NOTIFY_DONE)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (event_dev-&gt;flags &amp; IFF_SLAVE) {</div><div class='hunk'>@@ -4114,8 +4118,7 @@ static inline int bond_slave_override(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			     struct net_device *sb_dev,</div><div class='del'>-			     select_queue_fallback_t fallback)</div><div class='add'>+			     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* This helper function exists to help dev_pick_tx get the correct</div><div class='ctx'> 	 * destination queue.  Using a helper function skips a call to</div><div class='head'>diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c<br/>index b286f591242e..022044b59d6a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/bonding/bond_netlink.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/bonding/bond_netlink.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/bonding/bond_netlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/bonding/bond_netlink.c</a></div><div class='hunk'>@@ -546,7 +546,7 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_BOND_ARP_INTERVAL, bond-&gt;params.arp_interval))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	targets = nla_nest_start(skb, IFLA_BOND_ARP_IP_TARGET);</div><div class='add'>+	targets = nla_nest_start_noflag(skb, IFLA_BOND_ARP_IP_TARGET);</div><div class='ctx'> 	if (!targets)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -644,7 +644,7 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 		if (!bond_3ad_get_active_agg_info(bond, &amp;info)) {</div><div class='ctx'> 			struct nlattr *nest;</div><div class='ctx'> </div><div class='del'>-			nest = nla_nest_start(skb, IFLA_BOND_AD_INFO);</div><div class='add'>+			nest = nla_nest_start_noflag(skb, IFLA_BOND_AD_INFO);</div><div class='ctx'> 			if (!nest)</div><div class='ctx'> 				goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +711,7 @@ static int bond_fill_linkxstats(struct sk_buff *skb,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nest = nla_nest_start(skb, LINK_XSTATS_TYPE_BOND);</div><div class='add'>+	nest = nla_nest_start_noflag(skb, LINK_XSTATS_TYPE_BOND);</div><div class='ctx'> 	if (!nest)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='hunk'>@@ -722,7 +722,7 @@ static int bond_fill_linkxstats(struct sk_buff *skb,</div><div class='ctx'> 		else</div><div class='ctx'> 			stats = &amp;BOND_AD_INFO(bond).stats;</div><div class='ctx'> </div><div class='del'>-		nest2 = nla_nest_start(skb, BOND_XSTATS_3AD);</div><div class='add'>+		nest2 = nla_nest_start_noflag(skb, BOND_XSTATS_3AD);</div><div class='ctx'> 		if (!nest2) {</div><div class='ctx'> 			nla_nest_end(skb, nest);</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='head'>diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c<br/>index 2f120b2ffef0..4985268e2273 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/bonding/bond_sysfs_slave.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/bonding/bond_sysfs_slave.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/bonding/bond_sysfs_slave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/bonding/bond_sysfs_slave.c</a></div><div class='hunk'>@@ -55,7 +55,9 @@ 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, "%pM\n", slave-&gt;perm_hwaddr);</div><div class='add'>+	return sprintf(buf, "%*phC\n",</div><div class='add'>+		       slave-&gt;dev-&gt;addr_len,</div><div class='add'>+		       slave-&gt;perm_hwaddr);</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(perm_hwaddr);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig<br/>index 71bb3aebded4..c6c5ecdbcaef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/Kconfig</a></div><div class='hunk'>@@ -41,7 +41,7 @@ config NET_DSA_MT7530</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 &amp;&amp; NET_DSA_LEGACY</div><div class='add'>+	depends on NET_DSA</div><div class='ctx'> 	select NET_DSA_TAG_TRAILER</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This enables support for the Marvell 88E6060 ethernet switch</div><div class='hunk'>@@ -51,6 +51,8 @@ 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/sja1105/Kconfig"</div><div class='add'>+</div><div class='ctx'> config NET_DSA_QCA8K</div><div class='ctx'> 	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"</div><div class='ctx'> 	depends on NET_DSA</div><div class='head'>diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile<br/>index 82e5d794c41f..fefb6aaa82ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/Makefile</a></div><div class='hunk'>@@ -18,3 +18,4 @@ obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx.o</div><div class='ctx'> obj-y				+= b53/</div><div class='ctx'> obj-y				+= microchip/</div><div class='ctx'> obj-y				+= mv88e6xxx/</div><div class='add'>+obj-y				+= sja1105/</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c<br/>index 0852e5e08177..c8040ecf4425 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/b53/b53_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/b53/b53_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/b53/b53_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/b53/b53_common.c</a></div><div class='hunk'>@@ -428,7 +428,6 @@ 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='del'>-	dev-&gt;vlan_filtering_enabled = 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'>@@ -665,7 +664,7 @@ 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, dev-&gt;vlan_filtering_enabled);</div><div class='add'>+	b53_enable_vlan(dev, false, ds-&gt;vlan_filtering);</div><div class='ctx'> </div><div class='ctx'> 	b53_for_each_port(dev, i)</div><div class='ctx'> 		b53_write16(dev, B53_VLAN_PAGE,</div><div class='hunk'>@@ -966,6 +965,13 @@ static int b53_setup(struct dsa_switch *ds)</div><div class='ctx'> 			b53_disable_port(ds, port);</div><div class='ctx'> 	}</div><div class='ctx'> </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'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1275,35 +1281,17 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up);</div><div class='ctx'> int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	struct net_device *bridge_dev;</div><div class='del'>-	unsigned int i;</div><div class='ctx'> 	u16 pvid, new_pvid;</div><div class='ctx'> </div><div class='del'>-	/* Handle the case were multiple bridges span the same switch device</div><div class='del'>-	 * and one of them has a different setting than what is being requested</div><div class='del'>-	 * which would be breaking filtering semantics for any of the other</div><div class='del'>-	 * bridge devices.</div><div class='del'>-	 */</div><div class='del'>-	b53_for_each_port(dev, i) {</div><div class='del'>-		bridge_dev = dsa_to_port(ds, i)-&gt;bridge_dev;</div><div class='del'>-		if (bridge_dev &amp;&amp;</div><div class='del'>-		    bridge_dev != dsa_to_port(ds, port)-&gt;bridge_dev &amp;&amp;</div><div class='del'>-		    br_vlan_enabled(bridge_dev) != vlan_filtering) {</div><div class='del'>-			netdev_err(bridge_dev,</div><div class='del'>-				   "VLAN filtering is global to the switch!\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &amp;pvid);</div><div class='ctx'> 	new_pvid = pvid;</div><div class='del'>-	if (dev-&gt;vlan_filtering_enabled &amp;&amp; !vlan_filtering) {</div><div class='add'>+	if (!vlan_filtering) {</div><div class='ctx'> 		/* Filtering is currently enabled, use the default PVID since</div><div class='ctx'> 		 * the bridge does not expect tagging anymore</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev-&gt;ports[port].pvid = pvid;</div><div class='ctx'> 		new_pvid = b53_default_pvid(dev);</div><div class='del'>-	} else if (!dev-&gt;vlan_filtering_enabled &amp;&amp; vlan_filtering) {</div><div class='add'>+	} else {</div><div class='ctx'> 		/* Filtering is currently disabled, restore the previous PVID */</div><div class='ctx'> 		new_pvid = dev-&gt;ports[port].pvid;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1329,7 +1317,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='ctx'> 	if (vlan-&gt;vid_end &gt; dev-&gt;num_vlans)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	b53_enable_vlan(dev, true, dev-&gt;vlan_filtering_enabled);</div><div class='add'>+	b53_enable_vlan(dev, true, ds-&gt;vlan_filtering);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h<br/>index e3441dcf2d21..f25bc80c4ffc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/b53/b53_priv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/b53/b53_priv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/b53/b53_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/b53/b53_priv.h</a></div><div class='hunk'>@@ -139,7 +139,6 @@ 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='del'>-	bool vlan_filtering_enabled;</div><div class='ctx'> 	unsigned int num_ports;</div><div class='ctx'> 	struct b53_port *ports;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c<br/>index c8e3f05e1d72..4ccb3239f5f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/bcm_sf2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/bcm_sf2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/bcm_sf2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/bcm_sf2.c</a></div><div class='hunk'>@@ -1188,10 +1188,11 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_mdio;</div><div class='ctx'> </div><div class='del'>-	pr_info("Starfighter 2 top: %x.%02x, core: %x.%02x base: 0x%p, IRQs: %d, %d\n",</div><div class='del'>-		priv-&gt;hw_params.top_rev &gt;&gt; 8, priv-&gt;hw_params.top_rev &amp; 0xff,</div><div class='del'>-		priv-&gt;hw_params.core_rev &gt;&gt; 8, priv-&gt;hw_params.core_rev &amp; 0xff,</div><div class='del'>-		priv-&gt;core, priv-&gt;irq0, priv-&gt;irq1);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+		 "Starfighter 2 top: %x.%02x, core: %x.%02x, IRQs: %d, %d\n",</div><div class='add'>+		 priv-&gt;hw_params.top_rev &gt;&gt; 8, priv-&gt;hw_params.top_rev &amp; 0xff,</div><div class='add'>+		 priv-&gt;hw_params.core_rev &gt;&gt; 8, priv-&gt;hw_params.core_rev &amp; 0xff,</div><div class='add'>+		 priv-&gt;irq0, priv-&gt;irq1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c<br/>index e6234d209787..4212bc4a5f31 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/bcm_sf2_cfp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/bcm_sf2_cfp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/bcm_sf2_cfp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/bcm_sf2_cfp.c</a></div><div class='hunk'>@@ -886,6 +886,9 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 	     fs-&gt;m_ext.data[1]))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (fs-&gt;location != RX_CLS_LOC_ANY &amp;&amp; fs-&gt;location &gt;= CFP_NUM_RULES)</div><div class='add'>+		return -EINVAL;</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='hunk'>@@ -974,6 +977,9 @@ 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='add'>+	if (loc &gt;= CFP_NUM_RULES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* Refuse deleting unused rules, and those that are not unique since</div><div class='ctx'> 	 * that could leave IPv6 rules with one of the chained rule in the</div><div class='ctx'> 	 * table.</div><div class='head'>diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c<br/>index d8328866908c..553831df58fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/lantiq_gswip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/lantiq_gswip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/lantiq_gswip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/lantiq_gswip.c</a></div><div class='hunk'>@@ -4,7 +4,25 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Lantiq Deutschland</div><div class='ctx'>  * Copyright (C) 2012 John Crispin &lt;john@phrozen.org&gt;</div><div class='del'>- * Copyright (C) 2017 - 2018 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ * Copyright (C) 2017 - 2019 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -148,19 +166,29 @@</div><div class='ctx'> #define GSWIP_PCE_PMAP2			0x454	/* Default Multicast port map */</div><div class='ctx'> #define GSWIP_PCE_PMAP3			0x455	/* Default Unknown Unicast port map */</div><div class='ctx'> #define GSWIP_PCE_GCTRL_0		0x456</div><div class='add'>+#define  GSWIP_PCE_GCTRL_0_MTFL		BIT(0)  /* MAC Table Flushing */</div><div class='ctx'> #define  GSWIP_PCE_GCTRL_0_MC_VALID	BIT(3)</div><div class='ctx'> #define  GSWIP_PCE_GCTRL_0_VLAN		BIT(14) /* VLAN aware Switching */</div><div class='ctx'> #define GSWIP_PCE_GCTRL_1		0x457</div><div class='ctx'> #define  GSWIP_PCE_GCTRL_1_MAC_GLOCK	BIT(2)	/* MAC Address table lock */</div><div class='ctx'> #define  GSWIP_PCE_GCTRL_1_MAC_GLOCK_MOD	BIT(3) /* Mac address table lock forwarding mode */</div><div class='ctx'> #define GSWIP_PCE_PCTRL_0p(p)		(0x480 + ((p) * 0xA))</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_INGRESS	BIT(11)</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='ctx'> #define  GSWIP_PCE_PCTRL_0_PSTATE_LISTEN	0x0</div><div class='ctx'> #define  GSWIP_PCE_PCTRL_0_PSTATE_RX		0x1</div><div class='ctx'> #define  GSWIP_PCE_PCTRL_0_PSTATE_TX		0x2</div><div class='ctx'> #define  GSWIP_PCE_PCTRL_0_PSTATE_LEARNING	0x3</div><div class='ctx'> #define  GSWIP_PCE_PCTRL_0_PSTATE_FORWARDING	0x7</div><div class='ctx'> #define  GSWIP_PCE_PCTRL_0_PSTATE_MASK	GENMASK(2, 0)</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_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='ctx'> </div><div class='ctx'> #define GSWIP_MAC_FLEN			0x8C5</div><div class='ctx'> #define GSWIP_MAC_CTRL_2p(p)		(0x905 + ((p) * 0xC))</div><div class='hunk'>@@ -183,6 +211,11 @@</div><div class='ctx'> #define  GSWIP_SDMA_PCTRL_FCEN		BIT(1)	/* Flow Control Enable */</div><div class='ctx'> #define  GSWIP_SDMA_PCTRL_PAUFWD	BIT(1)	/* Pause Frame Forwarding */</div><div class='ctx'> </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_STATIC	0x01	/* Static not, aging entry */</div><div class='add'>+</div><div class='ctx'> #define XRX200_GPHY_FW_ALIGN	(16 * 1024)</div><div class='ctx'> </div><div class='ctx'> struct gswip_hw_info {</div><div class='hunk'>@@ -202,6 +235,12 @@ struct gswip_gphy_fw {</div><div class='ctx'> 	char *fw_name;</div><div class='ctx'> };</div><div class='ctx'> </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='ctx'> struct gswip_priv {</div><div class='ctx'> 	__iomem void *gswip;</div><div class='ctx'> 	__iomem void *mdio;</div><div class='hunk'>@@ -211,8 +250,22 @@ struct gswip_priv {</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct regmap *rcu_regmap;</div><div class='add'>+	struct gswip_vlan vlans[64];</div><div class='ctx'> 	int num_gphy_fw;</div><div class='ctx'> 	struct gswip_gphy_fw *gphy_fw;</div><div class='add'>+	u32 port_vlan_filter;</div><div class='add'>+};</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='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gswip_rmon_cnt_desc {</div><div class='hunk'>@@ -447,10 +500,153 @@ static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)</div><div class='ctx'> 	return of_mdiobus_register(ds-&gt;slave_mii_bus, mdio_np);</div><div class='ctx'> }</div><div class='ctx'> </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'>+	u16 crtl;</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'>+	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'>+	gswip_switch_w(priv, tbl-&gt;index, GSWIP_PCE_TBL_ADDR);</div><div class='add'>+	gswip_switch_mask(priv, 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 | GSWIP_PCE_TBL_CTRL_BAS,</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL);</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'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;key); i++)</div><div class='add'>+		tbl-&gt;key[i] = gswip_switch_r(priv, GSWIP_PCE_TBL_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'>+		tbl-&gt;val[i] = gswip_switch_r(priv, GSWIP_PCE_TBL_VAL(i));</div><div class='add'>+</div><div class='add'>+	tbl-&gt;mask = gswip_switch_r(priv, GSWIP_PCE_TBL_MASK);</div><div class='add'>+</div><div class='add'>+	crtl = gswip_switch_r(priv, GSWIP_PCE_TBL_CTRL);</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'>+	return 0;</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'>+	u16 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'>+	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'>+	gswip_switch_w(priv, tbl-&gt;index, GSWIP_PCE_TBL_ADDR);</div><div class='add'>+	gswip_switch_mask(priv, 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'>+			  GSWIP_PCE_TBL_CTRL);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;key); i++)</div><div class='add'>+		gswip_switch_w(priv, tbl-&gt;key[i], GSWIP_PCE_TBL_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'>+		gswip_switch_w(priv, tbl-&gt;val[i], GSWIP_PCE_TBL_VAL(i));</div><div class='add'>+</div><div class='add'>+	gswip_switch_mask(priv, 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'>+			  GSWIP_PCE_TBL_CTRL);</div><div class='add'>+</div><div class='add'>+	gswip_switch_w(priv, tbl-&gt;mask, GSWIP_PCE_TBL_MASK);</div><div class='add'>+</div><div class='add'>+	crtl = gswip_switch_r(priv, GSWIP_PCE_TBL_CTRL);</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'>+	gswip_switch_w(priv, crtl, GSWIP_PCE_TBL_CTRL);</div><div class='add'>+</div><div class='add'>+	return 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'>+</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'>+	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= max_ports) {</div><div class='add'>+		dev_err(priv-&gt;dev, "single port for %i supported\n", port);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</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] = 0; /* vid */</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] = 0 /* vid */;</div><div class='add'>+	vlan_mapping.val[1] = BIT(port) | BIT(cpu_port);</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='ctx'> static int gswip_port_enable(struct dsa_switch *ds, int port,</div><div class='ctx'> 			     struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	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='ctx'> </div><div class='ctx'> 	/* RMON Counter Enable for port */</div><div class='ctx'> 	gswip_switch_w(priv, GSWIP_BM_PCFG_CNTEN, GSWIP_BM_PCFGp(port));</div><div class='hunk'>@@ -461,8 +657,6 @@ static int gswip_port_enable(struct dsa_switch *ds, int port,</div><div class='ctx'> 			 GSWIP_FDMA_PCTRLp(port));</div><div class='ctx'> 	gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,</div><div class='ctx'> 			  GSWIP_SDMA_PCTRLp(port));</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_INGRESS,</div><div class='del'>-			  GSWIP_PCE_PCTRL_0p(port));</div><div class='ctx'> </div><div class='ctx'> 	if (!dsa_is_cpu_port(ds, port)) {</div><div class='ctx'> 		u32 macconf = GSWIP_MDIO_PHY_LINK_AUTO |</div><div class='hunk'>@@ -535,6 +729,39 @@ static int gswip_pce_load_microcode(struct gswip_priv *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </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'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='add'>+</div><div class='add'>+	/* Do not allow changing the VLAN filtering options while in bridge */</div><div class='add'>+	if (!!(priv-&gt;port_vlan_filter &amp; BIT(port)) != vlan_filtering &amp;&amp; bridge)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		/* Use port based VLAN tag */</div><div class='add'>+		gswip_switch_mask(priv,</div><div class='add'>+				  GSWIP_PCE_VCTRL_VSR,</div><div class='add'>+				  GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VEMR,</div><div class='add'>+				  GSWIP_PCE_VCTRL(port));</div><div class='add'>+		gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_TVM, 0,</div><div class='add'>+				  GSWIP_PCE_PCTRL_0p(port));</div><div class='add'>+	} else {</div><div class='add'>+		/* Use port based VLAN tag */</div><div class='add'>+		gswip_switch_mask(priv,</div><div class='add'>+				  GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VEMR,</div><div class='add'>+				  GSWIP_PCE_VCTRL_VSR,</div><div class='add'>+				  GSWIP_PCE_VCTRL(port));</div><div class='add'>+		gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_TVM,</div><div class='add'>+				  GSWIP_PCE_PCTRL_0p(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='ctx'> static int gswip_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct gswip_priv *priv = ds-&gt;priv;</div><div class='hunk'>@@ -547,8 +774,10 @@ static int gswip_setup(struct dsa_switch *ds)</div><div class='ctx'> 	gswip_switch_w(priv, 0, GSWIP_SWRES);</div><div class='ctx'> </div><div class='ctx'> 	/* 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='add'>+	for (i = 0; i &lt; priv-&gt;hw_info-&gt;max_ports; i++) {</div><div class='ctx'> 		gswip_port_disable(ds, i);</div><div class='add'>+		gswip_port_vlan_filtering(ds, i, false);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable Switch */</div><div class='ctx'> 	gswip_mdio_mask(priv, 0, GSWIP_MDIO_GLOB_ENABLE, GSWIP_MDIO_GLOB);</div><div class='hunk'>@@ -578,6 +807,10 @@ static int gswip_setup(struct dsa_switch *ds)</div><div class='ctx'> 	gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,</div><div class='ctx'> 			  GSWIP_FDMA_PCTRLp(cpu_port));</div><div class='ctx'> </div><div class='add'>+	/* accept special tag in ingress direction */</div><div class='add'>+	gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_INGRESS,</div><div class='add'>+			  GSWIP_PCE_PCTRL_0p(cpu_port));</div><div class='add'>+</div><div class='ctx'> 	gswip_switch_mask(priv, 0, GSWIP_MAC_CTRL_2_MLEN,</div><div class='ctx'> 			  GSWIP_MAC_CTRL_2p(cpu_port));</div><div class='ctx'> 	gswip_switch_w(priv, VLAN_ETH_FRAME_LEN + 8, GSWIP_MAC_FLEN);</div><div class='hunk'>@@ -587,10 +820,15 @@ static int gswip_setup(struct dsa_switch *ds)</div><div class='ctx'> 	/* VLAN aware Switching */</div><div class='ctx'> 	gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_VLAN, GSWIP_PCE_GCTRL_0);</div><div class='ctx'> </div><div class='del'>-	/* Mac Address Table Lock */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_1_MAC_GLOCK |</div><div class='del'>-				   GSWIP_PCE_GCTRL_1_MAC_GLOCK_MOD,</div><div class='del'>-			  GSWIP_PCE_GCTRL_1);</div><div class='add'>+	/* Flush MAC Table */</div><div class='add'>+	gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_MTFL, GSWIP_PCE_GCTRL_0);</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='ctx'> </div><div class='ctx'> 	gswip_port_enable(ds, cpu_port, NULL);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -602,6 +840,551 @@ static enum dsa_tag_protocol gswip_get_tag_protocol(struct dsa_switch *ds,</div><div class='ctx'> 	return DSA_TAG_PROTO_GSWIP;</div><div class='ctx'> }</div><div class='ctx'> </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_unaware(struct gswip_priv *priv,</div><div class='add'>+				  struct net_device *bridge, int port)</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_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='add'>+	bool active_vlan_created = false;</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) {</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 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, -1, 0);</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'>+		/* VLAN ID byte, maps to the VLAN ID of vlan active table */</div><div class='add'>+		vlan_mapping.val[0] = 0;</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'>+	/* Update the VLAN mapping entry and write it to the switch */</div><div class='add'>+	vlan_mapping.val[1] |= BIT(cpu_port);</div><div class='add'>+	vlan_mapping.val[1] |= 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_switch_w(priv, 0, GSWIP_PCE_DEFPVID(port));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_vlan_add_aware(struct gswip_priv *priv,</div><div class='add'>+				struct net_device *bridge, int port,</div><div class='add'>+				u16 vid, bool untagged,</div><div class='add'>+				bool pvid)</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_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='add'>+	bool active_vlan_created = false;</div><div class='add'>+	int idx = -1;</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'>+	/* 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 (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'>+			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'>+		/* 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'>+	} 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_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] |= BIT(cpu_port);</div><div class='add'>+	vlan_mapping.val[2] |= BIT(cpu_port);</div><div class='add'>+	vlan_mapping.val[1] |= BIT(port);</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'>+	if (pvid)</div><div class='add'>+		gswip_switch_w(priv, idx, GSWIP_PCE_DEFPVID(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, bool pvid, 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_port = priv-&gt;hw_info-&gt;cpu_port;</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'>+		    (!vlan_aware || 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, "bridge to leave does not exists\n");</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; ~BIT(cpu_port)) == 0) {</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 2.2 (GRX300) and later program here the VID directly. */</div><div class='add'>+	if (pvid)</div><div class='add'>+		gswip_switch_w(priv, 0, GSWIP_PCE_DEFPVID(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 net_device *bridge)</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'>+	/* When the bridge uses VLAN filtering we have to configure VLAN</div><div class='add'>+	 * specific bridges. No bridge is configured here.</div><div class='add'>+	 */</div><div class='add'>+	if (!br_vlan_enabled(bridge)) {</div><div class='add'>+		err = gswip_vlan_add_unaware(priv, bridge, port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		priv-&gt;port_vlan_filter &amp;= ~BIT(port);</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;port_vlan_filter |= BIT(port);</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 net_device *bridge)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	gswip_add_single_port_br(priv, port, true);</div><div class='add'>+</div><div class='add'>+	/* When the bridge uses VLAN filtering we have to configure VLAN</div><div class='add'>+	 * specific bridges. No bridge is configured here.</div><div class='add'>+	 */</div><div class='add'>+	if (!br_vlan_enabled(bridge))</div><div class='add'>+		gswip_vlan_remove(priv, bridge, port, 0, true, false);</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'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int i;</div><div class='add'>+	int pos = max_ports;</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'>+	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='add'>+		int idx = -1;</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 == 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'>+				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 void 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'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</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'>+	u16 vid;</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;</div><div class='add'>+</div><div class='add'>+	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid)</div><div class='add'>+		gswip_vlan_add_aware(priv, bridge, port, vid, untagged, pvid);</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 gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='add'>+	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int 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'>+	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='add'>+		err = gswip_vlan_remove(priv, bridge, port, vid, pvid, 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 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 brigde: %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_STATIC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (((mac_bridge.val[0] &amp; GENMASK(7, 4)) &gt;&gt; 4) != port)</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 brigde: %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'>+		gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,</div><div class='add'>+				  GSWIP_SDMA_PCTRLp(port));</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'>+	gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,</div><div class='add'>+			  GSWIP_SDMA_PCTRLp(port));</div><div class='add'>+	gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_PSTATE_MASK, stp_state,</div><div class='add'>+			  GSWIP_PCE_PCTRL_0p(port));</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'>+			  const unsigned char *addr, u16 vid, bool add)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='add'>+	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='add'>+	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</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'>+	if (!bridge)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = cpu_port; 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, "Port not part of a bridge\n");</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] = fid;</div><div class='add'>+	mac_bridge.val[0] = add ? BIT(port) : 0; /* port map */</div><div class='add'>+	mac_bridge.val[1] = GSWIP_TABLE_MAC_BRIDGE_STATIC;</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 brigde: %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'>+{</div><div class='add'>+	return gswip_port_fdb(ds, port, 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'>+{</div><div class='add'>+	return gswip_port_fdb(ds, port, 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[6];</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 write mac brigde: %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'>+		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_STATIC) {</div><div class='add'>+			if (mac_bridge.val[0] &amp; BIT(port))</div><div class='add'>+				cb(addr, 0, true, data);</div><div class='add'>+		} else {</div><div class='add'>+			if (((mac_bridge.val[0] &amp; GENMASK(7, 4)) &gt;&gt; 4) == port)</div><div class='add'>+				cb(addr, 0, false, data);</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 gswip_phylink_validate(struct dsa_switch *ds, int port,</div><div class='ctx'> 				   unsigned long *supported,</div><div class='ctx'> 				   struct phylink_link_state *state)</div><div class='hunk'>@@ -809,6 +1592,17 @@ static const struct dsa_switch_ops gswip_switch_ops = {</div><div class='ctx'> 	.setup			= gswip_setup,</div><div class='ctx'> 	.port_enable		= gswip_port_enable,</div><div class='ctx'> 	.port_disable		= gswip_port_disable,</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_prepare	= gswip_port_vlan_prepare,</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='ctx'> 	.phylink_validate	= gswip_phylink_validate,</div><div class='ctx'> 	.phylink_mac_config	= gswip_phylink_mac_config,</div><div class='ctx'> 	.phylink_mac_link_down	= gswip_phylink_mac_link_down,</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c<br/>index f16e1d7d8615..c026d15721f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/microchip/ksz9477.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/microchip/ksz9477.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/microchip/ksz9477.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/microchip/ksz9477.c</a></div><div class='hunk'>@@ -1144,6 +1144,7 @@ static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port)</div><div class='ctx'> 		interface = PHY_INTERFACE_MODE_GMII;</div><div class='ctx'> 		if (gbit)</div><div class='ctx'> 			break;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		interface = PHY_INTERFACE_MODE_MII;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c<br/>index 7357b4fc0185..8d531c5f21f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mt7530.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mt7530.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mt7530.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mt7530.c</a></div><div class='hunk'>@@ -828,11 +828,9 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)</div><div class='ctx'> 	mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,</div><div class='ctx'> 		   VLAN_ATTR(MT7530_VLAN_TRANSPARENT));</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ports[port].vlan_filtering = false;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; MT7530_NUM_PORTS; i++) {</div><div class='ctx'> 		if (dsa_is_user_port(ds, i) &amp;&amp;</div><div class='del'>-		    priv-&gt;ports[i].vlan_filtering) {</div><div class='add'>+		    dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[i])) {</div><div class='ctx'> 			all_user_ports_removed = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -891,8 +889,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 * And the other port's port matrix cannot be broken when the</div><div class='ctx'> 		 * other port is still a VLAN-aware port.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!priv-&gt;ports[i].vlan_filtering &amp;&amp;</div><div class='del'>-		    dsa_is_user_port(ds, i) &amp;&amp; i != port) {</div><div class='add'>+		if (dsa_is_user_port(ds, i) &amp;&amp; i != port &amp;&amp;</div><div class='add'>+		   !dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[i])) {</div><div class='ctx'> 			if (dsa_to_port(ds, i)-&gt;bridge_dev != bridge)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (priv-&gt;ports[i].enable)</div><div class='hunk'>@@ -910,8 +908,6 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='ctx'> 			   PCR_MATRIX(BIT(MT7530_CPU_PORT)));</div><div class='ctx'> 	priv-&gt;ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT));</div><div class='ctx'> </div><div class='del'>-	mt7530_port_set_vlan_unaware(ds, port);</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1013,10 +1009,6 @@ static int</div><div class='ctx'> mt7530_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='ctx'> 			   bool vlan_filtering)</div><div class='ctx'> {</div><div class='del'>-	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ports[port].vlan_filtering = vlan_filtering;</div><div class='del'>-</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'>@@ -1025,6 +1017,8 @@ mt7530_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 */</div><div class='ctx'> 		mt7530_port_set_vlan_aware(ds, port);</div><div class='ctx'> 		mt7530_port_set_vlan_aware(ds, MT7530_CPU_PORT);</div><div class='add'>+	} else {</div><div class='add'>+		mt7530_port_set_vlan_unaware(ds, port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1139,7 +1133,7 @@ mt7530_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 	/* The port is kept as VLAN-unaware if bridge with vlan_filtering not</div><div class='ctx'> 	 * being set.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!priv-&gt;ports[port].vlan_filtering)</div><div class='add'>+	if (!dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[port]))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='hunk'>@@ -1170,7 +1164,7 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	/* The port is kept as VLAN-unaware if bridge with vlan_filtering not</div><div class='ctx'> 	 * being set.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!priv-&gt;ports[port].vlan_filtering)</div><div class='add'>+	if (!dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[port]))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='head'>diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h<br/>index a95ed958df5b..1eec7bdc283a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mt7530.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mt7530.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mt7530.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mt7530.h</a></div><div class='hunk'>@@ -410,7 +410,6 @@ struct mt7530_port {</div><div class='ctx'> 	bool enable;</div><div class='ctx'> 	u32 pm;</div><div class='ctx'> 	u16 pvid;</div><div class='del'>-	bool vlan_filtering;</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='head'>diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c<br/>index 0b3e51f248c2..2a2489b5196d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6060.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6060.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6060.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6060.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * net/dsa/mv88e6060.c - Driver for Marvell 88e6060 switch chips</div><div class='ctx'>  * Copyright (c) 2008-2009 Marvell Semiconductor</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -18,40 +14,16 @@</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include "mv88e6060.h"</div><div class='ctx'> </div><div class='del'>-static int reg_read(struct dsa_switch *ds, int addr, int reg)</div><div class='add'>+static int reg_read(struct mv88e6060_priv *priv, int addr, int reg)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6060_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='ctx'> 	return mdiobus_read_nested(priv-&gt;bus, priv-&gt;sw_addr + addr, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define REG_READ(addr, reg)					\</div><div class='del'>-	({							\</div><div class='del'>-		int __ret;					\</div><div class='del'>-								\</div><div class='del'>-		__ret = reg_read(ds, addr, reg);		\</div><div class='del'>-		if (__ret &lt; 0)					\</div><div class='del'>-			return __ret;				\</div><div class='del'>-		__ret;						\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)</div><div class='add'>+static int reg_write(struct mv88e6060_priv *priv, int addr, int reg, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6060_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='ctx'> 	return mdiobus_write_nested(priv-&gt;bus, priv-&gt;sw_addr + addr, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define REG_WRITE(addr, reg, val)				\</div><div class='del'>-	({							\</div><div class='del'>-		int __ret;					\</div><div class='del'>-								\</div><div class='del'>-		__ret = reg_write(ds, addr, reg, val);		\</div><div class='del'>-		if (__ret &lt; 0)					\</div><div class='del'>-			return __ret;				\</div><div class='del'>-	})</div><div class='del'>-</div><div class='ctx'> static const char *mv88e6060_get_name(struct mii_bus *bus, int sw_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -76,28 +48,7 @@ static enum dsa_tag_protocol mv88e6060_get_tag_protocol(struct dsa_switch *ds,</div><div class='ctx'> 	return DSA_TAG_PROTO_TRAILER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *mv88e6060_drv_probe(struct device *dsa_dev,</div><div class='del'>-				       struct device *host_dev, int sw_addr,</div><div class='del'>-				       void **_priv)</div><div class='del'>-{</div><div class='del'>-	struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev);</div><div class='del'>-	struct mv88e6060_priv *priv;</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	name = mv88e6060_get_name(bus, sw_addr);</div><div class='del'>-	if (name) {</div><div class='del'>-		priv = devm_kzalloc(dsa_dev, sizeof(*priv), GFP_KERNEL);</div><div class='del'>-		if (!priv)</div><div class='del'>-			return NULL;</div><div class='del'>-		*_priv = priv;</div><div class='del'>-		priv-&gt;bus = bus;</div><div class='del'>-		priv-&gt;sw_addr = sw_addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6060_switch_reset(struct dsa_switch *ds)</div><div class='add'>+static int mv88e6060_switch_reset(struct mv88e6060_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -105,23 +56,32 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds)</div><div class='ctx'> </div><div class='ctx'> 	/* Set all ports to the disabled state. */</div><div class='ctx'> 	for (i = 0; i &lt; MV88E6060_PORTS; i++) {</div><div class='del'>-		ret = REG_READ(REG_PORT(i), PORT_CONTROL);</div><div class='del'>-		REG_WRITE(REG_PORT(i), PORT_CONTROL,</div><div class='del'>-			  ret &amp; ~PORT_CONTROL_STATE_MASK);</div><div class='add'>+		ret = reg_read(priv, REG_PORT(i), PORT_CONTROL);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = reg_write(priv, REG_PORT(i), PORT_CONTROL,</div><div class='add'>+				ret &amp; ~PORT_CONTROL_STATE_MASK);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for transmit queues to drain. */</div><div class='ctx'> 	usleep_range(2000, 4000);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the switch. */</div><div class='del'>-	REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,</div><div class='del'>-		  GLOBAL_ATU_CONTROL_SWRESET |</div><div class='del'>-		  GLOBAL_ATU_CONTROL_LEARNDIS);</div><div class='add'>+	ret = reg_write(priv, REG_GLOBAL, GLOBAL_ATU_CONTROL,</div><div class='add'>+			GLOBAL_ATU_CONTROL_SWRESET |</div><div class='add'>+			GLOBAL_ATU_CONTROL_LEARNDIS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait up to one second for reset to complete. */</div><div class='ctx'> 	timeout = jiffies + 1 * HZ;</div><div class='ctx'> 	while (time_before(jiffies, timeout)) {</div><div class='del'>-		ret = REG_READ(REG_GLOBAL, GLOBAL_STATUS);</div><div class='add'>+		ret = reg_read(priv, REG_GLOBAL, GLOBAL_STATUS);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='ctx'> 		if (ret &amp; GLOBAL_STATUS_INIT_READY)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -133,61 +93,69 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6060_setup_global(struct dsa_switch *ds)</div><div class='add'>+static int mv88e6060_setup_global(struct mv88e6060_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	/* Disable discarding of frames with excessive collisions,</div><div class='ctx'> 	 * set the maximum frame size to 1536 bytes, and mask all</div><div class='ctx'> 	 * interrupt sources.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_WRITE(REG_GLOBAL, GLOBAL_CONTROL, GLOBAL_CONTROL_MAX_FRAME_1536);</div><div class='add'>+	ret = reg_write(priv, REG_GLOBAL, GLOBAL_CONTROL,</div><div class='add'>+			GLOBAL_CONTROL_MAX_FRAME_1536);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable automatic address learning.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,</div><div class='del'>-		  GLOBAL_ATU_CONTROL_LEARNDIS);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return reg_write(priv, REG_GLOBAL, GLOBAL_ATU_CONTROL,</div><div class='add'>+			 GLOBAL_ATU_CONTROL_LEARNDIS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6060_setup_port(struct dsa_switch *ds, int p)</div><div class='add'>+static int mv88e6060_setup_port(struct mv88e6060_priv *priv, int p)</div><div class='ctx'> {</div><div class='ctx'> 	int addr = REG_PORT(p);</div><div class='add'>+	int ret;</div><div class='ctx'> </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='ctx'> 	 * port, enable Ingress and Egress Trailer tagging mode.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_WRITE(addr, PORT_CONTROL,</div><div class='del'>-		  dsa_is_cpu_port(ds, p) ?</div><div class='add'>+	ret = reg_write(priv, addr, PORT_CONTROL,</div><div class='add'>+			dsa_is_cpu_port(priv-&gt;ds, p) ?</div><div class='ctx'> 			PORT_CONTROL_TRAILER |</div><div class='ctx'> 			PORT_CONTROL_INGRESS_MODE |</div><div class='ctx'> 			PORT_CONTROL_STATE_FORWARDING :</div><div class='ctx'> 			PORT_CONTROL_STATE_FORWARDING);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Port based VLAN map: give each port its own address</div><div class='ctx'> 	 * database, allow the CPU port to talk to each of the 'real'</div><div class='ctx'> 	 * ports, and allow each of the 'real' ports to only talk to</div><div class='ctx'> 	 * the CPU port.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_WRITE(addr, PORT_VLAN_MAP,</div><div class='del'>-		  ((p &amp; 0xf) &lt;&lt; PORT_VLAN_MAP_DBNUM_SHIFT) |</div><div class='del'>-		   (dsa_is_cpu_port(ds, p) ? dsa_user_ports(ds) :</div><div class='del'>-		    BIT(dsa_to_port(ds, p)-&gt;cpu_dp-&gt;index)));</div><div class='add'>+	ret = reg_write(priv, addr, PORT_VLAN_MAP,</div><div class='add'>+			((p &amp; 0xf) &lt;&lt; PORT_VLAN_MAP_DBNUM_SHIFT) |</div><div class='add'>+			(dsa_is_cpu_port(priv-&gt;ds, p) ?</div><div class='add'>+			 dsa_user_ports(priv-&gt;ds) :</div><div class='add'>+			 BIT(dsa_to_port(priv-&gt;ds, p)-&gt;cpu_dp-&gt;index)));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Port Association Vector: when learning source addresses</div><div class='ctx'> 	 * of packets, add the address to the address database using</div><div class='ctx'> 	 * a port bitmap that has only the bit for this port set and</div><div class='ctx'> 	 * the other bits clear.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_WRITE(addr, PORT_ASSOC_VECTOR, BIT(p));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return reg_write(priv, addr, PORT_ASSOC_VECTOR, BIT(p));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6060_setup_addr(struct dsa_switch *ds)</div><div class='add'>+static int mv88e6060_setup_addr(struct mv88e6060_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u8 addr[ETH_ALEN];</div><div class='add'>+	int ret;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='ctx'> 	eth_random_addr(addr);</div><div class='hunk'>@@ -199,34 +167,43 @@ static int mv88e6060_setup_addr(struct dsa_switch *ds)</div><div class='ctx'> 	 */</div><div class='ctx'> 	val &amp;= 0xfeff;</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_01, val);</div><div class='del'>-	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_23, (addr[2] &lt;&lt; 8) | addr[3]);</div><div class='del'>-	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_45, (addr[4] &lt;&lt; 8) | addr[5]);</div><div class='add'>+	ret = reg_write(priv, REG_GLOBAL, GLOBAL_MAC_01, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_write(priv, REG_GLOBAL, GLOBAL_MAC_23,</div><div class='add'>+			(addr[2] &lt;&lt; 8) | addr[3]);</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='add'>+	return reg_write(priv, REG_GLOBAL, GLOBAL_MAC_45,</div><div class='add'>+			 (addr[4] &lt;&lt; 8) | addr[5]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6060_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='add'>+	struct mv88e6060_priv *priv = ds-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ret = mv88e6060_switch_reset(ds);</div><div class='add'>+	priv-&gt;ds = ds;</div><div class='add'>+</div><div class='add'>+	ret = mv88e6060_switch_reset(priv);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* @@@ initialise atu */</div><div class='ctx'> </div><div class='del'>-	ret = mv88e6060_setup_global(ds);</div><div class='add'>+	ret = mv88e6060_setup_global(priv);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mv88e6060_setup_addr(ds);</div><div class='add'>+	ret = mv88e6060_setup_addr(priv);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MV88E6060_PORTS; i++) {</div><div class='del'>-		ret = mv88e6060_setup_port(ds, i);</div><div class='add'>+		ret = mv88e6060_setup_port(priv, i);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -243,51 +220,93 @@ static int mv88e6060_port_to_phy_addr(int port)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6060_phy_read(struct dsa_switch *ds, int port, int regnum)</div><div class='ctx'> {</div><div class='add'>+	struct mv88e6060_priv *priv = ds-&gt;priv;</div><div class='ctx'> 	int addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = mv88e6060_port_to_phy_addr(port);</div><div class='ctx'> 	if (addr == -1)</div><div class='ctx'> 		return 0xffff;</div><div class='ctx'> </div><div class='del'>-	return reg_read(ds, addr, regnum);</div><div class='add'>+	return reg_read(priv, addr, regnum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val)</div><div class='ctx'> {</div><div class='add'>+	struct mv88e6060_priv *priv = ds-&gt;priv;</div><div class='ctx'> 	int addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = mv88e6060_port_to_phy_addr(port);</div><div class='ctx'> 	if (addr == -1)</div><div class='ctx'> 		return 0xffff;</div><div class='ctx'> </div><div class='del'>-	return reg_write(ds, addr, regnum, val);</div><div class='add'>+	return reg_write(priv, addr, regnum, val);</div><div class='ctx'> }</div><div class='ctx'> </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='del'>-	.probe		= mv88e6060_drv_probe,</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='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_switch_driver mv88e6060_switch_drv = {</div><div class='del'>-	.ops		= &amp;mv88e6060_switch_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mv88e6060_init(void)</div><div class='add'>+static int mv88e6060_probe(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='del'>-	register_switch_driver(&amp;mv88e6060_switch_drv);</div><div class='del'>-	return 0;</div><div class='add'>+	struct device *dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	struct mv88e6060_priv *priv;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	const char *name;</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;bus = mdiodev-&gt;bus;</div><div class='add'>+	priv-&gt;sw_addr = mdiodev-&gt;addr;</div><div class='add'>+</div><div class='add'>+	name = mv88e6060_get_name(priv-&gt;bus, priv-&gt;sw_addr);</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "switch %s detected\n", name);</div><div class='add'>+</div><div class='add'>+	ds = dsa_switch_alloc(dev, MV88E6060_PORTS);</div><div class='add'>+	if (!ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ds-&gt;priv = priv;</div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;ops = &amp;mv88e6060_switch_ops;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, ds);</div><div class='add'>+</div><div class='add'>+	return dsa_register_switch(ds);</div><div class='ctx'> }</div><div class='del'>-module_init(mv88e6060_init);</div><div class='ctx'> </div><div class='del'>-static void __exit mv88e6060_cleanup(void)</div><div class='add'>+static void mv88e6060_remove(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='del'>-	unregister_switch_driver(&amp;mv88e6060_switch_drv);</div><div class='add'>+	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(ds);</div><div class='ctx'> }</div><div class='del'>-module_exit(mv88e6060_cleanup);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mv88e6060_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "marvell,mv88e6060",</div><div class='add'>+	},</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdio_driver mv88e6060_driver = {</div><div class='add'>+	.probe	= mv88e6060_probe,</div><div class='add'>+	.remove = mv88e6060_remove,</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = "mv88e6060",</div><div class='add'>+		.of_match_table = mv88e6060_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(mv88e6060_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Marvell 88E6060 ethernet switch chip");</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6060.h b/drivers/net/dsa/mv88e6060.h<br/>index 10249bd16292..c0e7a0f2fb6a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6060.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6060.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6060.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6060.h</a></div><div class='hunk'>@@ -117,6 +117,7 @@ struct mv88e6060_priv {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> 	int sw_addr;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/Makefile b/drivers/net/dsa/mv88e6xxx/Makefile<br/>index 50de304abe2f..e85755dde90b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/Makefile</a></div><div class='hunk'>@@ -12,3 +12,4 @@ mv88e6xxx-objs += phy.o</div><div class='ctx'> mv88e6xxx-objs += port.o</div><div class='ctx'> mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_PTP) += ptp.o</div><div class='ctx'> mv88e6xxx-objs += serdes.o</div><div class='add'>+mv88e6xxx-objs += smi.o</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c<br/>index f4e2db44ad91..28414db979b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/chip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/chip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/chip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/chip.c</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #include "port.h"</div><div class='ctx'> #include "ptp.h"</div><div class='ctx'> #include "serdes.h"</div><div class='add'>+#include "smi.h"</div><div class='ctx'> </div><div class='ctx'> static void assert_reg_lock(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -52,149 +53,6 @@ static void assert_reg_lock(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The switch ADDR[4:1] configuration pins define the chip SMI device address</div><div class='del'>- * (ADDR[0] is always zero, thus only even SMI addresses can be strapped).</div><div class='del'>- *</div><div class='del'>- * When ADDR is all zero, the chip uses Single-chip Addressing Mode, assuming it</div><div class='del'>- * is the only device connected to the SMI master. In this mode it responds to</div><div class='del'>- * all 32 possible SMI addresses, and thus maps directly the internal devices.</div><div class='del'>- *</div><div class='del'>- * When ADDR is non-zero, the chip uses Multi-chip Addressing Mode, allowing</div><div class='del'>- * multiple devices to share the SMI interface. In this mode it responds to only</div><div class='del'>- * 2 registers, used to indirectly access the internal SMI devices.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int mv88e6xxx_smi_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-			      int addr, int reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	if (!chip-&gt;smi_ops)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return chip-&gt;smi_ops-&gt;read(chip, addr, reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6xxx_smi_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-			       int addr, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	if (!chip-&gt;smi_ops)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return chip-&gt;smi_ops-&gt;write(chip, addr, reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6xxx_smi_single_chip_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-					  int addr, int reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mdiobus_read_nested(chip-&gt;bus, addr, reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*val = ret &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 int mv88e6xxx_smi_single_chip_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-					   int addr, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mdiobus_write_nested(chip-&gt;bus, addr, reg, val);</div><div class='del'>-	if (ret &lt; 0)</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 mv88e6xxx_bus_ops mv88e6xxx_smi_single_chip_ops = {</div><div class='del'>-	.read = mv88e6xxx_smi_single_chip_read,</div><div class='del'>-	.write = mv88e6xxx_smi_single_chip_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int mv88e6xxx_smi_multi_chip_wait(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</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; 16; i++) {</div><div class='del'>-		ret = mdiobus_read_nested(chip-&gt;bus, chip-&gt;sw_addr, SMI_CMD);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if ((ret &amp; SMI_CMD_BUSY) == 0)</div><div class='del'>-			return 0;</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 mv88e6xxx_smi_multi_chip_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-					 int addr, int reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Wait for the bus to become free. */</div><div class='del'>-	ret = mv88e6xxx_smi_multi_chip_wait(chip);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Transmit the read command. */</div><div class='del'>-	ret = mdiobus_write_nested(chip-&gt;bus, chip-&gt;sw_addr, SMI_CMD,</div><div class='del'>-				   SMI_CMD_OP_22_READ | (addr &lt;&lt; 5) | reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Wait for the read command to complete. */</div><div class='del'>-	ret = mv88e6xxx_smi_multi_chip_wait(chip);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Read the data. */</div><div class='del'>-	ret = mdiobus_read_nested(chip-&gt;bus, chip-&gt;sw_addr, SMI_DATA);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*val = ret &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 int mv88e6xxx_smi_multi_chip_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-					  int addr, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Wait for the bus to become free. */</div><div class='del'>-	ret = mv88e6xxx_smi_multi_chip_wait(chip);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Transmit the data to write. */</div><div class='del'>-	ret = mdiobus_write_nested(chip-&gt;bus, chip-&gt;sw_addr, SMI_DATA, val);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Transmit the write command. */</div><div class='del'>-	ret = mdiobus_write_nested(chip-&gt;bus, chip-&gt;sw_addr, SMI_CMD,</div><div class='del'>-				   SMI_CMD_OP_22_WRITE | (addr &lt;&lt; 5) | reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Wait for the write command to complete. */</div><div class='del'>-	ret = mv88e6xxx_smi_multi_chip_wait(chip);</div><div class='del'>-	if (ret &lt; 0)</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 mv88e6xxx_bus_ops mv88e6xxx_smi_multi_chip_ops = {</div><div class='del'>-	.read = mv88e6xxx_smi_multi_chip_read,</div><div class='del'>-	.write = mv88e6xxx_smi_multi_chip_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int mv88e6xxx_read(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -553,11 +411,28 @@ int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port, int link,</div><div class='ctx'> 			     int speed, int duplex, int pause,</div><div class='ctx'> 			     phy_interface_t mode)</div><div class='ctx'> {</div><div class='add'>+	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='add'>+	if (!chip-&gt;info-&gt;ops-&gt;port_link_state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;port_link_state(chip, port, &amp;state);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Has anything actually changed? We don't expect the</div><div class='add'>+	 * interface mode to change without one of the other</div><div class='add'>+	 * parameters also changing</div><div class='add'>+	 */</div><div class='add'>+	if (state.link == link &amp;&amp;</div><div class='add'>+	    state.speed == speed &amp;&amp;</div><div class='add'>+	    state.duplex == duplex)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Port's MAC control must not be changed unless the link is down */</div><div class='ctx'> 	err = chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, 0);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -2411,6 +2286,9 @@ static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='add'>+	if (mv88e6xxx_port_set_state(chip, port, BR_STATE_DISABLED))</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to disable port\n");</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;serdes_irq_free)</div><div class='ctx'> 		chip-&gt;info-&gt;ops-&gt;serdes_irq_free(chip, port);</div><div class='ctx'> </div><div class='hunk'>@@ -2579,8 +2457,18 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)</div><div class='ctx'> </div><div class='ctx'> 	/* Setup Switch Port Registers */</div><div class='ctx'> 	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++) {</div><div class='del'>-		if (dsa_is_unused_port(ds, i))</div><div class='add'>+		if (dsa_is_unused_port(ds, i)) {</div><div class='add'>+			err = mv88e6xxx_port_set_state(chip, i,</div><div class='add'>+						       BR_STATE_DISABLED);</div><div class='add'>+			if (err)</div><div class='add'>+				goto unlock;</div><div class='add'>+</div><div class='add'>+			err = mv88e6xxx_serdes_power(chip, i, false);</div><div class='add'>+			if (err)</div><div class='add'>+				goto unlock;</div><div class='add'>+</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		err = mv88e6xxx_setup_port(chip, i);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -4615,30 +4503,6 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)</div><div class='ctx'> 	return chip;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,</div><div class='del'>-			      struct mii_bus *bus, int sw_addr)</div><div class='del'>-{</div><div class='del'>-	if (sw_addr == 0)</div><div class='del'>-		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_single_chip_ops;</div><div class='del'>-	else if (chip-&gt;info-&gt;multi_chip)</div><div class='del'>-		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_multi_chip_ops;</div><div class='del'>-	else</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	chip-&gt;bus = bus;</div><div class='del'>-	chip-&gt;sw_addr = sw_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 mv88e6xxx_ports_cmode_init(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++)</div><div class='del'>-		chip-&gt;ports[i].cmode = MV88E6XXX_PORT_STS_CMODE_INVALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds,</div><div class='ctx'> 							int port)</div><div class='ctx'> {</div><div class='hunk'>@@ -4647,58 +4511,6 @@ static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds,</div><div class='ctx'> 	return chip-&gt;info-&gt;tag_protocol;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)</div><div class='del'>-static const char *mv88e6xxx_drv_probe(struct device *dsa_dev,</div><div class='del'>-				       struct device *host_dev, int sw_addr,</div><div class='del'>-				       void **priv)</div><div class='del'>-{</div><div class='del'>-	struct mv88e6xxx_chip *chip;</div><div class='del'>-	struct mii_bus *bus;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	bus = dsa_host_dev_to_mii_bus(host_dev);</div><div class='del'>-	if (!bus)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	chip = mv88e6xxx_alloc_chip(dsa_dev);</div><div class='del'>-	if (!chip)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Legacy SMI probing will only support chips similar to 88E6085 */</div><div class='del'>-	chip-&gt;info = &amp;mv88e6xxx_table[MV88E6085];</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_smi_init(chip, bus, sw_addr);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_detect(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	mv88e6xxx_ports_cmode_init(chip);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_switch_reset(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	mv88e6xxx_phy_init(chip);</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_mdios_register(chip, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	*priv = chip;</div><div class='del'>-</div><div class='del'>-	return chip-&gt;info-&gt;name;</div><div class='del'>-free:</div><div class='del'>-	devm_kfree(dsa_dev, chip);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int mv88e6xxx_port_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='ctx'> 				      const struct switchdev_obj_port_mdb *mdb)</div><div class='ctx'> {</div><div class='hunk'>@@ -4753,9 +4565,6 @@ static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct dsa_switch_ops mv88e6xxx_switch_ops = {</div><div class='del'>-#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)</div><div class='del'>-	.probe			= mv88e6xxx_drv_probe,</div><div class='del'>-#endif</div><div class='ctx'> 	.get_tag_protocol	= mv88e6xxx_get_tag_protocol,</div><div class='ctx'> 	.setup			= mv88e6xxx_setup,</div><div class='ctx'> 	.adjust_link		= mv88e6xxx_adjust_link,</div><div class='hunk'>@@ -4801,10 +4610,6 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {</div><div class='ctx'> 	.get_ts_info		= mv88e6xxx_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_switch_driver mv88e6xxx_switch_drv = {</div><div class='del'>-	.ops			= &amp;mv88e6xxx_switch_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = chip-&gt;dev;</div><div class='hunk'>@@ -4915,7 +4720,6 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mv88e6xxx_ports_cmode_init(chip);</div><div class='ctx'> 	mv88e6xxx_phy_init(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;get_eeprom) {</div><div class='hunk'>@@ -4932,12 +4736,17 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;irq = of_irq_get(np, 0);</div><div class='del'>-	if (chip-&gt;irq == -EPROBE_DEFER) {</div><div class='del'>-		err = chip-&gt;irq;</div><div class='del'>-		goto out;</div><div class='add'>+	if (np) {</div><div class='add'>+		chip-&gt;irq = of_irq_get(np, 0);</div><div class='add'>+		if (chip-&gt;irq == -EPROBE_DEFER) {</div><div class='add'>+			err = chip-&gt;irq;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (pdata)</div><div class='add'>+		chip-&gt;irq = pdata-&gt;irq;</div><div class='add'>+</div><div class='ctx'> 	/* Has to be performed before the MDIO bus is created, because</div><div class='ctx'> 	 * the PHYs will link their interrupts to these interrupt</div><div class='ctx'> 	 * controllers</div><div class='hunk'>@@ -5047,19 +4856,7 @@ static struct mdio_driver mv88e6xxx_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mv88e6xxx_init(void)</div><div class='del'>-{</div><div class='del'>-	register_switch_driver(&amp;mv88e6xxx_switch_drv);</div><div class='del'>-	return mdio_driver_register(&amp;mv88e6xxx_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mv88e6xxx_init);</div><div class='del'>-</div><div class='del'>-static void __exit mv88e6xxx_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	mdio_driver_unregister(&amp;mv88e6xxx_driver);</div><div class='del'>-	unregister_switch_driver(&amp;mv88e6xxx_switch_drv);</div><div class='del'>-}</div><div class='del'>-module_exit(mv88e6xxx_cleanup);</div><div class='add'>+mdio_module_driver(mv88e6xxx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Marvell 88E6XXX ethernet switch chips");</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h<br/>index 19c07dff0440..faa3fa889f19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/chip.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/chip.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/chip.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/chip.h</a></div><div class='hunk'>@@ -21,17 +21,6 @@</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='del'>-#define SMI_CMD			0x00</div><div class='del'>-#define SMI_CMD_BUSY		BIT(15)</div><div class='del'>-#define SMI_CMD_CLAUSE_22	BIT(12)</div><div class='del'>-#define SMI_CMD_OP_22_WRITE	((1 &lt;&lt; 10) | SMI_CMD_BUSY | SMI_CMD_CLAUSE_22)</div><div class='del'>-#define SMI_CMD_OP_22_READ	((2 &lt;&lt; 10) | SMI_CMD_BUSY | SMI_CMD_CLAUSE_22)</div><div class='del'>-#define SMI_CMD_OP_45_WRITE_ADDR	((0 &lt;&lt; 10) | SMI_CMD_BUSY)</div><div class='del'>-#define SMI_CMD_OP_45_WRITE_DATA	((1 &lt;&lt; 10) | SMI_CMD_BUSY)</div><div class='del'>-#define SMI_CMD_OP_45_READ_DATA		((2 &lt;&lt; 10) | SMI_CMD_BUSY)</div><div class='del'>-#define SMI_CMD_OP_45_READ_DATA_INC	((3 &lt;&lt; 10) | SMI_CMD_BUSY)</div><div class='del'>-#define SMI_DATA		0x01</div><div class='del'>-</div><div class='ctx'> #define MV88E6XXX_N_FID		4096</div><div class='ctx'> </div><div class='ctx'> /* PVT limits for 4-bit port and 5-bit switch */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c<br/>index dce84a2a65c7..c44b2822e4dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/port.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/port.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/port.c</a></div><div class='hunk'>@@ -427,18 +427,22 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='del'>-	if (lane &lt; 0)</div><div class='add'>+	if (lane &lt; 0 &amp;&amp; lane != -ENODEV)</div><div class='ctx'> 		return lane;</div><div class='ctx'> </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='add'>+	if (lane &gt;= 0) {</div><div class='add'>+		if (chip-&gt;ports[port].serdes_irq) {</div><div class='add'>+			err = mv88e6390_serdes_irq_disable(chip, port, lane);</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 = mv88e6390x_serdes_power(chip, port, false);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </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='add'>+	chip-&gt;ports[port].cmode = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmode) {</div><div class='ctx'> 		err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;reg);</div><div class='hunk'>@@ -452,6 +456,12 @@ int mv88e6390x_port_set_cmode(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='add'>+		chip-&gt;ports[port].cmode = cmode;</div><div class='add'>+</div><div class='add'>+		lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='add'>+		if (lane &lt; 0)</div><div class='add'>+			return lane;</div><div class='add'>+</div><div class='ctx'> 		err = mv88e6390x_serdes_power(chip, port, true);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -463,8 +473,6 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;ports[port].cmode = cmode;</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/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h<br/>index c7bed263a0f4..39c85e98fb92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/port.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/mv88e6xxx/port.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/port.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/port.h</a></div><div class='hunk'>@@ -52,7 +52,6 @@</div><div class='ctx'> #define MV88E6185_PORT_STS_CMODE_1000BASE_X	0x0005</div><div class='ctx'> #define MV88E6185_PORT_STS_CMODE_PHY		0x0006</div><div class='ctx'> #define MV88E6185_PORT_STS_CMODE_DISABLED	0x0007</div><div class='del'>-#define MV88E6XXX_PORT_STS_CMODE_INVALID	0xff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x01: MAC (or PCS or Physical) Control Register */</div><div class='ctx'> #define MV88E6XXX_PORT_MAC_CTL				0x01</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/smi.c b/drivers/net/dsa/mv88e6xxx/smi.c<br/>new file mode 100644<br/>index 000000000000..96f7d2685bdc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/smi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/smi.c</a></div><div class='hunk'>@@ -0,0 +1,158 @@</div><div class='add'>+/*</div><div class='add'>+ * Marvell 88E6xxx System Management Interface (SMI) 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 Vivien Didelot &lt;vivien.didelot@gmail.com&gt;</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; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "smi.h"</div><div class='add'>+</div><div class='add'>+/* The switch ADDR[4:1] configuration pins define the chip SMI device address</div><div class='add'>+ * (ADDR[0] is always zero, thus only even SMI addresses can be strapped).</div><div class='add'>+ *</div><div class='add'>+ * When ADDR is all zero, the chip uses Single-chip Addressing Mode, assuming it</div><div class='add'>+ * is the only device connected to the SMI master. In this mode it responds to</div><div class='add'>+ * all 32 possible SMI addresses, and thus maps directly the internal devices.</div><div class='add'>+ *</div><div class='add'>+ * When ADDR is non-zero, the chip uses Multi-chip Addressing Mode, allowing</div><div class='add'>+ * multiple devices to share the SMI interface. In this mode it responds to only</div><div class='add'>+ * 2 registers, used to indirectly access the internal SMI devices.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_smi_direct_read(struct mv88e6xxx_chip *chip,</div><div class='add'>+				     int dev, int reg, u16 *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mdiobus_read_nested(chip-&gt;bus, dev, reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*data = ret &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 int mv88e6xxx_smi_direct_write(struct mv88e6xxx_chip *chip,</div><div class='add'>+				      int dev, int reg, u16 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mdiobus_write_nested(chip-&gt;bus, dev, reg, data);</div><div class='add'>+	if (ret &lt; 0)</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 mv88e6xxx_smi_direct_wait(struct mv88e6xxx_chip *chip,</div><div class='add'>+				     int dev, int reg, int bit, int val)</div><div class='add'>+{</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'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		err = mv88e6xxx_smi_direct_read(chip, dev, 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 &gt;&gt; bit) == !!val)</div><div class='add'>+			return 0;</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 const struct mv88e6xxx_bus_ops mv88e6xxx_smi_direct_ops = {</div><div class='add'>+	.read = mv88e6xxx_smi_direct_read,</div><div class='add'>+	.write = mv88e6xxx_smi_direct_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Offset 0x00: SMI Command Register</div><div class='add'>+ * Offset 0x01: SMI Data Register</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_smi_indirect_read(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       int dev, int reg, u16 *data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_direct_wait(chip, chip-&gt;sw_addr,</div><div class='add'>+					MV88E6XXX_SMI_CMD, 15, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_direct_write(chip, chip-&gt;sw_addr,</div><div class='add'>+					 MV88E6XXX_SMI_CMD,</div><div class='add'>+					 MV88E6XXX_SMI_CMD_BUSY |</div><div class='add'>+					 MV88E6XXX_SMI_CMD_MODE_22 |</div><div class='add'>+					 MV88E6XXX_SMI_CMD_OP_22_READ |</div><div class='add'>+					 (dev &lt;&lt; 5) | reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_direct_wait(chip, chip-&gt;sw_addr,</div><div class='add'>+					MV88E6XXX_SMI_CMD, 15, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_smi_direct_read(chip, chip-&gt;sw_addr,</div><div class='add'>+					 MV88E6XXX_SMI_DATA, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_smi_indirect_write(struct mv88e6xxx_chip *chip,</div><div class='add'>+					int dev, int reg, u16 data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_direct_wait(chip, chip-&gt;sw_addr,</div><div class='add'>+					MV88E6XXX_SMI_CMD, 15, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_direct_write(chip, chip-&gt;sw_addr,</div><div class='add'>+					 MV88E6XXX_SMI_DATA, data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_direct_write(chip, chip-&gt;sw_addr,</div><div class='add'>+					 MV88E6XXX_SMI_CMD,</div><div class='add'>+					 MV88E6XXX_SMI_CMD_BUSY |</div><div class='add'>+					 MV88E6XXX_SMI_CMD_MODE_22 |</div><div class='add'>+					 MV88E6XXX_SMI_CMD_OP_22_WRITE |</div><div class='add'>+					 (dev &lt;&lt; 5) | reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</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='add'>+static const struct mv88e6xxx_bus_ops mv88e6xxx_smi_indirect_ops = {</div><div class='add'>+	.read = mv88e6xxx_smi_indirect_read,</div><div class='add'>+	.write = mv88e6xxx_smi_indirect_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,</div><div class='add'>+		       struct mii_bus *bus, int sw_addr)</div><div class='add'>+{</div><div class='add'>+	if (sw_addr == 0)</div><div class='add'>+		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_direct_ops;</div><div class='add'>+	else if (chip-&gt;info-&gt;multi_chip)</div><div class='add'>+		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_indirect_ops;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	chip-&gt;bus = bus;</div><div class='add'>+	chip-&gt;sw_addr = sw_addr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/smi.h b/drivers/net/dsa/mv88e6xxx/smi.h<br/>new file mode 100644<br/>index 000000000000..35e6403b65dc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/mv88e6xxx/smi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/mv88e6xxx/smi.h</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/*</div><div class='add'>+ * Marvell 88E6xxx System Management Interface (SMI) 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 Vivien Didelot &lt;vivien.didelot@gmail.com&gt;</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; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MV88E6XXX_SMI_H</div><div class='add'>+#define _MV88E6XXX_SMI_H</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+</div><div class='add'>+/* Offset 0x00: SMI Command Register */</div><div class='add'>+#define MV88E6XXX_SMI_CMD			0x00</div><div class='add'>+#define MV88E6XXX_SMI_CMD_BUSY			0x8000</div><div class='add'>+#define MV88E6XXX_SMI_CMD_MODE_MASK		0x1000</div><div class='add'>+#define MV88E6XXX_SMI_CMD_MODE_45		0x0000</div><div class='add'>+#define MV88E6XXX_SMI_CMD_MODE_22		0x1000</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_MASK		0x0c00</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_22_WRITE		0x0400</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_22_READ		0x0800</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_45_WRITE_ADDR	0x0000</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_45_WRITE_DATA	0x0400</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_45_READ_DATA	0x0800</div><div class='add'>+#define MV88E6XXX_SMI_CMD_OP_45_READ_DATA_INC	0x0c00</div><div class='add'>+#define MV88E6XXX_SMI_CMD_DEV_ADDR_MASK		0x003e</div><div class='add'>+#define MV88E6XXX_SMI_CMD_REG_ADDR_MASK		0x001f</div><div class='add'>+</div><div class='add'>+/* Offset 0x01: SMI Data Register */</div><div class='add'>+#define MV88E6XXX_SMI_DATA			0x01</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,</div><div class='add'>+		       struct mii_bus *bus, int sw_addr);</div><div class='add'>+</div><div class='add'>+static inline int mv88e6xxx_smi_read(struct mv88e6xxx_chip *chip,</div><div class='add'>+				     int dev, int reg, u16 *data)</div><div class='add'>+{</div><div class='add'>+	if (chip-&gt;smi_ops &amp;&amp; chip-&gt;smi_ops-&gt;read)</div><div class='add'>+		return chip-&gt;smi_ops-&gt;read(chip, dev, reg, data);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mv88e6xxx_smi_write(struct mv88e6xxx_chip *chip,</div><div class='add'>+				      int dev, int reg, u16 data)</div><div class='add'>+{</div><div class='add'>+	if (chip-&gt;smi_ops &amp;&amp; chip-&gt;smi_ops-&gt;write)</div><div class='add'>+		return chip-&gt;smi_ops-&gt;write(chip, dev, reg, data);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _MV88E6XXX_SMI_H */</div><div class='head'>diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c<br/>index 576b37d12a63..c4fa400efdcc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/qca8k.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/qca8k.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/qca8k.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/qca8k.c</a></div><div class='hunk'>@@ -481,6 +481,155 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)</div><div class='ctx'> 		qca8k_reg_clear(priv, QCA8K_REG_PORT_STATUS(port), mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32</div><div class='add'>+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'>+static int</div><div class='add'>+qca8k_mdio_write(struct qca8k_priv *priv, int port, u32 regnum, u16 data)</div><div class='add'>+{</div><div class='add'>+	u32 phy, val;</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'>+	/* callee is responsible for not passing bad ports,</div><div class='add'>+	 * but we still would like to make spills impossible.</div><div class='add'>+	 */</div><div class='add'>+	phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;</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_write(priv, QCA8K_MDIO_MASTER_CTRL, val);</div><div class='add'>+</div><div class='add'>+	return qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,</div><div class='add'>+		QCA8K_MDIO_MASTER_BUSY);</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 port, u32 regnum)</div><div class='add'>+{</div><div class='add'>+	u32 phy, val;</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'>+	/* callee is responsible for not passing bad ports,</div><div class='add'>+	 * but we still would like to make spills impossible.</div><div class='add'>+	 */</div><div class='add'>+	phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;</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_write(priv, QCA8K_MDIO_MASTER_CTRL, val);</div><div class='add'>+</div><div class='add'>+	if (qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,</div><div class='add'>+			    QCA8K_MDIO_MASTER_BUSY))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	val = (qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL) &amp;</div><div class='add'>+		QCA8K_MDIO_MASTER_DATA_MASK);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)</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_mdio_write(priv, port, regnum, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_phy_read(struct dsa_switch *ds, int port, int regnum)</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_mdio_read(priv, port, 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_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'>+	int err;</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'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node(ports, port) {</div><div class='add'>+		err = of_property_read_u32(port, "reg", &amp;reg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</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'>+		if (of_property_read_bool(port, "phy-handle"))</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'>+	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'>+		qca8k_reg_clear(priv, QCA8K_MDIO_MASTER_CTRL,</div><div class='add'>+				QCA8K_MDIO_MASTER_EN);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;ops.phy_read = qca8k_phy_read;</div><div class='add'>+	priv-&gt;ops.phy_write = qca8k_phy_write;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> qca8k_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='hunk'>@@ -502,6 +651,10 @@ qca8k_setup(struct dsa_switch *ds)</div><div class='ctx'> 	if (IS_ERR(priv-&gt;regmap))</div><div class='ctx'> 		pr_warn("regmap initialization failed");</div><div class='ctx'> </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='ctx'> 	/* Initialize CPU port pad mode (xMII type, delays...) */</div><div class='ctx'> 	phy_mode = of_get_phy_mode(ds-&gt;ports[QCA8K_CPU_PORT].dn);</div><div class='ctx'> 	if (phy_mode &lt; 0) {</div><div class='hunk'>@@ -624,22 +777,6 @@ qca8k_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phy)</div><div class='ctx'> 	qca8k_port_set_status(priv, port, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-qca8k_phy_read(struct dsa_switch *ds, int phy, int regnum)</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'>-	return mdiobus_read(priv-&gt;bus, phy, regnum);</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 phy, int regnum, u16 val)</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'>-	return mdiobus_write(priv-&gt;bus, phy, regnum, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -879,8 +1016,6 @@ static const struct dsa_switch_ops qca8k_switch_ops = {</div><div class='ctx'> 	.setup			= qca8k_setup,</div><div class='ctx'> 	.adjust_link            = qca8k_adjust_link,</div><div class='ctx'> 	.get_strings		= qca8k_get_strings,</div><div class='del'>-	.phy_read		= qca8k_phy_read,</div><div class='del'>-	.phy_write		= qca8k_phy_write,</div><div class='ctx'> 	.get_ethtool_stats	= qca8k_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count		= qca8k_get_sset_count,</div><div class='ctx'> 	.get_mac_eee		= qca8k_get_mac_eee,</div><div class='hunk'>@@ -923,7 +1058,8 @@ qca8k_sw_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;ds-&gt;priv = priv;</div><div class='del'>-	priv-&gt;ds-&gt;ops = &amp;qca8k_switch_ops;</div><div class='add'>+	priv-&gt;ops = qca8k_switch_ops;</div><div class='add'>+	priv-&gt;ds-&gt;ops = &amp;priv-&gt;ops;</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> 	dev_set_drvdata(&amp;mdiodev-&gt;dev, priv);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h<br/>index d146e54c8a6c..249fd62268e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/qca8k.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dsa/qca8k.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/qca8k.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/qca8k.h</a></div><div class='hunk'>@@ -49,6 +49,18 @@</div><div class='ctx'> #define   QCA8K_MIB_FLUSH				BIT(24)</div><div class='ctx'> #define   QCA8K_MIB_CPU_KEEP				BIT(20)</div><div class='ctx'> #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(x)			((x) &lt;&lt; 21)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_REG_ADDR(x)			((x) &lt;&lt; 16)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_DATA(x)			(x)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_DATA_MASK			GENMASK(15, 0)</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='ctx'> #define QCA8K_GOL_MAC_ADDR0				0x60</div><div class='ctx'> #define QCA8K_GOL_MAC_ADDR1				0x64</div><div class='ctx'> #define QCA8K_REG_PORT_STATUS(_i)			(0x07c + (_i) * 4)</div><div class='hunk'>@@ -169,6 +181,7 @@ struct qca8k_priv {</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> 	struct mutex reg_mutex;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct dsa_switch_ops ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qca8k_mib_desc {</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/Kconfig b/drivers/net/dsa/sja1105/Kconfig<br/>new file mode 100644<br/>index 000000000000..757751a89819<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+config NET_DSA_SJA1105</div><div class='add'>+tristate "NXP SJA1105 Ethernet switch family support"</div><div class='add'>+	depends on NET_DSA &amp;&amp; SPI</div><div class='add'>+	select NET_DSA_TAG_SJA1105</div><div class='add'>+	select PACKING</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='add'>+	  This is the driver for the NXP SJA1105 automotive Ethernet switch</div><div class='add'>+	  family. These are 5-port devices and are managed over an SPI</div><div class='add'>+	  interface. Probing is handled based on OF bindings and so is the</div><div class='add'>+	  linkage to phylib. The driver supports the following revisions:</div><div class='add'>+	    - SJA1105E (Gen. 1, No TT-Ethernet)</div><div class='add'>+	    - SJA1105T (Gen. 1, TT-Ethernet)</div><div class='add'>+	    - SJA1105P (Gen. 2, No SGMII, No TT-Ethernet)</div><div class='add'>+	    - SJA1105Q (Gen. 2, No SGMII, TT-Ethernet)</div><div class='add'>+	    - SJA1105R (Gen. 2, SGMII, No TT-Ethernet)</div><div class='add'>+	    - SJA1105S (Gen. 2, SGMII, TT-Ethernet)</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/Makefile b/drivers/net/dsa/sja1105/Makefile<br/>new file mode 100644<br/>index 000000000000..1c2b55fec959<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+obj-$(CONFIG_NET_DSA_SJA1105) += sja1105.o</div><div class='add'>+</div><div class='add'>+sja1105-objs := \</div><div class='add'>+    sja1105_spi.o \</div><div class='add'>+    sja1105_main.o \</div><div class='add'>+    sja1105_ethtool.o \</div><div class='add'>+    sja1105_clocking.o \</div><div class='add'>+    sja1105_static_config.o \</div><div class='add'>+    sja1105_dynamic_config.o \</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h<br/>new file mode 100644<br/>index 000000000000..b043bfc408f2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105.h</a></div><div class='hunk'>@@ -0,0 +1,159 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ * Copyright (c) 2018, Sensor-Technik Wiedemann GmbH</div><div class='add'>+ * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _SJA1105_H</div><div class='add'>+#define _SJA1105_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dsa/sja1105.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include "sja1105_static_config.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_NUM_PORTS		5</div><div class='add'>+#define SJA1105_NUM_TC			8</div><div class='add'>+#define SJA1105ET_FDB_BIN_SIZE		4</div><div class='add'>+/* The hardware value is in multiples of 10 ms.</div><div class='add'>+ * The passed parameter is in multiples of 1 ms.</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_AGEING_TIME_MS(ms)	((ms) / 10)</div><div class='add'>+</div><div class='add'>+/* Keeps the different addresses between E/T and P/Q/R/S */</div><div class='add'>+struct sja1105_regs {</div><div class='add'>+	u64 device_id;</div><div class='add'>+	u64 prod_id;</div><div class='add'>+	u64 status;</div><div class='add'>+	u64 port_control;</div><div class='add'>+	u64 rgu;</div><div class='add'>+	u64 config;</div><div class='add'>+	u64 rmii_pll1;</div><div class='add'>+	u64 pad_mii_tx[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 cgu_idiv[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 rgmii_pad_mii_tx[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mii_tx_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mii_rx_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mii_ext_tx_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mii_ext_rx_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 rgmii_tx_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 rmii_ref_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 rmii_ext_tx_clk[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mac[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mac_hl1[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 mac_hl2[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 qlevel[SJA1105_NUM_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_info {</div><div class='add'>+	u64 device_id;</div><div class='add'>+	/* Needed for distinction between P and R, and between Q and S</div><div class='add'>+	 * (since the parts with/without SGMII share the same</div><div class='add'>+	 * switch core and device_id)</div><div class='add'>+	 */</div><div class='add'>+	u64 part_no;</div><div class='add'>+	const struct sja1105_dynamic_table_ops *dyn_ops;</div><div class='add'>+	const struct sja1105_table_ops *static_ops;</div><div class='add'>+	const struct sja1105_regs *regs;</div><div class='add'>+	int (*reset_cmd)(const void *ctx, const void *data);</div><div class='add'>+	int (*setup_rgmii_delay)(const void *ctx, int port);</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_private {</div><div class='add'>+	struct sja1105_static_config static_config;</div><div class='add'>+	bool rgmii_rx_delay[SJA1105_NUM_PORTS];</div><div class='add'>+	bool rgmii_tx_delay[SJA1105_NUM_PORTS];</div><div class='add'>+	const struct sja1105_info *info;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	struct spi_device *spidev;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct sja1105_port ports[SJA1105_NUM_PORTS];</div><div class='add'>+	/* Serializes transmission of management frames so that</div><div class='add'>+	 * the switch doesn't confuse them with one another.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex mgmt_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "sja1105_dynamic_config.h"</div><div class='add'>+</div><div class='add'>+struct sja1105_spi_message {</div><div class='add'>+	u64 access;</div><div class='add'>+	u64 read_count;</div><div class='add'>+	u64 address;</div><div class='add'>+};</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'>+/* From sja1105_spi.c */</div><div class='add'>+int sja1105_spi_send_packed_buf(const struct sja1105_private *priv,</div><div class='add'>+				sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='add'>+				void *packed_buf, size_t size_bytes);</div><div class='add'>+int sja1105_spi_send_int(const struct sja1105_private *priv,</div><div class='add'>+			 sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='add'>+			 u64 *value, u64 size_bytes);</div><div class='add'>+int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,</div><div class='add'>+				     sja1105_spi_rw_mode_t rw, u64 base_addr,</div><div class='add'>+				     void *packed_buf, u64 buf_len);</div><div class='add'>+int sja1105_static_config_upload(struct sja1105_private *priv);</div><div class='add'>+</div><div class='add'>+extern struct sja1105_info sja1105e_info;</div><div class='add'>+extern struct sja1105_info sja1105t_info;</div><div class='add'>+extern struct sja1105_info sja1105p_info;</div><div class='add'>+extern struct sja1105_info sja1105q_info;</div><div class='add'>+extern struct sja1105_info sja1105r_info;</div><div class='add'>+extern struct sja1105_info sja1105s_info;</div><div class='add'>+</div><div class='add'>+/* From sja1105_clocking.c */</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+	XMII_MAC = 0,</div><div class='add'>+	XMII_PHY = 1,</div><div class='add'>+} sja1105_mii_role_t;</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+	XMII_MODE_MII		= 0,</div><div class='add'>+	XMII_MODE_RMII		= 1,</div><div class='add'>+	XMII_MODE_RGMII		= 2,</div><div class='add'>+} sja1105_phy_interface_t;</div><div class='add'>+</div><div class='add'>+typedef enum {</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_AUTO	= 0,</div><div class='add'>+} sja1105_speed_t;</div><div class='add'>+</div><div class='add'>+int sja1105_clocking_setup_port(struct sja1105_private *priv, int port);</div><div class='add'>+int sja1105_clocking_setup(struct sja1105_private *priv);</div><div class='add'>+</div><div class='add'>+/* From sja1105_ethtool.c */</div><div class='add'>+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='add'>+int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='add'>+</div><div class='add'>+/* From sja1105_dynamic_config.c */</div><div class='add'>+int sja1105_dynamic_config_read(struct sja1105_private *priv,</div><div class='add'>+				enum sja1105_blk_idx blk_idx,</div><div class='add'>+				int index, void *entry);</div><div class='add'>+int sja1105_dynamic_config_write(struct sja1105_private *priv,</div><div class='add'>+				 enum sja1105_blk_idx blk_idx,</div><div class='add'>+				 int index, void *entry, bool keep);</div><div class='add'>+</div><div class='add'>+u8 sja1105_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid);</div><div class='add'>+</div><div class='add'>+/* Common implementations for the static and dynamic configs */</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 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 sja1105_vlan_lookup_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'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_clocking.c b/drivers/net/dsa/sja1105/sja1105_clocking.c<br/>new file mode 100644<br/>index 000000000000..94bfe0ee50a8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_clocking.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_clocking.c</a></div><div class='hunk'>@@ -0,0 +1,601 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause</div><div class='add'>+/* Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+ * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/packing.h&gt;</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_CGU_CMD	4</div><div class='add'>+</div><div class='add'>+struct sja1105_cfg_pad_mii_tx {</div><div class='add'>+	u64 d32_os;</div><div class='add'>+	u64 d32_ipud;</div><div class='add'>+	u64 d10_os;</div><div class='add'>+	u64 d10_ipud;</div><div class='add'>+	u64 ctrl_os;</div><div class='add'>+	u64 ctrl_ipud;</div><div class='add'>+	u64 clk_os;</div><div class='add'>+	u64 clk_ih;</div><div class='add'>+	u64 clk_ipud;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UM10944 Table 82.</div><div class='add'>+ * IDIV_0_C to IDIV_4_C control registers</div><div class='add'>+ * (addr. 10000Bh to 10000Fh)</div><div class='add'>+ */</div><div class='add'>+struct sja1105_cgu_idiv {</div><div class='add'>+	u64 clksrc;</div><div class='add'>+	u64 autoblock;</div><div class='add'>+	u64 idiv;</div><div class='add'>+	u64 pd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PLL_1_C control register</div><div class='add'>+ *</div><div class='add'>+ * SJA1105 E/T: UM10944 Table 81 (address 10000Ah)</div><div class='add'>+ * SJA1105 P/Q/R/S: UM11040 Table 116 (address 10000Ah)</div><div class='add'>+ */</div><div class='add'>+struct sja1105_cgu_pll_ctrl {</div><div class='add'>+	u64 pllclksrc;</div><div class='add'>+	u64 msel;</div><div class='add'>+	u64 autoblock;</div><div class='add'>+	u64 psel;</div><div class='add'>+	u64 direct;</div><div class='add'>+	u64 fbsel;</div><div class='add'>+	u64 bypass;</div><div class='add'>+	u64 pd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CLKSRC_MII0_TX_CLK	= 0x00,</div><div class='add'>+	CLKSRC_MII0_RX_CLK	= 0x01,</div><div class='add'>+	CLKSRC_MII1_TX_CLK	= 0x02,</div><div class='add'>+	CLKSRC_MII1_RX_CLK	= 0x03,</div><div class='add'>+	CLKSRC_MII2_TX_CLK	= 0x04,</div><div class='add'>+	CLKSRC_MII2_RX_CLK	= 0x05,</div><div class='add'>+	CLKSRC_MII3_TX_CLK	= 0x06,</div><div class='add'>+	CLKSRC_MII3_RX_CLK	= 0x07,</div><div class='add'>+	CLKSRC_MII4_TX_CLK	= 0x08,</div><div class='add'>+	CLKSRC_MII4_RX_CLK	= 0x09,</div><div class='add'>+	CLKSRC_PLL0		= 0x0B,</div><div class='add'>+	CLKSRC_PLL1		= 0x0E,</div><div class='add'>+	CLKSRC_IDIV0		= 0x11,</div><div class='add'>+	CLKSRC_IDIV1		= 0x12,</div><div class='add'>+	CLKSRC_IDIV2		= 0x13,</div><div class='add'>+	CLKSRC_IDIV3		= 0x14,</div><div class='add'>+	CLKSRC_IDIV4		= 0x15,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UM10944 Table 83.</div><div class='add'>+ * MIIx clock control registers 1 to 30</div><div class='add'>+ * (addresses 100013h to 100035h)</div><div class='add'>+ */</div><div class='add'>+struct sja1105_cgu_mii_ctrl {</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='add'>+static void sja1105_cgu_idiv_packing(void *buf, struct sja1105_cgu_idiv *idiv,</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;idiv-&gt;clksrc,    28, 24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;idiv-&gt;autoblock, 11, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;idiv-&gt;idiv,       5,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;idiv-&gt;pd,         0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_cgu_idiv_config(struct sja1105_private *priv, int port,</div><div class='add'>+				   bool enabled, int factor)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	struct sja1105_cgu_idiv idiv;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+</div><div class='add'>+	if (enabled &amp;&amp; factor != 1 &amp;&amp; factor != 10) {</div><div class='add'>+		dev_err(dev, "idiv factor must be 1 or 10\n");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	idiv.clksrc    = 0x0A;            /* 25MHz */</div><div class='add'>+	idiv.autoblock = 1;               /* Block clk automatically */</div><div class='add'>+	idiv.idiv      = factor - 1;      /* Divide by 1 or 10 */</div><div class='add'>+	idiv.pd        = enabled ? 0 : 1; /* Power down? */</div><div class='add'>+	sja1105_cgu_idiv_packing(packed_buf, &amp;idiv, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;cgu_idiv[port], packed_buf,</div><div class='add'>+					   SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_cgu_mii_control_packing(void *buf, struct sja1105_cgu_mii_ctrl *cmd,</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;cmd-&gt;clksrc,    28, 24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;autoblock, 11, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;pd,         0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_cgu_mii_tx_clk_config(struct sja1105_private *priv,</div><div class='add'>+					 int port, sja1105_mii_role_t role)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct sja1105_cgu_mii_ctrl mii_tx_clk;</div><div class='add'>+	const int mac_clk_sources[] = {</div><div class='add'>+		CLKSRC_MII0_TX_CLK,</div><div class='add'>+		CLKSRC_MII1_TX_CLK,</div><div class='add'>+		CLKSRC_MII2_TX_CLK,</div><div class='add'>+		CLKSRC_MII3_TX_CLK,</div><div class='add'>+		CLKSRC_MII4_TX_CLK,</div><div class='add'>+	};</div><div class='add'>+	const int phy_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='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	int clksrc;</div><div class='add'>+</div><div class='add'>+	if (role == XMII_MAC)</div><div class='add'>+		clksrc = mac_clk_sources[port];</div><div class='add'>+	else</div><div class='add'>+		clksrc = phy_clk_sources[port];</div><div class='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	mii_tx_clk.clksrc    = clksrc;</div><div class='add'>+	mii_tx_clk.autoblock = 1;  /* Autoblock clk while changing clksrc */</div><div class='add'>+	mii_tx_clk.pd        = 0;  /* Power Down off =&gt; enabled */</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_tx_clk, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;mii_tx_clk[port], packed_buf,</div><div class='add'>+					   SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sja1105_cgu_mii_rx_clk_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_cgu_mii_ctrl mii_rx_clk;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	const int clk_sources[] = {</div><div class='add'>+		CLKSRC_MII0_RX_CLK,</div><div class='add'>+		CLKSRC_MII1_RX_CLK,</div><div class='add'>+		CLKSRC_MII2_RX_CLK,</div><div class='add'>+		CLKSRC_MII3_RX_CLK,</div><div class='add'>+		CLKSRC_MII4_RX_CLK,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	mii_rx_clk.clksrc    = clk_sources[port];</div><div class='add'>+	mii_rx_clk.autoblock = 1;  /* Autoblock clk while changing clksrc */</div><div class='add'>+	mii_rx_clk.pd        = 0;  /* Power Down off =&gt; enabled */</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_rx_clk, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;mii_rx_clk[port], packed_buf,</div><div class='add'>+					   SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sja1105_cgu_mii_ext_tx_clk_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_cgu_mii_ctrl mii_ext_tx_clk;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	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='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	mii_ext_tx_clk.clksrc    = clk_sources[port];</div><div class='add'>+	mii_ext_tx_clk.autoblock = 1; /* Autoblock clk while changing clksrc */</div><div class='add'>+	mii_ext_tx_clk.pd        = 0; /* Power Down off =&gt; enabled */</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_ext_tx_clk, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;mii_ext_tx_clk[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</div><div class='add'>+sja1105_cgu_mii_ext_rx_clk_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_cgu_mii_ctrl mii_ext_rx_clk;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	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='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	mii_ext_rx_clk.clksrc    = clk_sources[port];</div><div class='add'>+	mii_ext_rx_clk.autoblock = 1; /* Autoblock clk while changing clksrc */</div><div class='add'>+	mii_ext_rx_clk.pd        = 0; /* Power Down off =&gt; enabled */</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_ext_rx_clk, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;mii_ext_rx_clk[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_mii_clocking_setup(struct sja1105_private *priv, int port,</div><div class='add'>+				      sja1105_mii_role_t role)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Configuring MII-%s clocking\n",</div><div class='add'>+		(role == XMII_MAC) ? "MAC" : "PHY");</div><div class='add'>+	/* If role is MAC, disable IDIV</div><div class='add'>+	 * If role is PHY, enable IDIV and configure for 1/1 divider</div><div class='add'>+	 */</div><div class='add'>+	rc = sja1105_cgu_idiv_config(priv, port, (role == XMII_PHY), 1);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Configure CLKSRC of MII_TX_CLK_n</div><div class='add'>+	 *   * If role is MAC, select TX_CLK_n</div><div class='add'>+	 *   * If role is PHY, select IDIV_n</div><div class='add'>+	 */</div><div class='add'>+	rc = sja1105_cgu_mii_tx_clk_config(priv, port, role);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Configure CLKSRC of MII_RX_CLK_n</div><div class='add'>+	 * Select RX_CLK_n</div><div class='add'>+	 */</div><div class='add'>+	rc = sja1105_cgu_mii_rx_clk_config(priv, port);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (role == XMII_PHY) {</div><div class='add'>+		/* Per MII spec, the PHY (which is us) drives the TX_CLK pin */</div><div class='add'>+</div><div class='add'>+		/* Configure CLKSRC of EXT_TX_CLK_n</div><div class='add'>+		 * Select IDIV_n</div><div class='add'>+		 */</div><div class='add'>+		rc = sja1105_cgu_mii_ext_tx_clk_config(priv, port);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		/* Configure CLKSRC of EXT_RX_CLK_n</div><div class='add'>+		 * Select IDIV_n</div><div class='add'>+		 */</div><div class='add'>+		rc = sja1105_cgu_mii_ext_rx_clk_config(priv, port);</div><div class='add'>+		if (rc &lt; 0)</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</div><div class='add'>+sja1105_cgu_pll_control_packing(void *buf, struct sja1105_cgu_pll_ctrl *cmd,</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;cmd-&gt;pllclksrc, 28, 24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;msel,      23, 16, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;autoblock, 11, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;psel,       9,  8, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;direct,     7,  7, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;fbsel,      6,  6, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;bypass,     1,  1, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;pd,         0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_cgu_rgmii_tx_clk_config(struct sja1105_private *priv,</div><div class='add'>+					   int port, sja1105_speed_t speed)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct sja1105_cgu_mii_ctrl txc;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	int clksrc;</div><div class='add'>+</div><div class='add'>+	if (speed == SJA1105_SPEED_1000MBPS) {</div><div class='add'>+		clksrc = CLKSRC_PLL0;</div><div class='add'>+	} else {</div><div class='add'>+		int clk_sources[] = {CLKSRC_IDIV0, CLKSRC_IDIV1, CLKSRC_IDIV2,</div><div class='add'>+				     CLKSRC_IDIV3, CLKSRC_IDIV4};</div><div class='add'>+		clksrc = clk_sources[port];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RGMII: 125MHz for 1000, 25MHz for 100, 2.5MHz for 10 */</div><div class='add'>+	txc.clksrc = clksrc;</div><div class='add'>+	/* Autoblock clk while changing clksrc */</div><div class='add'>+	txc.autoblock = 1;</div><div class='add'>+	/* Power Down off =&gt; enabled */</div><div class='add'>+	txc.pd = 0;</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;txc, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;rgmii_tx_clk[port],</div><div class='add'>+					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* AGU */</div><div class='add'>+static void</div><div class='add'>+sja1105_cfg_pad_mii_tx_packing(void *buf, struct sja1105_cfg_pad_mii_tx *cmd,</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;cmd-&gt;d32_os,   28, 27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;d32_ipud, 25, 24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;d10_os,   20, 19, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;d10_ipud, 17, 16, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ctrl_os,  12, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ctrl_ipud, 9,  8, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;clk_os,    4,  3, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;clk_ih,    2,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;clk_ipud,  1,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_rgmii_cfg_pad_tx_config(struct sja1105_private *priv,</div><div class='add'>+					   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_tx pad_mii_tx;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+</div><div class='add'>+	/* Payload */</div><div class='add'>+	pad_mii_tx.d32_os    = 3; /* TXD[3:2] output stage: */</div><div class='add'>+				  /*          high noise/high speed */</div><div class='add'>+	pad_mii_tx.d10_os    = 3; /* TXD[1:0] output stage: */</div><div class='add'>+				  /*          high noise/high speed */</div><div class='add'>+	pad_mii_tx.d32_ipud  = 2; /* TXD[3:2] input stage: */</div><div class='add'>+				  /*          plain input (default) */</div><div class='add'>+	pad_mii_tx.d10_ipud  = 2; /* TXD[1:0] input stage: */</div><div class='add'>+				  /*          plain input (default) */</div><div class='add'>+	pad_mii_tx.ctrl_os   = 3; /* TX_CTL / TX_ER output stage */</div><div class='add'>+	pad_mii_tx.ctrl_ipud = 2; /* TX_CTL / TX_ER input stage (default) */</div><div class='add'>+	pad_mii_tx.clk_os    = 3; /* TX_CLK output stage */</div><div class='add'>+	pad_mii_tx.clk_ih    = 0; /* TX_CLK input hysteresis (default) */</div><div class='add'>+	pad_mii_tx.clk_ipud  = 2; /* TX_CLK input stage (default) */</div><div class='add'>+	sja1105_cfg_pad_mii_tx_packing(packed_buf, &amp;pad_mii_tx, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;rgmii_pad_mii_tx[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'>+{</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+	sja1105_speed_t speed;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+	speed = mac[port].speed;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Configuring port %d RGMII at speed %dMbps\n",</div><div class='add'>+		port, speed);</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SJA1105_SPEED_1000MBPS:</div><div class='add'>+		/* 1000Mbps, IDIV disabled (125 MHz) */</div><div class='add'>+		rc = sja1105_cgu_idiv_config(priv, port, false, 1);</div><div class='add'>+		break;</div><div class='add'>+	case SJA1105_SPEED_100MBPS:</div><div class='add'>+		/* 100Mbps, IDIV enabled, divide by 1 (25 MHz) */</div><div class='add'>+		rc = sja1105_cgu_idiv_config(priv, port, true, 1);</div><div class='add'>+		break;</div><div class='add'>+	case SJA1105_SPEED_10MBPS:</div><div class='add'>+		/* 10Mbps, IDIV enabled, divide by 10 (2.5 MHz) */</div><div class='add'>+		rc = sja1105_cgu_idiv_config(priv, port, true, 10);</div><div class='add'>+		break;</div><div class='add'>+	case SJA1105_SPEED_AUTO:</div><div class='add'>+		/* Skip CGU configuration if there is no speed available</div><div class='add'>+		 * (e.g. link is not established yet)</div><div class='add'>+		 */</div><div class='add'>+		dev_dbg(dev, "Speed not available, skipping CGU config\n");</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to configure idiv\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = sja1105_cgu_rgmii_tx_clk_config(priv, port, speed);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to configure RGMII Tx clock\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = sja1105_rgmii_cfg_pad_tx_config(priv, port);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to configure Tx pad registers\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	if (!priv-&gt;info-&gt;setup_rgmii_delay)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;setup_rgmii_delay(priv, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_cgu_rmii_ref_clk_config(struct sja1105_private *priv,</div><div class='add'>+					   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_cgu_mii_ctrl ref_clk;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	const int clk_sources[] = {</div><div class='add'>+		CLKSRC_MII0_TX_CLK,</div><div class='add'>+		CLKSRC_MII1_TX_CLK,</div><div class='add'>+		CLKSRC_MII2_TX_CLK,</div><div class='add'>+		CLKSRC_MII3_TX_CLK,</div><div class='add'>+		CLKSRC_MII4_TX_CLK,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	ref_clk.clksrc    = clk_sources[port];</div><div class='add'>+	ref_clk.autoblock = 1;      /* Autoblock clk while changing clksrc */</div><div class='add'>+	ref_clk.pd        = 0;      /* Power Down off =&gt; enabled */</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;ref_clk, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;rmii_ref_clk[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</div><div class='add'>+sja1105_cgu_rmii_ext_tx_clk_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_cgu_mii_ctrl ext_tx_clk;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+</div><div class='add'>+	/* Payload for packed_buf */</div><div class='add'>+	ext_tx_clk.clksrc    = CLKSRC_PLL1;</div><div class='add'>+	ext_tx_clk.autoblock = 1;   /* Autoblock clk while changing clksrc */</div><div class='add'>+	ext_tx_clk.pd        = 0;   /* Power Down off =&gt; enabled */</div><div class='add'>+	sja1105_cgu_mii_control_packing(packed_buf, &amp;ext_tx_clk, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='add'>+					   regs-&gt;rmii_ext_tx_clk[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_cgu_rmii_pll_config(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	struct sja1105_cgu_pll_ctrl pll = {0};</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* PLL1 must be enabled and output 50 Mhz.</div><div class='add'>+	 * This is done by writing first 0x0A010941 to</div><div class='add'>+	 * the PLL_1_C register and then deasserting</div><div class='add'>+	 * power down (PD) 0x0A010940.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Step 1: PLL1 setup for 50Mhz */</div><div class='add'>+	pll.pllclksrc = 0xA;</div><div class='add'>+	pll.msel      = 0x1;</div><div class='add'>+	pll.autoblock = 0x1;</div><div class='add'>+	pll.psel      = 0x1;</div><div class='add'>+	pll.direct    = 0x0;</div><div class='add'>+	pll.fbsel     = 0x1;</div><div class='add'>+	pll.bypass    = 0x0;</div><div class='add'>+	pll.pd        = 0x1;</div><div class='add'>+</div><div class='add'>+	sja1105_cgu_pll_control_packing(packed_buf, &amp;pll, PACK);</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rmii_pll1,</div><div class='add'>+					 packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to configure PLL1 for 50MHz\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 2: Enable PLL1 */</div><div class='add'>+	pll.pd = 0x0;</div><div class='add'>+</div><div class='add'>+	sja1105_cgu_pll_control_packing(packed_buf, &amp;pll, PACK);</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rmii_pll1,</div><div class='add'>+					 packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to enable PLL1\n");</div><div class='add'>+		return 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 sja1105_rmii_clocking_setup(struct sja1105_private *priv, int port,</div><div class='add'>+				       sja1105_mii_role_t role)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Configuring RMII-%s clocking\n",</div><div class='add'>+		(role == XMII_MAC) ? "MAC" : "PHY");</div><div class='add'>+	/* AH1601.pdf chapter 2.5.1. Sources */</div><div class='add'>+	if (role == XMII_MAC) {</div><div class='add'>+		/* Configure and enable PLL1 for 50Mhz output */</div><div class='add'>+		rc = sja1105_cgu_rmii_pll_config(priv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	/* Disable IDIV for this port */</div><div class='add'>+	rc = sja1105_cgu_idiv_config(priv, port, false, 1);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	/* Source to sink mappings */</div><div class='add'>+	rc = sja1105_cgu_rmii_ref_clk_config(priv, port);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	if (role == XMII_MAC) {</div><div class='add'>+		rc = sja1105_cgu_rmii_ext_tx_clk_config(priv, port);</div><div class='add'>+		if (rc &lt; 0)</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'>+int sja1105_clocking_setup_port(struct sja1105_private *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_xmii_params_entry *mii;</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	sja1105_phy_interface_t phy_mode;</div><div class='add'>+	sja1105_mii_role_t role;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mii = priv-&gt;static_config.tables[BLK_IDX_XMII_PARAMS].entries;</div><div class='add'>+</div><div class='add'>+	/* RGMII etc */</div><div class='add'>+	phy_mode = mii-&gt;xmii_mode[port];</div><div class='add'>+	/* MAC or PHY, for applicable types (not RGMII) */</div><div class='add'>+	role = mii-&gt;phy_mac[port];</div><div class='add'>+</div><div class='add'>+	switch (phy_mode) {</div><div class='add'>+	case XMII_MODE_MII:</div><div class='add'>+		rc = sja1105_mii_clocking_setup(priv, port, role);</div><div class='add'>+		break;</div><div class='add'>+	case XMII_MODE_RMII:</div><div class='add'>+		rc = sja1105_rmii_clocking_setup(priv, port, role);</div><div class='add'>+		break;</div><div class='add'>+	case XMII_MODE_RGMII:</div><div class='add'>+		rc = sja1105_rgmii_clocking_setup(priv, port);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Invalid interface mode specified: %d\n",</div><div class='add'>+			phy_mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(dev, "Clocking setup for port %d failed: %d\n",</div><div class='add'>+			port, rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_clocking_setup(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	int port, rc;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; SJA1105_NUM_PORTS; port++) {</div><div class='add'>+		rc = sja1105_clocking_setup_port(priv, port);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</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_dynamic_config.c b/drivers/net/dsa/sja1105/sja1105_dynamic_config.c<br/>new file mode 100644<br/>index 000000000000..e73ab28bf632<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_dynamic_config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_dynamic_config.c</a></div><div class='hunk'>@@ -0,0 +1,532 @@</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'>+ */</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_DYN_CMD					4</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_SIZE_MAC_CONFIG_DYN_ENTRY			\</div><div class='add'>+	SJA1105_SIZE_DYN_CMD</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105ET_SIZE_L2_LOOKUP_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105PQRS_SIZE_L2_LOOKUP_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_VLAN_LOOKUP_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + 4 + SJA1105_SIZE_VLAN_LOOKUP_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_L2_FORWARDING_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_L2_FORWARDING_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_SIZE_MAC_CONFIG_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105ET_SIZE_MAC_CONFIG_DYN_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD			\</div><div class='add'>+	SJA1105_SIZE_DYN_CMD</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD			\</div><div class='add'>+	SJA1105_SIZE_DYN_CMD</div><div class='add'>+</div><div class='add'>+#define SJA1105_MAX_DYN_CMD_SIZE				\</div><div class='add'>+	SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD</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'>+	u8 *p = 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(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, 27, 27, size, op);</div><div class='add'>+	/* Hack - The hardware takes the 'index' field within</div><div class='add'>+	 * struct sja1105_l2_lookup_entry as the index on which this command</div><div class='add'>+	 * will operate. However it will ignore everything else, so 'index'</div><div class='add'>+	 * is logically part of command but physically part of entry.</div><div class='add'>+	 * Populate the 'index' entry field from within the command callback,</div><div class='add'>+	 * such that our API doesn't need to ask for a full-blown entry</div><div class='add'>+	 * structure when e.g. a delete is requested.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index, 29, 20,</div><div class='add'>+			SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY, op);</div><div class='add'>+	/* TODO hostcmd */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105et_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'>+	u8 *p = 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(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, 27, 27, size, op);</div><div class='add'>+	/* Hack - see comments above. */</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index, 29, 20,</div><div class='add'>+			SJA1105ET_SIZE_L2_LOOKUP_ENTRY, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105et_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 + SJA1105ET_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	u64 mgmtroute = 1;</div><div class='add'>+</div><div class='add'>+	sja1105et_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 sja1105et_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'>+	struct sja1105_mgmt_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105ET_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+</div><div class='add'>+	/* UM10944: To specify if a PTP egress timestamp shall be captured on</div><div class='add'>+	 * each port upon transmission of the frame, the LSB of VLANID in the</div><div class='add'>+	 * ENTRY field provided by the host must be set.</div><div class='add'>+	 * Bit 1 of VLANID then specifies the register where the timestamp for</div><div class='add'>+	 * this port is stored in.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tsreg,     85, 85, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;takets,    84, 84, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;macaddr,   83, 36, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports, 35, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;enfport,   30, 30, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* In E/T, entry is at addresses 0x27-0x28. There is a 4 byte gap at 0x29,</div><div class='add'>+ * and command is at 0x2a. Similarly in P/Q/R/S there is a 1 register gap</div><div class='add'>+ * between entry (0x2d, 0x2e) and command (0x30).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+sja1105_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 + SJA1105_SIZE_VLAN_LOOKUP_ENTRY + 4;</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;valident, 27, 27, size, op);</div><div class='add'>+	/* Hack - see comments above, applied for 'vlanid' field of</div><div class='add'>+	 * struct sja1105_vlan_lookup_entry.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index, 38, 27,</div><div class='add'>+			SJA1105_SIZE_VLAN_LOOKUP_ENTRY, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_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;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,    4,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105et_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'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+	/* Yup, user manual definitions are reversed */</div><div class='add'>+	u8 *reg1 = buf + 4;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(reg1, &amp;cmd-&gt;valid, 31, 31, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;cmd-&gt;index, 26, 24, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105et_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 int size = SJA1105ET_SIZE_MAC_CONFIG_DYN_ENTRY;</div><div class='add'>+	struct sja1105_mac_config_entry *entry = entry_ptr;</div><div class='add'>+	/* Yup, user manual definitions are reversed */</div><div class='add'>+	u8 *reg1 = buf + 4;</div><div class='add'>+	u8 *reg2 = buf;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;speed,     30, 29, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;drpdtag,   23, 23, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;drpuntag,  22, 22, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;retag,     21, 21, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;dyn_learn, 20, 20, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;egress,    19, 19, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;ingress,   18, 18, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;ing_mirr,  17, 17, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;egr_mirr,  16, 16, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;vlanprio,  14, 12, size, op);</div><div class='add'>+	sja1105_packing(reg1, &amp;entry-&gt;vlanid,    11,  0, size, op);</div><div class='add'>+	sja1105_packing(reg2, &amp;entry-&gt;tp_delin,  31, 16, size, op);</div><div class='add'>+	sja1105_packing(reg2, &amp;entry-&gt;tp_delout, 15,  0, size, op);</div><div class='add'>+	/* MAC configuration table entries which can't be reconfigured:</div><div class='add'>+	 * top, base, enabled, ifg, maxage, drpnona664</div><div class='add'>+	 */</div><div class='add'>+	/* Bogus return value, not used anywhere */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_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'>+	const int size = SJA1105ET_SIZE_MAC_CONFIG_DYN_ENTRY;</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY;</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,    2,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105et_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'>+	sja1105_packing(buf, &amp;cmd-&gt;valid, 31, 31,</div><div class='add'>+			SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1105et_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'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;poly, 7, 0,</div><div class='add'>+			SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD, op);</div><div class='add'>+	/* Bogus return value, not used anywhere */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105et_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'>+	const int size = SJA1105ET_SIZE_GENERAL_PARAMS_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'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1105et_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 int size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_port, 2, 0, size, op);</div><div class='add'>+	/* Bogus return value, not used anywhere */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define OP_READ		BIT(0)</div><div class='add'>+#define OP_WRITE	BIT(1)</div><div class='add'>+#define OP_DEL		BIT(2)</div><div class='add'>+</div><div class='add'>+/* SJA1105E/T: First generation */</div><div class='add'>+struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1105et_l2_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_l2_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x20,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MGMT_ROUTE] = {</div><div class='add'>+		.entry_packing = sja1105et_mgmt_route_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_mgmt_route_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE),</div><div class='add'>+		.max_entry_count = SJA1105_NUM_PORTS,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x20,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_POLICING] = {0},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105_vlan_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_WRITE | OP_DEL),</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VLAN_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1105_SIZE_VLAN_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x27,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING] = {</div><div class='add'>+		.entry_packing = sja1105_l2_forwarding_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105_l2_forwarding_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105_SIZE_L2_FORWARDING_DYN_CMD,</div><div class='add'>+		.addr = 0x24,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.entry_packing = sja1105et_mac_config_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_mac_config_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_MAC_CONFIG_DYN_CMD,</div><div class='add'>+		.addr = 0x36,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1105et_l2_lookup_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_l2_lookup_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x38,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING_PARAMS] = {0},</div><div class='add'>+	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1105et_general_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_general_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x34,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_XMII_PARAMS] = {0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1105P/Q/R/S: Second generation: TODO */</div><div class='add'>+struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_l2_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x24,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_POLICING] = {0},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105_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 = SJA1105_SIZE_VLAN_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x2D,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING] = {</div><div class='add'>+		.entry_packing = sja1105_l2_forwarding_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105_l2_forwarding_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105_SIZE_L2_FORWARDING_DYN_CMD,</div><div class='add'>+		.addr = 0x2A,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.entry_packing = sja1105pqrs_mac_config_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_mac_config_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE),</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD,</div><div class='add'>+		.addr = 0x4B,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1105et_l2_lookup_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_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),</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x38,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING_PARAMS] = {0},</div><div class='add'>+	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1105et_general_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_general_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x34,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_XMII_PARAMS] = {0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sja1105_dynamic_config_read(struct sja1105_private *priv,</div><div class='add'>+				enum sja1105_blk_idx blk_idx,</div><div class='add'>+				int index, void *entry)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_dynamic_table_ops *ops;</div><div class='add'>+	struct sja1105_dyn_cmd cmd = {0};</div><div class='add'>+	/* SPI payload buffer */</div><div class='add'>+	u8 packed_buf[SJA1105_MAX_DYN_CMD_SIZE] = {0};</div><div class='add'>+	int retries = 3;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (blk_idx &gt;= BLK_IDX_MAX_DYN)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	ops = &amp;priv-&gt;info-&gt;dyn_ops[blk_idx];</div><div class='add'>+</div><div class='add'>+	if (index &gt;= ops-&gt;max_entry_count)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	if (!(ops-&gt;access &amp; OP_READ))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (ops-&gt;packed_size &gt; SJA1105_MAX_DYN_CMD_SIZE)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	if (!ops-&gt;cmd_packing)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (!ops-&gt;entry_packing)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	cmd.valid = true; /* Trigger action on table entry */</div><div class='add'>+	cmd.rdwrset = SPI_READ; /* Action is read */</div><div class='add'>+	cmd.index = index;</div><div class='add'>+	ops-&gt;cmd_packing(packed_buf, &amp;cmd, PACK);</div><div class='add'>+</div><div class='add'>+	/* Send SPI write operation: read config table entry */</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, ops-&gt;addr,</div><div class='add'>+					 packed_buf, ops-&gt;packed_size);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Loop until we have confirmation that hardware has finished</div><div class='add'>+	 * processing the command and has cleared the VALID field</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		memset(packed_buf, 0, ops-&gt;packed_size);</div><div class='add'>+</div><div class='add'>+		/* Retrieve the read operation's result */</div><div class='add'>+		rc = sja1105_spi_send_packed_buf(priv, SPI_READ, ops-&gt;addr,</div><div class='add'>+						 packed_buf, ops-&gt;packed_size);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		cmd = (struct sja1105_dyn_cmd) {0};</div><div class='add'>+		ops-&gt;cmd_packing(packed_buf, &amp;cmd, UNPACK);</div><div class='add'>+		/* UM10944: [valident] will always be found cleared</div><div class='add'>+		 * during a read access with MGMTROUTE set.</div><div class='add'>+		 * So don't error out in that case.</div><div class='add'>+		 */</div><div class='add'>+		if (!cmd.valident &amp;&amp; blk_idx != BLK_IDX_MGMT_ROUTE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (cmd.valid &amp;&amp; --retries);</div><div class='add'>+</div><div class='add'>+	if (cmd.valid)</div><div class='add'>+		return -ETIMEDOUT;</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'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_dynamic_config_write(struct sja1105_private *priv,</div><div class='add'>+				 enum sja1105_blk_idx blk_idx,</div><div class='add'>+				 int index, void *entry, bool keep)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_dynamic_table_ops *ops;</div><div class='add'>+	struct sja1105_dyn_cmd cmd = {0};</div><div class='add'>+	/* SPI payload buffer */</div><div class='add'>+	u8 packed_buf[SJA1105_MAX_DYN_CMD_SIZE] = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (blk_idx &gt;= BLK_IDX_MAX_DYN)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	ops = &amp;priv-&gt;info-&gt;dyn_ops[blk_idx];</div><div class='add'>+</div><div class='add'>+	if (index &gt;= ops-&gt;max_entry_count)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	if (!(ops-&gt;access &amp; OP_WRITE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (!keep &amp;&amp; !(ops-&gt;access &amp; OP_DEL))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (ops-&gt;packed_size &gt; SJA1105_MAX_DYN_CMD_SIZE)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	cmd.valident = keep; /* If false, deletes entry */</div><div class='add'>+	cmd.valid = true; /* Trigger action on table entry */</div><div class='add'>+	cmd.rdwrset = SPI_WRITE; /* Action is write */</div><div class='add'>+	cmd.index = index;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;cmd_packing)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	ops-&gt;cmd_packing(packed_buf, &amp;cmd, PACK);</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;entry_packing)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	/* Don't dereference potentially NULL pointer if just</div><div class='add'>+	 * deleting a table entry is what was requested. For cases</div><div class='add'>+	 * where 'index' field is physically part of entry structure,</div><div class='add'>+	 * and needed here, we deal with that in the cmd_packing callback.</div><div class='add'>+	 */</div><div class='add'>+	if (keep)</div><div class='add'>+		ops-&gt;entry_packing(packed_buf, entry, PACK);</div><div class='add'>+</div><div class='add'>+	/* Send SPI write operation: read config table entry */</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, ops-&gt;addr,</div><div class='add'>+					 packed_buf, ops-&gt;packed_size);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	cmd = (struct sja1105_dyn_cmd) {0};</div><div class='add'>+	ops-&gt;cmd_packing(packed_buf, &amp;cmd, UNPACK);</div><div class='add'>+	if (cmd.errors)</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 u8 sja1105_crc8_add(u8 crc, u8 byte, u8 poly)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if ((crc ^ byte) &amp; (1 &lt;&lt; 7)) {</div><div class='add'>+			crc &lt;&lt;= 1;</div><div class='add'>+			crc ^= poly;</div><div class='add'>+		} else {</div><div class='add'>+			crc &lt;&lt;= 1;</div><div class='add'>+		}</div><div class='add'>+		byte &lt;&lt;= 1;</div><div class='add'>+	}</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CRC8 algorithm with non-reversed input, non-reversed output,</div><div class='add'>+ * no input xor and no output xor. Code customized for receiving</div><div class='add'>+ * the SJA1105 E/T FDB keys (vlanid, macaddr) as input. CRC polynomial</div><div class='add'>+ * is also received as argument in the Koopman notation that the switch</div><div class='add'>+ * hardware stores it in.</div><div class='add'>+ */</div><div class='add'>+u8 sja1105_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_params_entry *l2_lookup_params =</div><div class='add'>+		priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP_PARAMS].entries;</div><div class='add'>+	u64 poly_koopman = l2_lookup_params-&gt;poly;</div><div class='add'>+	/* Convert polynomial from Koopman to 'normal' notation */</div><div class='add'>+	u8 poly = (u8)(1 + (poly_koopman &lt;&lt; 1));</div><div class='add'>+	u64 vlanid = l2_lookup_params-&gt;shared_learn ? 0 : vid;</div><div class='add'>+	u64 input = (vlanid &lt;&lt; 48) | ether_addr_to_u64(addr);</div><div class='add'>+	u8 crc = 0; /* seed */</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Mask the eight bytes starting from MSB one at a time */</div><div class='add'>+	for (i = 56; i &gt;= 0; i -= 8) {</div><div class='add'>+		u8 byte = (input &amp; (0xffull &lt;&lt; i)) &gt;&gt; i;</div><div class='add'>+</div><div class='add'>+		crc = sja1105_crc8_add(crc, byte, poly);</div><div class='add'>+	}</div><div class='add'>+	return crc;</div><div class='add'>+}</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/>new file mode 100644<br/>index 000000000000..77be59546a55<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_dynamic_config.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_dynamic_config.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</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_DYNAMIC_CONFIG_H</div><div class='add'>+#define _SJA1105_DYNAMIC_CONFIG_H</div><div class='add'>+</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+#include &lt;linux/packing.h&gt;</div><div class='add'>+</div><div class='add'>+struct sja1105_dyn_cmd {</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='add'>+</div><div class='add'>+struct sja1105_dynamic_table_ops {</div><div class='add'>+	/* This returns size_t just to keep same prototype as the</div><div class='add'>+	 * static config ops, of which we are reusing some functions.</div><div class='add'>+	 */</div><div class='add'>+	size_t (*entry_packing)(void *buf, void *entry_ptr, enum packing_op op);</div><div class='add'>+	void (*cmd_packing)(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+			    enum packing_op op);</div><div class='add'>+	size_t max_entry_count;</div><div class='add'>+	size_t packed_size;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u8 access;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_mgmt_entry {</div><div class='add'>+	u64 tsreg;</div><div class='add'>+	u64 takets;</div><div class='add'>+	u64 macaddr;</div><div class='add'>+	u64 destports;</div><div class='add'>+	u64 enfport;</div><div class='add'>+	u64 index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='add'>+extern struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c<br/>new file mode 100644<br/>index 000000000000..ab581a28cd41<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,419 @@</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'>+ */</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_MAC_AREA		(0x02 * 4)</div><div class='add'>+#define SJA1105_SIZE_HL1_AREA		(0x10 * 4)</div><div class='add'>+#define SJA1105_SIZE_HL2_AREA		(0x4 * 4)</div><div class='add'>+#define SJA1105_SIZE_QLEVEL_AREA	(0x8 * 4) /* 0x4 to 0xB */</div><div class='add'>+</div><div class='add'>+struct sja1105_port_status_mac {</div><div class='add'>+	u64 n_runt;</div><div class='add'>+	u64 n_soferr;</div><div class='add'>+	u64 n_alignerr;</div><div class='add'>+	u64 n_miierr;</div><div class='add'>+	u64 typeerr;</div><div class='add'>+	u64 sizeerr;</div><div class='add'>+	u64 tctimeout;</div><div class='add'>+	u64 priorerr;</div><div class='add'>+	u64 nomaster;</div><div class='add'>+	u64 memov;</div><div class='add'>+	u64 memerr;</div><div class='add'>+	u64 invtyp;</div><div class='add'>+	u64 intcyov;</div><div class='add'>+	u64 domerr;</div><div class='add'>+	u64 pcfbagdrop;</div><div class='add'>+	u64 spcprior;</div><div class='add'>+	u64 ageprior;</div><div class='add'>+	u64 portdrop;</div><div class='add'>+	u64 lendrop;</div><div class='add'>+	u64 bagdrop;</div><div class='add'>+	u64 policeerr;</div><div class='add'>+	u64 drpnona664err;</div><div class='add'>+	u64 spcerr;</div><div class='add'>+	u64 agedrp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_port_status_hl1 {</div><div class='add'>+	u64 n_n664err;</div><div class='add'>+	u64 n_vlanerr;</div><div class='add'>+	u64 n_unreleased;</div><div class='add'>+	u64 n_sizeerr;</div><div class='add'>+	u64 n_crcerr;</div><div class='add'>+	u64 n_vlnotfound;</div><div class='add'>+	u64 n_ctpolerr;</div><div class='add'>+	u64 n_polerr;</div><div class='add'>+	u64 n_rxfrmsh;</div><div class='add'>+	u64 n_rxfrm;</div><div class='add'>+	u64 n_rxbytesh;</div><div class='add'>+	u64 n_rxbyte;</div><div class='add'>+	u64 n_txfrmsh;</div><div class='add'>+	u64 n_txfrm;</div><div class='add'>+	u64 n_txbytesh;</div><div class='add'>+	u64 n_txbyte;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_port_status_hl2 {</div><div class='add'>+	u64 n_qfull;</div><div class='add'>+	u64 n_part_drop;</div><div class='add'>+	u64 n_egr_disabled;</div><div class='add'>+	u64 n_not_reach;</div><div class='add'>+	u64 qlevel_hwm[8]; /* Only for P/Q/R/S */</div><div class='add'>+	u64 qlevel[8];     /* Only for P/Q/R/S */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_port_status {</div><div class='add'>+	struct sja1105_port_status_mac mac;</div><div class='add'>+	struct sja1105_port_status_hl1 hl1;</div><div class='add'>+	struct sja1105_port_status_hl2 hl2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_port_status_mac_unpack(void *buf,</div><div class='add'>+			       struct sja1105_port_status_mac *status)</div><div class='add'>+{</div><div class='add'>+	/* Make pointer arithmetic work on 4 bytes */</div><div class='add'>+	u32 *p = buf;</div><div class='add'>+</div><div class='add'>+	sja1105_unpack(p + 0x0, &amp;status-&gt;n_runt,       31, 24, 4);</div><div class='add'>+	sja1105_unpack(p + 0x0, &amp;status-&gt;n_soferr,     23, 16, 4);</div><div class='add'>+	sja1105_unpack(p + 0x0, &amp;status-&gt;n_alignerr,   15,  8, 4);</div><div class='add'>+	sja1105_unpack(p + 0x0, &amp;status-&gt;n_miierr,      7,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;typeerr,      27, 27, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;sizeerr,      26, 26, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;tctimeout,    25, 25, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;priorerr,     24, 24, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;nomaster,     23, 23, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;memov,        22, 22, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;memerr,       21, 21, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;invtyp,       19, 19, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;intcyov,      18, 18, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;domerr,       17, 17, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;pcfbagdrop,   16, 16, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;spcprior,     15, 12, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;ageprior,     11,  8, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;portdrop,      6,  6, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;lendrop,       5,  5, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;bagdrop,       4,  4, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;policeerr,     3,  3, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;drpnona664err, 2,  2, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;spcerr,        1,  1, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;agedrp,        0,  0, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_port_status_hl1_unpack(void *buf,</div><div class='add'>+			       struct sja1105_port_status_hl1 *status)</div><div class='add'>+{</div><div class='add'>+	/* Make pointer arithmetic work on 4 bytes */</div><div class='add'>+	u32 *p = buf;</div><div class='add'>+</div><div class='add'>+	sja1105_unpack(p + 0xF, &amp;status-&gt;n_n664err,    31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0xE, &amp;status-&gt;n_vlanerr,    31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0xD, &amp;status-&gt;n_unreleased, 31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0xC, &amp;status-&gt;n_sizeerr,    31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0xB, &amp;status-&gt;n_crcerr,     31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0xA, &amp;status-&gt;n_vlnotfound, 31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x9, &amp;status-&gt;n_ctpolerr,   31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x8, &amp;status-&gt;n_polerr,     31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x7, &amp;status-&gt;n_rxfrmsh,    31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x6, &amp;status-&gt;n_rxfrm,      31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x5, &amp;status-&gt;n_rxbytesh,   31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x4, &amp;status-&gt;n_rxbyte,     31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x3, &amp;status-&gt;n_txfrmsh,    31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x2, &amp;status-&gt;n_txfrm,      31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;n_txbytesh,   31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x0, &amp;status-&gt;n_txbyte,     31,  0, 4);</div><div class='add'>+	status-&gt;n_rxfrm  += status-&gt;n_rxfrmsh  &lt;&lt; 32;</div><div class='add'>+	status-&gt;n_rxbyte += status-&gt;n_rxbytesh &lt;&lt; 32;</div><div class='add'>+	status-&gt;n_txfrm  += status-&gt;n_txfrmsh  &lt;&lt; 32;</div><div class='add'>+	status-&gt;n_txbyte += status-&gt;n_txbytesh &lt;&lt; 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_port_status_hl2_unpack(void *buf,</div><div class='add'>+			       struct sja1105_port_status_hl2 *status)</div><div class='add'>+{</div><div class='add'>+	/* Make pointer arithmetic work on 4 bytes */</div><div class='add'>+	u32 *p = buf;</div><div class='add'>+</div><div class='add'>+	sja1105_unpack(p + 0x3, &amp;status-&gt;n_qfull,        31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x2, &amp;status-&gt;n_part_drop,    31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;n_egr_disabled, 31,  0, 4);</div><div class='add'>+	sja1105_unpack(p + 0x0, &amp;status-&gt;n_not_reach,    31,  0, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_port_status_qlevel_unpack(void *buf,</div><div class='add'>+				      struct sja1105_port_status_hl2 *status)</div><div class='add'>+{</div><div class='add'>+	/* Make pointer arithmetic work on 4 bytes */</div><div class='add'>+	u32 *p = buf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		sja1105_unpack(p + i, &amp;status-&gt;qlevel_hwm[i], 24, 16, 4);</div><div class='add'>+		sja1105_unpack(p + i, &amp;status-&gt;qlevel[i],      8,  0, 4);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_status_get_mac(struct sja1105_private *priv,</div><div class='add'>+				       struct sja1105_port_status_mac *status,</div><div class='add'>+				       int port)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_MAC_AREA] = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* MAC area */</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;mac[port],</div><div class='add'>+					 packed_buf, SJA1105_SIZE_MAC_AREA);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sja1105_port_status_mac_unpack(packed_buf, 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 sja1105_port_status_get_hl1(struct sja1105_private *priv,</div><div class='add'>+				       struct sja1105_port_status_hl1 *status,</div><div class='add'>+				       int port)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_HL1_AREA] = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;mac_hl1[port],</div><div class='add'>+					 packed_buf, SJA1105_SIZE_HL1_AREA);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sja1105_port_status_hl1_unpack(packed_buf, 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 sja1105_port_status_get_hl2(struct sja1105_private *priv,</div><div class='add'>+				       struct sja1105_port_status_hl2 *status,</div><div class='add'>+				       int port)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_QLEVEL_AREA] = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;mac_hl2[port],</div><div class='add'>+					 packed_buf, SJA1105_SIZE_HL2_AREA);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sja1105_port_status_hl2_unpack(packed_buf, status);</div><div class='add'>+</div><div class='add'>+	/* Code below is strictly P/Q/R/S specific. */</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 0;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;qlevel[port],</div><div class='add'>+					 packed_buf, SJA1105_SIZE_QLEVEL_AREA);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sja1105pqrs_port_status_qlevel_unpack(packed_buf, 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 sja1105_port_status_get(struct sja1105_private *priv,</div><div class='add'>+				   struct sja1105_port_status *status,</div><div class='add'>+				   int port)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_port_status_get_mac(priv, &amp;status-&gt;mac, port);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_port_status_get_hl1(priv, &amp;status-&gt;hl1, port);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_port_status_get_hl2(priv, &amp;status-&gt;hl2, port);</div><div class='add'>+	if (rc &lt; 0)</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 char sja1105_port_stats[][ETH_GSTRING_LEN] = {</div><div class='add'>+	/* MAC-Level Diagnostic Counters */</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'>+	/* MAC-Level Diagnostic Flags */</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'>+	/* High-Level Diagnostic Counters */</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'>+	"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'>+};</div><div class='add'>+</div><div class='add'>+static char sja1105pqrs_extra_port_stats[][ETH_GSTRING_LEN] = {</div><div class='add'>+	/* Queue Levels */</div><div class='add'>+	"qlevel_hwm_0",</div><div class='add'>+	"qlevel_hwm_1",</div><div class='add'>+	"qlevel_hwm_2",</div><div class='add'>+	"qlevel_hwm_3",</div><div class='add'>+	"qlevel_hwm_4",</div><div class='add'>+	"qlevel_hwm_5",</div><div class='add'>+	"qlevel_hwm_6",</div><div class='add'>+	"qlevel_hwm_7",</div><div class='add'>+	"qlevel_0",</div><div class='add'>+	"qlevel_1",</div><div class='add'>+	"qlevel_2",</div><div class='add'>+	"qlevel_3",</div><div class='add'>+	"qlevel_4",</div><div class='add'>+	"qlevel_5",</div><div class='add'>+	"qlevel_6",</div><div class='add'>+	"qlevel_7",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void sja1105_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_port_status status;</div><div class='add'>+	int rc, i, k = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;status, 0, sizeof(status));</div><div class='add'>+</div><div class='add'>+	rc = sja1105_port_status_get(priv, &amp;status, port);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to read port %d counters: %d\n",</div><div class='add'>+			port, rc);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	memset(data, 0, ARRAY_SIZE(sja1105_port_stats) * sizeof(u64));</div><div class='add'>+	data[k++] = status.mac.n_runt;</div><div class='add'>+	data[k++] = status.mac.n_soferr;</div><div class='add'>+	data[k++] = status.mac.n_alignerr;</div><div class='add'>+	data[k++] = status.mac.n_miierr;</div><div class='add'>+	data[k++] = status.mac.typeerr;</div><div class='add'>+	data[k++] = status.mac.sizeerr;</div><div class='add'>+	data[k++] = status.mac.tctimeout;</div><div class='add'>+	data[k++] = status.mac.priorerr;</div><div class='add'>+	data[k++] = status.mac.nomaster;</div><div class='add'>+	data[k++] = status.mac.memov;</div><div class='add'>+	data[k++] = status.mac.memerr;</div><div class='add'>+	data[k++] = status.mac.invtyp;</div><div class='add'>+	data[k++] = status.mac.intcyov;</div><div class='add'>+	data[k++] = status.mac.domerr;</div><div class='add'>+	data[k++] = status.mac.pcfbagdrop;</div><div class='add'>+	data[k++] = status.mac.spcprior;</div><div class='add'>+	data[k++] = status.mac.ageprior;</div><div class='add'>+	data[k++] = status.mac.portdrop;</div><div class='add'>+	data[k++] = status.mac.lendrop;</div><div class='add'>+	data[k++] = status.mac.bagdrop;</div><div class='add'>+	data[k++] = status.mac.policeerr;</div><div class='add'>+	data[k++] = status.mac.drpnona664err;</div><div class='add'>+	data[k++] = status.mac.spcerr;</div><div class='add'>+	data[k++] = status.mac.agedrp;</div><div class='add'>+	data[k++] = status.hl1.n_n664err;</div><div class='add'>+	data[k++] = status.hl1.n_vlanerr;</div><div class='add'>+	data[k++] = status.hl1.n_unreleased;</div><div class='add'>+	data[k++] = status.hl1.n_sizeerr;</div><div class='add'>+	data[k++] = status.hl1.n_crcerr;</div><div class='add'>+	data[k++] = status.hl1.n_vlnotfound;</div><div class='add'>+	data[k++] = status.hl1.n_ctpolerr;</div><div class='add'>+	data[k++] = status.hl1.n_polerr;</div><div class='add'>+	data[k++] = status.hl1.n_rxfrm;</div><div class='add'>+	data[k++] = status.hl1.n_rxbyte;</div><div class='add'>+	data[k++] = status.hl1.n_txfrm;</div><div class='add'>+	data[k++] = status.hl1.n_txbyte;</div><div class='add'>+	data[k++] = status.hl2.n_qfull;</div><div class='add'>+	data[k++] = status.hl2.n_part_drop;</div><div class='add'>+	data[k++] = status.hl2.n_egr_disabled;</div><div class='add'>+	data[k++] = status.hl2.n_not_reach;</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'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(data + k, 0, ARRAY_SIZE(sja1105pqrs_extra_port_stats) *</div><div class='add'>+			sizeof(u64));</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		data[k++] = status.hl2.qlevel_hwm[i];</div><div class='add'>+		data[k++] = status.hl2.qlevel[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</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='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u8 *p = data;</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; ARRAY_SIZE(sja1105_port_stats); i++) {</div><div class='add'>+			strlcpy(p, sja1105_port_stats[i], ETH_GSTRING_LEN);</div><div class='add'>+			p += ETH_GSTRING_LEN;</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'>+			return;</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(sja1105pqrs_extra_port_stats); i++) {</div><div class='add'>+			strlcpy(p, sja1105pqrs_extra_port_stats[i],</div><div class='add'>+				ETH_GSTRING_LEN);</div><div class='add'>+			p += ETH_GSTRING_LEN;</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'>+int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	int count = ARRAY_SIZE(sja1105_port_stats);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</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'>+	if (priv-&gt;info-&gt;device_id == SJA1105PR_DEVICE_ID ||</div><div class='add'>+	    priv-&gt;info-&gt;device_id == SJA1105QS_DEVICE_ID)</div><div class='add'>+		count += ARRAY_SIZE(sja1105pqrs_extra_port_stats);</div><div class='add'>+</div><div class='add'>+	return count;</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/>new file mode 100644<br/>index 000000000000..50ff625c85d6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_main.c</a></div><div class='hunk'>@@ -0,0 +1,1675 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2018, Sensor-Technik Wiedemann GmbH</div><div class='add'>+ * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.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/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/phylink.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/of_device.h&gt;</div><div class='add'>+#include &lt;linux/netdev_features.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.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/dsa/8021q.h&gt;</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+static void sja1105_hw_reset(struct gpio_desc *gpio, unsigned int pulse_len,</div><div class='add'>+			     unsigned int startup_delay)</div><div class='add'>+{</div><div class='add'>+	gpiod_set_value_cansleep(gpio, 1);</div><div class='add'>+	/* Wait for minimum reset pulse length */</div><div class='add'>+	msleep(pulse_len);</div><div class='add'>+	gpiod_set_value_cansleep(gpio, 0);</div><div class='add'>+	/* Wait until chip is ready after reset */</div><div class='add'>+	msleep(startup_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_port_allow_traffic(struct sja1105_l2_forwarding_entry *l2_fwd,</div><div class='add'>+			   int from, int to, bool allow)</div><div class='add'>+{</div><div class='add'>+	if (allow) {</div><div class='add'>+		l2_fwd[from].bc_domain  |= BIT(to);</div><div class='add'>+		l2_fwd[from].reach_port |= BIT(to);</div><div class='add'>+		l2_fwd[from].fl_domain  |= BIT(to);</div><div class='add'>+	} else {</div><div class='add'>+		l2_fwd[from].bc_domain  &amp;= ~BIT(to);</div><div class='add'>+		l2_fwd[from].reach_port &amp;= ~BIT(to);</div><div class='add'>+		l2_fwd[from].fl_domain  &amp;= ~BIT(to);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Structure used to temporarily transport device tree</div><div class='add'>+ * settings into sja1105_setup</div><div class='add'>+ */</div><div class='add'>+struct sja1105_dt_port {</div><div class='add'>+	phy_interface_t phy_mode;</div><div class='add'>+	sja1105_mii_role_t role;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sja1105_init_mac_settings(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mac_config_entry default_mac = {</div><div class='add'>+		/* Enable all 8 priority queues on egress.</div><div class='add'>+		 * Every queue i holds top[i] - base[i] frames.</div><div class='add'>+		 * Sum of top[i] - base[i] is 511 (max hardware limit).</div><div class='add'>+		 */</div><div class='add'>+		.top  = {0x3F, 0x7F, 0xBF, 0xFF, 0x13F, 0x17F, 0x1BF, 0x1FF},</div><div class='add'>+		.base = {0x0, 0x40, 0x80, 0xC0, 0x100, 0x140, 0x180, 0x1C0},</div><div class='add'>+		.enabled = {true, true, true, true, true, true, true, true},</div><div class='add'>+		/* Keep standard IFG of 12 bytes on egress. */</div><div class='add'>+		.ifg = 0,</div><div class='add'>+		/* Always put the MAC speed in automatic mode, where it can be</div><div class='add'>+		 * retrieved from the PHY object through phylib and</div><div class='add'>+		 * sja1105_adjust_port_config.</div><div class='add'>+		 */</div><div class='add'>+		.speed = SJA1105_SPEED_AUTO,</div><div class='add'>+		/* No static correction for 1-step 1588 events */</div><div class='add'>+		.tp_delin = 0,</div><div class='add'>+		.tp_delout = 0,</div><div class='add'>+		/* Disable aging for critical TTEthernet traffic */</div><div class='add'>+		.maxage = 0xFF,</div><div class='add'>+		/* Internal VLAN (pvid) to apply to untagged ingress */</div><div class='add'>+		.vlanprio = 0,</div><div class='add'>+		.vlanid = 0,</div><div class='add'>+		.ing_mirr = false,</div><div class='add'>+		.egr_mirr = false,</div><div class='add'>+		/* Don't drop traffic with other EtherType than ETH_P_IP */</div><div class='add'>+		.drpnona664 = false,</div><div class='add'>+		/* Don't drop double-tagged traffic */</div><div class='add'>+		.drpdtag = false,</div><div class='add'>+		/* Don't drop untagged traffic */</div><div class='add'>+		.drpuntag = false,</div><div class='add'>+		/* Don't retag 802.1p (VID 0) traffic with the pvid */</div><div class='add'>+		.retag = false,</div><div class='add'>+		/* Disable learning and I/O on user ports by default -</div><div class='add'>+		 * STP will enable it.</div><div class='add'>+		 */</div><div class='add'>+		.dyn_learn = false,</div><div class='add'>+		.egress = false,</div><div class='add'>+		.ingress = false,</div><div class='add'>+	};</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</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_MAC_CONFIG];</div><div class='add'>+</div><div class='add'>+	/* Discard previous MAC Configuration 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(SJA1105_NUM_PORTS,</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'>+	/* Override table based on phylib DT bindings */</div><div class='add'>+	table-&gt;entry_count = SJA1105_NUM_PORTS;</div><div class='add'>+</div><div class='add'>+	mac = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		mac[i] = default_mac;</div><div class='add'>+		if (i == dsa_upstream_port(priv-&gt;ds, i)) {</div><div class='add'>+			/* STP doesn't get called for CPU port, so we need to</div><div class='add'>+			 * set the I/O parameters statically.</div><div class='add'>+			 */</div><div class='add'>+			mac[i].dyn_learn = true;</div><div class='add'>+			mac[i].ingress = true;</div><div class='add'>+			mac[i].egress = 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_init_mii_settings(struct sja1105_private *priv,</div><div class='add'>+				     struct sja1105_dt_port *ports)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	struct sja1105_xmii_params_entry *mii;</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_XMII_PARAMS];</div><div class='add'>+</div><div class='add'>+	/* Discard previous xMII Mode 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(SJA1105_MAX_XMII_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'>+</div><div class='add'>+	/* Override table based on phylib DT bindings */</div><div class='add'>+	table-&gt;entry_count = SJA1105_MAX_XMII_PARAMS_COUNT;</div><div class='add'>+</div><div class='add'>+	mii = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		switch (ports[i].phy_mode) {</div><div class='add'>+		case PHY_INTERFACE_MODE_MII:</div><div class='add'>+			mii-&gt;xmii_mode[i] = XMII_MODE_MII;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+			mii-&gt;xmii_mode[i] = XMII_MODE_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'>+			mii-&gt;xmii_mode[i] = XMII_MODE_RGMII;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(dev, "Unsupported PHY mode %s!\n",</div><div class='add'>+				phy_modes(ports[i].phy_mode));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mii-&gt;phy_mac[i] = ports[i].role;</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_init_static_fdb(struct sja1105_private *priv)</div><div class='add'>+{</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_LOOKUP];</div><div class='add'>+</div><div class='add'>+	/* We only populate the FDB table through dynamic</div><div class='add'>+	 * L2 Address Lookup entries</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'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	struct sja1105_l2_lookup_params_entry default_l2_lookup_params = {</div><div class='add'>+		/* Learned FDB entries are forgotten after 300 seconds */</div><div class='add'>+		.maxage = SJA1105_AGEING_TIME_MS(300000),</div><div class='add'>+		/* All entries within a FDB bin are available for learning */</div><div class='add'>+		.dyn_tbsz = SJA1105ET_FDB_BIN_SIZE,</div><div class='add'>+		/* 2^8 + 2^5 + 2^3 + 2^2 + 2^1 + 1 in Koopman notation */</div><div class='add'>+		.poly = 0x97,</div><div class='add'>+		/* This selects between Independent VLAN Learning (IVL) and</div><div class='add'>+		 * Shared VLAN Learning (SVL)</div><div class='add'>+		 */</div><div class='add'>+		.shared_learn = false,</div><div class='add'>+		/* Don't discard management traffic based on ENFPORT -</div><div class='add'>+		 * we don't perform SMAC port enforcement anyway, so</div><div class='add'>+		 * what we are setting here doesn't matter.</div><div class='add'>+		 */</div><div class='add'>+		.no_enf_hostprt = false,</div><div class='add'>+		/* Don't learn SMAC for mac_fltres1 and mac_fltres0.</div><div class='add'>+		 * Maybe correlate with no_linklocal_learn from bridge driver?</div><div class='add'>+		 */</div><div class='add'>+		.no_mgmt_learn = true,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP_PARAMS];</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(SJA1105_MAX_L2_LOOKUP_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'>+</div><div class='add'>+	table-&gt;entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT;</div><div class='add'>+</div><div class='add'>+	/* This table only has a single entry */</div><div class='add'>+	((struct sja1105_l2_lookup_params_entry *)table-&gt;entries)[0] =</div><div class='add'>+				default_l2_lookup_params;</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_init_static_vlan(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	struct sja1105_vlan_lookup_entry pvid = {</div><div class='add'>+		.ving_mirr = 0,</div><div class='add'>+		.vegr_mirr = 0,</div><div class='add'>+		.vmemb_port = 0,</div><div class='add'>+		.vlan_bc = 0,</div><div class='add'>+		.tag_port = 0,</div><div class='add'>+		.vlanid = 0,</div><div class='add'>+	};</div><div class='add'>+	int i;</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'>+	/* The static VLAN table will only contain the initial pvid of 0.</div><div class='add'>+	 * All other VLANs are to be configured through dynamic entries,</div><div class='add'>+	 * and kept in the static configuration table as backing memory.</div><div class='add'>+	 * The pvid of 0 is sufficient to pass traffic while the ports are</div><div class='add'>+	 * standalone and when vlan_filtering is disabled. When filtering</div><div class='add'>+	 * gets enabled, the switchdev core sets up the VLAN ID 1 and sets</div><div class='add'>+	 * it as the new pvid. Actually 'pvid 1' still comes up in 'bridge</div><div class='add'>+	 * vlan' even when vlan_filtering is off, but it has no effect.</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(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'>+</div><div class='add'>+	/* VLAN ID 0: all DT-defined ports are members; no restrictions on</div><div class='add'>+	 * forwarding; always transmit priority-tagged frames as untagged.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		pvid.vmemb_port |= BIT(i);</div><div class='add'>+		pvid.vlan_bc |= BIT(i);</div><div class='add'>+		pvid.tag_port &amp;= ~BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	((struct sja1105_vlan_lookup_entry *)table-&gt;entries)[0] = pvid;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_init_l2_forwarding(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_forwarding_entry *l2fwd;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_FORWARDING];</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(SJA1105_MAX_L2_FORWARDING_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 = SJA1105_MAX_L2_FORWARDING_COUNT;</div><div class='add'>+</div><div class='add'>+	l2fwd = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* First 5 entries define the forwarding rules */</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		unsigned int upstream = dsa_upstream_port(priv-&gt;ds, i);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; SJA1105_NUM_TC; j++)</div><div class='add'>+			l2fwd[i].vlan_pmap[j] = j;</div><div class='add'>+</div><div class='add'>+		if (i == upstream)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sja1105_port_allow_traffic(l2fwd, i, upstream, true);</div><div class='add'>+		sja1105_port_allow_traffic(l2fwd, upstream, i, true);</div><div class='add'>+	}</div><div class='add'>+	/* Next 8 entries define VLAN PCP mapping from ingress to egress.</div><div class='add'>+	 * Create a one-to-one mapping.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_TC; i++)</div><div class='add'>+		for (j = 0; j &lt; SJA1105_NUM_PORTS; j++)</div><div class='add'>+			l2fwd[SJA1105_NUM_PORTS + i].vlan_pmap[j] = i;</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_init_l2_forwarding_params(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_forwarding_params_entry default_l2fwd_params = {</div><div class='add'>+		/* Disallow dynamic reconfiguration of vlan_pmap */</div><div class='add'>+		.max_dynp = 0,</div><div class='add'>+		/* Use a single memory partition for all ingress queues */</div><div class='add'>+		.part_spc = { SJA1105_MAX_FRAME_MEMORY, 0, 0, 0, 0, 0, 0, 0 },</div><div class='add'>+	};</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'>+</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(SJA1105_MAX_L2_FORWARDING_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'>+</div><div class='add'>+	table-&gt;entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT;</div><div class='add'>+</div><div class='add'>+	/* This table only has a single entry */</div><div class='add'>+	((struct sja1105_l2_forwarding_params_entry *)table-&gt;entries)[0] =</div><div class='add'>+				default_l2fwd_params;</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_init_general_params(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_general_params_entry default_general_params = {</div><div class='add'>+		/* Disallow dynamic changing of the mirror port */</div><div class='add'>+		.mirr_ptacu = 0,</div><div class='add'>+		.switchid = priv-&gt;ds-&gt;index,</div><div class='add'>+		/* Priority queue for link-local frames trapped to CPU */</div><div class='add'>+		.hostprio = 0,</div><div class='add'>+		.mac_fltres1 = SJA1105_LINKLOCAL_FILTER_A,</div><div class='add'>+		.mac_flt1    = SJA1105_LINKLOCAL_FILTER_A_MASK,</div><div class='add'>+		.incl_srcpt1 = true,</div><div class='add'>+		.send_meta1  = false,</div><div class='add'>+		.mac_fltres0 = SJA1105_LINKLOCAL_FILTER_B,</div><div class='add'>+		.mac_flt0    = SJA1105_LINKLOCAL_FILTER_B_MASK,</div><div class='add'>+		.incl_srcpt0 = true,</div><div class='add'>+		.send_meta0  = false,</div><div class='add'>+		/* The destination for traffic matching mac_fltres1 and</div><div class='add'>+		 * mac_fltres0 on all ports except host_port. Such traffic</div><div class='add'>+		 * receieved on host_port itself would be dropped, except</div><div class='add'>+		 * by installing a temporary 'management route'</div><div class='add'>+		 */</div><div class='add'>+		.host_port = dsa_upstream_port(priv-&gt;ds, 0),</div><div class='add'>+		/* Same as host port */</div><div class='add'>+		.mirr_port = dsa_upstream_port(priv-&gt;ds, 0),</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 (presumably because it</div><div class='add'>+		 * is a cascaded port and a downstream SJA switch already did</div><div class='add'>+		 * that). Default to an invalid port (to disable the feature)</div><div class='add'>+		 * and overwrite this if we find any DSA (cascaded) ports.</div><div class='add'>+		 */</div><div class='add'>+		.casc_port = SJA1105_NUM_PORTS,</div><div class='add'>+		/* No TTEthernet */</div><div class='add'>+		.vllupformat = 0,</div><div class='add'>+		.vlmarker = 0,</div><div class='add'>+		.vlmask = 0,</div><div class='add'>+		/* Only update correctionField for 1-step PTP (L2 transport) */</div><div class='add'>+		.ignore2stf = 0,</div><div class='add'>+		/* Forcefully disable VLAN filtering by telling</div><div class='add'>+		 * the switch that VLAN has a different EtherType.</div><div class='add'>+		 */</div><div class='add'>+		.tpid = ETH_P_SJA1105,</div><div class='add'>+		.tpid2 = ETH_P_SJA1105,</div><div class='add'>+	};</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int i, k = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		if (dsa_is_dsa_port(priv-&gt;ds, i))</div><div class='add'>+			default_general_params.casc_port = i;</div><div class='add'>+		else if (dsa_is_user_port(priv-&gt;ds, i))</div><div class='add'>+			priv-&gt;ports[i].mgmt_slot = k++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_GENERAL_PARAMS];</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(SJA1105_MAX_GENERAL_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'>+</div><div class='add'>+	table-&gt;entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT;</div><div class='add'>+</div><div class='add'>+	/* This table only has a single entry */</div><div class='add'>+	((struct sja1105_general_params_entry *)table-&gt;entries)[0] =</div><div class='add'>+				default_general_params;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SJA1105_RATE_MBPS(speed) (((speed) * 64000) / 1000)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+sja1105_setup_policer(struct sja1105_l2_policing_entry *policing,</div><div class='add'>+		      int index)</div><div class='add'>+{</div><div class='add'>+	policing[index].sharindx = index;</div><div class='add'>+	policing[index].smax = 65535; /* Burst size in bytes */</div><div class='add'>+	policing[index].rate = SJA1105_RATE_MBPS(1000);</div><div class='add'>+	policing[index].maxlen = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;</div><div class='add'>+	policing[index].partition = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_init_l2_policing(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int i, j, k;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_POLICING];</div><div class='add'>+</div><div class='add'>+	/* Discard previous L2 Policing 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(SJA1105_MAX_L2_POLICING_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 = SJA1105_MAX_L2_POLICING_COUNT;</div><div class='add'>+</div><div class='add'>+	policing = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* k sweeps through all unicast policers (0-39).</div><div class='add'>+	 * bcast sweeps through policers 40-44.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, k = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + i;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; SJA1105_NUM_TC; j++, k++)</div><div class='add'>+			sja1105_setup_policer(policing, k);</div><div class='add'>+</div><div class='add'>+		/* Set up this port's policer for broadcast traffic */</div><div class='add'>+		sja1105_setup_policer(policing, bcast);</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_static_config_load(struct sja1105_private *priv,</div><div class='add'>+				      struct sja1105_dt_port *ports)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	sja1105_static_config_free(&amp;priv-&gt;static_config);</div><div class='add'>+	rc = sja1105_static_config_init(&amp;priv-&gt;static_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 rc;</div><div class='add'>+</div><div class='add'>+	/* Build static configuration */</div><div class='add'>+	rc = sja1105_init_mac_settings(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_mii_settings(priv, ports);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_static_fdb(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_static_vlan(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_l2_lookup_params(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_l2_forwarding(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_l2_forwarding_params(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_l2_policing(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1105_init_general_params(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Send initial configuration to hardware via SPI */</div><div class='add'>+	return sja1105_static_config_upload(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_parse_rgmii_delays(struct sja1105_private *priv,</div><div class='add'>+				      const struct sja1105_dt_port *ports)</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_PORTS; i++) {</div><div class='add'>+		if (ports-&gt;role == XMII_MAC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||</div><div class='add'>+		    ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='add'>+			priv-&gt;rgmii_rx_delay[i] = true;</div><div class='add'>+</div><div class='add'>+		if (ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||</div><div class='add'>+		    ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='add'>+			priv-&gt;rgmii_tx_delay[i] = true;</div><div class='add'>+</div><div class='add'>+		if ((priv-&gt;rgmii_rx_delay[i] || priv-&gt;rgmii_tx_delay[i]) &amp;&amp;</div><div class='add'>+		     !priv-&gt;info-&gt;setup_rgmii_delay)</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 sja1105_parse_ports_node(struct sja1105_private *priv,</div><div class='add'>+				    struct sja1105_dt_port *ports,</div><div class='add'>+				    struct device_node *ports_node)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	struct device_node *child;</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(ports_node, child) {</div><div class='add'>+		struct device_node *phy_node;</div><div class='add'>+		int phy_mode;</div><div class='add'>+		u32 index;</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;index) &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'>+		phy_mode = of_get_phy_mode(child);</div><div class='add'>+		if (phy_mode &lt; 0) {</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'>+				index);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		ports[index].phy_mode = phy_mode;</div><div class='add'>+</div><div class='add'>+		phy_node = of_parse_phandle(child, "phy-handle", 0);</div><div class='add'>+		if (!phy_node) {</div><div class='add'>+			if (!of_phy_is_fixed_link(child)) {</div><div class='add'>+				dev_err(dev, "phy-handle or fixed-link "</div><div class='add'>+					"properties missing!\n");</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+			/* phy-handle is missing, but fixed-link isn't.</div><div class='add'>+			 * So it's a fixed link. Default to PHY role.</div><div class='add'>+			 */</div><div class='add'>+			ports[index].role = XMII_PHY;</div><div class='add'>+		} else {</div><div class='add'>+			/* phy-handle present =&gt; put port in MAC role */</div><div class='add'>+			ports[index].role = XMII_MAC;</div><div class='add'>+			of_node_put(phy_node);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The MAC/PHY role can be overridden with explicit bindings */</div><div class='add'>+		if (of_property_read_bool(child, "sja1105,role-mac"))</div><div class='add'>+			ports[index].role = XMII_MAC;</div><div class='add'>+		else if (of_property_read_bool(child, "sja1105,role-phy"))</div><div class='add'>+			ports[index].role = XMII_PHY;</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_parse_dt(struct sja1105_private *priv,</div><div class='add'>+			    struct sja1105_dt_port *ports)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	struct device_node *switch_node = dev-&gt;of_node;</div><div class='add'>+	struct device_node *ports_node;</div><div class='add'>+	int rc;</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'>+		dev_err(dev, "Incorrect bindings: absent \"ports\" node\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_parse_ports_node(priv, ports, ports_node);</div><div class='add'>+	of_node_put(ports_node);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert back and forth MAC speed from Mbps to SJA1105 encoding */</div><div class='add'>+static int sja1105_speed[] = {</div><div class='add'>+	[SJA1105_SPEED_AUTO]     = 0,</div><div class='add'>+	[SJA1105_SPEED_10MBPS]   = 10,</div><div class='add'>+	[SJA1105_SPEED_100MBPS]  = 100,</div><div class='add'>+	[SJA1105_SPEED_1000MBPS] = 1000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static sja1105_speed_t sja1105_get_speed_cfg(unsigned int speed_mbps)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = SJA1105_SPEED_AUTO; i &lt;= SJA1105_SPEED_1000MBPS; i++)</div><div class='add'>+		if (sja1105_speed[i] == speed_mbps)</div><div class='add'>+			return i;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set link speed and enable/disable traffic I/O in the MAC configuration</div><div class='add'>+ * for a specific port.</div><div class='add'>+ *</div><div class='add'>+ * @speed_mbps: If 0, leave the speed unchanged, else adapt MAC to PHY speed.</div><div class='add'>+ * @enabled: Manage Rx and Tx settings for this port. If false, overrides the</div><div class='add'>+ *	     settings from the STP state, but not persistently (does not</div><div class='add'>+ *	     overwrite the static MAC info for this port).</div><div class='add'>+ */</div><div class='add'>+static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,</div><div class='add'>+				      int speed_mbps, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mac_config_entry dyn_mac;</div><div class='add'>+	struct sja1105_xmii_params_entry *mii;</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'>+	sja1105_phy_interface_t phy_mode;</div><div class='add'>+	sja1105_speed_t speed;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mii = priv-&gt;static_config.tables[BLK_IDX_XMII_PARAMS].entries;</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+</div><div class='add'>+	speed = sja1105_get_speed_cfg(speed_mbps);</div><div class='add'>+	if (speed_mbps &amp;&amp; speed &lt; 0) {</div><div class='add'>+		dev_err(dev, "Invalid speed %iMbps\n", speed_mbps);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If requested, overwrite SJA1105_SPEED_AUTO from the static MAC</div><div class='add'>+	 * configuration table, since this will be used for the clocking setup,</div><div class='add'>+	 * and we no longer need to store it in the static config (already told</div><div class='add'>+	 * hardware we want auto during upload phase).</div><div class='add'>+	 */</div><div class='add'>+	if (speed_mbps)</div><div class='add'>+		mac[port].speed = speed;</div><div class='add'>+	else</div><div class='add'>+		mac[port].speed = SJA1105_SPEED_AUTO;</div><div class='add'>+</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='add'>+	dyn_mac = mac[port];</div><div class='add'>+	dyn_mac.ingress = enabled &amp;&amp; mac[port].ingress;</div><div class='add'>+	dyn_mac.egress  = enabled &amp;&amp; mac[port].egress;</div><div class='add'>+</div><div class='add'>+	/* Write to the dynamic reconfiguration tables */</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG,</div><div class='add'>+					  port, &amp;dyn_mac, true);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to write MAC config: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reconfigure the PLLs for the RGMII interfaces (required 125 MHz at</div><div class='add'>+	 * gigabit, 25 MHz at 100 Mbps and 2.5 MHz at 10 Mbps). For MII and</div><div class='add'>+	 * RMII no change of the clock setup is required. Actually, changing</div><div class='add'>+	 * the clock setup does interrupt the clock signal for a certain time</div><div class='add'>+	 * which causes trouble for all PHYs relying on this signal.</div><div class='add'>+	 */</div><div class='add'>+	if (!enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	phy_mode = mii-&gt;xmii_mode[port];</div><div class='add'>+	if (phy_mode != XMII_MODE_RGMII)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return sja1105_clocking_setup_port(priv, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_adjust_link(struct dsa_switch *ds, int port,</div><div class='add'>+				struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;link)</div><div class='add'>+		sja1105_adjust_port_config(priv, port, 0, false);</div><div class='add'>+	else</div><div class='add'>+		sja1105_adjust_port_config(priv, port, phydev-&gt;speed, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_phylink_validate(struct dsa_switch *ds, int port,</div><div class='add'>+				     unsigned long *supported,</div><div class='add'>+				     struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	/* Construct a new mask which exhaustively contains all link features</div><div class='add'>+	 * supported by the MAC, and then apply that (logical AND) to what will</div><div class='add'>+	 * be sent to the PHY for "marketing".</div><div class='add'>+	 */</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_xmii_params_entry *mii;</div><div class='add'>+</div><div class='add'>+	mii = priv-&gt;static_config.tables[BLK_IDX_XMII_PARAMS].entries;</div><div class='add'>+</div><div class='add'>+	/* The MAC does not support pause frames, and also doesn't</div><div class='add'>+	 * support half-duplex traffic modes.</div><div class='add'>+	 */</div><div class='add'>+	phylink_set(mask, Autoneg);</div><div class='add'>+	phylink_set(mask, MII);</div><div class='add'>+	phylink_set(mask, 10baseT_Full);</div><div class='add'>+	phylink_set(mask, 100baseT_Full);</div><div class='add'>+	if (mii-&gt;xmii_mode[port] == XMII_MODE_RGMII)</div><div class='add'>+		phylink_set(mask, 1000baseT_Full);</div><div class='add'>+</div><div class='add'>+	bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	bitmap_and(state-&gt;advertising, state-&gt;advertising, mask,</div><div class='add'>+		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* First-generation switches have a 4-way set associative TCAM that</div><div class='add'>+ * holds the FDB entries. An FDB index spans from 0 to 1023 and is comprised of</div><div class='add'>+ * a "bin" (grouping of 4 entries) and a "way" (an entry within a bin).</div><div class='add'>+ * For the placement of a newly learnt FDB entry, the switch selects the bin</div><div class='add'>+ * based on a hash function, and the way within that bin incrementally.</div><div class='add'>+ */</div><div class='add'>+static inline int sja1105et_fdb_index(int bin, int way)</div><div class='add'>+{</div><div class='add'>+	return bin * SJA1105ET_FDB_BIN_SIZE + way;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_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='add'>+{</div><div class='add'>+	int way;</div><div class='add'>+</div><div class='add'>+	for (way = 0; way &lt; SJA1105ET_FDB_BIN_SIZE; way++) {</div><div class='add'>+		struct sja1105_l2_lookup_entry l2_lookup = {0};</div><div class='add'>+		int index = sja1105et_fdb_index(bin, way);</div><div class='add'>+</div><div class='add'>+		/* Skip unused entries, optionally marking them</div><div class='add'>+		 * into the return value</div><div class='add'>+		 */</div><div class='add'>+		if (sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						index, &amp;l2_lookup)) {</div><div class='add'>+			if (last_unused)</div><div class='add'>+				*last_unused = way;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (l2_lookup.macaddr == ether_addr_to_u64(addr) &amp;&amp;</div><div class='add'>+		    l2_lookup.vlanid == vid) {</div><div class='add'>+			if (match)</div><div class='add'>+				*match = l2_lookup;</div><div class='add'>+			return way;</div><div class='add'>+		}</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_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};</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct device *dev = ds-&gt;dev;</div><div class='add'>+	int last_unused = -1;</div><div class='add'>+	int bin, way;</div><div class='add'>+</div><div class='add'>+	bin = sja1105_fdb_hash(priv, addr, vid);</div><div class='add'>+</div><div class='add'>+	way = sja1105_is_fdb_entry_in_bin(priv, bin, addr, vid,</div><div class='add'>+					  &amp;l2_lookup, &amp;last_unused);</div><div class='add'>+	if (way &gt;= 0) {</div><div class='add'>+		/* We have an FDB entry. Is our port in the destination</div><div class='add'>+		 * mask? If yes, we need to do nothing. If not, we need</div><div class='add'>+		 * to rewrite the entry by adding this port to it.</div><div class='add'>+		 */</div><div class='add'>+		if (l2_lookup.destports &amp; BIT(port))</div><div class='add'>+			return 0;</div><div class='add'>+		l2_lookup.destports |= BIT(port);</div><div class='add'>+	} else {</div><div class='add'>+		int index = sja1105et_fdb_index(bin, way);</div><div class='add'>+</div><div class='add'>+		/* We don't have an FDB entry. We construct a new one and</div><div class='add'>+		 * try to find a place for it within the FDB table.</div><div class='add'>+		 */</div><div class='add'>+		l2_lookup.macaddr = ether_addr_to_u64(addr);</div><div class='add'>+		l2_lookup.destports = BIT(port);</div><div class='add'>+		l2_lookup.vlanid = vid;</div><div class='add'>+</div><div class='add'>+		if (last_unused &gt;= 0) {</div><div class='add'>+			way = last_unused;</div><div class='add'>+		} else {</div><div class='add'>+			/* Bin is full, need to evict somebody.</div><div class='add'>+			 * Choose victim at random. If you get these messages</div><div class='add'>+			 * often, you may need to consider changing the</div><div class='add'>+			 * distribution function:</div><div class='add'>+			 * static_config[BLK_IDX_L2_LOOKUP_PARAMS].entries-&gt;poly</div><div class='add'>+			 */</div><div class='add'>+			get_random_bytes(&amp;way, sizeof(u8));</div><div class='add'>+			way %= SJA1105ET_FDB_BIN_SIZE;</div><div class='add'>+			dev_warn(dev, "Warning, FDB bin %d full while adding entry for %pM. Evicting entry %u.\n",</div><div class='add'>+				 bin, addr, way);</div><div class='add'>+			/* Evict entry */</div><div class='add'>+			sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						     index, NULL, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	l2_lookup.index = sja1105et_fdb_index(bin, way);</div><div class='add'>+</div><div class='add'>+	return 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'>+}</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'>+{</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'>+	int index, bin, way;</div><div class='add'>+	bool keep;</div><div class='add'>+</div><div class='add'>+	bin = sja1105_fdb_hash(priv, addr, vid);</div><div class='add'>+	way = sja1105_is_fdb_entry_in_bin(priv, bin, addr, vid,</div><div class='add'>+					  &amp;l2_lookup, NULL);</div><div class='add'>+	if (way &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	index = sja1105et_fdb_index(bin, way);</div><div class='add'>+</div><div class='add'>+	/* We have an FDB entry. Is our port in the destination mask? If yes,</div><div class='add'>+	 * we need to remove it. If the resulting port mask becomes empty, we</div><div class='add'>+	 * need to completely evict the FDB entry.</div><div class='add'>+	 * Otherwise we just write it back.</div><div class='add'>+	 */</div><div class='add'>+	if (l2_lookup.destports &amp; BIT(port))</div><div class='add'>+		l2_lookup.destports &amp;= ~BIT(port);</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'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					    index, &amp;l2_lookup, keep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_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 sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct device *dev = ds-&gt;dev;</div><div class='add'>+	int i;</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 == -EINVAL)</div><div class='add'>+			continue;</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(dev, "Failed to dump FDB: %d\n", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* FDB dump callback is per port. This means we have to</div><div class='add'>+		 * disregard a valid entry if it's not for this port, even if</div><div class='add'>+		 * only to revisit it later. This is inefficient because the</div><div class='add'>+		 * 1024-sized FDB table needs to be traversed 4 times through</div><div class='add'>+		 * SPI during a 'bridge fdb show' command.</div><div class='add'>+		 */</div><div class='add'>+		if (!(l2_lookup.destports &amp; BIT(port)))</div><div class='add'>+			continue;</div><div class='add'>+		u64_to_ether_addr(l2_lookup.macaddr, macaddr);</div><div class='add'>+		cb(macaddr, l2_lookup.vlanid, false, data);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This callback needs to be present */</div><div class='add'>+static int sja1105_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='add'>+			       const struct switchdev_obj_port_mdb *mdb)</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_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			    const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	sja1105_fdb_add(ds, port, mdb-&gt;addr, mdb-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	return sja1105_fdb_del(ds, port, mdb-&gt;addr, mdb-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_bridge_member(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct net_device *br, bool member)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_forwarding_entry *l2_fwd;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int i, 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 (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		/* Add this port to the forwarding matrix of the</div><div class='add'>+		 * other ports in the same bridge, and viceversa.</div><div class='add'>+		 */</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+		/* For the ports already under the bridge, only one thing needs</div><div class='add'>+		 * to be done, and that is to add this port to their</div><div class='add'>+		 * reachability domain. So we can perform the SPI write for</div><div class='add'>+		 * them immediately. However, for this port itself (the one</div><div class='add'>+		 * that is new to the bridge), we need to add all other ports</div><div class='add'>+		 * to its reachability domain. So we do that incrementally in</div><div class='add'>+		 * this loop, and perform the SPI write only at the end, once</div><div class='add'>+		 * the domain contains all other bridge ports.</div><div class='add'>+		 */</div><div class='add'>+		if (i == port)</div><div class='add'>+			continue;</div><div class='add'>+		if (dsa_to_port(ds, i)-&gt;bridge_dev != br)</div><div class='add'>+			continue;</div><div class='add'>+		sja1105_port_allow_traffic(l2_fwd, i, port, member);</div><div class='add'>+		sja1105_port_allow_traffic(l2_fwd, port, i, member);</div><div class='add'>+</div><div class='add'>+		rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_FORWARDING,</div><div class='add'>+						  i, &amp;l2_fwd[i], 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 sja1105_dynamic_config_write(priv, BLK_IDX_L2_FORWARDING,</div><div class='add'>+					    port, &amp;l2_fwd[port], true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_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 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'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		/* From UM10944 description of DRPDTAG (why put this there?):</div><div class='add'>+		 * "Management traffic flows to the port regardless of the state</div><div class='add'>+		 * of the INGRESS flag". So BPDUs are still be allowed to pass.</div><div class='add'>+		 * At the moment no difference between DISABLED and BLOCKING.</div><div class='add'>+		 */</div><div class='add'>+		mac[port].ingress   = false;</div><div class='add'>+		mac[port].egress    = false;</div><div class='add'>+		mac[port].dyn_learn = false;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		mac[port].ingress   = true;</div><div class='add'>+		mac[port].egress    = false;</div><div class='add'>+		mac[port].dyn_learn = false;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		mac[port].ingress   = true;</div><div class='add'>+		mac[port].egress    = false;</div><div class='add'>+		mac[port].dyn_learn = true;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		mac[port].ingress   = true;</div><div class='add'>+		mac[port].egress    = true;</div><div class='add'>+		mac[port].dyn_learn = true;</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'>+	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_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct net_device *br)</div><div class='add'>+{</div><div class='add'>+	return sja1105_bridge_member(ds, port, br, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct net_device *br)</div><div class='add'>+{</div><div class='add'>+	sja1105_bridge_member(ds, port, br, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 sja1105_stp_state_get(struct sja1105_private *priv, int port)</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].ingress &amp;&amp; !mac[port].egress &amp;&amp; !mac[port].dyn_learn)</div><div class='add'>+		return BR_STATE_BLOCKING;</div><div class='add'>+	if (mac[port].ingress &amp;&amp; !mac[port].egress &amp;&amp; !mac[port].dyn_learn)</div><div class='add'>+		return BR_STATE_LISTENING;</div><div class='add'>+	if (mac[port].ingress &amp;&amp; !mac[port].egress &amp;&amp; mac[port].dyn_learn)</div><div class='add'>+		return BR_STATE_LEARNING;</div><div class='add'>+	if (mac[port].ingress &amp;&amp; mac[port].egress &amp;&amp; mac[port].dyn_learn)</div><div class='add'>+		return BR_STATE_FORWARDING;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For situations where we need to change a setting at runtime that is only</div><div class='add'>+ * available through the static configuration, resetting the switch in order</div><div class='add'>+ * to upload the new static config is unavoidable. Back up the settings we</div><div class='add'>+ * modify at runtime (currently only MAC) and restore them after uploading,</div><div class='add'>+ * such that this operation is relatively seamless.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_static_config_reload(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+	int speed_mbps[SJA1105_NUM_PORTS];</div><div class='add'>+	u8 stp_state[SJA1105_NUM_PORTS];</div><div class='add'>+	int rc, i;</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'>+	/* Back up settings changed by sja1105_adjust_port_config and</div><div class='add'>+	 * sja1105_bridge_stp_state_set and restore their defaults.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		speed_mbps[i] = sja1105_speed[mac[i].speed];</div><div class='add'>+		mac[i].speed = SJA1105_SPEED_AUTO;</div><div class='add'>+		if (i == dsa_upstream_port(priv-&gt;ds, i)) {</div><div class='add'>+			mac[i].ingress = true;</div><div class='add'>+			mac[i].egress = true;</div><div class='add'>+			mac[i].dyn_learn = true;</div><div class='add'>+		} else {</div><div class='add'>+			stp_state[i] = sja1105_stp_state_get(priv, i);</div><div class='add'>+			mac[i].ingress = false;</div><div class='add'>+			mac[i].egress = false;</div><div class='add'>+			mac[i].dyn_learn = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset switch and send updated static configuration */</div><div class='add'>+	rc = sja1105_static_config_upload(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Configure the CGU (PLLs) for MII and RMII PHYs.</div><div class='add'>+	 * For these interfaces there is no dynamic configuration</div><div class='add'>+	 * needed, since PLLs have same settings at all speeds.</div><div class='add'>+	 */</div><div class='add'>+	rc = sja1105_clocking_setup(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		bool enabled = (speed_mbps[i] != 0);</div><div class='add'>+</div><div class='add'>+		if (i != dsa_upstream_port(priv-&gt;ds, i))</div><div class='add'>+			sja1105_bridge_stp_state_set(priv-&gt;ds, i, stp_state[i]);</div><div class='add'>+</div><div class='add'>+		rc = sja1105_adjust_port_config(priv, i, speed_mbps[i],</div><div class='add'>+						enabled);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</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'>+/* The TPID setting belongs to the General Parameters table,</div><div class='add'>+ * which can only be partially reconfigured at runtime (and not the TPID).</div><div class='add'>+ * So a switch reset is required.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_change_tpid(struct sja1105_private *priv,</div><div class='add'>+			       u16 tpid, u16 tpid2)</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'>+</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'>+	general_params-&gt;tpid = tpid;</div><div class='add'>+	general_params-&gt;tpid2 = tpid2;</div><div class='add'>+	return sja1105_static_config_reload(priv);</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'>+	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_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_vlan_apply(struct sja1105_private *priv, int port, u16 vid,</div><div class='add'>+			      bool enabled, bool untagged)</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'>+	if (match &lt; 0) {</div><div class='add'>+		/* Can't delete a missing entry. */</div><div class='add'>+		if (!enabled)</div><div class='add'>+			return 0;</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'>+		match = table-&gt;entry_count - 1;</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'>+	vlan[match].vlanid = vid;</div><div class='add'>+	if (enabled) {</div><div class='add'>+		vlan[match].vlan_bc |= BIT(port);</div><div class='add'>+		vlan[match].vmemb_port |= BIT(port);</div><div class='add'>+	} else {</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'>+	}</div><div class='add'>+	/* Also unset tag_port if removing this VLAN was requested,</div><div class='add'>+	 * just so we don't have a confusing bitmap (no practical purpose).</div><div class='add'>+	 */</div><div class='add'>+	if (untagged || !enabled)</div><div class='add'>+		vlan[match].tag_port &amp;= ~BIT(port);</div><div class='add'>+	else</div><div class='add'>+		vlan[match].tag_port |= BIT(port);</div><div class='add'>+	/* If there's no port left as member of this VLAN,</div><div class='add'>+	 * it's time for it to go.</div><div class='add'>+	 */</div><div class='add'>+	if (!vlan[match].vmemb_port)</div><div class='add'>+		keep = false;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;ds-&gt;dev,</div><div class='add'>+		"%s: port %d, vid %llu, broadcast domain 0x%llx, "</div><div class='add'>+		"port members 0x%llx, tagged ports 0x%llx, keep %d\n",</div><div class='add'>+		__func__, port, vlan[match].vlanid, vlan[match].vlan_bc,</div><div class='add'>+		vlan[match].vmemb_port, vlan[match].tag_port, keep);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_VLAN_LOOKUP, vid,</div><div class='add'>+					  &amp;vlan[match], keep);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (!keep)</div><div class='add'>+		return sja1105_table_delete_entry(table, match);</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_8021q_tagging(struct dsa_switch *ds, bool enabled)</div><div class='add'>+{</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		rc = dsa_port_setup_8021q_tagging(ds, i, enabled);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Failed to setup VLAN tagging for port %d: %d\n",</div><div class='add'>+				i, rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	dev_info(ds-&gt;dev, "%s switch tagging\n",</div><div class='add'>+		 enabled ? "Enabled" : "Disabled");</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'>+sja1105_get_tag_protocol(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_SJA1105;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This callback needs to be present */</div><div class='add'>+static int sja1105_vlan_prepare(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'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)</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 (enabled)</div><div class='add'>+		/* Enable VLAN filtering. */</div><div class='add'>+		rc = sja1105_change_tpid(priv, ETH_P_8021Q, ETH_P_8021AD);</div><div class='add'>+	else</div><div class='add'>+		/* Disable VLAN filtering. */</div><div class='add'>+		rc = sja1105_change_tpid(priv, ETH_P_SJA1105, ETH_P_SJA1105);</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to change VLAN Ethertype\n");</div><div class='add'>+</div><div class='add'>+	/* Switch port identification based on 802.1Q is only passable</div><div class='add'>+	 * if we are not under a vlan_filtering bridge. So make sure</div><div class='add'>+	 * the two configurations are mutually exclusive.</div><div class='add'>+	 */</div><div class='add'>+	return sja1105_setup_8021q_tagging(ds, !enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_vlan_add(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 sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; vid++) {</div><div class='add'>+		rc = sja1105_vlan_apply(priv, port, vid, true, vlan-&gt;flags &amp;</div><div class='add'>+					BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Failed to add VLAN %d to port %d: %d\n",</div><div class='add'>+				vid, port, rc);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID) {</div><div class='add'>+			rc = sja1105_pvid_apply(ds-&gt;priv, port, vid);</div><div class='add'>+			if (rc &lt; 0) {</div><div class='add'>+				dev_err(ds-&gt;dev, "Failed to set pvid %d on port %d: %d\n",</div><div class='add'>+					vid, port, rc);</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'>+</div><div class='add'>+static int sja1105_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 sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; vid++) {</div><div class='add'>+		rc = sja1105_vlan_apply(priv, port, vid, false, vlan-&gt;flags &amp;</div><div class='add'>+					BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Failed to remove VLAN %d from port %d: %d\n",</div><div class='add'>+				vid, port, 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_slave_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_dt_port ports[SJA1105_NUM_PORTS];</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'>+	rc = sja1105_parse_dt(priv, ports);</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'>+	/* Error out early if internal delays are required through DT</div><div class='add'>+	 * and we can't apply them.</div><div class='add'>+	 */</div><div class='add'>+	rc = sja1105_parse_rgmii_delays(priv, ports);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "RGMII delay not supported\n");</div><div class='add'>+		return rc;</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, ports);</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'>+	/* Configure the CGU (PHY link modes and speeds) */</div><div class='add'>+	rc = sja1105_clocking_setup(priv);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to configure MII clocking: %d\n", rc);</div><div class='add'>+		return rc;</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'>+</div><div class='add'>+	/* The DSA/switchdev model brings up switch ports in standalone mode by</div><div class='add'>+	 * default, and that means vlan_filtering is 0 since they're not under</div><div class='add'>+	 * a bridge, so it's safe to set up switch tagging at this time.</div><div class='add'>+	 */</div><div class='add'>+	return sja1105_setup_8021q_tagging(ds, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mgmt_entry mgmt_route = {0};</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct ethhdr *hdr;</div><div class='add'>+	int timeout = 10;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hdr = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	mgmt_route.macaddr = ether_addr_to_u64(hdr-&gt;h_dest);</div><div class='add'>+	mgmt_route.destports = BIT(port);</div><div class='add'>+	mgmt_route.enfport = 1;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_MGMT_ROUTE,</div><div class='add'>+					  slot, &amp;mgmt_route, true);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Transfer skb to the host port. */</div><div class='add'>+	dsa_enqueue_skb(skb, ds-&gt;ports[port].slave);</div><div class='add'>+</div><div class='add'>+	/* Wait until the switch has processed the frame */</div><div class='add'>+	do {</div><div class='add'>+		rc = sja1105_dynamic_config_read(priv, BLK_IDX_MGMT_ROUTE,</div><div class='add'>+						 slot, &amp;mgmt_route);</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 poll for mgmt route\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* UM10944: The ENFPORT flag of the respective entry is</div><div class='add'>+		 * cleared when a match is found. The host can use this</div><div class='add'>+		 * flag as an acknowledgment.</div><div class='add'>+		 */</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (mgmt_route.enfport &amp;&amp; --timeout);</div><div class='add'>+</div><div class='add'>+	if (!timeout) {</div><div class='add'>+		/* Clean up the management route so that a follow-up</div><div class='add'>+		 * frame may not match on it by mistake.</div><div class='add'>+		 */</div><div class='add'>+		sja1105_dynamic_config_write(priv, BLK_IDX_MGMT_ROUTE,</div><div class='add'>+					     slot, &amp;mgmt_route, false);</div><div class='add'>+		dev_err_ratelimited(priv-&gt;ds-&gt;dev, "xmit timed out\n");</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'>+/* Deferred work is unfortunately necessary because setting up the management</div><div class='add'>+ * route cannot be done from atomit context (SPI transfer takes a sleepable</div><div class='add'>+ * lock on the bus)</div><div class='add'>+ */</div><div class='add'>+static netdev_tx_t sja1105_port_deferred_xmit(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_port *sp = &amp;priv-&gt;ports[port];</div><div class='add'>+	int slot = sp-&gt;mgmt_slot;</div><div class='add'>+</div><div class='add'>+	/* The tragic fact about the switch having 4x2 slots for installing</div><div class='add'>+	 * management routes is that all of them except one are actually</div><div class='add'>+	 * useless.</div><div class='add'>+	 * If 2 slots are simultaneously configured for two BPDUs sent to the</div><div class='add'>+	 * same (multicast) DMAC but on different egress ports, the switch</div><div class='add'>+	 * would confuse them and redirect first frame it receives on the CPU</div><div class='add'>+	 * port towards the port configured on the numerically first slot</div><div class='add'>+	 * (therefore wrong port), then second received frame on second slot</div><div class='add'>+	 * (also wrong port).</div><div class='add'>+	 * So for all practical purposes, there needs to be a lock that</div><div class='add'>+	 * prevents that from happening. The slot used here is utterly useless</div><div class='add'>+	 * (could have simply been 0 just as fine), but we are doing it</div><div class='add'>+	 * nonetheless, in case a smarter idea ever comes up in the future.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mgmt_lock);</div><div class='add'>+</div><div class='add'>+	sja1105_mgmt_xmit(ds, port, slot, skb);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mgmt_lock);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The MAXAGE setting belongs to the L2 Forwarding Parameters table,</div><div class='add'>+ * which cannot be reconfigured at runtime. So a switch reset is required.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_set_ageing_time(struct dsa_switch *ds,</div><div class='add'>+				   unsigned int ageing_time)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_params_entry *l2_lookup_params;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	unsigned int maxage;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP_PARAMS];</div><div class='add'>+	l2_lookup_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	maxage = SJA1105_AGEING_TIME_MS(ageing_time);</div><div class='add'>+</div><div class='add'>+	if (l2_lookup_params-&gt;maxage == maxage)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	l2_lookup_params-&gt;maxage = maxage;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_reload(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops sja1105_switch_ops = {</div><div class='add'>+	.get_tag_protocol	= sja1105_get_tag_protocol,</div><div class='add'>+	.setup			= sja1105_setup,</div><div class='add'>+	.adjust_link		= sja1105_adjust_link,</div><div class='add'>+	.set_ageing_time	= sja1105_set_ageing_time,</div><div class='add'>+	.phylink_validate	= sja1105_phylink_validate,</div><div class='add'>+	.get_strings		= sja1105_get_strings,</div><div class='add'>+	.get_ethtool_stats	= sja1105_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= sja1105_get_sset_count,</div><div class='add'>+	.port_fdb_dump		= sja1105_fdb_dump,</div><div class='add'>+	.port_fdb_add		= sja1105_fdb_add,</div><div class='add'>+	.port_fdb_del		= sja1105_fdb_del,</div><div class='add'>+	.port_bridge_join	= sja1105_bridge_join,</div><div class='add'>+	.port_bridge_leave	= sja1105_bridge_leave,</div><div class='add'>+	.port_stp_state_set	= sja1105_bridge_stp_state_set,</div><div class='add'>+	.port_vlan_prepare	= sja1105_vlan_prepare,</div><div class='add'>+	.port_vlan_filtering	= sja1105_vlan_filtering,</div><div class='add'>+	.port_vlan_add		= sja1105_vlan_add,</div><div class='add'>+	.port_vlan_del		= sja1105_vlan_del,</div><div class='add'>+	.port_mdb_prepare	= sja1105_mdb_prepare,</div><div class='add'>+	.port_mdb_add		= sja1105_mdb_add,</div><div class='add'>+	.port_mdb_del		= sja1105_mdb_del,</div><div class='add'>+	.port_deferred_xmit	= sja1105_port_deferred_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sja1105_check_device_id(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 prod_id[SJA1105_SIZE_DEVICE_ID] = {0};</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	u64 device_id;</div><div class='add'>+	u64 part_no;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_int(priv, SPI_READ, regs-&gt;device_id,</div><div class='add'>+				  &amp;device_id, SJA1105_SIZE_DEVICE_ID);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (device_id != priv-&gt;info-&gt;device_id) {</div><div class='add'>+		dev_err(dev, "Expected device ID 0x%llx but read 0x%llx\n",</div><div class='add'>+			priv-&gt;info-&gt;device_id, device_id);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;prod_id,</div><div class='add'>+					 prod_id, SJA1105_SIZE_DEVICE_ID);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sja1105_unpack(prod_id, &amp;part_no, 19, 4, SJA1105_SIZE_DEVICE_ID);</div><div class='add'>+</div><div class='add'>+	if (part_no != priv-&gt;info-&gt;part_no) {</div><div class='add'>+		dev_err(dev, "Expected part number 0x%llx but read 0x%llx\n",</div><div class='add'>+			priv-&gt;info-&gt;part_no, part_no);</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 int sja1105_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 sja1105_private *priv;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;of_node) {</div><div class='add'>+		dev_err(dev, "No DTS bindings for SJA1105 driver\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(struct sja1105_private), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Configure the optional reset pin and bring up switch */</div><div class='add'>+	priv-&gt;reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset_gpio))</div><div class='add'>+		dev_dbg(dev, "reset-gpios not defined, ignoring\n");</div><div class='add'>+	else</div><div class='add'>+		sja1105_hw_reset(priv-&gt;reset_gpio, 1, 1);</div><div class='add'>+</div><div class='add'>+	/* Populate our driver private structure (priv) based on</div><div class='add'>+	 * the device tree node that was probed (spi)</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;spidev = spi;</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'>+	rc = spi_setup(spi);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Could not init SPI\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;info = of_device_get_match_data(dev);</div><div class='add'>+</div><div class='add'>+	/* Detect hardware device */</div><div class='add'>+	rc = sja1105_check_device_id(priv);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Device ID check failed: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Probed switch chip: %s\n", priv-&gt;info-&gt;name);</div><div class='add'>+</div><div class='add'>+	ds = dsa_switch_alloc(dev, SJA1105_NUM_PORTS);</div><div class='add'>+	if (!ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ds-&gt;ops = &amp;sja1105_switch_ops;</div><div class='add'>+	ds-&gt;priv = priv;</div><div class='add'>+	priv-&gt;ds = ds;</div><div class='add'>+</div><div class='add'>+	/* Connections between dsa_port and sja1105_port */</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+		struct sja1105_port *sp = &amp;priv-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		ds-&gt;ports[i].priv = sp;</div><div class='add'>+		sp-&gt;dp = &amp;ds-&gt;ports[i];</div><div class='add'>+	}</div><div class='add'>+	mutex_init(&amp;priv-&gt;mgmt_lock);</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 int sja1105_remove(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'>+	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+	sja1105_static_config_free(&amp;priv-&gt;static_config);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id sja1105_dt_ids[] = {</div><div class='add'>+	{ .compatible = "nxp,sja1105e", .data = &amp;sja1105e_info },</div><div class='add'>+	{ .compatible = "nxp,sja1105t", .data = &amp;sja1105t_info },</div><div class='add'>+	{ .compatible = "nxp,sja1105p", .data = &amp;sja1105p_info },</div><div class='add'>+	{ .compatible = "nxp,sja1105q", .data = &amp;sja1105q_info },</div><div class='add'>+	{ .compatible = "nxp,sja1105r", .data = &amp;sja1105r_info },</div><div class='add'>+	{ .compatible = "nxp,sja1105s", .data = &amp;sja1105s_info },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, sja1105_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct spi_driver sja1105_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name  = "sja1105",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.of_match_table = of_match_ptr(sja1105_dt_ids),</div><div class='add'>+	},</div><div class='add'>+	.probe  = sja1105_probe,</div><div class='add'>+	.remove = sja1105_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_spi_driver(sja1105_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Vladimir Oltean &lt;olteanv@gmail.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Georg Waibel &lt;georg.waibel@sensor-technik.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SJA1105 Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c<br/>new file mode 100644<br/>index 000000000000..244a94ccfc18<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_spi.c</a></div><div class='hunk'>@@ -0,0 +1,590 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause</div><div class='add'>+/* Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+ * Copyright (c) 2018, Sensor-Technik Wiedemann GmbH</div><div class='add'>+ * Copyright (c) 2018-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 &lt;linux/packing.h&gt;</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_PORT_CTRL		4</div><div class='add'>+#define SJA1105_SIZE_RESET_CMD		4</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='add'>+#define SJA1105_SIZE_SPI_TRANSFER_MAX	\</div><div class='add'>+	(SJA1105_SIZE_SPI_MSG_HEADER + SJA1105_SIZE_SPI_MSG_MAXLEN)</div><div class='add'>+</div><div class='add'>+static int sja1105_spi_transfer(const struct sja1105_private *priv,</div><div class='add'>+				const void *tx, void *rx, int size)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = priv-&gt;spidev;</div><div class='add'>+	struct spi_transfer transfer = {</div><div class='add'>+		.tx_buf = tx,</div><div class='add'>+		.rx_buf = rx,</div><div class='add'>+		.len = size,</div><div class='add'>+	};</div><div class='add'>+	struct spi_message msg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (size &gt; SJA1105_SIZE_SPI_TRANSFER_MAX) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "SPI message (%d) longer than max of %d\n",</div><div class='add'>+			size, SJA1105_SIZE_SPI_TRANSFER_MAX);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;msg);</div><div class='add'>+	spi_message_add_tail(&amp;transfer, &amp;msg);</div><div class='add'>+</div><div class='add'>+	rc = spi_sync(spi, &amp;msg);</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='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_spi_message_pack(void *buf, const struct sja1105_spi_message *msg)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_SPI_MSG_HEADER;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, size);</div><div class='add'>+</div><div class='add'>+	sja1105_pack(buf, &amp;msg-&gt;access,     31, 31, size);</div><div class='add'>+	sja1105_pack(buf, &amp;msg-&gt;read_count, 30, 25, size);</div><div class='add'>+	sja1105_pack(buf, &amp;msg-&gt;address,    24,  4, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If @rw is:</div><div class='add'>+ * - SPI_WRITE: creates and sends an SPI write message at absolute</div><div class='add'>+ *		address reg_addr, taking size_bytes from *packed_buf</div><div class='add'>+ * - SPI_READ:  creates and sends an SPI read message from absolute</div><div class='add'>+ *		address reg_addr, writing size_bytes into *packed_buf</div><div class='add'>+ *</div><div class='add'>+ * This function should only be called if it is priorly known that</div><div class='add'>+ * @size_bytes is smaller than SIZE_SPI_MSG_MAXLEN. Larger packed buffers</div><div class='add'>+ * are chunked in smaller pieces by sja1105_spi_send_long_packed_buf below.</div><div class='add'>+ */</div><div class='add'>+int sja1105_spi_send_packed_buf(const struct sja1105_private *priv,</div><div class='add'>+				sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='add'>+				void *packed_buf, size_t size_bytes)</div><div class='add'>+{</div><div class='add'>+	u8 tx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};</div><div class='add'>+	u8 rx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};</div><div class='add'>+	const int msg_len = size_bytes + SJA1105_SIZE_SPI_MSG_HEADER;</div><div class='add'>+	struct sja1105_spi_message msg = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (msg_len &gt; SJA1105_SIZE_SPI_TRANSFER_MAX)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	msg.access = rw;</div><div class='add'>+	msg.address = reg_addr;</div><div class='add'>+	if (rw == SPI_READ)</div><div class='add'>+		msg.read_count = size_bytes / 4;</div><div class='add'>+</div><div class='add'>+	sja1105_spi_message_pack(tx_buf, &amp;msg);</div><div class='add'>+</div><div class='add'>+	if (rw == SPI_WRITE)</div><div class='add'>+		memcpy(tx_buf + SJA1105_SIZE_SPI_MSG_HEADER,</div><div class='add'>+		       packed_buf, size_bytes);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_transfer(priv, tx_buf, rx_buf, msg_len);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (rw == SPI_READ)</div><div class='add'>+		memcpy(packed_buf, rx_buf + SJA1105_SIZE_SPI_MSG_HEADER,</div><div class='add'>+		       size_bytes);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If @rw is:</div><div class='add'>+ * - SPI_WRITE: creates and sends an SPI write message at absolute</div><div class='add'>+ *		address reg_addr, taking size_bytes from *packed_buf</div><div class='add'>+ * - SPI_READ:  creates and sends an SPI read message from absolute</div><div class='add'>+ *		address reg_addr, writing size_bytes into *packed_buf</div><div class='add'>+ *</div><div class='add'>+ * The u64 *value is unpacked, meaning that it's stored in the native</div><div class='add'>+ * CPU endianness and directly usable by software running on the core.</div><div class='add'>+ *</div><div class='add'>+ * This is a wrapper around sja1105_spi_send_packed_buf().</div><div class='add'>+ */</div><div class='add'>+int sja1105_spi_send_int(const struct sja1105_private *priv,</div><div class='add'>+			 sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='add'>+			 u64 *value, u64 size_bytes)</div><div class='add'>+{</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_SPI_MSG_MAXLEN];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (size_bytes &gt; SJA1105_SIZE_SPI_MSG_MAXLEN)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (rw == SPI_WRITE)</div><div class='add'>+		sja1105_pack(packed_buf, value, 8 * size_bytes - 1, 0,</div><div class='add'>+			     size_bytes);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, rw, reg_addr, packed_buf,</div><div class='add'>+					 size_bytes);</div><div class='add'>+</div><div class='add'>+	if (rw == SPI_READ)</div><div class='add'>+		sja1105_unpack(packed_buf, value, 8 * size_bytes - 1, 0,</div><div class='add'>+			       size_bytes);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Should be used if a @packed_buf larger than SJA1105_SIZE_SPI_MSG_MAXLEN</div><div class='add'>+ * must be sent/received. Splitting the buffer into chunks and assembling</div><div class='add'>+ * those into SPI messages is done automatically by this function.</div><div class='add'>+ */</div><div class='add'>+int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,</div><div class='add'>+				     sja1105_spi_rw_mode_t rw, u64 base_addr,</div><div class='add'>+				     void *packed_buf, u64 buf_len)</div><div class='add'>+{</div><div class='add'>+	struct chunk {</div><div class='add'>+		void *buf_ptr;</div><div class='add'>+		int len;</div><div class='add'>+		u64 spi_address;</div><div class='add'>+	} chunk;</div><div class='add'>+	int distance_to_end;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Initialize chunk */</div><div class='add'>+	chunk.buf_ptr = packed_buf;</div><div class='add'>+	chunk.spi_address = base_addr;</div><div class='add'>+	chunk.len = min_t(int, buf_len, SJA1105_SIZE_SPI_MSG_MAXLEN);</div><div class='add'>+</div><div class='add'>+	while (chunk.len) {</div><div class='add'>+		rc = sja1105_spi_send_packed_buf(priv, rw, chunk.spi_address,</div><div class='add'>+						 chunk.buf_ptr, chunk.len);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		chunk.buf_ptr += chunk.len;</div><div class='add'>+		chunk.spi_address += chunk.len / 4;</div><div class='add'>+		distance_to_end = (uintptr_t)(packed_buf + buf_len -</div><div class='add'>+					      chunk.buf_ptr);</div><div class='add'>+		chunk.len = min(distance_to_end, SJA1105_SIZE_SPI_MSG_MAXLEN);</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'>+/* Back-ported structure from UM11040 Table 112.</div><div class='add'>+ * Reset control register (addr. 100440h)</div><div class='add'>+ * In the SJA1105 E/T, only warm_rst and cold_rst are</div><div class='add'>+ * supported (exposed in UM10944 as rst_ctrl), but the bit</div><div class='add'>+ * offsets of warm_rst and cold_rst are actually reversed.</div><div class='add'>+ */</div><div class='add'>+struct sja1105_reset_cmd {</div><div class='add'>+	u64 switch_rst;</div><div class='add'>+	u64 cfg_rst;</div><div class='add'>+	u64 car_rst;</div><div class='add'>+	u64 otp_rst;</div><div class='add'>+	u64 warm_rst;</div><div class='add'>+	u64 cold_rst;</div><div class='add'>+	u64 por_rst;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105et_reset_cmd_pack(void *buf, const struct sja1105_reset_cmd *reset)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_RESET_CMD;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, size);</div><div class='add'>+</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;cold_rst, 3, 3, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;warm_rst, 2, 2, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_reset_cmd_pack(void *buf, const struct sja1105_reset_cmd *reset)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_RESET_CMD;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, size);</div><div class='add'>+</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;switch_rst, 8, 8, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;cfg_rst,    7, 7, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;car_rst,    5, 5, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;otp_rst,    4, 4, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;warm_rst,   3, 3, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;cold_rst,   2, 2, size);</div><div class='add'>+	sja1105_pack(buf, &amp;reset-&gt;por_rst,    1, 1, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105et_reset_cmd(const void *ctx, const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_private *priv = ctx;</div><div class='add'>+	const struct sja1105_reset_cmd *reset = data;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_RESET_CMD];</div><div class='add'>+</div><div class='add'>+	if (reset-&gt;switch_rst ||</div><div class='add'>+	    reset-&gt;cfg_rst ||</div><div class='add'>+	    reset-&gt;car_rst ||</div><div class='add'>+	    reset-&gt;otp_rst ||</div><div class='add'>+	    reset-&gt;por_rst) {</div><div class='add'>+		dev_err(dev, "Only warm and cold reset is supported "</div><div class='add'>+			"for SJA1105 E/T!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reset-&gt;warm_rst)</div><div class='add'>+		dev_dbg(dev, "Warm reset requested\n");</div><div class='add'>+	if (reset-&gt;cold_rst)</div><div class='add'>+		dev_dbg(dev, "Cold reset requested\n");</div><div class='add'>+</div><div class='add'>+	sja1105et_reset_cmd_pack(packed_buf, reset);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rgu,</div><div class='add'>+					   packed_buf, SJA1105_SIZE_RESET_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105pqrs_reset_cmd(const void *ctx, const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_private *priv = ctx;</div><div class='add'>+	const struct sja1105_reset_cmd *reset = data;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_RESET_CMD];</div><div class='add'>+</div><div class='add'>+	if (reset-&gt;switch_rst)</div><div class='add'>+		dev_dbg(dev, "Main reset for all functional modules requested\n");</div><div class='add'>+	if (reset-&gt;cfg_rst)</div><div class='add'>+		dev_dbg(dev, "Chip configuration reset requested\n");</div><div class='add'>+	if (reset-&gt;car_rst)</div><div class='add'>+		dev_dbg(dev, "Clock and reset control logic reset requested\n");</div><div class='add'>+	if (reset-&gt;otp_rst)</div><div class='add'>+		dev_dbg(dev, "OTP read cycle for reading product "</div><div class='add'>+			"config settings requested\n");</div><div class='add'>+	if (reset-&gt;warm_rst)</div><div class='add'>+		dev_dbg(dev, "Warm reset requested\n");</div><div class='add'>+	if (reset-&gt;cold_rst)</div><div class='add'>+		dev_dbg(dev, "Cold reset requested\n");</div><div class='add'>+	if (reset-&gt;por_rst)</div><div class='add'>+		dev_dbg(dev, "Power-on reset requested\n");</div><div class='add'>+</div><div class='add'>+	sja1105pqrs_reset_cmd_pack(packed_buf, reset);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rgu,</div><div class='add'>+					   packed_buf, SJA1105_SIZE_RESET_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_cold_reset(const struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_reset_cmd reset = {0};</div><div class='add'>+</div><div class='add'>+	reset.cold_rst = 1;</div><div class='add'>+	return priv-&gt;info-&gt;reset_cmd(priv, &amp;reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_inhibit_tx(const struct sja1105_private *priv,</div><div class='add'>+			      const unsigned long *port_bitmap)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u64 inhibit_cmd;</div><div class='add'>+	int port, rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_int(priv, SPI_READ, regs-&gt;port_control,</div><div class='add'>+				  &amp;inhibit_cmd, SJA1105_SIZE_PORT_CTRL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(port, port_bitmap, SJA1105_NUM_PORTS)</div><div class='add'>+		inhibit_cmd |= BIT(port);</div><div class='add'>+</div><div class='add'>+	return sja1105_spi_send_int(priv, SPI_WRITE, regs-&gt;port_control,</div><div class='add'>+				    &amp;inhibit_cmd, SJA1105_SIZE_PORT_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sja1105_status {</div><div class='add'>+	u64 configs;</div><div class='add'>+	u64 crcchkl;</div><div class='add'>+	u64 ids;</div><div class='add'>+	u64 crcchkg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This is not reading the entire General Status area, which is also</div><div class='add'>+ * divergent between E/T and P/Q/R/S, but only the relevant bits for</div><div class='add'>+ * ensuring that the static config upload procedure was successful.</div><div class='add'>+ */</div><div class='add'>+static void sja1105_status_unpack(void *buf, struct sja1105_status *status)</div><div class='add'>+{</div><div class='add'>+	/* So that addition translates to 4 bytes */</div><div class='add'>+	u32 *p = buf;</div><div class='add'>+</div><div class='add'>+	/* device_id is missing from the buffer, but we don't</div><div class='add'>+	 * want to diverge from the manual definition of the</div><div class='add'>+	 * register addresses, so we'll back off one step with</div><div class='add'>+	 * the register pointer, and never access p[0].</div><div class='add'>+	 */</div><div class='add'>+	p--;</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;configs,   31, 31, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;crcchkl,   30, 30, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;ids,       29, 29, 4);</div><div class='add'>+	sja1105_unpack(p + 0x1, &amp;status-&gt;crcchkg,   28, 28, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_status_get(struct sja1105_private *priv,</div><div class='add'>+			      struct sja1105_status *status)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 packed_buf[4];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_spi_send_packed_buf(priv, SPI_READ,</div><div class='add'>+					 regs-&gt;status,</div><div class='add'>+					 packed_buf, 4);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sja1105_status_unpack(packed_buf, status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Not const because unpacking priv-&gt;static_config into buffers and preparing</div><div class='add'>+ * for upload requires the recalculation of table CRCs and updating the</div><div class='add'>+ * structures with these.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+static_config_buf_prepare_for_upload(struct sja1105_private *priv,</div><div class='add'>+				     void *config_buf, int buf_len)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_static_config *config = &amp;priv-&gt;static_config;</div><div class='add'>+	struct sja1105_table_header final_header;</div><div class='add'>+	sja1105_config_valid_t valid;</div><div class='add'>+	char *final_header_ptr;</div><div class='add'>+	int crc_len;</div><div class='add'>+</div><div class='add'>+	valid = sja1105_static_config_check_valid(config);</div><div class='add'>+	if (valid != SJA1105_CONFIG_OK) {</div><div class='add'>+		dev_err(&amp;priv-&gt;spidev-&gt;dev,</div><div class='add'>+			sja1105_static_config_error_msg[valid]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write Device ID and config tables to config_buf */</div><div class='add'>+	sja1105_static_config_pack(config_buf, config);</div><div class='add'>+	/* Recalculate CRC of the last header (right now 0xDEADBEEF).</div><div class='add'>+	 * Don't include the CRC field itself.</div><div class='add'>+	 */</div><div class='add'>+	crc_len = buf_len - 4;</div><div class='add'>+	/* Read the whole table header */</div><div class='add'>+	final_header_ptr = config_buf + buf_len - SJA1105_SIZE_TABLE_HEADER;</div><div class='add'>+	sja1105_table_header_packing(final_header_ptr, &amp;final_header, UNPACK);</div><div class='add'>+	/* Modify */</div><div class='add'>+	final_header.crc = sja1105_crc32(config_buf, crc_len);</div><div class='add'>+	/* Rewrite */</div><div class='add'>+	sja1105_table_header_packing(final_header_ptr, &amp;final_header, PACK);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RETRIES 10</div><div class='add'>+</div><div class='add'>+int sja1105_static_config_upload(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned long port_bitmap = GENMASK_ULL(SJA1105_NUM_PORTS - 1, 0);</div><div class='add'>+	struct sja1105_static_config *config = &amp;priv-&gt;static_config;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	struct sja1105_status status;</div><div class='add'>+	int rc, retries = RETRIES;</div><div class='add'>+	u8 *config_buf;</div><div class='add'>+	int buf_len;</div><div class='add'>+</div><div class='add'>+	buf_len = sja1105_static_config_get_length(config);</div><div class='add'>+	config_buf = kcalloc(buf_len, sizeof(char), GFP_KERNEL);</div><div class='add'>+	if (!config_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = static_config_buf_prepare_for_upload(priv, config_buf, buf_len);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Invalid config, cannot upload\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* Prevent PHY jabbering during switch reset by inhibiting</div><div class='add'>+	 * Tx on all ports and waiting for current packet to drain.</div><div class='add'>+	 * Otherwise, the PHY will see an unterminated Ethernet packet.</div><div class='add'>+	 */</div><div class='add'>+	rc = sja1105_inhibit_tx(priv, &amp;port_bitmap);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to inhibit Tx on ports\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	/* Wait for an eventual egress packet to finish transmission</div><div class='add'>+	 * (reach IFG). It is guaranteed that a second one will not</div><div class='add'>+	 * follow, and that switch cold reset is thus safe</div><div class='add'>+	 */</div><div class='add'>+	usleep_range(500, 1000);</div><div class='add'>+	do {</div><div class='add'>+		/* Put the SJA1105 in programming mode */</div><div class='add'>+		rc = sja1105_cold_reset(priv);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(dev, "Failed to reset switch, retrying...\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/* Wait for the switch to come out of reset */</div><div class='add'>+		usleep_range(1000, 5000);</div><div class='add'>+		/* Upload the static config to the device */</div><div class='add'>+		rc = sja1105_spi_send_long_packed_buf(priv, SPI_WRITE,</div><div class='add'>+						      regs-&gt;config,</div><div class='add'>+						      config_buf, buf_len);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(dev, "Failed to upload config, retrying...\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/* Check that SJA1105 responded well to the config upload */</div><div class='add'>+		rc = sja1105_status_get(priv, &amp;status);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (status.ids == 1) {</div><div class='add'>+			dev_err(dev, "Mismatch between hardware and static config "</div><div class='add'>+				"device id. Wrote 0x%llx, wants 0x%llx\n",</div><div class='add'>+				config-&gt;device_id, priv-&gt;info-&gt;device_id);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (status.crcchkl == 1) {</div><div class='add'>+			dev_err(dev, "Switch reported invalid local CRC on "</div><div class='add'>+				"the uploaded config, retrying...\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (status.crcchkg == 1) {</div><div class='add'>+			dev_err(dev, "Switch reported invalid global CRC on "</div><div class='add'>+				"the uploaded config, retrying...\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (status.configs == 0) {</div><div class='add'>+			dev_err(dev, "Switch reported that configuration is "</div><div class='add'>+				"invalid, retrying...\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	} while (--retries &amp;&amp; (status.crcchkl == 1 || status.crcchkg == 1 ||</div><div class='add'>+		 status.configs == 0 || status.ids == 1));</div><div class='add'>+</div><div class='add'>+	if (!retries) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		dev_err(dev, "Failed to upload config to device, giving up\n");</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (retries != RETRIES - 1) {</div><div class='add'>+		dev_info(dev, "Succeeded after %d tried\n", RETRIES - retries);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Reset switch and programmed static config\n");</div><div class='add'>+out:</div><div class='add'>+	kfree(config_buf);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sja1105_regs sja1105et_regs = {</div><div class='add'>+	.device_id = 0x0,</div><div class='add'>+	.prod_id = 0x100BC3,</div><div class='add'>+	.status = 0x1,</div><div class='add'>+	.port_control = 0x11,</div><div class='add'>+	.config = 0x020000,</div><div class='add'>+	.rgu = 0x100440,</div><div class='add'>+	.pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='add'>+	.rmii_pll1 = 0x10000A,</div><div class='add'>+	.cgu_idiv = {0x10000B, 0x10000C, 0x10000D, 0x10000E, 0x10000F},</div><div class='add'>+	/* UM10944.pdf, Table 86, ACU Register overview */</div><div class='add'>+	.rgmii_pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='add'>+	.mac = {0x200, 0x202, 0x204, 0x206, 0x208},</div><div class='add'>+	.mac_hl1 = {0x400, 0x410, 0x420, 0x430, 0x440},</div><div class='add'>+	.mac_hl2 = {0x600, 0x610, 0x620, 0x630, 0x640},</div><div class='add'>+	/* UM10944.pdf, Table 78, CGU Register overview */</div><div class='add'>+	.mii_tx_clk = {0x100013, 0x10001A, 0x100021, 0x100028, 0x10002F},</div><div class='add'>+	.mii_rx_clk = {0x100014, 0x10001B, 0x100022, 0x100029, 0x100030},</div><div class='add'>+	.mii_ext_tx_clk = {0x100018, 0x10001F, 0x100026, 0x10002D, 0x100034},</div><div class='add'>+	.mii_ext_rx_clk = {0x100019, 0x100020, 0x100027, 0x10002E, 0x100035},</div><div class='add'>+	.rgmii_tx_clk = {0x100016, 0x10001D, 0x100024, 0x10002B, 0x100032},</div><div class='add'>+	.rmii_ref_clk = {0x100015, 0x10001C, 0x100023, 0x10002A, 0x100031},</div><div class='add'>+	.rmii_ext_tx_clk = {0x100018, 0x10001F, 0x100026, 0x10002D, 0x100034},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_regs sja1105pqrs_regs = {</div><div class='add'>+	.device_id = 0x0,</div><div class='add'>+	.prod_id = 0x100BC3,</div><div class='add'>+	.status = 0x1,</div><div class='add'>+	.port_control = 0x12,</div><div class='add'>+	.config = 0x020000,</div><div class='add'>+	.rgu = 0x100440,</div><div class='add'>+	.pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='add'>+	.rmii_pll1 = 0x10000A,</div><div class='add'>+	.cgu_idiv = {0x10000B, 0x10000C, 0x10000D, 0x10000E, 0x10000F},</div><div class='add'>+	/* UM10944.pdf, Table 86, ACU Register overview */</div><div class='add'>+	.rgmii_pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='add'>+	.mac = {0x200, 0x202, 0x204, 0x206, 0x208},</div><div class='add'>+	.mac_hl1 = {0x400, 0x410, 0x420, 0x430, 0x440},</div><div class='add'>+	.mac_hl2 = {0x600, 0x610, 0x620, 0x630, 0x640},</div><div class='add'>+	/* UM11040.pdf, Table 114 */</div><div class='add'>+	.mii_tx_clk = {0x100013, 0x100019, 0x10001F, 0x100025, 0x10002B},</div><div class='add'>+	.mii_rx_clk = {0x100014, 0x10001A, 0x100020, 0x100026, 0x10002C},</div><div class='add'>+	.mii_ext_tx_clk = {0x100017, 0x10001D, 0x100023, 0x100029, 0x10002F},</div><div class='add'>+	.mii_ext_rx_clk = {0x100018, 0x10001E, 0x100024, 0x10002A, 0x100030},</div><div class='add'>+	.rgmii_tx_clk = {0x100016, 0x10001C, 0x100022, 0x100028, 0x10002E},</div><div class='add'>+	.rmii_ref_clk = {0x100015, 0x10001B, 0x100021, 0x100027, 0x10002D},</div><div class='add'>+	.rmii_ext_tx_clk = {0x100017, 0x10001D, 0x100023, 0x100029, 0x10002F},</div><div class='add'>+	.qlevel = {0x604, 0x614, 0x624, 0x634, 0x644},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_info sja1105e_info = {</div><div class='add'>+	.device_id		= SJA1105E_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1105ET_PART_NO,</div><div class='add'>+	.static_ops		= sja1105e_table_ops,</div><div class='add'>+	.dyn_ops		= sja1105et_dyn_ops,</div><div class='add'>+	.reset_cmd		= sja1105et_reset_cmd,</div><div class='add'>+	.regs			= &amp;sja1105et_regs,</div><div class='add'>+	.name			= "SJA1105E",</div><div class='add'>+};</div><div class='add'>+struct sja1105_info sja1105t_info = {</div><div class='add'>+	.device_id		= SJA1105T_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1105ET_PART_NO,</div><div class='add'>+	.static_ops		= sja1105t_table_ops,</div><div class='add'>+	.dyn_ops		= sja1105et_dyn_ops,</div><div class='add'>+	.reset_cmd		= sja1105et_reset_cmd,</div><div class='add'>+	.regs			= &amp;sja1105et_regs,</div><div class='add'>+	.name			= "SJA1105T",</div><div class='add'>+};</div><div class='add'>+struct sja1105_info sja1105p_info = {</div><div class='add'>+	.device_id		= SJA1105PR_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1105P_PART_NO,</div><div class='add'>+	.static_ops		= sja1105p_table_ops,</div><div class='add'>+	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.name			= "SJA1105P",</div><div class='add'>+};</div><div class='add'>+struct sja1105_info sja1105q_info = {</div><div class='add'>+	.device_id		= SJA1105QS_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1105Q_PART_NO,</div><div class='add'>+	.static_ops		= sja1105q_table_ops,</div><div class='add'>+	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.name			= "SJA1105Q",</div><div class='add'>+};</div><div class='add'>+struct sja1105_info sja1105r_info = {</div><div class='add'>+	.device_id		= SJA1105PR_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1105R_PART_NO,</div><div class='add'>+	.static_ops		= sja1105r_table_ops,</div><div class='add'>+	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.name			= "SJA1105R",</div><div class='add'>+};</div><div class='add'>+struct sja1105_info sja1105s_info = {</div><div class='add'>+	.device_id		= SJA1105QS_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1105S_PART_NO,</div><div class='add'>+	.static_ops		= sja1105s_table_ops,</div><div class='add'>+	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.name			= "SJA1105S",</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/>new file mode 100644<br/>index 000000000000..b3c992b0abb0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_static_config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_static_config.c</a></div><div class='hunk'>@@ -0,0 +1,987 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause</div><div class='add'>+/* Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+ * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include "sja1105_static_config.h"</div><div class='add'>+#include &lt;linux/crc32.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'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+/* Convenience wrappers over the generic packing functions. These take into</div><div class='add'>+ * account the SJA1105 memory layout quirks and provide some level of</div><div class='add'>+ * programmer protection against incorrect API use. The errors are not expected</div><div class='add'>+ * to occur durring runtime, therefore printing and swallowing them here is</div><div class='add'>+ * appropriate instead of clutterring up higher-level code.</div><div class='add'>+ */</div><div class='add'>+void sja1105_pack(void *buf, const u64 *val, int start, int end, size_t len)</div><div class='add'>+{</div><div class='add'>+	int rc = packing(buf, (u64 *)val, start, end, len,</div><div class='add'>+			 PACK, QUIRK_LSW32_IS_FIRST);</div><div class='add'>+</div><div class='add'>+	if (likely(!rc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rc == -EINVAL) {</div><div class='add'>+		pr_err("Start bit (%d) expected to be larger than end (%d)\n",</div><div class='add'>+		       start, end);</div><div class='add'>+	} else if (rc == -ERANGE) {</div><div class='add'>+		if ((start - end + 1) &gt; 64)</div><div class='add'>+			pr_err("Field %d-%d too large for 64 bits!\n",</div><div class='add'>+			       start, end);</div><div class='add'>+		else</div><div class='add'>+			pr_err("Cannot store %llx inside bits %d-%d (would truncate)\n",</div><div class='add'>+			       *val, start, end);</div><div class='add'>+	}</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_unpack(const void *buf, u64 *val, int start, int end, size_t len)</div><div class='add'>+{</div><div class='add'>+	int rc = packing((void *)buf, val, start, end, len,</div><div class='add'>+			 UNPACK, QUIRK_LSW32_IS_FIRST);</div><div class='add'>+</div><div class='add'>+	if (likely(!rc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rc == -EINVAL)</div><div class='add'>+		pr_err("Start bit (%d) expected to be larger than end (%d)\n",</div><div class='add'>+		       start, end);</div><div class='add'>+	else if (rc == -ERANGE)</div><div class='add'>+		pr_err("Field %d-%d too large for 64 bits!\n",</div><div class='add'>+		       start, end);</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_packing(void *buf, u64 *val, int start, int end,</div><div class='add'>+		     size_t len, enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	int rc = packing(buf, val, start, end, len, op, QUIRK_LSW32_IS_FIRST);</div><div class='add'>+</div><div class='add'>+	if (likely(!rc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rc == -EINVAL) {</div><div class='add'>+		pr_err("Start bit (%d) expected to be larger than end (%d)\n",</div><div class='add'>+		       start, end);</div><div class='add'>+	} else if (rc == -ERANGE) {</div><div class='add'>+		if ((start - end + 1) &gt; 64)</div><div class='add'>+			pr_err("Field %d-%d too large for 64 bits!\n",</div><div class='add'>+			       start, end);</div><div class='add'>+		else</div><div class='add'>+			pr_err("Cannot store %llx inside bits %d-%d (would truncate)\n",</div><div class='add'>+			       *val, start, end);</div><div class='add'>+	}</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Little-endian Ethernet CRC32 of data packed as big-endian u32 words */</div><div class='add'>+u32 sja1105_crc32(const void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u64 word;</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	/* seed */</div><div class='add'>+	crc = ~0;</div><div class='add'>+	for (i = 0; i &lt; len; i += 4) {</div><div class='add'>+		sja1105_unpack((void *)buf + i, &amp;word, 31, 0, 4);</div><div class='add'>+		crc = crc32_le(crc, (u8 *)&amp;word, 4);</div><div class='add'>+	}</div><div class='add'>+	return ~crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105et_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'>+	const size_t size = SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_general_params_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vllupformat, 319, 319, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_ptacu,  318, 318, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;switchid,    317, 315, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;hostprio,    314, 312, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_fltres1, 311, 264, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_fltres0, 263, 216, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_flt1,    215, 168, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_flt0,    167, 120, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;incl_srcpt1, 119, 119, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;incl_srcpt0, 118, 118, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_meta1,  117, 117, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_meta0,  116, 116, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;casc_port,   115, 113, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;host_port,   112, 110, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_port,   109, 107, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlmarker,    106,  75, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlmask,       74,  43, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid,         42,  27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ignore2stf,   26,  26, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid2,        25,  10, 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'>+sja1105pqrs_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'>+	const size_t size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_general_params_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vllupformat, 351, 351, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_ptacu,  350, 350, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;switchid,    349, 347, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;hostprio,    346, 344, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_fltres1, 343, 296, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_fltres0, 295, 248, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_flt1,    247, 200, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_flt0,    199, 152, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;incl_srcpt1, 151, 151, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;incl_srcpt0, 150, 150, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_meta1,  149, 149, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_meta0,  148, 148, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;casc_port,   147, 145, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;host_port,   144, 142, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_port,   141, 139, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlmarker,    138, 107, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlmask,      106,  75, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid,         74,  59, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ignore2stf,   58,  58, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid2,        57,  42, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;queue_ts,     41,  41, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirrvid,   40,  29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirrpcp,   28,  26, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirrdei,   25,  25, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;replay_port,  24,  22, 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_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'>+	const size_t size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_l2_forwarding_params_entry *entry = entry_ptr;</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 = 13; i &lt; 8; i++, offset += 10)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;part_spc[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'>+size_t sja1105_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'>+	const size_t size = SJA1105_SIZE_L2_FORWARDING_ENTRY;</div><div class='add'>+	struct sja1105_l2_forwarding_entry *entry = entry_ptr;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;bc_domain,  63, 59, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;reach_port, 58, 54, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;fl_domain,  53, 49, size, op);</div><div class='add'>+	for (i = 0, offset = 25; i &lt; 8; 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'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1105et_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'>+	const size_t size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_l2_lookup_params_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxage,         31, 17, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;dyn_tbsz,       16, 14, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;poly,           13,  6, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;shared_learn,    5,  5, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;no_enf_hostprt,  4,  4, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;no_mgmt_learn,   3,  3, 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'>+sja1105pqrs_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'>+	const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_l2_lookup_params_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxage,         57,  43, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;shared_learn,   27,  27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;no_enf_hostprt, 26,  26, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;no_mgmt_learn,  25,  25, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</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'>+{</div><div class='add'>+	const size_t size = SJA1105ET_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,    95, 84, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;macaddr,   83, 36, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports, 35, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;enfport,   30, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;index,     29, 20, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</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'>+{</div><div class='add'>+	const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	/* These are static L2 lookup entries, so the structure</div><div class='add'>+	 * should match UM11040 Table 16/17 definitions when</div><div class='add'>+	 * LOCKEDS is 1.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,        81,  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'>+	sja1105_packing(buf, &amp;entry-&gt;index,         15,   6, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105_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'>+	const size_t size = SJA1105_SIZE_L2_POLICING_ENTRY;</div><div class='add'>+	struct sja1105_l2_policing_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;sharindx,  63, 58, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;smax,      57, 42, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;rate,      41, 26, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxlen,    25, 15, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;partition, 14, 12, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105et_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 = SJA1105ET_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 = 72; 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;ifg,       71, 67, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;speed,     66, 65, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tp_delin,  64, 49, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tp_delout, 48, 33, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxage,    32, 25, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanprio,  24, 22, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,    21, 10, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ing_mirr,   9,  9, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egr_mirr,   8,  8, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpnona664, 7,  7, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpdtag,    6,  6, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpuntag,   5,  5, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;retag,      4,  4, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;dyn_learn,  3,  3, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egress,     2,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ingress,    1,  1, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</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'>+{</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;ifg,       103, 99, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;speed,      98, 97, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tp_delin,   96, 81, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tp_delout,  80, 65, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxage,     64, 57, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanprio,   56, 54, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,     53, 42, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ing_mirr,   41, 41, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egr_mirr,   40, 40, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpnona664, 39, 39, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpdtag,    38, 38, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpuntag,   35, 35, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;retag,      34, 34, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;dyn_learn,  33, 33, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egress,     32, 32, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ingress,    31, 31, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</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'>+{</div><div class='add'>+	const size_t size = SJA1105_SIZE_VLAN_LOOKUP_ENTRY;</div><div class='add'>+	struct sja1105_vlan_lookup_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ving_mirr,  63, 59, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vegr_mirr,  58, 54, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vmemb_port, 53, 49, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlan_bc,    48, 44, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tag_port,   43, 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='add'>+static size_t sja1105_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 = SJA1105_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 = 17; i &lt; 5; i++, offset += 3) {</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'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1105_table_header_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_TABLE_HEADER;</div><div class='add'>+	struct sja1105_table_header *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;block_id, 31, 24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;len,      55, 32, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;crc,      95, 64, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* WARNING: the *hdr pointer is really non-const, because it is</div><div class='add'>+ * modifying the CRC of the header for a 2-stage packing operation</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+sja1105_table_header_pack_with_crc(void *buf, struct sja1105_table_header *hdr)</div><div class='add'>+{</div><div class='add'>+	/* First pack the table as-is, then calculate the CRC, and</div><div class='add'>+	 * finally put the proper CRC into the packed buffer</div><div class='add'>+	 */</div><div class='add'>+	memset(buf, 0, SJA1105_SIZE_TABLE_HEADER);</div><div class='add'>+	sja1105_table_header_packing(buf, hdr, PACK);</div><div class='add'>+	hdr-&gt;crc = sja1105_crc32(buf, SJA1105_SIZE_TABLE_HEADER - 4);</div><div class='add'>+	sja1105_pack(buf + SJA1105_SIZE_TABLE_HEADER - 4, &amp;hdr-&gt;crc, 31, 0, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_table_write_crc(u8 *table_start, u8 *crc_ptr)</div><div class='add'>+{</div><div class='add'>+	u64 computed_crc;</div><div class='add'>+	int len_bytes;</div><div class='add'>+</div><div class='add'>+	len_bytes = (uintptr_t)(crc_ptr - table_start);</div><div class='add'>+	computed_crc = sja1105_crc32(table_start, len_bytes);</div><div class='add'>+	sja1105_pack(crc_ptr, &amp;computed_crc, 31, 0, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The block IDs that the switches support are unfortunately sparse, so keep a</div><div class='add'>+ * mapping table to "block indices" and translate back and forth so that we</div><div class='add'>+ * don't waste useless memory in struct sja1105_static_config.</div><div class='add'>+ * Also, since the block id comes from essentially untrusted input (unpacking</div><div class='add'>+ * the static config from userspace) it has to be sanitized (range-checked)</div><div class='add'>+ * before blindly indexing kernel memory with the blk_idx.</div><div class='add'>+ */</div><div class='add'>+static u64 blk_id_map[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = BLKID_L2_LOOKUP,</div><div class='add'>+	[BLK_IDX_L2_POLICING] = BLKID_L2_POLICING,</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = BLKID_VLAN_LOOKUP,</div><div class='add'>+	[BLK_IDX_L2_FORWARDING] = BLKID_L2_FORWARDING,</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = BLKID_MAC_CONFIG,</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = BLKID_L2_LOOKUP_PARAMS,</div><div class='add'>+	[BLK_IDX_L2_FORWARDING_PARAMS] = BLKID_L2_FORWARDING_PARAMS,</div><div class='add'>+	[BLK_IDX_GENERAL_PARAMS] = BLKID_GENERAL_PARAMS,</div><div class='add'>+	[BLK_IDX_XMII_PARAMS] = BLKID_XMII_PARAMS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *sja1105_static_config_error_msg[] = {</div><div class='add'>+	[SJA1105_CONFIG_OK] = "",</div><div class='add'>+	[SJA1105_MISSING_L2_POLICING_TABLE] =</div><div class='add'>+		"l2-policing-table needs to have at least one entry",</div><div class='add'>+	[SJA1105_MISSING_L2_FORWARDING_TABLE] =</div><div class='add'>+		"l2-forwarding-table is either missing or incomplete",</div><div class='add'>+	[SJA1105_MISSING_L2_FORWARDING_PARAMS_TABLE] =</div><div class='add'>+		"l2-forwarding-parameters-table is missing",</div><div class='add'>+	[SJA1105_MISSING_GENERAL_PARAMS_TABLE] =</div><div class='add'>+		"general-parameters-table is missing",</div><div class='add'>+	[SJA1105_MISSING_VLAN_TABLE] =</div><div class='add'>+		"vlan-lookup-table needs to have at least the default untagged VLAN",</div><div class='add'>+	[SJA1105_MISSING_XMII_TABLE] =</div><div class='add'>+		"xmii-table is missing",</div><div class='add'>+	[SJA1105_MISSING_MAC_TABLE] =</div><div class='add'>+		"mac-configuration-table needs to contain an entry for each port",</div><div class='add'>+	[SJA1105_OVERCOMMITTED_FRAME_MEMORY] =</div><div class='add'>+		"Not allowed to overcommit frame memory. L2 memory partitions "</div><div class='add'>+		"and VL memory partitions share the same space. The sum of all "</div><div class='add'>+		"16 memory partitions is not allowed to be larger than 929 "</div><div class='add'>+		"128-byte blocks (or 910 with retagging). Please adjust "</div><div class='add'>+		"l2-forwarding-parameters-table.part_spc and/or "</div><div class='add'>+		"vl-forwarding-parameters-table.partspc.",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+sja1105_config_valid_t</div><div class='add'>+static_config_check_memory_size(const struct sja1105_table *tables)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_l2_forwarding_params_entry *l2_fwd_params;</div><div class='add'>+	int i, mem = 0;</div><div class='add'>+</div><div class='add'>+	l2_fwd_params = tables[BLK_IDX_L2_FORWARDING_PARAMS].entries;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		mem += l2_fwd_params-&gt;part_spc[i];</div><div class='add'>+</div><div class='add'>+	if (mem &gt; SJA1105_MAX_FRAME_MEMORY)</div><div class='add'>+		return SJA1105_OVERCOMMITTED_FRAME_MEMORY;</div><div class='add'>+</div><div class='add'>+	return SJA1105_CONFIG_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sja1105_config_valid_t</div><div class='add'>+sja1105_static_config_check_valid(const struct sja1105_static_config *config)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_table *tables = config-&gt;tables;</div><div class='add'>+#define IS_FULL(blk_idx) \</div><div class='add'>+	(tables[blk_idx].entry_count == tables[blk_idx].ops-&gt;max_entry_count)</div><div class='add'>+</div><div class='add'>+	if (tables[BLK_IDX_L2_POLICING].entry_count == 0)</div><div class='add'>+		return SJA1105_MISSING_L2_POLICING_TABLE;</div><div class='add'>+</div><div class='add'>+	if (tables[BLK_IDX_VLAN_LOOKUP].entry_count == 0)</div><div class='add'>+		return SJA1105_MISSING_VLAN_TABLE;</div><div class='add'>+</div><div class='add'>+	if (!IS_FULL(BLK_IDX_L2_FORWARDING))</div><div class='add'>+		return SJA1105_MISSING_L2_FORWARDING_TABLE;</div><div class='add'>+</div><div class='add'>+	if (!IS_FULL(BLK_IDX_MAC_CONFIG))</div><div class='add'>+		return SJA1105_MISSING_MAC_TABLE;</div><div class='add'>+</div><div class='add'>+	if (!IS_FULL(BLK_IDX_L2_FORWARDING_PARAMS))</div><div class='add'>+		return SJA1105_MISSING_L2_FORWARDING_PARAMS_TABLE;</div><div class='add'>+</div><div class='add'>+	if (!IS_FULL(BLK_IDX_GENERAL_PARAMS))</div><div class='add'>+		return SJA1105_MISSING_GENERAL_PARAMS_TABLE;</div><div class='add'>+</div><div class='add'>+	if (!IS_FULL(BLK_IDX_XMII_PARAMS))</div><div class='add'>+		return SJA1105_MISSING_XMII_TABLE;</div><div class='add'>+</div><div class='add'>+	return static_config_check_memory_size(tables);</div><div class='add'>+#undef IS_FULL</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+sja1105_static_config_pack(void *buf, struct sja1105_static_config *config)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_table_header header = {0};</div><div class='add'>+	enum sja1105_blk_idx i;</div><div class='add'>+	char *p = buf;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	sja1105_pack(p, &amp;config-&gt;device_id, 31, 0, 4);</div><div class='add'>+	p += SJA1105_SIZE_DEVICE_ID;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BLK_IDX_MAX; i++) {</div><div class='add'>+		const struct sja1105_table *table;</div><div class='add'>+		char *table_start;</div><div class='add'>+</div><div class='add'>+		table = &amp;config-&gt;tables[i];</div><div class='add'>+		if (!table-&gt;entry_count)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		header.block_id = blk_id_map[i];</div><div class='add'>+		header.len = table-&gt;entry_count *</div><div class='add'>+			     table-&gt;ops-&gt;packed_entry_size / 4;</div><div class='add'>+		sja1105_table_header_pack_with_crc(p, &amp;header);</div><div class='add'>+		p += SJA1105_SIZE_TABLE_HEADER;</div><div class='add'>+		table_start = p;</div><div class='add'>+		for (j = 0; j &lt; table-&gt;entry_count; j++) {</div><div class='add'>+			u8 *entry_ptr = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+			entry_ptr += j * table-&gt;ops-&gt;unpacked_entry_size;</div><div class='add'>+			memset(p, 0, table-&gt;ops-&gt;packed_entry_size);</div><div class='add'>+			table-&gt;ops-&gt;packing(p, entry_ptr, PACK);</div><div class='add'>+			p += table-&gt;ops-&gt;packed_entry_size;</div><div class='add'>+		}</div><div class='add'>+		sja1105_table_write_crc(table_start, p);</div><div class='add'>+		p += 4;</div><div class='add'>+	}</div><div class='add'>+	/* Final header:</div><div class='add'>+	 * Block ID does not matter</div><div class='add'>+	 * Length of 0 marks that header is final</div><div class='add'>+	 * CRC will be replaced on-the-fly on "config upload"</div><div class='add'>+	 */</div><div class='add'>+	header.block_id = 0;</div><div class='add'>+	header.len = 0;</div><div class='add'>+	header.crc = 0xDEADBEEF;</div><div class='add'>+	memset(p, 0, SJA1105_SIZE_TABLE_HEADER);</div><div class='add'>+	sja1105_table_header_packing(p, &amp;header, PACK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t</div><div class='add'>+sja1105_static_config_get_length(const struct sja1105_static_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned int sum;</div><div class='add'>+	unsigned int header_count;</div><div class='add'>+	enum sja1105_blk_idx i;</div><div class='add'>+</div><div class='add'>+	/* Ending header */</div><div class='add'>+	header_count = 1;</div><div class='add'>+	sum = SJA1105_SIZE_DEVICE_ID;</div><div class='add'>+</div><div class='add'>+	/* Tables (headers and entries) */</div><div class='add'>+	for (i = 0; i &lt; BLK_IDX_MAX; i++) {</div><div class='add'>+		const struct sja1105_table *table;</div><div class='add'>+</div><div class='add'>+		table = &amp;config-&gt;tables[i];</div><div class='add'>+		if (table-&gt;entry_count)</div><div class='add'>+			header_count++;</div><div class='add'>+</div><div class='add'>+		sum += table-&gt;ops-&gt;packed_entry_size * table-&gt;entry_count;</div><div class='add'>+	}</div><div class='add'>+	/* Headers have an additional CRC at the end */</div><div class='add'>+	sum += header_count * (SJA1105_SIZE_TABLE_HEADER + 4);</div><div class='add'>+	/* Last header does not have an extra CRC because there is no data */</div><div class='add'>+	sum -= 4;</div><div class='add'>+</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compatibility matrices */</div><div class='add'>+</div><div class='add'>+/* SJA1105E: First generation, no TTEthernet */</div><div class='add'>+struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1105et_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_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 = sja1105_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 = SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_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 = sja1105_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 = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1105et_mac_config_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_mac_config_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_SIZE_MAC_CONFIG_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1105et_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 = SJA1105ET_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 = sja1105_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_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1105et_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_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_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1105_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1105T: First generation, TTEthernet */</div><div class='add'>+struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1105et_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_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 = sja1105_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 = SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_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 = sja1105_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 = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1105et_mac_config_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_mac_config_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_SIZE_MAC_CONFIG_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1105et_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 = SJA1105ET_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 = sja1105_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_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1105et_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_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_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1105_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1105P: Second generation, no TTEthernet, no SGMII */</div><div class='add'>+struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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 = sja1105_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 = SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_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 = sja1105_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 = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105PQRS_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 = sja1105_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_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1105_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1105Q: Second generation, TTEthernet, no SGMII */</div><div class='add'>+struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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 = sja1105_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 = SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_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 = sja1105_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 = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105PQRS_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 = sja1105_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_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1105_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1105R: Second generation, no TTEthernet, SGMII */</div><div class='add'>+struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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 = sja1105_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 = SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_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 = sja1105_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 = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105PQRS_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 = sja1105_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_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1105_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1105S: Second generation, TTEthernet, SGMII */</div><div class='add'>+struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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 = sja1105_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 = SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_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 = sja1105_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 = SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_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 = SJA1105PQRS_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 = sja1105_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_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_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_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1105_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sja1105_static_config_init(struct sja1105_static_config *config,</div><div class='add'>+			       const struct sja1105_table_ops *static_ops,</div><div class='add'>+			       u64 device_id)</div><div class='add'>+{</div><div class='add'>+	enum sja1105_blk_idx i;</div><div class='add'>+</div><div class='add'>+	*config = (struct sja1105_static_config) {0};</div><div class='add'>+</div><div class='add'>+	/* Transfer static_ops array from priv into per-table ops</div><div class='add'>+	 * for handier access</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; BLK_IDX_MAX; i++)</div><div class='add'>+		config-&gt;tables[i].ops = &amp;static_ops[i];</div><div class='add'>+</div><div class='add'>+	config-&gt;device_id = device_id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_static_config_free(struct sja1105_static_config *config)</div><div class='add'>+{</div><div class='add'>+	enum sja1105_blk_idx i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BLK_IDX_MAX; i++) {</div><div class='add'>+		if (config-&gt;tables[i].entry_count) {</div><div class='add'>+			kfree(config-&gt;tables[i].entries);</div><div class='add'>+			config-&gt;tables[i].entry_count = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_table_delete_entry(struct sja1105_table *table, int i)</div><div class='add'>+{</div><div class='add'>+	size_t entry_size = table-&gt;ops-&gt;unpacked_entry_size;</div><div class='add'>+	u8 *entries = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	if (i &gt; table-&gt;entry_count)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	memmove(entries + i * entry_size, entries + (i + 1) * entry_size,</div><div class='add'>+		(table-&gt;entry_count - i) * entry_size);</div><div class='add'>+</div><div class='add'>+	table-&gt;entry_count--;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No pointers to table-&gt;entries should be kept when this is called. */</div><div class='add'>+int sja1105_table_resize(struct sja1105_table *table, size_t new_count)</div><div class='add'>+{</div><div class='add'>+	size_t entry_size = table-&gt;ops-&gt;unpacked_entry_size;</div><div class='add'>+	void *new_entries, *old_entries = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	if (new_count &gt; table-&gt;ops-&gt;max_entry_count)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	new_entries = kcalloc(new_count, entry_size, GFP_KERNEL);</div><div class='add'>+	if (!new_entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(new_entries, old_entries, min(new_count, table-&gt;entry_count) *</div><div class='add'>+		entry_size);</div><div class='add'>+</div><div class='add'>+	table-&gt;entries = new_entries;</div><div class='add'>+	table-&gt;entry_count = new_count;</div><div class='add'>+	kfree(old_entries);</div><div class='add'>+	return 0;</div><div class='add'>+}</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/>new file mode 100644<br/>index 000000000000..069ca8fd059c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dsa/sja1105/sja1105_static_config.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dsa/sja1105/sja1105_static_config.h</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause</div><div class='add'>+ * Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+ * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _SJA1105_STATIC_CONFIG_H</div><div class='add'>+#define _SJA1105_STATIC_CONFIG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/packing.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_DEVICE_ID				4</div><div class='add'>+#define SJA1105_SIZE_TABLE_HEADER			12</div><div class='add'>+#define SJA1105_SIZE_L2_POLICING_ENTRY			8</div><div class='add'>+#define SJA1105_SIZE_VLAN_LOOKUP_ENTRY			8</div><div class='add'>+#define SJA1105_SIZE_L2_FORWARDING_ENTRY		8</div><div class='add'>+#define SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY		12</div><div class='add'>+#define SJA1105_SIZE_XMII_PARAMS_ENTRY			4</div><div class='add'>+#define SJA1105ET_SIZE_L2_LOOKUP_ENTRY			12</div><div class='add'>+#define SJA1105ET_SIZE_MAC_CONFIG_ENTRY			28</div><div class='add'>+#define SJA1105ET_SIZE_L2_LOOKUP_PARAMS_ENTRY		4</div><div class='add'>+#define SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY		40</div><div class='add'>+#define SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY		20</div><div class='add'>+#define SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY		32</div><div class='add'>+#define SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY		16</div><div class='add'>+#define SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY		44</div><div class='add'>+</div><div class='add'>+/* UM10944.pdf Page 11, Table 2. Configuration Blocks */</div><div class='add'>+enum {</div><div class='add'>+	BLKID_L2_LOOKUP					= 0x05,</div><div class='add'>+	BLKID_L2_POLICING				= 0x06,</div><div class='add'>+	BLKID_VLAN_LOOKUP				= 0x07,</div><div class='add'>+	BLKID_L2_FORWARDING				= 0x08,</div><div class='add'>+	BLKID_MAC_CONFIG				= 0x09,</div><div class='add'>+	BLKID_L2_LOOKUP_PARAMS				= 0x0D,</div><div class='add'>+	BLKID_L2_FORWARDING_PARAMS			= 0x0E,</div><div class='add'>+	BLKID_GENERAL_PARAMS				= 0x11,</div><div class='add'>+	BLKID_XMII_PARAMS				= 0x4E,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_blk_idx {</div><div class='add'>+	BLK_IDX_L2_LOOKUP = 0,</div><div class='add'>+	BLK_IDX_L2_POLICING,</div><div class='add'>+	BLK_IDX_VLAN_LOOKUP,</div><div class='add'>+	BLK_IDX_L2_FORWARDING,</div><div class='add'>+	BLK_IDX_MAC_CONFIG,</div><div class='add'>+	BLK_IDX_L2_LOOKUP_PARAMS,</div><div class='add'>+	BLK_IDX_L2_FORWARDING_PARAMS,</div><div class='add'>+	BLK_IDX_GENERAL_PARAMS,</div><div class='add'>+	BLK_IDX_XMII_PARAMS,</div><div class='add'>+	BLK_IDX_MAX,</div><div class='add'>+	/* Fake block indices that are only valid for dynamic access */</div><div class='add'>+	BLK_IDX_MGMT_ROUTE,</div><div class='add'>+	BLK_IDX_MAX_DYN,</div><div class='add'>+	BLK_IDX_INVAL = -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SJA1105_MAX_L2_LOOKUP_COUNT			1024</div><div class='add'>+#define SJA1105_MAX_L2_POLICING_COUNT			45</div><div class='add'>+#define SJA1105_MAX_VLAN_LOOKUP_COUNT			4096</div><div class='add'>+#define SJA1105_MAX_L2_FORWARDING_COUNT			13</div><div class='add'>+#define SJA1105_MAX_MAC_CONFIG_COUNT			5</div><div class='add'>+#define SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT		1</div><div class='add'>+#define SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT		1</div><div class='add'>+#define SJA1105_MAX_GENERAL_PARAMS_COUNT		1</div><div class='add'>+#define SJA1105_MAX_XMII_PARAMS_COUNT			1</div><div class='add'>+</div><div class='add'>+#define SJA1105_MAX_FRAME_MEMORY			929</div><div class='add'>+</div><div class='add'>+#define SJA1105E_DEVICE_ID				0x9C00000Cull</div><div class='add'>+#define SJA1105T_DEVICE_ID				0x9E00030Eull</div><div class='add'>+#define SJA1105PR_DEVICE_ID				0xAF00030Eull</div><div class='add'>+#define SJA1105QS_DEVICE_ID				0xAE00030Eull</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_PART_NO				0x9A83</div><div class='add'>+#define SJA1105P_PART_NO				0x9A84</div><div class='add'>+#define SJA1105Q_PART_NO				0x9A85</div><div class='add'>+#define SJA1105R_PART_NO				0x9A86</div><div class='add'>+#define SJA1105S_PART_NO				0x9A87</div><div class='add'>+</div><div class='add'>+struct sja1105_general_params_entry {</div><div class='add'>+	u64 vllupformat;</div><div class='add'>+	u64 mirr_ptacu;</div><div class='add'>+	u64 switchid;</div><div class='add'>+	u64 hostprio;</div><div class='add'>+	u64 mac_fltres1;</div><div class='add'>+	u64 mac_fltres0;</div><div class='add'>+	u64 mac_flt1;</div><div class='add'>+	u64 mac_flt0;</div><div class='add'>+	u64 incl_srcpt1;</div><div class='add'>+	u64 incl_srcpt0;</div><div class='add'>+	u64 send_meta1;</div><div class='add'>+	u64 send_meta0;</div><div class='add'>+	u64 casc_port;</div><div class='add'>+	u64 host_port;</div><div class='add'>+	u64 mirr_port;</div><div class='add'>+	u64 vlmarker;</div><div class='add'>+	u64 vlmask;</div><div class='add'>+	u64 tpid;</div><div class='add'>+	u64 ignore2stf;</div><div class='add'>+	u64 tpid2;</div><div class='add'>+	/* P/Q/R/S only */</div><div class='add'>+	u64 queue_ts;</div><div class='add'>+	u64 egrmirrvid;</div><div class='add'>+	u64 egrmirrpcp;</div><div class='add'>+	u64 egrmirrdei;</div><div class='add'>+	u64 replay_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_vlan_lookup_entry {</div><div class='add'>+	u64 ving_mirr;</div><div class='add'>+	u64 vegr_mirr;</div><div class='add'>+	u64 vmemb_port;</div><div class='add'>+	u64 vlan_bc;</div><div class='add'>+	u64 tag_port;</div><div class='add'>+	u64 vlanid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_l2_lookup_entry {</div><div class='add'>+	u64 vlanid;</div><div class='add'>+	u64 macaddr;</div><div class='add'>+	u64 destports;</div><div class='add'>+	u64 enfport;</div><div class='add'>+	u64 index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_l2_lookup_params_entry {</div><div class='add'>+	u64 maxage;          /* Shared */</div><div class='add'>+	u64 dyn_tbsz;        /* E/T only */</div><div class='add'>+	u64 poly;            /* E/T only */</div><div class='add'>+	u64 shared_learn;    /* Shared */</div><div class='add'>+	u64 no_enf_hostprt;  /* Shared */</div><div class='add'>+	u64 no_mgmt_learn;   /* Shared */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_l2_forwarding_entry {</div><div class='add'>+	u64 bc_domain;</div><div class='add'>+	u64 reach_port;</div><div class='add'>+	u64 fl_domain;</div><div class='add'>+	u64 vlan_pmap[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_l2_forwarding_params_entry {</div><div class='add'>+	u64 max_dynp;</div><div class='add'>+	u64 part_spc[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_l2_policing_entry {</div><div class='add'>+	u64 sharindx;</div><div class='add'>+	u64 smax;</div><div class='add'>+	u64 rate;</div><div class='add'>+	u64 maxlen;</div><div class='add'>+	u64 partition;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_mac_config_entry {</div><div class='add'>+	u64 top[8];</div><div class='add'>+	u64 base[8];</div><div class='add'>+	u64 enabled[8];</div><div class='add'>+	u64 ifg;</div><div class='add'>+	u64 speed;</div><div class='add'>+	u64 tp_delin;</div><div class='add'>+	u64 tp_delout;</div><div class='add'>+	u64 maxage;</div><div class='add'>+	u64 vlanprio;</div><div class='add'>+	u64 vlanid;</div><div class='add'>+	u64 ing_mirr;</div><div class='add'>+	u64 egr_mirr;</div><div class='add'>+	u64 drpnona664;</div><div class='add'>+	u64 drpdtag;</div><div class='add'>+	u64 drpuntag;</div><div class='add'>+	u64 retag;</div><div class='add'>+	u64 dyn_learn;</div><div class='add'>+	u64 egress;</div><div class='add'>+	u64 ingress;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_xmii_params_entry {</div><div class='add'>+	u64 phy_mac[5];</div><div class='add'>+	u64 xmii_mode[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_table_header {</div><div class='add'>+	u64 block_id;</div><div class='add'>+	u64 len;</div><div class='add'>+	u64 crc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_table_ops {</div><div class='add'>+	size_t (*packing)(void *buf, void *entry_ptr, enum packing_op op);</div><div class='add'>+	size_t unpacked_entry_size;</div><div class='add'>+	size_t packed_entry_size;</div><div class='add'>+	size_t max_entry_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_table {</div><div class='add'>+	const struct sja1105_table_ops *ops;</div><div class='add'>+	size_t entry_count;</div><div class='add'>+	void *entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_static_config {</div><div class='add'>+	u64 device_id;</div><div class='add'>+	struct sja1105_table tables[BLK_IDX_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX];</div><div class='add'>+</div><div class='add'>+size_t sja1105_table_header_packing(void *buf, void *hdr, enum packing_op op);</div><div class='add'>+void</div><div class='add'>+sja1105_table_header_pack_with_crc(void *buf, struct sja1105_table_header *hdr);</div><div class='add'>+size_t</div><div class='add'>+sja1105_static_config_get_length(const struct sja1105_static_config *config);</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+	SJA1105_CONFIG_OK = 0,</div><div class='add'>+	SJA1105_MISSING_L2_POLICING_TABLE,</div><div class='add'>+	SJA1105_MISSING_L2_FORWARDING_TABLE,</div><div class='add'>+	SJA1105_MISSING_L2_FORWARDING_PARAMS_TABLE,</div><div class='add'>+	SJA1105_MISSING_GENERAL_PARAMS_TABLE,</div><div class='add'>+	SJA1105_MISSING_VLAN_TABLE,</div><div class='add'>+	SJA1105_MISSING_XMII_TABLE,</div><div class='add'>+	SJA1105_MISSING_MAC_TABLE,</div><div class='add'>+	SJA1105_OVERCOMMITTED_FRAME_MEMORY,</div><div class='add'>+} sja1105_config_valid_t;</div><div class='add'>+</div><div class='add'>+extern const char *sja1105_static_config_error_msg[];</div><div class='add'>+</div><div class='add'>+sja1105_config_valid_t</div><div class='add'>+sja1105_static_config_check_valid(const struct sja1105_static_config *config);</div><div class='add'>+void</div><div class='add'>+sja1105_static_config_pack(void *buf, struct sja1105_static_config *config);</div><div class='add'>+int sja1105_static_config_init(struct sja1105_static_config *config,</div><div class='add'>+			       const struct sja1105_table_ops *static_ops,</div><div class='add'>+			       u64 device_id);</div><div class='add'>+void sja1105_static_config_free(struct sja1105_static_config *config);</div><div class='add'>+</div><div class='add'>+int sja1105_table_delete_entry(struct sja1105_table *table, int i);</div><div class='add'>+int sja1105_table_resize(struct sja1105_table *table, size_t new_count);</div><div class='add'>+</div><div class='add'>+u32 sja1105_crc32(const void *buf, size_t len);</div><div class='add'>+</div><div class='add'>+void sja1105_pack(void *buf, const u64 *val, int start, int end, size_t len);</div><div class='add'>+void sja1105_unpack(const void *buf, u64 *val, int start, int end, size_t len);</div><div class='add'>+void sja1105_packing(void *buf, u64 *val, int start, int end,</div><div class='add'>+		     size_t len, enum packing_op op);</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 0d15a12a4560..3568129fb7da 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dummy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/dummy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/dummy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/dummy.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/kernel.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;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='hunk'>@@ -131,21 +132,9 @@ static void dummy_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dummy_get_ts_info(struct net_device *dev,</div><div class='del'>-			      struct ethtool_ts_info *ts_info)</div><div class='del'>-{</div><div class='del'>-	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;phc_index = -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct ethtool_ops dummy_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo            = dummy_get_drvinfo,</div><div class='del'>-	.get_ts_info		= dummy_get_ts_info,</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 dummy_setup(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c<br/>index 808abb6b3671..b15752267c8d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/3com/3c515.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/3com/3c515.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/3com/3c515.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/3com/3c515.c</a></div><div class='hunk'>@@ -1521,7 +1521,7 @@ static void update_stats(int ioaddr, struct net_device *dev)</div><div class='ctx'> static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr;</div><div class='del'>-	short new_mode;</div><div class='add'>+	unsigned short new_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		if (corkscrew_debug &gt; 3)</div><div class='head'>diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c<br/>index 342ae08ec3c2..d60a86aa8aa8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/8390/mac8390.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/8390/mac8390.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/8390/mac8390.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/8390/mac8390.c</a></div><div class='hunk'>@@ -153,8 +153,6 @@ static void dayna_block_input(struct net_device *dev, int count,</div><div class='ctx'> static void dayna_block_output(struct net_device *dev, int count,</div><div class='ctx'> 			       const unsigned char *buf, int start_page);</div><div class='ctx'> </div><div class='del'>-#define memcmp_withio(a, b, c)	memcmp((a), (void *)(b), (c))</div><div class='del'>-</div><div class='ctx'> /* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */</div><div class='ctx'> static void slow_sane_get_8390_hdr(struct net_device *dev,</div><div class='ctx'> 				   struct e8390_pkt_hdr *hdr, int ring_page);</div><div class='hunk'>@@ -233,19 +231,26 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)</div><div class='ctx'> </div><div class='ctx'> static enum mac8390_access mac8390_testio(unsigned long membase)</div><div class='ctx'> {</div><div class='del'>-	unsigned long outdata = 0xA5A0B5B0;</div><div class='del'>-	unsigned long indata =  0x00000000;</div><div class='add'>+	u32 outdata = 0xA5A0B5B0;</div><div class='add'>+	u32 indata = 0;</div><div class='add'>+</div><div class='ctx'> 	/* Try writing 32 bits */</div><div class='del'>-	memcpy_toio((void __iomem *)membase, &amp;outdata, 4);</div><div class='del'>-	/* Now compare them */</div><div class='del'>-	if (memcmp_withio(&amp;outdata, membase, 4) == 0)</div><div class='add'>+	nubus_writel(outdata, membase);</div><div class='add'>+	/* Now read it back */</div><div class='add'>+	indata = nubus_readl(membase);</div><div class='add'>+	if (outdata == indata)</div><div class='ctx'> 		return ACCESS_32;</div><div class='add'>+</div><div class='add'>+	outdata = 0xC5C0D5D0;</div><div class='add'>+	indata = 0;</div><div class='add'>+</div><div class='ctx'> 	/* Write 16 bit output */</div><div class='ctx'> 	word_memcpy_tocard(membase, &amp;outdata, 4);</div><div class='ctx'> 	/* Now read it back */</div><div class='ctx'> 	word_memcpy_fromcard(&amp;indata, membase, 4);</div><div class='ctx'> 	if (outdata == indata)</div><div class='ctx'> 		return ACCESS_16;</div><div class='add'>+</div><div class='ctx'> 	return ACCESS_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c<br/>index 47e5984f16fb..90080a886cd9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aeroflex/greth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aeroflex/greth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aeroflex/greth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aeroflex/greth.c</a></div><div class='hunk'>@@ -613,7 +613,6 @@ static irqreturn_t greth_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		napi_schedule(&amp;greth-&gt;napi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;greth-&gt;devlock);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -1459,7 +1458,7 @@ static int greth_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 		const u8 *addr;</div><div class='ctx'> </div><div class='ctx'> 		addr = of_get_mac_address(ofdev-&gt;dev.of_node);</div><div class='del'>-		if (addr) {</div><div class='add'>+		if (!IS_ERR(addr)) {</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='head'>diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c<br/>index 16477aa6d61f..4f7e792e50e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/alacritech/slicoss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/alacritech/slicoss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/alacritech/slicoss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/alacritech/slicoss.c</a></div><div class='hunk'>@@ -345,8 +345,6 @@ static void slic_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	if (sdev-&gt;promisc != set_promisc) {</div><div class='ctx'> 		sdev-&gt;promisc = set_promisc;</div><div class='ctx'> 		slic_configure_rcv(sdev);</div><div class='del'>-		/* make sure writes to receiver cant leak out of the lock */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;sdev-&gt;link_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1461,8 +1459,6 @@ static netdev_tx_t slic_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (slic_get_free_tx_descs(txq) &lt; SLIC_MAX_REQ_TX_DESCS)</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-	/* make sure writes to io-memory cant leak out of tx queue lock */</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> drop_skb:</div><div class='head'>diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c<br/>index e1acafa82214..37ebd890ef51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/allwinner/sun4i-emac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/allwinner/sun4i-emac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/allwinner/sun4i-emac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/allwinner/sun4i-emac.c</a></div><div class='hunk'>@@ -870,7 +870,7 @@ static int emac_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Read MAC-address from DT */</div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(ndev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the MAC address is valid, if not get a random one */</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 aa1d1f5339d2..877e67f4344b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/altera/altera_tse_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/altera/altera_tse_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/altera/altera_tse_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/altera/altera_tse_main.c</a></div><div class='hunk'>@@ -1537,7 +1537,7 @@ static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* get default MAC address from device tree */</div><div class='ctx'> 	macaddr = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-	if (macaddr)</div><div class='add'>+	if (!IS_ERR(macaddr))</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, macaddr);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(ndev);</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 b17d435de09f..7f8266b191ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amazon/ena/ena_com.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amazon/ena/ena_com.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amazon/ena/ena_com.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/amazon/ena/ena_com.c</a></div><div class='hunk'>@@ -731,7 +731,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		pr_err("Cannot set LLQ configuration: %d\n", rc);</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 int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comp_ctx,</div><div class='hunk'>@@ -2016,7 +2016,6 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)</div><div class='ctx'> 	mb();</div><div class='ctx'> 	writel_relaxed((u32)aenq-&gt;head,</div><div class='ctx'> 		       dev-&gt;reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);</div><div class='del'>-	mmiowb();</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'>@@ -2195,7 +2194,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (get_resp.u.flow_hash_func.supported_func &amp; (1 &lt;&lt; rss-&gt;hash_func)) {</div><div class='add'>+	if (!(get_resp.u.flow_hash_func.supported_func &amp; BIT(rss-&gt;hash_func))) {</div><div class='ctx'> 		pr_err("Func hash %d isn't supported by device, abort\n",</div><div class='ctx'> 		       rss-&gt;hash_func);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -2280,6 +2279,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	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='hunk'>@@ -2802,7 +2802,11 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)</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='del'>-	ena_com_enable_adaptive_moderation(ena_dev);</div><div class='add'>+</div><div class='add'>+	/* Disable adaptive moderation by default - can be enabled from</div><div class='add'>+	 * ethtool</div><div class='add'>+	 */</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'> err:</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 f3a5a384e6e8..fe596bc30a96 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amazon/ena/ena_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amazon/ena/ena_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amazon/ena/ena_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/amazon/ena/ena_ethtool.c</a></div><div class='hunk'>@@ -697,8 +697,8 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,</div><div class='ctx'> 	if (indir) {</div><div class='ctx'> 		for (i = 0; i &lt; ENA_RX_RSS_TABLE_SIZE; i++) {</div><div class='ctx'> 			rc = ena_com_indirect_table_fill_entry(ena_dev,</div><div class='del'>-							       ENA_IO_RXQ_IDX(indir[i]),</div><div class='del'>-							       i);</div><div class='add'>+							       i,</div><div class='add'>+							       ENA_IO_RXQ_IDX(indir[i]));</div><div class='ctx'> 			if (unlikely(rc)) {</div><div class='ctx'> 				netif_err(adapter, drv, netdev,</div><div class='ctx'> 					  "Cannot fill indirect table (index is too large)\n");</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 a6eacf2099c3..9c83642922c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amazon/ena/ena_netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amazon/ena/ena_netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amazon/ena/ena_netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/amazon/ena/ena_netdev.c</a></div><div class='hunk'>@@ -224,28 +224,23 @@ static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	if (!tx_ring-&gt;tx_buffer_info) {</div><div class='ctx'> 		tx_ring-&gt;tx_buffer_info = vzalloc(size);</div><div class='ctx'> 		if (!tx_ring-&gt;tx_buffer_info)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			goto err_tx_buffer_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(u16) * tx_ring-&gt;ring_size;</div><div class='ctx'> 	tx_ring-&gt;free_tx_ids = vzalloc_node(size, node);</div><div class='ctx'> 	if (!tx_ring-&gt;free_tx_ids) {</div><div class='ctx'> 		tx_ring-&gt;free_tx_ids = vzalloc(size);</div><div class='del'>-		if (!tx_ring-&gt;free_tx_ids) {</div><div class='del'>-			vfree(tx_ring-&gt;tx_buffer_info);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+		if (!tx_ring-&gt;free_tx_ids)</div><div class='add'>+			goto err_free_tx_ids;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = tx_ring-&gt;tx_max_header_size;</div><div class='ctx'> 	tx_ring-&gt;push_buf_intermediate_buf = vzalloc_node(size, node);</div><div class='ctx'> 	if (!tx_ring-&gt;push_buf_intermediate_buf) {</div><div class='ctx'> 		tx_ring-&gt;push_buf_intermediate_buf = vzalloc(size);</div><div class='del'>-		if (!tx_ring-&gt;push_buf_intermediate_buf) {</div><div class='del'>-			vfree(tx_ring-&gt;tx_buffer_info);</div><div class='del'>-			vfree(tx_ring-&gt;free_tx_ids);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+		if (!tx_ring-&gt;push_buf_intermediate_buf)</div><div class='add'>+			goto err_push_buf_intermediate_buf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Req id ring for TX out of order completions */</div><div class='hunk'>@@ -259,6 +254,15 @@ static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid)</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='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_push_buf_intermediate_buf:</div><div class='add'>+	vfree(tx_ring-&gt;free_tx_ids);</div><div class='add'>+	tx_ring-&gt;free_tx_ids = NULL;</div><div class='add'>+err_free_tx_ids:</div><div class='add'>+	vfree(tx_ring-&gt;tx_buffer_info);</div><div class='add'>+	tx_ring-&gt;tx_buffer_info = NULL;</div><div class='add'>+err_tx_buffer_info:</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ena_free_tx_resources - Free I/O Tx Resources per Queue</div><div class='hunk'>@@ -378,6 +382,7 @@ static int ena_setup_rx_resources(struct ena_adapter *adapter,</div><div class='ctx'> 		rx_ring-&gt;free_rx_ids = vzalloc(size);</div><div class='ctx'> 		if (!rx_ring-&gt;free_rx_ids) {</div><div class='ctx'> 			vfree(rx_ring-&gt;rx_buffer_info);</div><div class='add'>+			rx_ring-&gt;rx_buffer_info = NULL;</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1820,6 +1825,7 @@ err_setup_rx:</div><div class='ctx'> err_setup_tx:</div><div class='ctx'> 	ena_free_io_irq(adapter);</div><div class='ctx'> err_req_irq:</div><div class='add'>+	ena_del_napi(adapter);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2236,7 +2242,7 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netif_xmit_stopped(txq) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txq) || !netdev_xmit_more()) {</div><div class='ctx'> 		/* trigger the dma engine. ena_com_write_sq_doorbell()</div><div class='ctx'> 		 * has a mb</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2258,8 +2264,7 @@ error_drop_packet:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> 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'>-			    select_queue_fallback_t fallback)</div><div class='add'>+			    struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 qid;</div><div class='ctx'> 	/* we suspect that this is good for in--kernel network services that</div><div class='hunk'>@@ -2269,7 +2274,7 @@ static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	if (skb_rx_queue_recorded(skb))</div><div class='ctx'> 		qid = skb_get_rx_queue(skb);</div><div class='ctx'> 	else</div><div class='del'>-		qid = fallback(dev, skb, NULL);</div><div class='add'>+		qid = netdev_pick_tx(dev, skb, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return qid;</div><div class='ctx'> }</div><div class='hunk'>@@ -2292,7 +2297,7 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	host_info-&gt;bdf = (pdev-&gt;bus-&gt;number &lt;&lt; 8) | pdev-&gt;devfn;</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'>-	strncpy(host_info-&gt;kernel_ver_str, utsname()-&gt;version,</div><div class='add'>+	strlcpy(host_info-&gt;kernel_ver_str, utsname()-&gt;version,</div><div class='ctx'> 		sizeof(host_info-&gt;kernel_ver_str) - 1);</div><div class='ctx'> 	host_info-&gt;os_dist = 0;</div><div class='ctx'> 	strncpy(host_info-&gt;os_dist_str, utsname()-&gt;release,</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 4666084eda16..d5fd49dd25f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amd/xgbe/xgbe-dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/amd/xgbe/xgbe-dev.c</a></div><div class='hunk'>@@ -1887,7 +1887,7 @@ static void xgbe_dev_xmit(struct xgbe_channel *channel)</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;cur = cur_index + 1;</div><div class='del'>-	if (!packet-&gt;skb-&gt;xmit_more ||</div><div class='add'>+	if (!netdev_xmit_more() ||</div><div class='ctx'> 	    netif_xmit_stopped(netdev_get_tx_queue(pdata-&gt;netdev,</div><div class='ctx'> 						   channel-&gt;queue_index)))</div><div class='ctx'> 		xgbe_tx_start_xmit(channel, ring);</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 0cc911f928b1..3dd0cecddba8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/amd/xgbe/xgbe-drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/amd/xgbe/xgbe-drv.c</a></div><div class='hunk'>@@ -1612,7 +1612,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	/* PTP v2, UDP, any kind of event packet */</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-	/* PTP v1, UDP, any kind of event packet */</div><div class='add'>+		/* Fall through - to PTP v1, UDP, any kind of event packet */</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='hunk'>@@ -1623,7 +1623,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	/* PTP v2, UDP, Sync packet */</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-	/* PTP v1, UDP, Sync packet */</div><div class='add'>+		/* Fall through - to PTP v1, UDP, Sync packet */</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='hunk'>@@ -1634,7 +1634,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	/* PTP v2, UDP, Delay_req packet */</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-	/* PTP v1, UDP, Delay_req packet */</div><div class='add'>+		/* Fall through - to PTP v1, UDP, Delay_req packet */</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='ctx'> 		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/Kconfig b/drivers/net/ethernet/aquantia/Kconfig<br/>index 7d623e90dc19..12472c5bb34d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/Kconfig</a></div><div class='hunk'>@@ -17,7 +17,8 @@ if NET_VENDOR_AQUANTIA</div><div class='ctx'> </div><div class='ctx'> config AQTION</div><div class='ctx'> 	tristate "aQuantia AQtion(tm) Support"</div><div class='del'>-	depends on PCI &amp;&amp; X86_64</div><div class='add'>+	depends on PCI</div><div class='add'>+	depends on X86_64 || ARM64 || COMPILE_TEST</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This enables the support for the aQuantia AQtion(tm) Ethernet card.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/Makefile b/drivers/net/ethernet/aquantia/atlantic/Makefile<br/>index 4556630ee286..1f99cf832476 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/Makefile</a></div><div class='hunk'>@@ -36,6 +36,7 @@ atlantic-objs := aq_main.o \</div><div class='ctx'> 	aq_ring.o \</div><div class='ctx'> 	aq_hw_utils.o \</div><div class='ctx'> 	aq_ethtool.o \</div><div class='add'>+	aq_drvinfo.o \</div><div class='ctx'> 	aq_filters.o \</div><div class='ctx'> 	hw_atl/hw_atl_a0.o \</div><div class='ctx'> 	hw_atl/hw_atl_b0.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 3944ce7f0870..8f35c3f883f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #define AQ_CFG_TCS_DEF    1U</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_TXDS_DEF    4096U</div><div class='del'>-#define AQ_CFG_RXDS_DEF    1024U</div><div class='add'>+#define AQ_CFG_RXDS_DEF    2048U</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_IS_POLLING_DEF 0U</div><div class='ctx'> </div><div class='hunk'>@@ -34,10 +34,16 @@</div><div class='ctx'> #define AQ_CFG_TCS_MAX    8U</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_TX_FRAME_MAX  (16U * 1024U)</div><div class='del'>-#define AQ_CFG_RX_FRAME_MAX  (4U * 1024U)</div><div class='add'>+#define AQ_CFG_RX_FRAME_MAX  (2U * 1024U)</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_TX_CLEAN_BUDGET 256U</div><div class='ctx'> </div><div class='add'>+#define AQ_CFG_RX_REFILL_THRES 32U</div><div class='add'>+</div><div class='add'>+#define AQ_CFG_RX_HDR_SIZE 256U</div><div class='add'>+</div><div class='add'>+#define AQ_CFG_RX_PAGEORDER 0U</div><div class='add'>+</div><div class='ctx'> /* LRO */</div><div class='ctx'> #define AQ_CFG_IS_LRO_DEF           1U</div><div class='ctx'> </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 6b6d1724676e..235bb3a72d66 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_common.h</a></div><div class='hunk'>@@ -41,9 +41,6 @@</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 AQ_DEVICE_ID_AQC111E	0x51B1</div><div class='del'>-#define AQ_DEVICE_ID_AQC112E	0x52B1</div><div class='del'>-</div><div class='ctx'> #define HW_ATL_NIC_NAME "aQuantia AQtion 10Gbit Network Adapter"</div><div class='ctx'> </div><div class='ctx'> #define AQ_HWREV_ANY	0</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/>new file mode 100644<br/>index 000000000000..f5a92b2a5cd6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Copyright (C) 2014-2019 aQuantia Corporation. */</div><div class='add'>+</div><div class='add'>+/* File aq_drvinfo.c: Definition of common code for firmware info in sys.*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include "aq_drvinfo.h"</div><div class='add'>+</div><div class='add'>+static int aq_hwmon_read(struct device *dev, enum hwmon_sensor_types type,</div><div class='add'>+			 u32 attr, int channel, long *value)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = dev_get_drvdata(dev);</div><div class='add'>+	int temp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!aq_nic)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (type != hwmon_temp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case hwmon_temp_input:</div><div class='add'>+		err = aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp(aq_nic-&gt;aq_hw, &amp;temp);</div><div class='add'>+		*value = temp;</div><div class='add'>+		return err;</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 aq_hwmon_read_string(struct device *dev,</div><div class='add'>+				enum hwmon_sensor_types type,</div><div class='add'>+				u32 attr, int channel, const char **str)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (!aq_nic)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (type != hwmon_temp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case hwmon_temp_label:</div><div class='add'>+		*str = "PHY Temperature";</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 umode_t aq_hwmon_is_visible(const void *data,</div><div class='add'>+				   enum hwmon_sensor_types type,</div><div class='add'>+				   u32 attr, int channel)</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'>+	case hwmon_temp_label:</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 const struct hwmon_ops aq_hwmon_ops = {</div><div class='add'>+	.is_visible = aq_hwmon_is_visible,</div><div class='add'>+	.read = aq_hwmon_read,</div><div class='add'>+	.read_string = aq_hwmon_read_string,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 aq_hwmon_temp_config[] = {</div><div class='add'>+	HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='add'>+	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_channel_info aq_hwmon_temp = {</div><div class='add'>+	.type = hwmon_temp,</div><div class='add'>+	.config = aq_hwmon_temp_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_channel_info *aq_hwmon_info[] = {</div><div class='add'>+	&amp;aq_hwmon_temp,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_chip_info aq_hwmon_chip_info = {</div><div class='add'>+	.ops = &amp;aq_hwmon_ops,</div><div class='add'>+	.info = aq_hwmon_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int aq_drvinfo_init(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'>+	struct device *dev = &amp;aq_nic-&gt;pdev-&gt;dev;</div><div class='add'>+	struct device *hwmon_dev;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	hwmon_dev = devm_hwmon_device_register_with_info(dev,</div><div class='add'>+							 ndev-&gt;name,</div><div class='add'>+							 aq_nic,</div><div class='add'>+							 &amp;aq_hwmon_chip_info,</div><div class='add'>+							 NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(hwmon_dev))</div><div class='add'>+		err = PTR_ERR(hwmon_dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</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/>new file mode 100644<br/>index 000000000000..41fbb1358068<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Copyright (C) 2014-2017 aQuantia Corporation. */</div><div class='add'>+</div><div class='add'>+/* File aq_drvinfo.h: Declaration of common code for firmware info in sys.*/</div><div class='add'>+</div><div class='add'>+#ifndef AQ_DRVINFO_H</div><div class='add'>+#define AQ_DRVINFO_H</div><div class='add'>+</div><div class='add'>+#include "aq_nic.h"</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+#include "hw_atl/hw_atl_utils.h"</div><div class='add'>+</div><div class='add'>+int aq_drvinfo_init(struct net_device *ndev);</div><div class='add'>+</div><div class='add'>+#endif /* AQ_DRVINFO_H */</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 a718d7a1f76c..79da48094770 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a></div><div class='hunk'>@@ -405,8 +405,10 @@ static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_eee *eee)</div><div class='ctx'> 	if (!aq_nic-&gt;aq_fw_ops-&gt;get_eee_rate)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='ctx'> 	err = aq_nic-&gt;aq_fw_ops-&gt;get_eee_rate(aq_nic-&gt;aq_hw, &amp;rate,</div><div class='ctx'> 					      &amp;supported_rates);</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -439,8 +441,10 @@ static int aq_ethtool_set_eee(struct net_device *ndev, struct ethtool_eee *eee)</div><div class='ctx'> 		     !aq_nic-&gt;aq_fw_ops-&gt;set_eee_rate))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='ctx'> 	err = aq_nic-&gt;aq_fw_ops-&gt;get_eee_rate(aq_nic-&gt;aq_hw, &amp;rate,</div><div class='ctx'> 					      &amp;supported_rates);</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -452,20 +456,28 @@ static int aq_ethtool_set_eee(struct net_device *ndev, struct ethtool_eee *eee)</div><div class='ctx'> 		cfg-&gt;eee_speeds = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return aq_nic-&gt;aq_fw_ops-&gt;set_eee_rate(aq_nic-&gt;aq_hw, rate);</div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+	err = aq_nic-&gt;aq_fw_ops-&gt;set_eee_rate(aq_nic-&gt;aq_hw, rate);</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</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_ethtool_nway_reset(struct net_device *ndev)</div><div class='ctx'> {</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'> 	if (unlikely(!aq_nic-&gt;aq_fw_ops-&gt;renegotiate))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(ndev))</div><div class='del'>-		return aq_nic-&gt;aq_fw_ops-&gt;renegotiate(aq_nic-&gt;aq_hw);</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+		err = aq_nic-&gt;aq_fw_ops-&gt;renegotiate(aq_nic-&gt;aq_hw);</div><div class='add'>+		mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+	}</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'> static void aq_ethtool_get_pauseparam(struct net_device *ndev,</div><div class='hunk'>@@ -503,7 +515,9 @@ static int aq_ethtool_set_pauseparam(struct net_device *ndev,</div><div class='ctx'> 	else</div><div class='ctx'> 		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;flow_control &amp;= ~AQ_NIC_FC_TX;</div><div class='ctx'> </div><div class='add'>+	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='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</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 81aab73dc22f..95fd6c852a9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_hw.h</a></div><div class='hunk'>@@ -88,6 +88,8 @@ struct aq_stats_s {</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='add'>+#define AQ_HW_SERVICE_IRQS   1U</div><div class='add'>+</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='hunk'>@@ -259,6 +261,8 @@ 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_phy_temp)(struct aq_hw_s *self, int *temp);</div><div class='add'>+</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='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 d526c4f19d34..22a1c784dc9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a></div><div class='hunk'>@@ -53,6 +53,18 @@ void aq_hw_write_reg(struct aq_hw_s *hw, u32 reg, u32 value)</div><div class='ctx'> 	writel(value, hw-&gt;mmio + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Most of 64-bit registers are in LSW, MSW form.</div><div class='add'>+   Counters are normally implemented by HW as latched pairs:</div><div class='add'>+   reading LSW first locks MSW, to overcome LSW overflow</div><div class='add'>+ */</div><div class='add'>+u64 aq_hw_read_reg64(struct aq_hw_s *hw, u32 reg)</div><div class='add'>+{</div><div class='add'>+	u64 value = aq_hw_read_reg(hw, reg);</div><div class='add'>+</div><div class='add'>+	value |= (u64)aq_hw_read_reg(hw, reg + 4) &lt;&lt; 32;</div><div class='add'>+	return value;</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='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 bc711238ca0c..bf73428ed689 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@ void aq_hw_write_reg_bit(struct aq_hw_s *aq_hw, u32 addr, u32 msk,</div><div class='ctx'> 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='add'>+u64 aq_hw_read_reg64(struct aq_hw_s *hw, u32 reg);</div><div class='ctx'> int aq_hw_err_from_flags(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_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c<br/>index 2a11c1eefd8f..1ea8b77fc1a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_main.c</a></div><div class='hunk'>@@ -23,8 +23,17 @@ 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'>+static const char aq_ndev_driver_name[] = AQ_CFG_DRV_NAME;</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops aq_ndev_ops;</div><div class='ctx'> </div><div class='add'>+static struct workqueue_struct *aq_ndev_wq;</div><div class='add'>+</div><div class='add'>+void aq_ndev_schedule_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	queue_work(aq_ndev_wq, work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct net_device *aq_ndev_alloc(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = NULL;</div><div class='hunk'>@@ -209,3 +218,35 @@ static const struct net_device_ops aq_ndev_ops = {</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='ctx'> };</div><div class='add'>+</div><div class='add'>+static int __init aq_ndev_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	aq_ndev_wq = create_singlethread_workqueue(aq_ndev_driver_name);</div><div class='add'>+	if (!aq_ndev_wq) {</div><div class='add'>+		pr_err("Failed to create workqueue\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = aq_pci_func_register_driver();</div><div class='add'>+	if (ret) {</div><div class='add'>+		destroy_workqueue(aq_ndev_wq);</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 aq_ndev_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	aq_pci_func_unregister_driver();</div><div class='add'>+</div><div class='add'>+	if (aq_ndev_wq) {</div><div class='add'>+		destroy_workqueue(aq_ndev_wq);</div><div class='add'>+		aq_ndev_wq = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(aq_ndev_init_module);</div><div class='add'>+module_exit(aq_ndev_exit_module);</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 ce92152eb43e..5448b82fb7ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_main.h</a></div><div class='hunk'>@@ -13,7 +13,9 @@</div><div class='ctx'> #define AQ_MAIN_H</div><div class='ctx'> </div><div class='ctx'> #include "aq_common.h"</div><div class='add'>+#include "aq_nic.h"</div><div class='ctx'> </div><div class='add'>+void aq_ndev_schedule_work(struct work_struct *work);</div><div class='ctx'> struct net_device *aq_ndev_alloc(void);</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 ff83667410bd..e82d25a91bc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</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_main.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'>@@ -73,6 +74,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self)</div><div class='ctx'> 	cfg-&gt;tx_itr = aq_itr_tx;</div><div class='ctx'> 	cfg-&gt;rx_itr = aq_itr_rx;</div><div class='ctx'> </div><div class='add'>+	cfg-&gt;rxpageorder = AQ_CFG_RX_PAGEORDER;</div><div class='ctx'> 	cfg-&gt;is_rss = AQ_CFG_IS_RSS_DEF;</div><div class='ctx'> 	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='hunk'>@@ -91,7 +93,8 @@ void aq_nic_cfg_start(struct aq_nic_s *self)</div><div class='ctx'> 	/*rss rings */</div><div class='ctx'> 	cfg-&gt;vecs = min(cfg-&gt;aq_hw_caps-&gt;vecs, AQ_CFG_VECS_DEF);</div><div class='ctx'> 	cfg-&gt;vecs = min(cfg-&gt;vecs, num_online_cpus());</div><div class='del'>-	cfg-&gt;vecs = min(cfg-&gt;vecs, self-&gt;irqvecs);</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='ctx'> 	/* cfg-&gt;vecs should be power of 2 for RSS */</div><div class='ctx'> 	if (cfg-&gt;vecs &gt;= 8U)</div><div class='ctx'> 		cfg-&gt;vecs = 8U;</div><div class='hunk'>@@ -115,6 +118,15 @@ void aq_nic_cfg_start(struct aq_nic_s *self)</div><div class='ctx'> 		cfg-&gt;vecs = 1U;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Check if we have enough vectors allocated for</div><div class='add'>+	 * link status IRQ. If no - we'll know link state from</div><div class='add'>+	 * slower service task.</div><div class='add'>+	 */</div><div class='add'>+	if (AQ_HW_SERVICE_IRQS &gt; 0 &amp;&amp; cfg-&gt;vecs + 1 &lt;= self-&gt;irqvecs)</div><div class='add'>+		cfg-&gt;link_irq_vec = cfg-&gt;vecs;</div><div class='add'>+	else</div><div class='add'>+		cfg-&gt;link_irq_vec = 0;</div><div class='add'>+</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='ctx'> }</div><div class='hunk'>@@ -160,30 +172,48 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void aq_nic_service_timer_cb(struct timer_list *t)</div><div class='add'>+static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *self = from_timer(self, t, service_timer);</div><div class='del'>-	int ctimer = AQ_CFG_SERVICE_TIMER_INTERVAL;</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct aq_nic_s *self = private;</div><div class='add'>+</div><div class='add'>+	if (!self)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	aq_nic_update_link_status(self);</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_hw_ops-&gt;hw_irq_enable(self-&gt;aq_hw,</div><div class='add'>+				       BIT(self-&gt;aq_nic_cfg.link_irq_vec));</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_nic_service_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *self = container_of(work, struct aq_nic_s,</div><div class='add'>+					     service_task);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (aq_utils_obj_test(&amp;self-&gt;flags, AQ_NIC_FLAGS_IS_NOT_READY))</div><div class='del'>-		goto err_exit;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	err = aq_nic_update_link_status(self);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_exit;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	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='add'>+	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> </div><div class='ctx'> 	aq_nic_update_ndev_stats(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_nic_service_timer_cb(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *self = from_timer(self, t, service_timer);</div><div class='ctx'> </div><div class='del'>-	/* If no link - use faster timer rate to detect link up asap */</div><div class='del'>-	if (!netif_carrier_ok(self-&gt;ndev))</div><div class='del'>-		ctimer = max(ctimer / 2, 1);</div><div class='add'>+	mod_timer(&amp;self-&gt;service_timer, jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='del'>-	mod_timer(&amp;self-&gt;service_timer, jiffies + ctimer);</div><div class='add'>+	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='hunk'>@@ -213,8 +243,10 @@ int aq_nic_ndev_register(struct aq_nic_s *self)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	err = self-&gt;aq_fw_ops-&gt;get_mac_permanent(self-&gt;aq_hw,</div><div class='ctx'> 			    self-&gt;ndev-&gt;dev_addr);</div><div class='add'>+	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +315,9 @@ int aq_nic_init(struct aq_nic_s *self)</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;power_state = AQ_HW_POWER_STATE_D0;</div><div class='add'>+	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	err = self-&gt;aq_hw_ops-&gt;hw_reset(self-&gt;aq_hw);</div><div class='add'>+	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='ctx'> </div><div class='hunk'>@@ -333,9 +367,11 @@ int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> 	err = aq_nic_update_interrupt_moderation_settings(self);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_exit;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;self-&gt;service_task, aq_nic_service_task);</div><div class='add'>+</div><div class='ctx'> 	timer_setup(&amp;self-&gt;service_timer, aq_nic_service_timer_cb, 0);</div><div class='del'>-	mod_timer(&amp;self-&gt;service_timer, jiffies +</div><div class='del'>-		  AQ_CFG_SERVICE_TIMER_INTERVAL);</div><div class='add'>+	aq_nic_service_timer_cb(&amp;self-&gt;service_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;aq_nic_cfg.is_polling) {</div><div class='ctx'> 		timer_setup(&amp;self-&gt;polling_timer, aq_nic_polling_timer_cb, 0);</div><div class='hunk'>@@ -344,13 +380,25 @@ int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='ctx'> 			self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i]) {</div><div class='del'>-			err = aq_pci_func_alloc_irq(self, i,</div><div class='del'>-						    self-&gt;ndev-&gt;name, aq_vec,</div><div class='add'>+			err = aq_pci_func_alloc_irq(self, i, self-&gt;ndev-&gt;name,</div><div class='add'>+						    aq_vec_isr, aq_vec,</div><div class='ctx'> 						    aq_vec_get_affinity_mask(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'>+		if (self-&gt;aq_nic_cfg.link_irq_vec) {</div><div class='add'>+			int irqvec = pci_irq_vector(self-&gt;pdev,</div><div class='add'>+						   self-&gt;aq_nic_cfg.link_irq_vec);</div><div class='add'>+			err = request_threaded_irq(irqvec, NULL,</div><div class='add'>+						   aq_linkstate_threaded_isr,</div><div class='add'>+						   IRQF_SHARED,</div><div class='add'>+						   self-&gt;ndev-&gt;name, self);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_exit;</div><div class='add'>+			self-&gt;msix_entry_mask |= (1 &lt;&lt; self-&gt;aq_nic_cfg.link_irq_vec);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		err = self-&gt;aq_hw_ops-&gt;hw_irq_enable(self-&gt;aq_hw,</div><div class='ctx'> 						     AQ_CFG_IRQ_MASK);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -652,7 +700,14 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> 	unsigned int count = 0U;</div><div class='ctx'> 	struct aq_vec_s *aq_vec = NULL;</div><div class='del'>-	struct aq_stats_s *stats = self-&gt;aq_hw_ops-&gt;hw_get_hw_stats(self-&gt;aq_hw);</div><div class='add'>+	struct aq_stats_s *stats;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_fw_ops-&gt;update_stats) {</div><div class='add'>+		mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+		self-&gt;aq_fw_ops-&gt;update_stats(self-&gt;aq_hw);</div><div class='add'>+		mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+	}</div><div class='add'>+	stats = self-&gt;aq_hw_ops-&gt;hw_get_hw_stats(self-&gt;aq_hw);</div><div class='ctx'> </div><div class='ctx'> 	if (!stats)</div><div class='ctx'> 		goto err_exit;</div><div class='hunk'>@@ -698,11 +753,12 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self)</div><div class='ctx'> 	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='ctx'> </div><div class='del'>-	ndev-&gt;stats.rx_packets = stats-&gt;uprc + stats-&gt;mprc + stats-&gt;bprc;</div><div class='del'>-	ndev-&gt;stats.rx_bytes = stats-&gt;ubrc + stats-&gt;mbrc + stats-&gt;bbrc;</div><div class='add'>+	ndev-&gt;stats.rx_packets = stats-&gt;dma_pkt_rc;</div><div class='add'>+	ndev-&gt;stats.rx_bytes = stats-&gt;dma_oct_rc;</div><div class='ctx'> 	ndev-&gt;stats.rx_errors = stats-&gt;erpr;</div><div class='del'>-	ndev-&gt;stats.tx_packets = stats-&gt;uptc + stats-&gt;mptc + stats-&gt;bptc;</div><div class='del'>-	ndev-&gt;stats.tx_bytes = stats-&gt;ubtc + stats-&gt;mbtc + stats-&gt;bbtc;</div><div class='add'>+	ndev-&gt;stats.rx_dropped = stats-&gt;dpc;</div><div class='add'>+	ndev-&gt;stats.tx_packets = stats-&gt;dma_pkt_tc;</div><div class='add'>+	ndev-&gt;stats.tx_bytes = stats-&gt;dma_oct_tc;</div><div class='ctx'> 	ndev-&gt;stats.tx_errors = stats-&gt;erpt;</div><div class='ctx'> 	ndev-&gt;stats.multicast = stats-&gt;mprc;</div><div class='ctx'> }</div><div class='hunk'>@@ -839,7 +895,9 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 		self-&gt;aq_nic_cfg.is_autoneg = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	err = self-&gt;aq_fw_ops-&gt;set_link_speed(self-&gt;aq_hw, rate);</div><div class='add'>+	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='ctx'> </div><div class='hunk'>@@ -872,6 +930,7 @@ int aq_nic_stop(struct aq_nic_s *self)</div><div class='ctx'> 	netif_carrier_off(self-&gt;ndev);</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;self-&gt;service_timer);</div><div class='add'>+	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='hunk'>@@ -899,14 +958,22 @@ void aq_nic_deinit(struct aq_nic_s *self)</div><div class='ctx'> 		self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i])</div><div class='ctx'> 		aq_vec_deinit(aq_vec);</div><div class='ctx'> </div><div class='del'>-	self-&gt;aq_fw_ops-&gt;deinit(self-&gt;aq_hw);</div><div class='add'>+	if (likely(self-&gt;aq_fw_ops-&gt;deinit)) {</div><div class='add'>+		mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+		self-&gt;aq_fw_ops-&gt;deinit(self-&gt;aq_hw);</div><div class='add'>+		mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	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'>-		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'>-	}</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='ctx'> </div><div class='ctx'> err_exit:;</div><div class='ctx'> }</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 8e34c1e49bf2..c03d38ed105d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_nic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_nic.h</a></div><div class='hunk'>@@ -26,11 +26,13 @@ struct aq_nic_cfg_s {</div><div class='ctx'> 	u64 features;</div><div class='ctx'> 	u32 rxds;		/* rx ring size, descriptors # */</div><div class='ctx'> 	u32 txds;		/* tx ring size, descriptors # */</div><div class='del'>-	u32 vecs;		/* vecs==allocated irqs */</div><div class='add'>+	u32 vecs;		/* allocated rx/tx vectors */</div><div class='add'>+	u32 link_irq_vec;</div><div class='ctx'> 	u32 irq_type;</div><div class='ctx'> 	u32 itr;</div><div class='ctx'> 	u16 rx_itr;</div><div class='ctx'> 	u16 tx_itr;</div><div class='add'>+	u32 rxpageorder;</div><div class='ctx'> 	u32 num_rss_queues;</div><div class='ctx'> 	u32 mtu;</div><div class='ctx'> 	u32 flow_control;</div><div class='hunk'>@@ -91,6 +93,7 @@ struct aq_nic_s {</div><div class='ctx'> 	const struct aq_fw_ops *aq_fw_ops;</div><div class='ctx'> 	struct aq_nic_cfg_s aq_nic_cfg;</div><div class='ctx'> 	struct timer_list service_timer;</div><div class='add'>+	struct work_struct service_task;</div><div class='ctx'> 	struct timer_list polling_timer;</div><div class='ctx'> 	struct aq_hw_link_status_s link_status;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -103,6 +106,8 @@ struct aq_nic_s {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	unsigned int msix_entry_mask;</div><div class='ctx'> 	u32 irqvecs;</div><div class='add'>+	/* mutex to serialize FW interface access operations */</div><div class='add'>+	struct mutex fwreq_mutex;</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='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 0217ff4669a4..9cb0864d6d8d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</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='ctx'> #include "aq_filters.h"</div><div class='add'>+#include "aq_drvinfo.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'>@@ -42,9 +43,6 @@ 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='del'>-	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC111E), },</div><div class='del'>-	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC112E), },</div><div class='del'>-</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -74,9 +72,6 @@ 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='del'>-</div><div class='del'>-	{ AQ_DEVICE_ID_AQC111E,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc111e, },</div><div class='del'>-	{ AQ_DEVICE_ID_AQC112E,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc112e, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, aq_pci_tbl);</div><div class='hunk'>@@ -139,26 +134,27 @@ err_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int aq_pci_func_alloc_irq(struct aq_nic_s *self, unsigned int i,</div><div class='del'>-			  char *name, void *aq_vec, cpumask_t *affinity_mask)</div><div class='add'>+			  char *name, irq_handler_t irq_handler,</div><div class='add'>+			  void *irq_arg, cpumask_t *affinity_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = self-&gt;pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;msix_enabled || pdev-&gt;msi_enabled)</div><div class='del'>-		err = request_irq(pci_irq_vector(pdev, i), aq_vec_isr, 0,</div><div class='del'>-				  name, aq_vec);</div><div class='add'>+		err = request_irq(pci_irq_vector(pdev, i), irq_handler, 0,</div><div class='add'>+				  name, irq_arg);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = request_irq(pci_irq_vector(pdev, i), aq_vec_isr_legacy,</div><div class='del'>-				  IRQF_SHARED, name, aq_vec);</div><div class='add'>+				  IRQF_SHARED, name, irq_arg);</div><div class='ctx'> </div><div class='ctx'> 	if (err &gt;= 0) {</div><div class='ctx'> 		self-&gt;msix_entry_mask |= (1 &lt;&lt; i);</div><div class='del'>-		self-&gt;aq_vec[i] = aq_vec;</div><div class='ctx'> </div><div class='del'>-		if (pdev-&gt;msix_enabled)</div><div class='add'>+		if (pdev-&gt;msix_enabled &amp;&amp; affinity_mask)</div><div class='ctx'> 			irq_set_affinity_hint(pci_irq_vector(pdev, i),</div><div class='ctx'> 					      affinity_mask);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -166,16 +162,22 @@ void aq_pci_func_free_irqs(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = self-&gt;pdev;</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	void *irq_data;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 32U; i--;) {</div><div class='ctx'> 		if (!((1U &lt;&lt; i) &amp; self-&gt;msix_entry_mask))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (i &gt;= AQ_CFG_VECS_MAX)</div><div class='add'>+		if (self-&gt;aq_nic_cfg.link_irq_vec &amp;&amp;</div><div class='add'>+		    i == self-&gt;aq_nic_cfg.link_irq_vec)</div><div class='add'>+			irq_data = self;</div><div class='add'>+		else if (i &lt; AQ_CFG_VECS_MAX)</div><div class='add'>+			irq_data = self-&gt;aq_vec[i];</div><div class='add'>+		else</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;msix_enabled)</div><div class='ctx'> 			irq_set_affinity_hint(pci_irq_vector(pdev, i), NULL);</div><div class='del'>-		free_irq(pci_irq_vector(pdev, i), self-&gt;aq_vec[i]);</div><div class='add'>+		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='ctx'> }</div><div class='hunk'>@@ -185,7 +187,7 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self)</div><div class='ctx'> 	if (self-&gt;pdev-&gt;msix_enabled)</div><div class='ctx'> 		return AQ_HW_IRQ_MSIX;</div><div class='ctx'> 	if (self-&gt;pdev-&gt;msi_enabled)</div><div class='del'>-		return AQ_HW_IRQ_MSIX;</div><div class='add'>+		return AQ_HW_IRQ_MSI;</div><div class='ctx'> 	return AQ_HW_IRQ_LEGACY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -223,6 +225,8 @@ static int aq_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, self);</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='ctx'> 	err = aq_pci_probe_get_hw_by_id(pdev, &amp;self-&gt;aq_hw_ops,</div><div class='ctx'> 					&amp;aq_nic_get_cfg(self)-&gt;aq_hw_caps);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -268,6 +272,7 @@ static int aq_pci_probe(struct pci_dev *pdev,</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'>+	numvecs += AQ_HW_SERVICE_IRQS;</div><div class='ctx'> 	/*enable interrupts */</div><div class='ctx'> #if !AQ_CFG_FORCE_LEGACY_INT</div><div class='ctx'> 	err = pci_alloc_irq_vectors(self-&gt;pdev, 1, numvecs,</div><div class='hunk'>@@ -289,6 +294,8 @@ static int aq_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_register;</div><div class='ctx'> </div><div class='add'>+	aq_drvinfo_init(ndev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='hunk'>@@ -365,4 +372,13 @@ static struct pci_driver aq_pci_ops = {</div><div class='ctx'> 	.shutdown = aq_pci_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_pci_driver(aq_pci_ops);</div><div class='add'>+int aq_pci_func_register_driver(void)</div><div class='add'>+{</div><div class='add'>+	return pci_register_driver(&amp;aq_pci_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_pci_func_unregister_driver(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;aq_pci_ops);</div><div class='add'>+}</div><div class='add'>+</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 aeee67bf69fa..670f9a940d65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h</a></div><div class='hunk'>@@ -24,9 +24,12 @@ struct aq_board_revision_s {</div><div class='ctx'> </div><div class='ctx'> 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='del'>-			  char *name, void *aq_vec,</div><div class='del'>-			  cpumask_t *affinity_mask);</div><div class='add'>+			  char *name, irq_handler_t irq_handler,</div><div class='add'>+			  void *irq_arg, cpumask_t *affinity_mask);</div><div class='ctx'> void aq_pci_func_free_irqs(struct aq_nic_s *self);</div><div class='ctx'> unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self);</div><div class='ctx'> </div><div class='add'>+int aq_pci_func_register_driver(void);</div><div class='add'>+void aq_pci_func_unregister_driver(void);</div><div class='add'>+</div><div class='ctx'> #endif /* AQ_PCI_FUNC_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 74550ccc7a20..350e385528fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a></div><div class='hunk'>@@ -12,10 +12,89 @@</div><div class='ctx'> #include "aq_ring.h"</div><div class='ctx'> #include "aq_nic.h"</div><div class='ctx'> #include "aq_hw.h"</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='ctx'> </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 inline void aq_free_rxpage(struct aq_rxpage *rxpage, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = PAGE_SIZE &lt;&lt; rxpage-&gt;order;</div><div class='add'>+</div><div class='add'>+	dma_unmap_page(dev, rxpage-&gt;daddr, len, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	/* Drop the ref for being in the ring. */</div><div class='add'>+	__free_pages(rxpage-&gt;page, rxpage-&gt;order);</div><div class='add'>+	rxpage-&gt;page = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_rxpage(struct aq_rxpage *rxpage, unsigned int order,</div><div class='add'>+			 struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	dma_addr_t daddr;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	page = dev_alloc_pages(order);</div><div class='add'>+	if (unlikely(!page))</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	daddr = dma_map_page(dev, page, 0, PAGE_SIZE &lt;&lt; order,</div><div class='add'>+			     DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, daddr)))</div><div class='add'>+		goto free_page;</div><div class='add'>+</div><div class='add'>+	rxpage-&gt;page = page;</div><div class='add'>+	rxpage-&gt;daddr = daddr;</div><div class='add'>+	rxpage-&gt;order = order;</div><div class='add'>+	rxpage-&gt;pg_off = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_page:</div><div class='add'>+	__free_pages(page, order);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_rxpages(struct aq_ring_s *self, struct aq_ring_buff_s *rxbuf,</div><div class='add'>+			  int order)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (rxbuf-&gt;rxdata.page) {</div><div class='add'>+		/* One means ring is the only user and can reuse */</div><div class='add'>+		if (page_ref_count(rxbuf-&gt;rxdata.page) &gt; 1) {</div><div class='add'>+			/* Try reuse buffer */</div><div class='add'>+			rxbuf-&gt;rxdata.pg_off += AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+			if (rxbuf-&gt;rxdata.pg_off + AQ_CFG_RX_FRAME_MAX &lt;=</div><div class='add'>+				(PAGE_SIZE &lt;&lt; order)) {</div><div class='add'>+				self-&gt;stats.rx.pg_flips++;</div><div class='add'>+			} else {</div><div class='add'>+				/* Buffer exhausted. We have other users and</div><div class='add'>+				 * should release this page and realloc</div><div class='add'>+				 */</div><div class='add'>+				aq_free_rxpage(&amp;rxbuf-&gt;rxdata,</div><div class='add'>+					       aq_nic_get_dev(self-&gt;aq_nic));</div><div class='add'>+				self-&gt;stats.rx.pg_losts++;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			rxbuf-&gt;rxdata.pg_off = 0;</div><div class='add'>+			self-&gt;stats.rx.pg_reuses++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rxbuf-&gt;rxdata.page) {</div><div class='add'>+		ret = aq_get_rxpage(&amp;rxbuf-&gt;rxdata, order,</div><div class='add'>+				    aq_nic_get_dev(self-&gt;aq_nic));</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='ctx'> static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,</div><div class='ctx'> 				       struct aq_nic_s *aq_nic)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,6 +160,11 @@ struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,</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='add'>+	self-&gt;page_order = fls(AQ_CFG_RX_FRAME_MAX / PAGE_SIZE +</div><div class='add'>+			       (AQ_CFG_RX_FRAME_MAX % PAGE_SIZE ? 1 : 0)) - 1;</div><div class='add'>+</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='ctx'> </div><div class='ctx'> 	self = aq_ring_alloc(self, aq_nic);</div><div class='ctx'> 	if (!self) {</div><div class='hunk'>@@ -186,11 +270,12 @@ static void aq_rx_checksum(struct aq_ring_s *self,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (buff-&gt;is_ip_cso) {</div><div class='ctx'> 		__skb_incr_checksum_unnecessary(skb);</div><div class='del'>-		if (buff-&gt;is_udp_cso || buff-&gt;is_tcp_cso)</div><div class='del'>-			__skb_incr_checksum_unnecessary(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (buff-&gt;is_udp_cso || buff-&gt;is_tcp_cso)</div><div class='add'>+		__skb_incr_checksum_unnecessary(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define AQ_SKB_ALIGN SKB_DATA_ALIGN(sizeof(struct skb_shared_info))</div><div class='hunk'>@@ -200,22 +285,21 @@ int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='ctx'> 		     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'>-	int err = 0;</div><div class='ctx'> 	bool is_rsc_completed = true;</div><div class='add'>+	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'>+		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='ctx'> 		unsigned int i = 0U;</div><div class='del'>-		struct aq_ring_buff_s *buff_ = NULL;</div><div class='add'>+		u16 hdr_len;</div><div class='ctx'> </div><div class='del'>-		if (buff-&gt;is_error) {</div><div class='del'>-			__free_pages(buff-&gt;page, 0);</div><div class='add'>+		if (buff-&gt;is_error)</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (buff-&gt;is_cleaned)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -245,45 +329,67 @@ int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </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, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='ctx'> 		/* for single fragment packets use build_skb() */</div><div class='ctx'> 		if (buff-&gt;is_eop &amp;&amp;</div><div class='ctx'> 		    buff-&gt;len &lt;= AQ_CFG_RX_FRAME_MAX - AQ_SKB_ALIGN) {</div><div class='del'>-			skb = build_skb(page_address(buff-&gt;page),</div><div class='add'>+			skb = build_skb(aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='ctx'> 					AQ_CFG_RX_FRAME_MAX);</div><div class='ctx'> 			if (unlikely(!skb)) {</div><div class='ctx'> 				err = -ENOMEM;</div><div class='ctx'> 				goto err_exit;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='ctx'> 			skb_put(skb, buff-&gt;len);</div><div class='add'>+			page_ref_inc(buff-&gt;rxdata.page);</div><div class='ctx'> 		} else {</div><div class='del'>-			skb = netdev_alloc_skb(ndev, ETH_HLEN);</div><div class='add'>+			skb = napi_alloc_skb(napi, AQ_CFG_RX_HDR_SIZE);</div><div class='ctx'> 			if (unlikely(!skb)) {</div><div class='ctx'> 				err = -ENOMEM;</div><div class='ctx'> 				goto err_exit;</div><div class='ctx'> 			}</div><div class='del'>-			skb_put(skb, ETH_HLEN);</div><div class='del'>-			memcpy(skb-&gt;data, page_address(buff-&gt;page), ETH_HLEN);</div><div class='ctx'> </div><div class='del'>-			skb_add_rx_frag(skb, 0, buff-&gt;page, ETH_HLEN,</div><div class='del'>-					buff-&gt;len - ETH_HLEN,</div><div class='del'>-					SKB_TRUESIZE(buff-&gt;len - ETH_HLEN));</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, 0, 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'>+						AQ_CFG_RX_FRAME_MAX);</div><div class='add'>+				page_ref_inc(buff-&gt;rxdata.page);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (!buff-&gt;is_eop) {</div><div class='del'>-				for (i = 1U, next_ = buff-&gt;next,</div><div class='del'>-				     buff_ = &amp;self-&gt;buff_ring[next_];</div><div class='del'>-				     true; next_ = buff_-&gt;next,</div><div class='del'>-				     buff_ = &amp;self-&gt;buff_ring[next_], ++i) {</div><div class='del'>-					skb_add_rx_frag(skb, i,</div><div class='del'>-							buff_-&gt;page, 0,</div><div class='add'>+				buff_ = buff;</div><div class='add'>+				i = 1U;</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='add'>+</div><div class='add'>+					dma_sync_single_range_for_cpu(</div><div class='add'>+							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='ctx'> 							buff_-&gt;len,</div><div class='del'>-							SKB_TRUESIZE(buff-&gt;len -</div><div class='del'>-							ETH_HLEN));</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'>+							AQ_CFG_RX_FRAME_MAX);</div><div class='add'>+					page_ref_inc(buff_-&gt;rxdata.page);</div><div class='ctx'> 					buff_-&gt;is_cleaned = 1;</div><div class='del'>-</div><div class='del'>-					if (buff_-&gt;is_eop)</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='add'>+				} while (!buff_-&gt;is_eop);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -309,12 +415,15 @@ err_exit:</div><div class='ctx'> </div><div class='ctx'> int aq_ring_rx_fill(struct aq_ring_s *self)</div><div class='ctx'> {</div><div class='del'>-	unsigned int pages_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'>+	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='ctx'> </div><div class='add'>+	if (aq_ring_avail_dx(self) &lt; min_t(unsigned int, AQ_CFG_RX_REFILL_THRES,</div><div class='add'>+					   self-&gt;size / 2))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	for (i = aq_ring_avail_dx(self); i--;</div><div class='ctx'> 		self-&gt;sw_tail = aq_ring_next_dx(self, self-&gt;sw_tail)) {</div><div class='ctx'> 		buff = &amp;self-&gt;buff_ring[self-&gt;sw_tail];</div><div class='hunk'>@@ -322,30 +431,15 @@ int aq_ring_rx_fill(struct aq_ring_s *self)</div><div class='ctx'> 		buff-&gt;flags = 0U;</div><div class='ctx'> 		buff-&gt;len = AQ_CFG_RX_FRAME_MAX;</div><div class='ctx'> </div><div class='del'>-		buff-&gt;page = alloc_pages(GFP_ATOMIC | __GFP_COMP, pages_order);</div><div class='del'>-		if (!buff-&gt;page) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		err = aq_get_rxpages(self, buff, page_order);</div><div class='add'>+		if (err)</div><div class='ctx'> 			goto err_exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		buff-&gt;pa = dma_map_page(aq_nic_get_dev(self-&gt;aq_nic),</div><div class='del'>-					buff-&gt;page, 0,</div><div class='del'>-					AQ_CFG_RX_FRAME_MAX, DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-		if (dma_mapping_error(aq_nic_get_dev(self-&gt;aq_nic), buff-&gt;pa)) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_exit;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='add'>+		buff-&gt;pa = aq_buf_daddr(&amp;buff-&gt;rxdata);</div><div class='ctx'> 		buff = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		if (buff &amp;&amp; buff-&gt;page)</div><div class='del'>-			__free_pages(buff-&gt;page, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -358,10 +452,7 @@ void aq_ring_rx_deinit(struct aq_ring_s *self)</div><div class='ctx'> 		self-&gt;sw_head = aq_ring_next_dx(self, self-&gt;sw_head)) {</div><div class='ctx'> 		struct aq_ring_buff_s *buff = &amp;self-&gt;buff_ring[self-&gt;sw_head];</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page(aq_nic_get_dev(self-&gt;aq_nic), buff-&gt;pa,</div><div class='del'>-			       AQ_CFG_RX_FRAME_MAX, DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-		__free_pages(buff-&gt;page, 0);</div><div class='add'>+		aq_free_rxpage(&amp;buff-&gt;rxdata, aq_nic_get_dev(self-&gt;aq_nic));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_exit:;</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 ac1329f4051d..cfffc301e746 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_ring.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_ring.h</a></div><div class='hunk'>@@ -17,6 +17,13 @@</div><div class='ctx'> struct page;</div><div class='ctx'> struct aq_nic_cfg_s;</div><div class='ctx'> </div><div class='add'>+struct aq_rxpage {</div><div class='add'>+	struct page *page;</div><div class='add'>+	dma_addr_t daddr;</div><div class='add'>+	unsigned int order;</div><div class='add'>+	unsigned int pg_off;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*           TxC       SOP        DX         EOP</div><div class='ctx'>  *         +----------+----------+----------+-----------</div><div class='ctx'>  *   8bytes|len l3,l4 | pa       | pa       | pa</div><div class='hunk'>@@ -31,28 +38,21 @@ struct aq_nic_cfg_s;</div><div class='ctx'>  */</div><div class='ctx'> struct __packed aq_ring_buff_s {</div><div class='ctx'> 	union {</div><div class='add'>+		/* RX/TX */</div><div class='add'>+		dma_addr_t pa;</div><div class='ctx'> 		/* RX */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u32 rss_hash;</div><div class='ctx'> 			u16 next;</div><div class='ctx'> 			u8 is_hash_l4;</div><div class='ctx'> 			u8 rsvd1;</div><div class='del'>-			struct page *page;</div><div class='add'>+			struct aq_rxpage rxdata;</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='ctx'> 		};</div><div class='del'>-		/* DX */</div><div class='del'>-		struct {</div><div class='del'>-			dma_addr_t pa;</div><div class='del'>-		};</div><div class='del'>-		/* SOP */</div><div class='del'>-		struct {</div><div class='del'>-			dma_addr_t pa_sop;</div><div class='del'>-			u32 len_pkt_sop;</div><div class='del'>-		};</div><div class='ctx'> 		/* TxC */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u32 mss;</div><div class='hunk'>@@ -91,6 +91,9 @@ struct aq_ring_stats_rx_s {</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 pg_losts;</div><div class='add'>+	u64 pg_flips;</div><div class='add'>+	u64 pg_reuses;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_ring_stats_tx_s {</div><div class='hunk'>@@ -116,6 +119,7 @@ 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='add'>+	unsigned int page_order;</div><div class='ctx'> 	union aq_ring_stats_s stats;</div><div class='ctx'> 	dma_addr_t dx_ring_pa;</div><div class='ctx'> };</div><div class='hunk'>@@ -126,6 +130,16 @@ struct aq_ring_param_s {</div><div class='ctx'> 	cpumask_t affinity_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline void *aq_buf_vaddr(struct aq_rxpage *rxpage)</div><div class='add'>+{</div><div class='add'>+	return page_to_virt(rxpage-&gt;page) + rxpage-&gt;pg_off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t aq_buf_daddr(struct aq_rxpage *rxpage)</div><div class='add'>+{</div><div class='add'>+	return rxpage-&gt;daddr + rxpage-&gt;pg_off;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned int aq_ring_next_dx(struct aq_ring_s *self,</div><div class='ctx'> 					   unsigned int dx)</div><div class='ctx'> {</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 d335c334fa56..a2e4ca1782ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/aq_vec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/aq_vec.c</a></div><div class='hunk'>@@ -353,6 +353,9 @@ void aq_vec_add_stats(struct aq_vec_s *self,</div><div class='ctx'> 		stats_rx-&gt;errors += rx-&gt;errors;</div><div class='ctx'> 		stats_rx-&gt;jumbo_packets += rx-&gt;jumbo_packets;</div><div class='ctx'> 		stats_rx-&gt;lro_packets += rx-&gt;lro_packets;</div><div class='add'>+		stats_rx-&gt;pg_losts += rx-&gt;pg_losts;</div><div class='add'>+		stats_rx-&gt;pg_flips += rx-&gt;pg_flips;</div><div class='add'>+		stats_rx-&gt;pg_reuses += rx-&gt;pg_reuses;</div><div class='ctx'> </div><div class='ctx'> 		stats_tx-&gt;packets += tx-&gt;packets;</div><div class='ctx'> 		stats_tx-&gt;bytes += tx-&gt;bytes;</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 f6f8338153a2..9fe507fe2d7f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c</a></div><div class='hunk'>@@ -350,10 +350,10 @@ err_exit:</div><div class='ctx'> static int hw_atl_a0_hw_init(struct aq_hw_s *self, u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	static u32 aq_hw_atl_igcr_table_[4][2] = {</div><div class='del'>-		{ 0x20000000U, 0x20000000U }, /* AQ_IRQ_INVALID */</div><div class='del'>-		{ 0x20000080U, 0x20000080U }, /* AQ_IRQ_LEGACY */</div><div class='del'>-		{ 0x20000021U, 0x20000025U }, /* AQ_IRQ_MSI */</div><div class='del'>-		{ 0x20000022U, 0x20000026U }  /* AQ_IRQ_MSIX */</div><div class='add'>+		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },</div><div class='add'>+		[AQ_HW_IRQ_LEGACY]  = { 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='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -619,8 +619,6 @@ err_exit:</div><div class='ctx'> static int hw_atl_a0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> 					struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='del'>-	struct device *ndev = aq_nic_get_dev(ring-&gt;aq_nic);</div><div class='del'>-</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='ctx'> 		struct aq_ring_buff_s *buff = NULL;</div><div class='hunk'>@@ -687,8 +685,6 @@ static int hw_atl_a0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> 		is_err &amp;= ~0x18U;</div><div class='ctx'> 		is_err &amp;= ~0x04U;</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page(ndev, buff-&gt;pa, buff-&gt;len, DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='ctx'> 		if (is_err || rxd_wb-&gt;type &amp; 0x1000U) {</div><div class='ctx'> 			/* status error or DMA error */</div><div class='ctx'> 			buff-&gt;is_error = 1U;</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 b31dba1b1a55..bfcda12d73de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</a></div><div class='hunk'>@@ -259,7 +259,13 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpo_lro_time_base_divider_set(self, 0x61AU);</div><div class='ctx'> 		hw_atl_rpo_lro_inactive_interval_set(self, 0);</div><div class='del'>-		hw_atl_rpo_lro_max_coalescing_interval_set(self, 2);</div><div class='add'>+		/* the LRO timebase divider is 5 uS (0x61a),</div><div class='add'>+		 * which is multiplied by 50(0x32)</div><div class='add'>+		 * to get a maximum coalescing interval of 250 uS,</div><div class='add'>+		 * which is the default value</div><div class='add'>+		 */</div><div class='add'>+		hw_atl_rpo_lro_max_coalescing_interval_set(self, 50);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpo_lro_qsessions_lim_set(self, 1U);</div><div class='ctx'> </div><div class='hunk'>@@ -273,6 +279,10 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpo_lro_en_set(self,</div><div class='ctx'> 				      aq_nic_cfg-&gt;is_lro ? 0xFFFFFFFFU : 0U);</div><div class='add'>+		hw_atl_itr_rsc_en_set(self,</div><div class='add'>+				      aq_nic_cfg-&gt;is_lro ? 0xFFFFFFFFU : 0U);</div><div class='add'>+</div><div class='add'>+		hw_atl_itr_rsc_delay_set(self, 1U);</div><div class='ctx'> 	}</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='hunk'>@@ -378,10 +388,10 @@ err_exit:</div><div class='ctx'> static int hw_atl_b0_hw_init(struct aq_hw_s *self, u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	static u32 aq_hw_atl_igcr_table_[4][2] = {</div><div class='del'>-		{ 0x20000000U, 0x20000000U }, /* AQ_IRQ_INVALID */</div><div class='del'>-		{ 0x20000080U, 0x20000080U }, /* AQ_IRQ_LEGACY */</div><div class='del'>-		{ 0x20000021U, 0x20000025U }, /* AQ_IRQ_MSI */</div><div class='del'>-		{ 0x20000022U, 0x20000026U }  /* AQ_IRQ_MSIX */</div><div class='add'>+		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },</div><div class='add'>+		[AQ_HW_IRQ_LEGACY]  = { 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='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -433,6 +443,11 @@ static int hw_atl_b0_hw_init(struct aq_hw_s *self, u8 *mac_addr)</div><div class='ctx'> 				   ((HW_ATL_B0_ERR_INT &lt;&lt; 0x18) | (1U &lt;&lt; 0x1F)) |</div><div class='ctx'> 			    ((HW_ATL_B0_ERR_INT &lt;&lt; 0x10) | (1U &lt;&lt; 0x17)), 0U);</div><div class='ctx'> </div><div class='add'>+	/* Enable link interrupt */</div><div class='add'>+	if (aq_nic_cfg-&gt;link_irq_vec)</div><div class='add'>+		hw_atl_reg_gen_irq_map_set(self, BIT(7) |</div><div class='add'>+					   aq_nic_cfg-&gt;link_irq_vec, 3U);</div><div class='add'>+</div><div class='ctx'> 	hw_atl_b0_hw_offload_set(self, aq_nic_cfg);</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='hunk'>@@ -654,8 +669,6 @@ err_exit:</div><div class='ctx'> static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> 					struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='del'>-	struct device *ndev = aq_nic_get_dev(ring-&gt;aq_nic);</div><div class='del'>-</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='ctx'> 		struct aq_ring_buff_s *buff = NULL;</div><div class='hunk'>@@ -697,8 +710,6 @@ 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='del'>-		dma_unmap_page(ndev, buff-&gt;pa, buff-&gt;len, DMA_FROM_DEVICE);</div><div class='del'>-</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='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 2cc8dacfdc27..b1c0b6850e60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h</a></div><div class='hunk'>@@ -32,9 +32,6 @@ extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc109;</div><div class='ctx'> #define hw_atl_b0_caps_aqc111s hw_atl_b0_caps_aqc108</div><div class='ctx'> #define hw_atl_b0_caps_aqc112s hw_atl_b0_caps_aqc109</div><div class='ctx'> </div><div class='del'>-#define hw_atl_b0_caps_aqc111e hw_atl_b0_caps_aqc108</div><div class='del'>-#define hw_atl_b0_caps_aqc112e hw_atl_b0_caps_aqc109</div><div class='del'>-</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='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 b318eefd36ae..ea98a08d7820 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h</a></div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> #define HW_ATL_B0_TC_MAX 1U</div><div class='ctx'> #define HW_ATL_B0_RSS_MAX 8U</div><div class='ctx'> </div><div class='del'>-#define HW_ATL_B0_LRO_RXD_MAX 2U</div><div class='add'>+#define HW_ATL_B0_LRO_RXD_MAX 16U</div><div class='ctx'> #define HW_ATL_B0_RS_SLIP_ENABLED  0U</div><div class='ctx'> </div><div class='ctx'> /* (256k -1(max pay_len) - 54(header)) */</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 0722b8e01964..eaab25cd08b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c</a></div><div class='hunk'>@@ -49,11 +49,6 @@ u32 hw_atl_glb_soft_res_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> 				  HW_ATL_GLB_SOFT_RES_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 hw_atl_reg_rx_dma_stat_counter7get(struct aq_hw_s *aq_hw)</div><div class='del'>-{</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_RX_DMA_STAT_COUNTER7_ADR);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> u32 hw_atl_reg_glb_mif_id_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> {</div><div class='ctx'> 	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MIF_ID_ADR);</div><div class='hunk'>@@ -65,44 +60,24 @@ u32 hw_atl_rpb_rx_dma_drop_pkt_cnt_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> 	return aq_hw_read_reg(aq_hw, HW_ATL_RPB_RX_DMA_DROP_PKT_CNT_ADR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 hw_atl_stats_rx_dma_good_octet_counterlsw_get(struct aq_hw_s *aq_hw)</div><div class='del'>-{</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_RX_DMA_GOOD_OCTET_COUNTERLSW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 hw_atl_stats_rx_dma_good_pkt_counterlsw_get(struct aq_hw_s *aq_hw)</div><div class='add'>+u64 hw_atl_stats_rx_dma_good_octet_counter_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> {</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_RX_DMA_GOOD_PKT_COUNTERLSW);</div><div class='add'>+	return aq_hw_read_reg64(aq_hw, HW_ATL_STATS_RX_DMA_GOOD_OCTET_COUNTERLSW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 hw_atl_stats_tx_dma_good_octet_counterlsw_get(struct aq_hw_s *aq_hw)</div><div class='add'>+u64 hw_atl_stats_rx_dma_good_pkt_counter_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> {</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_TX_DMA_GOOD_OCTET_COUNTERLSW);</div><div class='add'>+	return aq_hw_read_reg64(aq_hw, HW_ATL_STATS_RX_DMA_GOOD_PKT_COUNTERLSW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 hw_atl_stats_tx_dma_good_pkt_counterlsw_get(struct aq_hw_s *aq_hw)</div><div class='add'>+u64 hw_atl_stats_tx_dma_good_octet_counter_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> {</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_TX_DMA_GOOD_PKT_COUNTERLSW);</div><div class='add'>+	return aq_hw_read_reg64(aq_hw, HW_ATL_STATS_TX_DMA_GOOD_OCTET_COUNTERLSW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 hw_atl_stats_rx_dma_good_octet_countermsw_get(struct aq_hw_s *aq_hw)</div><div class='add'>+u64 hw_atl_stats_tx_dma_good_pkt_counter_get(struct aq_hw_s *aq_hw)</div><div class='ctx'> {</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_RX_DMA_GOOD_OCTET_COUNTERMSW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 hw_atl_stats_rx_dma_good_pkt_countermsw_get(struct aq_hw_s *aq_hw)</div><div class='del'>-{</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_RX_DMA_GOOD_PKT_COUNTERMSW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 hw_atl_stats_tx_dma_good_octet_countermsw_get(struct aq_hw_s *aq_hw)</div><div class='del'>-{</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_TX_DMA_GOOD_OCTET_COUNTERMSW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 hw_atl_stats_tx_dma_good_pkt_countermsw_get(struct aq_hw_s *aq_hw)</div><div class='del'>-{</div><div class='del'>-	return aq_hw_read_reg(aq_hw, HW_ATL_STATS_TX_DMA_GOOD_PKT_COUNTERMSW);</div><div class='add'>+	return aq_hw_read_reg64(aq_hw, HW_ATL_STATS_TX_DMA_GOOD_PKT_COUNTERLSW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* interrupt */</div><div class='hunk'>@@ -315,6 +290,21 @@ void hw_atl_itr_res_irq_set(struct aq_hw_s *aq_hw, u32 res_irq)</div><div class='ctx'> 			    HW_ATL_ITR_RES_SHIFT, res_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* set RSC interrupt */</div><div class='add'>+void hw_atl_itr_rsc_en_set(struct aq_hw_s *aq_hw, u32 enable)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL_ITR_RSC_EN_ADR, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set RSC delay */</div><div class='add'>+void hw_atl_itr_rsc_delay_set(struct aq_hw_s *aq_hw, u32 delay)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_ITR_RSC_DELAY_ADR,</div><div class='add'>+			    HW_ATL_ITR_RSC_DELAY_MSK,</div><div class='add'>+			    HW_ATL_ITR_RSC_DELAY_SHIFT,</div><div class='add'>+			    delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* rdm */</div><div class='ctx'> void hw_atl_rdm_cpu_id_set(struct aq_hw_s *aq_hw, u32 cpuid, u32 dca)</div><div class='ctx'> {</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 d46351890b16..2eb44e1cff70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h</a></div><div class='hunk'>@@ -40,29 +40,17 @@ u32 hw_atl_glb_soft_res_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='ctx'> u32 hw_atl_rpb_rx_dma_drop_pkt_cnt_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='del'>-/* get rx dma good octet counter lsw */</div><div class='del'>-u32 hw_atl_stats_rx_dma_good_octet_counterlsw_get(struct aq_hw_s *aq_hw);</div><div class='add'>+/* get rx dma good octet counter */</div><div class='add'>+u64 hw_atl_stats_rx_dma_good_octet_counter_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='del'>-/* get rx dma good packet counter lsw */</div><div class='del'>-u32 hw_atl_stats_rx_dma_good_pkt_counterlsw_get(struct aq_hw_s *aq_hw);</div><div class='add'>+/* get rx dma good packet counter */</div><div class='add'>+u64 hw_atl_stats_rx_dma_good_pkt_counter_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='del'>-/* get tx dma good octet counter lsw */</div><div class='del'>-u32 hw_atl_stats_tx_dma_good_octet_counterlsw_get(struct aq_hw_s *aq_hw);</div><div class='add'>+/* get tx dma good octet counter */</div><div class='add'>+u64 hw_atl_stats_tx_dma_good_octet_counter_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='del'>-/* get tx dma good packet counter lsw */</div><div class='del'>-u32 hw_atl_stats_tx_dma_good_pkt_counterlsw_get(struct aq_hw_s *aq_hw);</div><div class='del'>-</div><div class='del'>-/* get rx dma good octet counter msw */</div><div class='del'>-u32 hw_atl_stats_rx_dma_good_octet_countermsw_get(struct aq_hw_s *aq_hw);</div><div class='del'>-</div><div class='del'>-/* get rx dma good packet counter msw */</div><div class='del'>-u32 hw_atl_stats_rx_dma_good_pkt_countermsw_get(struct aq_hw_s *aq_hw);</div><div class='del'>-</div><div class='del'>-/* get tx dma good octet counter msw */</div><div class='del'>-u32 hw_atl_stats_tx_dma_good_octet_countermsw_get(struct aq_hw_s *aq_hw);</div><div class='del'>-</div><div class='del'>-/* get tx dma good packet counter msw */</div><div class='del'>-u32 hw_atl_stats_tx_dma_good_pkt_countermsw_get(struct aq_hw_s *aq_hw);</div><div class='add'>+/* get tx dma good packet counter */</div><div class='add'>+u64 hw_atl_stats_tx_dma_good_pkt_counter_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='ctx'> /* get msm rx errors counter register */</div><div class='ctx'> u32 hw_atl_reg_mac_msm_rx_errs_cnt_get(struct aq_hw_s *aq_hw);</div><div class='hunk'>@@ -82,9 +70,6 @@ u32 hw_atl_reg_mac_msm_rx_bcst_octets_counter1get(struct aq_hw_s *aq_hw);</div><div class='ctx'> /* get msm rx unicast octets counter register 0 */</div><div class='ctx'> u32 hw_atl_reg_mac_msm_rx_ucst_octets_counter0get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='del'>-/* get rx dma statistics counter 7 */</div><div class='del'>-u32 hw_atl_reg_rx_dma_stat_counter7get(struct aq_hw_s *aq_hw);</div><div class='del'>-</div><div class='ctx'> /* get msm tx errors counter register */</div><div class='ctx'> u32 hw_atl_reg_mac_msm_tx_errs_cnt_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='hunk'>@@ -152,6 +137,12 @@ u32 hw_atl_itr_res_irq_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> /* set reset interrupt */</div><div class='ctx'> void hw_atl_itr_res_irq_set(struct aq_hw_s *aq_hw, u32 res_irq);</div><div class='ctx'> </div><div class='add'>+/* set RSC interrupt */</div><div class='add'>+void hw_atl_itr_rsc_en_set(struct aq_hw_s *aq_hw, u32 enable);</div><div class='add'>+</div><div class='add'>+/* set RSC delay */</div><div class='add'>+void hw_atl_itr_rsc_delay_set(struct aq_hw_s *aq_hw, u32 delay);</div><div class='add'>+</div><div class='ctx'> /* rdm */</div><div class='ctx'> </div><div class='ctx'> /* set cpu id */</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 fb45bc2d99cf..b64140924a02 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a></div><div class='hunk'>@@ -58,9 +58,6 @@</div><div class='ctx'> /* preprocessor definitions for msm rx unicast octets counter register 0 */</div><div class='ctx'> #define HW_ATL_MAC_MSM_RX_UCST_OCTETS_COUNTER0_ADR 0x000001b8u</div><div class='ctx'> </div><div class='del'>-/* preprocessor definitions for rx dma statistics counter 7 */</div><div class='del'>-#define HW_ATL_RX_DMA_STAT_COUNTER7_ADR 0x00006818u</div><div class='del'>-</div><div class='ctx'> /* preprocessor definitions for msm tx unicast frames counter register */</div><div class='ctx'> #define HW_ATL_MAC_MSM_TX_UCST_FRM_CNT_ADR 0x00000108u</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +92,19 @@</div><div class='ctx'> #define HW_ATL_ITR_RES_MSK 0x80000000</div><div class='ctx'> /* lower bit position of bitfield itr_reset */</div><div class='ctx'> #define HW_ATL_ITR_RES_SHIFT 31</div><div class='add'>+</div><div class='add'>+/* register address for bitfield  rsc_en */</div><div class='add'>+#define HW_ATL_ITR_RSC_EN_ADR 0x00002200</div><div class='add'>+</div><div class='add'>+/* register address for bitfield  rsc_delay */</div><div class='add'>+#define HW_ATL_ITR_RSC_DELAY_ADR 0x00002204</div><div class='add'>+/* bitmask for bitfield  rsc_delay */</div><div class='add'>+#define HW_ATL_ITR_RSC_DELAY_MSK 0x0000000f</div><div class='add'>+/* width of bitfield  rsc_delay */</div><div class='add'>+#define HW_ATL_ITR_RSC_DELAY_WIDTH 4</div><div class='add'>+/* lower bit position of bitfield  rsc_delay */</div><div class='add'>+#define HW_ATL_ITR_RSC_DELAY_SHIFT 0</div><div class='add'>+</div><div class='ctx'> /* register address for bitfield dca{d}_cpuid[7:0] */</div><div class='ctx'> #define HW_ATL_RDM_DCADCPUID_ADR(dca) (0x00006100 + (dca) * 0x4)</div><div class='ctx'> /* bitmask for bitfield dca{d}_cpuid[7:0] */</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 eb4b99d56081..1208f7ecdd76 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c</a></div><div class='hunk'>@@ -545,7 +545,7 @@ void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,</div><div class='ctx'> 		pmbox-&gt;stats.ubtc = pmbox-&gt;stats.uptc * mtu;</div><div class='ctx'> 		pmbox-&gt;stats.dpc = atomic_read(&amp;self-&gt;dpc);</div><div class='ctx'> 	} else {</div><div class='del'>-		pmbox-&gt;stats.dpc = hw_atl_reg_rx_dma_stat_counter7get(self);</div><div class='add'>+		pmbox-&gt;stats.dpc = hw_atl_rpb_rx_dma_drop_pkt_cnt_get(self);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_exit:;</div><div class='hunk'>@@ -763,6 +763,7 @@ static int hw_atl_fw1x_deinit(struct aq_hw_s *self)</div><div class='ctx'> int hw_atl_utils_update_stats(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_atl_utils_mbox mbox;</div><div class='add'>+	struct aq_stats_s *cs = &amp;self-&gt;curr_stats;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_utils_mpi_read_stats(self, &amp;mbox);</div><div class='ctx'> </div><div class='hunk'>@@ -789,10 +790,11 @@ int hw_atl_utils_update_stats(struct aq_hw_s *self)</div><div class='ctx'> 		AQ_SDELTA(dpc);</div><div class='ctx'> 	}</div><div class='ctx'> #undef AQ_SDELTA</div><div class='del'>-	self-&gt;curr_stats.dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self);</div><div class='del'>-	self-&gt;curr_stats.dma_pkt_tc = hw_atl_stats_tx_dma_good_pkt_counterlsw_get(self);</div><div class='del'>-	self-&gt;curr_stats.dma_oct_rc = hw_atl_stats_rx_dma_good_octet_counterlsw_get(self);</div><div class='del'>-	self-&gt;curr_stats.dma_oct_tc = hw_atl_stats_tx_dma_good_octet_counterlsw_get(self);</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='ctx'> </div><div class='ctx'> 	memcpy(&amp;self-&gt;last_stats, &amp;mbox.stats, sizeof(mbox.stats));</div><div class='ctx'> </div><div class='hunk'>@@ -960,6 +962,7 @@ 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_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='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 fe6c5658e016..fbc9d6ac841f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</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='add'>+#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='ctx'> #define HW_ATL_FW2X_CTRL_FORCE_RECONNECT  BIT(CTRL_FORCE_RECONNECT)</div><div class='ctx'> </div><div class='hunk'>@@ -310,6 +311,40 @@ static int aq_fw2x_update_stats(struct aq_hw_s *self)</div><div class='ctx'> 	return hw_atl_utils_update_stats(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aq_fw2x_get_phy_temp(struct aq_hw_s *self, int *temp)</div><div class='add'>+{</div><div class='add'>+	u32 mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='add'>+	u32 temp_val = mpi_opts &amp; HW_ATL_FW2X_CTRL_TEMPERATURE;</div><div class='add'>+	u32 phy_temp_offset;</div><div class='add'>+	u32 temp_res;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	phy_temp_offset = self-&gt;mbox_addr +</div><div class='add'>+			  offsetof(struct hw_atl_utils_mbox, info) +</div><div class='add'>+			  offsetof(struct hw_aq_info, phy_temperature);</div><div class='add'>+	/* Toggle statistics bit for FW to 0x36C.18 (CTRL_TEMPERATURE) */</div><div class='add'>+	mpi_opts = mpi_opts ^ HW_ATL_FW2X_CTRL_TEMPERATURE;</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</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'>+					temp_val !=</div><div class='add'>+					(val &amp; HW_ATL_FW2X_CTRL_TEMPERATURE),</div><div class='add'>+					1U, 10000U);</div><div class='add'>+	err = hw_atl_utils_fw_downld_dwords(self, phy_temp_offset,</div><div class='add'>+					    &amp;temp_res, 1);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Convert PHY temperature from 1/256 degree Celsius</div><div class='add'>+	 * to 1/1000 degree Celsius.</div><div class='add'>+	 */</div><div class='add'>+	*temp = temp_res  * 1000 / 256;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aq_fw2x_set_sleep_proxy(struct aq_hw_s *self, u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_atl_utils_fw_rpc *rpc = NULL;</div><div class='hunk'>@@ -509,6 +544,7 @@ const struct aq_fw_ops aq_fw_2x_ops = {</div><div class='ctx'> 	.set_state = aq_fw2x_set_state,</div><div class='ctx'> 	.update_link_status = aq_fw2x_update_link_status,</div><div class='ctx'> 	.update_stats = aq_fw2x_update_stats,</div><div class='add'>+	.get_phy_temp = aq_fw2x_get_phy_temp,</div><div class='ctx'> 	.set_power = aq_fw2x_set_power,</div><div class='ctx'> 	.set_eee_rate = aq_fw2x_set_eee_rate,</div><div class='ctx'> 	.get_eee_rate = aq_fw2x_get_eee_rate,</div><div class='head'>diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c<br/>index ff3d68532f5f..7f89ad5c336d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/arc/emac_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/arc/emac_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/arc/emac_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/arc/emac_main.c</a></div><div class='hunk'>@@ -960,7 +960,7 @@ int arc_emac_probe(struct net_device *ndev, int interface)</div><div class='ctx'> 	/* Get MAC address from device tree */</div><div class='ctx'> 	mac_addr = of_get_mac_address(dev-&gt;of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(ndev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c<br/>index 9e07b469066a..f35c9a75be50 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/atheros/atlx/atl1.c</a></div><div class='hunk'>@@ -1721,7 +1721,7 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;soft_stats.scc += smb-&gt;tx_1_col;</div><div class='ctx'> 	adapter-&gt;soft_stats.mcc += smb-&gt;tx_2_col;</div><div class='ctx'> 	adapter-&gt;soft_stats.latecol += smb-&gt;tx_late_col;</div><div class='del'>-	adapter-&gt;soft_stats.tx_underun += smb-&gt;tx_underrun;</div><div class='add'>+	adapter-&gt;soft_stats.tx_underrun += smb-&gt;tx_underrun;</div><div class='ctx'> 	adapter-&gt;soft_stats.tx_trunc += smb-&gt;tx_trunc;</div><div class='ctx'> 	adapter-&gt;soft_stats.tx_pause += smb-&gt;tx_pause;</div><div class='ctx'> </div><div class='hunk'>@@ -2439,7 +2439,6 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	atl1_tx_map(adapter, skb, ptpd);</div><div class='ctx'> 	atl1_tx_queue(adapter, count, ptpd);</div><div class='ctx'> 	atl1_update_mailbox(adapter);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3179,7 +3178,7 @@ static struct atl1_stats atl1_gstrings_stats[] = {</div><div class='ctx'> 	{"tx_deferred_ok", ATL1_STAT(soft_stats.deffer)},</div><div class='ctx'> 	{"tx_single_coll_ok", ATL1_STAT(soft_stats.scc)},</div><div class='ctx'> 	{"tx_multi_coll_ok", ATL1_STAT(soft_stats.mcc)},</div><div class='del'>-	{"tx_underun", ATL1_STAT(soft_stats.tx_underun)},</div><div class='add'>+	{"tx_underrun", ATL1_STAT(soft_stats.tx_underrun)},</div><div class='ctx'> 	{"tx_trunc", ATL1_STAT(soft_stats.tx_trunc)},</div><div class='ctx'> 	{"tx_pause", ATL1_STAT(soft_stats.tx_pause)},</div><div class='ctx'> 	{"rx_pause", ATL1_STAT(soft_stats.rx_pause)},</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h<br/>index 34a58cd846a0..eacff19ea05b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl1.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl1.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl1.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/atheros/atlx/atl1.h</a></div><div class='hunk'>@@ -681,7 +681,7 @@ struct atl1_sft_stats {</div><div class='ctx'> 	u64 scc;		/* packets TX after a single collision */</div><div class='ctx'> 	u64 mcc;		/* packets TX after multiple collisions */</div><div class='ctx'> 	u64 latecol;		/* TX packets w/ late collisions */</div><div class='del'>-	u64 tx_underun;		/* TX packets aborted due to TX FIFO underrun</div><div class='add'>+	u64 tx_underrun;	/* TX packets aborted due to TX FIFO underrun</div><div class='ctx'> 				 * or TRD FIFO underrun */</div><div class='ctx'> 	u64 tx_trunc;		/* TX packets truncated due to size &gt; MTU */</div><div class='ctx'> 	u64 rx_pause;		/* num Pause packets received. */</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c<br/>index d99317b3d891..dd81c5863111 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/atheros/atlx/atl2.c</a></div><div class='hunk'>@@ -553,7 +553,7 @@ static void atl2_intr_tx(struct atl2_adapter *adapter)</div><div class='ctx'> 			netdev-&gt;stats.tx_aborted_errors++;</div><div class='ctx'> 		if (txs-&gt;late_col)</div><div class='ctx'> 			netdev-&gt;stats.tx_window_errors++;</div><div class='del'>-		if (txs-&gt;underun)</div><div class='add'>+		if (txs-&gt;underrun)</div><div class='ctx'> 			netdev-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='hunk'>@@ -908,7 +908,6 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	ATL2_WRITE_REGW(&amp;adapter-&gt;hw, REG_MB_TXD_WR_IDX,</div><div class='ctx'> 		(adapter-&gt;txd_write_ptr &gt;&gt; 2));</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	dev_consume_skb_any(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h<br/>index c64a6bdfa7ae..25ec84cb4853 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/atheros/atlx/atl2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/atheros/atlx/atl2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/atheros/atlx/atl2.h</a></div><div class='hunk'>@@ -260,7 +260,7 @@ struct tx_pkt_status {</div><div class='ctx'> 	unsigned multi_col:1;</div><div class='ctx'> 	unsigned late_col:1;</div><div class='ctx'> 	unsigned abort_col:1;</div><div class='del'>-	unsigned underun:1;	/* current packet is aborted</div><div class='add'>+	unsigned underrun:1;	/* current packet is aborted</div><div class='ctx'> 				 * due to txram underrun */</div><div class='ctx'> 	unsigned:3;		/* reserved */</div><div class='ctx'> 	unsigned update:1;	/* always 1'b1 in tx_status_buf */</div><div class='head'>diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c<br/>index 6f56276015a4..3c4967eecef1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aurora/nb8800.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/aurora/nb8800.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/aurora/nb8800.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/aurora/nb8800.c</a></div><div class='hunk'>@@ -404,6 +404,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned int dma_len;</div><div class='ctx'> 	unsigned int align;</div><div class='ctx'> 	unsigned int next;</div><div class='add'>+	bool xmit_more;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;priv-&gt;tx_free) &lt;= NB8800_DESC_LOW) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='hunk'>@@ -423,9 +424,10 @@ static int nb8800_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='add'>+	xmit_more = netdev_xmit_more();</div><div class='ctx'> 	if (atomic_dec_return(&amp;priv-&gt;tx_free) &lt;= NB8800_DESC_LOW) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-		skb-&gt;xmit_more = 0;</div><div class='add'>+		xmit_more = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	next = priv-&gt;tx_next;</div><div class='hunk'>@@ -450,7 +452,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	desc-&gt;n_addr = priv-&gt;tx_bufs[next].dma_desc;</div><div class='ctx'> 	desc-&gt;config = DESC_BTS(2) | DESC_DS | DESC_EOF | dma_len;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;xmit_more)</div><div class='add'>+	if (!xmit_more)</div><div class='ctx'> 		desc-&gt;config |= DESC_EOC;</div><div class='ctx'> </div><div class='ctx'> 	txb-&gt;skb = skb;</div><div class='hunk'>@@ -468,7 +470,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;tx_next = next;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;xmit_more) {</div><div class='add'>+	if (!xmit_more) {</div><div class='ctx'> 		smp_wmb();</div><div class='ctx'> 		priv-&gt;tx_chain-&gt;ready = true;</div><div class='ctx'> 		priv-&gt;tx_chain = NULL;</div><div class='hunk'>@@ -1461,7 +1463,7 @@ static int nb8800_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		ether_addr_copy(dev-&gt;dev_addr, mac);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig<br/>index 716bfbba59cf..461b2c0b2ed6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/Kconfig</a></div><div class='hunk'>@@ -196,6 +196,7 @@ config BNXT</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select LIBCRC32C</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	---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='head'>diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c<br/>index bc3ac369cbe3..c623896e3ccb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bcmsysport.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bcmsysport.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bcmsysport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bcmsysport.c</a></div><div class='hunk'>@@ -116,15 +116,6 @@ static inline void dma_desc_set_addr(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	writel_relaxed(lower_32_bits(addr), d + DESC_ADDR_LO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void tdma_port_write_desc_addr(struct bcm_sysport_priv *priv,</div><div class='del'>-					     struct dma_desc *desc,</div><div class='del'>-					     unsigned int port)</div><div class='del'>-{</div><div class='del'>-	/* Ports are latched, so write upper address first */</div><div class='del'>-	tdma_writel(priv, desc-&gt;addr_status_len, TDMA_WRITE_PORT_HI(port));</div><div class='del'>-	tdma_writel(priv, desc-&gt;addr_lo, TDMA_WRITE_PORT_LO(port));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Ethtool operations */</div><div class='ctx'> static void bcm_sysport_set_rx_csum(struct net_device *dev,</div><div class='ctx'> 				    netdev_features_t wanted)</div><div class='hunk'>@@ -1291,11 +1282,10 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring;</div><div class='ctx'> 	struct bcm_sysport_cb *cb;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='del'>-	struct dma_desc *desc;</div><div class='add'>+	u32 len_status, addr_lo;</div><div class='ctx'> 	unsigned int skb_len;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='del'>-	u32 len_status;</div><div class='ctx'> 	u16 queue;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1338,10 +1328,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 	dma_unmap_addr_set(cb, dma_addr, mapping);</div><div class='ctx'> 	dma_unmap_len_set(cb, dma_len, skb_len);</div><div class='ctx'> </div><div class='del'>-	/* Fetch a descriptor entry from our pool */</div><div class='del'>-	desc = ring-&gt;desc_cpu;</div><div class='del'>-</div><div class='del'>-	desc-&gt;addr_lo = lower_32_bits(mapping);</div><div class='add'>+	addr_lo = lower_32_bits(mapping);</div><div class='ctx'> 	len_status = upper_32_bits(mapping) &amp; DESC_ADDR_HI_MASK;</div><div class='ctx'> 	len_status |= (skb_len &lt;&lt; DESC_LEN_SHIFT);</div><div class='ctx'> 	len_status |= (DESC_SOP | DESC_EOP | TX_STATUS_APP_CRC) &lt;&lt;</div><div class='hunk'>@@ -1354,16 +1341,9 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 		ring-&gt;curr_desc = 0;</div><div class='ctx'> 	ring-&gt;desc_count--;</div><div class='ctx'> </div><div class='del'>-	/* Ensure write completion of the descriptor status/length</div><div class='del'>-	 * in DRAM before the System Port WRITE_PORT register latches</div><div class='del'>-	 * the value</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-	desc-&gt;addr_status_len = len_status;</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	/* Write this descriptor address to the RING write port */</div><div class='del'>-	tdma_port_write_desc_addr(priv, desc, ring-&gt;index);</div><div class='add'>+	/* Ports are latched, so write upper address first */</div><div class='add'>+	tdma_writel(priv, len_status, TDMA_WRITE_PORT_HI(ring-&gt;index));</div><div class='add'>+	tdma_writel(priv, addr_lo, TDMA_WRITE_PORT_LO(ring-&gt;index));</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'>@@ -1489,28 +1469,14 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> 				    unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring = &amp;priv-&gt;tx_rings[index];</div><div class='del'>-	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	size_t size;</div><div class='del'>-	void *p;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Simple descriptors partitioning for now */</div><div class='ctx'> 	size = 256;</div><div class='ctx'> </div><div class='del'>-	/* We just need one DMA descriptor which is DMA-able, since writing to</div><div class='del'>-	 * the port will allocate a new descriptor in its internal linked-list</div><div class='del'>-	 */</div><div class='del'>-	p = dma_alloc_coherent(kdev, sizeof(struct dma_desc), &amp;ring-&gt;desc_dma,</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-	if (!p) {</div><div class='del'>-		netif_err(priv, hw, priv-&gt;netdev, "DMA alloc failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ring-&gt;cbs = kcalloc(size, sizeof(struct bcm_sysport_cb), GFP_KERNEL);</div><div class='ctx'> 	if (!ring-&gt;cbs) {</div><div class='del'>-		dma_free_coherent(kdev, sizeof(struct dma_desc),</div><div class='del'>-				  ring-&gt;desc_cpu, ring-&gt;desc_dma);</div><div class='ctx'> 		netif_err(priv, hw, priv-&gt;netdev, "CB allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1523,7 +1489,6 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	ring-&gt;size = size;</div><div class='ctx'> 	ring-&gt;clean_index = 0;</div><div class='ctx'> 	ring-&gt;alloc_size = ring-&gt;size;</div><div class='del'>-	ring-&gt;desc_cpu = p;</div><div class='ctx'> 	ring-&gt;desc_count = ring-&gt;size;</div><div class='ctx'> 	ring-&gt;curr_desc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1578,8 +1543,8 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	napi_enable(&amp;ring-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, hw, priv-&gt;netdev,</div><div class='del'>-		  "TDMA cfg, size=%d, desc_cpu=%p switch q=%d,port=%d\n",</div><div class='del'>-		  ring-&gt;size, ring-&gt;desc_cpu, ring-&gt;switch_queue,</div><div class='add'>+		  "TDMA cfg, size=%d, switch q=%d,port=%d\n",</div><div class='add'>+		  ring-&gt;size, ring-&gt;switch_queue,</div><div class='ctx'> 		  ring-&gt;switch_port);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1589,7 +1554,6 @@ static void bcm_sysport_fini_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> 				     unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring = &amp;priv-&gt;tx_rings[index];</div><div class='del'>-	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Caller should stop the TDMA engine */</div><div class='hunk'>@@ -1611,12 +1575,6 @@ static void bcm_sysport_fini_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	kfree(ring-&gt;cbs);</div><div class='ctx'> 	ring-&gt;cbs = NULL;</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;desc_dma) {</div><div class='del'>-		dma_free_coherent(kdev, sizeof(struct dma_desc),</div><div class='del'>-				  ring-&gt;desc_cpu, ring-&gt;desc_dma);</div><div class='del'>-		ring-&gt;desc_dma = 0;</div><div class='del'>-	}</div><div class='ctx'> 	ring-&gt;size = 0;</div><div class='ctx'> 	ring-&gt;alloc_size = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2274,8 +2232,7 @@ static const struct ethtool_ops bcm_sysport_ethtool_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-				    struct net_device *sb_dev,</div><div class='del'>-				    select_queue_fallback_t fallback)</div><div class='add'>+				    struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u16 queue = skb_get_queue_mapping(skb);</div><div class='hunk'>@@ -2283,7 +2240,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	unsigned int q, port;</div><div class='ctx'> </div><div class='ctx'> 	if (!netdev_uses_dsa(dev))</div><div class='del'>-		return fallback(dev, skb, NULL);</div><div class='add'>+		return netdev_pick_tx(dev, skb, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* DSA tagging layer will have configured the correct queue */</div><div class='ctx'> 	q = BRCM_TAG_GET_QUEUE(queue);</div><div class='hunk'>@@ -2291,7 +2248,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	tx_ring = priv-&gt;ring_map[q + port * priv-&gt;per_port_num_tx_queues];</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!tx_ring))</div><div class='del'>-		return fallback(dev, skb, NULL);</div><div class='add'>+		return netdev_pick_tx(dev, skb, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return tx_ring-&gt;index;</div><div class='ctx'> }</div><div class='hunk'>@@ -2548,7 +2505,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize netdevice members */</div><div class='ctx'> 	macaddr = of_get_mac_address(dn);</div><div class='del'>-	if (!macaddr || !is_valid_ether_addr(macaddr)) {</div><div class='add'>+	if (IS_ERR(macaddr)) {</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='ctx'> 	} else {</div><div class='hunk'>@@ -2599,11 +2556,11 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> </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='del'>-		 "Broadcom SYSTEMPORT%s" REV_FMT</div><div class='del'>-		 " at 0x%p (irqs: %d, %d, TXQs: %d, RXQs: %d)\n",</div><div class='add'>+		 "Broadcom SYSTEMPORT%s " REV_FMT</div><div class='add'>+		 " (irqs: %d, %d, TXQs: %d, RXQs: %d)\n",</div><div class='ctx'> 		 priv-&gt;is_lite ? " Lite" : "",</div><div class='ctx'> 		 (priv-&gt;rev &gt;&gt; 8) &amp; 0xff, priv-&gt;rev &amp; 0xff,</div><div class='del'>-		 priv-&gt;base, priv-&gt;irq0, priv-&gt;irq1, txq, rxq);</div><div class='add'>+		 priv-&gt;irq0, priv-&gt;irq1, txq, rxq);</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/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h<br/>index 0b192fea9c5d..6f3141c86436 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bcmsysport.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bcmsysport.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bcmsysport.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bcmsysport.h</a></div><div class='hunk'>@@ -516,12 +516,6 @@ struct bcm_rsb {</div><div class='ctx'> </div><div class='ctx'> #define TDMA_DEBUG			0x64c</div><div class='ctx'> </div><div class='del'>-/* Transmit/Receive descriptor */</div><div class='del'>-struct dma_desc {</div><div class='del'>-	u32	addr_status_len;</div><div class='del'>-	u32	addr_lo;</div><div class='del'>-};</div><div class='del'>-</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='ctx'> #define SP_LT_NUM_HW_RX_DESC_WORDS	256</div><div class='hunk'>@@ -530,7 +524,7 @@ struct dma_desc {</div><div class='ctx'> #define SP_NUM_TX_DESC			1536</div><div class='ctx'> #define SP_LT_NUM_TX_DESC		256</div><div class='ctx'> </div><div class='del'>-#define WORDS_PER_DESC			(sizeof(struct dma_desc) / sizeof(u32))</div><div class='add'>+#define WORDS_PER_DESC			2</div><div class='ctx'> </div><div class='ctx'> /* Rx/Tx common counter group.*/</div><div class='ctx'> struct bcm_sysport_pkt_counters {</div><div class='hunk'>@@ -718,7 +712,6 @@ struct bcm_sysport_net_dim {</div><div class='ctx'> struct bcm_sysport_tx_ring {</div><div class='ctx'> 	spinlock_t	lock;		/* Ring lock for tx reclaim/xmit */</div><div class='ctx'> 	struct napi_struct napi;	/* NAPI per tx queue */</div><div class='del'>-	dma_addr_t	desc_dma;	/* DMA cookie */</div><div class='ctx'> 	unsigned int	index;		/* Ring index */</div><div class='ctx'> 	unsigned int	size;		/* Ring current size */</div><div class='ctx'> 	unsigned int	alloc_size;	/* Ring one-time allocated size */</div><div class='hunk'>@@ -727,7 +720,6 @@ struct bcm_sysport_tx_ring {</div><div class='ctx'> 	unsigned int	c_index;	/* Last consumer index */</div><div class='ctx'> 	unsigned int	clean_index;	/* Current clean index */</div><div class='ctx'> 	struct bcm_sysport_cb *cbs;	/* Transmit control blocks */</div><div class='del'>-	struct dma_desc	*desc_cpu;	/* CPU view of the descriptor */</div><div class='ctx'> 	struct bcm_sysport_priv *priv;	/* private context backpointer */</div><div class='ctx'> 	unsigned long	packets;	/* packets statistics */</div><div class='ctx'> 	unsigned long	bytes;		/* bytes statistics */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c<br/>index 6fe074c1588b..34d18302b1a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bgmac-bcma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bgmac-bcma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bgmac-bcma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bgmac-bcma.c</a></div><div class='hunk'>@@ -132,7 +132,7 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> 		mac = of_get_mac_address(bgmac-&gt;dev-&gt;of_node);</div><div class='ctx'> </div><div class='ctx'> 	/* If no MAC address assigned via device tree, check SPROM */</div><div class='del'>-	if (!mac) {</div><div class='add'>+	if (IS_ERR_OR_NULL(mac)) {</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='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c<br/>index 894eda5b13cf..6dc0dd91ad11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bgmac-platform.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bgmac-platform.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bgmac-platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bgmac-platform.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static int bgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	bgmac-&gt;dma_dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(bgmac-&gt;net_dev-&gt;dev_addr, mac_addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "MAC address not present in device tree\n");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c<br/>index d63371d70bce..dfdd14eadd57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2.c</a></div><div class='hunk'>@@ -3305,8 +3305,6 @@ next_rx:</div><div class='ctx'> </div><div class='ctx'> 	BNX2_WR(bp, rxr-&gt;rx_bseq_addr, rxr-&gt;rx_prod_bseq);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	return rx_pkt;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -6723,8 +6721,6 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	BNX2_WR16(bp, txr-&gt;tx_bidx_addr, prod);</div><div class='ctx'> 	BNX2_WR(bp, txr-&gt;tx_bseq_addr, txr-&gt;tx_prod_bseq);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	txr-&gt;tx_prod = prod;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bnx2_tx_avail(bp, txr) &lt;= MAX_SKB_FRAGS)) {</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 ecb1bd7eb508..008ad0ca89ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a></div><div class='hunk'>@@ -1909,8 +1909,7 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *sb_dev,</div><div class='del'>-		       select_queue_fallback_t fallback)</div><div class='add'>+		       struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1932,7 +1931,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* select a non-FCoE queue */</div><div class='del'>-	return fallback(dev, skb, NULL) %</div><div class='add'>+	return netdev_pick_tx(dev, skb, NULL) %</div><div class='ctx'> 	       (BNX2X_NUM_ETH_QUEUES(bp) * bp-&gt;max_cos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4166,8 +4165,6 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	DOORBELL_RELAXED(bp, txdata-&gt;cid, txdata-&gt;tx_db.raw);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	txdata-&gt;tx_bd_prod += nbd;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bnx2x_tx_avail(bp, txdata) &lt; MAX_DESC_PER_TX_PKT)) {</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 2462e7aa0c5d..c2f6e44e9a3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a></div><div class='hunk'>@@ -498,8 +498,7 @@ int bnx2x_set_vf_spoofchk(struct net_device *dev, int idx, bool val);</div><div class='ctx'> </div><div class='ctx'> /* select_queue callback */</div><div class='ctx'> u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *sb_dev,</div><div class='del'>-		       select_queue_fallback_t fallback);</div><div class='add'>+		       struct net_device *sb_dev);</div><div class='ctx'> </div><div class='ctx'> static inline void bnx2x_update_rx_prod(struct bnx2x *bp,</div><div class='ctx'> 					struct bnx2x_fastpath *fp,</div><div class='hunk'>@@ -527,8 +526,6 @@ static inline void bnx2x_update_rx_prod(struct bnx2x *bp,</div><div class='ctx'> 		REG_WR_RELAXED(bp, fp-&gt;ustorm_rx_prods_offset + i * 4,</div><div class='ctx'> 			       ((u32 *)&amp;rx_prods)[i]);</div><div class='ctx'> </div><div class='del'>-	mmiowb(); /* keep prod updates ordered */</div><div class='del'>-</div><div class='ctx'> 	DP(NETIF_MSG_RX_STATUS,</div><div class='ctx'> 	   "queue[%d]:  wrote  bd_prod %u  cqe_prod %u  sge_prod %u\n",</div><div class='ctx'> 	   fp-&gt;index, bd_prod, rx_comp_prod, rx_sge_prod);</div><div class='hunk'>@@ -653,7 +650,6 @@ static inline void bnx2x_igu_ack_sb_gen(struct bnx2x *bp, u8 igu_sb_id,</div><div class='ctx'> 	REG_WR(bp, igu_addr, cmd_data.sb_id_and_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that ACK is written */</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -674,7 +670,6 @@ static inline void bnx2x_hc_ack_sb(struct bnx2x *bp, u8 sb_id,</div><div class='ctx'> 	REG_WR(bp, hc_addr, (*(u32 *)&amp;igu_ack));</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that ACK is written */</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> }</div><div class='ctx'> </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 749d0ef44371..0745cccd416d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a></div><div class='hunk'>@@ -2623,7 +2623,6 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	DOORBELL_RELAXED(bp, txdata-&gt;cid, txdata-&gt;tx_db.raw);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> </div><div class='ctx'> 	num_pkts++;</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 d9057c8bbeef..78326a6c0aba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a></div><div class='hunk'>@@ -3024,7 +3024,7 @@ 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		1</div><div class='add'>+#define BCM_5710_FW_REVISION_VERSION		11</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='hunk'>@@ -3639,8 +3639,10 @@ struct client_init_rx_data {</div><div class='ctx'> #define CLIENT_INIT_RX_DATA_TPA_EN_IPV6_SHIFT 1</div><div class='ctx'> #define CLIENT_INIT_RX_DATA_TPA_MODE (0x1&lt;&lt;2)</div><div class='ctx'> #define CLIENT_INIT_RX_DATA_TPA_MODE_SHIFT 2</div><div class='del'>-#define CLIENT_INIT_RX_DATA_RESERVED5 (0x1F&lt;&lt;3)</div><div class='del'>-#define CLIENT_INIT_RX_DATA_RESERVED5_SHIFT 3</div><div class='add'>+#define CLIENT_INIT_RX_DATA_TPA_OVER_VLAN_DISABLE (0x1&lt;&lt;3)</div><div class='add'>+#define CLIENT_INIT_RX_DATA_TPA_OVER_VLAN_DISABLE_SHIFT 3</div><div class='add'>+#define CLIENT_INIT_RX_DATA_RESERVED5 (0xF&lt;&lt;4)</div><div class='add'>+#define CLIENT_INIT_RX_DATA_RESERVED5_SHIFT 4</div><div class='ctx'> 	u8 vmqueue_mode_en_flg;</div><div class='ctx'> 	u8 extra_data_over_sgl_en_flg;</div><div class='ctx'> 	u8 cache_line_alignment_log_size;</div><div class='hunk'>@@ -3831,7 +3833,7 @@ struct eth_classify_cmd_header {</div><div class='ctx'>  */</div><div class='ctx'> struct eth_classify_header {</div><div class='ctx'> 	u8 rule_cnt;</div><div class='del'>-	u8 reserved0;</div><div class='add'>+	u8 warning_on_error;</div><div class='ctx'> 	__le16 reserved1;</div><div class='ctx'> 	__le32 echo;</div><div class='ctx'> };</div><div class='hunk'>@@ -4752,6 +4754,8 @@ struct tpa_update_ramrod_data {</div><div class='ctx'> 	__le32 sge_page_base_hi;</div><div class='ctx'> 	__le16 sge_pause_thr_low;</div><div class='ctx'> 	__le16 sge_pause_thr_high;</div><div class='add'>+	u8 tpa_over_vlan_disable;</div><div class='add'>+	u8 reserved[7];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -4946,7 +4950,7 @@ struct fairness_vars_per_port {</div><div class='ctx'> 	u32 upper_bound;</div><div class='ctx'> 	u32 fair_threshold;</div><div class='ctx'> 	u32 fairness_timeout;</div><div class='del'>-	u32 reserved0;</div><div class='add'>+	u32 size_thr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5415,7 +5419,9 @@ struct function_start_data {</div><div class='ctx'> 	u8 sd_vlan_force_pri_val;</div><div class='ctx'> 	u8 c2s_pri_tt_valid;</div><div class='ctx'> 	u8 c2s_pri_default;</div><div class='del'>-	u8 reserved2[6];</div><div class='add'>+	u8 tx_vlan_filtering_enable;</div><div class='add'>+	u8 tx_vlan_filtering_use_pvid;</div><div class='add'>+	u8 reserved2[4];</div><div class='ctx'> 	struct c2s_pri_trans_table_entry c2s_pri_trans_table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -5448,7 +5454,8 @@ struct function_update_data {</div><div class='ctx'> 	u8 reserved1;</div><div class='ctx'> 	__le16 sd_vlan_tag;</div><div class='ctx'> 	__le16 sd_vlan_eth_type;</div><div class='del'>-	__le16 reserved0;</div><div class='add'>+	u8 tx_vlan_filtering_pvid_change_flg;</div><div class='add'>+	u8 reserved0;</div><div class='ctx'> 	__le32 reserved2;</div><div class='ctx'> };</div><div class='ctx'> </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 626b491f7674..03ac10b1cd1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a></div><div class='hunk'>@@ -869,9 +869,6 @@ static void bnx2x_hc_int_disable(struct bnx2x *bp)</div><div class='ctx'> 	   "write %x to HC %d (addr 0x%x)\n",</div><div class='ctx'> 	   val, port, addr);</div><div class='ctx'> </div><div class='del'>-	/* flush all outstanding writes */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, addr, val);</div><div class='ctx'> 	if (REG_RD(bp, addr) != val)</div><div class='ctx'> 		BNX2X_ERR("BUG! Proper val not read from IGU!\n");</div><div class='hunk'>@@ -887,9 +884,6 @@ static void bnx2x_igu_int_disable(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_IFDOWN, "write %x to IGU\n", val);</div><div class='ctx'> </div><div class='del'>-	/* flush all outstanding writes */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);</div><div class='ctx'> 	if (REG_RD(bp, IGU_REG_PF_CONFIGURATION) != val)</div><div class='ctx'> 		BNX2X_ERR("BUG! Proper val not read from IGU!\n");</div><div class='hunk'>@@ -1595,7 +1589,6 @@ static void bnx2x_hc_int_enable(struct bnx2x *bp)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that HC_CONFIG is written before leading/trailing edge config</div><div class='ctx'> 	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> </div><div class='ctx'> 	if (!CHIP_IS_E1(bp)) {</div><div class='hunk'>@@ -1611,9 +1604,6 @@ static void bnx2x_hc_int_enable(struct bnx2x *bp)</div><div class='ctx'> 		REG_WR(bp, HC_REG_TRAILING_EDGE_0 + port*8, val);</div><div class='ctx'> 		REG_WR(bp, HC_REG_LEADING_EDGE_0 + port*8, val);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Make sure that interrupts are indeed enabled from here on */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_igu_int_enable(struct bnx2x *bp)</div><div class='hunk'>@@ -1674,9 +1664,6 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	REG_WR(bp, IGU_REG_TRAILING_EDGE_LATCH, val);</div><div class='ctx'> 	REG_WR(bp, IGU_REG_LEADING_EDGE_LATCH, val);</div><div class='del'>-</div><div class='del'>-	/* Make sure that interrupts are indeed enabled from here on */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnx2x_int_enable(struct bnx2x *bp)</div><div class='hunk'>@@ -3833,7 +3820,6 @@ static void bnx2x_sp_prod_update(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	REG_WR16_RELAXED(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func),</div><div class='ctx'> 			 bp-&gt;spq_prod_idx);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -5244,7 +5230,6 @@ static void bnx2x_update_eq_prod(struct bnx2x *bp, u16 prod)</div><div class='ctx'> {</div><div class='ctx'> 	/* No memory barriers */</div><div class='ctx'> 	storm_memset_eq_prod(bp, prod, BP_FUNC(bp));</div><div class='del'>-	mmiowb(); /* keep prod updates ordered */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int  bnx2x_cnic_handle_cfc_del(struct bnx2x *bp, u32 cid,</div><div class='hunk'>@@ -6513,7 +6498,6 @@ void bnx2x_nic_init_cnic(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	/* flush all */</div><div class='ctx'> 	mb();</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnx2x_pre_irq_nic_init(struct bnx2x *bp)</div><div class='hunk'>@@ -6553,7 +6537,6 @@ void bnx2x_post_irq_nic_init(struct bnx2x *bp, u32 load_code)</div><div class='ctx'> </div><div class='ctx'> 	/* flush all before enabling interrupts */</div><div class='ctx'> 	mb();</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_int_enable(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -7775,12 +7758,10 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, bool is_pf)</div><div class='ctx'> 	DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",</div><div class='ctx'> 			 data, igu_addr_data);</div><div class='ctx'> 	REG_WR(bp, igu_addr_data, data);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> 	DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",</div><div class='ctx'> 			  ctl, igu_addr_ctl);</div><div class='ctx'> 	REG_WR(bp, igu_addr_ctl, ctl);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> </div><div class='ctx'> 	/* wait for clean up to finish */</div><div class='hunk'>@@ -9550,7 +9531,6 @@ static void bnx2x_set_234_gates(struct bnx2x *bp, bool close)</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_HW | NETIF_MSG_IFUP, "%s gates #2, #3 and #4\n",</div><div class='ctx'> 		close ? "closing" : "opening");</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SHARED_MF_CLP_MAGIC  0x80000000 /* `magic' bit */</div><div class='hunk'>@@ -9674,7 +9654,6 @@ static void bnx2x_pxp_prep(struct bnx2x *bp)</div><div class='ctx'> 	if (!CHIP_IS_E1(bp)) {</div><div class='ctx'> 		REG_WR(bp, PXP2_REG_RD_START_INIT, 0);</div><div class='ctx'> 		REG_WR(bp, PXP2_REG_RQ_RBC_DONE, 0);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -9774,16 +9753,13 @@ static void bnx2x_process_kill_chip_reset(struct bnx2x *bp, bool global)</div><div class='ctx'> 	       reset_mask1 &amp; (~not_reset_mask1));</div><div class='ctx'> </div><div class='ctx'> 	barrier();</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,</div><div class='ctx'> 	       reset_mask2 &amp; (~stay_reset2));</div><div class='ctx'> </div><div class='ctx'> 	barrier();</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, reset_mask1);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -9867,9 +9843,6 @@ static int bnx2x_process_kill(struct bnx2x *bp, bool global)</div><div class='ctx'> 	REG_WR(bp, MISC_REG_UNPREPARED, 0);</div><div class='ctx'> 	barrier();</div><div class='ctx'> </div><div class='del'>-	/* Make sure all is written to the chip before the reset */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	/* Wait for 1ms to empty GLUE and PCI-E core queues,</div><div class='ctx'> 	 * PSWHST, GRC and PSWRD Tetris buffer.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -14828,7 +14801,6 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mmiowb();</div><div class='ctx'> 		barrier();</div><div class='ctx'> </div><div class='ctx'> 		/* Start accepting on iSCSI L2 ring */</div><div class='hunk'>@@ -14863,7 +14835,6 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)</div><div class='ctx'> 		if (!bnx2x_wait_sp_comp(bp, sp_bits))</div><div class='ctx'> 			BNX2X_ERR("rx_mode completion timed out!\n");</div><div class='ctx'> </div><div class='del'>-		mmiowb();</div><div class='ctx'> 		barrier();</div><div class='ctx'> </div><div class='ctx'> 		/* Unset iSCSI L2 MAC */</div><div class='hunk'>@@ -15376,27 +15347,47 @@ static int bnx2x_enable_ptp_packets(struct bnx2x *bp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BNX2X_P2P_DETECT_PARAM_MASK 0x5F5</div><div class='add'>+#define BNX2X_P2P_DETECT_RULE_MASK 0x3DBB</div><div class='add'>+#define BNX2X_PTP_TX_ON_PARAM_MASK (BNX2X_P2P_DETECT_PARAM_MASK &amp; 0x6AA)</div><div class='add'>+#define BNX2X_PTP_TX_ON_RULE_MASK (BNX2X_P2P_DETECT_RULE_MASK &amp; 0x3EEE)</div><div class='add'>+#define BNX2X_PTP_V1_L4_PARAM_MASK (BNX2X_P2P_DETECT_PARAM_MASK &amp; 0x7EE)</div><div class='add'>+#define BNX2X_PTP_V1_L4_RULE_MASK (BNX2X_P2P_DETECT_RULE_MASK &amp; 0x3FFE)</div><div class='add'>+#define BNX2X_PTP_V2_L4_PARAM_MASK (BNX2X_P2P_DETECT_PARAM_MASK &amp; 0x7EA)</div><div class='add'>+#define BNX2X_PTP_V2_L4_RULE_MASK (BNX2X_P2P_DETECT_RULE_MASK &amp; 0x3FEE)</div><div class='add'>+#define BNX2X_PTP_V2_L2_PARAM_MASK (BNX2X_P2P_DETECT_PARAM_MASK &amp; 0x6BF)</div><div class='add'>+#define BNX2X_PTP_V2_L2_RULE_MASK (BNX2X_P2P_DETECT_RULE_MASK &amp; 0x3EFF)</div><div class='add'>+#define BNX2X_PTP_V2_PARAM_MASK (BNX2X_P2P_DETECT_PARAM_MASK &amp; 0x6AA)</div><div class='add'>+#define BNX2X_PTP_V2_RULE_MASK (BNX2X_P2P_DETECT_RULE_MASK &amp; 0x3EEE)</div><div class='add'>+</div><div class='ctx'> int bnx2x_configure_ptp_filters(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='add'>+	u32 param, rule;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;hwtstamp_ioctl_called)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	param = port ? NIG_REG_P1_TLLH_PTP_PARAM_MASK :</div><div class='add'>+		NIG_REG_P0_TLLH_PTP_PARAM_MASK;</div><div class='add'>+	rule = port ? NIG_REG_P1_TLLH_PTP_RULE_MASK :</div><div class='add'>+		NIG_REG_P0_TLLH_PTP_RULE_MASK;</div><div class='ctx'> 	switch (bp-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='ctx'> 		bp-&gt;flags |= TX_TIMESTAMPING_EN;</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_TLLH_PTP_PARAM_MASK :</div><div class='del'>-		       NIG_REG_P0_TLLH_PTP_PARAM_MASK, 0x6AA);</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_TLLH_PTP_RULE_MASK :</div><div class='del'>-		       NIG_REG_P0_TLLH_PTP_RULE_MASK, 0x3EEE);</div><div class='add'>+		REG_WR(bp, param, BNX2X_PTP_TX_ON_PARAM_MASK);</div><div class='add'>+		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='ctx'> 		BNX2X_ERR("One-step timestamping is not supported\n");</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	param = port ? NIG_REG_P1_LLH_PTP_PARAM_MASK :</div><div class='add'>+		NIG_REG_P0_LLH_PTP_PARAM_MASK;</div><div class='add'>+	rule = port ? NIG_REG_P1_LLH_PTP_RULE_MASK :</div><div class='add'>+		NIG_REG_P0_LLH_PTP_RULE_MASK;</div><div class='ctx'> 	switch (bp-&gt;rx_filter) {</div><div class='ctx'> 	case HWTSTAMP_FILTER_NONE:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -15410,30 +15401,24 @@ int bnx2x_configure_ptp_filters(struct bnx2x *bp)</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='ctx'> 		bp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;</div><div class='ctx'> 		/* Initialize PTP detection for UDP/IPv4 events */</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_PARAM_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_PARAM_MASK, 0x7EE);</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_RULE_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_RULE_MASK, 0x3FFE);</div><div class='add'>+		REG_WR(bp, param, BNX2X_PTP_V1_L4_PARAM_MASK);</div><div class='add'>+		REG_WR(bp, rule, BNX2X_PTP_V1_L4_RULE_MASK);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='ctx'> 		bp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;</div><div class='ctx'> 		/* Initialize PTP detection for UDP/IPv4 or UDP/IPv6 events */</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_PARAM_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_PARAM_MASK, 0x7EA);</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_RULE_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_RULE_MASK, 0x3FEE);</div><div class='add'>+		REG_WR(bp, param, BNX2X_PTP_V2_L4_PARAM_MASK);</div><div class='add'>+		REG_WR(bp, rule, BNX2X_PTP_V2_L4_RULE_MASK);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='ctx'> 		bp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;</div><div class='ctx'> 		/* Initialize PTP detection L2 events */</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_PARAM_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_PARAM_MASK, 0x6BF);</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_RULE_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_RULE_MASK, 0x3EFF);</div><div class='add'>+		REG_WR(bp, param, BNX2X_PTP_V2_L2_PARAM_MASK);</div><div class='add'>+		REG_WR(bp, rule, BNX2X_PTP_V2_L2_RULE_MASK);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='hunk'>@@ -15441,10 +15426,8 @@ int bnx2x_configure_ptp_filters(struct bnx2x *bp)</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='ctx'> 		bp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='ctx'> 		/* Initialize PTP detection L2, UDP/IPv4 or UDP/IPv6 events */</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_PARAM_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_PARAM_MASK, 0x6AA);</div><div class='del'>-		REG_WR(bp, port ? NIG_REG_P1_LLH_PTP_RULE_MASK :</div><div class='del'>-		       NIG_REG_P0_LLH_PTP_RULE_MASK, 0x3EEE);</div><div class='add'>+		REG_WR(bp, param, BNX2X_PTP_V2_PARAM_MASK);</div><div class='add'>+		REG_WR(bp, rule, BNX2X_PTP_V2_RULE_MASK);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </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 7b22a6d8514c..80d250a6d048 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a></div><div class='hunk'>@@ -5039,7 +5039,6 @@ static inline int bnx2x_q_init(struct bnx2x *bp,</div><div class='ctx'> 	/* As no ramrod is sent, complete the command immediately  */</div><div class='ctx'> 	o-&gt;complete_cmd(bp, o, BNX2X_Q_CMD_INIT);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</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 c97b642e6537..0edbb0a76847 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c</a></div><div class='hunk'>@@ -100,13 +100,11 @@ static void bnx2x_vf_igu_ack_sb(struct bnx2x *bp, struct bnx2x_virtf *vf,</div><div class='ctx'> 	DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",</div><div class='ctx'> 	   cmd_data.sb_id_and_flags, igu_addr_data);</div><div class='ctx'> 	REG_WR(bp, igu_addr_data, cmd_data.sb_id_and_flags);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",</div><div class='ctx'> 	   ctl, igu_addr_ctl);</div><div class='ctx'> 	REG_WR(bp, igu_addr_ctl, ctl);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> }</div><div class='ctx'> </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 a9bdc21873d3..0752b7fa4d9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c</a></div><div class='hunk'>@@ -172,8 +172,6 @@ static int bnx2x_send_msg2pf(struct bnx2x *bp, u8 *done, dma_addr_t msg_mapping)</div><div class='ctx'> 	/* Trigger the PF FW */</div><div class='ctx'> 	writeb_relaxed(1, &amp;zone_data-&gt;trigger.vf_pf_channel.addr_valid);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	/* Wait for PF to complete */</div><div class='ctx'> 	while ((tout &gt;= 0) &amp;&amp; (!*done)) {</div><div class='ctx'> 		msleep(interval);</div><div class='hunk'>@@ -957,7 +955,7 @@ int bnx2x_vfpf_update_vlan(struct bnx2x *bp, u16 vid, u8 vf_qid, bool add)</div><div class='ctx'> 	bnx2x_sample_bulletin(bp);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;shadow_bulletin.content.valid_bitmap &amp; 1 &lt;&lt; VLAN_VALID) {</div><div class='del'>-		BNX2X_ERR("Hypervisor will dicline the request, avoiding\n");</div><div class='add'>+		BNX2X_ERR("Hypervisor will decline the request, avoiding\n");</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1179,7 +1177,6 @@ static void bnx2x_vf_mbx_resp_send_msg(struct bnx2x *bp,</div><div class='ctx'> </div><div class='ctx'> 	/* ack the FW */</div><div class='ctx'> 	storm_memset_vf_mbx_ack(bp, vf-&gt;abs_vfid);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	/* copy the response header including status-done field,</div><div class='ctx'> 	 * must be last dmae, must be after FW is acked</div><div class='hunk'>@@ -2174,7 +2171,6 @@ static void bnx2x_vf_mbx_request(struct bnx2x *bp, struct bnx2x_virtf *vf,</div><div class='ctx'> 		 */</div><div class='ctx'> 		storm_memset_vf_mbx_ack(bp, vf-&gt;abs_vfid);</div><div class='ctx'> 		/* Firmware ack should be written before unlocking channel */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		bnx2x_unlock_vf_pf_channel(bp, vf, mbx-&gt;first_tlv.tl.type);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c<br/>index 0bb9d7b3a2b6..8314c00d7537 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a></div><div class='hunk'>@@ -114,6 +114,7 @@ enum board_idx {</div><div class='ctx'> 	BCM5745x_NPAR,</div><div class='ctx'> 	BCM57508,</div><div class='ctx'> 	BCM57504,</div><div class='add'>+	BCM57502,</div><div class='ctx'> 	BCM58802,</div><div class='ctx'> 	BCM58804,</div><div class='ctx'> 	BCM58808,</div><div class='hunk'>@@ -158,6 +159,7 @@ static const struct {</div><div class='ctx'> 	[BCM5745x_NPAR] = { "Broadcom BCM5745x NetXtreme-E Ethernet Partition" },</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='add'>+	[BCM57502] = { "Broadcom BCM57502 NetXtreme-E 10Gb/25Gb/50Gb Ethernet" },</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='hunk'>@@ -205,6 +207,7 @@ static const struct pci_device_id bnxt_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16f1), .driver_data = BCM57452 },</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='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 },</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='hunk'>@@ -216,6 +219,7 @@ static const struct pci_device_id bnxt_pci_tbl[] = {</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, 0x1806), .driver_data = NETXTREME_E_P5_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1807), .driver_data = NETXTREME_E_P5_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0xd800), .driver_data = NETXTREME_S_VF },</div><div class='ctx'> #endif</div><div class='hunk'>@@ -551,15 +555,13 @@ normal_tx:</div><div class='ctx'> 	prod = NEXT_TX(prod);</div><div class='ctx'> 	txr-&gt;tx_prod = prod;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;xmit_more || netif_xmit_stopped(txq))</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(txq))</div><div class='ctx'> 		bnxt_db_write(bp, &amp;txr-&gt;tx_db, prod);</div><div class='ctx'> </div><div class='ctx'> tx_done:</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(bnxt_tx_avail(bp, txr) &lt;= MAX_SKB_FRAGS + 1)) {</div><div class='del'>-		if (skb-&gt;xmit_more &amp;&amp; !tx_buf-&gt;is_push)</div><div class='add'>+		if (netdev_xmit_more() &amp;&amp; !tx_buf-&gt;is_push)</div><div class='ctx'> 			bnxt_db_write(bp, &amp;txr-&gt;tx_db, prod);</div><div class='ctx'> </div><div class='ctx'> 		netif_tx_stop_queue(txq);</div><div class='hunk'>@@ -899,7 +901,7 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp,</div><div class='ctx'> 			     DMA_ATTR_WEAK_ORDERING);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!payload))</div><div class='del'>-		payload = eth_get_headlen(data_ptr, len);</div><div class='add'>+		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='hunk'>@@ -1133,6 +1135,8 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 	tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(cons != rxr-&gt;rx_next_cons)) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "TPA cons %x != expected cons %x\n",</div><div class='add'>+			    cons, rxr-&gt;rx_next_cons);</div><div class='ctx'> 		bnxt_sched_reset(bp, rxr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1585,15 +1589,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cons = rxcmp-&gt;rx_cmp_opaque;</div><div class='del'>-	rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='del'>-	data = rx_buf-&gt;data;</div><div class='del'>-	data_ptr = rx_buf-&gt;data_ptr;</div><div class='ctx'> 	if (unlikely(cons != rxr-&gt;rx_next_cons)) {</div><div class='ctx'> 		int rc1 = bnxt_discard_rx(bp, cpr, raw_cons, rxcmp);</div><div class='ctx'> </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='ctx'> 		bnxt_sched_reset(bp, rxr);</div><div class='ctx'> 		return rc1;</div><div class='ctx'> 	}</div><div class='add'>+	rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='add'>+	data = rx_buf-&gt;data;</div><div class='add'>+	data_ptr = rx_buf-&gt;data_ptr;</div><div class='ctx'> 	prefetch(data_ptr);</div><div class='ctx'> </div><div class='ctx'> 	misc = le32_to_cpu(rxcmp-&gt;rx_cmp_misc_v1);</div><div class='hunk'>@@ -1610,12 +1616,18 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> </div><div class='ctx'> 	rx_buf-&gt;data = NULL;</div><div class='ctx'> 	if (rxcmp1-&gt;rx_cmp_cfa_code_errors_v2 &amp; RX_CMP_L2_ERRORS) {</div><div class='add'>+		u32 rx_err = le32_to_cpu(rxcmp1-&gt;rx_cmp_cfa_code_errors_v2);</div><div class='add'>+</div><div class='ctx'> 		bnxt_reuse_rx_data(rxr, cons, data);</div><div class='ctx'> 		if (agg_bufs)</div><div class='ctx'> 			bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);</div><div class='ctx'> </div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		goto next_rx;</div><div class='add'>+		if (rx_err &amp; RX_CMPL_ERRORS_BUFFER_ERROR_MASK) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "RX buffer error %x\n", rx_err);</div><div class='add'>+			bnxt_sched_reset(bp, rxr);</div><div class='add'>+		}</div><div class='add'>+		goto next_rx_no_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	len = le32_to_cpu(rxcmp-&gt;rx_cmp_len_flags_type) &gt;&gt; RX_CMP_LEN_SHIFT;</div><div class='hunk'>@@ -1696,12 +1708,13 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	rc = 1;</div><div class='ctx'> </div><div class='ctx'> next_rx:</div><div class='del'>-	rxr-&gt;rx_prod = NEXT_RX(prod);</div><div class='del'>-	rxr-&gt;rx_next_cons = NEXT_RX(cons);</div><div class='del'>-</div><div class='ctx'> 	cpr-&gt;rx_packets += 1;</div><div class='ctx'> 	cpr-&gt;rx_bytes += len;</div><div class='ctx'> </div><div class='add'>+next_rx_no_len:</div><div class='add'>+	rxr-&gt;rx_prod = NEXT_RX(prod);</div><div class='add'>+	rxr-&gt;rx_next_cons = NEXT_RX(cons);</div><div class='add'>+</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='hunk'>@@ -2123,7 +2136,6 @@ static int bnxt_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			       &amp;dim_sample);</div><div class='ctx'> 		net_dim(&amp;cpr-&gt;dim, dim_sample);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3385,6 +3397,12 @@ static void bnxt_free_port_stats(struct bnxt *bp)</div><div class='ctx'> 				  bp-&gt;hw_rx_port_stats_ext_map);</div><div class='ctx'> 		bp-&gt;hw_rx_port_stats_ext = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hw_pcie_stats) {</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, sizeof(struct pcie_ctx_hw_stats),</div><div class='add'>+				  bp-&gt;hw_pcie_stats, bp-&gt;hw_pcie_stats_map);</div><div class='add'>+		bp-&gt;hw_pcie_stats = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_free_ring_stats(struct bnxt *bp)</div><div class='hunk'>@@ -3429,56 +3447,68 @@ static int bnxt_alloc_stats(struct bnxt *bp)</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'>-	if (BNXT_PF(bp) &amp;&amp; bp-&gt;chip_num != CHIP_NUM_58700) {</div><div class='del'>-		if (bp-&gt;hw_rx_port_stats)</div><div class='del'>-			goto alloc_ext_stats;</div><div class='add'>+	if (BNXT_VF(bp) || bp-&gt;chip_num == CHIP_NUM_58700)</div><div class='add'>+		return 0;</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='add'>+	if (bp-&gt;hw_rx_port_stats)</div><div class='add'>+		goto alloc_ext_stats;</div><div class='ctx'> </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;hw_port_stats_size = sizeof(struct rx_port_stats) +</div><div class='add'>+				 sizeof(struct tx_port_stats) + 1024;</div><div class='add'>+</div><div class='add'>+	bp-&gt;hw_rx_port_stats =</div><div class='add'>+		dma_alloc_coherent(&amp;pdev-&gt;dev, bp-&gt;hw_port_stats_size,</div><div class='add'>+				   &amp;bp-&gt;hw_rx_port_stats_map,</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;hw_rx_port_stats)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		bp-&gt;hw_tx_port_stats = (void *)(bp-&gt;hw_rx_port_stats + 1) +</div><div class='del'>-				       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='del'>-		bp-&gt;flags |= BNXT_FLAG_PORT_STATS;</div><div class='add'>+	bp-&gt;hw_tx_port_stats = (void *)(bp-&gt;hw_rx_port_stats + 1) + 512;</div><div class='add'>+	bp-&gt;hw_tx_port_stats_map = bp-&gt;hw_rx_port_stats_map +</div><div class='add'>+				   sizeof(struct rx_port_stats) + 512;</div><div class='add'>+	bp-&gt;flags |= BNXT_FLAG_PORT_STATS;</div><div class='ctx'> </div><div class='ctx'> alloc_ext_stats:</div><div class='del'>-		/* Display extended statistics only if FW supports it */</div><div class='del'>-		if (bp-&gt;hwrm_spec_code &lt; 0x10804 ||</div><div class='del'>-		    bp-&gt;hwrm_spec_code == 0x10900)</div><div class='add'>+	/* Display extended statistics only if FW supports it */</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10804 || bp-&gt;hwrm_spec_code == 0x10900)</div><div class='add'>+		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='del'>-			goto alloc_tx_ext_stats;</div><div class='add'>+	if (bp-&gt;hw_rx_port_stats_ext)</div><div class='add'>+		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,</div><div class='del'>-					   sizeof(struct rx_port_stats_ext),</div><div class='del'>-					   &amp;bp-&gt;hw_rx_port_stats_ext_map,</div><div class='del'>-					   GFP_KERNEL);</div><div class='del'>-		if (!bp-&gt;hw_rx_port_stats_ext)</div><div class='del'>-			return 0;</div><div class='add'>+	bp-&gt;hw_rx_port_stats_ext =</div><div class='add'>+		dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(struct rx_port_stats_ext),</div><div class='add'>+				   &amp;bp-&gt;hw_rx_port_stats_ext_map, GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;hw_rx_port_stats_ext)</div><div class='add'>+		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'>-			return 0;</div><div class='add'>+	if (bp-&gt;hw_tx_port_stats_ext)</div><div class='add'>+		goto alloc_pcie_stats;</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;hwrm_spec_code &gt;= 0x10902) {</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='del'>-		}</div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_PORT_STATS_EXT;</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &gt;= 0x10902 ||</div><div class='add'>+	    (bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_STATS_SUPPORTED)) {</div><div class='add'>+		bp-&gt;hw_tx_port_stats_ext =</div><div class='add'>+			dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					   sizeof(struct tx_port_stats_ext),</div><div class='add'>+					   &amp;bp-&gt;hw_tx_port_stats_ext_map,</div><div class='add'>+					   GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='add'>+	bp-&gt;flags |= BNXT_FLAG_PORT_STATS_EXT;</div><div class='add'>+</div><div class='add'>+alloc_pcie_stats:</div><div class='add'>+	if (bp-&gt;hw_pcie_stats ||</div><div class='add'>+	    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PCIE_STATS_SUPPORTED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bp-&gt;hw_pcie_stats =</div><div class='add'>+		dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(struct pcie_ctx_hw_stats),</div><div class='add'>+				   &amp;bp-&gt;hw_pcie_stats_map, GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;hw_pcie_stats)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bp-&gt;flags |= BNXT_FLAG_PCIE_STATS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4197,16 +4227,25 @@ static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,</div><div class='ctx'> static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,</div><div class='ctx'> 					     struct bnxt_ntuple_filter *fltr)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[fltr-&gt;rxq + 1];</div><div class='ctx'> 	struct hwrm_cfa_ntuple_filter_alloc_input req = {0};</div><div class='ctx'> 	struct hwrm_cfa_ntuple_filter_alloc_output *resp;</div><div class='ctx'> 	struct flow_keys *keys = &amp;fltr-&gt;fkeys;</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='add'>+	u32 dst_ena = 0;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_NTUPLE_FILTER_ALLOC, -1, -1);</div><div class='ctx'> 	req.l2_filter_id = bp-&gt;vnic_info[0].fw_l2_filter_id[fltr-&gt;l2_fltr_idx];</div><div class='ctx'> </div><div class='del'>-	req.enables = cpu_to_le32(BNXT_NTP_FLTR_FLAGS);</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX) {</div><div class='add'>+		dst_ena = CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX;</div><div class='add'>+		req.rfs_ring_tbl_idx = cpu_to_le16(fltr-&gt;rxq);</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[0];</div><div class='add'>+	} else {</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[fltr-&gt;rxq + 1];</div><div class='add'>+	}</div><div class='add'>+	req.dst_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	req.enables = cpu_to_le32(BNXT_NTP_FLTR_FLAGS | dst_ena);</div><div class='ctx'> </div><div class='ctx'> 	req.ethertype = htons(ETH_P_IP);</div><div class='ctx'> 	memcpy(req.src_macaddr, fltr-&gt;src_mac_addr, ETH_ALEN);</div><div class='hunk'>@@ -4244,7 +4283,6 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,</div><div class='ctx'> 	req.dst_port = keys-&gt;ports.dst;</div><div class='ctx'> 	req.dst_port_mask = cpu_to_be16(0xffff);</div><div class='ctx'> </div><div class='del'>-	req.dst_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='ctx'> 	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='ctx'> 	if (!rc) {</div><div class='hunk'>@@ -5125,10 +5163,10 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</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='del'>-		u32 cmpl_ring_id;</div><div class='ctx'> </div><div class='del'>-		cmpl_ring_id = bnxt_cp_ring_for_tx(bp, txr);</div><div class='ctx'> 		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='add'>+			u32 cmpl_ring_id = bnxt_cp_ring_for_tx(bp, txr);</div><div class='add'>+</div><div class='ctx'> 			hwrm_ring_free_send_msg(bp, ring,</div><div class='ctx'> 						RING_FREE_REQ_RING_TYPE_TX,</div><div class='ctx'> 						close_path ? cmpl_ring_id :</div><div class='hunk'>@@ -5141,10 +5179,10 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</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 = &amp;rxr-&gt;rx_ring_struct;</div><div class='ctx'> 		u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='del'>-		u32 cmpl_ring_id;</div><div class='ctx'> </div><div class='del'>-		cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='ctx'> 		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='add'>+			u32 cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+</div><div class='ctx'> 			hwrm_ring_free_send_msg(bp, ring,</div><div class='ctx'> 						RING_FREE_REQ_RING_TYPE_RX,</div><div class='ctx'> 						close_path ? cmpl_ring_id :</div><div class='hunk'>@@ -5163,10 +5201,10 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</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 = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='ctx'> 		u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='del'>-		u32 cmpl_ring_id;</div><div class='ctx'> </div><div class='del'>-		cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='ctx'> 		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='add'>+			u32 cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+</div><div class='ctx'> 			hwrm_ring_free_send_msg(bp, ring, type,</div><div class='ctx'> 						close_path ? cmpl_ring_id :</div><div class='ctx'> 						INVALID_HW_RING_ID);</div><div class='hunk'>@@ -5305,17 +5343,16 @@ __bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct hwrm_func_cfg_input *req,</div><div class='ctx'> 	req-&gt;num_tx_rings = cpu_to_le16(tx_rings);</div><div class='ctx'> 	if (BNXT_NEW_RM(bp)) {</div><div class='ctx'> 		enables |= rx_rings ? FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS : 0;</div><div class='add'>+		enables |= stats ? FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='ctx'> 		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='ctx'> 			enables |= cp_rings ? FUNC_CFG_REQ_ENABLES_NUM_MSIX : 0;</div><div class='ctx'> 			enables |= tx_rings + ring_grps ?</div><div class='del'>-				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS |</div><div class='del'>-				   FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='ctx'> 			enables |= rx_rings ?</div><div class='ctx'> 				FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			enables |= cp_rings ?</div><div class='del'>-				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS |</div><div class='del'>-				   FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='ctx'> 			enables |= ring_grps ?</div><div class='ctx'> 				   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS |</div><div class='ctx'> 				   FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='hunk'>@@ -5355,14 +5392,13 @@ __bnxt_hwrm_reserve_vf_rings(struct bnxt *bp,</div><div class='ctx'> 	enables |= tx_rings ? FUNC_VF_CFG_REQ_ENABLES_NUM_TX_RINGS : 0;</div><div class='ctx'> 	enables |= rx_rings ? FUNC_VF_CFG_REQ_ENABLES_NUM_RX_RINGS |</div><div class='ctx'> 			      FUNC_VF_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='add'>+	enables |= stats ? FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='ctx'> 		enables |= tx_rings + ring_grps ?</div><div class='del'>-			   FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS |</div><div class='del'>-			   FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+			   FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		enables |= cp_rings ?</div><div class='del'>-			   FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS |</div><div class='del'>-			   FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+			   FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='ctx'> 		enables |= ring_grps ?</div><div class='ctx'> 			   FUNC_VF_CFG_REQ_ENABLES_NUM_HW_RING_GRPS : 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5494,11 +5530,13 @@ static bool bnxt_need_reserve_rings(struct bnxt *bp)</div><div class='ctx'> 	stat = bnxt_get_func_stat_ctxs(bp);</div><div class='ctx'> 	if (BNXT_NEW_RM(bp) &amp;&amp;</div><div class='ctx'> 	    (hw_resc-&gt;resv_rx_rings != rx || hw_resc-&gt;resv_cp_rings != cp ||</div><div class='del'>-	     hw_resc-&gt;resv_irqs &lt; nq || hw_resc-&gt;resv_vnics != vnic ||</div><div class='del'>-	     hw_resc-&gt;resv_stat_ctxs != stat ||</div><div class='add'>+	     hw_resc-&gt;resv_vnics != vnic || hw_resc-&gt;resv_stat_ctxs != stat ||</div><div class='ctx'> 	     (hw_resc-&gt;resv_hw_ring_grps != grp &amp;&amp;</div><div class='ctx'> 	      !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))))</div><div class='ctx'> 		return true;</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) &amp;&amp; BNXT_PF(bp) &amp;&amp;</div><div class='add'>+	    hw_resc-&gt;resv_irqs != nq)</div><div class='add'>+		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6047,6 +6085,8 @@ static int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)</div><div class='ctx'> 			ctx-&gt;tqm_entries_multiple = 1;</div><div class='ctx'> 		ctx-&gt;mrav_max_entries = le32_to_cpu(resp-&gt;mrav_max_entries);</div><div class='ctx'> 		ctx-&gt;mrav_entry_size = le16_to_cpu(resp-&gt;mrav_entry_size);</div><div class='add'>+		ctx-&gt;mrav_num_entries_units =</div><div class='add'>+			le16_to_cpu(resp-&gt;mrav_num_entries_units);</div><div class='ctx'> 		ctx-&gt;tim_entry_size = le16_to_cpu(resp-&gt;tim_entry_size);</div><div class='ctx'> 		ctx-&gt;tim_max_entries = le32_to_cpu(resp-&gt;tim_max_entries);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -6093,6 +6133,7 @@ static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables)</div><div class='ctx'> 	struct bnxt_ctx_pg_info *ctx_pg;</div><div class='ctx'> 	__le32 *num_entries;</div><div class='ctx'> 	__le64 *pg_dir;</div><div class='add'>+	u32 flags = 0;</div><div class='ctx'> 	u8 *pg_attr;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> 	u32 ena;</div><div class='hunk'>@@ -6152,6 +6193,9 @@ static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables)</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV) {</div><div class='ctx'> 		ctx_pg = &amp;ctx-&gt;mrav_mem;</div><div class='ctx'> 		req.mrav_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		if (ctx-&gt;mrav_num_entries_units)</div><div class='add'>+			flags |=</div><div class='add'>+			FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT;</div><div class='ctx'> 		req.mrav_entry_size = cpu_to_le16(ctx-&gt;mrav_entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='ctx'> 				      &amp;req.mrav_pg_size_mrav_lvl,</div><div class='hunk'>@@ -6178,6 +6222,7 @@ static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables)</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='add'>+	req.flags = cpu_to_le32(flags);</div><div class='ctx'> 	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -6316,6 +6361,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)</div><div class='ctx'> 	struct bnxt_ctx_pg_info *ctx_pg;</div><div class='ctx'> 	struct bnxt_ctx_mem_info *ctx;</div><div class='ctx'> 	u32 mem_size, ena, entries;</div><div class='add'>+	u32 num_mr, num_ah;</div><div class='ctx'> 	u32 extra_srqs = 0;</div><div class='ctx'> 	u32 extra_qps = 0;</div><div class='ctx'> 	u8 pg_lvl = 1;</div><div class='hunk'>@@ -6379,12 +6425,21 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)</div><div class='ctx'> 		goto skip_rdma;</div><div class='ctx'> </div><div class='ctx'> 	ctx_pg = &amp;ctx-&gt;mrav_mem;</div><div class='del'>-	ctx_pg-&gt;entries = extra_qps * 4;</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 = 1024 * 256;</div><div class='add'>+	num_ah = 1024 * 128;</div><div class='add'>+	ctx_pg-&gt;entries = num_mr + num_ah;</div><div class='ctx'> 	mem_size = ctx-&gt;mrav_entry_size * ctx_pg-&gt;entries;</div><div class='ctx'> 	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 2);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	ena = FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV;</div><div class='add'>+	if (ctx-&gt;mrav_num_entries_units)</div><div class='add'>+		ctx_pg-&gt;entries =</div><div class='add'>+			((num_mr / ctx-&gt;mrav_num_entries_units) &lt;&lt; 16) |</div><div class='add'>+			 (num_ah / ctx-&gt;mrav_num_entries_units);</div><div class='ctx'> </div><div class='ctx'> 	ctx_pg = &amp;ctx-&gt;tim_mem;</div><div class='ctx'> 	ctx_pg-&gt;entries = ctx-&gt;qp_mem.entries;</div><div class='hunk'>@@ -6499,6 +6554,10 @@ 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_PCIE_STATS_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_PCIE_STATS_SUPPORTED;</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_EXT_STATS_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_EXT_STATS_SUPPORTED;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;tx_push_thresh = 0;</div><div class='ctx'> 	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED)</div><div class='hunk'>@@ -6571,6 +6630,34 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_hwrm_cfa_adv_flow_mgnt_qcaps(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_cfa_adv_flow_mgnt_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_cfa_adv_flow_mgnt_qcaps_output *resp;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_ADV_FLOW))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_ADV_FLOW_MGNT_QCAPS, -1, -1);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto hwrm_cfa_adv_qcaps_exit;</div><div class='add'>+</div><div class='add'>+	flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+	if (flags &amp;</div><div class='add'>+	    CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX;</div><div class='add'>+</div><div class='add'>+hwrm_cfa_adv_qcaps_exit:</div><div class='add'>+	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_hwrm_func_reset(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct hwrm_func_reset_input req = {0};</div><div class='hunk'>@@ -6662,6 +6749,15 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='ctx'> 		 resp-&gt;hwrm_fw_maj_8b, resp-&gt;hwrm_fw_min_8b,</div><div class='ctx'> 		 resp-&gt;hwrm_fw_bld_8b, resp-&gt;hwrm_fw_rsvd_8b);</div><div class='ctx'> </div><div class='add'>+	if (strlen(resp-&gt;active_pkg_name)) {</div><div class='add'>+		int fw_ver_len = strlen(bp-&gt;fw_ver_str);</div><div class='add'>+</div><div class='add'>+		snprintf(bp-&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'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_PKG_VER;</div><div class='add'>+	}</div><div class='add'>+</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='hunk'>@@ -6694,6 +6790,10 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='ctx'> 	    VER_GET_RESP_DEV_CAPS_CFG_TRUSTED_VF_SUPPORTED)</div><div class='ctx'> 		bp-&gt;fw_cap |= BNXT_FW_CAP_TRUSTED_VF;</div><div class='ctx'> </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'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_ADV_FLOW;</div><div class='add'>+</div><div class='ctx'> hwrm_ver_get_exit:</div><div class='ctx'> 	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -6743,6 +6843,7 @@ static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)</div><div class='ctx'> 	struct hwrm_queue_pri2cos_qcfg_input req2 = {0};</div><div class='ctx'> 	struct hwrm_port_qstats_ext_input req = {0};</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='add'>+	u32 tx_stat_size;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT))</div><div class='hunk'>@@ -6752,13 +6853,16 @@ static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)</div><div class='ctx'> 	req.port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='ctx'> 	req.rx_stat_size = cpu_to_le16(sizeof(struct rx_port_stats_ext));</div><div class='ctx'> 	req.rx_stat_host_addr = cpu_to_le64(bp-&gt;hw_rx_port_stats_ext_map);</div><div class='del'>-	req.tx_stat_size = cpu_to_le16(sizeof(struct tx_port_stats_ext));</div><div class='add'>+	tx_stat_size = bp-&gt;hw_tx_port_stats_ext ?</div><div class='add'>+		       sizeof(*bp-&gt;hw_tx_port_stats_ext) : 0;</div><div class='add'>+	req.tx_stat_size = cpu_to_le16(tx_stat_size);</div><div class='ctx'> 	req.tx_stat_host_addr = cpu_to_le64(bp-&gt;hw_tx_port_stats_ext_map);</div><div class='ctx'> 	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		bp-&gt;fw_rx_stats_ext_size = le16_to_cpu(resp-&gt;rx_stat_size) / 8;</div><div class='del'>-		bp-&gt;fw_tx_stats_ext_size = le16_to_cpu(resp-&gt;tx_stat_size) / 8;</div><div class='add'>+		bp-&gt;fw_tx_stats_ext_size = tx_stat_size ?</div><div class='add'>+			le16_to_cpu(resp-&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='hunk'>@@ -6795,6 +6899,19 @@ static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_hwrm_pcie_qstats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_pcie_qstats_input req = {0};</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PCIE_QSTATS, -1, -1);</div><div class='add'>+	req.pcie_stat_size = cpu_to_le16(sizeof(struct pcie_ctx_hw_stats));</div><div class='add'>+	req.pcie_stat_host_addr = cpu_to_le64(bp-&gt;hw_pcie_stats_map);</div><div class='add'>+	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_hwrm_free_tunnel_ports(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	if (bp-&gt;vxlan_port_cnt) {</div><div class='hunk'>@@ -8642,7 +8759,7 @@ static int bnxt_hwrm_port_phy_read(struct bnxt *bp, u16 phy_addr, u16 reg,</div><div class='ctx'> 	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='ctx'> 	req.phy_addr = phy_addr;</div><div class='ctx'> 	req.reg_addr = cpu_to_le16(reg &amp; 0x1f);</div><div class='del'>-	if (bp-&gt;link_info.support_speeds &amp; BNXT_LINK_SPEED_MSK_10GB) {</div><div class='add'>+	if (mdio_phy_id_is_c45(phy_addr)) {</div><div class='ctx'> 		req.cl45_mdio = 1;</div><div class='ctx'> 		req.phy_addr = mdio_phy_id_prtad(phy_addr);</div><div class='ctx'> 		req.dev_addr = mdio_phy_id_devad(phy_addr);</div><div class='hunk'>@@ -8669,7 +8786,7 @@ static int bnxt_hwrm_port_phy_write(struct bnxt *bp, u16 phy_addr, u16 reg,</div><div class='ctx'> 	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='ctx'> 	req.phy_addr = phy_addr;</div><div class='ctx'> 	req.reg_addr = cpu_to_le16(reg &amp; 0x1f);</div><div class='del'>-	if (bp-&gt;link_info.support_speeds &amp; BNXT_LINK_SPEED_MSK_10GB) {</div><div class='add'>+	if (mdio_phy_id_is_c45(phy_addr)) {</div><div class='ctx'> 		req.cl45_mdio = 1;</div><div class='ctx'> 		req.phy_addr = mdio_phy_id_prtad(phy_addr);</div><div class='ctx'> 		req.dev_addr = mdio_phy_id_devad(phy_addr);</div><div class='hunk'>@@ -8951,8 +9068,15 @@ static int bnxt_cfg_rx_mode(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> skip_uc:</div><div class='ctx'> 	rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, 0);</div><div class='add'>+	if (rc &amp;&amp; vnic-&gt;mc_list_count) {</div><div class='add'>+		netdev_info(bp-&gt;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 |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='add'>+		vnic-&gt;mc_list_count = 0;</div><div class='add'>+		rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, 0);</div><div class='add'>+	}</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_err(bp-&gt;dev, "HWRM cfa l2 rx mask failure rc: %x\n",</div><div class='add'>+		netdev_err(bp-&gt;dev, "HWRM cfa l2 rx mask failure rc: %d\n",</div><div class='ctx'> 			   rc);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -8980,8 +9104,11 @@ 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='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX)</div><div class='add'>+			return true;</div><div class='ctx'> 		return false;</div><div class='add'>+	}</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='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_NEW_RSS_CAP)</div><div class='hunk'>@@ -8996,7 +9123,7 @@ static bool bnxt_rfs_capable(struct bnxt *bp)</div><div class='ctx'> 	int vnics, max_vnics, max_rss_ctxs;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-		return false;</div><div class='add'>+		return bnxt_rfs_supported(bp);</div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_MSIX_CAP) || !bnxt_can_reserve_rings(bp))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -9378,6 +9505,7 @@ static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='ctx'> 		bnxt_hwrm_port_qstats(bp);</div><div class='ctx'> 		bnxt_hwrm_port_qstats_ext(bp);</div><div class='add'>+		bnxt_hwrm_pcie_qstats(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'>@@ -10048,23 +10176,6 @@ static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_get_phys_port_name(struct net_device *dev, char *buf,</div><div class='del'>-				   size_t len)</div><div class='del'>-{</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* The PF and it's VF-reps only support the switchdev framework */</div><div class='del'>-	if (!BNXT_PF(bp))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	rc = snprintf(buf, len, "p%d", bp-&gt;pf.port_id);</div><div class='del'>-</div><div class='del'>-	if (rc &gt;= len)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</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'> {</div><div class='hunk'>@@ -10083,6 +10194,13 @@ int bnxt_get_port_parent_id(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct devlink_port *bnxt_get_devlink_port(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 &amp;bp-&gt;dl_port;</div><div class='add'>+}</div><div class='add'>+</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='hunk'>@@ -10114,8 +10232,7 @@ static const struct net_device_ops bnxt_netdev_ops = {</div><div class='ctx'> 	.ndo_bpf		= bnxt_xdp,</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_port_parent_id	= bnxt_get_port_parent_id,</div><div class='del'>-	.ndo_get_phys_port_name = bnxt_get_phys_port_name</div><div class='add'>+	.ndo_get_devlink_port	= bnxt_get_devlink_port,</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'>@@ -10439,6 +10556,26 @@ 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 int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[])</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	int pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);</div><div class='add'>+	u32 dw;</div><div class='add'>+</div><div class='add'>+	if (!pos) {</div><div class='add'>+		netdev_info(bp-&gt;dev, "Unable do read adapter's DSN");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DSN (two dw) is at an offset of 4 from the cap pos */</div><div class='add'>+	pos += 4;</div><div class='add'>+	pci_read_config_dword(pdev, pos, &amp;dw);</div><div class='add'>+	put_unaligned_le32(dw, &amp;dsn[0]);</div><div class='add'>+	pci_read_config_dword(pdev, pos + 4, &amp;dw);</div><div class='add'>+	put_unaligned_le32(dw, &amp;dsn[4]);</div><div class='add'>+	return 0;</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='ctx'> 	static int version_printed;</div><div class='hunk'>@@ -10572,6 +10709,12 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		rc = -1;</div><div class='ctx'> 		goto init_err_pci_clean;</div><div class='ctx'> 	}</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='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'>@@ -10579,6 +10722,11 @@ 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'> </div><div class='add'>+	/* Read the adapter's DSN to use as the eswitch switch_id */</div><div class='add'>+	rc = bnxt_pcie_dsn_get(bp, bp-&gt;switch_id);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_err_pci_clean;</div><div class='add'>+</div><div class='ctx'> 	bnxt_hwrm_func_qcfg(bp);</div><div class='ctx'> 	bnxt_hwrm_vnic_qcaps(bp);</div><div class='ctx'> 	bnxt_hwrm_port_led_qcaps(bp);</div><div class='hunk'>@@ -10675,6 +10823,7 @@ init_err_cleanup_tc:</div><div class='ctx'> 	bnxt_clear_int_mode(bp);</div><div class='ctx'> </div><div class='ctx'> init_err_pci_clean:</div><div class='add'>+	bnxt_free_hwrm_short_cmd_req(bp);</div><div class='ctx'> 	bnxt_free_hwrm_resources(bp);</div><div class='ctx'> 	bnxt_free_ctx_mem(bp);</div><div class='ctx'> 	kfree(bp-&gt;ctx);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h<br/>index cf81ace7a6e6..eca36dd6b751 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a></div><div class='hunk'>@@ -1227,6 +1227,7 @@ struct bnxt_ctx_mem_info {</div><div class='ctx'> 	u16	mrav_entry_size;</div><div class='ctx'> 	u16	tim_entry_size;</div><div class='ctx'> 	u32	tim_max_entries;</div><div class='add'>+	u16	mrav_num_entries_units;</div><div class='ctx'> 	u8	tqm_entries_multiple;</div><div class='ctx'> </div><div class='ctx'> 	u32	flags;</div><div class='hunk'>@@ -1354,6 +1355,7 @@ struct bnxt {</div><div class='ctx'> 	#define BNXT_FLAG_DIM		0x2000000</div><div class='ctx'> 	#define BNXT_FLAG_ROCE_MIRROR_CAP	0x4000000</div><div class='ctx'> 	#define BNXT_FLAG_PORT_STATS_EXT	0x10000000</div><div class='add'>+	#define BNXT_FLAG_PCIE_STATS	0x40000000</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'>@@ -1480,6 +1482,11 @@ struct bnxt {</div><div class='ctx'> 	#define BNXT_FW_CAP_KONG_MB_CHNL		0x00000080</div><div class='ctx'> 	#define BNXT_FW_CAP_OVS_64BIT_HANDLE		0x00000400</div><div class='ctx'> 	#define BNXT_FW_CAP_TRUSTED_VF			0x00000800</div><div class='add'>+	#define BNXT_FW_CAP_PKG_VER			0x00004000</div><div class='add'>+	#define BNXT_FW_CAP_CFA_ADV_FLOW		0x00008000</div><div class='add'>+	#define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX	0x00010000</div><div class='add'>+	#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED	0x00020000</div><div class='add'>+	#define BNXT_FW_CAP_EXT_STATS_SUPPORTED		0x00040000</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='ctx'> 	u32			hwrm_spec_code;</div><div class='hunk'>@@ -1498,10 +1505,12 @@ struct bnxt {</div><div class='ctx'> 	struct tx_port_stats	*hw_tx_port_stats;</div><div class='ctx'> 	struct rx_port_stats_ext	*hw_rx_port_stats_ext;</div><div class='ctx'> 	struct tx_port_stats_ext	*hw_tx_port_stats_ext;</div><div class='add'>+	struct pcie_ctx_hw_stats	*hw_pcie_stats;</div><div class='ctx'> 	dma_addr_t		hw_rx_port_stats_map;</div><div class='ctx'> 	dma_addr_t		hw_tx_port_stats_map;</div><div class='ctx'> 	dma_addr_t		hw_rx_port_stats_ext_map;</div><div class='ctx'> 	dma_addr_t		hw_tx_port_stats_ext_map;</div><div class='add'>+	dma_addr_t		hw_pcie_stats_map;</div><div class='ctx'> 	int			hw_port_stats_size;</div><div class='ctx'> 	u16			fw_rx_stats_ext_size;</div><div class='ctx'> 	u16			fw_tx_stats_ext_size;</div><div class='hunk'>@@ -1634,6 +1643,9 @@ struct bnxt {</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='add'>+#define BNXT_PCIE_STATS_OFFSET(counter)			\</div><div class='add'>+	(offsetof(struct pcie_ctx_hw_stats, counter) / 8)</div><div class='add'>+</div><div class='ctx'> #define I2C_DEV_ADDR_A0				0xa0</div><div class='ctx'> #define I2C_DEV_ADDR_A2				0xa2</div><div class='ctx'> #define SFF_DIAG_SUPPORT_OFFSET			0x5c</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 e1feb97bcd81..549c90d3e465 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</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;net/devlink.h&gt;</div><div class='ctx'> #include "bnxt_hsi.h"</div><div class='ctx'> #include "bnxt.h"</div><div class='ctx'> #include "bnxt_vfr.h"</div><div class='hunk'>@@ -228,6 +229,9 @@ int bnxt_dl_register(struct bnxt *bp)</div><div class='ctx'> 		goto err_dl_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	devlink_port_attrs_set(&amp;bp-&gt;dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='add'>+			       bp-&gt;pf.port_id, false, 0,</div><div class='add'>+			       bp-&gt;switch_id, sizeof(bp-&gt;switch_id));</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='ctx'> 		netdev_err(bp-&gt;dev, "devlink_port_register failed");</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 adabbe94a259..b1263821a6e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a></div><div class='hunk'>@@ -235,6 +235,9 @@ 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='add'>+#define BNXT_PCIE_STATS_ENTRY(counter)	\</div><div class='add'>+	{ BNXT_PCIE_STATS_OFFSET(counter), __stringify(counter) }</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	RX_TOTAL_DISCARDS,</div><div class='ctx'> 	TX_TOTAL_DISCARDS,</div><div class='hunk'>@@ -345,6 +348,10 @@ static const struct {</div><div class='ctx'> 	BNXT_RX_STATS_EXT_ENTRY(resume_roce_pause_events),</div><div class='ctx'> 	BNXT_RX_STATS_EXT_COS_ENTRIES,</div><div class='ctx'> 	BNXT_RX_STATS_EXT_PFC_ENTRIES,</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_bits),</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_buffer_passed_threshold),</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_pcs_symbol_err),</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_corrected_bits),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='hunk'>@@ -383,6 +390,24 @@ 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='add'>+static const struct {</div><div class='add'>+	long offset;</div><div class='add'>+	char string[ETH_GSTRING_LEN];</div><div class='add'>+} bnxt_pcie_stats_arr[] = {</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_pl_signal_integrity),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_dl_signal_integrity),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_tl_signal_integrity),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_link_integrity),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_tx_traffic_rate),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_rx_traffic_rate),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_tx_dllp_statistics),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_rx_dllp_statistics),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_equalization_time),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_ltssm_histogram[0]),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_ltssm_histogram[2]),</div><div class='add'>+	BNXT_PCIE_STATS_ENTRY(pcie_recovery_histogram),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define BNXT_NUM_SW_FUNC_STATS	ARRAY_SIZE(bnxt_sw_func_stats)</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='hunk'>@@ -390,6 +415,7 @@ static const struct {</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='add'>+#define BNXT_NUM_PCIE_STATS ARRAY_SIZE(bnxt_pcie_stats_arr)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_num_stats(struct bnxt *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -407,6 +433,9 @@ static int bnxt_get_num_stats(struct bnxt *bp)</div><div class='ctx'> 			num_stats += BNXT_NUM_STATS_PRI;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS)</div><div class='add'>+		num_stats += BNXT_NUM_PCIE_STATS;</div><div class='add'>+</div><div class='ctx'> 	return num_stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -509,6 +538,14 @@ skip_ring_stats:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS) {</div><div class='add'>+		__le64 *pcie_stats = (__le64 *)bp-&gt;hw_pcie_stats;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; BNXT_NUM_PCIE_STATS; i++, j++) {</div><div class='add'>+			buf[j] = le64_to_cpu(*(pcie_stats +</div><div class='add'>+					       bnxt_pcie_stats_arr[i].offset));</div><div class='add'>+		}</div><div class='add'>+	}</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='hunk'>@@ -609,6 +646,12 @@ 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'> 		}</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS) {</div><div class='add'>+			for (i = 0; i &lt; BNXT_NUM_PCIE_STATS; i++) {</div><div class='add'>+				strcpy(buf, bnxt_pcie_stats_arr[i].string);</div><div class='add'>+				buf += ETH_GSTRING_LEN;</div><div class='add'>+			}</div><div class='add'>+		}</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='hunk'>@@ -3262,7 +3305,8 @@ void bnxt_ethtool_init(struct bnxt *bp)</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='del'>-	bnxt_get_pkgver(dev);</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PKG_VER))</div><div class='add'>+		bnxt_get_pkgver(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10704 || !BNXT_SINGLE_PF(bp))</div><div class='ctx'> 		return;</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/>index b6c610339501..12bbb2a207d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h</a></div><div class='hunk'>@@ -89,7 +89,10 @@ struct hwrm_short_input {</div><div class='ctx'> 	__le16	signature;</div><div class='ctx'> 	#define SHORT_REQ_SIGNATURE_SHORT_CMD 0x4321UL</div><div class='ctx'> 	#define SHORT_REQ_SIGNATURE_LAST     SHORT_REQ_SIGNATURE_SHORT_CMD</div><div class='del'>-	__le16	unused_0;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	#define SHORT_REQ_TARGET_ID_DEFAULT 0x0UL</div><div class='add'>+	#define SHORT_REQ_TARGET_ID_TOOLS   0xfffdUL</div><div class='add'>+	#define SHORT_REQ_TARGET_ID_LAST   SHORT_REQ_TARGET_ID_TOOLS</div><div class='ctx'> 	__le16	size;</div><div class='ctx'> 	__le64	req_addr;</div><div class='ctx'> };</div><div class='hunk'>@@ -211,6 +214,7 @@ struct cmd_nums {</div><div class='ctx'> 	#define HWRM_FWD_RESP                             0xd2UL</div><div class='ctx'> 	#define HWRM_FWD_ASYNC_EVENT_CMPL                 0xd3UL</div><div class='ctx'> 	#define HWRM_OEM_CMD                              0xd4UL</div><div class='add'>+	#define HWRM_PORT_PRBS_TEST                       0xd5UL</div><div class='ctx'> 	#define HWRM_TEMP_MONITOR_QUERY                   0xe0UL</div><div class='ctx'> 	#define HWRM_WOL_FILTER_ALLOC                     0xf0UL</div><div class='ctx'> 	#define HWRM_WOL_FILTER_FREE                      0xf1UL</div><div class='hunk'>@@ -262,6 +266,7 @@ struct cmd_nums {</div><div class='ctx'> 	#define HWRM_CFA_EEM_QCFG                         0x122UL</div><div class='ctx'> 	#define HWRM_CFA_EEM_OP                           0x123UL</div><div class='ctx'> 	#define HWRM_CFA_ADV_FLOW_MGNT_QCAPS              0x124UL</div><div class='add'>+	#define HWRM_CFA_TFLIB                            0x125UL</div><div class='ctx'> 	#define HWRM_ENGINE_CKV_HELLO                     0x12dUL</div><div class='ctx'> 	#define HWRM_ENGINE_CKV_STATUS                    0x12eUL</div><div class='ctx'> 	#define HWRM_ENGINE_CKV_CKEK_ADD                  0x12fUL</div><div class='hunk'>@@ -272,6 +277,7 @@ struct cmd_nums {</div><div class='ctx'> 	#define HWRM_ENGINE_CKV_RNG_GET                   0x134UL</div><div class='ctx'> 	#define HWRM_ENGINE_CKV_KEY_GEN                   0x135UL</div><div class='ctx'> 	#define HWRM_ENGINE_CKV_KEY_LABEL_CFG             0x136UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_KEY_LABEL_QCFG            0x137UL</div><div class='ctx'> 	#define HWRM_ENGINE_QG_CONFIG_QUERY               0x13cUL</div><div class='ctx'> 	#define HWRM_ENGINE_QG_QUERY                      0x13dUL</div><div class='ctx'> 	#define HWRM_ENGINE_QG_METER_PROFILE_CONFIG_QUERY 0x13eUL</div><div class='hunk'>@@ -312,6 +318,11 @@ struct cmd_nums {</div><div class='ctx'> 	#define HWRM_SELFTEST_IRQ                         0x202UL</div><div class='ctx'> 	#define HWRM_SELFTEST_RETRIEVE_SERDES_DATA        0x203UL</div><div class='ctx'> 	#define HWRM_PCIE_QSTATS                          0x204UL</div><div class='add'>+	#define HWRM_MFG_FRU_WRITE_CONTROL                0x205UL</div><div class='add'>+	#define HWRM_MFG_TIMERS_QUERY                     0x206UL</div><div class='add'>+	#define HWRM_MFG_OTP_CFG                          0x207UL</div><div class='add'>+	#define HWRM_MFG_OTP_QCFG                         0x208UL</div><div class='add'>+	#define HWRM_MFG_HDMA_TEST                        0x209UL</div><div class='ctx'> 	#define HWRM_DBG_READ_DIRECT                      0xff10UL</div><div class='ctx'> 	#define HWRM_DBG_READ_INDIRECT                    0xff11UL</div><div class='ctx'> 	#define HWRM_DBG_WRITE_DIRECT                     0xff12UL</div><div class='hunk'>@@ -325,6 +336,8 @@ struct cmd_nums {</div><div class='ctx'> 	#define HWRM_DBG_FW_CLI                           0xff1aUL</div><div class='ctx'> 	#define HWRM_DBG_I2C_CMD                          0xff1bUL</div><div class='ctx'> 	#define HWRM_DBG_RING_INFO_GET                    0xff1cUL</div><div class='add'>+	#define HWRM_DBG_CRASHDUMP_HEADER                 0xff1dUL</div><div class='add'>+	#define HWRM_DBG_CRASHDUMP_ERASE                  0xff1eUL</div><div class='ctx'> 	#define HWRM_NVM_FACTORY_DEFAULTS                 0xffeeUL</div><div class='ctx'> 	#define HWRM_NVM_VALIDATE_OPTION                  0xffefUL</div><div class='ctx'> 	#define HWRM_NVM_FLUSH                            0xfff0UL</div><div class='hunk'>@@ -350,23 +363,26 @@ struct cmd_nums {</div><div class='ctx'> /* ret_codes (size:64b/8B) */</div><div class='ctx'> struct ret_codes {</div><div class='ctx'> 	__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_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='add'>+	#define HWRM_ERR_CODE_SUCCESS                      0x0UL</div><div class='add'>+	#define HWRM_ERR_CODE_FAIL                         0x1UL</div><div class='add'>+	#define HWRM_ERR_CODE_INVALID_PARAMS               0x2UL</div><div class='add'>+	#define HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED       0x3UL</div><div class='add'>+	#define HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR         0x4UL</div><div class='add'>+	#define HWRM_ERR_CODE_INVALID_FLAGS                0x5UL</div><div class='add'>+	#define HWRM_ERR_CODE_INVALID_ENABLES              0x6UL</div><div class='add'>+	#define HWRM_ERR_CODE_UNSUPPORTED_TLV              0x7UL</div><div class='add'>+	#define HWRM_ERR_CODE_NO_BUFFER                    0x8UL</div><div class='add'>+	#define HWRM_ERR_CODE_UNSUPPORTED_OPTION_ERR       0x9UL</div><div class='add'>+	#define HWRM_ERR_CODE_HOT_RESET_PROGRESS           0xaUL</div><div class='add'>+	#define HWRM_ERR_CODE_HOT_RESET_FAIL               0xbUL</div><div class='add'>+	#define HWRM_ERR_CODE_NO_FLOW_COUNTER_DURING_ALLOC 0xcUL</div><div class='add'>+	#define HWRM_ERR_CODE_KEY_HASH_COLLISION           0xdUL</div><div class='add'>+	#define HWRM_ERR_CODE_KEY_ALREADY_EXISTS           0xeUL</div><div class='add'>+	#define HWRM_ERR_CODE_HWRM_ERROR                   0xfUL</div><div class='add'>+	#define HWRM_ERR_CODE_TLV_ENCAPSULATED_RESPONSE    0x8000UL</div><div class='add'>+	#define HWRM_ERR_CODE_UNKNOWN_ERR                  0xfffeUL</div><div class='add'>+	#define HWRM_ERR_CODE_CMD_NOT_SUPPORTED            0xffffUL</div><div class='add'>+	#define HWRM_ERR_CODE_LAST                        HWRM_ERR_CODE_CMD_NOT_SUPPORTED</div><div class='ctx'> 	__le16	unused_0[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -387,11 +403,15 @@ struct hwrm_err_output {</div><div class='ctx'> #define HW_HASH_INDEX_SIZE 0x80</div><div class='ctx'> #define HW_HASH_KEY_SIZE 40</div><div class='ctx'> #define HWRM_RESP_VALID_KEY 1</div><div class='add'>+#define HWRM_TARGET_ID_BONO 0xFFF8</div><div class='add'>+#define HWRM_TARGET_ID_KONG 0xFFF9</div><div class='add'>+#define HWRM_TARGET_ID_APE 0xFFFA</div><div class='add'>+#define HWRM_TARGET_ID_TOOLS 0xFFFD</div><div class='ctx'> #define HWRM_VERSION_MAJOR 1</div><div class='ctx'> #define HWRM_VERSION_MINOR 10</div><div class='ctx'> #define HWRM_VERSION_UPDATE 0</div><div class='del'>-#define HWRM_VERSION_RSVD 47</div><div class='del'>-#define HWRM_VERSION_STR "1.10.0.47"</div><div class='add'>+#define HWRM_VERSION_RSVD 69</div><div class='add'>+#define HWRM_VERSION_STR "1.10.0.69"</div><div class='ctx'> </div><div class='ctx'> /* hwrm_ver_get_input (size:192b/24B) */</div><div class='ctx'> struct hwrm_ver_get_input {</div><div class='hunk'>@@ -442,6 +462,7 @@ struct hwrm_ver_get_output {</div><div class='ctx'> 	#define VER_GET_RESP_DEV_CAPS_CFG_ADV_FLOW_COUNTERS_SUPPORTED              0x400UL</div><div class='ctx'> 	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_EEM_SUPPORTED                        0x800UL</div><div class='ctx'> 	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_ADV_FLOW_MGNT_SUPPORTED              0x1000UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_TFLIB_SUPPORTED                      0x2000UL</div><div class='ctx'> 	u8	roce_fw_maj_8b;</div><div class='ctx'> 	u8	roce_fw_min_8b;</div><div class='ctx'> 	u8	roce_fw_bld_8b;</div><div class='hunk'>@@ -449,7 +470,7 @@ struct hwrm_ver_get_output {</div><div class='ctx'> 	char	hwrm_fw_name[16];</div><div class='ctx'> 	char	mgmt_fw_name[16];</div><div class='ctx'> 	char	netctrl_fw_name[16];</div><div class='del'>-	u8	reserved2[16];</div><div class='add'>+	char	active_pkg_name[16];</div><div class='ctx'> 	char	roce_fw_name[16];</div><div class='ctx'> 	__le16	chip_num;</div><div class='ctx'> 	u8	chip_rev;</div><div class='hunk'>@@ -1047,6 +1068,7 @@ struct hwrm_func_qcaps_output {</div><div class='ctx'> 	#define FUNC_QCAPS_RESP_FLAGS_DYNAMIC_TX_RING_ALLOC           0x200000UL</div><div class='ctx'> 	#define FUNC_QCAPS_RESP_FLAGS_HOT_RESET_CAPABLE               0x400000UL</div><div class='ctx'> 	#define FUNC_QCAPS_RESP_FLAGS_ERROR_RECOVERY_CAPABLE          0x800000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_STATS_SUPPORTED             0x1000000UL</div><div class='ctx'> 	u8	mac_address[6];</div><div class='ctx'> 	__le16	max_rsscos_ctx;</div><div class='ctx'> 	__le16	max_cmpl_rings;</div><div class='hunk'>@@ -1715,7 +1737,7 @@ struct hwrm_func_backing_store_qcaps_output {</div><div class='ctx'> 	__le16	mrav_entry_size;</div><div class='ctx'> 	__le16	tim_entry_size;</div><div class='ctx'> 	__le32	tim_max_entries;</div><div class='del'>-	u8	unused_0[2];</div><div class='add'>+	__le16	mrav_num_entries_units;</div><div class='ctx'> 	u8	tqm_entries_multiple;</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -1728,7 +1750,8 @@ struct hwrm_func_backing_store_cfg_input {</div><div class='ctx'> 	__le16	target_id;</div><div class='ctx'> 	__le64	resp_addr;</div><div class='ctx'> 	__le32	flags;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_PREBOOT_MODE     0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_PREBOOT_MODE               0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT     0x2UL</div><div class='ctx'> 	__le32	enables;</div><div class='ctx'> 	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP            0x1UL</div><div class='ctx'> 	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_SRQ           0x2UL</div><div class='hunk'>@@ -2580,7 +2603,7 @@ struct hwrm_port_phy_qcfg_output {</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* hwrm_port_mac_cfg_input (size:320b/40B) */</div><div class='add'>+/* hwrm_port_mac_cfg_input (size:384b/48B) */</div><div class='ctx'> struct hwrm_port_mac_cfg_input {</div><div class='ctx'> 	__le16	req_type;</div><div class='ctx'> 	__le16	cmpl_ring;</div><div class='hunk'>@@ -2601,6 +2624,7 @@ struct hwrm_port_mac_cfg_input {</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_FLAGS_VLAN_PRI2COS_DISABLE          0x400UL</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_FLAGS_TUNNEL_PRI2COS_DISABLE        0x800UL</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_FLAGS_IP_DSCP2COS_DISABLE           0x1000UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_PTP_ONE_STEP_TX_TS            0x2000UL</div><div class='ctx'> 	__le32	enables;</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_ENABLES_IPG                            0x1UL</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_ENABLES_LPBK                           0x2UL</div><div class='hunk'>@@ -2610,6 +2634,7 @@ struct hwrm_port_mac_cfg_input {</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_ENABLES_RX_TS_CAPTURE_PTP_MSG_TYPE     0x40UL</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_ENABLES_TX_TS_CAPTURE_PTP_MSG_TYPE     0x80UL</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_ENABLES_COS_FIELD_CFG                  0x100UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_PTP_FREQ_ADJ_PPB               0x200UL</div><div class='ctx'> 	__le16	port_id;</div><div class='ctx'> 	u8	ipg;</div><div class='ctx'> 	u8	lpbk;</div><div class='hunk'>@@ -2642,6 +2667,8 @@ struct hwrm_port_mac_cfg_input {</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_DEFAULT_COS_MASK          0xe0UL</div><div class='ctx'> 	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_DEFAULT_COS_SFT           5</div><div class='ctx'> 	u8	unused_0[3];</div><div class='add'>+	__s32	ptp_freq_adj_ppb;</div><div class='add'>+	u8	unused_1[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hwrm_port_mac_cfg_output (size:128b/16B) */</div><div class='hunk'>@@ -2680,8 +2707,9 @@ struct hwrm_port_mac_ptp_qcfg_output {</div><div class='ctx'> 	__le16	seq_id;</div><div class='ctx'> 	__le16	resp_len;</div><div class='ctx'> 	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='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_DIRECT_ACCESS      0x1UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_HWRM_ACCESS        0x2UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_ONE_STEP_TX_TS     0x4UL</div><div class='ctx'> 	u8	unused_0[3];</div><div class='ctx'> 	__le32	rx_ts_reg_off_lower;</div><div class='ctx'> 	__le32	rx_ts_reg_off_upper;</div><div class='hunk'>@@ -2888,7 +2916,7 @@ struct tx_port_stats_ext {</div><div class='ctx'> 	__le64	pfc_pri7_tx_transitions;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* rx_port_stats_ext (size:2368b/296B) */</div><div class='add'>+/* rx_port_stats_ext (size:2624b/328B) */</div><div class='ctx'> struct rx_port_stats_ext {</div><div class='ctx'> 	__le64	link_down_events;</div><div class='ctx'> 	__le64	continuous_pause_events;</div><div class='hunk'>@@ -2927,6 +2955,10 @@ struct rx_port_stats_ext {</div><div class='ctx'> 	__le64	pfc_pri6_rx_transitions;</div><div class='ctx'> 	__le64	pfc_pri7_rx_duration_us;</div><div class='ctx'> 	__le64	pfc_pri7_rx_transitions;</div><div class='add'>+	__le64	rx_bits;</div><div class='add'>+	__le64	rx_buffer_passed_threshold;</div><div class='add'>+	__le64	rx_pcs_symbol_err;</div><div class='add'>+	__le64	rx_corrected_bits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hwrm_port_qstats_ext_input (size:320b/40B) */</div><div class='hunk'>@@ -3029,6 +3061,35 @@ struct hwrm_port_lpbk_clr_stats_output {</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* hwrm_port_ts_query_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_ts_query_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'>+	__le32	flags;</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH             0x1UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH_TX            0x0UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH_RX            0x1UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH_LAST         PORT_TS_QUERY_REQ_FLAGS_PATH_RX</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_CURRENT_TIME     0x2UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_ts_query_output (size:192b/24B) */</div><div class='add'>+struct hwrm_port_ts_query_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'>+	__le64	ptp_msg_ts;</div><div class='add'>+	__le16	ptp_msg_seqid;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* hwrm_port_phy_qcaps_input (size:192b/24B) */</div><div class='ctx'> struct hwrm_port_phy_qcaps_input {</div><div class='ctx'> 	__le16	req_type;</div><div class='hunk'>@@ -4703,7 +4764,8 @@ struct hwrm_vnic_qcaps_output {</div><div class='ctx'> 	#define VNIC_QCAPS_RESP_FLAGS_RSS_DFLT_CR_CAP                     0x20UL</div><div class='ctx'> 	#define VNIC_QCAPS_RESP_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_CAP     0x40UL</div><div class='ctx'> 	#define VNIC_QCAPS_RESP_FLAGS_OUTERMOST_RSS_CAP                   0x80UL</div><div class='del'>-	u8	unused_1[7];</div><div class='add'>+	__le16	max_aggs_supported;</div><div class='add'>+	u8	unused_1[5];</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4723,6 +4785,7 @@ struct hwrm_vnic_tpa_cfg_input {</div><div class='ctx'> 	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_WITH_SAME_GRE_SEQ     0x20UL</div><div class='ctx'> 	#define VNIC_TPA_CFG_REQ_FLAGS_GRO_IPID_CHECK            0x40UL</div><div class='ctx'> 	#define VNIC_TPA_CFG_REQ_FLAGS_GRO_TTL_CHECK             0x80UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_PACK_AS_GRO           0x100UL</div><div class='ctx'> 	__le32	enables;</div><div class='ctx'> 	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_SEGS      0x1UL</div><div class='ctx'> 	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGGS          0x2UL</div><div class='hunk'>@@ -5254,6 +5317,8 @@ struct hwrm_cfa_l2_filter_alloc_input {</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_L2          (0x1UL &lt;&lt; 4)</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_ROCE        (0x2UL &lt;&lt; 4)</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_LAST       CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_ROCE</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_XDP_DISABLE       0x40UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_SOURCE_VALID      0x80UL</div><div class='ctx'> 	__le32	enables;</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR             0x1UL</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK        0x2UL</div><div class='hunk'>@@ -5272,8 +5337,11 @@ struct hwrm_cfa_l2_filter_alloc_input {</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE         0x4000UL</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID              0x8000UL</div><div class='ctx'> 	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID      0x10000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_NUM_VLANS           0x20000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_NUM_VLANS         0x40000UL</div><div class='ctx'> 	u8	l2_addr[6];</div><div class='del'>-	u8	unused_0[2];</div><div class='add'>+	u8	num_vlans;</div><div class='add'>+	u8	t_num_vlans;</div><div class='ctx'> 	u8	l2_addr_mask[6];</div><div class='ctx'> 	__le16	l2_ovlan;</div><div class='ctx'> 	__le16	l2_ovlan_mask;</div><div class='hunk'>@@ -5338,6 +5406,16 @@ struct hwrm_cfa_l2_filter_alloc_output {</div><div class='ctx'> 	__le16	resp_len;</div><div class='ctx'> 	__le64	l2_filter_id;</div><div class='ctx'> 	__le32	flow_id;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='ctx'> 	u8	unused_0[3];</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -5504,6 +5582,16 @@ struct hwrm_cfa_tunnel_filter_alloc_output {</div><div class='ctx'> 	__le16	resp_len;</div><div class='ctx'> 	__le64	tunnel_filter_id;</div><div class='ctx'> 	__le32	flow_id;</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='ctx'> 	u8	unused_0[3];</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -5646,7 +5734,7 @@ struct hwrm_cfa_encap_record_free_output {</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* hwrm_cfa_ntuple_filter_alloc_input (size:1024b/128B) */</div><div class='add'>+/* hwrm_cfa_ntuple_filter_alloc_input (size:1088b/136B) */</div><div class='ctx'> struct hwrm_cfa_ntuple_filter_alloc_input {</div><div class='ctx'> 	__le16	req_type;</div><div class='ctx'> 	__le16	cmpl_ring;</div><div class='hunk'>@@ -5678,6 +5766,7 @@ struct hwrm_cfa_ntuple_filter_alloc_input {</div><div class='ctx'> 	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_ID               0x10000UL</div><div class='ctx'> 	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID       0x20000UL</div><div class='ctx'> 	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_MACADDR          0x40000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX     0x80000UL</div><div class='ctx'> 	__le64	l2_filter_id;</div><div class='ctx'> 	u8	src_macaddr[6];</div><div class='ctx'> 	__be16	ethertype;</div><div class='hunk'>@@ -5725,6 +5814,8 @@ struct hwrm_cfa_ntuple_filter_alloc_input {</div><div class='ctx'> 	__be16	dst_port;</div><div class='ctx'> 	__be16	dst_port_mask;</div><div class='ctx'> 	__le64	ntuple_filter_id_hint;</div><div class='add'>+	__le16	rfs_ring_tbl_idx;</div><div class='add'>+	u8	unused_0[6];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hwrm_cfa_ntuple_filter_alloc_output (size:192b/24B) */</div><div class='hunk'>@@ -5735,6 +5826,16 @@ struct hwrm_cfa_ntuple_filter_alloc_output {</div><div class='ctx'> 	__le16	resp_len;</div><div class='ctx'> 	__le64	ntuple_filter_id;</div><div class='ctx'> 	__le32	flow_id;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='ctx'> 	u8	unused_0[3];</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -5934,19 +6035,20 @@ struct hwrm_cfa_flow_alloc_input {</div><div class='ctx'> 	__le16	src_fid;</div><div class='ctx'> 	__le32	tunnel_handle;</div><div class='ctx'> 	__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='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FWD                       0x1UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_RECYCLE                   0x2UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_DROP                      0x4UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_METER                     0x8UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL                    0x10UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_SRC                   0x20UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_DEST                  0x40UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_IPV4_ADDRESS          0x80UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_L2_HEADER_REWRITE         0x100UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TTL_DECREMENT             0x200UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL_IP                 0x400UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FLOW_AGING_ENABLED        0x800UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_PRI_HINT                  0x1000UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NO_FLOW_COUNTER_ALLOC     0x2000UL</div><div class='ctx'> 	__le16	dst_fid;</div><div class='ctx'> 	__be16	l2_rewrite_vlan_tpid;</div><div class='ctx'> 	__be16	l2_rewrite_vlan_tci;</div><div class='hunk'>@@ -5997,6 +6099,16 @@ struct hwrm_cfa_flow_alloc_output {</div><div class='ctx'> 	__le16	flow_handle;</div><div class='ctx'> 	u8	unused_0[2];</div><div class='ctx'> 	__le32	flow_id;</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='ctx'> 	__le64	ext_flow_handle;</div><div class='ctx'> 	__le32	flow_counter_id;</div><div class='ctx'> 	u8	unused_1[3];</div><div class='hunk'>@@ -6011,7 +6123,8 @@ struct hwrm_cfa_flow_free_input {</div><div class='ctx'> 	__le16	target_id;</div><div class='ctx'> 	__le64	resp_addr;</div><div class='ctx'> 	__le16	flow_handle;</div><div class='del'>-	u8	unused_0[6];</div><div class='add'>+	__le16	unused_0;</div><div class='add'>+	__le32	flow_counter_id;</div><div class='ctx'> 	__le64	ext_flow_handle;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -6199,8 +6312,10 @@ struct hwrm_cfa_eem_qcaps_output {</div><div class='ctx'> 	__le16	seq_id;</div><div class='ctx'> 	__le16	resp_len;</div><div class='ctx'> 	__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='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_PATH_TX                                         0x1UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_PATH_RX                                         0x2UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_CENTRALIZED_MEMORY_MODEL_SUPPORTED              0x4UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_DETACHED_CENTRALIZED_MEMORY_MODEL_SUPPORTED     0x8UL</div><div class='ctx'> 	__le32	unused_0;</div><div class='ctx'> 	__le32	supported;</div><div class='ctx'> 	#define CFA_EEM_QCAPS_RESP_SUPPORTED_KEY0_TABLE                       0x1UL</div><div class='hunk'>@@ -6226,7 +6341,9 @@ struct hwrm_cfa_eem_cfg_input {</div><div class='ctx'> 	#define CFA_EEM_CFG_REQ_FLAGS_PATH_TX               0x1UL</div><div class='ctx'> 	#define CFA_EEM_CFG_REQ_FLAGS_PATH_RX               0x2UL</div><div class='ctx'> 	#define CFA_EEM_CFG_REQ_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='del'>-	__le32	unused_0;</div><div class='add'>+	#define CFA_EEM_CFG_REQ_FLAGS_SECONDARY_PF          0x8UL</div><div class='add'>+	__le16	group_id;</div><div class='add'>+	__le16	unused_0;</div><div class='ctx'> 	__le32	num_entries;</div><div class='ctx'> 	__le32	unused_1;</div><div class='ctx'> 	__le16	key0_ctx_id;</div><div class='hunk'>@@ -6258,7 +6375,7 @@ struct hwrm_cfa_eem_qcfg_input {</div><div class='ctx'> 	__le32	unused_0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* hwrm_cfa_eem_qcfg_output (size:128b/16B) */</div><div class='add'>+/* hwrm_cfa_eem_qcfg_output (size:192b/24B) */</div><div class='ctx'> struct hwrm_cfa_eem_qcfg_output {</div><div class='ctx'> 	__le16	error_code;</div><div class='ctx'> 	__le16	req_type;</div><div class='hunk'>@@ -6269,6 +6386,8 @@ struct hwrm_cfa_eem_qcfg_output {</div><div class='ctx'> 	#define CFA_EEM_QCFG_RESP_FLAGS_PATH_RX               0x2UL</div><div class='ctx'> 	#define CFA_EEM_QCFG_RESP_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='ctx'> 	__le32	num_entries;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hwrm_cfa_eem_op_input (size:192b/24B) */</div><div class='hunk'>@@ -6300,6 +6419,39 @@ struct hwrm_cfa_eem_op_output {</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* hwrm_cfa_adv_flow_mgnt_qcaps_input (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_adv_flow_mgnt_qcaps_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'>+	__le32	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_adv_flow_mgnt_qcaps_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_adv_flow_mgnt_qcaps_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'>+	__le32	flags;</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_HND_16BIT_SUPPORTED              0x1UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_HND_64BIT_SUPPORTED              0x2UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_BATCH_DELETE_SUPPORTED           0x4UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_RESET_ALL_SUPPORTED              0x8UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_DEST_FUNC_SUPPORTED       0x10UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_TX_EEM_FLOW_SUPPORTED                 0x20UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RX_EEM_FLOW_SUPPORTED                 0x40UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_COUNTER_ALLOC_SUPPORTED          0x80UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_SUPPORTED            0x100UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_UNTAGGED_VLAN_SUPPORTED               0x200UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_XDP_SUPPORTED                         0x400UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_L2_HEADER_SOURCE_FIELDS_SUPPORTED     0x800UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* hwrm_tunnel_dst_port_query_input (size:192b/24B) */</div><div class='ctx'> struct hwrm_tunnel_dst_port_query_input {</div><div class='ctx'> 	__le16	req_type;</div><div class='hunk'>@@ -6636,7 +6788,8 @@ struct hwrm_fw_qstatus_output {</div><div class='ctx'> 	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTNONE    0x0UL</div><div class='ctx'> 	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTASAP    0x1UL</div><div class='ctx'> 	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPCIERST 0x2UL</div><div class='del'>-	#define FW_QSTATUS_RESP_SELFRST_STATUS_LAST          FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPCIERST</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPOWER   0x3UL</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_LAST          FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPOWER</div><div class='ctx'> 	u8	unused_0[6];</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -6659,8 +6812,8 @@ struct hwrm_fw_set_time_input {</div><div class='ctx'> 	u8	unused_0;</div><div class='ctx'> 	__le16	millisecond;</div><div class='ctx'> 	__le16	zone;</div><div class='del'>-	#define FW_SET_TIME_REQ_ZONE_UTC     0x0UL</div><div class='del'>-	#define FW_SET_TIME_REQ_ZONE_UNKNOWN 0xffffUL</div><div class='add'>+	#define FW_SET_TIME_REQ_ZONE_UTC     0</div><div class='add'>+	#define FW_SET_TIME_REQ_ZONE_UNKNOWN 65535</div><div class='ctx'> 	#define FW_SET_TIME_REQ_ZONE_LAST   FW_SET_TIME_REQ_ZONE_UNKNOWN</div><div class='ctx'> 	u8	unused_1[4];</div><div class='ctx'> };</div><div class='hunk'>@@ -7064,7 +7217,9 @@ struct hwrm_dbg_coredump_list_input {</div><div class='ctx'> 	__le64	host_dest_addr;</div><div class='ctx'> 	__le32	host_buf_len;</div><div class='ctx'> 	__le16	seq_no;</div><div class='del'>-	u8	unused_0[2];</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define DBG_COREDUMP_LIST_REQ_FLAGS_CRASHDUMP     0x1UL</div><div class='add'>+	u8	unused_0[1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hwrm_dbg_coredump_list_output (size:128b/16B) */</div><div class='hunk'>@@ -7392,7 +7547,9 @@ struct hwrm_nvm_get_dev_info_output {</div><div class='ctx'> 	__le32	nvram_size;</div><div class='ctx'> 	__le32	reserved_size;</div><div class='ctx'> 	__le32	available_size;</div><div class='del'>-	u8	unused_0[3];</div><div class='add'>+	u8	nvm_cfg_ver_maj;</div><div class='add'>+	u8	nvm_cfg_ver_min;</div><div class='add'>+	u8	nvm_cfg_ver_upd;</div><div class='ctx'> 	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </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 2bdd2da9aac7..f760921389a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c</a></div><div class='hunk'>@@ -406,26 +406,6 @@ static void bnxt_vf_rep_netdev_init(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,</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_pcie_dsn_get(struct bnxt *bp, u8 dsn[])</div><div class='del'>-{</div><div class='del'>-	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='del'>-</div><div class='del'>-	if (!pos) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "Unable do read adapter's DSN");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</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='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static 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='hunk'>@@ -490,11 +470,6 @@ static int bnxt_vf_reps_create(struct bnxt *bp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* 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 err;</div><div class='del'>-</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='ctx'> 	bp-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c<br/>index 510dfc1c236b..57dc3cbff36e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/cnic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/cnic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/cnic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/cnic.c</a></div><div class='hunk'>@@ -4038,15 +4038,14 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)</div><div class='ctx'> 	case L5CM_RAMROD_CMD_ID_CLOSE: {</div><div class='ctx'> 		struct iscsi_kcqe *l5kcqe = (struct iscsi_kcqe *) kcqe;</div><div class='ctx'> </div><div class='del'>-		if (l4kcqe-&gt;status != 0 || l5kcqe-&gt;completion_status != 0) {</div><div class='del'>-			netdev_warn(dev-&gt;netdev, "RAMROD CLOSE compl with status 0x%x completion status 0x%x\n",</div><div class='del'>-				    l4kcqe-&gt;status, l5kcqe-&gt;completion_status);</div><div class='del'>-			opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;</div><div class='del'>-			/* Fall through */</div><div class='del'>-		} else {</div><div class='add'>+		if (l4kcqe-&gt;status == 0 &amp;&amp; l5kcqe-&gt;completion_status == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		netdev_warn(dev-&gt;netdev, "RAMROD CLOSE compl with status 0x%x completion status 0x%x\n",</div><div class='add'>+			    l4kcqe-&gt;status, l5kcqe-&gt;completion_status);</div><div class='add'>+		opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;</div><div class='ctx'> 	}</div><div class='add'>+		/* Fall through */</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='head'>diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c<br/>index 983245c0867c..374b9ff05c88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/genet/bcmgenet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/genet/bcmgenet.c</a></div><div class='hunk'>@@ -1665,7 +1665,7 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (ring-&gt;free_bds &lt;= (MAX_SKB_FRAGS + 1))</div><div class='ctx'> 		netif_tx_stop_queue(txq);</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;xmit_more || netif_xmit_stopped(txq))</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(txq))</div><div class='ctx'> 		/* Packets are ready, update producer index */</div><div class='ctx'> 		bcmgenet_tdma_ring_writel(priv, ring-&gt;index,</div><div class='ctx'> 					  ring-&gt;prod_index, TDMA_PROD_INDEX);</div><div class='hunk'>@@ -3476,7 +3476,7 @@ static int bcmgenet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (dn) {</div><div class='ctx'> 		macaddr = of_get_mac_address(dn);</div><div class='del'>-		if (!macaddr) {</div><div class='add'>+		if (IS_ERR(macaddr)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "can't find MAC address\n");</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto err;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c<br/>index 328373e0578f..6d1f9c822548 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/tg3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/tg3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/tg3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/tg3.c</a></div><div class='hunk'>@@ -1073,7 +1073,6 @@ static void tg3_int_reenable(struct tg3_napi *tnapi)</div><div class='ctx'> 	struct tg3 *tp = tnapi-&gt;tp;</div><div class='ctx'> </div><div class='ctx'> 	tw32_mailbox(tnapi-&gt;int_mbox, tnapi-&gt;last_tag &lt;&lt; 24);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	/* When doing tagged status, this work check is unnecessary.</div><div class='ctx'> 	 * The last_tag we write above tells the chip which piece of</div><div class='hunk'>@@ -4283,7 +4282,7 @@ static void tg3_power_down(struct tg3 *tp)</div><div class='ctx'> 	pci_set_power_state(tp-&gt;pdev, PCI_D3hot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)</div><div class='add'>+static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u32 *speed, u8 *duplex)</div><div class='ctx'> {</div><div class='ctx'> 	switch (val &amp; MII_TG3_AUX_STAT_SPDMASK) {</div><div class='ctx'> 	case MII_TG3_AUX_STAT_10HALF:</div><div class='hunk'>@@ -4787,7 +4786,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, bool force_reset)</div><div class='ctx'> 	bool current_link_up;</div><div class='ctx'> 	u32 bmsr, val;</div><div class='ctx'> 	u32 lcl_adv, rmt_adv;</div><div class='del'>-	u16 current_speed;</div><div class='add'>+	u32 current_speed;</div><div class='ctx'> 	u8 current_duplex;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='hunk'>@@ -5719,7 +5718,7 @@ out:</div><div class='ctx'> static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 orig_pause_cfg;</div><div class='del'>-	u16 orig_active_speed;</div><div class='add'>+	u32 orig_active_speed;</div><div class='ctx'> 	u8 orig_active_duplex;</div><div class='ctx'> 	u32 mac_status;</div><div class='ctx'> 	bool current_link_up;</div><div class='hunk'>@@ -5823,7 +5822,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 bmsr, bmcr;</div><div class='del'>-	u16 current_speed = SPEED_UNKNOWN;</div><div class='add'>+	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='ctx'> 	u32 local_adv, remote_adv, sgsr;</div><div class='hunk'>@@ -6999,7 +6998,6 @@ next_pkt_nopost:</div><div class='ctx'> 			tw32_rx_mbox(TG3_RX_JMB_PROD_IDX_REG,</div><div class='ctx'> 				     tpr-&gt;rx_jmb_prod_idx);</div><div class='ctx'> 		}</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	} else if (work_mask) {</div><div class='ctx'> 		/* rx_std_buffers[] and rx_jmb_buffers[] entries must be</div><div class='ctx'> 		 * updated before the producer indices can be updated.</div><div class='hunk'>@@ -7210,8 +7208,6 @@ static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)</div><div class='ctx'> 			tw32_rx_mbox(TG3_RX_JMB_PROD_IDX_REG,</div><div class='ctx'> 				     dpr-&gt;rx_jmb_prod_idx);</div><div class='ctx'> </div><div class='del'>-		mmiowb();</div><div class='del'>-</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			tw32_f(HOSTCC_MODE, tp-&gt;coal_now);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7278,7 +7274,6 @@ static int tg3_poll_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> 						  HOSTCC_MODE_ENABLE |</div><div class='ctx'> 						  tnapi-&gt;coal_now);</div><div class='ctx'> 			}</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8156,10 +8151,9 @@ 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 (!skb-&gt;xmit_more || netif_xmit_stopped(txq)) {</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(txq)) {</div><div class='ctx'> 		/* Packets are ready, update Tx producer idx on card. */</div><div class='ctx'> 		tw32_tx_mbox(tnapi-&gt;prodmbox, entry);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -12763,9 +12757,6 @@ static int tg3_set_phys_id(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='del'>-	if (!netif_running(tp-&gt;dev))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case ETHTOOL_ID_ACTIVE:</div><div class='ctx'> 		return 1;	/* cycle on/off once per second */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h<br/>index a772a33b685c..6953d0546acb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/tg3.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/broadcom/tg3.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/broadcom/tg3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/broadcom/tg3.h</a></div><div class='hunk'>@@ -2873,7 +2873,7 @@ struct tg3_tx_ring_info {</div><div class='ctx'> struct tg3_link_config {</div><div class='ctx'> 	/* Describes what we're trying to get. */</div><div class='ctx'> 	u32				advertising;</div><div class='del'>-	u16				speed;</div><div class='add'>+	u32				speed;</div><div class='ctx'> 	u8				duplex;</div><div class='ctx'> 	u8				autoneg;</div><div class='ctx'> 	u8				flowctrl;</div><div class='hunk'>@@ -2882,7 +2882,7 @@ struct tg3_link_config {</div><div class='ctx'> 	u8				active_flowctrl;</div><div class='ctx'> </div><div class='ctx'> 	u8				active_duplex;</div><div class='del'>-	u16				active_speed;</div><div class='add'>+	u32				active_speed;</div><div class='ctx'> 	u32				rmt_adv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c<br/>index ad099fd01b45..c049410bc888 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cadence/macb_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cadence/macb_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cadence/macb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cadence/macb_main.c</a></div><div class='hunk'>@@ -285,34 +285,22 @@ static void macb_set_hwaddr(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> static void macb_get_hwaddr(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	struct macb_platform_data *pdata;</div><div class='ctx'> 	u32 bottom;</div><div class='ctx'> 	u16 top;</div><div class='ctx'> 	u8 addr[6];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pdata = dev_get_platdata(&amp;bp-&gt;pdev-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	/* Check all 4 address register for valid address */</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		bottom = macb_or_gem_readl(bp, SA1B + i * 8);</div><div class='ctx'> 		top = macb_or_gem_readl(bp, SA1T + i * 8);</div><div class='ctx'> </div><div class='del'>-		if (pdata &amp;&amp; pdata-&gt;rev_eth_addr) {</div><div class='del'>-			addr[5] = bottom &amp; 0xff;</div><div class='del'>-			addr[4] = (bottom &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-			addr[3] = (bottom &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-			addr[2] = (bottom &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-			addr[1] = top &amp; 0xff;</div><div class='del'>-			addr[0] = (top &amp; 0xff00) &gt;&gt; 8;</div><div class='del'>-		} else {</div><div class='del'>-			addr[0] = bottom &amp; 0xff;</div><div class='del'>-			addr[1] = (bottom &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-			addr[2] = (bottom &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-			addr[3] = (bottom &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-			addr[4] = top &amp; 0xff;</div><div class='del'>-			addr[5] = (top &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		}</div><div class='add'>+		addr[0] = bottom &amp; 0xff;</div><div class='add'>+		addr[1] = (bottom &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		addr[2] = (bottom &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		addr[3] = (bottom &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		addr[4] = top &amp; 0xff;</div><div class='add'>+		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='ctx'> 			memcpy(bp-&gt;dev-&gt;dev_addr, addr, sizeof(addr));</div><div class='hunk'>@@ -510,12 +498,10 @@ static void macb_handle_link_change(struct net_device *dev)</div><div class='ctx'> static int macb_mii_probe(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='del'>-	struct macb_platform_data *pdata;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	struct device_node *np;</div><div class='del'>-	int phy_irq, ret, i;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='del'>-	pdata = dev_get_platdata(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -530,8 +516,6 @@ static int macb_mii_probe(struct net_device *dev)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!bp-&gt;phy_node &amp;&amp; !phy_find_first(bp-&gt;mii_bus)) {</div><div class='ctx'> 				for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='del'>-					struct phy_device *phydev;</div><div class='del'>-</div><div class='ctx'> 					phydev = mdiobus_scan(bp-&gt;mii_bus, i);</div><div class='ctx'> 					if (IS_ERR(phydev) &amp;&amp;</div><div class='ctx'> 					    PTR_ERR(phydev) != -ENODEV) {</div><div class='hunk'>@@ -559,19 +543,6 @@ static int macb_mii_probe(struct net_device *dev)</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (pdata) {</div><div class='del'>-			if (gpio_is_valid(pdata-&gt;phy_irq_pin)) {</div><div class='del'>-				ret = devm_gpio_request(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-							pdata-&gt;phy_irq_pin, "phy int");</div><div class='del'>-				if (!ret) {</div><div class='del'>-					phy_irq = gpio_to_irq(pdata-&gt;phy_irq_pin);</div><div class='del'>-					phydev-&gt;irq = (phy_irq &lt; 0) ? PHY_POLL : phy_irq;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				phydev-&gt;irq = PHY_POLL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* attach the mac to the phy */</div><div class='ctx'> 		ret = phy_connect_direct(dev, phydev, &amp;macb_handle_link_change,</div><div class='ctx'> 					 bp-&gt;phy_interface);</div><div class='hunk'>@@ -600,7 +571,6 @@ static int macb_mii_probe(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int macb_mii_init(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	struct macb_platform_data *pdata;</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	int err = -ENXIO;</div><div class='ctx'> </div><div class='hunk'>@@ -620,7 +590,6 @@ static int macb_mii_init(struct macb *bp)</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='ctx'> 	bp-&gt;mii_bus-&gt;parent = &amp;bp-&gt;pdev-&gt;dev;</div><div class='del'>-	pdata = dev_get_platdata(&amp;bp-&gt;pdev-&gt;dev);</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='hunk'>@@ -634,9 +603,6 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> 		err = mdiobus_register(bp-&gt;mii_bus);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (pdata)</div><div class='del'>-			bp-&gt;mii_bus-&gt;phy_mask = pdata-&gt;phy_mask;</div><div class='del'>-</div><div class='ctx'> 		err = of_mdiobus_register(bp-&gt;mii_bus, np);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -898,7 +864,9 @@ 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 (gem_ptp_do_txstamp(queue, skb, desc) == 0) {</div><div class='add'>+				if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp;</div><div class='add'>+					     SKBTX_HW_TSTAMP) &amp;&amp;</div><div class='add'>+				    gem_ptp_do_txstamp(queue, skb, desc) == 0) {</div><div class='ctx'> 					/* skb now belongs to timestamp buffer</div><div class='ctx'> 					 * and will be removed later</div><div class='ctx'> 					 */</div><div class='hunk'>@@ -2459,12 +2427,12 @@ 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'>-	bp-&gt;macbgem_ops.mog_init_rings(bp);</div><div class='del'>-	macb_init_hw(bp);</div><div class='del'>-</div><div class='ctx'> 	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue)</div><div class='ctx'> 		napi_enable(&amp;queue-&gt;napi);</div><div class='ctx'> </div><div class='add'>+	bp-&gt;macbgem_ops.mog_init_rings(bp);</div><div class='add'>+	macb_init_hw(bp);</div><div class='add'>+</div><div class='ctx'> 	/* schedule a link state check */</div><div class='ctx'> 	phy_start(dev-&gt;phydev);</div><div class='ctx'> </div><div class='hunk'>@@ -3370,14 +3338,20 @@ 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(*pclk)) {</div><div class='add'>+	if (IS_ERR_OR_NULL(*pclk)) {</div><div class='ctx'> 		err = PTR_ERR(*pclk);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to get macb_clk (%u)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(*hclk)) {</div><div class='add'>+	if (IS_ERR_OR_NULL(*hclk)) {</div><div class='ctx'> 		err = PTR_ERR(*hclk);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to get hclk (%u)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4044,7 +4018,6 @@ static int macb_probe(struct platform_device *pdev)</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='ctx'> 	unsigned int queue_mask, num_queues;</div><div class='del'>-	struct macb_platform_data *pdata;</div><div class='ctx'> 	bool native_io;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -4164,27 +4137,21 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 		bp-&gt;rx_intr_mask |= MACB_BIT(RXUBR);</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(np);</div><div class='del'>-	if (mac) {</div><div class='add'>+	if (PTR_ERR(mac) == -EPROBE_DEFER) {</div><div class='add'>+		err = -EPROBE_DEFER;</div><div class='add'>+		goto err_out_free_netdev;</div><div class='add'>+	} else if (!IS_ERR(mac)) {</div><div class='ctx'> 		ether_addr_copy(bp-&gt;dev-&gt;dev_addr, mac);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = nvmem_get_mac_address(&amp;pdev-&gt;dev, bp-&gt;dev-&gt;dev_addr);</div><div class='del'>-		if (err) {</div><div class='del'>-			if (err == -EPROBE_DEFER)</div><div class='del'>-				goto err_out_free_netdev;</div><div class='del'>-			macb_get_hwaddr(bp);</div><div class='del'>-		}</div><div class='add'>+		macb_get_hwaddr(bp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = of_get_phy_mode(np);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='del'>-		if (pdata &amp;&amp; pdata-&gt;is_rmii)</div><div class='del'>-			bp-&gt;phy_interface = PHY_INTERFACE_MODE_RMII;</div><div class='del'>-		else</div><div class='del'>-			bp-&gt;phy_interface = PHY_INTERFACE_MODE_MII;</div><div class='del'>-	} else {</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		/* not found in DT, MII by default */</div><div class='add'>+		bp-&gt;phy_interface = PHY_INTERFACE_MODE_MII;</div><div class='add'>+	else</div><div class='ctx'> 		bp-&gt;phy_interface = err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* IP specific init */</div><div class='ctx'> 	err = init(pdev);</div><div class='hunk'>@@ -4354,8 +4321,7 @@ static int __maybe_unused macb_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused macb_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct net_device *netdev = platform_get_drvdata(pdev);</div><div class='add'>+	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='ctx'> 	if (!(device_may_wakeup(&amp;bp-&gt;dev-&gt;dev))) {</div><div class='hunk'>@@ -4371,8 +4337,7 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused macb_runtime_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct net_device *netdev = platform_get_drvdata(pdev);</div><div class='add'>+	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='ctx'> 	if (!(device_may_wakeup(&amp;bp-&gt;dev-&gt;dev))) {</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig<br/>index 6650e2a5f171..7612ab6b286d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/Kconfig</a></div><div class='hunk'>@@ -68,6 +68,7 @@ config LIQUIDIO</div><div class='ctx'> 	imply PTP_1588_CLOCK</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select LIBCRC32C</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	---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='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c<br/>index 2df7440f58df..39643be8c30a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.c</a></div><div class='hunk'>@@ -38,9 +38,6 @@ int lio_cn6xxx_soft_reset(struct octeon_device *oct)</div><div class='ctx'> 	lio_pci_readq(oct, CN6XXX_CIU_SOFT_RST);</div><div class='ctx'> 	lio_pci_writeq(oct, 1, CN6XXX_CIU_SOFT_RST);</div><div class='ctx'> </div><div class='del'>-	/* make sure that the reset is written before starting timer */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	/* Wait for 10ms as Octeon resets. */</div><div class='ctx'> 	mdelay(100);</div><div class='ctx'> </div><div class='hunk'>@@ -487,9 +484,6 @@ void lio_cn6xxx_disable_interrupt(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	/* Disable Interrupts */</div><div class='ctx'> 	writeq(0, cn6xxx-&gt;intr_enb_reg64);</div><div class='del'>-</div><div class='del'>-	/* make sure interrupts are really disabled */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lio_cn6xxx_get_pcie_qlmport(struct octeon_device *oct)</div><div class='hunk'>@@ -555,10 +549,6 @@ static int lio_cn6xxx_process_droq_intr_regs(struct octeon_device *oct)</div><div class='ctx'> 				value &amp;= ~(1 &lt;&lt; oq_no);</div><div class='ctx'> 				octeon_write_csr(oct, reg, value);</div><div class='ctx'> </div><div class='del'>-				/* Ensure that the enable register is written.</div><div class='del'>-				 */</div><div class='del'>-				mmiowb();</div><div class='del'>-</div><div class='ctx'> 				spin_unlock(&amp;cn6xxx-&gt;lock_for_droq_int_enb_reg);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</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 fb6f813cff65..eab805579f96 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/lio_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/lio_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/lio_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/liquidio/lio_main.c</a></div><div class='hunk'>@@ -2522,7 +2522,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		irh-&gt;vlan = skb_vlan_tag_get(skb) &amp; 0xfff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	xmit_more = skb-&gt;xmit_more;</div><div class='add'>+	xmit_more = netdev_xmit_more();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(cmdsetup.s.timestamp))</div><div class='ctx'> 		status = send_nic_timestamp_pkt(oct, &amp;ndata, finfo, xmit_more);</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 54b245797d2e..db0b90555acb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.c</a></div><div class='hunk'>@@ -1585,7 +1585,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		irh-&gt;vlan = skb_vlan_tag_get(skb) &amp; VLAN_VID_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	xmit_more = skb-&gt;xmit_more;</div><div class='add'>+	xmit_more = netdev_xmit_more();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(cmdsetup.s.timestamp))</div><div class='ctx'> 		status = send_nic_timestamp_pkt(oct, &amp;ndata, finfo, xmit_more);</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 ce8c3f818666..934115d18488 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/octeon_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/liquidio/octeon_device.c</a></div><div class='hunk'>@@ -1449,7 +1449,6 @@ void lio_enable_irq(struct octeon_droq *droq, struct octeon_instr_queue *iq)</div><div class='ctx'> 		iq-&gt;pkt_in_done -= iq-&gt;pkts_processed;</div><div class='ctx'> 		iq-&gt;pkts_processed = 0;</div><div class='ctx'> 		/* this write needs to be flushed before we release the lock */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		spin_unlock_bh(&amp;iq-&gt;lock);</div><div class='ctx'> 		oct = iq-&gt;oct_dev;</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 a0c099f71524..017169023cca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/octeon_droq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/liquidio/octeon_droq.c</a></div><div class='hunk'>@@ -513,8 +513,6 @@ int octeon_retry_droq_refill(struct octeon_droq *droq)</div><div class='ctx'> 		 */</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		writel(desc_refilled, droq-&gt;pkts_credit_reg);</div><div class='del'>-		/* make sure mmio write completes */</div><div class='del'>-		mmiowb();</div><div class='ctx'> </div><div class='ctx'> 		if (pkts_credit + desc_refilled &gt;= CN23XX_SLI_DEF_BP)</div><div class='ctx'> 			reschedule = 0;</div><div class='hunk'>@@ -712,8 +710,6 @@ octeon_droq_fast_process_packets(struct octeon_device *oct,</div><div class='ctx'> 				 */</div><div class='ctx'> 				wmb();</div><div class='ctx'> 				writel(desc_refilled, droq-&gt;pkts_credit_reg);</div><div class='del'>-				/* make sure mmio write completes */</div><div class='del'>-				mmiowb();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}                       /* for (each packet)... */</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 c6f4cbda040f..fcf20a8f92d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/request_manager.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/liquidio/request_manager.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/liquidio/request_manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/liquidio/request_manager.c</a></div><div class='hunk'>@@ -278,7 +278,6 @@ ring_doorbell(struct octeon_device *oct, struct octeon_instr_queue *iq)</div><div class='ctx'> 	if (atomic_read(&amp;oct-&gt;status) == OCT_DEV_RUNNING) {</div><div class='ctx'> 		writel(iq-&gt;fill_cnt, iq-&gt;doorbell_reg);</div><div class='ctx'> 		/* make sure doorbell write goes through */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		iq-&gt;fill_cnt = 0;</div><div class='ctx'> 		iq-&gt;last_db_time = jiffies;</div><div class='ctx'> 		return;</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 5359c1021f42..15b1130aa4ae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.c</a></div><div class='hunk'>@@ -1503,7 +1503,7 @@ static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		memcpy(netdev-&gt;dev_addr, mac, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(netdev);</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 aa2be4807191..c032bef1b776 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a></div><div class='hunk'>@@ -32,6 +32,13 @@</div><div class='ctx'> #define DRV_NAME	"nicvf"</div><div class='ctx'> #define DRV_VERSION	"1.0"</div><div class='ctx'> </div><div class='add'>+/* NOTE: Packets bigger than 1530 are split across multiple pages and XDP needs</div><div class='add'>+ * the buffer to be contiguous. Allow XDP to be set up only if we don't exceed</div><div class='add'>+ * this value, keeping headroom for the 14 byte Ethernet header and two</div><div class='add'>+ * VLAN tags (for QinQ)</div><div class='add'>+ */</div><div class='add'>+#define MAX_XDP_MTU	(1530 - ETH_HLEN - VLAN_HLEN * 2)</div><div class='add'>+</div><div class='ctx'> /* Supported devices */</div><div class='ctx'> static const struct pci_device_id nicvf_id_table[] = {</div><div class='ctx'> 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM,</div><div class='hunk'>@@ -1328,10 +1335,11 @@ int nicvf_stop(struct net_device *netdev)</div><div class='ctx'> 	struct nicvf_cq_poll *cq_poll = NULL;</div><div class='ctx'> 	union nic_mbx mbx = {};</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;nic-&gt;link_change_work);</div><div class='del'>-</div><div class='ctx'> 	/* wait till all queued set_rx_mode tasks completes */</div><div class='del'>-	drain_workqueue(nic-&gt;nicvf_rx_mode_wq);</div><div class='add'>+	if (nic-&gt;nicvf_rx_mode_wq) {</div><div class='add'>+		cancel_delayed_work_sync(&amp;nic-&gt;link_change_work);</div><div class='add'>+		drain_workqueue(nic-&gt;nicvf_rx_mode_wq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mbx.msg.msg = NIC_MBOX_MSG_SHUTDOWN;</div><div class='ctx'> 	nicvf_send_msg_to_pf(nic, &amp;mbx);</div><div class='hunk'>@@ -1452,7 +1460,8 @@ int nicvf_open(struct net_device *netdev)</div><div class='ctx'> 	struct nicvf_cq_poll *cq_poll = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* wait till all queued set_rx_mode tasks completes if any */</div><div class='del'>-	drain_workqueue(nic-&gt;nicvf_rx_mode_wq);</div><div class='add'>+	if (nic-&gt;nicvf_rx_mode_wq)</div><div class='add'>+		drain_workqueue(nic-&gt;nicvf_rx_mode_wq);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1550,10 +1559,12 @@ int nicvf_open(struct net_device *netdev)</div><div class='ctx'> 	/* Send VF config done msg to PF */</div><div class='ctx'> 	nicvf_send_cfg_done(nic);</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;nic-&gt;link_change_work,</div><div class='del'>-			  nicvf_link_status_check_task);</div><div class='del'>-	queue_delayed_work(nic-&gt;nicvf_rx_mode_wq,</div><div class='del'>-			   &amp;nic-&gt;link_change_work, 0);</div><div class='add'>+	if (nic-&gt;nicvf_rx_mode_wq) {</div><div class='add'>+		INIT_DELAYED_WORK(&amp;nic-&gt;link_change_work,</div><div class='add'>+				  nicvf_link_status_check_task);</div><div class='add'>+		queue_delayed_work(nic-&gt;nicvf_rx_mode_wq,</div><div class='add'>+				   &amp;nic-&gt;link_change_work, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> cleanup:</div><div class='hunk'>@@ -1578,6 +1589,15 @@ static int nicvf_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> 	int orig_mtu = netdev-&gt;mtu;</div><div class='ctx'> </div><div class='add'>+	/* For now just support only the usual MTU sized frames,</div><div class='add'>+	 * plus some headroom for VLAN, QinQ.</div><div class='add'>+	 */</div><div class='add'>+	if (nic-&gt;xdp_prog &amp;&amp; new_mtu &gt; MAX_XDP_MTU) {</div><div class='add'>+		netdev_warn(netdev, "Jumbo frames not yet supported with XDP, current MTU %d.\n",</div><div class='add'>+			    netdev-&gt;mtu);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	netdev-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(netdev))</div><div class='hunk'>@@ -1826,8 +1846,10 @@ static int nicvf_xdp_setup(struct nicvf *nic, struct bpf_prog *prog)</div><div class='ctx'> 	bool bpf_attached = false;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* For now just support only the usual MTU sized frames */</div><div class='del'>-	if (prog &amp;&amp; (dev-&gt;mtu &gt; 1500)) {</div><div class='add'>+	/* For now just support only the usual MTU sized frames,</div><div class='add'>+	 * plus some headroom for VLAN, QinQ.</div><div class='add'>+	 */</div><div class='add'>+	if (prog &amp;&amp; dev-&gt;mtu &gt; MAX_XDP_MTU) {</div><div class='ctx'> 		netdev_warn(dev, "Jumbo frames not yet supported with XDP, current MTU %d.\n",</div><div class='ctx'> 			    dev-&gt;mtu);</div><div class='ctx'> 		return -EOPNOTSUPP;</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 5b4d3badcb73..e246f9733bb8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/thunder/nicvf_queues.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/thunder/nicvf_queues.c</a></div><div class='hunk'>@@ -105,20 +105,19 @@ static inline struct pgcache *nicvf_alloc_page(struct nicvf *nic,</div><div class='ctx'> 	/* Check if page can be recycled */</div><div class='ctx'> 	if (page) {</div><div class='ctx'> 		ref_count = page_ref_count(page);</div><div class='del'>-		/* Check if this page has been used once i.e 'put_page'</div><div class='del'>-		 * called after packet transmission i.e internal ref_count</div><div class='del'>-		 * and page's ref_count are equal i.e page can be recycled.</div><div class='add'>+		/* This page can be recycled if internal ref_count and page's</div><div class='add'>+		 * ref_count are equal, indicating that the page has been used</div><div class='add'>+		 * once for packet transmission. For non-XDP mode, internal</div><div class='add'>+		 * ref_count is always '1'.</div><div class='ctx'> 		 */</div><div class='del'>-		if (rbdr-&gt;is_xdp &amp;&amp; (ref_count == pgcache-&gt;ref_count))</div><div class='del'>-			pgcache-&gt;ref_count--;</div><div class='del'>-		else</div><div class='del'>-			page = NULL;</div><div class='del'>-</div><div class='del'>-		/* In non-XDP mode, page's ref_count needs to be '1' for it</div><div class='del'>-		 * to be recycled.</div><div class='del'>-		 */</div><div class='del'>-		if (!rbdr-&gt;is_xdp &amp;&amp; (ref_count != 1))</div><div class='add'>+		if (rbdr-&gt;is_xdp) {</div><div class='add'>+			if (ref_count == pgcache-&gt;ref_count)</div><div class='add'>+				pgcache-&gt;ref_count--;</div><div class='add'>+			else</div><div class='add'>+				page = NULL;</div><div class='add'>+		} else if (ref_count != 1) {</div><div class='ctx'> 			page = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!page) {</div><div class='hunk'>@@ -365,11 +364,10 @@ static void nicvf_free_rbdr(struct nicvf *nic, struct rbdr *rbdr)</div><div class='ctx'> 	while (head &lt; rbdr-&gt;pgcnt) {</div><div class='ctx'> 		pgcache = &amp;rbdr-&gt;pgcache[head];</div><div class='ctx'> 		if (pgcache-&gt;page &amp;&amp; page_ref_count(pgcache-&gt;page) != 0) {</div><div class='del'>-			if (!rbdr-&gt;is_xdp) {</div><div class='del'>-				put_page(pgcache-&gt;page);</div><div class='del'>-				continue;</div><div class='add'>+			if (rbdr-&gt;is_xdp) {</div><div class='add'>+				page_ref_sub(pgcache-&gt;page,</div><div class='add'>+					     pgcache-&gt;ref_count - 1);</div><div class='ctx'> 			}</div><div class='del'>-			page_ref_sub(pgcache-&gt;page, pgcache-&gt;ref_count - 1);</div><div class='ctx'> 			put_page(pgcache-&gt;page);</div><div class='ctx'> 		}</div><div class='ctx'> 		head++;</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 673c57b8023f..a65be851124f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cavium/thunder/thunder_bgx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cavium/thunder/thunder_bgx.c</a></div><div class='hunk'>@@ -962,13 +962,13 @@ static void bgx_poll_for_sgmii_link(struct lmac *lmac)</div><div class='ctx'> 	lmac-&gt;last_duplex = (an_result &gt;&gt; 1) &amp; 0x1;</div><div class='ctx'> 	switch (speed) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		lmac-&gt;last_speed = 10;</div><div class='add'>+		lmac-&gt;last_speed = SPEED_10;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		lmac-&gt;last_speed = 100;</div><div class='add'>+		lmac-&gt;last_speed = SPEED_100;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		lmac-&gt;last_speed = 1000;</div><div class='add'>+		lmac-&gt;last_speed = SPEED_1000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		lmac-&gt;link_up = false;</div><div class='hunk'>@@ -1012,10 +1012,10 @@ static void bgx_poll_for_link(struct work_struct *work)</div><div class='ctx'> 	    !(smu_link &amp; SMU_RX_CTL_STATUS)) {</div><div class='ctx'> 		lmac-&gt;link_up = 1;</div><div class='ctx'> 		if (lmac-&gt;lmac_type == BGX_MODE_XLAUI)</div><div class='del'>-			lmac-&gt;last_speed = 40000;</div><div class='add'>+			lmac-&gt;last_speed = SPEED_40000;</div><div class='ctx'> 		else</div><div class='del'>-			lmac-&gt;last_speed = 10000;</div><div class='del'>-		lmac-&gt;last_duplex = 1;</div><div class='add'>+			lmac-&gt;last_speed = SPEED_10000;</div><div class='add'>+		lmac-&gt;last_duplex = DUPLEX_FULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lmac-&gt;link_up = 0;</div><div class='ctx'> 		lmac-&gt;last_speed = SPEED_UNKNOWN;</div><div class='hunk'>@@ -1105,8 +1105,8 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Default to below link speed and duplex */</div><div class='ctx'> 				lmac-&gt;link_up = true;</div><div class='del'>-				lmac-&gt;last_speed = 1000;</div><div class='del'>-				lmac-&gt;last_duplex = 1;</div><div class='add'>+				lmac-&gt;last_speed = SPEED_1000;</div><div class='add'>+				lmac-&gt;last_duplex = DUPLEX_FULL;</div><div class='ctx'> 				bgx_sgmii_change_link_state(lmac);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1484,7 +1484,7 @@ static int bgx_init_of_phy(struct bgx *bgx)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		mac = of_get_mac_address(node);</div><div class='del'>-		if (mac)</div><div class='add'>+		if (!IS_ERR(mac))</div><div class='ctx'> 			ether_addr_copy(bgx-&gt;lmac[lmac].mac, mac);</div><div class='ctx'> </div><div class='ctx'> 		SET_NETDEV_DEV(&amp;bgx-&gt;lmac[lmac].netdev, &amp;bgx-&gt;pdev-&gt;dev);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c<br/>index 0e9182d3f02c..b3e4118a15e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a></div><div class='hunk'>@@ -443,9 +443,9 @@ found:</div><div class='ctx'> struct l2t_data *t3_init_l2t(unsigned int l2t_capacity)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2t_data *d;</div><div class='del'>-	int i, size = sizeof(*d) + l2t_capacity * sizeof(struct l2t_entry);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	d = kvzalloc(size, GFP_KERNEL);</div><div class='add'>+	d = kvzalloc(struct_size(d, l2tab, l2t_capacity), GFP_KERNEL);</div><div class='ctx'> 	if (!d)</div><div class='ctx'> 		return NULL;</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 c2fd323c4078..ea75f275023f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a></div><div class='hunk'>@@ -75,8 +75,8 @@ struct l2t_data {</div><div class='ctx'> 	struct l2t_entry *rover;	/* starting point for next allocation */</div><div class='ctx'> 	atomic_t nfree;		/* number of free entries */</div><div class='ctx'> 	rwlock_t lock;</div><div class='del'>-	struct l2t_entry l2tab[0];</div><div class='ctx'> 	struct rcu_head rcu_head;	/* to handle rcu cleanup */</div><div class='add'>+	struct l2t_entry l2tab[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef void (*arp_failure_handler_func)(struct t3cdev * dev,</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h<br/>index 956219c178e1..a8fe0808823d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.h</a></div><div class='hunk'>@@ -1575,9 +1575,11 @@ int t4_slow_intr_handler(struct adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> int t4_wait_dev_ready(void __iomem *regs);</div><div class='ctx'> </div><div class='add'>+fw_port_cap32_t t4_link_acaps(struct adapter *adapter, unsigned int port,</div><div class='add'>+			      struct link_config *lc);</div><div class='ctx'> int t4_link_l1cfg_core(struct adapter *adap, unsigned int mbox,</div><div class='ctx'> 		       unsigned int port, struct link_config *lc,</div><div class='del'>-		       bool sleep_ok, int timeout);</div><div class='add'>+		       u8 sleep_ok, int timeout);</div><div class='ctx'> </div><div class='ctx'> static inline int t4_link_l1cfg(struct adapter *adapter, unsigned int mbox,</div><div class='ctx'> 				unsigned int port, struct link_config *lc)</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 3130b43bba52..02959035ed3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c</a></div><div class='hunk'>@@ -2620,7 +2620,7 @@ static inline struct port_info *ethqset2pinfo(struct adapter *adap, int qset)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* should never happen! */</div><div class='del'>-	BUG_ON(1);</div><div class='add'>+	BUG();</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </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 bec4711005cc..9e589302af90 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c</a></div><div class='hunk'>@@ -442,7 +442,7 @@ static unsigned int speed_to_fw_caps(int speed)</div><div class='ctx'>  *	Link Mode Mask.</div><div class='ctx'>  */</div><div class='ctx'> static void fw_caps_to_lmm(enum fw_port_type port_type,</div><div class='del'>-			   unsigned int fw_caps,</div><div class='add'>+			   fw_port_cap32_t fw_caps,</div><div class='ctx'> 			   unsigned long *link_mode_mask)</div><div class='ctx'> {</div><div class='ctx'> 	#define SET_LMM(__lmm_name) \</div><div class='hunk'>@@ -632,7 +632,10 @@ static int get_link_ksettings(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	fw_caps_to_lmm(pi-&gt;port_type, pi-&gt;link_cfg.pcaps,</div><div class='ctx'> 		       link_ksettings-&gt;link_modes.supported);</div><div class='del'>-	fw_caps_to_lmm(pi-&gt;port_type, pi-&gt;link_cfg.acaps,</div><div class='add'>+	fw_caps_to_lmm(pi-&gt;port_type,</div><div class='add'>+		       t4_link_acaps(pi-&gt;adapter,</div><div class='add'>+				     pi-&gt;lport,</div><div class='add'>+				     &amp;pi-&gt;link_cfg),</div><div class='ctx'> 		       link_ksettings-&gt;link_modes.advertising);</div><div class='ctx'> 	fw_caps_to_lmm(pi-&gt;port_type, pi-&gt;link_cfg.lpacaps,</div><div class='ctx'> 		       link_ksettings-&gt;link_modes.lp_advertising);</div><div class='hunk'>@@ -642,22 +645,6 @@ static int get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 		       : SPEED_UNKNOWN);</div><div class='ctx'> 	base-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> </div><div class='del'>-	if (pi-&gt;link_cfg.fc &amp; PAUSE_RX) {</div><div class='del'>-		if (pi-&gt;link_cfg.fc &amp; PAUSE_TX) {</div><div class='del'>-			ethtool_link_ksettings_add_link_mode(link_ksettings,</div><div class='del'>-							     advertising,</div><div class='del'>-							     Pause);</div><div class='del'>-		} else {</div><div class='del'>-			ethtool_link_ksettings_add_link_mode(link_ksettings,</div><div class='del'>-							     advertising,</div><div class='del'>-							     Asym_Pause);</div><div class='del'>-		}</div><div class='del'>-	} else if (pi-&gt;link_cfg.fc &amp; PAUSE_TX) {</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(link_ksettings,</div><div class='del'>-						     advertising,</div><div class='del'>-						     Asym_Pause);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	base-&gt;autoneg = pi-&gt;link_cfg.autoneg;</div><div class='ctx'> 	if (pi-&gt;link_cfg.pcaps &amp; FW_PORT_CAP32_ANEG)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(link_ksettings,</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 5afb43000049..4107007b6ec4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c</a></div><div class='hunk'>@@ -524,8 +524,7 @@ static int del_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	fwr = __skb_put(skb, len);</div><div class='del'>-	t4_mk_filtdelwr(f-&gt;tid, fwr, (adapter-&gt;flags &amp; CXGB4_SHUTTING_DOWN) ? -1</div><div class='del'>-			: adapter-&gt;sge.fw_evtq.abs_id);</div><div class='add'>+	t4_mk_filtdelwr(f-&gt;tid, fwr, adapter-&gt;sge.fw_evtq.abs_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the filter as "pending" and ship off the Filter Work Request.</div><div class='ctx'> 	 * When we get the Work Request Reply we'll clear the pending status.</div><div class='hunk'>@@ -744,16 +743,40 @@ void clear_filter(struct adapter *adap, struct filter_entry *f)</div><div class='ctx'> </div><div class='ctx'> void clear_all_filters(struct adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = adapter-&gt;port[0];</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </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='ctx'> 					adapter-&gt;tids.nsftids;</div><div class='del'>-</div><div class='add'>+		/* Clear all TCAM filters */</div><div class='ctx'> 		for (i = 0; i &lt; max_ftid; i++, f++)</div><div class='ctx'> 			if (f-&gt;valid || f-&gt;pending)</div><div class='del'>-				clear_filter(adapter, f);</div><div class='add'>+				cxgb4_del_filter(dev, i, &amp;f-&gt;fs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear all hash filters */</div><div class='add'>+	if (is_hashfilter(adapter) &amp;&amp; adapter-&gt;tids.tid_tab) {</div><div class='add'>+		struct filter_entry *f;</div><div class='add'>+		unsigned int sb;</div><div class='add'>+</div><div class='add'>+		for (i = adapter-&gt;tids.hash_base;</div><div class='add'>+		     i &lt;= adapter-&gt;tids.ntids; i++) {</div><div class='add'>+			f = (struct filter_entry *)</div><div class='add'>+				adapter-&gt;tids.tid_tab[i];</div><div class='add'>+</div><div class='add'>+			if (f &amp;&amp; (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='add'>+		sb = t4_read_reg(adapter, LE_DB_SRVR_START_INDEX_A);</div><div class='add'>+		for (i = 0; i &lt; sb; i++) {</div><div class='add'>+			f = (struct filter_entry *)adapter-&gt;tids.tid_tab[i];</div><div class='add'>+</div><div class='add'>+			if (f &amp;&amp; (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='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1568,9 +1591,8 @@ int cxgb4_del_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 	struct filter_ctx ctx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* If we are shutting down the adapter do not wait for completion */</div><div class='ctx'> 	if (netdev2adap(dev)-&gt;flags &amp; CXGB4_SHUTTING_DOWN)</div><div class='del'>-		return __cxgb4_del_filter(dev, filter_id, fs, NULL);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;ctx.completion);</div><div class='ctx'> </div><div class='hunk'>@@ -1722,12 +1744,13 @@ void hash_filter_rpl(struct adapter *adap, const struct cpl_act_open_rpl *rpl)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		dev_err(adap-&gt;pdev_dev, "%s: filter creation PROBLEM; status = %u\n",</div><div class='del'>-			__func__, status);</div><div class='add'>+		if (status != CPL_ERR_TCAM_FULL)</div><div class='add'>+			dev_err(adap-&gt;pdev_dev, "%s: filter creation PROBLEM; status = %u\n",</div><div class='add'>+				__func__, status);</div><div class='ctx'> </div><div class='ctx'> 		if (ctx) {</div><div class='ctx'> 			if (status == CPL_ERR_TCAM_FULL)</div><div class='del'>-				ctx-&gt;result = -EAGAIN;</div><div class='add'>+				ctx-&gt;result = -ENOSPC;</div><div class='ctx'> 			else</div><div class='ctx'> 				ctx-&gt;result = -EINVAL;</div><div class='ctx'> 		}</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 89179e316687..715e4edcf4a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a></div><div class='hunk'>@@ -979,8 +979,7 @@ freeout:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			     struct net_device *sb_dev,</div><div class='del'>-			     select_queue_fallback_t fallback)</div><div class='add'>+			     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int txq;</div><div class='ctx'> </div><div class='hunk'>@@ -1022,7 +1021,7 @@ static u16 cxgb_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='del'>-	return fallback(dev, skb, NULL) % dev-&gt;real_num_tx_queues;</div><div class='add'>+	return netdev_pick_tx(dev, skb, NULL) % dev-&gt;real_num_tx_queues;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int closest_timer(const struct sge *s, int time)</div><div class='hunk'>@@ -6025,6 +6024,11 @@ static void remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If we allocated filters, free up state associated with any</div><div class='add'>+	 * valid filters ...</div><div class='add'>+	 */</div><div class='add'>+	clear_all_filters(adapter);</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;flags |= CXGB4_SHUTTING_DOWN;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;pf == 4) {</div><div class='hunk'>@@ -6055,11 +6059,6 @@ static void remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		if (IS_REACHABLE(CONFIG_THERMAL))</div><div class='ctx'> 			cxgb4_thermal_remove(adapter);</div><div class='ctx'> </div><div class='del'>-		/* If we allocated filters, free up state associated with any</div><div class='del'>-		 * valid filters ...</div><div class='del'>-		 */</div><div class='del'>-		clear_all_filters(adapter);</div><div class='del'>-</div><div class='ctx'> 		if (adapter-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='ctx'> 			cxgb_down(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -6161,15 +6160,24 @@ static int __init cxgb4_init_module(void)</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='del'>-		debugfs_remove(cxgb4_debugfs_root);</div><div class='add'>+		goto err_pci;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	if (!inet6addr_registered) {</div><div class='del'>-		register_inet6addr_notifier(&amp;cxgb4_inet6addr_notifier);</div><div class='del'>-		inet6addr_registered = true;</div><div class='add'>+		ret = register_inet6addr_notifier(&amp;cxgb4_inet6addr_notifier);</div><div class='add'>+		if (ret)</div><div class='add'>+			pci_unregister_driver(&amp;cxgb4_driver);</div><div class='add'>+		else</div><div class='add'>+			inet6addr_registered = true;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+err_pci:</div><div class='add'>+	debugfs_remove(cxgb4_debugfs_root);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </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 82a8d1970060..6e2d80008a79 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c</a></div><div class='hunk'>@@ -687,11 +687,8 @@ int cxgb4_tc_flower_replace(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	ret = ctx.result;</div><div class='ctx'> 	/* Check if hw returned error for filter creation */</div><div class='del'>-	if (ret) {</div><div class='del'>-		netdev_err(dev, "%s: filter creation err %d\n",</div><div class='del'>-			   __func__, ret);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto free_entry;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ch_flower-&gt;tc_flower_cookie = cls-&gt;cookie;</div><div class='ctx'> 	ch_flower-&gt;filter_id = ctx.tid;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c<br/>index 88773ca58e6b..b3da81e90132 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/sge.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/sge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a></div><div class='hunk'>@@ -476,7 +476,7 @@ static inline int get_buf_size(struct adapter *adapter,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		BUG_ON(1);</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return buf_size;</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 a3544041ad32..f9b70be59792 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a></div><div class='hunk'>@@ -3964,6 +3964,14 @@ void t4_ulprx_read_la(struct adapter *adap, u32 *la_buf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The ADVERT_MASK is used to mask out all of the Advertised Firmware Port</div><div class='add'>+ * Capabilities which we control with separate controls -- see, for instance,</div><div class='add'>+ * Pause Frames and Forward Error Correction.  In order to determine what the</div><div class='add'>+ * full set of Advertised Port Capabilities are, the base Advertised Port</div><div class='add'>+ * Capabilities (masked by ADVERT_MASK) must be combined with the Advertised</div><div class='add'>+ * Port Capabilities associated with those other controls.  See</div><div class='add'>+ * t4_link_acaps() for how this is done.</div><div class='add'>+ */</div><div class='ctx'> #define ADVERT_MASK (FW_PORT_CAP32_SPEED_V(FW_PORT_CAP32_SPEED_M) | \</div><div class='ctx'> 		     FW_PORT_CAP32_ANEG)</div><div class='ctx'> </div><div class='hunk'>@@ -4061,6 +4069,9 @@ static inline enum cc_pause fwcap_to_cc_pause(fw_port_cap32_t fw_pause)</div><div class='ctx'> /* Translate Common Code Pause specification into Firmware Port Capabilities */</div><div class='ctx'> static inline fw_port_cap32_t cc_to_fwcap_pause(enum cc_pause cc_pause)</div><div class='ctx'> {</div><div class='add'>+	/* Translate orthogonal RX/TX Pause Controls for L1 Configure</div><div class='add'>+	 * commands, etc.</div><div class='add'>+	 */</div><div class='ctx'> 	fw_port_cap32_t fw_pause = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cc_pause &amp; PAUSE_RX)</div><div class='hunk'>@@ -4070,6 +4081,19 @@ static inline fw_port_cap32_t cc_to_fwcap_pause(enum cc_pause cc_pause)</div><div class='ctx'> 	if (!(cc_pause &amp; PAUSE_AUTONEG))</div><div class='ctx'> 		fw_pause |= FW_PORT_CAP32_FORCE_PAUSE;</div><div class='ctx'> </div><div class='add'>+	/* Translate orthogonal Pause controls into IEEE 802.3 Pause,</div><div class='add'>+	 * Asymetrical Pause for use in reporting to upper layer OS code, etc.</div><div class='add'>+	 * Note that these bits are ignored in L1 Configure commands.</div><div class='add'>+	 */</div><div class='add'>+	if (cc_pause &amp; PAUSE_RX) {</div><div class='add'>+		if (cc_pause &amp; PAUSE_TX)</div><div class='add'>+			fw_pause |= FW_PORT_CAP32_802_3_PAUSE;</div><div class='add'>+		else</div><div class='add'>+			fw_pause |= FW_PORT_CAP32_802_3_ASM_DIR;</div><div class='add'>+	} else if (cc_pause &amp; PAUSE_TX) {</div><div class='add'>+		fw_pause |= FW_PORT_CAP32_802_3_ASM_DIR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return fw_pause;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4100,31 +4124,22 @@ static inline fw_port_cap32_t cc_to_fwcap_fec(enum cc_fec cc_fec)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	t4_link_l1cfg - apply link configuration to MAC/PHY</div><div class='add'>+ *	t4_link_acaps - compute Link Advertised Port Capabilities</div><div class='ctx'>  *	@adapter: the adapter</div><div class='del'>- *	@mbox: the Firmware Mailbox to use</div><div class='ctx'>  *	@port: the Port ID</div><div class='ctx'>  *	@lc: the Port's Link Configuration</div><div class='del'>- *	@sleep_ok: if true we may sleep while awaiting command completion</div><div class='del'>- *	@timeout: time to wait for command to finish before timing out</div><div class='del'>- *		(negative implies @sleep_ok=false)</div><div class='ctx'>  *</div><div class='del'>- *	Set up a port's MAC and PHY according to a desired link configuration.</div><div class='del'>- *	- If the PHY can auto-negotiate first decide what to advertise, then</div><div class='del'>- *	  enable/disable auto-negotiation as desired, and reset.</div><div class='del'>- *	- If the PHY does not auto-negotiate just reset it.</div><div class='del'>- *	- If auto-negotiation is off set the MAC to the proper speed/duplex/FC,</div><div class='del'>- *	  otherwise do it later based on the outcome of auto-negotiation.</div><div class='add'>+ *	Synthesize the Advertised Port Capabilities we'll be using based on</div><div class='add'>+ *	the base Advertised Port Capabilities (which have been filtered by</div><div class='add'>+ *	ADVERT_MASK) plus the individual controls for things like Pause</div><div class='add'>+ *	Frames, Forward Error Correction, MDI, etc.</div><div class='ctx'>  */</div><div class='del'>-int t4_link_l1cfg_core(struct adapter *adapter, unsigned int mbox,</div><div class='del'>-		       unsigned int port, struct link_config *lc,</div><div class='del'>-		       bool sleep_ok, int timeout)</div><div class='add'>+fw_port_cap32_t t4_link_acaps(struct adapter *adapter, unsigned int port,</div><div class='add'>+			      struct link_config *lc)</div><div class='ctx'> {</div><div class='del'>-	unsigned int fw_caps = adapter-&gt;params.fw_caps_support;</div><div class='del'>-	fw_port_cap32_t fw_fc, cc_fec, fw_fec, rcap;</div><div class='del'>-	struct fw_port_cmd cmd;</div><div class='add'>+	fw_port_cap32_t fw_fc, fw_fec, acaps;</div><div class='ctx'> 	unsigned int fw_mdi;</div><div class='del'>-	int ret;</div><div class='add'>+	char cc_fec;</div><div class='ctx'> </div><div class='ctx'> 	fw_mdi = (FW_PORT_CAP32_MDI_V(FW_PORT_CAP32_MDI_AUTO) &amp; lc-&gt;pcaps);</div><div class='ctx'> </div><div class='hunk'>@@ -4151,18 +4166,15 @@ int t4_link_l1cfg_core(struct adapter *adapter, unsigned int mbox,</div><div class='ctx'> 	 * init_link_config().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(lc-&gt;pcaps &amp; FW_PORT_CAP32_ANEG)) {</div><div class='del'>-		if (lc-&gt;autoneg == AUTONEG_ENABLE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		rcap = lc-&gt;acaps | fw_fc | fw_fec;</div><div class='add'>+		acaps = lc-&gt;acaps | fw_fc | fw_fec;</div><div class='ctx'> 		lc-&gt;fc = lc-&gt;requested_fc &amp; ~PAUSE_AUTONEG;</div><div class='ctx'> 		lc-&gt;fec = cc_fec;</div><div class='ctx'> 	} else if (lc-&gt;autoneg == AUTONEG_DISABLE) {</div><div class='del'>-		rcap = lc-&gt;speed_caps | fw_fc | fw_fec | fw_mdi;</div><div class='add'>+		acaps = lc-&gt;speed_caps | fw_fc | fw_fec | fw_mdi;</div><div class='ctx'> 		lc-&gt;fc = lc-&gt;requested_fc &amp; ~PAUSE_AUTONEG;</div><div class='ctx'> 		lc-&gt;fec = cc_fec;</div><div class='ctx'> 	} else {</div><div class='del'>-		rcap = lc-&gt;acaps | fw_fc | fw_fec | fw_mdi;</div><div class='add'>+		acaps = lc-&gt;acaps | fw_fc | fw_fec | fw_mdi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Some Requested Port Capabilities are trivially wrong if they exceed</div><div class='hunk'>@@ -4173,15 +4185,50 @@ int t4_link_l1cfg_core(struct adapter *adapter, unsigned int mbox,</div><div class='ctx'> 	 * we need to exclude this from this check in order to maintain</div><div class='ctx'> 	 * compatibility ...</div><div class='ctx'> 	 */</div><div class='del'>-	if ((rcap &amp; ~lc-&gt;pcaps) &amp; ~FW_PORT_CAP32_FORCE_PAUSE) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev,</div><div class='del'>-			"Requested Port Capabilities %#x exceed Physical Port Capabilities %#x\n",</div><div class='del'>-			rcap, lc-&gt;pcaps);</div><div class='add'>+	if ((acaps &amp; ~lc-&gt;pcaps) &amp; ~FW_PORT_CAP32_FORCE_PAUSE) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev, "Requested Port Capabilities %#x exceed Physical Port Capabilities %#x\n",</div><div class='add'>+			acaps, lc-&gt;pcaps);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return acaps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	t4_link_l1cfg_core - apply link configuration to MAC/PHY</div><div class='add'>+ *	@adapter: the adapter</div><div class='add'>+ *	@mbox: the Firmware Mailbox to use</div><div class='add'>+ *	@port: the Port ID</div><div class='add'>+ *	@lc: the Port's Link Configuration</div><div class='add'>+ *	@sleep_ok: if true we may sleep while awaiting command completion</div><div class='add'>+ *	@timeout: time to wait for command to finish before timing out</div><div class='add'>+ *		(negative implies @sleep_ok=false)</div><div class='add'>+ *</div><div class='add'>+ *	Set up a port's MAC and PHY according to a desired link configuration.</div><div class='add'>+ *	- If the PHY can auto-negotiate first decide what to advertise, then</div><div class='add'>+ *	  enable/disable auto-negotiation as desired, and reset.</div><div class='add'>+ *	- If the PHY does not auto-negotiate just reset it.</div><div class='add'>+ *	- If auto-negotiation is off set the MAC to the proper speed/duplex/FC,</div><div class='add'>+ *	  otherwise do it later based on the outcome of auto-negotiation.</div><div class='add'>+ */</div><div class='add'>+int t4_link_l1cfg_core(struct adapter *adapter, unsigned int mbox,</div><div class='add'>+		       unsigned int port, struct link_config *lc,</div><div class='add'>+		       u8 sleep_ok, int timeout)</div><div class='add'>+{</div><div class='add'>+	unsigned int fw_caps = adapter-&gt;params.fw_caps_support;</div><div class='add'>+	struct fw_port_cmd cmd;</div><div class='add'>+	fw_port_cap32_t rcap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(lc-&gt;pcaps &amp; FW_PORT_CAP32_ANEG) &amp;&amp;</div><div class='add'>+	    lc-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* And send that on to the Firmware ...</div><div class='add'>+	/* Compute our Requested Port Capabilities and send that on to the</div><div class='add'>+	 * Firmware.</div><div class='ctx'> 	 */</div><div class='add'>+	rcap = t4_link_acaps(adapter, port, lc);</div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	cmd.op_to_portid = cpu_to_be32(FW_CMD_OP_V(FW_PORT_CMD) |</div><div class='ctx'> 				       FW_CMD_REQUEST_F | FW_CMD_EXEC_F |</div><div class='hunk'>@@ -4211,7 +4258,7 @@ int t4_link_l1cfg_core(struct adapter *adapter, unsigned int mbox,</div><div class='ctx'> 			rcap, -ret);</div><div class='ctx'> 		return ret;</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'> /**</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h<br/>index 9125ddd89dd1..a02b1dff403e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h</a></div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #define __T4FW_VERSION_H__</div><div class='ctx'> </div><div class='ctx'> #define T4FW_VERSION_MAJOR 0x01</div><div class='del'>-#define T4FW_VERSION_MINOR 0x16</div><div class='del'>-#define T4FW_VERSION_MICRO 0x09</div><div class='add'>+#define T4FW_VERSION_MINOR 0x17</div><div class='add'>+#define T4FW_VERSION_MICRO 0x03</div><div class='ctx'> #define T4FW_VERSION_BUILD 0x00</div><div class='ctx'> </div><div class='ctx'> #define T4FW_MIN_VERSION_MAJOR 0x01</div><div class='hunk'>@@ -45,8 +45,8 @@</div><div class='ctx'> #define T4FW_MIN_VERSION_MICRO 0x00</div><div class='ctx'> </div><div class='ctx'> #define T5FW_VERSION_MAJOR 0x01</div><div class='del'>-#define T5FW_VERSION_MINOR 0x16</div><div class='del'>-#define T5FW_VERSION_MICRO 0x09</div><div class='add'>+#define T5FW_VERSION_MINOR 0x17</div><div class='add'>+#define T5FW_VERSION_MICRO 0x03</div><div class='ctx'> #define T5FW_VERSION_BUILD 0x00</div><div class='ctx'> </div><div class='ctx'> #define T5FW_MIN_VERSION_MAJOR 0x00</div><div class='hunk'>@@ -54,8 +54,8 @@</div><div class='ctx'> #define T5FW_MIN_VERSION_MICRO 0x00</div><div class='ctx'> </div><div class='ctx'> #define T6FW_VERSION_MAJOR 0x01</div><div class='del'>-#define T6FW_VERSION_MINOR 0x16</div><div class='del'>-#define T6FW_VERSION_MICRO 0x09</div><div class='add'>+#define T6FW_VERSION_MINOR 0x17</div><div class='add'>+#define T6FW_VERSION_MICRO 0x03</div><div class='ctx'> #define T6FW_VERSION_BUILD 0x00</div><div class='ctx'> </div><div class='ctx'> #define T6FW_MIN_VERSION_MAJOR 0x00</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 adc4d481815b..6d4cf3d0b2f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a></div><div class='hunk'>@@ -518,8 +518,8 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cpl = (void *)p;</div><div class='del'>-		/*FALLTHROUGH*/</div><div class='ctx'> 	}</div><div class='add'>+		/* Fall through */</div><div class='ctx'> </div><div class='ctx'> 	case CPL_SGE_EGR_UPDATE: {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1479,22 +1479,6 @@ static int cxgb4vf_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 		base-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pi-&gt;link_cfg.fc &amp; PAUSE_RX) {</div><div class='del'>-		if (pi-&gt;link_cfg.fc &amp; PAUSE_TX) {</div><div class='del'>-			ethtool_link_ksettings_add_link_mode(link_ksettings,</div><div class='del'>-							     advertising,</div><div class='del'>-							     Pause);</div><div class='del'>-		} else {</div><div class='del'>-			ethtool_link_ksettings_add_link_mode(link_ksettings,</div><div class='del'>-							     advertising,</div><div class='del'>-							     Asym_Pause);</div><div class='del'>-		}</div><div class='del'>-	} else if (pi-&gt;link_cfg.fc &amp; PAUSE_TX) {</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(link_ksettings,</div><div class='del'>-						     advertising,</div><div class='del'>-						     Asym_Pause);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	base-&gt;autoneg = pi-&gt;link_cfg.autoneg;</div><div class='ctx'> 	if (pi-&gt;link_cfg.pcaps &amp; FW_PORT_CAP32_ANEG)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(link_ksettings,</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 84dff74ca9cd..8a389d617a23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c</a></div><div class='hunk'>@@ -313,7 +313,17 @@ int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* In the Physical Function Driver Common Code, the ADVERT_MASK is used to</div><div class='add'>+ * mask out bits in the Advertised Port Capabilities which are managed via</div><div class='add'>+ * separate controls, like Pause Frames and Forward Error Correction.  In the</div><div class='add'>+ * Virtual Function Common Code, since we never perform L1 Configuration on</div><div class='add'>+ * the Link, the only things we really need to filter out are things which</div><div class='add'>+ * we decode and report separately like Speed.</div><div class='add'>+ */</div><div class='ctx'> #define ADVERT_MASK (FW_PORT_CAP32_SPEED_V(FW_PORT_CAP32_SPEED_M) | \</div><div class='add'>+		     FW_PORT_CAP32_802_3_PAUSE | \</div><div class='add'>+		     FW_PORT_CAP32_802_3_ASM_DIR | \</div><div class='add'>+		     FW_PORT_CAP32_FEC_V(FW_PORT_CAP32_FEC_M) | \</div><div class='ctx'> 		     FW_PORT_CAP32_ANEG)</div><div class='ctx'> </div><div class='ctx'> /**</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 74849be5f004..e2919005ead3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c</a></div><div class='hunk'>@@ -354,7 +354,10 @@ static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total,</div><div class='ctx'> 		ppmax = max;</div><div class='ctx'> </div><div class='ctx'> 	/* pool size must be multiple of unsigned long */</div><div class='del'>-	bmap = BITS_TO_LONGS(ppmax);</div><div class='add'>+	bmap = ppmax / BITS_PER_TYPE(unsigned long);</div><div class='add'>+	if (!bmap)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	ppmax = (bmap * sizeof(unsigned long)) &lt;&lt; 3;</div><div class='ctx'> </div><div class='ctx'> 	alloc_sz = sizeof(*pools) + sizeof(unsigned long) * bmap;</div><div class='hunk'>@@ -402,6 +405,10 @@ int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev,</div><div class='ctx'> 	if (reserve_factor) {</div><div class='ctx'> 		ppmax_pool = ppmax / reserve_factor;</div><div class='ctx'> 		pool = ppm_alloc_cpu_pool(&amp;ppmax_pool, &amp;pool_index_max);</div><div class='add'>+		if (!pool) {</div><div class='add'>+			ppmax_pool = 0;</div><div class='add'>+			reserve_factor = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("%s: ppmax %u, cpu total %u, per cpu %u.\n",</div><div class='ctx'> 			 ndev-&gt;name, ppmax, ppmax_pool, pool_index_max);</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 733d9172425b..acb2856936d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cisco/enic/enic_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cisco/enic/enic_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cisco/enic/enic_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cisco/enic/enic_main.c</a></div><div class='hunk'>@@ -897,7 +897,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	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='ctx'> 	skb_tx_timestamp(skb);</div><div class='del'>-	if (!skb-&gt;xmit_more || netif_xmit_stopped(txq))</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(txq))</div><div class='ctx'> 		vnic_wq_doorbell(wq);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;enic-&gt;wq_lock[txq_map]);</div><div class='head'>diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c<br/>index 949103db8a8a..9003eb6716cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cortina/gemini.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/cortina/gemini.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/cortina/gemini.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/cortina/gemini.c</a></div><div class='hunk'>@@ -1235,8 +1235,6 @@ static int gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	int txq_num, nfrags;</div><div class='ctx'> 	union dma_rwptr rw;</div><div class='ctx'> </div><div class='del'>-	SKB_FRAG_ASSERT(skb);</div><div class='del'>-</div><div class='ctx'> 	if (skb-&gt;len &gt;= 0x10000)</div><div class='ctx'> 		goto out_drop_free;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c<br/>index c2586f44c29d..953ee5616801 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/davicom/dm9000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/davicom/dm9000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/davicom/dm9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/davicom/dm9000.c</a></div><div class='hunk'>@@ -1412,7 +1412,7 @@ static struct dm9000_plat_data *dm9000_parse_dt(struct device *dev)</div><div class='ctx'> 		pdata-&gt;flags |= DM9000_PLATF_NO_EEPROM;</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(pdata-&gt;dev_addr, mac_addr, sizeof(pdata-&gt;dev_addr));</div><div class='ctx'> </div><div class='ctx'> 	return pdata;</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 3c7c04406a2b..e2f9fbced174 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/emulex/benet/be_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/emulex/benet/be_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/emulex/benet/be_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/emulex/benet/be_main.c</a></div><div class='hunk'>@@ -1376,7 +1376,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	u16 q_idx = skb_get_queue_mapping(skb);</div><div class='ctx'> 	struct be_tx_obj *txo = &amp;adapter-&gt;tx_obj[q_idx];</div><div class='ctx'> 	struct be_wrb_params wrb_params = { 0 };</div><div class='del'>-	bool flush = !skb-&gt;xmit_more;</div><div class='add'>+	bool flush = !netdev_xmit_more();</div><div class='ctx'> 	u16 wrb_cnt;</div><div class='ctx'> </div><div class='ctx'> 	skb = be_xmit_workarounds(adapter, skb, &amp;wrb_params);</div><div class='head'>diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c<br/>index 0f3e7f21c6fa..71da0490521b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ethoc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ethoc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ethoc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ethoc.c</a></div><div class='hunk'>@@ -1153,7 +1153,7 @@ static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> 		const void *mac;</div><div class='ctx'> </div><div class='ctx'> 		mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-		if (mac)</div><div class='add'>+		if (!IS_ERR(mac))</div><div class='ctx'> 			ether_addr_copy(netdev-&gt;dev_addr, mac);</div><div class='ctx'> 		priv-&gt;phy_id = -1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c<br/>index 659f1ad37e96..b4ce26155087 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ezchip/nps_enet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ezchip/nps_enet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ezchip/nps_enet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ezchip/nps_enet.c</a></div><div class='hunk'>@@ -616,7 +616,7 @@ static s32 nps_enet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* set kernel MAC address to dev */</div><div class='ctx'> 	mac_addr = of_get_mac_address(dev-&gt;of_node);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(ndev);</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 dfebc30c4841..d3f2408dc9e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.c</a></div><div class='hunk'>@@ -1648,7 +1648,7 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv,</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;= nr_frags; i++) {</div><div class='ctx'> 			WARN_ON(qm_sg_entry_is_ext(&amp;sgt[i]));</div><div class='ctx'> </div><div class='ctx'> 			dma_unmap_page(dev, qm_sg_addr(&amp;sgt[i]),</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 2ba49e959c3f..63b1ecc18c26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c</a></div><div class='hunk'>@@ -435,7 +435,7 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</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'> </div><div class='del'>-	napi_gro_receive(&amp;ch-&gt;napi, skb);</div><div class='add'>+	list_add_tail(&amp;skb-&gt;list, ch-&gt;rx_list);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -815,6 +815,14 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	queue_mapping = skb_get_queue_mapping(skb);</div><div class='ctx'> 	fq = &amp;priv-&gt;fq[queue_mapping];</div><div class='add'>+</div><div class='add'>+	fd_len = dpaa2_fd_get_len(&amp;fd);</div><div class='add'>+	nq = netdev_get_tx_queue(net_dev, queue_mapping);</div><div class='add'>+	netdev_tx_sent_queue(nq, fd_len);</div><div class='add'>+</div><div class='add'>+	/* Everything that happens after this enqueues might race with</div><div class='add'>+	 * the Tx confirmation callback for this frame</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; DPAA2_ETH_ENQUEUE_RETRIES; i++) {</div><div class='ctx'> 		err = priv-&gt;enqueue(priv, fq, &amp;fd, 0);</div><div class='ctx'> 		if (err != -EBUSY)</div><div class='hunk'>@@ -825,13 +833,10 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 		percpu_stats-&gt;tx_errors++;</div><div class='ctx'> 		/* Clean up everything, including freeing the skb */</div><div class='ctx'> 		free_tx_fd(priv, fq, &amp;fd, false);</div><div class='add'>+		netdev_tx_completed_queue(nq, 1, fd_len);</div><div class='ctx'> 	} else {</div><div class='del'>-		fd_len = dpaa2_fd_get_len(&amp;fd);</div><div class='ctx'> 		percpu_stats-&gt;tx_packets++;</div><div class='ctx'> 		percpu_stats-&gt;tx_bytes += fd_len;</div><div class='del'>-</div><div class='del'>-		nq = netdev_get_tx_queue(net_dev, queue_mapping);</div><div class='del'>-		netdev_tx_sent_queue(nq, fd_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -1108,12 +1113,16 @@ 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'>+	struct list_head rx_list;</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='ctx'> 	ch-&gt;xdp.res = 0;</div><div class='ctx'> 	priv = ch-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;rx_list);</div><div class='add'>+	ch-&gt;rx_list = &amp;rx_list;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = pull_channel(ch);</div><div class='ctx'> 		if (unlikely(err))</div><div class='hunk'>@@ -1157,6 +1166,8 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	work_done = max(rx_cleaned, 1);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	netif_receive_skb_list(ch-&gt;rx_list);</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'>@@ -1817,7 +1828,7 @@ static int dpaa2_eth_xdp_xmit_frame(struct net_device *net_dev,</div><div class='ctx'> 	dpaa2_fd_set_format(&amp;fd, dpaa2_fd_single);</div><div class='ctx'> 	dpaa2_fd_set_ctrl(&amp;fd, FD_CTRL_PTA);</div><div class='ctx'> </div><div class='del'>-	fq = &amp;priv-&gt;fq[smp_processor_id()];</div><div class='add'>+	fq = &amp;priv-&gt;fq[smp_processor_id() % dpaa2_eth_queue_count(priv)];</div><div class='ctx'> 	for (i = 0; i &lt; DPAA2_ETH_ENQUEUE_RETRIES; i++) {</div><div class='ctx'> 		err = priv-&gt;enqueue(priv, fq, &amp;fd, 0);</div><div class='ctx'> 		if (err != -EBUSY)</div><div class='hunk'>@@ -2560,10 +2571,12 @@ static const struct dpaa2_eth_dist_fields dist_fields[] = {</div><div class='ctx'> 		.rxnfc_field = RXH_L2DA,</div><div class='ctx'> 		.cls_prot = NET_PROT_ETH,</div><div class='ctx'> 		.cls_field = NH_FLD_ETH_DA,</div><div class='add'>+		.id = DPAA2_ETH_DIST_ETHDST,</div><div class='ctx'> 		.size = 6,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.cls_prot = NET_PROT_ETH,</div><div class='ctx'> 		.cls_field = NH_FLD_ETH_SA,</div><div class='add'>+		.id = DPAA2_ETH_DIST_ETHSRC,</div><div class='ctx'> 		.size = 6,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* This is the last ethertype field parsed:</div><div class='hunk'>@@ -2572,28 +2585,33 @@ static const struct dpaa2_eth_dist_fields dist_fields[] = {</div><div class='ctx'> 		 */</div><div class='ctx'> 		.cls_prot = NET_PROT_ETH,</div><div class='ctx'> 		.cls_field = NH_FLD_ETH_TYPE,</div><div class='add'>+		.id = DPAA2_ETH_DIST_ETHTYPE,</div><div class='ctx'> 		.size = 2,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* VLAN header */</div><div class='ctx'> 		.rxnfc_field = RXH_VLAN,</div><div class='ctx'> 		.cls_prot = NET_PROT_VLAN,</div><div class='ctx'> 		.cls_field = NH_FLD_VLAN_TCI,</div><div class='add'>+		.id = DPAA2_ETH_DIST_VLAN,</div><div class='ctx'> 		.size = 2,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* IP header */</div><div class='ctx'> 		.rxnfc_field = RXH_IP_SRC,</div><div class='ctx'> 		.cls_prot = NET_PROT_IP,</div><div class='ctx'> 		.cls_field = NH_FLD_IP_SRC,</div><div class='add'>+		.id = DPAA2_ETH_DIST_IPSRC,</div><div class='ctx'> 		.size = 4,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.rxnfc_field = RXH_IP_DST,</div><div class='ctx'> 		.cls_prot = NET_PROT_IP,</div><div class='ctx'> 		.cls_field = NH_FLD_IP_DST,</div><div class='add'>+		.id = DPAA2_ETH_DIST_IPDST,</div><div class='ctx'> 		.size = 4,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.rxnfc_field = RXH_L3_PROTO,</div><div class='ctx'> 		.cls_prot = NET_PROT_IP,</div><div class='ctx'> 		.cls_field = NH_FLD_IP_PROTO,</div><div class='add'>+		.id = DPAA2_ETH_DIST_IPPROTO,</div><div class='ctx'> 		.size = 1,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* Using UDP ports, this is functionally equivalent to raw</div><div class='hunk'>@@ -2602,11 +2620,13 @@ static const struct dpaa2_eth_dist_fields dist_fields[] = {</div><div class='ctx'> 		.rxnfc_field = RXH_L4_B_0_1,</div><div class='ctx'> 		.cls_prot = NET_PROT_UDP,</div><div class='ctx'> 		.cls_field = NH_FLD_UDP_PORT_SRC,</div><div class='add'>+		.id = DPAA2_ETH_DIST_L4SRC,</div><div class='ctx'> 		.size = 2,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.rxnfc_field = RXH_L4_B_2_3,</div><div class='ctx'> 		.cls_prot = NET_PROT_UDP,</div><div class='ctx'> 		.cls_field = NH_FLD_UDP_PORT_DST,</div><div class='add'>+		.id = DPAA2_ETH_DIST_L4DST,</div><div class='ctx'> 		.size = 2,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -2672,12 +2692,15 @@ static int config_cls_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Size of the Rx flow classification key */</div><div class='del'>-int dpaa2_eth_cls_key_size(void)</div><div class='add'>+int dpaa2_eth_cls_key_size(u64 fields)</div><div class='ctx'> {</div><div class='ctx'> 	int i, size = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dist_fields); i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dist_fields); i++) {</div><div class='add'>+		if (!(fields &amp; dist_fields[i].id))</div><div class='add'>+			continue;</div><div class='ctx'> 		size += dist_fields[i].size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='hunk'>@@ -2698,6 +2721,24 @@ int dpaa2_eth_cls_fld_off(int prot, int field)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Prune unused fields from the classification rule.</div><div class='add'>+ * Used when masking is not supported</div><div class='add'>+ */</div><div class='add'>+void dpaa2_eth_cls_trim_rule(void *key_mem, u64 fields)</div><div class='add'>+{</div><div class='add'>+	int off = 0, new_off = 0;</div><div class='add'>+	int i, size;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dist_fields); i++) {</div><div class='add'>+		size = dist_fields[i].size;</div><div class='add'>+		if (dist_fields[i].id &amp; fields) {</div><div class='add'>+			memcpy(key_mem + new_off, key_mem + off, size);</div><div class='add'>+			new_off += size;</div><div class='add'>+		}</div><div class='add'>+		off += size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Set Rx distribution (hash or flow classification) key</div><div class='ctx'>  * flags is a combination of RXH_ bits</div><div class='ctx'>  */</div><div class='hunk'>@@ -2719,14 +2760,13 @@ static int dpaa2_eth_set_dist_key(struct net_device *net_dev,</div><div class='ctx'> 		struct dpkg_extract *key =</div><div class='ctx'> 			&amp;cls_cfg.extracts[cls_cfg.num_extracts];</div><div class='ctx'> </div><div class='del'>-		/* For Rx hashing key we set only the selected fields.</div><div class='del'>-		 * For Rx flow classification key we set all supported fields</div><div class='add'>+		/* For both Rx hashing and classification keys</div><div class='add'>+		 * we set only the selected fields.</div><div class='ctx'> 		 */</div><div class='del'>-		if (type == DPAA2_ETH_RX_DIST_HASH) {</div><div class='del'>-			if (!(flags &amp; dist_fields[i].rxnfc_field))</div><div class='del'>-				continue;</div><div class='add'>+		if (!(flags &amp; dist_fields[i].id))</div><div class='add'>+			continue;</div><div class='add'>+		if (type == DPAA2_ETH_RX_DIST_HASH)</div><div class='ctx'> 			rx_hash_fields |= dist_fields[i].rxnfc_field;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (cls_cfg.num_extracts &gt;= DPKG_MAX_NUM_OF_EXTRACTS) {</div><div class='ctx'> 			dev_err(dev, "error adding key extraction rule, too many rules?\n");</div><div class='hunk'>@@ -2781,16 +2821,28 @@ free_key:</div><div class='ctx'> int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	u64 key = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!dpaa2_eth_hash_enabled(priv))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return dpaa2_eth_set_dist_key(net_dev, DPAA2_ETH_RX_DIST_HASH, flags);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dist_fields); i++)</div><div class='add'>+		if (dist_fields[i].rxnfc_field &amp; flags)</div><div class='add'>+			key |= dist_fields[i].id;</div><div class='add'>+</div><div class='add'>+	return dpaa2_eth_set_dist_key(net_dev, DPAA2_ETH_RX_DIST_HASH, key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_eth_set_cls(struct dpaa2_eth_priv *priv)</div><div class='add'>+int dpaa2_eth_set_cls(struct net_device *net_dev, u64 flags)</div><div class='add'>+{</div><div class='add'>+	return dpaa2_eth_set_dist_key(net_dev, DPAA2_ETH_RX_DIST_CLS, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_default_cls(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='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we actually support Rx flow classification */</div><div class='ctx'> 	if (dpaa2_eth_has_legacy_dist(priv)) {</div><div class='hunk'>@@ -2798,8 +2850,7 @@ static int dpaa2_eth_set_cls(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;dpni_attrs.options &amp; DPNI_OPT_NO_FS ||</div><div class='del'>-	    !(priv-&gt;dpni_attrs.options &amp; DPNI_OPT_HAS_KEY_MASKING)) {</div><div class='add'>+	if (!dpaa2_eth_fs_enabled(priv)) {</div><div class='ctx'> 		dev_dbg(dev, "Rx cls disabled in DPNI options\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2809,9 +2860,21 @@ static int dpaa2_eth_set_cls(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If there is no support for masking in the classification table,</div><div class='add'>+	 * we don't set a default key, as it will depend on the rules</div><div class='add'>+	 * added by the user at runtime.</div><div class='add'>+	 */</div><div class='add'>+	if (!dpaa2_eth_fs_mask_enabled(priv))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_set_cls(priv-&gt;net_dev, DPAA2_ETH_DIST_ALL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	priv-&gt;rx_cls_enabled = 1;</div><div class='ctx'> </div><div class='del'>-	return dpaa2_eth_set_dist_key(priv-&gt;net_dev, DPAA2_ETH_RX_DIST_CLS, 0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Bind the DPNI to its needed objects and resources: buffer pool, DPIOs,</div><div class='hunk'>@@ -2846,7 +2909,7 @@ static int bind_dpni(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	/* Configure the flow classification key; it includes all</div><div class='ctx'> 	 * supported header fields and cannot be modified at runtime</div><div class='ctx'> 	 */</div><div class='del'>-	err = dpaa2_eth_set_cls(priv);</div><div class='add'>+	err = dpaa2_eth_set_default_cls(priv);</div><div class='ctx'> 	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='ctx'> 		dev_err(dev, "Failed to configure Rx classification key\n");</div><div class='ctx'> </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 7879622aa3e6..5fb8f5c0dc9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h</a></div><div class='hunk'>@@ -334,6 +334,7 @@ struct dpaa2_eth_channel {</div><div class='ctx'> 	struct dpaa2_eth_ch_stats stats;</div><div class='ctx'> 	struct dpaa2_eth_ch_xdp xdp;</div><div class='ctx'> 	struct xdp_rxq_info xdp_rxq;</div><div class='add'>+	struct list_head *rx_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_eth_dist_fields {</div><div class='hunk'>@@ -341,6 +342,7 @@ struct dpaa2_eth_dist_fields {</div><div class='ctx'> 	enum net_prot cls_prot;</div><div class='ctx'> 	int cls_field;</div><div class='ctx'> 	int size;</div><div class='add'>+	u64 id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_eth_cls_rule {</div><div class='hunk'>@@ -393,6 +395,7 @@ struct dpaa2_eth_priv {</div><div class='ctx'> </div><div class='ctx'> 	/* enabled ethtool hashing bits */</div><div class='ctx'> 	u64 rx_hash_fields;</div><div class='add'>+	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='ctx'> 	struct bpf_prog *xdp_prog;</div><div class='hunk'>@@ -436,6 +439,12 @@ static inline int dpaa2_eth_cmp_dpni_ver(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	(dpaa2_eth_cmp_dpni_ver((priv), DPNI_RX_DIST_KEY_VER_MAJOR,	\</div><div class='ctx'> 				DPNI_RX_DIST_KEY_VER_MINOR) &lt; 0)</div><div class='ctx'> </div><div class='add'>+#define dpaa2_eth_fs_enabled(priv)	\</div><div class='add'>+	(!((priv)-&gt;dpni_attrs.options &amp; DPNI_OPT_NO_FS))</div><div class='add'>+</div><div class='add'>+#define dpaa2_eth_fs_mask_enabled(priv)	\</div><div class='add'>+	((priv)-&gt;dpni_attrs.options &amp; DPNI_OPT_HAS_KEY_MASKING)</div><div class='add'>+</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='hunk'>@@ -448,6 +457,18 @@ enum dpaa2_eth_rx_dist {</div><div class='ctx'> 	DPAA2_ETH_RX_DIST_CLS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Unique IDs for the supported Rx classification header fields */</div><div class='add'>+#define DPAA2_ETH_DIST_ETHDST		BIT(0)</div><div class='add'>+#define DPAA2_ETH_DIST_ETHSRC		BIT(1)</div><div class='add'>+#define DPAA2_ETH_DIST_ETHTYPE		BIT(2)</div><div class='add'>+#define DPAA2_ETH_DIST_VLAN		BIT(3)</div><div class='add'>+#define DPAA2_ETH_DIST_IPSRC		BIT(4)</div><div class='add'>+#define DPAA2_ETH_DIST_IPDST		BIT(5)</div><div class='add'>+#define DPAA2_ETH_DIST_IPPROTO		BIT(6)</div><div class='add'>+#define DPAA2_ETH_DIST_L4SRC		BIT(7)</div><div class='add'>+#define DPAA2_ETH_DIST_L4DST		BIT(8)</div><div class='add'>+#define DPAA2_ETH_DIST_ALL		(~0U)</div><div class='add'>+</div><div class='ctx'> static inline</div><div class='ctx'> unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='hunk'>@@ -482,7 +503,9 @@ static inline unsigned int dpaa2_eth_rx_head_room(struct dpaa2_eth_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags);</div><div class='del'>-int dpaa2_eth_cls_key_size(void);</div><div class='add'>+int dpaa2_eth_set_cls(struct net_device *net_dev, u64 key);</div><div class='add'>+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='add'>+void dpaa2_eth_cls_trim_rule(void *key_mem, u64 fields);</div><div class='ctx'> </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 591dfcf76adb..76bd8d2872cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c</a></div><div class='hunk'>@@ -264,7 +264,7 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,</div><div class='del'>-			 void *key, void *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'>@@ -272,18 +272,21 @@ static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_ETH, NH_FLD_ETH_TYPE);</div><div class='ctx'> 		*(__be16 *)(key + off) = eth_value-&gt;h_proto;</div><div class='ctx'> 		*(__be16 *)(mask + off) = eth_mask-&gt;h_proto;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_ETHTYPE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!is_zero_ether_addr(eth_mask-&gt;h_source)) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_ETH, NH_FLD_ETH_SA);</div><div class='ctx'> 		ether_addr_copy(key + off, eth_value-&gt;h_source);</div><div class='ctx'> 		ether_addr_copy(mask + off, eth_mask-&gt;h_source);</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_ETHSRC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!is_zero_ether_addr(eth_mask-&gt;h_dest)) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_ETH, NH_FLD_ETH_DA);</div><div class='ctx'> 		ether_addr_copy(key + off, eth_value-&gt;h_dest);</div><div class='ctx'> 		ether_addr_copy(mask + off, eth_mask-&gt;h_dest);</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_ETHDST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -291,7 +294,7 @@ static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,</div><div class='ctx'> </div><div class='ctx'> static int prep_uip_rule(struct ethtool_usrip4_spec *uip_value,</div><div class='ctx'> 			 struct ethtool_usrip4_spec *uip_mask,</div><div class='del'>-			 void *key, void *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'>@@ -303,18 +306,21 @@ static int prep_uip_rule(struct ethtool_usrip4_spec *uip_value,</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_IP, NH_FLD_IP_SRC);</div><div class='ctx'> 		*(__be32 *)(key + off) = uip_value-&gt;ip4src;</div><div class='ctx'> 		*(__be32 *)(mask + off) = uip_mask-&gt;ip4src;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_IPSRC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (uip_mask-&gt;ip4dst) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_IP, NH_FLD_IP_DST);</div><div class='ctx'> 		*(__be32 *)(key + off) = uip_value-&gt;ip4dst;</div><div class='ctx'> 		*(__be32 *)(mask + off) = uip_mask-&gt;ip4dst;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_IPDST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (uip_mask-&gt;proto) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_IP, NH_FLD_IP_PROTO);</div><div class='ctx'> 		*(u8 *)(key + off) = uip_value-&gt;proto;</div><div class='ctx'> 		*(u8 *)(mask + off) = uip_mask-&gt;proto;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_IPPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (uip_mask-&gt;l4_4_bytes) {</div><div class='hunk'>@@ -324,23 +330,26 @@ static int prep_uip_rule(struct ethtool_usrip4_spec *uip_value,</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_UDP, NH_FLD_UDP_PORT_SRC);</div><div class='ctx'> 		*(__be16 *)(key + off) = htons(tmp_value &gt;&gt; 16);</div><div class='ctx'> 		*(__be16 *)(mask + off) = htons(tmp_mask &gt;&gt; 16);</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_L4SRC;</div><div class='ctx'> </div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_UDP, NH_FLD_UDP_PORT_DST);</div><div class='ctx'> 		*(__be16 *)(key + off) = htons(tmp_value &amp; 0xFFFF);</div><div class='ctx'> 		*(__be16 *)(mask + off) = htons(tmp_mask &amp; 0xFFFF);</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_L4DST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Only apply the rule for IPv4 frames */</div><div class='ctx'> 	off = dpaa2_eth_cls_fld_off(NET_PROT_ETH, NH_FLD_ETH_TYPE);</div><div class='ctx'> 	*(__be16 *)(key + off) = htons(ETH_P_IP);</div><div class='ctx'> 	*(__be16 *)(mask + off) = htons(0xFFFF);</div><div class='add'>+	*fields |= DPAA2_ETH_DIST_ETHTYPE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int prep_l4_rule(struct ethtool_tcpip4_spec *l4_value,</div><div class='ctx'> 			struct ethtool_tcpip4_spec *l4_mask,</div><div class='del'>-			void *key, void *mask, u8 l4_proto)</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'>@@ -351,41 +360,47 @@ static int prep_l4_rule(struct ethtool_tcpip4_spec *l4_value,</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_IP, NH_FLD_IP_SRC);</div><div class='ctx'> 		*(__be32 *)(key + off) = l4_value-&gt;ip4src;</div><div class='ctx'> 		*(__be32 *)(mask + off) = l4_mask-&gt;ip4src;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_IPSRC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (l4_mask-&gt;ip4dst) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_IP, NH_FLD_IP_DST);</div><div class='ctx'> 		*(__be32 *)(key + off) = l4_value-&gt;ip4dst;</div><div class='ctx'> 		*(__be32 *)(mask + off) = l4_mask-&gt;ip4dst;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_IPDST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (l4_mask-&gt;psrc) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_UDP, NH_FLD_UDP_PORT_SRC);</div><div class='ctx'> 		*(__be16 *)(key + off) = l4_value-&gt;psrc;</div><div class='ctx'> 		*(__be16 *)(mask + off) = l4_mask-&gt;psrc;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_L4SRC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (l4_mask-&gt;pdst) {</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_UDP, NH_FLD_UDP_PORT_DST);</div><div class='ctx'> 		*(__be16 *)(key + off) = l4_value-&gt;pdst;</div><div class='ctx'> 		*(__be16 *)(mask + off) = l4_mask-&gt;pdst;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_L4DST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Only apply the rule for IPv4 frames with the specified L4 proto */</div><div class='ctx'> 	off = dpaa2_eth_cls_fld_off(NET_PROT_ETH, NH_FLD_ETH_TYPE);</div><div class='ctx'> 	*(__be16 *)(key + off) = htons(ETH_P_IP);</div><div class='ctx'> 	*(__be16 *)(mask + off) = htons(0xFFFF);</div><div class='add'>+	*fields |= DPAA2_ETH_DIST_ETHTYPE;</div><div class='ctx'> </div><div class='ctx'> 	off = dpaa2_eth_cls_fld_off(NET_PROT_IP, NH_FLD_IP_PROTO);</div><div class='ctx'> 	*(u8 *)(key + off) = l4_proto;</div><div class='ctx'> 	*(u8 *)(mask + off) = 0xFF;</div><div class='add'>+	*fields |= DPAA2_ETH_DIST_IPPROTO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int prep_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> 			 struct ethtool_flow_ext *ext_mask,</div><div class='del'>-			 void *key, void *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'>@@ -396,6 +411,7 @@ static int prep_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_VLAN, NH_FLD_VLAN_TCI);</div><div class='ctx'> 		*(__be16 *)(key + off) = ext_value-&gt;vlan_tci;</div><div class='ctx'> 		*(__be16 *)(mask + off) = ext_mask-&gt;vlan_tci;</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_VLAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -403,7 +419,7 @@ static int prep_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> </div><div class='ctx'> static int prep_mac_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> 			     struct ethtool_flow_ext *ext_mask,</div><div class='del'>-			     void *key, void *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'>@@ -411,36 +427,38 @@ static int prep_mac_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> 		off = dpaa2_eth_cls_fld_off(NET_PROT_ETH, NH_FLD_ETH_DA);</div><div class='ctx'> 		ether_addr_copy(key + off, ext_value-&gt;h_dest);</div><div class='ctx'> 		ether_addr_copy(mask + off, ext_mask-&gt;h_dest);</div><div class='add'>+		*fields |= DPAA2_ETH_DIST_ETHDST;</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 prep_cls_rule(struct ethtool_rx_flow_spec *fs, void *key, void *mask)</div><div class='add'>+static int prep_cls_rule(struct ethtool_rx_flow_spec *fs, void *key, void *mask,</div><div class='add'>+			 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='ctx'> 		err = prep_eth_rule(&amp;fs-&gt;h_u.ether_spec, &amp;fs-&gt;m_u.ether_spec,</div><div class='del'>-				    key, mask);</div><div class='add'>+				    key, mask, fields);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IP_USER_FLOW:</div><div class='ctx'> 		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);</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='ctx'> 		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);</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='ctx'> 		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);</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='ctx'> 		err = prep_l4_rule(&amp;fs-&gt;h_u.sctp_ip4_spec,</div><div class='ctx'> 				   &amp;fs-&gt;m_u.sctp_ip4_spec, key, mask,</div><div class='del'>-				   IPPROTO_SCTP);</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'>@@ -450,13 +468,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);</div><div class='add'>+		err = 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='add'>+		err = prep_mac_ext_rule(&amp;fs-&gt;h_ext, &amp;fs-&gt;m_ext, key, mask,</div><div class='add'>+					fields);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -473,6 +492,7 @@ static int do_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 	struct dpni_rule_cfg rule_cfg = { 0 };</div><div class='ctx'> 	struct dpni_fs_action_cfg fs_act = { 0 };</div><div class='ctx'> 	dma_addr_t key_iova;</div><div class='add'>+	u64 fields = 0;</div><div class='ctx'> 	void *key_buf;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -480,7 +500,7 @@ static int do_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 	    fs-&gt;ring_cookie &gt;= dpaa2_eth_queue_count(priv))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rule_cfg.key_size = dpaa2_eth_cls_key_size();</div><div class='add'>+	rule_cfg.key_size = dpaa2_eth_cls_key_size(DPAA2_ETH_DIST_ALL);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate twice the key size, for the actual key and for mask */</div><div class='ctx'> 	key_buf = kzalloc(rule_cfg.key_size * 2, GFP_KERNEL);</div><div class='hunk'>@@ -488,10 +508,36 @@ 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);</div><div class='add'>+	err = 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='add'>+	if (!dpaa2_eth_fs_mask_enabled(priv)) {</div><div class='add'>+		/* Masking allows us to configure a maximal key during init and</div><div class='add'>+		 * use it for all flow steering rules. Without it, we include</div><div class='add'>+		 * in the key only the fields actually used, so we need to</div><div class='add'>+		 * extract the others from the final key buffer.</div><div class='add'>+		 *</div><div class='add'>+		 * Program the FS key if needed, or return error if previously</div><div class='add'>+		 * set key can't be used for the current rule. User needs to</div><div class='add'>+		 * delete existing rules in this case to allow for the new one.</div><div class='add'>+		 */</div><div class='add'>+		if (!priv-&gt;rx_cls_fields) {</div><div class='add'>+			err = dpaa2_eth_set_cls(net_dev, fields);</div><div class='add'>+			if (err)</div><div class='add'>+				goto free_mem;</div><div class='add'>+</div><div class='add'>+			priv-&gt;rx_cls_fields = fields;</div><div class='add'>+		} else if (priv-&gt;rx_cls_fields != fields) {</div><div class='add'>+			netdev_err(net_dev, "No support for multiple FS keys, need to delete existing rules\n");</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto free_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dpaa2_eth_cls_trim_rule(key_buf, fields);</div><div class='add'>+		rule_cfg.key_size = dpaa2_eth_cls_key_size(fields);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	key_iova = dma_map_single(dev, key_buf, rule_cfg.key_size * 2,</div><div class='ctx'> 				  DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(dev, key_iova)) {</div><div class='hunk'>@@ -500,7 +546,8 @@ static int do_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rule_cfg.key_iova = key_iova;</div><div class='del'>-	rule_cfg.mask_iova = key_iova + rule_cfg.key_size;</div><div class='add'>+	if (dpaa2_eth_fs_mask_enabled(priv))</div><div class='add'>+		rule_cfg.mask_iova = key_iova + rule_cfg.key_size;</div><div class='ctx'> </div><div class='ctx'> 	if (add) {</div><div class='ctx'> 		if (fs-&gt;ring_cookie == RX_CLS_FLOW_DISC)</div><div class='hunk'>@@ -522,6 +569,17 @@ free_mem:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int num_rules(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i, rules = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_fs_count(priv); i++)</div><div class='add'>+		if (priv-&gt;cls_rules[i].in_use)</div><div class='add'>+			rules++;</div><div class='add'>+</div><div class='add'>+	return rules;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int update_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 			   struct ethtool_rx_flow_spec *new_fs,</div><div class='ctx'> 			   int location)</div><div class='hunk'>@@ -545,6 +603,9 @@ static int update_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		rule-&gt;in_use = 0;</div><div class='add'>+</div><div class='add'>+		if (!dpaa2_eth_fs_mask_enabled(priv) &amp;&amp; !num_rules(priv))</div><div class='add'>+			priv-&gt;rx_cls_fields = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If no new entry to add, return here */</div><div class='hunk'>@@ -581,9 +642,7 @@ static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLCNT:</div><div class='ctx'> 		rxnfc-&gt;rule_cnt = 0;</div><div class='del'>-		for (i = 0; i &lt; max_rules; i++)</div><div class='del'>-			if (priv-&gt;cls_rules[i].in_use)</div><div class='del'>-				rxnfc-&gt;rule_cnt++;</div><div class='add'>+		rxnfc-&gt;rule_cnt = num_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='head'>diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c<br/>index 697c2427f2b7..aa7d4e27c5d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fec_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fec_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fec_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/fec_main.c</a></div><div class='hunk'>@@ -1655,7 +1655,7 @@ static void fec_get_mac(struct net_device *ndev)</div><div class='ctx'> 		struct device_node *np = fep-&gt;pdev-&gt;dev.of_node;</div><div class='ctx'> 		if (np) {</div><div class='ctx'> 			const char *mac = of_get_mac_address(np);</div><div class='del'>-			if (mac)</div><div class='add'>+			if (!IS_ERR(mac))</div><div class='ctx'> 				iap = (unsigned char *) mac;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1840,13 +1840,9 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='del'>-		ret = clk_prepare_enable(fep-&gt;clk_ahb);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='ctx'> 		ret = clk_prepare_enable(fep-&gt;clk_enet_out);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto failed_clk_enet_out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		if (fep-&gt;clk_ptp) {</div><div class='ctx'> 			mutex_lock(&amp;fep-&gt;ptp_clk_mutex);</div><div class='hunk'>@@ -1866,7 +1862,6 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)</div><div class='ctx'> </div><div class='ctx'> 		phy_reset_after_clk_enable(ndev-&gt;phydev);</div><div class='ctx'> 	} else {</div><div class='del'>-		clk_disable_unprepare(fep-&gt;clk_ahb);</div><div class='ctx'> 		clk_disable_unprepare(fep-&gt;clk_enet_out);</div><div class='ctx'> 		if (fep-&gt;clk_ptp) {</div><div class='ctx'> 			mutex_lock(&amp;fep-&gt;ptp_clk_mutex);</div><div class='hunk'>@@ -1885,8 +1880,6 @@ failed_clk_ref:</div><div class='ctx'> failed_clk_ptp:</div><div class='ctx'> 	if (fep-&gt;clk_enet_out)</div><div class='ctx'> 		clk_disable_unprepare(fep-&gt;clk_enet_out);</div><div class='del'>-failed_clk_enet_out:</div><div class='del'>-		clk_disable_unprepare(fep-&gt;clk_ahb);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3470,6 +3463,9 @@ fec_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = clk_prepare_enable(fep-&gt;clk_ipg);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto failed_clk_ipg;</div><div class='add'>+	ret = clk_prepare_enable(fep-&gt;clk_ahb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto failed_clk_ahb;</div><div class='ctx'> </div><div class='ctx'> 	fep-&gt;reg_phy = devm_regulator_get_optional(&amp;pdev-&gt;dev, "phy");</div><div class='ctx'> 	if (!IS_ERR(fep-&gt;reg_phy)) {</div><div class='hunk'>@@ -3563,6 +3559,9 @@ failed_reset:</div><div class='ctx'> 	pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> failed_regulator:</div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk_ahb);</div><div class='add'>+failed_clk_ahb:</div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk_ipg);</div><div class='ctx'> failed_clk_ipg:</div><div class='ctx'> 	fec_enet_clk_enable(ndev, false);</div><div class='ctx'> failed_clk:</div><div class='hunk'>@@ -3686,6 +3685,7 @@ static int __maybe_unused fec_runtime_suspend(struct device *dev)</div><div class='ctx'> 	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct fec_enet_private *fep = netdev_priv(ndev);</div><div class='ctx'> </div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk_ahb);</div><div class='ctx'> 	clk_disable_unprepare(fep-&gt;clk_ipg);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3695,8 +3695,20 @@ static int __maybe_unused fec_runtime_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct fec_enet_private *fep = netdev_priv(ndev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return clk_prepare_enable(fep-&gt;clk_ipg);</div><div class='add'>+	ret = clk_prepare_enable(fep-&gt;clk_ahb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = clk_prepare_enable(fep-&gt;clk_ipg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto failed_clk_ipg;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed_clk_ipg:</div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk_ahb);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops fec_pm_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c<br/>index c1968b3ecec8..7b7e526869a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fec_mpc52xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fec_mpc52xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fec_mpc52xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/fec_mpc52xx.c</a></div><div class='hunk'>@@ -902,7 +902,7 @@ static int mpc52xx_fec_probe(struct platform_device *op)</div><div class='ctx'> 	 * First try to read MAC address from DT</div><div class='ctx'> 	 */</div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr) {</div><div class='add'>+	if (!IS_ERR(mac_addr)) {</div><div class='ctx'> 		memcpy(ndev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct mpc52xx_fec __iomem *fec = priv-&gt;fec;</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c<br/>index 3c21486c6c84..9cd2c28d17df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fman/mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fman/mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fman/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/fman/mac.c</a></div><div class='hunk'>@@ -724,7 +724,7 @@ static int mac_probe(struct platform_device *_of_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Get the MAC address */</div><div class='ctx'> 	mac_addr = of_get_mac_address(mac_node);</div><div class='del'>-	if (!mac_addr) {</div><div class='add'>+	if (IS_ERR(mac_addr)) {</div><div class='ctx'> 		dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto _return_of_get_parent;</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c<br/>index 7c548ed535da..90ea7a115d0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a></div><div class='hunk'>@@ -1014,7 +1014,7 @@ static int fs_enet_probe(struct platform_device *ofdev)</div><div class='ctx'> 	spin_lock_init(&amp;fep-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(ofdev-&gt;dev.of_node);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(ndev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	ret = fep-&gt;ops-&gt;allocate_bd(ndev);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c<br/>index 45fcc96be90e..df13c693b038 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/gianfar.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/gianfar.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/gianfar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/gianfar.c</a></div><div class='hunk'>@@ -872,7 +872,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='ctx'> </div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	if (model &amp;&amp; !strcasecmp(model, "TSEC"))</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c<br/>index eb3e65e8868f..216e99af2b5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/ucc_geth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/ucc_geth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/ucc_geth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/ucc_geth.c</a></div><div class='hunk'>@@ -3910,7 +3910,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	ugeth-&gt;ug_info = ug_info;</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c<br/>index 0beee2cc2ddd..722b6de24816 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/ucc_geth_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/freescale/ucc_geth_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/freescale/ucc_geth_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/freescale/ucc_geth_ethtool.c</a></div><div class='hunk'>@@ -252,14 +252,12 @@ uec_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	ug_info-&gt;bdRingLenRx[queue] = ring-&gt;rx_pending;</div><div class='ctx'> 	ug_info-&gt;bdRingLenTx[queue] = ring-&gt;tx_pending;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		/* FIXME: restart automatically */</div><div class='del'>-		netdev_info(netdev, "Please re-open the interface\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c<br/>index 2c2808830e95..96c32ae320b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hisi_femac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hisi_femac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hisi_femac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hisi_femac.c</a></div><div class='hunk'>@@ -870,7 +870,7 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 			   phy_modes(phy-&gt;interface));</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(node);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c<br/>index e5d853b7b454..b1cb58f0aaf6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hix5hd2_gmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hix5hd2_gmac.c</a></div><div class='hunk'>@@ -1229,7 +1229,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(node);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c<br/>index 79d03f8ee7b1..c7fa97a7e1f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hnae.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hnae.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hnae.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hnae.c</a></div><div class='hunk'>@@ -150,7 +150,6 @@ out_buffer_fail:</div><div class='ctx'> /* free desc along with its attached buffer */</div><div class='ctx'> static void hnae_free_desc(struct hnae_ring *ring)</div><div class='ctx'> {</div><div class='del'>-	hnae_free_buffers(ring);</div><div class='ctx'> 	dma_unmap_single(ring_to_dev(ring), ring-&gt;desc_dma_addr,</div><div class='ctx'> 			 ring-&gt;desc_num * sizeof(ring-&gt;desc[0]),</div><div class='ctx'> 			 ring_to_dma_dir(ring));</div><div class='hunk'>@@ -183,6 +182,9 @@ static int hnae_alloc_desc(struct hnae_ring *ring)</div><div class='ctx'> /* fini ring, also free the buffer for the ring */</div><div class='ctx'> static void hnae_fini_ring(struct hnae_ring *ring)</div><div class='ctx'> {</div><div class='add'>+	if (is_rx_ring(ring))</div><div class='add'>+		hnae_free_buffers(ring);</div><div class='add'>+</div><div class='ctx'> 	hnae_free_desc(ring);</div><div class='ctx'> 	kfree(ring-&gt;desc_cb);</div><div class='ctx'> 	ring-&gt;desc_cb = NULL;</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h<br/>index 08a750fb60c4..d6fb83437230 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hnae.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hnae.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hnae.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hnae.h</a></div><div class='hunk'>@@ -357,7 +357,7 @@ struct hnae_buf_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hnae_queue {</div><div class='del'>-	void __iomem *io_base;</div><div class='add'>+	u8 __iomem *io_base;</div><div class='ctx'> 	phys_addr_t phy_base;</div><div class='ctx'> 	struct hnae_ae_dev *dev;	/* the device who use this queue */</div><div class='ctx'> 	struct hnae_ring rx_ring ____cacheline_internodealigned_in_smp;</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c<br/>index a97228c93831..6c0507921623 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c</a></div><div class='hunk'>@@ -370,7 +370,7 @@ int hns_mac_clr_multicast(struct hns_mac_cb *mac_cb, int vfn)</div><div class='ctx'> static void hns_mac_param_get(struct mac_params *param,</div><div class='ctx'> 			      struct hns_mac_cb *mac_cb)</div><div class='ctx'> {</div><div class='del'>-	param-&gt;vaddr = (void *)mac_cb-&gt;vaddr;</div><div class='add'>+	param-&gt;vaddr = mac_cb-&gt;vaddr;</div><div class='ctx'> 	param-&gt;mac_mode = hns_get_enet_interface(mac_cb);</div><div class='ctx'> 	ether_addr_copy(param-&gt;addr, mac_cb-&gt;addr_entry_idx[0].addr);</div><div class='ctx'> 	param-&gt;mac_id = mac_cb-&gt;mac_id;</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h<br/>index fbc75341bef7..22589799f1a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h</a></div><div class='hunk'>@@ -187,7 +187,7 @@ struct mac_statistics {</div><div class='ctx'> /*mac para struct ,mac get param from nic or dsaf when initialize*/</div><div class='ctx'> struct mac_params {</div><div class='ctx'> 	char addr[ETH_ALEN];</div><div class='del'>-	void *vaddr; /*virtual address*/</div><div class='add'>+	u8 __iomem *vaddr; /*virtual address*/</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	u8 mac_id;</div><div class='ctx'> 	/**&lt; Ethernet operation mode (MAC-PHY interface and speed) */</div><div class='hunk'>@@ -402,7 +402,7 @@ struct mac_driver {</div><div class='ctx'> 	enum mac_mode mac_mode;</div><div class='ctx'> 	u8 mac_id;</div><div class='ctx'> 	struct hns_mac_cb *mac_cb;</div><div class='del'>-	void __iomem *io_base;</div><div class='add'>+	u8 __iomem *io_base;</div><div class='ctx'> 	unsigned int mac_en_flg;/*you'd better don't enable mac twice*/</div><div class='ctx'> 	unsigned int virt_dev_num;</div><div class='ctx'> 	struct device *dev;</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c<br/>index ac55db065f16..e05d2095d09b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c</a></div><div class='hunk'>@@ -1602,8 +1602,6 @@ static void hns_dsaf_set_mac_key(</div><div class='ctx'> 		       DSAF_TBL_TCAM_KEY_VLAN_S, vlan_id);</div><div class='ctx'> 	dsaf_set_field(mac_key-&gt;low.bits.port_vlan, DSAF_TBL_TCAM_KEY_PORT_M,</div><div class='ctx'> 		       DSAF_TBL_TCAM_KEY_PORT_S, port);</div><div class='del'>-</div><div class='del'>-	mac_key-&gt;low.bits.port_vlan = le16_to_cpu(mac_key-&gt;low.bits.port_vlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1663,8 +1661,8 @@ int hns_dsaf_set_mac_uc_entry(</div><div class='ctx'> 	/* default config dvc to 0 */</div><div class='ctx'> 	mac_data.tbl_ucast_dvc = 0;</div><div class='ctx'> 	mac_data.tbl_ucast_out_port = mac_entry-&gt;port_num;</div><div class='del'>-	tcam_data.tbl_tcam_data_high = cpu_to_le32(mac_key.high.val);</div><div class='del'>-	tcam_data.tbl_tcam_data_low = cpu_to_le32(mac_key.low.val);</div><div class='add'>+	tcam_data.tbl_tcam_data_high = mac_key.high.val;</div><div class='add'>+	tcam_data.tbl_tcam_data_low = mac_key.low.val;</div><div class='ctx'> </div><div class='ctx'> 	hns_dsaf_tcam_uc_cfg(dsaf_dev, entry_index, &amp;tcam_data, &amp;mac_data);</div><div class='ctx'> </div><div class='hunk'>@@ -1786,9 +1784,6 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,</div><div class='ctx'> 				     0xff,</div><div class='ctx'> 				     mc_mask);</div><div class='ctx'> </div><div class='del'>-		mask_key.high.val = le32_to_cpu(mask_key.high.val);</div><div class='del'>-		mask_key.low.val = le32_to_cpu(mask_key.low.val);</div><div class='del'>-</div><div class='ctx'> 		pmask_key = (struct dsaf_tbl_tcam_data *)(&amp;mask_key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1840,8 +1835,8 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,</div><div class='ctx'> 		dsaf_dev-&gt;ae_dev.name, mac_key.high.val,</div><div class='ctx'> 		mac_key.low.val, entry_index);</div><div class='ctx'> </div><div class='del'>-	tcam_data.tbl_tcam_data_high = cpu_to_le32(mac_key.high.val);</div><div class='del'>-	tcam_data.tbl_tcam_data_low = cpu_to_le32(mac_key.low.val);</div><div class='add'>+	tcam_data.tbl_tcam_data_high = mac_key.high.val;</div><div class='add'>+	tcam_data.tbl_tcam_data_low = mac_key.low.val;</div><div class='ctx'> </div><div class='ctx'> 	/* config mc entry with mask */</div><div class='ctx'> 	hns_dsaf_tcam_mc_cfg(dsaf_dev, entry_index, &amp;tcam_data,</div><div class='hunk'>@@ -1956,9 +1951,6 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,</div><div class='ctx'> 		/* config key mask */</div><div class='ctx'> 		hns_dsaf_set_mac_key(dsaf_dev, &amp;mask_key, 0x00, 0xff, mc_mask);</div><div class='ctx'> </div><div class='del'>-		mask_key.high.val = le32_to_cpu(mask_key.high.val);</div><div class='del'>-		mask_key.low.val = le32_to_cpu(mask_key.low.val);</div><div class='del'>-</div><div class='ctx'> 		pmask_key = (struct dsaf_tbl_tcam_data *)(&amp;mask_key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2012,8 +2004,8 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,</div><div class='ctx'> 		soft_mac_entry += entry_index;</div><div class='ctx'> 		soft_mac_entry-&gt;index = DSAF_INVALID_ENTRY_IDX;</div><div class='ctx'> 	} else { /* not zero, just del port, update */</div><div class='del'>-		tcam_data.tbl_tcam_data_high = cpu_to_le32(mac_key.high.val);</div><div class='del'>-		tcam_data.tbl_tcam_data_low = cpu_to_le32(mac_key.low.val);</div><div class='add'>+		tcam_data.tbl_tcam_data_high = mac_key.high.val;</div><div class='add'>+		tcam_data.tbl_tcam_data_low = mac_key.low.val;</div><div class='ctx'> </div><div class='ctx'> 		hns_dsaf_tcam_mc_cfg(dsaf_dev, entry_index,</div><div class='ctx'> 				     &amp;tcam_data,</div><div class='hunk'>@@ -2750,6 +2742,17 @@ int hns_dsaf_get_regs_count(void)</div><div class='ctx'> 	return DSAF_DUMP_REGS_NUM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hns_dsaf_get_port_id(u8 port)</div><div class='add'>+{</div><div class='add'>+	if (port &lt; DSAF_SERVICE_NW_NUM)</div><div class='add'>+		return port;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= DSAF_BASE_INNER_PORT_NUM)</div><div class='add'>+		return port - DSAF_BASE_INNER_PORT_NUM + DSAF_SERVICE_NW_NUM;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsaf_tbl_tcam_ucast_cfg tbl_tcam_ucast = {0, 1, 0, 0, 0x80};</div><div class='hunk'>@@ -2766,7 +2769,7 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)</div><div class='ctx'> 	struct hns_mac_cb *mac_cb;</div><div class='ctx'> 	u8 addr[ETH_ALEN] = {0};</div><div class='ctx'> 	u8 port_num;</div><div class='del'>-	u16 mskid;</div><div class='add'>+	int mskid;</div><div class='ctx'> </div><div class='ctx'> 	/* promisc use vague table match with vlanid = 0 &amp; macaddr = 0 */</div><div class='ctx'> 	hns_dsaf_set_mac_key(dsaf_dev, &amp;mac_key, 0x00, port, addr);</div><div class='hunk'>@@ -2815,23 +2818,33 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)</div><div class='ctx'> 	memset(&amp;temp_key, 0x0, sizeof(temp_key));</div><div class='ctx'> 	mask_entry.addr[0] = 0x01;</div><div class='ctx'> 	hns_dsaf_set_mac_key(dsaf_dev, &amp;mask_key, mask_entry.in_vlan_id,</div><div class='del'>-			     port, mask_entry.addr);</div><div class='add'>+			     0xf, mask_entry.addr);</div><div class='ctx'> 	tbl_tcam_mcast.tbl_mcast_item_vld = 1;</div><div class='ctx'> 	tbl_tcam_mcast.tbl_mcast_old_en = 0;</div><div class='ctx'> </div><div class='del'>-	if (port &lt; DSAF_SERVICE_NW_NUM) {</div><div class='del'>-		mskid = port;</div><div class='del'>-	} else if (port &gt;= DSAF_BASE_INNER_PORT_NUM) {</div><div class='del'>-		mskid = port - DSAF_BASE_INNER_PORT_NUM + DSAF_SERVICE_NW_NUM;</div><div class='del'>-	} else {</div><div class='add'>+	/* set MAC port to handle multicast */</div><div class='add'>+	mskid = hns_dsaf_get_port_id(port);</div><div class='add'>+	if (mskid == -EINVAL) {</div><div class='ctx'> 		dev_err(dsaf_dev-&gt;dev, "%s,pnum(%d)error,key(%#x:%#x)\n",</div><div class='ctx'> 			dsaf_dev-&gt;ae_dev.name, port,</div><div class='ctx'> 			mask_key.high.val, mask_key.low.val);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	dsaf_set_bit(tbl_tcam_mcast.tbl_mcast_port_msk[mskid / 32],</div><div class='add'>+		     mskid % 32, 1);</div><div class='ctx'> </div><div class='add'>+	/* set pool bit map to handle multicast */</div><div class='add'>+	mskid = hns_dsaf_get_port_id(port_num);</div><div class='add'>+	if (mskid == -EINVAL) {</div><div class='add'>+		dev_err(dsaf_dev-&gt;dev,</div><div class='add'>+			"%s, pool bit map pnum(%d)error,key(%#x:%#x)\n",</div><div class='add'>+			dsaf_dev-&gt;ae_dev.name, port_num,</div><div class='add'>+			mask_key.high.val, mask_key.low.val);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	dsaf_set_bit(tbl_tcam_mcast.tbl_mcast_port_msk[mskid / 32],</div><div class='ctx'> 		     mskid % 32, 1);</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;temp_key, &amp;mask_key, sizeof(mask_key));</div><div class='ctx'> 	hns_dsaf_tcam_mc_cfg_vague(dsaf_dev, entry_index, &amp;tbl_tcam_data_mc,</div><div class='ctx'> 				   (struct dsaf_tbl_tcam_data *)(&amp;mask_key),</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h<br/>index 0e1cd99831a6..76cc8887e1a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h</a></div><div class='hunk'>@@ -467,4 +467,6 @@ int hns_dsaf_clr_mac_mc_port(struct dsaf_device *dsaf_dev,</div><div class='ctx'> 			     u8 mac_id, u8 port_num);</div><div class='ctx'> int hns_dsaf_wait_pkt_clean(struct dsaf_device *dsaf_dev, int port);</div><div class='ctx'> </div><div class='add'>+int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset);</div><div class='add'>+</div><div class='ctx'> #endif /* __HNS_DSAF_MAIN_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c<br/>index 16294cd3c954..19b94879691f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c</a></div><div class='hunk'>@@ -670,7 +670,7 @@ static int hns_mac_config_sds_loopback(struct hns_mac_cb *mac_cb, bool en)</div><div class='ctx'> 		dsaf_set_field(origin, 1ull &lt;&lt; 10, 10, en);</div><div class='ctx'> 		dsaf_write_syscon(mac_cb-&gt;serdes_ctrl, reg_offset, origin);</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 *base_addr = (u8 *)mac_cb-&gt;serdes_vaddr +</div><div class='add'>+		u8 __iomem *base_addr = mac_cb-&gt;serdes_vaddr +</div><div class='ctx'> 				(mac_cb-&gt;mac_id &lt;= 3 ? 0x00280000 : 0x00200000);</div><div class='ctx'> 		dsaf_set_reg_field(base_addr, reg_offset, 1ull &lt;&lt; 10, 10, en);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c<br/>index 3d07c8a7639d..17c019106e6e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ void hns_ppe_set_indir_table(struct hns_ppe_cb *ppe_cb,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __iomem *</div><div class='add'>+static u8 __iomem *</div><div class='ctx'> hns_ppe_common_get_ioaddr(struct ppe_common_cb *ppe_common)</div><div class='ctx'> {</div><div class='ctx'> 	return ppe_common-&gt;dsaf_dev-&gt;ppe_base + PPE_COMMON_REG_OFFSET;</div><div class='hunk'>@@ -111,8 +111,8 @@ hns_ppe_common_free_cfg(struct dsaf_device *dsaf_dev, u32 comm_index)</div><div class='ctx'> 	dsaf_dev-&gt;ppe_common[comm_index] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __iomem *hns_ppe_get_iobase(struct ppe_common_cb *ppe_common,</div><div class='del'>-					int ppe_idx)</div><div class='add'>+static u8 __iomem *hns_ppe_get_iobase(struct ppe_common_cb *ppe_common,</div><div class='add'>+				      int ppe_idx)</div><div class='ctx'> {</div><div class='ctx'> 	return ppe_common-&gt;dsaf_dev-&gt;ppe_base + ppe_idx * PPE_REG_OFFSET;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h<br/>index f670e63a5a01..110c6e8222c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h</a></div><div class='hunk'>@@ -80,7 +80,7 @@ struct hns_ppe_cb {</div><div class='ctx'> 	struct hns_ppe_hw_stats hw_stats;</div><div class='ctx'> </div><div class='ctx'> 	u8 index;	/* index in a ppe common device */</div><div class='del'>-	void __iomem *io_base;</div><div class='add'>+	u8 __iomem *io_base;</div><div class='ctx'> 	int virq;</div><div class='ctx'> 	u32 rss_indir_table[HNS_PPEV2_RSS_IND_TBL_SIZE]; /*shadow indir tab */</div><div class='ctx'> 	u32 rss_key[HNS_PPEV2_RSS_KEY_NUM]; /* rss hash key */</div><div class='hunk'>@@ -89,7 +89,7 @@ struct hns_ppe_cb {</div><div class='ctx'> struct ppe_common_cb {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct dsaf_device *dsaf_dev;</div><div class='del'>-	void __iomem *io_base;</div><div class='add'>+	u8 __iomem *io_base;</div><div class='ctx'> </div><div class='ctx'> 	enum ppe_common_mode ppe_mode;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c<br/>index 6bf346c11b25..ac3518ca4d7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c</a></div><div class='hunk'>@@ -458,7 +458,7 @@ static void hns_rcb_ring_get_cfg(struct hnae_queue *q, int ring_type)</div><div class='ctx'> 		mdnum_ppkt = HNS_RCB_RING_MAX_BD_PER_PKT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ring = &amp;q-&gt;tx_ring;</div><div class='del'>-		ring-&gt;io_base = (u8 __iomem *)ring_pair_cb-&gt;q.io_base +</div><div class='add'>+		ring-&gt;io_base = ring_pair_cb-&gt;q.io_base +</div><div class='ctx'> 			HNS_RCB_TX_REG_OFFSET;</div><div class='ctx'> 		irq_idx = HNS_RCB_IRQ_IDX_TX;</div><div class='ctx'> 		mdnum_ppkt = is_ver1 ? HNS_RCB_RING_MAX_TXBD_PER_PKT :</div><div class='hunk'>@@ -764,7 +764,7 @@ static int hns_rcb_get_ring_num(struct dsaf_device *dsaf_dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __iomem *hns_rcb_common_get_vaddr(struct rcb_common_cb *rcb_common)</div><div class='add'>+static u8 __iomem *hns_rcb_common_get_vaddr(struct rcb_common_cb *rcb_common)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsaf_device *dsaf_dev = rcb_common-&gt;dsaf_dev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h<br/>index b9733b0b8482..b9e7f11f0896 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h</a></div><div class='hunk'>@@ -1018,7 +1018,7 @@</div><div class='ctx'> #define XGMAC_PAUSE_CTL_RSP_MODE_B	2</div><div class='ctx'> #define XGMAC_PAUSE_CTL_TX_XOFF_B	3</div><div class='ctx'> </div><div class='del'>-static inline void dsaf_write_reg(void __iomem *base, u32 reg, u32 value)</div><div class='add'>+static inline void dsaf_write_reg(u8 __iomem *base, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	writel(value, base + reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -1053,7 +1053,7 @@ static inline int dsaf_read_syscon(struct regmap *base, u32 reg, u32 *val)</div><div class='ctx'> #define dsaf_set_bit(origin, shift, val) \</div><div class='ctx'> 	dsaf_set_field((origin), (1ull &lt;&lt; (shift)), (shift), (val))</div><div class='ctx'> </div><div class='del'>-static inline void dsaf_set_reg_field(void __iomem *base, u32 reg, u32 mask,</div><div class='add'>+static inline void dsaf_set_reg_field(u8 __iomem *base, u32 reg, u32 mask,</div><div class='ctx'> 				      u32 shift, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	u32 origin = dsaf_read_reg(base, reg);</div><div class='hunk'>@@ -1073,7 +1073,7 @@ static inline void dsaf_set_reg_field(void __iomem *base, u32 reg, u32 mask,</div><div class='ctx'> #define dsaf_get_bit(origin, shift) \</div><div class='ctx'> 	dsaf_get_field((origin), (1ull &lt;&lt; (shift)), (shift))</div><div class='ctx'> </div><div class='del'>-static inline u32 dsaf_get_reg_field(void __iomem *base, u32 reg, u32 mask,</div><div class='add'>+static inline u32 dsaf_get_reg_field(u8 __iomem *base, u32 reg, u32 mask,</div><div class='ctx'> 				     u32 shift)</div><div class='ctx'> {</div><div class='ctx'> 	u32 origin;</div><div class='hunk'>@@ -1089,11 +1089,11 @@ static inline u32 dsaf_get_reg_field(void __iomem *base, u32 reg, u32 mask,</div><div class='ctx'> 	dsaf_get_reg_field((dev)-&gt;io_base, (reg), (1ull &lt;&lt; (bit)), (bit))</div><div class='ctx'> </div><div class='ctx'> #define dsaf_write_b(addr, data)\</div><div class='del'>-	writeb((data), (__iomem unsigned char *)(addr))</div><div class='add'>+	writeb((data), (__iomem u8 *)(addr))</div><div class='ctx'> #define dsaf_read_b(addr)\</div><div class='del'>-	readb((__iomem unsigned char *)(addr))</div><div class='add'>+	readb((__iomem u8 *)(addr))</div><div class='ctx'> </div><div class='ctx'> #define hns_mac_reg_read64(drv, offset) \</div><div class='del'>-	readq((__iomem void *)(((u8 *)(drv)-&gt;io_base + 0xc00 + (offset))))</div><div class='add'>+	readq((__iomem void *)(((drv)-&gt;io_base + 0xc00 + (offset))))</div><div class='ctx'> </div><div class='ctx'> #endif	/* _DSAF_REG_H */</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c<br/>index ba4316910dea..a60f207768fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static void hns_xgmac_lf_rf_control_init(struct mac_driver *mac_drv)</div><div class='ctx'> 	dsaf_set_bit(val, XGMAC_UNIDIR_EN_B, 0);</div><div class='ctx'> 	dsaf_set_bit(val, XGMAC_RF_TX_EN_B, 1);</div><div class='ctx'> 	dsaf_set_field(val, XGMAC_LF_RF_INSERT_M, XGMAC_LF_RF_INSERT_S, 0);</div><div class='del'>-	dsaf_write_reg(mac_drv, XGMAC_MAC_TX_LF_RF_CONTROL_REG, val);</div><div class='add'>+	dsaf_write_dev(mac_drv, XGMAC_MAC_TX_LF_RF_CONTROL_REG, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c<br/>index 60e7d7ae3787..65b985acae38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_enet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns/hns_enet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns/hns_enet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns/hns_enet.c</a></div><div class='hunk'>@@ -29,9 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SERVICE_TIMER_HZ (1 * HZ)</div><div class='ctx'> </div><div class='del'>-#define NIC_TX_CLEAN_MAX_NUM 256</div><div class='del'>-#define NIC_RX_CLEAN_MAX_NUM 64</div><div class='del'>-</div><div class='ctx'> #define RCB_IRQ_NOT_INITED 0</div><div class='ctx'> #define RCB_IRQ_INITED 1</div><div class='ctx'> #define HNS_BUFFER_SIZE_2048 2048</div><div class='hunk'>@@ -376,8 +373,6 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,</div><div class='ctx'> 	wmb(); /* commit all data before submit */</div><div class='ctx'> 	assert(skb-&gt;queue_mapping &lt; priv-&gt;ae_handle-&gt;q_num);</div><div class='ctx'> 	hnae_queue_xmit(priv-&gt;ae_handle-&gt;qs[skb-&gt;queue_mapping], buf_num);</div><div class='del'>-	ring-&gt;stats.tx_pkts++;</div><div class='del'>-	ring-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='hunk'>@@ -603,7 +598,7 @@ static int hns_nic_poll_rx_skb(struct hns_nic_ring_data *ring_data,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ring-&gt;stats.seg_pkt_cnt++;</div><div class='ctx'> </div><div class='del'>-		pull_len = eth_get_headlen(va, HNS_RX_HEAD_SIZE);</div><div class='add'>+		pull_len = eth_get_headlen(ndev, va, HNS_RX_HEAD_SIZE);</div><div class='ctx'> 		memcpy(__skb_put(skb, pull_len), va,</div><div class='ctx'> 		       ALIGN(pull_len, sizeof(long)));</div><div class='ctx'> </div><div class='hunk'>@@ -999,6 +994,9 @@ static int hns_nic_tx_poll_one(struct hns_nic_ring_data *ring_data,</div><div class='ctx'> 		/* issue prefetch for next Tx descriptor */</div><div class='ctx'> 		prefetch(&amp;ring-&gt;desc_cb[ring-&gt;next_to_clean]);</div><div class='ctx'> 	}</div><div class='add'>+	/* update tx ring statistics. */</div><div class='add'>+	ring-&gt;stats.tx_pkts += pkts;</div><div class='add'>+	ring-&gt;stats.tx_bytes += bytes;</div><div class='ctx'> </div><div class='ctx'> 	NETIF_TX_UNLOCK(ring);</div><div class='ctx'> </div><div class='hunk'>@@ -1964,8 +1962,7 @@ static void hns_nic_get_stats64(struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> static u16</div><div class='ctx'> hns_nic_select_queue(struct net_device *ndev, struct sk_buff *skb,</div><div class='del'>-		     struct net_device *sb_dev,</div><div class='del'>-		     select_queue_fallback_t fallback)</div><div class='add'>+		     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethhdr *eth_hdr = (struct ethhdr *)skb-&gt;data;</div><div class='ctx'> 	struct hns_nic_priv *priv = netdev_priv(ndev);</div><div class='hunk'>@@ -1975,7 +1972,7 @@ hns_nic_select_queue(struct net_device *ndev, struct sk_buff *skb,</div><div class='ctx'> 	    is_multicast_ether_addr(eth_hdr-&gt;h_dest))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	else</div><div class='del'>-		return fallback(ndev, skb, NULL);</div><div class='add'>+		return netdev_pick_tx(ndev, skb, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops hns_nic_netdev_ops = {</div><div class='hunk'>@@ -2152,7 +2149,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)</div><div class='ctx'> 			hns_nic_tx_fini_pro_v2;</div><div class='ctx'> </div><div class='ctx'> 		netif_napi_add(priv-&gt;netdev, &amp;rd-&gt;napi,</div><div class='del'>-			       hns_nic_common_poll, NIC_TX_CLEAN_MAX_NUM);</div><div class='add'>+			       hns_nic_common_poll, NAPI_POLL_WEIGHT);</div><div class='ctx'> 		rd-&gt;ring-&gt;irq_init_flag = RCB_IRQ_NOT_INITED;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = h-&gt;q_num; i &lt; h-&gt;q_num * 2; i++) {</div><div class='hunk'>@@ -2165,7 +2162,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)</div><div class='ctx'> 			hns_nic_rx_fini_pro_v2;</div><div class='ctx'> </div><div class='ctx'> 		netif_napi_add(priv-&gt;netdev, &amp;rd-&gt;napi,</div><div class='del'>-			       hns_nic_common_poll, NIC_RX_CLEAN_MAX_NUM);</div><div class='add'>+			       hns_nic_common_poll, NAPI_POLL_WEIGHT);</div><div class='ctx'> 		rd-&gt;ring-&gt;irq_init_flag = RCB_IRQ_NOT_INITED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h<br/>index 299b277bc7ae..83e19c6b974e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h</a></div><div class='hunk'>@@ -43,6 +43,8 @@ enum HCLGE_MBX_OPCODE {</div><div class='ctx'> 	HCLGE_MBX_GET_QID_IN_PF,	/* (VF -&gt; PF) get queue id in pf */</div><div class='ctx'> 	HCLGE_MBX_LINK_STAT_MODE,	/* (PF -&gt; VF) link mode has changed */</div><div class='ctx'> 	HCLGE_MBX_GET_LINK_MODE,	/* (VF -&gt; PF) get the link mode of pf */</div><div class='add'>+	HLCGE_MBX_PUSH_VLAN_INFO,	/* (PF -&gt; VF) push port base vlan */</div><div class='add'>+	HCLGE_MBX_GET_MEDIA_TYPE,       /* (VF -&gt; PF) get media type */</div><div class='ctx'> </div><div class='ctx'> 	HCLGE_MBX_GET_VF_FLR_STATUS = 200, /* (M7 -&gt; PF) get vf reset status */</div><div class='ctx'> };</div><div class='hunk'>@@ -62,6 +64,8 @@ enum hclge_mbx_vlan_cfg_subcode {</div><div class='ctx'> 	HCLGE_MBX_VLAN_FILTER = 0,	/* set vlan filter */</div><div class='ctx'> 	HCLGE_MBX_VLAN_TX_OFF_CFG,	/* set tx side vlan offload */</div><div class='ctx'> 	HCLGE_MBX_VLAN_RX_OFF_CFG,	/* set rx side vlan offload */</div><div class='add'>+	HCLGE_MBX_PORT_BASE_VLAN_CFG,	/* set port based vlan configuration */</div><div class='add'>+	HCLGE_MBX_GET_PORT_BASE_VLAN_STATE,	/* get port based vlan state */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HCLGE_MBX_MAX_MSG_SIZE	16</div><div class='hunk'>@@ -80,12 +84,15 @@ struct hclgevf_mbx_resp_status {</div><div class='ctx'> struct hclge_mbx_vf_to_pf_cmd {</div><div class='ctx'> 	u8 rsv;</div><div class='ctx'> 	u8 mbx_src_vfid; /* Auto filled by IMP */</div><div class='del'>-	u8 rsv1[2];</div><div class='add'>+	u8 mbx_need_resp;</div><div class='add'>+	u8 rsv1[1];</div><div class='ctx'> 	u8 msg_len;</div><div class='ctx'> 	u8 rsv2[3];</div><div class='ctx'> 	u8 msg[HCLGE_MBX_MAX_MSG_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HCLGE_MBX_NEED_RESP_BIT		BIT(0)</div><div class='add'>+</div><div class='ctx'> struct hclge_mbx_pf_to_vf_cmd {</div><div class='ctx'> 	u8 dest_vfid;</div><div class='ctx'> 	u8 rsv[3];</div><div class='hunk'>@@ -107,7 +114,7 @@ struct hclgevf_mbx_arq_ring {</div><div class='ctx'> 	struct hclgevf_dev *hdev;</div><div class='ctx'> 	u32 head;</div><div class='ctx'> 	u32 tail;</div><div class='del'>-	u32 count;</div><div class='add'>+	atomic_t count;</div><div class='ctx'> 	u16 msg_q[HCLGE_MBX_MAX_ARQ_MSG_NUM][HCLGE_MBX_MAX_ARQ_MSG_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.c b/drivers/net/ethernet/hisilicon/hns3/hnae3.c<br/>index 17ab4f4af6ad..fa8b8506b120 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hnae3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hnae3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hnae3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hnae3.c</a></div><div class='hunk'>@@ -76,8 +76,8 @@ static int hnae3_get_client_init_flag(struct hnae3_client *client,</div><div class='ctx'> 	return inited;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hnae3_match_n_instantiate(struct hnae3_client *client,</div><div class='del'>-				     struct hnae3_ae_dev *ae_dev, bool is_reg)</div><div class='add'>+static int hnae3_init_client_instance(struct hnae3_client *client,</div><div class='add'>+				      struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -87,23 +87,27 @@ static int hnae3_match_n_instantiate(struct hnae3_client *client,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* now, (un-)instantiate client by calling lower layer */</div><div class='del'>-	if (is_reg) {</div><div class='del'>-		ret = ae_dev-&gt;ops-&gt;init_client_instance(client, ae_dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			dev_err(&amp;ae_dev-&gt;pdev-&gt;dev,</div><div class='del'>-				"fail to instantiate client, ret = %d\n", ret);</div><div class='add'>+	ret = ae_dev-&gt;ops-&gt;init_client_instance(client, ae_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;ae_dev-&gt;pdev-&gt;dev,</div><div class='add'>+			"fail to instantiate client, ret = %d\n", ret);</div><div class='ctx'> </div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hnae3_uninit_client_instance(struct hnae3_client *client,</div><div class='add'>+					 struct hnae3_ae_dev *ae_dev)</div><div class='add'>+{</div><div class='add'>+	/* check if this client matches the type of ae_dev */</div><div class='add'>+	if (!(hnae3_client_match(client-&gt;type, ae_dev-&gt;dev_type) &amp;&amp;</div><div class='add'>+	      hnae3_get_bit(ae_dev-&gt;flag, HNAE3_DEV_INITED_B)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (hnae3_get_client_init_flag(client, ae_dev)) {</div><div class='ctx'> 		ae_dev-&gt;ops-&gt;uninit_client_instance(client, ae_dev);</div><div class='ctx'> </div><div class='ctx'> 		hnae3_set_client_init_flag(client, ae_dev, 0);</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'> int hnae3_register_client(struct hnae3_client *client)</div><div class='hunk'>@@ -129,7 +133,7 @@ int hnae3_register_client(struct hnae3_client *client)</div><div class='ctx'> 		/* if the client could not be initialized on current port, for</div><div class='ctx'> 		 * any error reasons, move on to next available port</div><div class='ctx'> 		 */</div><div class='del'>-		ret = hnae3_match_n_instantiate(client, ae_dev, true);</div><div class='add'>+		ret = hnae3_init_client_instance(client, ae_dev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			dev_err(&amp;ae_dev-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"match and instantiation failed for port, ret = %d\n",</div><div class='hunk'>@@ -153,7 +157,7 @@ void hnae3_unregister_client(struct hnae3_client *client)</div><div class='ctx'> 	mutex_lock(&amp;hnae3_common_lock);</div><div class='ctx'> 	/* un-initialize the client on every matched port */</div><div class='ctx'> 	list_for_each_entry(ae_dev, &amp;hnae3_ae_dev_list, node) {</div><div class='del'>-		hnae3_match_n_instantiate(client, ae_dev, false);</div><div class='add'>+		hnae3_uninit_client_instance(client, ae_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;client-&gt;node);</div><div class='hunk'>@@ -205,7 +209,7 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo)</div><div class='ctx'> 		 * initialize the figure out client instance</div><div class='ctx'> 		 */</div><div class='ctx'> 		list_for_each_entry(client, &amp;hnae3_client_list, node) {</div><div class='del'>-			ret = hnae3_match_n_instantiate(client, ae_dev, true);</div><div class='add'>+			ret = hnae3_init_client_instance(client, ae_dev);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				dev_err(&amp;ae_dev-&gt;pdev-&gt;dev,</div><div class='ctx'> 					"match and instantiation failed, ret = %d\n",</div><div class='hunk'>@@ -243,7 +247,7 @@ void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo)</div><div class='ctx'> 		 * un-initialize the figure out client instance</div><div class='ctx'> 		 */</div><div class='ctx'> 		list_for_each_entry(client, &amp;hnae3_client_list, node)</div><div class='del'>-			hnae3_match_n_instantiate(client, ae_dev, false);</div><div class='add'>+			hnae3_uninit_client_instance(client, ae_dev);</div><div class='ctx'> </div><div class='ctx'> 		ae_algo-&gt;ops-&gt;uninit_ae_dev(ae_dev);</div><div class='ctx'> 		hnae3_set_bit(ae_dev-&gt;flag, HNAE3_DEV_INITED_B, 0);</div><div class='hunk'>@@ -301,7 +305,7 @@ int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> 	 * initialize the figure out client instance</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(client, &amp;hnae3_client_list, node) {</div><div class='del'>-		ret = hnae3_match_n_instantiate(client, ae_dev, true);</div><div class='add'>+		ret = hnae3_init_client_instance(client, ae_dev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			dev_err(&amp;ae_dev-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"match and instantiation failed, ret = %d\n",</div><div class='hunk'>@@ -343,7 +347,7 @@ void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry(client, &amp;hnae3_client_list, node)</div><div class='del'>-			hnae3_match_n_instantiate(client, ae_dev, false);</div><div class='add'>+			hnae3_uninit_client_instance(client, ae_dev);</div><div class='ctx'> </div><div class='ctx'> 		ae_algo-&gt;ops-&gt;uninit_ae_dev(ae_dev);</div><div class='ctx'> 		hnae3_set_bit(ae_dev-&gt;flag, HNAE3_DEV_INITED_B, 0);</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h<br/>index 38b430f11fc1..ad21b0ef1946 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hnae3.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hnae3.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hnae3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hnae3.h</a></div><div class='hunk'>@@ -120,6 +120,25 @@ enum hnae3_media_type {</div><div class='ctx'> 	HNAE3_MEDIA_TYPE_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* must be consistent with definition in firmware */</div><div class='add'>+enum hnae3_module_type {</div><div class='add'>+	HNAE3_MODULE_TYPE_UNKNOWN	= 0x00,</div><div class='add'>+	HNAE3_MODULE_TYPE_FIBRE_LR	= 0x01,</div><div class='add'>+	HNAE3_MODULE_TYPE_FIBRE_SR	= 0x02,</div><div class='add'>+	HNAE3_MODULE_TYPE_AOC		= 0x03,</div><div class='add'>+	HNAE3_MODULE_TYPE_CR		= 0x04,</div><div class='add'>+	HNAE3_MODULE_TYPE_KR		= 0x05,</div><div class='add'>+	HNAE3_MODULE_TYPE_TP		= 0x06,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hnae3_fec_mode {</div><div class='add'>+	HNAE3_FEC_AUTO = 0,</div><div class='add'>+	HNAE3_FEC_BASER,</div><div class='add'>+	HNAE3_FEC_RS,</div><div class='add'>+	HNAE3_FEC_USER_DEF,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum hnae3_reset_notify_type {</div><div class='ctx'> 	HNAE3_UP_CLIENT,</div><div class='ctx'> 	HNAE3_DOWN_CLIENT,</div><div class='hunk'>@@ -147,6 +166,13 @@ enum hnae3_flr_state {</div><div class='ctx'> 	HNAE3_FLR_DONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum hnae3_port_base_vlan_state {</div><div class='add'>+	HNAE3_PORT_BASE_VLAN_DISABLE,</div><div class='add'>+	HNAE3_PORT_BASE_VLAN_ENABLE,</div><div class='add'>+	HNAE3_PORT_BASE_VLAN_MODIFY,</div><div class='add'>+	HNAE3_PORT_BASE_VLAN_NOCHANGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hnae3_vector_info {</div><div class='ctx'> 	u8 __iomem *io_addr;</div><div class='ctx'> 	int vector;</div><div class='hunk'>@@ -223,10 +249,10 @@ struct hnae3_ae_dev {</div><div class='ctx'>  *   non-ok</div><div class='ctx'>  * get_ksettings_an_result()</div><div class='ctx'>  *   Get negotiation status,speed and duplex</div><div class='del'>- * update_speed_duplex_h()</div><div class='del'>- *   Update hardware speed and duplex</div><div class='ctx'>  * get_media_type()</div><div class='ctx'>  *   Get media type of MAC</div><div class='add'>+ * check_port_speed()</div><div class='add'>+ *   Check target speed whether is supported</div><div class='ctx'>  * adjust_link()</div><div class='ctx'>  *   Adjust link status</div><div class='ctx'>  * set_loopback()</div><div class='hunk'>@@ -243,6 +269,8 @@ struct hnae3_ae_dev {</div><div class='ctx'>  *   set auto autonegotiation of pause frame use</div><div class='ctx'>  * get_autoneg()</div><div class='ctx'>  *   get auto autonegotiation of pause frame use</div><div class='add'>+ * restart_autoneg()</div><div class='add'>+ *   restart autonegotiation</div><div class='ctx'>  * get_coalesce_usecs()</div><div class='ctx'>  *   get usecs to delay a TX interrupt after a packet is sent</div><div class='ctx'>  * get_rx_max_coalesced_frames()</div><div class='hunk'>@@ -333,11 +361,15 @@ struct hnae3_ae_ops {</div><div class='ctx'> 	void (*get_ksettings_an_result)(struct hnae3_handle *handle,</div><div class='ctx'> 					u8 *auto_neg, u32 *speed, u8 *duplex);</div><div class='ctx'> </div><div class='del'>-	int (*update_speed_duplex_h)(struct hnae3_handle *handle);</div><div class='ctx'> 	int (*cfg_mac_speed_dup_h)(struct hnae3_handle *handle, int speed,</div><div class='ctx'> 				   u8 duplex);</div><div class='ctx'> </div><div class='del'>-	void (*get_media_type)(struct hnae3_handle *handle, u8 *media_type);</div><div class='add'>+	void (*get_media_type)(struct hnae3_handle *handle, u8 *media_type,</div><div class='add'>+			       u8 *module_type);</div><div class='add'>+	int (*check_port_speed)(struct hnae3_handle *handle, u32 speed);</div><div class='add'>+	void (*get_fec)(struct hnae3_handle *handle, u8 *fec_ability,</div><div class='add'>+			u8 *fec_mode);</div><div class='add'>+	int (*set_fec)(struct hnae3_handle *handle, u32 fec_mode);</div><div class='ctx'> 	void (*adjust_link)(struct hnae3_handle *handle, int speed, int duplex);</div><div class='ctx'> 	int (*set_loopback)(struct hnae3_handle *handle,</div><div class='ctx'> 			    enum hnae3_loop loop_mode, bool en);</div><div class='hunk'>@@ -353,6 +385,7 @@ struct hnae3_ae_ops {</div><div class='ctx'> </div><div class='ctx'> 	int (*set_autoneg)(struct hnae3_handle *handle, bool enable);</div><div class='ctx'> 	int (*get_autoneg)(struct hnae3_handle *handle);</div><div class='add'>+	int (*restart_autoneg)(struct hnae3_handle *handle);</div><div class='ctx'> </div><div class='ctx'> 	void (*get_coalesce_usecs)(struct hnae3_handle *handle,</div><div class='ctx'> 				   u32 *tx_usecs, u32 *rx_usecs);</div><div class='hunk'>@@ -385,7 +418,8 @@ struct hnae3_ae_ops {</div><div class='ctx'> 	void (*update_stats)(struct hnae3_handle *handle,</div><div class='ctx'> 			     struct net_device_stats *net_stats);</div><div class='ctx'> 	void (*get_stats)(struct hnae3_handle *handle, u64 *data);</div><div class='del'>-</div><div class='add'>+	void (*get_mac_pause_stats)(struct hnae3_handle *handle, u64 *tx_cnt,</div><div class='add'>+				    u64 *rx_cnt);</div><div class='ctx'> 	void (*get_strings)(struct hnae3_handle *handle,</div><div class='ctx'> 			    u32 stringset, u8 *data);</div><div class='ctx'> 	int (*get_sset_count)(struct hnae3_handle *handle, int stringset);</div><div class='hunk'>@@ -578,8 +612,13 @@ struct hnae3_handle {</div><div class='ctx'> </div><div class='ctx'> 	u32 numa_node_mask;	/* for multi-chip support */</div><div class='ctx'> </div><div class='add'>+	enum hnae3_port_base_vlan_state port_base_vlan_state;</div><div class='add'>+</div><div class='ctx'> 	u8 netdev_flags;</div><div class='ctx'> 	struct dentry *hnae3_dbgfs;</div><div class='add'>+</div><div class='add'>+	/* Network interface message level enabled bits */</div><div class='add'>+	u32 msg_enable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define hnae3_set_field(origin, mask, shift, val) \</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c<br/>index 0de543faa5b1..fc4917ac44be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c</a></div><div class='hunk'>@@ -239,6 +239,10 @@ static void hns3_dbg_help(struct hnae3_handle *h)</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "queue info [number]\n");</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "queue map\n");</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "bd info [q_num] &lt;bd index&gt;\n");</div><div class='add'>+</div><div class='add'>+	if (!hns3_is_phys_func(h-&gt;pdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump fd tcam\n");</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump tc\n");</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump tm map [q_num]\n");</div><div class='hunk'>@@ -247,6 +251,9 @@ static void hns3_dbg_help(struct hnae3_handle *h)</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump qos pri map\n");</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump qos buf cfg\n");</div><div class='ctx'> 	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump mng tbl\n");</div><div class='add'>+	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump reset info\n");</div><div class='add'>+	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump ncl_config &lt;offset&gt; &lt;length&gt;(in hex)\n");</div><div class='add'>+	dev_info(&amp;h-&gt;pdev-&gt;dev, "dump mac tnl status\n");</div><div class='ctx'> </div><div class='ctx'> 	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);</div><div class='ctx'> 	strncat(printf_buf, "dump reg [[bios common] [ssu &lt;prt_id&gt;]",</div><div class='hunk'>@@ -341,6 +348,8 @@ static ssize_t hns3_dbg_cmd_write(struct file *filp, const char __user *buffer,</div><div class='ctx'> 		ret = hns3_dbg_bd_info(handle, cmd_buf);</div><div class='ctx'> 	else if (handle-&gt;ae_algo-&gt;ops-&gt;dbg_run_cmd)</div><div class='ctx'> 		ret = handle-&gt;ae_algo-&gt;ops-&gt;dbg_run_cmd(handle, cmd_buf);</div><div class='add'>+	else</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		hns3_dbg_help(handle);</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c<br/>index 1c1f17ec6be2..18711e0f9bdf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include "hns3_enet.h"</div><div class='ctx'> </div><div class='ctx'> #define hns3_set_field(origin, shift, val)	((origin) |= ((val) &lt;&lt; (shift)))</div><div class='add'>+#define hns3_tx_bd_count(S)	DIV_ROUND_UP(S, HNS3_MAX_BD_SIZE)</div><div class='ctx'> </div><div class='ctx'> static void hns3_clear_all_ring(struct hnae3_handle *h);</div><div class='ctx'> static void hns3_force_clear_all_rx_ring(struct hnae3_handle *h);</div><div class='hunk'>@@ -34,6 +35,13 @@ static const char hns3_driver_string[] =</div><div class='ctx'> static const char hns3_copyright[] = "Copyright (c) 2017 Huawei Corporation.";</div><div class='ctx'> static struct hnae3_client client;</div><div class='ctx'> </div><div class='add'>+static int debug = -1;</div><div class='add'>+module_param(debug, int, 0);</div><div class='add'>+MODULE_PARM_DESC(debug, " Network interface message level setting");</div><div class='add'>+</div><div class='add'>+#define DEFAULT_MSG_LEVEL (NETIF_MSG_PROBE | NETIF_MSG_LINK | \</div><div class='add'>+			   NETIF_MSG_IFDOWN | NETIF_MSG_IFUP)</div><div class='add'>+</div><div class='ctx'> /* hns3_pci_tbl - PCI Device ID Table</div><div class='ctx'>  *</div><div class='ctx'>  * Last entry must be all 0s</div><div class='hunk'>@@ -66,7 +74,7 @@ static irqreturn_t hns3_irq_handle(int irq, void *vector)</div><div class='ctx'> {</div><div class='ctx'> 	struct hns3_enet_tqp_vector *tqp_vector = vector;</div><div class='ctx'> </div><div class='del'>-	napi_schedule(&amp;tqp_vector-&gt;napi);</div><div class='add'>+	napi_schedule_irqoff(&amp;tqp_vector-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -729,95 +737,6 @@ static int hns3_get_l4_protocol(struct sk_buff *skb, u8 *ol4_proto,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto,</div><div class='del'>-				u8 il4_proto, u32 *type_cs_vlan_tso,</div><div class='del'>-				u32 *ol_type_vlan_len_msec)</div><div class='del'>-{</div><div class='del'>-	union l3_hdr_info l3;</div><div class='del'>-	union l4_hdr_info l4;</div><div class='del'>-	unsigned char *l2_hdr;</div><div class='del'>-	u8 l4_proto = ol4_proto;</div><div class='del'>-	u32 ol2_len;</div><div class='del'>-	u32 ol3_len;</div><div class='del'>-	u32 ol4_len;</div><div class='del'>-	u32 l2_len;</div><div class='del'>-	u32 l3_len;</div><div class='del'>-</div><div class='del'>-	l3.hdr = skb_network_header(skb);</div><div class='del'>-	l4.hdr = skb_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	/* compute L2 header size for normal packet, defined in 2 Bytes */</div><div class='del'>-	l2_len = l3.hdr - skb-&gt;data;</div><div class='del'>-	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S, l2_len &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-	/* tunnel packet*/</div><div class='del'>-	if (skb-&gt;encapsulation) {</div><div class='del'>-		/* compute OL2 header size, defined in 2 Bytes */</div><div class='del'>-		ol2_len = l2_len;</div><div class='del'>-		hns3_set_field(*ol_type_vlan_len_msec,</div><div class='del'>-			       HNS3_TXD_L2LEN_S, ol2_len &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-		/* compute OL3 header size, defined in 4 Bytes */</div><div class='del'>-		ol3_len = l4.hdr - l3.hdr;</div><div class='del'>-		hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_S,</div><div class='del'>-			       ol3_len &gt;&gt; 2);</div><div class='del'>-</div><div class='del'>-		/* MAC in UDP, MAC in GRE (0x6558)*/</div><div class='del'>-		if ((ol4_proto == IPPROTO_UDP) || (ol4_proto == IPPROTO_GRE)) {</div><div class='del'>-			/* switch MAC header ptr from outer to inner header.*/</div><div class='del'>-			l2_hdr = skb_inner_mac_header(skb);</div><div class='del'>-</div><div class='del'>-			/* compute OL4 header size, defined in 4 Bytes. */</div><div class='del'>-			ol4_len = l2_hdr - l4.hdr;</div><div class='del'>-			hns3_set_field(*ol_type_vlan_len_msec,</div><div class='del'>-				       HNS3_TXD_L4LEN_S, ol4_len &gt;&gt; 2);</div><div class='del'>-</div><div class='del'>-			/* switch IP header ptr from outer to inner header */</div><div class='del'>-			l3.hdr = skb_inner_network_header(skb);</div><div class='del'>-</div><div class='del'>-			/* compute inner l2 header size, defined in 2 Bytes. */</div><div class='del'>-			l2_len = l3.hdr - l2_hdr;</div><div class='del'>-			hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S,</div><div class='del'>-				       l2_len &gt;&gt; 1);</div><div class='del'>-		} else {</div><div class='del'>-			/* skb packet types not supported by hardware,</div><div class='del'>-			 * txbd len fild doesn't be filled.</div><div class='del'>-			 */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* switch L4 header pointer from outer to inner */</div><div class='del'>-		l4.hdr = skb_inner_transport_header(skb);</div><div class='del'>-</div><div class='del'>-		l4_proto = il4_proto;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* compute inner(/normal) L3 header size, defined in 4 Bytes */</div><div class='del'>-	l3_len = l4.hdr - l3.hdr;</div><div class='del'>-	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3LEN_S, l3_len &gt;&gt; 2);</div><div class='del'>-</div><div class='del'>-	/* compute inner(/normal) L4 header size, defined in 4 Bytes */</div><div class='del'>-	switch (l4_proto) {</div><div class='del'>-	case IPPROTO_TCP:</div><div class='del'>-		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,</div><div class='del'>-			       l4.tcp-&gt;doff);</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_SCTP:</div><div class='del'>-		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,</div><div class='del'>-			       (sizeof(struct sctphdr) &gt;&gt; 2));</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_UDP:</div><div class='del'>-		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,</div><div class='del'>-			       (sizeof(struct udphdr) &gt;&gt; 2));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* skb packet types not supported by hardware,</div><div class='del'>-		 * txbd len fild doesn't be filled.</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* when skb-&gt;encapsulation is 0, skb-&gt;ip_summed is CHECKSUM_PARTIAL</div><div class='ctx'>  * and it is udp packet, which has a dest port as the IANA assigned.</div><div class='ctx'>  * the hardware is expected to do the checksum offload, but the</div><div class='hunk'>@@ -826,12 +745,12 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto,</div><div class='ctx'>  */</div><div class='ctx'> static bool hns3_tunnel_csum_bug(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-#define IANA_VXLAN_PORT	4789</div><div class='ctx'> 	union l4_hdr_info l4;</div><div class='ctx'> </div><div class='ctx'> 	l4.hdr = skb_transport_header(skb);</div><div class='ctx'> </div><div class='del'>-	if (!(!skb-&gt;encapsulation &amp;&amp; l4.udp-&gt;dest == htons(IANA_VXLAN_PORT)))</div><div class='add'>+	if (!(!skb-&gt;encapsulation &amp;&amp;</div><div class='add'>+	      l4.udp-&gt;dest == htons(IANA_VXLAN_UDP_PORT)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	skb_checksum_help(skb);</div><div class='hunk'>@@ -839,46 +758,71 @@ static bool hns3_tunnel_csum_bug(struct sk_buff *skb)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,</div><div class='del'>-				   u8 il4_proto, u32 *type_cs_vlan_tso,</div><div class='del'>-				   u32 *ol_type_vlan_len_msec)</div><div class='add'>+static void hns3_set_outer_l2l3l4(struct sk_buff *skb, u8 ol4_proto,</div><div class='add'>+				  u32 *ol_type_vlan_len_msec)</div><div class='ctx'> {</div><div class='add'>+	u32 l2_len, l3_len, l4_len;</div><div class='add'>+	unsigned char *il2_hdr;</div><div class='ctx'> 	union l3_hdr_info l3;</div><div class='del'>-	u32 l4_proto = ol4_proto;</div><div class='add'>+	union l4_hdr_info l4;</div><div class='ctx'> </div><div class='ctx'> 	l3.hdr = skb_network_header(skb);</div><div class='add'>+	l4.hdr = skb_transport_header(skb);</div><div class='ctx'> </div><div class='del'>-	/* define OL3 type and tunnel type(OL4).*/</div><div class='del'>-	if (skb-&gt;encapsulation) {</div><div class='del'>-		/* define outer network header type.*/</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-			if (skb_is_gso(skb))</div><div class='del'>-				hns3_set_field(*ol_type_vlan_len_msec,</div><div class='del'>-					       HNS3_TXD_OL3T_S,</div><div class='del'>-					       HNS3_OL3T_IPV4_CSUM);</div><div class='del'>-			else</div><div class='del'>-				hns3_set_field(*ol_type_vlan_len_msec,</div><div class='del'>-					       HNS3_TXD_OL3T_S,</div><div class='del'>-					       HNS3_OL3T_IPV4_NO_CSUM);</div><div class='del'>-</div><div class='del'>-		} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='del'>-			hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_S,</div><div class='del'>-				       HNS3_OL3T_IPV6);</div><div class='del'>-		}</div><div class='add'>+	/* compute OL2 header size, defined in 2 Bytes */</div><div class='add'>+	l2_len = l3.hdr - skb-&gt;data;</div><div class='add'>+	hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L2LEN_S, l2_len &gt;&gt; 1);</div><div class='ctx'> </div><div class='del'>-		/* define tunnel type(OL4).*/</div><div class='del'>-		switch (l4_proto) {</div><div class='del'>-		case IPPROTO_UDP:</div><div class='add'>+	/* compute OL3 header size, defined in 4 Bytes */</div><div class='add'>+	l3_len = l4.hdr - l3.hdr;</div><div class='add'>+	hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_S, l3_len &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	il2_hdr = skb_inner_mac_header(skb);</div><div class='add'>+	/* compute OL4 header size, defined in 4 Bytes. */</div><div class='add'>+	l4_len = il2_hdr - l4.hdr;</div><div class='add'>+	hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L4LEN_S, l4_len &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	/* define outer network header type */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		if (skb_is_gso(skb))</div><div class='ctx'> 			hns3_set_field(*ol_type_vlan_len_msec,</div><div class='del'>-				       HNS3_TXD_TUNTYPE_S,</div><div class='del'>-				       HNS3_TUN_MAC_IN_UDP);</div><div class='del'>-			break;</div><div class='del'>-		case IPPROTO_GRE:</div><div class='add'>+				       HNS3_TXD_OL3T_S,</div><div class='add'>+				       HNS3_OL3T_IPV4_CSUM);</div><div class='add'>+		else</div><div class='ctx'> 			hns3_set_field(*ol_type_vlan_len_msec,</div><div class='del'>-				       HNS3_TXD_TUNTYPE_S,</div><div class='del'>-				       HNS3_TUN_NVGRE);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='add'>+				       HNS3_TXD_OL3T_S,</div><div class='add'>+				       HNS3_OL3T_IPV4_NO_CSUM);</div><div class='add'>+</div><div class='add'>+	} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_S,</div><div class='add'>+			       HNS3_OL3T_IPV6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ol4_proto == IPPROTO_UDP)</div><div class='add'>+		hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_TUNTYPE_S,</div><div class='add'>+			       HNS3_TUN_MAC_IN_UDP);</div><div class='add'>+	else if (ol4_proto == IPPROTO_GRE)</div><div class='add'>+		hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_TUNTYPE_S,</div><div class='add'>+			       HNS3_TUN_NVGRE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hns3_set_l2l3l4(struct sk_buff *skb, u8 ol4_proto,</div><div class='add'>+			   u8 il4_proto, u32 *type_cs_vlan_tso,</div><div class='add'>+			   u32 *ol_type_vlan_len_msec)</div><div class='add'>+{</div><div class='add'>+	unsigned char *l2_hdr = l2_hdr = skb-&gt;data;</div><div class='add'>+	u32 l4_proto = ol4_proto;</div><div class='add'>+	union l4_hdr_info l4;</div><div class='add'>+	union l3_hdr_info l3;</div><div class='add'>+	u32 l2_len, l3_len;</div><div class='add'>+</div><div class='add'>+	l4.hdr = skb_transport_header(skb);</div><div class='add'>+	l3.hdr = skb_network_header(skb);</div><div class='add'>+</div><div class='add'>+	/* handle encapsulation skb */</div><div class='add'>+	if (skb-&gt;encapsulation) {</div><div class='add'>+		/* If this is a not UDP/GRE encapsulation skb */</div><div class='add'>+		if (!(ol4_proto == IPPROTO_UDP || ol4_proto == IPPROTO_GRE)) {</div><div class='ctx'> 			/* drop the skb tunnel packet if hardware don't support,</div><div class='ctx'> 			 * because hardware can't calculate csum when TSO.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -892,7 +836,12 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		hns3_set_outer_l2l3l4(skb, ol4_proto, ol_type_vlan_len_msec);</div><div class='add'>+</div><div class='add'>+		/* switch to inner header */</div><div class='add'>+		l2_hdr = skb_inner_mac_header(skb);</div><div class='ctx'> 		l3.hdr = skb_inner_network_header(skb);</div><div class='add'>+		l4.hdr = skb_inner_transport_header(skb);</div><div class='ctx'> 		l4_proto = il4_proto;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -910,11 +859,22 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,</div><div class='ctx'> 			       HNS3_L3T_IPV6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* compute inner(/normal) L2 header size, defined in 2 Bytes */</div><div class='add'>+	l2_len = l3.hdr - l2_hdr;</div><div class='add'>+	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S, l2_len &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+	/* compute inner(/normal) L3 header size, defined in 4 Bytes */</div><div class='add'>+	l3_len = l4.hdr - l3.hdr;</div><div class='add'>+	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3LEN_S, l3_len &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	/* compute inner(/normal) L4 header size, defined in 4 Bytes */</div><div class='ctx'> 	switch (l4_proto) {</div><div class='ctx'> 	case IPPROTO_TCP:</div><div class='ctx'> 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);</div><div class='ctx'> 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,</div><div class='ctx'> 			       HNS3_L4T_TCP);</div><div class='add'>+		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,</div><div class='add'>+			       l4.tcp-&gt;doff);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPPROTO_UDP:</div><div class='ctx'> 		if (hns3_tunnel_csum_bug(skb))</div><div class='hunk'>@@ -923,11 +883,15 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,</div><div class='ctx'> 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);</div><div class='ctx'> 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,</div><div class='ctx'> 			       HNS3_L4T_UDP);</div><div class='add'>+		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,</div><div class='add'>+			       (sizeof(struct udphdr) &gt;&gt; 2));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IPPROTO_SCTP:</div><div class='ctx'> 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);</div><div class='ctx'> 		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,</div><div class='ctx'> 			       HNS3_L4T_SCTP);</div><div class='add'>+		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,</div><div class='add'>+			       (sizeof(struct sctphdr) &gt;&gt; 2));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* drop the skb tunnel packet if hardware don't support,</div><div class='hunk'>@@ -962,6 +926,16 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> #define HNS3_TX_VLAN_PRIO_SHIFT 13</div><div class='ctx'> </div><div class='add'>+	struct hnae3_handle *handle = tx_ring-&gt;tqp-&gt;handle;</div><div class='add'>+</div><div class='add'>+	/* Since HW limitation, if port based insert VLAN enabled, only one VLAN</div><div class='add'>+	 * header is allowed in skb, otherwise it will cause RAS error.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb_vlan_tagged_multi(skb) &amp;&amp;</div><div class='add'>+		     handle-&gt;port_base_vlan_state ==</div><div class='add'>+		     HNAE3_PORT_BASE_VLAN_ENABLE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (skb-&gt;protocol == htons(ETH_P_8021Q) &amp;&amp;</div><div class='ctx'> 	    !(tx_ring-&gt;tqp-&gt;handle-&gt;kinfo.netdev-&gt;features &amp;</div><div class='ctx'> 	    NETIF_F_HW_VLAN_CTAG_TX)) {</div><div class='hunk'>@@ -983,8 +957,16 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb,</div><div class='ctx'> 		 * and use inner_vtag in one tag case.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_8021Q)) {</div><div class='del'>-			hns3_set_field(*out_vlan_flag, HNS3_TXD_OVLAN_B, 1);</div><div class='del'>-			*out_vtag = vlan_tag;</div><div class='add'>+			if (handle-&gt;port_base_vlan_state ==</div><div class='add'>+			    HNAE3_PORT_BASE_VLAN_DISABLE){</div><div class='add'>+				hns3_set_field(*out_vlan_flag,</div><div class='add'>+					       HNS3_TXD_OVLAN_B, 1);</div><div class='add'>+				*out_vtag = vlan_tag;</div><div class='add'>+			} else {</div><div class='add'>+				hns3_set_field(*inner_vlan_flag,</div><div class='add'>+					       HNS3_TXD_VLAN_B, 1);</div><div class='add'>+				*inner_vtag = vlan_tag;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			hns3_set_field(*inner_vlan_flag, HNS3_TXD_VLAN_B, 1);</div><div class='ctx'> 			*inner_vtag = vlan_tag;</div><div class='hunk'>@@ -1011,7 +993,6 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,</div><div class='ctx'> 	struct hns3_desc_cb *desc_cb = &amp;ring-&gt;desc_cb[ring-&gt;next_to_use];</div><div class='ctx'> 	struct hns3_desc *desc = &amp;ring-&gt;desc[ring-&gt;next_to_use];</div><div class='ctx'> 	struct device *dev = ring_to_dev(ring);</div><div class='del'>-	u16 bdtp_fe_sc_vld_ra_ri = 0;</div><div class='ctx'> 	struct skb_frag_struct *frag;</div><div class='ctx'> 	unsigned int frag_buf_num;</div><div class='ctx'> 	int k, sizeoflast;</div><div class='hunk'>@@ -1041,12 +1022,10 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,</div><div class='ctx'> 			ret = hns3_get_l4_protocol(skb, &amp;ol4_proto, &amp;il4_proto);</div><div class='ctx'> 			if (unlikely(ret))</div><div class='ctx'> 				return ret;</div><div class='del'>-			hns3_set_l2l3l4_len(skb, ol4_proto, il4_proto,</div><div class='del'>-					    &amp;type_cs_vlan_tso,</div><div class='del'>-					    &amp;ol_type_vlan_len_msec);</div><div class='del'>-			ret = hns3_set_l3l4_type_csum(skb, ol4_proto, il4_proto,</div><div class='del'>-						      &amp;type_cs_vlan_tso,</div><div class='del'>-						      &amp;ol_type_vlan_len_msec);</div><div class='add'>+</div><div class='add'>+			ret = hns3_set_l2l3l4(skb, ol4_proto, il4_proto,</div><div class='add'>+					      &amp;type_cs_vlan_tso,</div><div class='add'>+					      &amp;ol_type_vlan_len_msec);</div><div class='ctx'> 			if (unlikely(ret))</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1072,19 +1051,37 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,</div><div class='ctx'> 		dma = skb_frag_dma_map(dev, frag, 0, size, DMA_TO_DEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dma_mapping_error(ring-&gt;dev, dma))) {</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, dma))) {</div><div class='ctx'> 		ring-&gt;stats.sw_err_cnt++;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc_cb-&gt;length = size;</div><div class='ctx'> </div><div class='del'>-	frag_buf_num = (size + HNS3_MAX_BD_SIZE - 1) &gt;&gt; HNS3_MAX_BD_SIZE_OFFSET;</div><div class='add'>+	if (likely(size &lt;= HNS3_MAX_BD_SIZE)) {</div><div class='add'>+		u16 bdtp_fe_sc_vld_ra_ri = 0;</div><div class='add'>+</div><div class='add'>+		desc_cb-&gt;priv = priv;</div><div class='add'>+		desc_cb-&gt;dma = dma;</div><div class='add'>+		desc_cb-&gt;type = type;</div><div class='add'>+		desc-&gt;addr = cpu_to_le64(dma);</div><div class='add'>+		desc-&gt;tx.send_size = cpu_to_le16(size);</div><div class='add'>+		hns3_set_txbd_baseinfo(&amp;bdtp_fe_sc_vld_ra_ri, frag_end);</div><div class='add'>+		desc-&gt;tx.bdtp_fe_sc_vld_ra_ri =</div><div class='add'>+			cpu_to_le16(bdtp_fe_sc_vld_ra_ri);</div><div class='add'>+</div><div class='add'>+		ring_ptr_move_fw(ring, next_to_use);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	frag_buf_num = hns3_tx_bd_count(size);</div><div class='ctx'> 	sizeoflast = size &amp; HNS3_TX_LAST_SIZE_M;</div><div class='ctx'> 	sizeoflast = sizeoflast ? sizeoflast : HNS3_MAX_BD_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* When frag size is bigger than hardware limit, split this frag */</div><div class='ctx'> 	for (k = 0; k &lt; frag_buf_num; k++) {</div><div class='add'>+		u16 bdtp_fe_sc_vld_ra_ri = 0;</div><div class='add'>+</div><div class='ctx'> 		/* The txbd's baseinfo of DESC_TYPE_PAGE &amp; DESC_TYPE_SKB */</div><div class='ctx'> 		desc_cb-&gt;priv = priv;</div><div class='ctx'> 		desc_cb-&gt;dma = dma + HNS3_MAX_BD_SIZE * k;</div><div class='hunk'>@@ -1111,66 +1108,92 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hns3_nic_maybe_stop_tso(struct sk_buff **out_skb, int *bnum,</div><div class='del'>-				   struct hns3_enet_ring *ring)</div><div class='add'>+static int hns3_nic_bd_num(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = *out_skb;</div><div class='del'>-	struct sk_buff *new_skb = NULL;</div><div class='del'>-	struct skb_frag_struct *frag;</div><div class='del'>-	int bdnum_for_frag;</div><div class='del'>-	int frag_num;</div><div class='del'>-	int buf_num;</div><div class='del'>-	int size;</div><div class='del'>-	int i;</div><div class='add'>+	int size = skb_headlen(skb);</div><div class='add'>+	int i, bd_num;</div><div class='ctx'> </div><div class='del'>-	size = skb_headlen(skb);</div><div class='del'>-	buf_num = (size + HNS3_MAX_BD_SIZE - 1) &gt;&gt; HNS3_MAX_BD_SIZE_OFFSET;</div><div class='add'>+	/* if the total len is within the max bd limit */</div><div class='add'>+	if (likely(skb-&gt;len &lt;= HNS3_MAX_BD_SIZE))</div><div class='add'>+		return skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='add'>+</div><div class='add'>+	bd_num = hns3_tx_bd_count(size);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+		struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		int frag_bd_num;</div><div class='ctx'> </div><div class='del'>-	frag_num = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	for (i = 0; i &lt; frag_num; i++) {</div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 		size = skb_frag_size(frag);</div><div class='del'>-		bdnum_for_frag = (size + HNS3_MAX_BD_SIZE - 1) &gt;&gt;</div><div class='del'>-				 HNS3_MAX_BD_SIZE_OFFSET;</div><div class='del'>-		if (unlikely(bdnum_for_frag &gt; HNS3_MAX_BD_PER_FRAG))</div><div class='add'>+		frag_bd_num = hns3_tx_bd_count(size);</div><div class='add'>+</div><div class='add'>+		if (unlikely(frag_bd_num &gt; HNS3_MAX_BD_PER_FRAG))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		buf_num += bdnum_for_frag;</div><div class='add'>+		bd_num += frag_bd_num;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(buf_num &gt; HNS3_MAX_BD_PER_FRAG)) {</div><div class='del'>-		buf_num = (skb-&gt;len + HNS3_MAX_BD_SIZE - 1) &gt;&gt;</div><div class='del'>-			  HNS3_MAX_BD_SIZE_OFFSET;</div><div class='del'>-		if (ring_space(ring) &lt; buf_num)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		/* manual split the send packet */</div><div class='del'>-		new_skb = skb_copy(skb, GFP_ATOMIC);</div><div class='del'>-		if (!new_skb)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		*out_skb = new_skb;</div><div class='del'>-	}</div><div class='add'>+	return bd_num;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ring_space(ring) &lt; buf_num))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+static unsigned int hns3_gso_hdr_len(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!skb-&gt;encapsulation)</div><div class='add'>+		return skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='ctx'> </div><div class='del'>-	*bnum = buf_num;</div><div class='del'>-	return 0;</div><div class='add'>+	return skb_inner_transport_offset(skb) + inner_tcp_hdrlen(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hns3_nic_maybe_stop_tx(struct sk_buff **out_skb, int *bnum,</div><div class='del'>-				  struct hns3_enet_ring *ring)</div><div class='add'>+/* HW need every continuous 8 buffer data to be larger than MSS,</div><div class='add'>+ * we simplify it by ensuring skb_headlen + the first continuous</div><div class='add'>+ * 7 frags to to be larger than gso header len + mss, and the remaining</div><div class='add'>+ * continuous 7 frags to be larger than MSS except the last 7 frags.</div><div class='add'>+ */</div><div class='add'>+static bool hns3_skb_need_linearized(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int bd_limit = HNS3_MAX_BD_PER_FRAG - 1;</div><div class='add'>+	unsigned int tot_len = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd_limit; i++)</div><div class='add'>+		tot_len += skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='add'>+</div><div class='add'>+	/* ensure headlen + the first 7 frags is greater than mss + header</div><div class='add'>+	 * and the first 7 frags is greater than mss.</div><div class='add'>+	 */</div><div class='add'>+	if (((tot_len + skb_headlen(skb)) &lt; (skb_shinfo(skb)-&gt;gso_size +</div><div class='add'>+	    hns3_gso_hdr_len(skb))) || (tot_len &lt; skb_shinfo(skb)-&gt;gso_size))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* ensure the remaining continuous 7 buffer is greater than mss */</div><div class='add'>+	for (i = 0; i &lt; (skb_shinfo(skb)-&gt;nr_frags - bd_limit - 1); i++) {</div><div class='add'>+		tot_len -= skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='add'>+		tot_len += skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i + bd_limit]);</div><div class='add'>+</div><div class='add'>+		if (tot_len &lt; skb_shinfo(skb)-&gt;gso_size)</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 hns3_nic_maybe_stop_tx(struct hns3_enet_ring *ring,</div><div class='add'>+				  struct sk_buff **out_skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = *out_skb;</div><div class='del'>-	struct sk_buff *new_skb = NULL;</div><div class='del'>-	int buf_num;</div><div class='add'>+	int bd_num;</div><div class='ctx'> </div><div class='del'>-	/* No. of segments (plus a header) */</div><div class='del'>-	buf_num = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='add'>+	bd_num = hns3_nic_bd_num(skb);</div><div class='add'>+	if (bd_num &lt; 0)</div><div class='add'>+		return bd_num;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(buf_num &gt; HNS3_MAX_BD_PER_FRAG)) {</div><div class='del'>-		buf_num = (skb-&gt;len + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE;</div><div class='del'>-		if (ring_space(ring) &lt; buf_num)</div><div class='add'>+	if (unlikely(bd_num &gt; HNS3_MAX_BD_PER_FRAG)) {</div><div class='add'>+		struct sk_buff *new_skb;</div><div class='add'>+</div><div class='add'>+		if (skb_is_gso(skb) &amp;&amp; !hns3_skb_need_linearized(skb))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		bd_num = hns3_tx_bd_count(skb-&gt;len);</div><div class='add'>+		if (unlikely(ring_space(ring) &lt; bd_num))</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		/* manual split the send packet */</div><div class='ctx'> 		new_skb = skb_copy(skb, GFP_ATOMIC);</div><div class='hunk'>@@ -1178,14 +1201,17 @@ static int hns3_nic_maybe_stop_tx(struct sk_buff **out_skb, int *bnum,</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		*out_skb = new_skb;</div><div class='add'>+</div><div class='add'>+		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+		ring-&gt;stats.tx_copy++;</div><div class='add'>+		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ring_space(ring) &lt; buf_num))</div><div class='add'>+out:</div><div class='add'>+	if (unlikely(ring_space(ring) &lt; bd_num))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	*bnum = buf_num;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return bd_num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hns3_clear_desc(struct hns3_enet_ring *ring, int next_to_use_orig)</div><div class='hunk'>@@ -1198,6 +1224,9 @@ static void hns3_clear_desc(struct hns3_enet_ring *ring, int next_to_use_orig)</div><div class='ctx'> 		if (ring-&gt;next_to_use == next_to_use_orig)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		/* rollback one */</div><div class='add'>+		ring_ptr_move_bw(ring, next_to_use);</div><div class='add'>+</div><div class='ctx'> 		/* unmap the descriptor dma address */</div><div class='ctx'> 		if (ring-&gt;desc_cb[ring-&gt;next_to_use].type == DESC_TYPE_SKB)</div><div class='ctx'> 			dma_unmap_single(dev,</div><div class='hunk'>@@ -1211,9 +1240,7 @@ static void hns3_clear_desc(struct hns3_enet_ring *ring, int next_to_use_orig)</div><div class='ctx'> 				       DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		ring-&gt;desc_cb[ring-&gt;next_to_use].length = 0;</div><div class='del'>-</div><div class='del'>-		/* rollback one */</div><div class='del'>-		ring_ptr_move_bw(ring, next_to_use);</div><div class='add'>+		ring-&gt;desc_cb[ring-&gt;next_to_use].dma = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1226,7 +1253,6 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	struct netdev_queue *dev_queue;</div><div class='ctx'> 	struct skb_frag_struct *frag;</div><div class='ctx'> 	int next_to_use_head;</div><div class='del'>-	int next_to_use_frag;</div><div class='ctx'> 	int buf_num;</div><div class='ctx'> 	int seg_num;</div><div class='ctx'> 	int size;</div><div class='hunk'>@@ -1236,22 +1262,23 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	/* Prefetch the data used later */</div><div class='ctx'> 	prefetch(skb-&gt;data);</div><div class='ctx'> </div><div class='del'>-	switch (priv-&gt;ops.maybe_stop_tx(&amp;skb, &amp;buf_num, ring)) {</div><div class='del'>-	case -EBUSY:</div><div class='del'>-		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='del'>-		ring-&gt;stats.tx_busy++;</div><div class='del'>-		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+	buf_num = hns3_nic_maybe_stop_tx(ring, &amp;skb);</div><div class='add'>+	if (unlikely(buf_num &lt;= 0)) {</div><div class='add'>+		if (buf_num == -EBUSY) {</div><div class='add'>+			u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+			ring-&gt;stats.tx_busy++;</div><div class='add'>+			u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+			goto out_net_tx_busy;</div><div class='add'>+		} else if (buf_num == -ENOMEM) {</div><div class='add'>+			u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+			ring-&gt;stats.sw_err_cnt++;</div><div class='add'>+			u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		goto out_net_tx_busy;</div><div class='del'>-	case -ENOMEM:</div><div class='del'>-		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='del'>-		ring-&gt;stats.sw_err_cnt++;</div><div class='del'>-		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='del'>-		netdev_err(netdev, "no memory to xmit!\n");</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev, "xmit error: %d!\n", buf_num);</div><div class='ctx'> </div><div class='ctx'> 		goto out_err_tx_ok;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No. of segments (plus a header) */</div><div class='hunk'>@@ -1264,9 +1291,8 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	ret = hns3_fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0,</div><div class='ctx'> 			     DESC_TYPE_SKB);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		goto head_fill_err;</div><div class='add'>+		goto fill_err;</div><div class='ctx'> </div><div class='del'>-	next_to_use_frag = ring-&gt;next_to_use;</div><div class='ctx'> 	/* Fill the fragments */</div><div class='ctx'> 	for (i = 1; i &lt; seg_num; i++) {</div><div class='ctx'> 		frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='hunk'>@@ -1277,7 +1303,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 				     DESC_TYPE_PAGE);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(ret))</div><div class='del'>-			goto frag_fill_err;</div><div class='add'>+			goto fill_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Complete translate all packets */</div><div class='hunk'>@@ -1290,10 +1316,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>-frag_fill_err:</div><div class='del'>-	hns3_clear_desc(ring, next_to_use_frag);</div><div class='del'>-</div><div class='del'>-head_fill_err:</div><div class='add'>+fill_err:</div><div class='ctx'> 	hns3_clear_desc(ring, next_to_use_head);</div><div class='ctx'> </div><div class='ctx'> out_err_tx_ok:</div><div class='hunk'>@@ -1356,13 +1379,6 @@ static int hns3_nic_set_features(struct net_device *netdev,</div><div class='ctx'> 	bool enable;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; (NETIF_F_TSO | NETIF_F_TSO6)) {</div><div class='del'>-		if (features &amp; (NETIF_F_TSO | NETIF_F_TSO6))</div><div class='del'>-			priv-&gt;ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (changed &amp; (NETIF_F_GRO_HW) &amp;&amp; h-&gt;ae_algo-&gt;ops-&gt;set_gro_en) {</div><div class='ctx'> 		enable = !!(features &amp; NETIF_F_GRO_HW);</div><div class='ctx'> 		ret = h-&gt;ae_algo-&gt;ops-&gt;set_gro_en(h, enable);</div><div class='hunk'>@@ -1575,6 +1591,9 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct hnae3_handle *h = hns3_get_handle(netdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (hns3_nic_resetting(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	if (!h-&gt;ae_algo-&gt;ops-&gt;set_mtu)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -1591,13 +1610,19 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hns3_nic_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct hnae3_handle *h = hns3_get_handle(ndev);</div><div class='ctx'> 	struct hns3_enet_ring *tx_ring = NULL;</div><div class='add'>+	struct napi_struct *napi;</div><div class='ctx'> 	int timeout_queue = 0;</div><div class='ctx'> 	int hw_head, hw_tail;</div><div class='add'>+	int fbd_num, fbd_oft;</div><div class='add'>+	int ebd_num, ebd_oft;</div><div class='add'>+	int bd_num, bd_err;</div><div class='add'>+	int ring_en, tc;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Find the stopped queue the same way the stack does */</div><div class='del'>-	for (i = 0; i &lt; ndev-&gt;real_num_tx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; ndev-&gt;num_tx_queues; i++) {</div><div class='ctx'> 		struct netdev_queue *q;</div><div class='ctx'> 		unsigned long trans_start;</div><div class='ctx'> </div><div class='hunk'>@@ -1618,21 +1643,66 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;tx_timeout_count++;</div><div class='add'>+</div><div class='ctx'> 	tx_ring = priv-&gt;ring_data[timeout_queue].ring;</div><div class='add'>+	napi = &amp;tx_ring-&gt;tqp_vector-&gt;napi;</div><div class='add'>+</div><div class='add'>+	netdev_info(ndev,</div><div class='add'>+		    "tx_timeout count: %llu, queue id: %d, SW_NTU: 0x%x, SW_NTC: 0x%x, napi state: %lu\n",</div><div class='add'>+		    priv-&gt;tx_timeout_count, timeout_queue, tx_ring-&gt;next_to_use,</div><div class='add'>+		    tx_ring-&gt;next_to_clean, napi-&gt;state);</div><div class='add'>+</div><div class='add'>+	netdev_info(ndev,</div><div class='add'>+		    "tx_pkts: %llu, tx_bytes: %llu, io_err_cnt: %llu, sw_err_cnt: %llu\n",</div><div class='add'>+		    tx_ring-&gt;stats.tx_pkts, tx_ring-&gt;stats.tx_bytes,</div><div class='add'>+		    tx_ring-&gt;stats.io_err_cnt, tx_ring-&gt;stats.sw_err_cnt);</div><div class='add'>+</div><div class='add'>+	netdev_info(ndev,</div><div class='add'>+		    "seg_pkt_cnt: %llu, tx_err_cnt: %llu, restart_queue: %llu, tx_busy: %llu\n",</div><div class='add'>+		    tx_ring-&gt;stats.seg_pkt_cnt, tx_ring-&gt;stats.tx_err_cnt,</div><div class='add'>+		    tx_ring-&gt;stats.restart_queue, tx_ring-&gt;stats.tx_busy);</div><div class='add'>+</div><div class='add'>+	/* When mac received many pause frames continuous, it's unable to send</div><div class='add'>+	 * packets, which may cause tx timeout</div><div class='add'>+	 */</div><div class='add'>+	if (h-&gt;ae_algo-&gt;ops-&gt;update_stats &amp;&amp;</div><div class='add'>+	    h-&gt;ae_algo-&gt;ops-&gt;get_mac_pause_stats) {</div><div class='add'>+		u64 tx_pause_cnt, rx_pause_cnt;</div><div class='add'>+</div><div class='add'>+		h-&gt;ae_algo-&gt;ops-&gt;update_stats(h, &amp;ndev-&gt;stats);</div><div class='add'>+		h-&gt;ae_algo-&gt;ops-&gt;get_mac_pause_stats(h, &amp;tx_pause_cnt,</div><div class='add'>+						     &amp;rx_pause_cnt);</div><div class='add'>+		netdev_info(ndev, "tx_pause_cnt: %llu, rx_pause_cnt: %llu\n",</div><div class='add'>+			    tx_pause_cnt, rx_pause_cnt);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hw_head = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='ctx'> 				HNS3_RING_TX_RING_HEAD_REG);</div><div class='ctx'> 	hw_tail = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='ctx'> 				HNS3_RING_TX_RING_TAIL_REG);</div><div class='add'>+	fbd_num = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='add'>+				HNS3_RING_TX_RING_FBDNUM_REG);</div><div class='add'>+	fbd_oft = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='add'>+				HNS3_RING_TX_RING_OFFSET_REG);</div><div class='add'>+	ebd_num = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='add'>+				HNS3_RING_TX_RING_EBDNUM_REG);</div><div class='add'>+	ebd_oft = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='add'>+				HNS3_RING_TX_RING_EBD_OFFSET_REG);</div><div class='add'>+	bd_num = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='add'>+			       HNS3_RING_TX_RING_BD_NUM_REG);</div><div class='add'>+	bd_err = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base +</div><div class='add'>+			       HNS3_RING_TX_RING_BD_ERR_REG);</div><div class='add'>+	ring_en = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base + HNS3_RING_EN_REG);</div><div class='add'>+	tc = readl_relaxed(tx_ring-&gt;tqp-&gt;io_base + HNS3_RING_TX_RING_TC_REG);</div><div class='add'>+</div><div class='ctx'> 	netdev_info(ndev,</div><div class='del'>-		    "tx_timeout count: %llu, queue id: %d, SW_NTU: 0x%x, SW_NTC: 0x%x, HW_HEAD: 0x%x, HW_TAIL: 0x%x, INT: 0x%x\n",</div><div class='del'>-		    priv-&gt;tx_timeout_count,</div><div class='del'>-		    timeout_queue,</div><div class='del'>-		    tx_ring-&gt;next_to_use,</div><div class='del'>-		    tx_ring-&gt;next_to_clean,</div><div class='del'>-		    hw_head,</div><div class='del'>-		    hw_tail,</div><div class='add'>+		    "BD_NUM: 0x%x HW_HEAD: 0x%x, HW_TAIL: 0x%x, BD_ERR: 0x%x, INT: 0x%x\n",</div><div class='add'>+		    bd_num, hw_head, hw_tail, bd_err,</div><div class='ctx'> 		    readl(tx_ring-&gt;tqp_vector-&gt;mask_addr));</div><div class='add'>+	netdev_info(ndev,</div><div class='add'>+		    "RING_EN: 0x%x, TC: 0x%x, FBD_NUM: 0x%x FBD_OFT: 0x%x, EBD_NUM: 0x%x, EBD_OFT: 0x%x\n",</div><div class='add'>+		    ring_en, tc, fbd_num, fbd_oft, ebd_num, ebd_oft);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -1645,8 +1715,6 @@ static void hns3_nic_net_timeout(struct net_device *ndev)</div><div class='ctx'> 	if (!hns3_get_tx_timeo_queue_info(ndev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_timeout_count++;</div><div class='del'>-</div><div class='ctx'> 	/* request the reset, and let the hclge to determine</div><div class='ctx'> 	 * which reset level should be done</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1671,7 +1739,7 @@ static const struct net_device_ops hns3_nic_netdev_ops = {</div><div class='ctx'> 	.ndo_set_vf_vlan	= hns3_ndo_set_vf_vlan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static bool hns3_is_phys_func(struct pci_dev *pdev)</div><div class='add'>+bool hns3_is_phys_func(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dev_id = pdev-&gt;device;</div><div class='ctx'> </div><div class='hunk'>@@ -2118,17 +2186,30 @@ static void hns3_reuse_buffer(struct hns3_enet_ring *ring, int i)</div><div class='ctx'> 	ring-&gt;desc[i].rx.bd_base_info = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hns3_nic_reclaim_one_desc(struct hns3_enet_ring *ring, int *bytes,</div><div class='del'>-				      int *pkts)</div><div class='add'>+static void hns3_nic_reclaim_desc(struct hns3_enet_ring *ring, int head,</div><div class='add'>+				  int *bytes, int *pkts)</div><div class='ctx'> {</div><div class='del'>-	struct hns3_desc_cb *desc_cb = &amp;ring-&gt;desc_cb[ring-&gt;next_to_clean];</div><div class='add'>+	int ntc = ring-&gt;next_to_clean;</div><div class='add'>+	struct hns3_desc_cb *desc_cb;</div><div class='ctx'> </div><div class='del'>-	(*pkts) += (desc_cb-&gt;type == DESC_TYPE_SKB);</div><div class='del'>-	(*bytes) += desc_cb-&gt;length;</div><div class='del'>-	/* desc_cb will be cleaned, after hnae3_free_buffer_detach*/</div><div class='del'>-	hns3_free_buffer_detach(ring, ring-&gt;next_to_clean);</div><div class='add'>+	while (head != ntc) {</div><div class='add'>+		desc_cb = &amp;ring-&gt;desc_cb[ntc];</div><div class='add'>+		(*pkts) += (desc_cb-&gt;type == DESC_TYPE_SKB);</div><div class='add'>+		(*bytes) += desc_cb-&gt;length;</div><div class='add'>+		/* desc_cb will be cleaned, after hnae3_free_buffer_detach */</div><div class='add'>+		hns3_free_buffer_detach(ring, ntc);</div><div class='ctx'> </div><div class='del'>-	ring_ptr_move_fw(ring, next_to_clean);</div><div class='add'>+		if (++ntc == ring-&gt;desc_num)</div><div class='add'>+			ntc = 0;</div><div class='add'>+</div><div class='add'>+		/* Issue prefetch for next Tx descriptor */</div><div class='add'>+		prefetch(&amp;ring-&gt;desc_cb[ntc]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This smp_store_release() pairs with smp_load_acquire() in</div><div class='add'>+	 * ring_space called by hns3_nic_net_xmit.</div><div class='add'>+	 */</div><div class='add'>+	smp_store_release(&amp;ring-&gt;next_to_clean, ntc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_valid_clean_head(struct hns3_enet_ring *ring, int h)</div><div class='hunk'>@@ -2168,11 +2249,7 @@ void hns3_clean_tx_ring(struct hns3_enet_ring *ring)</div><div class='ctx'> </div><div class='ctx'> 	bytes = 0;</div><div class='ctx'> 	pkts = 0;</div><div class='del'>-	while (head != ring-&gt;next_to_clean) {</div><div class='del'>-		hns3_nic_reclaim_one_desc(ring, &amp;bytes, &amp;pkts);</div><div class='del'>-		/* Issue prefetch for next Tx descriptor */</div><div class='del'>-		prefetch(&amp;ring-&gt;desc_cb[ring-&gt;next_to_clean]);</div><div class='del'>-	}</div><div class='add'>+	hns3_nic_reclaim_desc(ring, head, &amp;bytes, &amp;pkts);</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;tqp_vector-&gt;tx_group.total_bytes += bytes;</div><div class='ctx'> 	ring-&gt;tqp_vector-&gt;tx_group.total_packets += pkts;</div><div class='hunk'>@@ -2234,6 +2311,10 @@ hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring, int cleand_count)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			hns3_replace_buffer(ring, ring-&gt;next_to_use, &amp;res_cbs);</div><div class='add'>+</div><div class='add'>+			u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+			ring-&gt;stats.non_reuse_pg++;</div><div class='add'>+			u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ring_ptr_move_fw(ring, next_to_use);</div><div class='hunk'>@@ -2247,64 +2328,78 @@ static void hns3_nic_reuse_page(struct sk_buff *skb, int i,</div><div class='ctx'> 				struct hns3_enet_ring *ring, int pull_len,</div><div class='ctx'> 				struct hns3_desc_cb *desc_cb)</div><div class='ctx'> {</div><div class='del'>-	struct hns3_desc *desc;</div><div class='del'>-	u32 truesize;</div><div class='del'>-	int size;</div><div class='del'>-	int last_offset;</div><div class='del'>-	bool twobufs;</div><div class='del'>-</div><div class='del'>-	twobufs = ((PAGE_SIZE &lt; 8192) &amp;&amp;</div><div class='del'>-		hnae3_buf_size(ring) == HNS3_BUFFER_SIZE_2048);</div><div class='del'>-</div><div class='del'>-	desc = &amp;ring-&gt;desc[ring-&gt;next_to_clean];</div><div class='del'>-	size = le16_to_cpu(desc-&gt;rx.size);</div><div class='del'>-</div><div class='del'>-	truesize = hnae3_buf_size(ring);</div><div class='del'>-</div><div class='del'>-	if (!twobufs)</div><div class='del'>-		last_offset = hnae3_page_size(ring) - hnae3_buf_size(ring);</div><div class='add'>+	struct hns3_desc *desc = &amp;ring-&gt;desc[ring-&gt;next_to_clean];</div><div class='add'>+	int size = le16_to_cpu(desc-&gt;rx.size);</div><div class='add'>+	u32 truesize = hnae3_buf_size(ring);</div><div class='ctx'> </div><div class='ctx'> 	skb_add_rx_frag(skb, i, desc_cb-&gt;priv, desc_cb-&gt;page_offset + pull_len,</div><div class='ctx'> 			size - pull_len, truesize);</div><div class='ctx'> </div><div class='del'>-	 /* Avoid re-using remote pages,flag default unreuse */</div><div class='del'>-	if (unlikely(page_to_nid(desc_cb-&gt;priv) != numa_node_id()))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (twobufs) {</div><div class='del'>-		/* If we are only owner of page we can reuse it */</div><div class='del'>-		if (likely(page_count(desc_cb-&gt;priv) == 1)) {</div><div class='del'>-			/* Flip page offset to other buffer */</div><div class='del'>-			desc_cb-&gt;page_offset ^= truesize;</div><div class='del'>-</div><div class='del'>-			desc_cb-&gt;reuse_flag = 1;</div><div class='del'>-			/* bump ref count on page before it is given*/</div><div class='del'>-			get_page(desc_cb-&gt;priv);</div><div class='del'>-		}</div><div class='add'>+	/* Avoid re-using remote pages, or the stack is still using the page</div><div class='add'>+	 * when page_offset rollback to zero, flag default unreuse</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(page_to_nid(desc_cb-&gt;priv) != numa_node_id()) ||</div><div class='add'>+	    (!desc_cb-&gt;page_offset &amp;&amp; page_count(desc_cb-&gt;priv) &gt; 1))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Move offset up to the next cache line */</div><div class='ctx'> 	desc_cb-&gt;page_offset += truesize;</div><div class='ctx'> </div><div class='del'>-	if (desc_cb-&gt;page_offset &lt;= last_offset) {</div><div class='add'>+	if (desc_cb-&gt;page_offset + truesize &lt;= hnae3_page_size(ring)) {</div><div class='ctx'> 		desc_cb-&gt;reuse_flag = 1;</div><div class='ctx'> 		/* Bump ref count on page before it is given*/</div><div class='ctx'> 		get_page(desc_cb-&gt;priv);</div><div class='add'>+	} else if (page_count(desc_cb-&gt;priv) == 1) {</div><div class='add'>+		desc_cb-&gt;reuse_flag = 1;</div><div class='add'>+		desc_cb-&gt;page_offset = 0;</div><div class='add'>+		get_page(desc_cb-&gt;priv);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hns3_gro_complete(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__be16 type = skb-&gt;protocol;</div><div class='add'>+	struct tcphdr *th;</div><div class='add'>+	int depth = 0;</div><div class='add'>+</div><div class='add'>+	while (type == htons(ETH_P_8021Q)) {</div><div class='add'>+		struct vlan_hdr *vh;</div><div class='add'>+</div><div class='add'>+		if ((depth + VLAN_HLEN) &gt; skb_headlen(skb))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		vh = (struct vlan_hdr *)(skb-&gt;data + depth);</div><div class='add'>+		type = vh-&gt;h_vlan_encapsulated_proto;</div><div class='add'>+		depth += VLAN_HLEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == htons(ETH_P_IP)) {</div><div class='add'>+		depth += sizeof(struct iphdr);</div><div class='add'>+	} else if (type == htons(ETH_P_IPV6)) {</div><div class='add'>+		depth += sizeof(struct ipv6hdr);</div><div class='add'>+	} else {</div><div class='add'>+		netdev_err(skb-&gt;dev,</div><div class='add'>+			   "Error: FW GRO supports only IPv4/IPv6, not 0x%04x, depth: %d\n",</div><div class='add'>+			   be16_to_cpu(type), depth);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	th = (struct tcphdr *)(skb-&gt;data + depth);</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_segs = NAPI_GRO_CB(skb)-&gt;count;</div><div class='add'>+	if (th-&gt;cwr)</div><div class='add'>+		skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_TCP_ECN;</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb,</div><div class='del'>-			     struct hns3_desc *desc)</div><div class='add'>+			     u32 l234info, u32 bd_base_info, u32 ol_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = ring-&gt;tqp-&gt;handle-&gt;kinfo.netdev;</div><div class='ctx'> 	int l3_type, l4_type;</div><div class='del'>-	u32 bd_base_info;</div><div class='ctx'> 	int ol4_type;</div><div class='del'>-	u32 l234info;</div><div class='del'>-</div><div class='del'>-	bd_base_info = le32_to_cpu(desc-&gt;rx.bd_base_info);</div><div class='del'>-	l234info = le32_to_cpu(desc-&gt;rx.l234_info);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='hunk'>@@ -2313,12 +2408,6 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb,</div><div class='ctx'> 	if (!(netdev-&gt;features &amp; NETIF_F_RXCSUM))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* We MUST enable hardware checksum before enabling hardware GRO */</div><div class='del'>-	if (skb_shinfo(skb)-&gt;gso_size) {</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* check if hardware has done checksum */</div><div class='ctx'> 	if (!(bd_base_info &amp; BIT(HNS3_RXD_L3L4P_B)))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2333,7 +2422,7 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ol4_type = hnae3_get_field(l234info, HNS3_RXD_OL4ID_M,</div><div class='add'>+	ol4_type = hnae3_get_field(ol_info, HNS3_RXD_OL4ID_M,</div><div class='ctx'> 				   HNS3_RXD_OL4ID_S);</div><div class='ctx'> 	switch (ol4_type) {</div><div class='ctx'> 	case HNS3_OL4_TYPE_MAC_IN_UDP:</div><div class='hunk'>@@ -2371,6 +2460,7 @@ static bool hns3_parse_vlan_tag(struct hns3_enet_ring *ring,</div><div class='ctx'> 				struct hns3_desc *desc, u32 l234info,</div><div class='ctx'> 				u16 *vlan_tag)</div><div class='ctx'> {</div><div class='add'>+	struct hnae3_handle *handle = ring-&gt;tqp-&gt;handle;</div><div class='ctx'> 	struct pci_dev *pdev = ring-&gt;tqp-&gt;handle-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;revision == 0x20) {</div><div class='hunk'>@@ -2383,15 +2473,36 @@ static bool hns3_parse_vlan_tag(struct hns3_enet_ring *ring,</div><div class='ctx'> </div><div class='ctx'> #define HNS3_STRP_OUTER_VLAN	0x1</div><div class='ctx'> #define HNS3_STRP_INNER_VLAN	0x2</div><div class='add'>+#define HNS3_STRP_BOTH		0x3</div><div class='ctx'> </div><div class='add'>+	/* Hardware always insert VLAN tag into RX descriptor when</div><div class='add'>+	 * remove the tag from packet, driver needs to determine</div><div class='add'>+	 * reporting which tag to stack.</div><div class='add'>+	 */</div><div class='ctx'> 	switch (hnae3_get_field(l234info, HNS3_RXD_STRP_TAGP_M,</div><div class='ctx'> 				HNS3_RXD_STRP_TAGP_S)) {</div><div class='ctx'> 	case HNS3_STRP_OUTER_VLAN:</div><div class='add'>+		if (handle-&gt;port_base_vlan_state !=</div><div class='add'>+				HNAE3_PORT_BASE_VLAN_DISABLE)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='ctx'> 		*vlan_tag = le16_to_cpu(desc-&gt;rx.ot_vlan_tag);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	case HNS3_STRP_INNER_VLAN:</div><div class='add'>+		if (handle-&gt;port_base_vlan_state !=</div><div class='add'>+				HNAE3_PORT_BASE_VLAN_DISABLE)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='ctx'> 		*vlan_tag = le16_to_cpu(desc-&gt;rx.vlan_tag);</div><div class='ctx'> 		return true;</div><div class='add'>+	case HNS3_STRP_BOTH:</div><div class='add'>+		if (handle-&gt;port_base_vlan_state ==</div><div class='add'>+				HNAE3_PORT_BASE_VLAN_DISABLE)</div><div class='add'>+			*vlan_tag = le16_to_cpu(desc-&gt;rx.ot_vlan_tag);</div><div class='add'>+		else</div><div class='add'>+			*vlan_tag = le16_to_cpu(desc-&gt;rx.vlan_tag);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2438,7 +2549,7 @@ static int hns3_alloc_skb(struct hns3_enet_ring *ring, int length,</div><div class='ctx'> 	ring-&gt;stats.seg_pkt_cnt++;</div><div class='ctx'> 	u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;pull_len = eth_get_headlen(va, HNS3_RX_HEAD_SIZE);</div><div class='add'>+	ring-&gt;pull_len = eth_get_headlen(netdev, va, HNS3_RX_HEAD_SIZE);</div><div class='ctx'> 	__skb_put(skb, ring-&gt;pull_len);</div><div class='ctx'> 	hns3_nic_reuse_page(skb, ring-&gt;frag_num++, ring, ring-&gt;pull_len,</div><div class='ctx'> 			    desc_cb);</div><div class='hunk'>@@ -2513,8 +2624,9 @@ static int hns3_add_frag(struct hns3_enet_ring *ring, struct hns3_desc *desc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hns3_set_gro_param(struct sk_buff *skb, u32 l234info,</div><div class='del'>-			       u32 bd_base_info)</div><div class='add'>+static int hns3_set_gro_and_checksum(struct hns3_enet_ring *ring,</div><div class='add'>+				     struct sk_buff *skb, u32 l234info,</div><div class='add'>+				     u32 bd_base_info, u32 ol_info)</div><div class='ctx'> {</div><div class='ctx'> 	u16 gro_count;</div><div class='ctx'> 	u32 l3_type;</div><div class='hunk'>@@ -2522,12 +2634,11 @@ static void hns3_set_gro_param(struct sk_buff *skb, u32 l234info,</div><div class='ctx'> 	gro_count = hnae3_get_field(l234info, HNS3_RXD_GRO_COUNT_M,</div><div class='ctx'> 				    HNS3_RXD_GRO_COUNT_S);</div><div class='ctx'> 	/* if there is no HW GRO, do not set gro params */</div><div class='del'>-	if (!gro_count)</div><div class='del'>-		return;</div><div class='add'>+	if (!gro_count) {</div><div class='add'>+		hns3_rx_checksum(ring, skb, l234info, bd_base_info, ol_info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* tcp_gro_complete() will copy NAPI_GRO_CB(skb)-&gt;count</div><div class='del'>-	 * to skb_shinfo(skb)-&gt;gso_segs</div><div class='del'>-	 */</div><div class='ctx'> 	NAPI_GRO_CB(skb)-&gt;count = gro_count;</div><div class='ctx'> </div><div class='ctx'> 	l3_type = hnae3_get_field(l234info, HNS3_RXD_L3ID_M,</div><div class='hunk'>@@ -2537,47 +2648,121 @@ static void hns3_set_gro_param(struct sk_buff *skb, u32 l234info,</div><div class='ctx'> 	else if (l3_type == HNS3_L3_TYPE_IPV6)</div><div class='ctx'> 		skb_shinfo(skb)-&gt;gso_type = SKB_GSO_TCPV6;</div><div class='ctx'> 	else</div><div class='del'>-		return;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_size = hnae3_get_field(bd_base_info,</div><div class='ctx'> 						    HNS3_RXD_GRO_SIZE_M,</div><div class='ctx'> 						    HNS3_RXD_GRO_SIZE_S);</div><div class='del'>-	if (skb_shinfo(skb)-&gt;gso_size)</div><div class='del'>-		tcp_gro_complete(skb);</div><div class='add'>+</div><div class='add'>+	return  hns3_gro_complete(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hns3_set_rx_skb_rss_type(struct hns3_enet_ring *ring,</div><div class='del'>-				     struct sk_buff *skb)</div><div class='add'>+				     struct sk_buff *skb, u32 rss_hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct hnae3_handle *handle = ring-&gt;tqp-&gt;handle;</div><div class='ctx'> 	enum pkt_hash_types rss_type;</div><div class='del'>-	struct hns3_desc *desc;</div><div class='del'>-	int last_bd;</div><div class='del'>-</div><div class='del'>-	/* When driver handle the rss type, ring-&gt;next_to_clean indicates the</div><div class='del'>-	 * first descriptor of next packet, need -1 here.</div><div class='del'>-	 */</div><div class='del'>-	last_bd = (ring-&gt;next_to_clean - 1 + ring-&gt;desc_num) % ring-&gt;desc_num;</div><div class='del'>-	desc = &amp;ring-&gt;desc[last_bd];</div><div class='ctx'> </div><div class='del'>-	if (le32_to_cpu(desc-&gt;rx.rss_hash))</div><div class='add'>+	if (rss_hash)</div><div class='ctx'> 		rss_type = handle-&gt;kinfo.rss_type;</div><div class='ctx'> 	else</div><div class='ctx'> 		rss_type = PKT_HASH_TYPE_NONE;</div><div class='ctx'> </div><div class='del'>-	skb_set_hash(skb, le32_to_cpu(desc-&gt;rx.rss_hash), rss_type);</div><div class='add'>+	skb_set_hash(skb, rss_hash, rss_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,</div><div class='del'>-			     struct sk_buff **out_skb)</div><div class='add'>+static int hns3_handle_bdinfo(struct hns3_enet_ring *ring, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = ring-&gt;tqp-&gt;handle-&gt;kinfo.netdev;</div><div class='ctx'> 	enum hns3_pkt_l2t_type l2_frame_type;</div><div class='add'>+	u32 bd_base_info, l234info, ol_info;</div><div class='add'>+	struct hns3_desc *desc;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int pre_ntc, ret;</div><div class='add'>+</div><div class='add'>+	/* bdinfo handled below is only valid on the last BD of the</div><div class='add'>+	 * current packet, and ring-&gt;next_to_clean indicates the first</div><div class='add'>+	 * descriptor of next packet, so need - 1 below.</div><div class='add'>+	 */</div><div class='add'>+	pre_ntc = ring-&gt;next_to_clean ? (ring-&gt;next_to_clean - 1) :</div><div class='add'>+					(ring-&gt;desc_num - 1);</div><div class='add'>+	desc = &amp;ring-&gt;desc[pre_ntc];</div><div class='add'>+	bd_base_info = le32_to_cpu(desc-&gt;rx.bd_base_info);</div><div class='add'>+	l234info = le32_to_cpu(desc-&gt;rx.l234_info);</div><div class='add'>+	ol_info = le32_to_cpu(desc-&gt;rx.ol_info);</div><div class='add'>+</div><div class='add'>+	/* Based on hw strategy, the tag offloaded will be stored at</div><div class='add'>+	 * ot_vlan_tag in two layer tag case, and stored at vlan_tag</div><div class='add'>+	 * in one layer tag case.</div><div class='add'>+	 */</div><div class='add'>+	if (netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX) {</div><div class='add'>+		u16 vlan_tag;</div><div class='add'>+</div><div class='add'>+		if (hns3_parse_vlan_tag(ring, desc, l234info, &amp;vlan_tag))</div><div class='add'>+			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),</div><div class='add'>+					       vlan_tag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!(bd_base_info &amp; BIT(HNS3_RXD_VLD_B)))) {</div><div class='add'>+		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+		ring-&gt;stats.non_vld_descs++;</div><div class='add'>+		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!desc-&gt;rx.pkt_len || (l234info &amp; (BIT(HNS3_RXD_TRUNCAT_B) |</div><div class='add'>+				  BIT(HNS3_RXD_L2E_B))))) {</div><div class='add'>+		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+		if (l234info &amp; BIT(HNS3_RXD_L2E_B))</div><div class='add'>+			ring-&gt;stats.l2_err++;</div><div class='add'>+		else</div><div class='add'>+			ring-&gt;stats.err_pkt_len++;</div><div class='add'>+		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* Do update ip stack process */</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='add'>+</div><div class='add'>+	/* This is needed in order to enable forwarding support */</div><div class='add'>+	ret = hns3_set_gro_and_checksum(ring, skb, l234info,</div><div class='add'>+					bd_base_info, ol_info);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+		ring-&gt;stats.rx_err_cnt++;</div><div class='add'>+		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	l2_frame_type = hnae3_get_field(l234info, HNS3_RXD_DMAC_M,</div><div class='add'>+					HNS3_RXD_DMAC_S);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+	ring-&gt;stats.rx_pkts++;</div><div class='add'>+	ring-&gt;stats.rx_bytes += len;</div><div class='add'>+</div><div class='add'>+	if (l2_frame_type == HNS3_L2_TYPE_MULTICAST)</div><div class='add'>+		ring-&gt;stats.rx_multicast++;</div><div class='add'>+</div><div class='add'>+	u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+</div><div class='add'>+	ring-&gt;tqp_vector-&gt;rx_group.total_bytes += len;</div><div class='add'>+</div><div class='add'>+	hns3_set_rx_skb_rss_type(ring, skb, le32_to_cpu(desc-&gt;rx.rss_hash));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,</div><div class='add'>+			     struct sk_buff **out_skb)</div><div class='add'>+{</div><div class='ctx'> 	struct sk_buff *skb = ring-&gt;skb;</div><div class='ctx'> 	struct hns3_desc_cb *desc_cb;</div><div class='ctx'> 	struct hns3_desc *desc;</div><div class='ctx'> 	u32 bd_base_info;</div><div class='del'>-	u32 l234info;</div><div class='ctx'> 	int length;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2637,64 +2822,13 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,</div><div class='ctx'> 		       ALIGN(ring-&gt;pull_len, sizeof(long)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	l234info = le32_to_cpu(desc-&gt;rx.l234_info);</div><div class='del'>-	bd_base_info = le32_to_cpu(desc-&gt;rx.bd_base_info);</div><div class='del'>-</div><div class='del'>-	/* Based on hw strategy, the tag offloaded will be stored at</div><div class='del'>-	 * ot_vlan_tag in two layer tag case, and stored at vlan_tag</div><div class='del'>-	 * in one layer tag case.</div><div class='del'>-	 */</div><div class='del'>-	if (netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX) {</div><div class='del'>-		u16 vlan_tag;</div><div class='del'>-</div><div class='del'>-		if (hns3_parse_vlan_tag(ring, desc, l234info, &amp;vlan_tag))</div><div class='del'>-			__vlan_hwaccel_put_tag(skb,</div><div class='del'>-					       htons(ETH_P_8021Q),</div><div class='del'>-					       vlan_tag);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!(bd_base_info &amp; BIT(HNS3_RXD_VLD_B)))) {</div><div class='del'>-		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='del'>-		ring-&gt;stats.non_vld_descs++;</div><div class='del'>-		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='del'>-</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely((!desc-&gt;rx.pkt_len) ||</div><div class='del'>-		     (l234info &amp; (BIT(HNS3_RXD_TRUNCAT_B) |</div><div class='del'>-				  BIT(HNS3_RXD_L2E_B))))) {</div><div class='del'>-		u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='del'>-		if (l234info &amp; BIT(HNS3_RXD_L2E_B))</div><div class='del'>-			ring-&gt;stats.l2_err++;</div><div class='del'>-		else</div><div class='del'>-			ring-&gt;stats.err_pkt_len++;</div><div class='del'>-		u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='del'>-</div><div class='add'>+	ret = hns3_handle_bdinfo(ring, skb);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	l2_frame_type = hnae3_get_field(l234info, HNS3_RXD_DMAC_M,</div><div class='del'>-					HNS3_RXD_DMAC_S);</div><div class='del'>-	u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='del'>-	if (l2_frame_type == HNS3_L2_TYPE_MULTICAST)</div><div class='del'>-		ring-&gt;stats.rx_multicast++;</div><div class='del'>-</div><div class='del'>-	ring-&gt;stats.rx_pkts++;</div><div class='del'>-	ring-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='del'>-</div><div class='del'>-	ring-&gt;tqp_vector-&gt;rx_group.total_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	/* This is needed in order to enable forwarding support */</div><div class='del'>-	hns3_set_gro_param(skb, l234info, bd_base_info);</div><div class='del'>-</div><div class='del'>-	hns3_rx_checksum(ring, skb, desc);</div><div class='ctx'> 	*out_skb = skb;</div><div class='del'>-	hns3_set_rx_skb_rss_type(ring, skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2704,9 +2838,8 @@ int hns3_clean_rx_ring(</div><div class='ctx'> 		void (*rx_fn)(struct hns3_enet_ring *, struct sk_buff *))</div><div class='ctx'> {</div><div class='ctx'> #define RCB_NOF_ALLOC_RX_BUFF_ONCE 16</div><div class='del'>-	struct net_device *netdev = ring-&gt;tqp-&gt;handle-&gt;kinfo.netdev;</div><div class='ctx'> 	int recv_pkts, recv_bds, clean_count, err;</div><div class='del'>-	int unused_count = hns3_desc_unused(ring) - ring-&gt;pending_buf;</div><div class='add'>+	int unused_count = hns3_desc_unused(ring);</div><div class='ctx'> 	struct sk_buff *skb = ring-&gt;skb;</div><div class='ctx'> 	int num;</div><div class='ctx'> </div><div class='hunk'>@@ -2715,6 +2848,7 @@ int hns3_clean_rx_ring(</div><div class='ctx'> </div><div class='ctx'> 	recv_pkts = 0, recv_bds = 0, clean_count = 0;</div><div class='ctx'> 	num -= unused_count;</div><div class='add'>+	unused_count -= ring-&gt;pending_buf;</div><div class='ctx'> </div><div class='ctx'> 	while (recv_pkts &lt; budget &amp;&amp; recv_bds &lt; num) {</div><div class='ctx'> 		/* Reuse or realloc buffers */</div><div class='hunk'>@@ -2741,8 +2875,6 @@ int hns3_clean_rx_ring(</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Do update ip stack process */</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='ctx'> 		rx_fn(ring, skb);</div><div class='ctx'> 		recv_bds += ring-&gt;pending_buf;</div><div class='ctx'> 		clean_count += ring-&gt;pending_buf;</div><div class='hunk'>@@ -2892,7 +3024,7 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct hns3_enet_tqp_vector *tqp_vector =</div><div class='ctx'> 		container_of(napi, struct hns3_enet_tqp_vector, napi);</div><div class='ctx'> 	bool clean_complete = true;</div><div class='del'>-	int rx_budget;</div><div class='add'>+	int rx_budget = budget;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_bit(HNS3_NIC_STATE_DOWN, &amp;priv-&gt;state))) {</div><div class='ctx'> 		napi_complete(napi);</div><div class='hunk'>@@ -2906,7 +3038,8 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		hns3_clean_tx_ring(ring);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure rx ring budget not smaller than 1 */</div><div class='del'>-	rx_budget = max(budget / tqp_vector-&gt;num_tqps, 1);</div><div class='add'>+	if (tqp_vector-&gt;num_tqps &gt; 1)</div><div class='add'>+		rx_budget = max(budget / tqp_vector-&gt;num_tqps, 1);</div><div class='ctx'> </div><div class='ctx'> 	hns3_for_each_ring(ring, tqp_vector-&gt;rx_group) {</div><div class='ctx'> 		int rx_cleaned = hns3_clean_rx_ring(ring, rx_budget,</div><div class='hunk'>@@ -3317,6 +3450,7 @@ err:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	devm_kfree(&amp;pdev-&gt;dev, priv-&gt;ring_data);</div><div class='add'>+	priv-&gt;ring_data = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3325,12 +3459,16 @@ static void hns3_put_ring_config(struct hns3_nic_priv *priv)</div><div class='ctx'> 	struct hnae3_handle *h = priv-&gt;ae_handle;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;ring_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; h-&gt;kinfo.num_tqps; i++) {</div><div class='ctx'> 		devm_kfree(priv-&gt;dev, priv-&gt;ring_data[i].ring);</div><div class='ctx'> 		devm_kfree(priv-&gt;dev,</div><div class='ctx'> 			   priv-&gt;ring_data[i + h-&gt;kinfo.num_tqps].ring);</div><div class='ctx'> 	}</div><div class='ctx'> 	devm_kfree(priv-&gt;dev, priv-&gt;ring_data);</div><div class='add'>+	priv-&gt;ring_data = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring)</div><div class='hunk'>@@ -3340,8 +3478,8 @@ static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring)</div><div class='ctx'> 	if (ring-&gt;desc_num &lt;= 0 || ring-&gt;buf_size &lt;= 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;desc_cb = kcalloc(ring-&gt;desc_num, sizeof(ring-&gt;desc_cb[0]),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	ring-&gt;desc_cb = devm_kcalloc(ring_to_dev(ring), ring-&gt;desc_num,</div><div class='add'>+				     sizeof(ring-&gt;desc_cb[0]), GFP_KERNEL);</div><div class='ctx'> 	if (!ring-&gt;desc_cb) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3362,7 +3500,7 @@ static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring)</div><div class='ctx'> out_with_desc:</div><div class='ctx'> 	hns3_free_desc(ring);</div><div class='ctx'> out_with_desc_cb:</div><div class='del'>-	kfree(ring-&gt;desc_cb);</div><div class='add'>+	devm_kfree(ring_to_dev(ring), ring-&gt;desc_cb);</div><div class='ctx'> 	ring-&gt;desc_cb = NULL;</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3371,7 +3509,7 @@ out:</div><div class='ctx'> static void hns3_fini_ring(struct hns3_enet_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hns3_free_desc(ring);</div><div class='del'>-	kfree(ring-&gt;desc_cb);</div><div class='add'>+	devm_kfree(ring_to_dev(ring), ring-&gt;desc_cb);</div><div class='ctx'> 	ring-&gt;desc_cb = NULL;</div><div class='ctx'> 	ring-&gt;next_to_clean = 0;</div><div class='ctx'> 	ring-&gt;next_to_use = 0;</div><div class='hunk'>@@ -3558,17 +3696,6 @@ static void hns3_del_all_fd_rules(struct net_device *netdev, bool clear_list)</div><div class='ctx'> 		h-&gt;ae_algo-&gt;ops-&gt;del_all_fd_entries(h, clear_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hns3_nic_set_priv_ops(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct hns3_nic_priv *priv = netdev_priv(netdev);</div><div class='del'>-</div><div class='del'>-	if ((netdev-&gt;features &amp; NETIF_F_TSO) ||</div><div class='del'>-	    (netdev-&gt;features &amp; NETIF_F_TSO6))</div><div class='del'>-		priv-&gt;ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int hns3_client_start(struct hnae3_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	if (!handle-&gt;ae_algo-&gt;ops-&gt;client_start)</div><div class='hunk'>@@ -3585,6 +3712,21 @@ static void hns3_client_stop(struct hnae3_handle *handle)</div><div class='ctx'> 	handle-&gt;ae_algo-&gt;ops-&gt;client_stop(handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hns3_info_show(struct hns3_nic_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_knic_private_info *kinfo = &amp;priv-&gt;ae_handle-&gt;kinfo;</div><div class='add'>+</div><div class='add'>+	dev_info(priv-&gt;dev, "MAC address: %pM\n", priv-&gt;netdev-&gt;dev_addr);</div><div class='add'>+	dev_info(priv-&gt;dev, "Task queue pairs numbers: %d\n", kinfo-&gt;num_tqps);</div><div class='add'>+	dev_info(priv-&gt;dev, "RSS size: %d\n", kinfo-&gt;rss_size);</div><div class='add'>+	dev_info(priv-&gt;dev, "Allocated RSS size: %d\n", kinfo-&gt;req_rss_size);</div><div class='add'>+	dev_info(priv-&gt;dev, "RX buffer length: %d\n", kinfo-&gt;rx_buf_len);</div><div class='add'>+	dev_info(priv-&gt;dev, "Desc num per TX queue: %d\n", kinfo-&gt;num_tx_desc);</div><div class='add'>+	dev_info(priv-&gt;dev, "Desc num per RX queue: %d\n", kinfo-&gt;num_rx_desc);</div><div class='add'>+	dev_info(priv-&gt;dev, "Total number of enabled TCs: %d\n", kinfo-&gt;num_tc);</div><div class='add'>+	dev_info(priv-&gt;dev, "Max mtu size: %d\n", priv-&gt;netdev-&gt;max_mtu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hns3_client_init(struct hnae3_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = handle-&gt;pdev;</div><div class='hunk'>@@ -3606,6 +3748,8 @@ static int hns3_client_init(struct hnae3_handle *handle)</div><div class='ctx'> 	priv-&gt;tx_timeout_count = 0;</div><div class='ctx'> 	set_bit(HNS3_NIC_STATE_DOWN, &amp;priv-&gt;state);</div><div class='ctx'> </div><div class='add'>+	handle-&gt;msg_enable = netif_msg_init(debug, DEFAULT_MSG_LEVEL);</div><div class='add'>+</div><div class='ctx'> 	handle-&gt;kinfo.netdev = netdev;</div><div class='ctx'> 	handle-&gt;priv = (void *)priv;</div><div class='ctx'> </div><div class='hunk'>@@ -3618,7 +3762,6 @@ static int hns3_client_init(struct hnae3_handle *handle)</div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;hns3_nic_netdev_ops;</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	hns3_ethtool_set_ops(netdev);</div><div class='del'>-	hns3_nic_set_priv_ops(netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Carrier off reporting is important to ethtool even BEFORE open */</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='hunk'>@@ -3672,6 +3815,9 @@ static int hns3_client_init(struct hnae3_handle *handle)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HNS3_NIC_STATE_INITED, &amp;priv-&gt;state);</div><div class='ctx'> </div><div class='add'>+	if (netif_msg_drv(handle))</div><div class='add'>+		hns3_info_show(priv);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_client_start:</div><div class='hunk'>@@ -3698,13 +3844,13 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)</div><div class='ctx'> 	struct hns3_nic_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	hns3_client_stop(handle);</div><div class='del'>-</div><div class='ctx'> 	hns3_remove_hw_addr(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (netdev-&gt;reg_state != NETREG_UNINITIALIZED)</div><div class='ctx'> 		unregister_netdev(netdev);</div><div class='ctx'> </div><div class='add'>+	hns3_client_stop(handle);</div><div class='add'>+</div><div class='ctx'> 	if (!test_and_clear_bit(HNS3_NIC_STATE_INITED, &amp;priv-&gt;state)) {</div><div class='ctx'> 		netdev_warn(netdev, "already uninitialized\n");</div><div class='ctx'> 		goto out_netdev_free;</div><div class='hunk'>@@ -3730,8 +3876,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)</div><div class='ctx'> </div><div class='ctx'> 	hns3_dbg_uninit(handle);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ring_data = NULL;</div><div class='del'>-</div><div class='ctx'> out_netdev_free:</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> }</div><div class='hunk'>@@ -3746,11 +3890,13 @@ static void hns3_link_status_change(struct hnae3_handle *handle, bool linkup)</div><div class='ctx'> 	if (linkup) {</div><div class='ctx'> 		netif_carrier_on(netdev);</div><div class='ctx'> 		netif_tx_wake_all_queues(netdev);</div><div class='del'>-		netdev_info(netdev, "link up\n");</div><div class='add'>+		if (netif_msg_link(handle))</div><div class='add'>+			netdev_info(netdev, "link up\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netif_carrier_off(netdev);</div><div class='ctx'> 		netif_tx_stop_all_queues(netdev);</div><div class='del'>-		netdev_info(netdev, "link down\n");</div><div class='add'>+		if (netif_msg_link(handle))</div><div class='add'>+			netdev_info(netdev, "link down\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3774,12 +3920,13 @@ static int hns3_recover_hw_addr(struct net_device *ndev)</div><div class='ctx'> 	struct netdev_hw_addr *ha, *tmp;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	netif_addr_lock_bh(ndev);</div><div class='ctx'> 	/* go through and sync uc_addr entries to the device */</div><div class='ctx'> 	list = &amp;ndev-&gt;uc;</div><div class='ctx'> 	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list) {</div><div class='ctx'> 		ret = hns3_nic_uc_sync(ndev, ha-&gt;addr);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* go through and sync mc_addr entries to the device */</div><div class='hunk'>@@ -3787,9 +3934,11 @@ static int hns3_recover_hw_addr(struct net_device *ndev)</div><div class='ctx'> 	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list) {</div><div class='ctx'> 		ret = hns3_nic_mc_sync(ndev, ha-&gt;addr);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	netif_addr_unlock_bh(ndev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3800,6 +3949,7 @@ static void hns3_remove_hw_addr(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	hns3_nic_uc_unsync(netdev, netdev-&gt;dev_addr);</div><div class='ctx'> </div><div class='add'>+	netif_addr_lock_bh(netdev);</div><div class='ctx'> 	/* go through and unsync uc_addr entries to the device */</div><div class='ctx'> 	list = &amp;netdev-&gt;uc;</div><div class='ctx'> 	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list)</div><div class='hunk'>@@ -3810,6 +3960,8 @@ static void hns3_remove_hw_addr(struct net_device *netdev)</div><div class='ctx'> 	list_for_each_entry_safe(ha, tmp, &amp;list-&gt;list, list)</div><div class='ctx'> 		if (ha-&gt;refcount &gt; 1)</div><div class='ctx'> 			hns3_nic_mc_unsync(netdev, ha-&gt;addr);</div><div class='add'>+</div><div class='add'>+	netif_addr_unlock_bh(netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hns3_clear_tx_ring(struct hns3_enet_ring *ring)</div><div class='hunk'>@@ -3851,6 +4003,13 @@ static int hns3_clear_rx_ring(struct hns3_enet_ring *ring)</div><div class='ctx'> 		ring_ptr_move_fw(ring, next_to_use);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Free the pending skb in rx ring */</div><div class='add'>+	if (ring-&gt;skb) {</div><div class='add'>+		dev_kfree_skb_any(ring-&gt;skb);</div><div class='add'>+		ring-&gt;skb = NULL;</div><div class='add'>+		ring-&gt;pending_buf = 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='hunk'>@@ -4049,18 +4208,24 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_uninit_vector;</div><div class='ctx'> </div><div class='add'>+	ret = hns3_client_start(handle);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "hns3_client_start fail! ret=%d\n", ret);</div><div class='add'>+		goto err_uninit_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	set_bit(HNS3_NIC_STATE_INITED, &amp;priv-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='add'>+err_uninit_ring:</div><div class='add'>+	hns3_uninit_all_ring(priv);</div><div class='ctx'> err_uninit_vector:</div><div class='ctx'> 	hns3_nic_uninit_vector_data(priv);</div><div class='del'>-	priv-&gt;ring_data = NULL;</div><div class='ctx'> err_dealloc_vector:</div><div class='ctx'> 	hns3_nic_dealloc_vector_data(priv);</div><div class='ctx'> err_put_ring:</div><div class='ctx'> 	hns3_put_ring_config(priv);</div><div class='del'>-	priv-&gt;ring_data = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4102,7 +4267,7 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle)</div><div class='ctx'> 	struct hns3_nic_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(HNS3_NIC_STATE_INITED, &amp;priv-&gt;state)) {</div><div class='add'>+	if (!test_and_clear_bit(HNS3_NIC_STATE_INITED, &amp;priv-&gt;state)) {</div><div class='ctx'> 		netdev_warn(netdev, "already uninitialized\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4122,9 +4287,6 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle)</div><div class='ctx'> 		netdev_err(netdev, "uninit ring error\n");</div><div class='ctx'> </div><div class='ctx'> 	hns3_put_ring_config(priv);</div><div class='del'>-	priv-&gt;ring_data = NULL;</div><div class='del'>-</div><div class='del'>-	clear_bit(HNS3_NIC_STATE_INITED, &amp;priv-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h<br/>index 1db0bd41d209..c14480f9b625 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.h</a></div><div class='hunk'>@@ -42,8 +42,10 @@ enum hns3_nic_state {</div><div class='ctx'> #define HNS3_RING_TX_RING_HEAD_REG		0x0005C</div><div class='ctx'> #define HNS3_RING_TX_RING_FBDNUM_REG		0x00060</div><div class='ctx'> #define HNS3_RING_TX_RING_OFFSET_REG		0x00064</div><div class='add'>+#define HNS3_RING_TX_RING_EBDNUM_REG		0x00068</div><div class='ctx'> #define HNS3_RING_TX_RING_PKTNUM_RECORD_REG	0x0006C</div><div class='del'>-</div><div class='add'>+#define HNS3_RING_TX_RING_EBD_OFFSET_REG	0x00070</div><div class='add'>+#define HNS3_RING_TX_RING_BD_ERR_REG		0x00074</div><div class='ctx'> #define HNS3_RING_PREFETCH_EN_REG		0x0007C</div><div class='ctx'> #define HNS3_RING_CFG_VF_NUM_REG		0x00080</div><div class='ctx'> #define HNS3_RING_ASID_REG			0x0008C</div><div class='hunk'>@@ -193,7 +195,6 @@ enum hns3_nic_state {</div><div class='ctx'> #define HNS3_VECTOR_INITED			1</div><div class='ctx'> </div><div class='ctx'> #define HNS3_MAX_BD_SIZE			65535</div><div class='del'>-#define HNS3_MAX_BD_SIZE_OFFSET		16</div><div class='ctx'> #define HNS3_MAX_BD_PER_FRAG			8</div><div class='ctx'> #define HNS3_MAX_BD_PER_PKT			MAX_SKB_FRAGS</div><div class='ctx'> </div><div class='hunk'>@@ -375,6 +376,7 @@ struct ring_stats {</div><div class='ctx'> 			u64 tx_err_cnt;</div><div class='ctx'> 			u64 restart_queue;</div><div class='ctx'> 			u64 tx_busy;</div><div class='add'>+			u64 tx_copy;</div><div class='ctx'> 		};</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u64 rx_pkts;</div><div class='hunk'>@@ -387,6 +389,7 @@ struct ring_stats {</div><div class='ctx'> 			u64 l2_err;</div><div class='ctx'> 			u64 l3l4_csum_err;</div><div class='ctx'> 			u64 rx_multicast;</div><div class='add'>+			u64 non_reuse_pg;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='hunk'>@@ -398,7 +401,6 @@ struct hns3_enet_ring {</div><div class='ctx'> 	struct hns3_enet_ring *next;</div><div class='ctx'> 	struct hns3_enet_tqp_vector *tqp_vector;</div><div class='ctx'> 	struct hnae3_queue *tqp;</div><div class='del'>-	char ring_name[HNS3_RING_NAME_LEN];</div><div class='ctx'> 	struct device *dev; /* will be used for DMA mapping of descriptors */</div><div class='ctx'> </div><div class='ctx'> 	/* statistic */</div><div class='hunk'>@@ -408,9 +410,6 @@ struct hns3_enet_ring {</div><div class='ctx'> 	dma_addr_t desc_dma_addr;</div><div class='ctx'> 	u32 buf_size;       /* size for hnae_desc-&gt;addr, preset by AE */</div><div class='ctx'> 	u16 desc_num;       /* total number of desc */</div><div class='del'>-	u16 max_desc_num_per_pkt;</div><div class='del'>-	u16 max_raw_data_sz_per_desc;</div><div class='del'>-	u16 max_pkt_size;</div><div class='ctx'> 	int next_to_use;    /* idx of next spare desc */</div><div class='ctx'> </div><div class='ctx'> 	/* idx of lastest sent desc, the ring is empty when equal to</div><div class='hunk'>@@ -424,9 +423,6 @@ struct hns3_enet_ring {</div><div class='ctx'> </div><div class='ctx'> 	u32 flag;          /* ring attribute */</div><div class='ctx'> </div><div class='del'>-	int numa_node;</div><div class='del'>-	cpumask_t affinity_mask;</div><div class='del'>-</div><div class='ctx'> 	int pending_buf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct sk_buff *tail_skb;</div><div class='hunk'>@@ -443,11 +439,6 @@ struct hns3_nic_ring_data {</div><div class='ctx'> 	void (*fini_process)(struct hns3_nic_ring_data *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hns3_nic_ops {</div><div class='del'>-	int (*maybe_stop_tx)(struct sk_buff **out_skb,</div><div class='del'>-			     int *bnum, struct hns3_enet_ring *ring);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum hns3_flow_level_range {</div><div class='ctx'> 	HNS3_FLOW_LOW = 0,</div><div class='ctx'> 	HNS3_FLOW_MID = 1,</div><div class='hunk'>@@ -537,7 +528,6 @@ struct hns3_nic_priv {</div><div class='ctx'> 	u32 port_id;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	struct hns3_nic_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * the cb for nic to manage the ring buffer, the first half of the</div><div class='hunk'>@@ -578,18 +568,16 @@ union l4_hdr_info {</div><div class='ctx'> 	unsigned char *hdr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* the distance between [begin, end) in a ring buffer</div><div class='del'>- * note: there is a unuse slot between the begin and the end</div><div class='del'>- */</div><div class='del'>-static inline int ring_dist(struct hns3_enet_ring *ring, int begin, int end)</div><div class='del'>-{</div><div class='del'>-	return (end - begin + ring-&gt;desc_num) % ring-&gt;desc_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int ring_space(struct hns3_enet_ring *ring)</div><div class='ctx'> {</div><div class='del'>-	return ring-&gt;desc_num -</div><div class='del'>-		ring_dist(ring, ring-&gt;next_to_clean, ring-&gt;next_to_use) - 1;</div><div class='add'>+	/* This smp_load_acquire() pairs with smp_store_release() in</div><div class='add'>+	 * hns3_nic_reclaim_one_desc called by hns3_clean_tx_ring.</div><div class='add'>+	 */</div><div class='add'>+	int begin = smp_load_acquire(&amp;ring-&gt;next_to_clean);</div><div class='add'>+	int end = READ_ONCE(ring-&gt;next_to_use);</div><div class='add'>+</div><div class='add'>+	return ((end &gt;= begin) ? (ring-&gt;desc_num - end + begin) :</div><div class='add'>+			(begin - end)) - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int is_ring_empty(struct hns3_enet_ring *ring)</div><div class='hunk'>@@ -634,7 +622,7 @@ static inline bool hns3_nic_resetting(struct net_device *netdev)</div><div class='ctx'> #define hnae3_queue_xmit(tqp, buf_num) writel_relaxed(buf_num, \</div><div class='ctx'> 		(tqp)-&gt;io_base + HNS3_RING_TX_RING_TAIL_REG)</div><div class='ctx'> </div><div class='del'>-#define ring_to_dev(ring) (&amp;(ring)-&gt;tqp-&gt;handle-&gt;pdev-&gt;dev)</div><div class='add'>+#define ring_to_dev(ring) ((ring)-&gt;dev)</div><div class='ctx'> </div><div class='ctx'> #define ring_to_dma_dir(ring) (HNAE3_IS_TX_RING(ring) ? \</div><div class='ctx'> 	DMA_TO_DEVICE : DMA_FROM_DEVICE)</div><div class='hunk'>@@ -667,6 +655,7 @@ int hns3_init_all_ring(struct hns3_nic_priv *priv);</div><div class='ctx'> int hns3_uninit_all_ring(struct hns3_nic_priv *priv);</div><div class='ctx'> int hns3_nic_reset_all_ring(struct hnae3_handle *h);</div><div class='ctx'> netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev);</div><div class='add'>+bool hns3_is_phys_func(struct pci_dev *pdev);</div><div class='ctx'> int hns3_clean_rx_ring(</div><div class='ctx'> 		struct hns3_enet_ring *ring, int budget,</div><div class='ctx'> 		void (*rx_fn)(struct hns3_enet_ring *, struct sk_buff *));</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c<br/>index 359d4731fb2d..d1588ea6132c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@ static const struct hns3_stats hns3_txq_stats[] = {</div><div class='ctx'> 	HNS3_TQP_STAT("errors", tx_err_cnt),</div><div class='ctx'> 	HNS3_TQP_STAT("wake", restart_queue),</div><div class='ctx'> 	HNS3_TQP_STAT("busy", tx_busy),</div><div class='add'>+	HNS3_TQP_STAT("copy", tx_copy),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HNS3_TXQ_STATS_COUNT ARRAY_SIZE(hns3_txq_stats)</div><div class='hunk'>@@ -48,6 +49,7 @@ static const struct hns3_stats hns3_rxq_stats[] = {</div><div class='ctx'> 	HNS3_TQP_STAT("l2_err", l2_err),</div><div class='ctx'> 	HNS3_TQP_STAT("l3l4_csum_err", l3l4_csum_err),</div><div class='ctx'> 	HNS3_TQP_STAT("multicast", rx_multicast),</div><div class='add'>+	HNS3_TQP_STAT("non_reuse_pg", non_reuse_pg),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HNS3_RXQ_STATS_COUNT ARRAY_SIZE(hns3_rxq_stats)</div><div class='hunk'>@@ -483,6 +485,11 @@ static void hns3_get_stats(struct net_device *netdev,</div><div class='ctx'> 	struct hnae3_handle *h = hns3_get_handle(netdev);</div><div class='ctx'> 	u64 *p = data;</div><div class='ctx'> </div><div class='add'>+	if (hns3_nic_resetting(netdev)) {</div><div class='add'>+		netdev_err(netdev, "dev resetting, could not get stats\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!h-&gt;ae_algo-&gt;ops-&gt;get_stats || !h-&gt;ae_algo-&gt;ops-&gt;update_stats) {</div><div class='ctx'> 		netdev_err(netdev, "could not get any statistics\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -599,6 +606,7 @@ static int hns3_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct hnae3_handle *h = hns3_get_handle(netdev);</div><div class='ctx'> 	const struct hnae3_ae_ops *ops;</div><div class='add'>+	u8 module_type;</div><div class='ctx'> 	u8 media_type;</div><div class='ctx'> 	u8 link_stat;</div><div class='ctx'> </div><div class='hunk'>@@ -607,7 +615,7 @@ static int hns3_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	ops = h-&gt;ae_algo-&gt;ops;</div><div class='ctx'> 	if (ops-&gt;get_media_type)</div><div class='del'>-		ops-&gt;get_media_type(h, &amp;media_type);</div><div class='add'>+		ops-&gt;get_media_type(h, &amp;media_type, &amp;module_type);</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -617,7 +625,15 @@ static int hns3_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 		hns3_get_ksettings(h, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HNAE3_MEDIA_TYPE_FIBER:</div><div class='del'>-		cmd-&gt;base.port = PORT_FIBRE;</div><div class='add'>+		if (module_type == HNAE3_MODULE_TYPE_CR)</div><div class='add'>+			cmd-&gt;base.port = PORT_DA;</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;base.port = PORT_FIBRE;</div><div class='add'>+</div><div class='add'>+		hns3_get_ksettings(h, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case HNAE3_MEDIA_TYPE_BACKPLANE:</div><div class='add'>+		cmd-&gt;base.port = PORT_NONE;</div><div class='ctx'> 		hns3_get_ksettings(h, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HNAE3_MEDIA_TYPE_COPPER:</div><div class='hunk'>@@ -645,14 +661,79 @@ static int hns3_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hns3_check_ksettings_param(struct net_device *netdev,</div><div class='add'>+				      const struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *handle = hns3_get_handle(netdev);</div><div class='add'>+	const struct hnae3_ae_ops *ops = handle-&gt;ae_algo-&gt;ops;</div><div class='add'>+	u8 module_type = HNAE3_MODULE_TYPE_UNKNOWN;</div><div class='add'>+	u8 media_type = HNAE3_MEDIA_TYPE_UNKNOWN;</div><div class='add'>+	u8 autoneg;</div><div class='add'>+	u32 speed;</div><div class='add'>+	u8 duplex;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;get_ksettings_an_result) {</div><div class='add'>+		ops-&gt;get_ksettings_an_result(handle, &amp;autoneg, &amp;speed, &amp;duplex);</div><div class='add'>+		if (cmd-&gt;base.autoneg == autoneg &amp;&amp; cmd-&gt;base.speed == speed &amp;&amp;</div><div class='add'>+		    cmd-&gt;base.duplex == duplex)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;get_media_type)</div><div class='add'>+		ops-&gt;get_media_type(handle, &amp;media_type, &amp;module_type);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;base.duplex != DUPLEX_FULL &amp;&amp;</div><div class='add'>+	    media_type != HNAE3_MEDIA_TYPE_COPPER) {</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "only copper port supports half duplex!");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;check_port_speed) {</div><div class='add'>+		ret = ops-&gt;check_port_speed(handle, cmd-&gt;base.speed);</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(netdev, "unsupported speed\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='ctx'> static int hns3_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 				   const struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct hnae3_handle *handle = hns3_get_handle(netdev);</div><div class='add'>+	const struct hnae3_ae_ops *ops = handle-&gt;ae_algo-&gt;ops;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Chip don't support this mode. */</div><div class='add'>+	if (cmd-&gt;base.speed == SPEED_1000 &amp;&amp; cmd-&gt;base.duplex == DUPLEX_HALF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* Only support ksettings_set for netdev with phy attached for now */</div><div class='ctx'> 	if (netdev-&gt;phydev)</div><div class='ctx'> 		return phy_ethtool_ksettings_set(netdev-&gt;phydev, cmd);</div><div class='ctx'> </div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	if (handle-&gt;pdev-&gt;revision == 0x20)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = hns3_check_ksettings_param(netdev, cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;set_autoneg) {</div><div class='add'>+		ret = ops-&gt;set_autoneg(handle, cmd-&gt;base.autoneg);</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 (ops-&gt;cfg_mac_speed_dup_h)</div><div class='add'>+		ret = ops-&gt;cfg_mac_speed_dup_h(handle, cmd-&gt;base.speed,</div><div class='add'>+					       cmd-&gt;base.duplex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 hns3_get_rss_key_size(struct net_device *netdev)</div><div class='hunk'>@@ -857,19 +938,36 @@ static int hns3_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)</div><div class='ctx'> </div><div class='ctx'> static int hns3_nway_reset(struct net_device *netdev)</div><div class='ctx'> {</div><div class='add'>+	struct hnae3_handle *handle = hns3_get_handle(netdev);</div><div class='add'>+	const struct hnae3_ae_ops *ops = handle-&gt;ae_algo-&gt;ops;</div><div class='ctx'> 	struct phy_device *phy = netdev-&gt;phydev;</div><div class='add'>+	int autoneg;</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'>-	/* Only support nway_reset for netdev with phy attached for now */</div><div class='del'>-	if (!phy)</div><div class='add'>+	if (hns3_nic_resetting(netdev)) {</div><div class='add'>+		netdev_err(netdev, "dev resetting!");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_autoneg || !ops-&gt;restart_autoneg)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;autoneg != AUTONEG_ENABLE)</div><div class='add'>+	autoneg = ops-&gt;get_autoneg(handle);</div><div class='add'>+	if (autoneg != AUTONEG_ENABLE) {</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "Autoneg is off, don't support to restart it\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy)</div><div class='add'>+		return genphy_restart_aneg(phy);</div><div class='add'>+</div><div class='add'>+	if (handle-&gt;pdev-&gt;revision == 0x20)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return genphy_restart_aneg(phy);</div><div class='add'>+	return ops-&gt;restart_autoneg(handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hns3_get_channels(struct net_device *netdev,</div><div class='hunk'>@@ -1101,6 +1199,95 @@ static int hns3_set_phys_id(struct net_device *netdev,</div><div class='ctx'> 	return h-&gt;ae_algo-&gt;ops-&gt;set_led_id(h, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 hns3_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *h = hns3_get_handle(netdev);</div><div class='add'>+</div><div class='add'>+	return h-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hns3_set_msglevel(struct net_device *netdev, u32 msg_level)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *h = hns3_get_handle(netdev);</div><div class='add'>+</div><div class='add'>+	h-&gt;msg_enable = msg_level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Translate local fec value into ethtool value. */</div><div class='add'>+static unsigned int loc_to_eth_fec(u8 loc_fec)</div><div class='add'>+{</div><div class='add'>+	u32 eth_fec = 0;</div><div class='add'>+</div><div class='add'>+	if (loc_fec &amp; BIT(HNAE3_FEC_AUTO))</div><div class='add'>+		eth_fec |= ETHTOOL_FEC_AUTO;</div><div class='add'>+	if (loc_fec &amp; BIT(HNAE3_FEC_RS))</div><div class='add'>+		eth_fec |= ETHTOOL_FEC_RS;</div><div class='add'>+	if (loc_fec &amp; BIT(HNAE3_FEC_BASER))</div><div class='add'>+		eth_fec |= ETHTOOL_FEC_BASER;</div><div class='add'>+</div><div class='add'>+	/* if nothing is set, then FEC is off */</div><div class='add'>+	if (!eth_fec)</div><div class='add'>+		eth_fec = ETHTOOL_FEC_OFF;</div><div class='add'>+</div><div class='add'>+	return eth_fec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Translate ethtool fec value into local value. */</div><div class='add'>+static unsigned int eth_to_loc_fec(unsigned int eth_fec)</div><div class='add'>+{</div><div class='add'>+	u32 loc_fec = 0;</div><div class='add'>+</div><div class='add'>+	if (eth_fec &amp; ETHTOOL_FEC_OFF)</div><div class='add'>+		return loc_fec;</div><div class='add'>+</div><div class='add'>+	if (eth_fec &amp; ETHTOOL_FEC_AUTO)</div><div class='add'>+		loc_fec |= BIT(HNAE3_FEC_AUTO);</div><div class='add'>+	if (eth_fec &amp; ETHTOOL_FEC_RS)</div><div class='add'>+		loc_fec |= BIT(HNAE3_FEC_RS);</div><div class='add'>+	if (eth_fec &amp; ETHTOOL_FEC_BASER)</div><div class='add'>+		loc_fec |= BIT(HNAE3_FEC_BASER);</div><div class='add'>+</div><div class='add'>+	return loc_fec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hns3_get_fecparam(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_fecparam *fec)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *handle = hns3_get_handle(netdev);</div><div class='add'>+	const struct hnae3_ae_ops *ops = handle-&gt;ae_algo-&gt;ops;</div><div class='add'>+	u8 fec_ability;</div><div class='add'>+	u8 fec_mode;</div><div class='add'>+</div><div class='add'>+	if (handle-&gt;pdev-&gt;revision == 0x20)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;get_fec)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ops-&gt;get_fec(handle, &amp;fec_ability, &amp;fec_mode);</div><div class='add'>+</div><div class='add'>+	fec-&gt;fec = loc_to_eth_fec(fec_ability);</div><div class='add'>+	fec-&gt;active_fec = loc_to_eth_fec(fec_mode);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hns3_set_fecparam(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_fecparam *fec)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *handle = hns3_get_handle(netdev);</div><div class='add'>+	const struct hnae3_ae_ops *ops = handle-&gt;ae_algo-&gt;ops;</div><div class='add'>+	u32 fec_mode;</div><div class='add'>+</div><div class='add'>+	if (handle-&gt;pdev-&gt;revision == 0x20)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;set_fec)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	fec_mode = eth_to_loc_fec(fec-&gt;fec);</div><div class='add'>+	return ops-&gt;set_fec(handle, fec_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops hns3vf_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo = hns3_get_drvinfo,</div><div class='ctx'> 	.get_ringparam = hns3_get_ringparam,</div><div class='hunk'>@@ -1121,6 +1308,8 @@ static const struct ethtool_ops hns3vf_ethtool_ops = {</div><div class='ctx'> 	.get_regs_len = hns3_get_regs_len,</div><div class='ctx'> 	.get_regs = hns3_get_regs,</div><div class='ctx'> 	.get_link = hns3_get_link,</div><div class='add'>+	.get_msglevel = hns3_get_msglevel,</div><div class='add'>+	.set_msglevel = hns3_set_msglevel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops hns3_ethtool_ops = {</div><div class='hunk'>@@ -1150,6 +1339,10 @@ static const struct ethtool_ops hns3_ethtool_ops = {</div><div class='ctx'> 	.get_regs_len = hns3_get_regs_len,</div><div class='ctx'> 	.get_regs = hns3_get_regs,</div><div class='ctx'> 	.set_phys_id = hns3_set_phys_id,</div><div class='add'>+	.get_msglevel = hns3_get_msglevel,</div><div class='add'>+	.set_msglevel = hns3_set_msglevel,</div><div class='add'>+	.get_fecparam = hns3_get_fecparam,</div><div class='add'>+	.set_fecparam = hns3_set_fecparam,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void hns3_ethtool_set_ops(struct net_device *netdev)</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile<br/>index fffe8c1c45d3..0fb61d440d3b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> # Makefile for the HISILICON network device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3</div><div class='add'>+ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HNS3_HCLGE) += hclge.o</div><div class='ctx'> hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_err.o  hclge_debugfs.o</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c<br/>index 3a093a92eac5..fbd904e3077c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c</a></div><div class='hunk'>@@ -355,7 +355,7 @@ int hclge_cmd_init(struct hclge_dev *hdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;hdev-&gt;hw.cmq.csq.lock);</div><div class='del'>-	spin_lock_bh(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='add'>+	spin_lock(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;hw.cmq.csq.next_to_clean = 0;</div><div class='ctx'> 	hdev-&gt;hw.cmq.csq.next_to_use = 0;</div><div class='hunk'>@@ -364,7 +364,7 @@ int hclge_cmd_init(struct hclge_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hclge_cmd_init_regs(&amp;hdev-&gt;hw);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='add'>+	spin_unlock(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='ctx'> 	spin_unlock_bh(&amp;hdev-&gt;hw.cmq.csq.lock);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='hunk'>@@ -373,21 +373,26 @@ int hclge_cmd_init(struct hclge_dev *hdev)</div><div class='ctx'> 	 * reset may happen when lower level reset is being processed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((hclge_is_reset_pending(hdev))) {</div><div class='del'>-		set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_cmd_init;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = hclge_cmd_query_firmware_version(&amp;hdev-&gt;hw, &amp;version);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"firmware version query failed %d\n", ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_cmd_init;</div><div class='ctx'> 	}</div><div class='ctx'> 	hdev-&gt;fw_version = version;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "The firmware version is %08x\n", version);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_cmd_init:</div><div class='add'>+	set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclge_cmd_uninit_regs(struct hclge_hw *hw)</div><div class='hunk'>@@ -411,7 +416,7 @@ static void hclge_destroy_queue(struct hclge_cmq_ring *ring)</div><div class='ctx'> 	spin_unlock(&amp;ring-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hclge_destroy_cmd_queue(struct hclge_hw *hw)</div><div class='add'>+static void hclge_destroy_cmd_queue(struct hclge_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	hclge_destroy_queue(&amp;hw-&gt;cmq.csq);</div><div class='ctx'> 	hclge_destroy_queue(&amp;hw-&gt;cmq.crq);</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h<br/>index 3714733c96d9..d79a209b80f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h</a></div><div class='hunk'>@@ -109,7 +109,11 @@ enum hclge_opcode_type {</div><div class='ctx'> 	HCLGE_OPC_QUERY_LINK_STATUS	= 0x0307,</div><div class='ctx'> 	HCLGE_OPC_CONFIG_MAX_FRM_SIZE	= 0x0308,</div><div class='ctx'> 	HCLGE_OPC_CONFIG_SPEED_DUP	= 0x0309,</div><div class='add'>+	HCLGE_OPC_QUERY_MAC_TNL_INT	= 0x0310,</div><div class='add'>+	HCLGE_OPC_MAC_TNL_INT_EN	= 0x0311,</div><div class='add'>+	HCLGE_OPC_CLEAR_MAC_TNL_INT	= 0x0312,</div><div class='ctx'> 	HCLGE_OPC_SERDES_LOOPBACK       = 0x0315,</div><div class='add'>+	HCLGE_OPC_CONFIG_FEC_MODE	= 0x031A,</div><div class='ctx'> </div><div class='ctx'> 	/* PFC/Pause commands */</div><div class='ctx'> 	HCLGE_OPC_CFG_MAC_PAUSE_EN      = 0x0701,</div><div class='hunk'>@@ -237,8 +241,11 @@ enum hclge_opcode_type {</div><div class='ctx'> 	/* Led command */</div><div class='ctx'> 	HCLGE_OPC_LED_STATUS_CFG	= 0xB000,</div><div class='ctx'> </div><div class='add'>+	/* NCL config command */</div><div class='add'>+	HCLGE_OPC_QUERY_NCL_CONFIG	= 0x7011,</div><div class='add'>+</div><div class='ctx'> 	/* SFP command */</div><div class='del'>-	HCLGE_OPC_SFP_GET_SPEED		= 0x7104,</div><div class='add'>+	HCLGE_OPC_GET_SFP_INFO		= 0x7104,</div><div class='ctx'> </div><div class='ctx'> 	/* Error INT commands */</div><div class='ctx'> 	HCLGE_MAC_COMMON_INT_EN		= 0x030E,</div><div class='hunk'>@@ -593,9 +600,30 @@ struct hclge_config_auto_neg_cmd {</div><div class='ctx'> 	u8      rsv[20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hclge_sfp_speed_cmd {</div><div class='del'>-	__le32	sfp_speed;</div><div class='del'>-	u32	rsv[5];</div><div class='add'>+struct hclge_sfp_info_cmd {</div><div class='add'>+	__le32 speed;</div><div class='add'>+	u8 query_type; /* 0: sfp speed, 1: active speed */</div><div class='add'>+	u8 active_fec;</div><div class='add'>+	u8 autoneg; /* autoneg state */</div><div class='add'>+	u8 autoneg_ability; /* whether support autoneg */</div><div class='add'>+	__le32 speed_ability; /* speed ability for current media */</div><div class='add'>+	__le32 module_type;</div><div class='add'>+	u8 rsv[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HCLGE_MAC_CFG_FEC_AUTO_EN_B	0</div><div class='add'>+#define HCLGE_MAC_CFG_FEC_MODE_S	1</div><div class='add'>+#define HCLGE_MAC_CFG_FEC_MODE_M	GENMASK(3, 1)</div><div class='add'>+#define HCLGE_MAC_CFG_FEC_SET_DEF_B	0</div><div class='add'>+#define HCLGE_MAC_CFG_FEC_CLR_DEF_B	1</div><div class='add'>+</div><div class='add'>+#define HCLGE_MAC_FEC_OFF		0</div><div class='add'>+#define HCLGE_MAC_FEC_BASER		1</div><div class='add'>+#define HCLGE_MAC_FEC_RS		2</div><div class='add'>+struct hclge_config_fec_cmd {</div><div class='add'>+	u8 fec_mode;</div><div class='add'>+	u8 default_config;</div><div class='add'>+	u8 rsv[22];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HCLGE_MAC_UPLINK_PORT		0x100</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c<br/>index 1192cf6f2321..a9ffb57c4607 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c</a></div><div class='hunk'>@@ -901,6 +901,109 @@ static void hclge_dbg_fd_tcam(struct hclge_dev *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hclge_dbg_dump_rst_info(struct hclge_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "PF reset count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.pf_rst_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "FLR reset count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.flr_rst_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "CORE reset count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.core_rst_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "GLOBAL reset count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.global_rst_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "IMP reset count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.imp_rst_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "reset done count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.reset_done_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "HW reset done count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.hw_reset_done_cnt);</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "reset count: %d\n",</div><div class='add'>+		 hdev-&gt;rst_stats.reset_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hclge_dbg_dump_ncl_config: print specified range of NCL_CONFIG file</div><div class='add'>+ * @hdev: pointer to struct hclge_dev</div><div class='add'>+ * @cmd_buf: string that contains offset and length</div><div class='add'>+ */</div><div class='add'>+static void hclge_dbg_dump_ncl_config(struct hclge_dev *hdev, char *cmd_buf)</div><div class='add'>+{</div><div class='add'>+#define HCLGE_MAX_NCL_CONFIG_OFFSET	4096</div><div class='add'>+#define HCLGE_MAX_NCL_CONFIG_LENGTH	(20 + 24 * 4)</div><div class='add'>+#define HCLGE_CMD_DATA_NUM		6</div><div class='add'>+</div><div class='add'>+	struct hclge_desc desc[5];</div><div class='add'>+	u32 byte_offset;</div><div class='add'>+	int bd_num = 5;</div><div class='add'>+	int offset;</div><div class='add'>+	int length;</div><div class='add'>+	int data0;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	ret = sscanf(cmd_buf, "%x %x", &amp;offset, &amp;length);</div><div class='add'>+	if (ret != 2 || offset &gt;= HCLGE_MAX_NCL_CONFIG_OFFSET ||</div><div class='add'>+	    length &gt; HCLGE_MAX_NCL_CONFIG_OFFSET - offset) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "Invalid offset or length.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (offset &lt; 0 || length &lt;= 0) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "Non-positive offset or length.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "offset |    data\n");</div><div class='add'>+</div><div class='add'>+	while (length &gt; 0) {</div><div class='add'>+		data0 = offset;</div><div class='add'>+		if (length &gt;= HCLGE_MAX_NCL_CONFIG_LENGTH)</div><div class='add'>+			data0 |= HCLGE_MAX_NCL_CONFIG_LENGTH &lt;&lt; 16;</div><div class='add'>+		else</div><div class='add'>+			data0 |= length &lt;&lt; 16;</div><div class='add'>+		ret = hclge_dbg_cmd_send(hdev, desc, data0, bd_num,</div><div class='add'>+					 HCLGE_OPC_QUERY_NCL_CONFIG);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		byte_offset = offset;</div><div class='add'>+		for (i = 0; i &lt; bd_num; i++) {</div><div class='add'>+			for (j = 0; j &lt; HCLGE_CMD_DATA_NUM; j++) {</div><div class='add'>+				if (i == 0 &amp;&amp; j == 0)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				dev_info(&amp;hdev-&gt;pdev-&gt;dev, "0x%04x | 0x%08x\n",</div><div class='add'>+					 byte_offset,</div><div class='add'>+					 le32_to_cpu(desc[i].data[j]));</div><div class='add'>+				byte_offset += sizeof(u32);</div><div class='add'>+				length -= sizeof(u32);</div><div class='add'>+				if (length &lt;= 0)</div><div class='add'>+					return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		offset += HCLGE_MAX_NCL_CONFIG_LENGTH;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hclge_dbg_dump_mac_tnl_status: print message about mac tnl interrupt</div><div class='add'>+ * @hdev: pointer to struct hclge_dev</div><div class='add'>+ */</div><div class='add'>+static void hclge_dbg_dump_mac_tnl_status(struct hclge_dev *hdev)</div><div class='add'>+{</div><div class='add'>+#define HCLGE_BILLION_NANO_SECONDS 1000000000</div><div class='add'>+</div><div class='add'>+	struct hclge_mac_tnl_stats stats;</div><div class='add'>+	unsigned long rem_nsec;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "Recently generated mac tnl interruption:\n");</div><div class='add'>+</div><div class='add'>+	while (kfifo_get(&amp;hdev-&gt;mac_tnl_log, &amp;stats)) {</div><div class='add'>+		rem_nsec = do_div(stats.time, HCLGE_BILLION_NANO_SECONDS);</div><div class='add'>+		dev_info(&amp;hdev-&gt;pdev-&gt;dev, "[%07lu.%03lu]status = 0x%x\n",</div><div class='add'>+			 (unsigned long)stats.time, rem_nsec / 1000,</div><div class='add'>+			 stats.status);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int hclge_dbg_run_cmd(struct hnae3_handle *handle, char *cmd_buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='hunk'>@@ -924,6 +1027,13 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, char *cmd_buf)</div><div class='ctx'> 		hclge_dbg_dump_mng_table(hdev);</div><div class='ctx'> 	} else if (strncmp(cmd_buf, "dump reg", 8) == 0) {</div><div class='ctx'> 		hclge_dbg_dump_reg_cmd(hdev, cmd_buf);</div><div class='add'>+	} else if (strncmp(cmd_buf, "dump reset info", 15) == 0) {</div><div class='add'>+		hclge_dbg_dump_rst_info(hdev);</div><div class='add'>+	} else if (strncmp(cmd_buf, "dump ncl_config", 15) == 0) {</div><div class='add'>+		hclge_dbg_dump_ncl_config(hdev,</div><div class='add'>+					  &amp;cmd_buf[sizeof("dump ncl_config")]);</div><div class='add'>+	} else if (strncmp(cmd_buf, "dump mac tnl status", 19) == 0) {</div><div class='add'>+		hclge_dbg_dump_mac_tnl_status(hdev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_info(&amp;hdev-&gt;pdev-&gt;dev, "unknown command\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c<br/>index 1f52d11f77b5..4ac80634c984 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c</a></div><div class='hunk'>@@ -4,287 +4,468 @@</div><div class='ctx'> #include "hclge_err.h"</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_imp_tcm_ecc_int[] = {</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "imp_itcm0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "imp_itcm1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "imp_itcm2_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "imp_itcm3_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "imp_dtcm0_mem0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "imp_dtcm0_mem1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "imp_dtcm1_mem0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "imp_dtcm1_mem1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "imp_itcm4_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "imp_itcm0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "imp_itcm1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "imp_itcm2_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "imp_itcm3_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "imp_dtcm0_mem0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "imp_dtcm0_mem1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "imp_dtcm1_mem0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "imp_dtcm1_mem1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "imp_itcm4_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_cmdq_nic_mem_ecc_int[] = {</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "cmdq_nic_rx_depth_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "cmdq_nic_tx_depth_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "cmdq_nic_rx_tail_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "cmdq_nic_tx_tail_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "cmdq_nic_rx_head_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "cmdq_nic_tx_head_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "cmdq_nic_rx_addr_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "cmdq_nic_tx_addr_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "cmdq_rocee_rx_depth_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(19), .msg = "cmdq_rocee_tx_depth_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(21), .msg = "cmdq_rocee_rx_tail_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(23), .msg = "cmdq_rocee_tx_tail_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(25), .msg = "cmdq_rocee_rx_head_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(27), .msg = "cmdq_rocee_tx_head_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(29), .msg = "cmdq_rocee_rx_addr_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(31), .msg = "cmdq_rocee_tx_addr_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "cmdq_nic_rx_depth_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "cmdq_nic_tx_depth_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "cmdq_nic_rx_tail_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "cmdq_nic_tx_tail_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "cmdq_nic_rx_head_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "cmdq_nic_tx_head_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "cmdq_nic_rx_addr_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "cmdq_nic_tx_addr_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "cmdq_rocee_rx_depth_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(19), .msg = "cmdq_rocee_tx_depth_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(21), .msg = "cmdq_rocee_rx_tail_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(23), .msg = "cmdq_rocee_tx_tail_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(25), .msg = "cmdq_rocee_rx_head_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(27), .msg = "cmdq_rocee_tx_head_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(29), .msg = "cmdq_rocee_rx_addr_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(31), .msg = "cmdq_rocee_tx_addr_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_tqp_int_ecc_int[] = {</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "tqp_int_cfg_even_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "tqp_int_cfg_odd_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "tqp_int_ctrl_even_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "tqp_int_ctrl_odd_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "tx_que_scan_int_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "rx_que_scan_int_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "tqp_int_cfg_even_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "tqp_int_cfg_odd_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "tqp_int_ctrl_even_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "tqp_int_ctrl_odd_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "tx_que_scan_int_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "rx_que_scan_int_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_msix_sram_ecc_int[] = {</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "msix_nic_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "msix_rocee_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "msix_nic_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "msix_rocee_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_igu_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "igu_rx_buf0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "igu_rx_buf1_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "igu_rx_buf0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "igu_rx_buf1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_igu_egu_tnl_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "rx_buf_overflow" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "rx_stp_fifo_overflow" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "rx_stp_fifo_undeflow" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "tx_buf_overflow" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "tx_buf_underrun" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "rx_stp_buf_overflow" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "rx_buf_overflow",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "rx_stp_fifo_overflow",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "rx_stp_fifo_undeflow",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "tx_buf_overflow",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "tx_buf_underrun",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "rx_stp_buf_overflow",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ncsi_err_int[] = {</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "ncsi_tx_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "ncsi_tx_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ppp_mpf_abnormal_int_st1[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "vf_vlan_ad_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "umv_mcast_group_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "umv_key_mem0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "umv_key_mem1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "umv_key_mem2_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "umv_key_mem3_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "umv_ad_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "rss_tc_mode_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "rss_idt_mem0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "rss_idt_mem1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "rss_idt_mem2_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "rss_idt_mem3_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(12), .msg = "rss_idt_mem4_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "rss_idt_mem5_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(14), .msg = "rss_idt_mem6_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "rss_idt_mem7_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(16), .msg = "rss_idt_mem8_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "rss_idt_mem9_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(18), .msg = "rss_idt_mem10_ecc_m1bit_err" },</div><div class='del'>-	{ .int_msk = BIT(19), .msg = "rss_idt_mem11_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(20), .msg = "rss_idt_mem12_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(21), .msg = "rss_idt_mem13_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(22), .msg = "rss_idt_mem14_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(23), .msg = "rss_idt_mem15_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(24), .msg = "port_vlan_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(25), .msg = "mcast_linear_table_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(26), .msg = "mcast_result_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(27),</div><div class='del'>-		.msg = "flow_director_ad_mem0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(28),</div><div class='del'>-		.msg = "flow_director_ad_mem1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(29),</div><div class='del'>-		.msg = "rx_vlan_tag_memory_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(30),</div><div class='del'>-		.msg = "Tx_UP_mapping_config_mem_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "vf_vlan_ad_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "umv_mcast_group_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "umv_key_mem0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "umv_key_mem1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "umv_key_mem2_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "umv_key_mem3_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "umv_ad_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "rss_tc_mode_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "rss_idt_mem0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "rss_idt_mem1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "rss_idt_mem2_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "rss_idt_mem3_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(12), .msg = "rss_idt_mem4_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "rss_idt_mem5_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(14), .msg = "rss_idt_mem6_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "rss_idt_mem7_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(16), .msg = "rss_idt_mem8_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "rss_idt_mem9_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(18), .msg = "rss_idt_mem10_ecc_m1bit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(19), .msg = "rss_idt_mem11_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(20), .msg = "rss_idt_mem12_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(21), .msg = "rss_idt_mem13_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(22), .msg = "rss_idt_mem14_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(23), .msg = "rss_idt_mem15_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(24), .msg = "port_vlan_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(25), .msg = "mcast_linear_table_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(26), .msg = "mcast_result_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(27), .msg = "flow_director_ad_mem0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(28), .msg = "flow_director_ad_mem1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(29), .msg = "rx_vlan_tag_memory_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(30), .msg = "Tx_UP_mapping_config_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ppp_pf_abnormal_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "tx_vlan_tag_err" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "rss_list_tc_unassigned_queue_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "tx_vlan_tag_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "rss_list_tc_unassigned_queue_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ppp_mpf_abnormal_int_st3[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "hfs_fifo_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "rslt_descr_fifo_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "tx_vlan_tag_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "FD_CN0_memory_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "FD_CN1_memory_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "GRO_AD_memory_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "hfs_fifo_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "rslt_descr_fifo_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "tx_vlan_tag_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "FD_CN0_memory_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "FD_CN1_memory_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "GRO_AD_memory_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_tm_sch_rint[] = {</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "tm_sch_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "tm_sch_port_shap_sub_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "tm_sch_port_shap_sub_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "tm_sch_pg_pshap_sub_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "tm_sch_pg_pshap_sub_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "tm_sch_pg_cshap_sub_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "tm_sch_pg_cshap_sub_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "tm_sch_pri_pshap_sub_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "tm_sch_pri_pshap_sub_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "tm_sch_pri_cshap_sub_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "tm_sch_pri_cshap_sub_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(12),</div><div class='del'>-	  .msg = "tm_sch_port_shap_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(13),</div><div class='del'>-	  .msg = "tm_sch_port_shap_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(14),</div><div class='del'>-	  .msg = "tm_sch_pg_pshap_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(15),</div><div class='del'>-	  .msg = "tm_sch_pg_pshap_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(16),</div><div class='del'>-	  .msg = "tm_sch_pg_cshap_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(17),</div><div class='del'>-	  .msg = "tm_sch_pg_cshap_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(18),</div><div class='del'>-	  .msg = "tm_sch_pri_pshap_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(19),</div><div class='del'>-	  .msg = "tm_sch_pri_pshap_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(20),</div><div class='del'>-	  .msg = "tm_sch_pri_cshap_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(21),</div><div class='del'>-	  .msg = "tm_sch_pri_cshap_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(22), .msg = "tm_sch_rq_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(23), .msg = "tm_sch_rq_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(24), .msg = "tm_sch_nq_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(25), .msg = "tm_sch_nq_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(26), .msg = "tm_sch_roce_up_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(27), .msg = "tm_sch_roce_up_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(28), .msg = "tm_sch_rcb_byte_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(29), .msg = "tm_sch_rcb_byte_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(30), .msg = "tm_sch_ssu_byte_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(31), .msg = "tm_sch_ssu_byte_fifo_rd_err" },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "tm_sch_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "tm_sch_port_shap_sub_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "tm_sch_port_shap_sub_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "tm_sch_pg_pshap_sub_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "tm_sch_pg_pshap_sub_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "tm_sch_pg_cshap_sub_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "tm_sch_pg_cshap_sub_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "tm_sch_pri_pshap_sub_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "tm_sch_pri_pshap_sub_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "tm_sch_pri_cshap_sub_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "tm_sch_pri_cshap_sub_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(12), .msg = "tm_sch_port_shap_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "tm_sch_port_shap_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(14), .msg = "tm_sch_pg_pshap_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "tm_sch_pg_pshap_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(16), .msg = "tm_sch_pg_cshap_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "tm_sch_pg_cshap_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(18), .msg = "tm_sch_pri_pshap_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(19), .msg = "tm_sch_pri_pshap_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(20), .msg = "tm_sch_pri_cshap_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(21), .msg = "tm_sch_pri_cshap_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(22), .msg = "tm_sch_rq_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(23), .msg = "tm_sch_rq_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(24), .msg = "tm_sch_nq_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(25), .msg = "tm_sch_nq_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(26), .msg = "tm_sch_roce_up_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(27), .msg = "tm_sch_roce_up_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(28), .msg = "tm_sch_rcb_byte_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(29), .msg = "tm_sch_rcb_byte_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(30), .msg = "tm_sch_ssu_byte_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(31), .msg = "tm_sch_ssu_byte_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_qcn_fifo_rint[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "qcn_shap_gp0_sch_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "qcn_shap_gp0_sch_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "qcn_shap_gp1_sch_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "qcn_shap_gp1_sch_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "qcn_shap_gp2_sch_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "qcn_shap_gp2_sch_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "qcn_shap_gp3_sch_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "qcn_shap_gp3_sch_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "qcn_shap_gp0_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "qcn_shap_gp0_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "qcn_shap_gp1_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "qcn_shap_gp1_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(12), .msg = "qcn_shap_gp2_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "qcn_shap_gp2_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(14), .msg = "qcn_shap_gp3_offset_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "qcn_shap_gp3_offset_fifo_wr_err" },</div><div class='del'>-	{ .int_msk = BIT(16), .msg = "qcn_byte_info_fifo_rd_err" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "qcn_byte_info_fifo_wr_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "qcn_shap_gp0_sch_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "qcn_shap_gp0_sch_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "qcn_shap_gp1_sch_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "qcn_shap_gp1_sch_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "qcn_shap_gp2_sch_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "qcn_shap_gp2_sch_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "qcn_shap_gp3_sch_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "qcn_shap_gp3_sch_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "qcn_shap_gp0_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "qcn_shap_gp0_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "qcn_shap_gp1_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "qcn_shap_gp1_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(12), .msg = "qcn_shap_gp2_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "qcn_shap_gp2_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(14), .msg = "qcn_shap_gp3_offset_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "qcn_shap_gp3_offset_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(16), .msg = "qcn_byte_info_fifo_rd_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "qcn_byte_info_fifo_wr_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_qcn_ecc_rint[] = {</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "qcn_byte_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "qcn_time_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "qcn_fb_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "qcn_link_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "qcn_rate_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "qcn_tmplt_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "qcn_shap_cfg_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "qcn_gp0_barrel_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "qcn_gp1_barrel_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(19), .msg = "qcn_gp2_barrel_mem_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(21), .msg = "qcn_gp3_barral_mem_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "qcn_byte_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "qcn_time_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "qcn_fb_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "qcn_link_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "qcn_rate_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "qcn_tmplt_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "qcn_shap_cfg_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "qcn_gp0_barrel_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "qcn_gp1_barrel_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(19), .msg = "qcn_gp2_barrel_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(21), .msg = "qcn_gp3_barral_mem_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_mac_afifo_tnl_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "egu_cge_afifo_ecc_1bit_err" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "egu_cge_afifo_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "egu_lge_afifo_ecc_1bit_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "egu_lge_afifo_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "cge_igu_afifo_ecc_1bit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "cge_igu_afifo_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "lge_igu_afifo_ecc_1bit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "lge_igu_afifo_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "cge_igu_afifo_overflow_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "lge_igu_afifo_overflow_err" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "egu_cge_afifo_underrun_err" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "egu_lge_afifo_underrun_err" },</div><div class='del'>-	{ .int_msk = BIT(12), .msg = "egu_ge_afifo_underrun_err" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "ge_igu_afifo_overflow_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "egu_cge_afifo_ecc_1bit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "egu_cge_afifo_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "egu_lge_afifo_ecc_1bit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "egu_lge_afifo_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "cge_igu_afifo_ecc_1bit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "cge_igu_afifo_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "lge_igu_afifo_ecc_1bit_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "lge_igu_afifo_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "cge_igu_afifo_overflow_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "lge_igu_afifo_overflow_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "egu_cge_afifo_underrun_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "egu_lge_afifo_underrun_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(12), .msg = "egu_ge_afifo_underrun_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "ge_igu_afifo_overflow_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ppu_mpf_abnormal_int_st2[] = {</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "rpu_rx_pkt_bit32_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(14), .msg = "rpu_rx_pkt_bit33_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "rpu_rx_pkt_bit34_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(16), .msg = "rpu_rx_pkt_bit35_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "rcb_tx_ring_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(18), .msg = "rcb_rx_ring_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(19), .msg = "rcb_tx_fbd_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(20), .msg = "rcb_rx_ebd_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(21), .msg = "rcb_tso_info_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(22), .msg = "rcb_tx_int_info_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(23), .msg = "rcb_rx_int_info_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(24), .msg = "tpu_tx_pkt_0_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(25), .msg = "tpu_tx_pkt_1_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(26), .msg = "rd_bus_err" },</div><div class='del'>-	{ .int_msk = BIT(27), .msg = "wr_bus_err" },</div><div class='del'>-	{ .int_msk = BIT(28), .msg = "reg_search_miss" },</div><div class='del'>-	{ .int_msk = BIT(29), .msg = "rx_q_search_miss" },</div><div class='del'>-	{ .int_msk = BIT(30), .msg = "ooo_ecc_err_detect" },</div><div class='del'>-	{ .int_msk = BIT(31), .msg = "ooo_ecc_err_multpl" },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "rpu_rx_pkt_bit32_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(14), .msg = "rpu_rx_pkt_bit33_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "rpu_rx_pkt_bit34_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(16), .msg = "rpu_rx_pkt_bit35_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "rcb_tx_ring_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(18), .msg = "rcb_rx_ring_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(19), .msg = "rcb_tx_fbd_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(20), .msg = "rcb_rx_ebd_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(21), .msg = "rcb_tso_info_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(22), .msg = "rcb_tx_int_info_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(23), .msg = "rcb_rx_int_info_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(24), .msg = "tpu_tx_pkt_0_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(25), .msg = "tpu_tx_pkt_1_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(26), .msg = "rd_bus_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(27), .msg = "wr_bus_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(28), .msg = "reg_search_miss",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(29), .msg = "rx_q_search_miss",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(30), .msg = "ooo_ecc_err_detect",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(31), .msg = "ooo_ecc_err_multpl",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ppu_mpf_abnormal_int_st3[] = {</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "gro_bd_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "gro_context_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "rx_stash_cfg_ecc_mbit_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "axi_rd_fbd_ecc_mbit_err" },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "gro_bd_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "gro_context_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "rx_stash_cfg_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "axi_rd_fbd_ecc_mbit_err",</div><div class='add'>+	  .reset_level = HNAE3_CORE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ppu_pf_abnormal_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "over_8bd_no_fe" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "tso_mss_cmp_min_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "tso_mss_cmp_max_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "tx_rd_fbd_poison" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "rx_rd_ebd_poison" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "buf_wait_timeout" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "over_8bd_no_fe",</div><div class='add'>+	  .reset_level = HNAE3_FUNC_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "tso_mss_cmp_min_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "tso_mss_cmp_max_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "tx_rd_fbd_poison",</div><div class='add'>+	  .reset_level = HNAE3_FUNC_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "rx_rd_ebd_poison",</div><div class='add'>+	  .reset_level = HNAE3_FUNC_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "buf_wait_timeout",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ssu_com_err_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "buf_sum_err" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "ppp_mb_num_err" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "ppp_mbid_err" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "ppp_rlt_mac_err" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "ppp_rlt_host_err" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "cks_edit_position_err" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "cks_edit_condition_err" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "vlan_edit_condition_err" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "vlan_num_ot_err" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "vlan_num_in_err" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "buf_sum_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "ppp_mb_num_err",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "ppp_mbid_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "ppp_rlt_mac_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "ppp_rlt_host_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "cks_edit_position_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "cks_edit_condition_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "vlan_edit_condition_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "vlan_num_ot_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "vlan_num_in_err",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HCLGE_SSU_MEM_ECC_ERR(x) \</div><div class='del'>-	{ .int_msk = BIT(x), .msg = "ssu_mem" #x "_ecc_mbit_err" }</div><div class='add'>+	{ .int_msk = BIT(x), .msg = "ssu_mem" #x "_ecc_mbit_err", \</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET }</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ssu_mem_ecc_err_int[] = {</div><div class='ctx'> 	HCLGE_SSU_MEM_ECC_ERR(0),</div><div class='hunk'>@@ -323,62 +504,106 @@ static const struct hclge_hw_error hclge_ssu_mem_ecc_err_int[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ssu_port_based_err_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "roc_pkt_without_key_port" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "tpu_pkt_without_key_port" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "igu_pkt_without_key_port" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "roc_eof_mis_match_port" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "tpu_eof_mis_match_port" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "igu_eof_mis_match_port" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "roc_sof_mis_match_port" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "tpu_sof_mis_match_port" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "igu_sof_mis_match_port" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "ets_rd_int_rx_port" },</div><div class='del'>-	{ .int_msk = BIT(12), .msg = "ets_wr_int_rx_port" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "ets_rd_int_tx_port" },</div><div class='del'>-	{ .int_msk = BIT(14), .msg = "ets_wr_int_tx_port" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "roc_pkt_without_key_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "tpu_pkt_without_key_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "igu_pkt_without_key_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "roc_eof_mis_match_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "tpu_eof_mis_match_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "igu_eof_mis_match_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "roc_sof_mis_match_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "tpu_sof_mis_match_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "igu_sof_mis_match_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "ets_rd_int_rx_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(12), .msg = "ets_wr_int_rx_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "ets_rd_int_tx_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(14), .msg = "ets_wr_int_tx_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ssu_fifo_overflow_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "ig_mac_inf_int" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "ig_host_inf_int" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "ig_roc_buf_int" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "ig_host_data_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(4), .msg = "ig_host_key_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(5), .msg = "tx_qcn_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(6), .msg = "rx_qcn_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(7), .msg = "tx_pf_rd_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(8), .msg = "rx_pf_rd_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "qm_eof_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "mb_rlt_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(11), .msg = "dup_uncopy_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(12), .msg = "dup_cnt_rd_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(13), .msg = "dup_cnt_drop_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(14), .msg = "dup_cnt_wrb_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(15), .msg = "host_cmd_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(16), .msg = "mac_cmd_fifo_int" },</div><div class='del'>-	{ .int_msk = BIT(17), .msg = "host_cmd_bitmap_empty_int" },</div><div class='del'>-	{ .int_msk = BIT(18), .msg = "mac_cmd_bitmap_empty_int" },</div><div class='del'>-	{ .int_msk = BIT(19), .msg = "dup_bitmap_empty_int" },</div><div class='del'>-	{ .int_msk = BIT(20), .msg = "out_queue_bitmap_empty_int" },</div><div class='del'>-	{ .int_msk = BIT(21), .msg = "bank2_bitmap_empty_int" },</div><div class='del'>-	{ .int_msk = BIT(22), .msg = "bank1_bitmap_empty_int" },</div><div class='del'>-	{ .int_msk = BIT(23), .msg = "bank0_bitmap_empty_int" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "ig_mac_inf_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "ig_host_inf_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "ig_roc_buf_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "ig_host_data_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(4), .msg = "ig_host_key_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(5), .msg = "tx_qcn_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(6), .msg = "rx_qcn_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(7), .msg = "tx_pf_rd_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(8), .msg = "rx_pf_rd_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "qm_eof_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "mb_rlt_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(11), .msg = "dup_uncopy_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(12), .msg = "dup_cnt_rd_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(13), .msg = "dup_cnt_drop_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(14), .msg = "dup_cnt_wrb_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(15), .msg = "host_cmd_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(16), .msg = "mac_cmd_fifo_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(17), .msg = "host_cmd_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(18), .msg = "mac_cmd_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(19), .msg = "dup_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(20), .msg = "out_queue_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(21), .msg = "bank2_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(22), .msg = "bank1_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(23), .msg = "bank0_bitmap_empty_int",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ssu_ets_tcg_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "ets_rd_int_rx_tcg" },</div><div class='del'>-	{ .int_msk = BIT(1), .msg = "ets_wr_int_rx_tcg" },</div><div class='del'>-	{ .int_msk = BIT(2), .msg = "ets_rd_int_tx_tcg" },</div><div class='del'>-	{ .int_msk = BIT(3), .msg = "ets_wr_int_tx_tcg" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "ets_rd_int_rx_tcg",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(1), .msg = "ets_wr_int_rx_tcg",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(2), .msg = "ets_rd_int_tx_tcg",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(3), .msg = "ets_wr_int_tx_tcg",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hclge_hw_error hclge_ssu_port_based_pf_int[] = {</div><div class='del'>-	{ .int_msk = BIT(0), .msg = "roc_pkt_without_key_port" },</div><div class='del'>-	{ .int_msk = BIT(9), .msg = "low_water_line_err_port" },</div><div class='del'>-	{ .int_msk = BIT(10), .msg = "hi_water_line_err_port" },</div><div class='add'>+	{ .int_msk = BIT(0), .msg = "roc_pkt_without_key_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='add'>+	{ .int_msk = BIT(9), .msg = "low_water_line_err_port",</div><div class='add'>+	  .reset_level = HNAE3_NONE_RESET },</div><div class='add'>+	{ .int_msk = BIT(10), .msg = "hi_water_line_err_port",</div><div class='add'>+	  .reset_level = HNAE3_GLOBAL_RESET },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -406,16 +631,29 @@ static const struct hclge_hw_error hclge_rocee_qmm_ovf_err_int[] = {</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void hclge_log_error(struct device *dev, char *reg,</div><div class='del'>-			    const struct hclge_hw_error *err,</div><div class='del'>-			    u32 err_sts)</div><div class='add'>+static enum hnae3_reset_type hclge_log_error(struct device *dev, char *reg,</div><div class='add'>+					     const struct hclge_hw_error *err,</div><div class='add'>+					     u32 err_sts)</div><div class='ctx'> {</div><div class='add'>+	enum hnae3_reset_type reset_level = HNAE3_FUNC_RESET;</div><div class='add'>+	bool need_reset = false;</div><div class='add'>+</div><div class='ctx'> 	while (err-&gt;msg) {</div><div class='del'>-		if (err-&gt;int_msk &amp; err_sts)</div><div class='add'>+		if (err-&gt;int_msk &amp; err_sts) {</div><div class='ctx'> 			dev_warn(dev, "%s %s found [error status=0x%x]\n",</div><div class='ctx'> 				 reg, err-&gt;msg, err_sts);</div><div class='add'>+			if (err-&gt;reset_level != HNAE3_NONE_RESET &amp;&amp;</div><div class='add'>+			    err-&gt;reset_level &gt;= reset_level) {</div><div class='add'>+				reset_level = err-&gt;reset_level;</div><div class='add'>+				need_reset = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		err++;</div><div class='ctx'> 	}</div><div class='add'>+	if (need_reset)</div><div class='add'>+		return reset_level;</div><div class='add'>+	else</div><div class='add'>+		return HNAE3_NONE_RESET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* hclge_cmd_query_error: read the error information</div><div class='hunk'>@@ -454,6 +692,16 @@ static int hclge_cmd_query_error(struct hclge_dev *hdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclge_clear_mac_tnl_int(struct hclge_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hclge_desc desc;</div><div class='add'>+</div><div class='add'>+	hclge_cmd_setup_basic_desc(&amp;desc, HCLGE_OPC_CLEAR_MAC_TNL_INT, false);</div><div class='add'>+	desc.data[0] = cpu_to_le32(HCLGE_MAC_TNL_INT_CLR);</div><div class='add'>+</div><div class='add'>+	return hclge_cmd_send(&amp;hdev-&gt;hw, &amp;desc, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_config_common_hw_err_int(struct hclge_dev *hdev, bool en)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;hdev-&gt;pdev-&gt;dev;</div><div class='hunk'>@@ -673,6 +921,21 @@ static int hclge_config_mac_err_int(struct hclge_dev *hdev, bool en)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hclge_config_mac_tnl_int(struct hclge_dev *hdev, bool en)</div><div class='add'>+{</div><div class='add'>+	struct hclge_desc desc;</div><div class='add'>+</div><div class='add'>+	hclge_cmd_setup_basic_desc(&amp;desc, HCLGE_OPC_MAC_TNL_INT_EN, false);</div><div class='add'>+	if (en)</div><div class='add'>+		desc.data[0] = cpu_to_le32(HCLGE_MAC_TNL_INT_EN);</div><div class='add'>+	else</div><div class='add'>+		desc.data[0] = 0;</div><div class='add'>+</div><div class='add'>+	desc.data[1] = cpu_to_le32(HCLGE_MAC_TNL_INT_EN_MASK);</div><div class='add'>+</div><div class='add'>+	return hclge_cmd_send(&amp;hdev-&gt;hw, &amp;desc, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_config_ppu_error_interrupts(struct hclge_dev *hdev, u32 cmd,</div><div class='ctx'> 					     bool en)</div><div class='ctx'> {</div><div class='hunk'>@@ -826,6 +1089,7 @@ static int hclge_handle_mpf_ras_error(struct hclge_dev *hdev,</div><div class='ctx'> 				      int num)</div><div class='ctx'> {</div><div class='ctx'> 	struct hnae3_ae_dev *ae_dev = hdev-&gt;ae_dev;</div><div class='add'>+	enum hnae3_reset_type reset_level;</div><div class='ctx'> 	struct device *dev = &amp;hdev-&gt;pdev-&gt;dev;</div><div class='ctx'> 	__le32 *desc_data;</div><div class='ctx'> 	u32 status;</div><div class='hunk'>@@ -845,78 +1109,94 @@ static int hclge_handle_mpf_ras_error(struct hclge_dev *hdev,</div><div class='ctx'> 	/* log HNS common errors */</div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[0]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "IMP_TCM_ECC_INT_STS",</div><div class='del'>-				&amp;hclge_imp_tcm_ecc_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "IMP_TCM_ECC_INT_STS",</div><div class='add'>+					      &amp;hclge_imp_tcm_ecc_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[1]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "CMDQ_MEM_ECC_INT_STS",</div><div class='del'>-				&amp;hclge_cmdq_nic_mem_ecc_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "CMDQ_MEM_ECC_INT_STS",</div><div class='add'>+					      &amp;hclge_cmdq_nic_mem_ecc_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((le32_to_cpu(desc[0].data[2])) &amp; BIT(0)) {</div><div class='ctx'> 		dev_warn(dev, "imp_rd_data_poison_err found\n");</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_NONE_RESET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[3]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "TQP_INT_ECC_INT_STS",</div><div class='del'>-				&amp;hclge_tqp_int_ecc_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "TQP_INT_ECC_INT_STS",</div><div class='add'>+					      &amp;hclge_tqp_int_ecc_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[4]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "MSIX_ECC_INT_STS",</div><div class='del'>-				&amp;hclge_msix_sram_ecc_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "MSIX_ECC_INT_STS",</div><div class='add'>+					      &amp;hclge_msix_sram_ecc_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log SSU(Storage Switch Unit) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[2];</div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 2));</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "SSU_ECC_MULTI_BIT_INT_0",</div><div class='del'>-				&amp;hclge_ssu_mem_ecc_err_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "SSU_ECC_MULTI_BIT_INT_0",</div><div class='add'>+					      &amp;hclge_ssu_mem_ecc_err_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 3)) &amp; BIT(0);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		dev_warn(dev, "SSU_ECC_MULTI_BIT_INT_1 ssu_mem32_ecc_mbit_err found [error status=0x%x]\n",</div><div class='ctx'> 			 status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 4)) &amp; HCLGE_SSU_COMMON_ERR_INT_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "SSU_COMMON_ERR_INT",</div><div class='del'>-				&amp;hclge_ssu_com_err_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "SSU_COMMON_ERR_INT",</div><div class='add'>+					      &amp;hclge_ssu_com_err_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log IGU(Ingress Unit) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[3];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data) &amp; HCLGE_IGU_INT_MASK;</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "IGU_INT_STS",</div><div class='del'>-				&amp;hclge_igu_int[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level = hclge_log_error(dev, "IGU_INT_STS",</div><div class='add'>+					      &amp;hclge_igu_int[0], status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* log PPP(Programmable Packet Process) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[4];</div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 1));</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "PPP_MPF_ABNORMAL_INT_ST1",</div><div class='del'>-				&amp;hclge_ppp_mpf_abnormal_int_st1[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level =</div><div class='add'>+			hclge_log_error(dev, "PPP_MPF_ABNORMAL_INT_ST1",</div><div class='add'>+					&amp;hclge_ppp_mpf_abnormal_int_st1[0],</div><div class='add'>+					status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 3)) &amp; HCLGE_PPP_MPF_INT_ST3_MASK;</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "PPP_MPF_ABNORMAL_INT_ST3",</div><div class='del'>-				&amp;hclge_ppp_mpf_abnormal_int_st3[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level =</div><div class='add'>+			hclge_log_error(dev, "PPP_MPF_ABNORMAL_INT_ST3",</div><div class='add'>+					&amp;hclge_ppp_mpf_abnormal_int_st3[0],</div><div class='add'>+					status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* log PPU(RCB) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[5];</div><div class='hunk'>@@ -924,55 +1204,60 @@ static int hclge_handle_mpf_ras_error(struct hclge_dev *hdev,</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		dev_warn(dev, "PPU_MPF_ABNORMAL_INT_ST1 %s found\n",</div><div class='ctx'> 			 "rpu_rx_pkt_ecc_mbit_err");</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 2));</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "PPU_MPF_ABNORMAL_INT_ST2",</div><div class='del'>-				&amp;hclge_ppu_mpf_abnormal_int_st2[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level =</div><div class='add'>+			hclge_log_error(dev, "PPU_MPF_ABNORMAL_INT_ST2",</div><div class='add'>+					&amp;hclge_ppu_mpf_abnormal_int_st2[0],</div><div class='add'>+					status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 3)) &amp; HCLGE_PPU_MPF_INT_ST3_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "PPU_MPF_ABNORMAL_INT_ST3",</div><div class='del'>-				&amp;hclge_ppu_mpf_abnormal_int_st3[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level =</div><div class='add'>+			hclge_log_error(dev, "PPU_MPF_ABNORMAL_INT_ST3",</div><div class='add'>+					&amp;hclge_ppu_mpf_abnormal_int_st3[0],</div><div class='add'>+					status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log TM(Traffic Manager) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[6];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "TM_SCH_RINT",</div><div class='del'>-				&amp;hclge_tm_sch_rint[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "TM_SCH_RINT",</div><div class='add'>+					      &amp;hclge_tm_sch_rint[0], status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log QCN(Quantized Congestion Control) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[7];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data) &amp; HCLGE_QCN_FIFO_INT_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "QCN_FIFO_RINT",</div><div class='del'>-				&amp;hclge_qcn_fifo_rint[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "QCN_FIFO_RINT",</div><div class='add'>+					      &amp;hclge_qcn_fifo_rint[0], status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 1)) &amp; HCLGE_QCN_ECC_INT_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "QCN_ECC_RINT",</div><div class='del'>-				&amp;hclge_qcn_ecc_rint[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "QCN_ECC_RINT",</div><div class='add'>+					      &amp;hclge_qcn_ecc_rint[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log NCSI errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[9];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data) &amp; HCLGE_NCSI_ECC_INT_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "NCSI_ECC_INT_RPT",</div><div class='del'>-				&amp;hclge_ncsi_err_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_CORE_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "NCSI_ECC_INT_RPT",</div><div class='add'>+					      &amp;hclge_ncsi_err_int[0], status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear all main PF RAS errors */</div><div class='hunk'>@@ -1000,6 +1285,7 @@ static int hclge_handle_pf_ras_error(struct hclge_dev *hdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct hnae3_ae_dev *ae_dev = hdev-&gt;ae_dev;</div><div class='ctx'> 	struct device *dev = &amp;hdev-&gt;pdev-&gt;dev;</div><div class='add'>+	enum hnae3_reset_type reset_level;</div><div class='ctx'> 	__le32 *desc_data;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1018,38 +1304,47 @@ static int hclge_handle_pf_ras_error(struct hclge_dev *hdev,</div><div class='ctx'> 	/* log SSU(Storage Switch Unit) errors */</div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[0]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "SSU_PORT_BASED_ERR_INT",</div><div class='del'>-				&amp;hclge_ssu_port_based_err_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "SSU_PORT_BASED_ERR_INT",</div><div class='add'>+					      &amp;hclge_ssu_port_based_err_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[1]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "SSU_FIFO_OVERFLOW_INT",</div><div class='del'>-				&amp;hclge_ssu_fifo_overflow_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "SSU_FIFO_OVERFLOW_INT",</div><div class='add'>+					      &amp;hclge_ssu_fifo_overflow_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[2]);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "SSU_ETS_TCG_INT",</div><div class='del'>-				&amp;hclge_ssu_ets_tcg_int[0], status);</div><div class='del'>-		HCLGE_SET_DEFAULT_RESET_REQUEST(HNAE3_GLOBAL_RESET);</div><div class='add'>+		reset_level = hclge_log_error(dev, "SSU_ETS_TCG_INT",</div><div class='add'>+					      &amp;hclge_ssu_ets_tcg_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log IGU(Ingress Unit) EGU(Egress Unit) TNL errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[1];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data) &amp; HCLGE_IGU_EGU_TNL_INT_MASK;</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "IGU_EGU_TNL_INT_STS",</div><div class='del'>-				&amp;hclge_igu_egu_tnl_int[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level = hclge_log_error(dev, "IGU_EGU_TNL_INT_STS",</div><div class='add'>+					      &amp;hclge_igu_egu_tnl_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* log PPU(RCB) errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[3];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data) &amp; HCLGE_PPU_PF_INT_RAS_MASK;</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "PPU_PF_ABNORMAL_INT_ST0",</div><div class='del'>-				&amp;hclge_ppu_pf_abnormal_int[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level = hclge_log_error(dev, "PPU_PF_ABNORMAL_INT_ST0",</div><div class='add'>+					      &amp;hclge_ppu_pf_abnormal_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		HCLGE_SET_DEFAULT_RESET_REQUEST(reset_level);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear all PF RAS errors */</div><div class='ctx'> 	hclge_cmd_reuse_desc(&amp;desc[0], false);</div><div class='hunk'>@@ -1341,16 +1636,15 @@ pci_ers_result_t hclge_handle_hw_ras_error(struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 			       unsigned long *reset_requests)</div><div class='ctx'> {</div><div class='add'>+	struct hclge_mac_tnl_stats mac_tnl_stats;</div><div class='ctx'> 	struct device *dev = &amp;hdev-&gt;pdev-&gt;dev;</div><div class='ctx'> 	u32 mpf_bd_num, pf_bd_num, bd_num;</div><div class='add'>+	enum hnae3_reset_type reset_level;</div><div class='ctx'> 	struct hclge_desc desc_bd;</div><div class='ctx'> 	struct hclge_desc *desc;</div><div class='ctx'> 	__le32 *desc_data;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	u32 status;</div><div class='del'>-</div><div class='del'>-	/* set default handling */</div><div class='del'>-	set_bit(HNAE3_FUNC_RESET, reset_requests);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* query the number of bds for the MSIx int status */</div><div class='ctx'> 	hclge_cmd_setup_basic_desc(&amp;desc_bd, HCLGE_QUERY_MSIX_INT_STS_BD_NUM,</div><div class='hunk'>@@ -1359,8 +1653,6 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "fail(%d) to query msix int status bd num\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		/* reset everything for now */</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1381,8 +1673,6 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "query all mpf msix int cmd failed (%d)\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		/* reset everything for now */</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='ctx'> 		goto msi_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1390,9 +1680,10 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[1];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "MAC_AFIFO_TNL_INT_R",</div><div class='del'>-				&amp;hclge_mac_afifo_tnl_int[0], status);</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='add'>+		reset_level = hclge_log_error(dev, "MAC_AFIFO_TNL_INT_R",</div><div class='add'>+					      &amp;hclge_mac_afifo_tnl_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		set_bit(reset_level, reset_requests);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log PPU(RCB) MPF errors */</div><div class='hunk'>@@ -1400,9 +1691,11 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	status = le32_to_cpu(*(desc_data + 2)) &amp;</div><div class='ctx'> 			HCLGE_PPU_MPF_INT_ST2_MSIX_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "PPU_MPF_ABNORMAL_INT_ST2",</div><div class='del'>-				&amp;hclge_ppu_mpf_abnormal_int_st2[0], status);</div><div class='del'>-		set_bit(HNAE3_CORE_RESET, reset_requests);</div><div class='add'>+		reset_level =</div><div class='add'>+			hclge_log_error(dev, "PPU_MPF_ABNORMAL_INT_ST2",</div><div class='add'>+					&amp;hclge_ppu_mpf_abnormal_int_st2[0],</div><div class='add'>+					status);</div><div class='add'>+		set_bit(reset_level, reset_requests);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear all main PF MSIx errors */</div><div class='hunk'>@@ -1413,8 +1706,6 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "clear all mpf msix int cmd failed (%d)\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		/* reset everything for now */</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='ctx'> 		goto msi_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1428,32 +1719,37 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "query all pf msix int cmd failed (%d)\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		/* reset everything for now */</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='ctx'> 		goto msi_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* log SSU PF errors */</div><div class='ctx'> 	status = le32_to_cpu(desc[0].data[0]) &amp; HCLGE_SSU_PORT_INT_MSIX_MASK;</div><div class='ctx'> 	if (status) {</div><div class='del'>-		hclge_log_error(dev, "SSU_PORT_BASED_ERR_INT",</div><div class='del'>-				&amp;hclge_ssu_port_based_pf_int[0], status);</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='add'>+		reset_level = hclge_log_error(dev, "SSU_PORT_BASED_ERR_INT",</div><div class='add'>+					      &amp;hclge_ssu_port_based_pf_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		set_bit(reset_level, reset_requests);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read and log PPP PF errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[2];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data);</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "PPP_PF_ABNORMAL_INT_ST0",</div><div class='del'>-				&amp;hclge_ppp_pf_abnormal_int[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level = hclge_log_error(dev, "PPP_PF_ABNORMAL_INT_ST0",</div><div class='add'>+					      &amp;hclge_ppp_pf_abnormal_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		set_bit(reset_level, reset_requests);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* log PPU(RCB) PF errors */</div><div class='ctx'> 	desc_data = (__le32 *)&amp;desc[3];</div><div class='ctx'> 	status = le32_to_cpu(*desc_data) &amp; HCLGE_PPU_PF_INT_MSIX_MASK;</div><div class='del'>-	if (status)</div><div class='del'>-		hclge_log_error(dev, "PPU_PF_ABNORMAL_INT_ST",</div><div class='del'>-				&amp;hclge_ppu_pf_abnormal_int[0], status);</div><div class='add'>+	if (status) {</div><div class='add'>+		reset_level = hclge_log_error(dev, "PPU_PF_ABNORMAL_INT_ST",</div><div class='add'>+					      &amp;hclge_ppu_pf_abnormal_int[0],</div><div class='add'>+					      status);</div><div class='add'>+		set_bit(reset_level, reset_requests);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear all PF MSIx errors */</div><div class='ctx'> 	hclge_cmd_reuse_desc(&amp;desc[0], false);</div><div class='hunk'>@@ -1463,8 +1759,31 @@ int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "clear all pf msix int cmd failed (%d)\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		/* reset everything for now */</div><div class='del'>-		set_bit(HNAE3_GLOBAL_RESET, reset_requests);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* query and clear mac tnl interruptions */</div><div class='add'>+	hclge_cmd_setup_basic_desc(&amp;desc[0], HCLGE_OPC_QUERY_MAC_TNL_INT,</div><div class='add'>+				   true);</div><div class='add'>+	ret = hclge_cmd_send(&amp;hdev-&gt;hw, &amp;desc[0], 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "query mac tnl int cmd failed (%d)\n", ret);</div><div class='add'>+		goto msi_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = le32_to_cpu(desc-&gt;data[0]);</div><div class='add'>+	if (status) {</div><div class='add'>+		/* When mac tnl interrupt occurs, we record current time and</div><div class='add'>+		 * register status here in a fifo, then clear the status. So</div><div class='add'>+		 * that if link status changes suddenly at some time, we can</div><div class='add'>+		 * query them by debugfs.</div><div class='add'>+		 */</div><div class='add'>+		mac_tnl_stats.time = local_clock();</div><div class='add'>+		mac_tnl_stats.status = status;</div><div class='add'>+		kfifo_put(&amp;hdev-&gt;mac_tnl_log, mac_tnl_stats);</div><div class='add'>+		ret = hclge_clear_mac_tnl_int(hdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(dev, "clear mac tnl int failed (%d)\n", ret);</div><div class='add'>+		set_bit(HNAE3_NONE_RESET, reset_requests);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> msi_error:</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h<br/>index fc068280d391..9645590c9294 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h</a></div><div class='hunk'>@@ -47,6 +47,9 @@</div><div class='ctx'> #define HCLGE_NCSI_ERR_INT_TYPE	0x9</div><div class='ctx'> #define HCLGE_MAC_COMMON_ERR_INT_EN		0x107FF</div><div class='ctx'> #define HCLGE_MAC_COMMON_ERR_INT_EN_MASK	0x107FF</div><div class='add'>+#define HCLGE_MAC_TNL_INT_EN			GENMASK(7, 0)</div><div class='add'>+#define HCLGE_MAC_TNL_INT_EN_MASK		GENMASK(7, 0)</div><div class='add'>+#define HCLGE_MAC_TNL_INT_CLR			GENMASK(7, 0)</div><div class='ctx'> #define HCLGE_PPU_MPF_ABNORMAL_INT0_EN		GENMASK(31, 0)</div><div class='ctx'> #define HCLGE_PPU_MPF_ABNORMAL_INT0_EN_MASK	GENMASK(31, 0)</div><div class='ctx'> #define HCLGE_PPU_MPF_ABNORMAL_INT1_EN		GENMASK(31, 0)</div><div class='hunk'>@@ -112,8 +115,10 @@ struct hclge_hw_blk {</div><div class='ctx'> struct hclge_hw_error {</div><div class='ctx'> 	u32 int_msk;</div><div class='ctx'> 	const char *msg;</div><div class='add'>+	enum hnae3_reset_type reset_level;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int hclge_config_mac_tnl_int(struct hclge_dev *hdev, bool en);</div><div class='ctx'> int hclge_hw_error_set_state(struct hclge_dev *hdev, bool state);</div><div class='ctx'> pci_ers_result_t hclge_handle_hw_ras_error(struct hnae3_ae_dev *ae_dev);</div><div class='ctx'> int hclge_handle_hw_msix_error(struct hclge_dev *hdev,</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c<br/>index deda606c51e7..d3b1f8cb1155 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include "hclge_cmd.h"</div><div class='ctx'> #include "hclge_dcb.h"</div><div class='hunk'>@@ -31,6 +32,7 @@</div><div class='ctx'> static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mps);</div><div class='ctx'> static int hclge_init_vlan_config(struct hclge_dev *hdev);</div><div class='ctx'> static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev);</div><div class='add'>+static bool hclge_get_hw_reset_stat(struct hnae3_handle *handle);</div><div class='ctx'> static int hclge_set_umv_space(struct hclge_dev *hdev, u16 space_size,</div><div class='ctx'> 			       u16 *allocated_size, bool is_alloc);</div><div class='ctx'> </div><div class='hunk'>@@ -697,6 +699,16 @@ static void hclge_get_stats(struct hnae3_handle *handle, u64 *data)</div><div class='ctx'> 	p = hclge_tqps_get_stats(handle, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hclge_get_mac_pause_stat(struct hnae3_handle *handle, u64 *tx_cnt,</div><div class='add'>+				     u64 *rx_cnt)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+</div><div class='add'>+	*tx_cnt = hdev-&gt;hw_stats.mac_stats.mac_tx_mac_pause_num;</div><div class='add'>+	*rx_cnt = hdev-&gt;hw_stats.mac_stats.mac_rx_mac_pause_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_parse_func_status(struct hclge_dev *hdev,</div><div class='ctx'> 				   struct hclge_func_status_cmd *status)</div><div class='ctx'> {</div><div class='hunk'>@@ -833,33 +845,189 @@ static int hclge_parse_speed(int speed_cmd, int *speed)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hclge_parse_fiber_link_mode(struct hclge_dev *hdev,</div><div class='del'>-					u8 speed_ability)</div><div class='add'>+static int hclge_check_port_speed(struct hnae3_handle *handle, u32 speed)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *supported = hdev-&gt;hw.mac.supported;</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	u32 speed_ability = hdev-&gt;hw.mac.speed_ability;</div><div class='add'>+	u32 speed_bit = 0;</div><div class='ctx'> </div><div class='del'>-	if (speed_ability &amp; HCLGE_SUPPORT_1G_BIT)</div><div class='del'>-		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,</div><div class='del'>-				 supported);</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case HCLGE_MAC_SPEED_10M:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_10M_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_100M:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_100M_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_1G:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_1G_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_10G:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_10G_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_25G:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_25G_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_40G:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_40G_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_50G:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_50G_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_100G:</div><div class='add'>+		speed_bit = HCLGE_SUPPORT_100G_BIT;</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 (speed_bit &amp; speed_ability)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void hclge_convert_setting_sr(struct hclge_mac *mac, u8 speed_ability)</div><div class='add'>+{</div><div class='ctx'> 	if (speed_ability &amp; HCLGE_SUPPORT_10G_BIT)</div><div class='ctx'> 		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,</div><div class='del'>-				 supported);</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_25G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_40G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_50G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_100G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void hclge_convert_setting_lr(struct hclge_mac *mac, u8 speed_ability)</div><div class='add'>+{</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_10G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='ctx'> 	if (speed_ability &amp; HCLGE_SUPPORT_25G_BIT)</div><div class='ctx'> 		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,</div><div class='del'>-				 supported);</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_50G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_40G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_100G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void hclge_convert_setting_cr(struct hclge_mac *mac, u8 speed_ability)</div><div class='add'>+{</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_10G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseCR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_25G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseCR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_40G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='ctx'> 	if (speed_ability &amp; HCLGE_SUPPORT_50G_BIT)</div><div class='del'>-		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,</div><div class='del'>-				 supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_100G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void hclge_convert_setting_kr(struct hclge_mac *mac, u8 speed_ability)</div><div class='add'>+{</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_1G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_10G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_25G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseKR_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_40G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_50G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='ctx'> 	if (speed_ability &amp; HCLGE_SUPPORT_100G_BIT)</div><div class='del'>-		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,</div><div class='del'>-				 supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, supported);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);</div><div class='add'>+static void hclge_convert_setting_fec(struct hclge_mac *mac)</div><div class='add'>+{</div><div class='add'>+	linkmode_clear_bit(ETHTOOL_LINK_MODE_FEC_BASER_BIT, mac-&gt;supported);</div><div class='add'>+	linkmode_clear_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT, mac-&gt;supported);</div><div class='add'>+</div><div class='add'>+	switch (mac-&gt;speed) {</div><div class='add'>+	case HCLGE_MAC_SPEED_10G:</div><div class='add'>+	case HCLGE_MAC_SPEED_40G:</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_BASER_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+		mac-&gt;fec_ability =</div><div class='add'>+			BIT(HNAE3_FEC_BASER) | BIT(HNAE3_FEC_AUTO);</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_25G:</div><div class='add'>+	case HCLGE_MAC_SPEED_50G:</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+		mac-&gt;fec_ability =</div><div class='add'>+			BIT(HNAE3_FEC_BASER) | BIT(HNAE3_FEC_RS) |</div><div class='add'>+			BIT(HNAE3_FEC_AUTO);</div><div class='add'>+		break;</div><div class='add'>+	case HCLGE_MAC_SPEED_100G:</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT, mac-&gt;supported);</div><div class='add'>+		mac-&gt;fec_ability = BIT(HNAE3_FEC_RS) | BIT(HNAE3_FEC_AUTO);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mac-&gt;fec_ability = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hclge_parse_fiber_link_mode(struct hclge_dev *hdev,</div><div class='add'>+					u8 speed_ability)</div><div class='add'>+{</div><div class='add'>+	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='add'>+</div><div class='add'>+	if (speed_ability &amp; HCLGE_SUPPORT_1G_BIT)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,</div><div class='add'>+				 mac-&gt;supported);</div><div class='add'>+</div><div class='add'>+	hclge_convert_setting_sr(mac, speed_ability);</div><div class='add'>+	hclge_convert_setting_lr(mac, speed_ability);</div><div class='add'>+	hclge_convert_setting_cr(mac, speed_ability);</div><div class='add'>+	if (hdev-&gt;pdev-&gt;revision &gt;= 0x21)</div><div class='add'>+		hclge_convert_setting_fec(mac);</div><div class='add'>+</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mac-&gt;supported);</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac-&gt;supported);</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT, mac-&gt;supported);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hclge_parse_backplane_link_mode(struct hclge_dev *hdev,</div><div class='add'>+					    u8 speed_ability)</div><div class='add'>+{</div><div class='add'>+	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='add'>+</div><div class='add'>+	hclge_convert_setting_kr(mac, speed_ability);</div><div class='add'>+	if (hdev-&gt;pdev-&gt;revision &gt;= 0x21)</div><div class='add'>+		hclge_convert_setting_fec(mac);</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, mac-&gt;supported);</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac-&gt;supported);</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT, mac-&gt;supported);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclge_parse_copper_link_mode(struct hclge_dev *hdev,</div><div class='hunk'>@@ -900,8 +1068,9 @@ static void hclge_parse_link_mode(struct hclge_dev *hdev, u8 speed_ability)</div><div class='ctx'> 		hclge_parse_fiber_link_mode(hdev, speed_ability);</div><div class='ctx'> 	else if (media_type == HNAE3_MEDIA_TYPE_COPPER)</div><div class='ctx'> 		hclge_parse_copper_link_mode(hdev, speed_ability);</div><div class='add'>+	else if (media_type == HNAE3_MEDIA_TYPE_BACKPLANE)</div><div class='add'>+		hclge_parse_backplane_link_mode(hdev, speed_ability);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static void hclge_parse_cfg(struct hclge_cfg *cfg, struct hclge_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_cfg_param_cmd *req;</div><div class='hunk'>@@ -1015,6 +1184,23 @@ static int hclge_get_cap(struct hclge_dev *hdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hclge_init_kdump_kernel_config(struct hclge_dev *hdev)</div><div class='add'>+{</div><div class='add'>+#define HCLGE_MIN_TX_DESC	64</div><div class='add'>+#define HCLGE_MIN_RX_DESC	64</div><div class='add'>+</div><div class='add'>+	if (!is_kdump_kernel())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+		 "Running kdump kernel. Using minimal resources\n");</div><div class='add'>+</div><div class='add'>+	/* minimal queue pairs equals to the number of vports */</div><div class='add'>+	hdev-&gt;num_tqps = hdev-&gt;num_vmdq_vport + hdev-&gt;num_req_vfs + 1;</div><div class='add'>+	hdev-&gt;num_tx_desc = HCLGE_MIN_TX_DESC;</div><div class='add'>+	hdev-&gt;num_rx_desc = HCLGE_MIN_RX_DESC;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_configure(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_cfg cfg;</div><div class='hunk'>@@ -1074,6 +1260,8 @@ static int hclge_configure(struct hclge_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;tx_sch_mode = HCLGE_FLAG_TC_BASE_SCH_MODE;</div><div class='ctx'> </div><div class='add'>+	hclge_init_kdump_kernel_config(hdev);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1337,6 +1525,8 @@ static int hclge_alloc_vport(struct hclge_dev *hdev)</div><div class='ctx'> 		vport-&gt;back = hdev;</div><div class='ctx'> 		vport-&gt;vport_id = i;</div><div class='ctx'> 		vport-&gt;mps = HCLGE_MAC_DEFAULT_FRAME;</div><div class='add'>+		vport-&gt;port_base_vlan_cfg.state = HNAE3_PORT_BASE_VLAN_DISABLE;</div><div class='add'>+		vport-&gt;rxvlan_cfg.rx_vlan_offload_en = true;</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;vport-&gt;vlan_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;vport-&gt;uc_mac_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;vport-&gt;mc_mac_list);</div><div class='hunk'>@@ -1399,7 +1589,7 @@ static int hclge_tx_buffer_alloc(struct hclge_dev *hdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hclge_get_tc_num(struct hclge_dev *hdev)</div><div class='add'>+static u32 hclge_get_tc_num(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, cnt = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1409,17 +1599,6 @@ static int hclge_get_tc_num(struct hclge_dev *hdev)</div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hclge_get_pfc_enalbe_num(struct hclge_dev *hdev)</div><div class='del'>-{</div><div class='del'>-	int i, cnt = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; HCLGE_MAX_TC_NUM; i++)</div><div class='del'>-		if (hdev-&gt;hw_tc_map &amp; BIT(i) &amp;&amp;</div><div class='del'>-		    hdev-&gt;tm_info.hw_pfc_map &amp; BIT(i))</div><div class='del'>-			cnt++;</div><div class='del'>-	return cnt;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Get the number of pfc enabled TCs, which have private buffer */</div><div class='ctx'> static int hclge_get_pfc_priv_num(struct hclge_dev *hdev,</div><div class='ctx'> 				  struct hclge_pkt_buf_alloc *buf_alloc)</div><div class='hunk'>@@ -1483,14 +1662,12 @@ static bool  hclge_is_rx_buf_ok(struct hclge_dev *hdev,</div><div class='ctx'> 				struct hclge_pkt_buf_alloc *buf_alloc,</div><div class='ctx'> 				u32 rx_all)</div><div class='ctx'> {</div><div class='del'>-	u32 shared_buf_min, shared_buf_tc, shared_std;</div><div class='del'>-	int tc_num, pfc_enable_num;</div><div class='add'>+	u32 shared_buf_min, shared_buf_tc, shared_std, hi_thrd, lo_thrd;</div><div class='add'>+	u32 tc_num = hclge_get_tc_num(hdev);</div><div class='ctx'> 	u32 shared_buf, aligned_mps;</div><div class='ctx'> 	u32 rx_priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	tc_num = hclge_get_tc_num(hdev);</div><div class='del'>-	pfc_enable_num = hclge_get_pfc_enalbe_num(hdev);</div><div class='ctx'> 	aligned_mps = roundup(hdev-&gt;mps, HCLGE_BUF_SIZE_UNIT);</div><div class='ctx'> </div><div class='ctx'> 	if (hnae3_dev_dcb_supported(hdev))</div><div class='hunk'>@@ -1499,9 +1676,7 @@ static bool  hclge_is_rx_buf_ok(struct hclge_dev *hdev,</div><div class='ctx'> 		shared_buf_min = aligned_mps + HCLGE_NON_DCB_ADDITIONAL_BUF</div><div class='ctx'> 					+ hdev-&gt;dv_buf_size;</div><div class='ctx'> </div><div class='del'>-	shared_buf_tc = pfc_enable_num * aligned_mps +</div><div class='del'>-			(tc_num - pfc_enable_num) * aligned_mps / 2 +</div><div class='del'>-			aligned_mps;</div><div class='add'>+	shared_buf_tc = tc_num * aligned_mps + aligned_mps;</div><div class='ctx'> 	shared_std = roundup(max_t(u32, shared_buf_min, shared_buf_tc),</div><div class='ctx'> 			     HCLGE_BUF_SIZE_UNIT);</div><div class='ctx'> </div><div class='hunk'>@@ -1518,19 +1693,26 @@ static bool  hclge_is_rx_buf_ok(struct hclge_dev *hdev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buf_alloc-&gt;s_buf.self.high = aligned_mps +</div><div class='ctx'> 						HCLGE_NON_DCB_ADDITIONAL_BUF;</div><div class='del'>-		buf_alloc-&gt;s_buf.self.low =</div><div class='del'>-			roundup(aligned_mps / 2, HCLGE_BUF_SIZE_UNIT);</div><div class='add'>+		buf_alloc-&gt;s_buf.self.low = aligned_mps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hnae3_dev_dcb_supported(hdev)) {</div><div class='add'>+		if (tc_num)</div><div class='add'>+			hi_thrd = (shared_buf - hdev-&gt;dv_buf_size) / tc_num;</div><div class='add'>+		else</div><div class='add'>+			hi_thrd = shared_buf - hdev-&gt;dv_buf_size;</div><div class='add'>+</div><div class='add'>+		hi_thrd = max_t(u32, hi_thrd, 2 * aligned_mps);</div><div class='add'>+		hi_thrd = rounddown(hi_thrd, HCLGE_BUF_SIZE_UNIT);</div><div class='add'>+		lo_thrd = hi_thrd - aligned_mps / 2;</div><div class='add'>+	} else {</div><div class='add'>+		hi_thrd = aligned_mps + HCLGE_NON_DCB_ADDITIONAL_BUF;</div><div class='add'>+		lo_thrd = aligned_mps;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HCLGE_MAX_TC_NUM; i++) {</div><div class='del'>-		if ((hdev-&gt;hw_tc_map &amp; BIT(i)) &amp;&amp;</div><div class='del'>-		    (hdev-&gt;tm_info.hw_pfc_map &amp; BIT(i))) {</div><div class='del'>-			buf_alloc-&gt;s_buf.tc_thrd[i].low = aligned_mps;</div><div class='del'>-			buf_alloc-&gt;s_buf.tc_thrd[i].high = 2 * aligned_mps;</div><div class='del'>-		} else {</div><div class='del'>-			buf_alloc-&gt;s_buf.tc_thrd[i].low = 0;</div><div class='del'>-			buf_alloc-&gt;s_buf.tc_thrd[i].high = aligned_mps;</div><div class='del'>-		}</div><div class='add'>+		buf_alloc-&gt;s_buf.tc_thrd[i].low = lo_thrd;</div><div class='add'>+		buf_alloc-&gt;s_buf.tc_thrd[i].high = hi_thrd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -2095,6 +2277,16 @@ static int hclge_set_autoneg(struct hnae3_handle *handle, bool enable)</div><div class='ctx'> 	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='ctx'> 	struct hclge_dev *hdev = vport-&gt;back;</div><div class='ctx'> </div><div class='add'>+	if (!hdev-&gt;hw.mac.support_autoneg) {</div><div class='add'>+		if (enable) {</div><div class='add'>+			dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+				"autoneg is not supported by current port\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		} else {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return hclge_set_autoneg_en(hdev, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2110,6 +2302,78 @@ static int hclge_get_autoneg(struct hnae3_handle *handle)</div><div class='ctx'> 	return hdev-&gt;hw.mac.autoneg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclge_restart_autoneg(struct hnae3_handle *handle)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;hdev-&gt;pdev-&gt;dev, "restart autoneg\n");</div><div class='add'>+</div><div class='add'>+	ret = hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return hclge_notify_client(hdev, HNAE3_UP_CLIENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hclge_set_fec_hw(struct hclge_dev *hdev, u32 fec_mode)</div><div class='add'>+{</div><div class='add'>+	struct hclge_config_fec_cmd *req;</div><div class='add'>+	struct hclge_desc desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hclge_cmd_setup_basic_desc(&amp;desc, HCLGE_OPC_CONFIG_FEC_MODE, false);</div><div class='add'>+</div><div class='add'>+	req = (struct hclge_config_fec_cmd *)desc.data;</div><div class='add'>+	if (fec_mode &amp; BIT(HNAE3_FEC_AUTO))</div><div class='add'>+		hnae3_set_bit(req-&gt;fec_mode, HCLGE_MAC_CFG_FEC_AUTO_EN_B, 1);</div><div class='add'>+	if (fec_mode &amp; BIT(HNAE3_FEC_RS))</div><div class='add'>+		hnae3_set_field(req-&gt;fec_mode, HCLGE_MAC_CFG_FEC_MODE_M,</div><div class='add'>+				HCLGE_MAC_CFG_FEC_MODE_S, HCLGE_MAC_FEC_RS);</div><div class='add'>+	if (fec_mode &amp; BIT(HNAE3_FEC_BASER))</div><div class='add'>+		hnae3_set_field(req-&gt;fec_mode, HCLGE_MAC_CFG_FEC_MODE_M,</div><div class='add'>+				HCLGE_MAC_CFG_FEC_MODE_S, HCLGE_MAC_FEC_BASER);</div><div class='add'>+</div><div class='add'>+	ret = hclge_cmd_send(&amp;hdev-&gt;hw, &amp;desc, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "set fec mode failed %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 hclge_set_fec(struct hnae3_handle *handle, u32 fec_mode)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fec_mode &amp;&amp; !(mac-&gt;fec_ability &amp; fec_mode)) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "unsupported fec mode\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hclge_set_fec_hw(hdev, fec_mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mac-&gt;user_fec_mode = fec_mode | BIT(HNAE3_FEC_USER_DEF);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hclge_get_fec(struct hnae3_handle *handle, u8 *fec_ability,</div><div class='add'>+			  u8 *fec_mode)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='add'>+</div><div class='add'>+	if (fec_ability)</div><div class='add'>+		*fec_ability = mac-&gt;fec_ability;</div><div class='add'>+	if (fec_mode)</div><div class='add'>+		*fec_mode = mac-&gt;fec_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_mac_init(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='hunk'>@@ -2127,6 +2391,15 @@ static int hclge_mac_init(struct hclge_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	mac-&gt;link = 0;</div><div class='ctx'> </div><div class='add'>+	if (mac-&gt;user_fec_mode &amp; BIT(HNAE3_FEC_USER_DEF)) {</div><div class='add'>+		ret = hclge_set_fec_hw(hdev, mac-&gt;user_fec_mode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+				"Fec mode init fail, ret = %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = hclge_set_mac_mtu(hdev, hdev-&gt;mps);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "set mtu failed ret=%d\n", ret);</div><div class='hunk'>@@ -2143,7 +2416,8 @@ static int hclge_mac_init(struct hclge_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> static void hclge_mbx_task_schedule(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_and_set_bit(HCLGE_STATE_MBX_SERVICE_SCHED, &amp;hdev-&gt;state))</div><div class='add'>+	if (!test_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state) &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(HCLGE_STATE_MBX_SERVICE_SCHED, &amp;hdev-&gt;state))</div><div class='ctx'> 		schedule_work(&amp;hdev-&gt;mbx_service_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2222,6 +2496,7 @@ static void hclge_update_link_status(struct hclge_dev *hdev)</div><div class='ctx'> 		for (i = 0; i &lt; hdev-&gt;num_vmdq_vport + 1; i++) {</div><div class='ctx'> 			handle = &amp;hdev-&gt;vport[i].nic;</div><div class='ctx'> 			client-&gt;ops-&gt;link_status_change(handle, state);</div><div class='add'>+			hclge_config_mac_tnl_int(hdev, state);</div><div class='ctx'> 			rhandle = &amp;hdev-&gt;vport[i].roce;</div><div class='ctx'> 			if (rclient &amp;&amp; rclient-&gt;ops-&gt;link_status_change)</div><div class='ctx'> 				rclient-&gt;ops-&gt;link_status_change(rhandle,</div><div class='hunk'>@@ -2231,14 +2506,35 @@ static void hclge_update_link_status(struct hclge_dev *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hclge_update_port_capability(struct hclge_mac *mac)</div><div class='add'>+{</div><div class='add'>+	/* firmware can not identify back plane type, the media type</div><div class='add'>+	 * read from configuration can help deal it</div><div class='add'>+	 */</div><div class='add'>+	if (mac-&gt;media_type == HNAE3_MEDIA_TYPE_BACKPLANE &amp;&amp;</div><div class='add'>+	    mac-&gt;module_type == HNAE3_MODULE_TYPE_UNKNOWN)</div><div class='add'>+		mac-&gt;module_type = HNAE3_MODULE_TYPE_KR;</div><div class='add'>+	else if (mac-&gt;media_type == HNAE3_MEDIA_TYPE_COPPER)</div><div class='add'>+		mac-&gt;module_type = HNAE3_MODULE_TYPE_TP;</div><div class='add'>+</div><div class='add'>+	if (mac-&gt;support_autoneg == true) {</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, mac-&gt;supported);</div><div class='add'>+		linkmode_copy(mac-&gt;advertising, mac-&gt;supported);</div><div class='add'>+	} else {</div><div class='add'>+		linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,</div><div class='add'>+				   mac-&gt;supported);</div><div class='add'>+		linkmode_zero(mac-&gt;advertising);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_get_sfp_speed(struct hclge_dev *hdev, u32 *speed)</div><div class='ctx'> {</div><div class='del'>-	struct hclge_sfp_speed_cmd *resp = NULL;</div><div class='add'>+	struct hclge_sfp_info_cmd *resp = NULL;</div><div class='ctx'> 	struct hclge_desc desc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	hclge_cmd_setup_basic_desc(&amp;desc, HCLGE_OPC_SFP_GET_SPEED, true);</div><div class='del'>-	resp = (struct hclge_sfp_speed_cmd *)desc.data;</div><div class='add'>+	hclge_cmd_setup_basic_desc(&amp;desc, HCLGE_OPC_GET_SFP_INFO, true);</div><div class='add'>+	resp = (struct hclge_sfp_info_cmd *)desc.data;</div><div class='ctx'> 	ret = hclge_cmd_send(&amp;hdev-&gt;hw, &amp;desc, 1);</div><div class='ctx'> 	if (ret == -EOPNOTSUPP) {</div><div class='ctx'> 		dev_warn(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -2249,28 +2545,67 @@ static int hclge_get_sfp_speed(struct hclge_dev *hdev, u32 *speed)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*speed = resp-&gt;sfp_speed;</div><div class='add'>+	*speed = le32_to_cpu(resp-&gt;speed);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hclge_update_speed_duplex(struct hclge_dev *hdev)</div><div class='add'>+static int hclge_get_sfp_info(struct hclge_dev *hdev, struct hclge_mac *mac)</div><div class='ctx'> {</div><div class='del'>-	struct hclge_mac mac = hdev-&gt;hw.mac;</div><div class='del'>-	int speed;</div><div class='add'>+	struct hclge_sfp_info_cmd *resp;</div><div class='add'>+	struct hclge_desc desc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* get the speed from SFP cmd when phy</div><div class='del'>-	 * doesn't exit.</div><div class='add'>+	hclge_cmd_setup_basic_desc(&amp;desc, HCLGE_OPC_GET_SFP_INFO, true);</div><div class='add'>+	resp = (struct hclge_sfp_info_cmd *)desc.data;</div><div class='add'>+</div><div class='add'>+	resp-&gt;query_type = QUERY_ACTIVE_SPEED;</div><div class='add'>+</div><div class='add'>+	ret = hclge_cmd_send(&amp;hdev-&gt;hw, &amp;desc, 1);</div><div class='add'>+	if (ret == -EOPNOTSUPP) {</div><div class='add'>+		dev_warn(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+			 "IMP does not support get SFP info %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	} else if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "get sfp info failed %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac-&gt;speed = le32_to_cpu(resp-&gt;speed);</div><div class='add'>+	/* if resp-&gt;speed_ability is 0, it means it's an old version</div><div class='add'>+	 * firmware, do not update these params</div><div class='ctx'> 	 */</div><div class='del'>-	if (mac.phydev)</div><div class='add'>+	if (resp-&gt;speed_ability) {</div><div class='add'>+		mac-&gt;module_type = le32_to_cpu(resp-&gt;module_type);</div><div class='add'>+		mac-&gt;speed_ability = le32_to_cpu(resp-&gt;speed_ability);</div><div class='add'>+		mac-&gt;autoneg = resp-&gt;autoneg;</div><div class='add'>+		mac-&gt;support_autoneg = resp-&gt;autoneg_ability;</div><div class='add'>+	} else {</div><div class='add'>+		mac-&gt;speed_type = QUERY_SFP_SPEED;</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 hclge_update_port_info(struct hclge_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='add'>+	int speed = HCLGE_MAC_SPEED_UNKNOWN;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* get the port info from SFP cmd if not copper port */</div><div class='add'>+	if (mac-&gt;media_type == HNAE3_MEDIA_TYPE_COPPER)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* if IMP does not support get SFP/qSFP speed, return directly */</div><div class='add'>+	/* if IMP does not support get SFP/qSFP info, return directly */</div><div class='ctx'> 	if (!hdev-&gt;support_sfp_query)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = hclge_get_sfp_speed(hdev, &amp;speed);</div><div class='add'>+	if (hdev-&gt;pdev-&gt;revision &gt;= 0x21)</div><div class='add'>+		ret = hclge_get_sfp_info(hdev, mac);</div><div class='add'>+	else</div><div class='add'>+		ret = hclge_get_sfp_speed(hdev, &amp;speed);</div><div class='add'>+</div><div class='ctx'> 	if (ret == -EOPNOTSUPP) {</div><div class='ctx'> 		hdev-&gt;support_sfp_query = false;</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2278,19 +2613,20 @@ static int hclge_update_speed_duplex(struct hclge_dev *hdev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (speed == HCLGE_MAC_SPEED_UNKNOWN)</div><div class='del'>-		return 0; /* do nothing if no SFP */</div><div class='del'>-</div><div class='del'>-	/* must config full duplex for SFP */</div><div class='del'>-	return hclge_cfg_mac_speed_dup(hdev, speed, HCLGE_MAC_FULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hclge_update_speed_duplex_h(struct hnae3_handle *handle)</div><div class='del'>-{</div><div class='del'>-	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='del'>-	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	if (hdev-&gt;pdev-&gt;revision &gt;= 0x21) {</div><div class='add'>+		if (mac-&gt;speed_type == QUERY_ACTIVE_SPEED) {</div><div class='add'>+			hclge_update_port_capability(mac);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return hclge_cfg_mac_speed_dup(hdev, mac-&gt;speed,</div><div class='add'>+					       HCLGE_MAC_FULL);</div><div class='add'>+	} else {</div><div class='add'>+		if (speed == HCLGE_MAC_SPEED_UNKNOWN)</div><div class='add'>+			return 0; /* do nothing if no SFP */</div><div class='ctx'> </div><div class='del'>-	return hclge_update_speed_duplex(hdev);</div><div class='add'>+		/* must config full duplex for SFP */</div><div class='add'>+		return hclge_cfg_mac_speed_dup(hdev, speed, HCLGE_MAC_FULL);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hclge_get_status(struct hnae3_handle *handle)</div><div class='hunk'>@@ -2344,6 +2680,7 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)</div><div class='ctx'> 		set_bit(HNAE3_IMP_RESET, &amp;hdev-&gt;reset_pending);</div><div class='ctx'> 		set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='ctx'> 		*clearval = BIT(HCLGE_VECTOR0_IMPRESET_INT_B);</div><div class='add'>+		hdev-&gt;rst_stats.imp_rst_cnt++;</div><div class='ctx'> 		return HCLGE_VECTOR0_EVENT_RST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2352,6 +2689,7 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)</div><div class='ctx'> 		set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='ctx'> 		set_bit(HNAE3_GLOBAL_RESET, &amp;hdev-&gt;reset_pending);</div><div class='ctx'> 		*clearval = BIT(HCLGE_VECTOR0_GLOBALRESET_INT_B);</div><div class='add'>+		hdev-&gt;rst_stats.global_rst_cnt++;</div><div class='ctx'> 		return HCLGE_VECTOR0_EVENT_RST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2360,12 +2698,16 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)</div><div class='ctx'> 		set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='ctx'> 		set_bit(HNAE3_CORE_RESET, &amp;hdev-&gt;reset_pending);</div><div class='ctx'> 		*clearval = BIT(HCLGE_VECTOR0_CORERESET_INT_B);</div><div class='add'>+		hdev-&gt;rst_stats.core_rst_cnt++;</div><div class='ctx'> 		return HCLGE_VECTOR0_EVENT_RST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for vector0 msix event source */</div><div class='del'>-	if (msix_src_reg &amp; HCLGE_VECTOR0_REG_MSIX_MASK)</div><div class='add'>+	if (msix_src_reg &amp; HCLGE_VECTOR0_REG_MSIX_MASK) {</div><div class='add'>+		dev_dbg(&amp;hdev-&gt;pdev-&gt;dev, "received event 0x%x\n",</div><div class='add'>+			msix_src_reg);</div><div class='ctx'> 		return HCLGE_VECTOR0_EVENT_ERR;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* check for vector0 mailbox(=CMDQ RX) event source */</div><div class='ctx'> 	if (BIT(HCLGE_VECTOR0_RX_CMDQ_INT_B) &amp; cmdq_src_reg) {</div><div class='hunk'>@@ -2374,6 +2716,9 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)</div><div class='ctx'> 		return HCLGE_VECTOR0_EVENT_MBX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* print other vector0 event source */</div><div class='add'>+	dev_dbg(&amp;hdev-&gt;pdev-&gt;dev, "cmdq_src_reg:0x%x, msix_src_reg:0x%x\n",</div><div class='add'>+		cmdq_src_reg, msix_src_reg);</div><div class='ctx'> 	return HCLGE_VECTOR0_EVENT_OTHER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2657,7 +3002,7 @@ static int hclge_set_all_vf_rst(struct hclge_dev *hdev, bool reset)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!reset)</div><div class='add'>+		if (!reset || !test_bit(HCLGE_VPORT_STATE_ALIVE, &amp;vport-&gt;state))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Inform VF to process the reset.</div><div class='hunk'>@@ -2694,9 +3039,18 @@ int hclge_func_reset_cmd(struct hclge_dev *hdev, int func_id)</div><div class='ctx'> </div><div class='ctx'> static void hclge_do_reset(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='add'>+	struct hnae3_handle *handle = &amp;hdev-&gt;vport[0].nic;</div><div class='ctx'> 	struct pci_dev *pdev = hdev-&gt;pdev;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	if (hclge_get_hw_reset_stat(handle)) {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Hardware reset not finish\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "func_rst_reg:0x%x, global_rst_reg:0x%x\n",</div><div class='add'>+			 hclge_read_dev(&amp;hdev-&gt;hw, HCLGE_FUN_RST_ING),</div><div class='add'>+			 hclge_read_dev(&amp;hdev-&gt;hw, HCLGE_GLOBAL_RESET_REG));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (hdev-&gt;reset_type) {</div><div class='ctx'> 	case HNAE3_GLOBAL_RESET:</div><div class='ctx'> 		val = hclge_read_dev(&amp;hdev-&gt;hw, HCLGE_GLOBAL_RESET_REG);</div><div class='hunk'>@@ -2775,6 +3129,10 @@ static enum hnae3_reset_type hclge_get_reset_level(struct hclge_dev *hdev,</div><div class='ctx'> 		clear_bit(HNAE3_FLR_RESET, addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;reset_type != HNAE3_NONE_RESET &amp;&amp;</div><div class='add'>+	    rst_level &lt; hdev-&gt;reset_type)</div><div class='add'>+		return HNAE3_NONE_RESET;</div><div class='add'>+</div><div class='ctx'> 	return rst_level;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2844,6 +3202,7 @@ static int hclge_reset_prepare_wait(struct hclge_dev *hdev)</div><div class='ctx'> 		 * after hclge_cmd_init is called.</div><div class='ctx'> 		 */</div><div class='ctx'> 		set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='add'>+		hdev-&gt;rst_stats.pf_rst_cnt++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HNAE3_FLR_RESET:</div><div class='ctx'> 		/* There is no mechanism for PF to know if VF has stopped IO</div><div class='hunk'>@@ -2852,6 +3211,7 @@ static int hclge_reset_prepare_wait(struct hclge_dev *hdev)</div><div class='ctx'> 		msleep(100);</div><div class='ctx'> 		set_bit(HCLGE_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='ctx'> 		set_bit(HNAE3_FLR_DOWN, &amp;hdev-&gt;flr_state);</div><div class='add'>+		hdev-&gt;rst_stats.flr_rst_cnt++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HNAE3_IMP_RESET:</div><div class='ctx'> 		reg_val = hclge_read_dev(&amp;hdev-&gt;hw, HCLGE_PF_OTHER_INT_REG);</div><div class='hunk'>@@ -2932,7 +3292,7 @@ static void hclge_reset(struct hclge_dev *hdev)</div><div class='ctx'> 	 * know if device is undergoing reset</div><div class='ctx'> 	 */</div><div class='ctx'> 	ae_dev-&gt;reset_type = hdev-&gt;reset_type;</div><div class='del'>-	hdev-&gt;reset_count++;</div><div class='add'>+	hdev-&gt;rst_stats.reset_cnt++;</div><div class='ctx'> 	/* perform reset of the stack &amp; ae device for a client */</div><div class='ctx'> 	ret = hclge_notify_roce_client(hdev, HNAE3_DOWN_CLIENT);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2958,6 +3318,8 @@ static void hclge_reset(struct hclge_dev *hdev)</div><div class='ctx'> 		goto err_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hdev-&gt;rst_stats.hw_reset_done_cnt++;</div><div class='add'>+</div><div class='ctx'> 	ret = hclge_notify_roce_client(hdev, HNAE3_UNINIT_CLIENT);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_reset;</div><div class='hunk'>@@ -3001,7 +3363,9 @@ static void hclge_reset(struct hclge_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;last_reset_time = jiffies;</div><div class='ctx'> 	hdev-&gt;reset_fail_cnt = 0;</div><div class='add'>+	hdev-&gt;rst_stats.reset_done_cnt++;</div><div class='ctx'> 	ae_dev-&gt;reset_type = HNAE3_NONE_RESET;</div><div class='add'>+	del_timer(&amp;hdev-&gt;reset_timer);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -3154,7 +3518,7 @@ static void hclge_service_task(struct work_struct *work)</div><div class='ctx'> 		hdev-&gt;hw_stats.stats_timer = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hclge_update_speed_duplex(hdev);</div><div class='add'>+	hclge_update_port_info(hdev);</div><div class='ctx'> 	hclge_update_link_status(hdev);</div><div class='ctx'> 	hclge_update_vport_alive(hdev);</div><div class='ctx'> 	hclge_service_complete(hdev);</div><div class='hunk'>@@ -5194,7 +5558,7 @@ static unsigned long hclge_ae_dev_reset_cnt(struct hnae3_handle *handle)</div><div class='ctx'> 	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='ctx'> 	struct hclge_dev *hdev = vport-&gt;back;</div><div class='ctx'> </div><div class='del'>-	return hdev-&gt;reset_count;</div><div class='add'>+	return hdev-&gt;rst_stats.hw_reset_done_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclge_enable_fd(struct hnae3_handle *handle, bool enable)</div><div class='hunk'>@@ -5282,8 +5646,8 @@ static int hclge_set_serdes_loopback(struct hclge_dev *hdev, bool en,</div><div class='ctx'> #define HCLGE_SERDES_RETRY_MS	10</div><div class='ctx'> #define HCLGE_SERDES_RETRY_NUM	100</div><div class='ctx'> </div><div class='del'>-#define HCLGE_MAC_LINK_STATUS_MS   20</div><div class='del'>-#define HCLGE_MAC_LINK_STATUS_NUM  10</div><div class='add'>+#define HCLGE_MAC_LINK_STATUS_MS   10</div><div class='add'>+#define HCLGE_MAC_LINK_STATUS_NUM  100</div><div class='ctx'> #define HCLGE_MAC_LINK_STATUS_DOWN 0</div><div class='ctx'> #define HCLGE_MAC_LINK_STATUS_UP   1</div><div class='ctx'> </div><div class='hunk'>@@ -5942,8 +6306,11 @@ int hclge_add_uc_addr_common(struct hclge_vport *vport,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check if we just hit the duplicate */</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	if (!ret) {</div><div class='add'>+		dev_warn(&amp;hdev-&gt;pdev-&gt;dev, "VF %d mac(%pM) exists\n",</div><div class='add'>+			 vport-&gt;vport_id, addr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 		"PF failed to add unicast entry(%pM) in the MAC table\n",</div><div class='hunk'>@@ -6293,7 +6660,8 @@ static int hclge_set_mac_addr(struct hnae3_handle *handle, void *p,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!is_first &amp;&amp; hclge_rm_uc_addr(handle, hdev-&gt;hw.mac.mac_addr))</div><div class='add'>+	if ((!is_first || is_kdump_kernel()) &amp;&amp;</div><div class='add'>+	    hclge_rm_uc_addr(handle, hdev-&gt;hw.mac.mac_addr))</div><div class='ctx'> 		dev_warn(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 			 "remove old uc mac address fail.\n");</div><div class='ctx'> </div><div class='hunk'>@@ -6543,30 +6911,6 @@ static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,</div><div class='del'>-			  u16 vlan_id, bool is_kill)</div><div class='del'>-{</div><div class='del'>-	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='del'>-	struct hclge_dev *hdev = vport-&gt;back;</div><div class='del'>-</div><div class='del'>-	return hclge_set_vlan_filter_hw(hdev, proto, vport-&gt;vport_id, vlan_id,</div><div class='del'>-					0, is_kill);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid,</div><div class='del'>-				    u16 vlan, u8 qos, __be16 proto)</div><div class='del'>-{</div><div class='del'>-	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='del'>-	struct hclge_dev *hdev = vport-&gt;back;</div><div class='del'>-</div><div class='del'>-	if ((vfid &gt;= hdev-&gt;num_alloc_vfs) || (vlan &gt; 4095) || (qos &gt; 7))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (proto != htons(ETH_P_8021Q))</div><div class='del'>-		return -EPROTONOSUPPORT;</div><div class='del'>-</div><div class='del'>-	return hclge_set_vlan_filter_hw(hdev, proto, vfid, vlan, qos, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_tx_vtag_cfg *vcfg = &amp;vport-&gt;txvlan_cfg;</div><div class='hunk'>@@ -6640,6 +6984,52 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclge_vlan_offload_cfg(struct hclge_vport *vport,</div><div class='add'>+				  u16 port_base_vlan_state,</div><div class='add'>+				  u16 vlan_tag)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (port_base_vlan_state == HNAE3_PORT_BASE_VLAN_DISABLE) {</div><div class='add'>+		vport-&gt;txvlan_cfg.accept_tag1 = true;</div><div class='add'>+		vport-&gt;txvlan_cfg.insert_tag1_en = false;</div><div class='add'>+		vport-&gt;txvlan_cfg.default_tag1 = 0;</div><div class='add'>+	} else {</div><div class='add'>+		vport-&gt;txvlan_cfg.accept_tag1 = false;</div><div class='add'>+		vport-&gt;txvlan_cfg.insert_tag1_en = true;</div><div class='add'>+		vport-&gt;txvlan_cfg.default_tag1 = vlan_tag;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vport-&gt;txvlan_cfg.accept_untag1 = true;</div><div class='add'>+</div><div class='add'>+	/* accept_tag2 and accept_untag2 are not supported on</div><div class='add'>+	 * pdev revision(0x20), new revision support them,</div><div class='add'>+	 * this two fields can not be configured by user.</div><div class='add'>+	 */</div><div class='add'>+	vport-&gt;txvlan_cfg.accept_tag2 = true;</div><div class='add'>+	vport-&gt;txvlan_cfg.accept_untag2 = true;</div><div class='add'>+	vport-&gt;txvlan_cfg.insert_tag2_en = false;</div><div class='add'>+	vport-&gt;txvlan_cfg.default_tag2 = 0;</div><div class='add'>+</div><div class='add'>+	if (port_base_vlan_state == HNAE3_PORT_BASE_VLAN_DISABLE) {</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag1_en = false;</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag2_en =</div><div class='add'>+				vport-&gt;rxvlan_cfg.rx_vlan_offload_en;</div><div class='add'>+	} else {</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag1_en =</div><div class='add'>+				vport-&gt;rxvlan_cfg.rx_vlan_offload_en;</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag2_en = true;</div><div class='add'>+	}</div><div class='add'>+	vport-&gt;rxvlan_cfg.vlan1_vlan_prionly = false;</div><div class='add'>+	vport-&gt;rxvlan_cfg.vlan2_vlan_prionly = false;</div><div class='add'>+</div><div class='add'>+	ret = hclge_set_vlan_tx_offload_cfg(vport);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return hclge_set_vlan_rx_offload_cfg(vport);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_set_vlan_protocol_type(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_rx_vlan_type_cfg_cmd *rx_req;</div><div class='hunk'>@@ -6730,34 +7120,14 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hdev-&gt;num_alloc_vport; i++) {</div><div class='del'>-		vport = &amp;hdev-&gt;vport[i];</div><div class='del'>-		vport-&gt;txvlan_cfg.accept_tag1 = true;</div><div class='del'>-		vport-&gt;txvlan_cfg.accept_untag1 = true;</div><div class='del'>-</div><div class='del'>-		/* accept_tag2 and accept_untag2 are not supported on</div><div class='del'>-		 * pdev revision(0x20), new revision support them. The</div><div class='del'>-		 * value of this two fields will not return error when driver</div><div class='del'>-		 * send command to fireware in revision(0x20).</div><div class='del'>-		 * This two fields can not configured by user.</div><div class='del'>-		 */</div><div class='del'>-		vport-&gt;txvlan_cfg.accept_tag2 = true;</div><div class='del'>-		vport-&gt;txvlan_cfg.accept_untag2 = true;</div><div class='add'>+		u16 vlan_tag;</div><div class='ctx'> </div><div class='del'>-		vport-&gt;txvlan_cfg.insert_tag1_en = false;</div><div class='del'>-		vport-&gt;txvlan_cfg.insert_tag2_en = false;</div><div class='del'>-		vport-&gt;txvlan_cfg.default_tag1 = 0;</div><div class='del'>-		vport-&gt;txvlan_cfg.default_tag2 = 0;</div><div class='del'>-</div><div class='del'>-		ret = hclge_set_vlan_tx_offload_cfg(vport);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		vport-&gt;rxvlan_cfg.strip_tag1_en = false;</div><div class='del'>-		vport-&gt;rxvlan_cfg.strip_tag2_en = true;</div><div class='del'>-		vport-&gt;rxvlan_cfg.vlan1_vlan_prionly = false;</div><div class='del'>-		vport-&gt;rxvlan_cfg.vlan2_vlan_prionly = false;</div><div class='add'>+		vport = &amp;hdev-&gt;vport[i];</div><div class='add'>+		vlan_tag = vport-&gt;port_base_vlan_cfg.vlan_info.vlan_tag;</div><div class='ctx'> </div><div class='del'>-		ret = hclge_set_vlan_rx_offload_cfg(vport);</div><div class='add'>+		ret = hclge_vlan_offload_cfg(vport,</div><div class='add'>+					     vport-&gt;port_base_vlan_cfg.state,</div><div class='add'>+					     vlan_tag);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6765,7 +7135,8 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev)</div><div class='ctx'> 	return hclge_set_vlan_filter(handle, htons(ETH_P_8021Q), 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id)</div><div class='add'>+static void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,</div><div class='add'>+				       bool writen_to_tbl)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_vport_vlan_cfg *vlan;</div><div class='ctx'> </div><div class='hunk'>@@ -6777,14 +7148,38 @@ void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id)</div><div class='ctx'> 	if (!vlan)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	vlan-&gt;hd_tbl_status = true;</div><div class='add'>+	vlan-&gt;hd_tbl_status = writen_to_tbl;</div><div class='ctx'> 	vlan-&gt;vlan_id = vlan_id;</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;vlan-&gt;node, &amp;vport-&gt;vlan_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,</div><div class='del'>-			       bool is_write_tbl)</div><div class='add'>+static int hclge_add_vport_all_vlan_table(struct hclge_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport_vlan_cfg *vlan, *tmp;</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(vlan, tmp, &amp;vport-&gt;vlan_list, node) {</div><div class='add'>+		if (!vlan-&gt;hd_tbl_status) {</div><div class='add'>+			ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),</div><div class='add'>+						       vport-&gt;vport_id,</div><div class='add'>+						       vlan-&gt;vlan_id, 0, false);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+					"restore vport vlan list 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'>+		vlan-&gt;hd_tbl_status = 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 void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,</div><div class='add'>+				      bool is_write_tbl)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_vport_vlan_cfg *vlan, *tmp;</div><div class='ctx'> 	struct hclge_dev *hdev = vport-&gt;back;</div><div class='hunk'>@@ -6847,14 +7242,203 @@ int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='ctx'> </div><div class='del'>-	vport-&gt;rxvlan_cfg.strip_tag1_en = false;</div><div class='del'>-	vport-&gt;rxvlan_cfg.strip_tag2_en = enable;</div><div class='add'>+	if (vport-&gt;port_base_vlan_cfg.state == HNAE3_PORT_BASE_VLAN_DISABLE) {</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag1_en = false;</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag2_en = enable;</div><div class='add'>+	} else {</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag1_en = enable;</div><div class='add'>+		vport-&gt;rxvlan_cfg.strip_tag2_en = true;</div><div class='add'>+	}</div><div class='ctx'> 	vport-&gt;rxvlan_cfg.vlan1_vlan_prionly = false;</div><div class='ctx'> 	vport-&gt;rxvlan_cfg.vlan2_vlan_prionly = false;</div><div class='add'>+	vport-&gt;rxvlan_cfg.rx_vlan_offload_en = enable;</div><div class='ctx'> </div><div class='ctx'> 	return hclge_set_vlan_rx_offload_cfg(vport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclge_update_vlan_filter_entries(struct hclge_vport *vport,</div><div class='add'>+					    u16 port_base_vlan_state,</div><div class='add'>+					    struct hclge_vlan_info *new_info,</div><div class='add'>+					    struct hclge_vlan_info *old_info)</div><div class='add'>+{</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (port_base_vlan_state == HNAE3_PORT_BASE_VLAN_ENABLE) {</div><div class='add'>+		hclge_rm_vport_all_vlan_table(vport, false);</div><div class='add'>+		return hclge_set_vlan_filter_hw(hdev,</div><div class='add'>+						 htons(new_info-&gt;vlan_proto),</div><div class='add'>+						 vport-&gt;vport_id,</div><div class='add'>+						 new_info-&gt;vlan_tag,</div><div class='add'>+						 new_info-&gt;qos, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hclge_set_vlan_filter_hw(hdev, htons(old_info-&gt;vlan_proto),</div><div class='add'>+				       vport-&gt;vport_id, old_info-&gt;vlan_tag,</div><div class='add'>+				       old_info-&gt;qos, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return hclge_add_vport_all_vlan_table(vport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state,</div><div class='add'>+				    struct hclge_vlan_info *vlan_info)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *nic = &amp;vport-&gt;nic;</div><div class='add'>+	struct hclge_vlan_info *old_vlan_info;</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	old_vlan_info = &amp;vport-&gt;port_base_vlan_cfg.vlan_info;</div><div class='add'>+</div><div class='add'>+	ret = hclge_vlan_offload_cfg(vport, state, vlan_info-&gt;vlan_tag);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (state == HNAE3_PORT_BASE_VLAN_MODIFY) {</div><div class='add'>+		/* add new VLAN tag */</div><div class='add'>+		ret = hclge_set_vlan_filter_hw(hdev,</div><div class='add'>+					       htons(vlan_info-&gt;vlan_proto),</div><div class='add'>+					       vport-&gt;vport_id,</div><div class='add'>+					       vlan_info-&gt;vlan_tag,</div><div class='add'>+					       vlan_info-&gt;qos, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* remove old VLAN tag */</div><div class='add'>+		ret = hclge_set_vlan_filter_hw(hdev,</div><div class='add'>+					       htons(old_vlan_info-&gt;vlan_proto),</div><div class='add'>+					       vport-&gt;vport_id,</div><div class='add'>+					       old_vlan_info-&gt;vlan_tag,</div><div class='add'>+					       old_vlan_info-&gt;qos, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		goto update;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hclge_update_vlan_filter_entries(vport, state, vlan_info,</div><div class='add'>+					       old_vlan_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* update state only when disable/enable port based VLAN */</div><div class='add'>+	vport-&gt;port_base_vlan_cfg.state = state;</div><div class='add'>+	if (state == HNAE3_PORT_BASE_VLAN_DISABLE)</div><div class='add'>+		nic-&gt;port_base_vlan_state = HNAE3_PORT_BASE_VLAN_DISABLE;</div><div class='add'>+	else</div><div class='add'>+		nic-&gt;port_base_vlan_state = HNAE3_PORT_BASE_VLAN_ENABLE;</div><div class='add'>+</div><div class='add'>+update:</div><div class='add'>+	vport-&gt;port_base_vlan_cfg.vlan_info.vlan_tag = vlan_info-&gt;vlan_tag;</div><div class='add'>+	vport-&gt;port_base_vlan_cfg.vlan_info.qos = vlan_info-&gt;qos;</div><div class='add'>+	vport-&gt;port_base_vlan_cfg.vlan_info.vlan_proto = vlan_info-&gt;vlan_proto;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 hclge_get_port_base_vlan_state(struct hclge_vport *vport,</div><div class='add'>+					  enum hnae3_port_base_vlan_state state,</div><div class='add'>+					  u16 vlan)</div><div class='add'>+{</div><div class='add'>+	if (state == HNAE3_PORT_BASE_VLAN_DISABLE) {</div><div class='add'>+		if (!vlan)</div><div class='add'>+			return HNAE3_PORT_BASE_VLAN_NOCHANGE;</div><div class='add'>+		else</div><div class='add'>+			return HNAE3_PORT_BASE_VLAN_ENABLE;</div><div class='add'>+	} else {</div><div class='add'>+		if (!vlan)</div><div class='add'>+			return HNAE3_PORT_BASE_VLAN_DISABLE;</div><div class='add'>+		else if (vport-&gt;port_base_vlan_cfg.vlan_info.vlan_tag == vlan)</div><div class='add'>+			return HNAE3_PORT_BASE_VLAN_NOCHANGE;</div><div class='add'>+		else</div><div class='add'>+			return HNAE3_PORT_BASE_VLAN_MODIFY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid,</div><div class='add'>+				    u16 vlan, u8 qos, __be16 proto)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	struct hclge_vlan_info vlan_info;</div><div class='add'>+	u16 state;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;pdev-&gt;revision == 0x20)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* qos is a 3 bits value, so can not be bigger than 7 */</div><div class='add'>+	if (vfid &gt;= hdev-&gt;num_alloc_vfs || vlan &gt; VLAN_N_VID - 1 || qos &gt; 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (proto != htons(ETH_P_8021Q))</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+</div><div class='add'>+	vport = &amp;hdev-&gt;vport[vfid];</div><div class='add'>+	state = hclge_get_port_base_vlan_state(vport,</div><div class='add'>+					       vport-&gt;port_base_vlan_cfg.state,</div><div class='add'>+					       vlan);</div><div class='add'>+	if (state == HNAE3_PORT_BASE_VLAN_NOCHANGE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlan_info.vlan_tag = vlan;</div><div class='add'>+	vlan_info.qos = qos;</div><div class='add'>+	vlan_info.vlan_proto = ntohs(proto);</div><div class='add'>+</div><div class='add'>+	/* update port based VLAN for PF */</div><div class='add'>+	if (!vfid) {</div><div class='add'>+		hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);</div><div class='add'>+		ret = hclge_update_port_base_vlan_cfg(vport, state, &amp;vlan_info);</div><div class='add'>+		hclge_notify_client(hdev, HNAE3_UP_CLIENT);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HCLGE_VPORT_STATE_ALIVE, &amp;vport-&gt;state)) {</div><div class='add'>+		return hclge_update_port_base_vlan_cfg(vport, state,</div><div class='add'>+						       &amp;vlan_info);</div><div class='add'>+	} else {</div><div class='add'>+		ret = hclge_push_vf_port_base_vlan_info(&amp;hdev-&gt;vport[0],</div><div class='add'>+							(u8)vfid, state,</div><div class='add'>+							vlan, qos,</div><div class='add'>+							ntohs(proto));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,</div><div class='add'>+			  u16 vlan_id, bool is_kill)</div><div class='add'>+{</div><div class='add'>+	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	bool writen_to_tbl = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* when port based VLAN enabled, we use port based VLAN as the VLAN</div><div class='add'>+	 * filter entry. In this case, we don't update VLAN filter table</div><div class='add'>+	 * when user add new VLAN or remove exist VLAN, just update the vport</div><div class='add'>+	 * VLAN list. The VLAN id in VLAN list won't be writen in VLAN filter</div><div class='add'>+	 * table until port based VLAN disabled</div><div class='add'>+	 */</div><div class='add'>+	if (handle-&gt;port_base_vlan_state == HNAE3_PORT_BASE_VLAN_DISABLE) {</div><div class='add'>+		ret = hclge_set_vlan_filter_hw(hdev, proto, vport-&gt;vport_id,</div><div class='add'>+					       vlan_id, 0, is_kill);</div><div class='add'>+		writen_to_tbl = true;</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'>+	if (is_kill)</div><div class='add'>+		hclge_rm_vport_vlan_table(vport, vlan_id, false);</div><div class='add'>+	else</div><div class='add'>+		hclge_add_vport_vlan_table(vport, vlan_id,</div><div class='add'>+					   writen_to_tbl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mps)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_config_max_frm_size_cmd *req;</div><div class='hunk'>@@ -7199,13 +7783,13 @@ static int hclge_set_pauseparam(struct hnae3_handle *handle, u32 auto_neg,</div><div class='ctx'> 	if (!fc_autoneg)</div><div class='ctx'> 		return hclge_cfg_pauseparam(hdev, rx_en, tx_en);</div><div class='ctx'> </div><div class='del'>-	/* Only support flow control negotiation for netdev with</div><div class='del'>-	 * phy attached for now.</div><div class='del'>-	 */</div><div class='del'>-	if (!phydev)</div><div class='add'>+	if (phydev)</div><div class='add'>+		return phy_start_aneg(phydev);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;pdev-&gt;revision == 0x20)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return phy_start_aneg(phydev);</div><div class='add'>+	return hclge_restart_autoneg(handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclge_get_ksettings_an_result(struct hnae3_handle *handle,</div><div class='hunk'>@@ -7222,13 +7806,17 @@ static void hclge_get_ksettings_an_result(struct hnae3_handle *handle,</div><div class='ctx'> 		*auto_neg = hdev-&gt;hw.mac.autoneg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hclge_get_media_type(struct hnae3_handle *handle, u8 *media_type)</div><div class='add'>+static void hclge_get_media_type(struct hnae3_handle *handle, u8 *media_type,</div><div class='add'>+				 u8 *module_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_vport *vport = hclge_get_vport(handle);</div><div class='ctx'> 	struct hclge_dev *hdev = vport-&gt;back;</div><div class='ctx'> </div><div class='ctx'> 	if (media_type)</div><div class='ctx'> 		*media_type = hdev-&gt;hw.mac.media_type;</div><div class='add'>+</div><div class='add'>+	if (module_type)</div><div class='add'>+		*module_type = hdev-&gt;hw.mac.module_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclge_get_mdix_mode(struct hnae3_handle *handle,</div><div class='hunk'>@@ -7280,6 +7868,32 @@ static void hclge_get_mdix_mode(struct hnae3_handle *handle,</div><div class='ctx'> 		*tp_mdix = ETH_TP_MDI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hclge_info_show(struct hclge_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;hdev-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "PF info begin:\n");</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Task queue pairs numbers: %d\n", hdev-&gt;num_tqps);</div><div class='add'>+	dev_info(dev, "Desc num per TX queue: %d\n", hdev-&gt;num_tx_desc);</div><div class='add'>+	dev_info(dev, "Desc num per RX queue: %d\n", hdev-&gt;num_rx_desc);</div><div class='add'>+	dev_info(dev, "Numbers of vports: %d\n", hdev-&gt;num_alloc_vport);</div><div class='add'>+	dev_info(dev, "Numbers of vmdp vports: %d\n", hdev-&gt;num_vmdq_vport);</div><div class='add'>+	dev_info(dev, "Numbers of VF for this PF: %d\n", hdev-&gt;num_req_vfs);</div><div class='add'>+	dev_info(dev, "HW tc map: %d\n", hdev-&gt;hw_tc_map);</div><div class='add'>+	dev_info(dev, "Total buffer size for TX/RX: %d\n", hdev-&gt;pkt_buf_size);</div><div class='add'>+	dev_info(dev, "TX buffer size for each TC: %d\n", hdev-&gt;tx_buf_size);</div><div class='add'>+	dev_info(dev, "DV buffer size for each TC: %d\n", hdev-&gt;dv_buf_size);</div><div class='add'>+	dev_info(dev, "This is %s PF\n",</div><div class='add'>+		 hdev-&gt;flag &amp; HCLGE_FLAG_MAIN ? "main" : "not main");</div><div class='add'>+	dev_info(dev, "DCB %s\n",</div><div class='add'>+		 hdev-&gt;flag &amp; HCLGE_FLAG_DCB_ENABLE ? "enable" : "disable");</div><div class='add'>+	dev_info(dev, "MQPRIO %s\n",</div><div class='add'>+		 hdev-&gt;flag &amp; HCLGE_FLAG_MQPRIO_ENABLE ? "enable" : "disable");</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "PF info end.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_init_client_instance(struct hnae3_client *client,</div><div class='ctx'> 				      struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -7301,6 +7915,9 @@ static int hclge_init_client_instance(struct hnae3_client *client,</div><div class='ctx'> </div><div class='ctx'> 			hnae3_set_client_init_flag(client, ae_dev, 1);</div><div class='ctx'> </div><div class='add'>+			if (netif_msg_drv(&amp;hdev-&gt;vport-&gt;nic))</div><div class='add'>+				hclge_info_show(hdev);</div><div class='add'>+</div><div class='ctx'> 			if (hdev-&gt;roce_client &amp;&amp;</div><div class='ctx'> 			    hnae3_dev_roce_supported(hdev)) {</div><div class='ctx'> 				struct hnae3_client *rc = hdev-&gt;roce_client;</div><div class='hunk'>@@ -7660,6 +8277,8 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> 		goto err_mdiobus_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	INIT_KFIFO(hdev-&gt;mac_tnl_log);</div><div class='add'>+</div><div class='ctx'> 	hclge_dcb_ops_set(hdev);</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;hdev-&gt;service_timer, hclge_service_timer, 0);</div><div class='hunk'>@@ -7708,7 +8327,7 @@ static void hclge_reset_vport_state(struct hclge_dev *hdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hdev-&gt;num_alloc_vport; i++) {</div><div class='del'>-		hclge_vport_start(vport);</div><div class='add'>+		hclge_vport_stop(vport);</div><div class='ctx'> 		vport++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -7813,6 +8432,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> 	hclge_enable_vector(&amp;hdev-&gt;misc_vector, false);</div><div class='ctx'> 	synchronize_irq(hdev-&gt;misc_vector.vector_irq);</div><div class='ctx'> </div><div class='add'>+	hclge_config_mac_tnl_int(hdev, false);</div><div class='ctx'> 	hclge_hw_error_set_state(hdev, false);</div><div class='ctx'> 	hclge_cmd_uninit(hdev);</div><div class='ctx'> 	hclge_misc_irq_uninit(hdev);</div><div class='hunk'>@@ -8234,9 +8854,11 @@ static const struct hnae3_ae_ops hclge_ops = {</div><div class='ctx'> 	.client_stop = hclge_client_stop,</div><div class='ctx'> 	.get_status = hclge_get_status,</div><div class='ctx'> 	.get_ksettings_an_result = hclge_get_ksettings_an_result,</div><div class='del'>-	.update_speed_duplex_h = hclge_update_speed_duplex_h,</div><div class='ctx'> 	.cfg_mac_speed_dup_h = hclge_cfg_mac_speed_dup_h,</div><div class='ctx'> 	.get_media_type = hclge_get_media_type,</div><div class='add'>+	.check_port_speed = hclge_check_port_speed,</div><div class='add'>+	.get_fec = hclge_get_fec,</div><div class='add'>+	.set_fec = hclge_set_fec,</div><div class='ctx'> 	.get_rss_key_size = hclge_get_rss_key_size,</div><div class='ctx'> 	.get_rss_indir_size = hclge_get_rss_indir_size,</div><div class='ctx'> 	.get_rss = hclge_get_rss,</div><div class='hunk'>@@ -8253,11 +8875,13 @@ static const struct hnae3_ae_ops hclge_ops = {</div><div class='ctx'> 	.rm_mc_addr = hclge_rm_mc_addr,</div><div class='ctx'> 	.set_autoneg = hclge_set_autoneg,</div><div class='ctx'> 	.get_autoneg = hclge_get_autoneg,</div><div class='add'>+	.restart_autoneg = hclge_restart_autoneg,</div><div class='ctx'> 	.get_pauseparam = hclge_get_pauseparam,</div><div class='ctx'> 	.set_pauseparam = hclge_set_pauseparam,</div><div class='ctx'> 	.set_mtu = hclge_set_mtu,</div><div class='ctx'> 	.reset_queue = hclge_reset_tqp,</div><div class='ctx'> 	.get_stats = hclge_get_stats,</div><div class='add'>+	.get_mac_pause_stats = hclge_get_mac_pause_stat,</div><div class='ctx'> 	.update_stats = hclge_update_stats,</div><div class='ctx'> 	.get_strings = hclge_get_strings,</div><div class='ctx'> 	.get_sset_count = hclge_get_sset_count,</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h<br/>index b57ac4beb313..dd06b11187b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hclge_cmd.h"</div><div class='ctx'> #include "hnae3.h"</div><div class='hunk'>@@ -188,6 +189,8 @@ enum HLCGE_PORT_TYPE {</div><div class='ctx'> #define HCLGE_SUPPORT_25G_BIT		BIT(2)</div><div class='ctx'> #define HCLGE_SUPPORT_50G_BIT		BIT(3)</div><div class='ctx'> #define HCLGE_SUPPORT_100G_BIT		BIT(4)</div><div class='add'>+/* to be compatible with exsit board */</div><div class='add'>+#define HCLGE_SUPPORT_40G_BIT		BIT(5)</div><div class='ctx'> #define HCLGE_SUPPORT_100M_BIT		BIT(6)</div><div class='ctx'> #define HCLGE_SUPPORT_10M_BIT		BIT(7)</div><div class='ctx'> #define HCLGE_SUPPORT_GE \</div><div class='hunk'>@@ -235,15 +238,25 @@ enum HCLGE_MAC_DUPLEX {</div><div class='ctx'> 	HCLGE_MAC_FULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define QUERY_SFP_SPEED		0</div><div class='add'>+#define QUERY_ACTIVE_SPEED	1</div><div class='add'>+</div><div class='ctx'> struct hclge_mac {</div><div class='ctx'> 	u8 phy_addr;</div><div class='ctx'> 	u8 flag;</div><div class='del'>-	u8 media_type;</div><div class='add'>+	u8 media_type;	/* port media type, e.g. fibre/copper/backplane */</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> 	u8 autoneg;</div><div class='ctx'> 	u8 duplex;</div><div class='add'>+	u8 support_autoneg;</div><div class='add'>+	u8 speed_type;	/* 0: sfp speed, 1: active speed */</div><div class='ctx'> 	u32 speed;</div><div class='del'>-	int link;	/* store the link status of mac &amp; phy (if phy exit)*/</div><div class='add'>+	u32 speed_ability; /* speed ability supported by current media */</div><div class='add'>+	u32 module_type; /* sub media type, e.g. kr/cr/sr/lr */</div><div class='add'>+	u32 fec_mode; /* active fec mode */</div><div class='add'>+	u32 user_fec_mode;</div><div class='add'>+	u32 fec_ability;</div><div class='add'>+	int link;	/* store the link status of mac &amp; phy (if phy exit) */</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	struct mii_bus *mdio_bus;</div><div class='ctx'> 	phy_interface_t phy_if;</div><div class='hunk'>@@ -649,6 +662,23 @@ struct hclge_vport_vlan_cfg {</div><div class='ctx'> 	u16 vlan_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hclge_rst_stats {</div><div class='add'>+	u32 reset_done_cnt;	/* the number of reset has completed */</div><div class='add'>+	u32 hw_reset_done_cnt;	/* the number of HW reset has completed */</div><div class='add'>+	u32 pf_rst_cnt;		/* the number of PF reset */</div><div class='add'>+	u32 flr_rst_cnt;	/* the number of FLR */</div><div class='add'>+	u32 core_rst_cnt;	/* the number of CORE reset */</div><div class='add'>+	u32 global_rst_cnt;	/* the number of GLOBAL */</div><div class='add'>+	u32 imp_rst_cnt;	/* the number of IMP reset */</div><div class='add'>+	u32 reset_cnt;		/* the number of reset */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* time and register status when mac tunnel interruption occur */</div><div class='add'>+struct hclge_mac_tnl_stats {</div><div class='add'>+	u64 time;</div><div class='add'>+	u32 status;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* For each bit of TCAM entry, it uses a pair of 'x' and</div><div class='ctx'>  * 'y' to indicate which value to match, like below:</div><div class='ctx'>  * ----------------------------------</div><div class='hunk'>@@ -675,6 +705,7 @@ struct hclge_vport_vlan_cfg {</div><div class='ctx'> 		(y) = (_k_ ^ ~_v_) &amp; (_k_); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define HCLGE_MAC_TNL_LOG_SIZE	8</div><div class='ctx'> #define HCLGE_VPORT_NUM 256</div><div class='ctx'> struct hclge_dev {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='hunk'>@@ -691,7 +722,7 @@ struct hclge_dev {</div><div class='ctx'> 	unsigned long default_reset_request;</div><div class='ctx'> 	unsigned long reset_request;	/* reset has been requested */</div><div class='ctx'> 	unsigned long reset_pending;	/* client rst is pending to be served */</div><div class='del'>-	unsigned long reset_count;	/* the number of reset has been done */</div><div class='add'>+	struct hclge_rst_stats rst_stats;</div><div class='ctx'> 	u32 reset_fail_cnt;</div><div class='ctx'> 	u32 fw_version;</div><div class='ctx'> 	u16 num_vmdq_vport;		/* Num vmdq vport this PF has set up */</div><div class='hunk'>@@ -791,6 +822,9 @@ struct hclge_dev {</div><div class='ctx'> 	struct mutex umv_mutex; /* protect share_umv_size */</div><div class='ctx'> </div><div class='ctx'> 	struct mutex vport_cfg_mutex;   /* Protect stored vf table */</div><div class='add'>+</div><div class='add'>+	DECLARE_KFIFO(mac_tnl_log, struct hclge_mac_tnl_stats,</div><div class='add'>+		      HCLGE_MAC_TNL_LOG_SIZE);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* VPort level vlan tag configuration for TX direction */</div><div class='hunk'>@@ -807,10 +841,11 @@ struct hclge_tx_vtag_cfg {</div><div class='ctx'> </div><div class='ctx'> /* VPort level vlan tag configuration for RX direction */</div><div class='ctx'> struct hclge_rx_vtag_cfg {</div><div class='del'>-	bool strip_tag1_en;	/* Whether strip inner vlan tag */</div><div class='del'>-	bool strip_tag2_en;	/* Whether strip outer vlan tag */</div><div class='del'>-	bool vlan1_vlan_prionly;/* Inner VLAN Tag up to descriptor Enable */</div><div class='del'>-	bool vlan2_vlan_prionly;/* Outer VLAN Tag up to descriptor Enable */</div><div class='add'>+	u8 rx_vlan_offload_en;	/* Whether enable rx vlan offload */</div><div class='add'>+	u8 strip_tag1_en;	/* Whether strip inner vlan tag */</div><div class='add'>+	u8 strip_tag2_en;	/* Whether strip outer vlan tag */</div><div class='add'>+	u8 vlan1_vlan_prionly;	/* Inner VLAN Tag up to descriptor Enable */</div><div class='add'>+	u8 vlan2_vlan_prionly;	/* Outer VLAN Tag up to descriptor Enable */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hclge_rss_tuple_cfg {</div><div class='hunk'>@@ -829,6 +864,17 @@ enum HCLGE_VPORT_STATE {</div><div class='ctx'> 	HCLGE_VPORT_STATE_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hclge_vlan_info {</div><div class='add'>+	u16 vlan_proto; /* so far support 802.1Q only */</div><div class='add'>+	u16 qos;</div><div class='add'>+	u16 vlan_tag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hclge_port_base_vlan_config {</div><div class='add'>+	u16 state;</div><div class='add'>+	struct hclge_vlan_info vlan_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hclge_vport {</div><div class='ctx'> 	u16 alloc_tqps;	/* Allocated Tx/Rx queues */</div><div class='ctx'> </div><div class='hunk'>@@ -842,9 +888,10 @@ struct hclge_vport {</div><div class='ctx'> 	u16 alloc_rss_size;</div><div class='ctx'> </div><div class='ctx'> 	u16 qs_offset;</div><div class='del'>-	u16 bw_limit;		/* VSI BW Limit (0 = disabled) */</div><div class='add'>+	u32 bw_limit;		/* VSI BW Limit (0 = disabled) */</div><div class='ctx'> 	u8  dwrr;</div><div class='ctx'> </div><div class='add'>+	struct hclge_port_base_vlan_config port_base_vlan_cfg;</div><div class='ctx'> 	struct hclge_tx_vtag_cfg  txvlan_cfg;</div><div class='ctx'> 	struct hclge_rx_vtag_cfg  rxvlan_cfg;</div><div class='ctx'> </div><div class='hunk'>@@ -924,9 +971,11 @@ void hclge_rm_vport_mac_table(struct hclge_vport *vport, const u8 *mac_addr,</div><div class='ctx'> void hclge_rm_vport_all_mac_table(struct hclge_vport *vport, bool is_del_list,</div><div class='ctx'> 				  enum HCLGE_MAC_ADDR_TYPE mac_type);</div><div class='ctx'> void hclge_uninit_vport_mac_table(struct hclge_dev *hdev);</div><div class='del'>-void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id);</div><div class='del'>-void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,</div><div class='del'>-			       bool is_write_tbl);</div><div class='ctx'> void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list);</div><div class='ctx'> void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev);</div><div class='add'>+int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state,</div><div class='add'>+				    struct hclge_vlan_info *vlan_info);</div><div class='add'>+int hclge_push_vf_port_base_vlan_info(struct hclge_vport *vport, u8 vfid,</div><div class='add'>+				      u16 state, u16 vlan_tag, u16 qos,</div><div class='add'>+				      u16 vlan_proto);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c<br/>index 306a23e486de..0e04e63f2a94 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c</a></div><div class='hunk'>@@ -212,8 +212,7 @@ static int hclge_set_vf_promisc_mode(struct hclge_vport *vport,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hclge_set_vf_uc_mac_addr(struct hclge_vport *vport,</div><div class='del'>-				    struct hclge_mbx_vf_to_pf_cmd *mbx_req,</div><div class='del'>-				    bool gen_resp)</div><div class='add'>+				    struct hclge_mbx_vf_to_pf_cmd *mbx_req)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *mac_addr = (const u8 *)(&amp;mbx_req-&gt;msg[2]);</div><div class='ctx'> 	struct hclge_dev *hdev = vport-&gt;back;</div><div class='hunk'>@@ -249,7 +248,7 @@ static int hclge_set_vf_uc_mac_addr(struct hclge_vport *vport,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gen_resp)</div><div class='add'>+	if (mbx_req-&gt;mbx_need_resp &amp; HCLGE_MBX_NEED_RESP_BIT)</div><div class='ctx'> 		hclge_gen_resp_to_vf(vport, mbx_req, status, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -289,9 +288,25 @@ static int hclge_set_vf_mc_mac_addr(struct hclge_vport *vport,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hclge_push_vf_port_base_vlan_info(struct hclge_vport *vport, u8 vfid,</div><div class='add'>+				      u16 state, u16 vlan_tag, u16 qos,</div><div class='add'>+				      u16 vlan_proto)</div><div class='add'>+{</div><div class='add'>+#define MSG_DATA_SIZE	8</div><div class='add'>+</div><div class='add'>+	u8 msg_data[MSG_DATA_SIZE];</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;msg_data[0], &amp;state, sizeof(u16));</div><div class='add'>+	memcpy(&amp;msg_data[2], &amp;vlan_proto, sizeof(u16));</div><div class='add'>+	memcpy(&amp;msg_data[4], &amp;qos, sizeof(u16));</div><div class='add'>+	memcpy(&amp;msg_data[6], &amp;vlan_tag, sizeof(u16));</div><div class='add'>+</div><div class='add'>+	return hclge_send_mbx_msg(vport, msg_data, sizeof(msg_data),</div><div class='add'>+				  HLCGE_MBX_PUSH_VLAN_INFO, vfid);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_set_vf_vlan_cfg(struct hclge_vport *vport,</div><div class='del'>-				 struct hclge_mbx_vf_to_pf_cmd *mbx_req,</div><div class='del'>-				 bool gen_resp)</div><div class='add'>+				 struct hclge_mbx_vf_to_pf_cmd *mbx_req)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -305,19 +320,27 @@ static int hclge_set_vf_vlan_cfg(struct hclge_vport *vport,</div><div class='ctx'> 		memcpy(&amp;proto, &amp;mbx_req-&gt;msg[5], sizeof(proto));</div><div class='ctx'> 		status = hclge_set_vlan_filter(handle, cpu_to_be16(proto),</div><div class='ctx'> 					       vlan, is_kill);</div><div class='del'>-		if (!status)</div><div class='del'>-			is_kill ? hclge_rm_vport_vlan_table(vport, vlan, false)</div><div class='del'>-			: hclge_add_vport_vlan_table(vport, vlan);</div><div class='ctx'> 	} else if (mbx_req-&gt;msg[1] == HCLGE_MBX_VLAN_RX_OFF_CFG) {</div><div class='ctx'> 		struct hnae3_handle *handle = &amp;vport-&gt;nic;</div><div class='ctx'> 		bool en = mbx_req-&gt;msg[2] ? true : false;</div><div class='ctx'> </div><div class='ctx'> 		status = hclge_en_hw_strip_rxvtag(handle, en);</div><div class='add'>+	} else if (mbx_req-&gt;msg[1] == HCLGE_MBX_PORT_BASE_VLAN_CFG) {</div><div class='add'>+		struct hclge_vlan_info *vlan_info;</div><div class='add'>+		u16 *state;</div><div class='add'>+</div><div class='add'>+		state = (u16 *)&amp;mbx_req-&gt;msg[2];</div><div class='add'>+		vlan_info = (struct hclge_vlan_info *)&amp;mbx_req-&gt;msg[4];</div><div class='add'>+		status = hclge_update_port_base_vlan_cfg(vport, *state,</div><div class='add'>+							 vlan_info);</div><div class='add'>+	} else if (mbx_req-&gt;msg[1] == HCLGE_MBX_GET_PORT_BASE_VLAN_STATE) {</div><div class='add'>+		u8 state;</div><div class='add'>+</div><div class='add'>+		state = vport-&gt;port_base_vlan_cfg.state;</div><div class='add'>+		status = hclge_gen_resp_to_vf(vport, mbx_req, 0, &amp;state,</div><div class='add'>+					      sizeof(u8));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gen_resp)</div><div class='del'>-		status = hclge_gen_resp_to_vf(vport, mbx_req, status, NULL, 0);</div><div class='del'>-</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -385,24 +408,33 @@ static int hclge_get_vf_queue_depth(struct hclge_vport *vport,</div><div class='ctx'> 				    HCLGE_TQPS_DEPTH_INFO_LEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclge_get_vf_media_type(struct hclge_vport *vport,</div><div class='add'>+				   struct hclge_mbx_vf_to_pf_cmd *mbx_req)</div><div class='add'>+{</div><div class='add'>+	struct hclge_dev *hdev = vport-&gt;back;</div><div class='add'>+	u8 resp_data[2];</div><div class='add'>+</div><div class='add'>+	resp_data[0] = hdev-&gt;hw.mac.media_type;</div><div class='add'>+	resp_data[1] = hdev-&gt;hw.mac.module_type;</div><div class='add'>+	return hclge_gen_resp_to_vf(vport, mbx_req, 0, resp_data,</div><div class='add'>+				    sizeof(resp_data));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclge_get_link_info(struct hclge_vport *vport,</div><div class='ctx'> 			       struct hclge_mbx_vf_to_pf_cmd *mbx_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclge_dev *hdev = vport-&gt;back;</div><div class='ctx'> 	u16 link_status;</div><div class='del'>-	u8 msg_data[10];</div><div class='del'>-	u16 media_type;</div><div class='add'>+	u8 msg_data[8];</div><div class='ctx'> 	u8 dest_vfid;</div><div class='ctx'> 	u16 duplex;</div><div class='ctx'> </div><div class='ctx'> 	/* mac.link can only be 0 or 1 */</div><div class='ctx'> 	link_status = (u16)hdev-&gt;hw.mac.link;</div><div class='ctx'> 	duplex = hdev-&gt;hw.mac.duplex;</div><div class='del'>-	media_type = hdev-&gt;hw.mac.media_type;</div><div class='ctx'> 	memcpy(&amp;msg_data[0], &amp;link_status, sizeof(u16));</div><div class='ctx'> 	memcpy(&amp;msg_data[2], &amp;hdev-&gt;hw.mac.speed, sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;msg_data[6], &amp;duplex, sizeof(u16));</div><div class='del'>-	memcpy(&amp;msg_data[8], &amp;media_type, sizeof(u16));</div><div class='ctx'> 	dest_vfid = mbx_req-&gt;mbx_src_vfid;</div><div class='ctx'> </div><div class='ctx'> 	/* send this requested info to VF */</div><div class='hunk'>@@ -565,7 +597,7 @@ void hclge_mbx_handler(struct hclge_dev *hdev)</div><div class='ctx'> 					ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case HCLGE_MBX_SET_UNICAST:</div><div class='del'>-			ret = hclge_set_vf_uc_mac_addr(vport, req, true);</div><div class='add'>+			ret = hclge_set_vf_uc_mac_addr(vport, req);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 					"PF fail(%d) to set VF UC MAC Addr\n",</div><div class='hunk'>@@ -579,7 +611,7 @@ void hclge_mbx_handler(struct hclge_dev *hdev)</div><div class='ctx'> 					ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case HCLGE_MBX_SET_VLAN:</div><div class='del'>-			ret = hclge_set_vf_vlan_cfg(vport, req, false);</div><div class='add'>+			ret = hclge_set_vf_vlan_cfg(vport, req);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 					"PF failed(%d) to config VF's VLAN\n",</div><div class='hunk'>@@ -662,6 +694,13 @@ void hclge_mbx_handler(struct hclge_dev *hdev)</div><div class='ctx'> 			hclge_rm_vport_all_vlan_table(vport, true);</div><div class='ctx'> 			mutex_unlock(&amp;hdev-&gt;vport_cfg_mutex);</div><div class='ctx'> 			break;</div><div class='add'>+		case HCLGE_MBX_GET_MEDIA_TYPE:</div><div class='add'>+			ret = hclge_get_vf_media_type(vport, req);</div><div class='add'>+			if (ret)</div><div class='add'>+				dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+					"PF fail(%d) to media type for VF\n",</div><div class='add'>+					ret);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"un-supported mailbox message, code = %d\n",</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c<br/>index 48eda2c6fdae..1e8134892d77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/marvell_phy.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hclge_cmd.h"</div><div class='ctx'> #include "hclge_main.h"</div><div class='hunk'>@@ -121,12 +122,18 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum)</div><div class='ctx'> </div><div class='ctx'> int hclge_mac_mdio_config(struct hclge_dev *hdev)</div><div class='ctx'> {</div><div class='add'>+#define PHY_INEXISTENT	255</div><div class='add'>+</div><div class='ctx'> 	struct hclge_mac *mac = &amp;hdev-&gt;hw.mac;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	struct mii_bus *mdio_bus;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (hdev-&gt;hw.mac.phy_addr &gt;= PHY_MAX_ADDR) {</div><div class='add'>+	if (hdev-&gt;hw.mac.phy_addr == PHY_INEXISTENT) {</div><div class='add'>+		dev_info(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+			 "no phy device is connected to mdio bus\n");</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (hdev-&gt;hw.mac.phy_addr &gt;= PHY_MAX_ADDR) {</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "phy_addr(%d) is too large.\n",</div><div class='ctx'> 			hdev-&gt;hw.mac.phy_addr);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -203,6 +210,8 @@ int hclge_mac_connect_phy(struct hnae3_handle *handle)</div><div class='ctx'> </div><div class='ctx'> 	linkmode_clear_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev-&gt;supported);</div><div class='ctx'> </div><div class='add'>+	phydev-&gt;dev_flags |= MARVELL_PHY_LED0_LINK_LED1_ACTIVE;</div><div class='add'>+</div><div class='ctx'> 	ret = phy_connect_direct(netdev, phydev,</div><div class='ctx'> 				 hclge_mac_adjust_link,</div><div class='ctx'> 				 PHY_INTERFACE_MODE_SGMII);</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c<br/>index aafc69f4bfdd..a7bbb6d3091a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c</a></div><div class='hunk'>@@ -1331,8 +1331,11 @@ int hclge_pause_setup_hw(struct hclge_dev *hdev, bool init)</div><div class='ctx'> 	ret = hclge_pfc_setup_hw(hdev);</div><div class='ctx'> 	if (init &amp;&amp; ret == -EOPNOTSUPP)</div><div class='ctx'> 		dev_warn(&amp;hdev-&gt;pdev-&gt;dev, "GE MAC does not support pfc\n");</div><div class='del'>-	else</div><div class='add'>+	else if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev, "config pfc failed! ret = %d\n",</div><div class='add'>+			ret);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return hclge_tm_bp_setup(hdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile<br/>index fb93bbd35845..6193f8fa7cf3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> # Makefile for the HISILICON network device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3</div><div class='add'>+ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o</div><div class='ctx'> hclgevf-objs = hclgevf_main.o hclgevf_cmd.o hclgevf_mbx.o
\ No newline at end of file</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c<br/>index 9441b453d38d..71f356fc2446 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c</a></div><div class='hunk'>@@ -27,26 +27,39 @@ static int hclgevf_ring_space(struct hclgevf_cmq_ring *ring)</div><div class='ctx'> 	return ring-&gt;desc_num - used - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclgevf_is_valid_csq_clean_head(struct hclgevf_cmq_ring *ring,</div><div class='add'>+					   int head)</div><div class='add'>+{</div><div class='add'>+	int ntu = ring-&gt;next_to_use;</div><div class='add'>+	int ntc = ring-&gt;next_to_clean;</div><div class='add'>+</div><div class='add'>+	if (ntu &gt; ntc)</div><div class='add'>+		return head &gt;= ntc &amp;&amp; head &lt;= ntu;</div><div class='add'>+</div><div class='add'>+	return head &gt;= ntc || head &lt;= ntu;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclgevf_cmd_csq_clean(struct hclgevf_hw *hw)</div><div class='ctx'> {</div><div class='add'>+	struct hclgevf_dev *hdev = container_of(hw, struct hclgevf_dev, hw);</div><div class='ctx'> 	struct hclgevf_cmq_ring *csq = &amp;hw-&gt;cmq.csq;</div><div class='del'>-	u16 ntc = csq-&gt;next_to_clean;</div><div class='del'>-	struct hclgevf_desc *desc;</div><div class='ctx'> 	int clean = 0;</div><div class='ctx'> 	u32 head;</div><div class='ctx'> </div><div class='del'>-	desc = &amp;csq-&gt;desc[ntc];</div><div class='ctx'> 	head = hclgevf_read_dev(hw, HCLGEVF_NIC_CSQ_HEAD_REG);</div><div class='del'>-	while (head != ntc) {</div><div class='del'>-		memset(desc, 0, sizeof(*desc));</div><div class='del'>-		ntc++;</div><div class='del'>-		if (ntc == csq-&gt;desc_num)</div><div class='del'>-			ntc = 0;</div><div class='del'>-		desc = &amp;csq-&gt;desc[ntc];</div><div class='del'>-		clean++;</div><div class='add'>+	rmb(); /* Make sure head is ready before touch any data */</div><div class='add'>+</div><div class='add'>+	if (!hclgevf_is_valid_csq_clean_head(csq, head)) {</div><div class='add'>+		dev_warn(&amp;hdev-&gt;pdev-&gt;dev, "wrong cmd head (%d, %d-%d)\n", head,</div><div class='add'>+			 csq-&gt;next_to_use, csq-&gt;next_to_clean);</div><div class='add'>+		dev_warn(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+			 "Disabling any further commands to IMP firmware\n");</div><div class='add'>+		set_bit(HCLGEVF_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	csq-&gt;next_to_clean = ntc;</div><div class='ctx'> </div><div class='add'>+	clean = (head - csq-&gt;next_to_clean + csq-&gt;desc_num) % csq-&gt;desc_num;</div><div class='add'>+	csq-&gt;next_to_clean = head;</div><div class='ctx'> 	return clean;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -321,13 +334,13 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;hdev-&gt;hw.cmq.csq.lock);</div><div class='del'>-	spin_lock_bh(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='add'>+	spin_lock(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize the pointers of async rx queue of mailbox */</div><div class='ctx'> 	hdev-&gt;arq.hdev = hdev;</div><div class='ctx'> 	hdev-&gt;arq.head = 0;</div><div class='ctx'> 	hdev-&gt;arq.tail = 0;</div><div class='del'>-	hdev-&gt;arq.count = 0;</div><div class='add'>+	atomic_set(&amp;hdev-&gt;arq.count, 0);</div><div class='ctx'> 	hdev-&gt;hw.cmq.csq.next_to_clean = 0;</div><div class='ctx'> 	hdev-&gt;hw.cmq.csq.next_to_use = 0;</div><div class='ctx'> 	hdev-&gt;hw.cmq.crq.next_to_clean = 0;</div><div class='hunk'>@@ -335,7 +348,7 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hclgevf_cmd_init_regs(&amp;hdev-&gt;hw);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='add'>+	spin_unlock(&amp;hdev-&gt;hw.cmq.crq.lock);</div><div class='ctx'> 	spin_unlock_bh(&amp;hdev-&gt;hw.cmq.csq.lock);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HCLGEVF_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='hunk'>@@ -344,8 +357,8 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev)</div><div class='ctx'> 	 * reset may happen when lower level reset is being processed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hclgevf_is_reset_pending(hdev)) {</div><div class='del'>-		set_bit(HCLGEVF_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_cmd_init;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get firmware version */</div><div class='hunk'>@@ -353,13 +366,18 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"failed(%d) to query firmware version\n", ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_cmd_init;</div><div class='ctx'> 	}</div><div class='ctx'> 	hdev-&gt;fw_version = version;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;hdev-&gt;pdev-&gt;dev, "The firmware version is %08x\n", version);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_cmd_init:</div><div class='add'>+	set_bit(HCLGEVF_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclgevf_cmd_uninit_regs(struct hclgevf_hw *hw)</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c<br/>index 8bc28e6f465f..5d53467ee2d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c</a></div><div class='hunk'>@@ -245,6 +245,27 @@ static int hclgevf_get_tc_info(struct hclgevf_dev *hdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclgevf_get_port_base_vlan_filter_state(struct hclgevf_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *nic = &amp;hdev-&gt;nic;</div><div class='add'>+	u8 resp_msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hclgevf_send_mbx_msg(hdev, HCLGE_MBX_SET_VLAN,</div><div class='add'>+				   HCLGE_MBX_GET_PORT_BASE_VLAN_STATE,</div><div class='add'>+				   NULL, 0, true, &amp;resp_msg, sizeof(u8));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+			"VF request to get port based vlan state failed %d",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nic-&gt;port_base_vlan_state = resp_msg;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclgevf_get_queue_info(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> #define HCLGEVF_TQPS_RSS_INFO_LEN	6</div><div class='hunk'>@@ -307,6 +328,26 @@ static u16 hclgevf_get_qid_global(struct hnae3_handle *handle, u16 queue_id)</div><div class='ctx'> 	return qid_in_pf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hclgevf_get_pf_media_type(struct hclgevf_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	u8 resp_msg[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hclgevf_send_mbx_msg(hdev, HCLGE_MBX_GET_MEDIA_TYPE, 0, NULL, 0,</div><div class='add'>+				   true, resp_msg, sizeof(resp_msg));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+			"VF request to get the pf port media type failed %d",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdev-&gt;hw.mac.media_type = resp_msg[0];</div><div class='add'>+	hdev-&gt;hw.mac.module_type = resp_msg[1];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclgevf_alloc_tqps(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclgevf_tqp *tqp;</div><div class='hunk'>@@ -404,7 +445,7 @@ void hclgevf_update_link_status(struct hclgevf_dev *hdev, int link_state)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hclgevf_update_link_mode(struct hclgevf_dev *hdev)</div><div class='add'>+static void hclgevf_update_link_mode(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> #define HCLGEVF_ADVERTISING 0</div><div class='ctx'> #define HCLGEVF_SUPPORTED   1</div><div class='hunk'>@@ -1375,9 +1416,11 @@ static int hclgevf_reset_prepare_wait(struct hclgevf_dev *hdev)</div><div class='ctx'> 	case HNAE3_VF_FUNC_RESET:</div><div class='ctx'> 		ret = hclgevf_send_mbx_msg(hdev, HCLGE_MBX_RESET, 0, NULL,</div><div class='ctx'> 					   0, true, NULL, sizeof(u8));</div><div class='add'>+		hdev-&gt;rst_stats.vf_func_rst_cnt++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HNAE3_FLR_RESET:</div><div class='ctx'> 		set_bit(HNAE3_FLR_DOWN, &amp;hdev-&gt;flr_state);</div><div class='add'>+		hdev-&gt;rst_stats.flr_rst_cnt++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1400,7 +1443,7 @@ static int hclgevf_reset(struct hclgevf_dev *hdev)</div><div class='ctx'> 	 * know if device is undergoing reset</div><div class='ctx'> 	 */</div><div class='ctx'> 	ae_dev-&gt;reset_type = hdev-&gt;reset_type;</div><div class='del'>-	hdev-&gt;reset_count++;</div><div class='add'>+	hdev-&gt;rst_stats.rst_cnt++;</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* bring down the nic to stop any ongoing TX/RX */</div><div class='hunk'>@@ -1426,6 +1469,8 @@ static int hclgevf_reset(struct hclgevf_dev *hdev)</div><div class='ctx'> 		goto err_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hdev-&gt;rst_stats.hw_rst_done_cnt++;</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* now, re-initialize the nic client and ae device*/</div><div class='hunk'>@@ -1444,6 +1489,7 @@ static int hclgevf_reset(struct hclgevf_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;last_reset_time = jiffies;</div><div class='ctx'> 	ae_dev-&gt;reset_type = HNAE3_NONE_RESET;</div><div class='add'>+	hdev-&gt;rst_stats.rst_done_cnt++;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> err_reset_lock:</div><div class='hunk'>@@ -1455,6 +1501,8 @@ err_reset:</div><div class='ctx'> 	 */</div><div class='ctx'> 	hclgevf_cmd_init(hdev);</div><div class='ctx'> 	dev_err(&amp;hdev-&gt;pdev-&gt;dev, "failed to reset VF\n");</div><div class='add'>+	if (hclgevf_is_reset_pending(hdev))</div><div class='add'>+		hclgevf_reset_task_schedule(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1564,8 +1612,7 @@ static void hclgevf_get_misc_vector(struct hclgevf_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> void hclgevf_reset_task_schedule(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(HCLGEVF_STATE_RST_SERVICE_SCHED, &amp;hdev-&gt;state) &amp;&amp;</div><div class='del'>-	    !test_bit(HCLGEVF_STATE_RST_HANDLING, &amp;hdev-&gt;state)) {</div><div class='add'>+	if (!test_bit(HCLGEVF_STATE_RST_SERVICE_SCHED, &amp;hdev-&gt;state)) {</div><div class='ctx'> 		set_bit(HCLGEVF_STATE_RST_SERVICE_SCHED, &amp;hdev-&gt;state);</div><div class='ctx'> 		schedule_work(&amp;hdev-&gt;rst_service_task);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1603,6 +1650,7 @@ static void hclgevf_service_timer(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;hdev-&gt;service_timer, jiffies + 5 * HZ);</div><div class='ctx'> </div><div class='add'>+	hdev-&gt;stats_timer++;</div><div class='ctx'> 	hclgevf_task_schedule(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1711,7 +1759,7 @@ static void hclgevf_keep_alive_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	hdev = container_of(work, struct hclgevf_dev, keep_alive_task);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(HCLGEVF_STATE_RST_HANDLING, &amp;hdev-&gt;state))</div><div class='add'>+	if (test_bit(HCLGEVF_STATE_CMD_DISABLE, &amp;hdev-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ret = hclgevf_send_mbx_msg(hdev, HCLGE_MBX_KEEP_ALIVE, 0, NULL,</div><div class='hunk'>@@ -1723,9 +1771,16 @@ static void hclgevf_keep_alive_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void hclgevf_service_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct hnae3_handle *handle;</div><div class='ctx'> 	struct hclgevf_dev *hdev;</div><div class='ctx'> </div><div class='ctx'> 	hdev = container_of(work, struct hclgevf_dev, service_task);</div><div class='add'>+	handle = &amp;hdev-&gt;nic;</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;stats_timer &gt;= HCLGEVF_STATS_TIMER_INTERVAL) {</div><div class='add'>+		hclgevf_tqps_update_stats(handle);</div><div class='add'>+		hdev-&gt;stats_timer = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* request the link status from the PF. PF would be able to tell VF</div><div class='ctx'> 	 * about such updates in future so we might remove this later</div><div class='hunk'>@@ -1762,6 +1817,7 @@ static enum hclgevf_evt_cause hclgevf_check_evt_cause(struct hclgevf_dev *hdev,</div><div class='ctx'> 		set_bit(HCLGEVF_STATE_CMD_DISABLE, &amp;hdev-&gt;state);</div><div class='ctx'> 		cmdq_src_reg &amp;= ~BIT(HCLGEVF_VECTOR0_RST_INT_B);</div><div class='ctx'> 		*clearval = cmdq_src_reg;</div><div class='add'>+		hdev-&gt;rst_stats.vf_rst_cnt++;</div><div class='ctx'> 		return HCLGEVF_VECTOR0_EVENT_RST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1814,6 +1870,11 @@ static int hclgevf_configure(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* get current port based vlan state from PF */</div><div class='add'>+	ret = hclgevf_get_port_base_vlan_filter_state(hdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* get queue configuration from PF */</div><div class='ctx'> 	ret = hclgevf_get_queue_info(hdev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1824,6 +1885,10 @@ static int hclgevf_configure(struct hclgevf_dev *hdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = hclgevf_get_pf_media_type(hdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* get tc configuration from PF */</div><div class='ctx'> 	return hclgevf_get_tc_info(hdev);</div><div class='ctx'> }</div><div class='hunk'>@@ -1986,8 +2051,10 @@ static void hclgevf_ae_stop(struct hnae3_handle *handle)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(HCLGEVF_STATE_DOWN, &amp;hdev-&gt;state);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; handle-&gt;kinfo.num_tqps; i++)</div><div class='del'>-		hclgevf_reset_tqp(handle, i);</div><div class='add'>+	if (hdev-&gt;reset_type != HNAE3_VF_RESET)</div><div class='add'>+		for (i = 0; i &lt; handle-&gt;kinfo.num_tqps; i++)</div><div class='add'>+			if (hclgevf_reset_tqp(handle, i))</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='ctx'> 	/* reset tqp stats */</div><div class='ctx'> 	hclgevf_reset_tqp_stats(handle);</div><div class='hunk'>@@ -2007,9 +2074,15 @@ static int hclgevf_set_alive(struct hnae3_handle *handle, bool alive)</div><div class='ctx'> static int hclgevf_client_start(struct hnae3_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hclgevf_set_alive(handle, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;hdev-&gt;keep_alive_timer, jiffies + 2 * HZ);</div><div class='del'>-	return hclgevf_set_alive(handle, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclgevf_client_stop(struct hnae3_handle *handle)</div><div class='hunk'>@@ -2051,6 +2124,10 @@ static void hclgevf_state_uninit(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	set_bit(HCLGEVF_STATE_DOWN, &amp;hdev-&gt;state);</div><div class='ctx'> </div><div class='add'>+	if (hdev-&gt;keep_alive_timer.function)</div><div class='add'>+		del_timer_sync(&amp;hdev-&gt;keep_alive_timer);</div><div class='add'>+	if (hdev-&gt;keep_alive_task.func)</div><div class='add'>+		cancel_work_sync(&amp;hdev-&gt;keep_alive_task);</div><div class='ctx'> 	if (hdev-&gt;service_timer.function)</div><div class='ctx'> 		del_timer_sync(&amp;hdev-&gt;service_timer);</div><div class='ctx'> 	if (hdev-&gt;service_task.func)</div><div class='hunk'>@@ -2155,6 +2232,23 @@ static void hclgevf_misc_irq_uninit(struct hclgevf_dev *hdev)</div><div class='ctx'> 	hclgevf_free_vector(hdev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hclgevf_info_show(struct hclgevf_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;hdev-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "VF info begin:\n");</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Task queue pairs numbers: %d\n", hdev-&gt;num_tqps);</div><div class='add'>+	dev_info(dev, "Desc num per TX queue: %d\n", hdev-&gt;num_tx_desc);</div><div class='add'>+	dev_info(dev, "Desc num per RX queue: %d\n", hdev-&gt;num_rx_desc);</div><div class='add'>+	dev_info(dev, "Numbers of vports: %d\n", hdev-&gt;num_alloc_vport);</div><div class='add'>+	dev_info(dev, "HW tc map: %d\n", hdev-&gt;hw_tc_map);</div><div class='add'>+	dev_info(dev, "PF media type of this VF: %d\n",</div><div class='add'>+		 hdev-&gt;hw.mac.media_type);</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "VF info end.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hclgevf_init_client_instance(struct hnae3_client *client,</div><div class='ctx'> 					struct hnae3_ae_dev *ae_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2172,6 +2266,9 @@ static int hclgevf_init_client_instance(struct hnae3_client *client,</div><div class='ctx'> </div><div class='ctx'> 		hnae3_set_client_init_flag(client, ae_dev, 1);</div><div class='ctx'> </div><div class='add'>+		if (netif_msg_drv(&amp;hdev-&gt;nic))</div><div class='add'>+			hclgevf_info_show(hdev);</div><div class='add'>+</div><div class='ctx'> 		if (hdev-&gt;roce_client &amp;&amp; hnae3_dev_roce_supported(hdev)) {</div><div class='ctx'> 			struct hnae3_client *rc = hdev-&gt;roce_client;</div><div class='ctx'> </div><div class='hunk'>@@ -2651,12 +2748,16 @@ static int hclgevf_gro_en(struct hnae3_handle *handle, bool enable)</div><div class='ctx'> 	return hclgevf_config_gro(hdev, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hclgevf_get_media_type(struct hnae3_handle *handle,</div><div class='del'>-				  u8 *media_type)</div><div class='add'>+static void hclgevf_get_media_type(struct hnae3_handle *handle, u8 *media_type,</div><div class='add'>+				   u8 *module_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);</div><div class='add'>+</div><div class='ctx'> 	if (media_type)</div><div class='ctx'> 		*media_type = hdev-&gt;hw.mac.media_type;</div><div class='add'>+</div><div class='add'>+	if (module_type)</div><div class='add'>+		*module_type = hdev-&gt;hw.mac.module_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool hclgevf_get_hw_reset_stat(struct hnae3_handle *handle)</div><div class='hunk'>@@ -2677,7 +2778,7 @@ static unsigned long hclgevf_ae_dev_reset_cnt(struct hnae3_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);</div><div class='ctx'> </div><div class='del'>-	return hdev-&gt;reset_count;</div><div class='add'>+	return hdev-&gt;rst_stats.hw_rst_done_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hclgevf_get_link_mode(struct hnae3_handle *handle,</div><div class='hunk'>@@ -2756,6 +2857,31 @@ static void hclgevf_get_regs(struct hnae3_handle *handle, u32 *version,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hclgevf_update_port_base_vlan_info(struct hclgevf_dev *hdev, u16 state,</div><div class='add'>+					u8 *port_base_vlan_info, u8 data_size)</div><div class='add'>+{</div><div class='add'>+	struct hnae3_handle *nic = &amp;hdev-&gt;nic;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	hclgevf_notify_client(hdev, HNAE3_DOWN_CLIENT);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	/* send msg to PF and wait update port based vlan info */</div><div class='add'>+	hclgevf_send_mbx_msg(hdev, HCLGE_MBX_SET_VLAN,</div><div class='add'>+			     HCLGE_MBX_PORT_BASE_VLAN_CFG,</div><div class='add'>+			     port_base_vlan_info, data_size,</div><div class='add'>+			     false, NULL, 0);</div><div class='add'>+</div><div class='add'>+	if (state == HNAE3_PORT_BASE_VLAN_DISABLE)</div><div class='add'>+		nic-&gt;port_base_vlan_state = HNAE3_PORT_BASE_VLAN_DISABLE;</div><div class='add'>+	else</div><div class='add'>+		nic-&gt;port_base_vlan_state = HNAE3_PORT_BASE_VLAN_ENABLE;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	hclgevf_notify_client(hdev, HNAE3_UP_CLIENT);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct hnae3_ae_ops hclgevf_ops = {</div><div class='ctx'> 	.init_ae_dev = hclgevf_init_ae_dev,</div><div class='ctx'> 	.uninit_ae_dev = hclgevf_uninit_ae_dev,</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h<br/>index c128863ee7d0..cc52f54f8c08 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h</a></div><div class='hunk'>@@ -116,6 +116,8 @@</div><div class='ctx'> #define HCLGEVF_S_IP_BIT		BIT(3)</div><div class='ctx'> #define HCLGEVF_V_TAG_BIT		BIT(4)</div><div class='ctx'> </div><div class='add'>+#define HCLGEVF_STATS_TIMER_INTERVAL	(36)</div><div class='add'>+</div><div class='ctx'> enum hclgevf_evt_cause {</div><div class='ctx'> 	HCLGEVF_VECTOR0_EVENT_RST,</div><div class='ctx'> 	HCLGEVF_VECTOR0_EVENT_MBX,</div><div class='hunk'>@@ -141,6 +143,7 @@ enum hclgevf_states {</div><div class='ctx'> </div><div class='ctx'> struct hclgevf_mac {</div><div class='ctx'> 	u8 media_type;</div><div class='add'>+	u8 module_type;</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> 	int link;</div><div class='ctx'> 	u8 duplex;</div><div class='hunk'>@@ -210,6 +213,15 @@ struct hclgevf_misc_vector {</div><div class='ctx'> 	int vector_irq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hclgevf_rst_stats {</div><div class='add'>+	u32 rst_cnt;			/* the number of reset */</div><div class='add'>+	u32 vf_func_rst_cnt;		/* the number of VF function reset */</div><div class='add'>+	u32 flr_rst_cnt;		/* the number of FLR */</div><div class='add'>+	u32 vf_rst_cnt;			/* the number of VF reset */</div><div class='add'>+	u32 rst_done_cnt;		/* the number of reset completed */</div><div class='add'>+	u32 hw_rst_done_cnt;		/* the number of HW reset completed */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hclgevf_dev {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct hnae3_ae_dev *ae_dev;</div><div class='hunk'>@@ -227,7 +239,7 @@ struct hclgevf_dev {</div><div class='ctx'> #define HCLGEVF_RESET_REQUESTED		0</div><div class='ctx'> #define HCLGEVF_RESET_PENDING		1</div><div class='ctx'> 	unsigned long reset_state;	/* requested, pending */</div><div class='del'>-	unsigned long reset_count;	/* the number of reset has been done */</div><div class='add'>+	struct hclgevf_rst_stats rst_stats;</div><div class='ctx'> 	u32 reset_attempts;</div><div class='ctx'> </div><div class='ctx'> 	u32 fw_version;</div><div class='hunk'>@@ -272,6 +284,7 @@ struct hclgevf_dev {</div><div class='ctx'> 	struct hnae3_client *nic_client;</div><div class='ctx'> 	struct hnae3_client *roce_client;</div><div class='ctx'> 	u32 flag;</div><div class='add'>+	u32 stats_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool hclgevf_is_reset_pending(struct hclgevf_dev *hdev)</div><div class='hunk'>@@ -290,4 +303,6 @@ void hclgevf_update_speed_duplex(struct hclgevf_dev *hdev, u32 speed,</div><div class='ctx'> 				 u8 duplex);</div><div class='ctx'> void hclgevf_reset_task_schedule(struct hclgevf_dev *hdev);</div><div class='ctx'> void hclgevf_mbx_task_schedule(struct hclgevf_dev *hdev);</div><div class='add'>+void hclgevf_update_port_base_vlan_info(struct hclgevf_dev *hdev, u16 state,</div><div class='add'>+					u8 *port_base_vlan_info, u8 data_size);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c<br/>index 7dc3c9f79169..30f2e9352cf3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c</a></div><div class='hunk'>@@ -49,8 +49,8 @@ static int hclgevf_get_mbx_resp(struct hclgevf_dev *hdev, u16 code0, u16 code1,</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt;= HCLGEVF_MAX_TRY_TIMES) {</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='del'>-			"VF could not get mbx resp(=%d) from PF in %d tries\n",</div><div class='del'>-			hdev-&gt;mbx_resp.received_resp, i);</div><div class='add'>+			"VF could not get mbx(%d,%d) resp(=%d) from PF in %d tries\n",</div><div class='add'>+			code0, code1, hdev-&gt;mbx_resp.received_resp, i);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -68,8 +68,11 @@ static int hclgevf_get_mbx_resp(struct hclgevf_dev *hdev, u16 code0, u16 code1,</div><div class='ctx'> </div><div class='ctx'> 	if (!(r_code0 == code0 &amp;&amp; r_code1 == code1 &amp;&amp; !mbx_resp-&gt;resp_status)) {</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='del'>-			"VF could not match resp code(code0=%d,code1=%d), %d",</div><div class='add'>+			"VF could not match resp code(code0=%d,code1=%d), %d\n",</div><div class='ctx'> 			code0, code1, mbx_resp-&gt;resp_status);</div><div class='add'>+		dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='add'>+			"VF could not match resp r_code(r_code0=%d,r_code1=%d)\n",</div><div class='add'>+			r_code0, r_code1);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +98,8 @@ int hclgevf_send_mbx_msg(struct hclgevf_dev *hdev, u16 code, u16 subcode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hclgevf_cmd_setup_basic_desc(&amp;desc, HCLGEVF_OPC_MBX_VF_TO_PF, false);</div><div class='add'>+	req-&gt;mbx_need_resp |= need_resp ? HCLGE_MBX_NEED_RESP_BIT :</div><div class='add'>+					  ~HCLGE_MBX_NEED_RESP_BIT;</div><div class='ctx'> 	req-&gt;msg[0] = code;</div><div class='ctx'> 	req-&gt;msg[1] = subcode;</div><div class='ctx'> 	memcpy(&amp;req-&gt;msg[2], msg_data, msg_len);</div><div class='hunk'>@@ -198,6 +203,7 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> 		case HCLGE_MBX_LINK_STAT_CHANGE:</div><div class='ctx'> 		case HCLGE_MBX_ASSERTING_RESET:</div><div class='ctx'> 		case HCLGE_MBX_LINK_STAT_MODE:</div><div class='add'>+		case HLCGE_MBX_PUSH_VLAN_INFO:</div><div class='ctx'> 			/* set this mbx event as pending. This is required as we</div><div class='ctx'> 			 * might loose interrupt event when mbx task is busy</div><div class='ctx'> 			 * handling. This shall be cleared when mbx task just</div><div class='hunk'>@@ -208,7 +214,8 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> 			/* we will drop the async msg if we find ARQ as full</div><div class='ctx'> 			 * and continue with next message</div><div class='ctx'> 			 */</div><div class='del'>-			if (hdev-&gt;arq.count &gt;= HCLGE_MBX_MAX_ARQ_MSG_NUM) {</div><div class='add'>+			if (atomic_read(&amp;hdev-&gt;arq.count) &gt;=</div><div class='add'>+			    HCLGE_MBX_MAX_ARQ_MSG_NUM) {</div><div class='ctx'> 				dev_warn(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 "Async Q full, dropping msg(%d)\n",</div><div class='ctx'> 					 req-&gt;msg[1]);</div><div class='hunk'>@@ -220,7 +227,7 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> 			memcpy(&amp;msg_q[0], req-&gt;msg,</div><div class='ctx'> 			       HCLGE_MBX_MAX_ARQ_MSG_SIZE * sizeof(u16));</div><div class='ctx'> 			hclge_mbx_tail_ptr_move_arq(hdev-&gt;arq);</div><div class='del'>-			hdev-&gt;arq.count++;</div><div class='add'>+			atomic_inc(&amp;hdev-&gt;arq.count);</div><div class='ctx'> </div><div class='ctx'> 			hclgevf_mbx_task_schedule(hdev);</div><div class='ctx'> </div><div class='hunk'>@@ -243,8 +250,8 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> void hclgevf_mbx_async_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	enum hnae3_reset_type reset_type;</div><div class='del'>-	u16 link_status;</div><div class='del'>-	u16 *msg_q;</div><div class='add'>+	u16 link_status, state;</div><div class='add'>+	u16 *msg_q, *vlan_info;</div><div class='ctx'> 	u8 duplex;</div><div class='ctx'> 	u32 speed;</div><div class='ctx'> 	u32 tail;</div><div class='hunk'>@@ -272,7 +279,6 @@ void hclgevf_mbx_async_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> 			link_status = le16_to_cpu(msg_q[1]);</div><div class='ctx'> 			memcpy(&amp;speed, &amp;msg_q[2], sizeof(speed));</div><div class='ctx'> 			duplex = (u8)le16_to_cpu(msg_q[4]);</div><div class='del'>-			hdev-&gt;hw.mac.media_type = (u8)le16_to_cpu(msg_q[5]);</div><div class='ctx'> </div><div class='ctx'> 			/* update upper layer with new link link status */</div><div class='ctx'> 			hclgevf_update_link_status(hdev, link_status);</div><div class='hunk'>@@ -300,6 +306,12 @@ void hclgevf_mbx_async_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> 			hclgevf_reset_task_schedule(hdev);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='add'>+		case HLCGE_MBX_PUSH_VLAN_INFO:</div><div class='add'>+			state = le16_to_cpu(msg_q[1]);</div><div class='add'>+			vlan_info = &amp;msg_q[1];</div><div class='add'>+			hclgevf_update_port_base_vlan_info(hdev, state,</div><div class='add'>+							   (u8 *)vlan_info, 8);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_err(&amp;hdev-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"fetched unsupported(%d) message from arq\n",</div><div class='hunk'>@@ -308,7 +320,7 @@ void hclgevf_mbx_async_handler(struct hclgevf_dev *hdev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hclge_mbx_head_ptr_move_arq(hdev-&gt;arq);</div><div class='del'>-		hdev-&gt;arq.count--;</div><div class='add'>+		atomic_dec(&amp;hdev-&gt;arq.count);</div><div class='ctx'> 		msg_q = hdev-&gt;arq.msg_q[hdev-&gt;arq.head];</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c<br/>index baf5cc251f32..8b8a7d00e8e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns_mdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/hisilicon/hns_mdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/hisilicon/hns_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/hisilicon/hns_mdio.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ struct hns_mdio_sc_reg {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hns_mdio_device {</div><div class='del'>-	void *vbase;		/* mdio reg base address */</div><div class='add'>+	u8 __iomem *vbase;		/* mdio reg base address */</div><div class='ctx'> 	struct regmap *subctrl_vbase;</div><div class='ctx'> 	struct hns_mdio_sc_reg sc_reg;</div><div class='ctx'> };</div><div class='hunk'>@@ -96,21 +96,17 @@ enum mdio_c45_op_seq {</div><div class='ctx'> #define MDIO_SC_CLK_ST		0x531C</div><div class='ctx'> #define MDIO_SC_RESET_ST	0x5A1C</div><div class='ctx'> </div><div class='del'>-static void mdio_write_reg(void *base, u32 reg, u32 value)</div><div class='add'>+static void mdio_write_reg(u8 __iomem *base, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='del'>-	u8 __iomem *reg_addr = (u8 __iomem *)base;</div><div class='del'>-</div><div class='del'>-	writel_relaxed(value, reg_addr + reg);</div><div class='add'>+	writel_relaxed(value, base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MDIO_WRITE_REG(a, reg, value) \</div><div class='ctx'> 	mdio_write_reg((a)-&gt;vbase, (reg), (value))</div><div class='ctx'> </div><div class='del'>-static u32 mdio_read_reg(void *base, u32 reg)</div><div class='add'>+static u32 mdio_read_reg(u8 __iomem *base, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u8 __iomem *reg_addr = (u8 __iomem *)base;</div><div class='del'>-</div><div class='del'>-	return readl_relaxed(reg_addr + reg);</div><div class='add'>+	return readl_relaxed(base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define mdio_set_field(origin, mask, shift, val) \</div><div class='hunk'>@@ -121,7 +117,7 @@ static u32 mdio_read_reg(void *base, u32 reg)</div><div class='ctx'> </div><div class='ctx'> #define mdio_get_field(origin, mask, shift) (((origin) &gt;&gt; (shift)) &amp; (mask))</div><div class='ctx'> </div><div class='del'>-static void mdio_set_reg_field(void *base, u32 reg, u32 mask, u32 shift,</div><div class='add'>+static void mdio_set_reg_field(u8 __iomem *base, u32 reg, u32 mask, u32 shift,</div><div class='ctx'> 			       u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	u32 origin = mdio_read_reg(base, reg);</div><div class='hunk'>@@ -133,7 +129,7 @@ static void mdio_set_reg_field(void *base, u32 reg, u32 mask, u32 shift,</div><div class='ctx'> #define MDIO_SET_REG_FIELD(dev, reg, mask, shift, val) \</div><div class='ctx'> 	mdio_set_reg_field((dev)-&gt;vbase, (reg), (mask), (shift), (val))</div><div class='ctx'> </div><div class='del'>-static u32 mdio_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)</div><div class='add'>+static u32 mdio_get_reg_field(u8 __iomem *base, u32 reg, u32 mask, u32 shift)</div><div class='ctx'> {</div><div class='ctx'> 	u32 origin;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c<br/>index e17bf33eba0c..0fbe8046824b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/huawei/hinic/hinic_tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/huawei/hinic/hinic_tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/huawei/hinic/hinic_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/huawei/hinic/hinic_tx.c</a></div><div class='hunk'>@@ -518,7 +518,7 @@ process_sq_wqe:</div><div class='ctx'> </div><div class='ctx'> flush_skbs:</div><div class='ctx'> 	netdev_txq = netdev_get_tx_queue(netdev, q_id);</div><div class='del'>-	if ((!skb-&gt;xmit_more) || (netif_xmit_stopped(netdev_txq)))</div><div class='add'>+	if ((!netdev_xmit_more()) || (netif_xmit_stopped(netdev_txq)))</div><div class='ctx'> 		hinic_sq_write_db(txq-&gt;sq, prod_idx, wqe_size, 0);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c<br/>index b69c622ba8b2..211c5f74b4c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/i825xx/lasi_82596.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/i825xx/lasi_82596.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/i825xx/lasi_82596.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/i825xx/lasi_82596.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> #define DMA_WBACK_INV(ndev, addr, len) \</div><div class='ctx'> 	do { dma_cache_sync((ndev)-&gt;dev.parent, (void *)addr, len, DMA_BIDIRECTIONAL); } while (0)</div><div class='ctx'> </div><div class='del'>-#define SYSBUS      0x0000006c;</div><div class='add'>+#define SYSBUS      0x0000006c</div><div class='ctx'> </div><div class='ctx'> /* big endian CPU, 82596 "big" endian mode */</div><div class='ctx'> #define SWAP32(x)   (((u32)(x)&lt;&lt;16) | ((((u32)(x)))&gt;&gt;16))</div><div class='hunk'>@@ -141,7 +141,8 @@ static void mpu_port(struct net_device *dev, int c, dma_addr_t x)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gsc_writel(a, dev-&gt;base_addr + PA_CPU_PORT_L_ACCESS);</div><div class='del'>-	udelay(1);</div><div class='add'>+	if (!running_on_qemu)</div><div class='add'>+		udelay(1);</div><div class='ctx'> 	gsc_writel(b, dev-&gt;base_addr + PA_CPU_PORT_L_ACCESS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c<br/>index 3baabdc89726..707c8ba120c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a></div><div class='hunk'>@@ -1463,7 +1463,7 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,</div><div class='ctx'> </div><div class='ctx'> 	memset(pr, 0, sizeof(struct ehea_port_res));</div><div class='ctx'> </div><div class='del'>-	pr-&gt;tx_bytes = rx_bytes;</div><div class='add'>+	pr-&gt;tx_bytes = tx_bytes;</div><div class='ctx'> 	pr-&gt;tx_packets = tx_packets;</div><div class='ctx'> 	pr-&gt;rx_bytes = rx_bytes;</div><div class='ctx'> 	pr-&gt;rx_packets = rx_packets;</div><div class='hunk'>@@ -3160,6 +3160,7 @@ static ssize_t ehea_probe_port(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (ehea_add_adapter_mr(adapter)) {</div><div class='ctx'> 		pr_err("creating MR failed\n");</div><div class='add'>+		of_node_put(eth_dn);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c<br/>index 5e4e37132bf2..77ce17383aba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ehea/ehea_qmr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ibm/ehea/ehea_qmr.c</a></div><div class='hunk'>@@ -123,8 +123,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,</div><div class='ctx'> 			       int nr_of_cqe, u64 eq_handle, u32 cq_token)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehea_cq *cq;</div><div class='del'>-	struct h_epa epa;</div><div class='del'>-	u64 *cq_handle_ref, hret, rpage;</div><div class='add'>+	u64 hret, rpage;</div><div class='ctx'> 	u32 counter;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	void *vpage;</div><div class='hunk'>@@ -139,8 +138,6 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	cq-&gt;adapter = adapter;</div><div class='ctx'> </div><div class='del'>-	cq_handle_ref = &amp;cq-&gt;fw_handle;</div><div class='del'>-</div><div class='ctx'> 	hret = ehea_h_alloc_resource_cq(adapter-&gt;handle, &amp;cq-&gt;attr,</div><div class='ctx'> 					&amp;cq-&gt;fw_handle, &amp;cq-&gt;epas);</div><div class='ctx'> 	if (hret != H_SUCCESS) {</div><div class='hunk'>@@ -188,7 +185,6 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw_qeit_reset(&amp;cq-&gt;hw_queue);</div><div class='del'>-	epa = cq-&gt;epas.kernel;</div><div class='ctx'> 	ehea_reset_cq_ep(cq);</div><div class='ctx'> 	ehea_reset_cq_n1(cq);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c<br/>index dd71d5db7274..d86b0e5895a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ibmveth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ibmveth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ibmveth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ibm/ibmveth.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ struct ibmveth_stat {</div><div class='ctx'> #define IBMVETH_STAT_OFF(stat) offsetof(struct ibmveth_adapter, stat)</div><div class='ctx'> #define IBMVETH_GET_STAT(a, off) *((u64 *)(((unsigned long)(a)) + off))</div><div class='ctx'> </div><div class='del'>-struct ibmveth_stat ibmveth_stats[] = {</div><div class='add'>+static struct ibmveth_stat ibmveth_stats[] = {</div><div class='ctx'> 	{ "replenish_task_cycles", IBMVETH_STAT_OFF(replenish_task_cycles) },</div><div class='ctx'> 	{ "replenish_no_mem", IBMVETH_STAT_OFF(replenish_no_mem) },</div><div class='ctx'> 	{ "replenish_add_buff_failure",</div><div class='head'>diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c<br/>index 5ecbb1adcf3b..b398d6c94dbd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ibmvnic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ibmvnic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ibmvnic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ibm/ibmvnic.c</a></div><div class='hunk'>@@ -120,6 +120,7 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *);</div><div class='ctx'> static void release_crq_queue(struct ibmvnic_adapter *);</div><div class='ctx'> static int __ibmvnic_set_mac(struct net_device *netdev, struct sockaddr *p);</div><div class='ctx'> static int init_crq_queue(struct ibmvnic_adapter *adapter);</div><div class='add'>+static int send_query_phys_parms(struct ibmvnic_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> struct ibmvnic_stat {</div><div class='ctx'> 	char name[ETH_GSTRING_LEN];</div><div class='hunk'>@@ -1885,6 +1886,7 @@ static int do_hard_reset(struct ibmvnic_adapter *adapter,</div><div class='ctx'> 	 */</div><div class='ctx'> 	adapter-&gt;state = VNIC_PROBED;</div><div class='ctx'> </div><div class='add'>+	reinit_completion(&amp;adapter-&gt;init_done);</div><div class='ctx'> 	rc = init_crq_queue(adapter);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(adapter-&gt;netdev,</div><div class='hunk'>@@ -1967,13 +1969,11 @@ static void __ibmvnic_reset(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibmvnic_rwi *rwi;</div><div class='ctx'> 	struct ibmvnic_adapter *adapter;</div><div class='del'>-	struct net_device *netdev;</div><div class='ctx'> 	bool we_lock_rtnl = false;</div><div class='ctx'> 	u32 reset_state;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	adapter = container_of(work, struct ibmvnic_adapter, ibmvnic_reset);</div><div class='del'>-	netdev = adapter-&gt;netdev;</div><div class='ctx'> </div><div class='ctx'> 	/* netif_set_real_num_xx_queues needs to take rtnl lock here</div><div class='ctx'> 	 * unless wait_for_reset is set, in which case the rtnl lock</div><div class='hunk'>@@ -2278,23 +2278,20 @@ static const struct net_device_ops ibmvnic_netdev_ops = {</div><div class='ctx'> static int ibmvnic_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='add'>+	struct ibmvnic_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	supported = (SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |</div><div class='del'>-			  SUPPORTED_FIBRE);</div><div class='del'>-	advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg |</div><div class='del'>-			    ADVERTISED_FIBRE);</div><div class='del'>-	cmd-&gt;base.speed = SPEED_1000;</div><div class='del'>-	cmd-&gt;base.duplex = DUPLEX_FULL;</div><div class='add'>+	rc = send_query_phys_parms(adapter);</div><div class='add'>+	if (rc) {</div><div class='add'>+		adapter-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+		adapter-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;base.speed = adapter-&gt;speed;</div><div class='add'>+	cmd-&gt;base.duplex = adapter-&gt;duplex;</div><div class='ctx'> 	cmd-&gt;base.port = PORT_FIBRE;</div><div class='ctx'> 	cmd-&gt;base.phy_address = 0;</div><div class='ctx'> 	cmd-&gt;base.autoneg = AUTONEG_ENABLE;</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'>@@ -2922,8 +2919,10 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)</div><div class='ctx'> 			goto req_tx_irq_failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		snprintf(scrq-&gt;name, sizeof(scrq-&gt;name), "ibmvnic-%x-tx%d",</div><div class='add'>+			 adapter-&gt;vdev-&gt;unit_address, i);</div><div class='ctx'> 		rc = request_irq(scrq-&gt;irq, ibmvnic_interrupt_tx,</div><div class='del'>-				 0, "ibmvnic_tx", scrq);</div><div class='add'>+				 0, scrq-&gt;name, scrq);</div><div class='ctx'> </div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			dev_err(dev, "Couldn't register tx irq 0x%x. rc=%d\n",</div><div class='hunk'>@@ -2943,8 +2942,10 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)</div><div class='ctx'> 			dev_err(dev, "Error mapping irq\n");</div><div class='ctx'> 			goto req_rx_irq_failed;</div><div class='ctx'> 		}</div><div class='add'>+		snprintf(scrq-&gt;name, sizeof(scrq-&gt;name), "ibmvnic-%x-rx%d",</div><div class='add'>+			 adapter-&gt;vdev-&gt;unit_address, i);</div><div class='ctx'> 		rc = request_irq(scrq-&gt;irq, ibmvnic_interrupt_rx,</div><div class='del'>-				 0, "ibmvnic_rx", scrq);</div><div class='add'>+				 0, scrq-&gt;name, scrq);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			dev_err(dev, "Couldn't register rx irq 0x%x. rc=%d\n",</div><div class='ctx'> 				scrq-&gt;irq, rc);</div><div class='hunk'>@@ -3761,6 +3762,7 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;adapter-&gt;vdev-&gt;dev;</div><div class='ctx'> 	struct ibmvnic_query_ip_offload_buffer *buf = &amp;adapter-&gt;ip_offload_buf;</div><div class='add'>+	netdev_features_t old_hw_features = 0;</div><div class='ctx'> 	union ibmvnic_crq crq;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -3836,24 +3838,41 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;ip_offload_ctrl.large_rx_ipv4 = 0;</div><div class='ctx'> 	adapter-&gt;ip_offload_ctrl.large_rx_ipv6 = 0;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;netdev-&gt;features = NETIF_F_SG | NETIF_F_GSO;</div><div class='add'>+	if (adapter-&gt;state != VNIC_PROBING) {</div><div class='add'>+		old_hw_features = adapter-&gt;netdev-&gt;hw_features;</div><div class='add'>+		adapter-&gt;netdev-&gt;hw_features = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;netdev-&gt;hw_features = NETIF_F_SG | NETIF_F_GSO | NETIF_F_GRO;</div><div class='ctx'> </div><div class='ctx'> 	if (buf-&gt;tcp_ipv4_chksum || buf-&gt;udp_ipv4_chksum)</div><div class='del'>-		adapter-&gt;netdev-&gt;features |= NETIF_F_IP_CSUM;</div><div class='add'>+		adapter-&gt;netdev-&gt;hw_features |= NETIF_F_IP_CSUM;</div><div class='ctx'> </div><div class='ctx'> 	if (buf-&gt;tcp_ipv6_chksum || buf-&gt;udp_ipv6_chksum)</div><div class='del'>-		adapter-&gt;netdev-&gt;features |= NETIF_F_IPV6_CSUM;</div><div class='add'>+		adapter-&gt;netdev-&gt;hw_features |= NETIF_F_IPV6_CSUM;</div><div class='ctx'> </div><div class='ctx'> 	if ((adapter-&gt;netdev-&gt;features &amp;</div><div class='ctx'> 	    (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)))</div><div class='del'>-		adapter-&gt;netdev-&gt;features |= NETIF_F_RXCSUM;</div><div class='add'>+		adapter-&gt;netdev-&gt;hw_features |= NETIF_F_RXCSUM;</div><div class='ctx'> </div><div class='ctx'> 	if (buf-&gt;large_tx_ipv4)</div><div class='del'>-		adapter-&gt;netdev-&gt;features |= NETIF_F_TSO;</div><div class='add'>+		adapter-&gt;netdev-&gt;hw_features |= NETIF_F_TSO;</div><div class='ctx'> 	if (buf-&gt;large_tx_ipv6)</div><div class='del'>-		adapter-&gt;netdev-&gt;features |= NETIF_F_TSO6;</div><div class='add'>+		adapter-&gt;netdev-&gt;hw_features |= NETIF_F_TSO6;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;state == VNIC_PROBING) {</div><div class='add'>+		adapter-&gt;netdev-&gt;features |= adapter-&gt;netdev-&gt;hw_features;</div><div class='add'>+	} else if (old_hw_features != adapter-&gt;netdev-&gt;hw_features) {</div><div class='add'>+		netdev_features_t tmp = 0;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;netdev-&gt;hw_features |= adapter-&gt;netdev-&gt;features;</div><div class='add'>+		/* disable features no longer supported */</div><div class='add'>+		adapter-&gt;netdev-&gt;features &amp;= adapter-&gt;netdev-&gt;hw_features;</div><div class='add'>+		/* turn on features now supported if previously enabled */</div><div class='add'>+		tmp = (old_hw_features ^ adapter-&gt;netdev-&gt;hw_features) &amp;</div><div class='add'>+			adapter-&gt;netdev-&gt;hw_features;</div><div class='add'>+		adapter-&gt;netdev-&gt;features |=</div><div class='add'>+				tmp &amp; adapter-&gt;netdev-&gt;wanted_features;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;crq, 0, sizeof(crq));</div><div class='ctx'> 	crq.control_ip_offload.first = IBMVNIC_CRQ_CMD;</div><div class='hunk'>@@ -4278,6 +4297,73 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int send_query_phys_parms(struct ibmvnic_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	union ibmvnic_crq crq;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	memset(&amp;crq, 0, sizeof(crq));</div><div class='add'>+	crq.query_phys_parms.first = IBMVNIC_CRQ_CMD;</div><div class='add'>+	crq.query_phys_parms.cmd = QUERY_PHYS_PARMS;</div><div class='add'>+	init_completion(&amp;adapter-&gt;fw_done);</div><div class='add'>+	rc = ibmvnic_send_crq(adapter, &amp;crq);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	wait_for_completion(&amp;adapter-&gt;fw_done);</div><div class='add'>+	return adapter-&gt;fw_done_rc ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq,</div><div class='add'>+				       struct ibmvnic_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = crq-&gt;query_phys_parms_rsp.rc.code;</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(netdev, "Error %d in QUERY_PHYS_PARMS\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	switch (cpu_to_be32(crq-&gt;query_phys_parms_rsp.speed)) {</div><div class='add'>+	case IBMVNIC_10MBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_100MBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_1GBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_10GBP:</div><div class='add'>+		adapter-&gt;speed = SPEED_10000;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_25GBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_25000;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_40GBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_40000;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_50GBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_50000;</div><div class='add'>+		break;</div><div class='add'>+	case IBMVNIC_100GBPS:</div><div class='add'>+		adapter-&gt;speed = SPEED_100000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_warn(netdev, "Unknown speed 0x%08x\n",</div><div class='add'>+			    cpu_to_be32(crq-&gt;query_phys_parms_rsp.speed));</div><div class='add'>+		adapter-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+	if (crq-&gt;query_phys_parms_rsp.flags1 &amp; IBMVNIC_FULL_DUPLEX)</div><div class='add'>+		adapter-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	else if (crq-&gt;query_phys_parms_rsp.flags1 &amp; IBMVNIC_HALF_DUPLEX)</div><div class='add'>+		adapter-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+	else</div><div class='add'>+		adapter-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ibmvnic_handle_crq(union ibmvnic_crq *crq,</div><div class='ctx'> 			       struct ibmvnic_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -4426,6 +4512,10 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq,</div><div class='ctx'> 	case GET_VPD_RSP:</div><div class='ctx'> 		handle_vpd_rsp(crq, adapter);</div><div class='ctx'> 		break;</div><div class='add'>+	case QUERY_PHYS_PARMS_RSP:</div><div class='add'>+		adapter-&gt;fw_done_rc = handle_query_phys_parms_rsp(crq, adapter);</div><div class='add'>+		complete(&amp;adapter-&gt;fw_done);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(netdev, "Got an invalid cmd type 0x%02x\n",</div><div class='ctx'> 			   gen_crq-&gt;cmd);</div><div class='hunk'>@@ -4581,8 +4671,9 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter)</div><div class='ctx'> 		     (unsigned long)adapter);</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(adapter-&gt;netdev, "registering irq 0x%x\n", vdev-&gt;irq);</div><div class='del'>-	rc = request_irq(vdev-&gt;irq, ibmvnic_interrupt, 0, IBMVNIC_NAME,</div><div class='del'>-			 adapter);</div><div class='add'>+	snprintf(crq-&gt;name, sizeof(crq-&gt;name), "ibmvnic-%x",</div><div class='add'>+		 adapter-&gt;vdev-&gt;unit_address);</div><div class='add'>+	rc = request_irq(vdev-&gt;irq, ibmvnic_interrupt, 0, crq-&gt;name, adapter);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(dev, "Couldn't register irq 0x%x. rc=%d\n",</div><div class='ctx'> 			vdev-&gt;irq, rc);</div><div class='hunk'>@@ -4625,7 +4716,7 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter)</div><div class='ctx'> 	old_num_rx_queues = adapter-&gt;req_rx_queues;</div><div class='ctx'> 	old_num_tx_queues = adapter-&gt;req_tx_queues;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;adapter-&gt;init_done);</div><div class='add'>+	reinit_completion(&amp;adapter-&gt;init_done);</div><div class='ctx'> 	adapter-&gt;init_done_rc = 0;</div><div class='ctx'> 	ibmvnic_send_crq_init(adapter);</div><div class='ctx'> 	if (!wait_for_completion_timeout(&amp;adapter-&gt;init_done, timeout)) {</div><div class='hunk'>@@ -4680,7 +4771,6 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;from_passive_init = false;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;adapter-&gt;init_done);</div><div class='ctx'> 	adapter-&gt;init_done_rc = 0;</div><div class='ctx'> 	ibmvnic_send_crq_init(adapter);</div><div class='ctx'> 	if (!wait_for_completion_timeout(&amp;adapter-&gt;init_done, timeout)) {</div><div class='hunk'>@@ -4759,6 +4849,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;ibmvnic_reset, __ibmvnic_reset);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adapter-&gt;rwi_list);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;rwi_lock);</div><div class='add'>+	init_completion(&amp;adapter-&gt;init_done);</div><div class='ctx'> 	adapter-&gt;resetting = false;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;mac_change_pending = false;</div><div class='head'>diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h<br/>index f2018dbebfa5..cffdac372a33 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ibmvnic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ibm/ibmvnic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ibm/ibmvnic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ibm/ibmvnic.h</a></div><div class='hunk'>@@ -377,11 +377,16 @@ struct ibmvnic_phys_parms {</div><div class='ctx'> 	u8 flags2;</div><div class='ctx'> #define IBMVNIC_LOGICAL_LNK_ACTIVE 0x80</div><div class='ctx'> 	__be32 speed;</div><div class='del'>-#define IBMVNIC_AUTONEG		0x80</div><div class='del'>-#define IBMVNIC_10MBPS		0x40</div><div class='del'>-#define IBMVNIC_100MBPS		0x20</div><div class='del'>-#define IBMVNIC_1GBPS		0x10</div><div class='del'>-#define IBMVNIC_10GBPS		0x08</div><div class='add'>+#define IBMVNIC_AUTONEG		0x80000000</div><div class='add'>+#define IBMVNIC_10MBPS		0x40000000</div><div class='add'>+#define IBMVNIC_100MBPS		0x20000000</div><div class='add'>+#define IBMVNIC_1GBPS		0x10000000</div><div class='add'>+#define IBMVNIC_10GBP		0x08000000</div><div class='add'>+#define IBMVNIC_40GBPS		0x04000000</div><div class='add'>+#define IBMVNIC_100GBPS		0x02000000</div><div class='add'>+#define IBMVNIC_25GBPS		0x01000000</div><div class='add'>+#define IBMVNIC_50GBPS		0x00800000</div><div class='add'>+#define IBMVNIC_200GBPS		0x00400000</div><div class='ctx'> 	__be32 mtu;</div><div class='ctx'> 	struct ibmvnic_rc rc;</div><div class='ctx'> } __packed __aligned(8);</div><div class='hunk'>@@ -850,6 +855,7 @@ struct ibmvnic_crq_queue {</div><div class='ctx'> 	dma_addr_t msg_token;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	bool active;</div><div class='add'>+	char name[32];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union sub_crq {</div><div class='hunk'>@@ -876,6 +882,7 @@ struct ibmvnic_sub_crq_queue {</div><div class='ctx'> 	struct sk_buff *rx_skb_top;</div><div class='ctx'> 	struct ibmvnic_adapter *adapter;</div><div class='ctx'> 	atomic_t used;</div><div class='add'>+	char name[32];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ibmvnic_long_term_buff {</div><div class='hunk'>@@ -999,6 +1006,9 @@ struct ibmvnic_adapter {</div><div class='ctx'> 	int phys_link_state;</div><div class='ctx'> 	int logical_link_state;</div><div class='ctx'> </div><div class='add'>+	u32 speed;</div><div class='add'>+	u8 duplex;</div><div class='add'>+</div><div class='ctx'> 	/* login data */</div><div class='ctx'> 	struct ibmvnic_login_buffer *login_buf;</div><div class='ctx'> 	dma_addr_t login_buf_token;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c<br/>index 0fd268070fb4..a65d5a9ba7db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/e100.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/e100.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/e100.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/e100.c</a></div><div class='hunk'>@@ -2797,7 +2797,7 @@ static int e100_set_features(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features = features;</div><div class='ctx'> 	e100_exec_cb(nic, NULL, e100_configure);</div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops e100_netdev_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c<br/>index 8fe9af0e2ab7..551de8c2fef2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/e1000/e1000_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/e1000/e1000_main.c</a></div><div class='hunk'>@@ -820,7 +820,7 @@ static int e1000_set_features(struct net_device *netdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		e1000_reset(adapter);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops e1000_netdev_ops = {</div><div class='hunk'>@@ -3267,14 +3267,9 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 		/* Make sure there is space in the ring for the next send. */</div><div class='ctx'> 		e1000_maybe_stop_tx(netdev, tx_ring, desc_needed);</div><div class='ctx'> </div><div class='del'>-		if (!skb-&gt;xmit_more ||</div><div class='add'>+		if (!netdev_xmit_more() ||</div><div class='ctx'> 		    netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) {</div><div class='ctx'> 			writel(tx_ring-&gt;next_to_use, hw-&gt;hw_addr + tx_ring-&gt;tdt);</div><div class='del'>-			/* we need this if more than one processor can write to</div><div class='del'>-			 * our tail at a time, it synchronizes IO on IA64/Altix</div><div class='del'>-			 * systems</div><div class='del'>-			 */</div><div class='del'>-			mmiowb();</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c<br/>index 7acc61e4f645..0e09bede42a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/e1000e/netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/e1000e/netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/e1000e/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/e1000e/netdev.c</a></div><div class='hunk'>@@ -3816,7 +3816,6 @@ static void e1000_flush_tx_ring(struct e1000_adapter *adapter)</div><div class='ctx'> 	if (tx_ring-&gt;next_to_use == tx_ring-&gt;count)</div><div class='ctx'> 		tx_ring-&gt;next_to_use = 0;</div><div class='ctx'> 	ew32(TDT(0), tx_ring-&gt;next_to_use);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	usleep_range(200, 250);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5897,19 +5896,13 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 				     DIV_ROUND_UP(PAGE_SIZE,</div><div class='ctx'> 						  adapter-&gt;tx_fifo_limit) + 2));</div><div class='ctx'> </div><div class='del'>-		if (!skb-&gt;xmit_more ||</div><div class='add'>+		if (!netdev_xmit_more() ||</div><div class='ctx'> 		    netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) {</div><div class='ctx'> 			if (adapter-&gt;flags2 &amp; FLAG2_PCIM2PCI_ARBITER_WA)</div><div class='ctx'> 				e1000e_update_tdt_wa(tx_ring,</div><div class='ctx'> 						     tx_ring-&gt;next_to_use);</div><div class='ctx'> 			else</div><div class='ctx'> 				writel(tx_ring-&gt;next_to_use, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-			/* we need this if more than one processor can write</div><div class='del'>-			 * to our tail at a time, it synchronizes IO on</div><div class='del'>-			 *IA64/Altix systems</div><div class='del'>-			 */</div><div class='del'>-			mmiowb();</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -7003,7 +6996,7 @@ static int e1000_set_features(struct net_device *netdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		e1000e_reset(adapter);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops e1000e_netdev_ops = {</div><div class='hunk'>@@ -7350,7 +7343,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	dev_pm_set_driver_flags(&amp;pdev-&gt;dev, DPM_FLAG_NEVER_SKIP);</div><div class='ctx'> </div><div class='del'>-	if (pci_dev_run_wake(pdev))</div><div class='add'>+	if (pci_dev_run_wake(pdev) &amp;&amp; hw-&gt;mac.type &lt; e1000_pch_cnp)</div><div class='ctx'> 		pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c<br/>index 5d4f1761dc0c..8de77155f2e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/fm10k/fm10k_iov.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/fm10k/fm10k_iov.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/fm10k/fm10k_iov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/fm10k/fm10k_iov.c</a></div><div class='hunk'>@@ -321,8 +321,6 @@ static void fm10k_mask_aer_comp_abort(struct pci_dev *pdev)</div><div class='ctx'> 	pci_read_config_dword(pdev, pos + PCI_ERR_UNCOR_MASK, &amp;err_mask);</div><div class='ctx'> 	err_mask |= PCI_ERR_UNC_COMP_ABORT;</div><div class='ctx'> 	pci_write_config_dword(pdev, pos + PCI_ERR_UNCOR_MASK, err_mask);</div><div class='del'>-</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fm10k_iov_resume(struct pci_dev *pdev)</div><div class='head'>diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c<br/>index 5a0419421511..90270b4a1682 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/fm10k/fm10k_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/fm10k/fm10k_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/fm10k/fm10k_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/fm10k/fm10k_main.c</a></div><div class='hunk'>@@ -41,6 +41,8 @@ static int __init fm10k_init_module(void)</div><div class='ctx'> 	/* create driver workqueue */</div><div class='ctx'> 	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,</div><div class='ctx'> 					  fm10k_driver_name);</div><div class='add'>+	if (!fm10k_workqueue)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	fm10k_dbg_init();</div><div class='ctx'> </div><div class='hunk'>@@ -278,7 +280,7 @@ static bool fm10k_add_rx_frag(struct fm10k_rx_buffer *rx_buffer,</div><div class='ctx'> 	/* we need the header to contain the greater of either ETH_HLEN or</div><div class='ctx'> 	 * 60 bytes if the skb-&gt;len is less than 60 for skb_pad.</div><div class='ctx'> 	 */</div><div class='del'>-	pull_len = eth_get_headlen(va, FM10K_RX_HDR_LEN);</div><div class='add'>+	pull_len = eth_get_headlen(skb-&gt;dev, va, FM10K_RX_HDR_LEN);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	memcpy(__skb_put(skb, pull_len), va, ALIGN(pull_len, sizeof(long)));</div><div class='hunk'>@@ -1035,13 +1037,8 @@ static void fm10k_tx_map(struct fm10k_ring *tx_ring,</div><div class='ctx'> 	fm10k_maybe_stop_tx(tx_ring, DESC_NEEDED);</div><div class='ctx'> </div><div class='ctx'> 	/* notify HW of packet */</div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/Makefile b/drivers/net/ethernet/intel/i40e/Makefile<br/>index 50590e8d1fd1..2f21b3e89fd0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/Makefile</a></div><div class='hunk'>@@ -21,6 +21,7 @@ i40e-objs := i40e_main.o \</div><div class='ctx'> 	i40e_diag.o	\</div><div class='ctx'> 	i40e_txrx.o	\</div><div class='ctx'> 	i40e_ptp.o	\</div><div class='add'>+	i40e_ddp.o \</div><div class='ctx'> 	i40e_client.o   \</div><div class='ctx'> 	i40e_virtchnl_pf.o \</div><div class='ctx'> 	i40e_xsk.o</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h<br/>index d684998ba2b0..7ce42040b851 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e.h</a></div><div class='hunk'>@@ -149,6 +149,7 @@ enum i40e_state_t {</div><div class='ctx'> 	__I40E_CLIENT_L2_CHANGE,</div><div class='ctx'> 	__I40E_CLIENT_RESET,</div><div class='ctx'> 	__I40E_VIRTCHNL_OP_PENDING,</div><div class='add'>+	__I40E_RECOVERY_MODE,</div><div class='ctx'> 	/* This must be last as it determines the size of the BITMAP */</div><div class='ctx'> 	__I40E_STATE_SIZE__,</div><div class='ctx'> };</div><div class='hunk'>@@ -321,6 +322,29 @@ struct i40e_udp_port_config {</div><div class='ctx'> 	u8 filter_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define I40_DDP_FLASH_REGION 100</div><div class='add'>+#define I40E_PROFILE_INFO_SIZE 48</div><div class='add'>+#define I40E_MAX_PROFILE_NUM 16</div><div class='add'>+#define I40E_PROFILE_LIST_SIZE \</div><div class='add'>+	(I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + 4)</div><div class='add'>+#define I40E_DDP_PROFILE_PATH "intel/i40e/ddp/"</div><div class='add'>+#define I40E_DDP_PROFILE_NAME_MAX 64</div><div class='add'>+</div><div class='add'>+int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,</div><div class='add'>+		  bool is_add);</div><div class='add'>+int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash);</div><div class='add'>+</div><div class='add'>+struct i40e_ddp_profile_list {</div><div class='add'>+	u32 p_count;</div><div class='add'>+	struct i40e_profile_info p_info[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct i40e_ddp_old_profile_list {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	size_t old_ddp_size;</div><div class='add'>+	u8 old_ddp_buf[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* macros related to FLX_PIT */</div><div class='ctx'> #define I40E_FLEX_SET_FSIZE(fsize) (((fsize) &lt;&lt; \</div><div class='ctx'> 				    I40E_PRTQF_FLX_PIT_FSIZE_SHIFT) &amp; \</div><div class='hunk'>@@ -589,6 +613,8 @@ struct i40e_pf {</div><div class='ctx'> 	struct sk_buff *ptp_tx_skb;</div><div class='ctx'> 	unsigned long ptp_tx_start;</div><div class='ctx'> 	struct hwtstamp_config tstamp_config;</div><div class='add'>+	struct timespec64 ptp_prev_hw_time;</div><div class='add'>+	ktime_t ptp_reset_start;</div><div class='ctx'> 	struct mutex tmreg_lock; /* Used to protect the SYSTIME registers. */</div><div class='ctx'> 	u32 ptp_adj_mult;</div><div class='ctx'> 	u32 tx_hwtstamp_timeouts;</div><div class='hunk'>@@ -610,6 +636,8 @@ struct i40e_pf {</div><div class='ctx'> 	u16 override_q_count;</div><div class='ctx'> 	u16 last_sw_conf_flags;</div><div class='ctx'> 	u16 last_sw_conf_valid_flags;</div><div class='add'>+	/* List to keep previous DDP profiles to be rolled back in the future */</div><div class='add'>+	struct list_head ddp_old_prof;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -790,6 +818,8 @@ struct i40e_vsi {</div><div class='ctx'> </div><div class='ctx'> 	/* VSI specific handlers */</div><div class='ctx'> 	irqreturn_t (*irq_handler)(int irq, void *data);</div><div class='add'>+</div><div class='add'>+	unsigned long *af_xdp_zc_qps; /* tracks AF_XDP ZC enabled qps */</div><div class='ctx'> } ____cacheline_internodealigned_in_smp;</div><div class='ctx'> </div><div class='ctx'> struct i40e_netdev_priv {</div><div class='hunk'>@@ -1081,6 +1111,8 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);</div><div class='ctx'> void i40e_ptp_set_increment(struct i40e_pf *pf);</div><div class='ctx'> int i40e_ptp_set_ts_config(struct i40e_pf *pf, struct ifreq *ifr);</div><div class='ctx'> int i40e_ptp_get_ts_config(struct i40e_pf *pf, struct ifreq *ifr);</div><div class='add'>+void i40e_ptp_save_hw_time(struct i40e_pf *pf);</div><div class='add'>+void i40e_ptp_restore_hw_time(struct i40e_pf *pf);</div><div class='ctx'> void i40e_ptp_init(struct i40e_pf *pf);</div><div class='ctx'> void i40e_ptp_stop(struct i40e_pf *pf);</div><div class='ctx'> int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);</div><div class='hunk'>@@ -1096,20 +1128,6 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi)</div><div class='ctx'> 	return !!vsi-&gt;xdp_prog;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)</div><div class='del'>-{</div><div class='del'>-	bool xdp_on = i40e_enabled_xdp_vsi(ring-&gt;vsi);</div><div class='del'>-	int qid = ring-&gt;queue_index;</div><div class='del'>-</div><div class='del'>-	if (ring_is_xdp(ring))</div><div class='del'>-		qid -= ring-&gt;vsi-&gt;alloc_queue_pairs;</div><div class='del'>-</div><div class='del'>-	if (!xdp_on)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return xdp_get_umem_from_qid(ring-&gt;vsi-&gt;netdev, qid);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);</div><div class='ctx'> int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate);</div><div class='ctx'> int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c<br/>index 7ab61f6ebb5f..243dcd4bec19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_adminq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_adminq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_adminq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_adminq.c</a></div><div class='hunk'>@@ -608,6 +608,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)</div><div class='ctx'> 	     hw-&gt;aq.api_min_ver &gt;= 7))</div><div class='ctx'> 		hw-&gt;flags |= I40E_HW_FLAG_802_1AD_CAPABLE;</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;aq.api_maj_ver &gt; 1 ||</div><div class='add'>+	    (hw-&gt;aq.api_maj_ver == 1 &amp;&amp;</div><div class='add'>+	     hw-&gt;aq.api_min_ver &gt;= 8))</div><div class='add'>+		hw-&gt;flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;</div><div class='add'>+</div><div class='ctx'> 	if (hw-&gt;aq.api_maj_ver &gt; I40E_FW_API_VERSION_MAJOR) {</div><div class='ctx'> 		ret_code = I40E_ERR_FIRMWARE_API_VERSION;</div><div class='ctx'> 		goto init_adminq_free_arq;</div><div class='hunk'>@@ -749,7 +754,7 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,</div><div class='ctx'> 	if (val &gt;= hw-&gt;aq.num_asq_entries) {</div><div class='ctx'> 		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,</div><div class='ctx'> 			   "AQTX: head overrun at %d\n", val);</div><div class='del'>-		status = I40E_ERR_QUEUE_EMPTY;</div><div class='add'>+		status = I40E_ERR_ADMIN_QUEUE_FULL;</div><div class='ctx'> 		goto asq_send_command_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h<br/>index 11506102471c..6536023fa074 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define I40E_FW_API_VERSION_MAJOR	0x0001</div><div class='del'>-#define I40E_FW_API_VERSION_MINOR_X722	0x0006</div><div class='del'>-#define I40E_FW_API_VERSION_MINOR_X710	0x0007</div><div class='add'>+#define I40E_FW_API_VERSION_MINOR_X722	0x0008</div><div class='add'>+#define I40E_FW_API_VERSION_MINOR_X710	0x0008</div><div class='ctx'> </div><div class='ctx'> #define I40E_FW_MINOR_VERSION(_h) ((_h)-&gt;mac.type == I40E_MAC_XL710 ? \</div><div class='ctx'> 					I40E_FW_API_VERSION_MINOR_X710 : \</div><div class='hunk'>@@ -261,6 +261,7 @@ enum i40e_admin_queue_opc {</div><div class='ctx'> 	i40e_aqc_opc_get_cee_dcb_cfg	= 0x0A07,</div><div class='ctx'> 	i40e_aqc_opc_lldp_set_local_mib	= 0x0A08,</div><div class='ctx'> 	i40e_aqc_opc_lldp_stop_start_spec_agent	= 0x0A09,</div><div class='add'>+	i40e_aqc_opc_lldp_restore		= 0x0A0A,</div><div class='ctx'> </div><div class='ctx'> 	/* Tunnel commands */</div><div class='ctx'> 	i40e_aqc_opc_add_udp_tunnel	= 0x0B00,</div><div class='hunk'>@@ -1887,6 +1888,8 @@ enum i40e_aq_phy_type {</div><div class='ctx'> 	I40E_PHY_TYPE_25GBASE_LR		= 0x22,</div><div class='ctx'> 	I40E_PHY_TYPE_25GBASE_AOC		= 0x23,</div><div class='ctx'> 	I40E_PHY_TYPE_25GBASE_ACC		= 0x24,</div><div class='add'>+	I40E_PHY_TYPE_2_5GBASE_T		= 0x30,</div><div class='add'>+	I40E_PHY_TYPE_5GBASE_T			= 0x31,</div><div class='ctx'> 	I40E_PHY_TYPE_MAX,</div><div class='ctx'> 	I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP	= 0xFD,</div><div class='ctx'> 	I40E_PHY_TYPE_EMPTY			= 0xFE,</div><div class='hunk'>@@ -1928,19 +1931,25 @@ enum i40e_aq_phy_type {</div><div class='ctx'> 				BIT_ULL(I40E_PHY_TYPE_25GBASE_SR) | \</div><div class='ctx'> 				BIT_ULL(I40E_PHY_TYPE_25GBASE_LR) | \</div><div class='ctx'> 				BIT_ULL(I40E_PHY_TYPE_25GBASE_AOC) | \</div><div class='del'>-				BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC))</div><div class='add'>+				BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC) | \</div><div class='add'>+				BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) | \</div><div class='add'>+				BIT_ULL(I40E_PHY_TYPE_5GBASE_T))</div><div class='ctx'> </div><div class='add'>+#define I40E_LINK_SPEED_2_5GB_SHIFT	0x0</div><div class='ctx'> #define I40E_LINK_SPEED_100MB_SHIFT	0x1</div><div class='ctx'> #define I40E_LINK_SPEED_1000MB_SHIFT	0x2</div><div class='ctx'> #define I40E_LINK_SPEED_10GB_SHIFT	0x3</div><div class='ctx'> #define I40E_LINK_SPEED_40GB_SHIFT	0x4</div><div class='ctx'> #define I40E_LINK_SPEED_20GB_SHIFT	0x5</div><div class='ctx'> #define I40E_LINK_SPEED_25GB_SHIFT	0x6</div><div class='add'>+#define I40E_LINK_SPEED_5GB_SHIFT	0x7</div><div class='ctx'> </div><div class='ctx'> enum i40e_aq_link_speed {</div><div class='ctx'> 	I40E_LINK_SPEED_UNKNOWN	= 0,</div><div class='ctx'> 	I40E_LINK_SPEED_100MB	= BIT(I40E_LINK_SPEED_100MB_SHIFT),</div><div class='ctx'> 	I40E_LINK_SPEED_1GB	= BIT(I40E_LINK_SPEED_1000MB_SHIFT),</div><div class='add'>+	I40E_LINK_SPEED_2_5GB	= (1 &lt;&lt; I40E_LINK_SPEED_2_5GB_SHIFT),</div><div class='add'>+	I40E_LINK_SPEED_5GB	= (1 &lt;&lt; I40E_LINK_SPEED_5GB_SHIFT),</div><div class='ctx'> 	I40E_LINK_SPEED_10GB	= BIT(I40E_LINK_SPEED_10GB_SHIFT),</div><div class='ctx'> 	I40E_LINK_SPEED_40GB	= BIT(I40E_LINK_SPEED_40GB_SHIFT),</div><div class='ctx'> 	I40E_LINK_SPEED_20GB	= BIT(I40E_LINK_SPEED_20GB_SHIFT),</div><div class='hunk'>@@ -1986,6 +1995,8 @@ struct i40e_aq_get_phy_abilities_resp {</div><div class='ctx'> #define I40E_AQ_PHY_TYPE_EXT_25G_LR	0x08</div><div class='ctx'> #define I40E_AQ_PHY_TYPE_EXT_25G_AOC	0x10</div><div class='ctx'> #define I40E_AQ_PHY_TYPE_EXT_25G_ACC	0x20</div><div class='add'>+#define I40E_AQ_PHY_TYPE_EXT_2_5GBASE_T	0x40</div><div class='add'>+#define I40E_AQ_PHY_TYPE_EXT_5GBASE_T	0x80</div><div class='ctx'> 	u8	fec_cfg_curr_mod_ext_info;</div><div class='ctx'> #define I40E_AQ_ENABLE_FEC_KR		0x01</div><div class='ctx'> #define I40E_AQ_ENABLE_FEC_RS		0x02</div><div class='hunk'>@@ -2498,18 +2509,19 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_update_tlv);</div><div class='ctx'> /* Stop LLDP (direct 0x0A05) */</div><div class='ctx'> struct i40e_aqc_lldp_stop {</div><div class='ctx'> 	u8	command;</div><div class='del'>-#define I40E_AQ_LLDP_AGENT_STOP		0x0</div><div class='del'>-#define I40E_AQ_LLDP_AGENT_SHUTDOWN	0x1</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_STOP			0x0</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_SHUTDOWN		0x1</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_STOP_PERSIST		0x2</div><div class='ctx'> 	u8	reserved[15];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop);</div><div class='ctx'> </div><div class='ctx'> /* Start LLDP (direct 0x0A06) */</div><div class='del'>-</div><div class='ctx'> struct i40e_aqc_lldp_start {</div><div class='ctx'> 	u8	command;</div><div class='del'>-#define I40E_AQ_LLDP_AGENT_START	0x1</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_START		0x1</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_START_PERSIST	0x2</div><div class='ctx'> 	u8	reserved[15];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2633,6 +2645,16 @@ struct i40e_aqc_lldp_stop_start_specific_agent {</div><div class='ctx'> </div><div class='ctx'> I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop_start_specific_agent);</div><div class='ctx'> </div><div class='add'>+/* Restore LLDP Agent factory settings (direct 0x0A0A) */</div><div class='add'>+struct i40e_aqc_lldp_restore {</div><div class='add'>+	u8	command;</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_RESTORE_NOT		0x0</div><div class='add'>+#define I40E_AQ_LLDP_AGENT_RESTORE		0x1</div><div class='add'>+	u8	reserved[15];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_restore);</div><div class='add'>+</div><div class='ctx'> /* Add Udp Tunnel command and completion (direct 0x0B00) */</div><div class='ctx'> struct i40e_aqc_add_udp_tunnel {</div><div class='ctx'> 	__le16	udp_port;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c<br/>index 5f3b8b9ff511..e81530ca08d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_client.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_client.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_client.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_client.c</a></div><div class='hunk'>@@ -578,11 +578,9 @@ static int i40e_client_setup_qvlist(struct i40e_info *ldev,</div><div class='ctx'> 	struct i40e_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	struct i40e_qv_info *qv_info;</div><div class='ctx'> 	u32 v_idx, i, reg_idx, reg;</div><div class='del'>-	u32 size;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct i40e_qvlist_info) +</div><div class='del'>-	       (sizeof(struct i40e_qv_info) * (qvlist_info-&gt;num_vectors - 1));</div><div class='del'>-	ldev-&gt;qvlist_info = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	ldev-&gt;qvlist_info = kzalloc(struct_size(ldev-&gt;qvlist_info, qv_info,</div><div class='add'>+				    qvlist_info-&gt;num_vectors - 1), GFP_KERNEL);</div><div class='ctx'> 	if (!ldev-&gt;qvlist_info)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ldev-&gt;qvlist_info-&gt;num_vectors = qvlist_info-&gt;num_vectors;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c<br/>index 97a9b1fb4763..ecb1adaa54ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_common.c</a></div><div class='hunk'>@@ -28,10 +28,14 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)</div><div class='ctx'> 		case I40E_DEV_ID_QSFP_C:</div><div class='ctx'> 		case I40E_DEV_ID_10G_BASE_T:</div><div class='ctx'> 		case I40E_DEV_ID_10G_BASE_T4:</div><div class='add'>+		case I40E_DEV_ID_10G_B:</div><div class='add'>+		case I40E_DEV_ID_10G_SFP:</div><div class='ctx'> 		case I40E_DEV_ID_20G_KR2:</div><div class='ctx'> 		case I40E_DEV_ID_20G_KR2_A:</div><div class='ctx'> 		case I40E_DEV_ID_25G_B:</div><div class='ctx'> 		case I40E_DEV_ID_25G_SFP28:</div><div class='add'>+		case I40E_DEV_ID_X710_N3000:</div><div class='add'>+		case I40E_DEV_ID_XXV710_N3000:</div><div class='ctx'> 			hw-&gt;mac.type = I40E_MAC_XL710;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case I40E_DEV_ID_KX_X722:</div><div class='hunk'>@@ -1149,6 +1153,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_PHY_TYPE_100BASE_TX:</div><div class='ctx'> 	case I40E_PHY_TYPE_1000BASE_T:</div><div class='add'>+	case I40E_PHY_TYPE_2_5GBASE_T:</div><div class='add'>+	case I40E_PHY_TYPE_5GBASE_T:</div><div class='ctx'> 	case I40E_PHY_TYPE_10GBASE_T:</div><div class='ctx'> 		media = I40E_MEDIA_TYPE_BASET;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1466,7 +1472,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)</div><div class='ctx'>  **/</div><div class='ctx'> u32 i40e_led_get(struct i40e_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	u32 current_mode = 0;</div><div class='ctx'> 	u32 mode = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1479,21 +1484,6 @@ u32 i40e_led_get(struct i40e_hw *hw)</div><div class='ctx'> 		if (!gpio_val)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* ignore gpio LED src mode entries related to the activity</div><div class='del'>-		 * LEDs</div><div class='del'>-		 */</div><div class='del'>-		current_mode = ((gpio_val &amp; I40E_GLGEN_GPIO_CTL_LED_MODE_MASK)</div><div class='del'>-				&gt;&gt; I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT);</div><div class='del'>-		switch (current_mode) {</div><div class='del'>-		case I40E_COMBINED_ACTIVITY:</div><div class='del'>-		case I40E_FILTER_ACTIVITY:</div><div class='del'>-		case I40E_MAC_ACTIVITY:</div><div class='del'>-		case I40E_LINK_ACTIVITY:</div><div class='del'>-			continue;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		mode = (gpio_val &amp; I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) &gt;&gt;</div><div class='ctx'> 			I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1513,7 +1503,6 @@ u32 i40e_led_get(struct i40e_hw *hw)</div><div class='ctx'>  **/</div><div class='ctx'> void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)</div><div class='ctx'> {</div><div class='del'>-	u32 current_mode = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (mode &amp; 0xfffffff0)</div><div class='hunk'>@@ -1527,22 +1516,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)</div><div class='ctx'> </div><div class='ctx'> 		if (!gpio_val)</div><div class='ctx'> 			continue;</div><div class='del'>-</div><div class='del'>-		/* ignore gpio LED src mode entries related to the activity</div><div class='del'>-		 * LEDs</div><div class='del'>-		 */</div><div class='del'>-		current_mode = ((gpio_val &amp; I40E_GLGEN_GPIO_CTL_LED_MODE_MASK)</div><div class='del'>-				&gt;&gt; I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT);</div><div class='del'>-		switch (current_mode) {</div><div class='del'>-		case I40E_COMBINED_ACTIVITY:</div><div class='del'>-		case I40E_FILTER_ACTIVITY:</div><div class='del'>-		case I40E_MAC_ACTIVITY:</div><div class='del'>-		case I40E_LINK_ACTIVITY:</div><div class='del'>-			continue;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		gpio_val &amp;= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK;</div><div class='ctx'> 		/* this &amp; is a bit of paranoia, but serves as a range check */</div><div class='ctx'> 		gpio_val |= ((mode &lt;&lt; I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &amp;</div><div class='hunk'>@@ -3657,14 +3630,54 @@ i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * i40e_aq_restore_lldp</div><div class='add'>+ * @hw: pointer to the hw struct</div><div class='add'>+ * @setting: pointer to factory setting variable or NULL</div><div class='add'>+ * @restore: True if factory settings should be restored</div><div class='add'>+ * @cmd_details: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Restore LLDP Agent factory settings if @restore set to True. In other case</div><div class='add'>+ * only returns factory setting in AQ response.</div><div class='add'>+ **/</div><div class='add'>+enum i40e_status_code</div><div class='add'>+i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore,</div><div class='add'>+		     struct i40e_asq_cmd_details *cmd_details)</div><div class='add'>+{</div><div class='add'>+	struct i40e_aq_desc desc;</div><div class='add'>+	struct i40e_aqc_lldp_restore *cmd =</div><div class='add'>+		(struct i40e_aqc_lldp_restore *)&amp;desc.params.raw;</div><div class='add'>+	i40e_status status;</div><div class='add'>+</div><div class='add'>+	if (!(hw-&gt;flags &amp; I40E_HW_FLAG_FW_LLDP_PERSISTENT)) {</div><div class='add'>+		i40e_debug(hw, I40E_DEBUG_ALL,</div><div class='add'>+			   "Restore LLDP not supported by current FW version.\n");</div><div class='add'>+		return I40E_ERR_DEVICE_NOT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i40e_fill_default_direct_cmd_desc(&amp;desc, i40e_aqc_opc_lldp_restore);</div><div class='add'>+</div><div class='add'>+	if (restore)</div><div class='add'>+		cmd-&gt;command |= I40E_AQ_LLDP_AGENT_RESTORE;</div><div class='add'>+</div><div class='add'>+	status = i40e_asq_send_command(hw, &amp;desc, NULL, 0, cmd_details);</div><div class='add'>+</div><div class='add'>+	if (setting)</div><div class='add'>+		*setting = cmd-&gt;command &amp; 1;</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='ctx'>  * i40e_aq_stop_lldp</div><div class='ctx'>  * @hw: pointer to the hw struct</div><div class='ctx'>  * @shutdown_agent: True if LLDP Agent needs to be Shutdown</div><div class='add'>+ * @persist: True if stop of LLDP should be persistent across power cycles</div><div class='ctx'>  * @cmd_details: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='ctx'>  * Stop or Shutdown the embedded LLDP Agent</div><div class='ctx'>  **/</div><div class='ctx'> i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,</div><div class='add'>+				bool persist,</div><div class='ctx'> 				struct i40e_asq_cmd_details *cmd_details)</div><div class='ctx'> {</div><div class='ctx'> 	struct i40e_aq_desc desc;</div><div class='hunk'>@@ -3677,6 +3690,14 @@ i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,</div><div class='ctx'> 	if (shutdown_agent)</div><div class='ctx'> 		cmd-&gt;command |= I40E_AQ_LLDP_AGENT_SHUTDOWN;</div><div class='ctx'> </div><div class='add'>+	if (persist) {</div><div class='add'>+		if (hw-&gt;flags &amp; I40E_HW_FLAG_FW_LLDP_PERSISTENT)</div><div class='add'>+			cmd-&gt;command |= I40E_AQ_LLDP_AGENT_STOP_PERSIST;</div><div class='add'>+		else</div><div class='add'>+			i40e_debug(hw, I40E_DEBUG_ALL,</div><div class='add'>+				   "Persistent Stop LLDP not supported by current FW version.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = i40e_asq_send_command(hw, &amp;desc, NULL, 0, cmd_details);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -3686,13 +3707,14 @@ i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,</div><div class='ctx'>  * i40e_aq_start_lldp</div><div class='ctx'>  * @hw: pointer to the hw struct</div><div class='ctx'>  * @buff: buffer for result</div><div class='add'>+ * @persist: True if start of LLDP should be persistent across power cycles</div><div class='ctx'>  * @buff_size: buffer size</div><div class='ctx'>  * @cmd_details: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='ctx'>  * Start the embedded LLDP Agent on all ports.</div><div class='ctx'>  **/</div><div class='del'>-i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,</div><div class='del'>-				struct i40e_asq_cmd_details *cmd_details)</div><div class='add'>+i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist,</div><div class='add'>+			       struct i40e_asq_cmd_details *cmd_details)</div><div class='ctx'> {</div><div class='ctx'> 	struct i40e_aq_desc desc;</div><div class='ctx'> 	struct i40e_aqc_lldp_start *cmd =</div><div class='hunk'>@@ -3702,6 +3724,15 @@ i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,</div><div class='ctx'> 	i40e_fill_default_direct_cmd_desc(&amp;desc, i40e_aqc_opc_lldp_start);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;command = I40E_AQ_LLDP_AGENT_START;</div><div class='add'>+</div><div class='add'>+	if (persist) {</div><div class='add'>+		if (hw-&gt;flags &amp; I40E_HW_FLAG_FW_LLDP_PERSISTENT)</div><div class='add'>+			cmd-&gt;command |= I40E_AQ_LLDP_AGENT_START_PERSIST;</div><div class='add'>+		else</div><div class='add'>+			i40e_debug(hw, I40E_DEBUG_ALL,</div><div class='add'>+				   "Persistent Start LLDP not supported by current FW version.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = i40e_asq_send_command(hw, &amp;desc, NULL, 0, cmd_details);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -4873,6 +4904,7 @@ i40e_status i40e_read_phy_register(struct i40e_hw *hw,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_DEV_ID_10G_BASE_T:</div><div class='ctx'> 	case I40E_DEV_ID_10G_BASE_T4:</div><div class='add'>+	case I40E_DEV_ID_10G_BASE_T_BC:</div><div class='ctx'> 	case I40E_DEV_ID_10G_BASE_T_X722:</div><div class='ctx'> 	case I40E_DEV_ID_25G_B:</div><div class='ctx'> 	case I40E_DEV_ID_25G_SFP28:</div><div class='hunk'>@@ -5448,6 +5480,163 @@ i40e_find_segment_in_package(u32 segment_type,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Get section table in profile */</div><div class='add'>+#define I40E_SECTION_TABLE(profile, sec_tbl)				\</div><div class='add'>+	do {								\</div><div class='add'>+		struct i40e_profile_segment *p = (profile);		\</div><div class='add'>+		u32 count;						\</div><div class='add'>+		u32 *nvm;						\</div><div class='add'>+		count = p-&gt;device_table_count;				\</div><div class='add'>+		nvm = (u32 *)&amp;p-&gt;device_table[count];			\</div><div class='add'>+		sec_tbl = (struct i40e_section_table *)&amp;nvm[nvm[0] + 1]; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* Get section header in profile */</div><div class='add'>+#define I40E_SECTION_HEADER(profile, offset)				\</div><div class='add'>+	(struct i40e_profile_section_header *)((u8 *)(profile) + (offset))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_find_section_in_profile</div><div class='add'>+ * @section_type: the section type to search for (i.e., SECTION_TYPE_NOTE)</div><div class='add'>+ * @profile: pointer to the i40e segment header to be searched</div><div class='add'>+ *</div><div class='add'>+ * This function searches i40e segment for a particular section type. On</div><div class='add'>+ * success it returns a pointer to the section header, otherwise it will</div><div class='add'>+ * return NULL.</div><div class='add'>+ **/</div><div class='add'>+struct i40e_profile_section_header *</div><div class='add'>+i40e_find_section_in_profile(u32 section_type,</div><div class='add'>+			     struct i40e_profile_segment *profile)</div><div class='add'>+{</div><div class='add'>+	struct i40e_profile_section_header *sec;</div><div class='add'>+	struct i40e_section_table *sec_tbl;</div><div class='add'>+	u32 sec_off;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (profile-&gt;header.type != SEGMENT_TYPE_I40E)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	I40E_SECTION_TABLE(profile, sec_tbl);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sec_tbl-&gt;section_count; i++) {</div><div class='add'>+		sec_off = sec_tbl-&gt;section_offset[i];</div><div class='add'>+		sec = I40E_SECTION_HEADER(profile, sec_off);</div><div class='add'>+		if (sec-&gt;section.type == section_type)</div><div class='add'>+			return sec;</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'>+/**</div><div class='add'>+ * i40e_ddp_exec_aq_section - Execute generic AQ for DDP</div><div class='add'>+ * @hw: pointer to the hw struct</div><div class='add'>+ * @aq: command buffer containing all data to execute AQ</div><div class='add'>+ **/</div><div class='add'>+static enum</div><div class='add'>+i40e_status_code i40e_ddp_exec_aq_section(struct i40e_hw *hw,</div><div class='add'>+					  struct i40e_profile_aq_section *aq)</div><div class='add'>+{</div><div class='add'>+	i40e_status status;</div><div class='add'>+	struct i40e_aq_desc desc;</div><div class='add'>+	u8 *msg = NULL;</div><div class='add'>+	u16 msglen;</div><div class='add'>+</div><div class='add'>+	i40e_fill_default_direct_cmd_desc(&amp;desc, aq-&gt;opcode);</div><div class='add'>+	desc.flags |= cpu_to_le16(aq-&gt;flags);</div><div class='add'>+	memcpy(desc.params.raw, aq-&gt;param, sizeof(desc.params.raw));</div><div class='add'>+</div><div class='add'>+	msglen = aq-&gt;datalen;</div><div class='add'>+	if (msglen) {</div><div class='add'>+		desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF |</div><div class='add'>+						I40E_AQ_FLAG_RD));</div><div class='add'>+		if (msglen &gt; I40E_AQ_LARGE_BUF)</div><div class='add'>+			desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);</div><div class='add'>+		desc.datalen = cpu_to_le16(msglen);</div><div class='add'>+		msg = &amp;aq-&gt;data[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = i40e_asq_send_command(hw, &amp;desc, msg, msglen, NULL);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='add'>+			   "unable to exec DDP AQ opcode %u, error %d\n",</div><div class='add'>+			   aq-&gt;opcode, status);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy returned desc to aq_buf */</div><div class='add'>+	memcpy(aq-&gt;param, desc.params.raw, sizeof(desc.params.raw));</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'>+ * i40e_validate_profile</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @profile: pointer to the profile segment of the package to be validated</div><div class='add'>+ * @track_id: package tracking id</div><div class='add'>+ * @rollback: flag if the profile is for rollback.</div><div class='add'>+ *</div><div class='add'>+ * Validates supported devices and profile's sections.</div><div class='add'>+ */</div><div class='add'>+static enum i40e_status_code</div><div class='add'>+i40e_validate_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,</div><div class='add'>+		      u32 track_id, bool rollback)</div><div class='add'>+{</div><div class='add'>+	struct i40e_profile_section_header *sec = NULL;</div><div class='add'>+	i40e_status status = 0;</div><div class='add'>+	struct i40e_section_table *sec_tbl;</div><div class='add'>+	u32 vendor_dev_id;</div><div class='add'>+	u32 dev_cnt;</div><div class='add'>+	u32 sec_off;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (track_id == I40E_DDP_TRACKID_INVALID) {</div><div class='add'>+		i40e_debug(hw, I40E_DEBUG_PACKAGE, "Invalid track_id\n");</div><div class='add'>+		return I40E_NOT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_cnt = profile-&gt;device_table_count;</div><div class='add'>+	for (i = 0; i &lt; dev_cnt; i++) {</div><div class='add'>+		vendor_dev_id = profile-&gt;device_table[i].vendor_dev_id;</div><div class='add'>+		if ((vendor_dev_id &gt;&gt; 16) == PCI_VENDOR_ID_INTEL &amp;&amp;</div><div class='add'>+		    hw-&gt;device_id == (vendor_dev_id &amp; 0xFFFF))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (dev_cnt &amp;&amp; i == dev_cnt) {</div><div class='add'>+		i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='add'>+			   "Device doesn't support DDP\n");</div><div class='add'>+		return I40E_ERR_DEVICE_NOT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I40E_SECTION_TABLE(profile, sec_tbl);</div><div class='add'>+</div><div class='add'>+	/* Validate sections types */</div><div class='add'>+	for (i = 0; i &lt; sec_tbl-&gt;section_count; i++) {</div><div class='add'>+		sec_off = sec_tbl-&gt;section_offset[i];</div><div class='add'>+		sec = I40E_SECTION_HEADER(profile, sec_off);</div><div class='add'>+		if (rollback) {</div><div class='add'>+			if (sec-&gt;section.type == SECTION_TYPE_MMIO ||</div><div class='add'>+			    sec-&gt;section.type == SECTION_TYPE_AQ ||</div><div class='add'>+			    sec-&gt;section.type == SECTION_TYPE_RB_AQ) {</div><div class='add'>+				i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='add'>+					   "Not a roll-back package\n");</div><div class='add'>+				return I40E_NOT_SUPPORTED;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (sec-&gt;section.type == SECTION_TYPE_RB_AQ ||</div><div class='add'>+			    sec-&gt;section.type == SECTION_TYPE_RB_MMIO) {</div><div class='add'>+				i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='add'>+					   "Not an original package\n");</div><div class='add'>+				return I40E_NOT_SUPPORTED;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * i40e_write_profile</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='hunk'>@@ -5463,47 +5652,99 @@ i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,</div><div class='ctx'> 	i40e_status status = 0;</div><div class='ctx'> 	struct i40e_section_table *sec_tbl;</div><div class='ctx'> 	struct i40e_profile_section_header *sec = NULL;</div><div class='del'>-	u32 dev_cnt;</div><div class='del'>-	u32 vendor_dev_id;</div><div class='del'>-	u32 *nvm;</div><div class='add'>+	struct i40e_profile_aq_section *ddp_aq;</div><div class='ctx'> 	u32 section_size = 0;</div><div class='ctx'> 	u32 offset = 0, info = 0;</div><div class='add'>+	u32 sec_off;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	dev_cnt = profile-&gt;device_table_count;</div><div class='add'>+	status = i40e_validate_profile(hw, profile, track_id, false);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dev_cnt; i++) {</div><div class='del'>-		vendor_dev_id = profile-&gt;device_table[i].vendor_dev_id;</div><div class='del'>-		if ((vendor_dev_id &gt;&gt; 16) == PCI_VENDOR_ID_INTEL)</div><div class='del'>-			if (hw-&gt;device_id == (vendor_dev_id &amp; 0xFFFF))</div><div class='add'>+	I40E_SECTION_TABLE(profile, sec_tbl);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sec_tbl-&gt;section_count; i++) {</div><div class='add'>+		sec_off = sec_tbl-&gt;section_offset[i];</div><div class='add'>+		sec = I40E_SECTION_HEADER(profile, sec_off);</div><div class='add'>+		/* Process generic admin command */</div><div class='add'>+		if (sec-&gt;section.type == SECTION_TYPE_AQ) {</div><div class='add'>+			ddp_aq = (struct i40e_profile_aq_section *)&amp;sec[1];</div><div class='add'>+			status = i40e_ddp_exec_aq_section(hw, ddp_aq);</div><div class='add'>+			if (status) {</div><div class='add'>+				i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='add'>+					   "Failed to execute aq: section %d, opcode %u\n",</div><div class='add'>+					   i, ddp_aq-&gt;opcode);</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='add'>+			sec-&gt;section.type = SECTION_TYPE_RB_AQ;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Skip any non-mmio sections */</div><div class='add'>+		if (sec-&gt;section.type != SECTION_TYPE_MMIO)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		section_size = sec-&gt;section.size +</div><div class='add'>+			sizeof(struct i40e_profile_section_header);</div><div class='add'>+</div><div class='add'>+		/* Write MMIO section */</div><div class='add'>+		status = i40e_aq_write_ddp(hw, (void *)sec, (u16)section_size,</div><div class='add'>+					   track_id, &amp;offset, &amp;info, NULL);</div><div class='add'>+		if (status) {</div><div class='add'>+			i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='add'>+				   "Failed to write profile: section %d, offset %d, info %d\n",</div><div class='add'>+				   i, offset, info);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (i == dev_cnt) {</div><div class='del'>-		i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support DDP");</div><div class='del'>-		return I40E_ERR_DEVICE_NOT_SUPPORTED;</div><div class='del'>-	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_rollback_profile</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @profile: pointer to the profile segment of the package to be removed</div><div class='add'>+ * @track_id: package tracking id</div><div class='add'>+ *</div><div class='add'>+ * Rolls back previously loaded package.</div><div class='add'>+ */</div><div class='add'>+enum i40e_status_code</div><div class='add'>+i40e_rollback_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,</div><div class='add'>+		      u32 track_id)</div><div class='add'>+{</div><div class='add'>+	struct i40e_profile_section_header *sec = NULL;</div><div class='add'>+	i40e_status status = 0;</div><div class='add'>+	struct i40e_section_table *sec_tbl;</div><div class='add'>+	u32 offset = 0, info = 0;</div><div class='add'>+	u32 section_size = 0;</div><div class='add'>+	u32 sec_off;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	nvm = (u32 *)&amp;profile-&gt;device_table[dev_cnt];</div><div class='del'>-	sec_tbl = (struct i40e_section_table *)&amp;nvm[nvm[0] + 1];</div><div class='add'>+	status = i40e_validate_profile(hw, profile, track_id, true);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sec_tbl-&gt;section_count; i++) {</div><div class='del'>-		sec = (struct i40e_profile_section_header *)((u8 *)profile +</div><div class='del'>-					     sec_tbl-&gt;section_offset[i]);</div><div class='add'>+	I40E_SECTION_TABLE(profile, sec_tbl);</div><div class='ctx'> </div><div class='del'>-		/* Skip 'AQ', 'note' and 'name' sections */</div><div class='del'>-		if (sec-&gt;section.type != SECTION_TYPE_MMIO)</div><div class='add'>+	/* For rollback write sections in reverse */</div><div class='add'>+	for (i = sec_tbl-&gt;section_count - 1; i &gt;= 0; i--) {</div><div class='add'>+		sec_off = sec_tbl-&gt;section_offset[i];</div><div class='add'>+		sec = I40E_SECTION_HEADER(profile, sec_off);</div><div class='add'>+</div><div class='add'>+		/* Skip any non-rollback sections */</div><div class='add'>+		if (sec-&gt;section.type != SECTION_TYPE_RB_MMIO)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		section_size = sec-&gt;section.size +</div><div class='ctx'> 			sizeof(struct i40e_profile_section_header);</div><div class='ctx'> </div><div class='del'>-		/* Write profile */</div><div class='add'>+		/* Write roll-back MMIO section */</div><div class='ctx'> 		status = i40e_aq_write_ddp(hw, (void *)sec, (u16)section_size,</div><div class='ctx'> 					   track_id, &amp;offset, &amp;info, NULL);</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			i40e_debug(hw, I40E_DEBUG_PACKAGE,</div><div class='del'>-				   "Failed to write profile: offset %d, info %d",</div><div class='del'>-				   offset, info);</div><div class='add'>+				   "Failed to write profile: section %d, offset %d, info %d\n",</div><div class='add'>+				   i, offset, info);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c<br/>index 56bff8faf371..292eeb3def10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_dcb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_dcb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_dcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_dcb.c</a></div><div class='hunk'>@@ -863,22 +863,23 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * i40e_init_dcb</div><div class='ctx'>  * @hw: pointer to the hw struct</div><div class='add'>+ * @enable_mib_change: enable mib change event</div><div class='ctx'>  *</div><div class='ctx'>  * Update DCB configuration from the Firmware</div><div class='ctx'>  **/</div><div class='del'>-i40e_status i40e_init_dcb(struct i40e_hw *hw)</div><div class='add'>+i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change)</div><div class='ctx'> {</div><div class='ctx'> 	i40e_status ret = 0;</div><div class='ctx'> 	struct i40e_lldp_variables lldp_cfg;</div><div class='ctx'> 	u8 adminstatus = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!hw-&gt;func_caps.dcb)</div><div class='del'>-		return ret;</div><div class='add'>+		return I40E_NOT_SUPPORTED;</div><div class='ctx'> </div><div class='ctx'> 	/* Read LLDP NVM area */</div><div class='ctx'> 	ret = i40e_read_lldp_cfg(hw, &amp;lldp_cfg);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		return I40E_ERR_NOT_READY;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the LLDP AdminStatus for the current port */</div><div class='ctx'> 	adminstatus = lldp_cfg.adminstatus &gt;&gt; (hw-&gt;port * 4);</div><div class='hunk'>@@ -887,7 +888,7 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw)</div><div class='ctx'> 	/* LLDP agent disabled */</div><div class='ctx'> 	if (!adminstatus) {</div><div class='ctx'> 		hw-&gt;dcbx_status = I40E_DCBX_STATUS_DISABLED;</div><div class='del'>-		return ret;</div><div class='add'>+		return I40E_ERR_NOT_READY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get DCBX status */</div><div class='hunk'>@@ -896,26 +897,19 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the DCBX Status */</div><div class='del'>-	switch (hw-&gt;dcbx_status) {</div><div class='del'>-	case I40E_DCBX_STATUS_DONE:</div><div class='del'>-	case I40E_DCBX_STATUS_IN_PROGRESS:</div><div class='add'>+	if (hw-&gt;dcbx_status == I40E_DCBX_STATUS_DONE ||</div><div class='add'>+	    hw-&gt;dcbx_status == I40E_DCBX_STATUS_IN_PROGRESS) {</div><div class='ctx'> 		/* Get current DCBX configuration */</div><div class='ctx'> 		ret = i40e_get_dcb_config(hw);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		break;</div><div class='del'>-	case I40E_DCBX_STATUS_DISABLED:</div><div class='del'>-		return ret;</div><div class='del'>-	case I40E_DCBX_STATUS_NOT_STARTED:</div><div class='del'>-	case I40E_DCBX_STATUS_MULTIPLE_PEERS:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	} else if (hw-&gt;dcbx_status == I40E_DCBX_STATUS_DISABLED) {</div><div class='add'>+		return I40E_ERR_NOT_READY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the LLDP MIB change event */</div><div class='del'>-	ret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (enable_mib_change)</div><div class='add'>+		ret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.h b/drivers/net/ethernet/intel/i40e/i40e_dcb.h<br/>index 2b748a60a843..ddb48ae7cce4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_dcb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_dcb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_dcb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_dcb.h</a></div><div class='hunk'>@@ -124,5 +124,5 @@ i40e_status i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type,</div><div class='ctx'> 					     u8 bridgetype,</div><div class='ctx'> 					     struct i40e_dcbx_config *dcbcfg);</div><div class='ctx'> i40e_status i40e_get_dcb_config(struct i40e_hw *hw);</div><div class='del'>-i40e_status i40e_init_dcb(struct i40e_hw *hw);</div><div class='add'>+i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change);</div><div class='ctx'> #endif /* _I40E_DCB_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_ddp.c b/drivers/net/ethernet/intel/i40e/i40e_ddp.c<br/>new file mode 100644<br/>index 000000000000..5e08f100c413<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_ddp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_ddp.c</a></div><div class='hunk'>@@ -0,0 +1,481 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2013 - 2018 Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#include "i40e.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_ddp_profiles_eq - checks if DDP profiles are the equivalent</div><div class='add'>+ * @a: new profile info</div><div class='add'>+ * @b: old profile info</div><div class='add'>+ *</div><div class='add'>+ * checks if DDP profiles are the equivalent.</div><div class='add'>+ * Returns true if profiles are the same.</div><div class='add'>+ **/</div><div class='add'>+static bool i40e_ddp_profiles_eq(struct i40e_profile_info *a,</div><div class='add'>+				 struct i40e_profile_info *b)</div><div class='add'>+{</div><div class='add'>+	return a-&gt;track_id == b-&gt;track_id &amp;&amp;</div><div class='add'>+		!memcmp(&amp;a-&gt;version, &amp;b-&gt;version, sizeof(a-&gt;version)) &amp;&amp;</div><div class='add'>+		!memcmp(&amp;a-&gt;name, &amp;b-&gt;name, I40E_DDP_NAME_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_ddp_does_profile_exist - checks if DDP profile loaded already</div><div class='add'>+ * @hw: HW data structure</div><div class='add'>+ * @pinfo: DDP profile information structure</div><div class='add'>+ *</div><div class='add'>+ * checks if DDP profile loaded already.</div><div class='add'>+ * Returns &gt;0 if the profile exists.</div><div class='add'>+ * Returns  0 if the profile is absent.</div><div class='add'>+ * Returns &lt;0 if error.</div><div class='add'>+ **/</div><div class='add'>+static int i40e_ddp_does_profile_exist(struct i40e_hw *hw,</div><div class='add'>+				       struct i40e_profile_info *pinfo)</div><div class='add'>+{</div><div class='add'>+	struct i40e_ddp_profile_list *profile_list;</div><div class='add'>+	u8 buff[I40E_PROFILE_LIST_SIZE];</div><div class='add'>+	i40e_status status;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	status = i40e_aq_get_ddp_list(hw, buff, I40E_PROFILE_LIST_SIZE, 0,</div><div class='add'>+				      NULL);</div><div class='add'>+	if (status)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	profile_list = (struct i40e_ddp_profile_list *)buff;</div><div class='add'>+	for (i = 0; i &lt; profile_list-&gt;p_count; i++) {</div><div class='add'>+		if (i40e_ddp_profiles_eq(pinfo, &amp;profile_list-&gt;p_info[i]))</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'>+/**</div><div class='add'>+ * i40e_ddp_profiles_overlap - checks if DDP profiles overlap.</div><div class='add'>+ * @new: new profile info</div><div class='add'>+ * @old: old profile info</div><div class='add'>+ *</div><div class='add'>+ * checks if DDP profiles overlap.</div><div class='add'>+ * Returns true if profiles are overlap.</div><div class='add'>+ **/</div><div class='add'>+static bool i40e_ddp_profiles_overlap(struct i40e_profile_info *new,</div><div class='add'>+				      struct i40e_profile_info *old)</div><div class='add'>+{</div><div class='add'>+	unsigned int group_id_old = (u8)((old-&gt;track_id &amp; 0x00FF0000) &gt;&gt; 16);</div><div class='add'>+	unsigned int group_id_new = (u8)((new-&gt;track_id &amp; 0x00FF0000) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	/* 0x00 group must be only the first */</div><div class='add'>+	if (group_id_new == 0)</div><div class='add'>+		return true;</div><div class='add'>+	/* 0xFF group is compatible with anything else */</div><div class='add'>+	if (group_id_new == 0xFF || group_id_old == 0xFF)</div><div class='add'>+		return false;</div><div class='add'>+	/* otherwise only profiles from the same group are compatible*/</div><div class='add'>+	return group_id_old != group_id_new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_ddp_does_profiles_ - checks if DDP overlaps with existing one.</div><div class='add'>+ * @hw: HW data structure</div><div class='add'>+ * @pinfo: DDP profile information structure</div><div class='add'>+ *</div><div class='add'>+ * checks if DDP profile overlaps with existing one.</div><div class='add'>+ * Returns &gt;0 if the profile overlaps.</div><div class='add'>+ * Returns  0 if the profile is ok.</div><div class='add'>+ * Returns &lt;0 if error.</div><div class='add'>+ **/</div><div class='add'>+static int i40e_ddp_does_profile_overlap(struct i40e_hw *hw,</div><div class='add'>+					 struct i40e_profile_info *pinfo)</div><div class='add'>+{</div><div class='add'>+	struct i40e_ddp_profile_list *profile_list;</div><div class='add'>+	u8 buff[I40E_PROFILE_LIST_SIZE];</div><div class='add'>+	i40e_status status;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	status = i40e_aq_get_ddp_list(hw, buff, I40E_PROFILE_LIST_SIZE, 0,</div><div class='add'>+				      NULL);</div><div class='add'>+	if (status)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	profile_list = (struct i40e_ddp_profile_list *)buff;</div><div class='add'>+	for (i = 0; i &lt; profile_list-&gt;p_count; i++) {</div><div class='add'>+		if (i40e_ddp_profiles_overlap(pinfo,</div><div class='add'>+					      &amp;profile_list-&gt;p_info[i]))</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'>+/**</div><div class='add'>+ * i40e_add_pinfo</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @profile: pointer to the profile segment of the package</div><div class='add'>+ * @profile_info_sec: buffer for information section</div><div class='add'>+ * @track_id: package tracking id</div><div class='add'>+ *</div><div class='add'>+ * Register a profile to the list of loaded profiles.</div><div class='add'>+ */</div><div class='add'>+static enum i40e_status_code</div><div class='add'>+i40e_add_pinfo(struct i40e_hw *hw, struct i40e_profile_segment *profile,</div><div class='add'>+	       u8 *profile_info_sec, u32 track_id)</div><div class='add'>+{</div><div class='add'>+	struct i40e_profile_section_header *sec;</div><div class='add'>+	struct i40e_profile_info *pinfo;</div><div class='add'>+	i40e_status status;</div><div class='add'>+	u32 offset = 0, info = 0;</div><div class='add'>+</div><div class='add'>+	sec = (struct i40e_profile_section_header *)profile_info_sec;</div><div class='add'>+	sec-&gt;tbl_size = 1;</div><div class='add'>+	sec-&gt;data_end = sizeof(struct i40e_profile_section_header) +</div><div class='add'>+			sizeof(struct i40e_profile_info);</div><div class='add'>+	sec-&gt;section.type = SECTION_TYPE_INFO;</div><div class='add'>+	sec-&gt;section.offset = sizeof(struct i40e_profile_section_header);</div><div class='add'>+	sec-&gt;section.size = sizeof(struct i40e_profile_info);</div><div class='add'>+	pinfo = (struct i40e_profile_info *)(profile_info_sec +</div><div class='add'>+					     sec-&gt;section.offset);</div><div class='add'>+	pinfo-&gt;track_id = track_id;</div><div class='add'>+	pinfo-&gt;version = profile-&gt;version;</div><div class='add'>+	pinfo-&gt;op = I40E_DDP_ADD_TRACKID;</div><div class='add'>+</div><div class='add'>+	/* Clear reserved field */</div><div class='add'>+	memset(pinfo-&gt;reserved, 0, sizeof(pinfo-&gt;reserved));</div><div class='add'>+	memcpy(pinfo-&gt;name, profile-&gt;name, I40E_DDP_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	status = i40e_aq_write_ddp(hw, (void *)sec, sec-&gt;data_end,</div><div class='add'>+				   track_id, &amp;offset, &amp;info, NULL);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_del_pinfo - delete DDP profile info from NIC</div><div class='add'>+ * @hw: HW data structure</div><div class='add'>+ * @profile: DDP profile segment to be deleted</div><div class='add'>+ * @profile_info_sec: DDP profile section header</div><div class='add'>+ * @track_id: track ID of the profile for deletion</div><div class='add'>+ *</div><div class='add'>+ * Removes DDP profile from the NIC.</div><div class='add'>+ **/</div><div class='add'>+static enum i40e_status_code</div><div class='add'>+i40e_del_pinfo(struct i40e_hw *hw, struct i40e_profile_segment *profile,</div><div class='add'>+	       u8 *profile_info_sec, u32 track_id)</div><div class='add'>+{</div><div class='add'>+	struct i40e_profile_section_header *sec;</div><div class='add'>+	struct i40e_profile_info *pinfo;</div><div class='add'>+	i40e_status status;</div><div class='add'>+	u32 offset = 0, info = 0;</div><div class='add'>+</div><div class='add'>+	sec = (struct i40e_profile_section_header *)profile_info_sec;</div><div class='add'>+	sec-&gt;tbl_size = 1;</div><div class='add'>+	sec-&gt;data_end = sizeof(struct i40e_profile_section_header) +</div><div class='add'>+			sizeof(struct i40e_profile_info);</div><div class='add'>+	sec-&gt;section.type = SECTION_TYPE_INFO;</div><div class='add'>+	sec-&gt;section.offset = sizeof(struct i40e_profile_section_header);</div><div class='add'>+	sec-&gt;section.size = sizeof(struct i40e_profile_info);</div><div class='add'>+	pinfo = (struct i40e_profile_info *)(profile_info_sec +</div><div class='add'>+					     sec-&gt;section.offset);</div><div class='add'>+	pinfo-&gt;track_id = track_id;</div><div class='add'>+	pinfo-&gt;version = profile-&gt;version;</div><div class='add'>+	pinfo-&gt;op = I40E_DDP_REMOVE_TRACKID;</div><div class='add'>+</div><div class='add'>+	/* Clear reserved field */</div><div class='add'>+	memset(pinfo-&gt;reserved, 0, sizeof(pinfo-&gt;reserved));</div><div class='add'>+	memcpy(pinfo-&gt;name, profile-&gt;name, I40E_DDP_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	status = i40e_aq_write_ddp(hw, (void *)sec, sec-&gt;data_end,</div><div class='add'>+				   track_id, &amp;offset, &amp;info, NULL);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_ddp_is_pkg_hdr_valid - performs basic pkg header integrity checks</div><div class='add'>+ * @netdev: net device structure (for logging purposes)</div><div class='add'>+ * @pkg_hdr: pointer to package header</div><div class='add'>+ * @size_huge: size of the whole DDP profile package in size_t</div><div class='add'>+ *</div><div class='add'>+ * Checks correctness of pkg header: Version, size too big/small, and</div><div class='add'>+ * all segment offsets alignment and boundaries. This function lets</div><div class='add'>+ * reject non DDP profile file to be loaded by administrator mistake.</div><div class='add'>+ **/</div><div class='add'>+static bool i40e_ddp_is_pkg_hdr_valid(struct net_device *netdev,</div><div class='add'>+				      struct i40e_package_header *pkg_hdr,</div><div class='add'>+				      size_t size_huge)</div><div class='add'>+{</div><div class='add'>+	u32 size = 0xFFFFFFFFU &amp; size_huge;</div><div class='add'>+	u32 pkg_hdr_size;</div><div class='add'>+	u32 segment;</div><div class='add'>+</div><div class='add'>+	if (!pkg_hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (pkg_hdr-&gt;version.major &gt; 0) {</div><div class='add'>+		struct i40e_ddp_version ver = pkg_hdr-&gt;version;</div><div class='add'>+</div><div class='add'>+		netdev_err(netdev, "Unsupported DDP profile version %u.%u.%u.%u",</div><div class='add'>+			   ver.major, ver.minor, ver.update, ver.draft);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (size_huge &gt; size) {</div><div class='add'>+		netdev_err(netdev, "Invalid DDP profile - size is bigger than 4G");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (size &lt; (sizeof(struct i40e_package_header) +</div><div class='add'>+		sizeof(struct i40e_metadata_segment) + sizeof(u32) * 2)) {</div><div class='add'>+		netdev_err(netdev, "Invalid DDP profile - size is too small.");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkg_hdr_size = sizeof(u32) * (pkg_hdr-&gt;segment_count + 2U);</div><div class='add'>+	if (size &lt; pkg_hdr_size) {</div><div class='add'>+		netdev_err(netdev, "Invalid DDP profile - too many segments");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	for (segment = 0; segment &lt; pkg_hdr-&gt;segment_count; ++segment) {</div><div class='add'>+		u32 offset = pkg_hdr-&gt;segment_offset[segment];</div><div class='add'>+</div><div class='add'>+		if (0xFU &amp; offset) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "Invalid DDP profile %u segment alignment",</div><div class='add'>+				   segment);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (pkg_hdr_size &gt; offset || offset &gt;= size) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "Invalid DDP profile %u segment offset",</div><div class='add'>+				   segment);</div><div class='add'>+			return false;</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'>+ * i40e_ddp_load - performs DDP loading</div><div class='add'>+ * @netdev: net device structure</div><div class='add'>+ * @data: buffer containing recipe file</div><div class='add'>+ * @size: size of the buffer</div><div class='add'>+ * @is_add: true when loading profile, false when rolling back the previous one</div><div class='add'>+ *</div><div class='add'>+ * Checks correctness and loads DDP profile to the NIC. The function is</div><div class='add'>+ * also used for rolling back previously loaded profile.</div><div class='add'>+ **/</div><div class='add'>+int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,</div><div class='add'>+		  bool is_add)</div><div class='add'>+{</div><div class='add'>+	u8 profile_info_sec[sizeof(struct i40e_profile_section_header) +</div><div class='add'>+			    sizeof(struct i40e_profile_info)];</div><div class='add'>+	struct i40e_metadata_segment *metadata_hdr;</div><div class='add'>+	struct i40e_profile_segment *profile_hdr;</div><div class='add'>+	struct i40e_profile_info pinfo;</div><div class='add'>+	struct i40e_package_header *pkg_hdr;</div><div class='add'>+	i40e_status status;</div><div class='add'>+	struct i40e_netdev_priv *np = netdev_priv(netdev);</div><div class='add'>+	struct i40e_vsi *vsi = np-&gt;vsi;</div><div class='add'>+	struct i40e_pf *pf = vsi-&gt;back;</div><div class='add'>+	u32 track_id;</div><div class='add'>+	int istatus;</div><div class='add'>+</div><div class='add'>+	pkg_hdr = (struct i40e_package_header *)data;</div><div class='add'>+	if (!i40e_ddp_is_pkg_hdr_valid(netdev, pkg_hdr, size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size &lt; (sizeof(struct i40e_package_header) +</div><div class='add'>+		    sizeof(struct i40e_metadata_segment) + sizeof(u32) * 2)) {</div><div class='add'>+		netdev_err(netdev, "Invalid DDP recipe size.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find beginning of segment data in buffer */</div><div class='add'>+	metadata_hdr = (struct i40e_metadata_segment *)</div><div class='add'>+		i40e_find_segment_in_package(SEGMENT_TYPE_METADATA, pkg_hdr);</div><div class='add'>+	if (!metadata_hdr) {</div><div class='add'>+		netdev_err(netdev, "Failed to find metadata segment in DDP recipe.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	track_id = metadata_hdr-&gt;track_id;</div><div class='add'>+	profile_hdr = (struct i40e_profile_segment *)</div><div class='add'>+		i40e_find_segment_in_package(SEGMENT_TYPE_I40E, pkg_hdr);</div><div class='add'>+	if (!profile_hdr) {</div><div class='add'>+		netdev_err(netdev, "Failed to find profile segment in DDP recipe.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pinfo.track_id = track_id;</div><div class='add'>+	pinfo.version = profile_hdr-&gt;version;</div><div class='add'>+	if (is_add)</div><div class='add'>+		pinfo.op = I40E_DDP_ADD_TRACKID;</div><div class='add'>+	else</div><div class='add'>+		pinfo.op = I40E_DDP_REMOVE_TRACKID;</div><div class='add'>+</div><div class='add'>+	memcpy(pinfo.name, profile_hdr-&gt;name, I40E_DDP_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Check if profile data already exists*/</div><div class='add'>+	istatus = i40e_ddp_does_profile_exist(&amp;pf-&gt;hw, &amp;pinfo);</div><div class='add'>+	if (istatus &lt; 0) {</div><div class='add'>+		netdev_err(netdev, "Failed to fetch loaded profiles.");</div><div class='add'>+		return istatus;</div><div class='add'>+	}</div><div class='add'>+	if (is_add) {</div><div class='add'>+		if (istatus &gt; 0) {</div><div class='add'>+			netdev_err(netdev, "DDP profile already loaded.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		istatus = i40e_ddp_does_profile_overlap(&amp;pf-&gt;hw, &amp;pinfo);</div><div class='add'>+		if (istatus &lt; 0) {</div><div class='add'>+			netdev_err(netdev, "Failed to fetch loaded profiles.");</div><div class='add'>+			return istatus;</div><div class='add'>+		}</div><div class='add'>+		if (istatus &gt; 0) {</div><div class='add'>+			netdev_err(netdev, "DDP profile overlaps with existing one.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (istatus == 0) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "DDP profile for deletion does not exist.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load profile data */</div><div class='add'>+	if (is_add) {</div><div class='add'>+		status = i40e_write_profile(&amp;pf-&gt;hw, profile_hdr, track_id);</div><div class='add'>+		if (status) {</div><div class='add'>+			if (status == I40E_ERR_DEVICE_NOT_SUPPORTED) {</div><div class='add'>+				netdev_err(netdev,</div><div class='add'>+					   "Profile is not supported by the device.");</div><div class='add'>+				return -EPERM;</div><div class='add'>+			}</div><div class='add'>+			netdev_err(netdev, "Failed to write DDP profile.");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		status = i40e_rollback_profile(&amp;pf-&gt;hw, profile_hdr, track_id);</div><div class='add'>+		if (status) {</div><div class='add'>+			netdev_err(netdev, "Failed to remove DDP profile.");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add/remove profile to/from profile list in FW */</div><div class='add'>+	if (is_add) {</div><div class='add'>+		status = i40e_add_pinfo(&amp;pf-&gt;hw, profile_hdr, profile_info_sec,</div><div class='add'>+					track_id);</div><div class='add'>+		if (status) {</div><div class='add'>+			netdev_err(netdev, "Failed to add DDP profile info.");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		status = i40e_del_pinfo(&amp;pf-&gt;hw, profile_hdr, profile_info_sec,</div><div class='add'>+					track_id);</div><div class='add'>+		if (status) {</div><div class='add'>+			netdev_err(netdev, "Failed to restore DDP profile info.");</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'>+/**</div><div class='add'>+ * i40e_ddp_restore - restore previously loaded profile and remove from list</div><div class='add'>+ * @pf: PF data struct</div><div class='add'>+ *</div><div class='add'>+ * Restores previously loaded profile stored on the list in driver memory.</div><div class='add'>+ * After rolling back removes entry from the list.</div><div class='add'>+ **/</div><div class='add'>+static int i40e_ddp_restore(struct i40e_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct i40e_ddp_old_profile_list *entry;</div><div class='add'>+	struct net_device *netdev = pf-&gt;vsi[pf-&gt;lan_vsi]-&gt;netdev;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;pf-&gt;ddp_old_prof)) {</div><div class='add'>+		entry = list_first_entry(&amp;pf-&gt;ddp_old_prof,</div><div class='add'>+					 struct i40e_ddp_old_profile_list,</div><div class='add'>+					 list);</div><div class='add'>+		status = i40e_ddp_load(netdev, entry-&gt;old_ddp_buf,</div><div class='add'>+				       entry-&gt;old_ddp_size, false);</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+		kfree(entry);</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'>+ * i40e_ddp_flash - callback function for ethtool flash feature</div><div class='add'>+ * @netdev: net device structure</div><div class='add'>+ * @flash: kernel flash structure</div><div class='add'>+ *</div><div class='add'>+ * Ethtool callback function used for loading and unloading DDP profiles.</div><div class='add'>+ **/</div><div class='add'>+int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *ddp_config;</div><div class='add'>+	struct i40e_netdev_priv *np = netdev_priv(netdev);</div><div class='add'>+	struct i40e_vsi *vsi = np-&gt;vsi;</div><div class='add'>+	struct i40e_pf *pf = vsi-&gt;back;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	/* Check for valid region first */</div><div class='add'>+	if (flash-&gt;region != I40_DDP_FLASH_REGION) {</div><div class='add'>+		netdev_err(netdev, "Requested firmware region is not recognized by this driver.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (pf-&gt;hw.bus.func != 0) {</div><div class='add'>+		netdev_err(netdev, "Any DDP operation is allowed only on Phy0 NIC interface");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the user supplied "-" instead of file name rollback previously</div><div class='add'>+	 * stored profile.</div><div class='add'>+	 */</div><div class='add'>+	if (strncmp(flash-&gt;data, "-", 2) != 0) {</div><div class='add'>+		struct i40e_ddp_old_profile_list *list_entry;</div><div class='add'>+		char profile_name[sizeof(I40E_DDP_PROFILE_PATH)</div><div class='add'>+				  + I40E_DDP_PROFILE_NAME_MAX];</div><div class='add'>+</div><div class='add'>+		profile_name[sizeof(profile_name) - 1] = 0;</div><div class='add'>+		strncpy(profile_name, I40E_DDP_PROFILE_PATH,</div><div class='add'>+			sizeof(profile_name) - 1);</div><div class='add'>+		strncat(profile_name, flash-&gt;data, I40E_DDP_PROFILE_NAME_MAX);</div><div class='add'>+		/* Load DDP recipe. */</div><div class='add'>+		status = request_firmware(&amp;ddp_config, profile_name,</div><div class='add'>+					  &amp;netdev-&gt;dev);</div><div class='add'>+		if (status) {</div><div class='add'>+			netdev_err(netdev, "DDP recipe file request failed.");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = i40e_ddp_load(netdev, ddp_config-&gt;data,</div><div class='add'>+				       ddp_config-&gt;size, true);</div><div class='add'>+</div><div class='add'>+		if (!status) {</div><div class='add'>+			list_entry =</div><div class='add'>+			  kzalloc(sizeof(struct i40e_ddp_old_profile_list) +</div><div class='add'>+				  ddp_config-&gt;size, GFP_KERNEL);</div><div class='add'>+			if (!list_entry) {</div><div class='add'>+				netdev_info(netdev, "Failed to allocate memory for previous DDP profile data.");</div><div class='add'>+				netdev_info(netdev, "New profile loaded but roll-back will be impossible.");</div><div class='add'>+			} else {</div><div class='add'>+				memcpy(list_entry-&gt;old_ddp_buf,</div><div class='add'>+				       ddp_config-&gt;data, ddp_config-&gt;size);</div><div class='add'>+				list_entry-&gt;old_ddp_size = ddp_config-&gt;size;</div><div class='add'>+				list_add(&amp;list_entry-&gt;list, &amp;pf-&gt;ddp_old_prof);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		release_firmware(ddp_config);</div><div class='add'>+	} else {</div><div class='add'>+		if (!list_empty(&amp;pf-&gt;ddp_old_prof)) {</div><div class='add'>+			status = i40e_ddp_restore(pf);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_warn(netdev, "There is no DDP profile to restore.");</div><div class='add'>+			status = -ENOENT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c<br/>index c67d485d6f99..7ea4f09229e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_debugfs.c</a></div><div class='hunk'>@@ -1321,7 +1321,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,</div><div class='ctx'> 		if (strncmp(&amp;cmd_buf[5], "stop", 4) == 0) {</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='del'>-			ret = i40e_aq_stop_lldp(&amp;pf-&gt;hw, false, NULL);</div><div class='add'>+			ret = i40e_aq_stop_lldp(&amp;pf-&gt;hw, false, false, NULL);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 "Stop LLDP AQ command failed =0x%x\n",</div><div class='hunk'>@@ -1358,7 +1358,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,</div><div class='ctx'> 				/* Continue and start FW LLDP anyways */</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = i40e_aq_start_lldp(&amp;pf-&gt;hw, NULL);</div><div class='add'>+			ret = i40e_aq_start_lldp(&amp;pf-&gt;hw, false, NULL);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 "Start LLDP AQ command failed =0x%x\n",</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h<br/>index 334b05ff685a..bac4da031f9b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_devids.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_devids.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_devids.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_devids.h</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #define _I40E_DEVIDS_H_</div><div class='ctx'> </div><div class='ctx'> /* Device IDs */</div><div class='add'>+#define I40E_DEV_ID_X710_N3000		0x0CF8</div><div class='add'>+#define I40E_DEV_ID_XXV710_N3000	0x0D58</div><div class='ctx'> #define I40E_DEV_ID_SFP_XL710		0x1572</div><div class='ctx'> #define I40E_DEV_ID_QEMU		0x1574</div><div class='ctx'> #define I40E_DEV_ID_KX_B		0x1580</div><div class='hunk'>@@ -18,6 +20,9 @@</div><div class='ctx'> #define I40E_DEV_ID_10G_BASE_T4		0x1589</div><div class='ctx'> #define I40E_DEV_ID_25G_B		0x158A</div><div class='ctx'> #define I40E_DEV_ID_25G_SFP28		0x158B</div><div class='add'>+#define I40E_DEV_ID_10G_BASE_T_BC	0x15FF</div><div class='add'>+#define I40E_DEV_ID_10G_B		0x104F</div><div class='add'>+#define I40E_DEV_ID_10G_SFP		0x104E</div><div class='ctx'> #define I40E_DEV_ID_KX_X722		0x37CE</div><div class='ctx'> #define I40E_DEV_ID_QSFP_X722		0x37CF</div><div class='ctx'> #define I40E_DEV_ID_SFP_X722		0x37D0</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c<br/>index 4c885801fa26..7545b21bee3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_ethtool.c</a></div><div class='hunk'>@@ -508,6 +508,20 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,</div><div class='ctx'> 			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='ctx'> 							     10000baseT_Full);</div><div class='ctx'> 	}</div><div class='add'>+	if (phy_types &amp; I40E_CAP_PHY_TYPE_2_5GBASE_T) {</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='add'>+						     2500baseT_Full);</div><div class='add'>+		if (hw_link_info-&gt;requested_speeds &amp; I40E_LINK_SPEED_2_5GB)</div><div class='add'>+			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+							     2500baseT_Full);</div><div class='add'>+	}</div><div class='add'>+	if (phy_types &amp; I40E_CAP_PHY_TYPE_5GBASE_T) {</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='add'>+						     5000baseT_Full);</div><div class='add'>+		if (hw_link_info-&gt;requested_speeds &amp; I40E_LINK_SPEED_5GB)</div><div class='add'>+			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+							     5000baseT_Full);</div><div class='add'>+	}</div><div class='ctx'> 	if (phy_types &amp; I40E_CAP_PHY_TYPE_XLAUI ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_XLPPI ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_40GBASE_AOC)</div><div class='hunk'>@@ -535,17 +549,23 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,</div><div class='ctx'> 			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='ctx'> 							     1000baseT_Full);</div><div class='ctx'> 	}</div><div class='del'>-	if (phy_types &amp; I40E_CAP_PHY_TYPE_40GBASE_SR4)</div><div class='add'>+	if (phy_types &amp; I40E_CAP_PHY_TYPE_40GBASE_SR4) {</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     40000baseSR4_Full);</div><div class='del'>-	if (phy_types &amp; I40E_CAP_PHY_TYPE_40GBASE_LR4)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+						     40000baseSR4_Full);</div><div class='add'>+	}</div><div class='add'>+	if (phy_types &amp; I40E_CAP_PHY_TYPE_40GBASE_LR4) {</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     40000baseLR4_Full);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+						     40000baseLR4_Full);</div><div class='add'>+	}</div><div class='ctx'> 	if (phy_types &amp; I40E_CAP_PHY_TYPE_40GBASE_KR4) {</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='del'>-						     40000baseLR4_Full);</div><div class='add'>+						     40000baseKR4_Full);</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='del'>-						     40000baseLR4_Full);</div><div class='add'>+						     40000baseKR4_Full);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (phy_types &amp; I40E_CAP_PHY_TYPE_20GBASE_KR2) {</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='hunk'>@@ -668,13 +688,15 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_25GBASE_KR ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_25GBASE_CR ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_20GBASE_KR2 ||</div><div class='del'>-	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_T ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_SR ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_LR ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_KX4 ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_KR ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_CR1_CU ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_CR1 ||</div><div class='add'>+	    phy_types &amp; I40E_CAP_PHY_TYPE_10GBASE_T ||</div><div class='add'>+	    phy_types &amp; I40E_CAP_PHY_TYPE_5GBASE_T ||</div><div class='add'>+	    phy_types &amp; I40E_CAP_PHY_TYPE_2_5GBASE_T ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_1000BASE_T_OPTICAL ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_1000BASE_T ||</div><div class='ctx'> 	    phy_types &amp; I40E_CAP_PHY_TYPE_1000BASE_SX ||</div><div class='hunk'>@@ -720,14 +742,20 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,</div><div class='ctx'> 	case I40E_PHY_TYPE_40GBASE_AOC:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     40000baseCR4_Full);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+						     40000baseCR4_Full);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_PHY_TYPE_40GBASE_SR4:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     40000baseSR4_Full);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+						     40000baseSR4_Full);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_PHY_TYPE_40GBASE_LR4:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     40000baseLR4_Full);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+						     40000baseLR4_Full);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_PHY_TYPE_25GBASE_SR:</div><div class='ctx'> 	case I40E_PHY_TYPE_25GBASE_LR:</div><div class='hunk'>@@ -778,12 +806,18 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,</div><div class='ctx'> 							     10000baseT_Full);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_PHY_TYPE_10GBASE_T:</div><div class='add'>+	case I40E_PHY_TYPE_5GBASE_T:</div><div class='add'>+	case I40E_PHY_TYPE_2_5GBASE_T:</div><div class='ctx'> 	case I40E_PHY_TYPE_1000BASE_T:</div><div class='ctx'> 	case I40E_PHY_TYPE_100BASE_TX:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     10000baseT_Full);</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='add'>+						     5000baseT_Full);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='add'>+						     2500baseT_Full);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     1000baseT_Full);</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     100baseT_Full);</div><div class='hunk'>@@ -791,6 +825,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,</div><div class='ctx'> 		if (hw_link_info-&gt;requested_speeds &amp; I40E_LINK_SPEED_10GB)</div><div class='ctx'> 			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='ctx'> 							     10000baseT_Full);</div><div class='add'>+		if (hw_link_info-&gt;requested_speeds &amp; I40E_LINK_SPEED_5GB)</div><div class='add'>+			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+							     5000baseT_Full);</div><div class='add'>+		if (hw_link_info-&gt;requested_speeds &amp; I40E_LINK_SPEED_2_5GB)</div><div class='add'>+			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='add'>+							     2500baseT_Full);</div><div class='ctx'> 		if (hw_link_info-&gt;requested_speeds &amp; I40E_LINK_SPEED_1GB)</div><div class='ctx'> 			ethtool_link_ksettings_add_link_mode(ks, advertising,</div><div class='ctx'> 							     1000baseT_Full);</div><div class='hunk'>@@ -946,6 +986,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,</div><div class='ctx'> 	case I40E_LINK_SPEED_10GB:</div><div class='ctx'> 		ks-&gt;base.speed = SPEED_10000;</div><div class='ctx'> 		break;</div><div class='add'>+	case I40E_LINK_SPEED_5GB:</div><div class='add'>+		ks-&gt;base.speed = SPEED_5000;</div><div class='add'>+		break;</div><div class='add'>+	case I40E_LINK_SPEED_2_5GB:</div><div class='add'>+		ks-&gt;base.speed = SPEED_2500;</div><div class='add'>+		break;</div><div class='ctx'> 	case I40E_LINK_SPEED_1GB:</div><div class='ctx'> 		ks-&gt;base.speed = SPEED_1000;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1033,6 +1079,7 @@ static int i40e_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_MEDIA_TYPE_FIBER:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported, FIBRE);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(ks, advertising, FIBRE);</div><div class='ctx'> 		ks-&gt;base.port = PORT_FIBRE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case I40E_MEDIA_TYPE_UNKNOWN:</div><div class='hunk'>@@ -1231,6 +1278,12 @@ static int i40e_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 						  10000baseLR_Full))</div><div class='ctx'> 		config.link_speed |= I40E_LINK_SPEED_10GB;</div><div class='ctx'> 	if (ethtool_link_ksettings_test_link_mode(ks, advertising,</div><div class='add'>+						  2500baseT_Full))</div><div class='add'>+		config.link_speed |= I40E_LINK_SPEED_2_5GB;</div><div class='add'>+	if (ethtool_link_ksettings_test_link_mode(ks, advertising,</div><div class='add'>+						  5000baseT_Full))</div><div class='add'>+		config.link_speed |= I40E_LINK_SPEED_5GB;</div><div class='add'>+	if (ethtool_link_ksettings_test_link_mode(ks, advertising,</div><div class='ctx'> 						  20000baseKR2_Full))</div><div class='ctx'> 		config.link_speed |= I40E_LINK_SPEED_20GB;</div><div class='ctx'> 	if (ethtool_link_ksettings_test_link_mode(ks, advertising,</div><div class='hunk'>@@ -2573,8 +2626,7 @@ static int i40e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* only magic packet is supported */</div><div class='del'>-	if (wol-&gt;wolopts &amp;&amp; (wol-&gt;wolopts != WAKE_MAGIC)</div><div class='del'>-			  | (wol-&gt;wolopts != WAKE_FILTER))</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~WAKE_MAGIC)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* is this a new value? */</div><div class='hunk'>@@ -4946,7 +4998,7 @@ flags_complete:</div><div class='ctx'> 		if (pf-&gt;flags &amp; I40E_FLAG_DISABLE_FW_LLDP) {</div><div class='ctx'> 			struct i40e_dcbx_config *dcbcfg;</div><div class='ctx'> </div><div class='del'>-			i40e_aq_stop_lldp(&amp;pf-&gt;hw, true, NULL);</div><div class='add'>+			i40e_aq_stop_lldp(&amp;pf-&gt;hw, true, false, NULL);</div><div class='ctx'> 			i40e_aq_set_dcb_parameters(&amp;pf-&gt;hw, true, NULL);</div><div class='ctx'> 			/* reset local_dcbx_config to default */</div><div class='ctx'> 			dcbcfg = &amp;pf-&gt;hw.local_dcbx_config;</div><div class='hunk'>@@ -4961,7 +5013,7 @@ flags_complete:</div><div class='ctx'> 			dcbcfg-&gt;pfc.willing = 1;</div><div class='ctx'> 			dcbcfg-&gt;pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;</div><div class='ctx'> 		} else {</div><div class='del'>-			i40e_aq_start_lldp(&amp;pf-&gt;hw, NULL);</div><div class='add'>+			i40e_aq_start_lldp(&amp;pf-&gt;hw, false, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5129,6 +5181,12 @@ static int i40e_get_module_eeprom(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct ethtool_ops i40e_ethtool_recovery_mode_ops = {</div><div class='add'>+	.set_eeprom		= i40e_set_eeprom,</div><div class='add'>+	.get_eeprom_len		= i40e_get_eeprom_len,</div><div class='add'>+	.get_eeprom		= i40e_get_eeprom,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops i40e_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= i40e_get_drvinfo,</div><div class='ctx'> 	.get_regs_len		= i40e_get_regs_len,</div><div class='hunk'>@@ -5172,9 +5230,16 @@ static const struct ethtool_ops i40e_ethtool_ops = {</div><div class='ctx'> 	.set_link_ksettings	= i40e_set_link_ksettings,</div><div class='ctx'> 	.get_fecparam = i40e_get_fec_param,</div><div class='ctx'> 	.set_fecparam = i40e_set_fec_param,</div><div class='add'>+	.flash_device = i40e_ddp_flash,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void i40e_set_ethtool_ops(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	netdev-&gt;ethtool_ops = &amp;i40e_ethtool_ops;</div><div class='add'>+	struct i40e_netdev_priv *np = netdev_priv(netdev);</div><div class='add'>+	struct i40e_pf		*pf = np-&gt;vsi-&gt;back;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(__I40E_RECOVERY_MODE, pf-&gt;state))</div><div class='add'>+		netdev-&gt;ethtool_ops = &amp;i40e_ethtool_ops;</div><div class='add'>+	else</div><div class='add'>+		netdev-&gt;ethtool_ops = &amp;i40e_ethtool_recovery_mode_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c<br/>index da62218eb70a..320562b39686 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_main.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static const char i40e_driver_string[] =</div><div class='ctx'> </div><div class='ctx'> #define DRV_VERSION_MAJOR 2</div><div class='ctx'> #define DRV_VERSION_MINOR 8</div><div class='del'>-#define DRV_VERSION_BUILD 10</div><div class='add'>+#define DRV_VERSION_BUILD 20</div><div class='ctx'> #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \</div><div class='ctx'> 	     __stringify(DRV_VERSION_MINOR) "." \</div><div class='ctx'> 	     __stringify(DRV_VERSION_BUILD)    DRV_KERN</div><div class='hunk'>@@ -46,6 +46,10 @@ static int i40e_setup_pf_filter_control(struct i40e_pf *pf);</div><div class='ctx'> static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired);</div><div class='ctx'> static int i40e_reset(struct i40e_pf *pf);</div><div class='ctx'> static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired);</div><div class='add'>+static int i40e_setup_misc_vector_for_recovery_mode(struct i40e_pf *pf);</div><div class='add'>+static int i40e_restore_interrupt_scheme(struct i40e_pf *pf);</div><div class='add'>+static bool i40e_check_recovery_mode(struct i40e_pf *pf);</div><div class='add'>+static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw);</div><div class='ctx'> static void i40e_fdir_sb_setup(struct i40e_pf *pf);</div><div class='ctx'> static int i40e_veb_get_bw_info(struct i40e_veb *veb);</div><div class='ctx'> static int i40e_get_capabilities(struct i40e_pf *pf,</div><div class='hunk'>@@ -69,6 +73,8 @@ static const struct pci_device_id i40e_pci_tbl[] = {</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0},</div><div class='add'>+	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_SFP), 0},</div><div class='add'>+	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_B), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_X722), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_X722), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},</div><div class='hunk'>@@ -77,6 +83,8 @@ static const struct pci_device_id i40e_pci_tbl[] = {</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0},</div><div class='add'>+	{PCI_VDEVICE(INTEL, I40E_DEV_ID_X710_N3000), 0},</div><div class='add'>+	{PCI_VDEVICE(INTEL, I40E_DEV_ID_XXV710_N3000), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_B), 0},</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_SFP28), 0},</div><div class='ctx'> 	/* required last entry */</div><div class='hunk'>@@ -278,8 +286,9 @@ struct i40e_vsi *i40e_find_vsi_from_id(struct i40e_pf *pf, u16 id)</div><div class='ctx'>  **/</div><div class='ctx'> void i40e_service_event_schedule(struct i40e_pf *pf)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(__I40E_DOWN, pf-&gt;state) &amp;&amp;</div><div class='del'>-	    !test_bit(__I40E_RESET_RECOVERY_PENDING, pf-&gt;state))</div><div class='add'>+	if ((!test_bit(__I40E_DOWN, pf-&gt;state) &amp;&amp;</div><div class='add'>+	     !test_bit(__I40E_RESET_RECOVERY_PENDING, pf-&gt;state)) ||</div><div class='add'>+	      test_bit(__I40E_RECOVERY_MODE, pf-&gt;state))</div><div class='ctx'> 		queue_work(i40e_wq, &amp;pf-&gt;service_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2107,11 +2116,22 @@ void i40e_aqc_add_filters(struct i40e_vsi *vsi, const char *vsi_name,</div><div class='ctx'> 	fcnt = i40e_update_filter_state(num_add, list, add_head);</div><div class='ctx'> </div><div class='ctx'> 	if (fcnt != num_add) {</div><div class='del'>-		set_bit(__I40E_VSI_OVERFLOW_PROMISC, vsi-&gt;state);</div><div class='del'>-		dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='del'>-			 "Error %s adding RX filters on %s, promiscuous mode forced on\n",</div><div class='del'>-			 i40e_aq_str(hw, aq_err),</div><div class='del'>-			 vsi_name);</div><div class='add'>+		if (vsi-&gt;type == I40E_VSI_MAIN) {</div><div class='add'>+			set_bit(__I40E_VSI_OVERFLOW_PROMISC, vsi-&gt;state);</div><div class='add'>+			dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Error %s adding RX filters on %s, promiscuous mode forced on\n",</div><div class='add'>+				 i40e_aq_str(hw, aq_err), vsi_name);</div><div class='add'>+		} else if (vsi-&gt;type == I40E_VSI_SRIOV ||</div><div class='add'>+			   vsi-&gt;type == I40E_VSI_VMDQ1 ||</div><div class='add'>+			   vsi-&gt;type == I40E_VSI_VMDQ2) {</div><div class='add'>+			dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Error %s adding RX filters on %s, please set promiscuous on manually for %s\n",</div><div class='add'>+				 i40e_aq_str(hw, aq_err), vsi_name, vsi_name);</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Error %s adding RX filters on %s, incorrect VSI type: %i.\n",</div><div class='add'>+				 i40e_aq_str(hw, aq_err), vsi_name, vsi-&gt;type);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2654,6 +2674,10 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)</div><div class='ctx'> 	struct i40e_vsi_context ctxt;</div><div class='ctx'> 	i40e_status ret;</div><div class='ctx'> </div><div class='add'>+	/* Don't modify stripping options if a port VLAN is active */</div><div class='add'>+	if (vsi-&gt;info.pvid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if ((vsi-&gt;info.valid_sections &amp;</div><div class='ctx'> 	     cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) &amp;&amp;</div><div class='ctx'> 	    ((vsi-&gt;info.port_vlan_flags &amp; I40E_AQ_VSI_PVLAN_MODE_MASK) == 0))</div><div class='hunk'>@@ -2684,6 +2708,10 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)</div><div class='ctx'> 	struct i40e_vsi_context ctxt;</div><div class='ctx'> 	i40e_status ret;</div><div class='ctx'> </div><div class='add'>+	/* Don't modify stripping options if a port VLAN is active */</div><div class='add'>+	if (vsi-&gt;info.pvid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if ((vsi-&gt;info.valid_sections &amp;</div><div class='ctx'> 	     cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) &amp;&amp;</div><div class='ctx'> 	    ((vsi-&gt;info.port_vlan_flags &amp; I40E_AQ_VSI_PVLAN_EMOD_MASK) ==</div><div class='hunk'>@@ -2949,9 +2977,9 @@ int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid)</div><div class='ctx'>  **/</div><div class='ctx'> void i40e_vsi_remove_pvid(struct i40e_vsi *vsi)</div><div class='ctx'> {</div><div class='del'>-	i40e_vlan_stripping_disable(vsi);</div><div class='del'>-</div><div class='ctx'> 	vsi-&gt;info.pvid = 0;</div><div class='add'>+</div><div class='add'>+	i40e_vlan_stripping_disable(vsi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3064,6 +3092,26 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * i40e_xsk_umem - Retrieve the AF_XDP ZC if XDP and ZC is enabled</div><div class='add'>+ * @ring: The Tx or Rx ring</div><div class='add'>+ *</div><div class='add'>+ * Returns the UMEM or NULL.</div><div class='add'>+ **/</div><div class='add'>+static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)</div><div class='add'>+{</div><div class='add'>+	bool xdp_on = i40e_enabled_xdp_vsi(ring-&gt;vsi);</div><div class='add'>+	int qid = ring-&gt;queue_index;</div><div class='add'>+</div><div class='add'>+	if (ring_is_xdp(ring))</div><div class='add'>+		qid -= ring-&gt;vsi-&gt;alloc_queue_pairs;</div><div class='add'>+</div><div class='add'>+	if (!xdp_on || !test_bit(qid, ring-&gt;vsi-&gt;af_xdp_zc_qps))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return xdp_get_umem_from_qid(ring-&gt;vsi-&gt;netdev, qid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * i40e_configure_tx_ring - Configure a transmit ring context and rest</div><div class='ctx'>  * @ring: The Tx ring to configure</div><div class='ctx'>  *</div><div class='hunk'>@@ -3980,7 +4028,8 @@ static irqreturn_t i40e_intr(int irq, void *data)</div><div class='ctx'> enable_intr:</div><div class='ctx'> 	/* re-enable interrupt causes */</div><div class='ctx'> 	wr32(hw, I40E_PFINT_ICR0_ENA, ena_mask);</div><div class='del'>-	if (!test_bit(__I40E_DOWN, pf-&gt;state)) {</div><div class='add'>+	if (!test_bit(__I40E_DOWN, pf-&gt;state) ||</div><div class='add'>+	    test_bit(__I40E_RECOVERY_MODE, pf-&gt;state)) {</div><div class='ctx'> 		i40e_service_event_schedule(pf);</div><div class='ctx'> 		i40e_irq_dynamic_enable_icr0(pf);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6383,7 +6432,7 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the initial DCB configuration */</div><div class='del'>-	err = i40e_init_dcb(hw);</div><div class='add'>+	err = i40e_init_dcb(hw, true);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		/* Device/Function is not DCBX capable */</div><div class='ctx'> 		if ((!hw-&gt;func_caps.dcb) ||</div><div class='hunk'>@@ -6473,6 +6522,12 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)</div><div class='ctx'> 	case I40E_LINK_SPEED_10GB:</div><div class='ctx'> 		speed = "10 G";</div><div class='ctx'> 		break;</div><div class='add'>+	case I40E_LINK_SPEED_5GB:</div><div class='add'>+		speed = "5 G";</div><div class='add'>+		break;</div><div class='add'>+	case I40E_LINK_SPEED_2_5GB:</div><div class='add'>+		speed = "2.5 G";</div><div class='add'>+		break;</div><div class='ctx'> 	case I40E_LINK_SPEED_1GB:</div><div class='ctx'> 		speed = "1000 M";</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -6826,10 +6881,12 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)</div><div class='ctx'> 	struct i40e_pf *pf = vsi-&gt;back;</div><div class='ctx'> 	u8 enabled_tc = 0, num_tc, hw;</div><div class='ctx'> 	bool need_reset = false;</div><div class='add'>+	int old_queue_pairs;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> 	u16 mode;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	old_queue_pairs = vsi-&gt;num_queue_pairs;</div><div class='ctx'> 	num_tc = mqprio_qopt-&gt;qopt.num_tc;</div><div class='ctx'> 	hw = mqprio_qopt-&gt;qopt.hw;</div><div class='ctx'> 	mode = mqprio_qopt-&gt;mode;</div><div class='hunk'>@@ -6930,6 +6987,7 @@ config_tc:</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = i40e_configure_queue_channels(vsi);</div><div class='ctx'> 		if (ret) {</div><div class='add'>+			vsi-&gt;num_queue_pairs = old_queue_pairs;</div><div class='ctx'> 			netdev_info(netdev,</div><div class='ctx'> 				    "Failed configuring queue channels\n");</div><div class='ctx'> 			need_reset = true;</div><div class='hunk'>@@ -9270,6 +9328,11 @@ static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired)</div><div class='ctx'> 			dev_warn(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 				 "shutdown_lan_hmc failed: %d\n", ret);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Save the current PTP time so that we can restore the time after the</div><div class='add'>+	 * reset completes.</div><div class='add'>+	 */</div><div class='add'>+	i40e_ptp_save_hw_time(pf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -9362,6 +9425,7 @@ static int i40e_reset(struct i40e_pf *pf)</div><div class='ctx'>  **/</div><div class='ctx'> static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)</div><div class='ctx'> {</div><div class='add'>+	int old_recovery_mode_bit = test_bit(__I40E_RECOVERY_MODE, pf-&gt;state);</div><div class='ctx'> 	struct i40e_vsi *vsi = pf-&gt;vsi[pf-&gt;lan_vsi];</div><div class='ctx'> 	struct i40e_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	u8 set_fc_aq_fail = 0;</div><div class='hunk'>@@ -9369,7 +9433,14 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int v;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(__I40E_DOWN, pf-&gt;state))</div><div class='add'>+	if (test_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf-&gt;state) &amp;&amp;</div><div class='add'>+	    i40e_check_recovery_mode(pf)) {</div><div class='add'>+		i40e_set_ethtool_ops(pf-&gt;vsi[pf-&gt;lan_vsi]-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(__I40E_DOWN, pf-&gt;state) &amp;&amp;</div><div class='add'>+	    !test_bit(__I40E_RECOVERY_MODE, pf-&gt;state) &amp;&amp;</div><div class='add'>+	    !old_recovery_mode_bit)</div><div class='ctx'> 		goto clear_recovery;</div><div class='ctx'> 	dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "Rebuilding internal switch\n");</div><div class='ctx'> </div><div class='hunk'>@@ -9398,6 +9469,44 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)</div><div class='ctx'> 	if (test_and_clear_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf-&gt;state))</div><div class='ctx'> 		i40e_verify_eeprom(pf);</div><div class='ctx'> </div><div class='add'>+	/* if we are going out of or into recovery mode we have to act</div><div class='add'>+	 * accordingly with regard to resources initialization</div><div class='add'>+	 * and deinitialization</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(__I40E_RECOVERY_MODE, pf-&gt;state) ||</div><div class='add'>+	    old_recovery_mode_bit) {</div><div class='add'>+		if (i40e_get_capabilities(pf,</div><div class='add'>+					  i40e_aqc_opc_list_func_capabilities))</div><div class='add'>+			goto end_unlock;</div><div class='add'>+</div><div class='add'>+		if (test_bit(__I40E_RECOVERY_MODE, pf-&gt;state)) {</div><div class='add'>+			/* we're staying in recovery mode so we'll reinitialize</div><div class='add'>+			 * misc vector here</div><div class='add'>+			 */</div><div class='add'>+			if (i40e_setup_misc_vector_for_recovery_mode(pf))</div><div class='add'>+				goto end_unlock;</div><div class='add'>+		} else {</div><div class='add'>+			if (!lock_acquired)</div><div class='add'>+				rtnl_lock();</div><div class='add'>+			/* we're going out of recovery mode so we'll free</div><div class='add'>+			 * the IRQ allocated specifically for recovery mode</div><div class='add'>+			 * and restore the interrupt scheme</div><div class='add'>+			 */</div><div class='add'>+			free_irq(pf-&gt;pdev-&gt;irq, pf);</div><div class='add'>+			i40e_clear_interrupt_scheme(pf);</div><div class='add'>+			if (i40e_restore_interrupt_scheme(pf))</div><div class='add'>+				goto end_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* tell the firmware that we're starting */</div><div class='add'>+		i40e_send_version(pf);</div><div class='add'>+</div><div class='add'>+		/* bail out in case recovery mode was detected, as there is</div><div class='add'>+		 * no need for further configuration.</div><div class='add'>+		 */</div><div class='add'>+		goto end_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	i40e_clear_pxe_mode(hw);</div><div class='ctx'> 	ret = i40e_get_capabilities(pf, i40e_aqc_opc_list_func_capabilities);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -9649,7 +9758,6 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)</div><div class='ctx'> {</div><div class='ctx'> 	struct i40e_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	bool mdd_detected = false;</div><div class='del'>-	bool pf_mdd_detected = false;</div><div class='ctx'> 	struct i40e_vf *vf;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -9695,19 +9803,12 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)</div><div class='ctx'> 		reg = rd32(hw, I40E_PF_MDET_TX);</div><div class='ctx'> 		if (reg &amp; I40E_PF_MDET_TX_VALID_MASK) {</div><div class='ctx'> 			wr32(hw, I40E_PF_MDET_TX, 0xFFFF);</div><div class='del'>-			dev_info(&amp;pf-&gt;pdev-&gt;dev, "TX driver issue detected, PF reset issued\n");</div><div class='del'>-			pf_mdd_detected = true;</div><div class='add'>+			dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "TX driver issue detected on PF\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		reg = rd32(hw, I40E_PF_MDET_RX);</div><div class='ctx'> 		if (reg &amp; I40E_PF_MDET_RX_VALID_MASK) {</div><div class='ctx'> 			wr32(hw, I40E_PF_MDET_RX, 0xFFFF);</div><div class='del'>-			dev_info(&amp;pf-&gt;pdev-&gt;dev, "RX driver issue detected, PF reset issued\n");</div><div class='del'>-			pf_mdd_detected = true;</div><div class='del'>-		}</div><div class='del'>-		/* Queue belongs to the PF, initiate a reset */</div><div class='del'>-		if (pf_mdd_detected) {</div><div class='del'>-			set_bit(__I40E_PF_RESET_REQUESTED, pf-&gt;state);</div><div class='del'>-			i40e_service_event_schedule(pf);</div><div class='add'>+			dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "RX driver issue detected on PF\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -9720,6 +9821,9 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)</div><div class='ctx'> 			vf-&gt;num_mdd_events++;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "TX driver issue detected on VF %d\n",</div><div class='ctx'> 				 i);</div><div class='add'>+			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Use PF Control I/F to re-enable the VF\n");</div><div class='add'>+			set_bit(I40E_VF_STATE_DISABLED, &amp;vf-&gt;vf_states);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		reg = rd32(hw, I40E_VP_MDET_RX(i));</div><div class='hunk'>@@ -9728,11 +9832,6 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)</div><div class='ctx'> 			vf-&gt;num_mdd_events++;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "RX driver issue detected on VF %d\n",</div><div class='ctx'> 				 i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vf-&gt;num_mdd_events &gt; I40E_DEFAULT_NUM_MDD_EVENTS_ALLOWED) {</div><div class='del'>-			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-				 "Too many MDD events on VF %d, disabled\n", i);</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 				 "Use PF Control I/F to re-enable the VF\n");</div><div class='ctx'> 			set_bit(I40E_VF_STATE_DISABLED, &amp;vf-&gt;vf_states);</div><div class='hunk'>@@ -9859,31 +9958,38 @@ static void i40e_service_task(struct work_struct *work)</div><div class='ctx'> 	unsigned long start_time = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/* don't bother with service tasks if a reset is in progress */</div><div class='del'>-	if (test_bit(__I40E_RESET_RECOVERY_PENDING, pf-&gt;state))</div><div class='add'>+	if (test_bit(__I40E_RESET_RECOVERY_PENDING, pf-&gt;state) ||</div><div class='add'>+	    test_bit(__I40E_SUSPENDED, pf-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(__I40E_SERVICE_SCHED, pf-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	i40e_detect_recover_hung(pf-&gt;vsi[pf-&gt;lan_vsi]);</div><div class='del'>-	i40e_sync_filters_subtask(pf);</div><div class='del'>-	i40e_reset_subtask(pf);</div><div class='del'>-	i40e_handle_mdd_event(pf);</div><div class='del'>-	i40e_vc_process_vflr_event(pf);</div><div class='del'>-	i40e_watchdog_subtask(pf);</div><div class='del'>-	i40e_fdir_reinit_subtask(pf);</div><div class='del'>-	if (test_and_clear_bit(__I40E_CLIENT_RESET, pf-&gt;state)) {</div><div class='del'>-		/* Client subtask will reopen next time through. */</div><div class='del'>-		i40e_notify_client_of_netdev_close(pf-&gt;vsi[pf-&gt;lan_vsi], true);</div><div class='add'>+	if (!test_bit(__I40E_RECOVERY_MODE, pf-&gt;state)) {</div><div class='add'>+		i40e_detect_recover_hung(pf-&gt;vsi[pf-&gt;lan_vsi]);</div><div class='add'>+		i40e_sync_filters_subtask(pf);</div><div class='add'>+		i40e_reset_subtask(pf);</div><div class='add'>+		i40e_handle_mdd_event(pf);</div><div class='add'>+		i40e_vc_process_vflr_event(pf);</div><div class='add'>+		i40e_watchdog_subtask(pf);</div><div class='add'>+		i40e_fdir_reinit_subtask(pf);</div><div class='add'>+		if (test_and_clear_bit(__I40E_CLIENT_RESET, pf-&gt;state)) {</div><div class='add'>+			/* Client subtask will reopen next time through. */</div><div class='add'>+			i40e_notify_client_of_netdev_close(pf-&gt;vsi[pf-&gt;lan_vsi],</div><div class='add'>+							   true);</div><div class='add'>+		} else {</div><div class='add'>+			i40e_client_subtask(pf);</div><div class='add'>+			if (test_and_clear_bit(__I40E_CLIENT_L2_CHANGE,</div><div class='add'>+					       pf-&gt;state))</div><div class='add'>+				i40e_notify_client_of_l2_param_changes(</div><div class='add'>+								pf-&gt;vsi[pf-&gt;lan_vsi]);</div><div class='add'>+		}</div><div class='add'>+		i40e_sync_filters_subtask(pf);</div><div class='add'>+		i40e_sync_udp_filters_subtask(pf);</div><div class='ctx'> 	} else {</div><div class='del'>-		i40e_client_subtask(pf);</div><div class='del'>-		if (test_and_clear_bit(__I40E_CLIENT_L2_CHANGE,</div><div class='del'>-				       pf-&gt;state))</div><div class='del'>-			i40e_notify_client_of_l2_param_changes(</div><div class='del'>-							pf-&gt;vsi[pf-&gt;lan_vsi]);</div><div class='del'>-	}</div><div class='del'>-	i40e_sync_filters_subtask(pf);</div><div class='del'>-	i40e_sync_udp_filters_subtask(pf);</div><div class='add'>+		i40e_reset_subtask(pf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	i40e_clean_adminq_subtask(pf);</div><div class='ctx'> </div><div class='ctx'> 	/* flush memory to make sure state is correct before next watchdog */</div><div class='hunk'>@@ -10064,6 +10170,12 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type)</div><div class='ctx'> 	hash_init(vsi-&gt;mac_filter_hash);</div><div class='ctx'> 	vsi-&gt;irqs_ready = false;</div><div class='ctx'> </div><div class='add'>+	if (type == I40E_VSI_MAIN) {</div><div class='add'>+		vsi-&gt;af_xdp_zc_qps = bitmap_zalloc(pf-&gt;num_lan_qps, GFP_KERNEL);</div><div class='add'>+		if (!vsi-&gt;af_xdp_zc_qps)</div><div class='add'>+			goto err_rings;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = i40e_set_num_rings_in_vsi(vsi);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_rings;</div><div class='hunk'>@@ -10082,6 +10194,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type)</div><div class='ctx'> 	goto unlock_pf;</div><div class='ctx'> </div><div class='ctx'> err_rings:</div><div class='add'>+	bitmap_free(vsi-&gt;af_xdp_zc_qps);</div><div class='ctx'> 	pf-&gt;next_vsi = i - 1;</div><div class='ctx'> 	kfree(vsi);</div><div class='ctx'> unlock_pf:</div><div class='hunk'>@@ -10162,6 +10275,7 @@ static int i40e_vsi_clear(struct i40e_vsi *vsi)</div><div class='ctx'> 	i40e_put_lump(pf-&gt;qp_pile, vsi-&gt;base_queue, vsi-&gt;idx);</div><div class='ctx'> 	i40e_put_lump(pf-&gt;irq_pile, vsi-&gt;base_vector, vsi-&gt;idx);</div><div class='ctx'> </div><div class='add'>+	bitmap_free(vsi-&gt;af_xdp_zc_qps);</div><div class='ctx'> 	i40e_vsi_free_arrays(vsi, true);</div><div class='ctx'> 	i40e_clear_rss_config_user(vsi);</div><div class='ctx'> </div><div class='hunk'>@@ -10698,6 +10812,48 @@ err_unwind:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * i40e_setup_misc_vector_for_recovery_mode - Setup the misc vector to handle</div><div class='add'>+ * non queue events in recovery mode</div><div class='add'>+ * @pf: board private structure</div><div class='add'>+ *</div><div class='add'>+ * This sets up the handler for MSIX 0 or MSI/legacy, which is used to manage</div><div class='add'>+ * the non-queue interrupts, e.g. AdminQ and errors in recovery mode.</div><div class='add'>+ * This is handled differently than in recovery mode since no Tx/Rx resources</div><div class='add'>+ * are being allocated.</div><div class='add'>+ **/</div><div class='add'>+static int i40e_setup_misc_vector_for_recovery_mode(struct i40e_pf *pf)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (pf-&gt;flags &amp; I40E_FLAG_MSIX_ENABLED) {</div><div class='add'>+		err = i40e_setup_misc_vector(pf);</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				 "MSI-X misc vector request failed, error %d\n",</div><div class='add'>+				 err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		u32 flags = pf-&gt;flags &amp; I40E_FLAG_MSI_ENABLED ? 0 : IRQF_SHARED;</div><div class='add'>+</div><div class='add'>+		err = request_irq(pf-&gt;pdev-&gt;irq, i40e_intr, flags,</div><div class='add'>+				  pf-&gt;int_name, pf);</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				 "MSI/legacy misc vector request failed, error %d\n",</div><div class='add'>+				 err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		i40e_enable_misc_int_causes(pf);</div><div class='add'>+		i40e_irq_dynamic_enable_icr0(pf);</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='ctx'>  * i40e_setup_misc_vector - Setup the misc vector to handle non queue events</div><div class='ctx'>  * @pf: board private structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -13860,6 +14016,125 @@ void i40e_set_fec_in_flags(u8 fec_cfg, u32 *flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * i40e_check_recovery_mode - check if we are running transition firmware</div><div class='add'>+ * @pf: board private structure</div><div class='add'>+ *</div><div class='add'>+ * Check registers indicating the firmware runs in recovery mode. Sets the</div><div class='add'>+ * appropriate driver state.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the recovery mode was detected, false otherwise</div><div class='add'>+ **/</div><div class='add'>+static bool i40e_check_recovery_mode(struct i40e_pf *pf)</div><div class='add'>+{</div><div class='add'>+	u32 val = rd32(&amp;pf-&gt;hw, I40E_GL_FWSTS);</div><div class='add'>+</div><div class='add'>+	if (val &amp; I40E_GL_FWSTS_FWS1B_MASK) {</div><div class='add'>+		dev_notice(&amp;pf-&gt;pdev-&gt;dev, "Firmware recovery mode detected. Limiting functionality.\n");</div><div class='add'>+		dev_notice(&amp;pf-&gt;pdev-&gt;dev, "Refer to the Intel(R) Ethernet Adapters and Devices User Guide for details on firmware recovery mode.\n");</div><div class='add'>+		set_bit(__I40E_RECOVERY_MODE, pf-&gt;state);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if (test_and_clear_bit(__I40E_RECOVERY_MODE, pf-&gt;state))</div><div class='add'>+		dev_info(&amp;pf-&gt;pdev-&gt;dev, "Reinitializing in normal mode with full functionality.\n");</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'>+ * i40e_init_recovery_mode - initialize subsystems needed in recovery mode</div><div class='add'>+ * @pf: board private structure</div><div class='add'>+ * @hw: ptr to the hardware info</div><div class='add'>+ *</div><div class='add'>+ * This function does a minimal setup of all subsystems needed for running</div><div class='add'>+ * recovery mode.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, negative on failure</div><div class='add'>+ **/</div><div class='add'>+static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct i40e_vsi *vsi;</div><div class='add'>+	int err;</div><div class='add'>+	int v_idx;</div><div class='add'>+</div><div class='add'>+	pci_save_state(pf-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	/* set up periodic task facility */</div><div class='add'>+	timer_setup(&amp;pf-&gt;service_timer, i40e_service_timer, 0);</div><div class='add'>+	pf-&gt;service_timer_period = HZ;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;pf-&gt;service_task, i40e_service_task);</div><div class='add'>+	clear_bit(__I40E_SERVICE_SCHED, pf-&gt;state);</div><div class='add'>+</div><div class='add'>+	err = i40e_init_interrupt_scheme(pf);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+</div><div class='add'>+	/* The number of VSIs reported by the FW is the minimum guaranteed</div><div class='add'>+	 * to us; HW supports far more and we share the remaining pool with</div><div class='add'>+	 * the other PFs. We allocate space for more than the guarantee with</div><div class='add'>+	 * the understanding that we might not get them all later.</div><div class='add'>+	 */</div><div class='add'>+	if (pf-&gt;hw.func_caps.num_vsis &lt; I40E_MIN_VSI_ALLOC)</div><div class='add'>+		pf-&gt;num_alloc_vsi = I40E_MIN_VSI_ALLOC;</div><div class='add'>+	else</div><div class='add'>+		pf-&gt;num_alloc_vsi = pf-&gt;hw.func_caps.num_vsis;</div><div class='add'>+</div><div class='add'>+	/* Set up the vsi struct and our local tracking of the MAIN PF vsi. */</div><div class='add'>+	pf-&gt;vsi = kcalloc(pf-&gt;num_alloc_vsi, sizeof(struct i40e_vsi *),</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	if (!pf-&gt;vsi) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We allocate one VSI which is needed as absolute minimum</div><div class='add'>+	 * in order to register the netdev</div><div class='add'>+	 */</div><div class='add'>+	v_idx = i40e_vsi_mem_alloc(pf, I40E_VSI_MAIN);</div><div class='add'>+	if (v_idx &lt; 0)</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+	pf-&gt;lan_vsi = v_idx;</div><div class='add'>+	vsi = pf-&gt;vsi[v_idx];</div><div class='add'>+	if (!vsi)</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+	vsi-&gt;alloc_queue_pairs = 1;</div><div class='add'>+	err = i40e_config_netdev(vsi);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+	err = register_netdev(vsi-&gt;netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+	vsi-&gt;netdev_registered = true;</div><div class='add'>+	i40e_dbg_pf_init(pf);</div><div class='add'>+</div><div class='add'>+	err = i40e_setup_misc_vector_for_recovery_mode(pf);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switch_setup;</div><div class='add'>+</div><div class='add'>+	/* tell the firmware that we're starting */</div><div class='add'>+	i40e_send_version(pf);</div><div class='add'>+</div><div class='add'>+	/* since everything's happy, start the service_task timer */</div><div class='add'>+	mod_timer(&amp;pf-&gt;service_timer,</div><div class='add'>+		  round_jiffies(jiffies + pf-&gt;service_timer_period));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_switch_setup:</div><div class='add'>+	i40e_reset_interrupt_capability(pf);</div><div class='add'>+	del_timer_sync(&amp;pf-&gt;service_timer);</div><div class='add'>+	i40e_shutdown_adminq(hw);</div><div class='add'>+	iounmap(hw-&gt;hw_addr);</div><div class='add'>+	pci_disable_pcie_error_reporting(pf-&gt;pdev);</div><div class='add'>+	pci_release_mem_regions(pf-&gt;pdev);</div><div class='add'>+	pci_disable_device(pf-&gt;pdev);</div><div class='add'>+	kfree(pf);</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'>  * i40e_probe - Device initialization routine</div><div class='ctx'>  * @pdev: PCI device information struct</div><div class='ctx'>  * @ent: entry in i40e_pci_tbl</div><div class='hunk'>@@ -13956,6 +14231,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pf-&gt;l3_flex_pit_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pf-&gt;l4_flex_pit_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;pf-&gt;ddp_old_prof);</div><div class='ctx'> </div><div class='ctx'> 	/* set up the locks for the AQ, do this only once in probe</div><div class='ctx'> 	 * and destroy them only once in remove</div><div class='hunk'>@@ -13983,13 +14259,14 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	/* Reset here to make sure all is clean and to define PF 'n' */</div><div class='ctx'> 	i40e_clear_hw(hw);</div><div class='del'>-	err = i40e_pf_reset(hw);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "Initial pf_reset failed: %d\n", err);</div><div class='del'>-		goto err_pf_reset;</div><div class='add'>+	if (!i40e_check_recovery_mode(pf)) {</div><div class='add'>+		err = i40e_pf_reset(hw);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "Initial pf_reset failed: %d\n", err);</div><div class='add'>+			goto err_pf_reset;</div><div class='add'>+		}</div><div class='add'>+		pf-&gt;pfr_count++;</div><div class='ctx'> 	}</div><div class='del'>-	pf-&gt;pfr_count++;</div><div class='del'>-</div><div class='ctx'> 	hw-&gt;aq.num_arq_entries = I40E_AQ_LEN;</div><div class='ctx'> 	hw-&gt;aq.num_asq_entries = I40E_AQ_LEN;</div><div class='ctx'> 	hw-&gt;aq.arq_buf_size = I40E_MAX_AQ_BUF_SIZE;</div><div class='hunk'>@@ -14014,7 +14291,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == I40E_ERR_FIRMWARE_API_VERSION)</div><div class='ctx'> 			dev_info(&amp;pdev-&gt;dev,</div><div class='del'>-				 "The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n");</div><div class='add'>+				 "The driver for the device stopped because the NVM image v%u.%u is newer than expected v%u.%u. You must install the most recent version of the network driver.\n",</div><div class='add'>+				 hw-&gt;aq.api_maj_ver,</div><div class='add'>+				 hw-&gt;aq.api_min_ver,</div><div class='add'>+				 I40E_FW_API_VERSION_MAJOR,</div><div class='add'>+				 I40E_FW_MINOR_VERSION(hw));</div><div class='ctx'> 		else</div><div class='ctx'> 			dev_info(&amp;pdev-&gt;dev,</div><div class='ctx'> 				 "The driver for the device stopped because the device firmware failed to init. Try updating your NVM image.\n");</div><div class='hunk'>@@ -14023,19 +14304,28 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> 	i40e_get_oem_version(hw);</div><div class='ctx'> </div><div class='del'>-	/* provide nvm, fw, api versions */</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "fw %d.%d.%05d api %d.%d nvm %s\n",</div><div class='add'>+	/* provide nvm, fw, api versions, vendor:device id, subsys vendor:device id */</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "fw %d.%d.%05d api %d.%d nvm %s [%04x:%04x] [%04x:%04x]\n",</div><div class='ctx'> 		 hw-&gt;aq.fw_maj_ver, hw-&gt;aq.fw_min_ver, hw-&gt;aq.fw_build,</div><div class='ctx'> 		 hw-&gt;aq.api_maj_ver, hw-&gt;aq.api_min_ver,</div><div class='del'>-		 i40e_nvm_version_str(hw));</div><div class='add'>+		 i40e_nvm_version_str(hw), hw-&gt;vendor_id, hw-&gt;device_id,</div><div class='add'>+		 hw-&gt;subsystem_vendor_id, hw-&gt;subsystem_device_id);</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &amp;&amp;</div><div class='ctx'> 	    hw-&gt;aq.api_min_ver &gt; I40E_FW_MINOR_VERSION(hw))</div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev,</div><div class='del'>-			 "The driver for the device detected a newer version of the NVM image than expected. Please install the most recent version of the network driver.\n");</div><div class='add'>+			 "The driver for the device detected a newer version of the NVM image v%u.%u than expected v%u.%u. Please install the most recent version of the network driver.\n",</div><div class='add'>+			 hw-&gt;aq.api_maj_ver,</div><div class='add'>+			 hw-&gt;aq.api_min_ver,</div><div class='add'>+			 I40E_FW_API_VERSION_MAJOR,</div><div class='add'>+			 I40E_FW_MINOR_VERSION(hw));</div><div class='ctx'> 	else if (hw-&gt;aq.api_maj_ver == 1 &amp;&amp; hw-&gt;aq.api_min_ver &lt; 4)</div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev,</div><div class='del'>-			 "The driver for the device detected an older version of the NVM image than expected. Please update the NVM image.\n");</div><div class='add'>+			 "The driver for the device detected an older version of the NVM image v%u.%u than expected v%u.%u. Please update the NVM image.\n",</div><div class='add'>+			 hw-&gt;aq.api_maj_ver,</div><div class='add'>+			 hw-&gt;aq.api_min_ver,</div><div class='add'>+			 I40E_FW_API_VERSION_MAJOR,</div><div class='add'>+			 I40E_FW_MINOR_VERSION(hw));</div><div class='ctx'> </div><div class='ctx'> 	i40e_verify_eeprom(pf);</div><div class='ctx'> </div><div class='hunk'>@@ -14044,6 +14334,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "This device is a pre-production adapter/LOM. Please be aware there may be issues with your hardware. If you are experiencing problems please contact your Intel or hardware representative who provided you with this hardware.\n");</div><div class='ctx'> </div><div class='ctx'> 	i40e_clear_pxe_mode(hw);</div><div class='add'>+</div><div class='ctx'> 	err = i40e_get_capabilities(pf, i40e_aqc_opc_list_func_capabilities);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_adminq_setup;</div><div class='hunk'>@@ -14054,6 +14345,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_sw_init;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_bit(__I40E_RECOVERY_MODE, pf-&gt;state))</div><div class='add'>+		return i40e_init_recovery_mode(pf, hw);</div><div class='add'>+</div><div class='ctx'> 	err = i40e_init_lan_hmc(hw, hw-&gt;func_caps.num_tx_qp,</div><div class='ctx'> 				hw-&gt;func_caps.num_rx_qp, 0, 0);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -14074,7 +14368,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pf-&gt;hw_features &amp; I40E_HW_STOP_FW_LLDP) {</div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev, "Stopping firmware LLDP agent.\n");</div><div class='del'>-		i40e_aq_stop_lldp(hw, true, NULL);</div><div class='add'>+		i40e_aq_stop_lldp(hw, true, false, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allow a platform config to override the HW addr */</div><div class='hunk'>@@ -14439,6 +14733,19 @@ static void i40e_remove(struct pci_dev *pdev)</div><div class='ctx'> 	if (pf-&gt;service_task.func)</div><div class='ctx'> 		cancel_work_sync(&amp;pf-&gt;service_task);</div><div class='ctx'> </div><div class='add'>+	if (test_bit(__I40E_RECOVERY_MODE, pf-&gt;state)) {</div><div class='add'>+		struct i40e_vsi *vsi = pf-&gt;vsi[0];</div><div class='add'>+</div><div class='add'>+		/* We know that we have allocated only one vsi for this PF,</div><div class='add'>+		 * it was just for registering netdevice, so the interface</div><div class='add'>+		 * could be visible in the 'ifconfig' output</div><div class='add'>+		 */</div><div class='add'>+		unregister_netdev(vsi-&gt;netdev);</div><div class='add'>+		free_netdev(vsi-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Client close must be called explicitly here because the timer</div><div class='ctx'> 	 * has been stopped.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -14488,6 +14795,12 @@ static void i40e_remove(struct pci_dev *pdev)</div><div class='ctx'> 				 ret_code);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+unmap:</div><div class='add'>+	/* Free MSI/legacy interrupt 0 when in recovery mode. */</div><div class='add'>+	if (test_bit(__I40E_RECOVERY_MODE, pf-&gt;state) &amp;&amp;</div><div class='add'>+	    !(pf-&gt;flags &amp; I40E_FLAG_MSIX_ENABLED))</div><div class='add'>+		free_irq(pf-&gt;pdev-&gt;irq, pf);</div><div class='add'>+</div><div class='ctx'> 	/* shutdown the adminq */</div><div class='ctx'> 	i40e_shutdown_adminq(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -14500,7 +14813,8 @@ static void i40e_remove(struct pci_dev *pdev)</div><div class='ctx'> 	i40e_clear_interrupt_scheme(pf);</div><div class='ctx'> 	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++) {</div><div class='ctx'> 		if (pf-&gt;vsi[i]) {</div><div class='del'>-			i40e_vsi_clear_rings(pf-&gt;vsi[i]);</div><div class='add'>+			if (!test_bit(__I40E_RECOVERY_MODE, pf-&gt;state))</div><div class='add'>+				i40e_vsi_clear_rings(pf-&gt;vsi[i]);</div><div class='ctx'> 			i40e_vsi_clear(pf-&gt;vsi[i]);</div><div class='ctx'> 			pf-&gt;vsi[i] = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -14708,6 +15022,11 @@ static void i40e_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 	wr32(hw, I40E_PFPM_WUFC,</div><div class='ctx'> 	     (pf-&gt;wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));</div><div class='ctx'> </div><div class='add'>+	/* Free MSI/legacy interrupt 0 when in recovery mode. */</div><div class='add'>+	if (test_bit(__I40E_RECOVERY_MODE, pf-&gt;state) &amp;&amp;</div><div class='add'>+	    !(pf-&gt;flags &amp; I40E_FLAG_MSIX_ENABLED))</div><div class='add'>+		free_irq(pf-&gt;pdev-&gt;irq, pf);</div><div class='add'>+</div><div class='ctx'> 	/* Since we're going to destroy queues during the</div><div class='ctx'> 	 * i40e_clear_interrupt_scheme() we should hold the RTNL lock for this</div><div class='ctx'> 	 * whole section</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c<br/>index 0299e5bbb902..c508b75c3c09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_nvm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_nvm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_nvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_nvm.c</a></div><div class='hunk'>@@ -578,11 +578,10 @@ i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw)</div><div class='ctx'> 	__le16 le_sum;</div><div class='ctx'> </div><div class='ctx'> 	ret_code = i40e_calc_nvm_checksum(hw, &amp;checksum);</div><div class='del'>-	if (!ret_code) {</div><div class='del'>-		le_sum = cpu_to_le16(checksum);</div><div class='add'>+	le_sum = cpu_to_le16(checksum);</div><div class='add'>+	if (!ret_code)</div><div class='ctx'> 		ret_code = i40e_write_nvm_aq(hw, 0x00, I40E_SR_SW_CHECKSUM_WORD,</div><div class='ctx'> 					     1, &amp;le_sum, true);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ret_code;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h<br/>index e08d754824b1..882627073dce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_prototype.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_prototype.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_prototype.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_prototype.h</a></div><div class='hunk'>@@ -203,14 +203,18 @@ i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type,</div><div class='ctx'> i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,</div><div class='ctx'> 				bool enable_update,</div><div class='ctx'> 				struct i40e_asq_cmd_details *cmd_details);</div><div class='add'>+enum i40e_status_code</div><div class='add'>+i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore,</div><div class='add'>+		     struct i40e_asq_cmd_details *cmd_details);</div><div class='ctx'> i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,</div><div class='add'>+			      bool persist,</div><div class='ctx'> 				struct i40e_asq_cmd_details *cmd_details);</div><div class='ctx'> i40e_status i40e_aq_set_dcb_parameters(struct i40e_hw *hw,</div><div class='ctx'> 				       bool dcb_enable,</div><div class='ctx'> 				       struct i40e_asq_cmd_details</div><div class='ctx'> 				       *cmd_details);</div><div class='del'>-i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,</div><div class='del'>-				struct i40e_asq_cmd_details *cmd_details);</div><div class='add'>+i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist,</div><div class='add'>+			       struct i40e_asq_cmd_details *cmd_details);</div><div class='ctx'> i40e_status i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,</div><div class='ctx'> 				       void *buff, u16 buff_size,</div><div class='ctx'> 				       struct i40e_asq_cmd_details *cmd_details);</div><div class='hunk'>@@ -429,10 +433,16 @@ i40e_status i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff,</div><div class='ctx'> struct i40e_generic_seg_header *</div><div class='ctx'> i40e_find_segment_in_package(u32 segment_type,</div><div class='ctx'> 			     struct i40e_package_header *pkg_header);</div><div class='add'>+struct i40e_profile_section_header *</div><div class='add'>+i40e_find_section_in_profile(u32 section_type,</div><div class='add'>+			     struct i40e_profile_segment *profile);</div><div class='ctx'> enum i40e_status_code</div><div class='ctx'> i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *i40e_seg,</div><div class='ctx'> 		   u32 track_id);</div><div class='ctx'> enum i40e_status_code</div><div class='add'>+i40e_rollback_profile(struct i40e_hw *hw, struct i40e_profile_segment *i40e_seg,</div><div class='add'>+		      u32 track_id);</div><div class='add'>+enum i40e_status_code</div><div class='ctx'> i40e_add_pinfo_to_list(struct i40e_hw *hw,</div><div class='ctx'> 		       struct i40e_profile_segment *profile,</div><div class='ctx'> 		       u8 *profile_info_sec, u32 track_id);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c<br/>index 5fb4353c742b..439c35f0c581 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_ptp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_ptp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_ptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_ptp.c</a></div><div class='hunk'>@@ -146,12 +146,13 @@ static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='ctx'> static int i40e_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='ctx'> {</div><div class='ctx'> 	struct i40e_pf *pf = container_of(ptp, struct i40e_pf, ptp_caps);</div><div class='del'>-	struct timespec64 now;</div><div class='add'>+	struct timespec64 now, then;</div><div class='ctx'> </div><div class='add'>+	then = ns_to_timespec64(delta);</div><div class='ctx'> 	mutex_lock(&amp;pf-&gt;tmreg_lock);</div><div class='ctx'> </div><div class='ctx'> 	i40e_ptp_read(pf, &amp;now, NULL);</div><div class='del'>-	timespec64_add_ns(&amp;now, delta);</div><div class='add'>+	now = timespec64_add(now, then);</div><div class='ctx'> 	i40e_ptp_write(pf, (const struct timespec64 *)&amp;now);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;pf-&gt;tmreg_lock);</div><div class='hunk'>@@ -724,16 +725,68 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)</div><div class='ctx'> 	pf-&gt;tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='ctx'> 	pf-&gt;tstamp_config.tx_type = HWTSTAMP_TX_OFF;</div><div class='ctx'> </div><div class='add'>+	/* Set the previous "reset" time to the current Kernel clock time */</div><div class='add'>+	pf-&gt;ptp_prev_hw_time = ktime_to_timespec64(ktime_get_real());</div><div class='add'>+	pf-&gt;ptp_reset_start = ktime_get();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * i40e_ptp_save_hw_time - Save the current PTP time as ptp_prev_hw_time</div><div class='add'>+ * @pf: Board private structure</div><div class='add'>+ *</div><div class='add'>+ * Read the current PTP time and save it into pf-&gt;ptp_prev_hw_time. This should</div><div class='add'>+ * be called at the end of preparing to reset, just before hardware reset</div><div class='add'>+ * occurs, in order to preserve the PTP time as close as possible across</div><div class='add'>+ * resets.</div><div class='add'>+ */</div><div class='add'>+void i40e_ptp_save_hw_time(struct i40e_pf *pf)</div><div class='add'>+{</div><div class='add'>+	/* don't try to access the PTP clock if it's not enabled */</div><div class='add'>+	if (!(pf-&gt;flags &amp; I40E_FLAG_PTP))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	i40e_ptp_gettimex(&amp;pf-&gt;ptp_caps, &amp;pf-&gt;ptp_prev_hw_time, NULL);</div><div class='add'>+	/* Get a monotonic starting time for this reset */</div><div class='add'>+	pf-&gt;ptp_reset_start = ktime_get();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * i40e_ptp_restore_hw_time - Restore the ptp_prev_hw_time + delta to PTP regs</div><div class='add'>+ * @pf: Board private structure</div><div class='add'>+ *</div><div class='add'>+ * Restore the PTP hardware clock registers. We previously cached the PTP</div><div class='add'>+ * hardware time as pf-&gt;ptp_prev_hw_time. To be as accurate as possible,</div><div class='add'>+ * update this value based on the time delta since the time was saved, using</div><div class='add'>+ * CLOCK_MONOTONIC (via ktime_get()) to calculate the time difference.</div><div class='add'>+ *</div><div class='add'>+ * This ensures that the hardware clock is restored to nearly what it should</div><div class='add'>+ * have been if a reset had not occurred.</div><div class='add'>+ */</div><div class='add'>+void i40e_ptp_restore_hw_time(struct i40e_pf *pf)</div><div class='add'>+{</div><div class='add'>+	ktime_t delta = ktime_sub(ktime_get(), pf-&gt;ptp_reset_start);</div><div class='add'>+</div><div class='add'>+	/* Update the previous HW time with the ktime delta */</div><div class='add'>+	timespec64_add_ns(&amp;pf-&gt;ptp_prev_hw_time, ktime_to_ns(delta));</div><div class='add'>+</div><div class='add'>+	/* Restore the hardware clock registers */</div><div class='add'>+	i40e_ptp_settime(&amp;pf-&gt;ptp_caps, &amp;pf-&gt;ptp_prev_hw_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * i40e_ptp_init - Initialize the 1588 support after device probe or reset</div><div class='ctx'>  * @pf: Board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * This function sets device up for 1588 support. The first time it is run, it</div><div class='ctx'>  * will create a PHC clock device. It does not create a clock device if one</div><div class='ctx'>  * already exists. It also reconfigures the device after a reset.</div><div class='add'>+ *</div><div class='add'>+ * The first time a clock is created, i40e_ptp_create_clock will set</div><div class='add'>+ * pf-&gt;ptp_prev_hw_time to the current system time. During resets, it is</div><div class='add'>+ * expected that this timespec will be set to the last known PTP clock time,</div><div class='add'>+ * in order to preserve the clock time as close as possible across a reset.</div><div class='ctx'>  **/</div><div class='ctx'> void i40e_ptp_init(struct i40e_pf *pf)</div><div class='ctx'> {</div><div class='hunk'>@@ -765,7 +818,6 @@ void i40e_ptp_init(struct i40e_pf *pf)</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev, "%s: ptp_clock_register failed\n",</div><div class='ctx'> 			__func__);</div><div class='ctx'> 	} else if (pf-&gt;ptp_clock) {</div><div class='del'>-		struct timespec64 ts;</div><div class='ctx'> 		u32 regval;</div><div class='ctx'> </div><div class='ctx'> 		if (pf-&gt;hw.debug_mask &amp; I40E_DEBUG_LAN)</div><div class='hunk'>@@ -786,9 +838,8 @@ void i40e_ptp_init(struct i40e_pf *pf)</div><div class='ctx'> 		/* reset timestamping mode */</div><div class='ctx'> 		i40e_ptp_set_timestamp_mode(pf, &amp;pf-&gt;tstamp_config);</div><div class='ctx'> </div><div class='del'>-		/* Set the clock value. */</div><div class='del'>-		ts = ktime_to_timespec64(ktime_get_real());</div><div class='del'>-		i40e_ptp_settime(&amp;pf-&gt;ptp_caps, &amp;ts);</div><div class='add'>+		/* Restore the clock time based on last known value */</div><div class='add'>+		i40e_ptp_restore_hw_time(pf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c<br/>index 6c97667d20ef..20a283702c9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_txrx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_txrx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_txrx.c</a></div><div class='hunk'>@@ -2035,7 +2035,8 @@ static struct sk_buff *i40e_construct_skb(struct i40e_ring *rx_ring,</div><div class='ctx'> 	/* Determine available headroom for copy */</div><div class='ctx'> 	headlen = size;</div><div class='ctx'> 	if (headlen &gt; I40E_RX_HDR_SIZE)</div><div class='del'>-		headlen = eth_get_headlen(xdp-&gt;data, I40E_RX_HDR_SIZE);</div><div class='add'>+		headlen = eth_get_headlen(skb-&gt;dev, xdp-&gt;data,</div><div class='add'>+					  I40E_RX_HDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	memcpy(__skb_put(skb, headlen), xdp-&gt;data,</div><div class='hunk'>@@ -3469,13 +3470,8 @@ static inline int i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,</div><div class='ctx'> 	first-&gt;next_to_watch = tx_desc;</div><div class='ctx'> </div><div class='ctx'> 	/* notify HW of packet */</div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h<br/>index 2781ab91ca82..8f43aa47c263 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_type.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_type.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_type.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_type.h</a></div><div class='hunk'>@@ -252,6 +252,12 @@ struct i40e_phy_info {</div><div class='ctx'> 					     I40E_PHY_TYPE_OFFSET)</div><div class='ctx'> #define I40E_CAP_PHY_TYPE_25GBASE_ACC BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC + \</div><div class='ctx'> 					     I40E_PHY_TYPE_OFFSET)</div><div class='add'>+/* Offset for 2.5G/5G PHY Types value to bit number conversion */</div><div class='add'>+#define I40E_PHY_TYPE_OFFSET2 (-10)</div><div class='add'>+#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T + \</div><div class='add'>+					     I40E_PHY_TYPE_OFFSET2)</div><div class='add'>+#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T + \</div><div class='add'>+					     I40E_PHY_TYPE_OFFSET2)</div><div class='ctx'> #define I40E_HW_CAP_MAX_GPIO			30</div><div class='ctx'> /* Capabilities of a PF or a VF or the whole device */</div><div class='ctx'> struct i40e_hw_capabilities {</div><div class='hunk'>@@ -616,6 +622,7 @@ struct i40e_hw {</div><div class='ctx'> #define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE  BIT_ULL(2)</div><div class='ctx'> #define I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK BIT_ULL(3)</div><div class='ctx'> #define I40E_HW_FLAG_FW_LLDP_STOPPABLE      BIT_ULL(4)</div><div class='add'>+#define I40E_HW_FLAG_FW_LLDP_PERSISTENT     BIT_ULL(5)</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Used in set switch config AQ command */</div><div class='hunk'>@@ -1527,6 +1534,8 @@ struct i40e_generic_seg_header {</div><div class='ctx'> struct i40e_metadata_segment {</div><div class='ctx'> 	struct i40e_generic_seg_header header;</div><div class='ctx'> 	struct i40e_ddp_version version;</div><div class='add'>+#define I40E_DDP_TRACKID_RDONLY		0</div><div class='add'>+#define I40E_DDP_TRACKID_INVALID	0xFFFFFFFF</div><div class='ctx'> 	u32 track_id;</div><div class='ctx'> 	char name[I40E_DDP_NAME_SIZE];</div><div class='ctx'> };</div><div class='hunk'>@@ -1555,15 +1564,36 @@ struct i40e_profile_section_header {</div><div class='ctx'> 	struct {</div><div class='ctx'> #define SECTION_TYPE_INFO	0x00000010</div><div class='ctx'> #define SECTION_TYPE_MMIO	0x00000800</div><div class='add'>+#define SECTION_TYPE_RB_MMIO	0x00001800</div><div class='ctx'> #define SECTION_TYPE_AQ		0x00000801</div><div class='add'>+#define SECTION_TYPE_RB_AQ	0x00001801</div><div class='ctx'> #define SECTION_TYPE_NOTE	0x80000000</div><div class='ctx'> #define SECTION_TYPE_NAME	0x80000001</div><div class='add'>+#define SECTION_TYPE_PROTO	0x80000002</div><div class='add'>+#define SECTION_TYPE_PCTYPE	0x80000003</div><div class='add'>+#define SECTION_TYPE_PTYPE	0x80000004</div><div class='ctx'> 		u32 type;</div><div class='ctx'> 		u32 offset;</div><div class='ctx'> 		u32 size;</div><div class='ctx'> 	} section;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct i40e_profile_tlv_section_record {</div><div class='add'>+	u8 rtype;</div><div class='add'>+	u8 type;</div><div class='add'>+	u16 len;</div><div class='add'>+	u8 data[12];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Generic AQ section in proflie */</div><div class='add'>+struct i40e_profile_aq_section {</div><div class='add'>+	u16 opcode;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u8  param[16];</div><div class='add'>+	u16 datalen;</div><div class='add'>+	u8  data[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct i40e_profile_info {</div><div class='ctx'> 	u32 track_id;</div><div class='ctx'> 	struct i40e_ddp_version version;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c<br/>index 831d52bc3c9a..479bc60c8f71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static inline bool i40e_vc_isvalid_vsi_id(struct i40e_vf *vf, u16 vsi_id)</div><div class='ctx'>  * check for the valid queue id</div><div class='ctx'>  **/</div><div class='ctx'> static inline bool i40e_vc_isvalid_queue_id(struct i40e_vf *vf, u16 vsi_id,</div><div class='del'>-					    u8 qid)</div><div class='add'>+					    u16 qid)</div><div class='ctx'> {</div><div class='ctx'> 	struct i40e_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct i40e_vsi *vsi = i40e_find_vsi_from_id(pf, vsi_id);</div><div class='hunk'>@@ -196,7 +196,7 @@ static inline bool i40e_vc_isvalid_queue_id(struct i40e_vf *vf, u16 vsi_id,</div><div class='ctx'>  *</div><div class='ctx'>  * check for the valid vector id</div><div class='ctx'>  **/</div><div class='del'>-static inline bool i40e_vc_isvalid_vector_id(struct i40e_vf *vf, u8 vector_id)</div><div class='add'>+static inline bool i40e_vc_isvalid_vector_id(struct i40e_vf *vf, u32 vector_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct i40e_pf *pf = vf-&gt;pf;</div><div class='ctx'> </div><div class='hunk'>@@ -441,14 +441,28 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,</div><div class='ctx'> 	u32 v_idx, i, reg_idx, reg;</div><div class='ctx'> 	u32 next_q_idx, next_q_type;</div><div class='ctx'> 	u32 msix_vf, size;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	msix_vf = pf-&gt;hw.func_caps.num_msix_vectors_vf;</div><div class='add'>+</div><div class='add'>+	if (qvlist_info-&gt;num_vectors &gt; msix_vf) {</div><div class='add'>+		dev_warn(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			 "Incorrect number of iwarp vectors %u. Maximum %u allowed.\n",</div><div class='add'>+			 qvlist_info-&gt;num_vectors,</div><div class='add'>+			 msix_vf);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct virtchnl_iwarp_qvlist_info) +</div><div class='ctx'> 	       (sizeof(struct virtchnl_iwarp_qv_info) *</div><div class='ctx'> 						(qvlist_info-&gt;num_vectors - 1));</div><div class='add'>+	kfree(vf-&gt;qvlist_info);</div><div class='ctx'> 	vf-&gt;qvlist_info = kzalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!vf-&gt;qvlist_info)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='add'>+	if (!vf-&gt;qvlist_info) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> 	vf-&gt;qvlist_info-&gt;num_vectors = qvlist_info-&gt;num_vectors;</div><div class='ctx'> </div><div class='ctx'> 	msix_vf = pf-&gt;hw.func_caps.num_msix_vectors_vf;</div><div class='hunk'>@@ -459,8 +473,10 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,</div><div class='ctx'> 		v_idx = qv_info-&gt;v_idx;</div><div class='ctx'> </div><div class='ctx'> 		/* Validate vector id belongs to this vf */</div><div class='del'>-		if (!i40e_vc_isvalid_vector_id(vf, v_idx))</div><div class='del'>-			goto err;</div><div class='add'>+		if (!i40e_vc_isvalid_vector_id(vf, v_idx)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		vf-&gt;qvlist_info-&gt;qv_info[i] = *qv_info;</div><div class='ctx'> </div><div class='hunk'>@@ -502,10 +518,11 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-err:</div><div class='add'>+err_free:</div><div class='ctx'> 	kfree(vf-&gt;qvlist_info);</div><div class='ctx'> 	vf-&gt;qvlist_info = NULL;</div><div class='del'>-	return -EINVAL;</div><div class='add'>+err_out:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1112,15 +1129,6 @@ static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf,</div><div class='ctx'> 	if (!i40e_vc_isvalid_vsi_id(vf, vsi_id) || !vsi)</div><div class='ctx'> 		return I40E_ERR_PARAM;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &amp;vf-&gt;vf_caps) &amp;&amp;</div><div class='del'>-	    (allmulti || alluni)) {</div><div class='del'>-		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			"Unprivileged VF %d is attempting to configure promiscuous mode\n",</div><div class='del'>-			vf-&gt;vf_id);</div><div class='del'>-		/* Lie to the VF on purpose. */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (vf-&gt;port_vlan_id) {</div><div class='ctx'> 		aq_ret = i40e_aq_set_vsi_mc_promisc_on_vlan(hw, vsi-&gt;seid,</div><div class='ctx'> 							    allmulti,</div><div class='hunk'>@@ -1997,8 +2005,31 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 	bool allmulti = false;</div><div class='ctx'> 	bool alluni = false;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(I40E_VF_STATE_ACTIVE, &amp;vf-&gt;vf_states))</div><div class='del'>-		return I40E_ERR_PARAM;</div><div class='add'>+	if (!test_bit(I40E_VF_STATE_ACTIVE, &amp;vf-&gt;vf_states)) {</div><div class='add'>+		aq_ret = I40E_ERR_PARAM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	if (!test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &amp;vf-&gt;vf_caps)) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"Unprivileged VF %d is attempting to configure promiscuous mode\n",</div><div class='add'>+			vf-&gt;vf_id);</div><div class='add'>+</div><div class='add'>+		/* Lie to the VF on purpose, because this is an error we can</div><div class='add'>+		 * ignore. Unprivileged VF is not a virtual channel error.</div><div class='add'>+		 */</div><div class='add'>+		aq_ret = 0;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &gt; I40E_MAX_VF_PROMISC_FLAGS) {</div><div class='add'>+		aq_ret = I40E_ERR_PARAM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!i40e_vc_isvalid_vsi_id(vf, info-&gt;vsi_id)) {</div><div class='add'>+		aq_ret = I40E_ERR_PARAM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Multicast promiscuous handling*/</div><div class='ctx'> 	if (info-&gt;flags &amp; FLAG_VF_MULTICAST_PROMISC)</div><div class='hunk'>@@ -2032,7 +2063,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 			clear_bit(I40E_VF_STATE_UC_PROMISC, &amp;vf-&gt;vf_states);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+err_out:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='ctx'> 	return i40e_vc_send_resp_to_vf(vf,</div><div class='ctx'> 				       VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE,</div><div class='hunk'>@@ -2054,17 +2085,16 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 	struct virtchnl_queue_pair_info *qpi;</div><div class='ctx'> 	struct i40e_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	u16 vsi_id, vsi_queue_id = 0;</div><div class='add'>+	u16 num_qps_all = 0;</div><div class='ctx'> 	i40e_status aq_ret = 0;</div><div class='ctx'> 	int i, j = 0, idx = 0;</div><div class='ctx'> </div><div class='del'>-	vsi_id = qci-&gt;vsi_id;</div><div class='del'>-</div><div class='ctx'> 	if (!test_bit(I40E_VF_STATE_ACTIVE, &amp;vf-&gt;vf_states)) {</div><div class='ctx'> 		aq_ret = I40E_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!i40e_vc_isvalid_vsi_id(vf, vsi_id)) {</div><div class='add'>+	if (!i40e_vc_isvalid_vsi_id(vf, qci-&gt;vsi_id)) {</div><div class='ctx'> 		aq_ret = I40E_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2074,10 +2104,27 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (vf-&gt;adq_enabled) {</div><div class='add'>+		for (i = 0; i &lt; I40E_MAX_VF_VSI; i++)</div><div class='add'>+			num_qps_all += vf-&gt;ch[i].num_qps;</div><div class='add'>+		if (num_qps_all != qci-&gt;num_queue_pairs) {</div><div class='add'>+			aq_ret = I40E_ERR_PARAM;</div><div class='add'>+			goto error_param;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsi_id = qci-&gt;vsi_id;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; qci-&gt;num_queue_pairs; i++) {</div><div class='ctx'> 		qpi = &amp;qci-&gt;qpair[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!vf-&gt;adq_enabled) {</div><div class='add'>+			if (!i40e_vc_isvalid_queue_id(vf, vsi_id,</div><div class='add'>+						      qpi-&gt;txq.queue_id)) {</div><div class='add'>+				aq_ret = I40E_ERR_PARAM;</div><div class='add'>+				goto error_param;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			vsi_queue_id = qpi-&gt;txq.queue_id;</div><div class='ctx'> </div><div class='ctx'> 			if (qpi-&gt;txq.vsi_id != qci-&gt;vsi_id ||</div><div class='hunk'>@@ -2088,10 +2135,8 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!i40e_vc_isvalid_queue_id(vf, vsi_id, vsi_queue_id)) {</div><div class='del'>-			aq_ret = I40E_ERR_PARAM;</div><div class='del'>-			goto error_param;</div><div class='del'>-		}</div><div class='add'>+		if (vf-&gt;adq_enabled)</div><div class='add'>+			vsi_id = vf-&gt;ch[idx].vsi_id;</div><div class='ctx'> </div><div class='ctx'> 		if (i40e_config_vsi_rx_queue(vf, vsi_id, vsi_queue_id,</div><div class='ctx'> 					     &amp;qpi-&gt;rxq) ||</div><div class='hunk'>@@ -2115,7 +2160,6 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 				j++;</div><div class='ctx'> 				vsi_queue_id++;</div><div class='ctx'> 			}</div><div class='del'>-			vsi_id = vf-&gt;ch[idx].vsi_id;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set vsi num_queue_pairs in use to num configured by VF */</div><div class='hunk'>@@ -2174,7 +2218,7 @@ static int i40e_vc_config_irq_map_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 	struct virtchnl_irq_map_info *irqmap_info =</div><div class='ctx'> 	    (struct virtchnl_irq_map_info *)msg;</div><div class='ctx'> 	struct virtchnl_vector_map *map;</div><div class='del'>-	u16 vsi_id, vector_id;</div><div class='add'>+	u16 vsi_id;</div><div class='ctx'> 	i40e_status aq_ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -2183,16 +2227,21 @@ static int i40e_vc_config_irq_map_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (irqmap_info-&gt;num_vectors &gt;</div><div class='add'>+	    vf-&gt;pf-&gt;hw.func_caps.num_msix_vectors_vf) {</div><div class='add'>+		aq_ret = I40E_ERR_PARAM;</div><div class='add'>+		goto error_param;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; irqmap_info-&gt;num_vectors; i++) {</div><div class='ctx'> 		map = &amp;irqmap_info-&gt;vecmap[i];</div><div class='del'>-		vector_id = map-&gt;vector_id;</div><div class='del'>-		vsi_id = map-&gt;vsi_id;</div><div class='ctx'> 		/* validate msg params */</div><div class='del'>-		if (!i40e_vc_isvalid_vector_id(vf, vector_id) ||</div><div class='del'>-		    !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {</div><div class='add'>+		if (!i40e_vc_isvalid_vector_id(vf, map-&gt;vector_id) ||</div><div class='add'>+		    !i40e_vc_isvalid_vsi_id(vf, map-&gt;vsi_id)) {</div><div class='ctx'> 			aq_ret = I40E_ERR_PARAM;</div><div class='ctx'> 			goto error_param;</div><div class='ctx'> 		}</div><div class='add'>+		vsi_id = map-&gt;vsi_id;</div><div class='ctx'> </div><div class='ctx'> 		if (i40e_validate_queue_map(vf, vsi_id, map-&gt;rxq_map)) {</div><div class='ctx'> 			aq_ret = I40E_ERR_PARAM;</div><div class='hunk'>@@ -2340,7 +2389,9 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((0 == vqs-&gt;rx_queues) &amp;&amp; (0 == vqs-&gt;tx_queues)) {</div><div class='add'>+	if ((vqs-&gt;rx_queues == 0 &amp;&amp; vqs-&gt;tx_queues == 0) ||</div><div class='add'>+	    vqs-&gt;rx_queues &gt; I40E_MAX_VF_QUEUES ||</div><div class='add'>+	    vqs-&gt;tx_queues &gt; I40E_MAX_VF_QUEUES) {</div><div class='ctx'> 		aq_ret = I40E_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2454,8 +2505,10 @@ error_param:</div><div class='ctx'> 				      (u8 *)&amp;stats, sizeof(stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* If the VF is not trusted restrict the number of MAC/VLAN it can program */</div><div class='del'>-#define I40E_VC_MAX_MAC_ADDR_PER_VF 12</div><div class='add'>+/* If the VF is not trusted restrict the number of MAC/VLAN it can program</div><div class='add'>+ * MAC filters: 16 for multicast, 1 for MAC, 1 for broadcast</div><div class='add'>+ */</div><div class='add'>+#define I40E_VC_MAX_MAC_ADDR_PER_VF (16 + 1 + 1)</div><div class='ctx'> #define I40E_VC_MAX_VLAN_PER_VF 8</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2764,7 +2817,8 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> </div><div class='ctx'> 	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (vsi-&gt;info.pvid) {</div><div class='del'>-		aq_ret = I40E_ERR_PARAM;</div><div class='add'>+		if (vfl-&gt;num_elements &gt; 1 || vfl-&gt;vlan_id[0])</div><div class='add'>+			aq_ret = I40E_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3126,7 +3180,7 @@ static int i40e_validate_cloud_filter(struct i40e_vf *vf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mask.dst_port &amp; data.dst_port) {</div><div class='del'>-		if (!data.dst_port || be16_to_cpu(data.dst_port) &gt; 0xFFFF) {</div><div class='add'>+		if (!data.dst_port) {</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "VF %d: Invalid Dest port\n",</div><div class='ctx'> 				 vf-&gt;vf_id);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -3134,7 +3188,7 @@ static int i40e_validate_cloud_filter(struct i40e_vf *vf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mask.src_port &amp; data.src_port) {</div><div class='del'>-		if (!data.src_port || be16_to_cpu(data.src_port) &gt; 0xFFFF) {</div><div class='add'>+		if (!data.src_port) {</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "VF %d: Invalid Source port\n",</div><div class='ctx'> 				 vf-&gt;vf_id);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -3374,7 +3428,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(I40E_VF_STATE_ACTIVE, &amp;vf-&gt;vf_states)) {</div><div class='ctx'> 		aq_ret = I40E_ERR_PARAM;</div><div class='del'>-		goto err;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!vf-&gt;adq_enabled) {</div><div class='hunk'>@@ -3382,7 +3436,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 			 "VF %d: ADq is not enabled, can't apply cloud filter\n",</div><div class='ctx'> 			 vf-&gt;vf_id);</div><div class='ctx'> 		aq_ret = I40E_ERR_PARAM;</div><div class='del'>-		goto err;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i40e_validate_cloud_filter(vf, vcf)) {</div><div class='hunk'>@@ -3390,7 +3444,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 			 "VF %d: Invalid input/s, can't apply cloud filter\n",</div><div class='ctx'> 			 vf-&gt;vf_id);</div><div class='ctx'> 		aq_ret = I40E_ERR_PARAM;</div><div class='del'>-		goto err;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfilter = kzalloc(sizeof(*cfilter), GFP_KERNEL);</div><div class='hunk'>@@ -3451,13 +3505,17 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)</div><div class='ctx'> 			"VF %d: Failed to add cloud filter, err %s aq_err %s\n",</div><div class='ctx'> 			vf-&gt;vf_id, i40e_stat_str(&amp;pf-&gt;hw, ret),</div><div class='ctx'> 			i40e_aq_str(&amp;pf-&gt;hw, pf-&gt;hw.aq.asq_last_status));</div><div class='del'>-		goto err;</div><div class='add'>+		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_HLIST_NODE(&amp;cfilter-&gt;cloud_node);</div><div class='ctx'> 	hlist_add_head(&amp;cfilter-&gt;cloud_node, &amp;vf-&gt;cloud_filter_list);</div><div class='add'>+	/* release the pointer passing it to the collection */</div><div class='add'>+	cfilter = NULL;</div><div class='ctx'> 	vf-&gt;num_cloud_filters++;</div><div class='del'>-err:</div><div class='add'>+err_free:</div><div class='add'>+	kfree(cfilter);</div><div class='add'>+err_out:</div><div class='ctx'> 	return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_ADD_CLOUD_FILTER,</div><div class='ctx'> 				       aq_ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -4009,6 +4067,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,</div><div class='ctx'> {</div><div class='ctx'> 	u16 vlanprio = vlan_id | (qos &lt;&lt; I40E_VLAN_PRIORITY_SHIFT);</div><div class='ctx'> 	struct i40e_netdev_priv *np = netdev_priv(netdev);</div><div class='add'>+	bool allmulti = false, alluni = false;</div><div class='ctx'> 	struct i40e_pf *pf = np-&gt;vsi-&gt;back;</div><div class='ctx'> 	struct i40e_vsi *vsi;</div><div class='ctx'> 	struct i40e_vf *vf;</div><div class='hunk'>@@ -4093,6 +4152,15 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;vsi-&gt;mac_filter_hash_lock);</div><div class='add'>+</div><div class='add'>+	/* disable promisc modes in case they were enabled */</div><div class='add'>+	ret = i40e_config_vf_promiscuous_mode(vf, vf-&gt;lan_vsi_id,</div><div class='add'>+					      allmulti, alluni);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Unable to config VF promiscuous mode\n");</div><div class='add'>+		goto error_pvid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (vlan_id || qos)</div><div class='ctx'> 		ret = i40e_vsi_add_pvid(vsi, vlanprio);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -4119,6 +4187,12 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;vsi-&gt;mac_filter_hash_lock);</div><div class='ctx'> </div><div class='add'>+	if (test_bit(I40E_VF_STATE_UC_PROMISC, &amp;vf-&gt;vf_states))</div><div class='add'>+		alluni = true;</div><div class='add'>+</div><div class='add'>+	if (test_bit(I40E_VF_STATE_MC_PROMISC, &amp;vf-&gt;vf_states))</div><div class='add'>+		allmulti = true;</div><div class='add'>+</div><div class='ctx'> 	/* Schedule the worker thread to take care of applying changes */</div><div class='ctx'> 	i40e_service_event_schedule(vsi-&gt;back);</div><div class='ctx'> </div><div class='hunk'>@@ -4131,6 +4205,13 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,</div><div class='ctx'> 	 * default LAN MAC address.</div><div class='ctx'> 	 */</div><div class='ctx'> 	vf-&gt;port_vlan_id = le16_to_cpu(vsi-&gt;info.pvid);</div><div class='add'>+</div><div class='add'>+	ret = i40e_config_vf_promiscuous_mode(vf, vsi-&gt;id, allmulti, alluni);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Unable to config vf promiscuous mode\n");</div><div class='add'>+		goto error_pvid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> error_pvid:</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h<br/>index f9621026beef..f65cc0c16550 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #define I40E_VLAN_MASK			0xFFF</div><div class='ctx'> #define I40E_PRIORITY_MASK		0xE000</div><div class='ctx'> </div><div class='add'>+#define I40E_MAX_VF_PROMISC_FLAGS	3</div><div class='add'>+</div><div class='ctx'> /* Various queue ctrls */</div><div class='ctx'> enum i40e_queue_ctrl {</div><div class='ctx'> 	I40E_QUEUE_CTRL_UNKNOWN = 0,</div><div class='head'>diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c<br/>index b5c182e688e3..1b17486543ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_xsk.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/i40e/i40e_xsk.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/i40e/i40e_xsk.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/i40e/i40e_xsk.c</a></div><div class='hunk'>@@ -102,6 +102,8 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	set_bit(qid, vsi-&gt;af_xdp_zc_qps);</div><div class='add'>+</div><div class='ctx'> 	if_running = netif_running(vsi-&gt;netdev) &amp;&amp; i40e_enabled_xdp_vsi(vsi);</div><div class='ctx'> </div><div class='ctx'> 	if (if_running) {</div><div class='hunk'>@@ -148,6 +150,7 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clear_bit(qid, vsi-&gt;af_xdp_zc_qps);</div><div class='ctx'> 	i40e_xsk_umem_dma_unmap(vsi, umem);</div><div class='ctx'> </div><div class='ctx'> 	if (if_running) {</div><div class='head'>diff --git a/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h<br/>index af4f94a6541e..e5ae4a1c0cff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #define I40E_FW_API_VERSION_MAJOR	0x0001</div><div class='ctx'> #define I40E_FW_API_VERSION_MINOR_X722	0x0005</div><div class='del'>-#define I40E_FW_API_VERSION_MINOR_X710	0x0007</div><div class='add'>+#define I40E_FW_API_VERSION_MINOR_X710	0x0008</div><div class='ctx'> </div><div class='ctx'> #define I40E_FW_MINOR_VERSION(_h) ((_h)-&gt;mac.type == I40E_MAC_XL710 ? \</div><div class='ctx'> 					I40E_FW_API_VERSION_MINOR_X710 : \</div><div class='head'>diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c<br/>index 9b4d7cec2e18..06d1509d57f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/iavf/iavf_txrx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/iavf/iavf_txrx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/iavf/iavf_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/iavf/iavf_txrx.c</a></div><div class='hunk'>@@ -1315,7 +1315,7 @@ static struct sk_buff *iavf_construct_skb(struct iavf_ring *rx_ring,</div><div class='ctx'> 	/* Determine available headroom for copy */</div><div class='ctx'> 	headlen = size;</div><div class='ctx'> 	if (headlen &gt; IAVF_RX_HDR_SIZE)</div><div class='del'>-		headlen = eth_get_headlen(va, IAVF_RX_HDR_SIZE);</div><div class='add'>+		headlen = eth_get_headlen(skb-&gt;dev, va, IAVF_RX_HDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	memcpy(__skb_put(skb, headlen), va, ALIGN(headlen, sizeof(long)));</div><div class='hunk'>@@ -2358,13 +2358,8 @@ static inline void iavf_tx_map(struct iavf_ring *tx_ring, struct sk_buff *skb,</div><div class='ctx'> 	first-&gt;next_to_watch = tx_desc;</div><div class='ctx'> </div><div class='ctx'> 	/* notify HW of packet */</div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile<br/>index e5d6f684437e..2d140ba83781 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/Makefile</a></div><div class='hunk'>@@ -17,3 +17,4 @@ ice-y := ice_main.o	\</div><div class='ctx'> 	 ice_txrx.o	\</div><div class='ctx'> 	 ice_ethtool.o</div><div class='ctx'> ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o</div><div class='add'>+ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_lib.o</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h<br/>index 89440775aea1..792e6e42030e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include "ice_devids.h"</div><div class='ctx'> #include "ice_type.h"</div><div class='ctx'> #include "ice_txrx.h"</div><div class='add'>+#include "ice_dcb.h"</div><div class='ctx'> #include "ice_switch.h"</div><div class='ctx'> #include "ice_common.h"</div><div class='ctx'> #include "ice_sched.h"</div><div class='hunk'>@@ -42,10 +43,21 @@</div><div class='ctx'> </div><div class='ctx'> extern const char ice_drv_ver[];</div><div class='ctx'> #define ICE_BAR0		0</div><div class='del'>-#define ICE_DFLT_NUM_DESC	128</div><div class='ctx'> #define ICE_REQ_DESC_MULTIPLE	32</div><div class='ctx'> #define ICE_MIN_NUM_DESC	ICE_REQ_DESC_MULTIPLE</div><div class='ctx'> #define ICE_MAX_NUM_DESC	8160</div><div class='add'>+/* set default number of Rx/Tx descriptors to the minimum between</div><div class='add'>+ * ICE_MAX_NUM_DESC and the number of descriptors to fill up an entire page</div><div class='add'>+ */</div><div class='add'>+#define ICE_DFLT_NUM_RX_DESC	min_t(u16, ICE_MAX_NUM_DESC, \</div><div class='add'>+				      ALIGN(PAGE_SIZE / \</div><div class='add'>+					    sizeof(union ice_32byte_rx_desc), \</div><div class='add'>+					    ICE_REQ_DESC_MULTIPLE))</div><div class='add'>+#define ICE_DFLT_NUM_TX_DESC	min_t(u16, ICE_MAX_NUM_DESC, \</div><div class='add'>+				      ALIGN(PAGE_SIZE / \</div><div class='add'>+					    sizeof(struct ice_tx_desc), \</div><div class='add'>+					    ICE_REQ_DESC_MULTIPLE))</div><div class='add'>+</div><div class='ctx'> #define ICE_DFLT_TRAFFIC_CLASS	BIT(0)</div><div class='ctx'> #define ICE_INT_NAME_STR_LEN	(IFNAMSIZ + 16)</div><div class='ctx'> #define ICE_ETHTOOL_FWVER_LEN	32</div><div class='hunk'>@@ -71,6 +83,8 @@ extern const char ice_drv_ver[];</div><div class='ctx'> #define ICE_MAX_QS_PER_VF		256</div><div class='ctx'> #define ICE_MIN_QS_PER_VF		1</div><div class='ctx'> #define ICE_DFLT_QS_PER_VF		4</div><div class='add'>+#define ICE_NONQ_VECS_VF		1</div><div class='add'>+#define ICE_MAX_SCATTER_QS_PER_VF	16</div><div class='ctx'> #define ICE_MAX_BASE_QS_PER_VF		16</div><div class='ctx'> #define ICE_MAX_INTR_PER_VF		65</div><div class='ctx'> #define ICE_MIN_INTR_PER_VF		(ICE_MIN_QS_PER_VF + 1)</div><div class='hunk'>@@ -114,6 +128,23 @@ extern const char ice_drv_ver[];</div><div class='ctx'> #define ice_for_each_q_vector(vsi, i) \</div><div class='ctx'> 	for ((i) = 0; (i) &lt; (vsi)-&gt;num_q_vectors; (i)++)</div><div class='ctx'> </div><div class='add'>+#define ICE_UCAST_PROMISC_BITS (ICE_PROMISC_UCAST_TX | ICE_PROMISC_MCAST_TX | \</div><div class='add'>+				ICE_PROMISC_UCAST_RX | ICE_PROMISC_MCAST_RX)</div><div class='add'>+</div><div class='add'>+#define ICE_UCAST_VLAN_PROMISC_BITS (ICE_PROMISC_UCAST_TX | \</div><div class='add'>+				     ICE_PROMISC_MCAST_TX | \</div><div class='add'>+				     ICE_PROMISC_UCAST_RX | \</div><div class='add'>+				     ICE_PROMISC_MCAST_RX | \</div><div class='add'>+				     ICE_PROMISC_VLAN_TX  | \</div><div class='add'>+				     ICE_PROMISC_VLAN_RX)</div><div class='add'>+</div><div class='add'>+#define ICE_MCAST_PROMISC_BITS (ICE_PROMISC_MCAST_TX | ICE_PROMISC_MCAST_RX)</div><div class='add'>+</div><div class='add'>+#define ICE_MCAST_VLAN_PROMISC_BITS (ICE_PROMISC_MCAST_TX | \</div><div class='add'>+				     ICE_PROMISC_MCAST_RX | \</div><div class='add'>+				     ICE_PROMISC_VLAN_TX  | \</div><div class='add'>+				     ICE_PROMISC_VLAN_RX)</div><div class='add'>+</div><div class='ctx'> struct ice_tc_info {</div><div class='ctx'> 	u16 qoffset;</div><div class='ctx'> 	u16 qcount_tx;</div><div class='hunk'>@@ -123,7 +154,7 @@ struct ice_tc_info {</div><div class='ctx'> </div><div class='ctx'> struct ice_tc_cfg {</div><div class='ctx'> 	u8 numtc; /* Total number of enabled TCs */</div><div class='del'>-	u8 ena_tc; /* TX map */</div><div class='add'>+	u8 ena_tc; /* Tx map */</div><div class='ctx'> 	struct ice_tc_info tc_info[ICE_MAX_TRAFFIC_CLASS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -134,7 +165,7 @@ struct ice_res_tracker {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ice_qs_cfg {</div><div class='del'>-	struct mutex *qs_mutex;  /* will be assgined to &amp;pf-&gt;avail_q_mutex */</div><div class='add'>+	struct mutex *qs_mutex;  /* will be assigned to &amp;pf-&gt;avail_q_mutex */</div><div class='ctx'> 	unsigned long *pf_map;</div><div class='ctx'> 	unsigned long pf_map_size;</div><div class='ctx'> 	unsigned int q_count;</div><div class='hunk'>@@ -224,6 +255,8 @@ struct ice_vsi {</div><div class='ctx'> </div><div class='ctx'> 	s16 vf_id;			/* VF ID for SR-IOV VSIs */</div><div class='ctx'> </div><div class='add'>+	u16 ethtype;			/* Ethernet protocol for pause frame */</div><div class='add'>+</div><div class='ctx'> 	/* RSS config */</div><div class='ctx'> 	u16 rss_table_size;	/* HW RSS table size */</div><div class='ctx'> 	u16 rss_size;		/* Allocated RSS queues */</div><div class='hunk'>@@ -247,6 +280,7 @@ struct ice_vsi {</div><div class='ctx'> 	u8 irqs_ready;</div><div class='ctx'> 	u8 current_isup;		 /* Sync 'link up' logging */</div><div class='ctx'> 	u8 stat_offsets_loaded;</div><div class='add'>+	u8 vlan_ena;</div><div class='ctx'> </div><div class='ctx'> 	/* queue information */</div><div class='ctx'> 	u8 tx_mapping_mode;		 /* ICE_MAP_MODE_[CONTIG|SCATTER] */</div><div class='hunk'>@@ -257,26 +291,34 @@ struct ice_vsi {</div><div class='ctx'> 	u16 num_txq;			 /* Used Tx queues */</div><div class='ctx'> 	u16 alloc_rxq;			 /* Allocated Rx queues */</div><div class='ctx'> 	u16 num_rxq;			 /* Used Rx queues */</div><div class='del'>-	u16 num_desc;</div><div class='add'>+	u16 num_rx_desc;</div><div class='add'>+	u16 num_tx_desc;</div><div class='ctx'> 	struct ice_tc_cfg tc_cfg;</div><div class='ctx'> } ____cacheline_internodealigned_in_smp;</div><div class='ctx'> </div><div class='ctx'> /* struct that defines an interrupt vector */</div><div class='ctx'> struct ice_q_vector {</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='del'>-	cpumask_t affinity_mask;</div><div class='del'>-	struct napi_struct napi;</div><div class='del'>-	struct ice_ring_container rx;</div><div class='del'>-	struct ice_ring_container tx;</div><div class='del'>-	struct irq_affinity_notify affinity_notify;</div><div class='add'>+</div><div class='ctx'> 	u16 v_idx;			/* index in the vsi-&gt;q_vector array. */</div><div class='del'>-	u8 num_ring_tx;			/* total number of Tx rings in vector */</div><div class='add'>+	u16 reg_idx;</div><div class='ctx'> 	u8 num_ring_rx;			/* total number of Rx rings in vector */</div><div class='del'>-	char name[ICE_INT_NAME_STR_LEN];</div><div class='add'>+	u8 num_ring_tx;			/* total number of Tx rings in vector */</div><div class='add'>+	u8 itr_countdown;		/* when 0 should adjust adaptive ITR */</div><div class='ctx'> 	/* in usecs, need to use ice_intrl_to_usecs_reg() before writing this</div><div class='ctx'> 	 * value to the device</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 intrl;</div><div class='add'>+</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	struct ice_ring_container rx;</div><div class='add'>+	struct ice_ring_container tx;</div><div class='add'>+</div><div class='add'>+	cpumask_t affinity_mask;</div><div class='add'>+	struct irq_affinity_notify affinity_notify;</div><div class='add'>+</div><div class='add'>+	char name[ICE_INT_NAME_STR_LEN];</div><div class='ctx'> } ____cacheline_internodealigned_in_smp;</div><div class='ctx'> </div><div class='ctx'> enum ice_pf_flags {</div><div class='hunk'>@@ -285,7 +327,11 @@ enum ice_pf_flags {</div><div class='ctx'> 	ICE_FLAG_RSS_ENA,</div><div class='ctx'> 	ICE_FLAG_SRIOV_ENA,</div><div class='ctx'> 	ICE_FLAG_SRIOV_CAPABLE,</div><div class='add'>+	ICE_FLAG_DCB_CAPABLE,</div><div class='add'>+	ICE_FLAG_DCB_ENA,</div><div class='ctx'> 	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,</div><div class='add'>+	ICE_FLAG_DISABLE_FW_LLDP,</div><div class='add'>+	ICE_FLAG_ETHTOOL_CTXT,		/* set when ethtool holds RTNL lock */</div><div class='ctx'> 	ICE_PF_FLAGS_NBITS		/* must be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -324,8 +370,8 @@ struct ice_pf {</div><div class='ctx'> 	u32 hw_oicr_idx;	/* Other interrupt cause vector HW index */</div><div class='ctx'> 	u32 num_avail_hw_msix;	/* remaining HW MSIX vectors left unclaimed */</div><div class='ctx'> 	u32 num_lan_msix;	/* Total MSIX vectors for base driver */</div><div class='del'>-	u16 num_lan_tx;		/* num lan Tx queues setup */</div><div class='del'>-	u16 num_lan_rx;		/* num lan Rx queues setup */</div><div class='add'>+	u16 num_lan_tx;		/* num LAN Tx queues setup */</div><div class='add'>+	u16 num_lan_rx;		/* num LAN Rx queues setup */</div><div class='ctx'> 	u16 q_left_tx;		/* remaining num Tx queues left unclaimed */</div><div class='ctx'> 	u16 q_left_rx;		/* remaining num Rx queues left unclaimed */</div><div class='ctx'> 	u16 next_vsi;		/* Next free slot in pf-&gt;vsi[] - 0-based! */</div><div class='hunk'>@@ -339,6 +385,9 @@ struct ice_pf {</div><div class='ctx'> 	struct ice_hw_port_stats stats_prev;</div><div class='ctx'> 	struct ice_hw hw;</div><div class='ctx'> 	u8 stat_prev_loaded;	/* has previous stats been loaded */</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+	u16 dcbx_cap;</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='ctx'> 	u32 tx_timeout_count;</div><div class='ctx'> 	unsigned long tx_timeout_last_recovery;</div><div class='ctx'> 	u32 tx_timeout_recovery_level;</div><div class='hunk'>@@ -351,14 +400,15 @@ struct ice_netdev_priv {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_irq_dynamic_ena - Enable default interrupt generation settings</div><div class='del'>- * @hw: pointer to hw struct</div><div class='del'>- * @vsi: pointer to vsi struct, can be NULL</div><div class='add'>+ * @hw: pointer to HW struct</div><div class='add'>+ * @vsi: pointer to VSI struct, can be NULL</div><div class='ctx'>  * @q_vector: pointer to q_vector, can be NULL</div><div class='ctx'>  */</div><div class='del'>-static inline void ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,</div><div class='del'>-				       struct ice_q_vector *q_vector)</div><div class='add'>+static inline void</div><div class='add'>+ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,</div><div class='add'>+		    struct ice_q_vector *q_vector)</div><div class='ctx'> {</div><div class='del'>-	u32 vector = (vsi &amp;&amp; q_vector) ? vsi-&gt;hw_base_vector + q_vector-&gt;v_idx :</div><div class='add'>+	u32 vector = (vsi &amp;&amp; q_vector) ? q_vector-&gt;reg_idx :</div><div class='ctx'> 				((struct ice_pf *)hw-&gt;back)-&gt;hw_oicr_idx;</div><div class='ctx'> 	int itr = ICE_ITR_NONE;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -374,10 +424,24 @@ static inline void ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,</div><div class='ctx'> 	wr32(hw, GLINT_DYN_CTL(vector), val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ice_vsi_set_tc_cfg(struct ice_vsi *vsi)</div><div class='add'>+/**</div><div class='add'>+ * ice_find_vsi_by_type - Find and return VSI of a given type</div><div class='add'>+ * @pf: PF to search for VSI</div><div class='add'>+ * @type: Value indicating type of VSI we are looking for</div><div class='add'>+ */</div><div class='add'>+static inline struct ice_vsi *</div><div class='add'>+ice_find_vsi_by_type(struct ice_pf *pf, enum ice_vsi_type type)</div><div class='ctx'> {</div><div class='del'>-	vsi-&gt;tc_cfg.ena_tc =  ICE_DFLT_TRAFFIC_CLASS;</div><div class='del'>-	vsi-&gt;tc_cfg.numtc = 1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++) {</div><div class='add'>+		struct ice_vsi *vsi = pf-&gt;vsi[i];</div><div class='add'>+</div><div class='add'>+		if (vsi &amp;&amp; vsi-&gt;type == type)</div><div class='add'>+			return vsi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ice_set_ethtool_ops(struct net_device *netdev);</div><div class='hunk'>@@ -388,5 +452,9 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);</div><div class='ctx'> void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);</div><div class='ctx'> void ice_print_link_msg(struct ice_vsi *vsi, bool isup);</div><div class='ctx'> void ice_napi_del(struct ice_vsi *vsi);</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked);</div><div class='add'>+void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked);</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ICE_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h<br/>index 242c78469181..6ef083002f5b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_adminq_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_adminq_cmd.h</a></div><div class='hunk'>@@ -62,7 +62,7 @@ struct ice_aqc_req_res {</div><div class='ctx'> #define ICE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS	180000</div><div class='ctx'> #define ICE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS	1000</div><div class='ctx'> #define ICE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS	3000</div><div class='del'>-	/* For SDP: pin id of the SDP */</div><div class='add'>+	/* For SDP: pin ID of the SDP */</div><div class='ctx'> 	__le32 res_number;</div><div class='ctx'> 	/* Status is only used for ICE_AQC_RES_ID_GLBL_LOCK */</div><div class='ctx'> 	__le16 status;</div><div class='hunk'>@@ -747,6 +747,32 @@ struct ice_aqc_delete_elem {</div><div class='ctx'> 	__le32 teid[1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Query Port ETS (indirect 0x040E)</div><div class='add'>+ *</div><div class='add'>+ * This indirect command is used to query port TC node configuration.</div><div class='add'>+ */</div><div class='add'>+struct ice_aqc_query_port_ets {</div><div class='add'>+	__le32 port_teid;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 addr_high;</div><div class='add'>+	__le32 addr_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ice_aqc_port_ets_elem {</div><div class='add'>+	u8 tc_valid_bits;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	/* 3 bits for UP per TC 0-7, 4th byte reserved */</div><div class='add'>+	__le32 up2tc;</div><div class='add'>+	u8 tc_bw_share[8];</div><div class='add'>+	__le32 port_eir_prof_id;</div><div class='add'>+	__le32 port_cir_prof_id;</div><div class='add'>+	/* 3 bits per Node priority to TC 0-7, 4th byte reserved */</div><div class='add'>+	__le32 tc_node_prio;</div><div class='add'>+#define ICE_TC_NODE_PRIO_S	0x4</div><div class='add'>+	u8 reserved1[4];</div><div class='add'>+	__le32 tc_node_teid[8]; /* Used for response, reserved in command */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Query Scheduler Resource Allocation (indirect 0x0412)</div><div class='ctx'>  * This indirect command retrieves the scheduler resources allocated by</div><div class='ctx'>  * EMP Firmware to the given PF.</div><div class='hunk'>@@ -953,8 +979,9 @@ struct ice_aqc_set_phy_cfg_data {</div><div class='ctx'> 	__le64 phy_type_low; /* Use values from ICE_PHY_TYPE_LOW_* */</div><div class='ctx'> 	__le64 phy_type_high; /* Use values from ICE_PHY_TYPE_HIGH_* */</div><div class='ctx'> 	u8 caps;</div><div class='del'>-#define ICE_AQ_PHY_ENA_TX_PAUSE_ABILITY		BIT(0)</div><div class='del'>-#define ICE_AQ_PHY_ENA_RX_PAUSE_ABILITY		BIT(1)</div><div class='add'>+#define ICE_AQ_PHY_ENA_VALID_MASK	ICE_M(0xef, 0)</div><div class='add'>+#define ICE_AQ_PHY_ENA_TX_PAUSE_ABILITY	BIT(0)</div><div class='add'>+#define ICE_AQ_PHY_ENA_RX_PAUSE_ABILITY	BIT(1)</div><div class='ctx'> #define ICE_AQ_PHY_ENA_LOW_POWER	BIT(2)</div><div class='ctx'> #define ICE_AQ_PHY_ENA_LINK		BIT(3)</div><div class='ctx'> #define ICE_AQ_PHY_ENA_AUTO_LINK_UPDT	BIT(5)</div><div class='hunk'>@@ -1023,7 +1050,7 @@ struct ice_aqc_get_link_status_data {</div><div class='ctx'> 	u8 ext_info;</div><div class='ctx'> #define ICE_AQ_LINK_PHY_TEMP_ALARM	BIT(0)</div><div class='ctx'> #define ICE_AQ_LINK_EXCESSIVE_ERRORS	BIT(1)	/* Excessive Link Errors */</div><div class='del'>-	/* Port TX Suspended */</div><div class='add'>+	/* Port Tx Suspended */</div><div class='ctx'> #define ICE_AQ_LINK_TX_S		2</div><div class='ctx'> #define ICE_AQ_LINK_TX_M		(0x03 &lt;&lt; ICE_AQ_LINK_TX_S)</div><div class='ctx'> #define ICE_AQ_LINK_TX_ACTIVE		0</div><div class='hunk'>@@ -1119,9 +1146,9 @@ struct ice_aqc_nvm {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Send to PF command (indirect 0x0801) id is only used by PF</div><div class='add'>+ * Send to PF command (indirect 0x0801) ID is only used by PF</div><div class='ctx'>  *</div><div class='del'>- * Send to VF command (indirect 0x0802) id is only used by PF</div><div class='add'>+ * Send to VF command (indirect 0x0802) ID is only used by PF</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> struct ice_aqc_pf_vf_msg {</div><div class='hunk'>@@ -1131,6 +1158,126 @@ struct ice_aqc_pf_vf_msg {</div><div class='ctx'> 	__le32 addr_low;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Get LLDP MIB (indirect 0x0A00)</div><div class='add'>+ * Note: This is also used by the LLDP MIB Change Event (0x0A01)</div><div class='add'>+ * as the format is the same.</div><div class='add'>+ */</div><div class='add'>+struct ice_aqc_lldp_get_mib {</div><div class='add'>+	u8 type;</div><div class='add'>+#define ICE_AQ_LLDP_MIB_TYPE_S			0</div><div class='add'>+#define ICE_AQ_LLDP_MIB_TYPE_M			(0x3 &lt;&lt; ICE_AQ_LLDP_MIB_TYPE_S)</div><div class='add'>+#define ICE_AQ_LLDP_MIB_LOCAL			0</div><div class='add'>+#define ICE_AQ_LLDP_MIB_REMOTE			1</div><div class='add'>+#define ICE_AQ_LLDP_MIB_LOCAL_AND_REMOTE	2</div><div class='add'>+#define ICE_AQ_LLDP_BRID_TYPE_S			2</div><div class='add'>+#define ICE_AQ_LLDP_BRID_TYPE_M			(0x3 &lt;&lt; ICE_AQ_LLDP_BRID_TYPE_S)</div><div class='add'>+#define ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID	0</div><div class='add'>+#define ICE_AQ_LLDP_BRID_TYPE_NON_TPMR		1</div><div class='add'>+/* Tx pause flags in the 0xA01 event use ICE_AQ_LLDP_TX_* */</div><div class='add'>+#define ICE_AQ_LLDP_TX_S			0x4</div><div class='add'>+#define ICE_AQ_LLDP_TX_M			(0x03 &lt;&lt; ICE_AQ_LLDP_TX_S)</div><div class='add'>+#define ICE_AQ_LLDP_TX_ACTIVE			0</div><div class='add'>+#define ICE_AQ_LLDP_TX_SUSPENDED		1</div><div class='add'>+#define ICE_AQ_LLDP_TX_FLUSHED			3</div><div class='add'>+/* The following bytes are reserved for the Get LLDP MIB command (0x0A00)</div><div class='add'>+ * and in the LLDP MIB Change Event (0x0A01). They are valid for the</div><div class='add'>+ * Get LLDP MIB (0x0A00) response only.</div><div class='add'>+ */</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	__le16 local_len;</div><div class='add'>+	__le16 remote_len;</div><div class='add'>+	u8 reserved2[2];</div><div class='add'>+	__le32 addr_high;</div><div class='add'>+	__le32 addr_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Configure LLDP MIB Change Event (direct 0x0A01) */</div><div class='add'>+/* For MIB Change Event use ice_aqc_lldp_get_mib structure above */</div><div class='add'>+struct ice_aqc_lldp_set_mib_change {</div><div class='add'>+	u8 command;</div><div class='add'>+#define ICE_AQ_LLDP_MIB_UPDATE_ENABLE		0x0</div><div class='add'>+#define ICE_AQ_LLDP_MIB_UPDATE_DIS		0x1</div><div class='add'>+	u8 reserved[15];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Stop LLDP (direct 0x0A05) */</div><div class='add'>+struct ice_aqc_lldp_stop {</div><div class='add'>+	u8 command;</div><div class='add'>+#define ICE_AQ_LLDP_AGENT_STATE_MASK	BIT(0)</div><div class='add'>+#define ICE_AQ_LLDP_AGENT_STOP		0x0</div><div class='add'>+#define ICE_AQ_LLDP_AGENT_SHUTDOWN	ICE_AQ_LLDP_AGENT_STATE_MASK</div><div class='add'>+#define ICE_AQ_LLDP_AGENT_PERSIST_DIS	BIT(1)</div><div class='add'>+	u8 reserved[15];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Start LLDP (direct 0x0A06) */</div><div class='add'>+struct ice_aqc_lldp_start {</div><div class='add'>+	u8 command;</div><div class='add'>+#define ICE_AQ_LLDP_AGENT_START		BIT(0)</div><div class='add'>+#define ICE_AQ_LLDP_AGENT_PERSIST_ENA	BIT(1)</div><div class='add'>+	u8 reserved[15];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Get CEE DCBX Oper Config (0x0A07)</div><div class='add'>+ * The command uses the generic descriptor struct and</div><div class='add'>+ * returns the struct below as an indirect response.</div><div class='add'>+ */</div><div class='add'>+struct ice_aqc_get_cee_dcb_cfg_resp {</div><div class='add'>+	u8 oper_num_tc;</div><div class='add'>+	u8 oper_prio_tc[4];</div><div class='add'>+	u8 oper_tc_bw[8];</div><div class='add'>+	u8 oper_pfc_en;</div><div class='add'>+	__le16 oper_app_prio;</div><div class='add'>+#define ICE_AQC_CEE_APP_FCOE_S		0</div><div class='add'>+#define ICE_AQC_CEE_APP_FCOE_M		(0x7 &lt;&lt; ICE_AQC_CEE_APP_FCOE_S)</div><div class='add'>+#define ICE_AQC_CEE_APP_ISCSI_S		3</div><div class='add'>+#define ICE_AQC_CEE_APP_ISCSI_M		(0x7 &lt;&lt; ICE_AQC_CEE_APP_ISCSI_S)</div><div class='add'>+#define ICE_AQC_CEE_APP_FIP_S		8</div><div class='add'>+#define ICE_AQC_CEE_APP_FIP_M		(0x7 &lt;&lt; ICE_AQC_CEE_APP_FIP_S)</div><div class='add'>+	__le32 tlv_status;</div><div class='add'>+#define ICE_AQC_CEE_PG_STATUS_S		0</div><div class='add'>+#define ICE_AQC_CEE_PG_STATUS_M		(0x7 &lt;&lt; ICE_AQC_CEE_PG_STATUS_S)</div><div class='add'>+#define ICE_AQC_CEE_PFC_STATUS_S	3</div><div class='add'>+#define ICE_AQC_CEE_PFC_STATUS_M	(0x7 &lt;&lt; ICE_AQC_CEE_PFC_STATUS_S)</div><div class='add'>+#define ICE_AQC_CEE_FCOE_STATUS_S	8</div><div class='add'>+#define ICE_AQC_CEE_FCOE_STATUS_M	(0x7 &lt;&lt; ICE_AQC_CEE_FCOE_STATUS_S)</div><div class='add'>+#define ICE_AQC_CEE_ISCSI_STATUS_S	11</div><div class='add'>+#define ICE_AQC_CEE_ISCSI_STATUS_M	(0x7 &lt;&lt; ICE_AQC_CEE_ISCSI_STATUS_S)</div><div class='add'>+#define ICE_AQC_CEE_FIP_STATUS_S	16</div><div class='add'>+#define ICE_AQC_CEE_FIP_STATUS_M	(0x7 &lt;&lt; ICE_AQC_CEE_FIP_STATUS_S)</div><div class='add'>+	u8 reserved[12];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Set Local LLDP MIB (indirect 0x0A08)</div><div class='add'>+ * Used to replace the local MIB of a given LLDP agent. e.g. DCBx</div><div class='add'>+ */</div><div class='add'>+struct ice_aqc_lldp_set_local_mib {</div><div class='add'>+	u8 type;</div><div class='add'>+#define SET_LOCAL_MIB_TYPE_DCBX_M		BIT(0)</div><div class='add'>+#define SET_LOCAL_MIB_TYPE_LOCAL_MIB		0</div><div class='add'>+#define SET_LOCAL_MIB_TYPE_CEE_M		BIT(1)</div><div class='add'>+#define SET_LOCAL_MIB_TYPE_CEE_WILLING		0</div><div class='add'>+#define SET_LOCAL_MIB_TYPE_CEE_NON_WILLING	SET_LOCAL_MIB_TYPE_CEE_M</div><div class='add'>+	u8 reserved0;</div><div class='add'>+	__le16 length;</div><div class='add'>+	u8 reserved1[4];</div><div class='add'>+	__le32 addr_high;</div><div class='add'>+	__le32 addr_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Stop/Start LLDP Agent (direct 0x0A09)</div><div class='add'>+ * Used for stopping/starting specific LLDP agent. e.g. DCBx.</div><div class='add'>+ * The same structure is used for the response, with the command field</div><div class='add'>+ * being used as the status field.</div><div class='add'>+ */</div><div class='add'>+struct ice_aqc_lldp_stop_start_specific_agent {</div><div class='add'>+	u8 command;</div><div class='add'>+#define ICE_AQC_START_STOP_AGENT_M		BIT(0)</div><div class='add'>+#define ICE_AQC_START_STOP_AGENT_STOP_DCBX	0</div><div class='add'>+#define ICE_AQC_START_STOP_AGENT_START_DCBX	ICE_AQC_START_STOP_AGENT_M</div><div class='add'>+	u8 reserved[15];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Get/Set RSS key (indirect 0x0B04/0x0B02) */</div><div class='ctx'> struct ice_aqc_get_set_rss_key {</div><div class='ctx'> #define ICE_AQC_GSET_RSS_KEY_VSI_VALID	BIT(15)</div><div class='hunk'>@@ -1144,6 +1291,9 @@ struct ice_aqc_get_set_rss_key {</div><div class='ctx'> </div><div class='ctx'> #define ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE	0x28</div><div class='ctx'> #define ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE	0xC</div><div class='add'>+#define ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE \</div><div class='add'>+				(ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE + \</div><div class='add'>+				 ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE)</div><div class='ctx'> </div><div class='ctx'> struct ice_aqc_get_set_rss_keys {</div><div class='ctx'> 	u8 standard_rss_key[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE];</div><div class='hunk'>@@ -1185,7 +1335,7 @@ struct ice_aqc_get_set_rss_lut {</div><div class='ctx'> 	__le32 addr_low;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Add TX LAN Queues (indirect 0x0C30) */</div><div class='add'>+/* Add Tx LAN Queues (indirect 0x0C30) */</div><div class='ctx'> struct ice_aqc_add_txqs {</div><div class='ctx'> 	u8 num_qgrps;</div><div class='ctx'> 	u8 reserved[3];</div><div class='hunk'>@@ -1194,7 +1344,7 @@ struct ice_aqc_add_txqs {</div><div class='ctx'> 	__le32 addr_low;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* This is the descriptor of each queue entry for the Add TX LAN Queues</div><div class='add'>+/* This is the descriptor of each queue entry for the Add Tx LAN Queues</div><div class='ctx'>  * command (0x0C30). Only used within struct ice_aqc_add_tx_qgrp.</div><div class='ctx'>  */</div><div class='ctx'> struct ice_aqc_add_txqs_perq {</div><div class='hunk'>@@ -1206,7 +1356,7 @@ struct ice_aqc_add_txqs_perq {</div><div class='ctx'> 	struct ice_aqc_txsched_elem info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The format of the command buffer for Add TX LAN Queues (0x0C30)</div><div class='add'>+/* The format of the command buffer for Add Tx LAN Queues (0x0C30)</div><div class='ctx'>  * is an array of the following structs. Please note that the length of</div><div class='ctx'>  * each struct ice_aqc_add_tx_qgrp is variable due</div><div class='ctx'>  * to the variable number of queues in each group!</div><div class='hunk'>@@ -1218,7 +1368,7 @@ struct ice_aqc_add_tx_qgrp {</div><div class='ctx'> 	struct ice_aqc_add_txqs_perq txqs[1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Disable TX LAN Queues (indirect 0x0C31) */</div><div class='add'>+/* Disable Tx LAN Queues (indirect 0x0C31) */</div><div class='ctx'> struct ice_aqc_dis_txqs {</div><div class='ctx'> 	u8 cmd_type;</div><div class='ctx'> #define ICE_AQC_Q_DIS_CMD_S		0</div><div class='hunk'>@@ -1240,7 +1390,7 @@ struct ice_aqc_dis_txqs {</div><div class='ctx'> 	__le32 addr_low;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The buffer for Disable TX LAN Queues (indirect 0x0C31)</div><div class='add'>+/* The buffer for Disable Tx LAN Queues (indirect 0x0C31)</div><div class='ctx'>  * contains the following structures, arrayed one after the</div><div class='ctx'>  * other.</div><div class='ctx'>  * Note: Since the q_id is 16 bits wide, if the</div><div class='hunk'>@@ -1387,8 +1537,15 @@ struct ice_aq_desc {</div><div class='ctx'> 		struct ice_aqc_get_topo get_topo;</div><div class='ctx'> 		struct ice_aqc_sched_elem_cmd sched_elem_cmd;</div><div class='ctx'> 		struct ice_aqc_query_txsched_res query_sched_res;</div><div class='add'>+		struct ice_aqc_query_port_ets port_ets;</div><div class='ctx'> 		struct ice_aqc_nvm nvm;</div><div class='ctx'> 		struct ice_aqc_pf_vf_msg virt;</div><div class='add'>+		struct ice_aqc_lldp_get_mib lldp_get_mib;</div><div class='add'>+		struct ice_aqc_lldp_set_mib_change lldp_set_event;</div><div class='add'>+		struct ice_aqc_lldp_stop lldp_stop;</div><div class='add'>+		struct ice_aqc_lldp_start lldp_start;</div><div class='add'>+		struct ice_aqc_lldp_set_local_mib lldp_set_mib;</div><div class='add'>+		struct ice_aqc_lldp_stop_start_specific_agent lldp_agent_ctrl;</div><div class='ctx'> 		struct ice_aqc_get_set_rss_lut get_set_rss_lut;</div><div class='ctx'> 		struct ice_aqc_get_set_rss_key get_set_rss_key;</div><div class='ctx'> 		struct ice_aqc_add_txqs add_txqs;</div><div class='hunk'>@@ -1421,6 +1578,8 @@ struct ice_aq_desc {</div><div class='ctx'> /* error codes */</div><div class='ctx'> enum ice_aq_err {</div><div class='ctx'> 	ICE_AQ_RC_OK		= 0,  /* Success */</div><div class='add'>+	ICE_AQ_RC_EPERM		= 1,  /* Operation not permitted */</div><div class='add'>+	ICE_AQ_RC_ENOENT	= 2,  /* No such element */</div><div class='ctx'> 	ICE_AQ_RC_ENOMEM	= 9,  /* Out of memory */</div><div class='ctx'> 	ICE_AQ_RC_EBUSY		= 12, /* Device or resource busy */</div><div class='ctx'> 	ICE_AQ_RC_EEXIST	= 13, /* Object already exists */</div><div class='hunk'>@@ -1473,6 +1632,7 @@ enum ice_adminq_opc {</div><div class='ctx'> 	ice_aqc_opc_get_sched_elems			= 0x0404,</div><div class='ctx'> 	ice_aqc_opc_suspend_sched_elems			= 0x0409,</div><div class='ctx'> 	ice_aqc_opc_resume_sched_elems			= 0x040A,</div><div class='add'>+	ice_aqc_opc_query_port_ets			= 0x040E,</div><div class='ctx'> 	ice_aqc_opc_delete_sched_elems			= 0x040F,</div><div class='ctx'> 	ice_aqc_opc_query_sched_res			= 0x0412,</div><div class='ctx'> </div><div class='hunk'>@@ -1490,6 +1650,14 @@ enum ice_adminq_opc {</div><div class='ctx'> 	/* PF/VF mailbox commands */</div><div class='ctx'> 	ice_mbx_opc_send_msg_to_pf			= 0x0801,</div><div class='ctx'> 	ice_mbx_opc_send_msg_to_vf			= 0x0802,</div><div class='add'>+	/* LLDP commands */</div><div class='add'>+	ice_aqc_opc_lldp_get_mib			= 0x0A00,</div><div class='add'>+	ice_aqc_opc_lldp_set_mib_change			= 0x0A01,</div><div class='add'>+	ice_aqc_opc_lldp_stop				= 0x0A05,</div><div class='add'>+	ice_aqc_opc_lldp_start				= 0x0A06,</div><div class='add'>+	ice_aqc_opc_get_cee_dcb_cfg			= 0x0A07,</div><div class='add'>+	ice_aqc_opc_lldp_set_local_mib			= 0x0A08,</div><div class='add'>+	ice_aqc_opc_lldp_stop_start_specific_agent	= 0x0A09,</div><div class='ctx'> </div><div class='ctx'> 	/* RSS commands */</div><div class='ctx'> 	ice_aqc_opc_set_rss_key				= 0x0B02,</div><div class='hunk'>@@ -1497,7 +1665,7 @@ enum ice_adminq_opc {</div><div class='ctx'> 	ice_aqc_opc_get_rss_key				= 0x0B04,</div><div class='ctx'> 	ice_aqc_opc_get_rss_lut				= 0x0B05,</div><div class='ctx'> </div><div class='del'>-	/* TX queue handling commands/events */</div><div class='add'>+	/* Tx queue handling commands/events */</div><div class='ctx'> 	ice_aqc_opc_add_txqs				= 0x0C30,</div><div class='ctx'> 	ice_aqc_opc_dis_txqs				= 0x0C31,</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c<br/>index 63f003441300..da7878529929 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_common.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * @hw: pointer to the HW structure</div><div class='ctx'>  *</div><div class='ctx'>  * This function sets the MAC type of the adapter based on the</div><div class='del'>- * vendor ID and device ID stored in the hw structure.</div><div class='add'>+ * vendor ID and device ID stored in the HW structure.</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status ice_set_mac_type(struct ice_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -77,7 +77,7 @@ enum ice_status ice_clear_pf_cfg(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_manage_mac_read - manage MAC address read command</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @buf: a virtual buffer to hold the manage MAC read response</div><div class='ctx'>  * @buf_size: Size of the virtual buffer</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -262,7 +262,7 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi)</div><div class='ctx'>  *</div><div class='ctx'>  * Get Link Status (0x607). Returns the link status of the adapter.</div><div class='ctx'>  */</div><div class='del'>-static enum ice_status</div><div class='add'>+enum ice_status</div><div class='ctx'> ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,</div><div class='ctx'> 		     struct ice_link_status *link, struct ice_sq_cd *cd)</div><div class='ctx'> {</div><div class='hunk'>@@ -331,7 +331,7 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,</div><div class='ctx'> 	/* flag cleared so calling functions don't call AQ again */</div><div class='ctx'> 	pi-&gt;phy.get_link_info = false;</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -358,22 +358,22 @@ static void ice_init_flex_flags(struct ice_hw *hw, enum ice_rxdid prof_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	case ICE_RXDID_FLEX_NIC:</div><div class='ctx'> 	case ICE_RXDID_FLEX_NIC_2:</div><div class='del'>-		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_RXFLG_PKT_FRG,</div><div class='del'>-				   ICE_RXFLG_UDP_GRE, ICE_RXFLG_PKT_DSI,</div><div class='del'>-				   ICE_RXFLG_FIN, idx++);</div><div class='add'>+		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_PKT_FRG,</div><div class='add'>+				   ICE_FLG_UDP_GRE, ICE_FLG_PKT_DSI,</div><div class='add'>+				   ICE_FLG_FIN, idx++);</div><div class='ctx'> 		/* flex flag 1 is not used for flexi-flag programming, skipping</div><div class='ctx'> 		 * these four FLG64 bits.</div><div class='ctx'> 		 */</div><div class='del'>-		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_RXFLG_SYN, ICE_RXFLG_RST,</div><div class='del'>-				   ICE_RXFLG_PKT_DSI, ICE_RXFLG_PKT_DSI, idx++);</div><div class='del'>-		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_RXFLG_PKT_DSI,</div><div class='del'>-				   ICE_RXFLG_PKT_DSI, ICE_RXFLG_EVLAN_x8100,</div><div class='del'>-				   ICE_RXFLG_EVLAN_x9100, idx++);</div><div class='del'>-		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_RXFLG_VLAN_x8100,</div><div class='del'>-				   ICE_RXFLG_TNL_VLAN, ICE_RXFLG_TNL_MAC,</div><div class='del'>-				   ICE_RXFLG_TNL0, idx++);</div><div class='del'>-		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_RXFLG_TNL1, ICE_RXFLG_TNL2,</div><div class='del'>-				   ICE_RXFLG_PKT_DSI, ICE_RXFLG_PKT_DSI, idx);</div><div class='add'>+		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_SYN, ICE_FLG_RST,</div><div class='add'>+				   ICE_FLG_PKT_DSI, ICE_FLG_PKT_DSI, idx++);</div><div class='add'>+		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_PKT_DSI,</div><div class='add'>+				   ICE_FLG_PKT_DSI, ICE_FLG_EVLAN_x8100,</div><div class='add'>+				   ICE_FLG_EVLAN_x9100, idx++);</div><div class='add'>+		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_VLAN_x8100,</div><div class='add'>+				   ICE_FLG_TNL_VLAN, ICE_FLG_TNL_MAC,</div><div class='add'>+				   ICE_FLG_TNL0, idx++);</div><div class='add'>+		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_TNL1, ICE_FLG_TNL2,</div><div class='add'>+				   ICE_FLG_PKT_DSI, ICE_FLG_PKT_DSI, idx);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -418,7 +418,7 @@ static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_init_fltr_mgmt_struct - initializes filter management list and locks</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -438,7 +438,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_cleanup_fltr_mgmt_struct - cleanup filter management list and locks</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  */</div><div class='ctx'> static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -477,7 +477,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_cfg_fw_log - configure FW logging</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @enable: enable certain FW logging events if true, disable all if false</div><div class='ctx'>  *</div><div class='ctx'>  * This function enables/disables the FW logging via Rx CQ events and a UART</div><div class='hunk'>@@ -626,7 +626,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_output_fw_log</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @desc: pointer to the AQ message descriptor</div><div class='ctx'>  * @buf: pointer to the buffer accompanying the AQ message</div><div class='ctx'>  *</div><div class='hunk'>@@ -642,12 +642,12 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_get_itr_intrl_gran - determine int/intrl granularity</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Determines the itr/intrl granularities based on the maximum aggregate</div><div class='ctx'>  * bandwidth according to the device's configuration during power-on.</div><div class='ctx'>  */</div><div class='del'>-static enum ice_status ice_get_itr_intrl_gran(struct ice_hw *hw)</div><div class='add'>+static void ice_get_itr_intrl_gran(struct ice_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u8 max_agg_bw = (rd32(hw, GL_PWR_MODE_CTL) &amp;</div><div class='ctx'> 			 GL_PWR_MODE_CTL_CAR_MAX_BW_M) &gt;&gt;</div><div class='hunk'>@@ -664,13 +664,7 @@ static enum ice_status ice_get_itr_intrl_gran(struct ice_hw *hw)</div><div class='ctx'> 		hw-&gt;itr_gran = ICE_ITR_GRAN_MAX_25;</div><div class='ctx'> 		hw-&gt;intrl_gran = ICE_INTRL_GRAN_MAX_25;</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		ice_debug(hw, ICE_DBG_INIT,</div><div class='del'>-			  "Failed to determine itr/intrl granularity\n");</div><div class='del'>-		return ICE_ERR_CFG;</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'> /**</div><div class='hunk'>@@ -697,9 +691,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw)</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	status = ice_get_itr_intrl_gran(hw);</div><div class='del'>-	if (status)</div><div class='del'>-		return status;</div><div class='add'>+	ice_get_itr_intrl_gran(hw);</div><div class='ctx'> </div><div class='ctx'> 	status = ice_init_all_ctrlq(hw);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -731,7 +723,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw)</div><div class='ctx'> 		goto err_unroll_cqinit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set the back pointer to hw */</div><div class='add'>+	/* set the back pointer to HW */</div><div class='ctx'> 	hw-&gt;port_info-&gt;hw = hw;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize port_info struct with switch configuration data */</div><div class='hunk'>@@ -988,7 +980,7 @@ enum ice_status ice_reset(struct ice_hw *hw, enum ice_reset_req req)</div><div class='ctx'>  * @ice_rxq_ctx: pointer to the rxq context</div><div class='ctx'>  * @rxq_index: the index of the Rx queue</div><div class='ctx'>  *</div><div class='del'>- * Copies rxq context from dense structure to hw register space</div><div class='add'>+ * Copies rxq context from dense structure to HW register space</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)</div><div class='hunk'>@@ -1001,7 +993,7 @@ ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)</div><div class='ctx'> 	if (rxq_index &gt; QRX_CTRL_MAX_INDEX)</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='ctx'> </div><div class='del'>-	/* Copy each dword separately to hw */</div><div class='add'>+	/* Copy each dword separately to HW */</div><div class='ctx'> 	for (i = 0; i &lt; ICE_RXQ_CTX_SIZE_DWORDS; i++) {</div><div class='ctx'> 		wr32(hw, QRX_CONTEXT(i, rxq_index),</div><div class='ctx'> 		     *((u32 *)(ice_rxq_ctx + (i * sizeof(u32)))));</div><div class='hunk'>@@ -1045,7 +1037,7 @@ static const struct ice_ctx_ele ice_rlan_ctx_info[] = {</div><div class='ctx'>  * @rxq_index: the index of the Rx queue</div><div class='ctx'>  *</div><div class='ctx'>  * Converts rxq context from sparse to dense structure and then writes</div><div class='del'>- * it to hw register space</div><div class='add'>+ * it to HW register space</div><div class='ctx'>  */</div><div class='ctx'> enum ice_status</div><div class='ctx'> ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,</div><div class='hunk'>@@ -1100,8 +1092,9 @@ const struct ice_ctx_ele ice_tlan_ctx_info[] = {</div><div class='ctx'>  *</div><div class='ctx'>  * Dumps debug log about control command with descriptor contents.</div><div class='ctx'>  */</div><div class='del'>-void ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc,</div><div class='del'>-		  void *buf, u16 buf_len)</div><div class='add'>+void</div><div class='add'>+ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf,</div><div class='add'>+	     u16 buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_aq_desc *cq_desc = (struct ice_aq_desc *)desc;</div><div class='ctx'> 	u16 len;</div><div class='hunk'>@@ -1143,7 +1136,7 @@ void ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_send_cmd - send FW Admin Queue command to FW Admin Queue</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @desc: descriptor describing the command</div><div class='ctx'>  * @buf: buffer to use for indirect commands (NULL for direct commands)</div><div class='ctx'>  * @buf_size: size of buffer for indirect commands (0 for direct commands)</div><div class='hunk'>@@ -1160,7 +1153,7 @@ ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_get_fw_ver</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='ctx'>  * Get the firmware version (0x0001) from the admin queue commands</div><div class='hunk'>@@ -1194,7 +1187,7 @@ enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_q_shutdown</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @unloading: is the driver unloading itself</div><div class='ctx'>  *</div><div class='ctx'>  * Tell the Firmware that we're shutting down the AdminQ and whether</div><div class='hunk'>@@ -1217,8 +1210,8 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_req_res</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='del'>- * @res: resource id</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @res: resource ID</div><div class='ctx'>  * @access: access type</div><div class='ctx'>  * @sdp_number: resource number</div><div class='ctx'>  * @timeout: the maximum time in ms that the driver may hold the resource</div><div class='hunk'>@@ -1303,8 +1296,8 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_release_res</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='del'>- * @res: resource id</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @res: resource ID</div><div class='ctx'>  * @sdp_number: resource number</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='hunk'>@@ -1330,7 +1323,7 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number,</div><div class='ctx'> /**</div><div class='ctx'>  * ice_acquire_res</div><div class='ctx'>  * @hw: pointer to the HW structure</div><div class='del'>- * @res: resource id</div><div class='add'>+ * @res: resource ID</div><div class='ctx'>  * @access: access type (read or write)</div><div class='ctx'>  * @timeout: timeout in milliseconds</div><div class='ctx'>  *</div><div class='hunk'>@@ -1392,7 +1385,7 @@ ice_acquire_res_exit:</div><div class='ctx'> /**</div><div class='ctx'>  * ice_release_res</div><div class='ctx'>  * @hw: pointer to the HW structure</div><div class='del'>- * @res: resource id</div><div class='add'>+ * @res: resource ID</div><div class='ctx'>  *</div><div class='ctx'>  * This function will release a resource using the proper Admin Command.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1404,7 +1397,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)</div><div class='ctx'> 	status = ice_aq_release_res(hw, res, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* there are some rare cases when trying to release the resource</div><div class='del'>-	 * results in an admin Q timeout, so handle them correctly</div><div class='add'>+	 * results in an admin queue timeout, so handle them correctly</div><div class='ctx'> 	 */</div><div class='ctx'> 	while ((status == ICE_ERR_AQ_TIMEOUT) &amp;&amp;</div><div class='ctx'> 	       (total_delay &lt; hw-&gt;adminq.sq_cmd_timeout)) {</div><div class='hunk'>@@ -1415,13 +1408,15 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_get_guar_num_vsi - determine number of guar VSI for a PF</div><div class='del'>- * @hw: pointer to the hw structure</div><div class='add'>+ * ice_get_num_per_func - determine number of resources per PF</div><div class='add'>+ * @hw: pointer to the HW structure</div><div class='add'>+ * @max: value to be evenly split between each PF</div><div class='ctx'>  *</div><div class='ctx'>  * Determine the number of valid functions by going through the bitmap returned</div><div class='del'>- * from parsing capabilities and use this to calculate the number of VSI per PF.</div><div class='add'>+ * from parsing capabilities and use this to calculate the number of resources</div><div class='add'>+ * per PF based on the max value passed in.</div><div class='ctx'>  */</div><div class='del'>-static u32 ice_get_guar_num_vsi(struct ice_hw *hw)</div><div class='add'>+static u32 ice_get_num_per_func(struct ice_hw *hw, u32 max)</div><div class='ctx'> {</div><div class='ctx'> 	u8 funcs;</div><div class='ctx'> </div><div class='hunk'>@@ -1432,12 +1427,12 @@ static u32 ice_get_guar_num_vsi(struct ice_hw *hw)</div><div class='ctx'> 	if (!funcs)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return ICE_MAX_VSI / funcs;</div><div class='add'>+	return max / funcs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_parse_caps - parse function/device capabilities</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @buf: pointer to a buffer containing function/device capability records</div><div class='ctx'>  * @cap_count: number of capability records in the list</div><div class='ctx'>  * @opc: type of capabilities list to parse</div><div class='hunk'>@@ -1512,7 +1507,8 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,</div><div class='ctx'> 					  "HW caps: Dev.VSI cnt = %d\n",</div><div class='ctx'> 					  dev_p-&gt;num_vsi_allocd_to_host);</div><div class='ctx'> 			} else if (func_p) {</div><div class='del'>-				func_p-&gt;guar_num_vsi = ice_get_guar_num_vsi(hw);</div><div class='add'>+				func_p-&gt;guar_num_vsi =</div><div class='add'>+					ice_get_num_per_func(hw, ICE_MAX_VSI);</div><div class='ctx'> 				ice_debug(hw, ICE_DBG_INIT,</div><div class='ctx'> 					  "HW caps: Func.VSI cnt = %d\n",</div><div class='ctx'> 					  number);</div><div class='hunk'>@@ -1578,7 +1574,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_discover_caps - query function/device capabilities</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @buf: a virtual buffer to hold the capabilities</div><div class='ctx'>  * @buf_size: Size of the virtual buffer</div><div class='ctx'>  * @cap_count: cap count needed if AQ err==ENOMEM</div><div class='hunk'>@@ -1617,8 +1613,8 @@ ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u32 *cap_count,</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @opc: capabilities type to discover - pass in the command opcode</div><div class='ctx'>  */</div><div class='del'>-static enum ice_status ice_discover_caps(struct ice_hw *hw,</div><div class='del'>-					 enum ice_adminq_opc opc)</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_discover_caps(struct ice_hw *hw, enum ice_adminq_opc opc)</div><div class='ctx'> {</div><div class='ctx'> 	enum ice_status status;</div><div class='ctx'> 	u32 cap_count;</div><div class='hunk'>@@ -1677,7 +1673,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_manage_mac_write - manage MAC address write command</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @mac_addr: MAC address to be written as LAA/LAA+WoL/Port address</div><div class='ctx'>  * @flags: flags to control write behavior</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -1705,7 +1701,7 @@ ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_clear_pxe_mode</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Tell the firmware that the driver is taking over from PXE (0x0110).</div><div class='ctx'>  */</div><div class='hunk'>@@ -1721,7 +1717,7 @@ static enum ice_status ice_aq_clear_pxe_mode(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_clear_pxe_mode - clear pxe operations mode</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Make sure all PXE mode settings are cleared, including things</div><div class='ctx'>  * like descriptor fetch/write-back mode.</div><div class='hunk'>@@ -1737,10 +1733,10 @@ void ice_clear_pxe_mode(struct ice_hw *hw)</div><div class='ctx'>  * @phy_type_low: lower part of phy_type</div><div class='ctx'>  * @phy_type_high: higher part of phy_type</div><div class='ctx'>  *</div><div class='del'>- * This helper function will convert an entry in phy type structure</div><div class='add'>+ * This helper function will convert an entry in PHY type structure</div><div class='ctx'>  * [phy_type_low, phy_type_high] to its corresponding link speed.</div><div class='ctx'>  * Note: In the structure of [phy_type_low, phy_type_high], there should</div><div class='del'>- * be one bit set, as this function will convert one phy type to its</div><div class='add'>+ * be one bit set, as this function will convert one PHY type to its</div><div class='ctx'>  * speed.</div><div class='ctx'>  * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned</div><div class='ctx'>  * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned</div><div class='hunk'>@@ -1884,10 +1880,10 @@ void</div><div class='ctx'> ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high,</div><div class='ctx'> 		    u16 link_speeds_bitmap)</div><div class='ctx'> {</div><div class='del'>-	u16 speed = ICE_AQ_LINK_SPEED_UNKNOWN;</div><div class='ctx'> 	u64 pt_high;</div><div class='ctx'> 	u64 pt_low;</div><div class='ctx'> 	int index;</div><div class='add'>+	u16 speed;</div><div class='ctx'> </div><div class='ctx'> 	/* We first check with low part of phy_type */</div><div class='ctx'> 	for (index = 0; index &lt;= ICE_PHY_TYPE_LOW_MAX_INDEX; index++) {</div><div class='hunk'>@@ -1910,7 +1906,7 @@ ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_set_phy_cfg</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @lport: logical port number</div><div class='ctx'>  * @cfg: structure with PHY configuration data to be set</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -1929,6 +1925,15 @@ ice_aq_set_phy_cfg(struct ice_hw *hw, u8 lport,</div><div class='ctx'> 	if (!cfg)</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='ctx'> </div><div class='add'>+	/* Ensure that only valid bits of cfg-&gt;caps can be turned on. */</div><div class='add'>+	if (cfg-&gt;caps &amp; ~ICE_AQ_PHY_ENA_VALID_MASK) {</div><div class='add'>+		ice_debug(hw, ICE_DBG_PHY,</div><div class='add'>+			  "Invalid bit is set in ice_aqc_set_phy_cfg_data-&gt;caps : 0x%x\n",</div><div class='add'>+			  cfg-&gt;caps);</div><div class='add'>+</div><div class='add'>+		cfg-&gt;caps &amp;= ICE_AQ_PHY_ENA_VALID_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_set_phy_cfg);</div><div class='ctx'> 	desc.params.set_phy.lport_num = lport;</div><div class='ctx'> 	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);</div><div class='hunk'>@@ -2016,7 +2021,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)</div><div class='ctx'> 	if (!pcaps)</div><div class='ctx'> 		return ICE_ERR_NO_MEMORY;</div><div class='ctx'> </div><div class='del'>-	/* Get the current phy config */</div><div class='add'>+	/* Get the current PHY config */</div><div class='ctx'> 	status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,</div><div class='ctx'> 				     NULL);</div><div class='ctx'> 	if (status) {</div><div class='hunk'>@@ -2027,8 +2032,10 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)</div><div class='ctx'> 	/* clear the old pause settings */</div><div class='ctx'> 	cfg.caps = pcaps-&gt;caps &amp; ~(ICE_AQC_PHY_EN_TX_LINK_PAUSE |</div><div class='ctx'> 				   ICE_AQC_PHY_EN_RX_LINK_PAUSE);</div><div class='add'>+</div><div class='ctx'> 	/* set the new capabilities */</div><div class='ctx'> 	cfg.caps |= pause_mask;</div><div class='add'>+</div><div class='ctx'> 	/* If the capabilities have changed, then set the new config */</div><div class='ctx'> 	if (cfg.caps != pcaps-&gt;caps) {</div><div class='ctx'> 		int retry_count, retry_max = 10;</div><div class='hunk'>@@ -2136,6 +2143,32 @@ ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_aq_set_event_mask</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @port_num: port number of the physical function</div><div class='add'>+ * @mask: event mask to be set</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Set event mask (0x0613)</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask,</div><div class='add'>+		      struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_set_event_mask *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.set_event_mask;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_set_event_mask);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;lport_num = port_num;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;event_mask = cpu_to_le16(mask);</div><div class='add'>+	return ice_aq_send_cmd(hw, &amp;desc, NULL, 0, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_aq_set_port_id_led</div><div class='ctx'>  * @pi: pointer to the port information</div><div class='ctx'>  * @is_orig_mode: is this LED set to original mode (by the net-list)</div><div class='hunk'>@@ -2297,7 +2330,7 @@ ice_aq_set_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __ice_aq_get_set_rss_key</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_id: VSI FW index</div><div class='ctx'>  * @key: pointer to key info struct</div><div class='ctx'>  * @set: set true to set the key, false to get the key</div><div class='hunk'>@@ -2332,7 +2365,7 @@ ice_status __ice_aq_get_set_rss_key(struct ice_hw *hw, u16 vsi_id,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_get_rss_key</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @key: pointer to key info struct</div><div class='ctx'>  *</div><div class='hunk'>@@ -2351,7 +2384,7 @@ ice_aq_get_rss_key(struct ice_hw *hw, u16 vsi_handle,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_set_rss_key</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @keys: pointer to key info struct</div><div class='ctx'>  *</div><div class='hunk'>@@ -2436,7 +2469,7 @@ ice_aq_add_lan_txq(struct ice_hw *hw, u8 num_qgrps,</div><div class='ctx'>  * @num_qgrps: number of groups in the list</div><div class='ctx'>  * @qg_list: the list of groups to disable</div><div class='ctx'>  * @buf_size: the total size of the qg_list buffer in bytes</div><div class='del'>- * @rst_src: if called due to reset, specifies the RST source</div><div class='add'>+ * @rst_src: if called due to reset, specifies the reset source</div><div class='ctx'>  * @vmvf_num: the relative VM or VF number that is undergoing the reset</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='hunk'>@@ -2476,7 +2509,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_VF_RESET:</div><div class='ctx'> 		cmd-&gt;cmd_type = ICE_AQC_Q_DIS_CMD_VF_RESET;</div><div class='del'>-		/* In this case, FW expects vmvf_num to be absolute VF id */</div><div class='add'>+		/* In this case, FW expects vmvf_num to be absolute VF ID */</div><div class='ctx'> 		cmd-&gt;vmvf_and_timeout |=</div><div class='ctx'> 			cpu_to_le16((vmvf_num + hw-&gt;func_caps.vf_base_id) &amp;</div><div class='ctx'> 				    ICE_AQC_Q_DIS_VMVF_NUM_M);</div><div class='hunk'>@@ -2534,8 +2567,8 @@ do_aq:</div><div class='ctx'>  * @dest_ctx: the context to be written to</div><div class='ctx'>  * @ce_info:  a description of the struct to be filled</div><div class='ctx'>  */</div><div class='del'>-static void ice_write_byte(u8 *src_ctx, u8 *dest_ctx,</div><div class='del'>-			   const struct ice_ctx_ele *ce_info)</div><div class='add'>+static void</div><div class='add'>+ice_write_byte(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)</div><div class='ctx'> {</div><div class='ctx'> 	u8 src_byte, dest_byte, mask;</div><div class='ctx'> 	u8 *from, *dest;</div><div class='hunk'>@@ -2573,8 +2606,8 @@ static void ice_write_byte(u8 *src_ctx, u8 *dest_ctx,</div><div class='ctx'>  * @dest_ctx: the context to be written to</div><div class='ctx'>  * @ce_info:  a description of the struct to be filled</div><div class='ctx'>  */</div><div class='del'>-static void ice_write_word(u8 *src_ctx, u8 *dest_ctx,</div><div class='del'>-			   const struct ice_ctx_ele *ce_info)</div><div class='add'>+static void</div><div class='add'>+ice_write_word(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)</div><div class='ctx'> {</div><div class='ctx'> 	u16 src_word, mask;</div><div class='ctx'> 	__le16 dest_word;</div><div class='hunk'>@@ -2616,8 +2649,8 @@ static void ice_write_word(u8 *src_ctx, u8 *dest_ctx,</div><div class='ctx'>  * @dest_ctx: the context to be written to</div><div class='ctx'>  * @ce_info:  a description of the struct to be filled</div><div class='ctx'>  */</div><div class='del'>-static void ice_write_dword(u8 *src_ctx, u8 *dest_ctx,</div><div class='del'>-			    const struct ice_ctx_ele *ce_info)</div><div class='add'>+static void</div><div class='add'>+ice_write_dword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)</div><div class='ctx'> {</div><div class='ctx'> 	u32 src_dword, mask;</div><div class='ctx'> 	__le32 dest_dword;</div><div class='hunk'>@@ -2667,8 +2700,8 @@ static void ice_write_dword(u8 *src_ctx, u8 *dest_ctx,</div><div class='ctx'>  * @dest_ctx: the context to be written to</div><div class='ctx'>  * @ce_info:  a description of the struct to be filled</div><div class='ctx'>  */</div><div class='del'>-static void ice_write_qword(u8 *src_ctx, u8 *dest_ctx,</div><div class='del'>-			    const struct ice_ctx_ele *ce_info)</div><div class='add'>+static void</div><div class='add'>+ice_write_qword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)</div><div class='ctx'> {</div><div class='ctx'> 	u64 src_qword, mask;</div><div class='ctx'> 	__le64 dest_qword;</div><div class='hunk'>@@ -2750,24 +2783,50 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_get_lan_q_ctx - get the LAN queue context for the given VSI and TC</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @vsi_handle: software VSI handle</div><div class='add'>+ * @tc: TC number</div><div class='add'>+ * @q_handle: software queue handle</div><div class='add'>+ */</div><div class='add'>+static struct ice_q_ctx *</div><div class='add'>+ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle)</div><div class='add'>+{</div><div class='add'>+	struct ice_vsi_ctx *vsi;</div><div class='add'>+	struct ice_q_ctx *q_ctx;</div><div class='add'>+</div><div class='add'>+	vsi = ice_get_vsi_ctx(hw, vsi_handle);</div><div class='add'>+	if (!vsi)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (q_handle &gt;= vsi-&gt;num_lan_q_entries[tc])</div><div class='add'>+		return NULL;</div><div class='add'>+	if (!vsi-&gt;lan_q_ctx[tc])</div><div class='add'>+		return NULL;</div><div class='add'>+	q_ctx = vsi-&gt;lan_q_ctx[tc];</div><div class='add'>+	return &amp;q_ctx[q_handle];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_ena_vsi_txq</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='del'>- * @tc: tc number</div><div class='add'>+ * @tc: TC number</div><div class='add'>+ * @q_handle: software queue handle</div><div class='ctx'>  * @num_qgrps: Number of added queue groups</div><div class='ctx'>  * @buf: list of queue groups to be added</div><div class='ctx'>  * @buf_size: size of buffer for indirect command</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='del'>- * This function adds one lan q</div><div class='add'>+ * This function adds one LAN queue</div><div class='ctx'>  */</div><div class='ctx'> enum ice_status</div><div class='del'>-ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,</div><div class='del'>-		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,</div><div class='add'>+ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,</div><div class='add'>+		u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,</div><div class='ctx'> 		struct ice_sq_cd *cd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_aqc_txsched_elem_data node = { 0 };</div><div class='ctx'> 	struct ice_sched_node *parent;</div><div class='add'>+	struct ice_q_ctx *q_ctx;</div><div class='ctx'> 	enum ice_status status;</div><div class='ctx'> 	struct ice_hw *hw;</div><div class='ctx'> </div><div class='hunk'>@@ -2784,6 +2843,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pi-&gt;sched_lock);</div><div class='ctx'> </div><div class='add'>+	q_ctx = ice_get_lan_q_ctx(hw, vsi_handle, tc, q_handle);</div><div class='add'>+	if (!q_ctx) {</div><div class='add'>+		ice_debug(hw, ICE_DBG_SCHED, "Enaq: invalid queue handle %d\n",</div><div class='add'>+			  q_handle);</div><div class='add'>+		status = ICE_ERR_PARAM;</div><div class='add'>+		goto ena_txq_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* find a parent node */</div><div class='ctx'> 	parent = ice_sched_get_free_qparent(pi, vsi_handle, tc,</div><div class='ctx'> 					    ICE_SCHED_NODE_OWNER_LAN);</div><div class='hunk'>@@ -2803,14 +2870,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,</div><div class='ctx'> 	 * Bit 5-6.</div><div class='ctx'> 	 * - Bit 7 is reserved.</div><div class='ctx'> 	 * Without setting the generic section as valid in valid_sections, the</div><div class='del'>-	 * Admin Q command will fail with error code ICE_AQ_RC_EINVAL.</div><div class='add'>+	 * Admin queue command will fail with error code ICE_AQ_RC_EINVAL.</div><div class='ctx'> 	 */</div><div class='ctx'> 	buf-&gt;txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC;</div><div class='ctx'> </div><div class='del'>-	/* add the lan q */</div><div class='add'>+	/* add the LAN queue */</div><div class='ctx'> 	status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		ice_debug(hw, ICE_DBG_SCHED, "enable Q %d failed %d\n",</div><div class='add'>+		ice_debug(hw, ICE_DBG_SCHED, "enable queue %d failed %d\n",</div><div class='ctx'> 			  le16_to_cpu(buf-&gt;txqs[0].txq_id),</div><div class='ctx'> 			  hw-&gt;adminq.sq_last_status);</div><div class='ctx'> 		goto ena_txq_exit;</div><div class='hunk'>@@ -2818,8 +2885,9 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,</div><div class='ctx'> </div><div class='ctx'> 	node.node_teid = buf-&gt;txqs[0].q_teid;</div><div class='ctx'> 	node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;</div><div class='add'>+	q_ctx-&gt;q_handle = q_handle;</div><div class='ctx'> </div><div class='del'>-	/* add a leaf node into schduler tree q layer */</div><div class='add'>+	/* add a leaf node into schduler tree queue layer */</div><div class='ctx'> 	status = ice_sched_add_node(pi, hw-&gt;num_tx_sched_layers - 1, &amp;node);</div><div class='ctx'> </div><div class='ctx'> ena_txq_exit:</div><div class='hunk'>@@ -2830,35 +2898,43 @@ ena_txq_exit:</div><div class='ctx'> /**</div><div class='ctx'>  * ice_dis_vsi_txq</div><div class='ctx'>  * @pi: port information structure</div><div class='add'>+ * @vsi_handle: software VSI handle</div><div class='add'>+ * @tc: TC number</div><div class='ctx'>  * @num_queues: number of queues</div><div class='add'>+ * @q_handles: pointer to software queue handle array</div><div class='ctx'>  * @q_ids: pointer to the q_id array</div><div class='ctx'>  * @q_teids: pointer to queue node teids</div><div class='del'>- * @rst_src: if called due to reset, specifies the RST source</div><div class='add'>+ * @rst_src: if called due to reset, specifies the reset source</div><div class='ctx'>  * @vmvf_num: the relative VM or VF number that is undergoing the reset</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='ctx'>  * This function removes queues and their corresponding nodes in SW DB</div><div class='ctx'>  */</div><div class='ctx'> enum ice_status</div><div class='del'>-ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,</div><div class='del'>-		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,</div><div class='add'>+ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,</div><div class='add'>+		u16 *q_handles, u16 *q_ids, u32 *q_teids,</div><div class='add'>+		enum ice_disq_rst_src rst_src, u16 vmvf_num,</div><div class='ctx'> 		struct ice_sq_cd *cd)</div><div class='ctx'> {</div><div class='ctx'> 	enum ice_status status = ICE_ERR_DOES_NOT_EXIST;</div><div class='ctx'> 	struct ice_aqc_dis_txq_item qg_list;</div><div class='add'>+	struct ice_q_ctx *q_ctx;</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='ctx'> 	if (!pi || pi-&gt;port_state != ICE_SCHED_PORT_STATE_READY)</div><div class='ctx'> 		return ICE_ERR_CFG;</div><div class='ctx'> </div><div class='del'>-	/* if queue is disabled already yet the disable queue command has to be</div><div class='del'>-	 * sent to complete the VF reset, then call ice_aq_dis_lan_txq without</div><div class='del'>-	 * any queue information</div><div class='del'>-	 */</div><div class='ctx'> </div><div class='del'>-	if (!num_queues &amp;&amp; rst_src)</div><div class='del'>-		return ice_aq_dis_lan_txq(pi-&gt;hw, 0, NULL, 0, rst_src, vmvf_num,</div><div class='del'>-					  NULL);</div><div class='add'>+	if (!num_queues) {</div><div class='add'>+		/* if queue is disabled already yet the disable queue command</div><div class='add'>+		 * has to be sent to complete the VF reset, then call</div><div class='add'>+		 * ice_aq_dis_lan_txq without any queue information</div><div class='add'>+		 */</div><div class='add'>+		if (rst_src)</div><div class='add'>+			return ice_aq_dis_lan_txq(pi-&gt;hw, 0, NULL, 0, rst_src,</div><div class='add'>+						  vmvf_num, NULL);</div><div class='add'>+		return ICE_ERR_CFG;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pi-&gt;sched_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2868,6 +2944,17 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,</div><div class='ctx'> 		node = ice_sched_find_node_by_teid(pi-&gt;root, q_teids[i]);</div><div class='ctx'> 		if (!node)</div><div class='ctx'> 			continue;</div><div class='add'>+		q_ctx = ice_get_lan_q_ctx(pi-&gt;hw, vsi_handle, tc, q_handles[i]);</div><div class='add'>+		if (!q_ctx) {</div><div class='add'>+			ice_debug(pi-&gt;hw, ICE_DBG_SCHED, "invalid queue handle%d\n",</div><div class='add'>+				  q_handles[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (q_ctx-&gt;q_handle != q_handles[i]) {</div><div class='add'>+			ice_debug(pi-&gt;hw, ICE_DBG_SCHED, "Err:handles %d %d\n",</div><div class='add'>+				  q_ctx-&gt;q_handle, q_handles[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		qg_list.parent_teid = node-&gt;info.parent_teid;</div><div class='ctx'> 		qg_list.num_qs = 1;</div><div class='ctx'> 		qg_list.q_id[0] = cpu_to_le16(q_ids[i]);</div><div class='hunk'>@@ -2878,18 +2965,19 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ice_free_sched_node(pi, node);</div><div class='add'>+		q_ctx-&gt;q_handle = ICE_INVAL_Q_HANDLE;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;pi-&gt;sched_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_cfg_vsi_qs - configure the new/exisiting VSI queues</div><div class='add'>+ * ice_cfg_vsi_qs - configure the new/existing VSI queues</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @tc_bitmap: TC bitmap</div><div class='ctx'>  * @maxqs: max queues array per TC</div><div class='del'>- * @owner: lan or rdma</div><div class='add'>+ * @owner: LAN or RDMA</div><div class='ctx'>  *</div><div class='ctx'>  * This function adds/updates the VSI queues per TC.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2908,7 +2996,7 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pi-&gt;sched_lock);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ICE_MAX_TRAFFIC_CLASS; i++) {</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='ctx'> 		/* configuration is possible only if TC node is present */</div><div class='ctx'> 		if (!ice_sched_get_tc_node(pi, i))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2924,13 +3012,13 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_cfg_vsi_lan - configure VSI lan queues</div><div class='add'>+ * ice_cfg_vsi_lan - configure VSI LAN queues</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @tc_bitmap: TC bitmap</div><div class='del'>- * @max_lanqs: max lan queues array per TC</div><div class='add'>+ * @max_lanqs: max LAN queues array per TC</div><div class='ctx'>  *</div><div class='del'>- * This function adds/updates the VSI lan queues per TC.</div><div class='add'>+ * This function adds/updates the VSI LAN queues per TC.</div><div class='ctx'>  */</div><div class='ctx'> enum ice_status</div><div class='ctx'> ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,</div><div class='hunk'>@@ -2942,7 +3030,7 @@ ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_replay_pre_init - replay pre initialization</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Initializes required config data for VSI, FD, ACL, and RSS before replay.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2966,7 +3054,7 @@ static enum ice_status ice_replay_pre_init(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_replay_vsi - replay VSI configuration</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: driver VSI handle</div><div class='ctx'>  *</div><div class='ctx'>  * Restore all VSI configuration after reset. It is required to call this</div><div class='hunk'>@@ -2993,7 +3081,7 @@ enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_replay_post - post replay configuration cleanup</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Post replay cleanup.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3012,8 +3100,9 @@ void ice_replay_post(struct ice_hw *hw)</div><div class='ctx'>  * @prev_stat: ptr to previous loaded stat value</div><div class='ctx'>  * @cur_stat: ptr to current stat value</div><div class='ctx'>  */</div><div class='del'>-void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,</div><div class='del'>-		       bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat)</div><div class='add'>+void</div><div class='add'>+ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,</div><div class='add'>+		  bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat)</div><div class='ctx'> {</div><div class='ctx'> 	u64 new_data;</div><div class='ctx'> </div><div class='hunk'>@@ -3043,8 +3132,9 @@ void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,</div><div class='ctx'>  * @prev_stat: ptr to previous loaded stat value</div><div class='ctx'>  * @cur_stat: ptr to current stat value</div><div class='ctx'>  */</div><div class='del'>-void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,</div><div class='del'>-		       u64 *prev_stat, u64 *cur_stat)</div><div class='add'>+void</div><div class='add'>+ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,</div><div class='add'>+		  u64 *prev_stat, u64 *cur_stat)</div><div class='ctx'> {</div><div class='ctx'> 	u32 new_data;</div><div class='ctx'> </div><div class='hunk'>@@ -3063,3 +3153,28 @@ void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,</div><div class='ctx'> 		/* to manage the potential roll-over */</div><div class='ctx'> 		*cur_stat = (new_data + BIT_ULL(32)) - *prev_stat;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_sched_query_elem - query element information from HW</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @node_teid: node TEID to be queried</div><div class='add'>+ * @buf: buffer to element information</div><div class='add'>+ *</div><div class='add'>+ * This function queries HW element information</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,</div><div class='add'>+		     struct ice_aqc_get_elem *buf)</div><div class='add'>+{</div><div class='add'>+	u16 buf_size, num_elem_ret = 0;</div><div class='add'>+	enum ice_status status;</div><div class='add'>+</div><div class='add'>+	buf_size = sizeof(*buf);</div><div class='add'>+	memset(buf, 0, buf_size);</div><div class='add'>+	buf-&gt;generic[0].node_teid = cpu_to_le32(node_teid);</div><div class='add'>+	status = ice_aq_query_sched_elems(hw, 1, buf, buf_size, &amp;num_elem_ret,</div><div class='add'>+					  NULL);</div><div class='add'>+	if (status || num_elem_ret != 1)</div><div class='add'>+		ice_debug(hw, ICE_DBG_SCHED, "query element failed\n");</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h<br/>index d7c7c2ed8823..f1ddebf45231 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_common.h</a></div><div class='hunk'>@@ -9,8 +9,8 @@</div><div class='ctx'> #include "ice_switch.h"</div><div class='ctx'> #include &lt;linux/avf/virtchnl.h&gt;</div><div class='ctx'> </div><div class='del'>-void ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf,</div><div class='del'>-		  u16 buf_len);</div><div class='add'>+void</div><div class='add'>+ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf, u16 buf_len);</div><div class='ctx'> enum ice_status ice_init_hw(struct ice_hw *hw);</div><div class='ctx'> void ice_deinit_hw(struct ice_hw *hw);</div><div class='ctx'> enum ice_status ice_check_reset(struct ice_hw *hw);</div><div class='hunk'>@@ -28,8 +28,8 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,</div><div class='ctx'> 		enum ice_aq_res_access_type access, u32 timeout);</div><div class='ctx'> void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res);</div><div class='ctx'> enum ice_status ice_init_nvm(struct ice_hw *hw);</div><div class='del'>-enum ice_status ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words,</div><div class='del'>-				u16 *data);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words, u16 *data);</div><div class='ctx'> enum ice_status</div><div class='ctx'> ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,</div><div class='ctx'> 		struct ice_aq_desc *desc, void *buf, u16 buf_size,</div><div class='hunk'>@@ -89,25 +89,37 @@ enum ice_status</div><div class='ctx'> ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link,</div><div class='ctx'> 			   struct ice_sq_cd *cd);</div><div class='ctx'> enum ice_status</div><div class='add'>+ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,</div><div class='add'>+		     struct ice_link_status *link, struct ice_sq_cd *cd);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask,</div><div class='add'>+		      struct ice_sq_cd *cd);</div><div class='add'>+enum ice_status</div><div class='ctx'> ice_aq_set_port_id_led(struct ice_port_info *pi, bool is_orig_mode,</div><div class='ctx'> 		       struct ice_sq_cd *cd);</div><div class='ctx'> </div><div class='ctx'> enum ice_status</div><div class='del'>-ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,</div><div class='del'>-		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,</div><div class='del'>-		struct ice_sq_cd *cmd_details);</div><div class='add'>+ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,</div><div class='add'>+		u16 *q_handle, u16 *q_ids, u32 *q_teids,</div><div class='add'>+		enum ice_disq_rst_src rst_src, u16 vmvf_num,</div><div class='add'>+		struct ice_sq_cd *cd);</div><div class='ctx'> enum ice_status</div><div class='ctx'> ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,</div><div class='ctx'> 		u16 *max_lanqs);</div><div class='ctx'> enum ice_status</div><div class='del'>-ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,</div><div class='del'>-		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,</div><div class='add'>+ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,</div><div class='add'>+		u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,</div><div class='ctx'> 		struct ice_sq_cd *cd);</div><div class='ctx'> enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);</div><div class='ctx'> void ice_replay_post(struct ice_hw *hw);</div><div class='ctx'> void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);</div><div class='del'>-void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,</div><div class='del'>-		       bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat);</div><div class='del'>-void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,</div><div class='del'>-		       u64 *prev_stat, u64 *cur_stat);</div><div class='add'>+void</div><div class='add'>+ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,</div><div class='add'>+		  bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat);</div><div class='add'>+void</div><div class='add'>+ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,</div><div class='add'>+		  u64 *prev_stat, u64 *cur_stat);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,</div><div class='add'>+		     struct ice_aqc_get_elem *buf);</div><div class='ctx'> #endif /* _ICE_COMMON_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c<br/>index 2bf5e11f559a..cc8cb5fdcdc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_controlq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_controlq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_controlq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_controlq.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ static void ice_mailbox_init_regs(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_check_sq_alive</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @cq: pointer to the specific Control queue</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if Queue is enabled else false.</div><div class='hunk'>@@ -287,7 +287,7 @@ ice_cfg_sq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @cq: pointer to the specific Control queue</div><div class='ctx'>  *</div><div class='del'>- * Configure base address and length registers for the receive (event q)</div><div class='add'>+ * Configure base address and length registers for the receive (event queue)</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)</div><div class='hunk'>@@ -751,7 +751,7 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sq_done - check if FW has processed the Admin Send Queue (ATQ)</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @cq: pointer to the specific Control queue</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if the firmware has processed all descriptors on the</div><div class='hunk'>@@ -767,7 +767,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sq_send_cmd - send command to Control Queue (ATQ)</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @cq: pointer to the specific Control queue</div><div class='ctx'>  * @desc: prefilled descriptor describing the command (non DMA mem)</div><div class='ctx'>  * @buf: buffer to use for indirect commands (or NULL for direct commands)</div><div class='hunk'>@@ -962,7 +962,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_clean_rq_elem</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @cq: pointer to the specific Control queue</div><div class='ctx'>  * @e: event info from the receive descriptor, includes any buffers</div><div class='ctx'>  * @pending: number of events that could be left to process</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h b/drivers/net/ethernet/intel/ice/ice_controlq.h<br/>index 0038a4109c99..e0585394d984 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_controlq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_controlq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_controlq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_controlq.h</a></div><div class='hunk'>@@ -79,6 +79,7 @@ struct ice_rq_event_info {</div><div class='ctx'> /* Control Queue information */</div><div class='ctx'> struct ice_ctl_q_info {</div><div class='ctx'> 	enum ice_ctl_q qtype;</div><div class='add'>+	enum ice_aq_err rq_last_status;	/* last status on receive queue */</div><div class='ctx'> 	struct ice_ctl_q_ring rq;	/* receive queue */</div><div class='ctx'> 	struct ice_ctl_q_ring sq;	/* send queue */</div><div class='ctx'> 	u32 sq_cmd_timeout;		/* send queue cmd write back timeout */</div><div class='hunk'>@@ -86,10 +87,9 @@ struct ice_ctl_q_info {</div><div class='ctx'> 	u16 num_sq_entries;		/* send queue depth */</div><div class='ctx'> 	u16 rq_buf_size;		/* receive queue buffer size */</div><div class='ctx'> 	u16 sq_buf_size;		/* send queue buffer size */</div><div class='add'>+	enum ice_aq_err sq_last_status;	/* last status on send queue */</div><div class='ctx'> 	struct mutex sq_lock;		/* Send queue lock */</div><div class='ctx'> 	struct mutex rq_lock;		/* Receive queue lock */</div><div class='del'>-	enum ice_aq_err sq_last_status;	/* last status on send queue */</div><div class='del'>-	enum ice_aq_err rq_last_status;	/* last status on receive queue */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _ICE_CONTROLQ_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_dcb.c b/drivers/net/ethernet/intel/ice/ice_dcb.c<br/>new file mode 100644<br/>index 000000000000..8bbf48e04a1c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_dcb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_dcb.c</a></div><div class='hunk'>@@ -0,0 +1,1392 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#include "ice_common.h"</div><div class='add'>+#include "ice_sched.h"</div><div class='add'>+#include "ice_dcb.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_aq_get_lldp_mib</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @bridge_type: type of bridge requested</div><div class='add'>+ * @mib_type: Local, Remote or both Local and Remote MIBs</div><div class='add'>+ * @buf: pointer to the caller-supplied buffer to store the MIB block</div><div class='add'>+ * @buf_size: size of the buffer (in bytes)</div><div class='add'>+ * @local_len: length of the returned Local LLDP MIB</div><div class='add'>+ * @remote_len: length of the returned Remote LLDP MIB</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Requests the complete LLDP MIB (entire packet). (0x0A00)</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_aq_get_lldp_mib(struct ice_hw *hw, u8 bridge_type, u8 mib_type, void *buf,</div><div class='add'>+		    u16 buf_size, u16 *local_len, u16 *remote_len,</div><div class='add'>+		    struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_lldp_get_mib *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+	enum ice_status status;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.lldp_get_mib;</div><div class='add'>+</div><div class='add'>+	if (buf_size == 0 || !buf)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_lldp_get_mib);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;type = mib_type &amp; ICE_AQ_LLDP_MIB_TYPE_M;</div><div class='add'>+	cmd-&gt;type |= (bridge_type &lt;&lt; ICE_AQ_LLDP_BRID_TYPE_S) &amp;</div><div class='add'>+		ICE_AQ_LLDP_BRID_TYPE_M;</div><div class='add'>+</div><div class='add'>+	desc.datalen = cpu_to_le16(buf_size);</div><div class='add'>+</div><div class='add'>+	status = ice_aq_send_cmd(hw, &amp;desc, buf, buf_size, cd);</div><div class='add'>+	if (!status) {</div><div class='add'>+		if (local_len)</div><div class='add'>+			*local_len = le16_to_cpu(cmd-&gt;local_len);</div><div class='add'>+		if (remote_len)</div><div class='add'>+			*remote_len = le16_to_cpu(cmd-&gt;remote_len);</div><div class='add'>+	}</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'>+ * ice_aq_cfg_lldp_mib_change</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @ena_update: Enable or Disable event posting</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Enable or Disable posting of an event on ARQ when LLDP MIB</div><div class='add'>+ * associated with the interface changes (0x0A01)</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_cfg_lldp_mib_change(struct ice_hw *hw, bool ena_update,</div><div class='add'>+			   struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_lldp_set_mib_change *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.lldp_set_event;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_lldp_set_mib_change);</div><div class='add'>+</div><div class='add'>+	if (!ena_update)</div><div class='add'>+		cmd-&gt;command |= ICE_AQ_LLDP_MIB_UPDATE_DIS;</div><div class='add'>+</div><div class='add'>+	return ice_aq_send_cmd(hw, &amp;desc, NULL, 0, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_aq_stop_lldp</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @shutdown_lldp_agent: True if LLDP Agent needs to be Shutdown</div><div class='add'>+ *			 False if LLDP Agent needs to be Stopped</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Stop or Shutdown the embedded LLDP Agent (0x0A05)</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_stop_lldp(struct ice_hw *hw, bool shutdown_lldp_agent,</div><div class='add'>+		 struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_lldp_stop *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.lldp_stop;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_lldp_stop);</div><div class='add'>+</div><div class='add'>+	if (shutdown_lldp_agent)</div><div class='add'>+		cmd-&gt;command |= ICE_AQ_LLDP_AGENT_SHUTDOWN;</div><div class='add'>+</div><div class='add'>+	return ice_aq_send_cmd(hw, &amp;desc, NULL, 0, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_aq_start_lldp</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Start the embedded LLDP Agent on all ports. (0x0A06)</div><div class='add'>+ */</div><div class='add'>+enum ice_status ice_aq_start_lldp(struct ice_hw *hw, struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_lldp_start *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.lldp_start;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_lldp_start);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;command = ICE_AQ_LLDP_AGENT_START;</div><div class='add'>+</div><div class='add'>+	return ice_aq_send_cmd(hw, &amp;desc, NULL, 0, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_aq_set_lldp_mib - Set the LLDP MIB</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @mib_type: Local, Remote or both Local and Remote MIBs</div><div class='add'>+ * @buf: pointer to the caller-supplied buffer to store the MIB block</div><div class='add'>+ * @buf_size: size of the buffer (in bytes)</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Set the LLDP MIB. (0x0A08)</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,</div><div class='add'>+		    struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_lldp_set_local_mib *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.lldp_set_mib;</div><div class='add'>+</div><div class='add'>+	if (buf_size == 0 || !buf)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_lldp_set_local_mib);</div><div class='add'>+</div><div class='add'>+	desc.flags |= cpu_to_le16((u16)ICE_AQ_FLAG_RD);</div><div class='add'>+	desc.datalen = cpu_to_le16(buf_size);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;type = mib_type;</div><div class='add'>+	cmd-&gt;length = cpu_to_le16(buf_size);</div><div class='add'>+</div><div class='add'>+	return ice_aq_send_cmd(hw, &amp;desc, buf, buf_size, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_get_dcbx_status</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ *</div><div class='add'>+ * Get the DCBX status from the Firmware</div><div class='add'>+ */</div><div class='add'>+u8 ice_get_dcbx_status(struct ice_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = rd32(hw, PRTDCB_GENS);</div><div class='add'>+	return (u8)((reg &amp; PRTDCB_GENS_DCBX_STATUS_M) &gt;&gt;</div><div class='add'>+		    PRTDCB_GENS_DCBX_STATUS_S);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_ieee_ets_common_tlv</div><div class='add'>+ * @buf: Data buffer to be parsed for ETS CFG/REC data</div><div class='add'>+ * @ets_cfg: Container to store parsed data</div><div class='add'>+ *</div><div class='add'>+ * Parses the common data of IEEE 802.1Qaz ETS CFG/REC TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_ieee_ets_common_tlv(u8 *buf, struct ice_dcb_ets_cfg *ets_cfg)</div><div class='add'>+{</div><div class='add'>+	u8 offset = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Priority Assignment Table (4 octets)</div><div class='add'>+	 * Octets:|    1    |    2    |    3    |    4    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *        |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *   Bits:|7  4|3  0|7  4|3  0|7  4|3  0|7  4|3  0|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		ets_cfg-&gt;prio_table[i * 2] =</div><div class='add'>+			((buf[offset] &amp; ICE_IEEE_ETS_PRIO_1_M) &gt;&gt;</div><div class='add'>+			 ICE_IEEE_ETS_PRIO_1_S);</div><div class='add'>+		ets_cfg-&gt;prio_table[i * 2 + 1] =</div><div class='add'>+			((buf[offset] &amp; ICE_IEEE_ETS_PRIO_0_M) &gt;&gt;</div><div class='add'>+			 ICE_IEEE_ETS_PRIO_0_S);</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TC Bandwidth Table (8 octets)</div><div class='add'>+	 * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *</div><div class='add'>+	 * TSA Assignment Table (8 octets)</div><div class='add'>+	 * Octets:| 9 | 10| 11| 12| 13| 14| 15| 16|</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 */</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='add'>+		ets_cfg-&gt;tcbwtable[i] = buf[offset];</div><div class='add'>+		ets_cfg-&gt;tsatable[i] = buf[ICE_MAX_TRAFFIC_CLASS + offset++];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_ieee_etscfg_tlv</div><div class='add'>+ * @tlv: IEEE 802.1Qaz ETS CFG TLV</div><div class='add'>+ * @dcbcfg: Local store to update ETS CFG data</div><div class='add'>+ *</div><div class='add'>+ * Parses IEEE 802.1Qaz ETS CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_ieee_etscfg_tlv(struct ice_lldp_org_tlv *tlv,</div><div class='add'>+			  struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcb_ets_cfg *etscfg;</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+</div><div class='add'>+	/* First Octet post subtype</div><div class='add'>+	 * --------------------------</div><div class='add'>+	 * |will-|CBS  | Re-  | Max |</div><div class='add'>+	 * |ing  |     |served| TCs |</div><div class='add'>+	 * --------------------------</div><div class='add'>+	 * |1bit | 1bit|3 bits|3bits|</div><div class='add'>+	 */</div><div class='add'>+	etscfg = &amp;dcbcfg-&gt;etscfg;</div><div class='add'>+	etscfg-&gt;willing = ((buf[0] &amp; ICE_IEEE_ETS_WILLING_M) &gt;&gt;</div><div class='add'>+			   ICE_IEEE_ETS_WILLING_S);</div><div class='add'>+	etscfg-&gt;cbs = ((buf[0] &amp; ICE_IEEE_ETS_CBS_M) &gt;&gt; ICE_IEEE_ETS_CBS_S);</div><div class='add'>+	etscfg-&gt;maxtcs = ((buf[0] &amp; ICE_IEEE_ETS_MAXTC_M) &gt;&gt;</div><div class='add'>+			  ICE_IEEE_ETS_MAXTC_S);</div><div class='add'>+</div><div class='add'>+	/* Begin parsing at Priority Assignment Table (offset 1 in buf) */</div><div class='add'>+	ice_parse_ieee_ets_common_tlv(&amp;buf[1], etscfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_ieee_etsrec_tlv</div><div class='add'>+ * @tlv: IEEE 802.1Qaz ETS REC TLV</div><div class='add'>+ * @dcbcfg: Local store to update ETS REC data</div><div class='add'>+ *</div><div class='add'>+ * Parses IEEE 802.1Qaz ETS REC TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_ieee_etsrec_tlv(struct ice_lldp_org_tlv *tlv,</div><div class='add'>+			  struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+</div><div class='add'>+	/* Begin parsing at Priority Assignment Table (offset 1 in buf) */</div><div class='add'>+	ice_parse_ieee_ets_common_tlv(&amp;buf[1], &amp;dcbcfg-&gt;etsrec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_ieee_pfccfg_tlv</div><div class='add'>+ * @tlv: IEEE 802.1Qaz PFC CFG TLV</div><div class='add'>+ * @dcbcfg: Local store to update PFC CFG data</div><div class='add'>+ *</div><div class='add'>+ * Parses IEEE 802.1Qaz PFC CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_ieee_pfccfg_tlv(struct ice_lldp_org_tlv *tlv,</div><div class='add'>+			  struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+</div><div class='add'>+	/* ----------------------------------------</div><div class='add'>+	 * |will-|MBC  | Re-  | PFC |  PFC Enable  |</div><div class='add'>+	 * |ing  |     |served| cap |              |</div><div class='add'>+	 * -----------------------------------------</div><div class='add'>+	 * |1bit | 1bit|2 bits|4bits| 1 octet      |</div><div class='add'>+	 */</div><div class='add'>+	dcbcfg-&gt;pfc.willing = ((buf[0] &amp; ICE_IEEE_PFC_WILLING_M) &gt;&gt;</div><div class='add'>+			       ICE_IEEE_PFC_WILLING_S);</div><div class='add'>+	dcbcfg-&gt;pfc.mbc = ((buf[0] &amp; ICE_IEEE_PFC_MBC_M) &gt;&gt; ICE_IEEE_PFC_MBC_S);</div><div class='add'>+	dcbcfg-&gt;pfc.pfccap = ((buf[0] &amp; ICE_IEEE_PFC_CAP_M) &gt;&gt;</div><div class='add'>+			      ICE_IEEE_PFC_CAP_S);</div><div class='add'>+	dcbcfg-&gt;pfc.pfcena = buf[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_ieee_app_tlv</div><div class='add'>+ * @tlv: IEEE 802.1Qaz APP TLV</div><div class='add'>+ * @dcbcfg: Local store to update APP PRIO data</div><div class='add'>+ *</div><div class='add'>+ * Parses IEEE 802.1Qaz APP PRIO TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_ieee_app_tlv(struct ice_lldp_org_tlv *tlv,</div><div class='add'>+		       struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u16 offset = 0;</div><div class='add'>+	u16 typelen;</div><div class='add'>+	int i = 0;</div><div class='add'>+	u16 len;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	typelen = ntohs(tlv-&gt;typelen);</div><div class='add'>+	len = ((typelen &amp; ICE_LLDP_TLV_LEN_M) &gt;&gt; ICE_LLDP_TLV_LEN_S);</div><div class='add'>+	buf = tlv-&gt;tlvinfo;</div><div class='add'>+</div><div class='add'>+	/* Removing sizeof(ouisubtype) and reserved byte from len.</div><div class='add'>+	 * Remaining len div 3 is number of APP TLVs.</div><div class='add'>+	 */</div><div class='add'>+	len -= (sizeof(tlv-&gt;ouisubtype) + 1);</div><div class='add'>+</div><div class='add'>+	/* Move offset to App Priority Table */</div><div class='add'>+	offset++;</div><div class='add'>+</div><div class='add'>+	/* Application Priority Table (3 octets)</div><div class='add'>+	 * Octets:|         1          |    2    |    3    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *        |Priority|Rsrvd| Sel |    Protocol ID    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *   Bits:|23    21|20 19|18 16|15                0|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 */</div><div class='add'>+	while (offset &lt; len) {</div><div class='add'>+		dcbcfg-&gt;app[i].priority = ((buf[offset] &amp;</div><div class='add'>+					    ICE_IEEE_APP_PRIO_M) &gt;&gt;</div><div class='add'>+					   ICE_IEEE_APP_PRIO_S);</div><div class='add'>+		dcbcfg-&gt;app[i].selector = ((buf[offset] &amp;</div><div class='add'>+					    ICE_IEEE_APP_SEL_M) &gt;&gt;</div><div class='add'>+					   ICE_IEEE_APP_SEL_S);</div><div class='add'>+		dcbcfg-&gt;app[i].prot_id = (buf[offset + 1] &lt;&lt; 0x8) |</div><div class='add'>+			buf[offset + 2];</div><div class='add'>+		/* Move to next app */</div><div class='add'>+		offset += 3;</div><div class='add'>+		i++;</div><div class='add'>+		if (i &gt;= ICE_DCBX_MAX_APPS)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dcbcfg-&gt;numapps = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_ieee_tlv</div><div class='add'>+ * @tlv: IEEE 802.1Qaz TLV</div><div class='add'>+ * @dcbcfg: Local store to update ETS REC data</div><div class='add'>+ *</div><div class='add'>+ * Get the TLV subtype and send it to parsing function</div><div class='add'>+ * based on the subtype value</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_ieee_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+	u8 subtype;</div><div class='add'>+</div><div class='add'>+	ouisubtype = ntohl(tlv-&gt;ouisubtype);</div><div class='add'>+	subtype = (u8)((ouisubtype &amp; ICE_LLDP_TLV_SUBTYPE_M) &gt;&gt;</div><div class='add'>+		       ICE_LLDP_TLV_SUBTYPE_S);</div><div class='add'>+	switch (subtype) {</div><div class='add'>+	case ICE_IEEE_SUBTYPE_ETS_CFG:</div><div class='add'>+		ice_parse_ieee_etscfg_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_IEEE_SUBTYPE_ETS_REC:</div><div class='add'>+		ice_parse_ieee_etsrec_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_IEEE_SUBTYPE_PFC_CFG:</div><div class='add'>+		ice_parse_ieee_pfccfg_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_IEEE_SUBTYPE_APP_PRI:</div><div class='add'>+		ice_parse_ieee_app_tlv(tlv, dcbcfg);</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'>+ * ice_parse_cee_pgcfg_tlv</div><div class='add'>+ * @tlv: CEE DCBX PG CFG TLV</div><div class='add'>+ * @dcbcfg: Local store to update ETS CFG data</div><div class='add'>+ *</div><div class='add'>+ * Parses CEE DCBX PG CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_cee_pgcfg_tlv(struct ice_cee_feat_tlv *tlv,</div><div class='add'>+			struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcb_ets_cfg *etscfg;</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+	u16 offset = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	etscfg = &amp;dcbcfg-&gt;etscfg;</div><div class='add'>+</div><div class='add'>+	if (tlv-&gt;en_will_err &amp; ICE_CEE_FEAT_TLV_WILLING_M)</div><div class='add'>+		etscfg-&gt;willing = 1;</div><div class='add'>+</div><div class='add'>+	etscfg-&gt;cbs = 0;</div><div class='add'>+	/* Priority Group Table (4 octets)</div><div class='add'>+	 * Octets:|    1    |    2    |    3    |    4    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *        |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *   Bits:|7  4|3  0|7  4|3  0|7  4|3  0|7  4|3  0|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		etscfg-&gt;prio_table[i * 2] =</div><div class='add'>+			((buf[offset] &amp; ICE_CEE_PGID_PRIO_1_M) &gt;&gt;</div><div class='add'>+			 ICE_CEE_PGID_PRIO_1_S);</div><div class='add'>+		etscfg-&gt;prio_table[i * 2 + 1] =</div><div class='add'>+			((buf[offset] &amp; ICE_CEE_PGID_PRIO_0_M) &gt;&gt;</div><div class='add'>+			 ICE_CEE_PGID_PRIO_0_S);</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PG Percentage Table (8 octets)</div><div class='add'>+	 * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *        |pg0|pg1|pg2|pg3|pg4|pg5|pg6|pg7|</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 */</div><div class='add'>+	ice_for_each_traffic_class(i)</div><div class='add'>+		etscfg-&gt;tcbwtable[i] = buf[offset++];</div><div class='add'>+</div><div class='add'>+	/* Number of TCs supported (1 octet) */</div><div class='add'>+	etscfg-&gt;maxtcs = buf[offset];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_cee_pfccfg_tlv</div><div class='add'>+ * @tlv: CEE DCBX PFC CFG TLV</div><div class='add'>+ * @dcbcfg: Local store to update PFC CFG data</div><div class='add'>+ *</div><div class='add'>+ * Parses CEE DCBX PFC CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_cee_pfccfg_tlv(struct ice_cee_feat_tlv *tlv,</div><div class='add'>+			 struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+</div><div class='add'>+	if (tlv-&gt;en_will_err &amp; ICE_CEE_FEAT_TLV_WILLING_M)</div><div class='add'>+		dcbcfg-&gt;pfc.willing = 1;</div><div class='add'>+</div><div class='add'>+	/* ------------------------</div><div class='add'>+	 * | PFC Enable | PFC TCs |</div><div class='add'>+	 * ------------------------</div><div class='add'>+	 * | 1 octet    | 1 octet |</div><div class='add'>+	 */</div><div class='add'>+	dcbcfg-&gt;pfc.pfcena = buf[0];</div><div class='add'>+	dcbcfg-&gt;pfc.pfccap = buf[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_cee_app_tlv</div><div class='add'>+ * @tlv: CEE DCBX APP TLV</div><div class='add'>+ * @dcbcfg: Local store to update APP PRIO data</div><div class='add'>+ *</div><div class='add'>+ * Parses CEE DCBX APP PRIO TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_cee_app_tlv(struct ice_cee_feat_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u16 len, typelen, offset = 0;</div><div class='add'>+	struct ice_cee_app_prio *app;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	typelen = ntohs(tlv-&gt;hdr.typelen);</div><div class='add'>+	len = ((typelen &amp; ICE_LLDP_TLV_LEN_M) &gt;&gt; ICE_LLDP_TLV_LEN_S);</div><div class='add'>+</div><div class='add'>+	dcbcfg-&gt;numapps = len / sizeof(*app);</div><div class='add'>+	if (!dcbcfg-&gt;numapps)</div><div class='add'>+		return;</div><div class='add'>+	if (dcbcfg-&gt;numapps &gt; ICE_DCBX_MAX_APPS)</div><div class='add'>+		dcbcfg-&gt;numapps = ICE_DCBX_MAX_APPS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dcbcfg-&gt;numapps; i++) {</div><div class='add'>+		u8 up, selector;</div><div class='add'>+</div><div class='add'>+		app = (struct ice_cee_app_prio *)(tlv-&gt;tlvinfo + offset);</div><div class='add'>+		for (up = 0; up &lt; ICE_MAX_USER_PRIORITY; up++)</div><div class='add'>+			if (app-&gt;prio_map &amp; BIT(up))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+		dcbcfg-&gt;app[i].priority = up;</div><div class='add'>+</div><div class='add'>+		/* Get Selector from lower 2 bits, and convert to IEEE */</div><div class='add'>+		selector = (app-&gt;upper_oui_sel &amp; ICE_CEE_APP_SELECTOR_M);</div><div class='add'>+		switch (selector) {</div><div class='add'>+		case ICE_CEE_APP_SEL_ETHTYPE:</div><div class='add'>+			dcbcfg-&gt;app[i].selector = ICE_APP_SEL_ETHTYPE;</div><div class='add'>+			break;</div><div class='add'>+		case ICE_CEE_APP_SEL_TCPIP:</div><div class='add'>+			dcbcfg-&gt;app[i].selector = ICE_APP_SEL_TCPIP;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* Keep selector as it is for unknown types */</div><div class='add'>+			dcbcfg-&gt;app[i].selector = selector;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dcbcfg-&gt;app[i].prot_id = ntohs(app-&gt;protocol);</div><div class='add'>+		/* Move to next app */</div><div class='add'>+		offset += sizeof(*app);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_cee_tlv</div><div class='add'>+ * @tlv: CEE DCBX TLV</div><div class='add'>+ * @dcbcfg: Local store to update DCBX config data</div><div class='add'>+ *</div><div class='add'>+ * Get the TLV subtype and send it to parsing function</div><div class='add'>+ * based on the subtype value</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_cee_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_cee_feat_tlv *sub_tlv;</div><div class='add'>+	u8 subtype, feat_tlv_count = 0;</div><div class='add'>+	u16 len, tlvlen, typelen;</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+</div><div class='add'>+	ouisubtype = ntohl(tlv-&gt;ouisubtype);</div><div class='add'>+	subtype = (u8)((ouisubtype &amp; ICE_LLDP_TLV_SUBTYPE_M) &gt;&gt;</div><div class='add'>+		       ICE_LLDP_TLV_SUBTYPE_S);</div><div class='add'>+	/* Return if not CEE DCBX */</div><div class='add'>+	if (subtype != ICE_CEE_DCBX_TYPE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	typelen = ntohs(tlv-&gt;typelen);</div><div class='add'>+	tlvlen = ((typelen &amp; ICE_LLDP_TLV_LEN_M) &gt;&gt; ICE_LLDP_TLV_LEN_S);</div><div class='add'>+	len = sizeof(tlv-&gt;typelen) + sizeof(ouisubtype) +</div><div class='add'>+		sizeof(struct ice_cee_ctrl_tlv);</div><div class='add'>+	/* Return if no CEE DCBX Feature TLVs */</div><div class='add'>+	if (tlvlen &lt;= len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sub_tlv = (struct ice_cee_feat_tlv *)((char *)tlv + len);</div><div class='add'>+	while (feat_tlv_count &lt; ICE_CEE_MAX_FEAT_TYPE) {</div><div class='add'>+		u16 sublen;</div><div class='add'>+</div><div class='add'>+		typelen = ntohs(sub_tlv-&gt;hdr.typelen);</div><div class='add'>+		sublen = ((typelen &amp; ICE_LLDP_TLV_LEN_M) &gt;&gt; ICE_LLDP_TLV_LEN_S);</div><div class='add'>+		subtype = (u8)((typelen &amp; ICE_LLDP_TLV_TYPE_M) &gt;&gt;</div><div class='add'>+			       ICE_LLDP_TLV_TYPE_S);</div><div class='add'>+		switch (subtype) {</div><div class='add'>+		case ICE_CEE_SUBTYPE_PG_CFG:</div><div class='add'>+			ice_parse_cee_pgcfg_tlv(sub_tlv, dcbcfg);</div><div class='add'>+			break;</div><div class='add'>+		case ICE_CEE_SUBTYPE_PFC_CFG:</div><div class='add'>+			ice_parse_cee_pfccfg_tlv(sub_tlv, dcbcfg);</div><div class='add'>+			break;</div><div class='add'>+		case ICE_CEE_SUBTYPE_APP_PRI:</div><div class='add'>+			ice_parse_cee_app_tlv(sub_tlv, dcbcfg);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return;	/* Invalid Sub-type return */</div><div class='add'>+		}</div><div class='add'>+		feat_tlv_count++;</div><div class='add'>+		/* Move to next sub TLV */</div><div class='add'>+		sub_tlv = (struct ice_cee_feat_tlv *)</div><div class='add'>+			  ((char *)sub_tlv + sizeof(sub_tlv-&gt;hdr.typelen) +</div><div class='add'>+			   sublen);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_parse_org_tlv</div><div class='add'>+ * @tlv: Organization specific TLV</div><div class='add'>+ * @dcbcfg: Local store to update ETS REC data</div><div class='add'>+ *</div><div class='add'>+ * Currently only IEEE 802.1Qaz TLV is supported, all others</div><div class='add'>+ * will be returned</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_parse_org_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+	u32 oui;</div><div class='add'>+</div><div class='add'>+	ouisubtype = ntohl(tlv-&gt;ouisubtype);</div><div class='add'>+	oui = ((ouisubtype &amp; ICE_LLDP_TLV_OUI_M) &gt;&gt; ICE_LLDP_TLV_OUI_S);</div><div class='add'>+	switch (oui) {</div><div class='add'>+	case ICE_IEEE_8021QAZ_OUI:</div><div class='add'>+		ice_parse_ieee_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_CEE_DCBX_OUI:</div><div class='add'>+		ice_parse_cee_tlv(tlv, dcbcfg);</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'>+ * ice_lldp_to_dcb_cfg</div><div class='add'>+ * @lldpmib: LLDPDU to be parsed</div><div class='add'>+ * @dcbcfg: store for LLDPDU data</div><div class='add'>+ *</div><div class='add'>+ * Parse DCB configuration from the LLDPDU</div><div class='add'>+ */</div><div class='add'>+enum ice_status ice_lldp_to_dcb_cfg(u8 *lldpmib, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_lldp_org_tlv *tlv;</div><div class='add'>+	enum ice_status ret = 0;</div><div class='add'>+	u16 offset = 0;</div><div class='add'>+	u16 typelen;</div><div class='add'>+	u16 type;</div><div class='add'>+	u16 len;</div><div class='add'>+</div><div class='add'>+	if (!lldpmib || !dcbcfg)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	/* set to the start of LLDPDU */</div><div class='add'>+	lldpmib += ETH_HLEN;</div><div class='add'>+	tlv = (struct ice_lldp_org_tlv *)lldpmib;</div><div class='add'>+	while (1) {</div><div class='add'>+		typelen = ntohs(tlv-&gt;typelen);</div><div class='add'>+		type = ((typelen &amp; ICE_LLDP_TLV_TYPE_M) &gt;&gt; ICE_LLDP_TLV_TYPE_S);</div><div class='add'>+		len = ((typelen &amp; ICE_LLDP_TLV_LEN_M) &gt;&gt; ICE_LLDP_TLV_LEN_S);</div><div class='add'>+		offset += sizeof(typelen) + len;</div><div class='add'>+</div><div class='add'>+		/* END TLV or beyond LLDPDU size */</div><div class='add'>+		if (type == ICE_TLV_TYPE_END || offset &gt; ICE_LLDPDU_SIZE)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case ICE_TLV_TYPE_ORG:</div><div class='add'>+			ice_parse_org_tlv(tlv, dcbcfg);</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'>+		/* Move to next TLV */</div><div class='add'>+		tlv = (struct ice_lldp_org_tlv *)</div><div class='add'>+		      ((char *)tlv + sizeof(tlv-&gt;typelen) + len);</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'>+ * ice_aq_get_dcb_cfg</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @mib_type: mib type for the query</div><div class='add'>+ * @bridgetype: bridge type for the query (remote)</div><div class='add'>+ * @dcbcfg: store for LLDPDU data</div><div class='add'>+ *</div><div class='add'>+ * Query DCB configuration from the firmware</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_aq_get_dcb_cfg(struct ice_hw *hw, u8 mib_type, u8 bridgetype,</div><div class='add'>+		   struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	enum ice_status ret;</div><div class='add'>+	u8 *lldpmib;</div><div class='add'>+</div><div class='add'>+	/* Allocate the LLDPDU */</div><div class='add'>+	lldpmib = devm_kzalloc(ice_hw_to_dev(hw), ICE_LLDPDU_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!lldpmib)</div><div class='add'>+		return ICE_ERR_NO_MEMORY;</div><div class='add'>+</div><div class='add'>+	ret = ice_aq_get_lldp_mib(hw, bridgetype, mib_type, (void *)lldpmib,</div><div class='add'>+				  ICE_LLDPDU_SIZE, NULL, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		/* Parse LLDP MIB to get DCB configuration */</div><div class='add'>+		ret = ice_lldp_to_dcb_cfg(lldpmib, dcbcfg);</div><div class='add'>+</div><div class='add'>+	devm_kfree(ice_hw_to_dev(hw), lldpmib);</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'>+ * ice_aq_start_stop_dcbx - Start/Stop DCBx service in FW</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @start_dcbx_agent: True if DCBx Agent needs to be started</div><div class='add'>+ *		      False if DCBx Agent needs to be stopped</div><div class='add'>+ * @dcbx_agent_status: FW indicates back the DCBx agent status</div><div class='add'>+ *		       True if DCBx Agent is active</div><div class='add'>+ *		       False if DCBx Agent is stopped</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Start/Stop the embedded dcbx Agent. In case that this wrapper function</div><div class='add'>+ * returns ICE_SUCCESS, caller will need to check if FW returns back the same</div><div class='add'>+ * value as stated in dcbx_agent_status, and react accordingly. (0x0A09)</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_start_stop_dcbx(struct ice_hw *hw, bool start_dcbx_agent,</div><div class='add'>+		       bool *dcbx_agent_status, struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_lldp_stop_start_specific_agent *cmd;</div><div class='add'>+	enum ice_status status;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+	u16 opcode;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;desc.params.lldp_agent_ctrl;</div><div class='add'>+</div><div class='add'>+	opcode = ice_aqc_opc_lldp_stop_start_specific_agent;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, opcode);</div><div class='add'>+</div><div class='add'>+	if (start_dcbx_agent)</div><div class='add'>+		cmd-&gt;command = ICE_AQC_START_STOP_AGENT_START_DCBX;</div><div class='add'>+</div><div class='add'>+	status = ice_aq_send_cmd(hw, &amp;desc, NULL, 0, cd);</div><div class='add'>+</div><div class='add'>+	*dcbx_agent_status = false;</div><div class='add'>+</div><div class='add'>+	if (!status &amp;&amp;</div><div class='add'>+	    cmd-&gt;command == ICE_AQC_START_STOP_AGENT_START_DCBX)</div><div class='add'>+		*dcbx_agent_status = true;</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'>+ * ice_aq_get_cee_dcb_cfg</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @buff: response buffer that stores CEE operational configuration</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * Get CEE DCBX mode operational configuration from firmware (0x0A07)</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_aq_get_cee_dcb_cfg(struct ice_hw *hw,</div><div class='add'>+		       struct ice_aqc_get_cee_dcb_cfg_resp *buff,</div><div class='add'>+		       struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_get_cee_dcb_cfg);</div><div class='add'>+</div><div class='add'>+	return ice_aq_send_cmd(hw, &amp;desc, (void *)buff, sizeof(*buff), cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_cee_to_dcb_cfg</div><div class='add'>+ * @cee_cfg: pointer to CEE configuration struct</div><div class='add'>+ * @dcbcfg: DCB configuration struct</div><div class='add'>+ *</div><div class='add'>+ * Convert CEE configuration from firmware to DCB configuration</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg,</div><div class='add'>+		   struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u32 status, tlv_status = le32_to_cpu(cee_cfg-&gt;tlv_status);</div><div class='add'>+	u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift;</div><div class='add'>+	u16 app_prio = le16_to_cpu(cee_cfg-&gt;oper_app_prio);</div><div class='add'>+	u8 i, err, sync, oper, app_index, ice_app_sel_type;</div><div class='add'>+	u16 ice_aqc_cee_app_mask, ice_aqc_cee_app_shift;</div><div class='add'>+	u16 ice_app_prot_id_type;</div><div class='add'>+</div><div class='add'>+	/* CEE PG data to ETS config */</div><div class='add'>+	dcbcfg-&gt;etscfg.maxtcs = cee_cfg-&gt;oper_num_tc;</div><div class='add'>+</div><div class='add'>+	/* Note that the FW creates the oper_prio_tc nibbles reversed</div><div class='add'>+	 * from those in the CEE Priority Group sub-TLV.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ICE_MAX_TRAFFIC_CLASS / 2; i++) {</div><div class='add'>+		dcbcfg-&gt;etscfg.prio_table[i * 2] =</div><div class='add'>+			((cee_cfg-&gt;oper_prio_tc[i] &amp; ICE_CEE_PGID_PRIO_0_M) &gt;&gt;</div><div class='add'>+			 ICE_CEE_PGID_PRIO_0_S);</div><div class='add'>+		dcbcfg-&gt;etscfg.prio_table[i * 2 + 1] =</div><div class='add'>+			((cee_cfg-&gt;oper_prio_tc[i] &amp; ICE_CEE_PGID_PRIO_1_M) &gt;&gt;</div><div class='add'>+			 ICE_CEE_PGID_PRIO_1_S);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='add'>+		dcbcfg-&gt;etscfg.tcbwtable[i] = cee_cfg-&gt;oper_tc_bw[i];</div><div class='add'>+</div><div class='add'>+		if (dcbcfg-&gt;etscfg.prio_table[i] == ICE_CEE_PGID_STRICT) {</div><div class='add'>+			/* Map it to next empty TC */</div><div class='add'>+			dcbcfg-&gt;etscfg.prio_table[i] = cee_cfg-&gt;oper_num_tc - 1;</div><div class='add'>+			dcbcfg-&gt;etscfg.tsatable[i] = ICE_IEEE_TSA_STRICT;</div><div class='add'>+		} else {</div><div class='add'>+			dcbcfg-&gt;etscfg.tsatable[i] = ICE_IEEE_TSA_ETS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CEE PFC data to ETS config */</div><div class='add'>+	dcbcfg-&gt;pfc.pfcena = cee_cfg-&gt;oper_pfc_en;</div><div class='add'>+	dcbcfg-&gt;pfc.pfccap = ICE_MAX_TRAFFIC_CLASS;</div><div class='add'>+</div><div class='add'>+	app_index = 0;</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			/* FCoE APP */</div><div class='add'>+			ice_aqc_cee_status_mask = ICE_AQC_CEE_FCOE_STATUS_M;</div><div class='add'>+			ice_aqc_cee_status_shift = ICE_AQC_CEE_FCOE_STATUS_S;</div><div class='add'>+			ice_aqc_cee_app_mask = ICE_AQC_CEE_APP_FCOE_M;</div><div class='add'>+			ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_FCOE_S;</div><div class='add'>+			ice_app_sel_type = ICE_APP_SEL_ETHTYPE;</div><div class='add'>+			ice_app_prot_id_type = ICE_APP_PROT_ID_FCOE;</div><div class='add'>+		} else if (i == 1) {</div><div class='add'>+			/* iSCSI APP */</div><div class='add'>+			ice_aqc_cee_status_mask = ICE_AQC_CEE_ISCSI_STATUS_M;</div><div class='add'>+			ice_aqc_cee_status_shift = ICE_AQC_CEE_ISCSI_STATUS_S;</div><div class='add'>+			ice_aqc_cee_app_mask = ICE_AQC_CEE_APP_ISCSI_M;</div><div class='add'>+			ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_ISCSI_S;</div><div class='add'>+			ice_app_sel_type = ICE_APP_SEL_TCPIP;</div><div class='add'>+			ice_app_prot_id_type = ICE_APP_PROT_ID_ISCSI;</div><div class='add'>+		} else {</div><div class='add'>+			/* FIP APP */</div><div class='add'>+			ice_aqc_cee_status_mask = ICE_AQC_CEE_FIP_STATUS_M;</div><div class='add'>+			ice_aqc_cee_status_shift = ICE_AQC_CEE_FIP_STATUS_S;</div><div class='add'>+			ice_aqc_cee_app_mask = ICE_AQC_CEE_APP_FIP_M;</div><div class='add'>+			ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_FIP_S;</div><div class='add'>+			ice_app_sel_type = ICE_APP_SEL_ETHTYPE;</div><div class='add'>+			ice_app_prot_id_type = ICE_APP_PROT_ID_FIP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = (tlv_status &amp; ice_aqc_cee_status_mask) &gt;&gt;</div><div class='add'>+			 ice_aqc_cee_status_shift;</div><div class='add'>+		err = (status &amp; ICE_TLV_STATUS_ERR) ? 1 : 0;</div><div class='add'>+		sync = (status &amp; ICE_TLV_STATUS_SYNC) ? 1 : 0;</div><div class='add'>+		oper = (status &amp; ICE_TLV_STATUS_OPER) ? 1 : 0;</div><div class='add'>+		/* Add FCoE/iSCSI/FIP APP if Error is False and</div><div class='add'>+		 * Oper/Sync is True</div><div class='add'>+		 */</div><div class='add'>+		if (!err &amp;&amp; sync &amp;&amp; oper) {</div><div class='add'>+			dcbcfg-&gt;app[app_index].priority =</div><div class='add'>+				(app_prio &amp; ice_aqc_cee_app_mask) &gt;&gt;</div><div class='add'>+				ice_aqc_cee_app_shift;</div><div class='add'>+			dcbcfg-&gt;app[app_index].selector = ice_app_sel_type;</div><div class='add'>+			dcbcfg-&gt;app[app_index].prot_id = ice_app_prot_id_type;</div><div class='add'>+			app_index++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dcbcfg-&gt;numapps = app_index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_get_ieee_dcb_cfg</div><div class='add'>+ * @pi: port information structure</div><div class='add'>+ * @dcbx_mode: mode of DCBX (IEEE or CEE)</div><div class='add'>+ *</div><div class='add'>+ * Get IEEE or CEE mode DCB configuration from the Firmware</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_get_ieee_or_cee_dcb_cfg(struct ice_port_info *pi, u8 dcbx_mode)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcbx_cfg *dcbx_cfg = NULL;</div><div class='add'>+	enum ice_status ret;</div><div class='add'>+</div><div class='add'>+	if (!pi)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	if (dcbx_mode == ICE_DCBX_MODE_IEEE)</div><div class='add'>+		dcbx_cfg = &amp;pi-&gt;local_dcbx_cfg;</div><div class='add'>+	else if (dcbx_mode == ICE_DCBX_MODE_CEE)</div><div class='add'>+		dcbx_cfg = &amp;pi-&gt;desired_dcbx_cfg;</div><div class='add'>+</div><div class='add'>+	/* Get Local DCB Config in case of ICE_DCBX_MODE_IEEE</div><div class='add'>+	 * or get CEE DCB Desired Config in case of ICE_DCBX_MODE_CEE</div><div class='add'>+	 */</div><div class='add'>+	ret = ice_aq_get_dcb_cfg(pi-&gt;hw, ICE_AQ_LLDP_MIB_LOCAL,</div><div class='add'>+				 ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID, dcbx_cfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Get Remote DCB Config */</div><div class='add'>+	dcbx_cfg = &amp;pi-&gt;remote_dcbx_cfg;</div><div class='add'>+	ret = ice_aq_get_dcb_cfg(pi-&gt;hw, ICE_AQ_LLDP_MIB_REMOTE,</div><div class='add'>+				 ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID, dcbx_cfg);</div><div class='add'>+	/* Don't treat ENOENT as an error for Remote MIBs */</div><div class='add'>+	if (pi-&gt;hw-&gt;adminq.sq_last_status == ICE_AQ_RC_ENOENT)</div><div class='add'>+		ret = 0;</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'>+ * ice_get_dcb_cfg</div><div class='add'>+ * @pi: port information structure</div><div class='add'>+ *</div><div class='add'>+ * Get DCB configuration from the Firmware</div><div class='add'>+ */</div><div class='add'>+enum ice_status ice_get_dcb_cfg(struct ice_port_info *pi)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_get_cee_dcb_cfg_resp cee_cfg;</div><div class='add'>+	struct ice_dcbx_cfg *dcbx_cfg;</div><div class='add'>+	enum ice_status ret;</div><div class='add'>+</div><div class='add'>+	if (!pi)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	ret = ice_aq_get_cee_dcb_cfg(pi-&gt;hw, &amp;cee_cfg, NULL);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* CEE mode */</div><div class='add'>+		dcbx_cfg = &amp;pi-&gt;local_dcbx_cfg;</div><div class='add'>+		dcbx_cfg-&gt;dcbx_mode = ICE_DCBX_MODE_CEE;</div><div class='add'>+		dcbx_cfg-&gt;tlv_status = le32_to_cpu(cee_cfg.tlv_status);</div><div class='add'>+		ice_cee_to_dcb_cfg(&amp;cee_cfg, dcbx_cfg);</div><div class='add'>+		ret = ice_get_ieee_or_cee_dcb_cfg(pi, ICE_DCBX_MODE_CEE);</div><div class='add'>+	} else if (pi-&gt;hw-&gt;adminq.sq_last_status == ICE_AQ_RC_ENOENT) {</div><div class='add'>+		/* CEE mode not enabled try querying IEEE data */</div><div class='add'>+		dcbx_cfg = &amp;pi-&gt;local_dcbx_cfg;</div><div class='add'>+		dcbx_cfg-&gt;dcbx_mode = ICE_DCBX_MODE_IEEE;</div><div class='add'>+		ret = ice_get_ieee_or_cee_dcb_cfg(pi, ICE_DCBX_MODE_IEEE);</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'>+ * ice_init_dcb</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ *</div><div class='add'>+ * Update DCB configuration from the Firmware</div><div class='add'>+ */</div><div class='add'>+enum ice_status ice_init_dcb(struct ice_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct ice_port_info *pi = hw-&gt;port_info;</div><div class='add'>+	enum ice_status ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;func_caps.common_cap.dcb)</div><div class='add'>+		return ICE_ERR_NOT_SUPPORTED;</div><div class='add'>+</div><div class='add'>+	pi-&gt;is_sw_lldp = true;</div><div class='add'>+</div><div class='add'>+	/* Get DCBX status */</div><div class='add'>+	pi-&gt;dcbx_status = ice_get_dcbx_status(hw);</div><div class='add'>+</div><div class='add'>+	if (pi-&gt;dcbx_status == ICE_DCBX_STATUS_DONE ||</div><div class='add'>+	    pi-&gt;dcbx_status == ICE_DCBX_STATUS_IN_PROGRESS) {</div><div class='add'>+		/* Get current DCBX configuration */</div><div class='add'>+		ret = ice_get_dcb_cfg(pi);</div><div class='add'>+		pi-&gt;is_sw_lldp = (hw-&gt;adminq.sq_last_status == ICE_AQ_RC_EPERM);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (pi-&gt;dcbx_status == ICE_DCBX_STATUS_DIS) {</div><div class='add'>+		return ICE_ERR_NOT_READY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure the LLDP MIB change event */</div><div class='add'>+	ret = ice_aq_cfg_lldp_mib_change(hw, true, NULL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		pi-&gt;is_sw_lldp = false;</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'>+ * ice_add_ieee_ets_common_tlv</div><div class='add'>+ * @buf: Data buffer to be populated with ice_dcb_ets_cfg data</div><div class='add'>+ * @ets_cfg: Container for ice_dcb_ets_cfg data</div><div class='add'>+ *</div><div class='add'>+ * Populate the TLV buffer with ice_dcb_ets_cfg data</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_ieee_ets_common_tlv(u8 *buf, struct ice_dcb_ets_cfg *ets_cfg)</div><div class='add'>+{</div><div class='add'>+	u8 priority0, priority1;</div><div class='add'>+	u8 offset = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Priority Assignment Table (4 octets)</div><div class='add'>+	 * Octets:|    1    |    2    |    3    |    4    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *        |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *   Bits:|7  4|3  0|7  4|3  0|7  4|3  0|7  4|3  0|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ICE_MAX_TRAFFIC_CLASS / 2; i++) {</div><div class='add'>+		priority0 = ets_cfg-&gt;prio_table[i * 2] &amp; 0xF;</div><div class='add'>+		priority1 = ets_cfg-&gt;prio_table[i * 2 + 1] &amp; 0xF;</div><div class='add'>+		buf[offset] = (priority0 &lt;&lt; ICE_IEEE_ETS_PRIO_1_S) | priority1;</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TC Bandwidth Table (8 octets)</div><div class='add'>+	 * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *</div><div class='add'>+	 * TSA Assignment Table (8 octets)</div><div class='add'>+	 * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|</div><div class='add'>+	 *        ---------------------------------</div><div class='add'>+	 */</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='add'>+		buf[offset] = ets_cfg-&gt;tcbwtable[i];</div><div class='add'>+		buf[ICE_MAX_TRAFFIC_CLASS + offset] = ets_cfg-&gt;tsatable[i];</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_add_ieee_ets_tlv - Prepare ETS TLV in IEEE format</div><div class='add'>+ * @tlv: Fill the ETS config data in IEEE format</div><div class='add'>+ * @dcbcfg: Local store which holds the DCB Config</div><div class='add'>+ *</div><div class='add'>+ * Prepare IEEE 802.1Qaz ETS CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_ieee_ets_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcb_ets_cfg *etscfg;</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+	u8 maxtcwilling = 0;</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+	u16 typelen;</div><div class='add'>+</div><div class='add'>+	typelen = ((ICE_TLV_TYPE_ORG &lt;&lt; ICE_LLDP_TLV_TYPE_S) |</div><div class='add'>+		   ICE_IEEE_ETS_TLV_LEN);</div><div class='add'>+	tlv-&gt;typelen = htons(typelen);</div><div class='add'>+</div><div class='add'>+	ouisubtype = ((ICE_IEEE_8021QAZ_OUI &lt;&lt; ICE_LLDP_TLV_OUI_S) |</div><div class='add'>+		      ICE_IEEE_SUBTYPE_ETS_CFG);</div><div class='add'>+	tlv-&gt;ouisubtype = htonl(ouisubtype);</div><div class='add'>+</div><div class='add'>+	/* First Octet post subtype</div><div class='add'>+	 * --------------------------</div><div class='add'>+	 * |will-|CBS  | Re-  | Max |</div><div class='add'>+	 * |ing  |     |served| TCs |</div><div class='add'>+	 * --------------------------</div><div class='add'>+	 * |1bit | 1bit|3 bits|3bits|</div><div class='add'>+	 */</div><div class='add'>+	etscfg = &amp;dcbcfg-&gt;etscfg;</div><div class='add'>+	if (etscfg-&gt;willing)</div><div class='add'>+		maxtcwilling = BIT(ICE_IEEE_ETS_WILLING_S);</div><div class='add'>+	maxtcwilling |= etscfg-&gt;maxtcs &amp; ICE_IEEE_ETS_MAXTC_M;</div><div class='add'>+	buf[0] = maxtcwilling;</div><div class='add'>+</div><div class='add'>+	/* Begin adding at Priority Assignment Table (offset 1 in buf) */</div><div class='add'>+	ice_add_ieee_ets_common_tlv(&amp;buf[1], etscfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_add_ieee_etsrec_tlv - Prepare ETS Recommended TLV in IEEE format</div><div class='add'>+ * @tlv: Fill ETS Recommended TLV in IEEE format</div><div class='add'>+ * @dcbcfg: Local store which holds the DCB Config</div><div class='add'>+ *</div><div class='add'>+ * Prepare IEEE 802.1Qaz ETS REC TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_ieee_etsrec_tlv(struct ice_lldp_org_tlv *tlv,</div><div class='add'>+			struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcb_ets_cfg *etsrec;</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+	u16 typelen;</div><div class='add'>+</div><div class='add'>+	typelen = ((ICE_TLV_TYPE_ORG &lt;&lt; ICE_LLDP_TLV_TYPE_S) |</div><div class='add'>+		   ICE_IEEE_ETS_TLV_LEN);</div><div class='add'>+	tlv-&gt;typelen = htons(typelen);</div><div class='add'>+</div><div class='add'>+	ouisubtype = ((ICE_IEEE_8021QAZ_OUI &lt;&lt; ICE_LLDP_TLV_OUI_S) |</div><div class='add'>+		      ICE_IEEE_SUBTYPE_ETS_REC);</div><div class='add'>+	tlv-&gt;ouisubtype = htonl(ouisubtype);</div><div class='add'>+</div><div class='add'>+	etsrec = &amp;dcbcfg-&gt;etsrec;</div><div class='add'>+</div><div class='add'>+	/* First Octet is reserved */</div><div class='add'>+	/* Begin adding at Priority Assignment Table (offset 1 in buf) */</div><div class='add'>+	ice_add_ieee_ets_common_tlv(&amp;buf[1], etsrec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_add_ieee_pfc_tlv - Prepare PFC TLV in IEEE format</div><div class='add'>+ * @tlv: Fill PFC TLV in IEEE format</div><div class='add'>+ * @dcbcfg: Local store which holds the PFC CFG data</div><div class='add'>+ *</div><div class='add'>+ * Prepare IEEE 802.1Qaz PFC CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_ieee_pfc_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+	u16 typelen;</div><div class='add'>+</div><div class='add'>+	typelen = ((ICE_TLV_TYPE_ORG &lt;&lt; ICE_LLDP_TLV_TYPE_S) |</div><div class='add'>+		   ICE_IEEE_PFC_TLV_LEN);</div><div class='add'>+	tlv-&gt;typelen = htons(typelen);</div><div class='add'>+</div><div class='add'>+	ouisubtype = ((ICE_IEEE_8021QAZ_OUI &lt;&lt; ICE_LLDP_TLV_OUI_S) |</div><div class='add'>+		      ICE_IEEE_SUBTYPE_PFC_CFG);</div><div class='add'>+	tlv-&gt;ouisubtype = htonl(ouisubtype);</div><div class='add'>+</div><div class='add'>+	/* ----------------------------------------</div><div class='add'>+	 * |will-|MBC  | Re-  | PFC |  PFC Enable  |</div><div class='add'>+	 * |ing  |     |served| cap |              |</div><div class='add'>+	 * -----------------------------------------</div><div class='add'>+	 * |1bit | 1bit|2 bits|4bits| 1 octet      |</div><div class='add'>+	 */</div><div class='add'>+	if (dcbcfg-&gt;pfc.willing)</div><div class='add'>+		buf[0] = BIT(ICE_IEEE_PFC_WILLING_S);</div><div class='add'>+</div><div class='add'>+	if (dcbcfg-&gt;pfc.mbc)</div><div class='add'>+		buf[0] |= BIT(ICE_IEEE_PFC_MBC_S);</div><div class='add'>+</div><div class='add'>+	buf[0] |= dcbcfg-&gt;pfc.pfccap &amp; 0xF;</div><div class='add'>+	buf[1] = dcbcfg-&gt;pfc.pfcena;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_add_ieee_app_pri_tlv -  Prepare APP TLV in IEEE format</div><div class='add'>+ * @tlv: Fill APP TLV in IEEE format</div><div class='add'>+ * @dcbcfg: Local store which holds the APP CFG data</div><div class='add'>+ *</div><div class='add'>+ * Prepare IEEE 802.1Qaz APP CFG TLV</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_ieee_app_pri_tlv(struct ice_lldp_org_tlv *tlv,</div><div class='add'>+			 struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u16 typelen, len, offset = 0;</div><div class='add'>+	u8 priority, selector, i = 0;</div><div class='add'>+	u8 *buf = tlv-&gt;tlvinfo;</div><div class='add'>+	u32 ouisubtype;</div><div class='add'>+</div><div class='add'>+	/* No APP TLVs then just return */</div><div class='add'>+	if (dcbcfg-&gt;numapps == 0)</div><div class='add'>+		return;</div><div class='add'>+	ouisubtype = ((ICE_IEEE_8021QAZ_OUI &lt;&lt; ICE_LLDP_TLV_OUI_S) |</div><div class='add'>+		      ICE_IEEE_SUBTYPE_APP_PRI);</div><div class='add'>+	tlv-&gt;ouisubtype = htonl(ouisubtype);</div><div class='add'>+</div><div class='add'>+	/* Move offset to App Priority Table */</div><div class='add'>+	offset++;</div><div class='add'>+	/* Application Priority Table (3 octets)</div><div class='add'>+	 * Octets:|         1          |    2    |    3    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *        |Priority|Rsrvd| Sel |    Protocol ID    |</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 *   Bits:|23    21|20 19|18 16|15                0|</div><div class='add'>+	 *        -----------------------------------------</div><div class='add'>+	 */</div><div class='add'>+	while (i &lt; dcbcfg-&gt;numapps) {</div><div class='add'>+		priority = dcbcfg-&gt;app[i].priority &amp; 0x7;</div><div class='add'>+		selector = dcbcfg-&gt;app[i].selector &amp; 0x7;</div><div class='add'>+		buf[offset] = (priority &lt;&lt; ICE_IEEE_APP_PRIO_S) | selector;</div><div class='add'>+		buf[offset + 1] = (dcbcfg-&gt;app[i].prot_id &gt;&gt; 0x8) &amp; 0xFF;</div><div class='add'>+		buf[offset + 2] = dcbcfg-&gt;app[i].prot_id &amp; 0xFF;</div><div class='add'>+		/* Move to next app */</div><div class='add'>+		offset += 3;</div><div class='add'>+		i++;</div><div class='add'>+		if (i &gt;= ICE_DCBX_MAX_APPS)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	/* len includes size of ouisubtype + 1 reserved + 3*numapps */</div><div class='add'>+	len = sizeof(tlv-&gt;ouisubtype) + 1 + (i * 3);</div><div class='add'>+	typelen = ((ICE_TLV_TYPE_ORG &lt;&lt; ICE_LLDP_TLV_TYPE_S) | (len &amp; 0x1FF));</div><div class='add'>+	tlv-&gt;typelen = htons(typelen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_add_dcb_tlv - Add all IEEE TLVs</div><div class='add'>+ * @tlv: Fill TLV data in IEEE format</div><div class='add'>+ * @dcbcfg: Local store which holds the DCB Config</div><div class='add'>+ * @tlvid: Type of IEEE TLV</div><div class='add'>+ *</div><div class='add'>+ * Add tlv information</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_dcb_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg,</div><div class='add'>+		u16 tlvid)</div><div class='add'>+{</div><div class='add'>+	switch (tlvid) {</div><div class='add'>+	case ICE_IEEE_TLV_ID_ETS_CFG:</div><div class='add'>+		ice_add_ieee_ets_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_IEEE_TLV_ID_ETS_REC:</div><div class='add'>+		ice_add_ieee_etsrec_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_IEEE_TLV_ID_PFC_CFG:</div><div class='add'>+		ice_add_ieee_pfc_tlv(tlv, dcbcfg);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_IEEE_TLV_ID_APP_PRI:</div><div class='add'>+		ice_add_ieee_app_pri_tlv(tlv, dcbcfg);</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'>+ * ice_dcb_cfg_to_lldp - Convert DCB configuration to MIB format</div><div class='add'>+ * @lldpmib: pointer to the HW struct</div><div class='add'>+ * @miblen: length of LLDP MIB</div><div class='add'>+ * @dcbcfg: Local store which holds the DCB Config</div><div class='add'>+ *</div><div class='add'>+ * Convert the DCB configuration to MIB format</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_dcb_cfg_to_lldp(u8 *lldpmib, u16 *miblen, struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u16 len, offset = 0, tlvid = ICE_TLV_ID_START;</div><div class='add'>+	struct ice_lldp_org_tlv *tlv;</div><div class='add'>+	u16 typelen;</div><div class='add'>+</div><div class='add'>+	tlv = (struct ice_lldp_org_tlv *)lldpmib;</div><div class='add'>+	while (1) {</div><div class='add'>+		ice_add_dcb_tlv(tlv, dcbcfg, tlvid++);</div><div class='add'>+		typelen = ntohs(tlv-&gt;typelen);</div><div class='add'>+		len = (typelen &amp; ICE_LLDP_TLV_LEN_M) &gt;&gt; ICE_LLDP_TLV_LEN_S;</div><div class='add'>+		if (len)</div><div class='add'>+			offset += len + 2;</div><div class='add'>+		/* END TLV or beyond LLDPDU size */</div><div class='add'>+		if (tlvid &gt;= ICE_TLV_ID_END_OF_LLDPPDU ||</div><div class='add'>+		    offset &gt; ICE_LLDPDU_SIZE)</div><div class='add'>+			break;</div><div class='add'>+		/* Move to next TLV */</div><div class='add'>+		if (len)</div><div class='add'>+			tlv = (struct ice_lldp_org_tlv *)</div><div class='add'>+				((char *)tlv + sizeof(tlv-&gt;typelen) + len);</div><div class='add'>+	}</div><div class='add'>+	*miblen = offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_set_dcb_cfg - Set the local LLDP MIB to FW</div><div class='add'>+ * @pi: port information structure</div><div class='add'>+ *</div><div class='add'>+ * Set DCB configuration to the Firmware</div><div class='add'>+ */</div><div class='add'>+enum ice_status ice_set_dcb_cfg(struct ice_port_info *pi)</div><div class='add'>+{</div><div class='add'>+	u8 mib_type, *lldpmib = NULL;</div><div class='add'>+	struct ice_dcbx_cfg *dcbcfg;</div><div class='add'>+	enum ice_status ret;</div><div class='add'>+	struct ice_hw *hw;</div><div class='add'>+	u16 miblen;</div><div class='add'>+</div><div class='add'>+	if (!pi)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	hw = pi-&gt;hw;</div><div class='add'>+</div><div class='add'>+	/* update the HW local config */</div><div class='add'>+	dcbcfg = &amp;pi-&gt;local_dcbx_cfg;</div><div class='add'>+	/* Allocate the LLDPDU */</div><div class='add'>+	lldpmib = devm_kzalloc(ice_hw_to_dev(hw), ICE_LLDPDU_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!lldpmib)</div><div class='add'>+		return ICE_ERR_NO_MEMORY;</div><div class='add'>+</div><div class='add'>+	mib_type = SET_LOCAL_MIB_TYPE_LOCAL_MIB;</div><div class='add'>+	if (dcbcfg-&gt;app_mode == ICE_DCBX_APPS_NON_WILLING)</div><div class='add'>+		mib_type |= SET_LOCAL_MIB_TYPE_CEE_NON_WILLING;</div><div class='add'>+</div><div class='add'>+	ice_dcb_cfg_to_lldp(lldpmib, &amp;miblen, dcbcfg);</div><div class='add'>+	ret = ice_aq_set_lldp_mib(hw, mib_type, (void *)lldpmib, miblen,</div><div class='add'>+				  NULL);</div><div class='add'>+</div><div class='add'>+	devm_kfree(ice_hw_to_dev(hw), lldpmib);</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'>+ * ice_aq_query_port_ets - query port ets configuration</div><div class='add'>+ * @pi: port information structure</div><div class='add'>+ * @buf: pointer to buffer</div><div class='add'>+ * @buf_size: buffer size in bytes</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * query current port ets configuration</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_aq_query_port_ets(struct ice_port_info *pi,</div><div class='add'>+		      struct ice_aqc_port_ets_elem *buf, u16 buf_size,</div><div class='add'>+		      struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_query_port_ets *cmd;</div><div class='add'>+	struct ice_aq_desc desc;</div><div class='add'>+	enum ice_status status;</div><div class='add'>+</div><div class='add'>+	if (!pi)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+	cmd = &amp;desc.params.port_ets;</div><div class='add'>+	ice_fill_dflt_direct_cmd_desc(&amp;desc, ice_aqc_opc_query_port_ets);</div><div class='add'>+	cmd-&gt;port_teid = pi-&gt;root-&gt;info.node_teid;</div><div class='add'>+</div><div class='add'>+	status = ice_aq_send_cmd(pi-&gt;hw, &amp;desc, buf, buf_size, cd);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_update_port_tc_tree_cfg - update TC tree configuration</div><div class='add'>+ * @pi: port information structure</div><div class='add'>+ * @buf: pointer to buffer</div><div class='add'>+ *</div><div class='add'>+ * update the SW DB with the new TC changes</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_update_port_tc_tree_cfg(struct ice_port_info *pi,</div><div class='add'>+			    struct ice_aqc_port_ets_elem *buf)</div><div class='add'>+{</div><div class='add'>+	struct ice_sched_node *node, *tc_node;</div><div class='add'>+	struct ice_aqc_get_elem elem;</div><div class='add'>+	enum ice_status status = 0;</div><div class='add'>+	u32 teid1, teid2;</div><div class='add'>+	u8 i, j;</div><div class='add'>+</div><div class='add'>+	if (!pi)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+	/* suspend the missing TC nodes */</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;root-&gt;num_children; i++) {</div><div class='add'>+		teid1 = le32_to_cpu(pi-&gt;root-&gt;children[i]-&gt;info.node_teid);</div><div class='add'>+		ice_for_each_traffic_class(j) {</div><div class='add'>+			teid2 = le32_to_cpu(buf-&gt;tc_node_teid[j]);</div><div class='add'>+			if (teid1 == teid2)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (j &lt; ICE_MAX_TRAFFIC_CLASS)</div><div class='add'>+			continue;</div><div class='add'>+		/* TC is missing */</div><div class='add'>+		pi-&gt;root-&gt;children[i]-&gt;in_use = false;</div><div class='add'>+	}</div><div class='add'>+	/* add the new TC nodes */</div><div class='add'>+	ice_for_each_traffic_class(j) {</div><div class='add'>+		teid2 = le32_to_cpu(buf-&gt;tc_node_teid[j]);</div><div class='add'>+		if (teid2 == ICE_INVAL_TEID)</div><div class='add'>+			continue;</div><div class='add'>+		/* Is it already present in the tree ? */</div><div class='add'>+		for (i = 0; i &lt; pi-&gt;root-&gt;num_children; i++) {</div><div class='add'>+			tc_node = pi-&gt;root-&gt;children[i];</div><div class='add'>+			if (!tc_node)</div><div class='add'>+				continue;</div><div class='add'>+			teid1 = le32_to_cpu(tc_node-&gt;info.node_teid);</div><div class='add'>+			if (teid1 == teid2) {</div><div class='add'>+				tc_node-&gt;tc_num = j;</div><div class='add'>+				tc_node-&gt;in_use = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (i &lt; pi-&gt;root-&gt;num_children)</div><div class='add'>+			continue;</div><div class='add'>+		/* new TC */</div><div class='add'>+		status = ice_sched_query_elem(pi-&gt;hw, teid2, &amp;elem);</div><div class='add'>+		if (!status)</div><div class='add'>+			status = ice_sched_add_node(pi, 1, &amp;elem.generic[0]);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+		/* update the TC number */</div><div class='add'>+		node = ice_sched_find_node_by_teid(pi-&gt;root, teid2);</div><div class='add'>+		if (node)</div><div class='add'>+			node-&gt;tc_num = j;</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'>+ * ice_query_port_ets - query port ets configuration</div><div class='add'>+ * @pi: port information structure</div><div class='add'>+ * @buf: pointer to buffer</div><div class='add'>+ * @buf_size: buffer size in bytes</div><div class='add'>+ * @cd: pointer to command details structure or NULL</div><div class='add'>+ *</div><div class='add'>+ * query current port ets configuration and update the</div><div class='add'>+ * SW DB with the TC changes</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_query_port_ets(struct ice_port_info *pi,</div><div class='add'>+		   struct ice_aqc_port_ets_elem *buf, u16 buf_size,</div><div class='add'>+		   struct ice_sq_cd *cd)</div><div class='add'>+{</div><div class='add'>+	enum ice_status status;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pi-&gt;sched_lock);</div><div class='add'>+	status = ice_aq_query_port_ets(pi, buf, buf_size, cd);</div><div class='add'>+	if (!status)</div><div class='add'>+		status = ice_update_port_tc_tree_cfg(pi, buf);</div><div class='add'>+	mutex_unlock(&amp;pi-&gt;sched_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_dcb.h b/drivers/net/ethernet/intel/ice/ice_dcb.h<br/>new file mode 100644<br/>index 000000000000..e7d4416e3a66<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_dcb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_dcb.h</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) 2019, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#ifndef _ICE_DCB_H_</div><div class='add'>+#define _ICE_DCB_H_</div><div class='add'>+</div><div class='add'>+#include "ice_type.h"</div><div class='add'>+</div><div class='add'>+#define ICE_DCBX_STATUS_NOT_STARTED	0</div><div class='add'>+#define ICE_DCBX_STATUS_IN_PROGRESS	1</div><div class='add'>+#define ICE_DCBX_STATUS_DONE		2</div><div class='add'>+#define ICE_DCBX_STATUS_DIS		7</div><div class='add'>+</div><div class='add'>+#define ICE_TLV_TYPE_END		0</div><div class='add'>+#define ICE_TLV_TYPE_ORG		127</div><div class='add'>+</div><div class='add'>+#define ICE_IEEE_8021QAZ_OUI		0x0080C2</div><div class='add'>+#define ICE_IEEE_SUBTYPE_ETS_CFG	9</div><div class='add'>+#define ICE_IEEE_SUBTYPE_ETS_REC	10</div><div class='add'>+#define ICE_IEEE_SUBTYPE_PFC_CFG	11</div><div class='add'>+#define ICE_IEEE_SUBTYPE_APP_PRI	12</div><div class='add'>+</div><div class='add'>+#define ICE_CEE_DCBX_OUI		0x001B21</div><div class='add'>+#define ICE_CEE_DCBX_TYPE		2</div><div class='add'>+#define ICE_CEE_SUBTYPE_PG_CFG		2</div><div class='add'>+#define ICE_CEE_SUBTYPE_PFC_CFG		3</div><div class='add'>+#define ICE_CEE_SUBTYPE_APP_PRI		4</div><div class='add'>+#define ICE_CEE_MAX_FEAT_TYPE		3</div><div class='add'>+/* Defines for LLDP TLV header */</div><div class='add'>+#define ICE_LLDP_TLV_LEN_S		0</div><div class='add'>+#define ICE_LLDP_TLV_LEN_M		(0x01FF &lt;&lt; ICE_LLDP_TLV_LEN_S)</div><div class='add'>+#define ICE_LLDP_TLV_TYPE_S		9</div><div class='add'>+#define ICE_LLDP_TLV_TYPE_M		(0x7F &lt;&lt; ICE_LLDP_TLV_TYPE_S)</div><div class='add'>+#define ICE_LLDP_TLV_SUBTYPE_S		0</div><div class='add'>+#define ICE_LLDP_TLV_SUBTYPE_M		(0xFF &lt;&lt; ICE_LLDP_TLV_SUBTYPE_S)</div><div class='add'>+#define ICE_LLDP_TLV_OUI_S		8</div><div class='add'>+#define ICE_LLDP_TLV_OUI_M		(0xFFFFFFUL &lt;&lt; ICE_LLDP_TLV_OUI_S)</div><div class='add'>+</div><div class='add'>+/* Defines for IEEE ETS TLV */</div><div class='add'>+#define ICE_IEEE_ETS_MAXTC_S	0</div><div class='add'>+#define ICE_IEEE_ETS_MAXTC_M		(0x7 &lt;&lt; ICE_IEEE_ETS_MAXTC_S)</div><div class='add'>+#define ICE_IEEE_ETS_CBS_S		6</div><div class='add'>+#define ICE_IEEE_ETS_CBS_M		BIT(ICE_IEEE_ETS_CBS_S)</div><div class='add'>+#define ICE_IEEE_ETS_WILLING_S		7</div><div class='add'>+#define ICE_IEEE_ETS_WILLING_M		BIT(ICE_IEEE_ETS_WILLING_S)</div><div class='add'>+#define ICE_IEEE_ETS_PRIO_0_S		0</div><div class='add'>+#define ICE_IEEE_ETS_PRIO_0_M		(0x7 &lt;&lt; ICE_IEEE_ETS_PRIO_0_S)</div><div class='add'>+#define ICE_IEEE_ETS_PRIO_1_S		4</div><div class='add'>+#define ICE_IEEE_ETS_PRIO_1_M		(0x7 &lt;&lt; ICE_IEEE_ETS_PRIO_1_S)</div><div class='add'>+#define ICE_CEE_PGID_PRIO_0_S		0</div><div class='add'>+#define ICE_CEE_PGID_PRIO_0_M		(0xF &lt;&lt; ICE_CEE_PGID_PRIO_0_S)</div><div class='add'>+#define ICE_CEE_PGID_PRIO_1_S		4</div><div class='add'>+#define ICE_CEE_PGID_PRIO_1_M		(0xF &lt;&lt; ICE_CEE_PGID_PRIO_1_S)</div><div class='add'>+#define ICE_CEE_PGID_STRICT		15</div><div class='add'>+</div><div class='add'>+/* Defines for IEEE TSA types */</div><div class='add'>+#define ICE_IEEE_TSA_STRICT		0</div><div class='add'>+#define ICE_IEEE_TSA_ETS		2</div><div class='add'>+</div><div class='add'>+/* Defines for IEEE PFC TLV */</div><div class='add'>+#define ICE_IEEE_PFC_CAP_S		0</div><div class='add'>+#define ICE_IEEE_PFC_CAP_M		(0xF &lt;&lt; ICE_IEEE_PFC_CAP_S)</div><div class='add'>+#define ICE_IEEE_PFC_MBC_S		6</div><div class='add'>+#define ICE_IEEE_PFC_MBC_M		BIT(ICE_IEEE_PFC_MBC_S)</div><div class='add'>+#define ICE_IEEE_PFC_WILLING_S		7</div><div class='add'>+#define ICE_IEEE_PFC_WILLING_M		BIT(ICE_IEEE_PFC_WILLING_S)</div><div class='add'>+</div><div class='add'>+/* Defines for IEEE APP TLV */</div><div class='add'>+#define ICE_IEEE_APP_SEL_S		0</div><div class='add'>+#define ICE_IEEE_APP_SEL_M		(0x7 &lt;&lt; ICE_IEEE_APP_SEL_S)</div><div class='add'>+#define ICE_IEEE_APP_PRIO_S		5</div><div class='add'>+#define ICE_IEEE_APP_PRIO_M		(0x7 &lt;&lt; ICE_IEEE_APP_PRIO_S)</div><div class='add'>+</div><div class='add'>+/* TLV definitions for preparing MIB */</div><div class='add'>+#define ICE_IEEE_TLV_ID_ETS_CFG		3</div><div class='add'>+#define ICE_IEEE_TLV_ID_ETS_REC		4</div><div class='add'>+#define ICE_IEEE_TLV_ID_PFC_CFG		5</div><div class='add'>+#define ICE_IEEE_TLV_ID_APP_PRI		6</div><div class='add'>+#define ICE_TLV_ID_END_OF_LLDPPDU	7</div><div class='add'>+#define ICE_TLV_ID_START		ICE_IEEE_TLV_ID_ETS_CFG</div><div class='add'>+</div><div class='add'>+#define ICE_IEEE_ETS_TLV_LEN		25</div><div class='add'>+#define ICE_IEEE_PFC_TLV_LEN		6</div><div class='add'>+#define ICE_IEEE_APP_TLV_LEN		11</div><div class='add'>+</div><div class='add'>+/* IEEE 802.1AB LLDP Organization specific TLV */</div><div class='add'>+struct ice_lldp_org_tlv {</div><div class='add'>+	__be16 typelen;</div><div class='add'>+	__be32 ouisubtype;</div><div class='add'>+	u8 tlvinfo[1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ice_cee_tlv_hdr {</div><div class='add'>+	__be16 typelen;</div><div class='add'>+	u8 operver;</div><div class='add'>+	u8 maxver;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ice_cee_ctrl_tlv {</div><div class='add'>+	struct ice_cee_tlv_hdr hdr;</div><div class='add'>+	__be32 seqno;</div><div class='add'>+	__be32 ackno;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ice_cee_feat_tlv {</div><div class='add'>+	struct ice_cee_tlv_hdr hdr;</div><div class='add'>+	u8 en_will_err; /* Bits: |En|Will|Err|Reserved(5)| */</div><div class='add'>+#define ICE_CEE_FEAT_TLV_ENA_M		0x80</div><div class='add'>+#define ICE_CEE_FEAT_TLV_WILLING_M	0x40</div><div class='add'>+#define ICE_CEE_FEAT_TLV_ERR_M		0x20</div><div class='add'>+	u8 subtype;</div><div class='add'>+	u8 tlvinfo[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ice_cee_app_prio {</div><div class='add'>+	__be16 protocol;</div><div class='add'>+	u8 upper_oui_sel; /* Bits: |Upper OUI(6)|Selector(2)| */</div><div class='add'>+#define ICE_CEE_APP_SELECTOR_M	0x03</div><div class='add'>+	__be16 lower_oui;</div><div class='add'>+	u8 prio_map;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+u8 ice_get_dcbx_status(struct ice_hw *hw);</div><div class='add'>+enum ice_status ice_lldp_to_dcb_cfg(u8 *lldpmib, struct ice_dcbx_cfg *dcbcfg);</div><div class='add'>+enum ice_status ice_get_dcb_cfg(struct ice_port_info *pi);</div><div class='add'>+enum ice_status ice_set_dcb_cfg(struct ice_port_info *pi);</div><div class='add'>+enum ice_status ice_init_dcb(struct ice_hw *hw);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_query_port_ets(struct ice_port_info *pi,</div><div class='add'>+		   struct ice_aqc_port_ets_elem *buf, u16 buf_size,</div><div class='add'>+		   struct ice_sq_cd *cmd_details);</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_stop_lldp(struct ice_hw *hw, bool shutdown_lldp_agent,</div><div class='add'>+		 struct ice_sq_cd *cd);</div><div class='add'>+enum ice_status ice_aq_start_lldp(struct ice_hw *hw, struct ice_sq_cd *cd);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_start_stop_dcbx(struct ice_hw *hw, bool start_dcbx_agent,</div><div class='add'>+		       bool *dcbx_agent_status, struct ice_sq_cd *cd);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_cfg_lldp_mib_change(struct ice_hw *hw, bool ena_update,</div><div class='add'>+			   struct ice_sq_cd *cd);</div><div class='add'>+#else /* CONFIG_DCB */</div><div class='add'>+static inline enum ice_status</div><div class='add'>+ice_aq_stop_lldp(struct ice_hw __always_unused *hw,</div><div class='add'>+		 bool __always_unused shutdown_lldp_agent,</div><div class='add'>+		 struct ice_sq_cd __always_unused *cd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum ice_status</div><div class='add'>+ice_aq_start_lldp(struct ice_hw __always_unused *hw,</div><div class='add'>+		  struct ice_sq_cd __always_unused *cd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum ice_status</div><div class='add'>+ice_aq_start_stop_dcbx(struct ice_hw __always_unused *hw,</div><div class='add'>+		       bool __always_unused start_dcbx_agent,</div><div class='add'>+		       bool *dcbx_agent_status,</div><div class='add'>+		       struct ice_sq_cd __always_unused *cd)</div><div class='add'>+{</div><div class='add'>+	*dcbx_agent_status = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum ice_status</div><div class='add'>+ice_aq_cfg_lldp_mib_change(struct ice_hw __always_unused *hw,</div><div class='add'>+			   bool __always_unused ena_update,</div><div class='add'>+			   struct ice_sq_cd __always_unused *cd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='add'>+#endif /* _ICE_DCB_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c<br/>new file mode 100644<br/>index 000000000000..3e81af1884fc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_dcb_lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_dcb_lib.c</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#include "ice_dcb_lib.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_dcb_get_ena_tc - return bitmap of enabled TCs</div><div class='add'>+ * @dcbcfg: DCB config to evaluate for enabled TCs</div><div class='add'>+ */</div><div class='add'>+u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	u8 i, num_tc, ena_tc = 1;</div><div class='add'>+</div><div class='add'>+	num_tc = ice_dcb_get_num_tc(dcbcfg);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_tc; i++)</div><div class='add'>+		ena_tc |= BIT(i);</div><div class='add'>+</div><div class='add'>+	return ena_tc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_dcb_get_num_tc - Get the number of TCs from DCBX config</div><div class='add'>+ * @dcbcfg: config to retrieve number of TCs from</div><div class='add'>+ */</div><div class='add'>+u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	bool tc_unused = false;</div><div class='add'>+	u8 num_tc = 0;</div><div class='add'>+	u8 ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Scan the ETS Config Priority Table to find traffic classes</div><div class='add'>+	 * enabled and create a bitmask of enabled TCs</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; CEE_DCBX_MAX_PRIO; i++)</div><div class='add'>+		num_tc |= BIT(dcbcfg-&gt;etscfg.prio_table[i]);</div><div class='add'>+</div><div class='add'>+	/* Scan bitmask for contiguous TCs starting with TC0 */</div><div class='add'>+	for (i = 0; i &lt; IEEE_8021QAZ_MAX_TCS; i++) {</div><div class='add'>+		if (num_tc &amp; BIT(i)) {</div><div class='add'>+			if (!tc_unused) {</div><div class='add'>+				ret++;</div><div class='add'>+			} else {</div><div class='add'>+				pr_err("Non-contiguous TCs - Disabling DCB\n");</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			tc_unused = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* There is always at least 1 TC */</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = 1;</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'>+ * ice_vsi_cfg_dcb_rings - Update rings to reflect DCB TC</div><div class='add'>+ * @vsi: VSI owner of rings being updated</div><div class='add'>+ */</div><div class='add'>+void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi)</div><div class='add'>+{</div><div class='add'>+	struct ice_ring *tx_ring, *rx_ring;</div><div class='add'>+	u16 qoffset, qcount;</div><div class='add'>+	int i, n;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ICE_FLAG_DCB_ENA, vsi-&gt;back-&gt;flags)) {</div><div class='add'>+		/* Reset the TC information */</div><div class='add'>+		for (i = 0; i &lt; vsi-&gt;num_txq; i++) {</div><div class='add'>+			tx_ring = vsi-&gt;tx_rings[i];</div><div class='add'>+			tx_ring-&gt;dcb_tc = 0;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; vsi-&gt;num_rxq; i++) {</div><div class='add'>+			rx_ring = vsi-&gt;rx_rings[i];</div><div class='add'>+			rx_ring-&gt;dcb_tc = 0;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ice_for_each_traffic_class(n) {</div><div class='add'>+		if (!(vsi-&gt;tc_cfg.ena_tc &amp; BIT(n)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		qoffset = vsi-&gt;tc_cfg.tc_info[n].qoffset;</div><div class='add'>+		qcount = vsi-&gt;tc_cfg.tc_info[n].qcount_tx;</div><div class='add'>+		for (i = qoffset; i &lt; (qoffset + qcount); i++) {</div><div class='add'>+			tx_ring = vsi-&gt;tx_rings[i];</div><div class='add'>+			rx_ring = vsi-&gt;rx_rings[i];</div><div class='add'>+			tx_ring-&gt;dcb_tc = n;</div><div class='add'>+			rx_ring-&gt;dcb_tc = n;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pf_dcb_recfg - Reconfigure all VEBs and VSIs</div><div class='add'>+ * @pf: pointer to the PF struct</div><div class='add'>+ *</div><div class='add'>+ * Assumed caller has already disabled all VSIs before</div><div class='add'>+ * calling this function. Reconfiguring DCB based on</div><div class='add'>+ * local_dcbx_cfg.</div><div class='add'>+ */</div><div class='add'>+static void ice_pf_dcb_recfg(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcbx_cfg *dcbcfg = &amp;pf-&gt;hw.port_info-&gt;local_dcbx_cfg;</div><div class='add'>+	u8 tc_map = 0;</div><div class='add'>+	int v, ret;</div><div class='add'>+</div><div class='add'>+	/* Update each VSI */</div><div class='add'>+	ice_for_each_vsi(pf, v) {</div><div class='add'>+		if (!pf-&gt;vsi[v])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pf-&gt;vsi[v]-&gt;type == ICE_VSI_PF)</div><div class='add'>+			tc_map = ice_dcb_get_ena_tc(dcbcfg);</div><div class='add'>+		else</div><div class='add'>+			tc_map = ICE_DFLT_TRAFFIC_CLASS;</div><div class='add'>+</div><div class='add'>+		ret = ice_vsi_cfg_tc(pf-&gt;vsi[v], tc_map);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				"Failed to config TC for VSI index: %d\n",</div><div class='add'>+				pf-&gt;vsi[v]-&gt;idx);</div><div class='add'>+		else</div><div class='add'>+			ice_vsi_map_rings_to_vectors(pf-&gt;vsi[v]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pf_dcb_cfg - Apply new DCB configuration</div><div class='add'>+ * @pf: pointer to the PF struct</div><div class='add'>+ * @new_cfg: DCBX config to apply</div><div class='add'>+ */</div><div class='add'>+static int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcbx_cfg *old_cfg, *curr_cfg;</div><div class='add'>+	struct ice_aqc_port_ets_elem buf = { 0 };</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	curr_cfg = &amp;pf-&gt;hw.port_info-&gt;local_dcbx_cfg;</div><div class='add'>+</div><div class='add'>+	/* Enable DCB tagging only when more than one TC */</div><div class='add'>+	if (ice_dcb_get_num_tc(new_cfg) &gt; 1) {</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "DCB tagging enabled (num TC &gt; 1)\n");</div><div class='add'>+		set_bit(ICE_FLAG_DCB_ENA, pf-&gt;flags);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "DCB tagging disabled (num TC = 1)\n");</div><div class='add'>+		clear_bit(ICE_FLAG_DCB_ENA, pf-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!memcmp(new_cfg, curr_cfg, sizeof(*new_cfg))) {</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "No change in DCB config required\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store old config in case FW config fails */</div><div class='add'>+	old_cfg = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*old_cfg), GFP_KERNEL);</div><div class='add'>+	memcpy(old_cfg, curr_cfg, sizeof(*old_cfg));</div><div class='add'>+</div><div class='add'>+	/* avoid race conditions by holding the lock while disabling and</div><div class='add'>+	 * re-enabling the VSI</div><div class='add'>+	 */</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	ice_pf_dis_all_vsi(pf, true);</div><div class='add'>+</div><div class='add'>+	memcpy(curr_cfg, new_cfg, sizeof(*curr_cfg));</div><div class='add'>+	memcpy(&amp;curr_cfg-&gt;etsrec, &amp;curr_cfg-&gt;etscfg, sizeof(curr_cfg-&gt;etsrec));</div><div class='add'>+</div><div class='add'>+	/* Only send new config to HW if we are in SW LLDP mode. Otherwise,</div><div class='add'>+	 * the new config came from the HW in the first place.</div><div class='add'>+	 */</div><div class='add'>+	if (pf-&gt;hw.port_info-&gt;is_sw_lldp) {</div><div class='add'>+		ret = ice_set_dcb_cfg(pf-&gt;hw.port_info);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;pf-&gt;pdev-&gt;dev, "Set DCB Config failed\n");</div><div class='add'>+			/* Restore previous settings to local config */</div><div class='add'>+			memcpy(curr_cfg, old_cfg, sizeof(*curr_cfg));</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ice_query_port_ets(pf-&gt;hw.port_info, &amp;buf, sizeof(buf), NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Query Port ETS failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ice_pf_dcb_recfg(pf);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ice_pf_ena_all_vsi(pf, true);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, old_cfg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_dcb_rebuild - rebuild DCB post reset</div><div class='add'>+ * @pf: physical function instance</div><div class='add'>+ */</div><div class='add'>+void ice_dcb_rebuild(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_port_ets_elem buf = { 0 };</div><div class='add'>+	struct ice_dcbx_cfg *prev_cfg;</div><div class='add'>+	enum ice_status ret;</div><div class='add'>+	u8 willing;</div><div class='add'>+</div><div class='add'>+	ret = ice_query_port_ets(pf-&gt;hw.port_info, &amp;buf, sizeof(buf), NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Query Port ETS failed\n");</div><div class='add'>+		goto dcb_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If DCB was not enabled previously, we are done */</div><div class='add'>+	if (!test_bit(ICE_FLAG_DCB_ENA, pf-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Save current willing state and force FW to unwilling */</div><div class='add'>+	willing = pf-&gt;hw.port_info-&gt;local_dcbx_cfg.etscfg.willing;</div><div class='add'>+	pf-&gt;hw.port_info-&gt;local_dcbx_cfg.etscfg.willing = 0x0;</div><div class='add'>+	ret = ice_set_dcb_cfg(pf-&gt;hw.port_info);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Failed to set DCB to unwilling\n");</div><div class='add'>+		goto dcb_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Retrieve DCB config and ensure same as current in SW */</div><div class='add'>+	prev_cfg = devm_kmemdup(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				&amp;pf-&gt;hw.port_info-&gt;local_dcbx_cfg,</div><div class='add'>+				sizeof(*prev_cfg), GFP_KERNEL);</div><div class='add'>+	if (!prev_cfg) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Failed to alloc space for DCB cfg\n");</div><div class='add'>+		goto dcb_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ice_init_dcb(&amp;pf-&gt;hw);</div><div class='add'>+	if (memcmp(prev_cfg, &amp;pf-&gt;hw.port_info-&gt;local_dcbx_cfg,</div><div class='add'>+		   sizeof(*prev_cfg))) {</div><div class='add'>+		/* difference in cfg detected - disable DCB till next MIB */</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Set local MIB not accurate\n");</div><div class='add'>+		devm_kfree(&amp;pf-&gt;pdev-&gt;dev, prev_cfg);</div><div class='add'>+		goto dcb_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fetched config congruent to previous configuration */</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, prev_cfg);</div><div class='add'>+</div><div class='add'>+	/* Configuration replayed - reset willing state to previous */</div><div class='add'>+	pf-&gt;hw.port_info-&gt;local_dcbx_cfg.etscfg.willing = willing;</div><div class='add'>+	ret = ice_set_dcb_cfg(pf-&gt;hw.port_info);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Fail restoring prev willing state\n");</div><div class='add'>+		goto dcb_error;</div><div class='add'>+	}</div><div class='add'>+	dev_info(&amp;pf-&gt;pdev-&gt;dev, "DCB restored after reset\n");</div><div class='add'>+	ret = ice_query_port_ets(pf-&gt;hw.port_info, &amp;buf, sizeof(buf), NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Query Port ETS failed\n");</div><div class='add'>+		goto dcb_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+dcb_error:</div><div class='add'>+	dev_err(&amp;pf-&gt;pdev-&gt;dev, "Disabling DCB until new settings occur\n");</div><div class='add'>+	prev_cfg = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*prev_cfg), GFP_KERNEL);</div><div class='add'>+	prev_cfg-&gt;etscfg.willing = true;</div><div class='add'>+	prev_cfg-&gt;etscfg.tcbwtable[0] = ICE_TC_MAX_BW;</div><div class='add'>+	prev_cfg-&gt;etscfg.tsatable[0] = ICE_IEEE_TSA_ETS;</div><div class='add'>+	memcpy(&amp;prev_cfg-&gt;etsrec, &amp;prev_cfg-&gt;etscfg, sizeof(prev_cfg-&gt;etsrec));</div><div class='add'>+	ice_pf_dcb_cfg(pf, prev_cfg);</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, prev_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_dcb_init_cfg - set the initial DCB config in SW</div><div class='add'>+ * @pf: pf to apply config to</div><div class='add'>+ */</div><div class='add'>+static int ice_dcb_init_cfg(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcbx_cfg *newcfg;</div><div class='add'>+	struct ice_port_info *pi;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	pi = pf-&gt;hw.port_info;</div><div class='add'>+	newcfg = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*newcfg), GFP_KERNEL);</div><div class='add'>+	if (!newcfg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(newcfg, &amp;pi-&gt;local_dcbx_cfg, sizeof(*newcfg));</div><div class='add'>+	memset(&amp;pi-&gt;local_dcbx_cfg, 0, sizeof(*newcfg));</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pf-&gt;pdev-&gt;dev, "Configuring initial DCB values\n");</div><div class='add'>+	if (ice_pf_dcb_cfg(pf, newcfg))</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, newcfg);</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'>+ * ice_dcb_sw_default_config - Apply a default DCB config</div><div class='add'>+ * @pf: pf to apply config to</div><div class='add'>+ */</div><div class='add'>+static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_port_ets_elem buf = { 0 };</div><div class='add'>+	struct ice_dcbx_cfg *dcbcfg;</div><div class='add'>+	struct ice_port_info *pi;</div><div class='add'>+	struct ice_hw *hw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hw = &amp;pf-&gt;hw;</div><div class='add'>+	pi = hw-&gt;port_info;</div><div class='add'>+	dcbcfg = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*dcbcfg), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	memset(dcbcfg, 0, sizeof(*dcbcfg));</div><div class='add'>+	memset(&amp;pi-&gt;local_dcbx_cfg, 0, sizeof(*dcbcfg));</div><div class='add'>+</div><div class='add'>+	dcbcfg-&gt;etscfg.willing = 1;</div><div class='add'>+	dcbcfg-&gt;etscfg.maxtcs = 8;</div><div class='add'>+	dcbcfg-&gt;etscfg.tcbwtable[0] = 100;</div><div class='add'>+	dcbcfg-&gt;etscfg.tsatable[0] = ICE_IEEE_TSA_ETS;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;dcbcfg-&gt;etsrec, &amp;dcbcfg-&gt;etscfg,</div><div class='add'>+	       sizeof(dcbcfg-&gt;etsrec));</div><div class='add'>+	dcbcfg-&gt;etsrec.willing = 0;</div><div class='add'>+</div><div class='add'>+	dcbcfg-&gt;pfc.willing = 1;</div><div class='add'>+	dcbcfg-&gt;pfc.pfccap = IEEE_8021QAZ_MAX_TCS;</div><div class='add'>+</div><div class='add'>+	dcbcfg-&gt;numapps = 1;</div><div class='add'>+	dcbcfg-&gt;app[0].selector = ICE_APP_SEL_ETHTYPE;</div><div class='add'>+	dcbcfg-&gt;app[0].priority = 3;</div><div class='add'>+	dcbcfg-&gt;app[0].prot_id = ICE_APP_PROT_ID_FCOE;</div><div class='add'>+</div><div class='add'>+	ret = ice_pf_dcb_cfg(pf, dcbcfg);</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, dcbcfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ice_query_port_ets(pi, &amp;buf, sizeof(buf), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_init_pf_dcb - initialize DCB for a PF</div><div class='add'>+ * @pf: pf to initiialize DCB for</div><div class='add'>+ */</div><div class='add'>+int ice_init_pf_dcb(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pf-&gt;pdev-&gt;dev;</div><div class='add'>+	struct ice_port_info *port_info;</div><div class='add'>+	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='add'>+	int sw_default = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port_info = hw-&gt;port_info;</div><div class='add'>+</div><div class='add'>+	/* check if device is DCB capable */</div><div class='add'>+	if (!hw-&gt;func_caps.common_cap.dcb) {</div><div class='add'>+		dev_dbg(dev, "DCB not supported\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Best effort to put DCBx and LLDP into a good state */</div><div class='add'>+	port_info-&gt;dcbx_status = ice_get_dcbx_status(hw);</div><div class='add'>+	if (port_info-&gt;dcbx_status != ICE_DCBX_STATUS_DONE &amp;&amp;</div><div class='add'>+	    port_info-&gt;dcbx_status != ICE_DCBX_STATUS_IN_PROGRESS) {</div><div class='add'>+		bool dcbx_status;</div><div class='add'>+</div><div class='add'>+		/* Attempt to start LLDP engine. Ignore errors</div><div class='add'>+		 * as this will error if it is already started</div><div class='add'>+		 */</div><div class='add'>+		ice_aq_start_lldp(hw, NULL);</div><div class='add'>+</div><div class='add'>+		/* Attempt to start DCBX. Ignore errors as this</div><div class='add'>+		 * will error if it is already started</div><div class='add'>+		 */</div><div class='add'>+		ice_aq_start_stop_dcbx(hw, true, &amp;dcbx_status, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ice_init_dcb(hw);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* FW LLDP not in usable state, default to SW DCBx/LLDP */</div><div class='add'>+		dev_info(&amp;pf-&gt;pdev-&gt;dev, "FW LLDP not in usable state\n");</div><div class='add'>+		hw-&gt;port_info-&gt;dcbx_status = ICE_DCBX_STATUS_NOT_STARTED;</div><div class='add'>+		hw-&gt;port_info-&gt;is_sw_lldp = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port_info-&gt;dcbx_status == ICE_DCBX_STATUS_DIS)</div><div class='add'>+		dev_info(&amp;pf-&gt;pdev-&gt;dev, "DCBX disabled\n");</div><div class='add'>+</div><div class='add'>+	/* LLDP disabled in FW */</div><div class='add'>+	if (port_info-&gt;is_sw_lldp) {</div><div class='add'>+		sw_default = 1;</div><div class='add'>+		dev_info(&amp;pf-&gt;pdev-&gt;dev, "DCBx/LLDP in SW mode.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port_info-&gt;dcbx_status == ICE_DCBX_STATUS_NOT_STARTED) {</div><div class='add'>+		sw_default = 1;</div><div class='add'>+		dev_info(&amp;pf-&gt;pdev-&gt;dev, "DCBX not started\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sw_default) {</div><div class='add'>+		err = ice_dcb_sw_dflt_cfg(pf);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				"Failed to set local DCB config %d\n", err);</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto dcb_init_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pf-&gt;dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;</div><div class='add'>+		set_bit(ICE_FLAG_DCB_CAPABLE, pf-&gt;flags);</div><div class='add'>+		set_bit(ICE_FLAG_DCB_ENA, pf-&gt;flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DCBX in FW and LLDP enabled in FW */</div><div class='add'>+	pf-&gt;dcbx_cap = DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_IEEE;</div><div class='add'>+</div><div class='add'>+	set_bit(ICE_FLAG_DCB_CAPABLE, pf-&gt;flags);</div><div class='add'>+</div><div class='add'>+	err = ice_dcb_init_cfg(pf);</div><div class='add'>+	if (err)</div><div class='add'>+		goto dcb_init_err;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pf-&gt;pdev-&gt;dev, "DCBX offload supported\n");</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+dcb_init_err:</div><div class='add'>+	dev_err(dev, "DCB init failed\n");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_update_dcb_stats - Update DCB stats counters</div><div class='add'>+ * @pf: PF whose stats needs to be updated</div><div class='add'>+ */</div><div class='add'>+void ice_update_dcb_stats(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	struct ice_hw_port_stats *prev_ps, *cur_ps;</div><div class='add'>+	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='add'>+	u8 pf_id = hw-&gt;pf_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	prev_ps = &amp;pf-&gt;stats_prev;</div><div class='add'>+	cur_ps = &amp;pf-&gt;stats;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		ice_stat_update32(hw, GLPRT_PXOFFRXC(pf_id, i),</div><div class='add'>+				  pf-&gt;stat_prev_loaded,</div><div class='add'>+				  &amp;prev_ps-&gt;priority_xoff_rx[i],</div><div class='add'>+				  &amp;cur_ps-&gt;priority_xoff_rx[i]);</div><div class='add'>+		ice_stat_update32(hw, GLPRT_PXONRXC(pf_id, i),</div><div class='add'>+				  pf-&gt;stat_prev_loaded,</div><div class='add'>+				  &amp;prev_ps-&gt;priority_xon_rx[i],</div><div class='add'>+				  &amp;cur_ps-&gt;priority_xon_rx[i]);</div><div class='add'>+		ice_stat_update32(hw, GLPRT_PXONTXC(pf_id, i),</div><div class='add'>+				  pf-&gt;stat_prev_loaded,</div><div class='add'>+				  &amp;prev_ps-&gt;priority_xon_tx[i],</div><div class='add'>+				  &amp;cur_ps-&gt;priority_xon_tx[i]);</div><div class='add'>+		ice_stat_update32(hw, GLPRT_PXOFFTXC(pf_id, i),</div><div class='add'>+				  pf-&gt;stat_prev_loaded,</div><div class='add'>+				  &amp;prev_ps-&gt;priority_xoff_tx[i],</div><div class='add'>+				  &amp;cur_ps-&gt;priority_xoff_tx[i]);</div><div class='add'>+		ice_stat_update32(hw, GLPRT_RXON2OFFCNT(pf_id, i),</div><div class='add'>+				  pf-&gt;stat_prev_loaded,</div><div class='add'>+				  &amp;prev_ps-&gt;priority_xon_2_xoff[i],</div><div class='add'>+				  &amp;cur_ps-&gt;priority_xon_2_xoff[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_tx_prepare_vlan_flags_dcb - prepare VLAN tagging for DCB</div><div class='add'>+ * @tx_ring: ring to send buffer on</div><div class='add'>+ * @first: pointer to struct ice_tx_buf</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+ice_tx_prepare_vlan_flags_dcb(struct ice_ring *tx_ring,</div><div class='add'>+			      struct ice_tx_buf *first)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = first-&gt;skb;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ICE_FLAG_DCB_ENA, tx_ring-&gt;vsi-&gt;back-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Insert 802.1p priority into VLAN header */</div><div class='add'>+	if ((first-&gt;tx_flags &amp; (ICE_TX_FLAGS_HW_VLAN | ICE_TX_FLAGS_SW_VLAN)) ||</div><div class='add'>+	    skb-&gt;priority != TC_PRIO_CONTROL) {</div><div class='add'>+		first-&gt;tx_flags &amp;= ~ICE_TX_FLAGS_VLAN_PR_M;</div><div class='add'>+		/* Mask the lower 3 bits to set the 802.1p priority */</div><div class='add'>+		first-&gt;tx_flags |= (skb-&gt;priority &amp; 0x7) &lt;&lt;</div><div class='add'>+				   ICE_TX_FLAGS_VLAN_PR_S;</div><div class='add'>+		if (first-&gt;tx_flags &amp; ICE_TX_FLAGS_SW_VLAN) {</div><div class='add'>+			struct vlan_ethhdr *vhdr;</div><div class='add'>+			int rc;</div><div class='add'>+</div><div class='add'>+			rc = skb_cow_head(skb, 0);</div><div class='add'>+			if (rc &lt; 0)</div><div class='add'>+				return rc;</div><div class='add'>+			vhdr = (struct vlan_ethhdr *)skb-&gt;data;</div><div class='add'>+			vhdr-&gt;h_vlan_TCI = htons(first-&gt;tx_flags &gt;&gt;</div><div class='add'>+						 ICE_TX_FLAGS_VLAN_S);</div><div class='add'>+		} else {</div><div class='add'>+			first-&gt;tx_flags |= ICE_TX_FLAGS_HW_VLAN;</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'>+ * ice_dcb_process_lldp_set_mib_change - Process MIB change</div><div class='add'>+ * @pf: ptr to ice_pf</div><div class='add'>+ * @event: pointer to the admin queue receive event</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,</div><div class='add'>+				    struct ice_rq_event_info *event)</div><div class='add'>+{</div><div class='add'>+	if (pf-&gt;dcbx_cap &amp; DCB_CAP_DCBX_LLD_MANAGED) {</div><div class='add'>+		struct ice_dcbx_cfg *dcbcfg, *prev_cfg;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		prev_cfg = &amp;pf-&gt;hw.port_info-&gt;local_dcbx_cfg;</div><div class='add'>+		dcbcfg = devm_kmemdup(&amp;pf-&gt;pdev-&gt;dev, prev_cfg,</div><div class='add'>+				      sizeof(*dcbcfg), GFP_KERNEL);</div><div class='add'>+		if (!dcbcfg)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		err = ice_lldp_to_dcb_cfg(event-&gt;msg_buf, dcbcfg);</div><div class='add'>+		if (!err)</div><div class='add'>+			ice_pf_dcb_cfg(pf, dcbcfg);</div><div class='add'>+</div><div class='add'>+		devm_kfree(&amp;pf-&gt;pdev-&gt;dev, dcbcfg);</div><div class='add'>+</div><div class='add'>+		/* Get updated DCBx data from firmware */</div><div class='add'>+		err = ice_get_dcb_cfg(pf-&gt;hw.port_info);</div><div class='add'>+		if (err)</div><div class='add'>+			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				"Failed to get DCB config\n");</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"MIB Change Event in HOST mode\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h<br/>new file mode 100644<br/>index 000000000000..ca7b76faa03c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_dcb_lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_dcb_lib.h</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) 2019, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#ifndef _ICE_DCB_LIB_H_</div><div class='add'>+#define _ICE_DCB_LIB_H_</div><div class='add'>+</div><div class='add'>+#include "ice.h"</div><div class='add'>+#include "ice_lib.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+#define ICE_TC_MAX_BW 100 /* Default Max BW percentage */</div><div class='add'>+</div><div class='add'>+void ice_dcb_rebuild(struct ice_pf *pf);</div><div class='add'>+u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg *dcbcfg);</div><div class='add'>+u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg);</div><div class='add'>+void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi);</div><div class='add'>+int ice_init_pf_dcb(struct ice_pf *pf);</div><div class='add'>+void ice_update_dcb_stats(struct ice_pf *pf);</div><div class='add'>+int</div><div class='add'>+ice_tx_prepare_vlan_flags_dcb(struct ice_ring *tx_ring,</div><div class='add'>+			      struct ice_tx_buf *first);</div><div class='add'>+void</div><div class='add'>+ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,</div><div class='add'>+				    struct ice_rq_event_info *event);</div><div class='add'>+static inline void</div><div class='add'>+ice_set_cgd_num(struct ice_tlan_ctx *tlan_ctx, struct ice_ring *ring)</div><div class='add'>+{</div><div class='add'>+	tlan_ctx-&gt;cgd_num = ring-&gt;dcb_tc;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define ice_dcb_rebuild(pf) do {} while (0)</div><div class='add'>+</div><div class='add'>+static inline u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg __always_unused *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	return ICE_DFLT_TRAFFIC_CLASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg __always_unused *dcbcfg)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ice_init_pf_dcb(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "DCB not supported\n");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+ice_tx_prepare_vlan_flags_dcb(struct ice_ring __always_unused *tx_ring,</div><div class='add'>+			      struct ice_tx_buf __always_unused *first)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ice_update_dcb_stats(pf) do {} while (0)</div><div class='add'>+#define ice_vsi_cfg_dcb_rings(vsi) do {} while (0)</div><div class='add'>+#define ice_dcb_process_lldp_set_mib_change(pf, event) do {} while (0)</div><div class='add'>+#define ice_set_cgd_num(tlan_ctx, ring) do {} while (0)</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='add'>+#endif /* _ICE_DCB_LIB_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c<br/>index eb8d149e317c..1341fde8d53f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_ethtool.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> /* ethtool support for ice */</div><div class='ctx'> </div><div class='ctx'> #include "ice.h"</div><div class='add'>+#include "ice_lib.h"</div><div class='add'>+#include "ice_dcb_lib.h"</div><div class='ctx'> </div><div class='ctx'> struct ice_stats {</div><div class='ctx'> 	char stat_string[ETH_GSTRING_LEN];</div><div class='hunk'>@@ -33,8 +35,14 @@ static int ice_q_stats_len(struct net_device *netdev)</div><div class='ctx'> #define ICE_PF_STATS_LEN	ARRAY_SIZE(ice_gstrings_pf_stats)</div><div class='ctx'> #define ICE_VSI_STATS_LEN	ARRAY_SIZE(ice_gstrings_vsi_stats)</div><div class='ctx'> </div><div class='del'>-#define ICE_ALL_STATS_LEN(n)	(ICE_PF_STATS_LEN + ICE_VSI_STATS_LEN + \</div><div class='del'>-				 ice_q_stats_len(n))</div><div class='add'>+#define ICE_PFC_STATS_LEN ( \</div><div class='add'>+		(FIELD_SIZEOF(struct ice_pf, stats.priority_xoff_rx) + \</div><div class='add'>+		 FIELD_SIZEOF(struct ice_pf, stats.priority_xon_rx) + \</div><div class='add'>+		 FIELD_SIZEOF(struct ice_pf, stats.priority_xoff_tx) + \</div><div class='add'>+		 FIELD_SIZEOF(struct ice_pf, stats.priority_xon_tx)) \</div><div class='add'>+		 / sizeof(u64))</div><div class='add'>+#define ICE_ALL_STATS_LEN(n)	(ICE_PF_STATS_LEN + ICE_PFC_STATS_LEN + \</div><div class='add'>+				 ICE_VSI_STATS_LEN + ice_q_stats_len(n))</div><div class='ctx'> </div><div class='ctx'> static const struct ice_stats ice_gstrings_vsi_stats[] = {</div><div class='ctx'> 	ICE_VSI_STAT("tx_unicast", eth_stats.tx_unicast),</div><div class='hunk'>@@ -126,6 +134,7 @@ struct ice_priv_flag {</div><div class='ctx'> </div><div class='ctx'> static const struct ice_priv_flag ice_gstrings_priv_flags[] = {</div><div class='ctx'> 	ICE_PRIV_FLAG("link-down-on-close", ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA),</div><div class='add'>+	ICE_PRIV_FLAG("disable-fw-lldp", ICE_FLAG_DISABLE_FW_LLDP),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ICE_PRIV_FLAG_ARRAY_SIZE	ARRAY_SIZE(ice_gstrings_priv_flags)</div><div class='hunk'>@@ -309,6 +318,22 @@ static void ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data)</div><div class='ctx'> 			p += ETH_GSTRING_LEN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		for (i = 0; i &lt; ICE_MAX_USER_PRIORITY; i++) {</div><div class='add'>+			snprintf(p, ETH_GSTRING_LEN,</div><div class='add'>+				 "port.tx-priority-%u-xon", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			snprintf(p, ETH_GSTRING_LEN,</div><div class='add'>+				 "port.tx-priority-%u-xoff", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; ICE_MAX_USER_PRIORITY; i++) {</div><div class='add'>+			snprintf(p, ETH_GSTRING_LEN,</div><div class='add'>+				 "port.rx-priority-%u-xon", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			snprintf(p, ETH_GSTRING_LEN,</div><div class='add'>+				 "port.rx-priority-%u-xoff", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETH_SS_PRIV_FLAGS:</div><div class='ctx'> 		for (i = 0; i &lt; ICE_PRIV_FLAG_ARRAY_SIZE; i++) {</div><div class='hunk'>@@ -382,13 +407,19 @@ static u32 ice_get_priv_flags(struct net_device *netdev)</div><div class='ctx'> static int ice_set_priv_flags(struct net_device *netdev, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='add'>+	DECLARE_BITMAP(change_flags, ICE_PF_FLAGS_NBITS);</div><div class='add'>+	DECLARE_BITMAP(orig_flags, ICE_PF_FLAGS_NBITS);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &gt; BIT(ICE_PRIV_FLAG_ARRAY_SIZE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	set_bit(ICE_FLAG_ETHTOOL_CTXT, pf-&gt;flags);</div><div class='add'>+</div><div class='add'>+	bitmap_copy(orig_flags, pf-&gt;flags, ICE_PF_FLAGS_NBITS);</div><div class='ctx'> 	for (i = 0; i &lt; ICE_PRIV_FLAG_ARRAY_SIZE; i++) {</div><div class='ctx'> 		const struct ice_priv_flag *priv_flag;</div><div class='ctx'> </div><div class='hunk'>@@ -400,7 +431,79 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)</div><div class='ctx'> 			clear_bit(priv_flag-&gt;bitno, pf-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	bitmap_xor(change_flags, pf-&gt;flags, orig_flags, ICE_PF_FLAGS_NBITS);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ICE_FLAG_DISABLE_FW_LLDP, change_flags)) {</div><div class='add'>+		if (test_bit(ICE_FLAG_DISABLE_FW_LLDP, pf-&gt;flags)) {</div><div class='add'>+			enum ice_status status;</div><div class='add'>+</div><div class='add'>+			status = ice_aq_cfg_lldp_mib_change(&amp;pf-&gt;hw, false,</div><div class='add'>+							    NULL);</div><div class='add'>+			/* If unregistering for LLDP events fails, this is</div><div class='add'>+			 * not an error state, as there shouldn't be any</div><div class='add'>+			 * events to respond to.</div><div class='add'>+			 */</div><div class='add'>+			if (status)</div><div class='add'>+				dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					 "Failed to unreg for LLDP events\n");</div><div class='add'>+</div><div class='add'>+			/* The AQ call to stop the FW LLDP agent will generate</div><div class='add'>+			 * an error if the agent is already stopped.</div><div class='add'>+			 */</div><div class='add'>+			status = ice_aq_stop_lldp(&amp;pf-&gt;hw, true, NULL);</div><div class='add'>+			if (status)</div><div class='add'>+				dev_warn(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					 "Fail to stop LLDP agent\n");</div><div class='add'>+			/* Use case for having the FW LLDP agent stopped</div><div class='add'>+			 * will likely not need DCB, so failure to init is</div><div class='add'>+			 * not a concern of ethtool</div><div class='add'>+			 */</div><div class='add'>+			status = ice_init_pf_dcb(pf);</div><div class='add'>+			if (status)</div><div class='add'>+				dev_warn(&amp;pf-&gt;pdev-&gt;dev, "Fail to init DCB\n");</div><div class='add'>+		} else {</div><div class='add'>+			enum ice_status status;</div><div class='add'>+			bool dcbx_agent_status;</div><div class='add'>+</div><div class='add'>+			/* AQ command to start FW LLDP agent will return an</div><div class='add'>+			 * error if the agent is already started</div><div class='add'>+			 */</div><div class='add'>+			status = ice_aq_start_lldp(&amp;pf-&gt;hw, NULL);</div><div class='add'>+			if (status)</div><div class='add'>+				dev_warn(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					 "Fail to start LLDP Agent\n");</div><div class='add'>+</div><div class='add'>+			/* AQ command to start FW DCBx agent will fail if</div><div class='add'>+			 * the agent is already started</div><div class='add'>+			 */</div><div class='add'>+			status = ice_aq_start_stop_dcbx(&amp;pf-&gt;hw, true,</div><div class='add'>+							&amp;dcbx_agent_status,</div><div class='add'>+							NULL);</div><div class='add'>+			if (status)</div><div class='add'>+				dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					"Failed to start FW DCBX\n");</div><div class='add'>+</div><div class='add'>+			dev_info(&amp;pf-&gt;pdev-&gt;dev, "FW DCBX agent is %s\n",</div><div class='add'>+				 dcbx_agent_status ? "ACTIVE" : "DISABLED");</div><div class='add'>+</div><div class='add'>+			/* Failure to configure MIB change or init DCB is not</div><div class='add'>+			 * relevant to ethtool.  Print notification that</div><div class='add'>+			 * registration/init failed but do not return error</div><div class='add'>+			 * state to ethtool</div><div class='add'>+			 */</div><div class='add'>+			status = ice_aq_cfg_lldp_mib_change(&amp;pf-&gt;hw, false,</div><div class='add'>+							    NULL);</div><div class='add'>+			if (status)</div><div class='add'>+				dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					"Fail to reg for MIB change\n");</div><div class='add'>+</div><div class='add'>+			status = ice_init_pf_dcb(pf);</div><div class='add'>+			if (status)</div><div class='add'>+				dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "Fail to init DCB\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	clear_bit(ICE_FLAG_ETHTOOL_CTXT, pf-&gt;flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ice_get_sset_count(struct net_device *netdev, int sset)</div><div class='hunk'>@@ -486,6 +589,16 @@ ice_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 		data[i++] = (ice_gstrings_pf_stats[j].sizeof_stat ==</div><div class='ctx'> 			     sizeof(u64)) ? *(u64 *)p : *(u32 *)p;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ICE_MAX_USER_PRIORITY; j++) {</div><div class='add'>+		data[i++] = pf-&gt;stats.priority_xon_tx[j];</div><div class='add'>+		data[i++] = pf-&gt;stats.priority_xoff_tx[j];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ICE_MAX_USER_PRIORITY; j++) {</div><div class='add'>+		data[i++] = pf-&gt;stats.priority_xon_rx[j];</div><div class='add'>+		data[i++] = pf-&gt;stats.priority_xoff_rx[j];</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -811,7 +924,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,</div><div class='ctx'> </div><div class='ctx'> 	link_info = &amp;vsi-&gt;port_info-&gt;phy.link_info;</div><div class='ctx'> </div><div class='del'>-	/* Initialize supported and advertised settings based on phy settings */</div><div class='add'>+	/* Initialize supported and advertised settings based on PHY settings */</div><div class='ctx'> 	switch (link_info-&gt;phy_type_low) {</div><div class='ctx'> 	case ICE_PHY_TYPE_LOW_100BASE_TX:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);</div><div class='hunk'>@@ -921,6 +1034,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,</div><div class='ctx'> 						     25000baseCR_Full);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_PHY_TYPE_LOW_25G_AUI_AOC_ACC:</div><div class='add'>+	case ICE_PHY_TYPE_LOW_25G_AUI_C2C:</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(ks, supported,</div><div class='ctx'> 						     25000baseCR_Full);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1137,10 +1251,10 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> ice_get_settings_link_down(struct ethtool_link_ksettings *ks,</div><div class='del'>-			   struct net_device __always_unused *netdev)</div><div class='add'>+			   struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	/* link is down and the driver needs to fall back on</div><div class='del'>-	 * supported phy types to figure out what info to display</div><div class='add'>+	 * supported PHY types to figure out what info to display</div><div class='ctx'> 	 */</div><div class='ctx'> 	ice_phy_type_to_ethtool(netdev, ks);</div><div class='ctx'> </div><div class='hunk'>@@ -1156,8 +1270,9 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks,</div><div class='ctx'>  *</div><div class='ctx'>  * Reports speed/duplex settings based on media_type</div><div class='ctx'>  */</div><div class='del'>-static int ice_get_link_ksettings(struct net_device *netdev,</div><div class='del'>-				  struct ethtool_link_ksettings *ks)</div><div class='add'>+static int</div><div class='add'>+ice_get_link_ksettings(struct net_device *netdev,</div><div class='add'>+		       struct ethtool_link_ksettings *ks)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_link_status *hw_link_info;</div><div class='hunk'>@@ -1349,7 +1464,7 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* If autoneg is currently enabled */</div><div class='ctx'> 		if (p-&gt;phy.link_info.an_info &amp; ICE_AQ_AN_COMPLETED) {</div><div class='del'>-			/* If autoneg is supported 10GBASE_T is the only phy</div><div class='add'>+			/* If autoneg is supported 10GBASE_T is the only PHY</div><div class='ctx'> 			 * that can disable it, so otherwise return error</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (ethtool_link_ksettings_test_link_mode(ks,</div><div class='hunk'>@@ -1399,14 +1514,13 @@ ice_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* Check if this is lan vsi */</div><div class='del'>-	for (idx = 0 ; idx &lt;  pf-&gt;num_alloc_vsi ; idx++) {</div><div class='add'>+	/* Check if this is LAN VSI */</div><div class='add'>+	ice_for_each_vsi(pf, idx)</div><div class='ctx'> 		if (pf-&gt;vsi[idx]-&gt;type == ICE_VSI_PF) {</div><div class='ctx'> 			if (np-&gt;vsi != pf-&gt;vsi[idx])</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;phy.media_type != ICE_MEDIA_BASET &amp;&amp;</div><div class='ctx'> 	    p-&gt;phy.media_type != ICE_MEDIA_FIBER &amp;&amp;</div><div class='hunk'>@@ -1464,7 +1578,7 @@ ice_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 	if (!abilities)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Get the current phy config */</div><div class='add'>+	/* Get the current PHY config */</div><div class='ctx'> 	status = ice_aq_get_phy_caps(p, false, ICE_AQC_REPORT_SW_CFG, abilities,</div><div class='ctx'> 				     NULL);</div><div class='ctx'> 	if (status) {</div><div class='hunk'>@@ -1559,15 +1673,16 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_get_rxnfc - command to get RX flow classification rules</div><div class='add'>+ * ice_get_rxnfc - command to get Rx flow classification rules</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @cmd: ethtool rxnfc command</div><div class='ctx'>  * @rule_locs: buffer to rturn Rx flow classification rules</div><div class='ctx'>  *</div><div class='ctx'>  * Returns Success if the command is supported.</div><div class='ctx'>  */</div><div class='del'>-static int ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,</div><div class='del'>-			 u32 __always_unused *rule_locs)</div><div class='add'>+static int</div><div class='add'>+ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,</div><div class='add'>+	      u32 __always_unused *rule_locs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='hunk'>@@ -1821,18 +1936,21 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)</div><div class='ctx'> 	struct ice_port_info *pi = np-&gt;vsi-&gt;port_info;</div><div class='ctx'> 	struct ice_aqc_get_phy_caps_data *pcaps;</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='add'>+	struct ice_dcbx_cfg *dcbx_cfg;</div><div class='ctx'> 	enum ice_status status;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize pause params */</div><div class='ctx'> 	pause-&gt;rx_pause = 0;</div><div class='ctx'> 	pause-&gt;tx_pause = 0;</div><div class='ctx'> </div><div class='add'>+	dcbx_cfg = &amp;pi-&gt;local_dcbx_cfg;</div><div class='add'>+</div><div class='ctx'> 	pcaps = devm_kzalloc(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, sizeof(*pcaps),</div><div class='ctx'> 			     GFP_KERNEL);</div><div class='ctx'> 	if (!pcaps)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Get current phy config */</div><div class='add'>+	/* Get current PHY config */</div><div class='ctx'> 	status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,</div><div class='ctx'> 				     NULL);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -1841,6 +1959,10 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)</div><div class='ctx'> 	pause-&gt;autoneg = ((pcaps-&gt;caps &amp; ICE_AQC_PHY_AN_MODE) ?</div><div class='ctx'> 			AUTONEG_ENABLE : AUTONEG_DISABLE);</div><div class='ctx'> </div><div class='add'>+	if (dcbx_cfg-&gt;pfc.pfcena)</div><div class='add'>+		/* PFC enabled so report LFC as off */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (pcaps-&gt;caps &amp; ICE_AQC_PHY_EN_TX_LINK_PAUSE)</div><div class='ctx'> 		pause-&gt;tx_pause = 1;</div><div class='ctx'> 	if (pcaps-&gt;caps &amp; ICE_AQC_PHY_EN_RX_LINK_PAUSE)</div><div class='hunk'>@@ -1861,6 +1983,7 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_link_status *hw_link_info;</div><div class='ctx'> 	struct ice_pf *pf = np-&gt;vsi-&gt;back;</div><div class='add'>+	struct ice_dcbx_cfg *dcbx_cfg;</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	struct ice_port_info *pi;</div><div class='hunk'>@@ -1871,6 +1994,7 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)</div><div class='ctx'> </div><div class='ctx'> 	pi = vsi-&gt;port_info;</div><div class='ctx'> 	hw_link_info = &amp;pi-&gt;phy.link_info;</div><div class='add'>+	dcbx_cfg = &amp;pi-&gt;local_dcbx_cfg;</div><div class='ctx'> 	link_up = hw_link_info-&gt;link_info &amp; ICE_AQ_LINK_UP;</div><div class='ctx'> </div><div class='ctx'> 	/* Changing the port's flow control is not supported if this isn't the</div><div class='hunk'>@@ -1893,6 +2017,10 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)</div><div class='ctx'> 		netdev_info(netdev, "Autoneg did not complete so changing settings may not result in an actual change.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dcbx_cfg-&gt;pfc.pfcena) {</div><div class='add'>+		netdev_info(netdev, "Priority flow control enabled. Cannot set link flow control.\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> 	if (pause-&gt;rx_pause &amp;&amp; pause-&gt;tx_pause)</div><div class='ctx'> 		pi-&gt;fc.req_mode = ICE_FC_FULL;</div><div class='ctx'> 	else if (pause-&gt;rx_pause &amp;&amp; !pause-&gt;tx_pause)</div><div class='hunk'>@@ -2021,11 +2149,12 @@ out:</div><div class='ctx'>  * @key: hash key</div><div class='ctx'>  * @hfunc: hash function</div><div class='ctx'>  *</div><div class='del'>- * Returns -EINVAL if the table specifies an invalid queue id, otherwise</div><div class='add'>+ * Returns -EINVAL if the table specifies an invalid queue ID, otherwise</div><div class='ctx'>  * returns 0 after programming the table.</div><div class='ctx'>  */</div><div class='del'>-static int ice_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</div><div class='add'>+ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key,</div><div class='add'>+	     const u8 hfunc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='hunk'>@@ -2087,7 +2216,7 @@ enum ice_container_type {</div><div class='ctx'> /**</div><div class='ctx'>  * ice_get_rc_coalesce - get ITR values for specific ring container</div><div class='ctx'>  * @ec: ethtool structure to fill with driver's coalesce settings</div><div class='del'>- * @c_type: container type, RX or TX</div><div class='add'>+ * @c_type: container type, Rx or Tx</div><div class='ctx'>  * @rc: ring container that the ITR values will come from</div><div class='ctx'>  *</div><div class='ctx'>  * Query the device for ice_ring_container specific ITR values. This is</div><div class='hunk'>@@ -2100,12 +2229,18 @@ static int</div><div class='ctx'> ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type,</div><div class='ctx'> 		    struct ice_ring_container *rc)</div><div class='ctx'> {</div><div class='del'>-	struct ice_pf *pf = rc-&gt;ring-&gt;vsi-&gt;back;</div><div class='add'>+	struct ice_pf *pf;</div><div class='add'>+</div><div class='add'>+	if (!rc-&gt;ring)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pf = rc-&gt;ring-&gt;vsi-&gt;back;</div><div class='ctx'> </div><div class='ctx'> 	switch (c_type) {</div><div class='ctx'> 	case ICE_RX_CONTAINER:</div><div class='ctx'> 		ec-&gt;use_adaptive_rx_coalesce = ITR_IS_DYNAMIC(rc-&gt;itr_setting);</div><div class='ctx'> 		ec-&gt;rx_coalesce_usecs = rc-&gt;itr_setting &amp; ~ICE_ITR_DYNAMIC;</div><div class='add'>+		ec-&gt;rx_coalesce_usecs_high = rc-&gt;ring-&gt;q_vector-&gt;intrl;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_TX_CONTAINER:</div><div class='ctx'> 		ec-&gt;use_adaptive_tx_coalesce = ITR_IS_DYNAMIC(rc-&gt;itr_setting);</div><div class='hunk'>@@ -2120,49 +2255,60 @@ ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_get_q_coalesce - get a queue's ITR/INTRL (coalesce) settings</div><div class='add'>+ * @vsi: VSI associated to the queue for getting ITR/INTRL (coalesce) settings</div><div class='add'>+ * @ec: coalesce settings to program the device with</div><div class='add'>+ * @q_num: update ITR/INTRL (coalesce) settings for this queue number/index</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, and negative under the following conditions:</div><div class='add'>+ * 1. Getting Tx or Rx ITR/INTRL (coalesce) settings failed.</div><div class='add'>+ * 2. The q_num passed in is not a valid number/index for Tx and Rx rings.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ice_get_q_coalesce(struct ice_vsi *vsi, struct ethtool_coalesce *ec, int q_num)</div><div class='add'>+{</div><div class='add'>+	if (q_num &lt; vsi-&gt;num_rxq &amp;&amp; q_num &lt; vsi-&gt;num_txq) {</div><div class='add'>+		if (ice_get_rc_coalesce(ec, ICE_RX_CONTAINER,</div><div class='add'>+					&amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (ice_get_rc_coalesce(ec, ICE_TX_CONTAINER,</div><div class='add'>+					&amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (q_num &lt; vsi-&gt;num_rxq) {</div><div class='add'>+		if (ice_get_rc_coalesce(ec, ICE_RX_CONTAINER,</div><div class='add'>+					&amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (q_num &lt; vsi-&gt;num_txq) {</div><div class='add'>+		if (ice_get_rc_coalesce(ec, ICE_TX_CONTAINER,</div><div class='add'>+					&amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</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'>+/**</div><div class='ctx'>  * __ice_get_coalesce - get ITR/INTRL values for the device</div><div class='ctx'>  * @netdev: pointer to the netdev associated with this query</div><div class='ctx'>  * @ec: ethtool structure to fill with driver's coalesce settings</div><div class='ctx'>  * @q_num: queue number to get the coalesce settings for</div><div class='add'>+ *</div><div class='add'>+ * If the caller passes in a negative q_num then we return coalesce settings</div><div class='add'>+ * based on queue number 0, else use the actual q_num passed in.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> __ice_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec,</div><div class='ctx'> 		   int q_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='del'>-	int tx = -EINVAL, rx = -EINVAL;</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='ctx'> </div><div class='del'>-	if (q_num &lt; 0) {</div><div class='del'>-		rx = ice_get_rc_coalesce(ec, ICE_RX_CONTAINER,</div><div class='del'>-					 &amp;vsi-&gt;rx_rings[0]-&gt;q_vector-&gt;rx);</div><div class='del'>-		tx = ice_get_rc_coalesce(ec, ICE_TX_CONTAINER,</div><div class='del'>-					 &amp;vsi-&gt;tx_rings[0]-&gt;q_vector-&gt;tx);</div><div class='del'>-</div><div class='del'>-		goto update_coalesced_frames;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (q_num &lt; vsi-&gt;num_rxq &amp;&amp; q_num &lt; vsi-&gt;num_txq) {</div><div class='del'>-		rx = ice_get_rc_coalesce(ec, ICE_RX_CONTAINER,</div><div class='del'>-					 &amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx);</div><div class='del'>-		tx = ice_get_rc_coalesce(ec, ICE_TX_CONTAINER,</div><div class='del'>-					 &amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx);</div><div class='del'>-	} else if (q_num &lt; vsi-&gt;num_rxq) {</div><div class='del'>-		rx = ice_get_rc_coalesce(ec, ICE_RX_CONTAINER,</div><div class='del'>-					 &amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx);</div><div class='del'>-	} else if (q_num &lt; vsi-&gt;num_txq) {</div><div class='del'>-		tx = ice_get_rc_coalesce(ec, ICE_TX_CONTAINER,</div><div class='del'>-					 &amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx);</div><div class='del'>-	} else {</div><div class='del'>-		/* q_num is invalid for both Rx and Tx queues */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (q_num &lt; 0)</div><div class='add'>+		q_num = 0;</div><div class='ctx'> </div><div class='del'>-update_coalesced_frames:</div><div class='del'>-	/* either q_num is invalid for both Rx and Tx queues or setting coalesce</div><div class='del'>-	 * failed completely</div><div class='del'>-	 */</div><div class='del'>-	if (tx &amp;&amp; rx)</div><div class='add'>+	if (ice_get_q_coalesce(vsi, ec, q_num))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (q_num &lt; vsi-&gt;num_txq)</div><div class='hunk'>@@ -2180,15 +2326,16 @@ ice_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)</div><div class='ctx'> 	return __ice_get_coalesce(netdev, ec, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,</div><div class='del'>-				  struct ethtool_coalesce *ec)</div><div class='add'>+static int</div><div class='add'>+ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,</div><div class='add'>+		       struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='ctx'> 	return __ice_get_coalesce(netdev, ec, q_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_set_rc_coalesce - set ITR values for specific ring container</div><div class='del'>- * @c_type: container type, RX or TX</div><div class='add'>+ * @c_type: container type, Rx or Tx</div><div class='ctx'>  * @ec: ethtool structure from user to update ITR settings</div><div class='ctx'>  * @rc: ring container that the ITR values will come from</div><div class='ctx'>  * @vsi: VSI associated to the ring container</div><div class='hunk'>@@ -2213,6 +2360,23 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,</div><div class='ctx'> </div><div class='ctx'> 	switch (c_type) {</div><div class='ctx'> 	case ICE_RX_CONTAINER:</div><div class='add'>+		if (ec-&gt;rx_coalesce_usecs_high &gt; ICE_MAX_INTRL ||</div><div class='add'>+		    (ec-&gt;rx_coalesce_usecs_high &amp;&amp;</div><div class='add'>+		     ec-&gt;rx_coalesce_usecs_high &lt; pf-&gt;hw.intrl_gran)) {</div><div class='add'>+			netdev_info(vsi-&gt;netdev,</div><div class='add'>+				    "Invalid value, rx-usecs-high valid values are 0 (disabled), %d-%d\n",</div><div class='add'>+				    pf-&gt;hw.intrl_gran, ICE_MAX_INTRL);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ec-&gt;rx_coalesce_usecs_high != rc-&gt;ring-&gt;q_vector-&gt;intrl) {</div><div class='add'>+			rc-&gt;ring-&gt;q_vector-&gt;intrl = ec-&gt;rx_coalesce_usecs_high;</div><div class='add'>+			wr32(&amp;pf-&gt;hw, GLINT_RATE(vsi-&gt;hw_base_vector +</div><div class='add'>+						 rc-&gt;ring-&gt;q_vector-&gt;v_idx),</div><div class='add'>+			     ice_intrl_usec_to_reg(ec-&gt;rx_coalesce_usecs_high,</div><div class='add'>+						   pf-&gt;hw.intrl_gran));</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (ec-&gt;rx_coalesce_usecs != itr_setting &amp;&amp;</div><div class='ctx'> 		    ec-&gt;use_adaptive_rx_coalesce) {</div><div class='ctx'> 			netdev_info(vsi-&gt;netdev,</div><div class='hunk'>@@ -2235,6 +2399,12 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_TX_CONTAINER:</div><div class='add'>+		if (ec-&gt;tx_coalesce_usecs_high) {</div><div class='add'>+			netdev_info(vsi-&gt;netdev,</div><div class='add'>+				    "setting tx-usecs-high is not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (ec-&gt;tx_coalesce_usecs != itr_setting &amp;&amp;</div><div class='ctx'> 		    ec-&gt;use_adaptive_tx_coalesce) {</div><div class='ctx'> 			netdev_info(vsi-&gt;netdev,</div><div class='hunk'>@@ -2264,54 +2434,77 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ice_set_q_coalesce - set a queue's ITR/INTRL (coalesce) settings</div><div class='add'>+ * @vsi: VSI associated to the queue that need updating</div><div class='add'>+ * @ec: coalesce settings to program the device with</div><div class='add'>+ * @q_num: update ITR/INTRL (coalesce) settings for this queue number/index</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, and negative under the following conditions:</div><div class='add'>+ * 1. Setting Tx or Rx ITR/INTRL (coalesce) settings failed.</div><div class='add'>+ * 2. The q_num passed in is not a valid number/index for Tx and Rx rings.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ice_set_q_coalesce(struct ice_vsi *vsi, struct ethtool_coalesce *ec, int q_num)</div><div class='add'>+{</div><div class='add'>+	if (q_num &lt; vsi-&gt;num_rxq &amp;&amp; q_num &lt; vsi-&gt;num_txq) {</div><div class='add'>+		if (ice_set_rc_coalesce(ICE_RX_CONTAINER, ec,</div><div class='add'>+					&amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx,</div><div class='add'>+					vsi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ice_set_rc_coalesce(ICE_TX_CONTAINER, ec,</div><div class='add'>+					&amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx,</div><div class='add'>+					vsi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (q_num &lt; vsi-&gt;num_rxq) {</div><div class='add'>+		if (ice_set_rc_coalesce(ICE_RX_CONTAINER, ec,</div><div class='add'>+					&amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx,</div><div class='add'>+					vsi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (q_num &lt; vsi-&gt;num_txq) {</div><div class='add'>+		if (ice_set_rc_coalesce(ICE_TX_CONTAINER, ec,</div><div class='add'>+					&amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx,</div><div class='add'>+					vsi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</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'>+/**</div><div class='add'>+ * __ice_set_coalesce - set ITR/INTRL values for the device</div><div class='add'>+ * @netdev: pointer to the netdev associated with this query</div><div class='add'>+ * @ec: ethtool structure to fill with driver's coalesce settings</div><div class='add'>+ * @q_num: queue number to get the coalesce settings for</div><div class='add'>+ *</div><div class='add'>+ * If the caller passes in a negative q_num then we set the coalesce settings</div><div class='add'>+ * for all Tx/Rx queues, else use the actual q_num passed in.</div><div class='add'>+ */</div><div class='ctx'> static int</div><div class='ctx'> __ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec,</div><div class='ctx'> 		   int q_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='del'>-	int rx = -EINVAL, tx = -EINVAL;</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='ctx'> </div><div class='ctx'> 	if (q_num &lt; 0) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		ice_for_each_q_vector(vsi, i) {</div><div class='del'>-			struct ice_q_vector *q_vector = vsi-&gt;q_vectors[i];</div><div class='del'>-</div><div class='del'>-			if (ice_set_rc_coalesce(ICE_RX_CONTAINER, ec,</div><div class='del'>-						&amp;q_vector-&gt;rx, vsi) ||</div><div class='del'>-			    ice_set_rc_coalesce(ICE_TX_CONTAINER, ec,</div><div class='del'>-						&amp;q_vector-&gt;tx, vsi))</div><div class='add'>+			if (ice_set_q_coalesce(vsi, ec, i))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		goto set_work_lmt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (q_num &lt; vsi-&gt;num_rxq &amp;&amp; q_num &lt; vsi-&gt;num_txq) {</div><div class='del'>-		rx = ice_set_rc_coalesce(ICE_RX_CONTAINER, ec,</div><div class='del'>-					 &amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx,</div><div class='del'>-					 vsi);</div><div class='del'>-		tx = ice_set_rc_coalesce(ICE_TX_CONTAINER, ec,</div><div class='del'>-					 &amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx,</div><div class='del'>-					 vsi);</div><div class='del'>-	} else if (q_num &lt; vsi-&gt;num_rxq) {</div><div class='del'>-		rx = ice_set_rc_coalesce(ICE_RX_CONTAINER, ec,</div><div class='del'>-					 &amp;vsi-&gt;rx_rings[q_num]-&gt;q_vector-&gt;rx,</div><div class='del'>-					 vsi);</div><div class='del'>-	} else if (q_num &lt; vsi-&gt;num_txq) {</div><div class='del'>-		tx  = ice_set_rc_coalesce(ICE_TX_CONTAINER, ec,</div><div class='del'>-					  &amp;vsi-&gt;tx_rings[q_num]-&gt;q_vector-&gt;tx,</div><div class='del'>-					  vsi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* either q_num is invalid for both Rx and Tx queues or setting coalesce</div><div class='del'>-	 * failed completely</div><div class='del'>-	 */</div><div class='del'>-	if (rx &amp;&amp; tx)</div><div class='add'>+	if (ice_set_q_coalesce(vsi, ec, q_num))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> set_work_lmt:</div><div class='add'>+</div><div class='ctx'> 	if (ec-&gt;tx_max_coalesced_frames_irq || ec-&gt;rx_max_coalesced_frames_irq)</div><div class='ctx'> 		vsi-&gt;work_lmt = max(ec-&gt;tx_max_coalesced_frames_irq,</div><div class='ctx'> 				    ec-&gt;rx_max_coalesced_frames_irq);</div><div class='hunk'>@@ -2325,8 +2518,9 @@ ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)</div><div class='ctx'> 	return __ice_set_coalesce(netdev, ec, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ice_set_per_q_coalesce(struct net_device *netdev, u32 q_num,</div><div class='del'>-				  struct ethtool_coalesce *ec)</div><div class='add'>+static int</div><div class='add'>+ice_set_per_q_coalesce(struct net_device *netdev, u32 q_num,</div><div class='add'>+		       struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='ctx'> 	return __ice_set_coalesce(netdev, ec, q_num);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h<br/>index 6bf5cc064270..ec25f26069b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_hw_autogen.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_hw_autogen.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_hw_autogen.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_hw_autogen.h</a></div><div class='hunk'>@@ -49,6 +49,9 @@</div><div class='ctx'> #define PF_MBX_ATQLEN_ATQLEN_M			ICE_M(0x3FF, 0)</div><div class='ctx'> #define PF_MBX_ATQLEN_ATQENABLE_M		BIT(31)</div><div class='ctx'> #define PF_MBX_ATQT				0x0022E300</div><div class='add'>+#define PRTDCB_GENS				0x00083020</div><div class='add'>+#define PRTDCB_GENS_DCBX_STATUS_S		0</div><div class='add'>+#define PRTDCB_GENS_DCBX_STATUS_M		ICE_M(0x7, 0)</div><div class='ctx'> #define GLFLXP_RXDID_FLAGS(_i, _j)		(0x0045D000 + ((_i) * 4 + (_j) * 256))</div><div class='ctx'> #define GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_S	0</div><div class='ctx'> #define GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_M	ICE_M(0x3F, 0)</div><div class='hunk'>@@ -106,6 +109,16 @@</div><div class='ctx'> #define VPGEN_VFRTRIG_VFSWR_M			BIT(0)</div><div class='ctx'> #define PFHMC_ERRORDATA				0x00520500</div><div class='ctx'> #define PFHMC_ERRORINFO				0x00520400</div><div class='add'>+#define GLINT_CTL				0x0016CC54</div><div class='add'>+#define GLINT_CTL_DIS_AUTOMASK_M		BIT(0)</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_200_S		16</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_200_M		ICE_M(0xF, 16)</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_100_S		20</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_100_M		ICE_M(0xF, 20)</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_50_S			24</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_50_M			ICE_M(0xF, 24)</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_25_S			28</div><div class='add'>+#define GLINT_CTL_ITR_GRAN_25_M			ICE_M(0xF, 28)</div><div class='ctx'> #define GLINT_DYN_CTL(_INT)			(0x00160000 + ((_INT) * 4))</div><div class='ctx'> #define GLINT_DYN_CTL_INTENA_M			BIT(0)</div><div class='ctx'> #define GLINT_DYN_CTL_CLEARPBA_M		BIT(1)</div><div class='hunk'>@@ -150,11 +163,15 @@</div><div class='ctx'> #define PFINT_OICR_ENA				0x0016C900</div><div class='ctx'> #define QINT_RQCTL(_QRX)			(0x00150000 + ((_QRX) * 4))</div><div class='ctx'> #define QINT_RQCTL_MSIX_INDX_S			0</div><div class='add'>+#define QINT_RQCTL_MSIX_INDX_M			ICE_M(0x7FF, 0)</div><div class='ctx'> #define QINT_RQCTL_ITR_INDX_S			11</div><div class='add'>+#define QINT_RQCTL_ITR_INDX_M			ICE_M(0x3, 11)</div><div class='ctx'> #define QINT_RQCTL_CAUSE_ENA_M			BIT(30)</div><div class='ctx'> #define QINT_TQCTL(_DBQM)			(0x00140000 + ((_DBQM) * 4))</div><div class='ctx'> #define QINT_TQCTL_MSIX_INDX_S			0</div><div class='add'>+#define QINT_TQCTL_MSIX_INDX_M			ICE_M(0x7FF, 0)</div><div class='ctx'> #define QINT_TQCTL_ITR_INDX_S			11</div><div class='add'>+#define QINT_TQCTL_ITR_INDX_M			ICE_M(0x3, 11)</div><div class='ctx'> #define QINT_TQCTL_CAUSE_ENA_M			BIT(30)</div><div class='ctx'> #define VPINT_ALLOC(_VF)			(0x001D1000 + ((_VF) * 4))</div><div class='ctx'> #define VPINT_ALLOC_FIRST_S			0</div><div class='hunk'>@@ -168,6 +185,8 @@</div><div class='ctx'> #define VPINT_ALLOC_PCI_LAST_S			12</div><div class='ctx'> #define VPINT_ALLOC_PCI_LAST_M			ICE_M(0x7FF, 12)</div><div class='ctx'> #define VPINT_ALLOC_PCI_VALID_M			BIT(31)</div><div class='add'>+#define VPINT_MBX_CTL(_VSI)			(0x0016A000 + ((_VSI) * 4))</div><div class='add'>+#define VPINT_MBX_CTL_CAUSE_ENA_M		BIT(30)</div><div class='ctx'> #define GLLAN_RCTL_0				0x002941F8</div><div class='ctx'> #define QRX_CONTEXT(_i, _QRX)			(0x00280000 + ((_i) * 8192 + (_QRX) * 4))</div><div class='ctx'> #define QRX_CTRL(_QRX)				(0x00120000 + ((_QRX) * 4))</div><div class='hunk'>@@ -306,11 +325,16 @@</div><div class='ctx'> #define GLPRT_PTC64L(_i)			(0x00380B80 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_PTC9522H(_i)			(0x00380D04 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_PTC9522L(_i)			(0x00380D00 + ((_i) * 8))</div><div class='add'>+#define GLPRT_PXOFFRXC(_i, _j)			(0x00380500 + ((_i) * 8 + (_j) * 64))</div><div class='add'>+#define GLPRT_PXOFFTXC(_i, _j)			(0x00380F40 + ((_i) * 8 + (_j) * 64))</div><div class='add'>+#define GLPRT_PXONRXC(_i, _j)			(0x00380300 + ((_i) * 8 + (_j) * 64))</div><div class='add'>+#define GLPRT_PXONTXC(_i, _j)			(0x00380D40 + ((_i) * 8 + (_j) * 64))</div><div class='ctx'> #define GLPRT_RFC(_i)				(0x00380AC0 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_RJC(_i)				(0x00380B00 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_RLEC(_i)				(0x00380140 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_ROC(_i)				(0x00380240 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_RUC(_i)				(0x00380200 + ((_i) * 8))</div><div class='add'>+#define GLPRT_RXON2OFFCNT(_i, _j)		(0x00380700 + ((_i) * 8 + (_j) * 64))</div><div class='ctx'> #define GLPRT_TDOLD(_i)				(0x00381280 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_UPRCH(_i)				(0x00381304 + ((_i) * 8))</div><div class='ctx'> #define GLPRT_UPRCL(_i)				(0x00381300 + ((_i) * 8))</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h<br/>index ef4c79b5aa32..510a8c900e61 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@ union ice_32byte_rx_desc {</div><div class='ctx'> 			} lo_dword;</div><div class='ctx'> 			union {</div><div class='ctx'> 				__le32 rss; /* RSS Hash */</div><div class='del'>-				__le32 fd_id; /* Flow Director filter id */</div><div class='add'>+				__le32 fd_id; /* Flow Director filter ID */</div><div class='ctx'> 			} hi_dword;</div><div class='ctx'> 		} qword0;</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -99,7 +99,7 @@ enum ice_rx_ptype_payload_layer {</div><div class='ctx'> 	ICE_RX_PTYPE_PAYLOAD_LAYER_PAY4	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* RX Flex Descriptor</div><div class='add'>+/* Rx Flex Descriptor</div><div class='ctx'>  * This descriptor is used instead of the legacy version descriptor when</div><div class='ctx'>  * ice_rlan_ctx.adv_desc is set</div><div class='ctx'>  */</div><div class='hunk'>@@ -113,7 +113,7 @@ union ice_32b_rx_flex_desc {</div><div class='ctx'> 	} read;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		/* Qword 0 */</div><div class='del'>-		u8 rxdid; /* descriptor builder profile id */</div><div class='add'>+		u8 rxdid; /* descriptor builder profile ID */</div><div class='ctx'> 		u8 mir_id_umb_cast; /* mirror=[5:0], umb=[7:6] */</div><div class='ctx'> 		__le16 ptype_flex_flags0; /* ptype=[9:0], ff0=[15:10] */</div><div class='ctx'> 		__le16 pkt_len; /* [15:14] are reserved */</div><div class='hunk'>@@ -149,7 +149,7 @@ union ice_32b_rx_flex_desc {</div><div class='ctx'> </div><div class='ctx'> /* Rx Flex Descriptor NIC Profile</div><div class='ctx'>  * This descriptor corresponds to RxDID 2 which contains</div><div class='del'>- * metadata fields for RSS, flow id and timestamp info</div><div class='add'>+ * metadata fields for RSS, flow ID and timestamp info</div><div class='ctx'>  */</div><div class='ctx'> struct ice_32b_rx_flex_desc_nic {</div><div class='ctx'> 	/* Qword 0 */</div><div class='hunk'>@@ -208,23 +208,23 @@ enum ice_flex_rx_mdid {</div><div class='ctx'> 	ICE_RX_MDID_HASH_HIGH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Rx Flag64 packet flag bits */</div><div class='del'>-enum ice_rx_flg64_bits {</div><div class='del'>-	ICE_RXFLG_PKT_DSI	= 0,</div><div class='del'>-	ICE_RXFLG_EVLAN_x8100	= 15,</div><div class='del'>-	ICE_RXFLG_EVLAN_x9100,</div><div class='del'>-	ICE_RXFLG_VLAN_x8100,</div><div class='del'>-	ICE_RXFLG_TNL_MAC	= 22,</div><div class='del'>-	ICE_RXFLG_TNL_VLAN,</div><div class='del'>-	ICE_RXFLG_PKT_FRG,</div><div class='del'>-	ICE_RXFLG_FIN		= 32,</div><div class='del'>-	ICE_RXFLG_SYN,</div><div class='del'>-	ICE_RXFLG_RST,</div><div class='del'>-	ICE_RXFLG_TNL0		= 38,</div><div class='del'>-	ICE_RXFLG_TNL1,</div><div class='del'>-	ICE_RXFLG_TNL2,</div><div class='del'>-	ICE_RXFLG_UDP_GRE,</div><div class='del'>-	ICE_RXFLG_RSVD		= 63</div><div class='add'>+/* Rx/Tx Flag64 packet flag bits */</div><div class='add'>+enum ice_flg64_bits {</div><div class='add'>+	ICE_FLG_PKT_DSI		= 0,</div><div class='add'>+	ICE_FLG_EVLAN_x8100	= 15,</div><div class='add'>+	ICE_FLG_EVLAN_x9100,</div><div class='add'>+	ICE_FLG_VLAN_x8100,</div><div class='add'>+	ICE_FLG_TNL_MAC		= 22,</div><div class='add'>+	ICE_FLG_TNL_VLAN,</div><div class='add'>+	ICE_FLG_PKT_FRG,</div><div class='add'>+	ICE_FLG_FIN		= 32,</div><div class='add'>+	ICE_FLG_SYN,</div><div class='add'>+	ICE_FLG_RST,</div><div class='add'>+	ICE_FLG_TNL0		= 38,</div><div class='add'>+	ICE_FLG_TNL1,</div><div class='add'>+	ICE_FLG_TNL2,</div><div class='add'>+	ICE_FLG_UDP_GRE,</div><div class='add'>+	ICE_FLG_RSVD		= 63</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* for ice_32byte_rx_flex_desc.ptype_flexi_flags0 member */</div><div class='hunk'>@@ -322,7 +322,7 @@ enum ice_rlan_ctx_rx_hsplit_1 {</div><div class='ctx'> 	ICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS	= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* TX Descriptor */</div><div class='add'>+/* Tx Descriptor */</div><div class='ctx'> struct ice_tx_desc {</div><div class='ctx'> 	__le64 buf_addr; /* Address of descriptor's data buf */</div><div class='ctx'> 	__le64 cmd_type_offset_bsz;</div><div class='hunk'>@@ -342,12 +342,12 @@ enum ice_tx_desc_cmd_bits {</div><div class='ctx'> 	ICE_TX_DESC_CMD_EOP			= 0x0001,</div><div class='ctx'> 	ICE_TX_DESC_CMD_RS			= 0x0002,</div><div class='ctx'> 	ICE_TX_DESC_CMD_IL2TAG1			= 0x0008,</div><div class='del'>-	ICE_TX_DESC_CMD_IIPT_IPV6		= 0x0020, /* 2 BITS */</div><div class='del'>-	ICE_TX_DESC_CMD_IIPT_IPV4		= 0x0040, /* 2 BITS */</div><div class='del'>-	ICE_TX_DESC_CMD_IIPT_IPV4_CSUM		= 0x0060, /* 2 BITS */</div><div class='del'>-	ICE_TX_DESC_CMD_L4T_EOFT_TCP		= 0x0100, /* 2 BITS */</div><div class='del'>-	ICE_TX_DESC_CMD_L4T_EOFT_SCTP		= 0x0200, /* 2 BITS */</div><div class='del'>-	ICE_TX_DESC_CMD_L4T_EOFT_UDP		= 0x0300, /* 2 BITS */</div><div class='add'>+	ICE_TX_DESC_CMD_IIPT_IPV6		= 0x0020,</div><div class='add'>+	ICE_TX_DESC_CMD_IIPT_IPV4		= 0x0040,</div><div class='add'>+	ICE_TX_DESC_CMD_IIPT_IPV4_CSUM		= 0x0060,</div><div class='add'>+	ICE_TX_DESC_CMD_L4T_EOFT_TCP		= 0x0100,</div><div class='add'>+	ICE_TX_DESC_CMD_L4T_EOFT_SCTP		= 0x0200,</div><div class='add'>+	ICE_TX_DESC_CMD_L4T_EOFT_UDP		= 0x0300,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ICE_TXD_QW1_OFFSET_S	16</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c<br/>index fa61203bee26..fbf1eba0cc2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_lib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_lib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_lib.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ice.h"</div><div class='ctx'> #include "ice_lib.h"</div><div class='add'>+#include "ice_dcb_lib.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_setup_rx_ctx - Configure a receive ring context</div><div class='hunk'>@@ -73,7 +74,7 @@ static int ice_setup_rx_ctx(struct ice_ring *ring)</div><div class='ctx'> 		regval |= (rxdid &lt;&lt; QRXFLXP_CNTXT_RXDID_IDX_S) &amp;</div><div class='ctx'> 			QRXFLXP_CNTXT_RXDID_IDX_M;</div><div class='ctx'> </div><div class='del'>-		/* increasing context priority to pick up profile id;</div><div class='add'>+		/* increasing context priority to pick up profile ID;</div><div class='ctx'> 		 * default is 0x01; setting to 0x03 to ensure profile</div><div class='ctx'> 		 * is programming if prev context is of same priority</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -124,6 +125,8 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)</div><div class='ctx'> 	/* Transmit Queue Length */</div><div class='ctx'> 	tlan_ctx-&gt;qlen = ring-&gt;count;</div><div class='ctx'> </div><div class='add'>+	ice_set_cgd_num(tlan_ctx, ring);</div><div class='add'>+</div><div class='ctx'> 	/* PF number */</div><div class='ctx'> 	tlan_ctx-&gt;pf_num = hw-&gt;pf_id;</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +141,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)</div><div class='ctx'> 		tlan_ctx-&gt;vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_VSI_VF:</div><div class='del'>-		/* Firmware expects vmvf_num to be absolute VF id */</div><div class='add'>+		/* Firmware expects vmvf_num to be absolute VF ID */</div><div class='ctx'> 		tlan_ctx-&gt;vmvf_num = hw-&gt;func_caps.vf_base_id + vsi-&gt;vf_id;</div><div class='ctx'> 		tlan_ctx-&gt;vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -175,17 +178,14 @@ static int ice_pf_rxq_wait(struct ice_pf *pf, int pf_q, bool ena)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ICE_Q_WAIT_MAX_RETRY; i++) {</div><div class='del'>-		u32 rx_reg = rd32(&amp;pf-&gt;hw, QRX_CTRL(pf_q));</div><div class='del'>-</div><div class='del'>-		if (ena == !!(rx_reg &amp; QRX_CTRL_QENA_STAT_M))</div><div class='del'>-			break;</div><div class='add'>+		if (ena == !!(rd32(&amp;pf-&gt;hw, QRX_CTRL(pf_q)) &amp;</div><div class='add'>+			      QRX_CTRL_QENA_STAT_M))</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		usleep_range(20, 40);</div><div class='ctx'> 	}</div><div class='del'>-	if (i &gt;= ICE_Q_WAIT_MAX_RETRY)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -197,19 +197,13 @@ static int ice_vsi_ctrl_rx_rings(struct ice_vsi *vsi, bool ena)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='del'>-	int i, j, ret = 0;</div><div class='add'>+	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; vsi-&gt;num_rxq; i++) {</div><div class='ctx'> 		int pf_q = vsi-&gt;rxq_map[i];</div><div class='ctx'> 		u32 rx_reg;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; ICE_Q_WAIT_MAX_RETRY; j++) {</div><div class='del'>-			rx_reg = rd32(hw, QRX_CTRL(pf_q));</div><div class='del'>-			if (((rx_reg &gt;&gt; QRX_CTRL_QENA_REQ_S) &amp; 1) ==</div><div class='del'>-			    ((rx_reg &gt;&gt; QRX_CTRL_QENA_STAT_S) &amp; 1))</div><div class='del'>-				break;</div><div class='del'>-			usleep_range(1000, 2000);</div><div class='del'>-		}</div><div class='add'>+		rx_reg = rd32(hw, QRX_CTRL(pf_q));</div><div class='ctx'> </div><div class='ctx'> 		/* Skip if the queue is already in the requested state */</div><div class='ctx'> 		if (ena == !!(rx_reg &amp; QRX_CTRL_QENA_STAT_M))</div><div class='hunk'>@@ -238,12 +232,11 @@ static int ice_vsi_ctrl_rx_rings(struct ice_vsi *vsi, bool ena)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_vsi_alloc_arrays - Allocate queue and vector pointer arrays for the VSI</div><div class='ctx'>  * @vsi: VSI pointer</div><div class='del'>- * @alloc_qvectors: a bool to specify if q_vectors need to be allocated.</div><div class='ctx'>  *</div><div class='ctx'>  * On error: returns error code (negative)</div><div class='ctx'>  * On success: returns 0</div><div class='ctx'>  */</div><div class='del'>-static int ice_vsi_alloc_arrays(struct ice_vsi *vsi, bool alloc_qvectors)</div><div class='add'>+static int ice_vsi_alloc_arrays(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> </div><div class='hunk'>@@ -258,15 +251,11 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi, bool alloc_qvectors)</div><div class='ctx'> 	if (!vsi-&gt;rx_rings)</div><div class='ctx'> 		goto err_rxrings;</div><div class='ctx'> </div><div class='del'>-	if (alloc_qvectors) {</div><div class='del'>-		/* allocate memory for q_vector pointers */</div><div class='del'>-		vsi-&gt;q_vectors = devm_kcalloc(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-					      vsi-&gt;num_q_vectors,</div><div class='del'>-					      sizeof(*vsi-&gt;q_vectors),</div><div class='del'>-					      GFP_KERNEL);</div><div class='del'>-		if (!vsi-&gt;q_vectors)</div><div class='del'>-			goto err_vectors;</div><div class='del'>-	}</div><div class='add'>+	/* allocate memory for q_vector pointers */</div><div class='add'>+	vsi-&gt;q_vectors = devm_kcalloc(&amp;pf-&gt;pdev-&gt;dev, vsi-&gt;num_q_vectors,</div><div class='add'>+				      sizeof(*vsi-&gt;q_vectors), GFP_KERNEL);</div><div class='add'>+	if (!vsi-&gt;q_vectors)</div><div class='add'>+		goto err_vectors;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -279,25 +268,49 @@ err_txrings:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vsi_set_num_qs - Set num queues, descriptors and vectors for a VSI</div><div class='add'>+ * ice_vsi_set_num_desc - Set number of descriptors for queues on this VSI</div><div class='ctx'>  * @vsi: the VSI being configured</div><div class='add'>+ */</div><div class='add'>+static void ice_vsi_set_num_desc(struct ice_vsi *vsi)</div><div class='add'>+{</div><div class='add'>+	switch (vsi-&gt;type) {</div><div class='add'>+	case ICE_VSI_PF:</div><div class='add'>+		vsi-&gt;num_rx_desc = ICE_DFLT_NUM_RX_DESC;</div><div class='add'>+		vsi-&gt;num_tx_desc = ICE_DFLT_NUM_TX_DESC;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+			"Not setting number of Tx/Rx descriptors for VSI type %d\n",</div><div class='add'>+			vsi-&gt;type);</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'>+ * ice_vsi_set_num_qs - Set number of queues, descriptors and vectors for a VSI</div><div class='add'>+ * @vsi: the VSI being configured</div><div class='add'>+ * @vf_id: ID of the VF being configured</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success and a negative value on error</div><div class='ctx'>  */</div><div class='del'>-static void ice_vsi_set_num_qs(struct ice_vsi *vsi)</div><div class='add'>+static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='add'>+	struct ice_vf *vf = NULL;</div><div class='add'>+</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_VF)</div><div class='add'>+		vsi-&gt;vf_id = vf_id;</div><div class='ctx'> </div><div class='ctx'> 	switch (vsi-&gt;type) {</div><div class='ctx'> 	case ICE_VSI_PF:</div><div class='ctx'> 		vsi-&gt;alloc_txq = pf-&gt;num_lan_tx;</div><div class='ctx'> 		vsi-&gt;alloc_rxq = pf-&gt;num_lan_rx;</div><div class='del'>-		vsi-&gt;num_desc = ALIGN(ICE_DFLT_NUM_DESC, ICE_REQ_DESC_MULTIPLE);</div><div class='ctx'> 		vsi-&gt;num_q_vectors = max_t(int, pf-&gt;num_lan_rx, pf-&gt;num_lan_tx);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_VSI_VF:</div><div class='del'>-		vsi-&gt;alloc_txq = pf-&gt;num_vf_qps;</div><div class='del'>-		vsi-&gt;alloc_rxq = pf-&gt;num_vf_qps;</div><div class='add'>+		vf = &amp;pf-&gt;vf[vsi-&gt;vf_id];</div><div class='add'>+		vsi-&gt;alloc_txq = vf-&gt;num_vf_qs;</div><div class='add'>+		vsi-&gt;alloc_rxq = vf-&gt;num_vf_qs;</div><div class='ctx'> 		/* pf-&gt;num_vf_msix includes (VF miscellaneous vector +</div><div class='ctx'> 		 * data queue interrupts). Since vsi-&gt;num_q_vectors is number</div><div class='ctx'> 		 * of queues vectors, subtract 1 from the original vector</div><div class='hunk'>@@ -306,10 +319,11 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi)</div><div class='ctx'> 		vsi-&gt;num_q_vectors = pf-&gt;num_vf_msix - 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, "Unknown VSI type %d\n",</div><div class='del'>-			 vsi-&gt;type);</div><div class='add'>+		dev_warn(&amp;pf-&gt;pdev-&gt;dev, "Unknown VSI type %d\n", vsi-&gt;type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ice_vsi_set_num_desc(vsi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -370,16 +384,15 @@ void ice_vsi_delete(struct ice_vsi *vsi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vsi_free_arrays - clean up VSI resources</div><div class='add'>+ * ice_vsi_free_arrays - De-allocate queue and vector pointer arrays for the VSI</div><div class='ctx'>  * @vsi: pointer to VSI being cleared</div><div class='del'>- * @free_qvectors: bool to specify if q_vectors should be deallocated</div><div class='ctx'>  */</div><div class='del'>-static void ice_vsi_free_arrays(struct ice_vsi *vsi, bool free_qvectors)</div><div class='add'>+static void ice_vsi_free_arrays(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> </div><div class='ctx'> 	/* free the ring and vector containers */</div><div class='del'>-	if (free_qvectors &amp;&amp; vsi-&gt;q_vectors) {</div><div class='add'>+	if (vsi-&gt;q_vectors) {</div><div class='ctx'> 		devm_kfree(&amp;pf-&gt;pdev-&gt;dev, vsi-&gt;q_vectors);</div><div class='ctx'> 		vsi-&gt;q_vectors = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -427,7 +440,7 @@ int ice_vsi_clear(struct ice_vsi *vsi)</div><div class='ctx'> 	if (vsi-&gt;idx &lt; pf-&gt;next_vsi)</div><div class='ctx'> 		pf-&gt;next_vsi = vsi-&gt;idx;</div><div class='ctx'> </div><div class='del'>-	ice_vsi_free_arrays(vsi, true);</div><div class='add'>+	ice_vsi_free_arrays(vsi);</div><div class='ctx'> 	mutex_unlock(&amp;pf-&gt;sw_mutex);</div><div class='ctx'> 	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, vsi);</div><div class='ctx'> </div><div class='hunk'>@@ -455,10 +468,12 @@ static irqreturn_t ice_msix_clean_rings(int __always_unused irq, void *data)</div><div class='ctx'>  * ice_vsi_alloc - Allocates the next available struct VSI in the PF</div><div class='ctx'>  * @pf: board private structure</div><div class='ctx'>  * @type: type of VSI</div><div class='add'>+ * @vf_id: ID of the VF being configured</div><div class='ctx'>  *</div><div class='ctx'>  * returns a pointer to a VSI on success, NULL on failure.</div><div class='ctx'>  */</div><div class='del'>-static struct ice_vsi *ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type)</div><div class='add'>+static struct ice_vsi *</div><div class='add'>+ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type, u16 vf_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_vsi *vsi = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -484,18 +499,21 @@ static struct ice_vsi *ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type)</div><div class='ctx'> 	vsi-&gt;idx = pf-&gt;next_vsi;</div><div class='ctx'> 	vsi-&gt;work_lmt = ICE_DFLT_IRQ_WORK;</div><div class='ctx'> </div><div class='del'>-	ice_vsi_set_num_qs(vsi);</div><div class='add'>+	if (type == ICE_VSI_VF)</div><div class='add'>+		ice_vsi_set_num_qs(vsi, vf_id);</div><div class='add'>+	else</div><div class='add'>+		ice_vsi_set_num_qs(vsi, ICE_INVAL_VFID);</div><div class='ctx'> </div><div class='ctx'> 	switch (vsi-&gt;type) {</div><div class='ctx'> 	case ICE_VSI_PF:</div><div class='del'>-		if (ice_vsi_alloc_arrays(vsi, true))</div><div class='add'>+		if (ice_vsi_alloc_arrays(vsi))</div><div class='ctx'> 			goto err_rings;</div><div class='ctx'> </div><div class='ctx'> 		/* Setup default MSIX irq handler for VSI */</div><div class='ctx'> 		vsi-&gt;irq_handler = ice_msix_clean_rings;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_VSI_VF:</div><div class='del'>-		if (ice_vsi_alloc_arrays(vsi, true))</div><div class='add'>+		if (ice_vsi_alloc_arrays(vsi))</div><div class='ctx'> 			goto err_rings;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -547,7 +565,7 @@ static int __ice_vsi_get_qs_contig(struct ice_qs_cfg *qs_cfg)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __ice_vsi_get_qs_sc - Assign a scattered queues from PF to VSI</div><div class='del'>- * @qs_cfg: gathered variables needed for PF-&gt;VSI queues assignment</div><div class='add'>+ * @qs_cfg: gathered variables needed for pf-&gt;vsi queues assignment</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success and -ENOMEM in case of no left space in PF queue bitmap</div><div class='ctx'>  */</div><div class='hunk'>@@ -579,11 +597,10 @@ err_scatter:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __ice_vsi_get_qs - helper function for assigning queues from PF to VSI</div><div class='del'>- * @qs_cfg: gathered variables needed for PF-&gt;VSI queues assignment</div><div class='add'>+ * @qs_cfg: gathered variables needed for pf-&gt;vsi queues assignment</div><div class='ctx'>  *</div><div class='del'>- * This is an internal function for assigning queues from the PF to VSI and</div><div class='del'>- * initially tries to find contiguous space.  If it is not successful to find</div><div class='del'>- * contiguous space, then it tries with the scatter approach.</div><div class='add'>+ * This function first tries to find contiguous space. If it is not successful,</div><div class='add'>+ * it tries with the scatter approach.</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success and -ENOMEM in case of no left space in PF queue bitmap</div><div class='ctx'>  */</div><div class='hunk'>@@ -827,7 +844,7 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)</div><div class='ctx'> 	/* find the (rounded up) power-of-2 of qcount */</div><div class='ctx'> 	pow = order_base_2(qcount_rx);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ICE_MAX_TRAFFIC_CLASS; i++) {</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='ctx'> 		if (!(vsi-&gt;tc_cfg.ena_tc &amp; BIT(i))) {</div><div class='ctx'> 			/* TC is not enabled */</div><div class='ctx'> 			vsi-&gt;tc_cfg.tc_info[i].qoffset = 0;</div><div class='hunk'>@@ -852,7 +869,18 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)</div><div class='ctx'> 		tx_count += tx_numq_tc;</div><div class='ctx'> 		ctxt-&gt;info.tc_mapping[i] = cpu_to_le16(qmap);</div><div class='ctx'> 	}</div><div class='del'>-	vsi-&gt;num_rxq = offset;</div><div class='add'>+</div><div class='add'>+	/* if offset is non-zero, means it is calculated correctly based on</div><div class='add'>+	 * enabled TCs for a given VSI otherwise qcount_rx will always</div><div class='add'>+	 * be correct and non-zero because it is based off - VSI's</div><div class='add'>+	 * allocated Rx queues which is at least 1 (hence qcount_tx will be</div><div class='add'>+	 * at least 1)</div><div class='add'>+	 */</div><div class='add'>+	if (offset)</div><div class='add'>+		vsi-&gt;num_rxq = offset;</div><div class='add'>+	else</div><div class='add'>+		vsi-&gt;num_rxq = qcount_rx;</div><div class='add'>+</div><div class='ctx'> 	vsi-&gt;num_txq = tx_count;</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;type == ICE_VSI_VF &amp;&amp; vsi-&gt;num_txq != vsi-&gt;num_rxq) {</div><div class='hunk'>@@ -881,6 +909,9 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)</div><div class='ctx'> static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	u8 lut_type, hash_type;</div><div class='add'>+	struct ice_pf *pf;</div><div class='add'>+</div><div class='add'>+	pf = vsi-&gt;back;</div><div class='ctx'> </div><div class='ctx'> 	switch (vsi-&gt;type) {</div><div class='ctx'> 	case ICE_VSI_PF:</div><div class='hunk'>@@ -894,8 +925,7 @@ static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi)</div><div class='ctx'> 		hash_type = ICE_AQ_VSI_Q_OPT_RSS_TPLZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, "Unknown VSI type %d\n",</div><div class='del'>-			 vsi-&gt;type);</div><div class='add'>+		dev_warn(&amp;pf-&gt;pdev-&gt;dev, "Unknown VSI type %d\n", vsi-&gt;type);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -923,6 +953,7 @@ static int ice_vsi_init(struct ice_vsi *vsi)</div><div class='ctx'> 	if (!ctxt)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	ctxt-&gt;info = vsi-&gt;info;</div><div class='ctx'> 	switch (vsi-&gt;type) {</div><div class='ctx'> 	case ICE_VSI_PF:</div><div class='ctx'> 		ctxt-&gt;flags = ICE_AQ_VSI_TYPE_PF;</div><div class='hunk'>@@ -948,6 +979,14 @@ static int ice_vsi_init(struct ice_vsi *vsi)</div><div class='ctx'> 	ctxt-&gt;info.sw_id = vsi-&gt;port_info-&gt;sw_id;</div><div class='ctx'> 	ice_vsi_setup_q_map(vsi, ctxt);</div><div class='ctx'> </div><div class='add'>+	/* Enable MAC Antispoof with new VSI being initialized or updated */</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_VF &amp;&amp; pf-&gt;vf[vsi-&gt;vf_id].spoofchk) {</div><div class='add'>+		ctxt-&gt;info.valid_sections |=</div><div class='add'>+			cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);</div><div class='add'>+		ctxt-&gt;info.sec_flags |=</div><div class='add'>+			ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ice_add_vsi(hw, vsi-&gt;idx, ctxt, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -973,10 +1012,11 @@ static int ice_vsi_init(struct ice_vsi *vsi)</div><div class='ctx'> static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_q_vector *q_vector;</div><div class='add'>+	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> 	struct ice_ring *ring;</div><div class='ctx'> </div><div class='ctx'> 	if (!vsi-&gt;q_vectors[v_idx]) {</div><div class='del'>-		dev_dbg(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, "Queue vector at index %d not found\n",</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "Queue vector at index %d not found\n",</div><div class='ctx'> 			v_idx);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -991,7 +1031,7 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx)</div><div class='ctx'> 	if (vsi-&gt;netdev)</div><div class='ctx'> 		netif_napi_del(&amp;q_vector-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	devm_kfree(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, q_vector);</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, q_vector);</div><div class='ctx'> 	vsi-&gt;q_vectors[v_idx] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1003,7 +1043,7 @@ void ice_vsi_free_q_vectors(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	int v_idx;</div><div class='ctx'> </div><div class='del'>-	for (v_idx = 0; v_idx &lt; vsi-&gt;num_q_vectors; v_idx++)</div><div class='add'>+	ice_for_each_q_vector(vsi, v_idx)</div><div class='ctx'> 		ice_free_q_vector(vsi, v_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1143,8 +1183,7 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi)</div><div class='ctx'> 						  num_q_vectors, vsi-&gt;idx);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev_warn(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, "Unknown VSI type %d\n",</div><div class='del'>-			 vsi-&gt;type);</div><div class='add'>+		dev_warn(&amp;pf-&gt;pdev-&gt;dev, "Unknown VSI type %d\n", vsi-&gt;type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1153,7 +1192,7 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi)</div><div class='ctx'> 			"Failed to get tracking for %d HW vectors for VSI %d, err=%d\n",</div><div class='ctx'> 			num_q_vectors, vsi-&gt;vsi_num, vsi-&gt;hw_base_vector);</div><div class='ctx'> 		if (vsi-&gt;type != ICE_VSI_VF) {</div><div class='del'>-			ice_free_res(vsi-&gt;back-&gt;sw_irq_tracker,</div><div class='add'>+			ice_free_res(pf-&gt;sw_irq_tracker,</div><div class='ctx'> 				     vsi-&gt;sw_base_vector, vsi-&gt;idx);</div><div class='ctx'> 			pf-&gt;num_avail_sw_msix += num_q_vectors;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1215,7 +1254,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)</div><div class='ctx'> 		ring-&gt;ring_active = false;</div><div class='ctx'> 		ring-&gt;vsi = vsi;</div><div class='ctx'> 		ring-&gt;dev = &amp;pf-&gt;pdev-&gt;dev;</div><div class='del'>-		ring-&gt;count = vsi-&gt;num_desc;</div><div class='add'>+		ring-&gt;count = vsi-&gt;num_tx_desc;</div><div class='ctx'> 		vsi-&gt;tx_rings[i] = ring;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1234,7 +1273,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)</div><div class='ctx'> 		ring-&gt;vsi = vsi;</div><div class='ctx'> 		ring-&gt;netdev = vsi-&gt;netdev;</div><div class='ctx'> 		ring-&gt;dev = &amp;pf-&gt;pdev-&gt;dev;</div><div class='del'>-		ring-&gt;count = vsi-&gt;num_desc;</div><div class='add'>+		ring-&gt;count = vsi-&gt;num_rx_desc;</div><div class='ctx'> 		vsi-&gt;rx_rings[i] = ring;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1253,7 +1292,11 @@ err_out:</div><div class='ctx'>  * through the MSI-X enabling code. On a constrained vector budget, we map Tx</div><div class='ctx'>  * and Rx rings to the vector as "efficiently" as possible.</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi)</div><div class='add'>+#else</div><div class='ctx'> static void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi)</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='ctx'> {</div><div class='ctx'> 	int q_vectors = vsi-&gt;num_q_vectors;</div><div class='ctx'> 	int tx_rings_rem, rx_rings_rem;</div><div class='hunk'>@@ -1339,7 +1382,6 @@ int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena)</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='del'>-	u8 seed[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE];</div><div class='ctx'> 	struct ice_aqc_get_set_rss_keys *key;</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> 	enum ice_status status;</div><div class='hunk'>@@ -1361,31 +1403,30 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)</div><div class='ctx'> 				    vsi-&gt;rss_table_size);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"set_rss_lut failed, error %d\n", status);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto ice_vsi_cfg_rss_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = devm_kzalloc(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, sizeof(*key), GFP_KERNEL);</div><div class='add'>+	key = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*key), GFP_KERNEL);</div><div class='ctx'> 	if (!key) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto ice_vsi_cfg_rss_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;rss_hkey_user)</div><div class='del'>-		memcpy(seed, vsi-&gt;rss_hkey_user,</div><div class='del'>-		       ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE);</div><div class='add'>+		memcpy(key,</div><div class='add'>+		       (struct ice_aqc_get_set_rss_keys *)vsi-&gt;rss_hkey_user,</div><div class='add'>+		       ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE);</div><div class='ctx'> 	else</div><div class='del'>-		netdev_rss_key_fill((void *)seed,</div><div class='del'>-				    ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE);</div><div class='del'>-	memcpy(&amp;key-&gt;standard_rss_key, seed,</div><div class='del'>-	       ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE);</div><div class='add'>+		netdev_rss_key_fill((void *)key,</div><div class='add'>+				    ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	status = ice_aq_set_rss_key(&amp;pf-&gt;hw, vsi-&gt;idx, key);</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, "set_rss_key failed, error %d\n",</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev, "set_rss_key failed, error %d\n",</div><div class='ctx'> 			status);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1397,12 +1438,12 @@ ice_vsi_cfg_rss_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_add_mac_to_list - Add a mac address filter entry to the list</div><div class='add'>+ * ice_add_mac_to_list - Add a MAC address filter entry to the list</div><div class='ctx'>  * @vsi: the VSI to be forwarded to</div><div class='ctx'>  * @add_list: pointer to the list which contains MAC filter entries</div><div class='ctx'>  * @macaddr: the MAC address to be added.</div><div class='ctx'>  *</div><div class='del'>- * Adds mac address filter entry to the temp list</div><div class='add'>+ * Adds MAC address filter entry to the temp list</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success or ENOMEM on failure.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1504,7 +1545,7 @@ void ice_free_fltr_list(struct device *dev, struct list_head *h)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_vsi_add_vlan - Add VSI membership for given VLAN</div><div class='ctx'>  * @vsi: the VSI being configured</div><div class='del'>- * @vid: VLAN id to be added</div><div class='add'>+ * @vid: VLAN ID to be added</div><div class='ctx'>  */</div><div class='ctx'> int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)</div><div class='ctx'> {</div><div class='hunk'>@@ -1542,7 +1583,7 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_vsi_kill_vlan - Remove VSI membership for a given VLAN</div><div class='ctx'>  * @vsi: the VSI being configured</div><div class='del'>- * @vid: VLAN id to be removed</div><div class='add'>+ * @vid: VLAN ID to be removed</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success and negative on failure</div><div class='ctx'>  */</div><div class='hunk'>@@ -1551,7 +1592,8 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)</div><div class='ctx'> 	struct ice_fltr_list_entry *list;</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> 	LIST_HEAD(tmp_add_list);</div><div class='del'>-	int status = 0;</div><div class='add'>+	enum ice_status status;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	list = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*list), GFP_KERNEL);</div><div class='ctx'> 	if (!list)</div><div class='hunk'>@@ -1567,14 +1609,20 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;list-&gt;list_entry);</div><div class='ctx'> 	list_add(&amp;list-&gt;list_entry, &amp;tmp_add_list);</div><div class='ctx'> </div><div class='del'>-	if (ice_remove_vlan(&amp;pf-&gt;hw, &amp;tmp_add_list)) {</div><div class='del'>-		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Error removing VLAN %d on vsi %i\n",</div><div class='del'>-			vid, vsi-&gt;vsi_num);</div><div class='del'>-		status = -EIO;</div><div class='add'>+	status = ice_remove_vlan(&amp;pf-&gt;hw, &amp;tmp_add_list);</div><div class='add'>+	if (status == ICE_ERR_DOES_NOT_EXIST) {</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"Failed to remove VLAN %d on VSI %i, it does not exist, status: %d\n",</div><div class='add'>+			vid, vsi-&gt;vsi_num, status);</div><div class='add'>+	} else if (status) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"Error removing VLAN %d on vsi %i error: %d\n",</div><div class='add'>+			vid, vsi-&gt;vsi_num, status);</div><div class='add'>+		err = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ice_free_fltr_list(&amp;pf-&gt;pdev-&gt;dev, &amp;tmp_add_list);</div><div class='del'>-	return status;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1586,7 +1634,6 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)</div><div class='ctx'>  */</div><div class='ctx'> int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;type == ICE_VSI_VF)</div><div class='hunk'>@@ -1601,14 +1648,19 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)</div><div class='ctx'> 	vsi-&gt;rx_buf_len = ICE_RXBUF_2048;</div><div class='ctx'> setup_rings:</div><div class='ctx'> 	/* set up individual rings */</div><div class='del'>-	for (i = 0; i &lt; vsi-&gt;num_rxq &amp;&amp; !err; i++)</div><div class='del'>-		err = ice_setup_rx_ctx(vsi-&gt;rx_rings[i]);</div><div class='add'>+	for (i = 0; i &lt; vsi-&gt;num_rxq; i++) {</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev, "ice_setup_rx_ctx failed\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+		err = ice_setup_rx_ctx(vsi-&gt;rx_rings[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+				"ice_setup_rx_ctx failed for RxQ %d, err %d\n",</div><div class='add'>+				i, err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return err;</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'>@@ -1640,7 +1692,7 @@ ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings, int offset)</div><div class='ctx'> 	num_q_grps = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* set up and configure the Tx queues for each enabled TC */</div><div class='del'>-	for (tc = 0; tc &lt; ICE_MAX_TRAFFIC_CLASS; tc++) {</div><div class='add'>+	ice_for_each_traffic_class(tc) {</div><div class='ctx'> 		if (!(vsi-&gt;tc_cfg.ena_tc &amp; BIT(tc)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1660,10 +1712,10 @@ ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings, int offset)</div><div class='ctx'> 			rings[q_idx]-&gt;tail =</div><div class='ctx'> 				pf-&gt;hw.hw_addr + QTX_COMM_DBELL(pf_q);</div><div class='ctx'> 			status = ice_ena_vsi_txq(vsi-&gt;port_info, vsi-&gt;idx, tc,</div><div class='del'>-						 num_q_grps, qg_buf, buf_len,</div><div class='del'>-						 NULL);</div><div class='add'>+						 i, num_q_grps, qg_buf,</div><div class='add'>+						 buf_len, NULL);</div><div class='ctx'> 			if (status) {</div><div class='del'>-				dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+				dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 					"Failed to set LAN Tx queue context, error: %d\n",</div><div class='ctx'> 					status);</div><div class='ctx'> 				err = -ENODEV;</div><div class='hunk'>@@ -1707,7 +1759,7 @@ int ice_vsi_cfg_lan_txqs(struct ice_vsi *vsi)</div><div class='ctx'>  * This function converts a decimal interrupt rate limit in usecs to the format</div><div class='ctx'>  * expected by firmware.</div><div class='ctx'>  */</div><div class='del'>-static u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)</div><div class='add'>+u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val = intrl / gran;</div><div class='ctx'> </div><div class='hunk'>@@ -1717,17 +1769,49 @@ static u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_cfg_itr_gran - set the ITR granularity to 2 usecs if not already set</div><div class='add'>+ * @hw: board specific structure</div><div class='add'>+ */</div><div class='add'>+static void ice_cfg_itr_gran(struct ice_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 regval = rd32(hw, GLINT_CTL);</div><div class='add'>+</div><div class='add'>+	/* no need to update global register if ITR gran is already set */</div><div class='add'>+	if (!(regval &amp; GLINT_CTL_DIS_AUTOMASK_M) &amp;&amp;</div><div class='add'>+	    (((regval &amp; GLINT_CTL_ITR_GRAN_200_M) &gt;&gt;</div><div class='add'>+	     GLINT_CTL_ITR_GRAN_200_S) == ICE_ITR_GRAN_US) &amp;&amp;</div><div class='add'>+	    (((regval &amp; GLINT_CTL_ITR_GRAN_100_M) &gt;&gt;</div><div class='add'>+	     GLINT_CTL_ITR_GRAN_100_S) == ICE_ITR_GRAN_US) &amp;&amp;</div><div class='add'>+	    (((regval &amp; GLINT_CTL_ITR_GRAN_50_M) &gt;&gt;</div><div class='add'>+	     GLINT_CTL_ITR_GRAN_50_S) == ICE_ITR_GRAN_US) &amp;&amp;</div><div class='add'>+	    (((regval &amp; GLINT_CTL_ITR_GRAN_25_M) &gt;&gt;</div><div class='add'>+	      GLINT_CTL_ITR_GRAN_25_S) == ICE_ITR_GRAN_US))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regval = ((ICE_ITR_GRAN_US &lt;&lt; GLINT_CTL_ITR_GRAN_200_S) &amp;</div><div class='add'>+		  GLINT_CTL_ITR_GRAN_200_M) |</div><div class='add'>+		 ((ICE_ITR_GRAN_US &lt;&lt; GLINT_CTL_ITR_GRAN_100_S) &amp;</div><div class='add'>+		  GLINT_CTL_ITR_GRAN_100_M) |</div><div class='add'>+		 ((ICE_ITR_GRAN_US &lt;&lt; GLINT_CTL_ITR_GRAN_50_S) &amp;</div><div class='add'>+		  GLINT_CTL_ITR_GRAN_50_M) |</div><div class='add'>+		 ((ICE_ITR_GRAN_US &lt;&lt; GLINT_CTL_ITR_GRAN_25_S) &amp;</div><div class='add'>+		  GLINT_CTL_ITR_GRAN_25_M);</div><div class='add'>+	wr32(hw, GLINT_CTL, regval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_cfg_itr - configure the initial interrupt throttle values</div><div class='ctx'>  * @hw: pointer to the HW structure</div><div class='ctx'>  * @q_vector: interrupt vector that's being configured</div><div class='del'>- * @vector: HW vector index to apply the interrupt throttling to</div><div class='ctx'>  *</div><div class='ctx'>  * Configure interrupt throttling values for the ring containers that are</div><div class='ctx'>  * associated with the interrupt vector passed in.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector, u16 vector)</div><div class='add'>+ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector)</div><div class='ctx'> {</div><div class='add'>+	ice_cfg_itr_gran(hw);</div><div class='add'>+</div><div class='ctx'> 	if (q_vector-&gt;num_ring_rx) {</div><div class='ctx'> 		struct ice_ring_container *rc = &amp;q_vector-&gt;rx;</div><div class='ctx'> </div><div class='hunk'>@@ -1738,8 +1822,7 @@ ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector, u16 vector)</div><div class='ctx'> 		rc-&gt;target_itr = ITR_TO_REG(rc-&gt;itr_setting);</div><div class='ctx'> 		rc-&gt;next_update = jiffies + 1;</div><div class='ctx'> 		rc-&gt;current_itr = rc-&gt;target_itr;</div><div class='del'>-		rc-&gt;latency_range = ICE_LOW_LATENCY;</div><div class='del'>-		wr32(hw, GLINT_ITR(rc-&gt;itr_idx, vector),</div><div class='add'>+		wr32(hw, GLINT_ITR(rc-&gt;itr_idx, q_vector-&gt;reg_idx),</div><div class='ctx'> 		     ITR_REG_ALIGN(rc-&gt;current_itr) &gt;&gt; ICE_ITR_GRAN_S);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1753,8 +1836,7 @@ ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector, u16 vector)</div><div class='ctx'> 		rc-&gt;target_itr = ITR_TO_REG(rc-&gt;itr_setting);</div><div class='ctx'> 		rc-&gt;next_update = jiffies + 1;</div><div class='ctx'> 		rc-&gt;current_itr = rc-&gt;target_itr;</div><div class='del'>-		rc-&gt;latency_range = ICE_LOW_LATENCY;</div><div class='del'>-		wr32(hw, GLINT_ITR(rc-&gt;itr_idx, vector),</div><div class='add'>+		wr32(hw, GLINT_ITR(rc-&gt;itr_idx, q_vector-&gt;reg_idx),</div><div class='ctx'> 		     ITR_REG_ALIGN(rc-&gt;current_itr) &gt;&gt; ICE_ITR_GRAN_S);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1766,17 +1848,17 @@ ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector, u16 vector)</div><div class='ctx'> void ice_vsi_cfg_msix(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='del'>-	u16 vector = vsi-&gt;hw_base_vector;</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	u32 txq = 0, rxq = 0;</div><div class='ctx'> 	int i, q;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; vsi-&gt;num_q_vectors; i++, vector++) {</div><div class='add'>+	for (i = 0; i &lt; vsi-&gt;num_q_vectors; i++) {</div><div class='ctx'> 		struct ice_q_vector *q_vector = vsi-&gt;q_vectors[i];</div><div class='add'>+		u16 reg_idx = q_vector-&gt;reg_idx;</div><div class='ctx'> </div><div class='del'>-		ice_cfg_itr(hw, q_vector, vector);</div><div class='add'>+		ice_cfg_itr(hw, q_vector);</div><div class='ctx'> </div><div class='del'>-		wr32(hw, GLINT_RATE(vector),</div><div class='add'>+		wr32(hw, GLINT_RATE(reg_idx),</div><div class='ctx'> 		     ice_intrl_usec_to_reg(q_vector-&gt;intrl, hw-&gt;intrl_gran));</div><div class='ctx'> </div><div class='ctx'> 		/* Both Transmit Queue Interrupt Cause Control register</div><div class='hunk'>@@ -1791,33 +1873,37 @@ void ice_vsi_cfg_msix(struct ice_vsi *vsi)</div><div class='ctx'> 		 * tracked for this PF.</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (q = 0; q &lt; q_vector-&gt;num_ring_tx; q++) {</div><div class='del'>-			int itr_idx = q_vector-&gt;tx.itr_idx;</div><div class='add'>+			int itr_idx = (q_vector-&gt;tx.itr_idx &lt;&lt;</div><div class='add'>+				       QINT_TQCTL_ITR_INDX_S) &amp;</div><div class='add'>+				QINT_TQCTL_ITR_INDX_M;</div><div class='ctx'> 			u32 val;</div><div class='ctx'> </div><div class='ctx'> 			if (vsi-&gt;type == ICE_VSI_VF)</div><div class='del'>-				val = QINT_TQCTL_CAUSE_ENA_M |</div><div class='del'>-				      (itr_idx &lt;&lt; QINT_TQCTL_ITR_INDX_S)  |</div><div class='del'>-				      ((i + 1) &lt;&lt; QINT_TQCTL_MSIX_INDX_S);</div><div class='add'>+				val = QINT_TQCTL_CAUSE_ENA_M | itr_idx |</div><div class='add'>+				      (((i + 1) &lt;&lt; QINT_TQCTL_MSIX_INDX_S) &amp;</div><div class='add'>+				       QINT_TQCTL_MSIX_INDX_M);</div><div class='ctx'> 			else</div><div class='del'>-				val = QINT_TQCTL_CAUSE_ENA_M |</div><div class='del'>-				      (itr_idx &lt;&lt; QINT_TQCTL_ITR_INDX_S)  |</div><div class='del'>-				      (vector &lt;&lt; QINT_TQCTL_MSIX_INDX_S);</div><div class='add'>+				val = QINT_TQCTL_CAUSE_ENA_M | itr_idx |</div><div class='add'>+				      ((reg_idx &lt;&lt; QINT_TQCTL_MSIX_INDX_S) &amp;</div><div class='add'>+				       QINT_TQCTL_MSIX_INDX_M);</div><div class='ctx'> 			wr32(hw, QINT_TQCTL(vsi-&gt;txq_map[txq]), val);</div><div class='ctx'> 			txq++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (q = 0; q &lt; q_vector-&gt;num_ring_rx; q++) {</div><div class='del'>-			int itr_idx = q_vector-&gt;rx.itr_idx;</div><div class='add'>+			int itr_idx = (q_vector-&gt;rx.itr_idx &lt;&lt;</div><div class='add'>+				       QINT_RQCTL_ITR_INDX_S) &amp;</div><div class='add'>+				QINT_RQCTL_ITR_INDX_M;</div><div class='ctx'> 			u32 val;</div><div class='ctx'> </div><div class='ctx'> 			if (vsi-&gt;type == ICE_VSI_VF)</div><div class='del'>-				val = QINT_RQCTL_CAUSE_ENA_M |</div><div class='del'>-				      (itr_idx &lt;&lt; QINT_RQCTL_ITR_INDX_S)  |</div><div class='del'>-				      ((i + 1) &lt;&lt; QINT_RQCTL_MSIX_INDX_S);</div><div class='add'>+				val = QINT_RQCTL_CAUSE_ENA_M | itr_idx |</div><div class='add'>+					(((i + 1) &lt;&lt; QINT_RQCTL_MSIX_INDX_S) &amp;</div><div class='add'>+					 QINT_RQCTL_MSIX_INDX_M);</div><div class='ctx'> 			else</div><div class='del'>-				val = QINT_RQCTL_CAUSE_ENA_M |</div><div class='del'>-				      (itr_idx &lt;&lt; QINT_RQCTL_ITR_INDX_S)  |</div><div class='del'>-				      (vector &lt;&lt; QINT_RQCTL_MSIX_INDX_S);</div><div class='add'>+				val = QINT_RQCTL_CAUSE_ENA_M | itr_idx |</div><div class='add'>+					((reg_idx &lt;&lt; QINT_RQCTL_MSIX_INDX_S) &amp;</div><div class='add'>+					 QINT_RQCTL_MSIX_INDX_M);</div><div class='ctx'> 			wr32(hw, QINT_RQCTL(vsi-&gt;rxq_map[rxq]), val);</div><div class='ctx'> 			rxq++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1848,6 +1934,10 @@ int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ctxt-&gt;info.vlan_flags = ICE_AQ_VSI_VLAN_MODE_ALL;</div><div class='ctx'> </div><div class='add'>+	/* Preserve existing VLAN strip setting */</div><div class='add'>+	ctxt-&gt;info.vlan_flags |= (vsi-&gt;info.vlan_flags &amp;</div><div class='add'>+				  ICE_AQ_VSI_VLAN_EMOD_M);</div><div class='add'>+</div><div class='ctx'> 	ctxt-&gt;info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);</div><div class='ctx'> </div><div class='ctx'> 	status = ice_update_vsi(hw, vsi-&gt;idx, ctxt, NULL);</div><div class='hunk'>@@ -1937,7 +2027,7 @@ int ice_vsi_stop_rx_rings(struct ice_vsi *vsi)</div><div class='ctx'>  * ice_vsi_stop_tx_rings - Disable Tx rings</div><div class='ctx'>  * @vsi: the VSI being configured</div><div class='ctx'>  * @rst_src: reset source</div><div class='del'>- * @rel_vmvf_num: Relative id of VF/VM</div><div class='add'>+ * @rel_vmvf_num: Relative ID of VF/VM</div><div class='ctx'>  * @rings: Tx ring array to be stopped</div><div class='ctx'>  * @offset: offset within vsi-&gt;txq_map</div><div class='ctx'>  */</div><div class='hunk'>@@ -1947,10 +2037,10 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vsi-&gt;back;</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='add'>+	int tc, q_idx = 0, err = 0;</div><div class='add'>+	u16 *q_ids, *q_handles, i;</div><div class='ctx'> 	enum ice_status status;</div><div class='ctx'> 	u32 *q_teids, val;</div><div class='del'>-	u16 *q_ids, i;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;num_txq &gt; ICE_LAN_TXQ_MAX_QDIS)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1967,50 +2057,69 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,</div><div class='ctx'> 		goto err_alloc_q_ids;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set up the Tx queue list to be disabled */</div><div class='del'>-	ice_for_each_txq(vsi, i) {</div><div class='del'>-		u16 v_idx;</div><div class='add'>+	q_handles = devm_kcalloc(&amp;pf-&gt;pdev-&gt;dev, vsi-&gt;num_txq,</div><div class='add'>+				 sizeof(*q_handles), GFP_KERNEL);</div><div class='add'>+	if (!q_handles) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_alloc_q_handles;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!rings || !rings[i] || !rings[i]-&gt;q_vector) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='add'>+	/* set up the Tx queue list to be disabled for each enabled TC */</div><div class='add'>+	ice_for_each_traffic_class(tc) {</div><div class='add'>+		if (!(vsi-&gt;tc_cfg.ena_tc &amp; BIT(tc)))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		q_ids[i] = vsi-&gt;txq_map[i + offset];</div><div class='del'>-		q_teids[i] = rings[i]-&gt;txq_teid;</div><div class='add'>+		for (i = 0; i &lt; vsi-&gt;tc_cfg.tc_info[tc].qcount_tx; i++) {</div><div class='add'>+			if (!rings || !rings[q_idx] ||</div><div class='add'>+			    !rings[q_idx]-&gt;q_vector) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_out;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		/* clear cause_ena bit for disabled queues */</div><div class='del'>-		val = rd32(hw, QINT_TQCTL(rings[i]-&gt;reg_idx));</div><div class='del'>-		val &amp;= ~QINT_TQCTL_CAUSE_ENA_M;</div><div class='del'>-		wr32(hw, QINT_TQCTL(rings[i]-&gt;reg_idx), val);</div><div class='add'>+			q_ids[i] = vsi-&gt;txq_map[q_idx + offset];</div><div class='add'>+			q_teids[i] = rings[q_idx]-&gt;txq_teid;</div><div class='add'>+			q_handles[i] = i;</div><div class='ctx'> </div><div class='del'>-		/* software is expected to wait for 100 ns */</div><div class='del'>-		ndelay(100);</div><div class='add'>+			/* clear cause_ena bit for disabled queues */</div><div class='add'>+			val = rd32(hw, QINT_TQCTL(rings[i]-&gt;reg_idx));</div><div class='add'>+			val &amp;= ~QINT_TQCTL_CAUSE_ENA_M;</div><div class='add'>+			wr32(hw, QINT_TQCTL(rings[i]-&gt;reg_idx), val);</div><div class='ctx'> </div><div class='del'>-		/* trigger a software interrupt for the vector associated to</div><div class='del'>-		 * the queue to schedule NAPI handler</div><div class='add'>+			/* software is expected to wait for 100 ns */</div><div class='add'>+			ndelay(100);</div><div class='add'>+</div><div class='add'>+			/* trigger a software interrupt for the vector</div><div class='add'>+			 * associated to the queue to schedule NAPI handler</div><div class='add'>+			 */</div><div class='add'>+			wr32(hw, GLINT_DYN_CTL(rings[i]-&gt;q_vector-&gt;reg_idx),</div><div class='add'>+			     GLINT_DYN_CTL_SWINT_TRIG_M |</div><div class='add'>+			     GLINT_DYN_CTL_INTENA_MSK_M);</div><div class='add'>+			q_idx++;</div><div class='add'>+		}</div><div class='add'>+		status = ice_dis_vsi_txq(vsi-&gt;port_info, vsi-&gt;idx, tc,</div><div class='add'>+					 vsi-&gt;num_txq, q_handles, q_ids,</div><div class='add'>+					 q_teids, rst_src, rel_vmvf_num, NULL);</div><div class='add'>+</div><div class='add'>+		/* if the disable queue command was exercised during an active</div><div class='add'>+		 * reset flow, ICE_ERR_RESET_ONGOING is returned. This is not</div><div class='add'>+		 * an error as the reset operation disables queues at the</div><div class='add'>+		 * hardware level anyway.</div><div class='ctx'> 		 */</div><div class='del'>-		v_idx = rings[i]-&gt;q_vector-&gt;v_idx;</div><div class='del'>-		wr32(hw, GLINT_DYN_CTL(vsi-&gt;hw_base_vector + v_idx),</div><div class='del'>-		     GLINT_DYN_CTL_SWINT_TRIG_M | GLINT_DYN_CTL_INTENA_MSK_M);</div><div class='del'>-	}</div><div class='del'>-	status = ice_dis_vsi_txq(vsi-&gt;port_info, vsi-&gt;num_txq, q_ids, q_teids,</div><div class='del'>-				 rst_src, rel_vmvf_num, NULL);</div><div class='del'>-	/* if the disable queue command was exercised during an active reset</div><div class='del'>-	 * flow, ICE_ERR_RESET_ONGOING is returned. This is not an error as</div><div class='del'>-	 * the reset operation disables queues at the hardware level anyway.</div><div class='del'>-	 */</div><div class='del'>-	if (status == ICE_ERR_RESET_ONGOING) {</div><div class='del'>-		dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			 "Reset in progress. LAN Tx queues already disabled\n");</div><div class='del'>-	} else if (status) {</div><div class='del'>-		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			"Failed to disable LAN Tx queues, error: %d\n",</div><div class='del'>-			status);</div><div class='del'>-		err = -ENODEV;</div><div class='add'>+		if (status == ICE_ERR_RESET_ONGOING) {</div><div class='add'>+			dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				"Reset in progress. LAN Tx queues already disabled\n");</div><div class='add'>+		} else if (status) {</div><div class='add'>+			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+				"Failed to disable LAN Tx queues, error: %d\n",</div><div class='add'>+				status);</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, q_handles);</div><div class='add'>+</div><div class='add'>+err_alloc_q_handles:</div><div class='ctx'> 	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, q_ids);</div><div class='ctx'> </div><div class='ctx'> err_alloc_q_ids:</div><div class='hunk'>@@ -2023,10 +2132,11 @@ err_alloc_q_ids:</div><div class='ctx'>  * ice_vsi_stop_lan_tx_rings - Disable LAN Tx rings</div><div class='ctx'>  * @vsi: the VSI being configured</div><div class='ctx'>  * @rst_src: reset source</div><div class='del'>- * @rel_vmvf_num: Relative id of VF/VM</div><div class='add'>+ * @rel_vmvf_num: Relative ID of VF/VM</div><div class='ctx'>  */</div><div class='del'>-int ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi,</div><div class='del'>-			      enum ice_disq_rst_src rst_src, u16 rel_vmvf_num)</div><div class='add'>+int</div><div class='add'>+ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,</div><div class='add'>+			  u16 rel_vmvf_num)</div><div class='ctx'> {</div><div class='ctx'> 	return ice_vsi_stop_tx_rings(vsi, rst_src, rel_vmvf_num, vsi-&gt;tx_rings,</div><div class='ctx'> 				     0);</div><div class='hunk'>@@ -2036,19 +2146,22 @@ int ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi,</div><div class='ctx'>  * ice_cfg_vlan_pruning - enable or disable VLAN pruning on the VSI</div><div class='ctx'>  * @vsi: VSI to enable or disable VLAN pruning on</div><div class='ctx'>  * @ena: set to true to enable VLAN pruning and false to disable it</div><div class='add'>+ * @vlan_promisc: enable valid security flags if not in VLAN promiscuous mode</div><div class='ctx'>  *</div><div class='ctx'>  * returns 0 if VSI is updated, negative otherwise</div><div class='ctx'>  */</div><div class='del'>-int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena)</div><div class='add'>+int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_vsi_ctx *ctxt;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct ice_pf *pf;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (!vsi)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev = &amp;vsi-&gt;back-&gt;pdev-&gt;dev;</div><div class='add'>+	pf = vsi-&gt;back;</div><div class='add'>+	dev = &amp;pf-&gt;pdev-&gt;dev;</div><div class='ctx'> 	ctxt = devm_kzalloc(dev, sizeof(*ctxt), GFP_KERNEL);</div><div class='ctx'> 	if (!ctxt)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2067,14 +2180,16 @@ int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena)</div><div class='ctx'> 		ctxt-&gt;info.sw_flags2 &amp;= ~ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctxt-&gt;info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID |</div><div class='del'>-						ICE_AQ_VSI_PROP_SW_VALID);</div><div class='add'>+	if (!vlan_promisc)</div><div class='add'>+		ctxt-&gt;info.valid_sections =</div><div class='add'>+			cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID |</div><div class='add'>+				    ICE_AQ_VSI_PROP_SW_VALID);</div><div class='ctx'> </div><div class='del'>-	status = ice_update_vsi(&amp;vsi-&gt;back-&gt;hw, vsi-&gt;idx, ctxt, NULL);</div><div class='add'>+	status = ice_update_vsi(&amp;pf-&gt;hw, vsi-&gt;idx, ctxt, NULL);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		netdev_err(vsi-&gt;netdev, "%sabling VLAN pruning on VSI handle: %d, VSI HW ID: %d failed, err = %d, aq_err = %d\n",</div><div class='ctx'> 			   ena ? "En" : "Dis", vsi-&gt;idx, vsi-&gt;vsi_num, status,</div><div class='del'>-			   vsi-&gt;back-&gt;hw.adminq.sq_last_status);</div><div class='add'>+			   pf-&gt;hw.adminq.sq_last_status);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2089,12 +2204,98 @@ err_out:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ice_vsi_set_tc_cfg(struct ice_vsi *vsi)</div><div class='add'>+{</div><div class='add'>+	struct ice_dcbx_cfg *cfg = &amp;vsi-&gt;port_info-&gt;local_dcbx_cfg;</div><div class='add'>+</div><div class='add'>+	vsi-&gt;tc_cfg.ena_tc = ice_dcb_get_ena_tc(cfg);</div><div class='add'>+	vsi-&gt;tc_cfg.numtc = ice_dcb_get_num_tc(cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_vsi_set_q_vectors_reg_idx - set the HW register index for all q_vectors</div><div class='add'>+ * @vsi: VSI to set the q_vectors register index on</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ice_vsi_set_q_vectors_reg_idx(struct ice_vsi *vsi)</div><div class='add'>+{</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	if (!vsi || !vsi-&gt;q_vectors)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ice_for_each_q_vector(vsi, i) {</div><div class='add'>+		struct ice_q_vector *q_vector = vsi-&gt;q_vectors[i];</div><div class='add'>+</div><div class='add'>+		if (!q_vector) {</div><div class='add'>+			dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='add'>+				"Failed to set reg_idx on q_vector %d VSI %d\n",</div><div class='add'>+				i, vsi-&gt;vsi_num);</div><div class='add'>+			goto clear_reg_idx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		q_vector-&gt;reg_idx = q_vector-&gt;v_idx + vsi-&gt;hw_base_vector;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clear_reg_idx:</div><div class='add'>+	ice_for_each_q_vector(vsi, i) {</div><div class='add'>+		struct ice_q_vector *q_vector = vsi-&gt;q_vectors[i];</div><div class='add'>+</div><div class='add'>+		if (q_vector)</div><div class='add'>+			q_vector-&gt;reg_idx = 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'>+/**</div><div class='add'>+ * ice_vsi_add_rem_eth_mac - Program VSI ethertype based filter with rule</div><div class='add'>+ * @vsi: the VSI being configured</div><div class='add'>+ * @add_rule: boolean value to add or remove ethertype filter rule</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule)</div><div class='add'>+{</div><div class='add'>+	struct ice_fltr_list_entry *list;</div><div class='add'>+	struct ice_pf *pf = vsi-&gt;back;</div><div class='add'>+	LIST_HEAD(tmp_add_list);</div><div class='add'>+	enum ice_status status;</div><div class='add'>+</div><div class='add'>+	list = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*list), GFP_KERNEL);</div><div class='add'>+	if (!list)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list-&gt;fltr_info.lkup_type = ICE_SW_LKUP_ETHERTYPE;</div><div class='add'>+	list-&gt;fltr_info.fltr_act = ICE_DROP_PACKET;</div><div class='add'>+	list-&gt;fltr_info.flag = ICE_FLTR_TX;</div><div class='add'>+	list-&gt;fltr_info.src_id = ICE_SRC_ID_VSI;</div><div class='add'>+	list-&gt;fltr_info.vsi_handle = vsi-&gt;idx;</div><div class='add'>+	list-&gt;fltr_info.l_data.ethertype_mac.ethertype = vsi-&gt;ethtype;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;list-&gt;list_entry);</div><div class='add'>+	list_add(&amp;list-&gt;list_entry, &amp;tmp_add_list);</div><div class='add'>+</div><div class='add'>+	if (add_rule)</div><div class='add'>+		status = ice_add_eth_mac(&amp;pf-&gt;hw, &amp;tmp_add_list);</div><div class='add'>+	else</div><div class='add'>+		status = ice_remove_eth_mac(&amp;pf-&gt;hw, &amp;tmp_add_list);</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"Failure Adding or Removing Ethertype on VSI %i error: %d\n",</div><div class='add'>+			vsi-&gt;vsi_num, status);</div><div class='add'>+</div><div class='add'>+	ice_free_fltr_list(&amp;pf-&gt;pdev-&gt;dev, &amp;tmp_add_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ice_vsi_setup - Set up a VSI by a given type</div><div class='ctx'>  * @pf: board private structure</div><div class='ctx'>  * @pi: pointer to the port_info instance</div><div class='ctx'>  * @type: VSI type</div><div class='del'>- * @vf_id: defines VF id to which this VSI connects. This field is meant to be</div><div class='add'>+ * @vf_id: defines VF ID to which this VSI connects. This field is meant to be</div><div class='ctx'>  *         used only for ICE_VSI_VF VSI type. For other VSI types, should</div><div class='ctx'>  *         fill-in ICE_INVAL_VFID as input.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2112,7 +2313,11 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='del'>-	vsi = ice_vsi_alloc(pf, type);</div><div class='add'>+	if (type == ICE_VSI_VF)</div><div class='add'>+		vsi = ice_vsi_alloc(pf, type, vf_id);</div><div class='add'>+	else</div><div class='add'>+		vsi = ice_vsi_alloc(pf, type, ICE_INVAL_VFID);</div><div class='add'>+</div><div class='ctx'> 	if (!vsi) {</div><div class='ctx'> 		dev_err(dev, "could not allocate VSI\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -2120,6 +2325,9 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> </div><div class='ctx'> 	vsi-&gt;port_info = pi;</div><div class='ctx'> 	vsi-&gt;vsw = pf-&gt;first_sw;</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_PF)</div><div class='add'>+		vsi-&gt;ethtype = ETH_P_PAUSE;</div><div class='add'>+</div><div class='ctx'> 	if (vsi-&gt;type == ICE_VSI_VF)</div><div class='ctx'> 		vsi-&gt;vf_id = vf_id;</div><div class='ctx'> </div><div class='hunk'>@@ -2132,7 +2340,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> 	/* set RSS capabilities */</div><div class='ctx'> 	ice_vsi_set_rss_params(vsi);</div><div class='ctx'> </div><div class='del'>-	/* set tc configuration */</div><div class='add'>+	/* set TC configuration */</div><div class='ctx'> 	ice_vsi_set_tc_cfg(vsi);</div><div class='ctx'> </div><div class='ctx'> 	/* create the VSI */</div><div class='hunk'>@@ -2150,6 +2358,10 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto unroll_alloc_q_vector;</div><div class='ctx'> </div><div class='add'>+		ret = ice_vsi_set_q_vectors_reg_idx(vsi);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unroll_vector_base;</div><div class='add'>+</div><div class='ctx'> 		ret = ice_vsi_alloc_rings(vsi);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto unroll_vector_base;</div><div class='hunk'>@@ -2188,6 +2400,10 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			vsi-&gt;hw_base_vector = pf-&gt;vf[vf_id].first_vector_idx;</div><div class='ctx'> 		}</div><div class='add'>+		ret = ice_vsi_set_q_vectors_reg_idx(vsi);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unroll_vector_base;</div><div class='add'>+</div><div class='ctx'> 		pf-&gt;q_left_tx -= vsi-&gt;alloc_txq;</div><div class='ctx'> 		pf-&gt;q_left_rx -= vsi-&gt;alloc_rxq;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2203,18 +2419,29 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> 	ret = ice_cfg_vsi_lan(vsi-&gt;port_info, vsi-&gt;idx, vsi-&gt;tc_cfg.ena_tc,</div><div class='ctx'> 			      max_txqs);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_info(&amp;pf-&gt;pdev-&gt;dev, "Failed VSI lan queue config\n");</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"VSI %d failed lan queue config, error %d\n",</div><div class='add'>+			vsi-&gt;vsi_num, ret);</div><div class='ctx'> 		goto unroll_vector_base;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Add switch rule to drop all Tx Flow Control Frames, of look up</div><div class='add'>+	 * type ETHERTYPE from VSIs, and restrict malicious VF from sending</div><div class='add'>+	 * out PAUSE or PFC frames. If enabled, FW can still send FC frames.</div><div class='add'>+	 * The rule is added once for PF VSI in order to create appropriate</div><div class='add'>+	 * recipe, since VSI/VSI list is ignored with drop action...</div><div class='add'>+	 */</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_PF)</div><div class='add'>+		ice_vsi_add_rem_eth_mac(vsi, true);</div><div class='add'>+</div><div class='ctx'> 	return vsi;</div><div class='ctx'> </div><div class='ctx'> unroll_vector_base:</div><div class='ctx'> 	/* reclaim SW interrupts back to the common pool */</div><div class='del'>-	ice_free_res(vsi-&gt;back-&gt;sw_irq_tracker, vsi-&gt;sw_base_vector, vsi-&gt;idx);</div><div class='add'>+	ice_free_res(pf-&gt;sw_irq_tracker, vsi-&gt;sw_base_vector, vsi-&gt;idx);</div><div class='ctx'> 	pf-&gt;num_avail_sw_msix += vsi-&gt;num_q_vectors;</div><div class='ctx'> 	/* reclaim HW interrupt back to the common pool */</div><div class='del'>-	ice_free_res(vsi-&gt;back-&gt;hw_irq_tracker, vsi-&gt;hw_base_vector, vsi-&gt;idx);</div><div class='add'>+	ice_free_res(pf-&gt;hw_irq_tracker, vsi-&gt;hw_base_vector, vsi-&gt;idx);</div><div class='ctx'> 	pf-&gt;num_avail_hw_msix += vsi-&gt;num_q_vectors;</div><div class='ctx'> unroll_alloc_q_vector:</div><div class='ctx'> 	ice_vsi_free_q_vectors(vsi);</div><div class='hunk'>@@ -2281,7 +2508,7 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		vsi-&gt;irqs_ready = false;</div><div class='del'>-		for (i = 0; i &lt; vsi-&gt;num_q_vectors; i++) {</div><div class='add'>+		ice_for_each_q_vector(vsi, i) {</div><div class='ctx'> 			u16 vector = i + base;</div><div class='ctx'> 			int irq_num;</div><div class='ctx'> </div><div class='hunk'>@@ -2500,12 +2727,12 @@ void ice_vsi_dis_irq(struct ice_vsi *vsi)</div><div class='ctx'> </div><div class='ctx'> 	/* disable each interrupt */</div><div class='ctx'> 	if (test_bit(ICE_FLAG_MSIX_ENA, pf-&gt;flags)) {</div><div class='del'>-		for (i = vsi-&gt;hw_base_vector;</div><div class='del'>-		     i &lt; (vsi-&gt;num_q_vectors + vsi-&gt;hw_base_vector); i++)</div><div class='del'>-			wr32(hw, GLINT_DYN_CTL(i), 0);</div><div class='add'>+		ice_for_each_q_vector(vsi, i)</div><div class='add'>+			wr32(hw, GLINT_DYN_CTL(vsi-&gt;q_vectors[i]-&gt;reg_idx), 0);</div><div class='ctx'> </div><div class='ctx'> 		ice_flush(hw);</div><div class='del'>-		for (i = 0; i &lt; vsi-&gt;num_q_vectors; i++)</div><div class='add'>+</div><div class='add'>+		ice_for_each_q_vector(vsi, i)</div><div class='ctx'> 			synchronize_irq(pf-&gt;msix_entries[i + base].vector);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2551,22 +2778,23 @@ int ice_vsi_release(struct ice_vsi *vsi)</div><div class='ctx'> 	/* reclaim interrupt vectors back to PF */</div><div class='ctx'> 	if (vsi-&gt;type != ICE_VSI_VF) {</div><div class='ctx'> 		/* reclaim SW interrupts back to the common pool */</div><div class='del'>-		ice_free_res(vsi-&gt;back-&gt;sw_irq_tracker, vsi-&gt;sw_base_vector,</div><div class='del'>-			     vsi-&gt;idx);</div><div class='add'>+		ice_free_res(pf-&gt;sw_irq_tracker, vsi-&gt;sw_base_vector, vsi-&gt;idx);</div><div class='ctx'> 		pf-&gt;num_avail_sw_msix += vsi-&gt;num_q_vectors;</div><div class='ctx'> 		/* reclaim HW interrupts back to the common pool */</div><div class='del'>-		ice_free_res(vsi-&gt;back-&gt;hw_irq_tracker, vsi-&gt;hw_base_vector,</div><div class='del'>-			     vsi-&gt;idx);</div><div class='add'>+		ice_free_res(pf-&gt;hw_irq_tracker, vsi-&gt;hw_base_vector, vsi-&gt;idx);</div><div class='ctx'> 		pf-&gt;num_avail_hw_msix += vsi-&gt;num_q_vectors;</div><div class='ctx'> 	} else if (test_bit(ICE_VF_STATE_CFG_INTR, vf-&gt;vf_states)) {</div><div class='ctx'> 		/* Reclaim VF resources back only while freeing all VFs or</div><div class='ctx'> 		 * vector reassignment is requested</div><div class='ctx'> 		 */</div><div class='del'>-		ice_free_res(vsi-&gt;back-&gt;hw_irq_tracker, vf-&gt;first_vector_idx,</div><div class='add'>+		ice_free_res(pf-&gt;hw_irq_tracker, vf-&gt;first_vector_idx,</div><div class='ctx'> 			     vsi-&gt;idx);</div><div class='ctx'> 		pf-&gt;num_avail_hw_msix += pf-&gt;num_vf_msix;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_PF)</div><div class='add'>+		ice_vsi_add_rem_eth_mac(vsi, false);</div><div class='add'>+</div><div class='ctx'> 	ice_remove_vsi_fltr(&amp;pf-&gt;hw, vsi-&gt;idx);</div><div class='ctx'> 	ice_rm_vsi_lan_cfg(vsi-&gt;port_info, vsi-&gt;idx);</div><div class='ctx'> 	ice_vsi_delete(vsi);</div><div class='hunk'>@@ -2596,6 +2824,7 @@ int ice_vsi_release(struct ice_vsi *vsi)</div><div class='ctx'> int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	u16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };</div><div class='add'>+	struct ice_vf *vf = NULL;</div><div class='ctx'> 	struct ice_pf *pf;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='hunk'>@@ -2603,16 +2832,38 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pf = vsi-&gt;back;</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_VF)</div><div class='add'>+		vf = &amp;pf-&gt;vf[vsi-&gt;vf_id];</div><div class='add'>+</div><div class='ctx'> 	ice_rm_vsi_lan_cfg(vsi-&gt;port_info, vsi-&gt;idx);</div><div class='ctx'> 	ice_vsi_free_q_vectors(vsi);</div><div class='del'>-	ice_free_res(vsi-&gt;back-&gt;sw_irq_tracker, vsi-&gt;sw_base_vector, vsi-&gt;idx);</div><div class='del'>-	ice_free_res(vsi-&gt;back-&gt;hw_irq_tracker, vsi-&gt;hw_base_vector, vsi-&gt;idx);</div><div class='del'>-	vsi-&gt;sw_base_vector = 0;</div><div class='add'>+</div><div class='add'>+	if (vsi-&gt;type != ICE_VSI_VF) {</div><div class='add'>+		/* reclaim SW interrupts back to the common pool */</div><div class='add'>+		ice_free_res(pf-&gt;sw_irq_tracker, vsi-&gt;sw_base_vector, vsi-&gt;idx);</div><div class='add'>+		pf-&gt;num_avail_sw_msix += vsi-&gt;num_q_vectors;</div><div class='add'>+		vsi-&gt;sw_base_vector = 0;</div><div class='add'>+		/* reclaim HW interrupts back to the common pool */</div><div class='add'>+		ice_free_res(pf-&gt;hw_irq_tracker, vsi-&gt;hw_base_vector,</div><div class='add'>+			     vsi-&gt;idx);</div><div class='add'>+		pf-&gt;num_avail_hw_msix += vsi-&gt;num_q_vectors;</div><div class='add'>+	} else {</div><div class='add'>+		/* Reclaim VF resources back to the common pool for reset and</div><div class='add'>+		 * and rebuild, with vector reassignment</div><div class='add'>+		 */</div><div class='add'>+		ice_free_res(pf-&gt;hw_irq_tracker, vf-&gt;first_vector_idx,</div><div class='add'>+			     vsi-&gt;idx);</div><div class='add'>+		pf-&gt;num_avail_hw_msix += pf-&gt;num_vf_msix;</div><div class='add'>+	}</div><div class='ctx'> 	vsi-&gt;hw_base_vector = 0;</div><div class='add'>+</div><div class='ctx'> 	ice_vsi_clear_rings(vsi);</div><div class='del'>-	ice_vsi_free_arrays(vsi, false);</div><div class='del'>-	ice_dev_onetime_setup(&amp;vsi-&gt;back-&gt;hw);</div><div class='del'>-	ice_vsi_set_num_qs(vsi);</div><div class='add'>+	ice_vsi_free_arrays(vsi);</div><div class='add'>+	ice_dev_onetime_setup(&amp;pf-&gt;hw);</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_VF)</div><div class='add'>+		ice_vsi_set_num_qs(vsi, vf-&gt;vf_id);</div><div class='add'>+	else</div><div class='add'>+		ice_vsi_set_num_qs(vsi, ICE_INVAL_VFID);</div><div class='ctx'> 	ice_vsi_set_tc_cfg(vsi);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize VSI struct elements and create VSI in FW */</div><div class='hunk'>@@ -2620,7 +2871,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_vsi;</div><div class='ctx'> </div><div class='del'>-	ret = ice_vsi_alloc_arrays(vsi, false);</div><div class='add'>+	ret = ice_vsi_alloc_arrays(vsi);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_vsi;</div><div class='ctx'> </div><div class='hunk'>@@ -2634,6 +2885,10 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_vectors;</div><div class='ctx'> </div><div class='add'>+		ret = ice_vsi_set_q_vectors_reg_idx(vsi);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_vectors;</div><div class='add'>+</div><div class='ctx'> 		ret = ice_vsi_alloc_rings(vsi);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_vectors;</div><div class='hunk'>@@ -2643,7 +2898,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> 		 * receive traffic on first queue. Hence no need to capture</div><div class='ctx'> 		 * return value</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(ICE_FLAG_RSS_ENA, vsi-&gt;back-&gt;flags))</div><div class='add'>+		if (test_bit(ICE_FLAG_RSS_ENA, pf-&gt;flags))</div><div class='ctx'> 			ice_vsi_cfg_rss_lut_key(vsi);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE_VSI_VF:</div><div class='hunk'>@@ -2655,12 +2910,16 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_vectors;</div><div class='ctx'> </div><div class='add'>+		ret = ice_vsi_set_q_vectors_reg_idx(vsi);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_vectors;</div><div class='add'>+</div><div class='ctx'> 		ret = ice_vsi_alloc_rings(vsi);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_vectors;</div><div class='ctx'> </div><div class='del'>-		vsi-&gt;back-&gt;q_left_tx -= vsi-&gt;alloc_txq;</div><div class='del'>-		vsi-&gt;back-&gt;q_left_rx -= vsi-&gt;alloc_rxq;</div><div class='add'>+		pf-&gt;q_left_tx -= vsi-&gt;alloc_txq;</div><div class='add'>+		pf-&gt;q_left_rx -= vsi-&gt;alloc_rxq;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2673,8 +2932,9 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)</div><div class='ctx'> 	ret = ice_cfg_vsi_lan(vsi-&gt;port_info, vsi-&gt;idx, vsi-&gt;tc_cfg.ena_tc,</div><div class='ctx'> 			      max_txqs);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_info(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='del'>-			 "Failed VSI lan queue config\n");</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"VSI %d failed lan queue config, error %d\n",</div><div class='add'>+			vsi-&gt;vsi_num, ret);</div><div class='ctx'> 		goto err_vectors;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2690,7 +2950,7 @@ err_rings:</div><div class='ctx'> 	}</div><div class='ctx'> err_vsi:</div><div class='ctx'> 	ice_vsi_clear(vsi);</div><div class='del'>-	set_bit(__ICE_RESET_FAILED, vsi-&gt;back-&gt;state);</div><div class='add'>+	set_bit(__ICE_RESET_FAILED, pf-&gt;state);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2705,3 +2965,125 @@ bool ice_is_reset_in_progress(unsigned long *state)</div><div class='ctx'> 	       test_bit(__ICE_CORER_REQ, state) ||</div><div class='ctx'> 	       test_bit(__ICE_GLOBR_REQ, state);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+/**</div><div class='add'>+ * ice_vsi_update_q_map - update our copy of the VSI info with new queue map</div><div class='add'>+ * @vsi: VSI being configured</div><div class='add'>+ * @ctx: the context buffer returned from AQ VSI update command</div><div class='add'>+ */</div><div class='add'>+static void ice_vsi_update_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	vsi-&gt;info.mapping_flags = ctx-&gt;info.mapping_flags;</div><div class='add'>+	memcpy(&amp;vsi-&gt;info.q_mapping, &amp;ctx-&gt;info.q_mapping,</div><div class='add'>+	       sizeof(vsi-&gt;info.q_mapping));</div><div class='add'>+	memcpy(&amp;vsi-&gt;info.tc_mapping, ctx-&gt;info.tc_mapping,</div><div class='add'>+	       sizeof(vsi-&gt;info.tc_mapping));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_vsi_cfg_netdev_tc - Setup the netdev TC configuration</div><div class='add'>+ * @vsi: the VSI being configured</div><div class='add'>+ * @ena_tc: TC map to be enabled</div><div class='add'>+ */</div><div class='add'>+static void ice_vsi_cfg_netdev_tc(struct ice_vsi *vsi, u8 ena_tc)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = vsi-&gt;netdev;</div><div class='add'>+	struct ice_pf *pf = vsi-&gt;back;</div><div class='add'>+	struct ice_dcbx_cfg *dcbcfg;</div><div class='add'>+	u8 netdev_tc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ena_tc) {</div><div class='add'>+		netdev_reset_tc(netdev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netdev_set_num_tc(netdev, vsi-&gt;tc_cfg.numtc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dcbcfg = &amp;pf-&gt;hw.port_info-&gt;local_dcbx_cfg;</div><div class='add'>+</div><div class='add'>+	ice_for_each_traffic_class(i)</div><div class='add'>+		if (vsi-&gt;tc_cfg.ena_tc &amp; BIT(i))</div><div class='add'>+			netdev_set_tc_queue(netdev,</div><div class='add'>+					    vsi-&gt;tc_cfg.tc_info[i].netdev_tc,</div><div class='add'>+					    vsi-&gt;tc_cfg.tc_info[i].qcount_tx,</div><div class='add'>+					    vsi-&gt;tc_cfg.tc_info[i].qoffset);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ICE_MAX_USER_PRIORITY; i++) {</div><div class='add'>+		u8 ets_tc = dcbcfg-&gt;etscfg.prio_table[i];</div><div class='add'>+</div><div class='add'>+		/* Get the mapped netdev TC# for the UP */</div><div class='add'>+		netdev_tc = vsi-&gt;tc_cfg.tc_info[ets_tc].netdev_tc;</div><div class='add'>+		netdev_set_prio_tc_map(netdev, i, netdev_tc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_vsi_cfg_tc - Configure VSI Tx Sched for given TC map</div><div class='add'>+ * @vsi: VSI to be configured</div><div class='add'>+ * @ena_tc: TC bitmap</div><div class='add'>+ *</div><div class='add'>+ * VSI queues expected to be quiesced before calling this function</div><div class='add'>+ */</div><div class='add'>+int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc)</div><div class='add'>+{</div><div class='add'>+	u16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };</div><div class='add'>+	struct ice_vsi_ctx *ctx;</div><div class='add'>+	struct ice_pf *pf = vsi-&gt;back;</div><div class='add'>+	enum ice_status status;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	u8 num_tc = 0;</div><div class='add'>+</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='add'>+		/* build bitmap of enabled TCs */</div><div class='add'>+		if (ena_tc &amp; BIT(i))</div><div class='add'>+			num_tc++;</div><div class='add'>+		/* populate max_txqs per TC */</div><div class='add'>+		max_txqs[i] = pf-&gt;num_lan_tx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsi-&gt;tc_cfg.ena_tc = ena_tc;</div><div class='add'>+	vsi-&gt;tc_cfg.numtc = num_tc;</div><div class='add'>+</div><div class='add'>+	ctx = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;vf_num = 0;</div><div class='add'>+	ctx-&gt;info = vsi-&gt;info;</div><div class='add'>+</div><div class='add'>+	ice_vsi_setup_q_map(vsi, ctx);</div><div class='add'>+</div><div class='add'>+	/* must to indicate which section of VSI context are being modified */</div><div class='add'>+	ctx-&gt;info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_RXQ_MAP_VALID);</div><div class='add'>+	status = ice_update_vsi(&amp;pf-&gt;hw, vsi-&gt;idx, ctx, NULL);</div><div class='add'>+	if (status) {</div><div class='add'>+		dev_info(&amp;pf-&gt;pdev-&gt;dev, "Failed VSI Update\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ice_cfg_vsi_lan(vsi-&gt;port_info, vsi-&gt;idx, vsi-&gt;tc_cfg.ena_tc,</div><div class='add'>+				 max_txqs);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"VSI %d failed TC config, error %d\n",</div><div class='add'>+			vsi-&gt;vsi_num, status);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ice_vsi_update_q_map(vsi, ctx);</div><div class='add'>+	vsi-&gt;info.valid_sections = 0;</div><div class='add'>+</div><div class='add'>+	ice_vsi_cfg_netdev_tc(vsi, ena_tc);</div><div class='add'>+out:</div><div class='add'>+	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, ctx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h<br/>index 7988a53729a9..a91d3553cc89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_lib.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_lib.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_lib.h</a></div><div class='hunk'>@@ -35,12 +35,16 @@ int</div><div class='ctx'> ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,</div><div class='ctx'> 			  u16 rel_vmvf_num);</div><div class='ctx'> </div><div class='del'>-int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena);</div><div class='add'>+int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc);</div><div class='ctx'> </div><div class='ctx'> void ice_vsi_delete(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='ctx'> int ice_vsi_clear(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc);</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='add'>+</div><div class='ctx'> struct ice_vsi *</div><div class='ctx'> ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,</div><div class='ctx'> 	      enum ice_vsi_type type, u16 vf_id);</div><div class='hunk'>@@ -62,6 +66,10 @@ void ice_vsi_free_q_vectors(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='ctx'> void ice_vsi_put_qs(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi);</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='add'>+</div><div class='ctx'> void ice_vsi_dis_irq(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='ctx'> void ice_vsi_free_irq(struct ice_vsi *vsi);</div><div class='hunk'>@@ -70,8 +78,7 @@ void ice_vsi_free_rx_rings(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='ctx'> void ice_vsi_free_tx_rings(struct ice_vsi *vsi);</div><div class='ctx'> </div><div class='del'>-int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc);</div><div class='del'>-</div><div class='ctx'> int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);</div><div class='ctx'> </div><div class='add'>+u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran);</div><div class='ctx'> #endif /* !_ICE_LIB_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c<br/>index 47cc3f905b7f..7843abf4d44d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_main.c</a></div><div class='hunk'>@@ -7,8 +7,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "ice.h"</div><div class='ctx'> #include "ice_lib.h"</div><div class='add'>+#include "ice_dcb_lib.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION	"0.7.2-k"</div><div class='add'>+#define DRV_VERSION	"0.7.4-k"</div><div class='ctx'> #define DRV_SUMMARY	"Intel(R) Ethernet Connection E800 Series Linux Driver"</div><div class='ctx'> const char ice_drv_ver[] = DRV_VERSION;</div><div class='ctx'> static const char ice_driver_string[] = DRV_SUMMARY;</div><div class='hunk'>@@ -30,7 +31,6 @@ MODULE_PARM_DESC(debug, "netif level (0=none,...,16=all)");</div><div class='ctx'> static struct workqueue_struct *ice_wq;</div><div class='ctx'> static const struct net_device_ops ice_netdev_ops;</div><div class='ctx'> </div><div class='del'>-static void ice_pf_dis_all_vsi(struct ice_pf *pf);</div><div class='ctx'> static void ice_rebuild(struct ice_pf *pf);</div><div class='ctx'> </div><div class='ctx'> static void ice_vsi_release_all(struct ice_pf *pf);</div><div class='hunk'>@@ -113,14 +113,14 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_add_mac_to_sync_list - creates list of mac addresses to be synced</div><div class='add'>+ * ice_add_mac_to_sync_list - creates list of MAC addresses to be synced</div><div class='ctx'>  * @netdev: the net device on which the sync is happening</div><div class='del'>- * @addr: mac address to sync</div><div class='add'>+ * @addr: MAC address to sync</div><div class='ctx'>  *</div><div class='ctx'>  * This is a callback function which is called by the in kernel device sync</div><div class='ctx'>  * functions (like __dev_uc_sync, __dev_mc_sync, etc). This function only</div><div class='ctx'>  * populates the tmp_sync_list, which is later used by ice_add_mac to add the</div><div class='del'>- * mac filters from the hardware.</div><div class='add'>+ * MAC filters from the hardware.</div><div class='ctx'>  */</div><div class='ctx'> static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -134,14 +134,14 @@ static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_add_mac_to_unsync_list - creates list of mac addresses to be unsynced</div><div class='add'>+ * ice_add_mac_to_unsync_list - creates list of MAC addresses to be unsynced</div><div class='ctx'>  * @netdev: the net device on which the unsync is happening</div><div class='del'>- * @addr: mac address to unsync</div><div class='add'>+ * @addr: MAC address to unsync</div><div class='ctx'>  *</div><div class='ctx'>  * This is a callback function which is called by the in kernel device unsync</div><div class='ctx'>  * functions (like __dev_uc_unsync, __dev_mc_unsync, etc). This function only</div><div class='ctx'>  * populates the tmp_unsync_list, which is later used by ice_remove_mac to</div><div class='del'>- * delete the mac filters from the hardware.</div><div class='add'>+ * delete the MAC filters from the hardware.</div><div class='ctx'>  */</div><div class='ctx'> static int ice_add_mac_to_unsync_list(struct net_device *netdev, const u8 *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -168,6 +168,39 @@ static bool ice_vsi_fltr_changed(struct ice_vsi *vsi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_cfg_promisc - Enable or disable promiscuous mode for a given PF</div><div class='add'>+ * @vsi: the VSI being configured</div><div class='add'>+ * @promisc_m: mask of promiscuous config bits</div><div class='add'>+ * @set_promisc: enable or disable promisc flag request</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int ice_cfg_promisc(struct ice_vsi *vsi, u8 promisc_m, bool set_promisc)</div><div class='add'>+{</div><div class='add'>+	struct ice_hw *hw = &amp;vsi-&gt;back-&gt;hw;</div><div class='add'>+	enum ice_status status = 0;</div><div class='add'>+</div><div class='add'>+	if (vsi-&gt;type != ICE_VSI_PF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (vsi-&gt;vlan_ena) {</div><div class='add'>+		status = ice_set_vlan_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						  set_promisc);</div><div class='add'>+	} else {</div><div class='add'>+		if (set_promisc)</div><div class='add'>+			status = ice_set_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						     0);</div><div class='add'>+		else</div><div class='add'>+			status = ice_clear_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						       0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status)</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'>+/**</div><div class='ctx'>  * ice_vsi_sync_fltr - Update the VSI filter list to the HW</div><div class='ctx'>  * @vsi: ptr to the VSI</div><div class='ctx'>  *</div><div class='hunk'>@@ -182,6 +215,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	enum ice_status status = 0;</div><div class='ctx'> 	u32 changed_flags = 0;</div><div class='add'>+	u8 promisc_m;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!vsi-&gt;netdev)</div><div class='hunk'>@@ -211,7 +245,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)</div><div class='ctx'> 		netif_addr_unlock_bh(netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Remove mac addresses in the unsync list */</div><div class='add'>+	/* Remove MAC addresses in the unsync list */</div><div class='ctx'> 	status = ice_remove_mac(hw, &amp;vsi-&gt;tmp_unsync_list);</div><div class='ctx'> 	ice_free_fltr_list(dev, &amp;vsi-&gt;tmp_unsync_list);</div><div class='ctx'> 	if (status) {</div><div class='hunk'>@@ -223,12 +257,16 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add mac addresses in the sync list */</div><div class='add'>+	/* Add MAC addresses in the sync list */</div><div class='ctx'> 	status = ice_add_mac(hw, &amp;vsi-&gt;tmp_sync_list);</div><div class='ctx'> 	ice_free_fltr_list(dev, &amp;vsi-&gt;tmp_sync_list);</div><div class='del'>-	if (status) {</div><div class='add'>+	/* If filter is added successfully or already exists, do not go into</div><div class='add'>+	 * 'if' condition and report it as error. Instead continue processing</div><div class='add'>+	 * rest of the function.</div><div class='add'>+	 */</div><div class='add'>+	if (status &amp;&amp; status != ICE_ERR_ALREADY_EXISTS) {</div><div class='ctx'> 		netdev_err(netdev, "Failed to add MAC filters\n");</div><div class='del'>-		/* If there is no more space for new umac filters, vsi</div><div class='add'>+		/* If there is no more space for new umac filters, VSI</div><div class='ctx'> 		 * should go into promiscuous mode. There should be some</div><div class='ctx'> 		 * space reserved for promiscuous filters.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -245,49 +283,56 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* check for changes in promiscuous modes */</div><div class='del'>-	if (changed_flags &amp; IFF_ALLMULTI)</div><div class='del'>-		netdev_warn(netdev, "Unsupported configuration\n");</div><div class='add'>+	if (changed_flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		if (vsi-&gt;current_netdev_flags &amp; IFF_ALLMULTI) {</div><div class='add'>+			if (vsi-&gt;vlan_ena)</div><div class='add'>+				promisc_m = ICE_MCAST_VLAN_PROMISC_BITS;</div><div class='add'>+			else</div><div class='add'>+				promisc_m = ICE_MCAST_PROMISC_BITS;</div><div class='add'>+</div><div class='add'>+			err = ice_cfg_promisc(vsi, promisc_m, true);</div><div class='add'>+			if (err) {</div><div class='add'>+				netdev_err(netdev, "Error setting Multicast promiscuous mode on VSI %i\n",</div><div class='add'>+					   vsi-&gt;vsi_num);</div><div class='add'>+				vsi-&gt;current_netdev_flags &amp;= ~IFF_ALLMULTI;</div><div class='add'>+				goto out_promisc;</div><div class='add'>+			}</div><div class='add'>+		} else if (!(vsi-&gt;current_netdev_flags &amp; IFF_ALLMULTI)) {</div><div class='add'>+			if (vsi-&gt;vlan_ena)</div><div class='add'>+				promisc_m = ICE_MCAST_VLAN_PROMISC_BITS;</div><div class='add'>+			else</div><div class='add'>+				promisc_m = ICE_MCAST_PROMISC_BITS;</div><div class='add'>+</div><div class='add'>+			err = ice_cfg_promisc(vsi, promisc_m, false);</div><div class='add'>+			if (err) {</div><div class='add'>+				netdev_err(netdev, "Error clearing Multicast promiscuous mode on VSI %i\n",</div><div class='add'>+					   vsi-&gt;vsi_num);</div><div class='add'>+				vsi-&gt;current_netdev_flags |= IFF_ALLMULTI;</div><div class='add'>+				goto out_promisc;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (((changed_flags &amp; IFF_PROMISC) || promisc_forced_on) ||</div><div class='ctx'> 	    test_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi-&gt;flags)) {</div><div class='ctx'> 		clear_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi-&gt;flags);</div><div class='ctx'> 		if (vsi-&gt;current_netdev_flags &amp; IFF_PROMISC) {</div><div class='del'>-			/* Apply TX filter rule to get traffic from VMs */</div><div class='del'>-			status = ice_cfg_dflt_vsi(hw, vsi-&gt;idx, true,</div><div class='del'>-						  ICE_FLTR_TX);</div><div class='del'>-			if (status) {</div><div class='del'>-				netdev_err(netdev, "Error setting default VSI %i tx rule\n",</div><div class='del'>-					   vsi-&gt;vsi_num);</div><div class='del'>-				vsi-&gt;current_netdev_flags &amp;= ~IFF_PROMISC;</div><div class='del'>-				err = -EIO;</div><div class='del'>-				goto out_promisc;</div><div class='del'>-			}</div><div class='del'>-			/* Apply RX filter rule to get traffic from wire */</div><div class='add'>+			/* Apply Rx filter rule to get traffic from wire */</div><div class='ctx'> 			status = ice_cfg_dflt_vsi(hw, vsi-&gt;idx, true,</div><div class='ctx'> 						  ICE_FLTR_RX);</div><div class='ctx'> 			if (status) {</div><div class='del'>-				netdev_err(netdev, "Error setting default VSI %i rx rule\n",</div><div class='add'>+				netdev_err(netdev, "Error setting default VSI %i Rx rule\n",</div><div class='ctx'> 					   vsi-&gt;vsi_num);</div><div class='ctx'> 				vsi-&gt;current_netdev_flags &amp;= ~IFF_PROMISC;</div><div class='ctx'> 				err = -EIO;</div><div class='ctx'> 				goto out_promisc;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			/* Clear TX filter rule to stop traffic from VMs */</div><div class='del'>-			status = ice_cfg_dflt_vsi(hw, vsi-&gt;idx, false,</div><div class='del'>-						  ICE_FLTR_TX);</div><div class='del'>-			if (status) {</div><div class='del'>-				netdev_err(netdev, "Error clearing default VSI %i tx rule\n",</div><div class='del'>-					   vsi-&gt;vsi_num);</div><div class='del'>-				vsi-&gt;current_netdev_flags |= IFF_PROMISC;</div><div class='del'>-				err = -EIO;</div><div class='del'>-				goto out_promisc;</div><div class='del'>-			}</div><div class='del'>-			/* Clear RX filter to remove traffic from wire */</div><div class='add'>+			/* Clear Rx filter to remove traffic from wire */</div><div class='ctx'> 			status = ice_cfg_dflt_vsi(hw, vsi-&gt;idx, false,</div><div class='ctx'> 						  ICE_FLTR_RX);</div><div class='ctx'> 			if (status) {</div><div class='del'>-				netdev_err(netdev, "Error clearing default VSI %i rx rule\n",</div><div class='add'>+				netdev_err(netdev, "Error clearing default VSI %i Rx rule\n",</div><div class='ctx'> 					   vsi-&gt;vsi_num);</div><div class='ctx'> 				vsi-&gt;current_netdev_flags |= IFF_PROMISC;</div><div class='ctx'> 				err = -EIO;</div><div class='hunk'>@@ -322,7 +367,7 @@ static void ice_sync_fltr_subtask(struct ice_pf *pf)</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(ICE_FLAG_FLTR_SYNC, pf-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	for (v = 0; v &lt; pf-&gt;num_alloc_vsi; v++)</div><div class='add'>+	ice_for_each_vsi(pf, v)</div><div class='ctx'> 		if (pf-&gt;vsi[v] &amp;&amp; ice_vsi_fltr_changed(pf-&gt;vsi[v]) &amp;&amp;</div><div class='ctx'> 		    ice_vsi_sync_fltr(pf-&gt;vsi[v])) {</div><div class='ctx'> 			/* come back and try again later */</div><div class='hunk'>@@ -332,6 +377,51 @@ static void ice_sync_fltr_subtask(struct ice_pf *pf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_dis_vsi - pause a VSI</div><div class='add'>+ * @vsi: the VSI being paused</div><div class='add'>+ * @locked: is the rtnl_lock already held</div><div class='add'>+ */</div><div class='add'>+static void ice_dis_vsi(struct ice_vsi *vsi, bool locked)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(__ICE_DOWN, vsi-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	set_bit(__ICE_NEEDS_RESTART, vsi-&gt;state);</div><div class='add'>+</div><div class='add'>+	if (vsi-&gt;type == ICE_VSI_PF &amp;&amp; vsi-&gt;netdev) {</div><div class='add'>+		if (netif_running(vsi-&gt;netdev)) {</div><div class='add'>+			if (!locked) {</div><div class='add'>+				rtnl_lock();</div><div class='add'>+				vsi-&gt;netdev-&gt;netdev_ops-&gt;ndo_stop(vsi-&gt;netdev);</div><div class='add'>+				rtnl_unlock();</div><div class='add'>+			} else {</div><div class='add'>+				vsi-&gt;netdev-&gt;netdev_ops-&gt;ndo_stop(vsi-&gt;netdev);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ice_vsi_close(vsi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pf_dis_all_vsi - Pause all VSIs on a PF</div><div class='add'>+ * @pf: the PF</div><div class='add'>+ * @locked: is the rtnl_lock already held</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked)</div><div class='add'>+#else</div><div class='add'>+static void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked)</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='add'>+{</div><div class='add'>+	int v;</div><div class='add'>+</div><div class='add'>+	ice_for_each_vsi(pf, v)</div><div class='add'>+		if (pf-&gt;vsi[v])</div><div class='add'>+			ice_dis_vsi(pf-&gt;vsi[v], locked);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_prepare_for_reset - prep for the core to reset</div><div class='ctx'>  * @pf: board private structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -342,12 +432,16 @@ ice_prepare_for_reset(struct ice_pf *pf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> </div><div class='add'>+	/* already prepared for reset */</div><div class='add'>+	if (test_bit(__ICE_PREPARED_FOR_RESET, pf-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* Notify VFs of impending reset */</div><div class='ctx'> 	if (ice_check_sq_alive(hw, &amp;hw-&gt;mailboxq))</div><div class='ctx'> 		ice_vc_notify_reset(pf);</div><div class='ctx'> </div><div class='ctx'> 	/* disable the VSIs and their queues that are not already DOWN */</div><div class='del'>-	ice_pf_dis_all_vsi(pf);</div><div class='add'>+	ice_pf_dis_all_vsi(pf, false);</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;port_info)</div><div class='ctx'> 		ice_sched_clear_port(hw-&gt;port_info);</div><div class='hunk'>@@ -394,6 +488,7 @@ static void ice_do_reset(struct ice_pf *pf, enum ice_reset_req reset_type)</div><div class='ctx'> 		ice_rebuild(pf);</div><div class='ctx'> 		clear_bit(__ICE_PREPARED_FOR_RESET, pf-&gt;state);</div><div class='ctx'> 		clear_bit(__ICE_PFR_REQ, pf-&gt;state);</div><div class='add'>+		ice_reset_all_vfs(pf, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -416,10 +511,15 @@ static void ice_reset_subtask(struct ice_pf *pf)</div><div class='ctx'> 	 * for the reset now), poll for reset done, rebuild and return.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_bit(__ICE_RESET_OICR_RECV, pf-&gt;state)) {</div><div class='del'>-		clear_bit(__ICE_GLOBR_RECV, pf-&gt;state);</div><div class='del'>-		clear_bit(__ICE_CORER_RECV, pf-&gt;state);</div><div class='del'>-		if (!test_bit(__ICE_PREPARED_FOR_RESET, pf-&gt;state))</div><div class='del'>-			ice_prepare_for_reset(pf);</div><div class='add'>+		/* Perform the largest reset requested */</div><div class='add'>+		if (test_and_clear_bit(__ICE_CORER_RECV, pf-&gt;state))</div><div class='add'>+			reset_type = ICE_RESET_CORER;</div><div class='add'>+		if (test_and_clear_bit(__ICE_GLOBR_RECV, pf-&gt;state))</div><div class='add'>+			reset_type = ICE_RESET_GLOBR;</div><div class='add'>+		/* return if no valid reset type requested */</div><div class='add'>+		if (reset_type == ICE_RESET_INVAL)</div><div class='add'>+			return;</div><div class='add'>+		ice_prepare_for_reset(pf);</div><div class='ctx'> </div><div class='ctx'> 		/* make sure we are ready to rebuild */</div><div class='ctx'> 		if (ice_check_reset(&amp;pf-&gt;hw)) {</div><div class='hunk'>@@ -429,13 +529,14 @@ static void ice_reset_subtask(struct ice_pf *pf)</div><div class='ctx'> 			pf-&gt;hw.reset_ongoing = false;</div><div class='ctx'> 			ice_rebuild(pf);</div><div class='ctx'> 			/* clear bit to resume normal operations, but</div><div class='del'>-			 * ICE_NEEDS_RESTART bit is set incase rebuild failed</div><div class='add'>+			 * ICE_NEEDS_RESTART bit is set in case rebuild failed</div><div class='ctx'> 			 */</div><div class='ctx'> 			clear_bit(__ICE_RESET_OICR_RECV, pf-&gt;state);</div><div class='ctx'> 			clear_bit(__ICE_PREPARED_FOR_RESET, pf-&gt;state);</div><div class='ctx'> 			clear_bit(__ICE_PFR_REQ, pf-&gt;state);</div><div class='ctx'> 			clear_bit(__ICE_CORER_REQ, pf-&gt;state);</div><div class='ctx'> 			clear_bit(__ICE_GLOBR_REQ, pf-&gt;state);</div><div class='add'>+			ice_reset_all_vfs(pf, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='hunk'>@@ -469,6 +570,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)</div><div class='ctx'> 	const char *speed;</div><div class='ctx'> 	const char *fc;</div><div class='ctx'> </div><div class='add'>+	if (!vsi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (vsi-&gt;current_isup == isup)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -519,6 +623,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)</div><div class='ctx'> 	case ICE_FC_RX_PAUSE:</div><div class='ctx'> 		fc = "RX";</div><div class='ctx'> 		break;</div><div class='add'>+	case ICE_FC_NONE:</div><div class='add'>+		fc = "None";</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		fc = "Unknown";</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -529,21 +636,22 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vsi_link_event - update the vsi's netdev</div><div class='del'>- * @vsi: the vsi on which the link event occurred</div><div class='del'>- * @link_up: whether or not the vsi needs to be set up or down</div><div class='add'>+ * ice_vsi_link_event - update the VSI's netdev</div><div class='add'>+ * @vsi: the VSI on which the link event occurred</div><div class='add'>+ * @link_up: whether or not the VSI needs to be set up or down</div><div class='ctx'>  */</div><div class='ctx'> static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)</div><div class='ctx'> {</div><div class='del'>-	if (!vsi || test_bit(__ICE_DOWN, vsi-&gt;state))</div><div class='add'>+	if (!vsi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_bit(__ICE_DOWN, vsi-&gt;state) || !vsi-&gt;netdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;type == ICE_VSI_PF) {</div><div class='del'>-		if (!vsi-&gt;netdev) {</div><div class='del'>-			dev_dbg(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='del'>-				"vsi-&gt;netdev is not initialized!\n");</div><div class='add'>+		if (link_up == netif_carrier_ok(vsi-&gt;netdev))</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		if (link_up) {</div><div class='ctx'> 			netif_carrier_on(vsi-&gt;netdev);</div><div class='ctx'> 			netif_tx_wake_all_queues(vsi-&gt;netdev);</div><div class='hunk'>@@ -558,61 +666,51 @@ static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)</div><div class='ctx'>  * ice_link_event - process the link event</div><div class='ctx'>  * @pf: pf that the link event is associated with</div><div class='ctx'>  * @pi: port_info for the port that the link event is associated with</div><div class='add'>+ * @link_up: true if the physical link is up and false if it is down</div><div class='add'>+ * @link_speed: current link speed received from the link event</div><div class='ctx'>  *</div><div class='del'>- * Returns -EIO if ice_get_link_status() fails</div><div class='del'>- * Returns 0 on success</div><div class='add'>+ * Returns 0 on success and negative on failure</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-ice_link_event(struct ice_pf *pf, struct ice_port_info *pi)</div><div class='add'>+ice_link_event(struct ice_pf *pf, struct ice_port_info *pi, bool link_up,</div><div class='add'>+	       u16 link_speed)</div><div class='ctx'> {</div><div class='del'>-	u8 new_link_speed, old_link_speed;</div><div class='ctx'> 	struct ice_phy_info *phy_info;</div><div class='del'>-	bool new_link_same_as_old;</div><div class='del'>-	bool new_link, old_link;</div><div class='del'>-	u8 lport;</div><div class='del'>-	u16 v;</div><div class='add'>+	struct ice_vsi *vsi;</div><div class='add'>+	u16 old_link_speed;</div><div class='add'>+	bool old_link;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='ctx'> 	phy_info = &amp;pi-&gt;phy;</div><div class='ctx'> 	phy_info-&gt;link_info_old = phy_info-&gt;link_info;</div><div class='del'>-	/* Force ice_get_link_status() to update link info */</div><div class='del'>-	phy_info-&gt;get_link_info = true;</div><div class='ctx'> </div><div class='del'>-	old_link = (phy_info-&gt;link_info_old.link_info &amp; ICE_AQ_LINK_UP);</div><div class='add'>+	old_link = !!(phy_info-&gt;link_info_old.link_info &amp; ICE_AQ_LINK_UP);</div><div class='ctx'> 	old_link_speed = phy_info-&gt;link_info_old.link_speed;</div><div class='ctx'> </div><div class='del'>-	lport = pi-&gt;lport;</div><div class='del'>-	if (ice_get_link_status(pi, &amp;new_link)) {</div><div class='add'>+	/* update the link info structures and re-enable link events,</div><div class='add'>+	 * don't bail on failure due to other book keeping needed</div><div class='add'>+	 */</div><div class='add'>+	result = ice_update_link_info(pi);</div><div class='add'>+	if (result)</div><div class='ctx'> 		dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			"Could not get link status for port %d\n", lport);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_link_speed = phy_info-&gt;link_info.link_speed;</div><div class='add'>+			"Failed to update link status and re-enable link events for port %d\n",</div><div class='add'>+			pi-&gt;lport);</div><div class='ctx'> </div><div class='del'>-	new_link_same_as_old = (new_link == old_link &amp;&amp;</div><div class='del'>-				new_link_speed == old_link_speed);</div><div class='del'>-</div><div class='del'>-	ice_for_each_vsi(pf, v) {</div><div class='del'>-		struct ice_vsi *vsi = pf-&gt;vsi[v];</div><div class='del'>-</div><div class='del'>-		if (!vsi || !vsi-&gt;port_info)</div><div class='del'>-			continue;</div><div class='add'>+	/* if the old link up/down and speed is the same as the new */</div><div class='add'>+	if (link_up == old_link &amp;&amp; link_speed == old_link_speed)</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-		if (new_link_same_as_old &amp;&amp;</div><div class='del'>-		    (test_bit(__ICE_DOWN, vsi-&gt;state) ||</div><div class='del'>-		    new_link == netif_carrier_ok(vsi-&gt;netdev)))</div><div class='del'>-			continue;</div><div class='add'>+	vsi = ice_find_vsi_by_type(pf, ICE_VSI_PF);</div><div class='add'>+	if (!vsi || !vsi-&gt;port_info)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (vsi-&gt;port_info-&gt;lport == lport) {</div><div class='del'>-			ice_print_link_msg(vsi, new_link);</div><div class='del'>-			ice_vsi_link_event(vsi, new_link);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ice_vsi_link_event(vsi, link_up);</div><div class='add'>+	ice_print_link_msg(vsi, link_up);</div><div class='ctx'> </div><div class='del'>-	if (!new_link_same_as_old &amp;&amp; pf-&gt;num_alloc_vfs)</div><div class='add'>+	if (pf-&gt;num_alloc_vfs)</div><div class='ctx'> 		ice_vc_notify_link_state(pf);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -635,19 +733,73 @@ static void ice_watchdog_subtask(struct ice_pf *pf)</div><div class='ctx'> </div><div class='ctx'> 	pf-&gt;serv_tmr_prev = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (ice_link_event(pf, pf-&gt;hw.port_info))</div><div class='del'>-		dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "ice_link_event failed\n");</div><div class='del'>-</div><div class='ctx'> 	/* Update the stats for active netdevs so the network stack</div><div class='ctx'> 	 * can look at updated numbers whenever it cares to</div><div class='ctx'> 	 */</div><div class='ctx'> 	ice_update_pf_stats(pf);</div><div class='del'>-	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++)</div><div class='add'>+	ice_for_each_vsi(pf, i)</div><div class='ctx'> 		if (pf-&gt;vsi[i] &amp;&amp; pf-&gt;vsi[i]-&gt;netdev)</div><div class='ctx'> 			ice_update_vsi_stats(pf-&gt;vsi[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_init_link_events - enable/initialize link events</div><div class='add'>+ * @pi: pointer to the port_info instance</div><div class='add'>+ *</div><div class='add'>+ * Returns -EIO on failure, 0 on success</div><div class='add'>+ */</div><div class='add'>+static int ice_init_link_events(struct ice_port_info *pi)</div><div class='add'>+{</div><div class='add'>+	u16 mask;</div><div class='add'>+</div><div class='add'>+	mask = ~((u16)(ICE_AQ_LINK_EVENT_UPDOWN | ICE_AQ_LINK_EVENT_MEDIA_NA |</div><div class='add'>+		       ICE_AQ_LINK_EVENT_MODULE_QUAL_FAIL));</div><div class='add'>+</div><div class='add'>+	if (ice_aq_set_event_mask(pi-&gt;hw, pi-&gt;lport, mask, NULL)) {</div><div class='add'>+		dev_dbg(ice_hw_to_dev(pi-&gt;hw),</div><div class='add'>+			"Failed to set link event mask for port %d\n",</div><div class='add'>+			pi-&gt;lport);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ice_aq_get_link_info(pi, true, NULL, NULL)) {</div><div class='add'>+		dev_dbg(ice_hw_to_dev(pi-&gt;hw),</div><div class='add'>+			"Failed to enable link events for port %d\n",</div><div class='add'>+			pi-&gt;lport);</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'>+/**</div><div class='add'>+ * ice_handle_link_event - handle link event via ARQ</div><div class='add'>+ * @pf: pf that the link event is associated with</div><div class='add'>+ * @event: event structure containing link status info</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ice_handle_link_event(struct ice_pf *pf, struct ice_rq_event_info *event)</div><div class='add'>+{</div><div class='add'>+	struct ice_aqc_get_link_status_data *link_data;</div><div class='add'>+	struct ice_port_info *port_info;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	link_data = (struct ice_aqc_get_link_status_data *)event-&gt;msg_buf;</div><div class='add'>+	port_info = pf-&gt;hw.port_info;</div><div class='add'>+	if (!port_info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	status = ice_link_event(pf, port_info,</div><div class='add'>+				!!(link_data-&gt;link_info &amp; ICE_AQ_LINK_UP),</div><div class='add'>+				le16_to_cpu(link_data-&gt;link_speed));</div><div class='add'>+	if (status)</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"Could not process link event, error %d\n", status);</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='ctx'>  * __ice_clean_ctrlq - helper function to clean controlq rings</div><div class='ctx'>  * @pf: ptr to struct ice_pf</div><div class='ctx'>  * @q_type: specific Control queue type</div><div class='hunk'>@@ -750,12 +902,20 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)</div><div class='ctx'> 		opcode = le16_to_cpu(event.desc.opcode);</div><div class='ctx'> </div><div class='ctx'> 		switch (opcode) {</div><div class='add'>+		case ice_aqc_opc_get_link_status:</div><div class='add'>+			if (ice_handle_link_event(pf, &amp;event))</div><div class='add'>+				dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					"Could not handle link event\n");</div><div class='add'>+			break;</div><div class='ctx'> 		case ice_mbx_opc_send_msg_to_pf:</div><div class='ctx'> 			ice_vc_process_vf_msg(pf, &amp;event);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ice_aqc_opc_fw_logging:</div><div class='ctx'> 			ice_output_fw_log(hw, &amp;event.desc, event.msg_buf);</div><div class='ctx'> 			break;</div><div class='add'>+		case ice_aqc_opc_lldp_set_mib_change:</div><div class='add'>+			ice_dcb_process_lldp_set_mib_change(pf, &amp;event);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"%s Receive Queue unknown event 0x%04x ignored\n",</div><div class='hunk'>@@ -877,6 +1037,18 @@ static void ice_service_task_stop(struct ice_pf *pf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_service_task_restart - restart service task and schedule works</div><div class='add'>+ * @pf: board private structure</div><div class='add'>+ *</div><div class='add'>+ * This function is needed for suspend and resume works (e.g WoL scenario)</div><div class='add'>+ */</div><div class='add'>+static void ice_service_task_restart(struct ice_pf *pf)</div><div class='add'>+{</div><div class='add'>+	clear_bit(__ICE_SERVICE_DIS, pf-&gt;state);</div><div class='add'>+	ice_service_task_schedule(pf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_service_timer - timer callback to schedule service task</div><div class='ctx'>  * @t: pointer to timer_list</div><div class='ctx'>  */</div><div class='hunk'>@@ -901,7 +1073,7 @@ static void ice_handle_mdd_event(struct ice_pf *pf)</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(__ICE_MDD_EVENT_PENDING, pf-&gt;state))</div><div class='add'>+	if (!test_and_clear_bit(__ICE_MDD_EVENT_PENDING, pf-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* find what triggered the MDD event */</div><div class='hunk'>@@ -993,10 +1165,12 @@ static void ice_handle_mdd_event(struct ice_pf *pf)</div><div class='ctx'> 	for (i = 0; i &lt; pf-&gt;num_alloc_vfs &amp;&amp; mdd_detected; i++) {</div><div class='ctx'> 		struct ice_vf *vf = &amp;pf-&gt;vf[i];</div><div class='ctx'> </div><div class='add'>+		mdd_detected = false;</div><div class='add'>+</div><div class='ctx'> 		reg = rd32(hw, VP_MDET_TX_PQM(i));</div><div class='ctx'> 		if (reg &amp; VP_MDET_TX_PQM_VALID_M) {</div><div class='ctx'> 			wr32(hw, VP_MDET_TX_PQM(i), 0xFFFF);</div><div class='del'>-			vf-&gt;num_mdd_events++;</div><div class='add'>+			mdd_detected = true;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "TX driver issue detected on VF %d\n",</div><div class='ctx'> 				 i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1004,7 +1178,7 @@ static void ice_handle_mdd_event(struct ice_pf *pf)</div><div class='ctx'> 		reg = rd32(hw, VP_MDET_TX_TCLAN(i));</div><div class='ctx'> 		if (reg &amp; VP_MDET_TX_TCLAN_VALID_M) {</div><div class='ctx'> 			wr32(hw, VP_MDET_TX_TCLAN(i), 0xFFFF);</div><div class='del'>-			vf-&gt;num_mdd_events++;</div><div class='add'>+			mdd_detected = true;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "TX driver issue detected on VF %d\n",</div><div class='ctx'> 				 i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1012,7 +1186,7 @@ static void ice_handle_mdd_event(struct ice_pf *pf)</div><div class='ctx'> 		reg = rd32(hw, VP_MDET_TX_TDPU(i));</div><div class='ctx'> 		if (reg &amp; VP_MDET_TX_TDPU_VALID_M) {</div><div class='ctx'> 			wr32(hw, VP_MDET_TX_TDPU(i), 0xFFFF);</div><div class='del'>-			vf-&gt;num_mdd_events++;</div><div class='add'>+			mdd_detected = true;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "TX driver issue detected on VF %d\n",</div><div class='ctx'> 				 i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1020,26 +1194,19 @@ static void ice_handle_mdd_event(struct ice_pf *pf)</div><div class='ctx'> 		reg = rd32(hw, VP_MDET_RX(i));</div><div class='ctx'> 		if (reg &amp; VP_MDET_RX_VALID_M) {</div><div class='ctx'> 			wr32(hw, VP_MDET_RX(i), 0xFFFF);</div><div class='del'>-			vf-&gt;num_mdd_events++;</div><div class='add'>+			mdd_detected = true;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev, "RX driver issue detected on VF %d\n",</div><div class='ctx'> 				 i);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (vf-&gt;num_mdd_events &gt; ICE_DFLT_NUM_MDD_EVENTS_ALLOWED) {</div><div class='del'>-			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-				 "Too many MDD events on VF %d, disabled\n", i);</div><div class='add'>+		if (mdd_detected) {</div><div class='add'>+			vf-&gt;num_mdd_events++;</div><div class='ctx'> 			dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 				 "Use PF Control I/F to re-enable the VF\n");</div><div class='ctx'> 			set_bit(ICE_VF_STATE_DIS, vf-&gt;vf_states);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* re-enable MDD interrupt cause */</div><div class='del'>-	clear_bit(__ICE_MDD_EVENT_PENDING, pf-&gt;state);</div><div class='del'>-	reg = rd32(hw, PFINT_OICR_ENA);</div><div class='del'>-	reg |= PFINT_OICR_MAL_DETECT_M;</div><div class='del'>-	wr32(hw, PFINT_OICR_ENA, reg);</div><div class='del'>-	ice_flush(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1089,7 +1256,7 @@ static void ice_service_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_set_ctrlq_len - helper function to set controlq length</div><div class='del'>- * @hw: pointer to the hw instance</div><div class='add'>+ * @hw: pointer to the HW instance</div><div class='ctx'>  */</div><div class='ctx'> static void ice_set_ctrlq_len(struct ice_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -1111,8 +1278,9 @@ static void ice_set_ctrlq_len(struct ice_hw *hw)</div><div class='ctx'>  * This is a callback function used by the irq_set_affinity_notifier function</div><div class='ctx'>  * so that we may register to receive changes to the irq affinity masks.</div><div class='ctx'>  */</div><div class='del'>-static void ice_irq_affinity_notify(struct irq_affinity_notify *notify,</div><div class='del'>-				    const cpumask_t *mask)</div><div class='add'>+static void</div><div class='add'>+ice_irq_affinity_notify(struct irq_affinity_notify *notify,</div><div class='add'>+			const cpumask_t *mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_q_vector *q_vector =</div><div class='ctx'> 		container_of(notify, struct ice_q_vector, affinity_notify);</div><div class='hunk'>@@ -1142,7 +1310,7 @@ static int ice_vsi_ena_irq(struct ice_vsi *vsi)</div><div class='ctx'> 	if (test_bit(ICE_FLAG_MSIX_ENA, pf-&gt;flags)) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; vsi-&gt;num_q_vectors; i++)</div><div class='add'>+		ice_for_each_q_vector(vsi, i)</div><div class='ctx'> 			ice_irq_dynamic_ena(hw, vsi, vsi-&gt;q_vectors[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1184,10 +1352,9 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)</div><div class='ctx'> 			/* skip this unused q_vector */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		err = devm_request_irq(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-				       pf-&gt;msix_entries[base + vector].vector,</div><div class='del'>-				       vsi-&gt;irq_handler, 0, q_vector-&gt;name,</div><div class='del'>-				       q_vector);</div><div class='add'>+		err = devm_request_irq(&amp;pf-&gt;pdev-&gt;dev, irq_num,</div><div class='add'>+				       vsi-&gt;irq_handler, 0,</div><div class='add'>+				       q_vector-&gt;name, q_vector);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			netdev_err(vsi-&gt;netdev,</div><div class='ctx'> 				   "MSIX request_irq failed, error: %d\n", err);</div><div class='hunk'>@@ -1328,7 +1495,7 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)</div><div class='ctx'> 			rd32(hw, PFHMC_ERRORDATA));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Report and mask off any remaining unexpected interrupts */</div><div class='add'>+	/* Report any remaining unexpected interrupts */</div><div class='ctx'> 	oicr &amp;= ena_mask;</div><div class='ctx'> 	if (oicr) {</div><div class='ctx'> 		dev_dbg(&amp;pf-&gt;pdev-&gt;dev, "unhandled interrupt oicr=0x%08x\n",</div><div class='hunk'>@@ -1342,12 +1509,9 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)</div><div class='ctx'> 			set_bit(__ICE_PFR_REQ, pf-&gt;state);</div><div class='ctx'> 			ice_service_task_schedule(pf);</div><div class='ctx'> 		}</div><div class='del'>-		ena_mask &amp;= ~oicr;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-	/* re-enable interrupt causes that are not handled during this pass */</div><div class='del'>-	wr32(hw, PFINT_OICR_ENA, ena_mask);</div><div class='ctx'> 	if (!test_bit(__ICE_DOWN, pf-&gt;state)) {</div><div class='ctx'> 		ice_service_task_schedule(pf);</div><div class='ctx'> 		ice_irq_dynamic_ena(hw, NULL, NULL);</div><div class='hunk'>@@ -1406,23 +1570,23 @@ static void ice_free_irq_msix_misc(struct ice_pf *pf)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_ena_ctrlq_interrupts - enable control queue interrupts</div><div class='ctx'>  * @hw: pointer to HW structure</div><div class='del'>- * @v_idx: HW vector index to associate the control queue interrupts with</div><div class='add'>+ * @reg_idx: HW vector index to associate the control queue interrupts with</div><div class='ctx'>  */</div><div class='del'>-static void ice_ena_ctrlq_interrupts(struct ice_hw *hw, u16 v_idx)</div><div class='add'>+static void ice_ena_ctrlq_interrupts(struct ice_hw *hw, u16 reg_idx)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	val = ((v_idx &amp; PFINT_OICR_CTL_MSIX_INDX_M) |</div><div class='add'>+	val = ((reg_idx &amp; PFINT_OICR_CTL_MSIX_INDX_M) |</div><div class='ctx'> 	       PFINT_OICR_CTL_CAUSE_ENA_M);</div><div class='ctx'> 	wr32(hw, PFINT_OICR_CTL, val);</div><div class='ctx'> </div><div class='ctx'> 	/* enable Admin queue Interrupt causes */</div><div class='del'>-	val = ((v_idx &amp; PFINT_FW_CTL_MSIX_INDX_M) |</div><div class='add'>+	val = ((reg_idx &amp; PFINT_FW_CTL_MSIX_INDX_M) |</div><div class='ctx'> 	       PFINT_FW_CTL_CAUSE_ENA_M);</div><div class='ctx'> 	wr32(hw, PFINT_FW_CTL, val);</div><div class='ctx'> </div><div class='ctx'> 	/* enable Mailbox queue Interrupt causes */</div><div class='del'>-	val = ((v_idx &amp; PFINT_MBX_CTL_MSIX_INDX_M) |</div><div class='add'>+	val = ((reg_idx &amp; PFINT_MBX_CTL_MSIX_INDX_M) |</div><div class='ctx'> 	       PFINT_MBX_CTL_CAUSE_ENA_M);</div><div class='ctx'> 	wr32(hw, PFINT_MBX_CTL, val);</div><div class='ctx'> </div><div class='hunk'>@@ -1510,7 +1674,7 @@ void ice_napi_del(struct ice_vsi *vsi)</div><div class='ctx'> 	if (!vsi-&gt;netdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (v_idx = 0; v_idx &lt; vsi-&gt;num_q_vectors; v_idx++)</div><div class='add'>+	ice_for_each_q_vector(vsi, v_idx)</div><div class='ctx'> 		netif_napi_del(&amp;vsi-&gt;q_vectors[v_idx]-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1529,7 +1693,7 @@ static void ice_napi_add(struct ice_vsi *vsi)</div><div class='ctx'> 	if (!vsi-&gt;netdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (v_idx = 0; v_idx &lt; vsi-&gt;num_q_vectors; v_idx++)</div><div class='add'>+	ice_for_each_q_vector(vsi, v_idx)</div><div class='ctx'> 		netif_napi_add(vsi-&gt;netdev, &amp;vsi-&gt;q_vectors[v_idx]-&gt;napi,</div><div class='ctx'> 			       ice_napi_poll, NAPI_POLL_WEIGHT);</div><div class='ctx'> }</div><div class='hunk'>@@ -1649,18 +1813,20 @@ ice_pf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vlan_rx_add_vid - Add a vlan id filter to HW offload</div><div class='add'>+ * ice_vlan_rx_add_vid - Add a VLAN ID filter to HW offload</div><div class='ctx'>  * @netdev: network interface to be adjusted</div><div class='ctx'>  * @proto: unused protocol</div><div class='del'>- * @vid: vlan id to be added</div><div class='add'>+ * @vid: VLAN ID to be added</div><div class='ctx'>  *</div><div class='del'>- * net_device_ops implementation for adding vlan ids</div><div class='add'>+ * net_device_ops implementation for adding VLAN IDs</div><div class='ctx'>  */</div><div class='del'>-static int ice_vlan_rx_add_vid(struct net_device *netdev,</div><div class='del'>-			       __always_unused __be16 proto, u16 vid)</div><div class='add'>+static int</div><div class='add'>+ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,</div><div class='add'>+		    u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (vid &gt;= VLAN_N_VID) {</div><div class='ctx'> 		netdev_err(netdev, "VLAN id requested %d is out of range %d\n",</div><div class='hunk'>@@ -1673,33 +1839,39 @@ static int ice_vlan_rx_add_vid(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	/* Enable VLAN pruning when VLAN 0 is added */</div><div class='ctx'> 	if (unlikely(!vid)) {</div><div class='del'>-		int ret = ice_cfg_vlan_pruning(vsi, true);</div><div class='del'>-</div><div class='add'>+		ret = ice_cfg_vlan_pruning(vsi, true, false);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add all VLAN ids including 0 to the switch filter. VLAN id 0 is</div><div class='add'>+	/* Add all VLAN IDs including 0 to the switch filter. VLAN ID 0 is</div><div class='ctx'> 	 * needed to continue allowing all untagged packets since VLAN prune</div><div class='ctx'> 	 * list is applied to all packets by the switch</div><div class='ctx'> 	 */</div><div class='del'>-	return ice_vsi_add_vlan(vsi, vid);</div><div class='add'>+	ret = ice_vsi_add_vlan(vsi, vid);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		vsi-&gt;vlan_ena = true;</div><div class='add'>+		set_bit(ICE_VSI_FLAG_VLAN_FLTR_CHANGED, vsi-&gt;flags);</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'>- * ice_vlan_rx_kill_vid - Remove a vlan id filter from HW offload</div><div class='add'>+ * ice_vlan_rx_kill_vid - Remove a VLAN ID filter from HW offload</div><div class='ctx'>  * @netdev: network interface to be adjusted</div><div class='ctx'>  * @proto: unused protocol</div><div class='del'>- * @vid: vlan id to be removed</div><div class='add'>+ * @vid: VLAN ID to be removed</div><div class='ctx'>  *</div><div class='del'>- * net_device_ops implementation for removing vlan ids</div><div class='add'>+ * net_device_ops implementation for removing VLAN IDs</div><div class='ctx'>  */</div><div class='del'>-static int ice_vlan_rx_kill_vid(struct net_device *netdev,</div><div class='del'>-				__always_unused __be16 proto, u16 vid)</div><div class='add'>+static int</div><div class='add'>+ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,</div><div class='add'>+		     u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='del'>-	int status;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;info.pvid)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1707,15 +1879,17 @@ static int ice_vlan_rx_kill_vid(struct net_device *netdev,</div><div class='ctx'> 	/* Make sure ice_vsi_kill_vlan is successful before updating VLAN</div><div class='ctx'> 	 * information</div><div class='ctx'> 	 */</div><div class='del'>-	status = ice_vsi_kill_vlan(vsi, vid);</div><div class='del'>-	if (status)</div><div class='del'>-		return status;</div><div class='add'>+	ret = ice_vsi_kill_vlan(vsi, vid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable VLAN pruning when VLAN 0 is removed */</div><div class='ctx'> 	if (unlikely(!vid))</div><div class='del'>-		status = ice_cfg_vlan_pruning(vsi, false);</div><div class='add'>+		ret = ice_cfg_vlan_pruning(vsi, false, false);</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	vsi-&gt;vlan_ena = false;</div><div class='add'>+	set_bit(ICE_VSI_FLAG_VLAN_FLTR_CHANGED, vsi-&gt;flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2033,23 +2207,6 @@ static int ice_init_interrupt_scheme(struct ice_pf *pf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_verify_itr_gran - verify driver's assumption of ITR granularity</div><div class='del'>- * @pf: pointer to the PF structure</div><div class='del'>- *</div><div class='del'>- * There is no error returned here because the driver will be able to handle a</div><div class='del'>- * different ITR granularity, but interrupt moderation will not be accurate if</div><div class='del'>- * the driver's assumptions are not verified. This assumption is made so we can</div><div class='del'>- * use constants in the hot path instead of accessing structure members.</div><div class='del'>- */</div><div class='del'>-static void ice_verify_itr_gran(struct ice_pf *pf)</div><div class='del'>-{</div><div class='del'>-	if (pf-&gt;hw.itr_gran != (ICE_ITR_GRAN_S &lt;&lt; 1))</div><div class='del'>-		dev_warn(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			 "%d ITR granularity assumption is invalid, actual ITR granularity is %d. Interrupt moderation will be inaccurate!\n",</div><div class='del'>-			 (ICE_ITR_GRAN_S &lt;&lt; 1), pf-&gt;hw.itr_gran);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ice_verify_cacheline_size - verify driver's assumption of 64 Byte cache lines</div><div class='ctx'>  * @pf: pointer to the PF structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -2072,9 +2229,10 @@ static void ice_verify_cacheline_size(struct ice_pf *pf)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, negative on failure</div><div class='ctx'>  */</div><div class='del'>-static int ice_probe(struct pci_dev *pdev,</div><div class='del'>-		     const struct pci_device_id __always_unused *ent)</div><div class='add'>+static int</div><div class='add'>+ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct ice_pf *pf;</div><div class='ctx'> 	struct ice_hw *hw;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2086,20 +2244,20 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), pci_name(pdev));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "BAR0 I/O map error %d\n", err);</div><div class='add'>+		dev_err(dev, "BAR0 I/O map error %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pf = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pf), GFP_KERNEL);</div><div class='add'>+	pf = devm_kzalloc(dev, sizeof(*pf), GFP_KERNEL);</div><div class='ctx'> 	if (!pf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* set up for high or low dma */</div><div class='del'>-	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));</div><div class='ctx'> 	if (err)</div><div class='del'>-		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+		err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "DMA configuration failed: 0x%x\n", err);</div><div class='add'>+		dev_err(dev, "DMA configuration failed: 0x%x\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2133,17 +2291,26 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = ice_init_hw(hw);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "ice_init_hw failed: %d\n", err);</div><div class='add'>+		dev_err(dev, "ice_init_hw failed: %d\n", err);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_exit_unroll;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "firmware %d.%d.%05d api %d.%d\n",</div><div class='add'>+	dev_info(dev, "firmware %d.%d.%05d api %d.%d\n",</div><div class='ctx'> 		 hw-&gt;fw_maj_ver, hw-&gt;fw_min_ver, hw-&gt;fw_build,</div><div class='ctx'> 		 hw-&gt;api_maj_ver, hw-&gt;api_min_ver);</div><div class='ctx'> </div><div class='ctx'> 	ice_init_pf(pf);</div><div class='ctx'> </div><div class='add'>+	err = ice_init_pf_dcb(pf);</div><div class='add'>+	if (err) {</div><div class='add'>+		clear_bit(ICE_FLAG_DCB_CAPABLE, pf-&gt;flags);</div><div class='add'>+		clear_bit(ICE_FLAG_DCB_ENA, pf-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* do not fail overall init if DCB init fails */</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ice_determine_q_usage(pf);</div><div class='ctx'> </div><div class='ctx'> 	pf-&gt;num_alloc_vsi = hw-&gt;func_caps.guar_num_vsi;</div><div class='hunk'>@@ -2152,8 +2319,8 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_init_pf_unroll;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pf-&gt;vsi = devm_kcalloc(&amp;pdev-&gt;dev, pf-&gt;num_alloc_vsi,</div><div class='del'>-			       sizeof(*pf-&gt;vsi), GFP_KERNEL);</div><div class='add'>+	pf-&gt;vsi = devm_kcalloc(dev, pf-&gt;num_alloc_vsi, sizeof(*pf-&gt;vsi),</div><div class='add'>+			       GFP_KERNEL);</div><div class='ctx'> 	if (!pf-&gt;vsi) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_init_pf_unroll;</div><div class='hunk'>@@ -2161,8 +2328,7 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = ice_init_interrupt_scheme(pf);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"ice_init_interrupt_scheme failed: %d\n", err);</div><div class='add'>+		dev_err(dev, "ice_init_interrupt_scheme failed: %d\n", err);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_init_interrupt_unroll;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2178,15 +2344,13 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (test_bit(ICE_FLAG_MSIX_ENA, pf-&gt;flags)) {</div><div class='ctx'> 		err = ice_req_irq_msix_misc(pf);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"setup of misc vector failed: %d\n", err);</div><div class='add'>+			dev_err(dev, "setup of misc vector failed: %d\n", err);</div><div class='ctx'> 			goto err_init_interrupt_unroll;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create switch struct for the switch element created by FW on boot */</div><div class='del'>-	pf-&gt;first_sw = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pf-&gt;first_sw),</div><div class='del'>-				    GFP_KERNEL);</div><div class='add'>+	pf-&gt;first_sw = devm_kzalloc(dev, sizeof(*pf-&gt;first_sw), GFP_KERNEL);</div><div class='ctx'> 	if (!pf-&gt;first_sw) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_msix_misc_unroll;</div><div class='hunk'>@@ -2204,8 +2368,7 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = ice_setup_pf_sw(pf);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"probe failed due to setup pf switch:%d\n", err);</div><div class='add'>+		dev_err(dev, "probe failed due to setup pf switch:%d\n", err);</div><div class='ctx'> 		goto err_alloc_sw_unroll;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2214,8 +2377,13 @@ static int ice_probe(struct pci_dev *pdev,</div><div class='ctx'> 	/* since everything is good, start the service timer */</div><div class='ctx'> 	mod_timer(&amp;pf-&gt;serv_tmr, round_jiffies(jiffies + pf-&gt;serv_tmr_period));</div><div class='ctx'> </div><div class='add'>+	err = ice_init_link_events(pf-&gt;hw.port_info);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "ice_init_link_events failed: %d\n", err);</div><div class='add'>+		goto err_alloc_sw_unroll;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ice_verify_cacheline_size(pf);</div><div class='del'>-	ice_verify_itr_gran(pf);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2227,7 +2395,7 @@ err_msix_misc_unroll:</div><div class='ctx'> 	ice_free_irq_msix_misc(pf);</div><div class='ctx'> err_init_interrupt_unroll:</div><div class='ctx'> 	ice_clear_interrupt_scheme(pf);</div><div class='del'>-	devm_kfree(&amp;pdev-&gt;dev, pf-&gt;vsi);</div><div class='add'>+	devm_kfree(dev, pf-&gt;vsi);</div><div class='ctx'> err_init_pf_unroll:</div><div class='ctx'> 	ice_deinit_pf(pf);</div><div class='ctx'> 	ice_deinit_hw(hw);</div><div class='hunk'>@@ -2272,6 +2440,136 @@ static void ice_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pci_disable_pcie_error_reporting(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ice_pci_err_detected - warning that PCI error has been detected</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ * @err: the type of PCI error</div><div class='add'>+ *</div><div class='add'>+ * Called to warn that something happened on the PCI bus and the error handling</div><div class='add'>+ * is in progress.  Allows the driver to gracefully prepare/handle PCI errors.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t</div><div class='add'>+ice_pci_err_detected(struct pci_dev *pdev, enum pci_channel_state err)</div><div class='add'>+{</div><div class='add'>+	struct ice_pf *pf = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!pf) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "%s: unrecoverable device error %d\n",</div><div class='add'>+			__func__, err);</div><div class='add'>+		return PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(__ICE_SUSPENDED, pf-&gt;state)) {</div><div class='add'>+		ice_service_task_stop(pf);</div><div class='add'>+</div><div class='add'>+		if (!test_bit(__ICE_PREPARED_FOR_RESET, pf-&gt;state)) {</div><div class='add'>+			set_bit(__ICE_PFR_REQ, pf-&gt;state);</div><div class='add'>+			ice_prepare_for_reset(pf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCI_ERS_RESULT_NEED_RESET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pci_err_slot_reset - a PCI slot reset has just happened</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ *</div><div class='add'>+ * Called to determine if the driver can recover from the PCI slot reset by</div><div class='add'>+ * using a register read to determine if the device is recoverable.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t ice_pci_err_slot_reset(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ice_pf *pf = pci_get_drvdata(pdev);</div><div class='add'>+	pci_ers_result_t result;</div><div class='add'>+	int err;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device_mem(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Cannot re-enable PCI device after reset, error %d\n",</div><div class='add'>+			err);</div><div class='add'>+		result = PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	} else {</div><div class='add'>+		pci_set_master(pdev);</div><div class='add'>+		pci_restore_state(pdev);</div><div class='add'>+		pci_save_state(pdev);</div><div class='add'>+		pci_wake_from_d3(pdev, false);</div><div class='add'>+</div><div class='add'>+		/* Check for life */</div><div class='add'>+		reg = rd32(&amp;pf-&gt;hw, GLGEN_RTRIG);</div><div class='add'>+		if (!reg)</div><div class='add'>+			result = PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+		else</div><div class='add'>+			result = PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_cleanup_aer_uncorrect_error_status(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+			"pci_cleanup_aer_uncorrect_error_status failed, error %d\n",</div><div class='add'>+			err);</div><div class='add'>+		/* non-fatal, continue */</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pci_err_resume - restart operations after PCI error recovery</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ *</div><div class='add'>+ * Called to allow the driver to bring things back up after PCI error and/or</div><div class='add'>+ * reset recovery have finished</div><div class='add'>+ */</div><div class='add'>+static void ice_pci_err_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ice_pf *pf = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!pf) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"%s failed, device is unrecoverable\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(__ICE_SUSPENDED, pf-&gt;state)) {</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "%s failed to resume normal operations!\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ice_do_reset(pf, ICE_RESET_PFR);</div><div class='add'>+	ice_service_task_restart(pf);</div><div class='add'>+	mod_timer(&amp;pf-&gt;serv_tmr, round_jiffies(jiffies + pf-&gt;serv_tmr_period));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pci_err_reset_prepare - prepare device driver for PCI reset</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ */</div><div class='add'>+static void ice_pci_err_reset_prepare(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ice_pf *pf = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(__ICE_SUSPENDED, pf-&gt;state)) {</div><div class='add'>+		ice_service_task_stop(pf);</div><div class='add'>+</div><div class='add'>+		if (!test_bit(__ICE_PREPARED_FOR_RESET, pf-&gt;state)) {</div><div class='add'>+			set_bit(__ICE_PFR_REQ, pf-&gt;state);</div><div class='add'>+			ice_prepare_for_reset(pf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_pci_err_reset_done - PCI reset done, device driver reset can begin</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ */</div><div class='add'>+static void ice_pci_err_reset_done(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	ice_pci_err_resume(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ice_pci_tbl - PCI Device ID Table</div><div class='ctx'>  *</div><div class='ctx'>  * Wildcard entries (PCI_ANY_ID) should come last</div><div class='hunk'>@@ -2289,12 +2587,21 @@ static const struct pci_device_id ice_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ice_pci_tbl);</div><div class='ctx'> </div><div class='add'>+static const struct pci_error_handlers ice_pci_err_handler = {</div><div class='add'>+	.error_detected = ice_pci_err_detected,</div><div class='add'>+	.slot_reset = ice_pci_err_slot_reset,</div><div class='add'>+	.reset_prepare = ice_pci_err_reset_prepare,</div><div class='add'>+	.reset_done = ice_pci_err_reset_done,</div><div class='add'>+	.resume = ice_pci_err_resume</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct pci_driver ice_driver = {</div><div class='ctx'> 	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = ice_pci_tbl,</div><div class='ctx'> 	.probe = ice_probe,</div><div class='ctx'> 	.remove = ice_remove,</div><div class='ctx'> 	.sriov_configure = ice_sriov_configure,</div><div class='add'>+	.err_handler = &amp;ice_pci_err_handler</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2341,7 +2648,7 @@ static void __exit ice_module_exit(void)</div><div class='ctx'> module_exit(ice_module_exit);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_set_mac_address - NDO callback to set mac address</div><div class='add'>+ * ice_set_mac_address - NDO callback to set MAC address</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @pi: pointer to an address structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -2378,14 +2685,14 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* When we change the mac address we also have to change the mac address</div><div class='del'>-	 * based filter rules that were created previously for the old mac</div><div class='add'>+	/* When we change the MAC address we also have to change the MAC address</div><div class='add'>+	 * based filter rules that were created previously for the old MAC</div><div class='ctx'> 	 * address. So first, we remove the old filter rule using ice_remove_mac</div><div class='ctx'> 	 * and then create a new filter rule using ice_add_mac. Note that for</div><div class='del'>-	 * both these operations, we first need to form a "list" of mac</div><div class='del'>-	 * addresses (even though in this case, we have only 1 mac address to be</div><div class='add'>+	 * both these operations, we first need to form a "list" of MAC</div><div class='add'>+	 * addresses (even though in this case, we have only 1 MAC address to be</div><div class='ctx'> 	 * added/removed) and this done using ice_add_mac_to_list. Depending on</div><div class='del'>-	 * the ensuing operation this "list" of mac addresses is either to be</div><div class='add'>+	 * the ensuing operation this "list" of MAC addresses is either to be</div><div class='ctx'> 	 * added or removed from the filter.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = ice_add_mac_to_list(vsi, &amp;r_mac_list, netdev-&gt;dev_addr);</div><div class='hunk'>@@ -2423,12 +2730,12 @@ free_lists:</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* change the netdev's mac address */</div><div class='add'>+	/* change the netdev's MAC address */</div><div class='ctx'> 	memcpy(netdev-&gt;dev_addr, mac, netdev-&gt;addr_len);</div><div class='ctx'> 	netdev_dbg(vsi-&gt;netdev, "updated mac address to %pM\n",</div><div class='ctx'> 		   netdev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	/* write new mac address to the firmware */</div><div class='add'>+	/* write new MAC address to the firmware */</div><div class='ctx'> 	flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;</div><div class='ctx'> 	status = ice_aq_manage_mac_write(hw, mac, flags, NULL);</div><div class='ctx'> 	if (status) {</div><div class='hunk'>@@ -2470,7 +2777,7 @@ static void ice_set_rx_mode(struct net_device *netdev)</div><div class='ctx'>  * @tb: pointer to array of nladdr (unused)</div><div class='ctx'>  * @dev: the net device pointer</div><div class='ctx'>  * @addr: the MAC address entry being added</div><div class='del'>- * @vid: VLAN id</div><div class='add'>+ * @vid: VLAN ID</div><div class='ctx'>  * @flags: instructions from stack about fdb operation</div><div class='ctx'>  * @extack: netlink extended ack</div><div class='ctx'>  */</div><div class='hunk'>@@ -2510,11 +2817,12 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],</div><div class='ctx'>  * @tb: pointer to array of nladdr (unused)</div><div class='ctx'>  * @dev: the net device pointer</div><div class='ctx'>  * @addr: the MAC address entry being added</div><div class='del'>- * @vid: VLAN id</div><div class='add'>+ * @vid: VLAN ID</div><div class='ctx'>  */</div><div class='del'>-static int ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],</div><div class='del'>-		       struct net_device *dev, const unsigned char *addr,</div><div class='del'>-		       __always_unused u16 vid)</div><div class='add'>+static int</div><div class='add'>+ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],</div><div class='add'>+	    struct net_device *dev, const unsigned char *addr,</div><div class='add'>+	    __always_unused u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2538,13 +2846,16 @@ static int ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],</div><div class='ctx'>  * @netdev: ptr to the netdev being adjusted</div><div class='ctx'>  * @features: the feature set that the stack is suggesting</div><div class='ctx'>  */</div><div class='del'>-static int ice_set_features(struct net_device *netdev,</div><div class='del'>-			    netdev_features_t features)</div><div class='add'>+static int</div><div class='add'>+ice_set_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	/* Multiple features can be changed in one call so keep features in</div><div class='add'>+	 * separate if/else statements to guarantee each feature is checked</div><div class='add'>+	 */</div><div class='ctx'> 	if (features &amp; NETIF_F_RXHASH &amp;&amp; !(netdev-&gt;features &amp; NETIF_F_RXHASH))</div><div class='ctx'> 		ret = ice_vsi_manage_rss_lut(vsi, true);</div><div class='ctx'> 	else if (!(features &amp; NETIF_F_RXHASH) &amp;&amp;</div><div class='hunk'>@@ -2557,8 +2868,9 @@ static int ice_set_features(struct net_device *netdev,</div><div class='ctx'> 	else if (!(features &amp; NETIF_F_HW_VLAN_CTAG_RX) &amp;&amp;</div><div class='ctx'> 		 (netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX))</div><div class='ctx'> 		ret = ice_vsi_manage_vlan_stripping(vsi, false);</div><div class='del'>-	else if ((features &amp; NETIF_F_HW_VLAN_CTAG_TX) &amp;&amp;</div><div class='del'>-		 !(netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX))</div><div class='add'>+</div><div class='add'>+	if ((features &amp; NETIF_F_HW_VLAN_CTAG_TX) &amp;&amp;</div><div class='add'>+	    !(netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX))</div><div class='ctx'> 		ret = ice_vsi_manage_vlan_insertion(vsi);</div><div class='ctx'> 	else if (!(features &amp; NETIF_F_HW_VLAN_CTAG_TX) &amp;&amp;</div><div class='ctx'> 		 (netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX))</div><div class='hunk'>@@ -2568,8 +2880,8 @@ static int ice_set_features(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vsi_vlan_setup - Setup vlan offload properties on a VSI</div><div class='del'>- * @vsi: VSI to setup vlan properties for</div><div class='add'>+ * ice_vsi_vlan_setup - Setup VLAN offload properties on a VSI</div><div class='add'>+ * @vsi: VSI to setup VLAN properties for</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vsi_vlan_setup(struct ice_vsi *vsi)</div><div class='ctx'> {</div><div class='hunk'>@@ -2601,6 +2913,7 @@ static int ice_vsi_cfg(struct ice_vsi *vsi)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+	ice_vsi_cfg_dcb_rings(vsi);</div><div class='ctx'> </div><div class='ctx'> 	err = ice_vsi_cfg_lan_txqs(vsi);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -2620,7 +2933,7 @@ static void ice_napi_enable_all(struct ice_vsi *vsi)</div><div class='ctx'> 	if (!vsi-&gt;netdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (q_idx = 0; q_idx &lt; vsi-&gt;num_q_vectors; q_idx++) {</div><div class='add'>+	ice_for_each_q_vector(vsi, q_idx)  {</div><div class='ctx'> 		struct ice_q_vector *q_vector = vsi-&gt;q_vectors[q_idx];</div><div class='ctx'> </div><div class='ctx'> 		if (q_vector-&gt;rx.ring || q_vector-&gt;tx.ring)</div><div class='hunk'>@@ -2666,7 +2979,7 @@ static int ice_up_complete(struct ice_vsi *vsi)</div><div class='ctx'> </div><div class='ctx'> 	ice_service_task_schedule(pf);</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'>@@ -2693,8 +3006,8 @@ int ice_up(struct ice_vsi *vsi)</div><div class='ctx'>  * This function fetches stats from the ring considering the atomic operations</div><div class='ctx'>  * that needs to be performed to read u64 values in 32 bit machine.</div><div class='ctx'>  */</div><div class='del'>-static void ice_fetch_u64_stats_per_ring(struct ice_ring *ring, u64 *pkts,</div><div class='del'>-					 u64 *bytes)</div><div class='add'>+static void</div><div class='add'>+ice_fetch_u64_stats_per_ring(struct ice_ring *ring, u64 *pkts, u64 *bytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int start;</div><div class='ctx'> 	*pkts = 0;</div><div class='hunk'>@@ -2911,6 +3224,8 @@ static void ice_update_pf_stats(struct ice_pf *pf)</div><div class='ctx'> 	ice_stat_update32(hw, GLPRT_LXOFFTXC(pf_id), pf-&gt;stat_prev_loaded,</div><div class='ctx'> 			  &amp;prev_ps-&gt;link_xoff_tx, &amp;cur_ps-&gt;link_xoff_tx);</div><div class='ctx'> </div><div class='add'>+	ice_update_dcb_stats(pf);</div><div class='add'>+</div><div class='ctx'> 	ice_stat_update32(hw, GLPRT_CRCERRS(pf_id), pf-&gt;stat_prev_loaded,</div><div class='ctx'> 			  &amp;prev_ps-&gt;crc_errors, &amp;cur_ps-&gt;crc_errors);</div><div class='ctx'> </div><div class='hunk'>@@ -2992,7 +3307,7 @@ static void ice_napi_disable_all(struct ice_vsi *vsi)</div><div class='ctx'> 	if (!vsi-&gt;netdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (q_idx = 0; q_idx &lt; vsi-&gt;num_q_vectors; q_idx++) {</div><div class='add'>+	ice_for_each_q_vector(vsi, q_idx) {</div><div class='ctx'> 		struct ice_q_vector *q_vector = vsi-&gt;q_vectors[q_idx];</div><div class='ctx'> </div><div class='ctx'> 		if (q_vector-&gt;rx.ring || q_vector-&gt;tx.ring)</div><div class='hunk'>@@ -3276,7 +3591,7 @@ static void ice_vsi_release_all(struct ice_pf *pf)</div><div class='ctx'> 	if (!pf-&gt;vsi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++) {</div><div class='add'>+	ice_for_each_vsi(pf, i) {</div><div class='ctx'> 		if (!pf-&gt;vsi[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -3289,47 +3604,31 @@ static void ice_vsi_release_all(struct ice_pf *pf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_dis_vsi - pause a VSI</div><div class='del'>- * @vsi: the VSI being paused</div><div class='add'>+ * ice_ena_vsi - resume a VSI</div><div class='add'>+ * @vsi: the VSI being resume</div><div class='ctx'>  * @locked: is the rtnl_lock already held</div><div class='ctx'>  */</div><div class='del'>-static void ice_dis_vsi(struct ice_vsi *vsi, bool locked)</div><div class='add'>+static int ice_ena_vsi(struct ice_vsi *vsi, bool locked)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(__ICE_DOWN, vsi-&gt;state))</div><div class='del'>-		return;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	set_bit(__ICE_NEEDS_RESTART, vsi-&gt;state);</div><div class='add'>+	if (!test_bit(__ICE_NEEDS_RESTART, vsi-&gt;state))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	clear_bit(__ICE_NEEDS_RESTART, vsi-&gt;state);</div><div class='add'>+</div><div class='add'>+	if (vsi-&gt;netdev &amp;&amp; vsi-&gt;type == ICE_VSI_PF) {</div><div class='add'>+		struct net_device *netd = vsi-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	if (vsi-&gt;type == ICE_VSI_PF &amp;&amp; vsi-&gt;netdev) {</div><div class='ctx'> 		if (netif_running(vsi-&gt;netdev)) {</div><div class='del'>-			if (!locked) {</div><div class='add'>+			if (locked) {</div><div class='add'>+				err = netd-&gt;netdev_ops-&gt;ndo_open(netd);</div><div class='add'>+			} else {</div><div class='ctx'> 				rtnl_lock();</div><div class='del'>-				vsi-&gt;netdev-&gt;netdev_ops-&gt;ndo_stop(vsi-&gt;netdev);</div><div class='add'>+				err = netd-&gt;netdev_ops-&gt;ndo_open(netd);</div><div class='ctx'> 				rtnl_unlock();</div><div class='del'>-			} else {</div><div class='del'>-				vsi-&gt;netdev-&gt;netdev_ops-&gt;ndo_stop(vsi-&gt;netdev);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			ice_vsi_close(vsi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ice_ena_vsi - resume a VSI</div><div class='del'>- * @vsi: the VSI being resume</div><div class='del'>- */</div><div class='del'>-static int ice_ena_vsi(struct ice_vsi *vsi)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(__ICE_NEEDS_RESTART, vsi-&gt;state) &amp;&amp;</div><div class='del'>-	    vsi-&gt;netdev) {</div><div class='del'>-		if (netif_running(vsi-&gt;netdev)) {</div><div class='del'>-			rtnl_lock();</div><div class='del'>-			err = vsi-&gt;netdev-&gt;netdev_ops-&gt;ndo_open(vsi-&gt;netdev);</div><div class='del'>-			rtnl_unlock();</div><div class='del'>-		} else {</div><div class='ctx'> 			err = ice_vsi_open(vsi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3338,29 +3637,21 @@ static int ice_ena_vsi(struct ice_vsi *vsi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_pf_dis_all_vsi - Pause all VSIs on a PF</div><div class='del'>- * @pf: the PF</div><div class='del'>- */</div><div class='del'>-static void ice_pf_dis_all_vsi(struct ice_pf *pf)</div><div class='del'>-{</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	ice_for_each_vsi(pf, v)</div><div class='del'>-		if (pf-&gt;vsi[v])</div><div class='del'>-			ice_dis_vsi(pf-&gt;vsi[v], false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ice_pf_ena_all_vsi - Resume all VSIs on a PF</div><div class='ctx'>  * @pf: the PF</div><div class='add'>+ * @locked: is the rtnl_lock already held</div><div class='ctx'>  */</div><div class='del'>-static int ice_pf_ena_all_vsi(struct ice_pf *pf)</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked)</div><div class='add'>+#else</div><div class='add'>+static int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked)</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='ctx'> {</div><div class='ctx'> 	int v;</div><div class='ctx'> </div><div class='ctx'> 	ice_for_each_vsi(pf, v)</div><div class='ctx'> 		if (pf-&gt;vsi[v])</div><div class='del'>-			if (ice_ena_vsi(pf-&gt;vsi[v]))</div><div class='add'>+			if (ice_ena_vsi(pf-&gt;vsi[v], locked))</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3375,16 +3666,12 @@ static int ice_vsi_rebuild_all(struct ice_pf *pf)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* loop through pf-&gt;vsi array and reinit the VSI if found */</div><div class='del'>-	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++) {</div><div class='add'>+	ice_for_each_vsi(pf, i) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='ctx'> 		if (!pf-&gt;vsi[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* VF VSI rebuild isn't supported yet */</div><div class='del'>-		if (pf-&gt;vsi[i]-&gt;type == ICE_VSI_VF)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		err = ice_vsi_rebuild(pf-&gt;vsi[i]);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -3412,7 +3699,7 @@ static int ice_vsi_replay_all(struct ice_pf *pf)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* loop through pf-&gt;vsi array and replay the VSI if found */</div><div class='del'>-	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++) {</div><div class='add'>+	ice_for_each_vsi(pf, i) {</div><div class='ctx'> 		if (!pf-&gt;vsi[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -3479,6 +3766,8 @@ static void ice_rebuild(struct ice_pf *pf)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_sched_init_port;</div><div class='ctx'> </div><div class='add'>+	ice_dcb_rebuild(pf);</div><div class='add'>+</div><div class='ctx'> 	/* reset search_hint of irq_trackers to 0 since interrupts are</div><div class='ctx'> 	 * reclaimed and could be allocated from beginning during VSI rebuild</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3512,7 +3801,7 @@ static void ice_rebuild(struct ice_pf *pf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* restart the VSIs that were rebuilt and running before the reset */</div><div class='del'>-	err = ice_pf_ena_all_vsi(pf);</div><div class='add'>+	err = ice_pf_ena_all_vsi(pf, false);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev, "error enabling VSIs\n");</div><div class='ctx'> 		/* no need to disable VSIs in tear down path in ice_rebuild()</div><div class='hunk'>@@ -3521,9 +3810,7 @@ static void ice_rebuild(struct ice_pf *pf)</div><div class='ctx'> 		goto err_vsi_rebuild;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ice_reset_all_vfs(pf, true);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++) {</div><div class='add'>+	ice_for_each_vsi(pf, i) {</div><div class='ctx'> 		bool link_up;</div><div class='ctx'> </div><div class='ctx'> 		if (!pf-&gt;vsi[i] || pf-&gt;vsi[i]-&gt;type != ICE_VSI_PF)</div><div class='hunk'>@@ -3710,7 +3997,7 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_bridge_getlink - Get the hardware bridge mode</div><div class='ctx'>  * @skb: skb buff</div><div class='del'>- * @pid: process id</div><div class='add'>+ * @pid: process ID</div><div class='ctx'>  * @seq: RTNL message seq</div><div class='ctx'>  * @dev: the netdev being configured</div><div class='ctx'>  * @filter_mask: filter mask passed in</div><div class='hunk'>@@ -3909,8 +4196,7 @@ static void ice_tx_timeout(struct net_device *netdev)</div><div class='ctx'> 		/* Read interrupt register */</div><div class='ctx'> 		if (test_bit(ICE_FLAG_MSIX_ENA, pf-&gt;flags))</div><div class='ctx'> 			val = rd32(hw,</div><div class='del'>-				   GLINT_DYN_CTL(tx_ring-&gt;q_vector-&gt;v_idx +</div><div class='del'>-						 tx_ring-&gt;vsi-&gt;hw_base_vector));</div><div class='add'>+				   GLINT_DYN_CTL(tx_ring-&gt;q_vector-&gt;reg_idx));</div><div class='ctx'> </div><div class='ctx'> 		netdev_info(netdev, "tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n",</div><div class='ctx'> 			    vsi-&gt;vsi_num, hung_queue, tx_ring-&gt;next_to_clean,</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c<br/>index 413fdbbcc4d0..62571d33d0d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_nvm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_nvm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_nvm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_nvm.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_read_nvm</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @module_typeid: module pointer location in words from the NVM beginning</div><div class='ctx'>  * @offset: byte offset from the module beginning</div><div class='ctx'>  * @length: length of the section to be read (in bytes from the offset)</div><div class='hunk'>@@ -235,7 +235,7 @@ ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_init_nvm - initializes NVM setting</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * This function reads and populates NVM settings such as Shadow RAM size,</div><div class='ctx'>  * max_timeout, and blank_nvm_mode</div><div class='hunk'>@@ -248,7 +248,7 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)</div><div class='ctx'> 	u32 fla, gens_stat;</div><div class='ctx'> 	u8 sr_size;</div><div class='ctx'> </div><div class='del'>-	/* The SR size is stored regardless of the nvm programming mode</div><div class='add'>+	/* The SR size is stored regardless of the NVM programming mode</div><div class='ctx'> 	 * as the blank mode may be used in the factory line.</div><div class='ctx'> 	 */</div><div class='ctx'> 	gens_stat = rd32(hw, GLNVM_GENS);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c<br/>index 56049739a250..8d49f83be7a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_sched.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_sched.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_sched.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_sched.c</a></div><div class='hunk'>@@ -43,9 +43,9 @@ ice_sched_add_root_node(struct ice_port_info *pi,</div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_find_node_by_teid - Find the Tx scheduler node in SW DB</div><div class='ctx'>  * @start_node: pointer to the starting ice_sched_node struct in a sub-tree</div><div class='del'>- * @teid: node teid to search</div><div class='add'>+ * @teid: node TEID to search</div><div class='ctx'>  *</div><div class='del'>- * This function searches for a node matching the teid in the scheduling tree</div><div class='add'>+ * This function searches for a node matching the TEID in the scheduling tree</div><div class='ctx'>  * from the SW DB. The search is recursive and is restricted by the number of</div><div class='ctx'>  * layers it has searched through; stopping at the max supported layer.</div><div class='ctx'>  *</div><div class='hunk'>@@ -66,7 +66,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)</div><div class='ctx'> 	    start_node-&gt;info.data.elem_type == ICE_AQC_ELEM_TYPE_LEAF)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* Check if teid matches to any of the children nodes */</div><div class='add'>+	/* Check if TEID matches to any of the children nodes */</div><div class='ctx'> 	for (i = 0; i &lt; start_node-&gt;num_children; i++)</div><div class='ctx'> 		if (ICE_TXSCHED_GET_NODE_TEID(start_node-&gt;children[i]) == teid)</div><div class='ctx'> 			return start_node-&gt;children[i];</div><div class='hunk'>@@ -86,7 +86,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aqc_send_sched_elem_cmd - send scheduling elements cmd</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @cmd_opc: cmd opcode</div><div class='ctx'>  * @elems_req: number of elements to request</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='hunk'>@@ -118,7 +118,7 @@ ice_aqc_send_sched_elem_cmd(struct ice_hw *hw, enum ice_adminq_opc cmd_opc,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_query_sched_elems - query scheduler elements</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @elems_req: number of elements to query</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='hunk'>@@ -127,7 +127,7 @@ ice_aqc_send_sched_elem_cmd(struct ice_hw *hw, enum ice_adminq_opc cmd_opc,</div><div class='ctx'>  *</div><div class='ctx'>  * Query scheduling elements (0x0404)</div><div class='ctx'>  */</div><div class='del'>-static enum ice_status</div><div class='add'>+enum ice_status</div><div class='ctx'> ice_aq_query_sched_elems(struct ice_hw *hw, u16 elems_req,</div><div class='ctx'> 			 struct ice_aqc_get_elem *buf, u16 buf_size,</div><div class='ctx'> 			 u16 *elems_ret, struct ice_sq_cd *cd)</div><div class='hunk'>@@ -138,31 +138,6 @@ ice_aq_query_sched_elems(struct ice_hw *hw, u16 elems_req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_query_elem - query element information from hw</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='del'>- * @node_teid: node teid to be queried</div><div class='del'>- * @buf: buffer to element information</div><div class='del'>- *</div><div class='del'>- * This function queries HW element information</div><div class='del'>- */</div><div class='del'>-static enum ice_status</div><div class='del'>-ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,</div><div class='del'>-		     struct ice_aqc_get_elem *buf)</div><div class='del'>-{</div><div class='del'>-	u16 buf_size, num_elem_ret = 0;</div><div class='del'>-	enum ice_status status;</div><div class='del'>-</div><div class='del'>-	buf_size = sizeof(*buf);</div><div class='del'>-	memset(buf, 0, buf_size);</div><div class='del'>-	buf-&gt;generic[0].node_teid = cpu_to_le32(node_teid);</div><div class='del'>-	status = ice_aq_query_sched_elems(hw, 1, buf, buf_size, &amp;num_elem_ret,</div><div class='del'>-					  NULL);</div><div class='del'>-	if (status || num_elem_ret != 1)</div><div class='del'>-		ice_debug(hw, ICE_DBG_SCHED, "query element failed\n");</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ice_sched_add_node - Insert the Tx scheduler node in SW DB</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @layer: Scheduler layer of the node</div><div class='hunk'>@@ -226,7 +201,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_delete_sched_elems - delete scheduler elements</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @grps_req: number of groups to delete</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='hunk'>@@ -246,13 +221,13 @@ ice_aq_delete_sched_elems(struct ice_hw *hw, u16 grps_req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_remove_elems - remove nodes from hw</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * ice_sched_remove_elems - remove nodes from HW</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @parent: pointer to the parent node</div><div class='ctx'>  * @num_nodes: number of nodes</div><div class='ctx'>  * @node_teids: array of node teids to be deleted</div><div class='ctx'>  *</div><div class='del'>- * This function remove nodes from hw</div><div class='add'>+ * This function remove nodes from HW</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,</div><div class='hunk'>@@ -276,7 +251,8 @@ ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,</div><div class='ctx'> 	status = ice_aq_delete_sched_elems(hw, 1, buf, buf_size,</div><div class='ctx'> 					   &amp;num_groups_removed, NULL);</div><div class='ctx'> 	if (status || num_groups_removed != 1)</div><div class='del'>-		ice_debug(hw, ICE_DBG_SCHED, "remove elements failed\n");</div><div class='add'>+		ice_debug(hw, ICE_DBG_SCHED, "remove node failed FW error %d\n",</div><div class='add'>+			  hw-&gt;adminq.sq_last_status);</div><div class='ctx'> </div><div class='ctx'> 	devm_kfree(ice_hw_to_dev(hw), buf);</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -284,7 +260,7 @@ ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_get_first_node - get the first node of the given layer</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @parent: pointer the base node of the subtree</div><div class='ctx'>  * @layer: layer number</div><div class='ctx'>  *</div><div class='hunk'>@@ -360,12 +336,8 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node)</div><div class='ctx'> 	    node-&gt;info.data.elem_type != ICE_AQC_ELEM_TYPE_ROOT_PORT &amp;&amp;</div><div class='ctx'> 	    node-&gt;info.data.elem_type != ICE_AQC_ELEM_TYPE_LEAF) {</div><div class='ctx'> 		u32 teid = le32_to_cpu(node-&gt;info.node_teid);</div><div class='del'>-		enum ice_status status;</div><div class='ctx'> </div><div class='del'>-		status = ice_sched_remove_elems(hw, node-&gt;parent, 1, &amp;teid);</div><div class='del'>-		if (status)</div><div class='del'>-			ice_debug(hw, ICE_DBG_SCHED,</div><div class='del'>-				  "remove element failed %d\n", status);</div><div class='add'>+		ice_sched_remove_elems(hw, node-&gt;parent, 1, &amp;teid);</div><div class='ctx'> 	}</div><div class='ctx'> 	parent = node-&gt;parent;</div><div class='ctx'> 	/* root has no parent */</div><div class='hunk'>@@ -409,7 +381,7 @@ err_exit:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_get_dflt_topo - gets default scheduler topology</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @lport: logical port number</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='hunk'>@@ -439,7 +411,7 @@ ice_aq_get_dflt_topo(struct ice_hw *hw, u8 lport,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_add_sched_elems - adds scheduling element</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @grps_req: the number of groups that are requested to be added</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='hunk'>@@ -460,7 +432,7 @@ ice_aq_add_sched_elems(struct ice_hw *hw, u16 grps_req,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_suspend_sched_elems - suspend scheduler elements</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @elems_req: number of elements to suspend</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='hunk'>@@ -481,7 +453,7 @@ ice_aq_suspend_sched_elems(struct ice_hw *hw, u16 elems_req,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_resume_sched_elems - resume scheduler elements</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @elems_req: number of elements to resume</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='hunk'>@@ -502,7 +474,7 @@ ice_aq_resume_sched_elems(struct ice_hw *hw, u16 elems_req,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_query_sched_res - query scheduler resource</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @buf_size: buffer size in bytes</div><div class='ctx'>  * @buf: pointer to buffer</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -521,13 +493,13 @@ ice_aq_query_sched_res(struct ice_hw *hw, u16 buf_size,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_suspend_resume_elems - suspend or resume hw nodes</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * ice_sched_suspend_resume_elems - suspend or resume HW nodes</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @num_nodes: number of nodes</div><div class='ctx'>  * @node_teids: array of node teids to be suspended or resumed</div><div class='ctx'>  * @suspend: true means suspend / false means resume</div><div class='ctx'>  *</div><div class='del'>- * This function suspends or resumes hw nodes</div><div class='add'>+ * This function suspends or resumes HW nodes</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,</div><div class='hunk'>@@ -561,10 +533,54 @@ ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_clear_agg - clears the agg related information</div><div class='add'>+ * ice_alloc_lan_q_ctx - allocate LAN queue contexts for the given VSI and TC</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @vsi_handle: VSI handle</div><div class='add'>+ * @tc: TC number</div><div class='add'>+ * @new_numqs: number of queues</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_alloc_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 new_numqs)</div><div class='add'>+{</div><div class='add'>+	struct ice_vsi_ctx *vsi_ctx;</div><div class='add'>+	struct ice_q_ctx *q_ctx;</div><div class='add'>+</div><div class='add'>+	vsi_ctx = ice_get_vsi_ctx(hw, vsi_handle);</div><div class='add'>+	if (!vsi_ctx)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+	/* allocate LAN queue contexts */</div><div class='add'>+	if (!vsi_ctx-&gt;lan_q_ctx[tc]) {</div><div class='add'>+		vsi_ctx-&gt;lan_q_ctx[tc] = devm_kcalloc(ice_hw_to_dev(hw),</div><div class='add'>+						      new_numqs,</div><div class='add'>+						      sizeof(*q_ctx),</div><div class='add'>+						      GFP_KERNEL);</div><div class='add'>+		if (!vsi_ctx-&gt;lan_q_ctx[tc])</div><div class='add'>+			return ICE_ERR_NO_MEMORY;</div><div class='add'>+		vsi_ctx-&gt;num_lan_q_entries[tc] = new_numqs;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* num queues are increased, update the queue contexts */</div><div class='add'>+	if (new_numqs &gt; vsi_ctx-&gt;num_lan_q_entries[tc]) {</div><div class='add'>+		u16 prev_num = vsi_ctx-&gt;num_lan_q_entries[tc];</div><div class='add'>+</div><div class='add'>+		q_ctx = devm_kcalloc(ice_hw_to_dev(hw), new_numqs,</div><div class='add'>+				     sizeof(*q_ctx), GFP_KERNEL);</div><div class='add'>+		if (!q_ctx)</div><div class='add'>+			return ICE_ERR_NO_MEMORY;</div><div class='add'>+		memcpy(q_ctx, vsi_ctx-&gt;lan_q_ctx[tc],</div><div class='add'>+		       prev_num * sizeof(*q_ctx));</div><div class='add'>+		devm_kfree(ice_hw_to_dev(hw), vsi_ctx-&gt;lan_q_ctx[tc]);</div><div class='add'>+		vsi_ctx-&gt;lan_q_ctx[tc] = q_ctx;</div><div class='add'>+		vsi_ctx-&gt;num_lan_q_entries[tc] = new_numqs;</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'>+ * ice_sched_clear_agg - clears the aggregator related information</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  *</div><div class='del'>- * This function removes agg list and free up agg related memory</div><div class='add'>+ * This function removes aggregator list and free up aggregator related memory</div><div class='ctx'>  * previously allocated.</div><div class='ctx'>  */</div><div class='ctx'> void ice_sched_clear_agg(struct ice_hw *hw)</div><div class='hunk'>@@ -622,7 +638,7 @@ void ice_sched_clear_port(struct ice_port_info *pi)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_cleanup_all - cleanup scheduler elements from SW DB for all ports</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Cleanup scheduling elements from SW DB for all the ports</div><div class='ctx'>  */</div><div class='hunk'>@@ -646,16 +662,16 @@ void ice_sched_cleanup_all(struct ice_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_add_elems - add nodes to hw and SW DB</div><div class='add'>+ * ice_sched_add_elems - add nodes to HW and SW DB</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @tc_node: pointer to the branch node</div><div class='ctx'>  * @parent: pointer to the parent node</div><div class='ctx'>  * @layer: layer number to add nodes</div><div class='ctx'>  * @num_nodes: number of nodes</div><div class='ctx'>  * @num_nodes_added: pointer to num nodes added</div><div class='del'>- * @first_node_teid: if new nodes are added then return the teid of first node</div><div class='add'>+ * @first_node_teid: if new nodes are added then return the TEID of first node</div><div class='ctx'>  *</div><div class='del'>- * This function add nodes to hw as well as to SW DB for a given layer</div><div class='add'>+ * This function add nodes to HW as well as to SW DB for a given layer</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,</div><div class='hunk'>@@ -697,7 +713,8 @@ ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,</div><div class='ctx'> 	status = ice_aq_add_sched_elems(hw, 1, buf, buf_size,</div><div class='ctx'> 					&amp;num_groups_added, NULL);</div><div class='ctx'> 	if (status || num_groups_added != 1) {</div><div class='del'>-		ice_debug(hw, ICE_DBG_SCHED, "add elements failed\n");</div><div class='add'>+		ice_debug(hw, ICE_DBG_SCHED, "add node failed FW Error %d\n",</div><div class='add'>+			  hw-&gt;adminq.sq_last_status);</div><div class='ctx'> 		devm_kfree(ice_hw_to_dev(hw), buf);</div><div class='ctx'> 		return ICE_ERR_CFG;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -748,7 +765,7 @@ ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,</div><div class='ctx'>  * @parent: pointer to parent node</div><div class='ctx'>  * @layer: layer number to add nodes</div><div class='ctx'>  * @num_nodes: number of nodes to be added</div><div class='del'>- * @first_node_teid: pointer to the first node teid</div><div class='add'>+ * @first_node_teid: pointer to the first node TEID</div><div class='ctx'>  * @num_nodes_added: pointer to number of nodes added</div><div class='ctx'>  *</div><div class='ctx'>  * This function add nodes to a given layer.</div><div class='hunk'>@@ -800,7 +817,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,</div><div class='ctx'> </div><div class='ctx'> 			*num_nodes_added += num_added;</div><div class='ctx'> 		}</div><div class='del'>-		/* Don't modify the first node teid memory if the first node was</div><div class='add'>+		/* Don't modify the first node TEID memory if the first node was</div><div class='ctx'> 		 * added already in the above call. Instead send some temp</div><div class='ctx'> 		 * memory for all other recursive calls.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -832,7 +849,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_get_qgrp_layer - get the current queue group layer number</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * This function returns the current queue group layer number</div><div class='ctx'>  */</div><div class='hunk'>@@ -844,7 +861,7 @@ static u8 ice_sched_get_qgrp_layer(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_get_vsi_layer - get the current VSI layer number</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * This function returns the current VSI layer number</div><div class='ctx'>  */</div><div class='hunk'>@@ -855,7 +872,7 @@ static u8 ice_sched_get_vsi_layer(struct ice_hw *hw)</div><div class='ctx'> 	 *     7               4</div><div class='ctx'> 	 *     5 or less       sw_entry_point_layer</div><div class='ctx'> 	 */</div><div class='del'>-	/* calculate the vsi layer based on number of layers. */</div><div class='add'>+	/* calculate the VSI layer based on number of layers. */</div><div class='ctx'> 	if (hw-&gt;num_tx_sched_layers &gt; ICE_VSI_LAYER_OFFSET + 1) {</div><div class='ctx'> 		u8 layer = hw-&gt;num_tx_sched_layers - ICE_VSI_LAYER_OFFSET;</div><div class='ctx'> </div><div class='hunk'>@@ -973,7 +990,7 @@ enum ice_status ice_sched_init_port(struct ice_port_info *pi)</div><div class='ctx'> 		goto err_init_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If the last node is a leaf node then the index of the Q group</div><div class='add'>+	/* If the last node is a leaf node then the index of the queue group</div><div class='ctx'> 	 * layer is two less than the number of elements.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (num_elems &gt; 2 &amp;&amp; buf[0].generic[num_elems - 1].data.elem_type ==</div><div class='hunk'>@@ -1082,7 +1099,7 @@ sched_query_out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_find_node_in_subtree - Find node in part of base node subtree</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @base: pointer to the base node</div><div class='ctx'>  * @node: pointer to the node to search</div><div class='ctx'>  *</div><div class='hunk'>@@ -1114,13 +1131,13 @@ ice_sched_find_node_in_subtree(struct ice_hw *hw, struct ice_sched_node *base,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_get_free_qparent - Get a free lan or rdma q group node</div><div class='add'>+ * ice_sched_get_free_qparent - Get a free LAN or RDMA queue group node</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @tc: branch number</div><div class='del'>- * @owner: lan or rdma</div><div class='add'>+ * @owner: LAN or RDMA</div><div class='ctx'>  *</div><div class='del'>- * This function retrieves a free lan or rdma q group node</div><div class='add'>+ * This function retrieves a free LAN or RDMA queue group node</div><div class='ctx'>  */</div><div class='ctx'> struct ice_sched_node *</div><div class='ctx'> ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,</div><div class='hunk'>@@ -1138,11 +1155,11 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,</div><div class='ctx'> 	if (!vsi_ctx)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	vsi_node = vsi_ctx-&gt;sched.vsi_node[tc];</div><div class='del'>-	/* validate invalid VSI id */</div><div class='add'>+	/* validate invalid VSI ID */</div><div class='ctx'> 	if (!vsi_node)</div><div class='ctx'> 		goto lan_q_exit;</div><div class='ctx'> </div><div class='del'>-	/* get the first q group node from VSI sub-tree */</div><div class='add'>+	/* get the first queue group node from VSI sub-tree */</div><div class='ctx'> 	qgrp_node = ice_sched_get_first_node(pi-&gt;hw, vsi_node, qgrp_layer);</div><div class='ctx'> 	while (qgrp_node) {</div><div class='ctx'> 		/* make sure the qgroup node is part of the VSI subtree */</div><div class='hunk'>@@ -1158,12 +1175,12 @@ lan_q_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_get_vsi_node - Get a VSI node based on VSI id</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * ice_sched_get_vsi_node - Get a VSI node based on VSI ID</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @tc_node: pointer to the TC node</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  *</div><div class='del'>- * This function retrieves a VSI node for a given VSI id from a given</div><div class='add'>+ * This function retrieves a VSI node for a given VSI ID from a given</div><div class='ctx'>  * TC branch</div><div class='ctx'>  */</div><div class='ctx'> static struct ice_sched_node *</div><div class='hunk'>@@ -1188,7 +1205,7 @@ ice_sched_get_vsi_node(struct ice_hw *hw, struct ice_sched_node *tc_node,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @num_qs: number of queues</div><div class='ctx'>  * @num_nodes: num nodes array</div><div class='ctx'>  *</div><div class='hunk'>@@ -1204,7 +1221,7 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)</div><div class='ctx'> 	qgl = ice_sched_get_qgrp_layer(hw);</div><div class='ctx'> 	vsil = ice_sched_get_vsi_layer(hw);</div><div class='ctx'> </div><div class='del'>-	/* calculate num nodes from q group to VSI layer */</div><div class='add'>+	/* calculate num nodes from queue group to VSI layer */</div><div class='ctx'> 	for (i = qgl; i &gt; vsil; i--) {</div><div class='ctx'> 		/* round to the next integer if there is a remainder */</div><div class='ctx'> 		num = DIV_ROUND_UP(num, hw-&gt;max_children[i]);</div><div class='hunk'>@@ -1220,10 +1237,10 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @tc_node: pointer to the TC node</div><div class='ctx'>  * @num_nodes: pointer to the num nodes that needs to be added per layer</div><div class='del'>- * @owner: node owner (lan or rdma)</div><div class='add'>+ * @owner: node owner (LAN or RDMA)</div><div class='ctx'>  *</div><div class='ctx'>  * This function adds the VSI child nodes to tree. It gets called for</div><div class='del'>- * lan and rdma separately.</div><div class='add'>+ * LAN and RDMA separately.</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,</div><div class='hunk'>@@ -1271,44 +1288,8 @@ ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_rm_vsi_child_nodes - remove VSI child nodes from the tree</div><div class='del'>- * @pi: port information structure</div><div class='del'>- * @vsi_node: pointer to the VSI node</div><div class='del'>- * @num_nodes: pointer to the num nodes that needs to be removed per layer</div><div class='del'>- * @owner: node owner (lan or rdma)</div><div class='del'>- *</div><div class='del'>- * This function removes the VSI child nodes from the tree. It gets called for</div><div class='del'>- * lan and rdma separately.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ice_sched_rm_vsi_child_nodes(struct ice_port_info *pi,</div><div class='del'>-			     struct ice_sched_node *vsi_node, u16 *num_nodes,</div><div class='del'>-			     u8 owner)</div><div class='del'>-{</div><div class='del'>-	struct ice_sched_node *node, *next;</div><div class='del'>-	u8 i, qgl, vsil;</div><div class='del'>-	u16 num;</div><div class='del'>-</div><div class='del'>-	qgl = ice_sched_get_qgrp_layer(pi-&gt;hw);</div><div class='del'>-	vsil = ice_sched_get_vsi_layer(pi-&gt;hw);</div><div class='del'>-</div><div class='del'>-	for (i = qgl; i &gt; vsil; i--) {</div><div class='del'>-		num = num_nodes[i];</div><div class='del'>-		node = ice_sched_get_first_node(pi-&gt;hw, vsi_node, i);</div><div class='del'>-		while (node &amp;&amp; num) {</div><div class='del'>-			next = node-&gt;sibling;</div><div class='del'>-			if (node-&gt;owner == owner &amp;&amp; !node-&gt;num_children) {</div><div class='del'>-				ice_free_sched_node(pi, node);</div><div class='del'>-				num--;</div><div class='del'>-			}</div><div class='del'>-			node = next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ice_sched_calc_vsi_support_nodes - calculate number of VSI support nodes</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @tc_node: pointer to TC node</div><div class='ctx'>  * @num_nodes: pointer to num nodes array</div><div class='ctx'>  *</div><div class='hunk'>@@ -1427,7 +1408,7 @@ ice_sched_add_vsi_to_topo(struct ice_port_info *pi, u16 vsi_handle, u8 tc)</div><div class='ctx'> 	/* calculate number of supported nodes needed for this VSI */</div><div class='ctx'> 	ice_sched_calc_vsi_support_nodes(hw, tc_node, num_nodes);</div><div class='ctx'> </div><div class='del'>-	/* add vsi supported nodes to tc subtree */</div><div class='add'>+	/* add VSI supported nodes to TC subtree */</div><div class='ctx'> 	return ice_sched_add_vsi_support_nodes(pi, vsi_handle, tc_node,</div><div class='ctx'> 					       num_nodes);</div><div class='ctx'> }</div><div class='hunk'>@@ -1446,7 +1427,6 @@ static enum ice_status</div><div class='ctx'> ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,</div><div class='ctx'> 				 u8 tc, u16 new_numqs, u8 owner)</div><div class='ctx'> {</div><div class='del'>-	u16 prev_num_nodes[ICE_AQC_TOPO_MAX_LEVEL_NUM] = { 0 };</div><div class='ctx'> 	u16 new_num_nodes[ICE_AQC_TOPO_MAX_LEVEL_NUM] = { 0 };</div><div class='ctx'> 	struct ice_sched_node *vsi_node;</div><div class='ctx'> 	struct ice_sched_node *tc_node;</div><div class='hunk'>@@ -1454,7 +1434,6 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,</div><div class='ctx'> 	enum ice_status status = 0;</div><div class='ctx'> 	struct ice_hw *hw = pi-&gt;hw;</div><div class='ctx'> 	u16 prev_numqs;</div><div class='del'>-	u8 i;</div><div class='ctx'> </div><div class='ctx'> 	tc_node = ice_sched_get_tc_node(pi, tc);</div><div class='ctx'> 	if (!tc_node)</div><div class='hunk'>@@ -1468,41 +1447,30 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,</div><div class='ctx'> 	if (!vsi_ctx)</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='ctx'> </div><div class='del'>-	if (owner == ICE_SCHED_NODE_OWNER_LAN)</div><div class='del'>-		prev_numqs = vsi_ctx-&gt;sched.max_lanq[tc];</div><div class='del'>-	else</div><div class='del'>-		return ICE_ERR_PARAM;</div><div class='del'>-</div><div class='del'>-	/* num queues are not changed */</div><div class='del'>-	if (prev_numqs == new_numqs)</div><div class='add'>+	prev_numqs = vsi_ctx-&gt;sched.max_lanq[tc];</div><div class='add'>+	/* num queues are not changed or less than the previous number */</div><div class='add'>+	if (new_numqs &lt;= prev_numqs)</div><div class='add'>+		return status;</div><div class='add'>+	status = ice_alloc_lan_q_ctx(hw, vsi_handle, tc, new_numqs);</div><div class='add'>+	if (status)</div><div class='ctx'> 		return status;</div><div class='del'>-</div><div class='del'>-	/* calculate number of nodes based on prev/new number of qs */</div><div class='del'>-	if (prev_numqs)</div><div class='del'>-		ice_sched_calc_vsi_child_nodes(hw, prev_numqs, prev_num_nodes);</div><div class='ctx'> </div><div class='ctx'> 	if (new_numqs)</div><div class='ctx'> 		ice_sched_calc_vsi_child_nodes(hw, new_numqs, new_num_nodes);</div><div class='del'>-</div><div class='del'>-	if (prev_numqs &gt; new_numqs) {</div><div class='del'>-		for (i = 0; i &lt; ICE_AQC_TOPO_MAX_LEVEL_NUM; i++)</div><div class='del'>-			new_num_nodes[i] = prev_num_nodes[i] - new_num_nodes[i];</div><div class='del'>-</div><div class='del'>-		ice_sched_rm_vsi_child_nodes(pi, vsi_node, new_num_nodes,</div><div class='del'>-					     owner);</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; ICE_AQC_TOPO_MAX_LEVEL_NUM; i++)</div><div class='del'>-			new_num_nodes[i] -= prev_num_nodes[i];</div><div class='del'>-</div><div class='del'>-		status = ice_sched_add_vsi_child_nodes(pi, vsi_handle, tc_node,</div><div class='del'>-						       new_num_nodes, owner);</div><div class='del'>-		if (status)</div><div class='del'>-			return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	/* Keep the max number of queue configuration all the time. Update the</div><div class='add'>+	 * tree only if number of queues &gt; previous number of queues. This may</div><div class='add'>+	 * leave some extra nodes in the tree if number of queues &lt; previous</div><div class='add'>+	 * number but that wouldn't harm anything. Removing those extra nodes</div><div class='add'>+	 * may complicate the code if those nodes are part of SRL or</div><div class='add'>+	 * individually rate limited.</div><div class='add'>+	 */</div><div class='add'>+	status = ice_sched_add_vsi_child_nodes(pi, vsi_handle, tc_node,</div><div class='add'>+					       new_num_nodes, owner);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> 	vsi_ctx-&gt;sched.max_lanq[tc] = new_numqs;</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1511,7 +1479,7 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  * @tc: TC number</div><div class='ctx'>  * @maxqs: max number of queues</div><div class='del'>- * @owner: lan or rdma</div><div class='add'>+ * @owner: LAN or RDMA</div><div class='ctx'>  * @enable: TC enabled or disabled</div><div class='ctx'>  *</div><div class='ctx'>  * This function adds/updates VSI nodes based on the number of queues. If TC is</div><div class='hunk'>@@ -1527,6 +1495,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,</div><div class='ctx'> 	enum ice_status status = 0;</div><div class='ctx'> 	struct ice_hw *hw = pi-&gt;hw;</div><div class='ctx'> </div><div class='add'>+	ice_debug(pi-&gt;hw, ICE_DBG_SCHED, "add/config VSI %d\n", vsi_handle);</div><div class='ctx'> 	tc_node = ice_sched_get_tc_node(pi, tc);</div><div class='ctx'> 	if (!tc_node)</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='hunk'>@@ -1535,7 +1504,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='ctx'> 	vsi_node = ice_sched_get_vsi_node(hw, tc_node, vsi_handle);</div><div class='ctx'> </div><div class='del'>-	/* suspend the VSI if tc is not enabled */</div><div class='add'>+	/* suspend the VSI if TC is not enabled */</div><div class='ctx'> 	if (!enable) {</div><div class='ctx'> 		if (vsi_node &amp;&amp; vsi_node-&gt;in_use) {</div><div class='ctx'> 			u32 teid = le32_to_cpu(vsi_node-&gt;info.node_teid);</div><div class='hunk'>@@ -1586,7 +1555,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_sched_rm_agg_vsi_entry - remove agg related VSI info entry</div><div class='add'>+ * ice_sched_rm_agg_vsi_entry - remove aggregator related VSI info entry</div><div class='ctx'>  * @pi: port information structure</div><div class='ctx'>  * @vsi_handle: software VSI handle</div><div class='ctx'>  *</div><div class='hunk'>@@ -1646,8 +1615,9 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)</div><div class='ctx'> {</div><div class='ctx'> 	enum ice_status status = ICE_ERR_PARAM;</div><div class='ctx'> 	struct ice_vsi_ctx *vsi_ctx;</div><div class='del'>-	u8 i, j = 0;</div><div class='add'>+	u8 i;</div><div class='ctx'> </div><div class='add'>+	ice_debug(pi-&gt;hw, ICE_DBG_SCHED, "removing VSI %d\n", vsi_handle);</div><div class='ctx'> 	if (!ice_is_vsi_valid(pi-&gt;hw, vsi_handle))</div><div class='ctx'> 		return status;</div><div class='ctx'> 	mutex_lock(&amp;pi-&gt;sched_lock);</div><div class='hunk'>@@ -1655,8 +1625,9 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)</div><div class='ctx'> 	if (!vsi_ctx)</div><div class='ctx'> 		goto exit_sched_rm_vsi_cfg;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ICE_MAX_TRAFFIC_CLASS; i++) {</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='ctx'> 		struct ice_sched_node *vsi_node, *tc_node;</div><div class='add'>+		u8 j = 0;</div><div class='ctx'> </div><div class='ctx'> 		tc_node = ice_sched_get_tc_node(pi, i);</div><div class='ctx'> 		if (!tc_node)</div><div class='hunk'>@@ -1689,7 +1660,7 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)</div><div class='ctx'> 			ice_free_sched_node(pi, vsi_node);</div><div class='ctx'> 			vsi_ctx-&gt;sched.vsi_node[i] = NULL;</div><div class='ctx'> </div><div class='del'>-			/* clean up agg related vsi info if any */</div><div class='add'>+			/* clean up aggregator related VSI info if any */</div><div class='ctx'> 			ice_sched_rm_agg_vsi_info(pi, vsi_handle);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (owner == ICE_SCHED_NODE_OWNER_LAN)</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_sched.h b/drivers/net/ethernet/intel/ice/ice_sched.h<br/>index bee8221ad146..3902a8ad3025 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_sched.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_sched.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_sched.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_sched.h</a></div><div class='hunk'>@@ -24,6 +24,10 @@ struct ice_sched_agg_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* FW AQ command calls */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_aq_query_sched_elems(struct ice_hw *hw, u16 elems_req,</div><div class='add'>+			 struct ice_aqc_get_elem *buf, u16 buf_size,</div><div class='add'>+			 u16 *elems_ret, struct ice_sq_cd *cd);</div><div class='ctx'> enum ice_status ice_sched_init_port(struct ice_port_info *pi);</div><div class='ctx'> enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw);</div><div class='ctx'> void ice_sched_clear_port(struct ice_port_info *pi);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_status.h b/drivers/net/ethernet/intel/ice/ice_status.h<br/>index 683f48824a29..17afe6acb18a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_status.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_status.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_status.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_status.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@ enum ice_status {</div><div class='ctx'> 	ICE_ERR_PARAM				= -1,</div><div class='ctx'> 	ICE_ERR_NOT_IMPL			= -2,</div><div class='ctx'> 	ICE_ERR_NOT_READY			= -3,</div><div class='add'>+	ICE_ERR_NOT_SUPPORTED			= -4,</div><div class='ctx'> 	ICE_ERR_BAD_PTR				= -5,</div><div class='ctx'> 	ICE_ERR_INVAL_SIZE			= -6,</div><div class='ctx'> 	ICE_ERR_DEVICE_NOT_SUPPORTED		= -8,</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c<br/>index 09d1c314b68f..9f1f595ae7e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_switch.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_switch.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_switch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_switch.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'>  * byte 6 = 0x2: to identify it as locally administered SA MAC</div><div class='ctx'>  * byte 12 = 0x81 &amp; byte 13 = 0x00:</div><div class='ctx'>  *	In case of VLAN filter first two bytes defines ether type (0x8100)</div><div class='del'>- *	and remaining two bytes are placeholder for programming a given VLAN id</div><div class='add'>+ *	and remaining two bytes are placeholder for programming a given VLAN ID</div><div class='ctx'>  *	In case of Ether type filter it is treated as header without VLAN tag</div><div class='ctx'>  *	and byte 12 and 13 is used to program a given Ether type instead</div><div class='ctx'>  */</div><div class='hunk'>@@ -51,7 +51,7 @@ static const u8 dummy_eth_header[DUMMY_ETH_HDR_LEN] = { 0x2, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_alloc_free_res - command to allocate/free resources</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @num_entries: number of resource entries in buffer</div><div class='ctx'>  * @buf: Indirect buffer to hold data parameters and response</div><div class='ctx'>  * @buf_size: size of buffer for indirect commands</div><div class='hunk'>@@ -87,7 +87,7 @@ ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_init_def_sw_recp - initialize the recipe book keeping tables</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Allocate memory for the entire recipe table and initialize the structures/</div><div class='ctx'>  * entries corresponding to basic recipes.</div><div class='hunk'>@@ -163,7 +163,7 @@ ice_aq_get_sw_cfg(struct ice_hw *hw, struct ice_aqc_get_sw_cfg_resp *buf,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_add_vsi</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_ctx: pointer to a VSI context struct</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='hunk'>@@ -206,7 +206,7 @@ ice_aq_add_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_free_vsi</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_ctx: pointer to a VSI context struct</div><div class='ctx'>  * @keep_vsi_alloc: keep VSI allocation as part of this PF's resources</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -242,7 +242,7 @@ ice_aq_free_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_update_vsi</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_ctx: pointer to a VSI context struct</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='ctx'>  *</div><div class='hunk'>@@ -279,7 +279,7 @@ ice_aq_update_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_is_vsi_valid - check whether the VSI is valid or not</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: VSI handle</div><div class='ctx'>  *</div><div class='ctx'>  * check whether the VSI is valid or not</div><div class='hunk'>@@ -290,11 +290,11 @@ bool ice_is_vsi_valid(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_get_hw_vsi_num - return the hw VSI number</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * ice_get_hw_vsi_num - return the HW VSI number</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: VSI handle</div><div class='ctx'>  *</div><div class='del'>- * return the hw VSI number</div><div class='add'>+ * return the HW VSI number</div><div class='ctx'>  * Caution: call this function only if VSI is valid (ice_is_vsi_valid)</div><div class='ctx'>  */</div><div class='ctx'> u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle)</div><div class='hunk'>@@ -304,7 +304,7 @@ u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_get_vsi_ctx - return the VSI context entry for a given VSI handle</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: VSI handle</div><div class='ctx'>  *</div><div class='ctx'>  * return the VSI context entry for a given VSI handle</div><div class='hunk'>@@ -316,21 +316,42 @@ struct ice_vsi_ctx *ice_get_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_save_vsi_ctx - save the VSI context for a given VSI handle</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: VSI handle</div><div class='ctx'>  * @vsi: VSI context pointer</div><div class='ctx'>  *</div><div class='ctx'>  * save the VSI context entry for a given VSI handle</div><div class='ctx'>  */</div><div class='del'>-static void ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle,</div><div class='del'>-			     struct ice_vsi_ctx *vsi)</div><div class='add'>+static void</div><div class='add'>+ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi)</div><div class='ctx'> {</div><div class='ctx'> 	hw-&gt;vsi_ctx[vsi_handle] = vsi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_clear_vsi_q_ctx - clear VSI queue contexts for all TCs</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @vsi_handle: VSI handle</div><div class='add'>+ */</div><div class='add'>+static void ice_clear_vsi_q_ctx(struct ice_hw *hw, u16 vsi_handle)</div><div class='add'>+{</div><div class='add'>+	struct ice_vsi_ctx *vsi;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	vsi = ice_get_vsi_ctx(hw, vsi_handle);</div><div class='add'>+	if (!vsi)</div><div class='add'>+		return;</div><div class='add'>+	ice_for_each_traffic_class(i) {</div><div class='add'>+		if (vsi-&gt;lan_q_ctx[i]) {</div><div class='add'>+			devm_kfree(ice_hw_to_dev(hw), vsi-&gt;lan_q_ctx[i]);</div><div class='add'>+			vsi-&gt;lan_q_ctx[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_clear_vsi_ctx - clear the VSI context entry</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: VSI handle</div><div class='ctx'>  *</div><div class='ctx'>  * clear the VSI context entry</div><div class='hunk'>@@ -341,6 +362,7 @@ static void ice_clear_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> </div><div class='ctx'> 	vsi = ice_get_vsi_ctx(hw, vsi_handle);</div><div class='ctx'> 	if (vsi) {</div><div class='add'>+		ice_clear_vsi_q_ctx(hw, vsi_handle);</div><div class='ctx'> 		devm_kfree(ice_hw_to_dev(hw), vsi);</div><div class='ctx'> 		hw-&gt;vsi_ctx[vsi_handle] = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -348,7 +370,7 @@ static void ice_clear_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_clear_all_vsi_ctx - clear all the VSI context entries</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  */</div><div class='ctx'> void ice_clear_all_vsi_ctx(struct ice_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -360,7 +382,7 @@ void ice_clear_all_vsi_ctx(struct ice_hw *hw)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_add_vsi - add VSI context to the hardware and VSI handle list</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: unique VSI handle provided by drivers</div><div class='ctx'>  * @vsi_ctx: pointer to a VSI context struct</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -383,7 +405,7 @@ ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> 		return status;</div><div class='ctx'> 	tmp_vsi_ctx = ice_get_vsi_ctx(hw, vsi_handle);</div><div class='ctx'> 	if (!tmp_vsi_ctx) {</div><div class='del'>-		/* Create a new vsi context */</div><div class='add'>+		/* Create a new VSI context */</div><div class='ctx'> 		tmp_vsi_ctx = devm_kzalloc(ice_hw_to_dev(hw),</div><div class='ctx'> 					   sizeof(*tmp_vsi_ctx), GFP_KERNEL);</div><div class='ctx'> 		if (!tmp_vsi_ctx) {</div><div class='hunk'>@@ -398,12 +420,12 @@ ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> 			tmp_vsi_ctx-&gt;vsi_num = vsi_ctx-&gt;vsi_num;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_free_vsi- free VSI context from hardware and VSI handle list</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: unique VSI handle</div><div class='ctx'>  * @vsi_ctx: pointer to a VSI context struct</div><div class='ctx'>  * @keep_vsi_alloc: keep VSI allocation as part of this PF's resources</div><div class='hunk'>@@ -428,7 +450,7 @@ ice_free_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_update_vsi</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle: unique VSI handle</div><div class='ctx'>  * @vsi_ctx: pointer to a VSI context struct</div><div class='ctx'>  * @cd: pointer to command details structure or NULL</div><div class='hunk'>@@ -447,8 +469,8 @@ ice_update_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_alloc_free_vsi_list</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='del'>- * @vsi_list_id: VSI list id returned or used for lookup</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='add'>+ * @vsi_list_id: VSI list ID returned or used for lookup</div><div class='ctx'>  * @lkup_type: switch rule filter lookup type</div><div class='ctx'>  * @opc: switch rules population command type - pass in the command opcode</div><div class='ctx'>  *</div><div class='hunk'>@@ -504,7 +526,7 @@ ice_aq_alloc_free_vsi_list_exit:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_aq_sw_rules - add/update/remove switch rules</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @rule_list: pointer to switch rule population list</div><div class='ctx'>  * @rule_list_sz: total size of the rule list in bytes</div><div class='ctx'>  * @num_rules: number of switch rules in the rule_list</div><div class='hunk'>@@ -643,21 +665,43 @@ static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi)</div><div class='ctx'> 	     fi-&gt;fltr_act == ICE_FWD_TO_VSI_LIST ||</div><div class='ctx'> 	     fi-&gt;fltr_act == ICE_FWD_TO_Q ||</div><div class='ctx'> 	     fi-&gt;fltr_act == ICE_FWD_TO_QGRP)) {</div><div class='del'>-		fi-&gt;lb_en = true;</div><div class='del'>-		/* Do not set lan_en to TRUE if</div><div class='add'>+		/* Setting LB for prune actions will result in replicated</div><div class='add'>+		 * packets to the internal switch that will be dropped.</div><div class='add'>+		 */</div><div class='add'>+		if (fi-&gt;lkup_type != ICE_SW_LKUP_VLAN)</div><div class='add'>+			fi-&gt;lb_en = true;</div><div class='add'>+</div><div class='add'>+		/* Set lan_en to TRUE if</div><div class='ctx'> 		 * 1. The switch is a VEB AND</div><div class='ctx'> 		 * 2</div><div class='del'>-		 * 2.1 The lookup is MAC with unicast addr for MAC, OR</div><div class='del'>-		 * 2.2 The lookup is MAC_VLAN with unicast addr for MAC</div><div class='add'>+		 * 2.1 The lookup is a directional lookup like ethertype,</div><div class='add'>+		 * promiscuous, ethertype-MAC, promiscuous-VLAN</div><div class='add'>+		 * and default-port OR</div><div class='add'>+		 * 2.2 The lookup is VLAN, OR</div><div class='add'>+		 * 2.3 The lookup is MAC with mcast or bcast addr for MAC, OR</div><div class='add'>+		 * 2.4 The lookup is MAC_VLAN with mcast or bcast addr for MAC.</div><div class='add'>+		 *</div><div class='add'>+		 * OR</div><div class='add'>+		 *</div><div class='add'>+		 * The switch is a VEPA.</div><div class='ctx'> 		 *</div><div class='del'>-		 * In all other cases, the LAN enable has to be set to true.</div><div class='add'>+		 * In all other cases, the LAN enable has to be set to false.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(hw-&gt;evb_veb &amp;&amp;</div><div class='del'>-		      ((fi-&gt;lkup_type == ICE_SW_LKUP_MAC &amp;&amp;</div><div class='del'>-			is_unicast_ether_addr(fi-&gt;l_data.mac.mac_addr)) ||</div><div class='del'>-		       (fi-&gt;lkup_type == ICE_SW_LKUP_MAC_VLAN &amp;&amp;</div><div class='del'>-			is_unicast_ether_addr(fi-&gt;l_data.mac_vlan.mac_addr)))))</div><div class='add'>+		if (hw-&gt;evb_veb) {</div><div class='add'>+			if (fi-&gt;lkup_type == ICE_SW_LKUP_ETHERTYPE ||</div><div class='add'>+			    fi-&gt;lkup_type == ICE_SW_LKUP_PROMISC ||</div><div class='add'>+			    fi-&gt;lkup_type == ICE_SW_LKUP_ETHERTYPE_MAC ||</div><div class='add'>+			    fi-&gt;lkup_type == ICE_SW_LKUP_PROMISC_VLAN ||</div><div class='add'>+			    fi-&gt;lkup_type == ICE_SW_LKUP_DFLT ||</div><div class='add'>+			    fi-&gt;lkup_type == ICE_SW_LKUP_VLAN ||</div><div class='add'>+			    (fi-&gt;lkup_type == ICE_SW_LKUP_MAC &amp;&amp;</div><div class='add'>+			     !is_unicast_ether_addr(fi-&gt;l_data.mac.mac_addr)) ||</div><div class='add'>+			    (fi-&gt;lkup_type == ICE_SW_LKUP_MAC_VLAN &amp;&amp;</div><div class='add'>+			     !is_unicast_ether_addr(fi-&gt;l_data.mac.mac_addr)))</div><div class='add'>+				fi-&gt;lan_en = true;</div><div class='add'>+		} else {</div><div class='ctx'> 			fi-&gt;lan_en = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -799,7 +843,7 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info,</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @m_ent: the management entry for which sw marker needs to be added</div><div class='ctx'>  * @sw_marker: sw marker to tag the Rx descriptor with</div><div class='del'>- * @l_id: large action resource id</div><div class='add'>+ * @l_id: large action resource ID</div><div class='ctx'>  *</div><div class='ctx'>  * Create a large action to hold software marker and update the switch rule</div><div class='ctx'>  * entry pointed by m_ent with newly created large action</div><div class='hunk'>@@ -811,8 +855,8 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,</div><div class='ctx'> 	struct ice_aqc_sw_rules_elem *lg_act, *rx_tx;</div><div class='ctx'> 	/* For software marker we need 3 large actions</div><div class='ctx'> 	 * 1. FWD action: FWD TO VSI or VSI LIST</div><div class='del'>-	 * 2. GENERIC VALUE action to hold the profile id</div><div class='del'>-	 * 3. GENERIC VALUE action to hold the software marker id</div><div class='add'>+	 * 2. GENERIC VALUE action to hold the profile ID</div><div class='add'>+	 * 3. GENERIC VALUE action to hold the software marker ID</div><div class='ctx'> 	 */</div><div class='ctx'> 	const u16 num_lg_acts = 3;</div><div class='ctx'> 	enum ice_status status;</div><div class='hunk'>@@ -875,13 +919,13 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,</div><div class='ctx'> 	ice_fill_sw_rule(hw, &amp;m_ent-&gt;fltr_info, rx_tx,</div><div class='ctx'> 			 ice_aqc_opc_update_sw_rules);</div><div class='ctx'> </div><div class='del'>-	/* Update the action to point to the large action id */</div><div class='add'>+	/* Update the action to point to the large action ID */</div><div class='ctx'> 	rx_tx-&gt;pdata.lkup_tx_rx.act =</div><div class='ctx'> 		cpu_to_le32(ICE_SINGLE_ACT_PTR |</div><div class='ctx'> 			    ((l_id &lt;&lt; ICE_SINGLE_ACT_PTR_VAL_S) &amp;</div><div class='ctx'> 			     ICE_SINGLE_ACT_PTR_VAL_M));</div><div class='ctx'> </div><div class='del'>-	/* Use the filter rule id of the previously created rule with single</div><div class='add'>+	/* Use the filter rule ID of the previously created rule with single</div><div class='ctx'> 	 * act. Once the update happens, hardware will treat this as large</div><div class='ctx'> 	 * action</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -904,10 +948,10 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @vsi_handle_arr: array of VSI handles to set in the VSI mapping</div><div class='ctx'>  * @num_vsi: number of VSI handles in the array</div><div class='del'>- * @vsi_list_id: VSI list id generated as part of allocate resource</div><div class='add'>+ * @vsi_list_id: VSI list ID generated as part of allocate resource</div><div class='ctx'>  *</div><div class='del'>- * Helper function to create a new entry of VSI list id to VSI mapping</div><div class='del'>- * using the given VSI list id</div><div class='add'>+ * Helper function to create a new entry of VSI list ID to VSI mapping</div><div class='add'>+ * using the given VSI list ID</div><div class='ctx'>  */</div><div class='ctx'> static struct ice_vsi_list_map_info *</div><div class='ctx'> ice_create_vsi_list_map(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,</div><div class='hunk'>@@ -935,13 +979,13 @@ ice_create_vsi_list_map(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @vsi_handle_arr: array of VSI handles to form a VSI list</div><div class='ctx'>  * @num_vsi: number of VSI handles in the array</div><div class='del'>- * @vsi_list_id: VSI list id generated as part of allocate resource</div><div class='add'>+ * @vsi_list_id: VSI list ID generated as part of allocate resource</div><div class='ctx'>  * @remove: Boolean value to indicate if this is a remove action</div><div class='ctx'>  * @opc: switch rules population command type - pass in the command opcode</div><div class='ctx'>  * @lkup_type: lookup type of the filter</div><div class='ctx'>  *</div><div class='ctx'>  * Call AQ command to add a new switch rule or update existing switch rule</div><div class='del'>- * using the given VSI list id</div><div class='add'>+ * using the given VSI list ID</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,</div><div class='hunk'>@@ -998,7 +1042,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_create_vsi_list_rule - Creates and populates a VSI list rule</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  * @vsi_handle_arr: array of VSI handles to form a VSI list</div><div class='ctx'>  * @num_vsi: number of VSI handles in the array</div><div class='ctx'>  * @vsi_list_id: stores the ID of the VSI list to be created</div><div class='hunk'>@@ -1092,7 +1136,7 @@ ice_create_pkt_fwd_rule_exit:</div><div class='ctx'>  * @f_info: filter information for switch rule</div><div class='ctx'>  *</div><div class='ctx'>  * Call AQ command to update a previously created switch rule with a</div><div class='del'>- * VSI list id</div><div class='add'>+ * VSI list ID</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='ctx'> ice_update_pkt_fwd_rule(struct ice_hw *hw, struct ice_fltr_info *f_info)</div><div class='hunk'>@@ -1119,7 +1163,7 @@ ice_update_pkt_fwd_rule(struct ice_hw *hw, struct ice_fltr_info *f_info)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_update_sw_rule_bridge_mode</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Updates unicast switch filter rules based on VEB/VEPA mode</div><div class='ctx'>  */</div><div class='hunk'>@@ -1174,7 +1218,7 @@ enum ice_status ice_update_sw_rule_bridge_mode(struct ice_hw *hw)</div><div class='ctx'>  *		Allocate a new VSI list and add two VSIs</div><div class='ctx'>  *		to this list using switch rule command</div><div class='ctx'>  *		Update the previously created switch rule with the</div><div class='del'>- *		newly created VSI list id</div><div class='add'>+ *		newly created VSI list ID</div><div class='ctx'>  *	if a VSI list was previously created</div><div class='ctx'>  *		Add the new VSI to the previously created VSI list set</div><div class='ctx'>  *		using the update switch rule command</div><div class='hunk'>@@ -1255,7 +1299,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Update the previously created VSI list set with</div><div class='del'>-		 * the new VSI id passed in</div><div class='add'>+		 * the new VSI ID passed in</div><div class='ctx'> 		 */</div><div class='ctx'> 		vsi_list_id = cur_fltr-&gt;fwd_id.vsi_list_id;</div><div class='ctx'> 		opcode = ice_aqc_opc_update_sw_rules;</div><div class='hunk'>@@ -1263,7 +1307,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,</div><div class='ctx'> 		status = ice_update_vsi_list_rule(hw, &amp;vsi_handle, 1,</div><div class='ctx'> 						  vsi_list_id, false, opcode,</div><div class='ctx'> 						  new_fltr-&gt;lkup_type);</div><div class='del'>-		/* update VSI list mapping info with new VSI id */</div><div class='add'>+		/* update VSI list mapping info with new VSI ID */</div><div class='ctx'> 		if (!status)</div><div class='ctx'> 			set_bit(vsi_handle, m_entry-&gt;vsi_list_info-&gt;vsi_map);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1305,7 +1349,7 @@ ice_find_rule_entry(struct ice_hw *hw, u8 recp_id, struct ice_fltr_info *f_info)</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @recp_id: lookup type for which VSI lists needs to be searched</div><div class='ctx'>  * @vsi_handle: VSI handle to be found in VSI list</div><div class='del'>- * @vsi_list_id: VSI list id found containing vsi_handle</div><div class='add'>+ * @vsi_list_id: VSI list ID found containing vsi_handle</div><div class='ctx'>  *</div><div class='ctx'>  * Helper function to search a VSI list with single entry containing given VSI</div><div class='ctx'>  * handle element. This can be extended further to search VSI list with more</div><div class='hunk'>@@ -1336,7 +1380,7 @@ ice_find_vsi_list_entry(struct ice_hw *hw, u8 recp_id, u16 vsi_handle,</div><div class='ctx'> /**</div><div class='ctx'>  * ice_add_rule_internal - add rule for a given lookup type</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='del'>- * @recp_id: lookup type (recipe id) for which rule has to be added</div><div class='add'>+ * @recp_id: lookup type (recipe ID) for which rule has to be added</div><div class='ctx'>  * @f_entry: structure containing MAC forwarding information</div><div class='ctx'>  *</div><div class='ctx'>  * Adds or updates the rule lists for a given recipe</div><div class='hunk'>@@ -1381,7 +1425,7 @@ ice_add_rule_internal(struct ice_hw *hw, u8 recp_id,</div><div class='ctx'> /**</div><div class='ctx'>  * ice_remove_vsi_list_rule</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='del'>- * @vsi_list_id: VSI list id generated as part of allocate resource</div><div class='add'>+ * @vsi_list_id: VSI list ID generated as part of allocate resource</div><div class='ctx'>  * @lkup_type: switch rule filter lookup type</div><div class='ctx'>  *</div><div class='ctx'>  * The VSI list should be emptied before this function is called to remove the</div><div class='hunk'>@@ -1506,7 +1550,7 @@ ice_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle,</div><div class='ctx'> /**</div><div class='ctx'>  * ice_remove_rule_internal - Remove a filter rule of a given type</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='del'>- * @recp_id: recipe id for which the rule needs to removed</div><div class='add'>+ * @recp_id: recipe ID for which the rule needs to removed</div><div class='ctx'>  * @f_entry: rule entry containing filter information</div><div class='ctx'>  */</div><div class='ctx'> static enum ice_status</div><div class='hunk'>@@ -1556,7 +1600,7 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id,</div><div class='ctx'> 		status = ice_rem_update_vsi_list(hw, vsi_handle, list_elem);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto exit;</div><div class='del'>-		/* if vsi count goes to zero after updating the vsi list */</div><div class='add'>+		/* if VSI count goes to zero after updating the VSI list */</div><div class='ctx'> 		if (list_elem-&gt;vsi_count == 0)</div><div class='ctx'> 			remove_rule = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1634,7 +1678,7 @@ ice_add_mac(struct ice_hw *hw, struct list_head *m_list)</div><div class='ctx'> 			return ICE_ERR_PARAM;</div><div class='ctx'> 		hw_vsi_id = ice_get_hw_vsi_num(hw, vsi_handle);</div><div class='ctx'> 		m_list_itr-&gt;fltr_info.fwd_id.hw_vsi_id = hw_vsi_id;</div><div class='del'>-		/* update the src in case it is vsi num */</div><div class='add'>+		/* update the src in case it is VSI num */</div><div class='ctx'> 		if (m_list_itr-&gt;fltr_info.src_id != ICE_SRC_ID_VSI)</div><div class='ctx'> 			return ICE_ERR_PARAM;</div><div class='ctx'> 		m_list_itr-&gt;fltr_info.src = hw_vsi_id;</div><div class='hunk'>@@ -1710,7 +1754,7 @@ ice_add_mac(struct ice_hw *hw, struct list_head *m_list)</div><div class='ctx'> 			((u8 *)r_iter + (elem_sent * s_rule_size));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Fill up rule id based on the value returned from FW */</div><div class='add'>+	/* Fill up rule ID based on the value returned from FW */</div><div class='ctx'> 	r_iter = s_rule;</div><div class='ctx'> 	list_for_each_entry(m_list_itr, m_list, list_entry) {</div><div class='ctx'> 		struct ice_fltr_info *f_info = &amp;m_list_itr-&gt;fltr_info;</div><div class='hunk'>@@ -1770,7 +1814,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)</div><div class='ctx'> 		ice_get_hw_vsi_num(hw, f_entry-&gt;fltr_info.vsi_handle);</div><div class='ctx'> 	new_fltr = &amp;f_entry-&gt;fltr_info;</div><div class='ctx'> </div><div class='del'>-	/* VLAN id should only be 12 bits */</div><div class='add'>+	/* VLAN ID should only be 12 bits */</div><div class='ctx'> 	if (new_fltr-&gt;l_data.vlan.vlan_id &gt; ICE_MAX_VLAN_ID)</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='ctx'> </div><div class='hunk'>@@ -1828,7 +1872,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (v_list_itr-&gt;vsi_list_info-&gt;ref_cnt == 1) {</div><div class='del'>-		/* Update existing VSI list to add new VSI id only if it used</div><div class='add'>+		/* Update existing VSI list to add new VSI ID only if it used</div><div class='ctx'> 		 * by one VLAN rule.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cur_fltr = &amp;v_list_itr-&gt;fltr_info;</div><div class='hunk'>@@ -1838,7 +1882,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)</div><div class='ctx'> 		/* If VLAN rule exists and VSI list being used by this rule is</div><div class='ctx'> 		 * referenced by more than 1 VLAN rule. Then create a new VSI</div><div class='ctx'> 		 * list appending previous VSI with new VSI and update existing</div><div class='del'>-		 * VLAN rule to point to new VSI list id</div><div class='add'>+		 * VLAN rule to point to new VSI list ID</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct ice_fltr_info tmp_fltr;</div><div class='ctx'> 		u16 vsi_handle_arr[2];</div><div class='hunk'>@@ -1926,6 +1970,65 @@ ice_add_vlan(struct ice_hw *hw, struct list_head *v_list)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_add_eth_mac - Add ethertype and MAC based filter rule</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @em_list: list of ether type MAC filter, MAC is optional</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_add_eth_mac(struct ice_hw *hw, struct list_head *em_list)</div><div class='add'>+{</div><div class='add'>+	struct ice_fltr_list_entry *em_list_itr;</div><div class='add'>+</div><div class='add'>+	if (!em_list || !hw)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(em_list_itr, em_list, list_entry) {</div><div class='add'>+		enum ice_sw_lkup_type l_type =</div><div class='add'>+			em_list_itr-&gt;fltr_info.lkup_type;</div><div class='add'>+</div><div class='add'>+		if (l_type != ICE_SW_LKUP_ETHERTYPE_MAC &amp;&amp;</div><div class='add'>+		    l_type != ICE_SW_LKUP_ETHERTYPE)</div><div class='add'>+			return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+		em_list_itr-&gt;fltr_info.flag = ICE_FLTR_TX;</div><div class='add'>+		em_list_itr-&gt;status = ice_add_rule_internal(hw, l_type,</div><div class='add'>+							    em_list_itr);</div><div class='add'>+		if (em_list_itr-&gt;status)</div><div class='add'>+			return em_list_itr-&gt;status;</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'>+ * ice_remove_eth_mac - Remove an ethertype (or MAC) based filter rule</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @em_list: list of ethertype or ethertype MAC entries</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_remove_eth_mac(struct ice_hw *hw, struct list_head *em_list)</div><div class='add'>+{</div><div class='add'>+	struct ice_fltr_list_entry *em_list_itr, *tmp;</div><div class='add'>+</div><div class='add'>+	if (!em_list || !hw)</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(em_list_itr, tmp, em_list, list_entry) {</div><div class='add'>+		enum ice_sw_lkup_type l_type =</div><div class='add'>+			em_list_itr-&gt;fltr_info.lkup_type;</div><div class='add'>+</div><div class='add'>+		if (l_type != ICE_SW_LKUP_ETHERTYPE_MAC &amp;&amp;</div><div class='add'>+		    l_type != ICE_SW_LKUP_ETHERTYPE)</div><div class='add'>+			return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+		em_list_itr-&gt;status = ice_remove_rule_internal(hw, l_type,</div><div class='add'>+							       em_list_itr);</div><div class='add'>+		if (em_list_itr-&gt;status)</div><div class='add'>+			return em_list_itr-&gt;status;</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'>  * ice_rem_sw_rule_info</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @rule_head: pointer to the switch list structure that we want to delete</div><div class='hunk'>@@ -2170,7 +2273,7 @@ ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16 vsi_handle,</div><div class='ctx'> 	struct ice_fltr_mgmt_list_entry *fm_entry;</div><div class='ctx'> 	enum ice_status status = 0;</div><div class='ctx'> </div><div class='del'>-	/* check to make sure VSI id is valid and within boundary */</div><div class='add'>+	/* check to make sure VSI ID is valid and within boundary */</div><div class='ctx'> 	if (!ice_is_vsi_valid(hw, vsi_handle))</div><div class='ctx'> 		return ICE_ERR_PARAM;</div><div class='ctx'> </div><div class='hunk'>@@ -2190,6 +2293,291 @@ ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16 vsi_handle,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_determine_promisc_mask</div><div class='add'>+ * @fi: filter info to parse</div><div class='add'>+ *</div><div class='add'>+ * Helper function to determine which ICE_PROMISC_ mask corresponds</div><div class='add'>+ * to given filter into.</div><div class='add'>+ */</div><div class='add'>+static u8 ice_determine_promisc_mask(struct ice_fltr_info *fi)</div><div class='add'>+{</div><div class='add'>+	u16 vid = fi-&gt;l_data.mac_vlan.vlan_id;</div><div class='add'>+	u8 *macaddr = fi-&gt;l_data.mac.mac_addr;</div><div class='add'>+	bool is_tx_fltr = false;</div><div class='add'>+	u8 promisc_mask = 0;</div><div class='add'>+</div><div class='add'>+	if (fi-&gt;flag == ICE_FLTR_TX)</div><div class='add'>+		is_tx_fltr = true;</div><div class='add'>+</div><div class='add'>+	if (is_broadcast_ether_addr(macaddr))</div><div class='add'>+		promisc_mask |= is_tx_fltr ?</div><div class='add'>+			ICE_PROMISC_BCAST_TX : ICE_PROMISC_BCAST_RX;</div><div class='add'>+	else if (is_multicast_ether_addr(macaddr))</div><div class='add'>+		promisc_mask |= is_tx_fltr ?</div><div class='add'>+			ICE_PROMISC_MCAST_TX : ICE_PROMISC_MCAST_RX;</div><div class='add'>+	else if (is_unicast_ether_addr(macaddr))</div><div class='add'>+		promisc_mask |= is_tx_fltr ?</div><div class='add'>+			ICE_PROMISC_UCAST_TX : ICE_PROMISC_UCAST_RX;</div><div class='add'>+	if (vid)</div><div class='add'>+		promisc_mask |= is_tx_fltr ?</div><div class='add'>+			ICE_PROMISC_VLAN_TX : ICE_PROMISC_VLAN_RX;</div><div class='add'>+</div><div class='add'>+	return promisc_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_remove_promisc - Remove promisc based filter rules</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @recp_id: recipe ID for which the rule needs to removed</div><div class='add'>+ * @v_list: list of promisc entries</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_remove_promisc(struct ice_hw *hw, u8 recp_id,</div><div class='add'>+		   struct list_head *v_list)</div><div class='add'>+{</div><div class='add'>+	struct ice_fltr_list_entry *v_list_itr, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(v_list_itr, tmp, v_list, list_entry) {</div><div class='add'>+		v_list_itr-&gt;status =</div><div class='add'>+			ice_remove_rule_internal(hw, recp_id, v_list_itr);</div><div class='add'>+		if (v_list_itr-&gt;status)</div><div class='add'>+			return v_list_itr-&gt;status;</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'>+ * ice_clear_vsi_promisc - clear specified promiscuous mode(s) for given VSI</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @vsi_handle: VSI handle to clear mode</div><div class='add'>+ * @promisc_mask: mask of promiscuous config bits to clear</div><div class='add'>+ * @vid: VLAN ID to clear VLAN promiscuous</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_clear_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,</div><div class='add'>+		      u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ice_switch_info *sw = hw-&gt;switch_info;</div><div class='add'>+	struct ice_fltr_list_entry *fm_entry, *tmp;</div><div class='add'>+	struct list_head remove_list_head;</div><div class='add'>+	struct ice_fltr_mgmt_list_entry *itr;</div><div class='add'>+	struct list_head *rule_head;</div><div class='add'>+	struct mutex *rule_lock;	/* Lock to protect filter rule list */</div><div class='add'>+	enum ice_status status = 0;</div><div class='add'>+	u8 recipe_id;</div><div class='add'>+</div><div class='add'>+	if (!ice_is_vsi_valid(hw, vsi_handle))</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+</div><div class='add'>+	if (vid)</div><div class='add'>+		recipe_id = ICE_SW_LKUP_PROMISC_VLAN;</div><div class='add'>+	else</div><div class='add'>+		recipe_id = ICE_SW_LKUP_PROMISC;</div><div class='add'>+</div><div class='add'>+	rule_head = &amp;sw-&gt;recp_list[recipe_id].filt_rules;</div><div class='add'>+	rule_lock = &amp;sw-&gt;recp_list[recipe_id].filt_rule_lock;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;remove_list_head);</div><div class='add'>+</div><div class='add'>+	mutex_lock(rule_lock);</div><div class='add'>+	list_for_each_entry(itr, rule_head, list_entry) {</div><div class='add'>+		u8 fltr_promisc_mask = 0;</div><div class='add'>+</div><div class='add'>+		if (!ice_vsi_uses_fltr(itr, vsi_handle))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fltr_promisc_mask |=</div><div class='add'>+			ice_determine_promisc_mask(&amp;itr-&gt;fltr_info);</div><div class='add'>+</div><div class='add'>+		/* Skip if filter is not completely specified by given mask */</div><div class='add'>+		if (fltr_promisc_mask &amp; ~promisc_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		status = ice_add_entry_to_vsi_fltr_list(hw, vsi_handle,</div><div class='add'>+							&amp;remove_list_head,</div><div class='add'>+							&amp;itr-&gt;fltr_info);</div><div class='add'>+		if (status) {</div><div class='add'>+			mutex_unlock(rule_lock);</div><div class='add'>+			goto free_fltr_list;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(rule_lock);</div><div class='add'>+</div><div class='add'>+	status = ice_remove_promisc(hw, recipe_id, &amp;remove_list_head);</div><div class='add'>+</div><div class='add'>+free_fltr_list:</div><div class='add'>+	list_for_each_entry_safe(fm_entry, tmp, &amp;remove_list_head, list_entry) {</div><div class='add'>+		list_del(&amp;fm_entry-&gt;list_entry);</div><div class='add'>+		devm_kfree(ice_hw_to_dev(hw), fm_entry);</div><div class='add'>+	}</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'>+ * ice_set_vsi_promisc - set given VSI to given promiscuous mode(s)</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @vsi_handle: VSI handle to configure</div><div class='add'>+ * @promisc_mask: mask of promiscuous config bits</div><div class='add'>+ * @vid: VLAN ID to set VLAN promiscuous</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_set_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, u16 vid)</div><div class='add'>+{</div><div class='add'>+	enum { UCAST_FLTR = 1, MCAST_FLTR, BCAST_FLTR };</div><div class='add'>+	struct ice_fltr_list_entry f_list_entry;</div><div class='add'>+	struct ice_fltr_info new_fltr;</div><div class='add'>+	enum ice_status status = 0;</div><div class='add'>+	bool is_tx_fltr;</div><div class='add'>+	u16 hw_vsi_id;</div><div class='add'>+	int pkt_type;</div><div class='add'>+	u8 recipe_id;</div><div class='add'>+</div><div class='add'>+	if (!ice_is_vsi_valid(hw, vsi_handle))</div><div class='add'>+		return ICE_ERR_PARAM;</div><div class='add'>+	hw_vsi_id = ice_get_hw_vsi_num(hw, vsi_handle);</div><div class='add'>+</div><div class='add'>+	memset(&amp;new_fltr, 0, sizeof(new_fltr));</div><div class='add'>+</div><div class='add'>+	if (promisc_mask &amp; (ICE_PROMISC_VLAN_RX | ICE_PROMISC_VLAN_TX)) {</div><div class='add'>+		new_fltr.lkup_type = ICE_SW_LKUP_PROMISC_VLAN;</div><div class='add'>+		new_fltr.l_data.mac_vlan.vlan_id = vid;</div><div class='add'>+		recipe_id = ICE_SW_LKUP_PROMISC_VLAN;</div><div class='add'>+	} else {</div><div class='add'>+		new_fltr.lkup_type = ICE_SW_LKUP_PROMISC;</div><div class='add'>+		recipe_id = ICE_SW_LKUP_PROMISC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Separate filters must be set for each direction/packet type</div><div class='add'>+	 * combination, so we will loop over the mask value, store the</div><div class='add'>+	 * individual type, and clear it out in the input mask as it</div><div class='add'>+	 * is found.</div><div class='add'>+	 */</div><div class='add'>+	while (promisc_mask) {</div><div class='add'>+		u8 *mac_addr;</div><div class='add'>+</div><div class='add'>+		pkt_type = 0;</div><div class='add'>+		is_tx_fltr = false;</div><div class='add'>+</div><div class='add'>+		if (promisc_mask &amp; ICE_PROMISC_UCAST_RX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_UCAST_RX;</div><div class='add'>+			pkt_type = UCAST_FLTR;</div><div class='add'>+		} else if (promisc_mask &amp; ICE_PROMISC_UCAST_TX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_UCAST_TX;</div><div class='add'>+			pkt_type = UCAST_FLTR;</div><div class='add'>+			is_tx_fltr = true;</div><div class='add'>+		} else if (promisc_mask &amp; ICE_PROMISC_MCAST_RX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_MCAST_RX;</div><div class='add'>+			pkt_type = MCAST_FLTR;</div><div class='add'>+		} else if (promisc_mask &amp; ICE_PROMISC_MCAST_TX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_MCAST_TX;</div><div class='add'>+			pkt_type = MCAST_FLTR;</div><div class='add'>+			is_tx_fltr = true;</div><div class='add'>+		} else if (promisc_mask &amp; ICE_PROMISC_BCAST_RX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_BCAST_RX;</div><div class='add'>+			pkt_type = BCAST_FLTR;</div><div class='add'>+		} else if (promisc_mask &amp; ICE_PROMISC_BCAST_TX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_BCAST_TX;</div><div class='add'>+			pkt_type = BCAST_FLTR;</div><div class='add'>+			is_tx_fltr = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for VLAN promiscuous flag */</div><div class='add'>+		if (promisc_mask &amp; ICE_PROMISC_VLAN_RX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_VLAN_RX;</div><div class='add'>+		} else if (promisc_mask &amp; ICE_PROMISC_VLAN_TX) {</div><div class='add'>+			promisc_mask &amp;= ~ICE_PROMISC_VLAN_TX;</div><div class='add'>+			is_tx_fltr = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set filter DA based on packet type */</div><div class='add'>+		mac_addr = new_fltr.l_data.mac.mac_addr;</div><div class='add'>+		if (pkt_type == BCAST_FLTR) {</div><div class='add'>+			eth_broadcast_addr(mac_addr);</div><div class='add'>+		} else if (pkt_type == MCAST_FLTR ||</div><div class='add'>+			   pkt_type == UCAST_FLTR) {</div><div class='add'>+			/* Use the dummy ether header DA */</div><div class='add'>+			ether_addr_copy(mac_addr, dummy_eth_header);</div><div class='add'>+			if (pkt_type == MCAST_FLTR)</div><div class='add'>+				mac_addr[0] |= 0x1;	/* Set multicast bit */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Need to reset this to zero for all iterations */</div><div class='add'>+		new_fltr.flag = 0;</div><div class='add'>+		if (is_tx_fltr) {</div><div class='add'>+			new_fltr.flag |= ICE_FLTR_TX;</div><div class='add'>+			new_fltr.src = hw_vsi_id;</div><div class='add'>+		} else {</div><div class='add'>+			new_fltr.flag |= ICE_FLTR_RX;</div><div class='add'>+			new_fltr.src = hw-&gt;port_info-&gt;lport;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		new_fltr.fltr_act = ICE_FWD_TO_VSI;</div><div class='add'>+		new_fltr.vsi_handle = vsi_handle;</div><div class='add'>+		new_fltr.fwd_id.hw_vsi_id = hw_vsi_id;</div><div class='add'>+		f_list_entry.fltr_info = new_fltr;</div><div class='add'>+</div><div class='add'>+		status = ice_add_rule_internal(hw, recipe_id, &amp;f_list_entry);</div><div class='add'>+		if (status)</div><div class='add'>+			goto set_promisc_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+set_promisc_exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_set_vlan_vsi_promisc</div><div class='add'>+ * @hw: pointer to the hardware structure</div><div class='add'>+ * @vsi_handle: VSI handle to configure</div><div class='add'>+ * @promisc_mask: mask of promiscuous config bits</div><div class='add'>+ * @rm_vlan_promisc: Clear VLANs VSI promisc mode</div><div class='add'>+ *</div><div class='add'>+ * Configure VSI with all associated VLANs to given promiscuous mode(s)</div><div class='add'>+ */</div><div class='add'>+enum ice_status</div><div class='add'>+ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,</div><div class='add'>+			 bool rm_vlan_promisc)</div><div class='add'>+{</div><div class='add'>+	struct ice_switch_info *sw = hw-&gt;switch_info;</div><div class='add'>+	struct ice_fltr_list_entry *list_itr, *tmp;</div><div class='add'>+	struct list_head vsi_list_head;</div><div class='add'>+	struct list_head *vlan_head;</div><div class='add'>+	struct mutex *vlan_lock; /* Lock to protect filter rule list */</div><div class='add'>+	enum ice_status status;</div><div class='add'>+	u16 vlan_id;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;vsi_list_head);</div><div class='add'>+	vlan_lock = &amp;sw-&gt;recp_list[ICE_SW_LKUP_VLAN].filt_rule_lock;</div><div class='add'>+	vlan_head = &amp;sw-&gt;recp_list[ICE_SW_LKUP_VLAN].filt_rules;</div><div class='add'>+	mutex_lock(vlan_lock);</div><div class='add'>+	status = ice_add_to_vsi_fltr_list(hw, vsi_handle, vlan_head,</div><div class='add'>+					  &amp;vsi_list_head);</div><div class='add'>+	mutex_unlock(vlan_lock);</div><div class='add'>+	if (status)</div><div class='add'>+		goto free_fltr_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(list_itr, &amp;vsi_list_head, list_entry) {</div><div class='add'>+		vlan_id = list_itr-&gt;fltr_info.l_data.vlan.vlan_id;</div><div class='add'>+		if (rm_vlan_promisc)</div><div class='add'>+			status = ice_clear_vsi_promisc(hw, vsi_handle,</div><div class='add'>+						       promisc_mask, vlan_id);</div><div class='add'>+		else</div><div class='add'>+			status = ice_set_vsi_promisc(hw, vsi_handle,</div><div class='add'>+						     promisc_mask, vlan_id);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_fltr_list:</div><div class='add'>+	list_for_each_entry_safe(list_itr, tmp, &amp;vsi_list_head, list_entry) {</div><div class='add'>+		list_del(&amp;list_itr-&gt;list_entry);</div><div class='add'>+		devm_kfree(ice_hw_to_dev(hw), list_itr);</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='ctx'>  * ice_remove_vsi_lkup_fltr - Remove lookup type filters for a VSI</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @vsi_handle: VSI handle to remove filters from</div><div class='hunk'>@@ -2224,12 +2612,14 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle,</div><div class='ctx'> 	case ICE_SW_LKUP_VLAN:</div><div class='ctx'> 		ice_remove_vlan(hw, &amp;remove_list_head);</div><div class='ctx'> 		break;</div><div class='add'>+	case ICE_SW_LKUP_PROMISC:</div><div class='add'>+	case ICE_SW_LKUP_PROMISC_VLAN:</div><div class='add'>+		ice_remove_promisc(hw, lkup, &amp;remove_list_head);</div><div class='add'>+		break;</div><div class='ctx'> 	case ICE_SW_LKUP_MAC_VLAN:</div><div class='ctx'> 	case ICE_SW_LKUP_ETHERTYPE:</div><div class='ctx'> 	case ICE_SW_LKUP_ETHERTYPE_MAC:</div><div class='del'>-	case ICE_SW_LKUP_PROMISC:</div><div class='ctx'> 	case ICE_SW_LKUP_DFLT:</div><div class='del'>-	case ICE_SW_LKUP_PROMISC_VLAN:</div><div class='ctx'> 	case ICE_SW_LKUP_LAST:</div><div class='ctx'> 	default:</div><div class='ctx'> 		ice_debug(hw, ICE_DBG_SW, "Unsupported lookup type %d\n", lkup);</div><div class='hunk'>@@ -2263,7 +2653,7 @@ void ice_remove_vsi_fltr(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'>  * ice_replay_vsi_fltr - Replay filters for requested VSI</div><div class='ctx'>  * @hw: pointer to the hardware structure</div><div class='ctx'>  * @vsi_handle: driver VSI handle</div><div class='del'>- * @recp_id: Recipe id for which rules need to be replayed</div><div class='add'>+ * @recp_id: Recipe ID for which rules need to be replayed</div><div class='ctx'>  * @list_head: list for which filters need to be replayed</div><div class='ctx'>  *</div><div class='ctx'>  * Replays the filter of recipe recp_id for a VSI represented via vsi_handle.</div><div class='hunk'>@@ -2287,7 +2677,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,</div><div class='ctx'> 		f_entry.fltr_info = itr-&gt;fltr_info;</div><div class='ctx'> 		if (itr-&gt;vsi_count &lt; 2 &amp;&amp; recp_id != ICE_SW_LKUP_VLAN &amp;&amp;</div><div class='ctx'> 		    itr-&gt;fltr_info.vsi_handle == vsi_handle) {</div><div class='del'>-			/* update the src in case it is vsi num */</div><div class='add'>+			/* update the src in case it is VSI num */</div><div class='ctx'> 			if (f_entry.fltr_info.src_id == ICE_SRC_ID_VSI)</div><div class='ctx'> 				f_entry.fltr_info.src = hw_vsi_id;</div><div class='ctx'> 			status = ice_add_rule_internal(hw, recp_id, &amp;f_entry);</div><div class='hunk'>@@ -2302,7 +2692,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,</div><div class='ctx'> 		clear_bit(vsi_handle, itr-&gt;vsi_list_info-&gt;vsi_map);</div><div class='ctx'> 		f_entry.fltr_info.vsi_handle = vsi_handle;</div><div class='ctx'> 		f_entry.fltr_info.fltr_act = ICE_FWD_TO_VSI;</div><div class='del'>-		/* update the src in case it is vsi num */</div><div class='add'>+		/* update the src in case it is VSI num */</div><div class='ctx'> 		if (f_entry.fltr_info.src_id == ICE_SRC_ID_VSI)</div><div class='ctx'> 			f_entry.fltr_info.src = hw_vsi_id;</div><div class='ctx'> 		if (recp_id == ICE_SW_LKUP_VLAN)</div><div class='hunk'>@@ -2342,7 +2732,7 @@ enum ice_status ice_replay_vsi_all_fltr(struct ice_hw *hw, u16 vsi_handle)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_rm_all_sw_replay_rule_info - deletes filter replay rules</div><div class='del'>- * @hw: pointer to the hw struct</div><div class='add'>+ * @hw: pointer to the HW struct</div><div class='ctx'>  *</div><div class='ctx'>  * Deletes the filter replay rules.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_switch.h b/drivers/net/ethernet/intel/ice/ice_switch.h<br/>index d5ef0bd58bf9..732b0b9b2e15 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_switch.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_switch.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_switch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_switch.h</a></div><div class='hunk'>@@ -9,6 +9,13 @@</div><div class='ctx'> #define ICE_SW_CFG_MAX_BUF_LEN 2048</div><div class='ctx'> #define ICE_DFLT_VSI_INVAL 0xff</div><div class='ctx'> #define ICE_VSI_INVAL_ID 0xffff</div><div class='add'>+#define ICE_INVAL_Q_HANDLE 0xFFFF</div><div class='add'>+#define ICE_INVAL_Q_HANDLE 0xFFFF</div><div class='add'>+</div><div class='add'>+/* VSI queue context structure */</div><div class='add'>+struct ice_q_ctx {</div><div class='add'>+	u16  q_handle;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* VSI context structure for add/get/update/free operations */</div><div class='ctx'> struct ice_vsi_ctx {</div><div class='hunk'>@@ -20,6 +27,8 @@ struct ice_vsi_ctx {</div><div class='ctx'> 	struct ice_sched_vsi_info sched;</div><div class='ctx'> 	u8 alloc_from_pool;</div><div class='ctx'> 	u8 vf_num;</div><div class='add'>+	u16 num_lan_q_entries[ICE_MAX_TRAFFIC_CLASS];</div><div class='add'>+	struct ice_q_ctx *lan_q_ctx[ICE_MAX_TRAFFIC_CLASS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ice_sw_fwd_act_type {</div><div class='hunk'>@@ -44,7 +53,7 @@ enum ice_sw_lkup_type {</div><div class='ctx'> 	ICE_SW_LKUP_LAST</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* type of filter src id */</div><div class='add'>+/* type of filter src ID */</div><div class='ctx'> enum ice_src_id {</div><div class='ctx'> 	ICE_SRC_ID_UNKNOWN = 0,</div><div class='ctx'> 	ICE_SRC_ID_VSI,</div><div class='hunk'>@@ -95,8 +104,8 @@ struct ice_fltr_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Depending on filter action */</div><div class='ctx'> 	union {</div><div class='del'>-		/* queue id in case of ICE_FWD_TO_Q and starting</div><div class='del'>-		 * queue id in case of ICE_FWD_TO_QGRP.</div><div class='add'>+		/* queue ID in case of ICE_FWD_TO_Q and starting</div><div class='add'>+		 * queue ID in case of ICE_FWD_TO_QGRP.</div><div class='ctx'> 		 */</div><div class='ctx'> 		u16 q_id:11;</div><div class='ctx'> 		u16 hw_vsi_id:10;</div><div class='hunk'>@@ -143,7 +152,7 @@ struct ice_sw_recipe {</div><div class='ctx'> 	DECLARE_BITMAP(r_bitmap, ICE_MAX_NUM_RECIPES);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list id */</div><div class='add'>+/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list ID */</div><div class='ctx'> struct ice_vsi_list_map_info {</div><div class='ctx'> 	struct list_head list_entry;</div><div class='ctx'> 	DECLARE_BITMAP(vsi_map, ICE_MAX_VSI);</div><div class='hunk'>@@ -165,7 +174,7 @@ struct ice_fltr_list_entry {</div><div class='ctx'>  * used for VLAN membership.</div><div class='ctx'>  */</div><div class='ctx'> struct ice_fltr_mgmt_list_entry {</div><div class='del'>-	/* back pointer to VSI list id to VSI list mapping */</div><div class='add'>+	/* back pointer to VSI list ID to VSI list mapping */</div><div class='ctx'> 	struct ice_vsi_list_map_info *vsi_list_info;</div><div class='ctx'> 	u16 vsi_count;</div><div class='ctx'> #define ICE_INVAL_LG_ACT_INDEX 0xffff</div><div class='hunk'>@@ -178,6 +187,17 @@ struct ice_fltr_mgmt_list_entry {</div><div class='ctx'> 	u8 counter_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ice_promisc_flags {</div><div class='add'>+	ICE_PROMISC_UCAST_RX = 0x1,</div><div class='add'>+	ICE_PROMISC_UCAST_TX = 0x2,</div><div class='add'>+	ICE_PROMISC_MCAST_RX = 0x4,</div><div class='add'>+	ICE_PROMISC_MCAST_TX = 0x8,</div><div class='add'>+	ICE_PROMISC_BCAST_RX = 0x10,</div><div class='add'>+	ICE_PROMISC_BCAST_TX = 0x20,</div><div class='add'>+	ICE_PROMISC_VLAN_RX = 0x40,</div><div class='add'>+	ICE_PROMISC_VLAN_TX = 0x80,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* VSI related commands */</div><div class='ctx'> enum ice_status</div><div class='ctx'> ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,</div><div class='hunk'>@@ -198,11 +218,27 @@ enum ice_status ice_get_initial_sw_cfg(struct ice_hw *hw);</div><div class='ctx'> enum ice_status ice_update_sw_rule_bridge_mode(struct ice_hw *hw);</div><div class='ctx'> enum ice_status ice_add_mac(struct ice_hw *hw, struct list_head *m_lst);</div><div class='ctx'> enum ice_status ice_remove_mac(struct ice_hw *hw, struct list_head *m_lst);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_add_eth_mac(struct ice_hw *hw, struct list_head *em_list);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_remove_eth_mac(struct ice_hw *hw, struct list_head *em_list);</div><div class='ctx'> void ice_remove_vsi_fltr(struct ice_hw *hw, u16 vsi_handle);</div><div class='del'>-enum ice_status ice_add_vlan(struct ice_hw *hw, struct list_head *m_list);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_add_vlan(struct ice_hw *hw, struct list_head *m_list);</div><div class='ctx'> enum ice_status ice_remove_vlan(struct ice_hw *hw, struct list_head *v_list);</div><div class='add'>+</div><div class='add'>+/* Promisc/defport setup for VSIs */</div><div class='ctx'> enum ice_status</div><div class='ctx'> ice_cfg_dflt_vsi(struct ice_hw *hw, u16 vsi_handle, bool set, u8 direction);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_set_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,</div><div class='add'>+		    u16 vid);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_clear_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,</div><div class='add'>+		      u16 vid);</div><div class='add'>+enum ice_status</div><div class='add'>+ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,</div><div class='add'>+			 bool rm_vlan_promisc);</div><div class='ctx'> </div><div class='ctx'> enum ice_status ice_init_def_sw_recp(struct ice_hw *hw);</div><div class='ctx'> u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c<br/>index c289d97f477d..2364eaf33d23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_txrx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_txrx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_txrx.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include "ice.h"</div><div class='add'>+#include "ice_dcb_lib.h"</div><div class='ctx'> </div><div class='ctx'> #define ICE_RX_HDR_SIZE		256</div><div class='ctx'> </div><div class='hunk'>@@ -100,8 +101,8 @@ void ice_free_tx_ring(struct ice_ring *tx_ring)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if there's any budget left (e.g. the clean is finished)</div><div class='ctx'>  */</div><div class='del'>-static bool ice_clean_tx_irq(struct ice_vsi *vsi, struct ice_ring *tx_ring,</div><div class='del'>-			     int napi_budget)</div><div class='add'>+static bool</div><div class='add'>+ice_clean_tx_irq(struct ice_vsi *vsi, struct ice_ring *tx_ring, int napi_budget)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int total_bytes = 0, total_pkts = 0;</div><div class='ctx'> 	unsigned int budget = vsi-&gt;work_lmt;</div><div class='hunk'>@@ -236,9 +237,9 @@ int ice_setup_tx_ring(struct ice_ring *tx_ring)</div><div class='ctx'> 	if (!tx_ring-&gt;tx_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* round up to nearest 4K */</div><div class='add'>+	/* round up to nearest page */</div><div class='ctx'> 	tx_ring-&gt;size = ALIGN(tx_ring-&gt;count * sizeof(struct ice_tx_desc),</div><div class='del'>-			      4096);</div><div class='add'>+			      PAGE_SIZE);</div><div class='ctx'> 	tx_ring-&gt;desc = dmam_alloc_coherent(dev, tx_ring-&gt;size, &amp;tx_ring-&gt;dma,</div><div class='ctx'> 					    GFP_KERNEL);</div><div class='ctx'> 	if (!tx_ring-&gt;desc) {</div><div class='hunk'>@@ -282,8 +283,17 @@ void ice_clean_rx_ring(struct ice_ring *rx_ring)</div><div class='ctx'> 		if (!rx_buf-&gt;page)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page(dev, rx_buf-&gt;dma, PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-		__free_pages(rx_buf-&gt;page, 0);</div><div class='add'>+		/* Invalidate cache lines that may have been written to by</div><div class='add'>+		 * device so that we avoid corrupting memory.</div><div class='add'>+		 */</div><div class='add'>+		dma_sync_single_range_for_cpu(dev, rx_buf-&gt;dma,</div><div class='add'>+					      rx_buf-&gt;page_offset,</div><div class='add'>+					      ICE_RXBUF_2048, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		/* free resources associated with mapping */</div><div class='add'>+		dma_unmap_page_attrs(dev, rx_buf-&gt;dma, PAGE_SIZE,</div><div class='add'>+				     DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);</div><div class='add'>+		__page_frag_cache_drain(rx_buf-&gt;page, rx_buf-&gt;pagecnt_bias);</div><div class='ctx'> </div><div class='ctx'> 		rx_buf-&gt;page = NULL;</div><div class='ctx'> 		rx_buf-&gt;page_offset = 0;</div><div class='hunk'>@@ -339,9 +349,9 @@ int ice_setup_rx_ring(struct ice_ring *rx_ring)</div><div class='ctx'> 	if (!rx_ring-&gt;rx_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* round up to nearest 4K */</div><div class='del'>-	rx_ring-&gt;size = rx_ring-&gt;count * sizeof(union ice_32byte_rx_desc);</div><div class='del'>-	rx_ring-&gt;size = ALIGN(rx_ring-&gt;size, 4096);</div><div class='add'>+	/* round up to nearest page */</div><div class='add'>+	rx_ring-&gt;size = ALIGN(rx_ring-&gt;count * sizeof(union ice_32byte_rx_desc),</div><div class='add'>+			      PAGE_SIZE);</div><div class='ctx'> 	rx_ring-&gt;desc = dmam_alloc_coherent(dev, rx_ring-&gt;size, &amp;rx_ring-&gt;dma,</div><div class='ctx'> 					    GFP_KERNEL);</div><div class='ctx'> 	if (!rx_ring-&gt;desc) {</div><div class='hunk'>@@ -389,8 +399,8 @@ static void ice_release_rx_desc(struct ice_ring *rx_ring, u32 val)</div><div class='ctx'>  * Returns true if the page was successfully allocated or</div><div class='ctx'>  * reused.</div><div class='ctx'>  */</div><div class='del'>-static bool ice_alloc_mapped_page(struct ice_ring *rx_ring,</div><div class='del'>-				  struct ice_rx_buf *bi)</div><div class='add'>+static bool</div><div class='add'>+ice_alloc_mapped_page(struct ice_ring *rx_ring, struct ice_rx_buf *bi)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = bi-&gt;page;</div><div class='ctx'> 	dma_addr_t dma;</div><div class='hunk'>@@ -409,7 +419,8 @@ static bool ice_alloc_mapped_page(struct ice_ring *rx_ring,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* map page for use */</div><div class='del'>-	dma = dma_map_page(rx_ring-&gt;dev, page, 0, PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+	dma = dma_map_page_attrs(rx_ring-&gt;dev, page, 0, PAGE_SIZE,</div><div class='add'>+				 DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);</div><div class='ctx'> </div><div class='ctx'> 	/* if mapping failed free memory back to system since</div><div class='ctx'> 	 * there isn't much point in holding memory we can't use</div><div class='hunk'>@@ -423,6 +434,8 @@ static bool ice_alloc_mapped_page(struct ice_ring *rx_ring,</div><div class='ctx'> 	bi-&gt;dma = dma;</div><div class='ctx'> 	bi-&gt;page = page;</div><div class='ctx'> 	bi-&gt;page_offset = 0;</div><div class='add'>+	page_ref_add(page, USHRT_MAX - 1);</div><div class='add'>+	bi-&gt;pagecnt_bias = USHRT_MAX;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -444,7 +457,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)</div><div class='ctx'> 	if (!rx_ring-&gt;netdev || !cleaned_count)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/* get the RX descriptor and buffer based on next_to_use */</div><div class='add'>+	/* get the Rx descriptor and buffer based on next_to_use */</div><div class='ctx'> 	rx_desc = ICE_RX_DESC(rx_ring, ntu);</div><div class='ctx'> 	bi = &amp;rx_ring-&gt;rx_buf[ntu];</div><div class='ctx'> </div><div class='hunk'>@@ -452,6 +465,12 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)</div><div class='ctx'> 		if (!ice_alloc_mapped_page(rx_ring, bi))</div><div class='ctx'> 			goto no_bufs;</div><div class='ctx'> </div><div class='add'>+		/* sync the buffer for use by the device */</div><div class='add'>+		dma_sync_single_range_for_device(rx_ring-&gt;dev, bi-&gt;dma,</div><div class='add'>+						 bi-&gt;page_offset,</div><div class='add'>+						 ICE_RXBUF_2048,</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='ctx'> 		/* Refresh the desc even if buffer_addrs didn't change</div><div class='ctx'> 		 * because each write-back erases this info.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -497,61 +516,43 @@ static bool ice_page_is_reserved(struct page *page)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_add_rx_frag - Add contents of Rx buffer to sk_buff</div><div class='del'>- * @rx_buf: buffer containing page to add</div><div class='del'>- * @rx_desc: descriptor containing length of buffer written by hardware</div><div class='del'>- * @skb: sk_buf to place the data into</div><div class='del'>- *</div><div class='del'>- * This function will add the data contained in rx_buf-&gt;page to the skb.</div><div class='del'>- * This is done either through a direct copy if the data in the buffer is</div><div class='del'>- * less than the skb header size, otherwise it will just attach the page as</div><div class='del'>- * a frag to the skb.</div><div class='add'>+ * ice_rx_buf_adjust_pg_offset - Prepare Rx buffer for reuse</div><div class='add'>+ * @rx_buf: Rx buffer to adjust</div><div class='add'>+ * @size: Size of adjustment</div><div class='ctx'>  *</div><div class='del'>- * The function will then update the page offset if necessary and return</div><div class='del'>- * true if the buffer can be reused by the adapter.</div><div class='add'>+ * Update the offset within page so that Rx buf will be ready to be reused.</div><div class='add'>+ * For systems with PAGE_SIZE &lt; 8192 this function will flip the page offset</div><div class='add'>+ * so the second half of page assigned to Rx buffer will be used, otherwise</div><div class='add'>+ * the offset is moved by the @size bytes</div><div class='ctx'>  */</div><div class='del'>-static bool ice_add_rx_frag(struct ice_rx_buf *rx_buf,</div><div class='del'>-			    union ice_32b_rx_flex_desc *rx_desc,</div><div class='del'>-			    struct sk_buff *skb)</div><div class='add'>+static void</div><div class='add'>+ice_rx_buf_adjust_pg_offset(struct ice_rx_buf *rx_buf, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> #if (PAGE_SIZE &lt; 8192)</div><div class='del'>-	unsigned int truesize = ICE_RXBUF_2048;</div><div class='add'>+	/* flip page offset to other buffer */</div><div class='add'>+	rx_buf-&gt;page_offset ^= size;</div><div class='ctx'> #else</div><div class='del'>-	unsigned int last_offset = PAGE_SIZE - ICE_RXBUF_2048;</div><div class='del'>-	unsigned int truesize;</div><div class='del'>-#endif /* PAGE_SIZE &lt; 8192) */</div><div class='del'>-</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned int size;</div><div class='del'>-</div><div class='del'>-	size = le16_to_cpu(rx_desc-&gt;wb.pkt_len) &amp;</div><div class='del'>-		ICE_RX_FLX_DESC_PKT_LEN_M;</div><div class='del'>-</div><div class='del'>-	page = rx_buf-&gt;page;</div><div class='add'>+	/* move offset up to the next cache line */</div><div class='add'>+	rx_buf-&gt;page_offset += size;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ice_can_reuse_rx_page - Determine if page can be reused for another Rx</div><div class='add'>+ * @rx_buf: buffer containing the page</div><div class='add'>+ *</div><div class='add'>+ * If page is reusable, we have a green light for calling ice_reuse_rx_page,</div><div class='add'>+ * which will assign the current buffer to the buffer that next_to_alloc is</div><div class='add'>+ * pointing to; otherwise, the DMA mapping needs to be destroyed and</div><div class='add'>+ * page freed</div><div class='add'>+ */</div><div class='add'>+static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf)</div><div class='add'>+{</div><div class='ctx'> #if (PAGE_SIZE &gt;= 8192)</div><div class='del'>-	truesize = ALIGN(size, L1_CACHE_BYTES);</div><div class='del'>-#endif /* PAGE_SIZE &gt;= 8192) */</div><div class='del'>-</div><div class='del'>-	/* will the data fit in the skb we allocated? if so, just</div><div class='del'>-	 * copy it as it is pretty small anyway</div><div class='del'>-	 */</div><div class='del'>-	if (size &lt;= ICE_RX_HDR_SIZE &amp;&amp; !skb_is_nonlinear(skb)) {</div><div class='del'>-		unsigned char *va = page_address(page) + rx_buf-&gt;page_offset;</div><div class='del'>-</div><div class='del'>-		memcpy(__skb_put(skb, size), va, ALIGN(size, sizeof(long)));</div><div class='del'>-</div><div class='del'>-		/* page is not reserved, we can reuse buffer as-is */</div><div class='del'>-		if (likely(!ice_page_is_reserved(page)))</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		/* this page cannot be reused so discard it */</div><div class='del'>-		__free_pages(page, 0);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags, page,</div><div class='del'>-			rx_buf-&gt;page_offset, size, truesize);</div><div class='add'>+	unsigned int last_offset = PAGE_SIZE - ICE_RXBUF_2048;</div><div class='add'>+#endif</div><div class='add'>+	unsigned int pagecnt_bias = rx_buf-&gt;pagecnt_bias;</div><div class='add'>+	struct page *page = rx_buf-&gt;page;</div><div class='ctx'> </div><div class='ctx'> 	/* avoid re-using remote pages */</div><div class='ctx'> 	if (unlikely(ice_page_is_reserved(page)))</div><div class='hunk'>@@ -559,36 +560,61 @@ static bool ice_add_rx_frag(struct ice_rx_buf *rx_buf,</div><div class='ctx'> </div><div class='ctx'> #if (PAGE_SIZE &lt; 8192)</div><div class='ctx'> 	/* if we are only owner of page we can reuse it */</div><div class='del'>-	if (unlikely(page_count(page) != 1))</div><div class='add'>+	if (unlikely((page_count(page) - pagecnt_bias) &gt; 1))</div><div class='ctx'> 		return false;</div><div class='del'>-</div><div class='del'>-	/* flip page offset to other buffer */</div><div class='del'>-	rx_buf-&gt;page_offset ^= truesize;</div><div class='ctx'> #else</div><div class='del'>-	/* move offset up to the next cache line */</div><div class='del'>-	rx_buf-&gt;page_offset += truesize;</div><div class='del'>-</div><div class='ctx'> 	if (rx_buf-&gt;page_offset &gt; last_offset)</div><div class='ctx'> 		return false;</div><div class='ctx'> #endif /* PAGE_SIZE &lt; 8192) */</div><div class='ctx'> </div><div class='del'>-	/* Even if we own the page, we are not allowed to use atomic_set()</div><div class='del'>-	 * This would break get_page_unless_zero() users.</div><div class='add'>+	/* If we have drained the page fragment pool we need to update</div><div class='add'>+	 * the pagecnt_bias and page count so that we fully restock the</div><div class='add'>+	 * number of references the driver holds.</div><div class='ctx'> 	 */</div><div class='del'>-	get_page(rx_buf-&gt;page);</div><div class='add'>+	if (unlikely(pagecnt_bias == 1)) {</div><div class='add'>+		page_ref_add(page, USHRT_MAX - 1);</div><div class='add'>+		rx_buf-&gt;pagecnt_bias = USHRT_MAX;</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='ctx'> /**</div><div class='add'>+ * ice_add_rx_frag - Add contents of Rx buffer to sk_buff as a frag</div><div class='add'>+ * @rx_buf: buffer containing page to add</div><div class='add'>+ * @skb: sk_buff to place the data into</div><div class='add'>+ * @size: packet length from rx_desc</div><div class='add'>+ *</div><div class='add'>+ * This function will add the data contained in rx_buf-&gt;page to the skb.</div><div class='add'>+ * It will just attach the page as a frag to the skb.</div><div class='add'>+ * The function will then update the page offset.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,</div><div class='add'>+		unsigned int size)</div><div class='add'>+{</div><div class='add'>+#if (PAGE_SIZE &gt;= 8192)</div><div class='add'>+	unsigned int truesize = SKB_DATA_ALIGN(size);</div><div class='add'>+#else</div><div class='add'>+	unsigned int truesize = ICE_RXBUF_2048;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags, rx_buf-&gt;page,</div><div class='add'>+			rx_buf-&gt;page_offset, size, truesize);</div><div class='add'>+</div><div class='add'>+	/* page is being used so we must update the page offset */</div><div class='add'>+	ice_rx_buf_adjust_pg_offset(rx_buf, truesize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_reuse_rx_page - page flip buffer and store it back on the ring</div><div class='ctx'>  * @rx_ring: Rx descriptor ring to store buffers on</div><div class='ctx'>  * @old_buf: donor buffer to have page reused</div><div class='ctx'>  *</div><div class='ctx'>  * Synchronizes page for reuse by the adapter</div><div class='ctx'>  */</div><div class='del'>-static void ice_reuse_rx_page(struct ice_ring *rx_ring,</div><div class='del'>-			      struct ice_rx_buf *old_buf)</div><div class='add'>+static void</div><div class='add'>+ice_reuse_rx_page(struct ice_ring *rx_ring, struct ice_rx_buf *old_buf)</div><div class='ctx'> {</div><div class='ctx'> 	u16 nta = rx_ring-&gt;next_to_alloc;</div><div class='ctx'> 	struct ice_rx_buf *new_buf;</div><div class='hunk'>@@ -599,121 +625,132 @@ static void ice_reuse_rx_page(struct ice_ring *rx_ring,</div><div class='ctx'> 	nta++;</div><div class='ctx'> 	rx_ring-&gt;next_to_alloc = (nta &lt; rx_ring-&gt;count) ? nta : 0;</div><div class='ctx'> </div><div class='del'>-	/* transfer page from old buffer to new buffer */</div><div class='del'>-	*new_buf = *old_buf;</div><div class='add'>+	/* Transfer page from old buffer to new buffer.</div><div class='add'>+	 * Move each member individually to avoid possible store</div><div class='add'>+	 * forwarding stalls and unnecessary copy of skb.</div><div class='add'>+	 */</div><div class='add'>+	new_buf-&gt;dma = old_buf-&gt;dma;</div><div class='add'>+	new_buf-&gt;page = old_buf-&gt;page;</div><div class='add'>+	new_buf-&gt;page_offset = old_buf-&gt;page_offset;</div><div class='add'>+	new_buf-&gt;pagecnt_bias = old_buf-&gt;pagecnt_bias;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_fetch_rx_buf - Allocate skb and populate it</div><div class='add'>+ * ice_get_rx_buf - Fetch Rx buffer and synchronize data for use</div><div class='ctx'>  * @rx_ring: Rx descriptor ring to transact packets on</div><div class='del'>- * @rx_desc: descriptor containing info written by hardware</div><div class='add'>+ * @skb: skb to be used</div><div class='add'>+ * @size: size of buffer to add to skb</div><div class='ctx'>  *</div><div class='del'>- * This function allocates an skb on the fly, and populates it with the page</div><div class='del'>- * data from the current receive descriptor, taking care to set up the skb</div><div class='del'>- * correctly, as well as handling calling the page recycle function if</div><div class='del'>- * necessary.</div><div class='add'>+ * This function will pull an Rx buffer from the ring and synchronize it</div><div class='add'>+ * for use by the CPU.</div><div class='ctx'>  */</div><div class='del'>-static struct sk_buff *ice_fetch_rx_buf(struct ice_ring *rx_ring,</div><div class='del'>-					union ice_32b_rx_flex_desc *rx_desc)</div><div class='add'>+static struct ice_rx_buf *</div><div class='add'>+ice_get_rx_buf(struct ice_ring *rx_ring, struct sk_buff **skb,</div><div class='add'>+	       const unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_rx_buf *rx_buf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	rx_buf = &amp;rx_ring-&gt;rx_buf[rx_ring-&gt;next_to_clean];</div><div class='del'>-	page = rx_buf-&gt;page;</div><div class='del'>-	prefetchw(page);</div><div class='add'>+	prefetchw(rx_buf-&gt;page);</div><div class='add'>+	*skb = rx_buf-&gt;skb;</div><div class='ctx'> </div><div class='del'>-	skb = rx_buf-&gt;skb;</div><div class='add'>+	/* we are reusing so sync this buffer for CPU use */</div><div class='add'>+	dma_sync_single_range_for_cpu(rx_ring-&gt;dev, rx_buf-&gt;dma,</div><div class='add'>+				      rx_buf-&gt;page_offset, size,</div><div class='add'>+				      DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-	if (likely(!skb)) {</div><div class='del'>-		u8 *page_addr = page_address(page) + rx_buf-&gt;page_offset;</div><div class='add'>+	/* We have pulled a buffer for use, so decrement pagecnt_bias */</div><div class='add'>+	rx_buf-&gt;pagecnt_bias--;</div><div class='ctx'> </div><div class='del'>-		/* prefetch first cache line of first page */</div><div class='del'>-		prefetch(page_addr);</div><div class='add'>+	return rx_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_construct_skb - Allocate skb and populate it</div><div class='add'>+ * @rx_ring: Rx descriptor ring to transact packets on</div><div class='add'>+ * @rx_buf: Rx buffer to pull data from</div><div class='add'>+ * @size: the length of the packet</div><div class='add'>+ *</div><div class='add'>+ * This function allocates an skb. It then populates it with the page</div><div class='add'>+ * data from the current receive descriptor, taking care to set up the</div><div class='add'>+ * skb correctly.</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *</div><div class='add'>+ice_construct_skb(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf,</div><div class='add'>+		  unsigned int size)</div><div class='add'>+{</div><div class='add'>+	void *va = page_address(rx_buf-&gt;page) + rx_buf-&gt;page_offset;</div><div class='add'>+	unsigned int headlen;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* prefetch first cache line of first page */</div><div class='add'>+	prefetch(va);</div><div class='ctx'> #if L1_CACHE_BYTES &lt; 128</div><div class='del'>-		prefetch((void *)(page_addr + L1_CACHE_BYTES));</div><div class='add'>+	prefetch((u8 *)va + L1_CACHE_BYTES);</div><div class='ctx'> #endif /* L1_CACHE_BYTES */</div><div class='ctx'> </div><div class='del'>-		/* allocate a skb to store the frags */</div><div class='del'>-		skb = __napi_alloc_skb(&amp;rx_ring-&gt;q_vector-&gt;napi,</div><div class='del'>-				       ICE_RX_HDR_SIZE,</div><div class='del'>-				       GFP_ATOMIC | __GFP_NOWARN);</div><div class='del'>-		if (unlikely(!skb)) {</div><div class='del'>-			rx_ring-&gt;rx_stats.alloc_buf_failed++;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='add'>+	/* allocate a skb to store the frags */</div><div class='add'>+	skb = __napi_alloc_skb(&amp;rx_ring-&gt;q_vector-&gt;napi, ICE_RX_HDR_SIZE,</div><div class='add'>+			       GFP_ATOMIC | __GFP_NOWARN);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-		/* we will be copying header into skb-&gt;data in</div><div class='del'>-		 * pskb_may_pull so it is in our interest to prefetch</div><div class='del'>-		 * it now to avoid a possible cache miss</div><div class='del'>-		 */</div><div class='del'>-		prefetchw(skb-&gt;data);</div><div class='add'>+	skb_record_rx_queue(skb, rx_ring-&gt;q_index);</div><div class='add'>+	/* Determine available headroom for copy */</div><div class='add'>+	headlen = size;</div><div class='add'>+	if (headlen &gt; ICE_RX_HDR_SIZE)</div><div class='add'>+		headlen = eth_get_headlen(skb-&gt;dev, va, ICE_RX_HDR_SIZE);</div><div class='ctx'> </div><div class='del'>-		skb_record_rx_queue(skb, rx_ring-&gt;q_index);</div><div class='del'>-	} else {</div><div class='del'>-		/* we are reusing so sync this buffer for CPU use */</div><div class='del'>-		dma_sync_single_range_for_cpu(rx_ring-&gt;dev, rx_buf-&gt;dma,</div><div class='del'>-					      rx_buf-&gt;page_offset,</div><div class='del'>-					      ICE_RXBUF_2048,</div><div class='del'>-					      DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-		rx_buf-&gt;skb = NULL;</div><div class='del'>-	}</div><div class='add'>+	/* align pull length to size of long to optimize memcpy performance */</div><div class='add'>+	memcpy(__skb_put(skb, headlen), va, ALIGN(headlen, sizeof(long)));</div><div class='ctx'> </div><div class='del'>-	/* pull page into skb */</div><div class='del'>-	if (ice_add_rx_frag(rx_buf, rx_desc, skb)) {</div><div class='del'>-		/* hand second half of page back to the ring */</div><div class='del'>-		ice_reuse_rx_page(rx_ring, rx_buf);</div><div class='del'>-		rx_ring-&gt;rx_stats.page_reuse_count++;</div><div class='add'>+	/* if we exhaust the linear part then add what is left as a frag */</div><div class='add'>+	size -= headlen;</div><div class='add'>+	if (size) {</div><div class='add'>+#if (PAGE_SIZE &gt;= 8192)</div><div class='add'>+		unsigned int truesize = SKB_DATA_ALIGN(size);</div><div class='add'>+#else</div><div class='add'>+		unsigned int truesize = ICE_RXBUF_2048;</div><div class='add'>+#endif</div><div class='add'>+		skb_add_rx_frag(skb, 0, rx_buf-&gt;page,</div><div class='add'>+				rx_buf-&gt;page_offset + headlen, size, truesize);</div><div class='add'>+		/* buffer is used by skb, update page_offset */</div><div class='add'>+		ice_rx_buf_adjust_pg_offset(rx_buf, truesize);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* we are not reusing the buffer so unmap it */</div><div class='del'>-		dma_unmap_page(rx_ring-&gt;dev, rx_buf-&gt;dma, PAGE_SIZE,</div><div class='del'>-			       DMA_FROM_DEVICE);</div><div class='add'>+		/* buffer is unused, reset bias back to rx_buf; data was copied</div><div class='add'>+		 * onto skb's linear part so there's no need for adjusting</div><div class='add'>+		 * page offset and we can reuse this buffer as-is</div><div class='add'>+		 */</div><div class='add'>+		rx_buf-&gt;pagecnt_bias++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* clear contents of buffer_info */</div><div class='del'>-	rx_buf-&gt;page = NULL;</div><div class='del'>-</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_pull_tail - ice specific version of skb_pull_tail</div><div class='del'>- * @skb: pointer to current skb being adjusted</div><div class='add'>+ * ice_put_rx_buf - Clean up used buffer and either recycle or free</div><div class='add'>+ * @rx_ring: Rx descriptor ring to transact packets on</div><div class='add'>+ * @rx_buf: Rx buffer to pull data from</div><div class='ctx'>  *</div><div class='del'>- * This function is an ice specific version of __pskb_pull_tail. The</div><div class='del'>- * main difference between this version and the original function is that</div><div class='del'>- * this function can make several assumptions about the state of things</div><div class='del'>- * that allow for significant optimizations versus the standard function.</div><div class='del'>- * As a result we can do things like drop a frag and maintain an accurate</div><div class='del'>- * truesize for the skb.</div><div class='add'>+ * This function will  clean up the contents of the rx_buf. It will</div><div class='add'>+ * either recycle the buffer or unmap it and free the associated resources.</div><div class='ctx'>  */</div><div class='del'>-static void ice_pull_tail(struct sk_buff *skb)</div><div class='add'>+static void ice_put_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf)</div><div class='ctx'> {</div><div class='del'>-	struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[0];</div><div class='del'>-	unsigned int pull_len;</div><div class='del'>-	unsigned char *va;</div><div class='del'>-</div><div class='del'>-	/* it is valid to use page_address instead of kmap since we are</div><div class='del'>-	 * working with pages allocated out of the lomem pool per</div><div class='del'>-	 * alloc_page(GFP_ATOMIC)</div><div class='del'>-	 */</div><div class='del'>-	va = skb_frag_address(frag);</div><div class='del'>-</div><div class='del'>-	/* we need the header to contain the greater of either ETH_HLEN or</div><div class='del'>-	 * 60 bytes if the skb-&gt;len is less than 60 for skb_pad.</div><div class='del'>-	 */</div><div class='del'>-	pull_len = eth_get_headlen(va, ICE_RX_HDR_SIZE);</div><div class='del'>-</div><div class='del'>-	/* align pull length to size of long to optimize memcpy performance */</div><div class='del'>-	skb_copy_to_linear_data(skb, va, ALIGN(pull_len, sizeof(long)));</div><div class='add'>+		/* hand second half of page back to the ring */</div><div class='add'>+	if (ice_can_reuse_rx_page(rx_buf)) {</div><div class='add'>+		ice_reuse_rx_page(rx_ring, rx_buf);</div><div class='add'>+		rx_ring-&gt;rx_stats.page_reuse_count++;</div><div class='add'>+	} else {</div><div class='add'>+		/* we are not reusing the buffer so unmap it */</div><div class='add'>+		dma_unmap_page_attrs(rx_ring-&gt;dev, rx_buf-&gt;dma, PAGE_SIZE,</div><div class='add'>+				     DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);</div><div class='add'>+		__page_frag_cache_drain(rx_buf-&gt;page, rx_buf-&gt;pagecnt_bias);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* update all of the pointers */</div><div class='del'>-	skb_frag_size_sub(frag, pull_len);</div><div class='del'>-	frag-&gt;page_offset += pull_len;</div><div class='del'>-	skb-&gt;data_len -= pull_len;</div><div class='del'>-	skb-&gt;tail += pull_len;</div><div class='add'>+	/* clear contents of buffer_info */</div><div class='add'>+	rx_buf-&gt;page = NULL;</div><div class='add'>+	rx_buf-&gt;skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -730,10 +767,6 @@ static void ice_pull_tail(struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static bool ice_cleanup_headers(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	/* place header in linear portion of buffer */</div><div class='del'>-	if (skb_is_nonlinear(skb))</div><div class='del'>-		ice_pull_tail(skb);</div><div class='del'>-</div><div class='ctx'> 	/* if eth_skb_pad returns an error the skb was freed */</div><div class='ctx'> 	if (eth_skb_pad(skb))</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -751,8 +784,8 @@ static bool ice_cleanup_headers(struct sk_buff *skb)</div><div class='ctx'>  * The status_error_len doesn't need to be shifted because it begins</div><div class='ctx'>  * at offset zero.</div><div class='ctx'>  */</div><div class='del'>-static bool ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc,</div><div class='del'>-			     const u16 stat_err_bits)</div><div class='add'>+static bool</div><div class='add'>+ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc, const u16 stat_err_bits)</div><div class='ctx'> {</div><div class='ctx'> 	return !!(rx_desc-&gt;wb.status_error0 &amp;</div><div class='ctx'> 		  cpu_to_le16(stat_err_bits));</div><div class='hunk'>@@ -769,9 +802,9 @@ static bool ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc,</div><div class='ctx'>  * sk_buff in the next buffer to be chained and return true indicating</div><div class='ctx'>  * that this is in fact a non-EOP buffer.</div><div class='ctx'>  */</div><div class='del'>-static bool ice_is_non_eop(struct ice_ring *rx_ring,</div><div class='del'>-			   union ice_32b_rx_flex_desc *rx_desc,</div><div class='del'>-			   struct sk_buff *skb)</div><div class='add'>+static bool</div><div class='add'>+ice_is_non_eop(struct ice_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc,</div><div class='add'>+	       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ntc = rx_ring-&gt;next_to_clean + 1;</div><div class='ctx'> </div><div class='hunk'>@@ -838,8 +871,9 @@ ice_rx_hash(struct ice_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc,</div><div class='ctx'>  *</div><div class='ctx'>  * skb-&gt;protocol must be set before this function is called</div><div class='ctx'>  */</div><div class='del'>-static void ice_rx_csum(struct ice_vsi *vsi, struct sk_buff *skb,</div><div class='del'>-			union ice_32b_rx_flex_desc *rx_desc, u8 ptype)</div><div class='add'>+static void</div><div class='add'>+ice_rx_csum(struct ice_vsi *vsi, struct sk_buff *skb,</div><div class='add'>+	    union ice_32b_rx_flex_desc *rx_desc, u8 ptype)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_rx_ptype_decoded decoded;</div><div class='ctx'> 	u32 rx_error, rx_status;</div><div class='hunk'>@@ -909,9 +943,10 @@ checksum_fail:</div><div class='ctx'>  * order to populate the hash, checksum, VLAN, protocol, and</div><div class='ctx'>  * other fields within the skb.</div><div class='ctx'>  */</div><div class='del'>-static void ice_process_skb_fields(struct ice_ring *rx_ring,</div><div class='del'>-				   union ice_32b_rx_flex_desc *rx_desc,</div><div class='del'>-				   struct sk_buff *skb, u8 ptype)</div><div class='add'>+static void</div><div class='add'>+ice_process_skb_fields(struct ice_ring *rx_ring,</div><div class='add'>+		       union ice_32b_rx_flex_desc *rx_desc,</div><div class='add'>+		       struct sk_buff *skb, u8 ptype)</div><div class='ctx'> {</div><div class='ctx'> 	ice_rx_hash(rx_ring, rx_desc, skb, ptype);</div><div class='ctx'> </div><div class='hunk'>@@ -925,18 +960,17 @@ static void ice_process_skb_fields(struct ice_ring *rx_ring,</div><div class='ctx'>  * ice_receive_skb - Send a completed packet up the stack</div><div class='ctx'>  * @rx_ring: Rx ring in play</div><div class='ctx'>  * @skb: packet to send up</div><div class='del'>- * @vlan_tag: vlan tag for packet</div><div class='add'>+ * @vlan_tag: VLAN tag for packet</div><div class='ctx'>  *</div><div class='ctx'>  * This function sends the completed packet (via. skb) up the stack using</div><div class='del'>- * gro receive functions (with/without vlan tag)</div><div class='add'>+ * gro receive functions (with/without VLAN tag)</div><div class='ctx'>  */</div><div class='del'>-static void ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb,</div><div class='del'>-			    u16 vlan_tag)</div><div class='add'>+static void</div><div class='add'>+ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag)</div><div class='ctx'> {</div><div class='ctx'> 	if ((rx_ring-&gt;netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX) &amp;&amp;</div><div class='del'>-	    (vlan_tag &amp; VLAN_VID_MASK)) {</div><div class='add'>+	    (vlan_tag &amp; VLAN_VID_MASK))</div><div class='ctx'> 		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);</div><div class='del'>-	}</div><div class='ctx'> 	napi_gro_receive(&amp;rx_ring-&gt;q_vector-&gt;napi, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -958,10 +992,12 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)</div><div class='ctx'> 	u16 cleaned_count = ICE_DESC_UNUSED(rx_ring);</div><div class='ctx'> 	bool failure = false;</div><div class='ctx'> </div><div class='del'>-	/* start the loop to process RX packets bounded by 'budget' */</div><div class='add'>+	/* start the loop to process Rx packets bounded by 'budget' */</div><div class='ctx'> 	while (likely(total_rx_pkts &lt; (unsigned int)budget)) {</div><div class='ctx'> 		union ice_32b_rx_flex_desc *rx_desc;</div><div class='add'>+		struct ice_rx_buf *rx_buf;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='add'>+		unsigned int size;</div><div class='ctx'> 		u16 stat_err_bits;</div><div class='ctx'> 		u16 vlan_tag = 0;</div><div class='ctx'> 		u8 rx_ptype;</div><div class='hunk'>@@ -973,7 +1009,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)</div><div class='ctx'> 			cleaned_count = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* get the RX desc from RX ring based on 'next_to_clean' */</div><div class='add'>+		/* get the Rx desc from Rx ring based on 'next_to_clean' */</div><div class='ctx'> 		rx_desc = ICE_RX_DESC(rx_ring, rx_ring-&gt;next_to_clean);</div><div class='ctx'> </div><div class='ctx'> 		/* status_error_len will always be zero for unused descriptors</div><div class='hunk'>@@ -991,11 +1027,24 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)</div><div class='ctx'> 		 */</div><div class='ctx'> 		dma_rmb();</div><div class='ctx'> </div><div class='add'>+		size = le16_to_cpu(rx_desc-&gt;wb.pkt_len) &amp;</div><div class='add'>+			ICE_RX_FLX_DESC_PKT_LEN_M;</div><div class='add'>+</div><div class='add'>+		rx_buf = ice_get_rx_buf(rx_ring, &amp;skb, size);</div><div class='ctx'> 		/* allocate (if needed) and populate skb */</div><div class='del'>-		skb = ice_fetch_rx_buf(rx_ring, rx_desc);</div><div class='del'>-		if (!skb)</div><div class='add'>+		if (skb)</div><div class='add'>+			ice_add_rx_frag(rx_buf, skb, size);</div><div class='add'>+		else</div><div class='add'>+			skb = ice_construct_skb(rx_ring, rx_buf, size);</div><div class='add'>+</div><div class='add'>+		/* exit if we failed to retrieve a buffer */</div><div class='add'>+		if (!skb) {</div><div class='add'>+			rx_ring-&gt;rx_stats.alloc_buf_failed++;</div><div class='add'>+			rx_buf-&gt;pagecnt_bias++;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		ice_put_rx_buf(rx_ring, rx_buf);</div><div class='ctx'> 		cleaned_count++;</div><div class='ctx'> </div><div class='ctx'> 		/* skip if it is NOP desc */</div><div class='hunk'>@@ -1049,17 +1098,247 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_adjust_itr_by_size_and_speed - Adjust ITR based on current traffic</div><div class='add'>+ * @port_info: port_info structure containing the current link speed</div><div class='add'>+ * @avg_pkt_size: average size of Tx or Rx packets based on clean routine</div><div class='add'>+ * @itr: itr value to update</div><div class='add'>+ *</div><div class='add'>+ * Calculate how big of an increment should be applied to the ITR value passed</div><div class='add'>+ * in based on wmem_default, SKB overhead, Ethernet overhead, and the current</div><div class='add'>+ * link speed.</div><div class='add'>+ *</div><div class='add'>+ * The following is a calculation derived from:</div><div class='add'>+ *  wmem_default / (size + overhead) = desired_pkts_per_int</div><div class='add'>+ *  rate / bits_per_byte / (size + Ethernet overhead) = pkt_rate</div><div class='add'>+ *  (desired_pkt_rate / pkt_rate) * usecs_per_sec = ITR value</div><div class='add'>+ *</div><div class='add'>+ * Assuming wmem_default is 212992 and overhead is 640 bytes per</div><div class='add'>+ * packet, (256 skb, 64 headroom, 320 shared info), we can reduce the</div><div class='add'>+ * formula down to:</div><div class='add'>+ *</div><div class='add'>+ *	 wmem_default * bits_per_byte * usecs_per_sec   pkt_size + 24</div><div class='add'>+ * ITR = -------------------------------------------- * --------------</div><div class='add'>+ *			     rate			pkt_size + 640</div><div class='add'>+ */</div><div class='add'>+static unsigned int</div><div class='add'>+ice_adjust_itr_by_size_and_speed(struct ice_port_info *port_info,</div><div class='add'>+				 unsigned int avg_pkt_size,</div><div class='add'>+				 unsigned int itr)</div><div class='add'>+{</div><div class='add'>+	switch (port_info-&gt;phy.link_info.link_speed) {</div><div class='add'>+	case ICE_AQ_LINK_SPEED_100GB:</div><div class='add'>+		itr += DIV_ROUND_UP(17 * (avg_pkt_size + 24),</div><div class='add'>+				    avg_pkt_size + 640);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_AQ_LINK_SPEED_50GB:</div><div class='add'>+		itr += DIV_ROUND_UP(34 * (avg_pkt_size + 24),</div><div class='add'>+				    avg_pkt_size + 640);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_AQ_LINK_SPEED_40GB:</div><div class='add'>+		itr += DIV_ROUND_UP(43 * (avg_pkt_size + 24),</div><div class='add'>+				    avg_pkt_size + 640);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_AQ_LINK_SPEED_25GB:</div><div class='add'>+		itr += DIV_ROUND_UP(68 * (avg_pkt_size + 24),</div><div class='add'>+				    avg_pkt_size + 640);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_AQ_LINK_SPEED_20GB:</div><div class='add'>+		itr += DIV_ROUND_UP(85 * (avg_pkt_size + 24),</div><div class='add'>+				    avg_pkt_size + 640);</div><div class='add'>+		break;</div><div class='add'>+	case ICE_AQ_LINK_SPEED_10GB:</div><div class='add'>+		/* fall through */</div><div class='add'>+	default:</div><div class='add'>+		itr += DIV_ROUND_UP(170 * (avg_pkt_size + 24),</div><div class='add'>+				    avg_pkt_size + 640);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((itr &amp; ICE_ITR_MASK) &gt; ICE_ITR_ADAPTIVE_MAX_USECS) {</div><div class='add'>+		itr &amp;= ICE_ITR_ADAPTIVE_LATENCY;</div><div class='add'>+		itr += ICE_ITR_ADAPTIVE_MAX_USECS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return itr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_update_itr - update the adaptive ITR value based on statistics</div><div class='add'>+ * @q_vector: structure containing interrupt and ring information</div><div class='add'>+ * @rc: structure containing ring performance data</div><div class='add'>+ *</div><div class='add'>+ * Stores a new ITR value based on packets and byte</div><div class='add'>+ * counts during the last interrupt.  The advantage of per interrupt</div><div class='add'>+ * computation is faster updates and more accurate ITR for the current</div><div class='add'>+ * traffic pattern.  Constants in this function were computed</div><div class='add'>+ * based on theoretical maximum wire speed and thresholds were set based</div><div class='add'>+ * on testing data as well as attempting to minimize response time</div><div class='add'>+ * while increasing bulk throughput.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ice_update_itr(struct ice_q_vector *q_vector, struct ice_ring_container *rc)</div><div class='add'>+{</div><div class='add'>+	unsigned long next_update = jiffies;</div><div class='add'>+	unsigned int packets, bytes, itr;</div><div class='add'>+	bool container_is_rx;</div><div class='add'>+</div><div class='add'>+	if (!rc-&gt;ring || !ITR_IS_DYNAMIC(rc-&gt;itr_setting))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If itr_countdown is set it means we programmed an ITR within</div><div class='add'>+	 * the last 4 interrupt cycles. This has a side effect of us</div><div class='add'>+	 * potentially firing an early interrupt. In order to work around</div><div class='add'>+	 * this we need to throw out any data received for a few</div><div class='add'>+	 * interrupts following the update.</div><div class='add'>+	 */</div><div class='add'>+	if (q_vector-&gt;itr_countdown) {</div><div class='add'>+		itr = rc-&gt;target_itr;</div><div class='add'>+		goto clear_counts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	container_is_rx = (&amp;q_vector-&gt;rx == rc);</div><div class='add'>+	/* For Rx we want to push the delay up and default to low latency.</div><div class='add'>+	 * for Tx we want to pull the delay down and default to high latency.</div><div class='add'>+	 */</div><div class='add'>+	itr = container_is_rx ?</div><div class='add'>+		ICE_ITR_ADAPTIVE_MIN_USECS | ICE_ITR_ADAPTIVE_LATENCY :</div><div class='add'>+		ICE_ITR_ADAPTIVE_MAX_USECS | ICE_ITR_ADAPTIVE_LATENCY;</div><div class='add'>+</div><div class='add'>+	/* If we didn't update within up to 1 - 2 jiffies we can assume</div><div class='add'>+	 * that either packets are coming in so slow there hasn't been</div><div class='add'>+	 * any work, or that there is so much work that NAPI is dealing</div><div class='add'>+	 * with interrupt moderation and we don't need to do anything.</div><div class='add'>+	 */</div><div class='add'>+	if (time_after(next_update, rc-&gt;next_update))</div><div class='add'>+		goto clear_counts;</div><div class='add'>+</div><div class='add'>+	packets = rc-&gt;total_pkts;</div><div class='add'>+	bytes = rc-&gt;total_bytes;</div><div class='add'>+</div><div class='add'>+	if (container_is_rx) {</div><div class='add'>+		/* If Rx there are 1 to 4 packets and bytes are less than</div><div class='add'>+		 * 9000 assume insufficient data to use bulk rate limiting</div><div class='add'>+		 * approach unless Tx is already in bulk rate limiting. We</div><div class='add'>+		 * are likely latency driven.</div><div class='add'>+		 */</div><div class='add'>+		if (packets &amp;&amp; packets &lt; 4 &amp;&amp; bytes &lt; 9000 &amp;&amp;</div><div class='add'>+		    (q_vector-&gt;tx.target_itr &amp; ICE_ITR_ADAPTIVE_LATENCY)) {</div><div class='add'>+			itr = ICE_ITR_ADAPTIVE_LATENCY;</div><div class='add'>+			goto adjust_by_size_and_speed;</div><div class='add'>+		}</div><div class='add'>+	} else if (packets &lt; 4) {</div><div class='add'>+		/* If we have Tx and Rx ITR maxed and Tx ITR is running in</div><div class='add'>+		 * bulk mode and we are receiving 4 or fewer packets just</div><div class='add'>+		 * reset the ITR_ADAPTIVE_LATENCY bit for latency mode so</div><div class='add'>+		 * that the Rx can relax.</div><div class='add'>+		 */</div><div class='add'>+		if (rc-&gt;target_itr == ICE_ITR_ADAPTIVE_MAX_USECS &amp;&amp;</div><div class='add'>+		    (q_vector-&gt;rx.target_itr &amp; ICE_ITR_MASK) ==</div><div class='add'>+		    ICE_ITR_ADAPTIVE_MAX_USECS)</div><div class='add'>+			goto clear_counts;</div><div class='add'>+	} else if (packets &gt; 32) {</div><div class='add'>+		/* If we have processed over 32 packets in a single interrupt</div><div class='add'>+		 * for Tx assume we need to switch over to "bulk" mode.</div><div class='add'>+		 */</div><div class='add'>+		rc-&gt;target_itr &amp;= ~ICE_ITR_ADAPTIVE_LATENCY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have no packets to actually measure against. This means</div><div class='add'>+	 * either one of the other queues on this vector is active or</div><div class='add'>+	 * we are a Tx queue doing TSO with too high of an interrupt rate.</div><div class='add'>+	 *</div><div class='add'>+	 * Between 4 and 56 we can assume that our current interrupt delay</div><div class='add'>+	 * is only slightly too low. As such we should increase it by a small</div><div class='add'>+	 * fixed amount.</div><div class='add'>+	 */</div><div class='add'>+	if (packets &lt; 56) {</div><div class='add'>+		itr = rc-&gt;target_itr + ICE_ITR_ADAPTIVE_MIN_INC;</div><div class='add'>+		if ((itr &amp; ICE_ITR_MASK) &gt; ICE_ITR_ADAPTIVE_MAX_USECS) {</div><div class='add'>+			itr &amp;= ICE_ITR_ADAPTIVE_LATENCY;</div><div class='add'>+			itr += ICE_ITR_ADAPTIVE_MAX_USECS;</div><div class='add'>+		}</div><div class='add'>+		goto clear_counts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (packets &lt;= 256) {</div><div class='add'>+		itr = min(q_vector-&gt;tx.current_itr, q_vector-&gt;rx.current_itr);</div><div class='add'>+		itr &amp;= ICE_ITR_MASK;</div><div class='add'>+</div><div class='add'>+		/* Between 56 and 112 is our "goldilocks" zone where we are</div><div class='add'>+		 * working out "just right". Just report that our current</div><div class='add'>+		 * ITR is good for us.</div><div class='add'>+		 */</div><div class='add'>+		if (packets &lt;= 112)</div><div class='add'>+			goto clear_counts;</div><div class='add'>+</div><div class='add'>+		/* If packet count is 128 or greater we are likely looking</div><div class='add'>+		 * at a slight overrun of the delay we want. Try halving</div><div class='add'>+		 * our delay to see if that will cut the number of packets</div><div class='add'>+		 * in half per interrupt.</div><div class='add'>+		 */</div><div class='add'>+		itr &gt;&gt;= 1;</div><div class='add'>+		itr &amp;= ICE_ITR_MASK;</div><div class='add'>+		if (itr &lt; ICE_ITR_ADAPTIVE_MIN_USECS)</div><div class='add'>+			itr = ICE_ITR_ADAPTIVE_MIN_USECS;</div><div class='add'>+</div><div class='add'>+		goto clear_counts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The paths below assume we are dealing with a bulk ITR since</div><div class='add'>+	 * number of packets is greater than 256. We are just going to have</div><div class='add'>+	 * to compute a value and try to bring the count under control,</div><div class='add'>+	 * though for smaller packet sizes there isn't much we can do as</div><div class='add'>+	 * NAPI polling will likely be kicking in sooner rather than later.</div><div class='add'>+	 */</div><div class='add'>+	itr = ICE_ITR_ADAPTIVE_BULK;</div><div class='add'>+</div><div class='add'>+adjust_by_size_and_speed:</div><div class='add'>+</div><div class='add'>+	/* based on checks above packets cannot be 0 so division is safe */</div><div class='add'>+	itr = ice_adjust_itr_by_size_and_speed(q_vector-&gt;vsi-&gt;port_info,</div><div class='add'>+					       bytes / packets, itr);</div><div class='add'>+</div><div class='add'>+clear_counts:</div><div class='add'>+	/* write back value */</div><div class='add'>+	rc-&gt;target_itr = itr;</div><div class='add'>+</div><div class='add'>+	/* next update should occur within next jiffy */</div><div class='add'>+	rc-&gt;next_update = next_update + 1;</div><div class='add'>+</div><div class='add'>+	rc-&gt;total_bytes = 0;</div><div class='add'>+	rc-&gt;total_pkts = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_buildreg_itr - build value for writing to the GLINT_DYN_CTL register</div><div class='ctx'>  * @itr_idx: interrupt throttling index</div><div class='del'>- * @reg_itr: interrupt throttling value adjusted based on ITR granularity</div><div class='add'>+ * @itr: interrupt throttling value in usecs</div><div class='ctx'>  */</div><div class='del'>-static u32 ice_buildreg_itr(int itr_idx, u16 reg_itr)</div><div class='add'>+static u32 ice_buildreg_itr(u16 itr_idx, u16 itr)</div><div class='ctx'> {</div><div class='add'>+	/* The itr value is reported in microseconds, and the register value is</div><div class='add'>+	 * recorded in 2 microsecond units. For this reason we only need to</div><div class='add'>+	 * shift by the GLINT_DYN_CTL_INTERVAL_S - ICE_ITR_GRAN_S to apply this</div><div class='add'>+	 * granularity as a shift instead of division. The mask makes sure the</div><div class='add'>+	 * ITR value is never odd so we don't accidentally write into the field</div><div class='add'>+	 * prior to the ITR field.</div><div class='add'>+	 */</div><div class='add'>+	itr &amp;= ICE_ITR_MASK;</div><div class='add'>+</div><div class='ctx'> 	return GLINT_DYN_CTL_INTENA_M | GLINT_DYN_CTL_CLEARPBA_M |</div><div class='ctx'> 		(itr_idx &lt;&lt; GLINT_DYN_CTL_ITR_INDX_S) |</div><div class='del'>-		(reg_itr &lt;&lt; GLINT_DYN_CTL_INTERVAL_S);</div><div class='add'>+		(itr &lt;&lt; (GLINT_DYN_CTL_INTERVAL_S - ICE_ITR_GRAN_S));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The act of updating the ITR will cause it to immediately trigger. In order</div><div class='add'>+ * to prevent this from throwing off adaptive update statistics we defer the</div><div class='add'>+ * update so that it can only happen so often. So after either Tx or Rx are</div><div class='add'>+ * updated we make the adaptive scheme wait until either the ITR completely</div><div class='add'>+ * expires via the next_update expiration or we have been through at least</div><div class='add'>+ * 3 interrupts.</div><div class='add'>+ */</div><div class='add'>+#define ITR_COUNTDOWN_START 3</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ice_update_ena_itr - Update ITR and re-enable MSIX interrupt</div><div class='ctx'>  * @vsi: the VSI associated with the q_vector</div><div class='hunk'>@@ -1068,10 +1347,14 @@ static u32 ice_buildreg_itr(int itr_idx, u16 reg_itr)</div><div class='ctx'> static void</div><div class='ctx'> ice_update_ena_itr(struct ice_vsi *vsi, struct ice_q_vector *q_vector)</div><div class='ctx'> {</div><div class='del'>-	struct ice_hw *hw = &amp;vsi-&gt;back-&gt;hw;</div><div class='del'>-	struct ice_ring_container *rc;</div><div class='add'>+	struct ice_ring_container *tx = &amp;q_vector-&gt;tx;</div><div class='add'>+	struct ice_ring_container *rx = &amp;q_vector-&gt;rx;</div><div class='ctx'> 	u32 itr_val;</div><div class='ctx'> </div><div class='add'>+	/* This will do nothing if dynamic updates are not enabled */</div><div class='add'>+	ice_update_itr(q_vector, tx);</div><div class='add'>+	ice_update_itr(q_vector, rx);</div><div class='add'>+</div><div class='ctx'> 	/* This block of logic allows us to get away with only updating</div><div class='ctx'> 	 * one ITR value with each interrupt. The idea is to perform a</div><div class='ctx'> 	 * pseudo-lazy update with the following criteria.</div><div class='hunk'>@@ -1080,35 +1363,36 @@ ice_update_ena_itr(struct ice_vsi *vsi, struct ice_q_vector *q_vector)</div><div class='ctx'> 	 * 2. If we must reduce an ITR that is given highest priority.</div><div class='ctx'> 	 * 3. We then give priority to increasing ITR based on amount.</div><div class='ctx'> 	 */</div><div class='del'>-	if (q_vector-&gt;rx.target_itr &lt; q_vector-&gt;rx.current_itr) {</div><div class='del'>-		rc = &amp;q_vector-&gt;rx;</div><div class='add'>+	if (rx-&gt;target_itr &lt; rx-&gt;current_itr) {</div><div class='ctx'> 		/* Rx ITR needs to be reduced, this is highest priority */</div><div class='del'>-		itr_val = ice_buildreg_itr(rc-&gt;itr_idx, rc-&gt;target_itr);</div><div class='del'>-		rc-&gt;current_itr = rc-&gt;target_itr;</div><div class='del'>-	} else if ((q_vector-&gt;tx.target_itr &lt; q_vector-&gt;tx.current_itr) ||</div><div class='del'>-		   ((q_vector-&gt;rx.target_itr - q_vector-&gt;rx.current_itr) &lt;</div><div class='del'>-		    (q_vector-&gt;tx.target_itr - q_vector-&gt;tx.current_itr))) {</div><div class='del'>-		rc = &amp;q_vector-&gt;tx;</div><div class='add'>+		itr_val = ice_buildreg_itr(rx-&gt;itr_idx, rx-&gt;target_itr);</div><div class='add'>+		rx-&gt;current_itr = rx-&gt;target_itr;</div><div class='add'>+		q_vector-&gt;itr_countdown = ITR_COUNTDOWN_START;</div><div class='add'>+	} else if ((tx-&gt;target_itr &lt; tx-&gt;current_itr) ||</div><div class='add'>+		   ((rx-&gt;target_itr - rx-&gt;current_itr) &lt;</div><div class='add'>+		    (tx-&gt;target_itr - tx-&gt;current_itr))) {</div><div class='ctx'> 		/* Tx ITR needs to be reduced, this is second priority</div><div class='ctx'> 		 * Tx ITR needs to be increased more than Rx, fourth priority</div><div class='ctx'> 		 */</div><div class='del'>-		itr_val = ice_buildreg_itr(rc-&gt;itr_idx, rc-&gt;target_itr);</div><div class='del'>-		rc-&gt;current_itr = rc-&gt;target_itr;</div><div class='del'>-	} else if (q_vector-&gt;rx.current_itr != q_vector-&gt;rx.target_itr) {</div><div class='del'>-		rc = &amp;q_vector-&gt;rx;</div><div class='add'>+		itr_val = ice_buildreg_itr(tx-&gt;itr_idx, tx-&gt;target_itr);</div><div class='add'>+		tx-&gt;current_itr = tx-&gt;target_itr;</div><div class='add'>+		q_vector-&gt;itr_countdown = ITR_COUNTDOWN_START;</div><div class='add'>+	} else if (rx-&gt;current_itr != rx-&gt;target_itr) {</div><div class='ctx'> 		/* Rx ITR needs to be increased, third priority */</div><div class='del'>-		itr_val = ice_buildreg_itr(rc-&gt;itr_idx, rc-&gt;target_itr);</div><div class='del'>-		rc-&gt;current_itr = rc-&gt;target_itr;</div><div class='add'>+		itr_val = ice_buildreg_itr(rx-&gt;itr_idx, rx-&gt;target_itr);</div><div class='add'>+		rx-&gt;current_itr = rx-&gt;target_itr;</div><div class='add'>+		q_vector-&gt;itr_countdown = ITR_COUNTDOWN_START;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Still have to re-enable the interrupts */</div><div class='ctx'> 		itr_val = ice_buildreg_itr(ICE_ITR_NONE, 0);</div><div class='add'>+		if (q_vector-&gt;itr_countdown)</div><div class='add'>+			q_vector-&gt;itr_countdown--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(__ICE_DOWN, vsi-&gt;state)) {</div><div class='del'>-		int vector = vsi-&gt;hw_base_vector + q_vector-&gt;v_idx;</div><div class='del'>-</div><div class='del'>-		wr32(hw, GLINT_DYN_CTL(vector), itr_val);</div><div class='del'>-	}</div><div class='add'>+	if (!test_bit(__ICE_DOWN, vsi-&gt;state))</div><div class='add'>+		wr32(&amp;vsi-&gt;back-&gt;hw,</div><div class='add'>+		     GLINT_DYN_CTL(q_vector-&gt;reg_idx),</div><div class='add'>+		     itr_val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1354,13 +1638,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,</div><div class='ctx'> 	ice_maybe_stop_tx(tx_ring, DESC_NEEDED);</div><div class='ctx'> </div><div class='ctx'> 	/* notify HW of packet */</div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='hunk'>@@ -1480,7 +1759,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW</div><div class='add'>+ * ice_tx_prepare_vlan_flags - prepare generic Tx VLAN tagging flags for HW</div><div class='ctx'>  * @tx_ring: ring to send buffer on</div><div class='ctx'>  * @first: pointer to struct ice_tx_buf</div><div class='ctx'>  *</div><div class='hunk'>@@ -1506,7 +1785,7 @@ ice_tx_prepare_vlan_flags(struct ice_ring *tx_ring, struct ice_tx_buf *first)</div><div class='ctx'> 		 * to the encapsulated ethertype.</div><div class='ctx'> 		 */</div><div class='ctx'> 		skb-&gt;protocol = vlan_get_protocol(skb);</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if we have a HW VLAN tag being added, default to the HW one */</div><div class='hunk'>@@ -1528,8 +1807,7 @@ ice_tx_prepare_vlan_flags(struct ice_ring *tx_ring, struct ice_tx_buf *first)</div><div class='ctx'> 		first-&gt;tx_flags |= ICE_TX_FLAGS_SW_VLAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return 0;</div><div class='add'>+	return ice_tx_prepare_vlan_flags_dcb(tx_ring, first);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1566,6 +1844,7 @@ int ice_tso(struct ice_tx_buf *first, struct ice_tx_offload_params *off)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/* cppcheck-suppress unreadVariable */</div><div class='ctx'> 	ip.hdr = skb_network_header(skb);</div><div class='ctx'> 	l4.hdr = skb_transport_header(skb);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h<br/>index fc358ea81816..66e05032ee56 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_txrx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_txrx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_txrx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_txrx.h</a></div><div class='hunk'>@@ -45,8 +45,13 @@</div><div class='ctx'> #define ICE_TX_FLAGS_HW_VLAN	BIT(1)</div><div class='ctx'> #define ICE_TX_FLAGS_SW_VLAN	BIT(2)</div><div class='ctx'> #define ICE_TX_FLAGS_VLAN_M	0xffff0000</div><div class='add'>+#define ICE_TX_FLAGS_VLAN_PR_M	0xe0000000</div><div class='add'>+#define ICE_TX_FLAGS_VLAN_PR_S	29</div><div class='ctx'> #define ICE_TX_FLAGS_VLAN_S	16</div><div class='ctx'> </div><div class='add'>+#define ICE_RX_DMA_ATTR \</div><div class='add'>+	(DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING)</div><div class='add'>+</div><div class='ctx'> struct ice_tx_buf {</div><div class='ctx'> 	struct ice_tx_desc *next_to_watch;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -73,6 +78,7 @@ struct ice_rx_buf {</div><div class='ctx'> 	dma_addr_t dma;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	unsigned int page_offset;</div><div class='add'>+	u16 pagecnt_bias;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ice_q_stats {</div><div class='hunk'>@@ -124,11 +130,19 @@ enum ice_rx_dtype {</div><div class='ctx'> #define ICE_ITR_DYNAMIC	0x8000  /* used as flag for itr_setting */</div><div class='ctx'> #define ITR_IS_DYNAMIC(setting) (!!((setting) &amp; ICE_ITR_DYNAMIC))</div><div class='ctx'> #define ITR_TO_REG(setting)	((setting) &amp; ~ICE_ITR_DYNAMIC)</div><div class='del'>-#define ICE_ITR_GRAN_S		1	/* Assume ITR granularity is 2us */</div><div class='add'>+#define ICE_ITR_GRAN_S		1	/* ITR granularity is always 2us */</div><div class='add'>+#define ICE_ITR_GRAN_US		BIT(ICE_ITR_GRAN_S)</div><div class='ctx'> #define ICE_ITR_MASK		0x1FFE	/* ITR register value alignment mask */</div><div class='ctx'> #define ITR_REG_ALIGN(setting)	__ALIGN_MASK(setting, ~ICE_ITR_MASK)</div><div class='ctx'> </div><div class='add'>+#define ICE_ITR_ADAPTIVE_MIN_INC	0x0002</div><div class='add'>+#define ICE_ITR_ADAPTIVE_MIN_USECS	0x0002</div><div class='add'>+#define ICE_ITR_ADAPTIVE_MAX_USECS	0x00FA</div><div class='add'>+#define ICE_ITR_ADAPTIVE_LATENCY	0x8000</div><div class='add'>+#define ICE_ITR_ADAPTIVE_BULK		0x0000</div><div class='add'>+</div><div class='ctx'> #define ICE_DFLT_INTRL	0</div><div class='add'>+#define ICE_MAX_INTRL	236</div><div class='ctx'> </div><div class='ctx'> /* Legacy or Advanced Mode Queue */</div><div class='ctx'> #define ICE_TX_ADVANCED	0</div><div class='hunk'>@@ -149,6 +163,9 @@ struct ice_ring {</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 q_index;			/* Queue number of ring */</div><div class='ctx'> 	u32 txq_teid;			/* Added Tx queue TEID */</div><div class='add'>+#ifdef CONFIG_DCB</div><div class='add'>+	u8 dcb_tc;		/* Traffic class of ring */</div><div class='add'>+#endif /* CONFIG_DCB */</div><div class='ctx'> </div><div class='ctx'> 	u16 count;			/* Number of descriptors */</div><div class='ctx'> 	u16 reg_idx;			/* HW register index of the ring */</div><div class='hunk'>@@ -173,21 +190,13 @@ struct ice_ring {</div><div class='ctx'> 	u16 next_to_alloc;</div><div class='ctx'> } ____cacheline_internodealigned_in_smp;</div><div class='ctx'> </div><div class='del'>-enum ice_latency_range {</div><div class='del'>-	ICE_LOWEST_LATENCY = 0,</div><div class='del'>-	ICE_LOW_LATENCY = 1,</div><div class='del'>-	ICE_BULK_LATENCY = 2,</div><div class='del'>-	ICE_ULTRA_LATENCY = 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct ice_ring_container {</div><div class='ctx'> 	/* head of linked-list of rings */</div><div class='ctx'> 	struct ice_ring *ring;</div><div class='ctx'> 	unsigned long next_update;	/* jiffies value of next queue update */</div><div class='ctx'> 	unsigned int total_bytes;	/* total bytes processed this int */</div><div class='ctx'> 	unsigned int total_pkts;	/* total packets processed this int */</div><div class='del'>-	enum ice_latency_range latency_range;</div><div class='del'>-	int itr_idx;		/* index in the interrupt vector */</div><div class='add'>+	u16 itr_idx;		/* index in the interrupt vector */</div><div class='ctx'> 	u16 target_itr;		/* value in usecs divided by the hw-&gt;itr_gran */</div><div class='ctx'> 	u16 current_itr;	/* value in usecs divided by the hw-&gt;itr_gran */</div><div class='ctx'> 	/* high bit set means dynamic ITR, rest is used to store user</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h<br/>index 17086d5b5c33..a862af4cbf78 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_type.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_type.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_type.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_type.h</a></div><div class='hunk'>@@ -24,6 +24,7 @@ static inline bool ice_is_tc_ena(u8 bitmap, u8 tc)</div><div class='ctx'> /* debug masks - set these bits in hw-&gt;debug_mask to control output */</div><div class='ctx'> #define ICE_DBG_INIT		BIT_ULL(1)</div><div class='ctx'> #define ICE_DBG_LINK		BIT_ULL(4)</div><div class='add'>+#define ICE_DBG_PHY		BIT_ULL(5)</div><div class='ctx'> #define ICE_DBG_QCTX		BIT_ULL(6)</div><div class='ctx'> #define ICE_DBG_NVM		BIT_ULL(7)</div><div class='ctx'> #define ICE_DBG_LAN		BIT_ULL(8)</div><div class='hunk'>@@ -106,7 +107,7 @@ struct ice_link_status {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Different reset sources for which a disable queue AQ call has to be made in</div><div class='del'>- * order to clean the TX scheduler as a part of the reset</div><div class='add'>+ * order to clean the Tx scheduler as a part of the reset</div><div class='ctx'>  */</div><div class='ctx'> enum ice_disq_rst_src {</div><div class='ctx'> 	ICE_NO_RESET = 0,</div><div class='hunk'>@@ -128,11 +129,11 @@ struct ice_phy_info {</div><div class='ctx'> struct ice_hw_common_caps {</div><div class='ctx'> 	u32 valid_functions;</div><div class='ctx'> </div><div class='del'>-	/* TX/RX queues */</div><div class='del'>-	u16 num_rxq;		/* Number/Total RX queues */</div><div class='del'>-	u16 rxq_first_id;	/* First queue ID for RX queues */</div><div class='del'>-	u16 num_txq;		/* Number/Total TX queues */</div><div class='del'>-	u16 txq_first_id;	/* First queue ID for TX queues */</div><div class='add'>+	/* Tx/Rx queues */</div><div class='add'>+	u16 num_rxq;		/* Number/Total Rx queues */</div><div class='add'>+	u16 rxq_first_id;	/* First queue ID for Rx queues */</div><div class='add'>+	u16 num_txq;		/* Number/Total Tx queues */</div><div class='add'>+	u16 txq_first_id;	/* First queue ID for Tx queues */</div><div class='ctx'> </div><div class='ctx'> 	/* MSI-X vectors */</div><div class='ctx'> 	u16 num_msix_vectors;</div><div class='hunk'>@@ -147,6 +148,8 @@ struct ice_hw_common_caps {</div><div class='ctx'> 	/* RSS related capabilities */</div><div class='ctx'> 	u16 rss_table_size;		/* 512 for PFs and 64 for VFs */</div><div class='ctx'> 	u8 rss_table_entry_width;	/* RSS Entry width in bits */</div><div class='add'>+</div><div class='add'>+	u8 dcb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Function specific capabilities */</div><div class='hunk'>@@ -209,12 +212,17 @@ struct ice_nvm_info {</div><div class='ctx'> #define ICE_MAX_TRAFFIC_CLASS 8</div><div class='ctx'> #define ICE_TXSCHED_MAX_BRANCHES ICE_MAX_TRAFFIC_CLASS</div><div class='ctx'> </div><div class='add'>+#define ice_for_each_traffic_class(_i)	\</div><div class='add'>+	for ((_i) = 0; (_i) &lt; ICE_MAX_TRAFFIC_CLASS; (_i)++)</div><div class='add'>+</div><div class='add'>+#define ICE_INVAL_TEID 0xFFFFFFFF</div><div class='add'>+</div><div class='ctx'> struct ice_sched_node {</div><div class='ctx'> 	struct ice_sched_node *parent;</div><div class='ctx'> 	struct ice_sched_node *sibling; /* next sibling in the same layer */</div><div class='ctx'> 	struct ice_sched_node **children;</div><div class='ctx'> 	struct ice_aqc_txsched_elem_data info;</div><div class='del'>-	u32 agg_id;			/* aggregator group id */</div><div class='add'>+	u32 agg_id;			/* aggregator group ID */</div><div class='ctx'> 	u16 vsi_handle;</div><div class='ctx'> 	u8 in_use;			/* suspended or in use */</div><div class='ctx'> 	u8 tx_sched_layer;		/* Logical Layer (1-9) */</div><div class='hunk'>@@ -241,13 +249,12 @@ enum ice_agg_type {</div><div class='ctx'> #define ICE_SCHED_DFLT_RL_PROF_ID	0</div><div class='ctx'> #define ICE_SCHED_DFLT_BW_WT		1</div><div class='ctx'> </div><div class='del'>-/* vsi type list entry to locate corresponding vsi/ag nodes */</div><div class='add'>+/* VSI type list entry to locate corresponding VSI/ag nodes */</div><div class='ctx'> struct ice_sched_vsi_info {</div><div class='ctx'> 	struct ice_sched_node *vsi_node[ICE_MAX_TRAFFIC_CLASS];</div><div class='ctx'> 	struct ice_sched_node *ag_node[ICE_MAX_TRAFFIC_CLASS];</div><div class='ctx'> 	struct list_head list_entry;</div><div class='ctx'> 	u16 max_lanq[ICE_MAX_TRAFFIC_CLASS];</div><div class='del'>-	u16 vsi_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* driver defines the policy */</div><div class='hunk'>@@ -257,15 +264,70 @@ struct ice_sched_tx_policy {</div><div class='ctx'> 	u8 rdma_ena;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* CEE or IEEE 802.1Qaz ETS Configuration data */</div><div class='add'>+struct ice_dcb_ets_cfg {</div><div class='add'>+	u8 willing;</div><div class='add'>+	u8 cbs;</div><div class='add'>+	u8 maxtcs;</div><div class='add'>+	u8 prio_table[ICE_MAX_TRAFFIC_CLASS];</div><div class='add'>+	u8 tcbwtable[ICE_MAX_TRAFFIC_CLASS];</div><div class='add'>+	u8 tsatable[ICE_MAX_TRAFFIC_CLASS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CEE or IEEE 802.1Qaz PFC Configuration data */</div><div class='add'>+struct ice_dcb_pfc_cfg {</div><div class='add'>+	u8 willing;</div><div class='add'>+	u8 mbc;</div><div class='add'>+	u8 pfccap;</div><div class='add'>+	u8 pfcena;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CEE or IEEE 802.1Qaz Application Priority data */</div><div class='add'>+struct ice_dcb_app_priority_table {</div><div class='add'>+	u16 prot_id;</div><div class='add'>+	u8 priority;</div><div class='add'>+	u8 selector;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ICE_MAX_USER_PRIORITY	8</div><div class='add'>+#define ICE_DCBX_MAX_APPS	32</div><div class='add'>+#define ICE_LLDPDU_SIZE		1500</div><div class='add'>+#define ICE_TLV_STATUS_OPER	0x1</div><div class='add'>+#define ICE_TLV_STATUS_SYNC	0x2</div><div class='add'>+#define ICE_TLV_STATUS_ERR	0x4</div><div class='add'>+#define ICE_APP_PROT_ID_FCOE	0x8906</div><div class='add'>+#define ICE_APP_PROT_ID_ISCSI	0x0cbc</div><div class='add'>+#define ICE_APP_PROT_ID_FIP	0x8914</div><div class='add'>+#define ICE_APP_SEL_ETHTYPE	0x1</div><div class='add'>+#define ICE_APP_SEL_TCPIP	0x2</div><div class='add'>+#define ICE_CEE_APP_SEL_ETHTYPE	0x0</div><div class='add'>+#define ICE_CEE_APP_SEL_TCPIP	0x1</div><div class='add'>+</div><div class='add'>+struct ice_dcbx_cfg {</div><div class='add'>+	u32 numapps;</div><div class='add'>+	u32 tlv_status; /* CEE mode TLV status */</div><div class='add'>+	struct ice_dcb_ets_cfg etscfg;</div><div class='add'>+	struct ice_dcb_ets_cfg etsrec;</div><div class='add'>+	struct ice_dcb_pfc_cfg pfc;</div><div class='add'>+	struct ice_dcb_app_priority_table app[ICE_DCBX_MAX_APPS];</div><div class='add'>+	u8 dcbx_mode;</div><div class='add'>+#define ICE_DCBX_MODE_CEE	0x1</div><div class='add'>+#define ICE_DCBX_MODE_IEEE	0x2</div><div class='add'>+	u8 app_mode;</div><div class='add'>+#define ICE_DCBX_APPS_NON_WILLING	0x1</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ice_port_info {</div><div class='ctx'> 	struct ice_sched_node *root;	/* Root Node per Port */</div><div class='del'>-	struct ice_hw *hw;		/* back pointer to hw instance */</div><div class='add'>+	struct ice_hw *hw;		/* back pointer to HW instance */</div><div class='ctx'> 	u32 last_node_teid;		/* scheduler last node info */</div><div class='ctx'> 	u16 sw_id;			/* Initial switch ID belongs to port */</div><div class='ctx'> 	u16 pf_vf_num;</div><div class='ctx'> 	u8 port_state;</div><div class='ctx'> #define ICE_SCHED_PORT_STATE_INIT	0x0</div><div class='ctx'> #define ICE_SCHED_PORT_STATE_READY	0x1</div><div class='add'>+	u8 lport;</div><div class='add'>+#define ICE_LPORT_MASK			0xff</div><div class='ctx'> 	u16 dflt_tx_vsi_rule_id;</div><div class='ctx'> 	u16 dflt_tx_vsi_num;</div><div class='ctx'> 	u16 dflt_rx_vsi_rule_id;</div><div class='hunk'>@@ -274,9 +336,14 @@ struct ice_port_info {</div><div class='ctx'> 	struct ice_mac_info mac;</div><div class='ctx'> 	struct ice_phy_info phy;</div><div class='ctx'> 	struct mutex sched_lock;	/* protect access to TXSched tree */</div><div class='del'>-	u8 lport;</div><div class='del'>-#define ICE_LPORT_MASK		0xff</div><div class='del'>-	u8 is_vf;</div><div class='add'>+	struct ice_dcbx_cfg local_dcbx_cfg;	/* Oper/Local Cfg */</div><div class='add'>+	/* DCBX info */</div><div class='add'>+	struct ice_dcbx_cfg remote_dcbx_cfg;	/* Peer Cfg */</div><div class='add'>+	struct ice_dcbx_cfg desired_dcbx_cfg;	/* CEE Desired Cfg */</div><div class='add'>+	/* LLDP/DCBX Status */</div><div class='add'>+	u8 dcbx_status:3;		/* see ICE_DCBX_STATUS_DIS */</div><div class='add'>+	u8 is_sw_lldp:1;</div><div class='add'>+	u8 is_vf:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ice_switch_info {</div><div class='hunk'>@@ -320,7 +387,7 @@ struct ice_hw {</div><div class='ctx'> </div><div class='ctx'> 	u8 pf_id;		/* device profile info */</div><div class='ctx'> </div><div class='del'>-	/* TX Scheduler values */</div><div class='add'>+	/* Tx Scheduler values */</div><div class='ctx'> 	u16 num_tx_sched_layers;</div><div class='ctx'> 	u16 num_tx_sched_phys_layers;</div><div class='ctx'> 	u8 flattened_layers;</div><div class='hunk'>@@ -331,7 +398,7 @@ struct ice_hw {</div><div class='ctx'> </div><div class='ctx'> 	struct ice_vsi_ctx *vsi_ctx[ICE_MAX_VSI];</div><div class='ctx'> 	u8 evb_veb;		/* true for VEB, false for VEPA */</div><div class='del'>-	u8 reset_ongoing;	/* true if hw is in reset, false otherwise */</div><div class='add'>+	u8 reset_ongoing;	/* true if HW is in reset, false otherwise */</div><div class='ctx'> 	struct ice_bus_info bus;</div><div class='ctx'> 	struct ice_nvm_info nvm;</div><div class='ctx'> 	struct ice_hw_dev_caps dev_caps;	/* device capabilities */</div><div class='hunk'>@@ -410,6 +477,11 @@ struct ice_hw_port_stats {</div><div class='ctx'> 	u64 link_xoff_rx;		/* lxoffrxc */</div><div class='ctx'> 	u64 link_xon_tx;		/* lxontxc */</div><div class='ctx'> 	u64 link_xoff_tx;		/* lxofftxc */</div><div class='add'>+	u64 priority_xon_rx[8];		/* pxonrxc[8] */</div><div class='add'>+	u64 priority_xoff_rx[8];	/* pxoffrxc[8] */</div><div class='add'>+	u64 priority_xon_tx[8];		/* pxontxc[8] */</div><div class='add'>+	u64 priority_xoff_tx[8];	/* pxofftxc[8] */</div><div class='add'>+	u64 priority_xon_2_xoff[8];	/* pxon2offc[8] */</div><div class='ctx'> 	u64 rx_size_64;			/* prc64 */</div><div class='ctx'> 	u64 rx_size_127;		/* prc127 */</div><div class='ctx'> 	u64 rx_size_255;		/* prc255 */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c<br/>index 57155b4a59dc..a805cbdd69be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c</a></div><div class='hunk'>@@ -5,6 +5,37 @@</div><div class='ctx'> #include "ice_lib.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_err_to_virt err - translate errors for VF return code</div><div class='add'>+ * @ice_err: error return code</div><div class='add'>+ */</div><div class='add'>+static enum virtchnl_status_code ice_err_to_virt_err(enum ice_status ice_err)</div><div class='add'>+{</div><div class='add'>+	switch (ice_err) {</div><div class='add'>+	case ICE_SUCCESS:</div><div class='add'>+		return VIRTCHNL_STATUS_SUCCESS;</div><div class='add'>+	case ICE_ERR_BAD_PTR:</div><div class='add'>+	case ICE_ERR_INVAL_SIZE:</div><div class='add'>+	case ICE_ERR_DEVICE_NOT_SUPPORTED:</div><div class='add'>+	case ICE_ERR_PARAM:</div><div class='add'>+	case ICE_ERR_CFG:</div><div class='add'>+		return VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+	case ICE_ERR_NO_MEMORY:</div><div class='add'>+		return VIRTCHNL_STATUS_ERR_NO_MEMORY;</div><div class='add'>+	case ICE_ERR_NOT_READY:</div><div class='add'>+	case ICE_ERR_RESET_FAILED:</div><div class='add'>+	case ICE_ERR_FW_API_VER:</div><div class='add'>+	case ICE_ERR_AQ_ERROR:</div><div class='add'>+	case ICE_ERR_AQ_TIMEOUT:</div><div class='add'>+	case ICE_ERR_AQ_FULL:</div><div class='add'>+	case ICE_ERR_AQ_NO_WORK:</div><div class='add'>+	case ICE_ERR_AQ_EMPTY:</div><div class='add'>+		return VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR;</div><div class='add'>+	default:</div><div class='add'>+		return VIRTCHNL_STATUS_ERR_NOT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ice_vc_vf_broadcast - Broadcast a message to all VFs on PF</div><div class='ctx'>  * @pf: pointer to the PF structure</div><div class='ctx'>  * @v_opcode: operation code</div><div class='hunk'>@@ -14,7 +45,7 @@</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> ice_vc_vf_broadcast(struct ice_pf *pf, enum virtchnl_ops v_opcode,</div><div class='del'>-		    enum ice_status v_retval, u8 *msg, u16 msglen)</div><div class='add'>+		    enum virtchnl_status_code v_retval, u8 *msg, u16 msglen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	struct ice_vf *vf = pf-&gt;vf;</div><div class='hunk'>@@ -104,7 +135,8 @@ static void ice_vc_notify_vf_link_state(struct ice_vf *vf)</div><div class='ctx'> 		ice_set_pfe_link(vf, &amp;pfe, ls-&gt;link_speed, ls-&gt;link_info &amp;</div><div class='ctx'> 				 ICE_AQ_LINK_UP);</div><div class='ctx'> </div><div class='del'>-	ice_aq_send_msg_to_vf(hw, vf-&gt;vf_id, VIRTCHNL_OP_EVENT, 0, (u8 *)&amp;pfe,</div><div class='add'>+	ice_aq_send_msg_to_vf(hw, vf-&gt;vf_id, VIRTCHNL_OP_EVENT,</div><div class='add'>+			      VIRTCHNL_STATUS_SUCCESS, (u8 *)&amp;pfe,</div><div class='ctx'> 			      sizeof(pfe), NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -343,11 +375,41 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vsi_set_pvid - Set port VLAN id for the VSI</div><div class='del'>- * @vsi: the VSI being changed</div><div class='del'>- * @vid: the VLAN id to set as a PVID</div><div class='add'>+ * ice_vsi_set_pvid_fill_ctxt - Set VSI ctxt for add PVID</div><div class='add'>+ * @ctxt: the VSI ctxt to fill</div><div class='add'>+ * @vid: the VLAN ID to set as a PVID</div><div class='add'>+ */</div><div class='add'>+static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;info.vlan_flags = (ICE_AQ_VSI_VLAN_MODE_UNTAGGED |</div><div class='add'>+				 ICE_AQ_VSI_PVLAN_INSERT_PVID |</div><div class='add'>+				 ICE_AQ_VSI_VLAN_EMOD_STR);</div><div class='add'>+	ctxt-&gt;info.pvid = cpu_to_le16(vid);</div><div class='add'>+	ctxt-&gt;info.sw_flags2 |= ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA;</div><div class='add'>+	ctxt-&gt;info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID |</div><div class='add'>+						ICE_AQ_VSI_PROP_SW_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_vsi_kill_pvid_fill_ctxt - Set VSI ctx for remove PVID</div><div class='add'>+ * @ctxt: the VSI ctxt to fill</div><div class='add'>+ */</div><div class='add'>+static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;info.vlan_flags = ICE_AQ_VSI_VLAN_EMOD_NOTHING;</div><div class='add'>+	ctxt-&gt;info.vlan_flags |= ICE_AQ_VSI_VLAN_MODE_ALL;</div><div class='add'>+	ctxt-&gt;info.sw_flags2 &amp;= ~ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA;</div><div class='add'>+	ctxt-&gt;info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID |</div><div class='add'>+						ICE_AQ_VSI_PROP_SW_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ice_vsi_manage_pvid - Enable or disable port VLAN for VSI</div><div class='add'>+ * @vsi: the VSI to update</div><div class='add'>+ * @vid: the VLAN ID to set as a PVID</div><div class='add'>+ * @enable: true for enable PVID false for disable</div><div class='ctx'>  */</div><div class='del'>-static int ice_vsi_set_pvid(struct ice_vsi *vsi, u16 vid)</div><div class='add'>+static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;vsi-&gt;back-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct ice_hw *hw = &amp;vsi-&gt;back-&gt;hw;</div><div class='hunk'>@@ -359,50 +421,31 @@ static int ice_vsi_set_pvid(struct ice_vsi *vsi, u16 vid)</div><div class='ctx'> 	if (!ctxt)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ctxt-&gt;info.vlan_flags = (ICE_AQ_VSI_VLAN_MODE_UNTAGGED |</div><div class='del'>-				 ICE_AQ_VSI_PVLAN_INSERT_PVID |</div><div class='del'>-				 ICE_AQ_VSI_VLAN_EMOD_STR);</div><div class='del'>-	ctxt-&gt;info.pvid = cpu_to_le16(vid);</div><div class='del'>-	ctxt-&gt;info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);</div><div class='add'>+	ctxt-&gt;info = vsi-&gt;info;</div><div class='add'>+	if (enable)</div><div class='add'>+		ice_vsi_set_pvid_fill_ctxt(ctxt, vid);</div><div class='add'>+	else</div><div class='add'>+		ice_vsi_kill_pvid_fill_ctxt(ctxt);</div><div class='ctx'> </div><div class='ctx'> 	status = ice_update_vsi(hw, vsi-&gt;idx, ctxt, NULL);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		dev_info(dev, "update VSI for VLAN insert failed, err %d aq_err %d\n",</div><div class='add'>+		dev_info(dev, "update VSI for port VLAN failed, err %d aq_err %d\n",</div><div class='ctx'> 			 status, hw-&gt;adminq.sq_last_status);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi-&gt;info.pvid = ctxt-&gt;info.pvid;</div><div class='del'>-	vsi-&gt;info.vlan_flags = ctxt-&gt;info.vlan_flags;</div><div class='add'>+	vsi-&gt;info = ctxt-&gt;info;</div><div class='ctx'> out:</div><div class='ctx'> 	devm_kfree(dev, ctxt);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ice_vsi_kill_pvid - Remove port VLAN id from the VSI</div><div class='del'>- * @vsi: the VSI being changed</div><div class='del'>- */</div><div class='del'>-static int ice_vsi_kill_pvid(struct ice_vsi *vsi)</div><div class='del'>-{</div><div class='del'>-	struct ice_pf *pf = vsi-&gt;back;</div><div class='del'>-</div><div class='del'>-	if (ice_vsi_manage_vlan_stripping(vsi, false)) {</div><div class='del'>-		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Error removing Port VLAN on VSI %i\n",</div><div class='del'>-			vsi-&gt;vsi_num);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vsi-&gt;info.pvid = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ice_vf_vsi_setup - Set up a VF VSI</div><div class='ctx'>  * @pf: board private structure</div><div class='ctx'>  * @pi: pointer to the port_info instance</div><div class='del'>- * @vf_id: defines VF id to which this VSI connects.</div><div class='add'>+ * @vf_id: defines VF ID to which this VSI connects.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns pointer to the successfully allocated VSI struct on success,</div><div class='ctx'>  * otherwise returns NULL on failure.</div><div class='hunk'>@@ -446,8 +489,10 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)</div><div class='ctx'> 	vsi-&gt;hw_base_vector += 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if port VLAN exist before, and restore it accordingly */</div><div class='del'>-	if (vf-&gt;port_vlan_id)</div><div class='del'>-		ice_vsi_set_pvid(vsi, vf-&gt;port_vlan_id);</div><div class='add'>+	if (vf-&gt;port_vlan_id) {</div><div class='add'>+		ice_vsi_manage_pvid(vsi, vf-&gt;port_vlan_id, true);</div><div class='add'>+		ice_vsi_add_vlan(vsi, vf-&gt;port_vlan_id &amp; ICE_VLAN_M);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	eth_broadcast_addr(broadcast);</div><div class='ctx'> </div><div class='hunk'>@@ -468,7 +513,7 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)</div><div class='ctx'> </div><div class='ctx'> 	/* Clear this bit after VF initialization since we shouldn't reclaim</div><div class='ctx'> 	 * and reassign interrupts for synchronous or asynchronous VFR events.</div><div class='del'>-	 * We dont want to reconfigure interrupts since AVF driver doesn't</div><div class='add'>+	 * We don't want to reconfigure interrupts since AVF driver doesn't</div><div class='ctx'> 	 * expect vector assignment to be changed unless there is a request for</div><div class='ctx'> 	 * more vectors.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -484,6 +529,8 @@ ice_alloc_vsi_res_exit:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_alloc_vf_res(struct ice_vf *vf)</div><div class='ctx'> {</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='add'>+	int tx_rx_queue_left;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* setup VF VSI and necessary resources */</div><div class='hunk'>@@ -491,6 +538,15 @@ static int ice_alloc_vf_res(struct ice_vf *vf)</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto ice_alloc_vf_res_exit;</div><div class='ctx'> </div><div class='add'>+	/* Update number of VF queues, in case VF had requested for queue</div><div class='add'>+	 * changes</div><div class='add'>+	 */</div><div class='add'>+	tx_rx_queue_left = min_t(int, pf-&gt;q_left_tx, pf-&gt;q_left_rx);</div><div class='add'>+	tx_rx_queue_left += ICE_DFLT_QS_PER_VF;</div><div class='add'>+	if (vf-&gt;num_req_qs &amp;&amp; vf-&gt;num_req_qs &lt;= tx_rx_queue_left &amp;&amp;</div><div class='add'>+	    vf-&gt;num_req_qs != vf-&gt;num_vf_qs)</div><div class='add'>+		vf-&gt;num_vf_qs = vf-&gt;num_req_qs;</div><div class='add'>+</div><div class='ctx'> 	if (vf-&gt;trusted)</div><div class='ctx'> 		set_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &amp;vf-&gt;vf_caps);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -548,6 +604,10 @@ static void ice_ena_vf_mappings(struct ice_vf *vf)</div><div class='ctx'> 		wr32(hw, GLINT_VECT2FUNC(v), reg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Map mailbox interrupt. We put an explicit 0 here to remind us that</div><div class='add'>+	 * VF admin queue interrupts will go to VF MSI-X vector 0.</div><div class='add'>+	 */</div><div class='add'>+	wr32(hw, VPINT_MBX_CTL(abs_vf_id), VPINT_MBX_CTL_CAUSE_ENA_M | 0);</div><div class='ctx'> 	/* set regardless of mapping mode */</div><div class='ctx'> 	wr32(hw, VPLAN_TXQ_MAPENA(vf-&gt;vf_id), VPLAN_TXQ_MAPENA_TX_ENA_M);</div><div class='ctx'> </div><div class='hunk'>@@ -750,6 +810,47 @@ static void ice_cleanup_and_realloc_vf(struct ice_vf *vf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ice_vf_set_vsi_promisc - set given VF VSI to given promiscuous mode(s)</div><div class='add'>+ * @vf: pointer to the VF info</div><div class='add'>+ * @vsi: the VSI being configured</div><div class='add'>+ * @promisc_m: mask of promiscuous config bits</div><div class='add'>+ * @rm_promisc: promisc flag request from the VF to remove or add filter</div><div class='add'>+ *</div><div class='add'>+ * This function configures VF VSI promiscuous mode, based on the VF requests,</div><div class='add'>+ * for Unicast, Multicast and VLAN</div><div class='add'>+ */</div><div class='add'>+static enum ice_status</div><div class='add'>+ice_vf_set_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m,</div><div class='add'>+		       bool rm_promisc)</div><div class='add'>+{</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='add'>+	enum ice_status status = 0;</div><div class='add'>+	struct ice_hw *hw;</div><div class='add'>+</div><div class='add'>+	hw = &amp;pf-&gt;hw;</div><div class='add'>+	if (vf-&gt;num_vlan) {</div><div class='add'>+		status = ice_set_vlan_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						  rm_promisc);</div><div class='add'>+	} else if (vf-&gt;port_vlan_id) {</div><div class='add'>+		if (rm_promisc)</div><div class='add'>+			status = ice_clear_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						       vf-&gt;port_vlan_id);</div><div class='add'>+		else</div><div class='add'>+			status = ice_set_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						     vf-&gt;port_vlan_id);</div><div class='add'>+	} else {</div><div class='add'>+		if (rm_promisc)</div><div class='add'>+			status = ice_clear_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						       0);</div><div class='add'>+		else</div><div class='add'>+			status = ice_set_vsi_promisc(hw, vsi-&gt;idx, promisc_m,</div><div class='add'>+						     0);</div><div class='add'>+	}</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='ctx'>  * ice_reset_all_vfs - reset all allocated VFs in one go</div><div class='ctx'>  * @pf: pointer to the PF structure</div><div class='ctx'>  * @is_vflr: true if VFLR was issued, false if not</div><div class='hunk'>@@ -764,6 +865,7 @@ static void ice_cleanup_and_realloc_vf(struct ice_vf *vf)</div><div class='ctx'> bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='add'>+	struct ice_vf *vf;</div><div class='ctx'> 	int v, i;</div><div class='ctx'> </div><div class='ctx'> 	/* If we don't have any VFs, then there is nothing to reset */</div><div class='hunk'>@@ -778,12 +880,17 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)</div><div class='ctx'> 	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++)</div><div class='ctx'> 		ice_trigger_vf_reset(&amp;pf-&gt;vf[v], is_vflr);</div><div class='ctx'> </div><div class='del'>-	/* Call Disable LAN Tx queue AQ call with VFR bit set and 0</div><div class='del'>-	 * queues to inform Firmware about VF reset.</div><div class='del'>-	 */</div><div class='del'>-	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++)</div><div class='del'>-		ice_dis_vsi_txq(pf-&gt;vsi[0]-&gt;port_info, 0, NULL, NULL,</div><div class='del'>-				ICE_VF_RESET, v, NULL);</div><div class='add'>+	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++) {</div><div class='add'>+		struct ice_vsi *vsi;</div><div class='add'>+</div><div class='add'>+		vf = &amp;pf-&gt;vf[v];</div><div class='add'>+		vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='add'>+		if (test_bit(ICE_VF_STATE_ENA, vf-&gt;vf_states)) {</div><div class='add'>+			ice_vsi_stop_lan_tx_rings(vsi, ICE_VF_RESET, vf-&gt;vf_id);</div><div class='add'>+			ice_vsi_stop_rx_rings(vsi);</div><div class='add'>+			clear_bit(ICE_VF_STATE_ENA, vf-&gt;vf_states);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* HW requires some time to make sure it can flush the FIFO for a VF</div><div class='ctx'> 	 * when it resets it. Poll the VPGEN_VFRSTAT register for each VF in</div><div class='hunk'>@@ -796,9 +903,9 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)</div><div class='ctx'> </div><div class='ctx'> 		/* Check each VF in sequence */</div><div class='ctx'> 		while (v &lt; pf-&gt;num_alloc_vfs) {</div><div class='del'>-			struct ice_vf *vf = &amp;pf-&gt;vf[v];</div><div class='ctx'> 			u32 reg;</div><div class='ctx'> </div><div class='add'>+			vf = &amp;pf-&gt;vf[v];</div><div class='ctx'> 			reg = rd32(hw, VPGEN_VFRSTAT(vf-&gt;vf_id));</div><div class='ctx'> 			if (!(reg &amp; VPGEN_VFRSTAT_VFRD_M))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -818,8 +925,18 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)</div><div class='ctx'> 	usleep_range(10000, 20000);</div><div class='ctx'> </div><div class='ctx'> 	/* free VF resources to begin resetting the VSI state */</div><div class='del'>-	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++)</div><div class='del'>-		ice_free_vf_res(&amp;pf-&gt;vf[v]);</div><div class='add'>+	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++) {</div><div class='add'>+		vf = &amp;pf-&gt;vf[v];</div><div class='add'>+</div><div class='add'>+		ice_free_vf_res(vf);</div><div class='add'>+</div><div class='add'>+		/* Free VF queues as well, and reallocate later.</div><div class='add'>+		 * If a given VF has different number of queues</div><div class='add'>+		 * configured, the request for update will come</div><div class='add'>+		 * via mailbox communication.</div><div class='add'>+		 */</div><div class='add'>+		vf-&gt;num_vf_qs = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice_check_avail_res(pf)) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -828,8 +945,15 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Finish the reset on each VF */</div><div class='del'>-	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++)</div><div class='del'>-		ice_cleanup_and_realloc_vf(&amp;pf-&gt;vf[v]);</div><div class='add'>+	for (v = 0; v &lt; pf-&gt;num_alloc_vfs; v++) {</div><div class='add'>+		vf = &amp;pf-&gt;vf[v];</div><div class='add'>+</div><div class='add'>+		vf-&gt;num_vf_qs = pf-&gt;num_vf_qps;</div><div class='add'>+		dev_dbg(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"VF-id %d has %d queues configured\n",</div><div class='add'>+			vf-&gt;vf_id, vf-&gt;num_vf_qs);</div><div class='add'>+		ice_cleanup_and_realloc_vf(vf);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ice_flush(hw);</div><div class='ctx'> 	clear_bit(__ICE_VF_DIS, pf-&gt;state);</div><div class='hunk'>@@ -847,9 +971,10 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)</div><div class='ctx'> static bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='del'>-	struct ice_hw *hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='add'>+	struct ice_hw *hw;</div><div class='ctx'> 	bool rsd = false;</div><div class='add'>+	u8 promisc_m;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -871,10 +996,11 @@ static bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)</div><div class='ctx'> 		/* Call Disable LAN Tx queue AQ call even when queues are not</div><div class='ctx'> 		 * enabled. This is needed for successful completiom of VFR</div><div class='ctx'> 		 */</div><div class='del'>-		ice_dis_vsi_txq(vsi-&gt;port_info, 0, NULL, NULL, ICE_VF_RESET,</div><div class='del'>-				vf-&gt;vf_id, NULL);</div><div class='add'>+		ice_dis_vsi_txq(vsi-&gt;port_info, vsi-&gt;idx, 0, 0, NULL, NULL,</div><div class='add'>+				NULL, ICE_VF_RESET, vf-&gt;vf_id, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hw = &amp;pf-&gt;hw;</div><div class='ctx'> 	/* poll VPGEN_VFRSTAT reg to make sure</div><div class='ctx'> 	 * that reset is complete</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -900,6 +1026,21 @@ static bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)</div><div class='ctx'> </div><div class='ctx'> 	usleep_range(10000, 20000);</div><div class='ctx'> </div><div class='add'>+	/* disable promiscuous modes in case they were enabled</div><div class='add'>+	 * ignore any error if disabling process failed</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ICE_VF_STATE_UC_PROMISC, vf-&gt;vf_states) ||</div><div class='add'>+	    test_bit(ICE_VF_STATE_MC_PROMISC, vf-&gt;vf_states)) {</div><div class='add'>+		if (vf-&gt;port_vlan_id ||  vf-&gt;num_vlan)</div><div class='add'>+			promisc_m = ICE_UCAST_VLAN_PROMISC_BITS;</div><div class='add'>+		else</div><div class='add'>+			promisc_m = ICE_UCAST_PROMISC_BITS;</div><div class='add'>+</div><div class='add'>+		vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='add'>+		if (ice_vf_set_vsi_promisc(vf, vsi, promisc_m, true))</div><div class='add'>+			dev_err(&amp;pf-&gt;pdev-&gt;dev, "disabling promiscuous mode failed\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* free VF resources to begin resetting the VSI state */</div><div class='ctx'> 	ice_free_vf_res(vf);</div><div class='ctx'> </div><div class='hunk'>@@ -938,7 +1079,7 @@ void ice_vc_notify_reset(struct ice_pf *pf)</div><div class='ctx'> </div><div class='ctx'> 	pfe.event = VIRTCHNL_EVENT_RESET_IMPENDING;</div><div class='ctx'> 	pfe.severity = PF_EVENT_SEVERITY_CERTAIN_DOOM;</div><div class='del'>-	ice_vc_vf_broadcast(pf, VIRTCHNL_OP_EVENT, ICE_SUCCESS,</div><div class='add'>+	ice_vc_vf_broadcast(pf, VIRTCHNL_OP_EVENT, VIRTCHNL_STATUS_SUCCESS,</div><div class='ctx'> 			    (u8 *)&amp;pfe, sizeof(struct virtchnl_pf_event));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -961,8 +1102,9 @@ static void ice_vc_notify_vf_reset(struct ice_vf *vf)</div><div class='ctx'> </div><div class='ctx'> 	pfe.event = VIRTCHNL_EVENT_RESET_IMPENDING;</div><div class='ctx'> 	pfe.severity = PF_EVENT_SEVERITY_CERTAIN_DOOM;</div><div class='del'>-	ice_aq_send_msg_to_vf(&amp;vf-&gt;pf-&gt;hw, vf-&gt;vf_id, VIRTCHNL_OP_EVENT, 0,</div><div class='del'>-			      (u8 *)&amp;pfe, sizeof(pfe), NULL);</div><div class='add'>+	ice_aq_send_msg_to_vf(&amp;vf-&gt;pf-&gt;hw, vf-&gt;vf_id, VIRTCHNL_OP_EVENT,</div><div class='add'>+			      VIRTCHNL_STATUS_SUCCESS, (u8 *)&amp;pfe, sizeof(pfe),</div><div class='add'>+			      NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1012,7 +1154,7 @@ static int ice_alloc_vfs(struct ice_pf *pf, u16 num_alloc_vfs)</div><div class='ctx'> 	pf-&gt;num_alloc_vfs = num_alloc_vfs;</div><div class='ctx'> </div><div class='ctx'> 	/* VF resources get allocated during reset */</div><div class='del'>-	if (!ice_reset_all_vfs(pf, false))</div><div class='add'>+	if (!ice_reset_all_vfs(pf, true))</div><div class='ctx'> 		goto err_unroll_sriov;</div><div class='ctx'> </div><div class='ctx'> 	goto err_unroll_intr;</div><div class='hunk'>@@ -1131,21 +1273,10 @@ void ice_process_vflr_event(struct ice_pf *pf)</div><div class='ctx'> 	int vf_id;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(__ICE_VFLR_EVENT_PENDING, pf-&gt;state) ||</div><div class='add'>+	if (!test_and_clear_bit(__ICE_VFLR_EVENT_PENDING, pf-&gt;state) ||</div><div class='ctx'> 	    !pf-&gt;num_alloc_vfs)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Re-enable the VFLR interrupt cause here, before looking for which</div><div class='del'>-	 * VF got reset. Otherwise, if another VF gets a reset while the</div><div class='del'>-	 * first one is being processed, that interrupt will be lost, and</div><div class='del'>-	 * that VF will be stuck in reset forever.</div><div class='del'>-	 */</div><div class='del'>-	reg = rd32(hw, PFINT_OICR_ENA);</div><div class='del'>-	reg |= PFINT_OICR_VFLR_M;</div><div class='del'>-	wr32(hw, PFINT_OICR_ENA, reg);</div><div class='del'>-	ice_flush(hw);</div><div class='del'>-</div><div class='del'>-	clear_bit(__ICE_VFLR_EVENT_PENDING, pf-&gt;state);</div><div class='ctx'> 	for (vf_id = 0; vf_id &lt; pf-&gt;num_alloc_vfs; vf_id++) {</div><div class='ctx'> 		struct ice_vf *vf = &amp;pf-&gt;vf[vf_id];</div><div class='ctx'> 		u32 reg_idx, bit_idx;</div><div class='hunk'>@@ -1182,8 +1313,9 @@ static void ice_vc_dis_vf(struct ice_vf *vf)</div><div class='ctx'>  *</div><div class='ctx'>  * send msg to VF</div><div class='ctx'>  */</div><div class='del'>-static int ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,</div><div class='del'>-				 enum ice_status v_retval, u8 *msg, u16 msglen)</div><div class='add'>+static int</div><div class='add'>+ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,</div><div class='add'>+		      enum virtchnl_status_code v_retval, u8 *msg, u16 msglen)</div><div class='ctx'> {</div><div class='ctx'> 	enum ice_status aq_ret;</div><div class='ctx'> 	struct ice_pf *pf;</div><div class='hunk'>@@ -1243,8 +1375,8 @@ static int ice_vc_get_ver_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 	if (VF_IS_V10(&amp;vf-&gt;vf_ver))</div><div class='ctx'> 		info.minor = VIRTCHNL_VERSION_MINOR_NO_VF_CAPS;</div><div class='ctx'> </div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_VERSION, ICE_SUCCESS,</div><div class='del'>-				     (u8 *)&amp;info,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_VERSION,</div><div class='add'>+				     VIRTCHNL_STATUS_SUCCESS, (u8 *)&amp;info,</div><div class='ctx'> 				     sizeof(struct virtchnl_version_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1257,15 +1389,15 @@ static int ice_vc_get_ver_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_vf_resource *vfres = NULL;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_INIT, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1273,7 +1405,7 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> </div><div class='ctx'> 	vfres = devm_kzalloc(&amp;pf-&gt;pdev-&gt;dev, len, GFP_KERNEL);</div><div class='ctx'> 	if (!vfres) {</div><div class='del'>-		aq_ret = ICE_ERR_NO_MEMORY;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1286,6 +1418,11 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> </div><div class='ctx'> 	vfres-&gt;vf_cap_flags = VIRTCHNL_VF_OFFLOAD_L2;</div><div class='ctx'> 	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='add'>+	if (!vsi) {</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!vsi-&gt;info.pvid)</div><div class='ctx'> 		vfres-&gt;vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_VLAN;</div><div class='ctx'> </div><div class='hunk'>@@ -1336,7 +1473,7 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	/* send the response back to the VF */</div><div class='del'>-	ret = ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_GET_VF_RESOURCES, aq_ret,</div><div class='add'>+	ret = ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_GET_VF_RESOURCES, v_ret,</div><div class='ctx'> 				    (u8 *)vfres, len);</div><div class='ctx'> </div><div class='ctx'> 	devm_kfree(&amp;pf-&gt;pdev-&gt;dev, vfres);</div><div class='hunk'>@@ -1360,15 +1497,15 @@ static void ice_vc_reset_vf_msg(struct ice_vf *vf)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_find_vsi_from_id</div><div class='ctx'>  * @pf: the pf structure to search for the VSI</div><div class='del'>- * @id: id of the VSI it is searching for</div><div class='add'>+ * @id: ID of the VSI it is searching for</div><div class='ctx'>  *</div><div class='del'>- * searches for the VSI with the given id</div><div class='add'>+ * searches for the VSI with the given ID</div><div class='ctx'>  */</div><div class='ctx'> static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pf-&gt;num_alloc_vsi; i++)</div><div class='add'>+	ice_for_each_vsi(pf, i)</div><div class='ctx'> 		if (pf-&gt;vsi[i] &amp;&amp; pf-&gt;vsi[i]-&gt;vsi_num == id)</div><div class='ctx'> 			return pf-&gt;vsi[i];</div><div class='ctx'> </div><div class='hunk'>@@ -1378,9 +1515,9 @@ static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_vc_isvalid_vsi_id</div><div class='ctx'>  * @vf: pointer to the VF info</div><div class='del'>- * @vsi_id: VF relative VSI id</div><div class='add'>+ * @vsi_id: VF relative VSI ID</div><div class='ctx'>  *</div><div class='del'>- * check for the valid VSI id</div><div class='add'>+ * check for the valid VSI ID</div><div class='ctx'>  */</div><div class='ctx'> static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1395,10 +1532,10 @@ static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id)</div><div class='ctx'> /**</div><div class='ctx'>  * ice_vc_isvalid_q_id</div><div class='ctx'>  * @vf: pointer to the VF info</div><div class='del'>- * @vsi_id: VSI id</div><div class='del'>- * @qid: VSI relative queue id</div><div class='add'>+ * @vsi_id: VSI ID</div><div class='add'>+ * @qid: VSI relative queue ID</div><div class='ctx'>  *</div><div class='del'>- * check for the valid queue id</div><div class='add'>+ * check for the valid queue ID</div><div class='ctx'>  */</div><div class='ctx'> static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid)</div><div class='ctx'> {</div><div class='hunk'>@@ -1416,42 +1553,42 @@ static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid)</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_config_rss_key(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_rss_key *vrk =</div><div class='ctx'> 		(struct virtchnl_rss_key *)msg;</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi = NULL;</div><div class='del'>-	enum ice_status aq_ret;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, vrk-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, vrk-&gt;vsi_id);</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vrk-&gt;key_len != ICE_VSIQF_HKEY_ARRAY_SIZE) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_FLAG_RSS_ENA, vf-&gt;pf-&gt;flags)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ice_set_rss(vsi, vrk-&gt;key, NULL, 0);</div><div class='del'>-	aq_ret = ret ? ICE_ERR_PARAM : ICE_SUCCESS;</div><div class='add'>+	if (ice_set_rss(vsi, vrk-&gt;key, NULL, 0))</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR;</div><div class='ctx'> error_param:</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_RSS_KEY, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_RSS_KEY, v_ret,</div><div class='ctx'> 				     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1465,40 +1602,40 @@ error_param:</div><div class='ctx'> static int ice_vc_config_rss_lut(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtchnl_rss_lut *vrl = (struct virtchnl_rss_lut *)msg;</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi = NULL;</div><div class='del'>-	enum ice_status aq_ret;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, vrl-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, vrl-&gt;vsi_id);</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vrl-&gt;lut_entries != ICE_VSIQF_HLUT_ARRAY_SIZE) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_FLAG_RSS_ENA, vf-&gt;pf-&gt;flags)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ice_set_rss(vsi, NULL, vrl-&gt;lut, ICE_VSIQF_HLUT_ARRAY_SIZE);</div><div class='del'>-	aq_ret = ret ? ICE_ERR_PARAM : ICE_SUCCESS;</div><div class='add'>+	if (ice_set_rss(vsi, NULL, vrl-&gt;lut, ICE_VSIQF_HLUT_ARRAY_SIZE))</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR;</div><div class='ctx'> error_param:</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_RSS_LUT, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_RSS_LUT, v_ret,</div><div class='ctx'> 				     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1511,25 +1648,26 @@ error_param:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_get_stats_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_queue_select *vqs =</div><div class='ctx'> 		(struct virtchnl_queue_select *)msg;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_eth_stats stats;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, vqs-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, vqs-&gt;vsi_id);</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1540,7 +1678,7 @@ static int ice_vc_get_stats_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> </div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_GET_STATS, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_GET_STATS, v_ret,</div><div class='ctx'> 				     (u8 *)&amp;stats, sizeof(stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1553,29 +1691,30 @@ error_param:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_queue_select *vqs =</div><div class='ctx'> 	    (struct virtchnl_queue_select *)msg;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, vqs-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!vqs-&gt;rx_queues &amp;&amp; !vqs-&gt;tx_queues) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, vqs-&gt;vsi_id);</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1584,15 +1723,15 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 	 * programmed using ice_vsi_cfg_txqs</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ice_vsi_start_rx_rings(vsi))</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> </div><div class='ctx'> 	/* Set flag to indicate that queues are enabled */</div><div class='del'>-	if (!aq_ret)</div><div class='add'>+	if (v_ret == VIRTCHNL_STATUS_SUCCESS)</div><div class='ctx'> 		set_bit(ICE_VF_STATE_ENA, vf-&gt;vf_states);</div><div class='ctx'> </div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_QUEUES, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_QUEUES, v_ret,</div><div class='ctx'> 				     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1606,30 +1745,31 @@ error_param:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_queue_select *vqs =</div><div class='ctx'> 	    (struct virtchnl_queue_select *)msg;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states) &amp;&amp;</div><div class='ctx'> 	    !test_bit(ICE_VF_STATE_ENA, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, vqs-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!vqs-&gt;rx_queues &amp;&amp; !vqs-&gt;tx_queues) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, vqs-&gt;vsi_id);</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1637,23 +1777,23 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 		dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"Failed to stop tx rings on VSI %d\n",</div><div class='ctx'> 			vsi-&gt;vsi_num);</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice_vsi_stop_rx_rings(vsi)) {</div><div class='ctx'> 		dev_err(&amp;vsi-&gt;back-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"Failed to stop rx rings on VSI %d\n",</div><div class='ctx'> 			vsi-&gt;vsi_num);</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear enabled queues flag */</div><div class='del'>-	if (!aq_ret)</div><div class='add'>+	if (v_ret == VIRTCHNL_STATUS_SUCCESS)</div><div class='ctx'> 		clear_bit(ICE_VF_STATE_ENA, vf-&gt;vf_states);</div><div class='ctx'> </div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_QUEUES, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_QUEUES, v_ret,</div><div class='ctx'> 				     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1666,22 +1806,30 @@ error_param:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_irq_map_info *irqmap_info =</div><div class='ctx'> 	    (struct virtchnl_irq_map_info *)msg;</div><div class='ctx'> 	u16 vsi_id, vsi_q_id, vector_id;</div><div class='ctx'> 	struct virtchnl_vector_map *map;</div><div class='ctx'> 	struct ice_vsi *vsi = NULL;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='ctx'> 	unsigned long qmap;</div><div class='add'>+	u16 num_q_vectors;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+	num_q_vectors = irqmap_info-&gt;num_vectors - ICE_NONQ_VECS_VF;</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states) ||</div><div class='add'>+	    !vsi || vsi-&gt;num_q_vectors &lt; num_q_vectors ||</div><div class='add'>+	    irqmap_info-&gt;num_vectors == 0) {</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; irqmap_info-&gt;num_vectors; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_q_vectors; i++) {</div><div class='add'>+		struct ice_q_vector *q_vector = vsi-&gt;q_vectors[i];</div><div class='add'>+</div><div class='ctx'> 		map = &amp;irqmap_info-&gt;vecmap[i];</div><div class='ctx'> </div><div class='ctx'> 		vector_id = map-&gt;vector_id;</div><div class='hunk'>@@ -1689,40 +1837,30 @@ static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 		/* validate msg params */</div><div class='ctx'> 		if (!(vector_id &lt; pf-&gt;hw.func_caps.common_cap</div><div class='ctx'> 		    .num_msix_vectors) || !ice_vc_isvalid_vsi_id(vf, vsi_id)) {</div><div class='del'>-			aq_ret = ICE_ERR_PARAM;</div><div class='del'>-			goto error_param;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vsi = ice_find_vsi_from_id(vf-&gt;pf, vsi_id);</div><div class='del'>-		if (!vsi) {</div><div class='del'>-			aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			goto error_param;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* lookout for the invalid queue index */</div><div class='ctx'> 		qmap = map-&gt;rxq_map;</div><div class='add'>+		q_vector-&gt;num_ring_rx = 0;</div><div class='ctx'> 		for_each_set_bit(vsi_q_id, &amp;qmap, ICE_MAX_BASE_QS_PER_VF) {</div><div class='del'>-			struct ice_q_vector *q_vector;</div><div class='del'>-</div><div class='ctx'> 			if (!ice_vc_isvalid_q_id(vf, vsi_id, vsi_q_id)) {</div><div class='del'>-				aq_ret = ICE_ERR_PARAM;</div><div class='add'>+				v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 				goto error_param;</div><div class='ctx'> 			}</div><div class='del'>-			q_vector = vsi-&gt;q_vectors[i];</div><div class='ctx'> 			q_vector-&gt;num_ring_rx++;</div><div class='ctx'> 			q_vector-&gt;rx.itr_idx = map-&gt;rxitr_idx;</div><div class='ctx'> 			vsi-&gt;rx_rings[vsi_q_id]-&gt;q_vector = q_vector;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		qmap = map-&gt;txq_map;</div><div class='add'>+		q_vector-&gt;num_ring_tx = 0;</div><div class='ctx'> 		for_each_set_bit(vsi_q_id, &amp;qmap, ICE_MAX_BASE_QS_PER_VF) {</div><div class='del'>-			struct ice_q_vector *q_vector;</div><div class='del'>-</div><div class='ctx'> 			if (!ice_vc_isvalid_q_id(vf, vsi_id, vsi_q_id)) {</div><div class='del'>-				aq_ret = ICE_ERR_PARAM;</div><div class='add'>+				v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 				goto error_param;</div><div class='ctx'> 			}</div><div class='del'>-			q_vector = vsi-&gt;q_vectors[i];</div><div class='ctx'> 			q_vector-&gt;num_ring_tx++;</div><div class='ctx'> 			q_vector-&gt;tx.itr_idx = map-&gt;txitr_idx;</div><div class='ctx'> 			vsi-&gt;tx_rings[vsi_q_id]-&gt;q_vector = q_vector;</div><div class='hunk'>@@ -1733,7 +1871,7 @@ static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 		ice_vsi_cfg_msix(vsi);</div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_IRQ_MAP, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_IRQ_MAP, v_ret,</div><div class='ctx'> 				     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1746,26 +1884,34 @@ error_param:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_vsi_queue_config_info *qci =</div><div class='ctx'> 	    (struct virtchnl_vsi_queue_config_info *)msg;</div><div class='ctx'> 	struct virtchnl_queue_pair_info *qpi;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='add'>+	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, qci-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, qci-&gt;vsi_id);</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		goto error_param;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qci-&gt;num_queue_pairs &gt; ICE_MAX_BASE_QS_PER_VF) {</div><div class='add'>+		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+			"VF-%d requesting more than supported number of queues: %d\n",</div><div class='add'>+			vf-&gt;vf_id, qci-&gt;num_queue_pairs);</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1775,7 +1921,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 		    qpi-&gt;rxq.vsi_id != qci-&gt;vsi_id ||</div><div class='ctx'> 		    qpi-&gt;rxq.queue_id != qpi-&gt;txq.queue_id ||</div><div class='ctx'> 		    !ice_vc_isvalid_q_id(vf, qci-&gt;vsi_id, qpi-&gt;txq.queue_id)) {</div><div class='del'>-			aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			goto error_param;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* copy Tx queue info from VF into VSI */</div><div class='hunk'>@@ -1785,13 +1931,13 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 		vsi-&gt;rx_rings[i]-&gt;dma = qpi-&gt;rxq.dma_ring_addr;</div><div class='ctx'> 		vsi-&gt;rx_rings[i]-&gt;count = qpi-&gt;rxq.ring_len;</div><div class='ctx'> 		if (qpi-&gt;rxq.databuffer_size &gt; ((16 * 1024) - 128)) {</div><div class='del'>-			aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			goto error_param;</div><div class='ctx'> 		}</div><div class='ctx'> 		vsi-&gt;rx_buf_len = qpi-&gt;rxq.databuffer_size;</div><div class='ctx'> 		if (qpi-&gt;rxq.max_pkt_size &gt;= (16 * 1024) ||</div><div class='ctx'> 		    qpi-&gt;rxq.max_pkt_size &lt; 64) {</div><div class='del'>-			aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			goto error_param;</div><div class='ctx'> 		}</div><div class='ctx'> 		vsi-&gt;max_frame = qpi-&gt;rxq.max_pkt_size;</div><div class='hunk'>@@ -1802,15 +1948,16 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> 	 */</div><div class='ctx'> 	vsi-&gt;num_txq = qci-&gt;num_queue_pairs;</div><div class='ctx'> 	vsi-&gt;num_rxq = qci-&gt;num_queue_pairs;</div><div class='add'>+	/* All queues of VF VSI are in TC 0 */</div><div class='add'>+	vsi-&gt;tc_cfg.tc_info[0].qcount_tx = qci-&gt;num_queue_pairs;</div><div class='add'>+	vsi-&gt;tc_cfg.tc_info[0].qcount_rx = qci-&gt;num_queue_pairs;</div><div class='ctx'> </div><div class='del'>-	if (!ice_vsi_cfg_lan_txqs(vsi) &amp;&amp; !ice_vsi_cfg_rxqs(vsi))</div><div class='del'>-		aq_ret = 0;</div><div class='del'>-	else</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+	if (ice_vsi_cfg_lan_txqs(vsi) || ice_vsi_cfg_rxqs(vsi))</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR;</div><div class='ctx'> </div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES, aq_ret,</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES, v_ret,</div><div class='ctx'> 				     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1845,18 +1992,18 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf)</div><div class='ctx'>  * ice_vc_handle_mac_addr_msg</div><div class='ctx'>  * @vf: pointer to the VF info</div><div class='ctx'>  * @msg: pointer to the msg buffer</div><div class='del'>- * @set: true if mac filters are being set, false otherwise</div><div class='add'>+ * @set: true if MAC filters are being set, false otherwise</div><div class='ctx'>  *</div><div class='ctx'>  * add guest MAC address filter</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_ether_addr_list *al =</div><div class='ctx'> 	    (struct virtchnl_ether_addr_list *)msg;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	enum virtchnl_ops vc_op;</div><div class='del'>-	enum ice_status ret;</div><div class='ctx'> 	LIST_HEAD(mac_list);</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> 	int mac_count = 0;</div><div class='hunk'>@@ -1869,19 +2016,27 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states) ||</div><div class='ctx'> 	    !ice_vc_isvalid_vsi_id(vf, al-&gt;vsi_id)) {</div><div class='del'>-		ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto handle_mac_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (set &amp;&amp; !ice_is_vf_trusted(vf) &amp;&amp;</div><div class='ctx'> 	    (vf-&gt;num_mac + al-&gt;num_elements) &gt; ICE_MAX_MACADDR_PER_VF) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			"Can't add more MAC addresses, because VF is not trusted, switch the VF to trusted mode in order to add more functionalities\n");</div><div class='del'>-		ret = ICE_ERR_PARAM;</div><div class='add'>+			"Can't add more MAC addresses, because VF-%d is not trusted, switch the VF to trusted mode in order to add more functionalities\n",</div><div class='add'>+			vf-&gt;vf_id);</div><div class='add'>+		/* There is no need to let VF know about not being trusted</div><div class='add'>+		 * to add more MAC addr, so we can just return success message.</div><div class='add'>+		 */</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto handle_mac_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='add'>+	if (!vsi) {</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+		goto handle_mac_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; al-&gt;num_elements; i++) {</div><div class='ctx'> 		u8 *maddr = al-&gt;list[i].addr;</div><div class='hunk'>@@ -1893,40 +2048,39 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)</div><div class='ctx'> 				 * already added. Just continue.</div><div class='ctx'> 				 */</div><div class='ctx'> 				dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-					 "mac %pM already set for VF %d\n",</div><div class='add'>+					 "MAC %pM already set for VF %d\n",</div><div class='ctx'> 					 maddr, vf-&gt;vf_id);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			} else {</div><div class='del'>-				/* VF can't remove dflt_lan_addr/bcast mac */</div><div class='add'>+				/* VF can't remove dflt_lan_addr/bcast MAC */</div><div class='ctx'> 				dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-					"can't remove mac %pM for VF %d\n",</div><div class='add'>+					"VF can't remove default MAC address or MAC %pM programmed by PF for VF %d\n",</div><div class='ctx'> 					maddr, vf-&gt;vf_id);</div><div class='del'>-				ret = ICE_ERR_PARAM;</div><div class='del'>-				goto handle_mac_exit;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* check for the invalid cases and bail if necessary */</div><div class='ctx'> 		if (is_zero_ether_addr(maddr)) {</div><div class='ctx'> 			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-				"invalid mac %pM provided for VF %d\n",</div><div class='add'>+				"invalid MAC %pM provided for VF %d\n",</div><div class='ctx'> 				maddr, vf-&gt;vf_id);</div><div class='del'>-			ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			goto handle_mac_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (is_unicast_ether_addr(maddr) &amp;&amp;</div><div class='ctx'> 		    !ice_can_vf_change_mac(vf)) {</div><div class='ctx'> 			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-				"can't change unicast mac for untrusted VF %d\n",</div><div class='add'>+				"can't change unicast MAC for untrusted VF %d\n",</div><div class='ctx'> 				vf-&gt;vf_id);</div><div class='del'>-			ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			goto handle_mac_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* get here if maddr is multicast or if VF can change mac */</div><div class='add'>+		/* get here if maddr is multicast or if VF can change MAC */</div><div class='ctx'> 		if (ice_add_mac_to_list(vsi, &amp;mac_list, al-&gt;list[i].addr)) {</div><div class='del'>-			ret = ICE_ERR_NO_MEMORY;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;</div><div class='ctx'> 			goto handle_mac_exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		mac_count++;</div><div class='hunk'>@@ -1934,14 +2088,14 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)</div><div class='ctx'> </div><div class='ctx'> 	/* program the updated filter list */</div><div class='ctx'> 	if (set)</div><div class='del'>-		ret = ice_add_mac(&amp;pf-&gt;hw, &amp;mac_list);</div><div class='add'>+		v_ret = ice_err_to_virt_err(ice_add_mac(&amp;pf-&gt;hw, &amp;mac_list));</div><div class='ctx'> 	else</div><div class='del'>-		ret = ice_remove_mac(&amp;pf-&gt;hw, &amp;mac_list);</div><div class='add'>+		v_ret = ice_err_to_virt_err(ice_remove_mac(&amp;pf-&gt;hw, &amp;mac_list));</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='add'>+	if (v_ret) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			"can't update mac filters for VF %d, error %d\n",</div><div class='del'>-			vf-&gt;vf_id, ret);</div><div class='add'>+			"can't update MAC filters for VF %d, error %d\n",</div><div class='add'>+			vf-&gt;vf_id, v_ret);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (set)</div><div class='ctx'> 			vf-&gt;num_mac += mac_count;</div><div class='hunk'>@@ -1952,7 +2106,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)</div><div class='ctx'> handle_mac_exit:</div><div class='ctx'> 	ice_free_fltr_list(&amp;pf-&gt;pdev-&gt;dev, &amp;mac_list);</div><div class='ctx'> 	/* send the response to the VF */</div><div class='del'>-	return ice_vc_send_msg_to_vf(vf, vc_op, ret, NULL, 0);</div><div class='add'>+	return ice_vc_send_msg_to_vf(vf, vc_op, v_ret, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1987,39 +2141,42 @@ static int ice_vc_del_mac_addr_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'>  * VFs get a default number of queues but can use this message to request a</div><div class='ctx'>  * different number. If the request is successful, PF will reset the VF and</div><div class='ctx'>  * return 0. If unsuccessful, PF will send message informing VF of number of</div><div class='del'>- * available queue pairs via virtchnl message response to vf.</div><div class='add'>+ * available queue pairs via virtchnl message response to VF.</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_vf_res_request *vfres =</div><div class='ctx'> 		(struct virtchnl_vf_res_request *)msg;</div><div class='ctx'> 	int req_queues = vfres-&gt;num_queue_pairs;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='add'>+	int max_allowed_vf_queues;</div><div class='ctx'> 	int tx_rx_queue_left;</div><div class='ctx'> 	int cur_queues;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cur_queues = pf-&gt;num_vf_qps;</div><div class='add'>+	cur_queues = vf-&gt;num_vf_qs;</div><div class='ctx'> 	tx_rx_queue_left = min_t(int, pf-&gt;q_left_tx, pf-&gt;q_left_rx);</div><div class='add'>+	max_allowed_vf_queues = tx_rx_queue_left + cur_queues;</div><div class='ctx'> 	if (req_queues &lt;= 0) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"VF %d tried to request %d queues. Ignoring.\n",</div><div class='ctx'> 			vf-&gt;vf_id, req_queues);</div><div class='del'>-	} else if (req_queues &gt; ICE_MAX_QS_PER_VF) {</div><div class='add'>+	} else if (req_queues &gt; ICE_MAX_BASE_QS_PER_VF) {</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"VF %d tried to request more than %d queues.\n",</div><div class='del'>-			vf-&gt;vf_id, ICE_MAX_QS_PER_VF);</div><div class='del'>-		vfres-&gt;num_queue_pairs = ICE_MAX_QS_PER_VF;</div><div class='add'>+			vf-&gt;vf_id, ICE_MAX_BASE_QS_PER_VF);</div><div class='add'>+		vfres-&gt;num_queue_pairs = ICE_MAX_BASE_QS_PER_VF;</div><div class='ctx'> 	} else if (req_queues - cur_queues &gt; tx_rx_queue_left) {</div><div class='ctx'> 		dev_warn(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 			 "VF %d requested %d more queues, but only %d left.\n",</div><div class='ctx'> 			 vf-&gt;vf_id, req_queues - cur_queues, tx_rx_queue_left);</div><div class='del'>-		vfres-&gt;num_queue_pairs = tx_rx_queue_left + cur_queues;</div><div class='add'>+		vfres-&gt;num_queue_pairs = min_t(int, max_allowed_vf_queues,</div><div class='add'>+					       ICE_MAX_BASE_QS_PER_VF);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* request is successful, then reset VF */</div><div class='ctx'> 		vf-&gt;num_req_qs = req_queues;</div><div class='hunk'>@@ -2033,18 +2190,18 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='ctx'> 	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_REQUEST_QUEUES,</div><div class='del'>-				     aq_ret, (u8 *)vfres, sizeof(*vfres));</div><div class='add'>+				     v_ret, (u8 *)vfres, sizeof(*vfres));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ice_set_vf_port_vlan</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @vf_id: VF identifier</div><div class='del'>- * @vlan_id: VLAN id being set</div><div class='add'>+ * @vlan_id: VLAN ID being set</div><div class='ctx'>  * @qos: priority setting</div><div class='ctx'>  * @vlan_proto: VLAN protocol</div><div class='ctx'>  *</div><div class='del'>- * program VF Port VLAN id and/or qos</div><div class='add'>+ * program VF Port VLAN ID and/or QoS</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,</div><div class='hunk'>@@ -2087,17 +2244,18 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If pvid, then remove all filters on the old VLAN */</div><div class='add'>+	/* If PVID, then remove all filters on the old VLAN */</div><div class='ctx'> 	if (vsi-&gt;info.pvid)</div><div class='ctx'> 		ice_vsi_kill_vlan(vsi, (le16_to_cpu(vsi-&gt;info.pvid) &amp;</div><div class='ctx'> 				  VLAN_VID_MASK));</div><div class='ctx'> </div><div class='ctx'> 	if (vlan_id || qos) {</div><div class='del'>-		ret = ice_vsi_set_pvid(vsi, vlanprio);</div><div class='add'>+		ret = ice_vsi_manage_pvid(vsi, vlanprio, true);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error_set_pvid;</div><div class='ctx'> 	} else {</div><div class='del'>-		ice_vsi_kill_pvid(vsi);</div><div class='add'>+		ice_vsi_manage_pvid(vsi, 0, false);</div><div class='add'>+		vsi-&gt;info.pvid = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vlan_id) {</div><div class='hunk'>@@ -2125,52 +2283,60 @@ error_set_pvid:</div><div class='ctx'>  * @msg: pointer to the msg buffer</div><div class='ctx'>  * @add_v: Add VLAN if true, otherwise delete VLAN</div><div class='ctx'>  *</div><div class='del'>- * Process virtchnl op to add or remove programmed guest VLAN id</div><div class='add'>+ * Process virtchnl op to add or remove programmed guest VLAN ID</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)</div><div class='ctx'> {</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct virtchnl_vlan_filter_list *vfl =</div><div class='ctx'> 	    (struct virtchnl_vlan_filter_list *)msg;</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='add'>+	bool vlan_promisc = false;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='add'>+	struct ice_hw *hw;</div><div class='add'>+	int status = 0;</div><div class='add'>+	u8 promisc_m;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ice_vc_isvalid_vsi_id(vf, vfl-&gt;vsi_id)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (add_v &amp;&amp; !ice_is_vf_trusted(vf) &amp;&amp;</div><div class='ctx'> 	    vf-&gt;num_vlan &gt;= ICE_MAX_VLAN_PER_VF) {</div><div class='ctx'> 		dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			 "VF is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\n");</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			 "VF-%d is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\n",</div><div class='add'>+			 vf-&gt;vf_id);</div><div class='add'>+		/* There is no need to let VF know about being not trusted,</div><div class='add'>+		 * so we can just return success message here</div><div class='add'>+		 */</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; vfl-&gt;num_elements; i++) {</div><div class='ctx'> 		if (vfl-&gt;vlan_id[i] &gt; ICE_MAX_VLANID) {</div><div class='del'>-			aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 			dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"invalid VF VLAN id %d\n", vfl-&gt;vlan_id[i]);</div><div class='ctx'> 			goto error_param;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vsi = ice_find_vsi_from_id(vf-&gt;pf, vfl-&gt;vsi_id);</div><div class='add'>+	hw = &amp;pf-&gt;hw;</div><div class='add'>+	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (!vsi) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vsi-&gt;info.pvid) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2178,38 +2344,94 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"%sable VLAN stripping failed for VSI %i\n",</div><div class='ctx'> 			 add_v ? "en" : "dis", vsi-&gt;vsi_num);</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ICE_VF_STATE_UC_PROMISC, vf-&gt;vf_states) ||</div><div class='add'>+	    test_bit(ICE_VF_STATE_MC_PROMISC, vf-&gt;vf_states))</div><div class='add'>+		vlan_promisc = true;</div><div class='add'>+</div><div class='ctx'> 	if (add_v) {</div><div class='ctx'> 		for (i = 0; i &lt; vfl-&gt;num_elements; i++) {</div><div class='ctx'> 			u16 vid = vfl-&gt;vlan_id[i];</div><div class='ctx'> </div><div class='del'>-			if (!ice_vsi_add_vlan(vsi, vid)) {</div><div class='del'>-				vf-&gt;num_vlan++;</div><div class='add'>+			if (!ice_is_vf_trusted(vf) &amp;&amp;</div><div class='add'>+			    vf-&gt;num_vlan &gt;= ICE_MAX_VLAN_PER_VF) {</div><div class='add'>+				dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+					 "VF-%d is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\n",</div><div class='add'>+					 vf-&gt;vf_id);</div><div class='add'>+				/* There is no need to let VF know about being</div><div class='add'>+				 * not trusted, so we can just return success</div><div class='add'>+				 * message here as well.</div><div class='add'>+				 */</div><div class='add'>+				goto error_param;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ice_vsi_add_vlan(vsi, vid)) {</div><div class='add'>+				v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+				goto error_param;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-				/* Enable VLAN pruning when VLAN 0 is added */</div><div class='del'>-				if (unlikely(!vid))</div><div class='del'>-					if (ice_cfg_vlan_pruning(vsi, true))</div><div class='del'>-						aq_ret = ICE_ERR_PARAM;</div><div class='add'>+			vf-&gt;num_vlan++;</div><div class='add'>+			/* Enable VLAN pruning when VLAN is added */</div><div class='add'>+			if (!vlan_promisc) {</div><div class='add'>+				status = ice_cfg_vlan_pruning(vsi, true, false);</div><div class='add'>+				if (status) {</div><div class='add'>+					v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+					dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+						"Enable VLAN pruning on VLAN ID: %d failed error-%d\n",</div><div class='add'>+						vid, status);</div><div class='add'>+					goto error_param;</div><div class='add'>+				}</div><div class='ctx'> 			} else {</div><div class='del'>-				aq_ret = ICE_ERR_PARAM;</div><div class='add'>+				/* Enable Ucast/Mcast VLAN promiscuous mode */</div><div class='add'>+				promisc_m = ICE_PROMISC_VLAN_TX |</div><div class='add'>+					    ICE_PROMISC_VLAN_RX;</div><div class='add'>+</div><div class='add'>+				status = ice_set_vsi_promisc(hw, vsi-&gt;idx,</div><div class='add'>+							     promisc_m, vid);</div><div class='add'>+				if (status) {</div><div class='add'>+					v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+					dev_err(&amp;pf-&gt;pdev-&gt;dev,</div><div class='add'>+						"Enable Unicast/multicast promiscuous mode on VLAN ID:%d failed error-%d\n",</div><div class='add'>+						vid, status);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; vfl-&gt;num_elements; i++) {</div><div class='add'>+		/* In case of non_trusted VF, number of VLAN elements passed</div><div class='add'>+		 * to PF for removal might be greater than number of VLANs</div><div class='add'>+		 * filter programmed for that VF - So, use actual number of</div><div class='add'>+		 * VLANS added earlier with add VLAN opcode. In order to avoid</div><div class='add'>+		 * removing VLAN that doesn't exist, which result to sending</div><div class='add'>+		 * erroneous failed message back to the VF</div><div class='add'>+		 */</div><div class='add'>+		int num_vf_vlan;</div><div class='add'>+</div><div class='add'>+		num_vf_vlan = vf-&gt;num_vlan;</div><div class='add'>+		for (i = 0; i &lt; vfl-&gt;num_elements &amp;&amp; i &lt; num_vf_vlan; i++) {</div><div class='ctx'> 			u16 vid = vfl-&gt;vlan_id[i];</div><div class='ctx'> </div><div class='ctx'> 			/* Make sure ice_vsi_kill_vlan is successful before</div><div class='ctx'> 			 * updating VLAN information</div><div class='ctx'> 			 */</div><div class='del'>-			if (!ice_vsi_kill_vlan(vsi, vid)) {</div><div class='del'>-				vf-&gt;num_vlan--;</div><div class='add'>+			if (ice_vsi_kill_vlan(vsi, vid)) {</div><div class='add'>+				v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+				goto error_param;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			vf-&gt;num_vlan--;</div><div class='add'>+			/* Disable VLAN pruning when removing VLAN */</div><div class='add'>+			ice_cfg_vlan_pruning(vsi, false, false);</div><div class='ctx'> </div><div class='del'>-				/* Disable VLAN pruning when removing VLAN 0 */</div><div class='del'>-				if (unlikely(!vid))</div><div class='del'>-					ice_cfg_vlan_pruning(vsi, false);</div><div class='add'>+			/* Disable Unicast/Multicast VLAN promiscuous mode */</div><div class='add'>+			if (vlan_promisc) {</div><div class='add'>+				promisc_m = ICE_PROMISC_VLAN_TX |</div><div class='add'>+					    ICE_PROMISC_VLAN_RX;</div><div class='add'>+</div><div class='add'>+				ice_clear_vsi_promisc(hw, vsi-&gt;idx,</div><div class='add'>+						      promisc_m, vid);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2217,10 +2439,10 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)</div><div class='ctx'> error_param:</div><div class='ctx'> 	/* send the response to the VF */</div><div class='ctx'> 	if (add_v)</div><div class='del'>-		return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ADD_VLAN, aq_ret,</div><div class='add'>+		return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ADD_VLAN, v_ret,</div><div class='ctx'> 					     NULL, 0);</div><div class='ctx'> 	else</div><div class='del'>-		return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DEL_VLAN, aq_ret,</div><div class='add'>+		return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DEL_VLAN, v_ret,</div><div class='ctx'> 					     NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2229,7 +2451,7 @@ error_param:</div><div class='ctx'>  * @vf: pointer to the VF info</div><div class='ctx'>  * @msg: pointer to the msg buffer</div><div class='ctx'>  *</div><div class='del'>- * Add and program guest VLAN id</div><div class='add'>+ * Add and program guest VLAN ID</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='hunk'>@@ -2241,7 +2463,7 @@ static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'>  * @vf: pointer to the VF info</div><div class='ctx'>  * @msg: pointer to the msg buffer</div><div class='ctx'>  *</div><div class='del'>- * remove programmed guest VLAN id</div><div class='add'>+ * remove programmed guest VLAN ID</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_remove_vlan_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'> {</div><div class='hunk'>@@ -2256,22 +2478,22 @@ static int ice_vc_remove_vlan_msg(struct ice_vf *vf, u8 *msg)</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_ena_vlan_stripping(struct ice_vf *vf)</div><div class='ctx'> {</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='ctx'> 	if (ice_vsi_manage_vlan_stripping(vsi, true))</div><div class='del'>-		aq_ret = ICE_ERR_AQ_ERROR;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> </div><div class='ctx'> error_param:</div><div class='ctx'> 	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING,</div><div class='del'>-				     aq_ret, NULL, 0);</div><div class='add'>+				     v_ret, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2282,22 +2504,27 @@ error_param:</div><div class='ctx'>  */</div><div class='ctx'> static int ice_vc_dis_vlan_stripping(struct ice_vf *vf)</div><div class='ctx'> {</div><div class='del'>-	enum ice_status aq_ret = 0;</div><div class='add'>+	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;</div><div class='ctx'> 	struct ice_pf *pf = vf-&gt;pf;</div><div class='ctx'> 	struct ice_vsi *vsi;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf-&gt;vf_states)) {</div><div class='del'>-		aq_ret = ICE_ERR_PARAM;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> 		goto error_param;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vsi = pf-&gt;vsi[vf-&gt;lan_vsi_idx];</div><div class='add'>+	if (!vsi) {</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='add'>+		goto error_param;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ice_vsi_manage_vlan_stripping(vsi, false))</div><div class='del'>-		aq_ret = ICE_ERR_AQ_ERROR;</div><div class='add'>+		v_ret = VIRTCHNL_STATUS_ERR_PARAM;</div><div class='ctx'> </div><div class='ctx'> error_param:</div><div class='ctx'> 	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING,</div><div class='del'>-				     aq_ret, NULL, 0);</div><div class='add'>+				     v_ret, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2333,7 +2560,7 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)</div><div class='ctx'> 	/* Perform basic checks on the msg */</div><div class='ctx'> 	err = virtchnl_vc_validate_vf_msg(&amp;vf-&gt;vf_ver, v_opcode, msg, msglen);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (err == VIRTCHNL_ERR_PARAM)</div><div class='add'>+		if (err == VIRTCHNL_STATUS_ERR_PARAM)</div><div class='ctx'> 			err = -EPERM;</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -2355,7 +2582,8 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)</div><div class='ctx'> </div><div class='ctx'> error_handler:</div><div class='ctx'> 	if (err) {</div><div class='del'>-		ice_vc_send_msg_to_vf(vf, v_opcode, ICE_ERR_PARAM, NULL, 0);</div><div class='add'>+		ice_vc_send_msg_to_vf(vf, v_opcode, VIRTCHNL_STATUS_ERR_PARAM,</div><div class='add'>+				      NULL, 0);</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Invalid message from VF %d, opcode %d, len %d, error %d\n",</div><div class='ctx'> 			vf_id, v_opcode, msglen, err);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2418,7 +2646,8 @@ error_handler:</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(&amp;pf-&gt;pdev-&gt;dev, "Unsupported opcode %d from VF %d\n",</div><div class='ctx'> 			v_opcode, vf_id);</div><div class='del'>-		err = ice_vc_send_msg_to_vf(vf, v_opcode, ICE_ERR_NOT_IMPL,</div><div class='add'>+		err = ice_vc_send_msg_to_vf(vf, v_opcode,</div><div class='add'>+					    VIRTCHNL_STATUS_ERR_NOT_SUPPORTED,</div><div class='ctx'> 					    NULL, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2427,7 +2656,7 @@ error_handler:</div><div class='ctx'> 		 * as it is busy with pending work.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev_info(&amp;pf-&gt;pdev-&gt;dev,</div><div class='del'>-			 "PF failed to honor VF %d, opcode %d\n, error %d\n",</div><div class='add'>+			 "PF failed to honor VF %d, opcode %d, error %d\n",</div><div class='ctx'> 			 vf_id, v_opcode, err);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2440,8 +2669,8 @@ error_handler:</div><div class='ctx'>  *</div><div class='ctx'>  * return VF configuration</div><div class='ctx'>  */</div><div class='del'>-int ice_get_vf_cfg(struct net_device *netdev, int vf_id,</div><div class='del'>-		   struct ifla_vf_info *ivi)</div><div class='add'>+int</div><div class='add'>+ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ice_netdev_priv *np = netdev_priv(netdev);</div><div class='ctx'> 	struct ice_vsi *vsi = np-&gt;vsi;</div><div class='hunk'>@@ -2550,9 +2779,9 @@ out:</div><div class='ctx'>  * ice_set_vf_mac</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @vf_id: VF identifier</div><div class='del'>- * @mac: mac address</div><div class='add'>+ * @mac: MAC address</div><div class='ctx'>  *</div><div class='del'>- * program VF mac address</div><div class='add'>+ * program VF MAC address</div><div class='ctx'>  */</div><div class='ctx'> int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)</div><div class='ctx'> {</div><div class='hunk'>@@ -2579,7 +2808,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* copy mac into dflt_lan_addr and trigger a VF reset. The reset</div><div class='add'>+	/* copy MAC into dflt_lan_addr and trigger a VF reset. The reset</div><div class='ctx'> 	 * flow will use the updated dflt_lan_addr and add a MAC filter</div><div class='ctx'> 	 * using ice_add_mac. Also set pf_set_mac to indicate that the PF has</div><div class='ctx'> 	 * set the MAC address for this VF.</div><div class='hunk'>@@ -2587,7 +2816,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)</div><div class='ctx'> 	ether_addr_copy(vf-&gt;dflt_lan_addr.addr, mac);</div><div class='ctx'> 	vf-&gt;pf_set_mac = true;</div><div class='ctx'> 	netdev_info(netdev,</div><div class='del'>-		    "mac on VF %d set to %pM\n. VF driver will be reinitialized\n",</div><div class='add'>+		    "MAC on VF %d set to %pM. VF driver will be reinitialized\n",</div><div class='ctx'> 		    vf_id, mac);</div><div class='ctx'> </div><div class='ctx'> 	ice_vc_dis_vf(vf);</div><div class='hunk'>@@ -2690,7 +2919,8 @@ int ice_set_vf_link_state(struct net_device *netdev, int vf_id, int link_state)</div><div class='ctx'> 		ice_set_pfe_link(vf, &amp;pfe, ls-&gt;link_speed, vf-&gt;link_up);</div><div class='ctx'> </div><div class='ctx'> 	/* Notify the VF of its new link state */</div><div class='del'>-	ice_aq_send_msg_to_vf(hw, vf-&gt;vf_id, VIRTCHNL_OP_EVENT, 0, (u8 *)&amp;pfe,</div><div class='add'>+	ice_aq_send_msg_to_vf(hw, vf-&gt;vf_id, VIRTCHNL_OP_EVENT,</div><div class='add'>+			      VIRTCHNL_STATUS_SUCCESS, (u8 *)&amp;pfe,</div><div class='ctx'> 			      sizeof(pfe), NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h<br/>index 01470a8ee03a..3725aea16840 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h</a></div><div class='hunk'>@@ -48,10 +48,10 @@ enum ice_virtchnl_cap {</div><div class='ctx'> struct ice_vf {</div><div class='ctx'> 	struct ice_pf *pf;</div><div class='ctx'> </div><div class='del'>-	s16 vf_id;			/* VF id in the PF space */</div><div class='add'>+	s16 vf_id;			/* VF ID in the PF space */</div><div class='ctx'> 	u32 driver_caps;		/* reported by VF driver */</div><div class='ctx'> 	int first_vector_idx;		/* first vector index of this VF */</div><div class='del'>-	struct ice_sw *vf_sw_id;	/* switch id the VF VSIs connect to */</div><div class='add'>+	struct ice_sw *vf_sw_id;	/* switch ID the VF VSIs connect to */</div><div class='ctx'> 	struct virtchnl_version_info vf_ver;</div><div class='ctx'> 	struct virtchnl_ether_addr dflt_lan_addr;</div><div class='ctx'> 	u16 port_vlan_id;</div><div class='hunk'>@@ -59,10 +59,10 @@ struct ice_vf {</div><div class='ctx'> 	u8 trusted;</div><div class='ctx'> 	u16 lan_vsi_idx;		/* index into PF struct */</div><div class='ctx'> 	u16 lan_vsi_num;		/* ID as used by firmware */</div><div class='del'>-	u64 num_mdd_events;		/* number of mdd events detected */</div><div class='add'>+	u64 num_mdd_events;		/* number of MDD events detected */</div><div class='ctx'> 	u64 num_inval_msgs;		/* number of continuous invalid msgs */</div><div class='ctx'> 	u64 num_valid_msgs;		/* number of valid msgs detected */</div><div class='del'>-	unsigned long vf_caps;		/* vf's adv. capabilities */</div><div class='add'>+	unsigned long vf_caps;		/* VF's adv. capabilities */</div><div class='ctx'> 	DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS);	/* VF runtime states */</div><div class='ctx'> 	unsigned int tx_rate;		/* Tx bandwidth limit in Mbps */</div><div class='ctx'> 	u8 link_forced;</div><div class='hunk'>@@ -70,6 +70,7 @@ struct ice_vf {</div><div class='ctx'> 	u8 spoofchk;</div><div class='ctx'> 	u16 num_mac;</div><div class='ctx'> 	u16 num_vlan;</div><div class='add'>+	u16 num_vf_qs;			/* num of queue configured per VF */</div><div class='ctx'> 	u8 num_req_qs;			/* num of queue pairs requested by VF */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,8 +78,8 @@ struct ice_vf {</div><div class='ctx'> void ice_process_vflr_event(struct ice_pf *pf);</div><div class='ctx'> int ice_sriov_configure(struct pci_dev *pdev, int num_vfs);</div><div class='ctx'> int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);</div><div class='del'>-int ice_get_vf_cfg(struct net_device *netdev, int vf_id,</div><div class='del'>-		   struct ifla_vf_info *ivi);</div><div class='add'>+int</div><div class='add'>+ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi);</div><div class='ctx'> </div><div class='ctx'> void ice_free_vfs(struct ice_pf *pf);</div><div class='ctx'> void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event);</div><div class='hunk'>@@ -86,11 +87,9 @@ void ice_vc_notify_link_state(struct ice_pf *pf);</div><div class='ctx'> void ice_vc_notify_reset(struct ice_pf *pf);</div><div class='ctx'> bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr);</div><div class='ctx'> </div><div class='del'>-int ice_set_vf_port_vlan(struct net_device *netdev, int vf_id,</div><div class='del'>-			 u16 vlan_id, u8 qos, __be16 vlan_proto);</div><div class='del'>-</div><div class='del'>-int ice_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,</div><div class='del'>-		  int max_tx_rate);</div><div class='add'>+int</div><div class='add'>+ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,</div><div class='add'>+		     __be16 vlan_proto);</div><div class='ctx'> </div><div class='ctx'> int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted);</div><div class='ctx'> </div><div class='hunk'>@@ -162,12 +161,5 @@ ice_set_vf_link_state(struct net_device __always_unused *netdev,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-ice_set_vf_bw(struct net_device __always_unused *netdev,</div><div class='del'>-	      int __always_unused vf_id, int __always_unused min_tx_rate,</div><div class='del'>-	      int __always_unused max_tx_rate)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='ctx'> #endif /* CONFIG_PCI_IOV */</div><div class='ctx'> #endif /* _ICE_VIRTCHNL_PF_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h<br/>index 01fcfc6f3415..d2e2c50ce257 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igb/e1000_defines.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igb/e1000_defines.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igb/e1000_defines.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igb/e1000_defines.h</a></div><div class='hunk'>@@ -194,6 +194,8 @@</div><div class='ctx'> /* enable link status from external LINK_0 and LINK_1 pins */</div><div class='ctx'> #define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */</div><div class='ctx'> #define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */</div><div class='add'>+#define E1000_CTRL_ADVD3WUC 0x00100000  /* D3 WUC */</div><div class='add'>+#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000 /* PHY PM enable */</div><div class='ctx'> #define E1000_CTRL_SDP0_DIR 0x00400000  /* SDP0 Data direction */</div><div class='ctx'> #define E1000_CTRL_SDP1_DIR 0x00800000  /* SDP1 Data direction */</div><div class='ctx'> #define E1000_CTRL_RST      0x04000000  /* Global reset */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c<br/>index c57671068245..c645d9e648e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igb/igb_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igb/igb_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igb/igb_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igb/igb_ethtool.c</a></div><div class='hunk'>@@ -3158,8 +3158,8 @@ static int igb_set_eee(struct net_device *netdev,</div><div class='ctx'> 	} else if (!edata-&gt;eee_enabled) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"Setting EEE options are not supported with EEE disabled\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;eee_advert = ethtool_adv_to_mmd_eee_adv_t(edata-&gt;advertised);</div><div class='ctx'> 	if (hw-&gt;dev_spec._82575.eee_disable != !edata-&gt;eee_enabled) {</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c<br/>index 69b230c53fed..39f33afc479c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igb/igb_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igb/igb_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igb/igb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igb/igb_main.c</a></div><div class='hunk'>@@ -2480,7 +2480,7 @@ static int igb_set_features(struct net_device *netdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		igb_reset(adapter);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='hunk'>@@ -3452,6 +3452,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dev_pm_set_driver_flags(&amp;pdev-&gt;dev, DPM_FLAG_NEVER_SKIP);</div><div class='add'>+</div><div class='ctx'> 	pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6026,13 +6029,8 @@ static int igb_tx_map(struct igb_ring *tx_ring,</div><div class='ctx'> 	/* Make sure there is space in the ring for the next send. */</div><div class='ctx'> 	igb_maybe_stop_tx(tx_ring, DESC_NEEDED);</div><div class='ctx'> </div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -8048,7 +8046,7 @@ static struct sk_buff *igb_construct_skb(struct igb_ring *rx_ring,</div><div class='ctx'> 	/* Determine available headroom for copy */</div><div class='ctx'> 	headlen = size;</div><div class='ctx'> 	if (headlen &gt; IGB_RX_HDR_LEN)</div><div class='del'>-		headlen = eth_get_headlen(va, IGB_RX_HDR_LEN);</div><div class='add'>+		headlen = eth_get_headlen(skb-&gt;dev, va, IGB_RX_HDR_LEN);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	memcpy(__skb_put(skb, headlen), va, ALIGN(headlen, sizeof(long)));</div><div class='hunk'>@@ -8740,9 +8738,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 ctrl, rctl, status;</div><div class='ctx'> 	u32 wufc = runtime ? E1000_WUFC_LNKC : adapter-&gt;wol;</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	int retval = 0;</div><div class='del'>-#endif</div><div class='add'>+	bool wake;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='hunk'>@@ -8755,14 +8751,6 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,</div><div class='ctx'> 	igb_clear_interrupt_scheme(adapter);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	if (!runtime) {</div><div class='del'>-		retval = pci_save_state(pdev);</div><div class='del'>-		if (retval)</div><div class='del'>-			return retval;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	status = rd32(E1000_STATUS);</div><div class='ctx'> 	if (status &amp; E1000_STATUS_LU)</div><div class='ctx'> 		wufc &amp;= ~E1000_WUFC_LNKC;</div><div class='hunk'>@@ -8779,10 +8767,6 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ctrl = rd32(E1000_CTRL);</div><div class='del'>-		/* advertise wake from D3Cold */</div><div class='del'>-		#define E1000_CTRL_ADVD3WUC 0x00100000</div><div class='del'>-		/* phy power management enable */</div><div class='del'>-		#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000</div><div class='ctx'> 		ctrl |= E1000_CTRL_ADVD3WUC;</div><div class='ctx'> 		wr32(E1000_CTRL, ctrl);</div><div class='ctx'> </div><div class='hunk'>@@ -8796,12 +8780,15 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,</div><div class='ctx'> 		wr32(E1000_WUFC, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*enable_wake = wufc || adapter-&gt;en_mng_pt;</div><div class='del'>-	if (!*enable_wake)</div><div class='add'>+	wake = wufc || adapter-&gt;en_mng_pt;</div><div class='add'>+	if (!wake)</div><div class='ctx'> 		igb_power_down_link(adapter);</div><div class='ctx'> 	else</div><div class='ctx'> 		igb_power_up_link(adapter);</div><div class='ctx'> </div><div class='add'>+	if (enable_wake)</div><div class='add'>+		*enable_wake = wake;</div><div class='add'>+</div><div class='ctx'> 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this</div><div class='ctx'> 	 * would have already happened in close and is redundant.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -8844,22 +8831,7 @@ static void igb_deliver_wake_packet(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused igb_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='del'>-	bool wake;</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-</div><div class='del'>-	retval = __igb_shutdown(pdev, &amp;wake, 0);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	if (wake) {</div><div class='del'>-		pci_prepare_to_sleep(pdev);</div><div class='del'>-	} else {</div><div class='del'>-		pci_wake_from_d3(pdev, false);</div><div class='del'>-		pci_set_power_state(pdev, PCI_D3hot);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return __igb_shutdown(to_pci_dev(dev), NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused igb_resume(struct device *dev)</div><div class='hunk'>@@ -8930,22 +8902,7 @@ static int __maybe_unused igb_runtime_idle(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused igb_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	int retval;</div><div class='del'>-	bool wake;</div><div class='del'>-</div><div class='del'>-	retval = __igb_shutdown(pdev, &amp;wake, 1);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	if (wake) {</div><div class='del'>-		pci_prepare_to_sleep(pdev);</div><div class='del'>-	} else {</div><div class='del'>-		pci_wake_from_d3(pdev, false);</div><div class='del'>-		pci_set_power_state(pdev, PCI_D3hot);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return __igb_shutdown(to_pci_dev(dev), NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused igb_runtime_resume(struct device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c<br/>index 4eab83faec62..34cd30d7162f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igbvf/netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igbvf/netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igbvf/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igbvf/netdev.c</a></div><div class='hunk'>@@ -2279,10 +2279,6 @@ static inline void igbvf_tx_queue_adv(struct igbvf_adapter *adapter,</div><div class='ctx'> 	tx_ring-&gt;buffer_info[first].next_to_watch = tx_desc;</div><div class='ctx'> 	tx_ring-&gt;next_to_use = i;</div><div class='ctx'> 	writel(i, adapter-&gt;hw.hw_addr + tx_ring-&gt;tail);</div><div class='del'>-	/* we need this if more than one processor can write to our tail</div><div class='del'>-	 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb,</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h<br/>index 80faccc34cda..0f5534ce27b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igc/igc.h</a></div><div class='hunk'>@@ -29,9 +29,15 @@ unsigned int igc_get_max_rss_queues(struct igc_adapter *adapter);</div><div class='ctx'> void igc_set_flag_queue_pairs(struct igc_adapter *adapter,</div><div class='ctx'> 			      const u32 max_rss_queues);</div><div class='ctx'> int igc_reinit_queues(struct igc_adapter *adapter);</div><div class='add'>+void igc_write_rss_indir_tbl(struct igc_adapter *adapter);</div><div class='ctx'> bool igc_has_link(struct igc_adapter *adapter);</div><div class='ctx'> void igc_reset(struct igc_adapter *adapter);</div><div class='ctx'> int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx);</div><div class='add'>+int igc_add_mac_steering_filter(struct igc_adapter *adapter,</div><div class='add'>+				const u8 *addr, u8 queue, u8 flags);</div><div class='add'>+int igc_del_mac_steering_filter(struct igc_adapter *adapter,</div><div class='add'>+				const u8 *addr, u8 queue, u8 flags);</div><div class='add'>+void igc_update_stats(struct igc_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> extern char igc_driver_name[];</div><div class='ctx'> extern char igc_driver_version[];</div><div class='hunk'>@@ -51,6 +57,13 @@ extern char igc_driver_version[];</div><div class='ctx'> #define IGC_FLAG_VLAN_PROMISC		BIT(15)</div><div class='ctx'> #define IGC_FLAG_RX_LEGACY		BIT(16)</div><div class='ctx'> </div><div class='add'>+#define IGC_FLAG_RSS_FIELD_IPV4_UDP	BIT(6)</div><div class='add'>+#define IGC_FLAG_RSS_FIELD_IPV6_UDP	BIT(7)</div><div class='add'>+</div><div class='add'>+#define IGC_MRQC_ENABLE_RSS_MQ		0x00000002</div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV4_UDP	0x00400000</div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV6_UDP	0x00800000</div><div class='add'>+</div><div class='ctx'> #define IGC_START_ITR			648 /* ~6000 ints/sec */</div><div class='ctx'> #define IGC_4K_ITR			980</div><div class='ctx'> #define IGC_20K_ITR			196</div><div class='hunk'>@@ -284,15 +297,50 @@ struct igc_q_vector {</div><div class='ctx'> 	struct igc_ring ring[0] ____cacheline_internodealigned_in_smp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MAX_ETYPE_FILTER		(4 - 1)</div><div class='add'>+</div><div class='add'>+enum igc_filter_match_flags {</div><div class='add'>+	IGC_FILTER_FLAG_ETHER_TYPE =	0x1,</div><div class='add'>+	IGC_FILTER_FLAG_VLAN_TCI   =	0x2,</div><div class='add'>+	IGC_FILTER_FLAG_SRC_MAC_ADDR =	0x4,</div><div class='add'>+	IGC_FILTER_FLAG_DST_MAC_ADDR =	0x8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RX network flow classification data structure */</div><div class='add'>+struct igc_nfc_input {</div><div class='add'>+	/* Byte layout in order, all values with MSB first:</div><div class='add'>+	 * match_flags - 1 byte</div><div class='add'>+	 * etype - 2 bytes</div><div class='add'>+	 * vlan_tci - 2 bytes</div><div class='add'>+	 */</div><div class='add'>+	u8 match_flags;</div><div class='add'>+	__be16 etype;</div><div class='add'>+	__be16 vlan_tci;</div><div class='add'>+	u8 src_addr[ETH_ALEN];</div><div class='add'>+	u8 dst_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct igc_nfc_filter {</div><div class='add'>+	struct hlist_node nfc_node;</div><div class='add'>+	struct igc_nfc_input filter;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	u16 etype_reg_index;</div><div class='add'>+	u16 sw_idx;</div><div class='add'>+	u16 action;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct igc_mac_addr {</div><div class='ctx'> 	u8 addr[ETH_ALEN];</div><div class='ctx'> 	u8 queue;</div><div class='ctx'> 	u8 state; /* bitmask */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IGC_MAC_STATE_DEFAULT	0x1</div><div class='del'>-#define IGC_MAC_STATE_MODIFIED	0x2</div><div class='del'>-#define IGC_MAC_STATE_IN_USE	0x4</div><div class='add'>+#define IGC_MAC_STATE_DEFAULT		0x1</div><div class='add'>+#define IGC_MAC_STATE_IN_USE		0x2</div><div class='add'>+#define IGC_MAC_STATE_SRC_ADDR		0x4</div><div class='add'>+#define IGC_MAC_STATE_QUEUE_STEERING	0x8</div><div class='add'>+</div><div class='add'>+#define IGC_MAX_RXNFC_FILTERS		16</div><div class='ctx'> </div><div class='ctx'> /* Board specific private data structure */</div><div class='ctx'> struct igc_adapter {</div><div class='hunk'>@@ -356,12 +404,22 @@ struct igc_adapter {</div><div class='ctx'> 	u16 tx_ring_count;</div><div class='ctx'> 	u16 rx_ring_count;</div><div class='ctx'> </div><div class='add'>+	u32 tx_hwtstamp_timeouts;</div><div class='add'>+	u32 tx_hwtstamp_skipped;</div><div class='add'>+	u32 rx_hwtstamp_cleared;</div><div class='ctx'> 	u32 *shadow_vfta;</div><div class='ctx'> </div><div class='ctx'> 	u32 rss_queues;</div><div class='add'>+	u32 rss_indir_tbl_init;</div><div class='add'>+</div><div class='add'>+	/* RX network flow classification support */</div><div class='add'>+	struct hlist_head nfc_filter_list;</div><div class='add'>+	struct hlist_head cls_flower_list;</div><div class='add'>+	unsigned int nfc_filter_count;</div><div class='ctx'> </div><div class='ctx'> 	/* lock for RX network flow classification filter */</div><div class='ctx'> 	spinlock_t nfc_lock;</div><div class='add'>+	bool etype_bitmap[MAX_ETYPE_FILTER];</div><div class='ctx'> </div><div class='ctx'> 	struct igc_mac_addr *mac_table;</div><div class='ctx'> </div><div class='hunk'>@@ -447,6 +505,10 @@ static inline s32 igc_read_phy_reg(struct igc_hw *hw, u32 offset, u16 *data)</div><div class='ctx'> </div><div class='ctx'> /* forward declaration */</div><div class='ctx'> void igc_reinit_locked(struct igc_adapter *);</div><div class='add'>+int igc_add_filter(struct igc_adapter *adapter,</div><div class='add'>+		   struct igc_nfc_filter *input);</div><div class='add'>+int igc_erase_filter(struct igc_adapter *adapter,</div><div class='add'>+		     struct igc_nfc_filter *input);</div><div class='ctx'> </div><div class='ctx'> #define igc_rx_pg_size(_ring) (PAGE_SIZE &lt;&lt; igc_rx_pg_order(_ring))</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/igc/igc_base.h b/drivers/net/ethernet/intel/igc/igc_base.h<br/>index 76d4991d7284..58d1109d7f3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_base.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_base.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_base.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igc/igc_base.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright (c)  2018 Intel Corporation */</div><div class='ctx'> </div><div class='del'>-#ifndef _IGC_BASE_H</div><div class='del'>-#define _IGC_BASE_H</div><div class='add'>+#ifndef _IGC_BASE_H_</div><div class='add'>+#define _IGC_BASE_H_</div><div class='ctx'> </div><div class='ctx'> /* forward declaration */</div><div class='ctx'> void igc_rx_fifo_flush_base(struct igc_hw *hw);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h<br/>index 7d1bdcd1225a..a9a30268de59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_defines.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_defines.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_defines.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igc/igc_defines.h</a></div><div class='hunk'>@@ -310,6 +310,12 @@</div><div class='ctx'> 	IGC_RXDEXT_STATERR_CXE |	\</div><div class='ctx'> 	IGC_RXDEXT_STATERR_RXE)</div><div class='ctx'> </div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV4_TCP	0x00010000</div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV4		0x00020000</div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV6_TCP_EX	0x00040000</div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV6		0x00100000</div><div class='add'>+#define IGC_MRQC_RSS_FIELD_IPV6_TCP	0x00200000</div><div class='add'>+</div><div class='ctx'> /* Header split receive */</div><div class='ctx'> #define IGC_RFCTL_IPV6_EX_DIS	0x00010000</div><div class='ctx'> #define IGC_RFCTL_LEF		0x00040000</div><div class='hunk'>@@ -325,6 +331,10 @@</div><div class='ctx'> #define I225_RXPBSIZE_DEFAULT	0x000000A2 /* RXPBSIZE default */</div><div class='ctx'> #define I225_TXPBSIZE_DEFAULT	0x04000014 /* TXPBSIZE default */</div><div class='ctx'> </div><div class='add'>+/* Receive Checksum Control */</div><div class='add'>+#define IGC_RXCSUM_CRCOFL	0x00000800   /* CRC32 offload enable */</div><div class='add'>+#define IGC_RXCSUM_PCSD		0x00002000   /* packet checksum disabled */</div><div class='add'>+</div><div class='ctx'> /* GPY211 - I225 defines */</div><div class='ctx'> #define GPY_MMD_MASK		0xFFFF0000</div><div class='ctx'> #define GPY_MMD_SHIFT		16</div><div class='hunk'>@@ -390,4 +400,11 @@</div><div class='ctx'> </div><div class='ctx'> #define IGC_N0_QUEUE -1</div><div class='ctx'> </div><div class='add'>+#define IGC_MAX_MAC_HDR_LEN	127</div><div class='add'>+#define IGC_MAX_NETWORK_HDR_LEN	511</div><div class='add'>+</div><div class='add'>+#define IGC_VLAPQF_QUEUE_SEL(_n, q_idx) ((q_idx) &lt;&lt; ((_n) * 4))</div><div class='add'>+#define IGC_VLAPQF_P_VALID(_n)	(0x1 &lt;&lt; (3 + (_n) * 4))</div><div class='add'>+#define IGC_VLAPQF_QUEUE_MASK	0x03</div><div class='add'>+</div><div class='ctx'> #endif /* _IGC_DEFINES_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c<br/>index eff37a6c0afa..ac98f1d96892 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igc/igc_ethtool.c</a></div><div class='hunk'>@@ -2,10 +2,120 @@</div><div class='ctx'> /* Copyright (c)  2018 Intel Corporation */</div><div class='ctx'> </div><div class='ctx'> /* ethtool support for igc */</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "igc.h"</div><div class='ctx'> </div><div class='add'>+/* forward declaration */</div><div class='add'>+struct igc_stats {</div><div class='add'>+	char stat_string[ETH_GSTRING_LEN];</div><div class='add'>+	int sizeof_stat;</div><div class='add'>+	int stat_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IGC_STAT(_name, _stat) { \</div><div class='add'>+	.stat_string = _name, \</div><div class='add'>+	.sizeof_stat = FIELD_SIZEOF(struct igc_adapter, _stat), \</div><div class='add'>+	.stat_offset = offsetof(struct igc_adapter, _stat) \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct igc_stats igc_gstrings_stats[] = {</div><div class='add'>+	IGC_STAT("rx_packets", stats.gprc),</div><div class='add'>+	IGC_STAT("tx_packets", stats.gptc),</div><div class='add'>+	IGC_STAT("rx_bytes", stats.gorc),</div><div class='add'>+	IGC_STAT("tx_bytes", stats.gotc),</div><div class='add'>+	IGC_STAT("rx_broadcast", stats.bprc),</div><div class='add'>+	IGC_STAT("tx_broadcast", stats.bptc),</div><div class='add'>+	IGC_STAT("rx_multicast", stats.mprc),</div><div class='add'>+	IGC_STAT("tx_multicast", stats.mptc),</div><div class='add'>+	IGC_STAT("multicast", stats.mprc),</div><div class='add'>+	IGC_STAT("collisions", stats.colc),</div><div class='add'>+	IGC_STAT("rx_crc_errors", stats.crcerrs),</div><div class='add'>+	IGC_STAT("rx_no_buffer_count", stats.rnbc),</div><div class='add'>+	IGC_STAT("rx_missed_errors", stats.mpc),</div><div class='add'>+	IGC_STAT("tx_aborted_errors", stats.ecol),</div><div class='add'>+	IGC_STAT("tx_carrier_errors", stats.tncrs),</div><div class='add'>+	IGC_STAT("tx_window_errors", stats.latecol),</div><div class='add'>+	IGC_STAT("tx_abort_late_coll", stats.latecol),</div><div class='add'>+	IGC_STAT("tx_deferred_ok", stats.dc),</div><div class='add'>+	IGC_STAT("tx_single_coll_ok", stats.scc),</div><div class='add'>+	IGC_STAT("tx_multi_coll_ok", stats.mcc),</div><div class='add'>+	IGC_STAT("tx_timeout_count", tx_timeout_count),</div><div class='add'>+	IGC_STAT("rx_long_length_errors", stats.roc),</div><div class='add'>+	IGC_STAT("rx_short_length_errors", stats.ruc),</div><div class='add'>+	IGC_STAT("rx_align_errors", stats.algnerrc),</div><div class='add'>+	IGC_STAT("tx_tcp_seg_good", stats.tsctc),</div><div class='add'>+	IGC_STAT("tx_tcp_seg_failed", stats.tsctfc),</div><div class='add'>+	IGC_STAT("rx_flow_control_xon", stats.xonrxc),</div><div class='add'>+	IGC_STAT("rx_flow_control_xoff", stats.xoffrxc),</div><div class='add'>+	IGC_STAT("tx_flow_control_xon", stats.xontxc),</div><div class='add'>+	IGC_STAT("tx_flow_control_xoff", stats.xofftxc),</div><div class='add'>+	IGC_STAT("rx_long_byte_count", stats.gorc),</div><div class='add'>+	IGC_STAT("tx_dma_out_of_sync", stats.doosync),</div><div class='add'>+	IGC_STAT("tx_smbus", stats.mgptc),</div><div class='add'>+	IGC_STAT("rx_smbus", stats.mgprc),</div><div class='add'>+	IGC_STAT("dropped_smbus", stats.mgpdc),</div><div class='add'>+	IGC_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),</div><div class='add'>+	IGC_STAT("os2bmc_tx_by_bmc", stats.b2ospc),</div><div class='add'>+	IGC_STAT("os2bmc_tx_by_host", stats.o2bspc),</div><div class='add'>+	IGC_STAT("os2bmc_rx_by_host", stats.b2ogprc),</div><div class='add'>+	IGC_STAT("tx_hwtstamp_timeouts", tx_hwtstamp_timeouts),</div><div class='add'>+	IGC_STAT("tx_hwtstamp_skipped", tx_hwtstamp_skipped),</div><div class='add'>+	IGC_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IGC_NETDEV_STAT(_net_stat) { \</div><div class='add'>+	.stat_string = __stringify(_net_stat), \</div><div class='add'>+	.sizeof_stat = FIELD_SIZEOF(struct rtnl_link_stats64, _net_stat), \</div><div class='add'>+	.stat_offset = offsetof(struct rtnl_link_stats64, _net_stat) \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct igc_stats igc_gstrings_net_stats[] = {</div><div class='add'>+	IGC_NETDEV_STAT(rx_errors),</div><div class='add'>+	IGC_NETDEV_STAT(tx_errors),</div><div class='add'>+	IGC_NETDEV_STAT(tx_dropped),</div><div class='add'>+	IGC_NETDEV_STAT(rx_length_errors),</div><div class='add'>+	IGC_NETDEV_STAT(rx_over_errors),</div><div class='add'>+	IGC_NETDEV_STAT(rx_frame_errors),</div><div class='add'>+	IGC_NETDEV_STAT(rx_fifo_errors),</div><div class='add'>+	IGC_NETDEV_STAT(tx_fifo_errors),</div><div class='add'>+	IGC_NETDEV_STAT(tx_heartbeat_errors)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum igc_diagnostics_results {</div><div class='add'>+	TEST_REG = 0,</div><div class='add'>+	TEST_EEP,</div><div class='add'>+	TEST_IRQ,</div><div class='add'>+	TEST_LOOP,</div><div class='add'>+	TEST_LINK</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char igc_gstrings_test[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[TEST_REG]  = "Register test  (offline)",</div><div class='add'>+	[TEST_EEP]  = "Eeprom test    (offline)",</div><div class='add'>+	[TEST_IRQ]  = "Interrupt test (offline)",</div><div class='add'>+	[TEST_LOOP] = "Loopback test  (offline)",</div><div class='add'>+	[TEST_LINK] = "Link test   (on/offline)"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IGC_TEST_LEN (sizeof(igc_gstrings_test) / ETH_GSTRING_LEN)</div><div class='add'>+</div><div class='add'>+#define IGC_GLOBAL_STATS_LEN	\</div><div class='add'>+	(sizeof(igc_gstrings_stats) / sizeof(struct igc_stats))</div><div class='add'>+#define IGC_NETDEV_STATS_LEN	\</div><div class='add'>+	(sizeof(igc_gstrings_net_stats) / sizeof(struct igc_stats))</div><div class='add'>+#define IGC_RX_QUEUE_STATS_LEN \</div><div class='add'>+	(sizeof(struct igc_rx_queue_stats) / sizeof(u64))</div><div class='add'>+#define IGC_TX_QUEUE_STATS_LEN 3 /* packets, bytes, restart_queue */</div><div class='add'>+#define IGC_QUEUE_STATS_LEN \</div><div class='add'>+	((((struct igc_adapter *)netdev_priv(netdev))-&gt;num_rx_queues * \</div><div class='add'>+	  IGC_RX_QUEUE_STATS_LEN) + \</div><div class='add'>+	 (((struct igc_adapter *)netdev_priv(netdev))-&gt;num_tx_queues * \</div><div class='add'>+	  IGC_TX_QUEUE_STATS_LEN))</div><div class='add'>+#define IGC_STATS_LEN \</div><div class='add'>+	(IGC_GLOBAL_STATS_LEN + IGC_NETDEV_STATS_LEN + IGC_QUEUE_STATS_LEN)</div><div class='add'>+</div><div class='ctx'> static const char igc_priv_flags_strings[][ETH_GSTRING_LEN] = {</div><div class='ctx'> #define IGC_PRIV_FLAGS_LEGACY_RX	BIT(0)</div><div class='ctx'> 	"legacy-rx",</div><div class='hunk'>@@ -545,6 +655,127 @@ static int igc_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void igc_get_strings(struct net_device *netdev, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct igc_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u8 *p = data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		memcpy(data, *igc_gstrings_test,</div><div class='add'>+		       IGC_TEST_LEN * ETH_GSTRING_LEN);</div><div class='add'>+		break;</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		for (i = 0; i &lt; IGC_GLOBAL_STATS_LEN; i++) {</div><div class='add'>+			memcpy(p, igc_gstrings_stats[i].stat_string,</div><div class='add'>+			       ETH_GSTRING_LEN);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; IGC_NETDEV_STATS_LEN; i++) {</div><div class='add'>+			memcpy(p, igc_gstrings_net_stats[i].stat_string,</div><div class='add'>+			       ETH_GSTRING_LEN);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='add'>+			sprintf(p, "tx_queue_%u_packets", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			sprintf(p, "tx_queue_%u_bytes", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			sprintf(p, "tx_queue_%u_restart", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+			sprintf(p, "rx_queue_%u_packets", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			sprintf(p, "rx_queue_%u_bytes", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			sprintf(p, "rx_queue_%u_drops", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			sprintf(p, "rx_queue_%u_csum_err", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+			sprintf(p, "rx_queue_%u_alloc_failed", i);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+		/* BUG_ON(p - data != IGC_STATS_LEN * ETH_GSTRING_LEN); */</div><div class='add'>+		break;</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		memcpy(data, igc_priv_flags_strings,</div><div class='add'>+		       IGC_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igc_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 IGC_STATS_LEN;</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		return IGC_TEST_LEN;</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		return IGC_PRIV_FLAGS_STR_LEN;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void igc_get_ethtool_stats(struct net_device *netdev,</div><div class='add'>+				  struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct igc_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct rtnl_link_stats64 *net_stats = &amp;adapter-&gt;stats64;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	struct igc_ring *ring;</div><div class='add'>+	int i, j;</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adapter-&gt;stats64_lock);</div><div class='add'>+	igc_update_stats(adapter);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IGC_GLOBAL_STATS_LEN; i++) {</div><div class='add'>+		p = (char *)adapter + igc_gstrings_stats[i].stat_offset;</div><div class='add'>+		data[i] = (igc_gstrings_stats[i].sizeof_stat ==</div><div class='add'>+			sizeof(u64)) ? *(u64 *)p : *(u32 *)p;</div><div class='add'>+	}</div><div class='add'>+	for (j = 0; j &lt; IGC_NETDEV_STATS_LEN; j++, i++) {</div><div class='add'>+		p = (char *)net_stats + igc_gstrings_net_stats[j].stat_offset;</div><div class='add'>+		data[i] = (igc_gstrings_net_stats[j].sizeof_stat ==</div><div class='add'>+			sizeof(u64)) ? *(u64 *)p : *(u32 *)p;</div><div class='add'>+	}</div><div class='add'>+	for (j = 0; j &lt; adapter-&gt;num_tx_queues; j++) {</div><div class='add'>+		u64	restart2;</div><div class='add'>+</div><div class='add'>+		ring = adapter-&gt;tx_ring[j];</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin_irq(&amp;ring-&gt;tx_syncp);</div><div class='add'>+			data[i]   = ring-&gt;tx_stats.packets;</div><div class='add'>+			data[i + 1] = ring-&gt;tx_stats.bytes;</div><div class='add'>+			data[i + 2] = ring-&gt;tx_stats.restart_queue;</div><div class='add'>+		} while (u64_stats_fetch_retry_irq(&amp;ring-&gt;tx_syncp, start));</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin_irq(&amp;ring-&gt;tx_syncp2);</div><div class='add'>+			restart2  = ring-&gt;tx_stats.restart_queue2;</div><div class='add'>+		} while (u64_stats_fetch_retry_irq(&amp;ring-&gt;tx_syncp2, start));</div><div class='add'>+		data[i + 2] += restart2;</div><div class='add'>+</div><div class='add'>+		i += IGC_TX_QUEUE_STATS_LEN;</div><div class='add'>+	}</div><div class='add'>+	for (j = 0; j &lt; adapter-&gt;num_rx_queues; j++) {</div><div class='add'>+		ring = adapter-&gt;rx_ring[j];</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin_irq(&amp;ring-&gt;rx_syncp);</div><div class='add'>+			data[i]   = ring-&gt;rx_stats.packets;</div><div class='add'>+			data[i + 1] = ring-&gt;rx_stats.bytes;</div><div class='add'>+			data[i + 2] = ring-&gt;rx_stats.drops;</div><div class='add'>+			data[i + 3] = ring-&gt;rx_stats.csum_err;</div><div class='add'>+			data[i + 4] = ring-&gt;rx_stats.alloc_failed;</div><div class='add'>+		} while (u64_stats_fetch_retry_irq(&amp;ring-&gt;rx_syncp, start));</div><div class='add'>+		i += IGC_RX_QUEUE_STATS_LEN;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;stats64_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int igc_get_coalesce(struct net_device *netdev,</div><div class='ctx'> 			    struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='hunk'>@@ -643,6 +874,605 @@ static int igc_set_coalesce(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ETHER_TYPE_FULL_MASK ((__force __be16)~0)</div><div class='add'>+static int igc_get_ethtool_nfc_entry(struct igc_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 igc_nfc_filter *rule = NULL;</div><div class='add'>+</div><div class='add'>+	/* report total rule count */</div><div class='add'>+	cmd-&gt;data = IGC_MAX_RXNFC_FILTERS;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;nfc_filter_list, nfc_node) {</div><div class='add'>+		if (fsp-&gt;location &lt;= rule-&gt;sw_idx)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rule || fsp-&gt;location != rule-&gt;sw_idx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;filter.match_flags) {</div><div class='add'>+		fsp-&gt;flow_type = ETHER_FLOW;</div><div class='add'>+		fsp-&gt;ring_cookie = rule-&gt;action;</div><div class='add'>+		if (rule-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_ETHER_TYPE) {</div><div class='add'>+			fsp-&gt;h_u.ether_spec.h_proto = rule-&gt;filter.etype;</div><div class='add'>+			fsp-&gt;m_u.ether_spec.h_proto = ETHER_TYPE_FULL_MASK;</div><div class='add'>+		}</div><div class='add'>+		if (rule-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_VLAN_TCI) {</div><div class='add'>+			fsp-&gt;flow_type |= FLOW_EXT;</div><div class='add'>+			fsp-&gt;h_ext.vlan_tci = rule-&gt;filter.vlan_tci;</div><div class='add'>+			fsp-&gt;m_ext.vlan_tci = htons(VLAN_PRIO_MASK);</div><div class='add'>+		}</div><div class='add'>+		if (rule-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_DST_MAC_ADDR) {</div><div class='add'>+			ether_addr_copy(fsp-&gt;h_u.ether_spec.h_dest,</div><div class='add'>+					rule-&gt;filter.dst_addr);</div><div class='add'>+			/* As we only support matching by the full</div><div class='add'>+			 * mask, return the mask to userspace</div><div class='add'>+			 */</div><div class='add'>+			eth_broadcast_addr(fsp-&gt;m_u.ether_spec.h_dest);</div><div class='add'>+		}</div><div class='add'>+		if (rule-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_SRC_MAC_ADDR) {</div><div class='add'>+			ether_addr_copy(fsp-&gt;h_u.ether_spec.h_source,</div><div class='add'>+					rule-&gt;filter.src_addr);</div><div class='add'>+			/* As we only support matching by the full</div><div class='add'>+			 * mask, return the mask to userspace</div><div class='add'>+			 */</div><div class='add'>+			eth_broadcast_addr(fsp-&gt;m_u.ether_spec.h_source);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igc_get_ethtool_nfc_all(struct igc_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 igc_nfc_filter *rule;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+</div><div class='add'>+	/* report total rule count */</div><div class='add'>+	cmd-&gt;data = IGC_MAX_RXNFC_FILTERS;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;nfc_filter_list, nfc_node) {</div><div class='add'>+		if (cnt == cmd-&gt;rule_cnt)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		rule_locs[cnt] = rule-&gt;sw_idx;</div><div class='add'>+		cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;rule_cnt = cnt;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igc_get_rss_hash_opts(struct igc_adapter *adapter,</div><div class='add'>+				 struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;data = 0;</div><div class='add'>+</div><div class='add'>+	/* Report default options for RSS on igc */</div><div class='add'>+	switch (cmd-&gt;flow_type) {</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+		cmd-&gt;data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+		if (adapter-&gt;flags &amp; IGC_FLAG_RSS_FIELD_IPV4_UDP)</div><div class='add'>+			cmd-&gt;data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case SCTP_V4_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case AH_ESP_V4_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case AH_V4_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case ESP_V4_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case IPV4_FLOW:</div><div class='add'>+		cmd-&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'>+		cmd-&gt;data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		if (adapter-&gt;flags &amp; IGC_FLAG_RSS_FIELD_IPV6_UDP)</div><div class='add'>+			cmd-&gt;data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case SCTP_V6_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case AH_ESP_V6_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case AH_V6_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case ESP_V6_FLOW:</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case IPV6_FLOW:</div><div class='add'>+		cmd-&gt;data |= RXH_IP_SRC | RXH_IP_DST;</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 igc_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 igc_adapter *adapter = netdev_priv(dev);</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_GRXRINGS:</div><div class='add'>+		cmd-&gt;data = adapter-&gt;num_rx_queues;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		cmd-&gt;rule_cnt = adapter-&gt;nfc_filter_count;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		ret = igc_get_ethtool_nfc_entry(adapter, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		ret = igc_get_ethtool_nfc_all(adapter, cmd, rule_locs);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXFH:</div><div class='add'>+		ret = igc_get_rss_hash_opts(adapter, 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='add'>+#define UDP_RSS_FLAGS (IGC_FLAG_RSS_FIELD_IPV4_UDP | \</div><div class='add'>+		       IGC_FLAG_RSS_FIELD_IPV6_UDP)</div><div class='add'>+static int igc_set_rss_hash_opt(struct igc_adapter *adapter,</div><div class='add'>+				struct ethtool_rxnfc *nfc)</div><div class='add'>+{</div><div class='add'>+	u32 flags = adapter-&gt;flags;</div><div class='add'>+</div><div class='add'>+	/* RSS does not support anything other than hashing</div><div class='add'>+	 * to queues on src and dst IPs and ports</div><div class='add'>+	 */</div><div class='add'>+	if (nfc-&gt;data &amp; ~(RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+			  RXH_L4_B_0_1 | RXH_L4_B_2_3))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (nfc-&gt;flow_type) {</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+		if (!(nfc-&gt;data &amp; RXH_IP_SRC) ||</div><div class='add'>+		    !(nfc-&gt;data &amp; RXH_IP_DST) ||</div><div class='add'>+		    !(nfc-&gt;data &amp; RXH_L4_B_0_1) ||</div><div class='add'>+		    !(nfc-&gt;data &amp; RXH_L4_B_2_3))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+		if (!(nfc-&gt;data &amp; RXH_IP_SRC) ||</div><div class='add'>+		    !(nfc-&gt;data &amp; RXH_IP_DST))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		switch (nfc-&gt;data &amp; (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {</div><div class='add'>+		case 0:</div><div class='add'>+			flags &amp;= ~IGC_FLAG_RSS_FIELD_IPV4_UDP;</div><div class='add'>+			break;</div><div class='add'>+		case (RXH_L4_B_0_1 | RXH_L4_B_2_3):</div><div class='add'>+			flags |= IGC_FLAG_RSS_FIELD_IPV4_UDP;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		if (!(nfc-&gt;data &amp; RXH_IP_SRC) ||</div><div class='add'>+		    !(nfc-&gt;data &amp; RXH_IP_DST))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		switch (nfc-&gt;data &amp; (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {</div><div class='add'>+		case 0:</div><div class='add'>+			flags &amp;= ~IGC_FLAG_RSS_FIELD_IPV6_UDP;</div><div class='add'>+			break;</div><div class='add'>+		case (RXH_L4_B_0_1 | RXH_L4_B_2_3):</div><div class='add'>+			flags |= IGC_FLAG_RSS_FIELD_IPV6_UDP;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AH_ESP_V4_FLOW:</div><div class='add'>+	case AH_V4_FLOW:</div><div class='add'>+	case ESP_V4_FLOW:</div><div class='add'>+	case SCTP_V4_FLOW:</div><div class='add'>+	case AH_ESP_V6_FLOW:</div><div class='add'>+	case AH_V6_FLOW:</div><div class='add'>+	case ESP_V6_FLOW:</div><div class='add'>+	case SCTP_V6_FLOW:</div><div class='add'>+		if (!(nfc-&gt;data &amp; RXH_IP_SRC) ||</div><div class='add'>+		    !(nfc-&gt;data &amp; RXH_IP_DST) ||</div><div class='add'>+		    (nfc-&gt;data &amp; RXH_L4_B_0_1) ||</div><div class='add'>+		    (nfc-&gt;data &amp; RXH_L4_B_2_3))</div><div class='add'>+			return -EINVAL;</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 we changed something we need to update flags */</div><div class='add'>+	if (flags != adapter-&gt;flags) {</div><div class='add'>+		struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+		u32 mrqc = rd32(IGC_MRQC);</div><div class='add'>+</div><div class='add'>+		if ((flags &amp; UDP_RSS_FLAGS) &amp;&amp;</div><div class='add'>+		    !(adapter-&gt;flags &amp; UDP_RSS_FLAGS))</div><div class='add'>+			dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				"enabling UDP RSS: fragmented packets may arrive out of order to the stack above\n");</div><div class='add'>+</div><div class='add'>+		adapter-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+		/* Perform hash on these packet types */</div><div class='add'>+		mrqc |= IGC_MRQC_RSS_FIELD_IPV4 |</div><div class='add'>+			IGC_MRQC_RSS_FIELD_IPV4_TCP |</div><div class='add'>+			IGC_MRQC_RSS_FIELD_IPV6 |</div><div class='add'>+			IGC_MRQC_RSS_FIELD_IPV6_TCP;</div><div class='add'>+</div><div class='add'>+		mrqc &amp;= ~(IGC_MRQC_RSS_FIELD_IPV4_UDP |</div><div class='add'>+			  IGC_MRQC_RSS_FIELD_IPV6_UDP);</div><div class='add'>+</div><div class='add'>+		if (flags &amp; IGC_FLAG_RSS_FIELD_IPV4_UDP)</div><div class='add'>+			mrqc |= IGC_MRQC_RSS_FIELD_IPV4_UDP;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; IGC_FLAG_RSS_FIELD_IPV6_UDP)</div><div class='add'>+			mrqc |= IGC_MRQC_RSS_FIELD_IPV6_UDP;</div><div class='add'>+</div><div class='add'>+		wr32(IGC_MRQC, mrqc);</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 igc_rxnfc_write_etype_filter(struct igc_adapter *adapter,</div><div class='add'>+					struct igc_nfc_filter *input)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u8 i;</div><div class='add'>+	u32 etqf;</div><div class='add'>+	u16 etype;</div><div class='add'>+</div><div class='add'>+	/* find an empty etype filter register */</div><div class='add'>+	for (i = 0; i &lt; MAX_ETYPE_FILTER; ++i) {</div><div class='add'>+		if (!adapter-&gt;etype_bitmap[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == MAX_ETYPE_FILTER) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "ethtool -N: etype filters are all used.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;etype_bitmap[i] = true;</div><div class='add'>+</div><div class='add'>+	etqf = rd32(IGC_ETQF(i));</div><div class='add'>+	etype = ntohs(input-&gt;filter.etype &amp; ETHER_TYPE_FULL_MASK);</div><div class='add'>+</div><div class='add'>+	etqf |= IGC_ETQF_FILTER_ENABLE;</div><div class='add'>+	etqf &amp;= ~IGC_ETQF_ETYPE_MASK;</div><div class='add'>+	etqf |= (etype &amp; IGC_ETQF_ETYPE_MASK);</div><div class='add'>+</div><div class='add'>+	etqf &amp;= ~IGC_ETQF_QUEUE_MASK;</div><div class='add'>+	etqf |= ((input-&gt;action &lt;&lt; IGC_ETQF_QUEUE_SHIFT)</div><div class='add'>+		&amp; IGC_ETQF_QUEUE_MASK);</div><div class='add'>+	etqf |= IGC_ETQF_QUEUE_ENABLE;</div><div class='add'>+</div><div class='add'>+	wr32(IGC_ETQF(i), etqf);</div><div class='add'>+</div><div class='add'>+	input-&gt;etype_reg_index = i;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igc_rxnfc_write_vlan_prio_filter(struct igc_adapter *adapter,</div><div class='add'>+					    struct igc_nfc_filter *input)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u8 vlan_priority;</div><div class='add'>+	u16 queue_index;</div><div class='add'>+	u32 vlapqf;</div><div class='add'>+</div><div class='add'>+	vlapqf = rd32(IGC_VLAPQF);</div><div class='add'>+	vlan_priority = (ntohs(input-&gt;filter.vlan_tci) &amp; VLAN_PRIO_MASK)</div><div class='add'>+				&gt;&gt; VLAN_PRIO_SHIFT;</div><div class='add'>+	queue_index = (vlapqf &gt;&gt; (vlan_priority * 4)) &amp; IGC_VLAPQF_QUEUE_MASK;</div><div class='add'>+</div><div class='add'>+	/* check whether this vlan prio is already set */</div><div class='add'>+	if (vlapqf &amp; IGC_VLAPQF_P_VALID(vlan_priority) &amp;&amp;</div><div class='add'>+	    queue_index != input-&gt;action) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "ethtool rxnfc set vlan prio filter failed.\n");</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlapqf |= IGC_VLAPQF_P_VALID(vlan_priority);</div><div class='add'>+	vlapqf |= IGC_VLAPQF_QUEUE_SEL(vlan_priority, input-&gt;action);</div><div class='add'>+</div><div class='add'>+	wr32(IGC_VLAPQF, vlapqf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int igc_add_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;mac.type == igc_i225 &amp;&amp;</div><div class='add'>+	    !(input-&gt;filter.match_flags &amp; ~IGC_FILTER_FLAG_SRC_MAC_ADDR)) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"i225 doesn't support flow classification rules specifying only source addresses.\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_ETHER_TYPE) {</div><div class='add'>+		err = igc_rxnfc_write_etype_filter(adapter, input);</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 (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_DST_MAC_ADDR) {</div><div class='add'>+		err = igc_add_mac_steering_filter(adapter,</div><div class='add'>+						  input-&gt;filter.dst_addr,</div><div class='add'>+						  input-&gt;action, 0);</div><div class='add'>+		err = min_t(int, err, 0);</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 (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_SRC_MAC_ADDR) {</div><div class='add'>+		err = igc_add_mac_steering_filter(adapter,</div><div class='add'>+						  input-&gt;filter.src_addr,</div><div class='add'>+						  input-&gt;action,</div><div class='add'>+						  IGC_MAC_STATE_SRC_ADDR);</div><div class='add'>+		err = min_t(int, err, 0);</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 (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_VLAN_TCI)</div><div class='add'>+		err = igc_rxnfc_write_vlan_prio_filter(adapter, input);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void igc_clear_etype_filter_regs(struct igc_adapter *adapter,</div><div class='add'>+					u16 reg_index)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 etqf = rd32(IGC_ETQF(reg_index));</div><div class='add'>+</div><div class='add'>+	etqf &amp;= ~IGC_ETQF_QUEUE_ENABLE;</div><div class='add'>+	etqf &amp;= ~IGC_ETQF_QUEUE_MASK;</div><div class='add'>+	etqf &amp;= ~IGC_ETQF_FILTER_ENABLE;</div><div class='add'>+</div><div class='add'>+	wr32(IGC_ETQF(reg_index), etqf);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;etype_bitmap[reg_index] = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void igc_clear_vlan_prio_filter(struct igc_adapter *adapter,</div><div class='add'>+				       u16 vlan_tci)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u8 vlan_priority;</div><div class='add'>+	u32 vlapqf;</div><div class='add'>+</div><div class='add'>+	vlan_priority = (vlan_tci &amp; VLAN_PRIO_MASK) &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='add'>+</div><div class='add'>+	vlapqf = rd32(IGC_VLAPQF);</div><div class='add'>+	vlapqf &amp;= ~IGC_VLAPQF_P_VALID(vlan_priority);</div><div class='add'>+	vlapqf &amp;= ~IGC_VLAPQF_QUEUE_SEL(vlan_priority,</div><div class='add'>+						IGC_VLAPQF_QUEUE_MASK);</div><div class='add'>+</div><div class='add'>+	wr32(IGC_VLAPQF, vlapqf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int igc_erase_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)</div><div class='add'>+{</div><div class='add'>+	if (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_ETHER_TYPE)</div><div class='add'>+		igc_clear_etype_filter_regs(adapter,</div><div class='add'>+					    input-&gt;etype_reg_index);</div><div class='add'>+</div><div class='add'>+	if (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_VLAN_TCI)</div><div class='add'>+		igc_clear_vlan_prio_filter(adapter,</div><div class='add'>+					   ntohs(input-&gt;filter.vlan_tci));</div><div class='add'>+</div><div class='add'>+	if (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_SRC_MAC_ADDR)</div><div class='add'>+		igc_del_mac_steering_filter(adapter, input-&gt;filter.src_addr,</div><div class='add'>+					    input-&gt;action,</div><div class='add'>+					    IGC_MAC_STATE_SRC_ADDR);</div><div class='add'>+</div><div class='add'>+	if (input-&gt;filter.match_flags &amp; IGC_FILTER_FLAG_DST_MAC_ADDR)</div><div class='add'>+		igc_del_mac_steering_filter(adapter, input-&gt;filter.dst_addr,</div><div class='add'>+					    input-&gt;action, 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 igc_update_ethtool_nfc_entry(struct igc_adapter *adapter,</div><div class='add'>+					struct igc_nfc_filter *input,</div><div class='add'>+					u16 sw_idx)</div><div class='add'>+{</div><div class='add'>+	struct igc_nfc_filter *rule, *parent;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	parent = NULL;</div><div class='add'>+	rule = NULL;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;nfc_filter_list, nfc_node) {</div><div class='add'>+		/* hash found, or no matching entry */</div><div class='add'>+		if (rule-&gt;sw_idx &gt;= sw_idx)</div><div class='add'>+			break;</div><div class='add'>+		parent = rule;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if there is an old rule occupying our place remove it */</div><div class='add'>+	if (rule &amp;&amp; rule-&gt;sw_idx == sw_idx) {</div><div class='add'>+		if (!input)</div><div class='add'>+			err = igc_erase_filter(adapter, rule);</div><div class='add'>+</div><div class='add'>+		hlist_del(&amp;rule-&gt;nfc_node);</div><div class='add'>+		kfree(rule);</div><div class='add'>+		adapter-&gt;nfc_filter_count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If no input this was a delete, err should be 0 if a rule was</div><div class='add'>+	 * successfully found and removed from the list else -EINVAL</div><div class='add'>+	 */</div><div class='add'>+	if (!input)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* initialize node */</div><div class='add'>+	INIT_HLIST_NODE(&amp;input-&gt;nfc_node);</div><div class='add'>+</div><div class='add'>+	/* add filter to the list */</div><div class='add'>+	if (parent)</div><div class='add'>+		hlist_add_behind(&amp;input-&gt;nfc_node, &amp;parent-&gt;nfc_node);</div><div class='add'>+	else</div><div class='add'>+		hlist_add_head(&amp;input-&gt;nfc_node, &amp;adapter-&gt;nfc_filter_list);</div><div class='add'>+</div><div class='add'>+	/* update counts */</div><div class='add'>+	adapter-&gt;nfc_filter_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 igc_add_ethtool_nfc_entry(struct igc_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 igc_nfc_filter *input, *rule;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!(netdev-&gt;hw_features &amp; NETIF_F_NTUPLE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Don't allow programming if the action is a queue greater than</div><div class='add'>+	 * the number of online Rx queues.</div><div class='add'>+	 */</div><div class='add'>+	if (fsp-&gt;ring_cookie == RX_CLS_FLOW_DISC ||</div><div class='add'>+	    fsp-&gt;ring_cookie &gt;= adapter-&gt;num_rx_queues) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "ethtool -N: The specified action is invalid\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't allow indexes to exist outside of available space */</div><div class='add'>+	if (fsp-&gt;location &gt;= IGC_MAX_RXNFC_FILTERS) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "Location out of range\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((fsp-&gt;flow_type &amp; ~FLOW_EXT) != ETHER_FLOW)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	input = kzalloc(sizeof(*input), GFP_KERNEL);</div><div class='add'>+	if (!input)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fsp-&gt;m_u.ether_spec.h_proto == ETHER_TYPE_FULL_MASK) {</div><div class='add'>+		input-&gt;filter.etype = fsp-&gt;h_u.ether_spec.h_proto;</div><div class='add'>+		input-&gt;filter.match_flags = IGC_FILTER_FLAG_ETHER_TYPE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only support matching addresses by the full mask */</div><div class='add'>+	if (is_broadcast_ether_addr(fsp-&gt;m_u.ether_spec.h_source)) {</div><div class='add'>+		input-&gt;filter.match_flags |= IGC_FILTER_FLAG_SRC_MAC_ADDR;</div><div class='add'>+		ether_addr_copy(input-&gt;filter.src_addr,</div><div class='add'>+				fsp-&gt;h_u.ether_spec.h_source);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only support matching addresses by the full mask */</div><div class='add'>+	if (is_broadcast_ether_addr(fsp-&gt;m_u.ether_spec.h_dest)) {</div><div class='add'>+		input-&gt;filter.match_flags |= IGC_FILTER_FLAG_DST_MAC_ADDR;</div><div class='add'>+		ether_addr_copy(input-&gt;filter.dst_addr,</div><div class='add'>+				fsp-&gt;h_u.ether_spec.h_dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((fsp-&gt;flow_type &amp; FLOW_EXT) &amp;&amp; fsp-&gt;m_ext.vlan_tci) {</div><div class='add'>+		if (fsp-&gt;m_ext.vlan_tci != htons(VLAN_PRIO_MASK)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+		input-&gt;filter.vlan_tci = fsp-&gt;h_ext.vlan_tci;</div><div class='add'>+		input-&gt;filter.match_flags |= IGC_FILTER_FLAG_VLAN_TCI;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input-&gt;action = fsp-&gt;ring_cookie;</div><div class='add'>+	input-&gt;sw_idx = fsp-&gt;location;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;nfc_filter_list, nfc_node) {</div><div class='add'>+		if (!memcmp(&amp;input-&gt;filter, &amp;rule-&gt;filter,</div><div class='add'>+			    sizeof(input-&gt;filter))) {</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				"ethtool: this filter is already set\n");</div><div class='add'>+			goto err_out_w_lock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = igc_add_filter(adapter, input);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_w_lock;</div><div class='add'>+</div><div class='add'>+	igc_update_ethtool_nfc_entry(adapter, input, input-&gt;sw_idx);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_w_lock:</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+err_out:</div><div class='add'>+	kfree(input);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igc_del_ethtool_nfc_entry(struct igc_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'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+	err = igc_update_ethtool_nfc_entry(adapter, NULL, fsp-&gt;location);</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;nfc_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 igc_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct igc_adapter *adapter = netdev_priv(dev);</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_SRXFH:</div><div class='add'>+		ret = igc_set_rss_hash_opt(adapter, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		ret = igc_add_ethtool_nfc_entry(adapter, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		ret = igc_del_ethtool_nfc_entry(adapter, cmd);</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'> void igc_write_rss_indir_tbl(struct igc_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -885,17 +1715,13 @@ static int igc_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 			if (hw-&gt;mac.type == igc_i225 &amp;&amp;</div><div class='ctx'> 			    (status &amp; IGC_STATUS_SPEED_2500)) {</div><div class='ctx'> 				speed = SPEED_2500;</div><div class='del'>-				hw_dbg("2500 Mbs, ");</div><div class='ctx'> 			} else {</div><div class='ctx'> 				speed = SPEED_1000;</div><div class='del'>-				hw_dbg("1000 Mbs, ");</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (status &amp; IGC_STATUS_SPEED_100) {</div><div class='ctx'> 			speed = SPEED_100;</div><div class='del'>-			hw_dbg("100 Mbs, ");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			speed = SPEED_10;</div><div class='del'>-			hw_dbg("10 Mbs, ");</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((status &amp; IGC_STATUS_FD) ||</div><div class='ctx'> 		    hw-&gt;phy.media_type != igc_media_type_copper)</div><div class='hunk'>@@ -1011,8 +1837,13 @@ static const struct ethtool_ops igc_ethtool_ops = {</div><div class='ctx'> 	.set_ringparam		= igc_set_ringparam,</div><div class='ctx'> 	.get_pauseparam		= igc_get_pauseparam,</div><div class='ctx'> 	.set_pauseparam		= igc_set_pauseparam,</div><div class='add'>+	.get_strings		= igc_get_strings,</div><div class='add'>+	.get_sset_count		= igc_get_sset_count,</div><div class='add'>+	.get_ethtool_stats	= igc_get_ethtool_stats,</div><div class='ctx'> 	.get_coalesce		= igc_get_coalesce,</div><div class='ctx'> 	.set_coalesce		= igc_set_coalesce,</div><div class='add'>+	.get_rxnfc		= igc_get_rxnfc,</div><div class='add'>+	.set_rxnfc		= igc_set_rxnfc,</div><div class='ctx'> 	.get_rxfh_indir_size	= igc_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh		= igc_get_rxfh,</div><div class='ctx'> 	.set_rxfh		= igc_set_rxfh,</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c<br/>index 87a11879bf2d..34fa0e60a780 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igc/igc_main.c</a></div><div class='hunk'>@@ -620,6 +620,55 @@ static void igc_configure_tx(struct igc_adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static void igc_setup_mrqc(struct igc_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 j, num_rx_queues;</div><div class='add'>+	u32 mrqc, rxcsum;</div><div class='add'>+	u32 rss_key[10];</div><div class='add'>+</div><div class='add'>+	netdev_rss_key_fill(rss_key, sizeof(rss_key));</div><div class='add'>+	for (j = 0; j &lt; 10; j++)</div><div class='add'>+		wr32(IGC_RSSRK(j), rss_key[j]);</div><div class='add'>+</div><div class='add'>+	num_rx_queues = adapter-&gt;rss_queues;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;rss_indir_tbl_init != num_rx_queues) {</div><div class='add'>+		for (j = 0; j &lt; IGC_RETA_SIZE; j++)</div><div class='add'>+			adapter-&gt;rss_indir_tbl[j] =</div><div class='add'>+			(j * num_rx_queues) / IGC_RETA_SIZE;</div><div class='add'>+		adapter-&gt;rss_indir_tbl_init = num_rx_queues;</div><div class='add'>+	}</div><div class='add'>+	igc_write_rss_indir_tbl(adapter);</div><div class='add'>+</div><div class='add'>+	/* Disable raw packet checksumming so that RSS hash is placed in</div><div class='add'>+	 * descriptor on writeback.  No need to enable TCP/UDP/IP checksum</div><div class='add'>+	 * offloads as they are enabled by default</div><div class='add'>+	 */</div><div class='add'>+	rxcsum = rd32(IGC_RXCSUM);</div><div class='add'>+	rxcsum |= IGC_RXCSUM_PCSD;</div><div class='add'>+</div><div class='add'>+	/* Enable Receive Checksum Offload for SCTP */</div><div class='add'>+	rxcsum |= IGC_RXCSUM_CRCOFL;</div><div class='add'>+</div><div class='add'>+	/* Don't need to set TUOFL or IPOFL, they default to 1 */</div><div class='add'>+	wr32(IGC_RXCSUM, rxcsum);</div><div class='add'>+</div><div class='add'>+	/* Generate RSS hash based on packet types, TCP/UDP</div><div class='add'>+	 * port numbers and/or IPv4/v6 src and dst addresses</div><div class='add'>+	 */</div><div class='add'>+	mrqc = IGC_MRQC_RSS_FIELD_IPV4 |</div><div class='add'>+	       IGC_MRQC_RSS_FIELD_IPV4_TCP |</div><div class='add'>+	       IGC_MRQC_RSS_FIELD_IPV6 |</div><div class='add'>+	       IGC_MRQC_RSS_FIELD_IPV6_TCP |</div><div class='add'>+	       IGC_MRQC_RSS_FIELD_IPV6_TCP_EX;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; IGC_FLAG_RSS_FIELD_IPV4_UDP)</div><div class='add'>+		mrqc |= IGC_MRQC_RSS_FIELD_IPV4_UDP;</div><div class='add'>+	if (adapter-&gt;flags &amp; IGC_FLAG_RSS_FIELD_IPV6_UDP)</div><div class='add'>+		mrqc |= IGC_MRQC_RSS_FIELD_IPV6_UDP;</div><div class='add'>+</div><div class='add'>+	mrqc |= IGC_MRQC_ENABLE_RSS_MQ;</div><div class='add'>+</div><div class='add'>+	wr32(IGC_MRQC, mrqc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -890,13 +939,8 @@ static int igc_tx_map(struct igc_ring *tx_ring,</div><div class='ctx'> 	/* Make sure there is space in the ring for the next send. */</div><div class='ctx'> 	igc_maybe_stop_tx(tx_ring, DESC_NEEDED);</div><div class='ctx'> </div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1150,7 +1194,7 @@ static struct sk_buff *igc_construct_skb(struct igc_ring *rx_ring,</div><div class='ctx'> 	/* Determine available headroom for copy */</div><div class='ctx'> 	headlen = size;</div><div class='ctx'> 	if (headlen &gt; IGC_RX_HDR_LEN)</div><div class='del'>-		headlen = eth_get_headlen(va, IGC_RX_HDR_LEN);</div><div class='add'>+		headlen = eth_get_headlen(skb-&gt;dev, va, IGC_RX_HDR_LEN);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	memcpy(__skb_put(skb, headlen), va, ALIGN(headlen, sizeof(long)));</div><div class='hunk'>@@ -1738,12 +1782,200 @@ void igc_up(struct igc_adapter *adapter)</div><div class='ctx'>  * igc_update_stats - Update the board statistics counters</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  */</div><div class='del'>-static void igc_update_stats(struct igc_adapter *adapter)</div><div class='add'>+void igc_update_stats(struct igc_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct rtnl_link_stats64 *net_stats = &amp;adapter-&gt;stats64;</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u64 _bytes, _packets;</div><div class='add'>+	u64 bytes, packets;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	u32 mpc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Prevent stats update while adapter is being reset, or if the pci</div><div class='add'>+	 * connection is down.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;link_speed == 0)</div><div class='add'>+		return;</div><div class='add'>+	if (pci_channel_offline(pdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	packets = 0;</div><div class='add'>+	bytes = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+		struct igc_ring *ring = adapter-&gt;rx_ring[i];</div><div class='add'>+		u32 rqdpc = rd32(IGC_RQDPC(i));</div><div class='add'>+</div><div class='add'>+		if (hw-&gt;mac.type &gt;= igc_i225)</div><div class='add'>+			wr32(IGC_RQDPC(i), 0);</div><div class='add'>+</div><div class='add'>+		if (rqdpc) {</div><div class='add'>+			ring-&gt;rx_stats.drops += rqdpc;</div><div class='add'>+			net_stats-&gt;rx_fifo_errors += rqdpc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin_irq(&amp;ring-&gt;rx_syncp);</div><div class='add'>+			_bytes = ring-&gt;rx_stats.bytes;</div><div class='add'>+			_packets = ring-&gt;rx_stats.packets;</div><div class='add'>+		} while (u64_stats_fetch_retry_irq(&amp;ring-&gt;rx_syncp, start));</div><div class='add'>+		bytes += _bytes;</div><div class='add'>+		packets += _packets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	net_stats-&gt;rx_bytes = bytes;</div><div class='add'>+	net_stats-&gt;rx_packets = packets;</div><div class='add'>+</div><div class='add'>+	packets = 0;</div><div class='add'>+	bytes = 0;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='add'>+		struct igc_ring *ring = adapter-&gt;tx_ring[i];</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin_irq(&amp;ring-&gt;tx_syncp);</div><div class='add'>+			_bytes = ring-&gt;tx_stats.bytes;</div><div class='add'>+			_packets = ring-&gt;tx_stats.packets;</div><div class='add'>+		} while (u64_stats_fetch_retry_irq(&amp;ring-&gt;tx_syncp, start));</div><div class='add'>+		bytes += _bytes;</div><div class='add'>+		packets += _packets;</div><div class='add'>+	}</div><div class='add'>+	net_stats-&gt;tx_bytes = bytes;</div><div class='add'>+	net_stats-&gt;tx_packets = packets;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* read stats registers */</div><div class='add'>+	adapter-&gt;stats.crcerrs += rd32(IGC_CRCERRS);</div><div class='add'>+	adapter-&gt;stats.gprc += rd32(IGC_GPRC);</div><div class='add'>+	adapter-&gt;stats.gorc += rd32(IGC_GORCL);</div><div class='add'>+	rd32(IGC_GORCH); /* clear GORCL */</div><div class='add'>+	adapter-&gt;stats.bprc += rd32(IGC_BPRC);</div><div class='add'>+	adapter-&gt;stats.mprc += rd32(IGC_MPRC);</div><div class='add'>+	adapter-&gt;stats.roc += rd32(IGC_ROC);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.prc64 += rd32(IGC_PRC64);</div><div class='add'>+	adapter-&gt;stats.prc127 += rd32(IGC_PRC127);</div><div class='add'>+	adapter-&gt;stats.prc255 += rd32(IGC_PRC255);</div><div class='add'>+	adapter-&gt;stats.prc511 += rd32(IGC_PRC511);</div><div class='add'>+	adapter-&gt;stats.prc1023 += rd32(IGC_PRC1023);</div><div class='add'>+	adapter-&gt;stats.prc1522 += rd32(IGC_PRC1522);</div><div class='add'>+	adapter-&gt;stats.symerrs += rd32(IGC_SYMERRS);</div><div class='add'>+	adapter-&gt;stats.sec += rd32(IGC_SEC);</div><div class='add'>+</div><div class='add'>+	mpc = rd32(IGC_MPC);</div><div class='add'>+	adapter-&gt;stats.mpc += mpc;</div><div class='add'>+	net_stats-&gt;rx_fifo_errors += mpc;</div><div class='add'>+	adapter-&gt;stats.scc += rd32(IGC_SCC);</div><div class='add'>+	adapter-&gt;stats.ecol += rd32(IGC_ECOL);</div><div class='add'>+	adapter-&gt;stats.mcc += rd32(IGC_MCC);</div><div class='add'>+	adapter-&gt;stats.latecol += rd32(IGC_LATECOL);</div><div class='add'>+	adapter-&gt;stats.dc += rd32(IGC_DC);</div><div class='add'>+	adapter-&gt;stats.rlec += rd32(IGC_RLEC);</div><div class='add'>+	adapter-&gt;stats.xonrxc += rd32(IGC_XONRXC);</div><div class='add'>+	adapter-&gt;stats.xontxc += rd32(IGC_XONTXC);</div><div class='add'>+	adapter-&gt;stats.xoffrxc += rd32(IGC_XOFFRXC);</div><div class='add'>+	adapter-&gt;stats.xofftxc += rd32(IGC_XOFFTXC);</div><div class='add'>+	adapter-&gt;stats.fcruc += rd32(IGC_FCRUC);</div><div class='add'>+	adapter-&gt;stats.gptc += rd32(IGC_GPTC);</div><div class='add'>+	adapter-&gt;stats.gotc += rd32(IGC_GOTCL);</div><div class='add'>+	rd32(IGC_GOTCH); /* clear GOTCL */</div><div class='add'>+	adapter-&gt;stats.rnbc += rd32(IGC_RNBC);</div><div class='add'>+	adapter-&gt;stats.ruc += rd32(IGC_RUC);</div><div class='add'>+	adapter-&gt;stats.rfc += rd32(IGC_RFC);</div><div class='add'>+	adapter-&gt;stats.rjc += rd32(IGC_RJC);</div><div class='add'>+	adapter-&gt;stats.tor += rd32(IGC_TORH);</div><div class='add'>+	adapter-&gt;stats.tot += rd32(IGC_TOTH);</div><div class='add'>+	adapter-&gt;stats.tpr += rd32(IGC_TPR);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.ptc64 += rd32(IGC_PTC64);</div><div class='add'>+	adapter-&gt;stats.ptc127 += rd32(IGC_PTC127);</div><div class='add'>+	adapter-&gt;stats.ptc255 += rd32(IGC_PTC255);</div><div class='add'>+	adapter-&gt;stats.ptc511 += rd32(IGC_PTC511);</div><div class='add'>+	adapter-&gt;stats.ptc1023 += rd32(IGC_PTC1023);</div><div class='add'>+	adapter-&gt;stats.ptc1522 += rd32(IGC_PTC1522);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.mptc += rd32(IGC_MPTC);</div><div class='add'>+	adapter-&gt;stats.bptc += rd32(IGC_BPTC);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.tpt += rd32(IGC_TPT);</div><div class='add'>+	adapter-&gt;stats.colc += rd32(IGC_COLC);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.algnerrc += rd32(IGC_ALGNERRC);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.tsctc += rd32(IGC_TSCTC);</div><div class='add'>+	adapter-&gt;stats.tsctfc += rd32(IGC_TSCTFC);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;stats.iac += rd32(IGC_IAC);</div><div class='add'>+	adapter-&gt;stats.icrxoc += rd32(IGC_ICRXOC);</div><div class='add'>+	adapter-&gt;stats.icrxptc += rd32(IGC_ICRXPTC);</div><div class='add'>+	adapter-&gt;stats.icrxatc += rd32(IGC_ICRXATC);</div><div class='add'>+	adapter-&gt;stats.ictxptc += rd32(IGC_ICTXPTC);</div><div class='add'>+	adapter-&gt;stats.ictxatc += rd32(IGC_ICTXATC);</div><div class='add'>+	adapter-&gt;stats.ictxqec += rd32(IGC_ICTXQEC);</div><div class='add'>+	adapter-&gt;stats.ictxqmtc += rd32(IGC_ICTXQMTC);</div><div class='add'>+	adapter-&gt;stats.icrxdmtc += rd32(IGC_ICRXDMTC);</div><div class='add'>+</div><div class='add'>+	/* Fill out the OS statistics structure */</div><div class='add'>+	net_stats-&gt;multicast = adapter-&gt;stats.mprc;</div><div class='add'>+	net_stats-&gt;collisions = adapter-&gt;stats.colc;</div><div class='add'>+</div><div class='add'>+	/* Rx Errors */</div><div class='add'>+</div><div class='add'>+	/* RLEC on some newer hardware can be incorrect so build</div><div class='add'>+	 * our own version based on RUC and ROC</div><div class='add'>+	 */</div><div class='add'>+	net_stats-&gt;rx_errors = adapter-&gt;stats.rxerrc +</div><div class='add'>+		adapter-&gt;stats.crcerrs + adapter-&gt;stats.algnerrc +</div><div class='add'>+		adapter-&gt;stats.ruc + adapter-&gt;stats.roc +</div><div class='add'>+		adapter-&gt;stats.cexterr;</div><div class='add'>+	net_stats-&gt;rx_length_errors = adapter-&gt;stats.ruc +</div><div class='add'>+				      adapter-&gt;stats.roc;</div><div class='add'>+	net_stats-&gt;rx_crc_errors = adapter-&gt;stats.crcerrs;</div><div class='add'>+	net_stats-&gt;rx_frame_errors = adapter-&gt;stats.algnerrc;</div><div class='add'>+	net_stats-&gt;rx_missed_errors = adapter-&gt;stats.mpc;</div><div class='add'>+</div><div class='add'>+	/* Tx Errors */</div><div class='add'>+	net_stats-&gt;tx_errors = adapter-&gt;stats.ecol +</div><div class='add'>+			       adapter-&gt;stats.latecol;</div><div class='add'>+	net_stats-&gt;tx_aborted_errors = adapter-&gt;stats.ecol;</div><div class='add'>+	net_stats-&gt;tx_window_errors = adapter-&gt;stats.latecol;</div><div class='add'>+	net_stats-&gt;tx_carrier_errors = adapter-&gt;stats.tncrs;</div><div class='add'>+</div><div class='add'>+	/* Tx Dropped needs to be maintained elsewhere */</div><div class='add'>+</div><div class='add'>+	/* Management Stats */</div><div class='add'>+	adapter-&gt;stats.mgptc += rd32(IGC_MGTPTC);</div><div class='add'>+	adapter-&gt;stats.mgprc += rd32(IGC_MGTPRC);</div><div class='add'>+	adapter-&gt;stats.mgpdc += rd32(IGC_MGTPDC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void igc_nfc_filter_exit(struct igc_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct igc_nfc_filter *rule;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;nfc_filter_list, nfc_node)</div><div class='add'>+		igc_erase_filter(adapter, rule);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;cls_flower_list, nfc_node)</div><div class='add'>+		igc_erase_filter(adapter, rule);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void igc_nfc_filter_restore(struct igc_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct igc_nfc_filter *rule;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(rule, &amp;adapter-&gt;nfc_filter_list, nfc_node)</div><div class='add'>+		igc_add_filter(adapter, rule);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;adapter-&gt;nfc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1890,6 +2122,86 @@ static struct net_device_stats *igc_get_stats(struct net_device *netdev)</div><div class='ctx'> 	return &amp;netdev-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static netdev_features_t igc_fix_features(struct net_device *netdev,</div><div class='add'>+					  netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	/* Since there is no support for separate Rx/Tx vlan accel</div><div class='add'>+	 * enable/disable make sure Tx flag is always in same state as Rx.</div><div class='add'>+	 */</div><div class='add'>+	if (features &amp; NETIF_F_HW_VLAN_CTAG_RX)</div><div class='add'>+		features |= NETIF_F_HW_VLAN_CTAG_TX;</div><div class='add'>+	else</div><div class='add'>+		features &amp;= ~NETIF_F_HW_VLAN_CTAG_TX;</div><div class='add'>+</div><div class='add'>+	return features;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igc_set_features(struct net_device *netdev,</div><div class='add'>+			    netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='add'>+	struct igc_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Add VLAN support */</div><div class='add'>+	if (!(changed &amp; (NETIF_F_RXALL | NETIF_F_NTUPLE)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(features &amp; NETIF_F_NTUPLE)) {</div><div class='add'>+		struct hlist_node *node2;</div><div class='add'>+		struct igc_nfc_filter *rule;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+		hlist_for_each_entry_safe(rule, node2,</div><div class='add'>+					  &amp;adapter-&gt;nfc_filter_list, nfc_node) {</div><div class='add'>+			igc_erase_filter(adapter, rule);</div><div class='add'>+			hlist_del(&amp;rule-&gt;nfc_node);</div><div class='add'>+			kfree(rule);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;nfc_lock);</div><div class='add'>+		adapter-&gt;nfc_filter_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;features = features;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		igc_reinit_locked(adapter);</div><div class='add'>+	else</div><div class='add'>+		igc_reset(adapter);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_features_t</div><div class='add'>+igc_features_check(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		   netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	unsigned int network_hdr_len, mac_hdr_len;</div><div class='add'>+</div><div class='add'>+	/* Make certain the headers can be described by a context descriptor */</div><div class='add'>+	mac_hdr_len = skb_network_header(skb) - skb-&gt;data;</div><div class='add'>+	if (unlikely(mac_hdr_len &gt; IGC_MAX_MAC_HDR_LEN))</div><div class='add'>+		return features &amp; ~(NETIF_F_HW_CSUM |</div><div class='add'>+				    NETIF_F_SCTP_CRC |</div><div class='add'>+				    NETIF_F_HW_VLAN_CTAG_TX |</div><div class='add'>+				    NETIF_F_TSO |</div><div class='add'>+				    NETIF_F_TSO6);</div><div class='add'>+</div><div class='add'>+	network_hdr_len = skb_checksum_start(skb) - skb_network_header(skb);</div><div class='add'>+	if (unlikely(network_hdr_len &gt;  IGC_MAX_NETWORK_HDR_LEN))</div><div class='add'>+		return features &amp; ~(NETIF_F_HW_CSUM |</div><div class='add'>+				    NETIF_F_SCTP_CRC |</div><div class='add'>+				    NETIF_F_TSO |</div><div class='add'>+				    NETIF_F_TSO6);</div><div class='add'>+</div><div class='add'>+	/* We can only support IPv4 TSO in tunnels if we can mangle the</div><div class='add'>+	 * inner IP ID field, so strip TSO if MANGLEID is not supported.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;encapsulation &amp;&amp; !(features &amp; NETIF_F_TSO_MANGLEID))</div><div class='add'>+		features &amp;= ~NETIF_F_TSO;</div><div class='add'>+</div><div class='add'>+	return features;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * igc_configure - configure the hardware for RX and TX</div><div class='ctx'>  * @adapter: private board structure</div><div class='hunk'>@@ -1906,6 +2218,7 @@ static void igc_configure(struct igc_adapter *adapter)</div><div class='ctx'> 	igc_setup_mrqc(adapter);</div><div class='ctx'> 	igc_setup_rctl(adapter);</div><div class='ctx'> </div><div class='add'>+	igc_nfc_filter_restore(adapter);</div><div class='ctx'> 	igc_configure_tx(adapter);</div><div class='ctx'> 	igc_configure_rx(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1967,6 +2280,127 @@ static void igc_set_default_mac_filter(struct igc_adapter *adapter)</div><div class='ctx'> 	igc_rar_set_index(adapter, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* If the filter to be added and an already existing filter express</div><div class='add'>+ * the same address and address type, it should be possible to only</div><div class='add'>+ * override the other configurations, for example the queue to steer</div><div class='add'>+ * traffic.</div><div class='add'>+ */</div><div class='add'>+static bool igc_mac_entry_can_be_used(const struct igc_mac_addr *entry,</div><div class='add'>+				      const u8 *addr, const u8 flags)</div><div class='add'>+{</div><div class='add'>+	if (!(entry-&gt;state &amp; IGC_MAC_STATE_IN_USE))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if ((entry-&gt;state &amp; IGC_MAC_STATE_SRC_ADDR) !=</div><div class='add'>+	    (flags &amp; IGC_MAC_STATE_SRC_ADDR))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!ether_addr_equal(addr, entry-&gt;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'>+/* Add a MAC filter for 'addr' directing matching traffic to 'queue',</div><div class='add'>+ * 'flags' is used to indicate what kind of match is made, match is by</div><div class='add'>+ * default for the destination address, if matching by source address</div><div class='add'>+ * is desired the flag IGC_MAC_STATE_SRC_ADDR can be used.</div><div class='add'>+ */</div><div class='add'>+static int igc_add_mac_filter_flags(struct igc_adapter *adapter,</div><div class='add'>+				    const u8 *addr, const u8 queue,</div><div class='add'>+				    const u8 flags)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int rar_entries = hw-&gt;mac.rar_entry_count;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (is_zero_ether_addr(addr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Search for the first empty entry in the MAC table.</div><div class='add'>+	 * Do not touch entries at the end of the table reserved for the VF MAC</div><div class='add'>+	 * addresses.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; rar_entries; i++) {</div><div class='add'>+		if (!igc_mac_entry_can_be_used(&amp;adapter-&gt;mac_table[i],</div><div class='add'>+					       addr, flags))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(adapter-&gt;mac_table[i].addr, addr);</div><div class='add'>+		adapter-&gt;mac_table[i].queue = queue;</div><div class='add'>+		adapter-&gt;mac_table[i].state |= IGC_MAC_STATE_IN_USE | flags;</div><div class='add'>+</div><div class='add'>+		igc_rar_set_index(adapter, i);</div><div class='add'>+		return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int igc_add_mac_steering_filter(struct igc_adapter *adapter,</div><div class='add'>+				const u8 *addr, u8 queue, u8 flags)</div><div class='add'>+{</div><div class='add'>+	return igc_add_mac_filter_flags(adapter, addr, queue,</div><div class='add'>+					IGC_MAC_STATE_QUEUE_STEERING | flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Remove a MAC filter for 'addr' directing matching traffic to</div><div class='add'>+ * 'queue', 'flags' is used to indicate what kind of match need to be</div><div class='add'>+ * removed, match is by default for the destination address, if</div><div class='add'>+ * matching by source address is to be removed the flag</div><div class='add'>+ * IGC_MAC_STATE_SRC_ADDR can be used.</div><div class='add'>+ */</div><div class='add'>+static int igc_del_mac_filter_flags(struct igc_adapter *adapter,</div><div class='add'>+				    const u8 *addr, const u8 queue,</div><div class='add'>+				    const u8 flags)</div><div class='add'>+{</div><div class='add'>+	struct igc_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int rar_entries = hw-&gt;mac.rar_entry_count;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (is_zero_ether_addr(addr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Search for matching entry in the MAC table based on given address</div><div class='add'>+	 * and queue. Do not touch entries at the end of the table reserved</div><div class='add'>+	 * for the VF MAC addresses.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; rar_entries; i++) {</div><div class='add'>+		if (!(adapter-&gt;mac_table[i].state &amp; IGC_MAC_STATE_IN_USE))</div><div class='add'>+			continue;</div><div class='add'>+		if ((adapter-&gt;mac_table[i].state &amp; flags) != flags)</div><div class='add'>+			continue;</div><div class='add'>+		if (adapter-&gt;mac_table[i].queue != queue)</div><div class='add'>+			continue;</div><div class='add'>+		if (!ether_addr_equal(adapter-&gt;mac_table[i].addr, addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* When a filter for the default address is "deleted",</div><div class='add'>+		 * we return it to its initial configuration</div><div class='add'>+		 */</div><div class='add'>+		if (adapter-&gt;mac_table[i].state &amp; IGC_MAC_STATE_DEFAULT) {</div><div class='add'>+			adapter-&gt;mac_table[i].state =</div><div class='add'>+				IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;</div><div class='add'>+		} else {</div><div class='add'>+			adapter-&gt;mac_table[i].state = 0;</div><div class='add'>+			adapter-&gt;mac_table[i].queue = 0;</div><div class='add'>+			memset(adapter-&gt;mac_table[i].addr, 0, ETH_ALEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		igc_rar_set_index(adapter, i);</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'>+int igc_del_mac_steering_filter(struct igc_adapter *adapter,</div><div class='add'>+				const u8 *addr, u8 queue, u8 flags)</div><div class='add'>+{</div><div class='add'>+	return igc_del_mac_filter_flags(adapter, addr, queue,</div><div class='add'>+					IGC_MAC_STATE_QUEUE_STEERING | flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * igc_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='hunk'>@@ -3434,6 +3868,9 @@ static const struct net_device_ops igc_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address	= igc_set_mac,</div><div class='ctx'> 	.ndo_change_mtu		= igc_change_mtu,</div><div class='ctx'> 	.ndo_get_stats		= igc_get_stats,</div><div class='add'>+	.ndo_fix_features	= igc_fix_features,</div><div class='add'>+	.ndo_set_features	= igc_set_features,</div><div class='add'>+	.ndo_features_check	= igc_features_check,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* PCIe configuration access */</div><div class='hunk'>@@ -3663,6 +4100,9 @@ static int igc_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_sw_init;</div><div class='ctx'> </div><div class='add'>+	/* copy netdev features into list of user selectable features */</div><div class='add'>+	netdev-&gt;hw_features |= NETIF_F_NTUPLE;</div><div class='add'>+</div><div class='ctx'> 	/* MTU range: 68 - 9216 */</div><div class='ctx'> 	netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='ctx'> 	netdev-&gt;max_mtu = MAX_STD_JUMBO_FRAME_SIZE;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igc/igc_regs.h b/drivers/net/ethernet/intel/igc/igc_regs.h<br/>index 5afe7a8d3faf..50d7c04dccf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/igc/igc_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/igc/igc_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/igc/igc_regs.h</a></div><div class='hunk'>@@ -80,8 +80,23 @@</div><div class='ctx'> /* MSI-X Table Register Descriptions */</div><div class='ctx'> #define IGC_PBACL		0x05B68  /* MSIx PBA Clear - R/W 1 to clear */</div><div class='ctx'> </div><div class='add'>+/* RSS registers */</div><div class='add'>+#define IGC_MRQC		0x05818 /* Multiple Receive Control - RW */</div><div class='add'>+</div><div class='add'>+/* Filtering Registers */</div><div class='add'>+#define IGC_ETQF(_n)		(0x05CB0 + (4 * (_n))) /* EType Queue Fltr */</div><div class='add'>+</div><div class='add'>+/* ETQF register bit definitions */</div><div class='add'>+#define IGC_ETQF_FILTER_ENABLE	BIT(26)</div><div class='add'>+#define IGC_ETQF_QUEUE_ENABLE	BIT(31)</div><div class='add'>+#define IGC_ETQF_QUEUE_SHIFT	16</div><div class='add'>+#define IGC_ETQF_QUEUE_MASK	0x00070000</div><div class='add'>+#define IGC_ETQF_ETYPE_MASK	0x0000FFFF</div><div class='add'>+</div><div class='ctx'> /* Redirection Table - RW Array */</div><div class='ctx'> #define IGC_RETA(_i)		(0x05C00 + ((_i) * 4))</div><div class='add'>+/* RSS Random Key - RW Array */</div><div class='add'>+#define IGC_RSSRK(_i)		(0x05C80 + ((_i) * 4))</div><div class='ctx'> </div><div class='ctx'> /* Receive Register Descriptions */</div><div class='ctx'> #define IGC_RCTL		0x00100  /* Rx Control - RW */</div><div class='hunk'>@@ -101,6 +116,7 @@</div><div class='ctx'> #define IGC_UTA			0x0A000  /* Unicast Table Array - RW */</div><div class='ctx'> #define IGC_RAL(_n)		(0x05400 + ((_n) * 0x08))</div><div class='ctx'> #define IGC_RAH(_n)		(0x05404 + ((_n) * 0x08))</div><div class='add'>+#define IGC_VLAPQF		0x055B0  /* VLAN Priority Queue Filter VLAPQF */</div><div class='ctx'> </div><div class='ctx'> /* Transmit Register Descriptions */</div><div class='ctx'> #define IGC_TCTL		0x00400  /* Tx Control - RW */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c<br/>index e100054a3765..57fd9ee6de66 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a></div><div class='hunk'>@@ -1800,7 +1800,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,</div><div class='ctx'> 	 * we need the header to contain the greater of either ETH_HLEN or</div><div class='ctx'> 	 * 60 bytes if the skb-&gt;len is less than 60 for skb_pad.</div><div class='ctx'> 	 */</div><div class='del'>-	pull_len = eth_get_headlen(va, IXGBE_RX_HDR_SIZE);</div><div class='add'>+	pull_len = eth_get_headlen(skb-&gt;dev, va, IXGBE_RX_HDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	skb_copy_to_linear_data(skb, va, ALIGN(pull_len, sizeof(long)));</div><div class='hunk'>@@ -8297,13 +8297,8 @@ static int ixgbe_tx_map(struct ixgbe_ring *tx_ring,</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_maybe_stop_tx(tx_ring, DESC_NEEDED);</div><div class='ctx'> </div><div class='del'>-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb-&gt;xmit_more) {</div><div class='add'>+	if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {</div><div class='ctx'> 		writel(i, tx_ring-&gt;tail);</div><div class='del'>-</div><div class='del'>-		/* we need this if more than one processor can write to our tail</div><div class='del'>-		 * at a time, it synchronizes IO on IA64/Altix systems</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -8483,8 +8478,7 @@ static void ixgbe_atr(struct ixgbe_ring *ring,</div><div class='ctx'> </div><div class='ctx'> #ifdef IXGBE_FCOE</div><div class='ctx'> static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			      struct net_device *sb_dev,</div><div class='del'>-			      select_queue_fallback_t fallback)</div><div class='add'>+			      struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter;</div><div class='ctx'> 	struct ixgbe_ring_feature *f;</div><div class='hunk'>@@ -8514,7 +8508,7 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	default:</div><div class='del'>-		return fallback(dev, skb, sb_dev);</div><div class='add'>+		return netdev_pick_tx(dev, skb, sb_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f = &amp;adapter-&gt;ring_feature[RING_F_FCOE];</div><div class='hunk'>@@ -9796,7 +9790,7 @@ static int ixgbe_set_features(struct net_device *netdev,</div><div class='ctx'> 			    NETIF_F_HW_VLAN_CTAG_FILTER))</div><div class='ctx'> 		ixgbe_set_rx_mode(netdev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c<br/>index cc4907f9ff02..2fb97967961c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a></div><div class='hunk'>@@ -905,13 +905,12 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	struct device *dev = &amp;adapter-&gt;netdev-&gt;dev;</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='add'>+	int err = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;mii_bus = devm_mdiobus_alloc(dev);</div><div class='del'>-	if (!adapter-&gt;mii_bus)</div><div class='add'>+	bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!bus)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	bus = adapter-&gt;mii_bus;</div><div class='del'>-</div><div class='ctx'> 	switch (hw-&gt;device_id) {</div><div class='ctx'> 	/* C3000 SoCs */</div><div class='ctx'> 	case IXGBE_DEV_ID_X550EM_A_KR:</div><div class='hunk'>@@ -949,12 +948,15 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)</div><div class='ctx'> 	 */</div><div class='ctx'> 	hw-&gt;phy.mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_SUPPORTS_C22;</div><div class='ctx'> </div><div class='del'>-	return mdiobus_register(bus);</div><div class='add'>+	err = mdiobus_register(bus);</div><div class='add'>+	if (!err) {</div><div class='add'>+		adapter-&gt;mii_bus = bus;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> ixgbe_no_mii_bus:</div><div class='ctx'> 	devm_mdiobus_free(dev, bus);</div><div class='del'>-	adapter-&gt;mii_bus = NULL;</div><div class='del'>-	return -ENODEV;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c<br/>index 49e23afa05a2..d189ed247665 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a></div><div class='hunk'>@@ -895,7 +895,8 @@ struct sk_buff *ixgbevf_construct_skb(struct ixgbevf_ring *rx_ring,</div><div class='ctx'> 	/* Determine available headroom for copy */</div><div class='ctx'> 	headlen = size;</div><div class='ctx'> 	if (headlen &gt; IXGBEVF_RX_HDR_SIZE)</div><div class='del'>-		headlen = eth_get_headlen(xdp-&gt;data, IXGBEVF_RX_HDR_SIZE);</div><div class='add'>+		headlen = eth_get_headlen(skb-&gt;dev, xdp-&gt;data,</div><div class='add'>+					  IXGBEVF_RX_HDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* align pull length to size of long to optimize memcpy performance */</div><div class='ctx'> 	memcpy(__skb_put(skb, headlen), xdp-&gt;data,</div><div class='head'>diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c<br/>index d29104de0d53..cda641ef89af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/lantiq_xrx200.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/lantiq_xrx200.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/lantiq_xrx200.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/lantiq_xrx200.c</a></div><div class='hunk'>@@ -478,7 +478,7 @@ static int xrx200_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(np);</div><div class='del'>-	if (mac &amp;&amp; is_valid_ether_addr(mac))</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		ether_addr_copy(net_dev-&gt;dev_addr, mac);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(net_dev);</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c<br/>index 292a668ce88e..07e254fc96ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mv643xx_eth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mv643xx_eth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mv643xx_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mv643xx_eth.c</a></div><div class='hunk'>@@ -2749,7 +2749,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(pnp);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(ppd.mac_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	mv643xx_eth_property(pnp, "tx-queue-size", ppd.tx_queue_size);</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c<br/>index c0a3718b2e2a..8186135883ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvneta.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvneta.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvneta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mvneta.c</a></div><div class='hunk'>@@ -2467,7 +2467,7 @@ out:</div><div class='ctx'> 		if (txq-&gt;count &gt;= txq-&gt;tx_stop_threshold)</div><div class='ctx'> 			netif_tx_stop_queue(nq);</div><div class='ctx'> </div><div class='del'>-		if (!skb-&gt;xmit_more || netif_xmit_stopped(nq) ||</div><div class='add'>+		if (!netdev_xmit_more() || netif_xmit_stopped(nq) ||</div><div class='ctx'> 		    txq-&gt;pending + frags &gt; MVNETA_TXQ_DEC_SENT_MASK)</div><div class='ctx'> 			mvneta_txq_pend_desc_add(pp, txq, frags);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3385,6 +3385,7 @@ static void mvneta_validate(struct net_device *ndev, unsigned long *supported,</div><div class='ctx'> 		phylink_set(mask, 1000baseX_Full);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pp-&gt;comphy || state-&gt;interface == PHY_INTERFACE_MODE_2500BASEX) {</div><div class='add'>+		phylink_set(mask, 2500baseT_Full);</div><div class='ctx'> 		phylink_set(mask, 2500baseX_Full);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4475,15 +4476,14 @@ static int mvneta_probe(struct platform_device *pdev)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	dev = alloc_etherdev_mqs(sizeof(struct mvneta_port), txq_number, rxq_number);</div><div class='add'>+	dev = devm_alloc_etherdev_mqs(&amp;pdev-&gt;dev, sizeof(struct mvneta_port),</div><div class='add'>+				      txq_number, rxq_number);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = irq_of_parse_and_map(dn, 0);</div><div class='del'>-	if (dev-&gt;irq == 0) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_free_netdev;</div><div class='del'>-	}</div><div class='add'>+	if (dev-&gt;irq == 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	phy_mode = of_get_phy_mode(dn);</div><div class='ctx'> 	if (phy_mode &lt; 0) {</div><div class='hunk'>@@ -4563,7 +4563,7 @@ static int mvneta_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dt_mac_addr = of_get_mac_address(dn);</div><div class='del'>-	if (dt_mac_addr) {</div><div class='add'>+	if (!IS_ERR(dt_mac_addr)) {</div><div class='ctx'> 		mac_from = "device tree";</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, dt_mac_addr, ETH_ALEN);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4704,8 +4704,6 @@ err_free_phylink:</div><div class='ctx'> 		phylink_destroy(pp-&gt;phylink);</div><div class='ctx'> err_free_irq:</div><div class='ctx'> 	irq_dispose_mapping(dev-&gt;irq);</div><div class='del'>-err_free_netdev:</div><div class='del'>-	free_netdev(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4722,7 +4720,6 @@ static int mvneta_remove(struct platform_device *pdev)</div><div class='ctx'> 	free_percpu(pp-&gt;stats);</div><div class='ctx'> 	irq_dispose_mapping(dev-&gt;irq);</div><div class='ctx'> 	phylink_destroy(pp-&gt;phylink);</div><div class='del'>-	free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (pp-&gt;bm_priv) {</div><div class='ctx'> 		mvneta_bm_pool_destroy(pp-&gt;bm_priv, pp-&gt;pool_long, 1 &lt;&lt; pp-&gt;id);</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h<br/>index ff0f4c503f53..6171270a016c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mvpp2/mvpp2.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.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;net/flow_offload.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Fifo Registers */</div><div class='ctx'> #define MVPP2_RX_DATA_FIFO_SIZE_REG(port)	(0x00 + 4 * (port))</div><div class='hunk'>@@ -101,6 +102,7 @@</div><div class='ctx'> #define MVPP2_CLS_FLOW_TBL1_REG			0x1828</div><div class='ctx'> #define     MVPP2_CLS_FLOW_TBL1_N_FIELDS_MASK	0x7</div><div class='ctx'> #define     MVPP2_CLS_FLOW_TBL1_N_FIELDS(x)	(x)</div><div class='add'>+#define     MVPP2_CLS_FLOW_TBL1_LU_TYPE(lu)	(((lu) &amp; 0x3f) &lt;&lt; 3)</div><div class='ctx'> #define     MVPP2_CLS_FLOW_TBL1_PRIO_MASK	0x3f</div><div class='ctx'> #define     MVPP2_CLS_FLOW_TBL1_PRIO(x)		((x) &lt;&lt; 9)</div><div class='ctx'> #define     MVPP2_CLS_FLOW_TBL1_SEQ_MASK	0x7</div><div class='hunk'>@@ -123,13 +125,18 @@</div><div class='ctx'> #define MVPP22_CLS_C2_TCAM_DATA2		0x1b18</div><div class='ctx'> #define MVPP22_CLS_C2_TCAM_DATA3		0x1b1c</div><div class='ctx'> #define MVPP22_CLS_C2_TCAM_DATA4		0x1b20</div><div class='add'>+#define     MVPP22_CLS_C2_LU_TYPE(lu)		((lu) &amp; 0x3f)</div><div class='ctx'> #define     MVPP22_CLS_C2_PORT_ID(port)		((port) &lt;&lt; 8)</div><div class='add'>+#define     MVPP22_CLS_C2_PORT_MASK		(0xff &lt;&lt; 8)</div><div class='add'>+#define MVPP22_CLS_C2_TCAM_INV			0x1b24</div><div class='add'>+#define     MVPP22_CLS_C2_TCAM_INV_BIT		BIT(31)</div><div class='ctx'> #define MVPP22_CLS_C2_HIT_CTR			0x1b50</div><div class='ctx'> #define MVPP22_CLS_C2_ACT			0x1b60</div><div class='ctx'> #define     MVPP22_CLS_C2_ACT_RSS_EN(act)	(((act) &amp; 0x3) &lt;&lt; 19)</div><div class='ctx'> #define     MVPP22_CLS_C2_ACT_FWD(act)		(((act) &amp; 0x7) &lt;&lt; 13)</div><div class='ctx'> #define     MVPP22_CLS_C2_ACT_QHIGH(act)	(((act) &amp; 0x3) &lt;&lt; 11)</div><div class='ctx'> #define     MVPP22_CLS_C2_ACT_QLOW(act)		(((act) &amp; 0x3) &lt;&lt; 9)</div><div class='add'>+#define     MVPP22_CLS_C2_ACT_COLOR(act)	((act) &amp; 0x7)</div><div class='ctx'> #define MVPP22_CLS_C2_ATTR0			0x1b64</div><div class='ctx'> #define     MVPP22_CLS_C2_ATTR0_QHIGH(qh)	(((qh) &amp; 0x1f) &lt;&lt; 24)</div><div class='ctx'> #define     MVPP22_CLS_C2_ATTR0_QHIGH_MASK	0x1f</div><div class='hunk'>@@ -610,6 +617,12 @@</div><div class='ctx'> #define MVPP2_BIT_TO_WORD(bit)		((bit) / 32)</div><div class='ctx'> #define MVPP2_BIT_IN_WORD(bit)		((bit) % 32)</div><div class='ctx'> </div><div class='add'>+#define MVPP2_N_PRS_FLOWS		52</div><div class='add'>+#define MVPP2_N_RFS_ENTRIES_PER_FLOW	4</div><div class='add'>+</div><div class='add'>+/* There are 7 supported high-level flows */</div><div class='add'>+#define MVPP2_N_RFS_RULES		(MVPP2_N_RFS_ENTRIES_PER_FLOW * 7)</div><div class='add'>+</div><div class='ctx'> /* RSS constants */</div><div class='ctx'> #define MVPP22_RSS_TABLE_ENTRIES	32</div><div class='ctx'> </div><div class='hunk'>@@ -710,6 +723,7 @@ enum mvpp2_prs_l3_cast {</div><div class='ctx'> #define MVPP2_DESC_DMA_MASK	DMA_BIT_MASK(40)</div><div class='ctx'> </div><div class='ctx'> /* Definitions */</div><div class='add'>+struct mvpp2_dbgfs_entries;</div><div class='ctx'> </div><div class='ctx'> /* Shared Packet Processor resources */</div><div class='ctx'> struct mvpp2 {</div><div class='hunk'>@@ -771,6 +785,9 @@ struct mvpp2 {</div><div class='ctx'> </div><div class='ctx'> 	/* Debugfs root entry */</div><div class='ctx'> 	struct dentry *dbgfs_dir;</div><div class='add'>+</div><div class='add'>+	/* Debugfs entries private data */</div><div class='add'>+	struct mvpp2_dbgfs_entries *dbgfs_entries;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mvpp2_pcpu_stats {</div><div class='hunk'>@@ -802,6 +819,37 @@ struct mvpp2_queue_vector {</div><div class='ctx'> 	struct cpumask *mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Internal represention of a Flow Steering rule */</div><div class='add'>+struct mvpp2_rfs_rule {</div><div class='add'>+	/* Rule location inside the flow*/</div><div class='add'>+	int loc;</div><div class='add'>+</div><div class='add'>+	/* Flow type, such as TCP_V4_FLOW, IP6_FLOW, etc. */</div><div class='add'>+	int flow_type;</div><div class='add'>+</div><div class='add'>+	/* Index of the C2 TCAM entry handling this rule */</div><div class='add'>+	int c2_index;</div><div class='add'>+</div><div class='add'>+	/* Header fields that needs to be extracted to match this flow */</div><div class='add'>+	u16 hek_fields;</div><div class='add'>+</div><div class='add'>+	/* CLS engine : only c2 is supported for now. */</div><div class='add'>+	u8 engine;</div><div class='add'>+</div><div class='add'>+	/* TCAM key and mask for C2-based steering. These fields should be</div><div class='add'>+	 * encapsulated in a union should we add more engines.</div><div class='add'>+	 */</div><div class='add'>+	u64 c2_tcam;</div><div class='add'>+	u64 c2_tcam_mask;</div><div class='add'>+</div><div class='add'>+	struct flow_rule *flow;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mvpp2_ethtool_fs {</div><div class='add'>+	struct mvpp2_rfs_rule rule;</div><div class='add'>+	struct ethtool_rxnfc rxnfc;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mvpp2_port {</div><div class='ctx'> 	u8 id;</div><div class='ctx'> </div><div class='hunk'>@@ -873,6 +921,10 @@ struct mvpp2_port {</div><div class='ctx'> </div><div class='ctx'> 	/* RSS indirection table */</div><div class='ctx'> 	u32 indir[MVPP22_RSS_TABLE_ENTRIES];</div><div class='add'>+</div><div class='add'>+	/* List of steering rules active on that port */</div><div class='add'>+	struct mvpp2_ethtool_fs *rfs_rules[MVPP2_N_RFS_RULES];</div><div class='add'>+	int n_rfs_rules;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The mvpp2_tx_desc and mvpp2_rx_desc structures describe the</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c<br/>index efdb7a656835..d046f7a1dcf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c</a></div><div class='hunk'>@@ -22,302 +22,302 @@</div><div class='ctx'> 	}							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mvpp2_cls_flow cls_flows[MVPP2_N_FLOWS] = {</div><div class='add'>+static const struct mvpp2_cls_flow cls_flows[MVPP2_N_PRS_FLOWS] = {</div><div class='ctx'> 	/* TCP over IPv4 flows, Not fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv4 flows, Not fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv4 flows, fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv4 flows, fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv4 flows, Not fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv4 flows, Not fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv4 flows, fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv4 flows, fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv6 flows, not fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv6 flows, not fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv6 flows, fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |</div><div class='ctx'> 		       MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |</div><div class='ctx'> 		       MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* TCP over IPv6 flows, fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_IP_FRAG_TRUE |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_IP_FRAG_TRUE |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_TCP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv6 flows, not fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv6 flows, not fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv6 flows, fragmented, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |</div><div class='ctx'> 		       MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |</div><div class='ctx'> 		       MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* UDP over IPv6 flows, fragmented, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_IP_FRAG_TRUE |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='del'>-	MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_IP_FRAG_TRUE |</div><div class='ctx'> 		       MVPP2_PRS_RI_L4_UDP,</div><div class='ctx'> 		       MVPP2_PRS_IP_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* IPv4 flows, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='del'>-	MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='del'>-	MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* IPv4 flows, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='del'>-	MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OPT,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='del'>-	MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP4_OTHER,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* IPv6 flows, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='del'>-	MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_UNTAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* IPv6 flows, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='del'>-	MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_IP6,</div><div class='ctx'> 		       MVPP2_PRS_RI_L3_PROTO_MASK),</div><div class='ctx'> </div><div class='ctx'> 	/* Non IP flow, no vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(ETHER_FLOW, MVPP2_FL_NON_IP_UNTAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_ETHERNET, MVPP2_FL_NON_IP_UNTAG,</div><div class='ctx'> 		       0,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_NONE,</div><div class='ctx'> 		       MVPP2_PRS_RI_VLAN_MASK),</div><div class='ctx'> 	/* Non IP flow, with vlan tag */</div><div class='del'>-	MVPP2_DEF_FLOW(ETHER_FLOW, MVPP2_FL_NON_IP_TAG,</div><div class='add'>+	MVPP2_DEF_FLOW(MVPP22_FLOW_ETHERNET, MVPP2_FL_NON_IP_TAG,</div><div class='ctx'> 		       MVPP22_CLS_HEK_OPT_VLAN,</div><div class='ctx'> 		       0, 0),</div><div class='ctx'> };</div><div class='hunk'>@@ -344,9 +344,9 @@ static void mvpp2_cls_flow_write(struct mvpp2 *priv,</div><div class='ctx'> 				 struct mvpp2_cls_flow_entry *fe)</div><div class='ctx'> {</div><div class='ctx'> 	mvpp2_write(priv, MVPP2_CLS_FLOW_INDEX_REG, fe-&gt;index);</div><div class='del'>-	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL0_REG,  fe-&gt;data[0]);</div><div class='del'>-	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL1_REG,  fe-&gt;data[1]);</div><div class='del'>-	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL2_REG,  fe-&gt;data[2]);</div><div class='add'>+	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL0_REG, fe-&gt;data[0]);</div><div class='add'>+	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL1_REG, fe-&gt;data[1]);</div><div class='add'>+	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL2_REG, fe-&gt;data[2]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 mvpp2_cls_lookup_hits(struct mvpp2 *priv, int index)</div><div class='hunk'>@@ -429,12 +429,6 @@ static void mvpp2_cls_flow_port_id_sel(struct mvpp2_cls_flow_entry *fe,</div><div class='ctx'> 		fe-&gt;data[0] &amp;= ~MVPP2_CLS_FLOW_TBL0_PORT_ID_SEL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mvpp2_cls_flow_seq_set(struct mvpp2_cls_flow_entry *fe, u32 seq)</div><div class='del'>-{</div><div class='del'>-	fe-&gt;data[1] &amp;= ~MVPP2_CLS_FLOW_TBL1_SEQ(MVPP2_CLS_FLOW_TBL1_SEQ_MASK);</div><div class='del'>-	fe-&gt;data[1] |= MVPP2_CLS_FLOW_TBL1_SEQ(seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mvpp2_cls_flow_last_set(struct mvpp2_cls_flow_entry *fe,</div><div class='ctx'> 				    bool is_last)</div><div class='ctx'> {</div><div class='hunk'>@@ -454,9 +448,22 @@ static void mvpp2_cls_flow_port_add(struct mvpp2_cls_flow_entry *fe,</div><div class='ctx'> 	fe-&gt;data[0] |= MVPP2_CLS_FLOW_TBL0_PORT_ID(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mvpp2_cls_flow_port_remove(struct mvpp2_cls_flow_entry *fe,</div><div class='add'>+				       u32 port)</div><div class='add'>+{</div><div class='add'>+	fe-&gt;data[0] &amp;= ~MVPP2_CLS_FLOW_TBL0_PORT_ID(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mvpp2_cls_flow_lu_type_set(struct mvpp2_cls_flow_entry *fe,</div><div class='add'>+				       u8 lu_type)</div><div class='add'>+{</div><div class='add'>+	fe-&gt;data[1] &amp;= ~MVPP2_CLS_FLOW_TBL1_LU_TYPE(MVPP2_CLS_LU_TYPE_MASK);</div><div class='add'>+	fe-&gt;data[1] |= MVPP2_CLS_FLOW_TBL1_LU_TYPE(lu_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Initialize the parser entry for the given flow */</div><div class='ctx'> static void mvpp2_cls_flow_prs_init(struct mvpp2 *priv,</div><div class='del'>-				    struct mvpp2_cls_flow *flow)</div><div class='add'>+				    const struct mvpp2_cls_flow *flow)</div><div class='ctx'> {</div><div class='ctx'> 	mvpp2_prs_add_flow(priv, flow-&gt;flow_id, flow-&gt;prs_ri.ri,</div><div class='ctx'> 			   flow-&gt;prs_ri.ri_mask);</div><div class='hunk'>@@ -464,7 +471,7 @@ static void mvpp2_cls_flow_prs_init(struct mvpp2 *priv,</div><div class='ctx'> </div><div class='ctx'> /* Initialize the Lookup Id table entry for the given flow */</div><div class='ctx'> static void mvpp2_cls_flow_lkp_init(struct mvpp2 *priv,</div><div class='del'>-				    struct mvpp2_cls_flow *flow)</div><div class='add'>+				    const struct mvpp2_cls_flow *flow)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_cls_lookup_entry le;</div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +484,7 @@ static void mvpp2_cls_flow_lkp_init(struct mvpp2 *priv,</div><div class='ctx'> 	/* We point on the first lookup in the sequence for the flow, that is</div><div class='ctx'> 	 * the C2 lookup.</div><div class='ctx'> 	 */</div><div class='del'>-	le.data |= MVPP2_CLS_LKP_FLOW_PTR(MVPP2_FLOW_C2_ENTRY(flow-&gt;flow_id));</div><div class='add'>+	le.data |= MVPP2_CLS_LKP_FLOW_PTR(MVPP2_CLS_FLT_FIRST(flow-&gt;flow_id));</div><div class='ctx'> </div><div class='ctx'> 	/* CLS is always enabled, RSS is enabled/disabled in C2 lookup */</div><div class='ctx'> 	le.data |= MVPP2_CLS_LKP_TBL_LOOKUP_EN_MASK;</div><div class='hunk'>@@ -485,21 +492,111 @@ static void mvpp2_cls_flow_lkp_init(struct mvpp2 *priv,</div><div class='ctx'> 	mvpp2_cls_lookup_write(priv, &amp;le);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mvpp2_cls_c2_write(struct mvpp2 *priv,</div><div class='add'>+			       struct mvpp2_cls_c2_entry *c2)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_IDX, c2-&gt;index);</div><div class='add'>+</div><div class='add'>+	val = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_INV);</div><div class='add'>+	if (c2-&gt;valid)</div><div class='add'>+		val &amp;= ~MVPP22_CLS_C2_TCAM_INV_BIT;</div><div class='add'>+	else</div><div class='add'>+		val |= MVPP22_CLS_C2_TCAM_INV_BIT;</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_INV, val);</div><div class='add'>+</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_ACT, c2-&gt;act);</div><div class='add'>+</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_ATTR0, c2-&gt;attr[0]);</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_ATTR1, c2-&gt;attr[1]);</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_ATTR2, c2-&gt;attr[2]);</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_ATTR3, c2-&gt;attr[3]);</div><div class='add'>+</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA0, c2-&gt;tcam[0]);</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA1, c2-&gt;tcam[1]);</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA2, c2-&gt;tcam[2]);</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA3, c2-&gt;tcam[3]);</div><div class='add'>+	/* Writing TCAM_DATA4 flushes writes to TCAM_DATA0-4 and INV to HW */</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA4, c2-&gt;tcam[4]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mvpp2_cls_c2_read(struct mvpp2 *priv, int index,</div><div class='add'>+		       struct mvpp2_cls_c2_entry *c2)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_IDX, index);</div><div class='add'>+</div><div class='add'>+	c2-&gt;index = index;</div><div class='add'>+</div><div class='add'>+	c2-&gt;tcam[0] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA0);</div><div class='add'>+	c2-&gt;tcam[1] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA1);</div><div class='add'>+	c2-&gt;tcam[2] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA2);</div><div class='add'>+	c2-&gt;tcam[3] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA3);</div><div class='add'>+	c2-&gt;tcam[4] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA4);</div><div class='add'>+</div><div class='add'>+	c2-&gt;act = mvpp2_read(priv, MVPP22_CLS_C2_ACT);</div><div class='add'>+</div><div class='add'>+	c2-&gt;attr[0] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR0);</div><div class='add'>+	c2-&gt;attr[1] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR1);</div><div class='add'>+	c2-&gt;attr[2] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR2);</div><div class='add'>+	c2-&gt;attr[3] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR3);</div><div class='add'>+</div><div class='add'>+	val = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_INV);</div><div class='add'>+	c2-&gt;valid = !(val &amp; MVPP22_CLS_C2_TCAM_INV_BIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mvpp2_cls_ethtool_flow_to_type(int flow_type)</div><div class='add'>+{</div><div class='add'>+	switch (flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS)) {</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+		return MVPP22_FLOW_TCP4;</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+		return MVPP22_FLOW_TCP6;</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+		return MVPP22_FLOW_UDP4;</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		return MVPP22_FLOW_UDP6;</div><div class='add'>+	case IPV4_FLOW:</div><div class='add'>+		return MVPP22_FLOW_IP4;</div><div class='add'>+	case IPV6_FLOW:</div><div class='add'>+		return MVPP22_FLOW_IP6;</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 mvpp2_cls_c2_port_flow_index(struct mvpp2_port *port, int loc)</div><div class='add'>+{</div><div class='add'>+	return MVPP22_CLS_C2_RFS_LOC(port-&gt;id, loc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Initialize the flow table entries for the given flow */</div><div class='del'>-static void mvpp2_cls_flow_init(struct mvpp2 *priv, struct mvpp2_cls_flow *flow)</div><div class='add'>+static void mvpp2_cls_flow_init(struct mvpp2 *priv,</div><div class='add'>+				const struct mvpp2_cls_flow *flow)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_cls_flow_entry fe;</div><div class='del'>-	int i;</div><div class='add'>+	int i, pri = 0;</div><div class='add'>+</div><div class='add'>+	/* Assign default values to all entries in the flow */</div><div class='add'>+	for (i = MVPP2_CLS_FLT_FIRST(flow-&gt;flow_id);</div><div class='add'>+	     i &lt;= MVPP2_CLS_FLT_LAST(flow-&gt;flow_id); i++) {</div><div class='add'>+		memset(&amp;fe, 0, sizeof(fe));</div><div class='add'>+		fe.index = i;</div><div class='add'>+		mvpp2_cls_flow_pri_set(&amp;fe, pri++);</div><div class='add'>+</div><div class='add'>+		if (i == MVPP2_CLS_FLT_LAST(flow-&gt;flow_id))</div><div class='add'>+			mvpp2_cls_flow_last_set(&amp;fe, 1);</div><div class='add'>+</div><div class='add'>+		mvpp2_cls_flow_write(priv, &amp;fe);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* C2 lookup */</div><div class='del'>-	memset(&amp;fe, 0, sizeof(fe));</div><div class='del'>-	fe.index = MVPP2_FLOW_C2_ENTRY(flow-&gt;flow_id);</div><div class='add'>+	/* RSS config C2 lookup */</div><div class='add'>+	mvpp2_cls_flow_read(priv, MVPP2_CLS_FLT_C2_RSS_ENTRY(flow-&gt;flow_id),</div><div class='add'>+			    &amp;fe);</div><div class='ctx'> </div><div class='ctx'> 	mvpp2_cls_flow_eng_set(&amp;fe, MVPP22_CLS_ENGINE_C2);</div><div class='ctx'> 	mvpp2_cls_flow_port_id_sel(&amp;fe, true);</div><div class='del'>-	mvpp2_cls_flow_last_set(&amp;fe, 0);</div><div class='del'>-	mvpp2_cls_flow_pri_set(&amp;fe, 0);</div><div class='del'>-	mvpp2_cls_flow_seq_set(&amp;fe, MVPP2_CLS_FLOW_SEQ_FIRST1);</div><div class='add'>+	mvpp2_cls_flow_lu_type_set(&amp;fe, MVPP22_FLOW_ETHERNET);</div><div class='ctx'> </div><div class='ctx'> 	/* Add all ports */</div><div class='ctx'> 	for (i = 0; i &lt; MVPP2_MAX_PORTS; i++)</div><div class='hunk'>@@ -509,22 +606,19 @@ static void mvpp2_cls_flow_init(struct mvpp2 *priv, struct mvpp2_cls_flow *flow)</div><div class='ctx'> </div><div class='ctx'> 	/* C3Hx lookups */</div><div class='ctx'> 	for (i = 0; i &lt; MVPP2_MAX_PORTS; i++) {</div><div class='del'>-		memset(&amp;fe, 0, sizeof(fe));</div><div class='del'>-		fe.index = MVPP2_PORT_FLOW_HASH_ENTRY(i, flow-&gt;flow_id);</div><div class='add'>+		mvpp2_cls_flow_read(priv,</div><div class='add'>+				    MVPP2_CLS_FLT_HASH_ENTRY(i, flow-&gt;flow_id),</div><div class='add'>+				    &amp;fe);</div><div class='ctx'> </div><div class='add'>+		/* Set a default engine. Will be overwritten when setting the</div><div class='add'>+		 * real HEK parameters</div><div class='add'>+		 */</div><div class='add'>+		mvpp2_cls_flow_eng_set(&amp;fe, MVPP22_CLS_ENGINE_C3HA);</div><div class='ctx'> 		mvpp2_cls_flow_port_id_sel(&amp;fe, true);</div><div class='del'>-		mvpp2_cls_flow_pri_set(&amp;fe, i + 1);</div><div class='del'>-		mvpp2_cls_flow_seq_set(&amp;fe, MVPP2_CLS_FLOW_SEQ_MIDDLE);</div><div class='ctx'> 		mvpp2_cls_flow_port_add(&amp;fe, BIT(i));</div><div class='ctx'> </div><div class='ctx'> 		mvpp2_cls_flow_write(priv, &amp;fe);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Update the last entry */</div><div class='del'>-	mvpp2_cls_flow_last_set(&amp;fe, 1);</div><div class='del'>-	mvpp2_cls_flow_seq_set(&amp;fe, MVPP2_CLS_FLOW_SEQ_LAST);</div><div class='del'>-</div><div class='del'>-	mvpp2_cls_flow_write(priv, &amp;fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Adds a field to the Header Extracted Key generation parameters*/</div><div class='hunk'>@@ -555,6 +649,9 @@ static int mvpp2_flow_set_hek_fields(struct mvpp2_cls_flow_entry *fe,</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(i, &amp;hash_opts, MVPP22_CLS_HEK_N_FIELDS) {</div><div class='ctx'> 		switch (BIT(i)) {</div><div class='add'>+		case MVPP22_CLS_HEK_OPT_MAC_DA:</div><div class='add'>+			field_id = MVPP22_CLS_FIELD_MAC_DA;</div><div class='add'>+			break;</div><div class='ctx'> 		case MVPP22_CLS_HEK_OPT_VLAN:</div><div class='ctx'> 			field_id = MVPP22_CLS_FIELD_VLAN;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -586,9 +683,29 @@ static int mvpp2_flow_set_hek_fields(struct mvpp2_cls_flow_entry *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mvpp2_cls_flow *mvpp2_cls_flow_get(int flow)</div><div class='add'>+/* Returns the size, in bits, of the corresponding HEK field */</div><div class='add'>+static int mvpp2_cls_hek_field_size(u32 field)</div><div class='ctx'> {</div><div class='del'>-	if (flow &gt;= MVPP2_N_FLOWS)</div><div class='add'>+	switch (field) {</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_MAC_DA:</div><div class='add'>+		return 48;</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_IP4SA:</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_IP4DA:</div><div class='add'>+		return 32;</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_IP6SA:</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_IP6DA:</div><div class='add'>+		return 128;</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_L4SIP:</div><div class='add'>+	case MVPP22_CLS_HEK_OPT_L4DIP:</div><div class='add'>+		return 16;</div><div class='add'>+	default:</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mvpp2_cls_flow *mvpp2_cls_flow_get(int flow)</div><div class='add'>+{</div><div class='add'>+	if (flow &gt;= MVPP2_N_PRS_FLOWS)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return &amp;cls_flows[flow];</div><div class='hunk'>@@ -608,21 +725,17 @@ struct mvpp2_cls_flow *mvpp2_cls_flow_get(int flow)</div><div class='ctx'> static int mvpp2_port_rss_hash_opts_set(struct mvpp2_port *port, int flow_type,</div><div class='ctx'> 					u16 requested_opts)</div><div class='ctx'> {</div><div class='add'>+	const struct mvpp2_cls_flow *flow;</div><div class='ctx'> 	struct mvpp2_cls_flow_entry fe;</div><div class='del'>-	struct mvpp2_cls_flow *flow;</div><div class='ctx'> 	int i, engine, flow_index;</div><div class='ctx'> 	u16 hash_opts;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MVPP2_N_FLOWS; i++) {</div><div class='add'>+	for_each_cls_flow_id_with_type(i, flow_type) {</div><div class='ctx'> 		flow = mvpp2_cls_flow_get(i);</div><div class='ctx'> 		if (!flow)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (flow-&gt;flow_type != flow_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		flow_index = MVPP2_PORT_FLOW_HASH_ENTRY(port-&gt;id,</div><div class='del'>-							flow-&gt;flow_id);</div><div class='add'>+		flow_index = MVPP2_CLS_FLT_HASH_ENTRY(port-&gt;id, flow-&gt;flow_id);</div><div class='ctx'> </div><div class='ctx'> 		mvpp2_cls_flow_read(port-&gt;priv, flow_index, &amp;fe);</div><div class='ctx'> </div><div class='hunk'>@@ -697,21 +810,17 @@ u16 mvpp2_flow_get_hek_fields(struct mvpp2_cls_flow_entry *fe)</div><div class='ctx'>  */</div><div class='ctx'> static u16 mvpp2_port_rss_hash_opts_get(struct mvpp2_port *port, int flow_type)</div><div class='ctx'> {</div><div class='add'>+	const struct mvpp2_cls_flow *flow;</div><div class='ctx'> 	struct mvpp2_cls_flow_entry fe;</div><div class='del'>-	struct mvpp2_cls_flow *flow;</div><div class='ctx'> 	int i, flow_index;</div><div class='ctx'> 	u16 hash_opts = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MVPP2_N_FLOWS; i++) {</div><div class='add'>+	for_each_cls_flow_id_with_type(i, flow_type) {</div><div class='ctx'> 		flow = mvpp2_cls_flow_get(i);</div><div class='ctx'> 		if (!flow)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		if (flow-&gt;flow_type != flow_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		flow_index = MVPP2_PORT_FLOW_HASH_ENTRY(port-&gt;id,</div><div class='del'>-							flow-&gt;flow_id);</div><div class='add'>+		flow_index = MVPP2_CLS_FLT_HASH_ENTRY(port-&gt;id, flow-&gt;flow_id);</div><div class='ctx'> </div><div class='ctx'> 		mvpp2_cls_flow_read(port-&gt;priv, flow_index, &amp;fe);</div><div class='ctx'> </div><div class='hunk'>@@ -723,10 +832,10 @@ static u16 mvpp2_port_rss_hash_opts_get(struct mvpp2_port *port, int flow_type)</div><div class='ctx'> </div><div class='ctx'> static void mvpp2_cls_port_init_flows(struct mvpp2 *priv)</div><div class='ctx'> {</div><div class='del'>-	struct mvpp2_cls_flow *flow;</div><div class='add'>+	const struct mvpp2_cls_flow *flow;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MVPP2_N_FLOWS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MVPP2_N_PRS_FLOWS; i++) {</div><div class='ctx'> 		flow = mvpp2_cls_flow_get(i);</div><div class='ctx'> 		if (!flow)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -737,47 +846,6 @@ static void mvpp2_cls_port_init_flows(struct mvpp2 *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mvpp2_cls_c2_write(struct mvpp2 *priv,</div><div class='del'>-			       struct mvpp2_cls_c2_entry *c2)</div><div class='del'>-{</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_IDX, c2-&gt;index);</div><div class='del'>-</div><div class='del'>-	/* Write TCAM */</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA0, c2-&gt;tcam[0]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA1, c2-&gt;tcam[1]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA2, c2-&gt;tcam[2]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA3, c2-&gt;tcam[3]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_DATA4, c2-&gt;tcam[4]);</div><div class='del'>-</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_ACT, c2-&gt;act);</div><div class='del'>-</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_ATTR0, c2-&gt;attr[0]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_ATTR1, c2-&gt;attr[1]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_ATTR2, c2-&gt;attr[2]);</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_ATTR3, c2-&gt;attr[3]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mvpp2_cls_c2_read(struct mvpp2 *priv, int index,</div><div class='del'>-		       struct mvpp2_cls_c2_entry *c2)</div><div class='del'>-{</div><div class='del'>-	mvpp2_write(priv, MVPP22_CLS_C2_TCAM_IDX, index);</div><div class='del'>-</div><div class='del'>-	c2-&gt;index = index;</div><div class='del'>-</div><div class='del'>-	c2-&gt;tcam[0] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA0);</div><div class='del'>-	c2-&gt;tcam[1] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA1);</div><div class='del'>-	c2-&gt;tcam[2] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA2);</div><div class='del'>-	c2-&gt;tcam[3] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA3);</div><div class='del'>-	c2-&gt;tcam[4] = mvpp2_read(priv, MVPP22_CLS_C2_TCAM_DATA4);</div><div class='del'>-</div><div class='del'>-	c2-&gt;act = mvpp2_read(priv, MVPP22_CLS_C2_ACT);</div><div class='del'>-</div><div class='del'>-	c2-&gt;attr[0] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR0);</div><div class='del'>-	c2-&gt;attr[1] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR1);</div><div class='del'>-	c2-&gt;attr[2] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR2);</div><div class='del'>-	c2-&gt;attr[3] = mvpp2_read(priv, MVPP22_CLS_C2_ATTR3);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mvpp2_port_c2_cls_init(struct mvpp2_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_cls_c2_entry c2;</div><div class='hunk'>@@ -791,6 +859,10 @@ static void mvpp2_port_c2_cls_init(struct mvpp2_port *port)</div><div class='ctx'> 	c2.tcam[4] = MVPP22_CLS_C2_PORT_ID(pmap);</div><div class='ctx'> 	c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_PORT_ID(pmap));</div><div class='ctx'> </div><div class='add'>+	/* Match on Lookup Type */</div><div class='add'>+	c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_LU_TYPE(MVPP2_CLS_LU_TYPE_MASK));</div><div class='add'>+	c2.tcam[4] |= MVPP22_CLS_C2_LU_TYPE(MVPP22_FLOW_ETHERNET);</div><div class='add'>+</div><div class='ctx'> 	/* Update RSS status after matching this entry */</div><div class='ctx'> 	c2.act = MVPP22_CLS_C2_ACT_RSS_EN(MVPP22_C2_UPD_LOCK);</div><div class='ctx'> </div><div class='hunk'>@@ -809,6 +881,8 @@ static void mvpp2_port_c2_cls_init(struct mvpp2_port *port)</div><div class='ctx'> 	c2.attr[0] = MVPP22_CLS_C2_ATTR0_QHIGH(qh) |</div><div class='ctx'> 		      MVPP22_CLS_C2_ATTR0_QLOW(ql);</div><div class='ctx'> </div><div class='add'>+	c2.valid = true;</div><div class='add'>+</div><div class='ctx'> 	mvpp2_cls_c2_write(port-&gt;priv, &amp;c2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -817,6 +891,7 @@ void mvpp2_cls_init(struct mvpp2 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_cls_lookup_entry le;</div><div class='ctx'> 	struct mvpp2_cls_flow_entry fe;</div><div class='add'>+	struct mvpp2_cls_c2_entry c2;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable classifier */</div><div class='hunk'>@@ -840,6 +915,14 @@ void mvpp2_cls_init(struct mvpp2 *priv)</div><div class='ctx'> 		mvpp2_cls_lookup_write(priv, &amp;le);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Clear C2 TCAM engine table */</div><div class='add'>+	memset(&amp;c2, 0, sizeof(c2));</div><div class='add'>+	c2.valid = false;</div><div class='add'>+	for (index = 0; index &lt; MVPP22_CLS_C2_N_ENTRIES; index++) {</div><div class='add'>+		c2.index = index;</div><div class='add'>+		mvpp2_cls_c2_write(priv, &amp;c2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mvpp2_cls_port_init_flows(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -902,16 +985,28 @@ static void mvpp2_rss_port_c2_disable(struct mvpp2_port *port)</div><div class='ctx'> 	mvpp2_cls_c2_write(port-&gt;priv, &amp;c2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mvpp22_rss_enable(struct mvpp2_port *port)</div><div class='add'>+void mvpp22_port_rss_enable(struct mvpp2_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	mvpp2_rss_port_c2_enable(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mvpp22_rss_disable(struct mvpp2_port *port)</div><div class='add'>+void mvpp22_port_rss_disable(struct mvpp2_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	mvpp2_rss_port_c2_disable(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mvpp22_port_c2_lookup_disable(struct mvpp2_port *port, int entry)</div><div class='add'>+{</div><div class='add'>+	struct mvpp2_cls_c2_entry c2;</div><div class='add'>+</div><div class='add'>+	mvpp2_cls_c2_read(port-&gt;priv, entry, &amp;c2);</div><div class='add'>+</div><div class='add'>+	/* Clear the port map so that the entry doesn't match anymore */</div><div class='add'>+	c2.tcam[4] &amp;= ~(MVPP22_CLS_C2_PORT_ID(BIT(port-&gt;id)));</div><div class='add'>+</div><div class='add'>+	mvpp2_cls_c2_write(port-&gt;priv, &amp;c2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Set CPU queue number for oversize packets */</div><div class='ctx'> void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -928,6 +1023,289 @@ void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port)</div><div class='ctx'> 	mvpp2_write(port-&gt;priv, MVPP2_CLS_SWFWD_PCTRL_REG, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mvpp2_port_c2_tcam_rule_add(struct mvpp2_port *port,</div><div class='add'>+				       struct mvpp2_rfs_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	struct mvpp2_cls_c2_entry c2;</div><div class='add'>+	u8 qh, ql, pmap;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c2, 0, sizeof(c2));</div><div class='add'>+</div><div class='add'>+	index = mvpp2_cls_c2_port_flow_index(port, rule-&gt;loc);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	c2.index = index;</div><div class='add'>+</div><div class='add'>+	act = &amp;rule-&gt;flow-&gt;action.entries[0];</div><div class='add'>+</div><div class='add'>+	rule-&gt;c2_index = c2.index;</div><div class='add'>+</div><div class='add'>+	c2.tcam[0] = (rule-&gt;c2_tcam &amp; 0xffff) |</div><div class='add'>+		     ((rule-&gt;c2_tcam_mask &amp; 0xffff) &lt;&lt; 16);</div><div class='add'>+	c2.tcam[1] = ((rule-&gt;c2_tcam &gt;&gt; 16) &amp; 0xffff) |</div><div class='add'>+		     (((rule-&gt;c2_tcam_mask &gt;&gt; 16) &amp; 0xffff) &lt;&lt; 16);</div><div class='add'>+	c2.tcam[2] = ((rule-&gt;c2_tcam &gt;&gt; 32) &amp; 0xffff) |</div><div class='add'>+		     (((rule-&gt;c2_tcam_mask &gt;&gt; 32) &amp; 0xffff) &lt;&lt; 16);</div><div class='add'>+	c2.tcam[3] = ((rule-&gt;c2_tcam &gt;&gt; 48) &amp; 0xffff) |</div><div class='add'>+		     (((rule-&gt;c2_tcam_mask &gt;&gt; 48) &amp; 0xffff) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	pmap = BIT(port-&gt;id);</div><div class='add'>+	c2.tcam[4] = MVPP22_CLS_C2_PORT_ID(pmap);</div><div class='add'>+	c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_PORT_ID(pmap));</div><div class='add'>+</div><div class='add'>+	/* Match on Lookup Type */</div><div class='add'>+	c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_LU_TYPE(MVPP2_CLS_LU_TYPE_MASK));</div><div class='add'>+	c2.tcam[4] |= MVPP22_CLS_C2_LU_TYPE(rule-&gt;loc);</div><div class='add'>+</div><div class='add'>+	if (act-&gt;id == FLOW_ACTION_DROP) {</div><div class='add'>+		c2.act = MVPP22_CLS_C2_ACT_COLOR(MVPP22_C2_COL_RED_LOCK);</div><div class='add'>+	} else {</div><div class='add'>+		/* We want to keep the default color derived from the Header</div><div class='add'>+		 * Parser drop entries, for VLAN and MAC filtering. This will</div><div class='add'>+		 * assign a default color of Green or Red, and we want matches</div><div class='add'>+		 * with a non-drop action to keep that color.</div><div class='add'>+		 */</div><div class='add'>+		c2.act = MVPP22_CLS_C2_ACT_COLOR(MVPP22_C2_COL_NO_UPD_LOCK);</div><div class='add'>+</div><div class='add'>+		/* Mark packet as "forwarded to software", needed for RSS */</div><div class='add'>+		c2.act |= MVPP22_CLS_C2_ACT_FWD(MVPP22_C2_FWD_SW_LOCK);</div><div class='add'>+</div><div class='add'>+		c2.act |= MVPP22_CLS_C2_ACT_QHIGH(MVPP22_C2_UPD_LOCK) |</div><div class='add'>+			   MVPP22_CLS_C2_ACT_QLOW(MVPP22_C2_UPD_LOCK);</div><div class='add'>+</div><div class='add'>+		qh = ((act-&gt;queue.index + port-&gt;first_rxq) &gt;&gt; 3) &amp; MVPP22_CLS_C2_ATTR0_QHIGH_MASK;</div><div class='add'>+		ql = (act-&gt;queue.index + port-&gt;first_rxq) &amp; MVPP22_CLS_C2_ATTR0_QLOW_MASK;</div><div class='add'>+</div><div class='add'>+		c2.attr[0] = MVPP22_CLS_C2_ATTR0_QHIGH(qh) |</div><div class='add'>+			      MVPP22_CLS_C2_ATTR0_QLOW(ql);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	c2.valid = true;</div><div class='add'>+</div><div class='add'>+	mvpp2_cls_c2_write(port-&gt;priv, &amp;c2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mvpp2_port_c2_rfs_rule_insert(struct mvpp2_port *port,</div><div class='add'>+					 struct mvpp2_rfs_rule *rule)</div><div class='add'>+{</div><div class='add'>+	return mvpp2_port_c2_tcam_rule_add(port, rule);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mvpp2_port_cls_rfs_rule_remove(struct mvpp2_port *port,</div><div class='add'>+					  struct mvpp2_rfs_rule *rule)</div><div class='add'>+{</div><div class='add'>+	const struct mvpp2_cls_flow *flow;</div><div class='add'>+	struct mvpp2_cls_flow_entry fe;</div><div class='add'>+	int index, i;</div><div class='add'>+</div><div class='add'>+	for_each_cls_flow_id_containing_type(i, rule-&gt;flow_type) {</div><div class='add'>+		flow = mvpp2_cls_flow_get(i);</div><div class='add'>+		if (!flow)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		index = MVPP2_CLS_FLT_C2_RFS(port-&gt;id, flow-&gt;flow_id, rule-&gt;loc);</div><div class='add'>+</div><div class='add'>+		mvpp2_cls_flow_read(port-&gt;priv, index, &amp;fe);</div><div class='add'>+		mvpp2_cls_flow_port_remove(&amp;fe, BIT(port-&gt;id));</div><div class='add'>+		mvpp2_cls_flow_write(port-&gt;priv, &amp;fe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;c2_index &gt;= 0)</div><div class='add'>+		mvpp22_port_c2_lookup_disable(port, rule-&gt;c2_index);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mvpp2_port_flt_rfs_rule_insert(struct mvpp2_port *port,</div><div class='add'>+					  struct mvpp2_rfs_rule *rule)</div><div class='add'>+{</div><div class='add'>+	const struct mvpp2_cls_flow *flow;</div><div class='add'>+	struct mvpp2 *priv = port-&gt;priv;</div><div class='add'>+	struct mvpp2_cls_flow_entry fe;</div><div class='add'>+	int index, ret, i;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;engine != MVPP22_CLS_ENGINE_C2)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = mvpp2_port_c2_rfs_rule_insert(port, rule);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for_each_cls_flow_id_containing_type(i, rule-&gt;flow_type) {</div><div class='add'>+		flow = mvpp2_cls_flow_get(i);</div><div class='add'>+		if (!flow)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		index = MVPP2_CLS_FLT_C2_RFS(port-&gt;id, flow-&gt;flow_id, rule-&gt;loc);</div><div class='add'>+</div><div class='add'>+		mvpp2_cls_flow_read(priv, index, &amp;fe);</div><div class='add'>+		mvpp2_cls_flow_eng_set(&amp;fe, rule-&gt;engine);</div><div class='add'>+		mvpp2_cls_flow_port_id_sel(&amp;fe, true);</div><div class='add'>+		mvpp2_flow_set_hek_fields(&amp;fe, rule-&gt;hek_fields);</div><div class='add'>+		mvpp2_cls_flow_lu_type_set(&amp;fe, rule-&gt;loc);</div><div class='add'>+		mvpp2_cls_flow_port_add(&amp;fe, 0xf);</div><div class='add'>+</div><div class='add'>+		mvpp2_cls_flow_write(priv, &amp;fe);</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 mvpp2_cls_c2_build_match(struct mvpp2_rfs_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *flow = rule-&gt;flow;</div><div class='add'>+	int offs = 64;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(flow, 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(flow, &amp;match);</div><div class='add'>+		if (match.mask-&gt;src) {</div><div class='add'>+			rule-&gt;hek_fields |= MVPP22_CLS_HEK_OPT_L4SIP;</div><div class='add'>+			offs -= mvpp2_cls_hek_field_size(MVPP22_CLS_HEK_OPT_L4SIP);</div><div class='add'>+</div><div class='add'>+			rule-&gt;c2_tcam |= ((u64)ntohs(match.key-&gt;src)) &lt;&lt; offs;</div><div class='add'>+			rule-&gt;c2_tcam_mask |= ((u64)ntohs(match.mask-&gt;src)) &lt;&lt; offs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;dst) {</div><div class='add'>+			rule-&gt;hek_fields |= MVPP22_CLS_HEK_OPT_L4DIP;</div><div class='add'>+			offs -= mvpp2_cls_hek_field_size(MVPP22_CLS_HEK_OPT_L4DIP);</div><div class='add'>+</div><div class='add'>+			rule-&gt;c2_tcam |= ((u64)ntohs(match.key-&gt;dst)) &lt;&lt; offs;</div><div class='add'>+			rule-&gt;c2_tcam_mask |= ((u64)ntohs(match.mask-&gt;dst)) &lt;&lt; offs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hweight16(rule-&gt;hek_fields) &gt; MVPP2_FLOW_N_FIELDS)</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 mvpp2_cls_rfs_parse_rule(struct mvpp2_rfs_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *flow = rule-&gt;flow;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+</div><div class='add'>+	act = &amp;flow-&gt;action.entries[0];</div><div class='add'>+	if (act-&gt;id != FLOW_ACTION_QUEUE &amp;&amp; act-&gt;id != FLOW_ACTION_DROP)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* For now, only use the C2 engine which has a HEK size limited to 64</div><div class='add'>+	 * bits for TCAM matching.</div><div class='add'>+	 */</div><div class='add'>+	rule-&gt;engine = MVPP22_CLS_ENGINE_C2;</div><div class='add'>+</div><div class='add'>+	if (mvpp2_cls_c2_build_match(rule))</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 mvpp2_ethtool_cls_rule_get(struct mvpp2_port *port,</div><div class='add'>+			       struct ethtool_rxnfc *rxnfc)</div><div class='add'>+{</div><div class='add'>+	struct mvpp2_ethtool_fs *efs;</div><div class='add'>+</div><div class='add'>+	if (rxnfc-&gt;fs.location &gt;= MVPP2_N_RFS_RULES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	efs = port-&gt;rfs_rules[rxnfc-&gt;fs.location];</div><div class='add'>+	if (!efs)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	memcpy(rxnfc, &amp;efs-&gt;rxnfc, sizeof(efs-&gt;rxnfc));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,</div><div class='add'>+			       struct ethtool_rxnfc *info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec_input input = {};</div><div class='add'>+	struct ethtool_rx_flow_rule *ethtool_rule;</div><div class='add'>+	struct mvpp2_ethtool_fs *efs, *old_efs;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;fs.location &gt;= 4 ||</div><div class='add'>+	    info-&gt;fs.location &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	efs = kzalloc(sizeof(*efs), GFP_KERNEL);</div><div class='add'>+	if (!efs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	input.fs = &amp;info-&gt;fs;</div><div class='add'>+</div><div class='add'>+	ethtool_rule = ethtool_rx_flow_rule_create(&amp;input);</div><div class='add'>+	if (IS_ERR(ethtool_rule)) {</div><div class='add'>+		ret = PTR_ERR(ethtool_rule);</div><div class='add'>+		goto clean_rule;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	efs-&gt;rule.flow = ethtool_rule-&gt;rule;</div><div class='add'>+	efs-&gt;rule.flow_type = mvpp2_cls_ethtool_flow_to_type(info-&gt;fs.flow_type);</div><div class='add'>+</div><div class='add'>+	ret = mvpp2_cls_rfs_parse_rule(&amp;efs-&gt;rule);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto clean_eth_rule;</div><div class='add'>+</div><div class='add'>+	efs-&gt;rule.loc = info-&gt;fs.location;</div><div class='add'>+</div><div class='add'>+	/* Replace an already existing rule */</div><div class='add'>+	if (port-&gt;rfs_rules[efs-&gt;rule.loc]) {</div><div class='add'>+		old_efs = port-&gt;rfs_rules[efs-&gt;rule.loc];</div><div class='add'>+		ret = mvpp2_port_cls_rfs_rule_remove(port, &amp;old_efs-&gt;rule);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto clean_eth_rule;</div><div class='add'>+		kfree(old_efs);</div><div class='add'>+		port-&gt;n_rfs_rules--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mvpp2_port_flt_rfs_rule_insert(port, &amp;efs-&gt;rule);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto clean_eth_rule;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;efs-&gt;rxnfc, info, sizeof(*info));</div><div class='add'>+	port-&gt;rfs_rules[efs-&gt;rule.loc] = efs;</div><div class='add'>+	port-&gt;n_rfs_rules++;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+clean_eth_rule:</div><div class='add'>+	ethtool_rx_flow_rule_destroy(ethtool_rule);</div><div class='add'>+clean_rule:</div><div class='add'>+	kfree(efs);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mvpp2_ethtool_cls_rule_del(struct mvpp2_port *port,</div><div class='add'>+			       struct ethtool_rxnfc *info)</div><div class='add'>+{</div><div class='add'>+	struct mvpp2_ethtool_fs *efs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	efs = port-&gt;rfs_rules[info-&gt;fs.location];</div><div class='add'>+	if (!efs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Remove the rule from the engines. */</div><div class='add'>+	ret = mvpp2_port_cls_rfs_rule_remove(port, &amp;efs-&gt;rule);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	port-&gt;n_rfs_rules--;</div><div class='add'>+	port-&gt;rfs_rules[info-&gt;fs.location] = NULL;</div><div class='add'>+	kfree(efs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 mvpp22_rxfh_indir(struct mvpp2_port *port, u32 rxq)</div><div class='ctx'> {</div><div class='ctx'> 	int nrxqs, cpu, cpus = num_possible_cpus();</div><div class='hunk'>@@ -965,19 +1343,22 @@ void mvpp22_rss_fill_table(struct mvpp2_port *port, u32 table)</div><div class='ctx'> int mvpp2_ethtool_rxfh_set(struct mvpp2_port *port, struct ethtool_rxnfc *info)</div><div class='ctx'> {</div><div class='ctx'> 	u16 hash_opts = 0;</div><div class='add'>+	u32 flow_type;</div><div class='ctx'> </div><div class='del'>-	switch (info-&gt;flow_type) {</div><div class='del'>-	case TCP_V4_FLOW:</div><div class='del'>-	case UDP_V4_FLOW:</div><div class='del'>-	case TCP_V6_FLOW:</div><div class='del'>-	case UDP_V6_FLOW:</div><div class='add'>+	flow_type = mvpp2_cls_ethtool_flow_to_type(info-&gt;flow_type);</div><div class='add'>+</div><div class='add'>+	switch (flow_type) {</div><div class='add'>+	case MVPP22_FLOW_TCP4:</div><div class='add'>+	case MVPP22_FLOW_UDP4:</div><div class='add'>+	case MVPP22_FLOW_TCP6:</div><div class='add'>+	case MVPP22_FLOW_UDP6:</div><div class='ctx'> 		if (info-&gt;data &amp; RXH_L4_B_0_1)</div><div class='ctx'> 			hash_opts |= MVPP22_CLS_HEK_OPT_L4SIP;</div><div class='ctx'> 		if (info-&gt;data &amp; RXH_L4_B_2_3)</div><div class='ctx'> 			hash_opts |= MVPP22_CLS_HEK_OPT_L4DIP;</div><div class='ctx'> 		/* Fallthrough */</div><div class='del'>-	case IPV4_FLOW:</div><div class='del'>-	case IPV6_FLOW:</div><div class='add'>+	case MVPP22_FLOW_IP4:</div><div class='add'>+	case MVPP22_FLOW_IP6:</div><div class='ctx'> 		if (info-&gt;data &amp; RXH_L2DA)</div><div class='ctx'> 			hash_opts |= MVPP22_CLS_HEK_OPT_MAC_DA;</div><div class='ctx'> 		if (info-&gt;data &amp; RXH_VLAN)</div><div class='hunk'>@@ -994,15 +1375,18 @@ int mvpp2_ethtool_rxfh_set(struct mvpp2_port *port, struct ethtool_rxnfc *info)</div><div class='ctx'> 	default: return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mvpp2_port_rss_hash_opts_set(port, info-&gt;flow_type, hash_opts);</div><div class='add'>+	return mvpp2_port_rss_hash_opts_set(port, flow_type, hash_opts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mvpp2_ethtool_rxfh_get(struct mvpp2_port *port, struct ethtool_rxnfc *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long hash_opts;</div><div class='add'>+	u32 flow_type;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	hash_opts = mvpp2_port_rss_hash_opts_get(port, info-&gt;flow_type);</div><div class='add'>+	flow_type = mvpp2_cls_ethtool_flow_to_type(info-&gt;flow_type);</div><div class='add'>+</div><div class='add'>+	hash_opts = mvpp2_port_rss_hash_opts_get(port, flow_type);</div><div class='ctx'> 	info-&gt;data = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(i, &amp;hash_opts, MVPP22_CLS_HEK_N_FIELDS) {</div><div class='hunk'>@@ -1037,7 +1421,7 @@ int mvpp2_ethtool_rxfh_get(struct mvpp2_port *port, struct ethtool_rxnfc *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mvpp22_rss_port_init(struct mvpp2_port *port)</div><div class='add'>+void mvpp22_port_rss_init(struct mvpp2_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2 *priv = port-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1065,10 +1449,10 @@ void mvpp22_rss_port_init(struct mvpp2_port *port)</div><div class='ctx'> 	mvpp22_rss_fill_table(port, port-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure default flows */</div><div class='del'>-	mvpp2_port_rss_hash_opts_set(port, IPV4_FLOW, MVPP22_CLS_HEK_IP4_2T);</div><div class='del'>-	mvpp2_port_rss_hash_opts_set(port, IPV6_FLOW, MVPP22_CLS_HEK_IP6_2T);</div><div class='del'>-	mvpp2_port_rss_hash_opts_set(port, TCP_V4_FLOW, MVPP22_CLS_HEK_IP4_5T);</div><div class='del'>-	mvpp2_port_rss_hash_opts_set(port, TCP_V6_FLOW, MVPP22_CLS_HEK_IP6_5T);</div><div class='del'>-	mvpp2_port_rss_hash_opts_set(port, UDP_V4_FLOW, MVPP22_CLS_HEK_IP4_5T);</div><div class='del'>-	mvpp2_port_rss_hash_opts_set(port, UDP_V6_FLOW, MVPP22_CLS_HEK_IP6_5T);</div><div class='add'>+	mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_IP4, MVPP22_CLS_HEK_IP4_2T);</div><div class='add'>+	mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_IP6, MVPP22_CLS_HEK_IP6_2T);</div><div class='add'>+	mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_TCP4, MVPP22_CLS_HEK_IP4_5T);</div><div class='add'>+	mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_TCP6, MVPP22_CLS_HEK_IP6_5T);</div><div class='add'>+	mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_UDP4, MVPP22_CLS_HEK_IP4_5T);</div><div class='add'>+	mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_UDP6, MVPP22_CLS_HEK_IP6_5T);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h<br/>index 089f05f29891..56b617375a65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h</a></div><div class='hunk'>@@ -71,14 +71,6 @@ enum mvpp2_cls_field_id {</div><div class='ctx'> 	MVPP22_CLS_FIELD_L4DIP = 0x1e,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum mvpp2_cls_flow_seq {</div><div class='del'>-	MVPP2_CLS_FLOW_SEQ_NORMAL = 0,</div><div class='del'>-	MVPP2_CLS_FLOW_SEQ_FIRST1,</div><div class='del'>-	MVPP2_CLS_FLOW_SEQ_FIRST2,</div><div class='del'>-	MVPP2_CLS_FLOW_SEQ_LAST,</div><div class='del'>-	MVPP2_CLS_FLOW_SEQ_MIDDLE</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Classifier C2 engine constants */</div><div class='ctx'> #define MVPP22_CLS_C2_TCAM_EN(data)		((data) &lt;&lt; 16)</div><div class='ctx'> </div><div class='hunk'>@@ -100,39 +92,62 @@ enum mvpp22_cls_c2_fwd_action {</div><div class='ctx'> 	MVPP22_C2_FWD_HW_LOW_LAT_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mvpp22_cls_c2_color_action {</div><div class='add'>+	MVPP22_C2_COL_NO_UPD = 0,</div><div class='add'>+	MVPP22_C2_COL_NO_UPD_LOCK,</div><div class='add'>+	MVPP22_C2_COL_GREEN,</div><div class='add'>+	MVPP22_C2_COL_GREEN_LOCK,</div><div class='add'>+	MVPP22_C2_COL_YELLOW,</div><div class='add'>+	MVPP22_C2_COL_YELLOW_LOCK,</div><div class='add'>+	MVPP22_C2_COL_RED,		/* Drop */</div><div class='add'>+	MVPP22_C2_COL_RED_LOCK,		/* Drop */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MVPP2_CLS_C2_TCAM_WORDS			5</div><div class='ctx'> #define MVPP2_CLS_C2_ATTR_WORDS			5</div><div class='ctx'> </div><div class='ctx'> struct mvpp2_cls_c2_entry {</div><div class='ctx'> 	u32 index;</div><div class='add'>+	/* TCAM lookup key */</div><div class='ctx'> 	u32 tcam[MVPP2_CLS_C2_TCAM_WORDS];</div><div class='add'>+	/* Actions to perform upon TCAM match */</div><div class='ctx'> 	u32 act;</div><div class='add'>+	/* Attributes relative to the actions to perform */</div><div class='ctx'> 	u32 attr[MVPP2_CLS_C2_ATTR_WORDS];</div><div class='add'>+	/* Entry validity */</div><div class='add'>+	u8 valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MVPP22_FLOW_ETHER_BIT	BIT(0)</div><div class='add'>+#define MVPP22_FLOW_IP4_BIT	BIT(1)</div><div class='add'>+#define MVPP22_FLOW_IP6_BIT	BIT(2)</div><div class='add'>+#define MVPP22_FLOW_TCP_BIT	BIT(3)</div><div class='add'>+#define MVPP22_FLOW_UDP_BIT	BIT(4)</div><div class='add'>+</div><div class='add'>+#define MVPP22_FLOW_TCP4	(MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP4_BIT | MVPP22_FLOW_TCP_BIT)</div><div class='add'>+#define MVPP22_FLOW_TCP6	(MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP6_BIT | MVPP22_FLOW_TCP_BIT)</div><div class='add'>+#define MVPP22_FLOW_UDP4	(MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP4_BIT | MVPP22_FLOW_UDP_BIT)</div><div class='add'>+#define MVPP22_FLOW_UDP6	(MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP6_BIT | MVPP22_FLOW_UDP_BIT)</div><div class='add'>+#define MVPP22_FLOW_IP4		(MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP4_BIT)</div><div class='add'>+#define MVPP22_FLOW_IP6		(MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP6_BIT)</div><div class='add'>+#define MVPP22_FLOW_ETHERNET	(MVPP22_FLOW_ETHER_BIT)</div><div class='add'>+</div><div class='ctx'> /* Classifier C2 engine entries */</div><div class='del'>-#define MVPP22_CLS_C2_RSS_ENTRY(port)	(port)</div><div class='del'>-#define MVPP22_CLS_C2_N_ENTRIES		MVPP2_MAX_PORTS</div><div class='add'>+#define MVPP22_CLS_C2_N_ENTRIES		256</div><div class='ctx'> </div><div class='del'>-/* RSS flow entries in the flow table. We have 2 entries per port for RSS.</div><div class='del'>- *</div><div class='del'>- * The first performs a lookup using the C2 TCAM engine, to tag the</div><div class='del'>- * packet for software forwarding (needed for RSS), enable or disable RSS, and</div><div class='del'>- * assign the default rx queue.</div><div class='del'>- *</div><div class='del'>- * The second configures the hash generation, by specifying which fields of the</div><div class='del'>- * packet header are used to generate the hash, and specifies the relevant hash</div><div class='del'>- * engine to use.</div><div class='add'>+/* Number of per-port dedicated entries in the C2 TCAM */</div><div class='add'>+#define MVPP22_CLS_C2_PORT_N_FLOWS	MVPP2_N_RFS_ENTRIES_PER_FLOW</div><div class='add'>+</div><div class='add'>+/* Each port has oen range per flow type + one entry controling the global RSS</div><div class='add'>+ * setting and the default rx queue</div><div class='ctx'>  */</div><div class='del'>-#define MVPP22_RSS_FLOW_C2_OFFS		0</div><div class='del'>-#define MVPP22_RSS_FLOW_HASH_OFFS	1</div><div class='del'>-#define MVPP22_RSS_FLOW_SIZE		(MVPP22_RSS_FLOW_HASH_OFFS + 1)</div><div class='add'>+#define MVPP22_CLS_C2_PORT_RANGE	(MVPP22_CLS_C2_PORT_N_FLOWS + 1)</div><div class='add'>+#define MVPP22_CLS_C2_PORT_FIRST(p)	((p) * MVPP22_CLS_C2_PORT_RANGE)</div><div class='add'>+#define MVPP22_CLS_C2_RSS_ENTRY(p)	(MVPP22_CLS_C2_PORT_FIRST((p) + 1) - 1)</div><div class='ctx'> </div><div class='del'>-#define MVPP22_RSS_FLOW_C2(port)	((port) * MVPP22_RSS_FLOW_SIZE + \</div><div class='del'>-					 MVPP22_RSS_FLOW_C2_OFFS)</div><div class='del'>-#define MVPP22_RSS_FLOW_HASH(port)	((port) * MVPP22_RSS_FLOW_SIZE + \</div><div class='del'>-					 MVPP22_RSS_FLOW_HASH_OFFS)</div><div class='del'>-#define MVPP22_RSS_FLOW_FIRST(port)	MVPP22_RSS_FLOW_C2(port)</div><div class='add'>+#define MVPP22_CLS_C2_PORT_FLOW_FIRST(p)	(MVPP22_CLS_C2_PORT_FIRST(p))</div><div class='add'>+</div><div class='add'>+#define MVPP22_CLS_C2_RFS_LOC(p, loc)	(MVPP22_CLS_C2_PORT_FLOW_FIRST(p) + (loc))</div><div class='ctx'> </div><div class='ctx'> /* Packet flow ID */</div><div class='ctx'> enum mvpp2_prs_flow {</div><div class='hunk'>@@ -162,6 +177,11 @@ enum mvpp2_prs_flow {</div><div class='ctx'> 	MVPP2_FL_LAST,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* LU Type defined for all engines, and specified in the flow table */</div><div class='add'>+#define MVPP2_CLS_LU_TYPE_MASK			0x3f</div><div class='add'>+</div><div class='add'>+#define MVPP2_N_FLOWS		(MVPP2_FL_LAST - MVPP2_FL_START)</div><div class='add'>+</div><div class='ctx'> struct mvpp2_cls_flow {</div><div class='ctx'> 	/* The L2-L4 traffic flow type */</div><div class='ctx'> 	int flow_type;</div><div class='hunk'>@@ -176,12 +196,48 @@ struct mvpp2_cls_flow {</div><div class='ctx'> 	struct mvpp2_prs_result_info prs_ri;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MVPP2_N_FLOWS	52</div><div class='add'>+#define MVPP2_CLS_FLT_ENTRIES_PER_FLOW		(MVPP2_MAX_PORTS + 1 + 16)</div><div class='add'>+#define MVPP2_CLS_FLT_FIRST(id)			(((id) - MVPP2_FL_START) * \</div><div class='add'>+						 MVPP2_CLS_FLT_ENTRIES_PER_FLOW)</div><div class='add'>+</div><div class='add'>+#define MVPP2_CLS_FLT_C2_RFS(port, id, rfs_n)	(MVPP2_CLS_FLT_FIRST(id) + \</div><div class='add'>+						 ((port) * MVPP2_MAX_PORTS) + \</div><div class='add'>+						 (rfs_n))</div><div class='add'>+</div><div class='add'>+#define MVPP2_CLS_FLT_C2_RSS_ENTRY(id)		(MVPP2_CLS_FLT_C2_RFS(MVPP2_MAX_PORTS, id, 0))</div><div class='add'>+#define MVPP2_CLS_FLT_HASH_ENTRY(port, id)	(MVPP2_CLS_FLT_C2_RSS_ENTRY(id) + 1 + (port))</div><div class='add'>+#define MVPP2_CLS_FLT_LAST(id)			(MVPP2_CLS_FLT_FIRST(id) + \</div><div class='add'>+						 MVPP2_CLS_FLT_ENTRIES_PER_FLOW - 1)</div><div class='add'>+</div><div class='add'>+/* Iterate on each classifier flow id. Sets 'i' to be the index of the first</div><div class='add'>+ * entry in the cls_flows table for each different flow_id.</div><div class='add'>+ * This relies on entries having the same flow_id in the cls_flows table being</div><div class='add'>+ * contiguous.</div><div class='add'>+ */</div><div class='add'>+#define for_each_cls_flow_id(i)						      \</div><div class='add'>+	for ((i) = 0; (i) &lt; MVPP2_N_PRS_FLOWS; (i)++)			      \</div><div class='add'>+		if ((i) &gt; 0 &amp;&amp;						      \</div><div class='add'>+		    cls_flows[(i)].flow_id == cls_flows[(i) - 1].flow_id)       \</div><div class='add'>+			continue;					      \</div><div class='add'>+		else</div><div class='add'>+</div><div class='add'>+/* Iterate on each classifier flow that has a given flow_type. Sets 'i' to be</div><div class='add'>+ * the index of the first entry in the cls_flow table for each different flow_id</div><div class='add'>+ * that has the given flow_type. This allows to operate on all flows that</div><div class='add'>+ * matches a given ethtool flow type.</div><div class='add'>+ */</div><div class='add'>+#define for_each_cls_flow_id_with_type(i, type)				      \</div><div class='add'>+	for_each_cls_flow_id((i))					      \</div><div class='add'>+		if (cls_flows[(i)].flow_type != (type))			      \</div><div class='add'>+			continue;					      \</div><div class='add'>+		else</div><div class='add'>+</div><div class='add'>+#define for_each_cls_flow_id_containing_type(i, type)			      \</div><div class='add'>+	for_each_cls_flow_id((i))					      \</div><div class='add'>+		if ((cls_flows[(i)].flow_type &amp; (type)) != (type))	      \</div><div class='add'>+			continue;					      \</div><div class='add'>+		else</div><div class='ctx'> </div><div class='del'>-#define MVPP2_ENTRIES_PER_FLOW			(MVPP2_MAX_PORTS + 1)</div><div class='del'>-#define MVPP2_FLOW_C2_ENTRY(id)			((id) * MVPP2_ENTRIES_PER_FLOW)</div><div class='del'>-#define MVPP2_PORT_FLOW_HASH_ENTRY(port, id)	((id) * MVPP2_ENTRIES_PER_FLOW + \</div><div class='del'>-						(port) + 1)</div><div class='ctx'> struct mvpp2_cls_flow_entry {</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	u32 data[MVPP2_CLS_FLOWS_TBL_DATA_WORDS];</div><div class='hunk'>@@ -194,11 +250,10 @@ struct mvpp2_cls_lookup_entry {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void mvpp22_rss_fill_table(struct mvpp2_port *port, u32 table);</div><div class='add'>+void mvpp22_port_rss_init(struct mvpp2_port *port);</div><div class='ctx'> </div><div class='del'>-void mvpp22_rss_port_init(struct mvpp2_port *port);</div><div class='del'>-</div><div class='del'>-void mvpp22_rss_enable(struct mvpp2_port *port);</div><div class='del'>-void mvpp22_rss_disable(struct mvpp2_port *port);</div><div class='add'>+void mvpp22_port_rss_enable(struct mvpp2_port *port);</div><div class='add'>+void mvpp22_port_rss_disable(struct mvpp2_port *port);</div><div class='ctx'> </div><div class='ctx'> int mvpp2_ethtool_rxfh_get(struct mvpp2_port *port, struct ethtool_rxnfc *info);</div><div class='ctx'> int mvpp2_ethtool_rxfh_set(struct mvpp2_port *port, struct ethtool_rxnfc *info);</div><div class='hunk'>@@ -213,7 +268,7 @@ int mvpp2_cls_flow_eng_get(struct mvpp2_cls_flow_entry *fe);</div><div class='ctx'> </div><div class='ctx'> u16 mvpp2_flow_get_hek_fields(struct mvpp2_cls_flow_entry *fe);</div><div class='ctx'> </div><div class='del'>-struct mvpp2_cls_flow *mvpp2_cls_flow_get(int flow);</div><div class='add'>+const struct mvpp2_cls_flow *mvpp2_cls_flow_get(int flow);</div><div class='ctx'> </div><div class='ctx'> u32 mvpp2_cls_flow_hits(struct mvpp2 *priv, int index);</div><div class='ctx'> </div><div class='hunk'>@@ -230,4 +285,13 @@ u32 mvpp2_cls_c2_hit_count(struct mvpp2 *priv, int c2_index);</div><div class='ctx'> void mvpp2_cls_c2_read(struct mvpp2 *priv, int index,</div><div class='ctx'> 		       struct mvpp2_cls_c2_entry *c2);</div><div class='ctx'> </div><div class='add'>+int mvpp2_ethtool_cls_rule_get(struct mvpp2_port *port,</div><div class='add'>+			       struct ethtool_rxnfc *rxnfc);</div><div class='add'>+</div><div class='add'>+int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,</div><div class='add'>+			       struct ethtool_rxnfc *info);</div><div class='add'>+</div><div class='add'>+int mvpp2_ethtool_cls_rule_del(struct mvpp2_port *port,</div><div class='add'>+			       struct ethtool_rxnfc *info);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c<br/>index f9744a61e5dd..0ee39ea47b6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c</a></div><div class='hunk'>@@ -18,22 +18,48 @@ struct mvpp2_dbgfs_prs_entry {</div><div class='ctx'> 	struct mvpp2 *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mvpp2_dbgfs_c2_entry {</div><div class='add'>+	int id;</div><div class='add'>+	struct mvpp2 *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mvpp2_dbgfs_flow_entry {</div><div class='ctx'> 	int flow;</div><div class='ctx'> 	struct mvpp2 *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mvpp2_dbgfs_flow_tbl_entry {</div><div class='add'>+	int id;</div><div class='add'>+	struct mvpp2 *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mvpp2_dbgfs_port_flow_entry {</div><div class='ctx'> 	struct mvpp2_port *port;</div><div class='ctx'> 	struct mvpp2_dbgfs_flow_entry *dbg_fe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mvpp2_dbgfs_entries {</div><div class='add'>+	/* Entries for Header Parser debug info */</div><div class='add'>+	struct mvpp2_dbgfs_prs_entry prs_entries[MVPP2_PRS_TCAM_SRAM_SIZE];</div><div class='add'>+</div><div class='add'>+	/* Entries for Classifier C2 engine debug info */</div><div class='add'>+	struct mvpp2_dbgfs_c2_entry c2_entries[MVPP22_CLS_C2_N_ENTRIES];</div><div class='add'>+</div><div class='add'>+	/* Entries for Classifier Flow Table debug info */</div><div class='add'>+	struct mvpp2_dbgfs_flow_tbl_entry flt_entries[MVPP2_CLS_FLOWS_TBL_SIZE];</div><div class='add'>+</div><div class='add'>+	/* Entries for Classifier flows debug info */</div><div class='add'>+	struct mvpp2_dbgfs_flow_entry flow_entries[MVPP2_N_PRS_FLOWS];</div><div class='add'>+</div><div class='add'>+	/* Entries for per-port flows debug info */</div><div class='add'>+	struct mvpp2_dbgfs_port_flow_entry port_flow_entries[MVPP2_MAX_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int mvpp2_dbgfs_flow_flt_hits_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='del'>-	struct mvpp2_dbgfs_flow_entry *entry = s-&gt;private;</div><div class='del'>-	int id = MVPP2_FLOW_C2_ENTRY(entry-&gt;flow);</div><div class='add'>+	struct mvpp2_dbgfs_flow_tbl_entry *entry = s-&gt;private;</div><div class='ctx'> </div><div class='del'>-	u32 hits = mvpp2_cls_flow_hits(entry-&gt;priv, id);</div><div class='add'>+	u32 hits = mvpp2_cls_flow_hits(entry-&gt;priv, entry-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "%u\n", hits);</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +84,7 @@ DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_flow_dec_hits);</div><div class='ctx'> static int mvpp2_dbgfs_flow_type_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_dbgfs_flow_entry *entry = s-&gt;private;</div><div class='del'>-	struct mvpp2_cls_flow *f;</div><div class='add'>+	const struct mvpp2_cls_flow *f;</div><div class='ctx'> 	const char *flow_name;</div><div class='ctx'> </div><div class='ctx'> 	f = mvpp2_cls_flow_get(entry-&gt;flow);</div><div class='hunk'>@@ -93,30 +119,12 @@ static int mvpp2_dbgfs_flow_type_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mvpp2_dbgfs_flow_type_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, mvpp2_dbgfs_flow_type_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mvpp2_dbgfs_flow_type_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-	struct mvpp2_dbgfs_flow_entry *flow_entry = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	kfree(flow_entry);</div><div class='del'>-	return single_release(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations mvpp2_dbgfs_flow_type_fops = {</div><div class='del'>-	.open = mvpp2_dbgfs_flow_type_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.release = mvpp2_dbgfs_flow_type_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_flow_type);</div><div class='ctx'> </div><div class='ctx'> static int mvpp2_dbgfs_flow_id_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='del'>-	struct mvpp2_dbgfs_flow_entry *entry = s-&gt;private;</div><div class='del'>-	struct mvpp2_cls_flow *f;</div><div class='add'>+	const struct mvpp2_dbgfs_flow_entry *entry = s-&gt;private;</div><div class='add'>+	const struct mvpp2_cls_flow *f;</div><div class='ctx'> </div><div class='ctx'> 	f = mvpp2_cls_flow_get(entry-&gt;flow);</div><div class='ctx'> 	if (!f)</div><div class='hunk'>@@ -134,7 +142,7 @@ static int mvpp2_dbgfs_port_flow_hash_opt_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	struct mvpp2_dbgfs_port_flow_entry *entry = s-&gt;private;</div><div class='ctx'> 	struct mvpp2_port *port = entry-&gt;port;</div><div class='ctx'> 	struct mvpp2_cls_flow_entry fe;</div><div class='del'>-	struct mvpp2_cls_flow *f;</div><div class='add'>+	const struct mvpp2_cls_flow *f;</div><div class='ctx'> 	int flow_index;</div><div class='ctx'> 	u16 hash_opts;</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +150,7 @@ static int mvpp2_dbgfs_port_flow_hash_opt_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	if (!f)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	flow_index = MVPP2_PORT_FLOW_HASH_ENTRY(entry-&gt;port-&gt;id, f-&gt;flow_id);</div><div class='add'>+	flow_index = MVPP2_CLS_FLT_HASH_ENTRY(entry-&gt;port-&gt;id, f-&gt;flow_id);</div><div class='ctx'> </div><div class='ctx'> 	mvpp2_cls_flow_read(port-&gt;priv, flow_index, &amp;fe);</div><div class='ctx'> </div><div class='hunk'>@@ -153,42 +161,21 @@ static int mvpp2_dbgfs_port_flow_hash_opt_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mvpp2_dbgfs_port_flow_hash_opt_open(struct inode *inode,</div><div class='del'>-					       struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, mvpp2_dbgfs_port_flow_hash_opt_show,</div><div class='del'>-			   inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mvpp2_dbgfs_port_flow_hash_opt_release(struct inode *inode,</div><div class='del'>-						  struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-	struct mvpp2_dbgfs_port_flow_entry *flow_entry = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	kfree(flow_entry);</div><div class='del'>-	return single_release(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations mvpp2_dbgfs_port_flow_hash_opt_fops = {</div><div class='del'>-	.open = mvpp2_dbgfs_port_flow_hash_opt_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.release = mvpp2_dbgfs_port_flow_hash_opt_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_port_flow_hash_opt);</div><div class='ctx'> </div><div class='ctx'> static int mvpp2_dbgfs_port_flow_engine_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_dbgfs_port_flow_entry *entry = s-&gt;private;</div><div class='ctx'> 	struct mvpp2_port *port = entry-&gt;port;</div><div class='ctx'> 	struct mvpp2_cls_flow_entry fe;</div><div class='del'>-	struct mvpp2_cls_flow *f;</div><div class='add'>+	const struct mvpp2_cls_flow *f;</div><div class='ctx'> 	int flow_index, engine;</div><div class='ctx'> </div><div class='ctx'> 	f = mvpp2_cls_flow_get(entry-&gt;dbg_fe-&gt;flow);</div><div class='ctx'> 	if (!f)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	flow_index = MVPP2_PORT_FLOW_HASH_ENTRY(entry-&gt;port-&gt;id, f-&gt;flow_id);</div><div class='add'>+	flow_index = MVPP2_CLS_FLT_HASH_ENTRY(entry-&gt;port-&gt;id, f-&gt;flow_id);</div><div class='ctx'> </div><div class='ctx'> 	mvpp2_cls_flow_read(port-&gt;priv, flow_index, &amp;fe);</div><div class='ctx'> </div><div class='hunk'>@@ -203,11 +190,10 @@ DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_port_flow_engine);</div><div class='ctx'> </div><div class='ctx'> static int mvpp2_dbgfs_flow_c2_hits_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='del'>-	struct mvpp2_port *port = s-&gt;private;</div><div class='add'>+	struct mvpp2_dbgfs_c2_entry *entry = s-&gt;private;</div><div class='ctx'> 	u32 hits;</div><div class='ctx'> </div><div class='del'>-	hits = mvpp2_cls_c2_hit_count(port-&gt;priv,</div><div class='del'>-				      MVPP22_CLS_C2_RSS_ENTRY(port-&gt;id));</div><div class='add'>+	hits = mvpp2_cls_c2_hit_count(entry-&gt;priv, entry-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "%u\n", hits);</div><div class='ctx'> </div><div class='hunk'>@@ -218,11 +204,11 @@ DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_flow_c2_hits);</div><div class='ctx'> </div><div class='ctx'> static int mvpp2_dbgfs_flow_c2_rxq_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='del'>-	struct mvpp2_port *port = s-&gt;private;</div><div class='add'>+	struct mvpp2_dbgfs_c2_entry *entry = s-&gt;private;</div><div class='ctx'> 	struct mvpp2_cls_c2_entry c2;</div><div class='ctx'> 	u8 qh, ql;</div><div class='ctx'> </div><div class='del'>-	mvpp2_cls_c2_read(port-&gt;priv, MVPP22_CLS_C2_RSS_ENTRY(port-&gt;id), &amp;c2);</div><div class='add'>+	mvpp2_cls_c2_read(entry-&gt;priv, entry-&gt;id, &amp;c2);</div><div class='ctx'> </div><div class='ctx'> 	qh = (c2.attr[0] &gt;&gt; MVPP22_CLS_C2_ATTR0_QHIGH_OFFS) &amp;</div><div class='ctx'> 	     MVPP22_CLS_C2_ATTR0_QHIGH_MASK;</div><div class='hunk'>@@ -239,11 +225,11 @@ DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_flow_c2_rxq);</div><div class='ctx'> </div><div class='ctx'> static int mvpp2_dbgfs_flow_c2_enable_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='del'>-	struct mvpp2_port *port = s-&gt;private;</div><div class='add'>+	struct mvpp2_dbgfs_c2_entry *entry = s-&gt;private;</div><div class='ctx'> 	struct mvpp2_cls_c2_entry c2;</div><div class='ctx'> 	int enabled;</div><div class='ctx'> </div><div class='del'>-	mvpp2_cls_c2_read(port-&gt;priv, MVPP22_CLS_C2_RSS_ENTRY(port-&gt;id), &amp;c2);</div><div class='add'>+	mvpp2_cls_c2_read(entry-&gt;priv, entry-&gt;id, &amp;c2);</div><div class='ctx'> </div><div class='ctx'> 	enabled = !!(c2.attr[2] &amp; MVPP22_CLS_C2_ATTR2_RSS_EN);</div><div class='ctx'> </div><div class='hunk'>@@ -456,25 +442,7 @@ static int mvpp2_dbgfs_prs_valid_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mvpp2_dbgfs_prs_valid_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, mvpp2_dbgfs_prs_valid_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mvpp2_dbgfs_prs_valid_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-	struct mvpp2_dbgfs_prs_entry *entry = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	kfree(entry);</div><div class='del'>-	return single_release(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations mvpp2_dbgfs_prs_valid_fops = {</div><div class='del'>-	.open = mvpp2_dbgfs_prs_valid_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.release = mvpp2_dbgfs_prs_valid_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mvpp2_dbgfs_prs_valid);</div><div class='ctx'> </div><div class='ctx'> static int mvpp2_dbgfs_flow_port_init(struct dentry *parent,</div><div class='ctx'> 				      struct mvpp2_port *port,</div><div class='hunk'>@@ -487,10 +455,7 @@ static int mvpp2_dbgfs_flow_port_init(struct dentry *parent,</div><div class='ctx'> 	if (IS_ERR(port_dir))</div><div class='ctx'> 		return PTR_ERR(port_dir);</div><div class='ctx'> </div><div class='del'>-	/* This will be freed by 'hash_opts' release op */</div><div class='del'>-	port_entry = kmalloc(sizeof(*port_entry), GFP_KERNEL);</div><div class='del'>-	if (!port_entry)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	port_entry = &amp;port-&gt;priv-&gt;dbgfs_entries-&gt;port_flow_entries[port-&gt;id];</div><div class='ctx'> </div><div class='ctx'> 	port_entry-&gt;port = port;</div><div class='ctx'> 	port_entry-&gt;dbg_fe = entry;</div><div class='hunk'>@@ -518,17 +483,11 @@ static int mvpp2_dbgfs_flow_entry_init(struct dentry *parent,</div><div class='ctx'> 	if (!flow_entry_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* This will be freed by 'type' release op */</div><div class='del'>-	entry = kmalloc(sizeof(*entry), GFP_KERNEL);</div><div class='del'>-	if (!entry)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	entry = &amp;priv-&gt;dbgfs_entries-&gt;flow_entries[flow];</div><div class='ctx'> </div><div class='ctx'> 	entry-&gt;flow = flow;</div><div class='ctx'> 	entry-&gt;priv = priv;</div><div class='ctx'> </div><div class='del'>-	debugfs_create_file("flow_hits", 0444, flow_entry_dir, entry,</div><div class='del'>-			    &amp;mvpp2_dbgfs_flow_flt_hits_fops);</div><div class='del'>-</div><div class='ctx'> 	debugfs_create_file("dec_hits", 0444, flow_entry_dir, entry,</div><div class='ctx'> 			    &amp;mvpp2_dbgfs_flow_dec_hits_fops);</div><div class='ctx'> </div><div class='hunk'>@@ -545,6 +504,7 @@ static int mvpp2_dbgfs_flow_entry_init(struct dentry *parent,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</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'>@@ -557,7 +517,7 @@ static int mvpp2_dbgfs_flow_init(struct dentry *parent, struct mvpp2 *priv)</div><div class='ctx'> 	if (!flow_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MVPP2_N_FLOWS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MVPP2_N_PRS_FLOWS; i++) {</div><div class='ctx'> 		ret = mvpp2_dbgfs_flow_entry_init(flow_dir, priv, i);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -582,10 +542,7 @@ static int mvpp2_dbgfs_prs_entry_init(struct dentry *parent,</div><div class='ctx'> 	if (!prs_entry_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* The 'valid' entry's ops will free that */</div><div class='del'>-	entry = kmalloc(sizeof(*entry), GFP_KERNEL);</div><div class='del'>-	if (!entry)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	entry = &amp;priv-&gt;dbgfs_entries-&gt;prs_entries[tid];</div><div class='ctx'> </div><div class='ctx'> 	entry-&gt;tid = tid;</div><div class='ctx'> 	entry-&gt;priv = priv;</div><div class='hunk'>@@ -630,6 +587,98 @@ static int mvpp2_dbgfs_prs_init(struct dentry *parent, struct mvpp2 *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mvpp2_dbgfs_c2_entry_init(struct dentry *parent,</div><div class='add'>+				     struct mvpp2 *priv, int id)</div><div class='add'>+{</div><div class='add'>+	struct mvpp2_dbgfs_c2_entry *entry;</div><div class='add'>+	struct dentry *c2_entry_dir;</div><div class='add'>+	char c2_entry_name[10];</div><div class='add'>+</div><div class='add'>+	if (id &gt;= MVPP22_CLS_C2_N_ENTRIES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sprintf(c2_entry_name, "%03d", id);</div><div class='add'>+</div><div class='add'>+	c2_entry_dir = debugfs_create_dir(c2_entry_name, parent);</div><div class='add'>+	if (!c2_entry_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry = &amp;priv-&gt;dbgfs_entries-&gt;c2_entries[id];</div><div class='add'>+</div><div class='add'>+	entry-&gt;id = id;</div><div class='add'>+	entry-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("hits", 0444, c2_entry_dir, entry,</div><div class='add'>+			    &amp;mvpp2_dbgfs_flow_c2_hits_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("default_rxq", 0444, c2_entry_dir, entry,</div><div class='add'>+			    &amp;mvpp2_dbgfs_flow_c2_rxq_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("rss_enable", 0444, c2_entry_dir, entry,</div><div class='add'>+			    &amp;mvpp2_dbgfs_flow_c2_enable_fops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mvpp2_dbgfs_flow_tbl_entry_init(struct dentry *parent,</div><div class='add'>+					   struct mvpp2 *priv, int id)</div><div class='add'>+{</div><div class='add'>+	struct mvpp2_dbgfs_flow_tbl_entry *entry;</div><div class='add'>+	struct dentry *flow_tbl_entry_dir;</div><div class='add'>+	char flow_tbl_entry_name[10];</div><div class='add'>+</div><div class='add'>+	if (id &gt;= MVPP2_CLS_FLOWS_TBL_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sprintf(flow_tbl_entry_name, "%03d", id);</div><div class='add'>+</div><div class='add'>+	flow_tbl_entry_dir = debugfs_create_dir(flow_tbl_entry_name, parent);</div><div class='add'>+	if (!flow_tbl_entry_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry = &amp;priv-&gt;dbgfs_entries-&gt;flt_entries[id];</div><div class='add'>+</div><div class='add'>+	entry-&gt;id = id;</div><div class='add'>+	entry-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("hits", 0444, flow_tbl_entry_dir, entry,</div><div class='add'>+			    &amp;mvpp2_dbgfs_flow_flt_hits_fops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mvpp2_dbgfs_cls_init(struct dentry *parent, struct mvpp2 *priv)</div><div class='add'>+{</div><div class='add'>+	struct dentry *cls_dir, *c2_dir, *flow_tbl_dir;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	cls_dir = debugfs_create_dir("classifier", parent);</div><div class='add'>+	if (!cls_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	c2_dir = debugfs_create_dir("c2", cls_dir);</div><div class='add'>+	if (!c2_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MVPP22_CLS_C2_N_ENTRIES; i++) {</div><div class='add'>+		ret = mvpp2_dbgfs_c2_entry_init(c2_dir, 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'>+	flow_tbl_dir = debugfs_create_dir("flow_table", cls_dir);</div><div class='add'>+	if (!flow_tbl_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MVPP2_CLS_FLOWS_TBL_SIZE; i++) {</div><div class='add'>+		ret = mvpp2_dbgfs_flow_tbl_entry_init(flow_tbl_dir, 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 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mvpp2_dbgfs_port_init(struct dentry *parent,</div><div class='ctx'> 				 struct mvpp2_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -648,21 +697,14 @@ static int mvpp2_dbgfs_port_init(struct dentry *parent,</div><div class='ctx'> 	debugfs_create_file("vid_filter", 0444, port_dir, port,</div><div class='ctx'> 			    &amp;mvpp2_dbgfs_port_vid_fops);</div><div class='ctx'> </div><div class='del'>-	debugfs_create_file("c2_hits", 0444, port_dir, port,</div><div class='del'>-			    &amp;mvpp2_dbgfs_flow_c2_hits_fops);</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("default_rxq", 0444, port_dir, port,</div><div class='del'>-			    &amp;mvpp2_dbgfs_flow_c2_rxq_fops);</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("rss_enable", 0444, port_dir, port,</div><div class='del'>-			    &amp;mvpp2_dbgfs_flow_c2_enable_fops);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mvpp2_dbgfs_cleanup(struct mvpp2 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	debugfs_remove_recursive(priv-&gt;dbgfs_dir);</div><div class='add'>+</div><div class='add'>+	kfree(priv-&gt;dbgfs_entries);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)</div><div class='hunk'>@@ -682,11 +724,18 @@ void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dbgfs_dir = mvpp2_dir;</div><div class='add'>+	priv-&gt;dbgfs_entries = kzalloc(sizeof(*priv-&gt;dbgfs_entries), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;dbgfs_entries)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	ret = mvpp2_dbgfs_prs_init(mvpp2_dir, priv);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	ret = mvpp2_dbgfs_cls_init(mvpp2_dir, priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;port_count; i++) {</div><div class='ctx'> 		ret = mvpp2_dbgfs_port_init(mvpp2_dir, priv-&gt;port_list[i]);</div><div class='ctx'> 		if (ret)</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c<br/>index 25fbed2b8d94..56d43d9b43ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c</a></div><div class='hunk'>@@ -3741,9 +3741,9 @@ static int mvpp2_set_features(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_RXHASH) {</div><div class='ctx'> 		if (features &amp; NETIF_F_RXHASH)</div><div class='del'>-			mvpp22_rss_enable(port);</div><div class='add'>+			mvpp22_port_rss_enable(port);</div><div class='ctx'> 		else</div><div class='del'>-			mvpp22_rss_disable(port);</div><div class='add'>+			mvpp22_port_rss_disable(port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3937,7 +3937,7 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,</div><div class='ctx'> 				   struct ethtool_rxnfc *info, u32 *rules)</div><div class='ctx'> {</div><div class='ctx'> 	struct mvpp2_port *port = netdev_priv(dev);</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret = 0, i, loc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!mvpp22_rss_is_supported())</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -3949,6 +3949,18 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,</div><div class='ctx'> 	case ETHTOOL_GRXRINGS:</div><div class='ctx'> 		info-&gt;data = port-&gt;nrxqs;</div><div class='ctx'> 		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		info-&gt;rule_cnt = port-&gt;n_rfs_rules;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		ret = mvpp2_ethtool_cls_rule_get(port, info);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		for (i = 0; i &lt; MVPP2_N_RFS_RULES; i++) {</div><div class='add'>+			if (port-&gt;rfs_rules[i])</div><div class='add'>+				rules[loc++] = i;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3969,6 +3981,12 @@ static int mvpp2_ethtool_set_rxnfc(struct net_device *dev,</div><div class='ctx'> 	case ETHTOOL_SRXFH:</div><div class='ctx'> 		ret = mvpp2_ethtool_rxfh_set(port, info);</div><div class='ctx'> 		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		ret = mvpp2_ethtool_cls_rule_ins(port, info);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		ret = mvpp2_ethtool_cls_rule_del(port, info);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4301,7 +4319,7 @@ static int mvpp2_port_init(struct mvpp2_port *port)</div><div class='ctx'> 	mvpp2_cls_port_config(port);</div><div class='ctx'> </div><div class='ctx'> 	if (mvpp22_rss_is_supported())</div><div class='del'>-		mvpp22_rss_port_init(port);</div><div class='add'>+		mvpp22_port_rss_init(port);</div><div class='ctx'> </div><div class='ctx'> 	/* Provide an initial Rx packet size */</div><div class='ctx'> 	port-&gt;pkt_size = MVPP2_RX_PKT_SIZE(port-&gt;dev-&gt;mtu);</div><div class='hunk'>@@ -4848,6 +4866,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,</div><div class='ctx'> 	struct mvpp2_port *port;</div><div class='ctx'> 	struct mvpp2_port_pcpu *port_pcpu;</div><div class='ctx'> 	struct device_node *port_node = to_of_node(port_fwnode);</div><div class='add'>+	netdev_features_t features;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct phylink *phylink;</div><div class='hunk'>@@ -4856,7 +4875,6 @@ static int mvpp2_port_probe(struct platform_device *pdev,</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> 	bool has_tx_irqs;</div><div class='ctx'> 	u32 id;</div><div class='del'>-	int features;</div><div class='ctx'> 	int phy_mode;</div><div class='ctx'> 	int err, i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c<br/>index 35f2142aac5e..ce037e8530fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/pxa168_eth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/pxa168_eth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/pxa168_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/pxa168_eth.c</a></div><div class='hunk'>@@ -1461,7 +1461,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdev-&gt;dev.of_node)</div><div class='ctx'> 		mac_addr = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac_addr &amp;&amp; is_valid_ether_addr(mac_addr)) {</div><div class='add'>+	if (!IS_ERR_OR_NULL(mac_addr)) {</div><div class='ctx'> 		ether_addr_copy(dev-&gt;dev_addr, mac_addr);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* try reading the mac address, if set by the bootloader */</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c<br/>index 8b3495ee2b6e..9d070cca3e9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/sky2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/marvell/sky2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/marvell/sky2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/marvell/sky2.c</a></div><div class='hunk'>@@ -1139,9 +1139,6 @@ static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, u16 idx)</div><div class='ctx'> 	/* Make sure write' to descriptors are complete before we tell hardware */</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx);</div><div class='del'>-</div><div class='del'>-	/* Synchronize I/O on since next processor may write to tail */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1354,7 +1351,6 @@ stopped:</div><div class='ctx'> </div><div class='ctx'> 	/* reset the Rx prefetch unit */</div><div class='ctx'> 	sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Clean out receive buffer area, assumes receiver hardware stopped */</div><div class='hunk'>@@ -4808,7 +4804,7 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,</div><div class='ctx'> 	 * 2) from internal registers set by bootloader</div><div class='ctx'> 	 */</div><div class='ctx'> 	iap = of_get_mac_address(hw-&gt;pdev-&gt;dev.of_node);</div><div class='del'>-	if (iap)</div><div class='add'>+	if (!IS_ERR(iap))</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, iap, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		memcpy_fromio(dev-&gt;dev_addr, hw-&gt;regs + B2_MAC_1 + port * 8,</div><div class='head'>diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c<br/>index 549d36497b8c..f9fbb3ffa3a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mediatek/mtk_eth_soc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mediatek/mtk_eth_soc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mediatek/mtk_eth_soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mediatek/mtk_eth_soc.c</a></div><div class='hunk'>@@ -767,7 +767,8 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='del'>-	if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)) || !skb-&gt;xmit_more)</div><div class='add'>+	if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)) ||</div><div class='add'>+	    !netdev_xmit_more())</div><div class='ctx'> 		mtk_w32(eth, txd-&gt;txd2, MTK_QTX_CTX_PTR);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2027,7 +2028,7 @@ static int __init mtk_init(struct net_device *dev)</div><div class='ctx'> 	const char *mac_addr;</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(mac-&gt;of_node);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(dev-&gt;dev_addr, mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* If the mac address is invalid, use random mac address  */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig<br/>index ff8057ed97ee..8491db57b0b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx4/Kconfig</a></div><div class='hunk'>@@ -26,6 +26,7 @@ config MLX4_EN_DCB</div><div class='ctx'> config MLX4_CORE</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on PCI</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='ctx'> config MLX4_DEBUG</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c<br/>index c81d15bf259c..87e90b5d4d7d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/catas.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/catas.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/catas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx4/catas.c</a></div><div class='hunk'>@@ -129,10 +129,6 @@ static int mlx4_reset_slave(struct mlx4_dev *dev)</div><div class='ctx'> 	comm_flags = rst_req &lt;&lt; COM_CHAN_RST_REQ_OFFSET;</div><div class='ctx'> 	__raw_writel((__force u32)cpu_to_be32(comm_flags),</div><div class='ctx'> 		     (__iomem char *)priv-&gt;mfunc.comm + MLX4_COMM_CHAN_FLAGS);</div><div class='del'>-	/* Make sure that our comm channel write doesn't</div><div class='del'>-	 * get mixed in with writes from another CPU.</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	end = msecs_to_jiffies(MLX4_COMM_TIME) + jiffies;</div><div class='ctx'> 	while (time_before(jiffies, end)) {</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c<br/>index a5d5d6fc1da0..c678344d22a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a></div><div class='hunk'>@@ -281,7 +281,6 @@ static int mlx4_comm_cmd_post(struct mlx4_dev *dev, u8 cmd, u16 param)</div><div class='ctx'> 	val = param | (cmd &lt;&lt; 16) | (priv-&gt;cmd.comm_toggle &lt;&lt; 31);</div><div class='ctx'> 	__raw_writel((__force u32) cpu_to_be32(val),</div><div class='ctx'> 		     &amp;priv-&gt;mfunc.comm-&gt;slave_write);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;persist-&gt;device_state_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -496,12 +495,6 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,</div><div class='ctx'> 					       (op_modifier &lt;&lt; HCR_OPMOD_SHIFT) |</div><div class='ctx'> 					       op), hcr + 6);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure that our HCR writes don't get mixed in with</div><div class='del'>-	 * writes from another CPU starting a FW command.</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	cmd-&gt;toggle = cmd-&gt;toggle ^ 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -2206,7 +2199,6 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,</div><div class='ctx'> 	}</div><div class='ctx'> 	__raw_writel((__force u32) cpu_to_be32(reply),</div><div class='ctx'> 		     &amp;priv-&gt;mfunc.comm[slave].slave_read);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -2410,7 +2402,6 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)</div><div class='ctx'> 				     &amp;priv-&gt;mfunc.comm[i].slave_write);</div><div class='ctx'> 			__raw_writel((__force u32) 0,</div><div class='ctx'> 				     &amp;priv-&gt;mfunc.comm[i].slave_read);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			for (port = 1; port &lt;= MLX4_MAX_PORTS; port++) {</div><div class='ctx'> 				struct mlx4_vport_state *admin_vport;</div><div class='ctx'> 				struct mlx4_vport_state *oper_vport;</div><div class='hunk'>@@ -2576,10 +2567,6 @@ void mlx4_report_internal_err_comm_event(struct mlx4_dev *dev)</div><div class='ctx'> 		slave_read |= (u32)COMM_CHAN_EVENT_INTERNAL_ERR;</div><div class='ctx'> 		__raw_writel((__force u32)cpu_to_be32(slave_read),</div><div class='ctx'> 			     &amp;priv-&gt;mfunc.comm[slave].slave_read);</div><div class='del'>-		/* Make sure that our comm channel write doesn't</div><div class='del'>-		 * get mixed in with writes from another CPU.</div><div class='del'>-		 */</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c<br/>index 2cbd2bd7c67c..36a92b19e613 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a></div><div class='hunk'>@@ -685,16 +685,15 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			 struct net_device *sb_dev,</div><div class='del'>-			 select_queue_fallback_t fallback)</div><div class='add'>+			 struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u16 rings_p_up = priv-&gt;num_tx_rings_p_up;</div><div class='ctx'> </div><div class='ctx'> 	if (netdev_get_num_tc(dev))</div><div class='del'>-		return fallback(dev, skb, NULL);</div><div class='add'>+		return netdev_pick_tx(dev, skb, NULL);</div><div class='ctx'> </div><div class='del'>-	return fallback(dev, skb, NULL) % rings_p_up;</div><div class='add'>+	return netdev_pick_tx(dev, skb, NULL) % rings_p_up;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx4_bf_copy(void __iomem *dst, const void *src,</div><div class='hunk'>@@ -1043,7 +1042,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	send_doorbell = __netdev_tx_sent_queue(ring-&gt;tx_queue,</div><div class='ctx'> 					       tx_info-&gt;nr_bytes,</div><div class='del'>-					       skb-&gt;xmit_more);</div><div class='add'>+					       netdev_xmit_more());</div><div class='ctx'> </div><div class='ctx'> 	real_size = (real_size / 16) &amp; 0x3f;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h<br/>index 8137454e2534..630f15977f09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.h</a></div><div class='hunk'>@@ -698,8 +698,7 @@ void mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);</div><div class='ctx'> </div><div class='ctx'> void mlx4_en_tx_irq(struct mlx4_cq *mcq);</div><div class='ctx'> u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			 struct net_device *sb_dev,</div><div class='del'>-			 select_queue_fallback_t fallback);</div><div class='add'>+			 struct net_device *sb_dev);</div><div class='ctx'> netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_ring *rx_ring,</div><div class='ctx'> 			       struct mlx4_en_rx_alloc *frame,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig<br/>index 6debffb8336b..9aca8086ee01 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> config MLX5_CORE</div><div class='ctx'> 	tristate "Mellanox 5th generation network adapters (ConnectX series) core driver"</div><div class='ctx'> 	depends on PCI</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	imply PTP_1588_CLOCK</div><div class='ctx'> 	imply VXLAN</div><div class='ctx'> 	default n</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile<br/>index 1a16f6d73cbc..243368dc23db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/Makefile</a></div><div class='hunk'>@@ -22,7 +22,8 @@ mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \</div><div class='ctx'> #</div><div class='ctx'> mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \</div><div class='ctx'> 		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \</div><div class='del'>-		en_selftest.o en/port.o en/monitor_stats.o en/reporter_tx.o</div><div class='add'>+		en_selftest.o en/port.o en/monitor_stats.o en/reporter_tx.o \</div><div class='add'>+		en/params.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Netdev extra</div><div class='hunk'>@@ -35,7 +36,7 @@ mlx5_core-$(CONFIG_MLX5_ESWITCH)     += en_rep.o en_tc.o en/tc_tun.o lib/port_tu</div><div class='ctx'> #</div><div class='ctx'> # Core extra</div><div class='ctx'> #</div><div class='del'>-mlx5_core-$(CONFIG_MLX5_ESWITCH)   += eswitch.o eswitch_offloads.o ecpf.o</div><div class='add'>+mlx5_core-$(CONFIG_MLX5_ESWITCH)   += eswitch.o eswitch_offloads.o ecpf.o rdma.o</div><div class='ctx'> mlx5_core-$(CONFIG_MLX5_MPFS)      += lib/mpfs.o</div><div class='ctx'> mlx5_core-$(CONFIG_VXLAN)          += lib/vxlan.o</div><div class='ctx'> mlx5_core-$(CONFIG_PTP_1588_CLOCK) += lib/clock.o</div><div class='hunk'>@@ -57,5 +58,3 @@ mlx5_core-$(CONFIG_MLX5_EN_IPSEC) += en_accel/ipsec.o en_accel/ipsec_rxtx.o \</div><div class='ctx'> 				     en_accel/ipsec_stats.o</div><div class='ctx'> </div><div class='ctx'> mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/tls.o en_accel/tls_rxtx.o en_accel/tls_stats.o</div><div class='del'>-</div><div class='del'>-CFLAGS_tracepoint.o := -I$(src)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/alloc.c b/drivers/net/ethernet/mellanox/mlx5/core/alloc.c<br/>index 9008e17126db..549f962cd86e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/alloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/alloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/alloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/alloc.c</a></div><div class='hunk'>@@ -57,15 +57,16 @@ static void *mlx5_dma_zalloc_coherent_node(struct mlx5_core_dev *dev,</div><div class='ctx'> 					   int node)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='add'>+	struct device *device = dev-&gt;device;</div><div class='ctx'> 	int original_node;</div><div class='ctx'> 	void *cpu_handle;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;alloc_mutex);</div><div class='del'>-	original_node = dev_to_node(&amp;dev-&gt;pdev-&gt;dev);</div><div class='del'>-	set_dev_node(&amp;dev-&gt;pdev-&gt;dev, node);</div><div class='del'>-	cpu_handle = dma_alloc_coherent(&amp;dev-&gt;pdev-&gt;dev, size, dma_handle,</div><div class='add'>+	original_node = dev_to_node(device);</div><div class='add'>+	set_dev_node(device, node);</div><div class='add'>+	cpu_handle = dma_alloc_coherent(device, size, dma_handle,</div><div class='ctx'> 					GFP_KERNEL);</div><div class='del'>-	set_dev_node(&amp;dev-&gt;pdev-&gt;dev, original_node);</div><div class='add'>+	set_dev_node(device, original_node);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;alloc_mutex);</div><div class='ctx'> 	return cpu_handle;</div><div class='ctx'> }</div><div class='hunk'>@@ -110,7 +111,7 @@ EXPORT_SYMBOL(mlx5_buf_alloc);</div><div class='ctx'> </div><div class='ctx'> void mlx5_buf_free(struct mlx5_core_dev *dev, struct mlx5_frag_buf *buf)</div><div class='ctx'> {</div><div class='del'>-	dma_free_coherent(&amp;dev-&gt;pdev-&gt;dev, buf-&gt;size, buf-&gt;frags-&gt;buf,</div><div class='add'>+	dma_free_coherent(dev-&gt;device, buf-&gt;size, buf-&gt;frags-&gt;buf,</div><div class='ctx'> 			  buf-&gt;frags-&gt;map);</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf-&gt;frags);</div><div class='hunk'>@@ -139,7 +140,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,</div><div class='ctx'> 		if (!frag-&gt;buf)</div><div class='ctx'> 			goto err_free_buf;</div><div class='ctx'> 		if (frag-&gt;map &amp; ((1 &lt;&lt; buf-&gt;page_shift) - 1)) {</div><div class='del'>-			dma_free_coherent(&amp;dev-&gt;pdev-&gt;dev, frag_sz,</div><div class='add'>+			dma_free_coherent(dev-&gt;device, frag_sz,</div><div class='ctx'> 					  buf-&gt;frags[i].buf, buf-&gt;frags[i].map);</div><div class='ctx'> 			mlx5_core_warn(dev, "unexpected map alignment: %pad, page_shift=%d\n",</div><div class='ctx'> 				       &amp;frag-&gt;map, buf-&gt;page_shift);</div><div class='hunk'>@@ -152,7 +153,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,</div><div class='ctx'> </div><div class='ctx'> err_free_buf:</div><div class='ctx'> 	while (i--)</div><div class='del'>-		dma_free_coherent(&amp;dev-&gt;pdev-&gt;dev, PAGE_SIZE, buf-&gt;frags[i].buf,</div><div class='add'>+		dma_free_coherent(dev-&gt;device, PAGE_SIZE, buf-&gt;frags[i].buf,</div><div class='ctx'> 				  buf-&gt;frags[i].map);</div><div class='ctx'> 	kfree(buf-&gt;frags);</div><div class='ctx'> err_out:</div><div class='hunk'>@@ -168,7 +169,7 @@ void mlx5_frag_buf_free(struct mlx5_core_dev *dev, struct mlx5_frag_buf *buf)</div><div class='ctx'> 	for (i = 0; i &lt; buf-&gt;npages; i++) {</div><div class='ctx'> 		int frag_sz = min_t(int, size, PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-		dma_free_coherent(&amp;dev-&gt;pdev-&gt;dev, frag_sz, buf-&gt;frags[i].buf,</div><div class='add'>+		dma_free_coherent(dev-&gt;device, frag_sz, buf-&gt;frags[i].buf,</div><div class='ctx'> 				  buf-&gt;frags[i].map);</div><div class='ctx'> 		size -= frag_sz;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -274,7 +275,7 @@ void mlx5_db_free(struct mlx5_core_dev *dev, struct mlx5_db *db)</div><div class='ctx'> 	__set_bit(db-&gt;index, db-&gt;u.pgdir-&gt;bitmap);</div><div class='ctx'> </div><div class='ctx'> 	if (bitmap_full(db-&gt;u.pgdir-&gt;bitmap, db_per_page)) {</div><div class='del'>-		dma_free_coherent(&amp;(dev-&gt;pdev-&gt;dev), PAGE_SIZE,</div><div class='add'>+		dma_free_coherent(dev-&gt;device, PAGE_SIZE,</div><div class='ctx'> 				  db-&gt;u.pgdir-&gt;db_page, db-&gt;u.pgdir-&gt;db_dma);</div><div class='ctx'> 		list_del(&amp;db-&gt;u.pgdir-&gt;list);</div><div class='ctx'> 		bitmap_free(db-&gt;u.pgdir-&gt;bitmap);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c<br/>index be48c6440251..937ba4bcb056 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/cmd.c</a></div><div class='hunk'>@@ -917,7 +917,6 @@ static void cmd_work_handler(struct work_struct *work)</div><div class='ctx'> 	mlx5_core_dbg(dev, "writing 0x%x to command doorbell\n", 1 &lt;&lt; ent-&gt;idx);</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	iowrite32be(1 &lt;&lt; ent-&gt;idx, &amp;dev-&gt;iseg-&gt;cmd_dbell);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	/* if not in polling don't use ent after this point */</div><div class='ctx'> 	if (cmd_mode == CMD_MODE_POLLING || poll_cmd) {</div><div class='ctx'> 		poll_timeout(ent);</div><div class='hunk'>@@ -1347,7 +1346,7 @@ static void set_wqname(struct mlx5_core_dev *dev)</div><div class='ctx'> 	struct mlx5_cmd *cmd = &amp;dev-&gt;cmd;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(cmd-&gt;wq_name, sizeof(cmd-&gt;wq_name), "mlx5_cmd_%s",</div><div class='del'>-		 dev_name(&amp;dev-&gt;pdev-&gt;dev));</div><div class='add'>+		 dev_name(dev-&gt;device));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void clean_debug_files(struct mlx5_core_dev *dev)</div><div class='hunk'>@@ -1852,7 +1851,7 @@ static void create_msg_cache(struct mlx5_core_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int alloc_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct device *ddev = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+	struct device *ddev = dev-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cmd_alloc_buf = dma_alloc_coherent(ddev, MLX5_ADAPTER_PAGE_SIZE,</div><div class='ctx'> 						&amp;cmd-&gt;alloc_dma, GFP_KERNEL);</div><div class='hunk'>@@ -1883,7 +1882,7 @@ static int alloc_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> static void free_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct device *ddev = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+	struct device *ddev = dev-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	dma_free_coherent(ddev, cmd-&gt;alloc_size, cmd-&gt;cmd_alloc_buf,</div><div class='ctx'> 			  cmd-&gt;alloc_dma);</div><div class='hunk'>@@ -1902,14 +1901,13 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)</div><div class='ctx'> 	memset(cmd, 0, sizeof(*cmd));</div><div class='ctx'> 	cmd_if_rev = cmdif_rev(dev);</div><div class='ctx'> 	if (cmd_if_rev != CMD_IF_REV) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev,</div><div class='del'>-			"Driver cmdif rev(%d) differs from firmware's(%d)\n",</div><div class='del'>-			CMD_IF_REV, cmd_if_rev);</div><div class='add'>+		mlx5_core_err(dev,</div><div class='add'>+			      "Driver cmdif rev(%d) differs from firmware's(%d)\n",</div><div class='add'>+			      CMD_IF_REV, cmd_if_rev);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;pool = dma_pool_create("mlx5_cmd", &amp;dev-&gt;pdev-&gt;dev, size, align,</div><div class='del'>-				    0);</div><div class='add'>+	cmd-&gt;pool = dma_pool_create("mlx5_cmd", dev-&gt;device, size, align, 0);</div><div class='ctx'> 	if (!cmd-&gt;pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1921,14 +1919,14 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)</div><div class='ctx'> 	cmd-&gt;log_sz = cmd_l &gt;&gt; 4 &amp; 0xf;</div><div class='ctx'> 	cmd-&gt;log_stride = cmd_l &amp; 0xf;</div><div class='ctx'> 	if (1 &lt;&lt; cmd-&gt;log_sz &gt; MLX5_MAX_COMMANDS) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "firmware reports too many outstanding commands %d\n",</div><div class='del'>-			1 &lt;&lt; cmd-&gt;log_sz);</div><div class='add'>+		mlx5_core_err(dev, "firmware reports too many outstanding commands %d\n",</div><div class='add'>+			      1 &lt;&lt; cmd-&gt;log_sz);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_free_page;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;log_sz + cmd-&gt;log_stride &gt; MLX5_ADAPTER_PAGE_SHIFT) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "command queue size overflow\n");</div><div class='add'>+		mlx5_core_err(dev, "command queue size overflow\n");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_free_page;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1939,8 +1937,8 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cmdif_rev = ioread32be(&amp;dev-&gt;iseg-&gt;cmdif_rev_fw_sub) &gt;&gt; 16;</div><div class='ctx'> 	if (cmd-&gt;cmdif_rev &gt; CMD_IF_REV) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "driver does not support command interface version. driver %d, firmware %d\n",</div><div class='del'>-			CMD_IF_REV, cmd-&gt;cmdif_rev);</div><div class='add'>+		mlx5_core_err(dev, "driver does not support command interface version. driver %d, firmware %d\n",</div><div class='add'>+			      CMD_IF_REV, cmd-&gt;cmdif_rev);</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto err_free_page;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1956,7 +1954,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)</div><div class='ctx'> 	cmd_h = (u32)((u64)(cmd-&gt;dma) &gt;&gt; 32);</div><div class='ctx'> 	cmd_l = (u32)(cmd-&gt;dma);</div><div class='ctx'> 	if (cmd_l &amp; 0xfff) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "invalid command queue address\n");</div><div class='add'>+		mlx5_core_err(dev, "invalid command queue address\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_free_page;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1976,7 +1974,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)</div><div class='ctx'> 	set_wqname(dev);</div><div class='ctx'> 	cmd-&gt;wq = create_singlethread_workqueue(cmd-&gt;wq_name);</div><div class='ctx'> 	if (!cmd-&gt;wq) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "failed to create command workqueue\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to create command workqueue\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_cache;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h<br/>index 83f90e9aff45..3038be575923 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@ TRACE_EVENT(mlx5_fw,</div><div class='ctx'> 	TP_ARGS(tracer, trace_timestamp, lost, event_id, msg),</div><div class='ctx'> </div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__string(dev_name, dev_name(&amp;tracer-&gt;dev-&gt;pdev-&gt;dev))</div><div class='add'>+		__string(dev_name, dev_name(tracer-&gt;dev-&gt;device))</div><div class='ctx'> 		__field(u64, trace_timestamp)</div><div class='ctx'> 		__field(bool, lost)</div><div class='ctx'> 		__field(u8, event_id)</div><div class='hunk'>@@ -55,7 +55,8 @@ TRACE_EVENT(mlx5_fw,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(dev_name, dev_name(&amp;tracer-&gt;dev-&gt;pdev-&gt;dev));</div><div class='add'>+		__assign_str(dev_name,</div><div class='add'>+			     dev_name(tracer-&gt;dev-&gt;device));</div><div class='ctx'> 		__entry-&gt;trace_timestamp = trace_timestamp;</div><div class='ctx'> 		__entry-&gt;lost = lost;</div><div class='ctx'> 		__entry-&gt;event_id = event_id;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h<br/>index 71c65cc17904..3a183d690e23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en.h</a></div><div class='hunk'>@@ -240,8 +240,8 @@ struct mlx5e_params {</div><div class='ctx'> 	bool rx_cqe_compress_def;</div><div class='ctx'> 	struct net_dim_cq_moder rx_cq_moderation;</div><div class='ctx'> 	struct net_dim_cq_moder tx_cq_moderation;</div><div class='add'>+	bool tunneled_offload_en;</div><div class='ctx'> 	bool lro_en;</div><div class='del'>-	u32 lro_wqe_sz;</div><div class='ctx'> 	u8  tx_min_inline_mode;</div><div class='ctx'> 	bool vlan_strip_disable;</div><div class='ctx'> 	bool scatter_fcs_en;</div><div class='hunk'>@@ -410,14 +410,17 @@ struct mlx5e_xdp_info_fifo {</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_xdp_wqe_info {</div><div class='ctx'> 	u8 num_wqebbs;</div><div class='del'>-	u8 num_ds;</div><div class='add'>+	u8 num_pkts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_xdp_mpwqe {</div><div class='ctx'> 	/* Current MPWQE session */</div><div class='ctx'> 	struct mlx5e_tx_wqe *wqe;</div><div class='ctx'> 	u8                   ds_count;</div><div class='add'>+	u8                   pkt_count;</div><div class='ctx'> 	u8                   max_ds_count;</div><div class='add'>+	u8                   complete;</div><div class='add'>+	u8                   inline_on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_xdpsq;</div><div class='hunk'>@@ -429,7 +432,6 @@ struct mlx5e_xdpsq {</div><div class='ctx'> 	/* dirtied @completion */</div><div class='ctx'> 	u32                        xdpi_fifo_cc;</div><div class='ctx'> 	u16                        cc;</div><div class='del'>-	bool                       redirect_flush;</div><div class='ctx'> </div><div class='ctx'> 	/* dirtied @xmit */</div><div class='ctx'> 	u32                        xdpi_fifo_pc ____cacheline_aligned_in_smp;</div><div class='hunk'>@@ -462,10 +464,10 @@ struct mlx5e_xdpsq {</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_icosq {</div><div class='ctx'> 	/* data path */</div><div class='add'>+	u16                        cc;</div><div class='add'>+	u16                        pc;</div><div class='ctx'> </div><div class='del'>-	/* dirtied @xmit */</div><div class='del'>-	u16                        pc ____cacheline_aligned_in_smp;</div><div class='del'>-</div><div class='add'>+	struct mlx5_wqe_ctrl_seg  *doorbell_cseg;</div><div class='ctx'> 	struct mlx5e_cq            cq;</div><div class='ctx'> </div><div class='ctx'> 	/* write@xmit, read@completion */</div><div class='hunk'>@@ -532,7 +534,8 @@ typedef bool (*mlx5e_fp_post_rx_wqes)(struct mlx5e_rq *rq);</div><div class='ctx'> typedef void (*mlx5e_fp_dealloc_wqe)(struct mlx5e_rq*, u16);</div><div class='ctx'> </div><div class='ctx'> enum mlx5e_rq_flag {</div><div class='del'>-	MLX5E_RQ_FLAG_XDP_XMIT = BIT(0),</div><div class='add'>+	MLX5E_RQ_FLAG_XDP_XMIT,</div><div class='add'>+	MLX5E_RQ_FLAG_XDP_REDIRECT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_rq_frag_info {</div><div class='hunk'>@@ -563,8 +566,10 @@ struct mlx5e_rq {</div><div class='ctx'> 			struct mlx5e_mpw_info *info;</div><div class='ctx'> 			mlx5e_fp_skb_from_cqe_mpwrq skb_from_cqe_mpwrq;</div><div class='ctx'> 			u16                    num_strides;</div><div class='add'>+			u16                    actual_wq_head;</div><div class='ctx'> 			u8                     log_stride_sz;</div><div class='del'>-			bool                   umr_in_progress;</div><div class='add'>+			u8                     umr_in_progress;</div><div class='add'>+			u8                     umr_last_bulk;</div><div class='ctx'> 		} mpwqe;</div><div class='ctx'> 	};</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -769,12 +774,12 @@ struct mlx5e_profile {</div><div class='ctx'> void mlx5e_build_ptys2ethtool_map(void);</div><div class='ctx'> </div><div class='ctx'> u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *sb_dev,</div><div class='del'>-		       select_queue_fallback_t fallback);</div><div class='add'>+		       struct net_device *sb_dev);</div><div class='ctx'> netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='del'>-			  struct mlx5e_tx_wqe *wqe, u16 pi);</div><div class='add'>+			  struct mlx5e_tx_wqe *wqe, u16 pi, bool xmit_more);</div><div class='ctx'> </div><div class='add'>+void mlx5e_trigger_irq(struct mlx5e_icosq *sq);</div><div class='ctx'> void mlx5e_completion_event(struct mlx5_core_cq *mcq);</div><div class='ctx'> void mlx5e_cq_error_event(struct mlx5_core_cq *mcq, enum mlx5_event event);</div><div class='ctx'> int mlx5e_napi_poll(struct napi_struct *napi, int budget);</div><div class='hunk'>@@ -858,6 +863,7 @@ void mlx5e_close_channels(struct mlx5e_channels *chs);</div><div class='ctx'>  * switching channels</div><div class='ctx'>  */</div><div class='ctx'> typedef int (*mlx5e_fp_hw_modify)(struct mlx5e_priv *priv);</div><div class='add'>+int mlx5e_safe_reopen_channels(struct mlx5e_priv *priv);</div><div class='ctx'> int mlx5e_safe_switch_channels(struct mlx5e_priv *priv,</div><div class='ctx'> 			       struct mlx5e_channels *new_chs,</div><div class='ctx'> 			       mlx5e_fp_hw_modify hw_modify);</div><div class='hunk'>@@ -885,6 +891,53 @@ static inline bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev)</div><div class='ctx'> 		MLX5_CAP_FLOWTABLE_NIC_RX(mdev, ft_field_support.inner_ip_version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool mlx5_tx_swp_supported(struct mlx5_core_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	return MLX5_CAP_ETH(mdev, swp) &amp;&amp;</div><div class='add'>+		MLX5_CAP_ETH(mdev, swp_csum) &amp;&amp; MLX5_CAP_ETH(mdev, swp_lso);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mlx5e_swp_spec {</div><div class='add'>+	__be16 l3_proto;</div><div class='add'>+	u8 l4_proto;</div><div class='add'>+	u8 is_tun;</div><div class='add'>+	__be16 tun_l3_proto;</div><div class='add'>+	u8 tun_l4_proto;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mlx5e_set_eseg_swp(struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg,</div><div class='add'>+		   struct mlx5e_swp_spec *swp_spec)</div><div class='add'>+{</div><div class='add'>+	/* SWP offsets are in 2-bytes words */</div><div class='add'>+	eseg-&gt;swp_outer_l3_offset = skb_network_offset(skb) / 2;</div><div class='add'>+	if (swp_spec-&gt;l3_proto == htons(ETH_P_IPV6))</div><div class='add'>+		eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_OUTER_L3_IPV6;</div><div class='add'>+	if (swp_spec-&gt;l4_proto) {</div><div class='add'>+		eseg-&gt;swp_outer_l4_offset = skb_transport_offset(skb) / 2;</div><div class='add'>+		if (swp_spec-&gt;l4_proto == IPPROTO_UDP)</div><div class='add'>+			eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_OUTER_L4_UDP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (swp_spec-&gt;is_tun) {</div><div class='add'>+		eseg-&gt;swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;</div><div class='add'>+		if (swp_spec-&gt;tun_l3_proto == htons(ETH_P_IPV6))</div><div class='add'>+			eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;</div><div class='add'>+	} else { /* typically for ipsec when xfrm mode != XFRM_MODE_TUNNEL */</div><div class='add'>+		eseg-&gt;swp_inner_l3_offset = skb_network_offset(skb) / 2;</div><div class='add'>+		if (swp_spec-&gt;l3_proto == htons(ETH_P_IPV6))</div><div class='add'>+			eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;</div><div class='add'>+	}</div><div class='add'>+	switch (swp_spec-&gt;tun_l4_proto) {</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+		eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_INNER_L4_UDP;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case IPPROTO_TCP:</div><div class='add'>+		eseg-&gt;swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void mlx5e_sq_fetch_wqe(struct mlx5e_txqsq *sq,</div><div class='ctx'> 				      struct mlx5e_tx_wqe **wqe,</div><div class='ctx'> 				      u16 *pi)</div><div class='hunk'>@@ -929,7 +982,7 @@ void mlx5e_notify_hw(struct mlx5_wq_cyc *wq, u16 pc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='del'>-	mlx5_write64((__be32 *)ctrl, uar_map, NULL);</div><div class='add'>+	mlx5_write64((__be32 *)ctrl, uar_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mlx5e_cq_arm(struct mlx5e_cq *cq)</div><div class='hunk'>@@ -1041,6 +1094,7 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *prof</div><div class='ctx'> int mlx5e_attach_netdev(struct mlx5e_priv *priv);</div><div class='ctx'> void mlx5e_detach_netdev(struct mlx5e_priv *priv);</div><div class='ctx'> void mlx5e_destroy_netdev(struct mlx5e_priv *priv);</div><div class='add'>+void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv);</div><div class='ctx'> void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,</div><div class='ctx'> 			    struct mlx5e_rss_params *rss_params,</div><div class='ctx'> 			    struct mlx5e_params *params,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c<br/>new file mode 100644<br/>index 000000000000..d3744bffbae3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/params.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/params.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='add'>+/* Copyright (c) 2019 Mellanox Technologies. */</div><div class='add'>+</div><div class='add'>+#include "en/params.h"</div><div class='add'>+</div><div class='add'>+u32 mlx5e_rx_get_linear_frag_sz(struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	u16 hw_mtu = MLX5E_SW2HW_MTU(params, params-&gt;sw_mtu);</div><div class='add'>+	u16 linear_rq_headroom = params-&gt;xdp_prog ?</div><div class='add'>+		XDP_PACKET_HEADROOM : MLX5_RX_HEADROOM;</div><div class='add'>+	u32 frag_sz;</div><div class='add'>+</div><div class='add'>+	linear_rq_headroom += NET_IP_ALIGN;</div><div class='add'>+</div><div class='add'>+	frag_sz = MLX5_SKB_FRAG_SZ(linear_rq_headroom + hw_mtu);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;xdp_prog &amp;&amp; frag_sz &lt; PAGE_SIZE)</div><div class='add'>+		frag_sz = PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	return frag_sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 mlx5e_mpwqe_log_pkts_per_wqe(struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	u32 linear_frag_sz = mlx5e_rx_get_linear_frag_sz(params);</div><div class='add'>+</div><div class='add'>+	return MLX5_MPWRQ_LOG_WQE_SZ - order_base_2(linear_frag_sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool mlx5e_rx_is_linear_skb(struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	u32 frag_sz = mlx5e_rx_get_linear_frag_sz(params);</div><div class='add'>+</div><div class='add'>+	return !params-&gt;lro_en &amp;&amp; frag_sz &lt;= PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLX5_MAX_MPWQE_LOG_WQE_STRIDE_SZ ((BIT(__mlx5_bit_sz(wq, log_wqe_stride_size)) - 1) + \</div><div class='add'>+					  MLX5_MPWQE_LOG_STRIDE_SZ_BASE)</div><div class='add'>+bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *mdev,</div><div class='add'>+				  struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	u32 frag_sz = mlx5e_rx_get_linear_frag_sz(params);</div><div class='add'>+	s8 signed_log_num_strides_param;</div><div class='add'>+	u8 log_num_strides;</div><div class='add'>+</div><div class='add'>+	if (!mlx5e_rx_is_linear_skb(params))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (order_base_2(frag_sz) &gt; MLX5_MAX_MPWQE_LOG_WQE_STRIDE_SZ)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (MLX5_CAP_GEN(mdev, ext_stride_num_range))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	log_num_strides = MLX5_MPWRQ_LOG_WQE_SZ - order_base_2(frag_sz);</div><div class='add'>+	signed_log_num_strides_param =</div><div class='add'>+		(s8)log_num_strides - MLX5_MPWQE_LOG_NUM_STRIDES_BASE;</div><div class='add'>+</div><div class='add'>+	return signed_log_num_strides_param &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	u8 log_pkts_per_wqe = mlx5e_mpwqe_log_pkts_per_wqe(params);</div><div class='add'>+</div><div class='add'>+	/* Numbers are unsigned, don't subtract to avoid underflow. */</div><div class='add'>+	if (params-&gt;log_rq_mtu_frames &lt;</div><div class='add'>+	    log_pkts_per_wqe + MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW)</div><div class='add'>+		return MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW;</div><div class='add'>+</div><div class='add'>+	return params-&gt;log_rq_mtu_frames - log_pkts_per_wqe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev,</div><div class='add'>+				   struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	if (mlx5e_rx_mpwqe_is_linear_skb(mdev, params))</div><div class='add'>+		return order_base_2(mlx5e_rx_get_linear_frag_sz(params));</div><div class='add'>+</div><div class='add'>+	return MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev,</div><div class='add'>+				   struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	return MLX5_MPWRQ_LOG_WQE_SZ -</div><div class='add'>+		mlx5e_mpwqe_get_log_stride_size(mdev, params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev,</div><div class='add'>+			  struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	u16 linear_rq_headroom = params-&gt;xdp_prog ?</div><div class='add'>+		XDP_PACKET_HEADROOM : MLX5_RX_HEADROOM;</div><div class='add'>+	bool is_linear_skb;</div><div class='add'>+</div><div class='add'>+	linear_rq_headroom += NET_IP_ALIGN;</div><div class='add'>+</div><div class='add'>+	is_linear_skb = (params-&gt;rq_wq_type == MLX5_WQ_TYPE_CYCLIC) ?</div><div class='add'>+		mlx5e_rx_is_linear_skb(params) :</div><div class='add'>+		mlx5e_rx_mpwqe_is_linear_skb(mdev, params);</div><div class='add'>+</div><div class='add'>+	return is_linear_skb ? linear_rq_headroom : 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h<br/>new file mode 100644<br/>index 000000000000..b106a0236f36<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/params.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/params.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='add'>+/* Copyright (c) 2019 Mellanox Technologies. */</div><div class='add'>+</div><div class='add'>+#ifndef __MLX5_EN_PARAMS_H__</div><div class='add'>+#define __MLX5_EN_PARAMS_H__</div><div class='add'>+</div><div class='add'>+#include "en.h"</div><div class='add'>+</div><div class='add'>+u32 mlx5e_rx_get_linear_frag_sz(struct mlx5e_params *params);</div><div class='add'>+u8 mlx5e_mpwqe_log_pkts_per_wqe(struct mlx5e_params *params);</div><div class='add'>+bool mlx5e_rx_is_linear_skb(struct mlx5e_params *params);</div><div class='add'>+bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *mdev,</div><div class='add'>+				  struct mlx5e_params *params);</div><div class='add'>+u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5e_params *params);</div><div class='add'>+u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev,</div><div class='add'>+				   struct mlx5e_params *params);</div><div class='add'>+u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev,</div><div class='add'>+				   struct mlx5e_params *params);</div><div class='add'>+u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev,</div><div class='add'>+			  struct mlx5e_params *params);</div><div class='add'>+</div><div class='add'>+#endif /* __MLX5_EN_PARAMS_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/port.c b/drivers/net/ethernet/mellanox/mlx5/core/en/port.c<br/>index 122927f3a600..d5e5afbdca6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/port.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/port.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/port.c</a></div><div class='hunk'>@@ -96,9 +96,6 @@ int mlx5_port_query_eth_proto(struct mlx5_core_dev *dev, u8 port, bool ext,</div><div class='ctx'> 	if (!eproto)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ext !=  MLX5_CAP_PCAM_FEATURE(dev, ptys_extended_ethernet))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	err = mlx5_query_port_ptys(dev, out, sizeof(out), MLX5_PTYS_EN, port);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c b/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c<br/>index eac245a93f91..633b117eb13e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c</a></div><div class='hunk'>@@ -122,7 +122,9 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* xoff = ((301+2.16 * len [m]) * speed [Gbps] + 2.72 MTU [B]) */</div><div class='add'>+/* xoff = ((301+2.16 * len [m]) * speed [Gbps] + 2.72 MTU [B])</div><div class='add'>+ * minimum speed value is 40Gbps</div><div class='add'>+ */</div><div class='ctx'> static u32 calculate_xoff(struct mlx5e_priv *priv, unsigned int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	u32 speed;</div><div class='hunk'>@@ -130,10 +132,9 @@ static u32 calculate_xoff(struct mlx5e_priv *priv, unsigned int mtu)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5e_port_linkspeed(priv-&gt;mdev, &amp;speed);</div><div class='del'>-	if (err) {</div><div class='del'>-		mlx5_core_warn(priv-&gt;mdev, "cannot get port speed\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		speed = SPEED_40000;</div><div class='add'>+	speed = max_t(u32, speed, SPEED_40000);</div><div class='ctx'> </div><div class='ctx'> 	xoff = (301 + 216 * priv-&gt;dcbx.cable_len / 100) * speed / 1000 + 272 * mtu / 100;</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +143,7 @@ static u32 calculate_xoff(struct mlx5e_priv *priv, unsigned int mtu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int update_xoff_threshold(struct mlx5e_port_buffer *port_buffer,</div><div class='del'>-				 u32 xoff, unsigned int mtu)</div><div class='add'>+				 u32 xoff, unsigned int max_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -154,36 +155,37 @@ static int update_xoff_threshold(struct mlx5e_port_buffer *port_buffer,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (port_buffer-&gt;buffer[i].size &lt;</div><div class='del'>-		    (xoff + mtu + (1 &lt;&lt; MLX5E_BUFFER_CELL_SHIFT)))</div><div class='add'>+		    (xoff + max_mtu + (1 &lt;&lt; MLX5E_BUFFER_CELL_SHIFT)))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		port_buffer-&gt;buffer[i].xoff = port_buffer-&gt;buffer[i].size - xoff;</div><div class='del'>-		port_buffer-&gt;buffer[i].xon  = port_buffer-&gt;buffer[i].xoff - mtu;</div><div class='add'>+		port_buffer-&gt;buffer[i].xon  =</div><div class='add'>+			port_buffer-&gt;buffer[i].xoff - max_mtu;</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'> /**</div><div class='del'>- * update_buffer_lossy()</div><div class='del'>- *   mtu: device's MTU</div><div class='del'>- *   pfc_en: &lt;input&gt; current pfc configuration</div><div class='del'>- *   buffer: &lt;input&gt; current prio to buffer mapping</div><div class='del'>- *   xoff:   &lt;input&gt; xoff value</div><div class='del'>- *   port_buffer: &lt;output&gt; port receive buffer configuration</div><div class='del'>- *   change: &lt;output&gt;</div><div class='add'>+ *	update_buffer_lossy	- Update buffer configuration based on pfc</div><div class='add'>+ *	@max_mtu: netdev's max_mtu</div><div class='add'>+ *	@pfc_en: &lt;input&gt; current pfc configuration</div><div class='add'>+ *	@buffer: &lt;input&gt; current prio to buffer mapping</div><div class='add'>+ *	@xoff:   &lt;input&gt; xoff value</div><div class='add'>+ *	@port_buffer: &lt;output&gt; port receive buffer configuration</div><div class='add'>+ *	@change: &lt;output&gt;</div><div class='ctx'>  *</div><div class='del'>- *   Update buffer configuration based on pfc configuraiton and priority</div><div class='del'>- *   to buffer mapping.</div><div class='del'>- *   Buffer's lossy bit is changed to:</div><div class='del'>- *     lossless if there is at least one PFC enabled priority mapped to this buffer</div><div class='del'>- *     lossy if all priorities mapped to this buffer are PFC disabled</div><div class='add'>+ *	Update buffer configuration based on pfc configuraiton and</div><div class='add'>+ *	priority to buffer mapping.</div><div class='add'>+ *	Buffer's lossy bit is changed to:</div><div class='add'>+ *		lossless if there is at least one PFC enabled priority</div><div class='add'>+ *		mapped to this buffer lossy if all priorities mapped to</div><div class='add'>+ *		this buffer are PFC disabled</div><div class='ctx'>  *</div><div class='del'>- *   Return:</div><div class='del'>- *     Return 0 if no error.</div><div class='del'>- *     Set change to true if buffer configuration is modified.</div><div class='add'>+ *	@return: 0 if no error,</div><div class='add'>+ *	sets change to true if buffer configuration was modified.</div><div class='ctx'>  */</div><div class='del'>-static int update_buffer_lossy(unsigned int mtu,</div><div class='add'>+static int update_buffer_lossy(unsigned int max_mtu,</div><div class='ctx'> 			       u8 pfc_en, u8 *buffer, u32 xoff,</div><div class='ctx'> 			       struct mlx5e_port_buffer *port_buffer,</div><div class='ctx'> 			       bool *change)</div><div class='hunk'>@@ -220,7 +222,7 @@ static int update_buffer_lossy(unsigned int mtu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed) {</div><div class='del'>-		err = update_xoff_threshold(port_buffer, xoff, mtu);</div><div class='add'>+		err = update_xoff_threshold(port_buffer, xoff, max_mtu);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -230,6 +232,7 @@ static int update_buffer_lossy(unsigned int mtu,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MINIMUM_MAX_MTU 9216</div><div class='ctx'> int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> 				    u32 change, unsigned int mtu,</div><div class='ctx'> 				    struct ieee_pfc *pfc,</div><div class='hunk'>@@ -241,12 +244,14 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> 	bool update_prio2buffer = false;</div><div class='ctx'> 	u8 buffer[MLX5E_MAX_PRIORITY];</div><div class='ctx'> 	bool update_buffer = false;</div><div class='add'>+	unsigned int max_mtu;</div><div class='ctx'> 	u32 total_used = 0;</div><div class='ctx'> 	u8 curr_pfc_en;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_dbg(HW, priv, "%s: change=%x\n", __func__, change);</div><div class='add'>+	max_mtu = max_t(unsigned int, priv-&gt;netdev-&gt;max_mtu, MINIMUM_MAX_MTU);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5e_port_query_buffer(priv, &amp;port_buffer);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -254,7 +259,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (change &amp; MLX5E_PORT_BUFFER_CABLE_LEN) {</div><div class='ctx'> 		update_buffer = true;</div><div class='del'>-		err = update_xoff_threshold(&amp;port_buffer, xoff, mtu);</div><div class='add'>+		err = update_xoff_threshold(&amp;port_buffer, xoff, max_mtu);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -264,7 +269,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = update_buffer_lossy(mtu, pfc-&gt;pfc_en, buffer, xoff,</div><div class='add'>+		err = update_buffer_lossy(max_mtu, pfc-&gt;pfc_en, buffer, xoff,</div><div class='ctx'> 					  &amp;port_buffer, &amp;update_buffer);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -276,8 +281,8 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = update_buffer_lossy(mtu, curr_pfc_en, prio2buffer, xoff,</div><div class='del'>-					  &amp;port_buffer, &amp;update_buffer);</div><div class='add'>+		err = update_buffer_lossy(max_mtu, curr_pfc_en, prio2buffer,</div><div class='add'>+					  xoff, &amp;port_buffer, &amp;update_buffer);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -301,7 +306,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		update_buffer = true;</div><div class='del'>-		err = update_xoff_threshold(&amp;port_buffer, xoff, mtu);</div><div class='add'>+		err = update_xoff_threshold(&amp;port_buffer, xoff, max_mtu);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -309,7 +314,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv,</div><div class='ctx'> 	/* Need to update buffer configuration if xoff value is changed */</div><div class='ctx'> 	if (!update_buffer &amp;&amp; xoff != priv-&gt;dcbx.xoff) {</div><div class='ctx'> 		update_buffer = true;</div><div class='del'>-		err = update_xoff_threshold(&amp;port_buffer, xoff, mtu);</div><div class='add'>+		err = update_xoff_threshold(&amp;port_buffer, xoff, max_mtu);</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/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c<br/>index 9d38e62cdf24..476dd97f7f2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c</a></div><div class='hunk'>@@ -186,12 +186,17 @@ static int mlx5e_tx_reporter_recover_from_ctx(struct mlx5e_tx_err_ctx *err_ctx)</div><div class='ctx'> </div><div class='ctx'> static int mlx5e_tx_reporter_recover_all(struct mlx5e_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;state_lock);</div><div class='del'>-	mlx5e_close_locked(priv-&gt;netdev);</div><div class='del'>-	err = mlx5e_open_locked(priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MLX5E_STATE_OPENED, &amp;priv-&gt;state))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mlx5e_safe_reopen_channels(priv);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;state_lock);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c<br/>index fa2a3c444cdc..fe5d4d7f15ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c</a></div><div class='hunk'>@@ -39,6 +39,10 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv,</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!(mlx5e_eswitch_rep(*out_dev) &amp;&amp;</div><div class='add'>+	      mlx5e_is_uplink_rep(netdev_priv(*out_dev))))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +74,7 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (mlx5_lag_is_multipath(mdev) &amp;&amp; !rt-&gt;rt_gateway)</div><div class='add'>+	if (mlx5_lag_is_multipath(mdev) &amp;&amp; rt-&gt;rt_gw_family != AF_INET)</div><div class='ctx'> 		return -ENETUNREACH;</div><div class='ctx'> #else</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='hunk'>@@ -96,7 +100,7 @@ static const char *mlx5e_netdev_kind(struct net_device *dev)</div><div class='ctx'> 	if (dev-&gt;rtnl_link_ops)</div><div class='ctx'> 		return dev-&gt;rtnl_link_ops-&gt;kind;</div><div class='ctx'> 	else</div><div class='del'>-		return "";</div><div class='add'>+		return "unknown";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,</div><div class='hunk'>@@ -636,8 +640,10 @@ int mlx5e_tc_tun_parse(struct net_device *filter_dev,</div><div class='ctx'> 						headers_c, headers_v);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_warn(priv-&gt;netdev,</div><div class='del'>-			    "decapsulation offload is not supported for %s net device (%d)\n",</div><div class='del'>-			    mlx5e_netdev_kind(filter_dev), tunnel_type);</div><div class='add'>+			    "decapsulation offload is not supported for %s (kind: \"%s\")\n",</div><div class='add'>+			    netdev_name(filter_dev),</div><div class='add'>+			    mlx5e_netdev_kind(filter_dev));</div><div class='add'>+</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c<br/>index 03b2a9f9c589..eb8ef78e5626 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c</a></div><div class='hunk'>@@ -33,6 +33,26 @@</div><div class='ctx'> #include &lt;linux/bpf_trace.h&gt;</div><div class='ctx'> #include "en/xdp.h"</div><div class='ctx'> </div><div class='add'>+int mlx5e_xdp_max_mtu(struct mlx5e_params *params)</div><div class='add'>+{</div><div class='add'>+	int hr = NET_IP_ALIGN + XDP_PACKET_HEADROOM;</div><div class='add'>+</div><div class='add'>+	/* Let S := SKB_DATA_ALIGN(sizeof(struct skb_shared_info)).</div><div class='add'>+	 * The condition checked in mlx5e_rx_is_linear_skb is:</div><div class='add'>+	 *   SKB_DATA_ALIGN(sw_mtu + hard_mtu + hr) + S &lt;= PAGE_SIZE         (1)</div><div class='add'>+	 *   (Note that hw_mtu == sw_mtu + hard_mtu.)</div><div class='add'>+	 * What is returned from this function is:</div><div class='add'>+	 *   max_mtu = PAGE_SIZE - S - hr - hard_mtu                         (2)</div><div class='add'>+	 * After assigning sw_mtu := max_mtu, the left side of (1) turns to</div><div class='add'>+	 * SKB_DATA_ALIGN(PAGE_SIZE - S) + S, which is equal to PAGE_SIZE,</div><div class='add'>+	 * because both PAGE_SIZE and S are already aligned. Any number greater</div><div class='add'>+	 * than max_mtu would make the left side of (1) greater than PAGE_SIZE,</div><div class='add'>+	 * so max_mtu is the maximum MTU allowed.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return MLX5E_HW2SW_MTU(params, SKB_MAX_HEAD(hr));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool</div><div class='ctx'> mlx5e_xmit_xdp_buff(struct mlx5e_xdpsq *sq, struct mlx5e_dma_info *di,</div><div class='ctx'> 		    struct xdp_buff *xdp)</div><div class='hunk'>@@ -85,7 +105,7 @@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di,</div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			goto xdp_abort;</div><div class='ctx'> 		__set_bit(MLX5E_RQ_FLAG_XDP_XMIT, rq-&gt;flags);</div><div class='del'>-		rq-&gt;xdpsq.redirect_flush = true;</div><div class='add'>+		__set_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq-&gt;flags);</div><div class='ctx'> 		mlx5e_page_dma_unmap(rq, di);</div><div class='ctx'> 		rq-&gt;stats-&gt;xdp_redirect++;</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -105,6 +125,7 @@ xdp_abort:</div><div class='ctx'> static void mlx5e_xdp_mpwqe_session_start(struct mlx5e_xdpsq *sq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_xdp_mpwqe *session = &amp;sq-&gt;mpwqe;</div><div class='add'>+	struct mlx5e_xdpsq_stats *stats = sq-&gt;stats;</div><div class='ctx'> 	struct mlx5_wq_cyc *wq = &amp;sq-&gt;wq;</div><div class='ctx'> 	u8  wqebbs;</div><div class='ctx'> 	u16 pi;</div><div class='hunk'>@@ -112,7 +133,9 @@ static void mlx5e_xdp_mpwqe_session_start(struct mlx5e_xdpsq *sq)</div><div class='ctx'> 	mlx5e_xdpsq_fetch_wqe(sq, &amp;session-&gt;wqe);</div><div class='ctx'> </div><div class='ctx'> 	prefetchw(session-&gt;wqe-&gt;data);</div><div class='del'>-	session-&gt;ds_count = MLX5E_XDP_TX_EMPTY_DS_COUNT;</div><div class='add'>+	session-&gt;ds_count  = MLX5E_XDP_TX_EMPTY_DS_COUNT;</div><div class='add'>+	session-&gt;pkt_count = 0;</div><div class='add'>+	session-&gt;complete  = 0;</div><div class='ctx'> </div><div class='ctx'> 	pi = mlx5_wq_cyc_ctr2ix(wq, sq-&gt;pc);</div><div class='ctx'> </div><div class='hunk'>@@ -131,6 +154,10 @@ static void mlx5e_xdp_mpwqe_session_start(struct mlx5e_xdpsq *sq)</div><div class='ctx'> 		       MLX5E_XDP_MPW_MAX_WQEBBS);</div><div class='ctx'> </div><div class='ctx'> 	session-&gt;max_ds_count = MLX5_SEND_WQEBB_NUM_DS * wqebbs;</div><div class='add'>+</div><div class='add'>+	mlx5e_xdp_update_inline_state(sq);</div><div class='add'>+</div><div class='add'>+	stats-&gt;mpwqe++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_xdp_mpwqe_complete(struct mlx5e_xdpsq *sq)</div><div class='hunk'>@@ -147,7 +174,7 @@ static void mlx5e_xdp_mpwqe_complete(struct mlx5e_xdpsq *sq)</div><div class='ctx'> 	cseg-&gt;qpn_ds = cpu_to_be32((sq-&gt;sqn &lt;&lt; 8) | ds_count);</div><div class='ctx'> </div><div class='ctx'> 	wi-&gt;num_wqebbs = DIV_ROUND_UP(ds_count, MLX5_SEND_WQEBB_NUM_DS);</div><div class='del'>-	wi-&gt;num_ds     = ds_count - MLX5E_XDP_TX_EMPTY_DS_COUNT;</div><div class='add'>+	wi-&gt;num_pkts   = session-&gt;pkt_count;</div><div class='ctx'> </div><div class='ctx'> 	sq-&gt;pc += wi-&gt;num_wqebbs;</div><div class='ctx'> </div><div class='hunk'>@@ -162,11 +189,9 @@ static bool mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq,</div><div class='ctx'> 	struct mlx5e_xdp_mpwqe *session = &amp;sq-&gt;mpwqe;</div><div class='ctx'> 	struct mlx5e_xdpsq_stats *stats = sq-&gt;stats;</div><div class='ctx'> </div><div class='del'>-	dma_addr_t dma_addr    = xdpi-&gt;dma_addr;</div><div class='ctx'> 	struct xdp_frame *xdpf = xdpi-&gt;xdpf;</div><div class='del'>-	unsigned int dma_len   = xdpf-&gt;len;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(sq-&gt;hw_mtu &lt; dma_len)) {</div><div class='add'>+	if (unlikely(sq-&gt;hw_mtu &lt; xdpf-&gt;len)) {</div><div class='ctx'> 		stats-&gt;err++;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -183,9 +208,10 @@ static bool mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq,</div><div class='ctx'> 		mlx5e_xdp_mpwqe_session_start(sq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mlx5e_xdp_mpwqe_add_dseg(sq, dma_addr, dma_len);</div><div class='add'>+	mlx5e_xdp_mpwqe_add_dseg(sq, xdpi, stats);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(session-&gt;ds_count == session-&gt;max_ds_count))</div><div class='add'>+	if (unlikely(session-&gt;complete ||</div><div class='add'>+		     session-&gt;ds_count == session-&gt;max_ds_count))</div><div class='ctx'> 		mlx5e_xdp_mpwqe_complete(sq);</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_xdpi_fifo_push(&amp;sq-&gt;db.xdpi_fifo, xdpi);</div><div class='hunk'>@@ -249,12 +275,33 @@ static bool mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xdp_info *</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq,</div><div class='add'>+				  struct mlx5e_xdp_wqe_info *wi,</div><div class='add'>+				  struct mlx5e_rq *rq,</div><div class='add'>+				  bool recycle)</div><div class='add'>+{</div><div class='add'>+	struct mlx5e_xdp_info_fifo *xdpi_fifo = &amp;sq-&gt;db.xdpi_fifo;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wi-&gt;num_pkts; i++) {</div><div class='add'>+		struct mlx5e_xdp_info xdpi = mlx5e_xdpi_fifo_pop(xdpi_fifo);</div><div class='add'>+</div><div class='add'>+		if (rq) {</div><div class='add'>+			/* XDP_TX */</div><div class='add'>+			mlx5e_page_release(rq, &amp;xdpi.di, recycle);</div><div class='add'>+		} else {</div><div class='add'>+			/* XDP_REDIRECT */</div><div class='add'>+			dma_unmap_single(sq-&gt;pdev, xdpi.dma_addr,</div><div class='add'>+					 xdpi.xdpf-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+			xdp_return_frame(xdpi.xdpf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5e_xdp_info_fifo *xdpi_fifo;</div><div class='ctx'> 	struct mlx5e_xdpsq *sq;</div><div class='ctx'> 	struct mlx5_cqe64 *cqe;</div><div class='del'>-	bool is_redirect;</div><div class='ctx'> 	u16 sqcc;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -267,9 +314,6 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> 	if (!cqe)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	is_redirect = !rq;</div><div class='del'>-	xdpi_fifo = &amp;sq-&gt;db.xdpi_fifo;</div><div class='del'>-</div><div class='ctx'> 	/* sq-&gt;cc must be updated only after mlx5_cqwq_update_db_record(),</div><div class='ctx'> 	 * otherwise a cq overrun may occur</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -291,7 +335,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='ctx'> 			struct mlx5e_xdp_wqe_info *wi;</div><div class='del'>-			u16 ci, j;</div><div class='add'>+			u16 ci;</div><div class='ctx'> </div><div class='ctx'> 			last_wqe = (sqcc == wqe_counter);</div><div class='ctx'> 			ci = mlx5_wq_cyc_ctr2ix(&amp;sq-&gt;wq, sqcc);</div><div class='hunk'>@@ -299,19 +343,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> </div><div class='ctx'> 			sqcc += wi-&gt;num_wqebbs;</div><div class='ctx'> </div><div class='del'>-			for (j = 0; j &lt; wi-&gt;num_ds; j++) {</div><div class='del'>-				struct mlx5e_xdp_info xdpi =</div><div class='del'>-					mlx5e_xdpi_fifo_pop(xdpi_fifo);</div><div class='del'>-</div><div class='del'>-				if (is_redirect) {</div><div class='del'>-					xdp_return_frame(xdpi.xdpf);</div><div class='del'>-					dma_unmap_single(sq-&gt;pdev, xdpi.dma_addr,</div><div class='del'>-							 xdpi.xdpf-&gt;len, DMA_TO_DEVICE);</div><div class='del'>-				} else {</div><div class='del'>-					/* Recycle RX page */</div><div class='del'>-					mlx5e_page_release(rq, &amp;xdpi.di, true);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+			mlx5e_free_xdpsq_desc(sq, wi, rq, true);</div><div class='ctx'> 		} while (!last_wqe);</div><div class='ctx'> 	} while ((++i &lt; MLX5E_TX_CQ_POLL_BUDGET) &amp;&amp; (cqe = mlx5_cqwq_get_cqe(&amp;cq-&gt;wq)));</div><div class='ctx'> </div><div class='hunk'>@@ -328,31 +360,16 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> </div><div class='ctx'> void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq, struct mlx5e_rq *rq)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5e_xdp_info_fifo *xdpi_fifo = &amp;sq-&gt;db.xdpi_fifo;</div><div class='del'>-	bool is_redirect = !rq;</div><div class='del'>-</div><div class='ctx'> 	while (sq-&gt;cc != sq-&gt;pc) {</div><div class='ctx'> 		struct mlx5e_xdp_wqe_info *wi;</div><div class='del'>-		u16 ci, i;</div><div class='add'>+		u16 ci;</div><div class='ctx'> </div><div class='ctx'> 		ci = mlx5_wq_cyc_ctr2ix(&amp;sq-&gt;wq, sq-&gt;cc);</div><div class='ctx'> 		wi = &amp;sq-&gt;db.wqe_info[ci];</div><div class='ctx'> </div><div class='ctx'> 		sq-&gt;cc += wi-&gt;num_wqebbs;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; wi-&gt;num_ds; i++) {</div><div class='del'>-			struct mlx5e_xdp_info xdpi =</div><div class='del'>-				mlx5e_xdpi_fifo_pop(xdpi_fifo);</div><div class='del'>-</div><div class='del'>-			if (is_redirect) {</div><div class='del'>-				xdp_return_frame(xdpi.xdpf);</div><div class='del'>-				dma_unmap_single(sq-&gt;pdev, xdpi.dma_addr,</div><div class='del'>-						 xdpi.xdpf-&gt;len, DMA_TO_DEVICE);</div><div class='del'>-			} else {</div><div class='del'>-				/* Recycle RX page */</div><div class='del'>-				mlx5e_page_release(rq, &amp;xdpi.di, false);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		mlx5e_free_xdpsq_desc(sq, wi, rq, false);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -419,9 +436,9 @@ void mlx5e_xdp_rx_poll_complete(struct mlx5e_rq *rq)</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_xmit_xdp_doorbell(xdpsq);</div><div class='ctx'> </div><div class='del'>-	if (xdpsq-&gt;redirect_flush) {</div><div class='add'>+	if (test_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq-&gt;flags)) {</div><div class='ctx'> 		xdp_do_flush_map();</div><div class='del'>-		xdpsq-&gt;redirect_flush = false;</div><div class='add'>+		__clear_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h<br/>index ee27a7c8cd87..8b537a4b0840 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h</a></div><div class='hunk'>@@ -34,13 +34,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "en.h"</div><div class='ctx'> </div><div class='del'>-#define MLX5E_XDP_MAX_MTU ((int)(PAGE_SIZE - \</div><div class='del'>-				 MLX5_SKB_FRAG_SZ(XDP_PACKET_HEADROOM)))</div><div class='ctx'> #define MLX5E_XDP_MIN_INLINE (ETH_HLEN + VLAN_HLEN)</div><div class='ctx'> #define MLX5E_XDP_TX_EMPTY_DS_COUNT \</div><div class='ctx'> 	(sizeof(struct mlx5e_tx_wqe) / MLX5_SEND_WQE_DS)</div><div class='ctx'> #define MLX5E_XDP_TX_DS_COUNT (MLX5E_XDP_TX_EMPTY_DS_COUNT + 1 /* SG DS */)</div><div class='ctx'> </div><div class='add'>+int mlx5e_xdp_max_mtu(struct mlx5e_params *params);</div><div class='ctx'> bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di,</div><div class='ctx'> 		      void *va, u16 *rx_headroom, u32 *len);</div><div class='ctx'> bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq);</div><div class='hunk'>@@ -75,16 +74,68 @@ static inline void mlx5e_xmit_xdp_doorbell(struct mlx5e_xdpsq *sq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Enable inline WQEs to shift some load from a congested HCA (HW) to</div><div class='add'>+ * a less congested cpu (SW).</div><div class='add'>+ */</div><div class='add'>+static inline void mlx5e_xdp_update_inline_state(struct mlx5e_xdpsq *sq)</div><div class='add'>+{</div><div class='add'>+	u16 outstanding = sq-&gt;xdpi_fifo_pc - sq-&gt;xdpi_fifo_cc;</div><div class='add'>+	struct mlx5e_xdp_mpwqe *session = &amp;sq-&gt;mpwqe;</div><div class='add'>+</div><div class='add'>+#define MLX5E_XDP_INLINE_WATERMARK_LOW	10</div><div class='add'>+#define MLX5E_XDP_INLINE_WATERMARK_HIGH 128</div><div class='add'>+</div><div class='add'>+	if (session-&gt;inline_on) {</div><div class='add'>+		if (outstanding &lt;= MLX5E_XDP_INLINE_WATERMARK_LOW)</div><div class='add'>+			session-&gt;inline_on = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* inline is false */</div><div class='add'>+	if (outstanding &gt;= MLX5E_XDP_INLINE_WATERMARK_HIGH)</div><div class='add'>+		session-&gt;inline_on = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='del'>-mlx5e_xdp_mpwqe_add_dseg(struct mlx5e_xdpsq *sq, dma_addr_t dma_addr, u16 dma_len)</div><div class='add'>+mlx5e_xdp_mpwqe_add_dseg(struct mlx5e_xdpsq *sq, struct mlx5e_xdp_info *xdpi,</div><div class='add'>+			 struct mlx5e_xdpsq_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_xdp_mpwqe *session = &amp;sq-&gt;mpwqe;</div><div class='add'>+	dma_addr_t dma_addr    = xdpi-&gt;dma_addr;</div><div class='add'>+	struct xdp_frame *xdpf = xdpi-&gt;xdpf;</div><div class='ctx'> 	struct mlx5_wqe_data_seg *dseg =</div><div class='del'>-		(struct mlx5_wqe_data_seg *)session-&gt;wqe + session-&gt;ds_count++;</div><div class='add'>+		(struct mlx5_wqe_data_seg *)session-&gt;wqe + session-&gt;ds_count;</div><div class='add'>+	u16 dma_len = xdpf-&gt;len;</div><div class='ctx'> </div><div class='add'>+	session-&gt;pkt_count++;</div><div class='add'>+</div><div class='add'>+#define MLX5E_XDP_INLINE_WQE_SZ_THRSD (256 - sizeof(struct mlx5_wqe_inline_seg))</div><div class='add'>+</div><div class='add'>+	if (session-&gt;inline_on &amp;&amp; dma_len &lt;= MLX5E_XDP_INLINE_WQE_SZ_THRSD) {</div><div class='add'>+		struct mlx5_wqe_inline_seg *inline_dseg =</div><div class='add'>+			(struct mlx5_wqe_inline_seg *)dseg;</div><div class='add'>+		u16 ds_len = sizeof(*inline_dseg) + dma_len;</div><div class='add'>+		u16 ds_cnt = DIV_ROUND_UP(ds_len, MLX5_SEND_WQE_DS);</div><div class='add'>+</div><div class='add'>+		if (unlikely(session-&gt;ds_count + ds_cnt &gt; session-&gt;max_ds_count)) {</div><div class='add'>+			/* Not enough space for inline wqe, send with memory pointer */</div><div class='add'>+			session-&gt;complete = true;</div><div class='add'>+			goto no_inline;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		inline_dseg-&gt;byte_count = cpu_to_be32(dma_len | MLX5_INLINE_SEG);</div><div class='add'>+		memcpy(inline_dseg-&gt;data, xdpf-&gt;data, dma_len);</div><div class='add'>+</div><div class='add'>+		session-&gt;ds_count += ds_cnt;</div><div class='add'>+		stats-&gt;inlnw++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+no_inline:</div><div class='ctx'> 	dseg-&gt;addr       = cpu_to_be64(dma_addr);</div><div class='ctx'> 	dseg-&gt;byte_count = cpu_to_be32(dma_len);</div><div class='ctx'> 	dseg-&gt;lkey       = sq-&gt;mkey_be;</div><div class='add'>+	session-&gt;ds_count++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mlx5e_xdpsq_fetch_wqe(struct mlx5e_xdpsq *sq,</div><div class='hunk'>@@ -111,5 +162,4 @@ mlx5e_xdpi_fifo_pop(struct mlx5e_xdp_info_fifo *fifo)</div><div class='ctx'> {</div><div class='ctx'> 	return fifo-&gt;xi[(*fifo-&gt;cc)++ &amp; fifo-&gt;mask];</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h<br/>index 1dd225380a66..6da7c88742dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h</a></div><div class='hunk'>@@ -40,6 +40,57 @@</div><div class='ctx'> #include "en_accel/tls_rxtx.h"</div><div class='ctx'> #include "en.h"</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_GENEVE)</div><div class='add'>+static inline bool mlx5_geneve_tx_allowed(struct mlx5_core_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	return mlx5_tx_swp_supported(mdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mlx5e_tx_tunnel_accel(struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg)</div><div class='add'>+{</div><div class='add'>+	struct mlx5e_swp_spec swp_spec = {};</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	__be16 l3_proto;</div><div class='add'>+	u8 l4_proto;</div><div class='add'>+</div><div class='add'>+	l3_proto = vlan_get_protocol(skb);</div><div class='add'>+	switch (l3_proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		l4_proto = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		l4_proto = ipv6_find_hdr(skb, &amp;offset, -1, NULL, NULL);</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 (l4_proto != IPPROTO_UDP ||</div><div class='add'>+	    udp_hdr(skb)-&gt;dest != cpu_to_be16(GENEVE_UDP_PORT))</div><div class='add'>+		return;</div><div class='add'>+	swp_spec.l3_proto = l3_proto;</div><div class='add'>+	swp_spec.l4_proto = l4_proto;</div><div class='add'>+	swp_spec.is_tun = true;</div><div class='add'>+	if (inner_ip_hdr(skb)-&gt;version == 6) {</div><div class='add'>+		swp_spec.tun_l3_proto = htons(ETH_P_IPV6);</div><div class='add'>+		swp_spec.tun_l4_proto = inner_ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+	} else {</div><div class='add'>+		swp_spec.tun_l3_proto = htons(ETH_P_IP);</div><div class='add'>+		swp_spec.tun_l4_proto = inner_ip_hdr(skb)-&gt;protocol;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlx5e_set_eseg_swp(skb, eseg, &amp;swp_spec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline bool mlx5_geneve_tx_allowed(struct mlx5_core_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_GENEVE */</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='ctx'> mlx5e_udp_gso_handle_tx_skb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c<br/>index 53608afd39b6..0dd17514caae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb,</div><div class='ctx'> 				struct mlx5_wqe_eth_seg *eseg, u8 mode,</div><div class='ctx'> 				struct xfrm_offload *xo)</div><div class='ctx'> {</div><div class='del'>-	u8 proto;</div><div class='add'>+	struct mlx5e_swp_spec swp_spec = {};</div><div class='ctx'> </div><div class='ctx'> 	/* Tunnel Mode:</div><div class='ctx'> 	 * SWP:      OutL3       InL3  InL4</div><div class='hunk'>@@ -146,35 +146,23 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb,</div><div class='ctx'> 	 * SWP:      OutL3       InL4</div><div class='ctx'> 	 *           InL3</div><div class='ctx'> 	 * Pkt: MAC  IP     ESP  L4</div><div class='del'>-	 *</div><div class='del'>-	 * Offsets are in 2-byte words, counting from start of frame</div><div class='ctx'> 	 */</div><div class='del'>-	eseg-&gt;swp_outer_l3_offset = skb_network_offset(skb) / 2;</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='del'>-		eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_OUTER_L3_IPV6;</div><div class='del'>-</div><div class='del'>-	if (mode == XFRM_MODE_TUNNEL) {</div><div class='del'>-		eseg-&gt;swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;</div><div class='add'>+	swp_spec.l3_proto = skb-&gt;protocol;</div><div class='add'>+	swp_spec.is_tun = mode == XFRM_MODE_TUNNEL;</div><div class='add'>+	if (swp_spec.is_tun) {</div><div class='ctx'> 		if (xo-&gt;proto == IPPROTO_IPV6) {</div><div class='del'>-			eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;</div><div class='del'>-			proto = inner_ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+			swp_spec.tun_l3_proto = htons(ETH_P_IPV6);</div><div class='add'>+			swp_spec.tun_l4_proto = inner_ipv6_hdr(skb)-&gt;nexthdr;</div><div class='ctx'> 		} else {</div><div class='del'>-			proto = inner_ip_hdr(skb)-&gt;protocol;</div><div class='add'>+			swp_spec.tun_l3_proto = htons(ETH_P_IP);</div><div class='add'>+			swp_spec.tun_l4_proto = inner_ip_hdr(skb)-&gt;protocol;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		eseg-&gt;swp_inner_l3_offset = skb_network_offset(skb) / 2;</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IPV6))</div><div class='del'>-			eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;</div><div class='del'>-		proto = xo-&gt;proto;</div><div class='del'>-	}</div><div class='del'>-	switch (proto) {</div><div class='del'>-	case IPPROTO_UDP:</div><div class='del'>-		eseg-&gt;swp_flags |= MLX5_ETH_WQE_SWP_INNER_L4_UDP;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case IPPROTO_TCP:</div><div class='del'>-		eseg-&gt;swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;</div><div class='del'>-		break;</div><div class='add'>+		swp_spec.tun_l3_proto = skb-&gt;protocol;</div><div class='add'>+		swp_spec.tun_l4_proto = xo-&gt;proto;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mlx5e_set_eseg_swp(skb, eseg, &amp;swp_spec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mlx5e_ipsec_set_iv_esn(struct sk_buff *skb, struct xfrm_state *x,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c<br/>index be137d4a9169..439bf5953885 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c</a></div><div class='hunk'>@@ -181,7 +181,6 @@ static void mlx5e_tls_complete_sync_skb(struct sk_buff *skb,</div><div class='ctx'> 	 */</div><div class='ctx'> 	nskb-&gt;ip_summed = CHECKSUM_PARTIAL;</div><div class='ctx'> </div><div class='del'>-	nskb-&gt;xmit_more = 1;</div><div class='ctx'> 	nskb-&gt;queue_mapping = skb-&gt;queue_mapping;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +247,7 @@ mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context_tx *context,</div><div class='ctx'> 	sq-&gt;stats-&gt;tls_resync_bytes += nskb-&gt;len;</div><div class='ctx'> 	mlx5e_tls_complete_sync_skb(skb, nskb, tcp_seq, headln,</div><div class='ctx'> 				    cpu_to_be64(info.rcd_sn));</div><div class='del'>-	mlx5e_sq_xmit(sq, nskb, *wqe, *pi);</div><div class='add'>+	mlx5e_sq_xmit(sq, nskb, *wqe, *pi, true);</div><div class='ctx'> 	mlx5e_sq_fetch_wqe(sq, wqe, pi);</div><div class='ctx'> 	return skb;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_common.c b/drivers/net/ethernet/mellanox/mlx5/core/en_common.c<br/>index 3078491cc0d0..1539cf3de5dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_common.c</a></div><div class='hunk'>@@ -45,7 +45,9 @@ int mlx5e_create_tir(struct mlx5_core_dev *mdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> 	list_add(&amp;tir-&gt;list, &amp;mdev-&gt;mlx5e_res.td.tirs_list);</div><div class='add'>+	mutex_unlock(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -53,8 +55,10 @@ int mlx5e_create_tir(struct mlx5_core_dev *mdev,</div><div class='ctx'> void mlx5e_destroy_tir(struct mlx5_core_dev *mdev,</div><div class='ctx'> 		       struct mlx5e_tir *tir)</div><div class='ctx'> {</div><div class='add'>+	mutex_lock(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> 	mlx5_core_destroy_tir(mdev, tir-&gt;tirn);</div><div class='ctx'> 	list_del(&amp;tir-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn,</div><div class='hunk'>@@ -114,6 +118,7 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mdev-&gt;mlx5e_res.td.tirs_list);</div><div class='add'>+	mutex_init(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -141,15 +146,17 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *mdev = priv-&gt;mdev;</div><div class='ctx'> 	struct mlx5e_tir *tir;</div><div class='del'>-	int err  = -ENOMEM;</div><div class='add'>+	int err  = 0;</div><div class='ctx'> 	u32 tirn = 0;</div><div class='ctx'> 	int inlen;</div><div class='ctx'> 	void *in;</div><div class='ctx'> </div><div class='ctx'> 	inlen = MLX5_ST_SZ_BYTES(modify_tir_in);</div><div class='ctx'> 	in = kvzalloc(inlen, GFP_KERNEL);</div><div class='del'>-	if (!in)</div><div class='add'>+	if (!in) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (enable_uc_lb)</div><div class='ctx'> 		MLX5_SET(modify_tir_in, in, ctx.self_lb_block,</div><div class='hunk'>@@ -157,6 +164,7 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb)</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(modify_tir_in, in, bitmask.self_lb_en, 1);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> 	list_for_each_entry(tir, &amp;mdev-&gt;mlx5e_res.td.tirs_list, list) {</div><div class='ctx'> 		tirn = tir-&gt;tirn;</div><div class='ctx'> 		err = mlx5_core_modify_tir(mdev, tirn, in, inlen);</div><div class='hunk'>@@ -168,6 +176,7 @@ out:</div><div class='ctx'> 	kvfree(in);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		netdev_err(priv-&gt;netdev, "refresh tir(0x%x) failed, %d\n", tirn, err);</div><div class='add'>+	mutex_unlock(&amp;mdev-&gt;mlx5e_res.td.list_lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c<br/>index a0987cc5fe4a..7efaa58ae034 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c</a></div><div class='hunk'>@@ -603,16 +603,18 @@ static void ptys2ethtool_supported_link(struct mlx5_core_dev *mdev,</div><div class='ctx'> 			  __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ptys2ethtool_adver_link(struct mlx5_core_dev *mdev,</div><div class='del'>-				    unsigned long *advertising_modes,</div><div class='del'>-				    u32 eth_proto_cap)</div><div class='add'>+static void ptys2ethtool_adver_link(unsigned long *advertising_modes,</div><div class='add'>+				    u32 eth_proto_cap, bool ext)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long proto_cap = eth_proto_cap;</div><div class='ctx'> 	struct ptys2ethtool_config *table;</div><div class='ctx'> 	u32 max_size;</div><div class='ctx'> 	int proto;</div><div class='ctx'> </div><div class='del'>-	mlx5e_ethtool_get_speed_arr(mdev, &amp;table, &amp;max_size);</div><div class='add'>+	table = ext ? ptys2ext_ethtool_table : ptys2legacy_ethtool_table;</div><div class='add'>+	max_size = ext ? ARRAY_SIZE(ptys2ext_ethtool_table) :</div><div class='add'>+			 ARRAY_SIZE(ptys2legacy_ethtool_table);</div><div class='add'>+</div><div class='ctx'> 	for_each_set_bit(proto, &amp;proto_cap, max_size)</div><div class='ctx'> 		bitmap_or(advertising_modes, advertising_modes,</div><div class='ctx'> 			  table[proto].advertised,</div><div class='hunk'>@@ -794,12 +796,12 @@ static void get_supported(struct mlx5_core_dev *mdev, u32 eth_proto_cap,</div><div class='ctx'> 	ethtool_link_ksettings_add_link_mode(link_ksettings, supported, Pause);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void get_advertising(struct mlx5_core_dev *mdev, u32 eth_proto_cap,</div><div class='del'>-			    u8 tx_pause, u8 rx_pause,</div><div class='del'>-			    struct ethtool_link_ksettings *link_ksettings)</div><div class='add'>+static void get_advertising(u32 eth_proto_cap, u8 tx_pause, u8 rx_pause,</div><div class='add'>+			    struct ethtool_link_ksettings *link_ksettings,</div><div class='add'>+			    bool ext)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *advertising = link_ksettings-&gt;link_modes.advertising;</div><div class='del'>-	ptys2ethtool_adver_link(mdev, advertising, eth_proto_cap);</div><div class='add'>+	ptys2ethtool_adver_link(advertising, eth_proto_cap, ext);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_pause)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(link_ksettings, advertising, Pause);</div><div class='hunk'>@@ -854,8 +856,9 @@ static void get_lp_advertising(struct mlx5_core_dev *mdev, u32 eth_proto_lp,</div><div class='ctx'> 			       struct ethtool_link_ksettings *link_ksettings)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *lp_advertising = link_ksettings-&gt;link_modes.lp_advertising;</div><div class='add'>+	bool ext = MLX5_CAP_PCAM_FEATURE(mdev, ptys_extended_ethernet);</div><div class='ctx'> </div><div class='del'>-	ptys2ethtool_adver_link(mdev, lp_advertising, eth_proto_lp);</div><div class='add'>+	ptys2ethtool_adver_link(lp_advertising, eth_proto_lp, ext);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx5e_ethtool_get_link_ksettings(struct mlx5e_priv *priv,</div><div class='hunk'>@@ -872,6 +875,7 @@ int mlx5e_ethtool_get_link_ksettings(struct mlx5e_priv *priv,</div><div class='ctx'> 	u8 an_disable_admin;</div><div class='ctx'> 	u8 an_status;</div><div class='ctx'> 	u8 connector_type;</div><div class='add'>+	bool admin_ext;</div><div class='ctx'> 	bool ext;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -886,6 +890,19 @@ int mlx5e_ethtool_get_link_ksettings(struct mlx5e_priv *priv,</div><div class='ctx'> 					      eth_proto_capability);</div><div class='ctx'> 	eth_proto_admin  = MLX5_GET_ETH_PROTO(ptys_reg, out, ext,</div><div class='ctx'> 					      eth_proto_admin);</div><div class='add'>+	/* Fields: eth_proto_admin and ext_eth_proto_admin  are</div><div class='add'>+	 * mutually exclusive. Hence try reading legacy advertising</div><div class='add'>+	 * when extended advertising is zero.</div><div class='add'>+	 * admin_ext indicates how eth_proto_admin should be</div><div class='add'>+	 * interpreted</div><div class='add'>+	 */</div><div class='add'>+	admin_ext = ext;</div><div class='add'>+	if (ext &amp;&amp; !eth_proto_admin) {</div><div class='add'>+		eth_proto_admin  = MLX5_GET_ETH_PROTO(ptys_reg, out, false,</div><div class='add'>+						      eth_proto_admin);</div><div class='add'>+		admin_ext = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	eth_proto_oper   = MLX5_GET_ETH_PROTO(ptys_reg, out, ext,</div><div class='ctx'> 					      eth_proto_oper);</div><div class='ctx'> 	eth_proto_lp	    = MLX5_GET(ptys_reg, out, eth_proto_lp_advertise);</div><div class='hunk'>@@ -899,7 +916,8 @@ int mlx5e_ethtool_get_link_ksettings(struct mlx5e_priv *priv,</div><div class='ctx'> 	ethtool_link_ksettings_zero_link_mode(link_ksettings, advertising);</div><div class='ctx'> </div><div class='ctx'> 	get_supported(mdev, eth_proto_cap, link_ksettings);</div><div class='del'>-	get_advertising(mdev, eth_proto_admin, tx_pause, rx_pause, link_ksettings);</div><div class='add'>+	get_advertising(eth_proto_admin, tx_pause, rx_pause, link_ksettings,</div><div class='add'>+			admin_ext);</div><div class='ctx'> 	get_speed_duplex(priv-&gt;netdev, eth_proto_oper, link_ksettings);</div><div class='ctx'> </div><div class='ctx'> 	eth_proto_oper = eth_proto_oper ? eth_proto_oper : eth_proto_cap;</div><div class='hunk'>@@ -997,19 +1015,17 @@ int mlx5e_ethtool_set_link_ksettings(struct mlx5e_priv *priv,</div><div class='ctx'> </div><div class='ctx'> #define MLX5E_PTYS_EXT ((1ULL &lt;&lt; ETHTOOL_LINK_MODE_50000baseKR_Full_BIT) - 1)</div><div class='ctx'> </div><div class='del'>-	ext_requested = (link_ksettings-&gt;link_modes.advertising[0] &gt;</div><div class='del'>-			MLX5E_PTYS_EXT);</div><div class='add'>+	ext_requested = !!(link_ksettings-&gt;link_modes.advertising[0] &gt;</div><div class='add'>+			MLX5E_PTYS_EXT ||</div><div class='add'>+			link_ksettings-&gt;link_modes.advertising[1]);</div><div class='ctx'> 	ext_supported = MLX5_CAP_PCAM_FEATURE(mdev, ptys_extended_ethernet);</div><div class='del'>-</div><div class='del'>-	/*when ptys_extended_ethernet is set legacy link modes are deprecated */</div><div class='del'>-	if (ext_requested != ext_supported)</div><div class='del'>-		return -EPROTONOSUPPORT;</div><div class='add'>+	ext_requested &amp;= ext_supported;</div><div class='ctx'> </div><div class='ctx'> 	speed = link_ksettings-&gt;base.speed;</div><div class='ctx'> 	ethtool2ptys_adver_func = ext_requested ?</div><div class='ctx'> 				  mlx5e_ethtool2ptys_ext_adver_link :</div><div class='ctx'> 				  mlx5e_ethtool2ptys_adver_link;</div><div class='del'>-	err = mlx5_port_query_eth_proto(mdev, 1, ext_supported, &amp;eproto);</div><div class='add'>+	err = mlx5_port_query_eth_proto(mdev, 1, ext_requested, &amp;eproto);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		netdev_err(priv-&gt;netdev, "%s: query port eth proto failed: %d\n",</div><div class='ctx'> 			   __func__, err);</div><div class='hunk'>@@ -1037,7 +1053,7 @@ int mlx5e_ethtool_set_link_ksettings(struct mlx5e_priv *priv,</div><div class='ctx'> 	if (!an_changes &amp;&amp; link_modes == eproto.admin)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mlx5_port_set_eth_ptys(mdev, an_disable, link_modes, ext_supported);</div><div class='add'>+	mlx5_port_set_eth_ptys(mdev, an_disable, link_modes, ext_requested);</div><div class='ctx'> 	mlx5_toggle_port_link(mdev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1545,7 +1561,7 @@ static int mlx5e_get_module_info(struct net_device *netdev,</div><div class='ctx'> 	struct mlx5e_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	struct mlx5_core_dev *dev = priv-&gt;mdev;</div><div class='ctx'> 	int size_read = 0;</div><div class='del'>-	u8 data[4];</div><div class='add'>+	u8 data[4] = {0};</div><div class='ctx'> </div><div class='ctx'> 	size_read = mlx5_query_module_eeprom(dev, 0, 2, data);</div><div class='ctx'> 	if (size_read &lt; 2)</div><div class='hunk'>@@ -1555,22 +1571,22 @@ static int mlx5e_get_module_info(struct net_device *netdev,</div><div class='ctx'> 	switch (data[0]) {</div><div class='ctx'> 	case MLX5_MODULE_ID_QSFP:</div><div class='ctx'> 		modinfo-&gt;type       = ETH_MODULE_SFF_8436;</div><div class='del'>-		modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8436_LEN;</div><div class='add'>+		modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8436_MAX_LEN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MLX5_MODULE_ID_QSFP_PLUS:</div><div class='ctx'> 	case MLX5_MODULE_ID_QSFP28:</div><div class='ctx'> 		/* data[1] = revision id */</div><div class='ctx'> 		if (data[0] == MLX5_MODULE_ID_QSFP28 || data[1] &gt;= 0x3) {</div><div class='ctx'> 			modinfo-&gt;type       = ETH_MODULE_SFF_8636;</div><div class='del'>-			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8636_LEN;</div><div class='add'>+			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8636_MAX_LEN;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			modinfo-&gt;type       = ETH_MODULE_SFF_8436;</div><div class='del'>-			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8436_LEN;</div><div class='add'>+			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8436_MAX_LEN;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MLX5_MODULE_ID_SFP:</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'>+		modinfo-&gt;eeprom_len = MLX5_EEPROM_PAGE_LENGTH;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(priv-&gt;netdev, "%s: cable type not recognized:0x%x\n",</div><div class='hunk'>@@ -1752,7 +1768,8 @@ static int set_pflag_rx_no_csum_complete(struct net_device *netdev, bool enable)</div><div class='ctx'> 	struct mlx5e_channel *c;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MLX5E_STATE_OPENED, &amp;priv-&gt;state))</div><div class='add'>+	if (!test_bit(MLX5E_STATE_OPENED, &amp;priv-&gt;state) ||</div><div class='add'>+	    priv-&gt;channels.params.xdp_prog)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; channels-&gt;num; i++) {</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c<br/>index b5fdbd3190d9..457cc39423f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_main.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;linux/mlx5/fs.h&gt;</div><div class='ctx'> #include &lt;net/vxlan.h&gt;</div><div class='add'>+#include &lt;net/geneve.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;net/page_pool.h&gt;</div><div class='hunk'>@@ -43,6 +44,7 @@</div><div class='ctx'> #include "en_rep.h"</div><div class='ctx'> #include "en_accel/ipsec.h"</div><div class='ctx'> #include "en_accel/ipsec_rxtx.h"</div><div class='add'>+#include "en_accel/en_accel.h"</div><div class='ctx'> #include "en_accel/tls.h"</div><div class='ctx'> #include "accel/ipsec.h"</div><div class='ctx'> #include "accel/tls.h"</div><div class='hunk'>@@ -53,6 +55,7 @@</div><div class='ctx'> #include "lib/eq.h"</div><div class='ctx'> #include "en/monitor_stats.h"</div><div class='ctx'> #include "en/reporter.h"</div><div class='add'>+#include "en/params.h"</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_rq_param {</div><div class='ctx'> 	u32			rqc[MLX5_ST_SZ_DW(rqc)];</div><div class='hunk'>@@ -101,108 +104,9 @@ bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mlx5e_rx_get_linear_frag_sz(struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	u16 hw_mtu = MLX5E_SW2HW_MTU(params, params-&gt;sw_mtu);</div><div class='del'>-	u16 linear_rq_headroom = params-&gt;xdp_prog ?</div><div class='del'>-		XDP_PACKET_HEADROOM : MLX5_RX_HEADROOM;</div><div class='del'>-	u32 frag_sz;</div><div class='del'>-</div><div class='del'>-	linear_rq_headroom += NET_IP_ALIGN;</div><div class='del'>-</div><div class='del'>-	frag_sz = MLX5_SKB_FRAG_SZ(linear_rq_headroom + hw_mtu);</div><div class='del'>-</div><div class='del'>-	if (params-&gt;xdp_prog &amp;&amp; frag_sz &lt; PAGE_SIZE)</div><div class='del'>-		frag_sz = PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-	return frag_sz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 mlx5e_mpwqe_log_pkts_per_wqe(struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	u32 linear_frag_sz = mlx5e_rx_get_linear_frag_sz(params);</div><div class='del'>-</div><div class='del'>-	return MLX5_MPWRQ_LOG_WQE_SZ - order_base_2(linear_frag_sz);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool mlx5e_rx_is_linear_skb(struct mlx5_core_dev *mdev,</div><div class='del'>-				   struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	u32 frag_sz = mlx5e_rx_get_linear_frag_sz(params);</div><div class='del'>-</div><div class='del'>-	return !params-&gt;lro_en &amp;&amp; frag_sz &lt;= PAGE_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MLX5_MAX_MPWQE_LOG_WQE_STRIDE_SZ ((BIT(__mlx5_bit_sz(wq, log_wqe_stride_size)) - 1) + \</div><div class='del'>-					  MLX5_MPWQE_LOG_STRIDE_SZ_BASE)</div><div class='del'>-static bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *mdev,</div><div class='del'>-					 struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	u32 frag_sz = mlx5e_rx_get_linear_frag_sz(params);</div><div class='del'>-	s8 signed_log_num_strides_param;</div><div class='del'>-	u8 log_num_strides;</div><div class='del'>-</div><div class='del'>-	if (!mlx5e_rx_is_linear_skb(mdev, params))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (order_base_2(frag_sz) &gt; MLX5_MAX_MPWQE_LOG_WQE_STRIDE_SZ)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (MLX5_CAP_GEN(mdev, ext_stride_num_range))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	log_num_strides = MLX5_MPWRQ_LOG_WQE_SZ - order_base_2(frag_sz);</div><div class='del'>-	signed_log_num_strides_param =</div><div class='del'>-		(s8)log_num_strides - MLX5_MPWQE_LOG_NUM_STRIDES_BASE;</div><div class='del'>-</div><div class='del'>-	return signed_log_num_strides_param &gt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	if (params-&gt;log_rq_mtu_frames &lt;</div><div class='del'>-	    mlx5e_mpwqe_log_pkts_per_wqe(params) + MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW)</div><div class='del'>-		return MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW;</div><div class='del'>-</div><div class='del'>-	return params-&gt;log_rq_mtu_frames - mlx5e_mpwqe_log_pkts_per_wqe(params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev,</div><div class='del'>-					  struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	if (mlx5e_rx_mpwqe_is_linear_skb(mdev, params))</div><div class='del'>-		return order_base_2(mlx5e_rx_get_linear_frag_sz(params));</div><div class='del'>-</div><div class='del'>-	return MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev,</div><div class='del'>-					  struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	return MLX5_MPWRQ_LOG_WQE_SZ -</div><div class='del'>-		mlx5e_mpwqe_get_log_stride_size(mdev, params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev,</div><div class='del'>-				 struct mlx5e_params *params)</div><div class='del'>-{</div><div class='del'>-	u16 linear_rq_headroom = params-&gt;xdp_prog ?</div><div class='del'>-		XDP_PACKET_HEADROOM : MLX5_RX_HEADROOM;</div><div class='del'>-	bool is_linear_skb;</div><div class='del'>-</div><div class='del'>-	linear_rq_headroom += NET_IP_ALIGN;</div><div class='del'>-</div><div class='del'>-	is_linear_skb = (params-&gt;rq_wq_type == MLX5_WQ_TYPE_CYCLIC) ?</div><div class='del'>-		mlx5e_rx_is_linear_skb(mdev, params) :</div><div class='del'>-		mlx5e_rx_mpwqe_is_linear_skb(mdev, params);</div><div class='del'>-</div><div class='del'>-	return is_linear_skb ? linear_rq_headroom : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev,</div><div class='ctx'> 			       struct mlx5e_params *params)</div><div class='ctx'> {</div><div class='del'>-	params-&gt;lro_wqe_sz = MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ;</div><div class='ctx'> 	params-&gt;log_rq_mtu_frames = is_kdump_kernel() ?</div><div class='ctx'> 		MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE :</div><div class='ctx'> 		MLX5E_PARAMS_DEFAULT_LOG_RQ_SIZE;</div><div class='hunk'>@@ -469,7 +373,6 @@ static void mlx5e_init_frags_partition(struct mlx5e_rq *rq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx5e_init_di_list(struct mlx5e_rq *rq,</div><div class='del'>-			      struct mlx5e_params *params,</div><div class='ctx'> 			      int wq_sz, int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int len = wq_sz &lt;&lt; rq-&gt;wqe.info.log_num_frags;</div><div class='hunk'>@@ -597,7 +500,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,</div><div class='ctx'> 			goto err_free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = mlx5e_init_di_list(rq, params, wq_sz, c-&gt;cpu);</div><div class='add'>+		err = mlx5e_init_di_list(rq, wq_sz, c-&gt;cpu);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_free;</div><div class='ctx'> 		rq-&gt;post_wqes = mlx5e_post_rx_wqes;</div><div class='hunk'>@@ -615,7 +518,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,</div><div class='ctx'> 			goto err_free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rq-&gt;wqe.skb_from_cqe = mlx5e_rx_is_linear_skb(mdev, params) ?</div><div class='add'>+		rq-&gt;wqe.skb_from_cqe = mlx5e_rx_is_linear_skb(params) ?</div><div class='ctx'> 			mlx5e_skb_from_cqe_linear :</div><div class='ctx'> 			mlx5e_skb_from_cqe_nonlinear;</div><div class='ctx'> 		rq-&gt;mkey_be = c-&gt;mkey_be;</div><div class='hunk'>@@ -902,10 +805,14 @@ static void mlx5e_free_rx_descs(struct mlx5e_rq *rq)</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {</div><div class='ctx'> 		struct mlx5_wq_ll *wq = &amp;rq-&gt;mpwqe.wq;</div><div class='add'>+		u16 head = wq-&gt;head;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-		/* UMR WQE (if in progress) is always at wq-&gt;head */</div><div class='del'>-		if (rq-&gt;mpwqe.umr_in_progress)</div><div class='del'>-			rq-&gt;dealloc_wqe(rq, wq-&gt;head);</div><div class='add'>+		/* Outstanding UMR WQEs (in progress) start at wq-&gt;head */</div><div class='add'>+		for (i = 0; i &lt; rq-&gt;mpwqe.umr_in_progress; i++) {</div><div class='add'>+			rq-&gt;dealloc_wqe(rq, head);</div><div class='add'>+			head = mlx5_wq_ll_get_wqe_next_ix(wq, head);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		while (!mlx5_wq_ll_is_empty(wq)) {</div><div class='ctx'> 			struct mlx5e_rx_wqe_ll *wqe;</div><div class='hunk'>@@ -951,7 +858,11 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,</div><div class='ctx'> 	if (params-&gt;rx_dim_enabled)</div><div class='ctx'> 		__set_bit(MLX5E_RQ_STATE_AM, &amp;c-&gt;rq.state);</div><div class='ctx'> </div><div class='del'>-	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE))</div><div class='add'>+	/* We disable csum_complete when XDP is enabled since</div><div class='add'>+	 * XDP programs might manipulate packets which will render</div><div class='add'>+	 * skb-&gt;checksum incorrect.</div><div class='add'>+	 */</div><div class='add'>+	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE) || c-&gt;xdp)</div><div class='ctx'> 		__set_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &amp;c-&gt;rq.state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -966,16 +877,8 @@ err_free_rq:</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_activate_rq(struct mlx5e_rq *rq)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5e_icosq *sq = &amp;rq-&gt;channel-&gt;icosq;</div><div class='del'>-	struct mlx5_wq_cyc *wq = &amp;sq-&gt;wq;</div><div class='del'>-	struct mlx5e_tx_wqe *nopwqe;</div><div class='del'>-</div><div class='del'>-	u16 pi = mlx5_wq_cyc_ctr2ix(wq, sq-&gt;pc);</div><div class='del'>-</div><div class='ctx'> 	set_bit(MLX5E_RQ_STATE_ENABLED, &amp;rq-&gt;state);</div><div class='del'>-	sq-&gt;db.ico_wqe[pi].opcode     = MLX5_OPCODE_NOP;</div><div class='del'>-	nopwqe = mlx5e_post_nop(wq, sq-&gt;sqn, &amp;sq-&gt;pc);</div><div class='del'>-	mlx5e_notify_hw(wq, sq-&gt;pc, sq-&gt;uar_map, &amp;nopwqe-&gt;ctrl);</div><div class='add'>+	mlx5e_trigger_irq(&amp;rq-&gt;channel-&gt;icosq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_deactivate_rq(struct mlx5e_rq *rq)</div><div class='hunk'>@@ -1087,7 +990,7 @@ static void mlx5e_free_icosq_db(struct mlx5e_icosq *sq)</div><div class='ctx'> </div><div class='ctx'> static int mlx5e_alloc_icosq_db(struct mlx5e_icosq *sq, int numa)</div><div class='ctx'> {</div><div class='del'>-	u8 wq_sz = mlx5_wq_cyc_get_size(&amp;sq-&gt;wq);</div><div class='add'>+	int wq_sz = mlx5_wq_cyc_get_size(&amp;sq-&gt;wq);</div><div class='ctx'> </div><div class='ctx'> 	sq-&gt;db.ico_wqe = kvzalloc_node(array_size(wq_sz,</div><div class='ctx'> 						  sizeof(*sq-&gt;db.ico_wqe)),</div><div class='hunk'>@@ -1523,7 +1426,7 @@ static int mlx5e_open_xdpsq(struct mlx5e_channel *c,</div><div class='ctx'> 			dseg-&gt;lkey = sq-&gt;mkey_be;</div><div class='ctx'> </div><div class='ctx'> 			wi-&gt;num_wqebbs = 1;</div><div class='del'>-			wi-&gt;num_ds     = 1;</div><div class='add'>+			wi-&gt;num_pkts   = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1891,7 +1794,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,</div><div class='ctx'> 	c-&gt;tstamp   = &amp;priv-&gt;tstamp;</div><div class='ctx'> 	c-&gt;ix       = ix;</div><div class='ctx'> 	c-&gt;cpu      = cpu;</div><div class='del'>-	c-&gt;pdev     = &amp;priv-&gt;mdev-&gt;pdev-&gt;dev;</div><div class='add'>+	c-&gt;pdev     = priv-&gt;mdev-&gt;device;</div><div class='ctx'> 	c-&gt;netdev   = priv-&gt;netdev;</div><div class='ctx'> 	c-&gt;mkey_be  = cpu_to_be32(priv-&gt;mdev-&gt;mlx5e_res.mkey.key);</div><div class='ctx'> 	c-&gt;num_tc   = params-&gt;num_tc;</div><div class='hunk'>@@ -2049,7 +1952,7 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev,</div><div class='ctx'> 		byte_count += MLX5E_METADATA_ETHER_LEN;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (mlx5e_rx_is_linear_skb(mdev, params)) {</div><div class='add'>+	if (mlx5e_rx_is_linear_skb(params)) {</div><div class='ctx'> 		int frag_stride;</div><div class='ctx'> </div><div class='ctx'> 		frag_stride = mlx5e_rx_get_linear_frag_sz(params);</div><div class='hunk'>@@ -2103,6 +2006,13 @@ static inline u8 mlx5e_get_rqwq_log_stride(u8 wq_type, int ndsegs)</div><div class='ctx'> 	return order_base_2(sz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 mlx5e_get_rq_log_wq_sz(void *rqc)</div><div class='add'>+{</div><div class='add'>+	void *wq = MLX5_ADDR_OF(rqc, rqc, wq);</div><div class='add'>+</div><div class='add'>+	return MLX5_GET(wq, wq, log_wq_sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mlx5e_build_rq_param(struct mlx5e_priv *priv,</div><div class='ctx'> 				 struct mlx5e_params *params,</div><div class='ctx'> 				 struct mlx5e_rq_param *param)</div><div class='hunk'>@@ -2137,7 +2047,7 @@ static void mlx5e_build_rq_param(struct mlx5e_priv *priv,</div><div class='ctx'> 	MLX5_SET(rqc, rqc, vsd,            params-&gt;vlan_strip_disable);</div><div class='ctx'> 	MLX5_SET(rqc, rqc, scatter_fcs,    params-&gt;scatter_fcs_en);</div><div class='ctx'> </div><div class='del'>-	param-&gt;wq.buf_numa_node = dev_to_node(&amp;mdev-&gt;pdev-&gt;dev);</div><div class='add'>+	param-&gt;wq.buf_numa_node = dev_to_node(mdev-&gt;device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_build_drop_rq_param(struct mlx5e_priv *priv,</div><div class='hunk'>@@ -2152,7 +2062,7 @@ static void mlx5e_build_drop_rq_param(struct mlx5e_priv *priv,</div><div class='ctx'> 		 mlx5e_get_rqwq_log_stride(MLX5_WQ_TYPE_CYCLIC, 1));</div><div class='ctx'> 	MLX5_SET(rqc, rqc, counter_set_id, priv-&gt;drop_rq_q_counter);</div><div class='ctx'> </div><div class='del'>-	param-&gt;wq.buf_numa_node = dev_to_node(&amp;mdev-&gt;pdev-&gt;dev);</div><div class='add'>+	param-&gt;wq.buf_numa_node = dev_to_node(mdev-&gt;device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_build_sq_param_common(struct mlx5e_priv *priv,</div><div class='hunk'>@@ -2164,7 +2074,7 @@ static void mlx5e_build_sq_param_common(struct mlx5e_priv *priv,</div><div class='ctx'> 	MLX5_SET(wq, wq, log_wq_stride, ilog2(MLX5_SEND_WQE_BB));</div><div class='ctx'> 	MLX5_SET(wq, wq, pd,            priv-&gt;mdev-&gt;mlx5e_res.pdn);</div><div class='ctx'> </div><div class='del'>-	param-&gt;wq.buf_numa_node = dev_to_node(&amp;priv-&gt;mdev-&gt;pdev-&gt;dev);</div><div class='add'>+	param-&gt;wq.buf_numa_node = dev_to_node(priv-&gt;mdev-&gt;device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_build_sq_param(struct mlx5e_priv *priv,</div><div class='hunk'>@@ -2173,10 +2083,13 @@ static void mlx5e_build_sq_param(struct mlx5e_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> 	void *sqc = param-&gt;sqc;</div><div class='ctx'> 	void *wq = MLX5_ADDR_OF(sqc, sqc, wq);</div><div class='add'>+	bool allow_swp;</div><div class='ctx'> </div><div class='add'>+	allow_swp = mlx5_geneve_tx_allowed(priv-&gt;mdev) ||</div><div class='add'>+		    !!MLX5_IPSEC_DEV(priv-&gt;mdev);</div><div class='ctx'> 	mlx5e_build_sq_param_common(priv, param);</div><div class='ctx'> 	MLX5_SET(wq, wq, log_wq_sz, params-&gt;log_sq_size);</div><div class='del'>-	MLX5_SET(sqc, sqc, allow_swp, !!MLX5_IPSEC_DEV(priv-&gt;mdev));</div><div class='add'>+	MLX5_SET(sqc, sqc, allow_swp, allow_swp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_build_common_cq_param(struct mlx5e_priv *priv,</div><div class='hunk'>@@ -2266,13 +2179,28 @@ static void mlx5e_build_xdpsq_param(struct mlx5e_priv *priv,</div><div class='ctx'> 	param-&gt;is_mpw = MLX5E_GET_PFLAG(params, MLX5E_PFLAG_XDP_TX_MPWQE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 mlx5e_build_icosq_log_wq_sz(struct mlx5e_params *params,</div><div class='add'>+				      struct mlx5e_rq_param *rqp)</div><div class='add'>+{</div><div class='add'>+	switch (params-&gt;rq_wq_type) {</div><div class='add'>+	case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ:</div><div class='add'>+		return order_base_2(MLX5E_UMR_WQEBBS) +</div><div class='add'>+			mlx5e_get_rq_log_wq_sz(rqp-&gt;rqc);</div><div class='add'>+	default: /* MLX5_WQ_TYPE_CYCLIC */</div><div class='add'>+		return MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mlx5e_build_channel_param(struct mlx5e_priv *priv,</div><div class='ctx'> 				      struct mlx5e_params *params,</div><div class='ctx'> 				      struct mlx5e_channel_param *cparam)</div><div class='ctx'> {</div><div class='del'>-	u8 icosq_log_wq_sz = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;</div><div class='add'>+	u8 icosq_log_wq_sz;</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_build_rq_param(priv, params, &amp;cparam-&gt;rq);</div><div class='add'>+</div><div class='add'>+	icosq_log_wq_sz = mlx5e_build_icosq_log_wq_sz(params, &amp;cparam-&gt;rq);</div><div class='add'>+</div><div class='ctx'> 	mlx5e_build_sq_param(priv, params, &amp;cparam-&gt;sq);</div><div class='ctx'> 	mlx5e_build_xdpsq_param(priv, params, &amp;cparam-&gt;xdp_sq);</div><div class='ctx'> 	mlx5e_build_icosq_param(priv, icosq_log_wq_sz, &amp;cparam-&gt;icosq);</div><div class='hunk'>@@ -2328,14 +2256,18 @@ static void mlx5e_activate_channels(struct mlx5e_channels *chs)</div><div class='ctx'> 		mlx5e_activate_channel(chs-&gt;c[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MLX5E_RQ_WQES_TIMEOUT 20000 /* msecs */</div><div class='add'>+</div><div class='ctx'> static int mlx5e_wait_channels_min_rx_wqes(struct mlx5e_channels *chs)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; chs-&gt;num; i++)</div><div class='del'>-		err |= mlx5e_wait_for_min_rx_wqes(&amp;chs-&gt;c[i]-&gt;rq,</div><div class='del'>-						  err ? 0 : 20000);</div><div class='add'>+	for (i = 0; i &lt; chs-&gt;num; i++) {</div><div class='add'>+		int timeout = err ? 0 : MLX5E_RQ_WQES_TIMEOUT;</div><div class='add'>+</div><div class='add'>+		err |= mlx5e_wait_for_min_rx_wqes(&amp;chs-&gt;c[i]-&gt;rq, timeout);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err ? -ETIMEDOUT : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2632,7 +2564,7 @@ static void mlx5e_build_tir_ctx_lro(struct mlx5e_params *params, void *tirc)</div><div class='ctx'> 		 MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO |</div><div class='ctx'> 		 MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO);</div><div class='ctx'> 	MLX5_SET(tirc, tirc, lro_max_ip_payload_size,</div><div class='del'>-		 (params-&gt;lro_wqe_sz - ROUGH_MAX_L2_L3_HDR_SZ) &gt;&gt; 8);</div><div class='add'>+		 (MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ - ROUGH_MAX_L2_L3_HDR_SZ) &gt;&gt; 8);</div><div class='ctx'> 	MLX5_SET(tirc, tirc, lro_timeout_period_usecs, params-&gt;lro_timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2742,22 +2674,6 @@ free_in:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mlx5e_build_inner_indir_tir_ctx(struct mlx5e_priv *priv,</div><div class='del'>-					    enum mlx5e_traffic_types tt,</div><div class='del'>-					    u32 *tirc)</div><div class='del'>-{</div><div class='del'>-	MLX5_SET(tirc, tirc, transport_domain, priv-&gt;mdev-&gt;mlx5e_res.td.tdn);</div><div class='del'>-</div><div class='del'>-	mlx5e_build_tir_ctx_lro(&amp;priv-&gt;channels.params, tirc);</div><div class='del'>-</div><div class='del'>-	MLX5_SET(tirc, tirc, disp_type, MLX5_TIRC_DISP_TYPE_INDIRECT);</div><div class='del'>-	MLX5_SET(tirc, tirc, indirect_table, priv-&gt;indir_rqt.rqtn);</div><div class='del'>-	MLX5_SET(tirc, tirc, tunneled_offload_en, 0x1);</div><div class='del'>-</div><div class='del'>-	mlx5e_build_indir_tir_ctx_hash(&amp;priv-&gt;rss_params,</div><div class='del'>-				       &amp;tirc_default_config[tt], tirc, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mlx5e_set_mtu(struct mlx5_core_dev *mdev,</div><div class='ctx'> 			 struct mlx5e_params *params, u16 mtu)</div><div class='ctx'> {</div><div class='hunk'>@@ -2807,6 +2723,21 @@ int mlx5e_set_dev_port_mtu(struct mlx5e_priv *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mlx5e_params *params = &amp;priv-&gt;channels.params;</div><div class='add'>+	struct net_device *netdev   = priv-&gt;netdev;</div><div class='add'>+	struct mlx5_core_dev *mdev  = priv-&gt;mdev;</div><div class='add'>+	u16 max_mtu;</div><div class='add'>+</div><div class='add'>+	/* MTU range: 68 - hw-specific max */</div><div class='add'>+	netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='add'>+</div><div class='add'>+	mlx5_query_port_max_mtu(mdev, &amp;max_mtu, 1);</div><div class='add'>+	netdev-&gt;max_mtu = min_t(unsigned int, MLX5E_HW2SW_MTU(params, max_mtu),</div><div class='add'>+				ETH_MAX_MTU);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mlx5e_netdev_set_tcs(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_priv *priv = netdev_priv(netdev);</div><div class='hunk'>@@ -2937,6 +2868,14 @@ int mlx5e_safe_switch_channels(struct mlx5e_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mlx5e_safe_reopen_channels(struct mlx5e_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mlx5e_channels new_channels = {};</div><div class='add'>+</div><div class='add'>+	new_channels.params = priv-&gt;channels.params;</div><div class='add'>+	return mlx5e_safe_switch_channels(priv, &amp;new_channels, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mlx5e_timestamp_init(struct mlx5e_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	priv-&gt;tstamp.tx_type   = HWTSTAMP_TX_OFF;</div><div class='hunk'>@@ -3046,8 +2985,8 @@ static int mlx5e_alloc_drop_cq(struct mlx5_core_dev *mdev,</div><div class='ctx'> 			       struct mlx5e_cq *cq,</div><div class='ctx'> 			       struct mlx5e_cq_param *param)</div><div class='ctx'> {</div><div class='del'>-	param-&gt;wq.buf_numa_node = dev_to_node(&amp;mdev-&gt;pdev-&gt;dev);</div><div class='del'>-	param-&gt;wq.db_numa_node  = dev_to_node(&amp;mdev-&gt;pdev-&gt;dev);</div><div class='add'>+	param-&gt;wq.buf_numa_node = dev_to_node(mdev-&gt;device);</div><div class='add'>+	param-&gt;wq.db_numa_node  = dev_to_node(mdev-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	return mlx5e_alloc_cq_common(mdev, param, cq);</div><div class='ctx'> }</div><div class='hunk'>@@ -3155,32 +3094,42 @@ static void mlx5e_cleanup_nic_tx(struct mlx5e_priv *priv)</div><div class='ctx'> 		mlx5e_destroy_tis(priv-&gt;mdev, priv-&gt;tisn[tc]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mlx5e_build_indir_tir_ctx(struct mlx5e_priv *priv,</div><div class='del'>-				      enum mlx5e_traffic_types tt,</div><div class='del'>-				      u32 *tirc)</div><div class='add'>+static void mlx5e_build_indir_tir_ctx_common(struct mlx5e_priv *priv,</div><div class='add'>+					     u32 rqtn, u32 *tirc)</div><div class='ctx'> {</div><div class='ctx'> 	MLX5_SET(tirc, tirc, transport_domain, priv-&gt;mdev-&gt;mlx5e_res.td.tdn);</div><div class='add'>+	MLX5_SET(tirc, tirc, disp_type, MLX5_TIRC_DISP_TYPE_INDIRECT);</div><div class='add'>+	MLX5_SET(tirc, tirc, indirect_table, rqtn);</div><div class='add'>+	MLX5_SET(tirc, tirc, tunneled_offload_en,</div><div class='add'>+		 priv-&gt;channels.params.tunneled_offload_en);</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_build_tir_ctx_lro(&amp;priv-&gt;channels.params, tirc);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	MLX5_SET(tirc, tirc, disp_type, MLX5_TIRC_DISP_TYPE_INDIRECT);</div><div class='del'>-	MLX5_SET(tirc, tirc, indirect_table, priv-&gt;indir_rqt.rqtn);</div><div class='del'>-</div><div class='add'>+static void mlx5e_build_indir_tir_ctx(struct mlx5e_priv *priv,</div><div class='add'>+				      enum mlx5e_traffic_types tt,</div><div class='add'>+				      u32 *tirc)</div><div class='add'>+{</div><div class='add'>+	mlx5e_build_indir_tir_ctx_common(priv, priv-&gt;indir_rqt.rqtn, tirc);</div><div class='ctx'> 	mlx5e_build_indir_tir_ctx_hash(&amp;priv-&gt;rss_params,</div><div class='ctx'> 				       &amp;tirc_default_config[tt], tirc, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_build_direct_tir_ctx(struct mlx5e_priv *priv, u32 rqtn, u32 *tirc)</div><div class='ctx'> {</div><div class='del'>-	MLX5_SET(tirc, tirc, transport_domain, priv-&gt;mdev-&gt;mlx5e_res.td.tdn);</div><div class='del'>-</div><div class='del'>-	mlx5e_build_tir_ctx_lro(&amp;priv-&gt;channels.params, tirc);</div><div class='del'>-</div><div class='del'>-	MLX5_SET(tirc, tirc, disp_type, MLX5_TIRC_DISP_TYPE_INDIRECT);</div><div class='del'>-	MLX5_SET(tirc, tirc, indirect_table, rqtn);</div><div class='add'>+	mlx5e_build_indir_tir_ctx_common(priv, rqtn, tirc);</div><div class='ctx'> 	MLX5_SET(tirc, tirc, rx_hash_fn, MLX5_RX_HASH_FN_INVERTED_XOR8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mlx5e_build_inner_indir_tir_ctx(struct mlx5e_priv *priv,</div><div class='add'>+					    enum mlx5e_traffic_types tt,</div><div class='add'>+					    u32 *tirc)</div><div class='add'>+{</div><div class='add'>+	mlx5e_build_indir_tir_ctx_common(priv, priv-&gt;indir_rqt.rqtn, tirc);</div><div class='add'>+	mlx5e_build_indir_tir_ctx_hash(&amp;priv-&gt;rss_params,</div><div class='add'>+				       &amp;tirc_default_config[tt], tirc, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_tir *tir;</div><div class='hunk'>@@ -3763,9 +3712,9 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu,</div><div class='ctx'> 	new_channels.params.sw_mtu = new_mtu;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;xdp_prog &amp;&amp;</div><div class='del'>-	    !mlx5e_rx_is_linear_skb(priv-&gt;mdev, &amp;new_channels.params)) {</div><div class='add'>+	    !mlx5e_rx_is_linear_skb(&amp;new_channels.params)) {</div><div class='ctx'> 		netdev_err(netdev, "MTU(%d) &gt; %d is not allowed while XDP enabled\n",</div><div class='del'>-			   new_mtu, MLX5E_XDP_MAX_MTU);</div><div class='add'>+			   new_mtu, mlx5e_xdp_max_mtu(params));</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4103,6 +4052,12 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv,</div><div class='ctx'> 		/* Verify if UDP port is being offloaded by HW */</div><div class='ctx'> 		if (mlx5_vxlan_lookup_port(priv-&gt;mdev-&gt;vxlan, port))</div><div class='ctx'> 			return features;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_GENEVE)</div><div class='add'>+		/* Support Geneve offload for default UDP port */</div><div class='add'>+		if (port == GENEVE_UDP_PORT &amp;&amp; mlx5_geneve_tx_allowed(priv-&gt;mdev))</div><div class='add'>+			return features;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -4161,11 +4116,10 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)</div><div class='ctx'> 	if (!report_failed)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	mlx5e_close_locked(priv-&gt;netdev);</div><div class='del'>-	err = mlx5e_open_locked(priv-&gt;netdev);</div><div class='add'>+	err = mlx5e_safe_reopen_channels(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		netdev_err(priv-&gt;netdev,</div><div class='del'>-			   "mlx5e_open_locked failed recovering from a tx_timeout, err(%d).\n",</div><div class='add'>+			   "mlx5e_safe_reopen_channels failed recovering from a tx_timeout, err(%d).\n",</div><div class='ctx'> 			   err);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='hunk'>@@ -4199,9 +4153,10 @@ static int mlx5e_xdp_allowed(struct mlx5e_priv *priv, struct bpf_prog *prog)</div><div class='ctx'> 	new_channels.params = priv-&gt;channels.params;</div><div class='ctx'> 	new_channels.params.xdp_prog = prog;</div><div class='ctx'> </div><div class='del'>-	if (!mlx5e_rx_is_linear_skb(priv-&gt;mdev, &amp;new_channels.params)) {</div><div class='add'>+	if (!mlx5e_rx_is_linear_skb(&amp;new_channels.params)) {</div><div class='ctx'> 		netdev_warn(netdev, "XDP is not allowed with MTU(%d) &gt; %d\n",</div><div class='del'>-			    new_channels.params.sw_mtu, MLX5E_XDP_MAX_MTU);</div><div class='add'>+			    new_channels.params.sw_mtu,</div><div class='add'>+			    mlx5e_xdp_max_mtu(&amp;new_channels.params));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4252,7 +4207,7 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog)</div><div class='ctx'> 		mlx5e_set_rq_type(priv-&gt;mdev, &amp;priv-&gt;channels.params);</div><div class='ctx'> </div><div class='ctx'> 	if (was_opened &amp;&amp; reset)</div><div class='del'>-		mlx5e_open_locked(netdev);</div><div class='add'>+		err = mlx5e_open_locked(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MLX5E_STATE_OPENED, &amp;priv-&gt;state) || reset)</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -4542,7 +4497,7 @@ void mlx5e_build_rq_params(struct mlx5_core_dev *mdev,</div><div class='ctx'> 	if (!slow_pci_heuristic(mdev) &amp;&amp;</div><div class='ctx'> 	    mlx5e_striding_rq_possible(mdev, params) &amp;&amp;</div><div class='ctx'> 	    (mlx5e_rx_mpwqe_is_linear_skb(mdev, params) ||</div><div class='del'>-	     !mlx5e_rx_is_linear_skb(mdev, params)))</div><div class='add'>+	     !mlx5e_rx_is_linear_skb(params)))</div><div class='ctx'> 		MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_STRIDING_RQ, true);</div><div class='ctx'> 	mlx5e_set_rq_type(mdev, params);</div><div class='ctx'> 	mlx5e_init_rq_type_params(mdev, params);</div><div class='hunk'>@@ -4553,7 +4508,7 @@ void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,</div><div class='ctx'> {</div><div class='ctx'> 	enum mlx5e_traffic_types tt;</div><div class='ctx'> </div><div class='del'>-	rss_params-&gt;hfunc = ETH_RSS_HASH_XOR;</div><div class='add'>+	rss_params-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='ctx'> 	netdev_rss_key_fill(rss_params-&gt;toeplitz_hash_key,</div><div class='ctx'> 			    sizeof(rss_params-&gt;toeplitz_hash_key));</div><div class='ctx'> 	mlx5e_build_default_indir_rqt(rss_params-&gt;indirection_rqt,</div><div class='hunk'>@@ -4618,6 +4573,8 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,</div><div class='ctx'> </div><div class='ctx'> 	/* RSS */</div><div class='ctx'> 	mlx5e_build_rss_params(rss_params, params-&gt;num_channels);</div><div class='add'>+	params-&gt;tunneled_offload_en =</div><div class='add'>+		mlx5e_tunnel_inner_ft_supported(mdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_set_netdev_dev_addr(struct net_device *netdev)</div><div class='hunk'>@@ -4639,7 +4596,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)</div><div class='ctx'> 	bool fcs_supported;</div><div class='ctx'> 	bool fcs_enabled;</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(netdev, &amp;mdev-&gt;pdev-&gt;dev);</div><div class='add'>+	SET_NETDEV_DEV(netdev, mdev-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;mlx5e_netdev_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -4674,7 +4631,8 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)</div><div class='ctx'> 	netdev-&gt;hw_features      |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='ctx'> 	netdev-&gt;hw_features      |= NETIF_F_HW_VLAN_STAG_TX;</div><div class='ctx'> </div><div class='del'>-	if (mlx5_vxlan_allowed(mdev-&gt;vxlan) || MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {</div><div class='add'>+	if (mlx5_vxlan_allowed(mdev-&gt;vxlan) || mlx5_geneve_tx_allowed(mdev) ||</div><div class='add'>+	    MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {</div><div class='ctx'> 		netdev-&gt;hw_enc_features |= NETIF_F_IP_CSUM;</div><div class='ctx'> 		netdev-&gt;hw_enc_features |= NETIF_F_IPV6_CSUM;</div><div class='ctx'> 		netdev-&gt;hw_enc_features |= NETIF_F_TSO;</div><div class='hunk'>@@ -4682,7 +4640,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)</div><div class='ctx'> 		netdev-&gt;hw_enc_features |= NETIF_F_GSO_PARTIAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mlx5_vxlan_allowed(mdev-&gt;vxlan)) {</div><div class='add'>+	if (mlx5_vxlan_allowed(mdev-&gt;vxlan) || mlx5_geneve_tx_allowed(mdev)) {</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'> 		netdev-&gt;hw_enc_features |= NETIF_F_GSO_UDP_TUNNEL |</div><div class='hunk'>@@ -4901,7 +4859,6 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = priv-&gt;netdev;</div><div class='ctx'> 	struct mlx5_core_dev *mdev = priv-&gt;mdev;</div><div class='del'>-	u16 max_mtu;</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_init_l2_addr(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -4909,10 +4866,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)</div><div class='ctx'> 	if (!netif_running(netdev))</div><div class='ctx'> 		mlx5_set_port_admin_status(mdev, MLX5_PORT_DOWN);</div><div class='ctx'> </div><div class='del'>-	/* MTU range: 68 - hw-specific max */</div><div class='del'>-	netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='del'>-	mlx5_query_port_max_mtu(priv-&gt;mdev, &amp;max_mtu, 1);</div><div class='del'>-	netdev-&gt;max_mtu = MLX5E_HW2SW_MTU(&amp;priv-&gt;channels.params, max_mtu);</div><div class='add'>+	mlx5e_set_netdev_mtu_boundaries(priv);</div><div class='ctx'> 	mlx5e_set_dev_port_mtu(priv);</div><div class='ctx'> </div><div class='ctx'> 	mlx5_lag_add(mdev, netdev);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c<br/>index a66b6ed80b30..91e24f1cead8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_rep.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_rep.c</a></div><div class='hunk'>@@ -795,7 +795,8 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb,</div><div class='ctx'> 	struct mlx5e_priv *priv = netdev_priv(rpriv-&gt;netdev);</div><div class='ctx'> 	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);</div><div class='ctx'> </div><div class='del'>-	if (!mlx5e_tc_tun_device_to_offload(priv, netdev))</div><div class='add'>+	if (!mlx5e_tc_tun_device_to_offload(priv, netdev) &amp;&amp;</div><div class='add'>+	    !is_vlan_dev(netdev))</div><div class='ctx'> 		return NOTIFY_OK;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='hunk'>@@ -1374,6 +1375,7 @@ static void mlx5e_build_rep_params(struct net_device *netdev)</div><div class='ctx'> 	mlx5e_set_rx_cq_mode_params(params, cq_period_mode);</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;num_tc                = 1;</div><div class='add'>+	params-&gt;tunneled_offload_en = false;</div><div class='ctx'> </div><div class='ctx'> 	mlx5_query_min_inline(mdev, &amp;params-&gt;tx_min_inline_mode);</div><div class='ctx'> </div><div class='hunk'>@@ -1389,7 +1391,7 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev)</div><div class='ctx'> 	struct mlx5_core_dev *mdev = priv-&gt;mdev;</div><div class='ctx'> </div><div class='ctx'> 	if (rep-&gt;vport == MLX5_VPORT_UPLINK) {</div><div class='del'>-		SET_NETDEV_DEV(netdev, &amp;priv-&gt;mdev-&gt;pdev-&gt;dev);</div><div class='add'>+		SET_NETDEV_DEV(netdev, mdev-&gt;device);</div><div class='ctx'> 		netdev-&gt;netdev_ops = &amp;mlx5e_netdev_ops_uplink_rep;</div><div class='ctx'> 		/* we want a persistent mac for the uplink rep */</div><div class='ctx'> 		mlx5_query_nic_vport_mac_address(mdev, 0, netdev-&gt;dev_addr);</div><div class='hunk'>@@ -1623,13 +1625,7 @@ static void mlx5e_cleanup_rep_tx(struct mlx5e_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_vf_rep_enable(struct mlx5e_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = priv-&gt;netdev;</div><div class='del'>-	struct mlx5_core_dev *mdev = priv-&gt;mdev;</div><div class='del'>-	u16 max_mtu;</div><div class='del'>-</div><div class='del'>-	netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='del'>-	mlx5_query_port_max_mtu(mdev, &amp;max_mtu, 1);</div><div class='del'>-	netdev-&gt;max_mtu = MLX5E_HW2SW_MTU(&amp;priv-&gt;channels.params, max_mtu);</div><div class='add'>+	mlx5e_set_netdev_mtu_boundaries(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int uplink_rep_async_event(struct notifier_block *nb, unsigned long event, void *data)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c<br/>index 3dde5c7e0739..13133e7f088e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_rx.c</a></div><div class='hunk'>@@ -409,14 +409,15 @@ mlx5e_free_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi, bool recycle</div><div class='ctx'> 			mlx5e_page_release(rq, &amp;dma_info[i], recycle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mlx5e_post_rx_mpwqe(struct mlx5e_rq *rq)</div><div class='add'>+static void mlx5e_post_rx_mpwqe(struct mlx5e_rq *rq, u8 n)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_wq_ll *wq = &amp;rq-&gt;mpwqe.wq;</div><div class='del'>-	struct mlx5e_rx_wqe_ll *wqe = mlx5_wq_ll_get_wqe(wq, wq-&gt;head);</div><div class='ctx'> </div><div class='del'>-	rq-&gt;mpwqe.umr_in_progress = false;</div><div class='add'>+	do {</div><div class='add'>+		u16 next_wqe_index = mlx5_wq_ll_get_wqe_next_ix(wq, wq-&gt;head);</div><div class='ctx'> </div><div class='del'>-	mlx5_wq_ll_push(wq, be16_to_cpu(wqe-&gt;next.next_wqe_index));</div><div class='add'>+		mlx5_wq_ll_push(wq, next_wqe_index);</div><div class='add'>+	} while (--n);</div><div class='ctx'> </div><div class='ctx'> 	/* ensure wqes are visible to device before updating doorbell record */</div><div class='ctx'> 	dma_wmb();</div><div class='hunk'>@@ -426,7 +427,7 @@ static void mlx5e_post_rx_mpwqe(struct mlx5e_rq *rq)</div><div class='ctx'> </div><div class='ctx'> static inline u16 mlx5e_icosq_wrap_cnt(struct mlx5e_icosq *sq)</div><div class='ctx'> {</div><div class='del'>-	return sq-&gt;pc &gt;&gt; MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;</div><div class='add'>+	return mlx5_wq_cyc_get_ctr_wrap_cnt(&amp;sq-&gt;wq, sq-&gt;pc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mlx5e_fill_icosq_frag_edge(struct mlx5e_icosq *sq,</div><div class='hunk'>@@ -478,8 +479,6 @@ static int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)</div><div class='ctx'> 	bitmap_zero(wi-&gt;xdp_xmit_bitmap, MLX5_MPWRQ_PAGES_PER_WQE);</div><div class='ctx'> 	wi-&gt;consumed_strides = 0;</div><div class='ctx'> </div><div class='del'>-	rq-&gt;mpwqe.umr_in_progress = true;</div><div class='del'>-</div><div class='ctx'> 	umr_wqe-&gt;ctrl.opmod_idx_opcode =</div><div class='ctx'> 		cpu_to_be32((sq-&gt;pc &lt;&lt; MLX5_WQE_CTRL_WQE_INDEX_SHIFT) |</div><div class='ctx'> 			    MLX5_OPCODE_UMR);</div><div class='hunk'>@@ -487,7 +486,8 @@ static int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)</div><div class='ctx'> </div><div class='ctx'> 	sq-&gt;db.ico_wqe[pi].opcode = MLX5_OPCODE_UMR;</div><div class='ctx'> 	sq-&gt;pc += MLX5E_UMR_WQEBBS;</div><div class='del'>-	mlx5e_notify_hw(wq, sq-&gt;pc, sq-&gt;uar_map, &amp;umr_wqe-&gt;ctrl);</div><div class='add'>+</div><div class='add'>+	sq-&gt;doorbell_cseg = &amp;umr_wqe-&gt;ctrl;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -542,37 +542,13 @@ bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq)</div><div class='ctx'> 	return !!err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mlx5e_poll_ico_single_cqe(struct mlx5e_cq *cq,</div><div class='del'>-					     struct mlx5e_icosq *sq,</div><div class='del'>-					     struct mlx5e_rq *rq,</div><div class='del'>-					     struct mlx5_cqe64 *cqe)</div><div class='del'>-{</div><div class='del'>-	struct mlx5_wq_cyc *wq = &amp;sq-&gt;wq;</div><div class='del'>-	u16 ci = mlx5_wq_cyc_ctr2ix(wq, be16_to_cpu(cqe-&gt;wqe_counter));</div><div class='del'>-	struct mlx5e_sq_wqe_info *icowi = &amp;sq-&gt;db.ico_wqe[ci];</div><div class='del'>-</div><div class='del'>-	mlx5_cqwq_pop(&amp;cq-&gt;wq);</div><div class='del'>-</div><div class='del'>-	if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) {</div><div class='del'>-		netdev_WARN_ONCE(cq-&gt;channel-&gt;netdev,</div><div class='del'>-				 "Bad OP in ICOSQ CQE: 0x%x\n", get_cqe_opcode(cqe));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (likely(icowi-&gt;opcode == MLX5_OPCODE_UMR)) {</div><div class='del'>-		mlx5e_post_rx_mpwqe(rq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(icowi-&gt;opcode != MLX5_OPCODE_NOP))</div><div class='del'>-		netdev_WARN_ONCE(cq-&gt;channel-&gt;netdev,</div><div class='del'>-				 "Bad OPCODE in ICOSQ WQE info: 0x%x\n", icowi-&gt;opcode);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mlx5e_poll_ico_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_icosq *sq = container_of(cq, struct mlx5e_icosq, cq);</div><div class='ctx'> 	struct mlx5_cqe64 *cqe;</div><div class='add'>+	u8  completed_umr = 0;</div><div class='add'>+	u16 sqcc;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &amp;sq-&gt;state)))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -581,28 +557,96 @@ static void mlx5e_poll_ico_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq)</div><div class='ctx'> 	if (likely(!cqe))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* by design, there's only a single cqe */</div><div class='del'>-	mlx5e_poll_ico_single_cqe(cq, sq, rq, cqe);</div><div class='add'>+	/* sq-&gt;cc must be updated only after mlx5_cqwq_update_db_record(),</div><div class='add'>+	 * otherwise a cq overrun may occur</div><div class='add'>+	 */</div><div class='add'>+	sqcc = sq-&gt;cc;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	do {</div><div class='add'>+		u16 wqe_counter;</div><div class='add'>+		bool last_wqe;</div><div class='add'>+</div><div class='add'>+		mlx5_cqwq_pop(&amp;cq-&gt;wq);</div><div class='add'>+</div><div class='add'>+		wqe_counter = be16_to_cpu(cqe-&gt;wqe_counter);</div><div class='add'>+</div><div class='add'>+		if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) {</div><div class='add'>+			netdev_WARN_ONCE(cq-&gt;channel-&gt;netdev,</div><div class='add'>+					 "Bad OP in ICOSQ CQE: 0x%x\n", get_cqe_opcode(cqe));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		do {</div><div class='add'>+			struct mlx5e_sq_wqe_info *wi;</div><div class='add'>+			u16 ci;</div><div class='add'>+</div><div class='add'>+			last_wqe = (sqcc == wqe_counter);</div><div class='add'>+</div><div class='add'>+			ci = mlx5_wq_cyc_ctr2ix(&amp;sq-&gt;wq, sqcc);</div><div class='add'>+			wi = &amp;sq-&gt;db.ico_wqe[ci];</div><div class='add'>+</div><div class='add'>+			if (likely(wi-&gt;opcode == MLX5_OPCODE_UMR)) {</div><div class='add'>+				sqcc += MLX5E_UMR_WQEBBS;</div><div class='add'>+				completed_umr++;</div><div class='add'>+			} else if (likely(wi-&gt;opcode == MLX5_OPCODE_NOP)) {</div><div class='add'>+				sqcc++;</div><div class='add'>+			} else {</div><div class='add'>+				netdev_WARN_ONCE(cq-&gt;channel-&gt;netdev,</div><div class='add'>+						 "Bad OPCODE in ICOSQ WQE info: 0x%x\n",</div><div class='add'>+						 wi-&gt;opcode);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} while (!last_wqe);</div><div class='add'>+</div><div class='add'>+	} while ((++i &lt; MLX5E_TX_CQ_POLL_BUDGET) &amp;&amp; (cqe = mlx5_cqwq_get_cqe(&amp;cq-&gt;wq)));</div><div class='add'>+</div><div class='add'>+	sq-&gt;cc = sqcc;</div><div class='ctx'> </div><div class='ctx'> 	mlx5_cqwq_update_db_record(&amp;cq-&gt;wq);</div><div class='add'>+</div><div class='add'>+	if (likely(completed_umr)) {</div><div class='add'>+		mlx5e_post_rx_mpwqe(rq, completed_umr);</div><div class='add'>+		rq-&gt;mpwqe.umr_in_progress -= completed_umr;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool mlx5e_post_rx_mpwqes(struct mlx5e_rq *rq)</div><div class='ctx'> {</div><div class='add'>+	struct mlx5e_icosq *sq = &amp;rq-&gt;channel-&gt;icosq;</div><div class='ctx'> 	struct mlx5_wq_ll *wq = &amp;rq-&gt;mpwqe.wq;</div><div class='add'>+	u8  missing, i;</div><div class='add'>+	u16 head;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &amp;rq-&gt;state)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	mlx5e_poll_ico_cq(&amp;rq-&gt;channel-&gt;icosq.cq, rq);</div><div class='add'>+	mlx5e_poll_ico_cq(&amp;sq-&gt;cq, rq);</div><div class='add'>+</div><div class='add'>+	missing = mlx5_wq_ll_missing(wq) - rq-&gt;mpwqe.umr_in_progress;</div><div class='ctx'> </div><div class='del'>-	if (mlx5_wq_ll_is_full(wq))</div><div class='add'>+	if (unlikely(rq-&gt;mpwqe.umr_in_progress &gt; rq-&gt;mpwqe.umr_last_bulk))</div><div class='add'>+		rq-&gt;stats-&gt;congst_umr++;</div><div class='add'>+</div><div class='add'>+#define UMR_WQE_BULK (2)</div><div class='add'>+	if (likely(missing &lt; UMR_WQE_BULK))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!rq-&gt;mpwqe.umr_in_progress)</div><div class='del'>-		mlx5e_alloc_rx_mpwqe(rq, wq-&gt;head);</div><div class='del'>-	else</div><div class='del'>-		rq-&gt;stats-&gt;congst_umr += mlx5_wq_ll_missing(wq) &gt; 2;</div><div class='add'>+	head = rq-&gt;mpwqe.actual_wq_head;</div><div class='add'>+	i = missing;</div><div class='add'>+	do {</div><div class='add'>+		if (unlikely(mlx5e_alloc_rx_mpwqe(rq, head)))</div><div class='add'>+			break;</div><div class='add'>+		head = mlx5_wq_ll_get_wqe_next_ix(wq, head);</div><div class='add'>+	} while (--i);</div><div class='add'>+</div><div class='add'>+	rq-&gt;mpwqe.umr_last_bulk    = missing - i;</div><div class='add'>+	if (sq-&gt;doorbell_cseg) {</div><div class='add'>+		mlx5e_notify_hw(&amp;sq-&gt;wq, sq-&gt;pc, sq-&gt;uar_map, sq-&gt;doorbell_cseg);</div><div class='add'>+		sq-&gt;doorbell_cseg = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rq-&gt;mpwqe.umr_in_progress += rq-&gt;mpwqe.umr_last_bulk;</div><div class='add'>+	rq-&gt;mpwqe.actual_wq_head   = head;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -692,7 +736,14 @@ static inline bool is_last_ethertype_ip(struct sk_buff *skb, int *network_depth,</div><div class='ctx'> {</div><div class='ctx'> 	*proto = ((struct ethhdr *)skb-&gt;data)-&gt;h_proto;</div><div class='ctx'> 	*proto = __vlan_get_protocol(skb, *proto, network_depth);</div><div class='del'>-	return (*proto == htons(ETH_P_IP) || *proto == htons(ETH_P_IPV6));</div><div class='add'>+</div><div class='add'>+	if (*proto == htons(ETH_P_IP))</div><div class='add'>+		return pskb_may_pull(skb, *network_depth + sizeof(struct iphdr));</div><div class='add'>+</div><div class='add'>+	if (*proto == htons(ETH_P_IPV6))</div><div class='add'>+		return pskb_may_pull(skb, *network_depth + sizeof(struct ipv6hdr));</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mlx5e_enable_ecn(struct mlx5e_rq *rq, struct sk_buff *skb)</div><div class='hunk'>@@ -712,17 +763,6 @@ static inline void mlx5e_enable_ecn(struct mlx5e_rq *rq, struct sk_buff *skb)</div><div class='ctx'> 	rq-&gt;stats-&gt;ecn_mark += !!rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mlx5e_get_fcs(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const void *fcs_bytes;</div><div class='del'>-	u32 _fcs_bytes;</div><div class='del'>-</div><div class='del'>-	fcs_bytes = skb_header_pointer(skb, skb-&gt;len - ETH_FCS_LEN,</div><div class='del'>-				       ETH_FCS_LEN, &amp;_fcs_bytes);</div><div class='del'>-</div><div class='del'>-	return __get_unaligned_cpu32(fcs_bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u8 get_ip_proto(struct sk_buff *skb, int network_depth, __be16 proto)</div><div class='ctx'> {</div><div class='ctx'> 	void *ip_p = skb-&gt;data + network_depth;</div><div class='hunk'>@@ -733,6 +773,68 @@ static u8 get_ip_proto(struct sk_buff *skb, int network_depth, __be16 proto)</div><div class='ctx'> </div><div class='ctx'> #define short_frame(size) ((size) &lt;= ETH_ZLEN + ETH_FCS_LEN)</div><div class='ctx'> </div><div class='add'>+#define MAX_PADDING 8</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+tail_padding_csum_slow(struct sk_buff *skb, int offset, int len,</div><div class='add'>+		       struct mlx5e_rq_stats *stats)</div><div class='add'>+{</div><div class='add'>+	stats-&gt;csum_complete_tail_slow++;</div><div class='add'>+	skb-&gt;csum = csum_block_add(skb-&gt;csum,</div><div class='add'>+				   skb_checksum(skb, offset, len, 0),</div><div class='add'>+				   offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+tail_padding_csum(struct sk_buff *skb, int offset,</div><div class='add'>+		  struct mlx5e_rq_stats *stats)</div><div class='add'>+{</div><div class='add'>+	u8 tail_padding[MAX_PADDING];</div><div class='add'>+	int len = skb-&gt;len - offset;</div><div class='add'>+	void *tail;</div><div class='add'>+</div><div class='add'>+	if (unlikely(len &gt; MAX_PADDING)) {</div><div class='add'>+		tail_padding_csum_slow(skb, offset, len, stats);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tail = skb_header_pointer(skb, offset, len, tail_padding);</div><div class='add'>+	if (unlikely(!tail)) {</div><div class='add'>+		tail_padding_csum_slow(skb, offset, len, stats);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats-&gt;csum_complete_tail++;</div><div class='add'>+	skb-&gt;csum = csum_block_add(skb-&gt;csum, csum_partial(tail, len, 0), offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mlx5e_skb_padding_csum(struct sk_buff *skb, int network_depth, __be16 proto,</div><div class='add'>+		       struct mlx5e_rq_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ipv6hdr *ip6;</div><div class='add'>+	struct iphdr   *ip4;</div><div class='add'>+	int pkt_len;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		ip4 = (struct iphdr *)(skb-&gt;data + network_depth);</div><div class='add'>+		pkt_len = network_depth + ntohs(ip4-&gt;tot_len);</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		ip6 = (struct ipv6hdr *)(skb-&gt;data + network_depth);</div><div class='add'>+		pkt_len = network_depth + sizeof(*ip6) + ntohs(ip6-&gt;payload_len);</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 (likely(pkt_len &gt;= skb-&gt;len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tail_padding_csum(skb, pkt_len, stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void mlx5e_handle_csum(struct net_device *netdev,</div><div class='ctx'> 				     struct mlx5_cqe64 *cqe,</div><div class='ctx'> 				     struct mlx5e_rq *rq,</div><div class='hunk'>@@ -752,7 +854,8 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &amp;rq-&gt;state)))</div><div class='add'>+	/* True when explicitly set via priv flag, or XDP prog is loaded */</div><div class='add'>+	if (test_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &amp;rq-&gt;state))</div><div class='ctx'> 		goto csum_unnecessary;</div><div class='ctx'> </div><div class='ctx'> 	/* CQE csum doesn't cover padding octets in short ethernet</div><div class='hunk'>@@ -780,18 +883,15 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,</div><div class='ctx'> 			skb-&gt;csum = csum_partial(skb-&gt;data + ETH_HLEN,</div><div class='ctx'> 						 network_depth - ETH_HLEN,</div><div class='ctx'> 						 skb-&gt;csum);</div><div class='del'>-		if (unlikely(netdev-&gt;features &amp; NETIF_F_RXFCS))</div><div class='del'>-			skb-&gt;csum = csum_block_add(skb-&gt;csum,</div><div class='del'>-						   (__force __wsum)mlx5e_get_fcs(skb),</div><div class='del'>-						   skb-&gt;len - ETH_FCS_LEN);</div><div class='add'>+</div><div class='add'>+		mlx5e_skb_padding_csum(skb, network_depth, proto, stats);</div><div class='ctx'> 		stats-&gt;csum_complete++;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> csum_unnecessary:</div><div class='ctx'> 	if (likely((cqe-&gt;hds_ip_ext &amp; CQE_L3_OK) &amp;&amp;</div><div class='del'>-		   ((cqe-&gt;hds_ip_ext &amp; CQE_L4_OK) ||</div><div class='del'>-		    (get_cqe_l4_hdr_type(cqe) == CQE_L4_HDR_TYPE_NONE)))) {</div><div class='add'>+		   (cqe-&gt;hds_ip_ext &amp; CQE_L4_OK))) {</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> 		if (cqe_is_tunneled(cqe)) {</div><div class='ctx'> 			skb-&gt;csum_level = 1;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c<br/>index 1a78e05cbba8..483d321d2151 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.c</a></div><div class='hunk'>@@ -59,10 +59,14 @@ static const struct counter_desc sw_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_unnecessary) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_none) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_complete) },</div><div class='add'>+	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_complete_tail) },</div><div class='add'>+	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_complete_tail_slow) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_unnecessary_inner) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_drop) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_redirect) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_tx_xmit) },</div><div class='add'>+	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_tx_mpwqe) },</div><div class='add'>+	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_tx_inlnw) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_tx_full) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_tx_err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_xdp_tx_cqe) },</div><div class='hunk'>@@ -77,6 +81,8 @@ static const struct counter_desc sw_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_queue_wake) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_cqe_err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_xdp_xmit) },</div><div class='add'>+	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_xdp_mpwqe) },</div><div class='add'>+	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_xdp_inlnw) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_xdp_full) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_xdp_err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_xdp_cqes) },</div><div class='hunk'>@@ -87,7 +93,6 @@ static const struct counter_desc sw_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_buff_alloc_err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cqe_compress_blks) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cqe_compress_pkts) },</div><div class='del'>-	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_page_reuse) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cache_reuse) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cache_full) },</div><div class='ctx'> 	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cache_empty) },</div><div class='hunk'>@@ -151,11 +156,15 @@ static void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv)</div><div class='ctx'> 		s-&gt;rx_removed_vlan_packets += rq_stats-&gt;removed_vlan_packets;</div><div class='ctx'> 		s-&gt;rx_csum_none	+= rq_stats-&gt;csum_none;</div><div class='ctx'> 		s-&gt;rx_csum_complete += rq_stats-&gt;csum_complete;</div><div class='add'>+		s-&gt;rx_csum_complete_tail += rq_stats-&gt;csum_complete_tail;</div><div class='add'>+		s-&gt;rx_csum_complete_tail_slow += rq_stats-&gt;csum_complete_tail_slow;</div><div class='ctx'> 		s-&gt;rx_csum_unnecessary += rq_stats-&gt;csum_unnecessary;</div><div class='ctx'> 		s-&gt;rx_csum_unnecessary_inner += rq_stats-&gt;csum_unnecessary_inner;</div><div class='ctx'> 		s-&gt;rx_xdp_drop     += rq_stats-&gt;xdp_drop;</div><div class='ctx'> 		s-&gt;rx_xdp_redirect += rq_stats-&gt;xdp_redirect;</div><div class='ctx'> 		s-&gt;rx_xdp_tx_xmit  += xdpsq_stats-&gt;xmit;</div><div class='add'>+		s-&gt;rx_xdp_tx_mpwqe += xdpsq_stats-&gt;mpwqe;</div><div class='add'>+		s-&gt;rx_xdp_tx_inlnw += xdpsq_stats-&gt;inlnw;</div><div class='ctx'> 		s-&gt;rx_xdp_tx_full  += xdpsq_stats-&gt;full;</div><div class='ctx'> 		s-&gt;rx_xdp_tx_err   += xdpsq_stats-&gt;err;</div><div class='ctx'> 		s-&gt;rx_xdp_tx_cqe   += xdpsq_stats-&gt;cqes;</div><div class='hunk'>@@ -166,7 +175,6 @@ static void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv)</div><div class='ctx'> 		s-&gt;rx_buff_alloc_err += rq_stats-&gt;buff_alloc_err;</div><div class='ctx'> 		s-&gt;rx_cqe_compress_blks += rq_stats-&gt;cqe_compress_blks;</div><div class='ctx'> 		s-&gt;rx_cqe_compress_pkts += rq_stats-&gt;cqe_compress_pkts;</div><div class='del'>-		s-&gt;rx_page_reuse  += rq_stats-&gt;page_reuse;</div><div class='ctx'> 		s-&gt;rx_cache_reuse += rq_stats-&gt;cache_reuse;</div><div class='ctx'> 		s-&gt;rx_cache_full  += rq_stats-&gt;cache_full;</div><div class='ctx'> 		s-&gt;rx_cache_empty += rq_stats-&gt;cache_empty;</div><div class='hunk'>@@ -181,6 +189,8 @@ static void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv)</div><div class='ctx'> 		s-&gt;ch_eq_rearm    += ch_stats-&gt;eq_rearm;</div><div class='ctx'> 		/* xdp redirect */</div><div class='ctx'> 		s-&gt;tx_xdp_xmit    += xdpsq_red_stats-&gt;xmit;</div><div class='add'>+		s-&gt;tx_xdp_mpwqe   += xdpsq_red_stats-&gt;mpwqe;</div><div class='add'>+		s-&gt;tx_xdp_inlnw   += xdpsq_red_stats-&gt;inlnw;</div><div class='ctx'> 		s-&gt;tx_xdp_full    += xdpsq_red_stats-&gt;full;</div><div class='ctx'> 		s-&gt;tx_xdp_err     += xdpsq_red_stats-&gt;err;</div><div class='ctx'> 		s-&gt;tx_xdp_cqes    += xdpsq_red_stats-&gt;cqes;</div><div class='hunk'>@@ -1190,6 +1200,8 @@ static const struct counter_desc rq_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, packets) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, bytes) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_complete) },</div><div class='add'>+	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_complete_tail) },</div><div class='add'>+	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_complete_tail_slow) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary_inner) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_none) },</div><div class='hunk'>@@ -1206,7 +1218,6 @@ static const struct counter_desc rq_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, buff_alloc_err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_blks) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_pkts) },</div><div class='del'>-	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, page_reuse) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_reuse) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_full) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_empty) },</div><div class='hunk'>@@ -1239,6 +1250,8 @@ static const struct counter_desc sq_stats_desc[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct counter_desc rq_xdpsq_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_RQ_XDPSQ_STAT(struct mlx5e_xdpsq_stats, xmit) },</div><div class='add'>+	{ MLX5E_DECLARE_RQ_XDPSQ_STAT(struct mlx5e_xdpsq_stats, mpwqe) },</div><div class='add'>+	{ MLX5E_DECLARE_RQ_XDPSQ_STAT(struct mlx5e_xdpsq_stats, inlnw) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RQ_XDPSQ_STAT(struct mlx5e_xdpsq_stats, full) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RQ_XDPSQ_STAT(struct mlx5e_xdpsq_stats, err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_RQ_XDPSQ_STAT(struct mlx5e_xdpsq_stats, cqes) },</div><div class='hunk'>@@ -1246,6 +1259,8 @@ static const struct counter_desc rq_xdpsq_stats_desc[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct counter_desc xdpsq_stats_desc[] = {</div><div class='ctx'> 	{ MLX5E_DECLARE_XDPSQ_STAT(struct mlx5e_xdpsq_stats, xmit) },</div><div class='add'>+	{ MLX5E_DECLARE_XDPSQ_STAT(struct mlx5e_xdpsq_stats, mpwqe) },</div><div class='add'>+	{ MLX5E_DECLARE_XDPSQ_STAT(struct mlx5e_xdpsq_stats, inlnw) },</div><div class='ctx'> 	{ MLX5E_DECLARE_XDPSQ_STAT(struct mlx5e_xdpsq_stats, full) },</div><div class='ctx'> 	{ MLX5E_DECLARE_XDPSQ_STAT(struct mlx5e_xdpsq_stats, err) },</div><div class='ctx'> 	{ MLX5E_DECLARE_XDPSQ_STAT(struct mlx5e_xdpsq_stats, cqes) },</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h<br/>index 4640d4f986f8..cdddcc46971b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.h</a></div><div class='hunk'>@@ -71,10 +71,14 @@ struct mlx5e_sw_stats {</div><div class='ctx'> 	u64 rx_csum_unnecessary;</div><div class='ctx'> 	u64 rx_csum_none;</div><div class='ctx'> 	u64 rx_csum_complete;</div><div class='add'>+	u64 rx_csum_complete_tail;</div><div class='add'>+	u64 rx_csum_complete_tail_slow;</div><div class='ctx'> 	u64 rx_csum_unnecessary_inner;</div><div class='ctx'> 	u64 rx_xdp_drop;</div><div class='ctx'> 	u64 rx_xdp_redirect;</div><div class='ctx'> 	u64 rx_xdp_tx_xmit;</div><div class='add'>+	u64 rx_xdp_tx_mpwqe;</div><div class='add'>+	u64 rx_xdp_tx_inlnw;</div><div class='ctx'> 	u64 rx_xdp_tx_full;</div><div class='ctx'> 	u64 rx_xdp_tx_err;</div><div class='ctx'> 	u64 rx_xdp_tx_cqe;</div><div class='hunk'>@@ -89,6 +93,8 @@ struct mlx5e_sw_stats {</div><div class='ctx'> 	u64 tx_queue_wake;</div><div class='ctx'> 	u64 tx_cqe_err;</div><div class='ctx'> 	u64 tx_xdp_xmit;</div><div class='add'>+	u64 tx_xdp_mpwqe;</div><div class='add'>+	u64 tx_xdp_inlnw;</div><div class='ctx'> 	u64 tx_xdp_full;</div><div class='ctx'> 	u64 tx_xdp_err;</div><div class='ctx'> 	u64 tx_xdp_cqes;</div><div class='hunk'>@@ -99,7 +105,6 @@ struct mlx5e_sw_stats {</div><div class='ctx'> 	u64 rx_buff_alloc_err;</div><div class='ctx'> 	u64 rx_cqe_compress_blks;</div><div class='ctx'> 	u64 rx_cqe_compress_pkts;</div><div class='del'>-	u64 rx_page_reuse;</div><div class='ctx'> 	u64 rx_cache_reuse;</div><div class='ctx'> 	u64 rx_cache_full;</div><div class='ctx'> 	u64 rx_cache_empty;</div><div class='hunk'>@@ -181,6 +186,8 @@ struct mlx5e_rq_stats {</div><div class='ctx'> 	u64 packets;</div><div class='ctx'> 	u64 bytes;</div><div class='ctx'> 	u64 csum_complete;</div><div class='add'>+	u64 csum_complete_tail;</div><div class='add'>+	u64 csum_complete_tail_slow;</div><div class='ctx'> 	u64 csum_unnecessary;</div><div class='ctx'> 	u64 csum_unnecessary_inner;</div><div class='ctx'> 	u64 csum_none;</div><div class='hunk'>@@ -197,7 +204,6 @@ struct mlx5e_rq_stats {</div><div class='ctx'> 	u64 buff_alloc_err;</div><div class='ctx'> 	u64 cqe_compress_blks;</div><div class='ctx'> 	u64 cqe_compress_pkts;</div><div class='del'>-	u64 page_reuse;</div><div class='ctx'> 	u64 cache_reuse;</div><div class='ctx'> 	u64 cache_full;</div><div class='ctx'> 	u64 cache_empty;</div><div class='hunk'>@@ -237,6 +243,8 @@ struct mlx5e_sq_stats {</div><div class='ctx'> </div><div class='ctx'> struct mlx5e_xdpsq_stats {</div><div class='ctx'> 	u64 xmit;</div><div class='add'>+	u64 mpwqe;</div><div class='add'>+	u64 inlnw;</div><div class='ctx'> 	u64 full;</div><div class='ctx'> 	u64 err;</div><div class='ctx'> 	/* dirtied @completion */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c<br/>index b4967a0ff8c7..122f457091a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_tc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_tc.c</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;net/tc_act/tc_pedit.h&gt;</div><div class='ctx'> #include &lt;net/tc_act/tc_csum.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #include "en.h"</div><div class='ctx'> #include "en_rep.h"</div><div class='ctx'> #include "en_tc.h"</div><div class='hunk'>@@ -663,7 +664,8 @@ static int mlx5e_hairpin_flow_add(struct mlx5e_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(priv-&gt;netdev, "add hairpin: tirn %x rqn %x peer %s sqn %x prio %d (log) data %d packets %d\n",</div><div class='del'>-		   hp-&gt;tirn, hp-&gt;pair-&gt;rqn[0], hp-&gt;pair-&gt;peer_mdev-&gt;priv.name,</div><div class='add'>+		   hp-&gt;tirn, hp-&gt;pair-&gt;rqn[0],</div><div class='add'>+		   dev_name(hp-&gt;pair-&gt;peer_mdev-&gt;device),</div><div class='ctx'> 		   hp-&gt;pair-&gt;sqn[0], match_prio, params.log_data_size, params.log_num_packets);</div><div class='ctx'> </div><div class='ctx'> 	hpe-&gt;hp = hp;</div><div class='hunk'>@@ -700,7 +702,7 @@ static void mlx5e_hairpin_flow_del(struct mlx5e_priv *priv,</div><div class='ctx'> 		hpe = list_entry(next, struct mlx5e_hairpin_entry, flows);</div><div class='ctx'> </div><div class='ctx'> 		netdev_dbg(priv-&gt;netdev, "del hairpin: peer %s\n",</div><div class='del'>-			   hpe-&gt;hp-&gt;pair-&gt;peer_mdev-&gt;priv.name);</div><div class='add'>+			   dev_name(hpe-&gt;hp-&gt;pair-&gt;peer_mdev-&gt;device));</div><div class='ctx'> </div><div class='ctx'> 		mlx5e_hairpin_destroy(hpe-&gt;hp);</div><div class='ctx'> 		hash_del(&amp;hpe-&gt;hairpin_hlist);</div><div class='hunk'>@@ -1437,6 +1439,26 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void *get_match_headers_criteria(u32 flags,</div><div class='add'>+					struct mlx5_flow_spec *spec)</div><div class='add'>+{</div><div class='add'>+	return (flags &amp; MLX5_FLOW_CONTEXT_ACTION_DECAP) ?</div><div class='add'>+		MLX5_ADDR_OF(fte_match_param, spec-&gt;match_criteria,</div><div class='add'>+			     inner_headers) :</div><div class='add'>+		MLX5_ADDR_OF(fte_match_param, spec-&gt;match_criteria,</div><div class='add'>+			     outer_headers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *get_match_headers_value(u32 flags,</div><div class='add'>+				     struct mlx5_flow_spec *spec)</div><div class='add'>+{</div><div class='add'>+	return (flags &amp; MLX5_FLOW_CONTEXT_ACTION_DECAP) ?</div><div class='add'>+		MLX5_ADDR_OF(fte_match_param, spec-&gt;match_value,</div><div class='add'>+			     inner_headers) :</div><div class='add'>+		MLX5_ADDR_OF(fte_match_param, spec-&gt;match_value,</div><div class='add'>+			     outer_headers);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __parse_cls_flower(struct mlx5e_priv *priv,</div><div class='ctx'> 			      struct mlx5_flow_spec *spec,</div><div class='ctx'> 			      struct tc_cls_flower_offload *f,</div><div class='hunk'>@@ -1502,10 +1524,10 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,</div><div class='ctx'> 		/* In decap flow, header pointers should point to the inner</div><div class='ctx'> 		 * headers, outer header were already set by parse_tunnel_attr</div><div class='ctx'> 		 */</div><div class='del'>-		headers_c = MLX5_ADDR_OF(fte_match_param, spec-&gt;match_criteria,</div><div class='del'>-					 inner_headers);</div><div class='del'>-		headers_v = MLX5_ADDR_OF(fte_match_param, spec-&gt;match_value,</div><div class='del'>-					 inner_headers);</div><div class='add'>+		headers_c = get_match_headers_criteria(MLX5_FLOW_CONTEXT_ACTION_DECAP,</div><div class='add'>+						       spec);</div><div class='add'>+		headers_v = get_match_headers_value(MLX5_FLOW_CONTEXT_ACTION_DECAP,</div><div class='add'>+						    spec);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='hunk'>@@ -1520,11 +1542,23 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,</div><div class='ctx'> 		if (match.mask-&gt;n_proto)</div><div class='ctx'> 			*match_level = MLX5_MATCH_L2;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN) ||</div><div class='add'>+	    is_vlan_dev(filter_dev)) {</div><div class='add'>+		struct flow_dissector_key_vlan filter_dev_mask;</div><div class='add'>+		struct flow_dissector_key_vlan filter_dev_key;</div><div class='ctx'> 		struct flow_match_vlan match;</div><div class='ctx'> </div><div class='del'>-		flow_rule_match_vlan(rule, &amp;match);</div><div class='add'>+		if (is_vlan_dev(filter_dev)) {</div><div class='add'>+			match.key = &amp;filter_dev_key;</div><div class='add'>+			match.key-&gt;vlan_id = vlan_dev_vlan_id(filter_dev);</div><div class='add'>+			match.key-&gt;vlan_tpid = vlan_dev_vlan_proto(filter_dev);</div><div class='add'>+			match.key-&gt;vlan_priority = 0;</div><div class='add'>+			match.mask = &amp;filter_dev_mask;</div><div class='add'>+			memset(match.mask, 0xff, sizeof(*match.mask));</div><div class='add'>+			match.mask-&gt;vlan_priority = 0;</div><div class='add'>+		} else {</div><div class='add'>+			flow_rule_match_vlan(rule, &amp;match);</div><div class='add'>+		}</div><div class='ctx'> 		if (match.mask-&gt;vlan_id ||</div><div class='ctx'> 		    match.mask-&gt;vlan_priority ||</div><div class='ctx'> 		    match.mask-&gt;vlan_tpid) {</div><div class='hunk'>@@ -1827,6 +1861,7 @@ static int parse_cls_flower(struct mlx5e_priv *priv,</div><div class='ctx'> </div><div class='ctx'> struct pedit_headers {</div><div class='ctx'> 	struct ethhdr  eth;</div><div class='add'>+	struct vlan_hdr vlan;</div><div class='ctx'> 	struct iphdr   ip4;</div><div class='ctx'> 	struct ipv6hdr ip6;</div><div class='ctx'> 	struct tcphdr  tcp;</div><div class='hunk'>@@ -1873,38 +1908,73 @@ struct mlx5_fields {</div><div class='ctx'> 	u8  field;</div><div class='ctx'> 	u8  size;</div><div class='ctx'> 	u32 offset;</div><div class='add'>+	u32 match_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define OFFLOAD(fw_field, size, field, off) \</div><div class='del'>-		{MLX5_ACTION_IN_FIELD_OUT_ ## fw_field, size, offsetof(struct pedit_headers, field) + (off)}</div><div class='add'>+#define OFFLOAD(fw_field, size, field, off, match_field) \</div><div class='add'>+		{MLX5_ACTION_IN_FIELD_OUT_ ## fw_field, size, \</div><div class='add'>+		 offsetof(struct pedit_headers, field) + (off), \</div><div class='add'>+		 MLX5_BYTE_OFF(fte_match_set_lyr_2_4, match_field)}</div><div class='add'>+</div><div class='add'>+static bool cmp_val_mask(void *valp, void *maskp, void *matchvalp,</div><div class='add'>+			 void *matchmaskp, int size)</div><div class='add'>+{</div><div class='add'>+	bool same = false;</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case sizeof(u8):</div><div class='add'>+		same = ((*(u8 *)valp) &amp; (*(u8 *)maskp)) ==</div><div class='add'>+		       ((*(u8 *)matchvalp) &amp; (*(u8 *)matchmaskp));</div><div class='add'>+		break;</div><div class='add'>+	case sizeof(u16):</div><div class='add'>+		same = ((*(u16 *)valp) &amp; (*(u16 *)maskp)) ==</div><div class='add'>+		       ((*(u16 *)matchvalp) &amp; (*(u16 *)matchmaskp));</div><div class='add'>+		break;</div><div class='add'>+	case sizeof(u32):</div><div class='add'>+		same = ((*(u32 *)valp) &amp; (*(u32 *)maskp)) ==</div><div class='add'>+		       ((*(u32 *)matchvalp) &amp; (*(u32 *)matchmaskp));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return same;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct mlx5_fields fields[] = {</div><div class='del'>-	OFFLOAD(DMAC_47_16, 4, eth.h_dest[0], 0),</div><div class='del'>-	OFFLOAD(DMAC_15_0,  2, eth.h_dest[4], 0),</div><div class='del'>-	OFFLOAD(SMAC_47_16, 4, eth.h_source[0], 0),</div><div class='del'>-	OFFLOAD(SMAC_15_0,  2, eth.h_source[4], 0),</div><div class='del'>-	OFFLOAD(ETHERTYPE,  2, eth.h_proto, 0),</div><div class='del'>-</div><div class='del'>-	OFFLOAD(IP_TTL, 1, ip4.ttl,   0),</div><div class='del'>-	OFFLOAD(SIPV4,  4, ip4.saddr, 0),</div><div class='del'>-	OFFLOAD(DIPV4,  4, ip4.daddr, 0),</div><div class='del'>-</div><div class='del'>-	OFFLOAD(SIPV6_127_96, 4, ip6.saddr.s6_addr32[0], 0),</div><div class='del'>-	OFFLOAD(SIPV6_95_64,  4, ip6.saddr.s6_addr32[1], 0),</div><div class='del'>-	OFFLOAD(SIPV6_63_32,  4, ip6.saddr.s6_addr32[2], 0),</div><div class='del'>-	OFFLOAD(SIPV6_31_0,   4, ip6.saddr.s6_addr32[3], 0),</div><div class='del'>-	OFFLOAD(DIPV6_127_96, 4, ip6.daddr.s6_addr32[0], 0),</div><div class='del'>-	OFFLOAD(DIPV6_95_64,  4, ip6.daddr.s6_addr32[1], 0),</div><div class='del'>-	OFFLOAD(DIPV6_63_32,  4, ip6.daddr.s6_addr32[2], 0),</div><div class='del'>-	OFFLOAD(DIPV6_31_0,   4, ip6.daddr.s6_addr32[3], 0),</div><div class='del'>-	OFFLOAD(IPV6_HOPLIMIT, 1, ip6.hop_limit, 0),</div><div class='del'>-</div><div class='del'>-	OFFLOAD(TCP_SPORT, 2, tcp.source,  0),</div><div class='del'>-	OFFLOAD(TCP_DPORT, 2, tcp.dest,    0),</div><div class='del'>-	OFFLOAD(TCP_FLAGS, 1, tcp.ack_seq, 5),</div><div class='del'>-</div><div class='del'>-	OFFLOAD(UDP_SPORT, 2, udp.source, 0),</div><div class='del'>-	OFFLOAD(UDP_DPORT, 2, udp.dest,   0),</div><div class='add'>+	OFFLOAD(DMAC_47_16, 4, eth.h_dest[0], 0, dmac_47_16),</div><div class='add'>+	OFFLOAD(DMAC_15_0,  2, eth.h_dest[4], 0, dmac_15_0),</div><div class='add'>+	OFFLOAD(SMAC_47_16, 4, eth.h_source[0], 0, smac_47_16),</div><div class='add'>+	OFFLOAD(SMAC_15_0,  2, eth.h_source[4], 0, smac_15_0),</div><div class='add'>+	OFFLOAD(ETHERTYPE,  2, eth.h_proto, 0, ethertype),</div><div class='add'>+	OFFLOAD(FIRST_VID,  2, vlan.h_vlan_TCI, 0, first_vid),</div><div class='add'>+</div><div class='add'>+	OFFLOAD(IP_TTL, 1, ip4.ttl,   0, ttl_hoplimit),</div><div class='add'>+	OFFLOAD(SIPV4,  4, ip4.saddr, 0, src_ipv4_src_ipv6.ipv4_layout.ipv4),</div><div class='add'>+	OFFLOAD(DIPV4,  4, ip4.daddr, 0, dst_ipv4_dst_ipv6.ipv4_layout.ipv4),</div><div class='add'>+</div><div class='add'>+	OFFLOAD(SIPV6_127_96, 4, ip6.saddr.s6_addr32[0], 0,</div><div class='add'>+		src_ipv4_src_ipv6.ipv6_layout.ipv6[0]),</div><div class='add'>+	OFFLOAD(SIPV6_95_64,  4, ip6.saddr.s6_addr32[1], 0,</div><div class='add'>+		src_ipv4_src_ipv6.ipv6_layout.ipv6[4]),</div><div class='add'>+	OFFLOAD(SIPV6_63_32,  4, ip6.saddr.s6_addr32[2], 0,</div><div class='add'>+		src_ipv4_src_ipv6.ipv6_layout.ipv6[8]),</div><div class='add'>+	OFFLOAD(SIPV6_31_0,   4, ip6.saddr.s6_addr32[3], 0,</div><div class='add'>+		src_ipv4_src_ipv6.ipv6_layout.ipv6[12]),</div><div class='add'>+	OFFLOAD(DIPV6_127_96, 4, ip6.daddr.s6_addr32[0], 0,</div><div class='add'>+		dst_ipv4_dst_ipv6.ipv6_layout.ipv6[0]),</div><div class='add'>+	OFFLOAD(DIPV6_95_64,  4, ip6.daddr.s6_addr32[1], 0,</div><div class='add'>+		dst_ipv4_dst_ipv6.ipv6_layout.ipv6[4]),</div><div class='add'>+	OFFLOAD(DIPV6_63_32,  4, ip6.daddr.s6_addr32[2], 0,</div><div class='add'>+		dst_ipv4_dst_ipv6.ipv6_layout.ipv6[8]),</div><div class='add'>+	OFFLOAD(DIPV6_31_0,   4, ip6.daddr.s6_addr32[3], 0,</div><div class='add'>+		dst_ipv4_dst_ipv6.ipv6_layout.ipv6[12]),</div><div class='add'>+	OFFLOAD(IPV6_HOPLIMIT, 1, ip6.hop_limit, 0, ttl_hoplimit),</div><div class='add'>+</div><div class='add'>+	OFFLOAD(TCP_SPORT, 2, tcp.source,  0, tcp_sport),</div><div class='add'>+	OFFLOAD(TCP_DPORT, 2, tcp.dest,    0, tcp_dport),</div><div class='add'>+	OFFLOAD(TCP_FLAGS, 1, tcp.ack_seq, 5, tcp_flags),</div><div class='add'>+</div><div class='add'>+	OFFLOAD(UDP_SPORT, 2, udp.source, 0, udp_sport),</div><div class='add'>+	OFFLOAD(UDP_DPORT, 2, udp.dest,   0, udp_dport),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* On input attr-&gt;max_mod_hdr_actions tells how many HW actions can be parsed at</div><div class='hunk'>@@ -1913,9 +1983,14 @@ static struct mlx5_fields fields[] = {</div><div class='ctx'>  */</div><div class='ctx'> static int offload_pedit_fields(struct pedit_headers_action *hdrs,</div><div class='ctx'> 				struct mlx5e_tc_flow_parse_attr *parse_attr,</div><div class='add'>+				u32 *action_flags,</div><div class='ctx'> 				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct pedit_headers *set_masks, *add_masks, *set_vals, *add_vals;</div><div class='add'>+	void *headers_c = get_match_headers_criteria(*action_flags,</div><div class='add'>+						     &amp;parse_attr-&gt;spec);</div><div class='add'>+	void *headers_v = get_match_headers_value(*action_flags,</div><div class='add'>+						  &amp;parse_attr-&gt;spec);</div><div class='ctx'> 	int i, action_size, nactions, max_actions, first, last, next_z;</div><div class='ctx'> 	void *s_masks_p, *a_masks_p, *vals_p;</div><div class='ctx'> 	struct mlx5_fields *f;</div><div class='hunk'>@@ -1939,6 +2014,8 @@ static int offload_pedit_fields(struct pedit_headers_action *hdrs,</div><div class='ctx'> 	nactions = parse_attr-&gt;num_mod_hdr_actions;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(fields); i++) {</div><div class='add'>+		bool skip;</div><div class='add'>+</div><div class='ctx'> 		f = &amp;fields[i];</div><div class='ctx'> 		/* avoid seeing bits set from previous iterations */</div><div class='ctx'> 		s_mask = 0;</div><div class='hunk'>@@ -1967,19 +2044,34 @@ static int offload_pedit_fields(struct pedit_headers_action *hdrs,</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		skip = false;</div><div class='ctx'> 		if (s_mask) {</div><div class='add'>+			void *match_mask = headers_c + f-&gt;match_offset;</div><div class='add'>+			void *match_val = headers_v + f-&gt;match_offset;</div><div class='add'>+</div><div class='ctx'> 			cmd  = MLX5_ACTION_TYPE_SET;</div><div class='ctx'> 			mask = s_mask;</div><div class='ctx'> 			vals_p = (void *)set_vals + f-&gt;offset;</div><div class='add'>+			/* don't rewrite if we have a match on the same value */</div><div class='add'>+			if (cmp_val_mask(vals_p, s_masks_p, match_val,</div><div class='add'>+					 match_mask, f-&gt;size))</div><div class='add'>+				skip = true;</div><div class='ctx'> 			/* clear to denote we consumed this field */</div><div class='ctx'> 			memset(s_masks_p, 0, f-&gt;size);</div><div class='ctx'> 		} else {</div><div class='add'>+			u32 zero = 0;</div><div class='add'>+</div><div class='ctx'> 			cmd  = MLX5_ACTION_TYPE_ADD;</div><div class='ctx'> 			mask = a_mask;</div><div class='ctx'> 			vals_p = (void *)add_vals + f-&gt;offset;</div><div class='add'>+			/* add 0 is no change */</div><div class='add'>+			if (!memcmp(vals_p, &amp;zero, f-&gt;size))</div><div class='add'>+				skip = true;</div><div class='ctx'> 			/* clear to denote we consumed this field */</div><div class='ctx'> 			memset(a_masks_p, 0, f-&gt;size);</div><div class='ctx'> 		}</div><div class='add'>+		if (skip)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		field_bsize = f-&gt;size * BITS_PER_BYTE;</div><div class='ctx'> </div><div class='hunk'>@@ -2026,6 +2118,15 @@ static int offload_pedit_fields(struct pedit_headers_action *hdrs,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlx5e_flow_namespace_max_modify_action(struct mlx5_core_dev *mdev,</div><div class='add'>+						  int namespace)</div><div class='add'>+{</div><div class='add'>+	if (namespace == MLX5_FLOW_NAMESPACE_FDB) /* FDB offloading */</div><div class='add'>+		return MLX5_CAP_ESW_FLOWTABLE_FDB(mdev, max_modify_header_actions);</div><div class='add'>+	else /* namespace is MLX5_FLOW_NAMESPACE_KERNEL - NIC offloading */</div><div class='add'>+		return MLX5_CAP_FLOWTABLE_NIC_RX(mdev, max_modify_header_actions);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int alloc_mod_hdr_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 				 struct pedit_headers_action *hdrs,</div><div class='ctx'> 				 int namespace,</div><div class='hunk'>@@ -2037,11 +2138,7 @@ static int alloc_mod_hdr_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 		hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].pedits;</div><div class='ctx'> 	action_size = MLX5_UN_SZ_BYTES(set_action_in_add_action_in_auto);</div><div class='ctx'> </div><div class='del'>-	if (namespace == MLX5_FLOW_NAMESPACE_FDB) /* FDB offloading */</div><div class='del'>-		max_actions = MLX5_CAP_ESW_FLOWTABLE_FDB(priv-&gt;mdev, max_modify_header_actions);</div><div class='del'>-	else /* namespace is MLX5_FLOW_NAMESPACE_KERNEL - NIC offloading */</div><div class='del'>-		max_actions = MLX5_CAP_FLOWTABLE_NIC_RX(priv-&gt;mdev, max_modify_header_actions);</div><div class='del'>-</div><div class='add'>+	max_actions = mlx5e_flow_namespace_max_modify_action(priv-&gt;mdev, namespace);</div><div class='ctx'> 	/* can get up to crazingly 16 HW actions in 32 bits pedit SW key */</div><div class='ctx'> 	max_actions = min(max_actions, nkeys * 16);</div><div class='ctx'> </div><div class='hunk'>@@ -2074,6 +2171,12 @@ static int parse_tc_pedit_action(struct mlx5e_priv *priv,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!mlx5e_flow_namespace_max_modify_action(priv-&gt;mdev, namespace)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "The pedit offload action is not supported");</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mask = act-&gt;mangle.mask;</div><div class='ctx'> 	val = act-&gt;mangle.val;</div><div class='ctx'> 	offset = act-&gt;mangle.offset;</div><div class='hunk'>@@ -2092,6 +2195,7 @@ out_err:</div><div class='ctx'> static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace,</div><div class='ctx'> 				 struct mlx5e_tc_flow_parse_attr *parse_attr,</div><div class='ctx'> 				 struct pedit_headers_action *hdrs,</div><div class='add'>+				 u32 *action_flags,</div><div class='ctx'> 				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct pedit_headers *cmd_masks;</div><div class='hunk'>@@ -2104,7 +2208,7 @@ static int alloc_tc_pedit_action(struct mlx5e_priv *priv, int namespace,</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = offload_pedit_fields(hdrs, parse_attr, extack);</div><div class='add'>+	err = offload_pedit_fields(hdrs, parse_attr, action_flags, extack);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_dealloc_parsed_actions;</div><div class='ctx'> </div><div class='hunk'>@@ -2158,6 +2262,52 @@ static bool csum_offload_supported(struct mlx5e_priv *priv,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ip_ttl_word {</div><div class='add'>+	__u8	ttl;</div><div class='add'>+	__u8	protocol;</div><div class='add'>+	__sum16	check;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ipv6_hoplimit_word {</div><div class='add'>+	__be16	payload_len;</div><div class='add'>+	__u8	nexthdr;</div><div class='add'>+	__u8	hop_limit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool is_action_keys_supported(const struct flow_action_entry *act)</div><div class='add'>+{</div><div class='add'>+	u32 mask, offset;</div><div class='add'>+	u8 htype;</div><div class='add'>+</div><div class='add'>+	htype = act-&gt;mangle.htype;</div><div class='add'>+	offset = act-&gt;mangle.offset;</div><div class='add'>+	mask = ~act-&gt;mangle.mask;</div><div class='add'>+	/* For IPv4 &amp; IPv6 header check 4 byte word,</div><div class='add'>+	 * to determine that modified fields</div><div class='add'>+	 * are NOT ttl &amp; hop_limit only.</div><div class='add'>+	 */</div><div class='add'>+	if (htype == FLOW_ACT_MANGLE_HDR_TYPE_IP4) {</div><div class='add'>+		struct ip_ttl_word *ttl_word =</div><div class='add'>+			(struct ip_ttl_word *)&amp;mask;</div><div class='add'>+</div><div class='add'>+		if (offset != offsetof(struct iphdr, ttl) ||</div><div class='add'>+		    ttl_word-&gt;protocol ||</div><div class='add'>+		    ttl_word-&gt;check) {</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	} else if (htype == FLOW_ACT_MANGLE_HDR_TYPE_IP6) {</div><div class='add'>+		struct ipv6_hoplimit_word *hoplimit_word =</div><div class='add'>+			(struct ipv6_hoplimit_word *)&amp;mask;</div><div class='add'>+</div><div class='add'>+		if (offset != offsetof(struct ipv6hdr, payload_len) ||</div><div class='add'>+		    hoplimit_word-&gt;payload_len ||</div><div class='add'>+		    hoplimit_word-&gt;nexthdr) {</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 bool modify_header_match_supported(struct mlx5_flow_spec *spec,</div><div class='ctx'> 					  struct flow_action *flow_action,</div><div class='ctx'> 					  u32 actions,</div><div class='hunk'>@@ -2165,16 +2315,12 @@ static bool modify_header_match_supported(struct mlx5_flow_spec *spec,</div><div class='ctx'> {</div><div class='ctx'> 	const struct flow_action_entry *act;</div><div class='ctx'> 	bool modify_ip_header;</div><div class='del'>-	u8 htype, ip_proto;</div><div class='ctx'> 	void *headers_v;</div><div class='ctx'> 	u16 ethertype;</div><div class='add'>+	u8 ip_proto;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (actions &amp; MLX5_FLOW_CONTEXT_ACTION_DECAP)</div><div class='del'>-		headers_v = MLX5_ADDR_OF(fte_match_param, spec-&gt;match_value, inner_headers);</div><div class='del'>-	else</div><div class='del'>-		headers_v = MLX5_ADDR_OF(fte_match_param, spec-&gt;match_value, outer_headers);</div><div class='del'>-</div><div class='add'>+	headers_v = get_match_headers_value(actions, spec);</div><div class='ctx'> 	ethertype = MLX5_GET(fte_match_set_lyr_2_4, headers_v, ethertype);</div><div class='ctx'> </div><div class='ctx'> 	/* for non-IP we only re-write MACs, so we're okay */</div><div class='hunk'>@@ -2187,9 +2333,7 @@ static bool modify_header_match_supported(struct mlx5_flow_spec *spec,</div><div class='ctx'> 		    act-&gt;id != FLOW_ACTION_ADD)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		htype = act-&gt;mangle.htype;</div><div class='del'>-		if (htype == FLOW_ACT_MANGLE_HDR_TYPE_IP4 ||</div><div class='del'>-		    htype == FLOW_ACT_MANGLE_HDR_TYPE_IP6) {</div><div class='add'>+		if (is_action_keys_supported(act)) {</div><div class='ctx'> 			modify_ip_header = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2222,7 +2366,8 @@ static bool actions_match_supported(struct mlx5e_priv *priv,</div><div class='ctx'> 		actions = flow-&gt;nic_attr-&gt;action;</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; MLX5E_TC_FLOW_EGRESS &amp;&amp;</div><div class='del'>-	    !(actions &amp; MLX5_FLOW_CONTEXT_ACTION_DECAP))</div><div class='add'>+	    !((actions &amp; MLX5_FLOW_CONTEXT_ACTION_DECAP) ||</div><div class='add'>+	      (actions &amp; MLX5_FLOW_CONTEXT_ACTION_VLAN_POP)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (actions &amp; MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)</div><div class='hunk'>@@ -2247,6 +2392,74 @@ static bool same_hw_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv)</div><div class='ctx'> 	return (fsystem_guid == psystem_guid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int add_vlan_rewrite_action(struct mlx5e_priv *priv, int namespace,</div><div class='add'>+				   const struct flow_action_entry *act,</div><div class='add'>+				   struct mlx5e_tc_flow_parse_attr *parse_attr,</div><div class='add'>+				   struct pedit_headers_action *hdrs,</div><div class='add'>+				   u32 *action, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u16 mask16 = VLAN_VID_MASK;</div><div class='add'>+	u16 val16 = act-&gt;vlan.vid &amp; VLAN_VID_MASK;</div><div class='add'>+	const struct flow_action_entry pedit_act = {</div><div class='add'>+		.id = FLOW_ACTION_MANGLE,</div><div class='add'>+		.mangle.htype = FLOW_ACT_MANGLE_HDR_TYPE_ETH,</div><div class='add'>+		.mangle.offset = offsetof(struct vlan_ethhdr, h_vlan_TCI),</div><div class='add'>+		.mangle.mask = ~(u32)be16_to_cpu(*(__be16 *)&amp;mask16),</div><div class='add'>+		.mangle.val = (u32)be16_to_cpu(*(__be16 *)&amp;val16),</div><div class='add'>+	};</div><div class='add'>+	u8 match_prio_mask, match_prio_val;</div><div class='add'>+	void *headers_c, *headers_v;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	headers_c = get_match_headers_criteria(*action, &amp;parse_attr-&gt;spec);</div><div class='add'>+	headers_v = get_match_headers_value(*action, &amp;parse_attr-&gt;spec);</div><div class='add'>+</div><div class='add'>+	if (!(MLX5_GET(fte_match_set_lyr_2_4, headers_c, cvlan_tag) &amp;&amp;</div><div class='add'>+	      MLX5_GET(fte_match_set_lyr_2_4, headers_v, cvlan_tag))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "VLAN rewrite action must have VLAN protocol match");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match_prio_mask = MLX5_GET(fte_match_set_lyr_2_4, headers_c, first_prio);</div><div class='add'>+	match_prio_val = MLX5_GET(fte_match_set_lyr_2_4, headers_v, first_prio);</div><div class='add'>+	if (act-&gt;vlan.prio != (match_prio_val &amp; match_prio_mask)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Changing VLAN prio is not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = parse_tc_pedit_action(priv, &amp;pedit_act, namespace, parse_attr,</div><div class='add'>+				    hdrs, NULL);</div><div class='add'>+	*action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;</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'>+add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv,</div><div class='add'>+				 struct mlx5e_tc_flow_parse_attr *parse_attr,</div><div class='add'>+				 struct pedit_headers_action *hdrs,</div><div class='add'>+				 u32 *action, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct flow_action_entry prio_tag_act = {</div><div class='add'>+		.vlan.vid = 0,</div><div class='add'>+		.vlan.prio =</div><div class='add'>+			MLX5_GET(fte_match_set_lyr_2_4,</div><div class='add'>+				 get_match_headers_value(*action,</div><div class='add'>+							 &amp;parse_attr-&gt;spec),</div><div class='add'>+				 first_prio) &amp;</div><div class='add'>+			MLX5_GET(fte_match_set_lyr_2_4,</div><div class='add'>+				 get_match_headers_criteria(*action,</div><div class='add'>+							    &amp;parse_attr-&gt;spec),</div><div class='add'>+				 first_prio),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return add_vlan_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB,</div><div class='add'>+				       &amp;prio_tag_act, parse_attr, hdrs, action,</div><div class='add'>+				       extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int parse_tc_nic_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 				struct flow_action *flow_action,</div><div class='ctx'> 				struct mlx5e_tc_flow_parse_attr *parse_attr,</div><div class='hunk'>@@ -2282,6 +2495,15 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 			action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR |</div><div class='ctx'> 				  MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;</div><div class='ctx'> 			break;</div><div class='add'>+		case FLOW_ACTION_VLAN_MANGLE:</div><div class='add'>+			err = add_vlan_rewrite_action(priv,</div><div class='add'>+						      MLX5_FLOW_NAMESPACE_KERNEL,</div><div class='add'>+						      act, parse_attr, hdrs,</div><div class='add'>+						      &amp;action, extack);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='ctx'> 		case FLOW_ACTION_CSUM:</div><div class='ctx'> 			if (csum_offload_supported(priv, action,</div><div class='ctx'> 						   act-&gt;csum_flags,</div><div class='hunk'>@@ -2321,16 +2543,22 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "The offload action is not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdrs[TCA_PEDIT_KEY_EX_CMD_SET].pedits ||</div><div class='ctx'> 	    hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].pedits) {</div><div class='ctx'> 		err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_KERNEL,</div><div class='del'>-					    parse_attr, hdrs, extack);</div><div class='add'>+					    parse_attr, hdrs, &amp;action, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+		/* in case all pedit actions are skipped, remove the MOD_HDR</div><div class='add'>+		 * flag.</div><div class='add'>+		 */</div><div class='add'>+		if (parse_attr-&gt;num_mod_hdr_actions == 0)</div><div class='add'>+			action &amp;= ~MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr-&gt;action = action;</div><div class='hunk'>@@ -2340,15 +2568,22 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cmp_encap_info(struct ip_tunnel_key *a,</div><div class='del'>-				 struct ip_tunnel_key *b)</div><div class='add'>+struct encap_key {</div><div class='add'>+	struct ip_tunnel_key *ip_tun_key;</div><div class='add'>+	int tunnel_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int cmp_encap_info(struct encap_key *a,</div><div class='add'>+				 struct encap_key *b)</div><div class='ctx'> {</div><div class='del'>-	return memcmp(a, b, sizeof(*a));</div><div class='add'>+	return memcmp(a-&gt;ip_tun_key, b-&gt;ip_tun_key, sizeof(*a-&gt;ip_tun_key)) ||</div><div class='add'>+	       a-&gt;tunnel_type != b-&gt;tunnel_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int hash_encap_info(struct ip_tunnel_key *key)</div><div class='add'>+static inline int hash_encap_info(struct encap_key *key)</div><div class='ctx'> {</div><div class='del'>-	return jhash(key, sizeof(*key), 0);</div><div class='add'>+	return jhash(key-&gt;ip_tun_key, sizeof(*key-&gt;ip_tun_key),</div><div class='add'>+		     key-&gt;tunnel_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2379,7 +2614,7 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv,</div><div class='ctx'> 	struct mlx5_esw_flow_attr *attr = flow-&gt;esw_attr;</div><div class='ctx'> 	struct mlx5e_tc_flow_parse_attr *parse_attr;</div><div class='ctx'> 	struct ip_tunnel_info *tun_info;</div><div class='del'>-	struct ip_tunnel_key *key;</div><div class='add'>+	struct encap_key key, e_key;</div><div class='ctx'> 	struct mlx5e_encap_entry *e;</div><div class='ctx'> 	unsigned short family;</div><div class='ctx'> 	uintptr_t hash_key;</div><div class='hunk'>@@ -2389,13 +2624,16 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv,</div><div class='ctx'> 	parse_attr = attr-&gt;parse_attr;</div><div class='ctx'> 	tun_info = &amp;parse_attr-&gt;tun_info[out_index];</div><div class='ctx'> 	family = ip_tunnel_info_af(tun_info);</div><div class='del'>-	key = &amp;tun_info-&gt;key;</div><div class='add'>+	key.ip_tun_key = &amp;tun_info-&gt;key;</div><div class='add'>+	key.tunnel_type = mlx5e_tc_tun_get_type(mirred_dev);</div><div class='ctx'> </div><div class='del'>-	hash_key = hash_encap_info(key);</div><div class='add'>+	hash_key = hash_encap_info(&amp;key);</div><div class='ctx'> </div><div class='ctx'> 	hash_for_each_possible_rcu(esw-&gt;offloads.encap_tbl, e,</div><div class='ctx'> 				   encap_hlist, hash_key) {</div><div class='del'>-		if (!cmp_encap_info(&amp;e-&gt;tun_info.key, key)) {</div><div class='add'>+		e_key.ip_tun_key = &amp;e-&gt;tun_info.key;</div><div class='add'>+		e_key.tunnel_type = e-&gt;tunnel_type;</div><div class='add'>+		if (!cmp_encap_info(&amp;e_key, &amp;key)) {</div><div class='ctx'> 			found = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2490,8 +2728,7 @@ static int parse_tc_vlan_action(struct mlx5e_priv *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		/* action is FLOW_ACT_VLAN_MANGLE */</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr-&gt;total_vlan = vlan_idx + 1;</div><div class='hunk'>@@ -2499,15 +2736,60 @@ static int parse_tc_vlan_action(struct mlx5e_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int add_vlan_push_action(struct mlx5e_priv *priv,</div><div class='add'>+				struct mlx5_esw_flow_attr *attr,</div><div class='add'>+				struct net_device **out_dev,</div><div class='add'>+				u32 *action)</div><div class='add'>+{</div><div class='add'>+	struct net_device *vlan_dev = *out_dev;</div><div class='add'>+	struct flow_action_entry vlan_act = {</div><div class='add'>+		.id = FLOW_ACTION_VLAN_PUSH,</div><div class='add'>+		.vlan.vid = vlan_dev_vlan_id(vlan_dev),</div><div class='add'>+		.vlan.proto = vlan_dev_vlan_proto(vlan_dev),</div><div class='add'>+		.vlan.prio = 0,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = parse_tc_vlan_action(priv, &amp;vlan_act, attr, action);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*out_dev = dev_get_by_index_rcu(dev_net(vlan_dev),</div><div class='add'>+					dev_get_iflink(vlan_dev));</div><div class='add'>+	if (is_vlan_dev(*out_dev))</div><div class='add'>+		err = add_vlan_push_action(priv, attr, out_dev, action);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_vlan_pop_action(struct mlx5e_priv *priv,</div><div class='add'>+			       struct mlx5_esw_flow_attr *attr,</div><div class='add'>+			       u32 *action)</div><div class='add'>+{</div><div class='add'>+	int nest_level = vlan_get_encap_level(attr-&gt;parse_attr-&gt;filter_dev);</div><div class='add'>+	struct flow_action_entry vlan_act = {</div><div class='add'>+		.id = FLOW_ACTION_VLAN_POP,</div><div class='add'>+	};</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	while (nest_level--) {</div><div class='add'>+		err = parse_tc_vlan_action(priv, &amp;vlan_act, attr, action);</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 err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int parse_tc_fdb_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 				struct flow_action *flow_action,</div><div class='del'>-				struct mlx5e_tc_flow_parse_attr *parse_attr,</div><div class='ctx'> 				struct mlx5e_tc_flow *flow,</div><div class='ctx'> 				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct pedit_headers_action hdrs[2] = {};</div><div class='ctx'> 	struct mlx5_eswitch *esw = priv-&gt;mdev-&gt;priv.eswitch;</div><div class='ctx'> 	struct mlx5_esw_flow_attr *attr = flow-&gt;esw_attr;</div><div class='add'>+	struct mlx5e_tc_flow_parse_attr *parse_attr = attr-&gt;parse_attr;</div><div class='ctx'> 	struct mlx5e_rep_priv *rpriv = priv-&gt;ppriv;</div><div class='ctx'> 	const struct ip_tunnel_info *info = NULL;</div><div class='ctx'> 	const struct flow_action_entry *act;</div><div class='hunk'>@@ -2579,6 +2861,20 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 				    uplink_upper == out_dev)</div><div class='ctx'> 					out_dev = uplink_dev;</div><div class='ctx'> </div><div class='add'>+				if (is_vlan_dev(out_dev)) {</div><div class='add'>+					err = add_vlan_push_action(priv, attr,</div><div class='add'>+								   &amp;out_dev,</div><div class='add'>+								   &amp;action);</div><div class='add'>+					if (err)</div><div class='add'>+						return err;</div><div class='add'>+				}</div><div class='add'>+				if (is_vlan_dev(parse_attr-&gt;filter_dev)) {</div><div class='add'>+					err = add_vlan_pop_action(priv, attr,</div><div class='add'>+								  &amp;action);</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 (!mlx5e_eswitch_rep(out_dev))</div><div class='ctx'> 					return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -2592,7 +2888,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 					out_dev-&gt;ifindex;</div><div class='ctx'> 				parse_attr-&gt;tun_info[attr-&gt;out_count] = *info;</div><div class='ctx'> 				encap = false;</div><div class='del'>-				attr-&gt;parse_attr = parse_attr;</div><div class='ctx'> 				attr-&gt;dests[attr-&gt;out_count].flags |=</div><div class='ctx'> 					MLX5_ESW_DEST_ENCAP;</div><div class='ctx'> 				attr-&gt;out_count++;</div><div class='hunk'>@@ -2625,7 +2920,27 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLOW_ACTION_VLAN_PUSH:</div><div class='ctx'> 		case FLOW_ACTION_VLAN_POP:</div><div class='del'>-			err = parse_tc_vlan_action(priv, act, attr, &amp;action);</div><div class='add'>+			if (act-&gt;id == FLOW_ACTION_VLAN_PUSH &amp;&amp;</div><div class='add'>+			    (action &amp; MLX5_FLOW_CONTEXT_ACTION_VLAN_POP)) {</div><div class='add'>+				/* Replace vlan pop+push with vlan modify */</div><div class='add'>+				action &amp;= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;</div><div class='add'>+				err = add_vlan_rewrite_action(priv,</div><div class='add'>+							      MLX5_FLOW_NAMESPACE_FDB,</div><div class='add'>+							      act, parse_attr, hdrs,</div><div class='add'>+							      &amp;action, extack);</div><div class='add'>+			} else {</div><div class='add'>+				err = parse_tc_vlan_action(priv, act, attr, &amp;action);</div><div class='add'>+			}</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			attr-&gt;split_count = attr-&gt;out_count;</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_VLAN_MANGLE:</div><div class='add'>+			err = add_vlan_rewrite_action(priv,</div><div class='add'>+						      MLX5_FLOW_NAMESPACE_FDB,</div><div class='add'>+						      act, parse_attr, hdrs,</div><div class='add'>+						      &amp;action, extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2651,16 +2966,39 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		default:</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "The offload action is not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (MLX5_CAP_GEN(esw-&gt;dev, prio_tag_required) &amp;&amp;</div><div class='add'>+	    action &amp; MLX5_FLOW_CONTEXT_ACTION_VLAN_POP) {</div><div class='add'>+		/* For prio tag mode, replace vlan pop with rewrite vlan prio</div><div class='add'>+		 * tag rewrite.</div><div class='add'>+		 */</div><div class='add'>+		action &amp;= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;</div><div class='add'>+		err = add_vlan_prio_tag_rewrite_action(priv, parse_attr, hdrs,</div><div class='add'>+						       &amp;action, 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 (hdrs[TCA_PEDIT_KEY_EX_CMD_SET].pedits ||</div><div class='ctx'> 	    hdrs[TCA_PEDIT_KEY_EX_CMD_ADD].pedits) {</div><div class='del'>-		err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_KERNEL,</div><div class='del'>-					    parse_attr, hdrs, extack);</div><div class='add'>+		err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB,</div><div class='add'>+					    parse_attr, hdrs, &amp;action, extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+		/* in case all pedit actions are skipped, remove the MOD_HDR</div><div class='add'>+		 * flag. we might have set split_count either by pedit or</div><div class='add'>+		 * pop/push. if there is no pop/push either, reset it too.</div><div class='add'>+		 */</div><div class='add'>+		if (parse_attr-&gt;num_mod_hdr_actions == 0) {</div><div class='add'>+			action &amp;= ~MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;</div><div class='add'>+			if (!((action &amp; MLX5_FLOW_CONTEXT_ACTION_VLAN_POP) ||</div><div class='add'>+			      (action &amp; MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH)))</div><div class='add'>+				attr-&gt;split_count = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr-&gt;action = action;</div><div class='hunk'>@@ -2829,7 +3167,7 @@ __mlx5e_add_fdb_flow(struct mlx5e_priv *priv,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='del'>-	err = parse_tc_fdb_actions(priv, &amp;rule-&gt;action, parse_attr, flow, extack);</div><div class='add'>+	err = parse_tc_fdb_actions(priv, &amp;rule-&gt;action, flow, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='hunk'>@@ -3026,6 +3364,7 @@ int mlx5e_configure_flower(struct net_device *dev, struct mlx5e_priv *priv,</div><div class='ctx'> 		netdev_warn_once(priv-&gt;netdev,</div><div class='ctx'> 				 "flow cookie %lx already exists, ignoring\n",</div><div class='ctx'> 				 f-&gt;cookie);</div><div class='add'>+		err = -EEXIST;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c<br/>index 25a8f8260c14..7b61126fcec9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_tx.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/if_vlan.h&gt;</div><div class='add'>+#include &lt;net/geneve.h&gt;</div><div class='ctx'> #include &lt;net/dsfield.h&gt;</div><div class='ctx'> #include "en.h"</div><div class='ctx'> #include "ipoib/ipoib.h"</div><div class='hunk'>@@ -110,11 +111,10 @@ static inline int mlx5e_get_dscp_up(struct mlx5e_priv *priv, struct sk_buff *skb</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *sb_dev,</div><div class='del'>-		       select_queue_fallback_t fallback)</div><div class='add'>+		       struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='add'>+	int channel_ix = netdev_pick_tx(dev, skb, NULL);</div><div class='ctx'> 	struct mlx5e_priv *priv = netdev_priv(dev);</div><div class='del'>-	int channel_ix = fallback(dev, skb, NULL);</div><div class='ctx'> 	u16 num_channels;</div><div class='ctx'> 	int up = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -163,7 +163,7 @@ static inline u16 mlx5e_calc_min_inline(enum mlx5_inline_modes mode,</div><div class='ctx'> 	case MLX5_INLINE_MODE_NONE:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case MLX5_INLINE_MODE_TCP_UDP:</div><div class='del'>-		hlen = eth_get_headlen(skb-&gt;data, skb_headlen(skb));</div><div class='add'>+		hlen = eth_get_headlen(skb-&gt;dev, skb-&gt;data, skb_headlen(skb));</div><div class='ctx'> 		if (hlen == ETH_HLEN &amp;&amp; !skb_vlan_tag_present(skb))</div><div class='ctx'> 			hlen += VLAN_HLEN;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -297,7 +297,8 @@ static inline void mlx5e_fill_sq_frag_edge(struct mlx5e_txqsq *sq,</div><div class='ctx'> static inline void</div><div class='ctx'> mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 		     u8 opcode, u16 ds_cnt, u8 num_wqebbs, u32 num_bytes, u8 num_dma,</div><div class='del'>-		     struct mlx5e_tx_wqe_info *wi, struct mlx5_wqe_ctrl_seg *cseg)</div><div class='add'>+		     struct mlx5e_tx_wqe_info *wi, struct mlx5_wqe_ctrl_seg *cseg,</div><div class='add'>+		     bool xmit_more)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_wq_cyc *wq = &amp;sq-&gt;wq;</div><div class='ctx'> </div><div class='hunk'>@@ -320,14 +321,14 @@ mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 		sq-&gt;stats-&gt;stopped++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;xmit_more || netif_xmit_stopped(sq-&gt;txq))</div><div class='add'>+	if (!xmit_more || netif_xmit_stopped(sq-&gt;txq))</div><div class='ctx'> 		mlx5e_notify_hw(wq, sq-&gt;pc, sq-&gt;uar_map, cseg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define INL_HDR_START_SZ (sizeof(((struct mlx5_wqe_eth_seg *)NULL)-&gt;inline_hdr.start))</div><div class='ctx'> </div><div class='ctx'> netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='del'>-			  struct mlx5e_tx_wqe *wqe, u16 pi)</div><div class='add'>+			  struct mlx5e_tx_wqe *wqe, u16 pi, bool xmit_more)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_wq_cyc *wq = &amp;sq-&gt;wq;</div><div class='ctx'> 	struct mlx5_wqe_ctrl_seg *cseg;</div><div class='hunk'>@@ -360,7 +361,7 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;bytes     += num_bytes;</div><div class='del'>-	stats-&gt;xmit_more += skb-&gt;xmit_more;</div><div class='add'>+	stats-&gt;xmit_more += netdev_xmit_more();</div><div class='ctx'> </div><div class='ctx'> 	headlen = skb-&gt;len - ihs - skb-&gt;data_len;</div><div class='ctx'> 	ds_cnt += !!headlen;</div><div class='hunk'>@@ -392,6 +393,10 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 	eseg = &amp;wqe-&gt;eth;</div><div class='ctx'> 	dseg =  wqe-&gt;data;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_GENEVE)</div><div class='add'>+	if (skb-&gt;encapsulation)</div><div class='add'>+		mlx5e_tx_tunnel_accel(skb, eseg);</div><div class='add'>+#endif</div><div class='ctx'> 	mlx5e_txwqe_build_eseg_csum(sq, skb, eseg);</div><div class='ctx'> </div><div class='ctx'> 	eseg-&gt;mss = mss;</div><div class='hunk'>@@ -419,7 +424,7 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 		goto err_drop;</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_txwqe_complete(sq, skb, opcode, ds_cnt, num_wqebbs, num_bytes,</div><div class='del'>-			     num_dma, wi, cseg);</div><div class='add'>+			     num_dma, wi, cseg, xmit_more);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='hunk'>@@ -445,7 +450,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>-	return mlx5e_sq_xmit(sq, skb, wqe, pi);</div><div class='add'>+	return mlx5e_sq_xmit(sq, skb, wqe, pi, netdev_xmit_more());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5e_dump_error_cqe(struct mlx5e_txqsq *sq,</div><div class='hunk'>@@ -655,7 +660,7 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;bytes     += num_bytes;</div><div class='del'>-	stats-&gt;xmit_more += skb-&gt;xmit_more;</div><div class='add'>+	stats-&gt;xmit_more += netdev_xmit_more();</div><div class='ctx'> </div><div class='ctx'> 	headlen = skb-&gt;len - ihs - skb-&gt;data_len;</div><div class='ctx'> 	ds_cnt += !!headlen;</div><div class='hunk'>@@ -700,7 +705,7 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,</div><div class='ctx'> 		goto err_drop;</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_txwqe_complete(sq, skb, opcode, ds_cnt, num_wqebbs, num_bytes,</div><div class='del'>-			     num_dma, wi, cseg);</div><div class='add'>+			     num_dma, wi, cseg, false);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c<br/>index b4af5e19f6ac..f9862bf75491 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c</a></div><div class='hunk'>@@ -71,6 +71,17 @@ static void mlx5e_handle_rx_dim(struct mlx5e_rq *rq)</div><div class='ctx'> 	net_dim(&amp;rq-&gt;dim, dim_sample);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mlx5e_trigger_irq(struct mlx5e_icosq *sq)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_wq_cyc *wq = &amp;sq-&gt;wq;</div><div class='add'>+	struct mlx5e_tx_wqe *nopwqe;</div><div class='add'>+	u16 pi = mlx5_wq_cyc_ctr2ix(wq, sq-&gt;pc);</div><div class='add'>+</div><div class='add'>+	sq-&gt;db.ico_wqe[pi].opcode = MLX5_OPCODE_NOP;</div><div class='add'>+	nopwqe = mlx5e_post_nop(wq, sq-&gt;sqn, &amp;sq-&gt;pc);</div><div class='add'>+	mlx5e_notify_hw(wq, sq-&gt;pc, sq-&gt;uar_map, &amp;nopwqe-&gt;ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx5e_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_channel *c = container_of(napi, struct mlx5e_channel,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c<br/>index bb6e5b5d9681..5aac97847721 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/eq.c</a></div><div class='hunk'>@@ -504,8 +504,7 @@ static u64 gather_async_events_mask(struct mlx5_core_dev *dev)</div><div class='ctx'> 	if (MLX5_VPORT_MANAGER(dev))</div><div class='ctx'> 		async_event_mask |= (1ull &lt;&lt; MLX5_EVENT_TYPE_NIC_VPORT_CHANGE);</div><div class='ctx'> </div><div class='del'>-	if (MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_ETH &amp;&amp;</div><div class='del'>-	    MLX5_CAP_GEN(dev, general_notification_event))</div><div class='add'>+	if (MLX5_CAP_GEN(dev, general_notification_event))</div><div class='ctx'> 		async_event_mask |= (1ull &lt;&lt; MLX5_EVENT_TYPE_GENERAL_EVENT);</div><div class='ctx'> </div><div class='ctx'> 	if (MLX5_CAP_GEN(dev, port_module_event))</div><div class='hunk'>@@ -707,7 +706,7 @@ void mlx5_eq_update_ci(struct mlx5_eq *eq, u32 cc, bool arm)</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel((__force u32)cpu_to_be32(val), addr);</div><div class='ctx'> 	/* We still want ordering, just not swabbing, so add a barrier */</div><div class='del'>-	mb();</div><div class='add'>+	wmb();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlx5_eq_update_ci);</div><div class='ctx'> </div><div class='hunk'>@@ -900,14 +899,12 @@ mlx5_comp_irq_get_affinity_mask(struct mlx5_core_dev *dev, int vector)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlx5_comp_irq_get_affinity_mask);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> struct cpu_rmap *mlx5_eq_table_get_rmap(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	return dev-&gt;priv.eq_table-&gt;rmap;</div><div class='del'>-#else</div><div class='del'>-	return NULL;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct mlx5_eq_comp *mlx5_eqn2comp_eq(struct mlx5_core_dev *dev, int eqn)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c<br/>index ecd2c747f726..9ea0ccfe5ef5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.c</a></div><div class='hunk'>@@ -72,25 +72,22 @@ static void esw_cleanup_vepa_rules(struct mlx5_eswitch *esw);</div><div class='ctx'> 			    MC_ADDR_CHANGE | \</div><div class='ctx'> 			    PROMISC_CHANGE)</div><div class='ctx'> </div><div class='del'>-/* The vport getter/iterator are only valid after esw-&gt;total_vports</div><div class='del'>- * and vport-&gt;vport are initialized in mlx5_eswitch_init.</div><div class='del'>- */</div><div class='del'>-#define mlx5_esw_for_all_vports(esw, i, vport)			\</div><div class='del'>-	for ((i) = MLX5_VPORT_PF;				\</div><div class='del'>-	     (vport) = &amp;(esw)-&gt;vports[i],			\</div><div class='del'>-	     (i) &lt; (esw)-&gt;total_vports; (i)++)</div><div class='add'>+struct mlx5_vport *__must_check</div><div class='add'>+mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num)</div><div class='add'>+{</div><div class='add'>+	u16 idx;</div><div class='ctx'> </div><div class='del'>-#define mlx5_esw_for_each_vf_vport(esw, i, vport, nvfs)	\</div><div class='del'>-	for ((i) = MLX5_VPORT_FIRST_VF;				\</div><div class='del'>-	     (vport) = &amp;(esw)-&gt;vports[i],			\</div><div class='del'>-	     (i) &lt;= (nvfs); (i)++)</div><div class='add'>+	if (!esw || !MLX5_CAP_GEN(esw-&gt;dev, vport_group_manager))</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='del'>-static struct mlx5_vport *mlx5_eswitch_get_vport(struct mlx5_eswitch *esw,</div><div class='del'>-						 u16 vport_num)</div><div class='del'>-{</div><div class='del'>-	u16 idx = mlx5_eswitch_vport_num_to_index(esw, vport_num);</div><div class='add'>+	idx = mlx5_eswitch_vport_num_to_index(esw, vport_num);</div><div class='add'>+</div><div class='add'>+	if (idx &gt; esw-&gt;total_vports - 1) {</div><div class='add'>+		esw_debug(esw-&gt;dev, "vport out of range: num(0x%x), idx(0x%x)\n",</div><div class='add'>+			  vport_num, idx);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(idx &gt; esw-&gt;total_vports - 1);</div><div class='ctx'> 	return &amp;esw-&gt;vports[idx];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -105,8 +102,7 @@ static int arm_vport_context_events_cmd(struct mlx5_core_dev *dev, u16 vport,</div><div class='ctx'> 		 opcode, MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT);</div><div class='ctx'> 	MLX5_SET(modify_nic_vport_context_in, in, field_select.change_event, 1);</div><div class='ctx'> 	MLX5_SET(modify_nic_vport_context_in, in, vport_number, vport);</div><div class='del'>-	if (vport)</div><div class='del'>-		MLX5_SET(modify_nic_vport_context_in, in, other_vport, 1);</div><div class='add'>+	MLX5_SET(modify_nic_vport_context_in, in, other_vport, 1);</div><div class='ctx'> 	nic_vport_ctx = MLX5_ADDR_OF(modify_nic_vport_context_in,</div><div class='ctx'> 				     in, nic_vport_context);</div><div class='ctx'> </div><div class='hunk'>@@ -134,8 +130,7 @@ static int modify_esw_vport_context_cmd(struct mlx5_core_dev *dev, u16 vport,</div><div class='ctx'> 	MLX5_SET(modify_esw_vport_context_in, in, opcode,</div><div class='ctx'> 		 MLX5_CMD_OP_MODIFY_ESW_VPORT_CONTEXT);</div><div class='ctx'> 	MLX5_SET(modify_esw_vport_context_in, in, vport_number, vport);</div><div class='del'>-	if (vport)</div><div class='del'>-		MLX5_SET(modify_esw_vport_context_in, in, other_vport, 1);</div><div class='add'>+	MLX5_SET(modify_esw_vport_context_in, in, other_vport, 1);</div><div class='ctx'> 	return mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -431,6 +426,8 @@ static int esw_create_legacy_table(struct mlx5_eswitch *esw)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;esw-&gt;fdb_table.legacy, 0, sizeof(struct legacy_fdb));</div><div class='add'>+</div><div class='ctx'> 	err = esw_create_legacy_vepa_table(esw);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -644,9 +641,8 @@ static int esw_del_mc_addr(struct mlx5_eswitch *esw, struct vport_addr *vaddr)</div><div class='ctx'> </div><div class='ctx'> /* Apply vport UC/MC list to HW l2 table and FDB table */</div><div class='ctx'> static void esw_apply_vport_addr_list(struct mlx5_eswitch *esw,</div><div class='del'>-				      u16 vport_num, int list_type)</div><div class='add'>+				      struct mlx5_vport *vport, int list_type)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	bool is_uc = list_type == MLX5_NVPRT_LIST_TYPE_UC;</div><div class='ctx'> 	vport_addr_action vport_addr_add;</div><div class='ctx'> 	vport_addr_action vport_addr_del;</div><div class='hunk'>@@ -679,9 +675,8 @@ static void esw_apply_vport_addr_list(struct mlx5_eswitch *esw,</div><div class='ctx'> </div><div class='ctx'> /* Sync vport UC/MC list from vport context */</div><div class='ctx'> static void esw_update_vport_addr_list(struct mlx5_eswitch *esw,</div><div class='del'>-				       u16 vport_num, int list_type)</div><div class='add'>+				       struct mlx5_vport *vport, int list_type)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	bool is_uc = list_type == MLX5_NVPRT_LIST_TYPE_UC;</div><div class='ctx'> 	u8 (*mac_list)[ETH_ALEN];</div><div class='ctx'> 	struct l2addr_node *node;</div><div class='hunk'>@@ -710,12 +705,12 @@ static void esw_update_vport_addr_list(struct mlx5_eswitch *esw,</div><div class='ctx'> 	if (!vport-&gt;enabled)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = mlx5_query_nic_vport_mac_list(esw-&gt;dev, vport_num, list_type,</div><div class='add'>+	err = mlx5_query_nic_vport_mac_list(esw-&gt;dev, vport-&gt;vport, list_type,</div><div class='ctx'> 					    mac_list, &amp;size);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	esw_debug(esw-&gt;dev, "vport[%d] context update %s list size (%d)\n",</div><div class='del'>-		  vport_num, is_uc ? "UC" : "MC", size);</div><div class='add'>+		  vport-&gt;vport, is_uc ? "UC" : "MC", size);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; size; i++) {</div><div class='ctx'> 		if (is_uc &amp;&amp; !is_valid_ether_addr(mac_list[i]))</div><div class='hunk'>@@ -753,10 +748,10 @@ static void esw_update_vport_addr_list(struct mlx5_eswitch *esw,</div><div class='ctx'> 		if (!addr) {</div><div class='ctx'> 			esw_warn(esw-&gt;dev,</div><div class='ctx'> 				 "Failed to add MAC(%pM) to vport[%d] DB\n",</div><div class='del'>-				 mac_list[i], vport_num);</div><div class='add'>+				 mac_list[i], vport-&gt;vport);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		addr-&gt;vport = vport_num;</div><div class='add'>+		addr-&gt;vport = vport-&gt;vport;</div><div class='ctx'> 		addr-&gt;action = MLX5_ACTION_ADD;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -766,9 +761,9 @@ out:</div><div class='ctx'> /* Sync vport UC/MC list from vport context</div><div class='ctx'>  * Must be called after esw_update_vport_addr_list</div><div class='ctx'>  */</div><div class='del'>-static void esw_update_vport_mc_promisc(struct mlx5_eswitch *esw, u16 vport_num)</div><div class='add'>+static void esw_update_vport_mc_promisc(struct mlx5_eswitch *esw,</div><div class='add'>+					struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	struct l2addr_node *node;</div><div class='ctx'> 	struct vport_addr *addr;</div><div class='ctx'> 	struct hlist_head *hash;</div><div class='hunk'>@@ -791,20 +786,20 @@ static void esw_update_vport_mc_promisc(struct mlx5_eswitch *esw, u16 vport_num)</div><div class='ctx'> 		if (!addr) {</div><div class='ctx'> 			esw_warn(esw-&gt;dev,</div><div class='ctx'> 				 "Failed to add allmulti MAC(%pM) to vport[%d] DB\n",</div><div class='del'>-				 mac, vport_num);</div><div class='add'>+				 mac, vport-&gt;vport);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		addr-&gt;vport = vport_num;</div><div class='add'>+		addr-&gt;vport = vport-&gt;vport;</div><div class='ctx'> 		addr-&gt;action = MLX5_ACTION_ADD;</div><div class='ctx'> 		addr-&gt;mc_promisc = true;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Apply vport rx mode to HW FDB table */</div><div class='del'>-static void esw_apply_vport_rx_mode(struct mlx5_eswitch *esw, u16 vport_num,</div><div class='add'>+static void esw_apply_vport_rx_mode(struct mlx5_eswitch *esw,</div><div class='add'>+				    struct mlx5_vport *vport,</div><div class='ctx'> 				    bool promisc, bool mc_promisc)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	struct esw_mc_addr *allmulti_addr = &amp;esw-&gt;mc_promisc;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR_OR_NULL(vport-&gt;allmulti_rule) != mc_promisc)</div><div class='hunk'>@@ -812,7 +807,7 @@ static void esw_apply_vport_rx_mode(struct mlx5_eswitch *esw, u16 vport_num,</div><div class='ctx'> </div><div class='ctx'> 	if (mc_promisc) {</div><div class='ctx'> 		vport-&gt;allmulti_rule =</div><div class='del'>-				esw_fdb_set_vport_allmulti_rule(esw, vport_num);</div><div class='add'>+			esw_fdb_set_vport_allmulti_rule(esw, vport-&gt;vport);</div><div class='ctx'> 		if (!allmulti_addr-&gt;uplink_rule)</div><div class='ctx'> 			allmulti_addr-&gt;uplink_rule =</div><div class='ctx'> 				esw_fdb_set_vport_allmulti_rule(esw,</div><div class='hunk'>@@ -835,8 +830,8 @@ promisc:</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (promisc) {</div><div class='del'>-		vport-&gt;promisc_rule = esw_fdb_set_vport_promisc_rule(esw,</div><div class='del'>-								     vport_num);</div><div class='add'>+		vport-&gt;promisc_rule =</div><div class='add'>+			esw_fdb_set_vport_promisc_rule(esw, vport-&gt;vport);</div><div class='ctx'> 	} else if (vport-&gt;promisc_rule) {</div><div class='ctx'> 		mlx5_del_flow_rules(vport-&gt;promisc_rule);</div><div class='ctx'> 		vport-&gt;promisc_rule = NULL;</div><div class='hunk'>@@ -844,23 +839,23 @@ promisc:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sync vport rx mode from vport context */</div><div class='del'>-static void esw_update_vport_rx_mode(struct mlx5_eswitch *esw, u16 vport_num)</div><div class='add'>+static void esw_update_vport_rx_mode(struct mlx5_eswitch *esw,</div><div class='add'>+				     struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	int promisc_all = 0;</div><div class='ctx'> 	int promisc_uc = 0;</div><div class='ctx'> 	int promisc_mc = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_query_nic_vport_promisc(esw-&gt;dev,</div><div class='del'>-					   vport_num,</div><div class='add'>+					   vport-&gt;vport,</div><div class='ctx'> 					   &amp;promisc_uc,</div><div class='ctx'> 					   &amp;promisc_mc,</div><div class='ctx'> 					   &amp;promisc_all);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return;</div><div class='ctx'> 	esw_debug(esw-&gt;dev, "vport[%d] context update rx mode promisc_all=%d, all_multi=%d\n",</div><div class='del'>-		  vport_num, promisc_all, promisc_mc);</div><div class='add'>+		  vport-&gt;vport, promisc_all, promisc_mc);</div><div class='ctx'> </div><div class='ctx'> 	if (!vport-&gt;info.trusted || !vport-&gt;enabled) {</div><div class='ctx'> 		promisc_uc = 0;</div><div class='hunk'>@@ -868,7 +863,7 @@ static void esw_update_vport_rx_mode(struct mlx5_eswitch *esw, u16 vport_num)</div><div class='ctx'> 		promisc_all = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	esw_apply_vport_rx_mode(esw, vport_num, promisc_all,</div><div class='add'>+	esw_apply_vport_rx_mode(esw, vport, promisc_all,</div><div class='ctx'> 				(promisc_all || promisc_mc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -883,27 +878,21 @@ static void esw_vport_change_handle_locked(struct mlx5_vport *vport)</div><div class='ctx'> 		  vport-&gt;vport, mac);</div><div class='ctx'> </div><div class='ctx'> 	if (vport-&gt;enabled_events &amp; UC_ADDR_CHANGE) {</div><div class='del'>-		esw_update_vport_addr_list(esw, vport-&gt;vport,</div><div class='del'>-					   MLX5_NVPRT_LIST_TYPE_UC);</div><div class='del'>-		esw_apply_vport_addr_list(esw, vport-&gt;vport,</div><div class='del'>-					  MLX5_NVPRT_LIST_TYPE_UC);</div><div class='add'>+		esw_update_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_UC);</div><div class='add'>+		esw_apply_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_UC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vport-&gt;enabled_events &amp; MC_ADDR_CHANGE) {</div><div class='del'>-		esw_update_vport_addr_list(esw, vport-&gt;vport,</div><div class='del'>-					   MLX5_NVPRT_LIST_TYPE_MC);</div><div class='del'>-	}</div><div class='add'>+	if (vport-&gt;enabled_events &amp; MC_ADDR_CHANGE)</div><div class='add'>+		esw_update_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_MC);</div><div class='ctx'> </div><div class='ctx'> 	if (vport-&gt;enabled_events &amp; PROMISC_CHANGE) {</div><div class='del'>-		esw_update_vport_rx_mode(esw, vport-&gt;vport);</div><div class='add'>+		esw_update_vport_rx_mode(esw, vport);</div><div class='ctx'> 		if (!IS_ERR_OR_NULL(vport-&gt;allmulti_rule))</div><div class='del'>-			esw_update_vport_mc_promisc(esw, vport-&gt;vport);</div><div class='add'>+			esw_update_vport_mc_promisc(esw, vport);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vport-&gt;enabled_events &amp; (PROMISC_CHANGE | MC_ADDR_CHANGE)) {</div><div class='del'>-		esw_apply_vport_addr_list(esw, vport-&gt;vport,</div><div class='del'>-					  MLX5_NVPRT_LIST_TYPE_MC);</div><div class='del'>-	}</div><div class='add'>+	if (vport-&gt;enabled_events &amp; (PROMISC_CHANGE | MC_ADDR_CHANGE))</div><div class='add'>+		esw_apply_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_MC);</div><div class='ctx'> </div><div class='ctx'> 	esw_debug(esw-&gt;dev, "vport[%d] Context Changed: Done\n", vport-&gt;vport);</div><div class='ctx'> 	if (vport-&gt;enabled)</div><div class='hunk'>@@ -922,8 +911,8 @@ static void esw_vport_change_handler(struct work_struct *work)</div><div class='ctx'> 	mutex_unlock(&amp;esw-&gt;state_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,</div><div class='del'>-				       struct mlx5_vport *vport)</div><div class='add'>+int esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);</div><div class='ctx'> 	struct mlx5_flow_group *vlan_grp = NULL;</div><div class='hunk'>@@ -1006,8 +995,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esw_vport_cleanup_egress_rules(struct mlx5_eswitch *esw,</div><div class='del'>-					   struct mlx5_vport *vport)</div><div class='add'>+void esw_vport_cleanup_egress_rules(struct mlx5_eswitch *esw,</div><div class='add'>+				    struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(vport-&gt;egress.allowed_vlan))</div><div class='ctx'> 		mlx5_del_flow_rules(vport-&gt;egress.allowed_vlan);</div><div class='hunk'>@@ -1019,8 +1008,8 @@ static void esw_vport_cleanup_egress_rules(struct mlx5_eswitch *esw,</div><div class='ctx'> 	vport-&gt;egress.drop_rule = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw,</div><div class='del'>-					 struct mlx5_vport *vport)</div><div class='add'>+void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				  struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ERR_OR_NULL(vport-&gt;egress.acl))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1036,8 +1025,8 @@ static void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw,</div><div class='ctx'> 	vport-&gt;egress.acl = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,</div><div class='del'>-					struct mlx5_vport *vport)</div><div class='add'>+int esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				 struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);</div><div class='ctx'> 	struct mlx5_core_dev *dev = esw-&gt;dev;</div><div class='hunk'>@@ -1168,8 +1157,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,</div><div class='del'>-					    struct mlx5_vport *vport)</div><div class='add'>+void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,</div><div class='add'>+				     struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(vport-&gt;ingress.drop_rule))</div><div class='ctx'> 		mlx5_del_flow_rules(vport-&gt;ingress.drop_rule);</div><div class='hunk'>@@ -1181,8 +1170,8 @@ static void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,</div><div class='ctx'> 	vport-&gt;ingress.allow_rule = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,</div><div class='del'>-					  struct mlx5_vport *vport)</div><div class='add'>+void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				   struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ERR_OR_NULL(vport-&gt;ingress.acl))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1420,10 +1409,10 @@ static void esw_destroy_tsar(struct mlx5_eswitch *esw)</div><div class='ctx'> 	esw-&gt;qos.enabled = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num,</div><div class='add'>+static int esw_vport_enable_qos(struct mlx5_eswitch *esw,</div><div class='add'>+				struct mlx5_vport *vport,</div><div class='ctx'> 				u32 initial_max_rate, u32 initial_bw_share)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	u32 sched_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {0};</div><div class='ctx'> 	struct mlx5_core_dev *dev = esw-&gt;dev;</div><div class='ctx'> 	void *vport_elem;</div><div class='hunk'>@@ -1440,7 +1429,7 @@ static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num,</div><div class='ctx'> 		 SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);</div><div class='ctx'> 	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,</div><div class='ctx'> 				  element_attributes);</div><div class='del'>-	MLX5_SET(vport_element, vport_elem, vport_number, vport_num);</div><div class='add'>+	MLX5_SET(vport_element, vport_elem, vport_number, vport-&gt;vport);</div><div class='ctx'> 	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,</div><div class='ctx'> 		 esw-&gt;qos.root_tsar_id);</div><div class='ctx'> 	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,</div><div class='hunk'>@@ -1453,7 +1442,7 @@ static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num,</div><div class='ctx'> 						 &amp;vport-&gt;qos.esw_tsar_ix);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		esw_warn(esw-&gt;dev, "E-Switch create TSAR vport element failed (vport=%d,err=%d)\n",</div><div class='del'>-			 vport_num, err);</div><div class='add'>+			 vport-&gt;vport, err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1461,10 +1450,10 @@ static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esw_vport_disable_qos(struct mlx5_eswitch *esw, int vport_num)</div><div class='add'>+static void esw_vport_disable_qos(struct mlx5_eswitch *esw,</div><div class='add'>+				  struct mlx5_vport *vport)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!vport-&gt;qos.enabled)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1474,15 +1463,15 @@ static void esw_vport_disable_qos(struct mlx5_eswitch *esw, int vport_num)</div><div class='ctx'> 						  vport-&gt;qos.esw_tsar_ix);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		esw_warn(esw-&gt;dev, "E-Switch destroy TSAR vport element failed (vport=%d,err=%d)\n",</div><div class='del'>-			 vport_num, err);</div><div class='add'>+			 vport-&gt;vport, err);</div><div class='ctx'> </div><div class='ctx'> 	vport-&gt;qos.enabled = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int esw_vport_qos_config(struct mlx5_eswitch *esw, int vport_num,</div><div class='add'>+static int esw_vport_qos_config(struct mlx5_eswitch *esw,</div><div class='add'>+				struct mlx5_vport *vport,</div><div class='ctx'> 				u32 max_rate, u32 bw_share)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	u32 sched_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {0};</div><div class='ctx'> 	struct mlx5_core_dev *dev = esw-&gt;dev;</div><div class='ctx'> 	void *vport_elem;</div><div class='hunk'>@@ -1499,7 +1488,7 @@ static int esw_vport_qos_config(struct mlx5_eswitch *esw, int vport_num,</div><div class='ctx'> 		 SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);</div><div class='ctx'> 	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,</div><div class='ctx'> 				  element_attributes);</div><div class='del'>-	MLX5_SET(vport_element, vport_elem, vport_number, vport_num);</div><div class='add'>+	MLX5_SET(vport_element, vport_elem, vport_number, vport-&gt;vport);</div><div class='ctx'> 	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,</div><div class='ctx'> 		 esw-&gt;qos.root_tsar_id);</div><div class='ctx'> 	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,</div><div class='hunk'>@@ -1515,7 +1504,7 @@ static int esw_vport_qos_config(struct mlx5_eswitch *esw, int vport_num,</div><div class='ctx'> 						 bitmask);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		esw_warn(esw-&gt;dev, "E-Switch modify TSAR vport element failed (vport=%d,err=%d)\n",</div><div class='del'>-			 vport_num, err);</div><div class='add'>+			 vport-&gt;vport, err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1618,7 +1607,7 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,</div><div class='ctx'> 	esw_apply_vport_conf(esw, vport);</div><div class='ctx'> </div><div class='ctx'> 	/* Attach vport to the eswitch rate limiter */</div><div class='del'>-	if (esw_vport_enable_qos(esw, vport_num, vport-&gt;info.max_rate,</div><div class='add'>+	if (esw_vport_enable_qos(esw, vport, vport-&gt;info.max_rate,</div><div class='ctx'> 				 vport-&gt;qos.bw_share))</div><div class='ctx'> 		esw_warn(esw-&gt;dev, "Failed to attach vport %d to eswitch rate limiter", vport_num);</div><div class='ctx'> </div><div class='hunk'>@@ -1663,7 +1652,7 @@ static void esw_disable_vport(struct mlx5_eswitch *esw,</div><div class='ctx'> 	 */</div><div class='ctx'> 	esw_vport_change_handle_locked(vport);</div><div class='ctx'> 	vport-&gt;enabled_events = 0;</div><div class='del'>-	esw_vport_disable_qos(esw, vport_num);</div><div class='add'>+	esw_vport_disable_qos(esw, vport);</div><div class='ctx'> 	if (esw-&gt;manager_vport != vport_num &amp;&amp;</div><div class='ctx'> 	    esw-&gt;mode == SRIOV_LEGACY) {</div><div class='ctx'> 		mlx5_modify_vport_admin_state(esw-&gt;dev,</div><div class='hunk'>@@ -1688,6 +1677,9 @@ static int eswitch_vport_event(struct notifier_block *nb,</div><div class='ctx'> </div><div class='ctx'> 	vport_num = be16_to_cpu(eqe-&gt;data.vport_change.vport_num);</div><div class='ctx'> 	vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='add'>+	if (IS_ERR(vport))</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+</div><div class='ctx'> 	if (vport-&gt;enabled)</div><div class='ctx'> 		queue_work(esw-&gt;work_queue, &amp;vport-&gt;vport_change_handler);</div><div class='ctx'> </div><div class='hunk'>@@ -1922,22 +1914,19 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Vport Administration */</div><div class='del'>-#define LEGAL_VPORT(esw, vport) (vport &gt;= 0 &amp;&amp; vport &lt; esw-&gt;total_vports)</div><div class='del'>-</div><div class='ctx'> int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,</div><div class='ctx'> 			       int vport, u8 mac[ETH_ALEN])</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> 	u64 node_guid;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!esw || !MLX5_CAP_GEN(esw-&gt;dev, vport_group_manager))</div><div class='del'>-		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac))</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='add'>+	if (is_multicast_ether_addr(mac))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;esw-&gt;state_lock);</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='ctx'> </div><div class='ctx'> 	if (evport-&gt;info.spoofchk &amp;&amp; !is_valid_ether_addr(mac))</div><div class='ctx'> 		mlx5_core_warn(esw-&gt;dev,</div><div class='hunk'>@@ -1972,16 +1961,15 @@ unlock:</div><div class='ctx'> int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw,</div><div class='ctx'> 				 int vport, int link_state)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!ESW_ALLOWED(esw))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;esw-&gt;state_lock);</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_modify_vport_admin_state(esw-&gt;dev,</div><div class='ctx'> 					    MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,</div><div class='hunk'>@@ -2003,14 +1991,10 @@ unlock:</div><div class='ctx'> int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,</div><div class='ctx'> 				  int vport, struct ifla_vf_info *ivi)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> </div><div class='del'>-	if (!esw || !MLX5_CAP_GEN(esw-&gt;dev, vport_group_manager))</div><div class='del'>-		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='ctx'> </div><div class='ctx'> 	memset(ivi, 0, sizeof(*ivi));</div><div class='ctx'> 	ivi-&gt;vf = vport - 1;</div><div class='hunk'>@@ -2032,16 +2016,17 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,</div><div class='ctx'> int __mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,</div><div class='ctx'> 				  int vport, u16 vlan, u8 qos, u8 set_flags)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!ESW_ALLOWED(esw))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport) || (vlan &gt; 4095) || (qos &gt; 7))</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='add'>+	if (vlan &gt; 4095 || qos &gt; 7)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;esw-&gt;state_lock);</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='ctx'> </div><div class='ctx'> 	err = modify_esw_vport_cvlan(esw-&gt;dev, vport, vlan, qos, set_flags);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -2075,17 +2060,16 @@ int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,</div><div class='ctx'> int mlx5_eswitch_set_vport_spoofchk(struct mlx5_eswitch *esw,</div><div class='ctx'> 				    int vport, bool spoofchk)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> 	bool pschk;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!ESW_ALLOWED(esw))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;esw-&gt;state_lock);</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='ctx'> 	pschk = evport-&gt;info.spoofchk;</div><div class='ctx'> 	evport-&gt;info.spoofchk = spoofchk;</div><div class='ctx'> 	if (pschk &amp;&amp; !is_valid_ether_addr(evport-&gt;info.mac))</div><div class='hunk'>@@ -2157,6 +2141,7 @@ static int _mlx5_eswitch_set_vepa_locked(struct mlx5_eswitch *esw,</div><div class='ctx'> </div><div class='ctx'> 	/* Star rule to forward all traffic to uplink vport */</div><div class='ctx'> 	memset(spec, 0, sizeof(*spec));</div><div class='add'>+	memset(&amp;dest, 0, sizeof(dest));</div><div class='ctx'> 	dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;</div><div class='ctx'> 	dest.vport.num = MLX5_VPORT_UPLINK;</div><div class='ctx'> 	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;</div><div class='hunk'>@@ -2225,15 +2210,14 @@ out:</div><div class='ctx'> int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,</div><div class='ctx'> 				 int vport, bool setting)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> </div><div class='ctx'> 	if (!ESW_ALLOWED(esw))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;esw-&gt;state_lock);</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='ctx'> 	evport-&gt;info.trusted = setting;</div><div class='ctx'> 	if (evport-&gt;enabled)</div><div class='ctx'> 		esw_vport_change_handle_locked(evport);</div><div class='hunk'>@@ -2283,7 +2267,7 @@ static int normalize_vports_min_rate(struct mlx5_eswitch *esw, u32 divider)</div><div class='ctx'> 		if (bw_share == evport-&gt;qos.bw_share)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		err = esw_vport_qos_config(esw, evport-&gt;vport, vport_max_rate,</div><div class='add'>+		err = esw_vport_qos_config(esw, evport, vport_max_rate,</div><div class='ctx'> 					   bw_share);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			evport-&gt;qos.bw_share = bw_share;</div><div class='hunk'>@@ -2297,7 +2281,7 @@ static int normalize_vports_min_rate(struct mlx5_eswitch *esw, u32 divider)</div><div class='ctx'> int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, int vport,</div><div class='ctx'> 				u32 max_rate, u32 min_rate)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_vport *evport;</div><div class='add'>+	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);</div><div class='ctx'> 	u32 fw_max_bw_share;</div><div class='ctx'> 	u32 previous_min_rate;</div><div class='ctx'> 	u32 divider;</div><div class='hunk'>@@ -2307,8 +2291,8 @@ int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, int vport,</div><div class='ctx'> </div><div class='ctx'> 	if (!ESW_ALLOWED(esw))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (IS_ERR(evport))</div><div class='add'>+		return PTR_ERR(evport);</div><div class='ctx'> </div><div class='ctx'> 	fw_max_bw_share = MLX5_CAP_QOS(esw-&gt;dev, max_tsar_bw_share);</div><div class='ctx'> 	min_rate_supported = MLX5_CAP_QOS(esw-&gt;dev, esw_bw_share) &amp;&amp;</div><div class='hunk'>@@ -2319,7 +2303,6 @@ int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, int vport,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;esw-&gt;state_lock);</div><div class='del'>-	evport = &amp;esw-&gt;vports[vport];</div><div class='ctx'> </div><div class='ctx'> 	if (min_rate == evport-&gt;info.min_rate)</div><div class='ctx'> 		goto set_max_rate;</div><div class='hunk'>@@ -2337,7 +2320,7 @@ set_max_rate:</div><div class='ctx'> 	if (max_rate == evport-&gt;info.max_rate)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	err = esw_vport_qos_config(esw, vport, max_rate, evport-&gt;qos.bw_share);</div><div class='add'>+	err = esw_vport_qos_config(esw, evport, max_rate, evport-&gt;qos.bw_share);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		evport-&gt;info.max_rate = max_rate;</div><div class='ctx'> </div><div class='hunk'>@@ -2347,11 +2330,10 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev,</div><div class='del'>-					       int vport_idx,</div><div class='add'>+					       struct mlx5_vport *vport,</div><div class='ctx'> 					       struct mlx5_vport_drop_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_eswitch *esw = dev-&gt;priv.eswitch;</div><div class='del'>-	struct mlx5_vport *vport = &amp;esw-&gt;vports[vport_idx];</div><div class='ctx'> 	u64 rx_discard_vport_down, tx_discard_vport_down;</div><div class='ctx'> 	u64 bytes = 0;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -2371,7 +2353,7 @@ static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev,</div><div class='ctx'> 	    !MLX5_CAP_GEN(dev, transmit_discard_vport_down))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = mlx5_query_vport_down_stats(dev, vport_idx, 1,</div><div class='add'>+	err = mlx5_query_vport_down_stats(dev, vport-&gt;vport, 1,</div><div class='ctx'> 					  &amp;rx_discard_vport_down,</div><div class='ctx'> 					  &amp;tx_discard_vport_down);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -2386,19 +2368,18 @@ static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,</div><div class='del'>-				 int vport,</div><div class='add'>+				 int vport_num,</div><div class='ctx'> 				 struct ifla_vf_stats *vf_stats)</div><div class='ctx'> {</div><div class='add'>+	struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);</div><div class='ctx'> 	int outlen = MLX5_ST_SZ_BYTES(query_vport_counter_out);</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(query_vport_counter_in)] = {0};</div><div class='ctx'> 	struct mlx5_vport_drop_stats stats = {0};</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 *out;</div><div class='ctx'> </div><div class='del'>-	if (!ESW_ALLOWED(esw))</div><div class='del'>-		return -EPERM;</div><div class='del'>-	if (!LEGAL_VPORT(esw, vport))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (IS_ERR(vport))</div><div class='add'>+		return PTR_ERR(vport);</div><div class='ctx'> </div><div class='ctx'> 	out = kvzalloc(outlen, GFP_KERNEL);</div><div class='ctx'> 	if (!out)</div><div class='hunk'>@@ -2407,7 +2388,7 @@ int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,</div><div class='ctx'> 	MLX5_SET(query_vport_counter_in, in, opcode,</div><div class='ctx'> 		 MLX5_CMD_OP_QUERY_VPORT_COUNTER);</div><div class='ctx'> 	MLX5_SET(query_vport_counter_in, in, op_mod, 0);</div><div class='del'>-	MLX5_SET(query_vport_counter_in, in, vport_number, vport);</div><div class='add'>+	MLX5_SET(query_vport_counter_in, in, vport_number, vport-&gt;vport);</div><div class='ctx'> 	MLX5_SET(query_vport_counter_in, in, other_vport, 1);</div><div class='ctx'> </div><div class='ctx'> 	memset(out, 0, outlen);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h<br/>index 3f3cd32ae60a..ed3fad689ec9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.h</a></div><div class='hunk'>@@ -227,6 +227,18 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports,</div><div class='ctx'> 		      int total_nvports);</div><div class='ctx'> void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw);</div><div class='ctx'> int esw_offloads_init_reps(struct mlx5_eswitch *esw);</div><div class='add'>+void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,</div><div class='add'>+				     struct mlx5_vport *vport);</div><div class='add'>+int esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				 struct mlx5_vport *vport);</div><div class='add'>+void esw_vport_cleanup_egress_rules(struct mlx5_eswitch *esw,</div><div class='add'>+				    struct mlx5_vport *vport);</div><div class='add'>+int esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				struct mlx5_vport *vport);</div><div class='add'>+void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				  struct mlx5_vport *vport);</div><div class='add'>+void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,</div><div class='add'>+				   struct mlx5_vport *vport);</div><div class='ctx'> </div><div class='ctx'> /* E-Switch API */</div><div class='ctx'> int mlx5_eswitch_init(struct mlx5_core_dev *dev);</div><div class='hunk'>@@ -376,11 +388,11 @@ bool mlx5_esw_multipath_prereq(struct mlx5_core_dev *dev0,</div><div class='ctx'> </div><div class='ctx'> #define MLX5_DEBUG_ESWITCH_MASK BIT(3)</div><div class='ctx'> </div><div class='del'>-#define esw_info(dev, format, ...)				\</div><div class='del'>-	pr_info("(%s): E-Switch: " format, (dev)-&gt;priv.name, ##__VA_ARGS__)</div><div class='add'>+#define esw_info(__dev, format, ...)			\</div><div class='add'>+	dev_info((__dev)-&gt;device, "E-Switch: " format, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define esw_warn(dev, format, ...)				\</div><div class='del'>-	pr_warn("(%s): E-Switch: " format, (dev)-&gt;priv.name, ##__VA_ARGS__)</div><div class='add'>+#define esw_warn(__dev, format, ...)			\</div><div class='add'>+	dev_warn((__dev)-&gt;device, "E-Switch: " format, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define esw_debug(dev, format, ...)				\</div><div class='ctx'> 	mlx5_core_dbg_mask(dev, MLX5_DEBUG_ESWITCH_MASK, format, ##__VA_ARGS__)</div><div class='hunk'>@@ -431,6 +443,54 @@ static inline int mlx5_eswitch_index_to_vport_num(struct mlx5_eswitch *esw,</div><div class='ctx'> 	return index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* TODO: This mlx5e_tc function shouldn't be called by eswitch */</div><div class='add'>+void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw);</div><div class='add'>+</div><div class='add'>+/* The vport getter/iterator are only valid after esw-&gt;total_vports</div><div class='add'>+ * and vport-&gt;vport are initialized in mlx5_eswitch_init.</div><div class='add'>+ */</div><div class='add'>+#define mlx5_esw_for_all_vports(esw, i, vport)		\</div><div class='add'>+	for ((i) = MLX5_VPORT_PF;			\</div><div class='add'>+	     (vport) = &amp;(esw)-&gt;vports[i],		\</div><div class='add'>+	     (i) &lt; (esw)-&gt;total_vports; (i)++)</div><div class='add'>+</div><div class='add'>+#define mlx5_esw_for_each_vf_vport(esw, i, vport, nvfs)	\</div><div class='add'>+	for ((i) = MLX5_VPORT_FIRST_VF;			\</div><div class='add'>+	     (vport) = &amp;(esw)-&gt;vports[(i)],		\</div><div class='add'>+	     (i) &lt;= (nvfs); (i)++)</div><div class='add'>+</div><div class='add'>+#define mlx5_esw_for_each_vf_vport_reverse(esw, i, vport, nvfs)	\</div><div class='add'>+	for ((i) = (nvfs);					\</div><div class='add'>+	     (vport) = &amp;(esw)-&gt;vports[(i)],			\</div><div class='add'>+	     (i) &gt;= MLX5_VPORT_FIRST_VF; (i)--)</div><div class='add'>+</div><div class='add'>+/* The rep getter/iterator are only valid after esw-&gt;total_vports</div><div class='add'>+ * and vport-&gt;vport are initialized in mlx5_eswitch_init.</div><div class='add'>+ */</div><div class='add'>+#define mlx5_esw_for_all_reps(esw, i, rep)			\</div><div class='add'>+	for ((i) = MLX5_VPORT_PF;				\</div><div class='add'>+	     (rep) = &amp;(esw)-&gt;offloads.vport_reps[i],		\</div><div class='add'>+	     (i) &lt; (esw)-&gt;total_vports; (i)++)</div><div class='add'>+</div><div class='add'>+#define mlx5_esw_for_each_vf_rep(esw, i, rep, nvfs)		\</div><div class='add'>+	for ((i) = MLX5_VPORT_FIRST_VF;				\</div><div class='add'>+	     (rep) = &amp;(esw)-&gt;offloads.vport_reps[i],		\</div><div class='add'>+	     (i) &lt;= (nvfs); (i)++)</div><div class='add'>+</div><div class='add'>+#define mlx5_esw_for_each_vf_rep_reverse(esw, i, rep, nvfs)	\</div><div class='add'>+	for ((i) = (nvfs);					\</div><div class='add'>+	     (rep) = &amp;(esw)-&gt;offloads.vport_reps[i],		\</div><div class='add'>+	     (i) &gt;= MLX5_VPORT_FIRST_VF; (i)--)</div><div class='add'>+</div><div class='add'>+#define mlx5_esw_for_each_vf_vport_num(esw, vport, nvfs)	\</div><div class='add'>+	for ((vport) = MLX5_VPORT_FIRST_VF; (vport) &lt;= (nvfs); (vport)++)</div><div class='add'>+</div><div class='add'>+#define mlx5_esw_for_each_vf_vport_num_reverse(esw, vport, nvfs)	\</div><div class='add'>+	for ((vport) = (nvfs); (vport) &gt;= MLX5_VPORT_FIRST_VF; (vport)--)</div><div class='add'>+</div><div class='add'>+struct mlx5_vport *__must_check</div><div class='add'>+mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num);</div><div class='add'>+</div><div class='ctx'> #else  /* CONFIG_MLX5_ESWITCH */</div><div class='ctx'> /* eswitch API stubs */</div><div class='ctx'> static inline int  mlx5_eswitch_init(struct mlx5_core_dev *dev) { return 0; }</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c<br/>index f2260391be5b..e09ae27485ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c</a></div><div class='hunk'>@@ -37,17 +37,13 @@</div><div class='ctx'> #include &lt;linux/mlx5/fs.h&gt;</div><div class='ctx'> #include "mlx5_core.h"</div><div class='ctx'> #include "eswitch.h"</div><div class='add'>+#include "rdma.h"</div><div class='ctx'> #include "en.h"</div><div class='ctx'> #include "fs_core.h"</div><div class='ctx'> #include "lib/devcom.h"</div><div class='ctx'> #include "ecpf.h"</div><div class='ctx'> #include "lib/eq.h"</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	FDB_FAST_PATH = 0,</div><div class='del'>-	FDB_SLOW_PATH</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* There are two match-all miss flows, one for unicast dst mac and</div><div class='ctx'>  * one for multicast.</div><div class='ctx'>  */</div><div class='hunk'>@@ -58,32 +54,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define UPLINK_REP_INDEX 0</div><div class='ctx'> </div><div class='del'>-/* The rep getter/iterator are only valid after esw-&gt;total_vports</div><div class='del'>- * and vport-&gt;vport are initialized in mlx5_eswitch_init.</div><div class='del'>- */</div><div class='del'>-#define mlx5_esw_for_all_reps(esw, i, rep)			\</div><div class='del'>-	for ((i) = MLX5_VPORT_PF;				\</div><div class='del'>-	     (rep) = &amp;(esw)-&gt;offloads.vport_reps[i],		\</div><div class='del'>-	     (i) &lt; (esw)-&gt;total_vports; (i)++)</div><div class='del'>-</div><div class='del'>-#define mlx5_esw_for_each_vf_rep(esw, i, rep, nvfs)		\</div><div class='del'>-	for ((i) = MLX5_VPORT_FIRST_VF;				\</div><div class='del'>-	     (rep) = &amp;(esw)-&gt;offloads.vport_reps[i],		\</div><div class='del'>-	     (i) &lt;= (nvfs); (i)++)</div><div class='del'>-</div><div class='del'>-#define mlx5_esw_for_each_vf_rep_reverse(esw, i, rep, nvfs)	\</div><div class='del'>-	for ((i) = (nvfs);					\</div><div class='del'>-	     (rep) = &amp;(esw)-&gt;offloads.vport_reps[i],		\</div><div class='del'>-	     (i) &gt;= MLX5_VPORT_FIRST_VF; (i)--)</div><div class='del'>-</div><div class='del'>-#define mlx5_esw_for_each_vf_vport(esw, vport, nvfs)		\</div><div class='del'>-	for ((vport) = MLX5_VPORT_FIRST_VF;			\</div><div class='del'>-	     (vport) &lt;= (nvfs); (vport)++)</div><div class='del'>-</div><div class='del'>-#define mlx5_esw_for_each_vf_vport_reverse(esw, vport, nvfs)	\</div><div class='del'>-	for ((vport) = (nvfs);					\</div><div class='del'>-	     (vport) &gt;= MLX5_VPORT_FIRST_VF; (vport)--)</div><div class='del'>-</div><div class='ctx'> static struct mlx5_eswitch_rep *mlx5_eswitch_get_rep(struct mlx5_eswitch *esw,</div><div class='ctx'> 						     u16 vport_num)</div><div class='ctx'> {</div><div class='hunk'>@@ -363,7 +333,7 @@ static int esw_set_global_vlan_pop(struct mlx5_eswitch *esw, u8 val)</div><div class='ctx'> 	esw_debug(esw-&gt;dev, "%s applying global %s policy\n", __func__, val ? "pop" : "none");</div><div class='ctx'> 	for (vf_vport = 1; vf_vport &lt; esw-&gt;enabled_vports; vf_vport++) {</div><div class='ctx'> 		rep = &amp;esw-&gt;offloads.vport_reps[vf_vport];</div><div class='del'>-		if (rep-&gt;rep_if[REP_ETH].state != REP_LOADED)</div><div class='add'>+		if (atomic_read(&amp;rep-&gt;rep_if[REP_ETH].state) != REP_LOADED)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		err = __mlx5_eswitch_set_vport_vlan(esw, rep-&gt;vport, 0, 0, val);</div><div class='hunk'>@@ -663,7 +633,7 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,</div><div class='ctx'> 		flows[mlx5_eswitch_ecpf_idx(esw)] = flow;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mlx5_esw_for_each_vf_vport(esw, i, mlx5_core_max_vfs(esw-&gt;dev)) {</div><div class='add'>+	mlx5_esw_for_each_vf_vport_num(esw, i, mlx5_core_max_vfs(esw-&gt;dev)) {</div><div class='ctx'> 		MLX5_SET(fte_match_set_misc, misc, source_port, i);</div><div class='ctx'> 		flow = mlx5_add_flow_rules(esw-&gt;fdb_table.offloads.slow_fdb,</div><div class='ctx'> 					   spec, &amp;flow_act, &amp;dest, 1);</div><div class='hunk'>@@ -681,7 +651,7 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,</div><div class='ctx'> </div><div class='ctx'> add_vf_flow_err:</div><div class='ctx'> 	nvports = --i;</div><div class='del'>-	mlx5_esw_for_each_vf_vport_reverse(esw, i, nvports)</div><div class='add'>+	mlx5_esw_for_each_vf_vport_num_reverse(esw, i, nvports)</div><div class='ctx'> 		mlx5_del_flow_rules(flows[i]);</div><div class='ctx'> </div><div class='ctx'> 	if (mlx5_ecpf_vport_exists(esw-&gt;dev))</div><div class='hunk'>@@ -704,7 +674,8 @@ static void esw_del_fdb_peer_miss_rules(struct mlx5_eswitch *esw)</div><div class='ctx'> </div><div class='ctx'> 	flows = esw-&gt;fdb_table.offloads.peer_miss_rules;</div><div class='ctx'> </div><div class='del'>-	mlx5_esw_for_each_vf_vport_reverse(esw, i, mlx5_core_max_vfs(esw-&gt;dev))</div><div class='add'>+	mlx5_esw_for_each_vf_vport_num_reverse(esw, i,</div><div class='add'>+					       mlx5_core_max_vfs(esw-&gt;dev))</div><div class='ctx'> 		mlx5_del_flow_rules(flows[i]);</div><div class='ctx'> </div><div class='ctx'> 	if (mlx5_ecpf_vport_exists(esw-&gt;dev))</div><div class='hunk'>@@ -1287,13 +1258,13 @@ void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw)</div><div class='ctx'> </div><div class='ctx'> int esw_offloads_init_reps(struct mlx5_eswitch *esw)</div><div class='ctx'> {</div><div class='del'>-	int total_vfs = MLX5_TOTAL_VPORTS(esw-&gt;dev);</div><div class='add'>+	int total_vports = MLX5_TOTAL_VPORTS(esw-&gt;dev);</div><div class='ctx'> 	struct mlx5_core_dev *dev = esw-&gt;dev;</div><div class='ctx'> 	struct mlx5_eswitch_rep *rep;</div><div class='ctx'> 	u8 hw_id[ETH_ALEN], rep_type;</div><div class='ctx'> 	int vport;</div><div class='ctx'> </div><div class='del'>-	esw-&gt;offloads.vport_reps = kcalloc(total_vfs,</div><div class='add'>+	esw-&gt;offloads.vport_reps = kcalloc(total_vports,</div><div class='ctx'> 					   sizeof(struct mlx5_eswitch_rep),</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='ctx'> 	if (!esw-&gt;offloads.vport_reps)</div><div class='hunk'>@@ -1306,7 +1277,8 @@ int esw_offloads_init_reps(struct mlx5_eswitch *esw)</div><div class='ctx'> 		ether_addr_copy(rep-&gt;hw_id, hw_id);</div><div class='ctx'> </div><div class='ctx'> 		for (rep_type = 0; rep_type &lt; NUM_REP_TYPES; rep_type++)</div><div class='del'>-			rep-&gt;rep_if[rep_type].state = REP_UNREGISTERED;</div><div class='add'>+			atomic_set(&amp;rep-&gt;rep_if[rep_type].state,</div><div class='add'>+				   REP_UNREGISTERED);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1315,11 +1287,9 @@ int esw_offloads_init_reps(struct mlx5_eswitch *esw)</div><div class='ctx'> static void __esw_offloads_unload_rep(struct mlx5_eswitch *esw,</div><div class='ctx'> 				      struct mlx5_eswitch_rep *rep, u8 rep_type)</div><div class='ctx'> {</div><div class='del'>-	if (rep-&gt;rep_if[rep_type].state != REP_LOADED)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rep-&gt;rep_if[rep_type].unload(rep);</div><div class='del'>-	rep-&gt;rep_if[rep_type].state = REP_REGISTERED;</div><div class='add'>+	if (atomic_cmpxchg(&amp;rep-&gt;rep_if[rep_type].state,</div><div class='add'>+			   REP_LOADED, REP_REGISTERED) == REP_LOADED)</div><div class='add'>+		rep-&gt;rep_if[rep_type].unload(rep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __unload_reps_special_vport(struct mlx5_eswitch *esw, u8 rep_type)</div><div class='hunk'>@@ -1380,16 +1350,15 @@ static int __esw_offloads_load_rep(struct mlx5_eswitch *esw,</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (rep-&gt;rep_if[rep_type].state != REP_REGISTERED)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = rep-&gt;rep_if[rep_type].load(esw-&gt;dev, rep);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	rep-&gt;rep_if[rep_type].state = REP_LOADED;</div><div class='add'>+	if (atomic_cmpxchg(&amp;rep-&gt;rep_if[rep_type].state,</div><div class='add'>+			   REP_REGISTERED, REP_LOADED) == REP_REGISTERED) {</div><div class='add'>+		err = rep-&gt;rep_if[rep_type].load(esw-&gt;dev, rep);</div><div class='add'>+		if (err)</div><div class='add'>+			atomic_set(&amp;rep-&gt;rep_if[rep_type].state,</div><div class='add'>+				   REP_REGISTERED);</div><div class='add'>+	}</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'> static int __load_reps_special_vport(struct mlx5_eswitch *esw, u8 rep_type)</div><div class='hunk'>@@ -1523,8 +1492,6 @@ static int mlx5_esw_offloads_pair(struct mlx5_eswitch *esw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw);</div><div class='del'>-</div><div class='ctx'> static void mlx5_esw_offloads_unpair(struct mlx5_eswitch *esw)</div><div class='ctx'> {</div><div class='ctx'> 	mlx5e_tc_clean_fdb_peer_flows(esw);</div><div class='hunk'>@@ -1607,12 +1574,182 @@ static void esw_offloads_devcom_cleanup(struct mlx5_eswitch *esw)</div><div class='ctx'> 	mlx5_devcom_unregister_component(devcom, MLX5_DEVCOM_ESW_OFFLOADS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int esw_vport_ingress_prio_tag_config(struct mlx5_eswitch *esw,</div><div class='add'>+					     struct mlx5_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_core_dev *dev = esw-&gt;dev;</div><div class='add'>+	struct mlx5_flow_act flow_act = {0};</div><div class='add'>+	struct mlx5_flow_spec *spec;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* For prio tag mode, there is only 1 FTEs:</div><div class='add'>+	 * 1) Untagged packets - push prio tag VLAN, allow</div><div class='add'>+	 * Unmatched traffic is allowed by default</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	esw_vport_cleanup_ingress_rules(esw, vport);</div><div class='add'>+</div><div class='add'>+	err = esw_vport_enable_ingress_acl(esw, vport);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_warn(esw-&gt;dev,</div><div class='add'>+			       "failed to enable prio tag ingress acl (%d) on vport[%d]\n",</div><div class='add'>+			       err, vport-&gt;vport);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	esw_debug(esw-&gt;dev,</div><div class='add'>+		  "vport[%d] configure ingress rules\n", vport-&gt;vport);</div><div class='add'>+</div><div class='add'>+	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_no_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Untagged packets - push prio tag VLAN, allow */</div><div class='add'>+	MLX5_SET_TO_ONES(fte_match_param, spec-&gt;match_criteria, outer_headers.cvlan_tag);</div><div class='add'>+	MLX5_SET(fte_match_param, spec-&gt;match_value, outer_headers.cvlan_tag, 0);</div><div class='add'>+	spec-&gt;match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;</div><div class='add'>+	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH |</div><div class='add'>+			  MLX5_FLOW_CONTEXT_ACTION_ALLOW;</div><div class='add'>+	flow_act.vlan[0].ethtype = ETH_P_8021Q;</div><div class='add'>+	flow_act.vlan[0].vid = 0;</div><div class='add'>+	flow_act.vlan[0].prio = 0;</div><div class='add'>+	vport-&gt;ingress.allow_rule =</div><div class='add'>+		mlx5_add_flow_rules(vport-&gt;ingress.acl, spec,</div><div class='add'>+				    &amp;flow_act, NULL, 0);</div><div class='add'>+	if (IS_ERR(vport-&gt;ingress.allow_rule)) {</div><div class='add'>+		err = PTR_ERR(vport-&gt;ingress.allow_rule);</div><div class='add'>+		esw_warn(esw-&gt;dev,</div><div class='add'>+			 "vport[%d] configure ingress untagged allow rule, err(%d)\n",</div><div class='add'>+			 vport-&gt;vport, err);</div><div class='add'>+		vport-&gt;ingress.allow_rule = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kvfree(spec);</div><div class='add'>+out_no_mem:</div><div class='add'>+	if (err)</div><div class='add'>+		esw_vport_cleanup_ingress_rules(esw, vport);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esw_vport_egress_prio_tag_config(struct mlx5_eswitch *esw,</div><div class='add'>+					    struct mlx5_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_flow_act flow_act = {0};</div><div class='add'>+	struct mlx5_flow_spec *spec;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* For prio tag mode, there is only 1 FTEs:</div><div class='add'>+	 * 1) prio tag packets - pop the prio tag VLAN, allow</div><div class='add'>+	 * Unmatched traffic is allowed by default</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	esw_vport_cleanup_egress_rules(esw, vport);</div><div class='add'>+</div><div class='add'>+	err = esw_vport_enable_egress_acl(esw, vport);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_warn(esw-&gt;dev,</div><div class='add'>+			       "failed to enable egress acl (%d) on vport[%d]\n",</div><div class='add'>+			       err, vport-&gt;vport);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	esw_debug(esw-&gt;dev,</div><div class='add'>+		  "vport[%d] configure prio tag egress rules\n", vport-&gt;vport);</div><div class='add'>+</div><div class='add'>+	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_no_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* prio tag vlan rule - pop it so VF receives untagged packets */</div><div class='add'>+	MLX5_SET_TO_ONES(fte_match_param, spec-&gt;match_criteria, outer_headers.cvlan_tag);</div><div class='add'>+	MLX5_SET_TO_ONES(fte_match_param, spec-&gt;match_value, outer_headers.cvlan_tag);</div><div class='add'>+	MLX5_SET_TO_ONES(fte_match_param, spec-&gt;match_criteria, outer_headers.first_vid);</div><div class='add'>+	MLX5_SET(fte_match_param, spec-&gt;match_value, outer_headers.first_vid, 0);</div><div class='add'>+</div><div class='add'>+	spec-&gt;match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;</div><div class='add'>+	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_VLAN_POP |</div><div class='add'>+			  MLX5_FLOW_CONTEXT_ACTION_ALLOW;</div><div class='add'>+	vport-&gt;egress.allowed_vlan =</div><div class='add'>+		mlx5_add_flow_rules(vport-&gt;egress.acl, spec,</div><div class='add'>+				    &amp;flow_act, NULL, 0);</div><div class='add'>+	if (IS_ERR(vport-&gt;egress.allowed_vlan)) {</div><div class='add'>+		err = PTR_ERR(vport-&gt;egress.allowed_vlan);</div><div class='add'>+		esw_warn(esw-&gt;dev,</div><div class='add'>+			 "vport[%d] configure egress pop prio tag vlan rule failed, err(%d)\n",</div><div class='add'>+			 vport-&gt;vport, err);</div><div class='add'>+		vport-&gt;egress.allowed_vlan = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kvfree(spec);</div><div class='add'>+out_no_mem:</div><div class='add'>+	if (err)</div><div class='add'>+		esw_vport_cleanup_egress_rules(esw, vport);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esw_prio_tag_acls_config(struct mlx5_eswitch *esw, int nvports)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_vport *vport = NULL;</div><div class='add'>+	int i, j;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mlx5_esw_for_each_vf_vport(esw, i, vport, nvports) {</div><div class='add'>+		err = esw_vport_ingress_prio_tag_config(esw, vport);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_ingress;</div><div class='add'>+		err = esw_vport_egress_prio_tag_config(esw, vport);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_egress;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_egress:</div><div class='add'>+	esw_vport_disable_ingress_acl(esw, vport);</div><div class='add'>+err_ingress:</div><div class='add'>+	mlx5_esw_for_each_vf_vport_reverse(esw, j, vport, i - 1) {</div><div class='add'>+		esw_vport_disable_egress_acl(esw, vport);</div><div class='add'>+		esw_vport_disable_ingress_acl(esw, vport);</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 esw_prio_tag_acls_cleanup(struct mlx5_eswitch *esw)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_vport *vport;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mlx5_esw_for_each_vf_vport(esw, i, vport, esw-&gt;nvports) {</div><div class='add'>+		esw_vport_disable_egress_acl(esw, vport);</div><div class='add'>+		esw_vport_disable_ingress_acl(esw, vport);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int esw_offloads_steering_init(struct mlx5_eswitch *esw, int nvports)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;esw-&gt;fdb_table.offloads, 0, sizeof(struct offloads_fdb));</div><div class='ctx'> 	mutex_init(&amp;esw-&gt;fdb_table.offloads.fdb_prio_lock);</div><div class='ctx'> </div><div class='add'>+	if (MLX5_CAP_GEN(esw-&gt;dev, prio_tag_required)) {</div><div class='add'>+		err = esw_prio_tag_acls_config(esw, nvports);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = esw_create_offloads_fdb_tables(esw, nvports);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1641,6 +1778,8 @@ static void esw_offloads_steering_cleanup(struct mlx5_eswitch *esw)</div><div class='ctx'> 	esw_destroy_vport_rx_group(esw);</div><div class='ctx'> 	esw_destroy_offloads_table(esw);</div><div class='ctx'> 	esw_destroy_offloads_fdb_tables(esw);</div><div class='add'>+	if (MLX5_CAP_GEN(esw-&gt;dev, prio_tag_required))</div><div class='add'>+		esw_prio_tag_acls_cleanup(esw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void esw_host_params_event_handler(struct work_struct *work)</div><div class='hunk'>@@ -1699,8 +1838,6 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;esw-&gt;fdb_table.offloads.fdb_prio_lock);</div><div class='del'>-</div><div class='ctx'> 	err = esw_offloads_steering_init(esw, total_nvports);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1718,6 +1855,8 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports,</div><div class='ctx'> 		esw-&gt;host_info.num_vfs = vf_nvports;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mlx5_rdma_enable_roce(esw-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_reps:</div><div class='hunk'>@@ -1756,6 +1895,7 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw)</div><div class='ctx'> 		num_vfs = esw-&gt;dev-&gt;priv.sriov.num_vfs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mlx5_rdma_disable_roce(esw-&gt;dev);</div><div class='ctx'> 	esw_offloads_devcom_cleanup(esw);</div><div class='ctx'> 	esw_offloads_unload_all_reps(esw, num_vfs);</div><div class='ctx'> 	esw_offloads_steering_cleanup(esw);</div><div class='hunk'>@@ -2075,7 +2215,7 @@ void mlx5_eswitch_register_vport_reps(struct mlx5_eswitch *esw,</div><div class='ctx'> 		rep_if-&gt;get_proto_dev = __rep_if-&gt;get_proto_dev;</div><div class='ctx'> 		rep_if-&gt;priv = __rep_if-&gt;priv;</div><div class='ctx'> </div><div class='del'>-		rep_if-&gt;state = REP_REGISTERED;</div><div class='add'>+		atomic_set(&amp;rep_if-&gt;state, REP_REGISTERED);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlx5_eswitch_register_vport_reps);</div><div class='hunk'>@@ -2090,7 +2230,7 @@ void mlx5_eswitch_unregister_vport_reps(struct mlx5_eswitch *esw, u8 rep_type)</div><div class='ctx'> 		__unload_reps_all_vport(esw, max_vf, rep_type);</div><div class='ctx'> </div><div class='ctx'> 	mlx5_esw_for_all_reps(esw, i, rep)</div><div class='del'>-		rep-&gt;rep_if[rep_type].state = REP_UNREGISTERED;</div><div class='add'>+		atomic_set(&amp;rep-&gt;rep_if[rep_type].state, REP_UNREGISTERED);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlx5_eswitch_unregister_vport_reps);</div><div class='ctx'> </div><div class='hunk'>@@ -2110,7 +2250,7 @@ void *mlx5_eswitch_get_proto_dev(struct mlx5_eswitch *esw,</div><div class='ctx'> </div><div class='ctx'> 	rep = mlx5_eswitch_get_rep(esw, vport);</div><div class='ctx'> </div><div class='del'>-	if (rep-&gt;rep_if[rep_type].state == REP_LOADED &amp;&amp;</div><div class='add'>+	if (atomic_read(&amp;rep-&gt;rep_if[rep_type].state) == REP_LOADED &amp;&amp;</div><div class='ctx'> 	    rep-&gt;rep_if[rep_type].get_proto_dev)</div><div class='ctx'> 		return rep-&gt;rep_if[rep_type].get_proto_dev(rep);</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/events.c b/drivers/net/ethernet/mellanox/mlx5/core/events.c<br/>index 5d5864e8df3c..a81e8d2168d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/events.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/events.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/events.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/events.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@ struct mlx5_event_nb {</div><div class='ctx'> static int any_notifier(struct notifier_block *, unsigned long, void *);</div><div class='ctx'> static int temp_warn(struct notifier_block *, unsigned long, void *);</div><div class='ctx'> static int port_module(struct notifier_block *, unsigned long, void *);</div><div class='add'>+static int pcie_core(struct notifier_block *, unsigned long, void *);</div><div class='ctx'> </div><div class='ctx'> /* handler which forwards the event to events-&gt;nh, driver notifiers */</div><div class='ctx'> static int forward_event(struct notifier_block *, unsigned long, void *);</div><div class='hunk'>@@ -30,6 +31,7 @@ static struct mlx5_nb events_nbs_ref[] = {</div><div class='ctx'> 	{.nb.notifier_call = any_notifier,  .event_type = MLX5_EVENT_TYPE_NOTIFY_ANY },</div><div class='ctx'> 	{.nb.notifier_call = temp_warn,     .event_type = MLX5_EVENT_TYPE_TEMP_WARN_EVENT },</div><div class='ctx'> 	{.nb.notifier_call = port_module,   .event_type = MLX5_EVENT_TYPE_PORT_MODULE_EVENT },</div><div class='add'>+	{.nb.notifier_call = pcie_core,     .event_type = MLX5_EVENT_TYPE_GENERAL_EVENT },</div><div class='ctx'> </div><div class='ctx'> 	/* Events to be forwarded (as is) to mlx5 core interfaces (mlx5e/mlx5_ib) */</div><div class='ctx'> 	{.nb.notifier_call = forward_event,   .event_type = MLX5_EVENT_TYPE_PORT_CHANGE },</div><div class='hunk'>@@ -51,11 +53,14 @@ static struct mlx5_nb events_nbs_ref[] = {</div><div class='ctx'> </div><div class='ctx'> struct mlx5_events {</div><div class='ctx'> 	struct mlx5_core_dev *dev;</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='ctx'> 	struct mlx5_event_nb  notifiers[ARRAY_SIZE(events_nbs_ref)];</div><div class='ctx'> 	/* driver notifier chain */</div><div class='ctx'> 	struct atomic_notifier_head nh;</div><div class='ctx'> 	/* port module events stats */</div><div class='ctx'> 	struct mlx5_pme_stats pme_stats;</div><div class='add'>+	/*pcie_core*/</div><div class='add'>+	struct work_struct pcie_core_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char *eqe_type_str(u8 type)</div><div class='hunk'>@@ -249,6 +254,69 @@ static int port_module(struct notifier_block *nb, unsigned long type, void *data</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	MLX5_PCI_POWER_COULD_NOT_BE_READ = 0x0,</div><div class='add'>+	MLX5_PCI_POWER_SUFFICIENT_REPORTED = 0x1,</div><div class='add'>+	MLX5_PCI_POWER_INSUFFICIENT_REPORTED = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mlx5_pcie_event(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	u32 out[MLX5_ST_SZ_DW(mpein_reg)] = {0};</div><div class='add'>+	u32 in[MLX5_ST_SZ_DW(mpein_reg)] = {0};</div><div class='add'>+	struct mlx5_events *events;</div><div class='add'>+	struct mlx5_core_dev *dev;</div><div class='add'>+	u8 power_status;</div><div class='add'>+	u16 pci_power;</div><div class='add'>+</div><div class='add'>+	events = container_of(work, struct mlx5_events, pcie_core_work);</div><div class='add'>+	dev  = events-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!MLX5_CAP_MCAM_FEATURE(dev, pci_status_and_power))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mlx5_core_access_reg(dev, in, sizeof(in), out, sizeof(out),</div><div class='add'>+			     MLX5_REG_MPEIN, 0, 0);</div><div class='add'>+	power_status = MLX5_GET(mpein_reg, out, pwr_status);</div><div class='add'>+	pci_power = MLX5_GET(mpein_reg, out, pci_power);</div><div class='add'>+</div><div class='add'>+	switch (power_status) {</div><div class='add'>+	case MLX5_PCI_POWER_COULD_NOT_BE_READ:</div><div class='add'>+		mlx5_core_info_rl(dev,</div><div class='add'>+				  "PCIe slot power capability was not advertised.\n");</div><div class='add'>+		break;</div><div class='add'>+	case MLX5_PCI_POWER_INSUFFICIENT_REPORTED:</div><div class='add'>+		mlx5_core_warn_rl(dev,</div><div class='add'>+				  "Detected insufficient power on the PCIe slot (%uW).\n",</div><div class='add'>+				  pci_power);</div><div class='add'>+		break;</div><div class='add'>+	case MLX5_PCI_POWER_SUFFICIENT_REPORTED:</div><div class='add'>+		mlx5_core_info_rl(dev,</div><div class='add'>+				  "PCIe slot advertised sufficient power (%uW).\n",</div><div class='add'>+				  pci_power);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcie_core(struct notifier_block *nb, unsigned long type, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_event_nb    *event_nb = mlx5_nb_cof(nb,</div><div class='add'>+							struct mlx5_event_nb,</div><div class='add'>+							nb);</div><div class='add'>+	struct mlx5_events      *events   = event_nb-&gt;ctx;</div><div class='add'>+	struct mlx5_eqe         *eqe      = data;</div><div class='add'>+</div><div class='add'>+	switch (eqe-&gt;sub_type) {</div><div class='add'>+	case MLX5_GENERAL_SUBTYPE_PCI_POWER_CHANGE_EVENT:</div><div class='add'>+			queue_work(events-&gt;wq, &amp;events-&gt;pcie_core_work);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mlx5_get_pme_stats(struct mlx5_core_dev *dev, struct mlx5_pme_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	*stats = dev-&gt;priv.events-&gt;pme_stats;</div><div class='hunk'>@@ -277,11 +345,17 @@ int mlx5_events_init(struct mlx5_core_dev *dev)</div><div class='ctx'> 	ATOMIC_INIT_NOTIFIER_HEAD(&amp;events-&gt;nh);</div><div class='ctx'> 	events-&gt;dev = dev;</div><div class='ctx'> 	dev-&gt;priv.events = events;</div><div class='add'>+	events-&gt;wq = create_singlethread_workqueue("mlx5_events");</div><div class='add'>+	if (!events-&gt;wq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	INIT_WORK(&amp;events-&gt;pcie_core_work, mlx5_pcie_event);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mlx5_events_cleanup(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	destroy_workqueue(dev-&gt;priv.events-&gt;wq);</div><div class='ctx'> 	kvfree(dev-&gt;priv.events);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -304,6 +378,7 @@ void mlx5_events_stop(struct mlx5_core_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = ARRAY_SIZE(events_nbs_ref) - 1; i &gt;= 0 ; i--)</div><div class='ctx'> 		mlx5_eq_notifier_unregister(dev, &amp;events-&gt;notifiers[i].nb);</div><div class='add'>+	flush_workqueue(events-&gt;wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx5_notifier_register(struct mlx5_core_dev *dev, struct notifier_block *nb)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c<br/>index 873541ef4c1b..ca2296a2f9ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ static void mlx5_fpga_conn_notify_hw(struct mlx5_fpga_conn *conn, void *wqe)</div><div class='ctx'> 	*conn-&gt;qp.wq.sq.db = cpu_to_be32(conn-&gt;qp.sq.pc);</div><div class='ctx'> 	/* Make sure that doorbell record is visible before ringing */</div><div class='ctx'> 	wmb();</div><div class='del'>-	mlx5_write64(wqe, conn-&gt;fdev-&gt;conn_res.uar-&gt;map + MLX5_BF_OFFSET, NULL);</div><div class='add'>+	mlx5_write64(wqe, conn-&gt;fdev-&gt;conn_res.uar-&gt;map + MLX5_BF_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx5_fpga_conn_post_send(struct mlx5_fpga_conn *conn,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h b/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h<br/>index 7e2e871dbf83..52c9dee91ea4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mlx5/eq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mlx5_core.h"</div><div class='ctx'> #include "lib/eq.h"</div><div class='ctx'> #include "fpga/cmd.h"</div><div class='ctx'> </div><div class='hunk'>@@ -62,26 +63,26 @@ struct mlx5_fpga_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define mlx5_fpga_dbg(__adev, format, ...) \</div><div class='del'>-	dev_dbg(&amp;(__adev)-&gt;mdev-&gt;pdev-&gt;dev, "FPGA: %s:%d:(pid %d): " format, \</div><div class='del'>-		 __func__, __LINE__, current-&gt;pid, ##__VA_ARGS__)</div><div class='add'>+	mlx5_core_dbg((__adev)-&gt;mdev, "FPGA: %s:%d:(pid %d): " format, \</div><div class='add'>+		       __func__, __LINE__, current-&gt;pid, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlx5_fpga_err(__adev, format, ...) \</div><div class='del'>-	dev_err(&amp;(__adev)-&gt;mdev-&gt;pdev-&gt;dev, "FPGA: %s:%d:(pid %d): " format, \</div><div class='del'>-		__func__, __LINE__, current-&gt;pid, ##__VA_ARGS__)</div><div class='add'>+	mlx5_core_err((__adev)-&gt;mdev, "FPGA: %s:%d:(pid %d): " format, \</div><div class='add'>+		      __func__, __LINE__, current-&gt;pid, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlx5_fpga_warn(__adev, format, ...) \</div><div class='del'>-	dev_warn(&amp;(__adev)-&gt;mdev-&gt;pdev-&gt;dev, "FPGA: %s:%d:(pid %d): " format, \</div><div class='del'>-		__func__, __LINE__, current-&gt;pid, ##__VA_ARGS__)</div><div class='add'>+	mlx5_core_warn((__adev)-&gt;mdev, "FPGA: %s:%d:(pid %d): " format, \</div><div class='add'>+		       __func__, __LINE__, current-&gt;pid, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlx5_fpga_warn_ratelimited(__adev, format, ...) \</div><div class='del'>-	dev_warn_ratelimited(&amp;(__adev)-&gt;mdev-&gt;pdev-&gt;dev, "FPGA: %s:%d: " \</div><div class='del'>-		format, __func__, __LINE__, ##__VA_ARGS__)</div><div class='add'>+	mlx5_core_err_rl((__adev)-&gt;mdev, "FPGA: %s:%d: " \</div><div class='add'>+			 format, __func__, __LINE__, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlx5_fpga_notice(__adev, format, ...) \</div><div class='del'>-	dev_notice(&amp;(__adev)-&gt;mdev-&gt;pdev-&gt;dev, "FPGA: " format, ##__VA_ARGS__)</div><div class='add'>+	mlx5_core_info((__adev)-&gt;mdev, "FPGA: " format, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlx5_fpga_info(__adev, format, ...) \</div><div class='del'>-	dev_info(&amp;(__adev)-&gt;mdev-&gt;pdev-&gt;dev, "FPGA: " format, ##__VA_ARGS__)</div><div class='add'>+	mlx5_core_info((__adev)-&gt;mdev, "FPGA: " format, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> int mlx5_fpga_init(struct mlx5_core_dev *mdev);</div><div class='ctx'> void mlx5_fpga_cleanup(struct mlx5_core_dev *mdev);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c<br/>index 5a22c5874f3b..52c47d3dd5a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c</a></div><div class='hunk'>@@ -989,32 +989,33 @@ static enum fs_flow_table_type egress_to_fs_ft(bool egress)</div><div class='ctx'> 	return egress ? FS_FT_NIC_TX : FS_FT_NIC_RX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fpga_ipsec_fs_create_flow_group(struct mlx5_core_dev *dev,</div><div class='add'>+static int fpga_ipsec_fs_create_flow_group(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					   struct mlx5_flow_table *ft,</div><div class='ctx'> 					   u32 *in,</div><div class='del'>-					   unsigned int *group_id,</div><div class='add'>+					   struct mlx5_flow_group *fg,</div><div class='ctx'> 					   bool is_egress)</div><div class='ctx'> {</div><div class='del'>-	int (*create_flow_group)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*create_flow_group)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				 struct mlx5_flow_table *ft, u32 *in,</div><div class='del'>-				 unsigned int *group_id) =</div><div class='add'>+				 struct mlx5_flow_group *fg) =</div><div class='ctx'> 		mlx5_fs_cmd_get_default(egress_to_fs_ft(is_egress))-&gt;create_flow_group;</div><div class='ctx'> 	char *misc_params_c = MLX5_ADDR_OF(create_flow_group_in, in,</div><div class='ctx'> 					   match_criteria.misc_parameters);</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	u32 saved_outer_esp_spi_mask;</div><div class='ctx'> 	u8 match_criteria_enable;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (MLX5_CAP_FLOWTABLE(dev,</div><div class='ctx'> 			       flow_table_properties_nic_receive.ft_field_support.outer_esp_spi))</div><div class='del'>-		return create_flow_group(dev, ft, in, group_id);</div><div class='add'>+		return create_flow_group(ns, ft, in, fg);</div><div class='ctx'> </div><div class='ctx'> 	match_criteria_enable =</div><div class='ctx'> 		MLX5_GET(create_flow_group_in, in, match_criteria_enable);</div><div class='ctx'> 	saved_outer_esp_spi_mask =</div><div class='ctx'> 		MLX5_GET(fte_match_set_misc, misc_params_c, outer_esp_spi);</div><div class='ctx'> 	if (!match_criteria_enable || !saved_outer_esp_spi_mask)</div><div class='del'>-		return create_flow_group(dev, ft, in, group_id);</div><div class='add'>+		return create_flow_group(ns, ft, in, fg);</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(fte_match_set_misc, misc_params_c, outer_esp_spi, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1023,7 +1024,7 @@ static int fpga_ipsec_fs_create_flow_group(struct mlx5_core_dev *dev,</div><div class='ctx'> 		MLX5_SET(create_flow_group_in, in, match_criteria_enable,</div><div class='ctx'> 			 match_criteria_enable &amp; ~MLX5_MATCH_MISC_PARAMETERS);</div><div class='ctx'> </div><div class='del'>-	ret = create_flow_group(dev, ft, in, group_id);</div><div class='add'>+	ret = create_flow_group(ns, ft, in, fg);</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(fte_match_set_misc, misc_params_c, outer_esp_spi, saved_outer_esp_spi_mask);</div><div class='ctx'> 	MLX5_SET(create_flow_group_in, in, match_criteria_enable, match_criteria_enable);</div><div class='hunk'>@@ -1031,17 +1032,18 @@ static int fpga_ipsec_fs_create_flow_group(struct mlx5_core_dev *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fpga_ipsec_fs_create_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int fpga_ipsec_fs_create_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				    struct mlx5_flow_table *ft,</div><div class='ctx'> 				    struct mlx5_flow_group *fg,</div><div class='ctx'> 				    struct fs_fte *fte,</div><div class='ctx'> 				    bool is_egress)</div><div class='ctx'> {</div><div class='del'>-	int (*create_fte)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*create_fte)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			  struct mlx5_flow_table *ft,</div><div class='ctx'> 			  struct mlx5_flow_group *fg,</div><div class='ctx'> 			  struct fs_fte *fte) =</div><div class='ctx'> 		mlx5_fs_cmd_get_default(egress_to_fs_ft(is_egress))-&gt;create_fte;</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	struct mlx5_fpga_device *fdev = dev-&gt;fpga;</div><div class='ctx'> 	struct mlx5_fpga_ipsec *fipsec = fdev-&gt;ipsec;</div><div class='ctx'> 	struct mlx5_fpga_ipsec_rule *rule;</div><div class='hunk'>@@ -1053,7 +1055,7 @@ static int fpga_ipsec_fs_create_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	    !(fte-&gt;action.action &amp;</div><div class='ctx'> 	      (MLX5_FLOW_CONTEXT_ACTION_ENCRYPT |</div><div class='ctx'> 	       MLX5_FLOW_CONTEXT_ACTION_DECRYPT)))</div><div class='del'>-		return create_fte(dev, ft, fg, fte);</div><div class='add'>+		return create_fte(ns, ft, fg, fte);</div><div class='ctx'> </div><div class='ctx'> 	rule = kzalloc(sizeof(*rule), GFP_KERNEL);</div><div class='ctx'> 	if (!rule)</div><div class='hunk'>@@ -1070,7 +1072,7 @@ static int fpga_ipsec_fs_create_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	WARN_ON(rule_insert(fipsec, rule));</div><div class='ctx'> </div><div class='ctx'> 	modify_spec_mailbox(dev, fte, &amp;mbox_mod);</div><div class='del'>-	ret = create_fte(dev, ft, fg, fte);</div><div class='add'>+	ret = create_fte(ns, ft, fg, fte);</div><div class='ctx'> 	restore_spec_mailbox(fte, &amp;mbox_mod);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		_rule_delete(fipsec, rule);</div><div class='hunk'>@@ -1081,19 +1083,20 @@ static int fpga_ipsec_fs_create_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fpga_ipsec_fs_update_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int fpga_ipsec_fs_update_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				    struct mlx5_flow_table *ft,</div><div class='del'>-				    unsigned int group_id,</div><div class='add'>+				    struct mlx5_flow_group *fg,</div><div class='ctx'> 				    int modify_mask,</div><div class='ctx'> 				    struct fs_fte *fte,</div><div class='ctx'> 				    bool is_egress)</div><div class='ctx'> {</div><div class='del'>-	int (*update_fte)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*update_fte)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			  struct mlx5_flow_table *ft,</div><div class='del'>-			  unsigned int group_id,</div><div class='add'>+			  struct mlx5_flow_group *fg,</div><div class='ctx'> 			  int modify_mask,</div><div class='ctx'> 			  struct fs_fte *fte) =</div><div class='ctx'> 		mlx5_fs_cmd_get_default(egress_to_fs_ft(is_egress))-&gt;update_fte;</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	bool is_esp = fte-&gt;action.esp_id;</div><div class='ctx'> 	struct mailbox_mod mbox_mod;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1102,24 +1105,25 @@ static int fpga_ipsec_fs_update_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	    !(fte-&gt;action.action &amp;</div><div class='ctx'> 	      (MLX5_FLOW_CONTEXT_ACTION_ENCRYPT |</div><div class='ctx'> 	       MLX5_FLOW_CONTEXT_ACTION_DECRYPT)))</div><div class='del'>-		return update_fte(dev, ft, group_id, modify_mask, fte);</div><div class='add'>+		return update_fte(ns, ft, fg, modify_mask, fte);</div><div class='ctx'> </div><div class='ctx'> 	modify_spec_mailbox(dev, fte, &amp;mbox_mod);</div><div class='del'>-	ret = update_fte(dev, ft, group_id, modify_mask, fte);</div><div class='add'>+	ret = update_fte(ns, ft, fg, modify_mask, fte);</div><div class='ctx'> 	restore_spec_mailbox(fte, &amp;mbox_mod);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fpga_ipsec_fs_delete_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int fpga_ipsec_fs_delete_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				    struct mlx5_flow_table *ft,</div><div class='ctx'> 				    struct fs_fte *fte,</div><div class='ctx'> 				    bool is_egress)</div><div class='ctx'> {</div><div class='del'>-	int (*delete_fte)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*delete_fte)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			  struct mlx5_flow_table *ft,</div><div class='ctx'> 			  struct fs_fte *fte) =</div><div class='ctx'> 		mlx5_fs_cmd_get_default(egress_to_fs_ft(is_egress))-&gt;delete_fte;</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	struct mlx5_fpga_device *fdev = dev-&gt;fpga;</div><div class='ctx'> 	struct mlx5_fpga_ipsec *fipsec = fdev-&gt;ipsec;</div><div class='ctx'> 	struct mlx5_fpga_ipsec_rule *rule;</div><div class='hunk'>@@ -1131,7 +1135,7 @@ static int fpga_ipsec_fs_delete_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	    !(fte-&gt;action.action &amp;</div><div class='ctx'> 	      (MLX5_FLOW_CONTEXT_ACTION_ENCRYPT |</div><div class='ctx'> 	       MLX5_FLOW_CONTEXT_ACTION_DECRYPT)))</div><div class='del'>-		return delete_fte(dev, ft, fte);</div><div class='add'>+		return delete_fte(ns, ft, fte);</div><div class='ctx'> </div><div class='ctx'> 	rule = rule_search(fipsec, fte);</div><div class='ctx'> 	if (!rule)</div><div class='hunk'>@@ -1141,84 +1145,84 @@ static int fpga_ipsec_fs_delete_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	rule_delete(fipsec, rule);</div><div class='ctx'> </div><div class='ctx'> 	modify_spec_mailbox(dev, fte, &amp;mbox_mod);</div><div class='del'>-	ret = delete_fte(dev, ft, fte);</div><div class='add'>+	ret = delete_fte(ns, ft, fte);</div><div class='ctx'> 	restore_spec_mailbox(fte, &amp;mbox_mod);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_create_flow_group_egress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_create_flow_group_egress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					    struct mlx5_flow_table *ft,</div><div class='ctx'> 					    u32 *in,</div><div class='del'>-					    unsigned int *group_id)</div><div class='add'>+					    struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_create_flow_group(dev, ft, in, group_id, true);</div><div class='add'>+	return fpga_ipsec_fs_create_flow_group(ns, ft, in, fg, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_create_fte_egress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_create_fte_egress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				     struct mlx5_flow_table *ft,</div><div class='ctx'> 				     struct mlx5_flow_group *fg,</div><div class='ctx'> 				     struct fs_fte *fte)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_create_fte(dev, ft, fg, fte, true);</div><div class='add'>+	return fpga_ipsec_fs_create_fte(ns, ft, fg, fte, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_update_fte_egress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_update_fte_egress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				     struct mlx5_flow_table *ft,</div><div class='del'>-				     unsigned int group_id,</div><div class='add'>+				     struct mlx5_flow_group *fg,</div><div class='ctx'> 				     int modify_mask,</div><div class='ctx'> 				     struct fs_fte *fte)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_update_fte(dev, ft, group_id, modify_mask, fte,</div><div class='add'>+	return fpga_ipsec_fs_update_fte(ns, ft, fg, modify_mask, fte,</div><div class='ctx'> 					true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_delete_fte_egress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_delete_fte_egress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				     struct mlx5_flow_table *ft,</div><div class='ctx'> 				     struct fs_fte *fte)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_delete_fte(dev, ft, fte, true);</div><div class='add'>+	return fpga_ipsec_fs_delete_fte(ns, ft, fte, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_create_flow_group_ingress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_create_flow_group_ingress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					     struct mlx5_flow_table *ft,</div><div class='ctx'> 					     u32 *in,</div><div class='del'>-					     unsigned int *group_id)</div><div class='add'>+					     struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_create_flow_group(dev, ft, in, group_id, false);</div><div class='add'>+	return fpga_ipsec_fs_create_flow_group(ns, ft, in, fg, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_create_fte_ingress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_create_fte_ingress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				      struct mlx5_flow_table *ft,</div><div class='ctx'> 				      struct mlx5_flow_group *fg,</div><div class='ctx'> 				      struct fs_fte *fte)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_create_fte(dev, ft, fg, fte, false);</div><div class='add'>+	return fpga_ipsec_fs_create_fte(ns, ft, fg, fte, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_update_fte_ingress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_update_fte_ingress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				      struct mlx5_flow_table *ft,</div><div class='del'>-				      unsigned int group_id,</div><div class='add'>+				      struct mlx5_flow_group *fg,</div><div class='ctx'> 				      int modify_mask,</div><div class='ctx'> 				      struct fs_fte *fte)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_update_fte(dev, ft, group_id, modify_mask, fte,</div><div class='add'>+	return fpga_ipsec_fs_update_fte(ns, ft, fg, modify_mask, fte,</div><div class='ctx'> 					false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mlx5_fpga_ipsec_fs_delete_fte_ingress(struct mlx5_core_dev *dev,</div><div class='add'>+mlx5_fpga_ipsec_fs_delete_fte_ingress(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				      struct mlx5_flow_table *ft,</div><div class='ctx'> 				      struct fs_fte *fte)</div><div class='ctx'> {</div><div class='del'>-	return fpga_ipsec_fs_delete_fte(dev, ft, fte, false);</div><div class='add'>+	return fpga_ipsec_fs_delete_fte(ns, ft, fte, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mlx5_flow_cmds fpga_ipsec_ingress;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c<br/>index 5cf5f2a9d51f..22a2ef111514 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c</a></div><div class='hunk'>@@ -148,14 +148,16 @@ static int mlx5_fpga_tls_alloc_swid(struct idr *idr, spinlock_t *idr_spinlock,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mlx5_fpga_tls_release_swid(struct idr *idr,</div><div class='del'>-				       spinlock_t *idr_spinlock, u32 swid)</div><div class='add'>+static void *mlx5_fpga_tls_release_swid(struct idr *idr,</div><div class='add'>+					spinlock_t *idr_spinlock, u32 swid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	void *ptr;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(idr_spinlock, flags);</div><div class='del'>-	idr_remove(idr, swid);</div><div class='add'>+	ptr = idr_remove(idr, swid);</div><div class='ctx'> 	spin_unlock_irqrestore(idr_spinlock, flags);</div><div class='add'>+	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx_tls_kfree_complete(struct mlx5_fpga_conn *conn,</div><div class='hunk'>@@ -165,20 +167,12 @@ static void mlx_tls_kfree_complete(struct mlx5_fpga_conn *conn,</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mlx5_teardown_stream_context {</div><div class='del'>-	struct mlx5_fpga_tls_command_context cmd;</div><div class='del'>-	u32 swid;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> mlx5_fpga_tls_teardown_completion(struct mlx5_fpga_conn *conn,</div><div class='ctx'> 				  struct mlx5_fpga_device *fdev,</div><div class='ctx'> 				  struct mlx5_fpga_tls_command_context *cmd,</div><div class='ctx'> 				  struct mlx5_fpga_dma_buf *resp)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_teardown_stream_context *ctx =</div><div class='del'>-		    container_of(cmd, struct mlx5_teardown_stream_context, cmd);</div><div class='del'>-</div><div class='ctx'> 	if (resp) {</div><div class='ctx'> 		u32 syndrome = MLX5_GET(tls_resp, resp-&gt;sg[0].data, syndrome);</div><div class='ctx'> </div><div class='hunk'>@@ -186,14 +180,6 @@ mlx5_fpga_tls_teardown_completion(struct mlx5_fpga_conn *conn,</div><div class='ctx'> 			mlx5_fpga_err(fdev,</div><div class='ctx'> 				      "Teardown stream failed with syndrome = %d",</div><div class='ctx'> 				      syndrome);</div><div class='del'>-		else if (MLX5_GET(tls_cmd, cmd-&gt;buf.sg[0].data, direction_sx))</div><div class='del'>-			mlx5_fpga_tls_release_swid(&amp;fdev-&gt;tls-&gt;tx_idr,</div><div class='del'>-						   &amp;fdev-&gt;tls-&gt;tx_idr_spinlock,</div><div class='del'>-						   ctx-&gt;swid);</div><div class='del'>-		else</div><div class='del'>-			mlx5_fpga_tls_release_swid(&amp;fdev-&gt;tls-&gt;rx_idr,</div><div class='del'>-						   &amp;fdev-&gt;tls-&gt;rx_idr_spinlock,</div><div class='del'>-						   ctx-&gt;swid);</div><div class='ctx'> 	}</div><div class='ctx'> 	mlx5_fpga_tls_put_command_ctx(cmd);</div><div class='ctx'> }</div><div class='hunk'>@@ -225,8 +211,14 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	flow = idr_find(&amp;mdev-&gt;fpga-&gt;tls-&gt;rx_idr, ntohl(handle));</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	if (unlikely(!flow)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		WARN_ONCE(1, "Received NULL pointer for handle\n");</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	mlx5_fpga_tls_flow_to_cmd(flow, cmd);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(tls_cmd, cmd, swid, ntohl(handle));</div><div class='ctx'> 	MLX5_SET64(tls_cmd, cmd, tls_rcd_sn, be64_to_cpu(rcd_sn));</div><div class='hunk'>@@ -238,6 +230,8 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,</div><div class='ctx'> 	buf-&gt;complete = mlx_tls_kfree_complete;</div><div class='ctx'> </div><div class='ctx'> 	ret = mlx5_fpga_sbu_conn_sendmsg(mdev-&gt;fpga-&gt;tls-&gt;conn, buf);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		kfree(buf);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -245,7 +239,7 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,</div><div class='ctx'> static void mlx5_fpga_tls_send_teardown_cmd(struct mlx5_core_dev *mdev,</div><div class='ctx'> 					    void *flow, u32 swid, gfp_t flags)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_teardown_stream_context *ctx;</div><div class='add'>+	struct mlx5_fpga_tls_command_context *ctx;</div><div class='ctx'> 	struct mlx5_fpga_dma_buf *buf;</div><div class='ctx'> 	void *cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +247,7 @@ static void mlx5_fpga_tls_send_teardown_cmd(struct mlx5_core_dev *mdev,</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	buf = &amp;ctx-&gt;cmd.buf;</div><div class='add'>+	buf = &amp;ctx-&gt;buf;</div><div class='ctx'> 	cmd = (ctx + 1);</div><div class='ctx'> 	MLX5_SET(tls_cmd, cmd, command_type, CMD_TEARDOWN_STREAM);</div><div class='ctx'> 	MLX5_SET(tls_cmd, cmd, swid, swid);</div><div class='hunk'>@@ -264,8 +258,7 @@ static void mlx5_fpga_tls_send_teardown_cmd(struct mlx5_core_dev *mdev,</div><div class='ctx'> 	buf-&gt;sg[0].data = cmd;</div><div class='ctx'> 	buf-&gt;sg[0].size = MLX5_TLS_COMMAND_SIZE;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;swid = swid;</div><div class='del'>-	mlx5_fpga_tls_cmd_send(mdev-&gt;fpga, &amp;ctx-&gt;cmd,</div><div class='add'>+	mlx5_fpga_tls_cmd_send(mdev-&gt;fpga, ctx,</div><div class='ctx'> 			       mlx5_fpga_tls_teardown_completion);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -275,13 +268,14 @@ void mlx5_fpga_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,</div><div class='ctx'> 	struct mlx5_fpga_tls *tls = mdev-&gt;fpga-&gt;tls;</div><div class='ctx'> 	void *flow;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	if (direction_sx)</div><div class='del'>-		flow = idr_find(&amp;tls-&gt;tx_idr, swid);</div><div class='add'>+		flow = mlx5_fpga_tls_release_swid(&amp;tls-&gt;tx_idr,</div><div class='add'>+						  &amp;tls-&gt;tx_idr_spinlock,</div><div class='add'>+						  swid);</div><div class='ctx'> 	else</div><div class='del'>-		flow = idr_find(&amp;tls-&gt;rx_idr, swid);</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+		flow = mlx5_fpga_tls_release_swid(&amp;tls-&gt;rx_idr,</div><div class='add'>+						  &amp;tls-&gt;rx_idr_spinlock,</div><div class='add'>+						  swid);</div><div class='ctx'> </div><div class='ctx'> 	if (!flow) {</div><div class='ctx'> 		mlx5_fpga_err(mdev-&gt;fpga, "No flow information for swid %u\n",</div><div class='hunk'>@@ -289,6 +283,7 @@ void mlx5_fpga_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	synchronize_rcu(); /* before kfree(flow) */</div><div class='ctx'> 	mlx5_fpga_tls_send_teardown_cmd(mdev, flow, swid, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c<br/>index c44ccb67c4a3..013b1ca4a791 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include "mlx5_core.h"</div><div class='ctx'> #include "eswitch.h"</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_update_root_ft(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_update_root_ft(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					struct mlx5_flow_table *ft,</div><div class='ctx'> 					u32 underlay_qpn,</div><div class='ctx'> 					bool disconnect)</div><div class='hunk'>@@ -47,47 +47,43 @@ static int mlx5_cmd_stub_update_root_ft(struct mlx5_core_dev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_create_flow_table(struct mlx5_core_dev *dev,</div><div class='del'>-					   u16 vport,</div><div class='del'>-					   enum fs_flow_table_op_mod op_mod,</div><div class='del'>-					   enum fs_flow_table_type type,</div><div class='del'>-					   unsigned int level,</div><div class='add'>+static int mlx5_cmd_stub_create_flow_table(struct mlx5_flow_root_namespace *ns,</div><div class='add'>+					   struct mlx5_flow_table *ft,</div><div class='ctx'> 					   unsigned int log_size,</div><div class='del'>-					   struct mlx5_flow_table *next_ft,</div><div class='del'>-					   unsigned int *table_id, u32 flags)</div><div class='add'>+					   struct mlx5_flow_table *next_ft)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_destroy_flow_table(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_destroy_flow_table(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					    struct mlx5_flow_table *ft)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_modify_flow_table(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_modify_flow_table(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					   struct mlx5_flow_table *ft,</div><div class='ctx'> 					   struct mlx5_flow_table *next_ft)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_create_flow_group(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_create_flow_group(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					   struct mlx5_flow_table *ft,</div><div class='ctx'> 					   u32 *in,</div><div class='del'>-					   unsigned int *group_id)</div><div class='add'>+					   struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_destroy_flow_group(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_destroy_flow_group(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 					    struct mlx5_flow_table *ft,</div><div class='del'>-					    unsigned int group_id)</div><div class='add'>+					    struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_create_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_create_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				    struct mlx5_flow_table *ft,</div><div class='ctx'> 				    struct mlx5_flow_group *group,</div><div class='ctx'> 				    struct fs_fte *fte)</div><div class='hunk'>@@ -95,28 +91,29 @@ static int mlx5_cmd_stub_create_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_update_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_update_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				    struct mlx5_flow_table *ft,</div><div class='del'>-				    unsigned int group_id,</div><div class='add'>+				    struct mlx5_flow_group *group,</div><div class='ctx'> 				    int modify_mask,</div><div class='ctx'> 				    struct fs_fte *fte)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_stub_delete_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_stub_delete_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				    struct mlx5_flow_table *ft,</div><div class='ctx'> 				    struct fs_fte *fte)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_update_root_ft(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_update_root_ft(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				   struct mlx5_flow_table *ft, u32 underlay_qpn,</div><div class='ctx'> 				   bool disconnect)</div><div class='ctx'> {</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(set_flow_table_root_in)]   = {0};</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(set_flow_table_root_out)] = {0};</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if ((MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_IB) &amp;&amp;</div><div class='ctx'> 	    underlay_qpn == 0)</div><div class='hunk'>@@ -143,29 +140,26 @@ static int mlx5_cmd_update_root_ft(struct mlx5_core_dev *dev,</div><div class='ctx'> 	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_create_flow_table(struct mlx5_core_dev *dev,</div><div class='del'>-				      u16 vport,</div><div class='del'>-				      enum fs_flow_table_op_mod op_mod,</div><div class='del'>-				      enum fs_flow_table_type type,</div><div class='del'>-				      unsigned int level,</div><div class='add'>+static int mlx5_cmd_create_flow_table(struct mlx5_flow_root_namespace *ns,</div><div class='add'>+				      struct mlx5_flow_table *ft,</div><div class='ctx'> 				      unsigned int log_size,</div><div class='del'>-				      struct mlx5_flow_table *next_ft,</div><div class='del'>-				      unsigned int *table_id, u32 flags)</div><div class='add'>+				      struct mlx5_flow_table *next_ft)</div><div class='ctx'> {</div><div class='del'>-	int en_encap = !!(flags &amp; MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT);</div><div class='del'>-	int en_decap = !!(flags &amp; MLX5_FLOW_TABLE_TUNNEL_EN_DECAP);</div><div class='add'>+	int en_encap = !!(ft-&gt;flags &amp; MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT);</div><div class='add'>+	int en_decap = !!(ft-&gt;flags &amp; MLX5_FLOW_TABLE_TUNNEL_EN_DECAP);</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(create_flow_table_out)] = {0};</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(create_flow_table_in)]   = {0};</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(create_flow_table_in, in, opcode,</div><div class='ctx'> 		 MLX5_CMD_OP_CREATE_FLOW_TABLE);</div><div class='ctx'> </div><div class='del'>-	MLX5_SET(create_flow_table_in, in, table_type, type);</div><div class='del'>-	MLX5_SET(create_flow_table_in, in, flow_table_context.level, level);</div><div class='add'>+	MLX5_SET(create_flow_table_in, in, table_type, ft-&gt;type);</div><div class='add'>+	MLX5_SET(create_flow_table_in, in, flow_table_context.level, ft-&gt;level);</div><div class='ctx'> 	MLX5_SET(create_flow_table_in, in, flow_table_context.log_size, log_size);</div><div class='del'>-	if (vport) {</div><div class='del'>-		MLX5_SET(create_flow_table_in, in, vport_number, vport);</div><div class='add'>+	if (ft-&gt;vport) {</div><div class='add'>+		MLX5_SET(create_flow_table_in, in, vport_number, ft-&gt;vport);</div><div class='ctx'> 		MLX5_SET(create_flow_table_in, in, other_vport, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -174,13 +168,18 @@ static int mlx5_cmd_create_flow_table(struct mlx5_core_dev *dev,</div><div class='ctx'> 	MLX5_SET(create_flow_table_in, in, flow_table_context.reformat_en,</div><div class='ctx'> 		 en_encap);</div><div class='ctx'> </div><div class='del'>-	switch (op_mod) {</div><div class='add'>+	switch (ft-&gt;op_mod) {</div><div class='ctx'> 	case FS_FT_OP_MOD_NORMAL:</div><div class='ctx'> 		if (next_ft) {</div><div class='ctx'> 			MLX5_SET(create_flow_table_in, in,</div><div class='del'>-				 flow_table_context.table_miss_action, 1);</div><div class='add'>+				 flow_table_context.table_miss_action,</div><div class='add'>+				 MLX5_FLOW_TABLE_MISS_ACTION_FWD);</div><div class='ctx'> 			MLX5_SET(create_flow_table_in, in,</div><div class='ctx'> 				 flow_table_context.table_miss_id, next_ft-&gt;id);</div><div class='add'>+		} else {</div><div class='add'>+			MLX5_SET(create_flow_table_in, in,</div><div class='add'>+				 flow_table_context.table_miss_action,</div><div class='add'>+				 ns-&gt;def_miss_action);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -195,16 +194,17 @@ static int mlx5_cmd_create_flow_table(struct mlx5_core_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));</div><div class='ctx'> 	if (!err)</div><div class='del'>-		*table_id = MLX5_GET(create_flow_table_out, out,</div><div class='del'>-				     table_id);</div><div class='add'>+		ft-&gt;id = MLX5_GET(create_flow_table_out, out,</div><div class='add'>+				  table_id);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_destroy_flow_table(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_destroy_flow_table(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				       struct mlx5_flow_table *ft)</div><div class='ctx'> {</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(destroy_flow_table_in)]   = {0};</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(destroy_flow_table_out)] = {0};</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(destroy_flow_table_in, in, opcode,</div><div class='ctx'> 		 MLX5_CMD_OP_DESTROY_FLOW_TABLE);</div><div class='hunk'>@@ -218,12 +218,13 @@ static int mlx5_cmd_destroy_flow_table(struct mlx5_core_dev *dev,</div><div class='ctx'> 	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_modify_flow_table(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_modify_flow_table(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				      struct mlx5_flow_table *ft,</div><div class='ctx'> 				      struct mlx5_flow_table *next_ft)</div><div class='ctx'> {</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(modify_flow_table_in)]   = {0};</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(modify_flow_table_out)] = {0};</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(modify_flow_table_in, in, opcode,</div><div class='ctx'> 		 MLX5_CMD_OP_MODIFY_FLOW_TABLE);</div><div class='hunk'>@@ -250,26 +251,29 @@ static int mlx5_cmd_modify_flow_table(struct mlx5_core_dev *dev,</div><div class='ctx'> 			 MLX5_MODIFY_FLOW_TABLE_MISS_TABLE_ID);</div><div class='ctx'> 		if (next_ft) {</div><div class='ctx'> 			MLX5_SET(modify_flow_table_in, in,</div><div class='del'>-				 flow_table_context.table_miss_action, 1);</div><div class='add'>+				 flow_table_context.table_miss_action,</div><div class='add'>+				 MLX5_FLOW_TABLE_MISS_ACTION_FWD);</div><div class='ctx'> 			MLX5_SET(modify_flow_table_in, in,</div><div class='ctx'> 				 flow_table_context.table_miss_id,</div><div class='ctx'> 				 next_ft-&gt;id);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			MLX5_SET(modify_flow_table_in, in,</div><div class='del'>-				 flow_table_context.table_miss_action, 0);</div><div class='add'>+				 flow_table_context.table_miss_action,</div><div class='add'>+				 ns-&gt;def_miss_action);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_create_flow_group(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_create_flow_group(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				      struct mlx5_flow_table *ft,</div><div class='ctx'> 				      u32 *in,</div><div class='del'>-				      unsigned int *group_id)</div><div class='add'>+				      struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(create_flow_group_out)] = {0};</div><div class='ctx'> 	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(create_flow_group_in, in, opcode,</div><div class='hunk'>@@ -283,23 +287,24 @@ static int mlx5_cmd_create_flow_group(struct mlx5_core_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));</div><div class='ctx'> 	if (!err)</div><div class='del'>-		*group_id = MLX5_GET(create_flow_group_out, out,</div><div class='del'>-				     group_id);</div><div class='add'>+		fg-&gt;id = MLX5_GET(create_flow_group_out, out,</div><div class='add'>+				  group_id);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_destroy_flow_group(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_destroy_flow_group(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				       struct mlx5_flow_table *ft,</div><div class='del'>-				       unsigned int group_id)</div><div class='add'>+				       struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(destroy_flow_group_out)] = {0};</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(destroy_flow_group_in)]   = {0};</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(destroy_flow_group_in, in, opcode,</div><div class='ctx'> 		 MLX5_CMD_OP_DESTROY_FLOW_GROUP);</div><div class='ctx'> 	MLX5_SET(destroy_flow_group_in, in, table_type, ft-&gt;type);</div><div class='ctx'> 	MLX5_SET(destroy_flow_group_in, in, table_id, ft-&gt;id);</div><div class='del'>-	MLX5_SET(destroy_flow_group_in, in, group_id, group_id);</div><div class='add'>+	MLX5_SET(destroy_flow_group_in, in, group_id, fg-&gt;id);</div><div class='ctx'> 	if (ft-&gt;vport) {</div><div class='ctx'> 		MLX5_SET(destroy_flow_group_in, in, vport_number, ft-&gt;vport);</div><div class='ctx'> 		MLX5_SET(destroy_flow_group_in, in, other_vport, 1);</div><div class='hunk'>@@ -505,23 +510,25 @@ err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_create_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_create_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			       struct mlx5_flow_table *ft,</div><div class='ctx'> 			       struct mlx5_flow_group *group,</div><div class='ctx'> 			       struct fs_fte *fte)</div><div class='ctx'> {</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	unsigned int group_id = group-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	return mlx5_cmd_set_fte(dev, 0, 0, ft, group_id, fte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_update_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_update_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			       struct mlx5_flow_table *ft,</div><div class='del'>-			       unsigned int group_id,</div><div class='add'>+			       struct mlx5_flow_group *fg,</div><div class='ctx'> 			       int modify_mask,</div><div class='ctx'> 			       struct fs_fte *fte)</div><div class='ctx'> {</div><div class='ctx'> 	int opmod;</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> 	int atomic_mod_cap = MLX5_CAP_FLOWTABLE(dev,</div><div class='ctx'> 						flow_table_properties_nic_receive.</div><div class='ctx'> 						flow_modify_en);</div><div class='hunk'>@@ -529,15 +536,16 @@ static int mlx5_cmd_update_fte(struct mlx5_core_dev *dev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	opmod = 1;</div><div class='ctx'> </div><div class='del'>-	return	mlx5_cmd_set_fte(dev, opmod, modify_mask, ft, group_id, fte);</div><div class='add'>+	return	mlx5_cmd_set_fte(dev, opmod, modify_mask, ft, fg-&gt;id, fte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_cmd_delete_fte(struct mlx5_core_dev *dev,</div><div class='add'>+static int mlx5_cmd_delete_fte(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			       struct mlx5_flow_table *ft,</div><div class='ctx'> 			       struct fs_fte *fte)</div><div class='ctx'> {</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(delete_fte_out)] = {0};</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(delete_fte_in)]   = {0};</div><div class='add'>+	struct mlx5_core_dev *dev = ns-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(delete_fte_in, in, opcode, MLX5_CMD_OP_DELETE_FLOW_TABLE_ENTRY);</div><div class='ctx'> 	MLX5_SET(delete_fte_in, in, table_type, ft-&gt;type);</div><div class='hunk'>@@ -853,6 +861,7 @@ const struct mlx5_flow_cmds *mlx5_fs_cmd_get_default(enum fs_flow_table_type typ</div><div class='ctx'> 	case FS_FT_SNIFFER_RX:</div><div class='ctx'> 	case FS_FT_SNIFFER_TX:</div><div class='ctx'> 	case FS_FT_NIC_TX:</div><div class='add'>+	case FS_FT_RDMA_RX:</div><div class='ctx'> 		return mlx5_fs_cmd_get_fw_cmds();</div><div class='ctx'> 	default:</div><div class='ctx'> 		return mlx5_fs_cmd_get_stub_cmds();</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h<br/>index 6228ba7bfa1a..e340f9af2f5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h</a></div><div class='hunk'>@@ -36,45 +36,42 @@</div><div class='ctx'> #include "fs_core.h"</div><div class='ctx'> </div><div class='ctx'> struct mlx5_flow_cmds {</div><div class='del'>-	int (*create_flow_table)(struct mlx5_core_dev *dev,</div><div class='del'>-				 u16 vport,</div><div class='del'>-				 enum fs_flow_table_op_mod op_mod,</div><div class='del'>-				 enum fs_flow_table_type type,</div><div class='del'>-				 unsigned int level, unsigned int log_size,</div><div class='del'>-				 struct mlx5_flow_table *next_ft,</div><div class='del'>-				 unsigned int *table_id, u32 flags);</div><div class='del'>-	int (*destroy_flow_table)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*create_flow_table)(struct mlx5_flow_root_namespace *ns,</div><div class='add'>+				 struct mlx5_flow_table *ft,</div><div class='add'>+				 unsigned int log_size,</div><div class='add'>+				 struct mlx5_flow_table *next_ft);</div><div class='add'>+	int (*destroy_flow_table)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				  struct mlx5_flow_table *ft);</div><div class='ctx'> </div><div class='del'>-	int (*modify_flow_table)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*modify_flow_table)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				 struct mlx5_flow_table *ft,</div><div class='ctx'> 				 struct mlx5_flow_table *next_ft);</div><div class='ctx'> </div><div class='del'>-	int (*create_flow_group)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*create_flow_group)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				 struct mlx5_flow_table *ft,</div><div class='ctx'> 				 u32 *in,</div><div class='del'>-				 unsigned int *group_id);</div><div class='add'>+				 struct mlx5_flow_group *fg);</div><div class='ctx'> </div><div class='del'>-	int (*destroy_flow_group)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*destroy_flow_group)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 				  struct mlx5_flow_table *ft,</div><div class='del'>-				  unsigned int group_id);</div><div class='add'>+				  struct mlx5_flow_group *fg);</div><div class='ctx'> </div><div class='del'>-	int (*create_fte)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*create_fte)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			  struct mlx5_flow_table *ft,</div><div class='ctx'> 			  struct mlx5_flow_group *fg,</div><div class='ctx'> 			  struct fs_fte *fte);</div><div class='ctx'> </div><div class='del'>-	int (*update_fte)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*update_fte)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			  struct mlx5_flow_table *ft,</div><div class='del'>-			  unsigned int group_id,</div><div class='add'>+			  struct mlx5_flow_group *fg,</div><div class='ctx'> 			  int modify_mask,</div><div class='ctx'> 			  struct fs_fte *fte);</div><div class='ctx'> </div><div class='del'>-	int (*delete_fte)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*delete_fte)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			  struct mlx5_flow_table *ft,</div><div class='ctx'> 			  struct fs_fte *fte);</div><div class='ctx'> </div><div class='del'>-	int (*update_root_ft)(struct mlx5_core_dev *dev,</div><div class='add'>+	int (*update_root_ft)(struct mlx5_flow_root_namespace *ns,</div><div class='ctx'> 			      struct mlx5_flow_table *ft,</div><div class='ctx'> 			      u32 underlay_qpn,</div><div class='ctx'> 			      bool disconnect);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c<br/>index 0be3eb86dd84..fb5b61727ee7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.c</a></div><div class='hunk'>@@ -403,7 +403,7 @@ static void del_hw_flow_table(struct fs_node *node)</div><div class='ctx'> 	trace_mlx5_fs_del_ft(ft);</div><div class='ctx'> </div><div class='ctx'> 	if (node-&gt;active) {</div><div class='del'>-		err = root-&gt;cmds-&gt;destroy_flow_table(dev, ft);</div><div class='add'>+		err = root-&gt;cmds-&gt;destroy_flow_table(root, ft);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			mlx5_core_warn(dev, "flow steering can't destroy ft\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -435,7 +435,7 @@ static void modify_fte(struct fs_fte *fte)</div><div class='ctx'> 	dev = get_dev(&amp;fte-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 	root = find_root(&amp;ft-&gt;node);</div><div class='del'>-	err = root-&gt;cmds-&gt;update_fte(dev, ft, fg-&gt;id, fte-&gt;modify_mask, fte);</div><div class='add'>+	err = root-&gt;cmds-&gt;update_fte(root, ft, fg, fte-&gt;modify_mask, fte);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		mlx5_core_warn(dev,</div><div class='ctx'> 			       "%s can't del rule fg id=%d fte_index=%d\n",</div><div class='hunk'>@@ -492,7 +492,7 @@ static void del_hw_fte(struct fs_node *node)</div><div class='ctx'> 	dev = get_dev(&amp;ft-&gt;node);</div><div class='ctx'> 	root = find_root(&amp;ft-&gt;node);</div><div class='ctx'> 	if (node-&gt;active) {</div><div class='del'>-		err = root-&gt;cmds-&gt;delete_fte(dev, ft, fte);</div><div class='add'>+		err = root-&gt;cmds-&gt;delete_fte(root, ft, fte);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			mlx5_core_warn(dev,</div><div class='ctx'> 				       "flow steering can't delete fte in index %d of flow group id %d\n",</div><div class='hunk'>@@ -532,7 +532,7 @@ static void del_hw_flow_group(struct fs_node *node)</div><div class='ctx'> 	trace_mlx5_fs_del_fg(fg);</div><div class='ctx'> </div><div class='ctx'> 	root = find_root(&amp;ft-&gt;node);</div><div class='del'>-	if (fg-&gt;node.active &amp;&amp; root-&gt;cmds-&gt;destroy_flow_group(dev, ft, fg-&gt;id))</div><div class='add'>+	if (fg-&gt;node.active &amp;&amp; root-&gt;cmds-&gt;destroy_flow_group(root, ft, fg))</div><div class='ctx'> 		mlx5_core_warn(dev, "flow steering can't destroy fg %d of ft %d\n",</div><div class='ctx'> 			       fg-&gt;id, ft-&gt;id);</div><div class='ctx'> }</div><div class='hunk'>@@ -783,7 +783,7 @@ static int connect_fts_in_prio(struct mlx5_core_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	fs_for_each_ft(iter, prio) {</div><div class='ctx'> 		i++;</div><div class='del'>-		err = root-&gt;cmds-&gt;modify_flow_table(dev, iter, ft);</div><div class='add'>+		err = root-&gt;cmds-&gt;modify_flow_table(root, iter, ft);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			mlx5_core_warn(dev, "Failed to modify flow table %d\n",</div><div class='ctx'> 				       iter-&gt;id);</div><div class='hunk'>@@ -819,7 +819,7 @@ static int update_root_ft_create(struct mlx5_flow_table *ft, struct fs_prio</div><div class='ctx'> 	struct mlx5_flow_root_namespace *root = find_root(&amp;prio-&gt;node);</div><div class='ctx'> 	struct mlx5_ft_underlay_qp *uqp;</div><div class='ctx'> 	int min_level = INT_MAX;</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	u32 qpn;</div><div class='ctx'> </div><div class='ctx'> 	if (root-&gt;root_ft)</div><div class='hunk'>@@ -831,11 +831,11 @@ static int update_root_ft_create(struct mlx5_flow_table *ft, struct fs_prio</div><div class='ctx'> 	if (list_empty(&amp;root-&gt;underlay_qpns)) {</div><div class='ctx'> 		/* Don't set any QPN (zero) in case QPN list is empty */</div><div class='ctx'> 		qpn = 0;</div><div class='del'>-		err = root-&gt;cmds-&gt;update_root_ft(root-&gt;dev, ft, qpn, false);</div><div class='add'>+		err = root-&gt;cmds-&gt;update_root_ft(root, ft, qpn, false);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		list_for_each_entry(uqp, &amp;root-&gt;underlay_qpns, list) {</div><div class='ctx'> 			qpn = uqp-&gt;qpn;</div><div class='del'>-			err = root-&gt;cmds-&gt;update_root_ft(root-&gt;dev, ft,</div><div class='add'>+			err = root-&gt;cmds-&gt;update_root_ft(root, ft,</div><div class='ctx'> 							 qpn, false);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -871,7 +871,7 @@ static int _mlx5_modify_rule_destination(struct mlx5_flow_rule *rule,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;rule-&gt;dest_attr, dest, sizeof(*dest));</div><div class='ctx'> 	root = find_root(&amp;ft-&gt;node);</div><div class='del'>-	err = root-&gt;cmds-&gt;update_fte(get_dev(&amp;ft-&gt;node), ft, fg-&gt;id,</div><div class='add'>+	err = root-&gt;cmds-&gt;update_fte(root, ft, fg,</div><div class='ctx'> 				     modify_mask, fte);</div><div class='ctx'> 	up_write_ref_node(&amp;fte-&gt;node, false);</div><div class='ctx'> </div><div class='hunk'>@@ -1013,9 +1013,7 @@ static struct mlx5_flow_table *__mlx5_create_flow_table(struct mlx5_flow_namespa</div><div class='ctx'> 	tree_init_node(&amp;ft-&gt;node, del_hw_flow_table, del_sw_flow_table);</div><div class='ctx'> 	log_table_sz = ft-&gt;max_fte ? ilog2(ft-&gt;max_fte) : 0;</div><div class='ctx'> 	next_ft = find_next_chained_ft(fs_prio);</div><div class='del'>-	err = root-&gt;cmds-&gt;create_flow_table(root-&gt;dev, ft-&gt;vport, ft-&gt;op_mod,</div><div class='del'>-					    ft-&gt;type, ft-&gt;level, log_table_sz,</div><div class='del'>-					    next_ft, &amp;ft-&gt;id, ft-&gt;flags);</div><div class='add'>+	err = root-&gt;cmds-&gt;create_flow_table(root, ft, log_table_sz, next_ft);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_ft;</div><div class='ctx'> </div><div class='hunk'>@@ -1032,7 +1030,7 @@ static struct mlx5_flow_table *__mlx5_create_flow_table(struct mlx5_flow_namespa</div><div class='ctx'> 	trace_mlx5_fs_add_ft(ft);</div><div class='ctx'> 	return ft;</div><div class='ctx'> destroy_ft:</div><div class='del'>-	root-&gt;cmds-&gt;destroy_flow_table(root-&gt;dev, ft);</div><div class='add'>+	root-&gt;cmds-&gt;destroy_flow_table(root, ft);</div><div class='ctx'> free_ft:</div><div class='ctx'> 	kfree(ft);</div><div class='ctx'> unlock_root:</div><div class='hunk'>@@ -1114,7 +1112,6 @@ struct mlx5_flow_group *mlx5_create_flow_group(struct mlx5_flow_table *ft,</div><div class='ctx'> 				   start_flow_index);</div><div class='ctx'> 	int end_index = MLX5_GET(create_flow_group_in, fg_in,</div><div class='ctx'> 				 end_flow_index);</div><div class='del'>-	struct mlx5_core_dev *dev = get_dev(&amp;ft-&gt;node);</div><div class='ctx'> 	struct mlx5_flow_group *fg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1129,7 +1126,7 @@ struct mlx5_flow_group *mlx5_create_flow_group(struct mlx5_flow_table *ft,</div><div class='ctx'> 	if (IS_ERR(fg))</div><div class='ctx'> 		return fg;</div><div class='ctx'> </div><div class='del'>-	err = root-&gt;cmds-&gt;create_flow_group(dev, ft, fg_in, &amp;fg-&gt;id);</div><div class='add'>+	err = root-&gt;cmds-&gt;create_flow_group(root, ft, fg_in, fg);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		tree_put_node(&amp;fg-&gt;node, false);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='hunk'>@@ -1269,11 +1266,9 @@ add_rule_fte(struct fs_fte *fte,</div><div class='ctx'> 	fs_get_obj(ft, fg-&gt;node.parent);</div><div class='ctx'> 	root = find_root(&amp;fg-&gt;node);</div><div class='ctx'> 	if (!(fte-&gt;status &amp; FS_FTE_STATUS_EXISTING))</div><div class='del'>-		err = root-&gt;cmds-&gt;create_fte(get_dev(&amp;ft-&gt;node),</div><div class='del'>-					     ft, fg, fte);</div><div class='add'>+		err = root-&gt;cmds-&gt;create_fte(root, ft, fg, fte);</div><div class='ctx'> 	else</div><div class='del'>-		err = root-&gt;cmds-&gt;update_fte(get_dev(&amp;ft-&gt;node), ft, fg-&gt;id,</div><div class='del'>-						     modify_mask, fte);</div><div class='add'>+		err = root-&gt;cmds-&gt;update_fte(root, ft, fg, modify_mask, fte);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_handle;</div><div class='ctx'> </div><div class='hunk'>@@ -1339,7 +1334,6 @@ static int create_auto_flow_group(struct mlx5_flow_table *ft,</div><div class='ctx'> 				  struct mlx5_flow_group *fg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_flow_root_namespace *root = find_root(&amp;ft-&gt;node);</div><div class='del'>-	struct mlx5_core_dev *dev = get_dev(&amp;ft-&gt;node);</div><div class='ctx'> 	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);</div><div class='ctx'> 	void *match_criteria_addr;</div><div class='ctx'> 	u8 src_esw_owner_mask_on;</div><div class='hunk'>@@ -1369,7 +1363,7 @@ static int create_auto_flow_group(struct mlx5_flow_table *ft,</div><div class='ctx'> 	memcpy(match_criteria_addr, fg-&gt;mask.match_criteria,</div><div class='ctx'> 	       sizeof(fg-&gt;mask.match_criteria));</div><div class='ctx'> </div><div class='del'>-	err = root-&gt;cmds-&gt;create_flow_group(dev, ft, in, &amp;fg-&gt;id);</div><div class='add'>+	err = root-&gt;cmds-&gt;create_flow_group(root, ft, in, fg);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		fg-&gt;node.active = true;</div><div class='ctx'> 		trace_mlx5_fs_add_fg(fg);</div><div class='hunk'>@@ -1941,12 +1935,12 @@ static int update_root_ft_destroy(struct mlx5_flow_table *ft)</div><div class='ctx'> 	if (list_empty(&amp;root-&gt;underlay_qpns)) {</div><div class='ctx'> 		/* Don't set any QPN (zero) in case QPN list is empty */</div><div class='ctx'> 		qpn = 0;</div><div class='del'>-		err = root-&gt;cmds-&gt;update_root_ft(root-&gt;dev, new_root_ft,</div><div class='add'>+		err = root-&gt;cmds-&gt;update_root_ft(root, new_root_ft,</div><div class='ctx'> 						 qpn, false);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		list_for_each_entry(uqp, &amp;root-&gt;underlay_qpns, list) {</div><div class='ctx'> 			qpn = uqp-&gt;qpn;</div><div class='del'>-			err = root-&gt;cmds-&gt;update_root_ft(root-&gt;dev,</div><div class='add'>+			err = root-&gt;cmds-&gt;update_root_ft(root,</div><div class='ctx'> 							 new_root_ft, qpn,</div><div class='ctx'> 							 false);</div><div class='ctx'> 			if (err)</div><div class='hunk'>@@ -2060,6 +2054,10 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev,</div><div class='ctx'> 		if (steering-&gt;sniffer_tx_root_ns)</div><div class='ctx'> 			return &amp;steering-&gt;sniffer_tx_root_ns-&gt;ns;</div><div class='ctx'> 		return NULL;</div><div class='add'>+	case MLX5_FLOW_NAMESPACE_RDMA_RX:</div><div class='add'>+		if (steering-&gt;rdma_rx_root_ns)</div><div class='add'>+			return &amp;steering-&gt;rdma_rx_root_ns-&gt;ns;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2456,6 +2454,7 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev)</div><div class='ctx'> 	steering-&gt;fdb_sub_ns = NULL;</div><div class='ctx'> 	cleanup_root_ns(steering-&gt;sniffer_rx_root_ns);</div><div class='ctx'> 	cleanup_root_ns(steering-&gt;sniffer_tx_root_ns);</div><div class='add'>+	cleanup_root_ns(steering-&gt;rdma_rx_root_ns);</div><div class='ctx'> 	cleanup_root_ns(steering-&gt;egress_root_ns);</div><div class='ctx'> 	mlx5_cleanup_fc_stats(dev);</div><div class='ctx'> 	kmem_cache_destroy(steering-&gt;ftes_cache);</div><div class='hunk'>@@ -2497,6 +2496,25 @@ static int init_sniffer_rx_root_ns(struct mlx5_flow_steering *steering)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int init_rdma_rx_root_ns(struct mlx5_flow_steering *steering)</div><div class='add'>+{</div><div class='add'>+	struct fs_prio *prio;</div><div class='add'>+</div><div class='add'>+	steering-&gt;rdma_rx_root_ns = create_root_ns(steering, FS_FT_RDMA_RX);</div><div class='add'>+	if (!steering-&gt;rdma_rx_root_ns)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	steering-&gt;rdma_rx_root_ns-&gt;def_miss_action =</div><div class='add'>+		MLX5_FLOW_TABLE_MISS_ACTION_SWITCH_DOMAIN;</div><div class='add'>+</div><div class='add'>+	/* Create single prio */</div><div class='add'>+	prio = fs_create_prio(&amp;steering-&gt;rdma_rx_root_ns-&gt;ns, 0, 1);</div><div class='add'>+	if (IS_ERR(prio)) {</div><div class='add'>+		cleanup_root_ns(steering-&gt;rdma_rx_root_ns);</div><div class='add'>+		return PTR_ERR(prio);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static int init_fdb_root_ns(struct mlx5_flow_steering *steering)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_flow_namespace *ns;</div><div class='hunk'>@@ -2516,8 +2534,16 @@ static int init_fdb_root_ns(struct mlx5_flow_steering *steering)</div><div class='ctx'> 	if (!steering-&gt;fdb_sub_ns)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	maj_prio = fs_create_prio(&amp;steering-&gt;fdb_root_ns-&gt;ns, FDB_BYPASS_PATH,</div><div class='add'>+				  1);</div><div class='add'>+	if (IS_ERR(maj_prio)) {</div><div class='add'>+		err = PTR_ERR(maj_prio);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	levels = 2 * FDB_MAX_PRIO * (FDB_MAX_CHAIN + 1);</div><div class='del'>-	maj_prio = fs_create_prio_chained(&amp;steering-&gt;fdb_root_ns-&gt;ns, 0,</div><div class='add'>+	maj_prio = fs_create_prio_chained(&amp;steering-&gt;fdb_root_ns-&gt;ns,</div><div class='add'>+					  FDB_FAST_PATH,</div><div class='ctx'> 					  levels);</div><div class='ctx'> 	if (IS_ERR(maj_prio)) {</div><div class='ctx'> 		err = PTR_ERR(maj_prio);</div><div class='hunk'>@@ -2542,7 +2568,7 @@ static int init_fdb_root_ns(struct mlx5_flow_steering *steering)</div><div class='ctx'> 		steering-&gt;fdb_sub_ns[chain] = ns;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	maj_prio = fs_create_prio(&amp;steering-&gt;fdb_root_ns-&gt;ns, 1, 1);</div><div class='add'>+	maj_prio = fs_create_prio(&amp;steering-&gt;fdb_root_ns-&gt;ns, FDB_SLOW_PATH, 1);</div><div class='ctx'> 	if (IS_ERR(maj_prio)) {</div><div class='ctx'> 		err = PTR_ERR(maj_prio);</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -2725,6 +2751,13 @@ int mlx5_init_fs(struct mlx5_core_dev *dev)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (MLX5_CAP_FLOWTABLE_RDMA_RX(dev, ft_support) &amp;&amp;</div><div class='add'>+	    MLX5_CAP_FLOWTABLE_RDMA_RX(dev, table_miss_action_domain)) {</div><div class='add'>+		err = init_rdma_rx_root_ns(steering);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (MLX5_IPSEC_DEV(dev) || MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) {</div><div class='ctx'> 		err = init_egress_root_ns(steering);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -2754,7 +2787,7 @@ int mlx5_fs_add_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn)</div><div class='ctx'> 		goto update_ft_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = root-&gt;cmds-&gt;update_root_ft(dev, root-&gt;root_ft, underlay_qpn,</div><div class='add'>+	err = root-&gt;cmds-&gt;update_root_ft(root, root-&gt;root_ft, underlay_qpn,</div><div class='ctx'> 					 false);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx5_core_warn(dev, "Failed adding underlay QPN (%u) to root FT err(%d)\n",</div><div class='hunk'>@@ -2798,7 +2831,7 @@ int mlx5_fs_remove_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = root-&gt;cmds-&gt;update_root_ft(dev, root-&gt;root_ft, underlay_qpn,</div><div class='add'>+	err = root-&gt;cmds-&gt;update_root_ft(root, root-&gt;root_ft, underlay_qpn,</div><div class='ctx'> 					 true);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		mlx5_core_warn(dev, "Failed removing underlay QPN (%u) from root FT err(%d)\n",</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h<br/>index 87de0e4d9124..a08c3d09a50f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.h</a></div><div class='hunk'>@@ -67,6 +67,7 @@ enum fs_flow_table_type {</div><div class='ctx'> 	FS_FT_FDB             = 0X4,</div><div class='ctx'> 	FS_FT_SNIFFER_RX	= 0X5,</div><div class='ctx'> 	FS_FT_SNIFFER_TX	= 0X6,</div><div class='add'>+	FS_FT_RDMA_RX		= 0X7,</div><div class='ctx'> 	FS_FT_MAX_TYPE = FS_FT_SNIFFER_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +91,7 @@ struct mlx5_flow_steering {</div><div class='ctx'> 	struct mlx5_flow_root_namespace **esw_ingress_root_ns;</div><div class='ctx'> 	struct mlx5_flow_root_namespace	*sniffer_tx_root_ns;</div><div class='ctx'> 	struct mlx5_flow_root_namespace	*sniffer_rx_root_ns;</div><div class='add'>+	struct mlx5_flow_root_namespace	*rdma_rx_root_ns;</div><div class='ctx'> 	struct mlx5_flow_root_namespace	*egress_root_ns;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -150,7 +152,7 @@ struct mlx5_ft_underlay_qp {</div><div class='ctx'> 	u32 qpn;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MLX5_FTE_MATCH_PARAM_RESERVED	reserved_at_800</div><div class='add'>+#define MLX5_FTE_MATCH_PARAM_RESERVED	reserved_at_a00</div><div class='ctx'> /* Calculate the fte_match_param length and without the reserved length.</div><div class='ctx'>  * Make sure the reserved field is the last.</div><div class='ctx'>  */</div><div class='hunk'>@@ -216,6 +218,7 @@ struct mlx5_flow_root_namespace {</div><div class='ctx'> 	struct mutex			chain_lock;</div><div class='ctx'> 	struct list_head		underlay_qpns;</div><div class='ctx'> 	const struct mlx5_flow_cmds	*cmds;</div><div class='add'>+	enum mlx5_flow_table_miss_action def_miss_action;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int mlx5_init_fc_stats(struct mlx5_core_dev *dev);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c<br/>index cb9fa3430c53..a2656f4008d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/health.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/health.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/health.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/health.c</a></div><div class='hunk'>@@ -152,11 +152,11 @@ static void health_recover(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	nic_state = mlx5_get_nic_state(dev);</div><div class='ctx'> 	if (nic_state == MLX5_NIC_IFC_INVALID) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "health recovery flow aborted since the nic state is invalid\n");</div><div class='add'>+		mlx5_core_err(dev, "health recovery flow aborted since the nic state is invalid\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "starting health recovery flow\n");</div><div class='add'>+	mlx5_core_err(dev, "starting health recovery flow\n");</div><div class='ctx'> 	mlx5_recover_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -180,8 +180,8 @@ static void health_care(struct work_struct *work)</div><div class='ctx'> 	if (!test_bit(MLX5_DROP_NEW_RECOVERY_WORK, &amp;health-&gt;flags))</div><div class='ctx'> 		schedule_delayed_work(&amp;health-&gt;recover_work, recover_delay);</div><div class='ctx'> 	else</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev,</div><div class='del'>-			"new health works are not permitted at this stage\n");</div><div class='add'>+		mlx5_core_err(dev,</div><div class='add'>+			      "new health works are not permitted at this stage\n");</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;health-&gt;wq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,18 +228,22 @@ static void print_health_info(struct mlx5_core_dev *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(h-&gt;assert_var); i++)</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "assert_var[%d] 0x%08x\n", i, ioread32be(h-&gt;assert_var + i));</div><div class='add'>+		mlx5_core_err(dev, "assert_var[%d] 0x%08x\n", i,</div><div class='add'>+			      ioread32be(h-&gt;assert_var + i));</div><div class='ctx'> </div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "assert_exit_ptr 0x%08x\n", ioread32be(&amp;h-&gt;assert_exit_ptr));</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "assert_callra 0x%08x\n", ioread32be(&amp;h-&gt;assert_callra));</div><div class='add'>+	mlx5_core_err(dev, "assert_exit_ptr 0x%08x\n",</div><div class='add'>+		      ioread32be(&amp;h-&gt;assert_exit_ptr));</div><div class='add'>+	mlx5_core_err(dev, "assert_callra 0x%08x\n",</div><div class='add'>+		      ioread32be(&amp;h-&gt;assert_callra));</div><div class='ctx'> 	sprintf(fw_str, "%d.%d.%d", fw_rev_maj(dev), fw_rev_min(dev), fw_rev_sub(dev));</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "fw_ver %s\n", fw_str);</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "hw_id 0x%08x\n", ioread32be(&amp;h-&gt;hw_id));</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "irisc_index %d\n", ioread8(&amp;h-&gt;irisc_index));</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "synd 0x%x: %s\n", ioread8(&amp;h-&gt;synd), hsynd_str(ioread8(&amp;h-&gt;synd)));</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "ext_synd 0x%04x\n", ioread16be(&amp;h-&gt;ext_synd));</div><div class='add'>+	mlx5_core_err(dev, "fw_ver %s\n", fw_str);</div><div class='add'>+	mlx5_core_err(dev, "hw_id 0x%08x\n", ioread32be(&amp;h-&gt;hw_id));</div><div class='add'>+	mlx5_core_err(dev, "irisc_index %d\n", ioread8(&amp;h-&gt;irisc_index));</div><div class='add'>+	mlx5_core_err(dev, "synd 0x%x: %s\n", ioread8(&amp;h-&gt;synd),</div><div class='add'>+		      hsynd_str(ioread8(&amp;h-&gt;synd)));</div><div class='add'>+	mlx5_core_err(dev, "ext_synd 0x%04x\n", ioread16be(&amp;h-&gt;ext_synd));</div><div class='ctx'> 	fw = ioread32be(&amp;h-&gt;fw_ver);</div><div class='del'>-	dev_err(&amp;dev-&gt;pdev-&gt;dev, "raw fw_ver 0x%08x\n", fw);</div><div class='add'>+	mlx5_core_err(dev, "raw fw_ver 0x%08x\n", fw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long get_next_poll_jiffies(void)</div><div class='hunk'>@@ -262,8 +266,7 @@ void mlx5_trigger_health_work(struct mlx5_core_dev *dev)</div><div class='ctx'> 	if (!test_bit(MLX5_DROP_NEW_HEALTH_WORK, &amp;health-&gt;flags))</div><div class='ctx'> 		queue_work(health-&gt;wq, &amp;health-&gt;work);</div><div class='ctx'> 	else</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev,</div><div class='del'>-			"new health works are not permitted at this stage\n");</div><div class='add'>+		mlx5_core_err(dev, "new health works are not permitted at this stage\n");</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;health-&gt;wq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +287,7 @@ static void poll_health(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	health-&gt;prev = count;</div><div class='ctx'> 	if (health-&gt;miss_counter == MAX_MISSES) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "device's health compromised - reached miss count\n");</div><div class='add'>+		mlx5_core_err(dev, "device's health compromised - reached miss count\n");</div><div class='ctx'> 		print_health_info(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -352,6 +355,13 @@ void mlx5_drain_health_recovery(struct mlx5_core_dev *dev)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;priv.health.recover_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mlx5_health_flush(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_core_health *health = &amp;dev-&gt;priv.health;</div><div class='add'>+</div><div class='add'>+	flush_workqueue(health-&gt;wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mlx5_health_cleanup(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_health *health = &amp;dev-&gt;priv.health;</div><div class='hunk'>@@ -370,7 +380,7 @@ int mlx5_health_init(struct mlx5_core_dev *dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(name, "mlx5_health");</div><div class='del'>-	strcat(name, dev_name(&amp;dev-&gt;pdev-&gt;dev));</div><div class='add'>+	strcat(name, dev_name(dev-&gt;device));</div><div class='ctx'> 	health-&gt;wq = create_singlethread_workqueue(name);</div><div class='ctx'> 	kfree(name);</div><div class='ctx'> 	if (!health-&gt;wq)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c<br/>index 4eac42555c7d..ada1b7c0e0b8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c</a></div><div class='hunk'>@@ -68,6 +68,7 @@ static void mlx5i_build_nic_params(struct mlx5_core_dev *mdev,</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;lro_en = false;</div><div class='ctx'> 	params-&gt;hard_mtu = MLX5_IB_GRH_BYTES + MLX5_IPOIB_HARD_LEN;</div><div class='add'>+	params-&gt;tunneled_offload_en = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called directly after IPoIB netdevice was created to initialize SW structs */</div><div class='hunk'>@@ -77,15 +78,14 @@ int mlx5i_init(struct mlx5_core_dev *mdev,</div><div class='ctx'> 	       void *ppriv)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5e_priv *priv  = mlx5i_epriv(netdev);</div><div class='del'>-	u16 max_mtu;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5e_netdev_init(netdev, priv, mdev, profile, ppriv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	mlx5_query_port_max_mtu(mdev, &amp;max_mtu, 1);</div><div class='del'>-	netdev-&gt;mtu = max_mtu;</div><div class='add'>+	mlx5e_set_netdev_mtu_boundaries(priv);</div><div class='add'>+	netdev-&gt;mtu = netdev-&gt;max_mtu;</div><div class='ctx'> </div><div class='ctx'> 	mlx5e_build_nic_params(mdev, &amp;priv-&gt;rss_params, &amp;priv-&gt;channels.params,</div><div class='ctx'> 			       mlx5e_get_netdev_max_channels(netdev),</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c<br/>index 5633f8572800..8212bfd05733 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c</a></div><div class='hunk'>@@ -122,7 +122,7 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,</div><div class='ctx'> 	/* Handle add/replace event */</div><div class='ctx'> 	if (fi-&gt;fib_nhs == 1) {</div><div class='ctx'> 		if (__mlx5_lag_is_active(ldev)) {</div><div class='del'>-			struct net_device *nh_dev = fi-&gt;fib_nh[0].nh_dev;</div><div class='add'>+			struct net_device *nh_dev = fi-&gt;fib_nh[0].fib_nh_dev;</div><div class='ctx'> 			int i = mlx5_lag_dev_get_netdev_idx(ldev, nh_dev);</div><div class='ctx'> </div><div class='ctx'> 			mlx5_lag_set_port_affinity(ldev, ++i);</div><div class='hunk'>@@ -134,10 +134,10 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify next hops are ports of the same hca */</div><div class='del'>-	if (!(fi-&gt;fib_nh[0].nh_dev == ldev-&gt;pf[0].netdev &amp;&amp;</div><div class='del'>-	      fi-&gt;fib_nh[1].nh_dev == ldev-&gt;pf[1].netdev) &amp;&amp;</div><div class='del'>-	    !(fi-&gt;fib_nh[0].nh_dev == ldev-&gt;pf[1].netdev &amp;&amp;</div><div class='del'>-	      fi-&gt;fib_nh[1].nh_dev == ldev-&gt;pf[0].netdev)) {</div><div class='add'>+	if (!(fi-&gt;fib_nh[0].fib_nh_dev == ldev-&gt;pf[0].netdev &amp;&amp;</div><div class='add'>+	      fi-&gt;fib_nh[1].fib_nh_dev == ldev-&gt;pf[1].netdev) &amp;&amp;</div><div class='add'>+	    !(fi-&gt;fib_nh[0].fib_nh_dev == ldev-&gt;pf[1].netdev &amp;&amp;</div><div class='add'>+	      fi-&gt;fib_nh[1].fib_nh_dev == ldev-&gt;pf[0].netdev)) {</div><div class='ctx'> 		mlx5_core_warn(ldev-&gt;pf[0].dev, "Multipath offload require two ports of the same HCA\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -167,7 +167,7 @@ static void mlx5_lag_fib_nexthop_event(struct mlx5_lag *ldev,</div><div class='ctx'> </div><div class='ctx'> 	/* nh added/removed */</div><div class='ctx'> 	if (event == FIB_EVENT_NH_DEL) {</div><div class='del'>-		int i = mlx5_lag_dev_get_netdev_idx(ldev, fib_nh-&gt;nh_dev);</div><div class='add'>+		int i = mlx5_lag_dev_get_netdev_idx(ldev, fib_nh-&gt;fib_nh_dev);</div><div class='ctx'> </div><div class='ctx'> 		if (i &gt;= 0) {</div><div class='ctx'> 			i = (i + 1) % 2 + 1; /* peer port */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c<br/>index 40f4a19b1ce1..be69c1d7941a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c</a></div><div class='hunk'>@@ -80,10 +80,8 @@ void mlx5_init_port_tun_entropy(struct mlx5_tun_entropy *tun_entropy,</div><div class='ctx'> 	mlx5_query_port_tun_entropy(mdev, &amp;entropy_flags);</div><div class='ctx'> 	tun_entropy-&gt;num_enabling_entries = 0;</div><div class='ctx'> 	tun_entropy-&gt;num_disabling_entries = 0;</div><div class='del'>-	tun_entropy-&gt;enabled = entropy_flags.calc_enabled;</div><div class='del'>-	tun_entropy-&gt;enabled =</div><div class='del'>-		(entropy_flags.calc_supported) ?</div><div class='del'>-		entropy_flags.calc_enabled : true;</div><div class='add'>+	tun_entropy-&gt;enabled = entropy_flags.calc_supported ?</div><div class='add'>+			       entropy_flags.calc_enabled : true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx5_set_entropy(struct mlx5_tun_entropy *tun_entropy,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c<br/>index 9a8fd762167b..b9d4f4e19ff9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</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/mlx5/driver.h&gt;</div><div class='add'>+#include &lt;net/vxlan.h&gt;</div><div class='ctx'> #include "mlx5_core.h"</div><div class='ctx'> #include "vxlan.h"</div><div class='ctx'> </div><div class='hunk'>@@ -204,8 +205,8 @@ struct mlx5_vxlan *mlx5_vxlan_create(struct mlx5_core_dev *mdev)</div><div class='ctx'> 	spin_lock_init(&amp;vxlan-&gt;lock);</div><div class='ctx'> 	hash_init(vxlan-&gt;htable);</div><div class='ctx'> </div><div class='del'>-	/* Hardware adds 4789 by default */</div><div class='del'>-	mlx5_vxlan_add_port(vxlan, 4789);</div><div class='add'>+	/* Hardware adds 4789 (IANA_VXLAN_UDP_PORT) by default */</div><div class='add'>+	mlx5_vxlan_add_port(vxlan, IANA_VXLAN_UDP_PORT);</div><div class='ctx'> </div><div class='ctx'> 	return vxlan;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c<br/>index 70cc906a102b..61fa1d162d28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/main.c</a></div><div class='hunk'>@@ -164,26 +164,6 @@ static struct mlx5_profile profile[] = {</div><div class='ctx'> 			.size	= 8,</div><div class='ctx'> 			.limit	= 4</div><div class='ctx'> 		},</div><div class='del'>-		.mr_cache[16]	= {</div><div class='del'>-			.size	= 8,</div><div class='del'>-			.limit	= 4</div><div class='del'>-		},</div><div class='del'>-		.mr_cache[17]	= {</div><div class='del'>-			.size	= 8,</div><div class='del'>-			.limit	= 4</div><div class='del'>-		},</div><div class='del'>-		.mr_cache[18]	= {</div><div class='del'>-			.size	= 8,</div><div class='del'>-			.limit	= 4</div><div class='del'>-		},</div><div class='del'>-		.mr_cache[19]	= {</div><div class='del'>-			.size	= 4,</div><div class='del'>-			.limit	= 2</div><div class='del'>-		},</div><div class='del'>-		.mr_cache[20]	= {</div><div class='del'>-			.size	= 4,</div><div class='del'>-			.limit	= 2</div><div class='del'>-		},</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -587,24 +567,23 @@ query_ex:</div><div class='ctx'> </div><div class='ctx'> static int set_hca_cap(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = handle_hca_cap(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "handle_hca_cap failed\n");</div><div class='add'>+		mlx5_core_err(dev, "handle_hca_cap failed\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = handle_hca_cap_atomic(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "handle_hca_cap_atomic failed\n");</div><div class='add'>+		mlx5_core_err(dev, "handle_hca_cap_atomic failed\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = handle_hca_cap_odp(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "handle_hca_cap_odp failed\n");</div><div class='add'>+		mlx5_core_err(dev, "handle_hca_cap_odp failed\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -736,36 +715,28 @@ static int mlx5_core_set_issi(struct mlx5_core_dev *dev)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv)</div><div class='add'>+static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev,</div><div class='add'>+			 const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='add'>+	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(dev-&gt;pdev, dev);</div><div class='del'>-	strncpy(priv-&gt;name, dev_name(&amp;pdev-&gt;dev), MLX5_MAX_NAME_LEN);</div><div class='del'>-	priv-&gt;name[MLX5_MAX_NAME_LEN - 1] = 0;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;priv-&gt;pgdir_mutex);</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;pgdir_list);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;mkey_lock);</div><div class='add'>+	priv-&gt;pci_dev_data = id-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;priv-&gt;alloc_mutex);</div><div class='add'>+	pci_set_drvdata(dev-&gt;pdev, dev);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;bar_addr = pci_resource_start(pdev, 0);</div><div class='ctx'> 	priv-&gt;numa_node = dev_to_node(&amp;dev-&gt;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (mlx5_debugfs_root)</div><div class='del'>-		priv-&gt;dbg_root =</div><div class='del'>-			debugfs_create_dir(pci_name(pdev), mlx5_debugfs_root);</div><div class='del'>-</div><div class='ctx'> 	err = mlx5_pci_enable_device(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Cannot enable PCI device, aborting\n");</div><div class='del'>-		goto err_dbg;</div><div class='add'>+		mlx5_core_err(dev, "Cannot enable PCI device, aborting\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = request_bar(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "error requesting BARs, aborting\n");</div><div class='add'>+		mlx5_core_err(dev, "error requesting BARs, aborting\n");</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -773,7 +744,7 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	err = set_dma_caps(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed setting DMA capabilities mask, aborting\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed setting DMA capabilities mask, aborting\n");</div><div class='ctx'> 		goto err_clr_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -782,11 +753,11 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv)</div><div class='ctx'> 	    pci_enable_atomic_ops_to_root(pdev, PCI_EXP_DEVCAP2_ATOMIC_COMP128))</div><div class='ctx'> 		mlx5_core_dbg(dev, "Enabling pci atomics failed\n");</div><div class='ctx'> </div><div class='del'>-	dev-&gt;iseg_base = pci_resource_start(dev-&gt;pdev, 0);</div><div class='add'>+	dev-&gt;iseg_base = dev-&gt;bar_addr;</div><div class='ctx'> 	dev-&gt;iseg = ioremap(dev-&gt;iseg_base, sizeof(*dev-&gt;iseg));</div><div class='ctx'> 	if (!dev-&gt;iseg) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed mapping initialization segment, aborting\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed mapping initialization segment, aborting\n");</div><div class='ctx'> 		goto err_clr_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -797,52 +768,47 @@ err_clr_master:</div><div class='ctx'> 	release_bar(dev-&gt;pdev);</div><div class='ctx'> err_disable:</div><div class='ctx'> 	mlx5_pci_disable_device(dev);</div><div class='del'>-</div><div class='del'>-err_dbg:</div><div class='del'>-	debugfs_remove(priv-&gt;dbg_root);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mlx5_pci_close(struct mlx5_core_dev *dev, struct mlx5_priv *priv)</div><div class='add'>+static void mlx5_pci_close(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	iounmap(dev-&gt;iseg);</div><div class='ctx'> 	pci_clear_master(dev-&gt;pdev);</div><div class='ctx'> 	release_bar(dev-&gt;pdev);</div><div class='ctx'> 	mlx5_pci_disable_device(dev);</div><div class='del'>-	debugfs_remove_recursive(priv-&gt;dbg_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_init_once(struct mlx5_core_dev *dev, struct mlx5_priv *priv)</div><div class='add'>+static int mlx5_init_once(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;devcom = mlx5_devcom_register_device(dev);</div><div class='del'>-	if (IS_ERR(priv-&gt;devcom))</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to register with devcom (0x%p)\n",</div><div class='del'>-			priv-&gt;devcom);</div><div class='add'>+	dev-&gt;priv.devcom = mlx5_devcom_register_device(dev);</div><div class='add'>+	if (IS_ERR(dev-&gt;priv.devcom))</div><div class='add'>+		mlx5_core_err(dev, "failed to register with devcom (0x%p)\n",</div><div class='add'>+			      dev-&gt;priv.devcom);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_query_board_id(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "query board id failed\n");</div><div class='add'>+		mlx5_core_err(dev, "query board id failed\n");</div><div class='ctx'> 		goto err_devcom;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_eq_table_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to initialize eq\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to initialize eq\n");</div><div class='ctx'> 		goto err_devcom;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_events_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to initialize events\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to initialize events\n");</div><div class='ctx'> 		goto err_eq_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_cq_debugfs_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to initialize cq debugfs\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to initialize cq debugfs\n");</div><div class='ctx'> 		goto err_events_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -858,31 +824,31 @@ static int mlx5_init_once(struct mlx5_core_dev *dev, struct mlx5_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_init_rl_table(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init rate limiting\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed to init rate limiting\n");</div><div class='ctx'> 		goto err_tables_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_mpfs_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init l2 table %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "Failed to init l2 table %d\n", err);</div><div class='ctx'> 		goto err_rl_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_eswitch_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init eswitch %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "Failed to init eswitch %d\n", err);</div><div class='ctx'> 		goto err_mpfs_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_sriov_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init sriov %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "Failed to init sriov %d\n", err);</div><div class='ctx'> 		goto err_eswitch_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_fpga_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init fpga device %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "Failed to init fpga device %d\n", err);</div><div class='ctx'> 		goto err_sriov_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -932,93 +898,78 @@ static void mlx5_cleanup_once(struct mlx5_core_dev *dev)</div><div class='ctx'> 	mlx5_devcom_unregister_device(dev-&gt;priv.devcom);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,</div><div class='del'>-			 bool boot)</div><div class='add'>+static int mlx5_function_setup(struct mlx5_core_dev *dev, bool boot)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;caps.embedded_cpu = mlx5_read_embedded_cpu(dev);</div><div class='del'>-	mutex_lock(&amp;dev-&gt;intf_state_mutex);</div><div class='del'>-	if (test_bit(MLX5_INTERFACE_STATE_UP, &amp;dev-&gt;intf_state)) {</div><div class='del'>-		dev_warn(&amp;dev-&gt;pdev-&gt;dev, "%s: interface is up, NOP\n",</div><div class='del'>-			 __func__);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "firmware version: %d.%d.%d\n", fw_rev_maj(dev),</div><div class='del'>-		 fw_rev_min(dev), fw_rev_sub(dev));</div><div class='add'>+	mlx5_core_info(dev, "firmware version: %d.%d.%d\n", fw_rev_maj(dev),</div><div class='add'>+		       fw_rev_min(dev), fw_rev_sub(dev));</div><div class='ctx'> </div><div class='ctx'> 	/* Only PFs hold the relevant PCIe information for this query */</div><div class='ctx'> 	if (mlx5_core_is_pf(dev))</div><div class='ctx'> 		pcie_print_link_status(dev-&gt;pdev);</div><div class='ctx'> </div><div class='del'>-	/* on load removing any previous indication of internal error, device is</div><div class='del'>-	 * up</div><div class='del'>-	 */</div><div class='del'>-	dev-&gt;state = MLX5_DEVICE_STATE_UP;</div><div class='del'>-</div><div class='ctx'> 	/* wait for firmware to accept initialization segments configurations</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = wait_fw_init(dev, FW_PRE_INIT_TIMEOUT_MILI);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "Firmware over %d MS in pre-initializing state, aborting\n",</div><div class='del'>-			FW_PRE_INIT_TIMEOUT_MILI);</div><div class='del'>-		goto out_err;</div><div class='add'>+		mlx5_core_err(dev, "Firmware over %d MS in pre-initializing state, aborting\n",</div><div class='add'>+			      FW_PRE_INIT_TIMEOUT_MILI);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_cmd_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed initializing command interface, aborting\n");</div><div class='del'>-		goto out_err;</div><div class='add'>+		mlx5_core_err(dev, "Failed initializing command interface, aborting\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = wait_fw_init(dev, FW_INIT_TIMEOUT_MILI);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "Firmware over %d MS in initializing state, aborting\n",</div><div class='del'>-			FW_INIT_TIMEOUT_MILI);</div><div class='add'>+		mlx5_core_err(dev, "Firmware over %d MS in initializing state, aborting\n",</div><div class='add'>+			      FW_INIT_TIMEOUT_MILI);</div><div class='ctx'> 		goto err_cmd_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_core_enable_hca(dev, 0);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "enable hca failed\n");</div><div class='add'>+		mlx5_core_err(dev, "enable hca failed\n");</div><div class='ctx'> 		goto err_cmd_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_core_set_issi(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to set issi\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to set issi\n");</div><div class='ctx'> 		goto err_disable_hca;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_satisfy_startup_pages(dev, 1);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to allocate boot pages\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to allocate boot pages\n");</div><div class='ctx'> 		goto err_disable_hca;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = set_hca_ctrl(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "set_hca_ctrl failed\n");</div><div class='add'>+		mlx5_core_err(dev, "set_hca_ctrl failed\n");</div><div class='ctx'> 		goto reclaim_boot_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = set_hca_cap(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "set_hca_cap failed\n");</div><div class='add'>+		mlx5_core_err(dev, "set_hca_cap failed\n");</div><div class='ctx'> 		goto reclaim_boot_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_satisfy_startup_pages(dev, 0);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to allocate init pages\n");</div><div class='add'>+		mlx5_core_err(dev, "failed to allocate init pages\n");</div><div class='ctx'> 		goto reclaim_boot_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_cmd_init_hca(dev, sw_owner_id);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "init hca failed\n");</div><div class='add'>+		mlx5_core_err(dev, "init hca failed\n");</div><div class='ctx'> 		goto reclaim_boot_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1028,23 +979,50 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_query_hca_caps(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "query hca failed\n");</div><div class='del'>-		goto err_stop_poll;</div><div class='add'>+		mlx5_core_err(dev, "query hca failed\n");</div><div class='add'>+		goto stop_health;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (boot) {</div><div class='del'>-		err = mlx5_init_once(dev, priv);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "sw objs init failed\n");</div><div class='del'>-			goto err_stop_poll;</div><div class='del'>-		}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+stop_health:</div><div class='add'>+	mlx5_stop_health_poll(dev, boot);</div><div class='add'>+reclaim_boot_pages:</div><div class='add'>+	mlx5_reclaim_startup_pages(dev);</div><div class='add'>+err_disable_hca:</div><div class='add'>+	mlx5_core_disable_hca(dev, 0);</div><div class='add'>+err_cmd_cleanup:</div><div class='add'>+	mlx5_cmd_cleanup(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx5_function_teardown(struct mlx5_core_dev *dev, bool boot)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mlx5_stop_health_poll(dev, boot);</div><div class='add'>+	err = mlx5_cmd_teardown_hca(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_err(dev, "tear_down_hca failed, skip cleanup\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='add'>+	mlx5_reclaim_startup_pages(dev);</div><div class='add'>+	mlx5_core_disable_hca(dev, 0);</div><div class='add'>+	mlx5_cmd_cleanup(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 mlx5_load(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;priv.uar = mlx5_get_uars_page(dev);</div><div class='ctx'> 	if (IS_ERR(dev-&gt;priv.uar)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed allocating uar, aborting\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed allocating uar, aborting\n");</div><div class='ctx'> 		err = PTR_ERR(dev-&gt;priv.uar);</div><div class='del'>-		goto err_get_uars;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mlx5_events_start(dev);</div><div class='hunk'>@@ -1052,132 +1030,155 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_eq_table_create(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to create EQs\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed to create EQs\n");</div><div class='ctx'> 		goto err_eq_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_fw_tracer_init(dev-&gt;tracer);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init FW tracer\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed to init FW tracer\n");</div><div class='ctx'> 		goto err_fw_tracer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_fpga_device_start(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "fpga device start failed %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "fpga device start failed %d\n", err);</div><div class='ctx'> 		goto err_fpga_start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_accel_ipsec_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "IPSec device start failed %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "IPSec device start failed %d\n", err);</div><div class='ctx'> 		goto err_ipsec_start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_accel_tls_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "TLS device start failed %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "TLS device start failed %d\n", err);</div><div class='ctx'> 		goto err_tls_start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_init_fs(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init flow steering\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed to init flow steering\n");</div><div class='ctx'> 		goto err_fs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_core_set_hca_defaults(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to set hca defaults\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed to set hca defaults\n");</div><div class='ctx'> 		goto err_fs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_sriov_attach(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "sriov init failed %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "sriov init failed %d\n", err);</div><div class='ctx'> 		goto err_sriov;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_ec_init(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to init embedded CPU\n");</div><div class='add'>+		mlx5_core_err(dev, "Failed to init embedded CPU\n");</div><div class='ctx'> 		goto err_ec;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mlx5_device_registered(dev)) {</div><div class='del'>-		mlx5_attach_device(dev);</div><div class='del'>-	} else {</div><div class='del'>-		err = mlx5_register_device(dev);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "mlx5_register_device failed %d\n", err);</div><div class='del'>-			goto err_reg_dev;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(MLX5_INTERFACE_STATE_UP, &amp;dev-&gt;intf_state);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;intf_state_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_reg_dev:</div><div class='del'>-	mlx5_ec_cleanup(dev);</div><div class='del'>-</div><div class='ctx'> err_ec:</div><div class='ctx'> 	mlx5_sriov_detach(dev);</div><div class='del'>-</div><div class='ctx'> err_sriov:</div><div class='ctx'> 	mlx5_cleanup_fs(dev);</div><div class='del'>-</div><div class='ctx'> err_fs:</div><div class='ctx'> 	mlx5_accel_tls_cleanup(dev);</div><div class='del'>-</div><div class='ctx'> err_tls_start:</div><div class='ctx'> 	mlx5_accel_ipsec_cleanup(dev);</div><div class='del'>-</div><div class='ctx'> err_ipsec_start:</div><div class='ctx'> 	mlx5_fpga_device_stop(dev);</div><div class='del'>-</div><div class='ctx'> err_fpga_start:</div><div class='ctx'> 	mlx5_fw_tracer_cleanup(dev-&gt;tracer);</div><div class='del'>-</div><div class='ctx'> err_fw_tracer:</div><div class='ctx'> 	mlx5_eq_table_destroy(dev);</div><div class='del'>-</div><div class='ctx'> err_eq_table:</div><div class='ctx'> 	mlx5_pagealloc_stop(dev);</div><div class='ctx'> 	mlx5_events_stop(dev);</div><div class='del'>-	mlx5_put_uars_page(dev, priv-&gt;uar);</div><div class='add'>+	mlx5_put_uars_page(dev, dev-&gt;priv.uar);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-err_get_uars:</div><div class='del'>-	if (boot)</div><div class='del'>-		mlx5_cleanup_once(dev);</div><div class='add'>+static void mlx5_unload(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mlx5_ec_cleanup(dev);</div><div class='add'>+	mlx5_sriov_detach(dev);</div><div class='add'>+	mlx5_cleanup_fs(dev);</div><div class='add'>+	mlx5_accel_ipsec_cleanup(dev);</div><div class='add'>+	mlx5_accel_tls_cleanup(dev);</div><div class='add'>+	mlx5_fpga_device_stop(dev);</div><div class='add'>+	mlx5_fw_tracer_cleanup(dev-&gt;tracer);</div><div class='add'>+	mlx5_eq_table_destroy(dev);</div><div class='add'>+	mlx5_pagealloc_stop(dev);</div><div class='add'>+	mlx5_events_stop(dev);</div><div class='add'>+	mlx5_put_uars_page(dev, dev-&gt;priv.uar);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-err_stop_poll:</div><div class='del'>-	mlx5_stop_health_poll(dev, boot);</div><div class='del'>-	if (mlx5_cmd_teardown_hca(dev)) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "tear_down_hca failed, skip cleanup\n");</div><div class='del'>-		goto out_err;</div><div class='add'>+static int mlx5_load_one(struct mlx5_core_dev *dev, bool boot)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;caps.embedded_cpu = mlx5_read_embedded_cpu(dev);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;intf_state_mutex);</div><div class='add'>+	if (test_bit(MLX5_INTERFACE_STATE_UP, &amp;dev-&gt;intf_state)) {</div><div class='add'>+		mlx5_core_warn(dev, "interface is up, NOP\n");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	/* remove any previous indication of internal error */</div><div class='add'>+	dev-&gt;state = MLX5_DEVICE_STATE_UP;</div><div class='ctx'> </div><div class='del'>-reclaim_boot_pages:</div><div class='del'>-	mlx5_reclaim_startup_pages(dev);</div><div class='add'>+	err = mlx5_function_setup(dev, boot);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-err_disable_hca:</div><div class='del'>-	mlx5_core_disable_hca(dev, 0);</div><div class='add'>+	if (boot) {</div><div class='add'>+		err = mlx5_init_once(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx5_core_err(dev, "sw objs init failed\n");</div><div class='add'>+			goto function_teardown;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-err_cmd_cleanup:</div><div class='del'>-	mlx5_cmd_cleanup(dev);</div><div class='add'>+	err = mlx5_load(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_load;</div><div class='add'>+</div><div class='add'>+	if (mlx5_device_registered(dev)) {</div><div class='add'>+		mlx5_attach_device(dev);</div><div class='add'>+	} else {</div><div class='add'>+		err = mlx5_register_device(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx5_core_err(dev, "register device failed %d\n", err);</div><div class='add'>+			goto err_reg_dev;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out_err:</div><div class='add'>+	set_bit(MLX5_INTERFACE_STATE_UP, &amp;dev-&gt;intf_state);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;intf_state_mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_reg_dev:</div><div class='add'>+	mlx5_unload(dev);</div><div class='add'>+err_load:</div><div class='add'>+	if (boot)</div><div class='add'>+		mlx5_cleanup_once(dev);</div><div class='add'>+function_teardown:</div><div class='add'>+	mlx5_function_teardown(dev, boot);</div><div class='ctx'> 	dev-&gt;state = MLX5_DEVICE_STATE_INTERNAL_ERROR;</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;intf_state_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,</div><div class='del'>-			   bool cleanup)</div><div class='add'>+static int mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1186,8 +1187,8 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;intf_state_mutex);</div><div class='ctx'> 	if (!test_bit(MLX5_INTERFACE_STATE_UP, &amp;dev-&gt;intf_state)) {</div><div class='del'>-		dev_warn(&amp;dev-&gt;pdev-&gt;dev, "%s: interface is down, NOP\n",</div><div class='del'>-			 __func__);</div><div class='add'>+		mlx5_core_warn(dev, "%s: interface is down, NOP\n",</div><div class='add'>+			       __func__);</div><div class='ctx'> 		if (cleanup)</div><div class='ctx'> 			mlx5_cleanup_once(dev);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1198,30 +1199,12 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,</div><div class='ctx'> 	if (mlx5_device_registered(dev))</div><div class='ctx'> 		mlx5_detach_device(dev);</div><div class='ctx'> </div><div class='del'>-	mlx5_ec_cleanup(dev);</div><div class='del'>-	mlx5_sriov_detach(dev);</div><div class='del'>-	mlx5_cleanup_fs(dev);</div><div class='del'>-	mlx5_accel_ipsec_cleanup(dev);</div><div class='del'>-	mlx5_accel_tls_cleanup(dev);</div><div class='del'>-	mlx5_fpga_device_stop(dev);</div><div class='del'>-	mlx5_fw_tracer_cleanup(dev-&gt;tracer);</div><div class='del'>-	mlx5_eq_table_destroy(dev);</div><div class='del'>-	mlx5_pagealloc_stop(dev);</div><div class='del'>-	mlx5_events_stop(dev);</div><div class='del'>-	mlx5_put_uars_page(dev, priv-&gt;uar);</div><div class='add'>+	mlx5_unload(dev);</div><div class='add'>+</div><div class='ctx'> 	if (cleanup)</div><div class='ctx'> 		mlx5_cleanup_once(dev);</div><div class='del'>-	mlx5_stop_health_poll(dev, cleanup);</div><div class='del'>-</div><div class='del'>-	err = mlx5_cmd_teardown_hca(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "tear_down_hca failed, skip cleanup\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	mlx5_reclaim_startup_pages(dev);</div><div class='del'>-	mlx5_core_disable_hca(dev, 0);</div><div class='del'>-	mlx5_cmd_cleanup(dev);</div><div class='ctx'> </div><div class='add'>+	mlx5_function_teardown(dev, cleanup);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;intf_state_mutex);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1238,29 +1221,12 @@ static const struct devlink_ops mlx5_devlink_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MLX5_IB_MOD "mlx5_ib"</div><div class='del'>-static int init_one(struct pci_dev *pdev,</div><div class='del'>-		    const struct pci_device_id *id)</div><div class='add'>+static int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx)</div><div class='ctx'> {</div><div class='del'>-	struct mlx5_core_dev *dev;</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	struct mlx5_priv *priv;</div><div class='add'>+	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	devlink = devlink_alloc(&amp;mlx5_devlink_ops, sizeof(*dev));</div><div class='del'>-	if (!devlink) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "kzalloc failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = devlink_priv(devlink);</div><div class='del'>-	priv = &amp;dev-&gt;priv;</div><div class='del'>-	priv-&gt;pci_dev_data = id-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;pdev = pdev;</div><div class='del'>-	dev-&gt;profile = &amp;profile[prof_sel];</div><div class='add'>+	dev-&gt;profile = &amp;profile[profile_idx];</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;ctx_list);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;ctx_lock);</div><div class='hunk'>@@ -1272,25 +1238,75 @@ static int init_one(struct pci_dev *pdev,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;bfregs.reg_head.list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;bfregs.wc_head.list);</div><div class='ctx'> </div><div class='del'>-	err = mlx5_pci_init(dev, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "mlx5_pci_init failed with error code %d\n", err);</div><div class='del'>-		goto clean_dev;</div><div class='add'>+	mutex_init(&amp;priv-&gt;alloc_mutex);</div><div class='add'>+	mutex_init(&amp;priv-&gt;pgdir_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;pgdir_list);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;mkey_lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;dbg_root = debugfs_create_dir(dev_name(dev-&gt;device),</div><div class='add'>+					    mlx5_debugfs_root);</div><div class='add'>+	if (!priv-&gt;dbg_root) {</div><div class='add'>+		dev_err(dev-&gt;device, "mlx5_core: error, Cannot create debugfs dir, aborting\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_health_init(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "mlx5_health_init failed with error code %d\n", err);</div><div class='del'>-		goto close_pci;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_health_init;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_pagealloc_init(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_pagealloc_init;</div><div class='ctx'> </div><div class='del'>-	err = mlx5_load_one(dev, priv, true);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pagealloc_init:</div><div class='add'>+	mlx5_health_cleanup(dev);</div><div class='add'>+err_health_init:</div><div class='add'>+	debugfs_remove(dev-&gt;priv.dbg_root);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx5_mdev_uninit(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mlx5_pagealloc_cleanup(dev);</div><div class='add'>+	mlx5_health_cleanup(dev);</div><div class='add'>+	debugfs_remove_recursive(dev-&gt;priv.dbg_root);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLX5_IB_MOD "mlx5_ib"</div><div class='add'>+static int init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_core_dev *dev;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_alloc(&amp;mlx5_devlink_ops, sizeof(*dev));</div><div class='add'>+	if (!devlink) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "kzalloc failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = devlink_priv(devlink);</div><div class='add'>+	dev-&gt;device = &amp;pdev-&gt;dev;</div><div class='add'>+	dev-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	err = mlx5_mdev_init(dev, prof_sel);</div><div class='add'>+	if (err)</div><div class='add'>+		goto mdev_init_err;</div><div class='add'>+</div><div class='add'>+	err = mlx5_pci_init(dev, pdev, id);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_err(dev, "mlx5_pci_init failed with error code %d\n",</div><div class='add'>+			      err);</div><div class='add'>+		goto pci_init_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx5_load_one(dev, true);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "mlx5_load_one failed with error code %d\n", err);</div><div class='add'>+		mlx5_core_err(dev, "mlx5_load_one failed with error code %d\n",</div><div class='add'>+			      err);</div><div class='ctx'> 		goto err_load_one;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1304,14 +1320,13 @@ static int init_one(struct pci_dev *pdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> clean_load:</div><div class='del'>-	mlx5_unload_one(dev, priv, true);</div><div class='add'>+	mlx5_unload_one(dev, true);</div><div class='add'>+</div><div class='ctx'> err_load_one:</div><div class='del'>-	mlx5_pagealloc_cleanup(dev);</div><div class='del'>-err_pagealloc_init:</div><div class='del'>-	mlx5_health_cleanup(dev);</div><div class='del'>-close_pci:</div><div class='del'>-	mlx5_pci_close(dev, priv);</div><div class='del'>-clean_dev:</div><div class='add'>+	mlx5_pci_close(dev);</div><div class='add'>+pci_init_err:</div><div class='add'>+	mlx5_mdev_uninit(dev);</div><div class='add'>+mdev_init_err:</div><div class='ctx'> 	devlink_free(devlink);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1321,20 +1336,18 @@ static void remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct devlink *devlink = priv_to_devlink(dev);</div><div class='del'>-	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	devlink_unregister(devlink);</div><div class='ctx'> 	mlx5_unregister_device(dev);</div><div class='ctx'> </div><div class='del'>-	if (mlx5_unload_one(dev, priv, true)) {</div><div class='del'>-		dev_err(&amp;dev-&gt;pdev-&gt;dev, "mlx5_unload_one failed\n");</div><div class='del'>-		mlx5_health_cleanup(dev);</div><div class='add'>+	if (mlx5_unload_one(dev, true)) {</div><div class='add'>+		mlx5_core_err(dev, "mlx5_unload_one failed\n");</div><div class='add'>+		mlx5_health_flush(dev);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mlx5_pagealloc_cleanup(dev);</div><div class='del'>-	mlx5_health_cleanup(dev);</div><div class='del'>-	mlx5_pci_close(dev, priv);</div><div class='add'>+	mlx5_pci_close(dev);</div><div class='add'>+	mlx5_mdev_uninit(dev);</div><div class='ctx'> 	devlink_free(devlink);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1342,12 +1355,11 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev,</div><div class='ctx'> 					      pci_channel_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "%s was called\n", __func__);</div><div class='add'>+	mlx5_core_info(dev, "%s was called\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	mlx5_enter_error_state(dev, false);</div><div class='del'>-	mlx5_unload_one(dev, priv, false);</div><div class='add'>+	mlx5_unload_one(dev, false);</div><div class='ctx'> 	/* In case of kernel call drain the health wq */</div><div class='ctx'> 	if (state) {</div><div class='ctx'> 		mlx5_drain_health_wq(dev);</div><div class='hunk'>@@ -1374,7 +1386,9 @@ static int wait_vital(struct pci_dev *pdev)</div><div class='ctx'> 		count = ioread32be(health-&gt;health_counter);</div><div class='ctx'> 		if (count &amp;&amp; count != 0xffffffff) {</div><div class='ctx'> 			if (last_count &amp;&amp; last_count != count) {</div><div class='del'>-				dev_info(&amp;pdev-&gt;dev, "Counter value 0x%x after %d iterations\n", count, i);</div><div class='add'>+				mlx5_core_info(dev,</div><div class='add'>+					       "wait vital counter value 0x%x after %d iterations\n",</div><div class='add'>+					       count, i);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			last_count = count;</div><div class='hunk'>@@ -1390,12 +1404,12 @@ static pci_ers_result_t mlx5_pci_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	struct mlx5_core_dev *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "%s was called\n", __func__);</div><div class='add'>+	mlx5_core_info(dev, "%s was called\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_pci_enable_device(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "%s: mlx5_pci_enable_device failed with error code: %d\n"</div><div class='del'>-			, __func__, err);</div><div class='add'>+		mlx5_core_err(dev, "%s: mlx5_pci_enable_device failed with error code: %d\n",</div><div class='add'>+			      __func__, err);</div><div class='ctx'> 		return PCI_ERS_RESULT_DISCONNECT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1404,7 +1418,7 @@ static pci_ers_result_t mlx5_pci_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	pci_save_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (wait_vital(pdev)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "%s: wait_vital timed out\n", __func__);</div><div class='add'>+		mlx5_core_err(dev, "%s: wait_vital timed out\n", __func__);</div><div class='ctx'> 		return PCI_ERS_RESULT_DISCONNECT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1414,17 +1428,16 @@ static pci_ers_result_t mlx5_pci_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> static void mlx5_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "%s was called\n", __func__);</div><div class='add'>+	mlx5_core_info(dev, "%s was called\n", __func__);</div><div class='ctx'> </div><div class='del'>-	err = mlx5_load_one(dev, priv, false);</div><div class='add'>+	err = mlx5_load_one(dev, false);</div><div class='ctx'> 	if (err)</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "%s: mlx5_load_one failed with error code: %d\n"</div><div class='del'>-			, __func__, err);</div><div class='add'>+		mlx5_core_err(dev, "%s: mlx5_load_one failed with error code: %d\n",</div><div class='add'>+			      __func__, err);</div><div class='ctx'> 	else</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "%s: device recovered\n", __func__);</div><div class='add'>+		mlx5_core_info(dev, "%s: device recovered\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_error_handlers mlx5_err_handler = {</div><div class='hunk'>@@ -1486,13 +1499,12 @@ succeed:</div><div class='ctx'> static void shutdown(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);</div><div class='del'>-	struct mlx5_priv *priv = &amp;dev-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "Shutdown was called\n");</div><div class='add'>+	mlx5_core_info(dev, "Shutdown was called\n");</div><div class='ctx'> 	err = mlx5_try_fast_unload(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		mlx5_unload_one(dev, priv, false);</div><div class='add'>+		mlx5_unload_one(dev, false);</div><div class='ctx'> 	mlx5_pci_disable_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h<br/>index 7b331674622c..22e69d4813e4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> #include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mlx5/cq.h&gt;</div><div class='ctx'> #include &lt;linux/mlx5/fs.h&gt;</div><div class='add'>+#include &lt;linux/mlx5/driver.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "mlx5_core"</div><div class='ctx'> #define DRIVER_VERSION "5.0-0"</div><div class='hunk'>@@ -48,44 +49,57 @@</div><div class='ctx'> extern uint mlx5_core_debug_mask;</div><div class='ctx'> </div><div class='ctx'> #define mlx5_core_dbg(__dev, format, ...)				\</div><div class='del'>-	dev_dbg(&amp;(__dev)-&gt;pdev-&gt;dev, "%s:%d:(pid %d): " format,		\</div><div class='add'>+	dev_dbg((__dev)-&gt;device, "%s:%d:(pid %d): " format,		\</div><div class='ctx'> 		 __func__, __LINE__, current-&gt;pid,			\</div><div class='ctx'> 		 ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define mlx5_core_dbg_once(__dev, format, ...)				\</div><div class='del'>-	dev_dbg_once(&amp;(__dev)-&gt;pdev-&gt;dev, "%s:%d:(pid %d): " format,	\</div><div class='del'>-		     __func__, __LINE__, current-&gt;pid,			\</div><div class='add'>+#define mlx5_core_dbg_once(__dev, format, ...)		\</div><div class='add'>+	dev_dbg_once((__dev)-&gt;device,		\</div><div class='add'>+		     "%s:%d:(pid %d): " format,		\</div><div class='add'>+		     __func__, __LINE__, current-&gt;pid,	\</div><div class='ctx'> 		     ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define mlx5_core_dbg_mask(__dev, mask, format, ...)			\</div><div class='del'>-do {									\</div><div class='del'>-	if ((mask) &amp; mlx5_core_debug_mask)				\</div><div class='del'>-		mlx5_core_dbg(__dev, format, ##__VA_ARGS__);		\</div><div class='add'>+#define mlx5_core_dbg_mask(__dev, mask, format, ...)		\</div><div class='add'>+do {								\</div><div class='add'>+	if ((mask) &amp; mlx5_core_debug_mask)			\</div><div class='add'>+		mlx5_core_dbg(__dev, format, ##__VA_ARGS__);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define mlx5_core_err(__dev, format, ...)				\</div><div class='del'>-	dev_err(&amp;(__dev)-&gt;pdev-&gt;dev, "%s:%d:(pid %d): " format,	\</div><div class='del'>-		__func__, __LINE__, current-&gt;pid,	\</div><div class='add'>+#define mlx5_core_err(__dev, format, ...)			\</div><div class='add'>+	dev_err((__dev)-&gt;device, "%s:%d:(pid %d): " format,	\</div><div class='add'>+		__func__, __LINE__, current-&gt;pid,		\</div><div class='ctx'> 	       ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define mlx5_core_err_rl(__dev, format, ...)				\</div><div class='del'>-	dev_err_ratelimited(&amp;(__dev)-&gt;pdev-&gt;dev,			\</div><div class='del'>-			   "%s:%d:(pid %d): " format,			\</div><div class='del'>-			   __func__, __LINE__, current-&gt;pid,		\</div><div class='del'>-			   ##__VA_ARGS__)</div><div class='add'>+#define mlx5_core_err_rl(__dev, format, ...)			\</div><div class='add'>+	dev_err_ratelimited((__dev)-&gt;device,			\</div><div class='add'>+			    "%s:%d:(pid %d): " format,		\</div><div class='add'>+			    __func__, __LINE__, current-&gt;pid,	\</div><div class='add'>+			    ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define mlx5_core_warn(__dev, format, ...)				\</div><div class='del'>-	dev_warn(&amp;(__dev)-&gt;pdev-&gt;dev, "%s:%d:(pid %d): " format,	\</div><div class='del'>-		 __func__, __LINE__, current-&gt;pid,			\</div><div class='del'>-		##__VA_ARGS__)</div><div class='add'>+#define mlx5_core_warn(__dev, format, ...)			\</div><div class='add'>+	dev_warn((__dev)-&gt;device, "%s:%d:(pid %d): " format,	\</div><div class='add'>+		 __func__, __LINE__, current-&gt;pid,		\</div><div class='add'>+		 ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mlx5_core_warn_once(__dev, format, ...)				\</div><div class='del'>-	dev_warn_once(&amp;(__dev)-&gt;pdev-&gt;dev, "%s:%d:(pid %d): " format,	\</div><div class='add'>+	dev_warn_once((__dev)-&gt;device, "%s:%d:(pid %d): " format,	\</div><div class='ctx'> 		      __func__, __LINE__, current-&gt;pid,			\</div><div class='ctx'> 		      ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define mlx5_core_info(__dev, format, ...)				\</div><div class='del'>-	dev_info(&amp;(__dev)-&gt;pdev-&gt;dev, format, ##__VA_ARGS__)</div><div class='add'>+#define mlx5_core_warn_rl(__dev, format, ...)			\</div><div class='add'>+	dev_warn_ratelimited((__dev)-&gt;device,			\</div><div class='add'>+			     "%s:%d:(pid %d): " format,		\</div><div class='add'>+			     __func__, __LINE__, current-&gt;pid,	\</div><div class='add'>+			     ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define mlx5_core_info(__dev, format, ...)		\</div><div class='add'>+	dev_info((__dev)-&gt;device, format, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define mlx5_core_info_rl(__dev, format, ...)			\</div><div class='add'>+	dev_info_ratelimited((__dev)-&gt;device,			\</div><div class='add'>+			     "%s:%d:(pid %d): " format,		\</div><div class='add'>+			     __func__, __LINE__, current-&gt;pid,	\</div><div class='add'>+			     ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_CMD_DATA, /* print command payload only */</div><div class='hunk'>@@ -111,7 +125,6 @@ void mlx5_sriov_cleanup(struct mlx5_core_dev *dev);</div><div class='ctx'> int mlx5_sriov_attach(struct mlx5_core_dev *dev);</div><div class='ctx'> void mlx5_sriov_detach(struct mlx5_core_dev *dev);</div><div class='ctx'> int mlx5_core_sriov_configure(struct pci_dev *dev, int num_vfs);</div><div class='del'>-bool mlx5_sriov_is_enabled(struct mlx5_core_dev *dev);</div><div class='ctx'> int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id);</div><div class='ctx'> int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id);</div><div class='ctx'> int mlx5_create_scheduling_element_cmd(struct mlx5_core_dev *dev, u8 hierarchy,</div><div class='hunk'>@@ -176,6 +189,11 @@ int mlx5_firmware_flash(struct mlx5_core_dev *dev, const struct firmware *fw);</div><div class='ctx'> void mlx5e_init(void);</div><div class='ctx'> void mlx5e_cleanup(void);</div><div class='ctx'> </div><div class='add'>+static inline bool mlx5_sriov_is_enabled(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return pci_num_vf(dev-&gt;pdev) ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int mlx5_lag_is_lacp_owner(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* LACP owner conditions:</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c<br/>index 41025387ff2c..91bd258ecf1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c</a></div><div class='hunk'>@@ -200,7 +200,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr)</div><div class='ctx'> 		rb_erase(&amp;fwp-&gt;rb_node, &amp;dev-&gt;priv.page_root);</div><div class='ctx'> 		if (fwp-&gt;free_count != 1)</div><div class='ctx'> 			list_del(&amp;fwp-&gt;list);</div><div class='del'>-		dma_unmap_page(&amp;dev-&gt;pdev-&gt;dev, addr &amp; MLX5_U64_4K_PAGE_MASK,</div><div class='add'>+		dma_unmap_page(dev-&gt;device, addr &amp; MLX5_U64_4K_PAGE_MASK,</div><div class='ctx'> 			       PAGE_SIZE, DMA_BIDIRECTIONAL);</div><div class='ctx'> 		__free_page(fwp-&gt;page);</div><div class='ctx'> 		kfree(fwp);</div><div class='hunk'>@@ -211,11 +211,12 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr)</div><div class='ctx'> </div><div class='ctx'> static int alloc_system_page(struct mlx5_core_dev *dev, u16 func_id)</div><div class='ctx'> {</div><div class='add'>+	struct device *device = dev-&gt;device;</div><div class='add'>+	int nid = dev_to_node(device);</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	u64 zero_addr = 1;</div><div class='ctx'> 	u64 addr;</div><div class='ctx'> 	int err;</div><div class='del'>-	int nid = dev_to_node(&amp;dev-&gt;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	page = alloc_pages_node(nid, GFP_HIGHUSER, 0);</div><div class='ctx'> 	if (!page) {</div><div class='hunk'>@@ -223,9 +224,8 @@ static int alloc_system_page(struct mlx5_core_dev *dev, u16 func_id)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> map:</div><div class='del'>-	addr = dma_map_page(&amp;dev-&gt;pdev-&gt;dev, page, 0,</div><div class='del'>-			    PAGE_SIZE, DMA_BIDIRECTIONAL);</div><div class='del'>-	if (dma_mapping_error(&amp;dev-&gt;pdev-&gt;dev, addr)) {</div><div class='add'>+	addr = dma_map_page(device, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL);</div><div class='add'>+	if (dma_mapping_error(device, addr)) {</div><div class='ctx'> 		mlx5_core_warn(dev, "failed dma mapping page\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_mapping;</div><div class='hunk'>@@ -240,8 +240,7 @@ map:</div><div class='ctx'> 	err = insert_page(dev, addr, page, func_id);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx5_core_err(dev, "failed to track allocated page\n");</div><div class='del'>-		dma_unmap_page(&amp;dev-&gt;pdev-&gt;dev, addr, PAGE_SIZE,</div><div class='del'>-			       DMA_BIDIRECTIONAL);</div><div class='add'>+		dma_unmap_page(device, addr, PAGE_SIZE, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_mapping:</div><div class='hunk'>@@ -249,7 +248,7 @@ err_mapping:</div><div class='ctx'> 		__free_page(page);</div><div class='ctx'> </div><div class='ctx'> 	if (zero_addr == 0)</div><div class='del'>-		dma_unmap_page(&amp;dev-&gt;pdev-&gt;dev, zero_addr, PAGE_SIZE,</div><div class='add'>+		dma_unmap_page(device, zero_addr, PAGE_SIZE,</div><div class='ctx'> 			       DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -600,8 +599,7 @@ int mlx5_wait_for_pages(struct mlx5_core_dev *dev, int *pages)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mlx5_core_dbg(dev, "Waiting for %d pages from %s\n", prev_pages,</div><div class='del'>-		      dev-&gt;priv.name);</div><div class='add'>+	mlx5_core_dbg(dev, "Waiting for %d pages\n", prev_pages);</div><div class='ctx'> 	while (*pages) {</div><div class='ctx'> 		if (time_after(jiffies, end)) {</div><div class='ctx'> 			mlx5_core_warn(dev, "aborting while there are %d pending pages\n", *pages);</div><div class='hunk'>@@ -614,6 +612,6 @@ int mlx5_wait_for_pages(struct mlx5_core_dev *dev, int *pages)</div><div class='ctx'> 		msleep(50);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mlx5_core_dbg(dev, "All pages received from %s\n", dev-&gt;priv.name);</div><div class='add'>+	mlx5_core_dbg(dev, "All pages received\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c<br/>index 21b7f05b16a5..cc262b30aed5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/port.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/port.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/port.c</a></div><div class='hunk'>@@ -293,15 +293,36 @@ static int mlx5_query_module_num(struct mlx5_core_dev *dev, int *module_num)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlx5_eeprom_page(int offset)</div><div class='add'>+{</div><div class='add'>+	if (offset &lt; MLX5_EEPROM_PAGE_LENGTH)</div><div class='add'>+		/* Addresses between 0-255 - page 00 */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Addresses between 256 - 639 belongs to pages 01, 02 and 03</div><div class='add'>+	 * For example, offset = 400 belongs to page 02:</div><div class='add'>+	 * 1 + ((400 - 256)/128) = 2</div><div class='add'>+	 */</div><div class='add'>+	return 1 + ((offset - MLX5_EEPROM_PAGE_LENGTH) /</div><div class='add'>+		    MLX5_EEPROM_HIGH_PAGE_LENGTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx5_eeprom_high_page_offset(int page_num)</div><div class='add'>+{</div><div class='add'>+	if (!page_num) /* Page 0 always start from low page */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* High page */</div><div class='add'>+	return page_num * MLX5_EEPROM_HIGH_PAGE_LENGTH;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx5_query_module_eeprom(struct mlx5_core_dev *dev,</div><div class='ctx'> 			     u16 offset, u16 size, u8 *data)</div><div class='ctx'> {</div><div class='add'>+	int module_num, page_num, status, err;</div><div class='ctx'> 	u32 out[MLX5_ST_SZ_DW(mcia_reg)];</div><div class='ctx'> 	u32 in[MLX5_ST_SZ_DW(mcia_reg)];</div><div class='del'>-	int module_num;</div><div class='ctx'> 	u16 i2c_addr;</div><div class='del'>-	int status;</div><div class='del'>-	int err;</div><div class='ctx'> 	void *ptr = MLX5_ADDR_OF(mcia_reg, out, dword_0);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_query_module_num(dev, &amp;module_num);</div><div class='hunk'>@@ -311,21 +332,24 @@ int mlx5_query_module_eeprom(struct mlx5_core_dev *dev,</div><div class='ctx'> 	memset(in, 0, sizeof(in));</div><div class='ctx'> 	size = min_t(int, size, MLX5_EEPROM_MAX_BYTES);</div><div class='ctx'> </div><div class='del'>-	if (offset &lt; MLX5_EEPROM_PAGE_LENGTH &amp;&amp;</div><div class='del'>-	    offset + size &gt; MLX5_EEPROM_PAGE_LENGTH)</div><div class='add'>+	/* Get the page number related to the given offset */</div><div class='add'>+	page_num = mlx5_eeprom_page(offset);</div><div class='add'>+</div><div class='add'>+	/* Set the right offset according to the page number,</div><div class='add'>+	 * For page_num &gt; 0, relative offset is always &gt;= 128 (high page).</div><div class='add'>+	 */</div><div class='add'>+	offset -= mlx5_eeprom_high_page_offset(page_num);</div><div class='add'>+</div><div class='add'>+	if (offset + size &gt; MLX5_EEPROM_PAGE_LENGTH)</div><div class='ctx'> 		/* Cross pages read, read until offset 256 in low page */</div><div class='ctx'> 		size -= offset + size - MLX5_EEPROM_PAGE_LENGTH;</div><div class='ctx'> </div><div class='ctx'> 	i2c_addr = MLX5_I2C_ADDR_LOW;</div><div class='del'>-	if (offset &gt;= MLX5_EEPROM_PAGE_LENGTH) {</div><div class='del'>-		i2c_addr = MLX5_I2C_ADDR_HIGH;</div><div class='del'>-		offset -= MLX5_EEPROM_PAGE_LENGTH;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	MLX5_SET(mcia_reg, in, l, 0);</div><div class='ctx'> 	MLX5_SET(mcia_reg, in, module, module_num);</div><div class='ctx'> 	MLX5_SET(mcia_reg, in, i2c_device_address, i2c_addr);</div><div class='del'>-	MLX5_SET(mcia_reg, in, page_number, 0);</div><div class='add'>+	MLX5_SET(mcia_reg, in, page_number, page_num);</div><div class='ctx'> 	MLX5_SET(mcia_reg, in, device_address, offset);</div><div class='ctx'> 	MLX5_SET(mcia_reg, in, size, size);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c<br/>index 370ca94b6775..b8ba74de9555 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/qp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/qp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/qp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/qp.c</a></div><div class='hunk'>@@ -40,6 +40,9 @@</div><div class='ctx'> #include "mlx5_core.h"</div><div class='ctx'> #include "lib/eq.h"</div><div class='ctx'> </div><div class='add'>+static int mlx5_core_drain_dct(struct mlx5_core_dev *dev,</div><div class='add'>+			       struct mlx5_core_dct *dct);</div><div class='add'>+</div><div class='ctx'> static struct mlx5_core_rsc_common *</div><div class='ctx'> mlx5_get_rsc(struct mlx5_qp_table *table, u32 rsn)</div><div class='ctx'> {</div><div class='hunk'>@@ -227,20 +230,49 @@ static void destroy_resource_common(struct mlx5_core_dev *dev,</div><div class='ctx'> 	wait_for_completion(&amp;qp-&gt;common.free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int _mlx5_core_destroy_dct(struct mlx5_core_dev *dev,</div><div class='add'>+				  struct mlx5_core_dct *dct, bool need_cleanup)</div><div class='add'>+{</div><div class='add'>+	u32 out[MLX5_ST_SZ_DW(destroy_dct_out)] = {0};</div><div class='add'>+	u32 in[MLX5_ST_SZ_DW(destroy_dct_in)]   = {0};</div><div class='add'>+	struct mlx5_core_qp *qp = &amp;dct-&gt;mqp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mlx5_core_drain_dct(dev, dct);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (dev-&gt;state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {</div><div class='add'>+			goto destroy;</div><div class='add'>+		} else {</div><div class='add'>+			mlx5_core_warn(</div><div class='add'>+				dev, "failed drain DCT 0x%x with error 0x%x\n",</div><div class='add'>+				qp-&gt;qpn, err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	wait_for_completion(&amp;dct-&gt;drained);</div><div class='add'>+destroy:</div><div class='add'>+	if (need_cleanup)</div><div class='add'>+		destroy_resource_common(dev, &amp;dct-&gt;mqp);</div><div class='add'>+	MLX5_SET(destroy_dct_in, in, opcode, MLX5_CMD_OP_DESTROY_DCT);</div><div class='add'>+	MLX5_SET(destroy_dct_in, in, dctn, qp-&gt;qpn);</div><div class='add'>+	MLX5_SET(destroy_dct_in, in, uid, qp-&gt;uid);</div><div class='add'>+	err = mlx5_cmd_exec(dev, (void *)&amp;in, sizeof(in),</div><div class='add'>+			    (void *)&amp;out, sizeof(out));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx5_core_create_dct(struct mlx5_core_dev *dev,</div><div class='ctx'> 			 struct mlx5_core_dct *dct,</div><div class='del'>-			 u32 *in, int inlen)</div><div class='add'>+			 u32 *in, int inlen,</div><div class='add'>+			 u32 *out, int outlen)</div><div class='ctx'> {</div><div class='del'>-	u32 out[MLX5_ST_SZ_DW(create_dct_out)]   = {0};</div><div class='del'>-	u32 din[MLX5_ST_SZ_DW(destroy_dct_in)]   = {0};</div><div class='del'>-	u32 dout[MLX5_ST_SZ_DW(destroy_dct_out)] = {0};</div><div class='ctx'> 	struct mlx5_core_qp *qp = &amp;dct-&gt;mqp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;dct-&gt;drained);</div><div class='ctx'> 	MLX5_SET(create_dct_in, in, opcode, MLX5_CMD_OP_CREATE_DCT);</div><div class='ctx'> </div><div class='del'>-	err = mlx5_cmd_exec(dev, in, inlen, &amp;out, sizeof(out));</div><div class='add'>+	err = mlx5_cmd_exec(dev, in, inlen, out, outlen);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx5_core_warn(dev, "create DCT failed, ret %d\n", err);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -254,11 +286,7 @@ int mlx5_core_create_dct(struct mlx5_core_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err_cmd:</div><div class='del'>-	MLX5_SET(destroy_dct_in, din, opcode, MLX5_CMD_OP_DESTROY_DCT);</div><div class='del'>-	MLX5_SET(destroy_dct_in, din, dctn, qp-&gt;qpn);</div><div class='del'>-	MLX5_SET(destroy_dct_in, din, uid, qp-&gt;uid);</div><div class='del'>-	mlx5_cmd_exec(dev, (void *)&amp;in, sizeof(din),</div><div class='del'>-		      (void *)&amp;out, sizeof(dout));</div><div class='add'>+	_mlx5_core_destroy_dct(dev, dct, false);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx5_core_create_dct);</div><div class='hunk'>@@ -323,29 +351,7 @@ static int mlx5_core_drain_dct(struct mlx5_core_dev *dev,</div><div class='ctx'> int mlx5_core_destroy_dct(struct mlx5_core_dev *dev,</div><div class='ctx'> 			  struct mlx5_core_dct *dct)</div><div class='ctx'> {</div><div class='del'>-	u32 out[MLX5_ST_SZ_DW(destroy_dct_out)] = {0};</div><div class='del'>-	u32 in[MLX5_ST_SZ_DW(destroy_dct_in)]   = {0};</div><div class='del'>-	struct mlx5_core_qp *qp = &amp;dct-&gt;mqp;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mlx5_core_drain_dct(dev, dct);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (dev-&gt;state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {</div><div class='del'>-			goto destroy;</div><div class='del'>-		} else {</div><div class='del'>-			mlx5_core_warn(dev, "failed drain DCT 0x%x with error 0x%x\n", qp-&gt;qpn, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	wait_for_completion(&amp;dct-&gt;drained);</div><div class='del'>-destroy:</div><div class='del'>-	destroy_resource_common(dev, &amp;dct-&gt;mqp);</div><div class='del'>-	MLX5_SET(destroy_dct_in, in, opcode, MLX5_CMD_OP_DESTROY_DCT);</div><div class='del'>-	MLX5_SET(destroy_dct_in, in, dctn, qp-&gt;qpn);</div><div class='del'>-	MLX5_SET(destroy_dct_in, in, uid, qp-&gt;uid);</div><div class='del'>-	err = mlx5_cmd_exec(dev, (void *)&amp;in, sizeof(in),</div><div class='del'>-			    (void *)&amp;out, sizeof(out));</div><div class='del'>-	return err;</div><div class='add'>+	return _mlx5_core_destroy_dct(dev, dct, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx5_core_destroy_dct);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c<br/>new file mode 100644<br/>index 000000000000..86f77456f873<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/rdma.c</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='add'>+/* Copyright (c) 2019 Mellanox Technologies */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mlx5/vport.h&gt;</div><div class='add'>+#include &lt;rdma/ib_verbs.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+</div><div class='add'>+#include "lib/mlx5.h"</div><div class='add'>+#include "eswitch.h"</div><div class='add'>+#include "fs_core.h"</div><div class='add'>+#include "rdma.h"</div><div class='add'>+</div><div class='add'>+static void mlx5_rdma_disable_roce_steering(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_core_roce *roce = &amp;dev-&gt;priv.roce;</div><div class='add'>+</div><div class='add'>+	if (!roce-&gt;ft)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mlx5_del_flow_rules(roce-&gt;allow_rule);</div><div class='add'>+	mlx5_destroy_flow_group(roce-&gt;fg);</div><div class='add'>+	mlx5_destroy_flow_table(roce-&gt;ft);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx5_rdma_enable_roce_steering(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);</div><div class='add'>+	struct mlx5_core_roce *roce = &amp;dev-&gt;priv.roce;</div><div class='add'>+	struct mlx5_flow_handle *flow_rule = NULL;</div><div class='add'>+	struct mlx5_flow_table_attr ft_attr = {};</div><div class='add'>+	struct mlx5_flow_namespace *ns = NULL;</div><div class='add'>+	struct mlx5_flow_act flow_act = {};</div><div class='add'>+	struct mlx5_flow_spec *spec;</div><div class='add'>+	struct mlx5_flow_table *ft;</div><div class='add'>+	struct mlx5_flow_group *fg;</div><div class='add'>+	void *match_criteria;</div><div class='add'>+	u32 *flow_group_in;</div><div class='add'>+	void *misc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(MLX5_CAP_FLOWTABLE_RDMA_RX(dev, ft_support) &amp;&amp;</div><div class='add'>+	      MLX5_CAP_FLOWTABLE_RDMA_RX(dev, table_miss_action_domain)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	flow_group_in = kvzalloc(inlen, GFP_KERNEL);</div><div class='add'>+	if (!flow_group_in)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec) {</div><div class='add'>+		kvfree(flow_group_in);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_RDMA_RX);</div><div class='add'>+	if (!ns) {</div><div class='add'>+		mlx5_core_err(dev, "Failed to get RDMA RX namespace");</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ft_attr.max_fte = 1;</div><div class='add'>+	ft = mlx5_create_flow_table(ns, &amp;ft_attr);</div><div class='add'>+	if (IS_ERR(ft)) {</div><div class='add'>+		mlx5_core_err(dev, "Failed to create RDMA RX flow table");</div><div class='add'>+		err = PTR_ERR(ft);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	MLX5_SET(create_flow_group_in, flow_group_in, match_criteria_enable,</div><div class='add'>+		 MLX5_MATCH_MISC_PARAMETERS);</div><div class='add'>+	match_criteria = MLX5_ADDR_OF(create_flow_group_in, flow_group_in,</div><div class='add'>+				      match_criteria);</div><div class='add'>+	MLX5_SET_TO_ONES(fte_match_param, match_criteria,</div><div class='add'>+			 misc_parameters.source_port);</div><div class='add'>+</div><div class='add'>+	fg = mlx5_create_flow_group(ft, flow_group_in);</div><div class='add'>+	if (IS_ERR(fg)) {</div><div class='add'>+		err = PTR_ERR(fg);</div><div class='add'>+		mlx5_core_err(dev, "Failed to create RDMA RX flow group err(%d)\n", err);</div><div class='add'>+		goto destroy_flow_table;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;match_criteria_enable = MLX5_MATCH_MISC_PARAMETERS;</div><div class='add'>+	misc = MLX5_ADDR_OF(fte_match_param, spec-&gt;match_value,</div><div class='add'>+			    misc_parameters);</div><div class='add'>+	MLX5_SET(fte_match_set_misc, misc, source_port,</div><div class='add'>+		 dev-&gt;priv.eswitch-&gt;manager_vport);</div><div class='add'>+	misc = MLX5_ADDR_OF(fte_match_param, spec-&gt;match_criteria,</div><div class='add'>+			    misc_parameters);</div><div class='add'>+	MLX5_SET_TO_ONES(fte_match_set_misc, misc, source_port);</div><div class='add'>+</div><div class='add'>+	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_ALLOW;</div><div class='add'>+	flow_rule = mlx5_add_flow_rules(ft, spec, &amp;flow_act, NULL, 0);</div><div class='add'>+	if (IS_ERR(flow_rule)) {</div><div class='add'>+		err = PTR_ERR(flow_rule);</div><div class='add'>+		mlx5_core_err(dev, "Failed to add RoCE allow rule, err=%d\n",</div><div class='add'>+			      err);</div><div class='add'>+		goto destroy_flow_group;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvfree(spec);</div><div class='add'>+	kvfree(flow_group_in);</div><div class='add'>+	roce-&gt;ft = ft;</div><div class='add'>+	roce-&gt;fg = fg;</div><div class='add'>+	roce-&gt;allow_rule = flow_rule;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+destroy_flow_table:</div><div class='add'>+	mlx5_destroy_flow_table(ft);</div><div class='add'>+destroy_flow_group:</div><div class='add'>+	mlx5_destroy_flow_group(fg);</div><div class='add'>+free:</div><div class='add'>+	kvfree(spec);</div><div class='add'>+	kvfree(flow_group_in);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx5_rdma_del_roce_addr(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mlx5_core_roce_gid_set(dev, 0, 0, 0,</div><div class='add'>+			       NULL, NULL, false, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx5_rdma_make_default_gid(struct mlx5_core_dev *dev, union ib_gid *gid)</div><div class='add'>+{</div><div class='add'>+	u8 hw_id[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	mlx5_query_nic_vport_mac_address(dev, 0, hw_id);</div><div class='add'>+	gid-&gt;global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL);</div><div class='add'>+	addrconf_addr_eui48(&amp;gid-&gt;raw[8], hw_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx5_rdma_add_roce_addr(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	union ib_gid gid;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	mlx5_rdma_make_default_gid(dev, &amp;gid);</div><div class='add'>+	return mlx5_core_roce_gid_set(dev, 0,</div><div class='add'>+				      MLX5_ROCE_VERSION_1,</div><div class='add'>+				      0, gid.raw, mac,</div><div class='add'>+				      false, 0, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mlx5_rdma_disable_roce_steering(dev);</div><div class='add'>+	mlx5_rdma_del_roce_addr(dev);</div><div class='add'>+	mlx5_nic_vport_disable_roce(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mlx5_nic_vport_enable_roce(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_err(dev, "Failed to enable RoCE: %d\n", err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx5_rdma_add_roce_addr(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_err(dev, "Failed to add RoCE address: %d\n", err);</div><div class='add'>+		goto disable_roce;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx5_rdma_enable_roce_steering(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx5_core_err(dev, "Failed to enable RoCE steering: %d\n", err);</div><div class='add'>+		goto del_roce_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+del_roce_addr:</div><div class='add'>+	mlx5_rdma_del_roce_addr(dev);</div><div class='add'>+disable_roce:</div><div class='add'>+	mlx5_nic_vport_disable_roce(dev);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.h b/drivers/net/ethernet/mellanox/mlx5/core/rdma.h<br/>new file mode 100644<br/>index 000000000000..750cff2a71a4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/rdma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/rdma.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='add'>+/* Copyright (c) 2019 Mellanox Technologies. */</div><div class='add'>+</div><div class='add'>+#ifndef __MLX5_RDMA_H__</div><div class='add'>+#define __MLX5_RDMA_H__</div><div class='add'>+</div><div class='add'>+#include "mlx5_core.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MLX5_ESWITCH</div><div class='add'>+</div><div class='add'>+void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev);</div><div class='add'>+void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MLX5_ESWITCH */</div><div class='add'>+</div><div class='add'>+static inline void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) {}</div><div class='add'>+static inline void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MLX5_ESWITCH */</div><div class='add'>+#endif /* __MLX5_RDMA_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c<br/>index 7b23fa8d2d60..a249b3c3843d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/sriov.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/sriov.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/sriov.c</a></div><div class='hunk'>@@ -36,13 +36,6 @@</div><div class='ctx'> #include "mlx5_core.h"</div><div class='ctx'> #include "eswitch.h"</div><div class='ctx'> </div><div class='del'>-bool mlx5_sriov_is_enabled(struct mlx5_core_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct mlx5_core_sriov *sriov = &amp;dev-&gt;priv.sriov;</div><div class='del'>-</div><div class='del'>-	return !!sriov-&gt;num_vfs;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sriov_restore_guids(struct mlx5_core_dev *dev, int vf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_sriov *sriov = &amp;dev-&gt;priv.sriov;</div><div class='hunk'>@@ -151,33 +144,10 @@ out:</div><div class='ctx'> 		mlx5_core_warn(dev, "timeout reclaiming VFs pages\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx5_pci_enable_sriov(struct pci_dev *pdev, int num_vfs)</div><div class='del'>-{</div><div class='del'>-	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (pci_num_vf(pdev)) {</div><div class='del'>-		mlx5_core_warn(dev, "Unable to enable pci sriov, already enabled\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_enable_sriov(pdev, num_vfs);</div><div class='del'>-	if (err)</div><div class='del'>-		mlx5_core_warn(dev, "pci_enable_sriov failed : %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 void mlx5_pci_disable_sriov(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	pci_disable_sriov(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mlx5_sriov_enable(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);</div><div class='del'>-	struct mlx5_core_sriov *sriov = &amp;dev-&gt;priv.sriov;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx5_device_enable_sriov(dev, num_vfs);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -185,42 +155,37 @@ static int mlx5_sriov_enable(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mlx5_pci_enable_sriov(pdev, num_vfs);</div><div class='add'>+	err = pci_enable_sriov(pdev, num_vfs);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		mlx5_core_warn(dev, "mlx5_pci_enable_sriov failed : %d\n", err);</div><div class='add'>+		mlx5_core_warn(dev, "pci_enable_sriov failed : %d\n", err);</div><div class='ctx'> 		mlx5_device_disable_sriov(dev);</div><div class='del'>-		return err;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	sriov-&gt;num_vfs = num_vfs;</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='ctx'> static void mlx5_sriov_disable(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);</div><div class='del'>-	struct mlx5_core_sriov *sriov = &amp;dev-&gt;priv.sriov;</div><div class='ctx'> </div><div class='del'>-	mlx5_pci_disable_sriov(pdev);</div><div class='add'>+	pci_disable_sriov(pdev);</div><div class='ctx'> 	mlx5_device_disable_sriov(dev);</div><div class='del'>-	sriov-&gt;num_vfs = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx5_core_sriov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);</div><div class='add'>+	struct mlx5_core_sriov *sriov = &amp;dev-&gt;priv.sriov;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	mlx5_core_dbg(dev, "requested num_vfs %d\n", num_vfs);</div><div class='del'>-	if (!mlx5_core_is_pf(dev))</div><div class='del'>-		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (num_vfs)</div><div class='ctx'> 		err = mlx5_sriov_enable(pdev, num_vfs);</div><div class='ctx'> 	else</div><div class='ctx'> 		mlx5_sriov_disable(pdev);</div><div class='ctx'> </div><div class='add'>+	if (!err)</div><div class='add'>+		sriov-&gt;num_vfs = num_vfs;</div><div class='ctx'> 	return err ? err : num_vfs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/transobj.c b/drivers/net/ethernet/mellanox/mlx5/core/transobj.c<br/>index c4d4b76096dc..b1068500f1df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/transobj.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/transobj.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/transobj.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/transobj.c</a></div><div class='hunk'>@@ -182,16 +182,24 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx5_core_query_sq_state);</div><div class='ctx'> </div><div class='add'>+int mlx5_core_create_tir_out(struct mlx5_core_dev *dev,</div><div class='add'>+			     u32 *in, int inlen,</div><div class='add'>+			     u32 *out, int outlen)</div><div class='add'>+{</div><div class='add'>+	MLX5_SET(create_tir_in, in, opcode, MLX5_CMD_OP_CREATE_TIR);</div><div class='add'>+</div><div class='add'>+	return mlx5_cmd_exec(dev, in, inlen, out, outlen);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mlx5_core_create_tir_out);</div><div class='add'>+</div><div class='ctx'> int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,</div><div class='ctx'> 			 u32 *tirn)</div><div class='ctx'> {</div><div class='del'>-	u32 out[MLX5_ST_SZ_DW(create_tir_out)] = {0};</div><div class='add'>+	u32 out[MLX5_ST_SZ_DW(create_tir_out)] = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	MLX5_SET(create_tir_in, in, opcode, MLX5_CMD_OP_CREATE_TIR);</div><div class='del'>-</div><div class='del'>-	memset(out, 0, sizeof(out));</div><div class='del'>-	err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));</div><div class='add'>+	err = mlx5_core_create_tir_out(dev, in, inlen,</div><div class='add'>+				       out, sizeof(out));</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		*tirn = MLX5_GET(create_tir_out, out, tirn);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/uar.c b/drivers/net/ethernet/mellanox/mlx5/core/uar.c<br/>index 94464723ff77..0d006224d7b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/uar.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/uar.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/uar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/uar.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static u64 uar2pfn(struct mlx5_core_dev *mdev, u32 index)</div><div class='ctx'> 	else</div><div class='ctx'> 		system_page_index = index;</div><div class='ctx'> </div><div class='del'>-	return (pci_resource_start(mdev-&gt;pdev, 0) &gt;&gt; PAGE_SHIFT) + system_page_index;</div><div class='add'>+	return (mdev-&gt;bar_addr &gt;&gt; PAGE_SHIFT) + system_page_index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void up_rel_func(struct kref *kref)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c<br/>index ef95feca9961..95cdc8cbcba4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/vport.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/vport.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/vport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/vport.c</a></div><div class='hunk'>@@ -371,67 +371,6 @@ int mlx5_modify_nic_vport_mac_list(struct mlx5_core_dev *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_mac_list);</div><div class='ctx'> </div><div class='del'>-int mlx5_query_nic_vport_vlans(struct mlx5_core_dev *dev,</div><div class='del'>-			       u16 vport,</div><div class='del'>-			       u16 vlans[],</div><div class='del'>-			       int *size)</div><div class='del'>-{</div><div class='del'>-	u32 in[MLX5_ST_SZ_DW(query_nic_vport_context_in)];</div><div class='del'>-	void *nic_vport_ctx;</div><div class='del'>-	int req_list_size;</div><div class='del'>-	int max_list_size;</div><div class='del'>-	int out_sz;</div><div class='del'>-	void *out;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	req_list_size = *size;</div><div class='del'>-	max_list_size = 1 &lt;&lt; MLX5_CAP_GEN(dev, log_max_vlan_list);</div><div class='del'>-	if (req_list_size &gt; max_list_size) {</div><div class='del'>-		mlx5_core_warn(dev, "Requested list size (%d) &gt; (%d) max list size\n",</div><div class='del'>-			       req_list_size, max_list_size);</div><div class='del'>-		req_list_size = max_list_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out_sz = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in) +</div><div class='del'>-			req_list_size * MLX5_ST_SZ_BYTES(vlan_layout);</div><div class='del'>-</div><div class='del'>-	memset(in, 0, sizeof(in));</div><div class='del'>-	out = kzalloc(out_sz, GFP_KERNEL);</div><div class='del'>-	if (!out)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	MLX5_SET(query_nic_vport_context_in, in, opcode,</div><div class='del'>-		 MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT);</div><div class='del'>-	MLX5_SET(query_nic_vport_context_in, in, allowed_list_type,</div><div class='del'>-		 MLX5_NVPRT_LIST_TYPE_VLAN);</div><div class='del'>-	MLX5_SET(query_nic_vport_context_in, in, vport_number, vport);</div><div class='del'>-</div><div class='del'>-	if (vport)</div><div class='del'>-		MLX5_SET(query_nic_vport_context_in, in, other_vport, 1);</div><div class='del'>-</div><div class='del'>-	err = mlx5_cmd_exec(dev, in, sizeof(in), out, out_sz);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	nic_vport_ctx = MLX5_ADDR_OF(query_nic_vport_context_out, out,</div><div class='del'>-				     nic_vport_context);</div><div class='del'>-	req_list_size = MLX5_GET(nic_vport_context, nic_vport_ctx,</div><div class='del'>-				 allowed_list_size);</div><div class='del'>-</div><div class='del'>-	*size = req_list_size;</div><div class='del'>-	for (i = 0; i &lt; req_list_size; i++) {</div><div class='del'>-		void *vlan_addr = MLX5_ADDR_OF(nic_vport_context,</div><div class='del'>-					       nic_vport_ctx,</div><div class='del'>-					       current_uc_mac_address[i]);</div><div class='del'>-		vlans[i] = MLX5_GET(vlan_layout, vlan_addr, vlan);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	kfree(out);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_vlans);</div><div class='del'>-</div><div class='ctx'> int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,</div><div class='ctx'> 				u16 vlans[],</div><div class='ctx'> 				int list_size)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h<br/>index ea934a48c90a..1f87cce421e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/wq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlx5/core/wq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlx5/core/wq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlx5/core/wq.h</a></div><div class='hunk'>@@ -134,6 +134,11 @@ static inline void mlx5_wq_cyc_update_db_record(struct mlx5_wq_cyc *wq)</div><div class='ctx'> 	*wq-&gt;db = cpu_to_be32(wq-&gt;wqe_ctr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16 mlx5_wq_cyc_get_ctr_wrap_cnt(struct mlx5_wq_cyc *wq, u16 ctr)</div><div class='add'>+{</div><div class='add'>+	return ctr &gt;&gt; wq-&gt;fbc.log_sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u16 mlx5_wq_cyc_ctr2ix(struct mlx5_wq_cyc *wq, u16 ctr)</div><div class='ctx'> {</div><div class='ctx'> 	return ctr &amp; wq-&gt;fbc.sz_m1;</div><div class='hunk'>@@ -243,6 +248,13 @@ static inline void *mlx5_wq_ll_get_wqe(struct mlx5_wq_ll *wq, u16 ix)</div><div class='ctx'> 	return mlx5_frag_buf_get_wqe(&amp;wq-&gt;fbc, ix);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16 mlx5_wq_ll_get_wqe_next_ix(struct mlx5_wq_ll *wq, u16 ix)</div><div class='add'>+{</div><div class='add'>+	struct mlx5_wqe_srq_next_seg *wqe = mlx5_wq_ll_get_wqe(wq, ix);</div><div class='add'>+</div><div class='add'>+	return be16_to_cpu(wqe-&gt;next_wqe_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void mlx5_wq_ll_push(struct mlx5_wq_ll *wq, u16 head_next)</div><div class='ctx'> {</div><div class='ctx'> 	wq-&gt;head = head_next;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/Kconfig b/drivers/net/ethernet/mellanox/mlxsw/Kconfig<br/>index 9c195dfed031..b6b3ff0fe17f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/Kconfig</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> config MLXSW_CORE</div><div class='ctx'> 	tristate "Mellanox Technologies Switch ASICs support"</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports Mellanox Technologies Switch ASICs family.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/Makefile b/drivers/net/ethernet/mellanox/mlxsw/Makefile<br/>index a01d15546e37..c4dc72e1ce63 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/Makefile</a></div><div class='hunk'>@@ -28,8 +28,8 @@ mlxsw_spectrum-objs		:= spectrum.o spectrum_buffers.o \</div><div class='ctx'> 				   spectrum1_mr_tcam.o spectrum2_mr_tcam.o \</div><div class='ctx'> 				   spectrum_mr_tcam.o spectrum_mr.o \</div><div class='ctx'> 				   spectrum_qdisc.o spectrum_span.o \</div><div class='del'>-				   spectrum_nve.o spectrum_nve_vxlan.o</div><div class='add'>+				   spectrum_nve.o spectrum_nve_vxlan.o \</div><div class='add'>+				   spectrum_dpipe.o</div><div class='ctx'> mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB)	+= spectrum_dcb.o</div><div class='del'>-mlxsw_spectrum-$(CONFIG_NET_DEVLINK) += spectrum_dpipe.o</div><div class='ctx'> obj-$(CONFIG_MLXSW_MINIMAL)	+= mlxsw_minimal.o</div><div class='ctx'> mlxsw_minimal-objs		:= minimal.o</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c<br/>index d23d53c0e284..bcbe07ec22be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/core.c</a></div><div class='hunk'>@@ -568,7 +568,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core)</div><div class='ctx'> 	if (!(mlxsw_core-&gt;bus-&gt;features &amp; MLXSW_BUS_F_TXRX))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	emad_wq = alloc_workqueue("mlxsw_core_emad", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	emad_wq = alloc_workqueue("mlxsw_core_emad", 0, 0);</div><div class='ctx'> 	if (!emad_wq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	mlxsw_core-&gt;emad_wq = emad_wq;</div><div class='hunk'>@@ -781,7 +781,8 @@ mlxsw_devlink_sb_pool_get(struct devlink *devlink,</div><div class='ctx'> static int</div><div class='ctx'> mlxsw_devlink_sb_pool_set(struct devlink *devlink,</div><div class='ctx'> 			  unsigned int sb_index, u16 pool_index, u32 size,</div><div class='del'>-			  enum devlink_sb_threshold_type threshold_type)</div><div class='add'>+			  enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);</div><div class='ctx'> 	struct mlxsw_driver *mlxsw_driver = mlxsw_core-&gt;driver;</div><div class='hunk'>@@ -789,7 +790,8 @@ mlxsw_devlink_sb_pool_set(struct devlink *devlink,</div><div class='ctx'> 	if (!mlxsw_driver-&gt;sb_pool_set)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	return mlxsw_driver-&gt;sb_pool_set(mlxsw_core, sb_index,</div><div class='del'>-					 pool_index, size, threshold_type);</div><div class='add'>+					 pool_index, size, threshold_type,</div><div class='add'>+					 extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *__dl_port(struct devlink_port *devlink_port)</div><div class='hunk'>@@ -829,7 +831,8 @@ static int mlxsw_devlink_sb_port_pool_get(struct devlink_port *devlink_port,</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_devlink_sb_port_pool_set(struct devlink_port *devlink_port,</div><div class='ctx'> 					  unsigned int sb_index, u16 pool_index,</div><div class='del'>-					  u32 threshold)</div><div class='add'>+					  u32 threshold,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_core *mlxsw_core = devlink_priv(devlink_port-&gt;devlink);</div><div class='ctx'> 	struct mlxsw_driver *mlxsw_driver = mlxsw_core-&gt;driver;</div><div class='hunk'>@@ -839,7 +842,7 @@ static int mlxsw_devlink_sb_port_pool_set(struct devlink_port *devlink_port,</div><div class='ctx'> 	    !mlxsw_core_port_check(mlxsw_core_port))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	return mlxsw_driver-&gt;sb_port_pool_set(mlxsw_core_port, sb_index,</div><div class='del'>-					      pool_index, threshold);</div><div class='add'>+					      pool_index, threshold, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -864,7 +867,8 @@ static int</div><div class='ctx'> mlxsw_devlink_sb_tc_pool_bind_set(struct devlink_port *devlink_port,</div><div class='ctx'> 				  unsigned int sb_index, u16 tc_index,</div><div class='ctx'> 				  enum devlink_sb_pool_type pool_type,</div><div class='del'>-				  u16 pool_index, u32 threshold)</div><div class='add'>+				  u16 pool_index, u32 threshold,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_core *mlxsw_core = devlink_priv(devlink_port-&gt;devlink);</div><div class='ctx'> 	struct mlxsw_driver *mlxsw_driver = mlxsw_core-&gt;driver;</div><div class='hunk'>@@ -875,7 +879,7 @@ mlxsw_devlink_sb_tc_pool_bind_set(struct devlink_port *devlink_port,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	return mlxsw_driver-&gt;sb_tc_pool_bind_set(mlxsw_core_port, sb_index,</div><div class='ctx'> 						 tc_index, pool_type,</div><div class='del'>-						 pool_index, threshold);</div><div class='add'>+						 pool_index, threshold, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_devlink_sb_occ_snapshot(struct devlink *devlink,</div><div class='hunk'>@@ -934,6 +938,46 @@ mlxsw_devlink_sb_occ_tc_port_bind_get(struct devlink_port *devlink_port,</div><div class='ctx'> 						     pool_type, p_cur, p_max);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);</div><div class='add'>+	char fw_info_psid[MLXSW_REG_MGIR_FW_INFO_PSID_SIZE];</div><div class='add'>+	u32 hw_rev, fw_major, fw_minor, fw_sub_minor;</div><div class='add'>+	char mgir_pl[MLXSW_REG_MGIR_LEN];</div><div class='add'>+	char buf[32];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devlink_info_driver_name_put(req,</div><div class='add'>+					   mlxsw_core-&gt;bus_info-&gt;device_kind);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mlxsw_reg_mgir_pack(mgir_pl);</div><div class='add'>+	err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mgir), mgir_pl);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	mlxsw_reg_mgir_unpack(mgir_pl, &amp;hw_rev, fw_info_psid, &amp;fw_major,</div><div class='add'>+			      &amp;fw_minor, &amp;fw_sub_minor);</div><div class='add'>+</div><div class='add'>+	sprintf(buf, "%X", hw_rev);</div><div class='add'>+	err = devlink_info_version_fixed_put(req, "hw.revision", buf);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devlink_info_version_fixed_put(req, "fw.psid", fw_info_psid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	sprintf(buf, "%d.%d.%d", fw_major, fw_minor, fw_sub_minor);</div><div class='add'>+	err = devlink_info_version_running_put(req, "fw.version", buf);</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'> static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink,</div><div class='ctx'> 						struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='hunk'>@@ -968,6 +1012,7 @@ static const struct devlink_ops mlxsw_devlink_ops = {</div><div class='ctx'> 	.sb_occ_max_clear		= mlxsw_devlink_sb_occ_max_clear,</div><div class='ctx'> 	.sb_occ_port_pool_get		= mlxsw_devlink_sb_occ_port_pool_get,</div><div class='ctx'> 	.sb_occ_tc_port_bind_get	= mlxsw_devlink_sb_occ_tc_port_bind_get,</div><div class='add'>+	.info_get			= mlxsw_devlink_info_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1718,7 +1763,11 @@ u64 mlxsw_core_res_get(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlxsw_core_res_get);</div><div class='ctx'> </div><div class='del'>-int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port)</div><div class='add'>+int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='add'>+			 u32 port_number, bool split,</div><div class='add'>+			 u32 split_port_subnumber,</div><div class='add'>+			 const unsigned char *switch_id,</div><div class='add'>+			 unsigned char switch_id_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct devlink *devlink = priv_to_devlink(mlxsw_core);</div><div class='ctx'> 	struct mlxsw_core_port *mlxsw_core_port =</div><div class='hunk'>@@ -1727,6 +1776,9 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mlxsw_core_port-&gt;local_port = local_port;</div><div class='add'>+	devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='add'>+			       port_number, split, split_port_subnumber,</div><div class='add'>+			       switch_id, switch_id_len);</div><div class='ctx'> 	err = devlink_port_register(devlink, devlink_port, local_port);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));</div><div class='hunk'>@@ -1746,17 +1798,13 @@ void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)</div><div class='ctx'> EXPORT_SYMBOL(mlxsw_core_port_fini);</div><div class='ctx'> </div><div class='ctx'> void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='del'>-			     void *port_driver_priv, struct net_device *dev,</div><div class='del'>-			     u32 port_number, bool split,</div><div class='del'>-			     u32 split_port_subnumber)</div><div class='add'>+			     void *port_driver_priv, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_core_port *mlxsw_core_port =</div><div class='ctx'> 					&amp;mlxsw_core-&gt;ports[local_port];</div><div class='ctx'> 	struct devlink_port *devlink_port = &amp;mlxsw_core_port-&gt;devlink_port;</div><div class='ctx'> </div><div class='ctx'> 	mlxsw_core_port-&gt;port_driver_priv = port_driver_priv;</div><div class='del'>-	devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='del'>-			       port_number, split, split_port_subnumber);</div><div class='ctx'> 	devlink_port_type_eth_set(devlink_port, dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlxsw_core_port_eth_set);</div><div class='hunk'>@@ -1796,16 +1844,18 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mlxsw_core_port_type_get);</div><div class='ctx'> </div><div class='del'>-int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core,</div><div class='del'>-				       u8 local_port, char *name, size_t len)</div><div class='add'>+</div><div class='add'>+struct devlink_port *</div><div class='add'>+mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,</div><div class='add'>+				 u8 local_port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_core_port *mlxsw_core_port =</div><div class='ctx'> 					&amp;mlxsw_core-&gt;ports[local_port];</div><div class='ctx'> 	struct devlink_port *devlink_port = &amp;mlxsw_core_port-&gt;devlink_port;</div><div class='ctx'> </div><div class='del'>-	return devlink_port_get_phys_port_name(devlink_port, name, len);</div><div class='add'>+	return devlink_port;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name);</div><div class='add'>+EXPORT_SYMBOL(mlxsw_core_port_devlink_port_get);</div><div class='ctx'> </div><div class='ctx'> static void mlxsw_core_buf_dump_dbg(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 				    const char *buf, size_t size)</div><div class='hunk'>@@ -1958,10 +2008,10 @@ static int __init mlxsw_core_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mlxsw_wq = alloc_workqueue(mlxsw_core_driver_name, WQ_MEM_RECLAIM, 0);</div><div class='add'>+	mlxsw_wq = alloc_workqueue(mlxsw_core_driver_name, 0, 0);</div><div class='ctx'> 	if (!mlxsw_wq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	mlxsw_owq = alloc_ordered_workqueue("%s_ordered", WQ_MEM_RECLAIM,</div><div class='add'>+	mlxsw_owq = alloc_ordered_workqueue("%s_ordered", 0,</div><div class='ctx'> 					    mlxsw_core_driver_name);</div><div class='ctx'> 	if (!mlxsw_owq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h<br/>index 8ec53f027575..917be621c904 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/core.h</a></div><div class='hunk'>@@ -164,20 +164,23 @@ void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 				  u16 lag_id, u8 local_port);</div><div class='ctx'> </div><div class='ctx'> void *mlxsw_core_port_driver_priv(struct mlxsw_core_port *mlxsw_core_port);</div><div class='del'>-int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port);</div><div class='add'>+int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='add'>+			 u32 port_number, bool split,</div><div class='add'>+			 u32 split_port_subnumber,</div><div class='add'>+			 const unsigned char *switch_id,</div><div class='add'>+			 unsigned char switch_id_len);</div><div class='ctx'> void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port);</div><div class='ctx'> void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='del'>-			     void *port_driver_priv, struct net_device *dev,</div><div class='del'>-			     u32 port_number, bool split,</div><div class='del'>-			     u32 split_port_subnumber);</div><div class='add'>+			     void *port_driver_priv, struct net_device *dev);</div><div class='ctx'> void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 			    void *port_driver_priv);</div><div class='ctx'> void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 			   void *port_driver_priv);</div><div class='ctx'> enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 						u8 local_port);</div><div class='del'>-int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core,</div><div class='del'>-				       u8 local_port, char *name, size_t len);</div><div class='add'>+struct devlink_port *</div><div class='add'>+mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,</div><div class='add'>+				 u8 local_port);</div><div class='ctx'> </div><div class='ctx'> int mlxsw_core_schedule_dw(struct delayed_work *dwork, unsigned long delay);</div><div class='ctx'> bool mlxsw_core_schedule_work(struct work_struct *work);</div><div class='hunk'>@@ -251,13 +254,14 @@ struct mlxsw_driver {</div><div class='ctx'> 			   struct devlink_sb_pool_info *pool_info);</div><div class='ctx'> 	int (*sb_pool_set)(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 			   unsigned int sb_index, u16 pool_index, u32 size,</div><div class='del'>-			   enum devlink_sb_threshold_type threshold_type);</div><div class='add'>+			   enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='ctx'> 	int (*sb_port_pool_get)(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				unsigned int sb_index, u16 pool_index,</div><div class='ctx'> 				u32 *p_threshold);</div><div class='ctx'> 	int (*sb_port_pool_set)(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				unsigned int sb_index, u16 pool_index,</div><div class='del'>-				u32 threshold);</div><div class='add'>+				u32 threshold, struct netlink_ext_ack *extack);</div><div class='ctx'> 	int (*sb_tc_pool_bind_get)(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				   unsigned int sb_index, u16 tc_index,</div><div class='ctx'> 				   enum devlink_sb_pool_type pool_type,</div><div class='hunk'>@@ -265,7 +269,8 @@ struct mlxsw_driver {</div><div class='ctx'> 	int (*sb_tc_pool_bind_set)(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				   unsigned int sb_index, u16 tc_index,</div><div class='ctx'> 				   enum devlink_sb_pool_type pool_type,</div><div class='del'>-				   u16 pool_index, u32 threshold);</div><div class='add'>+				   u16 pool_index, u32 threshold,</div><div class='add'>+				   struct netlink_ext_ack *extack);</div><div class='ctx'> 	int (*sb_occ_snapshot)(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 			       unsigned int sb_index);</div><div class='ctx'> 	int (*sb_occ_max_clear)(struct mlxsw_core *mlxsw_core,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c<br/>index 7a15e932ed2f..c1c1965d7acc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core_env.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/core_env.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core_env.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/core_env.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ int mlxsw_env_module_temp_thresholds_get(struct mlxsw_core *core, int module,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Do not consider thresholds for zero temperature. */</div><div class='del'>-		if (!MLXSW_REG_MTMP_TEMP_TO_MC(module_temp)) {</div><div class='add'>+		if (MLXSW_REG_MTMP_TEMP_TO_MC(module_temp) == 0) {</div><div class='ctx'> 			*temp = 0;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c<br/>index 00c390024350..cf2114273b72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/minimal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/minimal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/minimal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/minimal.c</a></div><div class='hunk'>@@ -51,33 +51,20 @@ static int mlxsw_m_port_dummy_open_stop(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mlxsw_m_port_get_phys_port_name(struct net_device *dev, char *name, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev);</div><div class='del'>-	struct mlxsw_core *core = mlxsw_m_port-&gt;mlxsw_m-&gt;core;</div><div class='del'>-	u8 local_port = mlxsw_m_port-&gt;local_port;</div><div class='del'>-</div><div class='del'>-	return mlxsw_core_port_get_phys_port_name(core, local_port, name, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mlxsw_m_port_get_port_parent_id(struct net_device *dev,</div><div class='del'>-					   struct netdev_phys_item_id *ppid)</div><div class='add'>+static struct devlink_port *</div><div class='add'>+mlxsw_m_port_get_devlink_port(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev);</div><div class='ctx'> 	struct mlxsw_m *mlxsw_m = mlxsw_m_port-&gt;mlxsw_m;</div><div class='ctx'> </div><div class='del'>-	ppid-&gt;id_len = sizeof(mlxsw_m-&gt;base_mac);</div><div class='del'>-	memcpy(&amp;ppid-&gt;id, &amp;mlxsw_m-&gt;base_mac, ppid-&gt;id_len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return mlxsw_core_port_devlink_port_get(mlxsw_m-&gt;core,</div><div class='add'>+						mlxsw_m_port-&gt;local_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops mlxsw_m_port_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= mlxsw_m_port_dummy_open_stop,</div><div class='ctx'> 	.ndo_stop		= mlxsw_m_port_dummy_open_stop,</div><div class='del'>-	.ndo_get_phys_port_name	= mlxsw_m_port_get_phys_port_name,</div><div class='del'>-	.ndo_get_port_parent_id	= mlxsw_m_port_get_port_parent_id,</div><div class='add'>+	.ndo_get_devlink_port	= mlxsw_m_port_get_devlink_port,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_m_get_module_info(struct net_device *netdev,</div><div class='hunk'>@@ -150,7 +137,10 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mlxsw_core_port_init(mlxsw_m-&gt;core, local_port);</div><div class='add'>+	err = mlxsw_core_port_init(mlxsw_m-&gt;core, local_port,</div><div class='add'>+				   module + 1, false, 0,</div><div class='add'>+				   mlxsw_m-&gt;base_mac,</div><div class='add'>+				   sizeof(mlxsw_m-&gt;base_mac));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_m-&gt;bus_info-&gt;dev, "Port %d: Failed to init core port\n",</div><div class='ctx'> 			local_port);</div><div class='hunk'>@@ -190,7 +180,7 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mlxsw_core_port_eth_set(mlxsw_m-&gt;core, mlxsw_m_port-&gt;local_port,</div><div class='del'>-				mlxsw_m_port, dev, module + 1, false, 0);</div><div class='add'>+				mlxsw_m_port, dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h<br/>index ffee38e36ce8..8648ca171254 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/pci_hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/pci_hw.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MLXSW_PCI_SW_RESET			0xF0010</div><div class='ctx'> #define MLXSW_PCI_SW_RESET_RST_BIT		BIT(0)</div><div class='del'>-#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS	13000</div><div class='add'>+#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS	20000</div><div class='ctx'> #define MLXSW_PCI_SW_RESET_WAIT_MSECS		100</div><div class='ctx'> #define MLXSW_PCI_FW_READY			0xA1844</div><div class='ctx'> #define MLXSW_PCI_FW_READY_MASK			0xFFFF</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h<br/>index eb4c5e8964cd..e8002bfc1e8f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/reg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/reg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/reg.h</a></div><div class='hunk'>@@ -5210,6 +5210,42 @@ static inline void mlxsw_reg_pspa_pack(char *payload, u8 swid, u8 local_port)</div><div class='ctx'> 	mlxsw_reg_pspa_sub_port_set(payload, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* PPLR - Port Physical Loopback Register</div><div class='add'>+ * --------------------------------------</div><div class='add'>+ * This register allows configuration of the port's loopback mode.</div><div class='add'>+ */</div><div class='add'>+#define MLXSW_REG_PPLR_ID 0x5018</div><div class='add'>+#define MLXSW_REG_PPLR_LEN 0x8</div><div class='add'>+</div><div class='add'>+MLXSW_REG_DEFINE(pplr, MLXSW_REG_PPLR_ID, MLXSW_REG_PPLR_LEN);</div><div class='add'>+</div><div class='add'>+/* reg_pplr_local_port</div><div class='add'>+ * Local port number.</div><div class='add'>+ * Access: Index</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM32(reg, pplr, local_port, 0x00, 16, 8);</div><div class='add'>+</div><div class='add'>+/* Phy local loopback. When set the port's egress traffic is looped back</div><div class='add'>+ * to the receiver and the port transmitter is disabled.</div><div class='add'>+ */</div><div class='add'>+#define MLXSW_REG_PPLR_LB_TYPE_BIT_PHY_LOCAL BIT(1)</div><div class='add'>+</div><div class='add'>+/* reg_pplr_lb_en</div><div class='add'>+ * Loopback enable.</div><div class='add'>+ * Access: RW</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM32(reg, pplr, lb_en, 0x04, 0, 8);</div><div class='add'>+</div><div class='add'>+static inline void mlxsw_reg_pplr_pack(char *payload, u8 local_port,</div><div class='add'>+				       bool phy_local)</div><div class='add'>+{</div><div class='add'>+	MLXSW_REG_ZERO(pplr, payload);</div><div class='add'>+	mlxsw_reg_pplr_local_port_set(payload, local_port);</div><div class='add'>+	mlxsw_reg_pplr_lb_en_set(payload,</div><div class='add'>+				 phy_local ?</div><div class='add'>+				 MLXSW_REG_PPLR_LB_TYPE_BIT_PHY_LOCAL : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* HTGT - Host Trap Group Table</div><div class='ctx'>  * ----------------------------</div><div class='ctx'>  * Configures the properties for forwarding to CPU.</div><div class='hunk'>@@ -8534,6 +8570,60 @@ static inline void mlxsw_reg_mpar_pack(char *payload, u8 local_port,</div><div class='ctx'> 	mlxsw_reg_mpar_pa_id_set(payload, pa_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* MGIR - Management General Information Register</div><div class='add'>+ * ----------------------------------------------</div><div class='add'>+ * MGIR register allows software to query the hardware and firmware general</div><div class='add'>+ * information.</div><div class='add'>+ */</div><div class='add'>+#define MLXSW_REG_MGIR_ID 0x9020</div><div class='add'>+#define MLXSW_REG_MGIR_LEN 0x9C</div><div class='add'>+</div><div class='add'>+MLXSW_REG_DEFINE(mgir, MLXSW_REG_MGIR_ID, MLXSW_REG_MGIR_LEN);</div><div class='add'>+</div><div class='add'>+/* reg_mgir_hw_info_device_hw_revision</div><div class='add'>+ * Access: RO</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM32(reg, mgir, hw_info_device_hw_revision, 0x0, 16, 16);</div><div class='add'>+</div><div class='add'>+#define MLXSW_REG_MGIR_FW_INFO_PSID_SIZE 16</div><div class='add'>+</div><div class='add'>+/* reg_mgir_fw_info_psid</div><div class='add'>+ * PSID (ASCII string).</div><div class='add'>+ * Access: RO</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM_BUF(reg, mgir, fw_info_psid, 0x30, MLXSW_REG_MGIR_FW_INFO_PSID_SIZE);</div><div class='add'>+</div><div class='add'>+/* reg_mgir_fw_info_extended_major</div><div class='add'>+ * Access: RO</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM32(reg, mgir, fw_info_extended_major, 0x44, 0, 32);</div><div class='add'>+</div><div class='add'>+/* reg_mgir_fw_info_extended_minor</div><div class='add'>+ * Access: RO</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM32(reg, mgir, fw_info_extended_minor, 0x48, 0, 32);</div><div class='add'>+</div><div class='add'>+/* reg_mgir_fw_info_extended_sub_minor</div><div class='add'>+ * Access: RO</div><div class='add'>+ */</div><div class='add'>+MLXSW_ITEM32(reg, mgir, fw_info_extended_sub_minor, 0x4C, 0, 32);</div><div class='add'>+</div><div class='add'>+static inline void mlxsw_reg_mgir_pack(char *payload)</div><div class='add'>+{</div><div class='add'>+	MLXSW_REG_ZERO(mgir, payload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mlxsw_reg_mgir_unpack(char *payload, u32 *hw_rev, char *fw_info_psid,</div><div class='add'>+		      u32 *fw_major, u32 *fw_minor, u32 *fw_sub_minor)</div><div class='add'>+{</div><div class='add'>+	*hw_rev = mlxsw_reg_mgir_hw_info_device_hw_revision_get(payload);</div><div class='add'>+	mlxsw_reg_mgir_fw_info_psid_memcpy_from(payload, fw_info_psid);</div><div class='add'>+	*fw_major = mlxsw_reg_mgir_fw_info_extended_major_get(payload);</div><div class='add'>+	*fw_minor = mlxsw_reg_mgir_fw_info_extended_minor_get(payload);</div><div class='add'>+	*fw_sub_minor = mlxsw_reg_mgir_fw_info_extended_sub_minor_get(payload);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* MRSR - Management Reset and Shutdown Register</div><div class='ctx'>  * ---------------------------------------------</div><div class='ctx'>  * MRSR register is used to reset or shutdown the switch or</div><div class='hunk'>@@ -9927,6 +10017,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {</div><div class='ctx'> 	MLXSW_REG(pptb),</div><div class='ctx'> 	MLXSW_REG(pbmc),</div><div class='ctx'> 	MLXSW_REG(pspa),</div><div class='add'>+	MLXSW_REG(pplr),</div><div class='ctx'> 	MLXSW_REG(htgt),</div><div class='ctx'> 	MLXSW_REG(hpkt),</div><div class='ctx'> 	MLXSW_REG(rgcr),</div><div class='hunk'>@@ -9958,6 +10049,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {</div><div class='ctx'> 	MLXSW_REG(mcia),</div><div class='ctx'> 	MLXSW_REG(mpat),</div><div class='ctx'> 	MLXSW_REG(mpar),</div><div class='add'>+	MLXSW_REG(mgir),</div><div class='ctx'> 	MLXSW_REG(mrsr),</div><div class='ctx'> 	MLXSW_REG(mlcr),</div><div class='ctx'> 	MLXSW_REG(mpsc),</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/resources.h b/drivers/net/ethernet/mellanox/mlxsw/resources.h<br/>index 773ef7fdb285..33a9fc9ef6a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/resources.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/resources.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/resources.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/resources.h</a></div><div class='hunk'>@@ -24,6 +24,8 @@ enum mlxsw_res_id {</div><div class='ctx'> 	MLXSW_RES_ID_MAX_SYSTEM_PORT,</div><div class='ctx'> 	MLXSW_RES_ID_MAX_LAG,</div><div class='ctx'> 	MLXSW_RES_ID_MAX_LAG_MEMBERS,</div><div class='add'>+	MLXSW_RES_ID_LOCAL_PORTS_IN_1X,</div><div class='add'>+	MLXSW_RES_ID_LOCAL_PORTS_IN_2X,</div><div class='ctx'> 	MLXSW_RES_ID_MAX_BUFFER_SIZE,</div><div class='ctx'> 	MLXSW_RES_ID_CELL_SIZE,</div><div class='ctx'> 	MLXSW_RES_ID_MAX_HEADROOM_SIZE,</div><div class='hunk'>@@ -78,6 +80,8 @@ static u16 mlxsw_res_ids[] = {</div><div class='ctx'> 	[MLXSW_RES_ID_MAX_SYSTEM_PORT] = 0x2502,</div><div class='ctx'> 	[MLXSW_RES_ID_MAX_LAG] = 0x2520,</div><div class='ctx'> 	[MLXSW_RES_ID_MAX_LAG_MEMBERS] = 0x2521,</div><div class='add'>+	[MLXSW_RES_ID_LOCAL_PORTS_IN_1X] = 0x2610,</div><div class='add'>+	[MLXSW_RES_ID_LOCAL_PORTS_IN_2X] = 0x2611,</div><div class='ctx'> 	[MLXSW_RES_ID_MAX_BUFFER_SIZE] = 0x2802,	/* Bytes */</div><div class='ctx'> 	[MLXSW_RES_ID_CELL_SIZE] = 0x2803,	/* Bytes */</div><div class='ctx'> 	[MLXSW_RES_ID_MAX_HEADROOM_SIZE] = 0x2811,	/* Bytes */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c<br/>index 9eb63300c1d3..dbb425717f5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/dcbnl.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> #include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;net/tc_act/tc_mirred.h&gt;</div><div class='hunk'>@@ -46,8 +46,8 @@</div><div class='ctx'> #define MLXSW_SP_FWREV_MINOR_TO_BRANCH(minor) ((minor) / 100)</div><div class='ctx'> </div><div class='ctx'> #define MLXSW_SP1_FWREV_MAJOR 13</div><div class='del'>-#define MLXSW_SP1_FWREV_MINOR 1910</div><div class='del'>-#define MLXSW_SP1_FWREV_SUBMINOR 622</div><div class='add'>+#define MLXSW_SP1_FWREV_MINOR 2000</div><div class='add'>+#define MLXSW_SP1_FWREV_SUBMINOR 1122</div><div class='ctx'> #define MLXSW_SP1_FWREV_CAN_RESET_MINOR 1702</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = {</div><div class='hunk'>@@ -1254,16 +1254,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlxsw_sp_port_get_phys_port_name(struct net_device *dev, char *name,</div><div class='del'>-					    size_t len)</div><div class='del'>-{</div><div class='del'>-	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	return mlxsw_core_port_get_phys_port_name(mlxsw_sp_port-&gt;mlxsw_sp-&gt;core,</div><div class='del'>-						  mlxsw_sp_port-&gt;local_port,</div><div class='del'>-						  name, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct mlxsw_sp_port_mall_tc_entry *</div><div class='ctx'> mlxsw_sp_port_mall_tc_entry_find(struct mlxsw_sp_port *port,</div><div class='ctx'> 				 unsigned long cookie) {</div><div class='hunk'>@@ -1279,21 +1269,19 @@ mlxsw_sp_port_mall_tc_entry_find(struct mlxsw_sp_port *port,</div><div class='ctx'> static int</div><div class='ctx'> mlxsw_sp_port_add_cls_matchall_mirror(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> 				      struct mlxsw_sp_port_mall_mirror_tc_entry *mirror,</div><div class='del'>-				      const struct tc_action *a,</div><div class='add'>+				      const struct flow_action_entry *act,</div><div class='ctx'> 				      bool ingress)</div><div class='ctx'> {</div><div class='ctx'> 	enum mlxsw_sp_span_type span_type;</div><div class='del'>-	struct net_device *to_dev;</div><div class='ctx'> </div><div class='del'>-	to_dev = tcf_mirred_dev(a);</div><div class='del'>-	if (!to_dev) {</div><div class='add'>+	if (!act-&gt;dev) {</div><div class='ctx'> 		netdev_err(mlxsw_sp_port-&gt;dev, "Could not find requested device\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mirror-&gt;ingress = ingress;</div><div class='ctx'> 	span_type = ingress ? MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS;</div><div class='del'>-	return mlxsw_sp_span_mirror_add(mlxsw_sp_port, to_dev, span_type,</div><div class='add'>+	return mlxsw_sp_span_mirror_add(mlxsw_sp_port, act-&gt;dev, span_type,</div><div class='ctx'> 					true, &amp;mirror-&gt;span_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1312,7 +1300,7 @@ mlxsw_sp_port_del_cls_matchall_mirror(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> static int</div><div class='ctx'> mlxsw_sp_port_add_cls_matchall_sample(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> 				      struct tc_cls_matchall_offload *cls,</div><div class='del'>-				      const struct tc_action *a,</div><div class='add'>+				      const struct flow_action_entry *act,</div><div class='ctx'> 				      bool ingress)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1323,18 +1311,18 @@ mlxsw_sp_port_add_cls_matchall_sample(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> 		netdev_err(mlxsw_sp_port-&gt;dev, "sample already active\n");</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> 	}</div><div class='del'>-	if (tcf_sample_rate(a) &gt; MLXSW_REG_MPSC_RATE_MAX) {</div><div class='add'>+	if (act-&gt;sample.rate &gt; MLXSW_REG_MPSC_RATE_MAX) {</div><div class='ctx'> 		netdev_err(mlxsw_sp_port-&gt;dev, "sample rate not supported\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(mlxsw_sp_port-&gt;sample-&gt;psample_group,</div><div class='del'>-			   tcf_sample_psample_group(a));</div><div class='del'>-	mlxsw_sp_port-&gt;sample-&gt;truncate = tcf_sample_truncate(a);</div><div class='del'>-	mlxsw_sp_port-&gt;sample-&gt;trunc_size = tcf_sample_trunc_size(a);</div><div class='del'>-	mlxsw_sp_port-&gt;sample-&gt;rate = tcf_sample_rate(a);</div><div class='add'>+			   act-&gt;sample.psample_group);</div><div class='add'>+	mlxsw_sp_port-&gt;sample-&gt;truncate = act-&gt;sample.truncate;</div><div class='add'>+	mlxsw_sp_port-&gt;sample-&gt;trunc_size = act-&gt;sample.trunc_size;</div><div class='add'>+	mlxsw_sp_port-&gt;sample-&gt;rate = act-&gt;sample.rate;</div><div class='ctx'> </div><div class='del'>-	err = mlxsw_sp_port_sample_set(mlxsw_sp_port, true, tcf_sample_rate(a));</div><div class='add'>+	err = mlxsw_sp_port_sample_set(mlxsw_sp_port, true, act-&gt;sample.rate);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_port_sample_set;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1360,10 +1348,10 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp_port_mall_tc_entry *mall_tc_entry;</div><div class='ctx'> 	__be16 protocol = f-&gt;common.protocol;</div><div class='del'>-	const struct tc_action *a;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!tcf_exts_has_one_action(f-&gt;exts)) {</div><div class='add'>+	if (!flow_offload_has_one_action(&amp;f-&gt;rule-&gt;action)) {</div><div class='ctx'> 		netdev_err(mlxsw_sp_port-&gt;dev, "only singular actions are supported\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1373,19 +1361,21 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	mall_tc_entry-&gt;cookie = f-&gt;cookie;</div><div class='ctx'> </div><div class='del'>-	a = tcf_exts_first_action(f-&gt;exts);</div><div class='add'>+	act = &amp;f-&gt;rule-&gt;action.entries[0];</div><div class='ctx'> </div><div class='del'>-	if (is_tcf_mirred_egress_mirror(a) &amp;&amp; protocol == htons(ETH_P_ALL)) {</div><div class='add'>+	if (act-&gt;id == FLOW_ACTION_MIRRED &amp;&amp; protocol == htons(ETH_P_ALL)) {</div><div class='ctx'> 		struct mlxsw_sp_port_mall_mirror_tc_entry *mirror;</div><div class='ctx'> </div><div class='ctx'> 		mall_tc_entry-&gt;type = MLXSW_SP_PORT_MALL_MIRROR;</div><div class='ctx'> 		mirror = &amp;mall_tc_entry-&gt;mirror;</div><div class='ctx'> 		err = mlxsw_sp_port_add_cls_matchall_mirror(mlxsw_sp_port,</div><div class='del'>-							    mirror, a, ingress);</div><div class='del'>-	} else if (is_tcf_sample(a) &amp;&amp; protocol == htons(ETH_P_ALL)) {</div><div class='add'>+							    mirror, act,</div><div class='add'>+							    ingress);</div><div class='add'>+	} else if (act-&gt;id == FLOW_ACTION_SAMPLE &amp;&amp;</div><div class='add'>+		   protocol == htons(ETH_P_ALL)) {</div><div class='ctx'> 		mall_tc_entry-&gt;type = MLXSW_SP_PORT_MALL_SAMPLE;</div><div class='ctx'> 		err = mlxsw_sp_port_add_cls_matchall_sample(mlxsw_sp_port, f,</div><div class='del'>-							    a, ingress);</div><div class='add'>+							    act, ingress);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1679,6 +1669,25 @@ static int mlxsw_sp_feature_hw_tc(struct net_device *dev, bool enable)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlxsw_sp_feature_loopback(struct net_device *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);</div><div class='add'>+	char pplr_pl[MLXSW_REG_PPLR_LEN];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		mlxsw_sp_port_admin_status_set(mlxsw_sp_port, false);</div><div class='add'>+</div><div class='add'>+	mlxsw_reg_pplr_pack(pplr_pl, mlxsw_sp_port-&gt;local_port, enable);</div><div class='add'>+	err = mlxsw_reg_write(mlxsw_sp_port-&gt;mlxsw_sp-&gt;core, MLXSW_REG(pplr),</div><div class='add'>+			      pplr_pl);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		mlxsw_sp_port_admin_status_set(mlxsw_sp_port, true);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> typedef int (*mlxsw_sp_feature_handler)(struct net_device *dev, bool enable);</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_sp_handle_feature(struct net_device *dev,</div><div class='hunk'>@@ -1710,20 +1719,30 @@ static int mlxsw_sp_handle_feature(struct net_device *dev,</div><div class='ctx'> static int mlxsw_sp_set_features(struct net_device *dev,</div><div class='ctx'> 				 netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	return mlxsw_sp_handle_feature(dev, features, NETIF_F_HW_TC,</div><div class='add'>+	netdev_features_t oper_features = dev-&gt;features;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err |= mlxsw_sp_handle_feature(dev, features, NETIF_F_HW_TC,</div><div class='ctx'> 				       mlxsw_sp_feature_hw_tc);</div><div class='add'>+	err |= mlxsw_sp_handle_feature(dev, features, NETIF_F_LOOPBACK,</div><div class='add'>+				       mlxsw_sp_feature_loopback);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		dev-&gt;features = oper_features;</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='ctx'> </div><div class='del'>-static int mlxsw_sp_port_get_port_parent_id(struct net_device *dev,</div><div class='del'>-					    struct netdev_phys_item_id *ppid)</div><div class='add'>+static struct devlink_port *</div><div class='add'>+mlxsw_sp_port_get_devlink_port(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port-&gt;mlxsw_sp;</div><div class='ctx'> </div><div class='del'>-	ppid-&gt;id_len = sizeof(mlxsw_sp-&gt;base_mac);</div><div class='del'>-	memcpy(&amp;ppid-&gt;id, &amp;mlxsw_sp-&gt;base_mac, ppid-&gt;id_len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return mlxsw_core_port_devlink_port_get(mlxsw_sp-&gt;core,</div><div class='add'>+						mlxsw_sp_port-&gt;local_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops mlxsw_sp_port_netdev_ops = {</div><div class='hunk'>@@ -1739,9 +1758,8 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = {</div><div class='ctx'> 	.ndo_get_offload_stats	= mlxsw_sp_port_get_offload_stats,</div><div class='ctx'> 	.ndo_vlan_rx_add_vid	= mlxsw_sp_port_add_vid,</div><div class='ctx'> 	.ndo_vlan_rx_kill_vid	= mlxsw_sp_port_kill_vid,</div><div class='del'>-	.ndo_get_phys_port_name	= mlxsw_sp_port_get_phys_port_name,</div><div class='ctx'> 	.ndo_set_features	= mlxsw_sp_set_features,</div><div class='del'>-	.ndo_get_port_parent_id	= mlxsw_sp_port_get_port_parent_id,</div><div class='add'>+	.ndo_get_devlink_port	= mlxsw_sp_port_get_devlink_port,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void mlxsw_sp_port_get_drvinfo(struct net_device *dev,</div><div class='hunk'>@@ -3126,11 +3144,11 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	mlxsw_sp_port-&gt;link.autoneg = autoneg;</div><div class='add'>+</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mlxsw_sp_port-&gt;link.autoneg = autoneg;</div><div class='del'>-</div><div class='ctx'> 	mlxsw_sp_port_admin_status_set(mlxsw_sp_port, false);</div><div class='ctx'> 	mlxsw_sp_port_admin_status_set(mlxsw_sp_port, true);</div><div class='ctx'> </div><div class='hunk'>@@ -3316,7 +3334,7 @@ static int mlxsw_sp_port_ets_init(struct mlxsw_sp_port *mlxsw_sp_port)</div><div class='ctx'> 		err = mlxsw_sp_port_ets_set(mlxsw_sp_port,</div><div class='ctx'> 					    MLXSW_REG_QEEC_HIERARCY_TC,</div><div class='ctx'> 					    i + 8, i,</div><div class='del'>-					    false, 0);</div><div class='add'>+					    true, 100);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3391,7 +3409,10 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mlxsw_core_port_init(mlxsw_sp-&gt;core, local_port);</div><div class='add'>+	err = mlxsw_core_port_init(mlxsw_sp-&gt;core, local_port,</div><div class='add'>+				   module + 1, split, lane / width,</div><div class='add'>+				   mlxsw_sp-&gt;base_mac,</div><div class='add'>+				   sizeof(mlxsw_sp-&gt;base_mac));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Port %d: Failed to init core port\n",</div><div class='ctx'> 			local_port);</div><div class='hunk'>@@ -3462,7 +3483,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features |= NETIF_F_NETNS_LOCAL | NETIF_F_LLTX | NETIF_F_SG |</div><div class='ctx'> 			 NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_TC;</div><div class='del'>-	dev-&gt;hw_features |= NETIF_F_HW_TC;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_HW_TC | NETIF_F_LOOPBACK;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;min_mtu = 0;</div><div class='ctx'> 	dev-&gt;max_mtu = ETH_MAX_MTU;</div><div class='hunk'>@@ -3573,8 +3594,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mlxsw_core_port_eth_set(mlxsw_sp-&gt;core, mlxsw_sp_port-&gt;local_port,</div><div class='del'>-				mlxsw_sp_port, dev, module + 1,</div><div class='del'>-				mlxsw_sp_port-&gt;split, lane / width);</div><div class='add'>+				mlxsw_sp_port, dev);</div><div class='ctx'> 	mlxsw_core_schedule_dw(&amp;mlxsw_sp_port-&gt;periodic_hw_stats.update_dw, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3710,14 +3730,14 @@ static u8 mlxsw_sp_cluster_base_port_get(u8 local_port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,</div><div class='del'>-				      u8 module, unsigned int count)</div><div class='add'>+				      u8 module, unsigned int count, u8 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u8 width = MLXSW_PORT_MODULE_MAX_WIDTH / count;</div><div class='ctx'> 	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		err = mlxsw_sp_port_create(mlxsw_sp, base_port + i, true,</div><div class='del'>-					   module, width, i * width);</div><div class='add'>+		err = mlxsw_sp_port_create(mlxsw_sp, base_port + i * offset,</div><div class='add'>+					   true, module, width, i * width);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_port_create;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3726,8 +3746,8 @@ static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port,</div><div class='ctx'> </div><div class='ctx'> err_port_create:</div><div class='ctx'> 	for (i--; i &gt;= 0; i--)</div><div class='del'>-		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i))</div><div class='del'>-			mlxsw_sp_port_remove(mlxsw_sp, base_port + i);</div><div class='add'>+		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i * offset))</div><div class='add'>+			mlxsw_sp_port_remove(mlxsw_sp, base_port + i * offset);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3758,11 +3778,19 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);</div><div class='add'>+	u8 local_ports_in_1x, local_ports_in_2x, offset;</div><div class='ctx'> 	struct mlxsw_sp_port *mlxsw_sp_port;</div><div class='ctx'> 	u8 module, cur_width, base_port;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (!MLXSW_CORE_RES_VALID(mlxsw_core, LOCAL_PORTS_IN_1X) ||</div><div class='add'>+	    !MLXSW_CORE_RES_VALID(mlxsw_core, LOCAL_PORTS_IN_2X))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	local_ports_in_1x = MLXSW_CORE_RES_GET(mlxsw_core, LOCAL_PORTS_IN_1X);</div><div class='add'>+	local_ports_in_2x = MLXSW_CORE_RES_GET(mlxsw_core, LOCAL_PORTS_IN_2X);</div><div class='add'>+</div><div class='ctx'> 	mlxsw_sp_port = mlxsw_sp-&gt;ports[local_port];</div><div class='ctx'> 	if (!mlxsw_sp_port) {</div><div class='ctx'> 		dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Port number \"%d\" does not exist\n",</div><div class='hunk'>@@ -3788,13 +3816,15 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we have enough slave (even) ports for the split. */</div><div class='ctx'> 	if (count == 2) {</div><div class='add'>+		offset = local_ports_in_2x;</div><div class='ctx'> 		base_port = local_port;</div><div class='del'>-		if (mlxsw_sp-&gt;ports[base_port + 1]) {</div><div class='add'>+		if (mlxsw_sp-&gt;ports[base_port + local_ports_in_2x]) {</div><div class='ctx'> 			netdev_err(mlxsw_sp_port-&gt;dev, "Invalid split configuration\n");</div><div class='ctx'> 			NL_SET_ERR_MSG_MOD(extack, "Invalid split configuration");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='add'>+		offset = local_ports_in_1x;</div><div class='ctx'> 		base_port = mlxsw_sp_cluster_base_port_get(local_port);</div><div class='ctx'> 		if (mlxsw_sp-&gt;ports[base_port + 1] ||</div><div class='ctx'> 		    mlxsw_sp-&gt;ports[base_port + 3]) {</div><div class='hunk'>@@ -3805,10 +3835,11 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++)</div><div class='del'>-		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i))</div><div class='del'>-			mlxsw_sp_port_remove(mlxsw_sp, base_port + i);</div><div class='add'>+		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i * offset))</div><div class='add'>+			mlxsw_sp_port_remove(mlxsw_sp, base_port + i * offset);</div><div class='ctx'> </div><div class='del'>-	err = mlxsw_sp_port_split_create(mlxsw_sp, base_port, module, count);</div><div class='add'>+	err = mlxsw_sp_port_split_create(mlxsw_sp, base_port, module, count,</div><div class='add'>+					 offset);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Failed to create split ports\n");</div><div class='ctx'> 		goto err_port_split_create;</div><div class='hunk'>@@ -3825,11 +3856,19 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);</div><div class='add'>+	u8 local_ports_in_1x, local_ports_in_2x, offset;</div><div class='ctx'> 	struct mlxsw_sp_port *mlxsw_sp_port;</div><div class='ctx'> 	u8 cur_width, base_port;</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!MLXSW_CORE_RES_VALID(mlxsw_core, LOCAL_PORTS_IN_1X) ||</div><div class='add'>+	    !MLXSW_CORE_RES_VALID(mlxsw_core, LOCAL_PORTS_IN_2X))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	local_ports_in_1x = MLXSW_CORE_RES_GET(mlxsw_core, LOCAL_PORTS_IN_1X);</div><div class='add'>+	local_ports_in_2x = MLXSW_CORE_RES_GET(mlxsw_core, LOCAL_PORTS_IN_2X);</div><div class='add'>+</div><div class='ctx'> 	mlxsw_sp_port = mlxsw_sp-&gt;ports[local_port];</div><div class='ctx'> 	if (!mlxsw_sp_port) {</div><div class='ctx'> 		dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Port number \"%d\" does not exist\n",</div><div class='hunk'>@@ -3847,6 +3886,11 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 	cur_width = mlxsw_sp_port-&gt;mapping.width;</div><div class='ctx'> 	count = cur_width == 1 ? 4 : 2;</div><div class='ctx'> </div><div class='add'>+	if (count == 2)</div><div class='add'>+		offset = local_ports_in_2x;</div><div class='add'>+	else</div><div class='add'>+		offset = local_ports_in_1x;</div><div class='add'>+</div><div class='ctx'> 	base_port = mlxsw_sp_cluster_base_port_get(local_port);</div><div class='ctx'> </div><div class='ctx'> 	/* Determine which ports to remove. */</div><div class='hunk'>@@ -3854,8 +3898,8 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port,</div><div class='ctx'> 		base_port = base_port + 2;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++)</div><div class='del'>-		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i))</div><div class='del'>-			mlxsw_sp_port_remove(mlxsw_sp, base_port + i);</div><div class='add'>+		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i * offset))</div><div class='add'>+			mlxsw_sp_port_remove(mlxsw_sp, base_port + i * offset);</div><div class='ctx'> </div><div class='ctx'> 	mlxsw_sp_port_unsplit_create(mlxsw_sp, base_port, count);</div><div class='ctx'> </div><div class='hunk'>@@ -4238,7 +4282,7 @@ static int mlxsw_sp_lag_init(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> 	u32 seed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	get_random_bytes(&amp;seed, sizeof(seed));</div><div class='add'>+	seed = jhash(mlxsw_sp-&gt;base_mac, sizeof(mlxsw_sp-&gt;base_mac), 0);</div><div class='ctx'> 	mlxsw_reg_slcr_pack(slcr_pl, MLXSW_REG_SLCR_LAG_HASH_SMAC |</div><div class='ctx'> 				     MLXSW_REG_SLCR_LAG_HASH_DMAC |</div><div class='ctx'> 				     MLXSW_REG_SLCR_LAG_HASH_ETHERTYPE |</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h<br/>index da6278b0caa4..8601b3041acd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum.h</a></div><div class='hunk'>@@ -371,13 +371,14 @@ int mlxsw_sp_sb_pool_get(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 			 struct devlink_sb_pool_info *pool_info);</div><div class='ctx'> int mlxsw_sp_sb_pool_set(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 			 unsigned int sb_index, u16 pool_index, u32 size,</div><div class='del'>-			 enum devlink_sb_threshold_type threshold_type);</div><div class='add'>+			 enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='ctx'> int mlxsw_sp_sb_port_pool_get(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 			      unsigned int sb_index, u16 pool_index,</div><div class='ctx'> 			      u32 *p_threshold);</div><div class='ctx'> int mlxsw_sp_sb_port_pool_set(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 			      unsigned int sb_index, u16 pool_index,</div><div class='del'>-			      u32 threshold);</div><div class='add'>+			      u32 threshold, struct netlink_ext_ack *extack);</div><div class='ctx'> int mlxsw_sp_sb_tc_pool_bind_get(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				 unsigned int sb_index, u16 tc_index,</div><div class='ctx'> 				 enum devlink_sb_pool_type pool_type,</div><div class='hunk'>@@ -385,7 +386,8 @@ int mlxsw_sp_sb_tc_pool_bind_get(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> int mlxsw_sp_sb_tc_pool_bind_set(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				 unsigned int sb_index, u16 tc_index,</div><div class='ctx'> 				 enum devlink_sb_pool_type pool_type,</div><div class='del'>-				 u16 pool_index, u32 threshold);</div><div class='add'>+				 u16 pool_index, u32 threshold,</div><div class='add'>+				 struct netlink_ext_ack *extack);</div><div class='ctx'> int mlxsw_sp_sb_occ_snapshot(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 			     unsigned int sb_index);</div><div class='ctx'> int mlxsw_sp_sb_occ_max_clear(struct mlxsw_core *mlxsw_core,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c<br/>index 8811f6513e36..e993159e8e4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c</a></div><div class='hunk'>@@ -216,7 +216,6 @@ struct mlxsw_sp_acl_tcam_vregion {</div><div class='ctx'> 		struct mlxsw_sp_acl_tcam_rehash_ctx ctx;</div><div class='ctx'> 	} rehash;</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp;</div><div class='del'>-	bool failed_rollback; /* Indicates failed rollback during migration */</div><div class='ctx'> 	unsigned int ref_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1256,11 +1255,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_start(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 	struct mlxsw_sp_acl_tcam_chunk *new_chunk;</div><div class='ctx'> </div><div class='ctx'> 	new_chunk = mlxsw_sp_acl_tcam_chunk_create(mlxsw_sp, vchunk, region);</div><div class='del'>-	if (IS_ERR(new_chunk)) {</div><div class='del'>-		if (ctx-&gt;this_is_rollback)</div><div class='del'>-			vchunk-&gt;vregion-&gt;failed_rollback = true;</div><div class='add'>+	if (IS_ERR(new_chunk))</div><div class='ctx'> 		return PTR_ERR(new_chunk);</div><div class='del'>-	}</div><div class='ctx'> 	vchunk-&gt;chunk2 = vchunk-&gt;chunk;</div><div class='ctx'> 	vchunk-&gt;chunk = new_chunk;</div><div class='ctx'> 	ctx-&gt;current_vchunk = vchunk;</div><div class='hunk'>@@ -1318,8 +1314,13 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 		err = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry,</div><div class='ctx'> 						       vchunk-&gt;chunk, credits);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			if (ctx-&gt;this_is_rollback)</div><div class='add'>+			if (ctx-&gt;this_is_rollback) {</div><div class='add'>+				/* Save the ventry which we ended with and try</div><div class='add'>+				 * to continue later on.</div><div class='add'>+				 */</div><div class='add'>+				ctx-&gt;start_ventry = ventry;</div><div class='ctx'> 				return err;</div><div class='add'>+			}</div><div class='ctx'> 			/* Swap the chunk and chunk2 pointers so the follow-up</div><div class='ctx'> 			 * rollback call will see the original chunk pointer</div><div class='ctx'> 			 * in vchunk-&gt;chunk.</div><div class='hunk'>@@ -1397,8 +1398,12 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 		ctx-&gt;this_is_rollback = true;</div><div class='ctx'> 		err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,</div><div class='ctx'> 							    ctx, credits);</div><div class='del'>-		if (err2)</div><div class='del'>-			vregion-&gt;failed_rollback = true;</div><div class='add'>+		if (err2) {</div><div class='add'>+			trace_mlxsw_sp_acl_tcam_vregion_rehash_rollback_failed(mlxsw_sp,</div><div class='add'>+									       vregion);</div><div class='add'>+			dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Failed to rollback during vregion migration fail\n");</div><div class='add'>+			/* Let the rollback to be continued later on. */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;vregion-&gt;lock);</div><div class='ctx'> 	trace_mlxsw_sp_acl_tcam_vregion_migrate_end(mlxsw_sp, vregion);</div><div class='hunk'>@@ -1423,8 +1428,6 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	trace_mlxsw_sp_acl_tcam_vregion_rehash(mlxsw_sp, vregion);</div><div class='del'>-	if (vregion-&gt;failed_rollback)</div><div class='del'>-		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	hints_priv = ops-&gt;region_rehash_hints_get(vregion-&gt;region-&gt;priv);</div><div class='ctx'> 	if (IS_ERR(hints_priv))</div><div class='hunk'>@@ -1471,11 +1474,9 @@ mlxsw_sp_acl_tcam_vregion_rehash_end(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 	struct mlxsw_sp_acl_tcam_region *unused_region = vregion-&gt;region2;</div><div class='ctx'> 	const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp-&gt;acl_tcam_ops;</div><div class='ctx'> </div><div class='del'>-	if (!vregion-&gt;failed_rollback) {</div><div class='del'>-		vregion-&gt;region2 = NULL;</div><div class='del'>-		mlxsw_sp_acl_tcam_group_region_detach(mlxsw_sp, unused_region);</div><div class='del'>-		mlxsw_sp_acl_tcam_region_destroy(mlxsw_sp, unused_region);</div><div class='del'>-	}</div><div class='add'>+	vregion-&gt;region2 = NULL;</div><div class='add'>+	mlxsw_sp_acl_tcam_group_region_detach(mlxsw_sp, unused_region);</div><div class='add'>+	mlxsw_sp_acl_tcam_region_destroy(mlxsw_sp, unused_region);</div><div class='ctx'> 	ops-&gt;region_rehash_hints_put(ctx-&gt;hints_priv);</div><div class='ctx'> 	ctx-&gt;hints_priv = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1506,11 +1507,6 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 						ctx, credits);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Failed to migrate vregion\n");</div><div class='del'>-		if (vregion-&gt;failed_rollback) {</div><div class='del'>-			trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,</div><div class='del'>-								   vregion);</div><div class='del'>-			dev_err(mlxsw_sp-&gt;bus_info-&gt;dev, "Failed to rollback during vregion migration fail\n");</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*credits &gt;= 0)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c<br/>index 9a79b5e11597..8512dd49e420 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/dcbnl.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "spectrum.h"</div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -15,6 +16,8 @@</div><div class='ctx'> struct mlxsw_sp_sb_pr {</div><div class='ctx'> 	enum mlxsw_reg_sbpr_mode mode;</div><div class='ctx'> 	u32 size;</div><div class='add'>+	u8 freeze_mode:1,</div><div class='add'>+	   freeze_size:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlxsw_cp_sb_occ {</div><div class='hunk'>@@ -27,6 +30,8 @@ struct mlxsw_sp_sb_cm {</div><div class='ctx'> 	u32 max_buff;</div><div class='ctx'> 	u16 pool_index;</div><div class='ctx'> 	struct mlxsw_cp_sb_occ occ;</div><div class='add'>+	u8 freeze_pool:1,</div><div class='add'>+	   freeze_thresh:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MLXSW_SP_SB_INFI -1U</div><div class='hunk'>@@ -48,7 +53,12 @@ struct mlxsw_sp_sb_pool_des {</div><div class='ctx'> 	u8 pool;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Order ingress pools before egress pools. */</div><div class='add'>+#define MLXSW_SP_SB_POOL_ING		0</div><div class='add'>+#define MLXSW_SP_SB_POOL_EGR		4</div><div class='add'>+#define MLXSW_SP_SB_POOL_EGR_MC		8</div><div class='add'>+#define MLXSW_SP_SB_POOL_ING_CPU	9</div><div class='add'>+#define MLXSW_SP_SB_POOL_EGR_CPU	10</div><div class='add'>+</div><div class='ctx'> static const struct mlxsw_sp_sb_pool_des mlxsw_sp1_sb_pool_dess[] = {</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_INGRESS, 0},</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_INGRESS, 1},</div><div class='hunk'>@@ -59,6 +69,8 @@ static const struct mlxsw_sp_sb_pool_des mlxsw_sp1_sb_pool_dess[] = {</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_EGRESS, 2},</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_EGRESS, 3},</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_EGRESS, 15},</div><div class='add'>+	{MLXSW_REG_SBXX_DIR_INGRESS, 4},</div><div class='add'>+	{MLXSW_REG_SBXX_DIR_EGRESS, 4},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_sp_sb_pool_des mlxsw_sp2_sb_pool_dess[] = {</div><div class='hunk'>@@ -70,6 +82,9 @@ static const struct mlxsw_sp_sb_pool_des mlxsw_sp2_sb_pool_dess[] = {</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_EGRESS, 1},</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_EGRESS, 2},</div><div class='ctx'> 	{MLXSW_REG_SBXX_DIR_EGRESS, 3},</div><div class='add'>+	{MLXSW_REG_SBXX_DIR_EGRESS, 15},</div><div class='add'>+	{MLXSW_REG_SBXX_DIR_INGRESS, 4},</div><div class='add'>+	{MLXSW_REG_SBXX_DIR_EGRESS, 4},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MLXSW_SP_SB_ING_TC_COUNT 8</div><div class='hunk'>@@ -93,6 +108,7 @@ struct mlxsw_sp_sb_vals {</div><div class='ctx'> 	unsigned int pool_count;</div><div class='ctx'> 	const struct mlxsw_sp_sb_pool_des *pool_dess;</div><div class='ctx'> 	const struct mlxsw_sp_sb_pm *pms;</div><div class='add'>+	const struct mlxsw_sp_sb_pm *pms_cpu;</div><div class='ctx'> 	const struct mlxsw_sp_sb_pr *prs;</div><div class='ctx'> 	const struct mlxsw_sp_sb_mm *mms;</div><div class='ctx'> 	const struct mlxsw_sp_sb_cm *cms_ingress;</div><div class='hunk'>@@ -274,7 +290,7 @@ static int mlxsw_sp_port_pb_init(struct mlxsw_sp_port *mlxsw_sp_port)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 pbs[] = {</div><div class='ctx'> 		[0] = MLXSW_SP_PB_HEADROOM * mlxsw_sp_port-&gt;mapping.width,</div><div class='del'>-		[9] = 2 * MLXSW_PORT_MAX_MTU,</div><div class='add'>+		[9] = MLXSW_PORT_MAX_MTU,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port-&gt;mlxsw_sp;</div><div class='ctx'> 	char pbmc_pl[MLXSW_REG_PBMC_LEN];</div><div class='hunk'>@@ -389,45 +405,60 @@ static void mlxsw_sp_sb_ports_fini(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> 		.size = _size,		\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define MLXSW_SP_SB_PR_EXT(_mode, _size, _freeze_mode, _freeze_size)	\</div><div class='add'>+	{								\</div><div class='add'>+		.mode = _mode,						\</div><div class='add'>+		.size = _size,						\</div><div class='add'>+		.freeze_mode = _freeze_mode,				\</div><div class='add'>+		.freeze_size = _freeze_size,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #define MLXSW_SP1_SB_PR_INGRESS_SIZE	12440000</div><div class='del'>-#define MLXSW_SP1_SB_PR_INGRESS_MNG_SIZE (200 * 1000)</div><div class='ctx'> #define MLXSW_SP1_SB_PR_EGRESS_SIZE	13232000</div><div class='add'>+#define MLXSW_SP1_SB_PR_CPU_SIZE	(256 * 1000)</div><div class='ctx'> </div><div class='add'>+/* Order according to mlxsw_sp1_sb_pool_dess */</div><div class='ctx'> static const struct mlxsw_sp_sb_pr mlxsw_sp1_sb_prs[] = {</div><div class='del'>-	/* Ingress pools. */</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='ctx'> 		       MLXSW_SP1_SB_PR_INGRESS_SIZE),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),</div><div class='del'>-	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='del'>-		       MLXSW_SP1_SB_PR_INGRESS_MNG_SIZE),</div><div class='del'>-	/* Egress pools. */</div><div class='del'>-	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='del'>-		       MLXSW_SP1_SB_PR_EGRESS_SIZE),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='add'>+			   MLXSW_SP1_SB_PR_EGRESS_SIZE, true, false),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),</div><div class='del'>-	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_STATIC, MLXSW_SP_SB_INFI,</div><div class='add'>+			   true, true),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='add'>+			   MLXSW_SP1_SB_PR_CPU_SIZE, true, false),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='add'>+			   MLXSW_SP1_SB_PR_CPU_SIZE, true, false),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MLXSW_SP2_SB_PR_INGRESS_SIZE	40960000</div><div class='del'>-#define MLXSW_SP2_SB_PR_INGRESS_MNG_SIZE (200 * 1000)</div><div class='ctx'> #define MLXSW_SP2_SB_PR_EGRESS_SIZE	40960000</div><div class='add'>+#define MLXSW_SP2_SB_PR_CPU_SIZE	(256 * 1000)</div><div class='ctx'> </div><div class='add'>+/* Order according to mlxsw_sp2_sb_pool_dess */</div><div class='ctx'> static const struct mlxsw_sp_sb_pr mlxsw_sp2_sb_prs[] = {</div><div class='del'>-	/* Ingress pools. */</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='ctx'> 		       MLXSW_SP2_SB_PR_INGRESS_SIZE),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, 0),</div><div class='del'>-	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='del'>-		       MLXSW_SP2_SB_PR_INGRESS_MNG_SIZE),</div><div class='del'>-	/* Egress pools. */</div><div class='del'>-	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='del'>-		       MLXSW_SP2_SB_PR_EGRESS_SIZE),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, 0),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='add'>+			   MLXSW_SP2_SB_PR_EGRESS_SIZE, true, false),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, 0),</div><div class='add'>+	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, 0),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_STATIC, MLXSW_SP_SB_INFI,</div><div class='add'>+			   true, true),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='add'>+			   MLXSW_SP2_SB_PR_CPU_SIZE, true, false),</div><div class='add'>+	MLXSW_SP_SB_PR_EXT(MLXSW_REG_SBPR_MODE_DYNAMIC,</div><div class='add'>+			   MLXSW_SP2_SB_PR_CPU_SIZE, true, false),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_sp_sb_prs_init(struct mlxsw_sp *mlxsw_sp,</div><div class='hunk'>@@ -462,83 +493,106 @@ static int mlxsw_sp_sb_prs_init(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 		.pool_index = _pool,			\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define MLXSW_SP_SB_CM_ING(_min_buff, _max_buff)	\</div><div class='add'>+	{						\</div><div class='add'>+		.min_buff = _min_buff,			\</div><div class='add'>+		.max_buff = _max_buff,			\</div><div class='add'>+		.pool_index = MLXSW_SP_SB_POOL_ING,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define MLXSW_SP_SB_CM_EGR(_min_buff, _max_buff)	\</div><div class='add'>+	{						\</div><div class='add'>+		.min_buff = _min_buff,			\</div><div class='add'>+		.max_buff = _max_buff,			\</div><div class='add'>+		.pool_index = MLXSW_SP_SB_POOL_EGR,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define MLXSW_SP_SB_CM_EGR_MC(_min_buff, _max_buff)	\</div><div class='add'>+	{						\</div><div class='add'>+		.min_buff = _min_buff,			\</div><div class='add'>+		.max_buff = _max_buff,			\</div><div class='add'>+		.pool_index = MLXSW_SP_SB_POOL_EGR_MC,	\</div><div class='add'>+		.freeze_pool = true,			\</div><div class='add'>+		.freeze_thresh = true,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> static const struct mlxsw_sp_sb_cm mlxsw_sp1_sb_cms_ingress[] = {</div><div class='del'>-	MLXSW_SP_SB_CM(10000, 8, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 0, 0), /* dummy, this PG does not exist */</div><div class='del'>-	MLXSW_SP_SB_CM(20000, 1, 3),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(10000, 8),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, 0), /* dummy, this PG does not exist */</div><div class='add'>+	MLXSW_SP_SB_CM(10000, 8, MLXSW_SP_SB_POOL_ING_CPU),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_sp_sb_cm mlxsw_sp2_sb_cms_ingress[] = {</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN, 0),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 0, 0), /* dummy, this PG does not exist */</div><div class='del'>-	MLXSW_SP_SB_CM(20000, 1, 3),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='add'>+	MLXSW_SP_SB_CM_ING(0, 0), /* dummy, this PG does not exist */</div><div class='add'>+	MLXSW_SP_SB_CM(10000, 8, MLXSW_SP_SB_POOL_ING_CPU),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_sp_sb_cm mlxsw_sp1_sb_cms_egress[] = {</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1500, 9, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(0, MLXSW_SP_SB_INFI, 8),</div><div class='del'>-	MLXSW_SP_SB_CM(1, 0xff, 4),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1500, 9),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1, 0xff),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_sp_sb_cm mlxsw_sp2_sb_cms_egress[] = {</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(0, 7, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(1, 0xff, 4),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(0, 7),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR_MC(0, MLXSW_SP_SB_INFI),</div><div class='add'>+	MLXSW_SP_SB_CM_EGR(1, 0xff),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MLXSW_SP_CPU_PORT_SB_CM MLXSW_SP_SB_CM(0, 0, 4)</div><div class='add'>+#define MLXSW_SP_CPU_PORT_SB_CM MLXSW_SP_SB_CM(0, 0, MLXSW_SP_SB_POOL_EGR_CPU)</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_sp_sb_cm mlxsw_sp_cpu_port_sb_cms[] = {</div><div class='ctx'> 	MLXSW_SP_CPU_PORT_SB_CM,</div><div class='del'>-	MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 4),</div><div class='del'>-	MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 4),</div><div class='add'>+	MLXSW_SP_SB_CM(1000, 8, MLXSW_SP_SB_POOL_EGR_CPU),</div><div class='add'>+	MLXSW_SP_SB_CM(1000, 8, MLXSW_SP_SB_POOL_EGR_CPU),</div><div class='add'>+	MLXSW_SP_SB_CM(1000, 8, MLXSW_SP_SB_POOL_EGR_CPU),</div><div class='add'>+	MLXSW_SP_SB_CM(1000, 8, MLXSW_SP_SB_POOL_EGR_CPU),</div><div class='add'>+	MLXSW_SP_SB_CM(1000, 8, MLXSW_SP_SB_POOL_EGR_CPU),</div><div class='ctx'> 	MLXSW_SP_CPU_PORT_SB_CM,</div><div class='del'>-	MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 4),</div><div class='add'>+	MLXSW_SP_SB_CM(1000, 8, MLXSW_SP_SB_POOL_EGR_CPU),</div><div class='ctx'> 	MLXSW_SP_CPU_PORT_SB_CM,</div><div class='ctx'> 	MLXSW_SP_CPU_PORT_SB_CM,</div><div class='ctx'> 	MLXSW_SP_CPU_PORT_SB_CM,</div><div class='hunk'>@@ -646,79 +700,116 @@ static int mlxsw_sp_cpu_port_sb_cms_init(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> 		.max_buff = _max_buff,		\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+/* Order according to mlxsw_sp1_sb_pool_dess */</div><div class='ctx'> static const struct mlxsw_sp_sb_pm mlxsw_sp1_sb_pms[] = {</div><div class='del'>-	/* Ingress pools. */</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MAX),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='del'>-	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MAX),</div><div class='del'>-	/* Egress pools. */</div><div class='add'>+	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 7),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> 	MLXSW_SP_SB_PM(10000, 90000),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 8),	/* 50% occupancy */</div><div class='add'>+	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Order according to mlxsw_sp2_sb_pool_dess */</div><div class='ctx'> static const struct mlxsw_sp_sb_pm mlxsw_sp2_sb_pms[] = {</div><div class='del'>-	/* Ingress pools. */</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 7),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 0),</div><div class='del'>-	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MAX),</div><div class='del'>-	/* Egress pools. */</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 7),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 0),</div><div class='ctx'> 	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(10000, 90000),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 8),	/* 50% occupancy */</div><div class='add'>+	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mlxsw_sp_port_sb_pms_init(struct mlxsw_sp_port *mlxsw_sp_port)</div><div class='add'>+/* Order according to mlxsw_sp*_sb_pool_dess */</div><div class='add'>+static const struct mlxsw_sp_sb_pm mlxsw_sp_cpu_port_sb_pms[] = {</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 90000),</div><div class='add'>+	MLXSW_SP_SB_PM(0, 0),</div><div class='add'>+	MLXSW_SP_SB_PM(0, MLXSW_REG_SBXX_DYN_MAX_BUFF_MAX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mlxsw_sp_sb_pms_init(struct mlxsw_sp *mlxsw_sp, u8 local_port,</div><div class='add'>+				const struct mlxsw_sp_sb_pm *pms,</div><div class='add'>+				bool skip_ingress)</div><div class='ctx'> {</div><div class='del'>-	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port-&gt;mlxsw_sp;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mlxsw_sp-&gt;sb_vals-&gt;pool_count; i++) {</div><div class='del'>-		const struct mlxsw_sp_sb_pm *pm = &amp;mlxsw_sp-&gt;sb_vals-&gt;pms[i];</div><div class='add'>+		const struct mlxsw_sp_sb_pm *pm = &amp;pms[i];</div><div class='add'>+		const struct mlxsw_sp_sb_pool_des *des;</div><div class='ctx'> 		u32 max_buff;</div><div class='ctx'> 		u32 min_buff;</div><div class='ctx'> </div><div class='add'>+		des = &amp;mlxsw_sp-&gt;sb_vals-&gt;pool_dess[i];</div><div class='add'>+		if (skip_ingress &amp;&amp; des-&gt;dir == MLXSW_REG_SBXX_DIR_INGRESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		min_buff = mlxsw_sp_bytes_cells(mlxsw_sp, pm-&gt;min_buff);</div><div class='ctx'> 		max_buff = pm-&gt;max_buff;</div><div class='ctx'> 		if (mlxsw_sp_sb_pool_is_static(mlxsw_sp, i))</div><div class='ctx'> 			max_buff = mlxsw_sp_bytes_cells(mlxsw_sp, max_buff);</div><div class='del'>-		err = mlxsw_sp_sb_pm_write(mlxsw_sp, mlxsw_sp_port-&gt;local_port,</div><div class='del'>-					   i, min_buff, max_buff);</div><div class='add'>+		err = mlxsw_sp_sb_pm_write(mlxsw_sp, local_port, i, min_buff,</div><div class='add'>+					   max_buff);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MLXSW_SP_SB_MM(_min_buff, _max_buff, _pool)	\</div><div class='add'>+static int mlxsw_sp_port_sb_pms_init(struct mlxsw_sp_port *mlxsw_sp_port)</div><div class='add'>+{</div><div class='add'>+	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port-&gt;mlxsw_sp;</div><div class='add'>+</div><div class='add'>+	return mlxsw_sp_sb_pms_init(mlxsw_sp, mlxsw_sp_port-&gt;local_port,</div><div class='add'>+				    mlxsw_sp-&gt;sb_vals-&gt;pms, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlxsw_sp_cpu_port_sb_pms_init(struct mlxsw_sp *mlxsw_sp)</div><div class='add'>+{</div><div class='add'>+	return mlxsw_sp_sb_pms_init(mlxsw_sp, 0, mlxsw_sp-&gt;sb_vals-&gt;pms_cpu,</div><div class='add'>+				    true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLXSW_SP_SB_MM(_min_buff, _max_buff)		\</div><div class='ctx'> 	{						\</div><div class='ctx'> 		.min_buff = _min_buff,			\</div><div class='ctx'> 		.max_buff = _max_buff,			\</div><div class='del'>-		.pool_index = _pool,			\</div><div class='add'>+		.pool_index = MLXSW_SP_SB_POOL_EGR,	\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> static const struct mlxsw_sp_sb_mm mlxsw_sp_sb_mms[] = {</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='del'>-	MLXSW_SP_SB_MM(0, 6, 4),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='add'>+	MLXSW_SP_SB_MM(0, 6),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_sp_sb_mms_init(struct mlxsw_sp *mlxsw_sp)</div><div class='hunk'>@@ -752,21 +843,22 @@ static void mlxsw_sp_pool_count(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; mlxsw_sp-&gt;sb_vals-&gt;pool_count; ++i)</div><div class='add'>+	for (i = 0; i &lt; mlxsw_sp-&gt;sb_vals-&gt;pool_count; ++i) {</div><div class='ctx'> 		if (mlxsw_sp-&gt;sb_vals-&gt;pool_dess[i].dir ==</div><div class='del'>-		    MLXSW_REG_SBXX_DIR_EGRESS)</div><div class='del'>-			goto out;</div><div class='del'>-	WARN(1, "No egress pools\n");</div><div class='add'>+		    MLXSW_REG_SBXX_DIR_INGRESS)</div><div class='add'>+			(*p_ingress_len)++;</div><div class='add'>+		else</div><div class='add'>+			(*p_egress_len)++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	*p_ingress_len = i;</div><div class='del'>-	*p_egress_len = mlxsw_sp-&gt;sb_vals-&gt;pool_count - i;</div><div class='add'>+	WARN(*p_egress_len == 0, "No egress pools\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct mlxsw_sp_sb_vals mlxsw_sp1_sb_vals = {</div><div class='ctx'> 	.pool_count = ARRAY_SIZE(mlxsw_sp1_sb_pool_dess),</div><div class='ctx'> 	.pool_dess = mlxsw_sp1_sb_pool_dess,</div><div class='ctx'> 	.pms = mlxsw_sp1_sb_pms,</div><div class='add'>+	.pms_cpu = mlxsw_sp_cpu_port_sb_pms,</div><div class='ctx'> 	.prs = mlxsw_sp1_sb_prs,</div><div class='ctx'> 	.mms = mlxsw_sp_sb_mms,</div><div class='ctx'> 	.cms_ingress = mlxsw_sp1_sb_cms_ingress,</div><div class='hunk'>@@ -782,6 +874,7 @@ const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals = {</div><div class='ctx'> 	.pool_count = ARRAY_SIZE(mlxsw_sp2_sb_pool_dess),</div><div class='ctx'> 	.pool_dess = mlxsw_sp2_sb_pool_dess,</div><div class='ctx'> 	.pms = mlxsw_sp2_sb_pms,</div><div class='add'>+	.pms_cpu = mlxsw_sp_cpu_port_sb_pms,</div><div class='ctx'> 	.prs = mlxsw_sp2_sb_prs,</div><div class='ctx'> 	.mms = mlxsw_sp_sb_mms,</div><div class='ctx'> 	.cms_ingress = mlxsw_sp2_sb_cms_ingress,</div><div class='hunk'>@@ -796,8 +889,8 @@ const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals = {</div><div class='ctx'> int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 max_headroom_size;</div><div class='del'>-	u16 ing_pool_count;</div><div class='del'>-	u16 eg_pool_count;</div><div class='add'>+	u16 ing_pool_count = 0;</div><div class='add'>+	u16 eg_pool_count = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!MLXSW_CORE_RES_VALID(mlxsw_sp-&gt;core, CELL_SIZE))</div><div class='hunk'>@@ -831,6 +924,9 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> 	err = mlxsw_sp_cpu_port_sb_cms_init(mlxsw_sp);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_sb_cpu_port_sb_cms_init;</div><div class='add'>+	err = mlxsw_sp_cpu_port_sb_pms_init(mlxsw_sp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_sb_cpu_port_pms_init;</div><div class='ctx'> 	err = mlxsw_sp_sb_mms_init(mlxsw_sp);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_sb_mms_init;</div><div class='hunk'>@@ -848,6 +944,7 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> </div><div class='ctx'> err_devlink_sb_register:</div><div class='ctx'> err_sb_mms_init:</div><div class='add'>+err_sb_cpu_port_pms_init:</div><div class='ctx'> err_sb_cpu_port_sb_cms_init:</div><div class='ctx'> err_sb_prs_init:</div><div class='ctx'> 	mlxsw_sp_sb_ports_fini(mlxsw_sp);</div><div class='hunk'>@@ -897,16 +994,32 @@ int mlxsw_sp_sb_pool_get(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> </div><div class='ctx'> int mlxsw_sp_sb_pool_set(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 			 unsigned int sb_index, u16 pool_index, u32 size,</div><div class='del'>-			 enum devlink_sb_threshold_type threshold_type)</div><div class='add'>+			 enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);</div><div class='ctx'> 	u32 pool_size = mlxsw_sp_bytes_cells(mlxsw_sp, size);</div><div class='add'>+	const struct mlxsw_sp_sb_pr *pr;</div><div class='ctx'> 	enum mlxsw_reg_sbpr_mode mode;</div><div class='ctx'> </div><div class='del'>-	if (size &gt; MLXSW_CORE_RES_GET(mlxsw_sp-&gt;core, MAX_BUFFER_SIZE))</div><div class='add'>+	mode = (enum mlxsw_reg_sbpr_mode) threshold_type;</div><div class='add'>+	pr = &amp;mlxsw_sp-&gt;sb_vals-&gt;prs[pool_index];</div><div class='add'>+</div><div class='add'>+	if (size &gt; MLXSW_CORE_RES_GET(mlxsw_sp-&gt;core, MAX_BUFFER_SIZE)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Exceeded shared buffer size");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pr-&gt;freeze_mode &amp;&amp; pr-&gt;mode != mode) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Changing this pool's threshold type is forbidden");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (pr-&gt;freeze_size &amp;&amp; pr-&gt;size != size) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Changing this pool's size is forbidden");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	mode = (enum mlxsw_reg_sbpr_mode) threshold_type;</div><div class='ctx'> 	return mlxsw_sp_sb_pr_write(mlxsw_sp, pool_index, mode,</div><div class='ctx'> 				    pool_size, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -924,7 +1037,8 @@ static u32 mlxsw_sp_sb_threshold_out(struct mlxsw_sp *mlxsw_sp, u16 pool_index,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_sp_sb_threshold_in(struct mlxsw_sp *mlxsw_sp, u16 pool_index,</div><div class='del'>-				    u32 threshold, u32 *p_max_buff)</div><div class='add'>+				    u32 threshold, u32 *p_max_buff,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp_sb_pr *pr = mlxsw_sp_sb_pr_get(mlxsw_sp, pool_index);</div><div class='ctx'> </div><div class='hunk'>@@ -933,8 +1047,10 @@ static int mlxsw_sp_sb_threshold_in(struct mlxsw_sp *mlxsw_sp, u16 pool_index,</div><div class='ctx'> </div><div class='ctx'> 		val = threshold + MLXSW_SP_SB_THRESHOLD_TO_ALPHA_OFFSET;</div><div class='ctx'> 		if (val &lt; MLXSW_REG_SBXX_DYN_MAX_BUFF_MIN ||</div><div class='del'>-		    val &gt; MLXSW_REG_SBXX_DYN_MAX_BUFF_MAX)</div><div class='add'>+		    val &gt; MLXSW_REG_SBXX_DYN_MAX_BUFF_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Invalid dynamic threshold value");</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		*p_max_buff = val;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*p_max_buff = mlxsw_sp_bytes_cells(mlxsw_sp, threshold);</div><div class='hunk'>@@ -960,7 +1076,7 @@ int mlxsw_sp_sb_port_pool_get(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> </div><div class='ctx'> int mlxsw_sp_sb_port_pool_set(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 			      unsigned int sb_index, u16 pool_index,</div><div class='del'>-			      u32 threshold)</div><div class='add'>+			      u32 threshold, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp_port *mlxsw_sp_port =</div><div class='ctx'> 			mlxsw_core_port_driver_priv(mlxsw_core_port);</div><div class='hunk'>@@ -970,7 +1086,7 @@ int mlxsw_sp_sb_port_pool_set(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlxsw_sp_sb_threshold_in(mlxsw_sp, pool_index,</div><div class='del'>-				       threshold, &amp;max_buff);</div><div class='add'>+				       threshold, &amp;max_buff, extack);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1001,22 +1117,41 @@ int mlxsw_sp_sb_tc_pool_bind_get(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> int mlxsw_sp_sb_tc_pool_bind_set(struct mlxsw_core_port *mlxsw_core_port,</div><div class='ctx'> 				 unsigned int sb_index, u16 tc_index,</div><div class='ctx'> 				 enum devlink_sb_pool_type pool_type,</div><div class='del'>-				 u16 pool_index, u32 threshold)</div><div class='add'>+				 u16 pool_index, u32 threshold,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sp_port *mlxsw_sp_port =</div><div class='ctx'> 			mlxsw_core_port_driver_priv(mlxsw_core_port);</div><div class='ctx'> 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port-&gt;mlxsw_sp;</div><div class='ctx'> 	u8 local_port = mlxsw_sp_port-&gt;local_port;</div><div class='add'>+	const struct mlxsw_sp_sb_cm *cm;</div><div class='ctx'> 	u8 pg_buff = tc_index;</div><div class='ctx'> 	enum mlxsw_reg_sbxx_dir dir = (enum mlxsw_reg_sbxx_dir) pool_type;</div><div class='ctx'> 	u32 max_buff;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (dir != mlxsw_sp-&gt;sb_vals-&gt;pool_dess[pool_index].dir)</div><div class='add'>+	if (dir != mlxsw_sp-&gt;sb_vals-&gt;pool_dess[pool_index].dir) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Binding egress TC to ingress pool and vice versa is forbidden");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dir == MLXSW_REG_SBXX_DIR_INGRESS)</div><div class='add'>+		cm = &amp;mlxsw_sp-&gt;sb_vals-&gt;cms_ingress[tc_index];</div><div class='add'>+	else</div><div class='add'>+		cm = &amp;mlxsw_sp-&gt;sb_vals-&gt;cms_egress[tc_index];</div><div class='add'>+</div><div class='add'>+	if (cm-&gt;freeze_pool &amp;&amp; cm-&gt;pool_index != pool_index) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Binding this TC to a different pool is forbidden");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cm-&gt;freeze_thresh &amp;&amp; cm-&gt;max_buff != threshold) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Changing this TC's threshold is forbidden");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlxsw_sp_sb_threshold_in(mlxsw_sp, pool_index,</div><div class='del'>-				       threshold, &amp;max_buff);</div><div class='add'>+				       threshold, &amp;max_buff, extack);</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/ethernet/mellanox/mlxsw/spectrum_dpipe.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h<br/>index e689576231ab..246dbb3c0e1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h</a></div><div class='hunk'>@@ -4,24 +4,9 @@</div><div class='ctx'> #ifndef _MLXSW_PIPELINE_H_</div><div class='ctx'> #define _MLXSW_PIPELINE_H_</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_NET_DEVLINK)</div><div class='del'>-</div><div class='ctx'> int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp);</div><div class='ctx'> void mlxsw_sp_dpipe_fini(struct mlxsw_sp *mlxsw_sp);</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp)</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 mlxsw_sp_dpipe_fini(struct mlxsw_sp *mlxsw_sp)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define MLXSW_SP_DPIPE_TABLE_NAME_ERIF "mlxsw_erif"</div><div class='ctx'> #define MLXSW_SP_DPIPE_TABLE_NAME_HOST4 "mlxsw_host4"</div><div class='ctx'> #define MLXSW_SP_DPIPE_TABLE_NAME_HOST6 "mlxsw_host6"</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c<br/>index 52fed8c7bf1e..1cda8a248b12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c</a></div><div class='hunk'>@@ -13,9 +13,9 @@</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/route.h&gt;</div><div class='ctx'> #include &lt;linux/gcd.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/if_macvlan.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;net/netevent.h&gt;</div><div class='ctx'> #include &lt;net/neighbour.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='hunk'>@@ -2371,7 +2371,7 @@ static enum mlxsw_reg_rauht_op mlxsw_sp_rauht_op(bool adding)</div><div class='ctx'> 			MLXSW_REG_RAUHT_OP_WRITE_DELETE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> mlxsw_sp_router_neigh_entry_op4(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				struct mlxsw_sp_neigh_entry *neigh_entry,</div><div class='ctx'> 				enum mlxsw_reg_rauht_op op)</div><div class='hunk'>@@ -2385,10 +2385,10 @@ mlxsw_sp_router_neigh_entry_op4(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 	if (neigh_entry-&gt;counter_valid)</div><div class='ctx'> 		mlxsw_reg_rauht_pack_counter(rauht_pl,</div><div class='ctx'> 					     neigh_entry-&gt;counter_index);</div><div class='del'>-	mlxsw_reg_write(mlxsw_sp-&gt;core, MLXSW_REG(rauht), rauht_pl);</div><div class='add'>+	return mlxsw_reg_write(mlxsw_sp-&gt;core, MLXSW_REG(rauht), rauht_pl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> mlxsw_sp_router_neigh_entry_op6(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				struct mlxsw_sp_neigh_entry *neigh_entry,</div><div class='ctx'> 				enum mlxsw_reg_rauht_op op)</div><div class='hunk'>@@ -2402,7 +2402,7 @@ mlxsw_sp_router_neigh_entry_op6(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 	if (neigh_entry-&gt;counter_valid)</div><div class='ctx'> 		mlxsw_reg_rauht_pack_counter(rauht_pl,</div><div class='ctx'> 					     neigh_entry-&gt;counter_index);</div><div class='del'>-	mlxsw_reg_write(mlxsw_sp-&gt;core, MLXSW_REG(rauht), rauht_pl);</div><div class='add'>+	return mlxsw_reg_write(mlxsw_sp-&gt;core, MLXSW_REG(rauht), rauht_pl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool mlxsw_sp_neigh_ipv6_ignore(struct mlxsw_sp_neigh_entry *neigh_entry)</div><div class='hunk'>@@ -2424,20 +2424,33 @@ mlxsw_sp_neigh_entry_update(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 			    struct mlxsw_sp_neigh_entry *neigh_entry,</div><div class='ctx'> 			    bool adding)</div><div class='ctx'> {</div><div class='add'>+	enum mlxsw_reg_rauht_op op = mlxsw_sp_rauht_op(adding);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!adding &amp;&amp; !neigh_entry-&gt;connected)</div><div class='ctx'> 		return;</div><div class='ctx'> 	neigh_entry-&gt;connected = adding;</div><div class='ctx'> 	if (neigh_entry-&gt;key.n-&gt;tbl-&gt;family == AF_INET) {</div><div class='del'>-		mlxsw_sp_router_neigh_entry_op4(mlxsw_sp, neigh_entry,</div><div class='del'>-						mlxsw_sp_rauht_op(adding));</div><div class='add'>+		err = mlxsw_sp_router_neigh_entry_op4(mlxsw_sp, neigh_entry,</div><div class='add'>+						      op);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='ctx'> 	} else if (neigh_entry-&gt;key.n-&gt;tbl-&gt;family == AF_INET6) {</div><div class='ctx'> 		if (mlxsw_sp_neigh_ipv6_ignore(neigh_entry))</div><div class='ctx'> 			return;</div><div class='del'>-		mlxsw_sp_router_neigh_entry_op6(mlxsw_sp, neigh_entry,</div><div class='del'>-						mlxsw_sp_rauht_op(adding));</div><div class='add'>+		err = mlxsw_sp_router_neigh_entry_op6(mlxsw_sp, neigh_entry,</div><div class='add'>+						      op);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (adding)</div><div class='add'>+		neigh_entry-&gt;key.n-&gt;flags |= NTF_OFFLOADED;</div><div class='add'>+	else</div><div class='add'>+		neigh_entry-&gt;key.n-&gt;flags &amp;= ~NTF_OFFLOADED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -2873,12 +2886,13 @@ mlxsw_sp_nexthop6_group_cmp(const struct mlxsw_sp_nexthop_group *nh_grp,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(mlxsw_sp_rt6, &amp;fib6_entry-&gt;rt6_list, list) {</div><div class='add'>+		struct fib6_nh *fib6_nh = &amp;mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh;</div><div class='ctx'> 		struct in6_addr *gw;</div><div class='ctx'> 		int ifindex, weight;</div><div class='ctx'> </div><div class='del'>-		ifindex = mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.nh_dev-&gt;ifindex;</div><div class='del'>-		weight = mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.nh_weight;</div><div class='del'>-		gw = &amp;mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.nh_gw;</div><div class='add'>+		ifindex = fib6_nh-&gt;fib_nh_dev-&gt;ifindex;</div><div class='add'>+		weight = fib6_nh-&gt;fib_nh_weight;</div><div class='add'>+		gw = &amp;fib6_nh-&gt;fib_nh_gw6;</div><div class='ctx'> 		if (!mlxsw_sp_nexthop6_group_has_nexthop(nh_grp, gw, ifindex,</div><div class='ctx'> 							 weight))</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -2944,7 +2958,7 @@ mlxsw_sp_nexthop6_group_hash(struct mlxsw_sp_fib6_entry *fib6_entry, u32 seed)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(mlxsw_sp_rt6, &amp;fib6_entry-&gt;rt6_list, list) {</div><div class='del'>-		dev = mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.nh_dev;</div><div class='add'>+		dev = mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.fib_nh_dev;</div><div class='ctx'> 		val ^= dev-&gt;ifindex;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3610,7 +3624,7 @@ static bool mlxsw_sp_nexthop4_ipip_type(const struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 					const struct fib_nh *fib_nh,</div><div class='ctx'> 					enum mlxsw_sp_ipip_type *p_ipipt)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = fib_nh-&gt;nh_dev;</div><div class='add'>+	struct net_device *dev = fib_nh-&gt;fib_nh_dev;</div><div class='ctx'> </div><div class='ctx'> 	return dev &amp;&amp;</div><div class='ctx'> 	       fib_nh-&gt;nh_parent-&gt;fib_type == RTN_UNICAST &amp;&amp;</div><div class='hunk'>@@ -3637,7 +3651,7 @@ static int mlxsw_sp_nexthop4_type_init(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				       struct fib_nh *fib_nh)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mlxsw_sp_ipip_ops *ipip_ops;</div><div class='del'>-	struct net_device *dev = fib_nh-&gt;nh_dev;</div><div class='add'>+	struct net_device *dev = fib_nh-&gt;fib_nh_dev;</div><div class='ctx'> 	struct mlxsw_sp_ipip_entry *ipip_entry;</div><div class='ctx'> 	struct mlxsw_sp_rif *rif;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -3681,18 +3695,18 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				  struct mlxsw_sp_nexthop *nh,</div><div class='ctx'> 				  struct fib_nh *fib_nh)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = fib_nh-&gt;nh_dev;</div><div class='add'>+	struct net_device *dev = fib_nh-&gt;fib_nh_dev;</div><div class='ctx'> 	struct in_device *in_dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	nh-&gt;nh_grp = nh_grp;</div><div class='ctx'> 	nh-&gt;key.fib_nh = fib_nh;</div><div class='ctx'> #ifdef CONFIG_IP_ROUTE_MULTIPATH</div><div class='del'>-	nh-&gt;nh_weight = fib_nh-&gt;nh_weight;</div><div class='add'>+	nh-&gt;nh_weight = fib_nh-&gt;fib_nh_weight;</div><div class='ctx'> #else</div><div class='ctx'> 	nh-&gt;nh_weight = 1;</div><div class='ctx'> #endif</div><div class='del'>-	memcpy(&amp;nh-&gt;gw_addr, &amp;fib_nh-&gt;nh_gw, sizeof(fib_nh-&gt;nh_gw));</div><div class='add'>+	memcpy(&amp;nh-&gt;gw_addr, &amp;fib_nh-&gt;fib_nh_gw4, sizeof(fib_nh-&gt;fib_nh_gw4));</div><div class='ctx'> 	err = mlxsw_sp_nexthop_insert(mlxsw_sp, nh);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -3705,7 +3719,7 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> </div><div class='ctx'> 	in_dev = __in_dev_get_rtnl(dev);</div><div class='ctx'> 	if (in_dev &amp;&amp; IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &amp;&amp;</div><div class='del'>-	    fib_nh-&gt;nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='add'>+	    fib_nh-&gt;fib_nh_flags &amp; RTNH_F_LINKDOWN)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	err = mlxsw_sp_nexthop4_type_init(mlxsw_sp, nh, fib_nh);</div><div class='hunk'>@@ -3804,7 +3818,7 @@ static void mlxsw_sp_nexthop_rif_gone_sync(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> static bool mlxsw_sp_fi_is_gateway(const struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				   const struct fib_info *fi)</div><div class='ctx'> {</div><div class='del'>-	return fi-&gt;fib_nh-&gt;nh_scope == RT_SCOPE_LINK ||</div><div class='add'>+	return fi-&gt;fib_nh-&gt;fib_nh_scope == RT_SCOPE_LINK ||</div><div class='ctx'> 	       mlxsw_sp_nexthop4_ipip_type(mlxsw_sp, fi-&gt;fib_nh, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3946,9 +3960,9 @@ mlxsw_sp_rt6_nexthop(struct mlxsw_sp_nexthop_group *nh_grp,</div><div class='ctx'> 		struct mlxsw_sp_nexthop *nh = &amp;nh_grp-&gt;nexthops[i];</div><div class='ctx'> 		struct fib6_info *rt = mlxsw_sp_rt6-&gt;rt;</div><div class='ctx'> </div><div class='del'>-		if (nh-&gt;rif &amp;&amp; nh-&gt;rif-&gt;dev == rt-&gt;fib6_nh.nh_dev &amp;&amp;</div><div class='add'>+		if (nh-&gt;rif &amp;&amp; nh-&gt;rif-&gt;dev == rt-&gt;fib6_nh.fib_nh_dev &amp;&amp;</div><div class='ctx'> 		    ipv6_addr_equal((const struct in6_addr *) &amp;nh-&gt;gw_addr,</div><div class='del'>-				    &amp;rt-&gt;fib6_nh.nh_gw))</div><div class='add'>+				    &amp;rt-&gt;fib6_nh.fib_nh_gw6))</div><div class='ctx'> 			return nh;</div><div class='ctx'> 		continue;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3966,7 +3980,7 @@ mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)</div><div class='ctx'> 	    fib_entry-&gt;type == MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE ||</div><div class='ctx'> 	    fib_entry-&gt;type == MLXSW_SP_FIB_ENTRY_TYPE_IPIP_DECAP ||</div><div class='ctx'> 	    fib_entry-&gt;type == MLXSW_SP_FIB_ENTRY_TYPE_NVE_DECAP) {</div><div class='del'>-		nh_grp-&gt;nexthops-&gt;key.fib_nh-&gt;nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+		nh_grp-&gt;nexthops-&gt;key.fib_nh-&gt;fib_nh_flags |= RTNH_F_OFFLOAD;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3974,9 +3988,9 @@ mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)</div><div class='ctx'> 		struct mlxsw_sp_nexthop *nh = &amp;nh_grp-&gt;nexthops[i];</div><div class='ctx'> </div><div class='ctx'> 		if (nh-&gt;offloaded)</div><div class='del'>-			nh-&gt;key.fib_nh-&gt;nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+			nh-&gt;key.fib_nh-&gt;fib_nh_flags |= RTNH_F_OFFLOAD;</div><div class='ctx'> 		else</div><div class='del'>-			nh-&gt;key.fib_nh-&gt;nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='add'>+			nh-&gt;key.fib_nh-&gt;fib_nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3992,7 +4006,7 @@ mlxsw_sp_fib4_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry)</div><div class='ctx'> 	for (i = 0; i &lt; nh_grp-&gt;count; i++) {</div><div class='ctx'> 		struct mlxsw_sp_nexthop *nh = &amp;nh_grp-&gt;nexthops[i];</div><div class='ctx'> </div><div class='del'>-		nh-&gt;key.fib_nh-&gt;nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='add'>+		nh-&gt;key.fib_nh-&gt;fib_nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4008,19 +4022,20 @@ mlxsw_sp_fib6_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)</div><div class='ctx'> 	if (fib_entry-&gt;type == MLXSW_SP_FIB_ENTRY_TYPE_LOCAL ||</div><div class='ctx'> 	    fib_entry-&gt;type == MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE) {</div><div class='ctx'> 		list_first_entry(&amp;fib6_entry-&gt;rt6_list, struct mlxsw_sp_rt6,</div><div class='del'>-				 list)-&gt;rt-&gt;fib6_nh.nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+				 list)-&gt;rt-&gt;fib6_nh.fib_nh_flags |= RTNH_F_OFFLOAD;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(mlxsw_sp_rt6, &amp;fib6_entry-&gt;rt6_list, list) {</div><div class='ctx'> 		struct mlxsw_sp_nexthop_group *nh_grp = fib_entry-&gt;nh_group;</div><div class='add'>+		struct fib6_nh *fib6_nh = &amp;mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh;</div><div class='ctx'> 		struct mlxsw_sp_nexthop *nh;</div><div class='ctx'> </div><div class='ctx'> 		nh = mlxsw_sp_rt6_nexthop(nh_grp, mlxsw_sp_rt6);</div><div class='ctx'> 		if (nh &amp;&amp; nh-&gt;offloaded)</div><div class='del'>-			mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+			fib6_nh-&gt;fib_nh_flags |= RTNH_F_OFFLOAD;</div><div class='ctx'> 		else</div><div class='del'>-			mlxsw_sp_rt6-&gt;rt-&gt;fib6_nh.nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='add'>+			fib6_nh-&gt;fib_nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4035,7 +4050,7 @@ mlxsw_sp_fib6_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry)</div><div class='ctx'> 	list_for_each_entry(mlxsw_sp_rt6, &amp;fib6_entry-&gt;rt6_list, list) {</div><div class='ctx'> 		struct fib6_info *rt = mlxsw_sp_rt6-&gt;rt;</div><div class='ctx'> </div><div class='del'>-		rt-&gt;fib6_nh.nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='add'>+		rt-&gt;fib6_nh.fib_nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4913,7 +4928,7 @@ static void mlxsw_sp_rt6_destroy(struct mlxsw_sp_rt6 *mlxsw_sp_rt6)</div><div class='ctx'> static bool mlxsw_sp_fib6_rt_can_mp(const struct fib6_info *rt)</div><div class='ctx'> {</div><div class='ctx'> 	/* RTF_CACHE routes are ignored */</div><div class='del'>-	return (rt-&gt;fib6_flags &amp; (RTF_GATEWAY | RTF_ADDRCONF)) == RTF_GATEWAY;</div><div class='add'>+	return !(rt-&gt;fib6_flags &amp; RTF_ADDRCONF) &amp;&amp; rt-&gt;fib6_nh.fib_nh_gw_family;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fib6_info *</div><div class='hunk'>@@ -4972,8 +4987,8 @@ static bool mlxsw_sp_nexthop6_ipip_type(const struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 					const struct fib6_info *rt,</div><div class='ctx'> 					enum mlxsw_sp_ipip_type *ret)</div><div class='ctx'> {</div><div class='del'>-	return rt-&gt;fib6_nh.nh_dev &amp;&amp;</div><div class='del'>-	       mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt-&gt;fib6_nh.nh_dev, ret);</div><div class='add'>+	return rt-&gt;fib6_nh.fib_nh_dev &amp;&amp;</div><div class='add'>+	       mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt-&gt;fib6_nh.fib_nh_dev, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,</div><div class='hunk'>@@ -4983,7 +4998,7 @@ static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> {</div><div class='ctx'> 	const struct mlxsw_sp_ipip_ops *ipip_ops;</div><div class='ctx'> 	struct mlxsw_sp_ipip_entry *ipip_entry;</div><div class='del'>-	struct net_device *dev = rt-&gt;fib6_nh.nh_dev;</div><div class='add'>+	struct net_device *dev = rt-&gt;fib6_nh.fib_nh_dev;</div><div class='ctx'> 	struct mlxsw_sp_rif *rif;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -5026,11 +5041,11 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				  struct mlxsw_sp_nexthop *nh,</div><div class='ctx'> 				  const struct fib6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = rt-&gt;fib6_nh.nh_dev;</div><div class='add'>+	struct net_device *dev = rt-&gt;fib6_nh.fib_nh_dev;</div><div class='ctx'> </div><div class='ctx'> 	nh-&gt;nh_grp = nh_grp;</div><div class='del'>-	nh-&gt;nh_weight = rt-&gt;fib6_nh.nh_weight;</div><div class='del'>-	memcpy(&amp;nh-&gt;gw_addr, &amp;rt-&gt;fib6_nh.nh_gw, sizeof(nh-&gt;gw_addr));</div><div class='add'>+	nh-&gt;nh_weight = rt-&gt;fib6_nh.fib_nh_weight;</div><div class='add'>+	memcpy(&amp;nh-&gt;gw_addr, &amp;rt-&gt;fib6_nh.fib_nh_gw6, sizeof(nh-&gt;gw_addr));</div><div class='ctx'> 	mlxsw_sp_nexthop_counter_alloc(mlxsw_sp, nh);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;nh-&gt;router_list_node, &amp;mlxsw_sp-&gt;router-&gt;nexthop_list);</div><div class='hunk'>@@ -5053,7 +5068,7 @@ static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 				    const struct fib6_info *rt)</div><div class='ctx'> {</div><div class='del'>-	return rt-&gt;fib6_flags &amp; RTF_GATEWAY ||</div><div class='add'>+	return rt-&gt;fib6_nh.fib_nh_gw_family ||</div><div class='ctx'> 	       mlxsw_sp_nexthop6_ipip_type(mlxsw_sp, rt, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6035,6 +6050,10 @@ static int mlxsw_sp_router_fib_rule_event(unsigned long event,</div><div class='ctx'> 	fr_info = container_of(info, struct fib_rule_notifier_info, info);</div><div class='ctx'> 	rule = fr_info-&gt;rule;</div><div class='ctx'> </div><div class='add'>+	/* Rule only affects locally generated traffic */</div><div class='add'>+	if (rule-&gt;iifindex == info-&gt;net-&gt;loopback_dev-&gt;ifindex)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	switch (info-&gt;family) {</div><div class='ctx'> 	case AF_INET:</div><div class='ctx'> 		if (!fib4_rule_default(rule) &amp;&amp; !rule-&gt;l3mdev)</div><div class='hunk'>@@ -6086,10 +6105,20 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb,</div><div class='ctx'> 			return notifier_from_errno(err);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FIB_EVENT_ENTRY_ADD:</div><div class='add'>+	case FIB_EVENT_ENTRY_REPLACE: /* fall through */</div><div class='add'>+	case FIB_EVENT_ENTRY_APPEND:  /* fall through */</div><div class='ctx'> 		if (router-&gt;aborted) {</div><div class='ctx'> 			NL_SET_ERR_MSG_MOD(info-&gt;extack, "FIB offload was aborted. Not configuring route");</div><div class='ctx'> 			return notifier_from_errno(-EINVAL);</div><div class='ctx'> 		}</div><div class='add'>+		if (info-&gt;family == AF_INET) {</div><div class='add'>+			struct fib_entry_notifier_info *fen_info = ptr;</div><div class='add'>+</div><div class='add'>+			if (fen_info-&gt;fi-&gt;fib_nh_is_v6) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(info-&gt;extack, "IPv6 gateway with IPv4 route is not supported");</div><div class='add'>+				return notifier_from_errno(-EINVAL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6781,7 +6810,7 @@ static int mlxsw_sp_router_port_check_rif_addr(struct mlxsw_sp *mlxsw_sp,</div><div class='ctx'> 	/* A RIF is not created for macvlan netdevs. Their MAC is used to</div><div class='ctx'> 	 * populate the FDB</div><div class='ctx'> 	 */</div><div class='del'>-	if (netif_is_macvlan(dev))</div><div class='add'>+	if (netif_is_macvlan(dev) || netif_is_l3_master(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MLXSW_CORE_RES_GET(mlxsw_sp-&gt;core, MAX_RIFS); i++) {</div><div class='hunk'>@@ -7808,7 +7837,7 @@ static int mlxsw_sp_mp_hash_init(struct mlxsw_sp *mlxsw_sp)</div><div class='ctx'> 	char recr2_pl[MLXSW_REG_RECR2_LEN];</div><div class='ctx'> 	u32 seed;</div><div class='ctx'> </div><div class='del'>-	get_random_bytes(&amp;seed, sizeof(seed));</div><div class='add'>+	seed = jhash(mlxsw_sp-&gt;base_mac, sizeof(mlxsw_sp-&gt;base_mac), 0);</div><div class='ctx'> 	mlxsw_reg_recr2_pack(recr2_pl, seed);</div><div class='ctx'> 	mlxsw_sp_mp4_hash_init(recr2_pl);</div><div class='ctx'> 	mlxsw_sp_mp6_hash_init(recr2_pl);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c<br/>index 536c23c578c3..560a60e522f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c</a></div><div class='hunk'>@@ -316,7 +316,11 @@ mlxsw_sp_span_gretap4_route(const struct net_device *to_dev,</div><div class='ctx'> </div><div class='ctx'> 	dev = rt-&gt;dst.dev;</div><div class='ctx'> 	*saddrp = fl4.saddr;</div><div class='del'>-	*daddrp = rt-&gt;rt_gateway;</div><div class='add'>+	if (rt-&gt;rt_gw_family == AF_INET)</div><div class='add'>+		*daddrp = rt-&gt;rt_gw4;</div><div class='add'>+	/* can not offload if route has an IPv6 gateway */</div><div class='add'>+	else if (rt-&gt;rt_gw_family == AF_INET6)</div><div class='add'>+		dev = NULL;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c<br/>index f6ce386c3036..50111f228d77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c</a></div><div class='hunk'>@@ -1630,7 +1630,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,</div><div class='ctx'> 	u16 fid_index;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (switchdev_trans_ph_prepare(trans))</div><div class='add'>+	if (switchdev_trans_ph_commit(trans))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp-&gt;bridge, orig_dev);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchib.c b/drivers/net/ethernet/mellanox/mlxsw/switchib.c<br/>index bcf2e79a21c8..0d9356b3f65d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/switchib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/switchib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/switchib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/switchib.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@ struct mlxsw_sib {</div><div class='ctx'> 	struct mlxsw_sib_port **ports;</div><div class='ctx'> 	struct mlxsw_core *core;</div><div class='ctx'> 	const struct mlxsw_bus_info *bus_info;</div><div class='add'>+	u8 hw_id[ETH_ALEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlxsw_sib_port {</div><div class='hunk'>@@ -102,6 +103,18 @@ mlxsw_sib_tx_v1_hdr_construct(struct sk_buff *skb,</div><div class='ctx'> 	mlxsw_tx_v1_hdr_type_set(txhdr, MLXSW_TXHDR_TYPE_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlxsw_sib_hw_id_get(struct mlxsw_sib *mlxsw_sib)</div><div class='add'>+{</div><div class='add'>+	char spad_pl[MLXSW_REG_SPAD_LEN] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mlxsw_reg_query(mlxsw_sib-&gt;core, MLXSW_REG(spad), spad_pl);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	mlxsw_reg_spad_base_mac_memcpy_from(spad_pl, mlxsw_sib-&gt;hw_id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mlxsw_sib_port_admin_status_set(struct mlxsw_sib_port *mlxsw_sib_port,</div><div class='ctx'> 				bool is_up)</div><div class='hunk'>@@ -267,7 +280,9 @@ static int mlxsw_sib_port_create(struct mlxsw_sib *mlxsw_sib, u8 local_port,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mlxsw_core_port_init(mlxsw_sib-&gt;core, local_port);</div><div class='add'>+	err = mlxsw_core_port_init(mlxsw_sib-&gt;core, local_port,</div><div class='add'>+				   module + 1, false, 0,</div><div class='add'>+				   mlxsw_sib-&gt;hw_id, sizeof(mlxsw_sib-&gt;hw_id));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_sib-&gt;bus_info-&gt;dev, "Port %d: Failed to init core port\n",</div><div class='ctx'> 			local_port);</div><div class='hunk'>@@ -439,6 +454,12 @@ static int mlxsw_sib_init(struct mlxsw_core *mlxsw_core,</div><div class='ctx'> 	mlxsw_sib-&gt;core = mlxsw_core;</div><div class='ctx'> 	mlxsw_sib-&gt;bus_info = mlxsw_bus_info;</div><div class='ctx'> </div><div class='add'>+	err = mlxsw_sib_hw_id_get(mlxsw_sib);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mlxsw_sib-&gt;bus_info-&gt;dev, "Failed to get switch HW ID\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = mlxsw_sib_ports_create(mlxsw_sib);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_sib-&gt;bus_info-&gt;dev, "Failed to create ports\n");</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c<br/>index 533fe6235b7c..fc4f19167262 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/switchx2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mellanox/mlxsw/switchx2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/switchx2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mellanox/mlxsw/switchx2.c</a></div><div class='hunk'>@@ -379,26 +379,14 @@ mlxsw_sx_port_get_stats64(struct net_device *dev,</div><div class='ctx'> 	stats-&gt;tx_dropped	= tx_dropped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlxsw_sx_port_get_phys_port_name(struct net_device *dev, char *name,</div><div class='del'>-					    size_t len)</div><div class='del'>-{</div><div class='del'>-	struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	return mlxsw_core_port_get_phys_port_name(mlxsw_sx_port-&gt;mlxsw_sx-&gt;core,</div><div class='del'>-						  mlxsw_sx_port-&gt;local_port,</div><div class='del'>-						  name, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mlxsw_sx_port_get_port_parent_id(struct net_device *dev,</div><div class='del'>-					    struct netdev_phys_item_id *ppid)</div><div class='add'>+static struct devlink_port *</div><div class='add'>+mlxsw_sx_port_get_devlink_port(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev);</div><div class='ctx'> 	struct mlxsw_sx *mlxsw_sx = mlxsw_sx_port-&gt;mlxsw_sx;</div><div class='ctx'> </div><div class='del'>-	ppid-&gt;id_len = sizeof(mlxsw_sx-&gt;hw_id);</div><div class='del'>-	memcpy(&amp;ppid-&gt;id, &amp;mlxsw_sx-&gt;hw_id, ppid-&gt;id_len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return mlxsw_core_port_devlink_port_get(mlxsw_sx-&gt;core,</div><div class='add'>+						mlxsw_sx_port-&gt;local_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops mlxsw_sx_port_netdev_ops = {</div><div class='hunk'>@@ -407,8 +395,7 @@ static const struct net_device_ops mlxsw_sx_port_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= mlxsw_sx_port_xmit,</div><div class='ctx'> 	.ndo_change_mtu		= mlxsw_sx_port_change_mtu,</div><div class='ctx'> 	.ndo_get_stats64	= mlxsw_sx_port_get_stats64,</div><div class='del'>-	.ndo_get_phys_port_name = mlxsw_sx_port_get_phys_port_name,</div><div class='del'>-	.ndo_get_port_parent_id	= mlxsw_sx_port_get_port_parent_id,</div><div class='add'>+	.ndo_get_devlink_port	= mlxsw_sx_port_get_devlink_port,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void mlxsw_sx_port_get_drvinfo(struct net_device *dev,</div><div class='hunk'>@@ -1102,7 +1089,7 @@ static int __mlxsw_sx_port_eth_create(struct mlxsw_sx *mlxsw_sx, u8 local_port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mlxsw_core_port_eth_set(mlxsw_sx-&gt;core, mlxsw_sx_port-&gt;local_port,</div><div class='del'>-				mlxsw_sx_port, dev, module + 1, false, 0);</div><div class='add'>+				mlxsw_sx_port, dev);</div><div class='ctx'> 	mlxsw_sx-&gt;ports[local_port] = mlxsw_sx_port;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1114,9 @@ static int mlxsw_sx_port_eth_create(struct mlxsw_sx *mlxsw_sx, u8 local_port,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mlxsw_core_port_init(mlxsw_sx-&gt;core, local_port);</div><div class='add'>+	err = mlxsw_core_port_init(mlxsw_sx-&gt;core, local_port,</div><div class='add'>+				   module + 1, false, 0,</div><div class='add'>+				   mlxsw_sx-&gt;hw_id, sizeof(mlxsw_sx-&gt;hw_id));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(mlxsw_sx-&gt;bus_info-&gt;dev, "Port %d: Failed to init core port\n",</div><div class='ctx'> 			local_port);</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c<br/>index bd6e9014bc74..b44172a901ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/micrel/ks8851.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/micrel/ks8851.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/micrel/ks8851.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/micrel/ks8851.c</a></div><div class='hunk'>@@ -142,6 +142,12 @@ struct ks8851_net {</div><div class='ctx'> </div><div class='ctx'> static int msg_enable;</div><div class='ctx'> </div><div class='add'>+/* SPI frame opcodes */</div><div class='add'>+#define KS_SPIOP_RD	(0x00)</div><div class='add'>+#define KS_SPIOP_WR	(0x40)</div><div class='add'>+#define KS_SPIOP_RXFIFO	(0x80)</div><div class='add'>+#define KS_SPIOP_TXFIFO	(0xC0)</div><div class='add'>+</div><div class='ctx'> /* shift for byte-enable data */</div><div class='ctx'> #define BYTE_EN(_x)	((_x) &lt;&lt; 2)</div><div class='ctx'> </div><div class='hunk'>@@ -419,7 +425,7 @@ static void ks8851_init_mac(struct ks8851_net *ks)</div><div class='ctx'> 	const u8 *mac_addr;</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(ks-&gt;spidev-&gt;dev.of_node);</div><div class='del'>-	if (mac_addr) {</div><div class='add'>+	if (!IS_ERR(mac_addr)) {</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> 		ks8851_write_mac_addr(dev);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -535,9 +541,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)</div><div class='ctx'> 		/* set dma read address */</div><div class='ctx'> 		ks8851_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI | 0x00);</div><div class='ctx'> </div><div class='del'>-		/* start the packet dma process, and set auto-dequeue rx */</div><div class='del'>-		ks8851_wrreg16(ks, KS_RXQCR,</div><div class='del'>-			       ks-&gt;rc_rxqcr | RXQCR_SDA | RXQCR_ADRFE);</div><div class='add'>+		/* start DMA access */</div><div class='add'>+		ks8851_wrreg16(ks, KS_RXQCR, ks-&gt;rc_rxqcr | RXQCR_SDA);</div><div class='ctx'> </div><div class='ctx'> 		if (rxlen &gt; 4) {</div><div class='ctx'> 			unsigned int rxalign;</div><div class='hunk'>@@ -568,7 +573,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ks8851_wrreg16(ks, KS_RXQCR, ks-&gt;rc_rxqcr);</div><div class='add'>+		/* end DMA access and dequeue packet */</div><div class='add'>+		ks8851_wrreg16(ks, KS_RXQCR, ks-&gt;rc_rxqcr | RXQCR_RRXEF);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -785,6 +791,15 @@ static void ks8851_tx_work(struct work_struct *work)</div><div class='ctx'> static int ks8851_net_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ks8851_net *ks = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(dev-&gt;irq, NULL, ks8851_irq,</div><div class='add'>+				   IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='add'>+				   dev-&gt;name, ks);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(dev, "failed to get irq\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* lock the card, even if we may not actually be doing anything</div><div class='ctx'> 	 * else at the moment */</div><div class='hunk'>@@ -849,6 +864,7 @@ static int ks8851_net_open(struct net_device *dev)</div><div class='ctx'> 	netif_dbg(ks, ifup, ks-&gt;netdev, "network device up\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ks-&gt;lock);</div><div class='add'>+	mii_check_link(&amp;ks-&gt;mii);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -899,6 +915,8 @@ static int ks8851_net_stop(struct net_device *dev)</div><div class='ctx'> 		dev_kfree_skb(txb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	free_irq(dev-&gt;irq, ks);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1508,6 +1526,7 @@ static int ks8851_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	spi_set_drvdata(spi, ks);</div><div class='ctx'> </div><div class='add'>+	netif_carrier_off(ks-&gt;netdev);</div><div class='ctx'> 	ndev-&gt;if_port = IF_PORT_100BASET;</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;ks8851_netdev_ops;</div><div class='ctx'> 	ndev-&gt;irq = spi-&gt;irq;</div><div class='hunk'>@@ -1529,14 +1548,6 @@ static int ks8851_probe(struct spi_device *spi)</div><div class='ctx'> 	ks8851_read_selftest(ks);</div><div class='ctx'> 	ks8851_init_mac(ks);</div><div class='ctx'> </div><div class='del'>-	ret = request_threaded_irq(spi-&gt;irq, NULL, ks8851_irq,</div><div class='del'>-				   IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='del'>-				   ndev-&gt;name, ks);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "failed to get irq\n");</div><div class='del'>-		goto err_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = register_netdev(ndev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "failed to register network device\n");</div><div class='hunk'>@@ -1549,14 +1560,10 @@ static int ks8851_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> err_netdev:</div><div class='del'>-	free_irq(ndev-&gt;irq, ks);</div><div class='del'>-</div><div class='del'>-err_irq:</div><div class='add'>+err_id:</div><div class='ctx'> 	if (gpio_is_valid(gpio))</div><div class='ctx'> 		gpio_set_value(gpio, 0);</div><div class='del'>-err_id:</div><div class='ctx'> 	regulator_disable(ks-&gt;vdd_reg);</div><div class='ctx'> err_reg:</div><div class='ctx'> 	regulator_disable(ks-&gt;vdd_io);</div><div class='hunk'>@@ -1574,7 +1581,6 @@ static int ks8851_remove(struct spi_device *spi)</div><div class='ctx'> 		dev_info(&amp;spi-&gt;dev, "remove\n");</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(priv-&gt;netdev);</div><div class='del'>-	free_irq(spi-&gt;irq, priv);</div><div class='ctx'> 	if (gpio_is_valid(priv-&gt;gpio))</div><div class='ctx'> 		gpio_set_value(priv-&gt;gpio, 0);</div><div class='ctx'> 	regulator_disable(priv-&gt;vdd_reg);</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h<br/>index 852256ef1f22..23da1e3ee429 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/micrel/ks8851.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/micrel/ks8851.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/micrel/ks8851.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/micrel/ks8851.h</a></div><div class='hunk'>@@ -11,9 +11,15 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define KS_CCR					0x08</div><div class='add'>+#define CCR_LE					(1 &lt;&lt; 10)   /* KSZ8851-16MLL */</div><div class='ctx'> #define CCR_EEPROM				(1 &lt;&lt; 9)</div><div class='del'>-#define CCR_SPI					(1 &lt;&lt; 8)</div><div class='del'>-#define CCR_32PIN				(1 &lt;&lt; 0)</div><div class='add'>+#define CCR_SPI					(1 &lt;&lt; 8)    /* KSZ8851SNL    */</div><div class='add'>+#define CCR_8BIT				(1 &lt;&lt; 7)    /* KSZ8851-16MLL */</div><div class='add'>+#define CCR_16BIT				(1 &lt;&lt; 6)    /* KSZ8851-16MLL */</div><div class='add'>+#define CCR_32BIT				(1 &lt;&lt; 5)    /* KSZ8851-16MLL */</div><div class='add'>+#define CCR_SHARED				(1 &lt;&lt; 4)    /* KSZ8851-16MLL */</div><div class='add'>+#define CCR_48PIN				(1 &lt;&lt; 1)    /* KSZ8851-16MLL */</div><div class='add'>+#define CCR_32PIN				(1 &lt;&lt; 0)    /* KSZ8851SNL    */</div><div class='ctx'> </div><div class='ctx'> /* MAC address registers */</div><div class='ctx'> #define KS_MAR(_m)				(0x15 - (_m))</div><div class='hunk'>@@ -112,13 +118,13 @@</div><div class='ctx'> #define RXCR1_RXE				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define KS_RXCR2				0x76</div><div class='del'>-#define RXCR2_SRDBL_MASK			(0x7 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_SHIFT			(5)</div><div class='del'>-#define RXCR2_SRDBL_4B				(0x0 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_8B				(0x1 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_16B				(0x2 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_32B				(0x3 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_FRAME			(0x4 &lt;&lt; 5)</div><div class='add'>+#define RXCR2_SRDBL_MASK			(0x7 &lt;&lt; 5)  /* KSZ8851SNL    */</div><div class='add'>+#define RXCR2_SRDBL_SHIFT			(5)	    /* KSZ8851SNL    */</div><div class='add'>+#define RXCR2_SRDBL_4B				(0x0 &lt;&lt; 5)  /* KSZ8851SNL    */</div><div class='add'>+#define RXCR2_SRDBL_8B				(0x1 &lt;&lt; 5)  /* KSZ8851SNL    */</div><div class='add'>+#define RXCR2_SRDBL_16B				(0x2 &lt;&lt; 5)  /* KSZ8851SNL    */</div><div class='add'>+#define RXCR2_SRDBL_32B				(0x3 &lt;&lt; 5)  /* KSZ8851SNL    */</div><div class='add'>+#define RXCR2_SRDBL_FRAME			(0x4 &lt;&lt; 5)  /* KSZ8851SNL    */</div><div class='ctx'> #define RXCR2_IUFFP				(1 &lt;&lt; 4)</div><div class='ctx'> #define RXCR2_RXIUFCEZ				(1 &lt;&lt; 3)</div><div class='ctx'> #define RXCR2_UDPLFE				(1 &lt;&lt; 2)</div><div class='hunk'>@@ -143,8 +149,10 @@</div><div class='ctx'> #define RXFSHR_RXCE				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define KS_RXFHBCR				0x7E</div><div class='add'>+#define RXFHBCR_CNT_MASK			(0xfff &lt;&lt; 0)</div><div class='add'>+</div><div class='ctx'> #define KS_TXQCR				0x80</div><div class='del'>-#define TXQCR_AETFE				(1 &lt;&lt; 2)</div><div class='add'>+#define TXQCR_AETFE				(1 &lt;&lt; 2)    /* KSZ8851SNL    */</div><div class='ctx'> #define TXQCR_TXQMAM				(1 &lt;&lt; 1)</div><div class='ctx'> #define TXQCR_METFE				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +175,10 @@</div><div class='ctx'> </div><div class='ctx'> #define KS_RXFDPR				0x86</div><div class='ctx'> #define RXFDPR_RXFPAI				(1 &lt;&lt; 14)</div><div class='add'>+#define RXFDPR_WST				(1 &lt;&lt; 12)   /* KSZ8851-16MLL */</div><div class='add'>+#define RXFDPR_EMS				(1 &lt;&lt; 11)   /* KSZ8851-16MLL */</div><div class='add'>+#define RXFDPR_RXFP_MASK			(0x7ff &lt;&lt; 0)</div><div class='add'>+#define RXFDPR_RXFP_SHIFT			(0)</div><div class='ctx'> </div><div class='ctx'> #define KS_RXDTTR				0x8C</div><div class='ctx'> #define KS_RXDBCTR				0x8E</div><div class='hunk'>@@ -184,7 +196,7 @@</div><div class='ctx'> #define IRQ_RXMPDI				(1 &lt;&lt; 4)</div><div class='ctx'> #define IRQ_LDI					(1 &lt;&lt; 3)</div><div class='ctx'> #define IRQ_EDI					(1 &lt;&lt; 2)</div><div class='del'>-#define IRQ_SPIBEI				(1 &lt;&lt; 1)</div><div class='add'>+#define IRQ_SPIBEI				(1 &lt;&lt; 1)    /* KSZ8851SNL    */</div><div class='ctx'> #define IRQ_DEDI				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define KS_RXFCTR				0x9C</div><div class='hunk'>@@ -257,42 +269,37 @@</div><div class='ctx'> #define KS_P1ANLPR				0xEE</div><div class='ctx'> </div><div class='ctx'> #define KS_P1SCLMD				0xF4</div><div class='del'>-#define P1SCLMD_LEDOFF				(1 &lt;&lt; 15)</div><div class='del'>-#define P1SCLMD_TXIDS				(1 &lt;&lt; 14)</div><div class='del'>-#define P1SCLMD_RESTARTAN			(1 &lt;&lt; 13)</div><div class='del'>-#define P1SCLMD_DISAUTOMDIX			(1 &lt;&lt; 10)</div><div class='del'>-#define P1SCLMD_FORCEMDIX			(1 &lt;&lt; 9)</div><div class='del'>-#define P1SCLMD_AUTONEGEN			(1 &lt;&lt; 7)</div><div class='del'>-#define P1SCLMD_FORCE100			(1 &lt;&lt; 6)</div><div class='del'>-#define P1SCLMD_FORCEFDX			(1 &lt;&lt; 5)</div><div class='del'>-#define P1SCLMD_ADV_FLOW			(1 &lt;&lt; 4)</div><div class='del'>-#define P1SCLMD_ADV_100BT_FDX			(1 &lt;&lt; 3)</div><div class='del'>-#define P1SCLMD_ADV_100BT_HDX			(1 &lt;&lt; 2)</div><div class='del'>-#define P1SCLMD_ADV_10BT_FDX			(1 &lt;&lt; 1)</div><div class='del'>-#define P1SCLMD_ADV_10BT_HDX			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define KS_P1CR					0xF6</div><div class='del'>-#define P1CR_HP_MDIX				(1 &lt;&lt; 15)</div><div class='del'>-#define P1CR_REV_POL				(1 &lt;&lt; 13)</div><div class='del'>-#define P1CR_OP_100M				(1 &lt;&lt; 10)</div><div class='del'>-#define P1CR_OP_FDX				(1 &lt;&lt; 9)</div><div class='del'>-#define P1CR_OP_MDI				(1 &lt;&lt; 7)</div><div class='del'>-#define P1CR_AN_DONE				(1 &lt;&lt; 6)</div><div class='del'>-#define P1CR_LINK_GOOD				(1 &lt;&lt; 5)</div><div class='del'>-#define P1CR_PNTR_FLOW				(1 &lt;&lt; 4)</div><div class='del'>-#define P1CR_PNTR_100BT_FDX			(1 &lt;&lt; 3)</div><div class='del'>-#define P1CR_PNTR_100BT_HDX			(1 &lt;&lt; 2)</div><div class='del'>-#define P1CR_PNTR_10BT_FDX			(1 &lt;&lt; 1)</div><div class='del'>-#define P1CR_PNTR_10BT_HDX			(1 &lt;&lt; 0)</div><div class='add'>+#define P1CR_LEDOFF				(1 &lt;&lt; 15)</div><div class='add'>+#define P1CR_TXIDS				(1 &lt;&lt; 14)</div><div class='add'>+#define P1CR_RESTARTAN				(1 &lt;&lt; 13)</div><div class='add'>+#define P1CR_DISAUTOMDIX			(1 &lt;&lt; 10)</div><div class='add'>+#define P1CR_FORCEMDIX				(1 &lt;&lt; 9)</div><div class='add'>+#define P1CR_AUTONEGEN				(1 &lt;&lt; 7)</div><div class='add'>+#define P1CR_FORCE100				(1 &lt;&lt; 6)</div><div class='add'>+#define P1CR_FORCEFDX				(1 &lt;&lt; 5)</div><div class='add'>+#define P1CR_ADV_FLOW				(1 &lt;&lt; 4)</div><div class='add'>+#define P1CR_ADV_100BT_FDX			(1 &lt;&lt; 3)</div><div class='add'>+#define P1CR_ADV_100BT_HDX			(1 &lt;&lt; 2)</div><div class='add'>+#define P1CR_ADV_10BT_FDX			(1 &lt;&lt; 1)</div><div class='add'>+#define P1CR_ADV_10BT_HDX			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define KS_P1SR					0xF8</div><div class='add'>+#define P1SR_HP_MDIX				(1 &lt;&lt; 15)</div><div class='add'>+#define P1SR_REV_POL				(1 &lt;&lt; 13)</div><div class='add'>+#define P1SR_OP_100M				(1 &lt;&lt; 10)</div><div class='add'>+#define P1SR_OP_FDX				(1 &lt;&lt; 9)</div><div class='add'>+#define P1SR_OP_MDI				(1 &lt;&lt; 7)</div><div class='add'>+#define P1SR_AN_DONE				(1 &lt;&lt; 6)</div><div class='add'>+#define P1SR_LINK_GOOD				(1 &lt;&lt; 5)</div><div class='add'>+#define P1SR_PNTR_FLOW				(1 &lt;&lt; 4)</div><div class='add'>+#define P1SR_PNTR_100BT_FDX			(1 &lt;&lt; 3)</div><div class='add'>+#define P1SR_PNTR_100BT_HDX			(1 &lt;&lt; 2)</div><div class='add'>+#define P1SR_PNTR_10BT_FDX			(1 &lt;&lt; 1)</div><div class='add'>+#define P1SR_PNTR_10BT_HDX			(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* TX Frame control */</div><div class='del'>-</div><div class='ctx'> #define TXFR_TXIC				(1 &lt;&lt; 15)</div><div class='ctx'> #define TXFR_TXFID_MASK				(0x3f &lt;&lt; 0)</div><div class='ctx'> #define TXFR_TXFID_SHIFT			(0)</div><div class='del'>-</div><div class='del'>-/* SPI frame opcodes */</div><div class='del'>-#define KS_SPIOP_RD				(0x00)</div><div class='del'>-#define KS_SPIOP_WR				(0x40)</div><div class='del'>-#define KS_SPIOP_RXFIFO				(0x80)</div><div class='del'>-#define KS_SPIOP_TXFIFO				(0xC0)</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c<br/>index 35f8c9ef204d..dc76b0d15234 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/micrel/ks8851_mll.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/micrel/ks8851_mll.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/micrel/ks8851_mll.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/micrel/ks8851_mll.c</a></div><div class='hunk'>@@ -40,6 +40,8 @@</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "ks8851.h"</div><div class='add'>+</div><div class='ctx'> #define	DRV_NAME	"ks8851_mll"</div><div class='ctx'> </div><div class='ctx'> static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };</div><div class='hunk'>@@ -48,319 +50,10 @@ static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };</div><div class='ctx'> #define TX_BUF_SIZE			2000</div><div class='ctx'> #define RX_BUF_SIZE			2000</div><div class='ctx'> </div><div class='del'>-#define KS_CCR				0x08</div><div class='del'>-#define CCR_EEPROM			(1 &lt;&lt; 9)</div><div class='del'>-#define CCR_SPI				(1 &lt;&lt; 8)</div><div class='del'>-#define CCR_8BIT			(1 &lt;&lt; 7)</div><div class='del'>-#define CCR_16BIT			(1 &lt;&lt; 6)</div><div class='del'>-#define CCR_32BIT			(1 &lt;&lt; 5)</div><div class='del'>-#define CCR_SHARED			(1 &lt;&lt; 4)</div><div class='del'>-#define CCR_32PIN			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* MAC address registers */</div><div class='del'>-#define KS_MARL				0x10</div><div class='del'>-#define KS_MARM				0x12</div><div class='del'>-#define KS_MARH				0x14</div><div class='del'>-</div><div class='del'>-#define KS_OBCR				0x20</div><div class='del'>-#define OBCR_ODS_16MA			(1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-#define KS_EEPCR			0x22</div><div class='del'>-#define EEPCR_EESA			(1 &lt;&lt; 4)</div><div class='del'>-#define EEPCR_EESB			(1 &lt;&lt; 3)</div><div class='del'>-#define EEPCR_EEDO			(1 &lt;&lt; 2)</div><div class='del'>-#define EEPCR_EESCK			(1 &lt;&lt; 1)</div><div class='del'>-#define EEPCR_EECS			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_MBIR				0x24</div><div class='del'>-#define MBIR_TXMBF			(1 &lt;&lt; 12)</div><div class='del'>-#define MBIR_TXMBFA			(1 &lt;&lt; 11)</div><div class='del'>-#define MBIR_RXMBF			(1 &lt;&lt; 4)</div><div class='del'>-#define MBIR_RXMBFA			(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#define KS_GRR				0x26</div><div class='del'>-#define GRR_QMU				(1 &lt;&lt; 1)</div><div class='del'>-#define GRR_GSR				(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_WFCR				0x2A</div><div class='del'>-#define WFCR_MPRXE			(1 &lt;&lt; 7)</div><div class='del'>-#define WFCR_WF3E			(1 &lt;&lt; 3)</div><div class='del'>-#define WFCR_WF2E			(1 &lt;&lt; 2)</div><div class='del'>-#define WFCR_WF1E			(1 &lt;&lt; 1)</div><div class='del'>-#define WFCR_WF0E			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_WF0CRC0			0x30</div><div class='del'>-#define KS_WF0CRC1			0x32</div><div class='del'>-#define KS_WF0BM0			0x34</div><div class='del'>-#define KS_WF0BM1			0x36</div><div class='del'>-#define KS_WF0BM2			0x38</div><div class='del'>-#define KS_WF0BM3			0x3A</div><div class='del'>-</div><div class='del'>-#define KS_WF1CRC0			0x40</div><div class='del'>-#define KS_WF1CRC1			0x42</div><div class='del'>-#define KS_WF1BM0			0x44</div><div class='del'>-#define KS_WF1BM1			0x46</div><div class='del'>-#define KS_WF1BM2			0x48</div><div class='del'>-#define KS_WF1BM3			0x4A</div><div class='del'>-</div><div class='del'>-#define KS_WF2CRC0			0x50</div><div class='del'>-#define KS_WF2CRC1			0x52</div><div class='del'>-#define KS_WF2BM0			0x54</div><div class='del'>-#define KS_WF2BM1			0x56</div><div class='del'>-#define KS_WF2BM2			0x58</div><div class='del'>-#define KS_WF2BM3			0x5A</div><div class='del'>-</div><div class='del'>-#define KS_WF3CRC0			0x60</div><div class='del'>-#define KS_WF3CRC1			0x62</div><div class='del'>-#define KS_WF3BM0			0x64</div><div class='del'>-#define KS_WF3BM1			0x66</div><div class='del'>-#define KS_WF3BM2			0x68</div><div class='del'>-#define KS_WF3BM3			0x6A</div><div class='del'>-</div><div class='del'>-#define KS_TXCR				0x70</div><div class='del'>-#define TXCR_TCGICMP			(1 &lt;&lt; 8)</div><div class='del'>-#define TXCR_TCGUDP			(1 &lt;&lt; 7)</div><div class='del'>-#define TXCR_TCGTCP			(1 &lt;&lt; 6)</div><div class='del'>-#define TXCR_TCGIP			(1 &lt;&lt; 5)</div><div class='del'>-#define TXCR_FTXQ			(1 &lt;&lt; 4)</div><div class='del'>-#define TXCR_TXFCE			(1 &lt;&lt; 3)</div><div class='del'>-#define TXCR_TXPE			(1 &lt;&lt; 2)</div><div class='del'>-#define TXCR_TXCRC			(1 &lt;&lt; 1)</div><div class='del'>-#define TXCR_TXE			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_TXSR				0x72</div><div class='del'>-#define TXSR_TXLC			(1 &lt;&lt; 13)</div><div class='del'>-#define TXSR_TXMC			(1 &lt;&lt; 12)</div><div class='del'>-#define TXSR_TXFID_MASK			(0x3f &lt;&lt; 0)</div><div class='del'>-#define TXSR_TXFID_SHIFT		(0)</div><div class='del'>-#define TXSR_TXFID_GET(_v)		(((_v) &gt;&gt; 0) &amp; 0x3f)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define KS_RXCR1			0x74</div><div class='del'>-#define RXCR1_FRXQ			(1 &lt;&lt; 15)</div><div class='del'>-#define RXCR1_RXUDPFCC			(1 &lt;&lt; 14)</div><div class='del'>-#define RXCR1_RXTCPFCC			(1 &lt;&lt; 13)</div><div class='del'>-#define RXCR1_RXIPFCC			(1 &lt;&lt; 12)</div><div class='del'>-#define RXCR1_RXPAFMA			(1 &lt;&lt; 11)</div><div class='del'>-#define RXCR1_RXFCE			(1 &lt;&lt; 10)</div><div class='del'>-#define RXCR1_RXEFE			(1 &lt;&lt; 9)</div><div class='del'>-#define RXCR1_RXMAFMA			(1 &lt;&lt; 8)</div><div class='del'>-#define RXCR1_RXBE			(1 &lt;&lt; 7)</div><div class='del'>-#define RXCR1_RXME			(1 &lt;&lt; 6)</div><div class='del'>-#define RXCR1_RXUE			(1 &lt;&lt; 5)</div><div class='del'>-#define RXCR1_RXAE			(1 &lt;&lt; 4)</div><div class='del'>-#define RXCR1_RXINVF			(1 &lt;&lt; 1)</div><div class='del'>-#define RXCR1_RXE			(1 &lt;&lt; 0)</div><div class='ctx'> #define RXCR1_FILTER_MASK    		(RXCR1_RXINVF | RXCR1_RXAE | \</div><div class='ctx'> 					 RXCR1_RXMAFMA | RXCR1_RXPAFMA)</div><div class='del'>-</div><div class='del'>-#define KS_RXCR2			0x76</div><div class='del'>-#define RXCR2_SRDBL_MASK		(0x7 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_SHIFT		(5)</div><div class='del'>-#define RXCR2_SRDBL_4B			(0x0 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_8B			(0x1 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_16B			(0x2 &lt;&lt; 5)</div><div class='del'>-#define RXCR2_SRDBL_32B			(0x3 &lt;&lt; 5)</div><div class='del'>-/* #define RXCR2_SRDBL_FRAME		(0x4 &lt;&lt; 5) */</div><div class='del'>-#define RXCR2_IUFFP			(1 &lt;&lt; 4)</div><div class='del'>-#define RXCR2_RXIUFCEZ			(1 &lt;&lt; 3)</div><div class='del'>-#define RXCR2_UDPLFE			(1 &lt;&lt; 2)</div><div class='del'>-#define RXCR2_RXICMPFCC			(1 &lt;&lt; 1)</div><div class='del'>-#define RXCR2_RXSAF			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_TXMIR			0x78</div><div class='del'>-</div><div class='del'>-#define KS_RXFHSR			0x7C</div><div class='del'>-#define RXFSHR_RXFV			(1 &lt;&lt; 15)</div><div class='del'>-#define RXFSHR_RXICMPFCS		(1 &lt;&lt; 13)</div><div class='del'>-#define RXFSHR_RXIPFCS			(1 &lt;&lt; 12)</div><div class='del'>-#define RXFSHR_RXTCPFCS			(1 &lt;&lt; 11)</div><div class='del'>-#define RXFSHR_RXUDPFCS			(1 &lt;&lt; 10)</div><div class='del'>-#define RXFSHR_RXBF			(1 &lt;&lt; 7)</div><div class='del'>-#define RXFSHR_RXMF			(1 &lt;&lt; 6)</div><div class='del'>-#define RXFSHR_RXUF			(1 &lt;&lt; 5)</div><div class='del'>-#define RXFSHR_RXMR			(1 &lt;&lt; 4)</div><div class='del'>-#define RXFSHR_RXFT			(1 &lt;&lt; 3)</div><div class='del'>-#define RXFSHR_RXFTL			(1 &lt;&lt; 2)</div><div class='del'>-#define RXFSHR_RXRF			(1 &lt;&lt; 1)</div><div class='del'>-#define RXFSHR_RXCE			(1 &lt;&lt; 0)</div><div class='del'>-#define	RXFSHR_ERR			(RXFSHR_RXCE | RXFSHR_RXRF |\</div><div class='del'>-					RXFSHR_RXFTL | RXFSHR_RXMR |\</div><div class='del'>-					RXFSHR_RXICMPFCS | RXFSHR_RXIPFCS |\</div><div class='del'>-					RXFSHR_RXTCPFCS)</div><div class='del'>-#define KS_RXFHBCR			0x7E</div><div class='del'>-#define RXFHBCR_CNT_MASK		0x0FFF</div><div class='del'>-</div><div class='del'>-#define KS_TXQCR			0x80</div><div class='del'>-#define TXQCR_AETFE			(1 &lt;&lt; 2)</div><div class='del'>-#define TXQCR_TXQMAM			(1 &lt;&lt; 1)</div><div class='del'>-#define TXQCR_METFE			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_RXQCR			0x82</div><div class='del'>-#define RXQCR_RXDTTS			(1 &lt;&lt; 12)</div><div class='del'>-#define RXQCR_RXDBCTS			(1 &lt;&lt; 11)</div><div class='del'>-#define RXQCR_RXFCTS			(1 &lt;&lt; 10)</div><div class='del'>-#define RXQCR_RXIPHTOE			(1 &lt;&lt; 9)</div><div class='del'>-#define RXQCR_RXDTTE			(1 &lt;&lt; 7)</div><div class='del'>-#define RXQCR_RXDBCTE			(1 &lt;&lt; 6)</div><div class='del'>-#define RXQCR_RXFCTE			(1 &lt;&lt; 5)</div><div class='del'>-#define RXQCR_ADRFE			(1 &lt;&lt; 4)</div><div class='del'>-#define RXQCR_SDA			(1 &lt;&lt; 3)</div><div class='del'>-#define RXQCR_RRXEF			(1 &lt;&lt; 0)</div><div class='ctx'> #define RXQCR_CMD_CNTL                	(RXQCR_RXFCTE|RXQCR_ADRFE)</div><div class='ctx'> </div><div class='del'>-#define KS_TXFDPR			0x84</div><div class='del'>-#define TXFDPR_TXFPAI			(1 &lt;&lt; 14)</div><div class='del'>-#define TXFDPR_TXFP_MASK		(0x7ff &lt;&lt; 0)</div><div class='del'>-#define TXFDPR_TXFP_SHIFT		(0)</div><div class='del'>-</div><div class='del'>-#define KS_RXFDPR			0x86</div><div class='del'>-#define RXFDPR_RXFPAI			(1 &lt;&lt; 14)</div><div class='del'>-</div><div class='del'>-#define KS_RXDTTR			0x8C</div><div class='del'>-#define KS_RXDBCTR			0x8E</div><div class='del'>-</div><div class='del'>-#define KS_IER				0x90</div><div class='del'>-#define KS_ISR				0x92</div><div class='del'>-#define IRQ_LCI				(1 &lt;&lt; 15)</div><div class='del'>-#define IRQ_TXI				(1 &lt;&lt; 14)</div><div class='del'>-#define IRQ_RXI				(1 &lt;&lt; 13)</div><div class='del'>-#define IRQ_RXOI			(1 &lt;&lt; 11)</div><div class='del'>-#define IRQ_TXPSI			(1 &lt;&lt; 9)</div><div class='del'>-#define IRQ_RXPSI			(1 &lt;&lt; 8)</div><div class='del'>-#define IRQ_TXSAI			(1 &lt;&lt; 6)</div><div class='del'>-#define IRQ_RXWFDI			(1 &lt;&lt; 5)</div><div class='del'>-#define IRQ_RXMPDI			(1 &lt;&lt; 4)</div><div class='del'>-#define IRQ_LDI				(1 &lt;&lt; 3)</div><div class='del'>-#define IRQ_EDI				(1 &lt;&lt; 2)</div><div class='del'>-#define IRQ_SPIBEI			(1 &lt;&lt; 1)</div><div class='del'>-#define IRQ_DEDI			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_RXFCTR			0x9C</div><div class='del'>-#define RXFCTR_THRESHOLD_MASK     	0x00FF</div><div class='del'>-</div><div class='del'>-#define KS_RXFC				0x9D</div><div class='del'>-#define RXFCTR_RXFC_MASK		(0xff &lt;&lt; 8)</div><div class='del'>-#define RXFCTR_RXFC_SHIFT		(8)</div><div class='del'>-#define RXFCTR_RXFC_GET(_v)		(((_v) &gt;&gt; 8) &amp; 0xff)</div><div class='del'>-#define RXFCTR_RXFCT_MASK		(0xff &lt;&lt; 0)</div><div class='del'>-#define RXFCTR_RXFCT_SHIFT		(0)</div><div class='del'>-</div><div class='del'>-#define KS_TXNTFSR			0x9E</div><div class='del'>-</div><div class='del'>-#define KS_MAHTR0			0xA0</div><div class='del'>-#define KS_MAHTR1			0xA2</div><div class='del'>-#define KS_MAHTR2			0xA4</div><div class='del'>-#define KS_MAHTR3			0xA6</div><div class='del'>-</div><div class='del'>-#define KS_FCLWR			0xB0</div><div class='del'>-#define KS_FCHWR			0xB2</div><div class='del'>-#define KS_FCOWR			0xB4</div><div class='del'>-</div><div class='del'>-#define KS_CIDER			0xC0</div><div class='del'>-#define CIDER_ID			0x8870</div><div class='del'>-#define CIDER_REV_MASK			(0x7 &lt;&lt; 1)</div><div class='del'>-#define CIDER_REV_SHIFT			(1)</div><div class='del'>-#define CIDER_REV_GET(_v)		(((_v) &gt;&gt; 1) &amp; 0x7)</div><div class='del'>-</div><div class='del'>-#define KS_CGCR				0xC6</div><div class='del'>-#define KS_IACR				0xC8</div><div class='del'>-#define IACR_RDEN			(1 &lt;&lt; 12)</div><div class='del'>-#define IACR_TSEL_MASK			(0x3 &lt;&lt; 10)</div><div class='del'>-#define IACR_TSEL_SHIFT			(10)</div><div class='del'>-#define IACR_TSEL_MIB			(0x3 &lt;&lt; 10)</div><div class='del'>-#define IACR_ADDR_MASK			(0x1f &lt;&lt; 0)</div><div class='del'>-#define IACR_ADDR_SHIFT			(0)</div><div class='del'>-</div><div class='del'>-#define KS_IADLR			0xD0</div><div class='del'>-#define KS_IAHDR			0xD2</div><div class='del'>-</div><div class='del'>-#define KS_PMECR			0xD4</div><div class='del'>-#define PMECR_PME_DELAY			(1 &lt;&lt; 14)</div><div class='del'>-#define PMECR_PME_POL			(1 &lt;&lt; 12)</div><div class='del'>-#define PMECR_WOL_WAKEUP		(1 &lt;&lt; 11)</div><div class='del'>-#define PMECR_WOL_MAGICPKT		(1 &lt;&lt; 10)</div><div class='del'>-#define PMECR_WOL_LINKUP		(1 &lt;&lt; 9)</div><div class='del'>-#define PMECR_WOL_ENERGY		(1 &lt;&lt; 8)</div><div class='del'>-#define PMECR_AUTO_WAKE_EN		(1 &lt;&lt; 7)</div><div class='del'>-#define PMECR_WAKEUP_NORMAL		(1 &lt;&lt; 6)</div><div class='del'>-#define PMECR_WKEVT_MASK		(0xf &lt;&lt; 2)</div><div class='del'>-#define PMECR_WKEVT_SHIFT		(2)</div><div class='del'>-#define PMECR_WKEVT_GET(_v)		(((_v) &gt;&gt; 2) &amp; 0xf)</div><div class='del'>-#define PMECR_WKEVT_ENERGY		(0x1 &lt;&lt; 2)</div><div class='del'>-#define PMECR_WKEVT_LINK		(0x2 &lt;&lt; 2)</div><div class='del'>-#define PMECR_WKEVT_MAGICPKT		(0x4 &lt;&lt; 2)</div><div class='del'>-#define PMECR_WKEVT_FRAME		(0x8 &lt;&lt; 2)</div><div class='del'>-#define PMECR_PM_MASK			(0x3 &lt;&lt; 0)</div><div class='del'>-#define PMECR_PM_SHIFT			(0)</div><div class='del'>-#define PMECR_PM_NORMAL			(0x0 &lt;&lt; 0)</div><div class='del'>-#define PMECR_PM_ENERGY			(0x1 &lt;&lt; 0)</div><div class='del'>-#define PMECR_PM_SOFTDOWN		(0x2 &lt;&lt; 0)</div><div class='del'>-#define PMECR_PM_POWERSAVE		(0x3 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* Standard MII PHY data */</div><div class='del'>-#define KS_P1MBCR			0xE4</div><div class='del'>-#define P1MBCR_FORCE_FDX		(1 &lt;&lt; 8)</div><div class='del'>-</div><div class='del'>-#define KS_P1MBSR			0xE6</div><div class='del'>-#define P1MBSR_AN_COMPLETE		(1 &lt;&lt; 5)</div><div class='del'>-#define P1MBSR_AN_CAPABLE		(1 &lt;&lt; 3)</div><div class='del'>-#define P1MBSR_LINK_UP			(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-#define KS_PHY1ILR			0xE8</div><div class='del'>-#define KS_PHY1IHR			0xEA</div><div class='del'>-#define KS_P1ANAR			0xEC</div><div class='del'>-#define KS_P1ANLPR			0xEE</div><div class='del'>-</div><div class='del'>-#define KS_P1SCLMD			0xF4</div><div class='del'>-#define P1SCLMD_LEDOFF			(1 &lt;&lt; 15)</div><div class='del'>-#define P1SCLMD_TXIDS			(1 &lt;&lt; 14)</div><div class='del'>-#define P1SCLMD_RESTARTAN		(1 &lt;&lt; 13)</div><div class='del'>-#define P1SCLMD_DISAUTOMDIX		(1 &lt;&lt; 10)</div><div class='del'>-#define P1SCLMD_FORCEMDIX		(1 &lt;&lt; 9)</div><div class='del'>-#define P1SCLMD_AUTONEGEN		(1 &lt;&lt; 7)</div><div class='del'>-#define P1SCLMD_FORCE100		(1 &lt;&lt; 6)</div><div class='del'>-#define P1SCLMD_FORCEFDX		(1 &lt;&lt; 5)</div><div class='del'>-#define P1SCLMD_ADV_FLOW		(1 &lt;&lt; 4)</div><div class='del'>-#define P1SCLMD_ADV_100BT_FDX		(1 &lt;&lt; 3)</div><div class='del'>-#define P1SCLMD_ADV_100BT_HDX		(1 &lt;&lt; 2)</div><div class='del'>-#define P1SCLMD_ADV_10BT_FDX		(1 &lt;&lt; 1)</div><div class='del'>-#define P1SCLMD_ADV_10BT_HDX		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define KS_P1CR				0xF6</div><div class='del'>-#define P1CR_HP_MDIX			(1 &lt;&lt; 15)</div><div class='del'>-#define P1CR_REV_POL			(1 &lt;&lt; 13)</div><div class='del'>-#define P1CR_OP_100M			(1 &lt;&lt; 10)</div><div class='del'>-#define P1CR_OP_FDX			(1 &lt;&lt; 9)</div><div class='del'>-#define P1CR_OP_MDI			(1 &lt;&lt; 7)</div><div class='del'>-#define P1CR_AN_DONE			(1 &lt;&lt; 6)</div><div class='del'>-#define P1CR_LINK_GOOD			(1 &lt;&lt; 5)</div><div class='del'>-#define P1CR_PNTR_FLOW			(1 &lt;&lt; 4)</div><div class='del'>-#define P1CR_PNTR_100BT_FDX		(1 &lt;&lt; 3)</div><div class='del'>-#define P1CR_PNTR_100BT_HDX		(1 &lt;&lt; 2)</div><div class='del'>-#define P1CR_PNTR_10BT_FDX		(1 &lt;&lt; 1)</div><div class='del'>-#define P1CR_PNTR_10BT_HDX		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* TX Frame control */</div><div class='del'>-</div><div class='del'>-#define TXFR_TXIC			(1 &lt;&lt; 15)</div><div class='del'>-#define TXFR_TXFID_MASK			(0x3f &lt;&lt; 0)</div><div class='del'>-#define TXFR_TXFID_SHIFT		(0)</div><div class='del'>-</div><div class='del'>-#define KS_P1SR				0xF8</div><div class='del'>-#define P1SR_HP_MDIX			(1 &lt;&lt; 15)</div><div class='del'>-#define P1SR_REV_POL			(1 &lt;&lt; 13)</div><div class='del'>-#define P1SR_OP_100M			(1 &lt;&lt; 10)</div><div class='del'>-#define P1SR_OP_FDX			(1 &lt;&lt; 9)</div><div class='del'>-#define P1SR_OP_MDI			(1 &lt;&lt; 7)</div><div class='del'>-#define P1SR_AN_DONE			(1 &lt;&lt; 6)</div><div class='del'>-#define P1SR_LINK_GOOD			(1 &lt;&lt; 5)</div><div class='del'>-#define P1SR_PNTR_FLOW			(1 &lt;&lt; 4)</div><div class='del'>-#define P1SR_PNTR_100BT_FDX		(1 &lt;&lt; 3)</div><div class='del'>-#define P1SR_PNTR_100BT_HDX		(1 &lt;&lt; 2)</div><div class='del'>-#define P1SR_PNTR_10BT_FDX		(1 &lt;&lt; 1)</div><div class='del'>-#define P1SR_PNTR_10BT_HDX		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='ctx'> #define	ENUM_BUS_NONE			0</div><div class='ctx'> #define	ENUM_BUS_8BIT			1</div><div class='ctx'> #define	ENUM_BUS_16BIT			2</div><div class='hunk'>@@ -1475,7 +1168,7 @@ static void ks_setup(struct ks_net *ks)</div><div class='ctx'> 	ks_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup Receive Frame Threshold - 1 frame (RXFCTFC) */</div><div class='del'>-	ks_wrreg16(ks, KS_RXFCTR, 1 &amp; RXFCTR_THRESHOLD_MASK);</div><div class='add'>+	ks_wrreg16(ks, KS_RXFCTR, 1 &amp; RXFCTR_RXFCT_MASK);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup RxQ Command Control (RXQCR) */</div><div class='ctx'> 	ks-&gt;rc_rxqcr = RXQCR_CMD_CNTL;</div><div class='hunk'>@@ -1488,7 +1181,7 @@ static void ks_setup(struct ks_net *ks)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	w = ks_rdreg16(ks, KS_P1MBCR);</div><div class='del'>-	w &amp;= ~P1MBCR_FORCE_FDX;</div><div class='add'>+	w &amp;= ~BMCR_FULLDPLX;</div><div class='ctx'> 	ks_wrreg16(ks, KS_P1MBCR, w);</div><div class='ctx'> </div><div class='ctx'> 	w = TXCR_TXFCE | TXCR_TXPE | TXCR_TXCRC | TXCR_TCGIP;</div><div class='hunk'>@@ -1629,12 +1322,12 @@ static int ks8851_probe(struct platform_device *pdev)</div><div class='ctx'> 	ks_setup_int(ks);</div><div class='ctx'> </div><div class='ctx'> 	data = ks_rdreg16(ks, KS_OBCR);</div><div class='del'>-	ks_wrreg16(ks, KS_OBCR, data | OBCR_ODS_16MA);</div><div class='add'>+	ks_wrreg16(ks, KS_OBCR, data | OBCR_ODS_16mA);</div><div class='ctx'> </div><div class='ctx'> 	/* overwriting the default MAC address */</div><div class='ctx'> 	if (pdev-&gt;dev.of_node) {</div><div class='ctx'> 		mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-		if (mac)</div><div class='add'>+		if (!IS_ERR(mac))</div><div class='ctx'> 			memcpy(ks-&gt;mac_addr, mac, ETH_ALEN);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct ks8851_mll_platform_data *pdata;</div><div class='head'>diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c<br/>index 8f72587b5a2c..0567e4f387a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/microchip/enc28j60.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/microchip/enc28j60.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/microchip/enc28j60.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/microchip/enc28j60.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Microchip ENC28J60 ethernet driver (MAC + PHY)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,11 +6,6 @@</div><div class='ctx'>  * Author: Claudio Lanconelli &lt;lanconelli.claudio@eptar.com&gt;</div><div class='ctx'>  * based on enc28j60.c written by David Anders for 2.4 kernel version</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 as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='ctx'>  * $Id: enc28j60.c,v 1.22 2007/12/20 10:47:01 claudio Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -18,9 +14,9 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/property.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='del'>-#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='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='hunk'>@@ -28,7 +24,6 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "enc28j60_hw.h"</div><div class='ctx'> </div><div class='hunk'>@@ -41,10 +36,11 @@</div><div class='ctx'> 	(NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN | NETIF_MSG_LINK)</div><div class='ctx'> </div><div class='ctx'> /* Buffer size required for the largest SPI transfer (i.e., reading a</div><div class='del'>- * frame). */</div><div class='add'>+ * frame).</div><div class='add'>+ */</div><div class='ctx'> #define SPI_TRANSFER_BUF_LEN	(4 + MAX_FRAMELEN)</div><div class='ctx'> </div><div class='del'>-#define TX_TIMEOUT	(4 * HZ)</div><div class='add'>+#define TX_TIMEOUT		(4 * HZ)</div><div class='ctx'> </div><div class='ctx'> /* Max TX retries in case of collision as suggested by errata datasheet */</div><div class='ctx'> #define MAX_TX_RETRYCOUNT	16</div><div class='hunk'>@@ -83,11 +79,12 @@ static struct {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SPI read buffer</div><div class='del'>- * wait for the SPI transfer and copy received data to destination</div><div class='add'>+ * Wait for the SPI transfer and copy received data to destination.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	u8 *rx_buf = priv-&gt;spi_transfer_buf + 4;</div><div class='ctx'> 	u8 *tx_buf = priv-&gt;spi_transfer_buf;</div><div class='ctx'> 	struct spi_transfer tx = {</div><div class='hunk'>@@ -113,8 +110,8 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)</div><div class='ctx'> 		ret = msg.status;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &amp;&amp; netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-			__func__, ret);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",</div><div class='add'>+			   __func__, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -122,9 +119,9 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)</div><div class='ctx'> /*</div><div class='ctx'>  * SPI write buffer</div><div class='ctx'>  */</div><div class='del'>-static int spi_write_buf(struct enc28j60_net *priv, int len,</div><div class='del'>-			 const u8 *data)</div><div class='add'>+static int spi_write_buf(struct enc28j60_net *priv, int len, const u8 *data)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; SPI_TRANSFER_BUF_LEN - 1 || len &lt;= 0)</div><div class='hunk'>@@ -134,8 +131,8 @@ static int spi_write_buf(struct enc28j60_net *priv, int len,</div><div class='ctx'> 		memcpy(&amp;priv-&gt;spi_transfer_buf[1], data, len);</div><div class='ctx'> 		ret = spi_write(priv-&gt;spi, priv-&gt;spi_transfer_buf, len + 1);</div><div class='ctx'> 		if (ret &amp;&amp; netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-				__func__, ret);</div><div class='add'>+			dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",</div><div class='add'>+				   __func__, ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -143,9 +140,9 @@ static int spi_write_buf(struct enc28j60_net *priv, int len,</div><div class='ctx'> /*</div><div class='ctx'>  * basic SPI read operation</div><div class='ctx'>  */</div><div class='del'>-static u8 spi_read_op(struct enc28j60_net *priv, u8 op,</div><div class='del'>-			   u8 addr)</div><div class='add'>+static u8 spi_read_op(struct enc28j60_net *priv, u8 op, u8 addr)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	u8 tx_buf[2];</div><div class='ctx'> 	u8 rx_buf[4];</div><div class='ctx'> 	u8 val = 0;</div><div class='hunk'>@@ -159,8 +156,8 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op,</div><div class='ctx'> 	tx_buf[0] = op | (addr &amp; ADDR_MASK);</div><div class='ctx'> 	ret = spi_write_then_read(priv-&gt;spi, tx_buf, 1, rx_buf, slen);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-			__func__, ret);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",</div><div class='add'>+			   __func__, ret);</div><div class='ctx'> 	else</div><div class='ctx'> 		val = rx_buf[slen - 1];</div><div class='ctx'> </div><div class='hunk'>@@ -170,28 +167,25 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op,</div><div class='ctx'> /*</div><div class='ctx'>  * basic SPI write operation</div><div class='ctx'>  */</div><div class='del'>-static int spi_write_op(struct enc28j60_net *priv, u8 op,</div><div class='del'>-			u8 addr, u8 val)</div><div class='add'>+static int spi_write_op(struct enc28j60_net *priv, u8 op, u8 addr, u8 val)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;spi_transfer_buf[0] = op | (addr &amp; ADDR_MASK);</div><div class='ctx'> 	priv-&gt;spi_transfer_buf[1] = val;</div><div class='ctx'> 	ret = spi_write(priv-&gt;spi, priv-&gt;spi_transfer_buf, 2);</div><div class='ctx'> 	if (ret &amp;&amp; netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n",</div><div class='del'>-			__func__, ret);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",</div><div class='add'>+			   __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enc28j60_soft_reset(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='del'>-	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	spi_write_op(priv, ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);</div><div class='ctx'> 	/* Errata workaround #1, CLKRDY check is unreliable,</div><div class='del'>-	 * delay at least 1 mS instead */</div><div class='add'>+	 * delay at least 1 ms instead */</div><div class='ctx'> 	udelay(2000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +197,7 @@ static void enc28j60_set_bank(struct enc28j60_net *priv, u8 addr)</div><div class='ctx'> 	u8 b = (addr &amp; BANK_MASK) &gt;&gt; 5;</div><div class='ctx'> </div><div class='ctx'> 	/* These registers (EIE, EIR, ESTAT, ECON2, ECON1)</div><div class='del'>-	 * are present in all banks, no need to switch bank</div><div class='add'>+	 * are present in all banks, no need to switch bank.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (addr &gt;= EIE &amp;&amp; addr &lt;= ECON1)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -242,15 +236,13 @@ static void enc28j60_set_bank(struct enc28j60_net *priv, u8 addr)</div><div class='ctx'> /*</div><div class='ctx'>  * Register bit field Set</div><div class='ctx'>  */</div><div class='del'>-static void nolock_reg_bfset(struct enc28j60_net *priv,</div><div class='del'>-				      u8 addr, u8 mask)</div><div class='add'>+static void nolock_reg_bfset(struct enc28j60_net *priv, u8 addr, u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	enc28j60_set_bank(priv, addr);</div><div class='ctx'> 	spi_write_op(priv, ENC28J60_BIT_FIELD_SET, addr, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locked_reg_bfset(struct enc28j60_net *priv,</div><div class='del'>-				      u8 addr, u8 mask)</div><div class='add'>+static void locked_reg_bfset(struct enc28j60_net *priv, u8 addr, u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_reg_bfset(priv, addr, mask);</div><div class='hunk'>@@ -260,15 +252,13 @@ static void locked_reg_bfset(struct enc28j60_net *priv,</div><div class='ctx'> /*</div><div class='ctx'>  * Register bit field Clear</div><div class='ctx'>  */</div><div class='del'>-static void nolock_reg_bfclr(struct enc28j60_net *priv,</div><div class='del'>-				      u8 addr, u8 mask)</div><div class='add'>+static void nolock_reg_bfclr(struct enc28j60_net *priv, u8 addr, u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	enc28j60_set_bank(priv, addr);</div><div class='ctx'> 	spi_write_op(priv, ENC28J60_BIT_FIELD_CLR, addr, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locked_reg_bfclr(struct enc28j60_net *priv,</div><div class='del'>-				      u8 addr, u8 mask)</div><div class='add'>+static void locked_reg_bfclr(struct enc28j60_net *priv, u8 addr, u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_reg_bfclr(priv, addr, mask);</div><div class='hunk'>@@ -278,15 +268,13 @@ static void locked_reg_bfclr(struct enc28j60_net *priv,</div><div class='ctx'> /*</div><div class='ctx'>  * Register byte read</div><div class='ctx'>  */</div><div class='del'>-static int nolock_regb_read(struct enc28j60_net *priv,</div><div class='del'>-				     u8 address)</div><div class='add'>+static int nolock_regb_read(struct enc28j60_net *priv, u8 address)</div><div class='ctx'> {</div><div class='ctx'> 	enc28j60_set_bank(priv, address);</div><div class='ctx'> 	return spi_read_op(priv, ENC28J60_READ_CTRL_REG, address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int locked_regb_read(struct enc28j60_net *priv,</div><div class='del'>-				     u8 address)</div><div class='add'>+static int locked_regb_read(struct enc28j60_net *priv, u8 address)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -300,8 +288,7 @@ static int locked_regb_read(struct enc28j60_net *priv,</div><div class='ctx'> /*</div><div class='ctx'>  * Register word read</div><div class='ctx'>  */</div><div class='del'>-static int nolock_regw_read(struct enc28j60_net *priv,</div><div class='del'>-				     u8 address)</div><div class='add'>+static int nolock_regw_read(struct enc28j60_net *priv, u8 address)</div><div class='ctx'> {</div><div class='ctx'> 	int rl, rh;</div><div class='ctx'> </div><div class='hunk'>@@ -312,8 +299,7 @@ static int nolock_regw_read(struct enc28j60_net *priv,</div><div class='ctx'> 	return (rh &lt;&lt; 8) | rl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int locked_regw_read(struct enc28j60_net *priv,</div><div class='del'>-				     u8 address)</div><div class='add'>+static int locked_regw_read(struct enc28j60_net *priv, u8 address)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -327,15 +313,13 @@ static int locked_regw_read(struct enc28j60_net *priv,</div><div class='ctx'> /*</div><div class='ctx'>  * Register byte write</div><div class='ctx'>  */</div><div class='del'>-static void nolock_regb_write(struct enc28j60_net *priv,</div><div class='del'>-				       u8 address, u8 data)</div><div class='add'>+static void nolock_regb_write(struct enc28j60_net *priv, u8 address, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	enc28j60_set_bank(priv, address);</div><div class='ctx'> 	spi_write_op(priv, ENC28J60_WRITE_CTRL_REG, address, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locked_regb_write(struct enc28j60_net *priv,</div><div class='del'>-				       u8 address, u8 data)</div><div class='add'>+static void locked_regb_write(struct enc28j60_net *priv, u8 address, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_regb_write(priv, address, data);</div><div class='hunk'>@@ -345,8 +329,7 @@ static void locked_regb_write(struct enc28j60_net *priv,</div><div class='ctx'> /*</div><div class='ctx'>  * Register word write</div><div class='ctx'>  */</div><div class='del'>-static void nolock_regw_write(struct enc28j60_net *priv,</div><div class='del'>-				       u8 address, u16 data)</div><div class='add'>+static void nolock_regw_write(struct enc28j60_net *priv, u8 address, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	enc28j60_set_bank(priv, address);</div><div class='ctx'> 	spi_write_op(priv, ENC28J60_WRITE_CTRL_REG, address, (u8) data);</div><div class='hunk'>@@ -354,8 +337,7 @@ static void nolock_regw_write(struct enc28j60_net *priv,</div><div class='ctx'> 		     (u8) (data &gt;&gt; 8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locked_regw_write(struct enc28j60_net *priv,</div><div class='del'>-				       u8 address, u16 data)</div><div class='add'>+static void locked_regw_write(struct enc28j60_net *priv, u8 address, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_regw_write(priv, address, data);</div><div class='hunk'>@@ -364,20 +346,23 @@ static void locked_regw_write(struct enc28j60_net *priv,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Buffer memory read</div><div class='del'>- * Select the starting address and execute a SPI buffer read</div><div class='add'>+ * Select the starting address and execute a SPI buffer read.</div><div class='ctx'>  */</div><div class='del'>-static void enc28j60_mem_read(struct enc28j60_net *priv,</div><div class='del'>-				     u16 addr, int len, u8 *data)</div><div class='add'>+static void enc28j60_mem_read(struct enc28j60_net *priv, u16 addr, int len,</div><div class='add'>+			      u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_regw_write(priv, ERDPTL, addr);</div><div class='ctx'> #ifdef CONFIG_ENC28J60_WRITEVERIFY</div><div class='ctx'> 	if (netif_msg_drv(priv)) {</div><div class='add'>+		struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 		u16 reg;</div><div class='add'>+</div><div class='ctx'> 		reg = nolock_regw_read(priv, ERDPTL);</div><div class='ctx'> 		if (reg != addr)</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": %s() error writing ERDPT "</div><div class='del'>-				"(0x%04x - 0x%04x)\n", __func__, reg, addr);</div><div class='add'>+			dev_printk(KERN_DEBUG, dev,</div><div class='add'>+				   "%s() error writing ERDPT (0x%04x - 0x%04x)\n",</div><div class='add'>+				   __func__, reg, addr);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spi_read_buf(priv, len, data);</div><div class='hunk'>@@ -390,6 +375,8 @@ static void enc28j60_mem_read(struct enc28j60_net *priv,</div><div class='ctx'> static void</div><div class='ctx'> enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	/* Set the write pointer to start of transmit buffer area */</div><div class='ctx'> 	nolock_regw_write(priv, EWRPTL, TXSTART_INIT);</div><div class='hunk'>@@ -398,9 +385,9 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)</div><div class='ctx'> 		u16 reg;</div><div class='ctx'> 		reg = nolock_regw_read(priv, EWRPTL);</div><div class='ctx'> 		if (reg != TXSTART_INIT)</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME</div><div class='del'>-				": %s() ERWPT:0x%04x != 0x%04x\n",</div><div class='del'>-				__func__, reg, TXSTART_INIT);</div><div class='add'>+			dev_printk(KERN_DEBUG, dev,</div><div class='add'>+				   "%s() ERWPT:0x%04x != 0x%04x\n",</div><div class='add'>+				   __func__, reg, TXSTART_INIT);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Set the TXND pointer to correspond to the packet size given */</div><div class='hunk'>@@ -408,30 +395,28 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)</div><div class='ctx'> 	/* write per-packet control byte */</div><div class='ctx'> 	spi_write_op(priv, ENC28J60_WRITE_BUF_MEM, 0, 0x00);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME</div><div class='del'>-			": %s() after control byte ERWPT:0x%04x\n",</div><div class='del'>-			__func__, nolock_regw_read(priv, EWRPTL));</div><div class='add'>+		dev_printk(KERN_DEBUG, dev,</div><div class='add'>+			   "%s() after control byte ERWPT:0x%04x\n",</div><div class='add'>+			   __func__, nolock_regw_read(priv, EWRPTL));</div><div class='ctx'> 	/* copy the packet into the transmit buffer */</div><div class='ctx'> 	spi_write_buf(priv, len, data);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME</div><div class='del'>-			 ": %s() after write packet ERWPT:0x%04x, len=%d\n",</div><div class='del'>-			 __func__, nolock_regw_read(priv, EWRPTL), len);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev,</div><div class='add'>+			   "%s() after write packet ERWPT:0x%04x, len=%d\n",</div><div class='add'>+			   __func__, nolock_regw_read(priv, EWRPTL), len);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long msec20_to_jiffies;</div><div class='del'>-</div><div class='ctx'> static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout = jiffies + msec20_to_jiffies;</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(20);</div><div class='ctx'> </div><div class='ctx'> 	/* 20 msec timeout read */</div><div class='ctx'> 	while ((nolock_regb_read(priv, reg) &amp; mask) != val) {</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='ctx'> 			if (netif_msg_drv(priv))</div><div class='del'>-				dev_dbg(&amp;priv-&gt;spi-&gt;dev,</div><div class='del'>-					"reg %02x ready timeout!\n", reg);</div><div class='add'>+				dev_dbg(dev, "reg %02x ready timeout!\n", reg);</div><div class='ctx'> 			return -ETIMEDOUT;</div><div class='ctx'> 		}</div><div class='ctx'> 		cpu_relax();</div><div class='hunk'>@@ -449,7 +434,7 @@ static int wait_phy_ready(struct enc28j60_net *priv)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PHY register read</div><div class='del'>- * PHY registers are not accessed directly, but through the MII</div><div class='add'>+ * PHY registers are not accessed directly, but through the MII.</div><div class='ctx'>  */</div><div class='ctx'> static u16 enc28j60_phy_read(struct enc28j60_net *priv, u8 address)</div><div class='ctx'> {</div><div class='hunk'>@@ -465,7 +450,7 @@ static u16 enc28j60_phy_read(struct enc28j60_net *priv, u8 address)</div><div class='ctx'> 	/* quit reading */</div><div class='ctx'> 	nolock_regb_write(priv, MICMD, 0x00);</div><div class='ctx'> 	/* return the data */</div><div class='del'>-	ret  = nolock_regw_read(priv, MIRDL);</div><div class='add'>+	ret = nolock_regw_read(priv, MIRDL);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -494,13 +479,13 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	if (!priv-&gt;hw_enable) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_INFO DRV_NAME</div><div class='del'>-				": %s: Setting MAC address to %pM\n",</div><div class='del'>-				ndev-&gt;name, ndev-&gt;dev_addr);</div><div class='add'>+			dev_info(dev, "%s: Setting MAC address to %pM\n",</div><div class='add'>+				 ndev-&gt;name, ndev-&gt;dev_addr);</div><div class='ctx'> 		/* NOTE: MAC address in ENC28J60 is byte-backward */</div><div class='ctx'> 		nolock_regb_write(priv, MAADR5, ndev-&gt;dev_addr[0]);</div><div class='ctx'> 		nolock_regb_write(priv, MAADR4, ndev-&gt;dev_addr[1]);</div><div class='hunk'>@@ -511,9 +496,9 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME</div><div class='del'>-				": %s() Hardware must be disabled to set "</div><div class='del'>-				"Mac address\n", __func__);</div><div class='add'>+			dev_printk(KERN_DEBUG, dev,</div><div class='add'>+				   "%s() Hardware must be disabled to set Mac address\n",</div><div class='add'>+				   __func__);</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='hunk'>@@ -532,7 +517,7 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 	if (!is_valid_ether_addr(address-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, address-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	ether_addr_copy(dev-&gt;dev_addr, address-&gt;sa_data);</div><div class='ctx'> 	return enc28j60_set_hw_macaddr(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -541,33 +526,36 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'>  */</div><div class='ctx'> static void enc28j60_dump_regs(struct enc28j60_net *priv, const char *msg)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME " %s\n"</div><div class='del'>-		"HwRevID: 0x%02x\n"</div><div class='del'>-		"Cntrl: ECON1 ECON2 ESTAT  EIR  EIE\n"</div><div class='del'>-		"       0x%02x  0x%02x  0x%02x  0x%02x  0x%02x\n"</div><div class='del'>-		"MAC  : MACON1 MACON3 MACON4\n"</div><div class='del'>-		"       0x%02x   0x%02x   0x%02x\n"</div><div class='del'>-		"Rx   : ERXST  ERXND  ERXWRPT ERXRDPT ERXFCON EPKTCNT MAMXFL\n"</div><div class='del'>-		"       0x%04x 0x%04x 0x%04x  0x%04x  "</div><div class='del'>-		"0x%02x    0x%02x    0x%04x\n"</div><div class='del'>-		"Tx   : ETXST  ETXND  MACLCON1 MACLCON2 MAPHSUP\n"</div><div class='del'>-		"       0x%04x 0x%04x 0x%02x     0x%02x     0x%02x\n",</div><div class='del'>-		msg, nolock_regb_read(priv, EREVID),</div><div class='del'>-		nolock_regb_read(priv, ECON1), nolock_regb_read(priv, ECON2),</div><div class='del'>-		nolock_regb_read(priv, ESTAT), nolock_regb_read(priv, EIR),</div><div class='del'>-		nolock_regb_read(priv, EIE), nolock_regb_read(priv, MACON1),</div><div class='del'>-		nolock_regb_read(priv, MACON3), nolock_regb_read(priv, MACON4),</div><div class='del'>-		nolock_regw_read(priv, ERXSTL), nolock_regw_read(priv, ERXNDL),</div><div class='del'>-		nolock_regw_read(priv, ERXWRPTL),</div><div class='del'>-		nolock_regw_read(priv, ERXRDPTL),</div><div class='del'>-		nolock_regb_read(priv, ERXFCON),</div><div class='del'>-		nolock_regb_read(priv, EPKTCNT),</div><div class='del'>-		nolock_regw_read(priv, MAMXFLL), nolock_regw_read(priv, ETXSTL),</div><div class='del'>-		nolock_regw_read(priv, ETXNDL),</div><div class='del'>-		nolock_regb_read(priv, MACLCON1),</div><div class='del'>-		nolock_regb_read(priv, MACLCON2),</div><div class='del'>-		nolock_regb_read(priv, MAPHSUP));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   " %s\n"</div><div class='add'>+		   "HwRevID: 0x%02x\n"</div><div class='add'>+		   "Cntrl: ECON1 ECON2 ESTAT  EIR  EIE\n"</div><div class='add'>+		   "       0x%02x  0x%02x  0x%02x  0x%02x  0x%02x\n"</div><div class='add'>+		   "MAC  : MACON1 MACON3 MACON4\n"</div><div class='add'>+		   "       0x%02x   0x%02x   0x%02x\n"</div><div class='add'>+		   "Rx   : ERXST  ERXND  ERXWRPT ERXRDPT ERXFCON EPKTCNT MAMXFL\n"</div><div class='add'>+		   "       0x%04x 0x%04x 0x%04x  0x%04x  "</div><div class='add'>+		   "0x%02x    0x%02x    0x%04x\n"</div><div class='add'>+		   "Tx   : ETXST  ETXND  MACLCON1 MACLCON2 MAPHSUP\n"</div><div class='add'>+		   "       0x%04x 0x%04x 0x%02x     0x%02x     0x%02x\n",</div><div class='add'>+		   msg, nolock_regb_read(priv, EREVID),</div><div class='add'>+		   nolock_regb_read(priv, ECON1), nolock_regb_read(priv, ECON2),</div><div class='add'>+		   nolock_regb_read(priv, ESTAT), nolock_regb_read(priv, EIR),</div><div class='add'>+		   nolock_regb_read(priv, EIE), nolock_regb_read(priv, MACON1),</div><div class='add'>+		   nolock_regb_read(priv, MACON3), nolock_regb_read(priv, MACON4),</div><div class='add'>+		   nolock_regw_read(priv, ERXSTL), nolock_regw_read(priv, ERXNDL),</div><div class='add'>+		   nolock_regw_read(priv, ERXWRPTL),</div><div class='add'>+		   nolock_regw_read(priv, ERXRDPTL),</div><div class='add'>+		   nolock_regb_read(priv, ERXFCON),</div><div class='add'>+		   nolock_regb_read(priv, EPKTCNT),</div><div class='add'>+		   nolock_regw_read(priv, MAMXFLL), nolock_regw_read(priv, ETXSTL),</div><div class='add'>+		   nolock_regw_read(priv, ETXNDL),</div><div class='add'>+		   nolock_regb_read(priv, MACLCON1),</div><div class='add'>+		   nolock_regb_read(priv, MACLCON2),</div><div class='add'>+		   nolock_regb_read(priv, MAPHSUP));</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -599,12 +587,13 @@ static u16 rx_packet_start(u16 ptr)</div><div class='ctx'> </div><div class='ctx'> static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	u16 erxrdpt;</div><div class='ctx'> </div><div class='ctx'> 	if (start &gt; 0x1FFF || end &gt; 0x1FFF || start &gt; end) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_ERR DRV_NAME ": %s(%d, %d) RXFIFO "</div><div class='del'>-				"bad parameters!\n", __func__, start, end);</div><div class='add'>+			dev_err(dev, "%s(%d, %d) RXFIFO bad parameters!\n",</div><div class='add'>+				__func__, start, end);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set receive buffer start + end */</div><div class='hunk'>@@ -617,10 +606,12 @@ static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)</div><div class='ctx'> </div><div class='ctx'> static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	if (start &gt; 0x1FFF || end &gt; 0x1FFF || start &gt; end) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_ERR DRV_NAME ": %s(%d, %d) TXFIFO "</div><div class='del'>-				"bad parameters!\n", __func__, start, end);</div><div class='add'>+			dev_err(dev, "%s(%d, %d) TXFIFO bad parameters!\n",</div><div class='add'>+				__func__, start, end);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set transmit buffer start + end */</div><div class='hunk'>@@ -630,14 +621,15 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Low power mode shrinks power consumption about 100x, so we'd like</div><div class='del'>- * the chip to be in that mode whenever it's inactive.  (However, we</div><div class='del'>- * can't stay in lowpower mode during suspend with WOL active.)</div><div class='add'>+ * the chip to be in that mode whenever it's inactive. (However, we</div><div class='add'>+ * can't stay in low power mode during suspend with WOL active.)</div><div class='ctx'>  */</div><div class='ctx'> static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='del'>-		dev_dbg(&amp;priv-&gt;spi-&gt;dev, "%s power...\n",</div><div class='del'>-				is_low ? "low" : "high");</div><div class='add'>+		dev_dbg(dev, "%s power...\n", is_low ? "low" : "high");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	if (is_low) {</div><div class='hunk'>@@ -656,11 +648,12 @@ static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low)</div><div class='ctx'> </div><div class='ctx'> static int enc28j60_hw_init(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() - %s\n", __func__,</div><div class='del'>-			priv-&gt;full_duplex ? "FullDuplex" : "HalfDuplex");</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "%s() - %s\n", __func__,</div><div class='add'>+			   priv-&gt;full_duplex ? "FullDuplex" : "HalfDuplex");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	/* first reset the chip */</div><div class='hunk'>@@ -682,15 +675,15 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check the RevID.</div><div class='ctx'> 	 * If it's 0x00 or 0xFF probably the enc28j60 is not mounted or</div><div class='del'>-	 * damaged</div><div class='add'>+	 * damaged.</div><div class='ctx'> 	 */</div><div class='ctx'> 	reg = locked_regb_read(priv, EREVID);</div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_INFO DRV_NAME ": chip RevID: 0x%02x\n", reg);</div><div class='add'>+		dev_info(dev, "chip RevID: 0x%02x\n", reg);</div><div class='ctx'> 	if (reg == 0x00 || reg == 0xff) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": %s() Invalid RevId %d\n",</div><div class='del'>-				__func__, reg);</div><div class='add'>+			dev_printk(KERN_DEBUG, dev, "%s() Invalid RevId %d\n",</div><div class='add'>+				   __func__, reg);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -723,7 +716,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MACLCON1 (default)</div><div class='ctx'> 	 * MACLCON2 (default)</div><div class='del'>-	 * Set the maximum packet size which the controller will accept</div><div class='add'>+	 * Set the maximum packet size which the controller will accept.</div><div class='ctx'> 	 */</div><div class='ctx'> 	locked_regw_write(priv, MAMXFLL, MAX_FRAMELEN);</div><div class='ctx'> </div><div class='hunk'>@@ -750,10 +743,12 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)</div><div class='ctx'> </div><div class='ctx'> static void enc28j60_hw_enable(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	/* enable interrupts */</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n",</div><div class='del'>-			__func__);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "%s() enabling interrupts.\n",</div><div class='add'>+			   __func__);</div><div class='ctx'> </div><div class='ctx'> 	enc28j60_phy_write(priv, PHIE, PHIE_PGEIE | PHIE_PLNKIE);</div><div class='ctx'> </div><div class='hunk'>@@ -772,7 +767,7 @@ static void enc28j60_hw_enable(struct enc28j60_net *priv)</div><div class='ctx'> static void enc28j60_hw_disable(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='del'>-	/* disable interrutps and packet reception */</div><div class='add'>+	/* disable interrupts and packet reception */</div><div class='ctx'> 	nolock_regb_write(priv, EIE, 0x00);</div><div class='ctx'> 	nolock_reg_bfclr(priv, ECON1, ECON1_RXEN);</div><div class='ctx'> 	priv-&gt;hw_enable = false;</div><div class='hunk'>@@ -793,14 +788,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex)</div><div class='ctx'> 			priv-&gt;full_duplex = (duplex == DUPLEX_FULL);</div><div class='ctx'> 		else {</div><div class='ctx'> 			if (netif_msg_link(priv))</div><div class='del'>-				dev_warn(&amp;ndev-&gt;dev,</div><div class='del'>-					"unsupported link setting\n");</div><div class='add'>+				netdev_warn(ndev, "unsupported link setting\n");</div><div class='ctx'> 			ret = -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netif_msg_link(priv))</div><div class='del'>-			dev_warn(&amp;ndev-&gt;dev, "Warning: hw must be disabled "</div><div class='del'>-				"to set link mode\n");</div><div class='add'>+			netdev_warn(ndev, "Warning: hw must be disabled to set link mode\n");</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -811,21 +804,23 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex)</div><div class='ctx'>  */</div><div class='ctx'> static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE])</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	int endptr;</div><div class='ctx'> </div><div class='ctx'> 	endptr = locked_regw_read(priv, ETXNDL);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": reading TSV at addr:0x%04x\n",</div><div class='del'>-			 endptr + 1);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "reading TSV at addr:0x%04x\n",</div><div class='add'>+			   endptr + 1);</div><div class='ctx'> 	enc28j60_mem_read(priv, endptr + 1, TSV_SIZE, tsv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,</div><div class='del'>-				u8 tsv[TSV_SIZE])</div><div class='add'>+			      u8 tsv[TSV_SIZE])</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	u16 tmp1, tmp2;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": %s - TSV:\n", msg);</div><div class='add'>+	dev_printk(KERN_DEBUG, dev, "%s - TSV:\n", msg);</div><div class='ctx'> 	tmp1 = tsv[1];</div><div class='ctx'> 	tmp1 &lt;&lt;= 8;</div><div class='ctx'> 	tmp1 |= tsv[0];</div><div class='hunk'>@@ -834,30 +829,32 @@ static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,</div><div class='ctx'> 	tmp2 &lt;&lt;= 8;</div><div class='ctx'> 	tmp2 |= tsv[4];</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": ByteCount: %d, CollisionCount: %d,"</div><div class='del'>-		" TotByteOnWire: %d\n", tmp1, tsv[2] &amp; 0x0f, tmp2);</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": TxDone: %d, CRCErr:%d, LenChkErr: %d,"</div><div class='del'>-		" LenOutOfRange: %d\n", TSV_GETBIT(tsv, TSV_TXDONE),</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXCRCERROR),</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXLENCHKERROR),</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXLENOUTOFRANGE));</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": Multicast: %d, Broadcast: %d, "</div><div class='del'>-		"PacketDefer: %d, ExDefer: %d\n",</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXMULTICAST),</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXBROADCAST),</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXPACKETDEFER),</div><div class='del'>-		TSV_GETBIT(tsv, TSV_TXEXDEFER));</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": ExCollision: %d, LateCollision: %d, "</div><div class='del'>-		 "Giant: %d, Underrun: %d\n",</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_TXEXCOLLISION),</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_TXLATECOLLISION),</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_TXGIANT), TSV_GETBIT(tsv, TSV_TXUNDERRUN));</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": ControlFrame: %d, PauseFrame: %d, "</div><div class='del'>-		 "BackPressApp: %d, VLanTagFrame: %d\n",</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_TXCONTROLFRAME),</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_TXPAUSEFRAME),</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_BACKPRESSUREAPP),</div><div class='del'>-		 TSV_GETBIT(tsv, TSV_TXVLANTAGFRAME));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "ByteCount: %d, CollisionCount: %d, TotByteOnWire: %d\n",</div><div class='add'>+		   tmp1, tsv[2] &amp; 0x0f, tmp2);</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "TxDone: %d, CRCErr:%d, LenChkErr: %d, LenOutOfRange: %d\n",</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXDONE),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXCRCERROR),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXLENCHKERROR),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXLENOUTOFRANGE));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "Multicast: %d, Broadcast: %d, PacketDefer: %d, ExDefer: %d\n",</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXMULTICAST),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXBROADCAST),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXPACKETDEFER),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXEXDEFER));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "ExCollision: %d, LateCollision: %d, Giant: %d, Underrun: %d\n",</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXEXCOLLISION),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXLATECOLLISION),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXGIANT), TSV_GETBIT(tsv, TSV_TXUNDERRUN));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "ControlFrame: %d, PauseFrame: %d, BackPressApp: %d, VLanTagFrame: %d\n",</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXCONTROLFRAME),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXPAUSEFRAME),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_BACKPRESSUREAPP),</div><div class='add'>+		   TSV_GETBIT(tsv, TSV_TXVLANTAGFRAME));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -866,27 +863,29 @@ static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,</div><div class='ctx'> static void enc28j60_dump_rsv(struct enc28j60_net *priv, const char *msg,</div><div class='ctx'> 			      u16 pk_ptr, int len, u16 sts)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": %s - NextPk: 0x%04x - RSV:\n",</div><div class='del'>-		msg, pk_ptr);</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": ByteCount: %d, DribbleNibble: %d\n", len,</div><div class='del'>-		 RSV_GETBIT(sts, RSV_DRIBBLENIBBLE));</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": RxOK: %d, CRCErr:%d, LenChkErr: %d,"</div><div class='del'>-		 " LenOutOfRange: %d\n", RSV_GETBIT(sts, RSV_RXOK),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_CRCERROR),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_LENCHECKERR),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_LENOUTOFRANGE));</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": Multicast: %d, Broadcast: %d, "</div><div class='del'>-		 "LongDropEvent: %d, CarrierEvent: %d\n",</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXMULTICAST),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXBROADCAST),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXLONGEVDROPEV),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_CARRIEREV));</div><div class='del'>-	printk(KERN_DEBUG DRV_NAME ": ControlFrame: %d, PauseFrame: %d,"</div><div class='del'>-		 " UnknownOp: %d, VLanTagFrame: %d\n",</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXCONTROLFRAME),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXPAUSEFRAME),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXUNKNOWNOPCODE),</div><div class='del'>-		 RSV_GETBIT(sts, RSV_RXTYPEVLAN));</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev_printk(KERN_DEBUG, dev, "%s - NextPk: 0x%04x - RSV:\n", msg, pk_ptr);</div><div class='add'>+	dev_printk(KERN_DEBUG, dev, "ByteCount: %d, DribbleNibble: %d\n",</div><div class='add'>+		   len, RSV_GETBIT(sts, RSV_DRIBBLENIBBLE));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "RxOK: %d, CRCErr:%d, LenChkErr: %d, LenOutOfRange: %d\n",</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXOK),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_CRCERROR),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_LENCHECKERR),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_LENOUTOFRANGE));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "Multicast: %d, Broadcast: %d, LongDropEvent: %d, CarrierEvent: %d\n",</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXMULTICAST),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXBROADCAST),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXLONGEVDROPEV),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_CARRIEREV));</div><div class='add'>+	dev_printk(KERN_DEBUG, dev,</div><div class='add'>+		   "ControlFrame: %d, PauseFrame: %d, UnknownOp: %d, VLanTagFrame: %d\n",</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXCONTROLFRAME),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXPAUSEFRAME),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXUNKNOWNOPCODE),</div><div class='add'>+		   RSV_GETBIT(sts, RSV_RXTYPEVLAN));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dump_packet(const char *msg, int len, const char *data)</div><div class='hunk'>@@ -904,20 +903,20 @@ static void dump_packet(const char *msg, int len, const char *data)</div><div class='ctx'> static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	u16 erxrdpt, next_packet, rxstat;</div><div class='ctx'> 	u8 rsv[RSV_SIZE];</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_rx_status(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": RX pk_addr:0x%04x\n",</div><div class='del'>-			priv-&gt;next_pk_ptr);</div><div class='add'>+		netdev_printk(KERN_DEBUG, ndev, "RX pk_addr:0x%04x\n",</div><div class='add'>+			      priv-&gt;next_pk_ptr);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(priv-&gt;next_pk_ptr &gt; RXEND_INIT)) {</div><div class='ctx'> 		if (netif_msg_rx_err(priv))</div><div class='del'>-			dev_err(&amp;ndev-&gt;dev,</div><div class='del'>-				"%s() Invalid packet address!! 0x%04x\n",</div><div class='del'>-				__func__, priv-&gt;next_pk_ptr);</div><div class='add'>+			netdev_err(ndev, "%s() Invalid packet address!! 0x%04x\n",</div><div class='add'>+				   __func__, priv-&gt;next_pk_ptr);</div><div class='ctx'> 		/* packet address corrupted: reset RX logic */</div><div class='ctx'> 		mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 		nolock_reg_bfclr(priv, ECON1, ECON1_RXEN);</div><div class='hunk'>@@ -950,7 +949,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (!RSV_GETBIT(rxstat, RSV_RXOK) || len &gt; MAX_FRAMELEN) {</div><div class='ctx'> 		if (netif_msg_rx_err(priv))</div><div class='del'>-			dev_err(&amp;ndev-&gt;dev, "Rx Error (%04x)\n", rxstat);</div><div class='add'>+			netdev_err(ndev, "Rx Error (%04x)\n", rxstat);</div><div class='ctx'> 		ndev-&gt;stats.rx_errors++;</div><div class='ctx'> 		if (RSV_GETBIT(rxstat, RSV_CRCERROR))</div><div class='ctx'> 			ndev-&gt;stats.rx_crc_errors++;</div><div class='hunk'>@@ -962,8 +961,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 		skb = netdev_alloc_skb(ndev, len + NET_IP_ALIGN);</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			if (netif_msg_rx_err(priv))</div><div class='del'>-				dev_err(&amp;ndev-&gt;dev,</div><div class='del'>-					"out of memory for Rx'd frame\n");</div><div class='add'>+				netdev_err(ndev, "out of memory for Rx'd frame\n");</div><div class='ctx'> 			ndev-&gt;stats.rx_dropped++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			skb_reserve(skb, NET_IP_ALIGN);</div><div class='hunk'>@@ -983,12 +981,12 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Move the RX read pointer to the start of the next</div><div class='ctx'> 	 * received packet.</div><div class='del'>-	 * This frees the memory we just read out</div><div class='add'>+	 * This frees the memory we just read out.</div><div class='ctx'> 	 */</div><div class='ctx'> 	erxrdpt = erxrdpt_workaround(next_packet, RXSTART_INIT, RXEND_INIT);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT:0x%04x\n",</div><div class='del'>-			__func__, erxrdpt);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev, "%s() ERXRDPT:0x%04x\n",</div><div class='add'>+			   __func__, erxrdpt);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	nolock_regw_write(priv, ERXRDPTL, erxrdpt);</div><div class='hunk'>@@ -997,9 +995,9 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'> 		u16 reg;</div><div class='ctx'> 		reg = nolock_regw_read(priv, ERXRDPTL);</div><div class='ctx'> 		if (reg != erxrdpt)</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT verify "</div><div class='del'>-				"error (0x%04x - 0x%04x)\n", __func__,</div><div class='del'>-				reg, erxrdpt);</div><div class='add'>+			dev_printk(KERN_DEBUG, dev,</div><div class='add'>+				   "%s() ERXRDPT verify error (0x%04x - 0x%04x)\n",</div><div class='add'>+				   __func__, reg, erxrdpt);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	priv-&gt;next_pk_ptr = next_packet;</div><div class='hunk'>@@ -1013,6 +1011,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)</div><div class='ctx'>  */</div><div class='ctx'> static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *ndev = priv-&gt;netdev;</div><div class='ctx'> 	int epkcnt, erxst, erxnd, erxwr, erxrd;</div><div class='ctx'> 	int free_space;</div><div class='ctx'> </div><div class='hunk'>@@ -1035,8 +1034,8 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	if (netif_msg_rx_status(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() free_space = %d\n",</div><div class='del'>-			__func__, free_space);</div><div class='add'>+		netdev_printk(KERN_DEBUG, ndev, "%s() free_space = %d\n",</div><div class='add'>+			      __func__, free_space);</div><div class='ctx'> 	return free_space;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1046,24 +1045,25 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)</div><div class='ctx'> static void enc28j60_check_link_status(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	int duplex;</div><div class='ctx'> </div><div class='ctx'> 	reg = enc28j60_phy_read(priv, PHSTAT2);</div><div class='ctx'> 	if (netif_msg_hw(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() PHSTAT1: %04x, "</div><div class='del'>-			"PHSTAT2: %04x\n", __func__,</div><div class='del'>-			enc28j60_phy_read(priv, PHSTAT1), reg);</div><div class='add'>+		dev_printk(KERN_DEBUG, dev,</div><div class='add'>+			   "%s() PHSTAT1: %04x, PHSTAT2: %04x\n", __func__,</div><div class='add'>+			   enc28j60_phy_read(priv, PHSTAT1), reg);</div><div class='ctx'> 	duplex = reg &amp; PHSTAT2_DPXSTAT;</div><div class='ctx'> </div><div class='ctx'> 	if (reg &amp; PHSTAT2_LSTAT) {</div><div class='ctx'> 		netif_carrier_on(ndev);</div><div class='ctx'> 		if (netif_msg_ifup(priv))</div><div class='del'>-			dev_info(&amp;ndev-&gt;dev, "link up - %s\n",</div><div class='del'>-				duplex ? "Full duplex" : "Half duplex");</div><div class='add'>+			netdev_info(ndev, "link up - %s\n",</div><div class='add'>+				    duplex ? "Full duplex" : "Half duplex");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netif_msg_ifdown(priv))</div><div class='del'>-			dev_info(&amp;ndev-&gt;dev, "link down\n");</div><div class='add'>+			netdev_info(ndev, "link down\n");</div><div class='ctx'> 		netif_carrier_off(ndev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1089,8 +1089,8 @@ static void enc28j60_tx_clear(struct net_device *ndev, bool err)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RX handler</div><div class='del'>- * ignore PKTIF because is unreliable! (look at the errata datasheet)</div><div class='del'>- * check EPKTCNT is the suggested workaround.</div><div class='add'>+ * Ignore PKTIF because is unreliable! (Look at the errata datasheet)</div><div class='add'>+ * Check EPKTCNT is the suggested workaround.</div><div class='ctx'>  * We don't need to clear interrupt flag, automatically done when</div><div class='ctx'>  * enc28j60_hw_rx() decrements the packet counter.</div><div class='ctx'>  * Returns how many packet processed.</div><div class='hunk'>@@ -1102,13 +1102,14 @@ static int enc28j60_rx_interrupt(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	pk_counter = locked_regb_read(priv, EPKTCNT);</div><div class='ctx'> 	if (pk_counter &amp;&amp; netif_msg_intr(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": intRX, pk_cnt: %d\n", pk_counter);</div><div class='add'>+		netdev_printk(KERN_DEBUG, ndev, "intRX, pk_cnt: %d\n",</div><div class='add'>+			      pk_counter);</div><div class='ctx'> 	if (pk_counter &gt; priv-&gt;max_pk_counter) {</div><div class='ctx'> 		/* update statistics */</div><div class='ctx'> 		priv-&gt;max_pk_counter = pk_counter;</div><div class='ctx'> 		if (netif_msg_rx_status(priv) &amp;&amp; priv-&gt;max_pk_counter &gt; 1)</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": RX max_pk_cnt: %d\n",</div><div class='del'>-				priv-&gt;max_pk_counter);</div><div class='add'>+			netdev_printk(KERN_DEBUG, ndev, "RX max_pk_cnt: %d\n",</div><div class='add'>+				      priv-&gt;max_pk_counter);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = pk_counter;</div><div class='ctx'> 	while (pk_counter-- &gt; 0)</div><div class='hunk'>@@ -1124,8 +1125,6 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 	struct net_device *ndev = priv-&gt;netdev;</div><div class='ctx'> 	int intflags, loop;</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_intr(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='ctx'> 	/* disable further interrupts */</div><div class='ctx'> 	locked_reg_bfclr(priv, EIE, EIE_INTIE);</div><div class='ctx'> </div><div class='hunk'>@@ -1136,16 +1135,16 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 		if ((intflags &amp; EIR_DMAIF) != 0) {</div><div class='ctx'> 			loop++;</div><div class='ctx'> 			if (netif_msg_intr(priv))</div><div class='del'>-				printk(KERN_DEBUG DRV_NAME</div><div class='del'>-					": intDMA(%d)\n", loop);</div><div class='add'>+				netdev_printk(KERN_DEBUG, ndev, "intDMA(%d)\n",</div><div class='add'>+					      loop);</div><div class='ctx'> 			locked_reg_bfclr(priv, EIR, EIR_DMAIF);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* LINK changed handler */</div><div class='ctx'> 		if ((intflags &amp; EIR_LINKIF) != 0) {</div><div class='ctx'> 			loop++;</div><div class='ctx'> 			if (netif_msg_intr(priv))</div><div class='del'>-				printk(KERN_DEBUG DRV_NAME</div><div class='del'>-					": intLINK(%d)\n", loop);</div><div class='add'>+				netdev_printk(KERN_DEBUG, ndev, "intLINK(%d)\n",</div><div class='add'>+					      loop);</div><div class='ctx'> 			enc28j60_check_link_status(ndev);</div><div class='ctx'> 			/* read PHIR to clear the flag */</div><div class='ctx'> 			enc28j60_phy_read(priv, PHIR);</div><div class='hunk'>@@ -1156,13 +1155,12 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 			bool err = false;</div><div class='ctx'> 			loop++;</div><div class='ctx'> 			if (netif_msg_intr(priv))</div><div class='del'>-				printk(KERN_DEBUG DRV_NAME</div><div class='del'>-					": intTX(%d)\n", loop);</div><div class='add'>+				netdev_printk(KERN_DEBUG, ndev, "intTX(%d)\n",</div><div class='add'>+					      loop);</div><div class='ctx'> 			priv-&gt;tx_retry_count = 0;</div><div class='ctx'> 			if (locked_regb_read(priv, ESTAT) &amp; ESTAT_TXABRT) {</div><div class='ctx'> 				if (netif_msg_tx_err(priv))</div><div class='del'>-					dev_err(&amp;ndev-&gt;dev,</div><div class='del'>-						"Tx Error (aborted)\n");</div><div class='add'>+					netdev_err(ndev, "Tx Error (aborted)\n");</div><div class='ctx'> 				err = true;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (netif_msg_tx_done(priv)) {</div><div class='hunk'>@@ -1179,8 +1177,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 			loop++;</div><div class='ctx'> 			if (netif_msg_intr(priv))</div><div class='del'>-				printk(KERN_DEBUG DRV_NAME</div><div class='del'>-					": intTXErr(%d)\n", loop);</div><div class='add'>+				netdev_printk(KERN_DEBUG, ndev, "intTXErr(%d)\n",</div><div class='add'>+					      loop);</div><div class='ctx'> 			locked_reg_bfclr(priv, ECON1, ECON1_TXRTS);</div><div class='ctx'> 			enc28j60_read_tsv(priv, tsv);</div><div class='ctx'> 			if (netif_msg_tx_err(priv))</div><div class='hunk'>@@ -1194,9 +1192,9 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 			/* Transmit Late collision check for retransmit */</div><div class='ctx'> 			if (TSV_GETBIT(tsv, TSV_TXLATECOLLISION)) {</div><div class='ctx'> 				if (netif_msg_tx_err(priv))</div><div class='del'>-					printk(KERN_DEBUG DRV_NAME</div><div class='del'>-						": LateCollision TXErr (%d)\n",</div><div class='del'>-						priv-&gt;tx_retry_count);</div><div class='add'>+					netdev_printk(KERN_DEBUG, ndev,</div><div class='add'>+						      "LateCollision TXErr (%d)\n",</div><div class='add'>+						      priv-&gt;tx_retry_count);</div><div class='ctx'> 				if (priv-&gt;tx_retry_count++ &lt; MAX_TX_RETRYCOUNT)</div><div class='ctx'> 					locked_reg_bfset(priv, ECON1,</div><div class='ctx'> 							   ECON1_TXRTS);</div><div class='hunk'>@@ -1210,13 +1208,12 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> 		if ((intflags &amp; EIR_RXERIF) != 0) {</div><div class='ctx'> 			loop++;</div><div class='ctx'> 			if (netif_msg_intr(priv))</div><div class='del'>-				printk(KERN_DEBUG DRV_NAME</div><div class='del'>-					": intRXErr(%d)\n", loop);</div><div class='add'>+				netdev_printk(KERN_DEBUG, ndev, "intRXErr(%d)\n",</div><div class='add'>+					      loop);</div><div class='ctx'> 			/* Check free FIFO space to flag RX overrun */</div><div class='ctx'> 			if (enc28j60_get_free_rxfifo(priv) &lt;= 0) {</div><div class='ctx'> 				if (netif_msg_rx_err(priv))</div><div class='del'>-					printk(KERN_DEBUG DRV_NAME</div><div class='del'>-						": RX Overrun\n");</div><div class='add'>+					netdev_printk(KERN_DEBUG, ndev, "RX Overrun\n");</div><div class='ctx'> 				ndev-&gt;stats.rx_dropped++;</div><div class='ctx'> 			}</div><div class='ctx'> 			locked_reg_bfclr(priv, EIR, EIR_RXERIF);</div><div class='hunk'>@@ -1228,8 +1225,6 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* re-enable interrupts */</div><div class='ctx'> 	locked_reg_bfset(priv, EIE, EIE_INTIE);</div><div class='del'>-	if (netif_msg_intr(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() exit\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1239,11 +1234,13 @@ static void enc28j60_irq_work_handler(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static void enc28j60_hw_tx(struct enc28j60_net *priv)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *ndev = priv-&gt;netdev;</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!priv-&gt;tx_skb);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_tx_queued(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME</div><div class='del'>-			": Tx Packet Len:%d\n", priv-&gt;tx_skb-&gt;len);</div><div class='add'>+		netdev_printk(KERN_DEBUG, ndev, "Tx Packet Len:%d\n",</div><div class='add'>+			      priv-&gt;tx_skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_pktdata(priv))</div><div class='ctx'> 		dump_packet(__func__,</div><div class='hunk'>@@ -1253,6 +1250,7 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv)</div><div class='ctx'> #ifdef CONFIG_ENC28J60_WRITEVERIFY</div><div class='ctx'> 	/* readback and verify written data */</div><div class='ctx'> 	if (netif_msg_drv(priv)) {</div><div class='add'>+		struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> 		int test_len, k;</div><div class='ctx'> 		u8 test_buf[64]; /* limit the test to the first 64 bytes */</div><div class='ctx'> 		int okflag;</div><div class='hunk'>@@ -1266,16 +1264,14 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv)</div><div class='ctx'> 		okflag = 1;</div><div class='ctx'> 		for (k = 0; k &lt; test_len; k++) {</div><div class='ctx'> 			if (priv-&gt;tx_skb-&gt;data[k] != test_buf[k]) {</div><div class='del'>-				printk(KERN_DEBUG DRV_NAME</div><div class='del'>-					 ": Error, %d location differ: "</div><div class='del'>-					 "0x%02x-0x%02x\n", k,</div><div class='del'>-					 priv-&gt;tx_skb-&gt;data[k], test_buf[k]);</div><div class='add'>+				dev_printk(KERN_DEBUG, dev,</div><div class='add'>+					   "Error, %d location differ: 0x%02x-0x%02x\n",</div><div class='add'>+					   k, priv-&gt;tx_skb-&gt;data[k], test_buf[k]);</div><div class='ctx'> 				okflag = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!okflag)</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": Tx write buffer, "</div><div class='del'>-				"verify ERROR!\n");</div><div class='add'>+			dev_printk(KERN_DEBUG, dev, "Tx write buffer, verify ERROR!\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	/* set TX request flag */</div><div class='hunk'>@@ -1287,14 +1283,11 @@ static netdev_tx_t enc28j60_send_packet(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_tx_queued(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	/* If some error occurs while trying to transmit this</div><div class='ctx'> 	 * packet, you should return '1' from this function.</div><div class='ctx'> 	 * In such a case you _may not_ do anything to the</div><div class='ctx'> 	 * SKB, it is still owned by the network queueing</div><div class='del'>-	 * layer when an error is returned.  This means you</div><div class='add'>+	 * layer when an error is returned. This means you</div><div class='ctx'> 	 * may not modify any SKB fields, you may not free</div><div class='ctx'> 	 * the SKB, etc.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1337,7 +1330,7 @@ static void enc28j60_tx_timeout(struct net_device *ndev)</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_timer(priv))</div><div class='del'>-		dev_err(&amp;ndev-&gt;dev, DRV_NAME " tx timeout\n");</div><div class='add'>+		netdev_err(ndev, "tx timeout\n");</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;stats.tx_errors++;</div><div class='ctx'> 	/* can't restart safely under softirq */</div><div class='hunk'>@@ -1356,13 +1349,9 @@ static int enc28j60_net_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='ctx'> 		if (netif_msg_ifup(priv))</div><div class='del'>-			dev_err(&amp;dev-&gt;dev, "invalid MAC address %pM\n",</div><div class='del'>-				dev-&gt;dev_addr);</div><div class='add'>+			netdev_err(dev, "invalid MAC address %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Reset the hardware here (and take it out of low power mode) */</div><div class='hunk'>@@ -1370,7 +1359,7 @@ static int enc28j60_net_open(struct net_device *dev)</div><div class='ctx'> 	enc28j60_hw_disable(priv);</div><div class='ctx'> 	if (!enc28j60_hw_init(priv)) {</div><div class='ctx'> 		if (netif_msg_ifup(priv))</div><div class='del'>-			dev_err(&amp;dev-&gt;dev, "hw_reset() failed\n");</div><div class='add'>+			netdev_err(dev, "hw_reset() failed\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Update the MAC address (in case user has changed it) */</div><div class='hunk'>@@ -1392,9 +1381,6 @@ static int enc28j60_net_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	enc28j60_hw_disable(priv);</div><div class='ctx'> 	enc28j60_lowpower(priv, true);</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='hunk'>@@ -1415,16 +1401,16 @@ static void enc28j60_set_multicast_list(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		if (netif_msg_link(priv))</div><div class='del'>-			dev_info(&amp;dev-&gt;dev, "promiscuous mode\n");</div><div class='add'>+			netdev_info(dev, "promiscuous mode\n");</div><div class='ctx'> 		priv-&gt;rxfilter = RXFILTER_PROMISC;</div><div class='ctx'> 	} else if ((dev-&gt;flags &amp; IFF_ALLMULTI) || !netdev_mc_empty(dev)) {</div><div class='ctx'> 		if (netif_msg_link(priv))</div><div class='del'>-			dev_info(&amp;dev-&gt;dev, "%smulticast mode\n",</div><div class='del'>-				(dev-&gt;flags &amp; IFF_ALLMULTI) ? "all-" : "");</div><div class='add'>+			netdev_info(dev, "%smulticast mode\n",</div><div class='add'>+				    (dev-&gt;flags &amp; IFF_ALLMULTI) ? "all-" : "");</div><div class='ctx'> 		priv-&gt;rxfilter = RXFILTER_MULTI;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netif_msg_link(priv))</div><div class='del'>-			dev_info(&amp;dev-&gt;dev, "normal mode\n");</div><div class='add'>+			netdev_info(dev, "normal mode\n");</div><div class='ctx'> 		priv-&gt;rxfilter = RXFILTER_NORMAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1436,20 +1422,21 @@ static void enc28j60_setrx_work_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv =</div><div class='ctx'> 		container_of(work, struct enc28j60_net, setrx_work);</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spi-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;rxfilter == RXFILTER_PROMISC) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": promiscuous mode\n");</div><div class='add'>+			dev_printk(KERN_DEBUG, dev, "promiscuous mode\n");</div><div class='ctx'> 		locked_regb_write(priv, ERXFCON, 0x00);</div><div class='ctx'> 	} else if (priv-&gt;rxfilter == RXFILTER_MULTI) {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": multicast mode\n");</div><div class='add'>+			dev_printk(KERN_DEBUG, dev, "multicast mode\n");</div><div class='ctx'> 		locked_regb_write(priv, ERXFCON,</div><div class='ctx'> 					ERXFCON_UCEN | ERXFCON_CRCEN |</div><div class='ctx'> 					ERXFCON_BCEN | ERXFCON_MCEN);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (netif_msg_drv(priv))</div><div class='del'>-			printk(KERN_DEBUG DRV_NAME ": normal mode\n");</div><div class='add'>+			dev_printk(KERN_DEBUG, dev, "normal mode\n");</div><div class='ctx'> 		locked_regb_write(priv, ERXFCON,</div><div class='ctx'> 					ERXFCON_UCEN | ERXFCON_CRCEN |</div><div class='ctx'> 					ERXFCON_BCEN);</div><div class='hunk'>@@ -1468,7 +1455,7 @@ static void enc28j60_restart_work_handler(struct work_struct *work)</div><div class='ctx'> 		enc28j60_net_close(ndev);</div><div class='ctx'> 		ret = enc28j60_net_open(ndev);</div><div class='ctx'> 		if (unlikely(ret)) {</div><div class='del'>-			dev_info(&amp;ndev-&gt;dev, " could not restart %d\n", ret);</div><div class='add'>+			netdev_info(ndev, "could not restart %d\n", ret);</div><div class='ctx'> 			dev_close(ndev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1552,14 +1539,13 @@ static const struct net_device_ops enc28j60_netdev_ops = {</div><div class='ctx'> </div><div class='ctx'> static int enc28j60_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='add'>+	unsigned char macaddr[ETH_ALEN];</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct enc28j60_net *priv;</div><div class='del'>-	const void *macaddr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_drv(&amp;debug))</div><div class='del'>-		dev_info(&amp;spi-&gt;dev, DRV_NAME " Ethernet driver %s loaded\n",</div><div class='del'>-			DRV_VERSION);</div><div class='add'>+		dev_info(&amp;spi-&gt;dev, "Ethernet driver %s loaded\n", DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct enc28j60_net));</div><div class='ctx'> 	if (!dev) {</div><div class='hunk'>@@ -1570,8 +1556,7 @@ static int enc28j60_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;netdev = dev;	/* priv to netdev reference */</div><div class='ctx'> 	priv-&gt;spi = spi;	/* priv to spi reference */</div><div class='del'>-	priv-&gt;msg_enable = netif_msg_init(debug.msg_enable,</div><div class='del'>-						ENC28J60_MSG_DEFAULT);</div><div class='add'>+	priv-&gt;msg_enable = netif_msg_init(debug.msg_enable, ENC28J60_MSG_DEFAULT);</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;lock);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;tx_work, enc28j60_tx_work_handler);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;setrx_work, enc28j60_setrx_work_handler);</div><div class='hunk'>@@ -1582,13 +1567,12 @@ static int enc28j60_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	if (!enc28j60_chipset_init(dev)) {</div><div class='ctx'> 		if (netif_msg_probe(priv))</div><div class='del'>-			dev_info(&amp;spi-&gt;dev, DRV_NAME " chip not found\n");</div><div class='add'>+			dev_info(&amp;spi-&gt;dev, "chip not found\n");</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto error_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	macaddr = of_get_mac_address(spi-&gt;dev.of_node);</div><div class='del'>-	if (macaddr)</div><div class='add'>+	if (device_get_mac_address(&amp;spi-&gt;dev, macaddr, sizeof(macaddr)))</div><div class='ctx'> 		ether_addr_copy(dev-&gt;dev_addr, macaddr);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(dev);</div><div class='hunk'>@@ -1600,8 +1584,8 @@ static int enc28j60_probe(struct spi_device *spi)</div><div class='ctx'> 	ret = request_irq(spi-&gt;irq, enc28j60_irq, 0, DRV_NAME, priv);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (netif_msg_probe(priv))</div><div class='del'>-			dev_err(&amp;spi-&gt;dev, DRV_NAME ": request irq %d failed "</div><div class='del'>-				"(ret = %d)\n", spi-&gt;irq, ret);</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "request irq %d failed (ret = %d)\n",</div><div class='add'>+				spi-&gt;irq, ret);</div><div class='ctx'> 		goto error_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1616,11 +1600,10 @@ static int enc28j60_probe(struct spi_device *spi)</div><div class='ctx'> 	ret = register_netdev(dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (netif_msg_probe(priv))</div><div class='del'>-			dev_err(&amp;spi-&gt;dev, "register netdev " DRV_NAME</div><div class='del'>-				" failed (ret = %d)\n", ret);</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "register netdev failed (ret = %d)\n",</div><div class='add'>+				ret);</div><div class='ctx'> 		goto error_register;</div><div class='ctx'> 	}</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, DRV_NAME " driver registered\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1636,9 +1619,6 @@ static int enc28j60_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct enc28j60_net *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_drv(priv))</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME ": remove\n");</div><div class='del'>-</div><div class='ctx'> 	unregister_netdev(priv-&gt;netdev);</div><div class='ctx'> 	free_irq(spi-&gt;irq, priv);</div><div class='ctx'> 	free_netdev(priv-&gt;netdev);</div><div class='hunk'>@@ -1660,22 +1640,7 @@ static struct spi_driver enc28j60_driver = {</div><div class='ctx'> 	.probe = enc28j60_probe,</div><div class='ctx'> 	.remove = enc28j60_remove,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init enc28j60_init(void)</div><div class='del'>-{</div><div class='del'>-	msec20_to_jiffies = msecs_to_jiffies(20);</div><div class='del'>-</div><div class='del'>-	return spi_register_driver(&amp;enc28j60_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(enc28j60_init);</div><div class='del'>-</div><div class='del'>-static void __exit enc28j60_exit(void)</div><div class='del'>-{</div><div class='del'>-	spi_unregister_driver(&amp;enc28j60_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(enc28j60_exit);</div><div class='add'>+module_spi_driver(enc28j60_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION(DRV_NAME " ethernet driver");</div><div class='ctx'> MODULE_AUTHOR("Claudio Lanconelli &lt;lanconelli.claudio@eptar.com&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c<br/>index a1d0d6e42533..d715ef4fc92f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mscc/ocelot.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/mscc/ocelot.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/mscc/ocelot.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/mscc/ocelot.c</a></div><div class='hunk'>@@ -613,7 +613,7 @@ static int ocelot_mact_mc_add(struct ocelot_port *port,</div><div class='ctx'> 			      struct netdev_hw_addr *hw_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ocelot *ocelot = port-&gt;ocelot;</div><div class='del'>-	struct netdev_hw_addr *ha = kzalloc(sizeof(*ha), GFP_KERNEL);</div><div class='add'>+	struct netdev_hw_addr *ha = kzalloc(sizeof(*ha), GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (!ha)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -959,10 +959,8 @@ static void ocelot_get_strings(struct net_device *netdev, u32 sset, u8 *data)</div><div class='ctx'> 		       ETH_GSTRING_LEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ocelot_check_stats(struct work_struct *work)</div><div class='add'>+static void ocelot_update_stats(struct ocelot *ocelot)</div><div class='ctx'> {</div><div class='del'>-	struct delayed_work *del_work = to_delayed_work(work);</div><div class='del'>-	struct ocelot *ocelot = container_of(del_work, struct ocelot, stats_work);</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ocelot-&gt;stats_lock);</div><div class='hunk'>@@ -986,11 +984,19 @@ static void ocelot_check_stats(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work(&amp;ocelot-&gt;stats_work);</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocelot_check_stats_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *del_work = to_delayed_work(work);</div><div class='add'>+	struct ocelot *ocelot = container_of(del_work, struct ocelot,</div><div class='add'>+					     stats_work);</div><div class='add'>+</div><div class='add'>+	ocelot_update_stats(ocelot);</div><div class='add'>+</div><div class='ctx'> 	queue_delayed_work(ocelot-&gt;stats_queue, &amp;ocelot-&gt;stats_work,</div><div class='ctx'> 			   OCELOT_STATS_CHECK_DELAY);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;ocelot-&gt;stats_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ocelot_get_ethtool_stats(struct net_device *dev,</div><div class='hunk'>@@ -1001,7 +1007,7 @@ static void ocelot_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* check and update now */</div><div class='del'>-	ocelot_check_stats(&amp;ocelot-&gt;stats_work.work);</div><div class='add'>+	ocelot_update_stats(ocelot);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy all counters */</div><div class='ctx'> 	for (i = 0; i &lt; ocelot-&gt;num_stats; i++)</div><div class='hunk'>@@ -1809,7 +1815,7 @@ int ocelot_init(struct ocelot *ocelot)</div><div class='ctx'> 				 ANA_CPUQ_8021_CFG_CPUQ_BPDU_VAL(6),</div><div class='ctx'> 				 ANA_CPUQ_8021_CFG, i);</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;ocelot-&gt;stats_work, ocelot_check_stats);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;ocelot-&gt;stats_work, ocelot_check_stats_work);</div><div class='ctx'> 	queue_delayed_work(ocelot-&gt;stats_queue, &amp;ocelot-&gt;stats_work,</div><div class='ctx'> 			   OCELOT_STATS_CHECK_DELAY);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c<br/>index e0340f778d8f..d8b7fba96d58 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/myricom/myri10ge/myri10ge.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/myricom/myri10ge/myri10ge.c</a></div><div class='hunk'>@@ -1439,7 +1439,6 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)</div><div class='ctx'> 			tx-&gt;queue_active = 0;</div><div class='ctx'> 			put_be32(htonl(1), tx-&gt;send_stop);</div><div class='ctx'> 			mb();</div><div class='del'>-			mmiowb();</div><div class='ctx'> 		}</div><div class='ctx'> 		__netif_tx_unlock(dev_queue);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2861,7 +2860,6 @@ again:</div><div class='ctx'> 		tx-&gt;queue_active = 1;</div><div class='ctx'> 		put_be32(htonl(1), tx-&gt;send_go);</div><div class='ctx'> 		mb();</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	tx-&gt;pkt_start++;</div><div class='ctx'> 	if ((avail - count) &lt; MXGEFW_MAX_SEND_DESC) {</div><div class='head'>diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c<br/>index feda9644289d..3b2ae1a21678 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/s2io.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/s2io.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/s2io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/neterion/s2io.c</a></div><div class='hunk'>@@ -4153,8 +4153,6 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	writeq(val64, &amp;tx_fifo-&gt;List_Control);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	put_off++;</div><div class='ctx'> 	if (put_off == fifo-&gt;tx_curr_put_info.fifo_len + 1)</div><div class='ctx'> 		put_off = 0;</div><div class='head'>diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c<br/>index 7cde387e5ec6..51cd57ab3d95 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-config.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/vxge/vxge-config.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-config.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/neterion/vxge/vxge-config.c</a></div><div class='hunk'>@@ -2366,6 +2366,7 @@ static void *__vxge_hw_blockpool_malloc(struct __vxge_hw_device *devh, u32 size,</div><div class='ctx'> 				dma_object-&gt;addr))) {</div><div class='ctx'> 			vxge_os_dma_free(devh-&gt;pdev, memblock,</div><div class='ctx'> 				&amp;dma_object-&gt;acc_handle);</div><div class='add'>+			memblock = NULL;</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c<br/>index b877acec5cde..1d334f2e0a56 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a></div><div class='hunk'>@@ -1826,7 +1826,6 @@ static int vxge_poll_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> 		vxge_hw_channel_msix_unmask(</div><div class='ctx'> 				(struct __vxge_hw_channel *)ring-&gt;handle,</div><div class='ctx'> 				ring-&gt;rx_vector_no);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We are copying and returning the local variable, in case if after</div><div class='hunk'>@@ -2234,8 +2233,6 @@ static irqreturn_t vxge_tx_msix_handle(int irq, void *dev_id)</div><div class='ctx'> 	vxge_hw_channel_msix_unmask((struct __vxge_hw_channel *)fifo-&gt;handle,</div><div class='ctx'> 				    fifo-&gt;tx_vector_no);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2272,14 +2269,12 @@ vxge_alarm_msix_handle(int irq, void *dev_id)</div><div class='ctx'> 		 */</div><div class='ctx'> 		vxge_hw_vpath_msix_mask(vdev-&gt;vpaths[i].handle, msix_id);</div><div class='ctx'> 		vxge_hw_vpath_msix_clear(vdev-&gt;vpaths[i].handle, msix_id);</div><div class='del'>-		mmiowb();</div><div class='ctx'> </div><div class='ctx'> 		status = vxge_hw_vpath_alarm_process(vdev-&gt;vpaths[i].handle,</div><div class='ctx'> 			vdev-&gt;exec_mode);</div><div class='ctx'> 		if (status == VXGE_HW_OK) {</div><div class='ctx'> 			vxge_hw_vpath_msix_unmask(vdev-&gt;vpaths[i].handle,</div><div class='ctx'> 						  msix_id);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		vxge_debug_intr(VXGE_ERR,</div><div class='head'>diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c<br/>index 59e77e3086bb..709d20d9938f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-traffic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/neterion/vxge/vxge-traffic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-traffic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/neterion/vxge/vxge-traffic.c</a></div><div class='hunk'>@@ -1399,11 +1399,7 @@ static void __vxge_hw_non_offload_db_post(struct __vxge_hw_fifo *fifo,</div><div class='ctx'> 		VXGE_HW_NODBW_GET_NO_SNOOP(no_snoop),</div><div class='ctx'> 		&amp;fifo-&gt;nofl_db-&gt;control_0);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	writeq(txdl_ptr, &amp;fifo-&gt;nofl_db-&gt;txdl_ptr);</div><div class='del'>-</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/Kconfig b/drivers/net/ethernet/netronome/Kconfig<br/>index 549898d5d450..f0d0e09f60e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/Kconfig</a></div><div class='hunk'>@@ -19,6 +19,7 @@ config NFP</div><div class='ctx'> 	tristate "Netronome(R) NFP4000/NFP6000 NIC driver"</div><div class='ctx'> 	depends on PCI &amp;&amp; PCI_MSI</div><div class='ctx'> 	depends on VXLAN || VXLAN=n</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports the Netronome(R) NFP4000/NFP6000 based</div><div class='ctx'> 	  cards working as a advanced Ethernet NIC.  It works with both</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/Makefile b/drivers/net/ethernet/netronome/nfp/Makefile<br/>index 47c708f08ade..87bf784f8e8f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/Makefile</a></div><div class='hunk'>@@ -15,6 +15,7 @@ nfp-objs := \</div><div class='ctx'> 	    nfpcore/nfp_resource.o \</div><div class='ctx'> 	    nfpcore/nfp_rtsym.o \</div><div class='ctx'> 	    nfpcore/nfp_target.o \</div><div class='add'>+	    ccm.o \</div><div class='ctx'> 	    nfp_asm.o \</div><div class='ctx'> 	    nfp_app.o \</div><div class='ctx'> 	    nfp_app_nic.o \</div><div class='hunk'>@@ -42,7 +43,8 @@ nfp-objs += \</div><div class='ctx'> 	    flower/match.o \</div><div class='ctx'> 	    flower/metadata.o \</div><div class='ctx'> 	    flower/offload.o \</div><div class='del'>-	    flower/tunnel_conf.o</div><div class='add'>+	    flower/tunnel_conf.o \</div><div class='add'>+	    flower/qos_conf.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_BPF_SYSCALL),y)</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/abm/cls.c b/drivers/net/ethernet/netronome/nfp/abm/cls.c<br/>index 9852080cf454..ff3913085665 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/abm/cls.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/abm/cls.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/abm/cls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/abm/cls.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ nfp_abm_u32_check_knode(struct nfp_abm *abm, struct tc_cls_u32_knode *knode,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (knode-&gt;sel-&gt;off || knode-&gt;sel-&gt;offshift || knode-&gt;sel-&gt;offmask ||</div><div class='ctx'> 	    knode-&gt;sel-&gt;offoff || knode-&gt;fshift) {</div><div class='del'>-		NL_SET_ERR_MSG_MOD(extack, "variable offseting not supported");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "variable offsetting not supported");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (knode-&gt;sel-&gt;hoff || knode-&gt;sel-&gt;hmask) {</div><div class='hunk'>@@ -78,7 +78,7 @@ nfp_abm_u32_check_knode(struct nfp_abm *abm, struct tc_cls_u32_knode *knode,</div><div class='ctx'> </div><div class='ctx'> 	k = &amp;knode-&gt;sel-&gt;keys[0];</div><div class='ctx'> 	if (k-&gt;offmask) {</div><div class='del'>-		NL_SET_ERR_MSG_MOD(extack, "offset mask - variable offseting not supported");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "offset mask - variable offsetting not supported");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (k-&gt;off) {</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/abm/ctrl.c b/drivers/net/ethernet/netronome/nfp/abm/ctrl.c<br/>index 9584f03f3efa..69e84ff7f2e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/abm/ctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/abm/ctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/abm/ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/abm/ctrl.c</a></div><div class='hunk'>@@ -261,10 +261,15 @@ int nfp_abm_ctrl_qm_disable(struct nfp_abm *abm)</div><div class='ctx'> </div><div class='ctx'> int nfp_abm_ctrl_prio_map_update(struct nfp_abm_link *alink, u32 *packed)</div><div class='ctx'> {</div><div class='add'>+	const u32 cmd = NFP_NET_CFG_MBOX_CMD_PCI_DSCP_PRIOMAP_SET;</div><div class='ctx'> 	struct nfp_net *nn = alink-&gt;vnic;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = nfp_net_mbox_lock(nn, alink-&gt;abm-&gt;prio_map_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/* Write data_len and wipe reserved */</div><div class='ctx'> 	nn_writeq(nn, nn-&gt;tlv_caps.mbox_off + NFP_NET_ABM_MBOX_DATALEN,</div><div class='ctx'> 		  alink-&gt;abm-&gt;prio_map_len);</div><div class='hunk'>@@ -273,8 +278,7 @@ int nfp_abm_ctrl_prio_map_update(struct nfp_abm_link *alink, u32 *packed)</div><div class='ctx'> 		nn_writel(nn, nn-&gt;tlv_caps.mbox_off + NFP_NET_ABM_MBOX_DATA + i,</div><div class='ctx'> 			  packed[i / sizeof(u32)]);</div><div class='ctx'> </div><div class='del'>-	err = nfp_net_reconfig_mbox(nn,</div><div class='del'>-				    NFP_NET_CFG_MBOX_CMD_PCI_DSCP_PRIOMAP_SET);</div><div class='add'>+	err = nfp_net_mbox_reconfig_and_unlock(nn, cmd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		nfp_err(alink-&gt;abm-&gt;app-&gt;cpp,</div><div class='ctx'> 			"setting DSCP -&gt; VQ map failed with error %d\n", err);</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c<br/>index 4d4ff5844c47..9183b3e85d21 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/abm/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/abm/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/abm/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/abm/main.c</a></div><div class='hunk'>@@ -53,7 +53,8 @@ nfp_abm_setup_tc(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device *nfp_abm_repr_get(struct nfp_app *app, u32 port_id)</div><div class='add'>+static struct net_device *</div><div class='add'>+nfp_abm_repr_get(struct nfp_app *app, u32 port_id, bool *redir_egress)</div><div class='ctx'> {</div><div class='ctx'> 	enum nfp_repr_type rtype;</div><div class='ctx'> 	struct nfp_reprs *reprs;</div><div class='hunk'>@@ -549,5 +550,5 @@ const struct nfp_app_type app_abm = {</div><div class='ctx'> 	.eswitch_mode_get	= nfp_abm_eswitch_mode_get,</div><div class='ctx'> 	.eswitch_mode_set	= nfp_abm_eswitch_mode_set,</div><div class='ctx'> </div><div class='del'>-	.repr_get	= nfp_abm_repr_get,</div><div class='add'>+	.dev_get	= nfp_abm_repr_get,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c<br/>index 9b6cfa697879..bc9850e4ec5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/cmsg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/bpf/cmsg.c</a></div><div class='hunk'>@@ -6,48 +6,13 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "../ccm.h"</div><div class='ctx'> #include "../nfp_app.h"</div><div class='ctx'> #include "../nfp_net.h"</div><div class='ctx'> #include "fw.h"</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-#define NFP_BPF_TAG_ALLOC_SPAN	(U16_MAX / 4)</div><div class='del'>-</div><div class='del'>-static bool nfp_bpf_all_tags_busy(struct nfp_app_bpf *bpf)</div><div class='del'>-{</div><div class='del'>-	u16 used_tags;</div><div class='del'>-</div><div class='del'>-	used_tags = bpf-&gt;tag_alloc_next - bpf-&gt;tag_alloc_last;</div><div class='del'>-</div><div class='del'>-	return used_tags &gt; NFP_BPF_TAG_ALLOC_SPAN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nfp_bpf_alloc_tag(struct nfp_app_bpf *bpf)</div><div class='del'>-{</div><div class='del'>-	/* All FW communication for BPF is request-reply.  To make sure we</div><div class='del'>-	 * don't reuse the message ID too early after timeout - limit the</div><div class='del'>-	 * number of requests in flight.</div><div class='del'>-	 */</div><div class='del'>-	if (nfp_bpf_all_tags_busy(bpf)) {</div><div class='del'>-		cmsg_warn(bpf, "all FW request contexts busy!\n");</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(__test_and_set_bit(bpf-&gt;tag_alloc_next, bpf-&gt;tag_allocator));</div><div class='del'>-	return bpf-&gt;tag_alloc_next++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfp_bpf_free_tag(struct nfp_app_bpf *bpf, u16 tag)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(!__test_and_clear_bit(tag, bpf-&gt;tag_allocator));</div><div class='del'>-</div><div class='del'>-	while (!test_bit(bpf-&gt;tag_alloc_last, bpf-&gt;tag_allocator) &amp;&amp;</div><div class='del'>-	       bpf-&gt;tag_alloc_last != bpf-&gt;tag_alloc_next)</div><div class='del'>-		bpf-&gt;tag_alloc_last++;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct sk_buff *</div><div class='ctx'> nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bpf, unsigned int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -87,149 +52,6 @@ nfp_bpf_cmsg_map_reply_size(struct nfp_app_bpf *bpf, unsigned int n)</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 nfp_bpf_cmsg_get_type(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct cmsg_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	hdr = (struct cmsg_hdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	return hdr-&gt;type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int nfp_bpf_cmsg_get_tag(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct cmsg_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	hdr = (struct cmsg_hdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	return be16_to_cpu(hdr-&gt;tag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *__nfp_bpf_reply(struct nfp_app_bpf *bpf, u16 tag)</div><div class='del'>-{</div><div class='del'>-	unsigned int msg_tag;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb_queue_walk(&amp;bpf-&gt;cmsg_replies, skb) {</div><div class='del'>-		msg_tag = nfp_bpf_cmsg_get_tag(skb);</div><div class='del'>-		if (msg_tag == tag) {</div><div class='del'>-			nfp_bpf_free_tag(bpf, tag);</div><div class='del'>-			__skb_unlink(skb, &amp;bpf-&gt;cmsg_replies);</div><div class='del'>-			return skb;</div><div class='del'>-		}</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 struct sk_buff *nfp_bpf_reply(struct nfp_app_bpf *bpf, u16 tag)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	nfp_ctrl_lock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-	skb = __nfp_bpf_reply(bpf, tag);</div><div class='del'>-	nfp_ctrl_unlock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *nfp_bpf_reply_drop_tag(struct nfp_app_bpf *bpf, u16 tag)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	nfp_ctrl_lock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-	skb = __nfp_bpf_reply(bpf, tag);</div><div class='del'>-	if (!skb)</div><div class='del'>-		nfp_bpf_free_tag(bpf, tag);</div><div class='del'>-	nfp_ctrl_unlock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *</div><div class='del'>-nfp_bpf_cmsg_wait_reply(struct nfp_app_bpf *bpf, enum nfp_bpf_cmsg_type type,</div><div class='del'>-			int tag)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 50; i++) {</div><div class='del'>-		udelay(4);</div><div class='del'>-		skb = nfp_bpf_reply(bpf, tag);</div><div class='del'>-		if (skb)</div><div class='del'>-			return skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = wait_event_interruptible_timeout(bpf-&gt;cmsg_wq,</div><div class='del'>-					       skb = nfp_bpf_reply(bpf, tag),</div><div class='del'>-					       msecs_to_jiffies(5000));</div><div class='del'>-	/* We didn't get a response - try last time and atomically drop</div><div class='del'>-	 * the tag even if no response is matched.</div><div class='del'>-	 */</div><div class='del'>-	if (!skb)</div><div class='del'>-		skb = nfp_bpf_reply_drop_tag(bpf, tag);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		cmsg_warn(bpf, "%s waiting for response to 0x%02x: %d\n",</div><div class='del'>-			  err == ERESTARTSYS ? "interrupted" : "error",</div><div class='del'>-			  type, err);</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-	if (!skb) {</div><div class='del'>-		cmsg_warn(bpf, "timeout waiting for response to 0x%02x\n",</div><div class='del'>-			  type);</div><div class='del'>-		return ERR_PTR(-ETIMEDOUT);</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 struct sk_buff *</div><div class='del'>-nfp_bpf_cmsg_communicate(struct nfp_app_bpf *bpf, struct sk_buff *skb,</div><div class='del'>-			 enum nfp_bpf_cmsg_type type, unsigned int reply_size)</div><div class='del'>-{</div><div class='del'>-	struct cmsg_hdr *hdr;</div><div class='del'>-	int tag;</div><div class='del'>-</div><div class='del'>-	nfp_ctrl_lock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-	tag = nfp_bpf_alloc_tag(bpf);</div><div class='del'>-	if (tag &lt; 0) {</div><div class='del'>-		nfp_ctrl_unlock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return ERR_PTR(tag);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = (void *)skb-&gt;data;</div><div class='del'>-	hdr-&gt;ver = CMSG_MAP_ABI_VERSION;</div><div class='del'>-	hdr-&gt;type = type;</div><div class='del'>-	hdr-&gt;tag = cpu_to_be16(tag);</div><div class='del'>-</div><div class='del'>-	__nfp_app_ctrl_tx(bpf-&gt;app, skb);</div><div class='del'>-</div><div class='del'>-	nfp_ctrl_unlock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-</div><div class='del'>-	skb = nfp_bpf_cmsg_wait_reply(bpf, type, tag);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return skb;</div><div class='del'>-</div><div class='del'>-	hdr = (struct cmsg_hdr *)skb-&gt;data;</div><div class='del'>-	if (hdr-&gt;type != __CMSG_REPLY(type)) {</div><div class='del'>-		cmsg_warn(bpf, "cmsg drop - wrong type 0x%02x != 0x%02lx!\n",</div><div class='del'>-			  hdr-&gt;type, __CMSG_REPLY(type));</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-	/* 0 reply_size means caller will do the validation */</div><div class='del'>-	if (reply_size &amp;&amp; skb-&gt;len != reply_size) {</div><div class='del'>-		cmsg_warn(bpf, "cmsg drop - type 0x%02x wrong size %d != %d!\n",</div><div class='del'>-			  type, skb-&gt;len, reply_size);</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-err_free:</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='del'>-	return ERR_PTR(-EIO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> nfp_bpf_ctrl_rc_to_errno(struct nfp_app_bpf *bpf,</div><div class='ctx'> 			 struct cmsg_reply_map_simple *reply)</div><div class='hunk'>@@ -275,8 +97,8 @@ nfp_bpf_ctrl_alloc_map(struct nfp_app_bpf *bpf, struct bpf_map *map)</div><div class='ctx'> 	req-&gt;map_type = cpu_to_be32(map-&gt;map_type);</div><div class='ctx'> 	req-&gt;map_flags = 0;</div><div class='ctx'> </div><div class='del'>-	skb = nfp_bpf_cmsg_communicate(bpf, skb, CMSG_TYPE_MAP_ALLOC,</div><div class='del'>-				       sizeof(*reply));</div><div class='add'>+	skb = nfp_ccm_communicate(&amp;bpf-&gt;ccm, skb, NFP_CCM_TYPE_BPF_MAP_ALLOC,</div><div class='add'>+				  sizeof(*reply));</div><div class='ctx'> 	if (IS_ERR(skb))</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -310,8 +132,8 @@ void nfp_bpf_ctrl_free_map(struct nfp_app_bpf *bpf, struct nfp_bpf_map *nfp_map)</div><div class='ctx'> 	req = (void *)skb-&gt;data;</div><div class='ctx'> 	req-&gt;tid = cpu_to_be32(nfp_map-&gt;tid);</div><div class='ctx'> </div><div class='del'>-	skb = nfp_bpf_cmsg_communicate(bpf, skb, CMSG_TYPE_MAP_FREE,</div><div class='del'>-				       sizeof(*reply));</div><div class='add'>+	skb = nfp_ccm_communicate(&amp;bpf-&gt;ccm, skb, NFP_CCM_TYPE_BPF_MAP_FREE,</div><div class='add'>+				  sizeof(*reply));</div><div class='ctx'> 	if (IS_ERR(skb)) {</div><div class='ctx'> 		cmsg_warn(bpf, "leaking map - I/O error\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -354,8 +176,7 @@ nfp_bpf_ctrl_reply_val(struct nfp_app_bpf *bpf, struct cmsg_reply_map_op *reply,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfp_bpf_ctrl_entry_op(struct bpf_offloaded_map *offmap,</div><div class='del'>-		      enum nfp_bpf_cmsg_type op,</div><div class='add'>+nfp_bpf_ctrl_entry_op(struct bpf_offloaded_map *offmap, enum nfp_ccm_type op,</div><div class='ctx'> 		      u8 *key, u8 *value, u64 flags, u8 *out_key, u8 *out_value)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_bpf_map *nfp_map = offmap-&gt;dev_priv;</div><div class='hunk'>@@ -386,8 +207,8 @@ nfp_bpf_ctrl_entry_op(struct bpf_offloaded_map *offmap,</div><div class='ctx'> 		memcpy(nfp_bpf_ctrl_req_val(bpf, req, 0), value,</div><div class='ctx'> 		       map-&gt;value_size);</div><div class='ctx'> </div><div class='del'>-	skb = nfp_bpf_cmsg_communicate(bpf, skb, op,</div><div class='del'>-				       nfp_bpf_cmsg_map_reply_size(bpf, 1));</div><div class='add'>+	skb = nfp_ccm_communicate(&amp;bpf-&gt;ccm, skb, op,</div><div class='add'>+				  nfp_bpf_cmsg_map_reply_size(bpf, 1));</div><div class='ctx'> 	if (IS_ERR(skb))</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -415,34 +236,34 @@ err_free:</div><div class='ctx'> int nfp_bpf_ctrl_update_entry(struct bpf_offloaded_map *offmap,</div><div class='ctx'> 			      void *key, void *value, u64 flags)</div><div class='ctx'> {</div><div class='del'>-	return nfp_bpf_ctrl_entry_op(offmap, CMSG_TYPE_MAP_UPDATE,</div><div class='add'>+	return nfp_bpf_ctrl_entry_op(offmap, NFP_CCM_TYPE_BPF_MAP_UPDATE,</div><div class='ctx'> 				     key, value, flags, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nfp_bpf_ctrl_del_entry(struct bpf_offloaded_map *offmap, void *key)</div><div class='ctx'> {</div><div class='del'>-	return nfp_bpf_ctrl_entry_op(offmap, CMSG_TYPE_MAP_DELETE,</div><div class='add'>+	return nfp_bpf_ctrl_entry_op(offmap, NFP_CCM_TYPE_BPF_MAP_DELETE,</div><div class='ctx'> 				     key, NULL, 0, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nfp_bpf_ctrl_lookup_entry(struct bpf_offloaded_map *offmap,</div><div class='ctx'> 			      void *key, void *value)</div><div class='ctx'> {</div><div class='del'>-	return nfp_bpf_ctrl_entry_op(offmap, CMSG_TYPE_MAP_LOOKUP,</div><div class='add'>+	return nfp_bpf_ctrl_entry_op(offmap, NFP_CCM_TYPE_BPF_MAP_LOOKUP,</div><div class='ctx'> 				     key, NULL, 0, NULL, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nfp_bpf_ctrl_getfirst_entry(struct bpf_offloaded_map *offmap,</div><div class='ctx'> 				void *next_key)</div><div class='ctx'> {</div><div class='del'>-	return nfp_bpf_ctrl_entry_op(offmap, CMSG_TYPE_MAP_GETFIRST,</div><div class='add'>+	return nfp_bpf_ctrl_entry_op(offmap, NFP_CCM_TYPE_BPF_MAP_GETFIRST,</div><div class='ctx'> 				     NULL, NULL, 0, next_key, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nfp_bpf_ctrl_getnext_entry(struct bpf_offloaded_map *offmap,</div><div class='ctx'> 			       void *key, void *next_key)</div><div class='ctx'> {</div><div class='del'>-	return nfp_bpf_ctrl_entry_op(offmap, CMSG_TYPE_MAP_GETNEXT,</div><div class='add'>+	return nfp_bpf_ctrl_entry_op(offmap, NFP_CCM_TYPE_BPF_MAP_GETNEXT,</div><div class='ctx'> 				     key, NULL, 0, next_key, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -456,54 +277,35 @@ unsigned int nfp_bpf_ctrl_cmsg_mtu(struct nfp_app_bpf *bpf)</div><div class='ctx'> void nfp_bpf_ctrl_msg_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_app_bpf *bpf = app-&gt;priv;</div><div class='del'>-	unsigned int tag;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb-&gt;len &lt; sizeof(struct cmsg_reply_map_simple))) {</div><div class='ctx'> 		cmsg_warn(bpf, "cmsg drop - too short %d!\n", skb-&gt;len);</div><div class='del'>-		goto err_free;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nfp_bpf_cmsg_get_type(skb) == CMSG_TYPE_BPF_EVENT) {</div><div class='add'>+	if (nfp_ccm_get_type(skb) == NFP_CCM_TYPE_BPF_BPF_EVENT) {</div><div class='ctx'> 		if (!nfp_bpf_event_output(bpf, skb-&gt;data, skb-&gt;len))</div><div class='ctx'> 			dev_consume_skb_any(skb);</div><div class='ctx'> 		else</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nfp_ctrl_lock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-</div><div class='del'>-	tag = nfp_bpf_cmsg_get_tag(skb);</div><div class='del'>-	if (unlikely(!test_bit(tag, bpf-&gt;tag_allocator))) {</div><div class='del'>-		cmsg_warn(bpf, "cmsg drop - no one is waiting for tag %u!\n",</div><div class='del'>-			  tag);</div><div class='del'>-		goto err_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__skb_queue_tail(&amp;bpf-&gt;cmsg_replies, skb);</div><div class='del'>-	wake_up_interruptible_all(&amp;bpf-&gt;cmsg_wq);</div><div class='del'>-</div><div class='del'>-	nfp_ctrl_unlock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-err_unlock:</div><div class='del'>-	nfp_ctrl_unlock(bpf-&gt;app-&gt;ctrl);</div><div class='del'>-err_free:</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='add'>+	nfp_ccm_rx(&amp;bpf-&gt;ccm, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> nfp_bpf_ctrl_msg_rx_raw(struct nfp_app *app, const void *data, unsigned int len)</div><div class='ctx'> {</div><div class='add'>+	const struct nfp_ccm_hdr *hdr = data;</div><div class='ctx'> 	struct nfp_app_bpf *bpf = app-&gt;priv;</div><div class='del'>-	const struct cmsg_hdr *hdr = data;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(len &lt; sizeof(struct cmsg_reply_map_simple))) {</div><div class='ctx'> 		cmsg_warn(bpf, "cmsg drop - too short %d!\n", len);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hdr-&gt;type == CMSG_TYPE_BPF_EVENT)</div><div class='add'>+	if (hdr-&gt;type == NFP_CCM_TYPE_BPF_BPF_EVENT)</div><div class='ctx'> 		nfp_bpf_event_output(bpf, data, len);</div><div class='ctx'> 	else</div><div class='ctx'> 		cmsg_warn(bpf, "cmsg drop - msg type %d with raw buffer!\n",</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/bpf/fw.h b/drivers/net/ethernet/netronome/nfp/bpf/fw.h<br/>index 721921bcf120..06c4286bd79e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/fw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/fw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/bpf/fw.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include "../ccm.h"</div><div class='ctx'> </div><div class='ctx'> /* Kernel's enum bpf_reg_type is not uABI so people may change it breaking</div><div class='ctx'>  * our FW ABI.  In that case we will do translation in the driver.</div><div class='hunk'>@@ -52,22 +53,6 @@ struct nfp_bpf_cap_tlv_maps {</div><div class='ctx'> /*</div><div class='ctx'>  * Types defined for map related control messages</div><div class='ctx'>  */</div><div class='del'>-#define CMSG_MAP_ABI_VERSION		1</div><div class='del'>-</div><div class='del'>-enum nfp_bpf_cmsg_type {</div><div class='del'>-	CMSG_TYPE_MAP_ALLOC	= 1,</div><div class='del'>-	CMSG_TYPE_MAP_FREE	= 2,</div><div class='del'>-	CMSG_TYPE_MAP_LOOKUP	= 3,</div><div class='del'>-	CMSG_TYPE_MAP_UPDATE	= 4,</div><div class='del'>-	CMSG_TYPE_MAP_DELETE	= 5,</div><div class='del'>-	CMSG_TYPE_MAP_GETNEXT	= 6,</div><div class='del'>-	CMSG_TYPE_MAP_GETFIRST	= 7,</div><div class='del'>-	CMSG_TYPE_BPF_EVENT	= 8,</div><div class='del'>-	__CMSG_TYPE_MAP_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CMSG_TYPE_MAP_REPLY_BIT		7</div><div class='del'>-#define __CMSG_REPLY(req)		(BIT(CMSG_TYPE_MAP_REPLY_BIT) | (req))</div><div class='ctx'> </div><div class='ctx'> /* BPF ABIv2 fixed-length control message fields */</div><div class='ctx'> #define CMSG_MAP_KEY_LW			16</div><div class='hunk'>@@ -84,19 +69,13 @@ enum nfp_bpf_cmsg_status {</div><div class='ctx'> 	CMSG_RC_ERR_MAP_E2BIG		= 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct cmsg_hdr {</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 ver;</div><div class='del'>-	__be16 tag;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct cmsg_reply_map_simple {</div><div class='del'>-	struct cmsg_hdr hdr;</div><div class='add'>+	struct nfp_ccm_hdr hdr;</div><div class='ctx'> 	__be32 rc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmsg_req_map_alloc_tbl {</div><div class='del'>-	struct cmsg_hdr hdr;</div><div class='add'>+	struct nfp_ccm_hdr hdr;</div><div class='ctx'> 	__be32 key_size;		/* in bytes */</div><div class='ctx'> 	__be32 value_size;		/* in bytes */</div><div class='ctx'> 	__be32 max_entries;</div><div class='hunk'>@@ -110,7 +89,7 @@ struct cmsg_reply_map_alloc_tbl {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmsg_req_map_free_tbl {</div><div class='del'>-	struct cmsg_hdr hdr;</div><div class='add'>+	struct nfp_ccm_hdr hdr;</div><div class='ctx'> 	__be32 tid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +99,7 @@ struct cmsg_reply_map_free_tbl {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmsg_req_map_op {</div><div class='del'>-	struct cmsg_hdr hdr;</div><div class='add'>+	struct nfp_ccm_hdr hdr;</div><div class='ctx'> 	__be32 tid;</div><div class='ctx'> 	__be32 count;</div><div class='ctx'> 	__be32 flags;</div><div class='hunk'>@@ -135,7 +114,7 @@ struct cmsg_reply_map_op {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cmsg_bpf_event {</div><div class='del'>-	struct cmsg_hdr hdr;</div><div class='add'>+	struct nfp_ccm_hdr hdr;</div><div class='ctx'> 	__be32 cpu_id;</div><div class='ctx'> 	__be64 map_ptr;</div><div class='ctx'> 	__be32 data_size;</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c<br/>index 275de9f4c61c..9c136da25221 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/bpf/main.c</a></div><div class='hunk'>@@ -442,14 +442,16 @@ static int nfp_bpf_init(struct nfp_app *app)</div><div class='ctx'> 	bpf-&gt;app = app;</div><div class='ctx'> 	app-&gt;priv = bpf;</div><div class='ctx'> </div><div class='del'>-	skb_queue_head_init(&amp;bpf-&gt;cmsg_replies);</div><div class='del'>-	init_waitqueue_head(&amp;bpf-&gt;cmsg_wq);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bpf-&gt;map_list);</div><div class='ctx'> </div><div class='del'>-	err = rhashtable_init(&amp;bpf-&gt;maps_neutral, &amp;nfp_bpf_maps_neutral_params);</div><div class='add'>+	err = nfp_ccm_init(&amp;bpf-&gt;ccm, app);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_bpf;</div><div class='ctx'> </div><div class='add'>+	err = rhashtable_init(&amp;bpf-&gt;maps_neutral, &amp;nfp_bpf_maps_neutral_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_clean_ccm;</div><div class='add'>+</div><div class='ctx'> 	nfp_bpf_init_capabilities(bpf);</div><div class='ctx'> </div><div class='ctx'> 	err = nfp_bpf_parse_capabilities(app);</div><div class='hunk'>@@ -474,6 +476,8 @@ static int nfp_bpf_init(struct nfp_app *app)</div><div class='ctx'> </div><div class='ctx'> err_free_neutral_maps:</div><div class='ctx'> 	rhashtable_destroy(&amp;bpf-&gt;maps_neutral);</div><div class='add'>+err_clean_ccm:</div><div class='add'>+	nfp_ccm_clean(&amp;bpf-&gt;ccm);</div><div class='ctx'> err_free_bpf:</div><div class='ctx'> 	kfree(bpf);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -484,7 +488,7 @@ static void nfp_bpf_clean(struct nfp_app *app)</div><div class='ctx'> 	struct nfp_app_bpf *bpf = app-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	bpf_offload_dev_destroy(bpf-&gt;bpf_dev);</div><div class='del'>-	WARN_ON(!skb_queue_empty(&amp;bpf-&gt;cmsg_replies));</div><div class='add'>+	nfp_ccm_clean(&amp;bpf-&gt;ccm);</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;bpf-&gt;map_list));</div><div class='ctx'> 	WARN_ON(bpf-&gt;maps_in_use || bpf-&gt;map_elems_in_use);</div><div class='ctx'> 	rhashtable_free_and_destroy(&amp;bpf-&gt;maps_neutral,</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h<br/>index b25a48218bcf..e54d1ac84df2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/bpf/main.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "../ccm.h"</div><div class='ctx'> #include "../nfp_asm.h"</div><div class='ctx'> #include "fw.h"</div><div class='ctx'> </div><div class='hunk'>@@ -84,16 +85,10 @@ enum pkt_vec {</div><div class='ctx'> /**</div><div class='ctx'>  * struct nfp_app_bpf - bpf app priv structure</div><div class='ctx'>  * @app:		backpointer to the app</div><div class='add'>+ * @ccm:		common control message handler data</div><div class='ctx'>  *</div><div class='ctx'>  * @bpf_dev:		BPF offload device handle</div><div class='ctx'>  *</div><div class='del'>- * @tag_allocator:	bitmap of control message tags in use</div><div class='del'>- * @tag_alloc_next:	next tag bit to allocate</div><div class='del'>- * @tag_alloc_last:	next tag bit to be freed</div><div class='del'>- *</div><div class='del'>- * @cmsg_replies:	received cmsg replies waiting to be consumed</div><div class='del'>- * @cmsg_wq:		work queue for waiting for cmsg replies</div><div class='del'>- *</div><div class='ctx'>  * @cmsg_key_sz:	size of key in cmsg element array</div><div class='ctx'>  * @cmsg_val_sz:	size of value in cmsg element array</div><div class='ctx'>  *</div><div class='hunk'>@@ -132,16 +127,10 @@ enum pkt_vec {</div><div class='ctx'>  */</div><div class='ctx'> struct nfp_app_bpf {</div><div class='ctx'> 	struct nfp_app *app;</div><div class='add'>+	struct nfp_ccm ccm;</div><div class='ctx'> </div><div class='ctx'> 	struct bpf_offload_dev *bpf_dev;</div><div class='ctx'> </div><div class='del'>-	DECLARE_BITMAP(tag_allocator, U16_MAX + 1);</div><div class='del'>-	u16 tag_alloc_next;</div><div class='del'>-	u16 tag_alloc_last;</div><div class='del'>-</div><div class='del'>-	struct sk_buff_head cmsg_replies;</div><div class='del'>-	struct wait_queue_head cmsg_wq;</div><div class='del'>-</div><div class='ctx'> 	unsigned int cmsg_key_sz;</div><div class='ctx'> 	unsigned int cmsg_val_sz;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c<br/>index 15dce97650a5..39c9fec222b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/offload.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/bpf/offload.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/bpf/offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/bpf/offload.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;net/tc_act/tc_mirred.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='add'>+#include "../ccm.h"</div><div class='ctx'> #include "../nfp_app.h"</div><div class='ctx'> #include "../nfp_net_ctrl.h"</div><div class='ctx'> #include "../nfp_net.h"</div><div class='hunk'>@@ -452,7 +453,7 @@ int nfp_bpf_event_output(struct nfp_app_bpf *bpf, const void *data,</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(struct cmsg_bpf_event) + pkt_size + data_size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (cbe-&gt;hdr.ver != CMSG_MAP_ABI_VERSION)</div><div class='add'>+	if (cbe-&gt;hdr.ver != NFP_CCM_ABI_VERSION)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/ccm.c b/drivers/net/ethernet/netronome/nfp/ccm.c<br/>new file mode 100644<br/>index 000000000000..94476e41e261<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/ccm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/ccm.c</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+/* Copyright (C) 2016-2019 Netronome Systems, Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccm.h"</div><div class='add'>+#include "nfp_app.h"</div><div class='add'>+#include "nfp_net.h"</div><div class='add'>+</div><div class='add'>+#define NFP_CCM_TYPE_REPLY_BIT		7</div><div class='add'>+#define __NFP_CCM_REPLY(req)		(BIT(NFP_CCM_TYPE_REPLY_BIT) | (req))</div><div class='add'>+</div><div class='add'>+#define ccm_warn(app, msg...)	nn_dp_warn(&amp;(app)-&gt;ctrl-&gt;dp, msg)</div><div class='add'>+</div><div class='add'>+#define NFP_CCM_TAG_ALLOC_SPAN	(U16_MAX / 4)</div><div class='add'>+</div><div class='add'>+static bool nfp_ccm_all_tags_busy(struct nfp_ccm *ccm)</div><div class='add'>+{</div><div class='add'>+	u16 used_tags;</div><div class='add'>+</div><div class='add'>+	used_tags = ccm-&gt;tag_alloc_next - ccm-&gt;tag_alloc_last;</div><div class='add'>+</div><div class='add'>+	return used_tags &gt; NFP_CCM_TAG_ALLOC_SPAN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfp_ccm_alloc_tag(struct nfp_ccm *ccm)</div><div class='add'>+{</div><div class='add'>+	/* CCM is for FW communication which is request-reply.  To make sure</div><div class='add'>+	 * we don't reuse the message ID too early after timeout - limit the</div><div class='add'>+	 * number of requests in flight.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(nfp_ccm_all_tags_busy(ccm))) {</div><div class='add'>+		ccm_warn(ccm-&gt;app, "all FW request contexts busy!\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(__test_and_set_bit(ccm-&gt;tag_alloc_next, ccm-&gt;tag_allocator));</div><div class='add'>+	return ccm-&gt;tag_alloc_next++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfp_ccm_free_tag(struct nfp_ccm *ccm, u16 tag)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!__test_and_clear_bit(tag, ccm-&gt;tag_allocator));</div><div class='add'>+</div><div class='add'>+	while (!test_bit(ccm-&gt;tag_alloc_last, ccm-&gt;tag_allocator) &amp;&amp;</div><div class='add'>+	       ccm-&gt;tag_alloc_last != ccm-&gt;tag_alloc_next)</div><div class='add'>+		ccm-&gt;tag_alloc_last++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__nfp_ccm_reply(struct nfp_ccm *ccm, u16 tag)</div><div class='add'>+{</div><div class='add'>+	unsigned int msg_tag;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(&amp;ccm-&gt;replies, skb) {</div><div class='add'>+		msg_tag = nfp_ccm_get_tag(skb);</div><div class='add'>+		if (msg_tag == tag) {</div><div class='add'>+			nfp_ccm_free_tag(ccm, tag);</div><div class='add'>+			__skb_unlink(skb, &amp;ccm-&gt;replies);</div><div class='add'>+			return skb;</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 sk_buff *</div><div class='add'>+nfp_ccm_reply(struct nfp_ccm *ccm, struct nfp_app *app, u16 tag)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_lock(app-&gt;ctrl);</div><div class='add'>+	skb = __nfp_ccm_reply(ccm, tag);</div><div class='add'>+	nfp_ctrl_unlock(app-&gt;ctrl);</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 *</div><div class='add'>+nfp_ccm_reply_drop_tag(struct nfp_ccm *ccm, struct nfp_app *app, u16 tag)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_lock(app-&gt;ctrl);</div><div class='add'>+	skb = __nfp_ccm_reply(ccm, tag);</div><div class='add'>+	if (!skb)</div><div class='add'>+		nfp_ccm_free_tag(ccm, tag);</div><div class='add'>+	nfp_ctrl_unlock(app-&gt;ctrl);</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 *</div><div class='add'>+nfp_ccm_wait_reply(struct nfp_ccm *ccm, struct nfp_app *app,</div><div class='add'>+		   enum nfp_ccm_type type, int tag)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 50; i++) {</div><div class='add'>+		udelay(4);</div><div class='add'>+		skb = nfp_ccm_reply(ccm, app, tag);</div><div class='add'>+		if (skb)</div><div class='add'>+			return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = wait_event_interruptible_timeout(ccm-&gt;wq,</div><div class='add'>+					       skb = nfp_ccm_reply(ccm, app,</div><div class='add'>+								   tag),</div><div class='add'>+					       msecs_to_jiffies(5000));</div><div class='add'>+	/* We didn't get a response - try last time and atomically drop</div><div class='add'>+	 * the tag even if no response is matched.</div><div class='add'>+	 */</div><div class='add'>+	if (!skb)</div><div class='add'>+		skb = nfp_ccm_reply_drop_tag(ccm, app, tag);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ccm_warn(app, "%s waiting for response to 0x%02x: %d\n",</div><div class='add'>+			 err == ERESTARTSYS ? "interrupted" : "error",</div><div class='add'>+			 type, err);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ccm_warn(app, "timeout waiting for response to 0x%02x\n", type);</div><div class='add'>+		return ERR_PTR(-ETIMEDOUT);</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'>+struct sk_buff *</div><div class='add'>+nfp_ccm_communicate(struct nfp_ccm *ccm, struct sk_buff *skb,</div><div class='add'>+		    enum nfp_ccm_type type, unsigned int reply_size)</div><div class='add'>+{</div><div class='add'>+	struct nfp_app *app = ccm-&gt;app;</div><div class='add'>+	struct nfp_ccm_hdr *hdr;</div><div class='add'>+	int reply_type, tag;</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_lock(app-&gt;ctrl);</div><div class='add'>+	tag = nfp_ccm_alloc_tag(ccm);</div><div class='add'>+	if (tag &lt; 0) {</div><div class='add'>+		nfp_ctrl_unlock(app-&gt;ctrl);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return ERR_PTR(tag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (void *)skb-&gt;data;</div><div class='add'>+	hdr-&gt;ver = NFP_CCM_ABI_VERSION;</div><div class='add'>+	hdr-&gt;type = type;</div><div class='add'>+	hdr-&gt;tag = cpu_to_be16(tag);</div><div class='add'>+</div><div class='add'>+	__nfp_app_ctrl_tx(app, skb);</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_unlock(app-&gt;ctrl);</div><div class='add'>+</div><div class='add'>+	skb = nfp_ccm_wait_reply(ccm, app, type, tag);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	reply_type = nfp_ccm_get_type(skb);</div><div class='add'>+	if (reply_type != __NFP_CCM_REPLY(type)) {</div><div class='add'>+		ccm_warn(app, "cmsg drop - wrong type 0x%02x != 0x%02lx!\n",</div><div class='add'>+			 reply_type, __NFP_CCM_REPLY(type));</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+	/* 0 reply_size means caller will do the validation */</div><div class='add'>+	if (reply_size &amp;&amp; skb-&gt;len != reply_size) {</div><div class='add'>+		ccm_warn(app, "cmsg drop - type 0x%02x wrong size %d != %d!\n",</div><div class='add'>+			 type, skb-&gt;len, reply_size);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+err_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return ERR_PTR(-EIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfp_ccm_rx(struct nfp_ccm *ccm, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nfp_app *app = ccm-&gt;app;</div><div class='add'>+	unsigned int tag;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb-&gt;len &lt; sizeof(struct nfp_ccm_hdr))) {</div><div class='add'>+		ccm_warn(app, "cmsg drop - too short %d!\n", skb-&gt;len);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_lock(app-&gt;ctrl);</div><div class='add'>+</div><div class='add'>+	tag = nfp_ccm_get_tag(skb);</div><div class='add'>+	if (unlikely(!test_bit(tag, ccm-&gt;tag_allocator))) {</div><div class='add'>+		ccm_warn(app, "cmsg drop - no one is waiting for tag %u!\n",</div><div class='add'>+			 tag);</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__skb_queue_tail(&amp;ccm-&gt;replies, skb);</div><div class='add'>+	wake_up_interruptible_all(&amp;ccm-&gt;wq);</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_unlock(app-&gt;ctrl);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_unlock:</div><div class='add'>+	nfp_ctrl_unlock(app-&gt;ctrl);</div><div class='add'>+err_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfp_ccm_init(struct nfp_ccm *ccm, struct nfp_app *app)</div><div class='add'>+{</div><div class='add'>+	ccm-&gt;app = app;</div><div class='add'>+	skb_queue_head_init(&amp;ccm-&gt;replies);</div><div class='add'>+	init_waitqueue_head(&amp;ccm-&gt;wq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfp_ccm_clean(struct nfp_ccm *ccm)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!skb_queue_empty(&amp;ccm-&gt;replies));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/ccm.h b/drivers/net/ethernet/netronome/nfp/ccm.h<br/>new file mode 100644<br/>index 000000000000..e2fe4b867958<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/ccm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/ccm.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/* Copyright (C) 2016-2019 Netronome Systems, Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef NFP_CCM_H</div><div class='add'>+#define NFP_CCM_H 1</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='add'>+struct nfp_app;</div><div class='add'>+</div><div class='add'>+/* Firmware ABI */</div><div class='add'>+</div><div class='add'>+enum nfp_ccm_type {</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_ALLOC	= 1,</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_FREE	= 2,</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_LOOKUP	= 3,</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_UPDATE	= 4,</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_DELETE	= 5,</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_GETNEXT	= 6,</div><div class='add'>+	NFP_CCM_TYPE_BPF_MAP_GETFIRST	= 7,</div><div class='add'>+	NFP_CCM_TYPE_BPF_BPF_EVENT	= 8,</div><div class='add'>+	__NFP_CCM_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NFP_CCM_ABI_VERSION		1</div><div class='add'>+</div><div class='add'>+struct nfp_ccm_hdr {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 ver;</div><div class='add'>+	__be16 tag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u8 nfp_ccm_get_type(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nfp_ccm_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct nfp_ccm_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	return hdr-&gt;type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int nfp_ccm_get_tag(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nfp_ccm_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct nfp_ccm_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	return be16_to_cpu(hdr-&gt;tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Implementation */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct nfp_ccm - common control message handling</div><div class='add'>+ * @tag_allocator:	bitmap of control message tags in use</div><div class='add'>+ * @tag_alloc_next:	next tag bit to allocate</div><div class='add'>+ * @tag_alloc_last:	next tag bit to be freed</div><div class='add'>+ *</div><div class='add'>+ * @replies:		received cmsg replies waiting to be consumed</div><div class='add'>+ * @wq:			work queue for waiting for cmsg replies</div><div class='add'>+ */</div><div class='add'>+struct nfp_ccm {</div><div class='add'>+	struct nfp_app *app;</div><div class='add'>+</div><div class='add'>+	DECLARE_BITMAP(tag_allocator, U16_MAX + 1);</div><div class='add'>+	u16 tag_alloc_next;</div><div class='add'>+	u16 tag_alloc_last;</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head replies;</div><div class='add'>+	struct wait_queue_head wq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int nfp_ccm_init(struct nfp_ccm *ccm, struct nfp_app *app);</div><div class='add'>+void nfp_ccm_clean(struct nfp_ccm *ccm);</div><div class='add'>+void nfp_ccm_rx(struct nfp_ccm *ccm, struct sk_buff *skb);</div><div class='add'>+struct sk_buff *</div><div class='add'>+nfp_ccm_communicate(struct nfp_ccm *ccm, struct sk_buff *skb,</div><div class='add'>+		    enum nfp_ccm_type type, unsigned int reply_size);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c<br/>index eeda4ed98333..c56e31d9f8a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/action.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/action.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/action.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/action.c</a></div><div class='hunk'>@@ -48,8 +48,7 @@ nfp_fl_push_vlan(struct nfp_fl_push_vlan *push_vlan,</div><div class='ctx'> </div><div class='ctx'> 	tmp_push_vlan_tci =</div><div class='ctx'> 		FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, act-&gt;vlan.prio) |</div><div class='del'>-		FIELD_PREP(NFP_FL_PUSH_VLAN_VID, act-&gt;vlan.vid) |</div><div class='del'>-		NFP_FL_PUSH_VLAN_CFI;</div><div class='add'>+		FIELD_PREP(NFP_FL_PUSH_VLAN_VID, act-&gt;vlan.vid);</div><div class='ctx'> 	push_vlan-&gt;vlan_tci = cpu_to_be16(tmp_push_vlan_tci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -161,9 +160,9 @@ nfp_fl_get_tun_from_act_l4_port(struct nfp_app *app,</div><div class='ctx'> 	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	switch (tun-&gt;key.tp_dst) {</div><div class='del'>-	case htons(NFP_FL_VXLAN_PORT):</div><div class='add'>+	case htons(IANA_VXLAN_UDP_PORT):</div><div class='ctx'> 		return NFP_FL_TUNNEL_VXLAN;</div><div class='del'>-	case htons(NFP_FL_GENEVE_PORT):</div><div class='add'>+	case htons(GENEVE_UDP_PORT):</div><div class='ctx'> 		if (priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_GENEVE)</div><div class='ctx'> 			return NFP_FL_TUNNEL_GENEVE;</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='hunk'>@@ -583,60 +582,23 @@ static u32 nfp_fl_csum_l4_to_flag(u8 ip_proto)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nfp_fl_pedit(const struct flow_action_entry *act,</div><div class='del'>-	     struct tc_cls_flower_offload *flow,</div><div class='del'>-	     char *nfp_action, int *a_len, u32 *csum_updated)</div><div class='del'>-{</div><div class='del'>-	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(flow);</div><div class='add'>+struct nfp_flower_pedit_acts {</div><div class='ctx'> 	struct nfp_fl_set_ipv6_addr set_ip6_dst, set_ip6_src;</div><div class='ctx'> 	struct nfp_fl_set_ipv6_tc_hl_fl set_ip6_tc_hl_fl;</div><div class='ctx'> 	struct nfp_fl_set_ip4_ttl_tos set_ip_ttl_tos;</div><div class='ctx'> 	struct nfp_fl_set_ip4_addrs set_ip_addr;</div><div class='del'>-	enum flow_action_mangle_base htype;</div><div class='ctx'> 	struct nfp_fl_set_tport set_tport;</div><div class='ctx'> 	struct nfp_fl_set_eth set_eth;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfp_fl_commit_mangle(struct tc_cls_flower_offload *flow, char *nfp_action,</div><div class='add'>+		     int *a_len, struct nfp_flower_pedit_acts *set_act,</div><div class='add'>+		     u32 *csum_updated)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(flow);</div><div class='ctx'> 	size_t act_size = 0;</div><div class='ctx'> 	u8 ip_proto = 0;</div><div class='del'>-	u32 offset;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;set_ip6_tc_hl_fl, 0, sizeof(set_ip6_tc_hl_fl));</div><div class='del'>-	memset(&amp;set_ip_ttl_tos, 0, sizeof(set_ip_ttl_tos));</div><div class='del'>-	memset(&amp;set_ip6_dst, 0, sizeof(set_ip6_dst));</div><div class='del'>-	memset(&amp;set_ip6_src, 0, sizeof(set_ip6_src));</div><div class='del'>-	memset(&amp;set_ip_addr, 0, sizeof(set_ip_addr));</div><div class='del'>-	memset(&amp;set_tport, 0, sizeof(set_tport));</div><div class='del'>-	memset(&amp;set_eth, 0, sizeof(set_eth));</div><div class='del'>-</div><div class='del'>-	htype = act-&gt;mangle.htype;</div><div class='del'>-	offset = act-&gt;mangle.offset;</div><div class='del'>-</div><div class='del'>-	switch (htype) {</div><div class='del'>-	case TCA_PEDIT_KEY_EX_HDR_TYPE_ETH:</div><div class='del'>-		err = nfp_fl_set_eth(act, offset, &amp;set_eth);</div><div class='del'>-		break;</div><div class='del'>-	case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4:</div><div class='del'>-		err = nfp_fl_set_ip4(act, offset, &amp;set_ip_addr,</div><div class='del'>-				     &amp;set_ip_ttl_tos);</div><div class='del'>-		break;</div><div class='del'>-	case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6:</div><div class='del'>-		err = nfp_fl_set_ip6(act, offset, &amp;set_ip6_dst,</div><div class='del'>-				     &amp;set_ip6_src, &amp;set_ip6_tc_hl_fl);</div><div class='del'>-		break;</div><div class='del'>-	case TCA_PEDIT_KEY_EX_HDR_TYPE_TCP:</div><div class='del'>-		err = nfp_fl_set_tport(act, offset, &amp;set_tport,</div><div class='del'>-				       NFP_FL_ACTION_OPCODE_SET_TCP);</div><div class='del'>-		break;</div><div class='del'>-	case TCA_PEDIT_KEY_EX_HDR_TYPE_UDP:</div><div class='del'>-		err = nfp_fl_set_tport(act, offset, &amp;set_tport,</div><div class='del'>-				       NFP_FL_ACTION_OPCODE_SET_UDP);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</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'>@@ -645,77 +607,82 @@ nfp_fl_pedit(const struct flow_action_entry *act,</div><div class='ctx'> 		ip_proto = match.key-&gt;ip_proto;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (set_eth.head.len_lw) {</div><div class='del'>-		act_size = sizeof(set_eth);</div><div class='del'>-		memcpy(nfp_action, &amp;set_eth, act_size);</div><div class='add'>+	if (set_act-&gt;set_eth.head.len_lw) {</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_eth);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_eth, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> 	}</div><div class='del'>-	if (set_ip_ttl_tos.head.len_lw) {</div><div class='add'>+</div><div class='add'>+	if (set_act-&gt;set_ip_ttl_tos.head.len_lw) {</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_ip_ttl_tos);</div><div class='del'>-		memcpy(nfp_action, &amp;set_ip_ttl_tos, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip_ttl_tos);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_ip_ttl_tos, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix IPv4 and TCP/UDP checksum. */</div><div class='ctx'> 		*csum_updated |= TCA_CSUM_UPDATE_FLAG_IPV4HDR |</div><div class='ctx'> 				nfp_fl_csum_l4_to_flag(ip_proto);</div><div class='ctx'> 	}</div><div class='del'>-	if (set_ip_addr.head.len_lw) {</div><div class='add'>+</div><div class='add'>+	if (set_act-&gt;set_ip_addr.head.len_lw) {</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_ip_addr);</div><div class='del'>-		memcpy(nfp_action, &amp;set_ip_addr, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip_addr);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_ip_addr, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix IPv4 and TCP/UDP checksum. */</div><div class='ctx'> 		*csum_updated |= TCA_CSUM_UPDATE_FLAG_IPV4HDR |</div><div class='ctx'> 				nfp_fl_csum_l4_to_flag(ip_proto);</div><div class='ctx'> 	}</div><div class='del'>-	if (set_ip6_tc_hl_fl.head.len_lw) {</div><div class='add'>+</div><div class='add'>+	if (set_act-&gt;set_ip6_tc_hl_fl.head.len_lw) {</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_ip6_tc_hl_fl);</div><div class='del'>-		memcpy(nfp_action, &amp;set_ip6_tc_hl_fl, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip6_tc_hl_fl);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_ip6_tc_hl_fl, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix TCP/UDP checksum. */</div><div class='ctx'> 		*csum_updated |= nfp_fl_csum_l4_to_flag(ip_proto);</div><div class='ctx'> 	}</div><div class='del'>-	if (set_ip6_dst.head.len_lw &amp;&amp; set_ip6_src.head.len_lw) {</div><div class='add'>+</div><div class='add'>+	if (set_act-&gt;set_ip6_dst.head.len_lw &amp;&amp;</div><div class='add'>+	    set_act-&gt;set_ip6_src.head.len_lw) {</div><div class='ctx'> 		/* TC compiles set src and dst IPv6 address as a single action,</div><div class='ctx'> 		 * the hardware requires this to be 2 separate actions.</div><div class='ctx'> 		 */</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_ip6_src);</div><div class='del'>-		memcpy(nfp_action, &amp;set_ip6_src, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip6_src);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_ip6_src, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='del'>-		act_size = sizeof(set_ip6_dst);</div><div class='del'>-		memcpy(&amp;nfp_action[sizeof(set_ip6_src)], &amp;set_ip6_dst,</div><div class='del'>-		       act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip6_dst);</div><div class='add'>+		memcpy(&amp;nfp_action[sizeof(set_act-&gt;set_ip6_src)],</div><div class='add'>+		       &amp;set_act-&gt;set_ip6_dst, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix TCP/UDP checksum. */</div><div class='ctx'> 		*csum_updated |= nfp_fl_csum_l4_to_flag(ip_proto);</div><div class='del'>-	} else if (set_ip6_dst.head.len_lw) {</div><div class='add'>+	} else if (set_act-&gt;set_ip6_dst.head.len_lw) {</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_ip6_dst);</div><div class='del'>-		memcpy(nfp_action, &amp;set_ip6_dst, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip6_dst);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_ip6_dst, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix TCP/UDP checksum. */</div><div class='ctx'> 		*csum_updated |= nfp_fl_csum_l4_to_flag(ip_proto);</div><div class='del'>-	} else if (set_ip6_src.head.len_lw) {</div><div class='add'>+	} else if (set_act-&gt;set_ip6_src.head.len_lw) {</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_ip6_src);</div><div class='del'>-		memcpy(nfp_action, &amp;set_ip6_src, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_ip6_src);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_ip6_src, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix TCP/UDP checksum. */</div><div class='ctx'> 		*csum_updated |= nfp_fl_csum_l4_to_flag(ip_proto);</div><div class='ctx'> 	}</div><div class='del'>-	if (set_tport.head.len_lw) {</div><div class='add'>+	if (set_act-&gt;set_tport.head.len_lw) {</div><div class='ctx'> 		nfp_action += act_size;</div><div class='del'>-		act_size = sizeof(set_tport);</div><div class='del'>-		memcpy(nfp_action, &amp;set_tport, act_size);</div><div class='add'>+		act_size = sizeof(set_act-&gt;set_tport);</div><div class='add'>+		memcpy(nfp_action, &amp;set_act-&gt;set_tport, act_size);</div><div class='ctx'> 		*a_len += act_size;</div><div class='ctx'> </div><div class='ctx'> 		/* Hardware will automatically fix TCP/UDP checksum. */</div><div class='hunk'>@@ -726,7 +693,40 @@ nfp_fl_pedit(const struct flow_action_entry *act,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfp_flower_output_action(struct nfp_app *app, const struct flow_action_entry *act,</div><div class='add'>+nfp_fl_pedit(const struct flow_action_entry *act,</div><div class='add'>+	     struct tc_cls_flower_offload *flow, char *nfp_action, int *a_len,</div><div class='add'>+	     u32 *csum_updated, struct nfp_flower_pedit_acts *set_act)</div><div class='add'>+{</div><div class='add'>+	enum flow_action_mangle_base htype;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	htype = act-&gt;mangle.htype;</div><div class='add'>+	offset = act-&gt;mangle.offset;</div><div class='add'>+</div><div class='add'>+	switch (htype) {</div><div class='add'>+	case TCA_PEDIT_KEY_EX_HDR_TYPE_ETH:</div><div class='add'>+		return nfp_fl_set_eth(act, offset, &amp;set_act-&gt;set_eth);</div><div class='add'>+	case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4:</div><div class='add'>+		return nfp_fl_set_ip4(act, offset, &amp;set_act-&gt;set_ip_addr,</div><div class='add'>+				      &amp;set_act-&gt;set_ip_ttl_tos);</div><div class='add'>+	case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6:</div><div class='add'>+		return nfp_fl_set_ip6(act, offset, &amp;set_act-&gt;set_ip6_dst,</div><div class='add'>+				      &amp;set_act-&gt;set_ip6_src,</div><div class='add'>+				      &amp;set_act-&gt;set_ip6_tc_hl_fl);</div><div class='add'>+	case TCA_PEDIT_KEY_EX_HDR_TYPE_TCP:</div><div class='add'>+		return nfp_fl_set_tport(act, offset, &amp;set_act-&gt;set_tport,</div><div class='add'>+					NFP_FL_ACTION_OPCODE_SET_TCP);</div><div class='add'>+	case TCA_PEDIT_KEY_EX_HDR_TYPE_UDP:</div><div class='add'>+		return nfp_fl_set_tport(act, offset, &amp;set_act-&gt;set_tport,</div><div class='add'>+					NFP_FL_ACTION_OPCODE_SET_UDP);</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'>+nfp_flower_output_action(struct nfp_app *app,</div><div class='add'>+			 const struct flow_action_entry *act,</div><div class='ctx'> 			 struct nfp_fl_payload *nfp_fl, int *a_len,</div><div class='ctx'> 			 struct net_device *netdev, bool last,</div><div class='ctx'> 			 enum nfp_flower_tun_type *tun_type, int *tun_out_cnt,</div><div class='hunk'>@@ -776,7 +776,8 @@ nfp_flower_loop_action(struct nfp_app *app, const struct flow_action_entry *act,</div><div class='ctx'> 		       struct nfp_fl_payload *nfp_fl, int *a_len,</div><div class='ctx'> 		       struct net_device *netdev,</div><div class='ctx'> 		       enum nfp_flower_tun_type *tun_type, int *tun_out_cnt,</div><div class='del'>-		       int *out_cnt, u32 *csum_updated)</div><div class='add'>+		       int *out_cnt, u32 *csum_updated,</div><div class='add'>+		       struct nfp_flower_pedit_acts *set_act)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_fl_set_ipv4_udp_tun *set_tun;</div><div class='ctx'> 	struct nfp_fl_pre_tunnel *pre_tun;</div><div class='hunk'>@@ -861,7 +862,7 @@ nfp_flower_loop_action(struct nfp_app *app, const struct flow_action_entry *act,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case FLOW_ACTION_MANGLE:</div><div class='ctx'> 		if (nfp_fl_pedit(act, flow, &amp;nfp_fl-&gt;action_data[*a_len],</div><div class='del'>-				 a_len, csum_updated))</div><div class='add'>+				 a_len, csum_updated, set_act))</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLOW_ACTION_CSUM:</div><div class='hunk'>@@ -881,12 +882,49 @@ nfp_flower_loop_action(struct nfp_app *app, const struct flow_action_entry *act,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool nfp_fl_check_mangle_start(struct flow_action *flow_act,</div><div class='add'>+				      int current_act_idx)</div><div class='add'>+{</div><div class='add'>+	struct flow_action_entry current_act;</div><div class='add'>+	struct flow_action_entry prev_act;</div><div class='add'>+</div><div class='add'>+	current_act = flow_act-&gt;entries[current_act_idx];</div><div class='add'>+	if (current_act.id != FLOW_ACTION_MANGLE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (current_act_idx == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	prev_act = flow_act-&gt;entries[current_act_idx - 1];</div><div class='add'>+</div><div class='add'>+	return prev_act.id != FLOW_ACTION_MANGLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nfp_fl_check_mangle_end(struct flow_action *flow_act,</div><div class='add'>+				    int current_act_idx)</div><div class='add'>+{</div><div class='add'>+	struct flow_action_entry current_act;</div><div class='add'>+	struct flow_action_entry next_act;</div><div class='add'>+</div><div class='add'>+	current_act = flow_act-&gt;entries[current_act_idx];</div><div class='add'>+	if (current_act.id != FLOW_ACTION_MANGLE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (current_act_idx == flow_act-&gt;num_entries)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	next_act = flow_act-&gt;entries[current_act_idx + 1];</div><div class='add'>+</div><div class='add'>+	return next_act.id != FLOW_ACTION_MANGLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int nfp_flower_compile_action(struct nfp_app *app,</div><div class='ctx'> 			      struct tc_cls_flower_offload *flow,</div><div class='ctx'> 			      struct net_device *netdev,</div><div class='ctx'> 			      struct nfp_fl_payload *nfp_flow)</div><div class='ctx'> {</div><div class='ctx'> 	int act_len, act_cnt, err, tun_out_cnt, out_cnt, i;</div><div class='add'>+	struct nfp_flower_pedit_acts set_act;</div><div class='ctx'> 	enum nfp_flower_tun_type tun_type;</div><div class='ctx'> 	struct flow_action_entry *act;</div><div class='ctx'> 	u32 csum_updated = 0;</div><div class='hunk'>@@ -900,12 +938,18 @@ int nfp_flower_compile_action(struct nfp_app *app,</div><div class='ctx'> 	out_cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	flow_action_for_each(i, act, &amp;flow-&gt;rule-&gt;action) {</div><div class='add'>+		if (nfp_fl_check_mangle_start(&amp;flow-&gt;rule-&gt;action, i))</div><div class='add'>+			memset(&amp;set_act, 0, sizeof(set_act));</div><div class='ctx'> 		err = nfp_flower_loop_action(app, act, flow, nfp_flow, &amp;act_len,</div><div class='ctx'> 					     netdev, &amp;tun_type, &amp;tun_out_cnt,</div><div class='del'>-					     &amp;out_cnt, &amp;csum_updated);</div><div class='add'>+					     &amp;out_cnt, &amp;csum_updated, &amp;set_act);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		act_cnt++;</div><div class='add'>+		if (nfp_fl_check_mangle_end(&amp;flow-&gt;rule-&gt;action, i))</div><div class='add'>+			nfp_fl_commit_mangle(flow,</div><div class='add'>+					     &amp;nfp_flow-&gt;action_data[act_len],</div><div class='add'>+					     &amp;act_len, &amp;set_act, &amp;csum_updated);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We optimise when the action list is small, this can unfortunately</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c<br/>index cf9e1118ee8f..d5bbe3d6048b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/cmsg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/cmsg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/cmsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/cmsg.c</a></div><div class='hunk'>@@ -159,7 +159,7 @@ nfp_flower_cmsg_portmod_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	netdev = nfp_app_repr_get(app, be32_to_cpu(msg-&gt;portnum));</div><div class='add'>+	netdev = nfp_app_dev_get(app, be32_to_cpu(msg-&gt;portnum), NULL);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	if (!netdev) {</div><div class='ctx'> 		nfp_flower_cmsg_warn(app, "ctrl msg for unknown port 0x%08x\n",</div><div class='hunk'>@@ -192,7 +192,7 @@ nfp_flower_cmsg_portreify_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> 	msg = nfp_flower_cmsg_get_data(skb);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	exists = !!nfp_app_repr_get(app, be32_to_cpu(msg-&gt;portnum));</div><div class='add'>+	exists = !!nfp_app_dev_get(app, be32_to_cpu(msg-&gt;portnum), NULL);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	if (!exists) {</div><div class='ctx'> 		nfp_flower_cmsg_warn(app, "ctrl msg for unknown port 0x%08x\n",</div><div class='hunk'>@@ -205,6 +205,50 @@ nfp_flower_cmsg_portreify_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+nfp_flower_cmsg_merge_hint_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int msg_len = nfp_flower_cmsg_get_data_len(skb);</div><div class='add'>+	struct nfp_flower_cmsg_merge_hint *msg;</div><div class='add'>+	struct nfp_fl_payload *sub_flows[2];</div><div class='add'>+	int err, i, flow_cnt;</div><div class='add'>+</div><div class='add'>+	msg = nfp_flower_cmsg_get_data(skb);</div><div class='add'>+	/* msg-&gt;count starts at 0 and always assumes at least 1 entry. */</div><div class='add'>+	flow_cnt = msg-&gt;count + 1;</div><div class='add'>+</div><div class='add'>+	if (msg_len &lt; struct_size(msg, flow, flow_cnt)) {</div><div class='add'>+		nfp_flower_cmsg_warn(app, "Merge hint ctrl msg too short - %d bytes but expect %zd\n",</div><div class='add'>+				     msg_len, struct_size(msg, flow, flow_cnt));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_cnt != 2) {</div><div class='add'>+		nfp_flower_cmsg_warn(app, "Merge hint contains %d flows - two are expected\n",</div><div class='add'>+				     flow_cnt);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	for (i = 0; i &lt; flow_cnt; i++) {</div><div class='add'>+		u32 ctx = be32_to_cpu(msg-&gt;flow[i].host_ctx);</div><div class='add'>+</div><div class='add'>+		sub_flows[i] = nfp_flower_get_fl_payload_from_ctx(app, ctx);</div><div class='add'>+		if (!sub_flows[i]) {</div><div class='add'>+			nfp_flower_cmsg_warn(app, "Invalid flow in merge hint\n");</div><div class='add'>+			goto err_rtnl_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_merge_offloaded_flows(app, sub_flows[0], sub_flows[1]);</div><div class='add'>+	/* Only warn on memory fail. Hint veto will not break functionality. */</div><div class='add'>+	if (err == -ENOMEM)</div><div class='add'>+		nfp_flower_cmsg_warn(app, "Flow merge memory fail.\n");</div><div class='add'>+</div><div class='add'>+err_rtnl_unlock:</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> nfp_flower_cmsg_process_one_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_flower_priv *app_priv = app-&gt;priv;</div><div class='hunk'>@@ -222,12 +266,21 @@ nfp_flower_cmsg_process_one_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> 	case NFP_FLOWER_CMSG_TYPE_PORT_MOD:</div><div class='ctx'> 		nfp_flower_cmsg_portmod_rx(app, skb);</div><div class='ctx'> 		break;</div><div class='add'>+	case NFP_FLOWER_CMSG_TYPE_MERGE_HINT:</div><div class='add'>+		if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_FLOW_MERGE) {</div><div class='add'>+			nfp_flower_cmsg_merge_hint_rx(app, skb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		goto err_default;</div><div class='ctx'> 	case NFP_FLOWER_CMSG_TYPE_NO_NEIGH:</div><div class='ctx'> 		nfp_tunnel_request_route(app, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFP_FLOWER_CMSG_TYPE_ACTIVE_TUNS:</div><div class='ctx'> 		nfp_tunnel_keep_alive(app, skb);</div><div class='ctx'> 		break;</div><div class='add'>+	case NFP_FLOWER_CMSG_TYPE_QOS_STATS:</div><div class='add'>+		nfp_flower_stats_rlim_reply(app, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	case NFP_FLOWER_CMSG_TYPE_LAG_CONFIG:</div><div class='ctx'> 		if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_LAG) {</div><div class='ctx'> 			skb_stored = nfp_flower_lag_unprocessed_msg(app, skb);</div><div class='hunk'>@@ -235,6 +288,7 @@ nfp_flower_cmsg_process_one_rx(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	default:</div><div class='add'>+err_default:</div><div class='ctx'> 		nfp_flower_cmsg_warn(app, "Cannot handle invalid repr control type %u\n",</div><div class='ctx'> 				     type);</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h<br/>index 4fcaf11ed56e..537f7fc19584 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/cmsg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/cmsg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/cmsg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/cmsg.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #define NFP_FLOWER_LAYER2_GENEVE_OP	BIT(6)</div><div class='ctx'> </div><div class='ctx'> #define NFP_FLOWER_MASK_VLAN_PRIO	GENMASK(15, 13)</div><div class='del'>-#define NFP_FLOWER_MASK_VLAN_CFI	BIT(12)</div><div class='add'>+#define NFP_FLOWER_MASK_VLAN_PRESENT	BIT(12)</div><div class='ctx'> #define NFP_FLOWER_MASK_VLAN_VID	GENMASK(11, 0)</div><div class='ctx'> </div><div class='ctx'> #define NFP_FLOWER_MASK_MPLS_LB		GENMASK(31, 12)</div><div class='hunk'>@@ -82,7 +82,6 @@</div><div class='ctx'> #define NFP_FL_OUT_FLAGS_TYPE_IDX	GENMASK(2, 0)</div><div class='ctx'> </div><div class='ctx'> #define NFP_FL_PUSH_VLAN_PRIO		GENMASK(15, 13)</div><div class='del'>-#define NFP_FL_PUSH_VLAN_CFI		BIT(12)</div><div class='ctx'> #define NFP_FL_PUSH_VLAN_VID		GENMASK(11, 0)</div><div class='ctx'> </div><div class='ctx'> #define IPV6_FLOW_LABEL_MASK		cpu_to_be32(0x000fffff)</div><div class='hunk'>@@ -403,11 +402,13 @@ struct nfp_flower_cmsg_hdr {</div><div class='ctx'> /* Types defined for port related control messages  */</div><div class='ctx'> enum nfp_flower_cmsg_type_port {</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_FLOW_ADD =		0,</div><div class='add'>+	NFP_FLOWER_CMSG_TYPE_FLOW_MOD =		1,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_FLOW_DEL =		2,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_LAG_CONFIG =	4,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_PORT_REIFY =	6,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_MAC_REPR =		7,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_PORT_MOD =		8,</div><div class='add'>+	NFP_FLOWER_CMSG_TYPE_MERGE_HINT =	9,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_NO_NEIGH =		10,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_TUN_MAC =		11,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_ACTIVE_TUNS =	12,</div><div class='hunk'>@@ -415,6 +416,9 @@ enum nfp_flower_cmsg_type_port {</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_TUN_IPS =		14,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_FLOW_STATS =	15,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_PORT_ECHO =	16,</div><div class='add'>+	NFP_FLOWER_CMSG_TYPE_QOS_MOD =		18,</div><div class='add'>+	NFP_FLOWER_CMSG_TYPE_QOS_DEL =		19,</div><div class='add'>+	NFP_FLOWER_CMSG_TYPE_QOS_STATS =	20,</div><div class='ctx'> 	NFP_FLOWER_CMSG_TYPE_MAX =		32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -452,6 +456,16 @@ struct nfp_flower_cmsg_portreify {</div><div class='ctx'> </div><div class='ctx'> #define NFP_FLOWER_CMSG_PORTREIFY_INFO_EXIST	BIT(0)</div><div class='ctx'> </div><div class='add'>+/* NFP_FLOWER_CMSG_TYPE_FLOW_MERGE_HINT */</div><div class='add'>+struct nfp_flower_cmsg_merge_hint {</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	u8 count;</div><div class='add'>+	struct {</div><div class='add'>+		__be32 host_ctx;</div><div class='add'>+		__be64 host_cookie;</div><div class='add'>+	} __packed flow[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum nfp_flower_cmsg_port_type {</div><div class='ctx'> 	NFP_FLOWER_CMSG_PORT_TYPE_UNSPEC =	0x0,</div><div class='ctx'> 	NFP_FLOWER_CMSG_PORT_TYPE_PHYS_PORT =	0x1,</div><div class='hunk'>@@ -474,6 +488,13 @@ enum nfp_flower_cmsg_port_vnic_type {</div><div class='ctx'> #define NFP_FLOWER_CMSG_PORT_PCIE_Q		GENMASK(5, 0)</div><div class='ctx'> #define NFP_FLOWER_CMSG_PORT_PHYS_PORT_NUM	GENMASK(7, 0)</div><div class='ctx'> </div><div class='add'>+static inline u32 nfp_flower_internal_port_get_port_id(u8 internal_port)</div><div class='add'>+{</div><div class='add'>+	return FIELD_PREP(NFP_FLOWER_CMSG_PORT_PHYS_PORT_NUM, internal_port) |</div><div class='add'>+		FIELD_PREP(NFP_FLOWER_CMSG_PORT_TYPE,</div><div class='add'>+			   NFP_FLOWER_CMSG_PORT_TYPE_OTHER_PORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 nfp_flower_cmsg_phys_port(u8 phys_port)</div><div class='ctx'> {</div><div class='ctx'> 	return FIELD_PREP(NFP_FLOWER_CMSG_PORT_PHYS_PORT_NUM, phys_port) |</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c<br/>index 408089133599..eb846133943b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/main.c</a></div><div class='hunk'>@@ -22,6 +22,9 @@</div><div class='ctx'> </div><div class='ctx'> #define NFP_FLOWER_ALLOWED_VER 0x0001000000010000UL</div><div class='ctx'> </div><div class='add'>+#define NFP_MIN_INT_PORT_ID	1</div><div class='add'>+#define NFP_MAX_INT_PORT_ID	256</div><div class='add'>+</div><div class='ctx'> static const char *nfp_flower_extra_cap(struct nfp_app *app, struct nfp_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	return "FLOWER";</div><div class='hunk'>@@ -32,6 +35,113 @@ static enum devlink_eswitch_mode eswitch_mode_get(struct nfp_app *app)</div><div class='ctx'> 	return DEVLINK_ESWITCH_MODE_SWITCHDEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+nfp_flower_lookup_internal_port_id(struct nfp_flower_priv *priv,</div><div class='add'>+				   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *entry;</div><div class='add'>+	int i, id = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	idr_for_each_entry(&amp;priv-&gt;internal_ports.port_ids, entry, i)</div><div class='add'>+		if (entry == netdev) {</div><div class='add'>+			id = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfp_flower_get_internal_port_id(struct nfp_app *app, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	id = nfp_flower_lookup_internal_port_id(priv, netdev);</div><div class='add'>+	if (id &gt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='add'>+	idr_preload(GFP_ATOMIC);</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;internal_ports.lock);</div><div class='add'>+	id = idr_alloc(&amp;priv-&gt;internal_ports.port_ids, netdev,</div><div class='add'>+		       NFP_MIN_INT_PORT_ID, NFP_MAX_INT_PORT_ID, GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;internal_ports.lock);</div><div class='add'>+	idr_preload_end();</div><div class='add'>+</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 nfp_flower_get_port_id_from_netdev(struct nfp_app *app,</div><div class='add'>+				       struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int ext_port;</div><div class='add'>+</div><div class='add'>+	if (nfp_netdev_is_nfp_repr(netdev)) {</div><div class='add'>+		return nfp_repr_get_port_id(netdev);</div><div class='add'>+	} else if (nfp_flower_internal_port_can_offload(app, netdev)) {</div><div class='add'>+		ext_port = nfp_flower_get_internal_port_id(app, netdev);</div><div class='add'>+		if (ext_port &lt; 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return nfp_flower_internal_port_get_port_id(ext_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 struct net_device *</div><div class='add'>+nfp_flower_get_netdev_from_internal_port_id(struct nfp_app *app, int port_id)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev = idr_find(&amp;priv-&gt;internal_ports.port_ids, port_id);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return netdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfp_flower_free_internal_port_id(struct nfp_app *app, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	id = nfp_flower_lookup_internal_port_id(priv, netdev);</div><div class='add'>+	if (!id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;internal_ports.lock);</div><div class='add'>+	idr_remove(&amp;priv-&gt;internal_ports.port_ids, id);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;internal_ports.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfp_flower_internal_port_event_handler(struct nfp_app *app,</div><div class='add'>+				       struct net_device *netdev,</div><div class='add'>+				       unsigned long event)</div><div class='add'>+{</div><div class='add'>+	if (event == NETDEV_UNREGISTER &amp;&amp;</div><div class='add'>+	    nfp_flower_internal_port_can_offload(app, netdev))</div><div class='add'>+		nfp_flower_free_internal_port_id(app, netdev);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfp_flower_internal_port_init(struct nfp_flower_priv *priv)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;internal_ports.lock);</div><div class='add'>+	idr_init(&amp;priv-&gt;internal_ports.port_ids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfp_flower_internal_port_cleanup(struct nfp_flower_priv *priv)</div><div class='add'>+{</div><div class='add'>+	idr_destroy(&amp;priv-&gt;internal_ports.port_ids);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct nfp_flower_non_repr_priv *</div><div class='ctx'> nfp_flower_non_repr_priv_lookup(struct nfp_app *app, struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,12 +229,21 @@ nfp_flower_repr_get_type_and_port(struct nfp_app *app, u32 port_id, u8 *port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device *</div><div class='del'>-nfp_flower_repr_get(struct nfp_app *app, u32 port_id)</div><div class='add'>+nfp_flower_dev_get(struct nfp_app *app, u32 port_id, bool *redir_egress)</div><div class='ctx'> {</div><div class='ctx'> 	enum nfp_repr_type repr_type;</div><div class='ctx'> 	struct nfp_reprs *reprs;</div><div class='ctx'> 	u8 port = 0;</div><div class='ctx'> </div><div class='add'>+	/* Check if the port is internal. */</div><div class='add'>+	if (FIELD_GET(NFP_FLOWER_CMSG_PORT_TYPE, port_id) ==</div><div class='add'>+	    NFP_FLOWER_CMSG_PORT_TYPE_OTHER_PORT) {</div><div class='add'>+		if (redir_egress)</div><div class='add'>+			*redir_egress = true;</div><div class='add'>+		port = FIELD_GET(NFP_FLOWER_CMSG_PORT_PHYS_PORT_NUM, port_id);</div><div class='add'>+		return nfp_flower_get_netdev_from_internal_port_id(app, port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	repr_type = nfp_flower_repr_get_type_and_port(app, port_id, &amp;port);</div><div class='ctx'> 	if (repr_type &gt; NFP_REPR_TYPE_MAX)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -641,11 +760,33 @@ static int nfp_flower_init(struct nfp_app *app)</div><div class='ctx'> 		goto err_cleanup_metadata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_FLOW_MOD) {</div><div class='add'>+		/* Tell the firmware that the driver supports flow merging. */</div><div class='add'>+		err = nfp_rtsym_write_le(app-&gt;pf-&gt;rtbl,</div><div class='add'>+					 "_abi_flower_merge_hint_enable", 1);</div><div class='add'>+		if (!err) {</div><div class='add'>+			app_priv-&gt;flower_ext_feats |= NFP_FL_FEATS_FLOW_MERGE;</div><div class='add'>+			nfp_flower_internal_port_init(app_priv);</div><div class='add'>+		} else if (err == -ENOENT) {</div><div class='add'>+			nfp_warn(app-&gt;cpp, "Flow merge not supported by FW.\n");</div><div class='add'>+		} else {</div><div class='add'>+			goto err_lag_clean;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		nfp_warn(app-&gt;cpp, "Flow mod/merge not supported by FW.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_VF_RLIM)</div><div class='add'>+		nfp_flower_qos_init(app);</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;app_priv-&gt;indr_block_cb_priv);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;app_priv-&gt;non_repr_priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_lag_clean:</div><div class='add'>+	if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_LAG)</div><div class='add'>+		nfp_flower_lag_cleanup(&amp;app_priv-&gt;nfp_lag);</div><div class='ctx'> err_cleanup_metadata:</div><div class='ctx'> 	nfp_flower_metadata_cleanup(app);</div><div class='ctx'> err_free_app_priv:</div><div class='hunk'>@@ -661,9 +802,15 @@ static void nfp_flower_clean(struct nfp_app *app)</div><div class='ctx'> 	skb_queue_purge(&amp;app_priv-&gt;cmsg_skbs_low);</div><div class='ctx'> 	flush_work(&amp;app_priv-&gt;cmsg_work);</div><div class='ctx'> </div><div class='add'>+	if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_VF_RLIM)</div><div class='add'>+		nfp_flower_qos_cleanup(app);</div><div class='add'>+</div><div class='ctx'> 	if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_LAG)</div><div class='ctx'> 		nfp_flower_lag_cleanup(&amp;app_priv-&gt;nfp_lag);</div><div class='ctx'> </div><div class='add'>+	if (app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_FLOW_MERGE)</div><div class='add'>+		nfp_flower_internal_port_cleanup(app_priv);</div><div class='add'>+</div><div class='ctx'> 	nfp_flower_metadata_cleanup(app);</div><div class='ctx'> 	vfree(app-&gt;priv);</div><div class='ctx'> 	app-&gt;priv = NULL;</div><div class='hunk'>@@ -762,6 +909,10 @@ nfp_flower_netdev_event(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> 	if (ret &amp; NOTIFY_STOP_MASK)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = nfp_flower_internal_port_event_handler(app, netdev, event);</div><div class='add'>+	if (ret &amp; NOTIFY_STOP_MASK)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	return nfp_tunnel_mac_event_handler(app, netdev, event, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -800,7 +951,7 @@ const struct nfp_app_type app_flower = {</div><div class='ctx'> 	.sriov_disable	= nfp_flower_sriov_disable,</div><div class='ctx'> </div><div class='ctx'> 	.eswitch_mode_get  = eswitch_mode_get,</div><div class='del'>-	.repr_get	= nfp_flower_repr_get,</div><div class='add'>+	.dev_get	= nfp_flower_dev_get,</div><div class='ctx'> </div><div class='ctx'> 	.setup_tc	= nfp_flower_setup_tc,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h<br/>index c0945a5fd1a4..40957a8dbfe6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/main.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #define __NFP_FLOWER_H__ 1</div><div class='ctx'> </div><div class='ctx'> #include "cmsg.h"</div><div class='add'>+#include "../nfp_net.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/circ_buf.h&gt;</div><div class='ctx'> #include &lt;linux/hashtable.h&gt;</div><div class='hunk'>@@ -34,14 +35,14 @@ struct nfp_app;</div><div class='ctx'> #define NFP_FL_MASK_REUSE_TIME_NS	40000</div><div class='ctx'> #define NFP_FL_MASK_ID_LOCATION		1</div><div class='ctx'> </div><div class='del'>-#define NFP_FL_VXLAN_PORT		4789</div><div class='del'>-#define NFP_FL_GENEVE_PORT		6081</div><div class='del'>-</div><div class='ctx'> /* Extra features bitmap. */</div><div class='ctx'> #define NFP_FL_FEATS_GENEVE		BIT(0)</div><div class='ctx'> #define NFP_FL_NBI_MTU_SETTING		BIT(1)</div><div class='ctx'> #define NFP_FL_FEATS_GENEVE_OPT		BIT(2)</div><div class='ctx'> #define NFP_FL_FEATS_VLAN_PCP		BIT(3)</div><div class='add'>+#define NFP_FL_FEATS_VF_RLIM		BIT(4)</div><div class='add'>+#define NFP_FL_FEATS_FLOW_MOD		BIT(5)</div><div class='add'>+#define NFP_FL_FEATS_FLOW_MERGE		BIT(30)</div><div class='ctx'> #define NFP_FL_FEATS_LAG		BIT(31)</div><div class='ctx'> </div><div class='ctx'> struct nfp_fl_mask_id {</div><div class='hunk'>@@ -118,6 +119,16 @@ struct nfp_fl_lag {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct nfp_fl_internal_ports - Flower APP priv data for additional ports</div><div class='add'>+ * @port_ids:	Assignment of ids to any additional ports</div><div class='add'>+ * @lock:	Lock for extra ports list</div><div class='add'>+ */</div><div class='add'>+struct nfp_fl_internal_ports {</div><div class='add'>+	struct idr port_ids;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct nfp_flower_priv - Flower APP per-vNIC priv data</div><div class='ctx'>  * @app:		Back pointer to app</div><div class='ctx'>  * @nn:			Pointer to vNIC</div><div class='hunk'>@@ -131,6 +142,7 @@ struct nfp_fl_lag {</div><div class='ctx'>  * @flow_table:		Hash table used to store flower rules</div><div class='ctx'>  * @stats:		Stored stats updates for flower rules</div><div class='ctx'>  * @stats_lock:		Lock for flower rule stats updates</div><div class='add'>+ * @stats_ctx_table:	Hash table to map stats contexts to its flow rule</div><div class='ctx'>  * @cmsg_work:		Workqueue for control messages processing</div><div class='ctx'>  * @cmsg_skbs_high:	List of higher priority skbs for control message</div><div class='ctx'>  *			processing</div><div class='hunk'>@@ -146,6 +158,10 @@ struct nfp_fl_lag {</div><div class='ctx'>  * @non_repr_priv:	List of offloaded non-repr ports and their priv data</div><div class='ctx'>  * @active_mem_unit:	Current active memory unit for flower rules</div><div class='ctx'>  * @total_mem_units:	Total number of available memory units for flower rules</div><div class='add'>+ * @internal_ports:	Internal port ids used in offloaded rules</div><div class='add'>+ * @qos_stats_work:	Workqueue for qos stats processing</div><div class='add'>+ * @qos_rate_limiters:	Current active qos rate limiters</div><div class='add'>+ * @qos_stats_lock:	Lock on qos stats updates</div><div class='ctx'>  */</div><div class='ctx'> struct nfp_flower_priv {</div><div class='ctx'> 	struct nfp_app *app;</div><div class='hunk'>@@ -160,6 +176,7 @@ struct nfp_flower_priv {</div><div class='ctx'> 	struct rhashtable flow_table;</div><div class='ctx'> 	struct nfp_fl_stats *stats;</div><div class='ctx'> 	spinlock_t stats_lock; /* lock stats */</div><div class='add'>+	struct rhashtable stats_ctx_table;</div><div class='ctx'> 	struct work_struct cmsg_work;</div><div class='ctx'> 	struct sk_buff_head cmsg_skbs_high;</div><div class='ctx'> 	struct sk_buff_head cmsg_skbs_low;</div><div class='hunk'>@@ -172,6 +189,24 @@ struct nfp_flower_priv {</div><div class='ctx'> 	struct list_head non_repr_priv;</div><div class='ctx'> 	unsigned int active_mem_unit;</div><div class='ctx'> 	unsigned int total_mem_units;</div><div class='add'>+	struct nfp_fl_internal_ports internal_ports;</div><div class='add'>+	struct delayed_work qos_stats_work;</div><div class='add'>+	unsigned int qos_rate_limiters;</div><div class='add'>+	spinlock_t qos_stats_lock; /* Protect the qos stats */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct nfp_fl_qos - Flower APP priv data for quality of service</div><div class='add'>+ * @netdev_port_id:	NFP port number of repr with qos info</div><div class='add'>+ * @curr_stats:		Currently stored stats updates for qos info</div><div class='add'>+ * @prev_stats:		Previously stored updates for qos info</div><div class='add'>+ * @last_update:	Stored time when last stats were updated</div><div class='add'>+ */</div><div class='add'>+struct nfp_fl_qos {</div><div class='add'>+	u32 netdev_port_id;</div><div class='add'>+	struct nfp_stat_pair curr_stats;</div><div class='add'>+	struct nfp_stat_pair prev_stats;</div><div class='add'>+	u64 last_update;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -180,14 +215,18 @@ struct nfp_flower_priv {</div><div class='ctx'>  * @lag_port_flags:	Extended port flags to record lag state of repr</div><div class='ctx'>  * @mac_offloaded:	Flag indicating a MAC address is offloaded for repr</div><div class='ctx'>  * @offloaded_mac_addr:	MAC address that has been offloaded for repr</div><div class='add'>+ * @block_shared:	Flag indicating if offload applies to shared blocks</div><div class='ctx'>  * @mac_list:		List entry of reprs that share the same offloaded MAC</div><div class='add'>+ * @qos_table:		Stored info on filters implementing qos</div><div class='ctx'>  */</div><div class='ctx'> struct nfp_flower_repr_priv {</div><div class='ctx'> 	struct nfp_repr *nfp_repr;</div><div class='ctx'> 	unsigned long lag_port_flags;</div><div class='ctx'> 	bool mac_offloaded;</div><div class='ctx'> 	u8 offloaded_mac_addr[ETH_ALEN];</div><div class='add'>+	bool block_shared;</div><div class='ctx'> 	struct list_head mac_list;</div><div class='add'>+	struct nfp_fl_qos qos_table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -239,6 +278,25 @@ struct nfp_fl_payload {</div><div class='ctx'> 	char *unmasked_data;</div><div class='ctx'> 	char *mask_data;</div><div class='ctx'> 	char *action_data;</div><div class='add'>+	struct list_head linked_flows;</div><div class='add'>+	bool in_hw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nfp_fl_payload_link {</div><div class='add'>+	/* A link contains a pointer to a merge flow and an associated sub_flow.</div><div class='add'>+	 * Each merge flow will feature in 2 links to its underlying sub_flows.</div><div class='add'>+	 * A sub_flow will have at least 1 link to a merge flow or more if it</div><div class='add'>+	 * has been used to create multiple merge flows.</div><div class='add'>+	 *</div><div class='add'>+	 * For a merge flow, 'linked_flows' in its nfp_fl_payload struct lists</div><div class='add'>+	 * all links to sub_flows (sub_flow.flow) via merge.list.</div><div class='add'>+	 * For a sub_flow, 'linked_flows' gives all links to merge flows it has</div><div class='add'>+	 * formed (merge_flow.flow) via sub_flow.list.</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		struct list_head list;</div><div class='add'>+		struct nfp_fl_payload *flow;</div><div class='add'>+	} merge_flow, sub_flow;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct rhashtable_params nfp_flower_table_params;</div><div class='hunk'>@@ -250,12 +308,40 @@ struct nfp_fl_stats_frame {</div><div class='ctx'> 	__be64 stats_cookie;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool</div><div class='add'>+nfp_flower_internal_port_can_offload(struct nfp_app *app,</div><div class='add'>+				     struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *app_priv = app-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!(app_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_FLOW_MERGE))</div><div class='add'>+		return false;</div><div class='add'>+	if (!netdev-&gt;rtnl_link_ops)</div><div class='add'>+		return false;</div><div class='add'>+	if (!strcmp(netdev-&gt;rtnl_link_ops-&gt;kind, "openvswitch"))</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'>+/* The address of the merged flow acts as its cookie.</div><div class='add'>+ * Cookies supplied to us by TC flower are also addresses to allocated</div><div class='add'>+ * memory and thus this scheme should not generate any collisions.</div><div class='add'>+ */</div><div class='add'>+static inline bool nfp_flower_is_merge_flow(struct nfp_fl_payload *flow_pay)</div><div class='add'>+{</div><div class='add'>+	return flow_pay-&gt;tc_flower_cookie == (unsigned long)flow_pay;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count,</div><div class='ctx'> 			     unsigned int host_ctx_split);</div><div class='ctx'> void nfp_flower_metadata_cleanup(struct nfp_app *app);</div><div class='ctx'> </div><div class='ctx'> int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> 			enum tc_setup_type type, void *type_data);</div><div class='add'>+int nfp_flower_merge_offloaded_flows(struct nfp_app *app,</div><div class='add'>+				     struct nfp_fl_payload *sub_flow1,</div><div class='add'>+				     struct nfp_fl_payload *sub_flow2);</div><div class='ctx'> int nfp_flower_compile_flow_match(struct nfp_app *app,</div><div class='ctx'> 				  struct tc_cls_flower_offload *flow,</div><div class='ctx'> 				  struct nfp_fl_key_ls *key_ls,</div><div class='hunk'>@@ -270,6 +356,8 @@ int nfp_compile_flow_metadata(struct nfp_app *app,</div><div class='ctx'> 			      struct tc_cls_flower_offload *flow,</div><div class='ctx'> 			      struct nfp_fl_payload *nfp_flow,</div><div class='ctx'> 			      struct net_device *netdev);</div><div class='add'>+void __nfp_modify_flow_metadata(struct nfp_flower_priv *priv,</div><div class='add'>+				struct nfp_fl_payload *nfp_flow);</div><div class='ctx'> int nfp_modify_flow_metadata(struct nfp_app *app,</div><div class='ctx'> 			     struct nfp_fl_payload *nfp_flow);</div><div class='ctx'> </div><div class='hunk'>@@ -277,6 +365,8 @@ struct nfp_fl_payload *</div><div class='ctx'> nfp_flower_search_fl_table(struct nfp_app *app, unsigned long tc_flower_cookie,</div><div class='ctx'> 			   struct net_device *netdev);</div><div class='ctx'> struct nfp_fl_payload *</div><div class='add'>+nfp_flower_get_fl_payload_from_ctx(struct nfp_app *app, u32 ctx_id);</div><div class='add'>+struct nfp_fl_payload *</div><div class='ctx'> nfp_flower_remove_fl_table(struct nfp_app *app, unsigned long tc_flower_cookie);</div><div class='ctx'> </div><div class='ctx'> void nfp_flower_rx_flow_stats(struct nfp_app *app, struct sk_buff *skb);</div><div class='hunk'>@@ -302,6 +392,11 @@ int nfp_flower_lag_populate_pre_action(struct nfp_app *app,</div><div class='ctx'> 				       struct nfp_fl_pre_lag *pre_act);</div><div class='ctx'> int nfp_flower_lag_get_output_id(struct nfp_app *app,</div><div class='ctx'> 				 struct net_device *master);</div><div class='add'>+void nfp_flower_qos_init(struct nfp_app *app);</div><div class='add'>+void nfp_flower_qos_cleanup(struct nfp_app *app);</div><div class='add'>+int nfp_flower_setup_qos_offload(struct nfp_app *app, struct net_device *netdev,</div><div class='add'>+				 struct tc_cls_matchall_offload *flow);</div><div class='add'>+void nfp_flower_stats_rlim_reply(struct nfp_app *app, struct sk_buff *skb);</div><div class='ctx'> int nfp_flower_reg_indir_block_handler(struct nfp_app *app,</div><div class='ctx'> 				       struct net_device *netdev,</div><div class='ctx'> 				       unsigned long event);</div><div class='hunk'>@@ -314,4 +409,6 @@ void</div><div class='ctx'> __nfp_flower_non_repr_priv_put(struct nfp_flower_non_repr_priv *non_repr_priv);</div><div class='ctx'> void</div><div class='ctx'> nfp_flower_non_repr_priv_put(struct nfp_app *app, struct net_device *netdev);</div><div class='add'>+u32 nfp_flower_get_port_id_from_netdev(struct nfp_app *app,</div><div class='add'>+				       struct net_device *netdev);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c<br/>index e03c8ef2c28c..bfa4bf34911d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/match.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/match.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/match.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/match.c</a></div><div class='hunk'>@@ -30,20 +30,19 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *ext,</div><div class='ctx'> </div><div class='ctx'> 		flow_rule_match_vlan(rule, &amp;match);</div><div class='ctx'> 		/* Populate the tci field. */</div><div class='del'>-		if (match.key-&gt;vlan_id || match.key-&gt;vlan_priority) {</div><div class='del'>-			tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,</div><div class='del'>-					     match.key-&gt;vlan_priority) |</div><div class='del'>-				  FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,</div><div class='del'>-					     match.key-&gt;vlan_id) |</div><div class='del'>-				  NFP_FLOWER_MASK_VLAN_CFI;</div><div class='del'>-			ext-&gt;tci = cpu_to_be16(tmp_tci);</div><div class='del'>-			tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,</div><div class='del'>-					     match.mask-&gt;vlan_priority) |</div><div class='del'>-				  FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,</div><div class='del'>-					     match.mask-&gt;vlan_id) |</div><div class='del'>-				  NFP_FLOWER_MASK_VLAN_CFI;</div><div class='del'>-			msk-&gt;tci = cpu_to_be16(tmp_tci);</div><div class='del'>-		}</div><div class='add'>+		tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;</div><div class='add'>+		tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,</div><div class='add'>+				      match.key-&gt;vlan_priority) |</div><div class='add'>+			   FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,</div><div class='add'>+				      match.key-&gt;vlan_id);</div><div class='add'>+		ext-&gt;tci = cpu_to_be16(tmp_tci);</div><div class='add'>+</div><div class='add'>+		tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;</div><div class='add'>+		tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,</div><div class='add'>+				      match.mask-&gt;vlan_priority) |</div><div class='add'>+			   FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,</div><div class='add'>+				      match.mask-&gt;vlan_id);</div><div class='add'>+		msk-&gt;tci = cpu_to_be16(tmp_tci);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -327,13 +326,12 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,</div><div class='ctx'> 				  struct nfp_fl_payload *nfp_flow,</div><div class='ctx'> 				  enum nfp_flower_tun_type tun_type)</div><div class='ctx'> {</div><div class='del'>-	u32 cmsg_port = 0;</div><div class='add'>+	u32 port_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 *ext;</div><div class='ctx'> 	u8 *msk;</div><div class='ctx'> </div><div class='del'>-	if (nfp_netdev_is_nfp_repr(netdev))</div><div class='del'>-		cmsg_port = nfp_repr_get_port_id(netdev);</div><div class='add'>+	port_id = nfp_flower_get_port_id_from_netdev(app, netdev);</div><div class='ctx'> </div><div class='ctx'> 	memset(nfp_flow-&gt;unmasked_data, 0, key_ls-&gt;key_size);</div><div class='ctx'> 	memset(nfp_flow-&gt;mask_data, 0, key_ls-&gt;key_size);</div><div class='hunk'>@@ -359,13 +357,13 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,</div><div class='ctx'> </div><div class='ctx'> 	/* Populate Exact Port data. */</div><div class='ctx'> 	err = nfp_flower_compile_port((struct nfp_flower_in_port *)ext,</div><div class='del'>-				      cmsg_port, false, tun_type);</div><div class='add'>+				      port_id, false, tun_type);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Populate Mask Port Data. */</div><div class='ctx'> 	err = nfp_flower_compile_port((struct nfp_flower_in_port *)msk,</div><div class='del'>-				      cmsg_port, true, tun_type);</div><div class='add'>+				      port_id, true, tun_type);</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/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c<br/>index 492837b852b6..3d326efdc814 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/metadata.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/metadata.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/metadata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/metadata.c</a></div><div class='hunk'>@@ -24,6 +24,18 @@ struct nfp_fl_flow_table_cmp_arg {</div><div class='ctx'> 	unsigned long cookie;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nfp_fl_stats_ctx_to_flow {</div><div class='add'>+	struct rhash_head ht_node;</div><div class='add'>+	u32 stats_cxt;</div><div class='add'>+	struct nfp_fl_payload *flow;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params stats_ctx_table_params = {</div><div class='add'>+	.key_offset	= offsetof(struct nfp_fl_stats_ctx_to_flow, stats_cxt),</div><div class='add'>+	.head_offset	= offsetof(struct nfp_fl_stats_ctx_to_flow, ht_node),</div><div class='add'>+	.key_len	= sizeof(u32),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int nfp_release_stats_entry(struct nfp_app *app, u32 stats_context_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='hunk'>@@ -264,9 +276,6 @@ nfp_check_mask_remove(struct nfp_app *app, char *mask_data, u32 mask_len,</div><div class='ctx'> 	if (!mask_entry)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (meta_flags)</div><div class='del'>-		*meta_flags &amp;= ~NFP_FL_META_FLAG_MANAGE_MASK;</div><div class='del'>-</div><div class='ctx'> 	*mask_id = mask_entry-&gt;mask_id;</div><div class='ctx'> 	mask_entry-&gt;ref_cnt--;</div><div class='ctx'> 	if (!mask_entry-&gt;ref_cnt) {</div><div class='hunk'>@@ -285,25 +294,42 @@ int nfp_compile_flow_metadata(struct nfp_app *app,</div><div class='ctx'> 			      struct nfp_fl_payload *nfp_flow,</div><div class='ctx'> 			      struct net_device *netdev)</div><div class='ctx'> {</div><div class='add'>+	struct nfp_fl_stats_ctx_to_flow *ctx_entry;</div><div class='ctx'> 	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='ctx'> 	struct nfp_fl_payload *check_entry;</div><div class='ctx'> 	u8 new_mask_id;</div><div class='ctx'> 	u32 stats_cxt;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (nfp_get_stats_entry(app, &amp;stats_cxt))</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	err = nfp_get_stats_entry(app, &amp;stats_cxt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	nfp_flow-&gt;meta.host_ctx_id = cpu_to_be32(stats_cxt);</div><div class='ctx'> 	nfp_flow-&gt;meta.host_cookie = cpu_to_be64(flow-&gt;cookie);</div><div class='ctx'> 	nfp_flow-&gt;ingress_dev = netdev;</div><div class='ctx'> </div><div class='add'>+	ctx_entry = kzalloc(sizeof(*ctx_entry), GFP_KERNEL);</div><div class='add'>+	if (!ctx_entry) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_release_stats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx_entry-&gt;stats_cxt = stats_cxt;</div><div class='add'>+	ctx_entry-&gt;flow = nfp_flow;</div><div class='add'>+</div><div class='add'>+	if (rhashtable_insert_fast(&amp;priv-&gt;stats_ctx_table, &amp;ctx_entry-&gt;ht_node,</div><div class='add'>+				   stats_ctx_table_params)) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_ctx_entry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	new_mask_id = 0;</div><div class='ctx'> 	if (!nfp_check_mask_add(app, nfp_flow-&gt;mask_data,</div><div class='ctx'> 				nfp_flow-&gt;meta.mask_len,</div><div class='ctx'> 				&amp;nfp_flow-&gt;meta.flags, &amp;new_mask_id)) {</div><div class='del'>-		if (nfp_release_stats_entry(app, stats_cxt))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		return -ENOENT;</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		goto err_remove_rhash;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nfp_flow-&gt;meta.flow_version = cpu_to_be64(priv-&gt;flower_version);</div><div class='hunk'>@@ -317,43 +343,82 @@ int nfp_compile_flow_metadata(struct nfp_app *app,</div><div class='ctx'> </div><div class='ctx'> 	check_entry = nfp_flower_search_fl_table(app, flow-&gt;cookie, netdev);</div><div class='ctx'> 	if (check_entry) {</div><div class='del'>-		if (nfp_release_stats_entry(app, stats_cxt))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (!nfp_check_mask_remove(app, nfp_flow-&gt;mask_data,</div><div class='del'>-					   nfp_flow-&gt;meta.mask_len,</div><div class='del'>-					   NULL, &amp;new_mask_id))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		return -EEXIST;</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto err_remove_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_remove_mask:</div><div class='add'>+	nfp_check_mask_remove(app, nfp_flow-&gt;mask_data, nfp_flow-&gt;meta.mask_len,</div><div class='add'>+			      NULL, &amp;new_mask_id);</div><div class='add'>+err_remove_rhash:</div><div class='add'>+	WARN_ON_ONCE(rhashtable_remove_fast(&amp;priv-&gt;stats_ctx_table,</div><div class='add'>+					    &amp;ctx_entry-&gt;ht_node,</div><div class='add'>+					    stats_ctx_table_params));</div><div class='add'>+err_free_ctx_entry:</div><div class='add'>+	kfree(ctx_entry);</div><div class='add'>+err_release_stats:</div><div class='add'>+	nfp_release_stats_entry(app, stats_cxt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __nfp_modify_flow_metadata(struct nfp_flower_priv *priv,</div><div class='add'>+				struct nfp_fl_payload *nfp_flow)</div><div class='add'>+{</div><div class='add'>+	nfp_flow-&gt;meta.flags &amp;= ~NFP_FL_META_FLAG_MANAGE_MASK;</div><div class='add'>+	nfp_flow-&gt;meta.flow_version = cpu_to_be64(priv-&gt;flower_version);</div><div class='add'>+	priv-&gt;flower_version++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nfp_modify_flow_metadata(struct nfp_app *app,</div><div class='ctx'> 			     struct nfp_fl_payload *nfp_flow)</div><div class='ctx'> {</div><div class='add'>+	struct nfp_fl_stats_ctx_to_flow *ctx_entry;</div><div class='ctx'> 	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='ctx'> 	u8 new_mask_id = 0;</div><div class='ctx'> 	u32 temp_ctx_id;</div><div class='ctx'> </div><div class='add'>+	__nfp_modify_flow_metadata(priv, nfp_flow);</div><div class='add'>+</div><div class='ctx'> 	nfp_check_mask_remove(app, nfp_flow-&gt;mask_data,</div><div class='ctx'> 			      nfp_flow-&gt;meta.mask_len, &amp;nfp_flow-&gt;meta.flags,</div><div class='ctx'> 			      &amp;new_mask_id);</div><div class='ctx'> </div><div class='del'>-	nfp_flow-&gt;meta.flow_version = cpu_to_be64(priv-&gt;flower_version);</div><div class='del'>-	priv-&gt;flower_version++;</div><div class='del'>-</div><div class='ctx'> 	/* Update flow payload with mask ids. */</div><div class='ctx'> 	nfp_flow-&gt;unmasked_data[NFP_FL_MASK_ID_LOCATION] = new_mask_id;</div><div class='ctx'> </div><div class='del'>-	/* Release the stats ctx id. */</div><div class='add'>+	/* Release the stats ctx id and ctx to flow table entry. */</div><div class='ctx'> 	temp_ctx_id = be32_to_cpu(nfp_flow-&gt;meta.host_ctx_id);</div><div class='ctx'> </div><div class='add'>+	ctx_entry = rhashtable_lookup_fast(&amp;priv-&gt;stats_ctx_table, &amp;temp_ctx_id,</div><div class='add'>+					   stats_ctx_table_params);</div><div class='add'>+	if (!ctx_entry)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(rhashtable_remove_fast(&amp;priv-&gt;stats_ctx_table,</div><div class='add'>+					    &amp;ctx_entry-&gt;ht_node,</div><div class='add'>+					    stats_ctx_table_params));</div><div class='add'>+	kfree(ctx_entry);</div><div class='add'>+</div><div class='ctx'> 	return nfp_release_stats_entry(app, temp_ctx_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct nfp_fl_payload *</div><div class='add'>+nfp_flower_get_fl_payload_from_ctx(struct nfp_app *app, u32 ctx_id)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_stats_ctx_to_flow *ctx_entry;</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ctx_entry = rhashtable_lookup_fast(&amp;priv-&gt;stats_ctx_table, &amp;ctx_id,</div><div class='add'>+					   stats_ctx_table_params);</div><div class='add'>+	if (!ctx_entry)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return ctx_entry-&gt;flow;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int nfp_fl_obj_cmpfn(struct rhashtable_compare_arg *arg,</div><div class='ctx'> 			    const void *obj)</div><div class='ctx'> {</div><div class='hunk'>@@ -403,6 +468,10 @@ int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	err = rhashtable_init(&amp;priv-&gt;stats_ctx_table, &amp;stats_ctx_table_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_flow_table;</div><div class='add'>+</div><div class='ctx'> 	get_random_bytes(&amp;priv-&gt;mask_id_seed, sizeof(priv-&gt;mask_id_seed));</div><div class='ctx'> </div><div class='ctx'> 	/* Init ring buffer and unallocated mask_ids. */</div><div class='hunk'>@@ -410,7 +479,7 @@ int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count,</div><div class='ctx'> 		kmalloc_array(NFP_FLOWER_MASK_ENTRY_RS,</div><div class='ctx'> 			      NFP_FLOWER_MASK_ELEMENT_RS, GFP_KERNEL);</div><div class='ctx'> 	if (!priv-&gt;mask_ids.mask_id_free_list.buf)</div><div class='del'>-		goto err_free_flow_table;</div><div class='add'>+		goto err_free_stats_ctx_table;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;mask_ids.init_unallocated = NFP_FLOWER_MASK_ENTRY_RS - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -447,6 +516,8 @@ err_free_last_used:</div><div class='ctx'> 	kfree(priv-&gt;mask_ids.last_used);</div><div class='ctx'> err_free_mask_id:</div><div class='ctx'> 	kfree(priv-&gt;mask_ids.mask_id_free_list.buf);</div><div class='add'>+err_free_stats_ctx_table:</div><div class='add'>+	rhashtable_destroy(&amp;priv-&gt;stats_ctx_table);</div><div class='ctx'> err_free_flow_table:</div><div class='ctx'> 	rhashtable_destroy(&amp;priv-&gt;flow_table);</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -461,6 +532,8 @@ void nfp_flower_metadata_cleanup(struct nfp_app *app)</div><div class='ctx'> </div><div class='ctx'> 	rhashtable_free_and_destroy(&amp;priv-&gt;flow_table,</div><div class='ctx'> 				    nfp_check_rhashtable_empty, NULL);</div><div class='add'>+	rhashtable_free_and_destroy(&amp;priv-&gt;stats_ctx_table,</div><div class='add'>+				    nfp_check_rhashtable_empty, NULL);</div><div class='ctx'> 	kvfree(priv-&gt;stats);</div><div class='ctx'> 	kfree(priv-&gt;mask_ids.mask_id_free_list.buf);</div><div class='ctx'> 	kfree(priv-&gt;mask_ids.last_used);</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c<br/>index 450d7296fd57..1fbfeb43c538 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/offload.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/offload.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/offload.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/offload.c</a></div><div class='hunk'>@@ -55,6 +55,28 @@</div><div class='ctx'> 	 BIT(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) | \</div><div class='ctx'> 	 BIT(FLOW_DISSECTOR_KEY_ENC_PORTS))</div><div class='ctx'> </div><div class='add'>+#define NFP_FLOWER_MERGE_FIELDS \</div><div class='add'>+	(NFP_FLOWER_LAYER_PORT | \</div><div class='add'>+	 NFP_FLOWER_LAYER_MAC | \</div><div class='add'>+	 NFP_FLOWER_LAYER_TP | \</div><div class='add'>+	 NFP_FLOWER_LAYER_IPV4 | \</div><div class='add'>+	 NFP_FLOWER_LAYER_IPV6)</div><div class='add'>+</div><div class='add'>+struct nfp_flower_merge_check {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__be16 tci;</div><div class='add'>+			struct nfp_flower_mac_mpls l2;</div><div class='add'>+			struct nfp_flower_tp_ports l4;</div><div class='add'>+			union {</div><div class='add'>+				struct nfp_flower_ipv4 ipv4;</div><div class='add'>+				struct nfp_flower_ipv6 ipv6;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		unsigned long vals[8];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> nfp_flower_xmit_flow(struct nfp_app *app, struct nfp_fl_payload *nfp_flow,</div><div class='ctx'> 		     u8 mtype)</div><div class='hunk'>@@ -195,7 +217,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,</div><div class='ctx'> 			flow_rule_match_enc_opts(rule, &amp;enc_op);</div><div class='ctx'> </div><div class='ctx'> 		switch (enc_ports.key-&gt;dst) {</div><div class='del'>-		case htons(NFP_FL_VXLAN_PORT):</div><div class='add'>+		case htons(IANA_VXLAN_UDP_PORT):</div><div class='ctx'> 			*tun_type = NFP_FL_TUNNEL_VXLAN;</div><div class='ctx'> 			key_layer |= NFP_FLOWER_LAYER_VXLAN;</div><div class='ctx'> 			key_size += sizeof(struct nfp_flower_ipv4_udp_tun);</div><div class='hunk'>@@ -203,7 +225,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,</div><div class='ctx'> 			if (enc_op.key)</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			break;</div><div class='del'>-		case htons(NFP_FL_GENEVE_PORT):</div><div class='add'>+		case htons(GENEVE_UDP_PORT):</div><div class='ctx'> 			if (!(priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_GENEVE))</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			*tun_type = NFP_FL_TUNNEL_GENEVE;</div><div class='hunk'>@@ -326,7 +348,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			case cpu_to_be16(ETH_P_IPV6):</div><div class='del'>-				key_layer |= NFP_FLOWER_LAYER_IPV6;</div><div class='add'>+					key_layer |= NFP_FLOWER_LAYER_IPV6;</div><div class='ctx'> 				key_size += sizeof(struct nfp_flower_ipv6);</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -376,6 +398,8 @@ nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer)</div><div class='ctx'> </div><div class='ctx'> 	flow_pay-&gt;nfp_tun_ipv4_addr = 0;</div><div class='ctx'> 	flow_pay-&gt;meta.flags = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;flow_pay-&gt;linked_flows);</div><div class='add'>+	flow_pay-&gt;in_hw = false;</div><div class='ctx'> </div><div class='ctx'> 	return flow_pay;</div><div class='ctx'> </div><div class='hunk'>@@ -388,6 +412,447 @@ err_free_flow:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+nfp_flower_update_merge_with_actions(struct nfp_fl_payload *flow,</div><div class='add'>+				     struct nfp_flower_merge_check *merge,</div><div class='add'>+				     u8 *last_act_id, int *act_out)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_set_ipv6_tc_hl_fl *ipv6_tc_hl_fl;</div><div class='add'>+	struct nfp_fl_set_ip4_ttl_tos *ipv4_ttl_tos;</div><div class='add'>+	struct nfp_fl_set_ip4_addrs *ipv4_add;</div><div class='add'>+	struct nfp_fl_set_ipv6_addr *ipv6_add;</div><div class='add'>+	struct nfp_fl_push_vlan *push_vlan;</div><div class='add'>+	struct nfp_fl_set_tport *tport;</div><div class='add'>+	struct nfp_fl_set_eth *eth;</div><div class='add'>+	struct nfp_fl_act_head *a;</div><div class='add'>+	unsigned int act_off = 0;</div><div class='add'>+	u8 act_id = 0;</div><div class='add'>+	u8 *ports;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	while (act_off &lt; flow-&gt;meta.act_len) {</div><div class='add'>+		a = (struct nfp_fl_act_head *)&amp;flow-&gt;action_data[act_off];</div><div class='add'>+		act_id = a-&gt;jump_id;</div><div class='add'>+</div><div class='add'>+		switch (act_id) {</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_OUTPUT:</div><div class='add'>+			if (act_out)</div><div class='add'>+				(*act_out)++;</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_PUSH_VLAN:</div><div class='add'>+			push_vlan = (struct nfp_fl_push_vlan *)a;</div><div class='add'>+			if (push_vlan-&gt;vlan_tci)</div><div class='add'>+				merge-&gt;tci = cpu_to_be16(0xffff);</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_POP_VLAN:</div><div class='add'>+			merge-&gt;tci = cpu_to_be16(0);</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_IPV4_TUNNEL:</div><div class='add'>+			/* New tunnel header means l2 to l4 can be matched. */</div><div class='add'>+			eth_broadcast_addr(&amp;merge-&gt;l2.mac_dst[0]);</div><div class='add'>+			eth_broadcast_addr(&amp;merge-&gt;l2.mac_src[0]);</div><div class='add'>+			memset(&amp;merge-&gt;l4, 0xff,</div><div class='add'>+			       sizeof(struct nfp_flower_tp_ports));</div><div class='add'>+			memset(&amp;merge-&gt;ipv4, 0xff,</div><div class='add'>+			       sizeof(struct nfp_flower_ipv4));</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_ETHERNET:</div><div class='add'>+			eth = (struct nfp_fl_set_eth *)a;</div><div class='add'>+			for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+				merge-&gt;l2.mac_dst[i] |= eth-&gt;eth_addr_mask[i];</div><div class='add'>+			for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+				merge-&gt;l2.mac_src[i] |=</div><div class='add'>+					eth-&gt;eth_addr_mask[ETH_ALEN + i];</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_IPV4_ADDRS:</div><div class='add'>+			ipv4_add = (struct nfp_fl_set_ip4_addrs *)a;</div><div class='add'>+			merge-&gt;ipv4.ipv4_src |= ipv4_add-&gt;ipv4_src_mask;</div><div class='add'>+			merge-&gt;ipv4.ipv4_dst |= ipv4_add-&gt;ipv4_dst_mask;</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS:</div><div class='add'>+			ipv4_ttl_tos = (struct nfp_fl_set_ip4_ttl_tos *)a;</div><div class='add'>+			merge-&gt;ipv4.ip_ext.ttl |= ipv4_ttl_tos-&gt;ipv4_ttl_mask;</div><div class='add'>+			merge-&gt;ipv4.ip_ext.tos |= ipv4_ttl_tos-&gt;ipv4_tos_mask;</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_IPV6_SRC:</div><div class='add'>+			ipv6_add = (struct nfp_fl_set_ipv6_addr *)a;</div><div class='add'>+			for (i = 0; i &lt; 4; i++)</div><div class='add'>+				merge-&gt;ipv6.ipv6_src.in6_u.u6_addr32[i] |=</div><div class='add'>+					ipv6_add-&gt;ipv6[i].mask;</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_IPV6_DST:</div><div class='add'>+			ipv6_add = (struct nfp_fl_set_ipv6_addr *)a;</div><div class='add'>+			for (i = 0; i &lt; 4; i++)</div><div class='add'>+				merge-&gt;ipv6.ipv6_dst.in6_u.u6_addr32[i] |=</div><div class='add'>+					ipv6_add-&gt;ipv6[i].mask;</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_IPV6_TC_HL_FL:</div><div class='add'>+			ipv6_tc_hl_fl = (struct nfp_fl_set_ipv6_tc_hl_fl *)a;</div><div class='add'>+			merge-&gt;ipv6.ip_ext.ttl |=</div><div class='add'>+				ipv6_tc_hl_fl-&gt;ipv6_hop_limit_mask;</div><div class='add'>+			merge-&gt;ipv6.ip_ext.tos |= ipv6_tc_hl_fl-&gt;ipv6_tc_mask;</div><div class='add'>+			merge-&gt;ipv6.ipv6_flow_label_exthdr |=</div><div class='add'>+				ipv6_tc_hl_fl-&gt;ipv6_label_mask;</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_UDP:</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_SET_TCP:</div><div class='add'>+			tport = (struct nfp_fl_set_tport *)a;</div><div class='add'>+			ports = (u8 *)&amp;merge-&gt;l4.port_src;</div><div class='add'>+			for (i = 0; i &lt; 4; i++)</div><div class='add'>+				ports[i] |= tport-&gt;tp_port_mask[i];</div><div class='add'>+			break;</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_PRE_TUNNEL:</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_PRE_LAG:</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_PUSH_GENEVE:</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'>+		act_off += a-&gt;len_lw &lt;&lt; NFP_FL_LW_SIZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (last_act_id)</div><div class='add'>+		*last_act_id = act_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</div><div class='add'>+nfp_flower_populate_merge_match(struct nfp_fl_payload *flow,</div><div class='add'>+				struct nfp_flower_merge_check *merge,</div><div class='add'>+				bool extra_fields)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_meta_tci *meta_tci;</div><div class='add'>+	u8 *mask = flow-&gt;mask_data;</div><div class='add'>+	u8 key_layer, match_size;</div><div class='add'>+</div><div class='add'>+	memset(merge, 0, sizeof(struct nfp_flower_merge_check));</div><div class='add'>+</div><div class='add'>+	meta_tci = (struct nfp_flower_meta_tci *)mask;</div><div class='add'>+	key_layer = meta_tci-&gt;nfp_flow_key_layer;</div><div class='add'>+</div><div class='add'>+	if (key_layer &amp; ~NFP_FLOWER_MERGE_FIELDS &amp;&amp; !extra_fields)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	merge-&gt;tci = meta_tci-&gt;tci;</div><div class='add'>+	mask += sizeof(struct nfp_flower_meta_tci);</div><div class='add'>+</div><div class='add'>+	if (key_layer &amp; NFP_FLOWER_LAYER_EXT_META)</div><div class='add'>+		mask += sizeof(struct nfp_flower_ext_meta);</div><div class='add'>+</div><div class='add'>+	mask += sizeof(struct nfp_flower_in_port);</div><div class='add'>+</div><div class='add'>+	if (key_layer &amp; NFP_FLOWER_LAYER_MAC) {</div><div class='add'>+		match_size = sizeof(struct nfp_flower_mac_mpls);</div><div class='add'>+		memcpy(&amp;merge-&gt;l2, mask, match_size);</div><div class='add'>+		mask += match_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (key_layer &amp; NFP_FLOWER_LAYER_TP) {</div><div class='add'>+		match_size = sizeof(struct nfp_flower_tp_ports);</div><div class='add'>+		memcpy(&amp;merge-&gt;l4, mask, match_size);</div><div class='add'>+		mask += match_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (key_layer &amp; NFP_FLOWER_LAYER_IPV4) {</div><div class='add'>+		match_size = sizeof(struct nfp_flower_ipv4);</div><div class='add'>+		memcpy(&amp;merge-&gt;ipv4, mask, match_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (key_layer &amp; NFP_FLOWER_LAYER_IPV6) {</div><div class='add'>+		match_size = sizeof(struct nfp_flower_ipv6);</div><div class='add'>+		memcpy(&amp;merge-&gt;ipv6, mask, match_size);</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'>+nfp_flower_can_merge(struct nfp_fl_payload *sub_flow1,</div><div class='add'>+		     struct nfp_fl_payload *sub_flow2)</div><div class='add'>+{</div><div class='add'>+	/* Two flows can be merged if sub_flow2 only matches on bits that are</div><div class='add'>+	 * either matched by sub_flow1 or set by a sub_flow1 action. This</div><div class='add'>+	 * ensures that every packet that hits sub_flow1 and recirculates is</div><div class='add'>+	 * guaranteed to hit sub_flow2.</div><div class='add'>+	 */</div><div class='add'>+	struct nfp_flower_merge_check sub_flow1_merge, sub_flow2_merge;</div><div class='add'>+	int err, act_out = 0;</div><div class='add'>+	u8 last_act_id = 0;</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_populate_merge_match(sub_flow1, &amp;sub_flow1_merge,</div><div class='add'>+					      true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_populate_merge_match(sub_flow2, &amp;sub_flow2_merge,</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'>+	err = nfp_flower_update_merge_with_actions(sub_flow1, &amp;sub_flow1_merge,</div><div class='add'>+						   &amp;last_act_id, &amp;act_out);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Must only be 1 output action and it must be the last in sequence. */</div><div class='add'>+	if (act_out != 1 || last_act_id != NFP_FL_ACTION_OPCODE_OUTPUT)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Reject merge if sub_flow2 matches on something that is not matched</div><div class='add'>+	 * on or set in an action by sub_flow1.</div><div class='add'>+	 */</div><div class='add'>+	err = bitmap_andnot(sub_flow2_merge.vals, sub_flow2_merge.vals,</div><div class='add'>+			    sub_flow1_merge.vals,</div><div class='add'>+			    sizeof(struct nfp_flower_merge_check) * 8);</div><div class='add'>+	if (err)</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 unsigned int</div><div class='add'>+nfp_flower_copy_pre_actions(char *act_dst, char *act_src, int len,</div><div class='add'>+			    bool *tunnel_act)</div><div class='add'>+{</div><div class='add'>+	unsigned int act_off = 0, act_len;</div><div class='add'>+	struct nfp_fl_act_head *a;</div><div class='add'>+	u8 act_id = 0;</div><div class='add'>+</div><div class='add'>+	while (act_off &lt; len) {</div><div class='add'>+		a = (struct nfp_fl_act_head *)&amp;act_src[act_off];</div><div class='add'>+		act_len = a-&gt;len_lw &lt;&lt; NFP_FL_LW_SIZ;</div><div class='add'>+		act_id = a-&gt;jump_id;</div><div class='add'>+</div><div class='add'>+		switch (act_id) {</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_PRE_TUNNEL:</div><div class='add'>+			if (tunnel_act)</div><div class='add'>+				*tunnel_act = true;</div><div class='add'>+			/* fall through */</div><div class='add'>+		case NFP_FL_ACTION_OPCODE_PRE_LAG:</div><div class='add'>+			memcpy(act_dst + act_off, act_src + act_off, act_len);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return act_off;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		act_off += act_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return act_off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfp_fl_verify_post_tun_acts(char *acts, int len)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_act_head *a;</div><div class='add'>+	unsigned int act_off = 0;</div><div class='add'>+</div><div class='add'>+	while (act_off &lt; len) {</div><div class='add'>+		a = (struct nfp_fl_act_head *)&amp;acts[act_off];</div><div class='add'>+		if (a-&gt;jump_id != NFP_FL_ACTION_OPCODE_OUTPUT)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		act_off += a-&gt;len_lw &lt;&lt; NFP_FL_LW_SIZ;</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'>+nfp_flower_merge_action(struct nfp_fl_payload *sub_flow1,</div><div class='add'>+			struct nfp_fl_payload *sub_flow2,</div><div class='add'>+			struct nfp_fl_payload *merge_flow)</div><div class='add'>+{</div><div class='add'>+	unsigned int sub1_act_len, sub2_act_len, pre_off1, pre_off2;</div><div class='add'>+	bool tunnel_act = false;</div><div class='add'>+	char *merge_act;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The last action of sub_flow1 must be output - do not merge this. */</div><div class='add'>+	sub1_act_len = sub_flow1-&gt;meta.act_len - sizeof(struct nfp_fl_output);</div><div class='add'>+	sub2_act_len = sub_flow2-&gt;meta.act_len;</div><div class='add'>+</div><div class='add'>+	if (!sub2_act_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sub1_act_len + sub2_act_len &gt; NFP_FL_MAX_A_SIZ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* A shortcut can only be applied if there is a single action. */</div><div class='add'>+	if (sub1_act_len)</div><div class='add'>+		merge_flow-&gt;meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_NULL);</div><div class='add'>+	else</div><div class='add'>+		merge_flow-&gt;meta.shortcut = sub_flow2-&gt;meta.shortcut;</div><div class='add'>+</div><div class='add'>+	merge_flow-&gt;meta.act_len = sub1_act_len + sub2_act_len;</div><div class='add'>+	merge_act = merge_flow-&gt;action_data;</div><div class='add'>+</div><div class='add'>+	/* Copy any pre-actions to the start of merge flow action list. */</div><div class='add'>+	pre_off1 = nfp_flower_copy_pre_actions(merge_act,</div><div class='add'>+					       sub_flow1-&gt;action_data,</div><div class='add'>+					       sub1_act_len, &amp;tunnel_act);</div><div class='add'>+	merge_act += pre_off1;</div><div class='add'>+	sub1_act_len -= pre_off1;</div><div class='add'>+	pre_off2 = nfp_flower_copy_pre_actions(merge_act,</div><div class='add'>+					       sub_flow2-&gt;action_data,</div><div class='add'>+					       sub2_act_len, NULL);</div><div class='add'>+	merge_act += pre_off2;</div><div class='add'>+	sub2_act_len -= pre_off2;</div><div class='add'>+</div><div class='add'>+	/* FW does a tunnel push when egressing, therefore, if sub_flow 1 pushes</div><div class='add'>+	 * a tunnel, sub_flow 2 can only have output actions for a valid merge.</div><div class='add'>+	 */</div><div class='add'>+	if (tunnel_act) {</div><div class='add'>+		char *post_tun_acts = &amp;sub_flow2-&gt;action_data[pre_off2];</div><div class='add'>+</div><div class='add'>+		err = nfp_fl_verify_post_tun_acts(post_tun_acts, sub2_act_len);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy remaining actions from sub_flows 1 and 2. */</div><div class='add'>+	memcpy(merge_act, sub_flow1-&gt;action_data + pre_off1, sub1_act_len);</div><div class='add'>+	merge_act += sub1_act_len;</div><div class='add'>+	memcpy(merge_act, sub_flow2-&gt;action_data + pre_off2, sub2_act_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Flow link code should only be accessed under RTNL. */</div><div class='add'>+static void nfp_flower_unlink_flow(struct nfp_fl_payload_link *link)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;link-&gt;merge_flow.list);</div><div class='add'>+	list_del(&amp;link-&gt;sub_flow.list);</div><div class='add'>+	kfree(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfp_flower_unlink_flows(struct nfp_fl_payload *merge_flow,</div><div class='add'>+				    struct nfp_fl_payload *sub_flow)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_payload_link *link;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;merge_flow-&gt;linked_flows, merge_flow.list)</div><div class='add'>+		if (link-&gt;sub_flow.flow == sub_flow) {</div><div class='add'>+			nfp_flower_unlink_flow(link);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfp_flower_link_flows(struct nfp_fl_payload *merge_flow,</div><div class='add'>+				 struct nfp_fl_payload *sub_flow)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_payload_link *link;</div><div class='add'>+</div><div class='add'>+	link = kmalloc(sizeof(*link), GFP_KERNEL);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	link-&gt;merge_flow.flow = merge_flow;</div><div class='add'>+	list_add_tail(&amp;link-&gt;merge_flow.list, &amp;merge_flow-&gt;linked_flows);</div><div class='add'>+	link-&gt;sub_flow.flow = sub_flow;</div><div class='add'>+	list_add_tail(&amp;link-&gt;sub_flow.list, &amp;sub_flow-&gt;linked_flows);</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'>+ * nfp_flower_merge_offloaded_flows() - Merge 2 existing flows to single flow.</div><div class='add'>+ * @app:	Pointer to the APP handle</div><div class='add'>+ * @sub_flow1:	Initial flow matched to produce merge hint</div><div class='add'>+ * @sub_flow2:	Post recirculation flow matched in merge hint</div><div class='add'>+ *</div><div class='add'>+ * Combines 2 flows (if valid) to a single flow, removing the initial from hw</div><div class='add'>+ * and offloading the new, merged flow.</div><div class='add'>+ *</div><div class='add'>+ * Return: negative value on error, 0 in success.</div><div class='add'>+ */</div><div class='add'>+int nfp_flower_merge_offloaded_flows(struct nfp_app *app,</div><div class='add'>+				     struct nfp_fl_payload *sub_flow1,</div><div class='add'>+				     struct nfp_fl_payload *sub_flow2)</div><div class='add'>+{</div><div class='add'>+	struct tc_cls_flower_offload merge_tc_off;</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+	struct nfp_fl_payload *merge_flow;</div><div class='add'>+	struct nfp_fl_key_ls merge_key_ls;</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 (sub_flow1 == sub_flow2 ||</div><div class='add'>+	    nfp_flower_is_merge_flow(sub_flow1) ||</div><div class='add'>+	    nfp_flower_is_merge_flow(sub_flow2))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_can_merge(sub_flow1, sub_flow2);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	merge_key_ls.key_size = sub_flow1-&gt;meta.key_len;</div><div class='add'>+</div><div class='add'>+	merge_flow = nfp_flower_allocate_new(&amp;merge_key_ls);</div><div class='add'>+	if (!merge_flow)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	merge_flow-&gt;tc_flower_cookie = (unsigned long)merge_flow;</div><div class='add'>+	merge_flow-&gt;ingress_dev = sub_flow1-&gt;ingress_dev;</div><div class='add'>+</div><div class='add'>+	memcpy(merge_flow-&gt;unmasked_data, sub_flow1-&gt;unmasked_data,</div><div class='add'>+	       sub_flow1-&gt;meta.key_len);</div><div class='add'>+	memcpy(merge_flow-&gt;mask_data, sub_flow1-&gt;mask_data,</div><div class='add'>+	       sub_flow1-&gt;meta.mask_len);</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_merge_action(sub_flow1, sub_flow2, merge_flow);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_destroy_merge_flow;</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_link_flows(merge_flow, sub_flow1);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_destroy_merge_flow;</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_link_flows(merge_flow, sub_flow2);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unlink_sub_flow1;</div><div class='add'>+</div><div class='add'>+	merge_tc_off.cookie = merge_flow-&gt;tc_flower_cookie;</div><div class='add'>+	err = nfp_compile_flow_metadata(app, &amp;merge_tc_off, merge_flow,</div><div class='add'>+					merge_flow-&gt;ingress_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unlink_sub_flow2;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_insert_fast(&amp;priv-&gt;flow_table, &amp;merge_flow-&gt;fl_node,</div><div class='add'>+				     nfp_flower_table_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_release_metadata;</div><div class='add'>+</div><div class='add'>+	err = nfp_flower_xmit_flow(app, merge_flow,</div><div class='add'>+				   NFP_FLOWER_CMSG_TYPE_FLOW_MOD);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_remove_rhash;</div><div class='add'>+</div><div class='add'>+	merge_flow-&gt;in_hw = true;</div><div class='add'>+	sub_flow1-&gt;in_hw = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_remove_rhash:</div><div class='add'>+	WARN_ON_ONCE(rhashtable_remove_fast(&amp;priv-&gt;flow_table,</div><div class='add'>+					    &amp;merge_flow-&gt;fl_node,</div><div class='add'>+					    nfp_flower_table_params));</div><div class='add'>+err_release_metadata:</div><div class='add'>+	nfp_modify_flow_metadata(app, merge_flow);</div><div class='add'>+err_unlink_sub_flow2:</div><div class='add'>+	nfp_flower_unlink_flows(merge_flow, sub_flow2);</div><div class='add'>+err_unlink_sub_flow1:</div><div class='add'>+	nfp_flower_unlink_flows(merge_flow, sub_flow1);</div><div class='add'>+err_destroy_merge_flow:</div><div class='add'>+	kfree(merge_flow-&gt;action_data);</div><div class='add'>+	kfree(merge_flow-&gt;mask_data);</div><div class='add'>+	kfree(merge_flow-&gt;unmasked_data);</div><div class='add'>+	kfree(merge_flow);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfp_flower_add_offload() - Adds a new flow to hardware.</div><div class='ctx'>  * @app:	Pointer to the APP handle</div><div class='hunk'>@@ -454,6 +919,8 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> 	if (port)</div><div class='ctx'> 		port-&gt;tc_offload_cnt++;</div><div class='ctx'> </div><div class='add'>+	flow_pay-&gt;in_hw = true;</div><div class='add'>+</div><div class='ctx'> 	/* Deallocate flow payload when flower rule has been destroyed. */</div><div class='ctx'> 	kfree(key_layer);</div><div class='ctx'> </div><div class='hunk'>@@ -475,6 +942,75 @@ err_free_key_ls:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+nfp_flower_remove_merge_flow(struct nfp_app *app,</div><div class='add'>+			     struct nfp_fl_payload *del_sub_flow,</div><div class='add'>+			     struct nfp_fl_payload *merge_flow)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+	struct nfp_fl_payload_link *link, *temp;</div><div class='add'>+	struct nfp_fl_payload *origin;</div><div class='add'>+	bool mod = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	link = list_first_entry(&amp;merge_flow-&gt;linked_flows,</div><div class='add'>+				struct nfp_fl_payload_link, merge_flow.list);</div><div class='add'>+	origin = link-&gt;sub_flow.flow;</div><div class='add'>+</div><div class='add'>+	/* Re-add rule the merge had overwritten if it has not been deleted. */</div><div class='add'>+	if (origin != del_sub_flow)</div><div class='add'>+		mod = true;</div><div class='add'>+</div><div class='add'>+	err = nfp_modify_flow_metadata(app, merge_flow);</div><div class='add'>+	if (err) {</div><div class='add'>+		nfp_flower_cmsg_warn(app, "Metadata fail for merge flow delete.\n");</div><div class='add'>+		goto err_free_links;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mod) {</div><div class='add'>+		err = nfp_flower_xmit_flow(app, merge_flow,</div><div class='add'>+					   NFP_FLOWER_CMSG_TYPE_FLOW_DEL);</div><div class='add'>+		if (err) {</div><div class='add'>+			nfp_flower_cmsg_warn(app, "Failed to delete merged flow.\n");</div><div class='add'>+			goto err_free_links;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		__nfp_modify_flow_metadata(priv, origin);</div><div class='add'>+		err = nfp_flower_xmit_flow(app, origin,</div><div class='add'>+					   NFP_FLOWER_CMSG_TYPE_FLOW_MOD);</div><div class='add'>+		if (err)</div><div class='add'>+			nfp_flower_cmsg_warn(app, "Failed to revert merge flow.\n");</div><div class='add'>+		origin-&gt;in_hw = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_free_links:</div><div class='add'>+	/* Clean any links connected with the merged flow. */</div><div class='add'>+	list_for_each_entry_safe(link, temp, &amp;merge_flow-&gt;linked_flows,</div><div class='add'>+				 merge_flow.list)</div><div class='add'>+		nfp_flower_unlink_flow(link);</div><div class='add'>+</div><div class='add'>+	kfree(merge_flow-&gt;action_data);</div><div class='add'>+	kfree(merge_flow-&gt;mask_data);</div><div class='add'>+	kfree(merge_flow-&gt;unmasked_data);</div><div class='add'>+	WARN_ON_ONCE(rhashtable_remove_fast(&amp;priv-&gt;flow_table,</div><div class='add'>+					    &amp;merge_flow-&gt;fl_node,</div><div class='add'>+					    nfp_flower_table_params));</div><div class='add'>+	kfree_rcu(merge_flow, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfp_flower_del_linked_merge_flows(struct nfp_app *app,</div><div class='add'>+				  struct nfp_fl_payload *sub_flow)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_payload_link *link, *temp;</div><div class='add'>+</div><div class='add'>+	/* Remove any merge flow formed from the deleted sub_flow. */</div><div class='add'>+	list_for_each_entry_safe(link, temp, &amp;sub_flow-&gt;linked_flows,</div><div class='add'>+				 sub_flow.list)</div><div class='add'>+		nfp_flower_remove_merge_flow(app, sub_flow,</div><div class='add'>+					     link-&gt;merge_flow.flow);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfp_flower_del_offload() - Removes a flow from hardware.</div><div class='ctx'>  * @app:	Pointer to the APP handle</div><div class='hunk'>@@ -482,7 +1018,7 @@ err_free_key_ls:</div><div class='ctx'>  * @flow:	TC flower classifier offload structure</div><div class='ctx'>  *</div><div class='ctx'>  * Removes a flow from the repeated hash structure and clears the</div><div class='del'>- * action payload.</div><div class='add'>+ * action payload. Any flows merged from this are also deleted.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: negative value on error, 0 if removed successfully.</div><div class='ctx'>  */</div><div class='hunk'>@@ -504,17 +1040,22 @@ nfp_flower_del_offload(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	err = nfp_modify_flow_metadata(app, nfp_flow);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_free_flow;</div><div class='add'>+		goto err_free_merge_flow;</div><div class='ctx'> </div><div class='ctx'> 	if (nfp_flow-&gt;nfp_tun_ipv4_addr)</div><div class='ctx'> 		nfp_tunnel_del_ipv4_off(app, nfp_flow-&gt;nfp_tun_ipv4_addr);</div><div class='ctx'> </div><div class='add'>+	if (!nfp_flow-&gt;in_hw) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto err_free_merge_flow;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = nfp_flower_xmit_flow(app, nfp_flow,</div><div class='ctx'> 				   NFP_FLOWER_CMSG_TYPE_FLOW_DEL);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_flow;</div><div class='add'>+	/* Fall through on error. */</div><div class='ctx'> </div><div class='del'>-err_free_flow:</div><div class='add'>+err_free_merge_flow:</div><div class='add'>+	nfp_flower_del_linked_merge_flows(app, nfp_flow);</div><div class='ctx'> 	if (port)</div><div class='ctx'> 		port-&gt;tc_offload_cnt--;</div><div class='ctx'> 	kfree(nfp_flow-&gt;action_data);</div><div class='hunk'>@@ -527,6 +1068,52 @@ err_free_flow:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+__nfp_flower_update_merge_stats(struct nfp_app *app,</div><div class='add'>+				struct nfp_fl_payload *merge_flow)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='add'>+	struct nfp_fl_payload_link *link;</div><div class='add'>+	struct nfp_fl_payload *sub_flow;</div><div class='add'>+	u64 pkts, bytes, used;</div><div class='add'>+	u32 ctx_id;</div><div class='add'>+</div><div class='add'>+	ctx_id = be32_to_cpu(merge_flow-&gt;meta.host_ctx_id);</div><div class='add'>+	pkts = priv-&gt;stats[ctx_id].pkts;</div><div class='add'>+	/* Do not cycle subflows if no stats to distribute. */</div><div class='add'>+	if (!pkts)</div><div class='add'>+		return;</div><div class='add'>+	bytes = priv-&gt;stats[ctx_id].bytes;</div><div class='add'>+	used = priv-&gt;stats[ctx_id].used;</div><div class='add'>+</div><div class='add'>+	/* Reset stats for the merge flow. */</div><div class='add'>+	priv-&gt;stats[ctx_id].pkts = 0;</div><div class='add'>+	priv-&gt;stats[ctx_id].bytes = 0;</div><div class='add'>+</div><div class='add'>+	/* The merge flow has received stats updates from firmware.</div><div class='add'>+	 * Distribute these stats to all subflows that form the merge.</div><div class='add'>+	 * The stats will collected from TC via the subflows.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(link, &amp;merge_flow-&gt;linked_flows, merge_flow.list) {</div><div class='add'>+		sub_flow = link-&gt;sub_flow.flow;</div><div class='add'>+		ctx_id = be32_to_cpu(sub_flow-&gt;meta.host_ctx_id);</div><div class='add'>+		priv-&gt;stats[ctx_id].pkts += pkts;</div><div class='add'>+		priv-&gt;stats[ctx_id].bytes += bytes;</div><div class='add'>+		max_t(u64, priv-&gt;stats[ctx_id].used, used);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfp_flower_update_merge_stats(struct nfp_app *app,</div><div class='add'>+			      struct nfp_fl_payload *sub_flow)</div><div class='add'>+{</div><div class='add'>+	struct nfp_fl_payload_link *link;</div><div class='add'>+</div><div class='add'>+	/* Get merge flows that the subflow forms to distribute their stats. */</div><div class='add'>+	list_for_each_entry(link, &amp;sub_flow-&gt;linked_flows, sub_flow.list)</div><div class='add'>+		__nfp_flower_update_merge_stats(app, link-&gt;merge_flow.flow);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfp_flower_get_stats() - Populates flow stats obtained from hardware.</div><div class='ctx'>  * @app:	Pointer to the APP handle</div><div class='hunk'>@@ -553,6 +1140,10 @@ nfp_flower_get_stats(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> 	ctx_id = be32_to_cpu(nfp_flow-&gt;meta.host_ctx_id);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;stats_lock);</div><div class='add'>+	/* If request is for a sub_flow, update stats from merged flows. */</div><div class='add'>+	if (!list_empty(&amp;nfp_flow-&gt;linked_flows))</div><div class='add'>+		nfp_flower_update_merge_stats(app, nfp_flow);</div><div class='add'>+</div><div class='ctx'> 	flow_stats_update(&amp;flow-&gt;stats, priv-&gt;stats[ctx_id].bytes,</div><div class='ctx'> 			  priv-&gt;stats[ctx_id].pkts, priv-&gt;stats[ctx_id].used);</div><div class='ctx'> </div><div class='hunk'>@@ -594,6 +1185,9 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,</div><div class='ctx'> 	case TC_SETUP_CLSFLOWER:</div><div class='ctx'> 		return nfp_flower_repr_offload(repr-&gt;app, repr-&gt;netdev,</div><div class='ctx'> 					       type_data);</div><div class='add'>+	case TC_SETUP_CLSMATCHALL:</div><div class='add'>+		return nfp_flower_setup_qos_offload(repr-&gt;app, repr-&gt;netdev,</div><div class='add'>+						    type_data);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -603,10 +1197,14 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,</div><div class='ctx'> 				     struct tc_block_offload *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_repr *repr = netdev_priv(netdev);</div><div class='add'>+	struct nfp_flower_repr_priv *repr_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	repr_priv = repr-&gt;app_priv;</div><div class='add'>+	repr_priv-&gt;block_shared = tcf_block_shared(f-&gt;block);</div><div class='add'>+</div><div class='ctx'> 	switch (f-&gt;command) {</div><div class='ctx'> 	case TC_BLOCK_BIND:</div><div class='ctx'> 		return tcf_block_cb_register(f-&gt;block,</div><div class='hunk'>@@ -682,7 +1280,9 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app,</div><div class='ctx'> 	struct nfp_flower_priv *priv = app-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (f-&gt;binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+	if (f-&gt;binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS &amp;&amp;</div><div class='add'>+	    !(f-&gt;binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS &amp;&amp;</div><div class='add'>+	      nfp_flower_internal_port_can_offload(app, netdev)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (f-&gt;command) {</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c<br/>new file mode 100644<br/>index 000000000000..86e968cd5ffd<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/qos_conf.c</a></div><div class='hunk'>@@ -0,0 +1,366 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+/* Copyright (C) 2019 Netronome Systems, Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/math64.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'>+</div><div class='add'>+#include "cmsg.h"</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "../nfp_port.h"</div><div class='add'>+</div><div class='add'>+#define NFP_FL_QOS_UPDATE		msecs_to_jiffies(1000)</div><div class='add'>+</div><div class='add'>+struct nfp_police_cfg_head {</div><div class='add'>+	__be32 flags_opts;</div><div class='add'>+	__be32 port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Police cmsg for configuring a trTCM traffic conditioner (8W/32B)</div><div class='add'>+ * See RFC 2698 for more details.</div><div class='add'>+ * ----------------------------------------------------------------</div><div class='add'>+ *    3                   2                   1</div><div class='add'>+ *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                          Flag options                         |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                          Port Ingress                         |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                        Token Bucket Peak                      |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                     Token Bucket Committed                    |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                         Peak Burst Size                       |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                      Committed Burst Size                     |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                      Peak Information Rate                    |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ * |                    Committed Information Rate                 |</div><div class='add'>+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+</div><div class='add'>+ */</div><div class='add'>+struct nfp_police_config {</div><div class='add'>+	struct nfp_police_cfg_head head;</div><div class='add'>+	__be32 bkt_tkn_p;</div><div class='add'>+	__be32 bkt_tkn_c;</div><div class='add'>+	__be32 pbs;</div><div class='add'>+	__be32 cbs;</div><div class='add'>+	__be32 pir;</div><div class='add'>+	__be32 cir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nfp_police_stats_reply {</div><div class='add'>+	struct nfp_police_cfg_head head;</div><div class='add'>+	__be64 pass_bytes;</div><div class='add'>+	__be64 pass_pkts;</div><div class='add'>+	__be64 drop_bytes;</div><div class='add'>+	__be64 drop_pkts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfp_flower_install_rate_limiter(struct nfp_app *app, struct net_device *netdev,</div><div class='add'>+				struct tc_cls_matchall_offload *flow,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct flow_action_entry *action = &amp;flow-&gt;rule-&gt;action.entries[0];</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+	struct nfp_flower_repr_priv *repr_priv;</div><div class='add'>+	struct nfp_police_config *config;</div><div class='add'>+	struct nfp_repr *repr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 netdev_port_id;</div><div class='add'>+	u64 burst, rate;</div><div class='add'>+</div><div class='add'>+	if (!nfp_netdev_is_nfp_repr(netdev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on higher level port");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	repr = netdev_priv(netdev);</div><div class='add'>+	repr_priv = repr-&gt;app_priv;</div><div class='add'>+</div><div class='add'>+	if (repr_priv-&gt;block_shared) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on shared blocks");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (repr-&gt;port-&gt;type != NFP_PORT_VF_PORT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on non-VF ports");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!flow_offload_has_one_action(&amp;flow-&gt;rule-&gt;action)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload requires a single action");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow-&gt;common.prio != (1 &lt;&lt; 16)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload requires highest priority");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (action-&gt;id != FLOW_ACTION_POLICE) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload requires police action");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate = action-&gt;police.rate_bytes_ps;</div><div class='add'>+	burst = div_u64(rate * PSCHED_NS2TICKS(action-&gt;police.burst),</div><div class='add'>+			PSCHED_TICKS_PER_SEC);</div><div class='add'>+	netdev_port_id = nfp_repr_get_port_id(netdev);</div><div class='add'>+</div><div class='add'>+	skb = nfp_flower_cmsg_alloc(repr-&gt;app, sizeof(struct nfp_police_config),</div><div class='add'>+				    NFP_FLOWER_CMSG_TYPE_QOS_MOD, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	config = nfp_flower_cmsg_get_data(skb);</div><div class='add'>+	memset(config, 0, sizeof(struct nfp_police_config));</div><div class='add'>+	config-&gt;head.port = cpu_to_be32(netdev_port_id);</div><div class='add'>+	config-&gt;bkt_tkn_p = cpu_to_be32(burst);</div><div class='add'>+	config-&gt;bkt_tkn_c = cpu_to_be32(burst);</div><div class='add'>+	config-&gt;pbs = cpu_to_be32(burst);</div><div class='add'>+	config-&gt;cbs = cpu_to_be32(burst);</div><div class='add'>+	config-&gt;pir = cpu_to_be32(rate);</div><div class='add'>+	config-&gt;cir = cpu_to_be32(rate);</div><div class='add'>+	nfp_ctrl_tx(repr-&gt;app-&gt;ctrl, skb);</div><div class='add'>+</div><div class='add'>+	repr_priv-&gt;qos_table.netdev_port_id = netdev_port_id;</div><div class='add'>+	fl_priv-&gt;qos_rate_limiters++;</div><div class='add'>+	if (fl_priv-&gt;qos_rate_limiters == 1)</div><div class='add'>+		schedule_delayed_work(&amp;fl_priv-&gt;qos_stats_work,</div><div class='add'>+				      NFP_FL_QOS_UPDATE);</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'>+nfp_flower_remove_rate_limiter(struct nfp_app *app, struct net_device *netdev,</div><div class='add'>+			       struct tc_cls_matchall_offload *flow,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+	struct nfp_flower_repr_priv *repr_priv;</div><div class='add'>+	struct nfp_police_config *config;</div><div class='add'>+	struct nfp_repr *repr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 netdev_port_id;</div><div class='add'>+</div><div class='add'>+	if (!nfp_netdev_is_nfp_repr(netdev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on higher level port");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	repr = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	netdev_port_id = nfp_repr_get_port_id(netdev);</div><div class='add'>+	repr_priv = repr-&gt;app_priv;</div><div class='add'>+</div><div class='add'>+	if (!repr_priv-&gt;qos_table.netdev_port_id) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: cannot remove qos entry that does not exist");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = nfp_flower_cmsg_alloc(repr-&gt;app, sizeof(struct nfp_police_config),</div><div class='add'>+				    NFP_FLOWER_CMSG_TYPE_QOS_DEL, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Clear all qos associate data for this interface */</div><div class='add'>+	memset(&amp;repr_priv-&gt;qos_table, 0, sizeof(struct nfp_fl_qos));</div><div class='add'>+	fl_priv-&gt;qos_rate_limiters--;</div><div class='add'>+	if (!fl_priv-&gt;qos_rate_limiters)</div><div class='add'>+		cancel_delayed_work_sync(&amp;fl_priv-&gt;qos_stats_work);</div><div class='add'>+</div><div class='add'>+	config = nfp_flower_cmsg_get_data(skb);</div><div class='add'>+	memset(config, 0, sizeof(struct nfp_police_config));</div><div class='add'>+	config-&gt;head.port = cpu_to_be32(netdev_port_id);</div><div class='add'>+	nfp_ctrl_tx(repr-&gt;app-&gt;ctrl, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfp_flower_stats_rlim_reply(struct nfp_app *app, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+	struct nfp_flower_repr_priv *repr_priv;</div><div class='add'>+	struct nfp_police_stats_reply *msg;</div><div class='add'>+	struct nfp_stat_pair *curr_stats;</div><div class='add'>+	struct nfp_stat_pair *prev_stats;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct nfp_repr *repr;</div><div class='add'>+	u32 netdev_port_id;</div><div class='add'>+</div><div class='add'>+	msg = nfp_flower_cmsg_get_data(skb);</div><div class='add'>+	netdev_port_id = be32_to_cpu(msg-&gt;head.port);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	netdev = nfp_app_dev_get(app, netdev_port_id, NULL);</div><div class='add'>+	if (!netdev)</div><div class='add'>+		goto exit_unlock_rcu;</div><div class='add'>+</div><div class='add'>+	repr = netdev_priv(netdev);</div><div class='add'>+	repr_priv = repr-&gt;app_priv;</div><div class='add'>+	curr_stats = &amp;repr_priv-&gt;qos_table.curr_stats;</div><div class='add'>+	prev_stats = &amp;repr_priv-&gt;qos_table.prev_stats;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;fl_priv-&gt;qos_stats_lock);</div><div class='add'>+	curr_stats-&gt;pkts = be64_to_cpu(msg-&gt;pass_pkts) +</div><div class='add'>+			   be64_to_cpu(msg-&gt;drop_pkts);</div><div class='add'>+	curr_stats-&gt;bytes = be64_to_cpu(msg-&gt;pass_bytes) +</div><div class='add'>+			    be64_to_cpu(msg-&gt;drop_bytes);</div><div class='add'>+</div><div class='add'>+	if (!repr_priv-&gt;qos_table.last_update) {</div><div class='add'>+		prev_stats-&gt;pkts = curr_stats-&gt;pkts;</div><div class='add'>+		prev_stats-&gt;bytes = curr_stats-&gt;bytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	repr_priv-&gt;qos_table.last_update = jiffies;</div><div class='add'>+	spin_unlock_bh(&amp;fl_priv-&gt;qos_stats_lock);</div><div class='add'>+</div><div class='add'>+exit_unlock_rcu:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfp_flower_stats_rlim_request(struct nfp_flower_priv *fl_priv,</div><div class='add'>+			      u32 netdev_port_id)</div><div class='add'>+{</div><div class='add'>+	struct nfp_police_cfg_head *head;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = nfp_flower_cmsg_alloc(fl_priv-&gt;app,</div><div class='add'>+				    sizeof(struct nfp_police_cfg_head),</div><div class='add'>+				    NFP_FLOWER_CMSG_TYPE_QOS_STATS,</div><div class='add'>+				    GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	head = nfp_flower_cmsg_get_data(skb);</div><div class='add'>+	memset(head, 0, sizeof(struct nfp_police_cfg_head));</div><div class='add'>+	head-&gt;port = cpu_to_be32(netdev_port_id);</div><div class='add'>+</div><div class='add'>+	nfp_ctrl_tx(fl_priv-&gt;app-&gt;ctrl, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfp_flower_stats_rlim_request_all(struct nfp_flower_priv *fl_priv)</div><div class='add'>+{</div><div class='add'>+	struct nfp_reprs *repr_set;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	repr_set = rcu_dereference(fl_priv-&gt;app-&gt;reprs[NFP_REPR_TYPE_VF]);</div><div class='add'>+	if (!repr_set)</div><div class='add'>+		goto exit_unlock_rcu;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; repr_set-&gt;num_reprs; i++) {</div><div class='add'>+		struct net_device *netdev;</div><div class='add'>+</div><div class='add'>+		netdev = rcu_dereference(repr_set-&gt;reprs[i]);</div><div class='add'>+		if (netdev) {</div><div class='add'>+			struct nfp_repr *priv = netdev_priv(netdev);</div><div class='add'>+			struct nfp_flower_repr_priv *repr_priv;</div><div class='add'>+			u32 netdev_port_id;</div><div class='add'>+</div><div class='add'>+			repr_priv = priv-&gt;app_priv;</div><div class='add'>+			netdev_port_id = repr_priv-&gt;qos_table.netdev_port_id;</div><div class='add'>+			if (!netdev_port_id)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			nfp_flower_stats_rlim_request(fl_priv, netdev_port_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_unlock_rcu:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_stats_cache(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *delayed_work;</div><div class='add'>+	struct nfp_flower_priv *fl_priv;</div><div class='add'>+</div><div class='add'>+	delayed_work = to_delayed_work(work);</div><div class='add'>+	fl_priv = container_of(delayed_work, struct nfp_flower_priv,</div><div class='add'>+			       qos_stats_work);</div><div class='add'>+</div><div class='add'>+	nfp_flower_stats_rlim_request_all(fl_priv);</div><div class='add'>+	schedule_delayed_work(&amp;fl_priv-&gt;qos_stats_work, NFP_FL_QOS_UPDATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfp_flower_stats_rate_limiter(struct nfp_app *app, struct net_device *netdev,</div><div class='add'>+			      struct tc_cls_matchall_offload *flow,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+	struct nfp_flower_repr_priv *repr_priv;</div><div class='add'>+	struct nfp_stat_pair *curr_stats;</div><div class='add'>+	struct nfp_stat_pair *prev_stats;</div><div class='add'>+	u64 diff_bytes, diff_pkts;</div><div class='add'>+	struct nfp_repr *repr;</div><div class='add'>+</div><div class='add'>+	if (!nfp_netdev_is_nfp_repr(netdev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on higher level port");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	repr = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	repr_priv = repr-&gt;app_priv;</div><div class='add'>+	if (!repr_priv-&gt;qos_table.netdev_port_id) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: cannot find qos entry for stats update");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;fl_priv-&gt;qos_stats_lock);</div><div class='add'>+	curr_stats = &amp;repr_priv-&gt;qos_table.curr_stats;</div><div class='add'>+	prev_stats = &amp;repr_priv-&gt;qos_table.prev_stats;</div><div class='add'>+	diff_pkts = curr_stats-&gt;pkts - prev_stats-&gt;pkts;</div><div class='add'>+	diff_bytes = curr_stats-&gt;bytes - prev_stats-&gt;bytes;</div><div class='add'>+	prev_stats-&gt;pkts = curr_stats-&gt;pkts;</div><div class='add'>+	prev_stats-&gt;bytes = curr_stats-&gt;bytes;</div><div class='add'>+	spin_unlock_bh(&amp;fl_priv-&gt;qos_stats_lock);</div><div class='add'>+</div><div class='add'>+	flow_stats_update(&amp;flow-&gt;stats, diff_bytes, diff_pkts,</div><div class='add'>+			  repr_priv-&gt;qos_table.last_update);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfp_flower_qos_init(struct nfp_app *app)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;fl_priv-&gt;qos_stats_lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;fl_priv-&gt;qos_stats_work, &amp;update_stats_cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfp_flower_qos_cleanup(struct nfp_app *app)</div><div class='add'>+{</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;fl_priv-&gt;qos_stats_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfp_flower_setup_qos_offload(struct nfp_app *app, struct net_device *netdev,</div><div class='add'>+				 struct tc_cls_matchall_offload *flow)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = flow-&gt;common.extack;</div><div class='add'>+	struct nfp_flower_priv *fl_priv = app-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!(fl_priv-&gt;flower_ext_feats &amp; NFP_FL_FEATS_VF_RLIM)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: loaded firmware does not support qos rate limit offload");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (flow-&gt;command) {</div><div class='add'>+	case TC_CLSMATCHALL_REPLACE:</div><div class='add'>+		return nfp_flower_install_rate_limiter(app, netdev, flow,</div><div class='add'>+						       extack);</div><div class='add'>+	case TC_CLSMATCHALL_DESTROY:</div><div class='add'>+		return nfp_flower_remove_rate_limiter(app, netdev, flow,</div><div class='add'>+						      extack);</div><div class='add'>+	case TC_CLSMATCHALL_STATS:</div><div class='add'>+		return nfp_flower_stats_rate_limiter(app, netdev, flow,</div><div class='add'>+						     extack);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c<br/>index 4d78be4ec4e9..faa06edf95ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c</a></div><div class='hunk'>@@ -171,7 +171,7 @@ void nfp_tunnel_keep_alive(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		ipv4_addr = payload-&gt;tun_info[i].ipv4;</div><div class='ctx'> 		port = be32_to_cpu(payload-&gt;tun_info[i].egress_port);</div><div class='del'>-		netdev = nfp_app_repr_get(app, port);</div><div class='add'>+		netdev = nfp_app_dev_get(app, port, NULL);</div><div class='ctx'> 		if (!netdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -270,9 +270,10 @@ nfp_tun_write_neigh(struct net_device *netdev, struct nfp_app *app,</div><div class='ctx'> 		    struct flowi4 *flow, struct neighbour *neigh, gfp_t flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_tun_neigh payload;</div><div class='add'>+	u32 port_id;</div><div class='ctx'> </div><div class='del'>-	/* Only offload representor IPv4s for now. */</div><div class='del'>-	if (!nfp_netdev_is_nfp_repr(netdev))</div><div class='add'>+	port_id = nfp_flower_get_port_id_from_netdev(app, netdev);</div><div class='add'>+	if (!port_id)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;payload, 0, sizeof(struct nfp_tun_neigh));</div><div class='hunk'>@@ -290,7 +291,7 @@ nfp_tun_write_neigh(struct net_device *netdev, struct nfp_app *app,</div><div class='ctx'> 	payload.src_ipv4 = flow-&gt;saddr;</div><div class='ctx'> 	ether_addr_copy(payload.src_addr, netdev-&gt;dev_addr);</div><div class='ctx'> 	neigh_ha_snapshot(payload.dst_addr, neigh, netdev);</div><div class='del'>-	payload.port_id = cpu_to_be32(nfp_repr_get_port_id(netdev));</div><div class='add'>+	payload.port_id = cpu_to_be32(port_id);</div><div class='ctx'> 	/* Add destination of new route to NFP cache. */</div><div class='ctx'> 	nfp_tun_add_route_to_cache(app, payload.dst_ipv4);</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +367,7 @@ void nfp_tunnel_request_route(struct nfp_app *app, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	payload = nfp_flower_cmsg_get_data(skb);</div><div class='ctx'> </div><div class='del'>-	netdev = nfp_app_repr_get(app, be32_to_cpu(payload-&gt;ingress_port));</div><div class='add'>+	netdev = nfp_app_dev_get(app, be32_to_cpu(payload-&gt;ingress_port), NULL);</div><div class='ctx'> 	if (!netdev)</div><div class='ctx'> 		goto route_fail_warning;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.h b/drivers/net/ethernet/netronome/nfp/nfp_app.h<br/>index f8d422713705..76d13af46a7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_app.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_app.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_app.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_app.h</a></div><div class='hunk'>@@ -79,7 +79,7 @@ extern const struct nfp_app_type app_abm;</div><div class='ctx'>  * @eswitch_mode_set:    set SR-IOV eswitch mode (under pf-&gt;lock)</div><div class='ctx'>  * @sriov_enable: app-specific sriov initialisation</div><div class='ctx'>  * @sriov_disable: app-specific sriov clean-up</div><div class='del'>- * @repr_get:	get representor netdev</div><div class='add'>+ * @dev_get:	get representor or internal port representing netdev</div><div class='ctx'>  */</div><div class='ctx'> struct nfp_app_type {</div><div class='ctx'> 	enum nfp_app_id id;</div><div class='hunk'>@@ -143,7 +143,8 @@ struct nfp_app_type {</div><div class='ctx'> </div><div class='ctx'> 	enum devlink_eswitch_mode (*eswitch_mode_get)(struct nfp_app *app);</div><div class='ctx'> 	int (*eswitch_mode_set)(struct nfp_app *app, u16 mode);</div><div class='del'>-	struct net_device *(*repr_get)(struct nfp_app *app, u32 id);</div><div class='add'>+	struct net_device *(*dev_get)(struct nfp_app *app, u32 id,</div><div class='add'>+				      bool *redir_egress);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -397,12 +398,14 @@ static inline void nfp_app_sriov_disable(struct nfp_app *app)</div><div class='ctx'> 		app-&gt;type-&gt;sriov_disable(app);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct net_device *nfp_app_repr_get(struct nfp_app *app, u32 id)</div><div class='add'>+static inline</div><div class='add'>+struct net_device *nfp_app_dev_get(struct nfp_app *app, u32 id,</div><div class='add'>+				   bool *redir_egress)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!app || !app-&gt;type-&gt;repr_get))</div><div class='add'>+	if (unlikely(!app || !app-&gt;type-&gt;dev_get))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return app-&gt;type-&gt;repr_get(app, id);</div><div class='add'>+	return app-&gt;type-&gt;dev_get(app, id, redir_egress);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nfp_app *nfp_app_from_netdev(struct net_device *netdev);</div><div class='hunk'>@@ -433,6 +436,6 @@ int nfp_app_nic_vnic_alloc(struct nfp_app *app, struct nfp_net *nn,</div><div class='ctx'> int nfp_app_nic_vnic_init_phy_port(struct nfp_pf *pf, struct nfp_app *app,</div><div class='ctx'> 				   struct nfp_net *nn, unsigned int id);</div><div class='ctx'> </div><div class='del'>-struct devlink *nfp_devlink_get_devlink(struct net_device *netdev);</div><div class='add'>+struct devlink_port *nfp_devlink_get_devlink_port(struct net_device *netdev);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c<br/>index e9eca99cf493..c50fce42f473 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_devlink.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_devlink.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_devlink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_devlink.c</a></div><div class='hunk'>@@ -144,7 +144,8 @@ nfp_devlink_sb_pool_get(struct devlink *devlink, unsigned int sb_index,</div><div class='ctx'> static int</div><div class='ctx'> nfp_devlink_sb_pool_set(struct devlink *devlink, unsigned int sb_index,</div><div class='ctx'> 			u16 pool_index,</div><div class='del'>-			u32 size, enum devlink_sb_threshold_type threshold_type)</div><div class='add'>+			u32 size, enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_pf *pf = devlink_priv(devlink);</div><div class='ctx'> </div><div class='hunk'>@@ -354,6 +355,8 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_eth_table_port eth_port;</div><div class='ctx'> 	struct devlink *devlink;</div><div class='add'>+	const u8 *serial;</div><div class='add'>+	int serial_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='hunk'>@@ -362,10 +365,10 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	devlink_port_type_eth_set(&amp;port-&gt;dl_port, port-&gt;netdev);</div><div class='add'>+	serial_len = nfp_cpp_serial(port-&gt;app-&gt;cpp, &amp;serial);</div><div class='ctx'> 	devlink_port_attrs_set(&amp;port-&gt;dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='ctx'> 			       eth_port.label_port, eth_port.is_split,</div><div class='del'>-			       eth_port.label_subport);</div><div class='add'>+			       eth_port.label_subport, serial, serial_len);</div><div class='ctx'> </div><div class='ctx'> 	devlink = priv_to_devlink(app-&gt;pf);</div><div class='ctx'> </div><div class='hunk'>@@ -377,13 +380,23 @@ void nfp_devlink_port_unregister(struct nfp_port *port)</div><div class='ctx'> 	devlink_port_unregister(&amp;port-&gt;dl_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct devlink *nfp_devlink_get_devlink(struct net_device *netdev)</div><div class='add'>+void nfp_devlink_port_type_eth_set(struct nfp_port *port)</div><div class='add'>+{</div><div class='add'>+	devlink_port_type_eth_set(&amp;port-&gt;dl_port, port-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfp_devlink_port_type_clear(struct nfp_port *port)</div><div class='ctx'> {</div><div class='del'>-	struct nfp_app *app;</div><div class='add'>+	devlink_port_type_clear(&amp;port-&gt;dl_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink_port *nfp_devlink_get_devlink_port(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct nfp_port *port;</div><div class='ctx'> </div><div class='del'>-	app = nfp_app_from_netdev(netdev);</div><div class='del'>-	if (!app)</div><div class='add'>+	port = nfp_port_from_netdev(netdev);</div><div class='add'>+	if (!port)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return priv_to_devlink(app-&gt;pf);</div><div class='add'>+	return &amp;port-&gt;dl_port;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c<br/>index f4c8776e42b6..948d1a4b4643 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_main.c</a></div><div class='hunk'>@@ -294,6 +294,9 @@ static int nfp_pcie_sriov_disable(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static int nfp_pcie_sriov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> {</div><div class='add'>+	if (!pci_get_drvdata(pdev))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	if (num_vfs == 0)</div><div class='ctx'> 		return nfp_pcie_sriov_disable(pdev);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -720,9 +723,13 @@ err_pci_disable:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfp_pci_remove(struct pci_dev *pdev)</div><div class='add'>+static void __nfp_pci_shutdown(struct pci_dev *pdev, bool unload_fw)</div><div class='ctx'> {</div><div class='del'>-	struct nfp_pf *pf = pci_get_drvdata(pdev);</div><div class='add'>+	struct nfp_pf *pf;</div><div class='add'>+</div><div class='add'>+	pf = pci_get_drvdata(pdev);</div><div class='add'>+	if (!pf)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	nfp_hwmon_unregister(pf);</div><div class='ctx'> </div><div class='hunk'>@@ -733,7 +740,7 @@ static void nfp_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	vfree(pf-&gt;dumpspec);</div><div class='ctx'> 	kfree(pf-&gt;rtbl);</div><div class='ctx'> 	nfp_mip_close(pf-&gt;mip);</div><div class='del'>-	if (pf-&gt;fw_loaded)</div><div class='add'>+	if (unload_fw &amp;&amp; pf-&gt;fw_loaded)</div><div class='ctx'> 		nfp_fw_unload(pf);</div><div class='ctx'> </div><div class='ctx'> 	destroy_workqueue(pf-&gt;wq);</div><div class='hunk'>@@ -749,11 +756,22 @@ static void nfp_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nfp_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	__nfp_pci_shutdown(pdev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfp_pci_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	__nfp_pci_shutdown(pdev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pci_driver nfp_pci_driver = {</div><div class='ctx'> 	.name			= nfp_driver_name,</div><div class='ctx'> 	.id_table		= nfp_pci_device_ids,</div><div class='ctx'> 	.probe			= nfp_pci_probe,</div><div class='ctx'> 	.remove			= nfp_pci_remove,</div><div class='add'>+	.shutdown		= nfp_pci_shutdown,</div><div class='ctx'> 	.sriov_configure	= nfp_pcie_sriov_configure,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h<br/>index be37c2d6151c..df9aff2684ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net.h</a></div><div class='hunk'>@@ -539,12 +539,17 @@ struct nfp_net_dp {</div><div class='ctx'>  * @shared_handler:     Handler for shared interrupts</div><div class='ctx'>  * @shared_name:        Name for shared interrupt</div><div class='ctx'>  * @me_freq_mhz:        ME clock_freq (MHz)</div><div class='del'>- * @reconfig_lock:	Protects HW reconfiguration request regs/machinery</div><div class='add'>+ * @reconfig_lock:	Protects @reconfig_posted, @reconfig_timer_active,</div><div class='add'>+ *			@reconfig_sync_present and HW reconfiguration request</div><div class='add'>+ *			regs/machinery from async requests (sync must take</div><div class='add'>+ *			@bar_lock)</div><div class='ctx'>  * @reconfig_posted:	Pending reconfig bits coming from async sources</div><div class='ctx'>  * @reconfig_timer_active:  Timer for reading reconfiguration results is pending</div><div class='ctx'>  * @reconfig_sync_present:  Some thread is performing synchronous reconfig</div><div class='ctx'>  * @reconfig_timer:	Timer for async reading of reconfig results</div><div class='ctx'>  * @reconfig_in_progress_update:	Update FW is processing now (debug only)</div><div class='add'>+ * @bar_lock:		vNIC config BAR access lock, protects: update,</div><div class='add'>+ *			mailbox area</div><div class='ctx'>  * @link_up:            Is the link up?</div><div class='ctx'>  * @link_status_lock:	Protects @link_* and ensures atomicity with BAR reading</div><div class='ctx'>  * @rx_coalesce_usecs:      RX interrupt moderation usecs delay parameter</div><div class='hunk'>@@ -615,6 +620,8 @@ struct nfp_net {</div><div class='ctx'> 	struct timer_list reconfig_timer;</div><div class='ctx'> 	u32 reconfig_in_progress_update;</div><div class='ctx'> </div><div class='add'>+	struct mutex bar_lock;</div><div class='add'>+</div><div class='ctx'> 	u32 rx_coalesce_usecs;</div><div class='ctx'> 	u32 rx_coalesce_max_frames;</div><div class='ctx'> 	u32 tx_coalesce_usecs;</div><div class='hunk'>@@ -839,6 +846,16 @@ static inline void nfp_ctrl_unlock(struct nfp_net *nn)</div><div class='ctx'> 	spin_unlock_bh(&amp;nn-&gt;r_vecs[0].lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void nn_ctrl_bar_lock(struct nfp_net *nn)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;nn-&gt;bar_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nn_ctrl_bar_unlock(struct nfp_net *nn)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;nn-&gt;bar_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Globals */</div><div class='ctx'> extern const char nfp_driver_version[];</div><div class='ctx'> </div><div class='hunk'>@@ -871,7 +888,9 @@ unsigned int nfp_net_rss_key_sz(struct nfp_net *nn);</div><div class='ctx'> void nfp_net_rss_write_itbl(struct nfp_net *nn);</div><div class='ctx'> void nfp_net_rss_write_key(struct nfp_net *nn);</div><div class='ctx'> void nfp_net_coalesce_write_cfg(struct nfp_net *nn);</div><div class='del'>-int nfp_net_reconfig_mbox(struct nfp_net *nn, u32 mbox_cmd);</div><div class='add'>+int nfp_net_mbox_lock(struct nfp_net *nn, unsigned int data_size);</div><div class='add'>+int nfp_net_mbox_reconfig(struct nfp_net *nn, u32 mbox_cmd);</div><div class='add'>+int nfp_net_mbox_reconfig_and_unlock(struct nfp_net *nn, u32 mbox_cmd);</div><div class='ctx'> </div><div class='ctx'> unsigned int</div><div class='ctx'> nfp_net_irqs_alloc(struct pci_dev *pdev, struct msix_entry *irq_entries,</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c<br/>index 6d1b8816552e..b82b684f52ce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_common.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.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/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/overflow.h&gt;</div><div class='ctx'> #include &lt;linux/page_ref.h&gt;</div><div class='hunk'>@@ -137,20 +138,37 @@ static bool nfp_net_reconfig_check_done(struct nfp_net *nn, bool last_check)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfp_net_reconfig_wait(struct nfp_net *nn, unsigned long deadline)</div><div class='add'>+static bool __nfp_net_reconfig_wait(struct nfp_net *nn, unsigned long deadline)</div><div class='ctx'> {</div><div class='ctx'> 	bool timed_out = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Poll update field, waiting for NFP to ack the config.</div><div class='add'>+	 * Do an opportunistic wait-busy loop, afterward sleep.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 50; i++) {</div><div class='add'>+		if (nfp_net_reconfig_check_done(nn, false))</div><div class='add'>+			return false;</div><div class='add'>+		udelay(4);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Poll update field, waiting for NFP to ack the config */</div><div class='ctx'> 	while (!nfp_net_reconfig_check_done(nn, timed_out)) {</div><div class='del'>-		msleep(1);</div><div class='add'>+		usleep_range(250, 500);</div><div class='ctx'> 		timed_out = time_is_before_eq_jiffies(deadline);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return timed_out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfp_net_reconfig_wait(struct nfp_net *nn, unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	if (__nfp_net_reconfig_wait(nn, deadline))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (nn_readl(nn, NFP_NET_CFG_UPDATE) &amp; NFP_NET_CFG_UPDATE_ERR)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	return timed_out ? -EIO : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfp_net_reconfig_timer(struct timer_list *t)</div><div class='hunk'>@@ -243,7 +261,7 @@ static void nfp_net_reconfig_wait_posted(struct nfp_net *nn)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nfp_net_reconfig() - Reconfigure the firmware</div><div class='add'>+ * __nfp_net_reconfig() - Reconfigure the firmware</div><div class='ctx'>  * @nn:      NFP Net device to reconfigure</div><div class='ctx'>  * @update:  The value for the update field in the BAR config</div><div class='ctx'>  *</div><div class='hunk'>@@ -253,10 +271,12 @@ static void nfp_net_reconfig_wait_posted(struct nfp_net *nn)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Negative errno on error, 0 on success</div><div class='ctx'>  */</div><div class='del'>-int nfp_net_reconfig(struct nfp_net *nn, u32 update)</div><div class='add'>+static int __nfp_net_reconfig(struct nfp_net *nn, u32 update)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;nn-&gt;bar_lock);</div><div class='add'>+</div><div class='ctx'> 	nfp_net_reconfig_sync_enter(nn);</div><div class='ctx'> </div><div class='ctx'> 	nfp_net_reconfig_start(nn, update);</div><div class='hunk'>@@ -274,8 +294,31 @@ int nfp_net_reconfig(struct nfp_net *nn, u32 update)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int nfp_net_reconfig(struct nfp_net *nn, u32 update)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nn_ctrl_bar_lock(nn);</div><div class='add'>+	ret = __nfp_net_reconfig(nn, update);</div><div class='add'>+	nn_ctrl_bar_unlock(nn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfp_net_mbox_lock(struct nfp_net *nn, unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	if (nn-&gt;tlv_caps.mbox_len &lt; NFP_NET_CFG_MBOX_SIMPLE_VAL + data_size) {</div><div class='add'>+		nn_err(nn, "mailbox too small for %u of data (%u)\n",</div><div class='add'>+		       data_size, nn-&gt;tlv_caps.mbox_len);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nn_ctrl_bar_lock(nn);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * nfp_net_reconfig_mbox() - Reconfigure the firmware via the mailbox</div><div class='add'>+ * nfp_net_mbox_reconfig() - Reconfigure the firmware via the mailbox</div><div class='ctx'>  * @nn:        NFP Net device to reconfigure</div><div class='ctx'>  * @mbox_cmd:  The value for the mailbox command</div><div class='ctx'>  *</div><div class='hunk'>@@ -283,19 +326,15 @@ int nfp_net_reconfig(struct nfp_net *nn, u32 update)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Negative errno on error, 0 on success</div><div class='ctx'>  */</div><div class='del'>-int nfp_net_reconfig_mbox(struct nfp_net *nn, u32 mbox_cmd)</div><div class='add'>+int nfp_net_mbox_reconfig(struct nfp_net *nn, u32 mbox_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mbox = nn-&gt;tlv_caps.mbox_off;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!nfp_net_has_mbox(&amp;nn-&gt;tlv_caps)) {</div><div class='del'>-		nn_err(nn, "no mailbox present, command: %u\n", mbox_cmd);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	lockdep_assert_held(&amp;nn-&gt;bar_lock);</div><div class='ctx'> 	nn_writeq(nn, mbox + NFP_NET_CFG_MBOX_SIMPLE_CMD, mbox_cmd);</div><div class='ctx'> </div><div class='del'>-	ret = nfp_net_reconfig(nn, NFP_NET_CFG_UPDATE_MBOX);</div><div class='add'>+	ret = __nfp_net_reconfig(nn, NFP_NET_CFG_UPDATE_MBOX);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		nn_err(nn, "Mailbox update error\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -304,6 +343,15 @@ int nfp_net_reconfig_mbox(struct nfp_net *nn, u32 mbox_cmd)</div><div class='ctx'> 	return -nn_readl(nn, mbox + NFP_NET_CFG_MBOX_SIMPLE_RET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int nfp_net_mbox_reconfig_and_unlock(struct nfp_net *nn, u32 mbox_cmd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nfp_net_mbox_reconfig(nn, mbox_cmd);</div><div class='add'>+	nn_ctrl_bar_unlock(nn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Interrupt configuration and handling</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -909,7 +957,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		nfp_net_tx_ring_stop(nd_q, tx_ring);</div><div class='ctx'> </div><div class='ctx'> 	tx_ring-&gt;wr_ptr_add += nr_frags + 1;</div><div class='del'>-	if (__netdev_tx_sent_queue(nd_q, txbuf-&gt;real_len, skb-&gt;xmit_more))</div><div class='add'>+	if (__netdev_tx_sent_queue(nd_q, txbuf-&gt;real_len, netdev_xmit_more()))</div><div class='ctx'> 		nfp_net_tx_xmit_more_flush(tx_ring);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -1635,6 +1683,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)</div><div class='ctx'> 		struct nfp_net_rx_buf *rxbuf;</div><div class='ctx'> 		struct nfp_net_rx_desc *rxd;</div><div class='ctx'> 		struct nfp_meta_parsed meta;</div><div class='add'>+		bool redir_egress = false;</div><div class='ctx'> 		struct net_device *netdev;</div><div class='ctx'> 		dma_addr_t new_dma_addr;</div><div class='ctx'> 		u32 meta_len_xdp = 0;</div><div class='hunk'>@@ -1770,13 +1819,16 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)</div><div class='ctx'> 			struct nfp_net *nn;</div><div class='ctx'> </div><div class='ctx'> 			nn = netdev_priv(dp-&gt;netdev);</div><div class='del'>-			netdev = nfp_app_repr_get(nn-&gt;app, meta.portid);</div><div class='add'>+			netdev = nfp_app_dev_get(nn-&gt;app, meta.portid,</div><div class='add'>+						 &amp;redir_egress);</div><div class='ctx'> 			if (unlikely(!netdev)) {</div><div class='ctx'> 				nfp_net_rx_drop(dp, r_vec, rx_ring, rxbuf,</div><div class='ctx'> 						NULL);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			nfp_repr_inc_rx_stats(netdev, pkt_len);</div><div class='add'>+</div><div class='add'>+			if (nfp_netdev_is_nfp_repr(netdev))</div><div class='add'>+				nfp_repr_inc_rx_stats(netdev, pkt_len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		skb = build_skb(rxbuf-&gt;frag, true_bufsz);</div><div class='hunk'>@@ -1811,7 +1863,13 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)</div><div class='ctx'> 		if (meta_len_xdp)</div><div class='ctx'> 			skb_metadata_set(skb, meta_len_xdp);</div><div class='ctx'> </div><div class='del'>-		napi_gro_receive(&amp;rx_ring-&gt;r_vec-&gt;napi, skb);</div><div class='add'>+		if (likely(!redir_egress)) {</div><div class='add'>+			napi_gro_receive(&amp;rx_ring-&gt;r_vec-&gt;napi, skb);</div><div class='add'>+		} else {</div><div class='add'>+			skb-&gt;dev = netdev;</div><div class='add'>+			__skb_push(skb, ETH_HLEN);</div><div class='add'>+			dev_queue_xmit(skb);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (xdp_prog) {</div><div class='hunk'>@@ -3111,7 +3169,9 @@ static int nfp_net_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> static int</div><div class='ctx'> nfp_net_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)</div><div class='ctx'> {</div><div class='add'>+	const u32 cmd = NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_ADD;</div><div class='ctx'> 	struct nfp_net *nn = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Priority tagged packets with vlan id 0 are processed by the</div><div class='ctx'> 	 * NFP as untagged packets</div><div class='hunk'>@@ -3119,17 +3179,23 @@ nfp_net_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)</div><div class='ctx'> 	if (!vid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	err = nfp_net_mbox_lock(nn, NFP_NET_CFG_VLAN_FILTER_SZ);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	nn_writew(nn, nn-&gt;tlv_caps.mbox_off + NFP_NET_CFG_VLAN_FILTER_VID, vid);</div><div class='ctx'> 	nn_writew(nn, nn-&gt;tlv_caps.mbox_off + NFP_NET_CFG_VLAN_FILTER_PROTO,</div><div class='ctx'> 		  ETH_P_8021Q);</div><div class='ctx'> </div><div class='del'>-	return nfp_net_reconfig_mbox(nn, NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_ADD);</div><div class='add'>+	return nfp_net_mbox_reconfig_and_unlock(nn, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> nfp_net_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)</div><div class='ctx'> {</div><div class='add'>+	const u32 cmd = NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_KILL;</div><div class='ctx'> 	struct nfp_net *nn = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Priority tagged packets with vlan id 0 are processed by the</div><div class='ctx'> 	 * NFP as untagged packets</div><div class='hunk'>@@ -3137,11 +3203,15 @@ nfp_net_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)</div><div class='ctx'> 	if (!vid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	err = nfp_net_mbox_lock(nn, NFP_NET_CFG_VLAN_FILTER_SZ);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	nn_writew(nn, nn-&gt;tlv_caps.mbox_off + NFP_NET_CFG_VLAN_FILTER_VID, vid);</div><div class='ctx'> 	nn_writew(nn, nn-&gt;tlv_caps.mbox_off + NFP_NET_CFG_VLAN_FILTER_PROTO,</div><div class='ctx'> 		  ETH_P_8021Q);</div><div class='ctx'> </div><div class='del'>-	return nfp_net_reconfig_mbox(nn, NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_KILL);</div><div class='add'>+	return nfp_net_mbox_reconfig_and_unlock(nn, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfp_net_stat64(struct net_device *netdev,</div><div class='hunk'>@@ -3324,8 +3394,11 @@ nfp_net_get_phys_port_name(struct net_device *netdev, char *name, size_t len)</div><div class='ctx'> 	struct nfp_net *nn = netdev_priv(netdev);</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='add'>+	/* If port is defined, devlink_port is registered and devlink core</div><div class='add'>+	 * is taking care of name formatting.</div><div class='add'>+	 */</div><div class='ctx'> 	if (nn-&gt;port)</div><div class='del'>-		return nfp_port_get_phys_port_name(netdev, name, len);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (nn-&gt;dp.is_vf || nn-&gt;vnic_no_name)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -3517,6 +3590,7 @@ const struct net_device_ops nfp_net_netdev_ops = {</div><div class='ctx'> 	.ndo_set_vf_mac         = nfp_app_set_vf_mac,</div><div class='ctx'> 	.ndo_set_vf_vlan        = nfp_app_set_vf_vlan,</div><div class='ctx'> 	.ndo_set_vf_spoofchk    = nfp_app_set_vf_spoofchk,</div><div class='add'>+	.ndo_set_vf_trust	= nfp_app_set_vf_trust,</div><div class='ctx'> 	.ndo_get_vf_config	= nfp_app_get_vf_config,</div><div class='ctx'> 	.ndo_set_vf_link_state  = nfp_app_set_vf_link_state,</div><div class='ctx'> 	.ndo_setup_tc		= nfp_port_setup_tc,</div><div class='hunk'>@@ -3530,8 +3604,7 @@ const struct net_device_ops nfp_net_netdev_ops = {</div><div class='ctx'> 	.ndo_udp_tunnel_add	= nfp_net_add_vxlan_port,</div><div class='ctx'> 	.ndo_udp_tunnel_del	= nfp_net_del_vxlan_port,</div><div class='ctx'> 	.ndo_bpf		= nfp_net_xdp,</div><div class='del'>-	.ndo_get_port_parent_id	= nfp_port_get_port_parent_id,</div><div class='del'>-	.ndo_get_devlink	= nfp_devlink_get_devlink,</div><div class='add'>+	.ndo_get_devlink_port	= nfp_devlink_get_devlink_port,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3548,7 +3621,7 @@ void nfp_net_info(struct nfp_net *nn)</div><div class='ctx'> 		nn-&gt;fw_ver.resv, nn-&gt;fw_ver.class,</div><div class='ctx'> 		nn-&gt;fw_ver.major, nn-&gt;fw_ver.minor,</div><div class='ctx'> 		nn-&gt;max_mtu);</div><div class='del'>-	nn_info(nn, "CAP: %#x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",</div><div class='add'>+	nn_info(nn, "CAP: %#x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",</div><div class='ctx'> 		nn-&gt;cap,</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_PROMISC  ? "PROMISC "  : "",</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_L2BC     ? "L2BCFILT " : "",</div><div class='hunk'>@@ -3564,7 +3637,6 @@ void nfp_net_info(struct nfp_net *nn)</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_RSS      ? "RSS1 "     : "",</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_RSS2     ? "RSS2 "     : "",</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_CTAG_FILTER ? "CTAG_FILTER " : "",</div><div class='del'>-		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_L2SWITCH ? "L2SWITCH " : "",</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_MSIXAUTO ? "AUTOMASK " : "",</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_IRQMOD   ? "IRQMOD "   : "",</div><div class='ctx'> 		nn-&gt;cap &amp; NFP_NET_CFG_CTRL_VXLAN    ? "VXLAN "    : "",</div><div class='hunk'>@@ -3632,6 +3704,8 @@ nfp_net_alloc(struct pci_dev *pdev, void __iomem *ctrl_bar, bool needs_netdev,</div><div class='ctx'> 	nn-&gt;dp.txd_cnt = NFP_NET_TX_DESCS_DEFAULT;</div><div class='ctx'> 	nn-&gt;dp.rxd_cnt = NFP_NET_RX_DESCS_DEFAULT;</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;nn-&gt;bar_lock);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;nn-&gt;reconfig_lock);</div><div class='ctx'> 	spin_lock_init(&amp;nn-&gt;link_status_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3659,6 +3733,9 @@ err_free_nn:</div><div class='ctx'> void nfp_net_free(struct nfp_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(timer_pending(&amp;nn-&gt;reconfig_timer) || nn-&gt;reconfig_posted);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;nn-&gt;bar_lock);</div><div class='add'>+</div><div class='ctx'> 	if (nn-&gt;dp.netdev)</div><div class='ctx'> 		free_netdev(nn-&gt;dp.netdev);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3920,9 +3997,6 @@ int nfp_net_init(struct nfp_net *nn)</div><div class='ctx'> 		nn-&gt;dp.ctrl |= NFP_NET_CFG_CTRL_IRQMOD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nn-&gt;dp.netdev)</div><div class='del'>-		nfp_net_netdev_init(nn);</div><div class='del'>-</div><div class='ctx'> 	/* Stash the re-configuration queue away.  First odd queue in TX Bar */</div><div class='ctx'> 	nn-&gt;qcp_cfg = nn-&gt;tx_bar + NFP_QCP_QUEUE_ADDR_SZ;</div><div class='ctx'> </div><div class='hunk'>@@ -3935,6 +4009,9 @@ int nfp_net_init(struct nfp_net *nn)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (nn-&gt;dp.netdev)</div><div class='add'>+		nfp_net_netdev_init(nn);</div><div class='add'>+</div><div class='ctx'> 	nfp_net_vecs_init(nn);</div><div class='ctx'> </div><div class='ctx'> 	if (!nn-&gt;dp.netdev)</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h<br/>index 372adea10e14..25919e338071 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h</a></div><div class='hunk'>@@ -104,8 +104,6 @@</div><div class='ctx'> #define   NFP_NET_CFG_CTRL_RINGPRIO	  (0x1 &lt;&lt; 19) /* Ring priorities */</div><div class='ctx'> #define   NFP_NET_CFG_CTRL_MSIXAUTO	  (0x1 &lt;&lt; 20) /* MSI-X auto-masking */</div><div class='ctx'> #define   NFP_NET_CFG_CTRL_TXRWB	  (0x1 &lt;&lt; 21) /* Write-back of TX ring*/</div><div class='del'>-#define   NFP_NET_CFG_CTRL_L2SWITCH	  (0x1 &lt;&lt; 22) /* L2 Switch */</div><div class='del'>-#define   NFP_NET_CFG_CTRL_L2SWITCH_LOCAL (0x1 &lt;&lt; 23) /* Switch to local */</div><div class='ctx'> #define   NFP_NET_CFG_CTRL_VXLAN	  (0x1 &lt;&lt; 24) /* VXLAN tunnel support */</div><div class='ctx'> #define   NFP_NET_CFG_CTRL_NVGRE	  (0x1 &lt;&lt; 25) /* NVGRE tunnel support */</div><div class='ctx'> #define   NFP_NET_CFG_CTRL_BPF		  (0x1 &lt;&lt; 27) /* BPF offload capable */</div><div class='hunk'>@@ -130,7 +128,6 @@</div><div class='ctx'> #define   NFP_NET_CFG_UPDATE_TXRPRIO	  (0x1 &lt;&lt;  3) /* TX Ring prio change */</div><div class='ctx'> #define   NFP_NET_CFG_UPDATE_RXRPRIO	  (0x1 &lt;&lt;  4) /* RX Ring prio change */</div><div class='ctx'> #define   NFP_NET_CFG_UPDATE_MSIX	  (0x1 &lt;&lt;  5) /* MSI-X change */</div><div class='del'>-#define   NFP_NET_CFG_UPDATE_L2SWITCH	  (0x1 &lt;&lt;  6) /* Switch changes */</div><div class='ctx'> #define   NFP_NET_CFG_UPDATE_RESET	  (0x1 &lt;&lt;  7) /* Update due to FLR */</div><div class='ctx'> #define   NFP_NET_CFG_UPDATE_IRQMOD	  (0x1 &lt;&lt;  8) /* IRQ mod change */</div><div class='ctx'> #define   NFP_NET_CFG_UPDATE_VXLAN	  (0x1 &lt;&lt;  9) /* VXLAN port change */</div><div class='hunk'>@@ -392,7 +389,6 @@</div><div class='ctx'> #define NFP_NET_CFG_MBOX_SIMPLE_CMD	0x0</div><div class='ctx'> #define NFP_NET_CFG_MBOX_SIMPLE_RET	0x4</div><div class='ctx'> #define NFP_NET_CFG_MBOX_SIMPLE_VAL	0x8</div><div class='del'>-#define NFP_NET_CFG_MBOX_SIMPLE_LEN	12</div><div class='ctx'> </div><div class='ctx'> #define NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_ADD 1</div><div class='ctx'> #define NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_KILL 2</div><div class='hunk'>@@ -498,10 +494,4 @@ struct nfp_net_tlv_caps {</div><div class='ctx'> </div><div class='ctx'> int nfp_net_tlv_caps_parse(struct device *dev, u8 __iomem *ctrl_mem,</div><div class='ctx'> 			   struct nfp_net_tlv_caps *caps);</div><div class='del'>-</div><div class='del'>-static inline bool nfp_net_has_mbox(struct nfp_net_tlv_caps *caps)</div><div class='del'>-{</div><div class='del'>-	return caps-&gt;mbox_len &gt;= NFP_NET_CFG_MBOX_SIMPLE_LEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* _NFP_NET_CTRL_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c<br/>index 690b62718dbb..851e31e0ba8e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/sfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "nfpcore/nfp.h"</div><div class='ctx'> #include "nfpcore/nfp_nsp.h"</div><div class='hunk'>@@ -152,6 +153,8 @@ static const struct nfp_et_stat nfp_mac_et_stats[] = {</div><div class='ctx'> #define NN_RVEC_GATHER_STATS	9</div><div class='ctx'> #define NN_RVEC_PER_Q_STATS	3</div><div class='ctx'> </div><div class='add'>+#define SFP_SFF_REV_COMPLIANCE	1</div><div class='add'>+</div><div class='ctx'> static void nfp_net_get_nspinfo(struct nfp_app *app, char *version)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfp_nsp *nsp;</div><div class='hunk'>@@ -1096,6 +1099,130 @@ nfp_app_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,</div><div class='ctx'> 					    buffer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+nfp_port_get_module_info(struct net_device *netdev,</div><div class='add'>+			 struct ethtool_modinfo *modinfo)</div><div class='add'>+{</div><div class='add'>+	struct nfp_eth_table_port *eth_port;</div><div class='add'>+	struct nfp_port *port;</div><div class='add'>+	unsigned int read_len;</div><div class='add'>+	struct nfp_nsp *nsp;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	port = nfp_port_from_netdev(netdev);</div><div class='add'>+	eth_port = nfp_port_get_eth_port(port);</div><div class='add'>+	if (!eth_port)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	nsp = nfp_nsp_open(port-&gt;app-&gt;cpp);</div><div class='add'>+	if (IS_ERR(nsp)) {</div><div class='add'>+		err = PTR_ERR(nsp);</div><div class='add'>+		netdev_err(netdev, "Failed to access the NSP: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nfp_nsp_has_read_module_eeprom(nsp)) {</div><div class='add'>+		netdev_info(netdev, "reading module EEPROM not supported. Please update flash\n");</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto exit_close_nsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (eth_port-&gt;interface) {</div><div class='add'>+	case NFP_INTERFACE_SFP:</div><div class='add'>+	case NFP_INTERFACE_SFP28:</div><div class='add'>+		err = nfp_nsp_read_module_eeprom(nsp, eth_port-&gt;eth_index,</div><div class='add'>+						 SFP_SFF8472_COMPLIANCE, &amp;data,</div><div class='add'>+						 1, &amp;read_len);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto exit_close_nsp;</div><div class='add'>+</div><div class='add'>+		if (!data) {</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'>+		break;</div><div class='add'>+	case NFP_INTERFACE_QSFP:</div><div class='add'>+		err = nfp_nsp_read_module_eeprom(nsp, eth_port-&gt;eth_index,</div><div class='add'>+						 SFP_SFF_REV_COMPLIANCE, &amp;data,</div><div class='add'>+						 1, &amp;read_len);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto exit_close_nsp;</div><div class='add'>+</div><div class='add'>+		if (data &lt; 0x3) {</div><div class='add'>+			modinfo-&gt;type = ETH_MODULE_SFF_8436;</div><div class='add'>+			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8436_LEN;</div><div class='add'>+		} else {</div><div class='add'>+			modinfo-&gt;type = ETH_MODULE_SFF_8636;</div><div class='add'>+			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8636_LEN;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NFP_INTERFACE_QSFP28:</div><div class='add'>+		modinfo-&gt;type = ETH_MODULE_SFF_8636;</div><div class='add'>+		modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8636_LEN;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(netdev, "Unsupported module 0x%x detected\n",</div><div class='add'>+			   eth_port-&gt;interface);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_close_nsp:</div><div class='add'>+	nfp_nsp_close(nsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfp_port_get_module_eeprom(struct net_device *netdev,</div><div class='add'>+			   struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct nfp_eth_table_port *eth_port;</div><div class='add'>+	struct nfp_port *port;</div><div class='add'>+	struct nfp_nsp *nsp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port = nfp_port_from_netdev(netdev);</div><div class='add'>+	eth_port = __nfp_port_get_eth_port(port);</div><div class='add'>+	if (!eth_port)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	nsp = nfp_nsp_open(port-&gt;app-&gt;cpp);</div><div class='add'>+	if (IS_ERR(nsp)) {</div><div class='add'>+		err = PTR_ERR(nsp);</div><div class='add'>+		netdev_err(netdev, "Failed to access the NSP: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nfp_nsp_has_read_module_eeprom(nsp)) {</div><div class='add'>+		netdev_info(netdev, "reading module EEPROM not supported. Please update flash\n");</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto exit_close_nsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nfp_nsp_read_module_eeprom(nsp, eth_port-&gt;eth_index,</div><div class='add'>+					 eeprom-&gt;offset, data, eeprom-&gt;len,</div><div class='add'>+					 &amp;eeprom-&gt;len);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (eeprom-&gt;len) {</div><div class='add'>+			netdev_warn(netdev,</div><div class='add'>+				    "Incomplete read from module EEPROM: %d\n",</div><div class='add'>+				     err);</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "Reading from module EEPROM failed: %d\n",</div><div class='add'>+				   err);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_close_nsp:</div><div class='add'>+	nfp_nsp_close(nsp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int nfp_net_set_coalesce(struct net_device *netdev,</div><div class='ctx'> 				struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='hunk'>@@ -1253,6 +1380,8 @@ static const struct ethtool_ops nfp_net_ethtool_ops = {</div><div class='ctx'> 	.set_dump		= nfp_app_set_dump,</div><div class='ctx'> 	.get_dump_flag		= nfp_app_get_dump_flag,</div><div class='ctx'> 	.get_dump_data		= nfp_app_get_dump_data,</div><div class='add'>+	.get_module_info	= nfp_port_get_module_info,</div><div class='add'>+	.get_module_eeprom	= nfp_port_get_module_eeprom,</div><div class='ctx'> 	.get_coalesce           = nfp_net_get_coalesce,</div><div class='ctx'> 	.set_coalesce           = nfp_net_set_coalesce,</div><div class='ctx'> 	.get_channels		= nfp_net_get_channels,</div><div class='hunk'>@@ -1272,6 +1401,8 @@ const struct ethtool_ops nfp_port_ethtool_ops = {</div><div class='ctx'> 	.set_dump		= nfp_app_set_dump,</div><div class='ctx'> 	.get_dump_flag		= nfp_app_get_dump_flag,</div><div class='ctx'> 	.get_dump_data		= nfp_app_get_dump_data,</div><div class='add'>+	.get_module_info	= nfp_port_get_module_info,</div><div class='add'>+	.get_module_eeprom	= nfp_port_get_module_eeprom,</div><div class='ctx'> 	.get_link_ksettings	= nfp_net_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings	= nfp_net_set_link_ksettings,</div><div class='ctx'> 	.get_fecparam		= nfp_port_get_fecparam,</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c<br/>index 08f5fdbd8e41..986464d4a206 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_main.c</a></div><div class='hunk'>@@ -150,34 +150,39 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id)</div><div class='ctx'> </div><div class='ctx'> 	nn-&gt;id = id;</div><div class='ctx'> </div><div class='add'>+	if (nn-&gt;port) {</div><div class='add'>+		err = nfp_devlink_port_register(pf-&gt;app, nn-&gt;port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = nfp_net_init(nn);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto err_devlink_port_clean;</div><div class='ctx'> </div><div class='ctx'> 	nfp_net_debugfs_vnic_add(nn, pf-&gt;ddir);</div><div class='ctx'> </div><div class='del'>-	if (nn-&gt;port) {</div><div class='del'>-		err = nfp_devlink_port_register(pf-&gt;app, nn-&gt;port);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_dfs_clean;</div><div class='del'>-	}</div><div class='add'>+	if (nn-&gt;port)</div><div class='add'>+		nfp_devlink_port_type_eth_set(nn-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	nfp_net_info(nn);</div><div class='ctx'> </div><div class='ctx'> 	if (nfp_net_is_data_vnic(nn)) {</div><div class='ctx'> 		err = nfp_app_vnic_init(pf-&gt;app, nn);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto err_devlink_port_clean;</div><div class='add'>+			goto err_devlink_port_type_clean;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_devlink_port_clean:</div><div class='add'>+err_devlink_port_type_clean:</div><div class='ctx'> 	if (nn-&gt;port)</div><div class='del'>-		nfp_devlink_port_unregister(nn-&gt;port);</div><div class='del'>-err_dfs_clean:</div><div class='add'>+		nfp_devlink_port_type_clear(nn-&gt;port);</div><div class='ctx'> 	nfp_net_debugfs_dir_clean(&amp;nn-&gt;debugfs_dir);</div><div class='ctx'> 	nfp_net_clean(nn);</div><div class='add'>+err_devlink_port_clean:</div><div class='add'>+	if (nn-&gt;port)</div><div class='add'>+		nfp_devlink_port_unregister(nn-&gt;port);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -221,9 +226,11 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn)</div><div class='ctx'> 	if (nfp_net_is_data_vnic(nn))</div><div class='ctx'> 		nfp_app_vnic_clean(pf-&gt;app, nn);</div><div class='ctx'> 	if (nn-&gt;port)</div><div class='del'>-		nfp_devlink_port_unregister(nn-&gt;port);</div><div class='add'>+		nfp_devlink_port_type_clear(nn-&gt;port);</div><div class='ctx'> 	nfp_net_debugfs_dir_clean(&amp;nn-&gt;debugfs_dir);</div><div class='ctx'> 	nfp_net_clean(nn);</div><div class='add'>+	if (nn-&gt;port)</div><div class='add'>+		nfp_devlink_port_unregister(nn-&gt;port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf)</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c<br/>index d2c803bb4e56..036edcc1fa18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_repr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_repr.c</a></div><div class='hunk'>@@ -195,7 +195,7 @@ static netdev_tx_t nfp_repr_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	ret = dev_queue_xmit(skb);</div><div class='ctx'> 	nfp_repr_inc_tx_stats(netdev, len, ret);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfp_repr_stop(struct net_device *netdev)</div><div class='hunk'>@@ -267,13 +267,13 @@ const struct net_device_ops nfp_repr_netdev_ops = {</div><div class='ctx'> 	.ndo_set_vf_mac		= nfp_app_set_vf_mac,</div><div class='ctx'> 	.ndo_set_vf_vlan	= nfp_app_set_vf_vlan,</div><div class='ctx'> 	.ndo_set_vf_spoofchk	= nfp_app_set_vf_spoofchk,</div><div class='add'>+	.ndo_set_vf_trust	= nfp_app_set_vf_trust,</div><div class='ctx'> 	.ndo_get_vf_config	= nfp_app_get_vf_config,</div><div class='ctx'> 	.ndo_set_vf_link_state	= nfp_app_set_vf_link_state,</div><div class='ctx'> 	.ndo_fix_features	= nfp_repr_fix_features,</div><div class='ctx'> 	.ndo_set_features	= nfp_port_set_features,</div><div class='ctx'> 	.ndo_set_mac_address    = eth_mac_addr,</div><div class='del'>-	.ndo_get_port_parent_id	= nfp_port_get_port_parent_id,</div><div class='del'>-	.ndo_get_devlink	= nfp_devlink_get_devlink,</div><div class='add'>+	.ndo_get_devlink_port	= nfp_devlink_get_devlink_port,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -383,7 +383,7 @@ int nfp_repr_init(struct nfp_app *app, struct net_device *netdev,</div><div class='ctx'> 	netdev-&gt;features &amp;= ~(NETIF_F_TSO | NETIF_F_TSO6);</div><div class='ctx'> 	netdev-&gt;gso_max_segs = NFP_NET_LSO_MAX_SEGS;</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='add'>+	netdev-&gt;priv_flags |= IFF_NO_QUEUE | IFF_DISABLE_NETPOLL;</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> </div><div class='ctx'> 	if (nfp_app_has_tc(app)) {</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c b/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c<br/>index b6ec46ed0540..3fdaaf8ed2ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='del'>-/* Copyright (C) 2017 Netronome Systems, Inc. */</div><div class='add'>+/* Copyright (C) 2017-2019 Netronome Systems, Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -146,6 +146,30 @@ int nfp_app_set_vf_spoofchk(struct net_device *netdev, int vf, bool enable)</div><div class='ctx'> 				    "spoofchk");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int nfp_app_set_vf_trust(struct net_device *netdev, int vf, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct nfp_app *app = nfp_app_from_netdev(netdev);</div><div class='add'>+	unsigned int vf_offset;</div><div class='add'>+	u8 vf_ctrl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = nfp_net_sriov_check(app, vf, NFP_NET_VF_CFG_MB_CAP_TRUST,</div><div class='add'>+				  "trust");</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Write trust control bit to VF entry in VF config symbol */</div><div class='add'>+	vf_offset = NFP_NET_VF_CFG_MB_SZ + vf * NFP_NET_VF_CFG_SZ +</div><div class='add'>+		NFP_NET_VF_CFG_CTRL;</div><div class='add'>+	vf_ctrl = readb(app-&gt;pf-&gt;vfcfg_tbl2 + vf_offset);</div><div class='add'>+	vf_ctrl &amp;= ~NFP_NET_VF_CFG_CTRL_TRUST;</div><div class='add'>+	vf_ctrl |= FIELD_PREP(NFP_NET_VF_CFG_CTRL_TRUST, enable);</div><div class='add'>+	writeb(vf_ctrl, app-&gt;pf-&gt;vfcfg_tbl2 + vf_offset);</div><div class='add'>+</div><div class='add'>+	return nfp_net_sriov_update(app, vf, NFP_NET_VF_CFG_MB_UPD_TRUST,</div><div class='add'>+				    "trust");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int nfp_app_set_vf_link_state(struct net_device *netdev, int vf,</div><div class='ctx'> 			      int link_state)</div><div class='ctx'> {</div><div class='hunk'>@@ -213,6 +237,7 @@ int nfp_app_get_vf_config(struct net_device *netdev, int vf,</div><div class='ctx'> 	ivi-&gt;qos = FIELD_GET(NFP_NET_VF_CFG_VLAN_QOS, vlan_tci);</div><div class='ctx'> </div><div class='ctx'> 	ivi-&gt;spoofchk = FIELD_GET(NFP_NET_VF_CFG_CTRL_SPOOF, flags);</div><div class='add'>+	ivi-&gt;trusted = FIELD_GET(NFP_NET_VF_CFG_CTRL_TRUST, flags);</div><div class='ctx'> 	ivi-&gt;linkstate = FIELD_GET(NFP_NET_VF_CFG_CTRL_LINK_STATE, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h b/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h<br/>index c9f09c5bb5ee..a3db0cbf6425 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='del'>-/* Copyright (C) 2017 Netronome Systems, Inc. */</div><div class='add'>+/* Copyright (C) 2017-2019 Netronome Systems, Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef _NFP_NET_SRIOV_H_</div><div class='ctx'> #define _NFP_NET_SRIOV_H_</div><div class='hunk'>@@ -19,12 +19,14 @@</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_CAP_VLAN			  (0x1 &lt;&lt; 1)</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_CAP_SPOOF			  (0x1 &lt;&lt; 2)</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_CAP_LINK_STATE		  (0x1 &lt;&lt; 3)</div><div class='add'>+#define   NFP_NET_VF_CFG_MB_CAP_TRUST			  (0x1 &lt;&lt; 4)</div><div class='ctx'> #define NFP_NET_VF_CFG_MB_RET				0x2</div><div class='ctx'> #define NFP_NET_VF_CFG_MB_UPD				0x4</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_UPD_MAC			  (0x1 &lt;&lt; 0)</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_UPD_VLAN			  (0x1 &lt;&lt; 1)</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_UPD_SPOOF			  (0x1 &lt;&lt; 2)</div><div class='ctx'> #define   NFP_NET_VF_CFG_MB_UPD_LINK_STATE		  (0x1 &lt;&lt; 3)</div><div class='add'>+#define   NFP_NET_VF_CFG_MB_UPD_TRUST			  (0x1 &lt;&lt; 4)</div><div class='ctx'> #define NFP_NET_VF_CFG_MB_VF_NUM			0x7</div><div class='ctx'> </div><div class='ctx'> /* VF config entry</div><div class='hunk'>@@ -35,6 +37,7 @@</div><div class='ctx'> #define   NFP_NET_VF_CFG_MAC_HI				  0x0</div><div class='ctx'> #define   NFP_NET_VF_CFG_MAC_LO				  0x6</div><div class='ctx'> #define NFP_NET_VF_CFG_CTRL				0x4</div><div class='add'>+#define   NFP_NET_VF_CFG_CTRL_TRUST			  0x8</div><div class='ctx'> #define   NFP_NET_VF_CFG_CTRL_SPOOF			  0x4</div><div class='ctx'> #define   NFP_NET_VF_CFG_CTRL_LINK_STATE		  0x3</div><div class='ctx'> #define     NFP_NET_VF_CFG_LS_MODE_AUTO			    0</div><div class='hunk'>@@ -48,6 +51,7 @@ int nfp_app_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);</div><div class='ctx'> int nfp_app_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,</div><div class='ctx'> 			__be16 vlan_proto);</div><div class='ctx'> int nfp_app_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);</div><div class='add'>+int nfp_app_set_vf_trust(struct net_device *netdev, int vf, bool setting);</div><div class='ctx'> int nfp_app_set_vf_link_state(struct net_device *netdev, int vf,</div><div class='ctx'> 			      int link_state);</div><div class='ctx'> int nfp_app_get_vf_config(struct net_device *netdev, int vf,</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c<br/>index 1145849ca7ba..e4977cdf7678 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c</a></div><div class='hunk'>@@ -282,8 +282,14 @@ err_free_vf:</div><div class='ctx'> </div><div class='ctx'> static void nfp_netvf_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct nfp_net_vf *vf = pci_get_drvdata(pdev);</div><div class='del'>-	struct nfp_net *nn = vf-&gt;nn;</div><div class='add'>+	struct nfp_net_vf *vf;</div><div class='add'>+	struct nfp_net *nn;</div><div class='add'>+</div><div class='add'>+	vf = pci_get_drvdata(pdev);</div><div class='add'>+	if (!vf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nn = vf-&gt;nn;</div><div class='ctx'> </div><div class='ctx'> 	/* Note, the order is slightly different from above as we need</div><div class='ctx'> 	 * to keep the nn pointer around till we have freed everything.</div><div class='hunk'>@@ -317,4 +323,5 @@ struct pci_driver nfp_netvf_pci_driver = {</div><div class='ctx'> 	.id_table    = nfp_netvf_pci_device_ids,</div><div class='ctx'> 	.probe       = nfp_netvf_pci_probe,</div><div class='ctx'> 	.remove      = nfp_netvf_pci_remove,</div><div class='add'>+	.shutdown    = nfp_netvf_pci_remove,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c<br/>index 93c5bfc0510b..fcd16877e6e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_port.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_port.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_port.c</a></div><div class='hunk'>@@ -30,22 +30,6 @@ struct nfp_port *nfp_port_from_netdev(struct net_device *netdev)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfp_port_get_port_parent_id(struct net_device *netdev,</div><div class='del'>-				struct netdev_phys_item_id *ppid)</div><div class='del'>-{</div><div class='del'>-	struct nfp_port *port;</div><div class='del'>-	const u8 *serial;</div><div class='del'>-</div><div class='del'>-	port = nfp_port_from_netdev(netdev);</div><div class='del'>-	if (!port)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	ppid-&gt;id_len = nfp_cpp_serial(port-&gt;app-&gt;cpp, &amp;serial);</div><div class='del'>-	memcpy(&amp;ppid-&gt;id, serial, ppid-&gt;id_len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int nfp_port_setup_tc(struct net_device *netdev, enum tc_setup_type type,</div><div class='ctx'> 		      void *type_data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h<br/>index 90ae053f5c07..d7fd203bb180 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_port.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfp_port.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfp_port.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfp_port.h</a></div><div class='hunk'>@@ -131,6 +131,8 @@ int nfp_net_refresh_port_table_sync(struct nfp_pf *pf);</div><div class='ctx'> </div><div class='ctx'> int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port);</div><div class='ctx'> void nfp_devlink_port_unregister(struct nfp_port *port);</div><div class='add'>+void nfp_devlink_port_type_eth_set(struct nfp_port *port);</div><div class='add'>+void nfp_devlink_port_type_clear(struct nfp_port *port);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Mac stats (0x0000 - 0x0200)</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c<br/>index 3a4e224a64b7..42cf4fd875ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c</a></div><div class='hunk'>@@ -79,6 +79,8 @@</div><div class='ctx'> #define NFP_VERSIONS_NCSI_OFF	22</div><div class='ctx'> #define NFP_VERSIONS_CFGR_OFF	26</div><div class='ctx'> </div><div class='add'>+#define NSP_SFF_EEPROM_BLOCK_LEN	8</div><div class='add'>+</div><div class='ctx'> enum nfp_nsp_cmd {</div><div class='ctx'> 	SPCODE_NOOP		= 0, /* No operation */</div><div class='ctx'> 	SPCODE_SOFT_RESET	= 1, /* Soft reset the NFP */</div><div class='hunk'>@@ -95,6 +97,7 @@ enum nfp_nsp_cmd {</div><div class='ctx'> 	SPCODE_FW_STORED	= 16, /* If no FW loaded, load flash app FW */</div><div class='ctx'> 	SPCODE_HWINFO_LOOKUP	= 17, /* Lookup HWinfo with overwrites etc. */</div><div class='ctx'> 	SPCODE_VERSIONS		= 21, /* Report FW versions */</div><div class='add'>+	SPCODE_READ_SFF_EEPROM	= 22, /* Read module EEPROM */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfp_nsp_dma_buf {</div><div class='hunk'>@@ -965,3 +968,62 @@ const char *nfp_nsp_versions_get(enum nfp_nsp_versions id, bool flash,</div><div class='ctx'> </div><div class='ctx'> 	return (const char *)&amp;buf[buf_off];</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__nfp_nsp_module_eeprom(struct nfp_nsp *state, void *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct nfp_nsp_command_buf_arg module_eeprom = {</div><div class='add'>+		{</div><div class='add'>+			.code		= SPCODE_READ_SFF_EEPROM,</div><div class='add'>+			.option		= size,</div><div class='add'>+		},</div><div class='add'>+		.in_buf		= buf,</div><div class='add'>+		.in_size	= size,</div><div class='add'>+		.out_buf	= buf,</div><div class='add'>+		.out_size	= size,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return nfp_nsp_command_buf(state, &amp;module_eeprom);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfp_nsp_read_module_eeprom(struct nfp_nsp *state, int eth_index,</div><div class='add'>+			       unsigned int offset, void *data,</div><div class='add'>+			       unsigned int len, unsigned int *read_len)</div><div class='add'>+{</div><div class='add'>+	struct eeprom_buf {</div><div class='add'>+		u8 metalen;</div><div class='add'>+		__le16 length;</div><div class='add'>+		__le16 offset;</div><div class='add'>+		__le16 readlen;</div><div class='add'>+		u8 eth_index;</div><div class='add'>+		u8 data[0];</div><div class='add'>+	} __packed *buf;</div><div class='add'>+	int bufsz, ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct eeprom_buf, data) % 8);</div><div class='add'>+</div><div class='add'>+	/* Buffer must be large enough and rounded to the next block size. */</div><div class='add'>+	bufsz = struct_size(buf, data, round_up(len, NSP_SFF_EEPROM_BLOCK_LEN));</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf-&gt;metalen =</div><div class='add'>+		offsetof(struct eeprom_buf, data) / NSP_SFF_EEPROM_BLOCK_LEN;</div><div class='add'>+	buf-&gt;length = cpu_to_le16(len);</div><div class='add'>+	buf-&gt;offset = cpu_to_le16(offset);</div><div class='add'>+	buf-&gt;eth_index = eth_index;</div><div class='add'>+</div><div class='add'>+	ret = __nfp_nsp_module_eeprom(state, buf, bufsz);</div><div class='add'>+</div><div class='add'>+	*read_len = min_t(unsigned int, len, le16_to_cpu(buf-&gt;readlen));</div><div class='add'>+	if (*read_len)</div><div class='add'>+		memcpy(data, buf-&gt;data, *read_len);</div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; *read_len &lt; len)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h<br/>index bd9c358c646f..22ee6985ee1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h</a></div><div class='hunk'>@@ -22,6 +22,9 @@ int nfp_nsp_write_flash(struct nfp_nsp *state, const struct firmware *fw);</div><div class='ctx'> int nfp_nsp_mac_reinit(struct nfp_nsp *state);</div><div class='ctx'> int nfp_nsp_load_stored_fw(struct nfp_nsp *state);</div><div class='ctx'> int nfp_nsp_hwinfo_lookup(struct nfp_nsp *state, void *buf, unsigned int size);</div><div class='add'>+int nfp_nsp_read_module_eeprom(struct nfp_nsp *state, int eth_index,</div><div class='add'>+			       unsigned int offset, void *data,</div><div class='add'>+			       unsigned int len, unsigned int *read_len);</div><div class='ctx'> </div><div class='ctx'> static inline bool nfp_nsp_has_mac_reinit(struct nfp_nsp *state)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,6 +46,11 @@ static inline bool nfp_nsp_has_versions(struct nfp_nsp *state)</div><div class='ctx'> 	return nfp_nsp_get_abi_ver_minor(state) &gt; 27;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool nfp_nsp_has_read_module_eeprom(struct nfp_nsp *state)</div><div class='add'>+{</div><div class='add'>+	return nfp_nsp_get_abi_ver_minor(state) &gt; 28;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum nfp_eth_interface {</div><div class='ctx'> 	NFP_INTERFACE_NONE	= 0,</div><div class='ctx'> 	NFP_INTERFACE_SFP	= 1,</div><div class='head'>diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c<br/>index 89d17399fb5a..da138edddd32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/nxp/lpc_eth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/nxp/lpc_eth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/nxp/lpc_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/nxp/lpc_eth.c</a></div><div class='hunk'>@@ -1368,7 +1368,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='ctx'> 		const char *macaddr = of_get_mac_address(np);</div><div class='del'>-		if (macaddr)</div><div class='add'>+		if (!IS_ERR(macaddr))</div><div class='ctx'> 			memcpy(ndev-&gt;dev_addr, macaddr, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='head'>diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c<br/>index a5bf46310f60..5ffaee9f53b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/pasemi/pasemi_mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/pasemi/pasemi_mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/pasemi/pasemi_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/pasemi/pasemi_mac.c</a></div><div class='hunk'>@@ -1355,7 +1355,7 @@ static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,</div><div class='ctx'> 	const int nh_off = skb_network_offset(skb);</div><div class='ctx'> 	const int nh_len = skb_network_header_len(skb);</div><div class='ctx'> 	const int nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	int cs_size, i, fill, hdr, cpyhdr, evt;</div><div class='add'>+	int cs_size, i, fill, hdr, evt;</div><div class='ctx'> 	dma_addr_t csdma;</div><div class='ctx'> </div><div class='ctx'> 	fund = XCT_FUN_ST | XCT_FUN_RR_8BRES |</div><div class='hunk'>@@ -1396,7 +1396,6 @@ static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,</div><div class='ctx'> 		fill++;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the result into the TCP packet */</div><div class='del'>-	cpyhdr = fill;</div><div class='ctx'> 	CS_DESC(csring, fill++) = XCT_FUN_O | XCT_FUN_FUN(csring-&gt;fun) |</div><div class='ctx'> 				  XCT_FUN_LLEN(2) | XCT_FUN_SE;</div><div class='ctx'> 	CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(cs_dest) | XCT_PTR_T;</div><div class='hunk'>@@ -1839,7 +1838,7 @@ static void __exit pasemi_mac_cleanup_module(void)</div><div class='ctx'> 	pci_unregister_driver(&amp;pasemi_mac_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int pasemi_mac_init_module(void)</div><div class='add'>+static int pasemi_mac_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h<br/>index 43a57ec296fd..c5e96ce20f59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed.h</a></div><div class='hunk'>@@ -431,12 +431,16 @@ struct qed_qm_info {</div><div class='ctx'> 	u8 num_pf_rls;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define QED_OVERFLOW_BIT	1</div><div class='add'>+</div><div class='ctx'> struct qed_db_recovery_info {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='ctx'> 	/* Lock to protect the doorbell recovery mechanism list */</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	bool dorq_attn;</div><div class='ctx'> 	u32 db_recovery_counter;</div><div class='add'>+	unsigned long overflow;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct storm_stats {</div><div class='hunk'>@@ -492,6 +496,9 @@ enum qed_mf_mode_bit {</div><div class='ctx'> </div><div class='ctx'> 	/* Allow DSCP to TC mapping */</div><div class='ctx'> 	QED_MF_DSCP_TO_TC_MAP,</div><div class='add'>+</div><div class='add'>+	/* Do not insert a vlan tag with id 0 */</div><div class='add'>+	QED_MF_DONT_ADD_VLAN0_TAG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum qed_ufp_mode {</div><div class='hunk'>@@ -920,8 +927,7 @@ u16 qed_get_cm_pq_idx_llt_mtc(struct qed_hwfn *p_hwfn, u8 tc);</div><div class='ctx'> </div><div class='ctx'> /* doorbell recovery mechanism */</div><div class='ctx'> void qed_db_recovery_dp(struct qed_hwfn *p_hwfn);</div><div class='del'>-void qed_db_recovery_execute(struct qed_hwfn *p_hwfn,</div><div class='del'>-			     enum qed_db_rec_exec db_exec);</div><div class='add'>+void qed_db_recovery_execute(struct qed_hwfn *p_hwfn);</div><div class='ctx'> bool qed_edpm_enabled(struct qed_hwfn *p_hwfn);</div><div class='ctx'> </div><div class='ctx'> /* Other Linux specific common definitions */</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c<br/>index 69966dfc6e3d..5c6a276f69ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_dcbx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_dcbx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_dcbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_dcbx.c</a></div><div class='hunk'>@@ -204,9 +204,7 @@ qed_dcbx_set_params(struct qed_dcbx_results *p_data,</div><div class='ctx'> 	else</div><div class='ctx'> 		p_data-&gt;arr[type].update = DONT_UPDATE_DCB_DSCP;</div><div class='ctx'> </div><div class='del'>-	/* Do not add vlan tag 0 when DCB is enabled and port in UFP/OV mode */</div><div class='del'>-	if ((test_bit(QED_MF_8021Q_TAGGING, &amp;p_hwfn-&gt;cdev-&gt;mf_bits) ||</div><div class='del'>-	     test_bit(QED_MF_8021AD_TAGGING, &amp;p_hwfn-&gt;cdev-&gt;mf_bits)))</div><div class='add'>+	if (test_bit(QED_MF_DONT_ADD_VLAN0_TAG, &amp;p_hwfn-&gt;cdev-&gt;mf_bits))</div><div class='ctx'> 		p_data-&gt;arr[type].dont_add_vlan0 = true;</div><div class='ctx'> </div><div class='ctx'> 	/* QM reconf data */</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c<br/>index 9df8c4b3b54e..fccdb06fc5c5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_dev.c</a></div><div class='hunk'>@@ -102,11 +102,15 @@ static void qed_db_recovery_dp_entry(struct qed_hwfn *p_hwfn,</div><div class='ctx'> </div><div class='ctx'> /* Doorbell address sanity (address within doorbell bar range) */</div><div class='ctx'> static bool qed_db_rec_sanity(struct qed_dev *cdev,</div><div class='del'>-			      void __iomem *db_addr, void *db_data)</div><div class='add'>+			      void __iomem *db_addr,</div><div class='add'>+			      enum qed_db_rec_width db_width,</div><div class='add'>+			      void *db_data)</div><div class='ctx'> {</div><div class='add'>+	u32 width = (db_width == DB_REC_WIDTH_32B) ? 32 : 64;</div><div class='add'>+</div><div class='ctx'> 	/* Make sure doorbell address is within the doorbell bar */</div><div class='ctx'> 	if (db_addr &lt; cdev-&gt;doorbells ||</div><div class='del'>-	    (u8 __iomem *)db_addr &gt;</div><div class='add'>+	    (u8 __iomem *)db_addr + width &gt;</div><div class='ctx'> 	    (u8 __iomem *)cdev-&gt;doorbells + cdev-&gt;db_size) {</div><div class='ctx'> 		WARN(true,</div><div class='ctx'> 		     "Illegal doorbell address: %p. Legal range for doorbell addresses is [%p..%p]\n",</div><div class='hunk'>@@ -159,7 +163,7 @@ int qed_db_recovery_add(struct qed_dev *cdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Sanitize doorbell address */</div><div class='del'>-	if (!qed_db_rec_sanity(cdev, db_addr, db_data))</div><div class='add'>+	if (!qed_db_rec_sanity(cdev, db_addr, db_width, db_data))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Obtain hwfn from doorbell address */</div><div class='hunk'>@@ -205,10 +209,6 @@ int qed_db_recovery_del(struct qed_dev *cdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Sanitize doorbell address */</div><div class='del'>-	if (!qed_db_rec_sanity(cdev, db_addr, db_data))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/* Obtain hwfn from doorbell address */</div><div class='ctx'> 	p_hwfn = qed_db_rec_find_hwfn(cdev, db_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -300,31 +300,24 @@ void qed_db_recovery_dp(struct qed_hwfn *p_hwfn)</div><div class='ctx'> </div><div class='ctx'> /* Ring the doorbell of a single doorbell recovery entry */</div><div class='ctx'> static void qed_db_recovery_ring(struct qed_hwfn *p_hwfn,</div><div class='del'>-				 struct qed_db_recovery_entry *db_entry,</div><div class='del'>-				 enum qed_db_rec_exec db_exec)</div><div class='del'>-{</div><div class='del'>-	if (db_exec != DB_REC_ONCE) {</div><div class='del'>-		/* Print according to width */</div><div class='del'>-		if (db_entry-&gt;db_width == DB_REC_WIDTH_32B) {</div><div class='del'>-			DP_VERBOSE(p_hwfn, QED_MSG_SPQ,</div><div class='del'>-				   "%s doorbell address %p data %x\n",</div><div class='del'>-				   db_exec == DB_REC_DRY_RUN ?</div><div class='del'>-				   "would have rung" : "ringing",</div><div class='del'>-				   db_entry-&gt;db_addr,</div><div class='del'>-				   *(u32 *)db_entry-&gt;db_data);</div><div class='del'>-		} else {</div><div class='del'>-			DP_VERBOSE(p_hwfn, QED_MSG_SPQ,</div><div class='del'>-				   "%s doorbell address %p data %llx\n",</div><div class='del'>-				   db_exec == DB_REC_DRY_RUN ?</div><div class='del'>-				   "would have rung" : "ringing",</div><div class='del'>-				   db_entry-&gt;db_addr,</div><div class='del'>-				   *(u64 *)(db_entry-&gt;db_data));</div><div class='del'>-		}</div><div class='add'>+				 struct qed_db_recovery_entry *db_entry)</div><div class='add'>+{</div><div class='add'>+	/* Print according to width */</div><div class='add'>+	if (db_entry-&gt;db_width == DB_REC_WIDTH_32B) {</div><div class='add'>+		DP_VERBOSE(p_hwfn, QED_MSG_SPQ,</div><div class='add'>+			   "ringing doorbell address %p data %x\n",</div><div class='add'>+			   db_entry-&gt;db_addr,</div><div class='add'>+			   *(u32 *)db_entry-&gt;db_data);</div><div class='add'>+	} else {</div><div class='add'>+		DP_VERBOSE(p_hwfn, QED_MSG_SPQ,</div><div class='add'>+			   "ringing doorbell address %p data %llx\n",</div><div class='add'>+			   db_entry-&gt;db_addr,</div><div class='add'>+			   *(u64 *)(db_entry-&gt;db_data));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity */</div><div class='ctx'> 	if (!qed_db_rec_sanity(p_hwfn-&gt;cdev, db_entry-&gt;db_addr,</div><div class='del'>-			       db_entry-&gt;db_data))</div><div class='add'>+			       db_entry-&gt;db_width, db_entry-&gt;db_data))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Flush the write combined buffer. Since there are multiple doorbelling</div><div class='hunk'>@@ -334,14 +327,12 @@ static void qed_db_recovery_ring(struct qed_hwfn *p_hwfn,</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='ctx'> 	/* Ring the doorbell */</div><div class='del'>-	if (db_exec == DB_REC_REAL_DEAL || db_exec == DB_REC_ONCE) {</div><div class='del'>-		if (db_entry-&gt;db_width == DB_REC_WIDTH_32B)</div><div class='del'>-			DIRECT_REG_WR(db_entry-&gt;db_addr,</div><div class='del'>-				      *(u32 *)(db_entry-&gt;db_data));</div><div class='del'>-		else</div><div class='del'>-			DIRECT_REG_WR64(db_entry-&gt;db_addr,</div><div class='del'>-					*(u64 *)(db_entry-&gt;db_data));</div><div class='del'>-	}</div><div class='add'>+	if (db_entry-&gt;db_width == DB_REC_WIDTH_32B)</div><div class='add'>+		DIRECT_REG_WR(db_entry-&gt;db_addr,</div><div class='add'>+			      *(u32 *)(db_entry-&gt;db_data));</div><div class='add'>+	else</div><div class='add'>+		DIRECT_REG_WR64(db_entry-&gt;db_addr,</div><div class='add'>+				*(u64 *)(db_entry-&gt;db_data));</div><div class='ctx'> </div><div class='ctx'> 	/* Flush the write combined buffer. Next doorbell may come from a</div><div class='ctx'> 	 * different entity to the same address...</div><div class='hunk'>@@ -350,29 +341,21 @@ static void qed_db_recovery_ring(struct qed_hwfn *p_hwfn,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Traverse the doorbell recovery entry list and ring all the doorbells */</div><div class='del'>-void qed_db_recovery_execute(struct qed_hwfn *p_hwfn,</div><div class='del'>-			     enum qed_db_rec_exec db_exec)</div><div class='add'>+void qed_db_recovery_execute(struct qed_hwfn *p_hwfn)</div><div class='ctx'> {</div><div class='ctx'> 	struct qed_db_recovery_entry *db_entry = NULL;</div><div class='ctx'> </div><div class='del'>-	if (db_exec != DB_REC_ONCE) {</div><div class='del'>-		DP_NOTICE(p_hwfn,</div><div class='del'>-			  "Executing doorbell recovery. Counter was %d\n",</div><div class='del'>-			  p_hwfn-&gt;db_recovery_info.db_recovery_counter);</div><div class='add'>+	DP_NOTICE(p_hwfn, "Executing doorbell recovery. Counter was %d\n",</div><div class='add'>+		  p_hwfn-&gt;db_recovery_info.db_recovery_counter);</div><div class='ctx'> </div><div class='del'>-		/* Track amount of times recovery was executed */</div><div class='del'>-		p_hwfn-&gt;db_recovery_info.db_recovery_counter++;</div><div class='del'>-	}</div><div class='add'>+	/* Track amount of times recovery was executed */</div><div class='add'>+	p_hwfn-&gt;db_recovery_info.db_recovery_counter++;</div><div class='ctx'> </div><div class='ctx'> 	/* Protect the list */</div><div class='ctx'> 	spin_lock_bh(&amp;p_hwfn-&gt;db_recovery_info.lock);</div><div class='ctx'> 	list_for_each_entry(db_entry,</div><div class='del'>-			    &amp;p_hwfn-&gt;db_recovery_info.list, list_entry) {</div><div class='del'>-		qed_db_recovery_ring(p_hwfn, db_entry, db_exec);</div><div class='del'>-		if (db_exec == DB_REC_ONCE)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+			    &amp;p_hwfn-&gt;db_recovery_info.list, list_entry)</div><div class='add'>+		qed_db_recovery_ring(p_hwfn, db_entry);</div><div class='ctx'> 	spin_unlock_bh(&amp;p_hwfn-&gt;db_recovery_info.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3157,12 +3140,14 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)</div><div class='ctx'> 			cdev-&gt;mf_bits = BIT(QED_MF_OVLAN_CLSS) |</div><div class='ctx'> 					BIT(QED_MF_LLH_PROTO_CLSS) |</div><div class='ctx'> 					BIT(QED_MF_UFP_SPECIFIC) |</div><div class='del'>-					BIT(QED_MF_8021Q_TAGGING);</div><div class='add'>+					BIT(QED_MF_8021Q_TAGGING) |</div><div class='add'>+					BIT(QED_MF_DONT_ADD_VLAN0_TAG);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NVM_CFG1_GLOB_MF_MODE_BD:</div><div class='ctx'> 			cdev-&gt;mf_bits = BIT(QED_MF_OVLAN_CLSS) |</div><div class='ctx'> 					BIT(QED_MF_LLH_PROTO_CLSS) |</div><div class='del'>-					BIT(QED_MF_8021AD_TAGGING);</div><div class='add'>+					BIT(QED_MF_8021AD_TAGGING) |</div><div class='add'>+					BIT(QED_MF_DONT_ADD_VLAN0_TAG);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NVM_CFG1_GLOB_MF_MODE_NPAR1_0:</div><div class='ctx'> 			cdev-&gt;mf_bits = BIT(QED_MF_LLH_MAC_CLSS) |</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c<br/>index e23980e301b6..fdfedbc8e431 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_int.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_int.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_int.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_int.c</a></div><div class='hunk'>@@ -378,6 +378,9 @@ static int qed_db_rec_flush_queue(struct qed_hwfn *p_hwfn,</div><div class='ctx'> 	u32 count = QED_DB_REC_COUNT;</div><div class='ctx'> 	u32 usage = 1;</div><div class='ctx'> </div><div class='add'>+	/* Flush any pending (e)dpms as they may never arrive */</div><div class='add'>+	qed_wr(p_hwfn, p_ptt, DORQ_REG_DPM_FORCE_ABORT, 0x1);</div><div class='add'>+</div><div class='ctx'> 	/* wait for usage to zero or count to run out. This is necessary since</div><div class='ctx'> 	 * EDPM doorbell transactions can take multiple 64b cycles, and as such</div><div class='ctx'> 	 * can "split" over the pci. Possibly, the doorbell drop can happen with</div><div class='hunk'>@@ -406,51 +409,74 @@ static int qed_db_rec_flush_queue(struct qed_hwfn *p_hwfn,</div><div class='ctx'> </div><div class='ctx'> int qed_db_rec_handler(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)</div><div class='ctx'> {</div><div class='del'>-	u32 overflow;</div><div class='add'>+	u32 attn_ovfl, cur_ovfl;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	overflow = qed_rd(p_hwfn, p_ptt, DORQ_REG_PF_OVFL_STICKY);</div><div class='del'>-	DP_NOTICE(p_hwfn, "PF Overflow sticky 0x%x\n", overflow);</div><div class='del'>-	if (!overflow) {</div><div class='del'>-		qed_db_recovery_execute(p_hwfn, DB_REC_ONCE);</div><div class='add'>+	attn_ovfl = test_and_clear_bit(QED_OVERFLOW_BIT,</div><div class='add'>+				       &amp;p_hwfn-&gt;db_recovery_info.overflow);</div><div class='add'>+	cur_ovfl = qed_rd(p_hwfn, p_ptt, DORQ_REG_PF_OVFL_STICKY);</div><div class='add'>+	if (!cur_ovfl &amp;&amp; !attn_ovfl)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (qed_edpm_enabled(p_hwfn)) {</div><div class='add'>+	DP_NOTICE(p_hwfn, "PF Overflow sticky: attn %u current %u\n",</div><div class='add'>+		  attn_ovfl, cur_ovfl);</div><div class='add'>+</div><div class='add'>+	if (cur_ovfl &amp;&amp; !p_hwfn-&gt;db_bar_no_edpm) {</div><div class='ctx'> 		rc = qed_db_rec_flush_queue(p_hwfn, p_ptt);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Flush any pending (e)dpm as they may never arrive */</div><div class='del'>-	qed_wr(p_hwfn, p_ptt, DORQ_REG_DPM_FORCE_ABORT, 0x1);</div><div class='del'>-</div><div class='ctx'> 	/* Release overflow sticky indication (stop silently dropping everything) */</div><div class='ctx'> 	qed_wr(p_hwfn, p_ptt, DORQ_REG_PF_OVFL_STICKY, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Repeat all last doorbells (doorbell drop recovery) */</div><div class='del'>-	qed_db_recovery_execute(p_hwfn, DB_REC_REAL_DEAL);</div><div class='add'>+	qed_db_recovery_execute(p_hwfn);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qed_dorq_attn_cb(struct qed_hwfn *p_hwfn)</div><div class='add'>+static void qed_dorq_attn_overflow(struct qed_hwfn *p_hwfn)</div><div class='ctx'> {</div><div class='del'>-	u32 int_sts, first_drop_reason, details, address, all_drops_reason;</div><div class='ctx'> 	struct qed_ptt *p_ptt = p_hwfn-&gt;p_dpc_ptt;</div><div class='add'>+	u32 overflow;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	int_sts = qed_rd(p_hwfn, p_ptt, DORQ_REG_INT_STS);</div><div class='del'>-	DP_NOTICE(p_hwfn-&gt;cdev, "DORQ attention. int_sts was %x\n", int_sts);</div><div class='add'>+	overflow = qed_rd(p_hwfn, p_ptt, DORQ_REG_PF_OVFL_STICKY);</div><div class='add'>+	if (!overflow)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Run PF doorbell recovery in next periodic handler */</div><div class='add'>+	set_bit(QED_OVERFLOW_BIT, &amp;p_hwfn-&gt;db_recovery_info.overflow);</div><div class='add'>+</div><div class='add'>+	if (!p_hwfn-&gt;db_bar_no_edpm) {</div><div class='add'>+		rc = qed_db_rec_flush_queue(p_hwfn, p_ptt);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qed_wr(p_hwfn, p_ptt, DORQ_REG_PF_OVFL_STICKY, 0x0);</div><div class='add'>+out:</div><div class='add'>+	/* Schedule the handler even if overflow was not detected */</div><div class='add'>+	qed_periodic_db_rec_start(p_hwfn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qed_dorq_attn_int_sts(struct qed_hwfn *p_hwfn)</div><div class='add'>+{</div><div class='add'>+	u32 int_sts, first_drop_reason, details, address, all_drops_reason;</div><div class='add'>+	struct qed_ptt *p_ptt = p_hwfn-&gt;p_dpc_ptt;</div><div class='ctx'> </div><div class='ctx'> 	/* int_sts may be zero since all PFs were interrupted for doorbell</div><div class='ctx'> 	 * overflow but another one already handled it. Can abort here. If</div><div class='ctx'> 	 * This PF also requires overflow recovery we will be interrupted again.</div><div class='ctx'> 	 * The masked almost full indication may also be set. Ignoring.</div><div class='ctx'> 	 */</div><div class='add'>+	int_sts = qed_rd(p_hwfn, p_ptt, DORQ_REG_INT_STS);</div><div class='ctx'> 	if (!(int_sts &amp; ~DORQ_REG_INT_STS_DORQ_FIFO_AFULL))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	DP_NOTICE(p_hwfn-&gt;cdev, "DORQ attention. int_sts was %x\n", int_sts);</div><div class='add'>+</div><div class='ctx'> 	/* check if db_drop or overflow happened */</div><div class='ctx'> 	if (int_sts &amp; (DORQ_REG_INT_STS_DB_DROP |</div><div class='ctx'> 		       DORQ_REG_INT_STS_DORQ_FIFO_OVFL_ERR)) {</div><div class='hunk'>@@ -477,11 +503,6 @@ static int qed_dorq_attn_cb(struct qed_hwfn *p_hwfn)</div><div class='ctx'> 			  GET_FIELD(details, QED_DORQ_ATTENTION_SIZE) * 4,</div><div class='ctx'> 			  first_drop_reason, all_drops_reason);</div><div class='ctx'> </div><div class='del'>-		rc = qed_db_rec_handler(p_hwfn, p_ptt);</div><div class='del'>-		qed_periodic_db_rec_start(p_hwfn);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-</div><div class='ctx'> 		/* Clear the doorbell drop details and prepare for next drop */</div><div class='ctx'> 		qed_wr(p_hwfn, p_ptt, DORQ_REG_DB_DROP_DETAILS_REL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -507,6 +528,25 @@ static int qed_dorq_attn_cb(struct qed_hwfn *p_hwfn)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qed_dorq_attn_cb(struct qed_hwfn *p_hwfn)</div><div class='add'>+{</div><div class='add'>+	p_hwfn-&gt;db_recovery_info.dorq_attn = true;</div><div class='add'>+	qed_dorq_attn_overflow(p_hwfn);</div><div class='add'>+</div><div class='add'>+	return qed_dorq_attn_int_sts(p_hwfn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qed_dorq_attn_handler(struct qed_hwfn *p_hwfn)</div><div class='add'>+{</div><div class='add'>+	if (p_hwfn-&gt;db_recovery_info.dorq_attn)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Call DORQ callback if the attention was missed */</div><div class='add'>+	qed_dorq_attn_cb(p_hwfn);</div><div class='add'>+out:</div><div class='add'>+	p_hwfn-&gt;db_recovery_info.dorq_attn = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Instead of major changes to the data-structure, we have a some 'special'</div><div class='ctx'>  * identifiers for sources that changed meaning between adapters.</div><div class='ctx'>  */</div><div class='hunk'>@@ -774,18 +814,12 @@ static inline u16 qed_attn_update_idx(struct qed_hwfn *p_hwfn,</div><div class='ctx'> {</div><div class='ctx'> 	u16 rc = 0, index;</div><div class='ctx'> </div><div class='del'>-	/* Make certain HW write took affect */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	index = le16_to_cpu(p_sb_desc-&gt;sb_attn-&gt;sb_index);</div><div class='ctx'> 	if (p_sb_desc-&gt;index != index) {</div><div class='ctx'> 		p_sb_desc-&gt;index	= index;</div><div class='ctx'> 		rc		      = QED_SB_ATT_IDX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Make certain we got a consistent view with HW */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1080,6 +1114,9 @@ static int qed_int_deassertion(struct qed_hwfn  *p_hwfn,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Handle missed DORQ attention */</div><div class='add'>+	qed_dorq_attn_handler(p_hwfn);</div><div class='add'>+</div><div class='ctx'> 	/* Clear IGU indication for the deasserted bits */</div><div class='ctx'> 	DIRECT_REG_WR((u8 __iomem *)p_hwfn-&gt;regview +</div><div class='ctx'> 				    GTT_BAR0_MAP_REG_IGU_CMD +</div><div class='hunk'>@@ -1170,7 +1207,6 @@ static void qed_sb_ack_attn(struct qed_hwfn *p_hwfn,</div><div class='ctx'> 	/* Both segments (interrupts &amp; acks) are written to same place address;</div><div class='ctx'> 	 * Need to guarantee all commands will be received (in-order) by HW.</div><div class='ctx'> 	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	barrier();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1805,9 +1841,6 @@ static void qed_int_igu_enable_attn(struct qed_hwfn *p_hwfn,</div><div class='ctx'> 	qed_wr(p_hwfn, p_ptt, IGU_REG_TRAILING_EDGE_LATCH, 0xfff);</div><div class='ctx'> 	qed_wr(p_hwfn, p_ptt, IGU_REG_ATTENTION_ENABLE, 0xfff);</div><div class='ctx'> </div><div class='del'>-	/* Flush the writes to IGU */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	/* Unmask AEU signals toward IGU */</div><div class='ctx'> 	qed_wr(p_hwfn, p_ptt, MISC_REG_AEU_MASK_ATTN_IGU, 0xff);</div><div class='ctx'> }</div><div class='hunk'>@@ -1871,9 +1904,6 @@ static void qed_int_igu_cleanup_sb(struct qed_hwfn *p_hwfn,</div><div class='ctx'> </div><div class='ctx'> 	qed_wr(p_hwfn, p_ptt, IGU_REG_COMMAND_REG_CTRL, cmd_ctrl);</div><div class='ctx'> </div><div class='del'>-	/* Flush the write to IGU */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	/* calculate where to read the status bit from */</div><div class='ctx'> 	sb_bit = 1 &lt;&lt; (igu_sb_id % 32);</div><div class='ctx'> 	sb_bit_addr = igu_sb_id / 32 * sizeof(u32);</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.h b/drivers/net/ethernet/qlogic/qed/qed_int.h<br/>index 1f356ed4f761..d473b522afc5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_int.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_int.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_int.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_int.h</a></div><div class='hunk'>@@ -192,8 +192,8 @@ void qed_int_disable_post_isr_release(struct qed_dev *cdev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * @brief - Doorbell Recovery handler.</div><div class='del'>- *          Run DB_REAL_DEAL doorbell recovery in case of PF overflow</div><div class='del'>- *          (and flush DORQ if needed), otherwise run DB_REC_ONCE.</div><div class='add'>+ *          Run doorbell recovery in case of PF overflow (and flush DORQ if</div><div class='add'>+ *          needed).</div><div class='ctx'>  *</div><div class='ctx'>  * @param p_hwfn</div><div class='ctx'>  * @param p_ptt</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c<br/>index f164d4acebcb..6de23b56b294 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_main.c</a></div><div class='hunk'>@@ -970,7 +970,7 @@ static void qed_update_pf_params(struct qed_dev *cdev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define QED_PERIODIC_DB_REC_COUNT		100</div><div class='add'>+#define QED_PERIODIC_DB_REC_COUNT		10</div><div class='ctx'> #define QED_PERIODIC_DB_REC_INTERVAL_MS		100</div><div class='ctx'> #define QED_PERIODIC_DB_REC_INTERVAL \</div><div class='ctx'> 	msecs_to_jiffies(QED_PERIODIC_DB_REC_INTERVAL_MS)</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c<br/>index 79b311b86f66..f5f3c03b9dd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_spq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_spq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_spq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_spq.c</a></div><div class='hunk'>@@ -341,9 +341,6 @@ void qed_eq_prod_update(struct qed_hwfn *p_hwfn, u16 prod)</div><div class='ctx'> 		   USTORM_EQE_CONS_OFFSET(p_hwfn-&gt;rel_pf_id);</div><div class='ctx'> </div><div class='ctx'> 	REG_WR16(p_hwfn, addr, prod);</div><div class='del'>-</div><div class='del'>-	/* keep prod updates ordered */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qed_eq_completion(struct qed_hwfn *p_hwfn, void *cookie)</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c<br/>index 9faaa6df78ed..2f318aaf2b05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_sriov.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qed/qed_sriov.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qed/qed_sriov.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qed/qed_sriov.c</a></div><div class='hunk'>@@ -1591,7 +1591,7 @@ static void qed_iov_vf_mbx_acquire(struct qed_hwfn *p_hwfn,</div><div class='ctx'> 			p_vfdev-&gt;eth_fp_hsi_minor = ETH_HSI_VER_NO_PKT_LEN_TUNN;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			DP_INFO(p_hwfn,</div><div class='del'>-				"VF[%d] needs fastpath HSI %02x.%02x, which is incompatible with loaded FW's faspath HSI %02x.%02x\n",</div><div class='add'>+				"VF[%d] needs fastpath HSI %02x.%02x, which is incompatible with loaded FW's fastpath HSI %02x.%02x\n",</div><div class='ctx'> 				vf-&gt;abs_vf_id,</div><div class='ctx'> 				req-&gt;vfdev_info.eth_fp_hsi_major,</div><div class='ctx'> 				req-&gt;vfdev_info.eth_fp_hsi_minor,</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qede/qede.h b/drivers/net/ethernet/qlogic/qede/qede.h<br/>index 63a78162cfaf..92fe226980fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qede/qede.h</a></div><div class='hunk'>@@ -498,8 +498,7 @@ struct qede_reload_args {</div><div class='ctx'> /* Datapath functions definition */</div><div class='ctx'> netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev);</div><div class='ctx'> u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		      struct net_device *sb_dev,</div><div class='del'>-		      select_queue_fallback_t fallback);</div><div class='add'>+		      struct net_device *sb_dev);</div><div class='ctx'> netdev_features_t qede_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='head'>diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c<br/>index b4c8949933f1..8911a97ab0ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qede/qede_ethtool.c</a></div><div class='hunk'>@@ -652,9 +652,9 @@ static void qede_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> {</div><div class='ctx'> 	char mfw[ETHTOOL_FWVERS_LEN], storm[ETHTOOL_FWVERS_LEN];</div><div class='ctx'> 	struct qede_dev *edev = netdev_priv(ndev);</div><div class='add'>+	char mbi[ETHTOOL_FWVERS_LEN];</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(info-&gt;driver, "qede", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	snprintf(storm, ETHTOOL_FWVERS_LEN, "%d.%d.%d.%d",</div><div class='ctx'> 		 edev-&gt;dev_info.common.fw_major,</div><div class='hunk'>@@ -668,13 +668,27 @@ static void qede_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 		 (edev-&gt;dev_info.common.mfw_rev &gt;&gt; 8) &amp; 0xFF,</div><div class='ctx'> 		 edev-&gt;dev_info.common.mfw_rev &amp; 0xFF);</div><div class='ctx'> </div><div class='del'>-	if ((strlen(storm) + strlen(mfw) + strlen("mfw storm  ")) &lt;</div><div class='del'>-	    sizeof(info-&gt;fw_version)) {</div><div class='add'>+	if ((strlen(storm) + strlen(DRV_MODULE_VERSION) + strlen("[storm]  ")) &lt;</div><div class='add'>+	    sizeof(info-&gt;version))</div><div class='add'>+		snprintf(info-&gt;version, sizeof(info-&gt;version),</div><div class='add'>+			 "%s [storm %s]", DRV_MODULE_VERSION, storm);</div><div class='add'>+	else</div><div class='add'>+		snprintf(info-&gt;version, sizeof(info-&gt;version),</div><div class='add'>+			 "%s %s", DRV_MODULE_VERSION, storm);</div><div class='add'>+</div><div class='add'>+	if (edev-&gt;dev_info.common.mbi_version) {</div><div class='add'>+		snprintf(mbi, ETHTOOL_FWVERS_LEN, "%d.%d.%d",</div><div class='add'>+			 (edev-&gt;dev_info.common.mbi_version &amp;</div><div class='add'>+			  QED_MBI_VERSION_2_MASK) &gt;&gt; QED_MBI_VERSION_2_OFFSET,</div><div class='add'>+			 (edev-&gt;dev_info.common.mbi_version &amp;</div><div class='add'>+			  QED_MBI_VERSION_1_MASK) &gt;&gt; QED_MBI_VERSION_1_OFFSET,</div><div class='add'>+			 (edev-&gt;dev_info.common.mbi_version &amp;</div><div class='add'>+			  QED_MBI_VERSION_0_MASK) &gt;&gt; QED_MBI_VERSION_0_OFFSET);</div><div class='ctx'> 		snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='del'>-			 "mfw %s storm %s", mfw, storm);</div><div class='add'>+			 "mbi %s [mfw %s]", mbi, mfw);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='del'>-			 "%s %s", mfw, storm);</div><div class='add'>+			 "mfw %s", mfw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(info-&gt;bus_info, pci_name(edev-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='hunk'>@@ -1526,14 +1540,6 @@ static int qede_selftest_transmit_traffic(struct qede_dev *edev,</div><div class='ctx'> 	barrier();</div><div class='ctx'> 	writel(txq-&gt;tx_db.raw, txq-&gt;doorbell_addr);</div><div class='ctx'> </div><div class='del'>-	/* mmiowb is needed to synchronize doorbell writes from more than one</div><div class='del'>-	 * processor. It guarantees that the write arrives to the device before</div><div class='del'>-	 * the queue lock is released and another start_xmit is called (possibly</div><div class='del'>-	 * on another CPU). Without this barrier, the next doorbell can bypass</div><div class='del'>-	 * this doorbell. This is applicable to IA64/Altix systems.</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; QEDE_SELFTEST_POLL_COUNT; i++) {</div><div class='ctx'> 		if (qede_txq_has_work(txq))</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c<br/>index 31b046e24565..0ae28f0d2523 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede_fp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede_fp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede_fp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qede/qede_fp.c</a></div><div class='hunk'>@@ -580,14 +580,6 @@ void qede_update_rx_prod(struct qede_dev *edev, struct qede_rx_queue *rxq)</div><div class='ctx'> </div><div class='ctx'> 	internal_ram_wr(rxq-&gt;hw_rxq_prod_addr, sizeof(rx_prods),</div><div class='ctx'> 			(u32 *)&amp;rx_prods);</div><div class='del'>-</div><div class='del'>-	/* mmiowb is needed to synchronize doorbell writes from more than one</div><div class='del'>-	 * processor. It guarantees that the write arrives to the device before</div><div class='del'>-	 * the napi lock is released and another qede_poll is called (possibly</div><div class='del'>-	 * on another CPU). Without this barrier, the next doorbell can bypass</div><div class='del'>-	 * this doorbell. This is applicable to IA64/Altix systems.</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qede_get_rxhash(struct sk_buff *skb, u8 bitfields, __le32 rss_hash)</div><div class='hunk'>@@ -1665,12 +1657,12 @@ netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	txq-&gt;tx_db.data.bd_prod =</div><div class='ctx'> 		cpu_to_le16(qed_chain_get_prod_idx(&amp;txq-&gt;tx_pbl));</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;xmit_more || netif_xmit_stopped(netdev_txq))</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(netdev_txq))</div><div class='ctx'> 		qede_update_tx_producer(txq);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(qed_chain_get_elem_left(&amp;txq-&gt;tx_pbl)</div><div class='ctx'> 		      &lt; (MAX_SKB_FRAGS + 1))) {</div><div class='del'>-		if (skb-&gt;xmit_more)</div><div class='add'>+		if (netdev_xmit_more())</div><div class='ctx'> 			qede_update_tx_producer(txq);</div><div class='ctx'> </div><div class='ctx'> 		netif_tx_stop_queue(netdev_txq);</div><div class='hunk'>@@ -1696,8 +1688,7 @@ netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		      struct net_device *sb_dev,</div><div class='del'>-		      select_queue_fallback_t fallback)</div><div class='add'>+		      struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qede_dev *edev = netdev_priv(dev);</div><div class='ctx'> 	int total_txq;</div><div class='hunk'>@@ -1705,7 +1696,7 @@ u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	total_txq = QEDE_TSS_COUNT(edev) * edev-&gt;dev_info.num_tc;</div><div class='ctx'> </div><div class='ctx'> 	return QEDE_TSS_COUNT(edev) ?</div><div class='del'>-		fallback(dev, skb, NULL) % total_txq :  0;</div><div class='add'>+		netdev_pick_tx(dev, skb, NULL) % total_txq :  0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 8B udp header + 8B base tunnel header + 32B option length */</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qede/qede_ptp.c b/drivers/net/ethernet/qlogic/qede/qede_ptp.c<br/>index 5f3f42a25361..bddb2b5982dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede_ptp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qede/qede_ptp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qede/qede_ptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qede/qede_ptp.c</a></div><div class='hunk'>@@ -490,18 +490,17 @@ int qede_ptp_enable(struct qede_dev *edev, bool init_tc)</div><div class='ctx'> </div><div class='ctx'> 	ptp-&gt;clock = ptp_clock_register(&amp;ptp-&gt;clock_info, &amp;edev-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (IS_ERR(ptp-&gt;clock)) {</div><div class='del'>-		rc = -EINVAL;</div><div class='ctx'> 		DP_ERR(edev, "PTP clock registration failed\n");</div><div class='add'>+		qede_ptp_disable(edev);</div><div class='add'>+		rc = -EINVAL;</div><div class='ctx'> 		goto err2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err2:</div><div class='del'>-	qede_ptp_disable(edev);</div><div class='del'>-	ptp-&gt;clock = NULL;</div><div class='ctx'> err1:</div><div class='ctx'> 	kfree(ptp);</div><div class='add'>+err2:</div><div class='ctx'> 	edev-&gt;ptp = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c<br/>index b61b88cbc0c7..457444894d80 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qla3xxx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qla3xxx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qla3xxx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qla3xxx.c</a></div><div class='hunk'>@@ -1858,7 +1858,6 @@ static void ql_update_small_bufq_prod_index(struct ql3_adapter *qdev)</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		writel_relaxed(qdev-&gt;small_buf_q_producer_index,</div><div class='ctx'> 			       &amp;port_regs-&gt;CommonRegs.rxSmallQProducerIndex);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h<br/>index 0c443ea98479..374a4d4371f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.h</a></div><div class='hunk'>@@ -497,7 +497,7 @@ struct qlcnic_hardware_context {</div><div class='ctx'> 	u16 board_type;</div><div class='ctx'> 	u16 supported_type;</div><div class='ctx'> </div><div class='del'>-	u16 link_speed;</div><div class='add'>+	u32 link_speed;</div><div class='ctx'> 	u16 link_duplex;</div><div class='ctx'> 	u16 link_autoneg;</div><div class='ctx'> 	u16 module_type;</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c<br/>index 3b0adda7cc9c..a4cd6f2cfb86 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a></div><div class='hunk'>@@ -1048,6 +1048,8 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; QLCNIC_NUM_ILB_PKT; i++) {</div><div class='ctx'> 		skb = netdev_alloc_skb(adapter-&gt;netdev, QLCNIC_ILB_PKT_SIZE);</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='ctx'> 		qlcnic_create_loopback_buff(skb-&gt;data, adapter-&gt;mac_addr);</div><div class='ctx'> 		skb_put(skb, QLCNIC_ILB_PKT_SIZE);</div><div class='ctx'> 		adapter-&gt;ahw-&gt;diag_cnt = 0;</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h<br/>index 3e71b65a9546..ad7c5eb8a3b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlge/qlge.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qlge/qlge.h</a></div><div class='hunk'>@@ -2181,7 +2181,6 @@ static inline void ql_write32(const struct ql_adapter *qdev, int reg, u32 val)</div><div class='ctx'> static inline void ql_write_db_reg(u32 val, void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	writel(val, addr);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c<br/>index 07e1c623048e..6cae33072496 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a></div><div class='hunk'>@@ -2695,7 +2695,6 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='ctx'> 	ql_write_db_reg_relaxed(tx_ring-&gt;prod_idx, tx_ring-&gt;prod_idx_db_reg);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	netif_printk(qdev, tx_queued, KERN_DEBUG, qdev-&gt;ndev,</div><div class='ctx'> 		     "tx queued, slot %d, len %d\n",</div><div class='ctx'> 		     tx_ring-&gt;prod_idx, skb-&gt;len);</div><div class='head'>diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c<br/>index 97f92953bdb9..b28360bc2255 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qualcomm/qca_spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qualcomm/qca_spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qualcomm/qca_spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qualcomm/qca_spi.c</a></div><div class='hunk'>@@ -966,7 +966,7 @@ qca_spi_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(spi-&gt;dev.of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		ether_addr_copy(qca-&gt;net_dev-&gt;dev_addr, mac);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(qca-&gt;net_dev-&gt;dev_addr)) {</div><div class='head'>diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c<br/>index db6068cd7a1f..590616846cd1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qualcomm/qca_uart.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/qualcomm/qca_uart.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/qualcomm/qca_uart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/qualcomm/qca_uart.c</a></div><div class='hunk'>@@ -351,7 +351,7 @@ static int qca_uart_probe(struct serdev_device *serdev)</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(serdev-&gt;dev.of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		ether_addr_copy(qca-&gt;net_dev-&gt;dev_addr, mac);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(qca-&gt;net_dev-&gt;dev_addr)) {</div><div class='head'>diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c<br/>index 04aa592f35c3..ad335bca3273 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/rdc/r6040.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/rdc/r6040.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/rdc/r6040.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/rdc/r6040.c</a></div><div class='hunk'>@@ -840,7 +840,7 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger the MAC to check the TX descriptor */</div><div class='del'>-	if (!skb-&gt;xmit_more || netif_queue_stopped(dev))</div><div class='add'>+	if (!netdev_xmit_more() || netif_queue_stopped(dev))</div><div class='ctx'> 		iowrite16(TM2TX, ioaddr + MTPR);</div><div class='ctx'> 	lp-&gt;tx_insert_ptr = descptr-&gt;vndescp;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c<br/>index cfb67b746595..58e0ca9093d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/realtek/atp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/realtek/atp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/realtek/atp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/realtek/atp.c</a></div><div class='hunk'>@@ -482,7 +482,7 @@ static void hardware_init(struct net_device *dev)</div><div class='ctx'> 	write_reg_high(ioaddr, IMR, ISRh_RxErr);</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;tx_unit_busy = 0;</div><div class='del'>-    lp-&gt;pac_cnt_in_tx_buf = 0;</div><div class='add'>+	lp-&gt;pac_cnt_in_tx_buf = 0;</div><div class='ctx'> 	lp-&gt;saved_tx_size = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c<br/>index c29dde064078..549be1c76a89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/realtek/r8169.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/realtek/r8169.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/realtek/r8169.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/realtek/r8169.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='add'>+#include &lt;linux/pci-aspm.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -490,10 +491,6 @@ enum rtl_register_content {</div><div class='ctx'> 	PCIDAC		= (1 &lt;&lt; 4),</div><div class='ctx'> 	PCIMulRW	= (1 &lt;&lt; 3),</div><div class='ctx'> #define INTT_MASK	GENMASK(1, 0)</div><div class='del'>-	INTT_0		= 0x0000,	// 8168</div><div class='del'>-	INTT_1		= 0x0001,	// 8168</div><div class='del'>-	INTT_2		= 0x0002,	// 8168</div><div class='del'>-	INTT_3		= 0x0003,	// 8168</div><div class='ctx'> </div><div class='ctx'> 	/* rtl8169_PHYstatus */</div><div class='ctx'> 	TBI_Enable	= 0x80,</div><div class='hunk'>@@ -678,6 +675,7 @@ struct rtl8169_private {</div><div class='ctx'> 		struct work_struct work;</div><div class='ctx'> 	} wk;</div><div class='ctx'> </div><div class='add'>+	unsigned irq_enabled:1;</div><div class='ctx'> 	unsigned supports_gmii:1;</div><div class='ctx'> 	dma_addr_t counters_phys_addr;</div><div class='ctx'> 	struct rtl8169_counters *counters;</div><div class='hunk'>@@ -701,6 +699,8 @@ struct rtl8169_private {</div><div class='ctx'> 	u32 ocp_base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+typedef void (*rtl_generic_fct)(struct rtl8169_private *tp);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Realtek and the Linux r8169 crew &lt;netdev@vger.kernel.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver");</div><div class='ctx'> module_param_named(debug, debug.msg_enable, int, 0);</div><div class='hunk'>@@ -775,9 +775,9 @@ static bool rtl_loop_wait(struct rtl8169_private *tp, const struct rtl_cond *c,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		delay(d);</div><div class='ctx'> 		if (c-&gt;check(tp) == high)</div><div class='ctx'> 			return true;</div><div class='add'>+		delay(d);</div><div class='ctx'> 	}</div><div class='ctx'> 	netif_err(tp, drv, tp-&gt;dev, "%s == %d (loop: %d, delay: %d).\n",</div><div class='ctx'> 		  c-&gt;msg, !high, n, d);</div><div class='hunk'>@@ -1065,8 +1065,8 @@ DECLARE_RTL_COND(rtl_eriar_cond)</div><div class='ctx'> 	return RTL_R32(tp, ERIAR) &amp; ERIAR_FLAG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,</div><div class='del'>-			  u32 val, int type)</div><div class='add'>+static void _rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,</div><div class='add'>+			   u32 val, int type)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON((addr &amp; 3) || (mask == 0));</div><div class='ctx'> 	RTL_W32(tp, ERIDR, val);</div><div class='hunk'>@@ -1075,7 +1075,13 @@ static void rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,</div><div class='ctx'> 	rtl_udelay_loop_wait_low(tp, &amp;rtl_eriar_cond, 100, 100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 rtl_eri_read(struct rtl8169_private *tp, int addr, int type)</div><div class='add'>+static void rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,</div><div class='add'>+			  u32 val)</div><div class='add'>+{</div><div class='add'>+	_rtl_eri_write(tp, addr, mask, val, ERIAR_EXGMAC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 _rtl_eri_read(struct rtl8169_private *tp, int addr, int type)</div><div class='ctx'> {</div><div class='ctx'> 	RTL_W32(tp, ERIAR, ERIAR_READ_CMD | type | ERIAR_MASK_1111 | addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1083,13 +1089,30 @@ static u32 rtl_eri_read(struct rtl8169_private *tp, int addr, int type)</div><div class='ctx'> 		RTL_R32(tp, ERIDR) : ~0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 rtl_eri_read(struct rtl8169_private *tp, int addr)</div><div class='add'>+{</div><div class='add'>+	return _rtl_eri_read(tp, addr, ERIAR_EXGMAC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl_w0w1_eri(struct rtl8169_private *tp, int addr, u32 mask, u32 p,</div><div class='del'>-			 u32 m, int type)</div><div class='add'>+			 u32 m)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	val = rtl_eri_read(tp, addr, type);</div><div class='del'>-	rtl_eri_write(tp, addr, mask, (val &amp; ~m) | p, type);</div><div class='add'>+	val = rtl_eri_read(tp, addr);</div><div class='add'>+	rtl_eri_write(tp, addr, mask, (val &amp; ~m) | p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_eri_set_bits(struct rtl8169_private *tp, int addr, u32 mask,</div><div class='add'>+			     u32 p)</div><div class='add'>+{</div><div class='add'>+	rtl_w0w1_eri(tp, addr, mask, p, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_eri_clear_bits(struct rtl8169_private *tp, int addr, u32 mask,</div><div class='add'>+			       u32 m)</div><div class='add'>+{</div><div class='add'>+	rtl_w0w1_eri(tp, addr, mask, 0, m);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 r8168dp_ocp_read(struct rtl8169_private *tp, u8 mask, u16 reg)</div><div class='hunk'>@@ -1101,7 +1124,7 @@ static u32 r8168dp_ocp_read(struct rtl8169_private *tp, u8 mask, u16 reg)</div><div class='ctx'> </div><div class='ctx'> static u32 r8168ep_ocp_read(struct rtl8169_private *tp, u8 mask, u16 reg)</div><div class='ctx'> {</div><div class='del'>-	return rtl_eri_read(tp, reg, ERIAR_OOB);</div><div class='add'>+	return _rtl_eri_read(tp, reg, ERIAR_OOB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void r8168dp_ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg,</div><div class='hunk'>@@ -1115,13 +1138,13 @@ static void r8168dp_ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg,</div><div class='ctx'> static void r8168ep_ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg,</div><div class='ctx'> 			      u32 data)</div><div class='ctx'> {</div><div class='del'>-	rtl_eri_write(tp, reg, ((u32)mask &amp; 0x0f) &lt;&lt; ERIAR_MASK_SHIFT,</div><div class='del'>-		      data, ERIAR_OOB);</div><div class='add'>+	_rtl_eri_write(tp, reg, ((u32)mask &amp; 0x0f) &lt;&lt; ERIAR_MASK_SHIFT,</div><div class='add'>+		       data, ERIAR_OOB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void r8168dp_oob_notify(struct rtl8169_private *tp, u8 cmd)</div><div class='ctx'> {</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_0001, cmd, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0xe8, ERIAR_MASK_0001, cmd);</div><div class='ctx'> </div><div class='ctx'> 	r8168dp_ocp_write(tp, 0x1, 0x30, 0x00000001);</div><div class='ctx'> }</div><div class='hunk'>@@ -1257,19 +1280,10 @@ static bool r8168_check_dash(struct rtl8169_private *tp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct exgmac_reg {</div><div class='del'>-	u16 addr;</div><div class='del'>-	u16 mask;</div><div class='del'>-	u32 val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void rtl_write_exgmac_batch(struct rtl8169_private *tp,</div><div class='del'>-				   const struct exgmac_reg *r, int len)</div><div class='add'>+static void rtl_reset_packet_filter(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='del'>-	while (len-- &gt; 0) {</div><div class='del'>-		rtl_eri_write(tp, r-&gt;addr, r-&gt;mask, r-&gt;val, ERIAR_EXGMAC);</div><div class='del'>-		r++;</div><div class='del'>-	}</div><div class='add'>+	rtl_eri_clear_bits(tp, 0xdc, ERIAR_MASK_0001, BIT(0));</div><div class='add'>+	rtl_eri_set_bits(tp, 0xdc, ERIAR_MASK_0001, BIT(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DECLARE_RTL_COND(rtl_efusear_cond)</div><div class='hunk'>@@ -1293,6 +1307,7 @@ static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)</div><div class='ctx'> static void rtl_irq_disable(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='ctx'> 	RTL_W16(tp, IntrMask, 0);</div><div class='add'>+	tp-&gt;irq_enabled = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define RTL_EVENT_NAPI_RX	(RxOK | RxErr)</div><div class='hunk'>@@ -1301,6 +1316,7 @@ static void rtl_irq_disable(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> static void rtl_irq_enable(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='add'>+	tp-&gt;irq_enabled = 1;</div><div class='ctx'> 	RTL_W16(tp, IntrMask, tp-&gt;irq_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1323,48 +1339,31 @@ static void rtl_link_chg_patch(struct rtl8169_private *tp)</div><div class='ctx'> 	if (tp-&gt;mac_version == RTL_GIGA_MAC_VER_34 ||</div><div class='ctx'> 	    tp-&gt;mac_version == RTL_GIGA_MAC_VER_38) {</div><div class='ctx'> 		if (phydev-&gt;speed == SPEED_1000) {</div><div class='del'>-			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x00000011,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='del'>-			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x00000011);</div><div class='add'>+			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005);</div><div class='ctx'> 		} else if (phydev-&gt;speed == SPEED_100) {</div><div class='del'>-			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='del'>-			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f);</div><div class='add'>+			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005);</div><div class='ctx'> 		} else {</div><div class='del'>-			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='del'>-			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x0000003f,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f);</div><div class='add'>+			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x0000003f);</div><div class='ctx'> 		}</div><div class='del'>-		/* Reset packet filter */</div><div class='del'>-		rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01,</div><div class='del'>-			     ERIAR_EXGMAC);</div><div class='del'>-		rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00,</div><div class='del'>-			     ERIAR_EXGMAC);</div><div class='add'>+		rtl_reset_packet_filter(tp);</div><div class='ctx'> 	} else if (tp-&gt;mac_version == RTL_GIGA_MAC_VER_35 ||</div><div class='ctx'> 		   tp-&gt;mac_version == RTL_GIGA_MAC_VER_36) {</div><div class='ctx'> 		if (phydev-&gt;speed == SPEED_1000) {</div><div class='del'>-			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x00000011,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='del'>-			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x00000011);</div><div class='add'>+			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005);</div><div class='ctx'> 		} else {</div><div class='del'>-			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='del'>-			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x0000003f,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f);</div><div class='add'>+			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x0000003f);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (tp-&gt;mac_version == RTL_GIGA_MAC_VER_37) {</div><div class='ctx'> 		if (phydev-&gt;speed == SPEED_10) {</div><div class='del'>-			rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x4d02,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='del'>-			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_0011, 0x0060,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x4d02);</div><div class='add'>+			rtl_eri_write(tp, 0x1dc, ERIAR_MASK_0011, 0x0060a);</div><div class='ctx'> 		} else {</div><div class='del'>-			rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000,</div><div class='del'>-				      ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1405,19 +1404,11 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:</div><div class='ctx'> 		tmp = ARRAY_SIZE(cfg) - 1;</div><div class='ctx'> 		if (wolopts &amp; WAKE_MAGIC)</div><div class='del'>-			rtl_w0w1_eri(tp,</div><div class='del'>-				     0x0dc,</div><div class='del'>-				     ERIAR_MASK_0100,</div><div class='del'>-				     MagicPacket_v2,</div><div class='del'>-				     0x0000,</div><div class='del'>-				     ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_set_bits(tp, 0x0dc, ERIAR_MASK_0100,</div><div class='add'>+					 MagicPacket_v2);</div><div class='ctx'> 		else</div><div class='del'>-			rtl_w0w1_eri(tp,</div><div class='del'>-				     0x0dc,</div><div class='del'>-				     ERIAR_MASK_0100,</div><div class='del'>-				     0x0000,</div><div class='del'>-				     MagicPacket_v2,</div><div class='del'>-				     ERIAR_EXGMAC);</div><div class='add'>+			rtl_eri_clear_bits(tp, 0x0dc, ERIAR_MASK_0100,</div><div class='add'>+					   MagicPacket_v2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		tmp = ARRAY_SIZE(cfg);</div><div class='hunk'>@@ -2289,8 +2280,8 @@ struct phy_reg {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rtl_writephy_batch(struct rtl8169_private *tp,</div><div class='del'>-			       const struct phy_reg *regs, int len)</div><div class='add'>+static void __rtl_writephy_batch(struct rtl8169_private *tp,</div><div class='add'>+				 const struct phy_reg *regs, int len)</div><div class='ctx'> {</div><div class='ctx'> 	while (len-- &gt; 0) {</div><div class='ctx'> 		rtl_writephy(tp, regs-&gt;reg, regs-&gt;val);</div><div class='hunk'>@@ -2298,6 +2289,8 @@ static void rtl_writephy_batch(struct rtl8169_private *tp,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define rtl_writephy_batch(tp, a) __rtl_writephy_batch(tp, a, ARRAY_SIZE(a))</div><div class='add'>+</div><div class='ctx'> #define PHY_READ		0x00000000</div><div class='ctx'> #define PHY_DATA_OR		0x10000000</div><div class='ctx'> #define PHY_DATA_AND		0x20000000</div><div class='hunk'>@@ -2560,7 +2553,11 @@ static void rtl_apply_firmware_cond(struct rtl8169_private *tp, u8 reg, u16 val)</div><div class='ctx'> </div><div class='ctx'> static void rtl8168_config_eee_mac(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='del'>-	rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_1111, 0x0003, 0x0000, ERIAR_EXGMAC);</div><div class='add'>+	/* Adjust EEE LED frequency */</div><div class='add'>+	if (tp-&gt;mac_version != RTL_GIGA_MAC_VER_38)</div><div class='add'>+		RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) &amp; ~0x07);</div><div class='add'>+</div><div class='add'>+	rtl_eri_set_bits(tp, 0x1b0, ERIAR_MASK_1111, 0x0003);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168f_config_eee_phy(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2649,7 +2646,7 @@ static void rtl8169s_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x00, 0x9200 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8169sb_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2660,7 +2657,7 @@ static void rtl8169sb_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2718,7 +2715,7 @@ static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	rtl8169scd_hw_phy_config_quirk(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -2773,7 +2770,7 @@ static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2786,7 +2783,7 @@ static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_writephy(tp, 0x1f, 0x0001);</div><div class='ctx'> 	rtl_patchphy(tp, 0x16, 1 &lt;&lt; 0);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168bef_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2797,7 +2794,7 @@ static void rtl8168bef_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168cp_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2810,7 +2807,7 @@ static void rtl8168cp_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168cp_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2825,7 +2822,7 @@ static void rtl8168cp_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_patchphy(tp, 0x14, 1 &lt;&lt; 5);</div><div class='ctx'> 	rtl_patchphy(tp, 0x0d, 1 &lt;&lt; 5);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168c_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -2850,7 +2847,7 @@ static void rtl8168c_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x09, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	rtl_patchphy(tp, 0x14, 1 &lt;&lt; 5);</div><div class='ctx'> 	rtl_patchphy(tp, 0x0d, 1 &lt;&lt; 5);</div><div class='hunk'>@@ -2877,7 +2874,7 @@ static void rtl8168c_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	rtl_patchphy(tp, 0x16, 1 &lt;&lt; 0);</div><div class='ctx'> 	rtl_patchphy(tp, 0x14, 1 &lt;&lt; 5);</div><div class='hunk'>@@ -2899,7 +2896,7 @@ static void rtl8168c_3_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	rtl_patchphy(tp, 0x16, 1 &lt;&lt; 0);</div><div class='ctx'> 	rtl_patchphy(tp, 0x14, 1 &lt;&lt; 5);</div><div class='hunk'>@@ -2955,7 +2952,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x0d, 0xf880 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init_0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Rx Error Issue</div><div class='hunk'>@@ -2976,7 +2973,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		};</div><div class='ctx'> 		int val;</div><div class='ctx'> </div><div class='del'>-		rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+		rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 		val = rtl_readphy(tp, 0x0d);</div><div class='ctx'> </div><div class='hunk'>@@ -3002,7 +2999,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 			{ 0x06, 0x6662 }</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+		rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* RSET couple improve */</div><div class='hunk'>@@ -3066,7 +3063,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x0d, 0xf880 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init_0);</div><div class='ctx'> </div><div class='ctx'> 	if (rtl8168d_efuse_read(tp, 0x01) == 0xb1) {</div><div class='ctx'> 		static const struct phy_reg phy_reg_init[] = {</div><div class='hunk'>@@ -3080,7 +3077,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		};</div><div class='ctx'> 		int val;</div><div class='ctx'> </div><div class='del'>-		rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+		rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 		val = rtl_readphy(tp, 0x0d);</div><div class='ctx'> 		if ((val &amp; 0x00ff) != 0x006c) {</div><div class='hunk'>@@ -3105,7 +3102,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 			{ 0x06, 0x2642 }</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+		rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fine tune PLL performance */</div><div class='hunk'>@@ -3183,7 +3180,7 @@ static void rtl8168d_3_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168d_4_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -3198,7 +3195,7 @@ static void rtl8168d_4_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 		{ 0x1f, 0x0000 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> 	rtl_patchphy(tp, 0x0d, 1 &lt;&lt; 5);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3234,7 +3231,7 @@ static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_apply_firmware(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	/* DCO enable for 10M IDLE Power */</div><div class='ctx'> 	rtl_writephy(tp, 0x1f, 0x0007);</div><div class='hunk'>@@ -3282,14 +3279,11 @@ static void rtl_rar_exgmac_set(struct rtl8169_private *tp, u8 *addr)</div><div class='ctx'> 		addr[2] | (addr[3] &lt;&lt; 8),</div><div class='ctx'> 		addr[4] | (addr[5] &lt;&lt; 8)</div><div class='ctx'> 	};</div><div class='del'>-	const struct exgmac_reg e[] = {</div><div class='del'>-		{ .addr = 0xe0, ERIAR_MASK_1111, .val = w[0] | (w[1] &lt;&lt; 16) },</div><div class='del'>-		{ .addr = 0xe4, ERIAR_MASK_1111, .val = w[2] },</div><div class='del'>-		{ .addr = 0xf0, ERIAR_MASK_1111, .val = w[0] &lt;&lt; 16 },</div><div class='del'>-		{ .addr = 0xf4, ERIAR_MASK_1111, .val = w[1] | (w[2] &lt;&lt; 16) }</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	rtl_write_exgmac_batch(tp, e, ARRAY_SIZE(e));</div><div class='add'>+	rtl_eri_write(tp, 0xe0, ERIAR_MASK_1111, w[0] | (w[1] &lt;&lt; 16));</div><div class='add'>+	rtl_eri_write(tp, 0xe4, ERIAR_MASK_1111, w[2]);</div><div class='add'>+	rtl_eri_write(tp, 0xf0, ERIAR_MASK_1111, w[0] &lt;&lt; 16);</div><div class='add'>+	rtl_eri_write(tp, 0xf4, ERIAR_MASK_1111, w[1] | (w[2] &lt;&lt; 16));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -3323,7 +3317,7 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_apply_firmware(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	/* For 4-corner performance improve */</div><div class='ctx'> 	rtl_writephy(tp, 0x1f, 0x0005);</div><div class='hunk'>@@ -3432,7 +3426,7 @@ static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_apply_firmware(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	rtl8168f_hw_phy_config(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -3498,7 +3492,7 @@ static void rtl8411_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_w0w1_phy(tp, 0x06, 0x4000, 0x0000);</div><div class='ctx'> 	rtl_writephy(tp, 0x1f, 0x0000);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='ctx'> 	/* Modify green table for giga */</div><div class='ctx'> 	rtl_writephy(tp, 0x1f, 0x0005);</div><div class='hunk'>@@ -3918,7 +3912,7 @@ static void rtl8102e_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_patchphy(tp, 0x19, 1 &lt;&lt; 13);</div><div class='ctx'> 	rtl_patchphy(tp, 0x10, 1 &lt;&lt; 15);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8105e_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -3944,7 +3938,7 @@ static void rtl8105e_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_apply_firmware(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl8402_hw_phy_config(struct rtl8169_private *tp)</div><div class='hunk'>@@ -3957,7 +3951,7 @@ static void rtl8402_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_apply_firmware(tp);</div><div class='ctx'> </div><div class='ctx'> 	/* EEE setting */</div><div class='del'>-	rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);</div><div class='ctx'> 	rtl_writephy(tp, 0x1f, 0x0004);</div><div class='ctx'> 	rtl_writephy(tp, 0x10, 0x401f);</div><div class='ctx'> 	rtl_writephy(tp, 0x19, 0x7030);</div><div class='hunk'>@@ -3980,139 +3974,73 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_apply_firmware(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));</div><div class='add'>+	rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_writephy_batch(tp, phy_reg_init);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_hw_phy_config(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	static const rtl_generic_fct phy_configs[] = {</div><div class='add'>+		/* PCI devices. */</div><div class='add'>+		[RTL_GIGA_MAC_VER_01] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_02] = rtl8169s_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_03] = rtl8169s_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_04] = rtl8169sb_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_05] = rtl8169scd_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_06] = rtl8169sce_hw_phy_config,</div><div class='add'>+		/* PCI-E devices. */</div><div class='add'>+		[RTL_GIGA_MAC_VER_07] = rtl8102e_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_08] = rtl8102e_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_09] = rtl8102e_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_10] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_12] = rtl8168bef_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_13] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_14] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_15] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_16] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_17] = rtl8168bef_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_18] = rtl8168cp_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_19] = rtl8168c_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_20] = rtl8168c_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_21] = rtl8168c_3_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_22] = rtl8168c_4_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_23] = rtl8168cp_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_24] = rtl8168cp_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_25] = rtl8168d_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_26] = rtl8168d_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_27] = rtl8168d_3_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_28] = rtl8168d_4_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_29] = rtl8105e_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_30] = rtl8105e_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_31] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_32] = rtl8168e_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_33] = rtl8168e_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_34] = rtl8168e_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_35] = rtl8168f_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_36] = rtl8168f_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_37] = rtl8402_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_38] = rtl8411_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_39] = rtl8106e_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_40] = rtl8168g_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_41] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_42] = rtl8168g_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_43] = rtl8168g_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_45] = rtl8168h_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_46] = rtl8168h_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_47] = rtl8168h_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_49] = rtl8168ep_1_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_50] = rtl8168ep_2_hw_phy_config,</div><div class='add'>+		[RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config,</div><div class='add'>+	};</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	switch (tp-&gt;mac_version) {</div><div class='del'>-	case RTL_GIGA_MAC_VER_01:</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_02:</div><div class='del'>-	case RTL_GIGA_MAC_VER_03:</div><div class='del'>-		rtl8169s_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_04:</div><div class='del'>-		rtl8169sb_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_05:</div><div class='del'>-		rtl8169scd_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_06:</div><div class='del'>-		rtl8169sce_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_07:</div><div class='del'>-	case RTL_GIGA_MAC_VER_08:</div><div class='del'>-	case RTL_GIGA_MAC_VER_09:</div><div class='del'>-		rtl8102e_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_11:</div><div class='del'>-		rtl8168bb_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_12:</div><div class='del'>-		rtl8168bef_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_17:</div><div class='del'>-		rtl8168bef_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_18:</div><div class='del'>-		rtl8168cp_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_19:</div><div class='del'>-		rtl8168c_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_20:</div><div class='del'>-		rtl8168c_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_21:</div><div class='del'>-		rtl8168c_3_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_22:</div><div class='del'>-		rtl8168c_4_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_23:</div><div class='del'>-	case RTL_GIGA_MAC_VER_24:</div><div class='del'>-		rtl8168cp_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_25:</div><div class='del'>-		rtl8168d_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_26:</div><div class='del'>-		rtl8168d_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_27:</div><div class='del'>-		rtl8168d_3_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_28:</div><div class='del'>-		rtl8168d_4_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_29:</div><div class='del'>-	case RTL_GIGA_MAC_VER_30:</div><div class='del'>-		rtl8105e_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_31:</div><div class='del'>-		/* None. */</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_32:</div><div class='del'>-	case RTL_GIGA_MAC_VER_33:</div><div class='del'>-		rtl8168e_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_34:</div><div class='del'>-		rtl8168e_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_35:</div><div class='del'>-		rtl8168f_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_36:</div><div class='del'>-		rtl8168f_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_37:</div><div class='del'>-		rtl8402_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_38:</div><div class='del'>-		rtl8411_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_39:</div><div class='del'>-		rtl8106e_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_40:</div><div class='del'>-		rtl8168g_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_42:</div><div class='del'>-	case RTL_GIGA_MAC_VER_43:</div><div class='del'>-	case RTL_GIGA_MAC_VER_44:</div><div class='del'>-		rtl8168g_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_45:</div><div class='del'>-	case RTL_GIGA_MAC_VER_47:</div><div class='del'>-		rtl8168h_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_46:</div><div class='del'>-	case RTL_GIGA_MAC_VER_48:</div><div class='del'>-		rtl8168h_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_49:</div><div class='del'>-		rtl8168ep_1_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_50:</div><div class='del'>-	case RTL_GIGA_MAC_VER_51:</div><div class='del'>-		rtl8168ep_2_hw_phy_config(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_41:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (phy_configs[tp-&gt;mac_version])</div><div class='add'>+		phy_configs[tp-&gt;mac_version](tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag)</div><div class='hunk'>@@ -4143,14 +4071,6 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)</div><div class='ctx'> 	phy_speed_up(tp-&gt;phydev);</div><div class='ctx'> </div><div class='ctx'> 	genphy_soft_reset(tp-&gt;phydev);</div><div class='del'>-</div><div class='del'>-	/* It was reported that several chips end up with 10MBit/Half on a</div><div class='del'>-	 * 1GBit link after resuming from S3. For whatever reason the PHY on</div><div class='del'>-	 * these chips doesn't properly start a renegotiation when soft-reset.</div><div class='del'>-	 * Explicitly requesting a renegotiation fixes this.</div><div class='del'>-	 */</div><div class='del'>-	if (tp-&gt;phydev-&gt;autoneg == AUTONEG_ENABLE)</div><div class='del'>-		phy_restart_aneg(tp-&gt;phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)</div><div class='hunk'>@@ -4279,8 +4199,7 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_40:</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_41:</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_49:</div><div class='del'>-		rtl_w0w1_eri(tp, 0x1a8, ERIAR_MASK_1111, 0x00000000,</div><div class='del'>-			     0xfc000000, ERIAR_EXGMAC);</div><div class='add'>+		rtl_eri_clear_bits(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000);</div><div class='ctx'> 		RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) &amp; ~0x80);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4308,8 +4227,7 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_41:</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_49:</div><div class='ctx'> 		RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | 0xc0);</div><div class='del'>-		rtl_w0w1_eri(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000,</div><div class='del'>-			     0x00000000, ERIAR_EXGMAC);</div><div class='add'>+		rtl_eri_set_bits(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4699,6 +4617,8 @@ static void rtl_hw_start(struct  rtl8169_private *tp)</div><div class='ctx'> 	rtl_set_rx_tx_desc_registers(tp);</div><div class='ctx'> 	rtl_lock_config_regs(tp);</div><div class='ctx'> </div><div class='add'>+	/* disable interrupt coalescing */</div><div class='add'>+	RTL_W16(tp, IntrMitigate, 0x0000);</div><div class='ctx'> 	/* Initially a 10 us delay. Turned it into a PCI commit. - FR */</div><div class='ctx'> 	RTL_R8(tp, IntrMask);</div><div class='ctx'> 	RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);</div><div class='hunk'>@@ -4731,12 +4651,6 @@ static void rtl_hw_start_8169(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl8169_set_magic_reg(tp, tp-&gt;mac_version);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Undocumented corner. Supposedly:</div><div class='del'>-	 * (TxTimer &lt;&lt; 12) | (TxPackets &lt;&lt; 8) | (RxTimer &lt;&lt; 4) | RxPackets</div><div class='del'>-	 */</div><div class='del'>-	RTL_W16(tp, IntrMitigate, 0x0000);</div><div class='del'>-</div><div class='ctx'> 	RTL_W32(tp, RxMissed, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4797,8 +4711,8 @@ struct ephy_info {</div><div class='ctx'> 	u16 bits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rtl_ephy_init(struct rtl8169_private *tp, const struct ephy_info *e,</div><div class='del'>-			  int len)</div><div class='add'>+static void __rtl_ephy_init(struct rtl8169_private *tp,</div><div class='add'>+			    const struct ephy_info *e, int len)</div><div class='ctx'> {</div><div class='ctx'> 	u16 w;</div><div class='ctx'> </div><div class='hunk'>@@ -4809,6 +4723,8 @@ static void rtl_ephy_init(struct rtl8169_private *tp, const struct ephy_info *e,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define rtl_ephy_init(tp, a) __rtl_ephy_init(tp, a, ARRAY_SIZE(a))</div><div class='add'>+</div><div class='ctx'> static void rtl_disable_clock_request(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='ctx'> 	pcie_capability_clear_word(tp-&gt;pci_dev, PCI_EXP_LNKCTL,</div><div class='hunk'>@@ -4840,6 +4756,24 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl_set_fifo_size(struct rtl8169_private *tp, u16 rx_stat,</div><div class='add'>+			      u16 tx_stat, u16 rx_dyn, u16 tx_dyn)</div><div class='add'>+{</div><div class='add'>+	/* Usage of dynamic vs. static FIFO is controlled by bit</div><div class='add'>+	 * TXCFG_AUTO_FIFO. Exact meaning of FIFO values isn't known.</div><div class='add'>+	 */</div><div class='add'>+	rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, (rx_stat &lt;&lt; 16) | rx_dyn);</div><div class='add'>+	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, (tx_stat &lt;&lt; 16) | tx_dyn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8168g_set_pause_thresholds(struct rtl8169_private *tp,</div><div class='add'>+					  u8 low, u8 high)</div><div class='add'>+{</div><div class='add'>+	/* FIFO thresholds for pause flow control */</div><div class='add'>+	rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, low);</div><div class='add'>+	rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, high);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl_hw_start_8168bb(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='ctx'> 	RTL_W8(tp, Config3, RTL_R8(tp, Config3) &amp; ~Beacon_en);</div><div class='hunk'>@@ -4889,7 +4823,7 @@ static void rtl_hw_start_8168cp_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168cp);</div><div class='ctx'> </div><div class='ctx'> 	__rtl_hw_start_8168cp(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -4937,7 +4871,7 @@ static void rtl_hw_start_8168c_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, DBG_REG, 0x06 | FIX_NAK_1 | FIX_NAK_2);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168c_1, ARRAY_SIZE(e_info_8168c_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168c_1);</div><div class='ctx'> </div><div class='ctx'> 	__rtl_hw_start_8168cp(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -4951,7 +4885,7 @@ static void rtl_hw_start_8168c_2(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168c_2);</div><div class='ctx'> </div><div class='ctx'> 	__rtl_hw_start_8168cp(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -5009,7 +4943,7 @@ static void rtl_hw_start_8168d_4(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, MaxTxPacketSize, TxPacketMax);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168d_4, ARRAY_SIZE(e_info_8168d_4));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168d_4);</div><div class='ctx'> </div><div class='ctx'> 	rtl_enable_clock_request(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -5034,7 +4968,7 @@ static void rtl_hw_start_8168e_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168e_1, ARRAY_SIZE(e_info_8168e_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168e_1);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;dev-&gt;mtu &lt;= ETH_DATA_LEN)</div><div class='ctx'> 		rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='hunk'>@@ -5059,19 +4993,18 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168e_2, ARRAY_SIZE(e_info_8168e_2));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168e_2);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;dev-&gt;mtu &lt;= ETH_DATA_LEN)</div><div class='ctx'> 		rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00100002, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x07ff0060, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);</div><div class='add'>+	rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);</div><div class='add'>+	rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x07ff0060);</div><div class='add'>+	rtl_eri_set_bits(tp, 0x1b0, ERIAR_MASK_0001, BIT(4));</div><div class='add'>+	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, MaxTxPacketSize, EarlySize);</div><div class='ctx'> </div><div class='hunk'>@@ -5079,9 +5012,6 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, MCU, RTL_R8(tp, MCU) &amp; ~NOW_IS_OOB);</div><div class='ctx'> </div><div class='del'>-	/* Adjust EEE LED frequency */</div><div class='del'>-	RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) &amp; ~0x07);</div><div class='del'>-</div><div class='ctx'> 	rtl8168_config_eee_mac(tp);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) | PFM_EN);</div><div class='hunk'>@@ -5097,16 +5027,14 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00100002, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0x1d0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x00000060, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);</div><div class='add'>+	rtl_reset_packet_filter(tp);</div><div class='add'>+	rtl_eri_set_bits(tp, 0x1b0, ERIAR_MASK_0001, BIT(4));</div><div class='add'>+	rtl_eri_set_bits(tp, 0x1d0, ERIAR_MASK_0001, BIT(4));</div><div class='add'>+	rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);</div><div class='add'>+	rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x00000060);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, MaxTxPacketSize, EarlySize);</div><div class='ctx'> </div><div class='hunk'>@@ -5131,12 +5059,9 @@ static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	rtl_hw_start_8168f(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168f_1);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00, ERIAR_EXGMAC);</div><div class='del'>-</div><div class='del'>-	/* Adjust EEE LED frequency */</div><div class='del'>-	RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) &amp; ~0x07);</div><div class='add'>+	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_hw_start_8411(struct rtl8169_private *tp)</div><div class='hunk'>@@ -5151,39 +5076,33 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_hw_start_8168f(tp);</div><div class='ctx'> 	rtl_pcie_state_l2l3_disable(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168f_1);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0x0000, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_set_bits(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_hw_start_8168g(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='del'>-	rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x080002, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);</div><div class='add'>+	rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);</div><div class='add'>+	rtl8168g_set_pause_thresholds(tp, 0x38, 0x48);</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='ctx'> 	rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0x2f8, ERIAR_MASK_0011, 0x1d8f, ERIAR_EXGMAC);</div><div class='add'>+	rtl_reset_packet_filter(tp);</div><div class='add'>+	rtl_eri_write(tp, 0x2f8, ERIAR_MASK_0011, 0x1d8f);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W32(tp, MISC, RTL_R32(tp, MISC) &amp; ~RXDV_GATED_EN);</div><div class='ctx'> 	RTL_W8(tp, MaxTxPacketSize, EarlySize);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-</div><div class='del'>-	/* Adjust EEE LED frequency */</div><div class='del'>-	RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) &amp; ~0x07);</div><div class='add'>+	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);</div><div class='ctx'> </div><div class='ctx'> 	rtl8168_config_eee_mac(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, 0x1000, ERIAR_EXGMAC);</div><div class='add'>+	rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06);</div><div class='add'>+	rtl_eri_clear_bits(tp, 0x1b0, ERIAR_MASK_0011, BIT(12));</div><div class='ctx'> </div><div class='ctx'> 	rtl_pcie_state_l2l3_disable(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -5201,7 +5120,7 @@ static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, false);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8168g_1, ARRAY_SIZE(e_info_8168g_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168g_1);</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5219,7 +5138,7 @@ static void rtl_hw_start_8168g_2(struct rtl8169_private *tp)</div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	RTL_W8(tp, Config2, RTL_R8(tp, Config2) &amp; ~ClkReqEn);</div><div class='ctx'> 	RTL_W8(tp, Config5, RTL_R8(tp, Config5) &amp; ~ASPM_en);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8168g_2, ARRAY_SIZE(e_info_8168g_2));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168g_2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_hw_start_8411_2(struct rtl8169_private *tp)</div><div class='hunk'>@@ -5236,7 +5155,7 @@ static void rtl_hw_start_8411_2(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, false);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8411_2, ARRAY_SIZE(e_info_8411_2));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8411_2);</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5255,34 +5174,28 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, false);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8168h_1, ARRAY_SIZE(e_info_8168h_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168h_1);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x00080002, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);</div><div class='add'>+	rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);</div><div class='add'>+	rtl8168g_set_pause_thresholds(tp, 0x38, 0x48);</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='ctx'> 	rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_reset_packet_filter(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_1111, 0x0010, 0x00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_set_bits(tp, 0xdc, ERIAR_MASK_1111, BIT(4));</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0xd4, ERIAR_MASK_1111, 0x1f00, 0x00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_set_bits(tp, 0xd4, ERIAR_MASK_1111, 0x1f00);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0x5f0, ERIAR_MASK_0011, 0x4f87, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0x5f0, ERIAR_MASK_0011, 0x4f87);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W32(tp, MISC, RTL_R32(tp, MISC) &amp; ~RXDV_GATED_EN);</div><div class='ctx'> 	RTL_W8(tp, MaxTxPacketSize, EarlySize);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-</div><div class='del'>-	/* Adjust EEE LED frequency */</div><div class='del'>-	RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) &amp; ~0x07);</div><div class='add'>+	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);</div><div class='ctx'> </div><div class='ctx'> 	rtl8168_config_eee_mac(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -5291,7 +5204,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) &amp; ~TX_10M_PS_EN);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, 0x1000, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_clear_bits(tp, 0x1b0, ERIAR_MASK_0011, BIT(12));</div><div class='ctx'> </div><div class='ctx'> 	rtl_pcie_state_l2l3_disable(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -5341,34 +5254,28 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='ctx'> 	rtl8168ep_stop_cmac(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x00080002, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x2f, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x5f, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);</div><div class='add'>+	rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);</div><div class='add'>+	rtl8168g_set_pause_thresholds(tp, 0x2f, 0x5f);</div><div class='ctx'> </div><div class='ctx'> 	rtl_set_def_aspm_entry_latency(tp);</div><div class='ctx'> </div><div class='ctx'> 	rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_reset_packet_filter(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0xd4, ERIAR_MASK_1111, 0x1f80, 0x00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_set_bits(tp, 0xd4, ERIAR_MASK_1111, 0x1f80);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0x5f0, ERIAR_MASK_0011, 0x4f87, ERIAR_EXGMAC);</div><div class='add'>+	rtl_eri_write(tp, 0x5f0, ERIAR_MASK_0011, 0x4f87);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W32(tp, MISC, RTL_R32(tp, MISC) &amp; ~RXDV_GATED_EN);</div><div class='ctx'> 	RTL_W8(tp, MaxTxPacketSize, EarlySize);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-</div><div class='del'>-	/* Adjust EEE LED frequency */</div><div class='del'>-	RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) &amp; ~0x07);</div><div class='add'>+	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);</div><div class='ctx'> </div><div class='ctx'> 	rtl8168_config_eee_mac(tp);</div><div class='ctx'> </div><div class='del'>-	rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06, ERIAR_EXGMAC);</div><div class='add'>+	rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06);</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) &amp; ~TX_10M_PS_EN);</div><div class='ctx'> </div><div class='hunk'>@@ -5387,7 +5294,7 @@ static void rtl_hw_start_8168ep_1(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, false);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8168ep_1, ARRAY_SIZE(e_info_8168ep_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168ep_1);</div><div class='ctx'> </div><div class='ctx'> 	rtl_hw_start_8168ep(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -5404,7 +5311,7 @@ static void rtl_hw_start_8168ep_2(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, false);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8168ep_2, ARRAY_SIZE(e_info_8168ep_2));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168ep_2);</div><div class='ctx'> </div><div class='ctx'> 	rtl_hw_start_8168ep(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -5426,7 +5333,7 @@ static void rtl_hw_start_8168ep_3(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* disable aspm and clock request before access ephy */</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, false);</div><div class='del'>-	rtl_ephy_init(tp, e_info_8168ep_3, ARRAY_SIZE(e_info_8168ep_3));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8168ep_3);</div><div class='ctx'> </div><div class='ctx'> 	rtl_hw_start_8168ep(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -5449,128 +5356,6 @@ static void rtl_hw_start_8168ep_3(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rtl_hw_start_8168(struct rtl8169_private *tp)</div><div class='del'>-{</div><div class='del'>-	RTL_W8(tp, MaxTxPacketSize, TxPacketMax);</div><div class='del'>-</div><div class='del'>-	tp-&gt;cp_cmd &amp;= ~INTT_MASK;</div><div class='del'>-	tp-&gt;cp_cmd |= PktCntrDisable | INTT_1;</div><div class='del'>-	RTL_W16(tp, CPlusCmd, tp-&gt;cp_cmd);</div><div class='del'>-</div><div class='del'>-	RTL_W16(tp, IntrMitigate, 0x5151);</div><div class='del'>-</div><div class='del'>-	/* Work around for RxFIFO overflow. */</div><div class='del'>-	if (tp-&gt;mac_version == RTL_GIGA_MAC_VER_11) {</div><div class='del'>-		tp-&gt;irq_mask |= RxFIFOOver;</div><div class='del'>-		tp-&gt;irq_mask &amp;= ~RxOverflow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (tp-&gt;mac_version) {</div><div class='del'>-	case RTL_GIGA_MAC_VER_11:</div><div class='del'>-		rtl_hw_start_8168bb(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_12:</div><div class='del'>-	case RTL_GIGA_MAC_VER_17:</div><div class='del'>-		rtl_hw_start_8168bef(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_18:</div><div class='del'>-		rtl_hw_start_8168cp_1(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_19:</div><div class='del'>-		rtl_hw_start_8168c_1(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_20:</div><div class='del'>-		rtl_hw_start_8168c_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_21:</div><div class='del'>-		rtl_hw_start_8168c_3(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_22:</div><div class='del'>-		rtl_hw_start_8168c_4(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_23:</div><div class='del'>-		rtl_hw_start_8168cp_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_24:</div><div class='del'>-		rtl_hw_start_8168cp_3(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_25:</div><div class='del'>-	case RTL_GIGA_MAC_VER_26:</div><div class='del'>-	case RTL_GIGA_MAC_VER_27:</div><div class='del'>-		rtl_hw_start_8168d(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_28:</div><div class='del'>-		rtl_hw_start_8168d_4(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_31:</div><div class='del'>-		rtl_hw_start_8168dp(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_32:</div><div class='del'>-	case RTL_GIGA_MAC_VER_33:</div><div class='del'>-		rtl_hw_start_8168e_1(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_34:</div><div class='del'>-		rtl_hw_start_8168e_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_35:</div><div class='del'>-	case RTL_GIGA_MAC_VER_36:</div><div class='del'>-		rtl_hw_start_8168f_1(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_38:</div><div class='del'>-		rtl_hw_start_8411(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_40:</div><div class='del'>-	case RTL_GIGA_MAC_VER_41:</div><div class='del'>-		rtl_hw_start_8168g_1(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_42:</div><div class='del'>-		rtl_hw_start_8168g_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_44:</div><div class='del'>-		rtl_hw_start_8411_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_45:</div><div class='del'>-	case RTL_GIGA_MAC_VER_46:</div><div class='del'>-		rtl_hw_start_8168h_1(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_49:</div><div class='del'>-		rtl_hw_start_8168ep_1(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_50:</div><div class='del'>-		rtl_hw_start_8168ep_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_51:</div><div class='del'>-		rtl_hw_start_8168ep_3(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		netif_err(tp, drv, tp-&gt;dev,</div><div class='del'>-			  "unknown chipset (mac_version = %d)\n",</div><div class='del'>-			  tp-&gt;mac_version);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void rtl_hw_start_8102e_1(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct ephy_info e_info_8102e_1[] = {</div><div class='hunk'>@@ -5599,7 +5384,7 @@ static void rtl_hw_start_8102e_1(struct rtl8169_private *tp)</div><div class='ctx'> 	if ((cfg1 &amp; LEDS0) &amp;&amp; (cfg1 &amp; LEDS1))</div><div class='ctx'> 		RTL_W8(tp, Config1, cfg1 &amp; ~LEDS0);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8102e_1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rtl_hw_start_8102e_2(struct rtl8169_private *tp)</div><div class='hunk'>@@ -5641,7 +5426,7 @@ static void rtl_hw_start_8105e_1(struct rtl8169_private *tp)</div><div class='ctx'> 	RTL_W8(tp, MCU, RTL_R8(tp, MCU) | EN_NDP | EN_OOB_RESET);</div><div class='ctx'> 	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) | PFM_EN);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8105e_1);</div><div class='ctx'> </div><div class='ctx'> 	rtl_pcie_state_l2l3_disable(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -5666,17 +5451,15 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp)</div><div class='ctx'> </div><div class='ctx'> 	RTL_W8(tp, MCU, RTL_R8(tp, MCU) &amp; ~NOW_IS_OOB);</div><div class='ctx'> </div><div class='del'>-	rtl_ephy_init(tp, e_info_8402, ARRAY_SIZE(e_info_8402));</div><div class='add'>+	rtl_ephy_init(tp, e_info_8402);</div><div class='ctx'> </div><div class='ctx'> 	rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);</div><div class='ctx'> </div><div class='del'>-	rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00000002, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00000006, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);</div><div class='del'>-	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00, ERIAR_EXGMAC);</div><div class='add'>+	rtl_set_fifo_size(tp, 0x00, 0x00, 0x02, 0x06);</div><div class='add'>+	rtl_reset_packet_filter(tp);</div><div class='add'>+	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);</div><div class='add'>+	rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00);</div><div class='ctx'> </div><div class='ctx'> 	rtl_pcie_state_l2l3_disable(tp);</div><div class='ctx'> }</div><div class='hunk'>@@ -5696,6 +5479,73 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)</div><div class='ctx'> 	rtl_hw_aspm_clkreq_enable(tp, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl_hw_config(struct rtl8169_private *tp)</div><div class='add'>+{</div><div class='add'>+	static const rtl_generic_fct hw_configs[] = {</div><div class='add'>+		[RTL_GIGA_MAC_VER_07] = rtl_hw_start_8102e_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_08] = rtl_hw_start_8102e_3,</div><div class='add'>+		[RTL_GIGA_MAC_VER_09] = rtl_hw_start_8102e_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_10] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168bb,</div><div class='add'>+		[RTL_GIGA_MAC_VER_12] = rtl_hw_start_8168bef,</div><div class='add'>+		[RTL_GIGA_MAC_VER_13] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_14] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_15] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_16] = NULL,</div><div class='add'>+		[RTL_GIGA_MAC_VER_17] = rtl_hw_start_8168bef,</div><div class='add'>+		[RTL_GIGA_MAC_VER_18] = rtl_hw_start_8168cp_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_19] = rtl_hw_start_8168c_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_20] = rtl_hw_start_8168c_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_21] = rtl_hw_start_8168c_3,</div><div class='add'>+		[RTL_GIGA_MAC_VER_22] = rtl_hw_start_8168c_4,</div><div class='add'>+		[RTL_GIGA_MAC_VER_23] = rtl_hw_start_8168cp_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_24] = rtl_hw_start_8168cp_3,</div><div class='add'>+		[RTL_GIGA_MAC_VER_25] = rtl_hw_start_8168d,</div><div class='add'>+		[RTL_GIGA_MAC_VER_26] = rtl_hw_start_8168d,</div><div class='add'>+		[RTL_GIGA_MAC_VER_27] = rtl_hw_start_8168d,</div><div class='add'>+		[RTL_GIGA_MAC_VER_28] = rtl_hw_start_8168d_4,</div><div class='add'>+		[RTL_GIGA_MAC_VER_29] = rtl_hw_start_8105e_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_30] = rtl_hw_start_8105e_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_31] = rtl_hw_start_8168dp,</div><div class='add'>+		[RTL_GIGA_MAC_VER_32] = rtl_hw_start_8168e_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_33] = rtl_hw_start_8168e_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_34] = rtl_hw_start_8168e_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_35] = rtl_hw_start_8168f_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_36] = rtl_hw_start_8168f_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_37] = rtl_hw_start_8402,</div><div class='add'>+		[RTL_GIGA_MAC_VER_38] = rtl_hw_start_8411,</div><div class='add'>+		[RTL_GIGA_MAC_VER_39] = rtl_hw_start_8106,</div><div class='add'>+		[RTL_GIGA_MAC_VER_40] = rtl_hw_start_8168g_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_41] = rtl_hw_start_8168g_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_42] = rtl_hw_start_8168g_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_43] = rtl_hw_start_8168g_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_45] = rtl_hw_start_8168h_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_46] = rtl_hw_start_8168h_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_47] = rtl_hw_start_8168h_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_49] = rtl_hw_start_8168ep_1,</div><div class='add'>+		[RTL_GIGA_MAC_VER_50] = rtl_hw_start_8168ep_2,</div><div class='add'>+		[RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (hw_configs[tp-&gt;mac_version])</div><div class='add'>+		hw_configs[tp-&gt;mac_version](tp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl_hw_start_8168(struct rtl8169_private *tp)</div><div class='add'>+{</div><div class='add'>+	RTL_W8(tp, MaxTxPacketSize, TxPacketMax);</div><div class='add'>+</div><div class='add'>+	/* Workaround for RxFIFO overflow. */</div><div class='add'>+	if (tp-&gt;mac_version == RTL_GIGA_MAC_VER_11) {</div><div class='add'>+		tp-&gt;irq_mask |= RxFIFOOver;</div><div class='add'>+		tp-&gt;irq_mask &amp;= ~RxOverflow;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtl_hw_config(tp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rtl_hw_start_8101(struct rtl8169_private *tp)</div><div class='ctx'> {</div><div class='ctx'> 	if (tp-&gt;mac_version &gt;= RTL_GIGA_MAC_VER_30)</div><div class='hunk'>@@ -5711,43 +5561,7 @@ static void rtl_hw_start_8101(struct rtl8169_private *tp)</div><div class='ctx'> 	tp-&gt;cp_cmd &amp;= CPCMD_QUIRK_MASK;</div><div class='ctx'> 	RTL_W16(tp, CPlusCmd, tp-&gt;cp_cmd);</div><div class='ctx'> </div><div class='del'>-	switch (tp-&gt;mac_version) {</div><div class='del'>-	case RTL_GIGA_MAC_VER_07:</div><div class='del'>-		rtl_hw_start_8102e_1(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_08:</div><div class='del'>-		rtl_hw_start_8102e_3(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_09:</div><div class='del'>-		rtl_hw_start_8102e_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_29:</div><div class='del'>-		rtl_hw_start_8105e_1(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_30:</div><div class='del'>-		rtl_hw_start_8105e_2(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_37:</div><div class='del'>-		rtl_hw_start_8402(tp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RTL_GIGA_MAC_VER_39:</div><div class='del'>-		rtl_hw_start_8106(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_43:</div><div class='del'>-		rtl_hw_start_8168g_2(tp);</div><div class='del'>-		break;</div><div class='del'>-	case RTL_GIGA_MAC_VER_47:</div><div class='del'>-	case RTL_GIGA_MAC_VER_48:</div><div class='del'>-		rtl_hw_start_8168h_1(tp);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RTL_W16(tp, IntrMitigate, 0x0000);</div><div class='add'>+	rtl_hw_config(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)</div><div class='hunk'>@@ -6264,7 +6078,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> 		if (rtl_tx_slots_avail(tp, MAX_SKB_FRAGS))</div><div class='del'>-			netif_wake_queue(dev);</div><div class='add'>+			netif_start_queue(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -6520,9 +6334,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = dev_instance;</div><div class='ctx'> 	u16 status = RTL_R16(tp, IntrStatus);</div><div class='del'>-	u16 irq_mask = RTL_R16(tp, IntrMask);</div><div class='ctx'> </div><div class='del'>-	if (status == 0xffff || !(status &amp; irq_mask))</div><div class='add'>+	if (!tp-&gt;irq_enabled || status == 0xffff || !(status &amp; tp-&gt;irq_mask))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(status &amp; SYSErr)) {</div><div class='hunk'>@@ -6540,10 +6353,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 		set_bit(RTL_FLAG_TASK_RESET_PENDING, tp-&gt;wk.flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status &amp; RTL_EVENT_NAPI) {</div><div class='del'>-		rtl_irq_disable(tp);</div><div class='del'>-		napi_schedule_irqoff(&amp;tp-&gt;napi);</div><div class='del'>-	}</div><div class='add'>+	rtl_irq_disable(tp);</div><div class='add'>+	napi_schedule_irqoff(&amp;tp-&gt;napi);</div><div class='ctx'> out:</div><div class='ctx'> 	rtl_ack_events(tp, status);</div><div class='ctx'> </div><div class='hunk'>@@ -6642,8 +6453,7 @@ static int r8169_phy_connect(struct rtl8169_private *tp)</div><div class='ctx'> 	if (!tp-&gt;supports_gmii)</div><div class='ctx'> 		phy_set_max_speed(phydev, SPEED_100);</div><div class='ctx'> </div><div class='del'>-	/* Ensure to advertise everything, incl. pause */</div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_support_asym_pause(phydev);</div><div class='ctx'> </div><div class='ctx'> 	phy_attached_info(phydev);</div><div class='ctx'> </div><div class='hunk'>@@ -7120,13 +6930,13 @@ static void rtl_read_mac_address(struct rtl8169_private *tp,</div><div class='ctx'> 	switch (tp-&gt;mac_version) {</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:</div><div class='ctx'> 	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:</div><div class='del'>-		value = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);</div><div class='add'>+		value = rtl_eri_read(tp, 0xe0);</div><div class='ctx'> 		mac_addr[0] = (value &gt;&gt;  0) &amp; 0xff;</div><div class='ctx'> 		mac_addr[1] = (value &gt;&gt;  8) &amp; 0xff;</div><div class='ctx'> 		mac_addr[2] = (value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 		mac_addr[3] = (value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-		value = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);</div><div class='add'>+		value = rtl_eri_read(tp, 0xe4);</div><div class='ctx'> 		mac_addr[4] = (value &gt;&gt;  0) &amp; 0xff;</div><div class='ctx'> 		mac_addr[5] = (value &gt;&gt;  8) &amp; 0xff;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -7350,6 +7160,11 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	/* Disable ASPM completely as that cause random device stop working</div><div class='add'>+	 * problems as well as full system hangs for some PCIe devices users.</div><div class='add'>+	 */</div><div class='add'>+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);</div><div class='add'>+</div><div class='ctx'> 	/* enable device (incl. PCI PM wakeup and hotplug setup) */</div><div class='ctx'> 	rc = pcim_enable_device(pdev);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='head'>diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c<br/>index 8154b38c08f7..ef8f08931fe8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/renesas/ravb_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/renesas/ravb_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/renesas/ravb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/renesas/ravb_main.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ static void ravb_set_buffer_align(struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static void ravb_read_mac_address(struct net_device *ndev, const u8 *mac)</div><div class='ctx'> {</div><div class='del'>-	if (mac) {</div><div class='add'>+	if (!IS_ERR(mac)) {</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, mac);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 mahr = ravb_read(ndev, MAHR);</div><div class='hunk'>@@ -728,7 +728,6 @@ static irqreturn_t ravb_emac_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	ravb_emac_interrupt_unlocked(ndev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -848,7 +847,6 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		result = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -881,7 +879,6 @@ static irqreturn_t ravb_multi_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		result = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -898,7 +895,6 @@ static irqreturn_t ravb_dma_interrupt(int irq, void *dev_id, int q)</div><div class='ctx'> 	if (ravb_queue_interrupt(ndev, q))</div><div class='ctx'> 		result = IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -943,7 +939,6 @@ static int ravb_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			ravb_write(ndev, ~(mask | TIS_RESERVED), TIS);</div><div class='ctx'> 			ravb_tx_free(ndev, q, true);</div><div class='ctx'> 			netif_wake_subqueue(ndev, q);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -959,7 +954,6 @@ static int ravb_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		ravb_write(ndev, mask, RIE0);</div><div class='ctx'> 		ravb_write(ndev, mask, TIE);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Receive error message handling */</div><div class='hunk'>@@ -1008,7 +1002,6 @@ static void ravb_adjust_link(struct net_device *ndev)</div><div class='ctx'> 	if (priv-&gt;no_avb_link &amp;&amp; phydev-&gt;link)</div><div class='ctx'> 		ravb_rcv_snd_enable(ndev);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (new_state &amp;&amp; netif_msg_link(priv))</div><div class='hunk'>@@ -1601,7 +1594,6 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		netif_stop_subqueue(ndev, q);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='hunk'>@@ -1615,8 +1607,7 @@ drop:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 ravb_select_queue(struct net_device *ndev, struct sk_buff *skb,</div><div class='del'>-			     struct net_device *sb_dev,</div><div class='del'>-			     select_queue_fallback_t fallback)</div><div class='add'>+			     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* If skb needs TX timestamp, it is handled in network control queue */</div><div class='ctx'> 	return (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) ? RAVB_NC :</div><div class='hunk'>@@ -1673,7 +1664,6 @@ static void ravb_set_rx_mode(struct net_device *ndev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	ravb_modify(ndev, ECMR, ECMR_PRM,</div><div class='ctx'> 		    ndev-&gt;flags &amp; IFF_PROMISC ? ECMR_PRM : 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1970,6 +1960,13 @@ static void ravb_set_config_mode(struct net_device *ndev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct soc_device_attribute ravb_delay_mode_quirk_match[] = {</div><div class='add'>+	{ .soc_id = "r8a774c0" },</div><div class='add'>+	{ .soc_id = "r8a77990" },</div><div class='add'>+	{ .soc_id = "r8a77995" },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Set tx and rx clock internal delay modes */</div><div class='ctx'> static void ravb_set_delay_mode(struct net_device *ndev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1981,8 +1978,12 @@ static void ravb_set_delay_mode(struct net_device *ndev)</div><div class='ctx'> 		set |= APSR_DM_RDM;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='del'>-	    priv-&gt;phy_interface == PHY_INTERFACE_MODE_RGMII_TXID)</div><div class='del'>-		set |= APSR_DM_TDM;</div><div class='add'>+	    priv-&gt;phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) {</div><div class='add'>+		if (!WARN(soc_device_match(ravb_delay_mode_quirk_match),</div><div class='add'>+			  "phy-mode %s requires TX clock internal delay mode which is not supported by this hardware revision. Please update device tree",</div><div class='add'>+			  phy_modes(priv-&gt;phy_interface)))</div><div class='add'>+			set |= APSR_DM_TDM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ravb_modify(ndev, APSR, APSR_DM, set);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/renesas/ravb_ptp.c b/drivers/net/ethernet/renesas/ravb_ptp.c<br/>index dce2a40a31e3..9a42580693cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/renesas/ravb_ptp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/renesas/ravb_ptp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/renesas/ravb_ptp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/renesas/ravb_ptp.c</a></div><div class='hunk'>@@ -196,7 +196,6 @@ static int ravb_ptp_extts(struct ptp_clock_info *ptp,</div><div class='ctx'> 		ravb_write(ndev, GIE_PTCS, GIE);</div><div class='ctx'> 	else</div><div class='ctx'> 		ravb_write(ndev, GID_PTCD, GID);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -259,7 +258,6 @@ static int ravb_ptp_perout(struct ptp_clock_info *ptp,</div><div class='ctx'> 		else</div><div class='ctx'> 			ravb_write(ndev, GID_PTMD0, GID);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -331,7 +329,6 @@ void ravb_ptp_init(struct net_device *ndev, struct platform_device *pdev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	ravb_wait(ndev, GCCR, GCCR_TCR, GCCR_TCR_NOREQ);</div><div class='ctx'> 	ravb_modify(ndev, GCCR, GCCR_TCSS, GCCR_TCSS_ADJGPTP);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;ptp.clock = ptp_clock_register(&amp;priv-&gt;ptp.info, &amp;pdev-&gt;dev);</div><div class='head'>diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c<br/>index e33af371b169..7c4e282242d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/renesas/sh_eth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/renesas/sh_eth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/renesas/sh_eth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/renesas/sh_eth.c</a></div><div class='hunk'>@@ -2010,7 +2010,6 @@ static void sh_eth_adjust_link(struct net_device *ndev)</div><div class='ctx'> 	if ((mdp-&gt;cd-&gt;no_psr || mdp-&gt;no_ether_link) &amp;&amp; phydev-&gt;link)</div><div class='ctx'> 		sh_eth_rcv_snd_enable(ndev);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mdp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (new_state &amp;&amp; netif_msg_link(mdp))</div><div class='hunk'>@@ -3193,7 +3192,7 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)</div><div class='ctx'> 	pdata-&gt;phy_interface = ret;</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		memcpy(pdata-&gt;mac_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;no_ether_link =</div><div class='head'>diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c<br/>index a71c900ca04f..7ae6c124bfe9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/rocker/rocker_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/rocker/rocker_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/rocker/rocker_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/rocker/rocker_main.c</a></div><div class='hunk'>@@ -2207,6 +2207,15 @@ static int rocker_router_fib_event(struct notifier_block *nb,</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case FIB_EVENT_ENTRY_ADD: /* fall through */</div><div class='ctx'> 	case FIB_EVENT_ENTRY_DEL:</div><div class='add'>+		if (info-&gt;family == AF_INET) {</div><div class='add'>+			struct fib_entry_notifier_info *fen_info = ptr;</div><div class='add'>+</div><div class='add'>+			if (fen_info-&gt;fi-&gt;fib_nh_is_v6) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(info-&gt;extack, "IPv6 gateway with IPv4 route is not supported");</div><div class='add'>+				return notifier_from_errno(-EINVAL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		memcpy(&amp;fib_work-&gt;fen_info, ptr, sizeof(fib_work-&gt;fen_info));</div><div class='ctx'> 		/* Take referece on fib_info to prevent it from being</div><div class='ctx'> 		 * freed while work is queued. Release it afterwards.</div><div class='head'>diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c<br/>index fa296a7c255d..30a49802fb51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/rocker/rocker_ofdpa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/rocker/rocker_ofdpa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/rocker/rocker_ofdpa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/rocker/rocker_ofdpa.c</a></div><div class='hunk'>@@ -2288,11 +2288,11 @@ static int ofdpa_port_fib_ipv4(struct ofdpa_port *ofdpa_port,  __be32 dst,</div><div class='ctx'> </div><div class='ctx'> 	nh = fi-&gt;fib_nh;</div><div class='ctx'> 	nh_on_port = (fi-&gt;fib_dev == ofdpa_port-&gt;dev);</div><div class='del'>-	has_gw = !!nh-&gt;nh_gw;</div><div class='add'>+	has_gw = !!nh-&gt;fib_nh_gw4;</div><div class='ctx'> </div><div class='ctx'> 	if (has_gw &amp;&amp; nh_on_port) {</div><div class='ctx'> 		err = ofdpa_port_ipv4_nh(ofdpa_port, flags,</div><div class='del'>-					 nh-&gt;nh_gw, &amp;index);</div><div class='add'>+					 nh-&gt;fib_nh_gw4, &amp;index);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2749,7 +2749,7 @@ static int ofdpa_fib4_add(struct rocker *rocker,</div><div class='ctx'> 				  fen_info-&gt;tb_id, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	fen_info-&gt;fi-&gt;fib_nh-&gt;nh_flags |= RTNH_F_OFFLOAD;</div><div class='add'>+	fen_info-&gt;fi-&gt;fib_nh-&gt;fib_nh_flags |= RTNH_F_OFFLOAD;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2764,7 +2764,7 @@ static int ofdpa_fib4_del(struct rocker *rocker,</div><div class='ctx'> 	ofdpa_port = ofdpa_port_dev_lower_find(fen_info-&gt;fi-&gt;fib_dev, rocker);</div><div class='ctx'> 	if (!ofdpa_port)</div><div class='ctx'> 		return 0;</div><div class='del'>-	fen_info-&gt;fi-&gt;fib_nh-&gt;nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='add'>+	fen_info-&gt;fi-&gt;fib_nh-&gt;fib_nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='ctx'> 	return ofdpa_port_fib_ipv4(ofdpa_port, htonl(fen_info-&gt;dst),</div><div class='ctx'> 				   fen_info-&gt;dst_len, fen_info-&gt;fi,</div><div class='ctx'> 				   fen_info-&gt;tb_id, OFDPA_OP_FLAG_REMOVE);</div><div class='hunk'>@@ -2791,7 +2791,7 @@ static void ofdpa_fib4_abort(struct rocker *rocker)</div><div class='ctx'> 						       rocker);</div><div class='ctx'> 		if (!ofdpa_port)</div><div class='ctx'> 			continue;</div><div class='del'>-		flow_entry-&gt;fi-&gt;fib_nh-&gt;nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='add'>+		flow_entry-&gt;fi-&gt;fib_nh-&gt;fib_nh_flags &amp;= ~RTNH_F_OFFLOAD;</div><div class='ctx'> 		ofdpa_flow_tbl_del(ofdpa_port, OFDPA_OP_FLAG_REMOVE,</div><div class='ctx'> 				   flow_entry);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c<br/>index fbd00cb0cb7d..d2bc9412ba03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ static int sxgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get MAC address if available (DT) */</div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR_OR_NULL(mac))</div><div class='ctx'> 		ether_addr_copy(priv-&gt;dev-&gt;dev_addr, mac);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the TX/RX IRQ numbers */</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/falcon/io.h b/drivers/net/ethernet/sfc/falcon/io.h<br/>index 7085ee1d5e2b..c3577643fbda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/falcon/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/falcon/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/falcon/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sfc/falcon/io.h</a></div><div class='hunk'>@@ -108,7 +108,6 @@ static inline void ef4_writeo(struct ef4_nic *efx, const ef4_oword_t *value,</div><div class='ctx'> 	_ef4_writed(efx, value-&gt;u32[2], reg + 8);</div><div class='ctx'> 	_ef4_writed(efx, value-&gt;u32[3], reg + 12);</div><div class='ctx'> #endif</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;efx-&gt;biu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -130,7 +129,6 @@ static inline void ef4_sram_writeq(struct ef4_nic *efx, void __iomem *membase,</div><div class='ctx'> 	__raw_writel((__force u32)value-&gt;u32[0], membase + addr);</div><div class='ctx'> 	__raw_writel((__force u32)value-&gt;u32[1], membase + addr + 4);</div><div class='ctx'> #endif</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;efx-&gt;biu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sfc/falcon/tx.c b/drivers/net/ethernet/sfc/falcon/tx.c<br/>index 3409bbf5b19f..c5059f456f37 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/falcon/tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/falcon/tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/falcon/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sfc/falcon/tx.c</a></div><div class='hunk'>@@ -321,7 +321,7 @@ netdev_tx_t ef4_enqueue_skb(struct ef4_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> 	netdev_tx_sent_queue(tx_queue-&gt;core_txq, skb_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Pass off to hardware */</div><div class='del'>-	if (!skb-&gt;xmit_more || netif_xmit_stopped(tx_queue-&gt;core_txq)) {</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(tx_queue-&gt;core_txq)) {</div><div class='ctx'> 		struct ef4_tx_queue *txq2 = ef4_tx_queue_partner(tx_queue);</div><div class='ctx'> </div><div class='ctx'> 		/* There could be packets left on the partner queue if those</div><div class='hunk'>@@ -333,7 +333,7 @@ netdev_tx_t ef4_enqueue_skb(struct ef4_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		ef4_nic_push_buffers(tx_queue);</div><div class='ctx'> 	} else {</div><div class='del'>-		tx_queue-&gt;xmit_more_available = skb-&gt;xmit_more;</div><div class='add'>+		tx_queue-&gt;xmit_more_available = netdev_xmit_more();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tx_queue-&gt;tx_packets++;</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/io.h b/drivers/net/ethernet/sfc/io.h<br/>index 89563170af52..2774a10f44e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/io.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/io.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/io.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sfc/io.h</a></div><div class='hunk'>@@ -120,7 +120,6 @@ static inline void efx_writeo(struct efx_nic *efx, const efx_oword_t *value,</div><div class='ctx'> 	_efx_writed(efx, value-&gt;u32[2], reg + 8);</div><div class='ctx'> 	_efx_writed(efx, value-&gt;u32[3], reg + 12);</div><div class='ctx'> #endif</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;efx-&gt;biu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +141,6 @@ static inline void efx_sram_writeq(struct efx_nic *efx, void __iomem *membase,</div><div class='ctx'> 	__raw_writel((__force u32)value-&gt;u32[0], membase + addr);</div><div class='ctx'> 	__raw_writel((__force u32)value-&gt;u32[1], membase + addr + 4);</div><div class='ctx'> #endif</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;efx-&gt;biu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c<br/>index 9382bb0b4d5a..a4bbfebe3d64 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/mcdi_port.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/mcdi_port.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/mcdi_port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sfc/mcdi_port.c</a></div><div class='hunk'>@@ -342,6 +342,7 @@ static void efx_mcdi_phy_decode_link(struct efx_nic *efx,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='add'>+		/* Fall through */</div><div class='ctx'> 	case MC_CMD_FCNTL_OFF:</div><div class='ctx'> 		link_state-&gt;fc = 0;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c<br/>index 06c8f282263f..e182055ec2eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sfc/tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sfc/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sfc/tx.c</a></div><div class='hunk'>@@ -478,8 +478,6 @@ static int efx_tx_tso_fallback(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		next = skb-&gt;next;</div><div class='ctx'> 		skb-&gt;next = NULL;</div><div class='ctx'> </div><div class='del'>-		if (next)</div><div class='del'>-			skb-&gt;xmit_more = true;</div><div class='ctx'> 		efx_enqueue_skb(tx_queue, skb);</div><div class='ctx'> 		skb = next;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -506,7 +504,7 @@ static int efx_tx_tso_fallback(struct efx_tx_queue *tx_queue,</div><div class='ctx'> netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old_insert_count = tx_queue-&gt;insert_count;</div><div class='del'>-	bool xmit_more = skb-&gt;xmit_more;</div><div class='add'>+	bool xmit_more = netdev_xmit_more();</div><div class='ctx'> 	bool data_mapped = false;</div><div class='ctx'> 	unsigned int segments;</div><div class='ctx'> 	unsigned int skb_len;</div><div class='hunk'>@@ -533,7 +531,7 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='ctx'> #ifdef EFX_USE_PIO</div><div class='del'>-	} else if (skb_len &lt;= efx_piobuf_size &amp;&amp; !skb-&gt;xmit_more &amp;&amp;</div><div class='add'>+	} else if (skb_len &lt;= efx_piobuf_size &amp;&amp; !xmit_more &amp;&amp;</div><div class='ctx'> 		   efx_nic_may_tx_pio(tx_queue)) {</div><div class='ctx'> 		/* Use PIO for short packets with an empty queue. */</div><div class='ctx'> 		if (efx_enqueue_skb_pio(tx_queue, skb))</div><div class='hunk'>@@ -559,8 +557,8 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> 	if (__netdev_tx_sent_queue(tx_queue-&gt;core_txq, skb_len, xmit_more)) {</div><div class='ctx'> 		struct efx_tx_queue *txq2 = efx_tx_queue_partner(tx_queue);</div><div class='ctx'> </div><div class='del'>-		/* There could be packets left on the partner queue if those</div><div class='del'>-		 * SKBs had skb-&gt;xmit_more set. If we do not push those they</div><div class='add'>+		/* There could be packets left on the partner queue if</div><div class='add'>+		 * xmit_more was set. If we do not push those they</div><div class='ctx'> 		 * could be left for a long time and cause a netdev watchdog.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (txq2-&gt;xmit_more_available)</div><div class='hunk'>@@ -568,7 +566,7 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		efx_nic_push_buffers(tx_queue);</div><div class='ctx'> 	} else {</div><div class='del'>-		tx_queue-&gt;xmit_more_available = skb-&gt;xmit_more;</div><div class='add'>+		tx_queue-&gt;xmit_more_available = xmit_more;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (segments) {</div><div class='head'>diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c<br/>index c07fd594fe71..02b3962b0e63 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/silan/sc92031.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/silan/sc92031.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/silan/sc92031.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/silan/sc92031.c</a></div><div class='hunk'>@@ -251,7 +251,6 @@ enum PMConfigBits {</div><div class='ctx'>  * use of mdelay() at _sc92031_reset.</div><div class='ctx'>  * Functions prefixed with _sc92031_ must be called with the lock held;</div><div class='ctx'>  * functions prefixed with sc92031_ must be called without the lock held.</div><div class='del'>- * Use mmiowb() before unlocking if the hardware was written to.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Locking rules for the interrupt:</div><div class='hunk'>@@ -361,7 +360,6 @@ static void sc92031_disable_interrupts(struct net_device *dev)</div><div class='ctx'> 	/* stop interrupts */</div><div class='ctx'> 	iowrite32(0, port_base + IntrMask);</div><div class='ctx'> 	_sc92031_dummy_read(port_base);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	/* wait for any concurrent interrupt/tasklet to finish */</div><div class='ctx'> 	synchronize_irq(priv-&gt;pdev-&gt;irq);</div><div class='hunk'>@@ -379,7 +377,6 @@ static void sc92031_enable_interrupts(struct net_device *dev)</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(IntrBits, port_base + IntrMask);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _sc92031_disable_tx_rx(struct net_device *dev)</div><div class='hunk'>@@ -867,7 +864,6 @@ out:</div><div class='ctx'> 	rmb();</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(intr_mask, port_base + IntrMask);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -901,7 +897,6 @@ out_none:</div><div class='ctx'> 	rmb();</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(intr_mask, port_base + IntrMask);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -978,7 +973,6 @@ static netdev_tx_t sc92031_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	iowrite32(priv-&gt;tx_bufs_dma_addr + entry * TX_BUF_SIZE,</div><div class='ctx'> 			port_base + TxAddr0 + entry * 4);</div><div class='ctx'> 	iowrite32(tx_status, port_base + TxStatus0 + entry * 4);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;tx_head - priv-&gt;tx_tail &gt;= NUM_TX_DESC)</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='hunk'>@@ -1024,7 +1018,6 @@ static int sc92031_open(struct net_device *dev)</div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	_sc92031_reset(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> 	sc92031_enable_interrupts(dev);</div><div class='hunk'>@@ -1060,7 +1053,6 @@ static int sc92031_stop(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	_sc92031_disable_tx_rx(dev);</div><div class='ctx'> 	_sc92031_tx_clear(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1081,7 +1073,6 @@ static void sc92031_set_multicast_list(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	_sc92031_set_mar(dev);</div><div class='ctx'> 	_sc92031_set_rx_config(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1098,7 +1089,6 @@ static void sc92031_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;tx_timeouts++;</div><div class='ctx'> </div><div class='ctx'> 	_sc92031_reset(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1140,7 +1130,6 @@ sc92031_ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	output_status = _sc92031_mii_read(port_base, MII_OutputStatus);</div><div class='ctx'> 	_sc92031_mii_scan(port_base);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1311,7 +1300,6 @@ static int sc92031_ethtool_set_wol(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;pm_config = pm_config;</div><div class='ctx'> 	iowrite32(pm_config, port_base + PMConfig);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1337,7 +1325,6 @@ static int sc92031_ethtool_nway_reset(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	_sc92031_mii_scan(port_base);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1530,7 +1517,6 @@ static int sc92031_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	_sc92031_disable_tx_rx(dev);</div><div class='ctx'> 	_sc92031_tx_clear(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1555,7 +1541,6 @@ static int sc92031_resume(struct pci_dev *pdev)</div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	_sc92031_reset(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='ctx'> 	sc92031_enable_interrupts(dev);</div><div class='head'>diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c<br/>index 6073387511f8..67f9bb6e941b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sis/sis900.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sis/sis900.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sis/sis900.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sis/sis900.c</a></div><div class='hunk'>@@ -730,10 +730,10 @@ static u16 sis900_default_phy(struct net_device * net_dev)</div><div class='ctx'> 		status = mdio_read(net_dev, phy-&gt;phy_addr, MII_STATUS);</div><div class='ctx'> </div><div class='ctx'> 		/* Link ON &amp; Not select default PHY &amp; not ghost PHY */</div><div class='del'>-		 if ((status &amp; MII_STAT_LINK) &amp;&amp; !default_phy &amp;&amp;</div><div class='del'>-					(phy-&gt;phy_types != UNKNOWN))</div><div class='del'>-		 	default_phy = phy;</div><div class='del'>-		 else {</div><div class='add'>+		if ((status &amp; MII_STAT_LINK) &amp;&amp; !default_phy &amp;&amp;</div><div class='add'>+		    (phy-&gt;phy_types != UNKNOWN)) {</div><div class='add'>+			default_phy = phy;</div><div class='add'>+		} else {</div><div class='ctx'> 			status = mdio_read(net_dev, phy-&gt;phy_addr, MII_CONTROL);</div><div class='ctx'> 			mdio_write(net_dev, phy-&gt;phy_addr, MII_CONTROL,</div><div class='ctx'> 				status | MII_CNTL_AUTO | MII_CNTL_ISOLATE);</div><div class='hunk'>@@ -741,7 +741,7 @@ static u16 sis900_default_phy(struct net_device * net_dev)</div><div class='ctx'> 				phy_home = phy;</div><div class='ctx'> 			else if(phy-&gt;phy_types == LAN)</div><div class='ctx'> 				phy_lan = phy;</div><div class='del'>-		 }</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!default_phy &amp;&amp; phy_home)</div><div class='head'>diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c<br/>index a18149720aa2..cba5881b2746 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/socionext/netsec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/socionext/netsec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/socionext/netsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/socionext/netsec.c</a></div><div class='hunk'>@@ -673,7 +673,8 @@ static void netsec_process_tx(struct netsec_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *netsec_alloc_rx_data(struct netsec_priv *priv,</div><div class='del'>-				  dma_addr_t *dma_handle, u16 *desc_len)</div><div class='add'>+				  dma_addr_t *dma_handle, u16 *desc_len,</div><div class='add'>+				  bool napi)</div><div class='ctx'> {</div><div class='ctx'> 	size_t total_len = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> 	size_t payload_len = NETSEC_RX_BUF_SZ;</div><div class='hunk'>@@ -682,7 +683,7 @@ static void *netsec_alloc_rx_data(struct netsec_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	total_len += SKB_DATA_ALIGN(payload_len + NETSEC_SKB_PAD);</div><div class='ctx'> </div><div class='del'>-	buf = napi_alloc_frag(total_len);</div><div class='add'>+	buf = napi ? napi_alloc_frag(total_len) : netdev_alloc_frag(total_len);</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -765,7 +766,8 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget)</div><div class='ctx'> 		/* allocate a fresh buffer and map it to the hardware.</div><div class='ctx'> 		 * This will eventually replace the old buffer in the hardware</div><div class='ctx'> 		 */</div><div class='del'>-		buf_addr = netsec_alloc_rx_data(priv, &amp;dma_handle, &amp;desc_len);</div><div class='add'>+		buf_addr = netsec_alloc_rx_data(priv, &amp;dma_handle, &amp;desc_len,</div><div class='add'>+						true);</div><div class='ctx'> 		if (unlikely(!buf_addr))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1069,7 +1071,8 @@ static int netsec_setup_rx_dring(struct netsec_priv *priv)</div><div class='ctx'> 		void *buf;</div><div class='ctx'> 		u16 len;</div><div class='ctx'> </div><div class='del'>-		buf = netsec_alloc_rx_data(priv, &amp;dma_handle, &amp;len);</div><div class='add'>+		buf = netsec_alloc_rx_data(priv, &amp;dma_handle, &amp;len,</div><div class='add'>+					   false);</div><div class='ctx'> 		if (!buf) {</div><div class='ctx'> 			netsec_uninit_pkt_dring(priv, NETSEC_RING_RX);</div><div class='ctx'> 			goto err_out;</div><div class='head'>diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c<br/>index bb6d5fb73035..51a7b48db4bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/socionext/sni_ave.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/socionext/sni_ave.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/socionext/sni_ave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/socionext/sni_ave.c</a></div><div class='hunk'>@@ -1599,7 +1599,7 @@ static int ave_probe(struct platform_device *pdev)</div><div class='ctx'> 	ndev-&gt;max_mtu = AVE_MAX_ETHFRAME - (ETH_HLEN + ETH_FCS_LEN);</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* if the mac address is invalid, use random mac address */</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/descs_com.h b/drivers/net/ethernet/stmicro/stmmac/descs_com.h<br/>index 40d6356a7e73..3dfb07a78952 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/descs_com.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/descs_com.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/descs_com.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/descs_com.h</a></div><div class='hunk'>@@ -29,11 +29,13 @@</div><div class='ctx'> /* Specific functions used for Ring mode */</div><div class='ctx'> </div><div class='ctx'> /* Enhanced descriptors */</div><div class='del'>-static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end)</div><div class='add'>+static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end,</div><div class='add'>+					   int bfsize)</div><div class='ctx'> {</div><div class='del'>-	p-&gt;des1 |= cpu_to_le32((BUF_SIZE_8KiB</div><div class='del'>-			&lt;&lt; ERDES1_BUFFER2_SIZE_SHIFT)</div><div class='del'>-		   &amp; ERDES1_BUFFER2_SIZE_MASK);</div><div class='add'>+	if (bfsize == BUF_SIZE_16KiB)</div><div class='add'>+		p-&gt;des1 |= cpu_to_le32((BUF_SIZE_8KiB</div><div class='add'>+				&lt;&lt; ERDES1_BUFFER2_SIZE_SHIFT)</div><div class='add'>+			   &amp; ERDES1_BUFFER2_SIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (end)</div><div class='ctx'> 		p-&gt;des1 |= cpu_to_le32(ERDES1_END_RING);</div><div class='hunk'>@@ -59,11 +61,15 @@ static inline void enh_set_tx_desc_len_on_ring(struct dma_desc *p, int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Normal descriptors */</div><div class='del'>-static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end)</div><div class='add'>+static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end, int bfsize)</div><div class='ctx'> {</div><div class='del'>-	p-&gt;des1 |= cpu_to_le32(((BUF_SIZE_2KiB - 1)</div><div class='del'>-				&lt;&lt; RDES1_BUFFER2_SIZE_SHIFT)</div><div class='del'>-		    &amp; RDES1_BUFFER2_SIZE_MASK);</div><div class='add'>+	if (bfsize &gt;= BUF_SIZE_2KiB) {</div><div class='add'>+		int bfsize2;</div><div class='add'>+</div><div class='add'>+		bfsize2 = min(bfsize - BUF_SIZE_2KiB + 1, BUF_SIZE_2KiB - 1);</div><div class='add'>+		p-&gt;des1 |= cpu_to_le32((bfsize2 &lt;&lt; RDES1_BUFFER2_SIZE_SHIFT)</div><div class='add'>+			    &amp; RDES1_BUFFER2_SIZE_MASK);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (end)</div><div class='ctx'> 		p-&gt;des1 |= cpu_to_le32(RDES1_END_RING);</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c<br/>index 062a600fa5a7..21428537e231 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c</a></div><div class='hunk'>@@ -333,6 +333,9 @@ static int stm32mp1_parse_data(struct stm32_dwmac *dwmac,</div><div class='ctx'> 	 */</div><div class='ctx'> 	dwmac-&gt;irq_pwr_wakeup = platform_get_irq_byname(pdev,</div><div class='ctx'> 							"stm32_pwr_wakeup");</div><div class='add'>+	if (dwmac-&gt;irq_pwr_wakeup == -EPROBE_DEFER)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+</div><div class='ctx'> 	if (!dwmac-&gt;clk_eth_ck &amp;&amp; dwmac-&gt;irq_pwr_wakeup &gt;= 0) {</div><div class='ctx'> 		err = device_init_wakeup(&amp;pdev-&gt;dev, true);</div><div class='ctx'> 		if (err) {</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c<br/>index 7fbb6a4dbf51..e061e9f5fad7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c</a></div><div class='hunk'>@@ -296,7 +296,7 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,</div><div class='del'>-				   int mode, int end)</div><div class='add'>+				   int mode, int end, int bfsize)</div><div class='ctx'> {</div><div class='ctx'> 	dwmac4_set_rx_owner(p, disable_rx_ic);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h<br/>index 37d5e6fe7473..085b700a4994 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h</a></div><div class='hunk'>@@ -143,6 +143,11 @@</div><div class='ctx'> #define XGMAC_RSF			BIT(5)</div><div class='ctx'> #define XGMAC_RTC			GENMASK(1, 0)</div><div class='ctx'> #define XGMAC_RTC_SHIFT			0</div><div class='add'>+#define XGMAC_MTL_RXQ_FLOW_CONTROL(x)	(0x00001150 + (0x80 * (x)))</div><div class='add'>+#define XGMAC_RFD			GENMASK(31, 17)</div><div class='add'>+#define XGMAC_RFD_SHIFT			17</div><div class='add'>+#define XGMAC_RFA			GENMASK(15, 1)</div><div class='add'>+#define XGMAC_RFA_SHIFT			1</div><div class='ctx'> #define XGMAC_MTL_QINTEN(x)		(0x00001170 + (0x80 * (x)))</div><div class='ctx'> #define XGMAC_RXOIE			BIT(16)</div><div class='ctx'> #define XGMAC_MTL_QINT_STATUS(x)	(0x00001174 + (0x80 * (x)))</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c<br/>index 1d858fdec997..98fa471da7c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c</a></div><div class='hunk'>@@ -123,7 +123,7 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dwxgmac2_init_rx_desc(struct dma_desc *p, int disable_rx_ic,</div><div class='del'>-				  int mode, int end)</div><div class='add'>+				  int mode, int end, int bfsize)</div><div class='ctx'> {</div><div class='ctx'> 	dwxgmac2_set_rx_owner(p, disable_rx_ic);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c<br/>index 2ba712b48a89..e79037f511e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c</a></div><div class='hunk'>@@ -147,6 +147,52 @@ static void dwxgmac2_dma_rx_mode(void __iomem *ioaddr, int mode,</div><div class='ctx'> 	value &amp;= ~XGMAC_RQS;</div><div class='ctx'> 	value |= (rqs &lt;&lt; XGMAC_RQS_SHIFT) &amp; XGMAC_RQS;</div><div class='ctx'> </div><div class='add'>+	if ((fifosz &gt;= 4096) &amp;&amp; (qmode != MTL_QUEUE_AVB)) {</div><div class='add'>+		u32 flow = readl(ioaddr + XGMAC_MTL_RXQ_FLOW_CONTROL(channel));</div><div class='add'>+		unsigned int rfd, rfa;</div><div class='add'>+</div><div class='add'>+		value |= XGMAC_EHFC;</div><div class='add'>+</div><div class='add'>+		/* Set Threshold for Activating Flow Control to min 2 frames,</div><div class='add'>+		 * i.e. 1500 * 2 = 3000 bytes.</div><div class='add'>+		 *</div><div class='add'>+		 * Set Threshold for Deactivating Flow Control to min 1 frame,</div><div class='add'>+		 * i.e. 1500 bytes.</div><div class='add'>+		 */</div><div class='add'>+		switch (fifosz) {</div><div class='add'>+		case 4096:</div><div class='add'>+			/* This violates the above formula because of FIFO size</div><div class='add'>+			 * limit therefore overflow may occur in spite of this.</div><div class='add'>+			 */</div><div class='add'>+			rfd = 0x03; /* Full-2.5K */</div><div class='add'>+			rfa = 0x01; /* Full-1.5K */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 8192:</div><div class='add'>+			rfd = 0x06; /* Full-4K */</div><div class='add'>+			rfa = 0x0a; /* Full-6K */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 16384:</div><div class='add'>+			rfd = 0x06; /* Full-4K */</div><div class='add'>+			rfa = 0x12; /* Full-10K */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			rfd = 0x06; /* Full-4K */</div><div class='add'>+			rfa = 0x1e; /* Full-16K */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flow &amp;= ~XGMAC_RFD;</div><div class='add'>+		flow |= rfd &lt;&lt; XGMAC_RFD_SHIFT;</div><div class='add'>+</div><div class='add'>+		flow &amp;= ~XGMAC_RFA;</div><div class='add'>+		flow |= rfa &lt;&lt; XGMAC_RFA_SHIFT;</div><div class='add'>+</div><div class='add'>+		writel(flow, ioaddr + XGMAC_MTL_RXQ_FLOW_CONTROL(channel));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	writel(value, ioaddr + XGMAC_MTL_RXQ_OPMODE(channel));</div><div class='ctx'> </div><div class='ctx'> 	/* Enable MTL RX overflow */</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c<br/>index 5ef91a790f9d..5202d6ad7919 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/enh_desc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/enh_desc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/enh_desc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/enh_desc.c</a></div><div class='hunk'>@@ -201,6 +201,11 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,</div><div class='ctx'> 	if (unlikely(rdes0 &amp; RDES0_OWN))</div><div class='ctx'> 		return dma_own;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!(rdes0 &amp; RDES0_LAST_DESCRIPTOR))) {</div><div class='add'>+		stats-&gt;rx_length_errors++;</div><div class='add'>+		return discard_frame;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(rdes0 &amp; RDES0_ERROR_SUMMARY)) {</div><div class='ctx'> 		if (unlikely(rdes0 &amp; RDES0_DESCRIPTOR_ERROR)) {</div><div class='ctx'> 			x-&gt;rx_desc++;</div><div class='hunk'>@@ -231,9 +236,10 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,</div><div class='ctx'> 	 * It doesn't match with the information reported into the databook.</div><div class='ctx'> 	 * At any rate, we need to understand if the CSUM hw computation is ok</div><div class='ctx'> 	 * and report this info to the upper layers. */</div><div class='del'>-	ret = enh_desc_coe_rdes0(!!(rdes0 &amp; RDES0_IPC_CSUM_ERROR),</div><div class='del'>-				 !!(rdes0 &amp; RDES0_FRAME_TYPE),</div><div class='del'>-				 !!(rdes0 &amp; ERDES0_RX_MAC_ADDR));</div><div class='add'>+	if (likely(ret == good_frame))</div><div class='add'>+		ret = enh_desc_coe_rdes0(!!(rdes0 &amp; RDES0_IPC_CSUM_ERROR),</div><div class='add'>+					 !!(rdes0 &amp; RDES0_FRAME_TYPE),</div><div class='add'>+					 !!(rdes0 &amp; ERDES0_RX_MAC_ADDR));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rdes0 &amp; RDES0_DRIBBLING))</div><div class='ctx'> 		x-&gt;dribbling_bit++;</div><div class='hunk'>@@ -259,15 +265,19 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,</div><div class='del'>-				  int mode, int end)</div><div class='add'>+				  int mode, int end, int bfsize)</div><div class='ctx'> {</div><div class='add'>+	int bfsize1;</div><div class='add'>+</div><div class='ctx'> 	p-&gt;des0 |= cpu_to_le32(RDES0_OWN);</div><div class='del'>-	p-&gt;des1 |= cpu_to_le32(BUF_SIZE_8KiB &amp; ERDES1_BUFFER1_SIZE_MASK);</div><div class='add'>+</div><div class='add'>+	bfsize1 = min(bfsize, BUF_SIZE_8KiB);</div><div class='add'>+	p-&gt;des1 |= cpu_to_le32(bfsize1 &amp; ERDES1_BUFFER1_SIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == STMMAC_CHAIN_MODE)</div><div class='ctx'> 		ehn_desc_rx_set_on_chain(p);</div><div class='ctx'> 	else</div><div class='del'>-		ehn_desc_rx_set_on_ring(p, end);</div><div class='add'>+		ehn_desc_rx_set_on_ring(p, end, bfsize);</div><div class='ctx'> </div><div class='ctx'> 	if (disable_rx_ic)</div><div class='ctx'> 		p-&gt;des1 |= cpu_to_le32(ERDES1_DISABLE_IC);</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h<br/>index 92b8944f26e3..5bb00234d961 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/hwif.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/hwif.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/hwif.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/hwif.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@ struct dma_extended_desc;</div><div class='ctx'> struct stmmac_desc_ops {</div><div class='ctx'> 	/* DMA RX descriptor ring initialization */</div><div class='ctx'> 	void (*init_rx_desc)(struct dma_desc *p, int disable_rx_ic, int mode,</div><div class='del'>-			int end);</div><div class='add'>+			int end, int bfsize);</div><div class='ctx'> 	/* DMA TX descriptor ring initialization */</div><div class='ctx'> 	void (*init_tx_desc)(struct dma_desc *p, int mode, int end);</div><div class='ctx'> 	/* Invoked by the xmit function to prepare the tx descriptor */</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c<br/>index de65bb29feba..6d690678c20e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/norm_desc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/norm_desc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/norm_desc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/norm_desc.c</a></div><div class='hunk'>@@ -91,8 +91,6 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,</div><div class='ctx'> 		return dma_own;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!(rdes0 &amp; RDES0_LAST_DESCRIPTOR))) {</div><div class='del'>-		pr_warn("%s: Oversized frame spanned multiple buffers\n",</div><div class='del'>-			__func__);</div><div class='ctx'> 		stats-&gt;rx_length_errors++;</div><div class='ctx'> 		return discard_frame;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -135,15 +133,19 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,</div><div class='del'>-			       int end)</div><div class='add'>+			       int end, int bfsize)</div><div class='ctx'> {</div><div class='add'>+	int bfsize1;</div><div class='add'>+</div><div class='ctx'> 	p-&gt;des0 |= cpu_to_le32(RDES0_OWN);</div><div class='del'>-	p-&gt;des1 |= cpu_to_le32((BUF_SIZE_2KiB - 1) &amp; RDES1_BUFFER1_SIZE_MASK);</div><div class='add'>+</div><div class='add'>+	bfsize1 = min(bfsize, BUF_SIZE_2KiB - 1);</div><div class='add'>+	p-&gt;des1 |= cpu_to_le32(bfsize1 &amp; RDES1_BUFFER1_SIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == STMMAC_CHAIN_MODE)</div><div class='ctx'> 		ndesc_rx_set_on_chain(p, end);</div><div class='ctx'> 	else</div><div class='del'>-		ndesc_rx_set_on_ring(p, end);</div><div class='add'>+		ndesc_rx_set_on_ring(p, end, bfsize);</div><div class='ctx'> </div><div class='ctx'> 	if (disable_rx_ic)</div><div class='ctx'> 		p-&gt;des1 |= cpu_to_le32(RDES1_DISABLE_IC);</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c<br/>index d8c5bc412219..4d9bcb4d0378 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/ring_mode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/ring_mode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/ring_mode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/ring_mode.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum)</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB);</div><div class='ctx'> 		stmmac_prepare_tx_desc(priv, desc, 1, bmax, csum,</div><div class='del'>-				STMMAC_RING_MODE, 1, false, skb-&gt;len);</div><div class='add'>+				STMMAC_RING_MODE, 0, false, skb-&gt;len);</div><div class='ctx'> 		tx_q-&gt;tx_skbuff[entry] = NULL;</div><div class='ctx'> 		entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +79,8 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum)</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB);</div><div class='ctx'> 		stmmac_prepare_tx_desc(priv, desc, 0, len, csum,</div><div class='del'>-				STMMAC_RING_MODE, 1, true, skb-&gt;len);</div><div class='add'>+				STMMAC_RING_MODE, 1, !skb_is_nonlinear(skb),</div><div class='add'>+				skb-&gt;len);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		des2 = dma_map_single(priv-&gt;device, skb-&gt;data,</div><div class='ctx'> 				      nopaged_len, DMA_TO_DEVICE);</div><div class='hunk'>@@ -91,7 +92,8 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum)</div><div class='ctx'> 		tx_q-&gt;tx_skbuff_dma[entry].is_jumbo = true;</div><div class='ctx'> 		desc-&gt;des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB);</div><div class='ctx'> 		stmmac_prepare_tx_desc(priv, desc, 1, nopaged_len, csum,</div><div class='del'>-				STMMAC_RING_MODE, 1, true, skb-&gt;len);</div><div class='add'>+				STMMAC_RING_MODE, 0, !skb_is_nonlinear(skb),</div><div class='add'>+				skb-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tx_q-&gt;cur_tx = entry;</div><div class='hunk'>@@ -111,10 +113,11 @@ static unsigned int is_jumbo_frm(int len, int enh_desc)</div><div class='ctx'> </div><div class='ctx'> static void refill_desc3(void *priv_ptr, struct dma_desc *p)</div><div class='ctx'> {</div><div class='del'>-	struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr;</div><div class='add'>+	struct stmmac_rx_queue *rx_q = priv_ptr;</div><div class='add'>+	struct stmmac_priv *priv = rx_q-&gt;priv_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill DES3 in case of RING mode */</div><div class='del'>-	if (priv-&gt;dma_buf_sz &gt;= BUF_SIZE_8KiB)</div><div class='add'>+	if (priv-&gt;dma_buf_sz == BUF_SIZE_16KiB)</div><div class='ctx'> 		p-&gt;des3 = cpu_to_le32(le32_to_cpu(p-&gt;des2) + BUF_SIZE_8KiB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c<br/>index 97c5e1aad88f..5678b869cbff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ MODULE_PARM_DESC(phyaddr, "Physical device address");</div><div class='ctx'> #define STMMAC_TX_THRESH	(DMA_TX_SIZE / 4)</div><div class='ctx'> #define STMMAC_RX_THRESH	(DMA_RX_SIZE / 4)</div><div class='ctx'> </div><div class='del'>-static int flow_ctrl = FLOW_OFF;</div><div class='add'>+static int flow_ctrl = FLOW_AUTO;</div><div class='ctx'> module_param(flow_ctrl, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(flow_ctrl, "Flow control ability [on/off]");</div><div class='ctx'> </div><div class='hunk'>@@ -1136,11 +1136,13 @@ static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv, u32 queue)</div><div class='ctx'> 		if (priv-&gt;extend_desc)</div><div class='ctx'> 			stmmac_init_rx_desc(priv, &amp;rx_q-&gt;dma_erx[i].basic,</div><div class='ctx'> 					priv-&gt;use_riwt, priv-&gt;mode,</div><div class='del'>-					(i == DMA_RX_SIZE - 1));</div><div class='add'>+					(i == DMA_RX_SIZE - 1),</div><div class='add'>+					priv-&gt;dma_buf_sz);</div><div class='ctx'> 		else</div><div class='ctx'> 			stmmac_init_rx_desc(priv, &amp;rx_q-&gt;dma_rx[i],</div><div class='ctx'> 					priv-&gt;use_riwt, priv-&gt;mode,</div><div class='del'>-					(i == DMA_RX_SIZE - 1));</div><div class='add'>+					(i == DMA_RX_SIZE - 1),</div><div class='add'>+					priv-&gt;dma_buf_sz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2614,8 +2616,6 @@ static int stmmac_open(struct net_device *dev)</div><div class='ctx'> 	u32 chan;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	stmmac_check_ether_addr(priv);</div><div class='del'>-</div><div class='ctx'> 	if (priv-&gt;hw-&gt;pcs != STMMAC_PCS_RGMII &amp;&amp;</div><div class='ctx'> 	    priv-&gt;hw-&gt;pcs != STMMAC_PCS_TBI &amp;&amp;</div><div class='ctx'> 	    priv-&gt;hw-&gt;pcs != STMMAC_PCS_RTBI) {</div><div class='hunk'>@@ -3216,14 +3216,16 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		stmmac_prepare_tx_desc(priv, first, 1, nopaged_len,</div><div class='ctx'> 				csum_insertion, priv-&gt;mode, 1, last_segment,</div><div class='ctx'> 				skb-&gt;len);</div><div class='del'>-</div><div class='del'>-		/* The own bit must be the latest setting done when prepare the</div><div class='del'>-		 * descriptor and then barrier is needed to make sure that</div><div class='del'>-		 * all is coherent before granting the DMA engine.</div><div class='del'>-		 */</div><div class='del'>-		wmb();</div><div class='add'>+	} else {</div><div class='add'>+		stmmac_set_tx_owner(priv, first);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* The own bit must be the latest setting done when prepare the</div><div class='add'>+	 * descriptor and then barrier is needed to make sure that</div><div class='add'>+	 * all is coherent before granting the DMA engine.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='ctx'> 	netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	stmmac_enable_dma_transmission(priv, priv-&gt;ioaddr);</div><div class='hunk'>@@ -3350,9 +3352,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct stmmac_rx_queue *rx_q = &amp;priv-&gt;rx_queue[queue];</div><div class='ctx'> 	struct stmmac_channel *ch = &amp;priv-&gt;channel[queue];</div><div class='del'>-	unsigned int entry = rx_q-&gt;cur_rx;</div><div class='add'>+	unsigned int next_entry = rx_q-&gt;cur_rx;</div><div class='ctx'> 	int coe = priv-&gt;hw-&gt;rx_csum;</div><div class='del'>-	unsigned int next_entry;</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	bool xmac;</div><div class='ctx'> </div><div class='hunk'>@@ -3370,10 +3371,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)</div><div class='ctx'> 		stmmac_display_ring(priv, rx_head, DMA_RX_SIZE, true);</div><div class='ctx'> 	}</div><div class='ctx'> 	while (count &lt; limit) {</div><div class='del'>-		int status;</div><div class='add'>+		int entry, status;</div><div class='ctx'> 		struct dma_desc *p;</div><div class='ctx'> 		struct dma_desc *np;</div><div class='ctx'> </div><div class='add'>+		entry = next_entry;</div><div class='add'>+</div><div class='ctx'> 		if (priv-&gt;extend_desc)</div><div class='ctx'> 			p = (struct dma_desc *)(rx_q-&gt;dma_erx + entry);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3429,11 +3432,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)</div><div class='ctx'> 			 *  ignored</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (frame_len &gt; priv-&gt;dma_buf_sz) {</div><div class='del'>-				netdev_err(priv-&gt;dev,</div><div class='del'>-					   "len %d larger than size (%d)\n",</div><div class='del'>-					   frame_len, priv-&gt;dma_buf_sz);</div><div class='add'>+				if (net_ratelimit())</div><div class='add'>+					netdev_err(priv-&gt;dev,</div><div class='add'>+						   "len %d larger than size (%d)\n",</div><div class='add'>+						   frame_len, priv-&gt;dma_buf_sz);</div><div class='ctx'> 				priv-&gt;dev-&gt;stats.rx_length_errors++;</div><div class='del'>-				break;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3</div><div class='hunk'>@@ -3468,7 +3472,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)</div><div class='ctx'> 						dev_warn(priv-&gt;device,</div><div class='ctx'> 							 "packet dropped\n");</div><div class='ctx'> 					priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-					break;</div><div class='add'>+					continue;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				dma_sync_single_for_cpu(priv-&gt;device,</div><div class='hunk'>@@ -3488,11 +3492,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				skb = rx_q-&gt;rx_skbuff[entry];</div><div class='ctx'> 				if (unlikely(!skb)) {</div><div class='del'>-					netdev_err(priv-&gt;dev,</div><div class='del'>-						   "%s: Inconsistent Rx chain\n",</div><div class='del'>-						   priv-&gt;dev-&gt;name);</div><div class='add'>+					if (net_ratelimit())</div><div class='add'>+						netdev_err(priv-&gt;dev,</div><div class='add'>+							   "%s: Inconsistent Rx chain\n",</div><div class='add'>+							   priv-&gt;dev-&gt;name);</div><div class='ctx'> 					priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-					break;</div><div class='add'>+					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				prefetch(skb-&gt;data - NET_IP_ALIGN);</div><div class='ctx'> 				rx_q-&gt;rx_skbuff[entry] = NULL;</div><div class='hunk'>@@ -3527,7 +3532,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)</div><div class='ctx'> 			priv-&gt;dev-&gt;stats.rx_packets++;</div><div class='ctx'> 			priv-&gt;dev-&gt;stats.rx_bytes += frame_len;</div><div class='ctx'> 		}</div><div class='del'>-		entry = next_entry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stmmac_rx_refill(priv, queue);</div><div class='hunk'>@@ -4258,7 +4262,7 @@ int stmmac_dvr_probe(struct device *device,</div><div class='ctx'> 	priv-&gt;wol_irq = res-&gt;wol_irq;</div><div class='ctx'> 	priv-&gt;lpi_irq = res-&gt;lpi_irq;</div><div class='ctx'> </div><div class='del'>-	if (res-&gt;mac)</div><div class='add'>+	if (!IS_ERR_OR_NULL(res-&gt;mac))</div><div class='ctx'> 		memcpy(priv-&gt;dev-&gt;dev_addr, res-&gt;mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(device, priv-&gt;dev);</div><div class='hunk'>@@ -4297,6 +4301,8 @@ int stmmac_dvr_probe(struct device *device,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_hw_init;</div><div class='ctx'> </div><div class='add'>+	stmmac_check_ether_addr(priv);</div><div class='add'>+</div><div class='ctx'> 	/* Configure real RX and TX queues */</div><div class='ctx'> 	netif_set_real_num_rx_queues(ndev, priv-&gt;plat-&gt;rx_queues_to_use);</div><div class='ctx'> 	netif_set_real_num_tx_queues(ndev, priv-&gt;plat-&gt;tx_queues_to_use);</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c<br/>index d819e8eaba12..26db6aa002d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c</a></div><div class='hunk'>@@ -159,6 +159,12 @@ static const struct dmi_system_id quark_pci_dmi[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.driver_data = (void *)&amp;galileo_stmmac_dmi_data,</div><div class='ctx'> 	},</div><div class='add'>+	/*</div><div class='add'>+	 * There are 2 types of SIMATIC IOT2000: IOT2020 and IOT2040.</div><div class='add'>+	 * The asset tag "6ES7647-0AA00-0YA2" is only for IOT2020 which</div><div class='add'>+	 * has only one pci network device while other asset tags are</div><div class='add'>+	 * for IOT2040 which has two.</div><div class='add'>+	 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"),</div><div class='hunk'>@@ -170,8 +176,6 @@ static const struct dmi_system_id quark_pci_dmi[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"),</div><div class='del'>-			DMI_EXACT_MATCH(DMI_BOARD_ASSET_TAG,</div><div class='del'>-					"6ES7647-0AA00-1YA2"),</div><div class='ctx'> 		},</div><div class='ctx'> 		.driver_data = (void *)&amp;iot2040_stmmac_dmi_data,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c<br/>index 644e42c181ee..01ea0d6f8819 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sun/ldmvsw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sun/ldmvsw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sun/ldmvsw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sun/ldmvsw.c</a></div><div class='hunk'>@@ -101,8 +101,7 @@ static struct vnet_port *vsw_tx_port_find(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 vsw_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct net_device *sb_dev,</div><div class='del'>-			    select_queue_fallback_t fallback)</div><div class='add'>+			    struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vnet_port *port = netdev_priv(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c<br/>index 590172818b92..96b883f965f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sun/sunvnet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/sun/sunvnet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/sun/sunvnet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/sun/sunvnet.c</a></div><div class='hunk'>@@ -234,8 +234,7 @@ static struct vnet_port *vnet_tx_port_find(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 vnet_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			     struct net_device *sb_dev,</div><div class='del'>-			     select_queue_fallback_t fallback)</div><div class='add'>+			     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vnet *vp = netdev_priv(dev);</div><div class='ctx'> 	struct vnet_port *port = __tx_port_find(vp, skb);</div><div class='head'>diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c<br/>index 99d86e39ff54..bf6c1c6779ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c</a></div><div class='hunk'>@@ -995,7 +995,7 @@ static void xlgmac_dev_xmit(struct xlgmac_channel *channel)</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;cur = cur_index + 1;</div><div class='del'>-	if (!pkt_info-&gt;skb-&gt;xmit_more ||</div><div class='add'>+	if (!netdev_xmit_more() ||</div><div class='ctx'> 	    netif_xmit_stopped(netdev_get_tx_queue(pdata-&gt;netdev,</div><div class='ctx'> 						   channel-&gt;queue_index)))</div><div class='ctx'> 		xlgmac_tx_start_xmit(channel, ring);</div><div class='head'>diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig<br/>index 8b21b40a9fe5..afbdc9744230 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/Kconfig</a></div><div class='hunk'>@@ -20,7 +20,6 @@ config TI_DAVINCI_EMAC</div><div class='ctx'> 	tristate "TI DaVinci EMAC Support"</div><div class='ctx'> 	depends on ARM &amp;&amp; ( ARCH_DAVINCI || ARCH_OMAP3 ) || COMPILE_TEST</div><div class='ctx'> 	select TI_DAVINCI_MDIO</div><div class='del'>-	select TI_DAVINCI_CPDMA</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports TI's DaVinci Ethernet .</div><div class='hunk'>@@ -38,16 +37,6 @@ config TI_DAVINCI_MDIO</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called davinci_mdio.  This is recommended.</div><div class='ctx'> </div><div class='del'>-config TI_DAVINCI_CPDMA</div><div class='del'>-	tristate "TI DaVinci CPDMA Support"</div><div class='del'>-	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST</div><div class='del'>-	select GENERIC_ALLOCATOR</div><div class='del'>-	---help---</div><div class='del'>-	  This driver supports TI's DaVinci CPDMA dma engine.</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 davinci_cpdma.  This is recommended.</div><div class='del'>-</div><div class='ctx'> config TI_CPSW_PHY_SEL</div><div class='ctx'> 	bool "TI CPSW Phy mode Selection (DEPRECATED)"</div><div class='ctx'> 	default n</div><div class='hunk'>@@ -55,17 +44,10 @@ config TI_CPSW_PHY_SEL</div><div class='ctx'> 	  This driver supports configuring of the phy mode connected to</div><div class='ctx'> 	  the CPSW. DEPRECATED: use PHY_TI_GMII_SEL.</div><div class='ctx'> </div><div class='del'>-config TI_CPSW_ALE</div><div class='del'>-	tristate "TI CPSW ALE Support"</div><div class='del'>-	---help---</div><div class='del'>-	  This driver supports TI's CPSW ALE module.</div><div class='del'>-</div><div class='ctx'> config TI_CPSW</div><div class='ctx'> 	tristate "TI CPSW Switch Support"</div><div class='ctx'> 	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST</div><div class='del'>-	select TI_DAVINCI_CPDMA</div><div class='ctx'> 	select TI_DAVINCI_MDIO</div><div class='del'>-	select TI_CPSW_ALE</div><div class='ctx'> 	select MFD_SYSCON</div><div class='ctx'> 	select REGMAP</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -94,7 +76,6 @@ config TI_CPTS_MOD</div><div class='ctx'> </div><div class='ctx'> config TI_KEYSTONE_NETCP</div><div class='ctx'> 	tristate "TI Keystone NETCP Core Support"</div><div class='del'>-	select TI_CPSW_ALE</div><div class='ctx'> 	select TI_DAVINCI_MDIO</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	depends on KEYSTONE_NAVIGATOR_DMA &amp;&amp; KEYSTONE_NAVIGATOR_QMSS</div><div class='head'>diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile<br/>index 0be551de821c..c3f53a40b48f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/Makefile</a></div><div class='hunk'>@@ -8,16 +8,15 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += cpsw-common.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_TLAN) += tlan.o</div><div class='ctx'> obj-$(CONFIG_CPMAC) += cpmac.o</div><div class='del'>-obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o</div><div class='add'>+obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o</div><div class='add'>+ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o</div><div class='ctx'> obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o</div><div class='del'>-obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o</div><div class='ctx'> obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o</div><div class='del'>-obj-$(CONFIG_TI_CPSW_ALE) += cpsw_ale.o</div><div class='ctx'> obj-$(CONFIG_TI_CPTS_MOD) += cpts.o</div><div class='ctx'> obj-$(CONFIG_TI_CPSW) += ti_cpsw.o</div><div class='del'>-ti_cpsw-y := cpsw.o</div><div class='add'>+ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o cpsw_priv.o cpsw_sl.o cpsw_ethtool.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_TI_KEYSTONE_NETCP) += keystone_netcp.o</div><div class='del'>-keystone_netcp-y := netcp_core.o</div><div class='add'>+keystone_netcp-y := netcp_core.o cpsw_ale.o</div><div class='ctx'> obj-$(CONFIG_TI_KEYSTONE_NETCP_ETHSS) += keystone_netcp_ethss.o</div><div class='ctx'> keystone_netcp_ethss-y := netcp_ethss.o netcp_sgmii.o netcp_xgbepcsr.o</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c<br/>index e2d47b24a869..3a655a4dc10e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpmac.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2006, 2007 Eugene Konev</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 as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/ti/cpsw-common.c b/drivers/net/ethernet/ti/cpsw-common.c<br/>index 38d1cc557c11..bfa81bbfce3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw-common.c</a></div><div class='hunk'>@@ -1,14 +1,4 @@</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, or</div><div class='del'>- * (at your option) any later version.</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='add'>+// SPDX-License-Identifier: GPL-2.0+</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='head'>diff --git a/drivers/net/ethernet/ti/cpsw-phy-sel.c b/drivers/net/ethernet/ti/cpsw-phy-sel.c<br/>index fec275e2208d..48e0924259f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw-phy-sel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw-phy-sel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw-phy-sel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw-phy-sel.c</a></div><div class='hunk'>@@ -1,17 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Texas Instruments Ethernet Switch Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2013 Texas Instruments</div><div class='ctx'>  *</div><div class='ctx'>  * Module Author: Mugunthan V N &lt;mugunthanvnm@ti.com&gt;</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</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 "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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c<br/>index a591583d120e..b18eeb05b993 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw.c</a></div><div class='hunk'>@@ -1,16 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Texas Instruments Ethernet Switch Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 Texas Instruments</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 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -44,138 +37,13 @@</div><div class='ctx'> </div><div class='ctx'> #include "cpsw.h"</div><div class='ctx'> #include "cpsw_ale.h"</div><div class='add'>+#include "cpsw_priv.h"</div><div class='add'>+#include "cpsw_sl.h"</div><div class='ctx'> #include "cpts.h"</div><div class='ctx'> #include "davinci_cpdma.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#define CPSW_DEBUG	(NETIF_MSG_HW		| NETIF_MSG_WOL		| \</div><div class='del'>-			 NETIF_MSG_DRV		| NETIF_MSG_LINK	| \</div><div class='del'>-			 NETIF_MSG_IFUP		| NETIF_MSG_INTR	| \</div><div class='del'>-			 NETIF_MSG_PROBE	| NETIF_MSG_TIMER	| \</div><div class='del'>-			 NETIF_MSG_IFDOWN	| NETIF_MSG_RX_ERR	| \</div><div class='del'>-			 NETIF_MSG_TX_ERR	| NETIF_MSG_TX_DONE	| \</div><div class='del'>-			 NETIF_MSG_PKTDATA	| NETIF_MSG_TX_QUEUED	| \</div><div class='del'>-			 NETIF_MSG_RX_STATUS)</div><div class='del'>-</div><div class='del'>-#define cpsw_info(priv, type, format, ...)		\</div><div class='del'>-do {								\</div><div class='del'>-	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='del'>-		dev_info(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define cpsw_err(priv, type, format, ...)		\</div><div class='del'>-do {								\</div><div class='del'>-	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='del'>-		dev_err(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define cpsw_dbg(priv, type, format, ...)		\</div><div class='del'>-do {								\</div><div class='del'>-	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='del'>-		dev_dbg(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define cpsw_notice(priv, type, format, ...)		\</div><div class='del'>-do {								\</div><div class='del'>-	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='del'>-		dev_notice(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define ALE_ALL_PORTS		0x7</div><div class='del'>-</div><div class='del'>-#define CPSW_MAJOR_VERSION(reg)		(reg &gt;&gt; 8 &amp; 0x7)</div><div class='del'>-#define CPSW_MINOR_VERSION(reg)		(reg &amp; 0xff)</div><div class='del'>-#define CPSW_RTL_VERSION(reg)		((reg &gt;&gt; 11) &amp; 0x1f)</div><div class='del'>-</div><div class='del'>-#define CPSW_VERSION_1		0x19010a</div><div class='del'>-#define CPSW_VERSION_2		0x19010c</div><div class='del'>-#define CPSW_VERSION_3		0x19010f</div><div class='del'>-#define CPSW_VERSION_4		0x190112</div><div class='del'>-</div><div class='del'>-#define HOST_PORT_NUM		0</div><div class='del'>-#define CPSW_ALE_PORTS_NUM	3</div><div class='del'>-#define SLIVER_SIZE		0x40</div><div class='del'>-</div><div class='del'>-#define CPSW1_HOST_PORT_OFFSET	0x028</div><div class='del'>-#define CPSW1_SLAVE_OFFSET	0x050</div><div class='del'>-#define CPSW1_SLAVE_SIZE	0x040</div><div class='del'>-#define CPSW1_CPDMA_OFFSET	0x100</div><div class='del'>-#define CPSW1_STATERAM_OFFSET	0x200</div><div class='del'>-#define CPSW1_HW_STATS		0x400</div><div class='del'>-#define CPSW1_CPTS_OFFSET	0x500</div><div class='del'>-#define CPSW1_ALE_OFFSET	0x600</div><div class='del'>-#define CPSW1_SLIVER_OFFSET	0x700</div><div class='del'>-</div><div class='del'>-#define CPSW2_HOST_PORT_OFFSET	0x108</div><div class='del'>-#define CPSW2_SLAVE_OFFSET	0x200</div><div class='del'>-#define CPSW2_SLAVE_SIZE	0x100</div><div class='del'>-#define CPSW2_CPDMA_OFFSET	0x800</div><div class='del'>-#define CPSW2_HW_STATS		0x900</div><div class='del'>-#define CPSW2_STATERAM_OFFSET	0xa00</div><div class='del'>-#define CPSW2_CPTS_OFFSET	0xc00</div><div class='del'>-#define CPSW2_ALE_OFFSET	0xd00</div><div class='del'>-#define CPSW2_SLIVER_OFFSET	0xd80</div><div class='del'>-#define CPSW2_BD_OFFSET		0x2000</div><div class='del'>-</div><div class='del'>-#define CPDMA_RXTHRESH		0x0c0</div><div class='del'>-#define CPDMA_RXFREE		0x0e0</div><div class='del'>-#define CPDMA_TXHDP		0x00</div><div class='del'>-#define CPDMA_RXHDP		0x20</div><div class='del'>-#define CPDMA_TXCP		0x40</div><div class='del'>-#define CPDMA_RXCP		0x60</div><div class='del'>-</div><div class='del'>-#define CPSW_POLL_WEIGHT	64</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP_HDR_SIZE		4</div><div class='del'>-#define CPSW_MIN_PACKET_SIZE	(VLAN_ETH_ZLEN)</div><div class='del'>-#define CPSW_MAX_PACKET_SIZE	(VLAN_ETH_FRAME_LEN +\</div><div class='del'>-				 ETH_FCS_LEN +\</div><div class='del'>-				 CPSW_RX_VLAN_ENCAP_HDR_SIZE)</div><div class='del'>-</div><div class='del'>-#define RX_PRIORITY_MAPPING	0x76543210</div><div class='del'>-#define TX_PRIORITY_MAPPING	0x33221100</div><div class='del'>-#define CPDMA_TX_PRIORITY_MAP	0x76543210</div><div class='del'>-</div><div class='del'>-#define CPSW_VLAN_AWARE		BIT(1)</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP	BIT(2)</div><div class='del'>-#define CPSW_ALE_VLAN_AWARE	1</div><div class='del'>-</div><div class='del'>-#define CPSW_FIFO_NORMAL_MODE		(0 &lt;&lt; 16)</div><div class='del'>-#define CPSW_FIFO_DUAL_MAC_MODE		(1 &lt;&lt; 16)</div><div class='del'>-#define CPSW_FIFO_RATE_LIMIT_MODE	(2 &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-#define CPSW_INTPACEEN		(0x3f &lt;&lt; 16)</div><div class='del'>-#define CPSW_INTPRESCALE_MASK	(0x7FF &lt;&lt; 0)</div><div class='del'>-#define CPSW_CMINTMAX_CNT	63</div><div class='del'>-#define CPSW_CMINTMIN_CNT	2</div><div class='del'>-#define CPSW_CMINTMAX_INTVL	(1000 / CPSW_CMINTMIN_CNT)</div><div class='del'>-#define CPSW_CMINTMIN_INTVL	((1000 / CPSW_CMINTMAX_CNT) + 1)</div><div class='del'>-</div><div class='del'>-#define cpsw_slave_index(cpsw, priv)				\</div><div class='del'>-		((cpsw-&gt;data.dual_emac) ? priv-&gt;emac_port :	\</div><div class='del'>-		cpsw-&gt;data.active_slave)</div><div class='del'>-#define IRQ_NUM			2</div><div class='del'>-#define CPSW_MAX_QUEUES		8</div><div class='del'>-#define CPSW_CPDMA_DESCS_POOL_SIZE_DEFAULT 256</div><div class='del'>-#define CPSW_FIFO_QUEUE_TYPE_SHIFT	16</div><div class='del'>-#define CPSW_FIFO_SHAPE_EN_SHIFT	16</div><div class='del'>-#define CPSW_FIFO_RATE_EN_SHIFT		20</div><div class='del'>-#define CPSW_TC_NUM			4</div><div class='del'>-#define CPSW_FIFO_SHAPERS_NUM		(CPSW_TC_NUM - 1)</div><div class='del'>-#define CPSW_PCT_MASK			0x7f</div><div class='del'>-</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP_HDR_PRIO_SHIFT	29</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP_HDR_PRIO_MSK		GENMASK(2, 0)</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP_HDR_VID_SHIFT	16</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP_HDR_PKT_TYPE_SHIFT	8</div><div class='del'>-#define CPSW_RX_VLAN_ENCAP_HDR_PKT_TYPE_MSK	GENMASK(1, 0)</div><div class='del'>-enum {</div><div class='del'>-	CPSW_RX_VLAN_ENCAP_HDR_PKT_VLAN_TAG = 0,</div><div class='del'>-	CPSW_RX_VLAN_ENCAP_HDR_PKT_RESERV,</div><div class='del'>-	CPSW_RX_VLAN_ENCAP_HDR_PKT_PRIO_TAG,</div><div class='del'>-	CPSW_RX_VLAN_ENCAP_HDR_PKT_UNTAG,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int debug_level;</div><div class='ctx'> module_param(debug_level, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(debug_level, "cpsw debug level (NETIF_MSG bits)");</div><div class='hunk'>@@ -192,369 +60,6 @@ static int descs_pool_size = CPSW_CPDMA_DESCS_POOL_SIZE_DEFAULT;</div><div class='ctx'> module_param(descs_pool_size, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(descs_pool_size, "Number of CPDMA CPPI descriptors in pool");</div><div class='ctx'> </div><div class='del'>-struct cpsw_wr_regs {</div><div class='del'>-	u32	id_ver;</div><div class='del'>-	u32	soft_reset;</div><div class='del'>-	u32	control;</div><div class='del'>-	u32	int_control;</div><div class='del'>-	u32	rx_thresh_en;</div><div class='del'>-	u32	rx_en;</div><div class='del'>-	u32	tx_en;</div><div class='del'>-	u32	misc_en;</div><div class='del'>-	u32	mem_allign1[8];</div><div class='del'>-	u32	rx_thresh_stat;</div><div class='del'>-	u32	rx_stat;</div><div class='del'>-	u32	tx_stat;</div><div class='del'>-	u32	misc_stat;</div><div class='del'>-	u32	mem_allign2[8];</div><div class='del'>-	u32	rx_imax;</div><div class='del'>-	u32	tx_imax;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_ss_regs {</div><div class='del'>-	u32	id_ver;</div><div class='del'>-	u32	control;</div><div class='del'>-	u32	soft_reset;</div><div class='del'>-	u32	stat_port_en;</div><div class='del'>-	u32	ptype;</div><div class='del'>-	u32	soft_idle;</div><div class='del'>-	u32	thru_rate;</div><div class='del'>-	u32	gap_thresh;</div><div class='del'>-	u32	tx_start_wds;</div><div class='del'>-	u32	flow_control;</div><div class='del'>-	u32	vlan_ltype;</div><div class='del'>-	u32	ts_ltype;</div><div class='del'>-	u32	dlr_ltype;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CPSW_PORT_V1 */</div><div class='del'>-#define CPSW1_MAX_BLKS      0x00 /* Maximum FIFO Blocks */</div><div class='del'>-#define CPSW1_BLK_CNT       0x04 /* FIFO Block Usage Count (Read Only) */</div><div class='del'>-#define CPSW1_TX_IN_CTL     0x08 /* Transmit FIFO Control */</div><div class='del'>-#define CPSW1_PORT_VLAN     0x0c /* VLAN Register */</div><div class='del'>-#define CPSW1_TX_PRI_MAP    0x10 /* Tx Header Priority to Switch Pri Mapping */</div><div class='del'>-#define CPSW1_TS_CTL        0x14 /* Time Sync Control */</div><div class='del'>-#define CPSW1_TS_SEQ_LTYPE  0x18 /* Time Sync Sequence ID Offset and Msg Type */</div><div class='del'>-#define CPSW1_TS_VLAN       0x1c /* Time Sync VLAN1 and VLAN2 */</div><div class='del'>-</div><div class='del'>-/* CPSW_PORT_V2 */</div><div class='del'>-#define CPSW2_CONTROL       0x00 /* Control Register */</div><div class='del'>-#define CPSW2_MAX_BLKS      0x08 /* Maximum FIFO Blocks */</div><div class='del'>-#define CPSW2_BLK_CNT       0x0c /* FIFO Block Usage Count (Read Only) */</div><div class='del'>-#define CPSW2_TX_IN_CTL     0x10 /* Transmit FIFO Control */</div><div class='del'>-#define CPSW2_PORT_VLAN     0x14 /* VLAN Register */</div><div class='del'>-#define CPSW2_TX_PRI_MAP    0x18 /* Tx Header Priority to Switch Pri Mapping */</div><div class='del'>-#define CPSW2_TS_SEQ_MTYPE  0x1c /* Time Sync Sequence ID Offset and Msg Type */</div><div class='del'>-</div><div class='del'>-/* CPSW_PORT_V1 and V2 */</div><div class='del'>-#define SA_LO               0x20 /* CPGMAC_SL Source Address Low */</div><div class='del'>-#define SA_HI               0x24 /* CPGMAC_SL Source Address High */</div><div class='del'>-#define SEND_PERCENT        0x28 /* Transmit Queue Send Percentages */</div><div class='del'>-</div><div class='del'>-/* CPSW_PORT_V2 only */</div><div class='del'>-#define RX_DSCP_PRI_MAP0    0x30 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP1    0x34 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP2    0x38 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP3    0x3c /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP4    0x40 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP5    0x44 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP6    0x48 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-#define RX_DSCP_PRI_MAP7    0x4c /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='del'>-</div><div class='del'>-/* Bit definitions for the CPSW2_CONTROL register */</div><div class='del'>-#define PASS_PRI_TAGGED     BIT(24) /* Pass Priority Tagged */</div><div class='del'>-#define VLAN_LTYPE2_EN      BIT(21) /* VLAN LTYPE 2 enable */</div><div class='del'>-#define VLAN_LTYPE1_EN      BIT(20) /* VLAN LTYPE 1 enable */</div><div class='del'>-#define DSCP_PRI_EN         BIT(16) /* DSCP Priority Enable */</div><div class='del'>-#define TS_107              BIT(15) /* Tyme Sync Dest IP Address 107 */</div><div class='del'>-#define TS_320              BIT(14) /* Time Sync Dest Port 320 enable */</div><div class='del'>-#define TS_319              BIT(13) /* Time Sync Dest Port 319 enable */</div><div class='del'>-#define TS_132              BIT(12) /* Time Sync Dest IP Addr 132 enable */</div><div class='del'>-#define TS_131              BIT(11) /* Time Sync Dest IP Addr 131 enable */</div><div class='del'>-#define TS_130              BIT(10) /* Time Sync Dest IP Addr 130 enable */</div><div class='del'>-#define TS_129              BIT(9)  /* Time Sync Dest IP Addr 129 enable */</div><div class='del'>-#define TS_TTL_NONZERO      BIT(8)  /* Time Sync Time To Live Non-zero enable */</div><div class='del'>-#define TS_ANNEX_F_EN       BIT(6)  /* Time Sync Annex F enable */</div><div class='del'>-#define TS_ANNEX_D_EN       BIT(4)  /* Time Sync Annex D enable */</div><div class='del'>-#define TS_LTYPE2_EN        BIT(3)  /* Time Sync LTYPE 2 enable */</div><div class='del'>-#define TS_LTYPE1_EN        BIT(2)  /* Time Sync LTYPE 1 enable */</div><div class='del'>-#define TS_TX_EN            BIT(1)  /* Time Sync Transmit Enable */</div><div class='del'>-#define TS_RX_EN            BIT(0)  /* Time Sync Receive Enable */</div><div class='del'>-</div><div class='del'>-#define CTRL_V2_TS_BITS \</div><div class='del'>-	(TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\</div><div class='del'>-	 TS_TTL_NONZERO  | TS_ANNEX_D_EN | TS_LTYPE1_EN | VLAN_LTYPE1_EN)</div><div class='del'>-</div><div class='del'>-#define CTRL_V2_ALL_TS_MASK (CTRL_V2_TS_BITS | TS_TX_EN | TS_RX_EN)</div><div class='del'>-#define CTRL_V2_TX_TS_BITS  (CTRL_V2_TS_BITS | TS_TX_EN)</div><div class='del'>-#define CTRL_V2_RX_TS_BITS  (CTRL_V2_TS_BITS | TS_RX_EN)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CTRL_V3_TS_BITS \</div><div class='del'>-	(TS_107 | TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\</div><div class='del'>-	 TS_TTL_NONZERO | TS_ANNEX_F_EN | TS_ANNEX_D_EN |\</div><div class='del'>-	 TS_LTYPE1_EN | VLAN_LTYPE1_EN)</div><div class='del'>-</div><div class='del'>-#define CTRL_V3_ALL_TS_MASK (CTRL_V3_TS_BITS | TS_TX_EN | TS_RX_EN)</div><div class='del'>-#define CTRL_V3_TX_TS_BITS  (CTRL_V3_TS_BITS | TS_TX_EN)</div><div class='del'>-#define CTRL_V3_RX_TS_BITS  (CTRL_V3_TS_BITS | TS_RX_EN)</div><div class='del'>-</div><div class='del'>-/* Bit definitions for the CPSW2_TS_SEQ_MTYPE register */</div><div class='del'>-#define TS_SEQ_ID_OFFSET_SHIFT   (16)    /* Time Sync Sequence ID Offset */</div><div class='del'>-#define TS_SEQ_ID_OFFSET_MASK    (0x3f)</div><div class='del'>-#define TS_MSG_TYPE_EN_SHIFT     (0)     /* Time Sync Message Type Enable */</div><div class='del'>-#define TS_MSG_TYPE_EN_MASK      (0xffff)</div><div class='del'>-</div><div class='del'>-/* The PTP event messages - Sync, Delay_Req, Pdelay_Req, and Pdelay_Resp. */</div><div class='del'>-#define EVENT_MSG_BITS ((1&lt;&lt;0) | (1&lt;&lt;1) | (1&lt;&lt;2) | (1&lt;&lt;3))</div><div class='del'>-</div><div class='del'>-/* Bit definitions for the CPSW1_TS_CTL register */</div><div class='del'>-#define CPSW_V1_TS_RX_EN		BIT(0)</div><div class='del'>-#define CPSW_V1_TS_TX_EN		BIT(4)</div><div class='del'>-#define CPSW_V1_MSG_TYPE_OFS		16</div><div class='del'>-</div><div class='del'>-/* Bit definitions for the CPSW1_TS_SEQ_LTYPE register */</div><div class='del'>-#define CPSW_V1_SEQ_ID_OFS_SHIFT	16</div><div class='del'>-</div><div class='del'>-#define CPSW_MAX_BLKS_TX		15</div><div class='del'>-#define CPSW_MAX_BLKS_TX_SHIFT		4</div><div class='del'>-#define CPSW_MAX_BLKS_RX		5</div><div class='del'>-</div><div class='del'>-struct cpsw_host_regs {</div><div class='del'>-	u32	max_blks;</div><div class='del'>-	u32	blk_cnt;</div><div class='del'>-	u32	tx_in_ctl;</div><div class='del'>-	u32	port_vlan;</div><div class='del'>-	u32	tx_pri_map;</div><div class='del'>-	u32	cpdma_tx_pri_map;</div><div class='del'>-	u32	cpdma_rx_chan_map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_sliver_regs {</div><div class='del'>-	u32	id_ver;</div><div class='del'>-	u32	mac_control;</div><div class='del'>-	u32	mac_status;</div><div class='del'>-	u32	soft_reset;</div><div class='del'>-	u32	rx_maxlen;</div><div class='del'>-	u32	__reserved_0;</div><div class='del'>-	u32	rx_pause;</div><div class='del'>-	u32	tx_pause;</div><div class='del'>-	u32	__reserved_1;</div><div class='del'>-	u32	rx_pri_map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_hw_stats {</div><div class='del'>-	u32	rxgoodframes;</div><div class='del'>-	u32	rxbroadcastframes;</div><div class='del'>-	u32	rxmulticastframes;</div><div class='del'>-	u32	rxpauseframes;</div><div class='del'>-	u32	rxcrcerrors;</div><div class='del'>-	u32	rxaligncodeerrors;</div><div class='del'>-	u32	rxoversizedframes;</div><div class='del'>-	u32	rxjabberframes;</div><div class='del'>-	u32	rxundersizedframes;</div><div class='del'>-	u32	rxfragments;</div><div class='del'>-	u32	__pad_0[2];</div><div class='del'>-	u32	rxoctets;</div><div class='del'>-	u32	txgoodframes;</div><div class='del'>-	u32	txbroadcastframes;</div><div class='del'>-	u32	txmulticastframes;</div><div class='del'>-	u32	txpauseframes;</div><div class='del'>-	u32	txdeferredframes;</div><div class='del'>-	u32	txcollisionframes;</div><div class='del'>-	u32	txsinglecollframes;</div><div class='del'>-	u32	txmultcollframes;</div><div class='del'>-	u32	txexcessivecollisions;</div><div class='del'>-	u32	txlatecollisions;</div><div class='del'>-	u32	txunderrun;</div><div class='del'>-	u32	txcarriersenseerrors;</div><div class='del'>-	u32	txoctets;</div><div class='del'>-	u32	octetframes64;</div><div class='del'>-	u32	octetframes65t127;</div><div class='del'>-	u32	octetframes128t255;</div><div class='del'>-	u32	octetframes256t511;</div><div class='del'>-	u32	octetframes512t1023;</div><div class='del'>-	u32	octetframes1024tup;</div><div class='del'>-	u32	netoctets;</div><div class='del'>-	u32	rxsofoverruns;</div><div class='del'>-	u32	rxmofoverruns;</div><div class='del'>-	u32	rxdmaoverruns;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_slave_data {</div><div class='del'>-	struct device_node *phy_node;</div><div class='del'>-	char		phy_id[MII_BUS_ID_SIZE];</div><div class='del'>-	int		phy_if;</div><div class='del'>-	u8		mac_addr[ETH_ALEN];</div><div class='del'>-	u16		dual_emac_res_vlan;	/* Reserved VLAN for DualEMAC */</div><div class='del'>-	struct phy	*ifphy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_platform_data {</div><div class='del'>-	struct cpsw_slave_data	*slave_data;</div><div class='del'>-	u32	ss_reg_ofs;	/* Subsystem control register offset */</div><div class='del'>-	u32	channels;	/* number of cpdma channels (symmetric) */</div><div class='del'>-	u32	slaves;		/* number of slave cpgmac ports */</div><div class='del'>-	u32	active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */</div><div class='del'>-	u32	ale_entries;	/* ale table size */</div><div class='del'>-	u32	bd_ram_size;  /*buffer descriptor ram size */</div><div class='del'>-	u32	mac_control;	/* Mac control register */</div><div class='del'>-	u16	default_vlan;	/* Def VLAN for ALE lookup in VLAN aware mode*/</div><div class='del'>-	bool	dual_emac;	/* Enable Dual EMAC mode */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_slave {</div><div class='del'>-	void __iomem			*regs;</div><div class='del'>-	struct cpsw_sliver_regs __iomem	*sliver;</div><div class='del'>-	int				slave_num;</div><div class='del'>-	u32				mac_control;</div><div class='del'>-	struct cpsw_slave_data		*data;</div><div class='del'>-	struct phy_device		*phy;</div><div class='del'>-	struct net_device		*ndev;</div><div class='del'>-	u32				port_vlan;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline u32 slave_read(struct cpsw_slave *slave, u32 offset)</div><div class='del'>-{</div><div class='del'>-	return readl_relaxed(slave-&gt;regs + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void slave_write(struct cpsw_slave *slave, u32 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-	writel_relaxed(val, slave-&gt;regs + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct cpsw_vector {</div><div class='del'>-	struct cpdma_chan *ch;</div><div class='del'>-	int budget;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_common {</div><div class='del'>-	struct device			*dev;</div><div class='del'>-	struct cpsw_platform_data	data;</div><div class='del'>-	struct napi_struct		napi_rx;</div><div class='del'>-	struct napi_struct		napi_tx;</div><div class='del'>-	struct cpsw_ss_regs __iomem	*regs;</div><div class='del'>-	struct cpsw_wr_regs __iomem	*wr_regs;</div><div class='del'>-	u8 __iomem			*hw_stats;</div><div class='del'>-	struct cpsw_host_regs __iomem	*host_port_regs;</div><div class='del'>-	u32				version;</div><div class='del'>-	u32				coal_intvl;</div><div class='del'>-	u32				bus_freq_mhz;</div><div class='del'>-	int				rx_packet_max;</div><div class='del'>-	struct cpsw_slave		*slaves;</div><div class='del'>-	struct cpdma_ctlr		*dma;</div><div class='del'>-	struct cpsw_vector		txv[CPSW_MAX_QUEUES];</div><div class='del'>-	struct cpsw_vector		rxv[CPSW_MAX_QUEUES];</div><div class='del'>-	struct cpsw_ale			*ale;</div><div class='del'>-	bool				quirk_irq;</div><div class='del'>-	bool				rx_irq_disabled;</div><div class='del'>-	bool				tx_irq_disabled;</div><div class='del'>-	u32 irqs_table[IRQ_NUM];</div><div class='del'>-	struct cpts			*cpts;</div><div class='del'>-	int				rx_ch_num, tx_ch_num;</div><div class='del'>-	int				speed;</div><div class='del'>-	int				usage_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_priv {</div><div class='del'>-	struct net_device		*ndev;</div><div class='del'>-	struct device			*dev;</div><div class='del'>-	u32				msg_enable;</div><div class='del'>-	u8				mac_addr[ETH_ALEN];</div><div class='del'>-	bool				rx_pause;</div><div class='del'>-	bool				tx_pause;</div><div class='del'>-	bool				mqprio_hw;</div><div class='del'>-	int				fifo_bw[CPSW_TC_NUM];</div><div class='del'>-	int				shp_cfg_speed;</div><div class='del'>-	int				tx_ts_enabled;</div><div class='del'>-	int				rx_ts_enabled;</div><div class='del'>-	u32 emac_port;</div><div class='del'>-	struct cpsw_common *cpsw;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpsw_stats {</div><div class='del'>-	char stat_string[ETH_GSTRING_LEN];</div><div class='del'>-	int type;</div><div class='del'>-	int sizeof_stat;</div><div class='del'>-	int stat_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CPSW_STATS,</div><div class='del'>-	CPDMA_RX_STATS,</div><div class='del'>-	CPDMA_TX_STATS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CPSW_STAT(m)		CPSW_STATS,				\</div><div class='del'>-				FIELD_SIZEOF(struct cpsw_hw_stats, m), \</div><div class='del'>-				offsetof(struct cpsw_hw_stats, m)</div><div class='del'>-#define CPDMA_RX_STAT(m)	CPDMA_RX_STATS,				   \</div><div class='del'>-				FIELD_SIZEOF(struct cpdma_chan_stats, m), \</div><div class='del'>-				offsetof(struct cpdma_chan_stats, m)</div><div class='del'>-#define CPDMA_TX_STAT(m)	CPDMA_TX_STATS,				   \</div><div class='del'>-				FIELD_SIZEOF(struct cpdma_chan_stats, m), \</div><div class='del'>-				offsetof(struct cpdma_chan_stats, m)</div><div class='del'>-</div><div class='del'>-static const struct cpsw_stats cpsw_gstrings_stats[] = {</div><div class='del'>-	{ "Good Rx Frames", CPSW_STAT(rxgoodframes) },</div><div class='del'>-	{ "Broadcast Rx Frames", CPSW_STAT(rxbroadcastframes) },</div><div class='del'>-	{ "Multicast Rx Frames", CPSW_STAT(rxmulticastframes) },</div><div class='del'>-	{ "Pause Rx Frames", CPSW_STAT(rxpauseframes) },</div><div class='del'>-	{ "Rx CRC Errors", CPSW_STAT(rxcrcerrors) },</div><div class='del'>-	{ "Rx Align/Code Errors", CPSW_STAT(rxaligncodeerrors) },</div><div class='del'>-	{ "Oversize Rx Frames", CPSW_STAT(rxoversizedframes) },</div><div class='del'>-	{ "Rx Jabbers", CPSW_STAT(rxjabberframes) },</div><div class='del'>-	{ "Undersize (Short) Rx Frames", CPSW_STAT(rxundersizedframes) },</div><div class='del'>-	{ "Rx Fragments", CPSW_STAT(rxfragments) },</div><div class='del'>-	{ "Rx Octets", CPSW_STAT(rxoctets) },</div><div class='del'>-	{ "Good Tx Frames", CPSW_STAT(txgoodframes) },</div><div class='del'>-	{ "Broadcast Tx Frames", CPSW_STAT(txbroadcastframes) },</div><div class='del'>-	{ "Multicast Tx Frames", CPSW_STAT(txmulticastframes) },</div><div class='del'>-	{ "Pause Tx Frames", CPSW_STAT(txpauseframes) },</div><div class='del'>-	{ "Deferred Tx Frames", CPSW_STAT(txdeferredframes) },</div><div class='del'>-	{ "Collisions", CPSW_STAT(txcollisionframes) },</div><div class='del'>-	{ "Single Collision Tx Frames", CPSW_STAT(txsinglecollframes) },</div><div class='del'>-	{ "Multiple Collision Tx Frames", CPSW_STAT(txmultcollframes) },</div><div class='del'>-	{ "Excessive Collisions", CPSW_STAT(txexcessivecollisions) },</div><div class='del'>-	{ "Late Collisions", CPSW_STAT(txlatecollisions) },</div><div class='del'>-	{ "Tx Underrun", CPSW_STAT(txunderrun) },</div><div class='del'>-	{ "Carrier Sense Errors", CPSW_STAT(txcarriersenseerrors) },</div><div class='del'>-	{ "Tx Octets", CPSW_STAT(txoctets) },</div><div class='del'>-	{ "Rx + Tx 64 Octet Frames", CPSW_STAT(octetframes64) },</div><div class='del'>-	{ "Rx + Tx 65-127 Octet Frames", CPSW_STAT(octetframes65t127) },</div><div class='del'>-	{ "Rx + Tx 128-255 Octet Frames", CPSW_STAT(octetframes128t255) },</div><div class='del'>-	{ "Rx + Tx 256-511 Octet Frames", CPSW_STAT(octetframes256t511) },</div><div class='del'>-	{ "Rx + Tx 512-1023 Octet Frames", CPSW_STAT(octetframes512t1023) },</div><div class='del'>-	{ "Rx + Tx 1024-Up Octet Frames", CPSW_STAT(octetframes1024tup) },</div><div class='del'>-	{ "Net Octets", CPSW_STAT(netoctets) },</div><div class='del'>-	{ "Rx Start of Frame Overruns", CPSW_STAT(rxsofoverruns) },</div><div class='del'>-	{ "Rx Middle of Frame Overruns", CPSW_STAT(rxmofoverruns) },</div><div class='del'>-	{ "Rx DMA Overruns", CPSW_STAT(rxdmaoverruns) },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct cpsw_stats cpsw_gstrings_ch_stats[] = {</div><div class='del'>-	{ "head_enqueue", CPDMA_RX_STAT(head_enqueue) },</div><div class='del'>-	{ "tail_enqueue", CPDMA_RX_STAT(tail_enqueue) },</div><div class='del'>-	{ "pad_enqueue", CPDMA_RX_STAT(pad_enqueue) },</div><div class='del'>-	{ "misqueued", CPDMA_RX_STAT(misqueued) },</div><div class='del'>-	{ "desc_alloc_fail", CPDMA_RX_STAT(desc_alloc_fail) },</div><div class='del'>-	{ "pad_alloc_fail", CPDMA_RX_STAT(pad_alloc_fail) },</div><div class='del'>-	{ "runt_receive_buf", CPDMA_RX_STAT(runt_receive_buff) },</div><div class='del'>-	{ "runt_transmit_buf", CPDMA_RX_STAT(runt_transmit_buff) },</div><div class='del'>-	{ "empty_dequeue", CPDMA_RX_STAT(empty_dequeue) },</div><div class='del'>-	{ "busy_dequeue", CPDMA_RX_STAT(busy_dequeue) },</div><div class='del'>-	{ "good_dequeue", CPDMA_RX_STAT(good_dequeue) },</div><div class='del'>-	{ "requeue", CPDMA_RX_STAT(requeue) },</div><div class='del'>-	{ "teardown_dequeue", CPDMA_RX_STAT(teardown_dequeue) },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CPSW_STATS_COMMON_LEN	ARRAY_SIZE(cpsw_gstrings_stats)</div><div class='del'>-#define CPSW_STATS_CH_LEN	ARRAY_SIZE(cpsw_gstrings_ch_stats)</div><div class='del'>-</div><div class='del'>-#define ndev_to_cpsw(ndev) (((struct cpsw_priv *)netdev_priv(ndev))-&gt;cpsw)</div><div class='del'>-#define napi_to_cpsw(napi)	container_of(napi, struct cpsw_common, napi)</div><div class='ctx'> #define for_each_slave(priv, func, arg...)				\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		struct cpsw_slave *slave;				\</div><div class='hunk'>@@ -572,11 +77,6 @@ static const struct cpsw_stats cpsw_gstrings_ch_stats[] = {</div><div class='ctx'> static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,</div><div class='ctx'> 				    __be16 proto, u16 vid);</div><div class='ctx'> </div><div class='del'>-static inline int cpsw_get_slave_port(u32 slave_num)</div><div class='del'>-{</div><div class='del'>-	return slave_num + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cpsw_set_promiscious(struct net_device *ndev, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='hunk'>@@ -653,13 +153,6 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct addr_sync_ctx {</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	const u8 *addr;		/* address to be synched */</div><div class='del'>-	int consumed;		/* number of address instances */</div><div class='del'>-	int flush;		/* flush flag */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * cpsw_set_mc - adds multicast entry to the table if it's not added or deletes</div><div class='ctx'>  * if it's not deleted</div><div class='hunk'>@@ -800,12 +293,17 @@ static int cpsw_purge_all_mc(struct net_device *ndev, const u8 *addr, int num)</div><div class='ctx'> </div><div class='ctx'> static void cpsw_ndo_set_rx_mode(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_port = -1;</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;data.dual_emac)</div><div class='add'>+		slave_port = priv-&gt;emac_port + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (ndev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		/* Enable promiscuous mode */</div><div class='ctx'> 		cpsw_set_promiscious(ndev, true);</div><div class='del'>-		cpsw_ale_set_allmulti(cpsw-&gt;ale, IFF_ALLMULTI);</div><div class='add'>+		cpsw_ale_set_allmulti(cpsw-&gt;ale, IFF_ALLMULTI, slave_port);</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Disable promiscuous mode */</div><div class='hunk'>@@ -813,14 +311,15 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Restore allmulti on vlans if necessary */</div><div class='del'>-	cpsw_ale_set_allmulti(cpsw-&gt;ale, ndev-&gt;flags &amp; IFF_ALLMULTI);</div><div class='add'>+	cpsw_ale_set_allmulti(cpsw-&gt;ale,</div><div class='add'>+			      ndev-&gt;flags &amp; IFF_ALLMULTI, slave_port);</div><div class='ctx'> </div><div class='ctx'> 	/* add/remove mcast address either for real netdev or for vlan */</div><div class='ctx'> 	__hw_addr_ref_sync_dev(&amp;ndev-&gt;mc, ndev, cpsw_add_mc_addr,</div><div class='ctx'> 			       cpsw_del_mc_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpsw_intr_enable(struct cpsw_common *cpsw)</div><div class='add'>+void cpsw_intr_enable(struct cpsw_common *cpsw)</div><div class='ctx'> {</div><div class='ctx'> 	writel_relaxed(0xFF, &amp;cpsw-&gt;wr_regs-&gt;tx_en);</div><div class='ctx'> 	writel_relaxed(0xFF, &amp;cpsw-&gt;wr_regs-&gt;rx_en);</div><div class='hunk'>@@ -829,7 +328,7 @@ static void cpsw_intr_enable(struct cpsw_common *cpsw)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpsw_intr_disable(struct cpsw_common *cpsw)</div><div class='add'>+void cpsw_intr_disable(struct cpsw_common *cpsw)</div><div class='ctx'> {</div><div class='ctx'> 	writel_relaxed(0, &amp;cpsw-&gt;wr_regs-&gt;tx_en);</div><div class='ctx'> 	writel_relaxed(0, &amp;cpsw-&gt;wr_regs-&gt;rx_en);</div><div class='hunk'>@@ -838,7 +337,7 @@ static void cpsw_intr_disable(struct cpsw_common *cpsw)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpsw_tx_handler(void *token, int len, int status)</div><div class='add'>+void cpsw_tx_handler(void *token, int len, int status)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue	*txq;</div><div class='ctx'> 	struct sk_buff		*skb = token;</div><div class='hunk'>@@ -970,11 +469,9 @@ requeue:</div><div class='ctx'> 		dev_kfree_skb_any(new_skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpsw_split_res(struct net_device *ndev)</div><div class='add'>+void cpsw_split_res(struct cpsw_common *cpsw)</div><div class='ctx'> {</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	u32 consumed_rate = 0, bigest_rate = 0;</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='ctx'> 	struct cpsw_vector *txv = cpsw-&gt;txv;</div><div class='ctx'> 	int i, ch_weight, rlim_ch_num = 0;</div><div class='ctx'> 	int budget, bigest_rate_ch = 0;</div><div class='hunk'>@@ -1254,29 +751,32 @@ static void _cpsw_adjust_link(struct cpsw_slave *slave,</div><div class='ctx'> 	slave_port = cpsw_get_slave_port(slave-&gt;slave_num);</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;link) {</div><div class='del'>-		mac_control = cpsw-&gt;data.mac_control;</div><div class='del'>-</div><div class='del'>-		/* enable forwarding */</div><div class='del'>-		cpsw_ale_control_set(cpsw-&gt;ale, slave_port,</div><div class='del'>-				     ALE_PORT_STATE, ALE_PORT_STATE_FORWARD);</div><div class='add'>+		mac_control = CPSW_SL_CTL_GMII_EN;</div><div class='ctx'> </div><div class='ctx'> 		if (phy-&gt;speed == 1000)</div><div class='del'>-			mac_control |= BIT(7);	/* GIGABITEN	*/</div><div class='add'>+			mac_control |= CPSW_SL_CTL_GIG;</div><div class='ctx'> 		if (phy-&gt;duplex)</div><div class='del'>-			mac_control |= BIT(0);	/* FULLDUPLEXEN	*/</div><div class='add'>+			mac_control |= CPSW_SL_CTL_FULLDUPLEX;</div><div class='ctx'> </div><div class='ctx'> 		/* set speed_in input in case RMII mode is used in 100Mbps */</div><div class='ctx'> 		if (phy-&gt;speed == 100)</div><div class='del'>-			mac_control |= BIT(15);</div><div class='add'>+			mac_control |= CPSW_SL_CTL_IFCTL_A;</div><div class='ctx'> 		/* in band mode only works in 10Mbps RGMII mode */</div><div class='ctx'> 		else if ((phy-&gt;speed == 10) &amp;&amp; phy_interface_is_rgmii(phy))</div><div class='del'>-			mac_control |= BIT(18); /* In Band mode */</div><div class='add'>+			mac_control |= CPSW_SL_CTL_EXT_EN; /* In Band mode */</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;rx_pause)</div><div class='del'>-			mac_control |= BIT(3);</div><div class='add'>+			mac_control |= CPSW_SL_CTL_RX_FLOW_EN;</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;tx_pause)</div><div class='del'>-			mac_control |= BIT(4);</div><div class='add'>+			mac_control |= CPSW_SL_CTL_TX_FLOW_EN;</div><div class='add'>+</div><div class='add'>+		if (mac_control != slave-&gt;mac_control)</div><div class='add'>+			cpsw_sl_ctl_set(slave-&gt;mac_sl, mac_control);</div><div class='add'>+</div><div class='add'>+		/* enable forwarding */</div><div class='add'>+		cpsw_ale_control_set(cpsw-&gt;ale, slave_port,</div><div class='add'>+				     ALE_PORT_STATE, ALE_PORT_STATE_FORWARD);</div><div class='ctx'> </div><div class='ctx'> 		*link = true;</div><div class='ctx'> </div><div class='hunk'>@@ -1290,12 +790,14 @@ static void _cpsw_adjust_link(struct cpsw_slave *slave,</div><div class='ctx'> 		/* disable forwarding */</div><div class='ctx'> 		cpsw_ale_control_set(cpsw-&gt;ale, slave_port,</div><div class='ctx'> 				     ALE_PORT_STATE, ALE_PORT_STATE_DISABLE);</div><div class='add'>+</div><div class='add'>+		cpsw_sl_wait_for_idle(slave-&gt;mac_sl, 100);</div><div class='add'>+</div><div class='add'>+		cpsw_sl_ctl_reset(slave-&gt;mac_sl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mac_control != slave-&gt;mac_control) {</div><div class='add'>+	if (mac_control != slave-&gt;mac_control)</div><div class='ctx'> 		phy_print_status(phy);</div><div class='del'>-		writel_relaxed(mac_control, &amp;slave-&gt;sliver-&gt;mac_control);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	slave-&gt;mac_control = mac_control;</div><div class='ctx'> }</div><div class='hunk'>@@ -1348,7 +850,7 @@ static void cpsw_adjust_link(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (link) {</div><div class='ctx'> 		if (cpsw_need_resplit(cpsw))</div><div class='del'>-			cpsw_split_res(ndev);</div><div class='add'>+			cpsw_split_res(cpsw);</div><div class='ctx'> </div><div class='ctx'> 		netif_carrier_on(ndev);</div><div class='ctx'> 		if (netif_running(ndev))</div><div class='hunk'>@@ -1359,167 +861,6 @@ static void cpsw_adjust_link(struct net_device *ndev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpsw_get_coalesce(struct net_device *ndev,</div><div class='del'>-				struct ethtool_coalesce *coal)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	coal-&gt;rx_coalesce_usecs = cpsw-&gt;coal_intvl;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_set_coalesce(struct net_device *ndev,</div><div class='del'>-				struct ethtool_coalesce *coal)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	u32 int_ctrl;</div><div class='del'>-	u32 num_interrupts = 0;</div><div class='del'>-	u32 prescale = 0;</div><div class='del'>-	u32 addnl_dvdr = 1;</div><div class='del'>-	u32 coal_intvl = 0;</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-</div><div class='del'>-	coal_intvl = coal-&gt;rx_coalesce_usecs;</div><div class='del'>-</div><div class='del'>-	int_ctrl =  readl(&amp;cpsw-&gt;wr_regs-&gt;int_control);</div><div class='del'>-	prescale = cpsw-&gt;bus_freq_mhz * 4;</div><div class='del'>-</div><div class='del'>-	if (!coal-&gt;rx_coalesce_usecs) {</div><div class='del'>-		int_ctrl &amp;= ~(CPSW_INTPRESCALE_MASK | CPSW_INTPACEEN);</div><div class='del'>-		goto update_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coal_intvl &lt; CPSW_CMINTMIN_INTVL)</div><div class='del'>-		coal_intvl = CPSW_CMINTMIN_INTVL;</div><div class='del'>-</div><div class='del'>-	if (coal_intvl &gt; CPSW_CMINTMAX_INTVL) {</div><div class='del'>-		/* Interrupt pacer works with 4us Pulse, we can</div><div class='del'>-		 * throttle further by dilating the 4us pulse.</div><div class='del'>-		 */</div><div class='del'>-		addnl_dvdr = CPSW_INTPRESCALE_MASK / prescale;</div><div class='del'>-</div><div class='del'>-		if (addnl_dvdr &gt; 1) {</div><div class='del'>-			prescale *= addnl_dvdr;</div><div class='del'>-			if (coal_intvl &gt; (CPSW_CMINTMAX_INTVL * addnl_dvdr))</div><div class='del'>-				coal_intvl = (CPSW_CMINTMAX_INTVL</div><div class='del'>-						* addnl_dvdr);</div><div class='del'>-		} else {</div><div class='del'>-			addnl_dvdr = 1;</div><div class='del'>-			coal_intvl = CPSW_CMINTMAX_INTVL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	num_interrupts = (1000 * addnl_dvdr) / coal_intvl;</div><div class='del'>-	writel(num_interrupts, &amp;cpsw-&gt;wr_regs-&gt;rx_imax);</div><div class='del'>-	writel(num_interrupts, &amp;cpsw-&gt;wr_regs-&gt;tx_imax);</div><div class='del'>-</div><div class='del'>-	int_ctrl |= CPSW_INTPACEEN;</div><div class='del'>-	int_ctrl &amp;= (~CPSW_INTPRESCALE_MASK);</div><div class='del'>-	int_ctrl |= (prescale &amp; CPSW_INTPRESCALE_MASK);</div><div class='del'>-</div><div class='del'>-update_return:</div><div class='del'>-	writel(int_ctrl, &amp;cpsw-&gt;wr_regs-&gt;int_control);</div><div class='del'>-</div><div class='del'>-	cpsw_notice(priv, timer, "Set coalesce to %d usecs.\n", coal_intvl);</div><div class='del'>-	cpsw-&gt;coal_intvl = coal_intvl;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_get_sset_count(struct net_device *ndev, int sset)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	switch (sset) {</div><div class='del'>-	case ETH_SS_STATS:</div><div class='del'>-		return (CPSW_STATS_COMMON_LEN +</div><div class='del'>-		       (cpsw-&gt;rx_ch_num + cpsw-&gt;tx_ch_num) *</div><div class='del'>-		       CPSW_STATS_CH_LEN);</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'>-static void cpsw_add_ch_strings(u8 **p, int ch_num, int rx_dir)</div><div class='del'>-{</div><div class='del'>-	int ch_stats_len;</div><div class='del'>-	int line;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ch_stats_len = CPSW_STATS_CH_LEN * ch_num;</div><div class='del'>-	for (i = 0; i &lt; ch_stats_len; i++) {</div><div class='del'>-		line = i % CPSW_STATS_CH_LEN;</div><div class='del'>-		snprintf(*p, ETH_GSTRING_LEN,</div><div class='del'>-			 "%s DMA chan %ld: %s", rx_dir ? "Rx" : "Tx",</div><div class='del'>-			 (long)(i / CPSW_STATS_CH_LEN),</div><div class='del'>-			 cpsw_gstrings_ch_stats[line].stat_string);</div><div class='del'>-		*p += ETH_GSTRING_LEN;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_strings(struct net_device *ndev, u32 stringset, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-	u8 *p = data;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (stringset) {</div><div class='del'>-	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; CPSW_STATS_COMMON_LEN; i++) {</div><div class='del'>-			memcpy(p, cpsw_gstrings_stats[i].stat_string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			p += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cpsw_add_ch_strings(&amp;p, cpsw-&gt;rx_ch_num, 1);</div><div class='del'>-		cpsw_add_ch_strings(&amp;p, cpsw-&gt;tx_ch_num, 0);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_ethtool_stats(struct net_device *ndev,</div><div class='del'>-				    struct ethtool_stats *stats, u64 *data)</div><div class='del'>-{</div><div class='del'>-	u8 *p;</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-	struct cpdma_chan_stats ch_stats;</div><div class='del'>-	int i, l, ch;</div><div class='del'>-</div><div class='del'>-	/* Collect Davinci CPDMA stats for Rx and Tx Channel */</div><div class='del'>-	for (l = 0; l &lt; CPSW_STATS_COMMON_LEN; l++)</div><div class='del'>-		data[l] = readl(cpsw-&gt;hw_stats +</div><div class='del'>-				cpsw_gstrings_stats[l].stat_offset);</div><div class='del'>-</div><div class='del'>-	for (ch = 0; ch &lt; cpsw-&gt;rx_ch_num; ch++) {</div><div class='del'>-		cpdma_chan_get_stats(cpsw-&gt;rxv[ch].ch, &amp;ch_stats);</div><div class='del'>-		for (i = 0; i &lt; CPSW_STATS_CH_LEN; i++, l++) {</div><div class='del'>-			p = (u8 *)&amp;ch_stats +</div><div class='del'>-				cpsw_gstrings_ch_stats[i].stat_offset;</div><div class='del'>-			data[l] = *(u32 *)p;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (ch = 0; ch &lt; cpsw-&gt;tx_ch_num; ch++) {</div><div class='del'>-		cpdma_chan_get_stats(cpsw-&gt;txv[ch].ch, &amp;ch_stats);</div><div class='del'>-		for (i = 0; i &lt; CPSW_STATS_CH_LEN; i++, l++) {</div><div class='del'>-			p = (u8 *)&amp;ch_stats +</div><div class='del'>-				cpsw_gstrings_ch_stats[i].stat_offset;</div><div class='del'>-			data[l] = *(u32 *)p;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv,</div><div class='del'>-					struct sk_buff *skb,</div><div class='del'>-					struct cpdma_chan *txch)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-</div><div class='del'>-	skb_tx_timestamp(skb);</div><div class='del'>-	return cpdma_chan_submit(txch, skb, skb-&gt;data, skb-&gt;len,</div><div class='del'>-				 priv-&gt;emac_port + cpsw-&gt;data.dual_emac);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void cpsw_add_dual_emac_def_ale_entries(</div><div class='ctx'> 		struct cpsw_priv *priv, struct cpsw_slave *slave,</div><div class='ctx'> 		u32 slave_port)</div><div class='hunk'>@@ -1542,24 +883,18 @@ static inline void cpsw_add_dual_emac_def_ale_entries(</div><div class='ctx'> 			     ALE_PORT_DROP_UNKNOWN_VLAN, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void soft_reset_slave(struct cpsw_slave *slave)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-</div><div class='del'>-	snprintf(name, sizeof(name), "slave-%d", slave-&gt;slave_num);</div><div class='del'>-	soft_reset(name, &amp;slave-&gt;sliver-&gt;soft_reset);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u32 slave_port;</div><div class='ctx'> 	struct phy_device *phy;</div><div class='ctx'> 	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='ctx'> </div><div class='del'>-	soft_reset_slave(slave);</div><div class='add'>+	cpsw_sl_reset(slave-&gt;mac_sl, 100);</div><div class='add'>+	cpsw_sl_ctl_reset(slave-&gt;mac_sl);</div><div class='ctx'> </div><div class='ctx'> 	/* setup priority mapping */</div><div class='del'>-	writel_relaxed(RX_PRIORITY_MAPPING, &amp;slave-&gt;sliver-&gt;rx_pri_map);</div><div class='add'>+	cpsw_sl_reg_write(slave-&gt;mac_sl, CPSW_SL_RX_PRI_MAP,</div><div class='add'>+			  RX_PRIORITY_MAPPING);</div><div class='ctx'> </div><div class='ctx'> 	switch (cpsw-&gt;version) {</div><div class='ctx'> 	case CPSW_VERSION_1:</div><div class='hunk'>@@ -1585,7 +920,8 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup max packet size, and mac address */</div><div class='del'>-	writel_relaxed(cpsw-&gt;rx_packet_max, &amp;slave-&gt;sliver-&gt;rx_maxlen);</div><div class='add'>+	cpsw_sl_reg_write(slave-&gt;mac_sl, CPSW_SL_RX_MAXLEN,</div><div class='add'>+			  cpsw-&gt;rx_packet_max);</div><div class='ctx'> 	cpsw_set_slave_mac(slave, priv);</div><div class='ctx'> </div><div class='ctx'> 	slave-&gt;mac_control = 0;	/* no link yet */</div><div class='hunk'>@@ -1696,7 +1032,7 @@ static void cpsw_init_host_port(struct cpsw_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpsw_fill_rx_channels(struct cpsw_priv *priv)</div><div class='add'>+int cpsw_fill_rx_channels(struct cpsw_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1748,7 +1084,8 @@ static void cpsw_slave_stop(struct cpsw_slave *slave, struct cpsw_common *cpsw)</div><div class='ctx'> 	slave-&gt;phy = NULL;</div><div class='ctx'> 	cpsw_ale_control_set(cpsw-&gt;ale, slave_port,</div><div class='ctx'> 			     ALE_PORT_STATE, ALE_PORT_STATE_DISABLE);</div><div class='del'>-	soft_reset_slave(slave);</div><div class='add'>+	cpsw_sl_reset(slave-&gt;mac_sl, 100);</div><div class='add'>+	cpsw_sl_ctl_reset(slave-&gt;mac_sl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cpsw_tc_to_fifo(int tc, int num_tc)</div><div class='hunk'>@@ -2114,7 +1451,7 @@ static int cpsw_ndo_stop(struct net_device *ndev)</div><div class='ctx'> 	for_each_slave(priv, cpsw_slave_stop, cpsw);</div><div class='ctx'> </div><div class='ctx'> 	if (cpsw_need_resplit(cpsw))</div><div class='del'>-		cpsw_split_res(ndev);</div><div class='add'>+		cpsw_split_res(cpsw);</div><div class='ctx'> </div><div class='ctx'> 	cpsw-&gt;usage_count--;</div><div class='ctx'> 	pm_runtime_put_sync(cpsw-&gt;dev);</div><div class='hunk'>@@ -2147,7 +1484,9 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	txch = cpsw-&gt;txv[q_idx].ch;</div><div class='ctx'> 	txq = netdev_get_tx_queue(ndev, q_idx);</div><div class='del'>-	ret = cpsw_tx_packet_submit(priv, skb, txch);</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+	ret = cpdma_chan_submit(txch, skb, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				priv-&gt;emac_port + cpsw-&gt;data.dual_emac);</div><div class='ctx'> 	if (unlikely(ret != 0)) {</div><div class='ctx'> 		cpsw_err(priv, tx_err, "desc submit failed\n");</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -2418,18 +1757,6 @@ static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-static void cpsw_ndo_poll_controller(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	cpsw_intr_disable(cpsw);</div><div class='del'>-	cpsw_rx_interrupt(cpsw-&gt;irqs_table[0], cpsw);</div><div class='del'>-	cpsw_tx_interrupt(cpsw-&gt;irqs_table[1], cpsw);</div><div class='del'>-	cpsw_intr_enable(cpsw);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline int cpsw_add_vlan_ale_entry(struct cpsw_priv *priv,</div><div class='ctx'> 				unsigned short vid)</div><div class='ctx'> {</div><div class='hunk'>@@ -2601,7 +1928,7 @@ static int cpsw_ndo_set_tx_maxrate(struct net_device *ndev, int queue, u32 rate)</div><div class='ctx'> 		netdev_get_tx_queue(slave-&gt;ndev, queue)-&gt;tx_maxrate = rate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpsw_split_res(ndev);</div><div class='add'>+	cpsw_split_res(cpsw);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2677,6 +2004,18 @@ static int cpsw_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+static void cpsw_ndo_poll_controller(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+</div><div class='add'>+	cpsw_intr_disable(cpsw);</div><div class='add'>+	cpsw_rx_interrupt(cpsw-&gt;irqs_table[0], cpsw);</div><div class='add'>+	cpsw_tx_interrupt(cpsw-&gt;irqs_table[1], cpsw);</div><div class='add'>+	cpsw_intr_enable(cpsw);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops cpsw_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= cpsw_ndo_open,</div><div class='ctx'> 	.ndo_stop		= cpsw_ndo_stop,</div><div class='hunk'>@@ -2695,25 +2034,6 @@ static const struct net_device_ops cpsw_netdev_ops = {</div><div class='ctx'> 	.ndo_setup_tc           = cpsw_ndo_setup_tc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cpsw_get_regs_len(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	return cpsw-&gt;data.ale_entries * ALE_ENTRY_WORDS * sizeof(u32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_regs(struct net_device *ndev,</div><div class='del'>-			  struct ethtool_regs *regs, void *p)</div><div class='del'>-{</div><div class='del'>-	u32 *reg = p;</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	/* update CPSW IP version */</div><div class='del'>-	regs-&gt;version = cpsw-&gt;version;</div><div class='del'>-</div><div class='del'>-	cpsw_ale_dump(cpsw-&gt;ale, reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cpsw_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 			     struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -2725,119 +2045,6 @@ static void cpsw_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 	strlcpy(info-&gt;bus_info, pdev-&gt;name, sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 cpsw_get_msglevel(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	return priv-&gt;msg_enable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_set_msglevel(struct net_device *ndev, u32 value)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;msg_enable = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_TI_CPTS)</div><div class='del'>-static int cpsw_get_ts_info(struct net_device *ndev,</div><div class='del'>-			    struct ethtool_ts_info *info)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	info-&gt;so_timestamping =</div><div class='del'>-		SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='del'>-		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='del'>-		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='del'>-	info-&gt;phc_index = cpsw-&gt;cpts-&gt;phc_index;</div><div class='del'>-	info-&gt;tx_types =</div><div class='del'>-		(1 &lt;&lt; HWTSTAMP_TX_OFF) |</div><div class='del'>-		(1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='del'>-	info-&gt;rx_filters =</div><div class='del'>-		(1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='del'>-		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |</div><div class='del'>-		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_EVENT);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static int cpsw_get_ts_info(struct net_device *ndev,</div><div class='del'>-			    struct ethtool_ts_info *info)</div><div class='del'>-{</div><div class='del'>-	info-&gt;so_timestamping =</div><div class='del'>-		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_SOFTWARE;</div><div class='del'>-	info-&gt;phc_index = -1;</div><div class='del'>-	info-&gt;tx_types = 0;</div><div class='del'>-	info-&gt;rx_filters = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int cpsw_get_link_ksettings(struct net_device *ndev,</div><div class='del'>-				   struct ethtool_link_ksettings *ecmd)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	if (!cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	phy_ethtool_ksettings_get(cpsw-&gt;slaves[slave_no].phy, ecmd);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_set_link_ksettings(struct net_device *ndev,</div><div class='del'>-				   const struct ethtool_link_ksettings *ecmd)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		return phy_ethtool_ksettings_set(cpsw-&gt;slaves[slave_no].phy,</div><div class='del'>-						 ecmd);</div><div class='del'>-	else</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	wol-&gt;supported = 0;</div><div class='del'>-	wol-&gt;wolopts = 0;</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		phy_ethtool_get_wol(cpsw-&gt;slaves[slave_no].phy, wol);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		return phy_ethtool_set_wol(cpsw-&gt;slaves[slave_no].phy, wol);</div><div class='del'>-	else</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_pauseparam(struct net_device *ndev,</div><div class='del'>-				struct ethtool_pauseparam *pause)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	pause-&gt;autoneg = AUTONEG_DISABLE;</div><div class='del'>-	pause-&gt;rx_pause = priv-&gt;rx_pause ? true : false;</div><div class='del'>-	pause-&gt;tx_pause = priv-&gt;tx_pause ? true : false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cpsw_set_pauseparam(struct net_device *ndev,</div><div class='ctx'> 			       struct ethtool_pauseparam *pause)</div><div class='ctx'> {</div><div class='hunk'>@@ -2851,316 +2058,10 @@ static int cpsw_set_pauseparam(struct net_device *ndev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpsw_ethtool_op_begin(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = pm_runtime_get_sync(cpsw-&gt;dev);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		cpsw_err(priv, drv, "ethtool begin failed %d\n", ret);</div><div class='del'>-		pm_runtime_put_noidle(cpsw-&gt;dev);</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 cpsw_ethtool_op_complete(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = pm_runtime_put(priv-&gt;cpsw-&gt;dev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		cpsw_err(priv, drv, "ethtool complete failed %d\n", ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_channels(struct net_device *ndev,</div><div class='del'>-			      struct ethtool_channels *ch)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-</div><div class='del'>-	ch-&gt;max_rx = cpsw-&gt;quirk_irq ? 1 : CPSW_MAX_QUEUES;</div><div class='del'>-	ch-&gt;max_tx = cpsw-&gt;quirk_irq ? 1 : CPSW_MAX_QUEUES;</div><div class='del'>-	ch-&gt;max_combined = 0;</div><div class='del'>-	ch-&gt;max_other = 0;</div><div class='del'>-	ch-&gt;other_count = 0;</div><div class='del'>-	ch-&gt;rx_count = cpsw-&gt;rx_ch_num;</div><div class='del'>-	ch-&gt;tx_count = cpsw-&gt;tx_ch_num;</div><div class='del'>-	ch-&gt;combined_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_check_ch_settings(struct cpsw_common *cpsw,</div><div class='del'>-				  struct ethtool_channels *ch)</div><div class='del'>-{</div><div class='del'>-	if (cpsw-&gt;quirk_irq) {</div><div class='del'>-		dev_err(cpsw-&gt;dev, "Maximum one tx/rx queue is allowed");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;combined_count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* verify we have at least one channel in each direction */</div><div class='del'>-	if (!ch-&gt;rx_count || !ch-&gt;tx_count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (ch-&gt;rx_count &gt; cpsw-&gt;data.channels ||</div><div class='del'>-	    ch-&gt;tx_count &gt; cpsw-&gt;data.channels)</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 cpsw_update_channels_res(struct cpsw_priv *priv, int ch_num, int rx)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	void (*handler)(void *, int, int);</div><div class='del'>-	struct netdev_queue *queue;</div><div class='del'>-	struct cpsw_vector *vec;</div><div class='del'>-	int ret, *ch, vch;</div><div class='del'>-</div><div class='del'>-	if (rx) {</div><div class='del'>-		ch = &amp;cpsw-&gt;rx_ch_num;</div><div class='del'>-		vec = cpsw-&gt;rxv;</div><div class='del'>-		handler = cpsw_rx_handler;</div><div class='del'>-	} else {</div><div class='del'>-		ch = &amp;cpsw-&gt;tx_ch_num;</div><div class='del'>-		vec = cpsw-&gt;txv;</div><div class='del'>-		handler = cpsw_tx_handler;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (*ch &lt; ch_num) {</div><div class='del'>-		vch = rx ? *ch : 7 - *ch;</div><div class='del'>-		vec[*ch].ch = cpdma_chan_create(cpsw-&gt;dma, vch, handler, rx);</div><div class='del'>-		queue = netdev_get_tx_queue(priv-&gt;ndev, *ch);</div><div class='del'>-		queue-&gt;tx_maxrate = 0;</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(vec[*ch].ch))</div><div class='del'>-			return PTR_ERR(vec[*ch].ch);</div><div class='del'>-</div><div class='del'>-		if (!vec[*ch].ch)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		cpsw_info(priv, ifup, "created new %d %s channel\n", *ch,</div><div class='del'>-			  (rx ? "rx" : "tx"));</div><div class='del'>-		(*ch)++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (*ch &gt; ch_num) {</div><div class='del'>-		(*ch)--;</div><div class='del'>-</div><div class='del'>-		ret = cpdma_chan_destroy(vec[*ch].ch);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		cpsw_info(priv, ifup, "destroyed %d %s channel\n", *ch,</div><div class='del'>-			  (rx ? "rx" : "tx"));</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 cpsw_update_channels(struct cpsw_priv *priv,</div><div class='del'>-				struct ethtool_channels *ch)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = cpsw_update_channels_res(priv, ch-&gt;rx_count, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = cpsw_update_channels_res(priv, ch-&gt;tx_count, 0);</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 void cpsw_suspend_data_pass(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='del'>-	struct cpsw_slave *slave;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Disable NAPI scheduling */</div><div class='del'>-	cpsw_intr_disable(cpsw);</div><div class='del'>-</div><div class='del'>-	/* Stop all transmit queues for every network device.</div><div class='del'>-	 * Disable re-using rx descriptors with dormant_on.</div><div class='del'>-	 */</div><div class='del'>-	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++) {</div><div class='del'>-		if (!(slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		netif_tx_stop_all_queues(slave-&gt;ndev);</div><div class='del'>-		netif_dormant_on(slave-&gt;ndev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle rest of tx packets and stop cpdma channels */</div><div class='del'>-	cpdma_ctlr_stop(cpsw-&gt;dma);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_resume_data_pass(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	struct cpsw_slave *slave;</div><div class='del'>-	int i, ret;</div><div class='del'>-</div><div class='del'>-	/* Allow rx packets handling */</div><div class='del'>-	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++)</div><div class='del'>-		if (slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev))</div><div class='del'>-			netif_dormant_off(slave-&gt;ndev);</div><div class='del'>-</div><div class='del'>-	/* After this receive is started */</div><div class='del'>-	if (cpsw-&gt;usage_count) {</div><div class='del'>-		ret = cpsw_fill_rx_channels(priv);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		cpdma_ctlr_start(cpsw-&gt;dma);</div><div class='del'>-		cpsw_intr_enable(cpsw);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Resume transmit for every affected interface */</div><div class='del'>-	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++)</div><div class='del'>-		if (slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev))</div><div class='del'>-			netif_tx_start_all_queues(slave-&gt;ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cpsw_set_channels(struct net_device *ndev,</div><div class='ctx'> 			     struct ethtool_channels *chs)</div><div class='ctx'> {</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	struct cpsw_slave *slave;</div><div class='del'>-	int i, ret;</div><div class='del'>-</div><div class='del'>-	ret = cpsw_check_ch_settings(cpsw, chs);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	cpsw_suspend_data_pass(ndev);</div><div class='del'>-	ret = cpsw_update_channels(priv, chs);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++) {</div><div class='del'>-		if (!(slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Inform stack about new count of queues */</div><div class='del'>-		ret = netif_set_real_num_tx_queues(slave-&gt;ndev,</div><div class='del'>-						   cpsw-&gt;tx_ch_num);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(priv-&gt;dev, "cannot set real number of tx queues\n");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = netif_set_real_num_rx_queues(slave-&gt;ndev,</div><div class='del'>-						   cpsw-&gt;rx_ch_num);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(priv-&gt;dev, "cannot set real number of rx queues\n");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;usage_count)</div><div class='del'>-		cpsw_split_res(ndev);</div><div class='del'>-</div><div class='del'>-	ret = cpsw_resume_data_pass(ndev);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return 0;</div><div class='del'>-err:</div><div class='del'>-	dev_err(priv-&gt;dev, "cannot update channels number, closing device\n");</div><div class='del'>-	dev_close(ndev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_get_eee(struct net_device *ndev, struct ethtool_eee *edata)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		return phy_ethtool_get_eee(cpsw-&gt;slaves[slave_no].phy, edata);</div><div class='del'>-	else</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_set_eee(struct net_device *ndev, struct ethtool_eee *edata)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		return phy_ethtool_set_eee(cpsw-&gt;slaves[slave_no].phy, edata);</div><div class='del'>-	else</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_nway_reset(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='del'>-		return genphy_restart_aneg(cpsw-&gt;slaves[slave_no].phy);</div><div class='del'>-	else</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpsw_get_ringparam(struct net_device *ndev,</div><div class='del'>-			       struct ethtool_ringparam *ering)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-</div><div class='del'>-	/* not supported */</div><div class='del'>-	ering-&gt;tx_max_pending = 0;</div><div class='del'>-	ering-&gt;tx_pending = cpdma_get_num_tx_descs(cpsw-&gt;dma);</div><div class='del'>-	ering-&gt;rx_max_pending = descs_pool_size - CPSW_MAX_QUEUES;</div><div class='del'>-	ering-&gt;rx_pending = cpdma_get_num_rx_descs(cpsw-&gt;dma);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cpsw_set_ringparam(struct net_device *ndev,</div><div class='del'>-			      struct ethtool_ringparam *ering)</div><div class='del'>-{</div><div class='del'>-	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* ignore ering-&gt;tx_pending - only rx_pending adjustment is supported */</div><div class='del'>-</div><div class='del'>-	if (ering-&gt;rx_mini_pending || ering-&gt;rx_jumbo_pending ||</div><div class='del'>-	    ering-&gt;rx_pending &lt; CPSW_MAX_QUEUES ||</div><div class='del'>-	    ering-&gt;rx_pending &gt; (descs_pool_size - CPSW_MAX_QUEUES))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (ering-&gt;rx_pending == cpdma_get_num_rx_descs(cpsw-&gt;dma))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	cpsw_suspend_data_pass(ndev);</div><div class='del'>-</div><div class='del'>-	cpdma_set_num_rx_descs(cpsw-&gt;dma, ering-&gt;rx_pending);</div><div class='del'>-</div><div class='del'>-	if (cpsw-&gt;usage_count)</div><div class='del'>-		cpdma_chan_split_pool(cpsw-&gt;dma);</div><div class='del'>-</div><div class='del'>-	ret = cpsw_resume_data_pass(ndev);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dev_err(&amp;ndev-&gt;dev, "cannot set ring params, closing device\n");</div><div class='del'>-	dev_close(ndev);</div><div class='del'>-	return ret;</div><div class='add'>+	return cpsw_set_channels_common(ndev, chs, cpsw_rx_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops cpsw_ethtool_ops = {</div><div class='hunk'>@@ -3193,19 +2094,6 @@ static const struct ethtool_ops cpsw_ethtool_ops = {</div><div class='ctx'> 	.set_ringparam = cpsw_set_ringparam,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_common *cpsw,</div><div class='del'>-			    u32 slave_reg_ofs, u32 sliver_reg_ofs)</div><div class='del'>-{</div><div class='del'>-	void __iomem		*regs = cpsw-&gt;regs;</div><div class='del'>-	int			slave_num = slave-&gt;slave_num;</div><div class='del'>-	struct cpsw_slave_data	*data = cpsw-&gt;data.slave_data + slave_num;</div><div class='del'>-</div><div class='del'>-	slave-&gt;data	= data;</div><div class='del'>-	slave-&gt;regs	= regs + slave_reg_ofs;</div><div class='del'>-	slave-&gt;sliver	= regs + sliver_reg_ofs;</div><div class='del'>-	slave-&gt;port_vlan = data-&gt;dual_emac_res_vlan;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cpsw_probe_dt(struct cpsw_platform_data *data,</div><div class='ctx'> 			 struct platform_device *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -3344,7 +2232,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,</div><div class='ctx'> </div><div class='ctx'> no_phy_slave:</div><div class='ctx'> 		mac_addr = of_get_mac_address(slave_node);</div><div class='del'>-		if (mac_addr) {</div><div class='add'>+		if (!IS_ERR(mac_addr)) {</div><div class='ctx'> 			memcpy(slave_data-&gt;mac_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = ti_cm_get_macid(&amp;pdev-&gt;dev, i,</div><div class='hunk'>@@ -3408,7 +2296,8 @@ static int cpsw_probe_dual_emac(struct cpsw_priv *priv)</div><div class='ctx'> 	struct cpsw_priv		*priv_sl2;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES);</div><div class='add'>+	ndev = devm_alloc_etherdev_mqs(cpsw-&gt;dev, sizeof(struct cpsw_priv),</div><div class='add'>+				       CPSW_MAX_QUEUES, CPSW_MAX_QUEUES);</div><div class='ctx'> 	if (!ndev) {</div><div class='ctx'> 		dev_err(cpsw-&gt;dev, "cpsw: error allocating net_device\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3442,11 +2331,8 @@ static int cpsw_probe_dual_emac(struct cpsw_priv *priv)</div><div class='ctx'> 	/* register the network device */</div><div class='ctx'> 	SET_NETDEV_DEV(ndev, cpsw-&gt;dev);</div><div class='ctx'> 	ret = register_netdev(ndev);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (ret)</div><div class='ctx'> 		dev_err(cpsw-&gt;dev, "cpsw: error registering net device\n");</div><div class='del'>-		free_netdev(ndev);</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3467,63 +2353,74 @@ static const struct soc_device_attribute cpsw_soc_devices[] = {</div><div class='ctx'> </div><div class='ctx'> static int cpsw_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct device			*dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct clk			*clk;</div><div class='ctx'> 	struct cpsw_platform_data	*data;</div><div class='ctx'> 	struct net_device		*ndev;</div><div class='ctx'> 	struct cpsw_priv		*priv;</div><div class='del'>-	struct cpdma_params		dma_params;</div><div class='del'>-	struct cpsw_ale_params		ale_params;</div><div class='ctx'> 	void __iomem			*ss_regs;</div><div class='del'>-	void __iomem			*cpts_regs;</div><div class='ctx'> 	struct resource			*res, *ss_res;</div><div class='ctx'> 	struct gpio_descs		*mode;</div><div class='del'>-	u32 slave_offset, sliver_offset, slave_size;</div><div class='ctx'> 	const struct soc_device_attribute *soc;</div><div class='ctx'> 	struct cpsw_common		*cpsw;</div><div class='del'>-	int ret = 0, i, ch;</div><div class='add'>+	int ret = 0, ch;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='del'>-	cpsw = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct cpsw_common), GFP_KERNEL);</div><div class='add'>+	cpsw = devm_kzalloc(dev, sizeof(struct cpsw_common), GFP_KERNEL);</div><div class='ctx'> 	if (!cpsw)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	cpsw-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	cpsw-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES);</div><div class='del'>-	if (!ndev) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "error allocating net_device\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, ndev);</div><div class='del'>-	priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;cpsw = cpsw;</div><div class='del'>-	priv-&gt;ndev = ndev;</div><div class='del'>-	priv-&gt;dev  = &amp;ndev-&gt;dev;</div><div class='del'>-	priv-&gt;msg_enable = netif_msg_init(debug_level, CPSW_DEBUG);</div><div class='del'>-	cpsw-&gt;rx_packet_max = max(rx_packet_max, 128);</div><div class='del'>-</div><div class='del'>-	mode = devm_gpiod_get_array_optional(&amp;pdev-&gt;dev, "mode", GPIOD_OUT_LOW);</div><div class='add'>+	mode = devm_gpiod_get_array_optional(dev, "mode", GPIOD_OUT_LOW);</div><div class='ctx'> 	if (IS_ERR(mode)) {</div><div class='ctx'> 		ret = PTR_ERR(mode);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "gpio request failed, ret %d\n", ret);</div><div class='del'>-		goto clean_ndev_ret;</div><div class='add'>+		dev_err(dev, "gpio request failed, ret %d\n", ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clk = devm_clk_get(dev, "fck");</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		ret = PTR_ERR(clk);</div><div class='add'>+		dev_err(dev, "fck is not found %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	cpsw-&gt;bus_freq_mhz = clk_get_rate(clk) / 1000000;</div><div class='add'>+</div><div class='add'>+	ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	ss_regs = devm_ioremap_resource(dev, ss_res);</div><div class='add'>+	if (IS_ERR(ss_regs))</div><div class='add'>+		return PTR_ERR(ss_regs);</div><div class='add'>+	cpsw-&gt;regs = ss_regs;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+	cpsw-&gt;wr_regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(cpsw-&gt;wr_regs))</div><div class='add'>+		return PTR_ERR(cpsw-&gt;wr_regs);</div><div class='add'>+</div><div class='add'>+	/* RX IRQ */</div><div class='add'>+	irq = platform_get_irq(pdev, 1);</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='add'>+	cpsw-&gt;irqs_table[0] = irq;</div><div class='add'>+</div><div class='add'>+	/* TX IRQ */</div><div class='add'>+	irq = platform_get_irq(pdev, 2);</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='add'>+	cpsw-&gt;irqs_table[1] = irq;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This may be required here for child devices.</div><div class='ctx'> 	 */</div><div class='del'>-	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* Select default pin state */</div><div class='del'>-	pinctrl_pm_select_default_state(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Need to enable clocks with runtime PM api to access module</div><div class='ctx'> 	 * registers</div><div class='ctx'> 	 */</div><div class='del'>-	ret = pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='add'>+	ret = pm_runtime_get_sync(dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='add'>+		pm_runtime_put_noidle(dev);</div><div class='ctx'> 		goto clean_runtime_disable_ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3531,170 +2428,72 @@ static int cpsw_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto clean_dt_ret;</div><div class='ctx'> </div><div class='del'>-	data = &amp;cpsw-&gt;data;</div><div class='del'>-	cpsw-&gt;rx_ch_num = 1;</div><div class='del'>-	cpsw-&gt;tx_ch_num = 1;</div><div class='del'>-</div><div class='del'>-	if (is_valid_ether_addr(data-&gt;slave_data[0].mac_addr)) {</div><div class='del'>-		memcpy(priv-&gt;mac_addr, data-&gt;slave_data[0].mac_addr, ETH_ALEN);</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "Detected MACID = %pM\n", priv-&gt;mac_addr);</div><div class='del'>-	} else {</div><div class='del'>-		eth_random_addr(priv-&gt;mac_addr);</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "Random MACID = %pM\n", priv-&gt;mac_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(ndev-&gt;dev_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	soc = soc_device_match(cpsw_soc_devices);</div><div class='add'>+	if (soc)</div><div class='add'>+		cpsw-&gt;quirk_irq = 1;</div><div class='ctx'> </div><div class='del'>-	cpsw-&gt;slaves = devm_kcalloc(&amp;pdev-&gt;dev,</div><div class='add'>+	data = &amp;cpsw-&gt;data;</div><div class='add'>+	cpsw-&gt;slaves = devm_kcalloc(dev,</div><div class='ctx'> 				    data-&gt;slaves, sizeof(struct cpsw_slave),</div><div class='ctx'> 				    GFP_KERNEL);</div><div class='ctx'> 	if (!cpsw-&gt;slaves) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto clean_dt_ret;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; data-&gt;slaves; i++)</div><div class='del'>-		cpsw-&gt;slaves[i].slave_num = i;</div><div class='del'>-</div><div class='del'>-	cpsw-&gt;slaves[0].ndev = ndev;</div><div class='del'>-	priv-&gt;emac_port = 0;</div><div class='del'>-</div><div class='del'>-	clk = devm_clk_get(&amp;pdev-&gt;dev, "fck");</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		dev_err(priv-&gt;dev, "fck is not found\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto clean_dt_ret;</div><div class='del'>-	}</div><div class='del'>-	cpsw-&gt;bus_freq_mhz = clk_get_rate(clk) / 1000000;</div><div class='del'>-</div><div class='del'>-	ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	ss_regs = devm_ioremap_resource(&amp;pdev-&gt;dev, ss_res);</div><div class='del'>-	if (IS_ERR(ss_regs)) {</div><div class='del'>-		ret = PTR_ERR(ss_regs);</div><div class='del'>-		goto clean_dt_ret;</div><div class='del'>-	}</div><div class='del'>-	cpsw-&gt;regs = ss_regs;</div><div class='del'>-</div><div class='del'>-	cpsw-&gt;version = readl(&amp;cpsw-&gt;regs-&gt;id_ver);</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	cpsw-&gt;wr_regs = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(cpsw-&gt;wr_regs)) {</div><div class='del'>-		ret = PTR_ERR(cpsw-&gt;wr_regs);</div><div class='del'>-		goto clean_dt_ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;dma_params, 0, sizeof(dma_params));</div><div class='del'>-	memset(&amp;ale_params, 0, sizeof(ale_params));</div><div class='add'>+	cpsw-&gt;rx_packet_max = max(rx_packet_max, CPSW_MAX_PACKET_SIZE);</div><div class='add'>+	cpsw-&gt;descs_pool_size = descs_pool_size;</div><div class='ctx'> </div><div class='del'>-	switch (cpsw-&gt;version) {</div><div class='del'>-	case CPSW_VERSION_1:</div><div class='del'>-		cpsw-&gt;host_port_regs = ss_regs + CPSW1_HOST_PORT_OFFSET;</div><div class='del'>-		cpts_regs		= ss_regs + CPSW1_CPTS_OFFSET;</div><div class='del'>-		cpsw-&gt;hw_stats	     = ss_regs + CPSW1_HW_STATS;</div><div class='del'>-		dma_params.dmaregs   = ss_regs + CPSW1_CPDMA_OFFSET;</div><div class='del'>-		dma_params.txhdp     = ss_regs + CPSW1_STATERAM_OFFSET;</div><div class='del'>-		ale_params.ale_regs  = ss_regs + CPSW1_ALE_OFFSET;</div><div class='del'>-		slave_offset         = CPSW1_SLAVE_OFFSET;</div><div class='del'>-		slave_size           = CPSW1_SLAVE_SIZE;</div><div class='del'>-		sliver_offset        = CPSW1_SLIVER_OFFSET;</div><div class='del'>-		dma_params.desc_mem_phys = 0;</div><div class='del'>-		break;</div><div class='del'>-	case CPSW_VERSION_2:</div><div class='del'>-	case CPSW_VERSION_3:</div><div class='del'>-	case CPSW_VERSION_4:</div><div class='del'>-		cpsw-&gt;host_port_regs = ss_regs + CPSW2_HOST_PORT_OFFSET;</div><div class='del'>-		cpts_regs		= ss_regs + CPSW2_CPTS_OFFSET;</div><div class='del'>-		cpsw-&gt;hw_stats	     = ss_regs + CPSW2_HW_STATS;</div><div class='del'>-		dma_params.dmaregs   = ss_regs + CPSW2_CPDMA_OFFSET;</div><div class='del'>-		dma_params.txhdp     = ss_regs + CPSW2_STATERAM_OFFSET;</div><div class='del'>-		ale_params.ale_regs  = ss_regs + CPSW2_ALE_OFFSET;</div><div class='del'>-		slave_offset         = CPSW2_SLAVE_OFFSET;</div><div class='del'>-		slave_size           = CPSW2_SLAVE_SIZE;</div><div class='del'>-		sliver_offset        = CPSW2_SLIVER_OFFSET;</div><div class='del'>-		dma_params.desc_mem_phys =</div><div class='del'>-			(u32 __force) ss_res-&gt;start + CPSW2_BD_OFFSET;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(priv-&gt;dev, "unknown version 0x%08x\n", cpsw-&gt;version);</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto clean_dt_ret;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cpsw-&gt;data.slaves; i++) {</div><div class='del'>-		struct cpsw_slave *slave = &amp;cpsw-&gt;slaves[i];</div><div class='del'>-</div><div class='del'>-		cpsw_slave_init(slave, cpsw, slave_offset, sliver_offset);</div><div class='del'>-		slave_offset  += slave_size;</div><div class='del'>-		sliver_offset += SLIVER_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dma_params.dev		= &amp;pdev-&gt;dev;</div><div class='del'>-	dma_params.rxthresh	= dma_params.dmaregs + CPDMA_RXTHRESH;</div><div class='del'>-	dma_params.rxfree	= dma_params.dmaregs + CPDMA_RXFREE;</div><div class='del'>-	dma_params.rxhdp	= dma_params.txhdp + CPDMA_RXHDP;</div><div class='del'>-	dma_params.txcp		= dma_params.txhdp + CPDMA_TXCP;</div><div class='del'>-	dma_params.rxcp		= dma_params.txhdp + CPDMA_RXCP;</div><div class='del'>-</div><div class='del'>-	dma_params.num_chan		= data-&gt;channels;</div><div class='del'>-	dma_params.has_soft_reset	= true;</div><div class='del'>-	dma_params.min_packet_size	= CPSW_MIN_PACKET_SIZE;</div><div class='del'>-	dma_params.desc_mem_size	= data-&gt;bd_ram_size;</div><div class='del'>-	dma_params.desc_align		= 16;</div><div class='del'>-	dma_params.has_ext_regs		= true;</div><div class='del'>-	dma_params.desc_hw_addr         = dma_params.desc_mem_phys;</div><div class='del'>-	dma_params.bus_freq_mhz		= cpsw-&gt;bus_freq_mhz;</div><div class='del'>-	dma_params.descs_pool_size	= descs_pool_size;</div><div class='del'>-</div><div class='del'>-	cpsw-&gt;dma = cpdma_ctlr_create(&amp;dma_params);</div><div class='del'>-	if (!cpsw-&gt;dma) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error initializing dma\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	ret = cpsw_init_common(cpsw, ss_regs, ale_ageout,</div><div class='add'>+			       ss_res-&gt;start + CPSW2_BD_OFFSET,</div><div class='add'>+			       descs_pool_size);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto clean_dt_ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	soc = soc_device_match(cpsw_soc_devices);</div><div class='del'>-	if (soc)</div><div class='del'>-		cpsw-&gt;quirk_irq = 1;</div><div class='ctx'> </div><div class='ctx'> 	ch = cpsw-&gt;quirk_irq ? 0 : 7;</div><div class='ctx'> 	cpsw-&gt;txv[0].ch = cpdma_chan_create(cpsw-&gt;dma, ch, cpsw_tx_handler, 0);</div><div class='ctx'> 	if (IS_ERR(cpsw-&gt;txv[0].ch)) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error initializing tx dma channel\n");</div><div class='add'>+		dev_err(dev, "error initializing tx dma channel\n");</div><div class='ctx'> 		ret = PTR_ERR(cpsw-&gt;txv[0].ch);</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+		goto clean_cpts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpsw-&gt;rxv[0].ch = cpdma_chan_create(cpsw-&gt;dma, 0, cpsw_rx_handler, 1);</div><div class='ctx'> 	if (IS_ERR(cpsw-&gt;rxv[0].ch)) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error initializing rx dma channel\n");</div><div class='add'>+		dev_err(dev, "error initializing rx dma channel\n");</div><div class='ctx'> 		ret = PTR_ERR(cpsw-&gt;rxv[0].ch);</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+		goto clean_cpts;</div><div class='ctx'> 	}</div><div class='add'>+	cpsw_split_res(cpsw);</div><div class='ctx'> </div><div class='del'>-	ale_params.dev			= &amp;pdev-&gt;dev;</div><div class='del'>-	ale_params.ale_ageout		= ale_ageout;</div><div class='del'>-	ale_params.ale_entries		= data-&gt;ale_entries;</div><div class='del'>-	ale_params.ale_ports		= CPSW_ALE_PORTS_NUM;</div><div class='del'>-</div><div class='del'>-	cpsw-&gt;ale = cpsw_ale_create(&amp;ale_params);</div><div class='del'>-	if (!cpsw-&gt;ale) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error initializing ale engine\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+	/* setup netdev */</div><div class='add'>+	ndev = devm_alloc_etherdev_mqs(dev, sizeof(struct cpsw_priv),</div><div class='add'>+				       CPSW_MAX_QUEUES, CPSW_MAX_QUEUES);</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		dev_err(dev, "error allocating net_device\n");</div><div class='add'>+		goto clean_cpts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpsw-&gt;cpts = cpts_create(cpsw-&gt;dev, cpts_regs, cpsw-&gt;dev-&gt;of_node);</div><div class='del'>-	if (IS_ERR(cpsw-&gt;cpts)) {</div><div class='del'>-		ret = PTR_ERR(cpsw-&gt;cpts);</div><div class='del'>-		goto clean_dma_ret;</div><div class='del'>-	}</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	priv-&gt;cpsw = cpsw;</div><div class='add'>+	priv-&gt;ndev = ndev;</div><div class='add'>+	priv-&gt;dev  = dev;</div><div class='add'>+	priv-&gt;msg_enable = netif_msg_init(debug_level, CPSW_DEBUG);</div><div class='add'>+	priv-&gt;emac_port = 0;</div><div class='ctx'> </div><div class='del'>-	ndev-&gt;irq = platform_get_irq(pdev, 1);</div><div class='del'>-	if (ndev-&gt;irq &lt; 0) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error getting irq resource\n");</div><div class='del'>-		ret = ndev-&gt;irq;</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+	if (is_valid_ether_addr(data-&gt;slave_data[0].mac_addr)) {</div><div class='add'>+		memcpy(priv-&gt;mac_addr, data-&gt;slave_data[0].mac_addr, ETH_ALEN);</div><div class='add'>+		dev_info(dev, "Detected MACID = %pM\n", priv-&gt;mac_addr);</div><div class='add'>+	} else {</div><div class='add'>+		eth_random_addr(priv-&gt;mac_addr);</div><div class='add'>+		dev_info(dev, "Random MACID = %pM\n", priv-&gt;mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memcpy(ndev-&gt;dev_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	cpsw-&gt;slaves[0].ndev = ndev;</div><div class='add'>+</div><div class='ctx'> 	ndev-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_CTAG_RX;</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;cpsw_netdev_ops;</div><div class='hunk'>@@ -3705,15 +2504,14 @@ static int cpsw_probe(struct platform_device *pdev)</div><div class='ctx'> 	netif_tx_napi_add(ndev, &amp;cpsw-&gt;napi_tx,</div><div class='ctx'> 			  cpsw-&gt;quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll,</div><div class='ctx'> 			  CPSW_POLL_WEIGHT);</div><div class='del'>-	cpsw_split_res(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* register the network device */</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'> 	ret = register_netdev(ndev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error registering net device\n");</div><div class='add'>+		dev_err(dev, "error registering net device\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+		goto clean_cpts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpsw-&gt;data.dual_emac) {</div><div class='hunk'>@@ -3731,40 +2529,24 @@ static int cpsw_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * If anyone wants to implement support for those, make sure to</div><div class='ctx'> 	 * first request and append them to irqs_table array.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	/* RX IRQ */</div><div class='del'>-	irq = platform_get_irq(pdev, 1);</div><div class='del'>-	if (irq &lt; 0) {</div><div class='del'>-		ret = irq;</div><div class='del'>-		goto clean_dma_ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cpsw-&gt;irqs_table[0] = irq;</div><div class='del'>-	ret = devm_request_irq(&amp;pdev-&gt;dev, irq, cpsw_rx_interrupt,</div><div class='del'>-			       0, dev_name(&amp;pdev-&gt;dev), cpsw);</div><div class='add'>+	ret = devm_request_irq(dev, cpsw-&gt;irqs_table[0], cpsw_rx_interrupt,</div><div class='add'>+			       0, dev_name(dev), cpsw);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error attaching irq (%d)\n", ret);</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+		dev_err(dev, "error attaching irq (%d)\n", ret);</div><div class='add'>+		goto clean_unregister_netdev_ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* TX IRQ */</div><div class='del'>-	irq = platform_get_irq(pdev, 2);</div><div class='del'>-	if (irq &lt; 0) {</div><div class='del'>-		ret = irq;</div><div class='del'>-		goto clean_dma_ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cpsw-&gt;irqs_table[1] = irq;</div><div class='del'>-	ret = devm_request_irq(&amp;pdev-&gt;dev, irq, cpsw_tx_interrupt,</div><div class='add'>+	ret = devm_request_irq(dev, cpsw-&gt;irqs_table[1], cpsw_tx_interrupt,</div><div class='ctx'> 			       0, dev_name(&amp;pdev-&gt;dev), cpsw);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(priv-&gt;dev, "error attaching irq (%d)\n", ret);</div><div class='del'>-		goto clean_dma_ret;</div><div class='add'>+		dev_err(dev, "error attaching irq (%d)\n", ret);</div><div class='add'>+		goto clean_unregister_netdev_ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpsw_notice(priv, probe,</div><div class='ctx'> 		    "initialized device (regs %pa, irq %d, pool size %d)\n",</div><div class='del'>-		    &amp;ss_res-&gt;start, ndev-&gt;irq, dma_params.descs_pool_size);</div><div class='add'>+		    &amp;ss_res-&gt;start, cpsw-&gt;irqs_table[0], descs_pool_size);</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3772,15 +2554,14 @@ static int cpsw_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> clean_unregister_netdev_ret:</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-clean_dma_ret:</div><div class='add'>+clean_cpts:</div><div class='add'>+	cpts_release(cpsw-&gt;cpts);</div><div class='ctx'> 	cpdma_ctlr_destroy(cpsw-&gt;dma);</div><div class='ctx'> clean_dt_ret:</div><div class='ctx'> 	cpsw_remove_dt(pdev);</div><div class='ctx'> 	pm_runtime_put_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> clean_runtime_disable_ret:</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='del'>-clean_ndev_ret:</div><div class='del'>-	free_netdev(priv-&gt;ndev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3805,9 +2586,6 @@ static int cpsw_remove(struct platform_device *pdev)</div><div class='ctx'> 	cpsw_remove_dt(pdev);</div><div class='ctx'> 	pm_runtime_put_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='del'>-	if (cpsw-&gt;data.dual_emac)</div><div class='del'>-		free_netdev(cpsw-&gt;slaves[1].ndev);</div><div class='del'>-	free_netdev(ndev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h<br/>index 907e05fc22e4..35d602f03281 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw.h</a></div><div class='hunk'>@@ -1,15 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Texas Instruments Ethernet Switch Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2013 Texas Instruments</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</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 "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='ctx'>  */</div><div class='ctx'> #ifndef __CPSW_H__</div><div class='ctx'> #define __CPSW_H__</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c<br/>index 798c989d5d93..84025dcc78d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_ale.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_ale.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_ale.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_ale.c</a></div><div class='hunk'>@@ -1,16 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Texas Instruments N-Port Ethernet Switch Address Lookup Engine</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 Texas Instruments</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 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='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'>@@ -287,6 +280,9 @@ int cpsw_ale_flush_multicast(struct cpsw_ale *ale, int port_mask, int vid)</div><div class='ctx'> 		if (cpsw_ale_get_mcast(ale_entry)) {</div><div class='ctx'> 			u8 addr[6];</div><div class='ctx'> </div><div class='add'>+			if (cpsw_ale_get_super(ale_entry))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			cpsw_ale_get_addr(ale_entry, addr);</div><div class='ctx'> 			if (!is_broadcast_ether_addr(addr))</div><div class='ctx'> 				cpsw_ale_flush_mcast(ale, ale_entry, port_mask);</div><div class='hunk'>@@ -296,7 +292,6 @@ int cpsw_ale_flush_multicast(struct cpsw_ale *ale, int port_mask, int vid)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_flush_multicast);</div><div class='ctx'> </div><div class='ctx'> static inline void cpsw_ale_set_vlan_entry_type(u32 *ale_entry,</div><div class='ctx'> 						int flags, u16 vid)</div><div class='hunk'>@@ -334,7 +329,6 @@ int cpsw_ale_add_ucast(struct cpsw_ale *ale, const u8 *addr, int port,</div><div class='ctx'> 	cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_add_ucast);</div><div class='ctx'> </div><div class='ctx'> int cpsw_ale_del_ucast(struct cpsw_ale *ale, const u8 *addr, int port,</div><div class='ctx'> 		       int flags, u16 vid)</div><div class='hunk'>@@ -350,7 +344,6 @@ int cpsw_ale_del_ucast(struct cpsw_ale *ale, const u8 *addr, int port,</div><div class='ctx'> 	cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_del_ucast);</div><div class='ctx'> </div><div class='ctx'> int cpsw_ale_add_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,</div><div class='ctx'> 		       int flags, u16 vid, int mcast_state)</div><div class='hunk'>@@ -365,7 +358,7 @@ int cpsw_ale_add_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,</div><div class='ctx'> 	cpsw_ale_set_vlan_entry_type(ale_entry, flags, vid);</div><div class='ctx'> </div><div class='ctx'> 	cpsw_ale_set_addr(ale_entry, addr);</div><div class='del'>-	cpsw_ale_set_super(ale_entry, (flags &amp; ALE_BLOCKED) ? 1 : 0);</div><div class='add'>+	cpsw_ale_set_super(ale_entry, (flags &amp; ALE_SUPER) ? 1 : 0);</div><div class='ctx'> 	cpsw_ale_set_mcast_state(ale_entry, mcast_state);</div><div class='ctx'> </div><div class='ctx'> 	mask = cpsw_ale_get_port_mask(ale_entry,</div><div class='hunk'>@@ -384,7 +377,6 @@ int cpsw_ale_add_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,</div><div class='ctx'> 	cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_add_mcast);</div><div class='ctx'> </div><div class='ctx'> int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,</div><div class='ctx'> 		       int flags, u16 vid)</div><div class='hunk'>@@ -407,7 +399,6 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,</div><div class='ctx'> 	cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_del_mcast);</div><div class='ctx'> </div><div class='ctx'> /* ALE NetCP NU switch specific vlan functions */</div><div class='ctx'> static void cpsw_ale_set_vlan_mcast(struct cpsw_ale *ale, u32 *ale_entry,</div><div class='hunk'>@@ -458,7 +449,6 @@ int cpsw_ale_add_vlan(struct cpsw_ale *ale, u16 vid, int port, int untag,</div><div class='ctx'> 	cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_add_vlan);</div><div class='ctx'> </div><div class='ctx'> int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -480,40 +470,39 @@ int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask)</div><div class='ctx'> 	cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_del_vlan);</div><div class='ctx'> </div><div class='del'>-void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti)</div><div class='add'>+void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti, int port)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ale_entry[ALE_ENTRY_WORDS];</div><div class='del'>-	int type, idx;</div><div class='ctx'> 	int unreg_mcast = 0;</div><div class='del'>-</div><div class='del'>-	/* Only bother doing the work if the setting is actually changing */</div><div class='del'>-	if (ale-&gt;allmulti == allmulti)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Remember the new setting to check against next time */</div><div class='del'>-	ale-&gt;allmulti = allmulti;</div><div class='add'>+	int type, idx;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ale-&gt;params.ale_entries; idx++) {</div><div class='add'>+		int vlan_members;</div><div class='add'>+</div><div class='ctx'> 		cpsw_ale_read(ale, idx, ale_entry);</div><div class='ctx'> 		type = cpsw_ale_get_entry_type(ale_entry);</div><div class='ctx'> 		if (type != ALE_TYPE_VLAN)</div><div class='ctx'> 			continue;</div><div class='add'>+		vlan_members =</div><div class='add'>+			cpsw_ale_get_vlan_member_list(ale_entry,</div><div class='add'>+						      ale-&gt;vlan_field_bits);</div><div class='add'>+</div><div class='add'>+		if (port != -1 &amp;&amp; !(vlan_members &amp; BIT(port)))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		unreg_mcast =</div><div class='ctx'> 			cpsw_ale_get_vlan_unreg_mcast(ale_entry,</div><div class='ctx'> 						      ale-&gt;vlan_field_bits);</div><div class='ctx'> 		if (allmulti)</div><div class='del'>-			unreg_mcast |= 1;</div><div class='add'>+			unreg_mcast |= ALE_PORT_HOST;</div><div class='ctx'> 		else</div><div class='del'>-			unreg_mcast &amp;= ~1;</div><div class='add'>+			unreg_mcast &amp;= ~ALE_PORT_HOST;</div><div class='ctx'> 		cpsw_ale_set_vlan_unreg_mcast(ale_entry, unreg_mcast,</div><div class='ctx'> 					      ale-&gt;vlan_field_bits);</div><div class='ctx'> 		cpsw_ale_write(ale, idx, ale_entry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_set_allmulti);</div><div class='ctx'> </div><div class='ctx'> struct ale_control_info {</div><div class='ctx'> 	const char	*name;</div><div class='hunk'>@@ -739,7 +728,6 @@ int cpsw_ale_control_set(struct cpsw_ale *ale, int port, int control,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_control_set);</div><div class='ctx'> </div><div class='ctx'> int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control)</div><div class='ctx'> {</div><div class='hunk'>@@ -763,7 +751,6 @@ int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control)</div><div class='ctx'> 	tmp = readl_relaxed(ale-&gt;params.ale_regs + offset) &gt;&gt; shift;</div><div class='ctx'> 	return tmp &amp; BITMASK(info-&gt;bits);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_control_get);</div><div class='ctx'> </div><div class='ctx'> static void cpsw_ale_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='hunk'>@@ -788,14 +775,12 @@ void cpsw_ale_start(struct cpsw_ale *ale)</div><div class='ctx'> 		add_timer(&amp;ale-&gt;timer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_start);</div><div class='ctx'> </div><div class='ctx'> void cpsw_ale_stop(struct cpsw_ale *ale)</div><div class='ctx'> {</div><div class='ctx'> 	del_timer_sync(&amp;ale-&gt;timer);</div><div class='ctx'> 	cpsw_ale_control_set(ale, 0, ALE_ENABLE, 0);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_stop);</div><div class='ctx'> </div><div class='ctx'> struct cpsw_ale *cpsw_ale_create(struct cpsw_ale_params *params)</div><div class='ctx'> {</div><div class='hunk'>@@ -879,7 +864,6 @@ struct cpsw_ale *cpsw_ale_create(struct cpsw_ale_params *params)</div><div class='ctx'> </div><div class='ctx'> 	return ale;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_create);</div><div class='ctx'> </div><div class='ctx'> void cpsw_ale_dump(struct cpsw_ale *ale, u32 *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -890,8 +874,3 @@ void cpsw_ale_dump(struct cpsw_ale *ale, u32 *data)</div><div class='ctx'> 		data += ALE_ENTRY_WORDS;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpsw_ale_dump);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_DESCRIPTION("TI CPSW ALE driver");</div><div class='del'>-MODULE_AUTHOR("Texas Instruments");</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw_ale.h b/drivers/net/ethernet/ti/cpsw_ale.h<br/>index cd07a3e96d57..370df254eb12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_ale.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpsw_ale.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_ale.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_ale.h</a></div><div class='hunk'>@@ -1,16 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Texas Instruments N-Port Ethernet Switch Address Lookup Engine APIs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 Texas Instruments</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 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='ctx'>  */</div><div class='ctx'> #ifndef __TI_CPSW_ALE_H__</div><div class='ctx'> #define __TI_CPSW_ALE_H__</div><div class='hunk'>@@ -37,7 +30,6 @@ struct cpsw_ale {</div><div class='ctx'> 	struct cpsw_ale_params	params;</div><div class='ctx'> 	struct timer_list	timer;</div><div class='ctx'> 	unsigned long		ageout;</div><div class='del'>-	int			allmulti;</div><div class='ctx'> 	u32			version;</div><div class='ctx'> 	/* These bits are different on NetCP NU Switch ALE */</div><div class='ctx'> 	u32			port_mask_bits;</div><div class='hunk'>@@ -116,7 +108,7 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,</div><div class='ctx'> int cpsw_ale_add_vlan(struct cpsw_ale *ale, u16 vid, int port, int untag,</div><div class='ctx'> 			int reg_mcast, int unreg_mcast);</div><div class='ctx'> int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port);</div><div class='del'>-void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti);</div><div class='add'>+void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti, int port);</div><div class='ctx'> </div><div class='ctx'> int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control);</div><div class='ctx'> int cpsw_ale_control_set(struct cpsw_ale *ale, int port,</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw_ethtool.c b/drivers/net/ethernet/ti/cpsw_ethtool.c<br/>new file mode 100644<br/>index 000000000000..a4a7ec0d2531<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,719 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Texas Instruments Ethernet Switch Driver ethtool intf</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Texas Instruments</div><div class='add'>+ */</div><div class='add'>+</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='add'>+#include &lt;linux/kmemleak.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/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cpsw.h"</div><div class='add'>+#include "cpts.h"</div><div class='add'>+#include "cpsw_ale.h"</div><div class='add'>+#include "cpsw_priv.h"</div><div class='add'>+#include "davinci_cpdma.h"</div><div class='add'>+</div><div class='add'>+struct cpsw_hw_stats {</div><div class='add'>+	u32	rxgoodframes;</div><div class='add'>+	u32	rxbroadcastframes;</div><div class='add'>+	u32	rxmulticastframes;</div><div class='add'>+	u32	rxpauseframes;</div><div class='add'>+	u32	rxcrcerrors;</div><div class='add'>+	u32	rxaligncodeerrors;</div><div class='add'>+	u32	rxoversizedframes;</div><div class='add'>+	u32	rxjabberframes;</div><div class='add'>+	u32	rxundersizedframes;</div><div class='add'>+	u32	rxfragments;</div><div class='add'>+	u32	__pad_0[2];</div><div class='add'>+	u32	rxoctets;</div><div class='add'>+	u32	txgoodframes;</div><div class='add'>+	u32	txbroadcastframes;</div><div class='add'>+	u32	txmulticastframes;</div><div class='add'>+	u32	txpauseframes;</div><div class='add'>+	u32	txdeferredframes;</div><div class='add'>+	u32	txcollisionframes;</div><div class='add'>+	u32	txsinglecollframes;</div><div class='add'>+	u32	txmultcollframes;</div><div class='add'>+	u32	txexcessivecollisions;</div><div class='add'>+	u32	txlatecollisions;</div><div class='add'>+	u32	txunderrun;</div><div class='add'>+	u32	txcarriersenseerrors;</div><div class='add'>+	u32	txoctets;</div><div class='add'>+	u32	octetframes64;</div><div class='add'>+	u32	octetframes65t127;</div><div class='add'>+	u32	octetframes128t255;</div><div class='add'>+	u32	octetframes256t511;</div><div class='add'>+	u32	octetframes512t1023;</div><div class='add'>+	u32	octetframes1024tup;</div><div class='add'>+	u32	netoctets;</div><div class='add'>+	u32	rxsofoverruns;</div><div class='add'>+	u32	rxmofoverruns;</div><div class='add'>+	u32	rxdmaoverruns;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_stats {</div><div class='add'>+	char stat_string[ETH_GSTRING_LEN];</div><div class='add'>+	int type;</div><div class='add'>+	int sizeof_stat;</div><div class='add'>+	int stat_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CPSW_STATS,</div><div class='add'>+	CPDMA_RX_STATS,</div><div class='add'>+	CPDMA_TX_STATS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CPSW_STAT(m)		CPSW_STATS,				\</div><div class='add'>+				FIELD_SIZEOF(struct cpsw_hw_stats, m), \</div><div class='add'>+				offsetof(struct cpsw_hw_stats, m)</div><div class='add'>+#define CPDMA_RX_STAT(m)	CPDMA_RX_STATS,				   \</div><div class='add'>+				FIELD_SIZEOF(struct cpdma_chan_stats, m), \</div><div class='add'>+				offsetof(struct cpdma_chan_stats, m)</div><div class='add'>+#define CPDMA_TX_STAT(m)	CPDMA_TX_STATS,				   \</div><div class='add'>+				FIELD_SIZEOF(struct cpdma_chan_stats, m), \</div><div class='add'>+				offsetof(struct cpdma_chan_stats, m)</div><div class='add'>+</div><div class='add'>+static const struct cpsw_stats cpsw_gstrings_stats[] = {</div><div class='add'>+	{ "Good Rx Frames", CPSW_STAT(rxgoodframes) },</div><div class='add'>+	{ "Broadcast Rx Frames", CPSW_STAT(rxbroadcastframes) },</div><div class='add'>+	{ "Multicast Rx Frames", CPSW_STAT(rxmulticastframes) },</div><div class='add'>+	{ "Pause Rx Frames", CPSW_STAT(rxpauseframes) },</div><div class='add'>+	{ "Rx CRC Errors", CPSW_STAT(rxcrcerrors) },</div><div class='add'>+	{ "Rx Align/Code Errors", CPSW_STAT(rxaligncodeerrors) },</div><div class='add'>+	{ "Oversize Rx Frames", CPSW_STAT(rxoversizedframes) },</div><div class='add'>+	{ "Rx Jabbers", CPSW_STAT(rxjabberframes) },</div><div class='add'>+	{ "Undersize (Short) Rx Frames", CPSW_STAT(rxundersizedframes) },</div><div class='add'>+	{ "Rx Fragments", CPSW_STAT(rxfragments) },</div><div class='add'>+	{ "Rx Octets", CPSW_STAT(rxoctets) },</div><div class='add'>+	{ "Good Tx Frames", CPSW_STAT(txgoodframes) },</div><div class='add'>+	{ "Broadcast Tx Frames", CPSW_STAT(txbroadcastframes) },</div><div class='add'>+	{ "Multicast Tx Frames", CPSW_STAT(txmulticastframes) },</div><div class='add'>+	{ "Pause Tx Frames", CPSW_STAT(txpauseframes) },</div><div class='add'>+	{ "Deferred Tx Frames", CPSW_STAT(txdeferredframes) },</div><div class='add'>+	{ "Collisions", CPSW_STAT(txcollisionframes) },</div><div class='add'>+	{ "Single Collision Tx Frames", CPSW_STAT(txsinglecollframes) },</div><div class='add'>+	{ "Multiple Collision Tx Frames", CPSW_STAT(txmultcollframes) },</div><div class='add'>+	{ "Excessive Collisions", CPSW_STAT(txexcessivecollisions) },</div><div class='add'>+	{ "Late Collisions", CPSW_STAT(txlatecollisions) },</div><div class='add'>+	{ "Tx Underrun", CPSW_STAT(txunderrun) },</div><div class='add'>+	{ "Carrier Sense Errors", CPSW_STAT(txcarriersenseerrors) },</div><div class='add'>+	{ "Tx Octets", CPSW_STAT(txoctets) },</div><div class='add'>+	{ "Rx + Tx 64 Octet Frames", CPSW_STAT(octetframes64) },</div><div class='add'>+	{ "Rx + Tx 65-127 Octet Frames", CPSW_STAT(octetframes65t127) },</div><div class='add'>+	{ "Rx + Tx 128-255 Octet Frames", CPSW_STAT(octetframes128t255) },</div><div class='add'>+	{ "Rx + Tx 256-511 Octet Frames", CPSW_STAT(octetframes256t511) },</div><div class='add'>+	{ "Rx + Tx 512-1023 Octet Frames", CPSW_STAT(octetframes512t1023) },</div><div class='add'>+	{ "Rx + Tx 1024-Up Octet Frames", CPSW_STAT(octetframes1024tup) },</div><div class='add'>+	{ "Net Octets", CPSW_STAT(netoctets) },</div><div class='add'>+	{ "Rx Start of Frame Overruns", CPSW_STAT(rxsofoverruns) },</div><div class='add'>+	{ "Rx Middle of Frame Overruns", CPSW_STAT(rxmofoverruns) },</div><div class='add'>+	{ "Rx DMA Overruns", CPSW_STAT(rxdmaoverruns) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cpsw_stats cpsw_gstrings_ch_stats[] = {</div><div class='add'>+	{ "head_enqueue", CPDMA_RX_STAT(head_enqueue) },</div><div class='add'>+	{ "tail_enqueue", CPDMA_RX_STAT(tail_enqueue) },</div><div class='add'>+	{ "pad_enqueue", CPDMA_RX_STAT(pad_enqueue) },</div><div class='add'>+	{ "misqueued", CPDMA_RX_STAT(misqueued) },</div><div class='add'>+	{ "desc_alloc_fail", CPDMA_RX_STAT(desc_alloc_fail) },</div><div class='add'>+	{ "pad_alloc_fail", CPDMA_RX_STAT(pad_alloc_fail) },</div><div class='add'>+	{ "runt_receive_buf", CPDMA_RX_STAT(runt_receive_buff) },</div><div class='add'>+	{ "runt_transmit_buf", CPDMA_RX_STAT(runt_transmit_buff) },</div><div class='add'>+	{ "empty_dequeue", CPDMA_RX_STAT(empty_dequeue) },</div><div class='add'>+	{ "busy_dequeue", CPDMA_RX_STAT(busy_dequeue) },</div><div class='add'>+	{ "good_dequeue", CPDMA_RX_STAT(good_dequeue) },</div><div class='add'>+	{ "requeue", CPDMA_RX_STAT(requeue) },</div><div class='add'>+	{ "teardown_dequeue", CPDMA_RX_STAT(teardown_dequeue) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CPSW_STATS_COMMON_LEN	ARRAY_SIZE(cpsw_gstrings_stats)</div><div class='add'>+#define CPSW_STATS_CH_LEN	ARRAY_SIZE(cpsw_gstrings_ch_stats)</div><div class='add'>+</div><div class='add'>+u32 cpsw_get_msglevel(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</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'>+void cpsw_set_msglevel(struct net_device *ndev, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;msg_enable = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_get_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+</div><div class='add'>+	coal-&gt;rx_coalesce_usecs = cpsw-&gt;coal_intvl;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 int_ctrl;</div><div class='add'>+	u32 num_interrupts = 0;</div><div class='add'>+	u32 prescale = 0;</div><div class='add'>+	u32 addnl_dvdr = 1;</div><div class='add'>+	u32 coal_intvl = 0;</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+</div><div class='add'>+	coal_intvl = coal-&gt;rx_coalesce_usecs;</div><div class='add'>+</div><div class='add'>+	int_ctrl =  readl(&amp;cpsw-&gt;wr_regs-&gt;int_control);</div><div class='add'>+	prescale = cpsw-&gt;bus_freq_mhz * 4;</div><div class='add'>+</div><div class='add'>+	if (!coal-&gt;rx_coalesce_usecs) {</div><div class='add'>+		int_ctrl &amp;= ~(CPSW_INTPRESCALE_MASK | CPSW_INTPACEEN);</div><div class='add'>+		goto update_return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (coal_intvl &lt; CPSW_CMINTMIN_INTVL)</div><div class='add'>+		coal_intvl = CPSW_CMINTMIN_INTVL;</div><div class='add'>+</div><div class='add'>+	if (coal_intvl &gt; CPSW_CMINTMAX_INTVL) {</div><div class='add'>+		/* Interrupt pacer works with 4us Pulse, we can</div><div class='add'>+		 * throttle further by dilating the 4us pulse.</div><div class='add'>+		 */</div><div class='add'>+		addnl_dvdr = CPSW_INTPRESCALE_MASK / prescale;</div><div class='add'>+</div><div class='add'>+		if (addnl_dvdr &gt; 1) {</div><div class='add'>+			prescale *= addnl_dvdr;</div><div class='add'>+			if (coal_intvl &gt; (CPSW_CMINTMAX_INTVL * addnl_dvdr))</div><div class='add'>+				coal_intvl = (CPSW_CMINTMAX_INTVL</div><div class='add'>+						* addnl_dvdr);</div><div class='add'>+		} else {</div><div class='add'>+			addnl_dvdr = 1;</div><div class='add'>+			coal_intvl = CPSW_CMINTMAX_INTVL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_interrupts = (1000 * addnl_dvdr) / coal_intvl;</div><div class='add'>+	writel(num_interrupts, &amp;cpsw-&gt;wr_regs-&gt;rx_imax);</div><div class='add'>+	writel(num_interrupts, &amp;cpsw-&gt;wr_regs-&gt;tx_imax);</div><div class='add'>+</div><div class='add'>+	int_ctrl |= CPSW_INTPACEEN;</div><div class='add'>+	int_ctrl &amp;= (~CPSW_INTPRESCALE_MASK);</div><div class='add'>+	int_ctrl |= (prescale &amp; CPSW_INTPRESCALE_MASK);</div><div class='add'>+</div><div class='add'>+update_return:</div><div class='add'>+	writel(int_ctrl, &amp;cpsw-&gt;wr_regs-&gt;int_control);</div><div class='add'>+</div><div class='add'>+	cpsw_notice(priv, timer, "Set coalesce to %d usecs.\n", coal_intvl);</div><div class='add'>+	cpsw-&gt;coal_intvl = coal_intvl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_get_sset_count(struct net_device *ndev, int sset)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return (CPSW_STATS_COMMON_LEN +</div><div class='add'>+		       (cpsw-&gt;rx_ch_num + cpsw-&gt;tx_ch_num) *</div><div class='add'>+		       CPSW_STATS_CH_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 cpsw_add_ch_strings(u8 **p, int ch_num, int rx_dir)</div><div class='add'>+{</div><div class='add'>+	int ch_stats_len;</div><div class='add'>+	int line;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ch_stats_len = CPSW_STATS_CH_LEN * ch_num;</div><div class='add'>+	for (i = 0; i &lt; ch_stats_len; i++) {</div><div class='add'>+		line = i % CPSW_STATS_CH_LEN;</div><div class='add'>+		snprintf(*p, ETH_GSTRING_LEN,</div><div class='add'>+			 "%s DMA chan %ld: %s", rx_dir ? "Rx" : "Tx",</div><div class='add'>+			 (long)(i / CPSW_STATS_CH_LEN),</div><div class='add'>+			 cpsw_gstrings_ch_stats[line].stat_string);</div><div class='add'>+		*p += ETH_GSTRING_LEN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_get_strings(struct net_device *ndev, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+	u8 *p = data;</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; CPSW_STATS_COMMON_LEN; i++) {</div><div class='add'>+			memcpy(p, cpsw_gstrings_stats[i].stat_string,</div><div class='add'>+			       ETH_GSTRING_LEN);</div><div class='add'>+			p += ETH_GSTRING_LEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cpsw_add_ch_strings(&amp;p, cpsw-&gt;rx_ch_num, 1);</div><div class='add'>+		cpsw_add_ch_strings(&amp;p, cpsw-&gt;tx_ch_num, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_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'>+	u8 *p;</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+	struct cpdma_chan_stats ch_stats;</div><div class='add'>+	int i, l, ch;</div><div class='add'>+</div><div class='add'>+	/* Collect Davinci CPDMA stats for Rx and Tx Channel */</div><div class='add'>+	for (l = 0; l &lt; CPSW_STATS_COMMON_LEN; l++)</div><div class='add'>+		data[l] = readl(cpsw-&gt;hw_stats +</div><div class='add'>+				cpsw_gstrings_stats[l].stat_offset);</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; cpsw-&gt;rx_ch_num; ch++) {</div><div class='add'>+		cpdma_chan_get_stats(cpsw-&gt;rxv[ch].ch, &amp;ch_stats);</div><div class='add'>+		for (i = 0; i &lt; CPSW_STATS_CH_LEN; i++, l++) {</div><div class='add'>+			p = (u8 *)&amp;ch_stats +</div><div class='add'>+				cpsw_gstrings_ch_stats[i].stat_offset;</div><div class='add'>+			data[l] = *(u32 *)p;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; cpsw-&gt;tx_ch_num; ch++) {</div><div class='add'>+		cpdma_chan_get_stats(cpsw-&gt;txv[ch].ch, &amp;ch_stats);</div><div class='add'>+		for (i = 0; i &lt; CPSW_STATS_CH_LEN; i++, l++) {</div><div class='add'>+			p = (u8 *)&amp;ch_stats +</div><div class='add'>+				cpsw_gstrings_ch_stats[i].stat_offset;</div><div class='add'>+			data[l] = *(u32 *)p;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_get_pauseparam(struct net_device *ndev,</div><div class='add'>+			 struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	pause-&gt;autoneg = AUTONEG_DISABLE;</div><div class='add'>+	pause-&gt;rx_pause = priv-&gt;rx_pause ? true : false;</div><div class='add'>+	pause-&gt;tx_pause = priv-&gt;tx_pause ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	wol-&gt;supported = 0;</div><div class='add'>+	wol-&gt;wolopts = 0;</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		phy_ethtool_get_wol(cpsw-&gt;slaves[slave_no].phy, wol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		return phy_ethtool_set_wol(cpsw-&gt;slaves[slave_no].phy, wol);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_get_regs_len(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+</div><div class='add'>+	return cpsw-&gt;data.ale_entries * ALE_ENTRY_WORDS * sizeof(u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_get_regs(struct net_device *ndev, struct ethtool_regs *regs, void *p)</div><div class='add'>+{</div><div class='add'>+	u32 *reg = p;</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+</div><div class='add'>+	/* update CPSW IP version */</div><div class='add'>+	regs-&gt;version = cpsw-&gt;version;</div><div class='add'>+</div><div class='add'>+	cpsw_ale_dump(cpsw-&gt;ale, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_ethtool_op_begin(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(cpsw-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		cpsw_err(priv, drv, "ethtool begin failed %d\n", ret);</div><div class='add'>+		pm_runtime_put_noidle(cpsw-&gt;dev);</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 cpsw_ethtool_op_complete(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_put(priv-&gt;cpsw-&gt;dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		cpsw_err(priv, drv, "ethtool complete failed %d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_get_channels(struct net_device *ndev, struct ethtool_channels *ch)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+</div><div class='add'>+	ch-&gt;max_rx = cpsw-&gt;quirk_irq ? 1 : CPSW_MAX_QUEUES;</div><div class='add'>+	ch-&gt;max_tx = cpsw-&gt;quirk_irq ? 1 : CPSW_MAX_QUEUES;</div><div class='add'>+	ch-&gt;max_combined = 0;</div><div class='add'>+	ch-&gt;max_other = 0;</div><div class='add'>+	ch-&gt;other_count = 0;</div><div class='add'>+	ch-&gt;rx_count = cpsw-&gt;rx_ch_num;</div><div class='add'>+	ch-&gt;tx_count = cpsw-&gt;tx_ch_num;</div><div class='add'>+	ch-&gt;combined_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_get_link_ksettings(struct net_device *ndev,</div><div class='add'>+			    struct ethtool_link_ksettings *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	if (!cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	phy_ethtool_ksettings_get(cpsw-&gt;slaves[slave_no].phy, ecmd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_set_link_ksettings(struct net_device *ndev,</div><div class='add'>+			    const struct ethtool_link_ksettings *ecmd)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	if (!cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return phy_ethtool_ksettings_set(cpsw-&gt;slaves[slave_no].phy, ecmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_get_eee(struct net_device *ndev, struct ethtool_eee *edata)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		return phy_ethtool_get_eee(cpsw-&gt;slaves[slave_no].phy, edata);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_set_eee(struct net_device *ndev, struct ethtool_eee *edata)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		return phy_ethtool_set_eee(cpsw-&gt;slaves[slave_no].phy, edata);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_nway_reset(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int slave_no = cpsw_slave_index(cpsw, priv);</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;slaves[slave_no].phy)</div><div class='add'>+		return genphy_restart_aneg(cpsw-&gt;slaves[slave_no].phy);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpsw_suspend_data_pass(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</div><div class='add'>+	struct cpsw_slave *slave;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Disable NAPI scheduling */</div><div class='add'>+	cpsw_intr_disable(cpsw);</div><div class='add'>+</div><div class='add'>+	/* Stop all transmit queues for every network device.</div><div class='add'>+	 * Disable re-using rx descriptors with dormant_on.</div><div class='add'>+	 */</div><div class='add'>+	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++) {</div><div class='add'>+		if (!(slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		netif_tx_stop_all_queues(slave-&gt;ndev);</div><div class='add'>+		netif_dormant_on(slave-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle rest of tx packets and stop cpdma channels */</div><div class='add'>+	cpdma_ctlr_stop(cpsw-&gt;dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpsw_resume_data_pass(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	struct cpsw_slave *slave;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* Allow rx packets handling */</div><div class='add'>+	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++)</div><div class='add'>+		if (slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev))</div><div class='add'>+			netif_dormant_off(slave-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	/* After this receive is started */</div><div class='add'>+	if (cpsw-&gt;usage_count) {</div><div class='add'>+		ret = cpsw_fill_rx_channels(priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		cpdma_ctlr_start(cpsw-&gt;dma);</div><div class='add'>+		cpsw_intr_enable(cpsw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Resume transmit for every affected interface */</div><div class='add'>+	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++)</div><div class='add'>+		if (slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev))</div><div class='add'>+			netif_tx_start_all_queues(slave-&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 cpsw_check_ch_settings(struct cpsw_common *cpsw,</div><div class='add'>+				  struct ethtool_channels *ch)</div><div class='add'>+{</div><div class='add'>+	if (cpsw-&gt;quirk_irq) {</div><div class='add'>+		dev_err(cpsw-&gt;dev, "Maximum one tx/rx queue is allowed");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;combined_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* verify we have at least one channel in each direction */</div><div class='add'>+	if (!ch-&gt;rx_count || !ch-&gt;tx_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;rx_count &gt; cpsw-&gt;data.channels ||</div><div class='add'>+	    ch-&gt;tx_count &gt; cpsw-&gt;data.channels)</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 cpsw_update_channels_res(struct cpsw_priv *priv, int ch_num, int rx,</div><div class='add'>+				    cpdma_handler_fn rx_handler)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	void (*handler)(void *, int, int);</div><div class='add'>+	struct netdev_queue *queue;</div><div class='add'>+	struct cpsw_vector *vec;</div><div class='add'>+	int ret, *ch, vch;</div><div class='add'>+</div><div class='add'>+	if (rx) {</div><div class='add'>+		ch = &amp;cpsw-&gt;rx_ch_num;</div><div class='add'>+		vec = cpsw-&gt;rxv;</div><div class='add'>+		handler = rx_handler;</div><div class='add'>+	} else {</div><div class='add'>+		ch = &amp;cpsw-&gt;tx_ch_num;</div><div class='add'>+		vec = cpsw-&gt;txv;</div><div class='add'>+		handler = cpsw_tx_handler;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (*ch &lt; ch_num) {</div><div class='add'>+		vch = rx ? *ch : 7 - *ch;</div><div class='add'>+		vec[*ch].ch = cpdma_chan_create(cpsw-&gt;dma, vch, handler, rx);</div><div class='add'>+		queue = netdev_get_tx_queue(priv-&gt;ndev, *ch);</div><div class='add'>+		queue-&gt;tx_maxrate = 0;</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(vec[*ch].ch))</div><div class='add'>+			return PTR_ERR(vec[*ch].ch);</div><div class='add'>+</div><div class='add'>+		if (!vec[*ch].ch)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		cpsw_info(priv, ifup, "created new %d %s channel\n", *ch,</div><div class='add'>+			  (rx ? "rx" : "tx"));</div><div class='add'>+		(*ch)++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (*ch &gt; ch_num) {</div><div class='add'>+		(*ch)--;</div><div class='add'>+</div><div class='add'>+		ret = cpdma_chan_destroy(vec[*ch].ch);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		cpsw_info(priv, ifup, "destroyed %d %s channel\n", *ch,</div><div class='add'>+			  (rx ? "rx" : "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 cpsw_set_channels_common(struct net_device *ndev,</div><div class='add'>+			     struct ethtool_channels *chs,</div><div class='add'>+			     cpdma_handler_fn rx_handler)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	struct cpsw_slave *slave;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = cpsw_check_ch_settings(cpsw, chs);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cpsw_suspend_data_pass(ndev);</div><div class='add'>+</div><div class='add'>+	ret = cpsw_update_channels_res(priv, chs-&gt;rx_count, 1, rx_handler);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cpsw_update_channels_res(priv, chs-&gt;tx_count, 0, rx_handler);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	for (i = cpsw-&gt;data.slaves, slave = cpsw-&gt;slaves; i; i--, slave++) {</div><div class='add'>+		if (!(slave-&gt;ndev &amp;&amp; netif_running(slave-&gt;ndev)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Inform stack about new count of queues */</div><div class='add'>+		ret = netif_set_real_num_tx_queues(slave-&gt;ndev,</div><div class='add'>+						   cpsw-&gt;tx_ch_num);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "cannot set real number of tx queues\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = netif_set_real_num_rx_queues(slave-&gt;ndev,</div><div class='add'>+						   cpsw-&gt;rx_ch_num);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "cannot set real number of rx queues\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;usage_count)</div><div class='add'>+		cpsw_split_res(cpsw);</div><div class='add'>+</div><div class='add'>+	ret = cpsw_resume_data_pass(ndev);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_err(priv-&gt;dev, "cannot update channels number, closing device\n");</div><div class='add'>+	dev_close(ndev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_get_ringparam(struct net_device *ndev,</div><div class='add'>+			struct ethtool_ringparam *ering)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+</div><div class='add'>+	/* not supported */</div><div class='add'>+	ering-&gt;tx_max_pending = 0;</div><div class='add'>+	ering-&gt;tx_pending = cpdma_get_num_tx_descs(cpsw-&gt;dma);</div><div class='add'>+	ering-&gt;rx_max_pending = cpsw-&gt;descs_pool_size - CPSW_MAX_QUEUES;</div><div class='add'>+	ering-&gt;rx_pending = cpdma_get_num_rx_descs(cpsw-&gt;dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_set_ringparam(struct net_device *ndev,</div><div class='add'>+		       struct ethtool_ringparam *ering)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct cpsw_common *cpsw = priv-&gt;cpsw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* ignore ering-&gt;tx_pending - only rx_pending adjustment is supported */</div><div class='add'>+</div><div class='add'>+	if (ering-&gt;rx_mini_pending || ering-&gt;rx_jumbo_pending ||</div><div class='add'>+	    ering-&gt;rx_pending &lt; CPSW_MAX_QUEUES ||</div><div class='add'>+	    ering-&gt;rx_pending &gt; (cpsw-&gt;descs_pool_size - CPSW_MAX_QUEUES))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ering-&gt;rx_pending == cpdma_get_num_rx_descs(cpsw-&gt;dma))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cpsw_suspend_data_pass(ndev);</div><div class='add'>+</div><div class='add'>+	cpdma_set_num_rx_descs(cpsw-&gt;dma, ering-&gt;rx_pending);</div><div class='add'>+</div><div class='add'>+	if (cpsw-&gt;usage_count)</div><div class='add'>+		cpdma_chan_split_pool(cpsw-&gt;dma);</div><div class='add'>+</div><div class='add'>+	ret = cpsw_resume_data_pass(ndev);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_err(cpsw-&gt;dev, "cannot set ring params, closing device\n");</div><div class='add'>+	dev_close(ndev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_TI_CPTS)</div><div class='add'>+int cpsw_get_ts_info(struct net_device *ndev, struct ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);</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_TX_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+	info-&gt;phc_index = cpsw-&gt;cpts-&gt;phc_index;</div><div class='add'>+	info-&gt;tx_types =</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_TX_OFF) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='add'>+	info-&gt;rx_filters =</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_EVENT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+int cpsw_get_ts_info(struct net_device *ndev, struct 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_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+	info-&gt;phc_index = -1;</div><div class='add'>+	info-&gt;tx_types = 0;</div><div class='add'>+	info-&gt;rx_filters = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c<br/>new file mode 100644<br/>index 000000000000..476d050a022c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_priv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_priv.c</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Texas Instruments Ethernet Switch Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Texas Instruments</div><div class='add'>+ */</div><div class='add'>+</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='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/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cpts.h"</div><div class='add'>+#include "cpsw_ale.h"</div><div class='add'>+#include "cpsw_priv.h"</div><div class='add'>+#include "cpsw_sl.h"</div><div class='add'>+#include "davinci_cpdma.h"</div><div class='add'>+</div><div class='add'>+int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,</div><div class='add'>+		     int ale_ageout, phys_addr_t desc_mem_phys,</div><div class='add'>+		     int descs_pool_size)</div><div class='add'>+{</div><div class='add'>+	u32 slave_offset, sliver_offset, slave_size;</div><div class='add'>+	struct cpsw_ale_params ale_params;</div><div class='add'>+	struct cpsw_platform_data *data;</div><div class='add'>+	struct cpdma_params dma_params;</div><div class='add'>+	struct device *dev = cpsw-&gt;dev;</div><div class='add'>+	void __iomem *cpts_regs;</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+</div><div class='add'>+	data = &amp;cpsw-&gt;data;</div><div class='add'>+	cpsw-&gt;rx_ch_num = 1;</div><div class='add'>+	cpsw-&gt;tx_ch_num = 1;</div><div class='add'>+</div><div class='add'>+	cpsw-&gt;version = readl(&amp;cpsw-&gt;regs-&gt;id_ver);</div><div class='add'>+</div><div class='add'>+	memset(&amp;dma_params, 0, sizeof(dma_params));</div><div class='add'>+	memset(&amp;ale_params, 0, sizeof(ale_params));</div><div class='add'>+</div><div class='add'>+	switch (cpsw-&gt;version) {</div><div class='add'>+	case CPSW_VERSION_1:</div><div class='add'>+		cpsw-&gt;host_port_regs = ss_regs + CPSW1_HOST_PORT_OFFSET;</div><div class='add'>+		cpts_regs	     = ss_regs + CPSW1_CPTS_OFFSET;</div><div class='add'>+		cpsw-&gt;hw_stats	     = ss_regs + CPSW1_HW_STATS;</div><div class='add'>+		dma_params.dmaregs   = ss_regs + CPSW1_CPDMA_OFFSET;</div><div class='add'>+		dma_params.txhdp     = ss_regs + CPSW1_STATERAM_OFFSET;</div><div class='add'>+		ale_params.ale_regs  = ss_regs + CPSW1_ALE_OFFSET;</div><div class='add'>+		slave_offset         = CPSW1_SLAVE_OFFSET;</div><div class='add'>+		slave_size           = CPSW1_SLAVE_SIZE;</div><div class='add'>+		sliver_offset        = CPSW1_SLIVER_OFFSET;</div><div class='add'>+		dma_params.desc_mem_phys = 0;</div><div class='add'>+		break;</div><div class='add'>+	case CPSW_VERSION_2:</div><div class='add'>+	case CPSW_VERSION_3:</div><div class='add'>+	case CPSW_VERSION_4:</div><div class='add'>+		cpsw-&gt;host_port_regs = ss_regs + CPSW2_HOST_PORT_OFFSET;</div><div class='add'>+		cpts_regs	     = ss_regs + CPSW2_CPTS_OFFSET;</div><div class='add'>+		cpsw-&gt;hw_stats	     = ss_regs + CPSW2_HW_STATS;</div><div class='add'>+		dma_params.dmaregs   = ss_regs + CPSW2_CPDMA_OFFSET;</div><div class='add'>+		dma_params.txhdp     = ss_regs + CPSW2_STATERAM_OFFSET;</div><div class='add'>+		ale_params.ale_regs  = ss_regs + CPSW2_ALE_OFFSET;</div><div class='add'>+		slave_offset         = CPSW2_SLAVE_OFFSET;</div><div class='add'>+		slave_size           = CPSW2_SLAVE_SIZE;</div><div class='add'>+		sliver_offset        = CPSW2_SLIVER_OFFSET;</div><div class='add'>+		dma_params.desc_mem_phys = desc_mem_phys;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "unknown version 0x%08x\n", cpsw-&gt;version);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cpsw-&gt;data.slaves; i++) {</div><div class='add'>+		struct cpsw_slave *slave = &amp;cpsw-&gt;slaves[i];</div><div class='add'>+		void __iomem		*regs = cpsw-&gt;regs;</div><div class='add'>+</div><div class='add'>+		slave-&gt;slave_num = i;</div><div class='add'>+		slave-&gt;data	= &amp;cpsw-&gt;data.slave_data[i];</div><div class='add'>+		slave-&gt;regs	= regs + slave_offset;</div><div class='add'>+		slave-&gt;port_vlan = slave-&gt;data-&gt;dual_emac_res_vlan;</div><div class='add'>+		slave-&gt;mac_sl = cpsw_sl_get("cpsw", dev, regs + sliver_offset);</div><div class='add'>+		if (IS_ERR(slave-&gt;mac_sl))</div><div class='add'>+			return PTR_ERR(slave-&gt;mac_sl);</div><div class='add'>+</div><div class='add'>+		slave_offset  += slave_size;</div><div class='add'>+		sliver_offset += SLIVER_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ale_params.dev			= dev;</div><div class='add'>+	ale_params.ale_ageout		= ale_ageout;</div><div class='add'>+	ale_params.ale_entries		= data-&gt;ale_entries;</div><div class='add'>+	ale_params.ale_ports		= CPSW_ALE_PORTS_NUM;</div><div class='add'>+</div><div class='add'>+	cpsw-&gt;ale = cpsw_ale_create(&amp;ale_params);</div><div class='add'>+	if (!cpsw-&gt;ale) {</div><div class='add'>+		dev_err(dev, "error initializing ale engine\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_params.dev		= dev;</div><div class='add'>+	dma_params.rxthresh	= dma_params.dmaregs + CPDMA_RXTHRESH;</div><div class='add'>+	dma_params.rxfree	= dma_params.dmaregs + CPDMA_RXFREE;</div><div class='add'>+	dma_params.rxhdp	= dma_params.txhdp + CPDMA_RXHDP;</div><div class='add'>+	dma_params.txcp		= dma_params.txhdp + CPDMA_TXCP;</div><div class='add'>+	dma_params.rxcp		= dma_params.txhdp + CPDMA_RXCP;</div><div class='add'>+</div><div class='add'>+	dma_params.num_chan		= data-&gt;channels;</div><div class='add'>+	dma_params.has_soft_reset	= true;</div><div class='add'>+	dma_params.min_packet_size	= CPSW_MIN_PACKET_SIZE;</div><div class='add'>+	dma_params.desc_mem_size	= data-&gt;bd_ram_size;</div><div class='add'>+	dma_params.desc_align		= 16;</div><div class='add'>+	dma_params.has_ext_regs		= true;</div><div class='add'>+	dma_params.desc_hw_addr         = dma_params.desc_mem_phys;</div><div class='add'>+	dma_params.bus_freq_mhz		= cpsw-&gt;bus_freq_mhz;</div><div class='add'>+	dma_params.descs_pool_size	= descs_pool_size;</div><div class='add'>+</div><div class='add'>+	cpsw-&gt;dma = cpdma_ctlr_create(&amp;dma_params);</div><div class='add'>+	if (!cpsw-&gt;dma) {</div><div class='add'>+		dev_err(dev, "error initializing dma\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpsw-&gt;cpts = cpts_create(cpsw-&gt;dev, cpts_regs, cpsw-&gt;dev-&gt;of_node);</div><div class='add'>+	if (IS_ERR(cpsw-&gt;cpts)) {</div><div class='add'>+		ret = PTR_ERR(cpsw-&gt;cpts);</div><div class='add'>+		cpdma_ctlr_destroy(cpsw-&gt;dma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw_priv.h b/drivers/net/ethernet/ti/cpsw_priv.h<br/>new file mode 100644<br/>index 000000000000..04795b97ee71<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_priv.h</a></div><div class='hunk'>@@ -0,0 +1,429 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Texas Instruments Ethernet Switch Driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_</div><div class='add'>+#define DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_</div><div class='add'>+</div><div class='add'>+#include "davinci_cpdma.h"</div><div class='add'>+</div><div class='add'>+#define CPSW_DEBUG	(NETIF_MSG_HW		| NETIF_MSG_WOL		| \</div><div class='add'>+			 NETIF_MSG_DRV		| NETIF_MSG_LINK	| \</div><div class='add'>+			 NETIF_MSG_IFUP		| NETIF_MSG_INTR	| \</div><div class='add'>+			 NETIF_MSG_PROBE	| NETIF_MSG_TIMER	| \</div><div class='add'>+			 NETIF_MSG_IFDOWN	| NETIF_MSG_RX_ERR	| \</div><div class='add'>+			 NETIF_MSG_TX_ERR	| NETIF_MSG_TX_DONE	| \</div><div class='add'>+			 NETIF_MSG_PKTDATA	| NETIF_MSG_TX_QUEUED	| \</div><div class='add'>+			 NETIF_MSG_RX_STATUS)</div><div class='add'>+</div><div class='add'>+#define cpsw_info(priv, type, format, ...)		\</div><div class='add'>+do {								\</div><div class='add'>+	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='add'>+		dev_info(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define cpsw_err(priv, type, format, ...)		\</div><div class='add'>+do {								\</div><div class='add'>+	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='add'>+		dev_err(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define cpsw_dbg(priv, type, format, ...)		\</div><div class='add'>+do {								\</div><div class='add'>+	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='add'>+		dev_dbg(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define cpsw_notice(priv, type, format, ...)		\</div><div class='add'>+do {								\</div><div class='add'>+	if (netif_msg_##type(priv) &amp;&amp; net_ratelimit())		\</div><div class='add'>+		dev_notice(priv-&gt;dev, format, ## __VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define ALE_ALL_PORTS		0x7</div><div class='add'>+</div><div class='add'>+#define CPSW_MAJOR_VERSION(reg)		(reg &gt;&gt; 8 &amp; 0x7)</div><div class='add'>+#define CPSW_MINOR_VERSION(reg)		(reg &amp; 0xff)</div><div class='add'>+#define CPSW_RTL_VERSION(reg)		((reg &gt;&gt; 11) &amp; 0x1f)</div><div class='add'>+</div><div class='add'>+#define CPSW_VERSION_1		0x19010a</div><div class='add'>+#define CPSW_VERSION_2		0x19010c</div><div class='add'>+#define CPSW_VERSION_3		0x19010f</div><div class='add'>+#define CPSW_VERSION_4		0x190112</div><div class='add'>+</div><div class='add'>+#define HOST_PORT_NUM		0</div><div class='add'>+#define CPSW_ALE_PORTS_NUM	3</div><div class='add'>+#define SLIVER_SIZE		0x40</div><div class='add'>+</div><div class='add'>+#define CPSW1_HOST_PORT_OFFSET	0x028</div><div class='add'>+#define CPSW1_SLAVE_OFFSET	0x050</div><div class='add'>+#define CPSW1_SLAVE_SIZE	0x040</div><div class='add'>+#define CPSW1_CPDMA_OFFSET	0x100</div><div class='add'>+#define CPSW1_STATERAM_OFFSET	0x200</div><div class='add'>+#define CPSW1_HW_STATS		0x400</div><div class='add'>+#define CPSW1_CPTS_OFFSET	0x500</div><div class='add'>+#define CPSW1_ALE_OFFSET	0x600</div><div class='add'>+#define CPSW1_SLIVER_OFFSET	0x700</div><div class='add'>+</div><div class='add'>+#define CPSW2_HOST_PORT_OFFSET	0x108</div><div class='add'>+#define CPSW2_SLAVE_OFFSET	0x200</div><div class='add'>+#define CPSW2_SLAVE_SIZE	0x100</div><div class='add'>+#define CPSW2_CPDMA_OFFSET	0x800</div><div class='add'>+#define CPSW2_HW_STATS		0x900</div><div class='add'>+#define CPSW2_STATERAM_OFFSET	0xa00</div><div class='add'>+#define CPSW2_CPTS_OFFSET	0xc00</div><div class='add'>+#define CPSW2_ALE_OFFSET	0xd00</div><div class='add'>+#define CPSW2_SLIVER_OFFSET	0xd80</div><div class='add'>+#define CPSW2_BD_OFFSET		0x2000</div><div class='add'>+</div><div class='add'>+#define CPDMA_RXTHRESH		0x0c0</div><div class='add'>+#define CPDMA_RXFREE		0x0e0</div><div class='add'>+#define CPDMA_TXHDP		0x00</div><div class='add'>+#define CPDMA_RXHDP		0x20</div><div class='add'>+#define CPDMA_TXCP		0x40</div><div class='add'>+#define CPDMA_RXCP		0x60</div><div class='add'>+</div><div class='add'>+#define CPSW_POLL_WEIGHT	64</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP_HDR_SIZE		4</div><div class='add'>+#define CPSW_MIN_PACKET_SIZE	(VLAN_ETH_ZLEN)</div><div class='add'>+#define CPSW_MAX_PACKET_SIZE	(VLAN_ETH_FRAME_LEN +\</div><div class='add'>+				 ETH_FCS_LEN +\</div><div class='add'>+				 CPSW_RX_VLAN_ENCAP_HDR_SIZE)</div><div class='add'>+</div><div class='add'>+#define RX_PRIORITY_MAPPING	0x76543210</div><div class='add'>+#define TX_PRIORITY_MAPPING	0x33221100</div><div class='add'>+#define CPDMA_TX_PRIORITY_MAP	0x76543210</div><div class='add'>+</div><div class='add'>+#define CPSW_VLAN_AWARE		BIT(1)</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP	BIT(2)</div><div class='add'>+#define CPSW_ALE_VLAN_AWARE	1</div><div class='add'>+</div><div class='add'>+#define CPSW_FIFO_NORMAL_MODE		(0 &lt;&lt; 16)</div><div class='add'>+#define CPSW_FIFO_DUAL_MAC_MODE		(1 &lt;&lt; 16)</div><div class='add'>+#define CPSW_FIFO_RATE_LIMIT_MODE	(2 &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+#define CPSW_INTPACEEN		(0x3f &lt;&lt; 16)</div><div class='add'>+#define CPSW_INTPRESCALE_MASK	(0x7FF &lt;&lt; 0)</div><div class='add'>+#define CPSW_CMINTMAX_CNT	63</div><div class='add'>+#define CPSW_CMINTMIN_CNT	2</div><div class='add'>+#define CPSW_CMINTMAX_INTVL	(1000 / CPSW_CMINTMIN_CNT)</div><div class='add'>+#define CPSW_CMINTMIN_INTVL	((1000 / CPSW_CMINTMAX_CNT) + 1)</div><div class='add'>+</div><div class='add'>+#define IRQ_NUM			2</div><div class='add'>+#define CPSW_MAX_QUEUES		8</div><div class='add'>+#define CPSW_CPDMA_DESCS_POOL_SIZE_DEFAULT 256</div><div class='add'>+#define CPSW_FIFO_QUEUE_TYPE_SHIFT	16</div><div class='add'>+#define CPSW_FIFO_SHAPE_EN_SHIFT	16</div><div class='add'>+#define CPSW_FIFO_RATE_EN_SHIFT		20</div><div class='add'>+#define CPSW_TC_NUM			4</div><div class='add'>+#define CPSW_FIFO_SHAPERS_NUM		(CPSW_TC_NUM - 1)</div><div class='add'>+#define CPSW_PCT_MASK			0x7f</div><div class='add'>+</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP_HDR_PRIO_SHIFT	29</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP_HDR_PRIO_MSK		GENMASK(2, 0)</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP_HDR_VID_SHIFT	16</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP_HDR_PKT_TYPE_SHIFT	8</div><div class='add'>+#define CPSW_RX_VLAN_ENCAP_HDR_PKT_TYPE_MSK	GENMASK(1, 0)</div><div class='add'>+enum {</div><div class='add'>+	CPSW_RX_VLAN_ENCAP_HDR_PKT_VLAN_TAG = 0,</div><div class='add'>+	CPSW_RX_VLAN_ENCAP_HDR_PKT_RESERV,</div><div class='add'>+	CPSW_RX_VLAN_ENCAP_HDR_PKT_PRIO_TAG,</div><div class='add'>+	CPSW_RX_VLAN_ENCAP_HDR_PKT_UNTAG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_wr_regs {</div><div class='add'>+	u32	id_ver;</div><div class='add'>+	u32	soft_reset;</div><div class='add'>+	u32	control;</div><div class='add'>+	u32	int_control;</div><div class='add'>+	u32	rx_thresh_en;</div><div class='add'>+	u32	rx_en;</div><div class='add'>+	u32	tx_en;</div><div class='add'>+	u32	misc_en;</div><div class='add'>+	u32	mem_allign1[8];</div><div class='add'>+	u32	rx_thresh_stat;</div><div class='add'>+	u32	rx_stat;</div><div class='add'>+	u32	tx_stat;</div><div class='add'>+	u32	misc_stat;</div><div class='add'>+	u32	mem_allign2[8];</div><div class='add'>+	u32	rx_imax;</div><div class='add'>+	u32	tx_imax;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_ss_regs {</div><div class='add'>+	u32	id_ver;</div><div class='add'>+	u32	control;</div><div class='add'>+	u32	soft_reset;</div><div class='add'>+	u32	stat_port_en;</div><div class='add'>+	u32	ptype;</div><div class='add'>+	u32	soft_idle;</div><div class='add'>+	u32	thru_rate;</div><div class='add'>+	u32	gap_thresh;</div><div class='add'>+	u32	tx_start_wds;</div><div class='add'>+	u32	flow_control;</div><div class='add'>+	u32	vlan_ltype;</div><div class='add'>+	u32	ts_ltype;</div><div class='add'>+	u32	dlr_ltype;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CPSW_PORT_V1 */</div><div class='add'>+#define CPSW1_MAX_BLKS      0x00 /* Maximum FIFO Blocks */</div><div class='add'>+#define CPSW1_BLK_CNT       0x04 /* FIFO Block Usage Count (Read Only) */</div><div class='add'>+#define CPSW1_TX_IN_CTL     0x08 /* Transmit FIFO Control */</div><div class='add'>+#define CPSW1_PORT_VLAN     0x0c /* VLAN Register */</div><div class='add'>+#define CPSW1_TX_PRI_MAP    0x10 /* Tx Header Priority to Switch Pri Mapping */</div><div class='add'>+#define CPSW1_TS_CTL        0x14 /* Time Sync Control */</div><div class='add'>+#define CPSW1_TS_SEQ_LTYPE  0x18 /* Time Sync Sequence ID Offset and Msg Type */</div><div class='add'>+#define CPSW1_TS_VLAN       0x1c /* Time Sync VLAN1 and VLAN2 */</div><div class='add'>+</div><div class='add'>+/* CPSW_PORT_V2 */</div><div class='add'>+#define CPSW2_CONTROL       0x00 /* Control Register */</div><div class='add'>+#define CPSW2_MAX_BLKS      0x08 /* Maximum FIFO Blocks */</div><div class='add'>+#define CPSW2_BLK_CNT       0x0c /* FIFO Block Usage Count (Read Only) */</div><div class='add'>+#define CPSW2_TX_IN_CTL     0x10 /* Transmit FIFO Control */</div><div class='add'>+#define CPSW2_PORT_VLAN     0x14 /* VLAN Register */</div><div class='add'>+#define CPSW2_TX_PRI_MAP    0x18 /* Tx Header Priority to Switch Pri Mapping */</div><div class='add'>+#define CPSW2_TS_SEQ_MTYPE  0x1c /* Time Sync Sequence ID Offset and Msg Type */</div><div class='add'>+</div><div class='add'>+/* CPSW_PORT_V1 and V2 */</div><div class='add'>+#define SA_LO               0x20 /* CPGMAC_SL Source Address Low */</div><div class='add'>+#define SA_HI               0x24 /* CPGMAC_SL Source Address High */</div><div class='add'>+#define SEND_PERCENT        0x28 /* Transmit Queue Send Percentages */</div><div class='add'>+</div><div class='add'>+/* CPSW_PORT_V2 only */</div><div class='add'>+#define RX_DSCP_PRI_MAP0    0x30 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP1    0x34 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP2    0x38 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP3    0x3c /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP4    0x40 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP5    0x44 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP6    0x48 /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+#define RX_DSCP_PRI_MAP7    0x4c /* Rx DSCP Priority to Rx Packet Mapping */</div><div class='add'>+</div><div class='add'>+/* Bit definitions for the CPSW2_CONTROL register */</div><div class='add'>+#define PASS_PRI_TAGGED     BIT(24) /* Pass Priority Tagged */</div><div class='add'>+#define VLAN_LTYPE2_EN      BIT(21) /* VLAN LTYPE 2 enable */</div><div class='add'>+#define VLAN_LTYPE1_EN      BIT(20) /* VLAN LTYPE 1 enable */</div><div class='add'>+#define DSCP_PRI_EN         BIT(16) /* DSCP Priority Enable */</div><div class='add'>+#define TS_107              BIT(15) /* Tyme Sync Dest IP Address 107 */</div><div class='add'>+#define TS_320              BIT(14) /* Time Sync Dest Port 320 enable */</div><div class='add'>+#define TS_319              BIT(13) /* Time Sync Dest Port 319 enable */</div><div class='add'>+#define TS_132              BIT(12) /* Time Sync Dest IP Addr 132 enable */</div><div class='add'>+#define TS_131              BIT(11) /* Time Sync Dest IP Addr 131 enable */</div><div class='add'>+#define TS_130              BIT(10) /* Time Sync Dest IP Addr 130 enable */</div><div class='add'>+#define TS_129              BIT(9)  /* Time Sync Dest IP Addr 129 enable */</div><div class='add'>+#define TS_TTL_NONZERO      BIT(8)  /* Time Sync Time To Live Non-zero enable */</div><div class='add'>+#define TS_ANNEX_F_EN       BIT(6)  /* Time Sync Annex F enable */</div><div class='add'>+#define TS_ANNEX_D_EN       BIT(4)  /* Time Sync Annex D enable */</div><div class='add'>+#define TS_LTYPE2_EN        BIT(3)  /* Time Sync LTYPE 2 enable */</div><div class='add'>+#define TS_LTYPE1_EN        BIT(2)  /* Time Sync LTYPE 1 enable */</div><div class='add'>+#define TS_TX_EN            BIT(1)  /* Time Sync Transmit Enable */</div><div class='add'>+#define TS_RX_EN            BIT(0)  /* Time Sync Receive Enable */</div><div class='add'>+</div><div class='add'>+#define CTRL_V2_TS_BITS \</div><div class='add'>+	(TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\</div><div class='add'>+	 TS_TTL_NONZERO  | TS_ANNEX_D_EN | TS_LTYPE1_EN | VLAN_LTYPE1_EN)</div><div class='add'>+</div><div class='add'>+#define CTRL_V2_ALL_TS_MASK (CTRL_V2_TS_BITS | TS_TX_EN | TS_RX_EN)</div><div class='add'>+#define CTRL_V2_TX_TS_BITS  (CTRL_V2_TS_BITS | TS_TX_EN)</div><div class='add'>+#define CTRL_V2_RX_TS_BITS  (CTRL_V2_TS_BITS | TS_RX_EN)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define CTRL_V3_TS_BITS \</div><div class='add'>+	(TS_107 | TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\</div><div class='add'>+	 TS_TTL_NONZERO | TS_ANNEX_F_EN | TS_ANNEX_D_EN |\</div><div class='add'>+	 TS_LTYPE1_EN | VLAN_LTYPE1_EN)</div><div class='add'>+</div><div class='add'>+#define CTRL_V3_ALL_TS_MASK (CTRL_V3_TS_BITS | TS_TX_EN | TS_RX_EN)</div><div class='add'>+#define CTRL_V3_TX_TS_BITS  (CTRL_V3_TS_BITS | TS_TX_EN)</div><div class='add'>+#define CTRL_V3_RX_TS_BITS  (CTRL_V3_TS_BITS | TS_RX_EN)</div><div class='add'>+</div><div class='add'>+/* Bit definitions for the CPSW2_TS_SEQ_MTYPE register */</div><div class='add'>+#define TS_SEQ_ID_OFFSET_SHIFT   (16)    /* Time Sync Sequence ID Offset */</div><div class='add'>+#define TS_SEQ_ID_OFFSET_MASK    (0x3f)</div><div class='add'>+#define TS_MSG_TYPE_EN_SHIFT     (0)     /* Time Sync Message Type Enable */</div><div class='add'>+#define TS_MSG_TYPE_EN_MASK      (0xffff)</div><div class='add'>+</div><div class='add'>+/* The PTP event messages - Sync, Delay_Req, Pdelay_Req, and Pdelay_Resp. */</div><div class='add'>+#define EVENT_MSG_BITS ((1&lt;&lt;0) | (1&lt;&lt;1) | (1&lt;&lt;2) | (1&lt;&lt;3))</div><div class='add'>+</div><div class='add'>+/* Bit definitions for the CPSW1_TS_CTL register */</div><div class='add'>+#define CPSW_V1_TS_RX_EN		BIT(0)</div><div class='add'>+#define CPSW_V1_TS_TX_EN		BIT(4)</div><div class='add'>+#define CPSW_V1_MSG_TYPE_OFS		16</div><div class='add'>+</div><div class='add'>+/* Bit definitions for the CPSW1_TS_SEQ_LTYPE register */</div><div class='add'>+#define CPSW_V1_SEQ_ID_OFS_SHIFT	16</div><div class='add'>+</div><div class='add'>+#define CPSW_MAX_BLKS_TX		15</div><div class='add'>+#define CPSW_MAX_BLKS_TX_SHIFT		4</div><div class='add'>+#define CPSW_MAX_BLKS_RX		5</div><div class='add'>+</div><div class='add'>+struct cpsw_host_regs {</div><div class='add'>+	u32	max_blks;</div><div class='add'>+	u32	blk_cnt;</div><div class='add'>+	u32	tx_in_ctl;</div><div class='add'>+	u32	port_vlan;</div><div class='add'>+	u32	tx_pri_map;</div><div class='add'>+	u32	cpdma_tx_pri_map;</div><div class='add'>+	u32	cpdma_rx_chan_map;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_slave_data {</div><div class='add'>+	struct device_node *phy_node;</div><div class='add'>+	char		phy_id[MII_BUS_ID_SIZE];</div><div class='add'>+	int		phy_if;</div><div class='add'>+	u8		mac_addr[ETH_ALEN];</div><div class='add'>+	u16		dual_emac_res_vlan;	/* Reserved VLAN for DualEMAC */</div><div class='add'>+	struct phy	*ifphy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_platform_data {</div><div class='add'>+	struct cpsw_slave_data	*slave_data;</div><div class='add'>+	u32	ss_reg_ofs;	/* Subsystem control register offset */</div><div class='add'>+	u32	channels;	/* number of cpdma channels (symmetric) */</div><div class='add'>+	u32	slaves;		/* number of slave cpgmac ports */</div><div class='add'>+	u32	active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */</div><div class='add'>+	u32	ale_entries;	/* ale table size */</div><div class='add'>+	u32	bd_ram_size;  /*buffer descriptor ram size */</div><div class='add'>+	u32	mac_control;	/* Mac control register */</div><div class='add'>+	u16	default_vlan;	/* Def VLAN for ALE lookup in VLAN aware mode*/</div><div class='add'>+	bool	dual_emac;	/* Enable Dual EMAC mode */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_slave {</div><div class='add'>+	void __iomem			*regs;</div><div class='add'>+	int				slave_num;</div><div class='add'>+	u32				mac_control;</div><div class='add'>+	struct cpsw_slave_data		*data;</div><div class='add'>+	struct phy_device		*phy;</div><div class='add'>+	struct net_device		*ndev;</div><div class='add'>+	u32				port_vlan;</div><div class='add'>+	struct cpsw_sl			*mac_sl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 slave_read(struct cpsw_slave *slave, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return readl_relaxed(slave-&gt;regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void slave_write(struct cpsw_slave *slave, u32 val, u32 offset)</div><div class='add'>+{</div><div class='add'>+	writel_relaxed(val, slave-&gt;regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpsw_vector {</div><div class='add'>+	struct cpdma_chan *ch;</div><div class='add'>+	int budget;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_common {</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	struct cpsw_platform_data	data;</div><div class='add'>+	struct napi_struct		napi_rx;</div><div class='add'>+	struct napi_struct		napi_tx;</div><div class='add'>+	struct cpsw_ss_regs __iomem	*regs;</div><div class='add'>+	struct cpsw_wr_regs __iomem	*wr_regs;</div><div class='add'>+	u8 __iomem			*hw_stats;</div><div class='add'>+	struct cpsw_host_regs __iomem	*host_port_regs;</div><div class='add'>+	u32				version;</div><div class='add'>+	u32				coal_intvl;</div><div class='add'>+	u32				bus_freq_mhz;</div><div class='add'>+	int				rx_packet_max;</div><div class='add'>+	int				descs_pool_size;</div><div class='add'>+	struct cpsw_slave		*slaves;</div><div class='add'>+	struct cpdma_ctlr		*dma;</div><div class='add'>+	struct cpsw_vector		txv[CPSW_MAX_QUEUES];</div><div class='add'>+	struct cpsw_vector		rxv[CPSW_MAX_QUEUES];</div><div class='add'>+	struct cpsw_ale			*ale;</div><div class='add'>+	bool				quirk_irq;</div><div class='add'>+	bool				rx_irq_disabled;</div><div class='add'>+	bool				tx_irq_disabled;</div><div class='add'>+	u32 irqs_table[IRQ_NUM];</div><div class='add'>+	struct cpts			*cpts;</div><div class='add'>+	int				rx_ch_num, tx_ch_num;</div><div class='add'>+	int				speed;</div><div class='add'>+	int				usage_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_priv {</div><div class='add'>+	struct net_device		*ndev;</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	u32				msg_enable;</div><div class='add'>+	u8				mac_addr[ETH_ALEN];</div><div class='add'>+	bool				rx_pause;</div><div class='add'>+	bool				tx_pause;</div><div class='add'>+	bool				mqprio_hw;</div><div class='add'>+	int				fifo_bw[CPSW_TC_NUM];</div><div class='add'>+	int				shp_cfg_speed;</div><div class='add'>+	int				tx_ts_enabled;</div><div class='add'>+	int				rx_ts_enabled;</div><div class='add'>+	u32 emac_port;</div><div class='add'>+	struct cpsw_common *cpsw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ndev_to_cpsw(ndev) (((struct cpsw_priv *)netdev_priv(ndev))-&gt;cpsw)</div><div class='add'>+#define napi_to_cpsw(napi)	container_of(napi, struct cpsw_common, napi)</div><div class='add'>+</div><div class='add'>+#define cpsw_slave_index(cpsw, priv)				\</div><div class='add'>+		((cpsw-&gt;data.dual_emac) ? priv-&gt;emac_port :	\</div><div class='add'>+		cpsw-&gt;data.active_slave)</div><div class='add'>+</div><div class='add'>+static inline int cpsw_get_slave_port(u32 slave_num)</div><div class='add'>+{</div><div class='add'>+	return slave_num + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct addr_sync_ctx {</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	const u8 *addr;		/* address to be synched */</div><div class='add'>+	int consumed;		/* number of address instances */</div><div class='add'>+	int flush;		/* flush flag */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,</div><div class='add'>+		     int ale_ageout, phys_addr_t desc_mem_phys,</div><div class='add'>+		     int descs_pool_size);</div><div class='add'>+void cpsw_split_res(struct cpsw_common *cpsw);</div><div class='add'>+int cpsw_fill_rx_channels(struct cpsw_priv *priv);</div><div class='add'>+void cpsw_intr_enable(struct cpsw_common *cpsw);</div><div class='add'>+void cpsw_intr_disable(struct cpsw_common *cpsw);</div><div class='add'>+void cpsw_tx_handler(void *token, int len, int status);</div><div class='add'>+</div><div class='add'>+/* ethtool */</div><div class='add'>+u32 cpsw_get_msglevel(struct net_device *ndev);</div><div class='add'>+void cpsw_set_msglevel(struct net_device *ndev, u32 value);</div><div class='add'>+int cpsw_get_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal);</div><div class='add'>+int cpsw_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal);</div><div class='add'>+int cpsw_get_sset_count(struct net_device *ndev, int sset);</div><div class='add'>+void cpsw_get_strings(struct net_device *ndev, u32 stringset, u8 *data);</div><div class='add'>+void cpsw_get_ethtool_stats(struct net_device *ndev,</div><div class='add'>+			    struct ethtool_stats *stats, u64 *data);</div><div class='add'>+void cpsw_get_pauseparam(struct net_device *ndev,</div><div class='add'>+			 struct ethtool_pauseparam *pause);</div><div class='add'>+void cpsw_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol);</div><div class='add'>+int cpsw_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol);</div><div class='add'>+int cpsw_get_regs_len(struct net_device *ndev);</div><div class='add'>+void cpsw_get_regs(struct net_device *ndev, struct ethtool_regs *regs, void *p);</div><div class='add'>+int cpsw_ethtool_op_begin(struct net_device *ndev);</div><div class='add'>+void cpsw_ethtool_op_complete(struct net_device *ndev);</div><div class='add'>+void cpsw_get_channels(struct net_device *ndev, struct ethtool_channels *ch);</div><div class='add'>+int cpsw_get_link_ksettings(struct net_device *ndev,</div><div class='add'>+			    struct ethtool_link_ksettings *ecmd);</div><div class='add'>+int cpsw_set_link_ksettings(struct net_device *ndev,</div><div class='add'>+			    const struct ethtool_link_ksettings *ecmd);</div><div class='add'>+int cpsw_get_eee(struct net_device *ndev, struct ethtool_eee *edata);</div><div class='add'>+int cpsw_set_eee(struct net_device *ndev, struct ethtool_eee *edata);</div><div class='add'>+int cpsw_nway_reset(struct net_device *ndev);</div><div class='add'>+void cpsw_get_ringparam(struct net_device *ndev,</div><div class='add'>+			struct ethtool_ringparam *ering);</div><div class='add'>+int cpsw_set_ringparam(struct net_device *ndev,</div><div class='add'>+		       struct ethtool_ringparam *ering);</div><div class='add'>+int cpsw_set_channels_common(struct net_device *ndev,</div><div class='add'>+			     struct ethtool_channels *chs,</div><div class='add'>+			     cpdma_handler_fn rx_handler);</div><div class='add'>+int cpsw_get_ts_info(struct net_device *ndev, struct ethtool_ts_info *info);</div><div class='add'>+</div><div class='add'>+#endif /* DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpsw_sl.c b/drivers/net/ethernet/ti/cpsw_sl.c<br/>new file mode 100644<br/>index 000000000000..0c7531cb0f39<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_sl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_sl.c</a></div><div class='hunk'>@@ -0,0 +1,328 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Texas Instruments Ethernet Switch media-access-controller (MAC) submodule/</div><div class='add'>+ * Ethernet MAC Sliver (CPGMAC_SL)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Texas Instruments</div><div class='add'>+ *</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/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cpsw_sl.h"</div><div class='add'>+</div><div class='add'>+#define CPSW_SL_REG_NOTUSED U16_MAX</div><div class='add'>+</div><div class='add'>+static const u16 cpsw_sl_reg_map_cpsw[] = {</div><div class='add'>+	[CPSW_SL_IDVER] = 0x00,</div><div class='add'>+	[CPSW_SL_MACCONTROL] = 0x04,</div><div class='add'>+	[CPSW_SL_MACSTATUS] = 0x08,</div><div class='add'>+	[CPSW_SL_SOFT_RESET] = 0x0c,</div><div class='add'>+	[CPSW_SL_RX_MAXLEN] = 0x10,</div><div class='add'>+	[CPSW_SL_BOFFTEST] = 0x14,</div><div class='add'>+	[CPSW_SL_RX_PAUSE] = 0x18,</div><div class='add'>+	[CPSW_SL_TX_PAUSE] = 0x1c,</div><div class='add'>+	[CPSW_SL_EMCONTROL] = 0x20,</div><div class='add'>+	[CPSW_SL_RX_PRI_MAP] = 0x24,</div><div class='add'>+	[CPSW_SL_TX_GAP] = 0x28,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 cpsw_sl_reg_map_66ak2hk[] = {</div><div class='add'>+	[CPSW_SL_IDVER] = 0x00,</div><div class='add'>+	[CPSW_SL_MACCONTROL] = 0x04,</div><div class='add'>+	[CPSW_SL_MACSTATUS] = 0x08,</div><div class='add'>+	[CPSW_SL_SOFT_RESET] = 0x0c,</div><div class='add'>+	[CPSW_SL_RX_MAXLEN] = 0x10,</div><div class='add'>+	[CPSW_SL_BOFFTEST] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+	[CPSW_SL_RX_PAUSE] = 0x18,</div><div class='add'>+	[CPSW_SL_TX_PAUSE] = 0x1c,</div><div class='add'>+	[CPSW_SL_EMCONTROL] = 0x20,</div><div class='add'>+	[CPSW_SL_RX_PRI_MAP] = 0x24,</div><div class='add'>+	[CPSW_SL_TX_GAP] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 cpsw_sl_reg_map_66ak2x_xgbe[] = {</div><div class='add'>+	[CPSW_SL_IDVER] = 0x00,</div><div class='add'>+	[CPSW_SL_MACCONTROL] = 0x04,</div><div class='add'>+	[CPSW_SL_MACSTATUS] = 0x08,</div><div class='add'>+	[CPSW_SL_SOFT_RESET] = 0x0c,</div><div class='add'>+	[CPSW_SL_RX_MAXLEN] = 0x10,</div><div class='add'>+	[CPSW_SL_BOFFTEST] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+	[CPSW_SL_RX_PAUSE] = 0x18,</div><div class='add'>+	[CPSW_SL_TX_PAUSE] = 0x1c,</div><div class='add'>+	[CPSW_SL_EMCONTROL] = 0x20,</div><div class='add'>+	[CPSW_SL_RX_PRI_MAP] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+	[CPSW_SL_TX_GAP] = 0x28,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 cpsw_sl_reg_map_66ak2elg_am65[] = {</div><div class='add'>+	[CPSW_SL_IDVER] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+	[CPSW_SL_MACCONTROL] = 0x00,</div><div class='add'>+	[CPSW_SL_MACSTATUS] = 0x04,</div><div class='add'>+	[CPSW_SL_SOFT_RESET] = 0x08,</div><div class='add'>+	[CPSW_SL_RX_MAXLEN] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+	[CPSW_SL_BOFFTEST] = 0x0c,</div><div class='add'>+	[CPSW_SL_RX_PAUSE] = 0x10,</div><div class='add'>+	[CPSW_SL_TX_PAUSE] = 0x40,</div><div class='add'>+	[CPSW_SL_EMCONTROL] = 0x70,</div><div class='add'>+	[CPSW_SL_RX_PRI_MAP] = CPSW_SL_REG_NOTUSED,</div><div class='add'>+	[CPSW_SL_TX_GAP] = 0x74,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CPSW_SL_SOFT_RESET_BIT		BIT(0)</div><div class='add'>+</div><div class='add'>+#define CPSW_SL_STATUS_PN_IDLE		BIT(31)</div><div class='add'>+#define CPSW_SL_AM65_STATUS_PN_E_IDLE	BIT(30)</div><div class='add'>+#define CPSW_SL_AM65_STATUS_PN_P_IDLE	BIT(29)</div><div class='add'>+#define CPSW_SL_AM65_STATUS_PN_TX_IDLE	BIT(28)</div><div class='add'>+</div><div class='add'>+#define CPSW_SL_STATUS_IDLE_MASK_BASE (CPSW_SL_STATUS_PN_IDLE)</div><div class='add'>+</div><div class='add'>+#define CPSW_SL_STATUS_IDLE_MASK_K3 \</div><div class='add'>+	(CPSW_SL_STATUS_IDLE_MASK_BASE | CPSW_SL_AM65_STATUS_PN_E_IDLE | \</div><div class='add'>+	 CPSW_SL_AM65_STATUS_PN_P_IDLE | CPSW_SL_AM65_STATUS_PN_TX_IDLE)</div><div class='add'>+</div><div class='add'>+#define CPSW_SL_CTL_FUNC_BASE \</div><div class='add'>+	(CPSW_SL_CTL_FULLDUPLEX |\</div><div class='add'>+	CPSW_SL_CTL_LOOPBACK |\</div><div class='add'>+	CPSW_SL_CTL_RX_FLOW_EN |\</div><div class='add'>+	CPSW_SL_CTL_TX_FLOW_EN |\</div><div class='add'>+	CPSW_SL_CTL_GMII_EN |\</div><div class='add'>+	CPSW_SL_CTL_TX_PACE |\</div><div class='add'>+	CPSW_SL_CTL_GIG |\</div><div class='add'>+	CPSW_SL_CTL_CMD_IDLE |\</div><div class='add'>+	CPSW_SL_CTL_IFCTL_A |\</div><div class='add'>+	CPSW_SL_CTL_IFCTL_B |\</div><div class='add'>+	CPSW_SL_CTL_GIG_FORCE |\</div><div class='add'>+	CPSW_SL_CTL_EXT_EN |\</div><div class='add'>+	CPSW_SL_CTL_RX_CEF_EN |\</div><div class='add'>+	CPSW_SL_CTL_RX_CSF_EN |\</div><div class='add'>+	CPSW_SL_CTL_RX_CMF_EN)</div><div class='add'>+</div><div class='add'>+struct cpsw_sl {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void __iomem *sl_base;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u32 control_features;</div><div class='add'>+	u32 idle_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_sl_dev_id {</div><div class='add'>+	const char *device_id;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	const u32 control_features;</div><div class='add'>+	const u32 regs_offset;</div><div class='add'>+	const u32 idle_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cpsw_sl_dev_id cpsw_sl_id_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.device_id = "cpsw",</div><div class='add'>+		.regs = cpsw_sl_reg_map_cpsw,</div><div class='add'>+		.control_features = CPSW_SL_CTL_FUNC_BASE |</div><div class='add'>+				    CPSW_SL_CTL_MTEST |</div><div class='add'>+				    CPSW_SL_CTL_TX_SHORT_GAP_EN |</div><div class='add'>+				    CPSW_SL_CTL_TX_SG_LIM_EN,</div><div class='add'>+		.idle_mask = CPSW_SL_STATUS_IDLE_MASK_BASE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.device_id = "66ak2hk",</div><div class='add'>+		.regs = cpsw_sl_reg_map_66ak2hk,</div><div class='add'>+		.control_features = CPSW_SL_CTL_FUNC_BASE |</div><div class='add'>+				    CPSW_SL_CTL_TX_SHORT_GAP_EN,</div><div class='add'>+		.idle_mask = CPSW_SL_STATUS_IDLE_MASK_BASE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.device_id = "66ak2x_xgbe",</div><div class='add'>+		.regs = cpsw_sl_reg_map_66ak2x_xgbe,</div><div class='add'>+		.control_features = CPSW_SL_CTL_FUNC_BASE |</div><div class='add'>+				    CPSW_SL_CTL_XGIG |</div><div class='add'>+				    CPSW_SL_CTL_TX_SHORT_GAP_EN |</div><div class='add'>+				    CPSW_SL_CTL_CRC_TYPE |</div><div class='add'>+				    CPSW_SL_CTL_XGMII_EN,</div><div class='add'>+		.idle_mask = CPSW_SL_STATUS_IDLE_MASK_BASE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.device_id = "66ak2el",</div><div class='add'>+		.regs = cpsw_sl_reg_map_66ak2elg_am65,</div><div class='add'>+		.regs_offset = 0x330,</div><div class='add'>+		.control_features = CPSW_SL_CTL_FUNC_BASE |</div><div class='add'>+				    CPSW_SL_CTL_MTEST |</div><div class='add'>+				    CPSW_SL_CTL_TX_SHORT_GAP_EN |</div><div class='add'>+				    CPSW_SL_CTL_CRC_TYPE |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_RX_FLO |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_TX_FLO |</div><div class='add'>+				    CPSW_SL_CTL_TX_SG_LIM_EN,</div><div class='add'>+		.idle_mask = CPSW_SL_STATUS_IDLE_MASK_BASE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.device_id = "66ak2g",</div><div class='add'>+		.regs = cpsw_sl_reg_map_66ak2elg_am65,</div><div class='add'>+		.regs_offset = 0x330,</div><div class='add'>+		.control_features = CPSW_SL_CTL_FUNC_BASE |</div><div class='add'>+				    CPSW_SL_CTL_MTEST |</div><div class='add'>+				    CPSW_SL_CTL_CRC_TYPE |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_RX_FLO |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_TX_FLO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.device_id = "am65",</div><div class='add'>+		.regs = cpsw_sl_reg_map_66ak2elg_am65,</div><div class='add'>+		.regs_offset = 0x330,</div><div class='add'>+		.control_features = CPSW_SL_CTL_FUNC_BASE |</div><div class='add'>+				    CPSW_SL_CTL_MTEST |</div><div class='add'>+				    CPSW_SL_CTL_XGIG |</div><div class='add'>+				    CPSW_SL_CTL_TX_SHORT_GAP_EN |</div><div class='add'>+				    CPSW_SL_CTL_CRC_TYPE |</div><div class='add'>+				    CPSW_SL_CTL_XGMII_EN |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_RX_FLO |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_TX_FLO |</div><div class='add'>+				    CPSW_SL_CTL_TX_SG_LIM_EN |</div><div class='add'>+				    CPSW_SL_CTL_EXT_EN_XGIG,</div><div class='add'>+		.idle_mask = CPSW_SL_STATUS_IDLE_MASK_K3,</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 cpsw_sl_reg_read(struct cpsw_sl *sl, enum cpsw_sl_regs reg)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (sl-&gt;regs[reg] == CPSW_SL_REG_NOTUSED) {</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl: not sup r reg: %04X\n",</div><div class='add'>+			sl-&gt;regs[reg]);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = readl(sl-&gt;sl_base + sl-&gt;regs[reg]);</div><div class='add'>+	dev_dbg(sl-&gt;dev, "cpsw_sl: reg: %04X r 0x%08X\n", sl-&gt;regs[reg], val);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_sl_reg_write(struct cpsw_sl *sl, enum cpsw_sl_regs reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (sl-&gt;regs[reg] == CPSW_SL_REG_NOTUSED) {</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl: not sup w reg: %04X\n",</div><div class='add'>+			sl-&gt;regs[reg]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(sl-&gt;dev, "cpsw_sl: reg: %04X w 0x%08X\n", sl-&gt;regs[reg], val);</div><div class='add'>+	writel(val, sl-&gt;sl_base + sl-&gt;regs[reg]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct cpsw_sl_dev_id *cpsw_sl_match_id(</div><div class='add'>+		const struct cpsw_sl_dev_id *id,</div><div class='add'>+		const char *device_id)</div><div class='add'>+{</div><div class='add'>+	if (!id || !device_id)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	while (id-&gt;device_id) {</div><div class='add'>+		if (strcmp(device_id, id-&gt;device_id) == 0)</div><div class='add'>+			return id;</div><div class='add'>+		id++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpsw_sl *cpsw_sl_get(const char *device_id, struct device *dev,</div><div class='add'>+			    void __iomem *sl_base)</div><div class='add'>+{</div><div class='add'>+	const struct cpsw_sl_dev_id *sl_dev_id;</div><div class='add'>+	struct cpsw_sl *sl;</div><div class='add'>+</div><div class='add'>+	sl = devm_kzalloc(dev, sizeof(struct cpsw_sl), GFP_KERNEL);</div><div class='add'>+	if (!sl)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	sl-&gt;dev = dev;</div><div class='add'>+	sl-&gt;sl_base = sl_base;</div><div class='add'>+</div><div class='add'>+	sl_dev_id = cpsw_sl_match_id(cpsw_sl_id_match, device_id);</div><div class='add'>+	if (!sl_dev_id) {</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl: dev_id %s not found.\n", device_id);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	sl-&gt;regs = sl_dev_id-&gt;regs;</div><div class='add'>+	sl-&gt;control_features = sl_dev_id-&gt;control_features;</div><div class='add'>+	sl-&gt;idle_mask = sl_dev_id-&gt;idle_mask;</div><div class='add'>+	sl-&gt;sl_base += sl_dev_id-&gt;regs_offset;</div><div class='add'>+</div><div class='add'>+	return sl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_sl_reset(struct cpsw_sl *sl, unsigned long tmo)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(tmo);</div><div class='add'>+</div><div class='add'>+	/* Set the soft reset bit */</div><div class='add'>+	cpsw_sl_reg_write(sl, CPSW_SL_SOFT_RESET, CPSW_SL_SOFT_RESET_BIT);</div><div class='add'>+</div><div class='add'>+	/* Wait for the bit to clear */</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+	} while ((cpsw_sl_reg_read(sl, CPSW_SL_SOFT_RESET) &amp;</div><div class='add'>+		  CPSW_SL_SOFT_RESET_BIT) &amp;&amp;</div><div class='add'>+		  time_after(timeout, jiffies));</div><div class='add'>+</div><div class='add'>+	if (cpsw_sl_reg_read(sl, CPSW_SL_SOFT_RESET) &amp; CPSW_SL_SOFT_RESET_BIT)</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl failed to soft-reset.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cpsw_sl_ctl_set(struct cpsw_sl *sl, u32 ctl_funcs)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (ctl_funcs &amp; ~sl-&gt;control_features) {</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl: unsupported func 0x%08X\n",</div><div class='add'>+			ctl_funcs &amp; (~sl-&gt;control_features));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = cpsw_sl_reg_read(sl, CPSW_SL_MACCONTROL);</div><div class='add'>+	val |= ctl_funcs;</div><div class='add'>+	cpsw_sl_reg_write(sl, CPSW_SL_MACCONTROL, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 cpsw_sl_ctl_clr(struct cpsw_sl *sl, u32 ctl_funcs)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (ctl_funcs &amp; ~sl-&gt;control_features) {</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl: unsupported func 0x%08X\n",</div><div class='add'>+			ctl_funcs &amp; (~sl-&gt;control_features));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = cpsw_sl_reg_read(sl, CPSW_SL_MACCONTROL);</div><div class='add'>+	val &amp;= ~ctl_funcs;</div><div class='add'>+	cpsw_sl_reg_write(sl, CPSW_SL_MACCONTROL, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpsw_sl_ctl_reset(struct cpsw_sl *sl)</div><div class='add'>+{</div><div class='add'>+	cpsw_sl_reg_write(sl, CPSW_SL_MACCONTROL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cpsw_sl_wait_for_idle(struct cpsw_sl *sl, unsigned long tmo)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(tmo);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+	} while (!(cpsw_sl_reg_read(sl, CPSW_SL_MACSTATUS) &amp;</div><div class='add'>+		  sl-&gt;idle_mask) &amp;&amp; time_after(timeout, jiffies));</div><div class='add'>+</div><div class='add'>+	if (!(cpsw_sl_reg_read(sl, CPSW_SL_MACSTATUS) &amp; sl-&gt;idle_mask)) {</div><div class='add'>+		dev_err(sl-&gt;dev, "cpsw_sl failed to soft-reset.\n");</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='head'>diff --git a/drivers/net/ethernet/ti/cpsw_sl.h b/drivers/net/ethernet/ti/cpsw_sl.h<br/>new file mode 100644<br/>index 000000000000..a6d06a5a420f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpsw_sl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpsw_sl.h</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'>+ * Texas Instruments Ethernet Switch media-access-controller (MAC) submodule/</div><div class='add'>+ * Ethernet MAC Sliver (CPGMAC_SL) APIs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Texas Instruments</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __TI_CPSW_SL_H__</div><div class='add'>+#define __TI_CPSW_SL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+enum cpsw_sl_regs {</div><div class='add'>+	CPSW_SL_IDVER,</div><div class='add'>+	CPSW_SL_MACCONTROL,</div><div class='add'>+	CPSW_SL_MACSTATUS,</div><div class='add'>+	CPSW_SL_SOFT_RESET,</div><div class='add'>+	CPSW_SL_RX_MAXLEN,</div><div class='add'>+	CPSW_SL_BOFFTEST,</div><div class='add'>+	CPSW_SL_RX_PAUSE,</div><div class='add'>+	CPSW_SL_TX_PAUSE,</div><div class='add'>+	CPSW_SL_EMCONTROL,</div><div class='add'>+	CPSW_SL_RX_PRI_MAP,</div><div class='add'>+	CPSW_SL_TX_GAP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CPSW_SL_CTL_FULLDUPLEX = BIT(0), /* Full Duplex mode */</div><div class='add'>+	CPSW_SL_CTL_LOOPBACK = BIT(1), /* Loop Back Mode */</div><div class='add'>+	CPSW_SL_CTL_MTEST = BIT(2), /* Manufacturing Test mode */</div><div class='add'>+	CPSW_SL_CTL_RX_FLOW_EN = BIT(3), /* Receive Flow Control Enable */</div><div class='add'>+	CPSW_SL_CTL_TX_FLOW_EN = BIT(4), /* Transmit Flow Control Enable */</div><div class='add'>+	CPSW_SL_CTL_GMII_EN = BIT(5), /* GMII Enable */</div><div class='add'>+	CPSW_SL_CTL_TX_PACE = BIT(6), /* Transmit Pacing Enable */</div><div class='add'>+	CPSW_SL_CTL_GIG = BIT(7), /* Gigabit Mode */</div><div class='add'>+	CPSW_SL_CTL_XGIG = BIT(8), /* 10 Gigabit Mode */</div><div class='add'>+	CPSW_SL_CTL_TX_SHORT_GAP_EN = BIT(10), /* Transmit Short Gap Enable */</div><div class='add'>+	CPSW_SL_CTL_CMD_IDLE = BIT(11), /* Command Idle */</div><div class='add'>+	CPSW_SL_CTL_CRC_TYPE = BIT(12), /* Port CRC Type */</div><div class='add'>+	CPSW_SL_CTL_XGMII_EN = BIT(13), /* XGMII Enable */</div><div class='add'>+	CPSW_SL_CTL_IFCTL_A = BIT(15), /* Interface Control A */</div><div class='add'>+	CPSW_SL_CTL_IFCTL_B = BIT(16), /* Interface Control B */</div><div class='add'>+	CPSW_SL_CTL_GIG_FORCE = BIT(17), /* Gigabit Mode Force */</div><div class='add'>+	CPSW_SL_CTL_EXT_EN = BIT(18), /* External Control Enable */</div><div class='add'>+	CPSW_SL_CTL_EXT_EN_RX_FLO = BIT(19), /* Ext RX Flow Control Enable */</div><div class='add'>+	CPSW_SL_CTL_EXT_EN_TX_FLO = BIT(20), /* Ext TX Flow Control Enable */</div><div class='add'>+	CPSW_SL_CTL_TX_SG_LIM_EN = BIT(21), /* TXt Short Gap Limit Enable */</div><div class='add'>+	CPSW_SL_CTL_RX_CEF_EN = BIT(22), /* RX Copy Error Frames Enable */</div><div class='add'>+	CPSW_SL_CTL_RX_CSF_EN = BIT(23), /* RX Copy Short Frames Enable */</div><div class='add'>+	CPSW_SL_CTL_RX_CMF_EN = BIT(24), /* RX Copy MAC Control Frames Enable */</div><div class='add'>+	CPSW_SL_CTL_EXT_EN_XGIG = BIT(25),  /* Ext XGIG Control En, k3 only */</div><div class='add'>+</div><div class='add'>+	CPSW_SL_CTL_FUNCS_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpsw_sl;</div><div class='add'>+</div><div class='add'>+struct cpsw_sl *cpsw_sl_get(const char *device_id, struct device *dev,</div><div class='add'>+			    void __iomem *sl_base);</div><div class='add'>+</div><div class='add'>+void cpsw_sl_reset(struct cpsw_sl *sl, unsigned long tmo);</div><div class='add'>+</div><div class='add'>+u32 cpsw_sl_ctl_set(struct cpsw_sl *sl, u32 ctl_funcs);</div><div class='add'>+u32 cpsw_sl_ctl_clr(struct cpsw_sl *sl, u32 ctl_funcs);</div><div class='add'>+void cpsw_sl_ctl_reset(struct cpsw_sl *sl);</div><div class='add'>+int cpsw_sl_wait_for_idle(struct cpsw_sl *sl, unsigned long tmo);</div><div class='add'>+</div><div class='add'>+u32 cpsw_sl_reg_read(struct cpsw_sl *sl, enum cpsw_sl_regs reg);</div><div class='add'>+void cpsw_sl_reg_write(struct cpsw_sl *sl, enum cpsw_sl_regs reg, u32 val);</div><div class='add'>+</div><div class='add'>+#endif /* __TI_CPSW_SL_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c<br/>index 2a9ba4acd7fa..e257018ada71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpts.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpts.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpts.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpts.c</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * TI Common Platform Time Sync</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 Richard Cochran &lt;richardcochran@gmail.com&gt;</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 as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='head'>diff --git a/drivers/net/ethernet/ti/cpts.h b/drivers/net/ethernet/ti/cpts.h<br/>index d2c7decd59b6..024aab6af12f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpts.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/cpts.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/cpts.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/cpts.h</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * TI Common Platform Time Sync</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 Richard Cochran &lt;richardcochran@gmail.com&gt;</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 as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _TI_CPTS_H_</div><div class='ctx'> #define _TI_CPTS_H_</div><div class='head'>diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c<br/>index 4236dcdd5634..35bf14d8e7af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_cpdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_cpdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_cpdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/davinci_cpdma.c</a></div><div class='hunk'>@@ -1,16 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Texas Instruments CPDMA Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Texas Instruments</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 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='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -527,7 +520,6 @@ struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params)</div><div class='ctx'> 		ctlr-&gt;num_chan = CPDMA_MAX_CHANNELS;</div><div class='ctx'> 	return ctlr;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctlr_create);</div><div class='ctx'> </div><div class='ctx'> int cpdma_ctlr_start(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='hunk'>@@ -588,7 +580,6 @@ int cpdma_ctlr_start(struct cpdma_ctlr *ctlr)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctlr_start);</div><div class='ctx'> </div><div class='ctx'> int cpdma_ctlr_stop(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='hunk'>@@ -621,7 +612,6 @@ int cpdma_ctlr_stop(struct cpdma_ctlr *ctlr)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctlr_stop);</div><div class='ctx'> </div><div class='ctx'> int cpdma_ctlr_destroy(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='hunk'>@@ -639,7 +629,6 @@ int cpdma_ctlr_destroy(struct cpdma_ctlr *ctlr)</div><div class='ctx'> 	cpdma_desc_pool_destroy(ctlr);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctlr_destroy);</div><div class='ctx'> </div><div class='ctx'> int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable)</div><div class='ctx'> {</div><div class='hunk'>@@ -660,25 +649,21 @@ int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctlr_int_ctrl);</div><div class='ctx'> </div><div class='ctx'> void cpdma_ctlr_eoi(struct cpdma_ctlr *ctlr, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	dma_reg_write(ctlr, CPDMA_MACEOIVECTOR, value);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctlr_eoi);</div><div class='ctx'> </div><div class='ctx'> u32 cpdma_ctrl_rxchs_state(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	return dma_reg_read(ctlr, CPDMA_RXINTSTATMASKED);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctrl_rxchs_state);</div><div class='ctx'> </div><div class='ctx'> u32 cpdma_ctrl_txchs_state(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	return dma_reg_read(ctlr, CPDMA_TXINTSTATMASKED);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_ctrl_txchs_state);</div><div class='ctx'> </div><div class='ctx'> static void cpdma_chan_set_descs(struct cpdma_ctlr *ctlr,</div><div class='ctx'> 				 int rx, int desc_num,</div><div class='hunk'>@@ -774,7 +759,6 @@ int cpdma_chan_split_pool(struct cpdma_ctlr *ctlr)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_split_pool);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* cpdma_chan_set_weight - set weight of a channel in percentage.</div><div class='hunk'>@@ -807,7 +791,6 @@ int cpdma_chan_set_weight(struct cpdma_chan *ch, int weight)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_set_weight);</div><div class='ctx'> </div><div class='ctx'> /* cpdma_chan_get_min_rate - get minimum allowed rate for channel</div><div class='ctx'>  * Should be called before cpdma_chan_set_rate.</div><div class='hunk'>@@ -822,7 +805,6 @@ u32 cpdma_chan_get_min_rate(struct cpdma_ctlr *ctlr)</div><div class='ctx'> </div><div class='ctx'> 	return DIV_ROUND_UP(divident, divisor);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_get_min_rate);</div><div class='ctx'> </div><div class='ctx'> /* cpdma_chan_set_rate - limits bandwidth for transmit channel.</div><div class='ctx'>  * The bandwidth * limited channels have to be in order beginning from lowest.</div><div class='hunk'>@@ -867,7 +849,6 @@ err:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_set_rate);</div><div class='ctx'> </div><div class='ctx'> u32 cpdma_chan_get_rate(struct cpdma_chan *ch)</div><div class='ctx'> {</div><div class='hunk'>@@ -880,7 +861,6 @@ u32 cpdma_chan_get_rate(struct cpdma_chan *ch)</div><div class='ctx'> </div><div class='ctx'> 	return rate;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_get_rate);</div><div class='ctx'> </div><div class='ctx'> struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num,</div><div class='ctx'> 				     cpdma_handler_fn handler, int rx_type)</div><div class='hunk'>@@ -940,7 +920,6 @@ struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return chan;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_create);</div><div class='ctx'> </div><div class='ctx'> int cpdma_chan_get_rx_buf_num(struct cpdma_chan *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -953,7 +932,6 @@ int cpdma_chan_get_rx_buf_num(struct cpdma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 	return desc_num;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_get_rx_buf_num);</div><div class='ctx'> </div><div class='ctx'> int cpdma_chan_destroy(struct cpdma_chan *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -975,7 +953,6 @@ int cpdma_chan_destroy(struct cpdma_chan *chan)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctlr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_destroy);</div><div class='ctx'> </div><div class='ctx'> int cpdma_chan_get_stats(struct cpdma_chan *chan,</div><div class='ctx'> 			 struct cpdma_chan_stats *stats)</div><div class='hunk'>@@ -988,7 +965,6 @@ int cpdma_chan_get_stats(struct cpdma_chan *chan,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_get_stats);</div><div class='ctx'> </div><div class='ctx'> static void __cpdma_chan_submit(struct cpdma_chan *chan,</div><div class='ctx'> 				struct cpdma_desc __iomem *desc)</div><div class='hunk'>@@ -1095,7 +1071,6 @@ unlock_ret:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_submit);</div><div class='ctx'> </div><div class='ctx'> bool cpdma_check_free_tx_desc(struct cpdma_chan *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -1110,7 +1085,6 @@ bool cpdma_check_free_tx_desc(struct cpdma_chan *chan)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='ctx'> 	return free_tx_desc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_check_free_tx_desc);</div><div class='ctx'> </div><div class='ctx'> static void __cpdma_chan_free(struct cpdma_chan *chan,</div><div class='ctx'> 			      struct cpdma_desc __iomem *desc,</div><div class='hunk'>@@ -1204,7 +1178,6 @@ int cpdma_chan_process(struct cpdma_chan *chan, int quota)</div><div class='ctx'> 	}</div><div class='ctx'> 	return used;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_process);</div><div class='ctx'> </div><div class='ctx'> int cpdma_chan_start(struct cpdma_chan *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -1224,7 +1197,6 @@ int cpdma_chan_start(struct cpdma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_start);</div><div class='ctx'> </div><div class='ctx'> int cpdma_chan_stop(struct cpdma_chan *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -1287,7 +1259,6 @@ int cpdma_chan_stop(struct cpdma_chan *chan)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_chan_stop);</div><div class='ctx'> </div><div class='ctx'> int cpdma_chan_int_ctrl(struct cpdma_chan *chan, bool enable)</div><div class='ctx'> {</div><div class='hunk'>@@ -1329,25 +1300,19 @@ int cpdma_control_set(struct cpdma_ctlr *ctlr, int control, int value)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_control_set);</div><div class='ctx'> </div><div class='ctx'> int cpdma_get_num_rx_descs(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	return ctlr-&gt;num_rx_desc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_get_num_rx_descs);</div><div class='ctx'> </div><div class='ctx'> int cpdma_get_num_tx_descs(struct cpdma_ctlr *ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	return ctlr-&gt;num_tx_desc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_get_num_tx_descs);</div><div class='ctx'> </div><div class='ctx'> void cpdma_set_num_rx_descs(struct cpdma_ctlr *ctlr, int num_rx_desc)</div><div class='ctx'> {</div><div class='ctx'> 	ctlr-&gt;num_rx_desc = num_rx_desc;</div><div class='ctx'> 	ctlr-&gt;num_tx_desc = ctlr-&gt;pool-&gt;num_desc - ctlr-&gt;num_rx_desc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpdma_set_num_rx_descs);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/ti/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h<br/>index d399af5389b8..10376062dafa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_cpdma.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_cpdma.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_cpdma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/davinci_cpdma.h</a></div><div class='hunk'>@@ -1,16 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Texas Instruments CPDMA Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Texas Instruments</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 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='ctx'>  */</div><div class='ctx'> #ifndef __DAVINCI_CPDMA_H__</div><div class='ctx'> #define __DAVINCI_CPDMA_H__</div><div class='hunk'>@@ -34,8 +27,8 @@ struct cpdma_params {</div><div class='ctx'> 	int			num_chan;</div><div class='ctx'> 	bool			has_soft_reset;</div><div class='ctx'> 	int			min_packet_size;</div><div class='del'>-	u32			desc_mem_phys;</div><div class='del'>-	u32			desc_hw_addr;</div><div class='add'>+	dma_addr_t		desc_mem_phys;</div><div class='add'>+	dma_addr_t		desc_hw_addr;</div><div class='ctx'> 	int			desc_mem_size;</div><div class='ctx'> 	int			desc_align;</div><div class='ctx'> 	u32			bus_freq_mhz;</div><div class='head'>diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c<br/>index 57450b174fc4..4bf65cab79e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_emac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_emac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_emac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/davinci_emac.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * DaVinci Ethernet Medium Access Controller</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,21 +7,6 @@</div><div class='ctx'>  * Copyright (C) 2009 Texas Instruments.</div><div class='ctx'>  *</div><div class='ctx'>  * ---------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='ctx'>  * History:</div><div class='ctx'>  * 0-5 A number of folks worked on this driver in bits and pieces but the major</div><div class='ctx'>  *     contribution came from Suraj Iyer and Anant Gole</div><div class='hunk'>@@ -1714,7 +1700,7 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(pdata-&gt;mac_addr)) {</div><div class='ctx'> 		mac_addr = of_get_mac_address(np);</div><div class='del'>-		if (mac_addr)</div><div class='add'>+		if (!IS_ERR(mac_addr))</div><div class='ctx'> 			ether_addr_copy(pdata-&gt;mac_addr, mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1912,15 +1898,11 @@ static int davinci_emac_probe(struct platform_device *pdev)</div><div class='ctx'> 		ether_addr_copy(ndev-&gt;dev_addr, priv-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(priv-&gt;mac_addr)) {</div><div class='del'>-		/* Try nvmem if MAC wasn't passed over pdata or DT. */</div><div class='del'>-		rc = nvmem_get_mac_address(&amp;pdev-&gt;dev, priv-&gt;mac_addr);</div><div class='del'>-		if (rc) {</div><div class='del'>-			/* Use random MAC if still none obtained. */</div><div class='del'>-			eth_hw_addr_random(ndev);</div><div class='del'>-			memcpy(priv-&gt;mac_addr, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='del'>-			dev_warn(&amp;pdev-&gt;dev, "using random MAC addr: %pM\n",</div><div class='del'>-				 priv-&gt;mac_addr);</div><div class='del'>-		}</div><div class='add'>+		/* Use random MAC if still none obtained. */</div><div class='add'>+		eth_hw_addr_random(ndev);</div><div class='add'>+		memcpy(priv-&gt;mac_addr, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "using random MAC addr: %pM\n",</div><div class='add'>+			 priv-&gt;mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;emac_netdev_ops;</div><div class='head'>diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c<br/>index a98aedae1b41..38b7f6d35759 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_mdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/davinci_mdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/davinci_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/davinci_mdio.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * DaVinci MDIO Module driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,22 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009 Texas Instruments.</div><div class='ctx'>  *</div><div class='del'>- * ---------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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/kernel.h&gt;</div><div class='hunk'>@@ -140,7 +125,7 @@ static void davinci_mdio_init_clk(struct davinci_mdio_data *data)</div><div class='ctx'> static void davinci_mdio_enable(struct davinci_mdio_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	/* set enable and clock divider */</div><div class='del'>-	__raw_writel(data-&gt;clk_div | CONTROL_ENABLE, &amp;data-&gt;regs-&gt;control);</div><div class='add'>+	writel(data-&gt;clk_div | CONTROL_ENABLE, &amp;data-&gt;regs-&gt;control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int davinci_mdio_reset(struct mii_bus *bus)</div><div class='hunk'>@@ -159,7 +144,7 @@ static int davinci_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> 	msleep(PHY_MAX_ADDR * data-&gt;access_time);</div><div class='ctx'> </div><div class='ctx'> 	/* dump hardware version info */</div><div class='del'>-	ver = __raw_readl(&amp;data-&gt;regs-&gt;version);</div><div class='add'>+	ver = readl(&amp;data-&gt;regs-&gt;version);</div><div class='ctx'> 	dev_info(data-&gt;dev,</div><div class='ctx'> 		 "davinci mdio revision %d.%d, bus freq %ld\n",</div><div class='ctx'> 		 (ver &gt;&gt; 8) &amp; 0xff, ver &amp; 0xff,</div><div class='hunk'>@@ -169,7 +154,7 @@ static int davinci_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* get phy mask from the alive register */</div><div class='del'>-	phy_mask = __raw_readl(&amp;data-&gt;regs-&gt;alive);</div><div class='add'>+	phy_mask = readl(&amp;data-&gt;regs-&gt;alive);</div><div class='ctx'> 	if (phy_mask) {</div><div class='ctx'> 		/* restrict mdio bus to live phys only */</div><div class='ctx'> 		dev_info(data-&gt;dev, "detected phy mask %x\n", ~phy_mask);</div><div class='hunk'>@@ -196,11 +181,11 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data)</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	while (time_after(timeout, jiffies)) {</div><div class='del'>-		reg = __raw_readl(&amp;regs-&gt;user[0].access);</div><div class='add'>+		reg = readl(&amp;regs-&gt;user[0].access);</div><div class='ctx'> 		if ((reg &amp; USERACCESS_GO) == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		reg = __raw_readl(&amp;regs-&gt;control);</div><div class='add'>+		reg = readl(&amp;regs-&gt;control);</div><div class='ctx'> 		if ((reg &amp; CONTROL_IDLE) == 0) {</div><div class='ctx'> 			usleep_range(100, 200);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -216,7 +201,7 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reg = __raw_readl(&amp;regs-&gt;user[0].access);</div><div class='add'>+	reg = readl(&amp;regs-&gt;user[0].access);</div><div class='ctx'> 	if ((reg &amp; USERACCESS_GO) == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -263,7 +248,7 @@ static int davinci_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		__raw_writel(reg, &amp;data-&gt;regs-&gt;user[0].access);</div><div class='add'>+		writel(reg, &amp;data-&gt;regs-&gt;user[0].access);</div><div class='ctx'> </div><div class='ctx'> 		ret = wait_for_user_access(data);</div><div class='ctx'> 		if (ret == -EAGAIN)</div><div class='hunk'>@@ -271,7 +256,7 @@ static int davinci_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		reg = __raw_readl(&amp;data-&gt;regs-&gt;user[0].access);</div><div class='add'>+		reg = readl(&amp;data-&gt;regs-&gt;user[0].access);</div><div class='ctx'> 		ret = (reg &amp; USERACCESS_ACK) ? (reg &amp; USERACCESS_DATA) : -EIO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -307,7 +292,7 @@ static int davinci_mdio_write(struct mii_bus *bus, int phy_id,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		__raw_writel(reg, &amp;data-&gt;regs-&gt;user[0].access);</div><div class='add'>+		writel(reg, &amp;data-&gt;regs-&gt;user[0].access);</div><div class='ctx'> </div><div class='ctx'> 		ret = wait_for_user_access(data);</div><div class='ctx'> 		if (ret == -EAGAIN)</div><div class='hunk'>@@ -412,9 +397,9 @@ static int davinci_mdio_probe(struct platform_device *pdev)</div><div class='ctx'> 	data-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	data-&gt;regs = devm_ioremap_resource(dev, res);</div><div class='del'>-	if (IS_ERR(data-&gt;regs))</div><div class='del'>-		return PTR_ERR(data-&gt;regs);</div><div class='add'>+	data-&gt;regs = devm_ioremap(dev, res-&gt;start, resource_size(res));</div><div class='add'>+	if (!data-&gt;regs)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	davinci_mdio_init_clk(data);</div><div class='ctx'> </div><div class='hunk'>@@ -472,9 +457,9 @@ static int davinci_mdio_runtime_suspend(struct device *dev)</div><div class='ctx'> 	u32 ctrl;</div><div class='ctx'> </div><div class='ctx'> 	/* shutdown the scan state machine */</div><div class='del'>-	ctrl = __raw_readl(&amp;data-&gt;regs-&gt;control);</div><div class='add'>+	ctrl = readl(&amp;data-&gt;regs-&gt;control);</div><div class='ctx'> 	ctrl &amp;= ~CONTROL_ENABLE;</div><div class='del'>-	__raw_writel(ctrl, &amp;data-&gt;regs-&gt;control);</div><div class='add'>+	writel(ctrl, &amp;data-&gt;regs-&gt;control);</div><div class='ctx'> 	wait_for_idle(data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/ti/netcp.h b/drivers/net/ethernet/ti/netcp.h<br/>index c4ffdf47bad5..43d5cd59b56b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/netcp.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * NetCP driver local header</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,15 +9,6 @@</div><div class='ctx'>  *		Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='ctx'>  *		Wingman Kwok &lt;w-kwok2@ti.com&gt;</div><div class='ctx'>  *		Murali Karicheri &lt;m-karicheri2@ti.com&gt;</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='ctx'>  */</div><div class='ctx'> #ifndef __NETCP_H__</div><div class='ctx'> #define __NETCP_H__</div><div class='head'>diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c<br/>index d847f672a705..642843945031 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/netcp_core.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Keystone NetCP Core driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,15 +9,6 @@</div><div class='ctx'>  *		Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='ctx'>  *		Murali Karicheri &lt;m-karicheri2@ti.com&gt;</div><div class='ctx'>  *		Wingman Kwok &lt;w-kwok2@ti.com&gt;</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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -2045,7 +2037,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,</div><div class='ctx'> 		devm_release_mem_region(dev, res.start, size);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mac_addr = of_get_mac_address(node_interface);</div><div class='del'>-		if (mac_addr)</div><div class='add'>+		if (!IS_ERR(mac_addr))</div><div class='ctx'> 			ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='ctx'> 		else</div><div class='ctx'> 			eth_random_addr(ndev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c<br/>index 5174d318901e..ec179700c184 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_ethss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_ethss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_ethss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/netcp_ethss.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Keystone GBE and XGBE subsystem code</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,15 +8,6 @@</div><div class='ctx'>  *		Cyril Chemparathy &lt;cyril@ti.com&gt;</div><div class='ctx'>  *		Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='ctx'>  *		Wingman Kwok &lt;w-kwok2@ti.com&gt;</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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -3657,12 +3649,16 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	ret = netcp_txpipe_init(&amp;gbe_dev-&gt;tx_pipe, netcp_device,</div><div class='ctx'> 				gbe_dev-&gt;dma_chan_name, gbe_dev-&gt;tx_queue_id);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		of_node_put(interfaces);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = netcp_txpipe_open(&amp;gbe_dev-&gt;tx_pipe);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		of_node_put(interfaces);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create network interfaces */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;gbe_dev-&gt;gbe_intf_head);</div><div class='head'>diff --git a/drivers/net/ethernet/ti/netcp_sgmii.c b/drivers/net/ethernet/ti/netcp_sgmii.c<br/>index 5d8419f658d0..f7cf56d6351d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_sgmii.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_sgmii.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_sgmii.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/netcp_sgmii.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * SGMI module initialisation</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,14 +7,6 @@</div><div class='ctx'>  *		Sandeep Paulraj &lt;s-paulraj@ti.com&gt;</div><div class='ctx'>  *		Wingman Kwok &lt;w-kwok2@ti.com&gt;</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 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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "netcp.h"</div><div class='head'>diff --git a/drivers/net/ethernet/ti/netcp_xgbepcsr.c b/drivers/net/ethernet/ti/netcp_xgbepcsr.c<br/>index 33571acc52b6..112778aedd8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_xgbepcsr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/ti/netcp_xgbepcsr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/ti/netcp_xgbepcsr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/ti/netcp_xgbepcsr.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * XGE PCSR module initialisation</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,14 +6,6 @@</div><div class='ctx'>  * Authors:	Sandeep Nair &lt;sandeep_n@ti.com&gt;</div><div class='ctx'>  *		WingMan Kwok &lt;w-kwok2@ti.com&gt;</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 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='ctx'>  */</div><div class='ctx'> #include "netcp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c<br/>index 33949248c829..ab55416a10fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/via/via-rhine.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/via/via-rhine.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/via/via-rhine.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/via/via-rhine.c</a></div><div class='hunk'>@@ -571,7 +571,6 @@ static void rhine_ack_events(struct rhine_private *rp, u32 mask)</div><div class='ctx'> 	if (rp-&gt;quirks &amp; rqStatusWBRace)</div><div class='ctx'> 		iowrite8(mask &gt;&gt; 16, ioaddr + IntrStatus2);</div><div class='ctx'> 	iowrite16(mask, ioaddr + IntrStatus);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -863,7 +862,6 @@ static int rhine_napipoll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	if (work_done &lt; budget) {</div><div class='ctx'> 		napi_complete_done(napi, work_done);</div><div class='ctx'> 		iowrite16(enable_mask, ioaddr + IntrEnable);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='hunk'>@@ -1893,7 +1891,6 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,</div><div class='ctx'> static void rhine_irq_disable(struct rhine_private *rp)</div><div class='ctx'> {</div><div class='ctx'> 	iowrite16(0x0000, rp-&gt;base + IntrEnable);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The interrupt handler does all of the Rx thread work and cleans up</div><div class='head'>diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c<br/>index d8ba512f166a..8788953eaafd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/wiznet/w5100.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/wiznet/w5100.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/wiznet/w5100.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/wiznet/w5100.c</a></div><div class='hunk'>@@ -219,7 +219,6 @@ static inline int __w5100_write_direct(struct net_device *ndev, u32 addr,</div><div class='ctx'> static inline int w5100_write_direct(struct net_device *ndev, u32 addr, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	__w5100_write_direct(ndev, addr, data);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -236,7 +235,6 @@ static int w5100_write16_direct(struct net_device *ndev, u32 addr, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	__w5100_write_direct(ndev, addr, data &gt;&gt; 8);</div><div class='ctx'> 	__w5100_write_direct(ndev, addr + 1, data);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -260,8 +258,6 @@ static int w5100_writebulk_direct(struct net_device *ndev, u32 addr,</div><div class='ctx'> 	for (i = 0; i &lt; len; i++, addr++)</div><div class='ctx'> 		__w5100_write_direct(ndev, addr, *buf++);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -375,7 +371,6 @@ static int w5100_readbulk_indirect(struct net_device *ndev, u32 addr, u8 *buf,</div><div class='ctx'> 	for (i = 0; i &lt; len; i++)</div><div class='ctx'> 		*buf++ = w5100_read_direct(ndev, W5100_IDM_DR);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mmio_priv-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -394,7 +389,6 @@ static int w5100_writebulk_indirect(struct net_device *ndev, u32 addr,</div><div class='ctx'> 	for (i = 0; i &lt; len; i++)</div><div class='ctx'> 		__w5100_write_direct(ndev, W5100_IDM_DR, *buf++);</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mmio_priv-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1164,7 +1158,7 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops,</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;setrx_work, w5100_setrx_work);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;restart_work, w5100_restart_work);</div><div class='ctx'> </div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR_OR_NULL(mac_addr))</div><div class='ctx'> 		memcpy(ndev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='head'>diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c<br/>index f9da5d6172e3..3f03eecc0479 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/wiznet/w5300.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/wiznet/w5300.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/wiznet/w5300.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/wiznet/w5300.c</a></div><div class='hunk'>@@ -141,7 +141,6 @@ static u16 w5300_read_indirect(struct w5300_priv *priv, u16 addr)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;reg_lock, flags);</div><div class='ctx'> 	w5300_write_direct(priv, W5300_IDM_AR, addr);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	data = w5300_read_direct(priv, W5300_IDM_DR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -154,9 +153,7 @@ static void w5300_write_indirect(struct w5300_priv *priv, u16 addr, u16 data)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;reg_lock, flags);</div><div class='ctx'> 	w5300_write_direct(priv, W5300_IDM_AR, addr);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	w5300_write_direct(priv, W5300_IDM_DR, data);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +189,6 @@ static int w5300_command(struct w5300_priv *priv, u16 cmd)</div><div class='ctx'> 	unsigned long timeout = jiffies + msecs_to_jiffies(100);</div><div class='ctx'> </div><div class='ctx'> 	w5300_write(priv, W5300_S0_CR, cmd);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	while (w5300_read(priv, W5300_S0_CR) != 0) {</div><div class='ctx'> 		if (time_after(jiffies, timeout))</div><div class='hunk'>@@ -241,18 +237,15 @@ static void w5300_write_macaddr(struct w5300_priv *priv)</div><div class='ctx'> 	w5300_write(priv, W5300_SHARH,</div><div class='ctx'> 		      ndev-&gt;dev_addr[4] &lt;&lt; 8 |</div><div class='ctx'> 		      ndev-&gt;dev_addr[5]);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void w5300_hw_reset(struct w5300_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	w5300_write_direct(priv, W5300_MR, MR_RST);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> 	w5300_write_direct(priv, W5300_MR, priv-&gt;indirect ?</div><div class='ctx'> 				 MR_WDF(7) | MR_PB | MR_IND :</div><div class='ctx'> 				 MR_WDF(7) | MR_PB);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	w5300_write(priv, W5300_IMR, 0);</div><div class='ctx'> 	w5300_write_macaddr(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -264,24 +257,20 @@ static void w5300_hw_reset(struct w5300_priv *priv)</div><div class='ctx'> 	w5300_write32(priv, W5300_TMSRL, 64 &lt;&lt; 24);</div><div class='ctx'> 	w5300_write32(priv, W5300_TMSRH, 0);</div><div class='ctx'> 	w5300_write(priv, W5300_MTYPE, 0x00ff);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void w5300_hw_start(struct w5300_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	w5300_write(priv, W5300_S0_MR, priv-&gt;promisc ?</div><div class='ctx'> 			  S0_MR_MACRAW : S0_MR_MACRAW_MF);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	w5300_command(priv, S0_CR_OPEN);</div><div class='ctx'> 	w5300_write(priv, W5300_S0_IMR, S0_IR_RECV | S0_IR_SENDOK);</div><div class='ctx'> 	w5300_write(priv, W5300_IMR, IR_S0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void w5300_hw_close(struct w5300_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	w5300_write(priv, W5300_IMR, 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	w5300_command(priv, S0_CR_CLOSE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,7 +361,6 @@ static netdev_tx_t w5300_start_tx(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='ctx'> </div><div class='ctx'> 	w5300_write_frame(priv, skb-&gt;data, skb-&gt;len);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	ndev-&gt;stats.tx_packets++;</div><div class='ctx'> 	ndev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='hunk'>@@ -419,7 +407,6 @@ static int w5300_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	if (rx_count &lt; budget) {</div><div class='ctx'> 		napi_complete_done(napi, rx_count);</div><div class='ctx'> 		w5300_write(priv, W5300_IMR, IR_S0);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rx_count;</div><div class='hunk'>@@ -434,7 +421,6 @@ static irqreturn_t w5300_interrupt(int irq, void *ndev_instance)</div><div class='ctx'> 	if (!ir)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	w5300_write(priv, W5300_S0_IR, ir);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	if (ir &amp; S0_IR_SENDOK) {</div><div class='ctx'> 		netif_dbg(priv, tx_done, ndev, "tx done\n");</div><div class='hunk'>@@ -444,7 +430,6 @@ static irqreturn_t w5300_interrupt(int irq, void *ndev_instance)</div><div class='ctx'> 	if (ir &amp; S0_IR_RECV) {</div><div class='ctx'> 		if (napi_schedule_prep(&amp;priv-&gt;napi)) {</div><div class='ctx'> 			w5300_write(priv, W5300_IMR, 0);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			__napi_schedule(&amp;priv-&gt;napi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig<br/>index da4ec575ccf9..db448fad621b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/xilinx/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> config NET_VENDOR_XILINX</div><div class='ctx'> 	bool "Xilinx devices"</div><div class='ctx'> 	default y</div><div class='del'>-	depends on PPC || PPC32 || MICROBLAZE || ARCH_ZYNQ || MIPS</div><div class='add'>+	depends on PPC || PPC32 || MICROBLAZE || ARCH_ZYNQ || MIPS || X86 || COMPILE_TEST</div><div class='ctx'> 	---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='hunk'>@@ -33,8 +33,7 @@ config XILINX_AXI_EMAC</div><div class='ctx'> </div><div class='ctx'> config XILINX_LL_TEMAC</div><div class='ctx'> 	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"</div><div class='del'>-	depends on (PPC || MICROBLAZE)</div><div class='del'>-	depends on !64BIT || BROKEN</div><div class='add'>+	depends on PPC || MICROBLAZE || X86 || COMPILE_TEST</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC</div><div class='head'>diff --git a/drivers/net/ethernet/xilinx/ll_temac.h b/drivers/net/ethernet/xilinx/ll_temac.h<br/>index 107575225383..1aeda084b8f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/ll_temac.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/ll_temac.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/ll_temac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/xilinx/ll_temac.h</a></div><div class='hunk'>@@ -334,6 +334,9 @@ struct temac_local {</div><div class='ctx'> </div><div class='ctx'> 	/* Connection to PHY device */</div><div class='ctx'> 	struct device_node *phy_node;</div><div class='add'>+	/* For non-device-tree devices */</div><div class='add'>+	char phy_name[MII_BUS_ID_SIZE + 3];</div><div class='add'>+	phy_interface_t phy_interface;</div><div class='ctx'> </div><div class='ctx'> 	/* MDIO bus data */</div><div class='ctx'> 	struct mii_bus *mii_bus;	/* MII bus reference */</div><div class='hunk'>@@ -344,8 +347,10 @@ struct temac_local {</div><div class='ctx'> #ifdef CONFIG_PPC_DCR</div><div class='ctx'> 	dcr_host_t sdma_dcrs;</div><div class='ctx'> #endif</div><div class='del'>-	u32 (*dma_in)(struct temac_local *, int);</div><div class='del'>-	void (*dma_out)(struct temac_local *, int, u32);</div><div class='add'>+	u32 (*temac_ior)(struct temac_local *lp, int offset);</div><div class='add'>+	void (*temac_iow)(struct temac_local *lp, int offset, u32 value);</div><div class='add'>+	u32 (*dma_in)(struct temac_local *lp, int reg);</div><div class='add'>+	void (*dma_out)(struct temac_local *lp, int reg, u32 value);</div><div class='ctx'> </div><div class='ctx'> 	int tx_irq;</div><div class='ctx'> 	int rx_irq;</div><div class='hunk'>@@ -353,7 +358,10 @@ struct temac_local {</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff **rx_skb;</div><div class='ctx'> 	spinlock_t rx_lock;</div><div class='del'>-	struct mutex indirect_mutex;</div><div class='add'>+	/* For synchronization of indirect register access.  Must be</div><div class='add'>+	 * shared mutex between interfaces in same TEMAC block.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex *indirect_mutex;</div><div class='ctx'> 	u32 options;			/* Current options word */</div><div class='ctx'> 	int last_link;</div><div class='ctx'> 	unsigned int temac_features;</div><div class='hunk'>@@ -367,18 +375,24 @@ struct temac_local {</div><div class='ctx'> 	int tx_bd_next;</div><div class='ctx'> 	int tx_bd_tail;</div><div class='ctx'> 	int rx_bd_ci;</div><div class='add'>+</div><div class='add'>+	/* DMA channel control setup */</div><div class='add'>+	u32 tx_chnl_ctrl;</div><div class='add'>+	u32 rx_chnl_ctrl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Wrappers for temac_ior()/temac_iow() function pointers above */</div><div class='add'>+#define temac_ior(lp, o) ((lp)-&gt;temac_ior(lp, o))</div><div class='add'>+#define temac_iow(lp, o, v) ((lp)-&gt;temac_iow(lp, o, v))</div><div class='add'>+</div><div class='ctx'> /* xilinx_temac.c */</div><div class='del'>-u32 temac_ior(struct temac_local *lp, int offset);</div><div class='del'>-void temac_iow(struct temac_local *lp, int offset, u32 value);</div><div class='ctx'> int temac_indirect_busywait(struct temac_local *lp);</div><div class='ctx'> u32 temac_indirect_in32(struct temac_local *lp, int reg);</div><div class='ctx'> void temac_indirect_out32(struct temac_local *lp, int reg, u32 value);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* xilinx_temac_mdio.c */</div><div class='del'>-int temac_mdio_setup(struct temac_local *lp, struct device_node *np);</div><div class='add'>+int temac_mdio_setup(struct temac_local *lp, struct platform_device *pdev);</div><div class='ctx'> void temac_mdio_teardown(struct temac_local *lp);</div><div class='ctx'> </div><div class='ctx'> #endif /* XILINX_LL_TEMAC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c<br/>index 44efffbe7970..997475c209c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/ll_temac_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/ll_temac_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/ll_temac_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/xilinx/ll_temac_main.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='hunk'>@@ -51,6 +52,7 @@</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/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/xilinx-ll-temac.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ll_temac.h"</div><div class='ctx'> </div><div class='hunk'>@@ -61,14 +63,24 @@</div><div class='ctx'>  * Low level register access functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-u32 temac_ior(struct temac_local *lp, int offset)</div><div class='add'>+static u32 _temac_ior_be(struct temac_local *lp, int offset)</div><div class='ctx'> {</div><div class='del'>-	return in_be32(lp-&gt;regs + offset);</div><div class='add'>+	return ioread32be(lp-&gt;regs + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void temac_iow(struct temac_local *lp, int offset, u32 value)</div><div class='add'>+static void _temac_iow_be(struct temac_local *lp, int offset, u32 value)</div><div class='ctx'> {</div><div class='del'>-	out_be32(lp-&gt;regs + offset, value);</div><div class='add'>+	return iowrite32be(value, lp-&gt;regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 _temac_ior_le(struct temac_local *lp, int offset)</div><div class='add'>+{</div><div class='add'>+	return ioread32(lp-&gt;regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _temac_iow_le(struct temac_local *lp, int offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	return iowrite32(value, lp-&gt;regs + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int temac_indirect_busywait(struct temac_local *lp)</div><div class='hunk'>@@ -80,7 +92,7 @@ int temac_indirect_busywait(struct temac_local *lp)</div><div class='ctx'> 			WARN_ON(1);</div><div class='ctx'> 			return -ETIMEDOUT;</div><div class='ctx'> 		}</div><div class='del'>-		msleep(1);</div><div class='add'>+		usleep_range(500, 1000);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -119,23 +131,35 @@ void temac_indirect_out32(struct temac_local *lp, int reg, u32 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * temac_dma_in32 - Memory mapped DMA read, this function expects a</div><div class='del'>- * register input that is based on DCR word addresses which</div><div class='del'>- * are then converted to memory mapped byte addresses</div><div class='add'>+ * temac_dma_in32_* - Memory mapped DMA read, these function expects a</div><div class='add'>+ * register input that is based on DCR word addresses which are then</div><div class='add'>+ * converted to memory mapped byte addresses.  To be assigned to</div><div class='add'>+ * lp-&gt;dma_in32.</div><div class='ctx'>  */</div><div class='del'>-static u32 temac_dma_in32(struct temac_local *lp, int reg)</div><div class='add'>+static u32 temac_dma_in32_be(struct temac_local *lp, int reg)</div><div class='ctx'> {</div><div class='del'>-	return in_be32(lp-&gt;sdma_regs + (reg &lt;&lt; 2));</div><div class='add'>+	return ioread32be(lp-&gt;sdma_regs + (reg &lt;&lt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 temac_dma_in32_le(struct temac_local *lp, int reg)</div><div class='add'>+{</div><div class='add'>+	return ioread32(lp-&gt;sdma_regs + (reg &lt;&lt; 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * temac_dma_out32 - Memory mapped DMA read, this function expects a</div><div class='del'>- * register input that is based on DCR word addresses which</div><div class='del'>- * are then converted to memory mapped byte addresses</div><div class='add'>+ * temac_dma_out32_* - Memory mapped DMA read, these function expects</div><div class='add'>+ * a register input that is based on DCR word addresses which are then</div><div class='add'>+ * converted to memory mapped byte addresses.  To be assigned to</div><div class='add'>+ * lp-&gt;dma_out32.</div><div class='ctx'>  */</div><div class='del'>-static void temac_dma_out32(struct temac_local *lp, int reg, u32 value)</div><div class='add'>+static void temac_dma_out32_be(struct temac_local *lp, int reg, u32 value)</div><div class='add'>+{</div><div class='add'>+	iowrite32be(value, lp-&gt;sdma_regs + (reg &lt;&lt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void temac_dma_out32_le(struct temac_local *lp, int reg, u32 value)</div><div class='ctx'> {</div><div class='del'>-	out_be32(lp-&gt;sdma_regs + (reg &lt;&lt; 2), value);</div><div class='add'>+	iowrite32(value, lp-&gt;sdma_regs + (reg &lt;&lt; 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* DMA register access functions can be DCR based or memory mapped.</div><div class='hunk'>@@ -187,7 +211,7 @@ static int temac_dcr_setup(struct temac_local *lp, struct platform_device *op,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * temac_dcr_setup - This is a stub for when DCR is not supported,</div><div class='del'>- * such as with MicroBlaze</div><div class='add'>+ * such as with MicroBlaze and x86</div><div class='ctx'>  */</div><div class='ctx'> static int temac_dcr_setup(struct temac_local *lp, struct platform_device *op,</div><div class='ctx'> 				struct device_node *np)</div><div class='hunk'>@@ -225,7 +249,6 @@ static void temac_dma_bd_release(struct net_device *ndev)</div><div class='ctx'> 		dma_free_coherent(ndev-&gt;dev.parent,</div><div class='ctx'> 				sizeof(*lp-&gt;tx_bd_v) * TX_BD_NUM,</div><div class='ctx'> 				lp-&gt;tx_bd_v, lp-&gt;tx_bd_p);</div><div class='del'>-	kfree(lp-&gt;rx_skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -235,9 +258,11 @@ static int temac_dma_bd_init(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct temac_local *lp = netdev_priv(ndev);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t skb_dma_addr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	lp-&gt;rx_skb = kcalloc(RX_BD_NUM, sizeof(*lp-&gt;rx_skb), GFP_KERNEL);</div><div class='add'>+	lp-&gt;rx_skb = devm_kcalloc(&amp;ndev-&gt;dev, RX_BD_NUM, sizeof(*lp-&gt;rx_skb),</div><div class='add'>+				  GFP_KERNEL);</div><div class='ctx'> 	if (!lp-&gt;rx_skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -256,13 +281,13 @@ static int temac_dma_bd_init(struct net_device *ndev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TX_BD_NUM; i++) {</div><div class='del'>-		lp-&gt;tx_bd_v[i].next = lp-&gt;tx_bd_p +</div><div class='del'>-				sizeof(*lp-&gt;tx_bd_v) * ((i + 1) % TX_BD_NUM);</div><div class='add'>+		lp-&gt;tx_bd_v[i].next = cpu_to_be32(lp-&gt;tx_bd_p</div><div class='add'>+				+ sizeof(*lp-&gt;tx_bd_v) * ((i + 1) % TX_BD_NUM));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; RX_BD_NUM; i++) {</div><div class='del'>-		lp-&gt;rx_bd_v[i].next = lp-&gt;rx_bd_p +</div><div class='del'>-				sizeof(*lp-&gt;rx_bd_v) * ((i + 1) % RX_BD_NUM);</div><div class='add'>+		lp-&gt;rx_bd_v[i].next = cpu_to_be32(lp-&gt;rx_bd_p</div><div class='add'>+				+ sizeof(*lp-&gt;rx_bd_v) * ((i + 1) % RX_BD_NUM));</div><div class='ctx'> </div><div class='ctx'> 		skb = netdev_alloc_skb_ip_align(ndev,</div><div class='ctx'> 						XTE_MAX_JUMBO_FRAME_SIZE);</div><div class='hunk'>@@ -271,31 +296,23 @@ static int temac_dma_bd_init(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;rx_skb[i] = skb;</div><div class='ctx'> 		/* returns physical address of skb-&gt;data */</div><div class='del'>-		lp-&gt;rx_bd_v[i].phys = dma_map_single(ndev-&gt;dev.parent,</div><div class='del'>-						     skb-&gt;data,</div><div class='del'>-						     XTE_MAX_JUMBO_FRAME_SIZE,</div><div class='del'>-						     DMA_FROM_DEVICE);</div><div class='del'>-		lp-&gt;rx_bd_v[i].len = XTE_MAX_JUMBO_FRAME_SIZE;</div><div class='del'>-		lp-&gt;rx_bd_v[i].app0 = STS_CTRL_APP0_IRQONEND;</div><div class='add'>+		skb_dma_addr = dma_map_single(ndev-&gt;dev.parent, skb-&gt;data,</div><div class='add'>+					      XTE_MAX_JUMBO_FRAME_SIZE,</div><div class='add'>+					      DMA_FROM_DEVICE);</div><div class='add'>+		lp-&gt;rx_bd_v[i].phys = cpu_to_be32(skb_dma_addr);</div><div class='add'>+		lp-&gt;rx_bd_v[i].len = cpu_to_be32(XTE_MAX_JUMBO_FRAME_SIZE);</div><div class='add'>+		lp-&gt;rx_bd_v[i].app0 = cpu_to_be32(STS_CTRL_APP0_IRQONEND);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;dma_out(lp, TX_CHNL_CTRL, 0x10220400 |</div><div class='del'>-					  CHNL_CTRL_IRQ_EN |</div><div class='del'>-					  CHNL_CTRL_IRQ_DLY_EN |</div><div class='del'>-					  CHNL_CTRL_IRQ_COAL_EN);</div><div class='del'>-	/* 0x10220483 */</div><div class='del'>-	/* 0x00100483 */</div><div class='del'>-	lp-&gt;dma_out(lp, RX_CHNL_CTRL, 0xff070000 |</div><div class='del'>-					  CHNL_CTRL_IRQ_EN |</div><div class='del'>-					  CHNL_CTRL_IRQ_DLY_EN |</div><div class='del'>-					  CHNL_CTRL_IRQ_COAL_EN |</div><div class='del'>-					  CHNL_CTRL_IRQ_IOE);</div><div class='del'>-	/* 0xff010283 */</div><div class='del'>-</div><div class='del'>-	lp-&gt;dma_out(lp, RX_CURDESC_PTR,  lp-&gt;rx_bd_p);</div><div class='del'>-	lp-&gt;dma_out(lp, RX_TAILDESC_PTR,</div><div class='del'>-		       lp-&gt;rx_bd_p + (sizeof(*lp-&gt;rx_bd_v) * (RX_BD_NUM - 1)));</div><div class='del'>-	lp-&gt;dma_out(lp, TX_CURDESC_PTR, lp-&gt;tx_bd_p);</div><div class='add'>+	/* Configure DMA channel (irq setup) */</div><div class='add'>+	lp-&gt;dma_out(lp, TX_CHNL_CTRL, lp-&gt;tx_chnl_ctrl |</div><div class='add'>+		    0x00000400 | // Use 1 Bit Wide Counters. Currently Not Used!</div><div class='add'>+		    CHNL_CTRL_IRQ_EN | CHNL_CTRL_IRQ_ERR_EN |</div><div class='add'>+		    CHNL_CTRL_IRQ_DLY_EN | CHNL_CTRL_IRQ_COAL_EN);</div><div class='add'>+	lp-&gt;dma_out(lp, RX_CHNL_CTRL, lp-&gt;rx_chnl_ctrl |</div><div class='add'>+		    CHNL_CTRL_IRQ_IOE |</div><div class='add'>+		    CHNL_CTRL_IRQ_EN | CHNL_CTRL_IRQ_ERR_EN |</div><div class='add'>+		    CHNL_CTRL_IRQ_DLY_EN | CHNL_CTRL_IRQ_COAL_EN);</div><div class='ctx'> </div><div class='ctx'> 	/* Init descriptor indexes */</div><div class='ctx'> 	lp-&gt;tx_bd_ci = 0;</div><div class='hunk'>@@ -303,6 +320,15 @@ static int temac_dma_bd_init(struct net_device *ndev)</div><div class='ctx'> 	lp-&gt;tx_bd_tail = 0;</div><div class='ctx'> 	lp-&gt;rx_bd_ci = 0;</div><div class='ctx'> </div><div class='add'>+	/* Enable RX DMA transfers */</div><div class='add'>+	wmb();</div><div class='add'>+	lp-&gt;dma_out(lp, RX_CURDESC_PTR,  lp-&gt;rx_bd_p);</div><div class='add'>+	lp-&gt;dma_out(lp, RX_TAILDESC_PTR,</div><div class='add'>+		       lp-&gt;rx_bd_p + (sizeof(*lp-&gt;rx_bd_v) * (RX_BD_NUM - 1)));</div><div class='add'>+</div><div class='add'>+	/* Prepare for TX DMA transfer */</div><div class='add'>+	lp-&gt;dma_out(lp, TX_CURDESC_PTR, lp-&gt;tx_bd_p);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -319,7 +345,7 @@ static void temac_do_set_mac_address(struct net_device *ndev)</div><div class='ctx'> 	struct temac_local *lp = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* set up unicast MAC address filter set its mac address */</div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_UAW0_OFFSET,</div><div class='ctx'> 			     (ndev-&gt;dev_addr[0]) |</div><div class='ctx'> 			     (ndev-&gt;dev_addr[1] &lt;&lt; 8) |</div><div class='hunk'>@@ -330,7 +356,7 @@ static void temac_do_set_mac_address(struct net_device *ndev)</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_UAW1_OFFSET,</div><div class='ctx'> 			     (ndev-&gt;dev_addr[4] &amp; 0x000000ff) |</div><div class='ctx'> 			     (ndev-&gt;dev_addr[5] &lt;&lt; 8));</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int temac_init_mac_address(struct net_device *ndev, const void *address)</div><div class='hunk'>@@ -359,7 +385,7 @@ static void temac_set_multicast_list(struct net_device *ndev)</div><div class='ctx'> 	u32 multi_addr_msw, multi_addr_lsw, val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	if (ndev-&gt;flags &amp; (IFF_ALLMULTI | IFF_PROMISC) ||</div><div class='ctx'> 	    netdev_mc_count(ndev) &gt; MULTICAST_CAM_TABLE_NUM) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -398,7 +424,7 @@ static void temac_set_multicast_list(struct net_device *ndev)</div><div class='ctx'> 		temac_indirect_out32(lp, XTE_MAW1_OFFSET, 0);</div><div class='ctx'> 		dev_info(&amp;ndev-&gt;dev, "Promiscuous mode disabled.\n");</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct temac_option {</div><div class='hunk'>@@ -490,7 +516,7 @@ static u32 temac_setoptions(struct net_device *ndev, u32 options)</div><div class='ctx'> 	struct temac_option *tp = &amp;temac_options[0];</div><div class='ctx'> 	int reg;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	while (tp-&gt;opt) {</div><div class='ctx'> 		reg = temac_indirect_in32(lp, tp-&gt;reg) &amp; ~tp-&gt;m_or;</div><div class='ctx'> 		if (options &amp; tp-&gt;opt)</div><div class='hunk'>@@ -499,7 +525,7 @@ static u32 temac_setoptions(struct net_device *ndev, u32 options)</div><div class='ctx'> 		tp++;</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;options |= options;</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -518,7 +544,7 @@ static void temac_device_reset(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;ndev-&gt;dev, "%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	/* Reset the receiver and wait for it to finish reset */</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_RXC1_OFFSET, XTE_RXC1_RXRST_MASK);</div><div class='ctx'> 	timeout = 1000;</div><div class='hunk'>@@ -570,7 +596,7 @@ static void temac_device_reset(struct net_device *ndev)</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_TXC_OFFSET, 0);</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_FCC_OFFSET, XTE_FCC_RXFLO_MASK);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Sync default options with HW</div><div class='ctx'> 	 * but leave receiver and transmitter disabled.  */</div><div class='hunk'>@@ -598,7 +624,7 @@ static void temac_adjust_link(struct net_device *ndev)</div><div class='ctx'> 	/* hash together the state values to decide if something has changed */</div><div class='ctx'> 	link_state = phy-&gt;speed | (phy-&gt;duplex &lt;&lt; 1) | phy-&gt;link;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	if (lp-&gt;last_link != link_state) {</div><div class='ctx'> 		mii_speed = temac_indirect_in32(lp, XTE_EMCFG_OFFSET);</div><div class='ctx'> 		mii_speed &amp;= ~XTE_EMCFG_LINKSPD_MASK;</div><div class='hunk'>@@ -614,23 +640,52 @@ static void temac_adjust_link(struct net_device *ndev)</div><div class='ctx'> 		lp-&gt;last_link = link_state;</div><div class='ctx'> 		phy_print_status(phy);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+</div><div class='add'>+static void ptr_to_txbd(void *p, struct cdmac_bd *bd)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;app3 = (u32)(((u64)p) &gt;&gt; 32);</div><div class='add'>+	bd-&gt;app4 = (u32)((u64)p &amp; 0xFFFFFFFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *ptr_from_txbd(struct cdmac_bd *bd)</div><div class='add'>+{</div><div class='add'>+	return (void *)(((u64)(bd-&gt;app3) &lt;&lt; 32) | bd-&gt;app4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static void ptr_to_txbd(void *p, struct cdmac_bd *bd)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;app4 = (u32)p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *ptr_from_txbd(struct cdmac_bd *bd)</div><div class='add'>+{</div><div class='add'>+	return (void *)(bd-&gt;app4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void temac_start_xmit_done(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct temac_local *lp = netdev_priv(ndev);</div><div class='ctx'> 	struct cdmac_bd *cur_p;</div><div class='ctx'> 	unsigned int stat = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	cur_p = &amp;lp-&gt;tx_bd_v[lp-&gt;tx_bd_ci];</div><div class='del'>-	stat = cur_p-&gt;app0;</div><div class='add'>+	stat = be32_to_cpu(cur_p-&gt;app0);</div><div class='ctx'> </div><div class='ctx'> 	while (stat &amp; STS_CTRL_APP0_CMPLT) {</div><div class='del'>-		dma_unmap_single(ndev-&gt;dev.parent, cur_p-&gt;phys, cur_p-&gt;len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		if (cur_p-&gt;app4)</div><div class='del'>-			dev_consume_skb_irq((struct sk_buff *)cur_p-&gt;app4);</div><div class='add'>+		dma_unmap_single(ndev-&gt;dev.parent, be32_to_cpu(cur_p-&gt;phys),</div><div class='add'>+				 be32_to_cpu(cur_p-&gt;len), DMA_TO_DEVICE);</div><div class='add'>+		skb = (struct sk_buff *)ptr_from_txbd(cur_p);</div><div class='add'>+		if (skb)</div><div class='add'>+			dev_consume_skb_irq(skb);</div><div class='ctx'> 		cur_p-&gt;app0 = 0;</div><div class='ctx'> 		cur_p-&gt;app1 = 0;</div><div class='ctx'> 		cur_p-&gt;app2 = 0;</div><div class='hunk'>@@ -638,14 +693,14 @@ static void temac_start_xmit_done(struct net_device *ndev)</div><div class='ctx'> 		cur_p-&gt;app4 = 0;</div><div class='ctx'> </div><div class='ctx'> 		ndev-&gt;stats.tx_packets++;</div><div class='del'>-		ndev-&gt;stats.tx_bytes += cur_p-&gt;len;</div><div class='add'>+		ndev-&gt;stats.tx_bytes += be32_to_cpu(cur_p-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;tx_bd_ci++;</div><div class='ctx'> 		if (lp-&gt;tx_bd_ci &gt;= TX_BD_NUM)</div><div class='ctx'> 			lp-&gt;tx_bd_ci = 0;</div><div class='ctx'> </div><div class='ctx'> 		cur_p = &amp;lp-&gt;tx_bd_v[lp-&gt;tx_bd_ci];</div><div class='del'>-		stat = cur_p-&gt;app0;</div><div class='add'>+		stat = be32_to_cpu(cur_p-&gt;app0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_wake_queue(ndev);</div><div class='hunk'>@@ -679,7 +734,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct temac_local *lp = netdev_priv(ndev);</div><div class='ctx'> 	struct cdmac_bd *cur_p;</div><div class='del'>-	dma_addr_t start_p, tail_p;</div><div class='add'>+	dma_addr_t start_p, tail_p, skb_dma_addr;</div><div class='ctx'> 	int ii;</div><div class='ctx'> 	unsigned long num_frag;</div><div class='ctx'> 	skb_frag_t *frag;</div><div class='hunk'>@@ -689,7 +744,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	start_p = lp-&gt;tx_bd_p + sizeof(*lp-&gt;tx_bd_v) * lp-&gt;tx_bd_tail;</div><div class='ctx'> 	cur_p = &amp;lp-&gt;tx_bd_v[lp-&gt;tx_bd_tail];</div><div class='ctx'> </div><div class='del'>-	if (temac_check_tx_bd_space(lp, num_frag)) {</div><div class='add'>+	if (temac_check_tx_bd_space(lp, num_frag + 1)) {</div><div class='ctx'> 		if (!netif_queue_stopped(ndev))</div><div class='ctx'> 			netif_stop_queue(ndev);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='hunk'>@@ -700,16 +755,18 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		unsigned int csum_start_off = skb_checksum_start_offset(skb);</div><div class='ctx'> 		unsigned int csum_index_off = csum_start_off + skb-&gt;csum_offset;</div><div class='ctx'> </div><div class='del'>-		cur_p-&gt;app0 |= 1; /* TX Checksum Enabled */</div><div class='del'>-		cur_p-&gt;app1 = (csum_start_off &lt;&lt; 16) | csum_index_off;</div><div class='add'>+		cur_p-&gt;app0 |= cpu_to_be32(0x000001); /* TX Checksum Enabled */</div><div class='add'>+		cur_p-&gt;app1 = cpu_to_be32((csum_start_off &lt;&lt; 16)</div><div class='add'>+					  | csum_index_off);</div><div class='ctx'> 		cur_p-&gt;app2 = 0;  /* initial checksum seed */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cur_p-&gt;app0 |= STS_CTRL_APP0_SOP;</div><div class='del'>-	cur_p-&gt;len = skb_headlen(skb);</div><div class='del'>-	cur_p-&gt;phys = dma_map_single(ndev-&gt;dev.parent, skb-&gt;data,</div><div class='del'>-				     skb_headlen(skb), DMA_TO_DEVICE);</div><div class='del'>-	cur_p-&gt;app4 = (unsigned long)skb;</div><div class='add'>+	cur_p-&gt;app0 |= cpu_to_be32(STS_CTRL_APP0_SOP);</div><div class='add'>+	skb_dma_addr = dma_map_single(ndev-&gt;dev.parent, skb-&gt;data,</div><div class='add'>+				      skb_headlen(skb), DMA_TO_DEVICE);</div><div class='add'>+	cur_p-&gt;len = cpu_to_be32(skb_headlen(skb));</div><div class='add'>+	cur_p-&gt;phys = cpu_to_be32(skb_dma_addr);</div><div class='add'>+	ptr_to_txbd((void *)skb, cur_p);</div><div class='ctx'> </div><div class='ctx'> 	for (ii = 0; ii &lt; num_frag; ii++) {</div><div class='ctx'> 		lp-&gt;tx_bd_tail++;</div><div class='hunk'>@@ -717,14 +774,16 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 			lp-&gt;tx_bd_tail = 0;</div><div class='ctx'> </div><div class='ctx'> 		cur_p = &amp;lp-&gt;tx_bd_v[lp-&gt;tx_bd_tail];</div><div class='del'>-		cur_p-&gt;phys = dma_map_single(ndev-&gt;dev.parent,</div><div class='del'>-					     skb_frag_address(frag),</div><div class='del'>-					     skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='del'>-		cur_p-&gt;len = skb_frag_size(frag);</div><div class='add'>+		skb_dma_addr = dma_map_single(ndev-&gt;dev.parent,</div><div class='add'>+					      skb_frag_address(frag),</div><div class='add'>+					      skb_frag_size(frag),</div><div class='add'>+					      DMA_TO_DEVICE);</div><div class='add'>+		cur_p-&gt;phys = cpu_to_be32(skb_dma_addr);</div><div class='add'>+		cur_p-&gt;len = cpu_to_be32(skb_frag_size(frag));</div><div class='ctx'> 		cur_p-&gt;app0 = 0;</div><div class='ctx'> 		frag++;</div><div class='ctx'> 	}</div><div class='del'>-	cur_p-&gt;app0 |= STS_CTRL_APP0_EOP;</div><div class='add'>+	cur_p-&gt;app0 |= cpu_to_be32(STS_CTRL_APP0_EOP);</div><div class='ctx'> </div><div class='ctx'> 	tail_p = lp-&gt;tx_bd_p + sizeof(*lp-&gt;tx_bd_v) * lp-&gt;tx_bd_tail;</div><div class='ctx'> 	lp-&gt;tx_bd_tail++;</div><div class='hunk'>@@ -734,6 +793,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Kick off the transfer */</div><div class='add'>+	wmb();</div><div class='ctx'> 	lp-&gt;dma_out(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -746,7 +806,7 @@ static void ll_temac_recv(struct net_device *ndev)</div><div class='ctx'> 	struct sk_buff *skb, *new_skb;</div><div class='ctx'> 	unsigned int bdstat;</div><div class='ctx'> 	struct cdmac_bd *cur_p;</div><div class='del'>-	dma_addr_t tail_p;</div><div class='add'>+	dma_addr_t tail_p, skb_dma_addr;</div><div class='ctx'> 	int length;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -755,14 +815,14 @@ static void ll_temac_recv(struct net_device *ndev)</div><div class='ctx'> 	tail_p = lp-&gt;rx_bd_p + sizeof(*lp-&gt;rx_bd_v) * lp-&gt;rx_bd_ci;</div><div class='ctx'> 	cur_p = &amp;lp-&gt;rx_bd_v[lp-&gt;rx_bd_ci];</div><div class='ctx'> </div><div class='del'>-	bdstat = cur_p-&gt;app0;</div><div class='add'>+	bdstat = be32_to_cpu(cur_p-&gt;app0);</div><div class='ctx'> 	while ((bdstat &amp; STS_CTRL_APP0_CMPLT)) {</div><div class='ctx'> </div><div class='ctx'> 		skb = lp-&gt;rx_skb[lp-&gt;rx_bd_ci];</div><div class='del'>-		length = cur_p-&gt;app4 &amp; 0x3FFF;</div><div class='add'>+		length = be32_to_cpu(cur_p-&gt;app4) &amp; 0x3FFF;</div><div class='ctx'> </div><div class='del'>-		dma_unmap_single(ndev-&gt;dev.parent, cur_p-&gt;phys, length,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='add'>+		dma_unmap_single(ndev-&gt;dev.parent, be32_to_cpu(cur_p-&gt;phys),</div><div class='add'>+				 XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		skb_put(skb, length);</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='hunk'>@@ -773,7 +833,12 @@ static void ll_temac_recv(struct net_device *ndev)</div><div class='ctx'> 		    (skb-&gt;protocol == htons(ETH_P_IP)) &amp;&amp;</div><div class='ctx'> 		    (skb-&gt;len &gt; 64)) {</div><div class='ctx'> </div><div class='del'>-			skb-&gt;csum = cur_p-&gt;app3 &amp; 0xFFFF;</div><div class='add'>+			/* Convert from device endianness (be32) to cpu</div><div class='add'>+			 * endiannes, and if necessary swap the bytes</div><div class='add'>+			 * (back) for proper IP checksum byte order</div><div class='add'>+			 * (be16).</div><div class='add'>+			 */</div><div class='add'>+			skb-&gt;csum = htons(be32_to_cpu(cur_p-&gt;app3) &amp; 0xFFFF);</div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -790,11 +855,12 @@ static void ll_temac_recv(struct net_device *ndev)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cur_p-&gt;app0 = STS_CTRL_APP0_IRQONEND;</div><div class='del'>-		cur_p-&gt;phys = dma_map_single(ndev-&gt;dev.parent, new_skb-&gt;data,</div><div class='del'>-					     XTE_MAX_JUMBO_FRAME_SIZE,</div><div class='del'>-					     DMA_FROM_DEVICE);</div><div class='del'>-		cur_p-&gt;len = XTE_MAX_JUMBO_FRAME_SIZE;</div><div class='add'>+		cur_p-&gt;app0 = cpu_to_be32(STS_CTRL_APP0_IRQONEND);</div><div class='add'>+		skb_dma_addr = dma_map_single(ndev-&gt;dev.parent, new_skb-&gt;data,</div><div class='add'>+					      XTE_MAX_JUMBO_FRAME_SIZE,</div><div class='add'>+					      DMA_FROM_DEVICE);</div><div class='add'>+		cur_p-&gt;phys = cpu_to_be32(skb_dma_addr);</div><div class='add'>+		cur_p-&gt;len = cpu_to_be32(XTE_MAX_JUMBO_FRAME_SIZE);</div><div class='ctx'> 		lp-&gt;rx_skb[lp-&gt;rx_bd_ci] = new_skb;</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;rx_bd_ci++;</div><div class='hunk'>@@ -802,7 +868,7 @@ static void ll_temac_recv(struct net_device *ndev)</div><div class='ctx'> 			lp-&gt;rx_bd_ci = 0;</div><div class='ctx'> </div><div class='ctx'> 		cur_p = &amp;lp-&gt;rx_bd_v[lp-&gt;rx_bd_ci];</div><div class='del'>-		bdstat = cur_p-&gt;app0;</div><div class='add'>+		bdstat = be32_to_cpu(cur_p-&gt;app0);</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;dma_out(lp, RX_TAILDESC_PTR, tail_p);</div><div class='ctx'> </div><div class='hunk'>@@ -820,8 +886,10 @@ static irqreturn_t ll_temac_tx_irq(int irq, void *_ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; (IRQ_COAL | IRQ_DLY))</div><div class='ctx'> 		temac_start_xmit_done(lp-&gt;ndev);</div><div class='del'>-	if (status &amp; 0x080)</div><div class='del'>-		dev_err(&amp;ndev-&gt;dev, "DMA error 0x%x\n", status);</div><div class='add'>+	if (status &amp; (IRQ_ERR | IRQ_DMAERR))</div><div class='add'>+		dev_err_ratelimited(&amp;ndev-&gt;dev,</div><div class='add'>+				    "TX error 0x%x TX_CHNL_STS=0x%08x\n",</div><div class='add'>+				    status, lp-&gt;dma_in(lp, TX_CHNL_STS));</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -838,6 +906,10 @@ static irqreturn_t ll_temac_rx_irq(int irq, void *_ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; (IRQ_COAL | IRQ_DLY))</div><div class='ctx'> 		ll_temac_recv(lp-&gt;ndev);</div><div class='add'>+	if (status &amp; (IRQ_ERR | IRQ_DMAERR))</div><div class='add'>+		dev_err_ratelimited(&amp;ndev-&gt;dev,</div><div class='add'>+				    "RX error 0x%x RX_CHNL_STS=0x%08x\n",</div><div class='add'>+				    status, lp-&gt;dma_in(lp, RX_CHNL_STS));</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -857,7 +929,14 @@ static int temac_open(struct net_device *ndev)</div><div class='ctx'> 			dev_err(lp-&gt;dev, "of_phy_connect() failed\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		phy_start(phydev);</div><div class='add'>+	} else if (strlen(lp-&gt;phy_name) &gt; 0) {</div><div class='add'>+		phydev = phy_connect(lp-&gt;ndev, lp-&gt;phy_name, temac_adjust_link,</div><div class='add'>+				     lp-&gt;phy_interface);</div><div class='add'>+		if (IS_ERR(phydev)) {</div><div class='add'>+			dev_err(lp-&gt;dev, "phy_connect() failed\n");</div><div class='add'>+			return PTR_ERR(phydev);</div><div class='add'>+		}</div><div class='ctx'> 		phy_start(phydev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -977,22 +1056,25 @@ static const struct ethtool_ops temac_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'>-static int temac_of_probe(struct platform_device *op)</div><div class='add'>+static int temac_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='add'>+	struct ll_temac_platform_data *pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct device_node *temac_np = dev_of_node(&amp;pdev-&gt;dev), *dma_np;</div><div class='ctx'> 	struct temac_local *lp;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='add'>+	struct resource *res;</div><div class='ctx'> 	const void *addr;</div><div class='ctx'> 	__be32 *p;</div><div class='add'>+	bool little_endian;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Init network device structure */</div><div class='del'>-	ndev = alloc_etherdev(sizeof(*lp));</div><div class='add'>+	ndev = devm_alloc_etherdev(&amp;pdev-&gt;dev, sizeof(*lp));</div><div class='ctx'> 	if (!ndev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(op, ndev);</div><div class='del'>-	SET_NETDEV_DEV(ndev, &amp;op-&gt;dev);</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	ndev-&gt;flags &amp;= ~IFF_MULTICAST;  /* clear multicast */</div><div class='ctx'> 	ndev-&gt;features = NETIF_F_SG;</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;temac_netdev_ops;</div><div class='hunk'>@@ -1014,89 +1096,196 @@ static int temac_of_probe(struct platform_device *op)</div><div class='ctx'> 	/* setup temac private info structure */</div><div class='ctx'> 	lp = netdev_priv(ndev);</div><div class='ctx'> 	lp-&gt;ndev = ndev;</div><div class='del'>-	lp-&gt;dev = &amp;op-&gt;dev;</div><div class='add'>+	lp-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	lp-&gt;options = XTE_OPTION_DEFAULTS;</div><div class='ctx'> 	spin_lock_init(&amp;lp-&gt;rx_lock);</div><div class='del'>-	mutex_init(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+</div><div class='add'>+	/* Setup mutex for synchronization of indirect register access */</div><div class='add'>+	if (pdata) {</div><div class='add'>+		if (!pdata-&gt;indirect_mutex) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"indirect_mutex missing in platform_data\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		lp-&gt;indirect_mutex = pdata-&gt;indirect_mutex;</div><div class='add'>+	} else {</div><div class='add'>+		lp-&gt;indirect_mutex = devm_kmalloc(&amp;pdev-&gt;dev,</div><div class='add'>+						  sizeof(*lp-&gt;indirect_mutex),</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+		mutex_init(lp-&gt;indirect_mutex);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* map device registers */</div><div class='del'>-	lp-&gt;regs = of_iomap(op-&gt;dev.of_node, 0);</div><div class='del'>-	if (!lp-&gt;regs) {</div><div class='del'>-		dev_err(&amp;op-&gt;dev, "could not map temac regs.\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto nodev;</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	lp-&gt;regs = devm_ioremap_nocache(&amp;pdev-&gt;dev, res-&gt;start,</div><div class='add'>+					resource_size(res));</div><div class='add'>+	if (IS_ERR(lp-&gt;regs)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "could not map TEMAC registers\n");</div><div class='add'>+		return PTR_ERR(lp-&gt;regs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Select register access functions with the specified</div><div class='add'>+	 * endianness mode.  Default for OF devices is big-endian.</div><div class='add'>+	 */</div><div class='add'>+	little_endian = false;</div><div class='add'>+	if (temac_np) {</div><div class='add'>+		if (of_get_property(temac_np, "little-endian", NULL))</div><div class='add'>+			little_endian = true;</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		little_endian = pdata-&gt;reg_little_endian;</div><div class='add'>+	}</div><div class='add'>+	if (little_endian) {</div><div class='add'>+		lp-&gt;temac_ior = _temac_ior_le;</div><div class='add'>+		lp-&gt;temac_iow = _temac_iow_le;</div><div class='add'>+	} else {</div><div class='add'>+		lp-&gt;temac_ior = _temac_ior_be;</div><div class='add'>+		lp-&gt;temac_iow = _temac_iow_be;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup checksum offload, but default to off if not specified */</div><div class='ctx'> 	lp-&gt;temac_features = 0;</div><div class='del'>-	p = (__be32 *)of_get_property(op-&gt;dev.of_node, "xlnx,txcsum", NULL);</div><div class='del'>-	if (p &amp;&amp; be32_to_cpu(*p)) {</div><div class='del'>-		lp-&gt;temac_features |= TEMAC_FEATURE_TX_CSUM;</div><div class='add'>+	if (temac_np) {</div><div class='add'>+		p = (__be32 *)of_get_property(temac_np, "xlnx,txcsum", NULL);</div><div class='add'>+		if (p &amp;&amp; be32_to_cpu(*p))</div><div class='add'>+			lp-&gt;temac_features |= TEMAC_FEATURE_TX_CSUM;</div><div class='add'>+		p = (__be32 *)of_get_property(temac_np, "xlnx,rxcsum", NULL);</div><div class='add'>+		if (p &amp;&amp; be32_to_cpu(*p))</div><div class='add'>+			lp-&gt;temac_features |= TEMAC_FEATURE_RX_CSUM;</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		if (pdata-&gt;txcsum)</div><div class='add'>+			lp-&gt;temac_features |= TEMAC_FEATURE_TX_CSUM;</div><div class='add'>+		if (pdata-&gt;rxcsum)</div><div class='add'>+			lp-&gt;temac_features |= TEMAC_FEATURE_RX_CSUM;</div><div class='add'>+	}</div><div class='add'>+	if (lp-&gt;temac_features &amp; TEMAC_FEATURE_TX_CSUM)</div><div class='ctx'> 		/* Can checksum TCP/UDP over IPv4. */</div><div class='ctx'> 		ndev-&gt;features |= NETIF_F_IP_CSUM;</div><div class='del'>-	}</div><div class='del'>-	p = (__be32 *)of_get_property(op-&gt;dev.of_node, "xlnx,rxcsum", NULL);</div><div class='del'>-	if (p &amp;&amp; be32_to_cpu(*p))</div><div class='del'>-		lp-&gt;temac_features |= TEMAC_FEATURE_RX_CSUM;</div><div class='del'>-</div><div class='del'>-	/* Find the DMA node, map the DMA registers, and decode the DMA IRQs */</div><div class='del'>-	np = of_parse_phandle(op-&gt;dev.of_node, "llink-connected", 0);</div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;op-&gt;dev, "could not find DMA node\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_iounmap;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* Setup the DMA register accesses, could be DCR or memory mapped */</div><div class='del'>-	if (temac_dcr_setup(lp, op, np)) {</div><div class='add'>+	/* Setup LocalLink DMA */</div><div class='add'>+	if (temac_np) {</div><div class='add'>+		/* Find the DMA node, map the DMA registers, and</div><div class='add'>+		 * decode the DMA IRQs.</div><div class='add'>+		 */</div><div class='add'>+		dma_np = of_parse_phandle(temac_np, "llink-connected", 0);</div><div class='add'>+		if (!dma_np) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "could not find DMA node\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/* no DCR in the device tree, try non-DCR */</div><div class='del'>-		lp-&gt;sdma_regs = of_iomap(np, 0);</div><div class='del'>-		if (lp-&gt;sdma_regs) {</div><div class='del'>-			lp-&gt;dma_in = temac_dma_in32;</div><div class='del'>-			lp-&gt;dma_out = temac_dma_out32;</div><div class='del'>-			dev_dbg(&amp;op-&gt;dev, "MEM base: %p\n", lp-&gt;sdma_regs);</div><div class='del'>-		} else {</div><div class='del'>-			dev_err(&amp;op-&gt;dev, "unable to map DMA registers\n");</div><div class='del'>-			of_node_put(np);</div><div class='del'>-			goto err_iounmap;</div><div class='add'>+		/* Setup the DMA register accesses, could be DCR or</div><div class='add'>+		 * memory mapped.</div><div class='add'>+		 */</div><div class='add'>+		if (temac_dcr_setup(lp, pdev, dma_np)) {</div><div class='add'>+			/* no DCR in the device tree, try non-DCR */</div><div class='add'>+			lp-&gt;sdma_regs = devm_of_iomap(&amp;pdev-&gt;dev, dma_np, 0,</div><div class='add'>+						      NULL);</div><div class='add'>+			if (IS_ERR(lp-&gt;sdma_regs)) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+					"unable to map DMA registers\n");</div><div class='add'>+				of_node_put(dma_np);</div><div class='add'>+				return PTR_ERR(lp-&gt;sdma_regs);</div><div class='add'>+			}</div><div class='add'>+			if (of_get_property(dma_np, "little-endian", NULL)) {</div><div class='add'>+				lp-&gt;dma_in = temac_dma_in32_le;</div><div class='add'>+				lp-&gt;dma_out = temac_dma_out32_le;</div><div class='add'>+			} else {</div><div class='add'>+				lp-&gt;dma_in = temac_dma_in32_be;</div><div class='add'>+				lp-&gt;dma_out = temac_dma_out32_be;</div><div class='add'>+			}</div><div class='add'>+			dev_dbg(&amp;pdev-&gt;dev, "MEM base: %p\n", lp-&gt;sdma_regs);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;rx_irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-	lp-&gt;tx_irq = irq_of_parse_and_map(np, 1);</div><div class='add'>+		/* Get DMA RX and TX interrupts */</div><div class='add'>+		lp-&gt;rx_irq = irq_of_parse_and_map(dma_np, 0);</div><div class='add'>+		lp-&gt;tx_irq = irq_of_parse_and_map(dma_np, 1);</div><div class='ctx'> </div><div class='del'>-	of_node_put(np); /* Finished with the DMA node; drop the reference */</div><div class='add'>+		/* Use defaults for IRQ delay/coalescing setup.  These</div><div class='add'>+		 * are configuration values, so does not belong in</div><div class='add'>+		 * device-tree.</div><div class='add'>+		 */</div><div class='add'>+		lp-&gt;tx_chnl_ctrl = 0x10220000;</div><div class='add'>+		lp-&gt;rx_chnl_ctrl = 0xff070000;</div><div class='add'>+</div><div class='add'>+		/* Finished with the DMA node; drop the reference */</div><div class='add'>+		of_node_put(dma_np);</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		/* 2nd memory resource specifies DMA registers */</div><div class='add'>+		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+		lp-&gt;sdma_regs = devm_ioremap_nocache(&amp;pdev-&gt;dev, res-&gt;start,</div><div class='add'>+						     resource_size(res));</div><div class='add'>+		if (IS_ERR(lp-&gt;sdma_regs)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"could not map DMA registers\n");</div><div class='add'>+			return PTR_ERR(lp-&gt;sdma_regs);</div><div class='add'>+		}</div><div class='add'>+		if (pdata-&gt;dma_little_endian) {</div><div class='add'>+			lp-&gt;dma_in = temac_dma_in32_le;</div><div class='add'>+			lp-&gt;dma_out = temac_dma_out32_le;</div><div class='add'>+		} else {</div><div class='add'>+			lp-&gt;dma_in = temac_dma_in32_be;</div><div class='add'>+			lp-&gt;dma_out = temac_dma_out32_be;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (!lp-&gt;rx_irq || !lp-&gt;tx_irq) {</div><div class='del'>-		dev_err(&amp;op-&gt;dev, "could not determine irqs\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto err_iounmap_2;</div><div class='add'>+		/* Get DMA RX and TX interrupts */</div><div class='add'>+		lp-&gt;rx_irq = platform_get_irq(pdev, 0);</div><div class='add'>+		lp-&gt;tx_irq = platform_get_irq(pdev, 1);</div><div class='add'>+</div><div class='add'>+		/* IRQ delay/coalescing setup */</div><div class='add'>+		if (pdata-&gt;tx_irq_timeout || pdata-&gt;tx_irq_count)</div><div class='add'>+			lp-&gt;tx_chnl_ctrl = (pdata-&gt;tx_irq_timeout &lt;&lt; 24) |</div><div class='add'>+				(pdata-&gt;tx_irq_count &lt;&lt; 16);</div><div class='add'>+		else</div><div class='add'>+			lp-&gt;tx_chnl_ctrl = 0x10220000;</div><div class='add'>+		if (pdata-&gt;rx_irq_timeout || pdata-&gt;rx_irq_count)</div><div class='add'>+			lp-&gt;rx_chnl_ctrl = (pdata-&gt;rx_irq_timeout &lt;&lt; 24) |</div><div class='add'>+				(pdata-&gt;rx_irq_count &lt;&lt; 16);</div><div class='add'>+		else</div><div class='add'>+			lp-&gt;rx_chnl_ctrl = 0xff070000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Error handle returned DMA RX and TX interrupts */</div><div class='add'>+	if (lp-&gt;rx_irq &lt; 0) {</div><div class='add'>+		if (lp-&gt;rx_irq != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "could not get DMA RX irq\n");</div><div class='add'>+		return lp-&gt;rx_irq;</div><div class='add'>+	}</div><div class='add'>+	if (lp-&gt;tx_irq &lt; 0) {</div><div class='add'>+		if (lp-&gt;tx_irq != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "could not get DMA TX irq\n");</div><div class='add'>+		return lp-&gt;tx_irq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Retrieve the MAC address */</div><div class='del'>-	addr = of_get_mac_address(op-&gt;dev.of_node);</div><div class='del'>-	if (!addr) {</div><div class='del'>-		dev_err(&amp;op-&gt;dev, "could not find MAC address\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_iounmap_2;</div><div class='add'>+	if (temac_np) {</div><div class='add'>+		/* Retrieve the MAC address */</div><div class='add'>+		addr = of_get_mac_address(temac_np);</div><div class='add'>+		if (IS_ERR(addr)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "could not find MAC address\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		temac_init_mac_address(ndev, addr);</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		temac_init_mac_address(ndev, pdata-&gt;mac_addr);</div><div class='ctx'> 	}</div><div class='del'>-	temac_init_mac_address(ndev, addr);</div><div class='ctx'> </div><div class='del'>-	rc = temac_mdio_setup(lp, op-&gt;dev.of_node);</div><div class='add'>+	rc = temac_mdio_setup(lp, pdev);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		dev_warn(&amp;op-&gt;dev, "error registering MDIO bus\n");</div><div class='del'>-</div><div class='del'>-	lp-&gt;phy_node = of_parse_phandle(op-&gt;dev.of_node, "phy-handle", 0);</div><div class='del'>-	if (lp-&gt;phy_node)</div><div class='del'>-		dev_dbg(lp-&gt;dev, "using PHY node %pOF (%p)\n", np, np);</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "error registering MDIO bus\n");</div><div class='add'>+</div><div class='add'>+	if (temac_np) {</div><div class='add'>+		lp-&gt;phy_node = of_parse_phandle(temac_np, "phy-handle", 0);</div><div class='add'>+		if (lp-&gt;phy_node)</div><div class='add'>+			dev_dbg(lp-&gt;dev, "using PHY node %pOF\n", temac_np);</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		snprintf(lp-&gt;phy_name, sizeof(lp-&gt;phy_name),</div><div class='add'>+			 PHY_ID_FMT, lp-&gt;mii_bus-&gt;id, pdata-&gt;phy_addr);</div><div class='add'>+		lp-&gt;phy_interface = pdata-&gt;phy_interface;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Add the device attributes */</div><div class='ctx'> 	rc = sysfs_create_group(&amp;lp-&gt;dev-&gt;kobj, &amp;temac_attr_group);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(lp-&gt;dev, "Error creating sysfs files\n");</div><div class='del'>-		goto err_iounmap_2;</div><div class='add'>+		goto err_sysfs_create;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = register_netdev(lp-&gt;ndev);</div><div class='hunk'>@@ -1107,33 +1296,25 @@ static int temac_of_probe(struct platform_device *op)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- err_register_ndev:</div><div class='add'>+err_register_ndev:</div><div class='ctx'> 	sysfs_remove_group(&amp;lp-&gt;dev-&gt;kobj, &amp;temac_attr_group);</div><div class='del'>- err_iounmap_2:</div><div class='del'>-	if (lp-&gt;sdma_regs)</div><div class='del'>-		iounmap(lp-&gt;sdma_regs);</div><div class='del'>- err_iounmap:</div><div class='del'>-	iounmap(lp-&gt;regs);</div><div class='del'>- nodev:</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-	ndev = NULL;</div><div class='add'>+err_sysfs_create:</div><div class='add'>+	if (lp-&gt;phy_node)</div><div class='add'>+		of_node_put(lp-&gt;phy_node);</div><div class='add'>+	temac_mdio_teardown(lp);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int temac_of_remove(struct platform_device *op)</div><div class='add'>+static int temac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = platform_get_drvdata(op);</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct temac_local *lp = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	temac_mdio_teardown(lp);</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='ctx'> 	sysfs_remove_group(&amp;lp-&gt;dev-&gt;kobj, &amp;temac_attr_group);</div><div class='del'>-	of_node_put(lp-&gt;phy_node);</div><div class='del'>-	lp-&gt;phy_node = NULL;</div><div class='del'>-	iounmap(lp-&gt;regs);</div><div class='del'>-	if (lp-&gt;sdma_regs)</div><div class='del'>-		iounmap(lp-&gt;sdma_regs);</div><div class='del'>-	free_netdev(ndev);</div><div class='add'>+	if (lp-&gt;phy_node)</div><div class='add'>+		of_node_put(lp-&gt;phy_node);</div><div class='add'>+	temac_mdio_teardown(lp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1146,16 +1327,16 @@ static const struct of_device_id temac_of_match[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, temac_of_match);</div><div class='ctx'> </div><div class='del'>-static struct platform_driver temac_of_driver = {</div><div class='del'>-	.probe = temac_of_probe,</div><div class='del'>-	.remove = temac_of_remove,</div><div class='add'>+static struct platform_driver temac_driver = {</div><div class='add'>+	.probe = temac_probe,</div><div class='add'>+	.remove = temac_remove,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "xilinx_temac",</div><div class='ctx'> 		.of_match_table = temac_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_platform_driver(temac_of_driver);</div><div class='add'>+module_platform_driver(temac_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Xilinx LL_TEMAC Ethernet driver");</div><div class='ctx'> MODULE_AUTHOR("Yoshio Kashiwagi");</div><div class='head'>diff --git a/drivers/net/ethernet/xilinx/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c<br/>index f5e83ac6f7e2..a4667326f745 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/ll_temac_mdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/ll_temac_mdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/ll_temac_mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/xilinx/ll_temac_mdio.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/xilinx-ll-temac.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ll_temac.h"</div><div class='ctx'> </div><div class='hunk'>@@ -28,10 +29,10 @@ static int temac_mdio_read(struct mii_bus *bus, int phy_id, int reg)</div><div class='ctx'> 	/* Write the PHY address to the MIIM Access Initiator register.</div><div class='ctx'> 	 * When the transfer completes, the PHY register value will appear</div><div class='ctx'> 	 * in the LSW0 register */</div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	temac_iow(lp, XTE_LSW0_OFFSET, (phy_id &lt;&lt; 5) | reg);</div><div class='ctx'> 	rc = temac_indirect_in32(lp, XTE_MIIMAI_OFFSET);</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(lp-&gt;dev, "temac_mdio_read(phy_id=%i, reg=%x) == %x\n",</div><div class='ctx'> 		phy_id, reg, rc);</div><div class='hunk'>@@ -49,25 +50,34 @@ static int temac_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 val)</div><div class='ctx'> 	/* First write the desired value into the write data register</div><div class='ctx'> 	 * and then write the address into the access initiator register</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_MGTDR_OFFSET, val);</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_MIIMAI_OFFSET, (phy_id &lt;&lt; 5) | reg);</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int temac_mdio_setup(struct temac_local *lp, struct device_node *np)</div><div class='add'>+int temac_mdio_setup(struct temac_local *lp, struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct ll_temac_platform_data *pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct device_node *np = dev_of_node(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> 	u32 bus_hz;</div><div class='ctx'> 	int clk_div;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct resource res;</div><div class='ctx'> </div><div class='add'>+	/* Get MDIO bus frequency (if specified) */</div><div class='add'>+	bus_hz = 0;</div><div class='add'>+	if (np)</div><div class='add'>+		of_property_read_u32(np, "clock-frequency", &amp;bus_hz);</div><div class='add'>+	else if (pdata)</div><div class='add'>+		bus_hz = pdata-&gt;mdio_clk_freq;</div><div class='add'>+</div><div class='ctx'> 	/* Calculate a reasonable divisor for the clock rate */</div><div class='ctx'> 	clk_div = 0x3f; /* worst-case default setting */</div><div class='del'>-	if (of_property_read_u32(np, "clock-frequency", &amp;bus_hz) == 0) {</div><div class='add'>+	if (bus_hz != 0) {</div><div class='ctx'> 		clk_div = bus_hz / (2500 * 1000 * 2) - 1;</div><div class='ctx'> 		if (clk_div &lt; 1)</div><div class='ctx'> 			clk_div = 1;</div><div class='hunk'>@@ -77,17 +87,23 @@ int temac_mdio_setup(struct temac_local *lp, struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the MDIO bus by asserting the enable bit and writing</div><div class='ctx'> 	 * in the clock config */</div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	temac_indirect_out32(lp, XTE_MC_OFFSET, 1 &lt;&lt; 6 | clk_div);</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> </div><div class='del'>-	bus = mdiobus_alloc();</div><div class='add'>+	bus = devm_mdiobus_alloc(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!bus)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	of_address_to_resource(np, 0, &amp;res);</div><div class='del'>-	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%.8llx",</div><div class='del'>-		 (unsigned long long)res.start);</div><div class='add'>+	if (np) {</div><div class='add'>+		of_address_to_resource(np, 0, &amp;res);</div><div class='add'>+		snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%.8llx",</div><div class='add'>+			 (unsigned long long)res.start);</div><div class='add'>+	} else if (pdata) {</div><div class='add'>+		snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%.8llx",</div><div class='add'>+			 pdata-&gt;mdio_bus_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bus-&gt;priv = lp;</div><div class='ctx'> 	bus-&gt;name = "Xilinx TEMAC MDIO";</div><div class='ctx'> 	bus-&gt;read = temac_mdio_read;</div><div class='hunk'>@@ -98,23 +114,16 @@ int temac_mdio_setup(struct temac_local *lp, struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	rc = of_mdiobus_register(bus, np);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto err_register;</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_lock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	dev_dbg(lp-&gt;dev, "MDIO bus registered;  MC:%x\n",</div><div class='ctx'> 		temac_indirect_in32(lp, XTE_MC_OFFSET));</div><div class='del'>-	mutex_unlock(&amp;lp-&gt;indirect_mutex);</div><div class='add'>+	mutex_unlock(lp-&gt;indirect_mutex);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- err_register:</div><div class='del'>-	mdiobus_free(bus);</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void temac_mdio_teardown(struct temac_local *lp)</div><div class='ctx'> {</div><div class='ctx'> 	mdiobus_unregister(lp-&gt;mii_bus);</div><div class='del'>-	mdiobus_free(lp-&gt;mii_bus);</div><div class='del'>-	lp-&gt;mii_bus = NULL;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c<br/>index ec7e7ec24ff9..108fbc7f125a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/xilinx_axienet_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/xilinx_axienet_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/xilinx_axienet_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/xilinx/xilinx_axienet_main.c</a></div><div class='hunk'>@@ -1575,12 +1575,14 @@ static int axienet_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = of_address_to_resource(np, 0, &amp;dmares);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "unable to get DMA resource\n");</div><div class='add'>+		of_node_put(np);</div><div class='ctx'> 		goto free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;dma_regs = devm_ioremap_resource(&amp;pdev-&gt;dev, &amp;dmares);</div><div class='ctx'> 	if (IS_ERR(lp-&gt;dma_regs)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "could not map DMA regs\n");</div><div class='ctx'> 		ret = PTR_ERR(lp-&gt;dma_regs);</div><div class='add'>+		of_node_put(np);</div><div class='ctx'> 		goto free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;rx_irq = irq_of_parse_and_map(np, 1);</div><div class='hunk'>@@ -1594,7 +1596,7 @@ static int axienet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Retrieve the MAC address */</div><div class='ctx'> 	mac_addr = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-	if (!mac_addr) {</div><div class='add'>+	if (IS_ERR(mac_addr)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "could not find MAC address\n");</div><div class='ctx'> 		goto free_netdev;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c<br/>index b03a417d0073..691170753563 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/xilinx_emaclite.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ethernet/xilinx/xilinx_emaclite.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</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/skbuff.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/slab.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='hunk'>@@ -1078,6 +1079,27 @@ static bool get_bool(struct platform_device *ofdev, const char *s)</div><div class='ctx'> 	return (bool)*p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * xemaclite_ethtools_get_drvinfo - Get various Axi Emac Lite driver info</div><div class='add'>+ * @ndev:       Pointer to net_device structure</div><div class='add'>+ * @ed:         Pointer to ethtool_drvinfo structure</div><div class='add'>+ *</div><div class='add'>+ * This implements ethtool command for getting the driver information.</div><div class='add'>+ * Issue "ethtool -i ethX" under linux prompt to execute this function.</div><div class='add'>+ */</div><div class='add'>+static void xemaclite_ethtools_get_drvinfo(struct net_device *ndev,</div><div class='add'>+					   struct ethtool_drvinfo *ed)</div><div class='add'>+{</div><div class='add'>+	strlcpy(ed-&gt;driver, DRIVER_NAME, sizeof(ed-&gt;driver));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops xemaclite_ethtool_ops = {</div><div class='add'>+	.get_drvinfo    = xemaclite_ethtools_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='ctx'> static const struct net_device_ops xemaclite_netdev_ops;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1143,7 +1165,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 	lp-&gt;rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");</div><div class='ctx'> 	mac_address = of_get_mac_address(ofdev-&gt;dev.of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac_address) {</div><div class='add'>+	if (!IS_ERR(mac_address)) {</div><div class='ctx'> 		/* Set the MAC address. */</div><div class='ctx'> 		memcpy(ndev-&gt;dev_addr, mac_address, ETH_ALEN);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1164,6 +1186,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 	dev_info(dev, "MAC address is now %pM\n", ndev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;xemaclite_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;xemaclite_ethtool_ops;</div><div class='ctx'> 	ndev-&gt;flags &amp;= ~IFF_MULTICAST;</div><div class='ctx'> 	ndev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='ctx'> </div><div class='hunk'>@@ -1229,12 +1252,29 @@ xemaclite_poll_controller(struct net_device *ndev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Ioctl MII Interface */</div><div class='add'>+static int xemaclite_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;phydev || !netif_running(dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGMIIPHY:</div><div class='add'>+	case SIOCGMIIREG:</div><div class='add'>+	case SIOCSMIIREG:</div><div class='add'>+		return phy_mii_ioctl(dev-&gt;phydev, rq, 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='ctx'> static const struct net_device_ops xemaclite_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= xemaclite_open,</div><div class='ctx'> 	.ndo_stop		= xemaclite_close,</div><div class='ctx'> 	.ndo_start_xmit		= xemaclite_send,</div><div class='ctx'> 	.ndo_set_mac_address	= xemaclite_set_mac_address,</div><div class='ctx'> 	.ndo_tx_timeout		= xemaclite_tx_timeout,</div><div class='add'>+	.ndo_do_ioctl		= xemaclite_ioctl,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller = xemaclite_poll_controller,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c<br/>index 5583d993480d..98d1a45c0606 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/geneve.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/geneve.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/geneve.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/geneve.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</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/hash.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='ctx'> #include &lt;net/gro_cells.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='hunk'>@@ -22,8 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> #define GENEVE_NETDEV_VER	"0.6"</div><div class='ctx'> </div><div class='del'>-#define GENEVE_UDP_PORT		6081</div><div class='del'>-</div><div class='ctx'> #define GENEVE_N_VID		(1u &lt;&lt; 24)</div><div class='ctx'> #define GENEVE_VID_MASK		(GENEVE_N_VID - 1)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c<br/>index 7a145172d503..eaf4311b4004 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/gtp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/gtp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/gtp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/gtp.c</a></div><div class='hunk'>@@ -1270,21 +1270,21 @@ static const struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = {</div><div class='ctx'> static const struct genl_ops gtp_genl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = GTP_CMD_NEWPDP,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = gtp_genl_new_pdp,</div><div class='del'>-		.policy = gtp_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = GTP_CMD_DELPDP,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = gtp_genl_del_pdp,</div><div class='del'>-		.policy = gtp_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = GTP_CMD_GETPDP,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = gtp_genl_get_pdp,</div><div class='ctx'> 		.dumpit = gtp_genl_dump_pdp,</div><div class='del'>-		.policy = gtp_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -1294,6 +1294,7 @@ static struct genl_family gtp_genl_family __ro_after_init = {</div><div class='ctx'> 	.version	= 0,</div><div class='ctx'> 	.hdrsize	= 0,</div><div class='ctx'> 	.maxattr	= GTPA_MAX,</div><div class='add'>+	.policy = gtp_genl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> 	.ops		= gtp_genl_ops,</div><div class='head'>diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c<br/>index 029206e4da3b..0f7025f3a384 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hippi/rrunner.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hippi/rrunner.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hippi/rrunner.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/hippi/rrunner.c</a></div><div class='hunk'>@@ -1298,11 +1298,11 @@ static void rr_dump(struct net_device *dev)</div><div class='ctx'> 	if (rrpriv-&gt;tx_skbuff[cons]){</div><div class='ctx'> 		len = min_t(int, 0x80, rrpriv-&gt;tx_skbuff[cons]-&gt;len);</div><div class='ctx'> 		printk("skbuff for cons %i is valid - dumping data (0x%x bytes - skbuff len 0x%x)\n", cons, len, rrpriv-&gt;tx_skbuff[cons]-&gt;len);</div><div class='del'>-		printk("mode 0x%x, size 0x%x,\n phys %08Lx, skbuff-addr %08lx, truesize 0x%x\n",</div><div class='add'>+		printk("mode 0x%x, size 0x%x,\n phys %08Lx, skbuff-addr %p, truesize 0x%x\n",</div><div class='ctx'> 		       rrpriv-&gt;tx_ring[cons].mode,</div><div class='ctx'> 		       rrpriv-&gt;tx_ring[cons].size,</div><div class='ctx'> 		       (unsigned long long) rrpriv-&gt;tx_ring[cons].addr.addrlo,</div><div class='del'>-		       (unsigned long)rrpriv-&gt;tx_skbuff[cons]-&gt;data,</div><div class='add'>+		       rrpriv-&gt;tx_skbuff[cons]-&gt;data,</div><div class='ctx'> 		       (unsigned int)rrpriv-&gt;tx_skbuff[cons]-&gt;truesize);</div><div class='ctx'> 		for (i = 0; i &lt; len; i++){</div><div class='ctx'> 			if (!(i &amp; 7))</div><div class='head'>diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h<br/>index e859ae2e42d5..49f41b64077b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hyperv/hyperv_net.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hyperv/hyperv_net.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hyperv/hyperv_net.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/hyperv/hyperv_net.h</a></div><div class='hunk'>@@ -987,6 +987,7 @@ struct netvsc_device {</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t wait_drain;</div><div class='ctx'> 	bool destroy;</div><div class='add'>+	bool tx_disable; /* if true, do not wake up queue again */</div><div class='ctx'> </div><div class='ctx'> 	/* Receive buffer allocated by us but manages by NetVSP */</div><div class='ctx'> 	void *recv_buf;</div><div class='head'>diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c<br/>index 813d195bbd57..ee198606854d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hyperv/netvsc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hyperv/netvsc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hyperv/netvsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/hyperv/netvsc.c</a></div><div class='hunk'>@@ -110,6 +110,7 @@ static struct netvsc_device *alloc_net_device(void)</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;net_device-&gt;wait_drain);</div><div class='ctx'> 	net_device-&gt;destroy = false;</div><div class='add'>+	net_device-&gt;tx_disable = false;</div><div class='ctx'> </div><div class='ctx'> 	net_device-&gt;max_pkt = RNDIS_MAX_PKT_DEFAULT;</div><div class='ctx'> 	net_device-&gt;pkt_align = RNDIS_PKT_ALIGN_DEFAULT;</div><div class='hunk'>@@ -719,7 +720,7 @@ static void netvsc_send_tx_complete(struct net_device *ndev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct netdev_queue *txq = netdev_get_tx_queue(ndev, q_idx);</div><div class='ctx'> </div><div class='del'>-		if (netif_tx_queue_stopped(txq) &amp;&amp;</div><div class='add'>+		if (netif_tx_queue_stopped(txq) &amp;&amp; !net_device-&gt;tx_disable &amp;&amp;</div><div class='ctx'> 		    (hv_get_avail_to_write_percent(&amp;channel-&gt;outbound) &gt;</div><div class='ctx'> 		     RING_AVAIL_PERCENT_HIWATER || queue_sends &lt; 1)) {</div><div class='ctx'> 			netif_tx_wake_queue(txq);</div><div class='hunk'>@@ -874,11 +875,6 @@ static inline int netvsc_send_pkt(</div><div class='ctx'> 	} else if (ret == -EAGAIN) {</div><div class='ctx'> 		netif_tx_stop_queue(txq);</div><div class='ctx'> 		ndev_ctx-&gt;eth_stats.stop_queue++;</div><div class='del'>-		if (atomic_read(&amp;nvchan-&gt;queue_sends) &lt; 1) {</div><div class='del'>-			netif_tx_wake_queue(txq);</div><div class='del'>-			ndev_ctx-&gt;eth_stats.wake_queue++;</div><div class='del'>-			ret = -ENOSPC;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_err(ndev,</div><div class='ctx'> 			   "Unable to send packet pages %u len %u, ret %d\n",</div><div class='hunk'>@@ -886,6 +882,15 @@ static inline int netvsc_send_pkt(</div><div class='ctx'> 			   ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (netif_tx_queue_stopped(txq) &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;nvchan-&gt;queue_sends) &lt; 1 &amp;&amp;</div><div class='add'>+	    !net_device-&gt;tx_disable) {</div><div class='add'>+		netif_tx_wake_queue(txq);</div><div class='add'>+		ndev_ctx-&gt;eth_stats.wake_queue++;</div><div class='add'>+		if (ret == -EAGAIN)</div><div class='add'>+			ret = -ENOSPC;</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='hunk'>@@ -964,7 +969,7 @@ int netvsc_send(struct net_device *ndev,</div><div class='ctx'> 	/* Keep aggregating only if stack says more data is coming</div><div class='ctx'> 	 * and not doing mixed modes send and not flow blocked</div><div class='ctx'> 	 */</div><div class='del'>-	xmit_more = skb-&gt;xmit_more &amp;&amp;</div><div class='add'>+	xmit_more = netdev_xmit_more() &amp;&amp;</div><div class='ctx'> 		!packet-&gt;cp_partial &amp;&amp;</div><div class='ctx'> 		!netif_xmit_stopped(netdev_get_tx_queue(ndev, packet-&gt;q_idx));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c<br/>index cf4897043e83..06393b215102 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hyperv/netvsc_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/hyperv/netvsc_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/hyperv/netvsc_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/hyperv/netvsc_drv.c</a></div><div class='hunk'>@@ -109,6 +109,15 @@ static void netvsc_set_rx_mode(struct net_device *net)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void netvsc_tx_enable(struct netvsc_device *nvscdev,</div><div class='add'>+			     struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	nvscdev-&gt;tx_disable = false;</div><div class='add'>+	virt_wmb(); /* ensure queue wake up mechanism is on */</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='ctx'> static int netvsc_open(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device_context *ndev_ctx = netdev_priv(net);</div><div class='hunk'>@@ -129,7 +138,7 @@ static int netvsc_open(struct net_device *net)</div><div class='ctx'> 	rdev = nvdev-&gt;extension;</div><div class='ctx'> 	if (!rdev-&gt;link_state) {</div><div class='ctx'> 		netif_carrier_on(net);</div><div class='del'>-		netif_tx_wake_all_queues(net);</div><div class='add'>+		netvsc_tx_enable(nvdev, net);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vf_netdev) {</div><div class='hunk'>@@ -184,6 +193,17 @@ static int netvsc_wait_until_empty(struct netvsc_device *nvdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void netvsc_tx_disable(struct netvsc_device *nvscdev,</div><div class='add'>+			      struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	if (nvscdev) {</div><div class='add'>+		nvscdev-&gt;tx_disable = true;</div><div class='add'>+		virt_wmb(); /* ensure txq will not wake up after stop */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_tx_disable(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int netvsc_close(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device_context *net_device_ctx = netdev_priv(net);</div><div class='hunk'>@@ -192,7 +212,7 @@ static int netvsc_close(struct net_device *net)</div><div class='ctx'> 	struct netvsc_device *nvdev = rtnl_dereference(net_device_ctx-&gt;nvdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	netif_tx_disable(net);</div><div class='add'>+	netvsc_tx_disable(nvdev, net);</div><div class='ctx'> </div><div class='ctx'> 	/* No need to close rndis filter if it is removed already */</div><div class='ctx'> 	if (!nvdev)</div><div class='hunk'>@@ -308,7 +328,7 @@ static inline int netvsc_get_tx_queue(struct net_device *ndev,</div><div class='ctx'>  * If a valid queue has already been assigned, then use that.</div><div class='ctx'>  * Otherwise compute tx queue based on hash and the send table.</div><div class='ctx'>  *</div><div class='del'>- * This is basically similar to default (__netdev_pick_tx) with the added step</div><div class='add'>+ * This is basically similar to default (netdev_pick_tx) with the added step</div><div class='ctx'>  * of using the host send_table when no other queue has been assigned.</div><div class='ctx'>  *</div><div class='ctx'>  * TODO support XPS - but get_xps_queue not exported</div><div class='hunk'>@@ -331,8 +351,7 @@ static u16 netvsc_pick_tx(struct net_device *ndev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,</div><div class='del'>-			       struct net_device *sb_dev,</div><div class='del'>-			       select_queue_fallback_t fallback)</div><div class='add'>+			       struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device_context *ndc = netdev_priv(ndev);</div><div class='ctx'> 	struct net_device *vf_netdev;</div><div class='hunk'>@@ -344,10 +363,9 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,</div><div class='ctx'> 		const struct net_device_ops *vf_ops = vf_netdev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='ctx'> 		if (vf_ops-&gt;ndo_select_queue)</div><div class='del'>-			txq = vf_ops-&gt;ndo_select_queue(vf_netdev, skb,</div><div class='del'>-						       sb_dev, fallback);</div><div class='add'>+			txq = vf_ops-&gt;ndo_select_queue(vf_netdev, skb, sb_dev);</div><div class='ctx'> 		else</div><div class='del'>-			txq = fallback(vf_netdev, skb, NULL);</div><div class='add'>+			txq = netdev_pick_tx(vf_netdev, skb, NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* Record the queue selected by VF so that it can be</div><div class='ctx'> 		 * used for common case where VF has more queues than</div><div class='hunk'>@@ -920,7 +938,7 @@ static int netvsc_detach(struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> 	/* If device was up (receiving) then shutdown */</div><div class='ctx'> 	if (netif_running(ndev)) {</div><div class='del'>-		netif_tx_disable(ndev);</div><div class='add'>+		netvsc_tx_disable(nvdev, ndev);</div><div class='ctx'> </div><div class='ctx'> 		ret = rndis_filter_close(nvdev);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1908,7 +1926,7 @@ static void netvsc_link_change(struct work_struct *w)</div><div class='ctx'> 		if (rdev-&gt;link_state) {</div><div class='ctx'> 			rdev-&gt;link_state = false;</div><div class='ctx'> 			netif_carrier_on(net);</div><div class='del'>-			netif_tx_wake_all_queues(net);</div><div class='add'>+			netvsc_tx_enable(net_device, net);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			notify = true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1918,7 +1936,7 @@ static void netvsc_link_change(struct work_struct *w)</div><div class='ctx'> 		if (!rdev-&gt;link_state) {</div><div class='ctx'> 			rdev-&gt;link_state = true;</div><div class='ctx'> 			netif_carrier_off(net);</div><div class='del'>-			netif_tx_stop_all_queues(net);</div><div class='add'>+			netvsc_tx_disable(net_device, net);</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(event);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1927,7 +1945,7 @@ static void netvsc_link_change(struct work_struct *w)</div><div class='ctx'> 		if (!rdev-&gt;link_state) {</div><div class='ctx'> 			rdev-&gt;link_state = true;</div><div class='ctx'> 			netif_carrier_off(net);</div><div class='del'>-			netif_tx_stop_all_queues(net);</div><div class='add'>+			netvsc_tx_disable(net_device, net);</div><div class='ctx'> 			event-&gt;event = RNDIS_STATUS_MEDIA_CONNECT;</div><div class='ctx'> 			spin_lock_irqsave(&amp;ndev_ctx-&gt;lock, flags);</div><div class='ctx'> 			list_add(&amp;event-&gt;list, &amp;ndev_ctx-&gt;reconfig_events);</div><div class='head'>diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c<br/>index cd1d8faccca5..cd6b95e673a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ieee802154/adf7242.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ieee802154/adf7242.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ieee802154/adf7242.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ieee802154/adf7242.c</a></div><div class='hunk'>@@ -1268,6 +1268,10 @@ static int adf7242_probe(struct spi_device *spi)</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;lp-&gt;work, adf7242_rx_cal_work);</div><div class='ctx'> 	lp-&gt;wqueue = alloc_ordered_workqueue(dev_name(&amp;spi-&gt;dev),</div><div class='ctx'> 					     WQ_MEM_RECLAIM);</div><div class='add'>+	if (unlikely(!lp-&gt;wqueue)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_hw_init;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = adf7242_hw_init(lp);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c<br/>index b6743f03dce0..b187ae1a6bd6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ieee802154/mac802154_hwsim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ieee802154/mac802154_hwsim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ieee802154/mac802154_hwsim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ieee802154/mac802154_hwsim.c</a></div><div class='hunk'>@@ -227,14 +227,16 @@ static int append_radio_msg(struct sk_buff *skb, struct hwsim_phy *phy)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nl_edges = nla_nest_start(skb, MAC802154_HWSIM_ATTR_RADIO_EDGES);</div><div class='add'>+	nl_edges = nla_nest_start_noflag(skb,</div><div class='add'>+					 MAC802154_HWSIM_ATTR_RADIO_EDGES);</div><div class='ctx'> 	if (!nl_edges) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_rcu(e, &amp;phy-&gt;edges, list) {</div><div class='del'>-		nl_edge = nla_nest_start(skb, MAC802154_HWSIM_ATTR_RADIO_EDGE);</div><div class='add'>+		nl_edge = nla_nest_start_noflag(skb,</div><div class='add'>+						MAC802154_HWSIM_ATTR_RADIO_EDGE);</div><div class='ctx'> 		if (!nl_edge) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			nla_nest_cancel(skb, nl_edges);</div><div class='hunk'>@@ -324,7 +326,7 @@ static int hwsim_get_radio_nl(struct sk_buff *msg, struct genl_info *info)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		genlmsg_reply(skb, info);</div><div class='add'>+		res = genlmsg_reply(skb, info);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -428,9 +430,7 @@ static int hwsim_new_edge_nl(struct sk_buff *msg, struct genl_info *info)</div><div class='ctx'> 	    !info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],</div><div class='del'>-			     hwsim_edge_policy, NULL))</div><div class='add'>+	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID])</div><div class='hunk'>@@ -492,9 +492,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info)</div><div class='ctx'> 	    !info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],</div><div class='del'>-			     hwsim_edge_policy, NULL))</div><div class='add'>+	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID])</div><div class='hunk'>@@ -542,9 +540,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)</div><div class='ctx'> 	    !info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,</div><div class='del'>-			     info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],</div><div class='del'>-			     hwsim_edge_policy, NULL))</div><div class='add'>+	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info-&gt;attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID] &amp;&amp;</div><div class='hunk'>@@ -598,37 +594,37 @@ static const struct nla_policy hwsim_genl_policy[MAC802154_HWSIM_ATTR_MAX + 1] =</div><div class='ctx'> static const struct genl_ops hwsim_nl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MAC802154_HWSIM_CMD_NEW_RADIO,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_new_radio_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MAC802154_HWSIM_CMD_DEL_RADIO,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_del_radio_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MAC802154_HWSIM_CMD_GET_RADIO,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_get_radio_nl,</div><div class='ctx'> 		.dumpit = hwsim_dump_radio_nl,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MAC802154_HWSIM_CMD_NEW_EDGE,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_new_edge_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MAC802154_HWSIM_CMD_DEL_EDGE,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_del_edge_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MAC802154_HWSIM_CMD_SET_EDGE,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_set_edge_lqi,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -638,6 +634,7 @@ static struct genl_family hwsim_genl_family __ro_after_init = {</div><div class='ctx'> 	.name = "MAC802154_HWSIM",</div><div class='ctx'> 	.version = 1,</div><div class='ctx'> 	.maxattr = MAC802154_HWSIM_ATTR_MAX,</div><div class='add'>+	.policy = hwsim_genl_policy,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> 	.ops = hwsim_nl_ops,</div><div class='ctx'> 	.n_ops = ARRAY_SIZE(hwsim_nl_ops),</div><div class='head'>diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c<br/>index c589f5ae75bb..8bb53ec8d9cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ieee802154/mcr20a.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ieee802154/mcr20a.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ieee802154/mcr20a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ieee802154/mcr20a.c</a></div><div class='hunk'>@@ -533,6 +533,8 @@ mcr20a_start(struct ieee802154_hw *hw)</div><div class='ctx'> 	dev_dbg(printdev(lp), "no slotted operation\n");</div><div class='ctx'> 	ret = regmap_update_bits(lp-&gt;regmap_dar, DAR_PHY_CTRL1,</div><div class='ctx'> 				 DAR_PHY_CTRL1_SLOTTED, 0x0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* enable irq */</div><div class='ctx'> 	enable_irq(lp-&gt;spi-&gt;irq);</div><div class='hunk'>@@ -540,11 +542,15 @@ mcr20a_start(struct ieee802154_hw *hw)</div><div class='ctx'> 	/* Unmask SEQ interrupt */</div><div class='ctx'> 	ret = regmap_update_bits(lp-&gt;regmap_dar, DAR_PHY_CTRL2,</div><div class='ctx'> 				 DAR_PHY_CTRL2_SEQMSK, 0x0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Start the RX sequence */</div><div class='ctx'> 	dev_dbg(printdev(lp), "start the RX sequence\n");</div><div class='ctx'> 	ret = regmap_update_bits(lp-&gt;regmap_dar, DAR_PHY_CTRL1,</div><div class='ctx'> 				 DAR_PHY_CTRL1_XCVSEQ_MASK, MCR20A_XCVSEQ_RX);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c<br/>index 2df7f60fe052..857e4bf99883 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/loopback.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/loopback.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/loopback.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/loopback.c</a></div><div class='hunk'>@@ -128,21 +128,9 @@ static u32 always_on(struct net_device *dev)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int loopback_get_ts_info(struct net_device *netdev,</div><div class='del'>-				struct ethtool_ts_info *ts_info)</div><div class='del'>-{</div><div class='del'>-	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;phc_index = -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct ethtool_ops loopback_ethtool_ops = {</div><div class='ctx'> 	.get_link		= always_on,</div><div class='del'>-	.get_ts_info		= loopback_get_ts_info,</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 loopback_dev_init(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c<br/>index 64a982563d59..009b2902c9d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/macsec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/macsec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/macsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/macsec.c</a></div><div class='hunk'>@@ -1611,9 +1611,7 @@ static int parse_sa_config(struct nlattr **attrs, struct nlattr **tb_sa)</div><div class='ctx'> 	if (!attrs[MACSEC_ATTR_SA_CONFIG])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(tb_sa, MACSEC_SA_ATTR_MAX,</div><div class='del'>-			     attrs[MACSEC_ATTR_SA_CONFIG],</div><div class='del'>-			     macsec_genl_sa_policy, NULL))</div><div class='add'>+	if (nla_parse_nested_deprecated(tb_sa, MACSEC_SA_ATTR_MAX, attrs[MACSEC_ATTR_SA_CONFIG], macsec_genl_sa_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1624,9 +1622,7 @@ static int parse_rxsc_config(struct nlattr **attrs, struct nlattr **tb_rxsc)</div><div class='ctx'> 	if (!attrs[MACSEC_ATTR_RXSC_CONFIG])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nla_parse_nested(tb_rxsc, MACSEC_RXSC_ATTR_MAX,</div><div class='del'>-			     attrs[MACSEC_ATTR_RXSC_CONFIG],</div><div class='del'>-			     macsec_genl_rxsc_policy, NULL))</div><div class='add'>+	if (nla_parse_nested_deprecated(tb_rxsc, MACSEC_RXSC_ATTR_MAX, attrs[MACSEC_ATTR_RXSC_CONFIG], macsec_genl_rxsc_policy, NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2175,8 +2171,9 @@ static int copy_tx_sa_stats(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_rx_sa_stats(struct sk_buff *skb,</div><div class='del'>-			    struct macsec_rx_sa_stats __percpu *pstats)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+copy_rx_sa_stats(struct sk_buff *skb,</div><div class='add'>+		 struct macsec_rx_sa_stats __percpu *pstats)</div><div class='ctx'> {</div><div class='ctx'> 	struct macsec_rx_sa_stats sum = {0, };</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -2201,8 +2198,8 @@ static int copy_rx_sa_stats(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_rx_sc_stats(struct sk_buff *skb,</div><div class='del'>-			    struct pcpu_rx_sc_stats __percpu *pstats)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+copy_rx_sc_stats(struct sk_buff *skb, struct pcpu_rx_sc_stats __percpu *pstats)</div><div class='ctx'> {</div><div class='ctx'> 	struct macsec_rx_sc_stats sum = {0, };</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -2265,8 +2262,8 @@ static int copy_rx_sc_stats(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_tx_sc_stats(struct sk_buff *skb,</div><div class='del'>-			    struct pcpu_tx_sc_stats __percpu *pstats)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+copy_tx_sc_stats(struct sk_buff *skb, struct pcpu_tx_sc_stats __percpu *pstats)</div><div class='ctx'> {</div><div class='ctx'> 	struct macsec_tx_sc_stats sum = {0, };</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -2305,8 +2302,8 @@ static int copy_tx_sc_stats(struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_secy_stats(struct sk_buff *skb,</div><div class='del'>-			   struct pcpu_secy_stats __percpu *pstats)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+copy_secy_stats(struct sk_buff *skb, struct pcpu_secy_stats __percpu *pstats)</div><div class='ctx'> {</div><div class='ctx'> 	struct macsec_dev_stats sum = {0, };</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -2364,7 +2361,8 @@ static int copy_secy_stats(struct sk_buff *skb,</div><div class='ctx'> static int nla_put_secy(struct macsec_secy *secy, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct macsec_tx_sc *tx_sc = &amp;secy-&gt;tx_sc;</div><div class='del'>-	struct nlattr *secy_nest = nla_nest_start(skb, MACSEC_ATTR_SECY);</div><div class='add'>+	struct nlattr *secy_nest = nla_nest_start_noflag(skb,</div><div class='add'>+							 MACSEC_ATTR_SECY);</div><div class='ctx'> 	u64 csid;</div><div class='ctx'> </div><div class='ctx'> 	if (!secy_nest)</div><div class='hunk'>@@ -2410,8 +2408,9 @@ cancel:</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='del'>-		     struct sk_buff *skb, struct netlink_callback *cb)</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='add'>+	  struct sk_buff *skb, struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct macsec_rx_sc *rx_sc;</div><div class='ctx'> 	struct macsec_tx_sc *tx_sc = &amp;secy-&gt;tx_sc;</div><div class='hunk'>@@ -2433,7 +2432,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 	if (nla_put_secy(secy, skb))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	attr = nla_nest_start(skb, MACSEC_ATTR_TXSC_STATS);</div><div class='add'>+	attr = nla_nest_start_noflag(skb, MACSEC_ATTR_TXSC_STATS);</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (copy_tx_sc_stats(skb, tx_sc-&gt;stats)) {</div><div class='hunk'>@@ -2442,7 +2441,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	nla_nest_end(skb, attr);</div><div class='ctx'> </div><div class='del'>-	attr = nla_nest_start(skb, MACSEC_ATTR_SECY_STATS);</div><div class='add'>+	attr = nla_nest_start_noflag(skb, MACSEC_ATTR_SECY_STATS);</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (copy_secy_stats(skb, macsec_priv(dev)-&gt;stats)) {</div><div class='hunk'>@@ -2451,7 +2450,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	nla_nest_end(skb, attr);</div><div class='ctx'> </div><div class='del'>-	txsa_list = nla_nest_start(skb, MACSEC_ATTR_TXSA_LIST);</div><div class='add'>+	txsa_list = nla_nest_start_noflag(skb, MACSEC_ATTR_TXSA_LIST);</div><div class='ctx'> 	if (!txsa_list)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	for (i = 0, j = 1; i &lt; MACSEC_NUM_AN; i++) {</div><div class='hunk'>@@ -2461,7 +2460,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 		if (!tx_sa)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		txsa_nest = nla_nest_start(skb, j++);</div><div class='add'>+		txsa_nest = nla_nest_start_noflag(skb, j++);</div><div class='ctx'> 		if (!txsa_nest) {</div><div class='ctx'> 			nla_nest_cancel(skb, txsa_list);</div><div class='ctx'> 			goto nla_put_failure;</div><div class='hunk'>@@ -2476,7 +2475,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		attr = nla_nest_start(skb, MACSEC_SA_ATTR_STATS);</div><div class='add'>+		attr = nla_nest_start_noflag(skb, MACSEC_SA_ATTR_STATS);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			nla_nest_cancel(skb, txsa_nest);</div><div class='ctx'> 			nla_nest_cancel(skb, txsa_list);</div><div class='hunk'>@@ -2494,7 +2493,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	nla_nest_end(skb, txsa_list);</div><div class='ctx'> </div><div class='del'>-	rxsc_list = nla_nest_start(skb, MACSEC_ATTR_RXSC_LIST);</div><div class='add'>+	rxsc_list = nla_nest_start_noflag(skb, MACSEC_ATTR_RXSC_LIST);</div><div class='ctx'> 	if (!rxsc_list)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -2502,7 +2501,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 	for_each_rxsc_rtnl(secy, rx_sc) {</div><div class='ctx'> 		int k;</div><div class='ctx'> 		struct nlattr *rxsa_list;</div><div class='del'>-		struct nlattr *rxsc_nest = nla_nest_start(skb, j++);</div><div class='add'>+		struct nlattr *rxsc_nest = nla_nest_start_noflag(skb, j++);</div><div class='ctx'> </div><div class='ctx'> 		if (!rxsc_nest) {</div><div class='ctx'> 			nla_nest_cancel(skb, rxsc_list);</div><div class='hunk'>@@ -2517,7 +2516,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		attr = nla_nest_start(skb, MACSEC_RXSC_ATTR_STATS);</div><div class='add'>+		attr = nla_nest_start_noflag(skb, MACSEC_RXSC_ATTR_STATS);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			nla_nest_cancel(skb, rxsc_nest);</div><div class='ctx'> 			nla_nest_cancel(skb, rxsc_list);</div><div class='hunk'>@@ -2531,7 +2530,8 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		nla_nest_end(skb, attr);</div><div class='ctx'> </div><div class='del'>-		rxsa_list = nla_nest_start(skb, MACSEC_RXSC_ATTR_SA_LIST);</div><div class='add'>+		rxsa_list = nla_nest_start_noflag(skb,</div><div class='add'>+						  MACSEC_RXSC_ATTR_SA_LIST);</div><div class='ctx'> 		if (!rxsa_list) {</div><div class='ctx'> 			nla_nest_cancel(skb, rxsc_nest);</div><div class='ctx'> 			nla_nest_cancel(skb, rxsc_list);</div><div class='hunk'>@@ -2545,7 +2545,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 			if (!rx_sa)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			rxsa_nest = nla_nest_start(skb, k++);</div><div class='add'>+			rxsa_nest = nla_nest_start_noflag(skb, k++);</div><div class='ctx'> 			if (!rxsa_nest) {</div><div class='ctx'> 				nla_nest_cancel(skb, rxsa_list);</div><div class='ctx'> 				nla_nest_cancel(skb, rxsc_nest);</div><div class='hunk'>@@ -2553,7 +2553,8 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,</div><div class='ctx'> 				goto nla_put_failure;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			attr = nla_nest_start(skb, MACSEC_SA_ATTR_STATS);</div><div class='add'>+			attr = nla_nest_start_noflag(skb,</div><div class='add'>+						     MACSEC_SA_ATTR_STATS);</div><div class='ctx'> 			if (!attr) {</div><div class='ctx'> 				nla_nest_cancel(skb, rxsa_list);</div><div class='ctx'> 				nla_nest_cancel(skb, rxsc_nest);</div><div class='hunk'>@@ -2636,61 +2637,61 @@ done:</div><div class='ctx'> static const struct genl_ops macsec_genl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_GET_TXSC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.dumpit = macsec_dump_txsc,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_ADD_RXSC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_add_rxsc,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_DEL_RXSC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_del_rxsc,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_UPD_RXSC,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_upd_rxsc,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_ADD_TXSA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_add_txsa,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_DEL_TXSA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_del_txsa,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_UPD_TXSA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_upd_txsa,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_ADD_RXSA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_add_rxsa,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_DEL_RXSA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_del_rxsa,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = MACSEC_CMD_UPD_RXSA,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = macsec_upd_rxsa,</div><div class='del'>-		.policy = macsec_genl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -2700,6 +2701,7 @@ static struct genl_family macsec_fam __ro_after_init = {</div><div class='ctx'> 	.hdrsize	= 0,</div><div class='ctx'> 	.version	= MACSEC_GENL_VERSION,</div><div class='ctx'> 	.maxattr	= MACSEC_ATTR_MAX,</div><div class='add'>+	.policy = macsec_genl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> 	.ops		= macsec_genl_ops,</div><div class='head'>diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c<br/>index 0c0f105657d3..b395423b19bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/macvlan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/macvlan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/macvlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/macvlan.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/notifier.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;linux/net_tstamp.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='hunk'>@@ -34,6 +35,7 @@</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;linux/netpoll.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MACVLAN_HASH_BITS	8</div><div class='ctx'> #define MACVLAN_HASH_SIZE	(1&lt;&lt;MACVLAN_HASH_BITS)</div><div class='hunk'>@@ -822,6 +824,30 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev = macvlan_dev_real_dev(dev);</div><div class='add'>+	const struct net_device_ops *ops = real_dev-&gt;netdev_ops;</div><div class='add'>+	struct ifreq ifrr;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	strncpy(ifrr.ifr_name, real_dev-&gt;name, IFNAMSIZ);</div><div class='add'>+	ifrr.ifr_ifru = ifr-&gt;ifr_ifru;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCSHWTSTAMP:</div><div class='add'>+	case SIOCGHWTSTAMP:</div><div class='add'>+		if (netif_device_present(real_dev) &amp;&amp; ops-&gt;ndo_do_ioctl)</div><div class='add'>+			err = ops-&gt;ndo_do_ioctl(real_dev, &amp;ifrr, cmd);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		ifr-&gt;ifr_ifru = ifrr.ifr_ifru;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * macvlan network devices have devices nesting below it and are a special</div><div class='ctx'>  * "super class" of normal network devices; split their locks off into a</div><div class='hunk'>@@ -1020,6 +1046,26 @@ static int macvlan_ethtool_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	return __ethtool_get_link_ksettings(vlan-&gt;lowerdev, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int macvlan_ethtool_get_ts_info(struct net_device *dev,</div><div class='add'>+				       struct ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev = macvlan_dev_real_dev(dev);</div><div class='add'>+	const struct ethtool_ops *ops = real_dev-&gt;ethtool_ops;</div><div class='add'>+	struct phy_device *phydev = real_dev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	if (phydev &amp;&amp; phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;ts_info) {</div><div class='add'>+		 return phydev-&gt;drv-&gt;ts_info(phydev, info);</div><div class='add'>+	} else if (ops-&gt;get_ts_info) {</div><div class='add'>+		return ops-&gt;get_ts_info(real_dev, info);</div><div class='add'>+	} else {</div><div class='add'>+		info-&gt;so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='add'>+			SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+		info-&gt;phc_index = -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='ctx'> static netdev_features_t macvlan_fix_features(struct net_device *dev,</div><div class='ctx'> 					      netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -1094,6 +1140,7 @@ static const struct ethtool_ops macvlan_ethtool_ops = {</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='ctx'> 	.get_link_ksettings	= macvlan_ethtool_get_link_ksettings,</div><div class='ctx'> 	.get_drvinfo		= macvlan_ethtool_get_drvinfo,</div><div class='add'>+	.get_ts_info		= macvlan_ethtool_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops macvlan_netdev_ops = {</div><div class='hunk'>@@ -1103,6 +1150,7 @@ static const struct net_device_ops macvlan_netdev_ops = {</div><div class='ctx'> 	.ndo_stop		= macvlan_stop,</div><div class='ctx'> 	.ndo_start_xmit		= macvlan_start_xmit,</div><div class='ctx'> 	.ndo_change_mtu		= macvlan_change_mtu,</div><div class='add'>+	.ndo_do_ioctl		= macvlan_do_ioctl,</div><div class='ctx'> 	.ndo_fix_features	= macvlan_fix_features,</div><div class='ctx'> 	.ndo_change_rx_flags	= macvlan_change_rx_flags,</div><div class='ctx'> 	.ndo_set_mac_address	= macvlan_set_mac_address,</div><div class='hunk'>@@ -1576,7 +1624,7 @@ static int macvlan_fill_info(struct sk_buff *skb,</div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_MACVLAN_MACADDR_COUNT, vlan-&gt;macaddr_count))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	if (vlan-&gt;macaddr_count &gt; 0) {</div><div class='del'>-		nest = nla_nest_start(skb, IFLA_MACVLAN_MACADDR_DATA);</div><div class='add'>+		nest = nla_nest_start_noflag(skb, IFLA_MACVLAN_MACADDR_DATA);</div><div class='ctx'> 		if (nest == NULL)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c<br/>index ed1166adaa2f..b16a1221d19b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/net_failover.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/net_failover.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/net_failover.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/net_failover.c</a></div><div class='hunk'>@@ -115,8 +115,7 @@ static netdev_tx_t net_failover_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static u16 net_failover_select_queue(struct net_device *dev,</div><div class='ctx'> 				     struct sk_buff *skb,</div><div class='del'>-				     struct net_device *sb_dev,</div><div class='del'>-				     select_queue_fallback_t fallback)</div><div class='add'>+				     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_failover_info *nfo_info = netdev_priv(dev);</div><div class='ctx'> 	struct net_device *primary_dev;</div><div class='hunk'>@@ -127,10 +126,9 @@ static u16 net_failover_select_queue(struct net_device *dev,</div><div class='ctx'> 		const struct net_device_ops *ops = primary_dev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='ctx'> 		if (ops-&gt;ndo_select_queue)</div><div class='del'>-			txq = ops-&gt;ndo_select_queue(primary_dev, skb,</div><div class='del'>-						    sb_dev, fallback);</div><div class='add'>+			txq = ops-&gt;ndo_select_queue(primary_dev, skb, sb_dev);</div><div class='ctx'> 		else</div><div class='del'>-			txq = fallback(primary_dev, skb, NULL);</div><div class='add'>+			txq = netdev_pick_tx(primary_dev, skb, NULL);</div><div class='ctx'> </div><div class='ctx'> 		qdisc_skb_cb(skb)-&gt;slave_dev_queue_mapping = skb-&gt;queue_mapping;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/netdevsim/Makefile b/drivers/net/netdevsim/Makefile<br/>index 0fee1d06c084..09f1315d2f2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/Makefile</a></div><div class='hunk'>@@ -3,17 +3,13 @@</div><div class='ctx'> obj-$(CONFIG_NETDEVSIM) += netdevsim.o</div><div class='ctx'> </div><div class='ctx'> netdevsim-objs := \</div><div class='del'>-	netdev.o \</div><div class='add'>+	netdev.o dev.o fib.o bus.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_BPF_SYSCALL),y)</div><div class='ctx'> netdevsim-objs += \</div><div class='ctx'> 	bpf.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-ifneq ($(CONFIG_NET_DEVLINK),)</div><div class='del'>-netdevsim-objs += devlink.o fib.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> ifneq ($(CONFIG_XFRM_OFFLOAD),)</div><div class='ctx'> netdevsim-objs += ipsec.o</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c<br/>index f92c43453ec6..2b74425822ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/bpf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/bpf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/bpf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/bpf.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> 	bpf_verifier_log_write(env, "[netdevsim] " fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> struct nsim_bpf_bound_prog {</div><div class='del'>-	struct netdevsim *ns;</div><div class='add'>+	struct nsim_dev *nsim_dev;</div><div class='ctx'> 	struct bpf_prog *prog;</div><div class='ctx'> 	struct dentry *ddir;</div><div class='ctx'> 	const char *state;</div><div class='hunk'>@@ -65,8 +65,8 @@ nsim_bpf_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn)</div><div class='ctx'> 	struct nsim_bpf_bound_prog *state;</div><div class='ctx'> </div><div class='ctx'> 	state = env-&gt;prog-&gt;aux-&gt;offload-&gt;dev_priv;</div><div class='del'>-	if (state-&gt;ns-&gt;bpf_bind_verifier_delay &amp;&amp; !insn_idx)</div><div class='del'>-		msleep(state-&gt;ns-&gt;bpf_bind_verifier_delay);</div><div class='add'>+	if (state-&gt;nsim_dev-&gt;bpf_bind_verifier_delay &amp;&amp; !insn_idx)</div><div class='add'>+		msleep(state-&gt;nsim_dev-&gt;bpf_bind_verifier_delay);</div><div class='ctx'> </div><div class='ctx'> 	if (insn_idx == env-&gt;prog-&gt;len - 1)</div><div class='ctx'> 		pr_vlog(env, "Hello from netdevsim!\n");</div><div class='hunk'>@@ -213,7 +213,8 @@ nsim_xdp_set_prog(struct netdevsim *ns, struct netdev_bpf *bpf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog)</div><div class='add'>+static int nsim_bpf_create_prog(struct nsim_dev *nsim_dev,</div><div class='add'>+				struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct nsim_bpf_bound_prog *state;</div><div class='ctx'> 	char name[16];</div><div class='hunk'>@@ -222,13 +223,13 @@ static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog)</div><div class='ctx'> 	if (!state)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	state-&gt;ns = ns;</div><div class='add'>+	state-&gt;nsim_dev = nsim_dev;</div><div class='ctx'> 	state-&gt;prog = prog;</div><div class='ctx'> 	state-&gt;state = "verify";</div><div class='ctx'> </div><div class='ctx'> 	/* Program id is not populated yet when we create the state. */</div><div class='del'>-	sprintf(name, "%u", ns-&gt;sdev-&gt;prog_id_gen++);</div><div class='del'>-	state-&gt;ddir = debugfs_create_dir(name, ns-&gt;sdev-&gt;ddir_bpf_bound_progs);</div><div class='add'>+	sprintf(name, "%u", nsim_dev-&gt;prog_id_gen++);</div><div class='add'>+	state-&gt;ddir = debugfs_create_dir(name, nsim_dev-&gt;ddir_bpf_bound_progs);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(state-&gt;ddir)) {</div><div class='ctx'> 		kfree(state);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -239,7 +240,7 @@ static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog)</div><div class='ctx'> 			    &amp;state-&gt;state, &amp;nsim_bpf_string_fops);</div><div class='ctx'> 	debugfs_create_bool("loaded", 0400, state-&gt;ddir, &amp;state-&gt;is_loaded);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;state-&gt;l, &amp;ns-&gt;sdev-&gt;bpf_bound_progs);</div><div class='add'>+	list_add_tail(&amp;state-&gt;l, &amp;nsim_dev-&gt;bpf_bound_progs);</div><div class='ctx'> </div><div class='ctx'> 	prog-&gt;aux-&gt;offload-&gt;dev_priv = state;</div><div class='ctx'> </div><div class='hunk'>@@ -248,12 +249,13 @@ static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog)</div><div class='ctx'> </div><div class='ctx'> static int nsim_bpf_verifier_prep(struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='del'>-	struct netdevsim *ns = bpf_offload_dev_priv(prog-&gt;aux-&gt;offload-&gt;offdev);</div><div class='add'>+	struct nsim_dev *nsim_dev =</div><div class='add'>+			bpf_offload_dev_priv(prog-&gt;aux-&gt;offload-&gt;offdev);</div><div class='ctx'> </div><div class='del'>-	if (!ns-&gt;bpf_bind_accept)</div><div class='add'>+	if (!nsim_dev-&gt;bpf_bind_accept)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return nsim_bpf_create_prog(ns, prog);</div><div class='add'>+	return nsim_bpf_create_prog(nsim_dev, prog);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nsim_bpf_translate(struct bpf_prog *prog)</div><div class='hunk'>@@ -512,7 +514,7 @@ nsim_bpf_map_alloc(struct netdevsim *ns, struct bpf_offloaded_map *offmap)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	offmap-&gt;dev_ops = &amp;nsim_bpf_map_ops;</div><div class='del'>-	list_add_tail(&amp;nmap-&gt;l, &amp;ns-&gt;sdev-&gt;bpf_bound_maps);</div><div class='add'>+	list_add_tail(&amp;nmap-&gt;l, &amp;ns-&gt;nsim_dev-&gt;bpf_bound_maps);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -576,61 +578,68 @@ int nsim_bpf(struct net_device *dev, struct netdev_bpf *bpf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nsim_bpf_init(struct netdevsim *ns)</div><div class='add'>+int nsim_bpf_dev_init(struct nsim_dev *nsim_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (ns-&gt;sdev-&gt;refcnt == 1) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;ns-&gt;sdev-&gt;bpf_bound_progs);</div><div class='del'>-		INIT_LIST_HEAD(&amp;ns-&gt;sdev-&gt;bpf_bound_maps);</div><div class='add'>+	INIT_LIST_HEAD(&amp;nsim_dev-&gt;bpf_bound_progs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;nsim_dev-&gt;bpf_bound_maps);</div><div class='ctx'> </div><div class='del'>-		ns-&gt;sdev-&gt;ddir_bpf_bound_progs =</div><div class='del'>-			debugfs_create_dir("bpf_bound_progs", ns-&gt;sdev-&gt;ddir);</div><div class='del'>-		if (IS_ERR_OR_NULL(ns-&gt;sdev-&gt;ddir_bpf_bound_progs))</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	nsim_dev-&gt;ddir_bpf_bound_progs = debugfs_create_dir("bpf_bound_progs",</div><div class='add'>+							    nsim_dev-&gt;ddir);</div><div class='add'>+	if (IS_ERR_OR_NULL(nsim_dev-&gt;ddir_bpf_bound_progs))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		ns-&gt;sdev-&gt;bpf_dev = bpf_offload_dev_create(&amp;nsim_bpf_dev_ops,</div><div class='del'>-							   ns);</div><div class='del'>-		err = PTR_ERR_OR_ZERO(ns-&gt;sdev-&gt;bpf_dev);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	nsim_dev-&gt;bpf_dev = bpf_offload_dev_create(&amp;nsim_bpf_dev_ops, nsim_dev);</div><div class='add'>+	err = PTR_ERR_OR_ZERO(nsim_dev-&gt;bpf_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nsim_dev-&gt;bpf_bind_accept = true;</div><div class='add'>+	debugfs_create_bool("bpf_bind_accept", 0600, nsim_dev-&gt;ddir,</div><div class='add'>+			    &amp;nsim_dev-&gt;bpf_bind_accept);</div><div class='add'>+	debugfs_create_u32("bpf_bind_verifier_delay", 0600, nsim_dev-&gt;ddir,</div><div class='add'>+			   &amp;nsim_dev-&gt;bpf_bind_verifier_delay);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsim_bpf_dev_exit(struct nsim_dev *nsim_dev)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;nsim_dev-&gt;bpf_bound_progs));</div><div class='add'>+	WARN_ON(!list_empty(&amp;nsim_dev-&gt;bpf_bound_maps));</div><div class='add'>+	bpf_offload_dev_destroy(nsim_dev-&gt;bpf_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nsim_bpf_init(struct netdevsim *ns)</div><div class='add'>+{</div><div class='add'>+	struct dentry *ddir = ns-&gt;nsim_dev_port-&gt;ddir;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = bpf_offload_dev_netdev_register(ns-&gt;sdev-&gt;bpf_dev, ns-&gt;netdev);</div><div class='add'>+	err = bpf_offload_dev_netdev_register(ns-&gt;nsim_dev-&gt;bpf_dev,</div><div class='add'>+					      ns-&gt;netdev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_destroy_bdev;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	debugfs_create_u32("bpf_offloaded_id", 0400, ns-&gt;ddir,</div><div class='add'>+	debugfs_create_u32("bpf_offloaded_id", 0400, ddir,</div><div class='ctx'> 			   &amp;ns-&gt;bpf_offloaded_id);</div><div class='ctx'> </div><div class='del'>-	ns-&gt;bpf_bind_accept = true;</div><div class='del'>-	debugfs_create_bool("bpf_bind_accept", 0600, ns-&gt;ddir,</div><div class='del'>-			    &amp;ns-&gt;bpf_bind_accept);</div><div class='del'>-	debugfs_create_u32("bpf_bind_verifier_delay", 0600, ns-&gt;ddir,</div><div class='del'>-			   &amp;ns-&gt;bpf_bind_verifier_delay);</div><div class='del'>-</div><div class='ctx'> 	ns-&gt;bpf_tc_accept = true;</div><div class='del'>-	debugfs_create_bool("bpf_tc_accept", 0600, ns-&gt;ddir,</div><div class='add'>+	debugfs_create_bool("bpf_tc_accept", 0600, ddir,</div><div class='ctx'> 			    &amp;ns-&gt;bpf_tc_accept);</div><div class='del'>-	debugfs_create_bool("bpf_tc_non_bound_accept", 0600, ns-&gt;ddir,</div><div class='add'>+	debugfs_create_bool("bpf_tc_non_bound_accept", 0600, ddir,</div><div class='ctx'> 			    &amp;ns-&gt;bpf_tc_non_bound_accept);</div><div class='ctx'> 	ns-&gt;bpf_xdpdrv_accept = true;</div><div class='del'>-	debugfs_create_bool("bpf_xdpdrv_accept", 0600, ns-&gt;ddir,</div><div class='add'>+	debugfs_create_bool("bpf_xdpdrv_accept", 0600, ddir,</div><div class='ctx'> 			    &amp;ns-&gt;bpf_xdpdrv_accept);</div><div class='ctx'> 	ns-&gt;bpf_xdpoffload_accept = true;</div><div class='del'>-	debugfs_create_bool("bpf_xdpoffload_accept", 0600, ns-&gt;ddir,</div><div class='add'>+	debugfs_create_bool("bpf_xdpoffload_accept", 0600, ddir,</div><div class='ctx'> 			    &amp;ns-&gt;bpf_xdpoffload_accept);</div><div class='ctx'> </div><div class='ctx'> 	ns-&gt;bpf_map_accept = true;</div><div class='del'>-	debugfs_create_bool("bpf_map_accept", 0600, ns-&gt;ddir,</div><div class='add'>+	debugfs_create_bool("bpf_map_accept", 0600, ddir,</div><div class='ctx'> 			    &amp;ns-&gt;bpf_map_accept);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_destroy_bdev:</div><div class='del'>-	if (ns-&gt;sdev-&gt;refcnt == 1)</div><div class='del'>-		bpf_offload_dev_destroy(ns-&gt;sdev-&gt;bpf_dev);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nsim_bpf_uninit(struct netdevsim *ns)</div><div class='hunk'>@@ -638,11 +647,5 @@ void nsim_bpf_uninit(struct netdevsim *ns)</div><div class='ctx'> 	WARN_ON(ns-&gt;xdp.prog);</div><div class='ctx'> 	WARN_ON(ns-&gt;xdp_hw.prog);</div><div class='ctx'> 	WARN_ON(ns-&gt;bpf_offloaded);</div><div class='del'>-	bpf_offload_dev_netdev_unregister(ns-&gt;sdev-&gt;bpf_dev, ns-&gt;netdev);</div><div class='del'>-</div><div class='del'>-	if (ns-&gt;sdev-&gt;refcnt == 1) {</div><div class='del'>-		WARN_ON(!list_empty(&amp;ns-&gt;sdev-&gt;bpf_bound_progs));</div><div class='del'>-		WARN_ON(!list_empty(&amp;ns-&gt;sdev-&gt;bpf_bound_maps));</div><div class='del'>-		bpf_offload_dev_destroy(ns-&gt;sdev-&gt;bpf_dev);</div><div class='del'>-	}</div><div class='add'>+	bpf_offload_dev_netdev_unregister(ns-&gt;nsim_dev-&gt;bpf_dev, ns-&gt;netdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c<br/>new file mode 100644<br/>index 000000000000..1a0ff3d7747b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/bus.c</a></div><div class='hunk'>@@ -0,0 +1,341 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2017 Netronome Systems, Inc.</div><div class='add'>+ * Copyright (C) 2019 Mellanox Technologies. All rights reserved</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/idr.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/mutex.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.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='add'>+</div><div class='add'>+#include "netdevsim.h"</div><div class='add'>+</div><div class='add'>+static DEFINE_IDA(nsim_bus_dev_ids);</div><div class='add'>+static LIST_HEAD(nsim_bus_dev_list);</div><div class='add'>+static DEFINE_MUTEX(nsim_bus_dev_list_lock);</div><div class='add'>+</div><div class='add'>+static struct nsim_bus_dev *to_nsim_bus_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return container_of(dev, struct nsim_bus_dev, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsim_bus_dev_vfs_enable(struct nsim_bus_dev *nsim_bus_dev,</div><div class='add'>+				   unsigned int num_vfs)</div><div class='add'>+{</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs = kcalloc(num_vfs,</div><div class='add'>+					  sizeof(struct nsim_vf_config),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!nsim_bus_dev-&gt;vfconfigs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	nsim_bus_dev-&gt;num_vfs = num_vfs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsim_bus_dev_vfs_disable(struct nsim_bus_dev *nsim_bus_dev)</div><div class='add'>+{</div><div class='add'>+	kfree(nsim_bus_dev-&gt;vfconfigs);</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs = NULL;</div><div class='add'>+	nsim_bus_dev-&gt;num_vfs = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nsim_bus_dev_numvfs_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+	unsigned int num_vfs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;num_vfs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	if (nsim_bus_dev-&gt;num_vfs == num_vfs)</div><div class='add'>+		goto exit_good;</div><div class='add'>+	if (nsim_bus_dev-&gt;num_vfs &amp;&amp; num_vfs) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_vfs) {</div><div class='add'>+		ret = nsim_bus_dev_vfs_enable(nsim_bus_dev, num_vfs);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto exit_unlock;</div><div class='add'>+	} else {</div><div class='add'>+		nsim_bus_dev_vfs_disable(nsim_bus_dev);</div><div class='add'>+	}</div><div class='add'>+exit_good:</div><div class='add'>+	ret = count;</div><div class='add'>+exit_unlock:</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 ssize_t</div><div class='add'>+nsim_bus_dev_numvfs_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", nsim_bus_dev-&gt;num_vfs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute nsim_bus_dev_numvfs_attr =</div><div class='add'>+	__ATTR(sriov_numvfs, 0664, nsim_bus_dev_numvfs_show,</div><div class='add'>+	       nsim_bus_dev_numvfs_store);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+new_port_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+	       const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+	unsigned int port_index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;port_index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = nsim_dev_port_add(nsim_bus_dev, port_index);</div><div class='add'>+	return ret ? ret : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute nsim_bus_dev_new_port_attr = __ATTR_WO(new_port);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+del_port_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+	       const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+	unsigned int port_index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;port_index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = nsim_dev_port_del(nsim_bus_dev, port_index);</div><div class='add'>+	return ret ? ret : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute nsim_bus_dev_del_port_attr = __ATTR_WO(del_port);</div><div class='add'>+</div><div class='add'>+static struct attribute *nsim_bus_dev_attrs[] = {</div><div class='add'>+	&amp;nsim_bus_dev_numvfs_attr.attr,</div><div class='add'>+	&amp;nsim_bus_dev_new_port_attr.attr,</div><div class='add'>+	&amp;nsim_bus_dev_del_port_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group nsim_bus_dev_attr_group = {</div><div class='add'>+	.attrs = nsim_bus_dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *nsim_bus_dev_attr_groups[] = {</div><div class='add'>+	&amp;nsim_bus_dev_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nsim_bus_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+</div><div class='add'>+	nsim_bus_dev_vfs_disable(nsim_bus_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_type nsim_bus_dev_type = {</div><div class='add'>+	.groups = nsim_bus_dev_attr_groups,</div><div class='add'>+	.release = nsim_bus_dev_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nsim_bus_dev *</div><div class='add'>+nsim_bus_dev_new(unsigned int id, unsigned int port_count);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+new_device_store(struct bus_type *bus, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev;</div><div class='add'>+	unsigned int port_count;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = sscanf(buf, "%u %u", &amp;id, &amp;port_count);</div><div class='add'>+	switch (err) {</div><div class='add'>+	case 1:</div><div class='add'>+		port_count = 1;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 2:</div><div class='add'>+		if (id &gt; INT_MAX) {</div><div class='add'>+			pr_err("Value of \"id\" is too big.\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'>+		pr_err("Format for adding new device is \"id port_count\" (uint uint).\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	nsim_bus_dev = nsim_bus_dev_new(id, port_count);</div><div class='add'>+	if (IS_ERR(nsim_bus_dev))</div><div class='add'>+		return PTR_ERR(nsim_bus_dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsim_bus_dev_list_lock);</div><div class='add'>+	list_add_tail(&amp;nsim_bus_dev-&gt;list, &amp;nsim_bus_dev_list);</div><div class='add'>+	mutex_unlock(&amp;nsim_bus_dev_list_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static BUS_ATTR_WO(new_device);</div><div class='add'>+</div><div class='add'>+static void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+del_device_store(struct bus_type *bus, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev, *tmp;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = sscanf(buf, "%u", &amp;id);</div><div class='add'>+	switch (err) {</div><div class='add'>+	case 1:</div><div class='add'>+		if (id &gt; INT_MAX) {</div><div class='add'>+			pr_err("Value of \"id\" is too big.\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'>+		pr_err("Format for deleting device is \"id\" (uint).\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	mutex_lock(&amp;nsim_bus_dev_list_lock);</div><div class='add'>+	list_for_each_entry_safe(nsim_bus_dev, tmp, &amp;nsim_bus_dev_list, list) {</div><div class='add'>+		if (nsim_bus_dev-&gt;dev.id != id)</div><div class='add'>+			continue;</div><div class='add'>+		list_del(&amp;nsim_bus_dev-&gt;list);</div><div class='add'>+		nsim_bus_dev_del(nsim_bus_dev);</div><div class='add'>+		err = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;nsim_bus_dev_list_lock);</div><div class='add'>+	return !err ? count : err;</div><div class='add'>+}</div><div class='add'>+static BUS_ATTR_WO(del_device);</div><div class='add'>+</div><div class='add'>+static struct attribute *nsim_bus_attrs[] = {</div><div class='add'>+	&amp;bus_attr_new_device.attr,</div><div class='add'>+	&amp;bus_attr_del_device.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(nsim_bus);</div><div class='add'>+</div><div class='add'>+static int nsim_bus_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+</div><div class='add'>+	return nsim_dev_probe(nsim_bus_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsim_bus_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+</div><div class='add'>+	nsim_dev_remove(nsim_bus_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsim_num_vf(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);</div><div class='add'>+</div><div class='add'>+	return nsim_bus_dev-&gt;num_vfs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bus_type nsim_bus = {</div><div class='add'>+	.name		= DRV_NAME,</div><div class='add'>+	.dev_name	= DRV_NAME,</div><div class='add'>+	.bus_groups	= nsim_bus_groups,</div><div class='add'>+	.probe		= nsim_bus_probe,</div><div class='add'>+	.remove		= nsim_bus_remove,</div><div class='add'>+	.num_vf		= nsim_num_vf,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nsim_bus_dev *</div><div class='add'>+nsim_bus_dev_new(unsigned int id, unsigned int port_count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nsim_bus_dev = kzalloc(sizeof(*nsim_bus_dev), GFP_KERNEL);</div><div class='add'>+	if (!nsim_bus_dev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	err = ida_alloc_range(&amp;nsim_bus_dev_ids, id, id, GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_nsim_bus_dev_free;</div><div class='add'>+	nsim_bus_dev-&gt;dev.id = err;</div><div class='add'>+	nsim_bus_dev-&gt;dev.bus = &amp;nsim_bus;</div><div class='add'>+	nsim_bus_dev-&gt;dev.type = &amp;nsim_bus_dev_type;</div><div class='add'>+	nsim_bus_dev-&gt;port_count = port_count;</div><div class='add'>+</div><div class='add'>+	err = device_register(&amp;nsim_bus_dev-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_nsim_bus_dev_id_free;</div><div class='add'>+	return nsim_bus_dev;</div><div class='add'>+</div><div class='add'>+err_nsim_bus_dev_id_free:</div><div class='add'>+	ida_free(&amp;nsim_bus_dev_ids, nsim_bus_dev-&gt;dev.id);</div><div class='add'>+err_nsim_bus_dev_free:</div><div class='add'>+	kfree(nsim_bus_dev);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev)</div><div class='add'>+{</div><div class='add'>+	device_unregister(&amp;nsim_bus_dev-&gt;dev);</div><div class='add'>+	ida_free(&amp;nsim_bus_dev_ids, nsim_bus_dev-&gt;dev.id);</div><div class='add'>+	kfree(nsim_bus_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_driver nsim_driver = {</div><div class='add'>+	.name		= DRV_NAME,</div><div class='add'>+	.bus		= &amp;nsim_bus,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int nsim_bus_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bus_register(&amp;nsim_bus);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = driver_register(&amp;nsim_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_bus_unregister;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_bus_unregister:</div><div class='add'>+	bus_unregister(&amp;nsim_bus);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsim_bus_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev, *tmp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsim_bus_dev_list_lock);</div><div class='add'>+	list_for_each_entry_safe(nsim_bus_dev, tmp, &amp;nsim_bus_dev_list, list) {</div><div class='add'>+		list_del(&amp;nsim_bus_dev-&gt;list);</div><div class='add'>+		nsim_bus_dev_del(nsim_bus_dev);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;nsim_bus_dev_list_lock);</div><div class='add'>+	driver_unregister(&amp;nsim_driver);</div><div class='add'>+	bus_unregister(&amp;nsim_bus);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c<br/>new file mode 100644<br/>index 000000000000..b509b941d5ca<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/dev.c</a></div><div class='hunk'>@@ -0,0 +1,447 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Cumulus Networks. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018 David Ahern &lt;dsa@cumulusnetworks.com&gt;</div><div class='add'>+ * Copyright (c) 2019 Mellanox Technologies. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the GNU General License Version 2,</div><div class='add'>+ * June 1991 as shown in the file COPYING in the top-level directory of this</div><div class='add'>+ * source tree.</div><div class='add'>+ *</div><div class='add'>+ * THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"</div><div class='add'>+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,</div><div class='add'>+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS</div><div class='add'>+ * FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE</div><div class='add'>+ * OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME</div><div class='add'>+ * THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netdevsim.h"</div><div class='add'>+</div><div class='add'>+static struct dentry *nsim_dev_ddir;</div><div class='add'>+</div><div class='add'>+static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)</div><div class='add'>+{</div><div class='add'>+	char dev_ddir_name[16];</div><div class='add'>+</div><div class='add'>+	sprintf(dev_ddir_name, DRV_NAME "%u", nsim_dev-&gt;nsim_bus_dev-&gt;dev.id);</div><div class='add'>+	nsim_dev-&gt;ddir = debugfs_create_dir(dev_ddir_name, nsim_dev_ddir);</div><div class='add'>+	if (IS_ERR_OR_NULL(nsim_dev-&gt;ddir))</div><div class='add'>+		return PTR_ERR_OR_ZERO(nsim_dev-&gt;ddir) ?: -EINVAL;</div><div class='add'>+	nsim_dev-&gt;ports_ddir = debugfs_create_dir("ports", nsim_dev-&gt;ddir);</div><div class='add'>+	if (IS_ERR_OR_NULL(nsim_dev-&gt;ports_ddir))</div><div class='add'>+		return PTR_ERR_OR_ZERO(nsim_dev-&gt;ports_ddir) ?: -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsim_dev_debugfs_exit(struct nsim_dev *nsim_dev)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(nsim_dev-&gt;ports_ddir);</div><div class='add'>+	debugfs_remove_recursive(nsim_dev-&gt;ddir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsim_dev_port_debugfs_init(struct nsim_dev *nsim_dev,</div><div class='add'>+				      struct nsim_dev_port *nsim_dev_port)</div><div class='add'>+{</div><div class='add'>+	char port_ddir_name[16];</div><div class='add'>+	char dev_link_name[32];</div><div class='add'>+</div><div class='add'>+	sprintf(port_ddir_name, "%u", nsim_dev_port-&gt;port_index);</div><div class='add'>+	nsim_dev_port-&gt;ddir = debugfs_create_dir(port_ddir_name,</div><div class='add'>+						 nsim_dev-&gt;ports_ddir);</div><div class='add'>+	if (IS_ERR_OR_NULL(nsim_dev_port-&gt;ddir))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sprintf(dev_link_name, "../../../" DRV_NAME "%u",</div><div class='add'>+		nsim_dev-&gt;nsim_bus_dev-&gt;dev.id);</div><div class='add'>+	debugfs_create_symlink("dev", nsim_dev_port-&gt;ddir, dev_link_name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsim_dev_port_debugfs_exit(struct nsim_dev_port *nsim_dev_port)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(nsim_dev_port-&gt;ddir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 nsim_dev_ipv4_fib_resource_occ_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = priv;</div><div class='add'>+</div><div class='add'>+	return nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+				NSIM_RESOURCE_IPV4_FIB, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 nsim_dev_ipv4_fib_rules_res_occ_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = priv;</div><div class='add'>+</div><div class='add'>+	return nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+				NSIM_RESOURCE_IPV4_FIB_RULES, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 nsim_dev_ipv6_fib_resource_occ_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = priv;</div><div class='add'>+</div><div class='add'>+	return nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+				NSIM_RESOURCE_IPV6_FIB, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 nsim_dev_ipv6_fib_rules_res_occ_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = priv;</div><div class='add'>+</div><div class='add'>+	return nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+				NSIM_RESOURCE_IPV6_FIB_RULES, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsim_dev_resources_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = devlink_priv(devlink);</div><div class='add'>+	struct devlink_resource_size_params params = {</div><div class='add'>+		.size_max = (u64)-1,</div><div class='add'>+		.size_granularity = 1,</div><div class='add'>+		.unit = DEVLINK_RESOURCE_UNIT_ENTRY</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+	u64 n;</div><div class='add'>+</div><div class='add'>+	/* Resources for IPv4 */</div><div class='add'>+	err = devlink_resource_register(devlink, "IPv4", (u64)-1,</div><div class='add'>+					NSIM_RESOURCE_IPV4,</div><div class='add'>+					DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					&amp;params);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failed to register IPv4 top resource\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+			     NSIM_RESOURCE_IPV4_FIB, true);</div><div class='add'>+	err = devlink_resource_register(devlink, "fib", n,</div><div class='add'>+					NSIM_RESOURCE_IPV4_FIB,</div><div class='add'>+					NSIM_RESOURCE_IPV4, &amp;params);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failed to register IPv4 FIB resource\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+			     NSIM_RESOURCE_IPV4_FIB_RULES, true);</div><div class='add'>+	err = devlink_resource_register(devlink, "fib-rules", n,</div><div class='add'>+					NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='add'>+					NSIM_RESOURCE_IPV4, &amp;params);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failed to register IPv4 FIB rules resource\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Resources for IPv6 */</div><div class='add'>+	err = devlink_resource_register(devlink, "IPv6", (u64)-1,</div><div class='add'>+					NSIM_RESOURCE_IPV6,</div><div class='add'>+					DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					&amp;params);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failed to register IPv6 top resource\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+			     NSIM_RESOURCE_IPV6_FIB, true);</div><div class='add'>+	err = devlink_resource_register(devlink, "fib", n,</div><div class='add'>+					NSIM_RESOURCE_IPV6_FIB,</div><div class='add'>+					NSIM_RESOURCE_IPV6, &amp;params);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failed to register IPv6 FIB resource\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = nsim_fib_get_val(nsim_dev-&gt;fib_data,</div><div class='add'>+			     NSIM_RESOURCE_IPV6_FIB_RULES, true);</div><div class='add'>+	err = devlink_resource_register(devlink, "fib-rules", n,</div><div class='add'>+					NSIM_RESOURCE_IPV6_FIB_RULES,</div><div class='add'>+					NSIM_RESOURCE_IPV6, &amp;params);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Failed to register IPv6 FIB rules resource\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_resource_occ_get_register(devlink,</div><div class='add'>+					  NSIM_RESOURCE_IPV4_FIB,</div><div class='add'>+					  nsim_dev_ipv4_fib_resource_occ_get,</div><div class='add'>+					  nsim_dev);</div><div class='add'>+	devlink_resource_occ_get_register(devlink,</div><div class='add'>+					  NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='add'>+					  nsim_dev_ipv4_fib_rules_res_occ_get,</div><div class='add'>+					  nsim_dev);</div><div class='add'>+	devlink_resource_occ_get_register(devlink,</div><div class='add'>+					  NSIM_RESOURCE_IPV6_FIB,</div><div class='add'>+					  nsim_dev_ipv6_fib_resource_occ_get,</div><div class='add'>+					  nsim_dev);</div><div class='add'>+	devlink_resource_occ_get_register(devlink,</div><div class='add'>+					  NSIM_RESOURCE_IPV6_FIB_RULES,</div><div class='add'>+					  nsim_dev_ipv6_fib_rules_res_occ_get,</div><div class='add'>+					  nsim_dev);</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 nsim_dev_reload(struct devlink *devlink,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = devlink_priv(devlink);</div><div class='add'>+	enum nsim_resource_id res_ids[] = {</div><div class='add'>+		NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='add'>+		NSIM_RESOURCE_IPV6_FIB, NSIM_RESOURCE_IPV6_FIB_RULES</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(res_ids); ++i) {</div><div class='add'>+		int err;</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		err = devlink_resource_size_get(devlink, res_ids[i], &amp;val);</div><div class='add'>+		if (!err) {</div><div class='add'>+			err = nsim_fib_set_max(nsim_dev-&gt;fib_data,</div><div class='add'>+					       res_ids[i], val, 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'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops nsim_dev_devlink_ops = {</div><div class='add'>+	.reload = nsim_dev_reload,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nsim_dev *</div><div class='add'>+nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev, unsigned int port_count)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_alloc(&amp;nsim_dev_devlink_ops, sizeof(*nsim_dev));</div><div class='add'>+	if (!devlink)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	nsim_dev = devlink_priv(devlink);</div><div class='add'>+	nsim_dev-&gt;nsim_bus_dev = nsim_bus_dev;</div><div class='add'>+	nsim_dev-&gt;switch_id.id_len = sizeof(nsim_dev-&gt;switch_id.id);</div><div class='add'>+	get_random_bytes(nsim_dev-&gt;switch_id.id, nsim_dev-&gt;switch_id.id_len);</div><div class='add'>+	INIT_LIST_HEAD(&amp;nsim_dev-&gt;port_list);</div><div class='add'>+	mutex_init(&amp;nsim_dev-&gt;port_list_lock);</div><div class='add'>+</div><div class='add'>+	nsim_dev-&gt;fib_data = nsim_fib_create();</div><div class='add'>+	if (IS_ERR(nsim_dev-&gt;fib_data)) {</div><div class='add'>+		err = PTR_ERR(nsim_dev-&gt;fib_data);</div><div class='add'>+		goto err_devlink_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nsim_dev_resources_register(devlink);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_fib_destroy;</div><div class='add'>+</div><div class='add'>+	err = devlink_register(devlink, &amp;nsim_bus_dev-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_resources_unregister;</div><div class='add'>+</div><div class='add'>+	err = nsim_dev_debugfs_init(nsim_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_dl_unregister;</div><div class='add'>+</div><div class='add'>+	err = nsim_bpf_dev_init(nsim_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_debugfs_exit;</div><div class='add'>+</div><div class='add'>+	return nsim_dev;</div><div class='add'>+</div><div class='add'>+err_debugfs_exit:</div><div class='add'>+	nsim_dev_debugfs_exit(nsim_dev);</div><div class='add'>+err_dl_unregister:</div><div class='add'>+	devlink_unregister(devlink);</div><div class='add'>+err_resources_unregister:</div><div class='add'>+	devlink_resources_unregister(devlink, NULL);</div><div class='add'>+err_fib_destroy:</div><div class='add'>+	nsim_fib_destroy(nsim_dev-&gt;fib_data);</div><div class='add'>+err_devlink_free:</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsim_dev_destroy(struct nsim_dev *nsim_dev)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = priv_to_devlink(nsim_dev);</div><div class='add'>+</div><div class='add'>+	nsim_bpf_dev_exit(nsim_dev);</div><div class='add'>+	nsim_dev_debugfs_exit(nsim_dev);</div><div class='add'>+	devlink_unregister(devlink);</div><div class='add'>+	devlink_resources_unregister(devlink, NULL);</div><div class='add'>+	nsim_fib_destroy(nsim_dev-&gt;fib_data);</div><div class='add'>+	mutex_destroy(&amp;nsim_dev-&gt;port_list_lock);</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __nsim_dev_port_add(struct nsim_dev *nsim_dev,</div><div class='add'>+			       unsigned int port_index)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev_port *nsim_dev_port;</div><div class='add'>+	struct devlink_port *devlink_port;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nsim_dev_port = kzalloc(sizeof(*nsim_dev_port), GFP_KERNEL);</div><div class='add'>+	if (!nsim_dev_port)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	nsim_dev_port-&gt;port_index = port_index;</div><div class='add'>+</div><div class='add'>+	devlink_port = &amp;nsim_dev_port-&gt;devlink_port;</div><div class='add'>+	devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='add'>+			       port_index + 1, 0, 0,</div><div class='add'>+			       nsim_dev-&gt;switch_id.id,</div><div class='add'>+			       nsim_dev-&gt;switch_id.id_len);</div><div class='add'>+	err = devlink_port_register(priv_to_devlink(nsim_dev), devlink_port,</div><div class='add'>+				    port_index);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_port_free;</div><div class='add'>+</div><div class='add'>+	err = nsim_dev_port_debugfs_init(nsim_dev, nsim_dev_port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_dl_port_unregister;</div><div class='add'>+</div><div class='add'>+	nsim_dev_port-&gt;ns = nsim_create(nsim_dev, nsim_dev_port);</div><div class='add'>+	if (IS_ERR(nsim_dev_port-&gt;ns)) {</div><div class='add'>+		err = PTR_ERR(nsim_dev_port-&gt;ns);</div><div class='add'>+		goto err_port_debugfs_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_port_type_eth_set(devlink_port, nsim_dev_port-&gt;ns-&gt;netdev);</div><div class='add'>+	list_add(&amp;nsim_dev_port-&gt;list, &amp;nsim_dev-&gt;port_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_port_debugfs_exit:</div><div class='add'>+	nsim_dev_port_debugfs_exit(nsim_dev_port);</div><div class='add'>+err_dl_port_unregister:</div><div class='add'>+	devlink_port_unregister(devlink_port);</div><div class='add'>+err_port_free:</div><div class='add'>+	kfree(nsim_dev_port);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __nsim_dev_port_del(struct nsim_dev_port *nsim_dev_port)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = &amp;nsim_dev_port-&gt;devlink_port;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;nsim_dev_port-&gt;list);</div><div class='add'>+	devlink_port_type_clear(devlink_port);</div><div class='add'>+	nsim_destroy(nsim_dev_port-&gt;ns);</div><div class='add'>+	nsim_dev_port_debugfs_exit(nsim_dev_port);</div><div class='add'>+	devlink_port_unregister(devlink_port);</div><div class='add'>+	kfree(nsim_dev_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsim_dev_port_del_all(struct nsim_dev *nsim_dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev_port *nsim_dev_port, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(nsim_dev_port, tmp,</div><div class='add'>+				 &amp;nsim_dev-&gt;port_list, list)</div><div class='add'>+		__nsim_dev_port_del(nsim_dev_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	nsim_dev = nsim_dev_create(nsim_bus_dev, nsim_bus_dev-&gt;port_count);</div><div class='add'>+	if (IS_ERR(nsim_dev))</div><div class='add'>+		return PTR_ERR(nsim_dev);</div><div class='add'>+	dev_set_drvdata(&amp;nsim_bus_dev-&gt;dev, nsim_dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nsim_bus_dev-&gt;port_count; i++) {</div><div class='add'>+		err = __nsim_dev_port_add(nsim_dev, i);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_port_del_all;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_port_del_all:</div><div class='add'>+	nsim_dev_port_del_all(nsim_dev);</div><div class='add'>+	nsim_dev_destroy(nsim_dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = dev_get_drvdata(&amp;nsim_bus_dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	nsim_dev_port_del_all(nsim_dev);</div><div class='add'>+	nsim_dev_destroy(nsim_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nsim_dev_port *</div><div class='add'>+__nsim_dev_port_lookup(struct nsim_dev *nsim_dev, unsigned int port_index)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev_port *nsim_dev_port;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nsim_dev_port, &amp;nsim_dev-&gt;port_list, list)</div><div class='add'>+		if (nsim_dev_port-&gt;port_index == port_index)</div><div class='add'>+			return nsim_dev_port;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev,</div><div class='add'>+		      unsigned int port_index)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = dev_get_drvdata(&amp;nsim_bus_dev-&gt;dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsim_dev-&gt;port_list_lock);</div><div class='add'>+	if (__nsim_dev_port_lookup(nsim_dev, port_index))</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+	else</div><div class='add'>+		err = __nsim_dev_port_add(nsim_dev, port_index);</div><div class='add'>+	mutex_unlock(&amp;nsim_dev-&gt;port_list_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev,</div><div class='add'>+		      unsigned int port_index)</div><div class='add'>+{</div><div class='add'>+	struct nsim_dev *nsim_dev = dev_get_drvdata(&amp;nsim_bus_dev-&gt;dev);</div><div class='add'>+	struct nsim_dev_port *nsim_dev_port;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nsim_dev-&gt;port_list_lock);</div><div class='add'>+	nsim_dev_port = __nsim_dev_port_lookup(nsim_dev, port_index);</div><div class='add'>+	if (!nsim_dev_port)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else</div><div class='add'>+		__nsim_dev_port_del(nsim_dev_port);</div><div class='add'>+	mutex_unlock(&amp;nsim_dev-&gt;port_list_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nsim_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	nsim_dev_ddir = debugfs_create_dir(DRV_NAME, NULL);</div><div class='add'>+	if (IS_ERR_OR_NULL(nsim_dev_ddir))</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 nsim_dev_exit(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(nsim_dev_ddir);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/netdevsim/devlink.c b/drivers/net/netdevsim/devlink.c<br/>deleted file mode 100644<br/>index 5135fc371f01..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/devlink.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/devlink.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,295 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2018 Cumulus Networks. All rights reserved.</div><div class='del'>- * Copyright (c) 2018 David Ahern &lt;dsa@cumulusnetworks.com&gt;</div><div class='del'>- *</div><div class='del'>- * This software is licensed under the GNU General License Version 2,</div><div class='del'>- * June 1991 as shown in the file COPYING in the top-level directory of this</div><div class='del'>- * source tree.</div><div class='del'>- *</div><div class='del'>- * THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"</div><div class='del'>- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,</div><div class='del'>- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS</div><div class='del'>- * FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE</div><div class='del'>- * OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME</div><div class='del'>- * THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;net/devlink.h&gt;</div><div class='del'>-#include &lt;net/netns/generic.h&gt;</div><div class='del'>-</div><div class='del'>-#include "netdevsim.h"</div><div class='del'>-</div><div class='del'>-static unsigned int nsim_devlink_id;</div><div class='del'>-</div><div class='del'>-/* place holder until devlink and namespaces is sorted out */</div><div class='del'>-static struct net *nsim_devlink_net(struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	return &amp;init_net;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* IPv4</div><div class='del'>- */</div><div class='del'>-static u64 nsim_ipv4_fib_resource_occ_get(void *priv)</div><div class='del'>-{</div><div class='del'>-	struct net *net = priv;</div><div class='del'>-</div><div class='del'>-	return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 nsim_ipv4_fib_rules_res_occ_get(void *priv)</div><div class='del'>-{</div><div class='del'>-	struct net *net = priv;</div><div class='del'>-</div><div class='del'>-	return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* IPv6</div><div class='del'>- */</div><div class='del'>-static u64 nsim_ipv6_fib_resource_occ_get(void *priv)</div><div class='del'>-{</div><div class='del'>-	struct net *net = priv;</div><div class='del'>-</div><div class='del'>-	return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 nsim_ipv6_fib_rules_res_occ_get(void *priv)</div><div class='del'>-{</div><div class='del'>-	struct net *net = priv;</div><div class='del'>-</div><div class='del'>-	return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devlink_resources_register(struct devlink *devlink)</div><div class='del'>-{</div><div class='del'>-	struct devlink_resource_size_params params = {</div><div class='del'>-		.size_max = (u64)-1,</div><div class='del'>-		.size_granularity = 1,</div><div class='del'>-		.unit = DEVLINK_RESOURCE_UNIT_ENTRY</div><div class='del'>-	};</div><div class='del'>-	struct net *net = nsim_devlink_net(devlink);</div><div class='del'>-	int err;</div><div class='del'>-	u64 n;</div><div class='del'>-</div><div class='del'>-	/* Resources for IPv4 */</div><div class='del'>-	err = devlink_resource_register(devlink, "IPv4", (u64)-1,</div><div class='del'>-					NSIM_RESOURCE_IPV4,</div><div class='del'>-					DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='del'>-					&amp;params);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Failed to register IPv4 top resource\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, true);</div><div class='del'>-	err = devlink_resource_register(devlink, "fib", n,</div><div class='del'>-					NSIM_RESOURCE_IPV4_FIB,</div><div class='del'>-					NSIM_RESOURCE_IPV4, &amp;params);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Failed to register IPv4 FIB resource\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, true);</div><div class='del'>-	err = devlink_resource_register(devlink, "fib-rules", n,</div><div class='del'>-					NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='del'>-					NSIM_RESOURCE_IPV4, &amp;params);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Failed to register IPv4 FIB rules resource\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Resources for IPv6 */</div><div class='del'>-	err = devlink_resource_register(devlink, "IPv6", (u64)-1,</div><div class='del'>-					NSIM_RESOURCE_IPV6,</div><div class='del'>-					DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='del'>-					&amp;params);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Failed to register IPv6 top resource\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, true);</div><div class='del'>-	err = devlink_resource_register(devlink, "fib", n,</div><div class='del'>-					NSIM_RESOURCE_IPV6_FIB,</div><div class='del'>-					NSIM_RESOURCE_IPV6, &amp;params);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Failed to register IPv6 FIB resource\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, true);</div><div class='del'>-	err = devlink_resource_register(devlink, "fib-rules", n,</div><div class='del'>-					NSIM_RESOURCE_IPV6_FIB_RULES,</div><div class='del'>-					NSIM_RESOURCE_IPV6, &amp;params);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Failed to register IPv6 FIB rules resource\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devlink_resource_occ_get_register(devlink,</div><div class='del'>-					  NSIM_RESOURCE_IPV4_FIB,</div><div class='del'>-					  nsim_ipv4_fib_resource_occ_get,</div><div class='del'>-					  net);</div><div class='del'>-	devlink_resource_occ_get_register(devlink,</div><div class='del'>-					  NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='del'>-					  nsim_ipv4_fib_rules_res_occ_get,</div><div class='del'>-					  net);</div><div class='del'>-	devlink_resource_occ_get_register(devlink,</div><div class='del'>-					  NSIM_RESOURCE_IPV6_FIB,</div><div class='del'>-					  nsim_ipv6_fib_resource_occ_get,</div><div class='del'>-					  net);</div><div class='del'>-	devlink_resource_occ_get_register(devlink,</div><div class='del'>-					  NSIM_RESOURCE_IPV6_FIB_RULES,</div><div class='del'>-					  nsim_ipv6_fib_rules_res_occ_get,</div><div class='del'>-					  net);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nsim_devlink_reload(struct devlink *devlink,</div><div class='del'>-			       struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	enum nsim_resource_id res_ids[] = {</div><div class='del'>-		NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='del'>-		NSIM_RESOURCE_IPV6_FIB, NSIM_RESOURCE_IPV6_FIB_RULES</div><div class='del'>-	};</div><div class='del'>-	struct net *net = nsim_devlink_net(devlink);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(res_ids); ++i) {</div><div class='del'>-		int err;</div><div class='del'>-		u64 val;</div><div class='del'>-</div><div class='del'>-		err = devlink_resource_size_get(devlink, res_ids[i], &amp;val);</div><div class='del'>-		if (!err) {</div><div class='del'>-			err = nsim_fib_set_max(net, res_ids[i], val, extack);</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'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nsim_devlink_net_reset(struct net *net)</div><div class='del'>-{</div><div class='del'>-	enum nsim_resource_id res_ids[] = {</div><div class='del'>-		NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,</div><div class='del'>-		NSIM_RESOURCE_IPV6_FIB, NSIM_RESOURCE_IPV6_FIB_RULES</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(res_ids); ++i) {</div><div class='del'>-		if (nsim_fib_set_max(net, res_ids[i], (u64)-1, NULL)) {</div><div class='del'>-			pr_err("Failed to reset limit for resource %u\n",</div><div class='del'>-			       res_ids[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct devlink_ops nsim_devlink_ops = {</div><div class='del'>-	.reload = nsim_devlink_reload,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* once devlink / namespace issues are sorted out</div><div class='del'>- * this needs to be net in which a devlink instance</div><div class='del'>- * is to be created. e.g., dev_net(ns-&gt;netdev)</div><div class='del'>- */</div><div class='del'>-static struct net *nsim_to_net(struct netdevsim *ns)</div><div class='del'>-{</div><div class='del'>-	return &amp;init_net;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nsim_devlink_teardown(struct netdevsim *ns)</div><div class='del'>-{</div><div class='del'>-	if (ns-&gt;devlink) {</div><div class='del'>-		struct net *net = nsim_to_net(ns);</div><div class='del'>-		bool *reg_devlink = net_generic(net, nsim_devlink_id);</div><div class='del'>-</div><div class='del'>-		devlink_resources_unregister(ns-&gt;devlink, NULL);</div><div class='del'>-		devlink_unregister(ns-&gt;devlink);</div><div class='del'>-		devlink_free(ns-&gt;devlink);</div><div class='del'>-		ns-&gt;devlink = NULL;</div><div class='del'>-</div><div class='del'>-		nsim_devlink_net_reset(net);</div><div class='del'>-		*reg_devlink = true;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int nsim_devlink_setup(struct netdevsim *ns)</div><div class='del'>-{</div><div class='del'>-	struct net *net = nsim_to_net(ns);</div><div class='del'>-	bool *reg_devlink = net_generic(net, nsim_devlink_id);</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* only one device per namespace controls devlink */</div><div class='del'>-	if (!*reg_devlink) {</div><div class='del'>-		ns-&gt;devlink = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devlink = devlink_alloc(&amp;nsim_devlink_ops, 0);</div><div class='del'>-	if (!devlink)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = devlink_register(devlink, &amp;ns-&gt;dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_devlink_free;</div><div class='del'>-</div><div class='del'>-	err = devlink_resources_register(devlink);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_dl_unregister;</div><div class='del'>-</div><div class='del'>-	ns-&gt;devlink = devlink;</div><div class='del'>-</div><div class='del'>-	*reg_devlink = false;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_dl_unregister:</div><div class='del'>-	devlink_unregister(devlink);</div><div class='del'>-err_devlink_free:</div><div class='del'>-	devlink_free(devlink);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialize per network namespace state */</div><div class='del'>-static int __net_init nsim_devlink_netns_init(struct net *net)</div><div class='del'>-{</div><div class='del'>-	bool *reg_devlink = net_generic(net, nsim_devlink_id);</div><div class='del'>-</div><div class='del'>-	*reg_devlink = true;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations nsim_devlink_net_ops = {</div><div class='del'>-	.init = nsim_devlink_netns_init,</div><div class='del'>-	.id   = &amp;nsim_devlink_id,</div><div class='del'>-	.size = sizeof(bool),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void nsim_devlink_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_pernet_subsys(&amp;nsim_devlink_net_ops);</div><div class='del'>-	nsim_fib_exit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int nsim_devlink_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nsim_fib_init();</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	err = register_pernet_subsys(&amp;nsim_devlink_net_ops);</div><div class='del'>-	if (err)</div><div class='del'>-		nsim_fib_exit();</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c<br/>index f61d094746c0..8c57ba747772 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/fib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/fib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/fib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/fib.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;net/ip_fib.h&gt;</div><div class='ctx'> #include &lt;net/ip6_fib.h&gt;</div><div class='ctx'> #include &lt;net/fib_rules.h&gt;</div><div class='del'>-#include &lt;net/netns/generic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "netdevsim.h"</div><div class='ctx'> </div><div class='hunk'>@@ -33,15 +32,14 @@ struct nsim_per_fib_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nsim_fib_data {</div><div class='add'>+	struct notifier_block fib_nb;</div><div class='ctx'> 	struct nsim_per_fib_data ipv4;</div><div class='ctx'> 	struct nsim_per_fib_data ipv6;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int nsim_fib_net_id;</div><div class='del'>-</div><div class='del'>-u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max)</div><div class='add'>+u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,</div><div class='add'>+		     enum nsim_resource_id res_id, bool max)</div><div class='ctx'> {</div><div class='del'>-	struct nsim_fib_data *fib_data = net_generic(net, nsim_fib_net_id);</div><div class='ctx'> 	struct nsim_fib_entry *entry;</div><div class='ctx'> </div><div class='ctx'> 	switch (res_id) {</div><div class='hunk'>@@ -64,10 +62,10 @@ u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max)</div><div class='ctx'> 	return max ? entry-&gt;max : entry-&gt;num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val,</div><div class='add'>+int nsim_fib_set_max(struct nsim_fib_data *fib_data,</div><div class='add'>+		     enum nsim_resource_id res_id, u64 val,</div><div class='ctx'> 		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct nsim_fib_data *fib_data = net_generic(net, nsim_fib_net_id);</div><div class='ctx'> 	struct nsim_fib_entry *entry;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -120,9 +118,9 @@ static int nsim_fib_rule_account(struct nsim_fib_entry *entry, bool add,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nsim_fib_rule_event(struct fib_notifier_info *info, bool add)</div><div class='add'>+static int nsim_fib_rule_event(struct nsim_fib_data *data,</div><div class='add'>+			       struct fib_notifier_info *info, bool add)</div><div class='ctx'> {</div><div class='del'>-	struct nsim_fib_data *data = net_generic(info-&gt;net, nsim_fib_net_id);</div><div class='ctx'> 	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -157,9 +155,9 @@ static int nsim_fib_account(struct nsim_fib_entry *entry, bool add,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nsim_fib_event(struct fib_notifier_info *info, bool add)</div><div class='add'>+static int nsim_fib_event(struct nsim_fib_data *data,</div><div class='add'>+			  struct fib_notifier_info *info, bool add)</div><div class='ctx'> {</div><div class='del'>-	struct nsim_fib_data *data = net_generic(info-&gt;net, nsim_fib_net_id);</div><div class='ctx'> 	struct netlink_ext_ack *extack = info-&gt;extack;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -178,18 +176,22 @@ static int nsim_fib_event(struct fib_notifier_info *info, bool add)</div><div class='ctx'> static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 			     void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct nsim_fib_data *data = container_of(nb, struct nsim_fib_data,</div><div class='add'>+						  fib_nb);</div><div class='ctx'> 	struct fib_notifier_info *info = ptr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case FIB_EVENT_RULE_ADD: /* fall through */</div><div class='ctx'> 	case FIB_EVENT_RULE_DEL:</div><div class='del'>-		err = nsim_fib_rule_event(info, event == FIB_EVENT_RULE_ADD);</div><div class='add'>+		err = nsim_fib_rule_event(data, info,</div><div class='add'>+					  event == FIB_EVENT_RULE_ADD);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FIB_EVENT_ENTRY_ADD:  /* fall through */</div><div class='ctx'> 	case FIB_EVENT_ENTRY_DEL:</div><div class='del'>-		err = nsim_fib_event(info, event == FIB_EVENT_ENTRY_ADD);</div><div class='add'>+		err = nsim_fib_event(data, info,</div><div class='add'>+				     event == FIB_EVENT_ENTRY_ADD);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -199,30 +201,23 @@ static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> /* inconsistent dump, trying again */</div><div class='ctx'> static void nsim_fib_dump_inconsistent(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='del'>-	struct nsim_fib_data *data;</div><div class='del'>-	struct net *net;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_net_rcu(net) {</div><div class='del'>-		data = net_generic(net, nsim_fib_net_id);</div><div class='del'>-</div><div class='del'>-		data-&gt;ipv4.fib.num = 0ULL;</div><div class='del'>-		data-&gt;ipv4.rules.num = 0ULL;</div><div class='add'>+	struct nsim_fib_data *data = container_of(nb, struct nsim_fib_data,</div><div class='add'>+						  fib_nb);</div><div class='ctx'> </div><div class='del'>-		data-&gt;ipv6.fib.num = 0ULL;</div><div class='del'>-		data-&gt;ipv6.rules.num = 0ULL;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	data-&gt;ipv4.fib.num = 0ULL;</div><div class='add'>+	data-&gt;ipv4.rules.num = 0ULL;</div><div class='add'>+	data-&gt;ipv6.fib.num = 0ULL;</div><div class='add'>+	data-&gt;ipv6.rules.num = 0ULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block nsim_fib_nb = {</div><div class='del'>-	.notifier_call = nsim_fib_event_nb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Initialize per network namespace state */</div><div class='del'>-static int __net_init nsim_fib_netns_init(struct net *net)</div><div class='add'>+struct nsim_fib_data *nsim_fib_create(void)</div><div class='ctx'> {</div><div class='del'>-	struct nsim_fib_data *data = net_generic(net, nsim_fib_net_id);</div><div class='add'>+	struct nsim_fib_data *data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;ipv4.fib.max = (u64)-1;</div><div class='ctx'> 	data-&gt;ipv4.rules.max = (u64)-1;</div><div class='hunk'>@@ -230,37 +225,22 @@ static int __net_init nsim_fib_netns_init(struct net *net)</div><div class='ctx'> 	data-&gt;ipv6.fib.max = (u64)-1;</div><div class='ctx'> 	data-&gt;ipv6.rules.max = (u64)-1;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pernet_operations nsim_fib_net_ops = {</div><div class='del'>-	.init = nsim_fib_netns_init,</div><div class='del'>-	.id   = &amp;nsim_fib_net_id,</div><div class='del'>-	.size = sizeof(struct nsim_fib_data),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void nsim_fib_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_pernet_subsys(&amp;nsim_fib_net_ops);</div><div class='del'>-	unregister_fib_notifier(&amp;nsim_fib_nb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int nsim_fib_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = register_pernet_subsys(&amp;nsim_fib_net_ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pr_err("Failed to register pernet subsystem\n");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = register_fib_notifier(&amp;nsim_fib_nb, nsim_fib_dump_inconsistent);</div><div class='del'>-	if (err &lt; 0) {</div><div class='add'>+	data-&gt;fib_nb.notifier_call = nsim_fib_event_nb;</div><div class='add'>+	err = register_fib_notifier(&amp;data-&gt;fib_nb, nsim_fib_dump_inconsistent);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		pr_err("Failed to register fib notifier\n");</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return data;</div><div class='add'>+</div><div class='ctx'> err_out:</div><div class='del'>-	return err;</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsim_fib_destroy(struct nsim_fib_data *data)</div><div class='add'>+{</div><div class='add'>+	unregister_fib_notifier(&amp;data-&gt;fib_nb);</div><div class='add'>+	kfree(data);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/netdevsim/ipsec.c b/drivers/net/netdevsim/ipsec.c<br/>index 76e11d889bb6..e27fc1a4516d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/ipsec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/ipsec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/ipsec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/ipsec.c</a></div><div class='hunk'>@@ -283,7 +283,8 @@ void nsim_ipsec_init(struct netdevsim *ns)</div><div class='ctx'> 	ns-&gt;netdev-&gt;features |= NSIM_ESP_FEATURES;</div><div class='ctx'> 	ns-&gt;netdev-&gt;hw_enc_features |= NSIM_ESP_FEATURES;</div><div class='ctx'> </div><div class='del'>-	ns-&gt;ipsec.pfile = debugfs_create_file("ipsec", 0400, ns-&gt;ddir, ns,</div><div class='add'>+	ns-&gt;ipsec.pfile = debugfs_create_file("ipsec", 0400,</div><div class='add'>+					      ns-&gt;nsim_dev_port-&gt;ddir, ns,</div><div class='ctx'> 					      &amp;ipsec_dbg_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c<br/>index 75a50b59cb8f..e5c8aa08e1cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/netdev.c</a></div><div class='hunk'>@@ -25,230 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "netdevsim.h"</div><div class='ctx'> </div><div class='del'>-struct nsim_vf_config {</div><div class='del'>-	int link_state;</div><div class='del'>-	u16 min_tx_rate;</div><div class='del'>-	u16 max_tx_rate;</div><div class='del'>-	u16 vlan;</div><div class='del'>-	__be16 vlan_proto;</div><div class='del'>-	u16 qos;</div><div class='del'>-	u8 vf_mac[ETH_ALEN];</div><div class='del'>-	bool spoofchk_enabled;</div><div class='del'>-	bool trusted;</div><div class='del'>-	bool rss_query_enabled;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 nsim_dev_id;</div><div class='del'>-</div><div class='del'>-static struct dentry *nsim_ddir;</div><div class='del'>-static struct dentry *nsim_sdev_ddir;</div><div class='del'>-</div><div class='del'>-static int nsim_num_vf(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = to_nsim(dev);</div><div class='del'>-</div><div class='del'>-	return ns-&gt;num_vfs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bus_type nsim_bus = {</div><div class='del'>-	.name		= DRV_NAME,</div><div class='del'>-	.dev_name	= DRV_NAME,</div><div class='del'>-	.num_vf		= nsim_num_vf,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int nsim_vfs_enable(struct netdevsim *ns, unsigned int num_vfs)</div><div class='del'>-{</div><div class='del'>-	ns-&gt;vfconfigs = kcalloc(num_vfs, sizeof(struct nsim_vf_config),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!ns-&gt;vfconfigs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ns-&gt;num_vfs = num_vfs;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nsim_vfs_disable(struct netdevsim *ns)</div><div class='del'>-{</div><div class='del'>-	kfree(ns-&gt;vfconfigs);</div><div class='del'>-	ns-&gt;vfconfigs = NULL;</div><div class='del'>-	ns-&gt;num_vfs = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-nsim_numvfs_store(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		  const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = to_nsim(dev);</div><div class='del'>-	unsigned int num_vfs;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = kstrtouint(buf, 0, &amp;num_vfs);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	if (ns-&gt;num_vfs == num_vfs)</div><div class='del'>-		goto exit_good;</div><div class='del'>-	if (ns-&gt;num_vfs &amp;&amp; num_vfs) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto exit_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (num_vfs) {</div><div class='del'>-		ret = nsim_vfs_enable(ns, num_vfs);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto exit_unlock;</div><div class='del'>-	} else {</div><div class='del'>-		nsim_vfs_disable(ns);</div><div class='del'>-	}</div><div class='del'>-exit_good:</div><div class='del'>-	ret = count;</div><div class='del'>-exit_unlock:</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-nsim_numvfs_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = to_nsim(dev);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%u\n", ns-&gt;num_vfs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device_attribute nsim_numvfs_attr =</div><div class='del'>-	__ATTR(sriov_numvfs, 0664, nsim_numvfs_show, nsim_numvfs_store);</div><div class='del'>-</div><div class='del'>-static struct attribute *nsim_dev_attrs[] = {</div><div class='del'>-	&amp;nsim_numvfs_attr.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group nsim_dev_attr_group = {</div><div class='del'>-	.attrs = nsim_dev_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group *nsim_dev_attr_groups[] = {</div><div class='del'>-	&amp;nsim_dev_attr_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void nsim_dev_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = to_nsim(dev);</div><div class='del'>-</div><div class='del'>-	nsim_vfs_disable(ns);</div><div class='del'>-	free_netdev(ns-&gt;netdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device_type nsim_dev_type = {</div><div class='del'>-	.groups = nsim_dev_attr_groups,</div><div class='del'>-	.release = nsim_dev_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int nsim_get_port_parent_id(struct net_device *dev,</div><div class='del'>-				   struct netdev_phys_item_id *ppid)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	ppid-&gt;id_len = sizeof(ns-&gt;sdev-&gt;switch_id);</div><div class='del'>-	memcpy(&amp;ppid-&gt;id, &amp;ns-&gt;sdev-&gt;switch_id, ppid-&gt;id_len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nsim_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	char sdev_ddir_name[10], sdev_link_name[32];</div><div class='del'>-	struct netdevsim *ns = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ns-&gt;netdev = dev;</div><div class='del'>-	ns-&gt;ddir = debugfs_create_dir(netdev_name(dev), nsim_ddir);</div><div class='del'>-	if (IS_ERR_OR_NULL(ns-&gt;ddir))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!ns-&gt;sdev) {</div><div class='del'>-		ns-&gt;sdev = kzalloc(sizeof(*ns-&gt;sdev), GFP_KERNEL);</div><div class='del'>-		if (!ns-&gt;sdev) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_debugfs_destroy;</div><div class='del'>-		}</div><div class='del'>-		ns-&gt;sdev-&gt;refcnt = 1;</div><div class='del'>-		ns-&gt;sdev-&gt;switch_id = nsim_dev_id;</div><div class='del'>-		sprintf(sdev_ddir_name, "%u", ns-&gt;sdev-&gt;switch_id);</div><div class='del'>-		ns-&gt;sdev-&gt;ddir = debugfs_create_dir(sdev_ddir_name,</div><div class='del'>-						    nsim_sdev_ddir);</div><div class='del'>-		if (IS_ERR_OR_NULL(ns-&gt;sdev-&gt;ddir)) {</div><div class='del'>-			err = PTR_ERR_OR_ZERO(ns-&gt;sdev-&gt;ddir) ?: -EINVAL;</div><div class='del'>-			goto err_sdev_free;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		sprintf(sdev_ddir_name, "%u", ns-&gt;sdev-&gt;switch_id);</div><div class='del'>-		ns-&gt;sdev-&gt;refcnt++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sprintf(sdev_link_name, "../../" DRV_NAME "_sdev/%s", sdev_ddir_name);</div><div class='del'>-	debugfs_create_symlink("sdev", ns-&gt;ddir, sdev_link_name);</div><div class='del'>-</div><div class='del'>-	err = nsim_bpf_init(ns);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_sdev_destroy;</div><div class='del'>-</div><div class='del'>-	ns-&gt;dev.id = nsim_dev_id++;</div><div class='del'>-	ns-&gt;dev.bus = &amp;nsim_bus;</div><div class='del'>-	ns-&gt;dev.type = &amp;nsim_dev_type;</div><div class='del'>-	err = device_register(&amp;ns-&gt;dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_bpf_uninit;</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;ns-&gt;dev);</div><div class='del'>-</div><div class='del'>-	err = nsim_devlink_setup(ns);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_unreg_dev;</div><div class='del'>-</div><div class='del'>-	nsim_ipsec_init(ns);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_unreg_dev:</div><div class='del'>-	device_unregister(&amp;ns-&gt;dev);</div><div class='del'>-err_bpf_uninit:</div><div class='del'>-	nsim_bpf_uninit(ns);</div><div class='del'>-err_sdev_destroy:</div><div class='del'>-	if (!--ns-&gt;sdev-&gt;refcnt) {</div><div class='del'>-		debugfs_remove_recursive(ns-&gt;sdev-&gt;ddir);</div><div class='del'>-err_sdev_free:</div><div class='del'>-		kfree(ns-&gt;sdev);</div><div class='del'>-	}</div><div class='del'>-err_debugfs_destroy:</div><div class='del'>-	debugfs_remove_recursive(ns-&gt;ddir);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nsim_uninit(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	nsim_ipsec_teardown(ns);</div><div class='del'>-	nsim_devlink_teardown(ns);</div><div class='del'>-	debugfs_remove_recursive(ns-&gt;ddir);</div><div class='del'>-	nsim_bpf_uninit(ns);</div><div class='del'>-	if (!--ns-&gt;sdev-&gt;refcnt) {</div><div class='del'>-		debugfs_remove_recursive(ns-&gt;sdev-&gt;ddir);</div><div class='del'>-		kfree(ns-&gt;sdev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nsim_free(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct netdevsim *ns = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	device_unregister(&amp;ns-&gt;dev);</div><div class='del'>-	/* netdev and vf state will be freed out of device_release() */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static netdev_tx_t nsim_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='hunk'>@@ -325,11 +101,12 @@ nsim_setup_tc_block(struct net_device *dev, struct tc_block_offload *f)</div><div class='ctx'> static int nsim_set_vf_mac(struct net_device *dev, int vf, u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Only refuse multicast addresses, zero address can mean unset/any. */</div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs || is_multicast_ether_addr(mac))</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs || is_multicast_ether_addr(mac))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	memcpy(ns-&gt;vfconfigs[vf].vf_mac, mac, ETH_ALEN);</div><div class='add'>+	memcpy(nsim_bus_dev-&gt;vfconfigs[vf].vf_mac, mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -338,13 +115,14 @@ static int nsim_set_vf_vlan(struct net_device *dev, int vf,</div><div class='ctx'> 			    u16 vlan, u8 qos, __be16 vlan_proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs || vlan &gt; 4095 || qos &gt; 7)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs || vlan &gt; 4095 || qos &gt; 7)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ns-&gt;vfconfigs[vf].vlan = vlan;</div><div class='del'>-	ns-&gt;vfconfigs[vf].qos = qos;</div><div class='del'>-	ns-&gt;vfconfigs[vf].vlan_proto = vlan_proto;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].vlan = vlan;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].qos = qos;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].vlan_proto = vlan_proto;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -352,12 +130,13 @@ static int nsim_set_vf_vlan(struct net_device *dev, int vf,</div><div class='ctx'> static int nsim_set_vf_rate(struct net_device *dev, int vf, int min, int max)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ns-&gt;vfconfigs[vf].min_tx_rate = min;</div><div class='del'>-	ns-&gt;vfconfigs[vf].max_tx_rate = max;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].min_tx_rate = min;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].max_tx_rate = max;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -365,10 +144,11 @@ static int nsim_set_vf_rate(struct net_device *dev, int vf, int min, int max)</div><div class='ctx'> static int nsim_set_vf_spoofchk(struct net_device *dev, int vf, bool val)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	ns-&gt;vfconfigs[vf].spoofchk_enabled = val;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].spoofchk_enabled = val;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -376,10 +156,11 @@ static int nsim_set_vf_spoofchk(struct net_device *dev, int vf, bool val)</div><div class='ctx'> static int nsim_set_vf_rss_query_en(struct net_device *dev, int vf, bool val)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	ns-&gt;vfconfigs[vf].rss_query_enabled = val;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].rss_query_enabled = val;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -387,10 +168,11 @@ static int nsim_set_vf_rss_query_en(struct net_device *dev, int vf, bool val)</div><div class='ctx'> static int nsim_set_vf_trust(struct net_device *dev, int vf, bool val)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	ns-&gt;vfconfigs[vf].trusted = val;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].trusted = val;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -399,21 +181,22 @@ static int</div><div class='ctx'> nsim_get_vf_config(struct net_device *dev, int vf, struct ifla_vf_info *ivi)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ivi-&gt;vf = vf;</div><div class='del'>-	ivi-&gt;linkstate = ns-&gt;vfconfigs[vf].link_state;</div><div class='del'>-	ivi-&gt;min_tx_rate = ns-&gt;vfconfigs[vf].min_tx_rate;</div><div class='del'>-	ivi-&gt;max_tx_rate = ns-&gt;vfconfigs[vf].max_tx_rate;</div><div class='del'>-	ivi-&gt;vlan = ns-&gt;vfconfigs[vf].vlan;</div><div class='del'>-	ivi-&gt;vlan_proto = ns-&gt;vfconfigs[vf].vlan_proto;</div><div class='del'>-	ivi-&gt;qos = ns-&gt;vfconfigs[vf].qos;</div><div class='del'>-	memcpy(&amp;ivi-&gt;mac, ns-&gt;vfconfigs[vf].vf_mac, ETH_ALEN);</div><div class='del'>-	ivi-&gt;spoofchk = ns-&gt;vfconfigs[vf].spoofchk_enabled;</div><div class='del'>-	ivi-&gt;trusted = ns-&gt;vfconfigs[vf].trusted;</div><div class='del'>-	ivi-&gt;rss_query_en = ns-&gt;vfconfigs[vf].rss_query_enabled;</div><div class='add'>+	ivi-&gt;linkstate = nsim_bus_dev-&gt;vfconfigs[vf].link_state;</div><div class='add'>+	ivi-&gt;min_tx_rate = nsim_bus_dev-&gt;vfconfigs[vf].min_tx_rate;</div><div class='add'>+	ivi-&gt;max_tx_rate = nsim_bus_dev-&gt;vfconfigs[vf].max_tx_rate;</div><div class='add'>+	ivi-&gt;vlan = nsim_bus_dev-&gt;vfconfigs[vf].vlan;</div><div class='add'>+	ivi-&gt;vlan_proto = nsim_bus_dev-&gt;vfconfigs[vf].vlan_proto;</div><div class='add'>+	ivi-&gt;qos = nsim_bus_dev-&gt;vfconfigs[vf].qos;</div><div class='add'>+	memcpy(&amp;ivi-&gt;mac, nsim_bus_dev-&gt;vfconfigs[vf].vf_mac, ETH_ALEN);</div><div class='add'>+	ivi-&gt;spoofchk = nsim_bus_dev-&gt;vfconfigs[vf].spoofchk_enabled;</div><div class='add'>+	ivi-&gt;trusted = nsim_bus_dev-&gt;vfconfigs[vf].trusted;</div><div class='add'>+	ivi-&gt;rss_query_en = nsim_bus_dev-&gt;vfconfigs[vf].rss_query_enabled;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -421,8 +204,9 @@ nsim_get_vf_config(struct net_device *dev, int vf, struct ifla_vf_info *ivi)</div><div class='ctx'> static int nsim_set_vf_link_state(struct net_device *dev, int vf, int state)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev = ns-&gt;nsim_bus_dev;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= ns-&gt;num_vfs)</div><div class='add'>+	if (vf &gt;= nsim_bus_dev-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='hunk'>@@ -434,7 +218,7 @@ static int nsim_set_vf_link_state(struct net_device *dev, int vf, int state)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ns-&gt;vfconfigs[vf].link_state = state;</div><div class='add'>+	nsim_bus_dev-&gt;vfconfigs[vf].link_state = state;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -461,9 +245,14 @@ nsim_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='add'>+static struct devlink_port *nsim_get_devlink_port(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdevsim *ns = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return &amp;ns-&gt;nsim_dev_port-&gt;devlink_port;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops nsim_netdev_ops = {</div><div class='del'>-	.ndo_init		= nsim_init,</div><div class='del'>-	.ndo_uninit		= nsim_uninit,</div><div class='ctx'> 	.ndo_start_xmit		= nsim_start_xmit,</div><div class='ctx'> 	.ndo_set_rx_mode	= nsim_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='hunk'>@@ -481,7 +270,7 @@ static const struct net_device_ops nsim_netdev_ops = {</div><div class='ctx'> 	.ndo_setup_tc		= nsim_setup_tc,</div><div class='ctx'> 	.ndo_set_features	= nsim_set_features,</div><div class='ctx'> 	.ndo_bpf		= nsim_bpf,</div><div class='del'>-	.ndo_get_port_parent_id	= nsim_get_port_parent_id,</div><div class='add'>+	.ndo_get_devlink_port	= nsim_get_devlink_port,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nsim_setup(struct net_device *dev)</div><div class='hunk'>@@ -489,9 +278,6 @@ static void nsim_setup(struct net_device *dev)</div><div class='ctx'> 	ether_setup(dev);</div><div class='ctx'> 	eth_hw_addr_random(dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;netdev_ops = &amp;nsim_netdev_ops;</div><div class='del'>-	dev-&gt;priv_destructor = nsim_free;</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;tx_queue_len = 0;</div><div class='ctx'> 	dev-&gt;flags |= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;flags &amp;= ~IFF_MULTICAST;</div><div class='hunk'>@@ -506,104 +292,102 @@ static void nsim_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;max_mtu = ETH_MAX_MTU;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nsim_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='del'>-			 struct netlink_ext_ack *extack)</div><div class='add'>+struct netdevsim *</div><div class='add'>+nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port)</div><div class='ctx'> {</div><div class='del'>-	if (tb[IFLA_ADDRESS]) {</div><div class='del'>-		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS])))</div><div class='del'>-			return -EADDRNOTAVAIL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct netdevsim *ns;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev = alloc_netdev(sizeof(*ns), "eth%d", NET_NAME_UNKNOWN, nsim_setup);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ns = netdev_priv(dev);</div><div class='add'>+	ns-&gt;netdev = dev;</div><div class='add'>+	ns-&gt;nsim_dev = nsim_dev;</div><div class='add'>+	ns-&gt;nsim_dev_port = nsim_dev_port;</div><div class='add'>+	ns-&gt;nsim_bus_dev = nsim_dev-&gt;nsim_bus_dev;</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;ns-&gt;nsim_bus_dev-&gt;dev);</div><div class='add'>+	dev-&gt;netdev_ops = &amp;nsim_netdev_ops;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = nsim_bpf_init(ns);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+</div><div class='add'>+	nsim_ipsec_init(ns);</div><div class='add'>+</div><div class='add'>+	err = register_netdevice(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_ipsec_teardown;</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return ns;</div><div class='add'>+</div><div class='add'>+err_ipsec_teardown:</div><div class='add'>+	nsim_ipsec_teardown(ns);</div><div class='add'>+	nsim_bpf_uninit(ns);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+err_free_netdev:</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nsim_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='add'>+void nsim_destroy(struct netdevsim *ns)</div><div class='ctx'> {</div><div class='del'>-	struct netdevsim *ns = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (tb[IFLA_LINK]) {</div><div class='del'>-		struct net_device *joindev;</div><div class='del'>-		struct netdevsim *joinns;</div><div class='del'>-</div><div class='del'>-		joindev = __dev_get_by_index(src_net,</div><div class='del'>-					     nla_get_u32(tb[IFLA_LINK]));</div><div class='del'>-		if (!joindev)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		if (joindev-&gt;netdev_ops != &amp;nsim_netdev_ops)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		joinns = netdev_priv(joindev);</div><div class='del'>-		if (!joinns-&gt;sdev || !joinns-&gt;sdev-&gt;refcnt)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		ns-&gt;sdev = joinns-&gt;sdev;</div><div class='del'>-	}</div><div class='add'>+	struct net_device *dev = ns-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	return register_netdevice(dev);</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	unregister_netdevice(dev);</div><div class='add'>+	nsim_ipsec_teardown(ns);</div><div class='add'>+	nsim_bpf_uninit(ns);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	free_netdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nsim_dellink(struct net_device *dev, struct list_head *head)</div><div class='add'>+static int nsim_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	unregister_netdevice_queue(dev, head);</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Please use: echo \"[ID] [PORT_COUNT]\" &gt; /sys/bus/netdevsim/new_device");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rtnl_link_ops nsim_link_ops __read_mostly = {</div><div class='ctx'> 	.kind		= DRV_NAME,</div><div class='del'>-	.priv_size	= sizeof(struct netdevsim),</div><div class='del'>-	.setup		= nsim_setup,</div><div class='ctx'> 	.validate	= nsim_validate,</div><div class='del'>-	.newlink	= nsim_newlink,</div><div class='del'>-	.dellink	= nsim_dellink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init nsim_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	nsim_ddir = debugfs_create_dir(DRV_NAME, NULL);</div><div class='del'>-	if (IS_ERR_OR_NULL(nsim_ddir))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	nsim_sdev_ddir = debugfs_create_dir(DRV_NAME "_sdev", NULL);</div><div class='del'>-	if (IS_ERR_OR_NULL(nsim_sdev_ddir)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_debugfs_destroy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = bus_register(&amp;nsim_bus);</div><div class='add'>+	err = nsim_dev_init();</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_sdir_destroy;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = nsim_devlink_init();</div><div class='add'>+	err = nsim_bus_init();</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_unreg_bus;</div><div class='add'>+		goto err_dev_exit;</div><div class='ctx'> </div><div class='ctx'> 	err = rtnl_link_register(&amp;nsim_link_ops);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_dl_fini;</div><div class='add'>+		goto err_bus_exit;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_dl_fini:</div><div class='del'>-	nsim_devlink_exit();</div><div class='del'>-err_unreg_bus:</div><div class='del'>-	bus_unregister(&amp;nsim_bus);</div><div class='del'>-err_sdir_destroy:</div><div class='del'>-	debugfs_remove_recursive(nsim_sdev_ddir);</div><div class='del'>-err_debugfs_destroy:</div><div class='del'>-	debugfs_remove_recursive(nsim_ddir);</div><div class='add'>+err_bus_exit:</div><div class='add'>+	nsim_bus_exit();</div><div class='add'>+err_dev_exit:</div><div class='add'>+	nsim_dev_exit();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit nsim_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_link_unregister(&amp;nsim_link_ops);</div><div class='del'>-	nsim_devlink_exit();</div><div class='del'>-	bus_unregister(&amp;nsim_bus);</div><div class='del'>-	debugfs_remove_recursive(nsim_sdev_ddir);</div><div class='del'>-	debugfs_remove_recursive(nsim_ddir);</div><div class='add'>+	nsim_bus_exit();</div><div class='add'>+	nsim_dev_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(nsim_module_init);</div><div class='head'>diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h<br/>index 384c254fafc5..3f398797c2bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/netdevsim.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/netdevsim/netdevsim.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/netdevsim.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/netdevsim.h</a></div><div class='hunk'>@@ -18,6 +18,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/u64_stats_sync.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='ctx'> #include &lt;net/xdp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"netdevsim"</div><div class='hunk'>@@ -26,26 +27,6 @@</div><div class='ctx'> </div><div class='ctx'> #define NSIM_EA(extack, msg)	NL_SET_ERR_MSG_MOD((extack), msg)</div><div class='ctx'> </div><div class='del'>-struct bpf_prog;</div><div class='del'>-struct bpf_offload_dev;</div><div class='del'>-struct dentry;</div><div class='del'>-struct nsim_vf_config;</div><div class='del'>-</div><div class='del'>-struct netdevsim_shared_dev {</div><div class='del'>-	unsigned int refcnt;</div><div class='del'>-	u32 switch_id;</div><div class='del'>-</div><div class='del'>-	struct dentry *ddir;</div><div class='del'>-</div><div class='del'>-	struct bpf_offload_dev *bpf_dev;</div><div class='del'>-</div><div class='del'>-	struct dentry *ddir_bpf_bound_progs;</div><div class='del'>-	u32 prog_id_gen;</div><div class='del'>-</div><div class='del'>-	struct list_head bpf_bound_progs;</div><div class='del'>-	struct list_head bpf_bound_maps;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define NSIM_IPSEC_MAX_SA_COUNT		33</div><div class='ctx'> #define NSIM_IPSEC_VALID		BIT(31)</div><div class='ctx'> </div><div class='hunk'>@@ -69,18 +50,14 @@ struct nsim_ipsec {</div><div class='ctx'> </div><div class='ctx'> struct netdevsim {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='add'>+	struct nsim_dev *nsim_dev;</div><div class='add'>+	struct nsim_dev_port *nsim_dev_port;</div><div class='ctx'> </div><div class='ctx'> 	u64 tx_packets;</div><div class='ctx'> 	u64 tx_bytes;</div><div class='ctx'> 	struct u64_stats_sync syncp;</div><div class='ctx'> </div><div class='del'>-	struct device dev;</div><div class='del'>-	struct netdevsim_shared_dev *sdev;</div><div class='del'>-</div><div class='del'>-	struct dentry *ddir;</div><div class='del'>-</div><div class='del'>-	unsigned int num_vfs;</div><div class='del'>-	struct nsim_vf_config *vfconfigs;</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev;</div><div class='ctx'> </div><div class='ctx'> 	struct bpf_prog	*bpf_offloaded;</div><div class='ctx'> 	u32 bpf_offloaded_id;</div><div class='hunk'>@@ -88,22 +65,22 @@ struct netdevsim {</div><div class='ctx'> 	struct xdp_attachment_info xdp;</div><div class='ctx'> 	struct xdp_attachment_info xdp_hw;</div><div class='ctx'> </div><div class='del'>-	bool bpf_bind_accept;</div><div class='del'>-	u32 bpf_bind_verifier_delay;</div><div class='del'>-</div><div class='ctx'> 	bool bpf_tc_accept;</div><div class='ctx'> 	bool bpf_tc_non_bound_accept;</div><div class='ctx'> 	bool bpf_xdpdrv_accept;</div><div class='ctx'> 	bool bpf_xdpoffload_accept;</div><div class='ctx'> </div><div class='ctx'> 	bool bpf_map_accept;</div><div class='del'>-#if IS_ENABLED(CONFIG_NET_DEVLINK)</div><div class='del'>-	struct devlink *devlink;</div><div class='del'>-#endif</div><div class='ctx'> 	struct nsim_ipsec ipsec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct netdevsim *</div><div class='add'>+nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port);</div><div class='add'>+void nsim_destroy(struct netdevsim *ns);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+int nsim_bpf_dev_init(struct nsim_dev *nsim_dev);</div><div class='add'>+void nsim_bpf_dev_exit(struct nsim_dev *nsim_dev);</div><div class='ctx'> int nsim_bpf_init(struct netdevsim *ns);</div><div class='ctx'> void nsim_bpf_uninit(struct netdevsim *ns);</div><div class='ctx'> int nsim_bpf(struct net_device *dev, struct netdev_bpf *bpf);</div><div class='hunk'>@@ -111,6 +88,15 @@ int nsim_bpf_disable_tc(struct netdevsim *ns);</div><div class='ctx'> int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type,</div><div class='ctx'> 			       void *type_data, void *cb_priv);</div><div class='ctx'> #else</div><div class='add'>+</div><div class='add'>+static inline int nsim_bpf_dev_init(struct nsim_dev *nsim_dev)</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 nsim_bpf_dev_exit(struct nsim_dev *nsim_dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline int nsim_bpf_init(struct netdevsim *ns)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -138,7 +124,6 @@ nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, void *type_data,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_NET_DEVLINK)</div><div class='ctx'> enum nsim_resource_id {</div><div class='ctx'> 	NSIM_RESOURCE_NONE,   /* DEVLINK_RESOURCE_ID_PARENT_TOP */</div><div class='ctx'> 	NSIM_RESOURCE_IPV4,</div><div class='hunk'>@@ -149,36 +134,47 @@ enum nsim_resource_id {</div><div class='ctx'> 	NSIM_RESOURCE_IPV6_FIB_RULES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nsim_devlink_setup(struct netdevsim *ns);</div><div class='del'>-void nsim_devlink_teardown(struct netdevsim *ns);</div><div class='add'>+struct nsim_dev_port {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct devlink_port devlink_port;</div><div class='add'>+	unsigned int port_index;</div><div class='add'>+	struct dentry *ddir;</div><div class='add'>+	struct netdevsim *ns;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-int nsim_devlink_init(void);</div><div class='del'>-void nsim_devlink_exit(void);</div><div class='add'>+struct nsim_dev {</div><div class='add'>+	struct nsim_bus_dev *nsim_bus_dev;</div><div class='add'>+	struct nsim_fib_data *fib_data;</div><div class='add'>+	struct dentry *ddir;</div><div class='add'>+	struct dentry *ports_ddir;</div><div class='add'>+	struct bpf_offload_dev *bpf_dev;</div><div class='add'>+	bool bpf_bind_accept;</div><div class='add'>+	u32 bpf_bind_verifier_delay;</div><div class='add'>+	struct dentry *ddir_bpf_bound_progs;</div><div class='add'>+	u32 prog_id_gen;</div><div class='add'>+	struct list_head bpf_bound_progs;</div><div class='add'>+	struct list_head bpf_bound_maps;</div><div class='add'>+	struct netdev_phys_item_id switch_id;</div><div class='add'>+	struct list_head port_list;</div><div class='add'>+	struct mutex port_list_lock; /* protects port list */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-int nsim_fib_init(void);</div><div class='del'>-void nsim_fib_exit(void);</div><div class='del'>-u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max);</div><div class='del'>-int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val,</div><div class='add'>+int nsim_dev_init(void);</div><div class='add'>+void nsim_dev_exit(void);</div><div class='add'>+int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev);</div><div class='add'>+void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev);</div><div class='add'>+int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev,</div><div class='add'>+		      unsigned int port_index);</div><div class='add'>+int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev,</div><div class='add'>+		      unsigned int port_index);</div><div class='add'>+</div><div class='add'>+struct nsim_fib_data *nsim_fib_create(void);</div><div class='add'>+void nsim_fib_destroy(struct nsim_fib_data *fib_data);</div><div class='add'>+u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,</div><div class='add'>+		     enum nsim_resource_id res_id, bool max);</div><div class='add'>+int nsim_fib_set_max(struct nsim_fib_data *fib_data,</div><div class='add'>+		     enum nsim_resource_id res_id, u64 val,</div><div class='ctx'> 		     struct netlink_ext_ack *extack);</div><div class='del'>-#else</div><div class='del'>-static inline int nsim_devlink_setup(struct netdevsim *ns)</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 nsim_devlink_teardown(struct netdevsim *ns)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int nsim_devlink_init(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 void nsim_devlink_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_XFRM_OFFLOAD)</div><div class='ctx'> void nsim_ipsec_init(struct netdevsim *ns);</div><div class='hunk'>@@ -199,7 +195,26 @@ static inline bool nsim_ipsec_tx(struct netdevsim *ns, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline struct netdevsim *to_nsim(struct device *ptr)</div><div class='del'>-{</div><div class='del'>-	return container_of(ptr, struct netdevsim, dev);</div><div class='del'>-}</div><div class='add'>+struct nsim_vf_config {</div><div class='add'>+	int link_state;</div><div class='add'>+	u16 min_tx_rate;</div><div class='add'>+	u16 max_tx_rate;</div><div class='add'>+	u16 vlan;</div><div class='add'>+	__be16 vlan_proto;</div><div class='add'>+	u16 qos;</div><div class='add'>+	u8 vf_mac[ETH_ALEN];</div><div class='add'>+	bool spoofchk_enabled;</div><div class='add'>+	bool trusted;</div><div class='add'>+	bool rss_query_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nsim_bus_dev {</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned int port_count;</div><div class='add'>+	unsigned int num_vfs;</div><div class='add'>+	struct nsim_vf_config *vfconfigs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int nsim_bus_init(void);</div><div class='add'>+void nsim_bus_exit(void);</div><div class='head'>diff --git a/drivers/net/netdevsim/sdev.c b/drivers/net/netdevsim/sdev.c<br/>new file mode 100644<br/>index 000000000000..6712da3340d6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/netdevsim/sdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/netdevsim/sdev.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019 Mellanox Technologies. All rights reserved */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netdevsim.h"</div><div class='add'>+</div><div class='add'>+static struct dentry *nsim_sdev_ddir;</div><div class='add'>+</div><div class='add'>+static u32 nsim_sdev_id;</div><div class='add'>+</div><div class='add'>+struct netdevsim_shared_dev *nsim_sdev_get(struct netdevsim *joinns)</div><div class='add'>+{</div><div class='add'>+	struct netdevsim_shared_dev *sdev;</div><div class='add'>+	char sdev_ddir_name[10];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (joinns) {</div><div class='add'>+		if (WARN_ON(!joinns-&gt;sdev))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+		sdev = joinns-&gt;sdev;</div><div class='add'>+		sdev-&gt;refcnt++;</div><div class='add'>+		return sdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);</div><div class='add'>+	if (!sdev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	sdev-&gt;refcnt = 1;</div><div class='add'>+	sdev-&gt;switch_id = nsim_sdev_id++;</div><div class='add'>+</div><div class='add'>+	sprintf(sdev_ddir_name, "%u", sdev-&gt;switch_id);</div><div class='add'>+	sdev-&gt;ddir = debugfs_create_dir(sdev_ddir_name, nsim_sdev_ddir);</div><div class='add'>+	if (IS_ERR_OR_NULL(sdev-&gt;ddir)) {</div><div class='add'>+		err = PTR_ERR_OR_ZERO(sdev-&gt;ddir) ?: -EINVAL;</div><div class='add'>+		goto err_sdev_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sdev;</div><div class='add'>+</div><div class='add'>+err_sdev_free:</div><div class='add'>+	nsim_sdev_id--;</div><div class='add'>+	kfree(sdev);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsim_sdev_put(struct netdevsim_shared_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	if (--sdev-&gt;refcnt)</div><div class='add'>+		return;</div><div class='add'>+	debugfs_remove_recursive(sdev-&gt;ddir);</div><div class='add'>+	kfree(sdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nsim_sdev_init(void)</div><div class='add'>+{</div><div class='add'>+	nsim_sdev_ddir = debugfs_create_dir(DRV_NAME "_sdev", NULL);</div><div class='add'>+	if (IS_ERR_OR_NULL(nsim_sdev_ddir))</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 nsim_sdev_exit(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(nsim_sdev_ddir);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig<br/>index 071869db44cf..d6299710d634 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/Kconfig</a></div><div class='hunk'>@@ -7,6 +7,8 @@ menuconfig MDIO_DEVICE</div><div class='ctx'> 	help</div><div class='ctx'> 	  MDIO devices and driver infrastructure code.</div><div class='ctx'> </div><div class='add'>+if MDIO_DEVICE</div><div class='add'>+</div><div class='ctx'> config MDIO_BUS</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default m if PHYLIB=m</div><div class='hunk'>@@ -74,6 +76,17 @@ config MDIO_BUS_MUX_GPIO</div><div class='ctx'> 	  several child MDIO busses to a parent bus.  Child bus</div><div class='ctx'> 	  selection is under the control of GPIO lines.</div><div class='ctx'> </div><div class='add'>+config MDIO_BUS_MUX_MESON_G12A</div><div class='add'>+	tristate "Amlogic G12a based MDIO bus multiplexer"</div><div class='add'>+	depends on ARCH_MESON || COMPILE_TEST</div><div class='add'>+	depends on OF_MDIO &amp;&amp; HAS_IOMEM &amp;&amp; COMMON_CLK</div><div class='add'>+	select MDIO_BUS_MUX</div><div class='add'>+	default m if ARCH_MESON</div><div class='add'>+	help</div><div class='add'>+	  This module provides a driver for the MDIO multiplexer/glue of</div><div class='add'>+	  the amlogic g12a SoC. The multiplexers connects either the external</div><div class='add'>+	  or the internal MDIO bus to the parent bus.</div><div class='add'>+</div><div class='ctx'> config MDIO_BUS_MUX_MMIOREG</div><div class='ctx'> 	tristate "MMIO device-controlled MDIO bus multiplexers"</div><div class='ctx'> 	depends on OF_MDIO &amp;&amp; HAS_IOMEM</div><div class='hunk'>@@ -179,6 +192,7 @@ config MDIO_XGENE</div><div class='ctx'> 	  APM X-Gene SoC's.</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> config PHYLINK</div><div class='ctx'> 	tristate</div><div class='hunk'>@@ -270,13 +284,13 @@ config BCM87XX_PHY</div><div class='ctx'> 	  Currently supports the BCM8706 and BCM8727 10G Ethernet PHYs.</div><div class='ctx'> </div><div class='ctx'> config BCM_CYGNUS_PHY</div><div class='del'>-	tristate "Broadcom Cygnus SoC internal PHY"</div><div class='del'>-	depends on ARCH_BCM_CYGNUS || COMPILE_TEST</div><div class='add'>+	tristate "Broadcom Cygnus/Omega SoC internal PHY"</div><div class='add'>+	depends on ARCH_BCM_IPROC || COMPILE_TEST</div><div class='ctx'> 	depends on MDIO_BCM_IPROC</div><div class='ctx'> 	select BCM_NET_PHYLIB</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This PHY driver is for the 1G internal PHYs of the Broadcom</div><div class='del'>-	  Cygnus Family SoC.</div><div class='add'>+	  Cygnus and Omega Family SoC.</div><div class='ctx'> </div><div class='ctx'> 	  Currently supports internal PHY's used in the BCM11300,</div><div class='ctx'> 	  BCM11320, BCM11350, BCM11360, BCM58300, BCM58302,</div><div class='hunk'>@@ -394,7 +408,7 @@ config MICROCHIP_T1_PHY</div><div class='ctx'> config MICROSEMI_PHY</div><div class='ctx'> 	tristate "Microsemi PHYs"</div><div class='ctx'> 	---help---</div><div class='del'>-	  Currently supports VSC8530, VSC8531, VSC8540 and VSC8541 PHYs</div><div class='add'>+	  Currently supports VSC8514, VSC8530, VSC8531, VSC8540 and VSC8541 PHYs</div><div class='ctx'> </div><div class='ctx'> config NATIONAL_PHY</div><div class='ctx'> 	tristate "National Semiconductor PHYs"</div><div class='head'>diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile<br/>index ece5dae67174..27d7f9f3b0de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/Makefile</a></div><div class='hunk'>@@ -28,6 +28,7 @@ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o</div><div class='ctx'> obj-$(CONFIG_MDIO_BUS_MUX)	+= mdio-mux.o</div><div class='ctx'> obj-$(CONFIG_MDIO_BUS_MUX_BCM_IPROC)	+= mdio-mux-bcm-iproc.o</div><div class='ctx'> obj-$(CONFIG_MDIO_BUS_MUX_GPIO)	+= mdio-mux-gpio.o</div><div class='add'>+obj-$(CONFIG_MDIO_BUS_MUX_MESON_G12A)	+= mdio-mux-meson-g12a.o</div><div class='ctx'> obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o</div><div class='ctx'> obj-$(CONFIG_MDIO_BUS_MUX_MULTIPLEXER) += mdio-mux-multiplexer.o</div><div class='ctx'> obj-$(CONFIG_MDIO_CAVIUM)	+= mdio-cavium.o</div><div class='head'>diff --git a/drivers/net/phy/amd.c b/drivers/net/phy/amd.c<br/>index 65b4b0960b1e..eef35f8c8d45 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/amd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/amd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/amd.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static struct phy_driver am79c_driver[] = { {</div><div class='ctx'> 	.phy_id		= PHY_ID_AM79C874,</div><div class='ctx'> 	.name		= "AM79C874",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= am79c_config_init,</div><div class='ctx'> 	.ack_interrupt	= am79c_ack_interrupt,</div><div class='ctx'> 	.config_intr	= am79c_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c<br/>index 37218e5d7cc9..eed4fe3d871f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/aquantia_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/aquantia_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/aquantia_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/aquantia_main.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</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/delay.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "aquantia.h"</div><div class='hunk'>@@ -22,20 +23,33 @@</div><div class='ctx'> #define PHY_ID_AQCS109	0x03a1b5c2</div><div class='ctx'> #define PHY_ID_AQR405	0x03a1b4b0</div><div class='ctx'> </div><div class='add'>+#define MDIO_PHYXS_VEND_IF_STATUS		0xe812</div><div class='add'>+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK	GENMASK(7, 3)</div><div class='add'>+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR	0</div><div class='add'>+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI	2</div><div class='add'>+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_SGMII	6</div><div class='add'>+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_OCSGMII	10</div><div class='add'>+</div><div class='ctx'> #define MDIO_AN_VEND_PROV			0xc400</div><div class='ctx'> #define MDIO_AN_VEND_PROV_1000BASET_FULL	BIT(15)</div><div class='ctx'> #define MDIO_AN_VEND_PROV_1000BASET_HALF	BIT(14)</div><div class='add'>+#define MDIO_AN_VEND_PROV_DOWNSHIFT_EN		BIT(4)</div><div class='add'>+#define MDIO_AN_VEND_PROV_DOWNSHIFT_MASK	GENMASK(3, 0)</div><div class='add'>+#define MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT	4</div><div class='ctx'> </div><div class='ctx'> #define MDIO_AN_TX_VEND_STATUS1			0xc800</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_10BASET		(0x0 &lt;&lt; 1)</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_100BASETX	(0x1 &lt;&lt; 1)</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_1000BASET	(0x2 &lt;&lt; 1)</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_10GBASET	(0x3 &lt;&lt; 1)</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_2500BASET	(0x4 &lt;&lt; 1)</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_5000BASET	(0x5 &lt;&lt; 1)</div><div class='del'>-#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK	(0x7 &lt;&lt; 1)</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK	GENMASK(3, 1)</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_10BASET		0</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_100BASETX	1</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_1000BASET	2</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_10GBASET	3</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_2500BASET	4</div><div class='add'>+#define MDIO_AN_TX_VEND_STATUS1_5000BASET	5</div><div class='ctx'> #define MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX	BIT(0)</div><div class='ctx'> </div><div class='add'>+#define MDIO_AN_TX_VEND_INT_STATUS1		0xcc00</div><div class='add'>+#define MDIO_AN_TX_VEND_INT_STATUS1_DOWNSHIFT	BIT(1)</div><div class='add'>+</div><div class='ctx'> #define MDIO_AN_TX_VEND_INT_STATUS2		0xcc01</div><div class='ctx'> </div><div class='ctx'> #define MDIO_AN_TX_VEND_INT_MASK2		0xd401</div><div class='hunk'>@@ -44,8 +58,42 @@</div><div class='ctx'> #define MDIO_AN_RX_LP_STAT1			0xe820</div><div class='ctx'> #define MDIO_AN_RX_LP_STAT1_1000BASET_FULL	BIT(15)</div><div class='ctx'> #define MDIO_AN_RX_LP_STAT1_1000BASET_HALF	BIT(14)</div><div class='add'>+#define MDIO_AN_RX_LP_STAT1_SHORT_REACH		BIT(13)</div><div class='add'>+#define MDIO_AN_RX_LP_STAT1_AQRATE_DOWNSHIFT	BIT(12)</div><div class='add'>+#define MDIO_AN_RX_LP_STAT1_AQ_PHY		BIT(2)</div><div class='add'>+</div><div class='add'>+#define MDIO_AN_RX_LP_STAT4			0xe823</div><div class='add'>+#define MDIO_AN_RX_LP_STAT4_FW_MAJOR		GENMASK(15, 8)</div><div class='add'>+#define MDIO_AN_RX_LP_STAT4_FW_MINOR		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MDIO_AN_RX_VEND_STAT3			0xe832</div><div class='add'>+#define MDIO_AN_RX_VEND_STAT3_AFR		BIT(0)</div><div class='add'>+</div><div class='add'>+/* MDIO_MMD_C22EXT */</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_RX_GOOD_FRAMES		0xd292</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_RX_BAD_FRAMES		0xd294</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_RX_FALSE_CARRIER		0xd297</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_GOOD_FRAMES		0xd313</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_BAD_FRAMES		0xd315</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_FALSE_CARRIER		0xd317</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_COLLISIONS		0xd318</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_LINE_COLLISIONS	0xd319</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_FRAME_ALIGN_ERR	0xd31a</div><div class='add'>+#define MDIO_C22EXT_STAT_SGMII_TX_RUNT_FRAMES		0xd31b</div><div class='ctx'> </div><div class='ctx'> /* Vendor specific 1, MDIO_MMD_VEND1 */</div><div class='add'>+#define VEND1_GLOBAL_FW_ID			0x0020</div><div class='add'>+#define VEND1_GLOBAL_FW_ID_MAJOR		GENMASK(15, 8)</div><div class='add'>+#define VEND1_GLOBAL_FW_ID_MINOR		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define VEND1_GLOBAL_RSVD_STAT1			0xc885</div><div class='add'>+#define VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID	GENMASK(7, 4)</div><div class='add'>+#define VEND1_GLOBAL_RSVD_STAT1_PROV_ID		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define VEND1_GLOBAL_RSVD_STAT9			0xc88d</div><div class='add'>+#define VEND1_GLOBAL_RSVD_STAT9_MODE		GENMASK(7, 0)</div><div class='add'>+#define VEND1_GLOBAL_RSVD_STAT9_1000BT2		0x23</div><div class='add'>+</div><div class='ctx'> #define VEND1_GLOBAL_INT_STD_STATUS		0xfc00</div><div class='ctx'> #define VEND1_GLOBAL_INT_VEND_STATUS		0xfc01</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +120,88 @@</div><div class='ctx'> #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2	BIT(1)</div><div class='ctx'> #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3	BIT(0)</div><div class='ctx'> </div><div class='add'>+struct aqr107_hw_stat {</div><div class='add'>+	const char *name;</div><div class='add'>+	int reg;</div><div class='add'>+	int size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SGMII_STAT(n, r, s) { n, MDIO_C22EXT_STAT_SGMII_ ## r, s }</div><div class='add'>+static const struct aqr107_hw_stat aqr107_hw_stats[] = {</div><div class='add'>+	SGMII_STAT("sgmii_rx_good_frames",	    RX_GOOD_FRAMES,	26),</div><div class='add'>+	SGMII_STAT("sgmii_rx_bad_frames",	    RX_BAD_FRAMES,	26),</div><div class='add'>+	SGMII_STAT("sgmii_rx_false_carrier_events", RX_FALSE_CARRIER,	 8),</div><div class='add'>+	SGMII_STAT("sgmii_tx_good_frames",	    TX_GOOD_FRAMES,	26),</div><div class='add'>+	SGMII_STAT("sgmii_tx_bad_frames",	    TX_BAD_FRAMES,	26),</div><div class='add'>+	SGMII_STAT("sgmii_tx_false_carrier_events", TX_FALSE_CARRIER,	 8),</div><div class='add'>+	SGMII_STAT("sgmii_tx_collisions",	    TX_COLLISIONS,	 8),</div><div class='add'>+	SGMII_STAT("sgmii_tx_line_collisions",	    TX_LINE_COLLISIONS,	 8),</div><div class='add'>+	SGMII_STAT("sgmii_tx_frame_alignment_err",  TX_FRAME_ALIGN_ERR,	16),</div><div class='add'>+	SGMII_STAT("sgmii_tx_runt_frames",	    TX_RUNT_FRAMES,	22),</div><div class='add'>+};</div><div class='add'>+#define AQR107_SGMII_STAT_SZ ARRAY_SIZE(aqr107_hw_stats)</div><div class='add'>+</div><div class='add'>+struct aqr107_priv {</div><div class='add'>+	u64 sgmii_stats[AQR107_SGMII_STAT_SZ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int aqr107_get_sset_count(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	return AQR107_SGMII_STAT_SZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aqr107_get_strings(struct phy_device *phydev, 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; AQR107_SGMII_STAT_SZ; i++)</div><div class='add'>+		strscpy(data + i * ETH_GSTRING_LEN, aqr107_hw_stats[i].name,</div><div class='add'>+			ETH_GSTRING_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 aqr107_get_stat(struct phy_device *phydev, int index)</div><div class='add'>+{</div><div class='add'>+	const struct aqr107_hw_stat *stat = aqr107_hw_stats + index;</div><div class='add'>+	int len_l = min(stat-&gt;size, 16);</div><div class='add'>+	int len_h = stat-&gt;size - len_l;</div><div class='add'>+	u64 ret;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_C22EXT, stat-&gt;reg);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return U64_MAX;</div><div class='add'>+</div><div class='add'>+	ret = val &amp; GENMASK(len_l - 1, 0);</div><div class='add'>+	if (len_h) {</div><div class='add'>+		val = phy_read_mmd(phydev, MDIO_MMD_C22EXT, stat-&gt;reg + 1);</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			return U64_MAX;</div><div class='add'>+</div><div class='add'>+		ret += (val &amp; GENMASK(len_h - 1, 0)) &lt;&lt; 16;</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 aqr107_get_stats(struct phy_device *phydev,</div><div class='add'>+			     struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct aqr107_priv *priv = phydev-&gt;priv;</div><div class='add'>+	u64 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQR107_SGMII_STAT_SZ; i++) {</div><div class='add'>+		val = aqr107_get_stat(phydev, i);</div><div class='add'>+		if (val == U64_MAX)</div><div class='add'>+			phydev_err(phydev, "Reading HW Statistics failed for %s\n",</div><div class='add'>+				   aqr107_hw_stats[i].name);</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;sgmii_stats[i] += val;</div><div class='add'>+</div><div class='add'>+		data[i] = priv-&gt;sgmii_stats[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aqr_config_aneg(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	bool changed = false;</div><div class='hunk'>@@ -112,41 +242,22 @@ static int aqr_config_aneg(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> static int aqr_config_intr(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='add'>+	bool en = phydev-&gt;interrupts == PHY_INTERRUPT_ENABLED;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;interrupts == PHY_INTERRUPT_ENABLED) {</div><div class='del'>-		err = phy_write_mmd(phydev, MDIO_MMD_AN,</div><div class='del'>-				    MDIO_AN_TX_VEND_INT_MASK2,</div><div class='del'>-				    MDIO_AN_TX_VEND_INT_MASK2_LINK);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = phy_write_mmd(phydev, MDIO_MMD_VEND1,</div><div class='del'>-				    VEND1_GLOBAL_INT_STD_MASK,</div><div class='del'>-				    VEND1_GLOBAL_INT_STD_MASK_ALL);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = phy_write_mmd(phydev, MDIO_MMD_VEND1,</div><div class='del'>-				    VEND1_GLOBAL_INT_VEND_MASK,</div><div class='del'>-				    VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 |</div><div class='del'>-				    VEND1_GLOBAL_INT_VEND_MASK_AN);</div><div class='del'>-	} else {</div><div class='del'>-		err = phy_write_mmd(phydev, MDIO_MMD_AN,</div><div class='del'>-				    MDIO_AN_TX_VEND_INT_MASK2, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = phy_write_mmd(phydev, MDIO_MMD_VEND1,</div><div class='del'>-				    VEND1_GLOBAL_INT_STD_MASK, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = phy_write_mmd(phydev, MDIO_MMD_VEND1,</div><div class='del'>-				    VEND1_GLOBAL_INT_VEND_MASK, 0);</div><div class='del'>-	}</div><div class='add'>+	err = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_MASK2,</div><div class='add'>+			    en ? MDIO_AN_TX_VEND_INT_MASK2_LINK : 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_INT_STD_MASK,</div><div class='add'>+			    en ? VEND1_GLOBAL_INT_STD_MASK_ALL : 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_INT_VEND_MASK,</div><div class='add'>+			     en ? VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 |</div><div class='add'>+			     VEND1_GLOBAL_INT_VEND_MASK_AN : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aqr_ack_interrupt(struct phy_device *phydev)</div><div class='hunk'>@@ -178,21 +289,315 @@ static int aqr_read_status(struct phy_device *phydev)</div><div class='ctx'> 	return genphy_c45_read_status(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aqr107_read_downshift_event(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_STATUS1);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	return !!(val &amp; MDIO_AN_TX_VEND_INT_STATUS1_DOWNSHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_read_rate(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(MDIO_AN_TX_VEND_STATUS1_RATE_MASK, val)) {</div><div class='add'>+	case MDIO_AN_TX_VEND_STATUS1_10BASET:</div><div class='add'>+		phydev-&gt;speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_AN_TX_VEND_STATUS1_100BASETX:</div><div class='add'>+		phydev-&gt;speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_AN_TX_VEND_STATUS1_1000BASET:</div><div class='add'>+		phydev-&gt;speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_AN_TX_VEND_STATUS1_2500BASET:</div><div class='add'>+		phydev-&gt;speed = SPEED_2500;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_AN_TX_VEND_STATUS1_5000BASET:</div><div class='add'>+		phydev-&gt;speed = SPEED_5000;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_AN_TX_VEND_STATUS1_10GBASET:</div><div class='add'>+		phydev-&gt;speed = SPEED_10000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		phydev-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val &amp; MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX)</div><div class='add'>+		phydev-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	else</div><div class='add'>+		phydev-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_read_status(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int val, ret;</div><div class='add'>+</div><div class='add'>+	ret = aqr_read_status(phydev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;link || phydev-&gt;autoneg == AUTONEG_DISABLE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_PHYXS, MDIO_PHYXS_VEND_IF_STATUS);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK, val)) {</div><div class='add'>+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR:</div><div class='add'>+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI:</div><div class='add'>+		phydev-&gt;interface = PHY_INTERFACE_MODE_10GKR;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_SGMII:</div><div class='add'>+		phydev-&gt;interface = PHY_INTERFACE_MODE_SGMII;</div><div class='add'>+		break;</div><div class='add'>+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_OCSGMII:</div><div class='add'>+		phydev-&gt;interface = PHY_INTERFACE_MODE_2500BASEX;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		phydev-&gt;interface = PHY_INTERFACE_MODE_NA;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = aqr107_read_downshift_event(phydev);</div><div class='add'>+	if (val &lt;= 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	phydev_warn(phydev, "Downshift occurred! Cabling may be defective.\n");</div><div class='add'>+</div><div class='add'>+	/* Read downshifted rate from vendor register */</div><div class='add'>+	return aqr107_read_rate(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_get_downshift(struct phy_device *phydev, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int val, cnt, enable;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_VEND_PROV);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	enable = FIELD_GET(MDIO_AN_VEND_PROV_DOWNSHIFT_EN, val);</div><div class='add'>+	cnt = FIELD_GET(MDIO_AN_VEND_PROV_DOWNSHIFT_MASK, val);</div><div class='add'>+</div><div class='add'>+	*data = enable &amp;&amp; cnt ? cnt : DOWNSHIFT_DEV_DISABLE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_set_downshift(struct phy_device *phydev, u8 cnt)</div><div class='add'>+{</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	if (!FIELD_FIT(MDIO_AN_VEND_PROV_DOWNSHIFT_MASK, cnt))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (cnt != DOWNSHIFT_DEV_DISABLE) {</div><div class='add'>+		val = MDIO_AN_VEND_PROV_DOWNSHIFT_EN;</div><div class='add'>+		val |= FIELD_PREP(MDIO_AN_VEND_PROV_DOWNSHIFT_MASK, cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_VEND_PROV,</div><div class='add'>+			      MDIO_AN_VEND_PROV_DOWNSHIFT_EN |</div><div class='add'>+			      MDIO_AN_VEND_PROV_DOWNSHIFT_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_get_tunable(struct phy_device *phydev,</div><div class='add'>+			      struct ethtool_tunable *tuna, void *data)</div><div class='add'>+{</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_DOWNSHIFT:</div><div class='add'>+		return aqr107_get_downshift(phydev, 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 aqr107_set_tunable(struct phy_device *phydev,</div><div class='add'>+			      struct ethtool_tunable *tuna, const void *data)</div><div class='add'>+{</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_DOWNSHIFT:</div><div class='add'>+		return aqr107_set_downshift(phydev, *(const u8 *)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'>+/* If we configure settings whilst firmware is still initializing the chip,</div><div class='add'>+ * then these settings may be overwritten. Therefore make sure chip</div><div class='add'>+ * initialization has completed. Use presence of the firmware ID as</div><div class='add'>+ * indicator for initialization having completed.</div><div class='add'>+ * The chip also provides a "reset completed" bit, but it's cleared after</div><div class='add'>+ * read. Therefore function would time out if called again.</div><div class='add'>+ */</div><div class='add'>+static int aqr107_wait_reset_complete(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int val, retries = 100;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_FW_ID);</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			return val;</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (!val &amp;&amp; --retries);</div><div class='add'>+</div><div class='add'>+	return val ? 0 : -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aqr107_chip_info(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	u8 fw_major, fw_minor, build_id, prov_id;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_FW_ID);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fw_major = FIELD_GET(VEND1_GLOBAL_FW_ID_MAJOR, val);</div><div class='add'>+	fw_minor = FIELD_GET(VEND1_GLOBAL_FW_ID_MINOR, val);</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_RSVD_STAT1);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val);</div><div class='add'>+	prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val);</div><div class='add'>+</div><div class='add'>+	phydev_dbg(phydev, "FW %u.%u, Build %u, Provisioning %u\n",</div><div class='add'>+		   fw_major, fw_minor, build_id, prov_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Check that the PHY interface type is compatible */</div><div class='add'>+	if (phydev-&gt;interface != PHY_INTERFACE_MODE_SGMII &amp;&amp;</div><div class='add'>+	    phydev-&gt;interface != PHY_INTERFACE_MODE_2500BASEX &amp;&amp;</div><div class='add'>+	    phydev-&gt;interface != PHY_INTERFACE_MODE_10GKR)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = aqr107_wait_reset_complete(phydev);</div><div class='add'>+	if (!ret)</div><div class='add'>+		aqr107_chip_info(phydev);</div><div class='add'>+</div><div class='add'>+	/* ensure that a latched downshift event is cleared */</div><div class='add'>+	aqr107_read_downshift_event(phydev);</div><div class='add'>+</div><div class='add'>+	return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aqcs109_config_init(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Check that the PHY interface type is compatible */</div><div class='add'>+	if (phydev-&gt;interface != PHY_INTERFACE_MODE_SGMII &amp;&amp;</div><div class='add'>+	    phydev-&gt;interface != PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = aqr107_wait_reset_complete(phydev);</div><div class='add'>+	if (!ret)</div><div class='add'>+		aqr107_chip_info(phydev);</div><div class='add'>+</div><div class='ctx'> 	/* AQCS109 belongs to a chip family partially supporting 10G and 5G.</div><div class='ctx'> 	 * PMA speed ability bits are the same for all members of the family,</div><div class='ctx'> 	 * AQCS109 however supports speeds up to 2.5G only.</div><div class='ctx'> 	 */</div><div class='del'>-	return phy_set_max_speed(phydev, SPEED_2500);</div><div class='add'>+	ret = phy_set_max_speed(phydev, SPEED_2500);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* ensure that a latched downshift event is cleared */</div><div class='add'>+	aqr107_read_downshift_event(phydev);</div><div class='add'>+</div><div class='add'>+	return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aqr107_link_change_notify(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	u8 fw_major, fw_minor;</div><div class='add'>+	bool downshift, short_reach, afr;</div><div class='add'>+	int mode, val;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;state != PHY_RUNNING || phydev-&gt;autoneg == AUTONEG_DISABLE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_RX_LP_STAT1);</div><div class='add'>+	/* call failed or link partner is no Aquantia PHY */</div><div class='add'>+	if (val &lt; 0 || !(val &amp; MDIO_AN_RX_LP_STAT1_AQ_PHY))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	short_reach = val &amp; MDIO_AN_RX_LP_STAT1_SHORT_REACH;</div><div class='add'>+	downshift = val &amp; MDIO_AN_RX_LP_STAT1_AQRATE_DOWNSHIFT;</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_RX_LP_STAT4);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fw_major = FIELD_GET(MDIO_AN_RX_LP_STAT4_FW_MAJOR, val);</div><div class='add'>+	fw_minor = FIELD_GET(MDIO_AN_RX_LP_STAT4_FW_MINOR, val);</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_RX_VEND_STAT3);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	afr = val &amp; MDIO_AN_RX_VEND_STAT3_AFR;</div><div class='add'>+</div><div class='add'>+	phydev_dbg(phydev, "Link partner is Aquantia PHY, FW %u.%u%s%s%s\n",</div><div class='add'>+		   fw_major, fw_minor,</div><div class='add'>+		   short_reach ? ", short reach mode" : "",</div><div class='add'>+		   downshift ? ", fast-retrain downshift advertised" : "",</div><div class='add'>+		   afr ? ", fast reframe advertised" : "");</div><div class='add'>+</div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_RSVD_STAT9);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mode = FIELD_GET(VEND1_GLOBAL_RSVD_STAT9_MODE, val);</div><div class='add'>+	if (mode == VEND1_GLOBAL_RSVD_STAT9_1000BT2)</div><div class='add'>+		phydev_info(phydev, "Aquantia 1000Base-T2 mode active\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_suspend(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	return phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, MDIO_CTRL1,</div><div class='add'>+				MDIO_CTRL1_LPOWER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_resume(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	return phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, MDIO_CTRL1,</div><div class='add'>+				  MDIO_CTRL1_LPOWER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aqr107_probe(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	phydev-&gt;priv = devm_kzalloc(&amp;phydev-&gt;mdio.dev,</div><div class='add'>+				    sizeof(struct aqr107_priv), GFP_KERNEL);</div><div class='add'>+	if (!phydev-&gt;priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return aqr_hwmon_probe(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct phy_driver aqr_driver[] = {</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQ1202),</div><div class='ctx'> 	.name		= "Aquantia AQ1202",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='hunk'>@@ -201,8 +606,6 @@ static struct phy_driver aqr_driver[] = {</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQ2104),</div><div class='ctx'> 	.name		= "Aquantia AQ2104",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='hunk'>@@ -211,8 +614,6 @@ static struct phy_driver aqr_driver[] = {</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQR105),</div><div class='ctx'> 	.name		= "Aquantia AQR105",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='hunk'>@@ -221,8 +622,6 @@ static struct phy_driver aqr_driver[] = {</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQR106),</div><div class='ctx'> 	.name		= "Aquantia AQR106",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='hunk'>@@ -231,31 +630,42 @@ static struct phy_driver aqr_driver[] = {</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQR107),</div><div class='ctx'> 	.name		= "Aquantia AQR107",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='del'>-	.probe		= aqr_hwmon_probe,</div><div class='add'>+	.probe		= aqr107_probe,</div><div class='add'>+	.config_init	= aqr107_config_init,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='del'>-	.read_status	= aqr_read_status,</div><div class='add'>+	.read_status	= aqr107_read_status,</div><div class='add'>+	.get_tunable    = aqr107_get_tunable,</div><div class='add'>+	.set_tunable    = aqr107_set_tunable,</div><div class='add'>+	.suspend	= aqr107_suspend,</div><div class='add'>+	.resume		= aqr107_resume,</div><div class='add'>+	.get_sset_count	= aqr107_get_sset_count,</div><div class='add'>+	.get_strings	= aqr107_get_strings,</div><div class='add'>+	.get_stats	= aqr107_get_stats,</div><div class='add'>+	.link_change_notify = aqr107_link_change_notify,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),</div><div class='ctx'> 	.name		= "Aquantia AQCS109",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='del'>-	.probe		= aqr_hwmon_probe,</div><div class='add'>+	.probe		= aqr107_probe,</div><div class='ctx'> 	.config_init	= aqcs109_config_init,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='del'>-	.read_status	= aqr_read_status,</div><div class='add'>+	.read_status	= aqr107_read_status,</div><div class='add'>+	.get_tunable    = aqr107_get_tunable,</div><div class='add'>+	.set_tunable    = aqr107_set_tunable,</div><div class='add'>+	.suspend	= aqr107_suspend,</div><div class='add'>+	.resume		= aqr107_resume,</div><div class='add'>+	.get_sset_count	= aqr107_get_sset_count,</div><div class='add'>+	.get_strings	= aqr107_get_strings,</div><div class='add'>+	.get_stats	= aqr107_get_stats,</div><div class='add'>+	.link_change_notify = aqr107_link_change_notify,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	PHY_ID_MATCH_MODEL(PHY_ID_AQR405),</div><div class='ctx'> 	.name		= "Aquantia AQR405",</div><div class='del'>-	.aneg_done	= genphy_c45_aneg_done,</div><div class='del'>-	.get_features	= genphy_c45_pma_read_abilities,</div><div class='ctx'> 	.config_aneg    = aqr_config_aneg,</div><div class='ctx'> 	.config_intr	= aqr_config_intr,</div><div class='ctx'> 	.ack_interrupt	= aqr_ack_interrupt,</div><div class='head'>diff --git a/drivers/net/phy/asix.c b/drivers/net/phy/asix.c<br/>index f14ba5366b91..79bf7ef1fcfd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/asix.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/asix.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/asix.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/asix.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static struct phy_driver asix_driver[] = { {</div><div class='ctx'> 	.phy_id		= PHY_ID_ASIX_AX88796B,</div><div class='ctx'> 	.name		= "Asix Electronics AX88796B",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.soft_reset	= asix_soft_reset,</div><div class='ctx'> } };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c<br/>index f3e96191eb6f..222ccd9ecfce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/at803x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/at803x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/at803x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/at803x.c</a></div><div class='hunk'>@@ -324,8 +324,6 @@ static int at803x_config_intr(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> static void at803x_link_change_notify(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	struct at803x_priv *priv = phydev-&gt;priv;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Conduct a hardware reset for AT8030 every time a link loss is</div><div class='ctx'> 	 * signalled. This is necessary to circumvent a hardware bug that</div><div class='hunk'>@@ -333,25 +331,19 @@ static void at803x_link_change_notify(struct phy_device *phydev)</div><div class='ctx'> 	 * in the FIFO. In such cases, the FIFO enters an error mode it</div><div class='ctx'> 	 * cannot recover from by software.</div><div class='ctx'> 	 */</div><div class='del'>-	if (phydev-&gt;state == PHY_NOLINK) {</div><div class='del'>-		if (phydev-&gt;mdio.reset &amp;&amp; !priv-&gt;phy_reset) {</div><div class='del'>-			struct at803x_context context;</div><div class='add'>+	if (phydev-&gt;state == PHY_NOLINK &amp;&amp; phydev-&gt;mdio.reset_gpio) {</div><div class='add'>+		struct at803x_context context;</div><div class='ctx'> </div><div class='del'>-			at803x_context_save(phydev, &amp;context);</div><div class='add'>+		at803x_context_save(phydev, &amp;context);</div><div class='ctx'> </div><div class='del'>-			phy_device_reset(phydev, 1);</div><div class='del'>-			msleep(1);</div><div class='del'>-			phy_device_reset(phydev, 0);</div><div class='del'>-			msleep(1);</div><div class='add'>+		phy_device_reset(phydev, 1);</div><div class='add'>+		msleep(1);</div><div class='add'>+		phy_device_reset(phydev, 0);</div><div class='add'>+		msleep(1);</div><div class='ctx'> </div><div class='del'>-			at803x_context_restore(phydev, &amp;context);</div><div class='add'>+		at803x_context_restore(phydev, &amp;context);</div><div class='ctx'> </div><div class='del'>-			phydev_dbg(phydev, "%s(): phy was reset\n",</div><div class='del'>-				   __func__);</div><div class='del'>-			priv-&gt;phy_reset = true;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;phy_reset = false;</div><div class='add'>+		phydev_dbg(phydev, "%s(): phy was reset\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +389,7 @@ static struct phy_driver at803x_driver[] = {</div><div class='ctx'> 	.get_wol		= at803x_get_wol,</div><div class='ctx'> 	.suspend		= at803x_suspend,</div><div class='ctx'> 	.resume			= at803x_resume,</div><div class='del'>-	.features		= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.ack_interrupt		= at803x_ack_interrupt,</div><div class='ctx'> 	.config_intr		= at803x_config_intr,</div><div class='ctx'> }, {</div><div class='hunk'>@@ -412,7 +404,7 @@ static struct phy_driver at803x_driver[] = {</div><div class='ctx'> 	.get_wol		= at803x_get_wol,</div><div class='ctx'> 	.suspend		= at803x_suspend,</div><div class='ctx'> 	.resume			= at803x_resume,</div><div class='del'>-	.features		= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.ack_interrupt		= at803x_ack_interrupt,</div><div class='ctx'> 	.config_intr		= at803x_config_intr,</div><div class='ctx'> }, {</div><div class='hunk'>@@ -426,7 +418,7 @@ static struct phy_driver at803x_driver[] = {</div><div class='ctx'> 	.get_wol		= at803x_get_wol,</div><div class='ctx'> 	.suspend		= at803x_suspend,</div><div class='ctx'> 	.resume			= at803x_resume,</div><div class='del'>-	.features		= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.aneg_done		= at803x_aneg_done,</div><div class='ctx'> 	.ack_interrupt		= &amp;at803x_ack_interrupt,</div><div class='ctx'> 	.config_intr		= &amp;at803x_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/bcm-cygnus.c b/drivers/net/phy/bcm-cygnus.c<br/>index ab8e12922bf9..9ccf28b0a04d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm-cygnus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm-cygnus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm-cygnus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/bcm-cygnus.c</a></div><div class='hunk'>@@ -10,6 +10,10 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='add'>+struct bcm_omega_phy_priv {</div><div class='add'>+	u64	*stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Broadcom Cygnus Phy specific registers */</div><div class='ctx'> #define MII_BCM_CYGNUS_AFE_VDAC_ICTRL_0  0x91E5 /* VDAL Control register */</div><div class='ctx'> </div><div class='hunk'>@@ -121,21 +125,162 @@ static int bcm_cygnus_resume(struct phy_device *phydev)</div><div class='ctx'> 	return genphy_config_aneg(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bcm_omega_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	u8 count, rev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rev = phydev-&gt;phy_id &amp; ~phydev-&gt;drv-&gt;phy_id_mask;</div><div class='add'>+</div><div class='add'>+	pr_info_once("%s: %s PHY revision: 0x%02x\n",</div><div class='add'>+		     phydev_name(phydev), phydev-&gt;drv-&gt;name, rev);</div><div class='add'>+</div><div class='add'>+	/* Dummy read to a register to workaround an issue upon reset where the</div><div class='add'>+	 * internal inverter may not allow the first MDIO transaction to pass</div><div class='add'>+	 * the MDIO management controller and make us return 0xffff for such</div><div class='add'>+	 * reads.</div><div class='add'>+	 */</div><div class='add'>+	phy_read(phydev, MII_BMSR);</div><div class='add'>+</div><div class='add'>+	switch (rev) {</div><div class='add'>+	case 0x00:</div><div class='add'>+		ret = bcm_phy_28nm_a0b0_afe_config_init(phydev);</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 (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = bcm_phy_downshift_get(phydev, &amp;count);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Only enable EEE if Wirespeed/downshift is disabled */</div><div class='add'>+	ret = bcm_phy_set_eee(phydev, count == DOWNSHIFT_DEV_DISABLE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return bcm_phy_enable_apd(phydev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm_omega_resume(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Re-apply workarounds coming out suspend/resume */</div><div class='add'>+	ret = bcm_omega_config_init(phydev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* 28nm Gigabit PHYs come out of reset without any half-duplex</div><div class='add'>+	 * or "hub" compliant advertised mode, fix that. This does not</div><div class='add'>+	 * cause any problems with the PHY library since genphy_config_aneg()</div><div class='add'>+	 * gracefully handles auto-negotiated and forced modes.</div><div class='add'>+	 */</div><div class='add'>+	return genphy_config_aneg(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm_omega_get_tunable(struct phy_device *phydev,</div><div class='add'>+				 struct ethtool_tunable *tuna, void *data)</div><div class='add'>+{</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_DOWNSHIFT:</div><div class='add'>+		return bcm_phy_downshift_get(phydev, (u8 *)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 bcm_omega_set_tunable(struct phy_device *phydev,</div><div class='add'>+				 struct ethtool_tunable *tuna,</div><div class='add'>+				 const void *data)</div><div class='add'>+{</div><div class='add'>+	u8 count = *(u8 *)data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_DOWNSHIFT:</div><div class='add'>+		ret = bcm_phy_downshift_set(phydev, count);</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 (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Disable EEE advertisement since this prevents the PHY</div><div class='add'>+	 * from successfully linking up, trigger auto-negotiation restart</div><div class='add'>+	 * to let the MAC decide what to do.</div><div class='add'>+	 */</div><div class='add'>+	ret = bcm_phy_set_eee(phydev, count == DOWNSHIFT_DEV_DISABLE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return genphy_restart_aneg(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm_omega_get_phy_stats(struct phy_device *phydev,</div><div class='add'>+				    struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct bcm_omega_phy_priv *priv = phydev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	bcm_phy_get_stats(phydev, priv-&gt;stats, stats, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm_omega_probe(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	struct bcm_omega_phy_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;phydev-&gt;mdio.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'>+	phydev-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	priv-&gt;stats = devm_kcalloc(&amp;phydev-&gt;mdio.dev,</div><div class='add'>+				   bcm_phy_get_sset_count(phydev), sizeof(u64),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;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='ctx'> static struct phy_driver bcm_cygnus_phy_driver[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.phy_id        = PHY_ID_BCM_CYGNUS,</div><div class='ctx'> 	.phy_id_mask   = 0xfffffff0,</div><div class='ctx'> 	.name          = "Broadcom Cygnus PHY",</div><div class='del'>-	.features      = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init   = bcm_cygnus_config_init,</div><div class='ctx'> 	.ack_interrupt = bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr   = bcm_phy_config_intr,</div><div class='ctx'> 	.suspend       = genphy_suspend,</div><div class='ctx'> 	.resume        = bcm_cygnus_resume,</div><div class='del'>-} };</div><div class='add'>+}, {</div><div class='add'>+	.phy_id		= PHY_ID_BCM_OMEGA,</div><div class='add'>+	.phy_id_mask	= 0xfffffff0,</div><div class='add'>+	.name		= "Broadcom Omega Combo GPHY",</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='add'>+	.flags		= PHY_IS_INTERNAL,</div><div class='add'>+	.config_init	= bcm_omega_config_init,</div><div class='add'>+	.suspend	= genphy_suspend,</div><div class='add'>+	.resume		= bcm_omega_resume,</div><div class='add'>+	.get_tunable	= bcm_omega_get_tunable,</div><div class='add'>+	.set_tunable	= bcm_omega_set_tunable,</div><div class='add'>+	.get_sset_count	= bcm_phy_get_sset_count,</div><div class='add'>+	.get_strings	= bcm_phy_get_strings,</div><div class='add'>+	.get_stats	= bcm_omega_get_phy_stats,</div><div class='add'>+	.probe		= bcm_omega_probe,</div><div class='add'>+}</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct mdio_device_id __maybe_unused bcm_cygnus_phy_tbl[] = {</div><div class='ctx'> 	{ PHY_ID_BCM_CYGNUS, 0xfffffff0, },</div><div class='add'>+	{ PHY_ID_BCM_OMEGA, 0xfffffff0, },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(mdio, bcm_cygnus_phy_tbl);</div><div class='head'>diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c<br/>index a75642051b8b..e0d3310957ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm-phy-lib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm-phy-lib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm-phy-lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/bcm-phy-lib.c</a></div><div class='hunk'>@@ -371,6 +371,58 @@ void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bcm_phy_get_stats);</div><div class='ctx'> </div><div class='add'>+void bcm_phy_r_rc_cal_reset(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	/* Reset R_CAL/RC_CAL Engine */</div><div class='add'>+	bcm_phy_write_exp_sel(phydev, 0x00b0, 0x0010);</div><div class='add'>+</div><div class='add'>+	/* Disable Reset R_AL/RC_CAL Engine */</div><div class='add'>+	bcm_phy_write_exp_sel(phydev, 0x00b0, 0x0000);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bcm_phy_r_rc_cal_reset);</div><div class='add'>+</div><div class='add'>+int bcm_phy_28nm_a0b0_afe_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	/* Increase VCO range to prevent unlocking problem of PLL at low</div><div class='add'>+	 * temp</div><div class='add'>+	 */</div><div class='add'>+	bcm_phy_write_misc(phydev, PLL_PLLCTRL_1, 0x0048);</div><div class='add'>+</div><div class='add'>+	/* Change Ki to 011 */</div><div class='add'>+	bcm_phy_write_misc(phydev, PLL_PLLCTRL_2, 0x021b);</div><div class='add'>+</div><div class='add'>+	/* Disable loading of TVCO buffer to bandgap, set bandgap trim</div><div class='add'>+	 * to 111</div><div class='add'>+	 */</div><div class='add'>+	bcm_phy_write_misc(phydev, PLL_PLLCTRL_4, 0x0e20);</div><div class='add'>+</div><div class='add'>+	/* Adjust bias current trim by -3 */</div><div class='add'>+	bcm_phy_write_misc(phydev, DSP_TAP10, 0x690b);</div><div class='add'>+</div><div class='add'>+	/* Switch to CORE_BASE1E */</div><div class='add'>+	phy_write(phydev, MII_BRCM_CORE_BASE1E, 0xd);</div><div class='add'>+</div><div class='add'>+	bcm_phy_r_rc_cal_reset(phydev);</div><div class='add'>+</div><div class='add'>+	/* write AFE_RXCONFIG_0 */</div><div class='add'>+	bcm_phy_write_misc(phydev, AFE_RXCONFIG_0, 0xeb19);</div><div class='add'>+</div><div class='add'>+	/* write AFE_RXCONFIG_1 */</div><div class='add'>+	bcm_phy_write_misc(phydev, AFE_RXCONFIG_1, 0x9a3f);</div><div class='add'>+</div><div class='add'>+	/* write AFE_RX_LP_COUNTER */</div><div class='add'>+	bcm_phy_write_misc(phydev, AFE_RX_LP_COUNTER, 0x7fc0);</div><div class='add'>+</div><div class='add'>+	/* write AFE_HPF_TRIM_OTHERS */</div><div class='add'>+	bcm_phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x000b);</div><div class='add'>+</div><div class='add'>+	/* write AFTE_TX_CONFIG */</div><div class='add'>+	bcm_phy_write_misc(phydev, AFE_TX_CONFIG, 0x0800);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bcm_phy_28nm_a0b0_afe_config_init);</div><div class='add'>+</div><div class='ctx'> MODULE_DESCRIPTION("Broadcom PHY Library");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Broadcom Corporation");</div><div class='head'>diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h<br/>index 17faaefcfd60..5ecacb4e64f0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm-phy-lib.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm-phy-lib.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm-phy-lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/bcm-phy-lib.h</a></div><div class='hunk'>@@ -9,6 +9,24 @@</div><div class='ctx'> #include &lt;linux/brcmphy.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='add'>+/* 28nm only register definitions */</div><div class='add'>+#define MISC_ADDR(base, channel)	base, channel</div><div class='add'>+</div><div class='add'>+#define DSP_TAP10			MISC_ADDR(0x0a, 0)</div><div class='add'>+#define PLL_PLLCTRL_1			MISC_ADDR(0x32, 1)</div><div class='add'>+#define PLL_PLLCTRL_2			MISC_ADDR(0x32, 2)</div><div class='add'>+#define PLL_PLLCTRL_4			MISC_ADDR(0x33, 0)</div><div class='add'>+</div><div class='add'>+#define AFE_RXCONFIG_0			MISC_ADDR(0x38, 0)</div><div class='add'>+#define AFE_RXCONFIG_1			MISC_ADDR(0x38, 1)</div><div class='add'>+#define AFE_RXCONFIG_2			MISC_ADDR(0x38, 2)</div><div class='add'>+#define AFE_RX_LP_COUNTER		MISC_ADDR(0x38, 3)</div><div class='add'>+#define AFE_TX_CONFIG			MISC_ADDR(0x39, 0)</div><div class='add'>+#define AFE_VDCA_ICTRL_0		MISC_ADDR(0x39, 1)</div><div class='add'>+#define AFE_VDAC_OTHERS_0		MISC_ADDR(0x39, 3)</div><div class='add'>+#define AFE_HPF_TRIM_OTHERS		MISC_ADDR(0x3a, 0)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> int bcm_phy_write_exp(struct phy_device *phydev, u16 reg, u16 val);</div><div class='ctx'> int bcm_phy_read_exp(struct phy_device *phydev, u16 reg);</div><div class='ctx'> </div><div class='hunk'>@@ -45,5 +63,7 @@ int bcm_phy_get_sset_count(struct phy_device *phydev);</div><div class='ctx'> void bcm_phy_get_strings(struct phy_device *phydev, u8 *data);</div><div class='ctx'> void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow,</div><div class='ctx'> 		       struct ethtool_stats *stats, u64 *data);</div><div class='add'>+void bcm_phy_r_rc_cal_reset(struct phy_device *phydev);</div><div class='add'>+int bcm_phy_28nm_a0b0_afe_config_init(struct phy_device *phydev);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_BCM_PHY_LIB_H */</div><div class='head'>diff --git a/drivers/net/phy/bcm63xx.c b/drivers/net/phy/bcm63xx.c<br/>index 44e6cff419a0..23f1958ba6ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm63xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm63xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm63xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/bcm63xx.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static struct phy_driver bcm63xx_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x00406000,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffc00,</div><div class='ctx'> 	.name		= "Broadcom BCM63XX (1)",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags		= PHY_IS_INTERNAL,</div><div class='ctx'> 	.config_init	= bcm63xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='hunk'>@@ -73,7 +73,7 @@ static struct phy_driver bcm63xx_driver[] = {</div><div class='ctx'> 	/* same phy as above, with just a different OUI */</div><div class='ctx'> 	.phy_id		= 0x002bdc00,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffc00,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags		= PHY_IS_INTERNAL,</div><div class='ctx'> 	.config_init	= bcm63xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='head'>diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c<br/>index b8415f8fae14..8fc33867e524 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm7xxx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/bcm7xxx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/bcm7xxx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/bcm7xxx.c</a></div><div class='hunk'>@@ -37,77 +37,10 @@</div><div class='ctx'> #define MII_BCM7XXX_SHD_3_TL4		0x23</div><div class='ctx'> #define  MII_BCM7XXX_TL4_RST_MSK	(BIT(2) | BIT(1))</div><div class='ctx'> </div><div class='del'>-/* 28nm only register definitions */</div><div class='del'>-#define MISC_ADDR(base, channel)	base, channel</div><div class='del'>-</div><div class='del'>-#define DSP_TAP10			MISC_ADDR(0x0a, 0)</div><div class='del'>-#define PLL_PLLCTRL_1			MISC_ADDR(0x32, 1)</div><div class='del'>-#define PLL_PLLCTRL_2			MISC_ADDR(0x32, 2)</div><div class='del'>-#define PLL_PLLCTRL_4			MISC_ADDR(0x33, 0)</div><div class='del'>-</div><div class='del'>-#define AFE_RXCONFIG_0			MISC_ADDR(0x38, 0)</div><div class='del'>-#define AFE_RXCONFIG_1			MISC_ADDR(0x38, 1)</div><div class='del'>-#define AFE_RXCONFIG_2			MISC_ADDR(0x38, 2)</div><div class='del'>-#define AFE_RX_LP_COUNTER		MISC_ADDR(0x38, 3)</div><div class='del'>-#define AFE_TX_CONFIG			MISC_ADDR(0x39, 0)</div><div class='del'>-#define AFE_VDCA_ICTRL_0		MISC_ADDR(0x39, 1)</div><div class='del'>-#define AFE_VDAC_OTHERS_0		MISC_ADDR(0x39, 3)</div><div class='del'>-#define AFE_HPF_TRIM_OTHERS		MISC_ADDR(0x3a, 0)</div><div class='del'>-</div><div class='ctx'> struct bcm7xxx_phy_priv {</div><div class='ctx'> 	u64	*stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void r_rc_cal_reset(struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	/* Reset R_CAL/RC_CAL Engine */</div><div class='del'>-	bcm_phy_write_exp_sel(phydev, 0x00b0, 0x0010);</div><div class='del'>-</div><div class='del'>-	/* Disable Reset R_AL/RC_CAL Engine */</div><div class='del'>-	bcm_phy_write_exp_sel(phydev, 0x00b0, 0x0000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bcm7xxx_28nm_b0_afe_config_init(struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	/* Increase VCO range to prevent unlocking problem of PLL at low</div><div class='del'>-	 * temp</div><div class='del'>-	 */</div><div class='del'>-	bcm_phy_write_misc(phydev, PLL_PLLCTRL_1, 0x0048);</div><div class='del'>-</div><div class='del'>-	/* Change Ki to 011 */</div><div class='del'>-	bcm_phy_write_misc(phydev, PLL_PLLCTRL_2, 0x021b);</div><div class='del'>-</div><div class='del'>-	/* Disable loading of TVCO buffer to bandgap, set bandgap trim</div><div class='del'>-	 * to 111</div><div class='del'>-	 */</div><div class='del'>-	bcm_phy_write_misc(phydev, PLL_PLLCTRL_4, 0x0e20);</div><div class='del'>-</div><div class='del'>-	/* Adjust bias current trim by -3 */</div><div class='del'>-	bcm_phy_write_misc(phydev, DSP_TAP10, 0x690b);</div><div class='del'>-</div><div class='del'>-	/* Switch to CORE_BASE1E */</div><div class='del'>-	phy_write(phydev, MII_BRCM_CORE_BASE1E, 0xd);</div><div class='del'>-</div><div class='del'>-	r_rc_cal_reset(phydev);</div><div class='del'>-</div><div class='del'>-	/* write AFE_RXCONFIG_0 */</div><div class='del'>-	bcm_phy_write_misc(phydev, AFE_RXCONFIG_0, 0xeb19);</div><div class='del'>-</div><div class='del'>-	/* write AFE_RXCONFIG_1 */</div><div class='del'>-	bcm_phy_write_misc(phydev, AFE_RXCONFIG_1, 0x9a3f);</div><div class='del'>-</div><div class='del'>-	/* write AFE_RX_LP_COUNTER */</div><div class='del'>-	bcm_phy_write_misc(phydev, AFE_RX_LP_COUNTER, 0x7fc0);</div><div class='del'>-</div><div class='del'>-	/* write AFE_HPF_TRIM_OTHERS */</div><div class='del'>-	bcm_phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x000b);</div><div class='del'>-</div><div class='del'>-	/* write AFTE_TX_CONFIG */</div><div class='del'>-	bcm_phy_write_misc(phydev, AFE_TX_CONFIG, 0x0800);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bcm7xxx_28nm_d0_afe_config_init(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	/* AFE_RXCONFIG_0 */</div><div class='hunk'>@@ -143,7 +76,7 @@ static int bcm7xxx_28nm_d0_afe_config_init(struct phy_device *phydev)</div><div class='ctx'> 	bcm_phy_write_misc(phydev, DSP_TAP10, 0x011b);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset R_CAL/RC_CAL engine */</div><div class='del'>-	r_rc_cal_reset(phydev);</div><div class='add'>+	bcm_phy_r_rc_cal_reset(phydev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -171,7 +104,7 @@ static int bcm7xxx_28nm_e0_plus_afe_config_init(struct phy_device *phydev)</div><div class='ctx'> 	bcm_phy_write_misc(phydev, DSP_TAP10, 0x011b);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset R_CAL/RC_CAL engine */</div><div class='del'>-	r_rc_cal_reset(phydev);</div><div class='add'>+	bcm_phy_r_rc_cal_reset(phydev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -196,7 +129,7 @@ static int bcm7xxx_28nm_a0_patch_afe_config_init(struct phy_device *phydev)</div><div class='ctx'> 	/* Enable ffe zero detection for Vitesse interoperability */</div><div class='ctx'> 	bcm_phy_write_misc(phydev, 0x26, 0x2, 0x0015);</div><div class='ctx'> </div><div class='del'>-	r_rc_cal_reset(phydev);</div><div class='add'>+	bcm_phy_r_rc_cal_reset(phydev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -227,7 +160,7 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev)</div><div class='ctx'> 	switch (rev) {</div><div class='ctx'> 	case 0xa0:</div><div class='ctx'> 	case 0xb0:</div><div class='del'>-		ret = bcm7xxx_28nm_b0_afe_config_init(phydev);</div><div class='add'>+		ret = bcm_phy_28nm_a0b0_afe_config_init(phydev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0xd0:</div><div class='ctx'> 		ret = bcm7xxx_28nm_d0_afe_config_init(phydev);</div><div class='hunk'>@@ -605,7 +538,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)</div><div class='ctx'> 	.phy_id		= (_oui),					\</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,					\</div><div class='ctx'> 	.name		= _name,					\</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,				\</div><div class='add'>+	/* PHY_GBIT_FEATURES */						\</div><div class='ctx'> 	.flags		= PHY_IS_INTERNAL,				\</div><div class='ctx'> 	.config_init	= bcm7xxx_28nm_config_init,			\</div><div class='ctx'> 	.resume		= bcm7xxx_28nm_resume,				\</div><div class='hunk'>@@ -622,7 +555,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)</div><div class='ctx'> 	.phy_id		= (_oui),					\</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,					\</div><div class='ctx'> 	.name		= _name,					\</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,				\</div><div class='add'>+	/* PHY_BASIC_FEATURES */					\</div><div class='ctx'> 	.flags		= PHY_IS_INTERNAL,				\</div><div class='ctx'> 	.config_init	= bcm7xxx_28nm_ephy_config_init,		\</div><div class='ctx'> 	.resume		= bcm7xxx_28nm_ephy_resume,			\</div><div class='hunk'>@@ -637,7 +570,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)</div><div class='ctx'> 	.phy_id         = (_oui),					\</div><div class='ctx'> 	.phy_id_mask    = 0xfffffff0,					\</div><div class='ctx'> 	.name           = _name,					\</div><div class='del'>-	.features       = PHY_BASIC_FEATURES,				\</div><div class='add'>+	/* PHY_BASIC_FEATURES */					\</div><div class='ctx'> 	.flags          = PHY_IS_INTERNAL,				\</div><div class='ctx'> 	.config_init    = bcm7xxx_config_init,				\</div><div class='ctx'> 	.suspend        = bcm7xxx_suspend,				\</div><div class='hunk'>@@ -657,7 +590,6 @@ static struct phy_driver bcm7xxx_driver[] = {</div><div class='ctx'> 	BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),</div><div class='ctx'> 	BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),</div><div class='ctx'> 	BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),</div><div class='del'>-	BCM7XXX_28NM_GPHY(PHY_ID_BCM_OMEGA, "Broadcom Omega Combo GPHY"),</div><div class='ctx'> 	BCM7XXX_40NM_EPHY(PHY_ID_BCM7346, "Broadcom BCM7346"),</div><div class='ctx'> 	BCM7XXX_40NM_EPHY(PHY_ID_BCM7362, "Broadcom BCM7362"),</div><div class='ctx'> 	BCM7XXX_40NM_EPHY(PHY_ID_BCM7425, "Broadcom BCM7425"),</div><div class='head'>diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c<br/>index 9605d4fe540b..67fa05d67523 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/broadcom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/broadcom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/broadcom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/broadcom.c</a></div><div class='hunk'>@@ -323,6 +323,19 @@ static int bcm54xx_config_init(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> 	bcm54xx_phydsp_config(phydev);</div><div class='ctx'> </div><div class='add'>+	/* Encode link speed into LED1 and LED3 pair (green/amber).</div><div class='add'>+	 * Also flash these two LEDs on activity. This means configuring</div><div class='add'>+	 * them for MULTICOLOR and encoding link/activity into them.</div><div class='add'>+	 */</div><div class='add'>+	val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) |</div><div class='add'>+		BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1);</div><div class='add'>+	bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);</div><div class='add'>+</div><div class='add'>+	val = BCM_LED_MULTICOLOR_IN_PHASE |</div><div class='add'>+		BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |</div><div class='add'>+		BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);</div><div class='add'>+	bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -597,7 +610,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5411,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5411",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -605,7 +618,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5421,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5421",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -613,7 +626,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM54210E,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM54210E",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -621,7 +634,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5461,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5461",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -629,7 +642,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM54612E,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM54612E",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -637,7 +650,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM54616S,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM54616S",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.config_aneg	= bcm54616s_config_aneg,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='hunk'>@@ -646,7 +659,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5464,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5464",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -654,7 +667,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5481,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5481",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.config_aneg	= bcm5481_config_aneg,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='hunk'>@@ -663,7 +676,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_BCM54810,</div><div class='ctx'> 	.phy_id_mask    = 0xfffffff0,</div><div class='ctx'> 	.name           = "Broadcom BCM54810",</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = bcm54xx_config_init,</div><div class='ctx'> 	.config_aneg    = bcm5481_config_aneg,</div><div class='ctx'> 	.ack_interrupt  = bcm_phy_ack_intr,</div><div class='hunk'>@@ -672,7 +685,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5482,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5482",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm5482_config_init,</div><div class='ctx'> 	.read_status	= bcm5482_read_status,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='hunk'>@@ -681,7 +694,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM50610,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM50610",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -689,7 +702,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM50610M,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM50610M",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -697,7 +710,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM57780,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM57780",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt	= bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr	= bcm_phy_config_intr,</div><div class='hunk'>@@ -705,7 +718,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCMAC131,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCMAC131",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= brcm_fet_config_init,</div><div class='ctx'> 	.ack_interrupt	= brcm_fet_ack_interrupt,</div><div class='ctx'> 	.config_intr	= brcm_fet_config_intr,</div><div class='hunk'>@@ -713,7 +726,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_BCM5241,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5241",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= brcm_fet_config_init,</div><div class='ctx'> 	.ack_interrupt	= brcm_fet_ack_interrupt,</div><div class='ctx'> 	.config_intr	= brcm_fet_config_intr,</div><div class='hunk'>@@ -722,7 +735,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Broadcom BCM5395",</div><div class='ctx'> 	.flags		= PHY_IS_INTERNAL,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.get_sset_count	= bcm_phy_get_sset_count,</div><div class='ctx'> 	.get_strings	= bcm_phy_get_strings,</div><div class='ctx'> 	.get_stats	= bcm53xx_phy_get_stats,</div><div class='hunk'>@@ -731,7 +744,7 @@ static struct phy_driver broadcom_drivers[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_BCM89610,</div><div class='ctx'> 	.phy_id_mask    = 0xfffffff0,</div><div class='ctx'> 	.name           = "Broadcom BCM89610",</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = bcm54xx_config_init,</div><div class='ctx'> 	.ack_interrupt  = bcm_phy_ack_intr,</div><div class='ctx'> 	.config_intr    = bcm_phy_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c<br/>index 108ed24f8489..9d1612a4d7e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/cicada.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/cicada.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/cicada.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/cicada.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ static struct phy_driver cis820x_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x000fc410,</div><div class='ctx'> 	.name		= "Cicada Cis8201",</div><div class='ctx'> 	.phy_id_mask	= 0x000ffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;cis820x_config_init,</div><div class='ctx'> 	.ack_interrupt	= &amp;cis820x_ack_interrupt,</div><div class='ctx'> 	.config_intr	= &amp;cis820x_config_intr,</div><div class='hunk'>@@ -110,7 +110,7 @@ static struct phy_driver cis820x_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x000fc440,</div><div class='ctx'> 	.name		= "Cicada Cis8204",</div><div class='ctx'> 	.phy_id_mask	= 0x000fffc0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;cis820x_config_init,</div><div class='ctx'> 	.ack_interrupt	= &amp;cis820x_ack_interrupt,</div><div class='ctx'> 	.config_intr	= &amp;cis820x_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c<br/>index bf39baa7f2c8..942f277463a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/davicom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/davicom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/davicom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/davicom.c</a></div><div class='hunk'>@@ -144,7 +144,7 @@ static struct phy_driver dm91xx_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x0181b880,</div><div class='ctx'> 	.name		= "Davicom DM9161E",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= dm9161_config_init,</div><div class='ctx'> 	.config_aneg	= dm9161_config_aneg,</div><div class='ctx'> 	.ack_interrupt	= dm9161_ack_interrupt,</div><div class='hunk'>@@ -153,7 +153,7 @@ static struct phy_driver dm91xx_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x0181b8b0,</div><div class='ctx'> 	.name		= "Davicom DM9161B/C",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= dm9161_config_init,</div><div class='ctx'> 	.config_aneg	= dm9161_config_aneg,</div><div class='ctx'> 	.ack_interrupt	= dm9161_ack_interrupt,</div><div class='hunk'>@@ -162,7 +162,7 @@ static struct phy_driver dm91xx_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x0181b8a0,</div><div class='ctx'> 	.name		= "Davicom DM9161A",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= dm9161_config_init,</div><div class='ctx'> 	.config_aneg	= dm9161_config_aneg,</div><div class='ctx'> 	.ack_interrupt	= dm9161_ack_interrupt,</div><div class='hunk'>@@ -171,7 +171,7 @@ static struct phy_driver dm91xx_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x00181b80,</div><div class='ctx'> 	.name		= "Davicom DM9131",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.ack_interrupt	= dm9161_ack_interrupt,</div><div class='ctx'> 	.config_intr	= dm9161_config_intr,</div><div class='ctx'> } };</div><div class='head'>diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c<br/>index 2fe2ebaf62d1..6580094161a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83640.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83640.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83640.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/dp83640.c</a></div><div class='hunk'>@@ -1514,7 +1514,7 @@ static struct phy_driver dp83640_driver = {</div><div class='ctx'> 	.phy_id		= DP83640_PHY_ID,</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "NatSemi DP83640",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.probe		= dp83640_probe,</div><div class='ctx'> 	.remove		= dp83640_remove,</div><div class='ctx'> 	.soft_reset	= dp83640_soft_reset,</div><div class='head'>diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c<br/>index bbd8c22067f3..7ed4760fb155 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83822.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83822.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83822.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/dp83822.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DP83822_PHY_ID	        0x2000a240</div><div class='add'>+#define DP83825I_PHY_ID		0x2000a150</div><div class='add'>+</div><div class='ctx'> #define DP83822_DEVADDR		0x1f</div><div class='ctx'> </div><div class='ctx'> #define MII_DP83822_PHYSCR	0x11</div><div class='hunk'>@@ -304,26 +306,30 @@ static int dp83822_resume(struct phy_device *phydev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define DP83822_PHY_DRIVER(_id, _name)				\</div><div class='add'>+	{							\</div><div class='add'>+		PHY_ID_MATCH_MODEL(_id),			\</div><div class='add'>+		.name		= (_name),			\</div><div class='add'>+		/* PHY_BASIC_FEATURES */			\</div><div class='add'>+		.soft_reset	= dp83822_phy_reset,		\</div><div class='add'>+		.config_init	= dp83822_config_init,		\</div><div class='add'>+		.get_wol = dp83822_get_wol,			\</div><div class='add'>+		.set_wol = dp83822_set_wol,			\</div><div class='add'>+		.ack_interrupt = dp83822_ack_interrupt,		\</div><div class='add'>+		.config_intr = dp83822_config_intr,		\</div><div class='add'>+		.suspend = dp83822_suspend,			\</div><div class='add'>+		.resume = dp83822_resume,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> static struct phy_driver dp83822_driver[] = {</div><div class='del'>-	{</div><div class='del'>-		.phy_id = DP83822_PHY_ID,</div><div class='del'>-		.phy_id_mask = 0xfffffff0,</div><div class='del'>-		.name = "TI DP83822",</div><div class='del'>-		.features = PHY_BASIC_FEATURES,</div><div class='del'>-		.config_init = dp83822_config_init,</div><div class='del'>-		.soft_reset = dp83822_phy_reset,</div><div class='del'>-		.get_wol = dp83822_get_wol,</div><div class='del'>-		.set_wol = dp83822_set_wol,</div><div class='del'>-		.ack_interrupt = dp83822_ack_interrupt,</div><div class='del'>-		.config_intr = dp83822_config_intr,</div><div class='del'>-		.suspend = dp83822_suspend,</div><div class='del'>-		.resume = dp83822_resume,</div><div class='del'>-	 },</div><div class='add'>+	DP83822_PHY_DRIVER(DP83822_PHY_ID, "TI DP83822"),</div><div class='add'>+	DP83822_PHY_DRIVER(DP83825I_PHY_ID, "TI DP83825I"),</div><div class='ctx'> };</div><div class='ctx'> module_phy_driver(dp83822_driver);</div><div class='ctx'> </div><div class='ctx'> static struct mdio_device_id __maybe_unused dp83822_tbl[] = {</div><div class='ctx'> 	{ DP83822_PHY_ID, 0xfffffff0 },</div><div class='add'>+	{ DP83825I_PHY_ID, 0xfffffff0 },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(mdio, dp83822_tbl);</div><div class='head'>diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c<br/>index f55dc907c2f3..6f9bc7d91f17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83848.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83848.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83848.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/dp83848.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl);</div><div class='ctx'> 		.phy_id		= _id,				\</div><div class='ctx'> 		.phy_id_mask	= 0xfffffff0,			\</div><div class='ctx'> 		.name		= _name,			\</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,		\</div><div class='add'>+		/* PHY_BASIC_FEATURES */			\</div><div class='ctx'> 								\</div><div class='ctx'> 		.soft_reset	= genphy_soft_reset,		\</div><div class='ctx'> 		.config_init	= _config_init,			\</div><div class='head'>diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c<br/>index 8448d01819ef..fd35131a0c39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83867.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83867.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83867.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/dp83867.c</a></div><div class='hunk'>@@ -315,7 +315,7 @@ static struct phy_driver dp83867_driver[] = {</div><div class='ctx'> 		.phy_id		= DP83867_PHY_ID,</div><div class='ctx'> 		.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 		.name		= "TI DP83867",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 		.config_init	= dp83867_config_init,</div><div class='ctx'> 		.soft_reset	= dp83867_phy_reset,</div><div class='head'>diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c<br/>index e9704af1d239..ac27da16824d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83tc811.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/dp83tc811.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/dp83tc811.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/dp83tc811.c</a></div><div class='hunk'>@@ -338,7 +338,7 @@ static struct phy_driver dp83811_driver[] = {</div><div class='ctx'> 		.phy_id = DP83TC811_PHY_ID,</div><div class='ctx'> 		.phy_id_mask = 0xfffffff0,</div><div class='ctx'> 		.name = "TI DP83TC811",</div><div class='del'>-		.features = PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.config_init = dp83811_config_init,</div><div class='ctx'> 		.config_aneg = dp83811_config_aneg,</div><div class='ctx'> 		.soft_reset = dp83811_phy_reset,</div><div class='head'>diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c<br/>index 2aa367c04a8e..09e07b902d3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/et1011c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/et1011c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/et1011c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/et1011c.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static struct phy_driver et1011c_driver[] = { {</div><div class='ctx'> 	.phy_id		= 0x0282f014,</div><div class='ctx'> 	.name		= "ET1011C",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_aneg	= et1011c_config_aneg,</div><div class='ctx'> 	.read_status	= et1011c_read_status,</div><div class='ctx'> } };</div><div class='head'>diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c<br/>index 1acd8bfdb3bc..3ffe46df249e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/fixed_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/fixed_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/fixed_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/fixed_phy.c</a></div><div class='hunk'>@@ -301,7 +301,7 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,</div><div class='ctx'> 				 phy-&gt;supported);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	linkmode_copy(phy-&gt;advertising, phy-&gt;supported);</div><div class='add'>+	phy_advertise_supported(phy);</div><div class='ctx'> </div><div class='ctx'> 	ret = phy_device_register(phy);</div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c<br/>index ebef8354bc81..d6e8516cd146 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/icplus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/icplus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/icplus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/icplus.c</a></div><div class='hunk'>@@ -311,7 +311,7 @@ static struct phy_driver icplus_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x02430d80,</div><div class='ctx'> 	.name		= "ICPlus IP175C",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;ip175c_config_init,</div><div class='ctx'> 	.config_aneg	= &amp;ip175c_config_aneg,</div><div class='ctx'> 	.read_status	= &amp;ip175c_read_status,</div><div class='hunk'>@@ -321,7 +321,7 @@ static struct phy_driver icplus_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x02430d90,</div><div class='ctx'> 	.name		= "ICPlus IP1001",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;ip1001_config_init,</div><div class='ctx'> 	.suspend	= genphy_suspend,</div><div class='ctx'> 	.resume		= genphy_resume,</div><div class='hunk'>@@ -329,7 +329,7 @@ static struct phy_driver icplus_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x02430c54,</div><div class='ctx'> 	.name		= "ICPlus IP101A/G",</div><div class='ctx'> 	.phy_id_mask	= 0x0ffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.probe		= ip101a_g_probe,</div><div class='ctx'> 	.config_intr	= ip101a_g_config_intr,</div><div class='ctx'> 	.did_interrupt	= ip101a_g_did_interrupt,</div><div class='head'>diff --git a/drivers/net/phy/intel-xway.c b/drivers/net/phy/intel-xway.c<br/>index 02d9713318b6..b7875b36097f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/intel-xway.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/intel-xway.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/intel-xway.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/intel-xway.c</a></div><div class='hunk'>@@ -232,7 +232,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY11G_1_3,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY11G (PEF 7071/PEF 7072) v1.3",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.config_aneg	= xway_gphy14_config_aneg,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='hunk'>@@ -244,7 +244,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY22F_1_3,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY22F (PEF 7061) v1.3",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.config_aneg	= xway_gphy14_config_aneg,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='hunk'>@@ -256,7 +256,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY11G_1_4,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY11G (PEF 7071/PEF 7072) v1.4",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.config_aneg	= xway_gphy14_config_aneg,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='hunk'>@@ -268,7 +268,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY22F_1_4,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY22F (PEF 7061) v1.4",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.config_aneg	= xway_gphy14_config_aneg,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='hunk'>@@ -280,7 +280,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY11G_1_5,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY11G (PEF 7071/PEF 7072) v1.5 / v1.6",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='ctx'> 		.did_interrupt	= xway_gphy_did_interrupt,</div><div class='hunk'>@@ -291,7 +291,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY22F_1_5,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY22F (PEF 7061) v1.5 / v1.6",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='ctx'> 		.did_interrupt	= xway_gphy_did_interrupt,</div><div class='hunk'>@@ -302,7 +302,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY11G_VR9_1_1,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY11G (xRX v1.1 integrated)",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='ctx'> 		.did_interrupt	= xway_gphy_did_interrupt,</div><div class='hunk'>@@ -313,7 +313,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY22F_VR9_1_1,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY22F (xRX v1.1 integrated)",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='ctx'> 		.did_interrupt	= xway_gphy_did_interrupt,</div><div class='hunk'>@@ -324,7 +324,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY11G_VR9_1_2,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY11G (xRX v1.2 integrated)",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='ctx'> 		.did_interrupt	= xway_gphy_did_interrupt,</div><div class='hunk'>@@ -335,7 +335,7 @@ static struct phy_driver xway_gphy[] = {</div><div class='ctx'> 		.phy_id		= PHY_ID_PHY22F_VR9_1_2,</div><div class='ctx'> 		.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 		.name		= "Intel XWAY PHY22F (xRX v1.2 integrated)",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.config_init	= xway_gphy_config_init,</div><div class='ctx'> 		.ack_interrupt	= xway_gphy_ack_interrupt,</div><div class='ctx'> 		.did_interrupt	= xway_gphy_did_interrupt,</div><div class='head'>diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c<br/>index a93d673baf35..314486288119 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/lxt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/lxt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/lxt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/lxt.c</a></div><div class='hunk'>@@ -251,7 +251,7 @@ static struct phy_driver lxt97x_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x78100000,</div><div class='ctx'> 	.name		= "LXT970",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= lxt970_config_init,</div><div class='ctx'> 	.ack_interrupt	= lxt970_ack_interrupt,</div><div class='ctx'> 	.config_intr	= lxt970_config_intr,</div><div class='hunk'>@@ -259,14 +259,14 @@ static struct phy_driver lxt97x_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x001378e0,</div><div class='ctx'> 	.name		= "LXT971",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.ack_interrupt	= lxt971_ack_interrupt,</div><div class='ctx'> 	.config_intr	= lxt971_config_intr,</div><div class='ctx'> }, {</div><div class='ctx'> 	.phy_id		= 0x00137a10,</div><div class='ctx'> 	.name		= "LXT973-A2",</div><div class='ctx'> 	.phy_id_mask	= 0xffffffff,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> 	.probe		= lxt973_probe,</div><div class='ctx'> 	.config_aneg	= lxt973_config_aneg,</div><div class='hunk'>@@ -275,7 +275,7 @@ static struct phy_driver lxt97x_driver[] = {</div><div class='ctx'> 	.phy_id		= 0x00137a10,</div><div class='ctx'> 	.name		= "LXT973",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> 	.probe		= lxt973_probe,</div><div class='ctx'> 	.config_aneg	= lxt973_config_aneg,</div><div class='head'>diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c<br/>index 3ccba37bd6dd..a7796134e3be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/marvell.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/marvell.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/marvell.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/marvell.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/marvell_phy.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -91,6 +92,14 @@</div><div class='ctx'> #define MII_88E1510_TEMP_SENSOR		0x1b</div><div class='ctx'> #define MII_88E1510_TEMP_SENSOR_MASK	0xff</div><div class='ctx'> </div><div class='add'>+#define MII_88E1540_COPPER_CTRL3	0x1a</div><div class='add'>+#define MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_MASK	GENMASK(11, 10)</div><div class='add'>+#define MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_00MS	0</div><div class='add'>+#define MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_10MS	1</div><div class='add'>+#define MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_20MS	2</div><div class='add'>+#define MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_40MS	3</div><div class='add'>+#define MII_88E1540_COPPER_CTRL3_FAST_LINK_DOWN		BIT(9)</div><div class='add'>+</div><div class='ctx'> #define MII_88E6390_MISC_TEST		0x1b</div><div class='ctx'> #define MII_88E6390_MISC_TEST_SAMPLE_1S		0</div><div class='ctx'> #define MII_88E6390_MISC_TEST_SAMPLE_10MS	BIT(14)</div><div class='hunk'>@@ -128,6 +137,7 @@</div><div class='ctx'> #define MII_PHY_LED_CTRL	        16</div><div class='ctx'> #define MII_88E1121_PHY_LED_DEF		0x0030</div><div class='ctx'> #define MII_88E1510_PHY_LED_DEF		0x1177</div><div class='add'>+#define MII_88E1510_PHY_LED0_LINK_LED1_ACTIVE	0x1040</div><div class='ctx'> </div><div class='ctx'> #define MII_M1011_PHY_STATUS		0x11</div><div class='ctx'> #define MII_M1011_PHY_STATUS_1000	0x8000</div><div class='hunk'>@@ -624,7 +634,10 @@ static void marvell_config_led(struct phy_device *phydev)</div><div class='ctx'> 	 * LED[2] .. Blink, Activity</div><div class='ctx'> 	 */</div><div class='ctx'> 	case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1510):</div><div class='del'>-		def_config = MII_88E1510_PHY_LED_DEF;</div><div class='add'>+		if (phydev-&gt;dev_flags &amp; MARVELL_PHY_LED0_LINK_LED1_ACTIVE)</div><div class='add'>+			def_config = MII_88E1510_PHY_LED0_LINK_LED1_ACTIVE;</div><div class='add'>+		else</div><div class='add'>+			def_config = MII_88E1510_PHY_LED_DEF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1025,6 +1038,101 @@ static int m88e1145_config_init(struct phy_device *phydev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = phy_read(phydev, MII_88E1540_COPPER_CTRL3);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; MII_88E1540_COPPER_CTRL3_FAST_LINK_DOWN)) {</div><div class='add'>+		*msecs = ETHTOOL_PHY_FAST_LINK_DOWN_OFF;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_GET(MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_MASK, val);</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_00MS:</div><div class='add'>+		*msecs = 0;</div><div class='add'>+		break;</div><div class='add'>+	case MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_10MS:</div><div class='add'>+		*msecs = 10;</div><div class='add'>+		break;</div><div class='add'>+	case MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_20MS:</div><div class='add'>+		*msecs = 20;</div><div class='add'>+		break;</div><div class='add'>+	case MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_40MS:</div><div class='add'>+		*msecs = 40;</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 m88e1540_set_fld(struct phy_device *phydev, const u8 *msecs)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_eee eee;</div><div class='add'>+	int val, ret;</div><div class='add'>+</div><div class='add'>+	if (*msecs == ETHTOOL_PHY_FAST_LINK_DOWN_OFF)</div><div class='add'>+		return phy_clear_bits(phydev, MII_88E1540_COPPER_CTRL3,</div><div class='add'>+				      MII_88E1540_COPPER_CTRL3_FAST_LINK_DOWN);</div><div class='add'>+</div><div class='add'>+	/* According to the Marvell data sheet EEE must be disabled for</div><div class='add'>+	 * Fast Link Down detection to work properly</div><div class='add'>+	 */</div><div class='add'>+	ret = phy_ethtool_get_eee(phydev, &amp;eee);</div><div class='add'>+	if (!ret &amp;&amp; eee.eee_enabled) {</div><div class='add'>+		phydev_warn(phydev, "Fast Link Down detection requires EEE to be disabled!\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*msecs &lt;= 5)</div><div class='add'>+		val = MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_00MS;</div><div class='add'>+	else if (*msecs &lt;= 15)</div><div class='add'>+		val = MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_10MS;</div><div class='add'>+	else if (*msecs &lt;= 30)</div><div class='add'>+		val = MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_20MS;</div><div class='add'>+	else</div><div class='add'>+		val = MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_40MS;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_MASK, val);</div><div class='add'>+</div><div class='add'>+	ret = phy_modify(phydev, MII_88E1540_COPPER_CTRL3,</div><div class='add'>+			 MII_88E1540_COPPER_CTRL3_LINK_DOWN_DELAY_MASK, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return phy_set_bits(phydev, MII_88E1540_COPPER_CTRL3,</div><div class='add'>+			    MII_88E1540_COPPER_CTRL3_FAST_LINK_DOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m88e1540_get_tunable(struct phy_device *phydev,</div><div class='add'>+				struct ethtool_tunable *tuna, void *data)</div><div class='add'>+{</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_FAST_LINK_DOWN:</div><div class='add'>+		return m88e1540_get_fld(phydev, 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 m88e1540_set_tunable(struct phy_device *phydev,</div><div class='add'>+				struct ethtool_tunable *tuna, const void *data)</div><div class='add'>+{</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_FAST_LINK_DOWN:</div><div class='add'>+		return m88e1540_set_fld(phydev, 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'> /* The VOD can be out of specification on link up. Poke an</div><div class='ctx'>  * undocumented register, in an undocumented page, with a magic value</div><div class='ctx'>  * to fix this.</div><div class='hunk'>@@ -1489,9 +1597,10 @@ static int marvell_get_sset_count(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> static void marvell_get_strings(struct phy_device *phydev, u8 *data)</div><div class='ctx'> {</div><div class='add'>+	int count = marvell_get_sset_count(phydev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(marvell_hw_stats); i++) {</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		strlcpy(data + i * ETH_GSTRING_LEN,</div><div class='ctx'> 			marvell_hw_stats[i].string, ETH_GSTRING_LEN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1519,9 +1628,10 @@ static u64 marvell_get_stat(struct phy_device *phydev, int i)</div><div class='ctx'> static void marvell_get_stats(struct phy_device *phydev,</div><div class='ctx'> 			      struct ethtool_stats *stats, u64 *data)</div><div class='ctx'> {</div><div class='add'>+	int count = marvell_get_sset_count(phydev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(marvell_hw_stats); i++)</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='ctx'> 		data[i] = marvell_get_stat(phydev, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2022,7 +2132,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1101,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1101",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;marvell_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1101_config_aneg,</div><div class='hunk'>@@ -2040,7 +2150,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1112,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1112",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1111_config_init,</div><div class='ctx'> 		.config_aneg = &amp;marvell_config_aneg,</div><div class='hunk'>@@ -2058,7 +2168,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1111,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1111",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1111_config_init,</div><div class='ctx'> 		.config_aneg = &amp;marvell_config_aneg,</div><div class='hunk'>@@ -2077,7 +2187,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1118,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1118",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1118_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1118_config_aneg,</div><div class='hunk'>@@ -2095,7 +2205,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1121R,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1121R",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = &amp;m88e1121_probe,</div><div class='ctx'> 		.config_init = &amp;marvell_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1121_config_aneg,</div><div class='hunk'>@@ -2115,7 +2225,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1318S,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1318S",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1318_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1318_config_aneg,</div><div class='hunk'>@@ -2137,7 +2247,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1145,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1145",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1145_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1101_config_aneg,</div><div class='hunk'>@@ -2156,7 +2266,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1149R,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1149R",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1149_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1118_config_aneg,</div><div class='hunk'>@@ -2174,7 +2284,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1240,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1240",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1111_config_init,</div><div class='ctx'> 		.config_aneg = &amp;marvell_config_aneg,</div><div class='hunk'>@@ -2192,7 +2302,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1116R,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1116R",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e1116r_config_init,</div><div class='ctx'> 		.ack_interrupt = &amp;marvell_ack_interrupt,</div><div class='hunk'>@@ -2232,7 +2342,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1540,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1540",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = m88e1510_probe,</div><div class='ctx'> 		.config_init = &amp;marvell_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1510_config_aneg,</div><div class='hunk'>@@ -2247,13 +2357,15 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.get_sset_count = marvell_get_sset_count,</div><div class='ctx'> 		.get_strings = marvell_get_strings,</div><div class='ctx'> 		.get_stats = marvell_get_stats,</div><div class='add'>+		.get_tunable = m88e1540_get_tunable,</div><div class='add'>+		.set_tunable = m88e1540_set_tunable,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E1545,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E1545",</div><div class='ctx'> 		.probe = m88e1510_probe,</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.config_init = &amp;marvell_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e1510_config_aneg,</div><div class='ctx'> 		.read_status = &amp;marvell_read_status,</div><div class='hunk'>@@ -2272,7 +2384,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E3016,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E3016",</div><div class='del'>-		.features = PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.probe = marvell_probe,</div><div class='ctx'> 		.config_init = &amp;m88e3016_config_init,</div><div class='ctx'> 		.aneg_done = &amp;marvell_aneg_done,</div><div class='hunk'>@@ -2292,7 +2404,7 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.phy_id = MARVELL_PHY_ID_88E6390,</div><div class='ctx'> 		.phy_id_mask = MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name = "Marvell 88E6390",</div><div class='del'>-		.features = PHY_GBIT_FEATURES,</div><div class='add'>+		/* PHY_GBIT_FEATURES */</div><div class='ctx'> 		.probe = m88e6390_probe,</div><div class='ctx'> 		.config_init = &amp;marvell_config_init,</div><div class='ctx'> 		.config_aneg = &amp;m88e6390_config_aneg,</div><div class='hunk'>@@ -2307,6 +2419,8 @@ static struct phy_driver marvell_drivers[] = {</div><div class='ctx'> 		.get_sset_count = marvell_get_sset_count,</div><div class='ctx'> 		.get_strings = marvell_get_strings,</div><div class='ctx'> 		.get_stats = marvell_get_stats,</div><div class='add'>+		.get_tunable = m88e1540_get_tunable,</div><div class='add'>+		.set_tunable = m88e1540_set_tunable,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c<br/>index 100b401b1f4a..238a20e13d6a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/marvell10g.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/marvell10g.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/marvell10g.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/marvell10g.c</a></div><div class='hunk'>@@ -48,6 +48,8 @@ enum {</div><div class='ctx'> 	MV_AN_STAT1000		= 0x8001, /* 1000base-T status register */</div><div class='ctx'> </div><div class='ctx'> 	/* Vendor2 MMD registers */</div><div class='add'>+	MV_V2_PORT_CTRL		= 0xf001,</div><div class='add'>+	MV_V2_PORT_CTRL_PWRDOWN = 0x0800,</div><div class='ctx'> 	MV_V2_TEMP_CTRL		= 0xf08a,</div><div class='ctx'> 	MV_V2_TEMP_CTRL_MASK	= 0xc000,</div><div class='ctx'> 	MV_V2_TEMP_CTRL_SAMPLE	= 0x0000,</div><div class='hunk'>@@ -226,11 +228,19 @@ static int mv3310_probe(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> static int mv3310_suspend(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,</div><div class='add'>+				MV_V2_PORT_CTRL_PWRDOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv3310_resume(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,</div><div class='add'>+				 MV_V2_PORT_CTRL_PWRDOWN);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	return mv3310_hwmon_config(phydev, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -472,8 +482,9 @@ static struct phy_driver mv3310_drivers[] = {</div><div class='ctx'> 		.phy_id		= MARVELL_PHY_ID_88E2110,</div><div class='ctx'> 		.phy_id_mask	= MARVELL_PHY_ID_MASK,</div><div class='ctx'> 		.name		= "mv88x2110",</div><div class='del'>-		.get_features	= genphy_c45_pma_read_abilities,</div><div class='ctx'> 		.probe		= mv3310_probe,</div><div class='add'>+		.suspend	= mv3310_suspend,</div><div class='add'>+		.resume		= mv3310_resume,</div><div class='ctx'> 		.soft_reset	= genphy_no_soft_reset,</div><div class='ctx'> 		.config_init	= mv3310_config_init,</div><div class='ctx'> 		.config_aneg	= mv3310_config_aneg,</div><div class='head'>diff --git a/drivers/net/phy/mdio-bcm-unimac.c b/drivers/net/phy/mdio-bcm-unimac.c<br/>index 8295bc7c8c20..4a28fb29adaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio-bcm-unimac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio-bcm-unimac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio-bcm-unimac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/mdio-bcm-unimac.c</a></div><div class='hunk'>@@ -92,10 +92,7 @@ static int unimac_mdio_poll(void *wait_func_data)</div><div class='ctx'> 		usleep_range(1000, 2000);</div><div class='ctx'> 	} while (--timeout);</div><div class='ctx'> </div><div class='del'>-	if (!timeout)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg)</div><div class='hunk'>@@ -292,7 +289,7 @@ static int unimac_mdio_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, priv);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "Broadcom UniMAC MDIO bus at 0x%p\n", priv-&gt;base);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Broadcom UniMAC MDIO bus\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/mdio-mux-meson-g12a.c b/drivers/net/phy/mdio-mux-meson-g12a.c<br/>new file mode 100644<br/>index 000000000000..6fa29ea8e2a3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio-mux-meson-g12a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/mdio-mux-meson-g12a.c</a></div><div class='hunk'>@@ -0,0 +1,380 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019 Baylibre, SAS.</div><div class='add'>+ * Author: Jerome Brunet &lt;jbrunet@baylibre.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/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/device.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/mdio-mux.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/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#define ETH_PLL_STS		0x40</div><div class='add'>+#define ETH_PLL_CTL0		0x44</div><div class='add'>+#define  PLL_CTL0_LOCK_DIG	BIT(30)</div><div class='add'>+#define  PLL_CTL0_RST		BIT(29)</div><div class='add'>+#define  PLL_CTL0_EN		BIT(28)</div><div class='add'>+#define  PLL_CTL0_SEL		BIT(23)</div><div class='add'>+#define  PLL_CTL0_N		GENMASK(14, 10)</div><div class='add'>+#define  PLL_CTL0_M		GENMASK(8, 0)</div><div class='add'>+#define  PLL_LOCK_TIMEOUT	1000000</div><div class='add'>+#define  PLL_MUX_NUM_PARENT	2</div><div class='add'>+#define ETH_PLL_CTL1		0x48</div><div class='add'>+#define ETH_PLL_CTL2		0x4c</div><div class='add'>+#define ETH_PLL_CTL3		0x50</div><div class='add'>+#define ETH_PLL_CTL4		0x54</div><div class='add'>+#define ETH_PLL_CTL5		0x58</div><div class='add'>+#define ETH_PLL_CTL6		0x5c</div><div class='add'>+#define ETH_PLL_CTL7		0x60</div><div class='add'>+</div><div class='add'>+#define ETH_PHY_CNTL0		0x80</div><div class='add'>+#define   EPHY_G12A_ID		0x33000180</div><div class='add'>+#define ETH_PHY_CNTL1		0x84</div><div class='add'>+#define  PHY_CNTL1_ST_MODE	GENMASK(2, 0)</div><div class='add'>+#define  PHY_CNTL1_ST_PHYADD	GENMASK(7, 3)</div><div class='add'>+#define   EPHY_DFLT_ADD		8</div><div class='add'>+#define  PHY_CNTL1_MII_MODE	GENMASK(15, 14)</div><div class='add'>+#define   EPHY_MODE_RMII	0x1</div><div class='add'>+#define  PHY_CNTL1_CLK_EN	BIT(16)</div><div class='add'>+#define  PHY_CNTL1_CLKFREQ	BIT(17)</div><div class='add'>+#define  PHY_CNTL1_PHY_ENB	BIT(18)</div><div class='add'>+#define ETH_PHY_CNTL2		0x88</div><div class='add'>+#define  PHY_CNTL2_USE_INTERNAL	BIT(5)</div><div class='add'>+#define  PHY_CNTL2_SMI_SRC_MAC	BIT(6)</div><div class='add'>+#define  PHY_CNTL2_RX_CLK_EPHY	BIT(9)</div><div class='add'>+</div><div class='add'>+#define MESON_G12A_MDIO_EXTERNAL_ID 0</div><div class='add'>+#define MESON_G12A_MDIO_INTERNAL_ID 1</div><div class='add'>+</div><div class='add'>+struct g12a_mdio_mux {</div><div class='add'>+	bool pll_is_enabled;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	void *mux_handle;</div><div class='add'>+	struct clk *pclk;</div><div class='add'>+	struct clk *pll;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct g12a_ephy_pll {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define g12a_ephy_pll_to_dev(_hw)			\</div><div class='add'>+	container_of(_hw, struct g12a_ephy_pll, hw)</div><div class='add'>+</div><div class='add'>+static unsigned long g12a_ephy_pll_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					       unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct g12a_ephy_pll *pll = g12a_ephy_pll_to_dev(hw);</div><div class='add'>+	u32 val, m, n;</div><div class='add'>+</div><div class='add'>+	val = readl(pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+	m = FIELD_GET(PLL_CTL0_M, val);</div><div class='add'>+	n = FIELD_GET(PLL_CTL0_N, val);</div><div class='add'>+</div><div class='add'>+	return parent_rate * m / n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g12a_ephy_pll_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct g12a_ephy_pll *pll = g12a_ephy_pll_to_dev(hw);</div><div class='add'>+	u32 val = readl(pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+</div><div class='add'>+	/* Apply both enable an reset */</div><div class='add'>+	val |= PLL_CTL0_RST | PLL_CTL0_EN;</div><div class='add'>+	writel(val, pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+</div><div class='add'>+	/* Clear the reset to let PLL lock */</div><div class='add'>+	val &amp;= ~PLL_CTL0_RST;</div><div class='add'>+	writel(val, pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+</div><div class='add'>+	/* Poll on the digital lock instead of the usual analog lock</div><div class='add'>+	 * This is done because bit 31 is unreliable on some SoC. Bit</div><div class='add'>+	 * 31 may indicate that the PLL is not lock eventhough the clock</div><div class='add'>+	 * is actually running</div><div class='add'>+	 */</div><div class='add'>+	return readl_poll_timeout(pll-&gt;base + ETH_PLL_CTL0, val,</div><div class='add'>+				  val &amp; PLL_CTL0_LOCK_DIG, 0, PLL_LOCK_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void g12a_ephy_pll_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct g12a_ephy_pll *pll = g12a_ephy_pll_to_dev(hw);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl(pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+	val &amp;= ~PLL_CTL0_EN;</div><div class='add'>+	val |= PLL_CTL0_RST;</div><div class='add'>+	writel(val, pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g12a_ephy_pll_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct g12a_ephy_pll *pll = g12a_ephy_pll_to_dev(hw);</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = readl(pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+</div><div class='add'>+	return (val &amp; PLL_CTL0_LOCK_DIG) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void g12a_ephy_pll_init(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct g12a_ephy_pll *pll = g12a_ephy_pll_to_dev(hw);</div><div class='add'>+</div><div class='add'>+	/* Apply PLL HW settings */</div><div class='add'>+	writel(0x29c0040a, pll-&gt;base + ETH_PLL_CTL0);</div><div class='add'>+	writel(0x927e0000, pll-&gt;base + ETH_PLL_CTL1);</div><div class='add'>+	writel(0xac5f49e5, pll-&gt;base + ETH_PLL_CTL2);</div><div class='add'>+	writel(0x00000000, pll-&gt;base + ETH_PLL_CTL3);</div><div class='add'>+	writel(0x00000000, pll-&gt;base + ETH_PLL_CTL4);</div><div class='add'>+	writel(0x20200000, pll-&gt;base + ETH_PLL_CTL5);</div><div class='add'>+	writel(0x0000c002, pll-&gt;base + ETH_PLL_CTL6);</div><div class='add'>+	writel(0x00000023, pll-&gt;base + ETH_PLL_CTL7);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops g12a_ephy_pll_ops = {</div><div class='add'>+	.recalc_rate	= g12a_ephy_pll_recalc_rate,</div><div class='add'>+	.is_enabled	= g12a_ephy_pll_is_enabled,</div><div class='add'>+	.enable		= g12a_ephy_pll_enable,</div><div class='add'>+	.disable	= g12a_ephy_pll_disable,</div><div class='add'>+	.init		= g12a_ephy_pll_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Enable the phy clock */</div><div class='add'>+	if (!priv-&gt;pll_is_enabled) {</div><div class='add'>+		ret = clk_prepare_enable(priv-&gt;pll);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;pll_is_enabled = true;</div><div class='add'>+</div><div class='add'>+	/* Initialize ephy control */</div><div class='add'>+	writel(EPHY_G12A_ID, priv-&gt;regs + ETH_PHY_CNTL0);</div><div class='add'>+	writel(FIELD_PREP(PHY_CNTL1_ST_MODE, 3) |</div><div class='add'>+	       FIELD_PREP(PHY_CNTL1_ST_PHYADD, EPHY_DFLT_ADD) |</div><div class='add'>+	       FIELD_PREP(PHY_CNTL1_MII_MODE, EPHY_MODE_RMII) |</div><div class='add'>+	       PHY_CNTL1_CLK_EN |</div><div class='add'>+	       PHY_CNTL1_CLKFREQ |</div><div class='add'>+	       PHY_CNTL1_PHY_ENB,</div><div class='add'>+	       priv-&gt;regs + ETH_PHY_CNTL1);</div><div class='add'>+	writel(PHY_CNTL2_USE_INTERNAL |</div><div class='add'>+	       PHY_CNTL2_SMI_SRC_MAC |</div><div class='add'>+	       PHY_CNTL2_RX_CLK_EPHY,</div><div class='add'>+	       priv-&gt;regs + ETH_PHY_CNTL2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g12a_enable_external_mdio(struct g12a_mdio_mux *priv)</div><div class='add'>+{</div><div class='add'>+	/* Reset the mdio bus mux */</div><div class='add'>+	writel_relaxed(0x0, priv-&gt;regs + ETH_PHY_CNTL2);</div><div class='add'>+</div><div class='add'>+	/* Disable the phy clock if enabled */</div><div class='add'>+	if (priv-&gt;pll_is_enabled) {</div><div class='add'>+		clk_disable_unprepare(priv-&gt;pll);</div><div class='add'>+		priv-&gt;pll_is_enabled = false;</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 g12a_mdio_switch_fn(int current_child, int desired_child,</div><div class='add'>+			       void *data)</div><div class='add'>+{</div><div class='add'>+	struct g12a_mdio_mux *priv = dev_get_drvdata(data);</div><div class='add'>+</div><div class='add'>+	if (current_child == desired_child)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (desired_child) {</div><div class='add'>+	case MESON_G12A_MDIO_EXTERNAL_ID:</div><div class='add'>+		return g12a_enable_external_mdio(priv);</div><div class='add'>+	case MESON_G12A_MDIO_INTERNAL_ID:</div><div class='add'>+		return g12a_enable_internal_mdio(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 const struct of_device_id g12a_mdio_mux_match[] = {</div><div class='add'>+	{ .compatible = "amlogic,g12a-mdio-mux", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, g12a_mdio_mux_match);</div><div class='add'>+</div><div class='add'>+static int g12a_ephy_glue_clk_register(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct g12a_mdio_mux *priv = dev_get_drvdata(dev);</div><div class='add'>+	const char *parent_names[PLL_MUX_NUM_PARENT];</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	struct g12a_ephy_pll *pll;</div><div class='add'>+	struct clk_mux *mux;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	char *name;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* get the mux parents */</div><div class='add'>+	for (i = 0; i &lt; PLL_MUX_NUM_PARENT; i++) {</div><div class='add'>+		char in_name[8];</div><div class='add'>+</div><div class='add'>+		snprintf(in_name, sizeof(in_name), "clkin%d", i);</div><div class='add'>+		clk = devm_clk_get(dev, in_name);</div><div class='add'>+		if (IS_ERR(clk)) {</div><div class='add'>+			if (PTR_ERR(clk) != -EPROBE_DEFER)</div><div class='add'>+				dev_err(dev, "Missing clock %s\n", in_name);</div><div class='add'>+			return PTR_ERR(clk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		parent_names[i] = __clk_get_name(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* create the input mux */</div><div class='add'>+	mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL);</div><div class='add'>+	if (!mux)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	name = kasprintf(GFP_KERNEL, "%s#mux", dev_name(dev));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;clk_mux_ro_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	init.parent_names = parent_names;</div><div class='add'>+	init.num_parents = PLL_MUX_NUM_PARENT;</div><div class='add'>+</div><div class='add'>+	mux-&gt;reg = priv-&gt;regs + ETH_PLL_CTL0;</div><div class='add'>+	mux-&gt;shift = __ffs(PLL_CTL0_SEL);</div><div class='add'>+	mux-&gt;mask = PLL_CTL0_SEL &gt;&gt; mux-&gt;shift;</div><div class='add'>+	mux-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_register(dev, &amp;mux-&gt;hw);</div><div class='add'>+	kfree(name);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		dev_err(dev, "failed to register input mux\n");</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* create the pll */</div><div class='add'>+	pll = devm_kzalloc(dev, sizeof(*pll), GFP_KERNEL);</div><div class='add'>+	if (!pll)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	name = kasprintf(GFP_KERNEL, "%s#pll", dev_name(dev));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;g12a_ephy_pll_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	parent_names[0] = __clk_get_name(clk);</div><div class='add'>+	init.parent_names = parent_names;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+</div><div class='add'>+	pll-&gt;base = priv-&gt;regs;</div><div class='add'>+	pll-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_register(dev, &amp;pll-&gt;hw);</div><div class='add'>+	kfree(name);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		dev_err(dev, "failed to register input mux\n");</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;pll = clk;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g12a_mdio_mux_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 g12a_mdio_mux *priv;</div><div class='add'>+	struct resource *res;</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'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	priv-&gt;regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(priv-&gt;regs))</div><div class='add'>+		return PTR_ERR(priv-&gt;regs);</div><div class='add'>+</div><div class='add'>+	priv-&gt;pclk = devm_clk_get(dev, "pclk");</div><div class='add'>+	if (IS_ERR(priv-&gt;pclk)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;pclk);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(dev, "failed to get peripheral clock\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure the device registers are clocked */</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;pclk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to enable peripheral clock");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register PLL in CCF */</div><div class='add'>+	ret = g12a_ephy_glue_clk_register(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = mdio_mux_init(dev, dev-&gt;of_node, g12a_mdio_switch_fn,</div><div class='add'>+			    &amp;priv-&gt;mux_handle, dev, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(dev, "mdio multiplexer init failed: %d", ret);</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'>+	clk_disable_unprepare(priv-&gt;pclk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g12a_mdio_mux_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct g12a_mdio_mux *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	mdio_mux_uninit(priv-&gt;mux_handle);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;pll_is_enabled)</div><div class='add'>+		clk_disable_unprepare(priv-&gt;pll);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;pclk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver g12a_mdio_mux_driver = {</div><div class='add'>+	.probe		= g12a_mdio_mux_probe,</div><div class='add'>+	.remove		= g12a_mdio_mux_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "g12a-mdio_mux",</div><div class='add'>+		.of_match_table = g12a_mdio_mux_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(g12a_mdio_mux_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Amlogic G12a MDIO multiplexer driver");</div><div class='add'>+MODULE_AUTHOR("Jerome Brunet &lt;jbrunet@baylibre.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c<br/>index 4be4cc09eb90..bd04fe762056 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio_bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio_bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/mdio_bus.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/of_gpio.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;linux/reset.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/mm.h&gt;</div><div class='hunk'>@@ -55,10 +56,25 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev)</div><div class='ctx'> 			return PTR_ERR(gpiod);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mdiodev-&gt;reset = gpiod;</div><div class='add'>+	mdiodev-&gt;reset_gpio = gpiod;</div><div class='ctx'> </div><div class='del'>-	/* Assert the reset signal again */</div><div class='del'>-	mdio_device_reset(mdiodev, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mdiobus_register_reset(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct reset_control *reset = NULL;</div><div class='add'>+</div><div class='add'>+	if (mdiodev-&gt;dev.of_node)</div><div class='add'>+		reset = devm_reset_control_get_exclusive(&amp;mdiodev-&gt;dev,</div><div class='add'>+							 "phy");</div><div class='add'>+	if (PTR_ERR(reset) == -ENOENT ||</div><div class='add'>+	    PTR_ERR(reset) == -ENOTSUPP)</div><div class='add'>+		reset = NULL;</div><div class='add'>+	else if (IS_ERR(reset))</div><div class='add'>+		return PTR_ERR(reset);</div><div class='add'>+</div><div class='add'>+	mdiodev-&gt;reset_ctrl = reset;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -74,6 +90,13 @@ int mdiobus_register_device(struct mdio_device *mdiodev)</div><div class='ctx'> 		err = mdiobus_register_gpiod(mdiodev);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+</div><div class='add'>+		err = mdiobus_register_reset(mdiodev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* Assert the reset signal */</div><div class='add'>+		mdio_device_reset(mdiodev, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mdiodev-&gt;bus-&gt;mdio_map[mdiodev-&gt;addr] = mdiodev;</div><div class='hunk'>@@ -446,8 +469,8 @@ void mdiobus_unregister(struct mii_bus *bus)</div><div class='ctx'> 		if (!mdiodev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (mdiodev-&gt;reset)</div><div class='del'>-			gpiod_put(mdiodev-&gt;reset);</div><div class='add'>+		if (mdiodev-&gt;reset_gpio)</div><div class='add'>+			gpiod_put(mdiodev-&gt;reset_gpio);</div><div class='ctx'> </div><div class='ctx'> 		mdiodev-&gt;device_remove(mdiodev);</div><div class='ctx'> 		mdiodev-&gt;device_free(mdiodev);</div><div class='head'>diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c<br/>index 887076292e50..e282600bd83e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mdio_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mdio_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/mdio_device.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='hunk'>@@ -116,10 +117,18 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int d;</div><div class='ctx'> </div><div class='del'>-	if (!mdiodev-&gt;reset)</div><div class='add'>+	if (!mdiodev-&gt;reset_gpio &amp;&amp; !mdiodev-&gt;reset_ctrl)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	gpiod_set_value(mdiodev-&gt;reset, value);</div><div class='add'>+	if (mdiodev-&gt;reset_gpio)</div><div class='add'>+		gpiod_set_value(mdiodev-&gt;reset_gpio, value);</div><div class='add'>+</div><div class='add'>+	if (mdiodev-&gt;reset_ctrl) {</div><div class='add'>+		if (value)</div><div class='add'>+			reset_control_assert(mdiodev-&gt;reset_ctrl);</div><div class='add'>+		else</div><div class='add'>+			reset_control_deassert(mdiodev-&gt;reset_ctrl);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	d = value ? mdiodev-&gt;reset_assert_delay : mdiodev-&gt;reset_deassert_delay;</div><div class='ctx'> 	if (d)</div><div class='head'>diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c<br/>index a238388eb1a5..fa80d6dce8ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/meson-gxl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/meson-gxl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/meson-gxl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/meson-gxl.c</a></div><div class='hunk'>@@ -201,6 +201,7 @@ static int meson_gxl_ack_interrupt(struct phy_device *phydev)</div><div class='ctx'> static int meson_gxl_config_intr(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (phydev-&gt;interrupts == PHY_INTERRUPT_ENABLED) {</div><div class='ctx'> 		val = INTSRC_ANEG_PR</div><div class='hunk'>@@ -213,29 +214,43 @@ static int meson_gxl_config_intr(struct phy_device *phydev)</div><div class='ctx'> 		val = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Ack any pending IRQ */</div><div class='add'>+	ret = meson_gxl_ack_interrupt(phydev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	return phy_write(phydev, INTSRC_MASK, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct phy_driver meson_gxl_phy[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.phy_id		= 0x01814400,</div><div class='del'>-		.phy_id_mask	= 0xfffffff0,</div><div class='add'>+		PHY_ID_MATCH_EXACT(0x01814400),</div><div class='ctx'> 		.name		= "Meson GXL Internal PHY",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='ctx'> 		.flags		= PHY_IS_INTERNAL,</div><div class='ctx'> 		.soft_reset     = genphy_soft_reset,</div><div class='ctx'> 		.config_init	= meson_gxl_config_init,</div><div class='del'>-		.aneg_done      = genphy_aneg_done,</div><div class='ctx'> 		.read_status	= meson_gxl_read_status,</div><div class='ctx'> 		.ack_interrupt	= meson_gxl_ack_interrupt,</div><div class='ctx'> 		.config_intr	= meson_gxl_config_intr,</div><div class='ctx'> 		.suspend        = genphy_suspend,</div><div class='ctx'> 		.resume         = genphy_resume,</div><div class='add'>+	}, {</div><div class='add'>+		PHY_ID_MATCH_EXACT(0x01803301),</div><div class='add'>+		.name		= "Meson G12A Internal PHY",</div><div class='add'>+		/* PHY_BASIC_FEATURES */</div><div class='add'>+		.flags		= PHY_IS_INTERNAL,</div><div class='add'>+		.soft_reset     = genphy_soft_reset,</div><div class='add'>+		.ack_interrupt	= meson_gxl_ack_interrupt,</div><div class='add'>+		.config_intr	= meson_gxl_config_intr,</div><div class='add'>+		.suspend        = genphy_suspend,</div><div class='add'>+		.resume         = genphy_resume,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mdio_device_id __maybe_unused meson_gxl_tbl[] = {</div><div class='del'>-	{ 0x01814400, 0xfffffff0 },</div><div class='add'>+	{ PHY_ID_MATCH_VENDOR(0x01814400) },</div><div class='add'>+	{ PHY_ID_MATCH_VENDOR(0x01803301) },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c<br/>index 352da24f1f33..3c8186f269f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/micrel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/micrel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/micrel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/micrel.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Operation Mode Strap Override */</div><div class='ctx'> #define MII_KSZPHY_OMSO				0x16</div><div class='add'>+#define KSZPHY_OMSO_FACTORY_TEST		BIT(15)</div><div class='ctx'> #define KSZPHY_OMSO_B_CAST_OFF			BIT(9)</div><div class='ctx'> #define KSZPHY_OMSO_NAND_TREE_ON		BIT(5)</div><div class='ctx'> #define KSZPHY_OMSO_RMII_OVERRIDE		BIT(1)</div><div class='hunk'>@@ -340,6 +341,18 @@ static int ksz8041_config_aneg(struct phy_device *phydev)</div><div class='ctx'> 	return genphy_config_aneg(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ksz8081_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	/* KSZPHY_OMSO_FACTORY_TEST is set at de-assertion of the reset line</div><div class='add'>+	 * based on the RXER (KSZ8081RNA/RND) or TXC (KSZ8081MNX/RNB) pin. If a</div><div class='add'>+	 * pull-down is missing, the factory test mode should be cleared by</div><div class='add'>+	 * manually writing a 0.</div><div class='add'>+	 */</div><div class='add'>+	phy_clear_bits(phydev, MII_KSZPHY_OMSO, KSZPHY_OMSO_FACTORY_TEST);</div><div class='add'>+</div><div class='add'>+	return kszphy_config_init(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ksz8061_config_init(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -738,6 +751,31 @@ static int ksz8873mll_read_status(struct phy_device *phydev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ksz9031_get_features(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = genphy_read_abilities(phydev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Silicon Errata Sheet (DS80000691D or DS80000692D):</div><div class='add'>+	 * Whenever the device's Asymmetric Pause capability is set to 1,</div><div class='add'>+	 * link-up may fail after a link-up to link-down transition.</div><div class='add'>+	 *</div><div class='add'>+	 * Workaround:</div><div class='add'>+	 * Do not enable the Asymmetric Pause capability bit.</div><div class='add'>+	 */</div><div class='add'>+	linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev-&gt;supported);</div><div class='add'>+</div><div class='add'>+	/* We force setting the Pause capability as the core will force the</div><div class='add'>+	 * Asymmetric Pause capability to 1 otherwise.</div><div class='add'>+	 */</div><div class='add'>+	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev-&gt;supported);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ksz9031_read_status(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -908,7 +946,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KS8737,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KS8737",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ks8737_type,</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='ctx'> 	.ack_interrupt	= kszphy_ack_interrupt,</div><div class='hunk'>@@ -919,7 +957,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8021,</div><div class='ctx'> 	.phy_id_mask	= 0x00ffffff,</div><div class='ctx'> 	.name		= "Micrel KSZ8021 or KSZ8031",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8021_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='hunk'>@@ -934,7 +972,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8031,</div><div class='ctx'> 	.phy_id_mask	= 0x00ffffff,</div><div class='ctx'> 	.name		= "Micrel KSZ8031",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8021_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='hunk'>@@ -949,7 +987,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8041,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ8041",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8041_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= ksz8041_config_init,</div><div class='hunk'>@@ -965,7 +1003,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8041RNLI,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ8041RNLI",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8041_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='hunk'>@@ -980,7 +1018,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8051,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ8051",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8051_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='hunk'>@@ -995,7 +1033,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8001,</div><div class='ctx'> 	.name		= "Micrel KSZ8001 or KS8721",</div><div class='ctx'> 	.phy_id_mask	= 0x00fffffc,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8041_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='hunk'>@@ -1010,10 +1048,10 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8081,</div><div class='ctx'> 	.name		= "Micrel KSZ8081 or KSZ8091",</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz8081_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='del'>-	.config_init	= kszphy_config_init,</div><div class='add'>+	.config_init	= ksz8081_config_init,</div><div class='ctx'> 	.ack_interrupt	= kszphy_ack_interrupt,</div><div class='ctx'> 	.config_intr	= kszphy_config_intr,</div><div class='ctx'> 	.get_sset_count = kszphy_get_sset_count,</div><div class='hunk'>@@ -1025,7 +1063,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8061,</div><div class='ctx'> 	.name		= "Micrel KSZ8061",</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= ksz8061_config_init,</div><div class='ctx'> 	.ack_interrupt	= kszphy_ack_interrupt,</div><div class='ctx'> 	.config_intr	= kszphy_config_intr,</div><div class='hunk'>@@ -1035,7 +1073,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ9021,</div><div class='ctx'> 	.phy_id_mask	= 0x000ffffe,</div><div class='ctx'> 	.name		= "Micrel KSZ9021 Gigabit PHY",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz9021_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= ksz9021_config_init,</div><div class='hunk'>@@ -1052,9 +1090,9 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ9031,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ9031 Gigabit PHY",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 	.driver_data	= &amp;ksz9021_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='add'>+	.get_features	= ksz9031_get_features,</div><div class='ctx'> 	.config_init	= ksz9031_config_init,</div><div class='ctx'> 	.soft_reset	= genphy_soft_reset,</div><div class='ctx'> 	.read_status	= ksz9031_read_status,</div><div class='hunk'>@@ -1069,7 +1107,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ9131,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Microchip KSZ9131 Gigabit PHY",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.driver_data	= &amp;ksz9021_type,</div><div class='ctx'> 	.probe		= kszphy_probe,</div><div class='ctx'> 	.config_init	= ksz9131_config_init,</div><div class='hunk'>@@ -1085,7 +1123,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8873MLL,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ8873MLL Switch",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='ctx'> 	.config_aneg	= ksz8873mll_config_aneg,</div><div class='ctx'> 	.read_status	= ksz8873mll_read_status,</div><div class='hunk'>@@ -1095,7 +1133,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ886X,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ886X Switch",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='ctx'> 	.suspend	= genphy_suspend,</div><div class='ctx'> 	.resume		= genphy_resume,</div><div class='hunk'>@@ -1103,7 +1141,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ8795,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Micrel KSZ8795",</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='ctx'> 	.config_aneg	= ksz8873mll_config_aneg,</div><div class='ctx'> 	.read_status	= ksz8873mll_read_status,</div><div class='hunk'>@@ -1113,7 +1151,7 @@ static struct phy_driver ksphy_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_KSZ9477,</div><div class='ctx'> 	.phy_id_mask	= MICREL_PHY_ID_MASK,</div><div class='ctx'> 	.name		= "Microchip KSZ9477",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= kszphy_config_init,</div><div class='ctx'> 	.suspend	= genphy_suspend,</div><div class='ctx'> 	.resume		= genphy_resume,</div><div class='head'>diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c<br/>index c6cbb3aa8ae0..eb1b3287fe08 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/microchip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/microchip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/microchip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/microchip.c</a></div><div class='hunk'>@@ -333,7 +333,7 @@ static struct phy_driver microchip_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "Microchip LAN88xx",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 	.probe		= lan88xx_probe,</div><div class='ctx'> 	.remove		= lan88xx_remove,</div><div class='head'>diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c<br/>index db50efb30df5..28676af97b42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mscc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/mscc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/mscc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/mscc.c</a></div><div class='hunk'>@@ -85,12 +85,49 @@ enum rgmii_rx_clock_delay {</div><div class='ctx'> #define LED_MODE_SEL_MASK(x)		  (GENMASK(3, 0) &lt;&lt; LED_MODE_SEL_POS(x))</div><div class='ctx'> #define LED_MODE_SEL(x, mode)		  (((mode) &lt;&lt; LED_MODE_SEL_POS(x)) &amp; LED_MODE_SEL_MASK(x))</div><div class='ctx'> </div><div class='add'>+#define MSCC_EXT_PAGE_CSR_CNTL_17	  17</div><div class='add'>+#define MSCC_EXT_PAGE_CSR_CNTL_18	  18</div><div class='add'>+</div><div class='add'>+#define MSCC_EXT_PAGE_CSR_CNTL_19	  19</div><div class='add'>+#define MSCC_PHY_CSR_CNTL_19_REG_ADDR(x)  (x)</div><div class='add'>+#define MSCC_PHY_CSR_CNTL_19_TARGET(x)	  ((x) &lt;&lt; 12)</div><div class='add'>+#define MSCC_PHY_CSR_CNTL_19_READ	  BIT(14)</div><div class='add'>+#define MSCC_PHY_CSR_CNTL_19_CMD	  BIT(15)</div><div class='add'>+</div><div class='add'>+#define MSCC_EXT_PAGE_CSR_CNTL_20	  20</div><div class='add'>+#define MSCC_PHY_CSR_CNTL_20_TARGET(x)	  (x)</div><div class='add'>+</div><div class='add'>+#define PHY_MCB_TARGET			  0x07</div><div class='add'>+#define PHY_MCB_S6G_WRITE		  BIT(31)</div><div class='add'>+#define PHY_MCB_S6G_READ		  BIT(30)</div><div class='add'>+</div><div class='add'>+#define PHY_S6G_PLL5G_CFG0		  0x06</div><div class='add'>+#define PHY_S6G_LCPLL_CFG		  0x11</div><div class='add'>+#define PHY_S6G_PLL_CFG			  0x2b</div><div class='add'>+#define PHY_S6G_COMMON_CFG		  0x2c</div><div class='add'>+#define PHY_S6G_GPC_CFG			  0x2e</div><div class='add'>+#define PHY_S6G_MISC_CFG		  0x3b</div><div class='add'>+#define PHY_MCB_S6G_CFG			  0x3f</div><div class='add'>+#define PHY_S6G_DFT_CFG2		  0x3e</div><div class='add'>+#define PHY_S6G_PLL_STATUS		  0x31</div><div class='add'>+#define PHY_S6G_IB_STATUS0		  0x2f</div><div class='add'>+</div><div class='add'>+#define PHY_S6G_SYS_RST_POS		  31</div><div class='add'>+#define PHY_S6G_ENA_LANE_POS		  18</div><div class='add'>+#define PHY_S6G_ENA_LOOP_POS		  8</div><div class='add'>+#define PHY_S6G_QRATE_POS		  6</div><div class='add'>+#define PHY_S6G_IF_MODE_POS		  4</div><div class='add'>+#define PHY_S6G_PLL_ENA_OFFS_POS	  21</div><div class='add'>+#define PHY_S6G_PLL_FSM_CTRL_DATA_POS	  8</div><div class='add'>+#define PHY_S6G_PLL_FSM_ENA_POS		  7</div><div class='add'>+</div><div class='ctx'> #define MSCC_EXT_PAGE_ACCESS		  31</div><div class='ctx'> #define MSCC_PHY_PAGE_STANDARD		  0x0000 /* Standard registers */</div><div class='ctx'> #define MSCC_PHY_PAGE_EXTENDED		  0x0001 /* Extended registers */</div><div class='ctx'> #define MSCC_PHY_PAGE_EXTENDED_2	  0x0002 /* Extended reg - page 2 */</div><div class='ctx'> #define MSCC_PHY_PAGE_EXTENDED_3	  0x0003 /* Extended reg - page 3 */</div><div class='ctx'> #define MSCC_PHY_PAGE_EXTENDED_4	  0x0004 /* Extended reg - page 4 */</div><div class='add'>+#define MSCC_PHY_PAGE_CSR_CNTL		  MSCC_PHY_PAGE_EXTENDED_4</div><div class='ctx'> /* Extended reg - GPIO; this is a bank of registers that are shared for all PHYs</div><div class='ctx'>  * in the same package.</div><div class='ctx'>  */</div><div class='hunk'>@@ -216,6 +253,7 @@ enum rgmii_rx_clock_delay {</div><div class='ctx'> #define MSCC_PHY_TR_MSB			  18</div><div class='ctx'> </div><div class='ctx'> /* Microsemi PHY ID's */</div><div class='add'>+#define PHY_ID_VSC8514			  0x00070670</div><div class='ctx'> #define PHY_ID_VSC8530			  0x00070560</div><div class='ctx'> #define PHY_ID_VSC8531			  0x00070570</div><div class='ctx'> #define PHY_ID_VSC8540			  0x00070760</div><div class='hunk'>@@ -1742,6 +1780,386 @@ static int vsc8584_did_interrupt(struct phy_device *phydev)</div><div class='ctx'> 	return (rc &lt; 0) ? 0 : rc &amp; MII_VSC85XX_INT_MASK_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vsc8514_config_pre_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	/* These are the settings to override the silicon default</div><div class='add'>+	 * values to handle hardware performance of PHY. They</div><div class='add'>+	 * are set at Power-On state and remain until PHY Reset.</div><div class='add'>+	 */</div><div class='add'>+	const struct reg_val pre_init1[] = {</div><div class='add'>+		{0x0f90, 0x00688980},</div><div class='add'>+		{0x0786, 0x00000003},</div><div class='add'>+		{0x07fa, 0x0050100f},</div><div class='add'>+		{0x0f82, 0x0012b002},</div><div class='add'>+		{0x1686, 0x00000004},</div><div class='add'>+		{0x168c, 0x00d2c46f},</div><div class='add'>+		{0x17a2, 0x00000620},</div><div class='add'>+		{0x16a0, 0x00eeffdd},</div><div class='add'>+		{0x16a6, 0x00071448},</div><div class='add'>+		{0x16a4, 0x0013132f},</div><div class='add'>+		{0x16a8, 0x00000000},</div><div class='add'>+		{0x0ffc, 0x00c0a028},</div><div class='add'>+		{0x0fe8, 0x0091b06c},</div><div class='add'>+		{0x0fea, 0x00041600},</div><div class='add'>+		{0x0f80, 0x00fffaff},</div><div class='add'>+		{0x0fec, 0x00901809},</div><div class='add'>+		{0x0ffe, 0x00b01007},</div><div class='add'>+		{0x16b0, 0x00eeff00},</div><div class='add'>+		{0x16b2, 0x00007000},</div><div class='add'>+		{0x16b4, 0x00000814},</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);</div><div class='add'>+</div><div class='add'>+	/* all writes below are broadcasted to all PHYs in the same package */</div><div class='add'>+	reg = phy_base_read(phydev, MSCC_PHY_EXT_CNTL_STATUS);</div><div class='add'>+	reg |= SMI_BROADCAST_WR_EN;</div><div class='add'>+	phy_base_write(phydev, MSCC_PHY_EXT_CNTL_STATUS, reg);</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TEST);</div><div class='add'>+</div><div class='add'>+	reg = phy_base_read(phydev, MSCC_PHY_TEST_PAGE_8);</div><div class='add'>+	reg |= BIT(15);</div><div class='add'>+	phy_base_write(phydev, MSCC_PHY_TEST_PAGE_8, reg);</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TR);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pre_init1); i++)</div><div class='add'>+		vsc8584_csr_write(phydev, pre_init1[i].reg, pre_init1[i].val);</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TEST);</div><div class='add'>+</div><div class='add'>+	reg = phy_base_read(phydev, MSCC_PHY_TEST_PAGE_8);</div><div class='add'>+	reg &amp;= ~BIT(15);</div><div class='add'>+	phy_base_write(phydev, MSCC_PHY_TEST_PAGE_8, reg);</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);</div><div class='add'>+</div><div class='add'>+	reg = phy_base_read(phydev, MSCC_PHY_EXT_CNTL_STATUS);</div><div class='add'>+	reg &amp;= ~SMI_BROADCAST_WR_EN;</div><div class='add'>+	phy_base_write(phydev, MSCC_PHY_EXT_CNTL_STATUS, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 vsc85xx_csr_ctrl_phy_read(struct phy_device *phydev,</div><div class='add'>+				     u32 target, u32 reg)</div><div class='add'>+{</div><div class='add'>+	unsigned long deadline;</div><div class='add'>+	u32 val, val_l, val_h;</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_CSR_CNTL);</div><div class='add'>+</div><div class='add'>+	/* CSR registers are grouped under different Target IDs.</div><div class='add'>+	 * 6-bit Target_ID is split between MSCC_EXT_PAGE_CSR_CNTL_20 and</div><div class='add'>+	 * MSCC_EXT_PAGE_CSR_CNTL_19 registers.</div><div class='add'>+	 * Target_ID[5:2] maps to bits[3:0] of MSCC_EXT_PAGE_CSR_CNTL_20</div><div class='add'>+	 * and Target_ID[1:0] maps to bits[13:12] of MSCC_EXT_PAGE_CSR_CNTL_19.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Setup the Target ID */</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_CSR_CNTL_20,</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_20_TARGET(target &gt;&gt; 2));</div><div class='add'>+</div><div class='add'>+	/* Trigger CSR Action - Read into the CSR's */</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_CSR_CNTL_19,</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_19_CMD | MSCC_PHY_CSR_CNTL_19_READ |</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_19_REG_ADDR(reg) |</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_19_TARGET(target &amp; 0x3));</div><div class='add'>+</div><div class='add'>+	/* Wait for register access*/</div><div class='add'>+	deadline = jiffies + msecs_to_jiffies(PROC_CMD_NCOMPLETED_TIMEOUT_MS);</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+		val = phy_base_read(phydev, MSCC_EXT_PAGE_CSR_CNTL_19);</div><div class='add'>+	} while (time_before(jiffies, deadline) &amp;&amp;</div><div class='add'>+		!(val &amp; MSCC_PHY_CSR_CNTL_19_CMD));</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; MSCC_PHY_CSR_CNTL_19_CMD))</div><div class='add'>+		return 0xffffffff;</div><div class='add'>+</div><div class='add'>+	/* Read the Least Significant Word (LSW) (17) */</div><div class='add'>+	val_l = phy_base_read(phydev, MSCC_EXT_PAGE_CSR_CNTL_17);</div><div class='add'>+</div><div class='add'>+	/* Read the Most Significant Word (MSW) (18) */</div><div class='add'>+	val_h = phy_base_read(phydev, MSCC_EXT_PAGE_CSR_CNTL_18);</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,</div><div class='add'>+		       MSCC_PHY_PAGE_STANDARD);</div><div class='add'>+</div><div class='add'>+	return (val_h &lt;&lt; 16) | val_l;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc85xx_csr_ctrl_phy_write(struct phy_device *phydev,</div><div class='add'>+				      u32 target, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	unsigned long deadline;</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_CSR_CNTL);</div><div class='add'>+</div><div class='add'>+	/* CSR registers are grouped under different Target IDs.</div><div class='add'>+	 * 6-bit Target_ID is split between MSCC_EXT_PAGE_CSR_CNTL_20 and</div><div class='add'>+	 * MSCC_EXT_PAGE_CSR_CNTL_19 registers.</div><div class='add'>+	 * Target_ID[5:2] maps to bits[3:0] of MSCC_EXT_PAGE_CSR_CNTL_20</div><div class='add'>+	 * and Target_ID[1:0] maps to bits[13:12] of MSCC_EXT_PAGE_CSR_CNTL_19.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Setup the Target ID */</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_CSR_CNTL_20,</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_20_TARGET(target &gt;&gt; 2));</div><div class='add'>+</div><div class='add'>+	/* Write the Least Significant Word (LSW) (17) */</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_CSR_CNTL_17, (u16)val);</div><div class='add'>+</div><div class='add'>+	/* Write the Most Significant Word (MSW) (18) */</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_CSR_CNTL_18, (u16)(val &gt;&gt; 16));</div><div class='add'>+</div><div class='add'>+	/* Trigger CSR Action - Write into the CSR's */</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_CSR_CNTL_19,</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_19_CMD |</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_19_REG_ADDR(reg) |</div><div class='add'>+		       MSCC_PHY_CSR_CNTL_19_TARGET(target &amp; 0x3));</div><div class='add'>+</div><div class='add'>+	/* Wait for register access */</div><div class='add'>+	deadline = jiffies + msecs_to_jiffies(PROC_CMD_NCOMPLETED_TIMEOUT_MS);</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+		val = phy_base_read(phydev, MSCC_EXT_PAGE_CSR_CNTL_19);</div><div class='add'>+	} while (time_before(jiffies, deadline) &amp;&amp;</div><div class='add'>+		 !(val &amp; MSCC_PHY_CSR_CNTL_19_CMD));</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; MSCC_PHY_CSR_CNTL_19_CMD))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,</div><div class='add'>+		       MSCC_PHY_PAGE_STANDARD);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __phy_write_mcb_s6g(struct phy_device *phydev, u32 reg, u8 mcb,</div><div class='add'>+			       u32 op)</div><div class='add'>+{</div><div class='add'>+	unsigned long deadline;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET, reg,</div><div class='add'>+					 op | (1 &lt;&lt; mcb));</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	deadline = jiffies + msecs_to_jiffies(PROC_CMD_NCOMPLETED_TIMEOUT_MS);</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+		val = vsc85xx_csr_ctrl_phy_read(phydev, PHY_MCB_TARGET, reg);</div><div class='add'>+</div><div class='add'>+		if (val == 0xffffffff)</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+	} while (time_before(jiffies, deadline) &amp;&amp; (val &amp; op));</div><div class='add'>+</div><div class='add'>+	if (val &amp; op)</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'>+/* Trigger a read to the spcified MCB */</div><div class='add'>+static int phy_update_mcb_s6g(struct phy_device *phydev, u32 reg, u8 mcb)</div><div class='add'>+{</div><div class='add'>+	return __phy_write_mcb_s6g(phydev, reg, mcb, PHY_MCB_S6G_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Trigger a write to the spcified MCB */</div><div class='add'>+static int phy_commit_mcb_s6g(struct phy_device *phydev, u32 reg, u8 mcb)</div><div class='add'>+{</div><div class='add'>+	return __phy_write_mcb_s6g(phydev, reg, mcb, PHY_MCB_S6G_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc8514_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	struct vsc8531_private *vsc8531 = phydev-&gt;priv;</div><div class='add'>+	unsigned long deadline;</div><div class='add'>+	u16 val, addr;</div><div class='add'>+	int ret, i;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	phydev-&gt;mdix_ctrl = ETH_TP_MDI_AUTO;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	__phy_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED);</div><div class='add'>+</div><div class='add'>+	addr = __phy_read(phydev, MSCC_PHY_EXT_PHY_CNTL_4);</div><div class='add'>+	addr &gt;&gt;= PHY_CNTL_4_ADDR_POS;</div><div class='add'>+</div><div class='add'>+	val = __phy_read(phydev, MSCC_PHY_ACTIPHY_CNTL);</div><div class='add'>+</div><div class='add'>+	if (val &amp; PHY_ADDR_REVERSED)</div><div class='add'>+		vsc8531-&gt;base_addr = phydev-&gt;mdio.addr + addr;</div><div class='add'>+	else</div><div class='add'>+		vsc8531-&gt;base_addr = phydev-&gt;mdio.addr - addr;</div><div class='add'>+</div><div class='add'>+	/* Some parts of the init sequence are identical for every PHY in the</div><div class='add'>+	 * package. Some parts are modifying the GPIO register bank which is a</div><div class='add'>+	 * set of registers that are affecting all PHYs, a few resetting the</div><div class='add'>+	 * microprocessor common to all PHYs.</div><div class='add'>+	 * All PHYs' interrupts mask register has to be zeroed before enabling</div><div class='add'>+	 * any PHY's interrupt in this register.</div><div class='add'>+	 * For all these reasons, we need to do the init sequence once and only</div><div class='add'>+	 * once whatever is the first PHY in the package that is initialized and</div><div class='add'>+	 * do the correct init sequence for all PHYs that are package-critical</div><div class='add'>+	 * in this pre-init function.</div><div class='add'>+	 */</div><div class='add'>+	if (!vsc8584_is_pkg_init(phydev, val &amp; PHY_ADDR_REVERSED ? 1 : 0))</div><div class='add'>+		vsc8514_config_pre_init(phydev);</div><div class='add'>+</div><div class='add'>+	vsc8531-&gt;pkg_init = true;</div><div class='add'>+</div><div class='add'>+	phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,</div><div class='add'>+		       MSCC_PHY_PAGE_EXTENDED_GPIO);</div><div class='add'>+</div><div class='add'>+	val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK);</div><div class='add'>+</div><div class='add'>+	val &amp;= ~MAC_CFG_MASK;</div><div class='add'>+	val |= MAC_CFG_QSGMII;</div><div class='add'>+	ret = phy_base_write(phydev, MSCC_PHY_MAC_CFG_FASTLINK, val);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = vsc8584_cmd(phydev,</div><div class='add'>+			  PROC_CMD_MCB_ACCESS_MAC_CONF |</div><div class='add'>+			  PROC_CMD_RST_CONF_PORT |</div><div class='add'>+			  PROC_CMD_READ_MOD_WRITE_PORT | PROC_CMD_QSGMII_MAC);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* 6g mcb */</div><div class='add'>+	phy_update_mcb_s6g(phydev, PHY_MCB_S6G_CFG, 0);</div><div class='add'>+	/* lcpll mcb */</div><div class='add'>+	phy_update_mcb_s6g(phydev, PHY_S6G_LCPLL_CFG, 0);</div><div class='add'>+	/* pll5gcfg0 */</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET,</div><div class='add'>+					 PHY_S6G_PLL5G_CFG0, 0x7036f145);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	phy_commit_mcb_s6g(phydev, PHY_S6G_LCPLL_CFG, 0);</div><div class='add'>+	/* pllcfg */</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET,</div><div class='add'>+					 PHY_S6G_PLL_CFG,</div><div class='add'>+					 (3 &lt;&lt; PHY_S6G_PLL_ENA_OFFS_POS) |</div><div class='add'>+					 (120 &lt;&lt; PHY_S6G_PLL_FSM_CTRL_DATA_POS)</div><div class='add'>+					 | (0 &lt;&lt; PHY_S6G_PLL_FSM_ENA_POS));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* commoncfg */</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET,</div><div class='add'>+					 PHY_S6G_COMMON_CFG,</div><div class='add'>+					 (0 &lt;&lt; PHY_S6G_SYS_RST_POS) |</div><div class='add'>+					 (0 &lt;&lt; PHY_S6G_ENA_LANE_POS) |</div><div class='add'>+					 (0 &lt;&lt; PHY_S6G_ENA_LOOP_POS) |</div><div class='add'>+					 (0 &lt;&lt; PHY_S6G_QRATE_POS) |</div><div class='add'>+					 (3 &lt;&lt; PHY_S6G_IF_MODE_POS));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* misccfg */</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET,</div><div class='add'>+					 PHY_S6G_MISC_CFG, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* gpcfg */</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET,</div><div class='add'>+					 PHY_S6G_GPC_CFG, 768);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	phy_commit_mcb_s6g(phydev, PHY_S6G_DFT_CFG2, 0);</div><div class='add'>+</div><div class='add'>+	deadline = jiffies + msecs_to_jiffies(PROC_CMD_NCOMPLETED_TIMEOUT_MS);</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+		phy_update_mcb_s6g(phydev, PHY_MCB_S6G_CFG,</div><div class='add'>+				   0); /* read 6G MCB into CSRs */</div><div class='add'>+		reg = vsc85xx_csr_ctrl_phy_read(phydev, PHY_MCB_TARGET,</div><div class='add'>+						PHY_S6G_PLL_STATUS);</div><div class='add'>+		if (reg == 0xffffffff) {</div><div class='add'>+			mutex_unlock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (time_before(jiffies, deadline) &amp;&amp; (reg &amp; BIT(12)));</div><div class='add'>+</div><div class='add'>+	if (reg &amp; BIT(12)) {</div><div class='add'>+		mutex_unlock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* misccfg */</div><div class='add'>+	ret = vsc85xx_csr_ctrl_phy_write(phydev, PHY_MCB_TARGET,</div><div class='add'>+					 PHY_S6G_MISC_CFG, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	phy_commit_mcb_s6g(phydev, PHY_MCB_S6G_CFG, 0);</div><div class='add'>+</div><div class='add'>+	deadline = jiffies + msecs_to_jiffies(PROC_CMD_NCOMPLETED_TIMEOUT_MS);</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+		phy_update_mcb_s6g(phydev, PHY_MCB_S6G_CFG,</div><div class='add'>+				   0); /* read 6G MCB into CSRs */</div><div class='add'>+		reg = vsc85xx_csr_ctrl_phy_read(phydev, PHY_MCB_TARGET,</div><div class='add'>+						PHY_S6G_IB_STATUS0);</div><div class='add'>+		if (reg == 0xffffffff) {</div><div class='add'>+			mutex_unlock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (time_before(jiffies, deadline) &amp;&amp; !(reg &amp; BIT(8)));</div><div class='add'>+</div><div class='add'>+	if (!(reg &amp; BIT(8))) {</div><div class='add'>+		mutex_unlock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	ret = phy_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);</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 = phy_modify(phydev, MSCC_PHY_EXT_PHY_CNTL_1, MEDIA_OP_MODE_MASK,</div><div class='add'>+			 MEDIA_OP_MODE_COPPER);</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 = genphy_soft_reset(phydev);</div><div class='add'>+</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; vsc8531-&gt;nleds; i++) {</div><div class='add'>+		ret = vsc85xx_led_cntl_set(phydev, i, vsc8531-&gt;leds_mode[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 ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vsc85xx_ack_interrupt(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -1791,6 +2209,31 @@ static int vsc85xx_read_status(struct phy_device *phydev)</div><div class='ctx'> 	return genphy_read_status(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vsc8514_probe(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	struct vsc8531_private *vsc8531;</div><div class='add'>+	u32 default_mode[4] = {VSC8531_LINK_1000_ACTIVITY,</div><div class='add'>+	   VSC8531_LINK_100_ACTIVITY, VSC8531_LINK_ACTIVITY,</div><div class='add'>+	   VSC8531_DUPLEX_COLLISION};</div><div class='add'>+</div><div class='add'>+	vsc8531 = devm_kzalloc(&amp;phydev-&gt;mdio.dev, sizeof(*vsc8531), GFP_KERNEL);</div><div class='add'>+	if (!vsc8531)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	phydev-&gt;priv = vsc8531;</div><div class='add'>+</div><div class='add'>+	vsc8531-&gt;nleds = 4;</div><div class='add'>+	vsc8531-&gt;supp_led_modes = VSC85XX_SUPP_LED_MODES;</div><div class='add'>+	vsc8531-&gt;hw_stats = vsc85xx_hw_stats;</div><div class='add'>+	vsc8531-&gt;nstats = ARRAY_SIZE(vsc85xx_hw_stats);</div><div class='add'>+	vsc8531-&gt;stats = devm_kmalloc_array(&amp;phydev-&gt;mdio.dev, vsc8531-&gt;nstats,</div><div class='add'>+					    sizeof(u64), GFP_KERNEL);</div><div class='add'>+	if (!vsc8531-&gt;stats)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return vsc85xx_dt_led_modes_get(phydev, default_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vsc8574_probe(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vsc8531_private *vsc8531;</div><div class='hunk'>@@ -1879,10 +2322,33 @@ static int vsc85xx_probe(struct phy_device *phydev)</div><div class='ctx'> /* Microsemi VSC85xx PHYs */</div><div class='ctx'> static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> {</div><div class='add'>+	.phy_id		= PHY_ID_VSC8514,</div><div class='add'>+	.name		= "Microsemi GE VSC8514 SyncE",</div><div class='add'>+	.phy_id_mask	= 0xfffffff0,</div><div class='add'>+	.soft_reset	= &amp;genphy_soft_reset,</div><div class='add'>+	.config_init    = &amp;vsc8514_config_init,</div><div class='add'>+	.config_aneg    = &amp;vsc85xx_config_aneg,</div><div class='add'>+	.read_status	= &amp;vsc85xx_read_status,</div><div class='add'>+	.ack_interrupt  = &amp;vsc85xx_ack_interrupt,</div><div class='add'>+	.config_intr    = &amp;vsc85xx_config_intr,</div><div class='add'>+	.suspend	= &amp;genphy_suspend,</div><div class='add'>+	.resume		= &amp;genphy_resume,</div><div class='add'>+	.probe		= &amp;vsc8514_probe,</div><div class='add'>+	.set_wol	= &amp;vsc85xx_wol_set,</div><div class='add'>+	.get_wol	= &amp;vsc85xx_wol_get,</div><div class='add'>+	.get_tunable	= &amp;vsc85xx_get_tunable,</div><div class='add'>+	.set_tunable	= &amp;vsc85xx_set_tunable,</div><div class='add'>+	.read_page      = &amp;vsc85xx_phy_read_page,</div><div class='add'>+	.write_page     = &amp;vsc85xx_phy_write_page,</div><div class='add'>+	.get_sset_count = &amp;vsc85xx_get_sset_count,</div><div class='add'>+	.get_strings    = &amp;vsc85xx_get_strings,</div><div class='add'>+	.get_stats      = &amp;vsc85xx_get_stats,</div><div class='add'>+},</div><div class='add'>+{</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8530,</div><div class='ctx'> 	.name		= "Microsemi FE VSC8530",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.soft_reset	= &amp;genphy_soft_reset,</div><div class='ctx'> 	.config_init	= &amp;vsc85xx_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc85xx_config_aneg,</div><div class='hunk'>@@ -1907,7 +2373,7 @@ static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8531,</div><div class='ctx'> 	.name		= "Microsemi VSC8531",</div><div class='ctx'> 	.phy_id_mask    = 0xfffffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.soft_reset	= &amp;genphy_soft_reset,</div><div class='ctx'> 	.config_init    = &amp;vsc85xx_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc85xx_config_aneg,</div><div class='hunk'>@@ -1932,7 +2398,7 @@ static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8540,</div><div class='ctx'> 	.name		= "Microsemi FE VSC8540 SyncE",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.soft_reset	= &amp;genphy_soft_reset,</div><div class='ctx'> 	.config_init	= &amp;vsc85xx_config_init,</div><div class='ctx'> 	.config_aneg	= &amp;vsc85xx_config_aneg,</div><div class='hunk'>@@ -1957,7 +2423,7 @@ static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8541,</div><div class='ctx'> 	.name		= "Microsemi VSC8541 SyncE",</div><div class='ctx'> 	.phy_id_mask    = 0xfffffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.soft_reset	= &amp;genphy_soft_reset,</div><div class='ctx'> 	.config_init    = &amp;vsc85xx_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc85xx_config_aneg,</div><div class='hunk'>@@ -1982,7 +2448,7 @@ static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8574,</div><div class='ctx'> 	.name		= "Microsemi GE VSC8574 SyncE",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.soft_reset	= &amp;genphy_soft_reset,</div><div class='ctx'> 	.config_init    = &amp;vsc8584_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc85xx_config_aneg,</div><div class='hunk'>@@ -2008,7 +2474,7 @@ static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8584,</div><div class='ctx'> 	.name		= "Microsemi GE VSC8584 SyncE",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.soft_reset	= &amp;genphy_soft_reset,</div><div class='ctx'> 	.config_init    = &amp;vsc8584_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc85xx_config_aneg,</div><div class='hunk'>@@ -2034,6 +2500,7 @@ static struct phy_driver vsc85xx_driver[] = {</div><div class='ctx'> module_phy_driver(vsc85xx_driver);</div><div class='ctx'> </div><div class='ctx'> static struct mdio_device_id __maybe_unused vsc85xx_tbl[] = {</div><div class='add'>+	{ PHY_ID_VSC8514, 0xfffffff0, },</div><div class='ctx'> 	{ PHY_ID_VSC8530, 0xfffffff0, },</div><div class='ctx'> 	{ PHY_ID_VSC8531, 0xfffffff0, },</div><div class='ctx'> 	{ PHY_ID_VSC8540, 0xfffffff0, },</div><div class='head'>diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c<br/>index 42282a86b680..a221dd552c3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/national.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/national.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/national.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/national.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ static struct phy_driver dp83865_driver[] = { {</div><div class='ctx'> 	.phy_id = DP83865_PHY_ID,</div><div class='ctx'> 	.phy_id_mask = 0xfffffff0,</div><div class='ctx'> 	.name = "NatSemi DP83865",</div><div class='del'>-	.features = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init = ns_config_init,</div><div class='ctx'> 	.ack_interrupt = ns_ack_interrupt,</div><div class='ctx'> 	.config_intr = ns_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c<br/>index 9e24d9569424..abe13dfe50ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy-c45.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy-c45.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy-c45.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/phy-c45.c</a></div><div class='hunk'>@@ -262,12 +262,30 @@ int genphy_c45_read_lpa(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='add'>+	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; MDIO_AN_STAT1_COMPLETE)) {</div><div class='add'>+		linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,</div><div class='add'>+				   phydev-&gt;lp_advertising);</div><div class='add'>+		mii_10gbt_stat_mod_linkmode_lpa_t(phydev-&gt;lp_advertising, 0);</div><div class='add'>+		mii_adv_mod_linkmode_adv_t(phydev-&gt;lp_advertising, 0);</div><div class='add'>+		phydev-&gt;pause = 0;</div><div class='add'>+		phydev-&gt;asym_pause = 0;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev-&gt;lp_advertising,</div><div class='add'>+			 val &amp; MDIO_AN_STAT1_LPABLE);</div><div class='add'>+</div><div class='ctx'> 	/* Read the link partner's base page advertisement */</div><div class='ctx'> 	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA);</div><div class='ctx'> 	if (val &lt; 0)</div><div class='ctx'> 		return val;</div><div class='ctx'> </div><div class='del'>-	mii_lpa_mod_linkmode_lpa_t(phydev-&gt;lp_advertising, val);</div><div class='add'>+	mii_adv_mod_linkmode_adv_t(phydev-&gt;lp_advertising, val);</div><div class='ctx'> 	phydev-&gt;pause = val &amp; LPA_PAUSE_CAP ? 1 : 0;</div><div class='ctx'> 	phydev-&gt;asym_pause = val &amp; LPA_PAUSE_ASYM ? 1 : 0;</div><div class='ctx'> </div><div class='hunk'>@@ -498,21 +516,10 @@ int gen10g_config_aneg(struct phy_device *phydev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(gen10g_config_aneg);</div><div class='ctx'> </div><div class='del'>-static int gen10g_read_status(struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	/* For now just lie and say it's 10G all the time */</div><div class='del'>-	phydev-&gt;speed = SPEED_10000;</div><div class='del'>-	phydev-&gt;duplex = DUPLEX_FULL;</div><div class='del'>-</div><div class='del'>-	return genphy_c45_read_link(phydev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct phy_driver genphy_10g_driver = {</div><div class='add'>+struct phy_driver genphy_c45_driver = {</div><div class='ctx'> 	.phy_id         = 0xffffffff,</div><div class='ctx'> 	.phy_id_mask    = 0xffffffff,</div><div class='del'>-	.name           = "Generic 10G PHY",</div><div class='add'>+	.name           = "Generic Clause 45 PHY",</div><div class='ctx'> 	.soft_reset	= genphy_no_soft_reset,</div><div class='del'>-	.features       = PHY_10GBIT_FEATURES,</div><div class='del'>-	.config_aneg    = gen10g_config_aneg,</div><div class='del'>-	.read_status    = gen10g_read_status,</div><div class='add'>+	.read_status    = genphy_c45_read_status,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c<br/>index 5016cd5fd7c7..3daf0214a242 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/phy-core.c</a></div><div class='hunk'>@@ -8,6 +8,11 @@</div><div class='ctx'> </div><div class='ctx'> const char *phy_speed_to_str(int speed)</div><div class='ctx'> {</div><div class='add'>+	BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 67,</div><div class='add'>+		"Enum ethtool_link_mode_bit_indices and phylib are out of sync. "</div><div class='add'>+		"If a speed or mode has been added please update phy_speed_to_str "</div><div class='add'>+		"and the PHY settings array.\n");</div><div class='add'>+</div><div class='ctx'> 	switch (speed) {</div><div class='ctx'> 	case SPEED_10:</div><div class='ctx'> 		return "10Mbps";</div><div class='hunk'>@@ -35,6 +40,8 @@ const char *phy_speed_to_str(int speed)</div><div class='ctx'> 		return "56Gbps";</div><div class='ctx'> 	case SPEED_100000:</div><div class='ctx'> 		return "100Gbps";</div><div class='add'>+	case SPEED_200000:</div><div class='add'>+		return "200Gbps";</div><div class='ctx'> 	case SPEED_UNKNOWN:</div><div class='ctx'> 		return "Unknown";</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -58,222 +65,81 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str);</div><div class='ctx'> /* A mapping of all SUPPORTED settings to speed/duplex.  This table</div><div class='ctx'>  * must be grouped by speed and sorted in descending match priority</div><div class='ctx'>  * - iow, descending speed. */</div><div class='add'>+</div><div class='add'>+#define PHY_SETTING(s, d, b) { .speed = SPEED_ ## s, .duplex = DUPLEX_ ## d, \</div><div class='add'>+			       .bit = ETHTOOL_LINK_MODE_ ## b ## _BIT}</div><div class='add'>+</div><div class='ctx'> static const struct phy_setting settings[] = {</div><div class='add'>+	/* 200G */</div><div class='add'>+	PHY_SETTING( 200000, FULL, 200000baseCR4_Full		),</div><div class='add'>+	PHY_SETTING( 200000, FULL, 200000baseKR4_Full		),</div><div class='add'>+	PHY_SETTING( 200000, FULL, 200000baseLR4_ER4_FR4_Full	),</div><div class='add'>+	PHY_SETTING( 200000, FULL, 200000baseDR4_Full		),</div><div class='add'>+	PHY_SETTING( 200000, FULL, 200000baseSR4_Full		),</div><div class='ctx'> 	/* 100G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_100000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_100000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_100000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_100000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseCR4_Full		),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseKR4_Full		),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseLR4_ER4_Full	),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseSR4_Full		),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseCR2_Full		),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseKR2_Full		),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseLR2_ER2_FR2_Full	),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseDR2_Full		),</div><div class='add'>+	PHY_SETTING( 100000, FULL, 100000baseSR2_Full		),</div><div class='ctx'> 	/* 56G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_56000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_56000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_56000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_56000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(  56000, FULL,  56000baseCR4_Full	  	),</div><div class='add'>+	PHY_SETTING(  56000, FULL,  56000baseKR4_Full	  	),</div><div class='add'>+	PHY_SETTING(  56000, FULL,  56000baseLR4_Full	  	),</div><div class='add'>+	PHY_SETTING(  56000, FULL,  56000baseSR4_Full	  	),</div><div class='ctx'> 	/* 50G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_50000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_50000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_50000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseCR2_Full		),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseKR2_Full		),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseSR2_Full		),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseCR_Full		),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseKR_Full		),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseLR_ER_FR_Full	),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseDR_Full		),</div><div class='add'>+	PHY_SETTING(  50000, FULL,  50000baseSR_Full		),</div><div class='ctx'> 	/* 40G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_40000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_40000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_40000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_40000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(  40000, FULL,  40000baseCR4_Full		),</div><div class='add'>+	PHY_SETTING(  40000, FULL,  40000baseKR4_Full		),</div><div class='add'>+	PHY_SETTING(  40000, FULL,  40000baseLR4_Full		),</div><div class='add'>+	PHY_SETTING(  40000, FULL,  40000baseSR4_Full		),</div><div class='ctx'> 	/* 25G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_25000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_25000baseCR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_25000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_25000baseKR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_25000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	PHY_SETTING(  25000, FULL,  25000baseCR_Full		),</div><div class='add'>+	PHY_SETTING(  25000, FULL,  25000baseKR_Full		),</div><div class='add'>+	PHY_SETTING(  25000, FULL,  25000baseSR_Full		),</div><div class='ctx'> 	/* 20G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_20000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_20000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(  20000, FULL,  20000baseKR2_Full		),</div><div class='add'>+	PHY_SETTING(  20000, FULL,  20000baseMLD2_Full		),</div><div class='ctx'> 	/* 10G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseCR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseR_FEC_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10000baseT_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseCR_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseER_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseKR_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseKX4_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseLR_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseLRM_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseR_FEC		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseSR_Full		),</div><div class='add'>+	PHY_SETTING(  10000, FULL,  10000baseT_Full		),</div><div class='ctx'> 	/* 5G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_5000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_5000baseT_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	PHY_SETTING(   5000, FULL,   5000baseT_Full		),</div><div class='ctx'> 	/* 2.5G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_2500,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_2500baseT_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_2500,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_2500baseX_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(   2500, FULL,   2500baseT_Full		),</div><div class='add'>+	PHY_SETTING(   2500, FULL,   2500baseX_Full		),</div><div class='ctx'> 	/* 1G */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_1000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_1000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_1000baseT_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_1000,</div><div class='del'>-		.duplex = DUPLEX_HALF,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_1000baseT_Half_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_1000,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_1000baseX_Full_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(   1000, FULL,   1000baseKX_Full		),</div><div class='add'>+	PHY_SETTING(   1000, FULL,   1000baseT_Full		),</div><div class='add'>+	PHY_SETTING(   1000, HALF,   1000baseT_Half		),</div><div class='add'>+	PHY_SETTING(   1000, FULL,   1000baseX_Full		),</div><div class='ctx'> 	/* 100M */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_100,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_100baseT_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_100,</div><div class='del'>-		.duplex = DUPLEX_HALF,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_100baseT_Half_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(    100, FULL,    100baseT_Full		),</div><div class='add'>+	PHY_SETTING(    100, HALF,    100baseT_Half		),</div><div class='ctx'> 	/* 10M */</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10baseT_Full_BIT,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.speed = SPEED_10,</div><div class='del'>-		.duplex = DUPLEX_HALF,</div><div class='del'>-		.bit = ETHTOOL_LINK_MODE_10baseT_Half_BIT,</div><div class='del'>-	},</div><div class='add'>+	PHY_SETTING(     10, FULL,     10baseT_Full		),</div><div class='add'>+	PHY_SETTING(     10, HALF,     10baseT_Half		),</div><div class='ctx'> };</div><div class='add'>+#undef PHY_SETTING</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * phy_lookup_setting - lookup a PHY setting</div><div class='hunk'>@@ -362,7 +228,7 @@ int phy_set_max_speed(struct phy_device *phydev, u32 max_speed)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_advertise_supported(phydev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c<br/>index 3745220c5c98..e8885429293a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/phy.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@ static const char *phy_state_to_str(enum phy_state st)</div><div class='ctx'> 	PHY_STATE_STR(NOLINK)</div><div class='ctx'> 	PHY_STATE_STR(FORCING)</div><div class='ctx'> 	PHY_STATE_STR(HALTED)</div><div class='del'>-	PHY_STATE_STR(RESUMING)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -61,6 +60,32 @@ static void phy_link_down(struct phy_device *phydev, bool do_carrier)</div><div class='ctx'> 	phy_led_trigger_change_speed(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *phy_pause_str(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	bool local_pause, local_asym_pause;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;autoneg == AUTONEG_DISABLE)</div><div class='add'>+		goto no_pause;</div><div class='add'>+</div><div class='add'>+	local_pause = linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+					phydev-&gt;advertising);</div><div class='add'>+	local_asym_pause = linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+					     phydev-&gt;advertising);</div><div class='add'>+</div><div class='add'>+	if (local_pause &amp;&amp; phydev-&gt;pause)</div><div class='add'>+		return "rx/tx";</div><div class='add'>+</div><div class='add'>+	if (local_asym_pause &amp;&amp; phydev-&gt;asym_pause) {</div><div class='add'>+		if (local_pause)</div><div class='add'>+			return "rx";</div><div class='add'>+		if (phydev-&gt;pause)</div><div class='add'>+			return "tx";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+no_pause:</div><div class='add'>+	return "off";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * phy_print_status - Convenience function to print out the current phy status</div><div class='ctx'>  * @phydev: the phy_device struct</div><div class='hunk'>@@ -72,7 +97,7 @@ void phy_print_status(struct phy_device *phydev)</div><div class='ctx'> 			"Link is Up - %s/%s - flow control %s\n",</div><div class='ctx'> 			phy_speed_to_str(phydev-&gt;speed),</div><div class='ctx'> 			phy_duplex_to_str(phydev-&gt;duplex),</div><div class='del'>-			phydev-&gt;pause ? "rx/tx" : "off");</div><div class='add'>+			phy_pause_str(phydev));</div><div class='ctx'> 	} else	{</div><div class='ctx'> 		netdev_info(phydev-&gt;attached_dev, "Link is Down\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -214,10 +239,6 @@ static void phy_sanitize_settings(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct phy_setting *setting;</div><div class='ctx'> </div><div class='del'>-	/* Sanitize settings based on PHY capabilities */</div><div class='del'>-	if (linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev-&gt;supported))</div><div class='del'>-		phydev-&gt;autoneg = AUTONEG_DISABLE;</div><div class='del'>-</div><div class='ctx'> 	setting = phy_find_valid(phydev-&gt;speed, phydev-&gt;duplex,</div><div class='ctx'> 				 phydev-&gt;supported);</div><div class='ctx'> 	if (setting) {</div><div class='hunk'>@@ -863,10 +884,7 @@ void phy_start(struct phy_device *phydev)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;state == PHY_READY)</div><div class='del'>-		phydev-&gt;state = PHY_UP;</div><div class='del'>-	else</div><div class='del'>-		phydev-&gt;state = PHY_RESUMING;</div><div class='add'>+	phydev-&gt;state = PHY_UP;</div><div class='ctx'> </div><div class='ctx'> 	phy_start_machine(phydev);</div><div class='ctx'> out:</div><div class='hunk'>@@ -891,9 +909,6 @@ void phy_state_machine(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	old_state = phydev-&gt;state;</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;link_change_notify)</div><div class='del'>-		phydev-&gt;drv-&gt;link_change_notify(phydev);</div><div class='del'>-</div><div class='ctx'> 	switch (phydev-&gt;state) {</div><div class='ctx'> 	case PHY_DOWN:</div><div class='ctx'> 	case PHY_READY:</div><div class='hunk'>@@ -904,7 +919,6 @@ void phy_state_machine(struct work_struct *work)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PHY_NOLINK:</div><div class='ctx'> 	case PHY_RUNNING:</div><div class='del'>-	case PHY_RESUMING:</div><div class='ctx'> 		err = phy_check_link_status(phydev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PHY_FORCING:</div><div class='hunk'>@@ -940,10 +954,13 @@ void phy_state_machine(struct work_struct *work)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		phy_error(phydev);</div><div class='ctx'> </div><div class='del'>-	if (old_state != phydev-&gt;state)</div><div class='add'>+	if (old_state != phydev-&gt;state) {</div><div class='ctx'> 		phydev_dbg(phydev, "PHY state change %s -&gt; %s\n",</div><div class='ctx'> 			   phy_state_to_str(old_state),</div><div class='ctx'> 			   phy_state_to_str(phydev-&gt;state));</div><div class='add'>+		if (phydev-&gt;drv &amp;&amp; phydev-&gt;drv-&gt;link_change_notify)</div><div class='add'>+			phydev-&gt;drv-&gt;link_change_notify(phydev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Only re-schedule a PHY state machine change if we are polling the</div><div class='ctx'> 	 * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving</div><div class='head'>diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c<br/>index 49fdd1ee798e..dcc93a873174 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/phy_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/phy_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/phy_device.c</a></div><div class='hunk'>@@ -225,7 +225,7 @@ static void phy_mdio_device_remove(struct mdio_device *mdiodev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct phy_driver genphy_driver;</div><div class='del'>-extern struct phy_driver genphy_10g_driver;</div><div class='add'>+extern struct phy_driver genphy_c45_driver;</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(phy_fixup_list);</div><div class='ctx'> static DEFINE_MUTEX(phy_fixup_lock);</div><div class='hunk'>@@ -1174,7 +1174,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!d-&gt;driver) {</div><div class='ctx'> 		if (phydev-&gt;is_c45)</div><div class='del'>-			d-&gt;driver = &amp;genphy_10g_driver.mdiodrv.driver;</div><div class='add'>+			d-&gt;driver = &amp;genphy_c45_driver.mdiodrv.driver;</div><div class='ctx'> 		else</div><div class='ctx'> 			d-&gt;driver = &amp;genphy_driver.mdiodrv.driver;</div><div class='ctx'> </div><div class='hunk'>@@ -1335,7 +1335,7 @@ EXPORT_SYMBOL_GPL(phy_driver_is_genphy);</div><div class='ctx'> bool phy_driver_is_genphy_10g(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	return phy_driver_is_genphy_kind(phydev,</div><div class='del'>-					 &amp;genphy_10g_driver.mdiodrv.driver);</div><div class='add'>+					 &amp;genphy_c45_driver.mdiodrv.driver);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(phy_driver_is_genphy_10g);</div><div class='ctx'> </div><div class='hunk'>@@ -1710,23 +1710,19 @@ int genphy_update_link(struct phy_device *phydev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!phy_polling_mode(phydev)) {</div><div class='ctx'> 		status = phy_read(phydev, MII_BMSR);</div><div class='del'>-		if (status &lt; 0) {</div><div class='add'>+		if (status &lt; 0)</div><div class='ctx'> 			return status;</div><div class='del'>-		} else if (status &amp; BMSR_LSTATUS) {</div><div class='del'>-			phydev-&gt;link = 1;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		else if (status &amp; BMSR_LSTATUS)</div><div class='add'>+			goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read link and autonegotiation status */</div><div class='ctx'> 	status = phy_read(phydev, MII_BMSR);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return status;</div><div class='del'>-</div><div class='del'>-	if ((status &amp; BMSR_LSTATUS) == 0)</div><div class='del'>-		phydev-&gt;link = 0;</div><div class='del'>-	else</div><div class='del'>-		phydev-&gt;link = 1;</div><div class='add'>+done:</div><div class='add'>+	phydev-&gt;link = status &amp; BMSR_LSTATUS ? 1 : 0;</div><div class='add'>+	phydev-&gt;autoneg_complete = status &amp; BMSR_ANEGCOMPLETE ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1743,23 +1739,26 @@ EXPORT_SYMBOL(genphy_update_link);</div><div class='ctx'>  */</div><div class='ctx'> int genphy_read_status(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	int adv;</div><div class='del'>-	int err;</div><div class='del'>-	int lpa;</div><div class='del'>-	int lpagb = 0;</div><div class='add'>+	int adv, lpa, lpagb, err, old_link = phydev-&gt;link;</div><div class='ctx'> </div><div class='ctx'> 	/* Update the link, but return if there was an error */</div><div class='ctx'> 	err = genphy_update_link(phydev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/* why bother the PHY if nothing can have changed */</div><div class='add'>+	if (phydev-&gt;autoneg == AUTONEG_ENABLE &amp;&amp; old_link &amp;&amp; phydev-&gt;link)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	phydev-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+	phydev-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	phydev-&gt;pause = 0;</div><div class='add'>+	phydev-&gt;asym_pause = 0;</div><div class='add'>+</div><div class='ctx'> 	linkmode_zero(phydev-&gt;lp_advertising);</div><div class='ctx'> </div><div class='del'>-	if (AUTONEG_ENABLE == phydev-&gt;autoneg) {</div><div class='del'>-		if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,</div><div class='del'>-				      phydev-&gt;supported) ||</div><div class='del'>-		    linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,</div><div class='del'>-				      phydev-&gt;supported)) {</div><div class='add'>+	if (phydev-&gt;autoneg == AUTONEG_ENABLE &amp;&amp; phydev-&gt;autoneg_complete) {</div><div class='add'>+		if (phydev-&gt;is_gigabit_capable) {</div><div class='ctx'> 			lpagb = phy_read(phydev, MII_STAT1000);</div><div class='ctx'> 			if (lpagb &lt; 0)</div><div class='ctx'> 				return lpagb;</div><div class='hunk'>@@ -1785,14 +1784,8 @@ int genphy_read_status(struct phy_device *phydev)</div><div class='ctx'> 			return lpa;</div><div class='ctx'> </div><div class='ctx'> 		mii_lpa_mod_linkmode_lpa_t(phydev-&gt;lp_advertising, lpa);</div><div class='del'>-</div><div class='del'>-		phydev-&gt;speed = SPEED_UNKNOWN;</div><div class='del'>-		phydev-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='del'>-		phydev-&gt;pause = 0;</div><div class='del'>-		phydev-&gt;asym_pause = 0;</div><div class='del'>-</div><div class='ctx'> 		phy_resolve_aneg_linkmode(phydev);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (phydev-&gt;autoneg == AUTONEG_DISABLE) {</div><div class='ctx'> 		int bmcr = phy_read(phydev, MII_BMCR);</div><div class='ctx'> </div><div class='ctx'> 		if (bmcr &lt; 0)</div><div class='hunk'>@@ -1809,9 +1802,6 @@ int genphy_read_status(struct phy_device *phydev)</div><div class='ctx'> 			phydev-&gt;speed = SPEED_100;</div><div class='ctx'> 		else</div><div class='ctx'> 			phydev-&gt;speed = SPEED_10;</div><div class='del'>-</div><div class='del'>-		phydev-&gt;pause = 0;</div><div class='del'>-		phydev-&gt;asym_pause = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1829,13 +1819,25 @@ EXPORT_SYMBOL(genphy_read_status);</div><div class='ctx'>  */</div><div class='ctx'> int genphy_soft_reset(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='add'>+	u16 res = BMCR_RESET;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = phy_write(phydev, MII_BMCR, BMCR_RESET);</div><div class='add'>+	if (phydev-&gt;autoneg == AUTONEG_ENABLE)</div><div class='add'>+		res |= BMCR_ANRESTART;</div><div class='add'>+</div><div class='add'>+	ret = phy_modify(phydev, MII_BMCR, BMCR_ISOLATE, res);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return phy_poll_reset(phydev);</div><div class='add'>+	ret = phy_poll_reset(phydev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* BMCR may be reset to defaults */</div><div class='add'>+	if (phydev-&gt;autoneg == AUTONEG_DISABLE)</div><div class='add'>+		ret = genphy_setup_forced(phydev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(genphy_soft_reset);</div><div class='ctx'> </div><div class='hunk'>@@ -1887,6 +1889,54 @@ int genphy_config_init(struct phy_device *phydev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(genphy_config_init);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * genphy_read_abilities - read PHY abilities from Clause 22 registers</div><div class='add'>+ * @phydev: target phy_device struct</div><div class='add'>+ *</div><div class='add'>+ * Description: Reads the PHY's abilities and populates</div><div class='add'>+ * phydev-&gt;supported accordingly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, &lt; 0 on failure</div><div class='add'>+ */</div><div class='add'>+int genphy_read_abilities(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	linkmode_set_bit_array(phy_basic_ports_array,</div><div class='add'>+			       ARRAY_SIZE(phy_basic_ports_array),</div><div class='add'>+			       phydev-&gt;supported);</div><div class='add'>+</div><div class='add'>+	val = phy_read(phydev, MII_BMSR);</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return val;</div><div class='add'>+</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev-&gt;supported,</div><div class='add'>+			 val &amp; BMSR_ANEGCAPABLE);</div><div class='add'>+</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, phydev-&gt;supported,</div><div class='add'>+			 val &amp; BMSR_100FULL);</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, phydev-&gt;supported,</div><div class='add'>+			 val &amp; BMSR_100HALF);</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, phydev-&gt;supported,</div><div class='add'>+			 val &amp; BMSR_10FULL);</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, phydev-&gt;supported,</div><div class='add'>+			 val &amp; BMSR_10HALF);</div><div class='add'>+</div><div class='add'>+	if (val &amp; BMSR_ESTATEN) {</div><div class='add'>+		val = phy_read(phydev, MII_ESTATUS);</div><div class='add'>+		if (val &lt; 0)</div><div class='add'>+			return val;</div><div class='add'>+</div><div class='add'>+		linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,</div><div class='add'>+				 phydev-&gt;supported, val &amp; ESTATUS_1000_TFULL);</div><div class='add'>+		linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,</div><div class='add'>+				 phydev-&gt;supported, val &amp; ESTATUS_1000_THALF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(genphy_read_abilities);</div><div class='add'>+</div><div class='ctx'> /* This is used for the phy device which doesn't support the MMD extended</div><div class='ctx'>  * register access, but it does have side effect when we are trying to access</div><div class='ctx'>  * the MMD register via indirect method.</div><div class='hunk'>@@ -1935,10 +1985,35 @@ EXPORT_SYMBOL(genphy_loopback);</div><div class='ctx'> void phy_remove_link_mode(struct phy_device *phydev, u32 link_mode)</div><div class='ctx'> {</div><div class='ctx'> 	linkmode_clear_bit(link_mode, phydev-&gt;supported);</div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_advertise_supported(phydev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(phy_remove_link_mode);</div><div class='ctx'> </div><div class='add'>+static void phy_copy_pause_bits(unsigned long *dst, unsigned long *src)</div><div class='add'>+{</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, dst,</div><div class='add'>+		linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, src));</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT, dst,</div><div class='add'>+		linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, src));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * phy_advertise_supported - Advertise all supported modes</div><div class='add'>+ * @phydev: target phy_device struct</div><div class='add'>+ *</div><div class='add'>+ * Description: Called to advertise all supported modes, doesn't touch</div><div class='add'>+ * pause mode advertising.</div><div class='add'>+ */</div><div class='add'>+void phy_advertise_supported(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(new);</div><div class='add'>+</div><div class='add'>+	linkmode_copy(new, phydev-&gt;supported);</div><div class='add'>+	phy_copy_pause_bits(new, phydev-&gt;advertising);</div><div class='add'>+	linkmode_copy(phydev-&gt;advertising, new);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(phy_advertise_supported);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * phy_support_sym_pause - Enable support of symmetrical pause</div><div class='ctx'>  * @phydev: target phy_device struct</div><div class='hunk'>@@ -1949,8 +2024,7 @@ EXPORT_SYMBOL(phy_remove_link_mode);</div><div class='ctx'> void phy_support_sym_pause(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev-&gt;supported);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev-&gt;supported);</div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_copy_pause_bits(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(phy_support_sym_pause);</div><div class='ctx'> </div><div class='hunk'>@@ -1962,9 +2036,7 @@ EXPORT_SYMBOL(phy_support_sym_pause);</div><div class='ctx'>  */</div><div class='ctx'> void phy_support_asym_pause(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev-&gt;supported);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev-&gt;supported);</div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_copy_pause_bits(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(phy_support_asym_pause);</div><div class='ctx'> </div><div class='hunk'>@@ -2044,11 +2116,14 @@ bool phy_validate_pause(struct phy_device *phydev,</div><div class='ctx'> 			struct ethtool_pauseparam *pp)</div><div class='ctx'> {</div><div class='ctx'> 	if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='del'>-			       phydev-&gt;supported) ||</div><div class='del'>-	    (!linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='del'>-				phydev-&gt;supported) &amp;&amp;</div><div class='del'>-	     pp-&gt;rx_pause != pp-&gt;tx_pause))</div><div class='add'>+			       phydev-&gt;supported) &amp;&amp; pp-&gt;rx_pause)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+			       phydev-&gt;supported) &amp;&amp;</div><div class='add'>+	    pp-&gt;rx_pause != pp-&gt;tx_pause)</div><div class='ctx'> 		return false;</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(phy_validate_pause);</div><div class='hunk'>@@ -2104,14 +2179,30 @@ static int phy_probe(struct device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (phydrv-&gt;features) {</div><div class='ctx'> 		linkmode_copy(phydev-&gt;supported, phydrv-&gt;features);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (phydrv-&gt;get_features) {</div><div class='ctx'> 		err = phydrv-&gt;get_features(phydev);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+	} else if (phydev-&gt;is_c45) {</div><div class='add'>+		err = genphy_c45_pma_read_abilities(phydev);</div><div class='add'>+	} else {</div><div class='add'>+		err = genphy_read_abilities(phydev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,</div><div class='add'>+			       phydev-&gt;supported))</div><div class='add'>+		phydev-&gt;autoneg = 0;</div><div class='add'>+</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,</div><div class='add'>+			      phydev-&gt;supported))</div><div class='add'>+		phydev-&gt;is_gigabit_capable = 1;</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,</div><div class='add'>+			      phydev-&gt;supported))</div><div class='add'>+		phydev-&gt;is_gigabit_capable = 1;</div><div class='add'>+</div><div class='ctx'> 	of_set_phy_supported(phydev);</div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_advertise_supported(phydev);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the EEE modes we want to prohibit. We will ask</div><div class='ctx'> 	 * the PHY stop advertising these mode later on</div><div class='hunk'>@@ -2177,11 +2268,11 @@ int phy_driver_register(struct phy_driver *new_driver, struct module *owner)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Either the features are hard coded, or dynamically</div><div class='del'>-	 * determine. It cannot be both or neither</div><div class='add'>+	 * determined. It cannot be both.</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON((!new_driver-&gt;features &amp;&amp; !new_driver-&gt;get_features) ||</div><div class='del'>-		    (new_driver-&gt;features &amp;&amp; new_driver-&gt;get_features))) {</div><div class='del'>-		pr_err("%s: Driver features are missing\n", new_driver-&gt;name);</div><div class='add'>+	if (WARN_ON(new_driver-&gt;features &amp;&amp; new_driver-&gt;get_features)) {</div><div class='add'>+		pr_err("%s: features and get_features must not both be set\n",</div><div class='add'>+		       new_driver-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2243,8 +2334,7 @@ static struct phy_driver genphy_driver = {</div><div class='ctx'> 	.phy_id_mask	= 0xffffffff,</div><div class='ctx'> 	.name		= "Generic PHY",</div><div class='ctx'> 	.soft_reset	= genphy_no_soft_reset,</div><div class='del'>-	.config_init	= genphy_config_init,</div><div class='del'>-	.features	= PHY_GBIT_ALL_PORTS_FEATURES,</div><div class='add'>+	.get_features	= genphy_read_abilities,</div><div class='ctx'> 	.aneg_done	= genphy_aneg_done,</div><div class='ctx'> 	.suspend	= genphy_suspend,</div><div class='ctx'> 	.resume		= genphy_resume,</div><div class='hunk'>@@ -2261,14 +2351,14 @@ static int __init phy_init(void)</div><div class='ctx'> </div><div class='ctx'> 	features_init();</div><div class='ctx'> </div><div class='del'>-	rc = phy_driver_register(&amp;genphy_10g_driver, THIS_MODULE);</div><div class='add'>+	rc = phy_driver_register(&amp;genphy_c45_driver, THIS_MODULE);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto err_10g;</div><div class='add'>+		goto err_c45;</div><div class='ctx'> </div><div class='ctx'> 	rc = phy_driver_register(&amp;genphy_driver, THIS_MODULE);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		phy_driver_unregister(&amp;genphy_10g_driver);</div><div class='del'>-err_10g:</div><div class='add'>+		phy_driver_unregister(&amp;genphy_c45_driver);</div><div class='add'>+err_c45:</div><div class='ctx'> 		mdio_bus_exit();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2277,7 +2367,7 @@ err_10g:</div><div class='ctx'> </div><div class='ctx'> static void __exit phy_exit(void)</div><div class='ctx'> {</div><div class='del'>-	phy_driver_unregister(&amp;genphy_10g_driver);</div><div class='add'>+	phy_driver_unregister(&amp;genphy_c45_driver);</div><div class='ctx'> 	phy_driver_unregister(&amp;genphy_driver);</div><div class='ctx'> 	mdio_bus_exit();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c<br/>index 5486f6fb2ab2..1b15a991ee06 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/qsemi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/qsemi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/qsemi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/qsemi.c</a></div><div class='hunk'>@@ -110,7 +110,7 @@ static struct phy_driver qs6612_driver[] = { {</div><div class='ctx'> 	.phy_id		= 0x00181440,</div><div class='ctx'> 	.name		= "QS6612",</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init	= qs6612_config_init,</div><div class='ctx'> 	.ack_interrupt	= qs6612_ack_interrupt,</div><div class='ctx'> 	.config_intr	= qs6612_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c<br/>index 10df52ccddfe..d6a10f323117 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/realtek.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/realtek.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/realtek.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/realtek.c</a></div><div class='hunk'>@@ -151,21 +151,14 @@ static int rtl8211_config_aneg(struct phy_device *phydev)</div><div class='ctx'> static int rtl8211c_config_init(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	/* RTL8211C has an issue when operating in Gigabit slave mode */</div><div class='del'>-	phy_set_bits(phydev, MII_CTRL1000,</div><div class='del'>-		     CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER);</div><div class='del'>-</div><div class='del'>-	return genphy_config_init(phydev);</div><div class='add'>+	return phy_set_bits(phydev, MII_CTRL1000,</div><div class='add'>+			    CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtl8211f_config_init(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	u16 val = 0;</div><div class='ctx'> </div><div class='del'>-	ret = genphy_config_init(phydev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	/* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */</div><div class='ctx'> 	if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='ctx'> 	    phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII_TXID)</div><div class='hunk'>@@ -192,10 +185,6 @@ static int rtl8366rb_config_init(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = genphy_config_init(phydev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	ret = phy_set_bits(phydev, RTL8366RB_POWER_SAVE,</div><div class='ctx'> 			   RTL8366RB_POWER_SAVE_ON);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -210,11 +199,9 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x00008201),</div><div class='ctx'> 		.name           = "RTL8201CP Ethernet",</div><div class='del'>-		.features       = PHY_BASIC_FEATURES,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc816),</div><div class='ctx'> 		.name		= "RTL8201F Fast Ethernet",</div><div class='del'>-		.features	= PHY_BASIC_FEATURES,</div><div class='ctx'> 		.ack_interrupt	= &amp;rtl8201_ack_interrupt,</div><div class='ctx'> 		.config_intr	= &amp;rtl8201_config_intr,</div><div class='ctx'> 		.suspend	= genphy_suspend,</div><div class='hunk'>@@ -224,14 +211,12 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc910),</div><div class='ctx'> 		.name		= "RTL8211 Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.config_aneg	= rtl8211_config_aneg,</div><div class='ctx'> 		.read_mmd	= &amp;genphy_read_mmd_unsupported,</div><div class='ctx'> 		.write_mmd	= &amp;genphy_write_mmd_unsupported,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc912),</div><div class='ctx'> 		.name		= "RTL8211B Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.ack_interrupt	= &amp;rtl821x_ack_interrupt,</div><div class='ctx'> 		.config_intr	= &amp;rtl8211b_config_intr,</div><div class='ctx'> 		.read_mmd	= &amp;genphy_read_mmd_unsupported,</div><div class='hunk'>@@ -241,14 +226,12 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc913),</div><div class='ctx'> 		.name		= "RTL8211C Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.config_init	= rtl8211c_config_init,</div><div class='ctx'> 		.read_mmd	= &amp;genphy_read_mmd_unsupported,</div><div class='ctx'> 		.write_mmd	= &amp;genphy_write_mmd_unsupported,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc914),</div><div class='ctx'> 		.name		= "RTL8211DN Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.ack_interrupt	= rtl821x_ack_interrupt,</div><div class='ctx'> 		.config_intr	= rtl8211e_config_intr,</div><div class='ctx'> 		.suspend	= genphy_suspend,</div><div class='hunk'>@@ -256,7 +239,6 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc915),</div><div class='ctx'> 		.name		= "RTL8211E Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.ack_interrupt	= &amp;rtl821x_ack_interrupt,</div><div class='ctx'> 		.config_intr	= &amp;rtl8211e_config_intr,</div><div class='ctx'> 		.suspend	= genphy_suspend,</div><div class='hunk'>@@ -264,7 +246,6 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc916),</div><div class='ctx'> 		.name		= "RTL8211F Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.config_init	= &amp;rtl8211f_config_init,</div><div class='ctx'> 		.ack_interrupt	= &amp;rtl8211f_ack_interrupt,</div><div class='ctx'> 		.config_intr	= &amp;rtl8211f_config_intr,</div><div class='hunk'>@@ -275,8 +256,6 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc800),</div><div class='ctx'> 		.name		= "Generic Realtek PHY",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='del'>-		.config_init	= genphy_config_init,</div><div class='ctx'> 		.suspend	= genphy_suspend,</div><div class='ctx'> 		.resume		= genphy_resume,</div><div class='ctx'> 		.read_page	= rtl821x_read_page,</div><div class='hunk'>@@ -284,7 +263,6 @@ static struct phy_driver realtek_drvs[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		PHY_ID_MATCH_EXACT(0x001cc961),</div><div class='ctx'> 		.name		= "RTL8366RB Gigabit Ethernet",</div><div class='del'>-		.features	= PHY_GBIT_FEATURES,</div><div class='ctx'> 		.config_init	= &amp;rtl8366rb_config_init,</div><div class='ctx'> 		/* These interrupts are handled by the irq controller</div><div class='ctx'> 		 * embedded inside the RTL8366RB, they get unmasked when the</div><div class='head'>diff --git a/drivers/net/phy/rockchip.c b/drivers/net/phy/rockchip.c<br/>index 95abf7072f32..52f1f65320fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/rockchip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/rockchip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/rockchip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/rockchip.c</a></div><div class='hunk'>@@ -104,41 +104,14 @@ static int rockchip_integrated_phy_config_init(struct phy_device *phydev)</div><div class='ctx'> </div><div class='ctx'> static void rockchip_link_change_notify(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	int speed = SPEED_10;</div><div class='del'>-</div><div class='del'>-	if (phydev-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='del'>-		int reg = phy_read(phydev, MII_SPECIAL_CONTROL_STATUS);</div><div class='del'>-</div><div class='del'>-		if (reg &lt; 0) {</div><div class='del'>-			phydev_err(phydev, "phy_read err: %d.\n", reg);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (reg &amp; MII_SPEED_100)</div><div class='del'>-			speed = SPEED_100;</div><div class='del'>-		else if (reg &amp; MII_SPEED_10)</div><div class='del'>-			speed = SPEED_10;</div><div class='del'>-	} else {</div><div class='del'>-		int bmcr = phy_read(phydev, MII_BMCR);</div><div class='del'>-</div><div class='del'>-		if (bmcr &lt; 0) {</div><div class='del'>-			phydev_err(phydev, "phy_read err: %d.\n", bmcr);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bmcr &amp; BMCR_SPEED100)</div><div class='del'>-			speed = SPEED_100;</div><div class='del'>-		else</div><div class='del'>-			speed = SPEED_10;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If mode switch happens from 10BT to 100BT, all DSP/AFE</div><div class='ctx'> 	 * registers are set to default values. So any AFE/DSP</div><div class='ctx'> 	 * registers have to be re-initialized in this case.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((phydev-&gt;speed == SPEED_10) &amp;&amp; (speed == SPEED_100)) {</div><div class='add'>+	if (phydev-&gt;state == PHY_RUNNING &amp;&amp; phydev-&gt;speed == SPEED_100) {</div><div class='ctx'> 		int ret = rockchip_integrated_phy_analog_init(phydev);</div><div class='add'>+</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			phydev_err(phydev, "rockchip_integrated_phy_analog_init err: %d.\n",</div><div class='ctx'> 				   ret);</div><div class='hunk'>@@ -202,7 +175,7 @@ static struct phy_driver rockchip_phy_driver[] = {</div><div class='ctx'> 	.phy_id			= INTERNAL_EPHY_ID,</div><div class='ctx'> 	.phy_id_mask		= 0xfffffff0,</div><div class='ctx'> 	.name			= "Rockchip integrated EPHY",</div><div class='del'>-	.features		= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags			= 0,</div><div class='ctx'> 	.link_change_notify	= rockchip_link_change_notify,</div><div class='ctx'> 	.soft_reset		= genphy_soft_reset,</div><div class='head'>diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c<br/>index c94d3bfbc772..dc3d92d340c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/smsc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/smsc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/smsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/smsc.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ static struct phy_driver smsc_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "SMSC LAN83C185",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 	.probe		= smsc_phy_probe,</div><div class='ctx'> </div><div class='hunk'>@@ -233,7 +233,7 @@ static struct phy_driver smsc_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "SMSC LAN8187",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 	.probe		= smsc_phy_probe,</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +257,7 @@ static struct phy_driver smsc_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "SMSC LAN8700",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 	.probe		= smsc_phy_probe,</div><div class='ctx'> </div><div class='hunk'>@@ -282,7 +282,7 @@ static struct phy_driver smsc_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "SMSC LAN911x Internal PHY",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 	.probe		= smsc_phy_probe,</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +300,7 @@ static struct phy_driver smsc_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "SMSC LAN8710/LAN8720",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags		= PHY_RST_AFTER_CLK_EN,</div><div class='ctx'> </div><div class='ctx'> 	.probe		= smsc_phy_probe,</div><div class='hunk'>@@ -326,7 +326,7 @@ static struct phy_driver smsc_phy_driver[] = {</div><div class='ctx'> 	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.name		= "SMSC LAN8740",</div><div class='ctx'> </div><div class='del'>-	.features	= PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> </div><div class='ctx'> 	.probe		= smsc_phy_probe,</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c<br/>index 92b64e254b44..7475cef17cf7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/spi_ks8995.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/spi_ks8995.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/spi_ks8995.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/spi_ks8995.c</a></div><div class='hunk'>@@ -159,6 +159,14 @@ static const struct spi_device_id ks8995_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(spi, ks8995_id);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id ks8895_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, ks8895_spi_of_match);</div><div class='add'>+</div><div class='ctx'> static inline u8 get_chip_id(u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	return (val &gt;&gt; ID1_CHIPID_S) &amp; ID1_CHIPID_M;</div><div class='hunk'>@@ -526,6 +534,7 @@ static int ks8995_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver ks8995_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	    = "spi-ks8995",</div><div class='add'>+		.of_match_table = of_match_ptr(ks8895_spi_of_match),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	  = ks8995_probe,</div><div class='ctx'> 	.remove	  = ks8995_remove,</div><div class='head'>diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c<br/>index 5b6acf431f98..d735a01380ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/ste10Xp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/ste10Xp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/ste10Xp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/ste10Xp.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ static struct phy_driver ste10xp_pdriver[] = {</div><div class='ctx'> 	.phy_id = STE101P_PHY_ID,</div><div class='ctx'> 	.phy_id_mask = 0xfffffff0,</div><div class='ctx'> 	.name = "STe101p",</div><div class='del'>-	.features = PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init = ste10Xp_config_init,</div><div class='ctx'> 	.ack_interrupt = ste10Xp_ack_interrupt,</div><div class='ctx'> 	.config_intr = ste10Xp_config_intr,</div><div class='hunk'>@@ -91,7 +91,7 @@ static struct phy_driver ste10xp_pdriver[] = {</div><div class='ctx'> 	.phy_id = STE100P_PHY_ID,</div><div class='ctx'> 	.phy_id_mask = 0xffffffff,</div><div class='ctx'> 	.name = "STe100p",</div><div class='del'>-	.features = PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.config_init = ste10Xp_config_init,</div><div class='ctx'> 	.ack_interrupt = ste10Xp_ack_interrupt,</div><div class='ctx'> 	.config_intr = ste10Xp_config_intr,</div><div class='head'>diff --git a/drivers/net/phy/uPD60620.c b/drivers/net/phy/uPD60620.c<br/>index 219fc7cdc2b3..a32b3fd8a370 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/uPD60620.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/uPD60620.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/uPD60620.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/uPD60620.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ static struct phy_driver upd60620_driver[1] = { {</div><div class='ctx'> 	.phy_id         = UPD60620_PHY_ID,</div><div class='ctx'> 	.phy_id_mask    = 0xfffffffe,</div><div class='ctx'> 	.name           = "Renesas uPD60620",</div><div class='del'>-	.features       = PHY_BASIC_FEATURES,</div><div class='add'>+	/* PHY_BASIC_FEATURES */</div><div class='ctx'> 	.flags          = 0,</div><div class='ctx'> 	.config_init    = upd60620_config_init,</div><div class='ctx'> 	.read_status    = upd60620_read_status,</div><div class='head'>diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c<br/>index dc0dd87a6694..43691b1acfd9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/vitesse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/phy/vitesse.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/phy/vitesse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/phy/vitesse.c</a></div><div class='hunk'>@@ -61,7 +61,6 @@</div><div class='ctx'> </div><div class='ctx'> #define PHY_ID_VSC8234			0x000fc620</div><div class='ctx'> #define PHY_ID_VSC8244			0x000fc6c0</div><div class='del'>-#define PHY_ID_VSC8514			0x00070670</div><div class='ctx'> #define PHY_ID_VSC8572			0x000704d0</div><div class='ctx'> #define PHY_ID_VSC8601			0x00070420</div><div class='ctx'> #define PHY_ID_VSC7385			0x00070450</div><div class='hunk'>@@ -293,7 +292,6 @@ static int vsc82xx_config_intr(struct phy_device *phydev)</div><div class='ctx'> 		err = phy_write(phydev, MII_VSC8244_IMASK,</div><div class='ctx'> 			(phydev-&gt;drv-&gt;phy_id == PHY_ID_VSC8234 ||</div><div class='ctx'> 			 phydev-&gt;drv-&gt;phy_id == PHY_ID_VSC8244 ||</div><div class='del'>-			 phydev-&gt;drv-&gt;phy_id == PHY_ID_VSC8514 ||</div><div class='ctx'> 			 phydev-&gt;drv-&gt;phy_id == PHY_ID_VSC8572 ||</div><div class='ctx'> 			 phydev-&gt;drv-&gt;phy_id == PHY_ID_VSC8601) ?</div><div class='ctx'> 				MII_VSC8244_IMASK_MASK :</div><div class='hunk'>@@ -389,7 +387,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC8234,</div><div class='ctx'> 	.name           = "Vitesse VSC8234",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = &amp;vsc824x_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc82x4_config_aneg,</div><div class='ctx'> 	.ack_interrupt  = &amp;vsc824x_ack_interrupt,</div><div class='hunk'>@@ -398,16 +396,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8244,</div><div class='ctx'> 	.name		= "Vitesse VSC8244",</div><div class='ctx'> 	.phy_id_mask	= 0x000fffc0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='del'>-	.config_init	= &amp;vsc824x_config_init,</div><div class='del'>-	.config_aneg	= &amp;vsc82x4_config_aneg,</div><div class='del'>-	.ack_interrupt	= &amp;vsc824x_ack_interrupt,</div><div class='del'>-	.config_intr	= &amp;vsc82xx_config_intr,</div><div class='del'>-}, {</div><div class='del'>-	.phy_id		= PHY_ID_VSC8514,</div><div class='del'>-	.name		= "Vitesse VSC8514",</div><div class='del'>-	.phy_id_mask	= 0x000ffff0,</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;vsc824x_config_init,</div><div class='ctx'> 	.config_aneg	= &amp;vsc82x4_config_aneg,</div><div class='ctx'> 	.ack_interrupt	= &amp;vsc824x_ack_interrupt,</div><div class='hunk'>@@ -416,7 +405,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC8572,</div><div class='ctx'> 	.name           = "Vitesse VSC8572",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = &amp;vsc824x_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc82x4_config_aneg,</div><div class='ctx'> 	.ack_interrupt  = &amp;vsc824x_ack_interrupt,</div><div class='hunk'>@@ -425,7 +414,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC8601,</div><div class='ctx'> 	.name           = "Vitesse VSC8601",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = &amp;vsc8601_config_init,</div><div class='ctx'> 	.ack_interrupt  = &amp;vsc824x_ack_interrupt,</div><div class='ctx'> 	.config_intr    = &amp;vsc82xx_config_intr,</div><div class='hunk'>@@ -433,7 +422,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC7385,</div><div class='ctx'> 	.name           = "Vitesse VSC7385",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = vsc738x_config_init,</div><div class='ctx'> 	.config_aneg    = vsc73xx_config_aneg,</div><div class='ctx'> 	.read_page      = vsc73xx_read_page,</div><div class='hunk'>@@ -442,7 +431,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC7388,</div><div class='ctx'> 	.name           = "Vitesse VSC7388",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = vsc738x_config_init,</div><div class='ctx'> 	.config_aneg    = vsc73xx_config_aneg,</div><div class='ctx'> 	.read_page      = vsc73xx_read_page,</div><div class='hunk'>@@ -451,7 +440,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC7395,</div><div class='ctx'> 	.name           = "Vitesse VSC7395",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = vsc739x_config_init,</div><div class='ctx'> 	.config_aneg    = vsc73xx_config_aneg,</div><div class='ctx'> 	.read_page      = vsc73xx_read_page,</div><div class='hunk'>@@ -460,7 +449,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC7398,</div><div class='ctx'> 	.name           = "Vitesse VSC7398",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = vsc739x_config_init,</div><div class='ctx'> 	.config_aneg    = vsc73xx_config_aneg,</div><div class='ctx'> 	.read_page      = vsc73xx_read_page,</div><div class='hunk'>@@ -469,7 +458,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id         = PHY_ID_VSC8662,</div><div class='ctx'> 	.name           = "Vitesse VSC8662",</div><div class='ctx'> 	.phy_id_mask    = 0x000ffff0,</div><div class='del'>-	.features       = PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init    = &amp;vsc824x_config_init,</div><div class='ctx'> 	.config_aneg    = &amp;vsc82x4_config_aneg,</div><div class='ctx'> 	.ack_interrupt  = &amp;vsc824x_ack_interrupt,</div><div class='hunk'>@@ -479,7 +468,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8221,</div><div class='ctx'> 	.phy_id_mask	= 0x000ffff0,</div><div class='ctx'> 	.name		= "Vitesse VSC8221",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;vsc8221_config_init,</div><div class='ctx'> 	.ack_interrupt	= &amp;vsc824x_ack_interrupt,</div><div class='ctx'> 	.config_intr	= &amp;vsc82xx_config_intr,</div><div class='hunk'>@@ -488,7 +477,7 @@ static struct phy_driver vsc82xx_driver[] = {</div><div class='ctx'> 	.phy_id		= PHY_ID_VSC8211,</div><div class='ctx'> 	.phy_id_mask	= 0x000ffff0,</div><div class='ctx'> 	.name		= "Vitesse VSC8211",</div><div class='del'>-	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	/* PHY_GBIT_FEATURES */</div><div class='ctx'> 	.config_init	= &amp;vsc8221_config_init,</div><div class='ctx'> 	.ack_interrupt	= &amp;vsc824x_ack_interrupt,</div><div class='ctx'> 	.config_intr	= &amp;vsc82xx_config_intr,</div><div class='hunk'>@@ -499,7 +488,6 @@ module_phy_driver(vsc82xx_driver);</div><div class='ctx'> static struct mdio_device_id __maybe_unused vitesse_tbl[] = {</div><div class='ctx'> 	{ PHY_ID_VSC8234, 0x000ffff0 },</div><div class='ctx'> 	{ PHY_ID_VSC8244, 0x000fffc0 },</div><div class='del'>-	{ PHY_ID_VSC8514, 0x000ffff0 },</div><div class='ctx'> 	{ PHY_ID_VSC8572, 0x000ffff0 },</div><div class='ctx'> 	{ PHY_ID_VSC7385, 0x000ffff0 },</div><div class='ctx'> 	{ PHY_ID_VSC7388, 0x000ffff0 },</div><div class='head'>diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c<br/>index 7ccdc62c6052..ff61dd8748de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ppp/ppp_mppe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/ppp/ppp_mppe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/ppp/ppp_mppe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/ppp/ppp_mppe.c</a></div><div class='hunk'>@@ -222,7 +222,6 @@ static void *mppe_alloc(unsigned char *options, int optlen)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> 	state-&gt;sha1-&gt;tfm = shash;</div><div class='del'>-	state-&gt;sha1-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	digestsize = crypto_shash_digestsize(shash);</div><div class='ctx'> 	if (digestsize &lt; MPPE_MAX_KEY_LEN)</div><div class='head'>diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c<br/>index 941cfa8f1c2a..627b3a4405ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/sb1000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/sb1000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/sb1000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/sb1000.c</a></div><div class='hunk'>@@ -316,7 +316,7 @@ static int</div><div class='ctx'> card_send_command(const int ioaddr[], const char* name,</div><div class='ctx'> 	const unsigned char out[], unsigned char in[])</div><div class='ctx'> {</div><div class='del'>-	int status, x;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	if ((status = card_wait_for_busy_clear(ioaddr, name)))</div><div class='ctx'> 		return status;</div><div class='hunk'>@@ -345,9 +345,7 @@ card_send_command(const int ioaddr[], const char* name,</div><div class='ctx'> 				out[0], out[1], out[2], out[3], out[4], out[5]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (out[1] == 0x1b) {</div><div class='del'>-		x = (out[2] == 0x02);</div><div class='del'>-	} else {</div><div class='add'>+	if (out[1] != 0x1b) {</div><div class='ctx'> 		if (out[0] &gt;= 0x80 &amp;&amp; in[0] != (out[1] | 0x80))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -490,14 +488,13 @@ sb1000_check_CRC(const int ioaddr[], const char* name)</div><div class='ctx'> 	static const unsigned char Command0[6] = {0x80, 0x1f, 0x00, 0x00, 0x00, 0x00};</div><div class='ctx'> </div><div class='ctx'> 	unsigned char st[7];</div><div class='del'>-	int crc, status;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* check CRC */</div><div class='ctx'> 	if ((status = card_send_command(ioaddr, name, Command0, st)))</div><div class='ctx'> 		return status;</div><div class='ctx'> 	if (st[1] != st[3] || st[2] != st[4])</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	crc = st[1] &lt;&lt; 8 | st[2];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c<br/>index f4e93f5fc204..ea90db3c7705 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/slip/slhc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/slip/slhc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/slip/slhc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/slip/slhc.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ out_fail:</div><div class='ctx'> void</div><div class='ctx'> slhc_free(struct slcompress *comp)</div><div class='ctx'> {</div><div class='del'>-	if ( comp == NULLSLCOMPR )</div><div class='add'>+	if ( IS_ERR_OR_NULL(comp) )</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if ( comp-&gt;tstate != NULLSLSTATE )</div><div class='head'>diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c<br/>index 6ed96fdfd96d..2106045b3e16 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/team/team.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/team/team.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/team/team.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/team/team.c</a></div><div class='hunk'>@@ -38,13 +38,11 @@</div><div class='ctx'>  * Helpers</div><div class='ctx'>  **********/</div><div class='ctx'> </div><div class='del'>-#define team_port_exists(dev) (dev-&gt;priv_flags &amp; IFF_TEAM_PORT)</div><div class='del'>-</div><div class='ctx'> static struct team_port *team_port_get_rtnl(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct team_port *port = rtnl_dereference(dev-&gt;rx_handler_data);</div><div class='ctx'> </div><div class='del'>-	return team_port_exists(dev) ? port : NULL;</div><div class='add'>+	return netif_is_team_port(dev) ? port : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1143,7 +1141,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (team_port_exists(port_dev)) {</div><div class='add'>+	if (netif_is_team_port(port_dev)) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Device is already a port of a team device");</div><div class='ctx'> 		netdev_err(dev, "Device %s is already a port "</div><div class='ctx'> 				"of a team device\n", portname);</div><div class='hunk'>@@ -1156,6 +1154,13 @@ static int team_port_add(struct team *team, struct net_device *port_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (netdev_has_upper_dev(dev, port_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Device is already an upper device of the team interface");</div><div class='add'>+		netdev_err(dev, "Device %s is already an upper device of the team interface\n",</div><div class='add'>+			   portname);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (port_dev-&gt;features &amp; NETIF_F_VLAN_CHALLENGED &amp;&amp;</div><div class='ctx'> 	    vlan_uses_dev(dev)) {</div><div class='ctx'> 		NL_SET_ERR_MSG(extack, "Device is VLAN challenged and team device has VLAN set up");</div><div class='hunk'>@@ -1246,6 +1251,23 @@ static int team_port_add(struct team *team, struct net_device *port_dev,</div><div class='ctx'> 		goto err_option_port_add;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* set promiscuity level to new slave */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		err = dev_set_promiscuity(port_dev, 1);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_set_slave_promisc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set allmulti level to new slave */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		err = dev_set_allmulti(port_dev, 1);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+				dev_set_promiscuity(port_dev, -1);</div><div class='add'>+			goto err_set_slave_promisc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	netif_addr_lock_bh(dev);</div><div class='ctx'> 	dev_uc_sync_multiple(port_dev, dev);</div><div class='ctx'> 	dev_mc_sync_multiple(port_dev, dev);</div><div class='hunk'>@@ -1262,6 +1284,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_set_slave_promisc:</div><div class='add'>+	__team_option_inst_del_port(team, port);</div><div class='add'>+</div><div class='ctx'> err_option_port_add:</div><div class='ctx'> 	team_upper_dev_unlink(team, port);</div><div class='ctx'> </div><div class='hunk'>@@ -1307,6 +1332,12 @@ static int team_port_del(struct team *team, struct net_device *port_dev)</div><div class='ctx'> </div><div class='ctx'> 	team_port_disable(team, port);</div><div class='ctx'> 	list_del_rcu(&amp;port-&gt;list);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+		dev_set_promiscuity(port_dev, -1);</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='add'>+		dev_set_allmulti(port_dev, -1);</div><div class='add'>+</div><div class='ctx'> 	team_upper_dev_unlink(team, port);</div><div class='ctx'> 	netdev_rx_handler_unregister(port_dev);</div><div class='ctx'> 	team_port_disable_netpoll(port);</div><div class='hunk'>@@ -1691,8 +1722,7 @@ static netdev_tx_t team_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 team_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			     struct net_device *sb_dev,</div><div class='del'>-			     select_queue_fallback_t fallback)</div><div class='add'>+			     struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This helper function exists to help dev_pick_tx get the correct</div><div class='hunk'>@@ -2260,7 +2290,7 @@ static int team_nl_fill_one_option_get(struct sk_buff *skb, struct team *team,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);</div><div class='add'>+	option_item = nla_nest_start_noflag(skb, TEAM_ATTR_ITEM_OPTION);</div><div class='ctx'> 	if (!option_item)</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -2374,7 +2404,7 @@ start_again:</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team-&gt;dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	option_list = nla_nest_start(skb, TEAM_ATTR_LIST_OPTION);</div><div class='add'>+	option_list = nla_nest_start_noflag(skb, TEAM_ATTR_LIST_OPTION);</div><div class='ctx'> 	if (!option_list)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -2480,9 +2510,11 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto team_put;</div><div class='ctx'> 		}</div><div class='del'>-		err = nla_parse_nested(opt_attrs, TEAM_ATTR_OPTION_MAX,</div><div class='del'>-				       nl_option, team_nl_option_policy,</div><div class='del'>-				       info-&gt;extack);</div><div class='add'>+		err = nla_parse_nested_deprecated(opt_attrs,</div><div class='add'>+						  TEAM_ATTR_OPTION_MAX,</div><div class='add'>+						  nl_option,</div><div class='add'>+						  team_nl_option_policy,</div><div class='add'>+						  info-&gt;extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto team_put;</div><div class='ctx'> 		if (!opt_attrs[TEAM_ATTR_OPTION_NAME] ||</div><div class='hunk'>@@ -2596,7 +2628,7 @@ static int team_nl_fill_one_port_get(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct nlattr *port_item;</div><div class='ctx'> </div><div class='del'>-	port_item = nla_nest_start(skb, TEAM_ATTR_ITEM_PORT);</div><div class='add'>+	port_item = nla_nest_start_noflag(skb, TEAM_ATTR_ITEM_PORT);</div><div class='ctx'> 	if (!port_item)</div><div class='ctx'> 		goto nest_cancel;</div><div class='ctx'> 	if (nla_put_u32(skb, TEAM_ATTR_PORT_IFINDEX, port-&gt;dev-&gt;ifindex))</div><div class='hunk'>@@ -2651,7 +2683,7 @@ start_again:</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team-&gt;dev-&gt;ifindex))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='del'>-	port_list = nla_nest_start(skb, TEAM_ATTR_LIST_PORT);</div><div class='add'>+	port_list = nla_nest_start_noflag(skb, TEAM_ATTR_LIST_PORT);</div><div class='ctx'> 	if (!port_list)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='hunk'>@@ -2725,25 +2757,25 @@ static int team_nl_cmd_port_list_get(struct sk_buff *skb,</div><div class='ctx'> static const struct genl_ops team_nl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = TEAM_CMD_NOOP,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = team_nl_cmd_noop,</div><div class='del'>-		.policy = team_nl_policy,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = TEAM_CMD_OPTIONS_SET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = team_nl_cmd_options_set,</div><div class='del'>-		.policy = team_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = TEAM_CMD_OPTIONS_GET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = team_nl_cmd_options_get,</div><div class='del'>-		.policy = team_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = TEAM_CMD_PORT_LIST_GET,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = team_nl_cmd_port_list_get,</div><div class='del'>-		.policy = team_nl_policy,</div><div class='ctx'> 		.flags = GENL_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -2756,6 +2788,7 @@ static struct genl_family team_nl_family __ro_after_init = {</div><div class='ctx'> 	.name		= TEAM_GENL_NAME,</div><div class='ctx'> 	.version	= TEAM_GENL_VERSION,</div><div class='ctx'> 	.maxattr	= TEAM_ATTR_MAX,</div><div class='add'>+	.policy = team_nl_policy,</div><div class='ctx'> 	.netnsok	= true,</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> 	.ops		= team_nl_ops,</div><div class='head'>diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c<br/>index c48c3a1eb1f8..fcf31335a8b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/thunderbolt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/thunderbolt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/thunderbolt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/thunderbolt.c</a></div><div class='hunk'>@@ -1282,6 +1282,7 @@ static int __maybe_unused tbnet_suspend(struct device *dev)</div><div class='ctx'> 		tbnet_tear_down(net, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tb_unregister_protocol_handler(&amp;net-&gt;handler);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1290,6 +1291,8 @@ static int __maybe_unused tbnet_resume(struct device *dev)</div><div class='ctx'> 	struct tb_service *svc = tb_to_service(dev);</div><div class='ctx'> 	struct tbnet *net = tb_service_get_drvdata(svc);</div><div class='ctx'> </div><div class='add'>+	tb_register_protocol_handler(&amp;net-&gt;handler);</div><div class='add'>+</div><div class='ctx'> 	netif_carrier_off(net-&gt;dev);</div><div class='ctx'> 	if (netif_running(net-&gt;dev)) {</div><div class='ctx'> 		netif_device_attach(net-&gt;dev);</div><div class='head'>diff --git a/drivers/net/tun.c b/drivers/net/tun.c<br/>index 1d68921723dc..9d72f8c76c15 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/tun.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/tun.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/tun.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/tun.c</a></div><div class='hunk'>@@ -606,8 +606,7 @@ static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct net_device *sb_dev,</div><div class='del'>-			    select_queue_fallback_t fallback)</div><div class='add'>+			    struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tun_struct *tun = netdev_priv(dev);</div><div class='ctx'> 	u16 ret;</div><div class='hunk'>@@ -1043,7 +1042,7 @@ static int tun_net_close(struct net_device *dev)</div><div class='ctx'> static void tun_automq_xmit(struct tun_struct *tun, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='del'>-	if (tun-&gt;numqueues == 1 &amp;&amp; static_key_false(&amp;rps_needed)) {</div><div class='add'>+	if (tun-&gt;numqueues == 1 &amp;&amp; static_branch_unlikely(&amp;rps_needed)) {</div><div class='ctx'> 		/* Select queue was not called for the skbuff, so we extract the</div><div class='ctx'> 		 * RPS hash and save it into the flow_table here.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1763,9 +1762,6 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,</div><div class='ctx'> 	int skb_xdp = 1;</div><div class='ctx'> 	bool frags = tun_napi_frags_enabled(tfile);</div><div class='ctx'> </div><div class='del'>-	if (!(tun-&gt;dev-&gt;flags &amp; IFF_UP))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	if (!(tun-&gt;flags &amp; IFF_NO_PI)) {</div><div class='ctx'> 		if (len &lt; sizeof(pi))</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1867,6 +1863,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,</div><div class='ctx'> 			err = skb_copy_datagram_from_iter(skb, 0, from, len);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+drop:</div><div class='ctx'> 			this_cpu_inc(tun-&gt;pcpu_stats-&gt;rx_dropped);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			if (frags) {</div><div class='hunk'>@@ -1874,7 +1872,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,</div><div class='ctx'> 				mutex_unlock(&amp;tfile-&gt;napi_mutex);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			return -EFAULT;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1958,13 +1956,22 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,</div><div class='ctx'> 	    !tfile-&gt;detached)</div><div class='ctx'> 		rxhash = __skb_get_hash_symmetric(skb);</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (unlikely(!(tun-&gt;dev-&gt;flags &amp; IFF_UP))) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (frags) {</div><div class='ctx'> 		/* Exercise flow dissector code path. */</div><div class='del'>-		u32 headlen = eth_get_headlen(skb-&gt;data, skb_headlen(skb));</div><div class='add'>+		u32 headlen = eth_get_headlen(tun-&gt;dev, skb-&gt;data,</div><div class='add'>+					      skb_headlen(skb));</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(headlen &gt; skb_headlen(skb))) {</div><div class='ctx'> 			this_cpu_inc(tun-&gt;pcpu_stats-&gt;rx_dropped);</div><div class='ctx'> 			napi_free_frags(&amp;tfile-&gt;napi);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			mutex_unlock(&amp;tfile-&gt;napi_mutex);</div><div class='ctx'> 			WARN_ON(1);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -1992,6 +1999,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netif_rx_ni(skb);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	stats = get_cpu_ptr(tun-&gt;pcpu_stats);</div><div class='ctx'> 	u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='hunk'>@@ -2865,8 +2873,7 @@ err_free_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tun_get_iff(struct net *net, struct tun_struct *tun,</div><div class='del'>-		       struct ifreq *ifr)</div><div class='add'>+static void tun_get_iff(struct tun_struct *tun, struct ifreq *ifr)</div><div class='ctx'> {</div><div class='ctx'> 	tun_debug(KERN_INFO, tun, "tun_get_iff\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3095,10 +3102,11 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> 	tun_debug(KERN_INFO, tun, "tun_chr_ioctl cmd %u\n", cmd);</div><div class='ctx'> </div><div class='add'>+	net = dev_net(tun-&gt;dev);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case TUNGETIFF:</div><div class='del'>-		tun_get_iff(current-&gt;nsproxy-&gt;net_ns, tun, &amp;ifr);</div><div class='add'>+		tun_get_iff(tun, &amp;ifr);</div><div class='ctx'> </div><div class='ctx'> 		if (tfile-&gt;detached)</div><div class='ctx'> 			ifr.ifr_flags |= IFF_DETACH_QUEUE;</div><div class='hunk'>@@ -3320,6 +3328,13 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		ret = tun_net_change_carrier(tun-&gt;dev, (bool)carrier);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case TUNGETDEVNETNS:</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		if (!ns_capable(net-&gt;user_ns, CAP_NET_ADMIN))</div><div class='add'>+			goto unlock;</div><div class='add'>+		ret = open_related_ns(&amp;net-&gt;ns, get_net_ns);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3449,7 +3464,7 @@ static void tun_chr_show_fdinfo(struct seq_file *m, struct file *file)</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	tun = tun_get(tfile);</div><div class='ctx'> 	if (tun)</div><div class='del'>-		tun_get_iff(current-&gt;nsproxy-&gt;net_ns, tun, &amp;ifr);</div><div class='add'>+		tun_get_iff(tun, &amp;ifr);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (tun)</div><div class='head'>diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c<br/>index 820a2fe7d027..aff995be2a31 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/aqc111.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/aqc111.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/aqc111.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/aqc111.c</a></div><div class='hunk'>@@ -1301,6 +1301,20 @@ static const struct driver_info trendnet_info = {</div><div class='ctx'> 	.tx_fixup	= aqc111_tx_fixup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct driver_info qnap_info = {</div><div class='add'>+	.description	= "QNAP QNA-UC5G1T USB to 5GbE Adapter",</div><div class='add'>+	.bind		= aqc111_bind,</div><div class='add'>+	.unbind		= aqc111_unbind,</div><div class='add'>+	.status		= aqc111_status,</div><div class='add'>+	.link_reset	= aqc111_link_reset,</div><div class='add'>+	.reset		= aqc111_reset,</div><div class='add'>+	.stop		= aqc111_stop,</div><div class='add'>+	.flags		= FLAG_ETHER | FLAG_FRAMING_AX |</div><div class='add'>+			  FLAG_AVOID_UNLINK_URBS | FLAG_MULTI_PACKET,</div><div class='add'>+	.rx_fixup	= aqc111_rx_fixup,</div><div class='add'>+	.tx_fixup	= aqc111_tx_fixup,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int aqc111_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='ctx'> {</div><div class='ctx'> 	struct usbnet *dev = usb_get_intfdata(intf);</div><div class='hunk'>@@ -1455,6 +1469,7 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 	{AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)},</div><div class='ctx'> 	{AQC111_USB_ETH_DEV(0x0b95, 0x2791, asix112_info)},</div><div class='ctx'> 	{AQC111_USB_ETH_DEV(0x20f4, 0xe05a, trendnet_info)},</div><div class='add'>+	{AQC111_USB_ETH_DEV(0x1c04, 0x0015, qnap_info)},</div><div class='ctx'> 	{ },/* END */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, products);</div><div class='head'>diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c<br/>index 5512a1038721..3e9b2c319e45 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/cdc_ether.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/cdc_ether.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/cdc_ether.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/cdc_ether.c</a></div><div class='hunk'>@@ -851,6 +851,14 @@ static const struct usb_device_id	products[] = {</div><div class='ctx'> 	.driver_info = 0,</div><div class='ctx'> },</div><div class='ctx'> </div><div class='add'>+/* QNAP QNA-UC5G1T USB to 5GbE Adapter (based on AQC111U) */</div><div class='add'>+{</div><div class='add'>+	USB_DEVICE_AND_INTERFACE_INFO(0x1c04, 0x0015, USB_CLASS_COMM,</div><div class='add'>+				      USB_CDC_SUBCLASS_ETHERNET,</div><div class='add'>+				      USB_CDC_PROTO_NONE),</div><div class='add'>+	.driver_info = 0,</div><div class='add'>+},</div><div class='add'>+</div><div class='ctx'> /* WHITELIST!!!</div><div class='ctx'>  *</div><div class='ctx'>  * CDC Ether uses two interfaces, not necessarily consecutive.</div><div class='head'>diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c<br/>index 0362acd5cdca..28321aca48fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/cdc_mbim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/cdc_mbim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/cdc_mbim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/cdc_mbim.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/usb/cdc_ncm.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* alternative VLAN for IP session 0 if not untagged */</div><div class='ctx'> #define MBIM_IPS0_VID	4094</div><div class='head'>diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c<br/>index 3d8a70d3ea9b..c247aed2dceb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/ipheth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/ipheth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/ipheth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/ipheth.c</a></div><div class='hunk'>@@ -54,17 +54,6 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_APPLE        0x05ac</div><div class='del'>-#define USB_PRODUCT_IPHONE      0x1290</div><div class='del'>-#define USB_PRODUCT_IPHONE_3G   0x1292</div><div class='del'>-#define USB_PRODUCT_IPHONE_3GS  0x1294</div><div class='del'>-#define USB_PRODUCT_IPHONE_4	0x1297</div><div class='del'>-#define USB_PRODUCT_IPAD 0x129a</div><div class='del'>-#define USB_PRODUCT_IPAD_2	0x12a2</div><div class='del'>-#define USB_PRODUCT_IPAD_3	0x12a6</div><div class='del'>-#define USB_PRODUCT_IPAD_MINI    0x12ab</div><div class='del'>-#define USB_PRODUCT_IPHONE_4_VZW 0x129c</div><div class='del'>-#define USB_PRODUCT_IPHONE_4S	0x12a0</div><div class='del'>-#define USB_PRODUCT_IPHONE_5	0x12a8</div><div class='ctx'> </div><div class='ctx'> #define IPHETH_USBINTF_CLASS    255</div><div class='ctx'> #define IPHETH_USBINTF_SUBCLASS 253</div><div class='hunk'>@@ -88,50 +77,9 @@</div><div class='ctx'> #define IPHETH_CARRIER_ON       0x04</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id ipheth_table[] = {</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPAD,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPAD_2,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPAD_3,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPAD_MINI,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4S,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='del'>-	{ USB_DEVICE_AND_INTERFACE_INFO(</div><div class='del'>-		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_5,</div><div class='del'>-		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,</div><div class='del'>-		IPHETH_USBINTF_PROTO) },</div><div class='add'>+	{ USB_VENDOR_AND_INTERFACE_INFO(USB_VENDOR_APPLE, IPHETH_USBINTF_CLASS,</div><div class='add'>+					IPHETH_USBINTF_SUBCLASS,</div><div class='add'>+					IPHETH_USBINTF_PROTO) },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, ipheth_table);</div><div class='hunk'>@@ -293,8 +241,6 @@ static int ipheth_carrier_set(struct ipheth_device *dev)</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (!dev)</div><div class='del'>-		return 0;</div><div class='ctx'> 	if (!dev-&gt;confirmed_pairing)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c<br/>index 74bebbdb4b15..5c3ac97519b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/qmi_wwan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/qmi_wwan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/qmi_wwan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/qmi_wwan.c</a></div><div class='hunk'>@@ -63,6 +63,7 @@ enum qmi_wwan_flags {</div><div class='ctx'> </div><div class='ctx'> enum qmi_wwan_quirks {</div><div class='ctx'> 	QMI_WWAN_QUIRK_DTR = 1 &lt;&lt; 0,	/* needs "set DTR" request */</div><div class='add'>+	QMI_WWAN_QUIRK_QUECTEL_DYNCFG = 1 &lt;&lt; 1,	/* check num. endpoints */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qmimux_hdr {</div><div class='hunk'>@@ -845,6 +846,16 @@ static const struct driver_info	qmi_wwan_info_quirk_dtr = {</div><div class='ctx'> 	.data           = QMI_WWAN_QUIRK_DTR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct driver_info	qmi_wwan_info_quirk_quectel_dyncfg = {</div><div class='add'>+	.description	= "WWAN/QMI device",</div><div class='add'>+	.flags		= FLAG_WWAN | FLAG_SEND_ZLP,</div><div class='add'>+	.bind		= qmi_wwan_bind,</div><div class='add'>+	.unbind		= qmi_wwan_unbind,</div><div class='add'>+	.manage_power	= qmi_wwan_manage_power,</div><div class='add'>+	.rx_fixup       = qmi_wwan_rx_fixup,</div><div class='add'>+	.data           = QMI_WWAN_QUIRK_DTR | QMI_WWAN_QUIRK_QUECTEL_DYNCFG,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define HUAWEI_VENDOR_ID	0x12D1</div><div class='ctx'> </div><div class='ctx'> /* map QMI/wwan function by a fixed interface number */</div><div class='hunk'>@@ -865,6 +876,15 @@ static const struct driver_info	qmi_wwan_info_quirk_dtr = {</div><div class='ctx'> #define QMI_GOBI_DEVICE(vend, prod) \</div><div class='ctx'> 	QMI_FIXED_INTF(vend, prod, 0)</div><div class='ctx'> </div><div class='add'>+/* Quectel does not use fixed interface numbers on at least some of their</div><div class='add'>+ * devices. We need to check the number of endpoints to ensure that we bind to</div><div class='add'>+ * the correct interface.</div><div class='add'>+ */</div><div class='add'>+#define QMI_QUIRK_QUECTEL_DYNCFG(vend, prod) \</div><div class='add'>+	USB_DEVICE_AND_INTERFACE_INFO(vend, prod, USB_CLASS_VENDOR_SPEC, \</div><div class='add'>+				      USB_SUBCLASS_VENDOR_SPEC, 0xff), \</div><div class='add'>+	.driver_info = (unsigned long)&amp;qmi_wwan_info_quirk_quectel_dyncfg</div><div class='add'>+</div><div class='ctx'> static const struct usb_device_id products[] = {</div><div class='ctx'> 	/* 1. CDC ECM like devices match on the control interface */</div><div class='ctx'> 	{	/* Huawei E392, E398 and possibly others sharing both device id and more... */</div><div class='hunk'>@@ -969,20 +989,9 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 		USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),</div><div class='ctx'> 		.driver_info = (unsigned long)&amp;qmi_wwan_info,</div><div class='ctx'> 	},</div><div class='del'>-	{	/* Quectel EP06/EG06/EM06 */</div><div class='del'>-		USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x0306,</div><div class='del'>-					      USB_CLASS_VENDOR_SPEC,</div><div class='del'>-					      USB_SUBCLASS_VENDOR_SPEC,</div><div class='del'>-					      0xff),</div><div class='del'>-		.driver_info	    = (unsigned long)&amp;qmi_wwan_info_quirk_dtr,</div><div class='del'>-	},</div><div class='del'>-	{	/* Quectel EG12/EM12 */</div><div class='del'>-		USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x0512,</div><div class='del'>-					      USB_CLASS_VENDOR_SPEC,</div><div class='del'>-					      USB_SUBCLASS_VENDOR_SPEC,</div><div class='del'>-					      0xff),</div><div class='del'>-		.driver_info	    = (unsigned long)&amp;qmi_wwan_info_quirk_dtr,</div><div class='del'>-	},</div><div class='add'>+	{QMI_QUIRK_QUECTEL_DYNCFG(0x2c7c, 0x0125)},	/* Quectel EC25, EC20 R2.0  Mini PCIe */</div><div class='add'>+	{QMI_QUIRK_QUECTEL_DYNCFG(0x2c7c, 0x0306)},	/* Quectel EP06/EG06/EM06 */</div><div class='add'>+	{QMI_QUIRK_QUECTEL_DYNCFG(0x2c7c, 0x0512)},	/* Quectel EG12/EM12 */</div><div class='ctx'> </div><div class='ctx'> 	/* 3. Combined interface devices matching on interface number */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x0408, 0xea42, 4)},	/* Yota / Megafon M100-1 */</div><div class='hunk'>@@ -1122,9 +1131,16 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 	{QMI_FIXED_INTF(0x0846, 0x68d3, 8)},	/* Netgear Aircard 779S */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x12d1, 0x140c, 1)},	/* Huawei E173 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x12d1, 0x14ac, 1)},	/* Huawei E1820 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0x0918, 3)},	/* Wistron NeWeb D16Q1 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0x0918, 4)},	/* Wistron NeWeb D16Q1 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0x0918, 5)},	/* Wistron NeWeb D16Q1 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0x3185, 4)},	/* Wistron NeWeb M18Q5 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0xd111, 4)},	/* M9615A DM11-1 D51QC */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x1435, 0xd181, 3)},	/* Wistron NeWeb D18Q1 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x1435, 0xd181, 4)},	/* Wistron NeWeb D18Q1 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x1435, 0xd181, 5)},	/* Wistron NeWeb D18Q1 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0xd182, 4)},	/* Wistron NeWeb D18 */</div><div class='add'>+	{QMI_FIXED_INTF(0x1435, 0xd182, 5)},	/* Wistron NeWeb D18 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x1435, 0xd191, 4)},	/* Wistron NeWeb D19Q1 */</div><div class='ctx'> 	{QMI_QUIRK_SET_DTR(0x1508, 0x1001, 4)},	/* Fibocom NL668 series */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x16d8, 0x6003, 0)},	/* CMOTech 6003 */</div><div class='hunk'>@@ -1180,6 +1196,7 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x0265, 4)},	/* ONDA MT8205 4G LTE */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x0284, 4)},	/* ZTE MF880 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x0326, 4)},	/* ZTE MF821D */</div><div class='add'>+	{QMI_FIXED_INTF(0x19d2, 0x0396, 3)},	/* ZTE ZM8620 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x0412, 4)},	/* Telewell TW-LTE 4G */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x1008, 4)},	/* ZTE (Vodafone) K3570-Z */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x1010, 4)},	/* ZTE (Vodafone) K3571-Z */</div><div class='hunk'>@@ -1200,9 +1217,12 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x1425, 2)},</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x1426, 2)},	/* ZTE MF91 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x1428, 2)},	/* Telewell TW-LTE 4G v2 */</div><div class='add'>+	{QMI_FIXED_INTF(0x19d2, 0x1432, 3)},	/* ZTE ME3620 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x19d2, 0x2002, 4)},	/* ZTE (Vodafone) K3765-Z */</div><div class='add'>+	{QMI_FIXED_INTF(0x2001, 0x7e16, 3)},	/* D-Link DWM-221 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x2001, 0x7e19, 4)},	/* D-Link DWM-221 B1 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x2001, 0x7e35, 4)},	/* D-Link DWM-222 */</div><div class='add'>+	{QMI_FIXED_INTF(0x2020, 0x2031, 4)},	/* Olicard 600 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x2020, 0x2033, 4)},	/* BroadMobi BM806U */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)},    /* Sierra Wireless MC7700 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x114f, 0x68a2, 8)},    /* Sierra Wireless MC7750 */</div><div class='hunk'>@@ -1270,7 +1290,6 @@ static const struct usb_device_id products[] = {</div><div class='ctx'> 	{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)},	/* HP lt4120 Snapdragon X5 LTE */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x22de, 0x9061, 3)},	/* WeTelecom WPD-600N */</div><div class='ctx'> 	{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)},	/* SIMCom 7100E, 7230E, 7600E ++ */</div><div class='del'>-	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)},	/* Quectel EC25, EC20 R2.0  Mini PCIe */</div><div class='ctx'> 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)},	/* Quectel EC21 Mini PCIe */</div><div class='ctx'> 	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)},	/* Quectel EG91 */</div><div class='ctx'> 	{QMI_FIXED_INTF(0x2c7c, 0x0296, 4)},	/* Quectel BG96 */</div><div class='hunk'>@@ -1350,27 +1369,12 @@ static bool quectel_ec20_detected(struct usb_interface *intf)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool quectel_diag_detected(struct usb_interface *intf)</div><div class='del'>-{</div><div class='del'>-	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='del'>-	struct usb_interface_descriptor intf_desc = intf-&gt;cur_altsetting-&gt;desc;</div><div class='del'>-	u16 id_vendor = le16_to_cpu(dev-&gt;descriptor.idVendor);</div><div class='del'>-	u16 id_product = le16_to_cpu(dev-&gt;descriptor.idProduct);</div><div class='del'>-</div><div class='del'>-	if (id_vendor != 0x2c7c || intf_desc.bNumEndpoints != 2)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (id_product == 0x0306 || id_product == 0x0512)</div><div class='del'>-		return true;</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int qmi_wwan_probe(struct usb_interface *intf,</div><div class='ctx'> 			  const struct usb_device_id *prod)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device_id *id = (struct usb_device_id *)prod;</div><div class='ctx'> 	struct usb_interface_descriptor *desc = &amp;intf-&gt;cur_altsetting-&gt;desc;</div><div class='add'>+	const struct driver_info *info;</div><div class='ctx'> </div><div class='ctx'> 	/* Workaround to enable dynamic IDs.  This disables usbnet</div><div class='ctx'> 	 * blacklisting functionality.  Which, if required, can be</div><div class='hunk'>@@ -1404,10 +1408,14 @@ static int qmi_wwan_probe(struct usb_interface *intf,</div><div class='ctx'> 	 * we need to match on class/subclass/protocol. These values are</div><div class='ctx'> 	 * identical for the diagnostic- and QMI-interface, but bNumEndpoints is</div><div class='ctx'> 	 * different. Ignore the current interface if the number of endpoints</div><div class='del'>-	 * the number for the diag interface (two).</div><div class='add'>+	 * equals the number for the diag interface (two).</div><div class='ctx'> 	 */</div><div class='del'>-	if (quectel_diag_detected(intf))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	info = (void *)&amp;id-&gt;driver_info;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;data &amp; QMI_WWAN_QUIRK_QUECTEL_DYNCFG) {</div><div class='add'>+		if (desc-&gt;bNumEndpoints == 2)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return usbnet_probe(intf, id);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c<br/>index 86c8c64fbb0f..b01bfa63860d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/r8152.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/r8152.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/r8152.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/r8152.c</a></div><div class='hunk'>@@ -1212,7 +1212,6 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa)</div><div class='ctx'> 		goto amacout;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(sa-&gt;sa_data, buf, 6);</div><div class='del'>-	ether_addr_copy(tp-&gt;netdev-&gt;dev_addr, sa-&gt;sa_data);</div><div class='ctx'> 	netif_info(tp, probe, tp-&gt;netdev,</div><div class='ctx'> 		   "Using pass-thru MAC addr %pM\n", sa-&gt;sa_data);</div><div class='ctx'> </div><div class='hunk'>@@ -1221,43 +1220,57 @@ amacout:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_ethernet_addr(struct r8152 *tp)</div><div class='add'>+static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = tp-&gt;netdev;</div><div class='del'>-	struct sockaddr sa;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	sa-&gt;sa_family = dev-&gt;type;</div><div class='add'>+</div><div class='ctx'> 	if (tp-&gt;version == RTL_VER_01) {</div><div class='del'>-		ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);</div><div class='add'>+		ret = pla_ocp_read(tp, PLA_IDR, 8, sa-&gt;sa_data);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* if device doesn't support MAC pass through this will</div><div class='ctx'> 		 * be expected to be non-zero</div><div class='ctx'> 		 */</div><div class='del'>-		ret = vendor_mac_passthru_addr_read(tp, &amp;sa);</div><div class='add'>+		ret = vendor_mac_passthru_addr_read(tp, sa);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);</div><div class='add'>+			ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa-&gt;sa_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netif_err(tp, probe, dev, "Get ether addr fail\n");</div><div class='del'>-	} else if (!is_valid_ether_addr(sa.sa_data)) {</div><div class='add'>+	} else if (!is_valid_ether_addr(sa-&gt;sa_data)) {</div><div class='ctx'> 		netif_err(tp, probe, dev, "Invalid ether addr %pM\n",</div><div class='del'>-			  sa.sa_data);</div><div class='add'>+			  sa-&gt;sa_data);</div><div class='ctx'> 		eth_hw_addr_random(dev);</div><div class='del'>-		ether_addr_copy(sa.sa_data, dev-&gt;dev_addr);</div><div class='del'>-		ret = rtl8152_set_mac_address(dev, &amp;sa);</div><div class='add'>+		ether_addr_copy(sa-&gt;sa_data, dev-&gt;dev_addr);</div><div class='ctx'> 		netif_info(tp, probe, dev, "Random ether addr %pM\n",</div><div class='del'>-			   sa.sa_data);</div><div class='del'>-	} else {</div><div class='del'>-		if (tp-&gt;version == RTL_VER_01)</div><div class='del'>-			ether_addr_copy(dev-&gt;dev_addr, sa.sa_data);</div><div class='del'>-		else</div><div class='del'>-			ret = rtl8152_set_mac_address(dev, &amp;sa);</div><div class='add'>+			   sa-&gt;sa_data);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_ethernet_addr(struct r8152 *tp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = tp-&gt;netdev;</div><div class='add'>+	struct sockaddr sa;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = determine_ethernet_addr(tp, &amp;sa);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;version == RTL_VER_01)</div><div class='add'>+		ether_addr_copy(dev-&gt;dev_addr, sa.sa_data);</div><div class='add'>+	else</div><div class='add'>+		ret = rtl8152_set_mac_address(dev, &amp;sa);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void read_bulk_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='hunk'>@@ -4264,10 +4277,18 @@ static int rtl8152_post_reset(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='ctx'> 	struct r8152 *tp = usb_get_intfdata(intf);</div><div class='ctx'> 	struct net_device *netdev;</div><div class='add'>+	struct sockaddr sa;</div><div class='ctx'> </div><div class='ctx'> 	if (!tp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* reset the MAC adddress in case of policy change */</div><div class='add'>+	if (determine_ethernet_addr(tp, &amp;sa) &gt;= 0) {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		dev_set_mac_address (tp-&gt;netdev, &amp;sa, NULL);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	netdev = tp-&gt;netdev;</div><div class='ctx'> 	if (!netif_running(netdev))</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c<br/>index ec287c9741e8..e4c2f3afce60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/smsc75xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/smsc75xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/smsc75xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/smsc75xx.c</a></div><div class='hunk'>@@ -774,8 +774,8 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* maybe the boot loader passed the MAC address in devicetree */</div><div class='ctx'> 	mac_addr = of_get_mac_address(dev-&gt;udev-&gt;dev.of_node);</div><div class='del'>-	if (mac_addr) {</div><div class='del'>-		memcpy(dev-&gt;net-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='add'>+	if (!IS_ERR(mac_addr)) {</div><div class='add'>+		ether_addr_copy(dev-&gt;net-&gt;dev_addr, mac_addr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c<br/>index e3d08626828e..a0e119907c84 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/smsc95xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/usb/smsc95xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/usb/smsc95xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/usb/smsc95xx.c</a></div><div class='hunk'>@@ -917,8 +917,8 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* maybe the boot loader passed the MAC address in devicetree */</div><div class='ctx'> 	mac_addr = of_get_mac_address(dev-&gt;udev-&gt;dev.of_node);</div><div class='del'>-	if (mac_addr) {</div><div class='del'>-		memcpy(dev-&gt;net-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='add'>+	if (!IS_ERR(mac_addr)) {</div><div class='add'>+		ether_addr_copy(dev-&gt;net-&gt;dev_addr, mac_addr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/veth.c b/drivers/net/veth.c<br/>index 569e87a51a33..09a1433b0833 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/veth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/veth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/veth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/veth.c</a></div><div class='hunk'>@@ -162,18 +162,6 @@ static void veth_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int veth_get_ts_info(struct net_device *dev,</div><div class='del'>-			    struct ethtool_ts_info *info)</div><div class='del'>-{</div><div class='del'>-	info-&gt;so_timestamping =</div><div class='del'>-		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_SOFTWARE;</div><div class='del'>-	info-&gt;phc_index = -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ethtool_ops veth_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= veth_get_drvinfo,</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='hunk'>@@ -181,7 +169,7 @@ static const struct ethtool_ops veth_ethtool_ops = {</div><div class='ctx'> 	.get_sset_count		= veth_get_sset_count,</div><div class='ctx'> 	.get_ethtool_stats	= veth_get_ethtool_stats,</div><div class='ctx'> 	.get_link_ksettings	= veth_get_link_ksettings,</div><div class='del'>-	.get_ts_info		= veth_get_ts_info,</div><div class='add'>+	.get_ts_info		= ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* general routines */</div><div class='head'>diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c<br/>index 7eb38ea9ba56..559c48e66afc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/virtio_net.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/virtio_net.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/virtio_net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/virtio_net.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/average.h&gt;</div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/xdp.h&gt;</div><div class='ctx'> #include &lt;net/net_failover.h&gt;</div><div class='hunk'>@@ -1568,7 +1567,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct send_queue *sq = &amp;vi-&gt;sq[qnum];</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum);</div><div class='del'>-	bool kick = !skb-&gt;xmit_more;</div><div class='add'>+	bool kick = !netdev_xmit_more();</div><div class='ctx'> 	bool use_napi = sq-&gt;napi.weight;</div><div class='ctx'> </div><div class='ctx'> 	/* Free up any pending old buffers before queueing new ones. */</div><div class='hunk'>@@ -1588,7 +1587,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		dev-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			dev_warn(&amp;dev-&gt;dev,</div><div class='del'>-				 "Unexpected TXQ (%d) queue failure: %d\n", qnum, err);</div><div class='add'>+				 "Unexpected TXQ (%d) queue failure: %d\n",</div><div class='add'>+				 qnum, err);</div><div class='ctx'> 		dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='hunk'>@@ -1925,7 +1925,7 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void virtnet_clean_affinity(struct virtnet_info *vi, long hcpu)</div><div class='add'>+static void virtnet_clean_affinity(struct virtnet_info *vi)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1949,7 +1949,7 @@ static void virtnet_set_affinity(struct virtnet_info *vi)</div><div class='ctx'> 	int stride;</div><div class='ctx'> </div><div class='ctx'> 	if (!zalloc_cpumask_var(&amp;mask, GFP_KERNEL)) {</div><div class='del'>-		virtnet_clean_affinity(vi, -1);</div><div class='add'>+		virtnet_clean_affinity(vi);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1999,7 +1999,7 @@ static int virtnet_cpu_down_prep(unsigned int cpu, struct hlist_node *node)</div><div class='ctx'> 	struct virtnet_info *vi = hlist_entry_safe(node, struct virtnet_info,</div><div class='ctx'> 						   node);</div><div class='ctx'> </div><div class='del'>-	virtnet_clean_affinity(vi, cpu);</div><div class='add'>+	virtnet_clean_affinity(vi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2384,7 +2384,7 @@ static int virtnet_set_guest_offloads(struct virtnet_info *vi, u64 offloads)</div><div class='ctx'> </div><div class='ctx'> 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_GUEST_OFFLOADS,</div><div class='ctx'> 				  VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, &amp;sg)) {</div><div class='del'>-		dev_warn(&amp;vi-&gt;dev-&gt;dev, "Fail to set guest offload. \n");</div><div class='add'>+		dev_warn(&amp;vi-&gt;dev-&gt;dev, "Fail to set guest offload.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2735,7 +2735,7 @@ static void virtnet_del_vqs(struct virtnet_info *vi)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_device *vdev = vi-&gt;vdev;</div><div class='ctx'> </div><div class='del'>-	virtnet_clean_affinity(vi, -1);</div><div class='add'>+	virtnet_clean_affinity(vi);</div><div class='ctx'> </div><div class='ctx'> 	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3115,8 +3115,9 @@ static int virtnet_probe(struct virtio_device *vdev)</div><div class='ctx'> 			/* Should never trigger: MTU was previously validated</div><div class='ctx'> 			 * in virtnet_validate.</div><div class='ctx'> 			 */</div><div class='del'>-			dev_err(&amp;vdev-&gt;dev, "device MTU appears to have changed "</div><div class='del'>-				"it is now %d &lt; %d", mtu, dev-&gt;min_mtu);</div><div class='add'>+			dev_err(&amp;vdev-&gt;dev,</div><div class='add'>+				"device MTU appears to have changed it is now %d &lt; %d",</div><div class='add'>+				mtu, dev-&gt;min_mtu);</div><div class='ctx'> 			goto free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c<br/>index 7c1430ed0244..cf7e6a92e73c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/vrf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/vrf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/vrf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/vrf.c</a></div><div class='hunk'>@@ -370,7 +370,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk,</div><div class='ctx'> 		neigh = __neigh_create(&amp;nd_tbl, nexthop, dst-&gt;dev, false);</div><div class='ctx'> 	if (!IS_ERR(neigh)) {</div><div class='ctx'> 		sock_confirm_neigh(skb, neigh);</div><div class='del'>-		ret = neigh_output(neigh, skb);</div><div class='add'>+		ret = neigh_output(neigh, skb, false);</div><div class='ctx'> 		rcu_read_unlock_bh();</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -549,7 +549,7 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s</div><div class='ctx'> 	struct net_device *dev = dst-&gt;dev;</div><div class='ctx'> 	unsigned int hh_len = LL_RESERVED_SPACE(dev);</div><div class='ctx'> 	struct neighbour *neigh;</div><div class='del'>-	u32 nexthop;</div><div class='add'>+	bool is_v6gw = false;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	nf_reset(skb);</div><div class='hunk'>@@ -572,13 +572,11 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_bh();</div><div class='ctx'> </div><div class='del'>-	nexthop = (__force u32)rt_nexthop(rt, ip_hdr(skb)-&gt;daddr);</div><div class='del'>-	neigh = __ipv4_neigh_lookup_noref(dev, nexthop);</div><div class='del'>-	if (unlikely(!neigh))</div><div class='del'>-		neigh = __neigh_create(&amp;arp_tbl, &amp;nexthop, dev, false);</div><div class='add'>+	neigh = ip_neigh_for_gw(rt, skb, &amp;is_v6gw);</div><div class='ctx'> 	if (!IS_ERR(neigh)) {</div><div class='ctx'> 		sock_confirm_neigh(skb, neigh);</div><div class='del'>-		ret = neigh_output(neigh, skb);</div><div class='add'>+		/* if crossing protocols, can not use the cached header */</div><div class='add'>+		ret = neigh_output(neigh, skb, is_v6gw);</div><div class='ctx'> 		rcu_read_unlock_bh();</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -875,6 +873,7 @@ static const struct net_device_ops vrf_netdev_ops = {</div><div class='ctx'> 	.ndo_init		= vrf_dev_init,</div><div class='ctx'> 	.ndo_uninit		= vrf_dev_uninit,</div><div class='ctx'> 	.ndo_start_xmit		= vrf_xmit,</div><div class='add'>+	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_get_stats64	= vrf_get_stats64,</div><div class='ctx'> 	.ndo_add_slave		= vrf_add_slave,</div><div class='ctx'> 	.ndo_del_slave		= vrf_del_slave,</div><div class='hunk'>@@ -1273,9 +1272,15 @@ static void vrf_setup(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* default to no qdisc; user can add if desired */</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;priv_flags |= IFF_NO_RX_HANDLER;</div><div class='add'>+	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;min_mtu = 0;</div><div class='del'>-	dev-&gt;max_mtu = 0;</div><div class='add'>+	/* VRF devices do not care about MTU, but if the MTU is set</div><div class='add'>+	 * too low then the ipv4 and ipv6 protocols are disabled</div><div class='add'>+	 * which breaks networking.</div><div class='add'>+	 */</div><div class='add'>+	dev-&gt;min_mtu = IPV6_MIN_MTU;</div><div class='add'>+	dev-&gt;max_mtu = ETH_MAX_MTU;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vrf_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='head'>diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c<br/>index 077f1b9f2761..5994d5415a03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/vxlan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/vxlan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/vxlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/vxlan.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/ndisc.h&gt;</div><div class='add'>+#include &lt;net/ipv6_stubs.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/icmp.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='hunk'>@@ -4335,10 +4336,8 @@ static void vxlan_destroy_tunnels(struct net *net, struct list_head *head)</div><div class='ctx'> 		/* If vxlan-&gt;dev is in the same netns, it has already been added</div><div class='ctx'> 		 * to the list by the previous loop.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!net_eq(dev_net(vxlan-&gt;dev), net)) {</div><div class='del'>-			gro_cells_destroy(&amp;vxlan-&gt;gro_cells);</div><div class='add'>+		if (!net_eq(dev_net(vxlan-&gt;dev), net))</div><div class='ctx'> 			unregister_netdevice_queue(vxlan-&gt;dev, head);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (h = 0; h &lt; PORT_HASH_SIZE; ++h)</div><div class='head'>diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c<br/>index ef298d8525c5..4fe7c7e132c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wimax/i2400m/control.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wimax/i2400m/control.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wimax/i2400m/control.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wimax/i2400m/control.c</a></div><div class='hunk'>@@ -352,6 +352,7 @@ void i2400m_report_tlv_system_state(struct i2400m *i2400m,</div><div class='ctx'> </div><div class='ctx'> 	case I2400M_SS_IDLE:</div><div class='ctx'> 		d_printf(1, dev, "entering BS-negotiated idle mode\n");</div><div class='add'>+		/* Fall through */</div><div class='ctx'> 	case I2400M_SS_DISCONNECTING:</div><div class='ctx'> 	case I2400M_SS_DATA_PATH_CONNECTED:</div><div class='ctx'> 		wimax_state_change(wimax_dev, WIMAX_ST_CONNECTED);</div><div class='head'>diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c<br/>index f20886ade1cc..ebd64e083726 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wimax/i2400m/tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wimax/i2400m/tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wimax/i2400m/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wimax/i2400m/tx.c</a></div><div class='hunk'>@@ -640,8 +640,7 @@ void i2400m_tx_close(struct i2400m *i2400m)</div><div class='ctx'> 	 * figure out where the next TX message starts (and where the</div><div class='ctx'> 	 * offset to the moved header is).</div><div class='ctx'> 	 */</div><div class='del'>-	hdr_size = sizeof(*tx_msg)</div><div class='del'>-		+ le16_to_cpu(tx_msg-&gt;num_pls) * sizeof(tx_msg-&gt;pld[0]);</div><div class='add'>+	hdr_size = struct_size(tx_msg, pld, le16_to_cpu(tx_msg-&gt;num_pls));</div><div class='ctx'> 	hdr_size = ALIGN(hdr_size, I2400M_PL_ALIGN);</div><div class='ctx'> 	tx_msg-&gt;offset = I2400M_TX_PLD_SIZE - hdr_size;</div><div class='ctx'> 	tx_msg_moved = (void *) tx_msg + tx_msg-&gt;offset;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c<br/>index 24b983edb357..eca87f7c5b6c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/ce.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/ce.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/ce.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/ce.c</a></div><div class='hunk'>@@ -1855,7 +1855,7 @@ void ath10k_ce_dump_registers(struct ath10k *ar,</div><div class='ctx'> 	struct ath10k_ce_crash_data ce_data;</div><div class='ctx'> 	u32 addr, id;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_err(ar, "Copy Engine register dump:\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c<br/>index 835b8de92d55..aff585658fc0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/core.c</a></div><div class='hunk'>@@ -3119,6 +3119,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,</div><div class='ctx'> 		goto err_free_wq;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	mutex_init(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ar-&gt;peers);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h<br/>index e08a17b01e03..e35aae5146f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/core.h</a></div><div class='hunk'>@@ -1063,6 +1063,9 @@ struct ath10k {</div><div class='ctx'> 	/* prevents concurrent FW reconfiguration */</div><div class='ctx'> 	struct mutex conf_mutex;</div><div class='ctx'> </div><div class='add'>+	/* protects coredump data */</div><div class='add'>+	struct mutex dump_mutex;</div><div class='add'>+</div><div class='ctx'> 	/* protects shared structure data */</div><div class='ctx'> 	spinlock_t data_lock;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/coredump.c b/drivers/net/wireless/ath/ath10k/coredump.c<br/>index 33838d9c1cb6..45a355fb62b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/coredump.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/coredump.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/coredump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/coredump.c</a></div><div class='hunk'>@@ -1102,7 +1102,7 @@ struct ath10k_fw_crash_data *ath10k_coredump_new(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_fw_crash_data *crash_data = ar-&gt;coredump.fw_crash_data;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ath10k_coredump_mask == 0)</div><div class='ctx'> 		/* coredump disabled */</div><div class='hunk'>@@ -1146,7 +1146,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	mutex_lock(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	dump_data = (struct ath10k_dump_file_data *)(buf);</div><div class='ctx'> 	strlcpy(dump_data-&gt;df_magic, "ATH10K-FW-DUMP",</div><div class='hunk'>@@ -1213,7 +1213,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)</div><div class='ctx'> 		sofar += sizeof(*dump_tlv) + crash_data-&gt;ramdump_buf_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return dump_data;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c<br/>index a20ea270d519..1acc622d2183 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/htt_rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/htt_rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/htt_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/htt_rx.c</a></div><div class='hunk'>@@ -2728,7 +2728,7 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 			num_msdus++;</div><div class='ctx'> 			num_bytes += ret;</div><div class='ctx'> 		}</div><div class='del'>-		ieee80211_return_txq(hw, txq);</div><div class='add'>+		ieee80211_return_txq(hw, txq, false);</div><div class='ctx'> 		ieee80211_txq_schedule_end(hw, txq-&gt;ac);</div><div class='ctx'> </div><div class='ctx'> 		record-&gt;num_msdus = cpu_to_le16(num_msdus);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c<br/>index b73c23d4ce86..9c703d287333 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/mac.c</a></div><div class='hunk'>@@ -4089,7 +4089,7 @@ static int ath10k_mac_schedule_txq(struct ieee80211_hw *hw, u32 ac)</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		ieee80211_return_txq(hw, txq);</div><div class='add'>+		ieee80211_return_txq(hw, txq, false);</div><div class='ctx'> 		ath10k_htt_tx_txq_update(hw, txq);</div><div class='ctx'> 		if (ret == -EBUSY)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4374,7 +4374,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	ieee80211_return_txq(hw, txq);</div><div class='add'>+	ieee80211_return_txq(hw, txq, false);</div><div class='ctx'> 	ath10k_htt_tx_txq_update(hw, txq);</div><div class='ctx'> out:</div><div class='ctx'> 	ieee80211_txq_schedule_end(hw, ac);</div><div class='hunk'>@@ -5774,7 +5774,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_MCAST_RATE &amp;&amp;</div><div class='del'>-	    !WARN_ON(ath10k_mac_vif_chan(arvif-&gt;vif, &amp;def))) {</div><div class='add'>+	    !ath10k_mac_vif_chan(arvif-&gt;vif, &amp;def)) {</div><div class='ctx'> 		band = def.chan-&gt;band;</div><div class='ctx'> 		rateidx = vif-&gt;bss_conf.mcast_rate[band] - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -5812,7 +5812,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BASIC_RATES) {</div><div class='del'>-		if (WARN_ON(ath10k_mac_vif_chan(vif, &amp;def))) {</div><div class='add'>+		if (ath10k_mac_vif_chan(vif, &amp;def)) {</div><div class='ctx'> 			mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c<br/>index 271f92c24d44..2c27f407a851 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/pci.c</a></div><div class='hunk'>@@ -1441,7 +1441,7 @@ static void ath10k_pci_dump_registers(struct ath10k *ar,</div><div class='ctx'> 	__le32 reg_dump_values[REG_DUMP_COUNT_QCA988X] = {};</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_pci_diag_read_hi(ar, &amp;reg_dump_values[0],</div><div class='ctx'> 				      hi_failure_state,</div><div class='hunk'>@@ -1656,7 +1656,7 @@ static void ath10k_pci_dump_memory(struct ath10k *ar,</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!crash_data)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1734,14 +1734,19 @@ static void ath10k_pci_dump_memory(struct ath10k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)</div><div class='add'>+static void ath10k_pci_fw_dump_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_pci *ar_pci = container_of(work, struct ath10k_pci,</div><div class='add'>+						 dump_work);</div><div class='ctx'> 	struct ath10k_fw_crash_data *crash_data;</div><div class='add'>+	struct ath10k *ar = ar_pci-&gt;ar;</div><div class='ctx'> 	char guid[UUID_STRING_LEN + 1];</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	mutex_lock(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 	ar-&gt;stats.fw_crash_counter++;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	crash_data = ath10k_coredump_new(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -1756,11 +1761,18 @@ static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)</div><div class='ctx'> 	ath10k_ce_dump_registers(ar, crash_data);</div><div class='ctx'> 	ath10k_pci_dump_memory(ar, crash_data);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	queue_work(ar-&gt;workqueue, &amp;ar-&gt;restart_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='add'>+</div><div class='add'>+	queue_work(ar-&gt;workqueue, &amp;ar_pci-&gt;dump_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath10k_pci_hif_send_complete_check(struct ath10k *ar, u8 pipe,</div><div class='ctx'> 					int force)</div><div class='ctx'> {</div><div class='hunk'>@@ -3442,6 +3454,8 @@ int ath10k_pci_setup_resource(struct ath10k *ar)</div><div class='ctx'> 	spin_lock_init(&amp;ar_pci-&gt;ps_lock);</div><div class='ctx'> 	mutex_init(&amp;ar_pci-&gt;ce_diag_mutex);</div><div class='ctx'> </div><div class='add'>+	INIT_WORK(&amp;ar_pci-&gt;dump_work, ath10k_pci_fw_dump_work);</div><div class='add'>+</div><div class='ctx'> 	timer_setup(&amp;ar_pci-&gt;rx_post_retry, ath10k_pci_rx_replenish_retry, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (QCA_REV_6174(ar) || QCA_REV_9377(ar))</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h<br/>index 3773c79f322f..4455ed6c5275 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/pci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/pci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/pci.h</a></div><div class='hunk'>@@ -121,6 +121,8 @@ struct ath10k_pci {</div><div class='ctx'> 	/* For protecting ce_diag */</div><div class='ctx'> 	struct mutex ce_diag_mutex;</div><div class='ctx'> </div><div class='add'>+	struct work_struct dump_work;</div><div class='add'>+</div><div class='ctx'> 	struct ath10k_ce ce;</div><div class='ctx'> 	struct timer_list rx_post_retry;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c<br/>index 6433ff10d80e..a29cfb9c72c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/testmode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath10k/testmode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath10k/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath10k/testmode.c</a></div><div class='hunk'>@@ -416,8 +416,8 @@ int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct nlattr *tb[ATH10K_TM_ATTR_MAX + 1];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, ATH10K_TM_ATTR_MAX, data, len, ath10k_tm_policy,</div><div class='del'>-			NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, ATH10K_TM_ATTR_MAX, data, len,</div><div class='add'>+				   ath10k_tm_policy, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c<br/>index a2351ef45ae0..65a4c142640d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath5k/base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath5k/base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath5k/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath5k/base.c</a></div><div class='hunk'>@@ -837,7 +837,6 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;link = &amp;ds-&gt;ds_link;</div><div class='ctx'> 	ath5k_hw_start_tx_dma(ah, txq-&gt;qnum);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2174,7 +2173,6 @@ ath5k_beacon_config(struct ath5k_hw *ah)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath5k_hw_set_imr(ah, ah-&gt;imask);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_bh(&amp;ah-&gt;block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2779,7 +2777,6 @@ int ath5k_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> done:</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;ah-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ATH_STAT_STARTED, ah-&gt;status);</div><div class='hunk'>@@ -2839,7 +2836,6 @@ void ath5k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 				"putting device to sleep\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;ah-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ath5k_stop_tasklets(ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c<br/>index 16e052d02c94..5e866a193ed0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a></div><div class='hunk'>@@ -263,7 +263,6 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		memcpy(common-&gt;curbssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 		common-&gt;curaid = 0;</div><div class='ctx'> 		ath5k_hw_set_bssid(ah);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_BEACON_INT)</div><div class='hunk'>@@ -528,7 +527,6 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;ah-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/testmode.c b/drivers/net/wireless/ath/ath6kl/testmode.c<br/>index d8dcacda9add..f3906dbe5495 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath6kl/testmode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath6kl/testmode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath6kl/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath6kl/testmode.c</a></div><div class='hunk'>@@ -74,8 +74,8 @@ int ath6kl_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 	int err, buf_len;</div><div class='ctx'> 	void *buf;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse(tb, ATH6KL_TM_ATTR_MAX, data, len, ath6kl_tm_policy,</div><div class='del'>-			NULL);</div><div class='add'>+	err = nla_parse_deprecated(tb, ATH6KL_TM_ATTR_MAX, data, len,</div><div class='add'>+				   ath6kl_tm_policy, NULL);</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/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c<br/>index 98141b699c88..a04d8616fe09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath9k/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath9k/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath9k/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath9k/init.c</a></div><div class='hunk'>@@ -642,7 +642,7 @@ static int ath9k_of_init(struct ath_softc *sc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(np);</div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		ether_addr_copy(common-&gt;macaddr, mac);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c<br/>index 773d428ff1b0..b17e1ca40995 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath9k/xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/ath9k/xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/ath9k/xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/ath9k/xmit.c</a></div><div class='hunk'>@@ -1938,12 +1938,15 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	while ((queue = ieee80211_next_txq(hw, txq-&gt;mac80211_qnum))) {</div><div class='add'>+		bool force;</div><div class='add'>+</div><div class='ctx'> 		tid = (struct ath_atx_tid *)queue-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 		ret = ath_tx_sched_aggr(sc, txq, tid);</div><div class='ctx'> 		ath_dbg(common, QUEUE, "ath_tx_sched_aggr returned %d\n", ret);</div><div class='ctx'> </div><div class='del'>-		ieee80211_return_txq(hw, queue);</div><div class='add'>+		force = !skb_queue_empty(&amp;tid-&gt;retry_q);</div><div class='add'>+		ieee80211_return_txq(hw, queue, force);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/testmode.c b/drivers/net/wireless/ath/wcn36xx/testmode.c<br/>index 51a038022c8b..7ae14b4d2d0e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wcn36xx/testmode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wcn36xx/testmode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wcn36xx/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wcn36xx/testmode.c</a></div><div class='hunk'>@@ -132,8 +132,8 @@ int wcn36xx_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	unsigned short attr;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg_dump(WCN36XX_DBG_TESTMODE_DUMP, "Data:", data, len);</div><div class='del'>-	ret = nla_parse(tb, WCN36XX_TM_ATTR_MAX, data, len,</div><div class='del'>-			wcn36xx_tm_policy, NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, WCN36XX_TM_ATTR_MAX, data, len,</div><div class='add'>+				   wcn36xx_tm_policy, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c<br/>index a1e226652b4a..804955d24b30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/cfg80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/cfg80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/cfg80211.c</a></div><div class='hunk'>@@ -465,7 +465,7 @@ static int wil_cfg80211_validate_add_iface(struct wil6210_priv *wil,</div><div class='ctx'> 		.num_different_channels = 1,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		if (wil-&gt;vifs[i]) {</div><div class='ctx'> 			wdev = vif_to_wdev(wil-&gt;vifs[i]);</div><div class='ctx'> 			params.iftype_num[wdev-&gt;iftype]++;</div><div class='hunk'>@@ -486,7 +486,7 @@ static int wil_cfg80211_validate_change_iface(struct wil6210_priv *wil,</div><div class='ctx'> 	};</div><div class='ctx'> 	bool check_combos = false;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		struct wil6210_vif *vif_pos = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (vif_pos &amp;&amp; vif != vif_pos) {</div><div class='hunk'>@@ -1274,7 +1274,12 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 			     params-&gt;wait);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	/* when the sent packet was not acked by receiver(ACK=0), rc will</div><div class='add'>+	 * be -EAGAIN. In this case this function needs to return success,</div><div class='add'>+	 * the ACK=0 will be reflected in tx_status.</div><div class='add'>+	 */</div><div class='ctx'> 	tx_status = (rc == 0);</div><div class='add'>+	rc = (rc == -EAGAIN) ? 0 : rc;</div><div class='ctx'> 	cfg80211_mgmt_tx_status(wdev, cookie ? *cookie : 0, buf, len,</div><div class='ctx'> 				tx_status, GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -1806,7 +1811,7 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil)</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> 	struct wiphy *wiphy = wil_to_wiphy(wil);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		struct wil6210_vif *vif = wil-&gt;vifs[i];</div><div class='ctx'> 		struct net_device *ndev;</div><div class='ctx'> 		struct cfg80211_beacon_data bcon = {};</div><div class='hunk'>@@ -2620,8 +2625,8 @@ static int wil_rf_sector_get_cfg(struct wiphy *wiphy,</div><div class='ctx'> 	if (!test_bit(WMI_FW_CAPABILITY_RF_SECTORS, wil-&gt;fw_capabilities))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rc = nla_parse(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data, data_len,</div><div class='del'>-		       wil_rf_sector_policy, NULL);</div><div class='add'>+	rc = nla_parse_deprecated(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data,</div><div class='add'>+				  data_len, wil_rf_sector_policy, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		wil_err(wil, "Invalid rf sector ATTR\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -2679,13 +2684,13 @@ static int wil_rf_sector_get_cfg(struct wiphy *wiphy,</div><div class='ctx'> 			      QCA_ATTR_PAD))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	nl_cfgs = nla_nest_start(msg, QCA_ATTR_DMG_RF_SECTOR_CFG);</div><div class='add'>+	nl_cfgs = nla_nest_start_noflag(msg, QCA_ATTR_DMG_RF_SECTOR_CFG);</div><div class='ctx'> 	if (!nl_cfgs)</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> 	for (i = 0; i &lt; WMI_MAX_RF_MODULES_NUM; i++) {</div><div class='ctx'> 		if (!(rf_modules_vec &amp; BIT(i)))</div><div class='ctx'> 			continue;</div><div class='del'>-		nl_cfg = nla_nest_start(msg, i);</div><div class='add'>+		nl_cfg = nla_nest_start_noflag(msg, i);</div><div class='ctx'> 		if (!nl_cfg)</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> 		si = &amp;reply.evt.sectors_info[i];</div><div class='hunk'>@@ -2740,8 +2745,8 @@ static int wil_rf_sector_set_cfg(struct wiphy *wiphy,</div><div class='ctx'> 	if (!test_bit(WMI_FW_CAPABILITY_RF_SECTORS, wil-&gt;fw_capabilities))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rc = nla_parse(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data, data_len,</div><div class='del'>-		       wil_rf_sector_policy, NULL);</div><div class='add'>+	rc = nla_parse_deprecated(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data,</div><div class='add'>+				  data_len, wil_rf_sector_policy, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		wil_err(wil, "Invalid rf sector ATTR\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -2773,9 +2778,11 @@ static int wil_rf_sector_set_cfg(struct wiphy *wiphy,</div><div class='ctx'> 	cmd.sector_type = sector_type;</div><div class='ctx'> 	nla_for_each_nested(nl_cfg, tb[QCA_ATTR_DMG_RF_SECTOR_CFG],</div><div class='ctx'> 			    tmp) {</div><div class='del'>-		rc = nla_parse_nested(tb2, QCA_ATTR_DMG_RF_SECTOR_CFG_MAX,</div><div class='del'>-				      nl_cfg, wil_rf_sector_cfg_policy,</div><div class='del'>-				      NULL);</div><div class='add'>+		rc = nla_parse_nested_deprecated(tb2,</div><div class='add'>+						 QCA_ATTR_DMG_RF_SECTOR_CFG_MAX,</div><div class='add'>+						 nl_cfg,</div><div class='add'>+						 wil_rf_sector_cfg_policy,</div><div class='add'>+						 NULL);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			wil_err(wil, "invalid sector cfg\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -2847,8 +2854,8 @@ static int wil_rf_sector_get_selected(struct wiphy *wiphy,</div><div class='ctx'> 	if (!test_bit(WMI_FW_CAPABILITY_RF_SECTORS, wil-&gt;fw_capabilities))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rc = nla_parse(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data, data_len,</div><div class='del'>-		       wil_rf_sector_policy, NULL);</div><div class='add'>+	rc = nla_parse_deprecated(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data,</div><div class='add'>+				  data_len, wil_rf_sector_policy, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		wil_err(wil, "Invalid rf sector ATTR\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -2955,8 +2962,8 @@ static int wil_rf_sector_set_selected(struct wiphy *wiphy,</div><div class='ctx'> 	if (!test_bit(WMI_FW_CAPABILITY_RF_SECTORS, wil-&gt;fw_capabilities))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rc = nla_parse(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data, data_len,</div><div class='del'>-		       wil_rf_sector_policy, NULL);</div><div class='add'>+	rc = nla_parse_deprecated(tb, QCA_ATTR_DMG_RF_SECTOR_MAX, data,</div><div class='add'>+				  data_len, wil_rf_sector_policy, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		wil_err(wil, "Invalid rf sector ATTR\n");</div><div class='ctx'> 		return rc;</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c<br/>index 7ad4e5328439..df2adff6c33a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/debugfs.c</a></div><div class='hunk'>@@ -207,6 +207,8 @@ static void wil_print_sring(struct seq_file *s, struct wil6210_priv *wil,</div><div class='ctx'> 		seq_puts(s, "???\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_printf(s, "  desc_rdy_pol   = %d\n", sring-&gt;desc_rdy_pol);</div><div class='add'>+	seq_printf(s, "  invalid_buff_id_cnt   = %d\n",</div><div class='add'>+		   sring-&gt;invalid_buff_id_cnt);</div><div class='ctx'> </div><div class='ctx'> 	if (sring-&gt;va &amp;&amp; (sring-&gt;size &lt;= (1 &lt;&lt; WIL_RING_SIZE_ORDER_MAX))) {</div><div class='ctx'> 		uint i;</div><div class='hunk'>@@ -258,6 +260,11 @@ static void wil_print_mbox_ring(struct seq_file *s, const char *prefix,</div><div class='ctx'> </div><div class='ctx'> 	wil_halp_vote(wil);</div><div class='ctx'> </div><div class='add'>+	if (wil_mem_access_lock(wil)) {</div><div class='add'>+		wil_halp_unvote(wil);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wil_memcpy_fromio_32(&amp;r, off, sizeof(r));</div><div class='ctx'> 	wil_mbox_ring_le2cpus(&amp;r);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -323,6 +330,7 @@ static void wil_print_mbox_ring(struct seq_file *s, const char *prefix,</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='ctx'> 	seq_puts(s, "}\n");</div><div class='add'>+	wil_mem_access_unlock(wil);</div><div class='ctx'> 	wil_halp_unvote(wil);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -601,6 +609,12 @@ static int memread_show(struct seq_file *s, void *data)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = wil_mem_access_lock(wil);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wil_pm_runtime_put(wil);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	a = wmi_buffer(wil, cpu_to_le32(mem_addr));</div><div class='ctx'> </div><div class='ctx'> 	if (a)</div><div class='hunk'>@@ -608,6 +622,7 @@ static int memread_show(struct seq_file *s, void *data)</div><div class='ctx'> 	else</div><div class='ctx'> 		seq_printf(s, "[0x%08x] = INVALID\n", mem_addr);</div><div class='ctx'> </div><div class='add'>+	wil_mem_access_unlock(wil);</div><div class='ctx'> 	wil_pm_runtime_put(wil);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -626,10 +641,6 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf,</div><div class='ctx'> 	size_t unaligned_bytes, aligned_count, ret;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(wil_status_suspending, wil_blob-&gt;wil-&gt;status) ||</div><div class='del'>-	    test_bit(wil_status_suspended, wil_blob-&gt;wil-&gt;status))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	if (pos &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -656,11 +667,19 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf,</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rc = wil_mem_access_lock(wil);</div><div class='add'>+	if (rc) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		wil_pm_runtime_put(wil);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wil_memcpy_fromio_32(buf, (const void __iomem *)</div><div class='ctx'> 			     wil_blob-&gt;blob.data + aligned_pos, aligned_count);</div><div class='ctx'> </div><div class='ctx'> 	ret = copy_to_user(user_buf, buf + unaligned_bytes, count);</div><div class='ctx'> </div><div class='add'>+	wil_mem_access_unlock(wil);</div><div class='ctx'> 	wil_pm_runtime_put(wil);</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -1364,7 +1383,7 @@ static int link_show(struct seq_file *s, void *data)</div><div class='ctx'> 		if (p-&gt;status != wil_sta_connected)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		vif = (mid &lt; wil-&gt;max_vifs) ? wil-&gt;vifs[mid] : NULL;</div><div class='add'>+		vif = (mid &lt; GET_MAX_VIFS(wil)) ? wil-&gt;vifs[mid] : NULL;</div><div class='ctx'> 		if (vif) {</div><div class='ctx'> 			rc = wil_cid_fill_sinfo(vif, i, sinfo);</div><div class='ctx'> 			if (rc)</div><div class='hunk'>@@ -1562,7 +1581,7 @@ __acquires(&amp;p-&gt;tid_rx_lock) __releases(&amp;p-&gt;tid_rx_lock)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		mid = (p-&gt;status != wil_sta_unused) ? p-&gt;mid : U8_MAX;</div><div class='del'>-		if (mid &lt; wil-&gt;max_vifs) {</div><div class='add'>+		if (mid &lt; GET_MAX_VIFS(wil)) {</div><div class='ctx'> 			struct wil6210_vif *vif = wil-&gt;vifs[mid];</div><div class='ctx'> </div><div class='ctx'> 			if (vif-&gt;wdev.iftype == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='hunk'>@@ -1628,7 +1647,7 @@ static int mids_show(struct seq_file *s, void *data)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wil-&gt;vif_mutex);</div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (vif) {</div><div class='hunk'>@@ -1849,7 +1868,7 @@ static int wil_link_stats_debugfs_show(struct seq_file *s, void *data)</div><div class='ctx'> 	/* iterate over all MIDs and show per-cid statistics. Then show the</div><div class='ctx'> 	 * global statistics</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(s, "MID %d ", i);</div><div class='hunk'>@@ -1905,7 +1924,7 @@ static ssize_t wil_link_stats_write(struct file *file, const char __user *buf,</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; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> 		if (!vif)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2375,6 +2394,7 @@ static const struct dbg_off dbg_wil_regs[] = {</div><div class='ctx'> 	{"RGF_MAC_MTRL_COUNTER_0", 0444, HOSTADDR(RGF_MAC_MTRL_COUNTER_0),</div><div class='ctx'> 		doff_io32},</div><div class='ctx'> 	{"RGF_USER_USAGE_1", 0444, HOSTADDR(RGF_USER_USAGE_1), doff_io32},</div><div class='add'>+	{"RGF_USER_USAGE_2", 0444, HOSTADDR(RGF_USER_USAGE_2), doff_io32},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/fw_inc.c b/drivers/net/wireless/ath/wil6210/fw_inc.c<br/>index 388b3d4717ca..3ec0f2fab9b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/fw_inc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/fw_inc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/fw_inc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/fw_inc.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014-2017 Qualcomm Atheros, Inc.</div><div class='del'>- * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and/or distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -647,6 +647,8 @@ int wil_request_firmware(struct wil6210_priv *wil, const char *name,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	release_firmware(fw);</div><div class='add'>+	if (rc)</div><div class='add'>+		wil_err_fw(wil, "Loading &lt;%s&gt; failed, rc %d\n", name, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -741,6 +743,8 @@ int wil_request_board(struct wil6210_priv *wil, const char *name)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	release_firmware(brd);</div><div class='add'>+	if (rc)</div><div class='add'>+		wil_err_fw(wil, "Loading &lt;%s&gt; failed, rc %d\n", name, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c<br/>index 277abfdf3322..9b9c9ec01536 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/main.c</a></div><div class='hunk'>@@ -184,6 +184,28 @@ void wil_memcpy_toio_32(volatile void __iomem *dst, const void *src,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Device memory access is prohibited while reset or suspend.</div><div class='add'>+ * wil_mem_access_lock protects accessing device memory in these cases</div><div class='add'>+ */</div><div class='add'>+int wil_mem_access_lock(struct wil6210_priv *wil)</div><div class='add'>+{</div><div class='add'>+	if (!down_read_trylock(&amp;wil-&gt;mem_lock))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (test_bit(wil_status_suspending, wil-&gt;status) ||</div><div class='add'>+	    test_bit(wil_status_suspended, wil-&gt;status)) {</div><div class='add'>+		up_read(&amp;wil-&gt;mem_lock);</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'>+void wil_mem_access_unlock(struct wil6210_priv *wil)</div><div class='add'>+{</div><div class='add'>+	up_read(&amp;wil-&gt;mem_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void wil_ring_fini_tx(struct wil6210_priv *wil, int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil_ring *ring = &amp;wil-&gt;ring_tx[id];</div><div class='hunk'>@@ -663,7 +685,7 @@ void wil_bcast_fini_all(struct wil6210_priv *wil)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct wil6210_vif *vif;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> 		if (vif)</div><div class='ctx'> 			wil_bcast_fini(vif);</div><div class='hunk'>@@ -703,6 +725,7 @@ int wil_priv_init(struct wil6210_priv *wil)</div><div class='ctx'> 	spin_lock_init(&amp;wil-&gt;wmi_ev_lock);</div><div class='ctx'> 	spin_lock_init(&amp;wil-&gt;net_queue_lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;wil-&gt;wq);</div><div class='add'>+	init_rwsem(&amp;wil-&gt;mem_lock);</div><div class='ctx'> </div><div class='ctx'> 	wil-&gt;wmi_wq = create_singlethread_workqueue(WIL_NAME "_wmi");</div><div class='ctx'> 	if (!wil-&gt;wmi_wq)</div><div class='hunk'>@@ -1390,13 +1413,22 @@ static int wil_get_otp_info(struct wil6210_priv *wil)</div><div class='ctx'> 	u8 mac[8];</div><div class='ctx'> 	int mac_addr;</div><div class='ctx'> </div><div class='del'>-	if (wil-&gt;hw_version &gt;= HW_VER_TALYN_MB)</div><div class='del'>-		mac_addr = RGF_OTP_MAC_TALYN_MB;</div><div class='del'>-	else</div><div class='del'>-		mac_addr = RGF_OTP_MAC;</div><div class='add'>+	/* OEM MAC has precedence */</div><div class='add'>+	mac_addr = RGF_OTP_OEM_MAC;</div><div class='add'>+	wil_memcpy_fromio_32(mac, wil-&gt;csr + HOSTADDR(mac_addr), sizeof(mac));</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(mac)) {</div><div class='add'>+		wil_info(wil, "using OEM MAC %pM\n", mac);</div><div class='add'>+	} else {</div><div class='add'>+		if (wil-&gt;hw_version &gt;= HW_VER_TALYN_MB)</div><div class='add'>+			mac_addr = RGF_OTP_MAC_TALYN_MB;</div><div class='add'>+		else</div><div class='add'>+			mac_addr = RGF_OTP_MAC;</div><div class='add'>+</div><div class='add'>+		wil_memcpy_fromio_32(mac, wil-&gt;csr + HOSTADDR(mac_addr),</div><div class='add'>+				     sizeof(mac));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	wil_memcpy_fromio_32(mac, wil-&gt;csr + HOSTADDR(mac_addr),</div><div class='del'>-			     sizeof(mac));</div><div class='ctx'> 	if (!is_valid_ether_addr(mac)) {</div><div class='ctx'> 		wil_err(wil, "Invalid MAC %pM\n", mac);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1460,7 +1492,7 @@ void wil_abort_scan_all_vifs(struct wil6210_priv *wil, bool sync)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		struct wil6210_vif *vif = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (vif)</div><div class='hunk'>@@ -1500,11 +1532,6 @@ static void wil_pre_fw_config(struct wil6210_priv *wil)</div><div class='ctx'> 	if (wil-&gt;hw_version &lt; HW_VER_TALYN_MB) {</div><div class='ctx'> 		wil_s(wil, RGF_CAF_ICR + offsetof(struct RGF_ICR, ICR), 0);</div><div class='ctx'> 		wil_w(wil, RGF_CAF_ICR + offsetof(struct RGF_ICR, IMV), ~0);</div><div class='del'>-	} else {</div><div class='del'>-		wil_s(wil,</div><div class='del'>-		      RGF_CAF_ICR_TALYN_MB + offsetof(struct RGF_ICR, ICR), 0);</div><div class='del'>-		wil_w(wil, RGF_CAF_ICR_TALYN_MB +</div><div class='del'>-		      offsetof(struct RGF_ICR, IMV), ~0);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* clear PAL_UNIT_ICR (potential D0-&gt;D3 leftover)</div><div class='ctx'> 	 * In Talyn-MB host cannot access this register due to</div><div class='hunk'>@@ -1528,7 +1555,7 @@ static int wil_restore_vifs(struct wil6210_priv *wil)</div><div class='ctx'> 	struct wireless_dev *wdev;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> 		if (!vif)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1580,7 +1607,8 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)</div><div class='ctx'> 	if (wil-&gt;hw_version == HW_VER_UNKNOWN)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(WIL_PLATFORM_CAPA_T_PWR_ON_0, wil-&gt;platform_capa)) {</div><div class='add'>+	if (test_bit(WIL_PLATFORM_CAPA_T_PWR_ON_0, wil-&gt;platform_capa) &amp;&amp;</div><div class='add'>+	    wil-&gt;hw_version &lt; HW_VER_TALYN_MB) {</div><div class='ctx'> 		wil_dbg_misc(wil, "Notify FW to set T_POWER_ON=0\n");</div><div class='ctx'> 		wil_s(wil, RGF_USER_USAGE_8, BIT_USER_SUPPORT_T_POWER_ON_0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1599,20 +1627,11 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(wil_status_resetting, wil-&gt;status);</div><div class='del'>-	if (test_bit(wil_status_collecting_dumps, wil-&gt;status)) {</div><div class='del'>-		/* Device collects crash dump, cancel the reset.</div><div class='del'>-		 * following crash dump collection, reset would take place.</div><div class='del'>-		 */</div><div class='del'>-		wil_dbg_misc(wil, "reject reset while collecting crash dump\n");</div><div class='del'>-		rc = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> 	wil_abort_scan_all_vifs(wil, false);</div><div class='ctx'> 	mutex_unlock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> 		if (vif) {</div><div class='ctx'> 			cancel_work_sync(&amp;vif-&gt;disconnect_worker);</div><div class='hunk'>@@ -1782,7 +1801,9 @@ int __wil_up(struct wil6210_priv *wil)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!mutex_is_locked(&amp;wil-&gt;mutex));</div><div class='ctx'> </div><div class='add'>+	down_write(&amp;wil-&gt;mem_lock);</div><div class='ctx'> 	rc = wil_reset(wil, true);</div><div class='add'>+	up_write(&amp;wil-&gt;mem_lock);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -1854,6 +1875,7 @@ int wil_up(struct wil6210_priv *wil)</div><div class='ctx'> </div><div class='ctx'> int __wil_down(struct wil6210_priv *wil)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='ctx'> 	WARN_ON(!mutex_is_locked(&amp;wil-&gt;mutex));</div><div class='ctx'> </div><div class='ctx'> 	set_bit(wil_status_resetting, wil-&gt;status);</div><div class='hunk'>@@ -1873,7 +1895,11 @@ int __wil_down(struct wil6210_priv *wil)</div><div class='ctx'> 	wil_abort_scan_all_vifs(wil, false);</div><div class='ctx'> 	mutex_unlock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> </div><div class='del'>-	return wil_reset(wil, false);</div><div class='add'>+	down_write(&amp;wil-&gt;mem_lock);</div><div class='add'>+	rc = wil_reset(wil, false);</div><div class='add'>+	up_write(&amp;wil-&gt;mem_lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wil_down(struct wil6210_priv *wil)</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c<br/>index b4e0eb1585b9..59f041d708fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/netdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/netdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/netdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/netdev.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.</div><div class='del'>- * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and/or distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -27,7 +27,7 @@ bool wil_has_other_active_ifaces(struct wil6210_priv *wil,</div><div class='ctx'> 	struct wil6210_vif *vif;</div><div class='ctx'> 	struct net_device *ndev_i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> 		if (vif) {</div><div class='ctx'> 			ndev_i = vif_to_ndev(vif);</div><div class='hunk'>@@ -155,7 +155,7 @@ static int wil6210_netdev_poll_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> 		struct wil6210_vif *vif;</div><div class='ctx'> </div><div class='ctx'> 		if (!ring-&gt;va || !txdata-&gt;enabled ||</div><div class='del'>-		    txdata-&gt;mid &gt;= wil-&gt;max_vifs)</div><div class='add'>+		    txdata-&gt;mid &gt;= GET_MAX_VIFS(wil))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		vif = wil-&gt;vifs[txdata-&gt;mid];</div><div class='hunk'>@@ -294,7 +294,7 @@ static u8 wil_vif_find_free_mid(struct wil6210_priv *wil)</div><div class='ctx'> {</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		if (!wil-&gt;vifs[i])</div><div class='ctx'> 			return i;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -500,7 +500,7 @@ void wil_vif_remove(struct wil6210_priv *wil, u8 mid)</div><div class='ctx'> 	bool any_active = wil_has_active_ifaces(wil, true, false);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='del'>-	if (mid &gt;= wil-&gt;max_vifs) {</div><div class='add'>+	if (mid &gt;= GET_MAX_VIFS(wil)) {</div><div class='ctx'> 		wil_err(wil, "invalid MID: %d\n", mid);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c<br/>index c8c6613371d1..3b82d6cfc218 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/pcie_bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/pcie_bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/pcie_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/pcie_bus.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.</div><div class='del'>- * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and/or distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -176,7 +176,7 @@ static void wil_remove_all_additional_vifs(struct wil6210_priv *wil)</div><div class='ctx'> 	struct wil6210_vif *vif;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 1; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 1; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		vif = wil-&gt;vifs[i];</div><div class='ctx'> 		if (vif) {</div><div class='ctx'> 			wil_vif_prepare_stop(vif);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c<br/>index 75fe9323547c..56143e7670ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/pm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/pm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/pm.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014,2017 Qualcomm Atheros, Inc.</div><div class='del'>- * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and/or distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -26,7 +26,7 @@ static void wil_pm_wake_connected_net_queues(struct wil6210_priv *wil)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wil-&gt;vif_mutex);</div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		struct wil6210_vif *vif = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (vif &amp;&amp; test_bit(wil_vif_fwconnected, vif-&gt;status))</div><div class='hunk'>@@ -40,7 +40,7 @@ static void wil_pm_stop_all_net_queues(struct wil6210_priv *wil)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wil-&gt;vif_mutex);</div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		struct wil6210_vif *vif = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (vif)</div><div class='hunk'>@@ -123,7 +123,7 @@ int wil_can_suspend(struct wil6210_priv *wil, bool is_runtime)</div><div class='ctx'> </div><div class='ctx'> 	/* interface is running */</div><div class='ctx'> 	mutex_lock(&amp;wil-&gt;vif_mutex);</div><div class='del'>-	for (i = 0; i &lt; wil-&gt;max_vifs; i++) {</div><div class='add'>+	for (i = 0; i &lt; GET_MAX_VIFS(wil); i++) {</div><div class='ctx'> 		struct wil6210_vif *vif = wil-&gt;vifs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!vif)</div><div class='hunk'>@@ -195,14 +195,18 @@ static int wil_suspend_keep_radio_on(struct wil6210_priv *wil)</div><div class='ctx'> 	wil_dbg_pm(wil, "suspend keep radio on\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Prevent handling of new tx and wmi commands */</div><div class='del'>-	set_bit(wil_status_suspending, wil-&gt;status);</div><div class='del'>-	if (test_bit(wil_status_collecting_dumps, wil-&gt;status)) {</div><div class='del'>-		/* Device collects crash dump, cancel the suspend */</div><div class='del'>-		wil_dbg_pm(wil, "reject suspend while collecting crash dump\n");</div><div class='del'>-		clear_bit(wil_status_suspending, wil-&gt;status);</div><div class='add'>+	rc = down_write_trylock(&amp;wil-&gt;mem_lock);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		wil_err(wil,</div><div class='add'>+			"device is busy. down_write_trylock failed, returned (0x%x)\n",</div><div class='add'>+			rc);</div><div class='ctx'> 		wil-&gt;suspend_stats.rejected_by_host++;</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	set_bit(wil_status_suspending, wil-&gt;status);</div><div class='add'>+	up_write(&amp;wil-&gt;mem_lock);</div><div class='add'>+</div><div class='ctx'> 	wil_pm_stop_all_net_queues(wil);</div><div class='ctx'> </div><div class='ctx'> 	if (!wil_is_tx_idle(wil)) {</div><div class='hunk'>@@ -310,15 +314,18 @@ static int wil_suspend_radio_off(struct wil6210_priv *wil)</div><div class='ctx'> </div><div class='ctx'> 	wil_dbg_pm(wil, "suspend radio off\n");</div><div class='ctx'> </div><div class='del'>-	set_bit(wil_status_suspending, wil-&gt;status);</div><div class='del'>-	if (test_bit(wil_status_collecting_dumps, wil-&gt;status)) {</div><div class='del'>-		/* Device collects crash dump, cancel the suspend */</div><div class='del'>-		wil_dbg_pm(wil, "reject suspend while collecting crash dump\n");</div><div class='del'>-		clear_bit(wil_status_suspending, wil-&gt;status);</div><div class='add'>+	rc = down_write_trylock(&amp;wil-&gt;mem_lock);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		wil_err(wil,</div><div class='add'>+			"device is busy. down_write_trylock failed, returned (0x%x)\n",</div><div class='add'>+			rc);</div><div class='ctx'> 		wil-&gt;suspend_stats.rejected_by_host++;</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	set_bit(wil_status_suspending, wil-&gt;status);</div><div class='add'>+	up_write(&amp;wil-&gt;mem_lock);</div><div class='add'>+</div><div class='ctx'> 	/* if netif up, hardware is alive, shut it down */</div><div class='ctx'> 	mutex_lock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> 	active_ifaces = wil_has_active_ifaces(wil, true, false);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wireless/ath/wil6210/txrx_edma.c<br/>index c38773878ae3..f6fce6ff73d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #define WIL_EDMA_MAX_DATA_OFFSET (2)</div><div class='ctx'> /* RX buffer size must be aligned to 4 bytes */</div><div class='ctx'> #define WIL_EDMA_RX_BUF_LEN_DEFAULT (2048)</div><div class='add'>+#define MAX_INVALID_BUFF_ID_RETRY (3)</div><div class='ctx'> </div><div class='ctx'> static void wil_tx_desc_unmap_edma(struct device *dev,</div><div class='ctx'> 				   union wil_tx_desc *desc,</div><div class='hunk'>@@ -312,7 +313,8 @@ static int wil_init_rx_buff_arr(struct wil6210_priv *wil,</div><div class='ctx'> 	struct list_head *free = &amp;wil-&gt;rx_buff_mgmt.free;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	wil-&gt;rx_buff_mgmt.buff_arr = kcalloc(size, sizeof(struct wil_rx_buff),</div><div class='add'>+	wil-&gt;rx_buff_mgmt.buff_arr = kcalloc(size + 1,</div><div class='add'>+					     sizeof(struct wil_rx_buff),</div><div class='ctx'> 					     GFP_KERNEL);</div><div class='ctx'> 	if (!wil-&gt;rx_buff_mgmt.buff_arr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -321,14 +323,16 @@ static int wil_init_rx_buff_arr(struct wil6210_priv *wil,</div><div class='ctx'> 	INIT_LIST_HEAD(active);</div><div class='ctx'> 	INIT_LIST_HEAD(free);</div><div class='ctx'> </div><div class='del'>-	/* Linkify the list */</div><div class='add'>+	/* Linkify the list.</div><div class='add'>+	 * buffer id 0 should not be used (marks invalid id).</div><div class='add'>+	 */</div><div class='ctx'> 	buff_arr = wil-&gt;rx_buff_mgmt.buff_arr;</div><div class='del'>-	for (i = 0; i &lt; size; i++) {</div><div class='add'>+	for (i = 1; i &lt;= size; i++) {</div><div class='ctx'> 		list_add(&amp;buff_arr[i].list, free);</div><div class='ctx'> 		buff_arr[i].id = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wil-&gt;rx_buff_mgmt.size = size;</div><div class='add'>+	wil-&gt;rx_buff_mgmt.size = size + 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -428,6 +432,9 @@ static void wil_ring_free_edma(struct wil6210_priv *wil, struct wil_ring *ring)</div><div class='ctx'> 			     &amp;ring-&gt;pa, ring-&gt;ctx);</div><div class='ctx'> </div><div class='ctx'> 		wil_move_all_rx_buff_to_free_list(wil, ring);</div><div class='add'>+		dma_free_coherent(dev, sizeof(*ring-&gt;edma_rx_swtail.va),</div><div class='add'>+				  ring-&gt;edma_rx_swtail.va,</div><div class='add'>+				  ring-&gt;edma_rx_swtail.pa);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -804,18 +811,9 @@ static int wil_rx_error_check_edma(struct wil6210_priv *wil,</div><div class='ctx'> 				   struct sk_buff *skb,</div><div class='ctx'> 				   struct wil_net_stats *stats)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='ctx'> 	int l2_rx_status;</div><div class='del'>-	int l3_rx_status;</div><div class='del'>-	int l4_rx_status;</div><div class='ctx'> 	void *msg = wil_skb_rxstatus(skb);</div><div class='ctx'> </div><div class='del'>-	error = wil_rx_status_get_error(msg);</div><div class='del'>-	if (!error) {</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	l2_rx_status = wil_rx_status_get_l2_rx_status(msg);</div><div class='ctx'> 	if (l2_rx_status != 0) {</div><div class='ctx'> 		wil_dbg_txrx(wil, "L2 RX error, l2_rx_status=0x%x\n",</div><div class='hunk'>@@ -844,17 +842,7 @@ static int wil_rx_error_check_edma(struct wil6210_priv *wil,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	l3_rx_status = wil_rx_status_get_l3_rx_status(msg);</div><div class='del'>-	l4_rx_status = wil_rx_status_get_l4_rx_status(msg);</div><div class='del'>-	if (!l3_rx_status &amp;&amp; !l4_rx_status)</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-	/* If HW reports bad checksum, let IP stack re-check it</div><div class='del'>-	 * For example, HW don't understand Microsoft IP stack that</div><div class='del'>-	 * mis-calculates TCP checksum - if it should be 0x0,</div><div class='del'>-	 * it writes 0xffff in violation of RFC 1624</div><div class='del'>-	 */</div><div class='del'>-	else</div><div class='del'>-		stats-&gt;rx_csum_err++;</div><div class='add'>+	skb-&gt;ip_summed = wil_rx_status_get_checksum(msg, stats);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -892,26 +880,50 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	/* Extract the buffer ID from the status message */</div><div class='ctx'> 	buff_id = le16_to_cpu(wil_rx_status_get_buff_id(msg));</div><div class='del'>-	if (unlikely(!wil_val_in_range(buff_id, 0, wil-&gt;rx_buff_mgmt.size))) {</div><div class='add'>+</div><div class='add'>+	while (!buff_id) {</div><div class='add'>+		struct wil_rx_status_extended *s;</div><div class='add'>+		int invalid_buff_id_retry = 0;</div><div class='add'>+</div><div class='add'>+		wil_dbg_txrx(wil,</div><div class='add'>+			     "buff_id is not updated yet by HW, (swhead 0x%x)\n",</div><div class='add'>+			     sring-&gt;swhead);</div><div class='add'>+		if (++invalid_buff_id_retry &gt; MAX_INVALID_BUFF_ID_RETRY)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Read the status message again */</div><div class='add'>+		s = (struct wil_rx_status_extended *)</div><div class='add'>+			(sring-&gt;va + (sring-&gt;elem_size * sring-&gt;swhead));</div><div class='add'>+		*(struct wil_rx_status_extended *)msg = *s;</div><div class='add'>+		buff_id = le16_to_cpu(wil_rx_status_get_buff_id(msg));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!wil_val_in_range(buff_id, 1, wil-&gt;rx_buff_mgmt.size))) {</div><div class='ctx'> 		wil_err(wil, "Corrupt buff_id=%d, sring-&gt;swhead=%d\n",</div><div class='ctx'> 			buff_id, sring-&gt;swhead);</div><div class='add'>+		wil_rx_status_reset_buff_id(sring);</div><div class='ctx'> 		wil_sring_advance_swhead(sring);</div><div class='add'>+		sring-&gt;invalid_buff_id_cnt++;</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wil_sring_advance_swhead(sring);</div><div class='del'>-</div><div class='ctx'> 	/* Extract the SKB from the rx_buff management array */</div><div class='ctx'> 	skb = wil-&gt;rx_buff_mgmt.buff_arr[buff_id].skb;</div><div class='ctx'> 	wil-&gt;rx_buff_mgmt.buff_arr[buff_id].skb = NULL;</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		wil_err(wil, "No Rx skb at buff_id %d\n", buff_id);</div><div class='add'>+		wil_rx_status_reset_buff_id(sring);</div><div class='ctx'> 		/* Move the buffer from the active list to the free list */</div><div class='del'>-		list_move(&amp;wil-&gt;rx_buff_mgmt.buff_arr[buff_id].list,</div><div class='del'>-			  &amp;wil-&gt;rx_buff_mgmt.free);</div><div class='add'>+		list_move_tail(&amp;wil-&gt;rx_buff_mgmt.buff_arr[buff_id].list,</div><div class='add'>+			       &amp;wil-&gt;rx_buff_mgmt.free);</div><div class='add'>+		wil_sring_advance_swhead(sring);</div><div class='add'>+		sring-&gt;invalid_buff_id_cnt++;</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	wil_rx_status_reset_buff_id(sring);</div><div class='add'>+	wil_sring_advance_swhead(sring);</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;pa, skb-&gt;cb, sizeof(pa));</div><div class='ctx'> 	dma_unmap_single(dev, pa, sz, DMA_FROM_DEVICE);</div><div class='ctx'> 	dmalen = le16_to_cpu(wil_rx_status_get_length(msg));</div><div class='hunk'>@@ -926,8 +938,8 @@ again:</div><div class='ctx'> 			  sizeof(struct wil_rx_status_extended), false);</div><div class='ctx'> </div><div class='ctx'> 	/* Move the buffer from the active list to the free list */</div><div class='del'>-	list_move(&amp;wil-&gt;rx_buff_mgmt.buff_arr[buff_id].list,</div><div class='del'>-		  &amp;wil-&gt;rx_buff_mgmt.free);</div><div class='add'>+	list_move_tail(&amp;wil-&gt;rx_buff_mgmt.buff_arr[buff_id].list,</div><div class='add'>+		       &amp;wil-&gt;rx_buff_mgmt.free);</div><div class='ctx'> </div><div class='ctx'> 	eop = wil_rx_status_get_eop(msg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.h b/drivers/net/wireless/ath/wil6210/txrx_edma.h<br/>index 343516a03a1e..bb4ff28b73e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2012-2016,2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2012-2016,2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and/or distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -427,6 +427,12 @@ static inline int wil_rx_status_get_eop(void *msg) /* EoP = End of Packet */</div><div class='ctx'> 			    30, 30);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void wil_rx_status_reset_buff_id(struct wil_status_ring *s)</div><div class='add'>+{</div><div class='add'>+	((struct wil_rx_status_compressed *)</div><div class='add'>+		(s-&gt;va + (s-&gt;elem_size * s-&gt;swhead)))-&gt;buff_id = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline __le16 wil_rx_status_get_buff_id(void *msg)</div><div class='ctx'> {</div><div class='ctx'> 	return ((struct wil_rx_status_compressed *)msg)-&gt;buff_id;</div><div class='hunk'>@@ -511,6 +517,45 @@ static inline int wil_rx_status_get_l4_rx_status(void *msg)</div><div class='ctx'> 			    5, 6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* L4	L3	Expected result</div><div class='add'>+ * 0	0	Ok. No L3 and no L4 known protocols found.</div><div class='add'>+ *		Treated as L2 packet. (no offloads on this packet)</div><div class='add'>+ * 0	1	Ok. It means that L3 was found, and checksum check passed.</div><div class='add'>+ *		No known L4 protocol was found.</div><div class='add'>+ * 0	2	It means that L3 protocol was found, and checksum check failed.</div><div class='add'>+ *		No L4 known protocol was found.</div><div class='add'>+ * 1	any	Ok. It means that L4 was found, and checksum check passed.</div><div class='add'>+ * 3	0	Not a possible scenario.</div><div class='add'>+ * 3	1	Recalculate. It means that L3 protocol was found, and checksum</div><div class='add'>+ *		passed. But L4 checksum failed. Need to see if really failed,</div><div class='add'>+ *		or due to fragmentation.</div><div class='add'>+ * 3	2	Both L3 and L4 checksum check failed.</div><div class='add'>+ */</div><div class='add'>+static inline int wil_rx_status_get_checksum(void *msg,</div><div class='add'>+					     struct wil_net_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int l3_rx_status = wil_rx_status_get_l3_rx_status(msg);</div><div class='add'>+	int l4_rx_status = wil_rx_status_get_l4_rx_status(msg);</div><div class='add'>+</div><div class='add'>+	if (l4_rx_status == 1)</div><div class='add'>+		return CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+	if (l4_rx_status == 0 &amp;&amp; l3_rx_status == 1)</div><div class='add'>+		return CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+	if (l3_rx_status == 0 &amp;&amp; l4_rx_status == 0)</div><div class='add'>+		/* L2 packet */</div><div class='add'>+		return CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	/* If HW reports bad checksum, let IP stack re-check it</div><div class='add'>+	 * For example, HW doesn't understand Microsoft IP stack that</div><div class='add'>+	 * mis-calculates TCP checksum - if it should be 0x0,</div><div class='add'>+	 * it writes 0xffff in violation of RFC 1624</div><div class='add'>+	 */</div><div class='add'>+	stats-&gt;rx_csum_err++;</div><div class='add'>+	return CHECKSUM_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int wil_rx_status_get_security(void *msg)</div><div class='ctx'> {</div><div class='ctx'> 	return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)-&gt;d0,</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h<br/>index e1b1039b13ab..8724d9975606 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wil6210.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wil6210.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wil6210.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/wil6210.h</a></div><div class='hunk'>@@ -185,6 +185,7 @@ struct RGF_ICR {</div><div class='ctx'> </div><div class='ctx'> /* registers - FW addresses */</div><div class='ctx'> #define RGF_USER_USAGE_1		(0x880004)</div><div class='add'>+#define RGF_USER_USAGE_2		(0x880008)</div><div class='ctx'> #define RGF_USER_USAGE_6		(0x880018)</div><div class='ctx'> 	#define BIT_USER_OOB_MODE		BIT(31)</div><div class='ctx'> 	#define BIT_USER_OOB_R2_MODE		BIT(30)</div><div class='hunk'>@@ -367,6 +368,7 @@ struct RGF_ICR {</div><div class='ctx'> 	#define REVISION_ID_SPARROW_D0	(0x3)</div><div class='ctx'> </div><div class='ctx'> #define RGF_OTP_MAC_TALYN_MB		(0x8a0304)</div><div class='add'>+#define RGF_OTP_OEM_MAC			(0x8a0334)</div><div class='ctx'> #define RGF_OTP_MAC			(0x8a0620)</div><div class='ctx'> </div><div class='ctx'> /* Talyn-MB */</div><div class='hunk'>@@ -566,10 +568,11 @@ struct wil_status_ring {</div><div class='ctx'> 	bool is_rx;</div><div class='ctx'> 	u8 desc_rdy_pol; /* Expected descriptor ready bit polarity */</div><div class='ctx'> 	struct wil_ring_rx_data rx_data;</div><div class='add'>+	u32 invalid_buff_id_cnt; /* relevant only for RX */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WIL_STA_TID_NUM (16)</div><div class='del'>-#define WIL_MCS_MAX (12) /* Maximum MCS supported */</div><div class='add'>+#define WIL_MCS_MAX (15) /* Maximum MCS supported */</div><div class='ctx'> </div><div class='ctx'> struct wil_net_stats {</div><div class='ctx'> 	unsigned long	rx_packets;</div><div class='hunk'>@@ -660,7 +663,6 @@ enum { /* for wil6210_priv.status */</div><div class='ctx'> 	wil_status_suspending, /* suspend in progress */</div><div class='ctx'> 	wil_status_suspended, /* suspend completed, device is suspended */</div><div class='ctx'> 	wil_status_resuming, /* resume in progress */</div><div class='del'>-	wil_status_collecting_dumps, /* crashdump collection in progress */</div><div class='ctx'> 	wil_status_last /* keep last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -992,6 +994,8 @@ struct wil6210_priv {</div><div class='ctx'> 	struct wil_txrx_ops txrx_ops;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex mutex; /* for wil6210_priv access in wil_{up|down} */</div><div class='add'>+	/* for synchronizing device memory access while reset or suspend */</div><div class='add'>+	struct rw_semaphore mem_lock;</div><div class='ctx'> 	/* statistics */</div><div class='ctx'> 	atomic_t isr_count_rx, isr_count_tx;</div><div class='ctx'> 	/* debugfs */</div><div class='hunk'>@@ -1060,6 +1064,7 @@ struct wil6210_priv {</div><div class='ctx'> #define vif_to_wil(v) (v-&gt;wil)</div><div class='ctx'> #define vif_to_ndev(v) (v-&gt;ndev)</div><div class='ctx'> #define vif_to_wdev(v) (&amp;v-&gt;wdev)</div><div class='add'>+#define GET_MAX_VIFS(wil) min_t(int, (wil)-&gt;max_vifs, WIL_MAX_VIFS)</div><div class='ctx'> </div><div class='ctx'> static inline struct wil6210_vif *wdev_to_vif(struct wil6210_priv *wil,</div><div class='ctx'> 					      struct wireless_dev *wdev)</div><div class='hunk'>@@ -1176,6 +1181,8 @@ void wil_memcpy_fromio_32(void *dst, const volatile void __iomem *src,</div><div class='ctx'> 			  size_t count);</div><div class='ctx'> void wil_memcpy_toio_32(volatile void __iomem *dst, const void *src,</div><div class='ctx'> 			size_t count);</div><div class='add'>+int wil_mem_access_lock(struct wil6210_priv *wil);</div><div class='add'>+void wil_mem_access_unlock(struct wil6210_priv *wil);</div><div class='ctx'> </div><div class='ctx'> struct wil6210_vif *</div><div class='ctx'> wil_vif_alloc(struct wil6210_priv *wil, const char *name,</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wil_crash_dump.c b/drivers/net/wireless/ath/wil6210/wil_crash_dump.c<br/>index dc33a0b4c3fa..772cb00c2002 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wil_crash_dump.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wil_crash_dump.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wil_crash_dump.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/wil_crash_dump.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015,2017 Qualcomm Atheros, Inc.</div><div class='del'>- * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission to use, copy, modify, and/or distribute this software for any</div><div class='ctx'>  * purpose with or without fee is hereby granted, provided that the above</div><div class='hunk'>@@ -57,7 +57,7 @@ static int wil_fw_get_crash_dump_bounds(struct wil6210_priv *wil,</div><div class='ctx'> </div><div class='ctx'> int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, rc;</div><div class='ctx'> 	const struct fw_map *map;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	u32 host_min, dump_size, offset, len;</div><div class='hunk'>@@ -73,14 +73,9 @@ int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(wil_status_collecting_dumps, wil-&gt;status);</div><div class='del'>-	if (test_bit(wil_status_suspending, wil-&gt;status) ||</div><div class='del'>-	    test_bit(wil_status_suspended, wil-&gt;status) ||</div><div class='del'>-	    test_bit(wil_status_resetting, wil-&gt;status)) {</div><div class='del'>-		wil_err(wil, "cannot collect fw dump during suspend/reset\n");</div><div class='del'>-		clear_bit(wil_status_collecting_dumps, wil-&gt;status);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	rc = wil_mem_access_lock(wil);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* copy to crash dump area */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(fw_mapping); i++) {</div><div class='hunk'>@@ -100,8 +95,7 @@ int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size)</div><div class='ctx'> 		wil_memcpy_fromio_32((void * __force)(dest + offset),</div><div class='ctx'> 				     (const void __iomem * __force)data, len);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	clear_bit(wil_status_collecting_dumps, wil-&gt;status);</div><div class='add'>+	wil_mem_access_unlock(wil);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c<br/>index bda4a9712f91..d89cd41e78ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/wmi.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@ MODULE_PARM_DESC(led_id,</div><div class='ctx'> </div><div class='ctx'> #define WIL_WAIT_FOR_SUSPEND_RESUME_COMP 200</div><div class='ctx'> #define WIL_WMI_CALL_GENERAL_TO_MS 100</div><div class='add'>+#define WIL_WMI_PCP_STOP_TO_MS 5000</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * WMI event receiving - theory of operations</div><div class='hunk'>@@ -2195,7 +2196,8 @@ int wmi_pcp_stop(struct wil6210_vif *vif)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	return wmi_call(wil, WMI_PCP_STOP_CMDID, vif-&gt;mid, NULL, 0,</div><div class='del'>-			WMI_PCP_STOPPED_EVENTID, NULL, 0, 20);</div><div class='add'>+			WMI_PCP_STOPPED_EVENTID, NULL, 0,</div><div class='add'>+			WIL_WMI_PCP_STOP_TO_MS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wmi_set_ssid(struct wil6210_vif *vif, u8 ssid_len, const void *ssid)</div><div class='hunk'>@@ -2957,6 +2959,10 @@ static const char *suspend_status2name(u8 status)</div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 	case WMI_TRAFFIC_SUSPEND_REJECTED_LINK_NOT_IDLE:</div><div class='ctx'> 		return "LINK_NOT_IDLE";</div><div class='add'>+	case WMI_TRAFFIC_SUSPEND_REJECTED_DISCONNECT:</div><div class='add'>+		return "DISCONNECT";</div><div class='add'>+	case WMI_TRAFFIC_SUSPEND_REJECTED_OTHER:</div><div class='add'>+		return "OTHER";</div><div class='ctx'> 	default:</div><div class='ctx'> 		return "Untracked status";</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3046,6 +3052,9 @@ static void resume_triggers2string(u32 triggers, char *string, int str_size)</div><div class='ctx'> </div><div class='ctx'> 	if (triggers &amp; WMI_RESUME_TRIGGER_WMI_EVT)</div><div class='ctx'> 		strlcat(string, " WMI_EVT", str_size);</div><div class='add'>+</div><div class='add'>+	if (triggers &amp; WMI_RESUME_TRIGGER_DISCONNECT)</div><div class='add'>+		strlcat(string, " DISCONNECT", str_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wmi_resume(struct wil6210_priv *wil)</div><div class='hunk'>@@ -3196,7 +3205,7 @@ static void wmi_event_handle(struct wil6210_priv *wil,</div><div class='ctx'> </div><div class='ctx'> 		if (mid == MID_BROADCAST)</div><div class='ctx'> 			mid = 0;</div><div class='del'>-		if (mid &gt;= ARRAY_SIZE(wil-&gt;vifs) || mid &gt;= wil-&gt;max_vifs) {</div><div class='add'>+		if (mid &gt;= GET_MAX_VIFS(wil)) {</div><div class='ctx'> 			wil_dbg_wmi(wil, "invalid mid %d, event skipped\n",</div><div class='ctx'> 				    mid);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -3502,8 +3511,9 @@ int wmi_mgmt_tx(struct wil6210_vif *vif, const u8 *buf, size_t len)</div><div class='ctx'> 	rc = wmi_call(wil, WMI_SW_TX_REQ_CMDID, vif-&gt;mid, cmd, total,</div><div class='ctx'> 		      WMI_SW_TX_COMPLETE_EVENTID, &amp;evt, sizeof(evt), 2000);</div><div class='ctx'> 	if (!rc &amp;&amp; evt.evt.status != WMI_FW_STATUS_SUCCESS) {</div><div class='del'>-		wil_err(wil, "mgmt_tx failed with status %d\n", evt.evt.status);</div><div class='del'>-		rc = -EINVAL;</div><div class='add'>+		wil_dbg_wmi(wil, "mgmt_tx failed with status %d\n",</div><div class='add'>+			    evt.evt.status);</div><div class='add'>+		rc = -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -3555,9 +3565,9 @@ int wmi_mgmt_tx_ext(struct wil6210_vif *vif, const u8 *buf, size_t len,</div><div class='ctx'> 	rc = wmi_call(wil, WMI_SW_TX_REQ_EXT_CMDID, vif-&gt;mid, cmd, total,</div><div class='ctx'> 		      WMI_SW_TX_COMPLETE_EVENTID, &amp;evt, sizeof(evt), 2000);</div><div class='ctx'> 	if (!rc &amp;&amp; evt.evt.status != WMI_FW_STATUS_SUCCESS) {</div><div class='del'>-		wil_err(wil, "mgmt_tx_ext failed with status %d\n",</div><div class='del'>-			evt.evt.status);</div><div class='del'>-		rc = -EINVAL;</div><div class='add'>+		wil_dbg_wmi(wil, "mgmt_tx_ext failed with status %d\n",</div><div class='add'>+			    evt.evt.status);</div><div class='add'>+		rc = -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(cmd);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h<br/>index b668758da994..da46fc8d39cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wmi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ath/wil6210/wmi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ath/wil6210/wmi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ath/wil6210/wmi.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2006-2012 Wilocity</div><div class='ctx'>  *</div><div class='hunk'>@@ -104,6 +104,7 @@ enum wmi_fw_capability {</div><div class='ctx'> 	WMI_FW_CAPABILITY_RAW_MODE			= 24,</div><div class='ctx'> 	WMI_FW_CAPABILITY_TX_REQ_EXT			= 25,</div><div class='ctx'> 	WMI_FW_CAPABILITY_CHANNEL_4			= 26,</div><div class='add'>+	WMI_FW_CAPABILITY_IPA				= 27,</div><div class='ctx'> 	WMI_FW_CAPABILITY_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +295,7 @@ enum wmi_command_id {</div><div class='ctx'> 	WMI_SET_AP_SLOT_SIZE_CMDID			= 0xA0F,</div><div class='ctx'> 	WMI_SET_VRING_PRIORITY_WEIGHT_CMDID		= 0xA10,</div><div class='ctx'> 	WMI_SET_VRING_PRIORITY_CMDID			= 0xA11,</div><div class='add'>+	WMI_RBUFCAP_CFG_CMDID				= 0xA12,</div><div class='ctx'> 	WMI_SET_MAC_ADDRESS_CMDID			= 0xF003,</div><div class='ctx'> 	WMI_ABORT_SCAN_CMDID				= 0xF007,</div><div class='ctx'> 	WMI_SET_PROMISCUOUS_MODE_CMDID			= 0xF041,</div><div class='hunk'>@@ -979,10 +981,22 @@ enum wmi_rx_msg_type {</div><div class='ctx'> 	WMI_RX_MSG_TYPE_EXTENDED	= 0x01,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum wmi_ring_add_irq_mode {</div><div class='add'>+	/* Backwards compatibility</div><div class='add'>+	 *  for DESC ring - interrupt disabled</div><div class='add'>+	 *  for STATUS ring - interrupt enabled</div><div class='add'>+	 */</div><div class='add'>+	WMI_RING_ADD_IRQ_MODE_BWC	= 0x00,</div><div class='add'>+	WMI_RING_ADD_IRQ_MODE_DISABLE	= 0x01,</div><div class='add'>+	WMI_RING_ADD_IRQ_MODE_ENABLE	= 0x02,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct wmi_tx_status_ring_add_cmd {</div><div class='ctx'> 	struct wmi_edma_ring_cfg ring_cfg;</div><div class='ctx'> 	u8 irq_index;</div><div class='del'>-	u8 reserved[3];</div><div class='add'>+	/* wmi_ring_add_irq_mode */</div><div class='add'>+	u8 irq_mode;</div><div class='add'>+	u8 reserved[2];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_rx_status_ring_add_cmd {</div><div class='hunk'>@@ -1016,7 +1030,10 @@ struct wmi_tx_desc_ring_add_cmd {</div><div class='ctx'> 	u8 mac_ctrl;</div><div class='ctx'> 	u8 to_resolution;</div><div class='ctx'> 	u8 agg_max_wsize;</div><div class='del'>-	u8 reserved[3];</div><div class='add'>+	u8 irq_index;</div><div class='add'>+	/* wmi_ring_add_irq_mode */</div><div class='add'>+	u8 irq_mode;</div><div class='add'>+	u8 reserved;</div><div class='ctx'> 	struct wmi_vring_cfg_schd schd_params;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1982,6 +1999,7 @@ enum wmi_event_id {</div><div class='ctx'> 	WMI_BEAMFORMING_MGMT_DONE_EVENTID		= 0x1836,</div><div class='ctx'> 	WMI_BF_TXSS_MGMT_DONE_EVENTID			= 0x1837,</div><div class='ctx'> 	WMI_BF_RXSS_MGMT_DONE_EVENTID			= 0x1839,</div><div class='add'>+	WMI_BF_TRIG_EVENTID				= 0x183A,</div><div class='ctx'> 	WMI_RS_MGMT_DONE_EVENTID			= 0x1852,</div><div class='ctx'> 	WMI_RF_MGMT_STATUS_EVENTID			= 0x1853,</div><div class='ctx'> 	WMI_BF_SM_MGMT_DONE_EVENTID			= 0x1838,</div><div class='hunk'>@@ -2082,6 +2100,7 @@ enum wmi_event_id {</div><div class='ctx'> 	WMI_SET_AP_SLOT_SIZE_EVENTID			= 0x1A0F,</div><div class='ctx'> 	WMI_SET_VRING_PRIORITY_WEIGHT_EVENTID		= 0x1A10,</div><div class='ctx'> 	WMI_SET_VRING_PRIORITY_EVENTID			= 0x1A11,</div><div class='add'>+	WMI_RBUFCAP_CFG_EVENTID				= 0x1A12,</div><div class='ctx'> 	WMI_SET_CHANNEL_EVENTID				= 0x9000,</div><div class='ctx'> 	WMI_ASSOC_REQ_EVENTID				= 0x9001,</div><div class='ctx'> 	WMI_EAPOL_RX_EVENTID				= 0x9002,</div><div class='hunk'>@@ -2267,7 +2286,9 @@ struct wmi_notify_req_done_event {</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> 	__le64 tsf;</div><div class='ctx'> 	s8 rssi;</div><div class='del'>-	u8 reserved0[3];</div><div class='add'>+	/* enum wmi_edmg_tx_mode */</div><div class='add'>+	u8 tx_mode;</div><div class='add'>+	u8 reserved0[2];</div><div class='ctx'> 	__le32 tx_tpt;</div><div class='ctx'> 	__le32 tx_goodput;</div><div class='ctx'> 	__le32 rx_goodput;</div><div class='hunk'>@@ -2316,6 +2337,7 @@ enum wmi_disconnect_reason {</div><div class='ctx'> 	WMI_DIS_REASON_PROFILE_MISMATCH		= 0x0C,</div><div class='ctx'> 	WMI_DIS_REASON_CONNECTION_EVICTED	= 0x0D,</div><div class='ctx'> 	WMI_DIS_REASON_IBSS_MERGE		= 0x0E,</div><div class='add'>+	WMI_DIS_REASON_HIGH_TEMPERATURE		= 0x0F,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* WMI_DISCONNECT_EVENTID */</div><div class='hunk'>@@ -3168,6 +3190,30 @@ struct wmi_brp_set_ant_limit_event {</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+enum wmi_bf_type {</div><div class='add'>+	WMI_BF_TYPE_SLS		= 0x00,</div><div class='add'>+	WMI_BF_TYPE_BRP_RX	= 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* WMI_BF_TRIG_CMDID */</div><div class='add'>+struct wmi_bf_trig_cmd {</div><div class='add'>+	/* enum wmi_bf_type - type of requested beamforming */</div><div class='add'>+	u8 bf_type;</div><div class='add'>+	/* used only for WMI_BF_TYPE_BRP_RX */</div><div class='add'>+	u8 cid;</div><div class='add'>+	/* used only for WMI_BF_TYPE_SLS */</div><div class='add'>+	u8 dst_mac[WMI_MAC_LEN];</div><div class='add'>+	u8 reserved[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* WMI_BF_TRIG_EVENTID */</div><div class='add'>+struct wmi_bf_trig_event {</div><div class='add'>+	/* enum wmi_fw_status */</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 cid;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* broadcast connection ID */</div><div class='ctx'> #define WMI_LINK_MAINTAIN_CFG_CID_BROADCAST	(0xFFFFFFFF)</div><div class='ctx'> </div><div class='hunk'>@@ -3263,6 +3309,8 @@ struct wmi_link_maintain_cfg_read_done_event {</div><div class='ctx'> enum wmi_traffic_suspend_status {</div><div class='ctx'> 	WMI_TRAFFIC_SUSPEND_APPROVED			= 0x0,</div><div class='ctx'> 	WMI_TRAFFIC_SUSPEND_REJECTED_LINK_NOT_IDLE	= 0x1,</div><div class='add'>+	WMI_TRAFFIC_SUSPEND_REJECTED_DISCONNECT		= 0x2,</div><div class='add'>+	WMI_TRAFFIC_SUSPEND_REJECTED_OTHER		= 0x3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* WMI_TRAFFIC_SUSPEND_EVENTID */</div><div class='hunk'>@@ -3282,6 +3330,7 @@ enum wmi_resume_trigger {</div><div class='ctx'> 	WMI_RESUME_TRIGGER_UCAST_RX	= 0x2,</div><div class='ctx'> 	WMI_RESUME_TRIGGER_BCAST_RX	= 0x4,</div><div class='ctx'> 	WMI_RESUME_TRIGGER_WMI_EVT	= 0x8,</div><div class='add'>+	WMI_RESUME_TRIGGER_DISCONNECT	= 0x10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* WMI_TRAFFIC_RESUME_EVENTID */</div><div class='hunk'>@@ -4057,4 +4106,38 @@ struct wmi_set_vring_priority_event {</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* WMI_RADAR_PCI_CTRL_BLOCK struct */</div><div class='add'>+struct wmi_radar_pci_ctrl_block {</div><div class='add'>+	/* last fw tail address index */</div><div class='add'>+	__le32 fw_tail_index;</div><div class='add'>+	/* last SW head address index known to FW */</div><div class='add'>+	__le32 sw_head_index;</div><div class='add'>+	__le32 last_wr_pulse_tsf_low;</div><div class='add'>+	__le32 last_wr_pulse_count;</div><div class='add'>+	__le32 last_wr_in_bytes;</div><div class='add'>+	__le32 last_wr_pulse_id;</div><div class='add'>+	__le32 last_wr_burst_id;</div><div class='add'>+	/* When pre overflow detected, advance sw head in unit of pulses */</div><div class='add'>+	__le32 sw_head_inc;</div><div class='add'>+	__le32 reserved[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* WMI_RBUFCAP_CFG_CMD */</div><div class='add'>+struct wmi_rbufcap_cfg_cmd {</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	/* RBUFCAP indicates rx space unavailable when number of rx</div><div class='add'>+	 * descriptors drops below this threshold. Set 0 to use system</div><div class='add'>+	 * default</div><div class='add'>+	 */</div><div class='add'>+	__le16 rx_desc_threshold;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* WMI_RBUFCAP_CFG_EVENTID */</div><div class='add'>+struct wmi_rbufcap_cfg_event {</div><div class='add'>+	/* enum wmi_fw_status */</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #endif /* __WILOCITY_WMI_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c<br/>index e99e766a3028..1cabae424839 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/atmel/at76c50x-usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/atmel/at76c50x-usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/atmel/at76c50x-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/atmel/at76c50x-usb.c</a></div><div class='hunk'>@@ -2585,8 +2585,8 @@ static int __init at76_mod_init(void)</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR DRIVER_NAME</div><div class='ctx'> 		       ": usb_register failed (status %d)\n", result);</div><div class='del'>-</div><div class='del'>-	led_trigger_register_simple("at76_usb-tx", &amp;ledtrig_tx);</div><div class='add'>+	else</div><div class='add'>+		led_trigger_register_simple("at76_usb-tx", &amp;ledtrig_tx);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c<br/>index 74be3c809225..4c7980f84591 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43/main.c</a></div><div class='hunk'>@@ -485,7 +485,6 @@ static void b43_ram_write(struct b43_wldev *dev, u16 offset, u32 val)</div><div class='ctx'> 		val = swab32(val);</div><div class='ctx'> </div><div class='ctx'> 	b43_write32(dev, B43_MMIO_RAM_CONTROL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43_write32(dev, B43_MMIO_RAM_DATA, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -656,9 +655,7 @@ static void b43_tsf_write_locked(struct b43_wldev *dev, u64 tsf)</div><div class='ctx'> 	/* The hardware guarantees us an atomic write, if we</div><div class='ctx'> 	 * write the low register first. */</div><div class='ctx'> 	b43_write32(dev, B43_MMIO_REV3PLUS_TSF_LOW, low);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43_write32(dev, B43_MMIO_REV3PLUS_TSF_HIGH, high);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void b43_tsf_write(struct b43_wldev *dev, u64 tsf)</div><div class='hunk'>@@ -1822,11 +1819,9 @@ static void b43_beacon_update_trigger_work(struct work_struct *work)</div><div class='ctx'> 		if (b43_bus_host_is_sdio(dev-&gt;dev)) {</div><div class='ctx'> 			/* wl-&gt;mutex is enough. */</div><div class='ctx'> 			b43_do_beacon_update_trigger_work(dev);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_lock_irq(&amp;wl-&gt;hardirq_lock);</div><div class='ctx'> 			b43_do_beacon_update_trigger_work(dev);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			spin_unlock_irq(&amp;wl-&gt;hardirq_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2078,7 +2073,6 @@ static irqreturn_t b43_interrupt_thread_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;wl-&gt;mutex);</div><div class='ctx'> 	b43_do_interrupt_thread(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -2143,7 +2137,6 @@ static irqreturn_t b43_interrupt_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dev-&gt;wl-&gt;hardirq_lock);</div><div class='ctx'> 	ret = b43_do_interrupt(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;dev-&gt;wl-&gt;hardirq_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/phy_lp.c b/drivers/net/wireless/broadcom/b43/phy_lp.c<br/>index 46408a560814..6b7f0238723f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43/phy_lp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43/phy_lp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43/phy_lp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43/phy_lp.c</a></div><div class='hunk'>@@ -1826,16 +1826,10 @@ static void lpphy_stop_tx_tone(struct b43_wldev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void lpphy_papd_cal(struct b43_wldev *dev, struct lpphy_tx_gains gains,</div><div class='del'>-			   int mode, bool useindex, u8 index)</div><div class='del'>-{</div><div class='del'>-	//TODO</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy_lp *lpphy = dev-&gt;phy.lp;</div><div class='del'>-	struct lpphy_tx_gains gains, oldgains;</div><div class='add'>+	struct lpphy_tx_gains oldgains;</div><div class='ctx'> 	int old_txpctl, old_afe_ovr, old_rf, old_bbmult;</div><div class='ctx'> </div><div class='ctx'> 	lpphy_read_tx_pctl_mode_from_hardware(dev);</div><div class='hunk'>@@ -1848,11 +1842,6 @@ static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> 	lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;dev-&gt;chip_id == 0x4325 &amp;&amp; dev-&gt;dev-&gt;chip_rev == 0)</div><div class='del'>-		lpphy_papd_cal(dev, gains, 0, 1, 30);</div><div class='del'>-	else</div><div class='del'>-		lpphy_papd_cal(dev, gains, 0, 1, 65);</div><div class='del'>-</div><div class='ctx'> 	if (old_afe_ovr)</div><div class='ctx'> 		lpphy_set_tx_gains(dev, oldgains);</div><div class='ctx'> 	lpphy_set_bb_mult(dev, old_bbmult);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/sysfs.c b/drivers/net/wireless/broadcom/b43/sysfs.c<br/>index 3190493bd07f..93d03b673670 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43/sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43/sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43/sysfs.c</a></div><div class='hunk'>@@ -129,7 +129,6 @@ static ssize_t b43_attr_interfmode_store(struct device *dev,</div><div class='ctx'> 	} else</div><div class='ctx'> 		err = -ENOSYS;</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	mutex_unlock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : count;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/ilt.c b/drivers/net/wireless/broadcom/b43legacy/ilt.c<br/>index ee5682e54204..6d15fb4d30c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/ilt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/ilt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/ilt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43legacy/ilt.c</a></div><div class='hunk'>@@ -315,14 +315,12 @@ const u16 b43legacy_ilt_sigmasqr2[B43legacy_ILT_SIGMASQR_SIZE] = {</div><div class='ctx'> void b43legacy_ilt_write(struct b43legacy_wldev *dev, u16 offset, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_ILT_G_CTRL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_ILT_G_DATA1, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void b43legacy_ilt_write32(struct b43legacy_wldev *dev, u16 offset, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_ILT_G_CTRL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_ILT_G_DATA2,</div><div class='ctx'> 			    (val &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_ILT_G_DATA1,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c<br/>index 55f411925960..c777efc6dc13 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43legacy/main.c</a></div><div class='hunk'>@@ -264,7 +264,6 @@ static void b43legacy_ram_write(struct b43legacy_wldev *dev, u16 offset,</div><div class='ctx'> 		val = swab32(val);</div><div class='ctx'> </div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_RAM_CONTROL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_RAM_DATA, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -341,14 +340,11 @@ void b43legacy_shm_write32(struct b43legacy_wldev *dev,</div><div class='ctx'> 		if (offset &amp; 0x0003) {</div><div class='ctx'> 			/* Unaligned access */</div><div class='ctx'> 			b43legacy_shm_control_word(dev, routing, offset &gt;&gt; 2);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			b43legacy_write16(dev,</div><div class='ctx'> 					  B43legacy_MMIO_SHM_DATA_UNALIGNED,</div><div class='ctx'> 					  (value &gt;&gt; 16) &amp; 0xffff);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			b43legacy_shm_control_word(dev, routing,</div><div class='ctx'> 						   (offset &gt;&gt; 2) + 1);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			b43legacy_write16(dev, B43legacy_MMIO_SHM_DATA,</div><div class='ctx'> 					  value &amp; 0xffff);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -356,7 +352,6 @@ void b43legacy_shm_write32(struct b43legacy_wldev *dev,</div><div class='ctx'> 		offset &gt;&gt;= 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	b43legacy_shm_control_word(dev, routing, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_SHM_DATA, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +363,6 @@ void b43legacy_shm_write16(struct b43legacy_wldev *dev, u16 routing, u16 offset,</div><div class='ctx'> 		if (offset &amp; 0x0003) {</div><div class='ctx'> 			/* Unaligned access */</div><div class='ctx'> 			b43legacy_shm_control_word(dev, routing, offset &gt;&gt; 2);</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			b43legacy_write16(dev,</div><div class='ctx'> 					  B43legacy_MMIO_SHM_DATA_UNALIGNED,</div><div class='ctx'> 					  value);</div><div class='hunk'>@@ -377,7 +371,6 @@ void b43legacy_shm_write16(struct b43legacy_wldev *dev, u16 routing, u16 offset,</div><div class='ctx'> 		offset &gt;&gt;= 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	b43legacy_shm_control_word(dev, routing, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_write16(dev, B43legacy_MMIO_SHM_DATA, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -471,7 +464,6 @@ static void b43legacy_time_lock(struct b43legacy_wldev *dev)</div><div class='ctx'> 	status = b43legacy_read32(dev, B43legacy_MMIO_MACCTL);</div><div class='ctx'> 	status |= B43legacy_MACCTL_TBTTHOLD;</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_MACCTL, status);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43legacy_time_unlock(struct b43legacy_wldev *dev)</div><div class='hunk'>@@ -494,10 +486,8 @@ static void b43legacy_tsf_write_locked(struct b43legacy_wldev *dev, u64 tsf)</div><div class='ctx'> 		u32 hi = (tsf &amp; 0xFFFFFFFF00000000ULL) &gt;&gt; 32;</div><div class='ctx'> </div><div class='ctx'> 		b43legacy_write32(dev, B43legacy_MMIO_REV3PLUS_TSF_LOW, 0);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		b43legacy_write32(dev, B43legacy_MMIO_REV3PLUS_TSF_HIGH,</div><div class='ctx'> 				    hi);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		b43legacy_write32(dev, B43legacy_MMIO_REV3PLUS_TSF_LOW,</div><div class='ctx'> 				    lo);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -507,13 +497,9 @@ static void b43legacy_tsf_write_locked(struct b43legacy_wldev *dev, u64 tsf)</div><div class='ctx'> 		u16 v3 = (tsf &amp; 0xFFFF000000000000ULL) &gt;&gt; 48;</div><div class='ctx'> </div><div class='ctx'> 		b43legacy_write16(dev, B43legacy_MMIO_TSF_0, 0);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		b43legacy_write16(dev, B43legacy_MMIO_TSF_3, v3);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		b43legacy_write16(dev, B43legacy_MMIO_TSF_2, v2);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		b43legacy_write16(dev, B43legacy_MMIO_TSF_1, v1);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		b43legacy_write16(dev, B43legacy_MMIO_TSF_0, v0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1250,7 +1236,6 @@ static void b43legacy_beacon_update_trigger_work(struct work_struct *work)</div><div class='ctx'> 		/* The handler might have updated the IRQ mask. */</div><div class='ctx'> 		b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_MASK,</div><div class='ctx'> 				  dev-&gt;irq_mask);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		spin_unlock_irq(&amp;wl-&gt;irq_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -1346,7 +1331,6 @@ static void b43legacy_interrupt_tasklet(struct b43legacy_wldev *dev)</div><div class='ctx'> 			       dma_reason[2], dma_reason[3],</div><div class='ctx'> 			       dma_reason[4], dma_reason[5]);</div><div class='ctx'> 			b43legacy_controller_restart(dev, "DMA error");</div><div class='del'>-			mmiowb();</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;dev-&gt;wl-&gt;irq_lock, flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1396,7 +1380,6 @@ static void b43legacy_interrupt_tasklet(struct b43legacy_wldev *dev)</div><div class='ctx'> 		handle_irq_transmit_status(dev);</div><div class='ctx'> </div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_MASK, dev-&gt;irq_mask);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;wl-&gt;irq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1488,7 +1471,6 @@ static irqreturn_t b43legacy_interrupt_handler(int irq, void *dev_id)</div><div class='ctx'> 	dev-&gt;irq_reason = reason;</div><div class='ctx'> 	tasklet_schedule(&amp;dev-&gt;isr_tasklet);</div><div class='ctx'> out:</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock(&amp;dev-&gt;wl-&gt;irq_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2781,7 +2763,6 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_MASK, dev-&gt;irq_mask);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'> out_unlock_mutex:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -2900,7 +2881,6 @@ static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_GEN_IRQ_MASK, dev-&gt;irq_mask);</div><div class='ctx'> 	/* XXX: why? */</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'>  out_unlock_mutex:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/phy.c b/drivers/net/wireless/broadcom/b43legacy/phy.c<br/>index 995c7d0c212a..f949766d27ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43legacy/phy.c</a></div><div class='hunk'>@@ -134,7 +134,6 @@ u16 b43legacy_phy_read(struct b43legacy_wldev *dev, u16 offset)</div><div class='ctx'> void b43legacy_phy_write(struct b43legacy_wldev *dev, u16 offset, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	b43legacy_write16(dev, B43legacy_MMIO_PHY_CONTROL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_write16(dev, B43legacy_MMIO_PHY_DATA, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/pio.h b/drivers/net/wireless/broadcom/b43legacy/pio.h<br/>index 1cd1b9ca5e9c..08cd02282beb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/pio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/pio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/pio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43legacy/pio.h</a></div><div class='hunk'>@@ -92,7 +92,6 @@ void b43legacy_pio_write(struct b43legacy_pioqueue *queue,</div><div class='ctx'> 		       u16 offset, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	b43legacy_write16(queue-&gt;dev, queue-&gt;mmio_base + offset, value);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/radio.c b/drivers/net/wireless/broadcom/b43legacy/radio.c<br/>index eab1c9387846..c6db444ea07e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/radio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/radio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/radio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43legacy/radio.c</a></div><div class='hunk'>@@ -95,7 +95,6 @@ void b43legacy_radio_lock(struct b43legacy_wldev *dev)</div><div class='ctx'> 	B43legacy_WARN_ON(status &amp; B43legacy_MACCTL_RADIOLOCK);</div><div class='ctx'> 	status |= B43legacy_MACCTL_RADIOLOCK;</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_MACCTL, status);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +107,6 @@ void b43legacy_radio_unlock(struct b43legacy_wldev *dev)</div><div class='ctx'> 	B43legacy_WARN_ON(!(status &amp; B43legacy_MACCTL_RADIOLOCK));</div><div class='ctx'> 	status &amp;= ~B43legacy_MACCTL_RADIOLOCK;</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_MACCTL, status);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 b43legacy_radio_read16(struct b43legacy_wldev *dev, u16 offset)</div><div class='hunk'>@@ -141,7 +139,6 @@ u16 b43legacy_radio_read16(struct b43legacy_wldev *dev, u16 offset)</div><div class='ctx'> void b43legacy_radio_write16(struct b43legacy_wldev *dev, u16 offset, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	b43legacy_write16(dev, B43legacy_MMIO_RADIO_CONTROL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_write16(dev, B43legacy_MMIO_RADIO_DATA_LOW, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,7 +330,6 @@ u8 b43legacy_radio_aci_scan(struct b43legacy_wldev *dev)</div><div class='ctx'> void b43legacy_nrssi_hw_write(struct b43legacy_wldev *dev, u16 offset, s16 val)</div><div class='ctx'> {</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_NRSSILT_CTRL, offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	b43legacy_phy_write(dev, B43legacy_PHY_NRSSILT_DATA, (u16)val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/sysfs.c b/drivers/net/wireless/broadcom/b43legacy/sysfs.c<br/>index 2a1da15c913b..2db83eec7a11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/b43legacy/sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/b43legacy/sysfs.c</a></div><div class='hunk'>@@ -143,7 +143,6 @@ static ssize_t b43legacy_attr_interfmode_store(struct device *dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		b43legacyerr(wldev-&gt;wl, "Interference Mitigation not "</div><div class='ctx'> 		       "supported by device\n");</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;wldev-&gt;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	mutex_unlock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c<br/>index 73d3c1a0a7c9..98b168736df0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a></div><div class='hunk'>@@ -490,11 +490,18 @@ fail:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr)</div><div class='add'>+void brcmf_proto_bcdc_detach_pre_delif(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bcdc *bcdc = drvr-&gt;proto-&gt;pd;</div><div class='add'>+</div><div class='add'>+	brcmf_fws_detach_pre_delif(bcdc-&gt;fws);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void brcmf_proto_bcdc_detach_post_delif(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_bcdc *bcdc = drvr-&gt;proto-&gt;pd;</div><div class='ctx'> </div><div class='ctx'> 	drvr-&gt;proto-&gt;pd = NULL;</div><div class='del'>-	brcmf_fws_detach(bcdc-&gt;fws);</div><div class='add'>+	brcmf_fws_detach_post_delif(bcdc-&gt;fws);</div><div class='ctx'> 	kfree(bcdc);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h<br/>index 3b0e9eff21b5..4bc52240ccea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h</a></div><div class='hunk'>@@ -18,14 +18,16 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRCMFMAC_PROTO_BCDC</div><div class='ctx'> int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr);</div><div class='del'>-void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr);</div><div class='add'>+void brcmf_proto_bcdc_detach_pre_delif(struct brcmf_pub *drvr);</div><div class='add'>+void brcmf_proto_bcdc_detach_post_delif(struct brcmf_pub *drvr);</div><div class='ctx'> void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state);</div><div class='ctx'> void brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,</div><div class='ctx'> 				 bool success);</div><div class='ctx'> struct brcmf_fws_info *drvr_to_fws(struct brcmf_pub *drvr);</div><div class='ctx'> #else</div><div class='ctx'> static inline int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { return 0; }</div><div class='del'>-static inline void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) {}</div><div class='add'>+static void brcmf_proto_bcdc_detach_pre_delif(struct brcmf_pub *drvr) {};</div><div class='add'>+static inline void brcmf_proto_bcdc_detach_post_delif(struct brcmf_pub *drvr) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* BRCMFMAC_BCDC_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c<br/>index ec129864cc9c..60aede5abb4d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a></div><div class='hunk'>@@ -628,15 +628,13 @@ int brcmf_sdiod_send_buf(struct brcmf_sdio_dev *sdiodev, u8 *buf, uint nbytes)</div><div class='ctx'> </div><div class='ctx'> 	err = brcmf_sdiod_set_backplane_window(sdiodev, addr);</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'> 	addr &amp;= SBSDIO_SB_OFT_ADDR_MASK;</div><div class='ctx'> 	addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='del'>-		err = brcmf_sdiod_skbuff_write(sdiodev, sdiodev-&gt;func2, addr,</div><div class='del'>-					       mypkt);</div><div class='del'>-</div><div class='add'>+	err = brcmf_sdiod_skbuff_write(sdiodev, sdiodev-&gt;func2, addr, mypkt);</div><div class='add'>+out:</div><div class='ctx'> 	brcmu_pkt_buf_free_skb(mypkt);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h<br/>index 3d441c5c745c..2fe167eae22c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a></div><div class='hunk'>@@ -91,6 +91,7 @@ struct brcmf_bus_ops {</div><div class='ctx'> 	int (*get_fwname)(struct device *dev, const char *ext,</div><div class='ctx'> 			  unsigned char *fw_name);</div><div class='ctx'> 	void (*debugfs_create)(struct device *dev);</div><div class='add'>+	int (*reset)(struct device *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +246,15 @@ void brcmf_bus_debugfs_create(struct brcmf_bus *bus)</div><div class='ctx'> 	return bus-&gt;ops-&gt;debugfs_create(bus-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline</div><div class='add'>+int brcmf_bus_reset(struct brcmf_bus *bus)</div><div class='add'>+{</div><div class='add'>+	if (!bus-&gt;ops-&gt;reset)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return bus-&gt;ops-&gt;reset(bus-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * interface functions from common layer</div><div class='ctx'>  */</div><div class='hunk'>@@ -262,6 +272,8 @@ void brcmf_detach(struct device *dev);</div><div class='ctx'> void brcmf_dev_reset(struct device *dev);</div><div class='ctx'> /* Request from bus module to initiate a coredump */</div><div class='ctx'> void brcmf_dev_coredump(struct device *dev);</div><div class='add'>+/* Indication that firmware has halted or crashed */</div><div class='add'>+void brcmf_fw_crashed(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> /* Configure the "global" bus state used by upper layers */</div><div class='ctx'> void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c<br/>index e92f6351bd22..8ee8af4e7ec4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a></div><div class='hunk'>@@ -5464,6 +5464,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 		conn_info-&gt;req_ie =</div><div class='ctx'> 		    kmemdup(cfg-&gt;extra_buf, conn_info-&gt;req_ie_len,</div><div class='ctx'> 			    GFP_KERNEL);</div><div class='add'>+		if (!conn_info-&gt;req_ie)</div><div class='add'>+			conn_info-&gt;req_ie_len = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		conn_info-&gt;req_ie_len = 0;</div><div class='ctx'> 		conn_info-&gt;req_ie = NULL;</div><div class='hunk'>@@ -5480,6 +5482,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 		conn_info-&gt;resp_ie =</div><div class='ctx'> 		    kmemdup(cfg-&gt;extra_buf, conn_info-&gt;resp_ie_len,</div><div class='ctx'> 			    GFP_KERNEL);</div><div class='add'>+		if (!conn_info-&gt;resp_ie)</div><div class='add'>+			conn_info-&gt;resp_ie_len = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		conn_info-&gt;resp_ie_len = 0;</div><div class='ctx'> 		conn_info-&gt;resp_ie = NULL;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c<br/>index 4fbe8791f674..7d6a08779693 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a></div><div class='hunk'>@@ -841,17 +841,17 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,</div><div class='ctx'> 			 bool rtnl_locked)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp;</div><div class='add'>+	int ifidx;</div><div class='ctx'> </div><div class='ctx'> 	ifp = drvr-&gt;iflist[bsscfgidx];</div><div class='del'>-	drvr-&gt;iflist[bsscfgidx] = NULL;</div><div class='ctx'> 	if (!ifp) {</div><div class='ctx'> 		bphy_err(drvr, "Null interface, bsscfgidx=%d\n", bsscfgidx);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,</div><div class='ctx'> 		  ifp-&gt;ifidx);</div><div class='del'>-	if (drvr-&gt;if2bss[ifp-&gt;ifidx] == bsscfgidx)</div><div class='del'>-		drvr-&gt;if2bss[ifp-&gt;ifidx] = BRCMF_BSSIDX_INVALID;</div><div class='add'>+	ifidx = ifp-&gt;ifidx;</div><div class='add'>+</div><div class='ctx'> 	if (ifp-&gt;ndev) {</div><div class='ctx'> 		if (bsscfgidx == 0) {</div><div class='ctx'> 			if (ifp-&gt;ndev-&gt;netdev_ops == &amp;brcmf_netdev_ops_pri) {</div><div class='hunk'>@@ -879,6 +879,10 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,</div><div class='ctx'> 		brcmf_p2p_ifp_removed(ifp, rtnl_locked);</div><div class='ctx'> 		kfree(ifp);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	drvr-&gt;iflist[bsscfgidx] = NULL;</div><div class='add'>+	if (drvr-&gt;if2bss[ifidx] == bsscfgidx)</div><div class='add'>+		drvr-&gt;if2bss[ifidx] = BRCMF_BSSIDX_INVALID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked)</div><div class='hunk'>@@ -1084,6 +1088,14 @@ static int brcmf_revinfo_read(struct seq_file *s, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcmf_core_bus_reset(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = container_of(work, struct brcmf_pub,</div><div class='add'>+					      bus_reset);</div><div class='add'>+</div><div class='add'>+	brcmf_bus_reset(drvr-&gt;bus_if);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='hunk'>@@ -1155,6 +1167,8 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops)</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_INET */</div><div class='ctx'> </div><div class='add'>+	INIT_WORK(&amp;drvr-&gt;bus_reset, brcmf_core_bus_reset);</div><div class='add'>+</div><div class='ctx'> 	/* populate debugfs */</div><div class='ctx'> 	brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);</div><div class='ctx'> 	brcmf_feat_debugfs_create(drvr);</div><div class='hunk'>@@ -1273,6 +1287,18 @@ void brcmf_dev_coredump(struct device *dev)</div><div class='ctx'> 		brcmf_dbg(TRACE, "failed to create coredump\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void brcmf_fw_crashed(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_pub *drvr = bus_if-&gt;drvr;</div><div class='add'>+</div><div class='add'>+	bphy_err(drvr, "Firmware has halted or crashed\n");</div><div class='add'>+</div><div class='add'>+	brcmf_dev_coredump(dev);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;drvr-&gt;bus_reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void brcmf_detach(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	s32 i;</div><div class='hunk'>@@ -1299,6 +1325,8 @@ void brcmf_detach(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_bus_change_state(bus_if, BRCMF_BUS_DOWN);</div><div class='ctx'> </div><div class='add'>+	brcmf_proto_detach_pre_delif(drvr);</div><div class='add'>+</div><div class='ctx'> 	/* make sure primary interface removed last */</div><div class='ctx'> 	for (i = BRCMF_MAX_IFS-1; i &gt; -1; i--)</div><div class='ctx'> 		brcmf_remove_interface(drvr-&gt;iflist[i], false);</div><div class='hunk'>@@ -1308,7 +1336,7 @@ void brcmf_detach(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_bus_stop(drvr-&gt;bus_if);</div><div class='ctx'> </div><div class='del'>-	brcmf_proto_detach(drvr);</div><div class='add'>+	brcmf_proto_detach_post_delif(drvr);</div><div class='ctx'> </div><div class='ctx'> 	bus_if-&gt;drvr = NULL;</div><div class='ctx'> 	wiphy_free(drvr-&gt;wiphy);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h<br/>index d8085ce579f4..9f09aa31eeda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a></div><div class='hunk'>@@ -143,6 +143,8 @@ struct brcmf_pub {</div><div class='ctx'> 	struct notifier_block inet6addr_notifier;</div><div class='ctx'> 	struct brcmf_mp_device *settings;</div><div class='ctx'> </div><div class='add'>+	struct work_struct bus_reset;</div><div class='add'>+</div><div class='ctx'> 	u8 clmver[BRCMF_DCMD_SMLEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c<br/>index 7535cb0d4ac0..9f1417e00073 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a></div><div class='hunk'>@@ -31,6 +31,10 @@ struct brcmf_dmi_data {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Please keep all entries sorted alphabetically */</div><div class='ctx'> </div><div class='add'>+static const struct brcmf_dmi_data acepc_t8_data = {</div><div class='add'>+	BRCM_CC_4345_CHIP_ID, 6, "acepc-t8"</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct brcmf_dmi_data gpd_win_pocket_data = {</div><div class='ctx'> 	BRCM_CC_4356_CHIP_ID, 2, "gpd-win-pocket"</div><div class='ctx'> };</div><div class='hunk'>@@ -49,6 +53,28 @@ static const struct brcmf_dmi_data pov_tab_p1006w_data = {</div><div class='ctx'> </div><div class='ctx'> static const struct dmi_system_id dmi_platform_data[] = {</div><div class='ctx'> 	{</div><div class='add'>+		/* ACEPC T8 Cherry Trail Z8350 mini PC */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T8"),</div><div class='add'>+			/* also match on somewhat unique bios-version */</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)&amp;acepc_t8_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* ACEPC T11 Cherry Trail Z8350 mini PC, same wifi as the T8 */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T11"),</div><div class='add'>+			/* also match on somewhat unique bios-version */</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)&amp;acepc_t8_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		/* Match for the GPDwin which unfortunately uses somewhat</div><div class='ctx'> 		 * generic dmi strings, which is why we test for 4 strings.</div><div class='ctx'> 		 * Comparing against 23 other byt/cht boards, board_vendor</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c<br/>index 8209a42dea72..6a333dd80b2d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c</a></div><div class='hunk'>@@ -711,7 +711,6 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,</div><div class='ctx'> 	size_t mp_path_len;</div><div class='ctx'> 	u32 i, j;</div><div class='ctx'> 	char end = '\0';</div><div class='del'>-	size_t reqsz;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; table_size; i++) {</div><div class='ctx'> 		if (mapping_table[i].chipid == chip &amp;&amp;</div><div class='hunk'>@@ -726,8 +725,7 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reqsz = sizeof(*fwreq) + n_fwnames * sizeof(struct brcmf_fw_item);</div><div class='del'>-	fwreq = kzalloc(reqsz, GFP_KERNEL);</div><div class='add'>+	fwreq = kzalloc(struct_size(fwreq, items, n_fwnames), GFP_KERNEL);</div><div class='ctx'> 	if (!fwreq)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -743,6 +741,7 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; n_fwnames; j++) {</div><div class='ctx'> 		fwreq-&gt;items[j].path = fwnames[j].path;</div><div class='add'>+		fwnames[j].path[0] = '\0';</div><div class='ctx'> 		/* check if firmware path is provided by module parameter */</div><div class='ctx'> 		if (brcmf_mp_global.firmware_path[0] != '\0') {</div><div class='ctx'> 			strlcpy(fwnames[j].path, mp_path,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c<br/>index abeb305492e0..c22c49ae552e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a></div><div class='hunk'>@@ -580,24 +580,6 @@ static bool brcmf_fws_ifidx_match(struct sk_buff *skb, void *arg)</div><div class='ctx'> 	return ifidx == *(int *)arg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,</div><div class='del'>-				int ifidx)</div><div class='del'>-{</div><div class='del'>-	bool (*matchfn)(struct sk_buff *, void *) = NULL;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int prec;</div><div class='del'>-</div><div class='del'>-	if (ifidx != -1)</div><div class='del'>-		matchfn = brcmf_fws_ifidx_match;</div><div class='del'>-	for (prec = 0; prec &lt; q-&gt;num_prec; prec++) {</div><div class='del'>-		skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &amp;ifidx);</div><div class='del'>-		while (skb) {</div><div class='del'>-			brcmu_pkt_buf_free_skb(skb);</div><div class='del'>-			skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &amp;ifidx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void brcmf_fws_hanger_init(struct brcmf_fws_hanger *hanger)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -669,6 +651,28 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,</div><div class='add'>+				int ifidx)</div><div class='add'>+{</div><div class='add'>+	bool (*matchfn)(struct sk_buff *, void *) = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int prec;</div><div class='add'>+	u32 hslot;</div><div class='add'>+</div><div class='add'>+	if (ifidx != -1)</div><div class='add'>+		matchfn = brcmf_fws_ifidx_match;</div><div class='add'>+	for (prec = 0; prec &lt; q-&gt;num_prec; prec++) {</div><div class='add'>+		skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &amp;ifidx);</div><div class='add'>+		while (skb) {</div><div class='add'>+			hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);</div><div class='add'>+			brcmf_fws_hanger_poppkt(&amp;fws-&gt;hanger, hslot, &amp;skb,</div><div class='add'>+						true);</div><div class='add'>+			brcmu_pkt_buf_free_skb(skb);</div><div class='add'>+			skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &amp;ifidx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int brcmf_fws_hanger_mark_suppressed(struct brcmf_fws_hanger *h,</div><div class='ctx'> 					    u32 slot_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -2200,6 +2204,8 @@ void brcmf_fws_del_interface(struct brcmf_if *ifp)</div><div class='ctx'> 	brcmf_fws_lock(fws);</div><div class='ctx'> 	ifp-&gt;fws_desc = NULL;</div><div class='ctx'> 	brcmf_dbg(TRACE, "deleting %s\n", entry-&gt;name);</div><div class='add'>+	brcmf_fws_macdesc_cleanup(fws, &amp;fws-&gt;desc.iface[ifp-&gt;ifidx],</div><div class='add'>+				  ifp-&gt;ifidx);</div><div class='ctx'> 	brcmf_fws_macdesc_deinit(entry);</div><div class='ctx'> 	brcmf_fws_cleanup(fws, ifp-&gt;ifidx);</div><div class='ctx'> 	brcmf_fws_unlock(fws);</div><div class='hunk'>@@ -2437,17 +2443,25 @@ struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr)</div><div class='ctx'> 	return fws;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	brcmf_fws_detach(fws);</div><div class='add'>+	brcmf_fws_detach_pre_delif(fws);</div><div class='add'>+	brcmf_fws_detach_post_delif(fws);</div><div class='ctx'> 	return ERR_PTR(rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_fws_detach(struct brcmf_fws_info *fws)</div><div class='add'>+void brcmf_fws_detach_pre_delif(struct brcmf_fws_info *fws)</div><div class='ctx'> {</div><div class='ctx'> 	if (!fws)</div><div class='ctx'> 		return;</div><div class='del'>-</div><div class='del'>-	if (fws-&gt;fws_wq)</div><div class='add'>+	if (fws-&gt;fws_wq) {</div><div class='ctx'> 		destroy_workqueue(fws-&gt;fws_wq);</div><div class='add'>+		fws-&gt;fws_wq = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void brcmf_fws_detach_post_delif(struct brcmf_fws_info *fws)</div><div class='add'>+{</div><div class='add'>+	if (!fws)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* cleanup */</div><div class='ctx'> 	brcmf_fws_lock(fws);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h<br/>index 4e6835766d5d..749c06dcdc17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a></div><div class='hunk'>@@ -19,7 +19,8 @@</div><div class='ctx'> #define FWSIGNAL_H_</div><div class='ctx'> </div><div class='ctx'> struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr);</div><div class='del'>-void brcmf_fws_detach(struct brcmf_fws_info *fws);</div><div class='add'>+void brcmf_fws_detach_pre_delif(struct brcmf_fws_info *fws);</div><div class='add'>+void brcmf_fws_detach_post_delif(struct brcmf_fws_info *fws);</div><div class='ctx'> void brcmf_fws_debugfs_create(struct brcmf_pub *drvr);</div><div class='ctx'> bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws);</div><div class='ctx'> bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c<br/>index d3780eae7f19..9d1f9ff25bfa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a></div><div class='hunk'>@@ -375,7 +375,7 @@ brcmf_msgbuf_get_pktid(struct device *dev, struct brcmf_msgbuf_pktids *pktids,</div><div class='ctx'> 	struct brcmf_msgbuf_pktid *pktid;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= pktids-&gt;array_size) {</div><div class='add'>+	if (idx &lt; 0 || idx &gt;= pktids-&gt;array_size) {</div><div class='ctx'> 		brcmf_err("Invalid packet id %d (max %d)\n", idx,</div><div class='ctx'> 			  pktids-&gt;array_size);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -747,7 +747,7 @@ static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)</div><div class='ctx'> 		tx_msghdr = (struct msgbuf_tx_msghdr *)ret_ptr;</div><div class='ctx'> </div><div class='ctx'> 		tx_msghdr-&gt;msg.msgtype = MSGBUF_TYPE_TX_POST;</div><div class='del'>-		tx_msghdr-&gt;msg.request_id = cpu_to_le32(pktid);</div><div class='add'>+		tx_msghdr-&gt;msg.request_id = cpu_to_le32(pktid + 1);</div><div class='ctx'> 		tx_msghdr-&gt;msg.ifidx = brcmf_flowring_ifidx_get(flow, flowid);</div><div class='ctx'> 		tx_msghdr-&gt;flags = BRCMF_MSGBUF_PKT_FLAGS_FRAME_802_3;</div><div class='ctx'> 		tx_msghdr-&gt;flags |= (skb-&gt;priority &amp; 0x07) &lt;&lt;</div><div class='hunk'>@@ -884,7 +884,7 @@ brcmf_msgbuf_process_txstatus(struct brcmf_msgbuf *msgbuf, void *buf)</div><div class='ctx'> 	u16 flowid;</div><div class='ctx'> </div><div class='ctx'> 	tx_status = (struct msgbuf_tx_status *)buf;</div><div class='del'>-	idx = le32_to_cpu(tx_status-&gt;msg.request_id);</div><div class='add'>+	idx = le32_to_cpu(tx_status-&gt;msg.request_id) - 1;</div><div class='ctx'> 	flowid = le16_to_cpu(tx_status-&gt;compl_hdr.flow_ring_id);</div><div class='ctx'> 	flowid -= BRCMF_H2D_MSGRING_FLOWRING_IDSTART;</div><div class='ctx'> 	skb = brcmf_msgbuf_get_pktid(msgbuf-&gt;drvr-&gt;bus_if-&gt;dev,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c<br/>index 58a6bc379358..83e4938527f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a></div><div class='hunk'>@@ -345,6 +345,10 @@ static const u32 brcmf_ring_itemsize[BRCMF_NROF_COMMON_MSGRINGS] = {</div><div class='ctx'> 	BRCMF_D2H_MSGRING_RX_COMPLETE_ITEMSIZE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void brcmf_pcie_setup(struct device *dev, int ret,</div><div class='add'>+			     struct brcmf_fw_request *fwreq);</div><div class='add'>+static struct brcmf_fw_request *</div><div class='add'>+brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo);</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='ctx'> brcmf_pcie_read_reg32(struct brcmf_pciedev_info *devinfo, u32 reg_offset)</div><div class='hunk'>@@ -671,6 +675,7 @@ static int</div><div class='ctx'> brcmf_pcie_send_mb_data(struct brcmf_pciedev_info *devinfo, u32 htod_mb_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pcie_shared_info *shared;</div><div class='add'>+	struct brcmf_core *core;</div><div class='ctx'> 	u32 addr;</div><div class='ctx'> 	u32 cur_htod_mb_data;</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -694,7 +699,11 @@ brcmf_pcie_send_mb_data(struct brcmf_pciedev_info *devinfo, u32 htod_mb_data)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_pcie_write_tcm32(devinfo, addr, htod_mb_data);</div><div class='ctx'> 	pci_write_config_dword(devinfo-&gt;pdev, BRCMF_PCIE_REG_SBMBX, 1);</div><div class='del'>-	pci_write_config_dword(devinfo-&gt;pdev, BRCMF_PCIE_REG_SBMBX, 1);</div><div class='add'>+</div><div class='add'>+	/* Send mailbox interrupt twice as a hardware workaround */</div><div class='add'>+	core = brcmf_chip_get_core(devinfo-&gt;ci, BCMA_CORE_PCIE2);</div><div class='add'>+	if (core-&gt;rev &lt;= 13)</div><div class='add'>+		pci_write_config_dword(devinfo-&gt;pdev, BRCMF_PCIE_REG_SBMBX, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -730,7 +739,7 @@ static void brcmf_pcie_handle_mb_data(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dtoh_mb_data &amp; BRCMF_D2H_DEV_FWHALT) {</div><div class='ctx'> 		brcmf_dbg(PCIE, "D2H_MB_DATA: FW HALT\n");</div><div class='del'>-		brcmf_dev_coredump(&amp;devinfo-&gt;pdev-&gt;dev);</div><div class='add'>+		brcmf_fw_crashed(&amp;devinfo-&gt;pdev-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -755,15 +764,22 @@ static void brcmf_pcie_bus_console_init(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 		  console-&gt;base_addr, console-&gt;buf_addr, console-&gt;bufsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo)</div><div class='add'>+/**</div><div class='add'>+ * brcmf_pcie_bus_console_read - reads firmware messages</div><div class='add'>+ *</div><div class='add'>+ * @error: specifies if error has occurred (prints messages unconditionally)</div><div class='add'>+ */</div><div class='add'>+static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo,</div><div class='add'>+					bool error)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = devinfo-&gt;pdev;</div><div class='add'>+	struct brcmf_bus *bus = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct brcmf_pcie_console *console;</div><div class='ctx'> 	u32 addr;</div><div class='ctx'> 	u8 ch;</div><div class='ctx'> 	u32 newidx;</div><div class='ctx'> </div><div class='del'>-	if (!BRCMF_FWCON_ON())</div><div class='add'>+	if (!error &amp;&amp; !BRCMF_FWCON_ON())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	console = &amp;devinfo-&gt;shared.console;</div><div class='hunk'>@@ -787,7 +803,10 @@ static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ch == '\n') {</div><div class='ctx'> 			console-&gt;log_str[console-&gt;log_idx] = 0;</div><div class='del'>-			pr_debug("CONSOLE: %s", console-&gt;log_str);</div><div class='add'>+			if (error)</div><div class='add'>+				brcmf_err(bus, "CONSOLE: %s", console-&gt;log_str);</div><div class='add'>+			else</div><div class='add'>+				pr_debug("CONSOLE: %s", console-&gt;log_str);</div><div class='ctx'> 			console-&gt;log_idx = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -848,7 +867,7 @@ static irqreturn_t brcmf_pcie_isr_thread(int irq, void *arg)</div><div class='ctx'> 							&amp;devinfo-&gt;pdev-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	brcmf_pcie_bus_console_read(devinfo);</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, false);</div><div class='ctx'> 	if (devinfo-&gt;state == BRCMFMAC_PCIE_STATE_UP)</div><div class='ctx'> 		brcmf_pcie_intr_enable(devinfo);</div><div class='ctx'> 	devinfo-&gt;in_irq = false;</div><div class='hunk'>@@ -1409,6 +1428,38 @@ int brcmf_pcie_get_fwname(struct device *dev, const char *ext, u8 *fw_name)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int brcmf_pcie_reset(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_pciedev *buspub = bus_if-&gt;bus_priv.pcie;</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = buspub-&gt;devinfo;</div><div class='add'>+	struct brcmf_fw_request *fwreq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, true);</div><div class='add'>+</div><div class='add'>+	brcmf_detach(dev);</div><div class='add'>+</div><div class='add'>+	brcmf_pcie_release_irq(devinfo);</div><div class='add'>+	brcmf_pcie_release_scratchbuffers(devinfo);</div><div class='add'>+	brcmf_pcie_release_ringbuffers(devinfo);</div><div class='add'>+	brcmf_pcie_reset_device(devinfo);</div><div class='add'>+</div><div class='add'>+	fwreq = brcmf_pcie_prepare_fw_request(devinfo);</div><div class='add'>+	if (!fwreq) {</div><div class='add'>+		dev_err(dev, "Failed to prepare FW request\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = brcmf_fw_get_firmwares(dev, fwreq, brcmf_pcie_setup);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to prepare FW request\n");</div><div class='add'>+		kfree(fwreq);</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 const struct brcmf_bus_ops brcmf_pcie_bus_ops = {</div><div class='ctx'> 	.txdata = brcmf_pcie_tx,</div><div class='ctx'> 	.stop = brcmf_pcie_down,</div><div class='hunk'>@@ -1418,6 +1469,7 @@ static const struct brcmf_bus_ops brcmf_pcie_bus_ops = {</div><div class='ctx'> 	.get_ramsize = brcmf_pcie_get_ramsize,</div><div class='ctx'> 	.get_memdump = brcmf_pcie_get_memdump,</div><div class='ctx'> 	.get_fwname = brcmf_pcie_get_fwname,</div><div class='add'>+	.reset = brcmf_pcie_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1778,7 +1830,7 @@ static void brcmf_pcie_setup(struct device *dev, int ret,</div><div class='ctx'> 	if (brcmf_attach(&amp;devinfo-&gt;pdev-&gt;dev, devinfo-&gt;settings) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	brcmf_pcie_bus_console_read(devinfo);</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, false);</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	device_release_driver(dev);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c<br/>index 024c643052bc..c7964ccdda69 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c</a></div><div class='hunk'>@@ -67,16 +67,22 @@ fail:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_proto_detach(struct brcmf_pub *drvr)</div><div class='add'>+void brcmf_proto_detach_post_delif(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	if (drvr-&gt;proto) {</div><div class='ctx'> 		if (drvr-&gt;bus_if-&gt;proto_type == BRCMF_PROTO_BCDC)</div><div class='del'>-			brcmf_proto_bcdc_detach(drvr);</div><div class='add'>+			brcmf_proto_bcdc_detach_post_delif(drvr);</div><div class='ctx'> 		else if (drvr-&gt;bus_if-&gt;proto_type == BRCMF_PROTO_MSGBUF)</div><div class='ctx'> 			brcmf_proto_msgbuf_detach(drvr);</div><div class='ctx'> 		kfree(drvr-&gt;proto);</div><div class='ctx'> 		drvr-&gt;proto = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void brcmf_proto_detach_pre_delif(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	if (drvr-&gt;proto &amp;&amp; drvr-&gt;bus_if-&gt;proto_type == BRCMF_PROTO_BCDC)</div><div class='add'>+		brcmf_proto_bcdc_detach_pre_delif(drvr);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h<br/>index d3c3b9a815ad..72355aea9028 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a></div><div class='hunk'>@@ -54,7 +54,8 @@ struct brcmf_proto {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int brcmf_proto_attach(struct brcmf_pub *drvr);</div><div class='del'>-void brcmf_proto_detach(struct brcmf_pub *drvr);</div><div class='add'>+void brcmf_proto_detach_pre_delif(struct brcmf_pub *drvr);</div><div class='add'>+void brcmf_proto_detach_post_delif(struct brcmf_pub *drvr);</div><div class='ctx'> </div><div class='ctx'> static inline int brcmf_proto_hdrpull(struct brcmf_pub *drvr, bool do_fws,</div><div class='ctx'> 				      struct sk_buff *skb,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c<br/>index 4d104ab80fd8..22b73da42822 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a></div><div class='hunk'>@@ -622,6 +622,7 @@ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");</div><div class='ctx'> /* Note the names are not postfixed with a1 for backward compatibility */</div><div class='ctx'> BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");</div><div class='ctx'> BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");</div><div class='add'>+BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");</div><div class='ctx'> BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");</div><div class='ctx'> BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");</div><div class='ctx'> BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");</div><div class='hunk'>@@ -642,7 +643,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),</div><div class='del'>-	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),</div><div class='ctx'> 	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),</div><div class='hunk'>@@ -1090,8 +1092,8 @@ static u32 brcmf_sdio_hostmail(struct brcmf_sdio *bus)</div><div class='ctx'> </div><div class='ctx'> 	/* dongle indicates the firmware has halted/crashed */</div><div class='ctx'> 	if (hmb_data &amp; HMB_DATA_FWHALT) {</div><div class='del'>-		brcmf_err("mailbox indicates firmware halted\n");</div><div class='del'>-		brcmf_dev_coredump(&amp;sdiod-&gt;func1-&gt;dev);</div><div class='add'>+		brcmf_dbg(SDIO, "mailbox indicates firmware halted\n");</div><div class='add'>+		brcmf_fw_crashed(&amp;sdiod-&gt;func1-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Dongle recomposed rx frames, accept them again */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c<br/>index e9cbfd077710..75fcd6752edc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ struct brcmf_usbdev_info {</div><div class='ctx'> </div><div class='ctx'> 	struct usb_device *usbdev;</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	struct mutex dev_init_lock;</div><div class='add'>+	struct completion dev_init_done;</div><div class='ctx'> </div><div class='ctx'> 	int ctl_in_pipe, ctl_out_pipe;</div><div class='ctx'> 	struct urb *ctl_urb; /* URB for control endpoint */</div><div class='hunk'>@@ -445,22 +445,17 @@ fail:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_usb_free_q(struct list_head *q, bool pending)</div><div class='add'>+static void brcmf_usb_free_q(struct list_head *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_usbreq *req, *next;</div><div class='del'>-	int i = 0;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(req, next, q, list) {</div><div class='ctx'> 		if (!req-&gt;urb) {</div><div class='ctx'> 			brcmf_err("bad req\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		i++;</div><div class='del'>-		if (pending) {</div><div class='del'>-			usb_kill_urb(req-&gt;urb);</div><div class='del'>-		} else {</div><div class='del'>-			usb_free_urb(req-&gt;urb);</div><div class='del'>-			list_del_init(&amp;req-&gt;list);</div><div class='del'>-		}</div><div class='add'>+		usb_free_urb(req-&gt;urb);</div><div class='add'>+		list_del_init(&amp;req-&gt;list);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -682,12 +677,18 @@ static int brcmf_usb_up(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static void brcmf_cancel_all_urbs(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	if (devinfo-&gt;ctl_urb)</div><div class='ctx'> 		usb_kill_urb(devinfo-&gt;ctl_urb);</div><div class='ctx'> 	if (devinfo-&gt;bulk_urb)</div><div class='ctx'> 		usb_kill_urb(devinfo-&gt;bulk_urb);</div><div class='del'>-	brcmf_usb_free_q(&amp;devinfo-&gt;tx_postq, true);</div><div class='del'>-	brcmf_usb_free_q(&amp;devinfo-&gt;rx_postq, true);</div><div class='add'>+	if (devinfo-&gt;tx_reqs)</div><div class='add'>+		for (i = 0; i &lt; devinfo-&gt;bus_pub.ntxq; i++)</div><div class='add'>+			usb_kill_urb(devinfo-&gt;tx_reqs[i].urb);</div><div class='add'>+	if (devinfo-&gt;rx_reqs)</div><div class='add'>+		for (i = 0; i &lt; devinfo-&gt;bus_pub.nrxq; i++)</div><div class='add'>+			usb_kill_urb(devinfo-&gt;rx_reqs[i].urb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_usb_down(struct device *dev)</div><div class='hunk'>@@ -1023,8 +1024,8 @@ static void brcmf_usb_detach(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 	brcmf_dbg(USB, "Enter, devinfo %p\n", devinfo);</div><div class='ctx'> </div><div class='ctx'> 	/* free the URBS */</div><div class='del'>-	brcmf_usb_free_q(&amp;devinfo-&gt;rx_freeq, false);</div><div class='del'>-	brcmf_usb_free_q(&amp;devinfo-&gt;tx_freeq, false);</div><div class='add'>+	brcmf_usb_free_q(&amp;devinfo-&gt;rx_freeq);</div><div class='add'>+	brcmf_usb_free_q(&amp;devinfo-&gt;tx_freeq);</div><div class='ctx'> </div><div class='ctx'> 	usb_free_urb(devinfo-&gt;ctl_urb);</div><div class='ctx'> 	usb_free_urb(devinfo-&gt;bulk_urb);</div><div class='hunk'>@@ -1193,11 +1194,11 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;devinfo-&gt;dev_init_lock);</div><div class='add'>+	complete(&amp;devinfo-&gt;dev_init_done);</div><div class='ctx'> 	return;</div><div class='ctx'> error:</div><div class='ctx'> 	brcmf_dbg(TRACE, "failed: dev=%s, err=%d\n", dev_name(dev), ret);</div><div class='del'>-	mutex_unlock(&amp;devinfo-&gt;dev_init_lock);</div><div class='add'>+	complete(&amp;devinfo-&gt;dev_init_done);</div><div class='ctx'> 	device_release_driver(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1265,7 +1266,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		/* we are done */</div><div class='del'>-		mutex_unlock(&amp;devinfo-&gt;dev_init_lock);</div><div class='add'>+		complete(&amp;devinfo-&gt;dev_init_done);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	bus-&gt;chip = bus_pub-&gt;devid;</div><div class='hunk'>@@ -1325,11 +1326,10 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;usbdev = usb;</div><div class='ctx'> 	devinfo-&gt;dev = &amp;usb-&gt;dev;</div><div class='del'>-	/* Take an init lock, to protect for disconnect while still loading.</div><div class='add'>+	/* Init completion, to protect for disconnect while still loading.</div><div class='ctx'> 	 * Necessary because of the asynchronous firmware load construction</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_init(&amp;devinfo-&gt;dev_init_lock);</div><div class='del'>-	mutex_lock(&amp;devinfo-&gt;dev_init_lock);</div><div class='add'>+	init_completion(&amp;devinfo-&gt;dev_init_done);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, devinfo);</div><div class='ctx'> </div><div class='hunk'>@@ -1407,7 +1407,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	mutex_unlock(&amp;devinfo-&gt;dev_init_lock);</div><div class='add'>+	complete(&amp;devinfo-&gt;dev_init_done);</div><div class='ctx'> 	kfree(devinfo);</div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1422,7 +1422,7 @@ brcmf_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	devinfo = (struct brcmf_usbdev_info *)usb_get_intfdata(intf);</div><div class='ctx'> </div><div class='ctx'> 	if (devinfo) {</div><div class='del'>-		mutex_lock(&amp;devinfo-&gt;dev_init_lock);</div><div class='add'>+		wait_for_completion(&amp;devinfo-&gt;dev_init_done);</div><div class='ctx'> 		/* Make sure that devinfo still exists. Firmware probe routines</div><div class='ctx'> 		 * may have released the device and cleared the intfdata.</div><div class='ctx'> 		 */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c<br/>index 8eff2753abad..d493021f6031 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c</a></div><div class='hunk'>@@ -35,9 +35,10 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,</div><div class='ctx'> 	struct brcmf_if *ifp;</div><div class='ctx'> 	const struct brcmf_vndr_dcmd_hdr *cmdhdr = data;</div><div class='ctx'> 	struct sk_buff *reply;</div><div class='del'>-	int ret, payload, ret_len;</div><div class='add'>+	unsigned int payload, ret_len;</div><div class='ctx'> 	void *dcmd_buf = NULL, *wr_pointer;</div><div class='ctx'> 	u16 msglen, maxmsglen = PAGE_SIZE - 0x100;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*cmdhdr)) {</div><div class='ctx'> 		brcmf_err("vendor command too short: %d\n", len);</div><div class='hunk'>@@ -65,7 +66,7 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,</div><div class='ctx'> 			brcmf_err("oversize return buffer %d\n", ret_len);</div><div class='ctx'> 			ret_len = BRCMF_DCMD_MAXLEN;</div><div class='ctx'> 		}</div><div class='del'>-		payload = max(ret_len, len) + 1;</div><div class='add'>+		payload = max_t(unsigned int, ret_len, len) + 1;</div><div class='ctx'> 		dcmd_buf = vzalloc(payload);</div><div class='ctx'> 		if (NULL == dcmd_buf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/3945-debug.c b/drivers/net/wireless/intel/iwlegacy/3945-debug.c<br/>index a2960032be81..4b912e707f38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlegacy/3945-debug.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlegacy/3945-debug.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlegacy/3945-debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlegacy/3945-debug.c</a></div><div class='hunk'>@@ -185,7 +185,7 @@ il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 		      "%-32s     current"</div><div class='del'>-		      "acumulative       delta         max\n",</div><div class='add'>+		      "accumulative      delta         max\n",</div><div class='ctx'> 		      "Statistics_Rx - CCK:");</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='hunk'>@@ -273,7 +273,7 @@ il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 		      "%-32s     current"</div><div class='del'>-		      "acumulative       delta         max\n",</div><div class='add'>+		      "accumulative      delta         max\n",</div><div class='ctx'> 		      "Statistics_Rx - GENERAL:");</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='hunk'>@@ -346,7 +346,7 @@ il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 		      "%-32s     current"</div><div class='del'>-		      "acumulative       delta         max\n",</div><div class='add'>+		      "accumulative      delta         max\n",</div><div class='ctx'> 		      "Statistics_Tx:");</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='hunk'>@@ -447,7 +447,7 @@ il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 		      "%-32s     current"</div><div class='del'>-		      "acumulative       delta         max\n",</div><div class='add'>+		      "accumulative      delta         max\n",</div><div class='ctx'> 		      "Statistics_General:");</div><div class='ctx'> 	pos +=</div><div class='ctx'> 	    scnprintf(buf + pos, bufsz - pos,</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c<br/>index ce4144a89217..a20b6c885047 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlegacy/4965.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlegacy/4965.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlegacy/4965.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlegacy/4965.c</a></div><div class='hunk'>@@ -577,7 +577,6 @@ il4965_math_div_round(s32 num, s32 denom, s32 * res)</div><div class='ctx'> 		sign = -sign;</div><div class='ctx'> 		denom = -denom;</div><div class='ctx'> 	}</div><div class='del'>-	*res = 1;</div><div class='ctx'> 	*res = ((num * 2 + denom) / (denom * 2)) * sign;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/common.h b/drivers/net/wireless/intel/iwlegacy/common.h<br/>index b079c64ca014..986646af8dfd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlegacy/common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlegacy/common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlegacy/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlegacy/common.h</a></div><div class='hunk'>@@ -2030,13 +2030,6 @@ static inline void</div><div class='ctx'> _il_release_nic_access(struct il_priv *il)</div><div class='ctx'> {</div><div class='ctx'> 	_il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-	/*</div><div class='del'>-	 * In above we are reading CSR_GP_CNTRL register, what will flush any</div><div class='del'>-	 * previous writes, but still want write, which clear MAC_ACCESS_REQ</div><div class='del'>-	 * bit, be performed on PCI bus before any other writes scheduled on</div><div class='del'>-	 * different CPUs (after we drop reg_lock).</div><div class='del'>-	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c<br/>index fdc56f821b5a..a9c846c59289 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> #include "iwl-config.h"</div><div class='ctx'> </div><div class='ctx'> /* Highest firmware API version supported */</div><div class='del'>-#define IWL_22000_UCODE_API_MAX	46</div><div class='add'>+#define IWL_22000_UCODE_API_MAX	48</div><div class='ctx'> </div><div class='ctx'> /* Lowest firmware API version supported */</div><div class='ctx'> #define IWL_22000_UCODE_API_MIN	39</div><div class='hunk'>@@ -80,14 +80,15 @@</div><div class='ctx'> #define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"</div><div class='ctx'> #define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"</div><div class='ctx'> #define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"</div><div class='del'>-#define IWL_22000_SU_Z0_FW_PRE		"iwlwifi-su-z0-"</div><div class='ctx'> #define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"</div><div class='add'>+#define IWL_QUZ_A_HR_B_FW_PRE		"iwlwifi-QuZ-a0-hr-b0-"</div><div class='ctx'> #define IWL_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-jf-b0-"</div><div class='ctx'> #define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"</div><div class='ctx'> #define IWL_22000_SO_A_JF_B_FW_PRE	"iwlwifi-so-a0-jf-b0-"</div><div class='ctx'> #define IWL_22000_SO_A_HR_B_FW_PRE      "iwlwifi-so-a0-hr-b0-"</div><div class='ctx'> #define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"</div><div class='ctx'> #define IWL_22000_TY_A_GF_A_FW_PRE      "iwlwifi-ty-a0-gf-a0-"</div><div class='add'>+#define IWL_22000_SO_A_GF4_A_FW_PRE     "iwlwifi-so-a0-gf4-a0-"</div><div class='ctx'> </div><div class='ctx'> #define IWL_22000_HR_MODULE_FIRMWARE(api) \</div><div class='ctx'> 	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"</div><div class='hunk'>@@ -103,10 +104,8 @@</div><div class='ctx'> 	IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='ctx'> #define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \</div><div class='ctx'> 	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_22000_SU_Z0_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_22000_SU_Z0_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='ctx'> #define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \</div><div class='ctx'> 	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='ctx'> #define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)		\</div><div class='hunk'>@@ -179,7 +178,11 @@ static const struct iwl_ht_params iwl_22000_ht_params = {</div><div class='ctx'> 	.dbgc_supported = true,						\</div><div class='ctx'> 	.min_umac_error_event_table = 0x400000,				\</div><div class='ctx'> 	.d3_debug_data_base_addr = 0x401000,				\</div><div class='del'>-	.d3_debug_data_length = 60 * 1024</div><div class='add'>+	.d3_debug_data_length = 60 * 1024,				\</div><div class='add'>+	.fw_mon_smem_write_ptr_addr = 0xa0c16c,				\</div><div class='add'>+	.fw_mon_smem_write_ptr_msk = 0xfffff,				\</div><div class='add'>+	.fw_mon_smem_cycle_cnt_ptr_addr = 0xa0c174,			\</div><div class='add'>+	.fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_AX200_COMMON						\</div><div class='ctx'> 	IWL_DEVICE_22000_COMMON,					\</div><div class='hunk'>@@ -189,7 +192,8 @@ static const struct iwl_ht_params iwl_22000_ht_params = {</div><div class='ctx'> 	IWL_DEVICE_22000_COMMON,					\</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_22000,			\</div><div class='ctx'> 	.base_params = &amp;iwl_22000_base_params,				\</div><div class='del'>-	.csr = &amp;iwl_csr_v1</div><div class='add'>+	.csr = &amp;iwl_csr_v1,						\</div><div class='add'>+	.gp2_reg_addr = 0xa02c68</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_22560						\</div><div class='ctx'> 	IWL_DEVICE_22000_COMMON,					\</div><div class='hunk'>@@ -200,9 +204,11 @@ static const struct iwl_ht_params iwl_22000_ht_params = {</div><div class='ctx'> #define IWL_DEVICE_AX210						\</div><div class='ctx'> 	IWL_DEVICE_AX200_COMMON,					\</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_AX210,			\</div><div class='del'>-	.base_params = &amp;iwl_22000_base_params,				\</div><div class='add'>+	.base_params = &amp;iwl_22560_base_params,				\</div><div class='ctx'> 	.csr = &amp;iwl_csr_v1,						\</div><div class='del'>-	.min_txq_size = 128</div><div class='add'>+	.min_txq_size = 128,						\</div><div class='add'>+	.gp2_reg_addr = 0xd02c68,					\</div><div class='add'>+	.min_256_ba_txq_size = 512</div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg iwl22000_2ac_cfg_hr = {</div><div class='ctx'> 	.name = "Intel(R) Dual Band Wireless AC 22000",</div><div class='hunk'>@@ -235,8 +241,20 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = {</div><div class='ctx'> 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl22260_2ax_cfg = {</div><div class='del'>-	.name = "Intel(R) Wireless-AX 22260",</div><div class='add'>+const struct iwl_cfg iwl_ax101_cfg_quz_hr = {</div><div class='add'>+	.name = "Intel(R) Wi-Fi 6 AX101",</div><div class='add'>+	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,</div><div class='add'>+	IWL_DEVICE_22500,</div><div class='add'>+	/*</div><div class='add'>+	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='add'>+	 * so we need to restrict the size of transmitted aggregation to the</div><div class='add'>+	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='add'>+	 */</div><div class='add'>+	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_cfg iwl_ax200_cfg_cc = {</div><div class='add'>+	.name = "Intel(R) Wi-Fi 6 AX200 160MHz",</div><div class='ctx'> 	.fw_name_pre = IWL_CC_A_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_22500,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -249,7 +267,7 @@ const struct iwl_cfg iwl22260_2ax_cfg = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg killer1650x_2ax_cfg = {</div><div class='del'>-	.name = "Killer(R) Wireless-AX 1650x Wireless Network Adapter (200NGW)",</div><div class='add'>+	.name = "Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)",</div><div class='ctx'> 	.fw_name_pre = IWL_CC_A_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_22500,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -262,7 +280,7 @@ const struct iwl_cfg killer1650x_2ax_cfg = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg killer1650w_2ax_cfg = {</div><div class='del'>-	.name = "Killer(R) Wireless-AX 1650w Wireless Network Adapter (200D2W)",</div><div class='add'>+	.name = "Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)",</div><div class='ctx'> 	.fw_name_pre = IWL_CC_A_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_22500,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -328,7 +346,7 @@ const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {</div><div class='del'>-	.name = "Killer(R) Wireless-AX 1650i Wireless Network Adapter (22560NGW)",</div><div class='add'>+	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",</div><div class='ctx'> 	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_22500,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -340,7 +358,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {</div><div class='del'>-	.name = "Killer(R) Wireless-AX 1650s Wireless Network Adapter (22560D2W)",</div><div class='add'>+	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",</div><div class='ctx'> 	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_22500,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -399,19 +417,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {</div><div class='ctx'> 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl22560_2ax_cfg_su_cdb = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AX 22560",</div><div class='del'>-	.fw_name_pre = IWL_22000_SU_Z0_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22560,</div><div class='del'>-	.cdb = true,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {</div><div class='ctx'> 	.name = "Intel(R) Wireless-AC 9560 160MHz",</div><div class='ctx'> 	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,</div><div class='hunk'>@@ -427,12 +432,20 @@ const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {</div><div class='ctx'> const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0 = {</div><div class='ctx'> 	.name = "Intel(R) Wi-Fi 7 AX211 160MHz",</div><div class='ctx'> 	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,</div><div class='add'>+	.uhb_supported = true,</div><div class='ctx'> 	IWL_DEVICE_AX210,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {</div><div class='ctx'> 	.name = "Intel(R) Wi-Fi 7 AX210 160MHz",</div><div class='ctx'> 	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,</div><div class='add'>+	.uhb_supported = true,</div><div class='add'>+	IWL_DEVICE_AX210,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_cfg iwlax210_2ax_cfg_so_gf4_a0 = {</div><div class='add'>+	.name = "Intel(R) Wi-Fi 7 AX210 160MHz",</div><div class='add'>+	.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_AX210,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -442,8 +455,8 @@ MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_22000_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/5000.c b/drivers/net/wireless/intel/iwlwifi/cfg/5000.c<br/>index 575a7022d045..3846064d51a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/cfg/5000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/cfg/5000.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -136,6 +136,7 @@ const struct iwl_cfg iwl5350_agn_cfg = {</div><div class='ctx'> 	.ht_params = &amp;iwl5000_ht_params,</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,</div><div class='ctx'> 	.internal_wimax_coex = true,</div><div class='add'>+	.csr = &amp;iwl_csr_v1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_5150						\</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c<br/>index 3225b64eb845..41bdd0eaf62c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/cfg/9000.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/cfg/9000.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * GPL LICENSE SUMMARY</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  * BSD LICENSE</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -148,7 +148,11 @@ static const struct iwl_tt_params iwl9000_tt_params = {</div><div class='ctx'> 	.d3_debug_data_length = 92 * 1024,				\</div><div class='ctx'> 	.ht_params = &amp;iwl9000_ht_params,				\</div><div class='ctx'> 	.nvm_ver = IWL9000_NVM_VERSION,					\</div><div class='del'>-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K</div><div class='add'>+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\</div><div class='add'>+	.fw_mon_smem_write_ptr_addr = 0xa0476c,				\</div><div class='add'>+	.fw_mon_smem_write_ptr_msk = 0xfffff,				\</div><div class='add'>+	.fw_mon_smem_cycle_cnt_ptr_addr = 0xa04774,			\</div><div class='add'>+	.fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> const struct iwl_cfg iwl9160_2ac_cfg = {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h<br/>index 86ea0784e1a3..31231b223aae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -214,7 +214,7 @@ struct iwl_proto_offload_cmd_v3_large {</div><div class='ctx'> #define IWL_WOWLAN_MIN_PATTERN_LEN	16</div><div class='ctx'> #define IWL_WOWLAN_MAX_PATTERN_LEN	128</div><div class='ctx'> </div><div class='del'>-struct iwl_wowlan_pattern {</div><div class='add'>+struct iwl_wowlan_pattern_v1 {</div><div class='ctx'> 	u8 mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];</div><div class='ctx'> 	u8 pattern[IWL_WOWLAN_MAX_PATTERN_LEN];</div><div class='ctx'> 	u8 mask_size;</div><div class='hunk'>@@ -227,7 +227,7 @@ struct iwl_wowlan_pattern {</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_wowlan_patterns_cmd - WoWLAN wakeup patterns</div><div class='ctx'>  */</div><div class='del'>-struct iwl_wowlan_patterns_cmd {</div><div class='add'>+struct iwl_wowlan_patterns_cmd_v1 {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @n_patterns: number of patterns</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -236,9 +236,129 @@ struct iwl_wowlan_patterns_cmd {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @patterns: the patterns, array length in @n_patterns</div><div class='ctx'> 	 */</div><div class='del'>-	struct iwl_wowlan_pattern patterns[];</div><div class='add'>+	struct iwl_wowlan_pattern_v1 patterns[];</div><div class='ctx'> } __packed; /* WOWLAN_PATTERN_ARRAY_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+#define IPV4_ADDR_SIZE	4</div><div class='add'>+#define IPV6_ADDR_SIZE	16</div><div class='add'>+</div><div class='add'>+enum iwl_wowlan_pattern_type {</div><div class='add'>+	WOWLAN_PATTERN_TYPE_BITMASK,</div><div class='add'>+	WOWLAN_PATTERN_TYPE_IPV4_TCP_SYN,</div><div class='add'>+	WOWLAN_PATTERN_TYPE_IPV6_TCP_SYN,</div><div class='add'>+	WOWLAN_PATTERN_TYPE_IPV4_TCP_SYN_WILDCARD,</div><div class='add'>+	WOWLAN_PATTERN_TYPE_IPV6_TCP_SYN_WILDCARD,</div><div class='add'>+}; /* WOWLAN_PATTERN_TYPE_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_ipv4_tcp_syn - WoWLAN IPv4 TCP SYN pattern data</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_ipv4_tcp_syn {</div><div class='add'>+	/**</div><div class='add'>+	 * @src_addr: source IP address to match</div><div class='add'>+	 */</div><div class='add'>+	u8 src_addr[IPV4_ADDR_SIZE];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dst_addr: destination IP address to match</div><div class='add'>+	 */</div><div class='add'>+	u8 dst_addr[IPV4_ADDR_SIZE];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @src_port: source TCP port to match</div><div class='add'>+	 */</div><div class='add'>+	__le16 src_port;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dst_port: destination TCP port to match</div><div class='add'>+	 */</div><div class='add'>+	__le16 dst_port;</div><div class='add'>+} __packed; /* WOWLAN_IPV4_TCP_SYN_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_ipv6_tcp_syn - WoWLAN Ipv6 TCP SYN pattern data</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_ipv6_tcp_syn {</div><div class='add'>+	/**</div><div class='add'>+	 * @src_addr: source IP address to match</div><div class='add'>+	 */</div><div class='add'>+	u8 src_addr[IPV6_ADDR_SIZE];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dst_addr: destination IP address to match</div><div class='add'>+	 */</div><div class='add'>+	u8 dst_addr[IPV6_ADDR_SIZE];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @src_port: source TCP port to match</div><div class='add'>+	 */</div><div class='add'>+	__le16 src_port;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dst_port: destination TCP port to match</div><div class='add'>+	 */</div><div class='add'>+	__le16 dst_port;</div><div class='add'>+} __packed; /* WOWLAN_IPV6_TCP_SYN_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * union iwl_wowlan_pattern_data - Data for the different pattern types</div><div class='add'>+ *</div><div class='add'>+ * If wildcard addresses/ports are to be used, the union can be left</div><div class='add'>+ * undefined.</div><div class='add'>+ */</div><div class='add'>+union iwl_wowlan_pattern_data {</div><div class='add'>+	/**</div><div class='add'>+	 * @bitmask: bitmask pattern data</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_wowlan_pattern_v1 bitmask;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ipv4_tcp_syn: IPv4 TCP SYN pattern data</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_wowlan_ipv4_tcp_syn ipv4_tcp_syn;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ipv6_tcp_syn: IPv6 TCP SYN pattern data</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_wowlan_ipv6_tcp_syn ipv6_tcp_syn;</div><div class='add'>+}; /* WOWLAN_PATTERN_API_U_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_pattern_v2 - Pattern entry for the WoWLAN wakeup patterns</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_pattern_v2 {</div><div class='add'>+	/**</div><div class='add'>+	 * @pattern_type: defines the struct type to be used in the union</div><div class='add'>+	 */</div><div class='add'>+	u8 pattern_type;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @reserved: reserved for alignment</div><div class='add'>+	 */</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @u: the union containing the match data, or undefined for</div><div class='add'>+	 *     wildcard matches</div><div class='add'>+	 */</div><div class='add'>+	union iwl_wowlan_pattern_data u;</div><div class='add'>+} __packed; /* WOWLAN_PATTERN_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_patterns_cmd - WoWLAN wakeup patterns command</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_patterns_cmd {</div><div class='add'>+	/**</div><div class='add'>+	 * @n_patterns: number of patterns</div><div class='add'>+	 */</div><div class='add'>+	__le32 n_patterns;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @patterns: the patterns, array length in @n_patterns</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_wowlan_pattern_v2 patterns[];</div><div class='add'>+} __packed; /* WOWLAN_PATTERN_ARRAY_API_S_VER_2 */</div><div class='add'>+</div><div class='ctx'> enum iwl_wowlan_wakeup_filters {</div><div class='ctx'> 	IWL_WOWLAN_WAKEUP_MAGIC_PACKET			= BIT(0),</div><div class='ctx'> 	IWL_WOWLAN_WAKEUP_PATTERN_MATCH			= BIT(1),</div><div class='hunk'>@@ -383,7 +503,11 @@ enum iwl_wowlan_wakeup_reason {</div><div class='ctx'> 	IWL_WOWLAN_WAKEUP_BY_D3_WAKEUP_HOST_TIMER		= BIT(14),</div><div class='ctx'> 	IWL_WOWLAN_WAKEUP_BY_RXFRAME_FILTERED_IN		= BIT(15),</div><div class='ctx'> 	IWL_WOWLAN_WAKEUP_BY_BEACON_FILTERED_IN			= BIT(16),</div><div class='del'>-</div><div class='add'>+	IWL_WAKEUP_BY_11W_UNPROTECTED_DEAUTH_OR_DISASSOC	= BIT(17),</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV4_TCP_SYN			= BIT(18),</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV4_TCP_SYN_WILDCARD		= BIT(19),</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV6_TCP_SYN			= BIT(20),</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV6_TCP_SYN_WILDCARD		= BIT(21),</div><div class='ctx'> }; /* WOWLAN_WAKE_UP_REASON_API_E_VER_2 */</div><div class='ctx'> </div><div class='ctx'> struct iwl_wowlan_gtk_status_v1 {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h<br/>index 33858787817b..f4202bc231a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a></div><div class='hunk'>@@ -60,12 +60,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_fw_ini_header: Common Header for all debug group TLV's structures</div><div class='add'>+ *</div><div class='ctx'>  * @tlv_version: version info</div><div class='ctx'>  * @apply_point: &amp;enum iwl_fw_ini_apply_point</div><div class='ctx'>  * @data: TLV data followed</div><div class='del'>- **/</div><div class='add'>+ */</div><div class='ctx'> struct iwl_fw_ini_header {</div><div class='ctx'> 	__le32 tlv_version;</div><div class='ctx'> 	__le32 apply_point;</div><div class='hunk'>@@ -73,7 +74,7 @@ struct iwl_fw_ini_header {</div><div class='ctx'> } __packed; /* FW_DEBUG_TLV_HEADER_S */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_allocation_tlv - (IWL_FW_INI_TLV_TYPE_BUFFER_ALLOCATION)</div><div class='add'>+ * struct iwl_fw_ini_allocation_tlv - (IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION)</div><div class='ctx'>  * buffer allocation TLV - for debug</div><div class='ctx'>  *</div><div class='ctx'>  * @iwl_fw_ini_header: header</div><div class='hunk'>@@ -84,7 +85,7 @@ struct iwl_fw_ini_header {</div><div class='ctx'>  * @max_fragments: the maximum allowed fragmentation in the desired memory</div><div class='ctx'>  *	allocation above</div><div class='ctx'>  * @min_frag_size: the minimum allowed fragmentation size in bytes</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> struct iwl_fw_ini_allocation_tlv {</div><div class='ctx'> 	struct iwl_fw_ini_header header;</div><div class='ctx'> 	__le32 allocation_id;</div><div class='hunk'>@@ -95,33 +96,52 @@ struct iwl_fw_ini_allocation_tlv {</div><div class='ctx'> } __packed; /* FW_DEBUG_TLV_BUFFER_ALLOCATION_TLV_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_hcmd (IWL_FW_INI_TLV_TYPE_HCMD)</div><div class='del'>- * Generic Host command pass through TLV</div><div class='add'>+ * enum iwl_fw_ini_dbg_domain - debug domains</div><div class='add'>+ * allows to send host cmd or collect memory region if a given domain is enabled</div><div class='add'>+ *</div><div class='add'>+ * @IWL_FW_INI_DBG_DOMAIN_ALWAYS_ON: the default domain, always on</div><div class='add'>+ * @IWL_FW_INI_DBG_DOMAIN_REPORT_PS: power save domain</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_ini_dbg_domain {</div><div class='add'>+	IWL_FW_INI_DBG_DOMAIN_ALWAYS_ON = 0,</div><div class='add'>+	IWL_FW_INI_DBG_DOMAIN_REPORT_PS,</div><div class='add'>+}; /* FW_DEBUG_TLV_DOMAIN_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_ini_hcmd</div><div class='ctx'>  *</div><div class='ctx'>  * @id: the debug configuration command type for instance: 0xf6 / 0xf5 / DHC</div><div class='ctx'>  * @group: the desired cmd group</div><div class='del'>- * @padding: all zeros for dword alignment</div><div class='del'>- * @data: all of the relevant command (0xf6/0xf5) to be sent</div><div class='del'>-*/</div><div class='add'>+ * @reserved: to align to FW struct</div><div class='add'>+ * @data: all of the relevant command data to be sent</div><div class='add'>+ */</div><div class='ctx'> struct iwl_fw_ini_hcmd {</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 group;</div><div class='del'>-	__le16 padding;</div><div class='add'>+	__le16 reserved;</div><div class='ctx'> 	u8 data[0];</div><div class='del'>-} __packed; /* FW_DEBUG_TLV_HCMD_DATA_S */</div><div class='add'>+} __packed; /* FW_DEBUG_TLV_HCMD_DATA_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_hcmd_tlv</div><div class='add'>+ * struct iwl_fw_ini_hcmd_tlv - (IWL_UCODE_TLV_TYPE_HCMD)</div><div class='add'>+ * Generic Host command pass through TLV</div><div class='add'>+ *</div><div class='ctx'>  * @header: header</div><div class='add'>+ * @domain: send command only if the specific domain is enabled</div><div class='add'>+ *	&amp;enum iwl_fw_ini_dbg_domain</div><div class='add'>+ * @period_msec: period in which the hcmd will be sent to FW. Measured in msec</div><div class='add'>+ *	(0 = one time command).</div><div class='ctx'>  * @hcmd: a variable length host-command to be sent to apply the configuration.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_hcmd_tlv {</div><div class='ctx'> 	struct iwl_fw_ini_header header;</div><div class='add'>+	__le32 domain;</div><div class='add'>+	__le32 period_msec;</div><div class='ctx'> 	struct iwl_fw_ini_hcmd hcmd;</div><div class='del'>-} __packed; /* FW_DEBUG_TLV_HCMD_S_VER_1 */</div><div class='add'>+} __packed; /* FW_DEBUG_TLV_HCMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct iwl_fw_ini_debug_flow_tlv (IWL_FW_INI_TLV_TYPE_DEBUG_FLOW)</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_ini_debug_flow_tlv - (IWL_UCODE_TLV_TYPE_DEBUG_FLOW)</div><div class='ctx'>  *</div><div class='ctx'>  * @header: header</div><div class='ctx'>  * @debug_flow_cfg: &amp;enum iwl_fw_ini_debug_flow</div><div class='hunk'>@@ -135,7 +155,19 @@ struct iwl_fw_ini_debug_flow_tlv {</div><div class='ctx'> #define IWL_FW_INI_MAX_NAME		32</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_fw_ini_region_cfg_dhc - defines dhc response to dump.</div><div class='add'>+ *</div><div class='add'>+ * @id_and_grp: id and group of dhc response.</div><div class='add'>+ * @desc: dhc response descriptor.</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_ini_region_cfg_dhc {</div><div class='add'>+	__le32 id_and_grp;</div><div class='add'>+	__le32 desc;</div><div class='add'>+} __packed; /* FW_DEBUG_TLV_REGION_DHC_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_fw_ini_region_cfg_internal - meta data of internal memory region</div><div class='add'>+ *</div><div class='ctx'>  * @num_of_range: the amount of ranges in the region</div><div class='ctx'>  * @range_data_size: size of the data to read per range, in bytes.</div><div class='ctx'>  */</div><div class='hunk'>@@ -146,6 +178,7 @@ struct iwl_fw_ini_region_cfg_internal {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_ini_region_cfg_fifos - meta data of fifos region</div><div class='add'>+ *</div><div class='ctx'>  * @fid1: fifo id 1 - bitmap of lmac tx/rx fifos to include in the region</div><div class='ctx'>  * @fid2: fifo id 2 - bitmap of umac rx fifos to include in the region.</div><div class='ctx'>  *	It is unused for tx.</div><div class='hunk'>@@ -163,34 +196,43 @@ struct iwl_fw_ini_region_cfg_fifos {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_ini_region_cfg</div><div class='add'>+ *</div><div class='ctx'>  * @region_id: ID of this dump configuration</div><div class='ctx'>  * @region_type: &amp;enum iwl_fw_ini_region_type</div><div class='del'>- * @num_regions: amount of regions in the address array.</div><div class='add'>+ * @domain: dump this region only if the specific domain is enabled</div><div class='add'>+ *	&amp;enum iwl_fw_ini_dbg_domain</div><div class='ctx'>  * @name_len: name length</div><div class='ctx'>  * @name: file name to use for this region</div><div class='ctx'>  * @internal: used in case the region uses internal memory.</div><div class='ctx'>  * @allocation_id: For DRAM type field substitutes for allocation_id</div><div class='ctx'>  * @fifos: used in case of fifos region.</div><div class='add'>+ * @dhc_desc: dhc response descriptor.</div><div class='add'>+ * @notif_id_and_grp: dump this region only if the specific notification</div><div class='add'>+ *	occurred.</div><div class='ctx'>  * @offset: offset to use for each memory base address</div><div class='ctx'>  * @start_addr: array of addresses.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_region_cfg {</div><div class='ctx'> 	__le32 region_id;</div><div class='ctx'> 	__le32 region_type;</div><div class='add'>+	__le32 domain;</div><div class='ctx'> 	__le32 name_len;</div><div class='ctx'> 	u8 name[IWL_FW_INI_MAX_NAME];</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct iwl_fw_ini_region_cfg_internal internal;</div><div class='ctx'> 		__le32 allocation_id;</div><div class='ctx'> 		struct iwl_fw_ini_region_cfg_fifos fifos;</div><div class='del'>-	};</div><div class='add'>+		struct iwl_fw_ini_region_cfg_dhc dhc_desc;</div><div class='add'>+		__le32 notif_id_and_grp;</div><div class='add'>+	}; /* FW_DEBUG_TLV_REGION_EXT_INT_PARAMS_API_U_VER_1 */</div><div class='ctx'> 	__le32 offset;</div><div class='ctx'> 	__le32 start_addr[];</div><div class='del'>-} __packed; /* FW_DEBUG_TLV_REGION_CONFIG_S */</div><div class='add'>+} __packed; /* FW_DEBUG_TLV_REGION_CONFIG_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_region_tlv - (IWL_FW_INI_TLV_TYPE_REGION_CFG)</div><div class='del'>- * DUMP sections define IDs and triggers that use those IDs TLV</div><div class='add'>+ * struct iwl_fw_ini_region_tlv - (IWL_UCODE_TLV_TYPE_REGIONS)</div><div class='add'>+ * defines memory regions to dump</div><div class='add'>+ *</div><div class='ctx'>  * @header: header</div><div class='ctx'>  * @num_regions: how many different region section and IDs are coming next</div><div class='ctx'>  * @region_config: list of dump configurations</div><div class='hunk'>@@ -199,13 +241,12 @@ struct iwl_fw_ini_region_tlv {</div><div class='ctx'> 	struct iwl_fw_ini_header header;</div><div class='ctx'> 	__le32 num_regions;</div><div class='ctx'> 	struct iwl_fw_ini_region_cfg region_config[];</div><div class='del'>-} __packed; /* FW_DEBUG_TLV_REGIONS_S_VER_1 */</div><div class='add'>+} __packed; /* FW_DEBUG_TLV_REGIONS_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_trigger - (IWL_FW_INI_TLV_TYPE_DUMP_CFG)</div><div class='del'>- * Region sections define IDs and triggers that use those IDs TLV</div><div class='add'>+ * struct iwl_fw_ini_trigger</div><div class='ctx'>  *</div><div class='del'>- * @trigger_id: enum &amp;iwl_fw_ini_tigger_id</div><div class='add'>+ * @trigger_id: &amp;enum iwl_fw_ini_trigger_id</div><div class='ctx'>  * @override_trig: determines how apply trigger in case a trigger with the</div><div class='ctx'>  *	same id is already in use. Using the first 2 bytes:</div><div class='ctx'>  *	Byte 0: if 0, override trigger configuration, otherwise use the</div><div class='hunk'>@@ -214,6 +255,7 @@ struct iwl_fw_ini_region_tlv {</div><div class='ctx'>  *	existing trigger.</div><div class='ctx'>  * @dump_delay: delay from trigger fire to dump, in usec</div><div class='ctx'>  * @occurrences: max amount of times to be fired</div><div class='add'>+ * @reserved: to align to FW struct</div><div class='ctx'>  * @ignore_consec: ignore consecutive triggers, in usec</div><div class='ctx'>  * @force_restart: force FW restart</div><div class='ctx'>  * @multi_dut: initiate debug dump data on several DUTs</div><div class='hunk'>@@ -226,17 +268,18 @@ struct iwl_fw_ini_trigger {</div><div class='ctx'> 	__le32 override_trig;</div><div class='ctx'> 	__le32 dump_delay;</div><div class='ctx'> 	__le32 occurrences;</div><div class='add'>+	__le32 reserved;</div><div class='ctx'> 	__le32 ignore_consec;</div><div class='ctx'> 	__le32 force_restart;</div><div class='ctx'> 	__le32 multi_dut;</div><div class='ctx'> 	__le32 trigger_data;</div><div class='ctx'> 	__le32 num_regions;</div><div class='ctx'> 	__le32 data[];</div><div class='del'>-} __packed; /* FW_TLV_DEBUG_TRIGGER_CONFIG_S */</div><div class='add'>+} __packed; /* FW_TLV_DEBUG_TRIGGER_CONFIG_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_trigger_tlv - (IWL_FW_INI_TLV_TYPE_TRIGGERS_CFG)</div><div class='del'>- * DUMP sections define IDs and triggers that use those IDs TLV</div><div class='add'>+ * struct iwl_fw_ini_trigger_tlv - (IWL_UCODE_TLV_TYPE_TRIGGERS)</div><div class='add'>+ * Triggers that hold memory regions to dump in case a trigger fires</div><div class='ctx'>  *</div><div class='ctx'>  * @header: header</div><div class='ctx'>  * @num_triggers: how many different triggers section and IDs are coming next</div><div class='hunk'>@@ -246,16 +289,18 @@ struct iwl_fw_ini_trigger_tlv {</div><div class='ctx'> 	struct iwl_fw_ini_header header;</div><div class='ctx'> 	__le32 num_triggers;</div><div class='ctx'> 	struct iwl_fw_ini_trigger trigger_config[];</div><div class='del'>-} __packed; /* FW_TLV_DEBUG_TRIGGERS_S_VER_1 */</div><div class='add'>+} __packed; /* FW_TLV_DEBUG_TRIGGERS_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_ini_trigger_id</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_FW_ASSERT: FW assert</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_FW_HW_ERROR: HW assert</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG: TFD queue hang</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_FW_DEBUG_HOST_TRIGGER: FW debug notification</div><div class='del'>- * @IWL_FW_TRIGGER_ID_FW_GENERIC_NOTIFOCATION: FW generic notification</div><div class='add'>+ * @IWL_FW_TRIGGER_ID_FW_GENERIC_NOTIFICATION: FW generic notification</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_USER_TRIGGER: User trigger</div><div class='add'>+ * @IWL_FW_TRIGGER_ID_PERIODIC_TRIGGER: triggers periodically</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY: peer inactivity</div><div class='ctx'>  * @IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED: TX latency</div><div class='ctx'>  *	threshold was crossed</div><div class='hunk'>@@ -299,47 +344,51 @@ enum iwl_fw_ini_trigger_id {</div><div class='ctx'> </div><div class='ctx'> 	/* FW triggers */</div><div class='ctx'> 	IWL_FW_TRIGGER_ID_FW_DEBUG_HOST_TRIGGER			= 4,</div><div class='del'>-	IWL_FW_TRIGGER_ID_FW_GENERIC_NOTIFOCATION		= 5,</div><div class='add'>+	IWL_FW_TRIGGER_ID_FW_GENERIC_NOTIFICATION		= 5,</div><div class='ctx'> </div><div class='ctx'> 	/* User trigger */</div><div class='ctx'> 	IWL_FW_TRIGGER_ID_USER_TRIGGER				= 6,</div><div class='ctx'> </div><div class='add'>+	/* periodic uses the data field for the interval time */</div><div class='add'>+	IWL_FW_TRIGGER_ID_PERIODIC_TRIGGER			= 7,</div><div class='add'>+</div><div class='ctx'> 	/* Host triggers */</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY		= 7,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED	= 8,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED	= 9,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_OS_REQ_DEAUTH_PEER		= 10,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_STOP_GO_REQUEST			= 11,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_START_GO_REQUEST			= 12,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_JOIN_GROUP_REQUEST		= 13,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_SCAN_START			= 14,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_SCAN_SUBMITTED			= 15,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_SCAN_PARAMS			= 16,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_CHECK_FOR_HANG			= 17,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_BAR_RECEIVED			= 18,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_AGG_TX_RESPONSE_STATUS_FAILED	= 19,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_EAPOL_TX_RESPONSE_FAILED		= 20,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_FAKE_TX_RESPONSE_SUSPECTED	= 21,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_AUTH_REQ_FROM_ASSOC_CLIENT	= 22,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_ROAM_COMPLETE			= 23,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAST_FAILED		= 24,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_D3_START				= 25,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_D3_END				= 26,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_BSS_MISSED_BEACONS		= 27,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_P2P_CLIENT_MISSED_BEACONS	= 28,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_TX_FAILURES		= 29,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_TX_WFD_ACTION_FRAME_FAILED	= 30,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAILED		= 31,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_SCAN_COMPLETE			= 32,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_SCAN_ABORT			= 33,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_NIC_ALIVE			= 34,</div><div class='del'>-	IWL_FW_TRIGGER_ID_HOST_CHANNEL_SWITCH_COMPLETE		= 35,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY		= 8,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED	= 9,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED	= 10,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_OS_REQ_DEAUTH_PEER		= 11,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_STOP_GO_REQUEST			= 12,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_START_GO_REQUEST			= 13,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_JOIN_GROUP_REQUEST		= 14,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_SCAN_START			= 15,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_SCAN_SUBMITTED			= 16,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_SCAN_PARAMS			= 17,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_CHECK_FOR_HANG			= 18,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_BAR_RECEIVED			= 19,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_AGG_TX_RESPONSE_STATUS_FAILED	= 20,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_EAPOL_TX_RESPONSE_FAILED		= 21,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_FAKE_TX_RESPONSE_SUSPECTED	= 22,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_AUTH_REQ_FROM_ASSOC_CLIENT	= 23,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_ROAM_COMPLETE			= 24,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAST_FAILED		= 25,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_D3_START				= 26,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_D3_END				= 27,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_BSS_MISSED_BEACONS		= 28,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_P2P_CLIENT_MISSED_BEACONS	= 29,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_TX_FAILURES		= 30,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_TX_WFD_ACTION_FRAME_FAILED	= 31,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAILED		= 32,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_SCAN_COMPLETE			= 33,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_SCAN_ABORT			= 34,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_NIC_ALIVE			= 35,</div><div class='add'>+	IWL_FW_TRIGGER_ID_HOST_CHANNEL_SWITCH_COMPLETE		= 36,</div><div class='ctx'> </div><div class='ctx'> 	IWL_FW_TRIGGER_ID_NUM,</div><div class='ctx'> }; /* FW_DEBUG_TLV_TRIGGER_ID_E_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_ini_apply_point</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_FW_INI_APPLY_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_APPLY_EARLY: pre loading FW</div><div class='ctx'>  * @IWL_FW_INI_APPLY_AFTER_ALIVE: first cmd from host after alive</div><div class='hunk'>@@ -360,6 +409,7 @@ enum iwl_fw_ini_apply_point {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_ini_allocation_id</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_ID_DBGC1: allocation meant for DBGC1 configuration</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_ID_DBGC2: allocation meant for DBGC2 configuration</div><div class='hunk'>@@ -380,18 +430,22 @@ enum iwl_fw_ini_allocation_id {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_ini_buffer_location</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_SRAM_PATH: SRAM location</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_DRAM_PATH: DRAM location</div><div class='add'>+ * @IWL_FW_INI_LOCATION_NPK_PATH: NPK location</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_ini_buffer_location {</div><div class='ctx'> 	IWL_FW_INI_LOCATION_INVALID,</div><div class='ctx'> 	IWL_FW_INI_LOCATION_SRAM_PATH,</div><div class='ctx'> 	IWL_FW_INI_LOCATION_DRAM_PATH,</div><div class='add'>+	IWL_FW_INI_LOCATION_NPK_PATH,</div><div class='ctx'> }; /* FW_DEBUG_TLV_BUFFER_LOCATION_E_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_ini_debug_flow</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_FW_INI_DEBUG_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_DEBUG_DBTR_FLOW: undefined</div><div class='ctx'>  * @IWL_FW_INI_DEBUG_TB2DTF_FLOW: undefined</div><div class='hunk'>@@ -404,6 +458,7 @@ enum iwl_fw_ini_debug_flow {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_ini_region_type</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_FW_INI_REGION_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_REGION_DEVICE_MEMORY: device internal memory</div><div class='ctx'>  * @IWL_FW_INI_REGION_PERIPHERY_MAC: periphery registers of MAC</div><div class='hunk'>@@ -416,6 +471,10 @@ enum iwl_fw_ini_debug_flow {</div><div class='ctx'>  * @IWL_FW_INI_REGION_RXF: RX fifo</div><div class='ctx'>  * @IWL_FW_INI_REGION_PAGING: paging memory</div><div class='ctx'>  * @IWL_FW_INI_REGION_CSR: CSR registers</div><div class='add'>+ * @IWL_FW_INI_REGION_NOTIFICATION: FW notification data</div><div class='add'>+ * @IWL_FW_INI_REGION_DHC: dhc response to dump</div><div class='add'>+ * @IWL_FW_INI_REGION_LMAC_ERROR_TABLE: lmac error table</div><div class='add'>+ * @IWL_FW_INI_REGION_UMAC_ERROR_TABLE: umac error table</div><div class='ctx'>  * @IWL_FW_INI_REGION_NUM: number of region types</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_ini_region_type {</div><div class='hunk'>@@ -431,6 +490,10 @@ enum iwl_fw_ini_region_type {</div><div class='ctx'> 	IWL_FW_INI_REGION_RXF,</div><div class='ctx'> 	IWL_FW_INI_REGION_PAGING,</div><div class='ctx'> 	IWL_FW_INI_REGION_CSR,</div><div class='add'>+	IWL_FW_INI_REGION_NOTIFICATION,</div><div class='add'>+	IWL_FW_INI_REGION_DHC,</div><div class='add'>+	IWL_FW_INI_REGION_LMAC_ERROR_TABLE,</div><div class='add'>+	IWL_FW_INI_REGION_UMAC_ERROR_TABLE,</div><div class='ctx'> 	IWL_FW_INI_REGION_NUM</div><div class='ctx'> }; /* FW_DEBUG_TLV_REGION_TYPE_E_VER_1 */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h<br/>index 5dddb21c1c4d..8d78b0e671c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a></div><div class='hunk'>@@ -675,6 +675,59 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v3 {</div><div class='ctx'> } __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_tof_range_rsp_ap_entry_ntfy_v4 - AP parameters (response)</div><div class='add'>+ * @bssid: BSSID of the AP</div><div class='add'>+ * @measure_status: current APs measurement status, one of</div><div class='add'>+ *	&amp;enum iwl_tof_entry_status.</div><div class='add'>+ * @measure_bw: Current AP Bandwidth: 0  20MHz, 1  40MHz, 2  80MHz</div><div class='add'>+ * @rtt: The Round Trip Time that took for the last measurement for</div><div class='add'>+ *	current AP [pSec]</div><div class='add'>+ * @rtt_variance: The Variance of the RTT values measured for current AP</div><div class='add'>+ * @rtt_spread: The Difference between the maximum and the minimum RTT</div><div class='add'>+ *	values measured for current AP in the current session [pSec]</div><div class='add'>+ * @rssi: RSSI as uploaded in the Channel Estimation notification</div><div class='add'>+ * @rssi_spread: The Difference between the maximum and the minimum RSSI values</div><div class='add'>+ *	measured for current AP in the current session</div><div class='add'>+ * @last_burst: 1 if no more FTM sessions are scheduled for this responder</div><div class='add'>+ * @refusal_period: refusal period in case of</div><div class='add'>+ *	@IWL_TOF_ENTRY_RESPONDER_CANNOT_COLABORATE [sec]</div><div class='add'>+ * @timestamp: The GP2 Clock [usec] where Channel Estimation notification was</div><div class='add'>+ *	uploaded by the LMAC</div><div class='add'>+ * @start_tsf: measurement start time in TSF of the mac specified in the range</div><div class='add'>+ *	request</div><div class='add'>+ * @rx_rate_n_flags: rate and flags of the last FTM frame received from this</div><div class='add'>+ *	responder</div><div class='add'>+ * @tx_rate_n_flags: rate and flags of the last ack sent to this responder</div><div class='add'>+ * @t2t3_initiator: as calculated from the algo in the initiator</div><div class='add'>+ * @t1t4_responder: as calculated from the algo in the responder</div><div class='add'>+ * @common_calib: Calib val that was used in for this AP measurement</div><div class='add'>+ * @specific_calib: val that was used in for this AP measurement</div><div class='add'>+ * @papd_calib_output: The result of the tof papd calibration that was injected</div><div class='add'>+ *	into the algorithm.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_rsp_ap_entry_ntfy_v4 {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 measure_status;</div><div class='add'>+	u8 measure_bw;</div><div class='add'>+	__le32 rtt;</div><div class='add'>+	__le32 rtt_variance;</div><div class='add'>+	__le32 rtt_spread;</div><div class='add'>+	s8 rssi;</div><div class='add'>+	u8 rssi_spread;</div><div class='add'>+	u8 last_burst;</div><div class='add'>+	u8 refusal_period;</div><div class='add'>+	__le32 timestamp;</div><div class='add'>+	__le32 start_tsf;</div><div class='add'>+	__le32 rx_rate_n_flags;</div><div class='add'>+	__le32 tx_rate_n_flags;</div><div class='add'>+	__le32 t2t3_initiator;</div><div class='add'>+	__le32 t1t4_responder;</div><div class='add'>+	__le16 common_calib;</div><div class='add'>+	__le16 specific_calib;</div><div class='add'>+	__le32 papd_calib_output;</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_4 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_tof_range_rsp_ap_entry_ntfy - AP parameters (response)</div><div class='ctx'>  * @bssid: BSSID of the AP</div><div class='ctx'>  * @measure_status: current APs measurement status, one of</div><div class='hunk'>@@ -704,6 +757,8 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v3 {</div><div class='ctx'>  * @specific_calib: val that was used in for this AP measurement</div><div class='ctx'>  * @papd_calib_output: The result of the tof papd calibration that was injected</div><div class='ctx'>  *	into the algorithm.</div><div class='add'>+ * @rttConfidence: a value between 0 - 31 that represents the rtt accuracy.</div><div class='add'>+ * @reserved: for alignment</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tof_range_rsp_ap_entry_ntfy {</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='hunk'>@@ -725,7 +780,9 @@ struct iwl_tof_range_rsp_ap_entry_ntfy {</div><div class='ctx'> 	__le16 common_calib;</div><div class='ctx'> 	__le16 specific_calib;</div><div class='ctx'> 	__le32 papd_calib_output;</div><div class='del'>-} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_4 */</div><div class='add'>+	u8 rttConfidence;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_tof_response_status - tof response status</div><div class='hunk'>@@ -761,6 +818,22 @@ struct iwl_tof_range_rsp_ntfy_v5 {</div><div class='ctx'> } __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_tof_range_rsp_ntfy_v6 - ranging response notification</div><div class='add'>+ * @request_id: A Token ID of the corresponding Range request</div><div class='add'>+ * @num_of_aps: Number of APs results</div><div class='add'>+ * @last_report: 1 if no more FTM sessions are scheduled, 0 otherwise.</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @ap: per-AP data</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_rsp_ntfy_v6 {</div><div class='add'>+	u8 request_id;</div><div class='add'>+	u8 num_of_aps;</div><div class='add'>+	u8 last_report;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	struct iwl_tof_range_rsp_ap_entry_ntfy_v4 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_6 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_tof_range_rsp_ntfy - ranging response notification</div><div class='ctx'>  * @request_id: A Token ID of the corresponding Range request</div><div class='ctx'>  * @num_of_aps: Number of APs results</div><div class='hunk'>@@ -774,7 +847,7 @@ struct iwl_tof_range_rsp_ntfy {</div><div class='ctx'> 	u8 last_report;</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	struct iwl_tof_range_rsp_ap_entry_ntfy ap[IWL_MVM_TOF_MAX_APS];</div><div class='del'>-} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_6 */</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_7 */</div><div class='ctx'> </div><div class='ctx'> #define IWL_MVM_TOF_MCSI_BUF_SIZE  (245)</div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h<br/>index 941c50477003..85c5e367cbf1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a></div><div class='hunk'>@@ -542,6 +542,66 @@ enum iwl_he_htc_flags {</div><div class='ctx'> #define IWL_HE_HTC_LINK_ADAP_BOTH		(3 &lt;&lt; IWL_HE_HTC_LINK_ADAP_POS)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_he_sta_context_cmd_v1 - configure FW to work with HE AP</div><div class='add'>+ * @sta_id: STA id</div><div class='add'>+ * @tid_limit: max num of TIDs in TX HE-SU multi-TID agg</div><div class='add'>+ *	0 - bad value, 1 - multi-tid not supported, 2..8 - tid limit</div><div class='add'>+ * @reserved1: reserved byte for future use</div><div class='add'>+ * @reserved2: reserved byte for future use</div><div class='add'>+ * @flags: see %iwl_11ax_sta_ctxt_flags</div><div class='add'>+ * @ref_bssid_addr: reference BSSID used by the AP</div><div class='add'>+ * @reserved0: reserved 2 bytes for aligning the ref_bssid_addr field to 8 bytes</div><div class='add'>+ * @htc_flags: which features are supported in HTC</div><div class='add'>+ * @frag_flags: frag support in A-MSDU</div><div class='add'>+ * @frag_level: frag support level</div><div class='add'>+ * @frag_max_num: max num of "open" MSDUs in the receiver (in power of 2)</div><div class='add'>+ * @frag_min_size: min frag size (except last frag)</div><div class='add'>+ * @pkt_ext: optional, exists according to PPE-present bit in the HE-PHY capa</div><div class='add'>+ * @bss_color: 11ax AP ID that is used in the HE SIG-A to mark inter BSS frame</div><div class='add'>+ * @htc_trig_based_pkt_ext: default PE in 4us units</div><div class='add'>+ * @frame_time_rts_th: HE duration RTS threshold, in units of 32us</div><div class='add'>+ * @rand_alloc_ecwmin: random CWmin = 2**ECWmin-1</div><div class='add'>+ * @rand_alloc_ecwmax: random CWmax = 2**ECWmax-1</div><div class='add'>+ * @reserved3: reserved byte for future use</div><div class='add'>+ * @trig_based_txf: MU EDCA Parameter set for the trigger based traffic queues</div><div class='add'>+ */</div><div class='add'>+struct iwl_he_sta_context_cmd_v1 {</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 tid_limit;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u8 reserved2;</div><div class='add'>+	__le32 flags;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via Multiple BSSID IE */</div><div class='add'>+	u8 ref_bssid_addr[6];</div><div class='add'>+	__le16 reserved0;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via HE-capabilities IE */</div><div class='add'>+	__le32 htc_flags;</div><div class='add'>+</div><div class='add'>+	u8 frag_flags;</div><div class='add'>+	u8 frag_level;</div><div class='add'>+	u8 frag_max_num;</div><div class='add'>+	u8 frag_min_size;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via PPE thresholds element */</div><div class='add'>+	struct iwl_he_pkt_ext pkt_ext;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via HE-Operation IE */</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 htc_trig_based_pkt_ext;</div><div class='add'>+	__le16 frame_time_rts_th;</div><div class='add'>+</div><div class='add'>+	/* Random access parameter set (i.e. RAPS) */</div><div class='add'>+	u8 rand_alloc_ecwmin;</div><div class='add'>+	u8 rand_alloc_ecwmax;</div><div class='add'>+	__le16 reserved3;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via MU EDCA parameter set element */</div><div class='add'>+	struct iwl_he_backoff_conf trig_based_txf[AC_NUM];</div><div class='add'>+} __packed; /* STA_CONTEXT_DOT11AX_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_he_sta_context_cmd - configure FW to work with HE AP</div><div class='ctx'>  * @sta_id: STA id</div><div class='ctx'>  * @tid_limit: max num of TIDs in TX HE-SU multi-TID agg</div><div class='hunk'>@@ -564,6 +624,14 @@ enum iwl_he_htc_flags {</div><div class='ctx'>  * @rand_alloc_ecwmax: random CWmax = 2**ECWmax-1</div><div class='ctx'>  * @reserved3: reserved byte for future use</div><div class='ctx'>  * @trig_based_txf: MU EDCA Parameter set for the trigger based traffic queues</div><div class='add'>+ * @max_bssid_indicator: indicator of the max bssid supported on the associated</div><div class='add'>+ *	bss</div><div class='add'>+ * @bssid_index: index of the associated VAP</div><div class='add'>+ * @ema_ap: AP supports enhanced Multi BSSID advertisement</div><div class='add'>+ * @profile_periodicity: number of Beacon periods that are needed to receive the</div><div class='add'>+ *	complete VAPs info</div><div class='add'>+ * @bssid_count: actual number of VAPs in the MultiBSS Set</div><div class='add'>+ * @reserved4: alignment</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_he_sta_context_cmd {</div><div class='ctx'> 	u8 sta_id;</div><div class='hunk'>@@ -599,7 +667,14 @@ struct iwl_he_sta_context_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* The below fields are set via MU EDCA parameter set element */</div><div class='ctx'> 	struct iwl_he_backoff_conf trig_based_txf[AC_NUM];</div><div class='del'>-} __packed; /* STA_CONTEXT_DOT11AX_API_S */</div><div class='add'>+</div><div class='add'>+	u8 max_bssid_indicator;</div><div class='add'>+	u8 bssid_index;</div><div class='add'>+	u8 ema_ap;</div><div class='add'>+	u8 profile_periodicity;</div><div class='add'>+	u8 bssid_count;</div><div class='add'>+	u8 reserved4[3];</div><div class='add'>+} __packed; /* STA_CONTEXT_DOT11AX_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_he_monitor_cmd - configure air sniffer for HE</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h<br/>index 93b392f0c6a4..97b49843e318 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ * Copyright(C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ * Copyright(C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -233,7 +233,8 @@ struct iwl_nvm_get_info_phy {</div><div class='ctx'> 	__le32 rx_chains;</div><div class='ctx'> } __packed; /* REGULATORY_NVM_GET_INFO_PHY_SKU_SECTION_S_VER_1 */</div><div class='ctx'> </div><div class='del'>-#define IWL_NUM_CHANNELS (51)</div><div class='add'>+#define IWL_NUM_CHANNELS_V1	51</div><div class='add'>+#define IWL_NUM_CHANNELS	110</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_nvm_get_info_regulatory - regulatory information</div><div class='hunk'>@@ -241,13 +242,39 @@ struct iwl_nvm_get_info_phy {</div><div class='ctx'>  * @channel_profile: regulatory data of this channel</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_nvm_get_info_regulatory {</div><div class='add'>+struct iwl_nvm_get_info_regulatory_v1 {</div><div class='ctx'> 	__le32 lar_enabled;</div><div class='del'>-	__le16 channel_profile[IWL_NUM_CHANNELS];</div><div class='add'>+	__le16 channel_profile[IWL_NUM_CHANNELS_V1];</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed; /* REGULATORY_NVM_GET_INFO_REGULATORY_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_nvm_get_info_regulatory - regulatory information</div><div class='add'>+ * @lar_enabled: is LAR enabled</div><div class='add'>+ * @n_channels: number of valid channels in the array</div><div class='add'>+ * @channel_profile: regulatory data of this channel</div><div class='add'>+ */</div><div class='add'>+struct iwl_nvm_get_info_regulatory {</div><div class='add'>+	__le32 lar_enabled;</div><div class='add'>+	__le32 n_channels;</div><div class='add'>+	__le32 channel_profile[IWL_NUM_CHANNELS];</div><div class='add'>+} __packed; /* REGULATORY_NVM_GET_INFO_REGULATORY_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_nvm_get_info_rsp_v3 - response to get NVM data</div><div class='add'>+ * @general: general NVM data</div><div class='add'>+ * @mac_sku: data relating to MAC sku</div><div class='add'>+ * @phy_sku: data relating to PHY sku</div><div class='add'>+ * @regulatory: regulatory data</div><div class='add'>+ */</div><div class='add'>+struct iwl_nvm_get_info_rsp_v3 {</div><div class='add'>+	struct iwl_nvm_get_info_general general;</div><div class='add'>+	struct iwl_nvm_get_info_sku mac_sku;</div><div class='add'>+	struct iwl_nvm_get_info_phy phy_sku;</div><div class='add'>+	struct iwl_nvm_get_info_regulatory_v1 regulatory;</div><div class='add'>+} __packed; /* REGULATORY_NVM_GET_INFO_RSP_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_nvm_get_info_rsp - response to get NVM data</div><div class='ctx'>  * @general: general NVM data</div><div class='ctx'>  * @mac_sku: data relating to MAC sku</div><div class='hunk'>@@ -259,7 +286,7 @@ struct iwl_nvm_get_info_rsp {</div><div class='ctx'> 	struct iwl_nvm_get_info_sku mac_sku;</div><div class='ctx'> 	struct iwl_nvm_get_info_phy phy_sku;</div><div class='ctx'> 	struct iwl_nvm_get_info_regulatory regulatory;</div><div class='del'>-} __packed; /* REGULATORY_NVM_GET_INFO_RSP_API_S_VER_3 */</div><div class='add'>+} __packed; /* REGULATORY_NVM_GET_INFO_RSP_API_S_VER_4 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_nvm_access_complete_cmd - NVM_ACCESS commands are completed</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h<br/>index 6e8224ce8906..d55312ef58c9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -688,13 +688,6 @@ struct iwl_rx_mpdu_desc {</div><div class='ctx'> </div><div class='ctx'> #define IWL_RX_DESC_SIZE_V1 offsetofend(struct iwl_rx_mpdu_desc, v1)</div><div class='ctx'> </div><div class='del'>-#define IWL_CD_STTS_OPTIMIZED_POS	0</div><div class='del'>-#define IWL_CD_STTS_OPTIMIZED_MSK	0x01</div><div class='del'>-#define IWL_CD_STTS_TRANSFER_STATUS_POS	1</div><div class='del'>-#define IWL_CD_STTS_TRANSFER_STATUS_MSK	0x0E</div><div class='del'>-#define IWL_CD_STTS_WIFI_STATUS_POS	4</div><div class='del'>-#define IWL_CD_STTS_WIFI_STATUS_MSK	0xF0</div><div class='del'>-</div><div class='ctx'> #define RX_NO_DATA_CHAIN_A_POS		0</div><div class='ctx'> #define RX_NO_DATA_CHAIN_A_MSK		(0xff &lt;&lt; RX_NO_DATA_CHAIN_A_POS)</div><div class='ctx'> #define RX_NO_DATA_CHAIN_B_POS		8</div><div class='hunk'>@@ -747,62 +740,6 @@ struct iwl_rx_no_data {</div><div class='ctx'> 	__le32 rx_vec[2];</div><div class='ctx'> } __packed; /* RX_NO_DATA_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum iwl_completion_desc_transfer_status -  transfer status (bits 1-3)</div><div class='del'>- * @IWL_CD_STTS_UNUSED: unused</div><div class='del'>- * @IWL_CD_STTS_UNUSED_2: unused</div><div class='del'>- * @IWL_CD_STTS_END_TRANSFER: successful transfer complete.</div><div class='del'>- *	In sniffer mode, when split is used, set in last CD completion. (RX)</div><div class='del'>- * @IWL_CD_STTS_OVERFLOW: In sniffer mode, when using split - used for</div><div class='del'>- *	all CD completion. (RX)</div><div class='del'>- * @IWL_CD_STTS_ABORTED: CR abort / close flow. (RX)</div><div class='del'>- * @IWL_CD_STTS_ERROR: general error (RX)</div><div class='del'>- */</div><div class='del'>-enum iwl_completion_desc_transfer_status {</div><div class='del'>-	IWL_CD_STTS_UNUSED,</div><div class='del'>-	IWL_CD_STTS_UNUSED_2,</div><div class='del'>-	IWL_CD_STTS_END_TRANSFER,</div><div class='del'>-	IWL_CD_STTS_OVERFLOW,</div><div class='del'>-	IWL_CD_STTS_ABORTED,</div><div class='del'>-	IWL_CD_STTS_ERROR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum iwl_completion_desc_wifi_status - wifi status (bits 4-7)</div><div class='del'>- * @IWL_CD_STTS_VALID: the packet is valid (RX)</div><div class='del'>- * @IWL_CD_STTS_FCS_ERR: frame check sequence error (RX)</div><div class='del'>- * @IWL_CD_STTS_SEC_KEY_ERR: error handling the security key of rx (RX)</div><div class='del'>- * @IWL_CD_STTS_DECRYPTION_ERR: error decrypting the frame (RX)</div><div class='del'>- * @IWL_CD_STTS_DUP: duplicate packet (RX)</div><div class='del'>- * @IWL_CD_STTS_ICV_MIC_ERR: MIC error (RX)</div><div class='del'>- * @IWL_CD_STTS_INTERNAL_SNAP_ERR: problems removing the snap (RX)</div><div class='del'>- * @IWL_CD_STTS_SEC_PORT_FAIL: security port fail (RX)</div><div class='del'>- * @IWL_CD_STTS_BA_OLD_SN: block ack received old SN (RX)</div><div class='del'>- * @IWL_CD_STTS_QOS_NULL: QoS null packet (RX)</div><div class='del'>- * @IWL_CD_STTS_MAC_HDR_ERR: MAC header conversion error (RX)</div><div class='del'>- * @IWL_CD_STTS_MAX_RETRANS: reached max number of retransmissions (TX)</div><div class='del'>- * @IWL_CD_STTS_EX_LIFETIME: exceeded lifetime (TX)</div><div class='del'>- * @IWL_CD_STTS_NOT_USED: completed but not used (RX)</div><div class='del'>- * @IWL_CD_STTS_REPLAY_ERR: pn check failed, replay error (RX)</div><div class='del'>- */</div><div class='del'>-enum iwl_completion_desc_wifi_status {</div><div class='del'>-	IWL_CD_STTS_VALID,</div><div class='del'>-	IWL_CD_STTS_FCS_ERR,</div><div class='del'>-	IWL_CD_STTS_SEC_KEY_ERR,</div><div class='del'>-	IWL_CD_STTS_DECRYPTION_ERR,</div><div class='del'>-	IWL_CD_STTS_DUP,</div><div class='del'>-	IWL_CD_STTS_ICV_MIC_ERR,</div><div class='del'>-	IWL_CD_STTS_INTERNAL_SNAP_ERR,</div><div class='del'>-	IWL_CD_STTS_SEC_PORT_FAIL,</div><div class='del'>-	IWL_CD_STTS_BA_OLD_SN,</div><div class='del'>-	IWL_CD_STTS_QOS_NULL,</div><div class='del'>-	IWL_CD_STTS_MAC_HDR_ERR,</div><div class='del'>-	IWL_CD_STTS_MAX_RETRANS,</div><div class='del'>-	IWL_CD_STTS_EX_LIFETIME,</div><div class='del'>-	IWL_CD_STTS_NOT_USED,</div><div class='del'>-	IWL_CD_STTS_REPLAY_ERR,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iwl_frame_release {</div><div class='ctx'> 	u8 baid;</div><div class='ctx'> 	u8 reserved;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h<br/>index 890a939c463d..1a67a2a439ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a></div><div class='hunk'>@@ -788,7 +788,53 @@ struct iwl_umac_scan_complete {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* SCAN_COMPLETE_NTF_UMAC_API_S_VER_1 */</div><div class='ctx'> </div><div class='del'>-#define SCAN_OFFLOAD_MATCHING_CHANNELS_LEN 5</div><div class='add'>+#define SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1 5</div><div class='add'>+#define SCAN_OFFLOAD_MATCHING_CHANNELS_LEN    7</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_offload_profile_match_v1 - match information</div><div class='add'>+ * @bssid: matched bssid</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @channel: channel where the match occurred</div><div class='add'>+ * @energy: energy</div><div class='add'>+ * @matching_feature: feature matches</div><div class='add'>+ * @matching_channels: bitmap of channels that matched, referencing</div><div class='add'>+ *	the channels passed in the scan offload request.</div><div class='add'>+ */</div><div class='add'>+struct iwl_scan_offload_profile_match_v1 {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 energy;</div><div class='add'>+	u8 matching_feature;</div><div class='add'>+	u8 matching_channels[SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1];</div><div class='add'>+} __packed; /* SCAN_OFFLOAD_PROFILE_MATCH_RESULTS_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_offload_profiles_query_v1 - match results query response</div><div class='add'>+ * @matched_profiles: bitmap of matched profiles, referencing the</div><div class='add'>+ *	matches passed in the scan offload request</div><div class='add'>+ * @last_scan_age: age of the last offloaded scan</div><div class='add'>+ * @n_scans_done: number of offloaded scans done</div><div class='add'>+ * @gp2_d0u: GP2 when D0U occurred</div><div class='add'>+ * @gp2_invoked: GP2 when scan offload was invoked</div><div class='add'>+ * @resume_while_scanning: not used</div><div class='add'>+ * @self_recovery: obsolete</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @matches: array of match information, one for each match</div><div class='add'>+ */</div><div class='add'>+struct iwl_scan_offload_profiles_query_v1 {</div><div class='add'>+	__le32 matched_profiles;</div><div class='add'>+	__le32 last_scan_age;</div><div class='add'>+	__le32 n_scans_done;</div><div class='add'>+	__le32 gp2_d0u;</div><div class='add'>+	__le32 gp2_invoked;</div><div class='add'>+	u8 resume_while_scanning;</div><div class='add'>+	u8 self_recovery;</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	struct iwl_scan_offload_profile_match_v1 matches[IWL_SCAN_MAX_PROFILES];</div><div class='add'>+} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_2 */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_scan_offload_profile_match - match information</div><div class='ctx'>  * @bssid: matched bssid</div><div class='hunk'>@@ -797,7 +843,7 @@ struct iwl_umac_scan_complete {</div><div class='ctx'>  * @energy: energy</div><div class='ctx'>  * @matching_feature: feature matches</div><div class='ctx'>  * @matching_channels: bitmap of channels that matched, referencing</div><div class='del'>- *	the channels passed in tue scan offload request</div><div class='add'>+ *	the channels passed in the scan offload request.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_scan_offload_profile_match {</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='hunk'>@@ -806,7 +852,7 @@ struct iwl_scan_offload_profile_match {</div><div class='ctx'> 	u8 energy;</div><div class='ctx'> 	u8 matching_feature;</div><div class='ctx'> 	u8 matching_channels[SCAN_OFFLOAD_MATCHING_CHANNELS_LEN];</div><div class='del'>-} __packed; /* SCAN_OFFLOAD_PROFILE_MATCH_RESULTS_S_VER_1 */</div><div class='add'>+} __packed; /* SCAN_OFFLOAD_PROFILE_MATCH_RESULTS_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_scan_offload_profiles_query - match results query response</div><div class='hunk'>@@ -831,7 +877,7 @@ struct iwl_scan_offload_profiles_query {</div><div class='ctx'> 	u8 self_recovery;</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> 	struct iwl_scan_offload_profile_match matches[IWL_SCAN_MAX_PROFILES];</div><div class='del'>-} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_2 */</div><div class='add'>+} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_umac_scan_iter_complete_notif - notifies end of scanning iteration</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h b/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h<br/>index 6ac240b6eace..73196cbc7fbe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright(c) 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -30,6 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright(c) 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -133,6 +135,7 @@ enum iwl_tx_queue_cfg_actions {</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEFAULT_QUEUE_SIZE 256</div><div class='ctx'> #define IWL_MGMT_QUEUE_SIZE 16</div><div class='add'>+#define IWL_CMD_QUEUE_SIZE 32</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_tx_queue_cfg_cmd - txq hw scheduler config command</div><div class='ctx'>  * @sta_id: station id</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c<br/>index f119c49cd39c..5f52e40a2903 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a></div><div class='hunk'>@@ -545,6 +545,7 @@ static const struct iwl_prph_range iwl_prph_dump_addr_22000[] = {</div><div class='ctx'> 	{ .start = 0x00a04590, .end = 0x00a04590 },</div><div class='ctx'> 	{ .start = 0x00a04598, .end = 0x00a04598 },</div><div class='ctx'> 	{ .start = 0x00a045c0, .end = 0x00a045f4 },</div><div class='add'>+	{ .start = 0x00a05c18, .end = 0x00a05c1c },</div><div class='ctx'> 	{ .start = 0x00a0c000, .end = 0x00a0c018 },</div><div class='ctx'> 	{ .start = 0x00a0c020, .end = 0x00a0c028 },</div><div class='ctx'> 	{ .start = 0x00a0c038, .end = 0x00a0c094 },</div><div class='hunk'>@@ -557,6 +558,12 @@ static const struct iwl_prph_range iwl_prph_dump_addr_22000[] = {</div><div class='ctx'> 	{ .start = 0x00a0c1b0, .end = 0x00a0c1b8 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct iwl_prph_range iwl_prph_dump_addr_ax210[] = {</div><div class='add'>+	{ .start = 0x00d03c00, .end = 0x00d03c64 },</div><div class='add'>+	{ .start = 0x00d05c18, .end = 0x00d05c1c },</div><div class='add'>+	{ .start = 0x00d0c000, .end = 0x00d0c174 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void iwl_read_prph_block(struct iwl_trans *trans, u32 start,</div><div class='ctx'> 				u32 len_bytes, __le32 *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -675,7 +682,8 @@ static void iwl_fw_prph_handler(struct iwl_fw_runtime *fwrt, void *ptr,</div><div class='ctx'> 	u32 range_len;</div><div class='ctx'> </div><div class='ctx'> 	if (fwrt-&gt;trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		/* TODO */</div><div class='add'>+		range_len = ARRAY_SIZE(iwl_prph_dump_addr_ax210);</div><div class='add'>+		handler(fwrt, iwl_prph_dump_addr_ax210, range_len, ptr);</div><div class='ctx'> 	} else if (fwrt-&gt;trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='ctx'> 		range_len = ARRAY_SIZE(iwl_prph_dump_addr_22000);</div><div class='ctx'> 		handler(fwrt, iwl_prph_dump_addr_22000, range_len, ptr);</div><div class='hunk'>@@ -804,8 +812,8 @@ static void iwl_dump_paging(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct iwl_fw_error_dump_file *</div><div class='del'>-_iwl_fw_error_dump(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		   struct iwl_fw_dump_ptrs *fw_error_dump)</div><div class='add'>+iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='add'>+		       struct iwl_fw_dump_ptrs *fw_error_dump)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_error_dump_file *dump_file;</div><div class='ctx'> 	struct iwl_fw_error_dump_data *dump_data;</div><div class='hunk'>@@ -909,11 +917,8 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		dump_data-&gt;type = cpu_to_le32(IWL_FW_ERROR_DUMP_DEV_FW_INFO);</div><div class='ctx'> 		dump_data-&gt;len = cpu_to_le32(sizeof(*dump_info));</div><div class='ctx'> 		dump_info = (void *)dump_data-&gt;data;</div><div class='del'>-		dump_info-&gt;device_family =</div><div class='del'>-			fwrt-&gt;trans-&gt;cfg-&gt;device_family ==</div><div class='del'>-			IWL_DEVICE_FAMILY_7000 ?</div><div class='del'>-				cpu_to_le32(IWL_FW_ERROR_DUMP_FAMILY_7) :</div><div class='del'>-				cpu_to_le32(IWL_FW_ERROR_DUMP_FAMILY_8);</div><div class='add'>+		dump_info-&gt;hw_type =</div><div class='add'>+			cpu_to_le32(CSR_HW_REV_TYPE(fwrt-&gt;trans-&gt;hw_rev));</div><div class='ctx'> 		dump_info-&gt;hw_step =</div><div class='ctx'> 			cpu_to_le32(CSR_HW_REV_STEP(fwrt-&gt;trans-&gt;hw_rev));</div><div class='ctx'> 		memcpy(dump_info-&gt;fw_human_readable, fwrt-&gt;fw-&gt;human_readable,</div><div class='hunk'>@@ -967,10 +972,11 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	if (fifo_len) {</div><div class='ctx'> 		iwl_fw_dump_rxf(fwrt, &amp;dump_data);</div><div class='ctx'> 		iwl_fw_dump_txf(fwrt, &amp;dump_data);</div><div class='del'>-		if (radio_len)</div><div class='del'>-			iwl_read_radio_regs(fwrt, &amp;dump_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (radio_len)</div><div class='add'>+		iwl_read_radio_regs(fwrt, &amp;dump_data);</div><div class='add'>+</div><div class='ctx'> 	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_ERROR_INFO) &amp;&amp;</div><div class='ctx'> 	    fwrt-&gt;dump.desc) {</div><div class='ctx'> 		dump_data-&gt;type = cpu_to_le32(IWL_FW_ERROR_DUMP_ERROR_INFO);</div><div class='hunk'>@@ -1049,14 +1055,14 @@ static int iwl_dump_ini_prph_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='ctx'> 	__le32 *val = range-&gt;data;</div><div class='del'>-	u32 addr, prph_val, offset = le32_to_cpu(reg-&gt;offset);</div><div class='add'>+	u32 prph_val;</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;start_addr[idx]) + le32_to_cpu(reg-&gt;offset);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	range-&gt;start_addr = reg-&gt;start_addr[idx];</div><div class='add'>+	range-&gt;start_addr = cpu_to_le64(addr);</div><div class='ctx'> 	range-&gt;range_data_size = reg-&gt;internal.range_data_size;</div><div class='ctx'> 	for (i = 0; i &lt; le32_to_cpu(reg-&gt;internal.range_data_size); i += 4) {</div><div class='del'>-		addr = le32_to_cpu(range-&gt;start_addr) + i;</div><div class='del'>-		prph_val = iwl_read_prph(fwrt-&gt;trans, addr + offset);</div><div class='add'>+		prph_val = iwl_read_prph(fwrt-&gt;trans, addr + i);</div><div class='ctx'> 		if (prph_val == 0x5a5a5a5a)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		*val++ = cpu_to_le32(prph_val);</div><div class='hunk'>@@ -1071,16 +1077,13 @@ static int iwl_dump_ini_csr_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='ctx'> 	__le32 *val = range-&gt;data;</div><div class='del'>-	u32 addr, offset = le32_to_cpu(reg-&gt;offset);</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;start_addr[idx]) + le32_to_cpu(reg-&gt;offset);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	range-&gt;start_addr = reg-&gt;start_addr[idx];</div><div class='add'>+	range-&gt;start_addr = cpu_to_le64(addr);</div><div class='ctx'> 	range-&gt;range_data_size = reg-&gt;internal.range_data_size;</div><div class='del'>-	for (i = 0; i &lt; le32_to_cpu(reg-&gt;internal.range_data_size); i += 4) {</div><div class='del'>-		addr = le32_to_cpu(range-&gt;start_addr) + i;</div><div class='del'>-		*val++ = cpu_to_le32(iwl_trans_read32(fwrt-&gt;trans,</div><div class='del'>-						      addr + offset));</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(reg-&gt;internal.range_data_size); i += 4)</div><div class='add'>+		*val++ = cpu_to_le32(iwl_trans_read32(fwrt-&gt;trans, addr + i));</div><div class='ctx'> </div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='hunk'>@@ -1090,12 +1093,11 @@ static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				     void *range_ptr, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='del'>-	u32 addr = le32_to_cpu(range-&gt;start_addr);</div><div class='del'>-	u32 offset = le32_to_cpu(reg-&gt;offset);</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;start_addr[idx]) + le32_to_cpu(reg-&gt;offset);</div><div class='ctx'> </div><div class='del'>-	range-&gt;start_addr = reg-&gt;start_addr[idx];</div><div class='add'>+	range-&gt;start_addr = cpu_to_le64(addr);</div><div class='ctx'> 	range-&gt;range_data_size = reg-&gt;internal.range_data_size;</div><div class='del'>-	iwl_trans_read_mem_bytes(fwrt-&gt;trans, addr + offset, range-&gt;data,</div><div class='add'>+	iwl_trans_read_mem_bytes(fwrt-&gt;trans, addr, range-&gt;data,</div><div class='ctx'> 				 le32_to_cpu(reg-&gt;internal.range_data_size));</div><div class='ctx'> </div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='hunk'>@@ -1109,7 +1111,7 @@ iwl_dump_ini_paging_gen2_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='ctx'> 	u32 page_size = fwrt-&gt;trans-&gt;init_dram.paging[idx].size;</div><div class='ctx'> </div><div class='del'>-	range-&gt;start_addr = cpu_to_le32(idx);</div><div class='add'>+	range-&gt;start_addr = cpu_to_le64(idx);</div><div class='ctx'> 	range-&gt;range_data_size = cpu_to_le32(page_size);</div><div class='ctx'> 	memcpy(range-&gt;data, fwrt-&gt;trans-&gt;init_dram.paging[idx].block,</div><div class='ctx'> 	       page_size);</div><div class='hunk'>@@ -1129,7 +1131,7 @@ static int iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	dma_addr_t addr = fwrt-&gt;fw_paging_db[idx].fw_paging_phys;</div><div class='ctx'> 	u32 page_size = fwrt-&gt;fw_paging_db[idx].fw_paging_size;</div><div class='ctx'> </div><div class='del'>-	range-&gt;start_addr = cpu_to_le32(idx);</div><div class='add'>+	range-&gt;start_addr = cpu_to_le64(idx);</div><div class='ctx'> 	range-&gt;range_data_size = cpu_to_le32(page_size);</div><div class='ctx'> 	dma_sync_single_for_cpu(fwrt-&gt;trans-&gt;dev, addr,	page_size,</div><div class='ctx'> 				DMA_BIDIRECTIONAL);</div><div class='hunk'>@@ -1152,7 +1154,7 @@ iwl_dump_ini_mon_dram_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	if (start_addr == 0x5a5a5a5a)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	range-&gt;start_addr = cpu_to_le32(start_addr);</div><div class='add'>+	range-&gt;start_addr = cpu_to_le64(start_addr);</div><div class='ctx'> 	range-&gt;range_data_size = cpu_to_le32(fwrt-&gt;trans-&gt;fw_mon[idx].size);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(range-&gt;data, fwrt-&gt;trans-&gt;fw_mon[idx].block,</div><div class='hunk'>@@ -1228,10 +1230,11 @@ static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_fifo_error_dump_range *range = range_ptr;</div><div class='ctx'> 	struct iwl_ini_txf_iter_data *iter;</div><div class='add'>+	struct iwl_fw_ini_error_dump_register *reg_dump = (void *)range-&gt;data;</div><div class='ctx'> 	u32 offs = le32_to_cpu(reg-&gt;offset), addr;</div><div class='ctx'> 	u32 registers_size =</div><div class='del'>-		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(__le32);</div><div class='del'>-	__le32 *val = range-&gt;data;</div><div class='add'>+		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(*reg_dump);</div><div class='add'>+	__le32 *data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1249,11 +1252,18 @@ static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	iwl_write_prph_no_grab(fwrt-&gt;trans, TXF_LARC_NUM + offs, iter-&gt;fifo);</div><div class='ctx'> </div><div class='del'>-	/* read txf registers */</div><div class='add'>+	/*</div><div class='add'>+	 * read txf registers. for each register, write to the dump the</div><div class='add'>+	 * register address and its value</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; le32_to_cpu(reg-&gt;fifos.num_of_registers); i++) {</div><div class='ctx'> 		addr = le32_to_cpu(reg-&gt;start_addr[i]) + offs;</div><div class='ctx'> </div><div class='del'>-		*val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='add'>+		reg_dump-&gt;addr = cpu_to_le32(addr);</div><div class='add'>+		reg_dump-&gt;data = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans,</div><div class='add'>+								   addr));</div><div class='add'>+</div><div class='add'>+		reg_dump++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;fifos.header_only) {</div><div class='hunk'>@@ -1270,8 +1280,9 @@ static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	/* Read FIFO */</div><div class='ctx'> 	addr = TXF_READ_MODIFY_DATA + offs;</div><div class='del'>-	for (i = 0; i &lt; iter-&gt;fifo_size; i += sizeof(__le32))</div><div class='del'>-		*val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='add'>+	data = (void *)reg_dump;</div><div class='add'>+	for (i = 0; i &lt; iter-&gt;fifo_size; i += sizeof(*data))</div><div class='add'>+		*data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	iwl_trans_release_nic_access(fwrt-&gt;trans, &amp;flags);</div><div class='hunk'>@@ -1327,10 +1338,11 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_fifo_error_dump_range *range = range_ptr;</div><div class='ctx'> 	struct iwl_ini_rxf_data rxf_data;</div><div class='add'>+	struct iwl_fw_ini_error_dump_register *reg_dump = (void *)range-&gt;data;</div><div class='ctx'> 	u32 offs = le32_to_cpu(reg-&gt;offset), addr;</div><div class='ctx'> 	u32 registers_size =</div><div class='del'>-		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(__le32);</div><div class='del'>-	__le32 *val = range-&gt;data;</div><div class='add'>+		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(*reg_dump);</div><div class='add'>+	__le32 *data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1341,17 +1353,22 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	if (!iwl_trans_grab_nic_access(fwrt-&gt;trans, &amp;flags))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	offs += rxf_data.offset;</div><div class='del'>-</div><div class='ctx'> 	range-&gt;fifo_num = cpu_to_le32(rxf_data.fifo_num);</div><div class='ctx'> 	range-&gt;num_of_registers = reg-&gt;fifos.num_of_registers;</div><div class='ctx'> 	range-&gt;range_data_size = cpu_to_le32(rxf_data.size + registers_size);</div><div class='ctx'> </div><div class='del'>-	/* read rxf registers */</div><div class='add'>+	/*</div><div class='add'>+	 * read rxf registers. for each register, write to the dump the</div><div class='add'>+	 * register address and its value</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; le32_to_cpu(reg-&gt;fifos.num_of_registers); i++) {</div><div class='ctx'> 		addr = le32_to_cpu(reg-&gt;start_addr[i]) + offs;</div><div class='ctx'> </div><div class='del'>-		*val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='add'>+		reg_dump-&gt;addr = cpu_to_le32(addr);</div><div class='add'>+		reg_dump-&gt;data = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans,</div><div class='add'>+								   addr));</div><div class='add'>+</div><div class='add'>+		reg_dump++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;fifos.header_only) {</div><div class='hunk'>@@ -1359,6 +1376,12 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * region register have absolute value so apply rxf offset after</div><div class='add'>+	 * reading the registers</div><div class='add'>+	 */</div><div class='add'>+	offs += rxf_data.offset;</div><div class='add'>+</div><div class='ctx'> 	/* Lock fence */</div><div class='ctx'> 	iwl_write_prph_no_grab(fwrt-&gt;trans, RXF_SET_FENCE_MODE + offs, 0x1);</div><div class='ctx'> 	/* Set fence pointer to the same place like WR pointer */</div><div class='hunk'>@@ -1369,8 +1392,9 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	/* Read FIFO */</div><div class='ctx'> 	addr =  RXF_FIFO_RD_FENCE_INC + offs;</div><div class='del'>-	for (i = 0; i &lt; rxf_data.size; i += sizeof(__le32))</div><div class='del'>-		*val++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='add'>+	data = (void *)reg_dump;</div><div class='add'>+	for (i = 0; i &lt; rxf_data.size; i += sizeof(*data))</div><div class='add'>+		*data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	iwl_trans_release_nic_access(fwrt-&gt;trans, &amp;flags);</div><div class='hunk'>@@ -1384,32 +1408,86 @@ static void *iwl_dump_ini_mem_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump *dump = data;</div><div class='ctx'> </div><div class='add'>+	dump-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_MEM_VER);</div><div class='add'>+</div><div class='ctx'> 	return dump-&gt;ranges;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-*iwl_dump_ini_mon_dram_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='del'>-				   struct iwl_fw_ini_region_cfg *reg,</div><div class='del'>-				   void *data)</div><div class='add'>+*iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			      struct iwl_fw_ini_region_cfg *reg,</div><div class='add'>+			      struct iwl_fw_ini_monitor_dump *data,</div><div class='add'>+			      u32 write_ptr_addr, u32 write_ptr_msk,</div><div class='add'>+			      u32 cycle_cnt_addr, u32 cycle_cnt_msk)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_ini_monitor_dram_dump *mon_dump = (void *)data;</div><div class='ctx'> 	u32 write_ptr, cycle_cnt;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_trans_grab_nic_access(fwrt-&gt;trans, &amp;flags)) {</div><div class='del'>-		IWL_ERR(fwrt, "Failed to get DRAM monitor header\n");</div><div class='add'>+		IWL_ERR(fwrt, "Failed to get monitor header\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	write_ptr = iwl_read_umac_prph_no_grab(fwrt-&gt;trans,</div><div class='del'>-					       MON_BUFF_WRPTR_VER2);</div><div class='del'>-	cycle_cnt = iwl_read_umac_prph_no_grab(fwrt-&gt;trans,</div><div class='del'>-					       MON_BUFF_CYCLE_CNT_VER2);</div><div class='add'>+</div><div class='add'>+	write_ptr = iwl_read_prph_no_grab(fwrt-&gt;trans, write_ptr_addr);</div><div class='add'>+	cycle_cnt = iwl_read_prph_no_grab(fwrt-&gt;trans, cycle_cnt_addr);</div><div class='add'>+</div><div class='ctx'> 	iwl_trans_release_nic_access(fwrt-&gt;trans, &amp;flags);</div><div class='ctx'> </div><div class='del'>-	mon_dump-&gt;write_ptr = cpu_to_le32(write_ptr);</div><div class='del'>-	mon_dump-&gt;cycle_cnt = cpu_to_le32(cycle_cnt);</div><div class='add'>+	data-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_MONITOR_VER);</div><div class='add'>+	data-&gt;write_ptr = cpu_to_le32(write_ptr &amp; write_ptr_msk);</div><div class='add'>+	data-&gt;cycle_cnt = cpu_to_le32(cycle_cnt &amp; cycle_cnt_msk);</div><div class='add'>+</div><div class='add'>+	return data-&gt;ranges;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+*iwl_dump_ini_mon_dram_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   struct iwl_fw_ini_region_cfg *reg,</div><div class='add'>+				   void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;</div><div class='add'>+	u32 write_ptr_addr, write_ptr_msk, cycle_cnt_addr, cycle_cnt_msk;</div><div class='add'>+</div><div class='add'>+	switch (fwrt-&gt;trans-&gt;cfg-&gt;device_family) {</div><div class='add'>+	case IWL_DEVICE_FAMILY_9000:</div><div class='add'>+	case IWL_DEVICE_FAMILY_22000:</div><div class='add'>+		write_ptr_addr = MON_BUFF_WRPTR_VER2;</div><div class='add'>+		write_ptr_msk = -1;</div><div class='add'>+		cycle_cnt_addr = MON_BUFF_CYCLE_CNT_VER2;</div><div class='add'>+		cycle_cnt_msk = -1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_ERR(fwrt, "Unsupported device family %d\n",</div><div class='add'>+			fwrt-&gt;trans-&gt;cfg-&gt;device_family);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_mon_fill_header(fwrt, reg, mon_dump, write_ptr_addr,</div><div class='add'>+					    write_ptr_msk, cycle_cnt_addr,</div><div class='add'>+					    cycle_cnt_msk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+*iwl_dump_ini_mon_smem_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   struct iwl_fw_ini_region_cfg *reg,</div><div class='add'>+				   void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;</div><div class='add'>+	const struct iwl_cfg *cfg = fwrt-&gt;trans-&gt;cfg;</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;cfg-&gt;device_family != IWL_DEVICE_FAMILY_9000 &amp;&amp;</div><div class='add'>+	    fwrt-&gt;trans-&gt;cfg-&gt;device_family != IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+		IWL_ERR(fwrt, "Unsupported device family %d\n",</div><div class='add'>+			fwrt-&gt;trans-&gt;cfg-&gt;device_family);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_mon_fill_header(fwrt, reg, mon_dump,</div><div class='add'>+					    cfg-&gt;fw_mon_smem_write_ptr_addr,</div><div class='add'>+					    cfg-&gt;fw_mon_smem_write_ptr_msk,</div><div class='add'>+					    cfg-&gt;fw_mon_smem_cycle_cnt_ptr_addr,</div><div class='add'>+					    cfg-&gt;fw_mon_smem_cycle_cnt_ptr_msk);</div><div class='ctx'> </div><div class='del'>-	return mon_dump-&gt;ranges;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *iwl_dump_ini_fifo_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='hunk'>@@ -1418,6 +1496,8 @@ static void *iwl_dump_ini_fifo_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_fifo_error_dump *dump = data;</div><div class='ctx'> </div><div class='add'>+	dump-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_FIFO_VER);</div><div class='add'>+</div><div class='ctx'> 	return dump-&gt;ranges;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1509,7 +1589,8 @@ static u32 iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> static u32 iwl_dump_ini_mon_dram_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 					  struct iwl_fw_ini_region_cfg *reg)</div><div class='ctx'> {</div><div class='del'>-	u32 size = sizeof(struct iwl_fw_ini_monitor_dram_dump);</div><div class='add'>+	u32 size = sizeof(struct iwl_fw_ini_monitor_dump) +</div><div class='add'>+		sizeof(struct iwl_fw_ini_error_dump_range);</div><div class='ctx'> </div><div class='ctx'> 	if (fwrt-&gt;trans-&gt;num_blocks)</div><div class='ctx'> 		size += fwrt-&gt;trans-&gt;fw_mon[0].size;</div><div class='hunk'>@@ -1517,6 +1598,15 @@ static u32 iwl_dump_ini_mon_dram_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 iwl_dump_ini_mon_smem_get_size(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					  struct iwl_fw_ini_region_cfg *reg)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct iwl_fw_ini_monitor_dump) +</div><div class='add'>+		iwl_dump_ini_mem_ranges(fwrt, reg) *</div><div class='add'>+		(sizeof(struct iwl_fw_ini_error_dump_range) +</div><div class='add'>+		 le32_to_cpu(reg-&gt;internal.range_data_size));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 iwl_dump_ini_txf_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				     struct iwl_fw_ini_region_cfg *reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -1524,7 +1614,7 @@ static u32 iwl_dump_ini_txf_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	void *fifo_iter = fwrt-&gt;dump.fifo_iter;</div><div class='ctx'> 	u32 size = 0;</div><div class='ctx'> 	u32 fifo_hdr = sizeof(struct iwl_fw_ini_fifo_error_dump_range) +</div><div class='del'>-		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(__le32);</div><div class='add'>+		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(__le32) * 2;</div><div class='ctx'> </div><div class='ctx'> 	fwrt-&gt;dump.fifo_iter = &amp;iter;</div><div class='ctx'> 	while (iwl_ini_txf_iter(fwrt, reg)) {</div><div class='hunk'>@@ -1547,7 +1637,7 @@ static u32 iwl_dump_ini_rxf_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	struct iwl_ini_rxf_data rx_data;</div><div class='ctx'> 	u32 size = sizeof(struct iwl_fw_ini_fifo_error_dump) +</div><div class='ctx'> 		sizeof(struct iwl_fw_ini_fifo_error_dump_range) +</div><div class='del'>-		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(__le32);</div><div class='add'>+		le32_to_cpu(reg-&gt;fifos.num_of_registers) * sizeof(__le32) * 2;</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;fifos.header_only)</div><div class='ctx'> 		return size;</div><div class='hunk'>@@ -1584,27 +1674,31 @@ struct iwl_dump_ini_mem_ops {</div><div class='ctx'>  * @fwrt: fw runtime struct.</div><div class='ctx'>  * @data: dump memory data.</div><div class='ctx'>  * @reg: region to copy to the dump.</div><div class='add'>+ * @ops: memory dump operations.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		 enum iwl_fw_ini_region_type type,</div><div class='ctx'> 		 struct iwl_fw_error_dump_data **data,</div><div class='ctx'> 		 struct iwl_fw_ini_region_cfg *reg,</div><div class='ctx'> 		 struct iwl_dump_ini_mem_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header *header = (void *)(*data)-&gt;data;</div><div class='add'>+	u32 num_of_ranges, i, type = le32_to_cpu(reg-&gt;region_type);</div><div class='ctx'> 	void *range;</div><div class='del'>-	u32 num_of_ranges, i;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!ops || !ops-&gt;get_num_of_ranges || !ops-&gt;get_size ||</div><div class='ctx'> 		    !ops-&gt;fill_mem_hdr || !ops-&gt;fill_range))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_FW(fwrt, "WRT: collecting region: id=%d, type=%d\n",</div><div class='add'>+		     le32_to_cpu(reg-&gt;region_id), type);</div><div class='add'>+</div><div class='ctx'> 	num_of_ranges = ops-&gt;get_num_of_ranges(fwrt, reg);</div><div class='ctx'> </div><div class='ctx'> 	(*data)-&gt;type = cpu_to_le32(type | INI_DUMP_BIT);</div><div class='ctx'> 	(*data)-&gt;len = cpu_to_le32(ops-&gt;get_size(fwrt, reg));</div><div class='ctx'> </div><div class='add'>+	header-&gt;region_id = reg-&gt;region_id;</div><div class='ctx'> 	header-&gt;num_of_ranges = cpu_to_le32(num_of_ranges);</div><div class='ctx'> 	header-&gt;name_len = cpu_to_le32(min_t(int, IWL_FW_INI_MAX_NAME,</div><div class='ctx'> 					     le32_to_cpu(reg-&gt;name_len)));</div><div class='hunk'>@@ -1612,8 +1706,10 @@ iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	range = ops-&gt;fill_mem_hdr(fwrt, reg, header);</div><div class='ctx'> 	if (!range) {</div><div class='del'>-		IWL_ERR(fwrt, "Failed to fill region header: id=%d, type=%d\n",</div><div class='add'>+		IWL_ERR(fwrt,</div><div class='add'>+			"WRT: failed to fill region header: id=%d, type=%d\n",</div><div class='ctx'> 			le32_to_cpu(reg-&gt;region_id), type);</div><div class='add'>+		memset(*data, 0, le32_to_cpu((*data)-&gt;len));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1621,8 +1717,10 @@ iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		int range_size = ops-&gt;fill_range(fwrt, reg, range, i);</div><div class='ctx'> </div><div class='ctx'> 		if (range_size &lt; 0) {</div><div class='del'>-			IWL_ERR(fwrt, "Failed to dump region: id=%d, type=%d\n",</div><div class='add'>+			IWL_ERR(fwrt,</div><div class='add'>+				"WRT: failed to dump region: id=%d, type=%d\n",</div><div class='ctx'> 				le32_to_cpu(reg-&gt;region_id), type);</div><div class='add'>+			memset(*data, 0, le32_to_cpu((*data)-&gt;len));</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		range = range + range_size;</div><div class='hunk'>@@ -1641,23 +1739,30 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	for (i = 0; i &lt; le32_to_cpu(trigger-&gt;num_regions); i++) {</div><div class='ctx'> 		u32 reg_id = le32_to_cpu(trigger-&gt;data[i]);</div><div class='ctx'> 		struct iwl_fw_ini_region_cfg *reg;</div><div class='del'>-		enum iwl_fw_ini_region_type type;</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(reg_id &gt;= ARRAY_SIZE(fwrt-&gt;dump.active_regs)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		reg = fwrt-&gt;dump.active_regs[reg_id];</div><div class='del'>-		if (WARN(!reg, "Unassigned region %d\n", reg_id))</div><div class='add'>+		if (!reg) {</div><div class='add'>+			IWL_WARN(fwrt,</div><div class='add'>+				 "WRT: unassigned region id %d, skipping\n",</div><div class='add'>+				 reg_id);</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		type = le32_to_cpu(reg-&gt;region_type);</div><div class='del'>-		switch (type) {</div><div class='add'>+		/* currently the driver supports always on domain only */</div><div class='add'>+		if (le32_to_cpu(reg-&gt;domain) != IWL_FW_INI_DBG_DOMAIN_ALWAYS_ON)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (le32_to_cpu(reg-&gt;region_type)) {</div><div class='ctx'> 		case IWL_FW_INI_REGION_DEVICE_MEMORY:</div><div class='ctx'> 		case IWL_FW_INI_REGION_PERIPHERY_MAC:</div><div class='ctx'> 		case IWL_FW_INI_REGION_PERIPHERY_PHY:</div><div class='ctx'> 		case IWL_FW_INI_REGION_PERIPHERY_AUX:</div><div class='del'>-		case IWL_FW_INI_REGION_INTERNAL_BUFFER:</div><div class='ctx'> 		case IWL_FW_INI_REGION_CSR:</div><div class='add'>+		case IWL_FW_INI_REGION_LMAC_ERROR_TABLE:</div><div class='add'>+		case IWL_FW_INI_REGION_UMAC_ERROR_TABLE:</div><div class='ctx'> 			size += hdr_len + iwl_dump_ini_mem_get_size(fwrt, reg);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_FW_INI_REGION_TXF:</div><div class='hunk'>@@ -1666,7 +1771,7 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		case IWL_FW_INI_REGION_RXF:</div><div class='ctx'> 			size += hdr_len + iwl_dump_ini_rxf_get_size(fwrt, reg);</div><div class='ctx'> 			break;</div><div class='del'>-		case IWL_FW_INI_REGION_PAGING: {</div><div class='add'>+		case IWL_FW_INI_REGION_PAGING:</div><div class='ctx'> 			size += hdr_len;</div><div class='ctx'> 			if (iwl_fw_dbg_is_paging_enabled(fwrt)) {</div><div class='ctx'> 				size += iwl_dump_ini_paging_get_size(fwrt, reg);</div><div class='hunk'>@@ -1675,13 +1780,16 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 									  reg);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		case IWL_FW_INI_REGION_DRAM_BUFFER:</div><div class='ctx'> 			if (!fwrt-&gt;trans-&gt;num_blocks)</div><div class='ctx'> 				break;</div><div class='ctx'> 			size += hdr_len +</div><div class='ctx'> 				iwl_dump_ini_mon_dram_get_size(fwrt, reg);</div><div class='ctx'> 			break;</div><div class='add'>+		case IWL_FW_INI_REGION_INTERNAL_BUFFER:</div><div class='add'>+			size += hdr_len +</div><div class='add'>+				iwl_dump_ini_mon_smem_get_size(fwrt, reg);</div><div class='add'>+			break;</div><div class='ctx'> 		case IWL_FW_INI_REGION_DRAM_IMR:</div><div class='ctx'> 			/* Undefined yet */</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1699,7 +1807,6 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		u32 reg_id = le32_to_cpu(trigger-&gt;data[i]);</div><div class='del'>-		enum iwl_fw_ini_region_type type;</div><div class='ctx'> 		struct iwl_fw_ini_region_cfg *reg;</div><div class='ctx'> 		struct iwl_dump_ini_mem_ops ops;</div><div class='ctx'> </div><div class='hunk'>@@ -1711,15 +1818,19 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		if (!reg)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		type = le32_to_cpu(reg-&gt;region_type);</div><div class='del'>-		switch (type) {</div><div class='add'>+		/* currently the driver supports always on domain only */</div><div class='add'>+		if (le32_to_cpu(reg-&gt;domain) != IWL_FW_INI_DBG_DOMAIN_ALWAYS_ON)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (le32_to_cpu(reg-&gt;region_type)) {</div><div class='ctx'> 		case IWL_FW_INI_REGION_DEVICE_MEMORY:</div><div class='del'>-		case IWL_FW_INI_REGION_INTERNAL_BUFFER:</div><div class='add'>+		case IWL_FW_INI_REGION_LMAC_ERROR_TABLE:</div><div class='add'>+		case IWL_FW_INI_REGION_UMAC_ERROR_TABLE:</div><div class='ctx'> 			ops.get_num_of_ranges = iwl_dump_ini_mem_ranges;</div><div class='ctx'> 			ops.get_size = iwl_dump_ini_mem_get_size;</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;</div><div class='ctx'> 			ops.fill_range = iwl_dump_ini_dev_mem_iter;</div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_FW_INI_REGION_PERIPHERY_MAC:</div><div class='ctx'> 		case IWL_FW_INI_REGION_PERIPHERY_PHY:</div><div class='hunk'>@@ -1728,16 +1839,23 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			ops.get_size = iwl_dump_ini_mem_get_size;</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;</div><div class='ctx'> 			ops.fill_range = iwl_dump_ini_prph_iter;</div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_FW_INI_REGION_DRAM_BUFFER:</div><div class='ctx'> 			ops.get_num_of_ranges = iwl_dump_ini_mon_dram_ranges;</div><div class='ctx'> 			ops.get_size = iwl_dump_ini_mon_dram_get_size;</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_mon_dram_fill_header;</div><div class='ctx'> 			ops.fill_range = iwl_dump_ini_mon_dram_iter;</div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			break;</div><div class='del'>-		case IWL_FW_INI_REGION_PAGING: {</div><div class='add'>+		case IWL_FW_INI_REGION_INTERNAL_BUFFER:</div><div class='add'>+			ops.get_num_of_ranges = iwl_dump_ini_mem_ranges;</div><div class='add'>+			ops.get_size = iwl_dump_ini_mon_smem_get_size;</div><div class='add'>+			ops.fill_mem_hdr = iwl_dump_ini_mon_smem_fill_header;</div><div class='add'>+			ops.fill_range = iwl_dump_ini_dev_mem_iter;</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='add'>+			break;</div><div class='add'>+		case IWL_FW_INI_REGION_PAGING:</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;</div><div class='ctx'> 			if (iwl_fw_dbg_is_paging_enabled(fwrt)) {</div><div class='ctx'> 				ops.get_num_of_ranges =</div><div class='hunk'>@@ -1752,9 +1870,8 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				ops.fill_range = iwl_dump_ini_paging_gen2_iter;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		case IWL_FW_INI_REGION_TXF: {</div><div class='ctx'> 			struct iwl_ini_txf_iter_data iter = { .init = true };</div><div class='ctx'> 			void *fifo_iter = fwrt-&gt;dump.fifo_iter;</div><div class='hunk'>@@ -1764,7 +1881,7 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			ops.get_size = iwl_dump_ini_txf_get_size;</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_fifo_fill_header;</div><div class='ctx'> 			ops.fill_range = iwl_dump_ini_txf_iter;</div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			fwrt-&gt;dump.fifo_iter = fifo_iter;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1773,14 +1890,14 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			ops.get_size = iwl_dump_ini_rxf_get_size;</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_fifo_fill_header;</div><div class='ctx'> 			ops.fill_range = iwl_dump_ini_rxf_iter;</div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_FW_INI_REGION_CSR:</div><div class='ctx'> 			ops.get_num_of_ranges =	iwl_dump_ini_mem_ranges;</div><div class='ctx'> 			ops.get_size = iwl_dump_ini_mem_get_size;</div><div class='ctx'> 			ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;</div><div class='ctx'> 			ops.fill_range = iwl_dump_ini_csr_iter;</div><div class='del'>-			iwl_dump_ini_mem(fwrt, type, data, reg, &amp;ops);</div><div class='add'>+			iwl_dump_ini_mem(fwrt, data, reg, &amp;ops);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_FW_INI_REGION_DRAM_IMR:</div><div class='ctx'> 			/* This is undefined yet */</div><div class='hunk'>@@ -1791,34 +1908,29 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct iwl_fw_error_dump_file *</div><div class='del'>-_iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		       struct iwl_fw_dump_ptrs *fw_error_dump)</div><div class='add'>+iwl_fw_error_ini_dump_file(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	int size, id = le32_to_cpu(fwrt-&gt;dump.desc-&gt;trig_desc.type);</div><div class='add'>+	int size;</div><div class='ctx'> 	struct iwl_fw_error_dump_data *dump_data;</div><div class='ctx'> 	struct iwl_fw_error_dump_file *dump_file;</div><div class='ctx'> 	struct iwl_fw_ini_trigger *trigger;</div><div class='del'>-</div><div class='del'>-	if (id == FW_DBG_TRIGGER_FW_ASSERT)</div><div class='del'>-		id = IWL_FW_TRIGGER_ID_FW_ASSERT;</div><div class='add'>+	enum iwl_fw_ini_trigger_id id = fwrt-&gt;dump.ini_trig_id;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_fw_ini_trigger_on(fwrt, id))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	trigger = fwrt-&gt;dump.active_trigs[id].trig;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(*dump_file);</div><div class='del'>-	size += iwl_fw_ini_get_trigger_len(fwrt, trigger);</div><div class='del'>-</div><div class='add'>+	size = iwl_fw_ini_get_trigger_len(fwrt, trigger);</div><div class='ctx'> 	if (!size)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	size += sizeof(*dump_file);</div><div class='add'>+</div><div class='ctx'> 	dump_file = vzalloc(size);</div><div class='ctx'> 	if (!dump_file)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	fw_error_dump-&gt;fwrt_ptr = dump_file;</div><div class='del'>-</div><div class='ctx'> 	dump_file-&gt;barker = cpu_to_le32(IWL_FW_ERROR_DUMP_BARKER);</div><div class='ctx'> 	dump_data = (void *)dump_file-&gt;data;</div><div class='ctx'> 	dump_file-&gt;file_len = cpu_to_le32(size);</div><div class='hunk'>@@ -1828,47 +1940,27 @@ _iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return dump_file;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_dump_ptrs *fw_error_dump;</div><div class='add'>+	struct iwl_fw_dump_ptrs fw_error_dump = {};</div><div class='ctx'> 	struct iwl_fw_error_dump_file *dump_file;</div><div class='ctx'> 	struct scatterlist *sg_dump_data;</div><div class='ctx'> 	u32 file_len;</div><div class='ctx'> 	u32 dump_mask = fwrt-&gt;fw-&gt;dbg.dump_mask;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(fwrt, "WRT dump start\n");</div><div class='del'>-</div><div class='del'>-	/* there's no point in fw dump if the bus is dead */</div><div class='del'>-	if (test_bit(STATUS_TRANS_DEAD, &amp;fwrt-&gt;trans-&gt;status)) {</div><div class='del'>-		IWL_ERR(fwrt, "Skip fw error dump since bus is dead\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fw_error_dump = kzalloc(sizeof(*fw_error_dump), GFP_KERNEL);</div><div class='del'>-	if (!fw_error_dump)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (fwrt-&gt;trans-&gt;ini_valid)</div><div class='del'>-		dump_file = _iwl_fw_error_ini_dump(fwrt, fw_error_dump);</div><div class='del'>-	else</div><div class='del'>-		dump_file = _iwl_fw_error_dump(fwrt, fw_error_dump);</div><div class='del'>-</div><div class='del'>-	if (!dump_file) {</div><div class='del'>-		kfree(fw_error_dump);</div><div class='add'>+	dump_file = iwl_fw_error_dump_file(fwrt, &amp;fw_error_dump);</div><div class='add'>+	if (!dump_file)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!fwrt-&gt;trans-&gt;ini_valid &amp;&amp; fwrt-&gt;dump.monitor_only)</div><div class='ctx'> 		dump_mask &amp;= IWL_FW_ERROR_DUMP_FW_MONITOR;</div><div class='ctx'> </div><div class='del'>-	if (!fwrt-&gt;trans-&gt;ini_valid)</div><div class='del'>-		fw_error_dump-&gt;trans_ptr =</div><div class='del'>-			iwl_trans_dump_data(fwrt-&gt;trans, dump_mask);</div><div class='del'>-</div><div class='add'>+	fw_error_dump.trans_ptr = iwl_trans_dump_data(fwrt-&gt;trans, dump_mask);</div><div class='ctx'> 	file_len = le32_to_cpu(dump_file-&gt;file_len);</div><div class='del'>-	fw_error_dump-&gt;fwrt_len = file_len;</div><div class='del'>-	if (fw_error_dump-&gt;trans_ptr) {</div><div class='del'>-		file_len += fw_error_dump-&gt;trans_ptr-&gt;len;</div><div class='add'>+	fw_error_dump.fwrt_len = file_len;</div><div class='add'>+</div><div class='add'>+	if (fw_error_dump.trans_ptr) {</div><div class='add'>+		file_len += fw_error_dump.trans_ptr-&gt;len;</div><div class='ctx'> 		dump_file-&gt;file_len = cpu_to_le32(file_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1876,27 +1968,49 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	if (sg_dump_data) {</div><div class='ctx'> 		sg_pcopy_from_buffer(sg_dump_data,</div><div class='ctx'> 				     sg_nents(sg_dump_data),</div><div class='del'>-				     fw_error_dump-&gt;fwrt_ptr,</div><div class='del'>-				     fw_error_dump-&gt;fwrt_len, 0);</div><div class='del'>-		if (fw_error_dump-&gt;trans_ptr)</div><div class='add'>+				     fw_error_dump.fwrt_ptr,</div><div class='add'>+				     fw_error_dump.fwrt_len, 0);</div><div class='add'>+		if (fw_error_dump.trans_ptr)</div><div class='ctx'> 			sg_pcopy_from_buffer(sg_dump_data,</div><div class='ctx'> 					     sg_nents(sg_dump_data),</div><div class='del'>-					     fw_error_dump-&gt;trans_ptr-&gt;data,</div><div class='del'>-					     fw_error_dump-&gt;trans_ptr-&gt;len,</div><div class='del'>-					     fw_error_dump-&gt;fwrt_len);</div><div class='add'>+					     fw_error_dump.trans_ptr-&gt;data,</div><div class='add'>+					     fw_error_dump.trans_ptr-&gt;len,</div><div class='add'>+					     fw_error_dump.fwrt_len);</div><div class='ctx'> 		dev_coredumpsg(fwrt-&gt;trans-&gt;dev, sg_dump_data, file_len,</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='del'>-	vfree(fw_error_dump-&gt;fwrt_ptr);</div><div class='del'>-	vfree(fw_error_dump-&gt;trans_ptr);</div><div class='del'>-	kfree(fw_error_dump);</div><div class='add'>+	vfree(fw_error_dump.fwrt_ptr);</div><div class='add'>+	vfree(fw_error_dump.trans_ptr);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	iwl_fw_free_dump_desc(fwrt);</div><div class='ctx'> 	clear_bit(IWL_FWRT_STATUS_DUMPING, &amp;fwrt-&gt;status);</div><div class='del'>-	IWL_DEBUG_INFO(fwrt, "WRT dump done\n");</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_fw_error_dump);</div><div class='add'>+</div><div class='add'>+static void iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_error_dump_file *dump_file;</div><div class='add'>+	struct scatterlist *sg_dump_data;</div><div class='add'>+	u32 file_len;</div><div class='add'>+</div><div class='add'>+	dump_file = iwl_fw_error_ini_dump_file(fwrt);</div><div class='add'>+	if (!dump_file)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	file_len = le32_to_cpu(dump_file-&gt;file_len);</div><div class='add'>+</div><div class='add'>+	sg_dump_data = alloc_sgtable(file_len);</div><div class='add'>+	if (sg_dump_data) {</div><div class='add'>+		sg_pcopy_from_buffer(sg_dump_data, sg_nents(sg_dump_data),</div><div class='add'>+				     dump_file, file_len, 0);</div><div class='add'>+		dev_coredumpsg(fwrt-&gt;trans-&gt;dev, sg_dump_data, file_len,</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+	vfree(dump_file);</div><div class='add'>+out:</div><div class='add'>+	fwrt-&gt;dump.ini_trig_id = IWL_FW_TRIGGER_ID_INVALID;</div><div class='add'>+	clear_bit(IWL_FWRT_STATUS_DUMPING, &amp;fwrt-&gt;status);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> const struct iwl_fw_dump_desc iwl_dump_desc_assert = {</div><div class='ctx'> 	.trig_desc = {</div><div class='hunk'>@@ -1910,6 +2024,17 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			    bool monitor_only,</div><div class='ctx'> 			    unsigned int delay)</div><div class='ctx'> {</div><div class='add'>+	u32 trig_type = le32_to_cpu(desc-&gt;trig_desc.type);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;ini_valid) {</div><div class='add'>+		ret = iwl_fw_dbg_ini_collect(fwrt, trig_type);</div><div class='add'>+		if (!ret)</div><div class='add'>+			iwl_fw_free_dump_desc(fwrt);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (test_and_set_bit(IWL_FWRT_STATUS_DUMPING, &amp;fwrt-&gt;status))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='hunk'>@@ -1942,23 +2067,19 @@ int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	iwl_dump_error_desc-&gt;len = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_fw_dbg_collect_desc(fwrt, iwl_dump_error_desc, false, 0);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (ret)</div><div class='ctx'> 		kfree(iwl_dump_error_desc);</div><div class='del'>-	} else {</div><div class='del'>-		set_bit(STATUS_FW_WAIT_DUMP, &amp;fwrt-&gt;trans-&gt;status);</div><div class='del'>-</div><div class='del'>-		/* trigger nmi to halt the fw */</div><div class='del'>-		iwl_force_nmi(fwrt-&gt;trans);</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		iwl_trans_sync_nmi(fwrt-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_dbg_error_collect);</div><div class='ctx'> </div><div class='del'>-int _iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			enum iwl_fw_dbg_trigger trig,</div><div class='del'>-			const char *str, size_t len,</div><div class='del'>-			struct iwl_fw_dbg_trigger_tlv *trigger)</div><div class='add'>+int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='add'>+		       enum iwl_fw_dbg_trigger trig,</div><div class='add'>+		       const char *str, size_t len,</div><div class='add'>+		       struct iwl_fw_dbg_trigger_tlv *trigger)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_dump_desc *desc;</div><div class='ctx'> 	unsigned int delay = 0;</div><div class='hunk'>@@ -1995,50 +2116,73 @@ int _iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	return iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay);</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(_iwl_fw_dbg_collect);</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect);</div><div class='ctx'> </div><div class='del'>-int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		       u32 id, const char *str, size_t len)</div><div class='add'>+int _iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			    enum iwl_fw_ini_trigger_id id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_dump_desc *desc;</div><div class='ctx'> 	struct iwl_fw_ini_active_triggers *active;</div><div class='ctx'> 	u32 occur, delay;</div><div class='ctx'> </div><div class='del'>-	if (!fwrt-&gt;trans-&gt;ini_valid)</div><div class='del'>-		return _iwl_fw_dbg_collect(fwrt, id, str, len, NULL);</div><div class='del'>-</div><div class='del'>-	if (id == FW_DBG_TRIGGER_USER)</div><div class='del'>-		id = IWL_FW_TRIGGER_ID_USER_TRIGGER;</div><div class='add'>+	if (WARN_ON(!iwl_fw_ini_trigger_on(fwrt, id)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	active = &amp;fwrt-&gt;dump.active_trigs[id];</div><div class='add'>+	if (test_and_set_bit(IWL_FWRT_STATUS_DUMPING, &amp;fwrt-&gt;status))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!active-&gt;active))</div><div class='add'>+	if (!iwl_fw_ini_trigger_on(fwrt, id)) {</div><div class='add'>+		IWL_WARN(fwrt, "WRT: Trigger %d is not active, aborting dump\n",</div><div class='add'>+			 id);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	active = &amp;fwrt-&gt;dump.active_trigs[id];</div><div class='ctx'> 	delay = le32_to_cpu(active-&gt;trig-&gt;dump_delay);</div><div class='ctx'> 	occur = le32_to_cpu(active-&gt;trig-&gt;occurrences);</div><div class='ctx'> 	if (!occur)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	active-&gt;trig-&gt;occurrences = cpu_to_le32(--occur);</div><div class='add'>+</div><div class='ctx'> 	if (le32_to_cpu(active-&gt;trig-&gt;force_restart)) {</div><div class='del'>-		IWL_WARN(fwrt, "Force restart: trigger %d fired.\n", id);</div><div class='add'>+		IWL_WARN(fwrt, "WRT: force restart: trigger %d fired.\n", id);</div><div class='ctx'> 		iwl_force_nmi(fwrt-&gt;trans);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);</div><div class='del'>-	if (!desc)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (test_and_set_bit(IWL_FWRT_STATUS_DUMPING, &amp;fwrt-&gt;status))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	active-&gt;trig-&gt;occurrences = cpu_to_le32(--occur);</div><div class='add'>+	fwrt-&gt;dump.ini_trig_id = id;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;len = len;</div><div class='del'>-	desc-&gt;trig_desc.type = cpu_to_le32(id);</div><div class='del'>-	memcpy(desc-&gt;trig_desc.data, str, len);</div><div class='add'>+	IWL_WARN(fwrt, "WRT: collecting data: ini trigger %d fired.\n", id);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;fwrt-&gt;dump.wk, usecs_to_jiffies(delay));</div><div class='ctx'> </div><div class='del'>-	return iwl_fw_dbg_collect_desc(fwrt, desc, true, delay);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect);</div><div class='add'>+IWL_EXPORT_SYMBOL(_iwl_fw_dbg_ini_collect);</div><div class='add'>+</div><div class='add'>+int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt, u32 legacy_trigger_id)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	switch (legacy_trigger_id) {</div><div class='add'>+	case FW_DBG_TRIGGER_FW_ASSERT:</div><div class='add'>+	case FW_DBG_TRIGGER_ALIVE_TIMEOUT:</div><div class='add'>+	case FW_DBG_TRIGGER_DRIVER:</div><div class='add'>+		id = IWL_FW_TRIGGER_ID_FW_ASSERT;</div><div class='add'>+		break;</div><div class='add'>+	case FW_DBG_TRIGGER_USER:</div><div class='add'>+		id = IWL_FW_TRIGGER_ID_USER_TRIGGER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return _iwl_fw_dbg_ini_collect(fwrt, id);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fw_dbg_ini_collect);</div><div class='ctx'> </div><div class='ctx'> int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			    struct iwl_fw_dbg_trigger_tlv *trigger,</div><div class='hunk'>@@ -2066,8 +2210,8 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		len = strlen(buf) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = _iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger-&gt;id), buf, len,</div><div class='del'>-				  trigger);</div><div class='add'>+	ret = iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger-&gt;id), buf, len,</div><div class='add'>+				 trigger);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2141,9 +2285,20 @@ void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* there's no point in fw dump if the bus is dead */</div><div class='add'>+	if (test_bit(STATUS_TRANS_DEAD, &amp;fwrt-&gt;trans-&gt;status)) {</div><div class='add'>+		IWL_ERR(fwrt, "Skip fw error dump since bus is dead\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	iwl_fw_dbg_stop_recording(fwrt, &amp;params);</div><div class='ctx'> </div><div class='del'>-	iwl_fw_error_dump(fwrt);</div><div class='add'>+	IWL_DEBUG_FW_INFO(fwrt, "WRT: data collection start\n");</div><div class='add'>+	if (fwrt-&gt;trans-&gt;ini_valid)</div><div class='add'>+		iwl_fw_error_ini_dump(fwrt);</div><div class='add'>+	else</div><div class='add'>+		iwl_fw_error_dump(fwrt);</div><div class='add'>+	IWL_DEBUG_FW_INFO(fwrt, "WRT: data collection done\n");</div><div class='ctx'> </div><div class='ctx'> 	/* start recording again if the firmware is not crashed */</div><div class='ctx'> 	if (!test_bit(STATUS_FW_ERROR, &amp;fwrt-&gt;trans-&gt;status) &amp;&amp;</div><div class='hunk'>@@ -2213,12 +2368,14 @@ iwl_fw_dbg_buffer_allocation(struct iwl_fw_runtime *fwrt, u32 size)</div><div class='ctx'> 	if (!virtual_addr)</div><div class='ctx'> 		IWL_ERR(fwrt, "Failed to allocate debug memory\n");</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_FW(trans,</div><div class='add'>+		     "Allocated DRAM buffer[%d], size=0x%x\n",</div><div class='add'>+		     trans-&gt;num_blocks, size);</div><div class='add'>+</div><div class='ctx'> 	trans-&gt;fw_mon[trans-&gt;num_blocks].block = virtual_addr;</div><div class='ctx'> 	trans-&gt;fw_mon[trans-&gt;num_blocks].physical = phys_addr;</div><div class='ctx'> 	trans-&gt;fw_mon[trans-&gt;num_blocks].size = size;</div><div class='ctx'> 	trans-&gt;num_blocks++;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_FW(trans, "Allocated debug block of size %d\n", size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_fw_dbg_buffer_apply(struct iwl_fw_runtime *fwrt,</div><div class='hunk'>@@ -2241,11 +2398,15 @@ static void iwl_fw_dbg_buffer_apply(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	if (buf_location == IWL_FW_INI_LOCATION_SRAM_PATH) {</div><div class='ctx'> 		if (!WARN(pnt != IWL_FW_INI_APPLY_EARLY,</div><div class='del'>-			  "Invalid apply point %d for SMEM buffer allocation",</div><div class='del'>-			  pnt))</div><div class='add'>+			  "WRT: Invalid apply point %d for SMEM buffer allocation, aborting\n",</div><div class='add'>+			  pnt)) {</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "WRT: applying SMEM buffer destination\n");</div><div class='add'>+</div><div class='ctx'> 			/* set sram monitor by enabling bit 7 */</div><div class='ctx'> 			iwl_set_bit(fwrt-&gt;trans, CSR_HW_IF_CONFIG_REG,</div><div class='ctx'> 				    CSR_HW_IF_CONFIG_REG_BIT_MONITOR_SRAM);</div><div class='add'>+		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2264,6 +2425,9 @@ static void iwl_fw_dbg_buffer_apply(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	if (trans-&gt;num_blocks == 1)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_FW(trans,</div><div class='add'>+		     "WRT: applying DRAM buffer[%d] destination\n", block_idx);</div><div class='add'>+</div><div class='ctx'> 	cmd-&gt;num_frags = cpu_to_le32(1);</div><div class='ctx'> 	cmd-&gt;fragments[0].address =</div><div class='ctx'> 		cpu_to_le64(trans-&gt;fw_mon[block_idx].physical);</div><div class='hunk'>@@ -2275,7 +2439,8 @@ static void iwl_fw_dbg_buffer_apply(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_fw_dbg_send_hcmd(struct iwl_fw_runtime *fwrt,</div><div class='del'>-				 struct iwl_ucode_tlv *tlv)</div><div class='add'>+				 struct iwl_ucode_tlv *tlv,</div><div class='add'>+				 bool ext)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_hcmd_tlv *hcmd_tlv = (void *)&amp;tlv-&gt;data[0];</div><div class='ctx'> 	struct iwl_fw_ini_hcmd *data = &amp;hcmd_tlv-&gt;hcmd;</div><div class='hunk'>@@ -2287,6 +2452,14 @@ static void iwl_fw_dbg_send_hcmd(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		.data = { data-&gt;data, },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* currently the driver supports always on domain only */</div><div class='add'>+	if (le32_to_cpu(hcmd_tlv-&gt;domain) != IWL_FW_INI_DBG_DOMAIN_ALWAYS_ON)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(fwrt,</div><div class='add'>+		     "WRT: ext=%d. Sending host command id=0x%x, group=0x%x\n",</div><div class='add'>+		     ext, data-&gt;id, data-&gt;group);</div><div class='add'>+</div><div class='ctx'> 	iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2296,24 +2469,32 @@ static void iwl_fw_dbg_update_regions(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> {</div><div class='ctx'> 	void *iter = (void *)tlv-&gt;region_config;</div><div class='ctx'> 	int i, size = le32_to_cpu(tlv-&gt;num_regions);</div><div class='add'>+	const char *err_st =</div><div class='add'>+		"WRT: ext=%d. Invalid region %s %d for apply point %d\n";</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; size; i++) {</div><div class='ctx'> 		struct iwl_fw_ini_region_cfg *reg = iter, **active;</div><div class='ctx'> 		int id = le32_to_cpu(reg-&gt;region_id);</div><div class='ctx'> 		u32 type = le32_to_cpu(reg-&gt;region_type);</div><div class='ctx'> </div><div class='del'>-		if (WARN(id &gt;= ARRAY_SIZE(fwrt-&gt;dump.active_regs),</div><div class='del'>-			 "Invalid region id %d for apply point %d\n", id, pnt))</div><div class='add'>+		if (WARN(id &gt;= ARRAY_SIZE(fwrt-&gt;dump.active_regs), err_st, ext,</div><div class='add'>+			 "id", id, pnt))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (WARN(type == 0 || type &gt;= IWL_FW_INI_REGION_NUM, err_st,</div><div class='add'>+			 ext, "type", type, pnt))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		active = &amp;fwrt-&gt;dump.active_regs[id];</div><div class='ctx'> </div><div class='ctx'> 		if (*active)</div><div class='del'>-			IWL_WARN(fwrt-&gt;trans, "region TLV %d override\n", id);</div><div class='add'>+			IWL_WARN(fwrt-&gt;trans,</div><div class='add'>+				 "WRT: ext=%d. Region id %d override\n",</div><div class='add'>+				 ext, id);</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_FW(fwrt,</div><div class='del'>-			     "%s: apply point %d, activating region ID %d\n",</div><div class='del'>-			     __func__, pnt, id);</div><div class='add'>+			     "WRT: ext=%d. Activating region id %d\n",</div><div class='add'>+			     ext, id);</div><div class='ctx'> </div><div class='ctx'> 		*active = reg;</div><div class='ctx'> </div><div class='hunk'>@@ -2321,7 +2502,15 @@ static void iwl_fw_dbg_update_regions(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		    type == IWL_FW_INI_REGION_RXF)</div><div class='ctx'> 			iter += le32_to_cpu(reg-&gt;fifos.num_of_registers) *</div><div class='ctx'> 				sizeof(__le32);</div><div class='del'>-		else if (type != IWL_FW_INI_REGION_DRAM_BUFFER)</div><div class='add'>+		else if (type == IWL_FW_INI_REGION_DEVICE_MEMORY ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_PERIPHERY_MAC ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_PERIPHERY_PHY ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_PERIPHERY_AUX ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_INTERNAL_BUFFER ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_PAGING ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_CSR ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_LMAC_ERROR_TABLE ||</div><div class='add'>+			 type == IWL_FW_INI_REGION_UMAC_ERROR_TABLE)</div><div class='ctx'> 			iter += le32_to_cpu(reg-&gt;internal.num_of_ranges) *</div><div class='ctx'> 				sizeof(__le32);</div><div class='ctx'> </div><div class='hunk'>@@ -2340,7 +2529,8 @@ static int iwl_fw_dbg_trig_realloc(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	ptr = krealloc(active-&gt;trig, size, GFP_KERNEL);</div><div class='ctx'> 	if (!ptr) {</div><div class='del'>-		IWL_ERR(fwrt, "Failed to allocate memory for trigger %d\n", id);</div><div class='add'>+		IWL_ERR(fwrt, "WRT: Failed to allocate memory for trigger %d\n",</div><div class='add'>+			id);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	active-&gt;trig = ptr;</div><div class='hunk'>@@ -2364,7 +2554,9 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		u32 trig_regs_size = le32_to_cpu(trig-&gt;num_regions) *</div><div class='ctx'> 			sizeof(__le32);</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(id &gt;= ARRAY_SIZE(fwrt-&gt;dump.active_trigs)))</div><div class='add'>+		if (WARN(id &gt;= ARRAY_SIZE(fwrt-&gt;dump.active_trigs),</div><div class='add'>+			 "WRT: ext=%d. Invalid trigger id %d for apply point %d\n",</div><div class='add'>+			 ext, id, apply_point))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		active = &amp;fwrt-&gt;dump.active_trigs[id];</div><div class='hunk'>@@ -2372,6 +2564,10 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		if (!active-&gt;active) {</div><div class='ctx'> 			size_t trig_size = sizeof(*trig) + trig_regs_size;</div><div class='ctx'> </div><div class='add'>+			IWL_DEBUG_FW(fwrt,</div><div class='add'>+				     "WRT: ext=%d. Activating trigger %d\n",</div><div class='add'>+				     ext, id);</div><div class='add'>+</div><div class='ctx'> 			if (iwl_fw_dbg_trig_realloc(fwrt, active, id,</div><div class='ctx'> 						    trig_size))</div><div class='ctx'> 				goto next;</div><div class='hunk'>@@ -2390,8 +2586,16 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			int mem_to_add = trig_regs_size;</div><div class='ctx'> </div><div class='ctx'> 			if (region_override) {</div><div class='add'>+				IWL_DEBUG_FW(fwrt,</div><div class='add'>+					     "WRT: ext=%d. Trigger %d regions override\n",</div><div class='add'>+					     ext, id);</div><div class='add'>+</div><div class='ctx'> 				mem_to_add -= active_regs * sizeof(__le32);</div><div class='ctx'> 			} else {</div><div class='add'>+				IWL_DEBUG_FW(fwrt,</div><div class='add'>+					     "WRT: ext=%d. Trigger %d regions appending\n",</div><div class='add'>+					     ext, id);</div><div class='add'>+</div><div class='ctx'> 				offset += active_regs;</div><div class='ctx'> 				new_regs += active_regs;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2400,8 +2604,13 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 						    active-&gt;size + mem_to_add))</div><div class='ctx'> 				goto next;</div><div class='ctx'> </div><div class='del'>-			if (conf_override)</div><div class='add'>+			if (conf_override) {</div><div class='add'>+				IWL_DEBUG_FW(fwrt,</div><div class='add'>+					     "WRT: ext=%d. Trigger %d configuration override\n",</div><div class='add'>+					     ext, id);</div><div class='add'>+</div><div class='ctx'> 				memcpy(active-&gt;trig, trig, sizeof(*trig));</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			memcpy(active-&gt;trig-&gt;data + offset, trig-&gt;data,</div><div class='ctx'> 			       trig_regs_size);</div><div class='hunk'>@@ -2413,6 +2622,20 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			active-&gt;trig-&gt;occurrences = cpu_to_le32(-1);</div><div class='ctx'> </div><div class='ctx'> 		active-&gt;active = true;</div><div class='add'>+</div><div class='add'>+		if (id == IWL_FW_TRIGGER_ID_PERIODIC_TRIGGER) {</div><div class='add'>+			u32 collect_interval = le32_to_cpu(trig-&gt;trigger_data);</div><div class='add'>+</div><div class='add'>+			/* the minimum allowed interval is 50ms */</div><div class='add'>+			if (collect_interval &lt; 50) {</div><div class='add'>+				collect_interval = 50;</div><div class='add'>+				trig-&gt;trigger_data =</div><div class='add'>+					cpu_to_le32(collect_interval);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mod_timer(&amp;fwrt-&gt;dump.periodic_trig,</div><div class='add'>+				  jiffies + msecs_to_jiffies(collect_interval));</div><div class='add'>+		}</div><div class='ctx'> next:</div><div class='ctx'> 		iter += sizeof(*trig) + trig_regs_size;</div><div class='ctx'> </div><div class='hunk'>@@ -2442,11 +2665,11 @@ static void _iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_HCMD:</div><div class='ctx'> 			if (pnt &lt; IWL_FW_INI_APPLY_AFTER_ALIVE) {</div><div class='ctx'> 				IWL_ERR(fwrt,</div><div class='del'>-					"Invalid apply point %x for host command\n",</div><div class='del'>-					pnt);</div><div class='add'>+					"WRT: ext=%d. Invalid apply point %d for host command\n",</div><div class='add'>+					ext, pnt);</div><div class='ctx'> 				goto next;</div><div class='ctx'> 			}</div><div class='del'>-			iwl_fw_dbg_send_hcmd(fwrt, tlv);</div><div class='add'>+			iwl_fw_dbg_send_hcmd(fwrt, tlv, ext);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_REGIONS:</div><div class='ctx'> 			iwl_fw_dbg_update_regions(fwrt, ini_tlv, ext, pnt);</div><div class='hunk'>@@ -2457,7 +2680,9 @@ static void _iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			WARN_ONCE(1, "Invalid TLV %x for apply point\n", type);</div><div class='add'>+			WARN_ONCE(1,</div><div class='add'>+				  "WRT: ext=%d. Invalid TLV 0x%x for apply point\n",</div><div class='add'>+				  ext, type);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> next:</div><div class='hunk'>@@ -2471,6 +2696,8 @@ void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	void *data = &amp;fwrt-&gt;trans-&gt;apply_points[apply_point];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_FW(fwrt, "WRT: enabling apply point %d\n", apply_point);</div><div class='add'>+</div><div class='ctx'> 	if (apply_point == IWL_FW_INI_APPLY_EARLY) {</div><div class='ctx'> 		for (i = 0; i &lt; IWL_FW_INI_MAX_REGION_ID; i++)</div><div class='ctx'> 			fwrt-&gt;dump.active_regs[i] = NULL;</div><div class='hunk'>@@ -2489,24 +2716,34 @@ IWL_EXPORT_SYMBOL(iwl_fw_dbg_apply_point);</div><div class='ctx'> </div><div class='ctx'> void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	/* if the wait event timeout elapses instead of wake up then</div><div class='del'>-	 * the driver did not receive NMI interrupt and can not assume the FW</div><div class='del'>-	 * is halted</div><div class='del'>-	 */</div><div class='del'>-	int ret = wait_event_timeout(fwrt-&gt;trans-&gt;fw_halt_waitq,</div><div class='del'>-				     !test_bit(STATUS_FW_WAIT_DUMP,</div><div class='del'>-					       &amp;fwrt-&gt;trans-&gt;status),</div><div class='del'>-				     msecs_to_jiffies(2000));</div><div class='del'>-	if (!ret) {</div><div class='del'>-		/* failed to receive NMI interrupt, assuming the FW is stuck */</div><div class='del'>-		set_bit(STATUS_FW_ERROR, &amp;fwrt-&gt;trans-&gt;status);</div><div class='del'>-</div><div class='del'>-		clear_bit(STATUS_FW_WAIT_DUMP, &amp;fwrt-&gt;trans-&gt;status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assuming the op mode mutex is held at this point */</div><div class='add'>+	del_timer(&amp;fwrt-&gt;dump.periodic_trig);</div><div class='ctx'> 	iwl_fw_dbg_collect_sync(fwrt);</div><div class='ctx'> </div><div class='ctx'> 	iwl_trans_stop_device(fwrt-&gt;trans);</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fwrt_stop_device);</div><div class='add'>+</div><div class='add'>+void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_runtime *fwrt;</div><div class='add'>+	enum iwl_fw_ini_trigger_id id = IWL_FW_TRIGGER_ID_PERIODIC_TRIGGER;</div><div class='add'>+	int ret;</div><div class='add'>+	typeof(fwrt-&gt;dump) *dump_ptr = container_of(t, typeof(fwrt-&gt;dump),</div><div class='add'>+						    periodic_trig);</div><div class='add'>+</div><div class='add'>+	fwrt = container_of(dump_ptr, typeof(*fwrt), dump);</div><div class='add'>+</div><div class='add'>+	ret = _iwl_fw_dbg_ini_collect(fwrt, id);</div><div class='add'>+	if (!ret || ret == -EBUSY) {</div><div class='add'>+		struct iwl_fw_ini_trigger *trig =</div><div class='add'>+			fwrt-&gt;dump.active_trigs[id].trig;</div><div class='add'>+		u32 occur = le32_to_cpu(trig-&gt;occurrences);</div><div class='add'>+		u32 collect_interval = le32_to_cpu(trig-&gt;trigger_data);</div><div class='add'>+</div><div class='add'>+		if (!occur)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mod_timer(&amp;fwrt-&gt;dump.periodic_trig,</div><div class='add'>+			  jiffies + msecs_to_jiffies(collect_interval));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h<br/>index a199056234d3..2a9e560a906b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/dbg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/dbg.h</a></div><div class='hunk'>@@ -108,18 +108,17 @@ static inline void iwl_fw_free_dump_desc(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	fwrt-&gt;dump.umac_err_id = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			    const struct iwl_fw_dump_desc *desc,</div><div class='ctx'> 			    bool monitor_only, unsigned int delay);</div><div class='ctx'> int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			     enum iwl_fw_dbg_trigger trig_type);</div><div class='del'>-int _iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			enum iwl_fw_dbg_trigger trig,</div><div class='del'>-			const char *str, size_t len,</div><div class='del'>-			struct iwl_fw_dbg_trigger_tlv *trigger);</div><div class='add'>+int _iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			    enum iwl_fw_ini_trigger_id id);</div><div class='add'>+int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt, u32 legacy_trigger_id);</div><div class='ctx'> int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		       u32 id, const char *str, size_t len);</div><div class='add'>+		       enum iwl_fw_dbg_trigger trig, const char *str,</div><div class='add'>+		       size_t len, struct iwl_fw_dbg_trigger_tlv *trigger);</div><div class='ctx'> int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			    struct iwl_fw_dbg_trigger_tlv *trigger,</div><div class='ctx'> 			    const char *fmt, ...) __printf(3, 4);</div><div class='hunk'>@@ -229,10 +228,8 @@ iwl_fw_ini_trigger_on(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	struct iwl_fw_ini_trigger *trig;</div><div class='ctx'> 	u32 usec;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!fwrt-&gt;trans-&gt;ini_valid || id &gt;= IWL_FW_TRIGGER_ID_NUM ||</div><div class='del'>-	    !fwrt-&gt;dump.active_trigs[id].active)</div><div class='add'>+	if (!fwrt-&gt;trans-&gt;ini_valid || id == IWL_FW_TRIGGER_ID_INVALID ||</div><div class='add'>+	    id &gt;= IWL_FW_TRIGGER_ID_NUM || !fwrt-&gt;dump.active_trigs[id].active)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	trig = fwrt-&gt;dump.active_trigs[id].trig;</div><div class='hunk'>@@ -388,11 +385,13 @@ void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_fw_flush_dump(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='add'>+	del_timer(&amp;fwrt-&gt;dump.periodic_trig);</div><div class='ctx'> 	flush_delayed_work(&amp;fwrt-&gt;dump.wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_fw_cancel_dump(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='add'>+	del_timer(&amp;fwrt-&gt;dump.periodic_trig);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;fwrt-&gt;dump.wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -461,4 +460,15 @@ static inline void iwl_fw_umac_set_alive_err_table(struct iwl_trans *trans,</div><div class='ctx'> /* This bit is used to differentiate the legacy dump from the ini dump */</div><div class='ctx'> #define INI_DUMP_BIT BIT(31)</div><div class='ctx'> </div><div class='add'>+static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	if (fwrt-&gt;trans-&gt;ini_valid &amp;&amp; fwrt-&gt;trans-&gt;hw_error) {</div><div class='add'>+		_iwl_fw_dbg_ini_collect(fwrt, IWL_FW_TRIGGER_ID_FW_HW_ERROR);</div><div class='add'>+		fwrt-&gt;trans-&gt;hw_error = false;</div><div class='add'>+	} else {</div><div class='add'>+		iwl_fw_dbg_collect_desc(fwrt, &amp;iwl_dump_desc_assert, false, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t);</div><div class='ctx'> #endif  /* __iwl_fw_dbg_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h<br/>index 9b5077bd46c3..0feff4c33e39 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a></div><div class='hunk'>@@ -184,7 +184,7 @@ enum iwl_fw_error_dump_family {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_error_dump_info - info on the device / firmware</div><div class='del'>- * @device_family: the family of the device (7 / 8)</div><div class='add'>+ * @hw_type: the type of the device</div><div class='ctx'>  * @hw_step: the step of the device</div><div class='ctx'>  * @fw_human_readable: human readable FW version</div><div class='ctx'>  * @dev_human_readable: name of the device</div><div class='hunk'>@@ -196,7 +196,7 @@ enum iwl_fw_error_dump_family {</div><div class='ctx'>  *	if the dump collection was not initiated by an assert, the value is 0</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_error_dump_info {</div><div class='del'>-	__le32 device_family;</div><div class='add'>+	__le32 hw_type;</div><div class='ctx'> 	__le32 hw_step;</div><div class='ctx'> 	u8 fw_human_readable[FW_VER_HUMAN_READABLE_SZ];</div><div class='ctx'> 	u8 dev_human_readable[64];</div><div class='hunk'>@@ -211,6 +211,9 @@ struct iwl_fw_error_dump_info {</div><div class='ctx'>  * @fw_mon_wr_ptr: the position of the write pointer in the cyclic buffer</div><div class='ctx'>  * @fw_mon_base_ptr: base pointer of the data</div><div class='ctx'>  * @fw_mon_cycle_cnt: number of wraparounds</div><div class='add'>+ * @fw_mon_base_high_ptr: used in AX210 devices, the base adderss is 64 bit</div><div class='add'>+ *	so fw_mon_base_ptr holds LSB 32 bits and fw_mon_base_high_ptr hold</div><div class='add'>+ *	MSB 32 bits</div><div class='ctx'>  * @reserved: for future use</div><div class='ctx'>  * @data: captured data</div><div class='ctx'>  */</div><div class='hunk'>@@ -218,7 +221,8 @@ struct iwl_fw_error_dump_fw_mon {</div><div class='ctx'> 	__le32 fw_mon_wr_ptr;</div><div class='ctx'> 	__le32 fw_mon_base_ptr;</div><div class='ctx'> 	__le32 fw_mon_cycle_cnt;</div><div class='del'>-	__le32 reserved[3];</div><div class='add'>+	__le32 fw_mon_base_high_ptr;</div><div class='add'>+	__le32 reserved[2];</div><div class='ctx'> 	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -274,25 +278,33 @@ struct iwl_fw_error_dump_mem {</div><div class='ctx'> 	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define IWL_INI_DUMP_MEM_VER 1</div><div class='add'>+#define IWL_INI_DUMP_MONITOR_VER 1</div><div class='add'>+#define IWL_INI_DUMP_FIFO_VER 1</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_ini_error_dump_range - range of memory</div><div class='del'>- * @start_addr: the start address of this range</div><div class='ctx'>  * @range_data_size: the size of this range, in bytes</div><div class='add'>+ * @start_addr: the start address of this range</div><div class='ctx'>  * @data: the actual memory</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_error_dump_range {</div><div class='del'>-	__le32 start_addr;</div><div class='ctx'> 	__le32 range_data_size;</div><div class='add'>+	__le64 start_addr;</div><div class='ctx'> 	__le32 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_ini_error_dump_header - ini region dump header</div><div class='add'>+ * @version: dump version</div><div class='add'>+ * @region_id: id of the region</div><div class='ctx'>  * @num_of_ranges: number of ranges in this region</div><div class='ctx'>  * @name_len: number of bytes allocated to the name string of this region</div><div class='ctx'>  * @name: name of the region</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_error_dump_header {</div><div class='add'>+	__le32 version;</div><div class='add'>+	__le32 region_id;</div><div class='ctx'> 	__le32 num_of_ranges;</div><div class='ctx'> 	__le32 name_len;</div><div class='ctx'> 	u8 name[IWL_FW_INI_MAX_NAME];</div><div class='hunk'>@@ -312,12 +324,23 @@ struct iwl_fw_ini_error_dump {</div><div class='ctx'> #define IWL_RXF_UMAC_BIT BIT(31)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_fw_ini_error_dump_register - ini register dump</div><div class='add'>+ * @addr: address of the register</div><div class='add'>+ * @data: data of the register</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_ini_error_dump_register {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 data;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_fw_ini_fifo_error_dump_range - ini fifo range dump</div><div class='ctx'>  * @fifo_num: the fifo num. In case of rxf and umac rxf, set BIT(31) to</div><div class='ctx'>  *	distinguish between lmac and umac</div><div class='ctx'>  * @num_of_registers: num of registers to dump, dword size each</div><div class='del'>- * @range_data_size: the size of the registers and fifo data</div><div class='del'>- * @data: fifo data</div><div class='add'>+ * @range_data_size: the size of the data</div><div class='add'>+ * @data: consist of</div><div class='add'>+ *	num_of_registers * (register address + register value) + fifo data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_fifo_error_dump_range {</div><div class='ctx'> 	__le32 fifo_num;</div><div class='hunk'>@@ -351,13 +374,13 @@ struct iwl_fw_error_dump_rb {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_monitor_dram_dump - ini dram monitor dump</div><div class='add'>+ * struct iwl_fw_ini_monitor_dump - ini monitor dump</div><div class='ctx'>  * @header - header of the region</div><div class='del'>- * @write_ptr - write pointer position in the dram</div><div class='add'>+ * @write_ptr - write pointer position in the buffer</div><div class='ctx'>  * @cycle_cnt - cycles count</div><div class='ctx'>  * @ranges - the memory ranges of this this region</div><div class='ctx'>  */</div><div class='del'>-struct iwl_fw_ini_monitor_dram_dump {</div><div class='add'>+struct iwl_fw_ini_monitor_dump {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header header;</div><div class='ctx'> 	__le32 write_ptr;</div><div class='ctx'> 	__le32 cycle_cnt;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h<br/>index 641c95d03b15..de9243d30135 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/file.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/file.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a></div><div class='hunk'>@@ -93,7 +93,7 @@ struct iwl_ucode_header {</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_UCODE_INI_TLV_GROUP	BIT(24)</div><div class='add'>+#define IWL_UCODE_INI_TLV_GROUP	0x1000000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * new TLV uCode file layout</div><div class='hunk'>@@ -142,17 +142,22 @@ enum iwl_ucode_tlv_type {</div><div class='ctx'> 	IWL_UCODE_TLV_FW_DBG_DEST	= 38,</div><div class='ctx'> 	IWL_UCODE_TLV_FW_DBG_CONF	= 39,</div><div class='ctx'> 	IWL_UCODE_TLV_FW_DBG_TRIGGER	= 40,</div><div class='add'>+	IWL_UCODE_TLV_CMD_VERSIONS	= 48,</div><div class='ctx'> 	IWL_UCODE_TLV_FW_GSCAN_CAPA	= 50,</div><div class='ctx'> 	IWL_UCODE_TLV_FW_MEM_SEG	= 51,</div><div class='ctx'> 	IWL_UCODE_TLV_IML		= 52,</div><div class='ctx'> 	IWL_UCODE_TLV_UMAC_DEBUG_ADDRS	= 54,</div><div class='ctx'> 	IWL_UCODE_TLV_LMAC_DEBUG_ADDRS	= 55,</div><div class='ctx'> 	IWL_UCODE_TLV_FW_RECOVERY_INFO	= 57,</div><div class='del'>-	IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION	= IWL_UCODE_INI_TLV_GROUP | 0x1,</div><div class='del'>-	IWL_UCODE_TLV_TYPE_HCMD			= IWL_UCODE_INI_TLV_GROUP | 0x2,</div><div class='del'>-	IWL_UCODE_TLV_TYPE_REGIONS		= IWL_UCODE_INI_TLV_GROUP | 0x3,</div><div class='del'>-	IWL_UCODE_TLV_TYPE_TRIGGERS		= IWL_UCODE_INI_TLV_GROUP | 0x4,</div><div class='del'>-	IWL_UCODE_TLV_TYPE_DEBUG_FLOW		= IWL_UCODE_INI_TLV_GROUP | 0x5,</div><div class='add'>+	IWL_UCODE_TLV_FW_FSEQ_VERSION	= 60,</div><div class='add'>+</div><div class='add'>+	IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION	= IWL_UCODE_INI_TLV_GROUP + 0x1,</div><div class='add'>+	IWL_UCODE_TLV_DEBUG_BASE = IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION,</div><div class='add'>+	IWL_UCODE_TLV_TYPE_HCMD			= IWL_UCODE_INI_TLV_GROUP + 0x2,</div><div class='add'>+	IWL_UCODE_TLV_TYPE_REGIONS		= IWL_UCODE_INI_TLV_GROUP + 0x3,</div><div class='add'>+	IWL_UCODE_TLV_TYPE_TRIGGERS		= IWL_UCODE_INI_TLV_GROUP + 0x4,</div><div class='add'>+	IWL_UCODE_TLV_TYPE_DEBUG_FLOW		= IWL_UCODE_INI_TLV_GROUP + 0x5,</div><div class='add'>+	IWL_UCODE_TLV_DEBUG_MAX = IWL_UCODE_TLV_TYPE_DEBUG_FLOW,</div><div class='ctx'> </div><div class='ctx'> 	/* TLVs 0x1000-0x2000 are for internal driver usage */</div><div class='ctx'> 	IWL_UCODE_TLV_FW_DBG_DUMP_LST	= 0x1000,</div><div class='hunk'>@@ -272,8 +277,15 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;</div><div class='ctx'>  *	version of the beacon notification.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_BEACON_FILTER_V4: This ucode supports v4 of</div><div class='ctx'>  *	BEACON_FILTER_CONFIG_API_S_VER_4.</div><div class='add'>+ * @IWL_UCODE_TLV_API_REGULATORY_NVM_INFO: This ucode supports v4 of</div><div class='add'>+ *	REGULATORY_NVM_GET_INFO_RSP_API_S.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ: This ucode supports v7 of</div><div class='ctx'>  *	LOCATION_RANGE_REQ_CMD_API_S and v6 of LOCATION_RANGE_RESP_NTFY_API_S.</div><div class='add'>+ * @IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS: This ucode supports v2 of</div><div class='add'>+ *	SCAN_OFFLOAD_PROFILE_MATCH_RESULTS_S and v3 of</div><div class='add'>+ *	SCAN_OFFLOAD_PROFILES_QUERY_RSP_S.</div><div class='add'>+ * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of</div><div class='add'>+ *	STA_CONTEXT_DOT11AX_API_S</div><div class='ctx'>  *</div><div class='ctx'>  * @NUM_IWL_UCODE_TLV_API: number of bits used</div><div class='ctx'>  */</div><div class='hunk'>@@ -300,7 +312,12 @@ enum iwl_ucode_tlv_api {</div><div class='ctx'> 	IWL_UCODE_TLV_API_REDUCE_TX_POWER	= (__force iwl_ucode_tlv_api_t)45,</div><div class='ctx'> 	IWL_UCODE_TLV_API_SHORT_BEACON_NOTIF	= (__force iwl_ucode_tlv_api_t)46,</div><div class='ctx'> 	IWL_UCODE_TLV_API_BEACON_FILTER_V4      = (__force iwl_ucode_tlv_api_t)47,</div><div class='add'>+	IWL_UCODE_TLV_API_REGULATORY_NVM_INFO   = (__force iwl_ucode_tlv_api_t)48,</div><div class='ctx'> 	IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ     = (__force iwl_ucode_tlv_api_t)49,</div><div class='add'>+	IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS    = (__force iwl_ucode_tlv_api_t)50,</div><div class='add'>+	IWL_UCODE_TLV_API_MBSSID_HE		= (__force iwl_ucode_tlv_api_t)52,</div><div class='add'>+	IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE	= (__force iwl_ucode_tlv_api_t)53,</div><div class='add'>+	IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,</div><div class='ctx'> </div><div class='ctx'> 	NUM_IWL_UCODE_TLV_API</div><div class='ctx'> #ifdef __CHECKER__</div><div class='hunk'>@@ -350,6 +367,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;</div><div class='ctx'>  * IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD: firmware supports CSA command</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS: firmware supports ultra high band</div><div class='ctx'>  *	(6 GHz).</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_CS_MODIFY: firmware supports modify action CSA command</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT</div><div class='hunk'>@@ -420,6 +438,7 @@ enum iwl_ucode_tlv_capa {</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD		= (__force iwl_ucode_tlv_capa_t)46,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS		= (__force iwl_ucode_tlv_capa_t)48,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_FTM_CALIBRATED		= (__force iwl_ucode_tlv_capa_t)47,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_CS_MODIFY			= (__force iwl_ucode_tlv_capa_t)49,</div><div class='ctx'> </div><div class='ctx'> 	/* set 2 */</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE		= (__force iwl_ucode_tlv_capa_t)64,</div><div class='hunk'>@@ -925,4 +944,20 @@ struct iwl_fw_dbg_conf_tlv {</div><div class='ctx'> 	struct iwl_fw_dbg_conf_hcmd hcmd;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define IWL_FW_CMD_VER_UNKNOWN 99</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_cmd_version - firmware command version entry</div><div class='add'>+ * @cmd: command ID</div><div class='add'>+ * @group: group ID</div><div class='add'>+ * @cmd_ver: command version</div><div class='add'>+ * @notif_ver: notification version</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_cmd_version {</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 group;</div><div class='add'>+	u8 cmd_ver;</div><div class='add'>+	u8 notif_ver;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #endif  /* __iwl_fw_file_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.h b/drivers/net/wireless/intel/iwlwifi/fw/img.h<br/>index f4c5a4d73206..18ca5f152be6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/img.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/img.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/img.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/img.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -109,6 +109,9 @@ struct iwl_ucode_capabilities {</div><div class='ctx'> 	u32 error_log_size;</div><div class='ctx'> 	unsigned long _api[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_API)];</div><div class='ctx'> 	unsigned long _capa[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_CAPA)];</div><div class='add'>+</div><div class='add'>+	const struct iwl_fw_cmd_version *cmd_versions;</div><div class='add'>+	u32 n_cmd_versions;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/init.c b/drivers/net/wireless/intel/iwlwifi/fw/init.c<br/>index 7adf4e4e841a..4435c0ce3013 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/init.c</a></div><div class='hunk'>@@ -76,7 +76,8 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,</div><div class='ctx'> 	fwrt-&gt;ops_ctx = ops_ctx;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;fwrt-&gt;dump.wk, iwl_fw_error_dump_wk);</div><div class='ctx'> 	iwl_fwrt_dbgfs_register(fwrt, dbgfs_dir);</div><div class='del'>-	init_waitqueue_head(&amp;fwrt-&gt;trans-&gt;fw_halt_waitq);</div><div class='add'>+	timer_setup(&amp;fwrt-&gt;dump.periodic_trig,</div><div class='add'>+		    iwl_fw_dbg_periodic_trig_handler, 0);</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h<br/>index a5fe1a8ca426..a6402a0b3854 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/fw/runtime.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/fw/runtime.h</a></div><div class='hunk'>@@ -145,6 +145,8 @@ struct iwl_fw_runtime {</div><div class='ctx'> 		u32 lmac_err_id[MAX_NUM_LMAC];</div><div class='ctx'> 		u32 umac_err_id;</div><div class='ctx'> 		void *fifo_iter;</div><div class='add'>+		enum iwl_fw_ini_trigger_id ini_trig_id;</div><div class='add'>+		struct timer_list periodic_trig;</div><div class='ctx'> 	} dump;</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	struct {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h<br/>index f5f87773667b..f3e69edf8907 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a></div><div class='hunk'>@@ -383,6 +383,9 @@ struct iwl_csr_params {</div><div class='ctx'>  * @bisr_workaround: BISR hardware workaround (for 22260 series devices)</div><div class='ctx'>  * @min_txq_size: minimum number of slots required in a TX queue</div><div class='ctx'>  * @umac_prph_offset: offset to add to UMAC periphery address</div><div class='add'>+ * @uhb_supported: ultra high band channels supported</div><div class='add'>+ * @min_256_ba_txq_size: minimum number of slots required in a TX queue which</div><div class='add'>+ *	supports 256 BA aggregation</div><div class='ctx'>  *</div><div class='ctx'>  * We enable the driver to be backward compatible wrt. hardware features.</div><div class='ctx'>  * API differences in uCode shouldn't be handled here but through TLVs</div><div class='hunk'>@@ -433,7 +436,8 @@ struct iwl_cfg {</div><div class='ctx'> 	    gen2:1,</div><div class='ctx'> 	    cdb:1,</div><div class='ctx'> 	    dbgc_supported:1,</div><div class='del'>-	    bisr_workaround:1;</div><div class='add'>+	    bisr_workaround:1,</div><div class='add'>+	    uhb_supported:1;</div><div class='ctx'> 	u8 valid_tx_ant;</div><div class='ctx'> 	u8 valid_rx_ant;</div><div class='ctx'> 	u8 non_shared_ant;</div><div class='hunk'>@@ -450,6 +454,12 @@ struct iwl_cfg {</div><div class='ctx'> 	u32 d3_debug_data_length;</div><div class='ctx'> 	u32 min_txq_size;</div><div class='ctx'> 	u32 umac_prph_offset;</div><div class='add'>+	u32 fw_mon_smem_write_ptr_addr;</div><div class='add'>+	u32 fw_mon_smem_write_ptr_msk;</div><div class='add'>+	u32 fw_mon_smem_cycle_cnt_ptr_addr;</div><div class='add'>+	u32 fw_mon_smem_cycle_cnt_ptr_msk;</div><div class='add'>+	u32 gp2_reg_addr;</div><div class='add'>+	u32 min_256_ba_txq_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct iwl_csr_params iwl_csr_v1;</div><div class='hunk'>@@ -549,8 +559,9 @@ extern const struct iwl_cfg iwl22000_2ac_cfg_hr;</div><div class='ctx'> extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;</div><div class='ctx'> extern const struct iwl_cfg iwl22000_2ac_cfg_jf;</div><div class='ctx'> extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;</div><div class='add'>+extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;</div><div class='ctx'> extern const struct iwl_cfg iwl22000_2ax_cfg_hr;</div><div class='del'>-extern const struct iwl_cfg iwl22260_2ax_cfg;</div><div class='add'>+extern const struct iwl_cfg iwl_ax200_cfg_cc;</div><div class='ctx'> extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;</div><div class='ctx'> extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0;</div><div class='ctx'> extern const struct iwl_cfg killer1650x_2ax_cfg;</div><div class='hunk'>@@ -567,11 +578,11 @@ extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;</div><div class='ctx'> extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;</div><div class='ctx'> extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;</div><div class='ctx'> extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;</div><div class='del'>-extern const struct iwl_cfg iwl22560_2ax_cfg_su_cdb;</div><div class='ctx'> extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;</div><div class='ctx'> extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;</div><div class='ctx'> extern const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0;</div><div class='ctx'> extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;</div><div class='add'>+extern const struct iwl_cfg iwlax210_2ax_cfg_so_gf4_a0;</div><div class='ctx'> #endif /* CPTCFG_IWLMVM || CPTCFG_IWLFMAC */</div><div class='ctx'> </div><div class='ctx'> #endif /* __IWL_CONFIG_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h<br/>index aea6d03e545a..553554846009 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -290,6 +290,7 @@</div><div class='ctx'> /* HW REV */</div><div class='ctx'> #define CSR_HW_REV_DASH(_val)          (((_val) &amp; 0x0000003) &gt;&gt; 0)</div><div class='ctx'> #define CSR_HW_REV_STEP(_val)          (((_val) &amp; 0x000000C) &gt;&gt; 2)</div><div class='add'>+#define CSR_HW_REV_TYPE(_val)          (((_val) &amp; 0x000FFF0) &gt;&gt; 4)</div><div class='ctx'> </div><div class='ctx'> /* HW RFID */</div><div class='ctx'> #define CSR_HW_RFID_FLAVOR(_val)       (((_val) &amp; 0x000000F) &gt;&gt; 0)</div><div class='hunk'>@@ -327,6 +328,7 @@ enum {</div><div class='ctx'> #define CSR_HW_REV_TYPE_NONE		(0x00001F0)</div><div class='ctx'> #define CSR_HW_REV_TYPE_QNJ		(0x0000360)</div><div class='ctx'> #define CSR_HW_REV_TYPE_QNJ_B0		(0x0000364)</div><div class='add'>+#define CSR_HW_REV_TYPE_QUZ		(0x0000354)</div><div class='ctx'> #define CSR_HW_REV_TYPE_HR_CDB		(0x0000340)</div><div class='ctx'> #define CSR_HW_REV_TYPE_SO		(0x0000370)</div><div class='ctx'> #define CSR_HW_REV_TYPE_TY		(0x0000420)</div><div class='hunk'>@@ -336,6 +338,7 @@ enum {</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_HR		(0x0010A000)</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109F00)</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)</div><div class='add'>+#define CSR_HW_RF_ID_TYPE_GF4		(0x0010E000)</div><div class='ctx'> </div><div class='ctx'> /* HW_RF CHIP ID  */</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_CHIP_ID(_val) (((_val) &gt;&gt; 12) &amp; 0xFFF)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c<br/>index 5798f434f68f..ba66f7fba064 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * GPL LICENSE SUMMARY</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * BSD LICENSE</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -73,6 +73,9 @@ void iwl_fw_dbg_copy_tlv(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,</div><div class='ctx'> 	int copy_size = le32_to_cpu(tlv-&gt;length) + sizeof(*tlv);</div><div class='ctx'> 	int offset_size = copy_size;</div><div class='ctx'> </div><div class='add'>+	if (le32_to_cpu(header-&gt;tlv_version) != 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ONCE(apply_point &gt;= IWL_FW_INI_APPLY_NUM,</div><div class='ctx'> 		      "Invalid apply point id %d\n", apply_point))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -126,13 +129,17 @@ void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data,</div><div class='ctx'> 		len -= ALIGN(tlv_len, 4);</div><div class='ctx'> 		data += sizeof(*tlv) + ALIGN(tlv_len, 4);</div><div class='ctx'> </div><div class='del'>-		if (!(tlv_type &amp; IWL_UCODE_INI_TLV_GROUP))</div><div class='add'>+		if (tlv_type &lt; IWL_UCODE_TLV_DEBUG_BASE ||</div><div class='add'>+		    tlv_type &gt; IWL_UCODE_TLV_DEBUG_MAX)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		hdr = (void *)&amp;tlv-&gt;data[0];</div><div class='ctx'> 		apply = le32_to_cpu(hdr-&gt;apply_point);</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_FW(trans, "Read TLV %x, apply point %d\n",</div><div class='add'>+		if (le32_to_cpu(hdr-&gt;tlv_version) != 1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_FW(trans, "WRT: read TLV 0x%x, apply point %d\n",</div><div class='ctx'> 			     le32_to_cpu(tlv-&gt;type), apply);</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(apply &gt;= IWL_FW_INI_APPLY_NUM))</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h<br/>index 655ff5694560..d3ba6a1422ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-debug.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-debug.h</a></div><div class='hunk'>@@ -218,5 +218,7 @@ do {                                            			\</div><div class='ctx'> #define IWL_DEBUG_TPT(p, f, a...)	IWL_DEBUG(p, IWL_DL_TPT, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_RPM(p, f, a...)	IWL_DEBUG(p, IWL_DL_RPM, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_LAR(p, f, a...)	IWL_DEBUG(p, IWL_DL_LAR, f, ## a)</div><div class='add'>+#define IWL_DEBUG_FW_INFO(p, f, a...)		\</div><div class='add'>+		IWL_DEBUG(p, IWL_DL_INFO | IWL_DL_FW, f, ## a)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c<br/>index 689a65b11cc3..852d3cbfc719 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a></div><div class='hunk'>@@ -179,6 +179,7 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv)</div><div class='ctx'> 		kfree(drv-&gt;fw.dbg.trigger_tlv[i]);</div><div class='ctx'> 	kfree(drv-&gt;fw.dbg.mem_tlv);</div><div class='ctx'> 	kfree(drv-&gt;fw.iml);</div><div class='add'>+	kfree(drv-&gt;fw.ucode_capa.cmd_versions);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IWL_UCODE_TYPE_MAX; i++)</div><div class='ctx'> 		iwl_free_fw_img(drv, drv-&gt;fw.img + i);</div><div class='hunk'>@@ -252,8 +253,8 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)</div><div class='ctx'> 	snprintf(drv-&gt;firmware_name, sizeof(drv-&gt;firmware_name), "%s%s.ucode",</div><div class='ctx'> 		 cfg-&gt;fw_name_pre, tag);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(drv, "attempting to load firmware '%s'\n",</div><div class='del'>-		       drv-&gt;firmware_name);</div><div class='add'>+	IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",</div><div class='add'>+			  drv-&gt;firmware_name);</div><div class='ctx'> </div><div class='ctx'> 	return request_firmware_nowait(THIS_MODULE, 1, drv-&gt;firmware_name,</div><div class='ctx'> 				       drv-&gt;trans-&gt;dev,</div><div class='hunk'>@@ -1144,6 +1145,23 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			if (iwlwifi_mod_params.enable_ini)</div><div class='ctx'> 				iwl_fw_dbg_copy_tlv(drv-&gt;trans, tlv, false);</div><div class='ctx'> 			break;</div><div class='add'>+		case IWL_UCODE_TLV_CMD_VERSIONS:</div><div class='add'>+			if (tlv_len % sizeof(struct iwl_fw_cmd_version)) {</div><div class='add'>+				IWL_ERR(drv,</div><div class='add'>+					"Invalid length for command versions: %u\n",</div><div class='add'>+					tlv_len);</div><div class='add'>+				tlv_len /= sizeof(struct iwl_fw_cmd_version);</div><div class='add'>+				tlv_len *= sizeof(struct iwl_fw_cmd_version);</div><div class='add'>+			}</div><div class='add'>+			if (WARN_ON(capa-&gt;cmd_versions))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			capa-&gt;cmd_versions = kmemdup(tlv_data, tlv_len,</div><div class='add'>+						     GFP_KERNEL);</div><div class='add'>+			if (!capa-&gt;cmd_versions)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			capa-&gt;n_cmd_versions =</div><div class='add'>+				tlv_len / sizeof(struct iwl_fw_cmd_version);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1318,8 +1336,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 	if (!ucode_raw)</div><div class='ctx'> 		goto try_again;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n",</div><div class='del'>-		       drv-&gt;firmware_name, ucode_raw-&gt;size);</div><div class='add'>+	IWL_DEBUG_FW_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n",</div><div class='add'>+			  drv-&gt;firmware_name, ucode_raw-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that we got at least the API version number */</div><div class='ctx'> 	if (ucode_raw-&gt;size &lt; 4) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c<br/>index 87d6de7efdd2..d87a6bb3e456 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a></div><div class='hunk'>@@ -130,7 +130,7 @@ enum nvm_sku_bits {</div><div class='ctx'> /*</div><div class='ctx'>  * These are the channel numbers in the order that they are stored in the NVM</div><div class='ctx'>  */</div><div class='del'>-static const u8 iwl_nvm_channels[] = {</div><div class='add'>+static const u16 iwl_nvm_channels[] = {</div><div class='ctx'> 	/* 2.4 GHz */</div><div class='ctx'> 	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,</div><div class='ctx'> 	/* 5 GHz */</div><div class='hunk'>@@ -139,7 +139,7 @@ static const u8 iwl_nvm_channels[] = {</div><div class='ctx'> 	149, 153, 157, 161, 165</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u8 iwl_ext_nvm_channels[] = {</div><div class='add'>+static const u16 iwl_ext_nvm_channels[] = {</div><div class='ctx'> 	/* 2.4 GHz */</div><div class='ctx'> 	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,</div><div class='ctx'> 	/* 5 GHz */</div><div class='hunk'>@@ -148,14 +148,27 @@ static const u8 iwl_ext_nvm_channels[] = {</div><div class='ctx'> 	149, 153, 157, 161, 165, 169, 173, 177, 181</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const u16 iwl_uhb_nvm_channels[] = {</div><div class='add'>+	/* 2.4 GHz */</div><div class='add'>+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,</div><div class='add'>+	/* 5 GHz */</div><div class='add'>+	36, 40, 44, 48, 52, 56, 60, 64, 68, 72, 76, 80, 84, 88, 92,</div><div class='add'>+	96, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144,</div><div class='add'>+	149, 153, 157, 161, 165, 169, 173, 177, 181,</div><div class='add'>+	/* 6-7 GHz */</div><div class='add'>+	189, 193, 197, 201, 205, 209, 213, 217, 221, 225, 229, 233, 237, 241,</div><div class='add'>+	245, 249, 253, 257, 261, 265, 269, 273, 277, 281, 285, 289, 293, 297,</div><div class='add'>+	301, 305, 309, 313, 317, 321, 325, 329, 333, 337, 341, 345, 349, 353,</div><div class='add'>+	357, 361, 365, 369, 373, 377, 381, 385, 389, 393, 397, 401, 405, 409,</div><div class='add'>+	413, 417, 421</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_NVM_NUM_CHANNELS		ARRAY_SIZE(iwl_nvm_channels)</div><div class='ctx'> #define IWL_NVM_NUM_CHANNELS_EXT	ARRAY_SIZE(iwl_ext_nvm_channels)</div><div class='add'>+#define IWL_NVM_NUM_CHANNELS_UHB	ARRAY_SIZE(iwl_uhb_nvm_channels)</div><div class='ctx'> #define NUM_2GHZ_CHANNELS		14</div><div class='del'>-#define NUM_2GHZ_CHANNELS_EXT	14</div><div class='ctx'> #define FIRST_2GHZ_HT_MINUS		5</div><div class='ctx'> #define LAST_2GHZ_HT_PLUS		9</div><div class='del'>-#define LAST_5GHZ_HT			165</div><div class='del'>-#define LAST_5GHZ_HT_FAMILY_8000	181</div><div class='ctx'> #define N_HW_ADDR_MASK			0xF</div><div class='ctx'> </div><div class='ctx'> /* rate data (static) */</div><div class='hunk'>@@ -213,7 +226,7 @@ enum iwl_nvm_channel_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_nvm_print_channel_flags(struct device *dev, u32 level,</div><div class='del'>-					       int chan, u16 flags)</div><div class='add'>+					       int chan, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> #define CHECK_AND_PRINT_I(x)	\</div><div class='ctx'> 	((flags &amp; NVM_CHANNEL_##x) ? " " #x : "")</div><div class='hunk'>@@ -244,20 +257,16 @@ static inline void iwl_nvm_print_channel_flags(struct device *dev, u32 level,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,</div><div class='del'>-				 u16 nvm_flags, const struct iwl_cfg *cfg)</div><div class='add'>+				 u32 nvm_flags, const struct iwl_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 flags = IEEE80211_CHAN_NO_HT40;</div><div class='del'>-	u32 last_5ghz_ht = LAST_5GHZ_HT;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;nvm_type == IWL_NVM_EXT)</div><div class='del'>-		last_5ghz_ht = LAST_5GHZ_HT_FAMILY_8000;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_5ghz &amp;&amp; (nvm_flags &amp; NVM_CHANNEL_40MHZ)) {</div><div class='ctx'> 		if (ch_num &lt;= LAST_2GHZ_HT_PLUS)</div><div class='ctx'> 			flags &amp;= ~IEEE80211_CHAN_NO_HT40PLUS;</div><div class='ctx'> 		if (ch_num &gt;= FIRST_2GHZ_HT_MINUS)</div><div class='ctx'> 			flags &amp;= ~IEEE80211_CHAN_NO_HT40MINUS;</div><div class='del'>-	} else if (ch_num &lt;= last_5ghz_ht &amp;&amp; (nvm_flags &amp; NVM_CHANNEL_40MHZ)) {</div><div class='add'>+	} else if (nvm_flags &amp; NVM_CHANNEL_40MHZ) {</div><div class='ctx'> 		if ((ch_idx - NUM_2GHZ_CHANNELS) % 2 == 0)</div><div class='ctx'> 			flags &amp;= ~IEEE80211_CHAN_NO_HT40PLUS;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -292,30 +301,36 @@ static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,</div><div class='ctx'> </div><div class='ctx'> static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 				struct iwl_nvm_data *data,</div><div class='del'>-				const __le16 * const nvm_ch_flags,</div><div class='del'>-				u32 sbands_flags)</div><div class='add'>+				const void * const nvm_ch_flags,</div><div class='add'>+				u32 sbands_flags, bool v4)</div><div class='ctx'> {</div><div class='ctx'> 	int ch_idx;</div><div class='ctx'> 	int n_channels = 0;</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='del'>-	u16 ch_flags;</div><div class='del'>-	int num_of_ch, num_2ghz_channels;</div><div class='del'>-	const u8 *nvm_chan;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;nvm_type != IWL_NVM_EXT) {</div><div class='del'>-		num_of_ch = IWL_NVM_NUM_CHANNELS;</div><div class='del'>-		nvm_chan = &amp;iwl_nvm_channels[0];</div><div class='del'>-		num_2ghz_channels = NUM_2GHZ_CHANNELS;</div><div class='del'>-	} else {</div><div class='add'>+	u32 ch_flags;</div><div class='add'>+	int num_of_ch, num_2ghz_channels = NUM_2GHZ_CHANNELS;</div><div class='add'>+	const u16 *nvm_chan;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;uhb_supported) {</div><div class='add'>+		num_of_ch = IWL_NVM_NUM_CHANNELS_UHB;</div><div class='add'>+		nvm_chan = iwl_uhb_nvm_channels;</div><div class='add'>+	} else if (cfg-&gt;nvm_type == IWL_NVM_EXT) {</div><div class='ctx'> 		num_of_ch = IWL_NVM_NUM_CHANNELS_EXT;</div><div class='del'>-		nvm_chan = &amp;iwl_ext_nvm_channels[0];</div><div class='del'>-		num_2ghz_channels = NUM_2GHZ_CHANNELS_EXT;</div><div class='add'>+		nvm_chan = iwl_ext_nvm_channels;</div><div class='add'>+	} else {</div><div class='add'>+		num_of_ch = IWL_NVM_NUM_CHANNELS;</div><div class='add'>+		nvm_chan = iwl_nvm_channels;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (ch_idx = 0; ch_idx &lt; num_of_ch; ch_idx++) {</div><div class='ctx'> 		bool is_5ghz = (ch_idx &gt;= num_2ghz_channels);</div><div class='ctx'> </div><div class='del'>-		ch_flags = __le16_to_cpup(nvm_ch_flags + ch_idx);</div><div class='add'>+		if (v4)</div><div class='add'>+			ch_flags =</div><div class='add'>+				__le32_to_cpup((__le32 *)nvm_ch_flags + ch_idx);</div><div class='add'>+		else</div><div class='add'>+			ch_flags =</div><div class='add'>+				__le16_to_cpup((__le16 *)nvm_ch_flags + ch_idx);</div><div class='ctx'> </div><div class='ctx'> 		if (is_5ghz &amp;&amp; !data-&gt;sku_cap_band_52ghz_enable)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -636,12 +651,7 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = {</div><div class='ctx'> static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband,</div><div class='ctx'> 				 u8 tx_chains, u8 rx_chains)</div><div class='ctx'> {</div><div class='del'>-	if (sband-&gt;band == NL80211_BAND_2GHZ ||</div><div class='del'>-	    sband-&gt;band == NL80211_BAND_5GHZ)</div><div class='del'>-		sband-&gt;iftype_data = iwl_he_capa;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-</div><div class='add'>+	sband-&gt;iftype_data = iwl_he_capa;</div><div class='ctx'> 	sband-&gt;n_iftype_data = ARRAY_SIZE(iwl_he_capa);</div><div class='ctx'> </div><div class='ctx'> 	/* If not 2x2, we need to indicate 1x1 in the Midamble RX Max NSTS */</div><div class='hunk'>@@ -661,15 +671,15 @@ static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband,</div><div class='ctx'> </div><div class='ctx'> static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 			    struct iwl_nvm_data *data,</div><div class='del'>-			    const __le16 *nvm_ch_flags, u8 tx_chains,</div><div class='del'>-			    u8 rx_chains, u32 sbands_flags)</div><div class='add'>+			    const void *nvm_ch_flags, u8 tx_chains,</div><div class='add'>+			    u8 rx_chains, u32 sbands_flags, bool v4)</div><div class='ctx'> {</div><div class='ctx'> 	int n_channels;</div><div class='ctx'> 	int n_used = 0;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> </div><div class='ctx'> 	n_channels = iwl_init_channel_map(dev, cfg, data, nvm_ch_flags,</div><div class='del'>-					  sbands_flags);</div><div class='add'>+					  sbands_flags, v4);</div><div class='ctx'> 	sband = &amp;data-&gt;bands[NL80211_BAND_2GHZ];</div><div class='ctx'> 	sband-&gt;band = NL80211_BAND_2GHZ;</div><div class='ctx'> 	sband-&gt;bitrates = &amp;iwl_cfg80211_rates[RATES_24_OFFS];</div><div class='hunk'>@@ -1006,22 +1016,18 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 		sbands_flags |= IWL_NVM_SBANDS_FLAGS_NO_WIDE_IN_5GHZ;</div><div class='ctx'> </div><div class='ctx'> 	iwl_init_sbands(dev, cfg, data, ch_section, tx_chains, rx_chains,</div><div class='del'>-			sbands_flags);</div><div class='add'>+			sbands_flags, false);</div><div class='ctx'> 	data-&gt;calib_version = 255;</div><div class='ctx'> </div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_parse_nvm_data);</div><div class='ctx'> </div><div class='del'>-static u32 iwl_nvm_get_regdom_bw_flags(const u8 *nvm_chan,</div><div class='add'>+static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='ctx'> 				       int ch_idx, u16 nvm_flags,</div><div class='ctx'> 				       const struct iwl_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 flags = NL80211_RRF_NO_HT40;</div><div class='del'>-	u32 last_5ghz_ht = LAST_5GHZ_HT;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;nvm_type == IWL_NVM_EXT)</div><div class='del'>-		last_5ghz_ht = LAST_5GHZ_HT_FAMILY_8000;</div><div class='ctx'> </div><div class='ctx'> 	if (ch_idx &lt; NUM_2GHZ_CHANNELS &amp;&amp;</div><div class='ctx'> 	    (nvm_flags &amp; NVM_CHANNEL_40MHZ)) {</div><div class='hunk'>@@ -1029,8 +1035,7 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u8 *nvm_chan,</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40PLUS;</div><div class='ctx'> 		if (nvm_chan[ch_idx] &gt;= FIRST_2GHZ_HT_MINUS)</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40MINUS;</div><div class='del'>-	} else if (nvm_chan[ch_idx] &lt;= last_5ghz_ht &amp;&amp;</div><div class='del'>-		   (nvm_flags &amp; NVM_CHANNEL_40MHZ)) {</div><div class='add'>+	} else if (nvm_flags &amp; NVM_CHANNEL_40MHZ) {</div><div class='ctx'> 		if ((ch_idx - NUM_2GHZ_CHANNELS) % 2 == 0)</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40PLUS;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1074,18 +1079,26 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 	int ch_idx;</div><div class='ctx'> 	u16 ch_flags;</div><div class='ctx'> 	u32 reg_rule_flags, prev_reg_rule_flags = 0;</div><div class='del'>-	const u8 *nvm_chan = cfg-&gt;nvm_type == IWL_NVM_EXT ?</div><div class='del'>-			     iwl_ext_nvm_channels : iwl_nvm_channels;</div><div class='add'>+	const u16 *nvm_chan;</div><div class='ctx'> 	struct ieee80211_regdomain *regd, *copy_rd;</div><div class='del'>-	int size_of_regd, regd_to_copy;</div><div class='ctx'> 	struct ieee80211_reg_rule *rule;</div><div class='ctx'> 	struct regdb_ptrs *regdb_ptrs;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	int center_freq, prev_center_freq = 0;</div><div class='ctx'> 	int valid_rules = 0;</div><div class='ctx'> 	bool new_rule;</div><div class='del'>-	int max_num_ch = cfg-&gt;nvm_type == IWL_NVM_EXT ?</div><div class='del'>-			 IWL_NVM_NUM_CHANNELS_EXT : IWL_NVM_NUM_CHANNELS;</div><div class='add'>+	int max_num_ch;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;uhb_supported) {</div><div class='add'>+		max_num_ch = IWL_NVM_NUM_CHANNELS_UHB;</div><div class='add'>+		nvm_chan = iwl_uhb_nvm_channels;</div><div class='add'>+	} else if (cfg-&gt;nvm_type == IWL_NVM_EXT) {</div><div class='add'>+		max_num_ch = IWL_NVM_NUM_CHANNELS_EXT;</div><div class='add'>+		nvm_chan = iwl_ext_nvm_channels;</div><div class='add'>+	} else {</div><div class='add'>+		max_num_ch = IWL_NVM_NUM_CHANNELS;</div><div class='add'>+		nvm_chan = iwl_nvm_channels;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(num_of_ch &gt; max_num_ch))</div><div class='ctx'> 		num_of_ch = max_num_ch;</div><div class='hunk'>@@ -1097,11 +1110,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 		      num_of_ch);</div><div class='ctx'> </div><div class='ctx'> 	/* build a regdomain rule for every valid channel */</div><div class='del'>-	size_of_regd =</div><div class='del'>-		sizeof(struct ieee80211_regdomain) +</div><div class='del'>-		num_of_ch * sizeof(struct ieee80211_reg_rule);</div><div class='del'>-</div><div class='del'>-	regd = kzalloc(size_of_regd, GFP_KERNEL);</div><div class='add'>+	regd = kzalloc(struct_size(regd, reg_rules, num_of_ch), GFP_KERNEL);</div><div class='ctx'> 	if (!regd)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -1177,14 +1186,10 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 	 * Narrow down regdom for unused regulatory rules to prevent hole</div><div class='ctx'> 	 * between reg rules to wmm rules.</div><div class='ctx'> 	 */</div><div class='del'>-	regd_to_copy = sizeof(struct ieee80211_regdomain) +</div><div class='del'>-		valid_rules * sizeof(struct ieee80211_reg_rule);</div><div class='del'>-</div><div class='del'>-	copy_rd = kmemdup(regd, regd_to_copy, GFP_KERNEL);</div><div class='del'>-	if (!copy_rd) {</div><div class='add'>+	copy_rd = kmemdup(regd, struct_size(regd, reg_rules, valid_rules),</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	if (!copy_rd)</div><div class='ctx'> 		copy_rd = ERR_PTR(-ENOMEM);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(regdb_ptrs);</div><div class='hunk'>@@ -1393,7 +1398,6 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='ctx'> 				 const struct iwl_fw *fw)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_nvm_get_info cmd = {};</div><div class='del'>-	struct iwl_nvm_get_info_rsp *rsp;</div><div class='ctx'> 	struct iwl_nvm_data *nvm;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='ctx'> 		.flags = CMD_WANT_SKB | CMD_SEND_IN_RFKILL,</div><div class='hunk'>@@ -1408,12 +1412,24 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='ctx'> 	bool empty_otp;</div><div class='ctx'> 	u32 mac_flags;</div><div class='ctx'> 	u32 sbands_flags = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * All the values in iwl_nvm_get_info_rsp v4 are the same as</div><div class='add'>+	 * in v3, except for the channel profile part of the</div><div class='add'>+	 * regulatory.  So we can just access the new struct, with the</div><div class='add'>+	 * exception of the latter.</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_nvm_get_info_rsp *rsp;</div><div class='add'>+	struct iwl_nvm_get_info_rsp_v3 *rsp_v3;</div><div class='add'>+	bool v4 = fw_has_api(&amp;fw-&gt;ucode_capa,</div><div class='add'>+			     IWL_UCODE_TLV_API_REGULATORY_NVM_INFO);</div><div class='add'>+	size_t rsp_size = v4 ? sizeof(*rsp) : sizeof(*rsp_v3);</div><div class='add'>+	void *channel_profile;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_trans_send_cmd(trans, &amp;hcmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	if (WARN(iwl_rx_packet_payload_len(hcmd.resp_pkt) != sizeof(*rsp),</div><div class='add'>+	if (WARN(iwl_rx_packet_payload_len(hcmd.resp_pkt) != rsp_size,</div><div class='ctx'> 		 "Invalid payload len in NVM response from FW %d",</div><div class='ctx'> 		 iwl_rx_packet_payload_len(hcmd.resp_pkt))) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -1475,11 +1491,15 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='ctx'> 		sbands_flags |= IWL_NVM_SBANDS_FLAGS_LAR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rsp_v3 = (void *)rsp;</div><div class='add'>+	channel_profile = v4 ? (void *)rsp-&gt;regulatory.channel_profile :</div><div class='add'>+			  (void *)rsp_v3-&gt;regulatory.channel_profile;</div><div class='add'>+</div><div class='ctx'> 	iwl_init_sbands(trans-&gt;dev, trans-&gt;cfg, nvm,</div><div class='del'>-			rsp-&gt;regulatory.channel_profile,</div><div class='add'>+			channel_profile,</div><div class='ctx'> 			nvm-&gt;valid_tx_ant &amp; fw-&gt;valid_tx_ant,</div><div class='ctx'> 			nvm-&gt;valid_rx_ant &amp; fw-&gt;valid_rx_ant,</div><div class='del'>-			sbands_flags);</div><div class='add'>+			sbands_flags, v4);</div><div class='ctx'> </div><div class='ctx'> 	iwl_free_resp(&amp;hcmd);</div><div class='ctx'> 	return nvm;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h<br/>index 1af9f9e1ecd4..8e6a0c363c0d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-prph.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-prph.h</a></div><div class='hunk'>@@ -368,6 +368,12 @@</div><div class='ctx'> #define MON_BUFF_WRPTR_VER2		(0xa03c24)</div><div class='ctx'> #define MON_BUFF_CYCLE_CNT_VER2		(0xa03c28)</div><div class='ctx'> #define MON_BUFF_SHIFT_VER2		(0x8)</div><div class='add'>+/* FW monitor familiy AX210 and on */</div><div class='add'>+#define DBGC_CUR_DBGBUF_BASE_ADDR_LSB		(0xd03c20)</div><div class='add'>+#define DBGC_CUR_DBGBUF_BASE_ADDR_MSB		(0xd03c24)</div><div class='add'>+#define DBGC_CUR_DBGBUF_STATUS			(0xd03c1c)</div><div class='add'>+#define DBGC_DBGBUF_WRAP_AROUND			(0xd03c2c)</div><div class='add'>+#define DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK	(0x00ffffff)</div><div class='ctx'> </div><div class='ctx'> #define MON_DMARB_RD_CTL_ADDR		(0xa03c60)</div><div class='ctx'> #define MON_DMARB_RD_DATA_ADDR		(0xa03c5c)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h<br/>index bbebbf3efd57..1e4c9ef548cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/iwl-trans.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/iwl-trans.h</a></div><div class='hunk'>@@ -274,7 +274,6 @@ struct iwl_rx_cmd_buffer {</div><div class='ctx'> 	bool _page_stolen;</div><div class='ctx'> 	u32 _rx_page_order;</div><div class='ctx'> 	unsigned int truesize;</div><div class='del'>-	u8 status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)</div><div class='hunk'>@@ -338,7 +337,6 @@ enum iwl_d3_status {</div><div class='ctx'>  *	are sent</div><div class='ctx'>  * @STATUS_TRANS_IDLE: the trans is idle - general commands are not to be sent</div><div class='ctx'>  * @STATUS_TRANS_DEAD: trans is dead - avoid any read/write operation</div><div class='del'>- * @STATUS_FW_WAIT_DUMP: if set, wait until cleared before collecting dump</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_trans_status {</div><div class='ctx'> 	STATUS_SYNC_HCMD_ACTIVE,</div><div class='hunk'>@@ -351,7 +349,6 @@ enum iwl_trans_status {</div><div class='ctx'> 	STATUS_TRANS_GOING_IDLE,</div><div class='ctx'> 	STATUS_TRANS_IDLE,</div><div class='ctx'> 	STATUS_TRANS_DEAD,</div><div class='del'>-	STATUS_FW_WAIT_DUMP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -618,6 +615,7 @@ struct iwl_trans_ops {</div><div class='ctx'> 	struct iwl_trans_dump_data *(*dump_data)(struct iwl_trans *trans,</div><div class='ctx'> 						 u32 dump_mask);</div><div class='ctx'> 	void (*debugfs_cleanup)(struct iwl_trans *trans);</div><div class='add'>+	void (*sync_nmi)(struct iwl_trans *trans);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -769,6 +767,7 @@ struct iwl_self_init_dram {</div><div class='ctx'>  * @umac_error_event_table: addr of umac error table</div><div class='ctx'>  * @error_event_table_tlv_status: bitmap that indicates what error table</div><div class='ctx'>  *	pointers was recevied via TLV. use enum &amp;iwl_error_event_table_status</div><div class='add'>+ * @hw_error: equals true if hw error interrupt was received from the FW</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_trans {</div><div class='ctx'> 	const struct iwl_trans_ops *ops;</div><div class='hunk'>@@ -831,7 +830,7 @@ struct iwl_trans {</div><div class='ctx'> 	u32 lmac_error_event_table[2];</div><div class='ctx'> 	u32 umac_error_event_table;</div><div class='ctx'> 	unsigned int error_event_table_tlv_status;</div><div class='del'>-	wait_queue_head_t fw_halt_waitq;</div><div class='add'>+	bool hw_error;</div><div class='ctx'> </div><div class='ctx'> 	/* pointer to trans specific struct */</div><div class='ctx'> 	/*Ensure that this pointer will always be aligned to sizeof pointer */</div><div class='hunk'>@@ -1239,10 +1238,12 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans)</div><div class='ctx'> 	/* prevent double restarts due to the same erroneous FW */</div><div class='ctx'> 	if (!test_and_set_bit(STATUS_FW_ERROR, &amp;trans-&gt;status))</div><div class='ctx'> 		iwl_op_mode_nic_error(trans-&gt;op_mode);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(STATUS_FW_WAIT_DUMP, &amp;trans-&gt;status))</div><div class='del'>-		wake_up(&amp;trans-&gt;fw_halt_waitq);</div><div class='del'>-</div><div class='add'>+static inline void iwl_trans_sync_nmi(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	if (trans-&gt;ops-&gt;sync_nmi)</div><div class='add'>+		trans-&gt;ops-&gt;sync_nmi(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c<br/>index 808bc6f363d0..60f5d337f16d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -385,10 +385,10 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='del'>-				 struct cfg80211_wowlan *wowlan)</div><div class='add'>+static int iwl_mvm_send_patterns_v1(struct iwl_mvm *mvm,</div><div class='add'>+				    struct cfg80211_wowlan *wowlan)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_wowlan_patterns_cmd *pattern_cmd;</div><div class='add'>+	struct iwl_wowlan_patterns_cmd_v1 *pattern_cmd;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = WOWLAN_PATTERNS,</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='hunk'>@@ -399,7 +399,7 @@ static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cmd.len[0] = sizeof(*pattern_cmd) +</div><div class='del'>-		wowlan-&gt;n_patterns * sizeof(struct iwl_wowlan_pattern);</div><div class='add'>+		wowlan-&gt;n_patterns * sizeof(struct iwl_wowlan_pattern_v1);</div><div class='ctx'> </div><div class='ctx'> 	pattern_cmd = kmalloc(cmd.len[0], GFP_KERNEL);</div><div class='ctx'> 	if (!pattern_cmd)</div><div class='hunk'>@@ -426,6 +426,50 @@ static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='add'>+				 struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct iwl_wowlan_patterns_cmd *pattern_cmd;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WOWLAN_PATTERNS,</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!wowlan-&gt;n_patterns)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmd.len[0] = sizeof(*pattern_cmd) +</div><div class='add'>+		wowlan-&gt;n_patterns * sizeof(struct iwl_wowlan_pattern_v2);</div><div class='add'>+</div><div class='add'>+	pattern_cmd = kmalloc(cmd.len[0], GFP_KERNEL);</div><div class='add'>+	if (!pattern_cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pattern_cmd-&gt;n_patterns = cpu_to_le32(wowlan-&gt;n_patterns);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wowlan-&gt;n_patterns; i++) {</div><div class='add'>+		int mask_len = DIV_ROUND_UP(wowlan-&gt;patterns[i].pattern_len, 8);</div><div class='add'>+</div><div class='add'>+		pattern_cmd-&gt;patterns[i].pattern_type =</div><div class='add'>+			WOWLAN_PATTERN_TYPE_BITMASK;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;pattern_cmd-&gt;patterns[i].u.bitmask.mask,</div><div class='add'>+		       wowlan-&gt;patterns[i].mask, mask_len);</div><div class='add'>+		memcpy(&amp;pattern_cmd-&gt;patterns[i].u.bitmask.pattern,</div><div class='add'>+		       wowlan-&gt;patterns[i].pattern,</div><div class='add'>+		       wowlan-&gt;patterns[i].pattern_len);</div><div class='add'>+		pattern_cmd-&gt;patterns[i].u.bitmask.mask_size = mask_len;</div><div class='add'>+		pattern_cmd-&gt;patterns[i].u.bitmask.pattern_size =</div><div class='add'>+			wowlan-&gt;patterns[i].pattern_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.data[0] = pattern_cmd;</div><div class='add'>+	err = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	kfree(pattern_cmd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 				struct ieee80211_sta *ap_sta)</div><div class='ctx'> {</div><div class='hunk'>@@ -851,7 +895,11 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_patterns(mvm, wowlan);</div><div class='add'>+	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+		       IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE))</div><div class='add'>+		ret = iwl_mvm_send_patterns(mvm, wowlan);</div><div class='add'>+	else</div><div class='add'>+		ret = iwl_mvm_send_patterns_v1(mvm, wowlan);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1728,9 +1776,12 @@ void iwl_mvm_d0i3_update_keys(struct iwl_mvm *mvm,</div><div class='ctx'> 	iwl_mvm_iter_d0i3_ap_keys(mvm, vif, iwl_mvm_d3_update_keys, &amp;gtkdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ND_QUERY_BUF_LEN (sizeof(struct iwl_scan_offload_profile_match) * \</div><div class='add'>+			  IWL_SCAN_MAX_PROFILES)</div><div class='add'>+</div><div class='ctx'> struct iwl_mvm_nd_query_results {</div><div class='ctx'> 	u32 matched_profiles;</div><div class='del'>-	struct iwl_scan_offload_profile_match matches[IWL_SCAN_MAX_PROFILES];</div><div class='add'>+	u8 matches[ND_QUERY_BUF_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1743,6 +1794,7 @@ iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,</div><div class='ctx'> 		.flags = CMD_WANT_SKB,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret, len;</div><div class='add'>+	size_t query_len, matches_len;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1750,8 +1802,19 @@ iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {</div><div class='add'>+		query_len = sizeof(struct iwl_scan_offload_profiles_query);</div><div class='add'>+		matches_len = sizeof(struct iwl_scan_offload_profile_match) *</div><div class='add'>+			IWL_SCAN_MAX_PROFILES;</div><div class='add'>+	} else {</div><div class='add'>+		query_len = sizeof(struct iwl_scan_offload_profiles_query_v1);</div><div class='add'>+		matches_len = sizeof(struct iwl_scan_offload_profile_match_v1) *</div><div class='add'>+			IWL_SCAN_MAX_PROFILES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	len = iwl_rx_packet_payload_len(cmd.resp_pkt);</div><div class='del'>-	if (len &lt; sizeof(*query)) {</div><div class='add'>+	if (len &lt; query_len) {</div><div class='ctx'> 		IWL_ERR(mvm, "Invalid scan offload profiles query response!\n");</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out_free_resp;</div><div class='hunk'>@@ -1760,7 +1823,7 @@ iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,</div><div class='ctx'> 	query = (void *)cmd.resp_pkt-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	results-&gt;matched_profiles = le32_to_cpu(query-&gt;matched_profiles);</div><div class='del'>-	memcpy(results-&gt;matches, query-&gt;matches, sizeof(results-&gt;matches));</div><div class='add'>+	memcpy(results-&gt;matches, query-&gt;matches, matches_len);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	mvm-&gt;last_netdetect_scans = le32_to_cpu(query-&gt;n_scans_done);</div><div class='hunk'>@@ -1771,6 +1834,57 @@ out_free_resp:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_query_num_match_chans(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_mvm_nd_query_results *query,</div><div class='add'>+					 int idx)</div><div class='add'>+{</div><div class='add'>+	int n_chans = 0, i;</div><div class='add'>+</div><div class='add'>+	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {</div><div class='add'>+		struct iwl_scan_offload_profile_match *matches =</div><div class='add'>+			(struct iwl_scan_offload_profile_match *)query-&gt;matches;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN; i++)</div><div class='add'>+			n_chans += hweight8(matches[idx].matching_channels[i]);</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_scan_offload_profile_match_v1 *matches =</div><div class='add'>+			(struct iwl_scan_offload_profile_match_v1 *)query-&gt;matches;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1; i++)</div><div class='add'>+			n_chans += hweight8(matches[idx].matching_channels[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return n_chans;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_query_set_freqs(struct iwl_mvm *mvm,</div><div class='add'>+				    struct iwl_mvm_nd_query_results *query,</div><div class='add'>+				    struct cfg80211_wowlan_nd_match *match,</div><div class='add'>+				    int idx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {</div><div class='add'>+		struct iwl_scan_offload_profile_match *matches =</div><div class='add'>+			(struct iwl_scan_offload_profile_match *)query-&gt;matches;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN * 8; i++)</div><div class='add'>+			if (matches[idx].matching_channels[i / 8] &amp; (BIT(i % 8)))</div><div class='add'>+				match-&gt;channels[match-&gt;n_channels++] =</div><div class='add'>+					mvm-&gt;nd_channels[i]-&gt;center_freq;</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_scan_offload_profile_match_v1 *matches =</div><div class='add'>+			(struct iwl_scan_offload_profile_match_v1 *)query-&gt;matches;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1 * 8; i++)</div><div class='add'>+			if (matches[idx].matching_channels[i / 8] &amp; (BIT(i % 8)))</div><div class='add'>+				match-&gt;channels[match-&gt;n_channels++] =</div><div class='add'>+					mvm-&gt;nd_channels[i]-&gt;center_freq;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 					    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='hunk'>@@ -1783,7 +1897,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_wowlan_status *fw_status;</div><div class='ctx'> 	unsigned long matched_profiles;</div><div class='ctx'> 	u32 reasons = 0;</div><div class='del'>-	int i, j, n_matches, ret;</div><div class='add'>+	int i, n_matches, ret;</div><div class='ctx'> </div><div class='ctx'> 	fw_status = iwl_mvm_get_wakeup_status(mvm);</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(fw_status)) {</div><div class='hunk'>@@ -1817,14 +1931,10 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 		goto out_report_nd;</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(i, &amp;matched_profiles, mvm-&gt;n_nd_match_sets) {</div><div class='del'>-		struct iwl_scan_offload_profile_match *fw_match;</div><div class='ctx'> 		struct cfg80211_wowlan_nd_match *match;</div><div class='ctx'> 		int idx, n_channels = 0;</div><div class='ctx'> </div><div class='del'>-		fw_match = &amp;query.matches[i];</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN; j++)</div><div class='del'>-			n_channels += hweight8(fw_match-&gt;matching_channels[j]);</div><div class='add'>+		n_channels = iwl_mvm_query_num_match_chans(mvm, &amp;query, i);</div><div class='ctx'> </div><div class='ctx'> 		match = kzalloc(struct_size(match, channels, n_channels),</div><div class='ctx'> 				GFP_KERNEL);</div><div class='hunk'>@@ -1844,10 +1954,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (mvm-&gt;n_nd_channels &lt; n_channels)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN * 8; j++)</div><div class='del'>-			if (fw_match-&gt;matching_channels[j / 8] &amp; (BIT(j % 8)))</div><div class='del'>-				match-&gt;channels[match-&gt;n_channels++] =</div><div class='del'>-					mvm-&gt;nd_channels[j]-&gt;center_freq;</div><div class='add'>+		iwl_mvm_query_set_freqs(mvm, &amp;query, match, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_report_nd:</div><div class='hunk'>@@ -2030,7 +2137,6 @@ out:</div><div class='ctx'> 	 * 2. We are using a unified image but had an error while exiting D3</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status);</div><div class='del'>-	set_bit(IWL_MVM_STATUS_D3_RECONFIG, &amp;mvm-&gt;status);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When switching images we return 1, which causes mac80211</div><div class='ctx'> 	 * to do a reconfig with IEEE80211_RECONFIG_TYPE_RESTART.</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c<br/>index 2453ceabf00d..f043eefabb4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c</a></div><div class='hunk'>@@ -743,9 +743,8 @@ static ssize_t iwl_dbgfs_quota_min_read(struct file *file,</div><div class='ctx'> #define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \</div><div class='ctx'> 	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct ieee80211_vif)</div><div class='ctx'> #define MVM_DEBUGFS_ADD_FILE_VIF(name, parent, mode) do {		\</div><div class='del'>-		if (!debugfs_create_file(#name, mode, parent, vif,	\</div><div class='del'>-					 &amp;iwl_dbgfs_##name##_ops))	\</div><div class='del'>-			goto err;					\</div><div class='add'>+		debugfs_create_file(#name, mode, parent, vif,		\</div><div class='add'>+				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(mac_params);</div><div class='hunk'>@@ -774,8 +773,7 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);</div><div class='del'>-</div><div class='del'>-	if (!mvmvif-&gt;dbgfs_dir) {</div><div class='add'>+	if (IS_ERR_OR_NULL(mvmvif-&gt;dbgfs_dir)) {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",</div><div class='ctx'> 			dbgfs_dir);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -812,12 +810,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;dbgfs_slink = debugfs_create_symlink(dbgfs_dir-&gt;d_name.name,</div><div class='ctx'> 						     mvm-&gt;debugfs_dir, buf);</div><div class='del'>-	if (!mvmvif-&gt;dbgfs_slink)</div><div class='del'>-		IWL_ERR(mvm, "Can't create debugfs symbolic link under %pd\n",</div><div class='del'>-			dbgfs_dir);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR(mvm, "Can't create debugfs entity\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c<br/>index 776b24f54200..d4ff6b44de2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a></div><div class='hunk'>@@ -1349,7 +1349,7 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_dbg_collect(&amp;mvm-&gt;fwrt, FW_DBG_TRIGGER_USER, buf,</div><div class='del'>-			   (count - 1));</div><div class='add'>+			   (count - 1), NULL);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_WRITE);</div><div class='ctx'> </div><div class='hunk'>@@ -1696,9 +1696,8 @@ static ssize_t iwl_dbgfs_d0i3_refs_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> #define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \</div><div class='ctx'> 	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct iwl_mvm)</div><div class='ctx'> #define MVM_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode) do {	\</div><div class='del'>-		if (!debugfs_create_file(alias, mode, parent, mvm,	\</div><div class='del'>-					 &amp;iwl_dbgfs_##name##_ops))	\</div><div class='del'>-			goto err;					\</div><div class='add'>+		debugfs_create_file(alias, mode, parent, mvm,		\</div><div class='add'>+				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #define MVM_DEBUGFS_ADD_FILE(name, parent, mode) \</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='hunk'>@@ -1709,9 +1708,8 @@ static ssize_t iwl_dbgfs_d0i3_refs_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct ieee80211_sta)</div><div class='ctx'> </div><div class='ctx'> #define MVM_DEBUGFS_ADD_STA_FILE_ALIAS(alias, name, parent, mode) do {	\</div><div class='del'>-		if (!debugfs_create_file(alias, mode, parent, sta,	\</div><div class='del'>-					 &amp;iwl_dbgfs_##name##_ops))	\</div><div class='del'>-			goto err;					\</div><div class='add'>+		debugfs_create_file(alias, mode, parent, sta,		\</div><div class='add'>+				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #define MVM_DEBUGFS_ADD_STA_FILE(name, parent, mode) \</div><div class='ctx'> 	MVM_DEBUGFS_ADD_STA_FILE_ALIAS(#name, name, parent, mode)</div><div class='hunk'>@@ -2092,13 +2090,9 @@ void iwl_mvm_sta_add_debugfs(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_tlc_offload(mvm))</div><div class='ctx'> 		MVM_DEBUGFS_ADD_STA_FILE(rs_data, dir, 0400);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR(mvm, "Can't create the mvm station debugfs entry\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)</div><div class='add'>+void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *bcast_dir __maybe_unused;</div><div class='ctx'> 	char buf[100];</div><div class='hunk'>@@ -2142,14 +2136,10 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)</div><div class='ctx'> #endif</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> </div><div class='del'>-	if (!debugfs_create_bool("enable_scan_iteration_notif",</div><div class='del'>-				 0600,</div><div class='del'>-				 mvm-&gt;debugfs_dir,</div><div class='del'>-				 &amp;mvm-&gt;scan_iter_notif_enabled))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_bool("drop_bcn_ap_mode", 0600,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;drop_bcn_ap_mode))</div><div class='del'>-		goto err;</div><div class='add'>+	debugfs_create_bool("enable_scan_iteration_notif", 0600,</div><div class='add'>+			    mvm-&gt;debugfs_dir, &amp;mvm-&gt;scan_iter_notif_enabled);</div><div class='add'>+	debugfs_create_bool("drop_bcn_ap_mode", 0600, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;drop_bcn_ap_mode);</div><div class='ctx'> </div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(uapsd_noagg_bssids, mvm-&gt;debugfs_dir, S_IRUSR);</div><div class='ctx'> </div><div class='hunk'>@@ -2157,13 +2147,9 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)</div><div class='ctx'> 	if (mvm-&gt;fw-&gt;ucode_capa.flags &amp; IWL_UCODE_TLV_FLAGS_BCAST_FILTERING) {</div><div class='ctx'> 		bcast_dir = debugfs_create_dir("bcast_filtering",</div><div class='ctx'> 					       mvm-&gt;debugfs_dir);</div><div class='del'>-		if (!bcast_dir)</div><div class='del'>-			goto err;</div><div class='ctx'> </div><div class='del'>-		if (!debugfs_create_bool("override", 0600,</div><div class='del'>-					 bcast_dir,</div><div class='del'>-					 &amp;mvm-&gt;dbgfs_bcast_filtering.override))</div><div class='del'>-			goto err;</div><div class='add'>+		debugfs_create_bool("override", 0600, bcast_dir,</div><div class='add'>+				    &amp;mvm-&gt;dbgfs_bcast_filtering.override);</div><div class='ctx'> </div><div class='ctx'> 		MVM_DEBUGFS_ADD_FILE_ALIAS("filters", bcast_filters,</div><div class='ctx'> 					   bcast_dir, 0600);</div><div class='hunk'>@@ -2175,35 +2161,26 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(d3_sram, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(d3_test, mvm-&gt;debugfs_dir, 0400);</div><div class='del'>-	if (!debugfs_create_bool("d3_wake_sysassert", 0600,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;d3_wake_sysassert))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_u32("last_netdetect_scans", 0400,</div><div class='del'>-				mvm-&gt;debugfs_dir, &amp;mvm-&gt;last_netdetect_scans))</div><div class='del'>-		goto err;</div><div class='add'>+	debugfs_create_bool("d3_wake_sysassert", 0600, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;d3_wake_sysassert);</div><div class='add'>+	debugfs_create_u32("last_netdetect_scans", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			   &amp;mvm-&gt;last_netdetect_scans);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (!debugfs_create_u8("ps_disabled", 0400,</div><div class='del'>-			       mvm-&gt;debugfs_dir, &amp;mvm-&gt;ps_disabled))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_blob("nvm_hw", 0400,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_hw_blob))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_blob("nvm_sw", 0400,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_sw_blob))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_blob("nvm_calib", 0400,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_calib_blob))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_blob("nvm_prod", 0400,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_prod_blob))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_blob("nvm_phy_sku", 0400,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_phy_sku_blob))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!debugfs_create_blob("nvm_reg", S_IRUSR,</div><div class='del'>-				 mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_reg_blob))</div><div class='del'>-		goto err;</div><div class='add'>+	debugfs_create_u8("ps_disabled", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			  &amp;mvm-&gt;ps_disabled);</div><div class='add'>+	debugfs_create_blob("nvm_hw", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;nvm_hw_blob);</div><div class='add'>+	debugfs_create_blob("nvm_sw", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;nvm_sw_blob);</div><div class='add'>+	debugfs_create_blob("nvm_calib", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;nvm_calib_blob);</div><div class='add'>+	debugfs_create_blob("nvm_prod", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;nvm_prod_blob);</div><div class='add'>+	debugfs_create_blob("nvm_phy_sku", 0400, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;nvm_phy_sku_blob);</div><div class='add'>+	debugfs_create_blob("nvm_reg", S_IRUSR,</div><div class='add'>+			    mvm-&gt;debugfs_dir, &amp;mvm-&gt;nvm_reg_blob);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_file("mem", 0600, dbgfs_dir, mvm, &amp;iwl_dbgfs_mem_ops);</div><div class='ctx'> </div><div class='hunk'>@@ -2212,11 +2189,5 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)</div><div class='ctx'> 	 * exists (before the opmode exists which removes the target.)</div><div class='ctx'> 	 */</div><div class='ctx'> 	snprintf(buf, 100, "../../%pd2", dbgfs_dir-&gt;d_parent);</div><div class='del'>-	if (!debugfs_create_symlink("iwlwifi", mvm-&gt;hw-&gt;wiphy-&gt;debugfsdir, buf))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR(mvm, "Can't create the mvm debugfs directory\n");</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	debugfs_create_symlink("iwlwifi", mvm-&gt;hw-&gt;wiphy-&gt;debugfsdir, buf);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c<br/>index e9822a3ec373..fec38a47696e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c</a></div><div class='hunk'>@@ -187,12 +187,24 @@ static void iwl_mvm_ftm_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		cmd-&gt;macaddr_mask[i] = ~req-&gt;mac_addr_mask[i];</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (vif-&gt;bss_conf.assoc) {</div><div class='ctx'> 		memcpy(cmd-&gt;range_req_bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='del'>-	else</div><div class='add'>+</div><div class='add'>+		/* AP's TSF is only relevant if associated */</div><div class='add'>+		for (i = 0; i &lt; req-&gt;n_peers; i++) {</div><div class='add'>+			if (req-&gt;peers[i].report_ap_tsf) {</div><div class='add'>+				struct iwl_mvm_vif *mvmvif =</div><div class='add'>+					iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+				cmd-&gt;tsf_mac_id = cpu_to_le32(mvmvif-&gt;id);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		eth_broadcast_addr(cmd-&gt;range_req_bssid);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* TODO: fill in tsf_mac_id if needed */</div><div class='add'>+	/* Don't report AP's TSF */</div><div class='ctx'> 	cmd-&gt;tsf_mac_id = cpu_to_le32(0xff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -460,9 +472,7 @@ static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id,</div><div class='ctx'> static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,</div><div class='ctx'> 				     struct cfg80211_pmsr_result *res)</div><div class='ctx'> {</div><div class='del'>-	s64 rtt_avg = res-&gt;ftm.rtt_avg * 100;</div><div class='del'>-</div><div class='del'>-	do_div(rtt_avg, 6666);</div><div class='add'>+	s64 rtt_avg = div_s64(res-&gt;ftm.rtt_avg * 100, 6666);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "entry %d\n", index);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res-&gt;status);</div><div class='hunk'>@@ -482,6 +492,7 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	struct iwl_tof_range_rsp_ntfy_v5 *fw_resp_v5 = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_tof_range_rsp_ntfy_v6 *fw_resp_v6 = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct iwl_tof_range_rsp_ntfy *fw_resp = (void *)pkt-&gt;data;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	bool new_api = fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='hunk'>@@ -521,8 +532,15 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 		int peer_idx;</div><div class='ctx'> </div><div class='ctx'> 		if (new_api) {</div><div class='del'>-			fw_ap = &amp;fw_resp-&gt;ap[i];</div><div class='add'>+			if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				       IWL_UCODE_TLV_API_FTM_RTT_ACCURACY))</div><div class='add'>+				fw_ap = &amp;fw_resp-&gt;ap[i];</div><div class='add'>+			else</div><div class='add'>+				fw_ap = (void *)&amp;fw_resp_v6-&gt;ap[i];</div><div class='add'>+</div><div class='ctx'> 			result.final = fw_resp-&gt;ap[i].last_burst;</div><div class='add'>+			result.ap_tsf = le32_to_cpu(fw_ap-&gt;start_tsf);</div><div class='add'>+			result.ap_tsf_valid = 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* the first part is the same for old and new APIs */</div><div class='ctx'> 			fw_ap = (void *)&amp;fw_resp_v5-&gt;ap[i];</div><div class='hunk'>@@ -590,6 +608,11 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 				     mvm-&gt;ftm_initiator.req,</div><div class='ctx'> 				     &amp;result, GFP_KERNEL);</div><div class='ctx'> </div><div class='add'>+		if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_API_FTM_RTT_ACCURACY))</div><div class='add'>+			IWL_DEBUG_INFO(mvm, "RTT confidence: %hhu\n",</div><div class='add'>+				       fw_ap-&gt;rttConfidence);</div><div class='add'>+</div><div class='ctx'> 		iwl_mvm_debug_range_resp(mvm, i, &amp;result);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c<br/>index 00a47f6f1d81..ab68b5d53ec9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a></div><div class='hunk'>@@ -1121,7 +1121,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 	ret = iwl_mvm_load_rt_fw(mvm);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);</div><div class='del'>-		iwl_fw_dbg_error_collect(&amp;mvm-&gt;fwrt, FW_DBG_TRIGGER_DRIVER);</div><div class='add'>+		if (ret != -ERFKILL)</div><div class='add'>+			iwl_fw_dbg_error_collect(&amp;mvm-&gt;fwrt,</div><div class='add'>+						 FW_DBG_TRIGGER_DRIVER);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c<br/>index 6a70dece447d..53c217af13c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -262,9 +262,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		.preferred_tsf = NUM_TSF_IDS,</div><div class='ctx'> 		.found_vif = false,</div><div class='ctx'> 	};</div><div class='del'>-	u32 ac;</div><div class='del'>-	int ret, i, queue_limit;</div><div class='del'>-	unsigned long used_hw_queues;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -341,37 +339,9 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mvmvif-&gt;time_event_data.list);</div><div class='ctx'> 	mvmvif-&gt;time_event_data.id = TE_MAX;</div><div class='ctx'> </div><div class='del'>-	/* No need to allocate data queues to P2P Device MAC.*/</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='del'>-		for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++)</div><div class='del'>-			vif-&gt;hw_queue[ac] = IEEE80211_INVAL_HW_QUEUE;</div><div class='del'>-</div><div class='add'>+	/* No need to allocate data queues to P2P Device MAC and NAN.*/</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * queues in mac80211 almost entirely independent of</div><div class='del'>-	 * the ones here - no real limit</div><div class='del'>-	 */</div><div class='del'>-	queue_limit = IEEE80211_MAX_QUEUES;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Find available queues, and allocate them to the ACs. When in</div><div class='del'>-	 * DQA-mode they aren't really used, and this is done only so the</div><div class='del'>-	 * mac80211 ieee80211_check_queues() function won't fail</div><div class='del'>-	 */</div><div class='del'>-	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='del'>-		u8 queue = find_first_zero_bit(&amp;used_hw_queues, queue_limit);</div><div class='del'>-</div><div class='del'>-		if (queue &gt;= queue_limit) {</div><div class='del'>-			IWL_ERR(mvm, "Failed to allocate queue\n");</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto exit_fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__set_bit(queue, &amp;used_hw_queues);</div><div class='del'>-		vif-&gt;hw_queue[ac] = queue;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the CAB queue for softAP and GO interfaces */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='hunk'>@@ -1143,9 +1113,7 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,</div><div class='ctx'> 				ieee80211_tu_to_usec(data.beacon_int * rand /</div><div class='ctx'> 						     100);</div><div class='ctx'> 		} else {</div><div class='del'>-			mvmvif-&gt;ap_beacon_time =</div><div class='del'>-				iwl_read_prph(mvm-&gt;trans,</div><div class='del'>-					      DEVICE_SYSTEM_TIME_REG);</div><div class='add'>+			mvmvif-&gt;ap_beacon_time = iwl_mvm_get_systime(mvm);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1573,6 +1541,7 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	vif = rcu_dereference(mvm-&gt;vif_id_to_mac[mac_id]);</div><div class='add'>+	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='hunk'>@@ -1581,7 +1550,6 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			    csa_vif != vif))</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> </div><div class='del'>-		mvmvif = iwl_mvm_vif_from_mac80211(csa_vif);</div><div class='ctx'> 		csa_id = FW_CMD_ID_AND_COLOR(mvmvif-&gt;id, mvmvif-&gt;color);</div><div class='ctx'> 		if (WARN(csa_id != id_n_color,</div><div class='ctx'> 			 "channel switch noa notification on unexpected vif (csa_vif=%d, notif=%d)",</div><div class='hunk'>@@ -1602,6 +1570,7 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		iwl_mvm_csa_client_absent(mvm, vif);</div><div class='add'>+		cancel_delayed_work(&amp;mvmvif-&gt;csa_work);</div><div class='ctx'> 		ieee80211_chswitch_done(vif, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c<br/>index 3a92c09d4692..5c52469288be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -420,6 +420,7 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> const static u8 he_if_types_ext_capa_sta[] = {</div><div class='ctx'> 	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='ctx'> 	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='ctx'> 	 [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,</div><div class='ctx'> };</div><div class='hunk'>@@ -597,6 +598,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		BIT(NL80211_IFTYPE_ADHOC);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+	wiphy_ext_feature_set(hw-&gt;wiphy, NL80211_EXT_FEATURE_VHT_IBSS);</div><div class='add'>+	hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_HT_IBSS;</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;wiphy-&gt;regulatory_flags |= REGULATORY_ENABLE_RELAX_NO_IR;</div><div class='ctx'> 	if (iwl_mvm_is_lar_supported(mvm))</div><div class='ctx'> 		hw-&gt;wiphy-&gt;regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;</div><div class='hunk'>@@ -732,6 +736,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;iftype_ext_capab = he_iftypes_ext_capa;</div><div class='ctx'> 		hw-&gt;wiphy-&gt;num_iftype_ext_capab =</div><div class='ctx'> 			ARRAY_SIZE(he_iftypes_ext_capa);</div><div class='add'>+</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_ONLY_HE_MULTI_BSSID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;</div><div class='hunk'>@@ -1191,15 +1198,6 @@ static void iwl_mvm_cleanup_iterator(void *data, u8 *mac,</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	/* clear the D3 reconfig, we only need it to avoid dumping a</div><div class='del'>-	 * firmware coredump on reconfiguration, we shouldn't do that</div><div class='del'>-	 * on D3-&gt;D0 transition</div><div class='del'>-	 */</div><div class='del'>-	if (!test_and_clear_bit(IWL_MVM_STATUS_D3_RECONFIG, &amp;mvm-&gt;status)) {</div><div class='del'>-		mvm-&gt;fwrt.dump.desc = &amp;iwl_dump_desc_assert;</div><div class='del'>-		iwl_fw_error_dump(&amp;mvm-&gt;fwrt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* cleanup all stale references (scan, roc), but keep the</div><div class='ctx'> 	 * ucode_down ref until reconfig is complete</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1500,6 +1498,91 @@ static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, 0, len, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (mvmvif-&gt;csa_failed) {</div><div class='add'>+		mvmvif-&gt;csa_failed = false;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		struct iwl_mvm_sta *mvmsta;</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;csa_bcn_pending = false;</div><div class='add'>+		mvmsta = iwl_mvm_sta_from_staid_protected(mvm,</div><div class='add'>+							  mvmvif-&gt;ap_sta_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvmsta)) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, false);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_enable_beacon_filter(mvm, vif, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;ps_disabled = false;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_power_update_ps(mvm);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;mvm-&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 void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_chan_switch_te_cmd cmd = {</div><div class='add'>+		.mac_id = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='add'>+							  mvmvif-&gt;color)),</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mvm, "Abort CSA on mac %d\n", mvmvif-&gt;id);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	WARN_ON(iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				     WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+					     CHANNEL_SWITCH_TIME_EVENT_CMD),</div><div class='add'>+				     0, sizeof(cmd), &amp;cmd));</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	WARN_ON(iwl_mvm_post_channel_switch(hw, vif));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_channel_switch_disconnect_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	mvmvif = container_of(wk, struct iwl_mvm_vif, csa_work.work);</div><div class='add'>+	vif = container_of((void *)mvmvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+	mvm = mvmvif-&gt;mvm;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_abort_channel_switch(mvm-&gt;hw, vif);</div><div class='add'>+	ieee80211_chswitch_done(vif, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='hunk'>@@ -1626,6 +1709,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_tcm_add_vif(mvm, vif);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mvmvif-&gt;csa_work,</div><div class='add'>+			  iwl_mvm_channel_switch_disconnect_wk);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		mvm-&gt;monitor_on = true;</div><div class='hunk'>@@ -2127,6 +2212,10 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		.frame_time_rts_th =</div><div class='ctx'> 			cpu_to_le16(vif-&gt;bss_conf.frame_time_rts_th),</div><div class='ctx'> 	};</div><div class='add'>+	int size = fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			      IWL_UCODE_TLV_API_MBSSID_HE) ?</div><div class='add'>+		   sizeof(sta_ctxt_cmd) :</div><div class='add'>+		   sizeof(struct iwl_he_sta_context_cmd_v1);</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2254,16 +2343,18 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 		/* Set the PPE thresholds accordingly */</div><div class='ctx'> 		if (low_th &gt;= 0 &amp;&amp; high_th &gt;= 0) {</div><div class='del'>-			u8 ***pkt_ext_qam =</div><div class='del'>-				(void *)sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th;</div><div class='add'>+			struct iwl_he_pkt_ext *pkt_ext =</div><div class='add'>+				(struct iwl_he_pkt_ext *)&amp;sta_ctxt_cmd.pkt_ext;</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='ctx'> 				u8 bw;</div><div class='ctx'> </div><div class='ctx'> 				for (bw = 0; bw &lt; MAX_HE_CHANNEL_BW_INDX;</div><div class='ctx'> 				     bw++) {</div><div class='del'>-					pkt_ext_qam[i][bw][0] = low_th;</div><div class='del'>-					pkt_ext_qam[i][bw][1] = high_th;</div><div class='add'>+					pkt_ext-&gt;pkt_ext_qam_th[i][bw][0] =</div><div class='add'>+						low_th;</div><div class='add'>+					pkt_ext-&gt;pkt_ext_qam_th[i][bw][1] =</div><div class='add'>+						high_th;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -2308,13 +2399,23 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 			(vif-&gt;bss_conf.uora_ocw_range &gt;&gt; 3) &amp; 0x7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* TODO: support Multi BSSID IE */</div><div class='add'>+	if (vif-&gt;bss_conf.nontransmitted) {</div><div class='add'>+		flags |= STA_CTXT_HE_REF_BSSID_VALID;</div><div class='add'>+		ether_addr_copy(sta_ctxt_cmd.ref_bssid_addr,</div><div class='add'>+				vif-&gt;bss_conf.transmitter_bssid);</div><div class='add'>+		sta_ctxt_cmd.max_bssid_indicator =</div><div class='add'>+			vif-&gt;bss_conf.bssid_indicator;</div><div class='add'>+		sta_ctxt_cmd.bssid_index = vif-&gt;bss_conf.bssid_index;</div><div class='add'>+		sta_ctxt_cmd.ema_ap = vif-&gt;bss_conf.ema_ap;</div><div class='add'>+		sta_ctxt_cmd.profile_periodicity =</div><div class='add'>+			vif-&gt;bss_conf.profile_periodicity;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sta_ctxt_cmd.flags = cpu_to_le32(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(STA_HE_CTXT_CMD,</div><div class='ctx'> 						 DATA_PATH_GROUP, 0),</div><div class='del'>-				 0, sizeof(sta_ctxt_cmd), &amp;sta_ctxt_cmd))</div><div class='add'>+				 0, size, &amp;sta_ctxt_cmd))</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to config FW to work HE!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2714,9 +2815,6 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_mac_ctxt_remove(mvm, vif);</div><div class='ctx'> </div><div class='del'>-	kfree(mvmvif-&gt;ap_wep_key);</div><div class='del'>-	mvmvif-&gt;ap_wep_key = NULL;</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3183,24 +3281,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = iwl_mvm_update_sta(mvm, vif, sta);</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_AUTHORIZED) {</div><div class='del'>-		/* if wep is used, need to set the key for the station now */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; mvmvif-&gt;ap_wep_key) {</div><div class='del'>-			mvm_sta-&gt;wep_key =</div><div class='del'>-				kmemdup(mvmvif-&gt;ap_wep_key,</div><div class='del'>-					sizeof(*mvmvif-&gt;ap_wep_key) +</div><div class='del'>-					mvmvif-&gt;ap_wep_key-&gt;keylen,</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-			if (!mvm_sta-&gt;wep_key) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = iwl_mvm_set_sta_key(mvm, vif, sta,</div><div class='del'>-						  mvm_sta-&gt;wep_key,</div><div class='del'>-						  STA_KEY_IDX_INVALID);</div><div class='del'>-		} else {</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='add'>+		ret = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* we don't support TDLS during DCM */</div><div class='ctx'> 		if (iwl_mvm_phy_ctx_count(mvm) &gt; 1)</div><div class='hunk'>@@ -3242,17 +3323,6 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 						   NL80211_TDLS_DISABLE_LINK);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Remove STA key if this is an AP using WEP */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; mvmvif-&gt;ap_wep_key) {</div><div class='del'>-			int rm_ret = iwl_mvm_remove_sta_key(mvm, vif, sta,</div><div class='del'>-							    mvm_sta-&gt;wep_key);</div><div class='del'>-</div><div class='del'>-			if (!ret)</div><div class='del'>-				ret = rm_ret;</div><div class='del'>-			kfree(mvm_sta-&gt;wep_key);</div><div class='del'>-			mvm_sta-&gt;wep_key = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (unlikely(ret &amp;&amp;</div><div class='ctx'> 			     test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='ctx'> 				      &amp;mvm-&gt;status)))</div><div class='hunk'>@@ -3289,6 +3359,13 @@ static void iwl_mvm_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 				  struct ieee80211_sta *sta, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (IEEE80211_RC_BW_CHANGED |</div><div class='add'>+		       IEEE80211_RC_SUPP_RATES_CHANGED |</div><div class='add'>+		       IEEE80211_RC_NSS_CHANGED))</div><div class='add'>+		iwl_mvm_rs_rate_init(mvm, sta, mvmvif-&gt;phy_ctxt-&gt;channel-&gt;band,</div><div class='add'>+				     true);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='ctx'> 	    changed &amp; IEEE80211_RC_NSS_CHANGED)</div><div class='hunk'>@@ -3439,20 +3516,12 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP40:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='del'>-			struct iwl_mvm_vif *mvmvif =</div><div class='del'>-				iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-</div><div class='del'>-			mvmvif-&gt;ap_wep_key = kmemdup(key,</div><div class='del'>-						     sizeof(*key) + key-&gt;keylen,</div><div class='del'>-						     GFP_KERNEL);</div><div class='del'>-			if (!mvmvif-&gt;ap_wep_key)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			break;</div><div class='add'>+		if (iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		/* support HW crypto on TX */</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* currently FW supports only one optional cipher scheme */</div><div class='ctx'> 		if (hw-&gt;n_cipher_schemes &amp;&amp;</div><div class='hunk'>@@ -3540,12 +3609,17 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, key_offset);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_WARN(mvm, "set key failed\n");</div><div class='add'>+			key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * can't add key for RX, but we don't need it</div><div class='del'>-			 * in the device for TX so still return 0</div><div class='add'>+			 * in the device for TX so still return 0,</div><div class='add'>+			 * unless we have new TX API where we cannot</div><div class='add'>+			 * put key material into the TX_CMD</div><div class='ctx'> 			 */</div><div class='del'>-			key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='del'>-			ret = 0;</div><div class='add'>+			if (iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+				ret = -EOPNOTSUPP;</div><div class='add'>+			else</div><div class='add'>+				ret = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3639,7 +3713,7 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    int duration)</div><div class='ctx'> {</div><div class='del'>-	int res, time_reg = DEVICE_SYSTEM_TIME_REG;</div><div class='add'>+	int res;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_time_event_data *te_data = &amp;mvmvif-&gt;hs_time_event_data;</div><div class='ctx'> 	static const u16 time_event_response[] = { HOT_SPOT_CMD };</div><div class='hunk'>@@ -3665,7 +3739,7 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 			      0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the time and duration */</div><div class='del'>-	tail-&gt;apply_time = cpu_to_le32(iwl_read_prph(mvm-&gt;trans, time_reg));</div><div class='add'>+	tail-&gt;apply_time = cpu_to_le32(iwl_mvm_get_systime(mvm));</div><div class='ctx'> </div><div class='ctx'> 	delay = AUX_ROC_MIN_DELAY;</div><div class='ctx'> 	req_dur = MSEC_TO_TU(duration);</div><div class='hunk'>@@ -4391,8 +4465,8 @@ static int __iwl_mvm_mac_testmode_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 noa_duration;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse(tb, IWL_MVM_TM_ATTR_MAX, data, len, iwl_mvm_tm_policy,</div><div class='del'>-			NULL);</div><div class='add'>+	err = nla_parse_deprecated(tb, IWL_MVM_TM_ATTR_MAX, data, len,</div><div class='add'>+				   iwl_mvm_tm_policy, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4469,16 +4543,22 @@ static int iwl_mvm_schedule_client_csa(struct iwl_mvm *mvm,</div><div class='ctx'> 		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='ctx'> 		.tsf = cpu_to_le32(chsw-&gt;timestamp),</div><div class='ctx'> 		.cs_count = chsw-&gt;count,</div><div class='add'>+		.cs_mode = chsw-&gt;block_tx,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	if (chsw-&gt;delay)</div><div class='add'>+		cmd.cs_delayed_bcn_count =</div><div class='add'>+			DIV_ROUND_UP(chsw-&gt;delay, vif-&gt;bss_conf.beacon_int);</div><div class='add'>+</div><div class='ctx'> 	return iwl_mvm_send_cmd_pdu(mvm,</div><div class='ctx'> 				    WIDE_ID(MAC_CONF_GROUP,</div><div class='ctx'> 					    CHANNEL_SWITCH_TIME_EVENT_CMD),</div><div class='ctx'> 				    0, sizeof(cmd), &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define IWL_MAX_CSA_BLOCK_TX 1500</div><div class='ctx'> static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 				      struct ieee80211_vif *vif,</div><div class='ctx'> 				      struct ieee80211_channel_switch *chsw)</div><div class='hunk'>@@ -4543,8 +4623,18 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 				((vif-&gt;bss_conf.beacon_int * (chsw-&gt;count - 1) -</div><div class='ctx'> 				  IWL_MVM_CHANNEL_SWITCH_TIME_CLIENT) * 1024);</div><div class='ctx'> </div><div class='del'>-		if (chsw-&gt;block_tx)</div><div class='add'>+		if (chsw-&gt;block_tx) {</div><div class='ctx'> 			iwl_mvm_csa_client_absent(mvm, vif);</div><div class='add'>+			/*</div><div class='add'>+			 * In case of undetermined / long time with immediate</div><div class='add'>+			 * quiet monitor status to gracefully disconnect</div><div class='add'>+			 */</div><div class='add'>+			if (!chsw-&gt;count ||</div><div class='add'>+			    chsw-&gt;count * vif-&gt;bss_conf.beacon_int &gt;</div><div class='add'>+			    IWL_MAX_CSA_BLOCK_TX)</div><div class='add'>+				schedule_delayed_work(&amp;mvmvif-&gt;csa_work,</div><div class='add'>+						      msecs_to_jiffies(IWL_MAX_CSA_BLOCK_TX));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (mvmvif-&gt;bf_data.bf_enabled) {</div><div class='ctx'> 			ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);</div><div class='hunk'>@@ -4559,6 +4649,9 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 			iwl_mvm_schedule_csa_period(mvm, vif,</div><div class='ctx'> 						    vif-&gt;bss_conf.beacon_int,</div><div class='ctx'> 						    apply_time);</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;csa_count = chsw-&gt;count;</div><div class='add'>+		mvmvif-&gt;csa_misbehave = false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4579,52 +4672,42 @@ out_unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif)</div><div class='add'>+static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     struct ieee80211_channel_switch *chsw)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (mvmvif-&gt;csa_failed) {</div><div class='del'>-		mvmvif-&gt;csa_failed = false;</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-		struct iwl_mvm_sta *mvmsta;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_chan_switch_te_cmd cmd = {</div><div class='add'>+		.mac_id = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='add'>+							  mvmvif-&gt;color)),</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_MODIFY),</div><div class='add'>+		.tsf = cpu_to_le32(chsw-&gt;timestamp),</div><div class='add'>+		.cs_count = chsw-&gt;count,</div><div class='add'>+		.cs_mode = chsw-&gt;block_tx,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		mvmvif-&gt;csa_bcn_pending = false;</div><div class='del'>-		mvmsta = iwl_mvm_sta_from_staid_protected(mvm,</div><div class='del'>-							  mvmvif-&gt;ap_sta_id);</div><div class='add'>+	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_CS_MODIFY))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(!mvmsta)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out_unlock;</div><div class='add'>+	if (chsw-&gt;count &gt;= mvmvif-&gt;csa_count &amp;&amp; chsw-&gt;block_tx) {</div><div class='add'>+		if (mvmvif-&gt;csa_misbehave) {</div><div class='add'>+			/* Second time, give up on this AP*/</div><div class='add'>+			iwl_mvm_abort_channel_switch(hw, vif);</div><div class='add'>+			ieee80211_chswitch_done(vif, false);</div><div class='add'>+			mvmvif-&gt;csa_misbehave = false;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, false);</div><div class='del'>-</div><div class='del'>-		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-</div><div class='del'>-		ret = iwl_mvm_enable_beacon_filter(mvm, vif, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-</div><div class='del'>-		iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+		mvmvif-&gt;csa_misbehave = true;</div><div class='ctx'> 	}</div><div class='add'>+	mvmvif-&gt;csa_count = chsw-&gt;count;</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;ps_disabled = false;</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_power_update_ps(mvm);</div><div class='add'>+	IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d\n", mvmvif-&gt;id);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	WARN_ON(iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				     WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+					     CHANNEL_SWITCH_TIME_EVENT_CMD),</div><div class='add'>+				     CMD_ASYNC, sizeof(cmd), &amp;cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)</div><div class='hunk'>@@ -5083,6 +5166,8 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {</div><div class='ctx'> 	.channel_switch = iwl_mvm_channel_switch,</div><div class='ctx'> 	.pre_channel_switch = iwl_mvm_pre_channel_switch,</div><div class='ctx'> 	.post_channel_switch = iwl_mvm_post_channel_switch,</div><div class='add'>+	.abort_channel_switch = iwl_mvm_abort_channel_switch,</div><div class='add'>+	.channel_switch_rx_beacon = iwl_mvm_channel_switch_rx_beacon,</div><div class='ctx'> </div><div class='ctx'> 	.tdls_channel_switch = iwl_mvm_tdls_channel_switch,</div><div class='ctx'> 	.tdls_cancel_channel_switch = iwl_mvm_tdls_cancel_channel_switch,</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h<br/>index bca6f6b536d9..8dc2a9850bc5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -490,6 +490,9 @@ struct iwl_mvm_vif {</div><div class='ctx'> 	bool csa_countdown;</div><div class='ctx'> 	bool csa_failed;</div><div class='ctx'> 	u16 csa_target_freq;</div><div class='add'>+	u16 csa_count;</div><div class='add'>+	u16 csa_misbehave;</div><div class='add'>+	struct delayed_work csa_work;</div><div class='ctx'> </div><div class='ctx'> 	/* Indicates that we are waiting for a beacon on a new channel */</div><div class='ctx'> 	bool csa_bcn_pending;</div><div class='hunk'>@@ -498,7 +501,6 @@ struct iwl_mvm_vif {</div><div class='ctx'> 	netdev_features_t features;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_probe_resp_data __rcu *probe_resp_data;</div><div class='del'>-	struct ieee80211_key_conf *ap_wep_key;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct iwl_mvm_vif *</div><div class='hunk'>@@ -1200,7 +1202,6 @@ struct iwl_mvm {</div><div class='ctx'>  * @IWL_MVM_STATUS_IN_HW_RESTART: HW restart is active</div><div class='ctx'>  * @IWL_MVM_STATUS_IN_D0I3: NIC is in D0i3</div><div class='ctx'>  * @IWL_MVM_STATUS_ROC_AUX_RUNNING: AUX remain-on-channel is running</div><div class='del'>- * @IWL_MVM_STATUS_D3_RECONFIG: D3 reconfiguration is being done</div><div class='ctx'>  * @IWL_MVM_STATUS_FIRMWARE_RUNNING: firmware is running</div><div class='ctx'>  * @IWL_MVM_STATUS_NEED_FLUSH_P2P: need to flush P2P bcast STA</div><div class='ctx'>  */</div><div class='hunk'>@@ -1212,7 +1213,6 @@ enum iwl_mvm_status {</div><div class='ctx'> 	IWL_MVM_STATUS_IN_HW_RESTART,</div><div class='ctx'> 	IWL_MVM_STATUS_IN_D0I3,</div><div class='ctx'> 	IWL_MVM_STATUS_ROC_AUX_RUNNING,</div><div class='del'>-	IWL_MVM_STATUS_D3_RECONFIG,</div><div class='ctx'> 	IWL_MVM_STATUS_FIRMWARE_RUNNING,</div><div class='ctx'> 	IWL_MVM_STATUS_NEED_FLUSH_P2P,</div><div class='ctx'> };</div><div class='hunk'>@@ -1538,6 +1538,7 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm);</div><div class='ctx'> u8 first_antenna(u8 mask);</div><div class='ctx'> u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx);</div><div class='ctx'> void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime);</div><div class='add'>+u32 iwl_mvm_get_systime(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> /* Tx / Host Commands */</div><div class='ctx'> int __must_check iwl_mvm_send_cmd(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1650,8 +1651,8 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			struct iwl_rx_cmd_buffer *rxb, int queue);</div><div class='del'>-void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='del'>-			    struct iwl_rx_cmd_buffer *rxb, int queue);</div><div class='add'>+void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='add'>+				struct iwl_rx_cmd_buffer *rxb, int queue);</div><div class='ctx'> void iwl_mvm_rx_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			      struct iwl_rx_cmd_buffer *rxb, int queue);</div><div class='ctx'> int iwl_mvm_notify_rx_queue(struct iwl_mvm *mvm, u32 rxq_mask,</div><div class='hunk'>@@ -1785,14 +1786,13 @@ void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> /* MVM debugfs */</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir);</div><div class='add'>+void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir);</div><div class='ctx'> void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> void iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> #else</div><div class='del'>-static inline int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm,</div><div class='del'>-					 struct dentry *dbgfs_dir)</div><div class='add'>+static inline void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm,</div><div class='add'>+					  struct dentry *dbgfs_dir)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline void</div><div class='ctx'> iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='hunk'>@@ -2024,17 +2024,6 @@ static inline u32 iwl_mvm_flushable_queues(struct iwl_mvm *mvm)</div><div class='ctx'> static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-	/* If IWL_MVM_STATUS_HW_RESTART_REQUESTED bit is set then we received</div><div class='del'>-	 * an assert. Since we failed to bring the interface up, mac80211</div><div class='del'>-	 * will not attempt to reconfig the device,</div><div class='del'>-	 * which handles the dump collection in assert flow,</div><div class='del'>-	 * so trigger dump collection here.</div><div class='del'>-	 */</div><div class='del'>-	if (test_and_clear_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='del'>-			       &amp;mvm-&gt;status))</div><div class='del'>-		iwl_fw_dbg_collect_desc(&amp;mvm-&gt;fwrt, &amp;iwl_dump_desc_assert,</div><div class='del'>-					false, 0);</div><div class='del'>-</div><div class='ctx'> 	iwl_fw_cancel_timestamp(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &amp;mvm-&gt;status);</div><div class='ctx'> 	iwl_fwrt_stop_device(&amp;mvm-&gt;fwrt);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c<br/>index ba27dce4c2bb..acd2fda12466 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -834,7 +834,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 	iwl_mvm_ref(mvm, IWL_MVM_REF_INIT_UCODE);</div><div class='ctx'> 	err = iwl_run_init_mvm_ucode(mvm, true);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err &amp;&amp; err != -ERFKILL)</div><div class='ctx'> 		iwl_fw_dbg_error_collect(&amp;mvm-&gt;fwrt, FW_DBG_TRIGGER_DRIVER);</div><div class='ctx'> 	if (!iwlmvm_mod_params.init_dbg || !err)</div><div class='ctx'> 		iwl_mvm_stop_device(mvm);</div><div class='hunk'>@@ -862,9 +862,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	min_backoff = iwl_mvm_min_backoff(mvm);</div><div class='ctx'> 	iwl_mvm_thermal_initialize(mvm, min_backoff);</div><div class='ctx'> </div><div class='del'>-	err = iwl_mvm_dbgfs_register(mvm, dbgfs_dir);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_unregister;</div><div class='add'>+	iwl_mvm_dbgfs_register(mvm, dbgfs_dir);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_has_new_rx_stats_api(mvm))</div><div class='ctx'> 		memset(&amp;mvm-&gt;rx_stats_v3, 0,</div><div class='hunk'>@@ -881,14 +879,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 	return op_mode;</div><div class='ctx'> </div><div class='del'>- out_unregister:</div><div class='del'>-	if (iwlmvm_mod_params.init_dbg)</div><div class='del'>-		return op_mode;</div><div class='del'>-</div><div class='del'>-	ieee80211_unregister_hw(mvm-&gt;hw);</div><div class='del'>-	mvm-&gt;hw_registered = false;</div><div class='del'>-	iwl_mvm_leds_exit(mvm);</div><div class='del'>-	iwl_mvm_thermal_exit(mvm);</div><div class='ctx'>  out_free:</div><div class='ctx'> 	iwl_fw_flush_dump(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	iwl_fw_runtime_free(&amp;mvm-&gt;fwrt);</div><div class='hunk'>@@ -1105,7 +1095,7 @@ static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,</div><div class='ctx'> 	else if (cmd == WIDE_ID(LEGACY_GROUP, FRAME_RELEASE))</div><div class='ctx'> 		iwl_mvm_rx_frame_release(mvm, napi, rxb, 0);</div><div class='ctx'> 	else if (cmd == WIDE_ID(DATA_PATH_GROUP, RX_NO_DATA_NOTIF))</div><div class='del'>-		iwl_mvm_rx_monitor_ndp(mvm, napi, rxb, 0);</div><div class='add'>+		iwl_mvm_rx_monitor_no_data(mvm, napi, rxb, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		iwl_mvm_rx_common(mvm, rxb, pkt);</div><div class='ctx'> }</div><div class='hunk'>@@ -1271,6 +1261,7 @@ static void iwl_mvm_reprobe_wk(struct work_struct *wk)</div><div class='ctx'> void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_abort_notification_waits(&amp;mvm-&gt;notif_wait);</div><div class='add'>+	del_timer(&amp;mvm-&gt;fwrt.dump.periodic_trig);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a bit racy, but worst case we tell mac80211 about</div><div class='hunk'>@@ -1291,8 +1282,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)</div><div class='ctx'> 	 * can't recover this since we're already half suspended.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!mvm-&gt;fw_restart &amp;&amp; fw_error) {</div><div class='del'>-		iwl_fw_dbg_collect_desc(&amp;mvm-&gt;fwrt, &amp;iwl_dump_desc_assert,</div><div class='del'>-					false, 0);</div><div class='add'>+		iwl_fw_error_collect(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	} else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='ctx'> 		struct iwl_mvm_reprobe *reprobe;</div><div class='ctx'> </div><div class='hunk'>@@ -1340,6 +1330,8 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		iwl_fw_error_collect(&amp;mvm-&gt;fwrt);</div><div class='add'>+</div><div class='ctx'> 		if (fw_error &amp;&amp; mvm-&gt;fw_restart &gt; 0)</div><div class='ctx'> 			mvm-&gt;fw_restart--;</div><div class='ctx'> 		set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c<br/>index a28283ff7295..659e21b2d4e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * GPL LICENSE SUMMARY</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2017        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  * BSD LICENSE</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2017        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -116,8 +116,9 @@ static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta)</div><div class='ctx'> 	return supp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 rs_fw_set_config_flags(struct iwl_mvm *mvm,</div><div class='del'>-				  struct ieee80211_sta *sta)</div><div class='add'>+static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  struct ieee80211_supported_band *sband)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='ctx'> 	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='hunk'>@@ -147,6 +148,12 @@ static u16 rs_fw_set_config_flags(struct iwl_mvm *mvm,</div><div class='ctx'> 	     (vht_ena &amp;&amp; (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RXLDPC))))</div><div class='ctx'> 		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='ctx'> </div><div class='add'>+	/* consider our LDPC support in case of HE */</div><div class='add'>+	if (sband-&gt;iftype_data &amp;&amp; sband-&gt;iftype_data-&gt;he_cap.has_he &amp;&amp;</div><div class='add'>+	    !(sband-&gt;iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[1] &amp;</div><div class='add'>+	     IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='add'>+		flags &amp;= ~IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='add'>+</div><div class='ctx'> 	if (he_cap &amp;&amp; he_cap-&gt;has_he &amp;&amp;</div><div class='ctx'> 	    (he_cap-&gt;he_cap_elem.phy_cap_info[3] &amp;</div><div class='ctx'> 	     IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK))</div><div class='hunk'>@@ -223,19 +230,43 @@ static u16 rs_fw_he_ieee80211_mcs_to_rs_mcs(u16 mcs)</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,</div><div class='del'>-			   const struct ieee80211_sta_he_cap *he_cap,</div><div class='add'>+			   struct ieee80211_supported_band *sband,</div><div class='ctx'> 			   struct iwl_tlc_config_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	u16 mcs_160 = le16_to_cpu(sta-&gt;he_cap.he_mcs_nss_supp.rx_mcs_160);</div><div class='del'>-	u16 mcs_80 = le16_to_cpu(sta-&gt;he_cap.he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	u16 mcs_160 = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='add'>+	u16 mcs_80 = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+	u16 tx_mcs_80 =</div><div class='add'>+		le16_to_cpu(sband-&gt;iftype_data-&gt;he_cap.he_mcs_nss_supp.tx_mcs_80);</div><div class='add'>+	u16 tx_mcs_160 =</div><div class='add'>+		le16_to_cpu(sband-&gt;iftype_data-&gt;he_cap.he_mcs_nss_supp.tx_mcs_160);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sta-&gt;rx_nss &amp;&amp; i &lt; MAX_NSS; i++) {</div><div class='ctx'> 		u16 _mcs_160 = (mcs_160 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='ctx'> 		u16 _mcs_80 = (mcs_80 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='del'>-</div><div class='add'>+		u16 _tx_mcs_160 = (tx_mcs_160 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='add'>+		u16 _tx_mcs_80 = (tx_mcs_80 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+		/* If one side doesn't support - mark both as not supporting */</div><div class='add'>+		if (_mcs_80 == IEEE80211_HE_MCS_NOT_SUPPORTED ||</div><div class='add'>+		    _tx_mcs_80 == IEEE80211_HE_MCS_NOT_SUPPORTED) {</div><div class='add'>+			_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			_tx_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+		}</div><div class='add'>+		if (_mcs_80 &gt; _tx_mcs_80)</div><div class='add'>+			_mcs_80 = _tx_mcs_80;</div><div class='ctx'> 		cmd-&gt;ht_rates[i][0] =</div><div class='ctx'> 			cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_80));</div><div class='add'>+</div><div class='add'>+		/* If one side doesn't support - mark both as not supporting */</div><div class='add'>+		if (_mcs_160 == IEEE80211_HE_MCS_NOT_SUPPORTED ||</div><div class='add'>+		    _tx_mcs_160 == IEEE80211_HE_MCS_NOT_SUPPORTED) {</div><div class='add'>+			_mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			_tx_mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+		}</div><div class='add'>+		if (_mcs_160 &gt; _tx_mcs_160)</div><div class='add'>+			_mcs_160 = _tx_mcs_160;</div><div class='ctx'> 		cmd-&gt;ht_rates[i][1] =</div><div class='ctx'> 			cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_160));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -264,7 +295,7 @@ static void rs_fw_set_supp_rates(struct ieee80211_sta *sta,</div><div class='ctx'> 	/* HT/VHT rates */</div><div class='ctx'> 	if (he_cap &amp;&amp; he_cap-&gt;has_he) {</div><div class='ctx'> 		cmd-&gt;mode = IWL_TLC_MNG_MODE_HE;</div><div class='del'>-		rs_fw_he_set_enabled_rates(sta, he_cap, cmd);</div><div class='add'>+		rs_fw_he_set_enabled_rates(sta, sband, cmd);</div><div class='ctx'> 	} else if (vht_cap &amp;&amp; vht_cap-&gt;vht_supported) {</div><div class='ctx'> 		cmd-&gt;mode = IWL_TLC_MNG_MODE_VHT;</div><div class='ctx'> 		rs_fw_vht_set_enabled_rates(sta, vht_cap, cmd);</div><div class='hunk'>@@ -345,6 +376,37 @@ out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+</div><div class='add'>+	if (vht_cap &amp;&amp; vht_cap-&gt;vht_supported) {</div><div class='add'>+		switch (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_MAX_MPDU_MASK) {</div><div class='add'>+		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454:</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_VHT_11454;</div><div class='add'>+		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991:</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_VHT_7991;</div><div class='add'>+		default:</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_VHT_3895;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	} else if (ht_cap &amp;&amp; ht_cap-&gt;ht_supported) {</div><div class='add'>+		if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_MAX_AMSDU)</div><div class='add'>+			/*</div><div class='add'>+			 * agg is offloaded so we need to assume that agg</div><div class='add'>+			 * are enabled and max mpdu in ampdu is 4095</div><div class='add'>+			 * (spec 802.11-2016 9.3.2.1)</div><div class='add'>+			 */</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_HT_BA;</div><div class='add'>+		else</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_HT_3839;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* in legacy mode no amsdu is enabled so return zero */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		     enum nl80211_band band, bool update)</div><div class='ctx'> {</div><div class='hunk'>@@ -352,15 +414,16 @@ void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_fw;</div><div class='ctx'> 	u32 cmd_id = iwl_cmd_id(TLC_MNG_CONFIG_CMD, DATA_PATH_GROUP, 0);</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_supported_band *sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	u16 max_amsdu_len = rs_fw_get_max_amsdu_len(sta);</div><div class='ctx'> 	struct iwl_tlc_config_cmd cfg_cmd = {</div><div class='ctx'> 		.sta_id = mvmsta-&gt;sta_id,</div><div class='ctx'> 		.max_ch_width = update ?</div><div class='ctx'> 			rs_fw_bw_from_sta_bw(sta) : RATE_MCS_CHAN_WIDTH_20,</div><div class='del'>-		.flags = cpu_to_le16(rs_fw_set_config_flags(mvm, sta)),</div><div class='add'>+		.flags = cpu_to_le16(rs_fw_get_config_flags(mvm, sta, sband)),</div><div class='ctx'> 		.chains = rs_fw_set_active_chains(iwl_mvm_get_valid_tx_ant(mvm)),</div><div class='del'>-		.max_mpdu_len = cpu_to_le16(sta-&gt;max_amsdu_len),</div><div class='ctx'> 		.sgi_ch_width_supp = rs_fw_sgi_cw_support(sta),</div><div class='add'>+		.max_mpdu_len = cpu_to_le16(max_amsdu_len),</div><div class='ctx'> 		.amsdu = iwl_mvm_is_csum_supported(mvm),</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -370,9 +433,14 @@ void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	iwl_mvm_reset_frame_stats(mvm);</div><div class='ctx'> #endif</div><div class='del'>-	sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='ctx'> 	rs_fw_set_supp_rates(sta, sband, &amp;cfg_cmd);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * since TLC offload works with one mode we can assume</div><div class='add'>+	 * that only vht/ht is used and also set it as station max amsdu</div><div class='add'>+	 */</div><div class='add'>+	sta-&gt;max_amsdu_len = max_amsdu_len;</div><div class='add'>+</div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cfg_cmd), &amp;cfg_cmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to send rate scale config (%d)\n", ret);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c<br/>index e231a44d2423..c182821ab22b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a></div><div class='hunk'>@@ -4078,9 +4078,8 @@ static ssize_t iwl_dbgfs_ss_force_write(struct iwl_lq_sta *lq_sta, char *buf,</div><div class='ctx'> #define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \</div><div class='ctx'> 	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct iwl_lq_sta)</div><div class='ctx'> #define MVM_DEBUGFS_ADD_FILE_RS(name, parent, mode) do {		\</div><div class='del'>-		if (!debugfs_create_file(#name, mode, parent, lq_sta,	\</div><div class='del'>-					 &amp;iwl_dbgfs_##name##_ops))	\</div><div class='del'>-			goto err;					\</div><div class='add'>+		debugfs_create_file(#name, mode, parent, lq_sta,	\</div><div class='add'>+				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(ss_force, 32);</div><div class='hunk'>@@ -4108,9 +4107,6 @@ static void rs_drv_add_sta_debugfs(void *mvm, void *priv_sta,</div><div class='ctx'> 			  &amp;lq_sta-&gt;pers.dbg_fixed_txp_reduction);</div><div class='ctx'> </div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE_RS(ss_force, dir, 0600);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR((struct iwl_mvm *)mvm, "Can't create debugfs entity\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rs_remove_sta_debugfs(void *mvm, void *mvm_sta)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c<br/>index 1e03acf30762..1824566d08fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -169,9 +169,9 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* iwl_mvm_create_skb Adds the rxb to a new skb */</div><div class='del'>-static void iwl_mvm_create_skb(struct sk_buff *skb, struct ieee80211_hdr *hdr,</div><div class='del'>-			       u16 len, u8 crypt_len,</div><div class='del'>-			       struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='add'>+			      struct ieee80211_hdr *hdr, u16 len, u8 crypt_len,</div><div class='add'>+			      struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	struct iwl_rx_mpdu_desc *desc = (void *)pkt-&gt;data;</div><div class='hunk'>@@ -204,6 +204,20 @@ static void iwl_mvm_create_skb(struct sk_buff *skb, struct ieee80211_hdr *hdr,</div><div class='ctx'> 	 * present before copying packet data.</div><div class='ctx'> 	 */</div><div class='ctx'> 	hdrlen += crypt_len;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(headlen &lt; hdrlen,</div><div class='add'>+		      "invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n",</div><div class='add'>+		      hdrlen, len, crypt_len)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We warn and trace because we want to be able to see</div><div class='add'>+		 * it in trace-cmd as well.</div><div class='add'>+		 */</div><div class='add'>+		IWL_DEBUG_RX(mvm,</div><div class='add'>+			     "invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n",</div><div class='add'>+			     hdrlen, len, crypt_len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb_put_data(skb, hdr, hdrlen);</div><div class='ctx'> 	skb_put_data(skb, (u8 *)hdr + hdrlen + pad_len, headlen - hdrlen);</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +230,8 @@ static void iwl_mvm_create_skb(struct sk_buff *skb, struct ieee80211_hdr *hdr,</div><div class='ctx'> 		skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,</div><div class='ctx'> 				fraglen, rxb-&gt;truesize);</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 void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1671,7 +1687,11 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			rx_status-&gt;boottime_ns = ktime_get_boot_ns();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_create_skb(skb, hdr, len, crypt_len, rxb);</div><div class='add'>+	if (iwl_mvm_create_skb(mvm, skb, hdr, len, crypt_len, rxb)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!iwl_mvm_reorder(mvm, napi, queue, sta, skb, desc))</div><div class='ctx'> 		iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue,</div><div class='ctx'> 						sta, csi);</div><div class='hunk'>@@ -1679,8 +1699,8 @@ out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='del'>-			    struct iwl_rx_cmd_buffer *rxb, int queue)</div><div class='add'>+void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='add'>+				struct iwl_rx_cmd_buffer *rxb, int queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rx_status *rx_status;</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='hunk'>@@ -1701,10 +1721,6 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 	if (unlikely(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Currently only NDP type is supported */</div><div class='del'>-	if (info_type != RX_NO_DATA_INFO_TYPE_NDP)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	energy_a = (rssi &amp; RX_NO_DATA_CHAIN_A_MSK) &gt;&gt; RX_NO_DATA_CHAIN_A_POS;</div><div class='ctx'> 	energy_b = (rssi &amp; RX_NO_DATA_CHAIN_B_MSK) &gt;&gt; RX_NO_DATA_CHAIN_B_POS;</div><div class='ctx'> 	channel = (rssi &amp; RX_NO_DATA_CHANNEL_MSK) &gt;&gt; RX_NO_DATA_CHANNEL_POS;</div><div class='hunk'>@@ -1726,9 +1742,22 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 	/* 0-length PSDU */</div><div class='ctx'> 	rx_status-&gt;flag |= RX_FLAG_NO_PSDU;</div><div class='del'>-	/* currently this is the only type for which we get this notif */</div><div class='del'>-	rx_status-&gt;zero_length_psdu_type =</div><div class='del'>-		IEEE80211_RADIOTAP_ZERO_LEN_PSDU_SOUNDING;</div><div class='add'>+</div><div class='add'>+	switch (info_type) {</div><div class='add'>+	case RX_NO_DATA_INFO_TYPE_NDP:</div><div class='add'>+		rx_status-&gt;zero_length_psdu_type =</div><div class='add'>+			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_SOUNDING;</div><div class='add'>+		break;</div><div class='add'>+	case RX_NO_DATA_INFO_TYPE_MU_UNMATCHED:</div><div class='add'>+	case RX_NO_DATA_INFO_TYPE_HE_TB_UNMATCHED:</div><div class='add'>+		rx_status-&gt;zero_length_psdu_type =</div><div class='add'>+			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_NOT_CAPTURED;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rx_status-&gt;zero_length_psdu_type =</div><div class='add'>+			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_VENDOR;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* This may be overridden by iwl_mvm_rx_he() to HE_RU */</div><div class='ctx'> 	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c<br/>index 78694bc38e76..d9ddf9ff6428 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a></div><div class='hunk'>@@ -1082,21 +1082,23 @@ static void iwl_mvm_fill_scan_dwell(struct iwl_mvm *mvm,</div><div class='ctx'> 	dwell-&gt;extended = IWL_SCAN_DWELL_EXTENDED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_fill_channels(struct iwl_mvm *mvm, u8 *channels)</div><div class='add'>+static void iwl_mvm_fill_channels(struct iwl_mvm *mvm, u8 *channels,</div><div class='add'>+				  u32 max_channels)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_supported_band *band;</div><div class='ctx'> 	int i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	band = &amp;mvm-&gt;nvm_data-&gt;bands[NL80211_BAND_2GHZ];</div><div class='del'>-	for (i = 0; i &lt; band-&gt;n_channels; i++, j++)</div><div class='add'>+	for (i = 0; i &lt; band-&gt;n_channels &amp;&amp; j &lt; max_channels; i++, j++)</div><div class='ctx'> 		channels[j] = band-&gt;channels[i].hw_value;</div><div class='ctx'> 	band = &amp;mvm-&gt;nvm_data-&gt;bands[NL80211_BAND_5GHZ];</div><div class='del'>-	for (i = 0; i &lt; band-&gt;n_channels; i++, j++)</div><div class='add'>+	for (i = 0; i &lt; band-&gt;n_channels &amp;&amp; j &lt; max_channels; i++, j++)</div><div class='ctx'> 		channels[j] = band-&gt;channels[i].hw_value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_fill_scan_config_v1(struct iwl_mvm *mvm, void *config,</div><div class='del'>-					u32 flags, u8 channel_flags)</div><div class='add'>+					u32 flags, u8 channel_flags,</div><div class='add'>+					u32 max_channels)</div><div class='ctx'> {</div><div class='ctx'> 	enum iwl_mvm_scan_type type = iwl_mvm_get_scan_type(mvm, NULL);</div><div class='ctx'> 	struct iwl_scan_config_v1 *cfg = config;</div><div class='hunk'>@@ -1115,11 +1117,12 @@ static void iwl_mvm_fill_scan_config_v1(struct iwl_mvm *mvm, void *config,</div><div class='ctx'> 	cfg-&gt;bcast_sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> 	cfg-&gt;channel_flags = channel_flags;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_fill_channels(mvm, cfg-&gt;channel_array);</div><div class='add'>+	iwl_mvm_fill_channels(mvm, cfg-&gt;channel_array, max_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_fill_scan_config(struct iwl_mvm *mvm, void *config,</div><div class='del'>-				     u32 flags, u8 channel_flags)</div><div class='add'>+				     u32 flags, u8 channel_flags,</div><div class='add'>+				     u32 max_channels)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_scan_config *cfg = config;</div><div class='ctx'> </div><div class='hunk'>@@ -1162,7 +1165,7 @@ static void iwl_mvm_fill_scan_config(struct iwl_mvm *mvm, void *config,</div><div class='ctx'> 	cfg-&gt;bcast_sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> 	cfg-&gt;channel_flags = channel_flags;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_fill_channels(mvm, cfg-&gt;channel_array);</div><div class='add'>+	iwl_mvm_fill_channels(mvm, cfg-&gt;channel_array, max_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_config_scan(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1181,7 +1184,7 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)</div><div class='ctx'> 	u8 channel_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(num_channels &gt; mvm-&gt;fw-&gt;ucode_capa.n_scan_channels))</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+		num_channels = mvm-&gt;fw-&gt;ucode_capa.n_scan_channels;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_cdb_supported(mvm)) {</div><div class='ctx'> 		type = iwl_mvm_get_scan_type_band(mvm, NULL,</div><div class='hunk'>@@ -1234,9 +1237,11 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)</div><div class='ctx'> 			flags |= (iwl_mvm_is_scan_fragmented(hb_type)) ?</div><div class='ctx'> 				 SCAN_CONFIG_FLAG_SET_LMAC2_FRAGMENTED :</div><div class='ctx'> 				 SCAN_CONFIG_FLAG_CLEAR_LMAC2_FRAGMENTED;</div><div class='del'>-		iwl_mvm_fill_scan_config(mvm, cfg, flags, channel_flags);</div><div class='add'>+		iwl_mvm_fill_scan_config(mvm, cfg, flags, channel_flags,</div><div class='add'>+					 num_channels);</div><div class='ctx'> 	} else {</div><div class='del'>-		iwl_mvm_fill_scan_config_v1(mvm, cfg, flags, channel_flags);</div><div class='add'>+		iwl_mvm_fill_scan_config_v1(mvm, cfg, flags, channel_flags,</div><div class='add'>+					    num_channels);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd.data[0] = cfg;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c<br/>index 498c315291cf..f545a737a92d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -746,7 +746,8 @@ static int iwl_mvm_find_free_queue(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> static int iwl_mvm_tvqm_enable_txq(struct iwl_mvm *mvm,</div><div class='ctx'> 				   u8 sta_id, u8 tid, unsigned int timeout)</div><div class='ctx'> {</div><div class='del'>-	int queue, size = IWL_DEFAULT_QUEUE_SIZE;</div><div class='add'>+	int queue, size = max_t(u32, IWL_DEFAULT_QUEUE_SIZE,</div><div class='add'>+				mvm-&gt;trans-&gt;cfg-&gt;min_256_ba_txq_size);</div><div class='ctx'> </div><div class='ctx'> 	if (tid == IWL_MAX_TID_COUNT) {</div><div class='ctx'> 		tid = IWL_MGMT_TID;</div><div class='hunk'>@@ -1399,7 +1400,9 @@ void iwl_mvm_add_new_dqa_stream_wk(struct work_struct *wk)</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_sta_alloc_queue(mvm, txq-&gt;sta, txq-&gt;ac, tid);</div><div class='ctx'> 		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+		local_bh_disable();</div><div class='ctx'> 		iwl_mvm_mac_itxq_xmit(mvm-&gt;hw, txq);</div><div class='add'>+		local_bh_enable();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -2107,12 +2110,14 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_has_new_tx_api(mvm)) {</div><div class='ctx'> 		if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 			queue = mvm-&gt;probe_queue;</div><div class='del'>-		else if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		} else if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='ctx'> 			queue = mvm-&gt;p2p_dev_queue;</div><div class='del'>-		else if (WARN(1, "Missing required TXQ for adding bcast STA\n"))</div><div class='add'>+		} else {</div><div class='add'>+			WARN(1, "Missing required TXQ for adding bcast STA\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		bsta-&gt;tfd_queue_msk |= BIT(queue);</div><div class='ctx'> </div><div class='hunk'>@@ -2275,7 +2280,8 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	static const u8 _maddr[] = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='ctx'> 	const u8 *maddr = _maddr;</div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='del'>-		.fifo = IWL_MVM_TX_FIFO_MCAST,</div><div class='add'>+		.fifo = vif-&gt;type == NL80211_IFTYPE_AP ?</div><div class='add'>+			IWL_MVM_TX_FIFO_MCAST : IWL_MVM_TX_FIFO_BE,</div><div class='ctx'> 		.sta_id = msta-&gt;sta_id,</div><div class='ctx'> 		.tid = 0,</div><div class='ctx'> 		.aggregate = false,</div><div class='hunk'>@@ -2333,21 +2339,6 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		iwl_mvm_enable_txq(mvm, NULL, mvmvif-&gt;cab_queue, 0, &amp;cfg,</div><div class='ctx'> 				   timeout);</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;ap_wep_key) {</div><div class='del'>-		u8 key_offset = iwl_mvm_set_fw_key_idx(mvm);</div><div class='del'>-</div><div class='del'>-		__set_bit(key_offset, mvm-&gt;fw_key_table);</div><div class='del'>-</div><div class='del'>-		if (key_offset == STA_KEY_IDX_INVALID)</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-</div><div class='del'>-		ret = iwl_mvm_send_sta_key(mvm, mvmvif-&gt;mcast_sta.sta_id,</div><div class='del'>-					   mvmvif-&gt;ap_wep_key, true, 0, NULL, 0,</div><div class='del'>-					   key_offset, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2419,28 +2410,6 @@ int iwl_mvm_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_disable_txq(mvm, NULL, mvmvif-&gt;cab_queue, 0, 0);</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;ap_wep_key) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (!__test_and_clear_bit(mvmvif-&gt;ap_wep_key-&gt;hw_key_idx,</div><div class='del'>-					  mvm-&gt;fw_key_table)) {</div><div class='del'>-			IWL_ERR(mvm, "offset %d not used in fw key table.\n",</div><div class='del'>-				mvmvif-&gt;ap_wep_key-&gt;hw_key_idx);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* track which key was deleted last */</div><div class='del'>-		for (i = 0; i &lt; STA_KEY_MAX_NUM; i++) {</div><div class='del'>-			if (mvm-&gt;fw_key_deleted[i] &lt; U8_MAX)</div><div class='del'>-				mvm-&gt;fw_key_deleted[i]++;</div><div class='del'>-		}</div><div class='del'>-		mvm-&gt;fw_key_deleted[mvmvif-&gt;ap_wep_key-&gt;hw_key_idx] = 0;</div><div class='del'>-		ret = __iwl_mvm_remove_sta_key(mvm, mvmvif-&gt;mcast_sta.sta_id,</div><div class='del'>-					       mvmvif-&gt;ap_wep_key, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = iwl_mvm_rm_sta_common(mvm, mvmvif-&gt;mcast_sta.sta_id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_WARN(mvm, "Failed sending remove station\n");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h<br/>index 79700c7310a1..b4d4071b865d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2016 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2015 - 2016 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -394,7 +394,6 @@ struct iwl_mvm_rxq_dup_data {</div><div class='ctx'>  *	the BA window. To be used for UAPSD only.</div><div class='ctx'>  * @ptk_pn: per-queue PTK PN data structures</div><div class='ctx'>  * @dup_data: per queue duplicate packet detection data</div><div class='del'>- * @wep_key: used in AP mode. Is a duplicate of the WEP key.</div><div class='ctx'>  * @deferred_traffic_tid_map: indication bitmap of deferred traffic per-TID</div><div class='ctx'>  * @tx_ant: the index of the antenna to use for data tx to this station. Only</div><div class='ctx'>  *	used during connection establishment (e.g. for the 4 way handshake</div><div class='hunk'>@@ -426,8 +425,6 @@ struct iwl_mvm_sta {</div><div class='ctx'> 	struct iwl_mvm_key_pn __rcu *ptk_pn[4];</div><div class='ctx'> 	struct iwl_mvm_rxq_dup_data *dup_data;</div><div class='ctx'> </div><div class='del'>-	struct ieee80211_key_conf *wep_key;</div><div class='del'>-</div><div class='ctx'> 	u8 reserved_queue;</div><div class='ctx'> </div><div class='ctx'> 	/* Temporary, until the new TLC will control the Tx protection */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c<br/>index 859aa5a4e6b5..9df21a8d1fc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(C) 2018 Intel Corporation</div><div class='add'>+ * Copyright(C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(C) 2018 Intel Corporation</div><div class='add'>+ * Copyright(C) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -252,8 +252,7 @@ static void iwl_mvm_tdls_update_cs_state(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	/* we only send requests to our switching peer - update sent time */</div><div class='ctx'> 	if (state == IWL_MVM_TDLS_SW_REQ_SENT)</div><div class='del'>-		mvm-&gt;tdls_cs.peer.sent_timestamp =</div><div class='del'>-			iwl_read_prph(mvm-&gt;trans, DEVICE_SYSTEM_TIME_REG);</div><div class='add'>+		mvm-&gt;tdls_cs.peer.sent_timestamp = iwl_mvm_get_systime(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (state == IWL_MVM_TDLS_SW_IDLE)</div><div class='ctx'> 		mvm-&gt;tdls_cs.cur_sta_id = IWL_MVM_INVALID_STA;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c<br/>index 9693fa4cdc39..4d34e5ab1bff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -234,6 +234,7 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		iwl_mvm_csa_client_absent(mvm, te_data-&gt;vif);</div><div class='add'>+		cancel_delayed_work(&amp;mvmvif-&gt;csa_work);</div><div class='ctx'> 		ieee80211_chswitch_done(te_data-&gt;vif, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c<br/>index 4649327abb45..b9914efc55c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a></div><div class='hunk'>@@ -1418,6 +1418,16 @@ void iwl_mvm_tcm_rm_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;mvmvif-&gt;uapsd_nonagg_detected_wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 iwl_mvm_get_systime(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u32 reg_addr = DEVICE_SYSTEM_TIME_REG;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='add'>+	    mvm-&gt;trans-&gt;cfg-&gt;gp2_reg_addr)</div><div class='add'>+		reg_addr = mvm-&gt;trans-&gt;cfg-&gt;gp2_reg_addr;</div><div class='add'>+</div><div class='add'>+	return iwl_read_prph(mvm-&gt;trans, reg_addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime)</div><div class='ctx'> {</div><div class='hunk'>@@ -1432,7 +1442,7 @@ void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime)</div><div class='ctx'> 		iwl_mvm_power_update_device(mvm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*gp2 = iwl_read_prph(mvm-&gt;trans, DEVICE_SYSTEM_TIME_REG);</div><div class='add'>+	*gp2 = iwl_mvm_get_systime(mvm);</div><div class='ctx'> 	*boottime = ktime_get_boot_ns();</div><div class='ctx'> </div><div class='ctx'> 	if (!ps_disabled) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c<br/>index 1e36459948db..f496d1bcb643 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c</a></div><div class='hunk'>@@ -66,7 +66,8 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,</div><div class='ctx'> 	void *iml_img;</div><div class='ctx'> 	u32 control_flags = 0;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int cmdq_size = max_t(u32, TFD_CMD_SLOTS, trans-&gt;cfg-&gt;min_txq_size);</div><div class='add'>+	int cmdq_size = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='add'>+			      trans-&gt;cfg-&gt;min_txq_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate prph scratch */</div><div class='ctx'> 	prph_scratch = dma_alloc_coherent(trans-&gt;dev, sizeof(*prph_scratch),</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c<br/>index 9274e317cc77..8969b47bacf2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * GPL LICENSE SUMMARY</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  * BSD LICENSE</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -210,7 +210,7 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,</div><div class='ctx'> 	ctxt_info-&gt;hcmd_cfg.cmd_queue_addr =</div><div class='ctx'> 		cpu_to_le64(trans_pcie-&gt;txq[trans_pcie-&gt;cmd_queue]-&gt;dma_addr);</div><div class='ctx'> 	ctxt_info-&gt;hcmd_cfg.cmd_queue_size =</div><div class='del'>-		TFD_QUEUE_CB_SIZE(TFD_CMD_SLOTS);</div><div class='add'>+		TFD_QUEUE_CB_SIZE(IWL_CMD_QUEUE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate ucode sections in dram and set addresses */</div><div class='ctx'> 	ret = iwl_pcie_init_fw_sec(trans, fw, &amp;ctxt_info-&gt;dram);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c<br/>index 2b94e4cef56c..cd035061cdd5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a></div><div class='hunk'>@@ -928,11 +928,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = {</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x34F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x34F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x34F0, 0x4070, iwl_ax101_cfg_qu_hr)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x40C0, 0x0000, iwl22560_2ax_cfg_su_cdb)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x40C0, 0x0010, iwl22560_2ax_cfg_su_cdb)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x40c0, 0x0090, iwl22560_2ax_cfg_su_cdb)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x40C0, 0x0310, iwl22560_2ax_cfg_su_cdb)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x40C0, 0x0A10, iwl22560_2ax_cfg_su_cdb)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x43F0, 0x0040, iwl_ax101_cfg_qu_hr)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x43F0, 0x0070, iwl_ax101_cfg_qu_hr)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x43F0, 0x0074, iwl_ax101_cfg_qu_hr)},</div><div class='hunk'>@@ -953,17 +948,15 @@ static const struct pci_device_id iwl_hw_card_ids[] = {</div><div class='ctx'> 	{IWL_PCI_DEVICE(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl_ax101_cfg_qu_hr)},</div><div class='ctx'> </div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl22260_2ax_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl22260_2ax_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl22260_2ax_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl22260_2ax_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl_ax200_cfg_cc)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl_ax200_cfg_cc)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl_ax200_cfg_cc)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl_ax200_cfg_cc)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x2723, 0x1653, killer1650w_2ax_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x2723, 0x1654, killer1650x_2ax_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl22260_2ax_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl22260_2ax_cfg)},</div><div class='del'>-</div><div class='del'>-	{IWL_PCI_DEVICE(0x1a56, 0x1653, killer1650w_2ax_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x1a56, 0x1654, killer1650x_2ax_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x2080, iwl_ax200_cfg_cc)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl_ax200_cfg_cc)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl_ax200_cfg_cc)},</div><div class='ctx'> </div><div class='ctx'> 	{IWL_PCI_DEVICE(0x2725, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},</div><div class='hunk'>@@ -1046,9 +1039,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register transport layer debugfs here */</div><div class='del'>-	ret = iwl_trans_pcie_dbgfs_register(iwl_trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_free_drv;</div><div class='add'>+	iwl_trans_pcie_dbgfs_register(iwl_trans);</div><div class='ctx'> </div><div class='ctx'> 	/* if RTPM is in use, enable it in our device */</div><div class='ctx'> 	if (iwl_trans-&gt;runtime_pm_mode != IWL_PLAT_PM_MODE_DISABLED) {</div><div class='hunk'>@@ -1077,8 +1068,6 @@ static int iwl_pci_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='del'>-out_free_drv:</div><div class='del'>-	iwl_drv_stop(iwl_trans-&gt;drv);</div><div class='ctx'> out_free_trans:</div><div class='ctx'> 	iwl_trans_pcie_free(iwl_trans);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h<br/>index bf8b61a476c5..b513037dc066 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/internal.h</a></div><div class='hunk'>@@ -106,7 +106,6 @@ struct iwl_host_cmd;</div><div class='ctx'>  * @page: driver's pointer to the rxb page</div><div class='ctx'>  * @invalid: rxb is in driver ownership - not owned by HW</div><div class='ctx'>  * @vid: index of this rxb in the global table</div><div class='del'>- * @size: size used from the buffer</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rx_mem_buffer {</div><div class='ctx'> 	dma_addr_t page_dma;</div><div class='hunk'>@@ -114,7 +113,6 @@ struct iwl_rx_mem_buffer {</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> 	bool invalid;</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	u32 size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -135,46 +133,32 @@ struct isr_statistics {</div><div class='ctx'> 	u32 unhandled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_RX_TD_TYPE_MSK	0xff000000</div><div class='del'>-#define IWL_RX_TD_SIZE_MSK	0x00ffffff</div><div class='del'>-#define IWL_RX_TD_SIZE_2K	BIT(11)</div><div class='del'>-#define IWL_RX_TD_TYPE		0</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rx_transfer_desc - transfer descriptor</div><div class='del'>- * @type_n_size: buffer type (bit 0: external buff valid,</div><div class='del'>- *	bit 1: optional footer valid, bit 2-7: reserved)</div><div class='del'>- *	and buffer size</div><div class='ctx'>  * @addr: ptr to free buffer start address</div><div class='ctx'>  * @rbid: unique tag of the buffer</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rx_transfer_desc {</div><div class='del'>-	__le32 type_n_size;</div><div class='del'>-	__le64 addr;</div><div class='ctx'> 	__le16 rbid;</div><div class='del'>-	__le16 reserved;</div><div class='add'>+	__le16 reserved[3];</div><div class='add'>+	__le64 addr;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define IWL_RX_CD_SIZE		0xffffff00</div><div class='add'>+#define IWL_RX_CD_FLAGS_FRAGMENTED	BIT(0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rx_completion_desc - completion descriptor</div><div class='del'>- * @type: buffer type (bit 0: external buff valid,</div><div class='del'>- *	bit 1: optional footer valid, bit 2-7: reserved)</div><div class='del'>- * @status: status of the completion</div><div class='ctx'>  * @reserved1: reserved</div><div class='ctx'>  * @rbid: unique tag of the received buffer</div><div class='del'>- * @size: buffer size, masked by IWL_RX_CD_SIZE</div><div class='add'>+ * @flags: flags (0: fragmented, all others: reserved)</div><div class='ctx'>  * @reserved2: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rx_completion_desc {</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 status;</div><div class='del'>-	__le16 reserved1;</div><div class='add'>+	__le32 reserved1;</div><div class='ctx'> 	__le16 rbid;</div><div class='del'>-	__le32 size;</div><div class='del'>-	u8 reserved2[22];</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 reserved2[25];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -306,10 +290,6 @@ struct iwl_cmd_meta {</div><div class='ctx'> 	u32 tbs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define TFD_TX_CMD_SLOTS 256</div><div class='del'>-#define TFD_CMD_SLOTS 32</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The FH will write back to the first TB only, so we need to copy some data</div><div class='ctx'>  * into the buffer regardless of whether it should be mapped or not.</div><div class='hunk'>@@ -556,7 +536,7 @@ struct iwl_trans_pcie {</div><div class='ctx'> 	int ict_index;</div><div class='ctx'> 	bool use_ict;</div><div class='ctx'> 	bool is_down, opmode_down;</div><div class='del'>-	bool debug_rfkill;</div><div class='add'>+	s8 debug_rfkill;</div><div class='ctx'> 	struct isr_statistics isr_stats;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t irq_lock;</div><div class='hunk'>@@ -1002,7 +982,7 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;trans_pcie-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (trans_pcie-&gt;debug_rfkill)</div><div class='add'>+	if (trans_pcie-&gt;debug_rfkill == 1)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return !(iwl_read32(trans, CSR_GP_CNTRL) &amp;</div><div class='hunk'>@@ -1043,15 +1023,12 @@ static inline bool iwl_pcie_dbg_on(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state);</div><div class='ctx'> void iwl_trans_pcie_dump_regs(struct iwl_trans *trans);</div><div class='del'>-void iwl_trans_sync_nmi(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);</div><div class='ctx'> #else</div><div class='del'>-static inline int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static inline void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int iwl_pci_fw_exit_d0i3(struct iwl_trans *trans);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c<br/>index 8d4f0628622b..31b3591f71d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/rx.c</a></div><div class='hunk'>@@ -282,9 +282,8 @@ static void iwl_pcie_restock_bd(struct iwl_trans *trans,</div><div class='ctx'> 	if (trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22560) {</div><div class='ctx'> 		struct iwl_rx_transfer_desc *bd = rxq-&gt;bd;</div><div class='ctx'> </div><div class='del'>-		bd[rxq-&gt;write].type_n_size =</div><div class='del'>-			cpu_to_le32((IWL_RX_TD_TYPE &amp; IWL_RX_TD_TYPE_MSK) |</div><div class='del'>-			((IWL_RX_TD_SIZE_2K &gt;&gt; 8) &amp; IWL_RX_TD_SIZE_MSK));</div><div class='add'>+		BUILD_BUG_ON(sizeof(*bd) != 2 * sizeof(u64));</div><div class='add'>+</div><div class='ctx'> 		bd[rxq-&gt;write].addr = cpu_to_le64(rxb-&gt;page_dma);</div><div class='ctx'> 		bd[rxq-&gt;write].rbid = cpu_to_le16(rxb-&gt;vid);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -435,7 +434,7 @@ static struct page *iwl_pcie_rx_alloc_page(struct iwl_trans *trans,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Issue an error if we don't have enough pre-allocated</div><div class='ctx'> 		  * buffers.</div><div class='del'>-`		 */</div><div class='add'>+		 */</div><div class='ctx'> 		if (!(gfp_mask &amp; __GFP_NOWARN) &amp;&amp; net_ratelimit())</div><div class='ctx'> 			IWL_CRIT(trans,</div><div class='ctx'> 				 "Failed to alloc_pages\n");</div><div class='hunk'>@@ -1265,9 +1264,6 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 			.truesize = max_len,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22560)</div><div class='del'>-			rxcb.status = rxq-&gt;cd[i].status;</div><div class='del'>-</div><div class='ctx'> 		pkt = rxb_addr(&amp;rxcb);</div><div class='ctx'> </div><div class='ctx'> 		if (pkt-&gt;len_n_flags == cpu_to_le32(FH_RSCSR_FRAME_INVALID)) {</div><div class='hunk'>@@ -1394,6 +1390,8 @@ static struct iwl_rx_mem_buffer *iwl_pcie_get_rxb(struct iwl_trans *trans,</div><div class='ctx'> 	struct iwl_rx_mem_buffer *rxb;</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_rx_completion_desc) != 32);</div><div class='add'>+</div><div class='ctx'> 	if (!trans-&gt;cfg-&gt;mq_rx_supported) {</div><div class='ctx'> 		rxb = rxq-&gt;queue[i];</div><div class='ctx'> 		rxq-&gt;queue[i] = NULL;</div><div class='hunk'>@@ -1415,9 +1413,6 @@ static struct iwl_rx_mem_buffer *iwl_pcie_get_rxb(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RX(trans, "Got virtual RB ID %u\n", (u32)rxb-&gt;vid);</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22560)</div><div class='del'>-		rxb-&gt;size = le32_to_cpu(rxq-&gt;cd[i].size) &amp; IWL_RX_CD_SIZE;</div><div class='del'>-</div><div class='ctx'> 	rxb-&gt;invalid = true;</div><div class='ctx'> </div><div class='ctx'> 	return rxb;</div><div class='hunk'>@@ -1434,10 +1429,15 @@ out_err:</div><div class='ctx'> static void iwl_pcie_rx_handle(struct iwl_trans *trans, int queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[queue];</div><div class='add'>+	struct iwl_rxq *rxq;</div><div class='ctx'> 	u32 r, i, count = 0;</div><div class='ctx'> 	bool emergency = false;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!trans_pcie-&gt;rxq || !trans_pcie-&gt;rxq[queue].bd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rxq = &amp;trans_pcie-&gt;rxq[queue];</div><div class='add'>+</div><div class='ctx'> restart:</div><div class='ctx'> 	spin_lock(&amp;rxq-&gt;lock);</div><div class='ctx'> 	/* uCode's read index (stored in shared DRAM) indicates the last Rx</div><div class='hunk'>@@ -2212,6 +2212,7 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 			"Hardware error detected. Restarting.\n");</div><div class='ctx'> </div><div class='ctx'> 		isr_stats-&gt;hw++;</div><div class='add'>+		trans-&gt;hw_error = true;</div><div class='ctx'> 		iwl_pcie_irq_handle_error(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c<br/>index 9c203ca75de9..8507a7bdcfdd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * GPL LICENSE SUMMARY</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of version 2 of the GNU General Public License as</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  * BSD LICENSE</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -234,7 +234,8 @@ void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)</div><div class='ctx'> static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	int queue_size = max_t(u32, TFD_CMD_SLOTS, trans-&gt;cfg-&gt;min_txq_size);</div><div class='add'>+	int queue_size = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='add'>+			       trans-&gt;cfg-&gt;min_txq_size);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: most of the logic can be removed in A0 - but not in Z0 */</div><div class='ctx'> 	spin_lock(&amp;trans_pcie-&gt;irq_lock);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c<br/>index fe8269d023de..803fcbac4152 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/trans.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/trans.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/trans.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/trans.c</a></div><div class='hunk'>@@ -896,6 +896,8 @@ void iwl_pcie_apply_destination(struct iwl_trans *trans)</div><div class='ctx'> 		if (!trans-&gt;num_blocks)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "WRT: applying DRAM buffer[0] destination\n");</div><div class='ctx'> 		iwl_write_umac_prph(trans, MON_BUFF_BASE_ADDR_VER2,</div><div class='ctx'> 				    trans-&gt;fw_mon[0].physical &gt;&gt;</div><div class='ctx'> 				    MON_BUFF_SHIFT_VER2);</div><div class='hunk'>@@ -2067,7 +2069,6 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans,</div><div class='ctx'> 	 * MAC_ACCESS_REQ bit to be performed before any other writes</div><div class='ctx'> 	 * scheduled on different CPUs (after we drop reg_lock).</div><div class='ctx'> 	 */</div><div class='del'>-	mmiowb();</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;trans_pcie-&gt;reg_lock, *flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -2442,9 +2443,8 @@ void iwl_pcie_dump_csr(struct iwl_trans *trans)</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> /* create and remove of files */</div><div class='ctx'> #define DEBUGFS_ADD_FILE(name, parent, mode) do {			\</div><div class='del'>-	if (!debugfs_create_file(#name, mode, parent, trans,		\</div><div class='del'>-				 &amp;iwl_dbgfs_##name##_ops))		\</div><div class='del'>-		goto err;						\</div><div class='add'>+	debugfs_create_file(#name, mode, parent, trans,			\</div><div class='add'>+			    &amp;iwl_dbgfs_##name##_ops);			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> /* file operation */</div><div class='hunk'>@@ -2687,16 +2687,17 @@ static ssize_t iwl_dbgfs_rfkill_write(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans *trans = file-&gt;private_data;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	bool old = trans_pcie-&gt;debug_rfkill;</div><div class='add'>+	bool new_value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = kstrtobool_from_user(user_buf, count, &amp;trans_pcie-&gt;debug_rfkill);</div><div class='add'>+	ret = kstrtobool_from_user(user_buf, count, &amp;new_value);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (old == trans_pcie-&gt;debug_rfkill)</div><div class='add'>+	if (new_value == trans_pcie-&gt;debug_rfkill)</div><div class='ctx'> 		return count;</div><div class='ctx'> 	IWL_WARN(trans, "changing debug rfkill %d-&gt;%d\n",</div><div class='del'>-		 old, trans_pcie-&gt;debug_rfkill);</div><div class='add'>+		 trans_pcie-&gt;debug_rfkill, new_value);</div><div class='add'>+	trans_pcie-&gt;debug_rfkill = new_value;</div><div class='ctx'> 	iwl_pcie_handle_rfkill_irq(trans);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -2847,7 +2848,7 @@ static const struct file_operations iwl_dbgfs_monitor_data_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Create the debugfs files and directories */</div><div class='del'>-int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dir = trans-&gt;dbgfs_dir;</div><div class='ctx'> </div><div class='hunk'>@@ -2858,11 +2859,6 @@ int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans)</div><div class='ctx'> 	DEBUGFS_ADD_FILE(fh_reg, dir, 0400);</div><div class='ctx'> 	DEBUGFS_ADD_FILE(rfkill, dir, 0600);</div><div class='ctx'> 	DEBUGFS_ADD_FILE(monitor_data, dir, 0400);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR(trans, "failed to create the trans debugfs entry\n");</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_trans_pcie_debugfs_cleanup(struct iwl_trans *trans)</div><div class='hunk'>@@ -3012,10 +3008,14 @@ static void</div><div class='ctx'> iwl_trans_pcie_dump_pointers(struct iwl_trans *trans,</div><div class='ctx'> 			     struct iwl_fw_error_dump_fw_mon *fw_mon_data)</div><div class='ctx'> {</div><div class='del'>-	u32 base, write_ptr, wrap_cnt;</div><div class='add'>+	u32 base, base_high, write_ptr, write_ptr_val, wrap_cnt;</div><div class='ctx'> </div><div class='del'>-	/* If there was a dest TLV - use the values from there */</div><div class='del'>-	if (trans-&gt;ini_valid) {</div><div class='add'>+	if (trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		base = DBGC_CUR_DBGBUF_BASE_ADDR_LSB;</div><div class='add'>+		base_high = DBGC_CUR_DBGBUF_BASE_ADDR_MSB;</div><div class='add'>+		write_ptr = DBGC_CUR_DBGBUF_STATUS;</div><div class='add'>+		wrap_cnt = DBGC_DBGBUF_WRAP_AROUND;</div><div class='add'>+	} else if (trans-&gt;ini_valid) {</div><div class='ctx'> 		base = iwl_umac_prph(trans, MON_BUFF_BASE_ADDR_VER2);</div><div class='ctx'> 		write_ptr = iwl_umac_prph(trans, MON_BUFF_WRPTR_VER2);</div><div class='ctx'> 		wrap_cnt = iwl_umac_prph(trans, MON_BUFF_CYCLE_CNT_VER2);</div><div class='hunk'>@@ -3028,12 +3028,18 @@ iwl_trans_pcie_dump_pointers(struct iwl_trans *trans,</div><div class='ctx'> 		write_ptr = MON_BUFF_WRPTR;</div><div class='ctx'> 		wrap_cnt = MON_BUFF_CYCLE_CNT;</div><div class='ctx'> 	}</div><div class='del'>-	fw_mon_data-&gt;fw_mon_wr_ptr =</div><div class='del'>-		cpu_to_le32(iwl_read_prph(trans, write_ptr));</div><div class='add'>+</div><div class='add'>+	write_ptr_val = iwl_read_prph(trans, write_ptr);</div><div class='ctx'> 	fw_mon_data-&gt;fw_mon_cycle_cnt =</div><div class='ctx'> 		cpu_to_le32(iwl_read_prph(trans, wrap_cnt));</div><div class='ctx'> 	fw_mon_data-&gt;fw_mon_base_ptr =</div><div class='ctx'> 		cpu_to_le32(iwl_read_prph(trans, base));</div><div class='add'>+	if (trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		fw_mon_data-&gt;fw_mon_base_high_ptr =</div><div class='add'>+			cpu_to_le32(iwl_read_prph(trans, base_high));</div><div class='add'>+		write_ptr_val &amp;= DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK;</div><div class='add'>+	}</div><div class='add'>+	fw_mon_data-&gt;fw_mon_wr_ptr = cpu_to_le32(write_ptr_val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='hunk'>@@ -3044,9 +3050,10 @@ iwl_trans_pcie_dump_monitor(struct iwl_trans *trans,</div><div class='ctx'> 	u32 len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((trans-&gt;num_blocks &amp;&amp;</div><div class='del'>-	     trans-&gt;cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) ||</div><div class='del'>-	     (trans-&gt;dbg_dest_tlv &amp;&amp; !trans-&gt;ini_valid) ||</div><div class='del'>-	     (trans-&gt;ini_valid &amp;&amp; trans-&gt;num_blocks)) {</div><div class='add'>+	     (trans-&gt;cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000 ||</div><div class='add'>+	      trans-&gt;cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210 ||</div><div class='add'>+	      trans-&gt;ini_valid)) ||</div><div class='add'>+	    (trans-&gt;dbg_dest_tlv &amp;&amp; !trans-&gt;ini_valid)) {</div><div class='ctx'> 		struct iwl_fw_error_dump_fw_mon *fw_mon_data;</div><div class='ctx'> </div><div class='ctx'> 		(*data)-&gt;type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR);</div><div class='hunk'>@@ -3165,8 +3172,10 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 	len = sizeof(*dump_data);</div><div class='ctx'> </div><div class='ctx'> 	/* host commands */</div><div class='del'>-	len += sizeof(*data) +</div><div class='del'>-		cmdq-&gt;n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE);</div><div class='add'>+	if (dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_TXCMD))</div><div class='add'>+		len += sizeof(*data) +</div><div class='add'>+			cmdq-&gt;n_window * (sizeof(*txcmd) +</div><div class='add'>+					  TFD_MAX_PAYLOAD_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* FW monitor */</div><div class='ctx'> 	if (dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_FW_MONITOR))</div><div class='hunk'>@@ -3318,7 +3327,8 @@ static void iwl_trans_pcie_resume(struct iwl_trans *trans)</div><div class='ctx'> 	.unref = iwl_trans_pcie_unref,					\</div><div class='ctx'> 	.dump_data = iwl_trans_pcie_dump_data,				\</div><div class='ctx'> 	.d3_suspend = iwl_trans_pcie_d3_suspend,			\</div><div class='del'>-	.d3_resume = iwl_trans_pcie_d3_resume</div><div class='add'>+	.d3_resume = iwl_trans_pcie_d3_resume,				\</div><div class='add'>+	.sync_nmi = iwl_trans_pcie_sync_nmi</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> #define IWL_TRANS_PM_OPS						\</div><div class='hunk'>@@ -3411,7 +3421,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_no_pci;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	trans_pcie-&gt;debug_rfkill = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (!cfg-&gt;base_params-&gt;pcie_l1_allowed) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3539,9 +3549,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans-&gt;hw_rf_id) ==</div><div class='ctx'> 			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF)) {</div><div class='ctx'> 			trans-&gt;cfg = &amp;iwlax210_2ax_cfg_so_gf_a0;</div><div class='add'>+		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans-&gt;hw_rf_id) ==</div><div class='add'>+			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF4)) {</div><div class='add'>+			trans-&gt;cfg = &amp;iwlax210_2ax_cfg_so_gf4_a0;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (cfg == &amp;iwl_ax101_cfg_qu_hr) {</div><div class='ctx'> 		if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans-&gt;hw_rf_id) ==</div><div class='add'>+		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &amp;&amp;</div><div class='add'>+		    trans-&gt;hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {</div><div class='add'>+			trans-&gt;cfg = &amp;iwl22000_2ax_cfg_qnj_hr_b0;</div><div class='add'>+		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans-&gt;hw_rf_id) ==</div><div class='ctx'> 		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {</div><div class='ctx'> 			trans-&gt;cfg = &amp;iwl_ax101_cfg_qu_hr;</div><div class='ctx'> 		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans-&gt;hw_rf_id) ==</div><div class='hunk'>@@ -3560,7 +3577,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans-&gt;hw_rf_id) ==</div><div class='ctx'> 		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &amp;&amp;</div><div class='del'>-		   (trans-&gt;cfg != &amp;iwl22260_2ax_cfg ||</div><div class='add'>+		   (trans-&gt;cfg != &amp;iwl_ax200_cfg_cc ||</div><div class='ctx'> 		    trans-&gt;hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {</div><div class='ctx'> 		u32 hw_status;</div><div class='ctx'> </div><div class='hunk'>@@ -3637,22 +3654,29 @@ out_no_pci:</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_trans_sync_nmi(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	unsigned long timeout = jiffies + IWL_TRANS_NMI_TIMEOUT;</div><div class='add'>+	u32 inta_addr, sw_err_bit;</div><div class='add'>+</div><div class='add'>+	if (trans_pcie-&gt;msix_enabled) {</div><div class='add'>+		inta_addr = CSR_MSIX_HW_INT_CAUSES_AD;</div><div class='add'>+		sw_err_bit = MSIX_HW_INT_CAUSES_REG_SW_ERR;</div><div class='add'>+	} else {</div><div class='add'>+		inta_addr = CSR_INT;</div><div class='add'>+		sw_err_bit = CSR_INT_BIT_SW_ERR;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_disable_interrupts(trans);</div><div class='ctx'> 	iwl_force_nmi(trans);</div><div class='ctx'> 	while (time_after(timeout, jiffies)) {</div><div class='del'>-		u32 inta_hw = iwl_read32(trans,</div><div class='del'>-					 CSR_MSIX_HW_INT_CAUSES_AD);</div><div class='add'>+		u32 inta_hw = iwl_read32(trans, inta_addr);</div><div class='ctx'> </div><div class='ctx'> 		/* Error detected by uCode */</div><div class='del'>-		if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_SW_ERR) {</div><div class='add'>+		if (inta_hw &amp; sw_err_bit) {</div><div class='ctx'> 			/* Clear causes register */</div><div class='del'>-			iwl_write32(trans, CSR_MSIX_HW_INT_CAUSES_AD,</div><div class='del'>-				    inta_hw &amp;</div><div class='del'>-				    MSIX_HW_INT_CAUSES_REG_SW_ERR);</div><div class='add'>+			iwl_write32(trans, inta_addr, inta_hw &amp; sw_err_bit);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c<br/>index 88530d9f4a54..38d110338987 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c</a></div><div class='hunk'>@@ -965,7 +965,7 @@ static int iwl_pcie_gen2_send_hcmd_sync(struct iwl_trans *trans,</div><div class='ctx'> 			       cmd_str);</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> </div><div class='del'>-		iwl_trans_sync_nmi(trans);</div><div class='add'>+		iwl_trans_pcie_sync_nmi(trans);</div><div class='ctx'> 		goto cancel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c<br/>index 9fbd37d23e85..fa4245d0d4a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intel/iwlwifi/pcie/tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intel/iwlwifi/pcie/tx.c</a></div><div class='hunk'>@@ -996,10 +996,11 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 		bool cmd_queue = (txq_id == trans_pcie-&gt;cmd_queue);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd_queue)</div><div class='del'>-			slots_num = max_t(u32, TFD_CMD_SLOTS,</div><div class='add'>+			slots_num = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='ctx'> 					  trans-&gt;cfg-&gt;min_txq_size);</div><div class='ctx'> 		else</div><div class='del'>-			slots_num = TFD_TX_CMD_SLOTS;</div><div class='add'>+			slots_num = max_t(u32, IWL_DEFAULT_QUEUE_SIZE,</div><div class='add'>+					  trans-&gt;cfg-&gt;min_256_ba_txq_size);</div><div class='ctx'> 		trans_pcie-&gt;txq[txq_id] = &amp;trans_pcie-&gt;txq_memory[txq_id];</div><div class='ctx'> 		ret = iwl_pcie_txq_alloc(trans, trans_pcie-&gt;txq[txq_id],</div><div class='ctx'> 					 slots_num, cmd_queue);</div><div class='hunk'>@@ -1049,10 +1050,11 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)</div><div class='ctx'> 		bool cmd_queue = (txq_id == trans_pcie-&gt;cmd_queue);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd_queue)</div><div class='del'>-			slots_num = max_t(u32, TFD_CMD_SLOTS,</div><div class='add'>+			slots_num = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='ctx'> 					  trans-&gt;cfg-&gt;min_txq_size);</div><div class='ctx'> 		else</div><div class='del'>-			slots_num = TFD_TX_CMD_SLOTS;</div><div class='add'>+			slots_num = max_t(u32, IWL_DEFAULT_QUEUE_SIZE,</div><div class='add'>+					  trans-&gt;cfg-&gt;min_256_ba_txq_size);</div><div class='ctx'> 		ret = iwl_pcie_txq_init(trans, trans_pcie-&gt;txq[txq_id],</div><div class='ctx'> 					slots_num, cmd_queue);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1960,7 +1962,7 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,</div><div class='ctx'> 			       iwl_get_cmd_string(trans, cmd-&gt;id));</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> </div><div class='del'>-		iwl_trans_sync_nmi(trans);</div><div class='add'>+		iwl_trans_pcie_sync_nmi(trans);</div><div class='ctx'> 		goto cancel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/mic.c b/drivers/net/wireless/intersil/orinoco/mic.c<br/>index 67b0c05afbdb..a324bc4b7938 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intersil/orinoco/mic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intersil/orinoco/mic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intersil/orinoco/mic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intersil/orinoco/mic.c</a></div><div class='hunk'>@@ -65,7 +65,6 @@ int orinoco_mic(struct crypto_shash *tfm_michael, u8 *key,</div><div class='ctx'> 	hdr[ETH_ALEN * 2 + 3] = 0;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm_michael;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = crypto_shash_setkey(tfm_michael, key, MIC_KEYLEN);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/p54pci.c b/drivers/net/wireless/intersil/p54/p54pci.c<br/>index 27a49068d32d..57ad56435dda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intersil/p54/p54pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/intersil/p54/p54pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/intersil/p54/p54pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/intersil/p54/p54pci.c</a></div><div class='hunk'>@@ -554,7 +554,7 @@ static int p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot enable new PCI device\n");</div><div class='del'>-		return err;</div><div class='add'>+		goto err_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mem_addr = pci_resource_start(pdev, 0);</div><div class='hunk'>@@ -639,6 +639,7 @@ static int p54p_probe(struct pci_dev *pdev,</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'>  err_disable_dev:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='add'>+err_put:</div><div class='ctx'> 	pci_dev_put(pdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c<br/>index 0838af04d681..60ca13e0f15b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mac80211_hwsim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mac80211_hwsim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mac80211_hwsim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mac80211_hwsim.c</a></div><div class='hunk'>@@ -409,8 +409,8 @@ static int mac80211_hwsim_vendor_cmd_test(struct wiphy *wiphy,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_MAX, data, data_len,</div><div class='del'>-			hwsim_vendor_test_policy, NULL);</div><div class='add'>+	err = nla_parse_deprecated(tb, QCA_WLAN_VENDOR_ATTR_MAX, data,</div><div class='add'>+				   data_len, hwsim_vendor_test_policy, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (!tb[QCA_WLAN_VENDOR_ATTR_TEST])</div><div class='hunk'>@@ -521,7 +521,7 @@ struct mac80211_hwsim_data {</div><div class='ctx'> 	unsigned int rx_filter;</div><div class='ctx'> 	bool started, idle, scanning;</div><div class='ctx'> 	struct mutex mutex;</div><div class='del'>-	struct tasklet_hrtimer beacon_timer;</div><div class='add'>+	struct hrtimer beacon_timer;</div><div class='ctx'> 	enum ps_mode {</div><div class='ctx'> 		PS_DISABLED, PS_ENABLED, PS_AUTO_POLL, PS_MANUAL_POLL</div><div class='ctx'> 	} ps;</div><div class='hunk'>@@ -1460,7 +1460,7 @@ static void mac80211_hwsim_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac80211_hwsim_data *data = hw-&gt;priv;</div><div class='ctx'> 	data-&gt;started = false;</div><div class='del'>-	tasklet_hrtimer_cancel(&amp;data-&gt;beacon_timer);</div><div class='add'>+	hrtimer_cancel(&amp;data-&gt;beacon_timer);</div><div class='ctx'> 	wiphy_dbg(hw-&gt;wiphy, "%s\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1583,14 +1583,12 @@ static enum hrtimer_restart</div><div class='ctx'> mac80211_hwsim_beacon(struct hrtimer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac80211_hwsim_data *data =</div><div class='del'>-		container_of(timer, struct mac80211_hwsim_data,</div><div class='del'>-			     beacon_timer.timer);</div><div class='add'>+		container_of(timer, struct mac80211_hwsim_data, beacon_timer);</div><div class='ctx'> 	struct ieee80211_hw *hw = data-&gt;hw;</div><div class='ctx'> 	u64 bcn_int = data-&gt;beacon_int;</div><div class='del'>-	ktime_t next_bcn;</div><div class='ctx'> </div><div class='ctx'> 	if (!data-&gt;started)</div><div class='del'>-		goto out;</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(</div><div class='ctx'> 		hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='hunk'>@@ -1601,12 +1599,9 @@ mac80211_hwsim_beacon(struct hrtimer *timer)</div><div class='ctx'> 		bcn_int -= data-&gt;bcn_delta;</div><div class='ctx'> 		data-&gt;bcn_delta = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	next_bcn = ktime_add(hrtimer_get_expires(timer),</div><div class='del'>-			     ns_to_ktime(bcn_int * 1000));</div><div class='del'>-	tasklet_hrtimer_start(&amp;data-&gt;beacon_timer, next_bcn, HRTIMER_MODE_ABS);</div><div class='del'>-out:</div><div class='del'>-	return HRTIMER_NORESTART;</div><div class='add'>+	hrtimer_forward(&amp;data-&gt;beacon_timer, hrtimer_get_expires(timer),</div><div class='add'>+			ns_to_ktime(bcn_int * NSEC_PER_USEC));</div><div class='add'>+	return HRTIMER_RESTART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char * const hwsim_chanwidths[] = {</div><div class='hunk'>@@ -1680,15 +1675,15 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!data-&gt;started || !data-&gt;beacon_int)</div><div class='del'>-		tasklet_hrtimer_cancel(&amp;data-&gt;beacon_timer);</div><div class='del'>-	else if (!hrtimer_is_queued(&amp;data-&gt;beacon_timer.timer)) {</div><div class='add'>+		hrtimer_cancel(&amp;data-&gt;beacon_timer);</div><div class='add'>+	else if (!hrtimer_is_queued(&amp;data-&gt;beacon_timer)) {</div><div class='ctx'> 		u64 tsf = mac80211_hwsim_get_tsf(hw, NULL);</div><div class='ctx'> 		u32 bcn_int = data-&gt;beacon_int;</div><div class='ctx'> 		u64 until_tbtt = bcn_int - do_div(tsf, bcn_int);</div><div class='ctx'> </div><div class='del'>-		tasklet_hrtimer_start(&amp;data-&gt;beacon_timer,</div><div class='del'>-				      ns_to_ktime(until_tbtt * 1000),</div><div class='del'>-				      HRTIMER_MODE_REL);</div><div class='add'>+		hrtimer_start(&amp;data-&gt;beacon_timer,</div><div class='add'>+			      ns_to_ktime(until_tbtt * NSEC_PER_USEC),</div><div class='add'>+			      HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1751,7 +1746,7 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			  info-&gt;enable_beacon, info-&gt;beacon_int);</div><div class='ctx'> 		vp-&gt;bcn_en = info-&gt;enable_beacon;</div><div class='ctx'> 		if (data-&gt;started &amp;&amp;</div><div class='del'>-		    !hrtimer_is_queued(&amp;data-&gt;beacon_timer.timer) &amp;&amp;</div><div class='add'>+		    !hrtimer_is_queued(&amp;data-&gt;beacon_timer) &amp;&amp;</div><div class='ctx'> 		    info-&gt;enable_beacon) {</div><div class='ctx'> 			u64 tsf, until_tbtt;</div><div class='ctx'> 			u32 bcn_int;</div><div class='hunk'>@@ -1759,9 +1754,10 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			tsf = mac80211_hwsim_get_tsf(hw, vif);</div><div class='ctx'> 			bcn_int = data-&gt;beacon_int;</div><div class='ctx'> 			until_tbtt = bcn_int - do_div(tsf, bcn_int);</div><div class='del'>-			tasklet_hrtimer_start(&amp;data-&gt;beacon_timer,</div><div class='del'>-					      ns_to_ktime(until_tbtt * 1000),</div><div class='del'>-					      HRTIMER_MODE_REL);</div><div class='add'>+</div><div class='add'>+			hrtimer_start(&amp;data-&gt;beacon_timer,</div><div class='add'>+				      ns_to_ktime(until_tbtt * NSEC_PER_USEC),</div><div class='add'>+				      HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> 		} else if (!info-&gt;enable_beacon) {</div><div class='ctx'> 			unsigned int count = 0;</div><div class='ctx'> 			ieee80211_iterate_active_interfaces_atomic(</div><div class='hunk'>@@ -1770,7 +1766,7 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			wiphy_dbg(hw-&gt;wiphy, "  beaconing vifs remaining: %u",</div><div class='ctx'> 				  count);</div><div class='ctx'> 			if (count == 0) {</div><div class='del'>-				tasklet_hrtimer_cancel(&amp;data-&gt;beacon_timer);</div><div class='add'>+				hrtimer_cancel(&amp;data-&gt;beacon_timer);</div><div class='ctx'> 				data-&gt;beacon_int = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1936,8 +1932,8 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int err, ps;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse(tb, HWSIM_TM_ATTR_MAX, data, len,</div><div class='del'>-			hwsim_testmode_policy, NULL);</div><div class='add'>+	err = nla_parse_deprecated(tb, HWSIM_TM_ATTR_MAX, data, len,</div><div class='add'>+				   hwsim_testmode_policy, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2644,7 +2640,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	const struct ieee80211_ops *ops = &amp;mac80211_hwsim_ops;</div><div class='ctx'> 	struct net *net;</div><div class='del'>-	int idx;</div><div class='add'>+	int idx, i;</div><div class='ctx'> 	int n_limits = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(param-&gt;channels &gt; 1 &amp;&amp; !param-&gt;use_chanctx))</div><div class='hunk'>@@ -2768,12 +2764,23 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,</div><div class='ctx'> 		goto failed_hw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	data-&gt;if_combination.max_interfaces = 0;</div><div class='add'>+	for (i = 0; i &lt; n_limits; i++)</div><div class='add'>+		data-&gt;if_combination.max_interfaces +=</div><div class='add'>+			data-&gt;if_limits[i].max;</div><div class='add'>+</div><div class='ctx'> 	data-&gt;if_combination.n_limits = n_limits;</div><div class='del'>-	data-&gt;if_combination.max_interfaces = 2048;</div><div class='ctx'> 	data-&gt;if_combination.limits = data-&gt;if_limits;</div><div class='ctx'> </div><div class='del'>-	hw-&gt;wiphy-&gt;iface_combinations = &amp;data-&gt;if_combination;</div><div class='del'>-	hw-&gt;wiphy-&gt;n_iface_combinations = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * If we actually were asked to support combinations,</div><div class='add'>+	 * advertise them - if there's only a single thing like</div><div class='add'>+	 * only IBSS then don't advertise it as combinations.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;if_combination.max_interfaces &gt; 1) {</div><div class='add'>+		hw-&gt;wiphy-&gt;iface_combinations = &amp;data-&gt;if_combination;</div><div class='add'>+		hw-&gt;wiphy-&gt;n_iface_combinations = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;ciphers) {</div><div class='ctx'> 		memcpy(data-&gt;ciphers, param-&gt;ciphers,</div><div class='hunk'>@@ -2799,6 +2806,12 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,</div><div class='ctx'> 	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='ctx'> 	ieee80211_hw_set(hw, TDLS_WIDER_BW);</div><div class='add'>+</div><div class='add'>+	/* We only have SW crypto and only implement the A-MPDU API</div><div class='add'>+	 * (but don't really build A-MPDUs) so can have extended key</div><div class='add'>+	 * support</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_hw_set(hw, EXT_KEY_ID_NATIVE);</div><div class='ctx'> 	if (rctbl)</div><div class='ctx'> 		ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);</div><div class='hunk'>@@ -2922,9 +2935,9 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,</div><div class='ctx'> </div><div class='ctx'> 	wiphy_ext_feature_set(hw-&gt;wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);</div><div class='ctx'> </div><div class='del'>-	tasklet_hrtimer_init(&amp;data-&gt;beacon_timer,</div><div class='del'>-			     mac80211_hwsim_beacon,</div><div class='del'>-			     CLOCK_MONOTONIC, HRTIMER_MODE_ABS);</div><div class='add'>+	hrtimer_init(&amp;data-&gt;beacon_timer, CLOCK_MONOTONIC,</div><div class='add'>+		     HRTIMER_MODE_ABS_SOFT);</div><div class='add'>+	data-&gt;beacon_timer.function = mac80211_hwsim_beacon;</div><div class='ctx'> </div><div class='ctx'> 	err = ieee80211_register_hw(hw);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -3620,35 +3633,35 @@ done:</div><div class='ctx'> static const struct genl_ops hwsim_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HWSIM_CMD_REGISTER,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_register_received_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HWSIM_CMD_FRAME,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_cloned_frame_received_nl,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HWSIM_CMD_TX_INFO_FRAME,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_tx_info_frame_received_nl,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HWSIM_CMD_NEW_RADIO,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_new_radio_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HWSIM_CMD_DEL_RADIO,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_del_radio_nl,</div><div class='ctx'> 		.flags = GENL_UNS_ADMIN_PERM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd = HWSIM_CMD_GET_RADIO,</div><div class='del'>-		.policy = hwsim_genl_policy,</div><div class='add'>+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,</div><div class='ctx'> 		.doit = hwsim_get_radio_nl,</div><div class='ctx'> 		.dumpit = hwsim_dump_radio_nl,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3658,6 +3671,7 @@ static struct genl_family hwsim_genl_family __ro_after_init = {</div><div class='ctx'> 	.name = "MAC80211_HWSIM",</div><div class='ctx'> 	.version = 1,</div><div class='ctx'> 	.maxattr = HWSIM_ATTR_MAX,</div><div class='add'>+	.policy = hwsim_genl_policy,</div><div class='ctx'> 	.netnsok = true,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> 	.ops = hwsim_ops,</div><div class='hunk'>@@ -3894,6 +3908,8 @@ static int __init init_mac80211_hwsim(void)</div><div class='ctx'> 		param.p2p_device = support_p2p_device;</div><div class='ctx'> 		param.use_chanctx = channels &gt; 1;</div><div class='ctx'> 		param.iftypes = HWSIM_IFTYPE_SUPPORT_MASK;</div><div class='add'>+		if (param.p2p_device)</div><div class='add'>+			param.iftypes |= BIT(NL80211_IFTYPE_P2P_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		err = mac80211_hwsim_new_radio(NULL, &amp;param);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/Kconfig b/drivers/net/wireless/marvell/mwifiex/Kconfig<br/>index 524fd565cb2a..572d187a99f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/Kconfig</a></div><div class='hunk'>@@ -9,13 +9,13 @@ config MWIFIEX</div><div class='ctx'> 	  mwifiex.</div><div class='ctx'> </div><div class='ctx'> config MWIFIEX_SDIO</div><div class='del'>-	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8997"</div><div class='add'>+	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8987/SD8997"</div><div class='ctx'> 	depends on MWIFIEX &amp;&amp; MMC</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select WANT_DEV_COREDUMP</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This adds support for wireless adapters based on Marvell</div><div class='del'>-	  8786/8787/8797/8887/8897/8997 chipsets with SDIO interface.</div><div class='add'>+	  8786/8787/8797/8887/8897/8977/8987/8997 chipsets with SDIO interface.</div><div class='ctx'> </div><div class='ctx'> 	  If you choose to build it as a module, it will be called</div><div class='ctx'> 	  mwifiex_sdio.</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c<br/>index c46f0a54a0c7..e11a4bb67172 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a></div><div class='hunk'>@@ -4059,8 +4059,8 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse(tb, MWIFIEX_TM_ATTR_MAX, data, len, mwifiex_tm_policy,</div><div class='del'>-			NULL);</div><div class='add'>+	err = nla_parse_deprecated(tb, MWIFIEX_TM_ATTR_MAX, data, len,</div><div class='add'>+				   mwifiex_tm_policy, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4082,16 +4082,20 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> </div><div class='ctx'> 		if (mwifiex_send_cmd(priv, 0, 0, 0, hostcmd, true)) {</div><div class='ctx'> 			dev_err(priv-&gt;adapter-&gt;dev, "Failed to process hostcmd\n");</div><div class='add'>+			kfree(hostcmd);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* process hostcmd response*/</div><div class='ctx'> 		skb = cfg80211_testmode_alloc_reply_skb(wiphy, hostcmd-&gt;len);</div><div class='del'>-		if (!skb)</div><div class='add'>+		if (!skb) {</div><div class='add'>+			kfree(hostcmd);</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		err = nla_put(skb, MWIFIEX_TM_ATTR_DATA,</div><div class='ctx'> 			      hostcmd-&gt;len, hostcmd-&gt;cmd);</div><div class='ctx'> 		if (err) {</div><div class='add'>+			kfree(hostcmd);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return -EMSGSIZE;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cfp.c b/drivers/net/wireless/marvell/mwifiex/cfp.c<br/>index bfe84e55df77..f1522fb1c1e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/cfp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/cfp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/cfp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/cfp.c</a></div><div class='hunk'>@@ -531,5 +531,8 @@ u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv,</div><div class='ctx'> 		rate_index = (rx_rate &gt; MWIFIEX_RATE_INDEX_OFDM0) ?</div><div class='ctx'> 			      rx_rate - 1 : rx_rate;</div><div class='ctx'> </div><div class='add'>+	if (rate_index &gt;= MWIFIEX_MAX_AC_RX_RATES)</div><div class='add'>+		rate_index = MWIFIEX_MAX_AC_RX_RATES - 1;</div><div class='add'>+</div><div class='ctx'> 	return rate_index;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c<br/>index 60db2b969e20..8c35441fd9b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a></div><div class='hunk'>@@ -341,6 +341,12 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		sleep_cfm_tmp =</div><div class='ctx'> 			dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm)</div><div class='ctx'> 				      + MWIFIEX_TYPE_LEN);</div><div class='add'>+		if (!sleep_cfm_tmp) {</div><div class='add'>+			mwifiex_dbg(adapter, ERROR,</div><div class='add'>+				    "SLEEP_CFM: dev_alloc_skb failed\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		skb_put(sleep_cfm_tmp, sizeof(struct mwifiex_opt_sleep_confirm)</div><div class='ctx'> 			+ MWIFIEX_TYPE_LEN);</div><div class='ctx'> 		put_unaligned_le32(MWIFIEX_USB_TYPE_CMD, sleep_cfm_tmp-&gt;data);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c<br/>index 20cee5c397fb..f6da8edab7f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/main.c</a></div><div class='hunk'>@@ -1282,8 +1282,7 @@ static struct net_device_stats *mwifiex_get_stats(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static u16</div><div class='ctx'> mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-				struct net_device *sb_dev,</div><div class='del'>-				select_queue_fallback_t fallback)</div><div class='add'>+				struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;priority = cfg80211_classify8021d(skb, NULL);</div><div class='ctx'> 	return mwifiex_1d_to_wmm_queue[skb-&gt;priority];</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c<br/>index a85648342d15..24c041dad9f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/sdio.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static int mwifiex_sdio_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	adapter = card-&gt;adapter;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MWIFIEX_IS_SUSPENDED, &amp;adapter-&gt;work_flags)) {</div><div class='add'>+	if (!test_bit(MWIFIEX_IS_SUSPENDED, &amp;adapter-&gt;work_flags)) {</div><div class='ctx'> 		mwifiex_dbg(adapter, WARN,</div><div class='ctx'> 			    "device already resumed\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -491,6 +491,8 @@ static void mwifiex_sdio_coredump(struct device *dev)</div><div class='ctx'> #define SDIO_DEVICE_ID_MARVELL_8801   (0x9139)</div><div class='ctx'> /* Device ID for SD8977 */</div><div class='ctx'> #define SDIO_DEVICE_ID_MARVELL_8977   (0x9145)</div><div class='add'>+/* Device ID for SD8987 */</div><div class='add'>+#define SDIO_DEVICE_ID_MARVELL_8987   (0x9149)</div><div class='ctx'> /* Device ID for SD8997 */</div><div class='ctx'> #define SDIO_DEVICE_ID_MARVELL_8997   (0x9141)</div><div class='ctx'> </div><div class='hunk'>@@ -511,6 +513,8 @@ static const struct sdio_device_id mwifiex_ids[] = {</div><div class='ctx'> 		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8801},</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977),</div><div class='ctx'> 		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8977},</div><div class='add'>+	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987),</div><div class='add'>+		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8987},</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997),</div><div class='ctx'> 		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8997},</div><div class='ctx'> 	{},</div><div class='hunk'>@@ -2731,4 +2735,5 @@ MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8977_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(SD8987_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8997_DEFAULT_FW_NAME);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h<br/>index 912de2cde8d9..f672bdf52cc1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sdio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/sdio.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"</div><div class='ctx'> #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin"</div><div class='ctx'> #define SD8977_DEFAULT_FW_NAME "mrvl/sd8977_uapsta.bin"</div><div class='add'>+#define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin"</div><div class='ctx'> #define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin"</div><div class='ctx'> </div><div class='ctx'> #define BLOCK_MODE	1</div><div class='hunk'>@@ -526,6 +527,58 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8887 = {</div><div class='ctx'> 				 0x68, 0x69, 0x6a},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8987 = {</div><div class='add'>+	.start_rd_port = 0,</div><div class='add'>+	.start_wr_port = 0,</div><div class='add'>+	.base_0_reg = 0xF8,</div><div class='add'>+	.base_1_reg = 0xF9,</div><div class='add'>+	.poll_reg = 0x5C,</div><div class='add'>+	.host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK |</div><div class='add'>+			CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK,</div><div class='add'>+	.host_int_rsr_reg = 0x4,</div><div class='add'>+	.host_int_status_reg = 0x0C,</div><div class='add'>+	.host_int_mask_reg = 0x08,</div><div class='add'>+	.status_reg_0 = 0xE8,</div><div class='add'>+	.status_reg_1 = 0xE9,</div><div class='add'>+	.sdio_int_mask = 0xff,</div><div class='add'>+	.data_port_mask = 0xffffffff,</div><div class='add'>+	.io_port_0_reg = 0xE4,</div><div class='add'>+	.io_port_1_reg = 0xE5,</div><div class='add'>+	.io_port_2_reg = 0xE6,</div><div class='add'>+	.max_mp_regs = 196,</div><div class='add'>+	.rd_bitmap_l = 0x10,</div><div class='add'>+	.rd_bitmap_u = 0x11,</div><div class='add'>+	.rd_bitmap_1l = 0x12,</div><div class='add'>+	.rd_bitmap_1u = 0x13,</div><div class='add'>+	.wr_bitmap_l = 0x14,</div><div class='add'>+	.wr_bitmap_u = 0x15,</div><div class='add'>+	.wr_bitmap_1l = 0x16,</div><div class='add'>+	.wr_bitmap_1u = 0x17,</div><div class='add'>+	.rd_len_p0_l = 0x18,</div><div class='add'>+	.rd_len_p0_u = 0x19,</div><div class='add'>+	.card_misc_cfg_reg = 0xd8,</div><div class='add'>+	.card_cfg_2_1_reg = 0xd9,</div><div class='add'>+	.cmd_rd_len_0 = 0xc0,</div><div class='add'>+	.cmd_rd_len_1 = 0xc1,</div><div class='add'>+	.cmd_rd_len_2 = 0xc2,</div><div class='add'>+	.cmd_rd_len_3 = 0xc3,</div><div class='add'>+	.cmd_cfg_0 = 0xc4,</div><div class='add'>+	.cmd_cfg_1 = 0xc5,</div><div class='add'>+	.cmd_cfg_2 = 0xc6,</div><div class='add'>+	.cmd_cfg_3 = 0xc7,</div><div class='add'>+	.fw_dump_host_ready = 0xcc,</div><div class='add'>+	.fw_dump_ctrl = 0xf9,</div><div class='add'>+	.fw_dump_start = 0xf1,</div><div class='add'>+	.fw_dump_end = 0xf8,</div><div class='add'>+	.func1_dump_reg_start = 0x10,</div><div class='add'>+	.func1_dump_reg_end = 0x17,</div><div class='add'>+	.func1_scratch_reg = 0xE8,</div><div class='add'>+	.func1_spec_reg_num = 13,</div><div class='add'>+	.func1_spec_reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60,</div><div class='add'>+				 0x61, 0x62, 0x64, 0x65, 0x66,</div><div class='add'>+				 0x68, 0x69, 0x6a},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {</div><div class='ctx'> 	.firmware = SD8786_DEFAULT_FW_NAME,</div><div class='ctx'> 	.reg = &amp;mwifiex_reg_sd87xx,</div><div class='hunk'>@@ -633,6 +686,22 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = {</div><div class='add'>+	.firmware = SD8987_DEFAULT_FW_NAME,</div><div class='add'>+	.reg = &amp;mwifiex_reg_sd8987,</div><div class='add'>+	.max_ports = 32,</div><div class='add'>+	.mp_agg_pkt_limit = 16,</div><div class='add'>+	.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,</div><div class='add'>+	.mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,</div><div class='add'>+	.mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,</div><div class='add'>+	.supports_sdio_new_mode = true,</div><div class='add'>+	.has_control_mask = false,</div><div class='add'>+	.can_dump_fw = true,</div><div class='add'>+	.fw_dump_enh = true,</div><div class='add'>+	.can_auto_tdls = true,</div><div class='add'>+	.can_ext_scan = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {</div><div class='ctx'> 	.firmware = SD8801_DEFAULT_FW_NAME,</div><div class='ctx'> 	.reg = &amp;mwifiex_reg_sd87xx,</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c<br/>index 69e3b624adbb..24b33e20e7a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c</a></div><div class='hunk'>@@ -1025,17 +1025,14 @@ mwifiex_create_custom_regdomain(struct mwifiex_private *priv,</div><div class='ctx'> 	struct ieee80211_regdomain *regd;</div><div class='ctx'> 	struct ieee80211_reg_rule *rule;</div><div class='ctx'> 	bool new_rule;</div><div class='del'>-	int regd_size, idx, freq, prev_freq = 0;</div><div class='add'>+	int idx, freq, prev_freq = 0;</div><div class='ctx'> 	u32 bw, prev_bw = 0;</div><div class='ctx'> 	u8 chflags, prev_chflags = 0, valid_rules = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(num_chan &gt; NL80211_MAX_SUPP_REG_RULES))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	regd_size = sizeof(struct ieee80211_regdomain) +</div><div class='del'>-		    num_chan * sizeof(struct ieee80211_reg_rule);</div><div class='del'>-</div><div class='del'>-	regd = kzalloc(regd_size, GFP_KERNEL);</div><div class='add'>+	regd = kzalloc(struct_size(regd, reg_rules, num_chan), GFP_KERNEL);</div><div class='ctx'> 	if (!regd)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c<br/>index a327fc5b36e3..8b3123cb84c8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sta_event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sta_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a></div><div class='hunk'>@@ -27,9 +27,9 @@</div><div class='ctx'> </div><div class='ctx'> #define MWIFIEX_IBSS_CONNECT_EVT_FIX_SIZE    12</div><div class='ctx'> </div><div class='del'>-static int mwifiex_check_ibss_peer_capabilties(struct mwifiex_private *priv,</div><div class='del'>-					       struct mwifiex_sta_node *sta_ptr,</div><div class='del'>-					       struct sk_buff *event)</div><div class='add'>+static int mwifiex_check_ibss_peer_capabilities(struct mwifiex_private *priv,</div><div class='add'>+					        struct mwifiex_sta_node *sta_ptr,</div><div class='add'>+					        struct sk_buff *event)</div><div class='ctx'> {</div><div class='ctx'> 	int evt_len, ele_len;</div><div class='ctx'> 	u8 *curr;</div><div class='hunk'>@@ -42,7 +42,7 @@ static int mwifiex_check_ibss_peer_capabilties(struct mwifiex_private *priv,</div><div class='ctx'> 	evt_len = event-&gt;len;</div><div class='ctx'> 	curr = event-&gt;data;</div><div class='ctx'> </div><div class='del'>-	mwifiex_dbg_dump(priv-&gt;adapter, EVT_D, "ibss peer capabilties:",</div><div class='add'>+	mwifiex_dbg_dump(priv-&gt;adapter, EVT_D, "ibss peer capabilities:",</div><div class='ctx'> 			 event-&gt;data, event-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	skb_push(event, MWIFIEX_IBSS_CONNECT_EVT_FIX_SIZE);</div><div class='hunk'>@@ -937,8 +937,8 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 			    ibss_sta_addr);</div><div class='ctx'> 		sta_ptr = mwifiex_add_sta_entry(priv, ibss_sta_addr);</div><div class='ctx'> 		if (sta_ptr &amp;&amp; adapter-&gt;adhoc_11n_enabled) {</div><div class='del'>-			mwifiex_check_ibss_peer_capabilties(priv, sta_ptr,</div><div class='del'>-							    adapter-&gt;event_skb);</div><div class='add'>+			mwifiex_check_ibss_peer_capabilities(priv, sta_ptr,</div><div class='add'>+							     adapter-&gt;event_skb);</div><div class='ctx'> 			if (sta_ptr-&gt;is_11n_enabled)</div><div class='ctx'> 				for (i = 0; i &lt; MAX_NUM_TID; i++)</div><div class='ctx'> 					sta_ptr-&gt;ampdu_sta[i] =</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c<br/>index fb28a5c7f441..52a2ce2e78b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/sta_rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/sta_rx.c</a></div><div class='hunk'>@@ -250,7 +250,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv,</div><div class='ctx'> 							     local_rx_pd-&gt;nf);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (rx_pkt_type != PKT_TYPE_BAR)</div><div class='add'>+		if (rx_pkt_type != PKT_TYPE_BAR &amp;&amp;</div><div class='add'>+		    local_rx_pd-&gt;priority &lt; MAX_NUM_TID)</div><div class='ctx'> 			priv-&gt;rx_seq[local_rx_pd-&gt;priority] = seq_num;</div><div class='ctx'> 		memcpy(ta, priv-&gt;curr_bss_params.bss_descriptor.mac_address,</div><div class='ctx'> 		       ETH_ALEN);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c<br/>index ca759d9c0253..86bfa1b9ef9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/uap_event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwifiex/uap_event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwifiex/uap_event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwifiex/uap_event.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> </div><div class='ctx'> #define MWIFIEX_BSS_START_EVT_FIX_SIZE    12</div><div class='ctx'> </div><div class='del'>-static int mwifiex_check_uap_capabilties(struct mwifiex_private *priv,</div><div class='del'>-					 struct sk_buff *event)</div><div class='add'>+static int mwifiex_check_uap_capabilities(struct mwifiex_private *priv,</div><div class='add'>+					  struct sk_buff *event)</div><div class='ctx'> {</div><div class='ctx'> 	int evt_len;</div><div class='ctx'> 	u8 *curr;</div><div class='hunk'>@@ -38,7 +38,7 @@ static int mwifiex_check_uap_capabilties(struct mwifiex_private *priv,</div><div class='ctx'> 	evt_len = event-&gt;len;</div><div class='ctx'> 	curr = event-&gt;data;</div><div class='ctx'> </div><div class='del'>-	mwifiex_dbg_dump(priv-&gt;adapter, EVT_D, "uap capabilties:",</div><div class='add'>+	mwifiex_dbg_dump(priv-&gt;adapter, EVT_D, "uap capabilities:",</div><div class='ctx'> 			 event-&gt;data, event-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	skb_push(event, MWIFIEX_BSS_START_EVT_FIX_SIZE);</div><div class='hunk'>@@ -201,7 +201,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)</div><div class='ctx'> 		       ETH_ALEN);</div><div class='ctx'> 		if (priv-&gt;hist_data)</div><div class='ctx'> 			mwifiex_hist_data_reset(priv);</div><div class='del'>-		mwifiex_check_uap_capabilties(priv, adapter-&gt;event_skb);</div><div class='add'>+		mwifiex_check_uap_capabilities(priv, adapter-&gt;event_skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EVENT_UAP_MIC_COUNTERMEASURES:</div><div class='ctx'> 		/* For future development */</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c<br/>index 8e4e9b6919e0..c4db6417748f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwl8k.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/marvell/mwl8k.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/marvell/mwl8k.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/marvell/mwl8k.c</a></div><div class='hunk'>@@ -441,6 +441,9 @@ static const struct ieee80211_rate mwl8k_rates_50[] = {</div><div class='ctx'> #define MWL8K_CMD_UPDATE_STADB		0x1123</div><div class='ctx'> #define MWL8K_CMD_BASTREAM		0x1125</div><div class='ctx'> </div><div class='add'>+#define MWL8K_LEGACY_5G_RATE_OFFSET \</div><div class='add'>+	(ARRAY_SIZE(mwl8k_rates_24) - ARRAY_SIZE(mwl8k_rates_50))</div><div class='add'>+</div><div class='ctx'> static const char *mwl8k_cmd_name(__le16 cmd, char *buf, int bufsize)</div><div class='ctx'> {</div><div class='ctx'> 	u16 command = le16_to_cpu(cmd);</div><div class='hunk'>@@ -1016,8 +1019,9 @@ mwl8k_rxd_ap_process(void *_rxd, struct ieee80211_rx_status *status,</div><div class='ctx'> </div><div class='ctx'> 	if (rxd-&gt;channel &gt; 14) {</div><div class='ctx'> 		status-&gt;band = NL80211_BAND_5GHZ;</div><div class='del'>-		if (!(status-&gt;encoding == RX_ENC_HT))</div><div class='del'>-			status-&gt;rate_idx -= 5;</div><div class='add'>+		if (!(status-&gt;encoding == RX_ENC_HT) &amp;&amp;</div><div class='add'>+		    status-&gt;rate_idx &gt;= MWL8K_LEGACY_5G_RATE_OFFSET)</div><div class='add'>+			status-&gt;rate_idx -= MWL8K_LEGACY_5G_RATE_OFFSET;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status-&gt;band = NL80211_BAND_2GHZ;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1124,8 +1128,9 @@ mwl8k_rxd_sta_process(void *_rxd, struct ieee80211_rx_status *status,</div><div class='ctx'> </div><div class='ctx'> 	if (rxd-&gt;channel &gt; 14) {</div><div class='ctx'> 		status-&gt;band = NL80211_BAND_5GHZ;</div><div class='del'>-		if (!(status-&gt;encoding == RX_ENC_HT))</div><div class='del'>-			status-&gt;rate_idx -= 5;</div><div class='add'>+		if (!(status-&gt;encoding == RX_ENC_HT) &amp;&amp;</div><div class='add'>+		    status-&gt;rate_idx &gt;= MWL8K_LEGACY_5G_RATE_OFFSET)</div><div class='add'>+			status-&gt;rate_idx -= MWL8K_LEGACY_5G_RATE_OFFSET;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status-&gt;band = NL80211_BAND_2GHZ;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2234,8 +2239,10 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='ctx'> 	dma_size = le16_to_cpu(cmd-&gt;length);</div><div class='ctx'> 	dma_addr = pci_map_single(priv-&gt;pdev, cmd, dma_size,</div><div class='ctx'> 				  PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-	if (pci_dma_mapping_error(priv-&gt;pdev, dma_addr))</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (pci_dma_mapping_error(priv-&gt;pdev, dma_addr)) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;hostcmd_wait = &amp;cmd_wait;</div><div class='ctx'> 	iowrite32(dma_addr, regs + MWL8K_HIU_GEN_PTR);</div><div class='hunk'>@@ -2275,6 +2282,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='ctx'> 				     ms);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+exit:</div><div class='ctx'> 	if (bitmap)</div><div class='ctx'> 		mwl8k_enable_bsses(hw, true, bitmap);</div><div class='ctx'> </div><div class='hunk'>@@ -4631,7 +4639,7 @@ static void mwl8k_tx_poll(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	limit = 32;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;priv-&gt;tx_lock);</div><div class='add'>+	spin_lock(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mwl8k_tx_queues(priv); i++)</div><div class='ctx'> 		limit -= mwl8k_txq_reclaim(hw, i, limit, 0);</div><div class='hunk'>@@ -4641,7 +4649,7 @@ static void mwl8k_tx_poll(unsigned long data)</div><div class='ctx'> 		priv-&gt;tx_wait = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;priv-&gt;tx_lock);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (limit) {</div><div class='ctx'> 		writel(~MWL8K_A2H_INT_TX_DONE,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig<br/>index dbe8c70a8f73..30e44e4c3c7d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/Kconfig</a></div><div class='hunk'>@@ -22,3 +22,4 @@ config MT76x02_USB</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt7603/Kconfig"</div><div class='add'>+source "drivers/net/wireless/mediatek/mt76/mt7615/Kconfig"</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile<br/>index 3fd1b64b4aa7..7beae2354a24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/Makefile</a></div><div class='hunk'>@@ -16,10 +16,11 @@ CFLAGS_mt76x02_trace.o := -I$(src)</div><div class='ctx'> mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \</div><div class='ctx'> 		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \</div><div class='ctx'> 		 mt76x02_txrx.o mt76x02_trace.o mt76x02_debugfs.o \</div><div class='del'>-		 mt76x02_dfs.o</div><div class='add'>+		 mt76x02_dfs.o mt76x02_beacon.o</div><div class='ctx'> </div><div class='ctx'> mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MT76x0_COMMON) += mt76x0/</div><div class='ctx'> obj-$(CONFIG_MT76x2_COMMON) += mt76x2/</div><div class='ctx'> obj-$(CONFIG_MT7603E) += mt7603/</div><div class='add'>+obj-$(CONFIG_MT7615E) += mt7615/</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c<br/>index 73c8b2805c97..27e3ff039c48 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/agg-rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/agg-rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/agg-rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/agg-rx.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ mt76_rx_aggr_check_ctl(struct sk_buff *skb, struct sk_buff_head *frames)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;tid = le16_to_cpu(bar-&gt;control) &gt;&gt; 12;</div><div class='del'>-	seqno = le16_to_cpu(bar-&gt;start_seq_num) &gt;&gt; 4;</div><div class='add'>+	seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(bar-&gt;start_seq_num));</div><div class='ctx'> 	tid = rcu_dereference(wcid-&gt;aggr[status-&gt;tid]);</div><div class='ctx'> 	if (!tid)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/debugfs.c b/drivers/net/wireless/mediatek/mt76/debugfs.c<br/>index a5adf22c3ffa..c6a9fe2aef9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/debugfs.c</a></div><div class='hunk'>@@ -43,14 +43,15 @@ mt76_queues_read(struct seq_file *s, void *data)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;q_tx); i++) {</div><div class='del'>-		struct mt76_queue *q = &amp;dev-&gt;q_tx[i];</div><div class='add'>+		struct mt76_sw_queue *q = &amp;dev-&gt;q_tx[i];</div><div class='ctx'> </div><div class='del'>-		if (!q-&gt;ndesc)</div><div class='add'>+		if (!q-&gt;q)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(s,</div><div class='ctx'> 			   "%d:	queued=%d head=%d tail=%d swq_queued=%d\n",</div><div class='del'>-			   i, q-&gt;queued, q-&gt;head, q-&gt;tail, q-&gt;swq_queued);</div><div class='add'>+			   i, q-&gt;q-&gt;queued, q-&gt;q-&gt;head, q-&gt;q-&gt;tail,</div><div class='add'>+			   q-&gt;swq_queued);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c<br/>index 6eedc0ec7661..4381155375e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/dma.c</a></div><div class='hunk'>@@ -18,16 +18,20 @@</div><div class='ctx'> #include "mt76.h"</div><div class='ctx'> #include "dma.h"</div><div class='ctx'> </div><div class='del'>-#define DMA_DUMMY_TXWI	((void *) ~0)</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     int idx, int n_desc, int bufsize,</div><div class='add'>+		     u32 ring_base)</div><div class='ctx'> {</div><div class='ctx'> 	int size;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;q-&gt;swq);</div><div class='add'>+</div><div class='add'>+	q-&gt;regs = dev-&gt;mmio.regs + ring_base + idx * MT_RING_SIZE;</div><div class='add'>+	q-&gt;ndesc = n_desc;</div><div class='add'>+	q-&gt;buf_size = bufsize;</div><div class='add'>+	q-&gt;hw_idx = idx;</div><div class='ctx'> </div><div class='ctx'> 	size = q-&gt;ndesc * sizeof(struct mt76_desc);</div><div class='ctx'> 	q-&gt;desc = dmam_alloc_coherent(dev-&gt;dev, size, &amp;q-&gt;desc_dma, GFP_KERNEL);</div><div class='hunk'>@@ -43,10 +47,10 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> 	for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='ctx'> 		q-&gt;desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='ctx'> </div><div class='del'>-	iowrite32(q-&gt;desc_dma, &amp;q-&gt;regs-&gt;desc_base);</div><div class='del'>-	iowrite32(0, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='del'>-	iowrite32(0, &amp;q-&gt;regs-&gt;dma_idx);</div><div class='del'>-	iowrite32(q-&gt;ndesc, &amp;q-&gt;regs-&gt;ring_size);</div><div class='add'>+	writel(q-&gt;desc_dma, &amp;q-&gt;regs-&gt;desc_base);</div><div class='add'>+	writel(0, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='add'>+	writel(0, &amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+	writel(q-&gt;ndesc, &amp;q-&gt;regs-&gt;ring_size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -61,7 +65,7 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 	int i, idx = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (txwi)</div><div class='del'>-		q-&gt;entry[q-&gt;head].txwi = DMA_DUMMY_TXWI;</div><div class='add'>+		q-&gt;entry[q-&gt;head].txwi = DMA_DUMMY_DATA;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nbufs; i += 2, buf += 2) {</div><div class='ctx'> 		u32 buf0 = buf[0].addr, buf1 = 0;</div><div class='hunk'>@@ -120,9 +124,12 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;txwi == DMA_DUMMY_TXWI)</div><div class='add'>+	if (e-&gt;txwi == DMA_DUMMY_DATA)</div><div class='ctx'> 		e-&gt;txwi = NULL;</div><div class='ctx'> </div><div class='add'>+	if (e-&gt;skb == DMA_DUMMY_DATA)</div><div class='add'>+		e-&gt;skb = NULL;</div><div class='add'>+</div><div class='ctx'> 	*prev_e = *e;</div><div class='ctx'> 	memset(e, 0, sizeof(*e));</div><div class='ctx'> }</div><div class='hunk'>@@ -130,57 +137,70 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,</div><div class='ctx'> static void</div><div class='ctx'> mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='del'>-	q-&gt;head = ioread32(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+	writel(q-&gt;desc_dma, &amp;q-&gt;regs-&gt;desc_base);</div><div class='add'>+	writel(q-&gt;ndesc, &amp;q-&gt;regs-&gt;ring_size);</div><div class='add'>+	q-&gt;head = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='ctx'> 	q-&gt;tail = q-&gt;head;</div><div class='del'>-	iowrite32(q-&gt;head, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='add'>+	writel(q-&gt;head, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_queue *q = &amp;dev-&gt;q_tx[qid];</div><div class='add'>+	struct mt76_sw_queue *sq = &amp;dev-&gt;q_tx[qid];</div><div class='add'>+	struct mt76_queue *q = sq-&gt;q;</div><div class='ctx'> 	struct mt76_queue_entry entry;</div><div class='add'>+	unsigned int n_swq_queued[4] = {};</div><div class='add'>+	unsigned int n_queued = 0;</div><div class='ctx'> 	bool wake = false;</div><div class='del'>-	int last;</div><div class='add'>+	int i, last;</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;ndesc)</div><div class='add'>+	if (!q)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;lock);</div><div class='ctx'> 	if (flush)</div><div class='ctx'> 		last = -1;</div><div class='ctx'> 	else</div><div class='del'>-		last = ioread32(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+		last = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='ctx'> </div><div class='del'>-	while (q-&gt;queued &amp;&amp; q-&gt;tail != last) {</div><div class='add'>+	while ((q-&gt;queued &gt; n_queued) &amp;&amp; q-&gt;tail != last) {</div><div class='ctx'> 		mt76_dma_tx_cleanup_idx(dev, q, q-&gt;tail, &amp;entry);</div><div class='ctx'> 		if (entry.schedule)</div><div class='del'>-			q-&gt;swq_queued--;</div><div class='add'>+			n_swq_queued[entry.qid]++;</div><div class='ctx'> </div><div class='ctx'> 		q-&gt;tail = (q-&gt;tail + 1) % q-&gt;ndesc;</div><div class='del'>-		q-&gt;queued--;</div><div class='add'>+		n_queued++;</div><div class='ctx'> </div><div class='del'>-		if (entry.skb) {</div><div class='del'>-			spin_unlock_bh(&amp;q-&gt;lock);</div><div class='del'>-			dev-&gt;drv-&gt;tx_complete_skb(dev, q, &amp;entry, flush);</div><div class='del'>-			spin_lock_bh(&amp;q-&gt;lock);</div><div class='del'>-		}</div><div class='add'>+		if (entry.skb)</div><div class='add'>+			dev-&gt;drv-&gt;tx_complete_skb(dev, qid, &amp;entry);</div><div class='ctx'> </div><div class='ctx'> 		if (entry.txwi) {</div><div class='del'>-			mt76_put_txwi(dev, entry.txwi);</div><div class='add'>+			if (!(dev-&gt;drv-&gt;txwi_flags &amp; MT_TXWI_NO_FREE))</div><div class='add'>+				mt76_put_txwi(dev, entry.txwi);</div><div class='ctx'> 			wake = !flush;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!flush &amp;&amp; q-&gt;tail == last)</div><div class='del'>-			last = ioread32(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+			last = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!flush)</div><div class='del'>-		mt76_txq_schedule(dev, q);</div><div class='del'>-	else</div><div class='add'>+	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+</div><div class='add'>+	q-&gt;queued -= n_queued;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(n_swq_queued); i++) {</div><div class='add'>+		if (!n_swq_queued[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev-&gt;q_tx[i].swq_queued -= n_swq_queued[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flush)</div><div class='ctx'> 		mt76_dma_sync_idx(dev, q);</div><div class='ctx'> </div><div class='del'>-	wake = wake &amp;&amp; qid &lt; IEEE80211_NUM_ACS &amp;&amp; q-&gt;queued &lt; q-&gt;ndesc - 8;</div><div class='add'>+	wake = wake &amp;&amp; q-&gt;stopped &amp;&amp;</div><div class='add'>+	       qid &lt; IEEE80211_NUM_ACS &amp;&amp; q-&gt;queued &lt; q-&gt;ndesc - 8;</div><div class='add'>+	if (wake)</div><div class='add'>+		q-&gt;stopped = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!q-&gt;queued)</div><div class='ctx'> 		wake_up(&amp;dev-&gt;tx_wait);</div><div class='hunk'>@@ -239,20 +259,20 @@ mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush,</div><div class='ctx'> static void</div><div class='ctx'> mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='del'>-	iowrite32(q-&gt;head, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='add'>+	writel(q-&gt;head, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,</div><div class='ctx'> 			  struct sk_buff *skb, u32 tx_info)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_queue *q = &amp;dev-&gt;q_tx[qid];</div><div class='add'>+	struct mt76_queue *q = dev-&gt;q_tx[qid].q;</div><div class='ctx'> 	struct mt76_queue_buf buf;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> </div><div class='ctx'> 	addr = dma_map_single(dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='ctx'> 			      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(dev-&gt;dev, addr))</div><div class='add'>+	if (unlikely(dma_mapping_error(dev-&gt;dev, addr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	buf.addr = addr;</div><div class='hunk'>@@ -266,80 +286,85 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-			  struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			  struct ieee80211_sta *sta)</div><div class='add'>+static int</div><div class='add'>+mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,</div><div class='add'>+		      struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+		      struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_queue *q = dev-&gt;q_tx[qid].q;</div><div class='add'>+	struct mt76_tx_info tx_info = {</div><div class='add'>+		.skb = skb,</div><div class='add'>+	};</div><div class='add'>+	int len, n = 0, ret = -ENOMEM;</div><div class='ctx'> 	struct mt76_queue_entry e;</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='del'>-	struct mt76_queue_buf buf[32];</div><div class='ctx'> 	struct sk_buff *iter;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='del'>-	int len;</div><div class='del'>-	u32 tx_info = 0;</div><div class='del'>-	int n, ret;</div><div class='add'>+	u8 *txwi;</div><div class='ctx'> </div><div class='ctx'> 	t = mt76_get_txwi(dev);</div><div class='ctx'> 	if (!t) {</div><div class='ctx'> 		ieee80211_free_txskb(dev-&gt;hw, skb);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;prev = skb-&gt;next = NULL;</div><div class='del'>-	dma_sync_single_for_cpu(dev-&gt;dev, t-&gt;dma_addr, sizeof(t-&gt;txwi),</div><div class='del'>-				DMA_TO_DEVICE);</div><div class='del'>-	ret = dev-&gt;drv-&gt;tx_prepare_skb(dev, &amp;t-&gt;txwi, skb, q, wcid, sta,</div><div class='del'>-				       &amp;tx_info);</div><div class='del'>-	dma_sync_single_for_device(dev-&gt;dev, t-&gt;dma_addr, sizeof(t-&gt;txwi),</div><div class='del'>-				   DMA_TO_DEVICE);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto free;</div><div class='add'>+	if (dev-&gt;drv-&gt;tx_aligned4_skbs)</div><div class='add'>+		mt76_insert_hdr_pad(skb);</div><div class='ctx'> </div><div class='del'>-	len = skb-&gt;len - skb-&gt;data_len;</div><div class='add'>+	len = skb_headlen(skb);</div><div class='ctx'> 	addr = dma_map_single(dev-&gt;dev, skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(dev-&gt;dev, addr)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	if (unlikely(dma_mapping_error(dev-&gt;dev, addr)))</div><div class='ctx'> 		goto free;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	n = 0;</div><div class='del'>-	buf[n].addr = t-&gt;dma_addr;</div><div class='del'>-	buf[n++].len = dev-&gt;drv-&gt;txwi_size;</div><div class='del'>-	buf[n].addr = addr;</div><div class='del'>-	buf[n++].len = len;</div><div class='add'>+	tx_info.buf[n].addr = t-&gt;dma_addr;</div><div class='add'>+	tx_info.buf[n++].len = dev-&gt;drv-&gt;txwi_size;</div><div class='add'>+	tx_info.buf[n].addr = addr;</div><div class='add'>+	tx_info.buf[n++].len = len;</div><div class='ctx'> </div><div class='ctx'> 	skb_walk_frags(skb, iter) {</div><div class='del'>-		if (n == ARRAY_SIZE(buf))</div><div class='add'>+		if (n == ARRAY_SIZE(tx_info.buf))</div><div class='ctx'> 			goto unmap;</div><div class='ctx'> </div><div class='ctx'> 		addr = dma_map_single(dev-&gt;dev, iter-&gt;data, iter-&gt;len,</div><div class='ctx'> 				      DMA_TO_DEVICE);</div><div class='del'>-		if (dma_mapping_error(dev-&gt;dev, addr))</div><div class='add'>+		if (unlikely(dma_mapping_error(dev-&gt;dev, addr)))</div><div class='ctx'> 			goto unmap;</div><div class='ctx'> </div><div class='del'>-		buf[n].addr = addr;</div><div class='del'>-		buf[n++].len = iter-&gt;len;</div><div class='add'>+		tx_info.buf[n].addr = addr;</div><div class='add'>+		tx_info.buf[n++].len = iter-&gt;len;</div><div class='ctx'> 	}</div><div class='add'>+	tx_info.nbuf = n;</div><div class='add'>+</div><div class='add'>+	dma_sync_single_for_cpu(dev-&gt;dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+	ret = dev-&gt;drv-&gt;tx_prepare_skb(dev, txwi, qid, wcid, sta, &amp;tx_info);</div><div class='add'>+	dma_sync_single_for_device(dev-&gt;dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto unmap;</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;queued + (n + 1) / 2 &gt;= q-&gt;ndesc - 1)</div><div class='add'>+	if (q-&gt;queued + (tx_info.nbuf + 1) / 2 &gt;= q-&gt;ndesc - 1) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto unmap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mt76_dma_add_buf(dev, q, buf, n, tx_info, skb, t);</div><div class='add'>+	return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf,</div><div class='add'>+				tx_info.info, tx_info.skb, t);</div><div class='ctx'> </div><div class='ctx'> unmap:</div><div class='del'>-	ret = -ENOMEM;</div><div class='ctx'> 	for (n--; n &gt; 0; n--)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, buf[n].addr, buf[n].len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='add'>+		dma_unmap_single(dev-&gt;dev, tx_info.buf[n].addr,</div><div class='add'>+				 tx_info.buf[n].len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> free:</div><div class='del'>-	e.skb = skb;</div><div class='add'>+	e.skb = tx_info.skb;</div><div class='ctx'> 	e.txwi = t;</div><div class='del'>-	dev-&gt;drv-&gt;tx_complete_skb(dev, q, &amp;e, true);</div><div class='add'>+	dev-&gt;drv-&gt;tx_complete_skb(dev, qid, &amp;e);</div><div class='ctx'> 	mt76_put_txwi(dev, t);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_dma_tx_queue_skb);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='hunk'>@@ -361,7 +386,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		addr = dma_map_single(dev-&gt;dev, buf, len, DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(dev-&gt;dev, addr)) {</div><div class='add'>+		if (unlikely(dma_mapping_error(dev-&gt;dev, addr))) {</div><div class='ctx'> 			skb_free_frag(buf);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h<br/>index e3292df5e9b2..03dd2bafa4e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/dma.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/dma.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/dma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/dma.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #ifndef __MT76_DMA_H</div><div class='ctx'> #define __MT76_DMA_H</div><div class='ctx'> </div><div class='add'>+#define DMA_DUMMY_DATA			((void *)~0)</div><div class='add'>+</div><div class='ctx'> #define MT_RING_SIZE			0x10</div><div class='ctx'> </div><div class='ctx'> #define MT_DMA_CTL_SD_LEN1		GENMASK(13, 0)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c<br/>index a1529920d877..04964937a3af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/eeprom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/eeprom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/eeprom.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ mt76_eeprom_override(struct mt76_dev *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mac = of_get_mac_address(np);</div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR(mac))</div><div class='ctx'> 		memcpy(dev-&gt;macaddr, mac, ETH_ALEN);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c<br/>index a033745adb2f..5b6a81ee457e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mac80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mac80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mac80211.c</a></div><div class='hunk'>@@ -214,6 +214,8 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband,</div><div class='ctx'> 	vht_cap-&gt;cap |= IEEE80211_VHT_CAP_RXLDPC |</div><div class='ctx'> 			IEEE80211_VHT_CAP_RXSTBC_1 |</div><div class='ctx'> 			IEEE80211_VHT_CAP_SHORT_GI_80 |</div><div class='add'>+			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |</div><div class='add'>+			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |</div><div class='ctx'> 			(3 &lt;&lt; IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -369,10 +371,16 @@ void mt76_unregister_device(struct mt76_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_status_check(dev, NULL, true);</div><div class='ctx'> 	ieee80211_unregister_hw(hw);</div><div class='del'>-	mt76_tx_free(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_unregister_device);</div><div class='ctx'> </div><div class='add'>+void mt76_free_device(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt76_tx_free(dev);</div><div class='add'>+	ieee80211_free_hw(dev-&gt;hw);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_free_device);</div><div class='add'>+</div><div class='ctx'> void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(MT76_STATE_RUNNING, &amp;dev-&gt;state)) {</div><div class='hunk'>@@ -384,17 +392,20 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_rx);</div><div class='ctx'> </div><div class='del'>-static bool mt76_has_tx_pending(struct mt76_dev *dev)</div><div class='add'>+bool mt76_has_tx_pending(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_queue *q;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;q_tx); i++) {</div><div class='del'>-		if (dev-&gt;q_tx[i].queued)</div><div class='add'>+		q = dev-&gt;q_tx[i].q;</div><div class='add'>+		if (q &amp;&amp; q-&gt;queued)</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_has_tx_pending);</div><div class='ctx'> </div><div class='ctx'> void mt76_set_channel(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -560,6 +571,7 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct mt76_wcid *wcid = status-&gt;wcid;</div><div class='ctx'> 	bool ps;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_pspoll(hdr-&gt;frame_control) &amp;&amp; !wcid) {</div><div class='ctx'> 		sta = ieee80211_find_sta_by_ifaddr(dev-&gt;hw, hdr-&gt;addr2, NULL);</div><div class='hunk'>@@ -606,6 +618,20 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;drv-&gt;sta_ps(dev, sta, ps);</div><div class='ctx'> 	ieee80211_sta_ps_transition(sta, ps);</div><div class='add'>+</div><div class='add'>+	if (ps)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++) {</div><div class='add'>+		struct mt76_txq *mtxq;</div><div class='add'>+</div><div class='add'>+		if (!sta-&gt;txq[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mtxq = (struct mt76_txq *) sta-&gt;txq[i]-&gt;drv_priv;</div><div class='add'>+		if (!skb_queue_empty(&amp;mtxq-&gt;retry_q))</div><div class='add'>+			ieee80211_schedule_txq(dev-&gt;hw, sta-&gt;txq[i]);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,</div><div class='hunk'>@@ -679,19 +705,15 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-	        struct ieee80211_sta *sta)</div><div class='add'>+void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='del'>-	int idx = wcid-&gt;idx;</div><div class='del'>-	int i;</div><div class='add'>+	int i, idx = wcid-&gt;idx;</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;wcid[idx], NULL);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;drv-&gt;sta_remove)</div><div class='ctx'> 		dev-&gt;drv-&gt;sta_remove(dev, vif, sta);</div><div class='ctx'> </div><div class='hunk'>@@ -699,7 +721,15 @@ mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++)</div><div class='ctx'> 		mt76_txq_remove(dev, sta-&gt;txq[i]);</div><div class='ctx'> 	mt76_wcid_free(dev-&gt;wcid_mask, idx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__mt76_sta_remove);</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	__mt76_sta_remove(dev, vif, sta);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -733,7 +763,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt76_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	int n_chains = hweight8(dev-&gt;antenna_mask);</div><div class='ctx'> </div><div class='del'>-	*dbm = dev-&gt;txpower_cur / 2;</div><div class='add'>+	*dbm = DIV_ROUND_UP(dev-&gt;txpower_cur, 2);</div><div class='ctx'> </div><div class='ctx'> 	/* convert from per-chain power to combined</div><div class='ctx'> 	 * output on 2x2 devices</div><div class='hunk'>@@ -783,3 +813,10 @@ void mt76_csa_check(struct mt76_dev *dev)</div><div class='ctx'> 		__mt76_csa_check, dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_csa_check);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mt76_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_set_tim);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c<br/>index 1d6bbce76041..38368d19aa6f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mmio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mmio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mmio.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	val = ioread32(dev-&gt;mmio.regs + offset);</div><div class='add'>+	val = readl(dev-&gt;mmio.regs + offset);</div><div class='ctx'> 	trace_reg_rr(dev, offset, val);</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='hunk'>@@ -30,7 +30,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)</div><div class='ctx'> static void mt76_mmio_wr(struct mt76_dev *dev, u32 offset, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	trace_reg_wr(dev, offset, val);</div><div class='del'>-	iowrite32(val, dev-&gt;mmio.regs + offset);</div><div class='add'>+	writel(val, dev-&gt;mmio.regs + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)</div><div class='hunk'>@@ -70,6 +70,19 @@ static int mt76_mmio_rd_rp(struct mt76_dev *dev, u32 base,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr,</div><div class='add'>+		       u32 clear, 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;dev-&gt;mmio.irq_lock, flags);</div><div class='add'>+	dev-&gt;mmio.irqmask &amp;= ~clear;</div><div class='add'>+	dev-&gt;mmio.irqmask |= set;</div><div class='add'>+	mt76_mmio_wr(dev, addr, dev-&gt;mmio.irqmask);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;mmio.irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_set_irq_mask);</div><div class='add'>+</div><div class='ctx'> void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_bus_ops mt76_mmio_ops = {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h<br/>index 5dfb0601f101..8ecbf81a906f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76.h</a></div><div class='hunk'>@@ -69,6 +69,7 @@ enum mt76_txq_id {</div><div class='ctx'> 	MT_TXQ_MCU,</div><div class='ctx'> 	MT_TXQ_BEACON,</div><div class='ctx'> 	MT_TXQ_CAB,</div><div class='add'>+	MT_TXQ_FWDL,</div><div class='ctx'> 	__MT_TXQ_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -83,12 +84,11 @@ struct mt76_queue_buf {</div><div class='ctx'> 	int len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt76u_buf {</div><div class='del'>-	struct mt76_dev *dev;</div><div class='del'>-	struct urb *urb;</div><div class='del'>-	size_t len;</div><div class='del'>-	void *buf;</div><div class='del'>-	bool done;</div><div class='add'>+struct mt76_tx_info {</div><div class='add'>+	struct mt76_queue_buf buf[32];</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int nbuf;</div><div class='add'>+	u32 info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_queue_entry {</div><div class='hunk'>@@ -98,9 +98,11 @@ struct mt76_queue_entry {</div><div class='ctx'> 	};</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct mt76_txwi_cache *txwi;</div><div class='del'>-		struct mt76u_buf ubuf;</div><div class='add'>+		struct urb *urb;</div><div class='ctx'> 	};</div><div class='add'>+	enum mt76_txq_id qid;</div><div class='ctx'> 	bool schedule;</div><div class='add'>+	bool done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_queue_regs {</div><div class='hunk'>@@ -117,15 +119,13 @@ struct mt76_queue {</div><div class='ctx'> 	struct mt76_queue_entry *entry;</div><div class='ctx'> 	struct mt76_desc *desc;</div><div class='ctx'> </div><div class='del'>-	struct list_head swq;</div><div class='del'>-	int swq_queued;</div><div class='del'>-</div><div class='ctx'> 	u16 first;</div><div class='ctx'> 	u16 head;</div><div class='ctx'> 	u16 tail;</div><div class='ctx'> 	int ndesc;</div><div class='ctx'> 	int queued;</div><div class='ctx'> 	int buf_size;</div><div class='add'>+	bool stopped;</div><div class='ctx'> </div><div class='ctx'> 	u8 buf_offset;</div><div class='ctx'> 	u8 hw_idx;</div><div class='hunk'>@@ -133,7 +133,13 @@ struct mt76_queue {</div><div class='ctx'> 	dma_addr_t desc_dma;</div><div class='ctx'> 	struct sk_buff *rx_head;</div><div class='ctx'> 	struct page_frag_cache rx_page;</div><div class='del'>-	spinlock_t rx_page_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt76_sw_queue {</div><div class='add'>+	struct mt76_queue *q;</div><div class='add'>+</div><div class='add'>+	struct list_head swq;</div><div class='add'>+	int swq_queued;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_mcu_ops {</div><div class='hunk'>@@ -143,18 +149,21 @@ struct mt76_mcu_ops {</div><div class='ctx'> 			 const struct mt76_reg_pair *rp, int len);</div><div class='ctx'> 	int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base,</div><div class='ctx'> 			 struct mt76_reg_pair *rp, int len);</div><div class='add'>+	int (*mcu_restart)(struct mt76_dev *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_queue_ops {</div><div class='ctx'> 	int (*init)(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='del'>-	int (*alloc)(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+	int (*alloc)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     int idx, int n_desc, int bufsize,</div><div class='add'>+		     u32 ring_base);</div><div class='ctx'> </div><div class='ctx'> 	int (*add_buf)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		       struct mt76_queue_buf *buf, int nbufs, u32 info,</div><div class='ctx'> 		       struct sk_buff *skb, void *txwi);</div><div class='ctx'> </div><div class='del'>-	int (*tx_queue_skb)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+	int (*tx_queue_skb)(struct mt76_dev *dev, enum mt76_txq_id qid,</div><div class='ctx'> 			    struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='ctx'> 			    struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='hunk'>@@ -181,6 +190,11 @@ enum mt76_wcid_flags {</div><div class='ctx'> </div><div class='ctx'> DECLARE_EWMA(signal, 10, 8);</div><div class='ctx'> </div><div class='add'>+#define MT_WCID_TX_INFO_RATE		GENMASK(15, 0)</div><div class='add'>+#define MT_WCID_TX_INFO_NSS		GENMASK(17, 16)</div><div class='add'>+#define MT_WCID_TX_INFO_TXPWR_ADJ	GENMASK(25, 18)</div><div class='add'>+#define MT_WCID_TX_INFO_SET		BIT(31)</div><div class='add'>+</div><div class='ctx'> struct mt76_wcid {</div><div class='ctx'> 	struct mt76_rx_tid __rcu *aggr[IEEE80211_NUM_TIDS];</div><div class='ctx'> </div><div class='hunk'>@@ -199,18 +213,14 @@ struct mt76_wcid {</div><div class='ctx'> 	u8 rx_check_pn;</div><div class='ctx'> 	u8 rx_key_pn[IEEE80211_NUM_TIDS][6];</div><div class='ctx'> </div><div class='del'>-	__le16 tx_rate;</div><div class='del'>-	bool tx_rate_set;</div><div class='del'>-	u8 tx_rate_nss;</div><div class='del'>-	s8 max_txpwr_adj;</div><div class='add'>+	u32 tx_info;</div><div class='ctx'> 	bool sw_iv;</div><div class='ctx'> </div><div class='ctx'> 	u8 packet_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_txq {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct mt76_queue *hwq;</div><div class='add'>+	struct mt76_sw_queue *swq;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff_head retry_q;</div><div class='hunk'>@@ -221,11 +231,11 @@ struct mt76_txq {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_txwi_cache {</div><div class='del'>-	u32 txwi[8];</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-};</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='ctx'> </div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct mt76_rx_tid {</div><div class='ctx'> 	struct rcu_head rcu_head;</div><div class='hunk'>@@ -278,18 +288,22 @@ struct mt76_hw_cap {</div><div class='ctx'> 	bool has_5ghz;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MT_TXWI_NO_FREE			BIT(0)</div><div class='add'>+</div><div class='ctx'> struct mt76_driver_ops {</div><div class='add'>+	bool tx_aligned4_skbs;</div><div class='add'>+	u32 txwi_flags;</div><div class='ctx'> 	u16 txwi_size;</div><div class='ctx'> </div><div class='ctx'> 	void (*update_survey)(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='ctx'> 	int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr,</div><div class='del'>-			      struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			      struct mt76_wcid *wcid,</div><div class='del'>-			      struct ieee80211_sta *sta, u32 *tx_info);</div><div class='add'>+			      enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			      struct ieee80211_sta *sta,</div><div class='add'>+			      struct mt76_tx_info *tx_info);</div><div class='ctx'> </div><div class='del'>-	void (*tx_complete_skb)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-				struct mt76_queue_entry *e, bool flush);</div><div class='add'>+	void (*tx_complete_skb)(struct mt76_dev *dev, enum mt76_txq_id qid,</div><div class='add'>+				struct mt76_queue_entry *e);</div><div class='ctx'> </div><div class='ctx'> 	bool (*tx_status_data)(struct mt76_dev *dev, u8 *update);</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +390,6 @@ struct mt76_usb {</div><div class='ctx'> 	u8 data[32];</div><div class='ctx'> </div><div class='ctx'> 	struct tasklet_struct rx_tasklet;</div><div class='del'>-	struct tasklet_struct tx_tasklet;</div><div class='ctx'> 	struct delayed_work stat_work;</div><div class='ctx'> </div><div class='ctx'> 	u8 out_ep[__MT_EP_OUT_MAX];</div><div class='hunk'>@@ -433,11 +446,14 @@ struct mt76_dev {</div><div class='ctx'> 	struct sk_buff_head rx_skb[__MT_RXQ_MAX];</div><div class='ctx'> </div><div class='ctx'> 	struct list_head txwi_cache;</div><div class='del'>-	struct mt76_queue q_tx[__MT_TXQ_MAX];</div><div class='add'>+	struct mt76_sw_queue q_tx[__MT_TXQ_MAX];</div><div class='ctx'> 	struct mt76_queue q_rx[__MT_RXQ_MAX];</div><div class='ctx'> 	const struct mt76_queue_ops *queue_ops;</div><div class='ctx'> 	int tx_dma_idx[4];</div><div class='ctx'> </div><div class='add'>+	struct tasklet_struct tx_tasklet;</div><div class='add'>+	struct delayed_work mac_work;</div><div class='add'>+</div><div class='ctx'> 	wait_queue_head_t tx_wait;</div><div class='ctx'> 	struct sk_buff_head status_list;</div><div class='ctx'> </div><div class='hunk'>@@ -453,6 +469,10 @@ struct mt76_dev {</div><div class='ctx'> 	u8 antenna_mask;</div><div class='ctx'> 	u16 chainmask;</div><div class='ctx'> </div><div class='add'>+	struct tasklet_struct pre_tbtt_tasklet;</div><div class='add'>+	int beacon_int;</div><div class='add'>+	u8 beacon_mask;</div><div class='add'>+</div><div class='ctx'> 	struct mt76_sband sband_2g;</div><div class='ctx'> 	struct mt76_sband sband_5g;</div><div class='ctx'> 	struct debugfs_blob_wrapper eeprom;</div><div class='hunk'>@@ -527,6 +547,9 @@ struct mt76_rx_status {</div><div class='ctx'> #define mt76_rd_rp(dev, ...)	(dev)-&gt;mt76.bus-&gt;rd_rp(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mt76_mcu_send_msg(dev, ...)	(dev)-&gt;mt76.mcu_ops-&gt;mcu_send_msg(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='add'>+#define __mt76_mcu_send_msg(dev, ...)	(dev)-&gt;mcu_ops-&gt;mcu_send_msg((dev), __VA_ARGS__)</div><div class='add'>+#define mt76_mcu_restart(dev, ...)	(dev)-&gt;mt76.mcu_ops-&gt;mcu_restart(&amp;((dev)-&gt;mt76))</div><div class='add'>+#define __mt76_mcu_restart(dev, ...)	(dev)-&gt;mcu_ops-&gt;mcu_restart((dev))</div><div class='ctx'> </div><div class='ctx'> #define mt76_set(dev, offset, val)	mt76_rmw(dev, offset, 0, val)</div><div class='ctx'> #define mt76_clear(dev, offset, val)	mt76_rmw(dev, offset, val, 0)</div><div class='hunk'>@@ -570,6 +593,7 @@ static inline u16 mt76_rev(struct mt76_dev *dev)</div><div class='ctx'> #define mt76_init_queues(dev)		(dev)-&gt;mt76.queue_ops-&gt;init(&amp;((dev)-&gt;mt76))</div><div class='ctx'> #define mt76_queue_alloc(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;alloc(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_tx_queue_skb_raw(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_queue_skb_raw(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='add'>+#define mt76_tx_queue_skb(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_queue_skb(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_rx_reset(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;rx_reset(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_tx_cleanup(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_cleanup(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_kick(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;kick(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='hunk'>@@ -595,6 +619,7 @@ struct mt76_dev *mt76_alloc_device(struct device *pdev, unsigned int size,</div><div class='ctx'> int mt76_register_device(struct mt76_dev *dev, bool vht,</div><div class='ctx'> 			 struct ieee80211_rate *rates, int n_rates);</div><div class='ctx'> void mt76_unregister_device(struct mt76_dev *dev);</div><div class='add'>+void mt76_free_device(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='ctx'> struct dentry *mt76_register_debugfs(struct mt76_dev *dev);</div><div class='ctx'> void mt76_seq_puts_array(struct seq_file *file, const char *str,</div><div class='hunk'>@@ -603,6 +628,12 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,</div><div class='ctx'> int mt76_eeprom_init(struct mt76_dev *dev, int len);</div><div class='ctx'> void mt76_eeprom_override(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='add'>+static inline u8 *</div><div class='add'>+mt76_get_txwi_ptr(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='add'>+{</div><div class='add'>+	return (u8 *)t - dev-&gt;drv-&gt;txwi_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* increment with wrap-around */</div><div class='ctx'> static inline int mt76_incr(int val, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -643,9 +674,19 @@ static inline struct mt76_tx_cb *mt76_tx_skb_cb(struct sk_buff *skb)</div><div class='ctx'> 	return ((void *) IEEE80211_SKB_CB(skb)-&gt;status.status_driver_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-			  struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			  struct ieee80211_sta *sta);</div><div class='add'>+static inline void mt76_insert_hdr_pad(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int len = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (len % 4 == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, 2);</div><div class='add'>+	memmove(skb-&gt;data, skb-&gt;data + 2, len);</div><div class='add'>+</div><div class='add'>+	skb-&gt;data[len] = 0;</div><div class='add'>+	skb-&gt;data[len + 1] = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb);</div><div class='ctx'> void mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='hunk'>@@ -655,13 +696,14 @@ void mt76_txq_remove(struct mt76_dev *dev, struct ieee80211_txq *txq);</div><div class='ctx'> void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq);</div><div class='ctx'> void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> 			 bool send_bar);</div><div class='del'>-void mt76_txq_schedule(struct mt76_dev *dev, struct mt76_queue *hwq);</div><div class='add'>+void mt76_txq_schedule(struct mt76_dev *dev, enum mt76_txq_id qid);</div><div class='ctx'> void mt76_txq_schedule_all(struct mt76_dev *dev);</div><div class='ctx'> void mt76_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 				  struct ieee80211_sta *sta,</div><div class='ctx'> 				  u16 tids, int nframes,</div><div class='ctx'> 				  enum ieee80211_frame_release_type reason,</div><div class='ctx'> 				  bool more_data);</div><div class='add'>+bool mt76_has_tx_pending(struct mt76_dev *dev);</div><div class='ctx'> void mt76_set_channel(struct mt76_dev *dev);</div><div class='ctx'> int mt76_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> 		    struct survey_info *survey);</div><div class='hunk'>@@ -693,6 +735,8 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		   struct ieee80211_sta *sta,</div><div class='ctx'> 		   enum ieee80211_sta_state old_state,</div><div class='ctx'> 		   enum ieee80211_sta_state new_state);</div><div class='add'>+void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='ctx'> struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);</div><div class='ctx'> </div><div class='hunk'>@@ -704,6 +748,8 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> void mt76_csa_check(struct mt76_dev *dev);</div><div class='ctx'> void mt76_csa_finish(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='add'>+int mt76_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set);</div><div class='add'>+</div><div class='ctx'> /* internal */</div><div class='ctx'> void mt76_tx_free(struct mt76_dev *dev);</div><div class='ctx'> struct mt76_txwi_cache *mt76_get_txwi(struct mt76_dev *dev);</div><div class='hunk'>@@ -734,8 +780,7 @@ static inline int</div><div class='ctx'> mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,</div><div class='ctx'> 	       int timeout)</div><div class='ctx'> {</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(dev-&gt;dev);</div><div class='del'>-	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct usb_device *udev = to_usb_device(dev-&gt;dev);</div><div class='ctx'> 	struct mt76_usb *usb = &amp;dev-&gt;usb;</div><div class='ctx'> 	unsigned int pipe;</div><div class='ctx'> </div><div class='hunk'>@@ -753,10 +798,10 @@ int mt76u_vendor_request(struct mt76_dev *dev, u8 req,</div><div class='ctx'> void mt76u_single_wr(struct mt76_dev *dev, const u8 req,</div><div class='ctx'> 		     const u16 offset, const u32 val);</div><div class='ctx'> int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf);</div><div class='del'>-int mt76u_submit_rx_buffers(struct mt76_dev *dev);</div><div class='ctx'> int mt76u_alloc_queues(struct mt76_dev *dev);</div><div class='del'>-void mt76u_stop_queues(struct mt76_dev *dev);</div><div class='del'>-void mt76u_stop_stat_wk(struct mt76_dev *dev);</div><div class='add'>+void mt76u_stop_tx(struct mt76_dev *dev);</div><div class='add'>+void mt76u_stop_rx(struct mt76_dev *dev);</div><div class='add'>+int mt76u_resume_rx(struct mt76_dev *dev);</div><div class='ctx'> void mt76u_queues_deinit(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *</div><div class='hunk'>@@ -766,4 +811,6 @@ void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb);</div><div class='ctx'> struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,</div><div class='ctx'> 				      unsigned long expires);</div><div class='ctx'> </div><div class='add'>+void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr, u32 clear, u32 set);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c<br/>index afcd86f735b4..58e68fbdbf75 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.c</a></div><div class='hunk'>@@ -16,21 +16,20 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct mt7603_vif *mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='add'>+	if (!(dev-&gt;mt76.beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mt76_dma_tx_queue_skb(&amp;dev-&gt;mt76, &amp;dev-&gt;mt76.q_tx[MT_TXQ_BEACON], skb,</div><div class='del'>-			      &amp;mvif-&gt;sta.wcid, NULL);</div><div class='add'>+	mt76_tx_queue_skb(dev, MT_TXQ_BEACON, skb, &amp;mvif-&gt;sta.wcid, NULL);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> 	mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |</div><div class='ctx'> 		FIELD_PREP(MT_DMA_FQCR0_TARGET_WCID, mvif-&gt;sta.wcid.idx) |</div><div class='ctx'> 		FIELD_PREP(MT_DMA_FQCR0_TARGET_QID,</div><div class='del'>-			   dev-&gt;mt76.q_tx[MT_TXQ_CAB].hw_idx) |</div><div class='add'>+			   dev-&gt;mt76.q_tx[MT_TXQ_CAB].q-&gt;hw_idx) |</div><div class='ctx'> 		FIELD_PREP(MT_DMA_FQCR0_DEST_PORT_ID, 3) |</div><div class='ctx'> 		FIELD_PREP(MT_DMA_FQCR0_DEST_QUEUE_ID, 8));</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +48,7 @@ mt7603_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='add'>+	if (!(dev-&gt;mt76.beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);</div><div class='hunk'>@@ -73,10 +72,13 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int i, nframes;</div><div class='ctx'> </div><div class='add'>+	if (mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	data.dev = dev;</div><div class='ctx'> 	__skb_queue_head_init(&amp;data.q);</div><div class='ctx'> </div><div class='del'>-	q = &amp;dev-&gt;mt76.q_tx[MT_TXQ_BEACON];</div><div class='add'>+	q = dev-&gt;mt76.q_tx[MT_TXQ_BEACON].q;</div><div class='ctx'> 	spin_lock_bh(&amp;q-&gt;lock);</div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='hunk'>@@ -93,7 +95,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> 	if (dev-&gt;mt76.csa_complete)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	q = &amp;dev-&gt;mt76.q_tx[MT_TXQ_CAB];</div><div class='add'>+	q = dev-&gt;mt76.q_tx[MT_TXQ_CAB].q;</div><div class='ctx'> 	do {</div><div class='ctx'> 		nframes = skb_queue_len(&amp;data.q);</div><div class='ctx'> 		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='hunk'>@@ -118,8 +120,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> 		struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='ctx'> 		struct mt7603_vif *mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		mt76_dma_tx_queue_skb(&amp;dev-&gt;mt76, q, skb, &amp;mvif-&gt;sta.wcid,</div><div class='del'>-				      NULL);</div><div class='add'>+		mt76_tx_queue_skb(dev, MT_TXQ_CAB, skb, &amp;mvif-&gt;sta.wcid, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	mt76_queue_kick(dev, q);</div><div class='ctx'> 	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='hunk'>@@ -135,8 +136,8 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);</div><div class='del'>-	if (dev-&gt;mt76.q_tx[MT_TXQ_BEACON].queued &gt;</div><div class='del'>-	    __sw_hweight8(dev-&gt;beacon_mask))</div><div class='add'>+	if (dev-&gt;mt76.q_tx[MT_TXQ_BEACON].q-&gt;queued &gt;</div><div class='add'>+	    hweight8(dev-&gt;mt76.beacon_mask))</div><div class='ctx'> 		dev-&gt;beacon_check++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -146,19 +147,19 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)</div><div class='ctx'> </div><div class='ctx'> 	if (idx &gt;= 0) {</div><div class='ctx'> 		if (intval)</div><div class='del'>-			dev-&gt;beacon_mask |= BIT(idx);</div><div class='add'>+			dev-&gt;mt76.beacon_mask |= BIT(idx);</div><div class='ctx'> 		else</div><div class='del'>-			dev-&gt;beacon_mask &amp;= ~BIT(idx);</div><div class='add'>+			dev-&gt;mt76.beacon_mask &amp;= ~BIT(idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;beacon_mask || (!intval &amp;&amp; idx &lt; 0)) {</div><div class='add'>+	if (!dev-&gt;mt76.beacon_mask || (!intval &amp;&amp; idx &lt; 0)) {</div><div class='ctx'> 		mt7603_irq_disable(dev, MT_INT_MAC_IRQ3);</div><div class='ctx'> 		mt76_clear(dev, MT_ARB_SCR, MT_ARB_SCR_BCNQ_OPMODE_MASK);</div><div class='ctx'> 		mt76_wr(dev, MT_HW_INT_MASK(3), 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;beacon_int = intval;</div><div class='add'>+	dev-&gt;mt76.beacon_int = intval;</div><div class='ctx'> 	mt76_wr(dev, MT_TBTT,</div><div class='ctx'> 		FIELD_PREP(MT_TBTT_PERIOD, intval) | MT_TBTT_CAL_ENABLE);</div><div class='ctx'> </div><div class='hunk'>@@ -176,10 +177,11 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)</div><div class='ctx'> </div><div class='ctx'> 	mt76_set(dev, MT_WF_ARB_BCN_START,</div><div class='ctx'> 		 MT_WF_ARB_BCN_START_BSSn(0) |</div><div class='del'>-		 ((dev-&gt;beacon_mask &gt;&gt; 1) * MT_WF_ARB_BCN_START_BSS0n(1)));</div><div class='add'>+		 ((dev-&gt;mt76.beacon_mask &gt;&gt; 1) *</div><div class='add'>+		  MT_WF_ARB_BCN_START_BSS0n(1)));</div><div class='ctx'> 	mt7603_irq_enable(dev, MT_INT_MAC_IRQ3);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;beacon_mask &amp; ~BIT(0))</div><div class='add'>+	if (dev-&gt;mt76.beacon_mask &amp; ~BIT(0))</div><div class='ctx'> 		mt76_set(dev, MT_LPON_SBTOR(0), MT_LPON_SBTOR_SUB_BSS_EN);</div><div class='ctx'> 	else</div><div class='ctx'> 		mt76_clear(dev, MT_LPON_SBTOR(0), MT_LPON_SBTOR_SUB_BSS_EN);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/core.c b/drivers/net/wireless/mediatek/mt76/mt7603/core.c<br/>index 1086dcd376a0..37e5644b45ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/core.c</a></div><div class='hunk'>@@ -2,17 +2,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "mt7603.h"</div><div class='ctx'> </div><div class='del'>-void mt7603_set_irq_mask(struct mt7603_dev *dev, u32 clear, u32 set)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;mt76.mmio.irq_lock, flags);</div><div class='del'>-	dev-&gt;mt76.mmio.irqmask &amp;= ~clear;</div><div class='del'>-	dev-&gt;mt76.mmio.irqmask |= set;</div><div class='del'>-	mt76_wr(dev, MT_INT_MASK_CSR, dev-&gt;mt76.mmio.irqmask);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;mt76.mmio.irq_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void mt7603_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='hunk'>@@ -38,7 +27,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> 		mt76_wr(dev, MT_HW_INT_STATUS(3), hwintr);</div><div class='ctx'> 		if (hwintr &amp; MT_HW_INT3_PRE_TBTT0)</div><div class='del'>-			tasklet_schedule(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+			tasklet_schedule(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='ctx'> 		if ((hwintr &amp; MT_HW_INT3_TBTT0) &amp;&amp; dev-&gt;mt76.csa_complete)</div><div class='ctx'> 			mt76_csa_finish(&amp;dev-&gt;mt76);</div><div class='hunk'>@@ -46,7 +35,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; MT_INT_TX_DONE_ALL) {</div><div class='ctx'> 		mt7603_irq_disable(dev, MT_INT_TX_DONE_ALL);</div><div class='del'>-		tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+		tasklet_schedule(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; MT_INT_RX_DONE(0)) {</div><div class='hunk'>@@ -64,8 +53,8 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> u32 mt7603_reg_map(struct mt7603_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='del'>-	u32 base = addr &amp; GENMASK(31, 19);</div><div class='del'>-	u32 offset = addr &amp; GENMASK(18, 0);</div><div class='add'>+	u32 base = addr &amp; MT_MCU_PCIE_REMAP_2_BASE;</div><div class='add'>+	u32 offset = addr &amp; MT_MCU_PCIE_REMAP_2_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;bus_ops-&gt;wr(&amp;dev-&gt;mt76, MT_MCU_PCIE_REMAP_2, base);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c<br/>index d69e82c66ab2..27e2d9f90553 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a></div><div class='hunk'>@@ -5,18 +5,22 @@</div><div class='ctx'> #include "../dma.h"</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_queue *q,</div><div class='add'>+mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_sw_queue *q,</div><div class='ctx'> 		     int idx, int n_desc)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct mt76_queue *hwq;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	q-&gt;hw_idx = idx;</div><div class='del'>-	q-&gt;regs = dev-&gt;mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;</div><div class='del'>-	q-&gt;ndesc = n_desc;</div><div class='add'>+	hwq = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*hwq), GFP_KERNEL);</div><div class='add'>+	if (!hwq)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_queue_alloc(dev, q);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	err = mt76_queue_alloc(dev, hwq, idx, n_desc, 0, MT_TX_RING_BASE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;swq);</div><div class='add'>+	q-&gt;q = hwq;</div><div class='ctx'> </div><div class='ctx'> 	mt7603_irq_enable(dev, MT_INT_TX_DONE(idx));</div><div class='ctx'> </div><div class='hunk'>@@ -27,12 +31,16 @@ static void</div><div class='ctx'> mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *txd = (__le32 *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct mt7603_sta *msta;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='add'>+	void *priv;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	u32 val;</div><div class='add'>+	u8 tid;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; sizeof(MT_TXD_SIZE) + sizeof(struct ieee80211_hdr))</div><div class='add'>+	if (skb-&gt;len &lt; MT_TXD_SIZE + sizeof(struct ieee80211_hdr))</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='ctx'> 	val = le32_to_cpu(txd[1]);</div><div class='hunk'>@@ -46,10 +54,19 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	msta = container_of(wcid, struct mt7603_sta, wcid);</div><div class='add'>+	priv = msta = container_of(wcid, struct mt7603_sta, wcid);</div><div class='ctx'> 	val = le32_to_cpu(txd[0]);</div><div class='ctx'> 	skb_set_queue_mapping(skb, FIELD_GET(MT_TXD0_Q_IDX, val));</div><div class='ctx'> </div><div class='add'>+	val &amp;= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);</div><div class='add'>+	val |= FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_HW_QUEUE_MGMT);</div><div class='add'>+	txd[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	sta = container_of(priv, struct ieee80211_sta, drv_priv);</div><div class='add'>+	hdr = (struct ieee80211_hdr *) &amp;skb-&gt;data[MT_TXD_SIZE];</div><div class='add'>+	tid = *ieee80211_get_qos_ctl(hdr) &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	ieee80211_sta_set_buffered(sta, tid, true);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> 	__skb_queue_tail(&amp;msta-&gt;psq, skb);</div><div class='ctx'> 	if (skb_queue_len(&amp;msta-&gt;psq) &gt;= 64) {</div><div class='hunk'>@@ -106,15 +123,12 @@ static int</div><div class='ctx'> mt7603_init_rx_queue(struct mt7603_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		     int idx, int n_desc, int bufsize)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	q-&gt;regs = dev-&gt;mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;</div><div class='del'>-	q-&gt;ndesc = n_desc;</div><div class='del'>-	q-&gt;buf_size = bufsize;</div><div class='del'>-</div><div class='del'>-	ret = mt76_queue_alloc(dev, q);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	err = mt76_queue_alloc(dev, q, idx, n_desc, bufsize,</div><div class='add'>+			       MT_RX_RING_BASE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mt7603_irq_enable(dev, MT_INT_RX_DONE(idx));</div><div class='ctx'> </div><div class='hunk'>@@ -131,6 +145,8 @@ mt7603_tx_tasklet(unsigned long data)</div><div class='ctx'> 	for (i = MT_TXQ_MCU; i &gt;= 0; i--)</div><div class='ctx'> 		mt76_queue_tx_cleanup(dev, i, false);</div><div class='ctx'> </div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='ctx'> 	mt7603_irq_enable(dev, MT_INT_TX_DONE_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -150,7 +166,7 @@ int mt7603_dma_init(struct mt7603_dev *dev)</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;mt76.mmio.mcu.wait);</div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;mt76.mmio.mcu.res_q);</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;dev-&gt;tx_tasklet, mt7603_tx_tasklet, (unsigned long)dev);</div><div class='add'>+	tasklet_init(&amp;dev-&gt;mt76.tx_tasklet, mt7603_tx_tasklet, (unsigned long)dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76_clear(dev, MT_WPDMA_GLO_CFG,</div><div class='ctx'> 		   MT_WPDMA_GLO_CFG_TX_DMA_EN |</div><div class='hunk'>@@ -210,6 +226,6 @@ void mt7603_dma_cleanup(struct mt7603_dev *dev)</div><div class='ctx'> 		   MT_WPDMA_GLO_CFG_RX_DMA_EN |</div><div class='ctx'> 		   MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE);</div><div class='ctx'> </div><div class='del'>-	tasklet_kill(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+	tasklet_kill(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='ctx'> 	mt76_dma_cleanup(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c<br/>index 15cc8f33b34d..78cdbb70e178 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/init.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static void</div><div class='ctx'> mt7603_phy_init(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int rx_chains = dev-&gt;mt76.antenna_mask;</div><div class='del'>-	int tx_chains = __sw_hweight8(rx_chains) - 1;</div><div class='add'>+	int tx_chains = hweight8(rx_chains) - 1;</div><div class='ctx'> </div><div class='ctx'> 	mt76_rmw(dev, MT_WF_RMAC_RMCR,</div><div class='ctx'> 		 (MT_WF_RMAC_RMCR_SMPS_MODE |</div><div class='hunk'>@@ -167,7 +167,8 @@ mt7603_mac_init(struct mt7603_dev *dev)</div><div class='ctx'> 		FIELD_PREP(MT_AGG_RETRY_CONTROL_BAR_LIMIT, 1) |</div><div class='ctx'> 		FIELD_PREP(MT_AGG_RETRY_CONTROL_RTS_LIMIT, 15));</div><div class='ctx'> </div><div class='del'>-	mt76_rmw(dev, MT_DMA_DCR0, ~0xfffc, 4096);</div><div class='add'>+	mt76_wr(dev, MT_DMA_DCR0, MT_DMA_DCR0_RX_VEC_DROP |</div><div class='add'>+		FIELD_PREP(MT_DMA_DCR0_MAX_RX_LEN, 4096));</div><div class='ctx'> </div><div class='ctx'> 	mt76_rmw(dev, MT_DMA_VCFR0, BIT(0), BIT(13));</div><div class='ctx'> 	mt76_rmw(dev, MT_DMA_TMCFR0, BIT(0) | BIT(1), BIT(13));</div><div class='hunk'>@@ -488,6 +489,7 @@ mt7603_init_txpower(struct mt7603_dev *dev,</div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='ctx'> 		chan = &amp;sband-&gt;channels[i];</div><div class='ctx'> 		chan-&gt;max_power = target_power;</div><div class='add'>+		chan-&gt;orig_mpwr = target_power;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -510,8 +512,10 @@ int mt7603_register_device(struct mt7603_dev *dev)</div><div class='ctx'> 	bus_ops-&gt;rmw = mt7603_rmw;</div><div class='ctx'> 	dev-&gt;mt76.bus = bus_ops;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;dev-&gt;mac_work, mt7603_mac_work);</div><div class='del'>-	tasklet_init(&amp;dev-&gt;pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;ps_lock);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mt76.mac_work, mt7603_mac_work);</div><div class='add'>+	tasklet_init(&amp;dev-&gt;mt76.pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,</div><div class='ctx'> 		     (unsigned long)dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for 7688, which only has 1SS */</div><div class='hunk'>@@ -570,9 +574,9 @@ int mt7603_register_device(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mt7603_unregister_device(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='ctx'> 	mt7603_mcu_exit(dev);</div><div class='ctx'> 	mt7603_dma_cleanup(dev);</div><div class='del'>-	ieee80211_free_hw(mt76_hw(dev));</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c<br/>index 0a0115861b51..6d506e34c3ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/mac.c</a></div><div class='hunk'>@@ -343,7 +343,7 @@ void mt7603_mac_rx_ba_reset(struct mt7603_dev *dev, void *addr, u8 tid)</div><div class='ctx'> 		 MT_BA_CONTROL_1_RESET));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn,</div><div class='add'>+void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid,</div><div class='ctx'> 			    int ba_size)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr = mt7603_wtbl2_addr(wcid);</div><div class='hunk'>@@ -358,43 +358,6 @@ void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn,</div><div class='ctx'> 		mt76_clear(dev, addr + (15 * 4), tid_mask);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000);</div><div class='del'>-</div><div class='del'>-	mt7603_mac_stop(dev);</div><div class='del'>-	switch (tid) {</div><div class='del'>-	case 0:</div><div class='del'>-		mt76_rmw_field(dev, addr + (2 * 4), MT_WTBL2_W2_TID0_SN, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		mt76_rmw_field(dev, addr + (2 * 4), MT_WTBL2_W2_TID1_SN, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		mt76_rmw_field(dev, addr + (2 * 4), MT_WTBL2_W2_TID2_SN_LO,</div><div class='del'>-			       ssn);</div><div class='del'>-		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID2_SN_HI,</div><div class='del'>-			       ssn &gt;&gt; 8);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID3_SN, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID4_SN, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID5_SN_LO,</div><div class='del'>-			       ssn);</div><div class='del'>-		mt76_rmw_field(dev, addr + (4 * 4), MT_WTBL2_W4_TID5_SN_HI,</div><div class='del'>-			       ssn &gt;&gt; 4);</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		mt76_rmw_field(dev, addr + (4 * 4), MT_WTBL2_W4_TID6_SN, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		mt76_rmw_field(dev, addr + (4 * 4), MT_WTBL2_W4_TID7_SN, ssn);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	mt7603_wtbl_update(dev, wcid, MT_WTBL_UPDATE_WTBL2);</div><div class='del'>-	mt7603_mac_start(dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 7; i &gt; 0; i--) {</div><div class='ctx'> 		if (ba_size &gt;= MT_AGG_SIZE_LIMIT(i))</div><div class='hunk'>@@ -627,7 +590,7 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	status-&gt;aggr = unicast &amp;&amp;</div><div class='ctx'> 		       !ieee80211_is_qos_nullfunc(hdr-&gt;frame_control);</div><div class='ctx'> 	status-&gt;tid = *ieee80211_get_qos_ctl(hdr) &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	status-&gt;seqno = hdr-&gt;seq_ctrl &gt;&gt; 4;</div><div class='add'>+	status-&gt;seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -754,11 +717,11 @@ void mt7603_wtbl_set_rates(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> 		MT_WTBL_UPDATE_RATE_UPDATE |</div><div class='ctx'> 		MT_WTBL_UPDATE_TX_COUNT_CLEAR);</div><div class='ctx'> </div><div class='del'>-	if (!sta-&gt;wcid.tx_rate_set)</div><div class='add'>+	if (!(sta-&gt;wcid.tx_info &amp; MT_WCID_TX_INFO_SET))</div><div class='ctx'> 		mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000);</div><div class='ctx'> </div><div class='ctx'> 	sta-&gt;rate_count = 2 * MT7603_RATE_RETRY * n_rates;</div><div class='del'>-	sta-&gt;wcid.tx_rate_set = true;</div><div class='add'>+	sta-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum mt7603_cipher_type</div><div class='hunk'>@@ -820,20 +783,23 @@ int mt7603_wtbl_set_key(struct mt7603_dev *dev, int wcid,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,</div><div class='del'>-		      struct sk_buff *skb, struct mt76_queue *q,</div><div class='add'>+		      struct sk_buff *skb, enum mt76_txq_id qid,</div><div class='ctx'> 		      struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='ctx'> 		      int pid, struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_tx_rate *rate = &amp;info-&gt;control.rates[0];</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_bar *bar = (struct ieee80211_bar *)skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	struct mt76_queue *q = dev-&gt;mt76.q_tx[qid].q;</div><div class='ctx'> 	struct mt7603_vif *mvif;</div><div class='ctx'> 	int wlan_idx;</div><div class='ctx'> 	int hdr_len = ieee80211_get_hdrlen_from_skb(skb);</div><div class='ctx'> 	int tx_count = 8;</div><div class='ctx'> 	u8 frame_type, frame_subtype;</div><div class='ctx'> 	u16 fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='add'>+	u16 seqno = 0;</div><div class='ctx'> 	u8 vif_idx = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u8 bw;</div><div class='hunk'>@@ -841,7 +807,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,</div><div class='ctx'> 	if (vif) {</div><div class='ctx'> 		mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 		vif_idx = mvif-&gt;idx;</div><div class='del'>-		if (vif_idx &amp;&amp; q &gt;= &amp;dev-&gt;mt76.q_tx[MT_TXQ_BEACON])</div><div class='add'>+		if (vif_idx &amp;&amp; qid &gt;= MT_TXQ_BEACON)</div><div class='ctx'> 			vif_idx += 0x10;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -915,11 +881,21 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* use maximum tx count for beacons and buffered multicast */</div><div class='del'>-	if (q &gt;= &amp;dev-&gt;mt76.q_tx[MT_TXQ_BEACON])</div><div class='add'>+	if (qid &gt;= MT_TXQ_BEACON)</div><div class='ctx'> 		tx_count = 0x1f;</div><div class='ctx'> </div><div class='ctx'> 	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count) |</div><div class='del'>-	      FIELD_PREP(MT_TXD3_SEQ, le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='add'>+		  MT_TXD3_SN_VALID;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		seqno = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='add'>+	else if (ieee80211_is_back_req(hdr-&gt;frame_control))</div><div class='add'>+		seqno = le16_to_cpu(bar-&gt;start_seq_num);</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~MT_TXD3_SN_VALID;</div><div class='add'>+</div><div class='add'>+	val |= FIELD_PREP(MT_TXD3_SEQ, seqno &gt;&gt; 4);</div><div class='add'>+</div><div class='ctx'> 	txwi[3] = cpu_to_le32(val);</div><div class='ctx'> </div><div class='ctx'> 	if (key) {</div><div class='hunk'>@@ -936,13 +912,13 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='del'>-			  struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='del'>-			  u32 *tx_info)</div><div class='add'>+			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='ctx'> 	struct mt7603_sta *msta = container_of(wcid, struct mt7603_sta, wcid);</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='ctx'> 	int pid;</div><div class='ctx'> </div><div class='hunk'>@@ -958,7 +934,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 			mt7603_wtbl_set_ps(dev, msta, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pid = mt76_tx_status_skb_add(mdev, wcid, skb);</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE) {</div><div class='ctx'> 		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='hunk'>@@ -968,7 +944,8 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 		spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7603_mac_write_txwi(dev, txwi_ptr, skb, q, wcid, sta, pid, key);</div><div class='add'>+	mt7603_mac_write_txwi(dev, txwi_ptr, tx_info-&gt;skb, qid, wcid,</div><div class='add'>+			      sta, pid, key);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1072,7 +1049,7 @@ out:</div><div class='ctx'> 	case MT_PHY_TYPE_HT:</div><div class='ctx'> 		final_rate_flags |= IEEE80211_TX_RC_MCS;</div><div class='ctx'> 		final_rate &amp;= GENMASK(5, 0);</div><div class='del'>-		if (i &gt; 15)</div><div class='add'>+		if (final_rate &gt; 15)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1167,8 +1144,8 @@ out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='del'>-			    struct mt76_queue_entry *e, bool flush)</div><div class='add'>+void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			    struct mt76_queue_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='ctx'> 	struct sk_buff *skb = e-&gt;skb;</div><div class='hunk'>@@ -1178,7 +1155,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (q - dev-&gt;mt76.q_tx &lt; 4)</div><div class='add'>+	if (qid &lt; 4)</div><div class='ctx'> 		dev-&gt;tx_hang_check = 0;</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_complete_skb(mdev, skb);</div><div class='hunk'>@@ -1291,7 +1268,7 @@ static void mt7603_dma_sched_reset(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int beacon_int = dev-&gt;beacon_int;</div><div class='add'>+	int beacon_int = dev-&gt;mt76.beacon_int;</div><div class='ctx'> 	u32 mask = dev-&gt;mt76.mmio.irqmask;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1301,8 +1278,8 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)</div><div class='ctx'> 	/* lock/unlock all queues to ensure that no tx is pending */</div><div class='ctx'> 	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='del'>-	tasklet_disable(&amp;dev-&gt;tx_tasklet);</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	napi_disable(&amp;dev-&gt;mt76.napi[0]);</div><div class='ctx'> 	napi_disable(&amp;dev-&gt;mt76.napi[1]);</div><div class='ctx'> </div><div class='hunk'>@@ -1348,10 +1325,10 @@ skip_dma_reset:</div><div class='ctx'> 	clear_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	tasklet_enable(&amp;dev-&gt;tx_tasklet);</div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+	tasklet_enable(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='ctx'> </div><div class='del'>-	tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	mt7603_beacon_set_timer(dev, -1, beacon_int);</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.napi[0]);</div><div class='hunk'>@@ -1410,17 +1387,17 @@ static bool mt7603_tx_hang(struct mt7603_dev *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		q = &amp;dev-&gt;mt76.q_tx[i];</div><div class='add'>+		q = dev-&gt;mt76.q_tx[i].q;</div><div class='ctx'> </div><div class='ctx'> 		if (!q-&gt;queued)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		prev_dma_idx = dev-&gt;tx_dma_idx[i];</div><div class='del'>-		dma_idx = ioread32(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+		dma_idx = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='ctx'> 		dev-&gt;tx_dma_idx[i] = dma_idx;</div><div class='ctx'> </div><div class='ctx'> 		if (dma_idx == prev_dma_idx &amp;&amp;</div><div class='del'>-		    dma_idx != ioread32(&amp;q-&gt;regs-&gt;cpu_idx))</div><div class='add'>+		    dma_idx != readl(&amp;q-&gt;regs-&gt;cpu_idx))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1691,7 +1668,7 @@ out:</div><div class='ctx'> void mt7603_mac_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(work, struct mt7603_dev,</div><div class='del'>-					      mac_work.work);</div><div class='add'>+					      mt76.mac_work.work);</div><div class='ctx'> 	bool reset = false;</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, false);</div><div class='hunk'>@@ -1744,6 +1721,6 @@ void mt7603_mac_work(struct work_struct *work)</div><div class='ctx'> 	if (reset)</div><div class='ctx'> 		mt7603_mac_watchdog_reset(dev);</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     msecs_to_jiffies(MT7603_WATCHDOG_TIME));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c<br/>index b10775ed92e6..0a0334dc40d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include "mt7603.h"</div><div class='add'>+#include "mac.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -15,7 +16,7 @@ mt7603_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	mt7603_mac_start(dev);</div><div class='ctx'> 	dev-&gt;survey_time = ktime_get_boottime();</div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-	mt7603_mac_work(&amp;dev-&gt;mac_work.work);</div><div class='add'>+	mt7603_mac_work(&amp;dev-&gt;mt76.mac_work.work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -26,7 +27,7 @@ mt7603_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mac_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='ctx'> 	mt7603_mac_stop(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -131,11 +132,13 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)</div><div class='ctx'> 	u8 bw = MT_BW_20;</div><div class='ctx'> 	bool failed = false;</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mac_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 	set_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='ctx'> </div><div class='add'>+	mt7603_beacon_set_timer(dev, -1, 0);</div><div class='ctx'> 	mt76_set_channel(&amp;dev-&gt;mt76);</div><div class='ctx'> 	mt7603_mac_stop(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -170,7 +173,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)</div><div class='ctx'> </div><div class='ctx'> 	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     MT7603_WATCHDOG_TIME);</div><div class='ctx'> </div><div class='ctx'> 	/* reset channel stats */</div><div class='hunk'>@@ -185,10 +188,14 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)</div><div class='ctx'> 	mt7603_init_edcca(dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	if (!(mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL))</div><div class='add'>+		mt7603_beacon_set_timer(dev, -1, dev-&gt;mt76.beacon_int);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='add'>+	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='add'>+</div><div class='ctx'> 	if (failed)</div><div class='del'>-		mt7603_mac_work(&amp;dev-&gt;mac_work.work);</div><div class='add'>+		mt7603_mac_work(&amp;dev-&gt;mt76.mac_work.work);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -293,9 +300,9 @@ mt7603_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_BEACON_ENABLED | BSS_CHANGED_BEACON_INT)) {</div><div class='ctx'> 		int beacon_int = !!info-&gt;enable_beacon * info-&gt;beacon_int;</div><div class='ctx'> </div><div class='del'>-		tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+		tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 		mt7603_beacon_set_timer(dev, mvif-&gt;idx, beacon_int);</div><div class='del'>-		tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+		tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='hunk'>@@ -371,7 +378,7 @@ mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)</div><div class='ctx'> 	struct mt7603_sta *msta = (struct mt7603_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff_head list;</div><div class='ctx'> </div><div class='del'>-	mt76_stop_tx_queues(&amp;dev-&gt;mt76, sta, false);</div><div class='add'>+	mt76_stop_tx_queues(&amp;dev-&gt;mt76, sta, true);</div><div class='ctx'> 	mt7603_wtbl_set_ps(dev, msta, ps);</div><div class='ctx'> 	if (ps)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -386,6 +393,15 @@ mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+mt7603_ps_set_more_data(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *) &amp;skb-&gt;data[MT_TXD_SIZE];</div><div class='add'>+	hdr-&gt;frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> mt7603_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 			       struct ieee80211_sta *sta,</div><div class='ctx'> 			       u16 tids, int nframes,</div><div class='hunk'>@@ -399,6 +415,8 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_head_init(&amp;list);</div><div class='ctx'> </div><div class='add'>+	mt7603_wtbl_set_ps(dev, msta, false);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> 	skb_queue_walk_safe(&amp;msta-&gt;psq, skb, tmp) {</div><div class='ctx'> 		if (!nframes)</div><div class='hunk'>@@ -409,11 +427,15 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 		skb_set_queue_mapping(skb, MT_TXQ_PSD);</div><div class='ctx'> 		__skb_unlink(skb, &amp;msta-&gt;psq);</div><div class='add'>+		mt7603_ps_set_more_data(skb);</div><div class='ctx'> 		__skb_queue_tail(&amp;list, skb);</div><div class='ctx'> 		nframes--;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> </div><div class='add'>+	if (!skb_queue_empty(&amp;list))</div><div class='add'>+		ieee80211_sta_eosp(sta);</div><div class='add'>+</div><div class='ctx'> 	mt7603_ps_tx_list(dev, &amp;list);</div><div class='ctx'> </div><div class='ctx'> 	if (nframes)</div><div class='hunk'>@@ -476,7 +498,7 @@ mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='ctx'> 	u16 cw_max = (1 &lt;&lt; 10) - 1;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	queue = dev-&gt;mt76.q_tx[queue].hw_idx;</div><div class='add'>+	queue = dev-&gt;mt76.q_tx[queue].q-&gt;hw_idx;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;cw_min)</div><div class='ctx'> 		cw_min = params-&gt;cw_min;</div><div class='hunk'>@@ -519,7 +541,6 @@ mt7603_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MT76_SCANNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-	mt7603_beacon_set_timer(dev, -1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -528,7 +549,6 @@ mt7603_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_SCANNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-	mt7603_beacon_set_timer(dev, -1, dev-&gt;beacon_int);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -568,21 +588,21 @@ mt7603_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='ctx'> 		mtxq-&gt;aggr = true;</div><div class='ctx'> 		mtxq-&gt;send_bar = false;</div><div class='del'>-		mt7603_mac_tx_ba_reset(dev, msta-&gt;wcid.idx, tid, *ssn, ba_size);</div><div class='add'>+		mt7603_mac_tx_ba_reset(dev, msta-&gt;wcid.idx, tid, ba_size);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='ctx'> 		mtxq-&gt;aggr = false;</div><div class='ctx'> 		ieee80211_send_bar(vif, sta-&gt;addr, tid, mtxq-&gt;agg_ssn);</div><div class='del'>-		mt7603_mac_tx_ba_reset(dev, msta-&gt;wcid.idx, tid, *ssn, -1);</div><div class='add'>+		mt7603_mac_tx_ba_reset(dev, msta-&gt;wcid.idx, tid, -1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		mtxq-&gt;agg_ssn = *ssn &lt;&lt; 4;</div><div class='add'>+		mtxq-&gt;agg_ssn = IEEE80211_SN_TO_SEQ(*ssn);</div><div class='ctx'> 		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='ctx'> 		mtxq-&gt;aggr = false;</div><div class='del'>-		mt7603_mac_tx_ba_reset(dev, msta-&gt;wcid.idx, tid, *ssn, -1);</div><div class='add'>+		mt7603_mac_tx_ba_reset(dev, msta-&gt;wcid.idx, tid, -1);</div><div class='ctx'> 		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -648,12 +668,6 @@ static void mt7603_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *cont</div><div class='ctx'> 	mt76_tx(&amp;dev-&gt;mt76, control-&gt;sta, wcid, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7603_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const struct ieee80211_ops mt7603_ops = {</div><div class='ctx'> 	.tx = mt7603_tx,</div><div class='ctx'> 	.start = mt7603_start,</div><div class='hunk'>@@ -675,7 +689,7 @@ const struct ieee80211_ops mt7603_ops = {</div><div class='ctx'> 	.sta_rate_tbl_update = mt7603_sta_rate_tbl_update,</div><div class='ctx'> 	.release_buffered_frames = mt7603_release_buffered_frames,</div><div class='ctx'> 	.set_coverage_class = mt7603_set_coverage_class,</div><div class='del'>-	.set_tim = mt7603_set_tim,</div><div class='add'>+	.set_tim = mt76_set_tim,</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c<br/>index 4b0713f1fd5e..6357b5658a32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a></div><div class='hunk'>@@ -14,17 +14,14 @@ struct mt7603_fw_trailer {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-__mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,</div><div class='del'>-		      int query, int *wait_seq)</div><div class='add'>+__mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb,</div><div class='add'>+		      int cmd, int *wait_seq)</div><div class='ctx'> {</div><div class='ctx'> 	int hdrlen = dev-&gt;mcu_running ? sizeof(struct mt7603_mcu_txd) : 12;</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='ctx'> 	struct mt7603_mcu_txd *txd;</div><div class='ctx'> 	u8 seq;</div><div class='ctx'> </div><div class='del'>-	if (!skb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	seq = ++mdev-&gt;mmio.mcu.msg_seq &amp; 0xf;</div><div class='ctx'> 	if (!seq)</div><div class='ctx'> 		seq = ++mdev-&gt;mmio.mcu.msg_seq &amp; 0xf;</div><div class='hunk'>@@ -42,15 +39,14 @@ __mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,</div><div class='ctx'> </div><div class='ctx'> 	if (cmd &lt; 0) {</div><div class='ctx'> 		txd-&gt;cid = -cmd;</div><div class='add'>+		txd-&gt;set_query = MCU_Q_NA;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		txd-&gt;cid = MCU_CMD_EXT_CID;</div><div class='ctx'> 		txd-&gt;ext_cid = cmd;</div><div class='del'>-		if (query != MCU_Q_NA)</div><div class='del'>-			txd-&gt;ext_cid_ack = 1;</div><div class='add'>+		txd-&gt;set_query = MCU_Q_SET;</div><div class='add'>+		txd-&gt;ext_cid_ack = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txd-&gt;set_query = query;</div><div class='del'>-</div><div class='ctx'> 	if (wait_seq)</div><div class='ctx'> 		*wait_seq = seq;</div><div class='ctx'> </div><div class='hunk'>@@ -58,21 +54,26 @@ __mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,</div><div class='del'>-		    int query)</div><div class='add'>+mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,</div><div class='add'>+		    int len, bool wait_resp)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='ctx'> 	unsigned long expires = jiffies + 3 * HZ;</div><div class='ctx'> 	struct mt7603_mcu_rxd *rxd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	int ret, seq;</div><div class='ctx'> </div><div class='add'>+	skb = mt7603_mcu_msg_alloc(data, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;mdev-&gt;mmio.mcu.mutex);</div><div class='ctx'> </div><div class='del'>-	ret = __mt7603_mcu_msg_send(dev, skb, cmd, query, &amp;seq);</div><div class='add'>+	ret = __mt7603_mcu_msg_send(dev, skb, cmd, &amp;seq);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	while (wait_resp) {</div><div class='ctx'> 		bool check_seq = false;</div><div class='ctx'> </div><div class='ctx'> 		skb = mt76_mcu_get_response(&amp;dev-&gt;mt76, expires);</div><div class='hunk'>@@ -113,28 +114,22 @@ mt7603_mcu_init_download(struct mt7603_dev *dev, u32 addr, u32 len)</div><div class='ctx'> 		.len = cpu_to_le32(len),</div><div class='ctx'> 		.mode = cpu_to_le32(BIT(31)),</div><div class='ctx'> 	};</div><div class='del'>-	struct sk_buff *skb = mt7603_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='ctx'> </div><div class='del'>-	return mt7603_mcu_msg_send(dev, skb, -MCU_CMD_TARGET_ADDRESS_LEN_REQ,</div><div class='del'>-				   MCU_Q_NA);</div><div class='add'>+	return __mt76_mcu_send_msg(&amp;dev-&gt;mt76, -MCU_CMD_TARGET_ADDRESS_LEN_REQ,</div><div class='add'>+				   &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7603_mcu_send_firmware(struct mt7603_dev *dev, const void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int cur_len, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='del'>-		int cur_len = min_t(int, 4096 - sizeof(struct mt7603_mcu_txd),</div><div class='del'>-				    len);</div><div class='del'>-</div><div class='del'>-		skb = mt7603_mcu_msg_alloc(data, cur_len);</div><div class='del'>-		if (!skb)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		cur_len = min_t(int, 4096 - sizeof(struct mt7603_mcu_txd),</div><div class='add'>+				len);</div><div class='ctx'> </div><div class='del'>-		ret = __mt7603_mcu_msg_send(dev, skb, -MCU_CMD_FW_SCATTER,</div><div class='del'>-					    MCU_Q_NA, NULL);</div><div class='add'>+		ret = __mt76_mcu_send_msg(&amp;dev-&gt;mt76, -MCU_CMD_FW_SCATTER,</div><div class='add'>+					  data, cur_len, false);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -155,23 +150,19 @@ mt7603_mcu_start_firmware(struct mt7603_dev *dev, u32 addr)</div><div class='ctx'> 		.override = cpu_to_le32(addr ? 1 : 0),</div><div class='ctx'> 		.addr = cpu_to_le32(addr),</div><div class='ctx'> 	};</div><div class='del'>-	struct sk_buff *skb = mt7603_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='ctx'> </div><div class='del'>-	return mt7603_mcu_msg_send(dev, skb, -MCU_CMD_FW_START_REQ,</div><div class='del'>-				   MCU_Q_NA);</div><div class='add'>+	return __mt76_mcu_send_msg(&amp;dev-&gt;mt76, -MCU_CMD_FW_START_REQ,</div><div class='add'>+				   &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7603_mcu_restart(struct mt7603_dev *dev)</div><div class='add'>+mt7603_mcu_restart(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = mt7603_mcu_msg_alloc(NULL, 0);</div><div class='del'>-</div><div class='del'>-	return mt7603_mcu_msg_send(dev, skb, -MCU_CMD_RESTART_DL_REQ,</div><div class='del'>-				   MCU_Q_NA);</div><div class='add'>+	return __mt76_mcu_send_msg(dev, -MCU_CMD_RESTART_DL_REQ,</div><div class='add'>+				   NULL, 0, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7603_load_firmware(struct mt7603_dev *dev)</div><div class='add'>+static int mt7603_load_firmware(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	const struct mt7603_fw_trailer *hdr;</div><div class='hunk'>@@ -261,6 +252,9 @@ running:</div><div class='ctx'> 	mt76_clear(dev, MT_SCH_4, BIT(8));</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mcu_running = true;</div><div class='add'>+	snprintf(dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version,</div><div class='add'>+		 sizeof(dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version),</div><div class='add'>+		 "%.10s-%.15s", hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='ctx'> 	dev_info(dev-&gt;mt76.dev, "firmware init done\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -271,14 +265,18 @@ out:</div><div class='ctx'> </div><div class='ctx'> int mt7603_mcu_init(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	mutex_init(&amp;dev-&gt;mt76.mmio.mcu.mutex);</div><div class='add'>+	static const struct mt76_mcu_ops mt7603_mcu_ops = {</div><div class='add'>+		.mcu_send_msg = mt7603_mcu_msg_send,</div><div class='add'>+		.mcu_restart = mt7603_mcu_restart,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7603_mcu_ops;</div><div class='ctx'> 	return mt7603_load_firmware(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7603_mcu_exit(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	mt7603_mcu_restart(dev);</div><div class='add'>+	__mt76_mcu_restart(&amp;dev-&gt;mt76);</div><div class='ctx'> 	skb_queue_purge(&amp;dev-&gt;mt76.mmio.mcu.res_q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -360,27 +358,30 @@ int mt7603_mcu_set_eeprom(struct mt7603_dev *dev)</div><div class='ctx'> 		.buffer_mode = 1,</div><div class='ctx'> 		.len = ARRAY_SIZE(req_fields) - 1,</div><div class='ctx'> 	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct req_data *data;</div><div class='ctx'> 	const int size = 0xff * sizeof(struct req_data);</div><div class='del'>-	u8 *eep = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='del'>-	int i;</div><div class='add'>+	u8 *req, *eep = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='add'>+	int i, ret, len = sizeof(req_hdr) + size;</div><div class='add'>+	struct req_data *data;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(req_fields) * sizeof(*data) &gt; size);</div><div class='ctx'> </div><div class='del'>-	skb = mt7603_mcu_msg_alloc(NULL, size + sizeof(req_hdr));</div><div class='del'>-	memcpy(skb_put(skb, sizeof(req_hdr)), &amp;req_hdr, sizeof(req_hdr));</div><div class='del'>-	data = (struct req_data *)skb_put(skb, size);</div><div class='del'>-	memset(data, 0, size);</div><div class='add'>+	req = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	memcpy(req, &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+	data = (struct req_data *)(req + sizeof(req_hdr));</div><div class='add'>+	memset(data, 0, size);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(req_fields); i++) {</div><div class='ctx'> 		data[i].addr = cpu_to_le16(req_fields[i]);</div><div class='ctx'> 		data[i].val = eep[req_fields[i]];</div><div class='del'>-		data[i].pad = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt7603_mcu_msg_send(dev, skb, MCU_EXT_CMD_EFUSE_BUFFER_MODE,</div><div class='del'>-				   MCU_Q_SET);</div><div class='add'>+	ret = __mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_EFUSE_BUFFER_MODE,</div><div class='add'>+				  req, len, true);</div><div class='add'>+	kfree(req);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)</div><div class='hunk'>@@ -415,7 +416,6 @@ static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)</div><div class='ctx'> 		},</div><div class='ctx'> #undef EEP_VAL</div><div class='ctx'> 	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	u8 *eep = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(req.rate_power_delta, eep + MT_EE_TX_POWER_CCK,</div><div class='hunk'>@@ -424,16 +424,15 @@ static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)</div><div class='ctx'> 	memcpy(req.temp_comp_power, eep + MT_EE_STEP_NUM_NEG_6_7,</div><div class='ctx'> 	       sizeof(req.temp_comp_power));</div><div class='ctx'> </div><div class='del'>-	skb = mt7603_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='del'>-	return mt7603_mcu_msg_send(dev, skb, MCU_EXT_CMD_SET_TX_POWER_CTRL,</div><div class='del'>-				   MCU_Q_SET);</div><div class='add'>+	return __mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_SET_TX_POWER_CTRL,</div><div class='add'>+				   &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7603_mcu_set_channel(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfg80211_chan_def *chandef = &amp;dev-&gt;mt76.chandef;</div><div class='ctx'> 	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='del'>-	int n_chains = __sw_hweight8(dev-&gt;mt76.antenna_mask);</div><div class='add'>+	int n_chains = hweight8(dev-&gt;mt76.antenna_mask);</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 control_chan;</div><div class='ctx'> 		u8 center_chan;</div><div class='hunk'>@@ -450,10 +449,8 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)</div><div class='ctx'> 		.tx_streams = n_chains,</div><div class='ctx'> 		.rx_streams = n_chains,</div><div class='ctx'> 	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	s8 tx_power;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;mt76.chandef.width == NL80211_CHAN_WIDTH_40) {</div><div class='ctx'> 		req.bw = MT_BW_40;</div><div class='hunk'>@@ -473,9 +470,8 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(req.txpower); i++)</div><div class='ctx'> 		req.txpower[i] = tx_power;</div><div class='ctx'> </div><div class='del'>-	skb = mt7603_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='del'>-	ret = mt7603_mcu_msg_send(dev, skb, MCU_EXT_CMD_CHANNEL_SWITCH,</div><div class='del'>-				  MCU_Q_SET);</div><div class='add'>+	ret = __mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_CHANNEL_SWITCH,</div><div class='add'>+				  &amp;req, sizeof(req), true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h<br/>index 79f332429432..fa64bbaab0d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h</a></div><div class='hunk'>@@ -109,7 +109,6 @@ struct mt7603_dev {</div><div class='ctx'> </div><div class='ctx'> 	ktime_t survey_time;</div><div class='ctx'> 	ktime_t ed_time;</div><div class='del'>-	int beacon_int;</div><div class='ctx'> </div><div class='ctx'> 	struct mt76_queue q_rx;</div><div class='ctx'> </div><div class='hunk'>@@ -126,8 +125,6 @@ struct mt7603_dev {</div><div class='ctx'> </div><div class='ctx'> 	s8 sensitivity;</div><div class='ctx'> </div><div class='del'>-	u8 beacon_mask;</div><div class='del'>-</div><div class='ctx'> 	u8 beacon_check;</div><div class='ctx'> 	u8 tx_hang_check;</div><div class='ctx'> 	u8 tx_dma_check;</div><div class='hunk'>@@ -143,10 +140,6 @@ struct mt7603_dev {</div><div class='ctx'> 	u32 reset_test;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int reset_cause[__RESET_CAUSE_MAX];</div><div class='del'>-</div><div class='del'>-	struct delayed_work mac_work;</div><div class='del'>-	struct tasklet_struct tx_tasklet;</div><div class='del'>-	struct tasklet_struct pre_tbtt_tasklet;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct mt76_driver_ops mt7603_drv_ops;</div><div class='hunk'>@@ -179,16 +172,14 @@ void mt7603_dma_cleanup(struct mt7603_dev *dev);</div><div class='ctx'> int mt7603_mcu_init(struct mt7603_dev *dev);</div><div class='ctx'> void mt7603_init_debugfs(struct mt7603_dev *dev);</div><div class='ctx'> </div><div class='del'>-void mt7603_set_irq_mask(struct mt7603_dev *dev, u32 clear, u32 set);</div><div class='del'>-</div><div class='ctx'> static inline void mt7603_irq_enable(struct mt7603_dev *dev, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	mt7603_set_irq_mask(dev, 0, mask);</div><div class='add'>+	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, 0, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mt7603_irq_disable(struct mt7603_dev *dev, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	mt7603_set_irq_mask(dev, mask, 0);</div><div class='add'>+	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7603_mac_dma_start(struct mt7603_dev *dev);</div><div class='hunk'>@@ -200,7 +191,7 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval);</div><div class='ctx'> int mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb);</div><div class='ctx'> void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data);</div><div class='ctx'> void mt7603_mac_rx_ba_reset(struct mt7603_dev *dev, void *addr, u8 tid);</div><div class='del'>-void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn,</div><div class='add'>+void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid,</div><div class='ctx'> 			    int ba_size);</div><div class='ctx'> </div><div class='ctx'> void mt7603_pse_client_reset(struct mt7603_dev *dev);</div><div class='hunk'>@@ -225,12 +216,12 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort);</div><div class='ctx'> </div><div class='ctx'> int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='del'>-			  struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='del'>-			  u32 *tx_info);</div><div class='add'>+			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct mt76_tx_info *tx_info);</div><div class='ctx'> </div><div class='del'>-void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='del'>-			    struct mt76_queue_entry *e, bool flush);</div><div class='add'>+void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			    struct mt76_queue_entry *e);</div><div class='ctx'> </div><div class='ctx'> void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='ctx'> 			 struct sk_buff *skb);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/regs.h b/drivers/net/wireless/mediatek/mt76/mt7603/regs.h<br/>index da6827ae6cee..9d257d5c309d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/regs.h</a></div><div class='hunk'>@@ -233,6 +233,10 @@</div><div class='ctx'> #define MT_WF_DMA(ofs)			(MT_WF_DMA_BASE + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_DMA_DCR0			MT_WF_DMA(0x000)</div><div class='add'>+#define MT_DMA_DCR0_MAX_RX_LEN		GENMASK(15, 0)</div><div class='add'>+#define MT_DMA_DCR0_DAMSDU		BIT(16)</div><div class='add'>+#define MT_DMA_DCR0_RX_VEC_DROP		BIT(17)</div><div class='add'>+</div><div class='ctx'> #define MT_DMA_DCR1			MT_WF_DMA(0x004)</div><div class='ctx'> </div><div class='ctx'> #define MT_DMA_FQCR0			MT_WF_DMA(0x008)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c<br/>index e13fea80d970..b920be1f5718 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt7603/soc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7603/soc.c</a></div><div class='hunk'>@@ -23,9 +23,9 @@ mt76_wmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mem_base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (!mem_base) {</div><div class='add'>+	if (IS_ERR(mem_base)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to get memory resource\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return PTR_ERR(mem_base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), &amp;mt7603_ops,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig<br/>new file mode 100644<br/>index 000000000000..3b8aba09bd5e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+config MT7615E</div><div class='add'>+	tristate "MediaTek MT7615E (PCIe) support"</div><div class='add'>+	select MT76_CORE</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  This adds support for MT7615-based wireless PCIe devices.</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Makefile b/drivers/net/wireless/mediatek/mt76/mt7615/Makefile<br/>new file mode 100644<br/>index 000000000000..6397552f6ee3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+#SPDX-License-Identifier: ISC</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MT7615E) += mt7615e.o</div><div class='add'>+</div><div class='add'>+mt7615e-y := pci.o init.o dma.o eeprom.o main.o mcu.o mac.o</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c<br/>new file mode 100644<br/>index 000000000000..3ec6582afd8f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/dma.c</a></div><div class='hunk'>@@ -0,0 +1,205 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *         Roy Luo &lt;royluo@google.com&gt;</div><div class='add'>+ *         Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ *         Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7615_init_tx_queues(struct mt7615_dev *dev, int n_desc)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sw_queue *q;</div><div class='add'>+	struct mt76_queue *hwq;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	hwq = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*hwq), GFP_KERNEL);</div><div class='add'>+	if (!hwq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = mt76_queue_alloc(dev, hwq, 0, n_desc, 0, MT_TX_RING_BASE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MT_TXQ_MCU; i++) {</div><div class='add'>+		q = &amp;dev-&gt;mt76.q_tx[i];</div><div class='add'>+		INIT_LIST_HEAD(&amp;q-&gt;swq);</div><div class='add'>+		q-&gt;q = hwq;</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'>+mt7615_init_mcu_queue(struct mt7615_dev *dev, struct mt76_sw_queue *q,</div><div class='add'>+		      int idx, int n_desc)</div><div class='add'>+{</div><div class='add'>+	struct mt76_queue *hwq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hwq = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*hwq), GFP_KERNEL);</div><div class='add'>+	if (!hwq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = mt76_queue_alloc(dev, hwq, idx, n_desc, 0, MT_TX_RING_BASE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;swq);</div><div class='add'>+	q-&gt;q = hwq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='add'>+			 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;skb-&gt;data[skb-&gt;len];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='add'>+</div><div class='add'>+	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd++; rxd + 7 &lt;= end; rxd += 7)</div><div class='add'>+			mt7615_mac_add_txs(dev, rxd);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		mt7615_mac_tx_free(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_RX_EVENT:</div><div class='add'>+		mt76_mcu_rx_event(&amp;dev-&gt;mt76, skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_NORMAL:</div><div class='add'>+		if (!mt7615_mac_fill_rx(dev, skb)) {</div><div class='add'>+			mt76_rx(&amp;dev-&gt;mt76, q, skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/* fall through */</div><div class='add'>+	default:</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_tx_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = (struct mt7615_dev *)data;</div><div class='add'>+	static const u8 queue_map[] = {</div><div class='add'>+		MT_TXQ_MCU,</div><div class='add'>+		MT_TXQ_BE</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(queue_map); i++)</div><div class='add'>+		mt76_queue_tx_cleanup(dev, queue_map[i], false);</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	mt7615_irq_enable(dev, MT_INT_TX_DONE_ALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_dma_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;dev-&gt;mt76.tx_tasklet, mt7615_tx_tasklet,</div><div class='add'>+		     (unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE |</div><div class='add'>+		MT_WPDMA_GLO_CFG_FIFO_LITTLE_ENDIAN |</div><div class='add'>+		MT_WPDMA_GLO_CFG_FIRST_TOKEN_ONLY |</div><div class='add'>+		MT_WPDMA_GLO_CFG_OMIT_TX_INFO);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		       MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT0, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		       MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT21, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		       MT_WPDMA_GLO_CFG_DMA_BURST_SIZE, 0x3);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		       MT_WPDMA_GLO_CFG_MULTI_DMA_EN, 0x3);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_GLO_CFG1, 0x1);</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_TX_PRE_CFG, 0xf0000);</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_RX_PRE_CFG, 0xf7f0000);</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_ABT_CFG, 0x4000026);</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_ABT_CFG1, 0x18811881);</div><div class='add'>+	mt76_set(dev, 0x7158, BIT(16));</div><div class='add'>+	mt76_clear(dev, 0x7000, BIT(23));</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_RST_IDX, ~0);</div><div class='add'>+</div><div class='add'>+	ret = mt7615_init_tx_queues(dev, MT7615_TX_RING_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_init_mcu_queue(dev, &amp;dev-&gt;mt76.q_tx[MT_TXQ_MCU],</div><div class='add'>+				    MT7615_TXQ_MCU,</div><div class='add'>+				    MT7615_TX_MCU_RING_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_init_mcu_queue(dev, &amp;dev-&gt;mt76.q_tx[MT_TXQ_FWDL],</div><div class='add'>+				    MT7615_TXQ_FWDL,</div><div class='add'>+				    MT7615_TX_FWDL_RING_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* init rx queues */</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU], 1,</div><div class='add'>+			       MT7615_RX_MCU_RING_SIZE, MT_RX_BUF_SIZE,</div><div class='add'>+			       MT_RX_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN], 0,</div><div class='add'>+			       MT7615_RX_RING_SIZE, MT_RX_BUF_SIZE,</div><div class='add'>+			       MT_RX_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_DELAY_INT_CFG, 0);</div><div class='add'>+</div><div class='add'>+	ret = mt76_init_queues(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_poll(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		  MT_WPDMA_GLO_CFG_TX_DMA_BUSY |</div><div class='add'>+		  MT_WPDMA_GLO_CFG_RX_DMA_BUSY, 0, 1000);</div><div class='add'>+</div><div class='add'>+	/* start dma engine */</div><div class='add'>+	mt76_set(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		 MT_WPDMA_GLO_CFG_TX_DMA_EN |</div><div class='add'>+		 MT_WPDMA_GLO_CFG_RX_DMA_EN);</div><div class='add'>+</div><div class='add'>+	/* enable interrupts for TX/RX rings */</div><div class='add'>+	mt7615_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_dma_cleanup(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt76_clear(dev, MT_WPDMA_GLO_CFG,</div><div class='add'>+		   MT_WPDMA_GLO_CFG_TX_DMA_EN |</div><div class='add'>+		   MT_WPDMA_GLO_CFG_RX_DMA_EN);</div><div class='add'>+	mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_SW_RESET);</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	mt76_dma_cleanup(&amp;dev-&gt;mt76);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c<br/>new file mode 100644<br/>index 000000000000..dd5ab46a4f66<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *         Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+#include "eeprom.h"</div><div class='add'>+</div><div class='add'>+static int mt7615_efuse_read(struct mt7615_dev *dev, u32 base,</div><div class='add'>+			     u16 addr, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val = mt76_rr(dev, base + MT_EFUSE_CTRL);</div><div class='add'>+	val &amp;= ~(MT_EFUSE_CTRL_AIN | MT_EFUSE_CTRL_MODE);</div><div class='add'>+	val |= FIELD_PREP(MT_EFUSE_CTRL_AIN, addr &amp; ~0xf);</div><div class='add'>+	val |= MT_EFUSE_CTRL_KICK;</div><div class='add'>+	mt76_wr(dev, base + MT_EFUSE_CTRL, val);</div><div class='add'>+</div><div class='add'>+	if (!mt76_poll(dev, base + MT_EFUSE_CTRL, MT_EFUSE_CTRL_KICK, 0, 1000))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	udelay(2);</div><div class='add'>+</div><div class='add'>+	val = mt76_rr(dev, base + MT_EFUSE_CTRL);</div><div class='add'>+	if ((val &amp; MT_EFUSE_CTRL_AOUT) == MT_EFUSE_CTRL_AOUT ||</div><div class='add'>+	    WARN_ON_ONCE(!(val &amp; MT_EFUSE_CTRL_VALID))) {</div><div class='add'>+		memset(data, 0x0, 16);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		val = mt76_rr(dev, base + MT_EFUSE_RDATA(i));</div><div class='add'>+		put_unaligned_le32(val, data + 4 * 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'>+static int mt7615_efuse_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 base = mt7615_reg_map(dev, MT_EFUSE_BASE);</div><div class='add'>+	int len = MT7615_EEPROM_SIZE;</div><div class='add'>+	int ret, i;</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	if (mt76_rr(dev, base + MT_EFUSE_BASE_CTRL) &amp; MT_EFUSE_BASE_CTRL_EMPTY)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.otp.data = devm_kzalloc(dev-&gt;mt76.dev, len, GFP_KERNEL);</div><div class='add'>+	dev-&gt;mt76.otp.size = len;</div><div class='add'>+	if (!dev-&gt;mt76.otp.data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf = dev-&gt;mt76.otp.data;</div><div class='add'>+	for (i = 0; i + 16 &lt;= len; i += 16) {</div><div class='add'>+		ret = mt7615_efuse_read(dev, base, i, buf + 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 mt7615_eeprom_load(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_eeprom_init(&amp;dev-&gt;mt76, MT7615_EEPROM_SIZE);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt7615_efuse_init(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_eeprom_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_eeprom_load(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;mt76.eeprom.data, dev-&gt;mt76.otp.data, MT7615_EEPROM_SIZE);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.cap.has_2ghz = true;</div><div class='add'>+	dev-&gt;mt76.cap.has_5ghz = true;</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;mt76.macaddr, dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR,</div><div class='add'>+	       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	mt76_eeprom_override(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h<br/>new file mode 100644<br/>index 000000000000..a4cf16688171<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7615_EEPROM_H</div><div class='add'>+#define __MT7615_EEPROM_H</div><div class='add'>+</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+</div><div class='add'>+enum mt7615_eeprom_field {</div><div class='add'>+	MT_EE_CHIP_ID =				0x000,</div><div class='add'>+	MT_EE_VERSION =				0x002,</div><div class='add'>+	MT_EE_MAC_ADDR =			0x004,</div><div class='add'>+	MT_EE_NIC_CONF_0 =			0x034,</div><div class='add'>+</div><div class='add'>+	__MT_EE_MAX =				0x3bf</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c<br/>new file mode 100644<br/>index 000000000000..3ab3ff553ef2<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/init.c</a></div><div class='hunk'>@@ -0,0 +1,229 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='add'>+ *         Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *         Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static void mt7615_phy_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* disable band 0 rf low power beacon mode */</div><div class='add'>+	mt76_rmw(dev, MT_WF_PHY_WF2_RFCTRL0, MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN,</div><div class='add'>+		 MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_mac_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* enable band 0 clk */</div><div class='add'>+	mt76_rmw(dev, MT_CFG_CCR,</div><div class='add'>+		 MT_CFG_CCR_MAC_D0_1X_GC_EN | MT_CFG_CCR_MAC_D0_2X_GC_EN,</div><div class='add'>+		 MT_CFG_CCR_MAC_D0_1X_GC_EN | MT_CFG_CCR_MAC_D0_2X_GC_EN);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_TMAC_CTCR0,</div><div class='add'>+		       MT_TMAC_CTCR0_INS_DDLMT_REFTIME, 0x3f);</div><div class='add'>+	mt76_rmw_field(dev, MT_TMAC_CTCR0,</div><div class='add'>+		       MT_TMAC_CTCR0_INS_DDLMT_DENSITY, 0x3);</div><div class='add'>+	mt76_rmw(dev, MT_TMAC_CTCR0,</div><div class='add'>+		 MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN |</div><div class='add'>+		 MT_TMAC_CTCR0_INS_DDLMT_EN,</div><div class='add'>+		 MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN |</div><div class='add'>+		 MT_TMAC_CTCR0_INS_DDLMT_EN);</div><div class='add'>+</div><div class='add'>+	mt7615_mcu_set_rts_thresh(dev, 0x92b);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_AGG_SCR, MT_AGG_SCR_NLNAV_MID_PTEC_DIS,</div><div class='add'>+		 MT_AGG_SCR_NLNAV_MID_PTEC_DIS);</div><div class='add'>+</div><div class='add'>+	mt7615_mcu_init_mac(dev);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_DMA_DCR0, MT_DMA_DCR0_RX_VEC_DROP |</div><div class='add'>+		FIELD_PREP(MT_DMA_DCR0_MAX_RX_LEN, 3072));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_AGG_ARUCR, FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), 7));</div><div class='add'>+	mt76_wr(dev, MT_AGG_ARDCR,</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), 0) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(1),</div><div class='add'>+			   max_t(int, 0, MT7615_RATE_RETRY - 2)) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(2), MT7615_RATE_RETRY - 1) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(3), MT7615_RATE_RETRY - 1) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(4), MT7615_RATE_RETRY - 1) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(5), MT7615_RATE_RETRY - 1) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(6), MT7615_RATE_RETRY - 1) |</div><div class='add'>+		FIELD_PREP(MT_AGG_ARxCR_LIMIT(7), MT7615_RATE_RETRY - 1));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_AGG_ARCR,</div><div class='add'>+		(MT_AGG_ARCR_INIT_RATE1 |</div><div class='add'>+		 FIELD_PREP(MT_AGG_ARCR_RTS_RATE_THR, 2) |</div><div class='add'>+		 MT_AGG_ARCR_RATE_DOWN_RATIO_EN |</div><div class='add'>+		 FIELD_PREP(MT_AGG_ARCR_RATE_DOWN_RATIO, 1) |</div><div class='add'>+		 FIELD_PREP(MT_AGG_ARCR_RATE_UP_EXTRA_TH, 4)));</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.global_wcid.idx = MT7615_WTBL_RESERVED;</div><div class='add'>+	dev-&gt;mt76.global_wcid.hw_key_idx = -1;</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[MT7615_WTBL_RESERVED],</div><div class='add'>+			   &amp;dev-&gt;mt76.global_wcid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_init_hardware(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;token_lock);</div><div class='add'>+	idr_init(&amp;dev-&gt;token);</div><div class='add'>+</div><div class='add'>+	ret = mt7615_eeprom_init(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_dma_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mt76.state);</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt7615_mcu_set_eeprom(dev);</div><div class='add'>+	mt7615_mac_init(dev);</div><div class='add'>+	mt7615_phy_init(dev);</div><div class='add'>+	mt7615_mcu_ctrl_pm_state(dev, 0);</div><div class='add'>+	mt7615_mcu_del_wtbl_all(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CCK_RATE(_idx, _rate) {						\</div><div class='add'>+	.bitrate = _rate,						\</div><div class='add'>+	.flags = IEEE80211_RATE_SHORT_PREAMBLE,				\</div><div class='add'>+	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),			\</div><div class='add'>+	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (4 + (_idx)),	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define OFDM_RATE(_idx, _rate) {					\</div><div class='add'>+	.bitrate = _rate,						\</div><div class='add'>+	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),			\</div><div class='add'>+	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_rate mt7615_rates[] = {</div><div class='add'>+	CCK_RATE(0, 10),</div><div class='add'>+	CCK_RATE(1, 20),</div><div class='add'>+	CCK_RATE(2, 55),</div><div class='add'>+	CCK_RATE(3, 110),</div><div class='add'>+	OFDM_RATE(11, 60),</div><div class='add'>+	OFDM_RATE(15, 90),</div><div class='add'>+	OFDM_RATE(10, 120),</div><div class='add'>+	OFDM_RATE(14, 180),</div><div class='add'>+	OFDM_RATE(9,  240),</div><div class='add'>+	OFDM_RATE(13, 360),</div><div class='add'>+	OFDM_RATE(8,  480),</div><div class='add'>+	OFDM_RATE(12, 540),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit if_limits[] = {</div><div class='add'>+	{</div><div class='add'>+		.max = MT7615_MAX_INTERFACES,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+			 BIT(NL80211_IFTYPE_STATION)</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_combination if_comb[] = {</div><div class='add'>+	{</div><div class='add'>+		.limits = if_limits,</div><div class='add'>+		.n_limits = ARRAY_SIZE(if_limits),</div><div class='add'>+		.max_interfaces = 4,</div><div class='add'>+		.num_different_channels = 1,</div><div class='add'>+		.beacon_int_infra_match = true,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt7615_init_debugfs(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+</div><div class='add'>+	dir = mt76_register_debugfs(&amp;dev-&gt;mt76);</div><div class='add'>+	if (!dir)</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 mt7615_register_device(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_init_hardware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mt76.mac_work, mt7615_mac_work);</div><div class='add'>+</div><div class='add'>+	hw-&gt;queues = 4;</div><div class='add'>+	hw-&gt;max_rates = 3;</div><div class='add'>+	hw-&gt;max_report_rates = 7;</div><div class='add'>+	hw-&gt;max_rate_tries = 11;</div><div class='add'>+</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct mt7615_sta);</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct mt7615_vif);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;iface_combinations = if_comb;</div><div class='add'>+	wiphy-&gt;n_iface_combinations = ARRAY_SIZE(if_comb);</div><div class='add'>+</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);</div><div class='add'>+	ieee80211_hw_set(hw, TX_STATUS_NO_AMPDU_LEN);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.sband_2g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;</div><div class='add'>+	dev-&gt;mt76.sband_5g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;</div><div class='add'>+	dev-&gt;mt76.sband_5g.sband.vht_cap.cap |=</div><div class='add'>+			IEEE80211_VHT_CAP_SHORT_GI_160 |</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |</div><div class='add'>+			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;</div><div class='add'>+	dev-&gt;mt76.chainmask = 0x404;</div><div class='add'>+	dev-&gt;mt76.antenna_mask = 0xf;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_AP);</div><div class='add'>+</div><div class='add'>+	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt7615_rates,</div><div class='add'>+				   ARRAY_SIZE(mt7615_rates));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	hw-&gt;max_tx_fragments = MT_TXP_MAX_BUF_NUM;</div><div class='add'>+</div><div class='add'>+	return mt7615_init_debugfs(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_unregister_device(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *txwi;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+	idr_for_each_entry(&amp;dev-&gt;token, txwi, id) {</div><div class='add'>+		mt7615_txp_skb_unmap(&amp;dev-&gt;mt76, txwi);</div><div class='add'>+		if (txwi-&gt;skb)</div><div class='add'>+			dev_kfree_skb_any(txwi-&gt;skb);</div><div class='add'>+		mt76_put_txwi(&amp;dev-&gt;mt76, txwi);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+	idr_destroy(&amp;dev-&gt;token);</div><div class='add'>+	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7615_mcu_exit(dev);</div><div class='add'>+	mt7615_dma_cleanup(dev);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_hw(mt76_hw(dev));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c<br/>new file mode 100644<br/>index 000000000000..b8f48d10f27a<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/mac.c</a></div><div class='hunk'>@@ -0,0 +1,775 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *         Roy Luo &lt;royluo@google.com&gt;</div><div class='add'>+ *         Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ *         Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</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/timekeeping.h&gt;</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev,</div><div class='add'>+					    u8 idx, bool unicast)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_sta *sta;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= ARRAY_SIZE(dev-&gt;mt76.wcid))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+	if (unicast || !wcid)</div><div class='add'>+		return wcid;</div><div class='add'>+</div><div class='add'>+	if (!wcid-&gt;sta)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sta = container_of(wcid, struct mt7615_sta, wcid);</div><div class='add'>+	if (!sta-&gt;vif)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return &amp;sta-&gt;vif-&gt;sta.wcid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_get_rate(struct mt7615_dev *dev,</div><div class='add'>+			   struct ieee80211_supported_band *sband,</div><div class='add'>+			   int idx, bool cck)</div><div class='add'>+{</div><div class='add'>+	int offset = 0;</div><div class='add'>+	int len = sband-&gt;n_bitrates;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (cck) {</div><div class='add'>+		if (sband == &amp;dev-&gt;mt76.sband_5g.sband)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		idx &amp;= ~BIT(2); /* short preamble */</div><div class='add'>+	} else if (sband == &amp;dev-&gt;mt76.sband_2g.sband) {</div><div class='add'>+		offset = 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; len; i++) {</div><div class='add'>+		if ((sband-&gt;bitrates[i].hw_value &amp; GENMASK(7, 0)) == idx)</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'>+static void mt7615_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	int hdr_len = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+	u8 *pn = status-&gt;iv;</div><div class='add'>+	u8 *hdr;</div><div class='add'>+</div><div class='add'>+	__skb_push(skb, 8);</div><div class='add'>+	memmove(skb-&gt;data, skb-&gt;data + 8, hdr_len);</div><div class='add'>+	hdr = skb-&gt;data + hdr_len;</div><div class='add'>+</div><div class='add'>+	hdr[0] = pn[5];</div><div class='add'>+	hdr[1] = pn[4];</div><div class='add'>+	hdr[2] = 0;</div><div class='add'>+	hdr[3] = 0x20 | (key_id &lt;&lt; 6);</div><div class='add'>+	hdr[4] = pn[3];</div><div class='add'>+	hdr[5] = pn[2];</div><div class='add'>+	hdr[6] = pn[1];</div><div class='add'>+	hdr[7] = pn[0];</div><div class='add'>+</div><div class='add'>+	status-&gt;flag &amp;= ~RX_FLAG_IV_STRIPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	u32 rxd0 = le32_to_cpu(rxd[0]);</div><div class='add'>+	u32 rxd1 = le32_to_cpu(rxd[1]);</div><div class='add'>+	u32 rxd2 = le32_to_cpu(rxd[2]);</div><div class='add'>+	bool unicast, remove_pad, insert_ccmp_hdr = false;</div><div class='add'>+	int i, idx;</div><div class='add'>+</div><div class='add'>+	memset(status, 0, sizeof(*status));</div><div class='add'>+</div><div class='add'>+	unicast = (rxd1 &amp; MT_RXD1_NORMAL_ADDR_TYPE) == MT_RXD1_NORMAL_U2M;</div><div class='add'>+	idx = FIELD_GET(MT_RXD2_NORMAL_WLAN_IDX, rxd2);</div><div class='add'>+	status-&gt;wcid = mt7615_rx_get_wcid(dev, idx, unicast);</div><div class='add'>+</div><div class='add'>+	/* TODO: properly support DBDC */</div><div class='add'>+	status-&gt;freq = dev-&gt;mt76.chandef.chan-&gt;center_freq;</div><div class='add'>+	status-&gt;band = dev-&gt;mt76.chandef.chan-&gt;band;</div><div class='add'>+	if (status-&gt;band == NL80211_BAND_5GHZ)</div><div class='add'>+		sband = &amp;dev-&gt;mt76.sband_5g.sband;</div><div class='add'>+	else</div><div class='add'>+		sband = &amp;dev-&gt;mt76.sband_2g.sband;</div><div class='add'>+</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_FCS_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_TKIP_MIC_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2) != 0 &amp;&amp;</div><div class='add'>+	    !(rxd2 &amp; (MT_RXD2_NORMAL_CLM | MT_RXD2_NORMAL_CM))) {</div><div class='add'>+		status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+		status-&gt;flag |= RX_FLAG_IV_STRIPPED;</div><div class='add'>+		status-&gt;flag |= RX_FLAG_MMIC_STRIPPED | RX_FLAG_MIC_STRIPPED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	remove_pad = rxd1 &amp; MT_RXD1_NORMAL_HDR_OFFSET;</div><div class='add'>+</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_MAX_LEN_ERROR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sband-&gt;channels)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rxd += 4;</div><div class='add'>+	if (rxd0 &amp; MT_RXD0_NORMAL_GROUP_4) {</div><div class='add'>+		rxd += 4;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxd0 &amp; MT_RXD0_NORMAL_GROUP_1) {</div><div class='add'>+		u8 *data = (u8 *)rxd;</div><div class='add'>+</div><div class='add'>+		if (status-&gt;flag &amp; RX_FLAG_DECRYPTED) {</div><div class='add'>+			status-&gt;iv[0] = data[5];</div><div class='add'>+			status-&gt;iv[1] = data[4];</div><div class='add'>+			status-&gt;iv[2] = data[3];</div><div class='add'>+			status-&gt;iv[3] = data[2];</div><div class='add'>+			status-&gt;iv[4] = data[1];</div><div class='add'>+			status-&gt;iv[5] = data[0];</div><div class='add'>+</div><div class='add'>+			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+		}</div><div class='add'>+		rxd += 4;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxd0 &amp; MT_RXD0_NORMAL_GROUP_2) {</div><div class='add'>+		rxd += 2;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxd0 &amp; MT_RXD0_NORMAL_GROUP_3) {</div><div class='add'>+		u32 rxdg0 = le32_to_cpu(rxd[0]);</div><div class='add'>+		u32 rxdg1 = le32_to_cpu(rxd[1]);</div><div class='add'>+		u8 stbc = FIELD_GET(MT_RXV1_HT_STBC, rxdg0);</div><div class='add'>+		bool cck = false;</div><div class='add'>+</div><div class='add'>+		i = FIELD_GET(MT_RXV1_TX_RATE, rxdg0);</div><div class='add'>+		switch (FIELD_GET(MT_RXV1_TX_MODE, rxdg0)) {</div><div class='add'>+		case MT_PHY_TYPE_CCK:</div><div class='add'>+			cck = true;</div><div class='add'>+			/* fall through */</div><div class='add'>+		case MT_PHY_TYPE_OFDM:</div><div class='add'>+			i = mt7615_get_rate(dev, sband, i, cck);</div><div class='add'>+			break;</div><div class='add'>+		case MT_PHY_TYPE_HT_GF:</div><div class='add'>+		case MT_PHY_TYPE_HT:</div><div class='add'>+			status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+			if (i &gt; 31)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		case MT_PHY_TYPE_VHT:</div><div class='add'>+			status-&gt;nss = FIELD_GET(MT_RXV2_NSTS, rxdg1) + 1;</div><div class='add'>+			status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		status-&gt;rate_idx = i;</div><div class='add'>+</div><div class='add'>+		switch (FIELD_GET(MT_RXV1_FRAME_MODE, rxdg0)) {</div><div class='add'>+		case MT_PHY_BW_20:</div><div class='add'>+			break;</div><div class='add'>+		case MT_PHY_BW_40:</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+			break;</div><div class='add'>+		case MT_PHY_BW_80:</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+			break;</div><div class='add'>+		case MT_PHY_BW_160:</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_160;</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 (rxdg0 &amp; MT_RXV1_HT_SHORT_GI)</div><div class='add'>+			status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		if (rxdg0 &amp; MT_RXV1_HT_AD_CODE)</div><div class='add'>+			status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='add'>+</div><div class='add'>+		status-&gt;enc_flags |= RX_ENC_FLAG_STBC_MASK * stbc;</div><div class='add'>+</div><div class='add'>+		/* TODO: RSSI */</div><div class='add'>+		rxd += 6;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, (u8 *)rxd - skb-&gt;data + 2 * remove_pad);</div><div class='add'>+</div><div class='add'>+	if (insert_ccmp_hdr) {</div><div class='add'>+		u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);</div><div class='add'>+</div><div class='add'>+		mt7615_insert_ccmp_hdr(skb, key_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	if (!status-&gt;wcid || !ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	status-&gt;aggr = unicast &amp;&amp;</div><div class='add'>+		       !ieee80211_is_qos_nullfunc(hdr-&gt;frame_control);</div><div class='add'>+	status-&gt;tid = *ieee80211_get_qos_ctl(hdr) &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	status-&gt;seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			    struct mt76_queue_entry *e)</div><div class='add'>+{</div><div class='add'>+	if (!e-&gt;txwi) {</div><div class='add'>+		dev_kfree_skb_any(e-&gt;skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* error path */</div><div class='add'>+	if (e-&gt;skb == DMA_DUMMY_DATA) {</div><div class='add'>+		struct mt76_txwi_cache *t;</div><div class='add'>+		struct mt7615_dev *dev;</div><div class='add'>+		struct mt7615_txp *txp;</div><div class='add'>+		u8 *txwi_ptr;</div><div class='add'>+</div><div class='add'>+		txwi_ptr = mt76_get_txwi_ptr(mdev, e-&gt;txwi);</div><div class='add'>+		txp = (struct mt7615_txp *)(txwi_ptr + MT_TXD_SIZE);</div><div class='add'>+		dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+		t = idr_remove(&amp;dev-&gt;token, le16_to_cpu(txp-&gt;token));</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+		e-&gt;skb = t ? t-&gt;skb : NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (e-&gt;skb)</div><div class='add'>+		mt76_tx_complete_skb(mdev, e-&gt;skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 mt7615_mac_tx_rate_val(struct mt7615_dev *dev,</div><div class='add'>+			   const struct ieee80211_tx_rate *rate,</div><div class='add'>+			   bool stbc, u8 *bw)</div><div class='add'>+{</div><div class='add'>+	u8 phy, nss, rate_idx;</div><div class='add'>+	u16 rateval;</div><div class='add'>+</div><div class='add'>+	*bw = 0;</div><div class='add'>+</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_VHT_MCS) {</div><div class='add'>+		rate_idx = ieee80211_rate_get_vht_mcs(rate);</div><div class='add'>+		nss = ieee80211_rate_get_vht_nss(rate);</div><div class='add'>+		phy = MT_PHY_TYPE_VHT;</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			*bw = 1;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_TX_RC_80_MHZ_WIDTH)</div><div class='add'>+			*bw = 2;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_TX_RC_160_MHZ_WIDTH)</div><div class='add'>+			*bw = 3;</div><div class='add'>+	} else if (rate-&gt;flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='add'>+		rate_idx = rate-&gt;idx;</div><div class='add'>+		nss = 1 + (rate-&gt;idx &gt;&gt; 3);</div><div class='add'>+		phy = MT_PHY_TYPE_HT;</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_GREEN_FIELD)</div><div class='add'>+			phy = MT_PHY_TYPE_HT_GF;</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			*bw = 1;</div><div class='add'>+	} else {</div><div class='add'>+		const struct ieee80211_rate *r;</div><div class='add'>+		int band = dev-&gt;mt76.chandef.chan-&gt;band;</div><div class='add'>+		u16 val;</div><div class='add'>+</div><div class='add'>+		nss = 1;</div><div class='add'>+		r = &amp;mt76_hw(dev)-&gt;wiphy-&gt;bands[band]-&gt;bitrates[rate-&gt;idx];</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_USE_SHORT_PREAMBLE)</div><div class='add'>+			val = r-&gt;hw_value_short;</div><div class='add'>+		else</div><div class='add'>+			val = r-&gt;hw_value;</div><div class='add'>+</div><div class='add'>+		phy = val &gt;&gt; 8;</div><div class='add'>+		rate_idx = val &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rateval = (FIELD_PREP(MT_TX_RATE_IDX, rate_idx) |</div><div class='add'>+		   FIELD_PREP(MT_TX_RATE_MODE, phy) |</div><div class='add'>+		   FIELD_PREP(MT_TX_RATE_NSS, nss - 1));</div><div class='add'>+</div><div class='add'>+	if (stbc &amp;&amp; nss == 1)</div><div class='add'>+		rateval |= MT_TX_RATE_STBC;</div><div class='add'>+</div><div class='add'>+	return rateval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='add'>+			  struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+			  struct ieee80211_sta *sta, int pid,</div><div class='add'>+			  struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_tx_rate *rate = &amp;info-&gt;control.rates[0];</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	int tx_count = 8;</div><div class='add'>+	u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx = 0;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	u16 seqno = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (vif) {</div><div class='add'>+		struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		tx_count = msta-&gt;rate_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc_type = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2;</div><div class='add'>+	fc_stype = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data(fc)) {</div><div class='add'>+		q_idx = skb_get_queue_mapping(skb);</div><div class='add'>+		p_fmt = MT_TX_TYPE_CT;</div><div class='add'>+	} else if (ieee80211_is_beacon(fc)) {</div><div class='add'>+		q_idx = MT_LMAC_BCN0;</div><div class='add'>+		p_fmt = MT_TX_TYPE_FW;</div><div class='add'>+	} else {</div><div class='add'>+		q_idx = MT_LMAC_ALTX0;</div><div class='add'>+		p_fmt = MT_TX_TYPE_CT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len + MT_TXD_SIZE) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_P_IDX, MT_TX_PORT_IDX_LMAC) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);</div><div class='add'>+	txwi[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = MT_TXD1_LONG_FORMAT |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_WLAN_IDX, wcid-&gt;idx) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_11) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_INFO,</div><div class='add'>+			 ieee80211_get_hdrlen_from_skb(skb) / 2) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_TID,</div><div class='add'>+			 skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_PKT_FMT, p_fmt) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx);</div><div class='add'>+	txwi[1] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_MULTICAST,</div><div class='add'>+			 is_multicast_ether_addr(hdr-&gt;addr1));</div><div class='add'>+	txwi[2] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU))</div><div class='add'>+		txwi[2] |= cpu_to_le32(MT_TXD2_BA_DISABLE);</div><div class='add'>+</div><div class='add'>+	txwi[4] = 0;</div><div class='add'>+	txwi[6] = 0;</div><div class='add'>+</div><div class='add'>+	if (rate-&gt;idx &gt;= 0 &amp;&amp; rate-&gt;count &amp;&amp;</div><div class='add'>+	    !(info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE)) {</div><div class='add'>+		bool stbc = info-&gt;flags &amp; IEEE80211_TX_CTL_STBC;</div><div class='add'>+		u8 bw;</div><div class='add'>+		u16 rateval = mt7615_mac_tx_rate_val(dev, rate, stbc, &amp;bw);</div><div class='add'>+</div><div class='add'>+		txwi[2] |= cpu_to_le32(MT_TXD2_FIX_RATE);</div><div class='add'>+</div><div class='add'>+		val = MT_TXD6_FIXED_BW |</div><div class='add'>+		      FIELD_PREP(MT_TXD6_BW, bw) |</div><div class='add'>+		      FIELD_PREP(MT_TXD6_TX_RATE, rateval);</div><div class='add'>+		txwi[6] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+			txwi[6] |= cpu_to_le32(MT_TXD6_SGI);</div><div class='add'>+</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_LDPC)</div><div class='add'>+			txwi[6] |= cpu_to_le32(MT_TXD6_LDPC);</div><div class='add'>+</div><div class='add'>+		if (!(rate-&gt;flags &amp; (IEEE80211_TX_RC_MCS |</div><div class='add'>+				     IEEE80211_TX_RC_VHT_MCS)))</div><div class='add'>+			txwi[2] |= cpu_to_le32(MT_TXD2_BA_DISABLE);</div><div class='add'>+</div><div class='add'>+		tx_count = rate-&gt;count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_beacon(fc)) {</div><div class='add'>+		val = MT_TXD5_TX_STATUS_HOST | MT_TXD5_SW_POWER_MGMT |</div><div class='add'>+		      FIELD_PREP(MT_TXD5_PID, pid);</div><div class='add'>+		txwi[5] = cpu_to_le32(val);</div><div class='add'>+	} else {</div><div class='add'>+		txwi[5] = 0;</div><div class='add'>+		/* use maximum tx count for beacons */</div><div class='add'>+		tx_count = 0x1f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count);</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='add'>+		seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='add'>+		val |= MT_TXD3_SN_VALID;</div><div class='add'>+	} else if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='add'>+		struct ieee80211_bar *bar = (struct ieee80211_bar *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(bar-&gt;start_seq_num));</div><div class='add'>+		val |= MT_TXD3_SN_VALID;</div><div class='add'>+	}</div><div class='add'>+	val |= FIELD_PREP(MT_TXD3_SEQ, seqno);</div><div class='add'>+</div><div class='add'>+	txwi[3] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_NO_ACK);</div><div class='add'>+</div><div class='add'>+	if (key)</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_PROTECT_FRAME);</div><div class='add'>+</div><div class='add'>+	txwi[7] = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='add'>+		  FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_txp_skb_unmap(struct mt76_dev *dev,</div><div class='add'>+			  struct mt76_txwi_cache *t)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_txp *txp;</div><div class='add'>+	u8 *txwi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='add'>+	txp = (struct mt7615_txp *)(txwi + MT_TXD_SIZE);</div><div class='add'>+	for (i = 1; i &lt; txp-&gt;nbuf; i++)</div><div class='add'>+		dma_unmap_single(dev-&gt;dev, le32_to_cpu(txp-&gt;buf[i]),</div><div class='add'>+				 le16_to_cpu(txp-&gt;len[i]), DMA_TO_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct mt76_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx_info-&gt;skb-&gt;data;</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+	struct mt7615_sta *msta = container_of(wcid, struct mt7615_sta, wcid);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	int i, pid, id, nbuf = tx_info-&gt;nbuf - 1;</div><div class='add'>+	u8 *txwi = (u8 *)txwi_ptr;</div><div class='add'>+	struct mt76_txwi_cache *t;</div><div class='add'>+	struct mt7615_txp *txp;</div><div class='add'>+</div><div class='add'>+	if (!wcid)</div><div class='add'>+		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE) {</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+		msta-&gt;rate_probe = true;</div><div class='add'>+		mt7615_mcu_set_rates(dev, msta, &amp;info-&gt;control.rates[0],</div><div class='add'>+				     msta-&gt;rates);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7615_mac_write_txwi(dev, txwi_ptr, tx_info-&gt;skb, wcid, sta,</div><div class='add'>+			      pid, key);</div><div class='add'>+</div><div class='add'>+	txp = (struct mt7615_txp *)(txwi + MT_TXD_SIZE);</div><div class='add'>+	for (i = 0; i &lt; nbuf; i++) {</div><div class='add'>+		txp-&gt;buf[i] = cpu_to_le32(tx_info-&gt;buf[i + 1].addr);</div><div class='add'>+		txp-&gt;len[i] = cpu_to_le16(tx_info-&gt;buf[i + 1].len);</div><div class='add'>+	}</div><div class='add'>+	txp-&gt;nbuf = nbuf;</div><div class='add'>+</div><div class='add'>+	/* pass partial skb header to fw */</div><div class='add'>+	tx_info-&gt;buf[1].len = MT_CT_PARSE_LEN;</div><div class='add'>+	tx_info-&gt;nbuf = MT_CT_DMA_BUF_NUM;</div><div class='add'>+</div><div class='add'>+	txp-&gt;flags = cpu_to_le16(MT_CT_INFO_APPLY_TXD);</div><div class='add'>+</div><div class='add'>+	if (!key)</div><div class='add'>+		txp-&gt;flags |= cpu_to_le16(MT_CT_INFO_NONE_CIPHER_FRAME);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_mgmt(hdr-&gt;frame_control))</div><div class='add'>+		txp-&gt;flags |= cpu_to_le16(MT_CT_INFO_MGMT_FRAME);</div><div class='add'>+</div><div class='add'>+	if (vif) {</div><div class='add'>+		struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		txp-&gt;bss_idx = mvif-&gt;idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	t = (struct mt76_txwi_cache *)(txwi + mdev-&gt;drv-&gt;txwi_size);</div><div class='add'>+	t-&gt;skb = tx_info-&gt;skb;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+	id = idr_alloc(&amp;dev-&gt;token, t, 0, MT7615_TOKEN_SIZE, GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='add'>+	txp-&gt;token = cpu_to_le16(id);</div><div class='add'>+	txp-&gt;rept_wds_wcid = 0xff;</div><div class='add'>+	tx_info-&gt;skb = DMA_DUMMY_DATA;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,</div><div class='add'>+			    struct ieee80211_tx_info *info, __le32 *txs_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	int i, idx, count, final_idx = 0;</div><div class='add'>+	bool fixed_rate, final_mpdu, ack_timeout;</div><div class='add'>+	bool probe, ampdu, cck = false;</div><div class='add'>+	u32 final_rate, final_rate_flags, final_nss, txs;</div><div class='add'>+	u8 pid;</div><div class='add'>+</div><div class='add'>+	fixed_rate = info-&gt;status.rates[0].count;</div><div class='add'>+	probe = !!(info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE);</div><div class='add'>+</div><div class='add'>+	txs = le32_to_cpu(txs_data[1]);</div><div class='add'>+	final_mpdu = txs &amp; MT_TXS1_ACKED_MPDU;</div><div class='add'>+	ampdu = !fixed_rate &amp;&amp; (txs &amp; MT_TXS1_AMPDU);</div><div class='add'>+</div><div class='add'>+	txs = le32_to_cpu(txs_data[3]);</div><div class='add'>+	count = FIELD_GET(MT_TXS3_TX_COUNT, txs);</div><div class='add'>+</div><div class='add'>+	txs = le32_to_cpu(txs_data[0]);</div><div class='add'>+	pid = FIELD_GET(MT_TXS0_PID, txs);</div><div class='add'>+	final_rate = FIELD_GET(MT_TXS0_TX_RATE, txs);</div><div class='add'>+	ack_timeout = txs &amp; MT_TXS0_ACK_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	if (!ampdu &amp;&amp; (txs &amp; MT_TXS0_RTS_TIMEOUT))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (txs &amp; MT_TXS0_QUEUE_TIMEOUT)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!ack_timeout)</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+	info-&gt;status.ampdu_len = 1;</div><div class='add'>+	info-&gt;status.ampdu_ack_len = !!(info-&gt;flags &amp;</div><div class='add'>+					IEEE80211_TX_STAT_ACK);</div><div class='add'>+</div><div class='add'>+	if (ampdu || (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU))</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_CTL_AMPDU;</div><div class='add'>+</div><div class='add'>+	if (fixed_rate &amp;&amp; !probe) {</div><div class='add'>+		info-&gt;status.rates[0].count = count;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, idx = 0; i &lt; ARRAY_SIZE(info-&gt;status.rates); i++) {</div><div class='add'>+		int cur_count = min_t(int, count, 2 * MT7615_RATE_RETRY);</div><div class='add'>+</div><div class='add'>+		if (!i &amp;&amp; probe) {</div><div class='add'>+			cur_count = 1;</div><div class='add'>+		} else {</div><div class='add'>+			info-&gt;status.rates[i] = sta-&gt;rates[idx];</div><div class='add'>+			idx++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i &amp;&amp; info-&gt;status.rates[i].idx &lt; 0) {</div><div class='add'>+			info-&gt;status.rates[i - 1].count += count;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!count) {</div><div class='add'>+			info-&gt;status.rates[i].idx = -1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;status.rates[i].count = cur_count;</div><div class='add'>+		final_idx = i;</div><div class='add'>+		count -= cur_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	final_rate_flags = info-&gt;status.rates[final_idx].flags;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(MT_TX_RATE_MODE, final_rate)) {</div><div class='add'>+	case MT_PHY_TYPE_CCK:</div><div class='add'>+		cck = true;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case MT_PHY_TYPE_OFDM:</div><div class='add'>+		if (dev-&gt;mt76.chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='add'>+			sband = &amp;dev-&gt;mt76.sband_5g.sband;</div><div class='add'>+		else</div><div class='add'>+			sband = &amp;dev-&gt;mt76.sband_2g.sband;</div><div class='add'>+		final_rate &amp;= MT_TX_RATE_IDX;</div><div class='add'>+		final_rate = mt7615_get_rate(dev, sband, final_rate, cck);</div><div class='add'>+		final_rate_flags = 0;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HT_GF:</div><div class='add'>+	case MT_PHY_TYPE_HT:</div><div class='add'>+		final_rate_flags |= IEEE80211_TX_RC_MCS;</div><div class='add'>+		final_rate &amp;= MT_TX_RATE_IDX;</div><div class='add'>+		if (final_rate &gt; 31)</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_VHT:</div><div class='add'>+		final_nss = FIELD_GET(MT_TX_RATE_NSS, final_rate);</div><div class='add'>+		final_rate_flags |= IEEE80211_TX_RC_VHT_MCS;</div><div class='add'>+		final_rate = (final_rate &amp; MT_TX_RATE_IDX) | (final_nss &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;status.rates[final_idx].idx = final_rate;</div><div class='add'>+	info-&gt;status.rates[final_idx].flags = final_rate_flags;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mt7615_mac_add_txs_skb(struct mt7615_dev *dev,</div><div class='add'>+				   struct mt7615_sta *sta, int pid,</div><div class='add'>+				   __le32 *txs_data)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (pid &lt; MT_PACKET_ID_FIRST)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_lock(mdev, &amp;list);</div><div class='add'>+	skb = mt76_tx_status_skb_get(mdev, &amp;sta-&gt;wcid, pid, &amp;list);</div><div class='add'>+	if (skb) {</div><div class='add'>+		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE) {</div><div class='add'>+			spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+			if (sta-&gt;rate_probe) {</div><div class='add'>+				mt7615_mcu_set_rates(dev, sta, NULL,</div><div class='add'>+						     sta-&gt;rates);</div><div class='add'>+				sta-&gt;rate_probe = false;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!mt7615_fill_txs(dev, sta, info, txs_data)) {</div><div class='add'>+			ieee80211_tx_info_clear_status(info);</div><div class='add'>+			info-&gt;status.rates[0].idx = -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mt76_tx_status_skb_done(mdev, skb, &amp;list);</div><div class='add'>+	}</div><div class='add'>+	mt76_tx_status_unlock(mdev, &amp;list);</div><div class='add'>+</div><div class='add'>+	return !!skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info info = {};</div><div class='add'>+	struct ieee80211_sta *sta = NULL;</div><div class='add'>+	struct mt7615_sta *msta = NULL;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	__le32 *txs_data = data;</div><div class='add'>+	u32 txs;</div><div class='add'>+	u8 wcidx;</div><div class='add'>+	u8 pid;</div><div class='add'>+</div><div class='add'>+	txs = le32_to_cpu(txs_data[0]);</div><div class='add'>+	pid = FIELD_GET(MT_TXS0_PID, txs);</div><div class='add'>+	txs = le32_to_cpu(txs_data[2]);</div><div class='add'>+	wcidx = FIELD_GET(MT_TXS2_WCID, txs);</div><div class='add'>+</div><div class='add'>+	if (pid == MT_PACKET_ID_NO_ACK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (wcidx &gt;= ARRAY_SIZE(dev-&gt;mt76.wcid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	wcid = rcu_dereference(dev-&gt;mt76.wcid[wcidx]);</div><div class='add'>+	if (!wcid)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	msta = container_of(wcid, struct mt7615_sta, wcid);</div><div class='add'>+	sta = wcid_to_sta(wcid);</div><div class='add'>+</div><div class='add'>+	if (mt7615_mac_add_txs_skb(dev, msta, pid, txs_data))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (wcidx &gt;= MT7615_WTBL_STA || !sta)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (mt7615_fill_txs(dev, msta, &amp;info, txs_data))</div><div class='add'>+		ieee80211_tx_status_noskb(mt76_hw(dev), sta, &amp;info);</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'>+void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_tx_free *free = (struct mt7615_tx_free *)skb-&gt;data;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_txwi_cache *txwi;</div><div class='add'>+	u8 i, count;</div><div class='add'>+</div><div class='add'>+	count = FIELD_GET(MT_TX_FREE_MSDU_ID_CNT, le16_to_cpu(free-&gt;ctrl));</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+		txwi = idr_remove(&amp;dev-&gt;token, le16_to_cpu(free-&gt;token[i]));</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+</div><div class='add'>+		if (!txwi)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mt7615_txp_skb_unmap(mdev, txwi);</div><div class='add'>+		if (txwi-&gt;skb) {</div><div class='add'>+			mt76_tx_complete_skb(mdev, txwi-&gt;skb);</div><div class='add'>+			txwi-&gt;skb = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mt76_put_txwi(mdev, txwi);</div><div class='add'>+	}</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_mac_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev;</div><div class='add'>+</div><div class='add'>+	dev = (struct mt7615_dev *)container_of(work, struct mt76_dev,</div><div class='add'>+						mac_work.work);</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, false);</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='add'>+				     MT7615_WATCHDOG_TIME);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h<br/>new file mode 100644<br/>index 000000000000..18ad4b8a3807<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/mac.h</a></div><div class='hunk'>@@ -0,0 +1,300 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7615_MAC_H</div><div class='add'>+#define __MT7615_MAC_H</div><div class='add'>+</div><div class='add'>+#define MT_CT_PARSE_LEN			72</div><div class='add'>+#define MT_CT_DMA_BUF_NUM		2</div><div class='add'>+</div><div class='add'>+#define MT_RXD0_LENGTH			GENMASK(15, 0)</div><div class='add'>+#define MT_RXD0_PKT_TYPE		GENMASK(31, 29)</div><div class='add'>+</div><div class='add'>+#define MT_RXD0_NORMAL_ETH_TYPE_OFS	GENMASK(22, 16)</div><div class='add'>+#define MT_RXD0_NORMAL_IP_SUM		BIT(23)</div><div class='add'>+#define MT_RXD0_NORMAL_UDP_TCP_SUM	BIT(24)</div><div class='add'>+#define MT_RXD0_NORMAL_GROUP_1		BIT(25)</div><div class='add'>+#define MT_RXD0_NORMAL_GROUP_2		BIT(26)</div><div class='add'>+#define MT_RXD0_NORMAL_GROUP_3		BIT(27)</div><div class='add'>+#define MT_RXD0_NORMAL_GROUP_4		BIT(28)</div><div class='add'>+</div><div class='add'>+enum rx_pkt_type {</div><div class='add'>+	PKT_TYPE_TXS,</div><div class='add'>+	PKT_TYPE_TXRXV,</div><div class='add'>+	PKT_TYPE_NORMAL,</div><div class='add'>+	PKT_TYPE_RX_DUP_RFB,</div><div class='add'>+	PKT_TYPE_RX_TMR,</div><div class='add'>+	PKT_TYPE_RETRIEVE,</div><div class='add'>+	PKT_TYPE_TXRX_NOTIFY,</div><div class='add'>+	PKT_TYPE_RX_EVENT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_RXD1_NORMAL_BSSID		GENMASK(31, 26)</div><div class='add'>+#define MT_RXD1_NORMAL_PAYLOAD_FORMAT	GENMASK(25, 24)</div><div class='add'>+#define MT_RXD1_NORMAL_HDR_TRANS	BIT(23)</div><div class='add'>+#define MT_RXD1_NORMAL_HDR_OFFSET	BIT(22)</div><div class='add'>+#define MT_RXD1_NORMAL_MAC_HDR_LEN	GENMASK(21, 16)</div><div class='add'>+#define MT_RXD1_NORMAL_CH_FREQ		GENMASK(15, 8)</div><div class='add'>+#define MT_RXD1_NORMAL_KEY_ID		GENMASK(7, 6)</div><div class='add'>+#define MT_RXD1_NORMAL_BEACON_UC	BIT(5)</div><div class='add'>+#define MT_RXD1_NORMAL_BEACON_MC	BIT(4)</div><div class='add'>+#define MT_RXD1_NORMAL_BF_REPORT	BIT(3)</div><div class='add'>+#define MT_RXD1_NORMAL_ADDR_TYPE	GENMASK(2, 1)</div><div class='add'>+#define MT_RXD1_NORMAL_BCAST		GENMASK(2, 1)</div><div class='add'>+#define MT_RXD1_NORMAL_MCAST		BIT(2)</div><div class='add'>+#define MT_RXD1_NORMAL_U2M		BIT(1)</div><div class='add'>+#define MT_RXD1_NORMAL_HTC_VLD		BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_RXD2_NORMAL_NON_AMPDU	BIT(31)</div><div class='add'>+#define MT_RXD2_NORMAL_NON_AMPDU_SUB	BIT(30)</div><div class='add'>+#define MT_RXD2_NORMAL_NDATA		BIT(29)</div><div class='add'>+#define MT_RXD2_NORMAL_NULL_FRAME	BIT(28)</div><div class='add'>+#define MT_RXD2_NORMAL_FRAG		BIT(27)</div><div class='add'>+#define MT_RXD2_NORMAL_INT_FRAME	BIT(26)</div><div class='add'>+#define MT_RXD2_NORMAL_HDR_TRANS_ERROR	BIT(25)</div><div class='add'>+#define MT_RXD2_NORMAL_MAX_LEN_ERROR	BIT(24)</div><div class='add'>+#define MT_RXD2_NORMAL_AMSDU_ERR	BIT(23)</div><div class='add'>+#define MT_RXD2_NORMAL_LEN_MISMATCH	BIT(22)</div><div class='add'>+#define MT_RXD2_NORMAL_TKIP_MIC_ERR	BIT(21)</div><div class='add'>+#define MT_RXD2_NORMAL_ICV_ERR		BIT(20)</div><div class='add'>+#define MT_RXD2_NORMAL_CLM		BIT(19)</div><div class='add'>+#define MT_RXD2_NORMAL_CM		BIT(18)</div><div class='add'>+#define MT_RXD2_NORMAL_FCS_ERR		BIT(17)</div><div class='add'>+#define MT_RXD2_NORMAL_SW_BIT		BIT(16)</div><div class='add'>+#define MT_RXD2_NORMAL_SEC_MODE		GENMASK(15, 12)</div><div class='add'>+#define MT_RXD2_NORMAL_TID		GENMASK(11, 8)</div><div class='add'>+#define MT_RXD2_NORMAL_WLAN_IDX		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_RXD3_NORMAL_PF_STS		GENMASK(31, 30)</div><div class='add'>+#define MT_RXD3_NORMAL_PF_MODE		BIT(29)</div><div class='add'>+#define MT_RXD3_NORMAL_CLS_BITMAP	GENMASK(28, 19)</div><div class='add'>+#define MT_RXD3_NORMAL_WOL		GENMASK(18, 14)</div><div class='add'>+#define MT_RXD3_NORMAL_MAGIC_PKT	BIT(13)</div><div class='add'>+#define MT_RXD3_NORMAL_OFLD		GENMASK(12, 11)</div><div class='add'>+#define MT_RXD3_NORMAL_CLS		BIT(10)</div><div class='add'>+#define MT_RXD3_NORMAL_PATTERN_DROP	BIT(9)</div><div class='add'>+#define MT_RXD3_NORMAL_TSF_COMPARE_LOSS	BIT(8)</div><div class='add'>+#define MT_RXD3_NORMAL_RXV_SEQ		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_RXV1_ACID_DET_H		BIT(31)</div><div class='add'>+#define MT_RXV1_ACID_DET_L		BIT(30)</div><div class='add'>+#define MT_RXV1_VHTA2_B8_B3		GENMASK(29, 24)</div><div class='add'>+#define MT_RXV1_NUM_RX			GENMASK(23, 22)</div><div class='add'>+#define MT_RXV1_HT_NO_SOUND		BIT(21)</div><div class='add'>+#define MT_RXV1_HT_SMOOTH		BIT(20)</div><div class='add'>+#define MT_RXV1_HT_SHORT_GI		BIT(19)</div><div class='add'>+#define MT_RXV1_HT_AGGR			BIT(18)</div><div class='add'>+#define MT_RXV1_VHTA1_B22		BIT(17)</div><div class='add'>+#define MT_RXV1_FRAME_MODE		GENMASK(16, 15)</div><div class='add'>+#define MT_RXV1_TX_MODE			GENMASK(14, 12)</div><div class='add'>+#define MT_RXV1_HT_EXT_LTF		GENMASK(11, 10)</div><div class='add'>+#define MT_RXV1_HT_AD_CODE		BIT(9)</div><div class='add'>+#define MT_RXV1_HT_STBC			GENMASK(8, 7)</div><div class='add'>+#define MT_RXV1_TX_RATE			GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+#define MT_RXV2_SEL_ANT			BIT(31)</div><div class='add'>+#define MT_RXV2_VALID_BIT		BIT(30)</div><div class='add'>+#define MT_RXV2_NSTS			GENMASK(29, 27)</div><div class='add'>+#define MT_RXV2_GROUP_ID		GENMASK(26, 21)</div><div class='add'>+#define MT_RXV2_LENGTH			GENMASK(20, 0)</div><div class='add'>+</div><div class='add'>+enum tx_header_format {</div><div class='add'>+	MT_HDR_FORMAT_802_3,</div><div class='add'>+	MT_HDR_FORMAT_CMD,</div><div class='add'>+	MT_HDR_FORMAT_802_11,</div><div class='add'>+	MT_HDR_FORMAT_802_11_EXT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_pkt_type {</div><div class='add'>+	MT_TX_TYPE_CT,</div><div class='add'>+	MT_TX_TYPE_SF,</div><div class='add'>+	MT_TX_TYPE_CMD,</div><div class='add'>+	MT_TX_TYPE_FW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_pkt_queue_idx {</div><div class='add'>+	MT_LMAC_AC00,</div><div class='add'>+	MT_LMAC_AC01,</div><div class='add'>+	MT_LMAC_AC02,</div><div class='add'>+	MT_LMAC_AC03,</div><div class='add'>+	MT_LMAC_ALTX0 = 0x10,</div><div class='add'>+	MT_LMAC_BMC0,</div><div class='add'>+	MT_LMAC_BCN0,</div><div class='add'>+	MT_LMAC_PSMP0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_port_idx {</div><div class='add'>+	MT_TX_PORT_IDX_LMAC,</div><div class='add'>+	MT_TX_PORT_IDX_MCU</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_mcu_port_q_idx {</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q0 = 0,</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q1,</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q2,</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q3,</div><div class='add'>+	MT_TX_MCU_PORT_RX_FWDL = 0x1e</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_phy_bandwidth {</div><div class='add'>+	MT_PHY_BW_20,</div><div class='add'>+	MT_PHY_BW_40,</div><div class='add'>+	MT_PHY_BW_80,</div><div class='add'>+	MT_PHY_BW_160,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_CT_INFO_APPLY_TXD		BIT(0)</div><div class='add'>+#define MT_CT_INFO_COPY_HOST_TXD_ALL	BIT(1)</div><div class='add'>+#define MT_CT_INFO_MGMT_FRAME		BIT(2)</div><div class='add'>+#define MT_CT_INFO_NONE_CIPHER_FRAME	BIT(3)</div><div class='add'>+#define MT_CT_INFO_HSR2_TX		BIT(4)</div><div class='add'>+</div><div class='add'>+#define MT_TXD_SIZE			(8 * 4)</div><div class='add'>+</div><div class='add'>+#define MT_TXD0_P_IDX			BIT(31)</div><div class='add'>+#define MT_TXD0_Q_IDX			GENMASK(30, 26)</div><div class='add'>+#define MT_TXD0_UDP_TCP_SUM		BIT(24)</div><div class='add'>+#define MT_TXD0_IP_SUM			BIT(23)</div><div class='add'>+#define MT_TXD0_ETH_TYPE_OFFSET		GENMASK(22, 16)</div><div class='add'>+#define MT_TXD0_TX_BYTES		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD1_OWN_MAC			GENMASK(31, 26)</div><div class='add'>+#define MT_TXD1_PKT_FMT			GENMASK(25, 24)</div><div class='add'>+#define MT_TXD1_TID			GENMASK(23, 21)</div><div class='add'>+#define MT_TXD1_AMSDU			BIT(20)</div><div class='add'>+#define MT_TXD1_UNXV			BIT(19)</div><div class='add'>+#define MT_TXD1_HDR_PAD			GENMASK(18, 17)</div><div class='add'>+#define MT_TXD1_TXD_LEN			BIT(16)</div><div class='add'>+#define MT_TXD1_LONG_FORMAT		BIT(15)</div><div class='add'>+#define MT_TXD1_HDR_FORMAT		GENMASK(14, 13)</div><div class='add'>+#define MT_TXD1_HDR_INFO		GENMASK(12, 8)</div><div class='add'>+#define MT_TXD1_WLAN_IDX		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD2_FIX_RATE		BIT(31)</div><div class='add'>+#define MT_TXD2_TIMING_MEASURE		BIT(30)</div><div class='add'>+#define MT_TXD2_BA_DISABLE		BIT(29)</div><div class='add'>+#define MT_TXD2_POWER_OFFSET		GENMASK(28, 24)</div><div class='add'>+#define MT_TXD2_MAX_TX_TIME		GENMASK(23, 16)</div><div class='add'>+#define MT_TXD2_FRAG			GENMASK(15, 14)</div><div class='add'>+#define MT_TXD2_HTC_VLD			BIT(13)</div><div class='add'>+#define MT_TXD2_DURATION		BIT(12)</div><div class='add'>+#define MT_TXD2_BIP			BIT(11)</div><div class='add'>+#define MT_TXD2_MULTICAST		BIT(10)</div><div class='add'>+#define MT_TXD2_RTS			BIT(9)</div><div class='add'>+#define MT_TXD2_SOUNDING		BIT(8)</div><div class='add'>+#define MT_TXD2_NDPA			BIT(7)</div><div class='add'>+#define MT_TXD2_NDP			BIT(6)</div><div class='add'>+#define MT_TXD2_FRAME_TYPE		GENMASK(5, 4)</div><div class='add'>+#define MT_TXD2_SUB_TYPE		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD3_SN_VALID		BIT(31)</div><div class='add'>+#define MT_TXD3_PN_VALID		BIT(30)</div><div class='add'>+#define MT_TXD3_SEQ			GENMASK(27, 16)</div><div class='add'>+#define MT_TXD3_REM_TX_COUNT		GENMASK(15, 11)</div><div class='add'>+#define MT_TXD3_TX_COUNT		GENMASK(10, 6)</div><div class='add'>+#define MT_TXD3_PROTECT_FRAME		BIT(1)</div><div class='add'>+#define MT_TXD3_NO_ACK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD4_PN_LOW			GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD5_PN_HIGH			GENMASK(31, 16)</div><div class='add'>+#define MT_TXD5_SW_POWER_MGMT		BIT(13)</div><div class='add'>+#define MT_TXD5_DA_SELECT		BIT(11)</div><div class='add'>+#define MT_TXD5_TX_STATUS_HOST		BIT(10)</div><div class='add'>+#define MT_TXD5_TX_STATUS_MCU		BIT(9)</div><div class='add'>+#define MT_TXD5_TX_STATUS_FMT		BIT(8)</div><div class='add'>+#define MT_TXD5_PID			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD6_FIXED_RATE		BIT(31)</div><div class='add'>+#define MT_TXD6_SGI			BIT(30)</div><div class='add'>+#define MT_TXD6_LDPC			BIT(29)</div><div class='add'>+#define MT_TXD6_TX_BF			BIT(28)</div><div class='add'>+#define MT_TXD6_TX_RATE			GENMASK(27, 16)</div><div class='add'>+#define MT_TXD6_ANT_ID			GENMASK(15, 4)</div><div class='add'>+#define MT_TXD6_DYN_BW			BIT(3)</div><div class='add'>+#define MT_TXD6_FIXED_BW		BIT(2)</div><div class='add'>+#define MT_TXD6_BW			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD7_TYPE			GENMASK(21, 20)</div><div class='add'>+#define MT_TXD7_SUB_TYPE		GENMASK(19, 16)</div><div class='add'>+</div><div class='add'>+#define MT_TX_RATE_STBC			BIT(11)</div><div class='add'>+#define MT_TX_RATE_NSS			GENMASK(10, 9)</div><div class='add'>+#define MT_TX_RATE_MODE			GENMASK(8, 6)</div><div class='add'>+#define MT_TX_RATE_IDX			GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXP_MAX_BUF_NUM		6</div><div class='add'>+</div><div class='add'>+struct mt7615_txp {</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 token;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 rept_wds_wcid;</div><div class='add'>+	u8 rsv;</div><div class='add'>+	u8 nbuf;</div><div class='add'>+	__le32 buf[MT_TXP_MAX_BUF_NUM];</div><div class='add'>+	__le16 len[MT_TXP_MAX_BUF_NUM];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7615_tx_free {</div><div class='add'>+	__le16 rx_byte_cnt;</div><div class='add'>+	__le16 ctrl;</div><div class='add'>+	u8 txd_cnt;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+	__le16 token[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MT_TX_FREE_MSDU_ID_CNT		GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_PID			GENMASK(31, 24)</div><div class='add'>+#define MT_TXS0_BA_ERROR		BIT(22)</div><div class='add'>+#define MT_TXS0_PS_FLAG			BIT(21)</div><div class='add'>+#define MT_TXS0_TXOP_TIMEOUT		BIT(20)</div><div class='add'>+#define MT_TXS0_BIP_ERROR		BIT(19)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_QUEUE_TIMEOUT		BIT(18)</div><div class='add'>+#define MT_TXS0_RTS_TIMEOUT		BIT(17)</div><div class='add'>+#define MT_TXS0_ACK_TIMEOUT		BIT(16)</div><div class='add'>+#define MT_TXS0_ACK_ERROR_MASK		GENMASK(18, 16)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_TX_STATUS_HOST		BIT(15)</div><div class='add'>+#define MT_TXS0_TX_STATUS_MCU		BIT(14)</div><div class='add'>+#define MT_TXS0_TXS_FORMAT		BIT(13)</div><div class='add'>+#define MT_TXS0_FIXED_RATE		BIT(12)</div><div class='add'>+#define MT_TXS0_TX_RATE			GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS1_ANT_ID			GENMASK(31, 20)</div><div class='add'>+#define MT_TXS1_RESP_RATE		GENMASK(19, 16)</div><div class='add'>+#define MT_TXS1_BW			GENMASK(15, 14)</div><div class='add'>+#define MT_TXS1_I_TXBF			BIT(13)</div><div class='add'>+#define MT_TXS1_E_TXBF			BIT(12)</div><div class='add'>+#define MT_TXS1_TID			GENMASK(11, 9)</div><div class='add'>+#define MT_TXS1_AMPDU			BIT(8)</div><div class='add'>+#define MT_TXS1_ACKED_MPDU		BIT(7)</div><div class='add'>+#define MT_TXS1_TX_POWER_DBM		GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS2_WCID			GENMASK(31, 24)</div><div class='add'>+#define MT_TXS2_RXV_SEQNO		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS2_TX_DELAY		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS3_LAST_TX_RATE		GENMASK(31, 29)</div><div class='add'>+#define MT_TXS3_TX_COUNT		GENMASK(28, 24)</div><div class='add'>+#define MT_TXS3_F1_TSSI1		GENMASK(23, 12)</div><div class='add'>+#define MT_TXS3_F1_TSSI0		GENMASK(11, 0)</div><div class='add'>+#define MT_TXS3_F0_SEQNO		GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS4_F0_TIMESTAMP		GENMASK(31, 0)</div><div class='add'>+#define MT_TXS4_F1_TSSI3		GENMASK(23, 12)</div><div class='add'>+#define MT_TXS4_F1_TSSI2		GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS5_F0_FRONT_TIME		GENMASK(24, 0)</div><div class='add'>+#define MT_TXS5_F1_NOISE_2		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS5_F1_NOISE_1		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS5_F1_NOISE_0		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS6_F1_RCPI_3		GENMASK(31, 24)</div><div class='add'>+#define MT_TXS6_F1_RCPI_2		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS6_F1_RCPI_1		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS6_F1_RCPI_0		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c<br/>new file mode 100644<br/>index 000000000000..80e6b211f60b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/main.c</a></div><div class='hunk'>@@ -0,0 +1,499 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='add'>+ *         Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *         Felix Fietkau &lt;nbd@nbd.name&gt;</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/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+</div><div class='add'>+static int mt7615_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='add'>+				     MT7615_WATCHDOG_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 mt7615_stop(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_omac_idx(enum nl80211_iftype type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		/* ap use hw bssid 0 and ext bssid */</div><div class='add'>+		if (~mask &amp; BIT(HW_BSSID_0))</div><div class='add'>+			return HW_BSSID_0;</div><div class='add'>+</div><div class='add'>+		for (i = EXT_BSSID_1; i &lt; EXT_BSSID_END; i++)</div><div class='add'>+			if (~mask &amp; BIT(i))</div><div class='add'>+				return i;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		/* sta use hw bssid other than 0 */</div><div class='add'>+		for (i = HW_BSSID_1; i &lt; HW_BSSID_MAX; i++)</div><div class='add'>+			if (~mask &amp; BIT(i))</div><div class='add'>+				return i;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</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'>+static int mt7615_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt76_txq *mtxq;</div><div class='add'>+	int idx, ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	mvif-&gt;idx = ffs(~dev-&gt;vif_mask) - 1;</div><div class='add'>+	if (mvif-&gt;idx &gt;= MT7615_MAX_INTERFACES) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvif-&gt;omac_idx = get_omac_idx(vif-&gt;type, dev-&gt;omac_mask);</div><div class='add'>+	if (mvif-&gt;omac_idx &lt; 0) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: DBDC support. Use band 0 and wmm 0 for now */</div><div class='add'>+	mvif-&gt;band_idx = 0;</div><div class='add'>+	mvif-&gt;wmm_idx = 0;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_set_dev_info(dev, vif, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vif_mask |= BIT(mvif-&gt;idx);</div><div class='add'>+	dev-&gt;omac_mask |= BIT(mvif-&gt;omac_idx);</div><div class='add'>+	idx = MT7615_WTBL_RESERVED - 1 - mvif-&gt;idx;</div><div class='add'>+	mvif-&gt;sta.wcid.idx = idx;</div><div class='add'>+	mvif-&gt;sta.wcid.hw_key_idx = -1;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.wcid);</div><div class='add'>+	mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='add'>+	mtxq-&gt;wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+	mt76_txq_init(&amp;dev-&gt;mt76, vif-&gt;txq);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.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 mt7615_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	int idx = mvif-&gt;sta.wcid.idx;</div><div class='add'>+</div><div class='add'>+	/* TODO: disable beacon for the bss */</div><div class='add'>+</div><div class='add'>+	mt7615_mcu_set_dev_info(dev, vif, 0);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], NULL);</div><div class='add'>+	mt76_txq_remove(&amp;dev-&gt;mt76, vif-&gt;txq);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	dev-&gt;vif_mask &amp;= ~BIT(mvif-&gt;idx);</div><div class='add'>+	dev-&gt;omac_mask &amp;= ~BIT(mvif-&gt;omac_idx);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_set_channel(struct mt7615_dev *dev,</div><div class='add'>+			      struct cfg80211_chan_def *def)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='add'>+	set_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='add'>+</div><div class='add'>+	mt76_set_channel(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_set_channel(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='add'>+				     MT7615_WATCHDOG_TIME);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			  struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_sta *msta = sta ? (struct mt7615_sta *)sta-&gt;drv_priv :</div><div class='add'>+				  &amp;mvif-&gt;sta;</div><div class='add'>+	struct mt76_wcid *wcid = &amp;msta-&gt;wcid;</div><div class='add'>+	int idx = key-&gt;keyidx;</div><div class='add'>+</div><div class='add'>+	/* The hardware does not support per-STA RX GTK, fallback</div><div class='add'>+	 * to software mode for these.</div><div class='add'>+	 */</div><div class='add'>+	if ((vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='add'>+	     vif-&gt;type == NL80211_IFTYPE_MESH_POINT) &amp;&amp;</div><div class='add'>+	    (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP) &amp;&amp;</div><div class='add'>+	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='add'>+		key-&gt;hw_key_idx = wcid-&gt;idx;</div><div class='add'>+		wcid-&gt;hw_key_idx = idx;</div><div class='add'>+	} else {</div><div class='add'>+		if (idx == wcid-&gt;hw_key_idx)</div><div class='add'>+			wcid-&gt;hw_key_idx = -1;</div><div class='add'>+</div><div class='add'>+		key = NULL;</div><div class='add'>+	}</div><div class='add'>+	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid, key);</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_set_wtbl_key(dev, wcid-&gt;idx, key, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+		ieee80211_stop_queues(hw);</div><div class='add'>+		ret = mt7615_set_channel(dev, &amp;hw-&gt;conf.chandef);</div><div class='add'>+		ieee80211_wake_queues(hw);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+		if (!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR))</div><div class='add'>+			dev-&gt;mt76.rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;mt76.rxfilter &amp;= ~MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+</div><div class='add'>+		mt76_wr(dev, MT_WF_RFCR, dev-&gt;mt76.rxfilter);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mt76.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'>+mt7615_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+	       const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	static const u8 wmm_queue_map[] = {</div><div class='add'>+		[IEEE80211_AC_BK] = 0,</div><div class='add'>+		[IEEE80211_AC_BE] = 1,</div><div class='add'>+		[IEEE80211_AC_VI] = 2,</div><div class='add'>+		[IEEE80211_AC_VO] = 3,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* TODO: hw wmm_set 1~3 */</div><div class='add'>+	return mt7615_mcu_set_wmm(dev, wmm_queue_map[queue], params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+				    unsigned int changed_flags,</div><div class='add'>+				    unsigned int *total_flags,</div><div class='add'>+				    u64 multicast)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+#define MT76_FILTER(_flag, _hw) do { \</div><div class='add'>+		flags |= *total_flags &amp; FIF_##_flag;			\</div><div class='add'>+		dev-&gt;mt76.rxfilter &amp;= ~(_hw);				\</div><div class='add'>+		dev-&gt;mt76.rxfilter |= !(flags &amp; FIF_##_flag) * (_hw);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.rxfilter &amp;= ~(MT_WF_RFCR_DROP_OTHER_BSS |</div><div class='add'>+				MT_WF_RFCR_DROP_OTHER_BEACON |</div><div class='add'>+				MT_WF_RFCR_DROP_FRAME_REPORT |</div><div class='add'>+				MT_WF_RFCR_DROP_PROBEREQ |</div><div class='add'>+				MT_WF_RFCR_DROP_MCAST_FILTERED |</div><div class='add'>+				MT_WF_RFCR_DROP_MCAST |</div><div class='add'>+				MT_WF_RFCR_DROP_BCAST |</div><div class='add'>+				MT_WF_RFCR_DROP_DUPLICATE |</div><div class='add'>+				MT_WF_RFCR_DROP_A2_BSSID |</div><div class='add'>+				MT_WF_RFCR_DROP_UNWANTED_CTL |</div><div class='add'>+				MT_WF_RFCR_DROP_STBC_MULTI);</div><div class='add'>+</div><div class='add'>+	MT76_FILTER(OTHER_BSS, MT_WF_RFCR_DROP_OTHER_TIM |</div><div class='add'>+			       MT_WF_RFCR_DROP_A3_MAC |</div><div class='add'>+			       MT_WF_RFCR_DROP_A3_BSSID);</div><div class='add'>+</div><div class='add'>+	MT76_FILTER(FCSFAIL, MT_WF_RFCR_DROP_FCSFAIL);</div><div class='add'>+</div><div class='add'>+	MT76_FILTER(CONTROL, MT_WF_RFCR_DROP_CTS |</div><div class='add'>+			     MT_WF_RFCR_DROP_RTS |</div><div class='add'>+			     MT_WF_RFCR_DROP_CTL_RSV |</div><div class='add'>+			     MT_WF_RFCR_DROP_NDPA);</div><div class='add'>+</div><div class='add'>+	*total_flags = flags;</div><div class='add'>+	mt76_wr(dev, MT_WF_RFCR, dev-&gt;mt76.rxfilter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_bss_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_bss_conf *info,</div><div class='add'>+				    u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	/* TODO: sta mode connect/disconnect</div><div class='add'>+	 * BSS_CHANGED_ASSOC | BSS_CHANGED_BSSID</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* TODO: update beacon content</div><div class='add'>+	 * BSS_CHANGED_BEACON</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='add'>+		if (info-&gt;enable_beacon) {</div><div class='add'>+			mt7615_mcu_set_bss_info(dev, vif, 1);</div><div class='add'>+			mt7615_mcu_add_wtbl_bmc(dev, vif);</div><div class='add'>+			mt7615_mcu_set_sta_rec_bmc(dev, vif, 1);</div><div class='add'>+			mt7615_mcu_set_bcn(dev, vif, 1);</div><div class='add'>+		} else {</div><div class='add'>+			mt7615_mcu_set_sta_rec_bmc(dev, vif, 0);</div><div class='add'>+			mt7615_mcu_del_wtbl_bmc(dev, vif);</div><div class='add'>+			mt7615_mcu_set_bss_info(dev, vif, 0);</div><div class='add'>+			mt7615_mcu_set_bcn(dev, vif, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7615_WTBL_STA - 1);</div><div class='add'>+	if (idx &lt; 0)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	msta-&gt;vif = mvif;</div><div class='add'>+	msta-&gt;wcid.sta = 1;</div><div class='add'>+	msta-&gt;wcid.idx = idx;</div><div class='add'>+</div><div class='add'>+	mt7615_mcu_add_wtbl(dev, vif, sta);</div><div class='add'>+	mt7615_mcu_set_sta_rec(dev, vif, sta, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		mt7615_mcu_set_ht_cap(dev, vif, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt7615_mcu_set_sta_rec(dev, vif, sta, 0);</div><div class='add'>+	mt7615_mcu_del_wtbl(dev, vif, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_sta_rate_tbl_update(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_sta_rates *sta_rates = rcu_dereference(sta-&gt;rates);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(msta-&gt;rates); i++) {</div><div class='add'>+		msta-&gt;rates[i].idx = sta_rates-&gt;rate[i].idx;</div><div class='add'>+		msta-&gt;rates[i].count = sta_rates-&gt;rate[i].count;</div><div class='add'>+		msta-&gt;rates[i].flags = sta_rates-&gt;rate[i].flags;</div><div class='add'>+</div><div class='add'>+		if (msta-&gt;rates[i].idx &lt; 0 || !msta-&gt;rates[i].count)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	msta-&gt;n_rates = i;</div><div class='add'>+	mt7615_mcu_set_rates(dev, msta, NULL, msta-&gt;rates);</div><div class='add'>+	msta-&gt;rate_probe = false;</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_tx(struct ieee80211_hw *hw,</div><div class='add'>+		      struct ieee80211_tx_control *control,</div><div class='add'>+		      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	struct mt76_wcid *wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+</div><div class='add'>+	if (control-&gt;sta) {</div><div class='add'>+		struct mt7615_sta *sta;</div><div class='add'>+</div><div class='add'>+		sta = (struct mt7615_sta *)control-&gt;sta-&gt;drv_priv;</div><div class='add'>+		wcid = &amp;sta-&gt;wcid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif &amp;&amp; !control-&gt;sta) {</div><div class='add'>+		struct mt7615_vif *mvif;</div><div class='add'>+</div><div class='add'>+		mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+		wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_tx(&amp;dev-&gt;mt76, control-&gt;sta, wcid, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_set_rts_threshold(struct ieee80211_hw *hw, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	mt7615_mcu_set_rts_thresh(dev, val);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.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</div><div class='add'>+mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		    struct ieee80211_ampdu_params *params)</div><div class='add'>+{</div><div class='add'>+	enum ieee80211_ampdu_mlme_action action = params-&gt;action;</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	struct ieee80211_txq *txq = sta-&gt;txq[params-&gt;tid];</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	u16 tid = params-&gt;tid;</div><div class='add'>+	u16 *ssn = &amp;params-&gt;ssn;</div><div class='add'>+	struct mt76_txq *mtxq;</div><div class='add'>+</div><div class='add'>+	if (!txq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mtxq = (struct mt76_txq *)txq-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+		mt76_rx_aggr_start(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid, tid, *ssn,</div><div class='add'>+				   params-&gt;buf_size);</div><div class='add'>+		mt7615_mcu_set_rx_ba(dev, params, 1);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		mt76_rx_aggr_stop(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid, tid);</div><div class='add'>+		mt7615_mcu_set_rx_ba(dev, params, 0);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='add'>+		mtxq-&gt;aggr = true;</div><div class='add'>+		mtxq-&gt;send_bar = false;</div><div class='add'>+		mt7615_mcu_set_tx_ba(dev, params, 1);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='add'>+		mtxq-&gt;aggr = false;</div><div class='add'>+		ieee80211_send_bar(vif, sta-&gt;addr, tid, mtxq-&gt;agg_ssn);</div><div class='add'>+		mt7615_mcu_set_tx_ba(dev, params, 0);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_START:</div><div class='add'>+		mtxq-&gt;agg_ssn = IEEE80211_SN_TO_SEQ(*ssn);</div><div class='add'>+		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='add'>+		mtxq-&gt;aggr = false;</div><div class='add'>+		mt7615_mcu_set_tx_ba(dev, params, 0);</div><div class='add'>+		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</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 void</div><div class='add'>+mt7615_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_SCANNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7615_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_SCANNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ieee80211_ops mt7615_ops = {</div><div class='add'>+	.tx = mt7615_tx,</div><div class='add'>+	.start = mt7615_start,</div><div class='add'>+	.stop = mt7615_stop,</div><div class='add'>+	.add_interface = mt7615_add_interface,</div><div class='add'>+	.remove_interface = mt7615_remove_interface,</div><div class='add'>+	.config = mt7615_config,</div><div class='add'>+	.conf_tx = mt7615_conf_tx,</div><div class='add'>+	.configure_filter = mt7615_configure_filter,</div><div class='add'>+	.bss_info_changed = mt7615_bss_info_changed,</div><div class='add'>+	.sta_state = mt76_sta_state,</div><div class='add'>+	.set_key = mt7615_set_key,</div><div class='add'>+	.ampdu_action = mt7615_ampdu_action,</div><div class='add'>+	.set_rts_threshold = mt7615_set_rts_threshold,</div><div class='add'>+	.wake_tx_queue = mt76_wake_tx_queue,</div><div class='add'>+	.sta_rate_tbl_update = mt7615_sta_rate_tbl_update,</div><div class='add'>+	.sw_scan_start = mt7615_sw_scan,</div><div class='add'>+	.sw_scan_complete = mt7615_sw_scan_complete,</div><div class='add'>+	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c<br/>new file mode 100644<br/>index 000000000000..ea67c6022fe6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.c</a></div><div class='hunk'>@@ -0,0 +1,1655 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='add'>+ *         Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "eeprom.h"</div><div class='add'>+</div><div class='add'>+struct mt7615_patch_hdr {</div><div class='add'>+	char build_date[16];</div><div class='add'>+	char platform[4];</div><div class='add'>+	__be32 hw_sw_ver;</div><div class='add'>+	__be32 patch_ver;</div><div class='add'>+	__be16 checksum;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7615_fw_trailer {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	u8 chip_id;</div><div class='add'>+	u8 feature_set;</div><div class='add'>+	u8 eco_code;</div><div class='add'>+	char fw_ver[10];</div><div class='add'>+	char build_date[15];</div><div class='add'>+	__le32 len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MCU_PATCH_ADDRESS		0x80000</div><div class='add'>+</div><div class='add'>+#define N9_REGION_NUM			2</div><div class='add'>+#define CR4_REGION_NUM			1</div><div class='add'>+</div><div class='add'>+#define IMG_CRC_LEN			4</div><div class='add'>+</div><div class='add'>+#define FW_FEATURE_SET_ENCRYPT		BIT(0)</div><div class='add'>+#define FW_FEATURE_SET_KEY_IDX		GENMASK(2, 1)</div><div class='add'>+</div><div class='add'>+#define DL_MODE_ENCRYPT			BIT(0)</div><div class='add'>+#define DL_MODE_KEY_IDX			GENMASK(2, 1)</div><div class='add'>+#define DL_MODE_RESET_SEC_IV		BIT(3)</div><div class='add'>+#define DL_MODE_WORKING_PDA_CR4		BIT(4)</div><div class='add'>+#define DL_MODE_NEED_RSP		BIT(31)</div><div class='add'>+</div><div class='add'>+#define FW_START_OVERRIDE		BIT(0)</div><div class='add'>+#define FW_START_WORKING_PDA_CR4	BIT(2)</div><div class='add'>+</div><div class='add'>+static int __mt7615_mcu_msg_send(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='add'>+				 int cmd, int query, int dest, int *wait_seq)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_mcu_txd *mcu_txd;</div><div class='add'>+	u8 seq, q_idx, pkt_fmt;</div><div class='add'>+	enum mt76_txq_id qid;</div><div class='add'>+	u32 val;</div><div class='add'>+	__le32 *txd;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	seq = ++dev-&gt;mt76.mmio.mcu.msg_seq &amp; 0xf;</div><div class='add'>+	if (!seq)</div><div class='add'>+		seq = ++dev-&gt;mt76.mmio.mcu.msg_seq &amp; 0xf;</div><div class='add'>+</div><div class='add'>+	mcu_txd = (struct mt7615_mcu_txd *)skb_push(skb,</div><div class='add'>+		   sizeof(struct mt7615_mcu_txd));</div><div class='add'>+	memset(mcu_txd, 0, sizeof(struct mt7615_mcu_txd));</div><div class='add'>+</div><div class='add'>+	if (cmd != -MCU_CMD_FW_SCATTER) {</div><div class='add'>+		q_idx = MT_TX_MCU_PORT_RX_Q0;</div><div class='add'>+		pkt_fmt = MT_TX_TYPE_CMD;</div><div class='add'>+	} else {</div><div class='add'>+		q_idx = MT_TX_MCU_PORT_RX_FWDL;</div><div class='add'>+		pkt_fmt = MT_TX_TYPE_FW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txd = mcu_txd-&gt;txd;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, cpu_to_le16(skb-&gt;len)) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_P_IDX, MT_TX_PORT_IDX_MCU) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);</div><div class='add'>+	txd[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = MT_TXD1_LONG_FORMAT |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_CMD) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_PKT_FMT, pkt_fmt);</div><div class='add'>+	txd[1] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	mcu_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(mcu_txd-&gt;txd));</div><div class='add'>+	mcu_txd-&gt;pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU, q_idx));</div><div class='add'>+	mcu_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='add'>+	mcu_txd-&gt;seq = seq;</div><div class='add'>+</div><div class='add'>+	if (cmd &lt; 0) {</div><div class='add'>+		mcu_txd-&gt;cid = -cmd;</div><div class='add'>+	} else {</div><div class='add'>+		mcu_txd-&gt;cid = MCU_CMD_EXT_CID;</div><div class='add'>+		mcu_txd-&gt;ext_cid = cmd;</div><div class='add'>+		if (query != MCU_Q_NA)</div><div class='add'>+			mcu_txd-&gt;ext_cid_ack = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcu_txd-&gt;set_query = query;</div><div class='add'>+	mcu_txd-&gt;s2d_index = dest;</div><div class='add'>+</div><div class='add'>+	if (wait_seq)</div><div class='add'>+		*wait_seq = seq;</div><div class='add'>+</div><div class='add'>+	if (test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mt76.state))</div><div class='add'>+		qid = MT_TXQ_MCU;</div><div class='add'>+	else</div><div class='add'>+		qid = MT_TXQ_FWDL;</div><div class='add'>+</div><div class='add'>+	return mt76_tx_queue_skb_raw(dev, qid, skb, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_mcu_msg_send(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='add'>+			       int cmd, int query, int dest,</div><div class='add'>+			       struct sk_buff **skb_ret)</div><div class='add'>+{</div><div class='add'>+	unsigned long expires = jiffies + 10 * HZ;</div><div class='add'>+	struct mt7615_mcu_rxd *rxd;</div><div class='add'>+	int ret, seq;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mmio.mcu.mutex);</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_msg_send(dev, skb, cmd, query, dest, &amp;seq);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		skb = mt76_mcu_get_response(&amp;dev-&gt;mt76, expires);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "Message %d (seq %d) timeout\n",</div><div class='add'>+				cmd, seq);</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rxd = (struct mt7615_mcu_rxd *)skb-&gt;data;</div><div class='add'>+		if (seq != rxd-&gt;seq)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (skb_ret) {</div><div class='add'>+			int hdr_len = sizeof(*rxd);</div><div class='add'>+</div><div class='add'>+			if (!test_bit(MT76_STATE_MCU_RUNNING,</div><div class='add'>+				      &amp;dev-&gt;mt76.state))</div><div class='add'>+				hdr_len -= 4;</div><div class='add'>+			skb_pull(skb, hdr_len);</div><div class='add'>+			*skb_ret = skb;</div><div class='add'>+		} else {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mmio.mcu.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 mt7615_mcu_init_download(struct mt7615_dev *dev, u32 addr,</div><div class='add'>+				    u32 len, u32 mode)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 addr;</div><div class='add'>+		__le32 len;</div><div class='add'>+		__le32 mode;</div><div class='add'>+	} req = {</div><div class='add'>+		.addr = cpu_to_le32(addr),</div><div class='add'>+		.len = cpu_to_le32(len),</div><div class='add'>+		.mode = cpu_to_le32(mode),</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, -MCU_CMD_TARGET_ADDRESS_LEN_REQ,</div><div class='add'>+				   MCU_Q_NA, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_mcu_send_firmware(struct mt7615_dev *dev, const void *data,</div><div class='add'>+				    int len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		int cur_len = min_t(int, 4096 - sizeof(struct mt7615_mcu_txd),</div><div class='add'>+				    len);</div><div class='add'>+</div><div class='add'>+		skb = mt7615_mcu_msg_alloc(data, cur_len);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		ret = __mt7615_mcu_msg_send(dev, skb, -MCU_CMD_FW_SCATTER,</div><div class='add'>+					    MCU_Q_NA, MCU_S2D_H2N, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		data += cur_len;</div><div class='add'>+		len -= cur_len;</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 mt7615_mcu_start_firmware(struct mt7615_dev *dev, u32 addr,</div><div class='add'>+				     u32 option)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 option;</div><div class='add'>+		__le32 addr;</div><div class='add'>+	} req = {</div><div class='add'>+		.option = cpu_to_le32(option),</div><div class='add'>+		.addr = cpu_to_le32(addr),</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, -MCU_CMD_FW_START_REQ,</div><div class='add'>+				   MCU_Q_NA, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_mcu_restart(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(NULL, 0);</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, -MCU_CMD_RESTART_DL_REQ,</div><div class='add'>+				   MCU_Q_NA, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_mcu_patch_sem_ctrl(struct mt7615_dev *dev, bool get)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 operation;</div><div class='add'>+	} req = {</div><div class='add'>+		.operation = cpu_to_le32(get ? PATCH_SEM_GET :</div><div class='add'>+					 PATCH_SEM_RELEASE),</div><div class='add'>+	};</div><div class='add'>+	struct event {</div><div class='add'>+		u8 status;</div><div class='add'>+		u8 reserved[3];</div><div class='add'>+	} *resp;</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+	struct sk_buff *skb_ret;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_msg_send(dev, skb, -MCU_CMD_PATCH_SEM_CONTROL,</div><div class='add'>+				  MCU_Q_NA, MCU_S2D_H2N, &amp;skb_ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	resp = (struct event *)(skb_ret-&gt;data);</div><div class='add'>+	ret = resp-&gt;status;</div><div class='add'>+	dev_kfree_skb(skb_ret);</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'>+static int mt7615_mcu_start_patch(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 check_crc;</div><div class='add'>+		u8 reserved[3];</div><div class='add'>+	} req = {</div><div class='add'>+		.check_crc = 0,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, -MCU_CMD_PATCH_FINISH_REQ,</div><div class='add'>+				   MCU_Q_NA, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_driver_own(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt76_wr(dev, MT_CFG_LPCR_HOST, MT_CFG_LPCR_HOST_DRV_OWN);</div><div class='add'>+	if (!mt76_poll_msec(dev, MT_CFG_LPCR_HOST,</div><div class='add'>+			    MT_CFG_LPCR_HOST_FW_OWN, 0, 500)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Timeout for driver own\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 mt7615_load_patch(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const struct mt7615_patch_hdr *hdr;</div><div class='add'>+	const char *firmware = MT7615_ROM_PATCH;</div><div class='add'>+	int len, ret, sem;</div><div class='add'>+</div><div class='add'>+	sem = mt7615_mcu_patch_sem_ctrl(dev, 1);</div><div class='add'>+	switch (sem) {</div><div class='add'>+	case PATCH_IS_DL:</div><div class='add'>+		return 0;</div><div class='add'>+	case PATCH_NOT_DL_SEM_SUCCESS:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Failed to get patch semaphore\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, firmware, dev-&gt;mt76.dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Invalid firmware\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'>+	hdr = (const struct mt7615_patch_hdr *)(fw-&gt;data);</div><div class='add'>+</div><div class='add'>+	dev_info(dev-&gt;mt76.dev, "HW/SW Version: 0x%x, Build Time: %.16s\n",</div><div class='add'>+		 be32_to_cpu(hdr-&gt;hw_sw_ver), hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+	len = fw-&gt;size - sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_init_download(dev, MCU_PATCH_ADDRESS, len,</div><div class='add'>+				       DL_MODE_NEED_RSP);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_send_firmware(dev, fw-&gt;data + sizeof(*hdr), len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Failed to send firmware to device\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_start_patch(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Failed to start patch\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	sem = mt7615_mcu_patch_sem_ctrl(dev, 0);</div><div class='add'>+	switch (sem) {</div><div class='add'>+	case PATCH_REL_SEM_SUCCESS:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Failed to release patch semaphore\n");</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 u32 gen_dl_mode(u8 feature_set, bool is_cr4)</div><div class='add'>+{</div><div class='add'>+	u32 ret = 0;</div><div class='add'>+</div><div class='add'>+	ret |= (feature_set &amp; FW_FEATURE_SET_ENCRYPT) ?</div><div class='add'>+	       (DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV) : 0;</div><div class='add'>+	ret |= FIELD_PREP(DL_MODE_KEY_IDX,</div><div class='add'>+			  FIELD_GET(FW_FEATURE_SET_KEY_IDX, feature_set));</div><div class='add'>+	ret |= DL_MODE_NEED_RSP;</div><div class='add'>+	ret |= is_cr4 ? DL_MODE_WORKING_PDA_CR4 : 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 mt7615_load_ram(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const struct mt7615_fw_trailer *hdr;</div><div class='add'>+	const char *n9_firmware = MT7615_FIRMWARE_N9;</div><div class='add'>+	const char *cr4_firmware = MT7615_FIRMWARE_CR4;</div><div class='add'>+	u32 n9_ilm_addr, offset;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, n9_firmware, dev-&gt;mt76.dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; N9_REGION_NUM * sizeof(*hdr)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Invalid firmware\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'>+	hdr = (const struct mt7615_fw_trailer *)(fw-&gt;data + fw-&gt;size -</div><div class='add'>+					N9_REGION_NUM * sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	dev_info(dev-&gt;mt76.dev, "N9 Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='add'>+		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+	n9_ilm_addr = le32_to_cpu(hdr-&gt;addr);</div><div class='add'>+</div><div class='add'>+	for (offset = 0, i = 0; i &lt; N9_REGION_NUM; i++) {</div><div class='add'>+		u32 len, addr, mode;</div><div class='add'>+</div><div class='add'>+		len = le32_to_cpu(hdr[i].len) + IMG_CRC_LEN;</div><div class='add'>+		addr = le32_to_cpu(hdr[i].addr);</div><div class='add'>+		mode = gen_dl_mode(hdr[i].feature_set, false);</div><div class='add'>+</div><div class='add'>+		ret = mt7615_mcu_init_download(dev, addr, len, mode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mt7615_mcu_send_firmware(dev, fw-&gt;data + offset, len);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "Failed to send firmware to device\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		offset += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_start_firmware(dev, n9_ilm_addr, FW_START_OVERRIDE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Failed to start N9 firmware\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, cr4_firmware, dev-&gt;mt76.dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; CR4_REGION_NUM * sizeof(*hdr)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Invalid firmware\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'>+	hdr = (const struct mt7615_fw_trailer *)(fw-&gt;data + fw-&gt;size -</div><div class='add'>+					CR4_REGION_NUM * sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	dev_info(dev-&gt;mt76.dev, "CR4 Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='add'>+		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+	for (offset = 0, i = 0; i &lt; CR4_REGION_NUM; i++) {</div><div class='add'>+		u32 len, addr, mode;</div><div class='add'>+</div><div class='add'>+		len = le32_to_cpu(hdr[i].len) + IMG_CRC_LEN;</div><div class='add'>+		addr = le32_to_cpu(hdr[i].addr);</div><div class='add'>+		mode = gen_dl_mode(hdr[i].feature_set, true);</div><div class='add'>+</div><div class='add'>+		ret = mt7615_mcu_init_download(dev, addr, len, mode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mt7615_mcu_send_firmware(dev, fw-&gt;data + offset, len);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "Failed to send firmware to device\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		offset += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7615_mcu_start_firmware(dev, 0, FW_START_WORKING_PDA_CR4);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Failed to start CR4 firmware\n");</div><div class='add'>+</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 mt7615_load_firmware(struct mt7615_dev *dev)</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 = mt76_get_field(dev, MT_TOP_MISC2, MT_TOP_MISC2_FW_STATE);</div><div class='add'>+</div><div class='add'>+	if (val != FW_STATE_FW_DOWNLOAD) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Firmware is not ready for download\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7615_load_patch(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_load_ram(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!mt76_poll_msec(dev, MT_TOP_MISC2, MT_TOP_MISC2_FW_STATE,</div><div class='add'>+			    FIELD_PREP(MT_TOP_MISC2_FW_STATE,</div><div class='add'>+				       FW_STATE_CR4_RDY), 500)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Timeout for initializing firmware\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;mt76.dev, "Firmware init done\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_driver_own(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_load_firmware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_mcu_exit(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt7615_mcu_restart(dev);</div><div class='add'>+	mt76_wr(dev, MT_CFG_LPCR_HOST, MT_CFG_LPCR_HOST_FW_OWN);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mmio.mcu.res_q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_eeprom(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct req_data {</div><div class='add'>+		u8 val;</div><div class='add'>+	} __packed;</div><div class='add'>+	struct {</div><div class='add'>+		u8 buffer_mode;</div><div class='add'>+		u8 pad;</div><div class='add'>+		u16 len;</div><div class='add'>+	} __packed req_hdr = {</div><div class='add'>+		.buffer_mode = 1,</div><div class='add'>+		.len = __MT_EE_MAX - MT_EE_NIC_CONF_0,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct req_data *data;</div><div class='add'>+	const int size = (__MT_EE_MAX - MT_EE_NIC_CONF_0) *</div><div class='add'>+			 sizeof(struct req_data);</div><div class='add'>+	u8 *eep = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u16 off;</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(NULL, size + sizeof(req_hdr));</div><div class='add'>+	memcpy(skb_put(skb, sizeof(req_hdr)), &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+	data = (struct req_data *)skb_put(skb, size);</div><div class='add'>+	memset(data, 0, size);</div><div class='add'>+</div><div class='add'>+	for (off = MT_EE_NIC_CONF_0; off &lt; __MT_EE_MAX; off++)</div><div class='add'>+		data[off - MT_EE_NIC_CONF_0].val = eep[off];</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_EFUSE_BUFFER_MODE,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_init_mac(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 enable;</div><div class='add'>+		u8 band;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.enable = 1,</div><div class='add'>+		.band = 0,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_MAC_INIT_CTRL,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_rts_thresh(struct mt7615_dev *dev, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 prot_idx;</div><div class='add'>+		u8 band;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+		__le32 len_thresh;</div><div class='add'>+		__le32 pkt_thresh;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.prot_idx = 1,</div><div class='add'>+		.band = 0,</div><div class='add'>+		.len_thresh = cpu_to_le32(val),</div><div class='add'>+		.pkt_thresh = cpu_to_le32(0x2),</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_PROTECT_CTRL,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,</div><div class='add'>+		       const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+#define WMM_AIFS_SET	BIT(0)</div><div class='add'>+#define WMM_CW_MIN_SET	BIT(1)</div><div class='add'>+#define WMM_CW_MAX_SET	BIT(2)</div><div class='add'>+#define WMM_TXOP_SET	BIT(3)</div><div class='add'>+	struct req_data {</div><div class='add'>+		u8 number;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+		u8 queue;</div><div class='add'>+		u8 valid;</div><div class='add'>+		u8 aifs;</div><div class='add'>+		u8 cw_min;</div><div class='add'>+		__le16 cw_max;</div><div class='add'>+		__le16 txop;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.number = 1,</div><div class='add'>+		.queue = queue,</div><div class='add'>+		.valid = WMM_AIFS_SET | WMM_TXOP_SET,</div><div class='add'>+		.aifs = params-&gt;aifs,</div><div class='add'>+		.txop = cpu_to_le16(params-&gt;txop),</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;cw_min) {</div><div class='add'>+		req.valid |= WMM_CW_MIN_SET;</div><div class='add'>+		req.cw_min = params-&gt;cw_min;</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;cw_max) {</div><div class='add'>+		req.valid |= WMM_CW_MAX_SET;</div><div class='add'>+		req.cw_max = cpu_to_le16(params-&gt;cw_max);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_EDCA_UPDATE,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_ctrl_pm_state(struct mt7615_dev *dev, int enter)</div><div class='add'>+{</div><div class='add'>+#define ENTER_PM_STATE	1</div><div class='add'>+#define EXIT_PM_STATE	2</div><div class='add'>+	struct {</div><div class='add'>+		u8 pm_number;</div><div class='add'>+		u8 pm_state;</div><div class='add'>+		u8 bssid[ETH_ALEN];</div><div class='add'>+		u8 dtim_period;</div><div class='add'>+		u8 wlan_idx;</div><div class='add'>+		__le16 bcn_interval;</div><div class='add'>+		__le32 aid;</div><div class='add'>+		__le32 rx_filter;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+		__le32 feature;</div><div class='add'>+		u8 omac_idx;</div><div class='add'>+		u8 wmm_idx;</div><div class='add'>+		u8 bcn_loss_cnt;</div><div class='add'>+		u8 bcn_sp_duration;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.pm_number = 5,</div><div class='add'>+		.pm_state = (enter) ? ENTER_PM_STATE : EXIT_PM_STATE,</div><div class='add'>+		.band_idx = 0,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_PM_STATE_CTRL,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mt7615_mcu_set_dev_info(struct mt7615_dev *dev,</div><div class='add'>+				     struct dev_info *dev_info)</div><div class='add'>+{</div><div class='add'>+	struct req_hdr {</div><div class='add'>+		u8 omac_idx;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		__le16 tlv_num;</div><div class='add'>+		u8 is_tlv_append;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+	} __packed req_hdr = {0};</div><div class='add'>+	struct req_tlv {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 active;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 omac_addr[ETH_ALEN];</div><div class='add'>+	} __packed;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 tlv_num = 0;</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(NULL, sizeof(req_hdr) +</div><div class='add'>+				   sizeof(struct req_tlv));</div><div class='add'>+	skb_reserve(skb, sizeof(req_hdr));</div><div class='add'>+</div><div class='add'>+	if (dev_info-&gt;feature &amp; BIT(DEV_INFO_ACTIVE)) {</div><div class='add'>+		struct req_tlv req_tlv = {</div><div class='add'>+			.tag = cpu_to_le16(DEV_INFO_ACTIVE),</div><div class='add'>+			.len = cpu_to_le16(sizeof(req_tlv)),</div><div class='add'>+			.active = dev_info-&gt;enable,</div><div class='add'>+			.band_idx = dev_info-&gt;band_idx,</div><div class='add'>+		};</div><div class='add'>+		memcpy(req_tlv.omac_addr, dev_info-&gt;omac_addr, ETH_ALEN);</div><div class='add'>+		memcpy(skb_put(skb, sizeof(req_tlv)), &amp;req_tlv,</div><div class='add'>+		       sizeof(req_tlv));</div><div class='add'>+		tlv_num++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_hdr.omac_idx = dev_info-&gt;omac_idx;</div><div class='add'>+	req_hdr.band_idx = dev_info-&gt;band_idx;</div><div class='add'>+	req_hdr.tlv_num = cpu_to_le16(tlv_num);</div><div class='add'>+	req_hdr.is_tlv_append = tlv_num ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	memcpy(skb_push(skb, sizeof(req_hdr)), &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_DEV_INFO_UPDATE,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_dev_info(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    int en)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct dev_info dev_info = {0};</div><div class='add'>+</div><div class='add'>+	dev_info.omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	memcpy(dev_info.omac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	dev_info.band_idx = mvif-&gt;band_idx;</div><div class='add'>+	dev_info.enable = en;</div><div class='add'>+	dev_info.feature = BIT(DEV_INFO_ACTIVE);</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_dev_info(dev, &amp;dev_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bss_info_omac_handler (struct mt7615_dev *dev,</div><div class='add'>+				   struct bss_info *bss_info,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bss_info_omac tlv = {0};</div><div class='add'>+</div><div class='add'>+	tlv.tag = cpu_to_le16(BSS_INFO_OMAC);</div><div class='add'>+	tlv.len = cpu_to_le16(sizeof(tlv));</div><div class='add'>+	tlv.hw_bss_idx = (bss_info-&gt;omac_idx &gt; EXT_BSSID_START) ?</div><div class='add'>+			 HW_BSSID_0 : bss_info-&gt;omac_idx;</div><div class='add'>+	tlv.omac_idx = bss_info-&gt;omac_idx;</div><div class='add'>+	tlv.band_idx = bss_info-&gt;band_idx;</div><div class='add'>+	tlv.conn_type = cpu_to_le32(bss_info-&gt;conn_type);</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(tlv)), &amp;tlv, sizeof(tlv));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bss_info_basic_handler (struct mt7615_dev *dev,</div><div class='add'>+				    struct bss_info *bss_info,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bss_info_basic tlv = {0};</div><div class='add'>+</div><div class='add'>+	tlv.tag = cpu_to_le16(BSS_INFO_BASIC);</div><div class='add'>+	tlv.len = cpu_to_le16(sizeof(tlv));</div><div class='add'>+	tlv.network_type = cpu_to_le32(bss_info-&gt;network_type);</div><div class='add'>+	tlv.active = bss_info-&gt;enable;</div><div class='add'>+	tlv.bcn_interval = cpu_to_le16(bss_info-&gt;bcn_interval);</div><div class='add'>+	memcpy(tlv.bssid, bss_info-&gt;bssid, ETH_ALEN);</div><div class='add'>+	tlv.wmm_idx = bss_info-&gt;wmm_idx;</div><div class='add'>+	tlv.dtim_period = bss_info-&gt;dtim_period;</div><div class='add'>+	tlv.bmc_tx_wlan_idx = bss_info-&gt;bmc_tx_wlan_idx;</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(tlv)), &amp;tlv, sizeof(tlv));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bss_info_ext_bss_handler (struct mt7615_dev *dev,</div><div class='add'>+				      struct bss_info *bss_info,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+/* SIFS 20us + 512 byte beacon tranmitted by 1Mbps (3906us) */</div><div class='add'>+#define BCN_TX_ESTIMATE_TIME (4096 + 20)</div><div class='add'>+	struct bss_info_ext_bss tlv = {0};</div><div class='add'>+	int ext_bss_idx;</div><div class='add'>+</div><div class='add'>+	ext_bss_idx = bss_info-&gt;omac_idx - EXT_BSSID_START;</div><div class='add'>+</div><div class='add'>+	if (ext_bss_idx &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv.tag = cpu_to_le16(BSS_INFO_EXT_BSS);</div><div class='add'>+	tlv.len = cpu_to_le16(sizeof(tlv));</div><div class='add'>+	tlv.mbss_tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(tlv)), &amp;tlv, sizeof(tlv));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bss_info_tag_handler bss_info_tag_handler[] = {</div><div class='add'>+	{BSS_INFO_OMAC, sizeof(struct bss_info_omac), bss_info_omac_handler},</div><div class='add'>+	{BSS_INFO_BASIC, sizeof(struct bss_info_basic), bss_info_basic_handler},</div><div class='add'>+	{BSS_INFO_RF_CH, sizeof(struct bss_info_rf_ch), NULL},</div><div class='add'>+	{BSS_INFO_PM, 0, NULL},</div><div class='add'>+	{BSS_INFO_UAPSD, 0, NULL},</div><div class='add'>+	{BSS_INFO_ROAM_DETECTION, 0, NULL},</div><div class='add'>+	{BSS_INFO_LQ_RM, 0, NULL},</div><div class='add'>+	{BSS_INFO_EXT_BSS, sizeof(struct bss_info_ext_bss), bss_info_ext_bss_handler},</div><div class='add'>+	{BSS_INFO_BMC_INFO, 0, NULL},</div><div class='add'>+	{BSS_INFO_SYNC_MODE, 0, NULL},</div><div class='add'>+	{BSS_INFO_RA, 0, NULL},</div><div class='add'>+	{BSS_INFO_MAX_NUM, 0, NULL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __mt7615_mcu_set_bss_info(struct mt7615_dev *dev,</div><div class='add'>+				     struct bss_info *bss_info)</div><div class='add'>+{</div><div class='add'>+	struct req_hdr {</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 rsv0;</div><div class='add'>+		__le16 tlv_num;</div><div class='add'>+		u8 is_tlv_append;</div><div class='add'>+		u8 rsv1[3];</div><div class='add'>+	} __packed req_hdr = {0};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 tlv_num = 0;</div><div class='add'>+	u32 size = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BSS_INFO_MAX_NUM; i++)</div><div class='add'>+		if ((BIT(bss_info_tag_handler[i].tag) &amp; bss_info-&gt;feature) &amp;&amp;</div><div class='add'>+		    bss_info_tag_handler[i].handler) {</div><div class='add'>+			tlv_num++;</div><div class='add'>+			size += bss_info_tag_handler[i].len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(NULL, sizeof(req_hdr) + size);</div><div class='add'>+</div><div class='add'>+	req_hdr.bss_idx = bss_info-&gt;bss_idx;</div><div class='add'>+	req_hdr.tlv_num = cpu_to_le16(tlv_num);</div><div class='add'>+	req_hdr.is_tlv_append = tlv_num ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(req_hdr)), &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BSS_INFO_MAX_NUM; i++)</div><div class='add'>+		if ((BIT(bss_info_tag_handler[i].tag) &amp; bss_info-&gt;feature) &amp;&amp;</div><div class='add'>+		    bss_info_tag_handler[i].handler)</div><div class='add'>+			bss_info_tag_handler[i].handler(dev, bss_info, skb);</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_BSS_INFO_UPDATE,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bss_info_convert_vif_type(enum nl80211_iftype type,</div><div class='add'>+				      u32 *network_type, u32 *conn_type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		if (network_type)</div><div class='add'>+			*network_type = NETWORK_INFRA;</div><div class='add'>+		if (conn_type)</div><div class='add'>+			*conn_type = CONNECTION_INFRA_AP;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (network_type)</div><div class='add'>+			*network_type = NETWORK_INFRA;</div><div class='add'>+		if (conn_type)</div><div class='add'>+			*conn_type = CONNECTION_INFRA_STA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_bss_info(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    int en)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct bss_info bss_info = {0};</div><div class='add'>+	u8 bmc_tx_wlan_idx = 0;</div><div class='add'>+	u32 network_type = 0, conn_type = 0;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		bmc_tx_wlan_idx = mvif-&gt;sta.wcid.idx;</div><div class='add'>+	} else if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		/* find the unicast entry for sta mode bmc tx */</div><div class='add'>+		struct ieee80211_sta *ap_sta;</div><div class='add'>+		struct mt7615_sta *msta;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+</div><div class='add'>+		ap_sta = ieee80211_find_sta(vif, vif-&gt;bss_conf.bssid);</div><div class='add'>+		if (!ap_sta) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msta = (struct mt7615_sta *)ap_sta-&gt;drv_priv;</div><div class='add'>+		bmc_tx_wlan_idx = msta-&gt;wcid.idx;</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bss_info_convert_vif_type(vif-&gt;type, &amp;network_type, &amp;conn_type);</div><div class='add'>+</div><div class='add'>+	bss_info.bss_idx = mvif-&gt;idx;</div><div class='add'>+	memcpy(bss_info.bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+	bss_info.omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	bss_info.band_idx = mvif-&gt;band_idx;</div><div class='add'>+	bss_info.bmc_tx_wlan_idx = bmc_tx_wlan_idx;</div><div class='add'>+	bss_info.wmm_idx = mvif-&gt;wmm_idx;</div><div class='add'>+	bss_info.network_type = network_type;</div><div class='add'>+	bss_info.conn_type = conn_type;</div><div class='add'>+	bss_info.bcn_interval = vif-&gt;bss_conf.beacon_int;</div><div class='add'>+	bss_info.dtim_period = vif-&gt;bss_conf.dtim_period;</div><div class='add'>+	bss_info.enable = en;</div><div class='add'>+	bss_info.feature = BIT(BSS_INFO_BASIC);</div><div class='add'>+	if (en) {</div><div class='add'>+		bss_info.feature |= BIT(BSS_INFO_OMAC);</div><div class='add'>+		if (mvif-&gt;omac_idx &gt; EXT_BSSID_START)</div><div class='add'>+			bss_info.feature |= BIT(BSS_INFO_EXT_BSS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_bss_info(dev, &amp;bss_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mt7615_mcu_set_wtbl(struct mt7615_dev *dev, int wlan_idx,</div><div class='add'>+				 int operation, void *buf, int buf_len)</div><div class='add'>+{</div><div class='add'>+	struct req_hdr {</div><div class='add'>+		u8 wlan_idx;</div><div class='add'>+		u8 operation;</div><div class='add'>+		__le16 tlv_num;</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+	} __packed req_hdr = {0};</div><div class='add'>+	struct tlv {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 buf[0];</div><div class='add'>+	} __packed;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 tlv_num = 0;</div><div class='add'>+	int offset = 0;</div><div class='add'>+</div><div class='add'>+	while (offset &lt; buf_len) {</div><div class='add'>+		struct tlv *tlv = (struct tlv *)((u8 *)buf + offset);</div><div class='add'>+</div><div class='add'>+		tlv_num++;</div><div class='add'>+		offset += tlv-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(NULL, sizeof(req_hdr) + buf_len);</div><div class='add'>+</div><div class='add'>+	req_hdr.wlan_idx = wlan_idx;</div><div class='add'>+	req_hdr.operation = operation;</div><div class='add'>+	req_hdr.tlv_num = cpu_to_le16(tlv_num);</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(req_hdr)), &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+</div><div class='add'>+	if (buf &amp;&amp; buf_len)</div><div class='add'>+		memcpy(skb_put(skb, buf_len), buf, buf_len);</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_WTBL_UPDATE,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum mt7615_cipher_type</div><div class='add'>+mt7615_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)</div><div class='add'>+{</div><div class='add'>+	if (!key || key-&gt;keylen &gt; 32)</div><div class='add'>+		return MT_CIPHER_NONE;</div><div class='add'>+</div><div class='add'>+	memcpy(key_data, key-&gt;key, key-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		return MT_CIPHER_WEP40;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		return MT_CIPHER_WEP104;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		/* Rx/Tx MIC keys are swapped */</div><div class='add'>+		memcpy(key_data + 16, key-&gt;key + 24, 8);</div><div class='add'>+		memcpy(key_data + 24, key-&gt;key + 16, 8);</div><div class='add'>+		return MT_CIPHER_TKIP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		return MT_CIPHER_AES_CCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		return MT_CIPHER_CCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		return MT_CIPHER_GCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		return MT_CIPHER_GCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		return MT_CIPHER_WAPI;</div><div class='add'>+	default:</div><div class='add'>+		return MT_CIPHER_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid,</div><div class='add'>+			    struct ieee80211_key_conf *key,</div><div class='add'>+			    enum set_key_cmd cmd)</div><div class='add'>+{</div><div class='add'>+	struct wtbl_sec_key wtbl_sec_key = {0};</div><div class='add'>+	int buf_len = sizeof(struct wtbl_sec_key);</div><div class='add'>+	u8 cipher;</div><div class='add'>+</div><div class='add'>+	wtbl_sec_key.tag = cpu_to_le16(WTBL_SEC_KEY);</div><div class='add'>+	wtbl_sec_key.len = cpu_to_le16(buf_len);</div><div class='add'>+	wtbl_sec_key.add = cmd;</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='add'>+		cipher = mt7615_get_key_info(key, wtbl_sec_key.key_material);</div><div class='add'>+		if (cipher == MT_CIPHER_NONE &amp;&amp; key)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		wtbl_sec_key.cipher_id = cipher;</div><div class='add'>+		wtbl_sec_key.key_id = key-&gt;keyidx;</div><div class='add'>+		wtbl_sec_key.key_len = key-&gt;keylen;</div><div class='add'>+	} else {</div><div class='add'>+		wtbl_sec_key.key_len = sizeof(wtbl_sec_key.key_material);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_wtbl(dev, wcid, WTBL_SET, &amp;wtbl_sec_key,</div><div class='add'>+				     buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct wtbl_generic *wtbl_generic;</div><div class='add'>+	struct wtbl_rx *wtbl_rx;</div><div class='add'>+	int buf_len, ret;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(MT7615_WTBL_UPDATE_MAX_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	wtbl_generic = (struct wtbl_generic *)buf;</div><div class='add'>+	buf_len = sizeof(*wtbl_generic);</div><div class='add'>+	wtbl_generic-&gt;tag = cpu_to_le16(WTBL_GENERIC);</div><div class='add'>+	wtbl_generic-&gt;len = cpu_to_le16(buf_len);</div><div class='add'>+	eth_broadcast_addr(wtbl_generic-&gt;peer_addr);</div><div class='add'>+	wtbl_generic-&gt;muar_idx = 0xe;</div><div class='add'>+</div><div class='add'>+	wtbl_rx = (struct wtbl_rx *)(buf + buf_len);</div><div class='add'>+	buf_len += sizeof(*wtbl_rx);</div><div class='add'>+	wtbl_rx-&gt;tag = cpu_to_le16(WTBL_RX);</div><div class='add'>+	wtbl_rx-&gt;len = cpu_to_le16(sizeof(*wtbl_rx));</div><div class='add'>+	wtbl_rx-&gt;rca1 = 1;</div><div class='add'>+	wtbl_rx-&gt;rca2 = 1;</div><div class='add'>+	wtbl_rx-&gt;rv = 1;</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_set_wtbl(dev, mvif-&gt;sta.wcid.idx,</div><div class='add'>+				    WTBL_RESET_AND_SET, buf, buf_len);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_del_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_wtbl(dev, mvif-&gt;sta.wcid.idx,</div><div class='add'>+				     WTBL_RESET_AND_SET, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_add_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct wtbl_generic *wtbl_generic;</div><div class='add'>+	struct wtbl_rx *wtbl_rx;</div><div class='add'>+	int buf_len, ret;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(MT7615_WTBL_UPDATE_MAX_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	wtbl_generic = (struct wtbl_generic *)buf;</div><div class='add'>+	buf_len = sizeof(*wtbl_generic);</div><div class='add'>+	wtbl_generic-&gt;tag = cpu_to_le16(WTBL_GENERIC);</div><div class='add'>+	wtbl_generic-&gt;len = cpu_to_le16(buf_len);</div><div class='add'>+	memcpy(wtbl_generic-&gt;peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	wtbl_generic-&gt;muar_idx = mvif-&gt;omac_idx;</div><div class='add'>+	wtbl_generic-&gt;qos = sta-&gt;wme;</div><div class='add'>+	wtbl_generic-&gt;partial_aid = cpu_to_le16(sta-&gt;aid);</div><div class='add'>+</div><div class='add'>+	wtbl_rx = (struct wtbl_rx *)(buf + buf_len);</div><div class='add'>+	buf_len += sizeof(*wtbl_rx);</div><div class='add'>+	wtbl_rx-&gt;tag = cpu_to_le16(WTBL_RX);</div><div class='add'>+	wtbl_rx-&gt;len = cpu_to_le16(sizeof(*wtbl_rx));</div><div class='add'>+	wtbl_rx-&gt;rca1 = (vif-&gt;type == NL80211_IFTYPE_AP) ? 0 : 1;</div><div class='add'>+	wtbl_rx-&gt;rca2 = 1;</div><div class='add'>+	wtbl_rx-&gt;rv = 1;</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_set_wtbl(dev, msta-&gt;wcid.idx,</div><div class='add'>+				    WTBL_RESET_AND_SET, buf, buf_len);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_del_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_wtbl(dev, msta-&gt;wcid.idx,</div><div class='add'>+				     WTBL_RESET_AND_SET, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return __mt7615_mcu_set_wtbl(dev, 0, WTBL_RESET_ALL, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, int bss_idx,</div><div class='add'>+				    int wlan_idx, int muar_idx, void *buf,</div><div class='add'>+				    int buf_len)</div><div class='add'>+{</div><div class='add'>+	struct req_hdr {</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 wlan_idx;</div><div class='add'>+		__le16 tlv_num;</div><div class='add'>+		u8 is_tlv_append;</div><div class='add'>+		u8 muar_idx;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} __packed req_hdr = {0};</div><div class='add'>+	struct tlv {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 buf[0];</div><div class='add'>+	} __packed;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 tlv_num = 0;</div><div class='add'>+	int offset = 0;</div><div class='add'>+</div><div class='add'>+	while (offset &lt; buf_len) {</div><div class='add'>+		struct tlv *tlv = (struct tlv *)((u8 *)buf + offset);</div><div class='add'>+</div><div class='add'>+		tlv_num++;</div><div class='add'>+		offset += tlv-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(NULL, sizeof(req_hdr) + buf_len);</div><div class='add'>+</div><div class='add'>+	req_hdr.bss_idx = bss_idx;</div><div class='add'>+	req_hdr.wlan_idx = wlan_idx;</div><div class='add'>+	req_hdr.tlv_num = cpu_to_le16(tlv_num);</div><div class='add'>+	req_hdr.is_tlv_append = tlv_num ? 1 : 0;</div><div class='add'>+	req_hdr.muar_idx = muar_idx;</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(req_hdr)), &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+</div><div class='add'>+	if (buf &amp;&amp; buf_len)</div><div class='add'>+		memcpy(skb_put(skb, buf_len), buf, buf_len);</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_STA_REC_UPDATE,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_sta_rec_bmc(struct mt7615_dev *dev,</div><div class='add'>+			       struct ieee80211_vif *vif, bool en)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct sta_rec_basic sta_rec_basic = {0};</div><div class='add'>+	int buf_len = sizeof(struct sta_rec_basic);</div><div class='add'>+</div><div class='add'>+	sta_rec_basic.tag = cpu_to_le16(STA_REC_BASIC);</div><div class='add'>+	sta_rec_basic.len = cpu_to_le16(buf_len);</div><div class='add'>+	sta_rec_basic.conn_type = cpu_to_le32(CONNECTION_INFRA_BC);</div><div class='add'>+	eth_broadcast_addr(sta_rec_basic.peer_addr);</div><div class='add'>+	if (en) {</div><div class='add'>+		sta_rec_basic.conn_state = CONN_STATE_PORT_SECURE;</div><div class='add'>+		sta_rec_basic.extra_info =</div><div class='add'>+			cpu_to_le16(EXTRA_INFO_VER | EXTRA_INFO_NEW);</div><div class='add'>+	} else {</div><div class='add'>+		sta_rec_basic.conn_state = CONN_STATE_DISCONNECT;</div><div class='add'>+		sta_rec_basic.extra_info = cpu_to_le16(EXTRA_INFO_VER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_sta_rec(dev, mvif-&gt;idx, mvif-&gt;sta.wcid.idx,</div><div class='add'>+					mvif-&gt;omac_idx, &amp;sta_rec_basic,</div><div class='add'>+					buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sta_rec_convert_vif_type(enum nl80211_iftype type, u32 *conn_type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		if (conn_type)</div><div class='add'>+			*conn_type = CONNECTION_INFRA_STA;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (conn_type)</div><div class='add'>+			*conn_type = CONNECTION_INFRA_AP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta, bool en)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct sta_rec_basic sta_rec_basic = {0};</div><div class='add'>+	int buf_len = sizeof(struct sta_rec_basic);</div><div class='add'>+	u32 conn_type = 0;</div><div class='add'>+</div><div class='add'>+	sta_rec_convert_vif_type(vif-&gt;type, &amp;conn_type);</div><div class='add'>+</div><div class='add'>+	sta_rec_basic.tag = cpu_to_le16(STA_REC_BASIC);</div><div class='add'>+	sta_rec_basic.len = cpu_to_le16(buf_len);</div><div class='add'>+	sta_rec_basic.conn_type = cpu_to_le32(conn_type);</div><div class='add'>+	sta_rec_basic.qos = sta-&gt;wme;</div><div class='add'>+	sta_rec_basic.aid = cpu_to_le16(sta-&gt;aid);</div><div class='add'>+	memcpy(sta_rec_basic.peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		sta_rec_basic.conn_state = CONN_STATE_PORT_SECURE;</div><div class='add'>+		sta_rec_basic.extra_info =</div><div class='add'>+			cpu_to_le16(EXTRA_INFO_VER | EXTRA_INFO_NEW);</div><div class='add'>+	} else {</div><div class='add'>+		sta_rec_basic.conn_state = CONN_STATE_DISCONNECT;</div><div class='add'>+		sta_rec_basic.extra_info = cpu_to_le16(EXTRA_INFO_VER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_sta_rec(dev, mvif-&gt;idx, msta-&gt;wcid.idx,</div><div class='add'>+					mvif-&gt;omac_idx, &amp;sta_rec_basic,</div><div class='add'>+					buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_bcn(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       int en)</div><div class='add'>+{</div><div class='add'>+	struct req {</div><div class='add'>+		u8 omac_idx;</div><div class='add'>+		u8 enable;</div><div class='add'>+		u8 wlan_idx;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 pkt_type;</div><div class='add'>+		u8 need_pre_tbtt_int;</div><div class='add'>+		__le16 csa_ie_pos;</div><div class='add'>+		__le16 pkt_len;</div><div class='add'>+		__le16 tim_ie_pos;</div><div class='add'>+		u8 pkt[512];</div><div class='add'>+		u8 csa_cnt;</div><div class='add'>+		/* bss color change */</div><div class='add'>+		u8 bcc_cnt;</div><div class='add'>+		__le16 bcc_ie_pos;</div><div class='add'>+	} __packed req = {0};</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_wcid *wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 tim_off, tim_len;</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_beacon_get_tim(mt76_hw(dev), vif, &amp;tim_off, &amp;tim_len);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; 512 - MT_TXD_SIZE) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Bcn size limit exceed\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7615_mac_write_txwi(dev, (__le32 *)(req.pkt), skb, wcid, NULL,</div><div class='add'>+			      0, NULL);</div><div class='add'>+	memcpy(req.pkt + MT_TXD_SIZE, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	req.omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	req.enable = en;</div><div class='add'>+	req.wlan_idx = wcid-&gt;idx;</div><div class='add'>+	req.band_idx = mvif-&gt;band_idx;</div><div class='add'>+	/* pky_type: 0 for bcn, 1 for tim */</div><div class='add'>+	req.pkt_type = 0;</div><div class='add'>+	req.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb-&gt;len);</div><div class='add'>+	req.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + tim_off);</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_BCN_OFFLOAD,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_channel(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chdef = &amp;dev-&gt;mt76.chandef;</div><div class='add'>+	struct {</div><div class='add'>+		u8 control_chan;</div><div class='add'>+		u8 center_chan;</div><div class='add'>+		u8 bw;</div><div class='add'>+		u8 tx_streams;</div><div class='add'>+		u8 rx_streams_mask;</div><div class='add'>+		u8 switch_reason;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		/* for 80+80 only */</div><div class='add'>+		u8 center_chan2;</div><div class='add'>+		__le16 cac_case;</div><div class='add'>+		u8 channel_band;</div><div class='add'>+		u8 rsv0;</div><div class='add'>+		__le32 outband_freq;</div><div class='add'>+		u8 txpower_drop;</div><div class='add'>+		u8 rsv1[3];</div><div class='add'>+		u8 txpower_sku[53];</div><div class='add'>+		u8 rsv2[3];</div><div class='add'>+	} req = {0};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req.control_chan = chdef-&gt;chan-&gt;hw_value;</div><div class='add'>+	req.center_chan = ieee80211_frequency_to_channel(chdef-&gt;center_freq1);</div><div class='add'>+	req.tx_streams = (dev-&gt;mt76.chainmask &gt;&gt; 8) &amp; 0xf;</div><div class='add'>+	req.rx_streams_mask = dev-&gt;mt76.antenna_mask;</div><div class='add'>+	req.switch_reason = CH_SWITCH_NORMAL;</div><div class='add'>+	req.band_idx = 0;</div><div class='add'>+	req.center_chan2 = ieee80211_frequency_to_channel(chdef-&gt;center_freq2);</div><div class='add'>+	req.txpower_drop = 0;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;mt76.chandef.width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		req.bw = CMD_CBW_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		req.bw = CMD_CBW_80MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		req.bw = CMD_CBW_8080MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		req.bw = CMD_CBW_160MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_5:</div><div class='add'>+		req.bw = CMD_CBW_5MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_10:</div><div class='add'>+		req.bw = CMD_CBW_10MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		req.bw = CMD_CBW_20MHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(req.txpower_sku, 0x3f, 49);</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+	ret = mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_CHANNEL_SWITCH,</div><div class='add'>+				  MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	skb = mt7615_mcu_msg_alloc(&amp;req, sizeof(req));</div><div class='add'>+	return mt7615_mcu_msg_send(dev, skb, MCU_EXT_CMD_SET_RX_PATH,</div><div class='add'>+				   MCU_Q_SET, MCU_S2D_H2N, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct wtbl_ht *wtbl_ht;</div><div class='add'>+	struct wtbl_raw *wtbl_raw;</div><div class='add'>+	struct sta_rec_ht *sta_rec_ht;</div><div class='add'>+	int buf_len, ret;</div><div class='add'>+	u32 msk, val = 0;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(MT7615_WTBL_UPDATE_MAX_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* ht basic */</div><div class='add'>+	buf_len = sizeof(*wtbl_ht);</div><div class='add'>+	wtbl_ht = (struct wtbl_ht *)buf;</div><div class='add'>+	wtbl_ht-&gt;tag = cpu_to_le16(WTBL_HT);</div><div class='add'>+	wtbl_ht-&gt;len = cpu_to_le16(sizeof(*wtbl_ht));</div><div class='add'>+	wtbl_ht-&gt;ht = 1;</div><div class='add'>+	wtbl_ht-&gt;ldpc = sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING;</div><div class='add'>+	wtbl_ht-&gt;af = sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+	wtbl_ht-&gt;mm = sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='add'>+		val |= MT_WTBL_W5_SHORT_GI_20;</div><div class='add'>+	if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='add'>+		val |= MT_WTBL_W5_SHORT_GI_40;</div><div class='add'>+</div><div class='add'>+	/* vht basic */</div><div class='add'>+	if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		struct wtbl_vht *wtbl_vht;</div><div class='add'>+</div><div class='add'>+		wtbl_vht = (struct wtbl_vht *)(buf + buf_len);</div><div class='add'>+		buf_len += sizeof(*wtbl_vht);</div><div class='add'>+		wtbl_vht-&gt;tag = cpu_to_le16(WTBL_VHT);</div><div class='add'>+		wtbl_vht-&gt;len = cpu_to_le16(sizeof(*wtbl_vht));</div><div class='add'>+		wtbl_vht-&gt;ldpc = sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC;</div><div class='add'>+		wtbl_vht-&gt;vht = 1;</div><div class='add'>+</div><div class='add'>+		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='add'>+			val |= MT_WTBL_W5_SHORT_GI_80;</div><div class='add'>+		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_160)</div><div class='add'>+			val |= MT_WTBL_W5_SHORT_GI_160;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* smps */</div><div class='add'>+	if (sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC) {</div><div class='add'>+		struct wtbl_smps *wtbl_smps;</div><div class='add'>+</div><div class='add'>+		wtbl_smps = (struct wtbl_smps *)(buf + buf_len);</div><div class='add'>+		buf_len += sizeof(*wtbl_smps);</div><div class='add'>+		wtbl_smps-&gt;tag = cpu_to_le16(WTBL_SMPS);</div><div class='add'>+		wtbl_smps-&gt;len = cpu_to_le16(sizeof(*wtbl_smps));</div><div class='add'>+		wtbl_smps-&gt;smps = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* sgi */</div><div class='add'>+	msk = MT_WTBL_W5_SHORT_GI_20 | MT_WTBL_W5_SHORT_GI_40 |</div><div class='add'>+	      MT_WTBL_W5_SHORT_GI_80 | MT_WTBL_W5_SHORT_GI_160;</div><div class='add'>+</div><div class='add'>+	wtbl_raw = (struct wtbl_raw *)(buf + buf_len);</div><div class='add'>+	buf_len += sizeof(*wtbl_raw);</div><div class='add'>+	wtbl_raw-&gt;tag = cpu_to_le16(WTBL_RAW_DATA);</div><div class='add'>+	wtbl_raw-&gt;len = cpu_to_le16(sizeof(*wtbl_raw));</div><div class='add'>+	wtbl_raw-&gt;wtbl_idx = 1;</div><div class='add'>+	wtbl_raw-&gt;dw = 5;</div><div class='add'>+	wtbl_raw-&gt;msk = cpu_to_le32(~msk);</div><div class='add'>+	wtbl_raw-&gt;val = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_set_wtbl(dev, msta-&gt;wcid.idx, WTBL_SET, buf,</div><div class='add'>+				    buf_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, MT7615_WTBL_UPDATE_MAX_SIZE);</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(*sta_rec_ht);</div><div class='add'>+	sta_rec_ht = (struct sta_rec_ht *)buf;</div><div class='add'>+	sta_rec_ht-&gt;tag = cpu_to_le16(STA_REC_HT);</div><div class='add'>+	sta_rec_ht-&gt;len = cpu_to_le16(sizeof(*sta_rec_ht));</div><div class='add'>+	sta_rec_ht-&gt;ht_cap = cpu_to_le16(sta-&gt;ht_cap.cap);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		struct sta_rec_vht *sta_rec_vht;</div><div class='add'>+</div><div class='add'>+		sta_rec_vht = (struct sta_rec_vht *)(buf + buf_len);</div><div class='add'>+		buf_len += sizeof(*sta_rec_vht);</div><div class='add'>+		sta_rec_vht-&gt;tag = cpu_to_le16(STA_REC_VHT);</div><div class='add'>+		sta_rec_vht-&gt;len = cpu_to_le16(sizeof(*sta_rec_vht));</div><div class='add'>+		sta_rec_vht-&gt;vht_cap = cpu_to_le32(sta-&gt;vht_cap.cap);</div><div class='add'>+		sta_rec_vht-&gt;vht_rx_mcs_map =</div><div class='add'>+			cpu_to_le16(sta-&gt;vht_cap.vht_mcs.rx_mcs_map);</div><div class='add'>+		sta_rec_vht-&gt;vht_tx_mcs_map =</div><div class='add'>+			cpu_to_le16(sta-&gt;vht_cap.vht_mcs.tx_mcs_map);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_set_sta_rec(dev, mvif-&gt;idx, msta-&gt;wcid.idx,</div><div class='add'>+				       mvif-&gt;omac_idx, buf, buf_len);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool add)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7615_vif *mvif = msta-&gt;vif;</div><div class='add'>+	u8 ba_range[8] = {4, 8, 12, 24, 36, 48, 54, 64};</div><div class='add'>+	u16 tid = params-&gt;tid;</div><div class='add'>+	u16 ba_size = params-&gt;buf_size;</div><div class='add'>+	u16 ssn = params-&gt;ssn;</div><div class='add'>+	struct wtbl_ba wtbl_ba = {0};</div><div class='add'>+	struct sta_rec_ba sta_rec_ba = {0};</div><div class='add'>+	int ret, buf_len;</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(struct wtbl_ba);</div><div class='add'>+</div><div class='add'>+	wtbl_ba.tag = cpu_to_le16(WTBL_BA);</div><div class='add'>+	wtbl_ba.len = cpu_to_le16(buf_len);</div><div class='add'>+	wtbl_ba.tid = tid;</div><div class='add'>+	wtbl_ba.ba_type = MT_BA_TYPE_ORIGINATOR;</div><div class='add'>+</div><div class='add'>+	if (add) {</div><div class='add'>+		u8 idx;</div><div class='add'>+</div><div class='add'>+		for (idx = 7; idx &gt; 0; idx--) {</div><div class='add'>+			if (ba_size &gt;= ba_range[idx])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wtbl_ba.sn = cpu_to_le16(ssn);</div><div class='add'>+		wtbl_ba.ba_en = 1;</div><div class='add'>+		wtbl_ba.ba_winsize_idx = idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_set_wtbl(dev, msta-&gt;wcid.idx, WTBL_SET, &amp;wtbl_ba,</div><div class='add'>+				    buf_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(struct sta_rec_ba);</div><div class='add'>+</div><div class='add'>+	sta_rec_ba.tag = cpu_to_le16(STA_REC_BA);</div><div class='add'>+	sta_rec_ba.len = cpu_to_le16(buf_len);</div><div class='add'>+	sta_rec_ba.tid = tid;</div><div class='add'>+	sta_rec_ba.ba_type = MT_BA_TYPE_ORIGINATOR;</div><div class='add'>+	sta_rec_ba.amsdu = params-&gt;amsdu;</div><div class='add'>+	sta_rec_ba.ba_en = add &lt;&lt; tid;</div><div class='add'>+	sta_rec_ba.ssn = cpu_to_le16(ssn);</div><div class='add'>+	sta_rec_ba.winsize = cpu_to_le16(ba_size);</div><div class='add'>+</div><div class='add'>+	return __mt7615_mcu_set_sta_rec(dev, mvif-&gt;idx, msta-&gt;wcid.idx,</div><div class='add'>+					mvif-&gt;omac_idx, &amp;sta_rec_ba, buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool add)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7615_vif *mvif = msta-&gt;vif;</div><div class='add'>+	u16 tid = params-&gt;tid;</div><div class='add'>+	struct wtbl_ba wtbl_ba = {0};</div><div class='add'>+	struct sta_rec_ba sta_rec_ba = {0};</div><div class='add'>+	int ret, buf_len;</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(struct sta_rec_ba);</div><div class='add'>+</div><div class='add'>+	sta_rec_ba.tag = cpu_to_le16(STA_REC_BA);</div><div class='add'>+	sta_rec_ba.len = cpu_to_le16(buf_len);</div><div class='add'>+	sta_rec_ba.tid = tid;</div><div class='add'>+	sta_rec_ba.ba_type = MT_BA_TYPE_RECIPIENT;</div><div class='add'>+	sta_rec_ba.amsdu = params-&gt;amsdu;</div><div class='add'>+	sta_rec_ba.ba_en = add &lt;&lt; tid;</div><div class='add'>+	sta_rec_ba.ssn = cpu_to_le16(params-&gt;ssn);</div><div class='add'>+	sta_rec_ba.winsize = cpu_to_le16(params-&gt;buf_size);</div><div class='add'>+</div><div class='add'>+	ret = __mt7615_mcu_set_sta_rec(dev, mvif-&gt;idx, msta-&gt;wcid.idx,</div><div class='add'>+				       mvif-&gt;omac_idx, &amp;sta_rec_ba, buf_len);</div><div class='add'>+	if (ret || !add)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(struct wtbl_ba);</div><div class='add'>+</div><div class='add'>+	wtbl_ba.tag = cpu_to_le16(WTBL_BA);</div><div class='add'>+	wtbl_ba.len = cpu_to_le16(buf_len);</div><div class='add'>+	wtbl_ba.tid = tid;</div><div class='add'>+	wtbl_ba.ba_type = MT_BA_TYPE_RECIPIENT;</div><div class='add'>+	memcpy(wtbl_ba.peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	wtbl_ba.rst_ba_tid = tid;</div><div class='add'>+	wtbl_ba.rst_ba_sel = RST_BA_MAC_TID_MATCH;</div><div class='add'>+	wtbl_ba.rst_ba_sb = 1;</div><div class='add'>+</div><div class='add'>+	return  __mt7615_mcu_set_wtbl(dev, msta-&gt;wcid.idx, WTBL_SET,</div><div class='add'>+				      &amp;wtbl_ba, buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_mcu_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta,</div><div class='add'>+			  struct ieee80211_tx_rate *probe_rate,</div><div class='add'>+			  struct ieee80211_tx_rate *rates)</div><div class='add'>+{</div><div class='add'>+	int wcid = sta-&gt;wcid.idx;</div><div class='add'>+	u32 addr = MT_WTBL_BASE + wcid * MT_WTBL_ENTRY_SIZE;</div><div class='add'>+	bool stbc = false;</div><div class='add'>+	int n_rates = sta-&gt;n_rates;</div><div class='add'>+	u8 bw, bw_prev, bw_idx = 0;</div><div class='add'>+	u16 val[4];</div><div class='add'>+	u16 probe_val;</div><div class='add'>+	u32 w5, w27;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = n_rates; i &lt; 4; i++)</div><div class='add'>+		rates[i] = rates[n_rates - 1];</div><div class='add'>+</div><div class='add'>+	val[0] = mt7615_mac_tx_rate_val(dev, &amp;rates[0], stbc, &amp;bw);</div><div class='add'>+	bw_prev = bw;</div><div class='add'>+</div><div class='add'>+	if (probe_rate) {</div><div class='add'>+		probe_val = mt7615_mac_tx_rate_val(dev, probe_rate, stbc, &amp;bw);</div><div class='add'>+		if (bw)</div><div class='add'>+			bw_idx = 1;</div><div class='add'>+		else</div><div class='add'>+			bw_prev = 0;</div><div class='add'>+	} else {</div><div class='add'>+		probe_val = val[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val[1] = mt7615_mac_tx_rate_val(dev, &amp;rates[1], stbc, &amp;bw);</div><div class='add'>+	if (bw_prev) {</div><div class='add'>+		bw_idx = 3;</div><div class='add'>+		bw_prev = bw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val[2] = mt7615_mac_tx_rate_val(dev, &amp;rates[2], stbc, &amp;bw);</div><div class='add'>+	if (bw_prev) {</div><div class='add'>+		bw_idx = 5;</div><div class='add'>+		bw_prev = bw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val[3] = mt7615_mac_tx_rate_val(dev, &amp;rates[3], stbc, &amp;bw);</div><div class='add'>+	if (bw_prev)</div><div class='add'>+		bw_idx = 7;</div><div class='add'>+</div><div class='add'>+	w27 = mt76_rr(dev, addr + 27 * 4);</div><div class='add'>+	w27 &amp;= ~MT_WTBL_W27_CC_BW_SEL;</div><div class='add'>+	w27 |= FIELD_PREP(MT_WTBL_W27_CC_BW_SEL, bw);</div><div class='add'>+</div><div class='add'>+	w5 = mt76_rr(dev, addr + 5 * 4);</div><div class='add'>+	w5 &amp;= ~(MT_WTBL_W5_BW_CAP | MT_WTBL_W5_CHANGE_BW_RATE);</div><div class='add'>+	w5 |= FIELD_PREP(MT_WTBL_W5_BW_CAP, bw) |</div><div class='add'>+	      FIELD_PREP(MT_WTBL_W5_CHANGE_BW_RATE, bw_idx ? bw_idx - 1 : 7);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WTBL_RIUCR0, w5);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WTBL_RIUCR1,</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR1_RATE0, probe_val) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR1_RATE1, val[0]) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR1_RATE2_LO, val[0]));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WTBL_RIUCR2,</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR2_RATE2_HI, val[0] &gt;&gt; 8) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR2_RATE3, val[1]) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR2_RATE4, val[1]) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR2_RATE5_LO, val[2]));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WTBL_RIUCR3,</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR3_RATE5_HI, val[2] &gt;&gt; 4) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR3_RATE6, val[2]) |</div><div class='add'>+		FIELD_PREP(MT_WTBL_RIUCR3_RATE7, val[3]));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WTBL_UPDATE,</div><div class='add'>+		FIELD_PREP(MT_WTBL_UPDATE_WLAN_IDX, wcid) |</div><div class='add'>+		MT_WTBL_UPDATE_RATE_UPDATE |</div><div class='add'>+		MT_WTBL_UPDATE_TX_COUNT_CLEAR);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, addr + 27 * 4, w27);</div><div class='add'>+</div><div class='add'>+	if (!(sta-&gt;wcid.tx_info &amp; MT_WCID_TX_INFO_SET))</div><div class='add'>+		mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000);</div><div class='add'>+</div><div class='add'>+	sta-&gt;rate_count = 2 * MT7615_RATE_RETRY * n_rates;</div><div class='add'>+	sta-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h<br/>new file mode 100644<br/>index 000000000000..9455f8fa475d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.h</a></div><div class='hunk'>@@ -0,0 +1,520 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7615_MCU_H</div><div class='add'>+#define __MT7615_MCU_H</div><div class='add'>+</div><div class='add'>+struct mt7615_mcu_txd {</div><div class='add'>+	__le32 txd[8];</div><div class='add'>+</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 pq_id;</div><div class='add'>+</div><div class='add'>+	u8 cid;</div><div class='add'>+	u8 pkt_type;</div><div class='add'>+	u8 set_query; /* FW don't care */</div><div class='add'>+	u8 seq;</div><div class='add'>+</div><div class='add'>+	u8 uc_d2b0_rev;</div><div class='add'>+	u8 ext_cid;</div><div class='add'>+	u8 s2d_index;</div><div class='add'>+	u8 ext_cid_ack;</div><div class='add'>+</div><div class='add'>+	u32 reserved[5];</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+struct mt7615_mcu_rxd {</div><div class='add'>+	__le32 rxd[4];</div><div class='add'>+</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 pkt_type_id;</div><div class='add'>+</div><div class='add'>+	u8 eid;</div><div class='add'>+	u8 seq;</div><div class='add'>+	__le16 __rsv;</div><div class='add'>+</div><div class='add'>+	u8 ext_eid;</div><div class='add'>+	u8 __rsv1[2];</div><div class='add'>+	u8 s2d_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCU_PQ_ID(p, q)		(((p) &lt;&lt; 15) | ((q) &lt;&lt; 10))</div><div class='add'>+#define MCU_PKT_ID		0xa0</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_Q_QUERY,</div><div class='add'>+	MCU_Q_SET,</div><div class='add'>+	MCU_Q_RESERVED,</div><div class='add'>+	MCU_Q_NA</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_S2D_H2N,</div><div class='add'>+	MCU_S2D_C2N,</div><div class='add'>+	MCU_S2D_H2C,</div><div class='add'>+	MCU_S2D_H2CN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_CMD_TARGET_ADDRESS_LEN_REQ = 0x01,</div><div class='add'>+	MCU_CMD_FW_START_REQ = 0x02,</div><div class='add'>+	MCU_CMD_INIT_ACCESS_REG = 0x3,</div><div class='add'>+	MCU_CMD_PATCH_START_REQ = 0x05,</div><div class='add'>+	MCU_CMD_PATCH_FINISH_REQ = 0x07,</div><div class='add'>+	MCU_CMD_PATCH_SEM_CONTROL = 0x10,</div><div class='add'>+	MCU_CMD_EXT_CID = 0xED,</div><div class='add'>+	MCU_CMD_FW_SCATTER = 0xEE,</div><div class='add'>+	MCU_CMD_RESTART_DL_REQ = 0xEF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_EXT_CMD_PM_STATE_CTRL = 0x07,</div><div class='add'>+	MCU_EXT_CMD_CHANNEL_SWITCH = 0x08,</div><div class='add'>+	MCU_EXT_CMD_EFUSE_BUFFER_MODE = 0x21,</div><div class='add'>+	MCU_EXT_CMD_STA_REC_UPDATE = 0x25,</div><div class='add'>+	MCU_EXT_CMD_BSS_INFO_UPDATE = 0x26,</div><div class='add'>+	MCU_EXT_CMD_EDCA_UPDATE = 0x27,</div><div class='add'>+	MCU_EXT_CMD_DEV_INFO_UPDATE = 0x2A,</div><div class='add'>+	MCU_EXT_CMD_WTBL_UPDATE = 0x32,</div><div class='add'>+	MCU_EXT_CMD_PROTECT_CTRL = 0x3e,</div><div class='add'>+	MCU_EXT_CMD_MAC_INIT_CTRL = 0x46,</div><div class='add'>+	MCU_EXT_CMD_BCN_OFFLOAD = 0x49,</div><div class='add'>+	MCU_EXT_CMD_SET_RX_PATH = 0x4e,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PATCH_SEM_RELEASE = 0x0,</div><div class='add'>+	PATCH_SEM_GET	  = 0x1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PATCH_NOT_DL_SEM_FAIL	 = 0x0,</div><div class='add'>+	PATCH_IS_DL		 = 0x1,</div><div class='add'>+	PATCH_NOT_DL_SEM_SUCCESS = 0x2,</div><div class='add'>+	PATCH_REL_SEM_SUCCESS	 = 0x3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FW_STATE_INITIAL          = 0,</div><div class='add'>+	FW_STATE_FW_DOWNLOAD      = 1,</div><div class='add'>+	FW_STATE_NORMAL_OPERATION = 2,</div><div class='add'>+	FW_STATE_NORMAL_TRX       = 3,</div><div class='add'>+	FW_STATE_CR4_RDY          = 7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STA_TYPE_STA		BIT(0)</div><div class='add'>+#define STA_TYPE_AP		BIT(1)</div><div class='add'>+#define STA_TYPE_ADHOC		BIT(2)</div><div class='add'>+#define STA_TYPE_TDLS		BIT(3)</div><div class='add'>+#define STA_TYPE_WDS		BIT(4)</div><div class='add'>+#define STA_TYPE_BC		BIT(5)</div><div class='add'>+</div><div class='add'>+#define NETWORK_INFRA		BIT(16)</div><div class='add'>+#define NETWORK_P2P		BIT(17)</div><div class='add'>+#define NETWORK_IBSS		BIT(18)</div><div class='add'>+#define NETWORK_MESH		BIT(19)</div><div class='add'>+#define NETWORK_BOW		BIT(20)</div><div class='add'>+#define NETWORK_WDS		BIT(21)</div><div class='add'>+</div><div class='add'>+#define CONNECTION_INFRA_STA	(STA_TYPE_STA | NETWORK_INFRA)</div><div class='add'>+#define CONNECTION_INFRA_AP	(STA_TYPE_AP | NETWORK_INFRA)</div><div class='add'>+#define CONNECTION_P2P_GC	(STA_TYPE_STA | NETWORK_P2P)</div><div class='add'>+#define CONNECTION_P2P_GO	(STA_TYPE_AP | NETWORK_P2P)</div><div class='add'>+#define CONNECTION_MESH_STA	(STA_TYPE_STA | NETWORK_MESH)</div><div class='add'>+#define CONNECTION_MESH_AP	(STA_TYPE_AP | NETWORK_MESH)</div><div class='add'>+#define CONNECTION_IBSS_ADHOC	(STA_TYPE_ADHOC | NETWORK_IBSS)</div><div class='add'>+#define CONNECTION_TDLS		(STA_TYPE_STA | NETWORK_INFRA | STA_TYPE_TDLS)</div><div class='add'>+#define CONNECTION_WDS		(STA_TYPE_WDS | NETWORK_WDS)</div><div class='add'>+#define CONNECTION_INFRA_BC	(STA_TYPE_BC | NETWORK_INFRA)</div><div class='add'>+</div><div class='add'>+#define CONN_STATE_DISCONNECT	0</div><div class='add'>+#define CONN_STATE_CONNECT	1</div><div class='add'>+#define CONN_STATE_PORT_SECURE	2</div><div class='add'>+</div><div class='add'>+struct dev_info {</div><div class='add'>+	u8 omac_idx;</div><div class='add'>+	u8 omac_addr[ETH_ALEN];</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 enable;</div><div class='add'>+	u32 feature;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DEV_INFO_ACTIVE,</div><div class='add'>+	DEV_INFO_MAX_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bss_info {</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 omac_idx;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 bmc_tx_wlan_idx; /* for bmc tx (sta mode use uc entry) */</div><div class='add'>+	u8 wmm_idx;</div><div class='add'>+	u32 network_type;</div><div class='add'>+	u32 conn_type;</div><div class='add'>+	u16 bcn_interval;</div><div class='add'>+	u8 dtim_period;</div><div class='add'>+	u8 enable;</div><div class='add'>+	u32 feature;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bss_info_tag_handler {</div><div class='add'>+	u32 tag;</div><div class='add'>+	u32 len;</div><div class='add'>+	void (*handler)(struct mt7615_dev *dev,</div><div class='add'>+			struct bss_info *bss_info, struct sk_buff *skb);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bss_info_omac {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 hw_bss_idx;</div><div class='add'>+	u8 omac_idx;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 rsv0;</div><div class='add'>+	__le32 conn_type;</div><div class='add'>+	u32 rsv1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_info_basic {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 network_type;</div><div class='add'>+	u8 active;</div><div class='add'>+	u8 rsv0;</div><div class='add'>+	__le16 bcn_interval;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 wmm_idx;</div><div class='add'>+	u8 dtim_period;</div><div class='add'>+	u8 bmc_tx_wlan_idx;</div><div class='add'>+	u8 cipher; /* not used */</div><div class='add'>+	u8 phymode; /* not used */</div><div class='add'>+	u8 rsv1[5];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_info_rf_ch {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 pri_ch;</div><div class='add'>+	u8 central_ch0;</div><div class='add'>+	u8 central_ch1;</div><div class='add'>+	u8 bw;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_info_ext_bss {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 mbss_tsf_offset; /* in unit of us */</div><div class='add'>+	u8 rsv[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BSS_INFO_OMAC,</div><div class='add'>+	BSS_INFO_BASIC,</div><div class='add'>+	BSS_INFO_RF_CH, /* optional, for BT/LTE coex */</div><div class='add'>+	BSS_INFO_PM, /* sta only */</div><div class='add'>+	BSS_INFO_UAPSD, /* sta only */</div><div class='add'>+	BSS_INFO_ROAM_DETECTION, /* obsoleted */</div><div class='add'>+	BSS_INFO_LQ_RM, /* obsoleted */</div><div class='add'>+	BSS_INFO_EXT_BSS,</div><div class='add'>+	BSS_INFO_BMC_INFO, /* for bmc rate control in CR4 */</div><div class='add'>+	BSS_INFO_SYNC_MODE, /* obsoleted */</div><div class='add'>+	BSS_INFO_RA,</div><div class='add'>+	BSS_INFO_MAX_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WTBL_RESET_AND_SET = 1,</div><div class='add'>+	WTBL_SET,</div><div class='add'>+	WTBL_QUERY,</div><div class='add'>+	WTBL_RESET_ALL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wtbl_generic {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	u8 muar_idx;</div><div class='add'>+	u8 skip_tx;</div><div class='add'>+	u8 cf_ack;</div><div class='add'>+	u8 qos;</div><div class='add'>+	u8 mesh;</div><div class='add'>+	u8 adm;</div><div class='add'>+	__le16 partial_aid;</div><div class='add'>+	u8 baf_en;</div><div class='add'>+	u8 aad_om;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_rx {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 rcid;</div><div class='add'>+	u8 rca1;</div><div class='add'>+	u8 rca2;</div><div class='add'>+	u8 rv;</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_ht {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 ht;</div><div class='add'>+	u8 ldpc;</div><div class='add'>+	u8 af;</div><div class='add'>+	u8 mm;</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_vht {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 ldpc;</div><div class='add'>+	u8 dyn_bw;</div><div class='add'>+	u8 vht;</div><div class='add'>+	u8 txop_ps;</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_tx_ps {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 txps;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_hdr_trans {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 to_ds;</div><div class='add'>+	u8 from_ds;</div><div class='add'>+	u8 disable_rx_trans;</div><div class='add'>+	u8 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum mt7615_cipher_type {</div><div class='add'>+	MT_CIPHER_NONE,</div><div class='add'>+	MT_CIPHER_WEP40,</div><div class='add'>+	MT_CIPHER_TKIP,</div><div class='add'>+	MT_CIPHER_TKIP_NO_MIC,</div><div class='add'>+	MT_CIPHER_AES_CCMP,</div><div class='add'>+	MT_CIPHER_WEP104,</div><div class='add'>+	MT_CIPHER_BIP_CMAC_128,</div><div class='add'>+	MT_CIPHER_WEP128,</div><div class='add'>+	MT_CIPHER_WAPI,</div><div class='add'>+	MT_CIPHER_CCMP_256 = 10,</div><div class='add'>+	MT_CIPHER_GCMP,</div><div class='add'>+	MT_CIPHER_GCMP_256,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wtbl_sec_key {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 add; /* 0: add, 1: remove */</div><div class='add'>+	u8 rkv;</div><div class='add'>+	u8 ikv;</div><div class='add'>+	u8 cipher_id;</div><div class='add'>+	u8 key_id;</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+	u8 key_material[32];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT_BA_TYPE_INVALID,</div><div class='add'>+	MT_BA_TYPE_ORIGINATOR,</div><div class='add'>+	MT_BA_TYPE_RECIPIENT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RST_BA_MAC_TID_MATCH,</div><div class='add'>+	RST_BA_MAC_MATCH,</div><div class='add'>+	RST_BA_NO_MATCH</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wtbl_ba {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	/* common */</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 ba_type;</div><div class='add'>+	u8 rsv0[2];</div><div class='add'>+	/* originator only */</div><div class='add'>+	__le16 sn;</div><div class='add'>+	u8 ba_en;</div><div class='add'>+	u8 ba_winsize_idx;</div><div class='add'>+	__le16 ba_winsize;</div><div class='add'>+	/* recipient only */</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	u8 rst_ba_tid;</div><div class='add'>+	u8 rst_ba_sel;</div><div class='add'>+	u8 rst_ba_sb;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 rsv1[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_bf {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 ibf;</div><div class='add'>+	u8 ebf;</div><div class='add'>+	u8 ibf_vht;</div><div class='add'>+	u8 ebf_vht;</div><div class='add'>+	u8 gid;</div><div class='add'>+	u8 pfmu_idx;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_smps {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 smps;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_pn {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 pn[6];</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_spe {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 spe_idx;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wtbl_raw {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 wtbl_idx;</div><div class='add'>+	u8 dw;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+	__le32 msk;</div><div class='add'>+	__le32 val;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MT7615_WTBL_UPDATE_MAX_SIZE (sizeof(struct wtbl_generic) + \</div><div class='add'>+				     sizeof(struct wtbl_rx) + \</div><div class='add'>+				     sizeof(struct wtbl_ht) + \</div><div class='add'>+				     sizeof(struct wtbl_vht) + \</div><div class='add'>+				     sizeof(struct wtbl_tx_ps) + \</div><div class='add'>+				     sizeof(struct wtbl_hdr_trans) + \</div><div class='add'>+				     sizeof(struct wtbl_sec_key) + \</div><div class='add'>+				     sizeof(struct wtbl_ba) + \</div><div class='add'>+				     sizeof(struct wtbl_bf) + \</div><div class='add'>+				     sizeof(struct wtbl_smps) + \</div><div class='add'>+				     sizeof(struct wtbl_pn) + \</div><div class='add'>+				     sizeof(struct wtbl_spe))</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WTBL_GENERIC,</div><div class='add'>+	WTBL_RX,</div><div class='add'>+	WTBL_HT,</div><div class='add'>+	WTBL_VHT,</div><div class='add'>+	WTBL_PEER_PS, /* not used */</div><div class='add'>+	WTBL_TX_PS,</div><div class='add'>+	WTBL_HDR_TRANS,</div><div class='add'>+	WTBL_SEC_KEY,</div><div class='add'>+	WTBL_BA,</div><div class='add'>+	WTBL_RDG, /* obsoleted */</div><div class='add'>+	WTBL_PROTECT, /* not used */</div><div class='add'>+	WTBL_CLEAR, /* not used */</div><div class='add'>+	WTBL_BF,</div><div class='add'>+	WTBL_SMPS,</div><div class='add'>+	WTBL_RAW_DATA, /* debug only */</div><div class='add'>+	WTBL_PN,</div><div class='add'>+	WTBL_SPE,</div><div class='add'>+	WTBL_MAX_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sta_rec_basic {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 conn_type;</div><div class='add'>+	u8 conn_state;</div><div class='add'>+	u8 qos;</div><div class='add'>+	__le16 aid;</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+#define EXTRA_INFO_VER	BIT(0)</div><div class='add'>+#define EXTRA_INFO_NEW	BIT(1)</div><div class='add'>+	__le16 extra_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_ht {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 ht_cap;</div><div class='add'>+	u16 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_vht {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 vht_cap;</div><div class='add'>+	__le16 vht_rx_mcs_map;</div><div class='add'>+	__le16 vht_tx_mcs_map;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_ba {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 ba_type;</div><div class='add'>+	u8 amsdu;</div><div class='add'>+	u8 ba_en;</div><div class='add'>+	__le16 ssn;</div><div class='add'>+	__le16 winsize;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MT7615_STA_REC_UPDATE_MAX_SIZE (sizeof(struct sta_rec_basic) + \</div><div class='add'>+					sizeof(struct sta_rec_ht) + \</div><div class='add'>+					sizeof(struct sta_rec_vht))</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STA_REC_BASIC,</div><div class='add'>+	STA_REC_RA,</div><div class='add'>+	STA_REC_RA_CMM_INFO,</div><div class='add'>+	STA_REC_RA_UPDATE,</div><div class='add'>+	STA_REC_BF,</div><div class='add'>+	STA_REC_AMSDU, /* for CR4 */</div><div class='add'>+	STA_REC_BA,</div><div class='add'>+	STA_REC_RED, /* not used */</div><div class='add'>+	STA_REC_TX_PROC, /* for hdr trans and CSO in CR4 */</div><div class='add'>+	STA_REC_HT,</div><div class='add'>+	STA_REC_VHT,</div><div class='add'>+	STA_REC_APPS,</div><div class='add'>+	STA_REC_MAX_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CMD_CBW_20MHZ,</div><div class='add'>+	CMD_CBW_40MHZ,</div><div class='add'>+	CMD_CBW_80MHZ,</div><div class='add'>+	CMD_CBW_160MHZ,</div><div class='add'>+	CMD_CBW_10MHZ,</div><div class='add'>+	CMD_CBW_5MHZ,</div><div class='add'>+	CMD_CBW_8080MHZ</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CH_SWITCH_NORMAL = 0,</div><div class='add'>+	CH_SWITCH_SCAN = 3,</div><div class='add'>+	CH_SWITCH_MCC = 4,</div><div class='add'>+	CH_SWITCH_DFS = 5,</div><div class='add'>+	CH_SWITCH_BACKGROUND_SCAN_START = 6,</div><div class='add'>+	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,</div><div class='add'>+	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,</div><div class='add'>+	CH_SWITCH_SCAN_BYPASS_DPD = 9</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct sk_buff *</div><div class='add'>+mt7615_mcu_msg_alloc(const void *data, int len)</div><div class='add'>+{</div><div class='add'>+	return mt76_mcu_msg_alloc(data, sizeof(struct mt7615_mcu_txd),</div><div class='add'>+				  len, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h<br/>new file mode 100644<br/>index 000000000000..895c2904d7eb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7615_H</div><div class='add'>+#define __MT7615_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='add'>+#include "../mt76.h"</div><div class='add'>+#include "regs.h"</div><div class='add'>+</div><div class='add'>+#define MT7615_MAX_INTERFACES		4</div><div class='add'>+#define MT7615_WTBL_SIZE		128</div><div class='add'>+#define MT7615_WTBL_RESERVED		(MT7615_WTBL_SIZE - 1)</div><div class='add'>+#define MT7615_WTBL_STA			(MT7615_WTBL_RESERVED - \</div><div class='add'>+					 MT7615_MAX_INTERFACES)</div><div class='add'>+</div><div class='add'>+#define MT7615_WATCHDOG_TIME		100 /* ms */</div><div class='add'>+#define MT7615_RATE_RETRY		2</div><div class='add'>+</div><div class='add'>+#define MT7615_TX_RING_SIZE		1024</div><div class='add'>+#define MT7615_TX_MCU_RING_SIZE		128</div><div class='add'>+#define MT7615_TX_FWDL_RING_SIZE	128</div><div class='add'>+</div><div class='add'>+#define MT7615_RX_RING_SIZE		1024</div><div class='add'>+#define MT7615_RX_MCU_RING_SIZE		512</div><div class='add'>+</div><div class='add'>+#define MT7615_FIRMWARE_CR4		"mt7615_cr4.bin"</div><div class='add'>+#define MT7615_FIRMWARE_N9		"mt7615_n9.bin"</div><div class='add'>+#define MT7615_ROM_PATCH		"mt7615_rom_patch.bin"</div><div class='add'>+</div><div class='add'>+#define MT7615_EEPROM_SIZE		1024</div><div class='add'>+#define MT7615_TOKEN_SIZE		4096</div><div class='add'>+</div><div class='add'>+struct mt7615_vif;</div><div class='add'>+struct mt7615_sta;</div><div class='add'>+</div><div class='add'>+enum mt7615_hw_txq_id {</div><div class='add'>+	MT7615_TXQ_MAIN,</div><div class='add'>+	MT7615_TXQ_EXT,</div><div class='add'>+	MT7615_TXQ_MCU,</div><div class='add'>+	MT7615_TXQ_FWDL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7615_sta {</div><div class='add'>+	struct mt76_wcid wcid; /* must be first */</div><div class='add'>+</div><div class='add'>+	struct mt7615_vif *vif;</div><div class='add'>+</div><div class='add'>+	struct ieee80211_tx_rate rates[8];</div><div class='add'>+	u8 rate_count;</div><div class='add'>+	u8 n_rates;</div><div class='add'>+</div><div class='add'>+	u8 rate_probe;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7615_vif {</div><div class='add'>+	u8 idx;</div><div class='add'>+	u8 omac_idx;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 wmm_idx;</div><div class='add'>+</div><div class='add'>+	struct mt7615_sta sta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7615_dev {</div><div class='add'>+	struct mt76_dev mt76; /* must be first */</div><div class='add'>+	u32 vif_mask;</div><div class='add'>+	u32 omac_mask;</div><div class='add'>+</div><div class='add'>+	spinlock_t token_lock;</div><div class='add'>+	struct idr token;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	HW_BSSID_0 = 0x0,</div><div class='add'>+	HW_BSSID_1,</div><div class='add'>+	HW_BSSID_2,</div><div class='add'>+	HW_BSSID_3,</div><div class='add'>+	HW_BSSID_MAX,</div><div class='add'>+	EXT_BSSID_START = 0x10,</div><div class='add'>+	EXT_BSSID_1,</div><div class='add'>+	EXT_BSSID_2,</div><div class='add'>+	EXT_BSSID_3,</div><div class='add'>+	EXT_BSSID_4,</div><div class='add'>+	EXT_BSSID_5,</div><div class='add'>+	EXT_BSSID_6,</div><div class='add'>+	EXT_BSSID_7,</div><div class='add'>+	EXT_BSSID_8,</div><div class='add'>+	EXT_BSSID_9,</div><div class='add'>+	EXT_BSSID_10,</div><div class='add'>+	EXT_BSSID_11,</div><div class='add'>+	EXT_BSSID_12,</div><div class='add'>+	EXT_BSSID_13,</div><div class='add'>+	EXT_BSSID_14,</div><div class='add'>+	EXT_BSSID_15,</div><div class='add'>+	EXT_BSSID_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct ieee80211_ops mt7615_ops;</div><div class='add'>+extern struct pci_driver mt7615_pci_driver;</div><div class='add'>+</div><div class='add'>+u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);</div><div class='add'>+</div><div class='add'>+int mt7615_register_device(struct mt7615_dev *dev);</div><div class='add'>+void mt7615_unregister_device(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_eeprom_init(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_dma_init(struct mt7615_dev *dev);</div><div class='add'>+void mt7615_dma_cleanup(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_mcu_init(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_mcu_set_dev_info(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    int en);</div><div class='add'>+int mt7615_mcu_set_bss_info(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    int en);</div><div class='add'>+int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid,</div><div class='add'>+			    struct ieee80211_key_conf *key,</div><div class='add'>+			    enum set_key_cmd cmd);</div><div class='add'>+void mt7615_mcu_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta,</div><div class='add'>+			  struct ieee80211_tx_rate *probe_rate,</div><div class='add'>+			  struct ieee80211_tx_rate *rates);</div><div class='add'>+int mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif);</div><div class='add'>+int mt7615_mcu_del_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif);</div><div class='add'>+int mt7615_mcu_add_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta);</div><div class='add'>+int mt7615_mcu_del_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta);</div><div class='add'>+int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_mcu_set_sta_rec_bmc(struct mt7615_dev *dev,</div><div class='add'>+			       struct ieee80211_vif *vif, bool en);</div><div class='add'>+int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta, bool en);</div><div class='add'>+int mt7615_mcu_set_bcn(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       int en);</div><div class='add'>+int mt7615_mcu_set_channel(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,</div><div class='add'>+		       const struct ieee80211_tx_queue_params *params);</div><div class='add'>+int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool add);</div><div class='add'>+int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool add);</div><div class='add'>+int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta);</div><div class='add'>+</div><div class='add'>+static inline void mt7615_irq_enable(struct mt7615_dev *dev, u32 mask)</div><div class='add'>+{</div><div class='add'>+	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, 0, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt7615_irq_disable(struct mt7615_dev *dev, u32 mask)</div><div class='add'>+{</div><div class='add'>+	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, mask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 mt7615_mac_tx_rate_val(struct mt7615_dev *dev,</div><div class='add'>+			   const struct ieee80211_tx_rate *rate,</div><div class='add'>+			   bool stbc, u8 *bw);</div><div class='add'>+int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='add'>+			  struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+			  struct ieee80211_sta *sta, int pid,</div><div class='add'>+			  struct ieee80211_key_conf *key);</div><div class='add'>+int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb);</div><div class='add'>+void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data);</div><div class='add'>+void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+int mt7615_mcu_set_eeprom(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_mcu_init_mac(struct mt7615_dev *dev);</div><div class='add'>+int mt7615_mcu_set_rts_thresh(struct mt7615_dev *dev, u32 val);</div><div class='add'>+int mt7615_mcu_ctrl_pm_state(struct mt7615_dev *dev, int enter);</div><div class='add'>+void mt7615_mcu_exit(struct mt7615_dev *dev);</div><div class='add'>+</div><div class='add'>+int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct mt76_tx_info *tx_info);</div><div class='add'>+</div><div class='add'>+void mt7615_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			    struct mt76_queue_entry *e);</div><div class='add'>+</div><div class='add'>+void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='add'>+			 struct sk_buff *skb);</div><div class='add'>+void mt7615_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);</div><div class='add'>+void mt7615_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);</div><div class='add'>+int mt7615_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		   struct ieee80211_sta *sta);</div><div class='add'>+void mt7615_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_sta *sta);</div><div class='add'>+void mt7615_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta);</div><div class='add'>+void mt7615_mac_work(struct work_struct *work);</div><div class='add'>+void mt7615_txp_skb_unmap(struct mt76_dev *dev,</div><div class='add'>+			  struct mt76_txwi_cache *txwi);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c<br/>new file mode 100644<br/>index 000000000000..11122bd2d727<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/pci.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *         Felix Fietkau &lt;nbd@nbd.name&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/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7615.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id mt7615_pci_device_table[] = {</div><div class='add'>+	{ PCI_DEVICE(0x14c3, 0x7615) },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u32 base = addr &amp; MT_MCU_PCIE_REMAP_2_BASE;</div><div class='add'>+	u32 offset = addr &amp; MT_MCU_PCIE_REMAP_2_OFFSET;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_MCU_PCIE_REMAP_2, base);</div><div class='add'>+</div><div class='add'>+	return MT_PCIE_REMAP_BASE_2 + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7615_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt7615_irq_enable(dev, MT_INT_RX_DONE(q));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t mt7615_irq_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = dev_instance;</div><div class='add'>+	u32 intr;</div><div class='add'>+</div><div class='add'>+	intr = mt76_rr(dev, MT_INT_SOURCE_CSR);</div><div class='add'>+	mt76_wr(dev, MT_INT_SOURCE_CSR, intr);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mt76.state))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	intr &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_TX_DONE_ALL) {</div><div class='add'>+		mt7615_irq_disable(dev, MT_INT_TX_DONE_ALL);</div><div class='add'>+		tasklet_schedule(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX_DONE(0)) {</div><div class='add'>+		mt7615_irq_disable(dev, MT_INT_RX_DONE(0));</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX_DONE(1)) {</div><div class='add'>+		mt7615_irq_disable(dev, MT_INT_RX_DONE(1));</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[1]);</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 mt7615_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			    const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_driver_ops drv_ops = {</div><div class='add'>+		/* txwi_size = txd size + txp size */</div><div class='add'>+		.txwi_size = MT_TXD_SIZE + sizeof(struct mt7615_txp),</div><div class='add'>+		.txwi_flags = MT_TXWI_NO_FREE,</div><div class='add'>+		.tx_prepare_skb = mt7615_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt7615_tx_complete_skb,</div><div class='add'>+		.rx_skb = mt7615_queue_rx_skb,</div><div class='add'>+		.rx_poll_complete = mt7615_rx_poll_complete,</div><div class='add'>+		.sta_ps = mt7615_sta_ps,</div><div class='add'>+		.sta_add = mt7615_sta_add,</div><div class='add'>+		.sta_assoc = mt7615_sta_assoc,</div><div class='add'>+		.sta_remove = mt7615_sta_remove,</div><div class='add'>+	};</div><div class='add'>+	struct mt7615_dev *dev;</div><div class='add'>+	struct mt76_dev *mdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pcim_enable_device(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), &amp;mt7615_ops,</div><div class='add'>+				 &amp;drv_ops);</div><div class='add'>+	if (!mdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+	mt76_mmio_init(&amp;dev-&gt;mt76, pcim_iomap_table(pdev)[0]);</div><div class='add'>+</div><div class='add'>+	mdev-&gt;rev = (mt76_rr(dev, MT_HW_CHIPID) &lt;&lt; 16) |</div><div class='add'>+		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='add'>+	dev_dbg(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(mdev-&gt;dev, pdev-&gt;irq, mt7615_irq_handler,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_register_device(dev);</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'>+	ieee80211_free_hw(mt76_hw(dev));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt7615_unregister_device(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pci_driver mt7615_pci_driver = {</div><div class='add'>+	.name		= KBUILD_MODNAME,</div><div class='add'>+	.id_table	= mt7615_pci_device_table,</div><div class='add'>+	.probe		= mt7615_pci_probe,</div><div class='add'>+	.remove		= mt7615_pci_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(mt7615_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, mt7615_pci_device_table);</div><div class='add'>+MODULE_FIRMWARE(MT7615_FIRMWARE_CR4);</div><div class='add'>+MODULE_FIRMWARE(MT7615_FIRMWARE_N9);</div><div class='add'>+MODULE_FIRMWARE(MT7615_ROM_PATCH);</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h<br/>new file mode 100644<br/>index 000000000000..70e5ace33cc3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt7615/regs.h</a></div><div class='hunk'>@@ -0,0 +1,203 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* Copyright (C) 2019 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7615_REGS_H</div><div class='add'>+#define __MT7615_REGS_H</div><div class='add'>+</div><div class='add'>+#define MT_HW_REV			0x1000</div><div class='add'>+#define MT_HW_CHIPID			0x1008</div><div class='add'>+#define MT_TOP_MISC2			0x1134</div><div class='add'>+#define MT_TOP_MISC2_FW_STATE		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MCU_BASE			0x2000</div><div class='add'>+#define MT_MCU(ofs)			(MT_MCU_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_MCU_PCIE_REMAP_1		MT_MCU(0x500)</div><div class='add'>+#define MT_MCU_PCIE_REMAP_1_OFFSET	GENMASK(17, 0)</div><div class='add'>+#define MT_MCU_PCIE_REMAP_1_BASE	GENMASK(31, 18)</div><div class='add'>+#define MT_PCIE_REMAP_BASE_1		0x40000</div><div class='add'>+</div><div class='add'>+#define MT_MCU_PCIE_REMAP_2		MT_MCU(0x504)</div><div class='add'>+#define MT_MCU_PCIE_REMAP_2_OFFSET	GENMASK(18, 0)</div><div class='add'>+#define MT_MCU_PCIE_REMAP_2_BASE	GENMASK(31, 19)</div><div class='add'>+#define MT_PCIE_REMAP_BASE_2		0x80000</div><div class='add'>+</div><div class='add'>+#define MT_HIF_BASE			0x4000</div><div class='add'>+#define MT_HIF(ofs)			(MT_HIF_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_CFG_LPCR_HOST		MT_HIF(0x1f0)</div><div class='add'>+#define MT_CFG_LPCR_HOST_FW_OWN		BIT(0)</div><div class='add'>+#define MT_CFG_LPCR_HOST_DRV_OWN	BIT(1)</div><div class='add'>+</div><div class='add'>+#define MT_INT_SOURCE_CSR		MT_HIF(0x200)</div><div class='add'>+#define MT_INT_MASK_CSR			MT_HIF(0x204)</div><div class='add'>+#define MT_DELAY_INT_CFG		MT_HIF(0x210)</div><div class='add'>+</div><div class='add'>+#define MT_INT_RX_DONE(_n)		BIT(_n)</div><div class='add'>+#define MT_INT_RX_DONE_ALL		GENMASK(1, 0)</div><div class='add'>+#define MT_INT_TX_DONE_ALL		GENMASK(7, 4)</div><div class='add'>+#define MT_INT_TX_DONE(_n)		BIT((_n) + 4)</div><div class='add'>+</div><div class='add'>+#define MT_WPDMA_GLO_CFG		MT_HIF(0x208)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_TX_DMA_EN	BIT(0)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_TX_DMA_BUSY	BIT(1)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_RX_DMA_EN	BIT(2)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_RX_DMA_BUSY	BIT(3)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_DMA_BURST_SIZE	GENMASK(5, 4)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE	BIT(6)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_BIG_ENDIAN	BIT(7)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT0	BIT(9)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_MULTI_DMA_EN	GENMASK(11, 10)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_FIFO_LITTLE_ENDIAN	BIT(12)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT21	GENMASK(23, 22)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_SW_RESET	BIT(24)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_FIRST_TOKEN_ONLY	BIT(26)</div><div class='add'>+#define MT_WPDMA_GLO_CFG_OMIT_TX_INFO	BIT(28)</div><div class='add'>+</div><div class='add'>+#define MT_WPDMA_RST_IDX		MT_HIF(0x20c)</div><div class='add'>+</div><div class='add'>+#define MT_TX_RING_BASE			MT_HIF(0x300)</div><div class='add'>+#define MT_RX_RING_BASE			MT_HIF(0x400)</div><div class='add'>+</div><div class='add'>+#define MT_WPDMA_GLO_CFG1		MT_HIF(0x500)</div><div class='add'>+#define MT_WPDMA_TX_PRE_CFG		MT_HIF(0x510)</div><div class='add'>+#define MT_WPDMA_RX_PRE_CFG		MT_HIF(0x520)</div><div class='add'>+#define MT_WPDMA_ABT_CFG		MT_HIF(0x530)</div><div class='add'>+#define MT_WPDMA_ABT_CFG1		MT_HIF(0x534)</div><div class='add'>+</div><div class='add'>+#define MT_WF_PHY_BASE			0x10000</div><div class='add'>+#define MT_WF_PHY(ofs)			(MT_WF_PHY_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_WF_PHY_WF2_RFCTRL0		MT_WF_PHY(0x1900)</div><div class='add'>+#define MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN	BIT(9)</div><div class='add'>+</div><div class='add'>+#define MT_WF_CFG_BASE			0x20200</div><div class='add'>+#define MT_WF_CFG(ofs)			(MT_WF_CFG_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_CFG_CCR			MT_WF_CFG(0x000)</div><div class='add'>+#define MT_CFG_CCR_MAC_D1_1X_GC_EN	BIT(24)</div><div class='add'>+#define MT_CFG_CCR_MAC_D0_1X_GC_EN	BIT(25)</div><div class='add'>+#define MT_CFG_CCR_MAC_D1_2X_GC_EN	BIT(30)</div><div class='add'>+#define MT_CFG_CCR_MAC_D0_2X_GC_EN	BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT_WF_AGG_BASE			0x20a00</div><div class='add'>+#define MT_WF_AGG(ofs)			(MT_WF_AGG_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_AGG_ARCR			MT_WF_AGG(0x010)</div><div class='add'>+#define MT_AGG_ARCR_INIT_RATE1		BIT(0)</div><div class='add'>+#define MT_AGG_ARCR_RTS_RATE_THR	GENMASK(12, 8)</div><div class='add'>+#define MT_AGG_ARCR_RATE_DOWN_RATIO	GENMASK(17, 16)</div><div class='add'>+#define MT_AGG_ARCR_RATE_DOWN_RATIO_EN	BIT(19)</div><div class='add'>+#define MT_AGG_ARCR_RATE_UP_EXTRA_TH	GENMASK(22, 20)</div><div class='add'>+</div><div class='add'>+#define MT_AGG_ARUCR			MT_WF_AGG(0x018)</div><div class='add'>+#define MT_AGG_ARDCR			MT_WF_AGG(0x01c)</div><div class='add'>+#define MT_AGG_ARxCR_LIMIT_SHIFT(_n)	(4 * (_n))</div><div class='add'>+#define MT_AGG_ARxCR_LIMIT(_n)		GENMASK(2 + \</div><div class='add'>+					MT_AGG_ARxCR_LIMIT_SHIFT(_n), \</div><div class='add'>+					MT_AGG_ARxCR_LIMIT_SHIFT(_n))</div><div class='add'>+</div><div class='add'>+#define MT_AGG_SCR			MT_WF_AGG(0x0fc)</div><div class='add'>+#define MT_AGG_SCR_NLNAV_MID_PTEC_DIS	BIT(3)</div><div class='add'>+</div><div class='add'>+#define MT_WF_TMAC_BASE			0x21000</div><div class='add'>+#define MT_WF_TMAC(ofs)			(MT_WF_TMAC_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_TMAC_CTCR0			MT_WF_TMAC(0x0f4)</div><div class='add'>+#define MT_TMAC_CTCR0_INS_DDLMT_REFTIME	GENMASK(5, 0)</div><div class='add'>+#define MT_TMAC_CTCR0_INS_DDLMT_DENSITY	GENMASK(15, 12)</div><div class='add'>+#define MT_TMAC_CTCR0_INS_DDLMT_EN	BIT(17)</div><div class='add'>+#define MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN	BIT(18)</div><div class='add'>+</div><div class='add'>+#define MT_WF_RMAC_BASE			0x21200</div><div class='add'>+#define MT_WF_RMAC(ofs)			(MT_WF_RMAC_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_WF_RFCR			MT_WF_RMAC(0x000)</div><div class='add'>+#define MT_WF_RFCR_DROP_STBC_MULTI	BIT(0)</div><div class='add'>+#define MT_WF_RFCR_DROP_FCSFAIL		BIT(1)</div><div class='add'>+#define MT_WF_RFCR_DROP_VERSION		BIT(3)</div><div class='add'>+#define MT_WF_RFCR_DROP_PROBEREQ	BIT(4)</div><div class='add'>+#define MT_WF_RFCR_DROP_MCAST		BIT(5)</div><div class='add'>+#define MT_WF_RFCR_DROP_BCAST		BIT(6)</div><div class='add'>+#define MT_WF_RFCR_DROP_MCAST_FILTERED	BIT(7)</div><div class='add'>+#define MT_WF_RFCR_DROP_A3_MAC		BIT(8)</div><div class='add'>+#define MT_WF_RFCR_DROP_A3_BSSID	BIT(9)</div><div class='add'>+#define MT_WF_RFCR_DROP_A2_BSSID	BIT(10)</div><div class='add'>+#define MT_WF_RFCR_DROP_OTHER_BEACON	BIT(11)</div><div class='add'>+#define MT_WF_RFCR_DROP_FRAME_REPORT	BIT(12)</div><div class='add'>+#define MT_WF_RFCR_DROP_CTL_RSV		BIT(13)</div><div class='add'>+#define MT_WF_RFCR_DROP_CTS		BIT(14)</div><div class='add'>+#define MT_WF_RFCR_DROP_RTS		BIT(15)</div><div class='add'>+#define MT_WF_RFCR_DROP_DUPLICATE	BIT(16)</div><div class='add'>+#define MT_WF_RFCR_DROP_OTHER_BSS	BIT(17)</div><div class='add'>+#define MT_WF_RFCR_DROP_OTHER_UC	BIT(18)</div><div class='add'>+#define MT_WF_RFCR_DROP_OTHER_TIM	BIT(19)</div><div class='add'>+#define MT_WF_RFCR_DROP_NDPA		BIT(20)</div><div class='add'>+#define MT_WF_RFCR_DROP_UNWANTED_CTL	BIT(21)</div><div class='add'>+</div><div class='add'>+#define MT_WF_DMA_BASE			0x21800</div><div class='add'>+#define MT_WF_DMA(ofs)			(MT_WF_DMA_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_DMA_DCR0			MT_WF_DMA(0x000)</div><div class='add'>+#define MT_DMA_DCR0_MAX_RX_LEN		GENMASK(15, 2)</div><div class='add'>+#define MT_DMA_DCR0_RX_VEC_DROP		BIT(17)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_BASE			0x30000</div><div class='add'>+#define MT_WTBL_ENTRY_SIZE		256</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_OFF_BASE		0x23400</div><div class='add'>+#define MT_WTBL_OFF(n)			(MT_WTBL_OFF_BASE + (n))</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_UPDATE			MT_WTBL_OFF(0x030)</div><div class='add'>+#define MT_WTBL_UPDATE_WLAN_IDX		GENMASK(7, 0)</div><div class='add'>+#define MT_WTBL_UPDATE_RATE_UPDATE	BIT(13)</div><div class='add'>+#define MT_WTBL_UPDATE_TX_COUNT_CLEAR	BIT(14)</div><div class='add'>+#define MT_WTBL_UPDATE_BUSY		BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_ON_BASE			0x23000</div><div class='add'>+#define MT_WTBL_ON(_n)			(MT_WTBL_ON_BASE + (_n))</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_RIUCR0			MT_WTBL_ON(0x020)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_RIUCR1			MT_WTBL_ON(0x024)</div><div class='add'>+#define MT_WTBL_RIUCR1_RATE0		GENMASK(11, 0)</div><div class='add'>+#define MT_WTBL_RIUCR1_RATE1		GENMASK(23, 12)</div><div class='add'>+#define MT_WTBL_RIUCR1_RATE2_LO		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_RIUCR2			MT_WTBL_ON(0x028)</div><div class='add'>+#define MT_WTBL_RIUCR2_RATE2_HI		GENMASK(3, 0)</div><div class='add'>+#define MT_WTBL_RIUCR2_RATE3		GENMASK(15, 4)</div><div class='add'>+#define MT_WTBL_RIUCR2_RATE4		GENMASK(27, 16)</div><div class='add'>+#define MT_WTBL_RIUCR2_RATE5_LO		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_RIUCR3			MT_WTBL_ON(0x02c)</div><div class='add'>+#define MT_WTBL_RIUCR3_RATE5_HI		GENMASK(7, 0)</div><div class='add'>+#define MT_WTBL_RIUCR3_RATE6		GENMASK(19, 8)</div><div class='add'>+#define MT_WTBL_RIUCR3_RATE7		GENMASK(31, 20)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_W5_CHANGE_BW_RATE	GENMASK(7, 5)</div><div class='add'>+#define MT_WTBL_W5_SHORT_GI_20		BIT(8)</div><div class='add'>+#define MT_WTBL_W5_SHORT_GI_40		BIT(9)</div><div class='add'>+#define MT_WTBL_W5_SHORT_GI_80		BIT(10)</div><div class='add'>+#define MT_WTBL_W5_SHORT_GI_160		BIT(11)</div><div class='add'>+#define MT_WTBL_W5_BW_CAP		GENMASK(13, 12)</div><div class='add'>+#define MT_WTBL_W27_CC_BW_SEL		GENMASK(6, 5)</div><div class='add'>+</div><div class='add'>+#define MT_EFUSE_BASE			0x81070000</div><div class='add'>+#define MT_EFUSE_BASE_CTRL		0x000</div><div class='add'>+#define MT_EFUSE_BASE_CTRL_EMPTY	BIT(30)</div><div class='add'>+</div><div class='add'>+#define MT_EFUSE_CTRL			0x008</div><div class='add'>+#define MT_EFUSE_CTRL_AOUT		GENMASK(5, 0)</div><div class='add'>+#define MT_EFUSE_CTRL_MODE		GENMASK(7, 6)</div><div class='add'>+#define MT_EFUSE_CTRL_LDO_OFF_TIME	GENMASK(13, 8)</div><div class='add'>+#define MT_EFUSE_CTRL_LDO_ON_TIME	GENMASK(15, 14)</div><div class='add'>+#define MT_EFUSE_CTRL_AIN		GENMASK(25, 16)</div><div class='add'>+#define MT_EFUSE_CTRL_VALID		BIT(29)</div><div class='add'>+#define MT_EFUSE_CTRL_KICK		BIT(30)</div><div class='add'>+#define MT_EFUSE_CTRL_SEL		BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT_EFUSE_WDATA(_i)		(0x010 + ((_i) * 4))</div><div class='add'>+#define MT_EFUSE_RDATA(_i)		(0x030 + ((_i) * 4))</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c<br/>index bcb72e019fd2..57e46d57b449 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x0/init.c</a></div><div class='hunk'>@@ -259,7 +259,6 @@ int mt76x0_init_hardware(struct mt76x02_dev *dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mt76x0_phy_init(dev);</div><div class='del'>-	mt76x02_init_beacon_config(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -281,6 +280,7 @@ mt76x0_init_txpower(struct mt76x02_dev *dev,</div><div class='ctx'> 		mt76x0_get_power_info(dev, chan, &amp;tp);</div><div class='ctx'> </div><div class='ctx'> 		chan-&gt;max_power = (mt76x02_get_max_rate_power(&amp;t) + tp) / 2;</div><div class='add'>+		chan-&gt;orig_mpwr = chan-&gt;max_power;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h<br/>index 0290ba5869a5..736f81752b5b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h</a></div><div class='hunk'>@@ -46,7 +46,7 @@ static const struct mt76_reg_pair common_mac_reg_table[] = {</div><div class='ctx'> 	{ MT_MM20_PROT_CFG,		0x01742004 },</div><div class='ctx'> 	{ MT_MM40_PROT_CFG,		0x03f42084 },</div><div class='ctx'> 	{ MT_TXOP_CTRL_CFG,		0x0000583f },</div><div class='del'>-	{ MT_TX_RTS_CFG,		0x00092b20 },</div><div class='add'>+	{ MT_TX_RTS_CFG,		0x00ffff20 },</div><div class='ctx'> 	{ MT_EXP_ACK_TIME,		0x002400ca },</div><div class='ctx'> 	{ MT_TXOP_HLDR_ET,		0x00000002 },</div><div class='ctx'> 	{ MT_XIFS_TIME_CFG,		0x33a41010 },</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c<br/>index fee16ab21edb..691984037f98 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x0/main.c</a></div><div class='hunk'>@@ -22,10 +22,9 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='del'>-	if (mt76_is_mmio(dev)) {</div><div class='del'>-		tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	dev-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, false);</div><div class='add'>+	if (mt76_is_mmio(dev))</div><div class='ctx'> 		tasklet_disable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_set_channel(&amp;dev-&gt;mt76);</div><div class='ctx'> 	ret = mt76x0_phy_set_channel(dev, chandef);</div><div class='hunk'>@@ -38,9 +37,10 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='ctx'> </div><div class='ctx'> 	if (mt76_is_mmio(dev)) {</div><div class='ctx'> 		mt76x02_dfs_init_params(dev);</div><div class='del'>-		tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='ctx'> 		tasklet_enable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='ctx'> 	}</div><div class='add'>+	dev-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, true);</div><div class='add'>+</div><div class='ctx'> 	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c<br/>index f302162036d0..4585e1b756c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.c</a></div><div class='hunk'>@@ -25,25 +25,21 @@ static int mt76x0e_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	mt76x02_mac_start(dev);</div><div class='ctx'> 	mt76x0_phy_calibrate(dev, true);</div><div class='del'>-	ieee80211_queue_delayed_work(dev-&gt;mt76.hw, &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(dev-&gt;mt76.hw, &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     MT_MAC_WORK_INTERVAL);</div><div class='ctx'> 	ieee80211_queue_delayed_work(dev-&gt;mt76.hw, &amp;dev-&gt;cal_work,</div><div class='ctx'> 				     MT_CALIBRATE_INTERVAL);</div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76x0e_stop_hw(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mac_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='ctx'> </div><div class='ctx'> 	if (!mt76_poll(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_TX_DMA_BUSY,</div><div class='ctx'> 		       0, 1000))</div><div class='hunk'>@@ -62,10 +58,8 @@ static void mt76x0e_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> 	mt76x0e_stop_hw(dev);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -74,13 +68,6 @@ mt76x0e_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt76x0e_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,</div><div class='del'>-		bool set)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ieee80211_ops mt76x0e_ops = {</div><div class='ctx'> 	.tx = mt76x02_tx,</div><div class='ctx'> 	.start = mt76x0e_start,</div><div class='hunk'>@@ -101,7 +88,7 @@ static const struct ieee80211_ops mt76x0e_ops = {</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='ctx'> 	.get_txpower = mt76_get_txpower,</div><div class='ctx'> 	.flush = mt76x0e_flush,</div><div class='del'>-	.set_tim = mt76x0e_set_tim,</div><div class='add'>+	.set_tim = mt76_set_tim,</div><div class='ctx'> 	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> 	.set_coverage_class = mt76x02_set_coverage_class,</div><div class='ctx'> 	.set_rts_threshold = mt76x02_set_rts_threshold,</div><div class='hunk'>@@ -128,6 +115,8 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	mt76x02e_init_beacon_config(dev);</div><div class='add'>+</div><div class='ctx'> 	if (mt76_chip(&amp;dev-&gt;mt76) == 0x7610) {</div><div class='ctx'> 		u16 val;</div><div class='ctx'> </div><div class='hunk'>@@ -164,6 +153,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='ctx'> 		.txwi_size = sizeof(struct mt76x02_txwi),</div><div class='add'>+		.tx_aligned4_skbs = true,</div><div class='ctx'> 		.update_survey = mt76x02_update_channel,</div><div class='ctx'> 		.tx_prepare_skb = mt76x02_tx_prepare_skb,</div><div class='ctx'> 		.tx_complete_skb = mt76x02_tx_complete_skb,</div><div class='hunk'>@@ -223,7 +213,7 @@ error:</div><div class='ctx'> static void mt76x0e_cleanup(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	clear_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mt76.state);</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	mt76x0_chip_onoff(dev, false, false);</div><div class='ctx'> 	mt76x0e_stop_hw(dev);</div><div class='ctx'> 	mt76x02_dma_cleanup(dev);</div><div class='hunk'>@@ -238,7 +228,7 @@ mt76x0e_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mt76_unregister_device(mdev);</div><div class='ctx'> 	mt76x0e_cleanup(dev);</div><div class='del'>-	ieee80211_free_hw(mdev-&gt;hw);</div><div class='add'>+	mt76_free_device(mdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id mt76x0e_device_table[] = {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c<br/>index 91718647da02..7c38ec4418db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.c</a></div><div class='hunk'>@@ -81,20 +81,19 @@ static void mt76x0u_cleanup(struct mt76x02_dev *dev)</div><div class='ctx'> 	mt76u_queues_deinit(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76x0u_mac_stop(struct mt76x02_dev *dev)</div><div class='add'>+static void mt76x0u_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='add'>+	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mac_work);</div><div class='del'>-	mt76u_stop_stat_wk(&amp;dev-&gt;mt76);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='add'>+	mt76u_stop_tx(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76x02u_exit_beacon_config(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(MT76_REMOVED, &amp;dev-&gt;mt76.state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mt76_clear(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_TIMER_EN |</div><div class='del'>-		   MT_BEACON_TIME_CFG_SYNC_MODE | MT_BEACON_TIME_CFG_TBTT_EN |</div><div class='del'>-		   MT_BEACON_TIME_CFG_BEACON_TX);</div><div class='del'>-</div><div class='ctx'> 	if (!mt76_poll(dev, MT_USB_DMA_CFG, MT_USB_DMA_CFG_TX_BUSY, 0, 1000))</div><div class='ctx'> 		dev_warn(dev-&gt;mt76.dev, "TX DMA did not stop\n");</div><div class='ctx'> </div><div class='hunk'>@@ -109,31 +108,17 @@ static int mt76x0u_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	ret = mt76x0_mac_start(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mt76x0_phy_calibrate(dev, true);</div><div class='del'>-	ieee80211_queue_delayed_work(dev-&gt;mt76.hw, &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(dev-&gt;mt76.hw, &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     MT_MAC_WORK_INTERVAL);</div><div class='ctx'> 	ieee80211_queue_delayed_work(dev-&gt;mt76.hw, &amp;dev-&gt;cal_work,</div><div class='ctx'> 				     MT_CALIBRATE_INTERVAL);</div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt76x0u_stop(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	mt76x0u_mac_stop(dev);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops mt76x0u_ops = {</div><div class='hunk'>@@ -155,6 +140,8 @@ static const struct ieee80211_ops mt76x0u_ops = {</div><div class='ctx'> 	.set_rts_threshold = mt76x02_set_rts_threshold,</div><div class='ctx'> 	.wake_tx_queue = mt76_wake_tx_queue,</div><div class='ctx'> 	.get_txpower = mt76_get_txpower,</div><div class='add'>+	.set_tim = mt76_set_tim,</div><div class='add'>+	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mt76x0u_init_hardware(struct mt76x02_dev *dev)</div><div class='hunk'>@@ -175,6 +162,8 @@ static int mt76x0u_init_hardware(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	mt76x02u_init_beacon_config(dev);</div><div class='add'>+</div><div class='ctx'> 	mt76_rmw(dev, MT_US_CYC_CFG, MT_US_CYC_CNT, 0x1e);</div><div class='ctx'> 	mt76_wr(dev, MT_TXOP_CTRL_CFG,</div><div class='ctx'> 		FIELD_PREP(MT_TXOP_TRUN_EN, 0x3f) |</div><div class='hunk'>@@ -223,16 +212,17 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 		.tx_complete_skb = mt76x02u_tx_complete_skb,</div><div class='ctx'> 		.tx_status_data = mt76x02_tx_status_data,</div><div class='ctx'> 		.rx_skb = mt76x02_queue_rx_skb,</div><div class='add'>+		.sta_ps = mt76x02_sta_ps,</div><div class='ctx'> 		.sta_add = mt76x02_sta_add,</div><div class='ctx'> 		.sta_remove = mt76x02_sta_remove,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct usb_device *usb_dev = interface_to_usbdev(usb_intf);</div><div class='ctx'> 	struct mt76x02_dev *dev;</div><div class='ctx'> 	struct mt76_dev *mdev;</div><div class='del'>-	u32 asic_rev, mac_rev;</div><div class='add'>+	u32 mac_rev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mdev = mt76_alloc_device(&amp;usb_intf-&gt;dev, sizeof(*dev), &amp;mt76x0u_ops,</div><div class='add'>+	mdev = mt76_alloc_device(&amp;usb_dev-&gt;dev, sizeof(*dev), &amp;mt76x0u_ops,</div><div class='ctx'> 				 &amp;drv_ops);</div><div class='ctx'> 	if (!mdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -262,10 +252,14 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	asic_rev = mt76_rr(dev, MT_ASIC_VERSION);</div><div class='add'>+	mdev-&gt;rev = mt76_rr(dev, MT_ASIC_VERSION);</div><div class='ctx'> 	mac_rev = mt76_rr(dev, MT_MAC_CSR0);</div><div class='ctx'> 	dev_info(mdev-&gt;dev, "ASIC revision: %08x MAC revision: %08x\n",</div><div class='del'>-		 asic_rev, mac_rev);</div><div class='add'>+		 mdev-&gt;rev, mac_rev);</div><div class='add'>+	if (!is_mt76x0(dev)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Note: vendor driver skips this check for MT76X0U */</div><div class='ctx'> 	if (!(mt76_rr(dev, MT_EFUSE_CTRL) &amp; MT_EFUSE_CTRL_SEL))</div><div class='hunk'>@@ -307,8 +301,7 @@ static int __maybe_unused mt76x0_suspend(struct usb_interface *usb_intf,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = usb_get_intfdata(usb_intf);</div><div class='ctx'> </div><div class='del'>-	mt76u_stop_queues(&amp;dev-&gt;mt76);</div><div class='del'>-	mt76x0u_mac_stop(dev);</div><div class='add'>+	mt76u_stop_rx(&amp;dev-&gt;mt76);</div><div class='ctx'> 	clear_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> 	mt76x0_chip_onoff(dev, false, false);</div><div class='ctx'> </div><div class='hunk'>@@ -318,16 +311,12 @@ static int __maybe_unused mt76x0_suspend(struct usb_interface *usb_intf,</div><div class='ctx'> static int __maybe_unused mt76x0_resume(struct usb_interface *usb_intf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = usb_get_intfdata(usb_intf);</div><div class='del'>-	struct mt76_usb *usb = &amp;dev-&gt;mt76.usb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt76u_submit_rx_buffers(&amp;dev-&gt;mt76);</div><div class='add'>+	ret = mt76u_resume_rx(&amp;dev-&gt;mt76);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	tasklet_enable(&amp;usb-&gt;rx_tasklet);</div><div class='del'>-	tasklet_enable(&amp;usb-&gt;tx_tasklet);</div><div class='del'>-</div><div class='ctx'> 	ret = mt76x0u_init_hardware(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h<br/>index 6915cce5def9..687bd14b2d77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a></div><div class='hunk'>@@ -51,6 +51,7 @@ struct mt76x02_calibration {</div><div class='ctx'> 	u16 false_cca;</div><div class='ctx'> 	s8 avg_rssi_all;</div><div class='ctx'> 	s8 agc_gain_adjust;</div><div class='add'>+	s8 agc_lowest_gain;</div><div class='ctx'> 	s8 low_gain;</div><div class='ctx'> </div><div class='ctx'> 	s8 temp_vco;</div><div class='hunk'>@@ -67,6 +68,13 @@ struct mt76x02_calibration {</div><div class='ctx'> 	s8 tssi_dc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt76x02_beacon_ops {</div><div class='add'>+	unsigned int nslots;</div><div class='add'>+	unsigned int slot_size;</div><div class='add'>+	void (*pre_tbtt_enable) (struct mt76x02_dev *, bool);</div><div class='add'>+	void (*beacon_enable) (struct mt76x02_dev *, bool);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76x02_dev {</div><div class='ctx'> 	struct mt76_dev mt76; /* must be first */</div><div class='ctx'> </div><div class='hunk'>@@ -78,23 +86,25 @@ struct mt76x02_dev {</div><div class='ctx'> </div><div class='ctx'> 	u8 txdone_seq;</div><div class='ctx'> 	DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);</div><div class='add'>+	spinlock_t txstatus_fifo_lock;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *rx_head;</div><div class='ctx'> </div><div class='del'>-	struct tasklet_struct tx_tasklet;</div><div class='del'>-	struct tasklet_struct pre_tbtt_tasklet;</div><div class='add'>+	struct napi_struct tx_napi;</div><div class='ctx'> 	struct delayed_work cal_work;</div><div class='del'>-	struct delayed_work mac_work;</div><div class='ctx'> 	struct delayed_work wdt_work;</div><div class='ctx'> </div><div class='add'>+	struct hrtimer pre_tbtt_timer;</div><div class='add'>+	struct work_struct pre_tbtt_work;</div><div class='add'>+</div><div class='add'>+	const struct mt76x02_beacon_ops *beacon_ops;</div><div class='add'>+</div><div class='ctx'> 	u32 aggr_stats[32];</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *beacons[8];</div><div class='del'>-	u8 beacon_mask;</div><div class='ctx'> 	u8 beacon_data_mask;</div><div class='ctx'> </div><div class='ctx'> 	u8 tbtt_count;</div><div class='del'>-	u16 beacon_int;</div><div class='ctx'> </div><div class='ctx'> 	u32 tx_hang_reset;</div><div class='ctx'> 	u8 tx_hang_check;</div><div class='hunk'>@@ -114,8 +124,11 @@ struct mt76x02_dev {</div><div class='ctx'> 	struct mt76x02_dfs_pattern_detector dfs_pd;</div><div class='ctx'> </div><div class='ctx'> 	/* edcca monitor */</div><div class='add'>+	unsigned long ed_trigger_timeout;</div><div class='ctx'> 	bool ed_tx_blocked;</div><div class='ctx'> 	bool ed_monitor;</div><div class='add'>+	u8 ed_monitor_enabled;</div><div class='add'>+	u8 ed_monitor_learning;</div><div class='ctx'> 	u8 ed_trigger;</div><div class='ctx'> 	u8 ed_silent;</div><div class='ctx'> 	ktime_t ed_time;</div><div class='hunk'>@@ -159,7 +172,6 @@ void mt76x02_set_tx_ackto(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x02_set_coverage_class(struct ieee80211_hw *hw,</div><div class='ctx'> 				s16 coverage_class);</div><div class='ctx'> int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, u32 val);</div><div class='del'>-int mt76x02_insert_hdr_pad(struct sk_buff *skb);</div><div class='ctx'> void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len);</div><div class='ctx'> bool mt76x02_tx_status_data(struct mt76_dev *mdev, u8 *update);</div><div class='ctx'> void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='hunk'>@@ -169,9 +181,9 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance);</div><div class='ctx'> void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,</div><div class='ctx'> 		struct sk_buff *skb);</div><div class='ctx'> int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			   struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='del'>-			   u32 *tx_info);</div><div class='add'>+			   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   struct mt76_tx_info *tx_info);</div><div class='ctx'> void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		     const u8 *mac);</div><div class='ctx'> void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -181,13 +193,30 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			      struct ieee80211_vif *vif,</div><div class='ctx'> 			      struct ieee80211_bss_conf *info, u32 changed);</div><div class='ctx'> </div><div class='del'>-extern const u16 mt76x02_beacon_offsets[16];</div><div class='add'>+struct beacon_bc_data {</div><div class='add'>+	struct mt76x02_dev *dev;</div><div class='add'>+	struct sk_buff_head q;</div><div class='add'>+	struct sk_buff *tail[8];</div><div class='add'>+};</div><div class='ctx'> void mt76x02_init_beacon_config(struct mt76x02_dev *dev);</div><div class='del'>-void mt76x02_set_irq_mask(struct mt76x02_dev *dev, u32 clear, u32 set);</div><div class='add'>+void mt76x02e_init_beacon_config(struct mt76x02_dev *dev);</div><div class='add'>+void mt76x02_resync_beacon_timer(struct mt76x02_dev *dev);</div><div class='add'>+void mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif);</div><div class='add'>+void mt76x02_enqueue_buffered_bc(struct mt76x02_dev *dev,</div><div class='add'>+				 struct beacon_bc_data *data,</div><div class='add'>+				 int max_nframes);</div><div class='add'>+</div><div class='ctx'> void mt76x02_mac_start(struct mt76x02_dev *dev);</div><div class='ctx'> </div><div class='ctx'> void mt76x02_init_debugfs(struct mt76x02_dev *dev);</div><div class='ctx'> </div><div class='add'>+static inline bool is_mt76x0(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(&amp;dev-&gt;mt76) == 0x7610 ||</div><div class='add'>+	       mt76_chip(&amp;dev-&gt;mt76) == 0x7630 ||</div><div class='add'>+	       mt76_chip(&amp;dev-&gt;mt76) == 0x7650;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool is_mt76x2(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return mt76_chip(&amp;dev-&gt;mt76) == 0x7612 ||</div><div class='hunk'>@@ -197,12 +226,12 @@ static inline bool is_mt76x2(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static inline void mt76x02_irq_enable(struct mt76x02_dev *dev, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	mt76x02_set_irq_mask(dev, 0, mask);</div><div class='add'>+	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, 0, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mt76x02_irq_disable(struct mt76x02_dev *dev, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	mt76x02_set_irq_mask(dev, mask, 0);</div><div class='add'>+	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c<br/>new file mode 100644<br/>index 000000000000..e196b9c0a686<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c</a></div><div class='hunk'>@@ -0,0 +1,286 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2018 Stanislaw Gruszka &lt;stf_xl@wp.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission to use, copy, modify, and/or distribute this software for any</div><div class='add'>+ * purpose with or without fee is hereby granted, provided that the above</div><div class='add'>+ * copyright notice and this permission notice appear in all copies.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='add'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='add'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='add'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='add'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mt76x02.h"</div><div class='add'>+</div><div class='add'>+static void mt76x02_set_beacon_offsets(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 regs[4] = {};</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; dev-&gt;beacon_ops-&gt;nslots; i++) {</div><div class='add'>+		val = i * dev-&gt;beacon_ops-&gt;slot_size;</div><div class='add'>+		regs[i / 4] |= (val / 64) &lt;&lt; (8 * (i % 4));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		mt76_wr(dev, MT_BCN_OFFSET(i), regs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76x02_write_beacon(struct mt76x02_dev *dev, int offset, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int beacon_len = dev-&gt;beacon_ops-&gt;slot_size;</div><div class='add'>+	struct mt76x02_txwi txwi;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(beacon_len &lt; skb-&gt;len + sizeof(struct mt76x02_txwi)))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	mt76x02_mac_write_txwi(dev, &amp;txwi, skb, NULL, NULL, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	mt76_wr_copy(dev, offset, &amp;txwi, sizeof(txwi));</div><div class='add'>+	offset += sizeof(txwi);</div><div class='add'>+</div><div class='add'>+	mt76_wr_copy(dev, offset, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 bcn_idx,</div><div class='add'>+			 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int beacon_len = dev-&gt;beacon_ops-&gt;slot_size;</div><div class='add'>+	int beacon_addr = MT_BEACON_BASE + (beacon_len * bcn_idx);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Prevent corrupt transmissions during update */</div><div class='add'>+	mt76_set(dev, MT_BCN_BYPASS_MASK, BIT(bcn_idx));</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		ret = mt76x02_write_beacon(dev, beacon_addr, skb);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dev-&gt;beacon_data_mask |= BIT(bcn_idx);</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;beacon_data_mask &amp;= ~BIT(bcn_idx);</div><div class='add'>+		for (i = 0; i &lt; beacon_len; i += 4)</div><div class='add'>+			mt76_wr(dev, beacon_addr + i, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xff00 | ~dev-&gt;beacon_data_mask);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	bool force_update = false;</div><div class='add'>+	int bcn_idx = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;beacons); i++) {</div><div class='add'>+		if (vif_idx == i) {</div><div class='add'>+			force_update = !!dev-&gt;beacons[i] ^ !!skb;</div><div class='add'>+</div><div class='add'>+			if (dev-&gt;beacons[i])</div><div class='add'>+				dev_kfree_skb(dev-&gt;beacons[i]);</div><div class='add'>+</div><div class='add'>+			dev-&gt;beacons[i] = skb;</div><div class='add'>+			__mt76x02_mac_set_beacon(dev, bcn_idx, skb);</div><div class='add'>+		} else if (force_update &amp;&amp; dev-&gt;beacons[i]) {</div><div class='add'>+			__mt76x02_mac_set_beacon(dev, bcn_idx,</div><div class='add'>+						 dev-&gt;beacons[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bcn_idx += !!dev-&gt;beacons[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = bcn_idx; i &lt; ARRAY_SIZE(dev-&gt;beacons); i++) {</div><div class='add'>+		if (!(dev-&gt;beacon_data_mask &amp; BIT(i)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		__mt76x02_mac_set_beacon(dev, i, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_MAC_BSSID_DW1, MT_MAC_BSSID_DW1_MBEACON_N,</div><div class='add'>+		       bcn_idx - 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02_mac_set_beacon);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='add'>+				bool val, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u8 old_mask = dev-&gt;mt76.beacon_mask;</div><div class='add'>+	bool en;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (val) {</div><div class='add'>+		dev-&gt;mt76.beacon_mask |= BIT(vif_idx);</div><div class='add'>+		if (skb)</div><div class='add'>+			mt76x02_mac_set_beacon(dev, vif_idx, skb);</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;mt76.beacon_mask &amp;= ~BIT(vif_idx);</div><div class='add'>+		mt76x02_mac_set_beacon(dev, vif_idx, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!!old_mask == !!dev-&gt;mt76.beacon_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	en = dev-&gt;mt76.beacon_mask;</div><div class='add'>+</div><div class='add'>+	reg = MT_BEACON_TIME_CFG_BEACON_TX |</div><div class='add'>+	      MT_BEACON_TIME_CFG_TBTT_EN |</div><div class='add'>+	      MT_BEACON_TIME_CFG_TIMER_EN;</div><div class='add'>+	mt76_rmw(dev, MT_BEACON_TIME_CFG, reg, reg * en);</div><div class='add'>+</div><div class='add'>+	dev-&gt;beacon_ops-&gt;beacon_enable(dev, en);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,</div><div class='add'>+				   struct ieee80211_vif *vif, bool val)</div><div class='add'>+{</div><div class='add'>+	u8 vif_idx = ((struct mt76x02_vif *)vif-&gt;drv_priv)-&gt;idx;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	dev-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, false);</div><div class='add'>+</div><div class='add'>+	if (mt76_is_usb(dev))</div><div class='add'>+		skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;mt76.beacon_mask)</div><div class='add'>+		dev-&gt;tbtt_count = 0;</div><div class='add'>+</div><div class='add'>+	__mt76x02_mac_set_beacon_enable(dev, vif_idx, val, skb);</div><div class='add'>+</div><div class='add'>+	dev-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mt76x02_resync_beacon_timer(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 timer_val = dev-&gt;mt76.beacon_int &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	dev-&gt;tbtt_count++;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Beacon timer drifts by 1us every tick, the timer is configured</div><div class='add'>+	 * in 1/16 TU (64us) units.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;tbtt_count &lt; 63)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The updated beacon interval takes effect after two TBTT, because</div><div class='add'>+	 * at this point the original interval has already been loaded into</div><div class='add'>+	 * the next TBTT_TIMER value</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;tbtt_count == 63)</div><div class='add'>+		timer_val -= 1;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_BEACON_TIME_CFG,</div><div class='add'>+		       MT_BEACON_TIME_CFG_INTVAL, timer_val);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;tbtt_count &gt;= 64) {</div><div class='add'>+		dev-&gt;tbtt_count = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02_resync_beacon_timer);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = (struct mt76x02_dev *)priv;</div><div class='add'>+	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;mt76.beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76x02_mac_set_beacon(dev, mvif-&gt;idx, skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02_update_beacon_iter);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76x02_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct beacon_bc_data *data = priv;</div><div class='add'>+	struct mt76x02_dev *dev = data-&gt;dev;</div><div class='add'>+	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;mt76.beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	info-&gt;control.vif = vif;</div><div class='add'>+	info-&gt;flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;</div><div class='add'>+	mt76_skb_set_moredata(skb, true);</div><div class='add'>+	__skb_queue_tail(&amp;data-&gt;q, skb);</div><div class='add'>+	data-&gt;tail[mvif-&gt;idx] = skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mt76x02_enqueue_buffered_bc(struct mt76x02_dev *dev, struct beacon_bc_data *data,</div><div class='add'>+			    int max_nframes)</div><div class='add'>+{</div><div class='add'>+	int i, nframes;</div><div class='add'>+</div><div class='add'>+	data-&gt;dev = dev;</div><div class='add'>+	__skb_queue_head_init(&amp;data-&gt;q);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		nframes = skb_queue_len(&amp;data-&gt;q);</div><div class='add'>+		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='add'>+			IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+			mt76x02_add_buffered_bc, data);</div><div class='add'>+	} while (nframes != skb_queue_len(&amp;data-&gt;q) &amp;&amp;</div><div class='add'>+		 skb_queue_len(&amp;data-&gt;q) &lt; max_nframes);</div><div class='add'>+</div><div class='add'>+	if (!skb_queue_len(&amp;data-&gt;q))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(data-&gt;tail); i++) {</div><div class='add'>+		if (!data-&gt;tail[i])</div><div class='add'>+			continue;</div><div class='add'>+		mt76_skb_set_moredata(data-&gt;tail[i], false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02_enqueue_buffered_bc);</div><div class='add'>+</div><div class='add'>+void mt76x02_init_beacon_config(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt76_clear(dev, MT_BEACON_TIME_CFG, (MT_BEACON_TIME_CFG_TIMER_EN |</div><div class='add'>+					     MT_BEACON_TIME_CFG_TBTT_EN |</div><div class='add'>+					     MT_BEACON_TIME_CFG_BEACON_TX));</div><div class='add'>+	mt76_set(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_SYNC_MODE);</div><div class='add'>+	mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xffff);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		mt76x02_mac_set_beacon(dev, i, NULL);</div><div class='add'>+</div><div class='add'>+	mt76x02_set_beacon_offsets(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c<br/>index 7580c5c986ff..b1d6fd4861e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a></div><div class='hunk'>@@ -116,6 +116,32 @@ static int read_agc(struct seq_file *file, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt76_edcca_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = data;</div><div class='add'>+	enum nl80211_dfs_regions region = dev-&gt;dfs_pd.region;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ed_monitor_enabled = !!val;</div><div class='add'>+	dev-&gt;ed_monitor = dev-&gt;ed_monitor_enabled &amp;&amp;</div><div class='add'>+			  region == NL80211_DFS_ETSI;</div><div class='add'>+	mt76x02_edcca_init(dev, 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</div><div class='add'>+mt76_edcca_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;ed_monitor_enabled;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_edcca, mt76_edcca_get, mt76_edcca_set,</div><div class='add'>+			 "%lld\n");</div><div class='add'>+</div><div class='ctx'> void mt76x02_init_debugfs(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dir;</div><div class='hunk'>@@ -127,6 +153,7 @@ void mt76x02_init_debugfs(struct mt76x02_dev *dev)</div><div class='ctx'> 	debugfs_create_u8("temperature", 0400, dir, &amp;dev-&gt;cal.temp);</div><div class='ctx'> 	debugfs_create_bool("tpc", 0600, dir, &amp;dev-&gt;enable_tpc);</div><div class='ctx'> </div><div class='add'>+	debugfs_create_file("edcca", 0400, dir, dev, &amp;fops_edcca);</div><div class='ctx'> 	debugfs_create_file("ampdu_stat", 0400, dir, dev, &amp;fops_ampdu_stat);</div><div class='ctx'> 	debugfs_create_file("dfs_stats", 0400, dir, dev, &amp;fops_dfs_stat);</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "txpower", dir,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c<br/>index e4649103efd4..17d12d212d1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c</a></div><div class='hunk'>@@ -885,7 +885,8 @@ mt76x02_dfs_set_domain(struct mt76x02_dev *dev,</div><div class='ctx'> 	if (dfs_pd-&gt;region != region) {</div><div class='ctx'> 		tasklet_disable(&amp;dfs_pd-&gt;dfs_tasklet);</div><div class='ctx'> </div><div class='del'>-		dev-&gt;ed_monitor = region == NL80211_DFS_ETSI;</div><div class='add'>+		dev-&gt;ed_monitor = dev-&gt;ed_monitor_enabled &amp;&amp;</div><div class='add'>+				  region == NL80211_DFS_ETSI;</div><div class='ctx'> 		mt76x02_edcca_init(dev, true);</div><div class='ctx'> </div><div class='ctx'> 		dfs_pd-&gt;region = region;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c<br/>index 91ff6598eccf..56510a1a843a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.c</a></div><div class='hunk'>@@ -67,12 +67,39 @@ int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_mac_shared_key_setup);</div><div class='ctx'> </div><div class='add'>+void mt76x02_mac_wcid_sync_pn(struct mt76x02_dev *dev, u8 idx,</div><div class='add'>+			      struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	enum mt76x02_cipher_type cipher;</div><div class='add'>+	u8 key_data[32];</div><div class='add'>+	u32 iv, eiv;</div><div class='add'>+	u64 pn;</div><div class='add'>+</div><div class='add'>+	cipher = mt76x02_mac_get_key_info(key, key_data);</div><div class='add'>+	iv = mt76_rr(dev, MT_WCID_IV(idx));</div><div class='add'>+	eiv = mt76_rr(dev, MT_WCID_IV(idx) + 4);</div><div class='add'>+</div><div class='add'>+	pn = (u64)eiv &lt;&lt; 16;</div><div class='add'>+	if (cipher == MT_CIPHER_TKIP) {</div><div class='add'>+		pn |= (iv &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		pn |= (iv &amp; 0xff) &lt;&lt; 8;</div><div class='add'>+	} else if (cipher &gt;= MT_CIPHER_AES_CCMP) {</div><div class='add'>+		pn |= iv &amp; 0xffff;</div><div class='add'>+	} else {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic64_set(&amp;key-&gt;tx_pn, pn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,</div><div class='ctx'> 			     struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='ctx'> 	enum mt76x02_cipher_type cipher;</div><div class='ctx'> 	u8 key_data[32];</div><div class='ctx'> 	u8 iv_data[8];</div><div class='add'>+	u64 pn;</div><div class='ctx'> </div><div class='ctx'> 	cipher = mt76x02_mac_get_key_info(key, key_data);</div><div class='ctx'> 	if (cipher == MT_CIPHER_NONE &amp;&amp; key)</div><div class='hunk'>@@ -85,9 +112,22 @@ int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,</div><div class='ctx'> 	if (key) {</div><div class='ctx'> 		mt76_rmw_field(dev, MT_WCID_ATTR(idx), MT_WCID_ATTR_PAIRWISE,</div><div class='ctx'> 			       !!(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE));</div><div class='add'>+</div><div class='add'>+		pn = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='add'>+</div><div class='ctx'> 		iv_data[3] = key-&gt;keyidx &lt;&lt; 6;</div><div class='del'>-		if (cipher &gt;= MT_CIPHER_TKIP)</div><div class='add'>+		if (cipher &gt;= MT_CIPHER_TKIP) {</div><div class='ctx'> 			iv_data[3] |= 0x20;</div><div class='add'>+			put_unaligned_le32(pn &gt;&gt; 16, &amp;iv_data[4]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cipher == MT_CIPHER_TKIP) {</div><div class='add'>+			iv_data[0] = (pn &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			iv_data[1] = (iv_data[0] | 0x20) &amp; 0x7f;</div><div class='add'>+			iv_data[2] = pn &amp; 0xff;</div><div class='add'>+		} else if (cipher &gt;= MT_CIPHER_AES_CCMP) {</div><div class='add'>+			put_unaligned_le16((pn &amp; 0xffff), &amp;iv_data[0]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr_copy(dev, MT_WCID_IV(idx), iv_data, sizeof(iv_data));</div><div class='hunk'>@@ -178,10 +218,17 @@ mt76x02_mac_tx_rate_val(struct mt76x02_dev *dev,</div><div class='ctx'> void mt76x02_mac_wcid_set_rate(struct mt76x02_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			       const struct ieee80211_tx_rate *rate)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='del'>-	wcid-&gt;tx_rate = mt76x02_mac_tx_rate_val(dev, rate, &amp;wcid-&gt;tx_rate_nss);</div><div class='del'>-	wcid-&gt;tx_rate_set = true;</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+	s8 max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, rate);</div><div class='add'>+	__le16 rateval;</div><div class='add'>+	u32 tx_info;</div><div class='add'>+	s8 nss;</div><div class='add'>+</div><div class='add'>+	rateval = mt76x02_mac_tx_rate_val(dev, rate, &amp;nss);</div><div class='add'>+	tx_info = FIELD_PREP(MT_WCID_TX_INFO_RATE, rateval) |</div><div class='add'>+		  FIELD_PREP(MT_WCID_TX_INFO_NSS, nss) |</div><div class='add'>+		  FIELD_PREP(MT_WCID_TX_INFO_TXPWR_ADJ, max_txpwr_adj) |</div><div class='add'>+		  MT_WCID_TX_INFO_SET;</div><div class='add'>+	wcid-&gt;tx_info = tx_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76x02_mac_set_short_preamble(struct mt76x02_dev *dev, bool enable)</div><div class='hunk'>@@ -283,6 +330,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_tx_rate *rate = &amp;info-&gt;control.rates[0];</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	u32 wcid_tx_info;</div><div class='ctx'> 	u16 rate_ht_mask = FIELD_PREP(MT_RXWI_RATE_PHY, BIT(1) | BIT(2));</div><div class='ctx'> 	u16 txwi_flags = 0;</div><div class='ctx'> 	u8 nss;</div><div class='hunk'>@@ -317,16 +365,16 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 		txwi-&gt;eiv = *((__le32 *)&amp;ccmp_pn[4]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	if (wcid &amp;&amp; (rate-&gt;idx &lt; 0 || !rate-&gt;count)) {</div><div class='del'>-		txwi-&gt;rate = wcid-&gt;tx_rate;</div><div class='del'>-		max_txpwr_adj = wcid-&gt;max_txpwr_adj;</div><div class='del'>-		nss = wcid-&gt;tx_rate_nss;</div><div class='add'>+		wcid_tx_info = wcid-&gt;tx_info;</div><div class='add'>+		txwi-&gt;rate = FIELD_GET(MT_WCID_TX_INFO_RATE, wcid_tx_info);</div><div class='add'>+		max_txpwr_adj = FIELD_GET(MT_WCID_TX_INFO_TXPWR_ADJ,</div><div class='add'>+					  wcid_tx_info);</div><div class='add'>+		nss = FIELD_GET(MT_WCID_TX_INFO_NSS, wcid_tx_info);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		txwi-&gt;rate = mt76x02_mac_tx_rate_val(dev, rate, &amp;nss);</div><div class='ctx'> 		max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, rate);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> </div><div class='ctx'> 	txpwr_adj = mt76x02_tx_get_txpwr_adj(dev, dev-&gt;mt76.txpower_conf,</div><div class='ctx'> 					     max_txpwr_adj);</div><div class='hunk'>@@ -426,7 +474,6 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	mt76_tx_status_lock(mdev, &amp;list);</div><div class='ctx'> </div><div class='ctx'> 	if (stat-&gt;wcid &lt; ARRAY_SIZE(dev-&gt;mt76.wcid))</div><div class='ctx'> 		wcid = rcu_dereference(dev-&gt;mt76.wcid[stat-&gt;wcid]);</div><div class='hunk'>@@ -439,6 +486,8 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,</div><div class='ctx'> 					  drv_priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mt76_tx_status_lock(mdev, &amp;list);</div><div class='add'>+</div><div class='ctx'> 	if (wcid) {</div><div class='ctx'> 		if (stat-&gt;pktid &gt;= MT_PACKET_ID_FIRST)</div><div class='ctx'> 			status.skb = mt76_tx_status_skb_get(mdev, wcid,</div><div class='hunk'>@@ -458,7 +507,9 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,</div><div class='ctx'> 		if (*update == 0 &amp;&amp; stat_val == stat_cache &amp;&amp;</div><div class='ctx'> 		    stat-&gt;wcid == msta-&gt;status.wcid &amp;&amp; msta-&gt;n_frames &lt; 32) {</div><div class='ctx'> 			msta-&gt;n_frames++;</div><div class='del'>-			goto out;</div><div class='add'>+			mt76_tx_status_unlock(mdev, &amp;list);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mt76x02_mac_fill_tx_status(dev, status.info, &amp;msta-&gt;status,</div><div class='hunk'>@@ -474,11 +525,10 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (status.skb)</div><div class='ctx'> 		mt76_tx_status_skb_done(mdev, status.skb, &amp;list);</div><div class='del'>-	else</div><div class='del'>-		ieee80211_tx_status_ext(mt76_hw(dev), &amp;status);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	mt76_tx_status_unlock(mdev, &amp;list);</div><div class='add'>+</div><div class='add'>+	if (!status.skb)</div><div class='add'>+		ieee80211_tx_status_ext(mt76_hw(dev), &amp;status);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -689,7 +739,6 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,</div><div class='ctx'> void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_tx_status stat = {};</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u8 update = 1;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='hunk'>@@ -699,9 +748,11 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq)</div><div class='ctx'> 	trace_mac_txstat_poll(dev);</div><div class='ctx'> </div><div class='ctx'> 	while (!irq || !kfifo_is_full(&amp;dev-&gt;txstatus_fifo)) {</div><div class='del'>-		spin_lock_irqsave(&amp;dev-&gt;mt76.mmio.irq_lock, flags);</div><div class='add'>+		if (!spin_trylock(&amp;dev-&gt;txstatus_fifo_lock))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		ret = mt76x02_mac_load_tx_status(dev, &amp;stat);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;mt76.mmio.irq_lock, flags);</div><div class='add'>+		spin_unlock(&amp;dev-&gt;txstatus_fifo_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -715,11 +766,12 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='del'>-			     struct mt76_queue_entry *e, bool flush)</div><div class='add'>+void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			     struct mt76_queue_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='ctx'> 	struct mt76x02_txwi *txwi;</div><div class='add'>+	u8 *txwi_ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (!e-&gt;txwi) {</div><div class='ctx'> 		dev_kfree_skb_any(e-&gt;skb);</div><div class='hunk'>@@ -728,7 +780,8 @@ void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_mac_poll_tx_status(dev, false);</div><div class='ctx'> </div><div class='del'>-	txwi = (struct mt76x02_txwi *) &amp;e-&gt;txwi-&gt;txwi;</div><div class='add'>+	txwi_ptr = mt76_get_txwi_ptr(mdev, e-&gt;txwi);</div><div class='add'>+	txwi = (struct mt76x02_txwi *)txwi_ptr;</div><div class='ctx'> 	trace_mac_txdone_add(dev, txwi-&gt;wcid, txwi-&gt;pktid);</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_complete_skb(mdev, e-&gt;skb);</div><div class='hunk'>@@ -920,6 +973,7 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mt76x02_edcca_tx_enable(dev, true);</div><div class='add'>+	dev-&gt;ed_monitor_learning = true;</div><div class='ctx'> </div><div class='ctx'> 	/* clear previous CCA timer value */</div><div class='ctx'> 	mt76_rr(dev, MT_ED_CCA_TIMER);</div><div class='hunk'>@@ -929,6 +983,10 @@ EXPORT_SYMBOL_GPL(mt76x02_edcca_init);</div><div class='ctx'> </div><div class='ctx'> #define MT_EDCCA_TH		92</div><div class='ctx'> #define MT_EDCCA_BLOCK_TH	2</div><div class='add'>+#define MT_EDCCA_LEARN_TH	50</div><div class='add'>+#define MT_EDCCA_LEARN_CCA	180</div><div class='add'>+#define MT_EDCCA_LEARN_TIMEOUT	(20 * HZ)</div><div class='add'>+</div><div class='ctx'> static void mt76x02_edcca_check(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ktime_t cur_time;</div><div class='hunk'>@@ -951,18 +1009,30 @@ static void mt76x02_edcca_check(struct mt76x02_dev *dev)</div><div class='ctx'> 		dev-&gt;ed_trigger = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ed_trigger &gt; MT_EDCCA_BLOCK_TH &amp;&amp;</div><div class='del'>-	    !dev-&gt;ed_tx_blocked)</div><div class='add'>+	if (dev-&gt;cal.agc_lowest_gain &amp;&amp;</div><div class='add'>+	    dev-&gt;cal.false_cca &gt; MT_EDCCA_LEARN_CCA &amp;&amp;</div><div class='add'>+	    dev-&gt;ed_trigger &gt; MT_EDCCA_LEARN_TH) {</div><div class='add'>+		dev-&gt;ed_monitor_learning = false;</div><div class='add'>+		dev-&gt;ed_trigger_timeout = jiffies + 20 * HZ;</div><div class='add'>+	} else if (!dev-&gt;ed_monitor_learning &amp;&amp;</div><div class='add'>+		   time_is_after_jiffies(dev-&gt;ed_trigger_timeout)) {</div><div class='add'>+		dev-&gt;ed_monitor_learning = true;</div><div class='add'>+		mt76x02_edcca_tx_enable(dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ed_monitor_learning)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ed_trigger &gt; MT_EDCCA_BLOCK_TH &amp;&amp; !dev-&gt;ed_tx_blocked)</div><div class='ctx'> 		mt76x02_edcca_tx_enable(dev, false);</div><div class='del'>-	else if (dev-&gt;ed_silent &gt; MT_EDCCA_BLOCK_TH &amp;&amp;</div><div class='del'>-		 dev-&gt;ed_tx_blocked)</div><div class='add'>+	else if (dev-&gt;ed_silent &gt; MT_EDCCA_BLOCK_TH &amp;&amp; dev-&gt;ed_tx_blocked)</div><div class='ctx'> 		mt76x02_edcca_tx_enable(dev, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76x02_mac_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = container_of(work, struct mt76x02_dev,</div><div class='del'>-					       mac_work.work);</div><div class='add'>+					       mt76.mac_work.work);</div><div class='ctx'> 	int i, idx;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='hunk'>@@ -975,7 +1045,7 @@ void mt76x02_mac_work(struct work_struct *work)</div><div class='ctx'> 		dev-&gt;aggr_stats[idx++] += val &gt;&gt; 16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;beacon_mask)</div><div class='add'>+	if (!dev-&gt;mt76.beacon_mask)</div><div class='ctx'> 		mt76x02_check_mac_err(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;ed_monitor)</div><div class='hunk'>@@ -985,7 +1055,7 @@ void mt76x02_mac_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, false);</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     MT_MAC_WORK_INTERVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -996,141 +1066,3 @@ void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr)</div><div class='ctx'> 	mt76_rmw_field(dev, MT_MAC_APC_BSSID_H(idx), MT_MAC_APC_BSSID_H_ADDR,</div><div class='ctx'> 		       get_unaligned_le16(addr + 4));</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt76x02_write_beacon(struct mt76x02_dev *dev, int offset, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int beacon_len = mt76x02_beacon_offsets[1] - mt76x02_beacon_offsets[0];</div><div class='del'>-	struct mt76x02_txwi txwi;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(beacon_len &lt; skb-&gt;len + sizeof(struct mt76x02_txwi)))</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-</div><div class='del'>-	mt76x02_mac_write_txwi(dev, &amp;txwi, skb, NULL, NULL, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	mt76_wr_copy(dev, offset, &amp;txwi, sizeof(txwi));</div><div class='del'>-	offset += sizeof(txwi);</div><div class='del'>-</div><div class='del'>-	mt76_wr_copy(dev, offset, skb-&gt;data, skb-&gt;len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 bcn_idx,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int beacon_len = mt76x02_beacon_offsets[1] - mt76x02_beacon_offsets[0];</div><div class='del'>-	int beacon_addr = mt76x02_beacon_offsets[bcn_idx];</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Prevent corrupt transmissions during update */</div><div class='del'>-	mt76_set(dev, MT_BCN_BYPASS_MASK, BIT(bcn_idx));</div><div class='del'>-</div><div class='del'>-	if (skb) {</div><div class='del'>-		ret = mt76x02_write_beacon(dev, beacon_addr, skb);</div><div class='del'>-		if (!ret)</div><div class='del'>-			dev-&gt;beacon_data_mask |= BIT(bcn_idx);</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;beacon_data_mask &amp;= ~BIT(bcn_idx);</div><div class='del'>-		for (i = 0; i &lt; beacon_len; i += 4)</div><div class='del'>-			mt76_wr(dev, beacon_addr + i, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xff00 | ~dev-&gt;beacon_data_mask);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='del'>-			   struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	bool force_update = false;</div><div class='del'>-	int bcn_idx = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;beacons); i++) {</div><div class='del'>-		if (vif_idx == i) {</div><div class='del'>-			force_update = !!dev-&gt;beacons[i] ^ !!skb;</div><div class='del'>-</div><div class='del'>-			if (dev-&gt;beacons[i])</div><div class='del'>-				dev_kfree_skb(dev-&gt;beacons[i]);</div><div class='del'>-</div><div class='del'>-			dev-&gt;beacons[i] = skb;</div><div class='del'>-			__mt76x02_mac_set_beacon(dev, bcn_idx, skb);</div><div class='del'>-		} else if (force_update &amp;&amp; dev-&gt;beacons[i]) {</div><div class='del'>-			__mt76x02_mac_set_beacon(dev, bcn_idx,</div><div class='del'>-						 dev-&gt;beacons[i]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bcn_idx += !!dev-&gt;beacons[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = bcn_idx; i &lt; ARRAY_SIZE(dev-&gt;beacons); i++) {</div><div class='del'>-		if (!(dev-&gt;beacon_data_mask &amp; BIT(i)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		__mt76x02_mac_set_beacon(dev, i, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt76_rmw_field(dev, MT_MAC_BSSID_DW1, MT_MAC_BSSID_DW1_MBEACON_N,</div><div class='del'>-		       bcn_idx - 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='del'>-				bool val, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	u8 old_mask = dev-&gt;beacon_mask;</div><div class='del'>-	bool en;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		dev-&gt;beacon_mask |= BIT(vif_idx);</div><div class='del'>-		if (skb)</div><div class='del'>-			mt76x02_mac_set_beacon(dev, vif_idx, skb);</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;beacon_mask &amp;= ~BIT(vif_idx);</div><div class='del'>-		mt76x02_mac_set_beacon(dev, vif_idx, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!!old_mask == !!dev-&gt;beacon_mask)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	en = dev-&gt;beacon_mask;</div><div class='del'>-</div><div class='del'>-	reg = MT_BEACON_TIME_CFG_BEACON_TX |</div><div class='del'>-	      MT_BEACON_TIME_CFG_TBTT_EN |</div><div class='del'>-	      MT_BEACON_TIME_CFG_TIMER_EN;</div><div class='del'>-	mt76_rmw(dev, MT_BEACON_TIME_CFG, reg, reg * en);</div><div class='del'>-</div><div class='del'>-	if (mt76_is_usb(dev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mt76_rmw_field(dev, MT_INT_TIMER_EN, MT_INT_TIMER_EN_PRE_TBTT_EN, en);</div><div class='del'>-	if (en)</div><div class='del'>-		mt76x02_irq_enable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);</div><div class='del'>-	else</div><div class='del'>-		mt76x02_irq_disable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,</div><div class='del'>-				   struct ieee80211_vif *vif, bool val)</div><div class='del'>-{</div><div class='del'>-	u8 vif_idx = ((struct mt76x02_vif *)vif-&gt;drv_priv)-&gt;idx;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-</div><div class='del'>-	if (mt76_is_mmio(dev))</div><div class='del'>-		tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='del'>-	else if (val)</div><div class='del'>-		skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;beacon_mask)</div><div class='del'>-		dev-&gt;tbtt_count = 0;</div><div class='del'>-</div><div class='del'>-	__mt76x02_mac_set_beacon_enable(dev, vif_idx, val, skb);</div><div class='del'>-</div><div class='del'>-	if (mt76_is_mmio(dev))</div><div class='del'>-		tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h<br/>index 6b1f25d2f64c..e4a9e0d0924b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.h</a></div><div class='hunk'>@@ -177,6 +177,8 @@ int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='ctx'> 				 u8 key_idx, struct ieee80211_key_conf *key);</div><div class='ctx'> int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,</div><div class='ctx'> 			     struct ieee80211_key_conf *key);</div><div class='add'>+void mt76x02_mac_wcid_sync_pn(struct mt76x02_dev *dev, u8 idx,</div><div class='add'>+			      struct ieee80211_key_conf *key);</div><div class='ctx'> void mt76x02_mac_wcid_setup(struct mt76x02_dev *dev, u8 idx, u8 vif_idx,</div><div class='ctx'> 			    u8 *mac);</div><div class='ctx'> void mt76x02_mac_wcid_set_drop(struct mt76x02_dev *dev, u8 idx, bool drop);</div><div class='hunk'>@@ -196,8 +198,8 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 			    struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='ctx'> 			    struct ieee80211_sta *sta, int len);</div><div class='ctx'> void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq);</div><div class='del'>-void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='del'>-			     struct mt76_queue_entry *e, bool flush);</div><div class='add'>+void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			     struct mt76_queue_entry *e);</div><div class='ctx'> void mt76x02_update_channel(struct mt76_dev *mdev);</div><div class='ctx'> void mt76x02_mac_work(struct work_struct *work);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c<br/>index 1229f19f2b02..7b7163bc3b62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a></div><div class='hunk'>@@ -19,98 +19,21 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mt76x02.h"</div><div class='add'>+#include "mt76x02_mcu.h"</div><div class='ctx'> #include "mt76x02_trace.h"</div><div class='ctx'> </div><div class='del'>-struct beacon_bc_data {</div><div class='del'>-	struct mt76x02_dev *dev;</div><div class='del'>-	struct sk_buff_head q;</div><div class='del'>-	struct sk_buff *tail[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct mt76x02_dev *dev = (struct mt76x02_dev *)priv;</div><div class='del'>-	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mt76x02_mac_set_beacon(dev, mvif-&gt;idx, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt76x02_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct beacon_bc_data *data = priv;</div><div class='del'>-	struct mt76x02_dev *dev = data-&gt;dev;</div><div class='del'>-	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	info-&gt;control.vif = vif;</div><div class='del'>-	info-&gt;flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;</div><div class='del'>-	mt76_skb_set_moredata(skb, true);</div><div class='del'>-	__skb_queue_tail(&amp;data-&gt;q, skb);</div><div class='del'>-	data-&gt;tail[mvif-&gt;idx] = skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt76x02_resync_beacon_timer(struct mt76x02_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u32 timer_val = dev-&gt;beacon_int &lt;&lt; 4;</div><div class='del'>-</div><div class='del'>-	dev-&gt;tbtt_count++;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Beacon timer drifts by 1us every tick, the timer is configured</div><div class='del'>-	 * in 1/16 TU (64us) units.</div><div class='del'>-	 */</div><div class='del'>-	if (dev-&gt;tbtt_count &lt; 63)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The updated beacon interval takes effect after two TBTT, because</div><div class='del'>-	 * at this point the original interval has already been loaded into</div><div class='del'>-	 * the next TBTT_TIMER value</div><div class='del'>-	 */</div><div class='del'>-	if (dev-&gt;tbtt_count == 63)</div><div class='del'>-		timer_val -= 1;</div><div class='del'>-</div><div class='del'>-	mt76_rmw_field(dev, MT_BEACON_TIME_CFG,</div><div class='del'>-		       MT_BEACON_TIME_CFG_INTVAL, timer_val);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;tbtt_count &gt;= 64) {</div><div class='del'>-		dev-&gt;tbtt_count = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mt76x02_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = (struct mt76x02_dev *)arg;</div><div class='del'>-	struct mt76_queue *q = &amp;dev-&gt;mt76.q_tx[MT_TXQ_PSD];</div><div class='add'>+	struct mt76_queue *q = dev-&gt;mt76.q_tx[MT_TXQ_PSD].q;</div><div class='ctx'> 	struct beacon_bc_data data = {};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int i, nframes;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	mt76x02_resync_beacon_timer(dev);</div><div class='add'>+	if (mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	data.dev = dev;</div><div class='del'>-	__skb_queue_head_init(&amp;data.q);</div><div class='add'>+	mt76x02_resync_beacon_timer(dev);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='hunk'>@@ -121,13 +44,7 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> 	if (dev-&gt;mt76.csa_complete)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		nframes = skb_queue_len(&amp;data.q);</div><div class='del'>-		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='del'>-			IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-			mt76x02_add_buffered_bc, &amp;data);</div><div class='del'>-	} while (nframes != skb_queue_len(&amp;data.q) &amp;&amp;</div><div class='del'>-		 skb_queue_len(&amp;data.q) &lt; 8);</div><div class='add'>+	mt76x02_enqueue_buffered_bc(dev, &amp;data, 8);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_queue_len(&amp;data.q))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -145,25 +62,67 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg)</div><div class='ctx'> 		struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='ctx'> 		struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		mt76_dma_tx_queue_skb(&amp;dev-&gt;mt76, q, skb, &amp;mvif-&gt;group_wcid,</div><div class='del'>-				      NULL);</div><div class='add'>+		mt76_tx_queue_skb(dev, MT_TXQ_PSD, skb, &amp;mvif-&gt;group_wcid,</div><div class='add'>+				  NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mt76x02e_pre_tbtt_enable(struct mt76x02_dev *dev, bool en)</div><div class='add'>+{</div><div class='add'>+	if (en)</div><div class='add'>+		tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='add'>+	else</div><div class='add'>+		tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02e_beacon_enable(struct mt76x02_dev *dev, bool en)</div><div class='add'>+{</div><div class='add'>+	mt76_rmw_field(dev, MT_INT_TIMER_EN, MT_INT_TIMER_EN_PRE_TBTT_EN, en);</div><div class='add'>+	if (en)</div><div class='add'>+		mt76x02_irq_enable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);</div><div class='add'>+	else</div><div class='add'>+		mt76x02_irq_disable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76x02e_init_beacon_config(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76x02_beacon_ops beacon_ops = {</div><div class='add'>+		.nslots = 8,</div><div class='add'>+		.slot_size = 1024,</div><div class='add'>+		.pre_tbtt_enable = mt76x02e_pre_tbtt_enable,</div><div class='add'>+		.beacon_enable = mt76x02e_beacon_enable,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev-&gt;beacon_ops = &amp;beacon_ops;</div><div class='add'>+</div><div class='add'>+	/* Fire a pre-TBTT interrupt 8 ms before TBTT */</div><div class='add'>+	mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_PRE_TBTT, 8 &lt;&lt; 4);</div><div class='add'>+	mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_GP_TIMER,</div><div class='add'>+		       MT_DFS_GP_INTERVAL);</div><div class='add'>+	mt76_wr(dev, MT_INT_TIMER_EN, 0);</div><div class='add'>+</div><div class='add'>+	mt76x02_init_beacon_config(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02e_init_beacon_config);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-mt76x02_init_tx_queue(struct mt76x02_dev *dev, struct mt76_queue *q,</div><div class='add'>+mt76x02_init_tx_queue(struct mt76x02_dev *dev, struct mt76_sw_queue *q,</div><div class='ctx'> 		      int idx, int n_desc)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct mt76_queue *hwq;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	q-&gt;regs = dev-&gt;mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;</div><div class='del'>-	q-&gt;ndesc = n_desc;</div><div class='del'>-	q-&gt;hw_idx = idx;</div><div class='add'>+	hwq = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*hwq), GFP_KERNEL);</div><div class='add'>+	if (!hwq)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_queue_alloc(dev, q);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	err = mt76_queue_alloc(dev, hwq, idx, n_desc, 0, MT_TX_RING_BASE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;swq);</div><div class='add'>+	q-&gt;q = hwq;</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_irq_enable(dev, MT_INT_TX_DONE(idx));</div><div class='ctx'> </div><div class='hunk'>@@ -174,15 +133,12 @@ static int</div><div class='ctx'> mt76x02_init_rx_queue(struct mt76x02_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		      int idx, int n_desc, int bufsize)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	q-&gt;regs = dev-&gt;mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;</div><div class='del'>-	q-&gt;ndesc = n_desc;</div><div class='del'>-	q-&gt;buf_size = bufsize;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_queue_alloc(dev, q);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	err = mt76_queue_alloc(dev, q, idx, n_desc, bufsize,</div><div class='add'>+			       MT_RX_RING_BASE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_irq_enable(dev, MT_INT_RX_DONE(idx));</div><div class='ctx'> </div><div class='hunk'>@@ -201,15 +157,32 @@ static void mt76x02_process_tx_status_fifo(struct mt76x02_dev *dev)</div><div class='ctx'> static void mt76x02_tx_tasklet(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = (struct mt76x02_dev *)data;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='add'>+	mt76x02_mac_poll_tx_status(dev, false);</div><div class='ctx'> 	mt76x02_process_tx_status_fifo(dev);</div><div class='ctx'> </div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt76x02_poll_tx(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = container_of(napi, struct mt76x02_dev, tx_napi);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt76x02_mac_poll_tx_status(dev, false);</div><div class='add'>+</div><div class='ctx'> 	for (i = MT_TXQ_MCU; i &gt;= 0; i--)</div><div class='ctx'> 		mt76_queue_tx_cleanup(dev, i, false);</div><div class='ctx'> </div><div class='del'>-	mt76x02_mac_poll_tx_status(dev, false);</div><div class='del'>-	mt76x02_irq_enable(dev, MT_INT_TX_DONE_ALL);</div><div class='add'>+	if (napi_complete_done(napi, 0))</div><div class='add'>+		mt76x02_irq_enable(dev, MT_INT_TX_DONE_ALL);</div><div class='add'>+</div><div class='add'>+	for (i = MT_TXQ_MCU; i &gt;= 0; i--)</div><div class='add'>+		mt76_queue_tx_cleanup(dev, i, false);</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='hunk'>@@ -219,7 +192,6 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='ctx'> 	void *status_fifo;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(sizeof(t-&gt;txwi) &lt; sizeof(struct mt76x02_txwi));</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct mt76x02_rxwi) &gt; MT_RX_HEADROOM);</div><div class='ctx'> </div><div class='ctx'> 	fifo_size = roundup_pow_of_two(32 * sizeof(struct mt76x02_tx_status));</div><div class='hunk'>@@ -227,10 +199,12 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (!status_fifo)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;dev-&gt;tx_tasklet, mt76x02_tx_tasklet, (unsigned long) dev);</div><div class='del'>-	tasklet_init(&amp;dev-&gt;pre_tbtt_tasklet, mt76x02_pre_tbtt_tasklet,</div><div class='add'>+	tasklet_init(&amp;dev-&gt;mt76.tx_tasklet, mt76x02_tx_tasklet,</div><div class='add'>+		     (unsigned long) dev);</div><div class='add'>+	tasklet_init(&amp;dev-&gt;mt76.pre_tbtt_tasklet, mt76x02_pre_tbtt_tasklet,</div><div class='ctx'> 		     (unsigned long)dev);</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;dev-&gt;txstatus_fifo_lock);</div><div class='ctx'> 	kfifo_init(&amp;dev-&gt;txstatus_fifo, status_fifo, fifo_size);</div><div class='ctx'> </div><div class='ctx'> 	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='hunk'>@@ -267,7 +241,15 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return mt76_init_queues(dev);</div><div class='add'>+	ret = mt76_init_queues(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netif_tx_napi_add(&amp;dev-&gt;mt76.napi_dev, &amp;dev-&gt;tx_napi, mt76x02_poll_tx,</div><div class='add'>+			  NAPI_POLL_WEIGHT);</div><div class='add'>+	napi_enable(&amp;dev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_dma_init);</div><div class='ctx'> </div><div class='hunk'>@@ -295,11 +277,6 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> 	intr &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_TX_DONE_ALL) {</div><div class='del'>-		mt76x02_irq_disable(dev, MT_INT_TX_DONE_ALL);</div><div class='del'>-		tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (intr &amp; MT_INT_RX_DONE(0)) {</div><div class='ctx'> 		mt76x02_irq_disable(dev, MT_INT_RX_DONE(0));</div><div class='ctx'> 		napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='hunk'>@@ -311,19 +288,22 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; MT_INT_PRE_TBTT)</div><div class='del'>-		tasklet_schedule(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+		tasklet_schedule(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	/* send buffered multicast frames now */</div><div class='ctx'> 	if (intr &amp; MT_INT_TBTT) {</div><div class='ctx'> 		if (dev-&gt;mt76.csa_complete)</div><div class='ctx'> 			mt76_csa_finish(&amp;dev-&gt;mt76);</div><div class='ctx'> 		else</div><div class='del'>-			mt76_queue_kick(dev, &amp;dev-&gt;mt76.q_tx[MT_TXQ_PSD]);</div><div class='add'>+			mt76_queue_kick(dev, dev-&gt;mt76.q_tx[MT_TXQ_PSD].q);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_TX_STAT) {</div><div class='add'>+	if (intr &amp; MT_INT_TX_STAT)</div><div class='ctx'> 		mt76x02_mac_poll_tx_status(dev, true);</div><div class='del'>-		tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; (MT_INT_TX_STAT | MT_INT_TX_DONE_ALL)) {</div><div class='add'>+		mt76x02_irq_disable(dev, MT_INT_TX_DONE_ALL);</div><div class='add'>+		napi_schedule(&amp;dev-&gt;tx_napi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; MT_INT_GPTIMER) {</div><div class='hunk'>@@ -335,18 +315,6 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_irq_handler);</div><div class='ctx'> </div><div class='del'>-void mt76x02_set_irq_mask(struct mt76x02_dev *dev, u32 clear, u32 set)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;mt76.mmio.irq_lock, flags);</div><div class='del'>-	dev-&gt;mt76.mmio.irqmask &amp;= ~clear;</div><div class='del'>-	dev-&gt;mt76.mmio.irqmask |= set;</div><div class='del'>-	mt76_wr(dev, MT_INT_MASK_CSR, dev-&gt;mt76.mmio.irqmask);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;mt76.mmio.irq_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76x02_set_irq_mask);</div><div class='del'>-</div><div class='ctx'> static void mt76x02_dma_enable(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -365,7 +333,8 @@ static void mt76x02_dma_enable(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mt76x02_dma_cleanup(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	tasklet_kill(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+	tasklet_kill(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	netif_napi_del(&amp;dev-&gt;tx_napi);</div><div class='ctx'> 	mt76_dma_cleanup(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_dma_cleanup);</div><div class='hunk'>@@ -402,13 +371,13 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		q = &amp;dev-&gt;mt76.q_tx[i];</div><div class='add'>+		q = dev-&gt;mt76.q_tx[i].q;</div><div class='ctx'> </div><div class='ctx'> 		if (!q-&gt;queued)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		prev_dma_idx = dev-&gt;mt76.tx_dma_idx[i];</div><div class='del'>-		dma_idx = ioread32(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+		dma_idx = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='ctx'> 		dev-&gt;mt76.tx_dma_idx[i] = dma_idx;</div><div class='ctx'> </div><div class='ctx'> 		if (prev_dma_idx == dma_idx)</div><div class='hunk'>@@ -418,23 +387,84 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)</div><div class='ctx'> 	return i &lt; 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mt76x02_key_sync(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct ieee80211_key_conf *key, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+	    return;</div><div class='add'>+</div><div class='add'>+	wcid = (struct mt76_wcid *) sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (wcid-&gt;hw_key_idx != key-&gt;keyidx || wcid-&gt;sw_iv)</div><div class='add'>+	    return;</div><div class='add'>+</div><div class='add'>+	mt76x02_mac_wcid_sync_pn(dev, wcid-&gt;idx, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02_reset_state(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ieee80211_iter_keys_rcu(dev-&gt;mt76.hw, NULL, mt76x02_key_sync, NULL);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.wcid); i++) {</div><div class='add'>+		struct ieee80211_sta *sta;</div><div class='add'>+		struct ieee80211_vif *vif;</div><div class='add'>+		struct mt76x02_sta *msta;</div><div class='add'>+		struct mt76_wcid *wcid;</div><div class='add'>+		void *priv;</div><div class='add'>+</div><div class='add'>+		wcid = rcu_dereference_protected(dev-&gt;mt76.wcid[i],</div><div class='add'>+					lockdep_is_held(&amp;dev-&gt;mt76.mutex));</div><div class='add'>+		if (!wcid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		priv = msta = container_of(wcid, struct mt76x02_sta, wcid);</div><div class='add'>+		sta = container_of(priv, struct ieee80211_sta, drv_priv);</div><div class='add'>+</div><div class='add'>+		priv = msta-&gt;vif;</div><div class='add'>+		vif = container_of(priv, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+		__mt76_sta_remove(&amp;dev-&gt;mt76, vif, sta);</div><div class='add'>+		memset(msta, 0, sizeof(*msta));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;vif_mask = 0;</div><div class='add'>+	dev-&gt;mt76.beacon_mask = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = dev-&gt;mt76.mmio.irqmask;</div><div class='add'>+	bool restart = dev-&gt;mt76.mcu_ops-&gt;mcu_restart;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_stop_queues(dev-&gt;mt76.hw);</div><div class='ctx'> 	set_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='ctx'> </div><div class='del'>-	tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	napi_disable(&amp;dev-&gt;tx_napi);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.napi); i++)</div><div class='ctx'> 		napi_disable(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;beacon_mask)</div><div class='add'>+	if (restart)</div><div class='add'>+		mt76x02_reset_state(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;mt76.beacon_mask)</div><div class='ctx'> 		mt76_clear(dev, MT_BEACON_TIME_CFG,</div><div class='ctx'> 			   MT_BEACON_TIME_CFG_BEACON_TX |</div><div class='ctx'> 			   MT_BEACON_TIME_CFG_TBTT_EN);</div><div class='hunk'>@@ -452,20 +482,21 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)</div><div class='ctx'> 	/* let fw reset DMA */</div><div class='ctx'> 	mt76_set(dev, 0x734, 0x3);</div><div class='ctx'> </div><div class='add'>+	if (restart)</div><div class='add'>+		mt76_mcu_restart(dev);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.q_tx); i++)</div><div class='ctx'> 		mt76_queue_tx_cleanup(dev, i, true);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.q_rx); i++)</div><div class='ctx'> 		mt76_queue_rx_reset(dev, i);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_MAC_SYS_CTRL,</div><div class='del'>-		MT_MAC_SYS_CTRL_ENABLE_TX | MT_MAC_SYS_CTRL_ENABLE_RX);</div><div class='del'>-	mt76_set(dev, MT_WPDMA_GLO_CFG,</div><div class='del'>-		 MT_WPDMA_GLO_CFG_TX_DMA_EN | MT_WPDMA_GLO_CFG_RX_DMA_EN);</div><div class='add'>+	mt76x02_mac_start(dev);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;ed_monitor)</div><div class='ctx'> 		mt76_set(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;beacon_mask)</div><div class='add'>+	if (dev-&gt;mt76.beacon_mask &amp;&amp; !restart)</div><div class='ctx'> 		mt76_set(dev, MT_BEACON_TIME_CFG,</div><div class='ctx'> 			 MT_BEACON_TIME_CFG_BEACON_TX |</div><div class='ctx'> 			 MT_BEACON_TIME_CFG_TBTT_EN);</div><div class='hunk'>@@ -476,19 +507,24 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='ctx'> </div><div class='del'>-	tasklet_enable(&amp;dev-&gt;tx_tasklet);</div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+	tasklet_enable(&amp;dev-&gt;mt76.tx_tasklet);</div><div class='add'>+	napi_enable(&amp;dev-&gt;tx_napi);</div><div class='add'>+	napi_schedule(&amp;dev-&gt;tx_napi);</div><div class='ctx'> </div><div class='del'>-	tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.napi); i++) {</div><div class='ctx'> 		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> 		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_wake_queues(dev-&gt;mt76.hw);</div><div class='del'>-</div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='add'>+	if (restart) {</div><div class='add'>+		mt76x02_mcu_function_select(dev, Q_SELECT, 1);</div><div class='add'>+		ieee80211_restart_hw(dev-&gt;mt76.hw);</div><div class='add'>+	} else {</div><div class='add'>+		ieee80211_wake_queues(dev-&gt;mt76.hw);</div><div class='add'>+		mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76x02_check_tx_hang(struct mt76x02_dev *dev)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c<br/>index a020c757ba5c..a54b63a96eae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.c</a></div><div class='hunk'>@@ -194,6 +194,8 @@ bool mt76x02_phy_adjust_vga_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev-&gt;cal.agc_lowest_gain = dev-&gt;cal.agc_gain_adjust &gt;= limit;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_phy_adjust_vga_gain);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h<br/>index 7401cb94fb72..2ce05b543dff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_regs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_regs.h</a></div><div class='hunk'>@@ -356,7 +356,10 @@</div><div class='ctx'> #define MT_BEACON_TIME_CFG_TSF_COMP	GENMASK(31, 24)</div><div class='ctx'> </div><div class='ctx'> #define MT_TBTT_SYNC_CFG		0x1118</div><div class='del'>-#define MT_TBTT_TIMER_CFG		0x1124</div><div class='add'>+#define MT_TSF_TIMER_DW0		0x111c</div><div class='add'>+#define MT_TSF_TIMER_DW1		0x1120</div><div class='add'>+#define MT_TBTT_TIMER			0x1124</div><div class='add'>+#define MT_TBTT_TIMER_VAL		GENMASK(16, 0)</div><div class='ctx'> </div><div class='ctx'> #define MT_INT_TIMER_CFG		0x1128</div><div class='ctx'> #define MT_INT_TIMER_CFG_PRE_TBTT	GENMASK(15, 0)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c<br/>index 94f47248c59f..cf7abd9b7d2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</a></div><div class='hunk'>@@ -147,36 +147,33 @@ bool mt76x02_tx_status_data(struct mt76_dev *mdev, u8 *update)</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_tx_status_data);</div><div class='ctx'> </div><div class='ctx'> int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			   struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='del'>-			   u32 *tx_info)</div><div class='add'>+			   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx_info-&gt;skb-&gt;data;</div><div class='ctx'> 	struct mt76x02_txwi *txwi = txwi_ptr;</div><div class='del'>-	int qsel = MT_QSEL_EDCA;</div><div class='del'>-	int pid;</div><div class='del'>-	int ret;</div><div class='add'>+	int hdrlen, len, pid, qsel = MT_QSEL_EDCA;</div><div class='ctx'> </div><div class='del'>-	if (q == &amp;dev-&gt;mt76.q_tx[MT_TXQ_PSD] &amp;&amp; wcid &amp;&amp; wcid-&gt;idx &lt; 128)</div><div class='add'>+	if (qid == MT_TXQ_PSD &amp;&amp; wcid &amp;&amp; wcid-&gt;idx &lt; 128)</div><div class='ctx'> 		mt76x02_mac_wcid_set_drop(dev, wcid-&gt;idx, false);</div><div class='ctx'> </div><div class='del'>-	mt76x02_mac_write_txwi(dev, txwi, skb, wcid, sta, skb-&gt;len);</div><div class='add'>+	hdrlen = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	len = tx_info-&gt;skb-&gt;len - (hdrlen &amp; 2);</div><div class='add'>+	mt76x02_mac_write_txwi(dev, txwi, tx_info-&gt;skb, wcid, sta, len);</div><div class='ctx'> </div><div class='del'>-	pid = mt76_tx_status_skb_add(mdev, wcid, skb);</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='ctx'> 	txwi-&gt;pktid = pid;</div><div class='ctx'> </div><div class='del'>-	ret = mt76x02_insert_hdr_pad(skb);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	if (pid &gt;= MT_PACKET_ID_FIRST)</div><div class='ctx'> 		qsel = MT_QSEL_MGMT;</div><div class='ctx'> </div><div class='del'>-	*tx_info = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) |</div><div class='del'>-		   MT_TXD_INFO_80211;</div><div class='add'>+	tx_info-&gt;info = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) |</div><div class='add'>+			MT_TXD_INFO_80211;</div><div class='ctx'> </div><div class='ctx'> 	if (!wcid || wcid-&gt;hw_key_idx == 0xff || wcid-&gt;sw_iv)</div><div class='del'>-		*tx_info |= MT_TXD_INFO_WIV;</div><div class='add'>+		tx_info-&gt;info |= MT_TXD_INFO_WIV;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h b/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h<br/>index 0126e51d77ed..7b53f9e57f29 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.h</a></div><div class='hunk'>@@ -26,9 +26,11 @@ int mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, const void *data,</div><div class='ctx'> </div><div class='ctx'> int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags);</div><div class='ctx'> int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,</div><div class='del'>-			    struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			    struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='del'>-			    u32 *tx_info);</div><div class='del'>-void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='del'>-			      struct mt76_queue_entry *e, bool flush);</div><div class='add'>+			    enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    struct mt76_tx_info *tx_info);</div><div class='add'>+void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			      struct mt76_queue_entry *e);</div><div class='add'>+void mt76x02u_init_beacon_config(struct mt76x02_dev *dev);</div><div class='add'>+void mt76x02u_exit_beacon_config(struct mt76x02_dev *dev);</div><div class='ctx'> #endif /* __MT76x02_USB_H */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c<br/>index 43f07461c8d3..6b89f7eab26c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@ static void mt76x02u_remove_dma_hdr(struct sk_buff *skb)</div><div class='ctx'> 		mt76x02_remove_hdr_pad(skb, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,</div><div class='del'>-			      struct mt76_queue_entry *e, bool flush)</div><div class='add'>+void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,</div><div class='add'>+			      struct mt76_queue_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	mt76x02u_remove_dma_hdr(e-&gt;skb);</div><div class='ctx'> 	mt76_tx_complete_skb(mdev, e-&gt;skb);</div><div class='hunk'>@@ -72,26 +72,26 @@ int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,</div><div class='del'>-			    struct sk_buff *skb, struct mt76_queue *q,</div><div class='del'>-			    struct mt76_wcid *wcid, struct ieee80211_sta *sta,</div><div class='del'>-			    u32 *tx_info)</div><div class='add'>+			    enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='add'>+	int pid, len = tx_info-&gt;skb-&gt;len, ep = q2ep(mdev-&gt;q_tx[qid].q-&gt;hw_idx);</div><div class='ctx'> 	struct mt76x02_txwi *txwi;</div><div class='ctx'> 	enum mt76_qsel qsel;</div><div class='del'>-	int len = skb-&gt;len;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	int pid;</div><div class='ctx'> </div><div class='del'>-	mt76x02_insert_hdr_pad(skb);</div><div class='add'>+	mt76_insert_hdr_pad(tx_info-&gt;skb);</div><div class='ctx'> </div><div class='del'>-	txwi = skb_push(skb, sizeof(struct mt76x02_txwi));</div><div class='del'>-	mt76x02_mac_write_txwi(dev, txwi, skb, wcid, sta, len);</div><div class='add'>+	txwi = (struct mt76x02_txwi *)(tx_info-&gt;skb-&gt;data - sizeof(*txwi));</div><div class='add'>+	mt76x02_mac_write_txwi(dev, txwi, tx_info-&gt;skb, wcid, sta, len);</div><div class='add'>+	skb_push(tx_info-&gt;skb, sizeof(*txwi));</div><div class='ctx'> </div><div class='del'>-	pid = mt76_tx_status_skb_add(mdev, wcid, skb);</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='ctx'> 	txwi-&gt;pktid = pid;</div><div class='ctx'> </div><div class='del'>-	if (pid &gt;= MT_PACKET_ID_FIRST || q2ep(q-&gt;hw_idx) == MT_EP_OUT_HCCA)</div><div class='add'>+	if (pid &gt;= MT_PACKET_ID_FIRST || ep == MT_EP_OUT_HCCA)</div><div class='ctx'> 		qsel = MT_QSEL_MGMT;</div><div class='ctx'> 	else</div><div class='ctx'> 		qsel = MT_QSEL_EDCA;</div><div class='hunk'>@@ -101,6 +101,167 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,</div><div class='ctx'> 	if (!wcid || wcid-&gt;hw_key_idx == 0xff || wcid-&gt;sw_iv)</div><div class='ctx'> 		flags |= MT_TXD_INFO_WIV;</div><div class='ctx'> </div><div class='del'>-	return mt76x02u_skb_dma_info(skb, WLAN_PORT, flags);</div><div class='add'>+	return mt76x02u_skb_dma_info(tx_info-&gt;skb, WLAN_PORT, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02u_tx_prepare_skb);</div><div class='add'>+</div><div class='add'>+/* Trigger pre-TBTT event 8 ms before TBTT */</div><div class='add'>+#define PRE_TBTT_USEC 8000</div><div class='add'>+</div><div class='add'>+/* Beacon SRAM memory is limited to 8kB. We need to send PS buffered frames</div><div class='add'>+ * (which can be 1500 bytes big) via beacon memory. That make limit of number</div><div class='add'>+ * of slots to 5. TODO: dynamically calculate offsets in beacon SRAM.</div><div class='add'>+ */</div><div class='add'>+#define N_BCN_SLOTS 5</div><div class='add'>+</div><div class='add'>+static void mt76x02u_start_pre_tbtt_timer(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u64 time;</div><div class='add'>+	u32 tbtt;</div><div class='add'>+</div><div class='add'>+	/* Get remaining TBTT in usec */</div><div class='add'>+	tbtt = mt76_get_field(dev, MT_TBTT_TIMER, MT_TBTT_TIMER_VAL);</div><div class='add'>+	tbtt *= 32;</div><div class='add'>+</div><div class='add'>+	if (tbtt &lt;= PRE_TBTT_USEC) {</div><div class='add'>+		queue_work(system_highpri_wq, &amp;dev-&gt;pre_tbtt_work);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time = (tbtt - PRE_TBTT_USEC) * 1000ull;</div><div class='add'>+	hrtimer_start(&amp;dev-&gt;pre_tbtt_timer, time, HRTIMER_MODE_REL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02u_restart_pre_tbtt_timer(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 tbtt, dw0, dw1;</div><div class='add'>+	u64 tsf, time;</div><div class='add'>+</div><div class='add'>+	/* Get remaining TBTT in usec */</div><div class='add'>+	tbtt = mt76_get_field(dev, MT_TBTT_TIMER, MT_TBTT_TIMER_VAL);</div><div class='add'>+	tbtt *= 32;</div><div class='add'>+</div><div class='add'>+	dw0 = mt76_rr(dev, MT_TSF_TIMER_DW0);</div><div class='add'>+	dw1 = mt76_rr(dev, MT_TSF_TIMER_DW1);</div><div class='add'>+	tsf = (u64)dw0 &lt;&lt; 32 | dw1;</div><div class='add'>+	dev_dbg(dev-&gt;mt76.dev, "TSF: %llu us TBTT %u us\n", tsf, tbtt);</div><div class='add'>+</div><div class='add'>+	/* Convert beacon interval in TU (1024 usec) to nsec */</div><div class='add'>+	time = ((1000000000ull * dev-&gt;mt76.beacon_int) &gt;&gt; 10);</div><div class='add'>+</div><div class='add'>+	/* Adjust time to trigger hrtimer 8ms before TBTT */</div><div class='add'>+	if (tbtt &lt; PRE_TBTT_USEC)</div><div class='add'>+		time -= (PRE_TBTT_USEC - tbtt) * 1000ull;</div><div class='add'>+	else</div><div class='add'>+		time += (tbtt - PRE_TBTT_USEC) * 1000ull;</div><div class='add'>+</div><div class='add'>+	hrtimer_start(&amp;dev-&gt;pre_tbtt_timer, time, HRTIMER_MODE_REL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02u_stop_pre_tbtt_timer(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		hrtimer_cancel(&amp;dev-&gt;pre_tbtt_timer);</div><div class='add'>+		cancel_work_sync(&amp;dev-&gt;pre_tbtt_work);</div><div class='add'>+		/* Timer can be rearmed by work. */</div><div class='add'>+	} while (hrtimer_active(&amp;dev-&gt;pre_tbtt_timer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02u_pre_tbtt_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev =</div><div class='add'>+		container_of(work, struct mt76x02_dev, pre_tbtt_work);</div><div class='add'>+	struct beacon_bc_data data = {};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int i, nbeacons;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;mt76.beacon_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76x02_resync_beacon_timer(dev);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces(mt76_hw(dev),</div><div class='add'>+		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+		mt76x02_update_beacon_iter, dev);</div><div class='add'>+</div><div class='add'>+	nbeacons = hweight8(dev-&gt;mt76.beacon_mask);</div><div class='add'>+	mt76x02_enqueue_buffered_bc(dev, &amp;data, N_BCN_SLOTS - nbeacons);</div><div class='add'>+</div><div class='add'>+	for (i = nbeacons; i &lt; N_BCN_SLOTS; i++) {</div><div class='add'>+		skb = __skb_dequeue(&amp;data.q);</div><div class='add'>+		mt76x02_mac_set_beacon(dev, i, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76x02u_restart_pre_tbtt_timer(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart mt76x02u_pre_tbtt_interrupt(struct hrtimer *timer)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev =</div><div class='add'>+	    container_of(timer, struct mt76x02_dev, pre_tbtt_timer);</div><div class='add'>+</div><div class='add'>+	queue_work(system_highpri_wq, &amp;dev-&gt;pre_tbtt_work);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02u_pre_tbtt_enable(struct mt76x02_dev *dev, bool en)</div><div class='add'>+{</div><div class='add'>+	if (en &amp;&amp; dev-&gt;mt76.beacon_mask &amp;&amp;</div><div class='add'>+	    !hrtimer_active(&amp;dev-&gt;pre_tbtt_timer))</div><div class='add'>+		mt76x02u_start_pre_tbtt_timer(dev);</div><div class='add'>+	if (!en)</div><div class='add'>+		mt76x02u_stop_pre_tbtt_timer(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt76x02u_beacon_enable(struct mt76x02_dev *dev, bool en)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!dev-&gt;mt76.beacon_int))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		mt76x02u_start_pre_tbtt_timer(dev);</div><div class='add'>+	} else {</div><div class='add'>+		/* Timer is already stopped, only clean up</div><div class='add'>+		 * PS buffered frames if any.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; N_BCN_SLOTS; i++)</div><div class='add'>+			mt76x02_mac_set_beacon(dev, i, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76x02u_init_beacon_config(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76x02_beacon_ops beacon_ops = {</div><div class='add'>+		.nslots = N_BCN_SLOTS,</div><div class='add'>+		.slot_size = (8192 / N_BCN_SLOTS) &amp; ~63,</div><div class='add'>+		.pre_tbtt_enable = mt76x02u_pre_tbtt_enable,</div><div class='add'>+		.beacon_enable = mt76x02u_beacon_enable,</div><div class='add'>+	};</div><div class='add'>+	dev-&gt;beacon_ops = &amp;beacon_ops;</div><div class='add'>+</div><div class='add'>+	hrtimer_init(&amp;dev-&gt;pre_tbtt_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='add'>+	dev-&gt;pre_tbtt_timer.function = mt76x02u_pre_tbtt_interrupt;</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;pre_tbtt_work, mt76x02u_pre_tbtt_work);</div><div class='add'>+</div><div class='add'>+	mt76x02_init_beacon_config(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02u_init_beacon_config);</div><div class='add'>+</div><div class='add'>+void mt76x02u_exit_beacon_config(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(MT76_REMOVED, &amp;dev-&gt;mt76.state))</div><div class='add'>+		mt76_clear(dev, MT_BEACON_TIME_CFG,</div><div class='add'>+			   MT_BEACON_TIME_CFG_TIMER_EN |</div><div class='add'>+			   MT_BEACON_TIME_CFG_SYNC_MODE |</div><div class='add'>+			   MT_BEACON_TIME_CFG_TBTT_EN |</div><div class='add'>+			   MT_BEACON_TIME_CFG_BEACON_TX);</div><div class='add'>+</div><div class='add'>+	mt76x02u_stop_pre_tbtt_timer(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x02u_exit_beacon_config);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c<br/>index a48c261b0c63..ad5323447ed4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x02_util.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x02_util.c</a></div><div class='hunk'>@@ -132,7 +132,7 @@ void mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='ctx'> 	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='ctx'> 	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;dev-&gt;mac_work, mt76x02_mac_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mt76.mac_work, mt76x02_mac_work);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;queues = 4;</div><div class='ctx'> 	hw-&gt;max_rates = 1;</div><div class='hunk'>@@ -142,6 +142,7 @@ void mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	wiphy-&gt;interface_modes =</div><div class='ctx'> 		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='ctx'> 		BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='ctx'> #endif</div><div class='hunk'>@@ -158,7 +159,6 @@ void mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='ctx'> 		wiphy-&gt;reg_notifier = mt76x02_regd_notifier;</div><div class='ctx'> 		wiphy-&gt;iface_combinations = mt76x02_if_comb;</div><div class='ctx'> 		wiphy-&gt;n_iface_combinations = ARRAY_SIZE(mt76x02_if_comb);</div><div class='del'>-		wiphy-&gt;interface_modes |= BIT(NL80211_IFTYPE_AP);</div><div class='ctx'> 		wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;</div><div class='ctx'> </div><div class='ctx'> 		/* init led callbacks */</div><div class='hunk'>@@ -237,6 +237,8 @@ int mt76x02_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> </div><div class='add'>+	memset(msta, 0, sizeof(*msta));</div><div class='add'>+</div><div class='ctx'> 	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, ARRAY_SIZE(dev-&gt;mt76.wcid));</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return -ENOSPC;</div><div class='hunk'>@@ -274,6 +276,8 @@ mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_txq *mtxq;</div><div class='ctx'> </div><div class='add'>+	memset(mvif, 0, sizeof(*mvif));</div><div class='add'>+</div><div class='ctx'> 	mvif-&gt;idx = idx;</div><div class='ctx'> 	mvif-&gt;group_wcid.idx = MT_VIF_WCID(idx);</div><div class='ctx'> 	mvif-&gt;group_wcid.hw_key_idx = -1;</div><div class='hunk'>@@ -289,6 +293,12 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	unsigned int idx = 0;</div><div class='ctx'> </div><div class='add'>+	/* Allow to change address in HW if we create first interface. */</div><div class='add'>+	if (!dev-&gt;vif_mask &amp;&amp;</div><div class='add'>+	    (((vif-&gt;addr[0] ^ dev-&gt;mt76.macaddr[0]) &amp; ~GENMASK(4, 1)) ||</div><div class='add'>+	     memcmp(vif-&gt;addr + 1, dev-&gt;mt76.macaddr + 1, ETH_ALEN - 1)))</div><div class='add'>+		mt76x02_mac_setaddr(dev, vif-&gt;addr);</div><div class='add'>+</div><div class='ctx'> 	if (vif-&gt;addr[0] &amp; BIT(1))</div><div class='ctx'> 		idx = 1 + (((dev-&gt;mt76.macaddr[0] ^ vif-&gt;addr[0]) &gt;&gt; 2) &amp; 7);</div><div class='ctx'> </div><div class='hunk'>@@ -311,10 +321,6 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	if (dev-&gt;vif_mask &amp; BIT(idx))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	/* Allow to change address in HW if we create first interface. */</div><div class='del'>-	if (!dev-&gt;vif_mask &amp;&amp; !ether_addr_equal(dev-&gt;mt76.macaddr, vif-&gt;addr))</div><div class='del'>-                mt76x02_mac_setaddr(dev, vif-&gt;addr);</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;vif_mask |= BIT(idx);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_vif_init(dev, vif, idx);</div><div class='hunk'>@@ -372,7 +378,7 @@ int mt76x02_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		ieee80211_send_bar(vif, sta-&gt;addr, tid, mtxq-&gt;agg_ssn);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		mtxq-&gt;agg_ssn = *ssn &lt;&lt; 4;</div><div class='add'>+		mtxq-&gt;agg_ssn = IEEE80211_SN_TO_SEQ(*ssn);</div><div class='ctx'> 		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='hunk'>@@ -418,6 +424,16 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * In USB AP mode, broadcast/multicast frames are setup in beacon</div><div class='add'>+	 * data registers and sent via HW beacons engine, they require to</div><div class='add'>+	 * be already encrypted.</div><div class='add'>+	 */</div><div class='add'>+	if (mt76_is_usb(dev) &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	msta = sta ? (struct mt76x02_sta *) sta-&gt;drv_priv : NULL;</div><div class='ctx'> 	wcid = msta ? &amp;msta-&gt;wcid : &amp;mvif-&gt;group_wcid;</div><div class='ctx'> </div><div class='hunk'>@@ -459,7 +475,7 @@ int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	u8 cw_min = 5, cw_max = 10, qid;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	qid = dev-&gt;mt76.q_tx[queue].hw_idx;</div><div class='add'>+	qid = dev-&gt;mt76.q_tx[queue].q-&gt;hw_idx;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;cw_min)</div><div class='ctx'> 		cw_min = fls(params-&gt;cw_min);</div><div class='hunk'>@@ -556,26 +572,9 @@ void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,</div><div class='ctx'> 	rate.idx = rates-&gt;rate[0].idx;</div><div class='ctx'> 	rate.flags = rates-&gt;rate[0].flags;</div><div class='ctx'> 	mt76x02_mac_wcid_set_rate(dev, &amp;msta-&gt;wcid, &amp;rate);</div><div class='del'>-	msta-&gt;wcid.max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, &amp;rate);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_sta_rate_tbl_update);</div><div class='ctx'> </div><div class='del'>-int mt76x02_insert_hdr_pad(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int len = ieee80211_get_hdrlen_from_skb(skb);</div><div class='del'>-</div><div class='del'>-	if (len % 4 == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	skb_push(skb, 2);</div><div class='del'>-	memmove(skb-&gt;data, skb-&gt;data + 2, len);</div><div class='del'>-</div><div class='del'>-	skb-&gt;data[len] = 0;</div><div class='del'>-	skb-&gt;data[len + 1] = 0;</div><div class='del'>-	return 2;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76x02_insert_hdr_pad);</div><div class='del'>-</div><div class='ctx'> void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int hdrlen;</div><div class='hunk'>@@ -594,8 +593,6 @@ void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (mt76_is_mmio(dev))</div><div class='del'>-		tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='ctx'> 	set_bit(MT76_SCANNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_sw_scan);</div><div class='hunk'>@@ -606,9 +603,6 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_SCANNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-	if (mt76_is_mmio(dev))</div><div class='del'>-		tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;cal.gain_init_done) {</div><div class='ctx'> 		/* Restore AGC gain and resume calibration after scanning. */</div><div class='ctx'> 		dev-&gt;cal.low_gain = -1;</div><div class='hunk'>@@ -625,72 +619,11 @@ void mt76x02_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta,</div><div class='ctx'> 	int idx = msta-&gt;wcid.idx;</div><div class='ctx'> </div><div class='ctx'> 	mt76_stop_tx_queues(&amp;dev-&gt;mt76, sta, true);</div><div class='del'>-	mt76x02_mac_wcid_set_drop(dev, idx, ps);</div><div class='add'>+	if (mt76_is_mmio(dev))</div><div class='add'>+		mt76x02_mac_wcid_set_drop(dev, idx, ps);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_sta_ps);</div><div class='ctx'> </div><div class='del'>-const u16 mt76x02_beacon_offsets[16] = {</div><div class='del'>-	/* 1024 byte per beacon */</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc400,</div><div class='del'>-	0xc800,</div><div class='del'>-	0xcc00,</div><div class='del'>-	0xd000,</div><div class='del'>-	0xd400,</div><div class='del'>-	0xd800,</div><div class='del'>-	0xdc00,</div><div class='del'>-	/* BSS idx 8-15 not used for beacons */</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-	0xc000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void mt76x02_set_beacon_offsets(struct mt76x02_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u16 val, base = MT_BEACON_BASE;</div><div class='del'>-	u32 regs[4] = {};</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'>-		val = mt76x02_beacon_offsets[i] - base;</div><div class='del'>-		regs[i / 4] |= (val / 64) &lt;&lt; (8 * (i % 4));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		mt76_wr(dev, MT_BCN_OFFSET(i), regs[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt76x02_init_beacon_config(struct mt76x02_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (mt76_is_mmio(dev)) {</div><div class='del'>-		/* Fire a pre-TBTT interrupt 8 ms before TBTT */</div><div class='del'>-		mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_PRE_TBTT,</div><div class='del'>-			       8 &lt;&lt; 4);</div><div class='del'>-		mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_GP_TIMER,</div><div class='del'>-			       MT_DFS_GP_INTERVAL);</div><div class='del'>-		mt76_wr(dev, MT_INT_TIMER_EN, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt76_clear(dev, MT_BEACON_TIME_CFG, (MT_BEACON_TIME_CFG_TIMER_EN |</div><div class='del'>-					     MT_BEACON_TIME_CFG_TBTT_EN |</div><div class='del'>-					     MT_BEACON_TIME_CFG_BEACON_TX));</div><div class='del'>-	mt76_set(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_SYNC_MODE);</div><div class='del'>-	mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xffff);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		mt76x02_mac_set_beacon(dev, i, NULL);</div><div class='del'>-</div><div class='del'>-	mt76x02_set_beacon_offsets(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);</div><div class='del'>-</div><div class='ctx'> void mt76x02_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			      struct ieee80211_vif *vif,</div><div class='ctx'> 			      struct ieee80211_bss_conf *info,</div><div class='hunk'>@@ -712,7 +645,7 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		mt76_rmw_field(dev, MT_BEACON_TIME_CFG,</div><div class='ctx'> 			       MT_BEACON_TIME_CFG_INTVAL,</div><div class='ctx'> 			       info-&gt;beacon_int &lt;&lt; 4);</div><div class='del'>-		dev-&gt;beacon_int = info-&gt;beacon_int;</div><div class='add'>+		dev-&gt;mt76.beacon_int = info-&gt;beacon_int;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BEACON_ENABLED)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c<br/>index f8534362e2c8..c6078e90ca43 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/init.c</a></div><div class='hunk'>@@ -106,7 +106,7 @@ void mt76_write_mac_initvals(struct mt76x02_dev *dev)</div><div class='ctx'> 		{ MT_TX_SW_CFG1,		0x00010000 },</div><div class='ctx'> 		{ MT_TX_SW_CFG2,		0x00000000 },</div><div class='ctx'> 		{ MT_TXOP_CTRL_CFG,		0x0400583f },</div><div class='del'>-		{ MT_TX_RTS_CFG,		0x00100020 },</div><div class='add'>+		{ MT_TX_RTS_CFG,		0x00ffff20 },</div><div class='ctx'> 		{ MT_TX_TIMEOUT_CFG,		0x000a2290 },</div><div class='ctx'> 		{ MT_TX_RETRY_CFG,		0x47f01f0f },</div><div class='ctx'> 		{ MT_EXP_ACK_TIME,		0x002c00dc },</div><div class='hunk'>@@ -165,27 +165,21 @@ void mt76x2_init_txpower(struct mt76x02_dev *dev,</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct mt76x2_tx_power_info txp;</div><div class='ctx'> 	struct mt76_rate_power t = {};</div><div class='del'>-	int target_power;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='ctx'> 		chan = &amp;sband-&gt;channels[i];</div><div class='ctx'> </div><div class='ctx'> 		mt76x2_get_power_info(dev, &amp;txp, chan);</div><div class='del'>-</div><div class='del'>-		target_power = max_t(int, (txp.chain[0].target_power +</div><div class='del'>-					   txp.chain[0].delta),</div><div class='del'>-					  (txp.chain[1].target_power +</div><div class='del'>-					   txp.chain[1].delta));</div><div class='del'>-</div><div class='ctx'> 		mt76x2_get_rate_power(dev, &amp;t, chan);</div><div class='ctx'> </div><div class='ctx'> 		chan-&gt;max_power = mt76x02_get_max_rate_power(&amp;t) +</div><div class='del'>-				  target_power;</div><div class='del'>-		chan-&gt;max_power /= 2;</div><div class='add'>+				  txp.target_power;</div><div class='add'>+		chan-&gt;max_power = DIV_ROUND_UP(chan-&gt;max_power, 2);</div><div class='ctx'> </div><div class='ctx'> 		/* convert to combined output power on 2x2 devices */</div><div class='ctx'> 		chan-&gt;max_power += 3;</div><div class='add'>+		chan-&gt;orig_mpwr = chan-&gt;max_power;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x2_init_txpower);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h<br/>index 6c619f1c65c9..d7abe3d73bad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h</a></div><div class='hunk'>@@ -71,6 +71,7 @@ int mt76x2_mcu_load_cr(struct mt76x02_dev *dev, u8 type, u8 temp_level,</div><div class='ctx'> </div><div class='ctx'> void mt76x2_cleanup(struct mt76x02_dev *dev);</div><div class='ctx'> </div><div class='add'>+int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard);</div><div class='ctx'> void mt76x2_reset_wlan(struct mt76x02_dev *dev, bool enable);</div><div class='ctx'> void mt76x2_init_txpower(struct mt76x02_dev *dev,</div><div class='ctx'> 			 struct ieee80211_supported_band *sband);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c<br/>index 6274655e1f7e..e84d5c5911ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='ctx'> 		.txwi_size = sizeof(struct mt76x02_txwi),</div><div class='add'>+		.tx_aligned4_skbs = true,</div><div class='ctx'> 		.update_survey = mt76x02_update_channel,</div><div class='ctx'> 		.tx_prepare_skb = mt76x02_tx_prepare_skb,</div><div class='ctx'> 		.tx_complete_skb = mt76x02_tx_complete_skb,</div><div class='hunk'>@@ -106,7 +107,7 @@ mt76pci_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mt76_unregister_device(mdev);</div><div class='ctx'> 	mt76x2_cleanup(dev);</div><div class='del'>-	ieee80211_free_hw(mdev-&gt;hw);</div><div class='add'>+	mt76_free_device(mdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mt76pci_device_table);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c<br/>index 984d9c4c2e1a..71aea2832644 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ mt76x2_fixup_xtal(struct mt76x02_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)</div><div class='add'>+int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *macaddr = dev-&gt;mt76.macaddr;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -120,7 +120,7 @@ static int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)</div><div class='ctx'> 	mt76_clear(dev, MT_FCE_L2_STUFF, MT_FCE_L2_STUFF_WR_MPDU_LEN_EN);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_mac_setaddr(dev, macaddr);</div><div class='del'>-	mt76x02_init_beacon_config(dev);</div><div class='add'>+	mt76x02e_init_beacon_config(dev);</div><div class='ctx'> 	if (!hard)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +291,7 @@ static int mt76x2_init_hardware(struct mt76x02_dev *dev)</div><div class='ctx'> void mt76x2_stop_hardware(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mac_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;wdt_work);</div><div class='ctx'> 	mt76x02_mcu_set_radio_state(dev, false);</div><div class='ctx'> 	mt76x2_mac_stop(dev, false);</div><div class='hunk'>@@ -300,7 +300,7 @@ void mt76x2_stop_hardware(struct mt76x02_dev *dev)</div><div class='ctx'> void mt76x2_cleanup(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	tasklet_disable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	mt76x2_stop_hardware(dev);</div><div class='ctx'> 	mt76x02_dma_cleanup(dev);</div><div class='ctx'> 	mt76x02_mcu_cleanup(dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c<br/>index 878ce92405ed..e416eee6a306 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c</a></div><div class='hunk'>@@ -22,26 +22,21 @@ mt76x2_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	ret = mt76x2_mac_start(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76x2_phy_start(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     MT_MAC_WORK_INTERVAL);</div><div class='ctx'> 	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;wdt_work,</div><div class='ctx'> 				     MT_WATCHDOG_TIME);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -49,10 +44,8 @@ mt76x2_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> 	mt76x2_stop_hardware(dev);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -66,7 +59,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='ctx'> </div><div class='ctx'> 	mt76_set_channel(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='del'>-	tasklet_disable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	tasklet_disable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	mt76x2_mac_stop(dev, true);</div><div class='hunk'>@@ -80,7 +73,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='ctx'> </div><div class='ctx'> 	mt76x2_mac_resume(dev);</div><div class='ctx'> 	tasklet_enable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='del'>-	tasklet_enable(&amp;dev-&gt;pre_tbtt_tasklet);</div><div class='add'>+	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='ctx'> </div><div class='hunk'>@@ -135,12 +128,6 @@ mt76x2_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt76x2_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,</div><div class='ctx'> 			      u32 rx_ant)</div><div class='ctx'> {</div><div class='hunk'>@@ -197,7 +184,7 @@ const struct ieee80211_ops mt76x2_ops = {</div><div class='ctx'> 	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> 	.set_coverage_class = mt76x02_set_coverage_class,</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='del'>-	.set_tim = mt76x2_set_tim,</div><div class='add'>+	.set_tim = mt76_set_tim,</div><div class='ctx'> 	.set_antenna = mt76x2_set_antenna,</div><div class='ctx'> 	.get_antenna = mt76x2_get_antenna,</div><div class='ctx'> 	.set_rts_threshold = mt76x02_set_rts_threshold,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c<br/>index 03e24ae7f66c..605dc66ae83b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a></div><div class='hunk'>@@ -165,9 +165,30 @@ error:</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt76pci_mcu_restart(struct mt76_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt76x02_mcu_cleanup(dev);</div><div class='add'>+	mt76x2_mac_reset(dev, true);</div><div class='add'>+</div><div class='add'>+	ret = mt76pci_load_firmware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WPDMA_RST_IDX, ~0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt76x2_mcu_init(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_mcu_ops mt76x2_mcu_ops = {</div><div class='add'>+		.mcu_restart = mt76pci_mcu_restart,</div><div class='ctx'> 		.mcu_send_msg = mt76x02_mcu_msg_send,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c<br/>index 1848e8ab2e21..cdedf95ca4f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.c</a></div><div class='hunk'>@@ -161,12 +161,12 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)</div><div class='ctx'> 		delta = txp.delta_bw80;</div><div class='ctx'> </div><div class='ctx'> 	mt76x2_get_rate_power(dev, &amp;t, chan);</div><div class='del'>-	mt76x02_add_rate_power_offset(&amp;t, txp.chain[0].target_power);</div><div class='add'>+	mt76x02_add_rate_power_offset(&amp;t, txp.target_power + delta);</div><div class='ctx'> 	mt76x02_limit_rate_power(&amp;t, dev-&gt;mt76.txpower_conf);</div><div class='ctx'> 	dev-&gt;mt76.txpower_cur = mt76x02_get_max_rate_power(&amp;t);</div><div class='ctx'> </div><div class='ctx'> 	base_power = mt76x2_get_min_rate_power(&amp;t);</div><div class='del'>-	delta += base_power - txp.chain[0].target_power;</div><div class='add'>+	delta = base_power - txp.target_power;</div><div class='ctx'> 	txp_0 = txp.chain[0].target_power + txp.chain[0].delta + delta;</div><div class='ctx'> 	txp_1 = txp.chain[1].target_power + txp.chain[1].delta + delta;</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +182,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_add_rate_power_offset(&amp;t, -base_power);</div><div class='del'>-	dev-&gt;target_power = txp.chain[0].target_power;</div><div class='add'>+	dev-&gt;target_power = txp.target_power;</div><div class='ctx'> 	dev-&gt;target_power_delta[0] = txp_0 - txp.chain[0].target_power;</div><div class='ctx'> 	dev-&gt;target_power_delta[1] = txp_1 - txp.chain[0].target_power;</div><div class='ctx'> 	dev-&gt;mt76.rate_power = t;</div><div class='hunk'>@@ -260,10 +260,15 @@ mt76x2_phy_set_gain_val(struct mt76x02_dev *dev)</div><div class='ctx'> 	gain_val[0] = dev-&gt;cal.agc_gain_cur[0] - dev-&gt;cal.agc_gain_adjust;</div><div class='ctx'> 	gain_val[1] = dev-&gt;cal.agc_gain_cur[1] - dev-&gt;cal.agc_gain_adjust;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mt76.chandef.width &gt;= NL80211_CHAN_WIDTH_40)</div><div class='add'>+	val = 0x1836 &lt;&lt; 16;</div><div class='add'>+	if (!mt76x2_has_ext_lna(dev) &amp;&amp;</div><div class='add'>+	    dev-&gt;mt76.chandef.width &gt;= NL80211_CHAN_WIDTH_40)</div><div class='ctx'> 		val = 0x1e42 &lt;&lt; 16;</div><div class='del'>-	else</div><div class='del'>-		val = 0x1836 &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	if (mt76x2_has_ext_lna(dev) &amp;&amp;</div><div class='add'>+	    dev-&gt;mt76.chandef.chan-&gt;band == NL80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+	    dev-&gt;mt76.chandef.width &lt; NL80211_CHAN_WIDTH_40)</div><div class='add'>+		val = 0x0f36 &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 	val |= 0xf8;</div><div class='ctx'> </div><div class='hunk'>@@ -280,6 +285,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *gain = dev-&gt;cal.agc_gain_init;</div><div class='ctx'> 	u8 low_gain_delta, gain_delta;</div><div class='add'>+	u32 agc_35, agc_37;</div><div class='ctx'> 	bool gain_change;</div><div class='ctx'> 	int low_gain;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -318,6 +324,16 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		low_gain_delta = 14;</div><div class='ctx'> </div><div class='add'>+	agc_37 = 0x2121262c;</div><div class='add'>+	if (dev-&gt;mt76.chandef.chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='add'>+		agc_35 = 0x11111516;</div><div class='add'>+	else if (low_gain == 2)</div><div class='add'>+		agc_35 = agc_37 = 0x08080808;</div><div class='add'>+	else if (dev-&gt;mt76.chandef.width == NL80211_CHAN_WIDTH_80)</div><div class='add'>+		agc_35 = 0x10101014;</div><div class='add'>+	else</div><div class='add'>+		agc_35 = 0x11111116;</div><div class='add'>+</div><div class='ctx'> 	if (low_gain == 2) {</div><div class='ctx'> 		mt76_wr(dev, MT_BBP(RXO, 18), 0xf000a990);</div><div class='ctx'> 		mt76_wr(dev, MT_BBP(AGC, 35), 0x08080808);</div><div class='hunk'>@@ -326,15 +342,13 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 		dev-&gt;cal.agc_gain_adjust = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mt76_wr(dev, MT_BBP(RXO, 18), 0xf000a991);</div><div class='del'>-		if (dev-&gt;mt76.chandef.width == NL80211_CHAN_WIDTH_80)</div><div class='del'>-			mt76_wr(dev, MT_BBP(AGC, 35), 0x10101014);</div><div class='del'>-		else</div><div class='del'>-			mt76_wr(dev, MT_BBP(AGC, 35), 0x11111116);</div><div class='del'>-		mt76_wr(dev, MT_BBP(AGC, 37), 0x2121262C);</div><div class='ctx'> 		gain_delta = 0;</div><div class='ctx'> 		dev-&gt;cal.agc_gain_adjust = low_gain_delta;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mt76_wr(dev, MT_BBP(AGC, 35), agc_35);</div><div class='add'>+	mt76_wr(dev, MT_BBP(AGC, 37), agc_37);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;cal.agc_gain_cur[0] = gain[0] - gain_delta;</div><div class='ctx'> 	dev-&gt;cal.agc_gain_cur[1] = gain[1] - gain_delta;</div><div class='ctx'> 	mt76x2_phy_set_gain_val(dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c<br/>index ddb6b2c48e01..7a994a783510 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a></div><div class='hunk'>@@ -21,11 +21,10 @@</div><div class='ctx'> #include "mt76x2u.h"</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id mt76x2u_device_table[] = {</div><div class='del'>-	{ USB_DEVICE(0x0e8d, 0x7612) }, /* Alfa AWUS036ACM */</div><div class='ctx'> 	{ USB_DEVICE(0x0b05, 0x1833) },	/* Asus USB-AC54 */</div><div class='ctx'> 	{ USB_DEVICE(0x0b05, 0x17eb) },	/* Asus USB-AC55 */</div><div class='ctx'> 	{ USB_DEVICE(0x0b05, 0x180b) },	/* Asus USB-N53 B1 */</div><div class='del'>-	{ USB_DEVICE(0x0e8d, 0x7612) },	/* Aukey USB-AC1200 */</div><div class='add'>+	{ USB_DEVICE(0x0e8d, 0x7612) },	/* Aukey USBAC1200 - Alfa AWUS036ACM */</div><div class='ctx'> 	{ USB_DEVICE(0x057c, 0x8503) },	/* Avm FRITZ!WLAN AC860 */</div><div class='ctx'> 	{ USB_DEVICE(0x7392, 0xb711) },	/* Edimax EW 7722 UAC */</div><div class='ctx'> 	{ USB_DEVICE(0x0846, 0x9053) },	/* Netgear A6210 */</div><div class='hunk'>@@ -41,6 +40,7 @@ static int mt76x2u_probe(struct usb_interface *intf,</div><div class='ctx'> 		.tx_complete_skb = mt76x02u_tx_complete_skb,</div><div class='ctx'> 		.tx_status_data = mt76x02_tx_status_data,</div><div class='ctx'> 		.rx_skb = mt76x02_queue_rx_skb,</div><div class='add'>+		.sta_ps = mt76x02_sta_ps,</div><div class='ctx'> 		.sta_add = mt76x02_sta_add,</div><div class='ctx'> 		.sta_remove = mt76x02_sta_remove,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -49,7 +49,7 @@ static int mt76x2u_probe(struct usb_interface *intf,</div><div class='ctx'> 	struct mt76_dev *mdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mdev = mt76_alloc_device(&amp;intf-&gt;dev, sizeof(*dev), &amp;mt76x2u_ops,</div><div class='add'>+	mdev = mt76_alloc_device(&amp;udev-&gt;dev, sizeof(*dev), &amp;mt76x2u_ops,</div><div class='ctx'> 				 &amp;drv_ops);</div><div class='ctx'> 	if (!mdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -59,6 +59,8 @@ static int mt76x2u_probe(struct usb_interface *intf,</div><div class='ctx'> 	udev = usb_get_dev(udev);</div><div class='ctx'> 	usb_reset_device(udev);</div><div class='ctx'> </div><div class='add'>+	usb_set_intfdata(intf, dev);</div><div class='add'>+</div><div class='ctx'> 	mt76x02u_init_mcu(mdev);</div><div class='ctx'> 	err = mt76u_init(mdev, intf);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -66,6 +68,10 @@ static int mt76x2u_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	mdev-&gt;rev = mt76_rr(dev, MT_ASIC_VERSION);</div><div class='ctx'> 	dev_info(mdev-&gt;dev, "ASIC revision: %08x\n", mdev-&gt;rev);</div><div class='add'>+	if (!is_mt76x2(dev)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = mt76x2u_register_device(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -101,8 +107,7 @@ static int __maybe_unused mt76x2u_suspend(struct usb_interface *intf,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = usb_get_intfdata(intf);</div><div class='ctx'> </div><div class='del'>-	mt76u_stop_queues(&amp;dev-&gt;mt76);</div><div class='del'>-	mt76x2u_stop_hw(dev);</div><div class='add'>+	mt76u_stop_rx(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -110,16 +115,12 @@ static int __maybe_unused mt76x2u_suspend(struct usb_interface *intf,</div><div class='ctx'> static int __maybe_unused mt76x2u_resume(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = usb_get_intfdata(intf);</div><div class='del'>-	struct mt76_usb *usb = &amp;dev-&gt;mt76.usb;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mt76u_submit_rx_buffers(&amp;dev-&gt;mt76);</div><div class='add'>+	err = mt76u_resume_rx(&amp;dev-&gt;mt76);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	tasklet_enable(&amp;usb-&gt;rx_tasklet);</div><div class='del'>-	tasklet_enable(&amp;usb-&gt;tx_tasklet);</div><div class='del'>-</div><div class='ctx'> 	err = mt76x2u_init_hardware(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c<br/>index 1da90e58d942..f2c57d5b87f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c</a></div><div class='hunk'>@@ -183,7 +183,7 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev)</div><div class='ctx'> 			mt76x02_mac_shared_key_setup(dev, i, k, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt76x02_init_beacon_config(dev);</div><div class='add'>+	mt76x02u_init_beacon_config(dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76_rmw(dev, MT_US_CYC_CFG, MT_US_CYC_CNT, 0x1e);</div><div class='ctx'> 	mt76_wr(dev, MT_TXOP_CTRL_CFG, 0x583f);</div><div class='hunk'>@@ -244,9 +244,8 @@ fail:</div><div class='ctx'> </div><div class='ctx'> void mt76x2u_stop_hw(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	mt76u_stop_stat_wk(&amp;dev-&gt;mt76);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mac_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mt76.mac_work);</div><div class='ctx'> 	mt76x2u_mac_stop(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c<br/>index 5e84b4535cb1..3b82345756ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c</a></div><div class='hunk'>@@ -93,7 +93,6 @@ int mt76x2u_mac_reset(struct mt76x02_dev *dev)</div><div class='ctx'> 	mt76_wr(dev, MT_TX_LINK_CFG, 0x1020);</div><div class='ctx'> 	mt76_wr(dev, MT_AUTO_RSP_CFG, 0x13);</div><div class='ctx'> 	mt76_wr(dev, MT_MAX_LEN_CFG, 0x2f00);</div><div class='del'>-	mt76_wr(dev, MT_TX_RTS_CFG, 0x92b20);</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, MT_WMM_AIFSN, 0x2273);</div><div class='ctx'> 	mt76_wr(dev, MT_WMM_CWMIN, 0x2344);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c<br/>index 2ac78e4dc41a..97bcf6494ec1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c</a></div><div class='hunk'>@@ -21,29 +21,24 @@ static int mt76x2u_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	ret = mt76x2u_mac_start(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mac_work,</div><div class='add'>+	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mt76.mac_work,</div><div class='ctx'> 				     MT_MAC_WORK_INTERVAL);</div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76x2u_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mt76.state);</div><div class='add'>+	mt76u_stop_tx(&amp;dev-&gt;mt76);</div><div class='ctx'> 	mt76x2u_stop_hw(dev);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -57,6 +52,8 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	mt76_set_channel(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, false);</div><div class='add'>+</div><div class='ctx'> 	mt76x2_mac_stop(dev, false);</div><div class='ctx'> </div><div class='ctx'> 	err = mt76x2u_phy_set_channel(dev, chandef);</div><div class='hunk'>@@ -64,6 +61,8 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,</div><div class='ctx'> 	mt76x2_mac_resume(dev);</div><div class='ctx'> 	mt76x02_edcca_init(dev, true);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, true);</div><div class='add'>+</div><div class='ctx'> 	clear_bit(MT76_RESET, &amp;dev-&gt;mt76.state);</div><div class='ctx'> 	mt76_txq_schedule_all(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='hunk'>@@ -125,4 +124,6 @@ const struct ieee80211_ops mt76x2u_ops = {</div><div class='ctx'> 	.sw_scan_complete = mt76x02_sw_scan_complete,</div><div class='ctx'> 	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,</div><div class='ctx'> 	.get_txpower = mt76_get_txpower,</div><div class='add'>+	.set_tim = mt76_set_tim,</div><div class='add'>+	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c<br/>index 5a349fe3e576..5397827668b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/tx.c</a></div><div class='hunk'>@@ -21,15 +21,17 @@ mt76_alloc_txwi(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='add'>+	u8 *txwi;</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='del'>-	size = (sizeof(*t) + L1_CACHE_BYTES - 1) &amp; ~(L1_CACHE_BYTES - 1);</div><div class='del'>-	t = devm_kzalloc(dev-&gt;dev, size, GFP_ATOMIC);</div><div class='del'>-	if (!t)</div><div class='add'>+	size = L1_CACHE_ALIGN(dev-&gt;drv-&gt;txwi_size + sizeof(*t));</div><div class='add'>+	txwi = devm_kzalloc(dev-&gt;dev, size, GFP_ATOMIC);</div><div class='add'>+	if (!txwi)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	addr = dma_map_single(dev-&gt;dev, &amp;t-&gt;txwi, sizeof(t-&gt;txwi),</div><div class='add'>+	addr = dma_map_single(dev-&gt;dev, txwi, dev-&gt;drv-&gt;txwi_size,</div><div class='ctx'> 			      DMA_TO_DEVICE);</div><div class='add'>+	t = (struct mt76_txwi_cache *)(txwi + dev-&gt;drv-&gt;txwi_size);</div><div class='ctx'> 	t-&gt;dma_addr = addr;</div><div class='ctx'> </div><div class='ctx'> 	return t;</div><div class='hunk'>@@ -72,13 +74,14 @@ mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='ctx'> 	list_add(&amp;t-&gt;list, &amp;dev-&gt;txwi_cache);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_put_txwi);</div><div class='ctx'> </div><div class='ctx'> void mt76_tx_free(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='ctx'> </div><div class='ctx'> 	while ((t = __mt76_get_txwi(dev)) != NULL)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, t-&gt;dma_addr, sizeof(t-&gt;txwi),</div><div class='add'>+		dma_unmap_single(dev-&gt;dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +269,7 @@ mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> 		skb_set_queue_mapping(skb, qid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!wcid-&gt;tx_rate_set)</div><div class='add'>+	if (!(wcid-&gt;tx_info &amp; MT_WCID_TX_INFO_SET))</div><div class='ctx'> 		ieee80211_get_tx_rates(info-&gt;control.vif, sta, skb,</div><div class='ctx'> 				       info-&gt;control.rates, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -283,14 +286,17 @@ mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> 			mt76_check_agg_ssn(mtxq, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	q = &amp;dev-&gt;q_tx[qid];</div><div class='add'>+	q = dev-&gt;q_tx[qid].q;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;q-&gt;lock);</div><div class='del'>-	dev-&gt;queue_ops-&gt;tx_queue_skb(dev, q, skb, wcid, sta);</div><div class='add'>+	dev-&gt;queue_ops-&gt;tx_queue_skb(dev, qid, skb, wcid, sta);</div><div class='ctx'> 	dev-&gt;queue_ops-&gt;kick(dev, q);</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;queued &gt; q-&gt;ndesc - 8)</div><div class='add'>+	if (q-&gt;queued &gt; q-&gt;ndesc - 8 &amp;&amp; !q-&gt;stopped) {</div><div class='ctx'> 		ieee80211_stop_queue(dev-&gt;hw, skb_get_queue_mapping(skb));</div><div class='add'>+		q-&gt;stopped = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_tx);</div><div class='hunk'>@@ -324,7 +330,6 @@ mt76_queue_ps_skb(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *) sta-&gt;drv_priv;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct mt76_queue *hwq = &amp;dev-&gt;q_tx[MT_TXQ_PSD];</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE;</div><div class='ctx'> 	if (last)</div><div class='hunk'>@@ -332,7 +337,7 @@ mt76_queue_ps_skb(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> 			       IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='ctx'> </div><div class='ctx'> 	mt76_skb_set_moredata(skb, !last);</div><div class='del'>-	dev-&gt;queue_ops-&gt;tx_queue_skb(dev, hwq, skb, wcid, sta);</div><div class='add'>+	dev-&gt;queue_ops-&gt;tx_queue_skb(dev, MT_TXQ_PSD, skb, wcid, sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -343,7 +348,7 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	struct sk_buff *last_skb = NULL;</div><div class='del'>-	struct mt76_queue *hwq = &amp;dev-&gt;q_tx[MT_TXQ_PSD];</div><div class='add'>+	struct mt76_queue *hwq = dev-&gt;q_tx[MT_TXQ_PSD].q;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;hwq-&gt;lock);</div><div class='hunk'>@@ -374,18 +379,23 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,</div><div class='ctx'> 	if (last_skb) {</div><div class='ctx'> 		mt76_queue_ps_skb(dev, sta, last_skb, true);</div><div class='ctx'> 		dev-&gt;queue_ops-&gt;kick(dev, hwq);</div><div class='add'>+	} else {</div><div class='add'>+		ieee80211_sta_eosp(sta);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;hwq-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_release_buffered_frames);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,</div><div class='add'>+mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_sw_queue *sq,</div><div class='ctx'> 		    struct mt76_txq *mtxq, bool *empty)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_txq *txq = mtxq_to_txq(mtxq);</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='add'>+	enum mt76_txq_id qid = mt76_txq_get_qid(txq);</div><div class='ctx'> 	struct mt76_wcid *wcid = mtxq-&gt;wcid;</div><div class='add'>+	struct mt76_queue *hwq = sq-&gt;q;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int n_frames = 1, limit;</div><div class='ctx'> 	struct ieee80211_tx_rate tx_rate;</div><div class='hunk'>@@ -405,7 +415,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	if (!wcid-&gt;tx_rate_set)</div><div class='add'>+	if (!(wcid-&gt;tx_info &amp; MT_WCID_TX_INFO_SET))</div><div class='ctx'> 		ieee80211_get_tx_rates(txq-&gt;vif, txq-&gt;sta, skb,</div><div class='ctx'> 				       info-&gt;control.rates, 1);</div><div class='ctx'> 	tx_rate = info-&gt;control.rates[0];</div><div class='hunk'>@@ -417,7 +427,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,</div><div class='ctx'> 	if (ampdu)</div><div class='ctx'> 		mt76_check_agg_ssn(mtxq, skb);</div><div class='ctx'> </div><div class='del'>-	idx = dev-&gt;queue_ops-&gt;tx_queue_skb(dev, hwq, skb, wcid, txq-&gt;sta);</div><div class='add'>+	idx = dev-&gt;queue_ops-&gt;tx_queue_skb(dev, qid, skb, wcid, txq-&gt;sta);</div><div class='ctx'> </div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return idx;</div><div class='hunk'>@@ -452,7 +462,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,</div><div class='ctx'> 		if (cur_ampdu)</div><div class='ctx'> 			mt76_check_agg_ssn(mtxq, skb);</div><div class='ctx'> </div><div class='del'>-		idx = dev-&gt;queue_ops-&gt;tx_queue_skb(dev, hwq, skb, wcid,</div><div class='add'>+		idx = dev-&gt;queue_ops-&gt;tx_queue_skb(dev, qid, skb, wcid,</div><div class='ctx'> 						   txq-&gt;sta);</div><div class='ctx'> 		if (idx &lt; 0)</div><div class='ctx'> 			return idx;</div><div class='hunk'>@@ -461,8 +471,9 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,</div><div class='ctx'> 	} while (n_frames &lt; limit);</div><div class='ctx'> </div><div class='ctx'> 	if (!probe) {</div><div class='del'>-		hwq-&gt;swq_queued++;</div><div class='add'>+		hwq-&gt;entry[idx].qid = sq - dev-&gt;q_tx;</div><div class='ctx'> 		hwq-&gt;entry[idx].schedule = true;</div><div class='add'>+		sq-&gt;swq_queued++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;queue_ops-&gt;kick(dev, hwq);</div><div class='hunk'>@@ -471,22 +482,37 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76_txq_schedule_list(struct mt76_dev *dev, struct mt76_queue *hwq)</div><div class='add'>+mt76_txq_schedule_list(struct mt76_dev *dev, enum mt76_txq_id qid)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_txq *mtxq, *mtxq_last;</div><div class='del'>-	int len = 0;</div><div class='add'>+	struct mt76_sw_queue *sq = &amp;dev-&gt;q_tx[qid];</div><div class='add'>+	struct mt76_queue *hwq = sq-&gt;q;</div><div class='add'>+	struct ieee80211_txq *txq;</div><div class='add'>+	struct mt76_txq *mtxq;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-restart:</div><div class='del'>-	mtxq_last = list_last_entry(&amp;hwq-&gt;swq, struct mt76_txq, list);</div><div class='del'>-	while (!list_empty(&amp;hwq-&gt;swq)) {</div><div class='add'>+	spin_lock_bh(&amp;hwq-&gt;lock);</div><div class='add'>+	while (1) {</div><div class='ctx'> 		bool empty = false;</div><div class='del'>-		int cur;</div><div class='add'>+</div><div class='add'>+		if (sq-&gt;swq_queued &gt;= 4)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(MT76_OFFCHANNEL, &amp;dev-&gt;state) ||</div><div class='del'>-		    test_bit(MT76_RESET, &amp;dev-&gt;state))</div><div class='del'>-			return -EBUSY;</div><div class='add'>+		    test_bit(MT76_RESET, &amp;dev-&gt;state)) {</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txq = ieee80211_next_txq(dev-&gt;hw, qid);</div><div class='add'>+		if (!txq)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mtxq = (struct mt76_txq *)txq-&gt;drv_priv;</div><div class='add'>+		wcid = mtxq-&gt;wcid;</div><div class='add'>+		if (wcid &amp;&amp; test_bit(MT_WCID_FLAG_PS, &amp;wcid-&gt;flags))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		mtxq = list_first_entry(&amp;hwq-&gt;swq, struct mt76_txq, list);</div><div class='ctx'> 		if (mtxq-&gt;send_bar &amp;&amp; mtxq-&gt;aggr) {</div><div class='ctx'> 			struct ieee80211_txq *txq = mtxq_to_txq(mtxq);</div><div class='ctx'> 			struct ieee80211_sta *sta = txq-&gt;sta;</div><div class='hunk'>@@ -498,38 +524,37 @@ restart:</div><div class='ctx'> 			spin_unlock_bh(&amp;hwq-&gt;lock);</div><div class='ctx'> 			ieee80211_send_bar(vif, sta-&gt;addr, tid, agg_ssn);</div><div class='ctx'> 			spin_lock_bh(&amp;hwq-&gt;lock);</div><div class='del'>-			goto restart;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_del_init(&amp;mtxq-&gt;list);</div><div class='del'>-</div><div class='del'>-		cur = mt76_txq_send_burst(dev, hwq, mtxq, &amp;empty);</div><div class='del'>-		if (!empty)</div><div class='del'>-			list_add_tail(&amp;mtxq-&gt;list, &amp;hwq-&gt;swq);</div><div class='del'>-</div><div class='del'>-		if (cur &lt; 0)</div><div class='del'>-			return cur;</div><div class='del'>-</div><div class='del'>-		len += cur;</div><div class='del'>-</div><div class='del'>-		if (mtxq == mtxq_last)</div><div class='del'>-			break;</div><div class='add'>+		ret += mt76_txq_send_burst(dev, sq, mtxq, &amp;empty);</div><div class='add'>+		if (skb_queue_empty(&amp;mtxq-&gt;retry_q))</div><div class='add'>+			empty = true;</div><div class='add'>+		ieee80211_return_txq(dev-&gt;hw, txq, !empty);</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_bh(&amp;hwq-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return len;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt76_txq_schedule(struct mt76_dev *dev, struct mt76_queue *hwq)</div><div class='add'>+void mt76_txq_schedule(struct mt76_dev *dev, enum mt76_txq_id qid)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_sw_queue *sq = &amp;dev-&gt;q_tx[qid];</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='add'>+	if (qid &gt;= 4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sq-&gt;swq_queued &gt;= 4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	do {</div><div class='del'>-		if (hwq-&gt;swq_queued &gt;= 4 || list_empty(&amp;hwq-&gt;swq))</div><div class='del'>-			break;</div><div class='ctx'> </div><div class='del'>-		len = mt76_txq_schedule_list(dev, hwq);</div><div class='add'>+	do {</div><div class='add'>+		ieee80211_txq_schedule_start(dev-&gt;hw, qid);</div><div class='add'>+		len = mt76_txq_schedule_list(dev, qid);</div><div class='add'>+		ieee80211_txq_schedule_end(dev-&gt;hw, qid);</div><div class='ctx'> 	} while (len &gt; 0);</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_txq_schedule);</div><div class='hunk'>@@ -538,13 +563,8 @@ void mt76_txq_schedule_all(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;= MT_TXQ_BK; i++) {</div><div class='del'>-		struct mt76_queue *q = &amp;dev-&gt;q_tx[i];</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;q-&gt;lock);</div><div class='del'>-		mt76_txq_schedule(dev, q);</div><div class='del'>-		spin_unlock_bh(&amp;q-&gt;lock);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt;= MT_TXQ_BK; i++)</div><div class='add'>+		mt76_txq_schedule(dev, i);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_txq_schedule_all);</div><div class='ctx'> </div><div class='hunk'>@@ -555,18 +575,18 @@ void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++) {</div><div class='ctx'> 		struct ieee80211_txq *txq = sta-&gt;txq[i];</div><div class='add'>+		struct mt76_queue *hwq;</div><div class='ctx'> 		struct mt76_txq *mtxq;</div><div class='ctx'> </div><div class='ctx'> 		if (!txq)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		mtxq = (struct mt76_txq *)txq-&gt;drv_priv;</div><div class='add'>+		hwq = mtxq-&gt;swq-&gt;q;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;mtxq-&gt;hwq-&gt;lock);</div><div class='add'>+		spin_lock_bh(&amp;hwq-&gt;lock);</div><div class='ctx'> 		mtxq-&gt;send_bar = mtxq-&gt;aggr &amp;&amp; send_bar;</div><div class='del'>-		if (!list_empty(&amp;mtxq-&gt;list))</div><div class='del'>-			list_del_init(&amp;mtxq-&gt;list);</div><div class='del'>-		spin_unlock_bh(&amp;mtxq-&gt;hwq-&gt;lock);</div><div class='add'>+		spin_unlock_bh(&amp;hwq-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_stop_tx_queues);</div><div class='hunk'>@@ -574,33 +594,23 @@ EXPORT_SYMBOL_GPL(mt76_stop_tx_queues);</div><div class='ctx'> void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = hw-&gt;priv;</div><div class='del'>-	struct mt76_txq *mtxq = (struct mt76_txq *) txq-&gt;drv_priv;</div><div class='del'>-	struct mt76_queue *hwq = mtxq-&gt;hwq;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;hwq-&gt;lock);</div><div class='del'>-	if (list_empty(&amp;mtxq-&gt;list))</div><div class='del'>-		list_add_tail(&amp;mtxq-&gt;list, &amp;hwq-&gt;swq);</div><div class='del'>-	mt76_txq_schedule(dev, hwq);</div><div class='del'>-	spin_unlock_bh(&amp;hwq-&gt;lock);</div><div class='add'>+	if (!test_bit(MT76_STATE_RUNNING, &amp;dev-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_wake_tx_queue);</div><div class='ctx'> </div><div class='ctx'> void mt76_txq_remove(struct mt76_dev *dev, struct ieee80211_txq *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txq *mtxq;</div><div class='del'>-	struct mt76_queue *hwq;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	if (!txq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mtxq = (struct mt76_txq *) txq-&gt;drv_priv;</div><div class='del'>-	hwq = mtxq-&gt;hwq;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;hwq-&gt;lock);</div><div class='del'>-	if (!list_empty(&amp;mtxq-&gt;list))</div><div class='del'>-		list_del_init(&amp;mtxq-&gt;list);</div><div class='del'>-	spin_unlock_bh(&amp;hwq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;mtxq-&gt;retry_q)) != NULL)</div><div class='ctx'> 		ieee80211_free_txskb(dev-&gt;hw, skb);</div><div class='hunk'>@@ -611,10 +621,9 @@ void mt76_txq_init(struct mt76_dev *dev, struct ieee80211_txq *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txq *mtxq = (struct mt76_txq *) txq-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;mtxq-&gt;list);</div><div class='ctx'> 	skb_queue_head_init(&amp;mtxq-&gt;retry_q);</div><div class='ctx'> </div><div class='del'>-	mtxq-&gt;hwq = &amp;dev-&gt;q_tx[mt76_txq_get_qid(txq)];</div><div class='add'>+	mtxq-&gt;swq = &amp;dev-&gt;q_tx[mt76_txq_get_qid(txq)];</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_txq_init);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c<br/>index ae6ada370597..bbaa1365bbda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt76/usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt76/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt76/usb.c</a></div><div class='hunk'>@@ -31,8 +31,7 @@ static int __mt76u_vendor_request(struct mt76_dev *dev, u8 req,</div><div class='ctx'> 				  u8 req_type, u16 val, u16 offset,</div><div class='ctx'> 				  void *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(dev-&gt;dev);</div><div class='del'>-	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct usb_device *udev = to_usb_device(dev-&gt;dev);</div><div class='ctx'> 	unsigned int pipe;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -247,8 +246,7 @@ mt76u_rd_rp(struct mt76_dev *dev, u32 base,</div><div class='ctx'> </div><div class='ctx'> static bool mt76u_check_sg(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(dev-&gt;dev);</div><div class='del'>-	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct usb_device *udev = to_usb_device(dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return (!disable_usb_sg &amp;&amp; udev-&gt;bus-&gt;sg_tablesize &gt; 0 &amp;&amp;</div><div class='ctx'> 		(udev-&gt;bus-&gt;no_sg_constraint ||</div><div class='hunk'>@@ -285,28 +283,24 @@ mt76u_set_endpoints(struct usb_interface *intf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76u_buf *buf,</div><div class='del'>-		 int nsgs, int len, int sglen)</div><div class='add'>+mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,</div><div class='add'>+		 int nsgs, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='del'>-	struct urb *urb = buf-&gt;urb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;rx_page_lock);</div><div class='ctx'> 	for (i = 0; i &lt; nsgs; i++) {</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> 		void *data;</div><div class='ctx'> 		int offset;</div><div class='ctx'> </div><div class='del'>-		data = page_frag_alloc(&amp;q-&gt;rx_page, len, GFP_ATOMIC);</div><div class='add'>+		data = page_frag_alloc(&amp;q-&gt;rx_page, q-&gt;buf_size, gfp);</div><div class='ctx'> 		if (!data)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		page = virt_to_head_page(data);</div><div class='ctx'> 		offset = data - page_address(page);</div><div class='del'>-		sg_set_page(&amp;urb-&gt;sg[i], page, sglen, offset);</div><div class='add'>+		sg_set_page(&amp;urb-&gt;sg[i], page, q-&gt;buf_size, offset);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;q-&gt;rx_page_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (i &lt; nsgs) {</div><div class='ctx'> 		int j;</div><div class='hunk'>@@ -317,72 +311,78 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76u_buf *buf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	urb-&gt;num_sgs = max_t(int, i, urb-&gt;num_sgs);</div><div class='del'>-	buf-&gt;len = urb-&gt;num_sgs * sglen,</div><div class='add'>+	urb-&gt;transfer_buffer_length = urb-&gt;num_sgs * q-&gt;buf_size,</div><div class='ctx'> 	sg_init_marker(urb-&gt;sg, urb-&gt;num_sgs);</div><div class='ctx'> </div><div class='ctx'> 	return i ? : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76u_refill_rx(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-		struct mt76u_buf *buf, int nsgs, gfp_t gfp)</div><div class='add'>+mt76u_refill_rx(struct mt76_dev *dev, struct urb *urb, int nsgs, gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;usb.sg_en) {</div><div class='del'>-		return mt76u_fill_rx_sg(dev, buf, nsgs, q-&gt;buf_size,</div><div class='del'>-					SKB_WITH_OVERHEAD(q-&gt;buf_size));</div><div class='add'>+		return mt76u_fill_rx_sg(dev, q, urb, nsgs, gfp);</div><div class='ctx'> 	} else {</div><div class='del'>-		buf-&gt;buf = page_frag_alloc(&amp;q-&gt;rx_page, q-&gt;buf_size, gfp);</div><div class='del'>-		return buf-&gt;buf ? 0 : -ENOMEM;</div><div class='add'>+		urb-&gt;transfer_buffer_length = q-&gt;buf_size;</div><div class='add'>+		urb-&gt;transfer_buffer = page_frag_alloc(&amp;q-&gt;rx_page,</div><div class='add'>+						       q-&gt;buf_size, gfp);</div><div class='add'>+		return urb-&gt;transfer_buffer ? 0 : -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf)</div><div class='add'>+mt76u_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='add'>+	unsigned int size = sizeof(struct urb);</div><div class='ctx'> </div><div class='del'>-	buf-&gt;len = SKB_WITH_OVERHEAD(q-&gt;buf_size);</div><div class='del'>-	buf-&gt;dev = dev;</div><div class='add'>+	if (dev-&gt;usb.sg_en)</div><div class='add'>+		size += MT_SG_MAX_SIZE * sizeof(struct scatterlist);</div><div class='ctx'> </div><div class='del'>-	buf-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-	if (!buf-&gt;urb)</div><div class='add'>+	e-&gt;urb = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!e-&gt;urb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;usb.sg_en) {</div><div class='del'>-		buf-&gt;urb-&gt;sg = devm_kcalloc(dev-&gt;dev, MT_SG_MAX_SIZE,</div><div class='del'>-					    sizeof(*buf-&gt;urb-&gt;sg),</div><div class='del'>-					    GFP_KERNEL);</div><div class='del'>-		if (!buf-&gt;urb-&gt;sg)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	usb_init_urb(e-&gt;urb);</div><div class='ctx'> </div><div class='del'>-		sg_init_table(buf-&gt;urb-&gt;sg, MT_SG_MAX_SIZE);</div><div class='del'>-	}</div><div class='add'>+	if (dev-&gt;usb.sg_en)</div><div class='add'>+		e-&gt;urb-&gt;sg = (struct scatterlist *)(e-&gt;urb + 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'>+mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mt76u_urb_alloc(dev, e);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return mt76u_refill_rx(dev, q, buf, MT_SG_MAX_SIZE, GFP_KERNEL);</div><div class='add'>+	return mt76u_refill_rx(dev, e-&gt;urb, MT_SG_MAX_SIZE, GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76u_buf_free(struct mt76u_buf *buf)</div><div class='add'>+static void mt76u_urb_free(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct urb *urb = buf-&gt;urb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; urb-&gt;num_sgs; i++)</div><div class='ctx'> 		skb_free_frag(sg_virt(&amp;urb-&gt;sg[i]));</div><div class='ctx'> </div><div class='del'>-	if (buf-&gt;buf)</div><div class='del'>-		skb_free_frag(buf-&gt;buf);</div><div class='add'>+	if (urb-&gt;transfer_buffer)</div><div class='add'>+		skb_free_frag(urb-&gt;transfer_buffer);</div><div class='ctx'> </div><div class='del'>-	usb_free_urb(buf-&gt;urb);</div><div class='add'>+	usb_free_urb(urb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt76u_fill_bulk_urb(struct mt76_dev *dev, int dir, int index,</div><div class='del'>-		    struct mt76u_buf *buf, usb_complete_t complete_fn,</div><div class='add'>+		    struct urb *urb, usb_complete_t complete_fn,</div><div class='ctx'> 		    void *context)</div><div class='ctx'> {</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(dev-&gt;dev);</div><div class='del'>-	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='del'>-	u8 *data = buf-&gt;urb-&gt;num_sgs ? NULL : buf-&gt;buf;</div><div class='add'>+	struct usb_device *udev = to_usb_device(dev-&gt;dev);</div><div class='ctx'> 	unsigned int pipe;</div><div class='ctx'> </div><div class='ctx'> 	if (dir == USB_DIR_IN)</div><div class='hunk'>@@ -390,37 +390,28 @@ mt76u_fill_bulk_urb(struct mt76_dev *dev, int dir, int index,</div><div class='ctx'> 	else</div><div class='ctx'> 		pipe = usb_sndbulkpipe(udev, dev-&gt;usb.out_ep[index]);</div><div class='ctx'> </div><div class='del'>-	usb_fill_bulk_urb(buf-&gt;urb, udev, pipe, data, buf-&gt;len,</div><div class='del'>-			  complete_fn, context);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,</div><div class='del'>-		 struct mt76u_buf *buf, gfp_t gfp,</div><div class='del'>-		 usb_complete_t complete_fn, void *context)</div><div class='del'>-{</div><div class='del'>-	mt76u_fill_bulk_urb(dev, dir, index, buf, complete_fn,</div><div class='del'>-			    context);</div><div class='del'>-	trace_submit_urb(dev, buf-&gt;urb);</div><div class='del'>-</div><div class='del'>-	return usb_submit_urb(buf-&gt;urb, gfp);</div><div class='add'>+	urb-&gt;dev = udev;</div><div class='add'>+	urb-&gt;pipe = pipe;</div><div class='add'>+	urb-&gt;complete = complete_fn;</div><div class='add'>+	urb-&gt;context = context;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct mt76u_buf</div><div class='del'>-*mt76u_get_next_rx_entry(struct mt76_queue *q)</div><div class='add'>+static inline struct urb *</div><div class='add'>+mt76u_get_next_rx_entry(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76u_buf *buf = NULL;</div><div class='add'>+	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='add'>+	struct urb *urb = NULL;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='ctx'> 	if (q-&gt;queued &gt; 0) {</div><div class='del'>-		buf = &amp;q-&gt;entry[q-&gt;head].ubuf;</div><div class='add'>+		urb = q-&gt;entry[q-&gt;head].urb;</div><div class='ctx'> 		q-&gt;head = (q-&gt;head + 1) % q-&gt;ndesc;</div><div class='ctx'> 		q-&gt;queued--;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	return buf;</div><div class='add'>+	return urb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt76u_get_rx_entry_len(u8 *data, u32 data_len)</div><div class='hunk'>@@ -439,12 +430,12 @@ static int mt76u_get_rx_entry_len(u8 *data, u32 data_len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76u_process_rx_entry(struct mt76_dev *dev, struct mt76u_buf *buf)</div><div class='add'>+mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='del'>-	struct urb *urb = buf-&gt;urb;</div><div class='del'>-	u8 *data = urb-&gt;num_sgs ? sg_virt(&amp;urb-&gt;sg[0]) : buf-&gt;buf;</div><div class='del'>-	int data_len, len, nsgs = 1;</div><div class='add'>+	u8 *data = urb-&gt;num_sgs ? sg_virt(&amp;urb-&gt;sg[0]) : urb-&gt;transfer_buffer;</div><div class='add'>+	int data_len = urb-&gt;num_sgs ? urb-&gt;sg[0].length : urb-&gt;actual_length;</div><div class='add'>+	int len, nsgs = 1;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;state))</div><div class='hunk'>@@ -454,10 +445,11 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct mt76u_buf *buf)</div><div class='ctx'> 	if (len &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	data_len = urb-&gt;num_sgs ? urb-&gt;sg[0].length : buf-&gt;len;</div><div class='ctx'> 	data_len = min_t(int, len, data_len - MT_DMA_HDR_LEN);</div><div class='del'>-	if (MT_DMA_HDR_LEN + data_len &gt; SKB_WITH_OVERHEAD(q-&gt;buf_size))</div><div class='add'>+	if (MT_DMA_HDR_LEN + data_len &gt; SKB_WITH_OVERHEAD(q-&gt;buf_size)) {</div><div class='add'>+		dev_err_ratelimited(dev-&gt;dev, "rx data too big %d\n", data_len);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skb = build_skb(data, q-&gt;buf_size);</div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -503,7 +495,7 @@ static void mt76u_complete_rx(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='del'>-	if (WARN_ONCE(q-&gt;entry[q-&gt;tail].ubuf.urb != urb, "rx urb mismatch"))</div><div class='add'>+	if (WARN_ONCE(q-&gt;entry[q-&gt;tail].urb != urb, "rx urb mismatch"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;tail = (q-&gt;tail + 1) % q-&gt;ndesc;</div><div class='hunk'>@@ -513,37 +505,43 @@ out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt76u_submit_rx_buf(struct mt76_dev *dev, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	mt76u_fill_bulk_urb(dev, USB_DIR_IN, MT_EP_IN_PKT_RX, urb,</div><div class='add'>+			    mt76u_complete_rx, dev);</div><div class='add'>+	trace_submit_urb(dev, urb);</div><div class='add'>+</div><div class='add'>+	return usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mt76u_rx_tasklet(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = (struct mt76_dev *)data;</div><div class='del'>-	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='del'>-	struct mt76u_buf *buf;</div><div class='add'>+	struct urb *urb;</div><div class='ctx'> 	int err, count;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='del'>-		buf = mt76u_get_next_rx_entry(q);</div><div class='del'>-		if (!buf)</div><div class='add'>+		urb = mt76u_get_next_rx_entry(dev);</div><div class='add'>+		if (!urb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		count = mt76u_process_rx_entry(dev, buf);</div><div class='add'>+		count = mt76u_process_rx_entry(dev, urb);</div><div class='ctx'> 		if (count &gt; 0) {</div><div class='del'>-			err = mt76u_refill_rx(dev, q, buf, count,</div><div class='del'>-					      GFP_ATOMIC);</div><div class='add'>+			err = mt76u_refill_rx(dev, urb, count, GFP_ATOMIC);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		mt76u_submit_buf(dev, USB_DIR_IN, MT_EP_IN_PKT_RX,</div><div class='del'>-				 buf, GFP_ATOMIC,</div><div class='del'>-				 mt76u_complete_rx, dev);</div><div class='add'>+		mt76u_submit_rx_buf(dev, urb);</div><div class='ctx'> 	}</div><div class='ctx'> 	mt76_rx_poll_complete(dev, MT_RXQ_MAIN, NULL);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt76u_submit_rx_buffers(struct mt76_dev *dev)</div><div class='add'>+static int mt76u_submit_rx_buffers(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -551,9 +549,7 @@ int mt76u_submit_rx_buffers(struct mt76_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='ctx'> 	for (i = 0; i &lt; q-&gt;ndesc; i++) {</div><div class='del'>-		err = mt76u_submit_buf(dev, USB_DIR_IN, MT_EP_IN_PKT_RX,</div><div class='del'>-				       &amp;q-&gt;entry[i].ubuf, GFP_ATOMIC,</div><div class='del'>-				       mt76u_complete_rx, dev);</div><div class='add'>+		err = mt76u_submit_rx_buf(dev, q-&gt;entry[i].urb);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -563,7 +559,6 @@ int mt76u_submit_rx_buffers(struct mt76_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76u_submit_rx_buffers);</div><div class='ctx'> </div><div class='ctx'> static int mt76u_alloc_rx(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -575,7 +570,6 @@ static int mt76u_alloc_rx(struct mt76_dev *dev)</div><div class='ctx'> 	if (!usb-&gt;mcu.data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;q-&gt;rx_page_lock);</div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;lock);</div><div class='ctx'> 	q-&gt;entry = devm_kcalloc(dev-&gt;dev,</div><div class='ctx'> 				MT_NUM_RX_ENTRIES, sizeof(*q-&gt;entry),</div><div class='hunk'>@@ -586,7 +580,7 @@ static int mt76u_alloc_rx(struct mt76_dev *dev)</div><div class='ctx'> 	q-&gt;buf_size = dev-&gt;usb.sg_en ? MT_RX_BUF_SIZE : PAGE_SIZE;</div><div class='ctx'> 	q-&gt;ndesc = MT_NUM_RX_ENTRIES;</div><div class='ctx'> 	for (i = 0; i &lt; q-&gt;ndesc; i++) {</div><div class='del'>-		err = mt76u_buf_alloc(dev, &amp;q-&gt;entry[i].ubuf);</div><div class='add'>+		err = mt76u_rx_urb_alloc(dev, &amp;q-&gt;entry[i]);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -601,66 +595,88 @@ static void mt76u_free_rx(struct mt76_dev *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='del'>-		mt76u_buf_free(&amp;q-&gt;entry[i].ubuf);</div><div class='add'>+		mt76u_urb_free(q-&gt;entry[i].urb);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;rx_page_lock);</div><div class='ctx'> 	if (!q-&gt;rx_page.va)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	page = virt_to_page(q-&gt;rx_page.va);</div><div class='ctx'> 	__page_frag_cache_drain(page, q-&gt;rx_page.pagecnt_bias);</div><div class='ctx'> 	memset(&amp;q-&gt;rx_page, 0, sizeof(q-&gt;rx_page));</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_bh(&amp;q-&gt;rx_page_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76u_stop_rx(struct mt76_dev *dev)</div><div class='add'>+void mt76u_stop_rx(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='add'>+		usb_poison_urb(q-&gt;entry[i].urb);</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;dev-&gt;usb.rx_tasklet);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76u_stop_rx);</div><div class='add'>+</div><div class='add'>+int mt76u_resume_rx(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *q = &amp;dev-&gt;q_rx[MT_RXQ_MAIN];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='del'>-		usb_kill_urb(q-&gt;entry[i].ubuf.urb);</div><div class='add'>+		usb_unpoison_urb(q-&gt;entry[i].urb);</div><div class='add'>+</div><div class='add'>+	return mt76u_submit_rx_buffers(dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76u_resume_rx);</div><div class='ctx'> </div><div class='ctx'> static void mt76u_tx_tasklet(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = (struct mt76_dev *)data;</div><div class='ctx'> 	struct mt76_queue_entry entry;</div><div class='del'>-	struct mt76u_buf *buf;</div><div class='add'>+	struct mt76_sw_queue *sq;</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='ctx'> 	bool wake;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-		q = &amp;dev-&gt;q_tx[i];</div><div class='add'>+		u32 n_dequeued = 0, n_sw_dequeued = 0;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;q-&gt;lock);</div><div class='del'>-		while (true) {</div><div class='del'>-			buf = &amp;q-&gt;entry[q-&gt;head].ubuf;</div><div class='del'>-			if (!buf-&gt;done || !q-&gt;queued)</div><div class='add'>+		sq = &amp;dev-&gt;q_tx[i];</div><div class='add'>+		q = sq-&gt;q;</div><div class='add'>+</div><div class='add'>+		while (q-&gt;queued &gt; n_dequeued) {</div><div class='add'>+			if (!q-&gt;entry[q-&gt;head].done)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (q-&gt;entry[q-&gt;head].schedule) {</div><div class='ctx'> 				q-&gt;entry[q-&gt;head].schedule = false;</div><div class='del'>-				q-&gt;swq_queued--;</div><div class='add'>+				n_sw_dequeued++;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			entry = q-&gt;entry[q-&gt;head];</div><div class='add'>+			q-&gt;entry[q-&gt;head].done = false;</div><div class='ctx'> 			q-&gt;head = (q-&gt;head + 1) % q-&gt;ndesc;</div><div class='del'>-			q-&gt;queued--;</div><div class='add'>+			n_dequeued++;</div><div class='ctx'> </div><div class='del'>-			spin_unlock_bh(&amp;q-&gt;lock);</div><div class='del'>-			dev-&gt;drv-&gt;tx_complete_skb(dev, q, &amp;entry, false);</div><div class='del'>-			spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+			dev-&gt;drv-&gt;tx_complete_skb(dev, i, &amp;entry);</div><div class='ctx'> 		}</div><div class='del'>-		mt76_txq_schedule(dev, q);</div><div class='del'>-		wake = i &lt; IEEE80211_NUM_ACS &amp;&amp; q-&gt;queued &lt; q-&gt;ndesc - 8;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+</div><div class='add'>+		sq-&gt;swq_queued -= n_sw_dequeued;</div><div class='add'>+		q-&gt;queued -= n_dequeued;</div><div class='add'>+</div><div class='add'>+		wake = q-&gt;stopped &amp;&amp; q-&gt;queued &lt; q-&gt;ndesc - 8;</div><div class='add'>+		if (wake)</div><div class='add'>+			q-&gt;stopped = false;</div><div class='add'>+</div><div class='ctx'> 		if (!q-&gt;queued)</div><div class='ctx'> 			wake_up(&amp;dev-&gt;tx_wait);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_bh(&amp;q-&gt;lock);</div><div class='ctx'> </div><div class='add'>+		mt76_txq_schedule(dev, i);</div><div class='add'>+</div><div class='ctx'> 		if (!test_and_set_bit(MT76_READING_STATS, &amp;dev-&gt;state))</div><div class='ctx'> 			ieee80211_queue_delayed_work(dev-&gt;hw,</div><div class='ctx'> 						     &amp;dev-&gt;usb.stat_work,</div><div class='hunk'>@@ -699,34 +715,43 @@ static void mt76u_tx_status_data(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void mt76u_complete_tx(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct mt76u_buf *buf = urb-&gt;context;</div><div class='del'>-	struct mt76_dev *dev = buf-&gt;dev;</div><div class='add'>+	struct mt76_dev *dev = dev_get_drvdata(&amp;urb-&gt;dev-&gt;dev);</div><div class='add'>+	struct mt76_queue_entry *e = urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	if (mt76u_urb_error(urb))</div><div class='ctx'> 		dev_err(dev-&gt;dev, "tx urb failed: %d\n", urb-&gt;status);</div><div class='del'>-	buf-&gt;done = true;</div><div class='add'>+	e-&gt;done = true;</div><div class='ctx'> </div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;usb.tx_tasklet);</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;tx_tasklet);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76u_tx_build_sg(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='del'>-		  struct urb *urb)</div><div class='add'>+mt76u_tx_setup_buffers(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+		       struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	if (!dev-&gt;usb.sg_en)</div><div class='del'>-		return 0;</div><div class='add'>+	urb-&gt;transfer_buffer_length = skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-	sg_init_table(urb-&gt;sg, MT_SG_MAX_SIZE);</div><div class='del'>-	urb-&gt;num_sgs = skb_to_sgvec(skb, urb-&gt;sg, 0, skb-&gt;len);</div><div class='del'>-	return urb-&gt;num_sgs;</div><div class='add'>+	if (!dev-&gt;usb.sg_en) {</div><div class='add'>+		urb-&gt;transfer_buffer = skb-&gt;data;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		sg_init_table(urb-&gt;sg, MT_SG_MAX_SIZE);</div><div class='add'>+		urb-&gt;num_sgs = skb_to_sgvec(skb, urb-&gt;sg, 0, skb-&gt;len);</div><div class='add'>+		if (urb-&gt;num_sgs == 0)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		return urb-&gt;num_sgs;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,</div><div class='ctx'> 		   struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='ctx'> 		   struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt76u_buf *buf;</div><div class='add'>+	struct mt76_queue *q = dev-&gt;q_tx[qid].q;</div><div class='add'>+	struct mt76_tx_info tx_info = {</div><div class='add'>+		.skb = skb,</div><div class='add'>+	};</div><div class='ctx'> 	u16 idx = q-&gt;tail;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -734,24 +759,20 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;prev = skb-&gt;next = NULL;</div><div class='del'>-	err = dev-&gt;drv-&gt;tx_prepare_skb(dev, NULL, skb, q, wcid, sta, NULL);</div><div class='add'>+	err = dev-&gt;drv-&gt;tx_prepare_skb(dev, NULL, qid, wcid, sta, &amp;tx_info);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	buf = &amp;q-&gt;entry[idx].ubuf;</div><div class='del'>-	buf-&gt;buf = skb-&gt;data;</div><div class='del'>-	buf-&gt;len = skb-&gt;len;</div><div class='del'>-	buf-&gt;done = false;</div><div class='del'>-</div><div class='del'>-	err = mt76u_tx_build_sg(dev, skb, buf-&gt;urb);</div><div class='add'>+	err = mt76u_tx_setup_buffers(dev, tx_info.skb, q-&gt;entry[idx].urb);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	mt76u_fill_bulk_urb(dev, USB_DIR_OUT, q2ep(q-&gt;hw_idx),</div><div class='del'>-			    buf, mt76u_complete_tx, buf);</div><div class='add'>+			    q-&gt;entry[idx].urb, mt76u_complete_tx,</div><div class='add'>+			    &amp;q-&gt;entry[idx]);</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;tail = (q-&gt;tail + 1) % q-&gt;ndesc;</div><div class='del'>-	q-&gt;entry[idx].skb = skb;</div><div class='add'>+	q-&gt;entry[idx].skb = tx_info.skb;</div><div class='ctx'> 	q-&gt;queued++;</div><div class='ctx'> </div><div class='ctx'> 	return idx;</div><div class='hunk'>@@ -759,14 +780,14 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> </div><div class='ctx'> static void mt76u_tx_kick(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct mt76u_buf *buf;</div><div class='add'>+	struct urb *urb;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	while (q-&gt;first != q-&gt;tail) {</div><div class='del'>-		buf = &amp;q-&gt;entry[q-&gt;first].ubuf;</div><div class='add'>+		urb = q-&gt;entry[q-&gt;first].urb;</div><div class='ctx'> </div><div class='del'>-		trace_submit_urb(dev, buf-&gt;urb);</div><div class='del'>-		err = usb_submit_urb(buf-&gt;urb, GFP_ATOMIC);</div><div class='add'>+		trace_submit_urb(dev, urb);</div><div class='add'>+		err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			if (err == -ENODEV)</div><div class='ctx'> 				set_bit(MT76_REMOVED, &amp;dev-&gt;state);</div><div class='hunk'>@@ -781,15 +802,24 @@ static void mt76u_tx_kick(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> </div><div class='ctx'> static int mt76u_alloc_tx(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76u_buf *buf;</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i, j, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= MT_TXQ_PSD; i++) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;dev-&gt;q_tx[i].swq);</div><div class='add'>+</div><div class='add'>+		if (i &gt;= IEEE80211_NUM_ACS) {</div><div class='add'>+			dev-&gt;q_tx[i].q = dev-&gt;q_tx[0].q;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		q = devm_kzalloc(dev-&gt;dev, sizeof(*q), GFP_KERNEL);</div><div class='add'>+		if (!q)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-		q = &amp;dev-&gt;q_tx[i];</div><div class='ctx'> 		spin_lock_init(&amp;q-&gt;lock);</div><div class='del'>-		INIT_LIST_HEAD(&amp;q-&gt;swq);</div><div class='ctx'> 		q-&gt;hw_idx = mt76_ac_to_hwq(i);</div><div class='add'>+		dev-&gt;q_tx[i].q = q;</div><div class='ctx'> </div><div class='ctx'> 		q-&gt;entry = devm_kcalloc(dev-&gt;dev,</div><div class='ctx'> 					MT_NUM_TX_ENTRIES, sizeof(*q-&gt;entry),</div><div class='hunk'>@@ -799,22 +829,9 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 		q-&gt;ndesc = MT_NUM_TX_ENTRIES;</div><div class='ctx'> 		for (j = 0; j &lt; q-&gt;ndesc; j++) {</div><div class='del'>-			buf = &amp;q-&gt;entry[j].ubuf;</div><div class='del'>-			buf-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-			buf-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-			if (!buf-&gt;urb)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			if (dev-&gt;usb.sg_en) {</div><div class='del'>-				size_t size = MT_SG_MAX_SIZE *</div><div class='del'>-					      sizeof(struct scatterlist);</div><div class='del'>-</div><div class='del'>-				buf-&gt;urb-&gt;sg = devm_kzalloc(dev-&gt;dev, size,</div><div class='del'>-							    GFP_KERNEL);</div><div class='del'>-				if (!buf-&gt;urb-&gt;sg)</div><div class='del'>-					return -ENOMEM;</div><div class='del'>-			}</div><div class='add'>+			err = mt76u_urb_alloc(dev, &amp;q-&gt;entry[j]);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -826,44 +843,60 @@ static void mt76u_free_tx(struct mt76_dev *dev)</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-		q = &amp;dev-&gt;q_tx[i];</div><div class='add'>+		q = dev-&gt;q_tx[i].q;</div><div class='ctx'> 		for (j = 0; j &lt; q-&gt;ndesc; j++)</div><div class='del'>-			usb_free_urb(q-&gt;entry[j].ubuf.urb);</div><div class='add'>+			usb_free_urb(q-&gt;entry[j].urb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76u_stop_tx(struct mt76_dev *dev)</div><div class='add'>+void mt76u_stop_tx(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_queue_entry entry;</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i, j, ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-		q = &amp;dev-&gt;q_tx[i];</div><div class='del'>-		for (j = 0; j &lt; q-&gt;ndesc; j++)</div><div class='del'>-			usb_kill_urb(q-&gt;entry[j].ubuf.urb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	ret = wait_event_timeout(dev-&gt;tx_wait, !mt76_has_tx_pending(dev), HZ/5);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "timed out waiting for pending tx\n");</div><div class='ctx'> </div><div class='del'>-void mt76u_stop_queues(struct mt76_dev *dev)</div><div class='del'>-{</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;usb.rx_tasklet);</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;usb.tx_tasklet);</div><div class='add'>+		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='add'>+			q = dev-&gt;q_tx[i].q;</div><div class='add'>+			for (j = 0; j &lt; q-&gt;ndesc; j++)</div><div class='add'>+				usb_kill_urb(q-&gt;entry[j].urb);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	mt76u_stop_rx(dev);</div><div class='del'>-	mt76u_stop_tx(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76u_stop_queues);</div><div class='add'>+		tasklet_kill(&amp;dev-&gt;tx_tasklet);</div><div class='add'>+</div><div class='add'>+		/* On device removal we maight queue skb's, but mt76u_tx_kick()</div><div class='add'>+		 * will fail to submit urb, cleanup those skb's manually.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='add'>+			q = dev-&gt;q_tx[i].q;</div><div class='add'>+</div><div class='add'>+			/* Assure we are in sync with killed tasklet. */</div><div class='add'>+			spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+			while (q-&gt;queued) {</div><div class='add'>+				entry = q-&gt;entry[q-&gt;head];</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'>+</div><div class='add'>+				dev-&gt;drv-&gt;tx_complete_skb(dev, i, &amp;entry);</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='ctx'> </div><div class='del'>-void mt76u_stop_stat_wk(struct mt76_dev *dev)</div><div class='del'>-{</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;usb.stat_work);</div><div class='ctx'> 	clear_bit(MT76_READING_STATS, &amp;dev-&gt;state);</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_check(dev, NULL, true);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76u_stop_stat_wk);</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76u_stop_tx);</div><div class='ctx'> </div><div class='ctx'> void mt76u_queues_deinit(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	mt76u_stop_queues(dev);</div><div class='add'>+	mt76u_stop_rx(dev);</div><div class='add'>+	mt76u_stop_tx(dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76u_free_rx(dev);</div><div class='ctx'> 	mt76u_free_tx(dev);</div><div class='hunk'>@@ -902,7 +935,7 @@ int mt76u_init(struct mt76_dev *dev,</div><div class='ctx'> 	struct mt76_usb *usb = &amp;dev-&gt;usb;</div><div class='ctx'> </div><div class='ctx'> 	tasklet_init(&amp;usb-&gt;rx_tasklet, mt76u_rx_tasklet, (unsigned long)dev);</div><div class='del'>-	tasklet_init(&amp;usb-&gt;tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev);</div><div class='add'>+	tasklet_init(&amp;dev-&gt;tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;usb-&gt;stat_work, mt76u_tx_status_data);</div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;rx_skb[MT_RXQ_MAIN]);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt7601u/usb.c b/drivers/net/wireless/mediatek/mt7601u/usb.c<br/>index d8b7863f7926..6ae7f14dc9bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt7601u/usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/mediatek/mt7601u/usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/mediatek/mt7601u/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/mediatek/mt7601u/usb.c</a></div><div class='hunk'>@@ -303,6 +303,10 @@ static int mt7601u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 	mac_rev = mt7601u_rr(dev, MT_MAC_CSR0);</div><div class='ctx'> 	dev_info(dev-&gt;dev, "ASIC revision: %08x MAC revision: %08x\n",</div><div class='ctx'> 		 asic_rev, mac_rev);</div><div class='add'>+	if ((asic_rev &gt;&gt; 16) != 0x7601) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Note: vendor driver skips this check for MT7601U */</div><div class='ctx'> 	if (!(mt7601u_rr(dev, MT_EFUSE_CTRL) &amp; MT_EFUSE_CTRL_SEL))</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/bus.h b/drivers/net/wireless/quantenna/qtnfmac/bus.h<br/>index 14b569b6d1b5..7cea08f71838 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/bus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/bus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/bus.h</a></div><div class='hunk'>@@ -13,12 +13,11 @@</div><div class='ctx'> #define QTNF_MAX_MAC		3</div><div class='ctx'> </div><div class='ctx'> enum qtnf_fw_state {</div><div class='del'>-	QTNF_FW_STATE_RESET,</div><div class='del'>-	QTNF_FW_STATE_FW_DNLD_DONE,</div><div class='add'>+	QTNF_FW_STATE_DETACHED,</div><div class='ctx'> 	QTNF_FW_STATE_BOOT_DONE,</div><div class='ctx'> 	QTNF_FW_STATE_ACTIVE,</div><div class='del'>-	QTNF_FW_STATE_DETACHED,</div><div class='del'>-	QTNF_FW_STATE_EP_DEAD,</div><div class='add'>+	QTNF_FW_STATE_RUNNING,</div><div class='add'>+	QTNF_FW_STATE_DEAD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qtnf_bus;</div><div class='hunk'>@@ -50,6 +49,7 @@ struct qtnf_bus {</div><div class='ctx'> 	struct napi_struct mux_napi;</div><div class='ctx'> 	struct net_device mux_dev;</div><div class='ctx'> 	struct workqueue_struct *workqueue;</div><div class='add'>+	struct workqueue_struct *hprio_workqueue;</div><div class='ctx'> 	struct work_struct fw_work;</div><div class='ctx'> 	struct work_struct event_work;</div><div class='ctx'> 	struct mutex bus_lock; /* lock during command/event processing */</div><div class='hunk'>@@ -58,6 +58,23 @@ struct qtnf_bus {</div><div class='ctx'> 	char bus_priv[0] __aligned(sizeof(void *));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool qtnf_fw_is_up(struct qtnf_bus *bus)</div><div class='add'>+{</div><div class='add'>+	enum qtnf_fw_state state = bus-&gt;fw_state;</div><div class='add'>+</div><div class='add'>+	return ((state == QTNF_FW_STATE_ACTIVE) ||</div><div class='add'>+		(state == QTNF_FW_STATE_RUNNING));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool qtnf_fw_is_attached(struct qtnf_bus *bus)</div><div class='add'>+{</div><div class='add'>+	enum qtnf_fw_state state = bus-&gt;fw_state;</div><div class='add'>+</div><div class='add'>+	return ((state == QTNF_FW_STATE_ACTIVE) ||</div><div class='add'>+		(state == QTNF_FW_STATE_RUNNING) ||</div><div class='add'>+		(state == QTNF_FW_STATE_DEAD));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void *get_bus_priv(struct qtnf_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN(!bus, "qtnfmac: invalid bus pointer"))</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c<br/>index dcb0991432f4..d90016125dfc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/cfg80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/cfg80211.c</a></div><div class='hunk'>@@ -144,6 +144,7 @@ int qtnf_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev =  wdev-&gt;netdev;</div><div class='ctx'> 	struct qtnf_vif *vif;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!netdev))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -157,6 +158,11 @@ int qtnf_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)</div><div class='ctx'> 	if (netif_carrier_ok(netdev))</div><div class='ctx'> 		netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='add'>+	while ((skb = skb_dequeue(&amp;vif-&gt;high_pri_tx_queue)))</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;vif-&gt;high_pri_tx_work);</div><div class='add'>+</div><div class='ctx'> 	if (netdev-&gt;reg_state == NETREG_REGISTERED)</div><div class='ctx'> 		unregister_netdevice(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -424,13 +430,13 @@ qtnf_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 	*cookie = short_cookie;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;offchan)</div><div class='del'>-		flags |= QLINK_MGMT_FRAME_TX_FLAG_OFFCHAN;</div><div class='add'>+		flags |= QLINK_FRAME_TX_FLAG_OFFCHAN;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;no_cck)</div><div class='del'>-		flags |= QLINK_MGMT_FRAME_TX_FLAG_NO_CCK;</div><div class='add'>+		flags |= QLINK_FRAME_TX_FLAG_NO_CCK;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;dont_wait_for_ack)</div><div class='del'>-		flags |= QLINK_MGMT_FRAME_TX_FLAG_ACK_NOWAIT;</div><div class='add'>+		flags |= QLINK_FRAME_TX_FLAG_ACK_NOWAIT;</div><div class='ctx'> </div><div class='ctx'> 	/* If channel is not specified, pass "freq = 0" to tell device</div><div class='ctx'> 	 * firmware to use current channel.</div><div class='hunk'>@@ -445,9 +451,8 @@ qtnf_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 		 le16_to_cpu(mgmt_frame-&gt;frame_control), mgmt_frame-&gt;da,</div><div class='ctx'> 		 params-&gt;len, short_cookie, flags);</div><div class='ctx'> </div><div class='del'>-	return qtnf_cmd_send_mgmt_frame(vif, short_cookie, flags,</div><div class='del'>-					freq,</div><div class='del'>-					params-&gt;buf, params-&gt;len);</div><div class='add'>+	return qtnf_cmd_send_frame(vif, short_cookie, flags,</div><div class='add'>+				   freq, params-&gt;buf, params-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -993,53 +998,31 @@ static struct cfg80211_ops qtn_cfg80211_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void qtnf_cfg80211_reg_notifier(struct wiphy *wiphy_in,</div><div class='add'>+static void qtnf_cfg80211_reg_notifier(struct wiphy *wiphy,</div><div class='ctx'> 				       struct regulatory_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct qtnf_wmac *mac = wiphy_priv(wiphy_in);</div><div class='del'>-	struct qtnf_bus *bus = mac-&gt;bus;</div><div class='del'>-	struct wiphy *wiphy;</div><div class='del'>-	unsigned int mac_idx;</div><div class='add'>+	struct qtnf_wmac *mac = wiphy_priv(wiphy);</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("MAC%u: initiator=%d alpha=%c%c\n", mac-&gt;macid, req-&gt;initiator,</div><div class='ctx'> 		 req-&gt;alpha2[0], req-&gt;alpha2[1]);</div><div class='ctx'> </div><div class='del'>-	ret = qtnf_cmd_reg_notify(bus, req);</div><div class='add'>+	ret = qtnf_cmd_reg_notify(mac, req, qtnf_mac_slave_radar_get(wiphy));</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		if (ret == -EOPNOTSUPP) {</div><div class='del'>-			pr_warn("reg update not supported\n");</div><div class='del'>-		} else if (ret == -EALREADY) {</div><div class='del'>-			pr_info("regulatory domain is already set to %c%c",</div><div class='del'>-				req-&gt;alpha2[0], req-&gt;alpha2[1]);</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("failed to update reg domain to %c%c\n",</div><div class='del'>-			       req-&gt;alpha2[0], req-&gt;alpha2[1]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		pr_err("MAC%u: failed to update region to %c%c: %d\n",</div><div class='add'>+		       mac-&gt;macid, req-&gt;alpha2[0], req-&gt;alpha2[1], ret);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (mac_idx = 0; mac_idx &lt; QTNF_MAX_MAC; ++mac_idx) {</div><div class='del'>-		if (!(bus-&gt;hw_info.mac_bitmap &amp; (1 &lt;&lt; mac_idx)))</div><div class='add'>+	for (band = 0; band &lt; NUM_NL80211_BANDS; ++band) {</div><div class='add'>+		if (!wiphy-&gt;bands[band])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		mac = bus-&gt;mac[mac_idx];</div><div class='del'>-		if (!mac)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		wiphy = priv_to_wiphy(mac);</div><div class='del'>-</div><div class='del'>-		for (band = 0; band &lt; NUM_NL80211_BANDS; ++band) {</div><div class='del'>-			if (!wiphy-&gt;bands[band])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ret = qtnf_cmd_band_info_get(mac, wiphy-&gt;bands[band]);</div><div class='del'>-			if (ret)</div><div class='del'>-				pr_err("failed to get chan info for mac %u band %u\n",</div><div class='del'>-				       mac_idx, band);</div><div class='del'>-		}</div><div class='add'>+		ret = qtnf_cmd_band_info_get(mac, wiphy-&gt;bands[band]);</div><div class='add'>+		if (ret)</div><div class='add'>+			pr_err("MAC%u: failed to update band %u\n",</div><div class='add'>+			       mac-&gt;macid, band);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1095,6 +1078,7 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac)</div><div class='ctx'> 	struct wiphy *wiphy = priv_to_wiphy(mac);</div><div class='ctx'> 	struct qtnf_mac_info *macinfo = &amp;mac-&gt;macinfo;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool regdomain_is_known;</div><div class='ctx'> </div><div class='ctx'> 	if (!wiphy) {</div><div class='ctx'> 		pr_err("invalid wiphy pointer\n");</div><div class='hunk'>@@ -1127,7 +1111,8 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac)</div><div class='ctx'> 			WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |</div><div class='ctx'> 			WIPHY_FLAG_AP_UAPSD |</div><div class='ctx'> 			WIPHY_FLAG_HAS_CHANNEL_SWITCH |</div><div class='del'>-			WIPHY_FLAG_4ADDR_STATION;</div><div class='add'>+			WIPHY_FLAG_4ADDR_STATION |</div><div class='add'>+			WIPHY_FLAG_NETNS_OK;</div><div class='ctx'> 	wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (hw_info-&gt;hw_capab &amp; QLINK_HW_CAPAB_DFS_OFFLOAD)</div><div class='hunk'>@@ -1166,11 +1151,19 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac)</div><div class='ctx'> 		wiphy-&gt;wowlan = macinfo-&gt;wowlan;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	regdomain_is_known = isalpha(mac-&gt;rd-&gt;alpha2[0]) &amp;&amp;</div><div class='add'>+				isalpha(mac-&gt;rd-&gt;alpha2[1]);</div><div class='add'>+</div><div class='ctx'> 	if (hw_info-&gt;hw_capab &amp; QLINK_HW_CAPAB_REG_UPDATE) {</div><div class='del'>-		wiphy-&gt;regulatory_flags |= REGULATORY_STRICT_REG |</div><div class='del'>-			REGULATORY_CUSTOM_REG;</div><div class='ctx'> 		wiphy-&gt;reg_notifier = qtnf_cfg80211_reg_notifier;</div><div class='del'>-		wiphy_apply_custom_regulatory(wiphy, hw_info-&gt;rd);</div><div class='add'>+</div><div class='add'>+		if (mac-&gt;rd-&gt;alpha2[0] == '9' &amp;&amp; mac-&gt;rd-&gt;alpha2[1] == '9') {</div><div class='add'>+			wiphy-&gt;regulatory_flags |= REGULATORY_CUSTOM_REG |</div><div class='add'>+				REGULATORY_STRICT_REG;</div><div class='add'>+			wiphy_apply_custom_regulatory(wiphy, mac-&gt;rd);</div><div class='add'>+		} else if (regdomain_is_known) {</div><div class='add'>+			wiphy-&gt;regulatory_flags |= REGULATORY_STRICT_REG;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		wiphy-&gt;regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1193,10 +1186,9 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (wiphy-&gt;regulatory_flags &amp; REGULATORY_WIPHY_SELF_MANAGED)</div><div class='del'>-		ret = regulatory_set_wiphy_regd(wiphy, hw_info-&gt;rd);</div><div class='del'>-	else if (isalpha(hw_info-&gt;rd-&gt;alpha2[0]) &amp;&amp;</div><div class='del'>-		 isalpha(hw_info-&gt;rd-&gt;alpha2[1]))</div><div class='del'>-		ret = regulatory_hint(wiphy, hw_info-&gt;rd-&gt;alpha2);</div><div class='add'>+		ret = regulatory_set_wiphy_regd(wiphy, mac-&gt;rd);</div><div class='add'>+	else if (regdomain_is_known)</div><div class='add'>+		ret = regulatory_hint(wiphy, mac-&gt;rd-&gt;alpha2);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c<br/>index 85a2a58f4c16..459f6b81d2eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/commands.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/commands.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/commands.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/commands.c</a></div><div class='hunk'>@@ -11,6 +11,13 @@</div><div class='ctx'> #include "bus.h"</div><div class='ctx'> #include "commands.h"</div><div class='ctx'> </div><div class='add'>+#define QTNF_SCAN_TIME_AUTO	0</div><div class='add'>+</div><div class='add'>+/* Let device itself to select best values for current conditions */</div><div class='add'>+#define QTNF_SCAN_DWELL_ACTIVE_DEFAULT		QTNF_SCAN_TIME_AUTO</div><div class='add'>+#define QTNF_SCAN_DWELL_PASSIVE_DEFAULT		QTNF_SCAN_TIME_AUTO</div><div class='add'>+#define QTNF_SCAN_SAMPLE_DURATION_DEFAULT	QTNF_SCAN_TIME_AUTO</div><div class='add'>+</div><div class='ctx'> static int qtnf_cmd_check_reply_header(const struct qlink_resp *resp,</div><div class='ctx'> 				       u16 cmd_id, u8 mac_id, u8 vif_id,</div><div class='ctx'> 				       size_t resp_size)</div><div class='hunk'>@@ -89,8 +96,7 @@ static int qtnf_cmd_send_with_reply(struct qtnf_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("VIF%u.%u cmd=0x%.4X\n", mac_id, vif_id, cmd_id);</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;fw_state != QTNF_FW_STATE_ACTIVE &amp;&amp;</div><div class='del'>-	    cmd_id != QLINK_CMD_FW_INIT) {</div><div class='add'>+	if (!qtnf_fw_is_up(bus) &amp;&amp; cmd_id != QLINK_CMD_FW_INIT) {</div><div class='ctx'> 		pr_warn("VIF%u.%u: drop cmd 0x%.4X in fw state %d\n",</div><div class='ctx'> 			mac_id, vif_id, cmd_id, bus-&gt;fw_state);</div><div class='ctx'> 		dev_kfree_skb(cmd_skb);</div><div class='hunk'>@@ -177,14 +183,6 @@ static void qtnf_cmd_tlv_ie_set_add(struct sk_buff *cmd_skb, u8 frame_type,</div><div class='ctx'> 		memcpy(tlv-&gt;ie_data, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline size_t qtnf_cmd_acl_data_size(const struct cfg80211_acl_data *acl)</div><div class='del'>-{</div><div class='del'>-	size_t size = sizeof(struct qlink_acl_data) +</div><div class='del'>-		      acl-&gt;n_acl_entries * sizeof(struct qlink_mac_address);</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool qtnf_cmd_start_ap_can_fit(const struct qtnf_vif *vif,</div><div class='ctx'> 				      const struct cfg80211_ap_settings *s)</div><div class='ctx'> {</div><div class='hunk'>@@ -203,7 +201,7 @@ static bool qtnf_cmd_start_ap_can_fit(const struct qtnf_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;acl)</div><div class='ctx'> 		len += sizeof(struct qlink_tlv_hdr) +</div><div class='del'>-		       qtnf_cmd_acl_data_size(s-&gt;acl);</div><div class='add'>+		       struct_size(s-&gt;acl, mac_addrs, s-&gt;acl-&gt;n_acl_entries);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; (sizeof(struct qlink_cmd) + QTNF_MAX_CMD_BUF_SIZE)) {</div><div class='ctx'> 		pr_err("VIF%u.%u: can not fit AP settings: %u\n",</div><div class='hunk'>@@ -310,7 +308,8 @@ int qtnf_cmd_send_start_ap(struct qtnf_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;acl) {</div><div class='del'>-		size_t acl_size = qtnf_cmd_acl_data_size(s-&gt;acl);</div><div class='add'>+		size_t acl_size = struct_size(s-&gt;acl, mac_addrs,</div><div class='add'>+					      s-&gt;acl-&gt;n_acl_entries);</div><div class='ctx'> 		struct qlink_tlv_hdr *tlv =</div><div class='ctx'> 			skb_put(cmd_skb, sizeof(*tlv) + acl_size);</div><div class='ctx'> </div><div class='hunk'>@@ -382,11 +381,11 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int qtnf_cmd_send_mgmt_frame(struct qtnf_vif *vif, u32 cookie, u16 flags,</div><div class='del'>-			     u16 freq, const u8 *buf, size_t len)</div><div class='add'>+int qtnf_cmd_send_frame(struct qtnf_vif *vif, u32 cookie, u16 flags,</div><div class='add'>+			u16 freq, const u8 *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *cmd_skb;</div><div class='del'>-	struct qlink_cmd_mgmt_frame_tx *cmd;</div><div class='add'>+	struct qlink_cmd_frame_tx *cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (sizeof(*cmd) + len &gt; QTNF_MAX_CMD_BUF_SIZE) {</div><div class='hunk'>@@ -396,14 +395,14 @@ int qtnf_cmd_send_mgmt_frame(struct qtnf_vif *vif, u32 cookie, u16 flags,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif-&gt;mac-&gt;macid, vif-&gt;vifid,</div><div class='del'>-					    QLINK_CMD_SEND_MGMT_FRAME,</div><div class='add'>+					    QLINK_CMD_SEND_FRAME,</div><div class='ctx'> 					    sizeof(*cmd));</div><div class='ctx'> 	if (!cmd_skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	qtnf_bus_lock(vif-&gt;mac-&gt;bus);</div><div class='ctx'> </div><div class='del'>-	cmd = (struct qlink_cmd_mgmt_frame_tx *)cmd_skb-&gt;data;</div><div class='add'>+	cmd = (struct qlink_cmd_frame_tx *)cmd_skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;cookie = cpu_to_le32(cookie);</div><div class='ctx'> 	cmd-&gt;freq = cpu_to_le16(freq);</div><div class='ctx'> 	cmd-&gt;flags = cpu_to_le16(flags);</div><div class='hunk'>@@ -786,8 +785,25 @@ int qtnf_cmd_send_change_intf_type(struct qtnf_vif *vif,</div><div class='ctx'> 				   int use4addr,</div><div class='ctx'> 				   u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	return qtnf_cmd_send_add_change_intf(vif, iftype, use4addr, mac_addr,</div><div class='del'>-					     QLINK_CMD_CHANGE_INTF);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qtnf_cmd_send_add_change_intf(vif, iftype, use4addr, mac_addr,</div><div class='add'>+					    QLINK_CMD_CHANGE_INTF);</div><div class='add'>+</div><div class='add'>+	/* Regulatory settings may be different for different interface types */</div><div class='add'>+	if (ret == 0 &amp;&amp; vif-&gt;wdev.iftype != iftype) {</div><div class='add'>+		enum nl80211_band band;</div><div class='add'>+		struct wiphy *wiphy = priv_to_wiphy(vif-&gt;mac);</div><div class='add'>+</div><div class='add'>+		for (band = 0; band &lt; NUM_NL80211_BANDS; ++band) {</div><div class='add'>+			if (!wiphy-&gt;bands[band])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			qtnf_cmd_band_info_get(vif-&gt;mac, wiphy-&gt;bands[band]);</div><div class='add'>+		}</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'> int qtnf_cmd_send_del_intf(struct qtnf_vif *vif)</div><div class='hunk'>@@ -831,55 +847,6 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 qtnf_cmd_resp_reg_rule_flags_parse(u32 qflags)</div><div class='del'>-{</div><div class='del'>-	u32 flags = 0;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_OFDM)</div><div class='del'>-		flags |= NL80211_RRF_NO_OFDM;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_CCK)</div><div class='del'>-		flags |= NL80211_RRF_NO_CCK;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_INDOOR)</div><div class='del'>-		flags |= NL80211_RRF_NO_INDOOR;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_OUTDOOR)</div><div class='del'>-		flags |= NL80211_RRF_NO_OUTDOOR;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_DFS)</div><div class='del'>-		flags |= NL80211_RRF_DFS;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_PTP_ONLY)</div><div class='del'>-		flags |= NL80211_RRF_PTP_ONLY;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_PTMP_ONLY)</div><div class='del'>-		flags |= NL80211_RRF_PTMP_ONLY;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_IR)</div><div class='del'>-		flags |= NL80211_RRF_NO_IR;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_AUTO_BW)</div><div class='del'>-		flags |= NL80211_RRF_AUTO_BW;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_IR_CONCURRENT)</div><div class='del'>-		flags |= NL80211_RRF_IR_CONCURRENT;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_HT40MINUS)</div><div class='del'>-		flags |= NL80211_RRF_NO_HT40MINUS;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_HT40PLUS)</div><div class='del'>-		flags |= NL80211_RRF_NO_HT40PLUS;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_80MHZ)</div><div class='del'>-		flags |= NL80211_RRF_NO_80MHZ;</div><div class='del'>-</div><div class='del'>-	if (qflags &amp; QLINK_RRF_NO_160MHZ)</div><div class='del'>-		flags |= NL80211_RRF_NO_160MHZ;</div><div class='del'>-</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> 			   const struct qlink_resp_get_hw_info *resp,</div><div class='hunk'>@@ -887,7 +854,6 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> {</div><div class='ctx'> 	struct qtnf_hw_info *hwinfo = &amp;bus-&gt;hw_info;</div><div class='ctx'> 	const struct qlink_tlv_hdr *tlv;</div><div class='del'>-	const struct qlink_tlv_reg_rule *tlv_rule;</div><div class='ctx'> 	const char *bld_name = NULL;</div><div class='ctx'> 	const char *bld_rev = NULL;</div><div class='ctx'> 	const char *bld_type = NULL;</div><div class='hunk'>@@ -898,19 +864,8 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> 	const char *calibration_ver = NULL;</div><div class='ctx'> 	const char *uboot_ver = NULL;</div><div class='ctx'> 	u32 hw_ver = 0;</div><div class='del'>-	struct ieee80211_reg_rule *rule;</div><div class='ctx'> 	u16 tlv_type;</div><div class='ctx'> 	u16 tlv_value_len;</div><div class='del'>-	unsigned int rule_idx = 0;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(resp-&gt;n_reg_rules &gt; NL80211_MAX_SUPP_REG_RULES))</div><div class='del'>-		return -E2BIG;</div><div class='del'>-</div><div class='del'>-	hwinfo-&gt;rd = kzalloc(struct_size(hwinfo-&gt;rd, reg_rules,</div><div class='del'>-					 resp-&gt;n_reg_rules), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!hwinfo-&gt;rd)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	hwinfo-&gt;num_mac = resp-&gt;num_mac;</div><div class='ctx'> 	hwinfo-&gt;mac_bitmap = resp-&gt;mac_bitmap;</div><div class='hunk'>@@ -919,30 +874,11 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> 	hwinfo-&gt;total_tx_chain = resp-&gt;total_tx_chain;</div><div class='ctx'> 	hwinfo-&gt;total_rx_chain = resp-&gt;total_rx_chain;</div><div class='ctx'> 	hwinfo-&gt;hw_capab = le32_to_cpu(resp-&gt;hw_capab);</div><div class='del'>-	hwinfo-&gt;rd-&gt;n_reg_rules = resp-&gt;n_reg_rules;</div><div class='del'>-	hwinfo-&gt;rd-&gt;alpha2[0] = resp-&gt;alpha2[0];</div><div class='del'>-	hwinfo-&gt;rd-&gt;alpha2[1] = resp-&gt;alpha2[1];</div><div class='ctx'> </div><div class='ctx'> 	bld_tmstamp = le32_to_cpu(resp-&gt;bld_tmstamp);</div><div class='ctx'> 	plat_id = le32_to_cpu(resp-&gt;plat_id);</div><div class='ctx'> 	hw_ver = le32_to_cpu(resp-&gt;hw_ver);</div><div class='ctx'> </div><div class='del'>-	switch (resp-&gt;dfs_region) {</div><div class='del'>-	case QLINK_DFS_FCC:</div><div class='del'>-		hwinfo-&gt;rd-&gt;dfs_region = NL80211_DFS_FCC;</div><div class='del'>-		break;</div><div class='del'>-	case QLINK_DFS_ETSI:</div><div class='del'>-		hwinfo-&gt;rd-&gt;dfs_region = NL80211_DFS_ETSI;</div><div class='del'>-		break;</div><div class='del'>-	case QLINK_DFS_JP:</div><div class='del'>-		hwinfo-&gt;rd-&gt;dfs_region = NL80211_DFS_JP;</div><div class='del'>-		break;</div><div class='del'>-	case QLINK_DFS_UNSET:</div><div class='del'>-	default:</div><div class='del'>-		hwinfo-&gt;rd-&gt;dfs_region = NL80211_DFS_UNSET;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	tlv = (const struct qlink_tlv_hdr *)resp-&gt;info;</div><div class='ctx'> </div><div class='ctx'> 	while (info_len &gt;= sizeof(*tlv)) {</div><div class='hunk'>@@ -956,37 +892,6 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (tlv_type) {</div><div class='del'>-		case QTN_TLV_ID_REG_RULE:</div><div class='del'>-			if (rule_idx &gt;= resp-&gt;n_reg_rules) {</div><div class='del'>-				pr_warn("unexpected number of rules: %u\n",</div><div class='del'>-					resp-&gt;n_reg_rules);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (tlv_value_len != sizeof(*tlv_rule) - sizeof(*tlv)) {</div><div class='del'>-				pr_warn("malformed TLV 0x%.2X; LEN: %u\n",</div><div class='del'>-					tlv_type, tlv_value_len);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			tlv_rule = (const struct qlink_tlv_reg_rule *)tlv;</div><div class='del'>-			rule = &amp;hwinfo-&gt;rd-&gt;reg_rules[rule_idx++];</div><div class='del'>-</div><div class='del'>-			rule-&gt;freq_range.start_freq_khz =</div><div class='del'>-				le32_to_cpu(tlv_rule-&gt;start_freq_khz);</div><div class='del'>-			rule-&gt;freq_range.end_freq_khz =</div><div class='del'>-				le32_to_cpu(tlv_rule-&gt;end_freq_khz);</div><div class='del'>-			rule-&gt;freq_range.max_bandwidth_khz =</div><div class='del'>-				le32_to_cpu(tlv_rule-&gt;max_bandwidth_khz);</div><div class='del'>-			rule-&gt;power_rule.max_antenna_gain =</div><div class='del'>-				le32_to_cpu(tlv_rule-&gt;max_antenna_gain);</div><div class='del'>-			rule-&gt;power_rule.max_eirp =</div><div class='del'>-				le32_to_cpu(tlv_rule-&gt;max_eirp);</div><div class='del'>-			rule-&gt;dfs_cac_ms =</div><div class='del'>-				le32_to_cpu(tlv_rule-&gt;dfs_cac_ms);</div><div class='del'>-			rule-&gt;flags = qtnf_cmd_resp_reg_rule_flags_parse(</div><div class='del'>-					le32_to_cpu(tlv_rule-&gt;flags));</div><div class='del'>-			break;</div><div class='ctx'> 		case QTN_TLV_ID_BUILD_NAME:</div><div class='ctx'> 			bld_name = (const void *)tlv-&gt;val;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1019,17 +924,8 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> 		tlv = (struct qlink_tlv_hdr *)(tlv-&gt;val + tlv_value_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rule_idx != resp-&gt;n_reg_rules) {</div><div class='del'>-		pr_warn("unexpected number of rules: expected %u got %u\n",</div><div class='del'>-			resp-&gt;n_reg_rules, rule_idx);</div><div class='del'>-		kfree(hwinfo-&gt;rd);</div><div class='del'>-		hwinfo-&gt;rd = NULL;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("fw_version=%d, MACs map %#x, alpha2=\"%c%c\", chains Tx=%u Rx=%u, capab=0x%x\n",</div><div class='add'>+	pr_info("fw_version=%d, MACs map %#x, chains Tx=%u Rx=%u, capab=0x%x\n",</div><div class='ctx'> 		hwinfo-&gt;fw_ver, hwinfo-&gt;mac_bitmap,</div><div class='del'>-		hwinfo-&gt;rd-&gt;alpha2[0], hwinfo-&gt;rd-&gt;alpha2[1],</div><div class='ctx'> 		hwinfo-&gt;total_tx_chain, hwinfo-&gt;total_rx_chain,</div><div class='ctx'> 		hwinfo-&gt;hw_capab);</div><div class='ctx'> </div><div class='hunk'>@@ -1042,7 +938,7 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,</div><div class='ctx'> 		"\nHardware ID:           %s"  \</div><div class='ctx'> 		"\nCalibration version:   %s"  \</div><div class='ctx'> 		"\nU-Boot version:        %s"  \</div><div class='del'>-		"\nHardware version:      0x%08x",</div><div class='add'>+		"\nHardware version:      0x%08x\n",</div><div class='ctx'> 		bld_name, bld_rev, bld_type, bld_label,</div><div class='ctx'> 		(unsigned long)bld_tmstamp,</div><div class='ctx'> 		(unsigned long)plat_id,</div><div class='hunk'>@@ -1085,9 +981,12 @@ qtnf_parse_wowlan_info(struct qtnf_wmac *mac,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qtnf_parse_variable_mac_info(struct qtnf_wmac *mac,</div><div class='del'>-					const u8 *tlv_buf, size_t tlv_buf_size)</div><div class='add'>+static int</div><div class='add'>+qtnf_parse_variable_mac_info(struct qtnf_wmac *mac,</div><div class='add'>+			     const struct qlink_resp_get_mac_info *resp,</div><div class='add'>+			     size_t tlv_buf_size)</div><div class='ctx'> {</div><div class='add'>+	const u8 *tlv_buf = resp-&gt;var_info;</div><div class='ctx'> 	struct ieee80211_iface_combination *comb = NULL;</div><div class='ctx'> 	size_t n_comb = 0;</div><div class='ctx'> 	struct ieee80211_iface_limit *limits;</div><div class='hunk'>@@ -1105,6 +1004,38 @@ static int qtnf_parse_variable_mac_info(struct qtnf_wmac *mac,</div><div class='ctx'> 	u8 ext_capa_len = 0;</div><div class='ctx'> 	u8 ext_capa_mask_len = 0;</div><div class='ctx'> 	int i = 0;</div><div class='add'>+	struct ieee80211_reg_rule *rule;</div><div class='add'>+	unsigned int rule_idx = 0;</div><div class='add'>+	const struct qlink_tlv_reg_rule *tlv_rule;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(resp-&gt;n_reg_rules &gt; NL80211_MAX_SUPP_REG_RULES))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	mac-&gt;rd = kzalloc(sizeof(*mac-&gt;rd) +</div><div class='add'>+			  sizeof(struct ieee80211_reg_rule) *</div><div class='add'>+			  resp-&gt;n_reg_rules, GFP_KERNEL);</div><div class='add'>+	if (!mac-&gt;rd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mac-&gt;rd-&gt;n_reg_rules = resp-&gt;n_reg_rules;</div><div class='add'>+	mac-&gt;rd-&gt;alpha2[0] = resp-&gt;alpha2[0];</div><div class='add'>+	mac-&gt;rd-&gt;alpha2[1] = resp-&gt;alpha2[1];</div><div class='add'>+</div><div class='add'>+	switch (resp-&gt;dfs_region) {</div><div class='add'>+	case QLINK_DFS_FCC:</div><div class='add'>+		mac-&gt;rd-&gt;dfs_region = NL80211_DFS_FCC;</div><div class='add'>+		break;</div><div class='add'>+	case QLINK_DFS_ETSI:</div><div class='add'>+		mac-&gt;rd-&gt;dfs_region = NL80211_DFS_ETSI;</div><div class='add'>+		break;</div><div class='add'>+	case QLINK_DFS_JP:</div><div class='add'>+		mac-&gt;rd-&gt;dfs_region = NL80211_DFS_JP;</div><div class='add'>+		break;</div><div class='add'>+	case QLINK_DFS_UNSET:</div><div class='add'>+	default:</div><div class='add'>+		mac-&gt;rd-&gt;dfs_region = NL80211_DFS_UNSET;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tlv = (const struct qlink_tlv_hdr *)tlv_buf;</div><div class='ctx'> 	while (tlv_buf_size &gt;= sizeof(struct qlink_tlv_hdr)) {</div><div class='hunk'>@@ -1225,6 +1156,23 @@ static int qtnf_parse_variable_mac_info(struct qtnf_wmac *mac,</div><div class='ctx'> 			mac-&gt;macinfo.wowlan = NULL;</div><div class='ctx'> 			qtnf_parse_wowlan_info(mac, wowlan);</div><div class='ctx'> 			break;</div><div class='add'>+		case QTN_TLV_ID_REG_RULE:</div><div class='add'>+			if (rule_idx &gt;= resp-&gt;n_reg_rules) {</div><div class='add'>+				pr_warn("unexpected number of rules: %u\n",</div><div class='add'>+					resp-&gt;n_reg_rules);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (tlv_value_len != sizeof(*tlv_rule) - sizeof(*tlv)) {</div><div class='add'>+				pr_warn("malformed TLV 0x%.2X; LEN: %u\n",</div><div class='add'>+					tlv_type, tlv_value_len);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tlv_rule = (const struct qlink_tlv_reg_rule *)tlv;</div><div class='add'>+			rule = &amp;mac-&gt;rd-&gt;reg_rules[rule_idx++];</div><div class='add'>+			qlink_utils_regrule_q2nl(rule, tlv_rule);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			pr_warn("MAC%u: unknown TLV type %u\n",</div><div class='ctx'> 				mac-&gt;macid, tlv_type);</div><div class='hunk'>@@ -1253,6 +1201,12 @@ static int qtnf_parse_variable_mac_info(struct qtnf_wmac *mac,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rule_idx != resp-&gt;n_reg_rules) {</div><div class='add'>+		pr_warn("unexpected number of rules: expected %u got %u\n",</div><div class='add'>+			resp-&gt;n_reg_rules, rule_idx);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ext_capa_len &gt; 0) {</div><div class='ctx'> 		ext_capa = kmemdup(ext_capa, ext_capa_len, GFP_KERNEL);</div><div class='ctx'> 		if (!ext_capa)</div><div class='hunk'>@@ -1663,7 +1617,7 @@ int qtnf_cmd_get_mac_info(struct qtnf_wmac *mac)</div><div class='ctx'> </div><div class='ctx'> 	resp = (const struct qlink_resp_get_mac_info *)resp_skb-&gt;data;</div><div class='ctx'> 	qtnf_cmd_resp_proc_mac_info(mac, resp);</div><div class='del'>-	ret = qtnf_parse_variable_mac_info(mac, resp-&gt;var_info, var_data_len);</div><div class='add'>+	ret = qtnf_parse_variable_mac_info(mac, resp, var_data_len);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	qtnf_bus_unlock(mac-&gt;bus);</div><div class='hunk'>@@ -1709,21 +1663,7 @@ int qtnf_cmd_band_info_get(struct qtnf_wmac *mac,</div><div class='ctx'> 	struct qlink_resp_band_info_get *resp;</div><div class='ctx'> 	size_t info_len = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u8 qband;</div><div class='del'>-</div><div class='del'>-	switch (band-&gt;band) {</div><div class='del'>-	case NL80211_BAND_2GHZ:</div><div class='del'>-		qband = QLINK_BAND_2GHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_BAND_5GHZ:</div><div class='del'>-		qband = QLINK_BAND_5GHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_BAND_60GHZ:</div><div class='del'>-		qband = QLINK_BAND_60GHZ;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	u8 qband = qlink_utils_band_cfg2q(band-&gt;band);</div><div class='ctx'> </div><div class='ctx'> 	cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac-&gt;macid, 0,</div><div class='ctx'> 					    QLINK_CMD_BAND_INFO_GET,</div><div class='hunk'>@@ -2107,22 +2047,23 @@ out:</div><div class='ctx'> static void qtnf_cmd_channel_tlv_add(struct sk_buff *cmd_skb,</div><div class='ctx'> 				     const struct ieee80211_channel *sc)</div><div class='ctx'> {</div><div class='del'>-	struct qlink_tlv_channel *qchan;</div><div class='del'>-	u32 flags = 0;</div><div class='del'>-</div><div class='del'>-	qchan = skb_put_zero(cmd_skb, sizeof(*qchan));</div><div class='del'>-	qchan-&gt;hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL);</div><div class='del'>-	qchan-&gt;hdr.len = cpu_to_le16(sizeof(*qchan) - sizeof(qchan-&gt;hdr));</div><div class='del'>-	qchan-&gt;chan.center_freq = cpu_to_le16(sc-&gt;center_freq);</div><div class='del'>-	qchan-&gt;chan.hw_value = cpu_to_le16(sc-&gt;hw_value);</div><div class='del'>-</div><div class='del'>-	if (sc-&gt;flags &amp; IEEE80211_CHAN_NO_IR)</div><div class='del'>-		flags |= QLINK_CHAN_NO_IR;</div><div class='del'>-</div><div class='del'>-	if (sc-&gt;flags &amp; IEEE80211_CHAN_RADAR)</div><div class='del'>-		flags |= QLINK_CHAN_RADAR;</div><div class='del'>-</div><div class='del'>-	qchan-&gt;chan.flags = cpu_to_le32(flags);</div><div class='add'>+	struct qlink_tlv_channel *tlv;</div><div class='add'>+	struct qlink_channel *qch;</div><div class='add'>+</div><div class='add'>+	tlv = skb_put_zero(cmd_skb, sizeof(*tlv));</div><div class='add'>+	qch = &amp;tlv-&gt;chan;</div><div class='add'>+	tlv-&gt;hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL);</div><div class='add'>+	tlv-&gt;hdr.len = cpu_to_le16(sizeof(*qch));</div><div class='add'>+</div><div class='add'>+	qch-&gt;center_freq = cpu_to_le16(sc-&gt;center_freq);</div><div class='add'>+	qch-&gt;hw_value = cpu_to_le16(sc-&gt;hw_value);</div><div class='add'>+	qch-&gt;band = qlink_utils_band_cfg2q(sc-&gt;band);</div><div class='add'>+	qch-&gt;max_power = sc-&gt;max_power;</div><div class='add'>+	qch-&gt;max_reg_power = sc-&gt;max_reg_power;</div><div class='add'>+	qch-&gt;max_antenna_gain = sc-&gt;max_antenna_gain;</div><div class='add'>+	qch-&gt;beacon_found = sc-&gt;beacon_found;</div><div class='add'>+	qch-&gt;dfs_state = qlink_utils_dfs_state_cfg2q(sc-&gt;dfs_state);</div><div class='add'>+	qch-&gt;flags = cpu_to_le32(qlink_utils_chflags_cfg2q(sc-&gt;flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qtnf_cmd_randmac_tlv_add(struct sk_buff *cmd_skb,</div><div class='hunk'>@@ -2141,6 +2082,35 @@ static void qtnf_cmd_randmac_tlv_add(struct sk_buff *cmd_skb,</div><div class='ctx'> 	memcpy(randmac-&gt;mac_addr_mask, mac_addr_mask, ETH_ALEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qtnf_cmd_scan_set_dwell(struct qtnf_wmac *mac,</div><div class='add'>+				    struct sk_buff *cmd_skb)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_scan_request *scan_req = mac-&gt;scan_req;</div><div class='add'>+	u16 dwell_active = QTNF_SCAN_DWELL_ACTIVE_DEFAULT;</div><div class='add'>+	u16 dwell_passive = QTNF_SCAN_DWELL_PASSIVE_DEFAULT;</div><div class='add'>+	u16 duration = QTNF_SCAN_SAMPLE_DURATION_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (scan_req-&gt;duration) {</div><div class='add'>+		dwell_active = scan_req-&gt;duration;</div><div class='add'>+		dwell_passive = scan_req-&gt;duration;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("MAC%u: %s scan dwell active=%u, passive=%u, duration=%u\n",</div><div class='add'>+		 mac-&gt;macid,</div><div class='add'>+		 scan_req-&gt;duration_mandatory ? "mandatory" : "max",</div><div class='add'>+		 dwell_active, dwell_passive, duration);</div><div class='add'>+</div><div class='add'>+	qtnf_cmd_skb_put_tlv_u16(cmd_skb,</div><div class='add'>+				 QTN_TLV_ID_SCAN_DWELL_ACTIVE,</div><div class='add'>+				 dwell_active);</div><div class='add'>+	qtnf_cmd_skb_put_tlv_u16(cmd_skb,</div><div class='add'>+				 QTN_TLV_ID_SCAN_DWELL_PASSIVE,</div><div class='add'>+				 dwell_passive);</div><div class='add'>+	qtnf_cmd_skb_put_tlv_u16(cmd_skb,</div><div class='add'>+				 QTN_TLV_ID_SCAN_SAMPLE_DURATION,</div><div class='add'>+				 duration);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int qtnf_cmd_send_scan(struct qtnf_wmac *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *cmd_skb;</div><div class='hunk'>@@ -2192,6 +2162,8 @@ int qtnf_cmd_send_scan(struct qtnf_wmac *mac)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	qtnf_cmd_scan_set_dwell(mac, cmd_skb);</div><div class='add'>+</div><div class='ctx'> 	if (scan_req-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='ctx'> 		pr_debug("MAC%u: scan with random addr=%pM, mask=%pM\n",</div><div class='ctx'> 			 mac-&gt;macid,</div><div class='hunk'>@@ -2207,15 +2179,6 @@ int qtnf_cmd_send_scan(struct qtnf_wmac *mac)</div><div class='ctx'> 		qtnf_cmd_skb_put_tlv_tag(cmd_skb, QTN_TLV_ID_SCAN_FLUSH);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (scan_req-&gt;duration) {</div><div class='del'>-		pr_debug("MAC%u: %s scan duration %u\n", mac-&gt;macid,</div><div class='del'>-			 scan_req-&gt;duration_mandatory ? "mandatory" : "max",</div><div class='del'>-			 scan_req-&gt;duration);</div><div class='del'>-</div><div class='del'>-		qtnf_cmd_skb_put_tlv_u16(cmd_skb, QTN_TLV_ID_SCAN_DWELL,</div><div class='del'>-					 scan_req-&gt;duration);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = qtnf_cmd_send(mac-&gt;bus, cmd_skb);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2404,13 +2367,18 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int qtnf_cmd_reg_notify(struct qtnf_bus *bus, struct regulatory_request *req)</div><div class='add'>+int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req,</div><div class='add'>+			bool slave_radar)</div><div class='ctx'> {</div><div class='add'>+	struct wiphy *wiphy = priv_to_wiphy(mac);</div><div class='add'>+	struct qtnf_bus *bus = mac-&gt;bus;</div><div class='ctx'> 	struct sk_buff *cmd_skb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct qlink_cmd_reg_notify *cmd;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	const struct ieee80211_supported_band *cfg_band;</div><div class='ctx'> </div><div class='del'>-	cmd_skb = qtnf_cmd_alloc_new_cmdskb(QLINK_MACID_RSVD, QLINK_VIFID_RSVD,</div><div class='add'>+	cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac-&gt;macid, QLINK_VIFID_RSVD,</div><div class='ctx'> 					    QLINK_CMD_REG_NOTIFY,</div><div class='ctx'> 					    sizeof(*cmd));</div><div class='ctx'> 	if (!cmd_skb)</div><div class='hunk'>@@ -2447,12 +2415,41 @@ int qtnf_cmd_reg_notify(struct qtnf_bus *bus, struct regulatory_request *req)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (req-&gt;dfs_region) {</div><div class='add'>+	case NL80211_DFS_FCC:</div><div class='add'>+		cmd-&gt;dfs_region = QLINK_DFS_FCC;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_DFS_ETSI:</div><div class='add'>+		cmd-&gt;dfs_region = QLINK_DFS_ETSI;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_DFS_JP:</div><div class='add'>+		cmd-&gt;dfs_region = QLINK_DFS_JP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cmd-&gt;dfs_region = QLINK_DFS_UNSET;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;slave_radar = slave_radar;</div><div class='add'>+	cmd-&gt;num_channels = 0;</div><div class='add'>+</div><div class='add'>+	for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		cfg_band = wiphy-&gt;bands[band];</div><div class='add'>+		if (!cfg_band)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;num_channels += cfg_band-&gt;n_channels;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; cfg_band-&gt;n_channels; ++i) {</div><div class='add'>+			qtnf_cmd_channel_tlv_add(cmd_skb,</div><div class='add'>+						 &amp;cfg_band-&gt;channels[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	qtnf_bus_lock(bus);</div><div class='ctx'> 	ret = qtnf_cmd_send(bus, cmd_skb);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	qtnf_bus_unlock(bus);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2592,7 +2589,7 @@ int qtnf_cmd_set_mac_acl(const struct qtnf_vif *vif,</div><div class='ctx'> 	struct qtnf_bus *bus = vif-&gt;mac-&gt;bus;</div><div class='ctx'> 	struct sk_buff *cmd_skb;</div><div class='ctx'> 	struct qlink_tlv_hdr *tlv;</div><div class='del'>-	size_t acl_size = qtnf_cmd_acl_data_size(params);</div><div class='add'>+	size_t acl_size = struct_size(params, mac_addrs, params-&gt;n_acl_entries);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif-&gt;mac-&gt;macid, vif-&gt;vifid,</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.h b/drivers/net/wireless/quantenna/qtnfmac/commands.h<br/>index 64f0b9dc8a14..88d7a3cd90d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/commands.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/commands.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/commands.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/commands.h</a></div><div class='hunk'>@@ -27,8 +27,8 @@ int qtnf_cmd_send_start_ap(struct qtnf_vif *vif,</div><div class='ctx'> 			   const struct cfg80211_ap_settings *s);</div><div class='ctx'> int qtnf_cmd_send_stop_ap(struct qtnf_vif *vif);</div><div class='ctx'> int qtnf_cmd_send_register_mgmt(struct qtnf_vif *vif, u16 frame_type, bool reg);</div><div class='del'>-int qtnf_cmd_send_mgmt_frame(struct qtnf_vif *vif, u32 cookie, u16 flags,</div><div class='del'>-			     u16 freq, const u8 *buf, size_t len);</div><div class='add'>+int qtnf_cmd_send_frame(struct qtnf_vif *vif, u32 cookie, u16 flags,</div><div class='add'>+			u16 freq, const u8 *buf, size_t len);</div><div class='ctx'> int qtnf_cmd_send_mgmt_set_appie(struct qtnf_vif *vif, u8 frame_type,</div><div class='ctx'> 				 const u8 *buf, size_t len);</div><div class='ctx'> int qtnf_cmd_get_sta_info(struct qtnf_vif *vif, const u8 *sta_mac,</div><div class='hunk'>@@ -57,7 +57,8 @@ int qtnf_cmd_send_disconnect(struct qtnf_vif *vif,</div><div class='ctx'> 			     u16 reason_code);</div><div class='ctx'> int qtnf_cmd_send_updown_intf(struct qtnf_vif *vif,</div><div class='ctx'> 			      bool up);</div><div class='del'>-int qtnf_cmd_reg_notify(struct qtnf_bus *bus, struct regulatory_request *req);</div><div class='add'>+int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req,</div><div class='add'>+			bool slave_radar);</div><div class='ctx'> int qtnf_cmd_get_chan_stats(struct qtnf_wmac *mac, u16 channel,</div><div class='ctx'> 			    struct qtnf_chan_stats *stats);</div><div class='ctx'> int qtnf_cmd_send_chan_switch(struct qtnf_vif *vif,</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c<br/>index ee1b75fda1dd..8d699cc03d26 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/core.c</a></div><div class='hunk'>@@ -16,6 +16,12 @@</div><div class='ctx'> #define QTNF_DMP_MAX_LEN 48</div><div class='ctx'> #define QTNF_PRIMARY_VIF_IDX	0</div><div class='ctx'> </div><div class='add'>+static bool slave_radar = true;</div><div class='add'>+module_param(slave_radar, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(slave_radar, "set 0 to disable radar detection in slave mode");</div><div class='add'>+</div><div class='add'>+static struct dentry *qtnf_debugfs_dir;</div><div class='add'>+</div><div class='ctx'> struct qtnf_frame_meta_info {</div><div class='ctx'> 	u8 magic_s;</div><div class='ctx'> 	u8 ifidx;</div><div class='hunk'>@@ -368,6 +374,23 @@ static void qtnf_mac_scan_timeout(struct work_struct *work)</div><div class='ctx'> 	qtnf_mac_scan_finish(mac, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qtnf_vif_send_data_high_pri(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct qtnf_vif *vif =</div><div class='add'>+		container_of(work, struct qtnf_vif, high_pri_tx_work);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;netdev ||</div><div class='add'>+	    vif-&gt;wdev.iftype == NL80211_IFTYPE_UNSPECIFIED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;vif-&gt;high_pri_tx_queue))) {</div><div class='add'>+		qtnf_cmd_send_frame(vif, 0, QLINK_FRAME_TX_FLAG_8023,</div><div class='add'>+				    0, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct qtnf_wmac *qtnf_core_mac_alloc(struct qtnf_bus *bus,</div><div class='ctx'> 					     unsigned int macid)</div><div class='ctx'> {</div><div class='hunk'>@@ -395,7 +418,8 @@ static struct qtnf_wmac *qtnf_core_mac_alloc(struct qtnf_bus *bus,</div><div class='ctx'> 		vif-&gt;mac = mac;</div><div class='ctx'> 		vif-&gt;vifid = i;</div><div class='ctx'> 		qtnf_sta_list_init(&amp;vif-&gt;sta_list);</div><div class='del'>-</div><div class='add'>+		INIT_WORK(&amp;vif-&gt;high_pri_tx_work, qtnf_vif_send_data_high_pri);</div><div class='add'>+		skb_queue_head_init(&amp;vif-&gt;high_pri_tx_queue);</div><div class='ctx'> 		vif-&gt;stats64 = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);</div><div class='ctx'> 		if (!vif-&gt;stats64)</div><div class='ctx'> 			pr_warn("VIF%u.%u: per cpu stats allocation failed\n",</div><div class='hunk'>@@ -408,6 +432,11 @@ static struct qtnf_wmac *qtnf_core_mac_alloc(struct qtnf_bus *bus,</div><div class='ctx'> 	return mac;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool qtnf_mac_slave_radar_get(struct wiphy *wiphy)</div><div class='add'>+{</div><div class='add'>+	return slave_radar;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops qtnf_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo = cfg80211_get_drvinfo,</div><div class='ctx'> };</div><div class='hunk'>@@ -499,6 +528,8 @@ static void qtnf_core_mac_detach(struct qtnf_bus *bus, unsigned int macid)</div><div class='ctx'> 	qtnf_mac_iface_comb_free(mac);</div><div class='ctx'> 	qtnf_mac_ext_caps_free(mac);</div><div class='ctx'> 	kfree(mac-&gt;macinfo.wowlan);</div><div class='add'>+	kfree(mac-&gt;rd);</div><div class='add'>+	mac-&gt;rd = NULL;</div><div class='ctx'> 	wiphy_free(wiphy);</div><div class='ctx'> 	bus-&gt;mac[macid] = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -587,8 +618,6 @@ int qtnf_core_attach(struct qtnf_bus *bus)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	qtnf_trans_init(bus);</div><div class='del'>-</div><div class='del'>-	bus-&gt;fw_state = QTNF_FW_STATE_BOOT_DONE;</div><div class='ctx'> 	qtnf_bus_data_rx_start(bus);</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;workqueue = alloc_ordered_workqueue("QTNF_BUS", 0);</div><div class='hunk'>@@ -598,6 +627,13 @@ int qtnf_core_attach(struct qtnf_bus *bus)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bus-&gt;hprio_workqueue = alloc_workqueue("QTNF_HPRI", WQ_HIGHPRI, 0);</div><div class='add'>+	if (!bus-&gt;hprio_workqueue) {</div><div class='add'>+		pr_err("failed to alloc high prio workqueue\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	INIT_WORK(&amp;bus-&gt;event_work, qtnf_event_work_handler);</div><div class='ctx'> </div><div class='ctx'> 	ret = qtnf_cmd_send_init_fw(bus);</div><div class='hunk'>@@ -607,7 +643,6 @@ int qtnf_core_attach(struct qtnf_bus *bus)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;fw_state = QTNF_FW_STATE_ACTIVE;</div><div class='del'>-</div><div class='ctx'> 	ret = qtnf_cmd_get_hw_info(bus);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("failed to get HW info: %d\n", ret);</div><div class='hunk'>@@ -637,11 +672,11 @@ int qtnf_core_attach(struct qtnf_bus *bus)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bus-&gt;fw_state = QTNF_FW_STATE_RUNNING;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	qtnf_core_detach(bus);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qtnf_core_attach);</div><div class='hunk'>@@ -655,7 +690,7 @@ void qtnf_core_detach(struct qtnf_bus *bus)</div><div class='ctx'> 	for (macid = 0; macid &lt; QTNF_MAX_MAC; macid++)</div><div class='ctx'> 		qtnf_core_mac_detach(bus, macid);</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;fw_state == QTNF_FW_STATE_ACTIVE)</div><div class='add'>+	if (qtnf_fw_is_up(bus))</div><div class='ctx'> 		qtnf_cmd_send_deinit_fw(bus);</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;fw_state = QTNF_FW_STATE_DETACHED;</div><div class='hunk'>@@ -663,10 +698,14 @@ void qtnf_core_detach(struct qtnf_bus *bus)</div><div class='ctx'> 	if (bus-&gt;workqueue) {</div><div class='ctx'> 		flush_workqueue(bus-&gt;workqueue);</div><div class='ctx'> 		destroy_workqueue(bus-&gt;workqueue);</div><div class='add'>+		bus-&gt;workqueue = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(bus-&gt;hw_info.rd);</div><div class='del'>-	bus-&gt;hw_info.rd = NULL;</div><div class='add'>+	if (bus-&gt;hprio_workqueue) {</div><div class='add'>+		flush_workqueue(bus-&gt;hprio_workqueue);</div><div class='add'>+		destroy_workqueue(bus-&gt;hprio_workqueue);</div><div class='add'>+		bus-&gt;hprio_workqueue = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	qtnf_trans_free(bus);</div><div class='ctx'> }</div><div class='hunk'>@@ -684,6 +723,9 @@ struct net_device *qtnf_classify_skb(struct qtnf_bus *bus, struct sk_buff *skb)</div><div class='ctx'> 	struct qtnf_wmac *mac;</div><div class='ctx'> 	struct qtnf_vif *vif;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(bus-&gt;fw_state != QTNF_FW_STATE_RUNNING))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	meta = (struct qtnf_frame_meta_info *)</div><div class='ctx'> 		(skb_tail_pointer(skb) - sizeof(*meta));</div><div class='ctx'> </div><div class='hunk'>@@ -799,6 +841,39 @@ void qtnf_update_tx_stats(struct net_device *ndev, const struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qtnf_update_tx_stats);</div><div class='ctx'> </div><div class='add'>+void qtnf_packet_send_hi_pri(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct qtnf_vif *vif = qtnf_netdev_get_priv(skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;vif-&gt;high_pri_tx_queue, skb);</div><div class='add'>+	queue_work(vif-&gt;mac-&gt;bus-&gt;hprio_workqueue, &amp;vif-&gt;high_pri_tx_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(qtnf_packet_send_hi_pri);</div><div class='add'>+</div><div class='add'>+struct dentry *qtnf_get_debugfs_dir(void)</div><div class='add'>+{</div><div class='add'>+	return qtnf_debugfs_dir;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(qtnf_get_debugfs_dir);</div><div class='add'>+</div><div class='add'>+static int __init qtnf_core_register(void)</div><div class='add'>+{</div><div class='add'>+	qtnf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(qtnf_debugfs_dir))</div><div class='add'>+		qtnf_debugfs_dir = NULL;</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 qtnf_core_exit(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove(qtnf_debugfs_dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(qtnf_core_register);</div><div class='add'>+module_exit(qtnf_core_exit);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Quantenna Communications");</div><div class='ctx'> MODULE_DESCRIPTION("Quantenna 802.11 wireless LAN FullMAC driver.");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h<br/>index a31cff46e964..322858df600c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/core.h</a></div><div class='hunk'>@@ -63,6 +63,8 @@ struct qtnf_vif {</div><div class='ctx'> 	struct qtnf_wmac *mac;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct reset_work;</div><div class='add'>+	struct work_struct high_pri_tx_work;</div><div class='add'>+	struct sk_buff_head high_pri_tx_queue;</div><div class='ctx'> 	struct qtnf_sta_list sta_list;</div><div class='ctx'> 	unsigned long cons_tx_timeout_cnt;</div><div class='ctx'> 	int generation;</div><div class='hunk'>@@ -112,6 +114,7 @@ struct qtnf_wmac {</div><div class='ctx'> 	struct cfg80211_scan_request *scan_req;</div><div class='ctx'> 	struct mutex mac_lock;	/* lock during wmac speicific ops */</div><div class='ctx'> 	struct delayed_work scan_timeout;</div><div class='add'>+	struct ieee80211_regdomain *rd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qtnf_hw_info {</div><div class='hunk'>@@ -120,7 +123,6 @@ struct qtnf_hw_info {</div><div class='ctx'> 	u8 mac_bitmap;</div><div class='ctx'> 	u32 fw_ver;</div><div class='ctx'> 	u32 hw_capab;</div><div class='del'>-	struct ieee80211_regdomain *rd;</div><div class='ctx'> 	u8 total_tx_chain;</div><div class='ctx'> 	u8 total_rx_chain;</div><div class='ctx'> 	char fw_version[ETHTOOL_FWVERS_LEN];</div><div class='hunk'>@@ -132,6 +134,7 @@ struct qtnf_vif *qtnf_mac_get_free_vif(struct qtnf_wmac *mac);</div><div class='ctx'> struct qtnf_vif *qtnf_mac_get_base_vif(struct qtnf_wmac *mac);</div><div class='ctx'> void qtnf_mac_iface_comb_free(struct qtnf_wmac *mac);</div><div class='ctx'> void qtnf_mac_ext_caps_free(struct qtnf_wmac *mac);</div><div class='add'>+bool qtnf_mac_slave_radar_get(struct wiphy *wiphy);</div><div class='ctx'> struct wiphy *qtnf_wiphy_allocate(struct qtnf_bus *bus);</div><div class='ctx'> int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *priv,</div><div class='ctx'> 			 const char *name, unsigned char name_assign_type);</div><div class='hunk'>@@ -149,6 +152,8 @@ void qtnf_virtual_intf_cleanup(struct net_device *ndev);</div><div class='ctx'> </div><div class='ctx'> void qtnf_netdev_updown(struct net_device *ndev, bool up);</div><div class='ctx'> void qtnf_scan_done(struct qtnf_wmac *mac, bool aborted);</div><div class='add'>+void qtnf_packet_send_hi_pri(struct sk_buff *skb);</div><div class='add'>+struct dentry *qtnf_get_debugfs_dir(void);</div><div class='ctx'> </div><div class='ctx'> static inline struct qtnf_vif *qtnf_netdev_get_priv(struct net_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/debug.c b/drivers/net/wireless/quantenna/qtnfmac/debug.c<br/>index 598ece753a4b..2d3574c1f10e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/debug.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/debug.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/debug.c</a></div><div class='hunk'>@@ -5,7 +5,9 @@</div><div class='ctx'> </div><div class='ctx'> void qtnf_debugfs_init(struct qtnf_bus *bus, const char *name)</div><div class='ctx'> {</div><div class='del'>-	bus-&gt;dbg_dir = debugfs_create_dir(name, NULL);</div><div class='add'>+	struct dentry *parent = qtnf_get_debugfs_dir();</div><div class='add'>+</div><div class='add'>+	bus-&gt;dbg_dir = debugfs_create_dir(name, parent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void qtnf_debugfs_remove(struct qtnf_bus *bus)</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c<br/>index 6c1b886339ac..b57c8c18a8d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/event.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/event.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/event.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/event.c</a></div><div class='hunk'>@@ -493,14 +493,20 @@ qtnf_event_handle_freq_change(struct qtnf_wmac *mac,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; QTNF_MAX_INTF; i++) {</div><div class='ctx'> 		vif = &amp;mac-&gt;iflist[i];</div><div class='add'>+</div><div class='ctx'> 		if (vif-&gt;wdev.iftype == NL80211_IFTYPE_UNSPECIFIED)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (vif-&gt;netdev) {</div><div class='del'>-			mutex_lock(&amp;vif-&gt;wdev.mtx);</div><div class='del'>-			cfg80211_ch_switch_notify(vif-&gt;netdev, &amp;chandef);</div><div class='del'>-			mutex_unlock(&amp;vif-&gt;wdev.mtx);</div><div class='del'>-		}</div><div class='add'>+		if (vif-&gt;wdev.iftype == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    !vif-&gt;wdev.current_bss)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!vif-&gt;netdev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;vif-&gt;wdev.mtx);</div><div class='add'>+		cfg80211_ch_switch_notify(vif-&gt;netdev, &amp;chandef);</div><div class='add'>+		mutex_unlock(&amp;vif-&gt;wdev.mtx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c<br/>index c3a32effa6f0..e4e9344b6982 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ int qtnf_pcie_control_tx(struct qtnf_bus *bus, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -ETIMEDOUT) {</div><div class='ctx'> 		pr_err("EP firmware is dead\n");</div><div class='del'>-		bus-&gt;fw_state = QTNF_FW_STATE_EP_DEAD;</div><div class='add'>+		bus-&gt;fw_state = QTNF_FW_STATE_DEAD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -128,32 +128,22 @@ static int qtnf_dbg_shm_stats(struct seq_file *s, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void qtnf_pcie_fw_boot_done(struct qtnf_bus *bus, bool boot_success)</div><div class='add'>+int qtnf_pcie_fw_boot_done(struct qtnf_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	struct qtnf_pcie_bus_priv *priv = get_bus_priv(bus);</div><div class='del'>-	struct pci_dev *pdev = priv-&gt;pdev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (boot_success) {</div><div class='del'>-		bus-&gt;fw_state = QTNF_FW_STATE_FW_DNLD_DONE;</div><div class='del'>-</div><div class='del'>-		ret = qtnf_core_attach(bus);</div><div class='del'>-		if (ret) {</div><div class='del'>-			pr_err("failed to attach core\n");</div><div class='del'>-			boot_success = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (boot_success) {</div><div class='add'>+	bus-&gt;fw_state = QTNF_FW_STATE_BOOT_DONE;</div><div class='add'>+	ret = qtnf_core_attach(bus);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to attach core\n");</div><div class='add'>+	} else {</div><div class='ctx'> 		qtnf_debugfs_init(bus, DRV_NAME);</div><div class='ctx'> 		qtnf_debugfs_add_entry(bus, "mps", qtnf_dbg_mps_show);</div><div class='ctx'> 		qtnf_debugfs_add_entry(bus, "msi_enabled", qtnf_dbg_msi_show);</div><div class='ctx'> 		qtnf_debugfs_add_entry(bus, "shm_stats", qtnf_dbg_shm_stats);</div><div class='del'>-	} else {</div><div class='del'>-		bus-&gt;fw_state = QTNF_FW_STATE_DETACHED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	put_device(&amp;pdev-&gt;dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qtnf_tune_pcie_mps(struct pci_dev *pdev)</div><div class='hunk'>@@ -344,7 +334,7 @@ static int qtnf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	pcie_priv = get_bus_priv(bus);</div><div class='ctx'> 	pci_set_drvdata(pdev, bus);</div><div class='ctx'> 	bus-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	bus-&gt;fw_state = QTNF_FW_STATE_RESET;</div><div class='add'>+	bus-&gt;fw_state = QTNF_FW_STATE_DETACHED;</div><div class='ctx'> 	pcie_priv-&gt;pdev = pdev;</div><div class='ctx'> 	pcie_priv-&gt;tx_stopped = 0;</div><div class='ctx'> 	pcie_priv-&gt;rx_bd_num = rx_bd_size_param;</div><div class='hunk'>@@ -364,6 +354,7 @@ static int qtnf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	pcie_priv-&gt;pcie_irq_count = 0;</div><div class='ctx'> 	pcie_priv-&gt;tx_reclaim_done = 0;</div><div class='ctx'> 	pcie_priv-&gt;tx_reclaim_req = 0;</div><div class='add'>+	pcie_priv-&gt;tx_eapol = 0;</div><div class='ctx'> </div><div class='ctx'> 	pcie_priv-&gt;workqueue = create_singlethread_workqueue("QTNF_PCIE");</div><div class='ctx'> 	if (!pcie_priv-&gt;workqueue) {</div><div class='hunk'>@@ -419,8 +410,7 @@ static void qtnf_pcie_remove(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;bus-&gt;fw_work);</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;fw_state == QTNF_FW_STATE_ACTIVE ||</div><div class='del'>-	    bus-&gt;fw_state == QTNF_FW_STATE_EP_DEAD)</div><div class='add'>+	if (qtnf_fw_is_attached(bus))</div><div class='ctx'> 		qtnf_core_detach(bus);</div><div class='ctx'> </div><div class='ctx'> 	netif_napi_del(&amp;bus-&gt;mux_napi);</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h<br/>index bbc074e1f34d..5e8b9cb68419 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h</a></div><div class='hunk'>@@ -62,6 +62,7 @@ struct qtnf_pcie_bus_priv {</div><div class='ctx'> 	u32 tx_done_count;</div><div class='ctx'> 	u32 tx_reclaim_done;</div><div class='ctx'> 	u32 tx_reclaim_req;</div><div class='add'>+	u32 tx_eapol;</div><div class='ctx'> </div><div class='ctx'> 	u8 msi_enabled;</div><div class='ctx'> 	u8 tx_stopped;</div><div class='hunk'>@@ -70,7 +71,7 @@ struct qtnf_pcie_bus_priv {</div><div class='ctx'> </div><div class='ctx'> int qtnf_pcie_control_tx(struct qtnf_bus *bus, struct sk_buff *skb);</div><div class='ctx'> int qtnf_pcie_alloc_skb_array(struct qtnf_pcie_bus_priv *priv);</div><div class='del'>-void qtnf_pcie_fw_boot_done(struct qtnf_bus *bus, bool boot_success);</div><div class='add'>+int qtnf_pcie_fw_boot_done(struct qtnf_bus *bus);</div><div class='ctx'> void qtnf_pcie_init_shm_ipc(struct qtnf_pcie_bus_priv *priv,</div><div class='ctx'> 			    struct qtnf_shm_ipc_region __iomem *ipc_tx_reg,</div><div class='ctx'> 			    struct qtnf_shm_ipc_region __iomem *ipc_rx_reg,</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c<br/>index 1f5facbb8905..3aa3714d4dfd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c</a></div><div class='hunk'>@@ -980,12 +980,11 @@ static void qtnf_pearl_fw_work_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct qtnf_bus *bus = container_of(work, struct qtnf_bus, fw_work);</div><div class='ctx'> 	struct qtnf_pcie_pearl_state *ps = (void *)get_bus_priv(bus);</div><div class='add'>+	u32 state = QTN_RC_FW_LOADRDY | QTN_RC_FW_QLINK;</div><div class='add'>+	const char *fwname = QTN_PCI_PEARL_FW_NAME;</div><div class='ctx'> 	struct pci_dev *pdev = ps-&gt;base.pdev;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 state = QTN_RC_FW_LOADRDY | QTN_RC_FW_QLINK;</div><div class='del'>-	const char *fwname = QTN_PCI_PEARL_FW_NAME;</div><div class='del'>-	bool fw_boot_success = false;</div><div class='ctx'> </div><div class='ctx'> 	if (ps-&gt;base.flashboot) {</div><div class='ctx'> 		state |= QTN_RC_FW_FLASHBOOT;</div><div class='hunk'>@@ -1031,23 +1030,23 @@ static void qtnf_pearl_fw_work_handler(struct work_struct *work)</div><div class='ctx'> 		goto fw_load_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_info("firmware is up and running\n");</div><div class='del'>-</div><div class='ctx'> 	if (qtnf_poll_state(&amp;ps-&gt;bda-&gt;bda_ep_state,</div><div class='ctx'> 			    QTN_EP_FW_QLINK_DONE, QTN_FW_QLINK_TIMEOUT_MS)) {</div><div class='ctx'> 		pr_err("firmware runtime failure\n");</div><div class='ctx'> 		goto fw_load_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fw_boot_success = true;</div><div class='add'>+	pr_info("firmware is up and running\n");</div><div class='ctx'> </div><div class='del'>-fw_load_exit:</div><div class='del'>-	qtnf_pcie_fw_boot_done(bus, fw_boot_success);</div><div class='add'>+	ret = qtnf_pcie_fw_boot_done(bus);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fw_load_exit;</div><div class='ctx'> </div><div class='del'>-	if (fw_boot_success) {</div><div class='del'>-		qtnf_debugfs_add_entry(bus, "hdp_stats", qtnf_dbg_hdp_stats);</div><div class='del'>-		qtnf_debugfs_add_entry(bus, "irq_stats", qtnf_dbg_irq_stats);</div><div class='del'>-	}</div><div class='add'>+	qtnf_debugfs_add_entry(bus, "hdp_stats", qtnf_dbg_hdp_stats);</div><div class='add'>+	qtnf_debugfs_add_entry(bus, "irq_stats", qtnf_dbg_irq_stats);</div><div class='add'>+</div><div class='add'>+fw_load_exit:</div><div class='add'>+	put_device(&amp;pdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qtnf_pearl_reclaim_tasklet_fn(unsigned long data)</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c<br/>index cbcda57105f3..9a4380ed7f1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c</a></div><div class='hunk'>@@ -498,6 +498,13 @@ static int qtnf_pcie_data_tx(struct qtnf_bus *bus, struct sk_buff *skb)</div><div class='ctx'> 	int len;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(skb-&gt;protocol == htons(ETH_P_PAE))) {</div><div class='add'>+		qtnf_packet_send_hi_pri(skb);</div><div class='add'>+		qtnf_update_tx_stats(skb-&gt;dev, skb);</div><div class='add'>+		priv-&gt;tx_eapol++;</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!qtnf_tx_queue_ready(ts)) {</div><div class='hunk'>@@ -761,6 +768,7 @@ static int qtnf_dbg_pkt_stats(struct seq_file *s, void *data)</div><div class='ctx'> 	seq_printf(s, "tx_done_count(%u)\n", priv-&gt;tx_done_count);</div><div class='ctx'> 	seq_printf(s, "tx_reclaim_done(%u)\n", priv-&gt;tx_reclaim_done);</div><div class='ctx'> 	seq_printf(s, "tx_reclaim_req(%u)\n", priv-&gt;tx_reclaim_req);</div><div class='add'>+	seq_printf(s, "tx_eapol(%u)\n", priv-&gt;tx_eapol);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "tx_bd_r_index(%u)\n", priv-&gt;tx_bd_r_index);</div><div class='ctx'> 	seq_printf(s, "tx_done_index(%u)\n", tx_done_index);</div><div class='hunk'>@@ -1023,8 +1031,9 @@ static void qtnf_topaz_fw_work_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct qtnf_bus *bus = container_of(work, struct qtnf_bus, fw_work);</div><div class='ctx'> 	struct qtnf_pcie_topaz_state *ts = (void *)get_bus_priv(bus);</div><div class='del'>-	int ret;</div><div class='ctx'> 	int bootloader_needed = readl(&amp;ts-&gt;bda-&gt;bda_flags) &amp; QTN_BDA_XMIT_UBOOT;</div><div class='add'>+	struct pci_dev *pdev = ts-&gt;base.pdev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	qtnf_set_state(&amp;ts-&gt;bda-&gt;bda_bootstate, QTN_BDA_FW_TARGET_BOOT);</div><div class='ctx'> </div><div class='hunk'>@@ -1073,19 +1082,23 @@ static void qtnf_topaz_fw_work_handler(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = qtnf_post_init_ep(ts);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("FW runtime failure\n");</div><div class='add'>+		goto fw_load_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pr_info("firmware is up and running\n");</div><div class='ctx'> </div><div class='del'>-	ret = qtnf_post_init_ep(ts);</div><div class='add'>+	ret = qtnf_pcie_fw_boot_done(bus);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		pr_err("FW runtime failure\n");</div><div class='add'>+		goto fw_load_exit;</div><div class='ctx'> </div><div class='del'>-fw_load_exit:</div><div class='del'>-	qtnf_pcie_fw_boot_done(bus, ret ? false : true);</div><div class='add'>+	qtnf_debugfs_add_entry(bus, "pkt_stats", qtnf_dbg_pkt_stats);</div><div class='add'>+	qtnf_debugfs_add_entry(bus, "irq_stats", qtnf_dbg_irq_stats);</div><div class='ctx'> </div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		qtnf_debugfs_add_entry(bus, "pkt_stats", qtnf_dbg_pkt_stats);</div><div class='del'>-		qtnf_debugfs_add_entry(bus, "irq_stats", qtnf_dbg_irq_stats);</div><div class='del'>-	}</div><div class='add'>+fw_load_exit:</div><div class='add'>+	put_device(&amp;pdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qtnf_reclaim_tasklet_fn(unsigned long data)</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h<br/>index 7798edcf7980..8a3c6344fa8e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/qlink.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/qlink.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/qlink.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/qlink.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> </div><div class='del'>-#define QLINK_PROTO_VER		13</div><div class='add'>+#define QLINK_PROTO_VER		15</div><div class='ctx'> </div><div class='ctx'> #define QLINK_MACID_RSVD		0xFF</div><div class='ctx'> #define QLINK_VIFID_RSVD		0xFF</div><div class='hunk'>@@ -206,6 +206,8 @@ struct qlink_sta_info_state {</div><div class='ctx'>  * execution status (one of &amp;enum qlink_cmd_result). Reply message</div><div class='ctx'>  * may also contain data payload specific to the command type.</div><div class='ctx'>  *</div><div class='add'>+ * @QLINK_CMD_SEND_FRAME: send specified frame over the air; firmware will</div><div class='add'>+ *	encapsulate 802.3 packet into 802.11 frame automatically.</div><div class='ctx'>  * @QLINK_CMD_BAND_INFO_GET: for the specified MAC and specified band, get</div><div class='ctx'>  *	the band's description including number of operational channels and</div><div class='ctx'>  *	info on each channel, HT/VHT capabilities, supported rates etc.</div><div class='hunk'>@@ -220,7 +222,7 @@ enum qlink_cmd_type {</div><div class='ctx'> 	QLINK_CMD_FW_INIT		= 0x0001,</div><div class='ctx'> 	QLINK_CMD_FW_DEINIT		= 0x0002,</div><div class='ctx'> 	QLINK_CMD_REGISTER_MGMT		= 0x0003,</div><div class='del'>-	QLINK_CMD_SEND_MGMT_FRAME	= 0x0004,</div><div class='add'>+	QLINK_CMD_SEND_FRAME		= 0x0004,</div><div class='ctx'> 	QLINK_CMD_MGMT_SET_APPIE	= 0x0005,</div><div class='ctx'> 	QLINK_CMD_PHY_PARAMS_GET	= 0x0011,</div><div class='ctx'> 	QLINK_CMD_PHY_PARAMS_SET	= 0x0012,</div><div class='hunk'>@@ -321,22 +323,26 @@ struct qlink_cmd_mgmt_frame_register {</div><div class='ctx'> 	u8 do_register;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-enum qlink_mgmt_frame_tx_flags {</div><div class='del'>-	QLINK_MGMT_FRAME_TX_FLAG_NONE		= 0,</div><div class='del'>-	QLINK_MGMT_FRAME_TX_FLAG_OFFCHAN	= BIT(0),</div><div class='del'>-	QLINK_MGMT_FRAME_TX_FLAG_NO_CCK		= BIT(1),</div><div class='del'>-	QLINK_MGMT_FRAME_TX_FLAG_ACK_NOWAIT	= BIT(2),</div><div class='add'>+/**</div><div class='add'>+ * @QLINK_FRAME_TX_FLAG_8023: frame has a 802.3 header; if not set, frame</div><div class='add'>+ *	is a 802.11 encapsulated.</div><div class='add'>+ */</div><div class='add'>+enum qlink_frame_tx_flags {</div><div class='add'>+	QLINK_FRAME_TX_FLAG_OFFCHAN	= BIT(0),</div><div class='add'>+	QLINK_FRAME_TX_FLAG_NO_CCK	= BIT(1),</div><div class='add'>+	QLINK_FRAME_TX_FLAG_ACK_NOWAIT	= BIT(2),</div><div class='add'>+	QLINK_FRAME_TX_FLAG_8023	= BIT(3),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct qlink_cmd_mgmt_frame_tx - data for QLINK_CMD_SEND_MGMT_FRAME command</div><div class='add'>+ * struct qlink_cmd_frame_tx - data for QLINK_CMD_SEND_FRAME command</div><div class='ctx'>  *</div><div class='ctx'>  * @cookie: opaque request identifier.</div><div class='ctx'>  * @freq: Frequency to use for frame transmission.</div><div class='del'>- * @flags: Transmission flags, one of &amp;enum qlink_mgmt_frame_tx_flags.</div><div class='add'>+ * @flags: Transmission flags, one of &amp;enum qlink_frame_tx_flags.</div><div class='ctx'>  * @frame_data: frame to transmit.</div><div class='ctx'>  */</div><div class='del'>-struct qlink_cmd_mgmt_frame_tx {</div><div class='add'>+struct qlink_cmd_frame_tx {</div><div class='ctx'> 	struct qlink_cmd chdr;</div><div class='ctx'> 	__le32 cookie;</div><div class='ctx'> 	__le16 freq;</div><div class='hunk'>@@ -580,12 +586,22 @@ enum qlink_user_reg_hint_type {</div><div class='ctx'>  * @initiator: which entity sent the request, one of &amp;enum qlink_reg_initiator.</div><div class='ctx'>  * @user_reg_hint_type: type of hint for QLINK_REGDOM_SET_BY_USER request, one</div><div class='ctx'>  *	of &amp;enum qlink_user_reg_hint_type.</div><div class='add'>+ * @num_channels: number of &amp;struct qlink_tlv_channel in a variable portion of a</div><div class='add'>+ *	payload.</div><div class='add'>+ * @slave_radar: whether slave device should enable radar detection.</div><div class='add'>+ * @dfs_region: one of &amp;enum qlink_dfs_regions.</div><div class='add'>+ * @info: variable portion of regulatory notifier callback.</div><div class='ctx'>  */</div><div class='ctx'> struct qlink_cmd_reg_notify {</div><div class='ctx'> 	struct qlink_cmd chdr;</div><div class='ctx'> 	u8 alpha2[2];</div><div class='ctx'> 	u8 initiator;</div><div class='ctx'> 	u8 user_reg_hint_type;</div><div class='add'>+	u8 num_channels;</div><div class='add'>+	u8 dfs_region;</div><div class='add'>+	u8 slave_radar;</div><div class='add'>+	u8 rsvd[1];</div><div class='add'>+	u8 info[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -765,6 +781,18 @@ struct qlink_resp {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum qlink_dfs_regions - regulatory DFS regions</div><div class='add'>+ *</div><div class='add'>+ * Corresponds to &amp;enum nl80211_dfs_regions.</div><div class='add'>+ */</div><div class='add'>+enum qlink_dfs_regions {</div><div class='add'>+	QLINK_DFS_UNSET	= 0,</div><div class='add'>+	QLINK_DFS_FCC	= 1,</div><div class='add'>+	QLINK_DFS_ETSI	= 2,</div><div class='add'>+	QLINK_DFS_JP	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct qlink_resp_get_mac_info - response for QLINK_CMD_MAC_INFO command</div><div class='ctx'>  *</div><div class='ctx'>  * Data describing specific physical device providing wireless MAC</div><div class='hunk'>@@ -779,6 +807,10 @@ struct qlink_resp {</div><div class='ctx'>  * @bands_cap: wireless bands WMAC can operate in, bitmap of &amp;enum qlink_band.</div><div class='ctx'>  * @max_ap_assoc_sta: Maximum number of associations supported by WMAC.</div><div class='ctx'>  * @radar_detect_widths: bitmask of channels BW for which WMAC can detect radar.</div><div class='add'>+ * @alpha2: country code ID firmware is configured to.</div><div class='add'>+ * @n_reg_rules: number of regulatory rules TLVs in variable portion of the</div><div class='add'>+ *	message.</div><div class='add'>+ * @dfs_region: regulatory DFS region, one of &amp;enum qlink_dfs_regions.</div><div class='ctx'>  * @var_info: variable-length WMAC info data.</div><div class='ctx'>  */</div><div class='ctx'> struct qlink_resp_get_mac_info {</div><div class='hunk'>@@ -792,23 +824,14 @@ struct qlink_resp_get_mac_info {</div><div class='ctx'> 	__le16 radar_detect_widths;</div><div class='ctx'> 	__le32 max_acl_mac_addrs;</div><div class='ctx'> 	u8 bands_cap;</div><div class='add'>+	u8 alpha2[2];</div><div class='add'>+	u8 n_reg_rules;</div><div class='add'>+	u8 dfs_region;</div><div class='ctx'> 	u8 rsvd[1];</div><div class='ctx'> 	u8 var_info[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum qlink_dfs_regions - regulatory DFS regions</div><div class='del'>- *</div><div class='del'>- * Corresponds to &amp;enum nl80211_dfs_regions.</div><div class='del'>- */</div><div class='del'>-enum qlink_dfs_regions {</div><div class='del'>-	QLINK_DFS_UNSET	= 0,</div><div class='del'>-	QLINK_DFS_FCC	= 1,</div><div class='del'>-	QLINK_DFS_ETSI	= 2,</div><div class='del'>-	QLINK_DFS_JP	= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct qlink_resp_get_hw_info - response for QLINK_CMD_GET_HW_INFO command</div><div class='ctx'>  *</div><div class='ctx'>  * Description of wireless hardware capabilities and features.</div><div class='hunk'>@@ -820,11 +843,7 @@ enum qlink_dfs_regions {</div><div class='ctx'>  * @mac_bitmap: Bitmap of MAC IDs that are active and can be used in firmware.</div><div class='ctx'>  * @total_tx_chains: total number of transmit chains used by device.</div><div class='ctx'>  * @total_rx_chains: total number of receive chains.</div><div class='del'>- * @alpha2: country code ID firmware is configured to.</div><div class='del'>- * @n_reg_rules: number of regulatory rules TLVs in variable portion of the</div><div class='del'>- *	message.</div><div class='del'>- * @dfs_region: regulatory DFS region, one of @enum qlink_dfs_region.</div><div class='del'>- * @info: variable-length HW info, can contain QTN_TLV_ID_REG_RULE.</div><div class='add'>+ * @info: variable-length HW info.</div><div class='ctx'>  */</div><div class='ctx'> struct qlink_resp_get_hw_info {</div><div class='ctx'> 	struct qlink_resp rhdr;</div><div class='hunk'>@@ -838,9 +857,6 @@ struct qlink_resp_get_hw_info {</div><div class='ctx'> 	u8 mac_bitmap;</div><div class='ctx'> 	u8 total_tx_chain;</div><div class='ctx'> 	u8 total_rx_chain;</div><div class='del'>-	u8 alpha2[2];</div><div class='del'>-	u8 n_reg_rules;</div><div class='del'>-	u8 dfs_region;</div><div class='ctx'> 	u8 info[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1148,6 +1164,13 @@ struct qlink_event_external_auth {</div><div class='ctx'>  *	carried by QTN_TLV_ID_STA_STATS_MAP.</div><div class='ctx'>  * @QTN_TLV_ID_MAX_SCAN_SSIDS: maximum number of SSIDs the device can scan</div><div class='ctx'>  *	for in any given scan.</div><div class='add'>+ * @QTN_TLV_ID_SCAN_DWELL_ACTIVE: time spent on a single channel for an active</div><div class='add'>+ *	scan.</div><div class='add'>+ * @QTN_TLV_ID_SCAN_DWELL_PASSIVE: time spent on a single channel for a passive</div><div class='add'>+ *	scan.</div><div class='add'>+ * @QTN_TLV_ID_SCAN_SAMPLE_DURATION: total duration of sampling a single channel</div><div class='add'>+ *	during a scan including off-channel dwell time and operating channel</div><div class='add'>+ *	time.</div><div class='ctx'>  */</div><div class='ctx'> enum qlink_tlv_id {</div><div class='ctx'> 	QTN_TLV_ID_FRAG_THRESH		= 0x0201,</div><div class='hunk'>@@ -1180,7 +1203,9 @@ enum qlink_tlv_id {</div><div class='ctx'> 	QTN_TLV_ID_WOWLAN_CAPAB		= 0x0410,</div><div class='ctx'> 	QTN_TLV_ID_WOWLAN_PATTERN	= 0x0411,</div><div class='ctx'> 	QTN_TLV_ID_SCAN_FLUSH		= 0x0412,</div><div class='del'>-	QTN_TLV_ID_SCAN_DWELL		= 0x0413,</div><div class='add'>+	QTN_TLV_ID_SCAN_DWELL_ACTIVE	= 0x0413,</div><div class='add'>+	QTN_TLV_ID_SCAN_DWELL_PASSIVE	= 0x0416,</div><div class='add'>+	QTN_TLV_ID_SCAN_SAMPLE_DURATION	= 0x0417,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qlink_tlv_hdr {</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c<br/>index 72bfd17cb687..1a972bce7b8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.c</a></div><div class='hunk'>@@ -182,3 +182,120 @@ void qlink_acl_data_cfg2q(const struct cfg80211_acl_data *acl,</div><div class='ctx'> 	memcpy(qacl-&gt;mac_addrs, acl-&gt;mac_addrs,</div><div class='ctx'> 	       acl-&gt;n_acl_entries * sizeof(*qacl-&gt;mac_addrs));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+enum qlink_band qlink_utils_band_cfg2q(enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		return QLINK_BAND_2GHZ;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		return QLINK_BAND_5GHZ;</div><div class='add'>+	case NL80211_BAND_60GHZ:</div><div class='add'>+		return QLINK_BAND_60GHZ;</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'>+enum qlink_dfs_state qlink_utils_dfs_state_cfg2q(enum nl80211_dfs_state state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case NL80211_DFS_USABLE:</div><div class='add'>+		return QLINK_DFS_USABLE;</div><div class='add'>+	case NL80211_DFS_AVAILABLE:</div><div class='add'>+		return QLINK_DFS_AVAILABLE;</div><div class='add'>+	case NL80211_DFS_UNAVAILABLE:</div><div class='add'>+	default:</div><div class='add'>+		return QLINK_DFS_UNAVAILABLE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 qlink_utils_chflags_cfg2q(u32 cfgflags)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+		flags |= QLINK_CHAN_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_NO_IR)</div><div class='add'>+		flags |= QLINK_CHAN_NO_IR;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_RADAR)</div><div class='add'>+		flags |= QLINK_CHAN_RADAR;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_NO_HT40PLUS)</div><div class='add'>+		flags |= QLINK_CHAN_NO_HT40PLUS;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_NO_HT40MINUS)</div><div class='add'>+		flags |= QLINK_CHAN_NO_HT40MINUS;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_NO_80MHZ)</div><div class='add'>+		flags |= QLINK_CHAN_NO_80MHZ;</div><div class='add'>+</div><div class='add'>+	if (cfgflags &amp; IEEE80211_CHAN_NO_160MHZ)</div><div class='add'>+		flags |= QLINK_CHAN_NO_160MHZ;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 qtnf_reg_rule_flags_parse(u32 qflags)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_OFDM)</div><div class='add'>+		flags |= NL80211_RRF_NO_OFDM;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_CCK)</div><div class='add'>+		flags |= NL80211_RRF_NO_CCK;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_INDOOR)</div><div class='add'>+		flags |= NL80211_RRF_NO_INDOOR;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_OUTDOOR)</div><div class='add'>+		flags |= NL80211_RRF_NO_OUTDOOR;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_DFS)</div><div class='add'>+		flags |= NL80211_RRF_DFS;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_PTP_ONLY)</div><div class='add'>+		flags |= NL80211_RRF_PTP_ONLY;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_PTMP_ONLY)</div><div class='add'>+		flags |= NL80211_RRF_PTMP_ONLY;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_IR)</div><div class='add'>+		flags |= NL80211_RRF_NO_IR;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_AUTO_BW)</div><div class='add'>+		flags |= NL80211_RRF_AUTO_BW;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_IR_CONCURRENT)</div><div class='add'>+		flags |= NL80211_RRF_IR_CONCURRENT;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_HT40MINUS)</div><div class='add'>+		flags |= NL80211_RRF_NO_HT40MINUS;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_HT40PLUS)</div><div class='add'>+		flags |= NL80211_RRF_NO_HT40PLUS;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_80MHZ)</div><div class='add'>+		flags |= NL80211_RRF_NO_80MHZ;</div><div class='add'>+</div><div class='add'>+	if (qflags &amp; QLINK_RRF_NO_160MHZ)</div><div class='add'>+		flags |= NL80211_RRF_NO_160MHZ;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qlink_utils_regrule_q2nl(struct ieee80211_reg_rule *rule,</div><div class='add'>+			      const struct qlink_tlv_reg_rule *tlv)</div><div class='add'>+{</div><div class='add'>+	rule-&gt;freq_range.start_freq_khz = le32_to_cpu(tlv-&gt;start_freq_khz);</div><div class='add'>+	rule-&gt;freq_range.end_freq_khz = le32_to_cpu(tlv-&gt;end_freq_khz);</div><div class='add'>+	rule-&gt;freq_range.max_bandwidth_khz =</div><div class='add'>+		le32_to_cpu(tlv-&gt;max_bandwidth_khz);</div><div class='add'>+	rule-&gt;power_rule.max_antenna_gain = le32_to_cpu(tlv-&gt;max_antenna_gain);</div><div class='add'>+	rule-&gt;power_rule.max_eirp = le32_to_cpu(tlv-&gt;max_eirp);</div><div class='add'>+	rule-&gt;dfs_cac_ms = le32_to_cpu(tlv-&gt;dfs_cac_ms);</div><div class='add'>+	rule-&gt;flags = qtnf_reg_rule_flags_parse(le32_to_cpu(tlv-&gt;flags));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h<br/>index 781ea7fe79f2..f873beed2ae7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.h</a></div><div class='hunk'>@@ -79,5 +79,10 @@ bool qtnf_utils_is_bit_set(const u8 *arr, unsigned int bit,</div><div class='ctx'> 			   unsigned int arr_max_len);</div><div class='ctx'> void qlink_acl_data_cfg2q(const struct cfg80211_acl_data *acl,</div><div class='ctx'> 			  struct qlink_acl_data *qacl);</div><div class='add'>+enum qlink_band qlink_utils_band_cfg2q(enum nl80211_band band);</div><div class='add'>+enum qlink_dfs_state qlink_utils_dfs_state_cfg2q(enum nl80211_dfs_state state);</div><div class='add'>+u32 qlink_utils_chflags_cfg2q(u32 cfgflags);</div><div class='add'>+void qlink_utils_regrule_q2nl(struct ieee80211_reg_rule *rule,</div><div class='add'>+			      const struct qlink_tlv_reg_rule *tlv_rule);</div><div class='ctx'> </div><div class='ctx'> #endif /* _QTN_FMAC_QLINK_UTIL_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h<br/>index b05ed2f3025a..06c38bafd2ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800.h</a></div><div class='hunk'>@@ -48,7 +48,8 @@</div><div class='ctx'>  * RF2853 2.4G/5G 3T3R</div><div class='ctx'>  * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390)</div><div class='ctx'>  * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)</div><div class='del'>- * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)</div><div class='add'>+ * RF3053 2.4G/5G 3T3R(RT3563/RT3573/RT3593)</div><div class='add'>+ * RF3853 2.4G/5G 3T3R(RT3883/RT3662)</div><div class='ctx'>  * RF5592 2.4G/5G 2T2R</div><div class='ctx'>  * RF3070 2.4G 1T1R</div><div class='ctx'>  * RF5360 2.4G 1T1R</div><div class='hunk'>@@ -72,6 +73,7 @@</div><div class='ctx'> #define RF5592				0x000f</div><div class='ctx'> #define RF3070				0x3070</div><div class='ctx'> #define RF3290				0x3290</div><div class='add'>+#define RF3853				0x3853</div><div class='ctx'> #define RF5350				0x5350</div><div class='ctx'> #define RF5360				0x5360</div><div class='ctx'> #define RF5362				0x5362</div><div class='hunk'>@@ -1726,6 +1728,20 @@</div><div class='ctx'> #define TX_PWR_CFG_9B_STBC_MCS7		FIELD32(0x000000ff)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * TX_TXBF_CFG:</div><div class='add'>+ */</div><div class='add'>+#define TX_TXBF_CFG_0			0x138c</div><div class='add'>+#define TX_TXBF_CFG_1			0x13a4</div><div class='add'>+#define TX_TXBF_CFG_2			0x13a8</div><div class='add'>+#define TX_TXBF_CFG_3			0x13ac</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TX_FBK_CFG_3S:</div><div class='add'>+ */</div><div class='add'>+#define TX_FBK_CFG_3S_0			0x13c4</div><div class='add'>+#define TX_FBK_CFG_3S_1			0x13c8</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * RX_FILTER_CFG: RX configuration register.</div><div class='ctx'>  */</div><div class='ctx'> #define RX_FILTER_CFG			0x1400</div><div class='hunk'>@@ -2296,6 +2312,7 @@ struct mac_iveiv_entry {</div><div class='ctx'> /*</div><div class='ctx'>  * RFCSR 2:</div><div class='ctx'>  */</div><div class='add'>+#define RFCSR2_RESCAL_BP		FIELD8(0x40)</div><div class='ctx'> #define RFCSR2_RESCAL_EN		FIELD8(0x80)</div><div class='ctx'> #define RFCSR2_RX2_EN_MT7620		FIELD8(0x02)</div><div class='ctx'> #define RFCSR2_TX2_EN_MT7620		FIELD8(0x20)</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c<br/>index a03b5284a050..c8f2bf1243fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800lib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800lib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800lib.c</a></div><div class='hunk'>@@ -381,7 +381,8 @@ static unsigned int rt2800_eeprom_word_index(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		      wiphy_name(rt2x00dev-&gt;hw-&gt;wiphy), word))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 		map = rt2800_eeprom_map_ext;</div><div class='ctx'> 	else</div><div class='ctx'> 		map = rt2800_eeprom_map;</div><div class='hunk'>@@ -590,6 +591,7 @@ void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> {</div><div class='ctx'> 	switch (rt2x00dev-&gt;chip.rt) {</div><div class='ctx'> 	case RT3593:</div><div class='add'>+	case RT3883:</div><div class='ctx'> 		*txwi_size = TXWI_DESC_SIZE_4WORDS;</div><div class='ctx'> 		*rxwi_size = RXWI_DESC_SIZE_5WORDS;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1100,7 +1102,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800_txdone_entry);</div><div class='ctx'> </div><div class='del'>-void rt2800_txdone(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+void rt2800_txdone(struct rt2x00_dev *rt2x00dev, unsigned int quota)</div><div class='ctx'> {</div><div class='ctx'> 	struct data_queue *queue;</div><div class='ctx'> 	struct queue_entry *entry;</div><div class='hunk'>@@ -1108,7 +1110,7 @@ void rt2800_txdone(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	u8 qid;</div><div class='ctx'> 	bool match;</div><div class='ctx'> </div><div class='del'>-	while (kfifo_get(&amp;rt2x00dev-&gt;txstatus_fifo, &amp;reg)) {</div><div class='add'>+	while (quota-- &gt; 0 &amp;&amp; kfifo_get(&amp;rt2x00dev-&gt;txstatus_fifo, &amp;reg)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * TX_STA_FIFO_PID_QUEUE is a 2-bit field, thus qid is</div><div class='ctx'> 		 * guaranteed to be one of the TX QIDs .</div><div class='hunk'>@@ -1164,15 +1166,6 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	struct data_queue *queue;</div><div class='ctx'> 	struct queue_entry *entry;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(DEVICE_STATE_FLUSHING, &amp;rt2x00dev-&gt;flags)) {</div><div class='del'>-		unsigned long tout = msecs_to_jiffies(1000);</div><div class='del'>-</div><div class='del'>-		if (time_before(jiffies, rt2x00dev-&gt;last_nostatus_check + tout))</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rt2x00dev-&gt;last_nostatus_check = jiffies;</div><div class='del'>-</div><div class='ctx'> 	tx_queue_for_each(rt2x00dev, queue) {</div><div class='ctx'> 		entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);</div><div class='ctx'> 		if (rt2800_entry_txstatus_timeout(rt2x00dev, entry))</div><div class='hunk'>@@ -1183,6 +1176,23 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * test if there is an entry in any TX queue for which DMA is done</div><div class='add'>+ * but the TX status has not been returned yet</div><div class='add'>+ */</div><div class='add'>+bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+{</div><div class='add'>+	struct data_queue *queue;</div><div class='add'>+</div><div class='add'>+	tx_queue_for_each(rt2x00dev, queue) {</div><div class='add'>+		if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=</div><div class='add'>+		    rt2x00queue_get_entry(queue, Q_INDEX_DONE))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(rt2800_txstatus_pending);</div><div class='add'>+</div><div class='ctx'> void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct data_queue *queue;</div><div class='hunk'>@@ -2172,7 +2182,8 @@ void rt2800_config_ant(struct rt2x00_dev *rt2x00dev, struct antenna_setup *ant)</div><div class='ctx'> 	rt2800_bbp_write(rt2x00dev, 3, r3);</div><div class='ctx'> 	rt2800_bbp_write(rt2x00dev, 1, r1);</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 		if (ant-&gt;rx_chain_num == 1)</div><div class='ctx'> 			rt2800_bbp_write(rt2x00dev, 86, 0x00);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2194,7 +2205,8 @@ static void rt2800_config_lna_gain(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_LNA);</div><div class='ctx'> 		lna_gain = rt2x00_get_field16(eeprom, EEPROM_LNA_A0);</div><div class='ctx'> 	} else if (libconf-&gt;rf.channel &lt;= 128) {</div><div class='del'>-		if (rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+		if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+		    rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 			eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);</div><div class='ctx'> 			lna_gain = rt2x00_get_field16(eeprom,</div><div class='ctx'> 						      EEPROM_EXT_LNA2_A1);</div><div class='hunk'>@@ -2204,7 +2216,8 @@ static void rt2800_config_lna_gain(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 						      EEPROM_RSSI_BG2_LNA_A1);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+		if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+		    rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 			eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);</div><div class='ctx'> 			lna_gain = rt2x00_get_field16(eeprom,</div><div class='ctx'> 						      EEPROM_EXT_LNA2_A2);</div><div class='hunk'>@@ -2872,6 +2885,211 @@ static void rt2800_config_channel_rf3053(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rt2800_config_channel_rf3853(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+					 struct ieee80211_conf *conf,</div><div class='add'>+					 struct rf_channel *rf,</div><div class='add'>+					 struct channel_info *info)</div><div class='add'>+{</div><div class='add'>+	u8 rfcsr;</div><div class='add'>+	u8 bbp;</div><div class='add'>+	u8 pwr1, pwr2, pwr3;</div><div class='add'>+</div><div class='add'>+	const bool txbf_enabled = false; /* TODO */</div><div class='add'>+</div><div class='add'>+	/* TODO: add band selection */</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 6, 0x40);</div><div class='add'>+	else if (rf-&gt;channel &lt; 132)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 6, 0x80);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 6, 0x40);</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 8, rf-&gt;rf1);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 9, rf-&gt;rf3);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 11, 0x46);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 11, 0x48);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 12, 0x1a);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 12, 0x52);</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 13, 0x12);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_RX0_PD, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_TX0_PD, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_RX1_PD, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_TX1_PD, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_RX2_PD, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_TX2_PD, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_RF_BLOCK_EN, 1);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_PLL_PD, 1);</div><div class='add'>+</div><div class='add'>+	switch (rt2x00dev-&gt;default_ant.tx_chain_num) {</div><div class='add'>+	case 3:</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR1_TX2_PD, 1);</div><div class='add'>+		/* fallthrough */</div><div class='add'>+	case 2:</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR1_TX1_PD, 1);</div><div class='add'>+		/* fallthrough */</div><div class='add'>+	case 1:</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR1_TX0_PD, 1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (rt2x00dev-&gt;default_ant.rx_chain_num) {</div><div class='add'>+	case 3:</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR1_RX2_PD, 1);</div><div class='add'>+		/* fallthrough */</div><div class='add'>+	case 2:</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR1_RX1_PD, 1);</div><div class='add'>+		/* fallthrough */</div><div class='add'>+	case 1:</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR1_RX0_PD, 1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);</div><div class='add'>+</div><div class='add'>+	rt2800_freq_cal_mode1(rt2x00dev);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 30);</div><div class='add'>+	if (!conf_is_ht40(conf))</div><div class='add'>+		rfcsr &amp;= ~(0x06);</div><div class='add'>+	else</div><div class='add'>+		rfcsr |= 0x06;</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 31, 0xa0);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 31, 0x80);</div><div class='add'>+</div><div class='add'>+	if (conf_is_ht40(conf))</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 32, 0x80);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 32, 0xd8);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 34, 0x3c);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 34, 0x20);</div><div class='add'>+</div><div class='add'>+	/* loopback RF_BS */</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 36);</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR36_RF_BS, 1);</div><div class='add'>+	else</div><div class='add'>+		rt2x00_set_field8(&amp;rfcsr, RFCSR36_RF_BS, 0);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 36, rfcsr);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rfcsr = 0x23;</div><div class='add'>+	else if (rf-&gt;channel &lt; 100)</div><div class='add'>+		rfcsr = 0x36;</div><div class='add'>+	else if (rf-&gt;channel &lt; 132)</div><div class='add'>+		rfcsr = 0x32;</div><div class='add'>+	else</div><div class='add'>+		rfcsr = 0x30;</div><div class='add'>+</div><div class='add'>+	if (txbf_enabled)</div><div class='add'>+		rfcsr |= 0x40;</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 44, 0x93);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 44, 0x9b);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rfcsr = 0xbb;</div><div class='add'>+	else if (rf-&gt;channel &lt; 100)</div><div class='add'>+		rfcsr = 0xeb;</div><div class='add'>+	else if (rf-&gt;channel &lt; 132)</div><div class='add'>+		rfcsr = 0xb3;</div><div class='add'>+	else</div><div class='add'>+		rfcsr = 0x9b;</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 45, rfcsr);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rfcsr = 0x8e;</div><div class='add'>+	else</div><div class='add'>+		rfcsr = 0x8a;</div><div class='add'>+</div><div class='add'>+	if (txbf_enabled)</div><div class='add'>+		rfcsr |= 0x20;</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 50, 0x86);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 51);</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 51, 0x75);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 51, 0x51);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 52);</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 52, 0x45);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 52, 0x05);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14) {</div><div class='add'>+		pwr1 = info-&gt;default_power1 &amp; 0x1f;</div><div class='add'>+		pwr2 = info-&gt;default_power2 &amp; 0x1f;</div><div class='add'>+		pwr3 = info-&gt;default_power3 &amp; 0x1f;</div><div class='add'>+	} else {</div><div class='add'>+		pwr1 = 0x48 | ((info-&gt;default_power1 &amp; 0x18) &lt;&lt; 1) |</div><div class='add'>+			(info-&gt;default_power1 &amp; 0x7);</div><div class='add'>+		pwr2 = 0x48 | ((info-&gt;default_power2 &amp; 0x18) &lt;&lt; 1) |</div><div class='add'>+			(info-&gt;default_power2 &amp; 0x7);</div><div class='add'>+		pwr3 = 0x48 | ((info-&gt;default_power3 &amp; 0x18) &lt;&lt; 1) |</div><div class='add'>+			(info-&gt;default_power3 &amp; 0x7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 53, pwr1);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 54, pwr2);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 55, pwr3);</div><div class='add'>+</div><div class='add'>+	rt2x00_dbg(rt2x00dev, "Channel:%d, pwr1:%02x, pwr2:%02x, pwr3:%02x\n",</div><div class='add'>+		   rf-&gt;channel, pwr1, pwr2, pwr3);</div><div class='add'>+</div><div class='add'>+	bbp = (info-&gt;default_power1 &gt;&gt; 5) |</div><div class='add'>+	      ((info-&gt;default_power2 &amp; 0xe0) &gt;&gt; 1);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 109, bbp);</div><div class='add'>+</div><div class='add'>+	bbp = rt2800_bbp_read(rt2x00dev, 110);</div><div class='add'>+	bbp &amp;= 0x0f;</div><div class='add'>+	bbp |= (info-&gt;default_power3 &amp; 0xe0) &gt;&gt; 1;</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 110, bbp);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 57);</div><div class='add'>+	if (rf-&gt;channel &lt;= 14)</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 57, 0x6e);</div><div class='add'>+	else</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 57, 0x3e);</div><div class='add'>+</div><div class='add'>+	/* Enable RF tuning */</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 3);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR3_VCOCAL_EN, 1);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);</div><div class='add'>+</div><div class='add'>+	udelay(2000);</div><div class='add'>+</div><div class='add'>+	bbp = rt2800_bbp_read(rt2x00dev, 49);</div><div class='add'>+	/* clear update flag */</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 49, bbp &amp; 0xfe);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 49, bbp);</div><div class='add'>+</div><div class='add'>+	/* TODO: add calibration for TxBF */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define POWER_BOUND		0x27</div><div class='ctx'> #define POWER_BOUND_5G		0x2b</div><div class='ctx'> </div><div class='hunk'>@@ -3675,19 +3893,51 @@ static char rt2800_txpower_to_dev(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				  unsigned int channel,</div><div class='ctx'> 				  char txpower)</div><div class='ctx'> {</div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 		txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);</div><div class='ctx'> </div><div class='ctx'> 	if (channel &lt;= 14)</div><div class='ctx'> 		return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 		return clamp_t(char, txpower, MIN_A_TXPOWER_3593,</div><div class='ctx'> 			       MAX_A_TXPOWER_3593);</div><div class='ctx'> 	else</div><div class='ctx'> 		return clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rt3883_bbp_adjust(struct rt2x00_dev *rt2x00dev,</div><div class='add'>+			      struct rf_channel *rf)</div><div class='add'>+{</div><div class='add'>+	u8 bbp;</div><div class='add'>+</div><div class='add'>+	bbp = (rf-&gt;channel &gt; 14) ? 0x48 : 0x38;</div><div class='add'>+	rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, bbp);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 69, 0x12);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &lt;= 14) {</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 70, 0x0a);</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable CCK packet detection */</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 70, 0x00);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 73, 0x10);</div><div class='add'>+</div><div class='add'>+	if (rf-&gt;channel &gt; 14) {</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 62, 0x1d);</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 63, 0x1d);</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 64, 0x1d);</div><div class='add'>+	} else {</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 62, 0x2d);</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 63, 0x2d);</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 64, 0x2d);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				  struct ieee80211_conf *conf,</div><div class='ctx'> 				  struct rf_channel *rf,</div><div class='hunk'>@@ -3706,6 +3956,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			rt2800_txpower_to_dev(rt2x00dev, rf-&gt;channel,</div><div class='ctx'> 					      info-&gt;default_power3);</div><div class='ctx'> </div><div class='add'>+	switch (rt2x00dev-&gt;chip.rt) {</div><div class='add'>+	case RT3883:</div><div class='add'>+		rt3883_bbp_adjust(rt2x00dev, rf);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (rt2x00dev-&gt;chip.rf) {</div><div class='ctx'> 	case RF2020:</div><div class='ctx'> 	case RF3020:</div><div class='hunk'>@@ -3726,6 +3982,9 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	case RF3322:</div><div class='ctx'> 		rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);</div><div class='ctx'> 		break;</div><div class='add'>+	case RF3853:</div><div class='add'>+		rt2800_config_channel_rf3853(rt2x00dev, conf, rf, info);</div><div class='add'>+		break;</div><div class='ctx'> 	case RF3070:</div><div class='ctx'> 	case RF5350:</div><div class='ctx'> 	case RF5360:</div><div class='hunk'>@@ -3807,6 +4066,15 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='ctx'> 		rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='ctx'> 		rt2800_bbp_write(rt2x00dev, 77, 0x98);</div><div class='add'>+	} else if (rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='add'>+		rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='add'>+</div><div class='add'>+		if (rt2x00dev-&gt;default_ant.rx_chain_num &gt; 1)</div><div class='add'>+			rt2800_bbp_write(rt2x00dev, 86, 0x46);</div><div class='add'>+		else</div><div class='add'>+			rt2800_bbp_write(rt2x00dev, 86, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='ctx'> 		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev-&gt;lna_gain);</div><div class='hunk'>@@ -3820,6 +4088,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		    !rt2x00_rt(rt2x00dev, RT6352)) {</div><div class='ctx'> 			if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {</div><div class='ctx'> 				rt2800_bbp_write(rt2x00dev, 82, 0x62);</div><div class='add'>+				rt2800_bbp_write(rt2x00dev, 82, 0x62);</div><div class='ctx'> 				rt2800_bbp_write(rt2x00dev, 75, 0x46);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='hunk'>@@ -3828,19 +4097,22 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 					rt2800_bbp_write(rt2x00dev, 82, 0x84);</div><div class='ctx'> 				rt2800_bbp_write(rt2x00dev, 75, 0x50);</div><div class='ctx'> 			}</div><div class='del'>-			if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+			if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+			    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 				rt2800_bbp_write(rt2x00dev, 83, 0x8a);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (rt2x00_rt(rt2x00dev, RT3572))</div><div class='ctx'> 			rt2800_bbp_write(rt2x00dev, 82, 0x94);</div><div class='del'>-		else if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+		else if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+			 rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 			rt2800_bbp_write(rt2x00dev, 82, 0x82);</div><div class='ctx'> 		else if (!rt2x00_rt(rt2x00dev, RT6352))</div><div class='ctx'> 			rt2800_bbp_write(rt2x00dev, 82, 0xf2);</div><div class='ctx'> </div><div class='del'>-		if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+		if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+		    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 			rt2800_bbp_write(rt2x00dev, 83, 0x9a);</div><div class='ctx'> </div><div class='ctx'> 		if (rt2x00_has_cap_external_lna_a(rt2x00dev))</div><div class='hunk'>@@ -3976,6 +4248,23 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		usleep_range(1000, 1500);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='add'>+		if (!conf_is_ht40(conf))</div><div class='add'>+			rt2800_bbp_write(rt2x00dev, 105, 0x34);</div><div class='add'>+		else</div><div class='add'>+			rt2800_bbp_write(rt2x00dev, 105, 0x04);</div><div class='add'>+</div><div class='add'>+		/* AGC init */</div><div class='add'>+		if (rf-&gt;channel &lt;= 14)</div><div class='add'>+			reg = 0x2e + rt2x00dev-&gt;lna_gain;</div><div class='add'>+		else</div><div class='add'>+			reg = 0x20 + ((rt2x00dev-&gt;lna_gain * 5) / 3);</div><div class='add'>+</div><div class='add'>+		rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);</div><div class='add'>+</div><div class='add'>+		usleep_range(1000, 1500);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (rt2x00_rt(rt2x00dev, RT5592) || rt2x00_rt(rt2x00dev, RT6352)) {</div><div class='ctx'> 		reg = 0x10;</div><div class='ctx'> 		if (!conf_is_ht40(conf)) {</div><div class='hunk'>@@ -4235,6 +4524,9 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b,</div><div class='ctx'> 	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='ctx'> 		return min_t(u8, txpower, 0xc);</div><div class='ctx'> </div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3883))</div><div class='add'>+		return min_t(u8, txpower, 0xf);</div><div class='add'>+</div><div class='ctx'> 	if (rt2x00_has_cap_power_limit(rt2x00dev)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check if eirp txpower exceed txpower_limit.</div><div class='hunk'>@@ -4996,7 +5288,8 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				  struct ieee80211_channel *chan,</div><div class='ctx'> 				  int power_level)</div><div class='ctx'> {</div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 		rt2800_config_txpower_rt3593(rt2x00dev, chan, power_level);</div><div class='ctx'> 	else if (rt2x00_rt(rt2x00dev, RT6352))</div><div class='ctx'> 		rt2800_config_txpower_rt6352(rt2x00dev, chan, power_level);</div><div class='hunk'>@@ -5043,6 +5336,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	case RF3053:</div><div class='ctx'> 	case RF3070:</div><div class='ctx'> 	case RF3290:</div><div class='add'>+	case RF3853:</div><div class='ctx'> 	case RF5350:</div><div class='ctx'> 	case RF5360:</div><div class='ctx'> 	case RF5362:</div><div class='hunk'>@@ -5243,7 +5537,8 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		else</div><div class='ctx'> 			vgc = 0x2e + rt2x00dev-&gt;lna_gain;</div><div class='ctx'> 	} else { /* 5GHZ band */</div><div class='del'>-		if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+		if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+		    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 			vgc = 0x20 + (rt2x00dev-&gt;lna_gain * 5) / 3;</div><div class='ctx'> 		else if (rt2x00_rt(rt2x00dev, RT5592))</div><div class='ctx'> 			vgc = 0x24 + (2 * rt2x00dev-&gt;lna_gain);</div><div class='hunk'>@@ -5263,7 +5558,8 @@ static inline void rt2800_set_vgc(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> {</div><div class='ctx'> 	if (qual-&gt;vgc_level != vgc_level) {</div><div class='ctx'> 		if (rt2x00_rt(rt2x00dev, RT3572) ||</div><div class='del'>-		    rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+		    rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+		    rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 			rt2800_bbp_write_with_rx_chain(rt2x00dev, 66,</div><div class='ctx'> 						       vgc_level);</div><div class='ctx'> 		} else if (rt2x00_rt(rt2x00dev, RT5592)) {</div><div class='hunk'>@@ -5310,6 +5606,11 @@ void rt2800_link_tuner(struct rt2x00_dev *rt2x00dev, struct link_qual *qual,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case RT3883:</div><div class='add'>+		if (qual-&gt;rssi &gt; -65)</div><div class='add'>+			vgc += 0x10;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case RT5592:</div><div class='ctx'> 		if (qual-&gt;rssi &gt; -65)</div><div class='ctx'> 			vgc += 0x20;</div><div class='hunk'>@@ -5462,6 +5763,12 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 			rt2800_register_write(rt2x00dev, TX_SW_CFG2,</div><div class='ctx'> 					      0x00000000);</div><div class='ctx'> 		}</div><div class='add'>+	} else if (rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000402);</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00040000);</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);</div><div class='ctx'> 	} else if (rt2x00_rt(rt2x00dev, RT5390) ||</div><div class='ctx'> 		   rt2x00_rt(rt2x00dev, RT5392) ||</div><div class='ctx'> 		   rt2x00_rt(rt2x00dev, RT6352)) {</div><div class='hunk'>@@ -5675,6 +5982,11 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;</div><div class='ctx'> 	rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);</div><div class='ctx'> </div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_0, 0x12111008);</div><div class='add'>+		rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reg = rt2800_register_read(rt2x00dev, TX_RTS_CFG);</div><div class='ctx'> 	rt2x00_set_field32(&amp;reg, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 7);</div><div class='ctx'> 	rt2x00_set_field32(&amp;reg, TX_RTS_CFG_RTS_THRES,</div><div class='hunk'>@@ -6291,6 +6603,47 @@ static void rt2800_init_bbp_3593(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		rt2800_bbp_write(rt2x00dev, 103, 0xc0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rt2800_init_bbp_3883(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+{</div><div class='add'>+	rt2800_init_bbp_early(rt2x00dev);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 4, 0x50);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 47, 0x48);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 86, 0x46);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 88, 0x90);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 92, 0x02);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 103, 0xc0);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 104, 0x92);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 105, 0x34);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 106, 0x12);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 120, 0x50);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 137, 0x0f);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 163, 0x9d);</div><div class='add'>+</div><div class='add'>+	/* Set ITxBF timeout to 0x9C40=1000msec */</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 179, 0x02);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 180, 0x00);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 182, 0x40);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 180, 0x01);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 182, 0x9c);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 179, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Reprogram the inband interface to put right values in RXWI */</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x04);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0x3b);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x06);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0xa0);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x07);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0xa1);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x08);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0xa2);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 148, 0xc8);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ant, div_mode;</div><div class='hunk'>@@ -6735,6 +7088,9 @@ static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	case RT3593:</div><div class='ctx'> 		rt2800_init_bbp_3593(rt2x00dev);</div><div class='ctx'> 		return;</div><div class='add'>+	case RT3883:</div><div class='add'>+		rt2800_init_bbp_3883(rt2x00dev);</div><div class='add'>+		return;</div><div class='ctx'> 	case RT5390:</div><div class='ctx'> 	case RT5392:</div><div class='ctx'> 		rt2800_init_bbp_53xx(rt2x00dev);</div><div class='hunk'>@@ -7606,6 +7962,144 @@ static void rt2800_init_rfcsr_5350(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2800_rfcsr_write(rt2x00dev, 63, 0x00);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rt2800_init_rfcsr_3883(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+{</div><div class='add'>+	u8 rfcsr;</div><div class='add'>+</div><div class='add'>+	/* TODO: get the actual ECO value from the SoC */</div><div class='add'>+	const unsigned int eco = 5;</div><div class='add'>+</div><div class='add'>+	rt2800_rf_init_calibration(rt2x00dev, 2);</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 0, 0xe0);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 1, 0x03);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 2, 0x50);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 3, 0x20);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 4, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 5, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 6, 0x40);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 7, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 8, 0x5b);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 9, 0x08);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 10, 0xd3);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 11, 0x48);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 12, 0x1a);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 13, 0x12);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 14, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 15, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 16, 0x00);</div><div class='add'>+</div><div class='add'>+	/* RFCSR 17 will be initialized later based on the</div><div class='add'>+	 * frequency offset stored in the EEPROM</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 18, 0x40);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 19, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 20, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 21, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 22, 0x20);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 23, 0xc0);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 24, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 25, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 26, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 27, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 28, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 29, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 30, 0x10);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 31, 0x80);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 32, 0x80);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 33, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 34, 0x20);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 35, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 36, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 37, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 38, 0x86);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 39, 0x23);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 40, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 41, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 42, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 43, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 44, 0x93);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 45, 0xbb);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 46, 0x60);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 47, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 48, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 49, 0x8e);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 50, 0x86);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 51, 0x51);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 52, 0x05);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 53, 0x76);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 54, 0x76);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 55, 0x76);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 56, 0xdb);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 57, 0x3e);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 58, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 59, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 60, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 61, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 62, 0x00);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 63, 0x00);</div><div class='add'>+</div><div class='add'>+	/* TODO: rx filter calibration? */</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 137, 0x0f);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 163, 0x9d);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 105, 0x05);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 179, 0x02);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 180, 0x00);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 182, 0x40);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 180, 0x01);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 182, 0x9c);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 179, 0x00);</div><div class='add'>+</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x04);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0x3b);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x06);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0xa0);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x07);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0xa1);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 142, 0x08);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 143, 0xa2);</div><div class='add'>+	rt2800_bbp_write(rt2x00dev, 148, 0xc8);</div><div class='add'>+</div><div class='add'>+	if (eco == 5) {</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 32, 0xd8);</div><div class='add'>+		rt2800_rfcsr_write(rt2x00dev, 33, 0x32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 2);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR2_RESCAL_BP, 0);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR2_RESCAL_EN, 1);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);</div><div class='add'>+	msleep(1);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR2_RESCAL_EN, 0);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);</div><div class='add'>+	rt2x00_set_field8(&amp;rfcsr, RFCSR1_RF_BLOCK_EN, 1);</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 6);</div><div class='add'>+	rfcsr |= 0xc0;</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 22);</div><div class='add'>+	rfcsr |= 0x20;</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 46);</div><div class='add'>+	rfcsr |= 0x20;</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 46, rfcsr);</div><div class='add'>+</div><div class='add'>+	rfcsr = rt2800_rfcsr_read(rt2x00dev, 20);</div><div class='add'>+	rfcsr &amp;= ~0xee;</div><div class='add'>+	rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	rt2800_rf_init_calibration(rt2x00dev, 2);</div><div class='hunk'>@@ -8448,6 +8942,9 @@ static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	case RT3390:</div><div class='ctx'> 		rt2800_init_rfcsr_3390(rt2x00dev);</div><div class='ctx'> 		break;</div><div class='add'>+	case RT3883:</div><div class='add'>+		rt2800_init_rfcsr_3883(rt2x00dev);</div><div class='add'>+		break;</div><div class='ctx'> 	case RT3572:</div><div class='ctx'> 		rt2800_init_rfcsr_3572(rt2x00dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -8653,7 +9150,8 @@ static u8 rt2800_get_txmixer_gain_24g(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 word;</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	word = rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG);</div><div class='hunk'>@@ -8667,7 +9165,8 @@ static u8 rt2800_get_txmixer_gain_5g(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 word;</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593))</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	word = rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A);</div><div class='hunk'>@@ -8773,7 +9272,8 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	word = rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2);</div><div class='ctx'> 	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) &gt; 10)</div><div class='ctx'> 		rt2x00_set_field16(&amp;word, EEPROM_RSSI_BG2_OFFSET2, 0);</div><div class='del'>-	if (!rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+	if (!rt2x00_rt(rt2x00dev, RT3593) &amp;&amp;</div><div class='add'>+	    !rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 		if (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 ||</div><div class='ctx'> 		    rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff)</div><div class='ctx'> 			rt2x00_set_field16(&amp;word, EEPROM_RSSI_BG2_LNA_A1,</div><div class='hunk'>@@ -8793,7 +9293,8 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	word = rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2);</div><div class='ctx'> 	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A2_OFFSET2)) &gt; 10)</div><div class='ctx'> 		rt2x00_set_field16(&amp;word, EEPROM_RSSI_A2_OFFSET2, 0);</div><div class='del'>-	if (!rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+	if (!rt2x00_rt(rt2x00dev, RT3593) &amp;&amp;</div><div class='add'>+	    !rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 		if (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 ||</div><div class='ctx'> 		    rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff)</div><div class='ctx'> 			rt2x00_set_field16(&amp;word, EEPROM_RSSI_A2_LNA_A2,</div><div class='hunk'>@@ -8801,7 +9302,8 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word);</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rt(rt2x00dev, RT3593)) {</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3593) ||</div><div class='add'>+	    rt2x00_rt(rt2x00dev, RT3883)) {</div><div class='ctx'> 		word = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);</div><div class='ctx'> 		if (rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0x00 ||</div><div class='ctx'> 		    rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0xff)</div><div class='hunk'>@@ -8840,6 +9342,8 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		rf = rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID);</div><div class='ctx'> 	else if (rt2x00_rt(rt2x00dev, RT3352))</div><div class='ctx'> 		rf = RF3322;</div><div class='add'>+	else if (rt2x00_rt(rt2x00dev, RT3883))</div><div class='add'>+		rf = RF3853;</div><div class='ctx'> 	else if (rt2x00_rt(rt2x00dev, RT5350))</div><div class='ctx'> 		rf = RF5350;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -8860,6 +9364,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	case RF3290:</div><div class='ctx'> 	case RF3320:</div><div class='ctx'> 	case RF3322:</div><div class='add'>+	case RF3853:</div><div class='ctx'> 	case RF5350:</div><div class='ctx'> 	case RF5360:</div><div class='ctx'> 	case RF5362:</div><div class='hunk'>@@ -9146,6 +9651,66 @@ static const struct rf_channel rf_vals_3x_xtal20[] = {</div><div class='ctx'> 	{14,   0xF0,	 2,  0x18},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct rf_channel rf_vals_3853[] = {</div><div class='add'>+	{1,  241, 6, 2},</div><div class='add'>+	{2,  241, 6, 7},</div><div class='add'>+	{3,  242, 6, 2},</div><div class='add'>+	{4,  242, 6, 7},</div><div class='add'>+	{5,  243, 6, 2},</div><div class='add'>+	{6,  243, 6, 7},</div><div class='add'>+	{7,  244, 6, 2},</div><div class='add'>+	{8,  244, 6, 7},</div><div class='add'>+	{9,  245, 6, 2},</div><div class='add'>+	{10, 245, 6, 7},</div><div class='add'>+	{11, 246, 6, 2},</div><div class='add'>+	{12, 246, 6, 7},</div><div class='add'>+	{13, 247, 6, 2},</div><div class='add'>+	{14, 248, 6, 4},</div><div class='add'>+</div><div class='add'>+	{36, 0x56, 8, 4},</div><div class='add'>+	{38, 0x56, 8, 6},</div><div class='add'>+	{40, 0x56, 8, 8},</div><div class='add'>+	{44, 0x57, 8, 0},</div><div class='add'>+	{46, 0x57, 8, 2},</div><div class='add'>+	{48, 0x57, 8, 4},</div><div class='add'>+	{52, 0x57, 8, 8},</div><div class='add'>+	{54, 0x57, 8, 10},</div><div class='add'>+	{56, 0x58, 8, 0},</div><div class='add'>+	{60, 0x58, 8, 4},</div><div class='add'>+	{62, 0x58, 8, 6},</div><div class='add'>+	{64, 0x58, 8, 8},</div><div class='add'>+</div><div class='add'>+	{100, 0x5b, 8, 8},</div><div class='add'>+	{102, 0x5b, 8, 10},</div><div class='add'>+	{104, 0x5c, 8, 0},</div><div class='add'>+	{108, 0x5c, 8, 4},</div><div class='add'>+	{110, 0x5c, 8, 6},</div><div class='add'>+	{112, 0x5c, 8, 8},</div><div class='add'>+	{114, 0x5c, 8, 10},</div><div class='add'>+	{116, 0x5d, 8, 0},</div><div class='add'>+	{118, 0x5d, 8, 2},</div><div class='add'>+	{120, 0x5d, 8, 4},</div><div class='add'>+	{124, 0x5d, 8, 8},</div><div class='add'>+	{126, 0x5d, 8, 10},</div><div class='add'>+	{128, 0x5e, 8, 0},</div><div class='add'>+	{132, 0x5e, 8, 4},</div><div class='add'>+	{134, 0x5e, 8, 6},</div><div class='add'>+	{136, 0x5e, 8, 8},</div><div class='add'>+	{140, 0x5f, 8, 0},</div><div class='add'>+</div><div class='add'>+	{149, 0x5f, 8, 9},</div><div class='add'>+	{151, 0x5f, 8, 11},</div><div class='add'>+	{153, 0x60, 8, 1},</div><div class='add'>+	{157, 0x60, 8, 5},</div><div class='add'>+	{159, 0x60, 8, 7},</div><div class='add'>+	{161, 0x60, 8, 9},</div><div class='add'>+	{165, 0x61, 8, 1},</div><div class='add'>+	{167, 0x61, 8, 3},</div><div class='add'>+	{169, 0x61, 8, 5},</div><div class='add'>+	{171, 0x61, 8, 7},</div><div class='add'>+	{173, 0x61, 8, 9},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct rf_channel rf_vals_5592_xtal20[] = {</div><div class='ctx'> 	/* Channel, N, K, mod, R */</div><div class='ctx'> 	{1, 482, 4, 10, 3},</div><div class='hunk'>@@ -9409,6 +9974,11 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 		spec-&gt;channels = rf_vals_3x;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case RF3853:</div><div class='add'>+		spec-&gt;num_channels = ARRAY_SIZE(rf_vals_3853);</div><div class='add'>+		spec-&gt;channels = rf_vals_3853;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case RF5592:</div><div class='ctx'> 		reg = rt2800_register_read(rt2x00dev, MAC_DEBUG_INDEX);</div><div class='ctx'> 		if (rt2x00_get_field32(reg, MAC_DEBUG_INDEX_XTAL)) {</div><div class='hunk'>@@ -9528,6 +10098,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	case RF3053:</div><div class='ctx'> 	case RF3070:</div><div class='ctx'> 	case RF3290:</div><div class='add'>+	case RF3853:</div><div class='ctx'> 	case RF5350:</div><div class='ctx'> 	case RF5360:</div><div class='ctx'> 	case RF5362:</div><div class='hunk'>@@ -9570,6 +10141,7 @@ static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	case RT3390:</div><div class='ctx'> 	case RT3572:</div><div class='ctx'> 	case RT3593:</div><div class='add'>+	case RT3883:</div><div class='ctx'> 	case RT5350:</div><div class='ctx'> 	case RT5390:</div><div class='ctx'> 	case RT5392:</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h<br/>index 0dff2c7b3010..759eab2b70c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800lib.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800lib.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800lib.h</a></div><div class='hunk'>@@ -195,9 +195,10 @@ void rt2800_process_rxwi(struct queue_entry *entry, struct rxdone_entry_desc *tx</div><div class='ctx'> </div><div class='ctx'> void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,</div><div class='ctx'> 			 bool match);</div><div class='del'>-void rt2800_txdone(struct rt2x00_dev *rt2x00dev);</div><div class='add'>+void rt2800_txdone(struct rt2x00_dev *rt2x00dev, unsigned int quota);</div><div class='ctx'> void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev);</div><div class='ctx'> bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev);</div><div class='add'>+bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev);</div><div class='ctx'> </div><div class='ctx'> void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);</div><div class='ctx'> void rt2800_clear_beacon(struct queue_entry *entry);</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c<br/>index ddb88cfeace2..ecc4c9332ec7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.c</a></div><div class='hunk'>@@ -255,26 +255,12 @@ void rt2800mmio_autowake_tasklet(unsigned long data)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800mmio_autowake_tasklet);</div><div class='ctx'> </div><div class='del'>-static void rt2800mmio_txdone(struct rt2x00_dev *rt2x00dev)</div><div class='del'>-{</div><div class='del'>-	bool timeout = false;</div><div class='del'>-</div><div class='del'>-	while (!kfifo_is_empty(&amp;rt2x00dev-&gt;txstatus_fifo) ||</div><div class='del'>-	       (timeout = rt2800_txstatus_timeout(rt2x00dev))) {</div><div class='del'>-</div><div class='del'>-		rt2800_txdone(rt2x00dev);</div><div class='del'>-</div><div class='del'>-		if (timeout)</div><div class='del'>-			rt2800_txdone_nostatus(rt2x00dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rt2800mmio_fetch_txstatus(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+static void rt2800mmio_fetch_txstatus(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 status;</div><div class='del'>-	bool more = false;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/* FIXEME: rewrite this comment</div><div class='add'>+	/*</div><div class='ctx'> 	 * The TX_FIFO_STATUS interrupt needs special care. We should</div><div class='ctx'> 	 * read TX_STA_FIFO but we should do it immediately as otherwise</div><div class='ctx'> 	 * the register can overflow and we would lose status reports.</div><div class='hunk'>@@ -285,34 +271,32 @@ static bool rt2800mmio_fetch_txstatus(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	 * because we can schedule the tasklet multiple times (when the</div><div class='ctx'> 	 * interrupt fires again during tx status processing).</div><div class='ctx'> 	 *</div><div class='del'>-	 * txstatus tasklet is called with INT_SOURCE_CSR_TX_FIFO_STATUS</div><div class='del'>-	 * disabled so have only one producer and one consumer - we don't</div><div class='del'>-	 * need to lock the kfifo.</div><div class='add'>+	 * We also read statuses from tx status timeout timer, use</div><div class='add'>+	 * lock to prevent concurent writes to fifo.</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rt2x00dev-&gt;irqmask_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	while (!kfifo_is_full(&amp;rt2x00dev-&gt;txstatus_fifo)) {</div><div class='ctx'> 		status = rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO);</div><div class='ctx'> 		if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		kfifo_put(&amp;rt2x00dev-&gt;txstatus_fifo, status);</div><div class='del'>-		more = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return more;</div><div class='add'>+	spin_unlock_irqrestore(&amp;rt2x00dev-&gt;irqmask_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rt2800mmio_txstatus_tasklet(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		rt2800mmio_txdone(rt2x00dev);</div><div class='add'>+	rt2800_txdone(rt2x00dev, 16);</div><div class='ctx'> </div><div class='del'>-	} while (rt2800mmio_fetch_txstatus(rt2x00dev));</div><div class='add'>+	if (!kfifo_is_empty(&amp;rt2x00dev-&gt;txstatus_fifo))</div><div class='add'>+		tasklet_schedule(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='del'>-		rt2800mmio_enable_interrupt(rt2x00dev,</div><div class='del'>-					    INT_SOURCE_CSR_TX_FIFO_STATUS);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800mmio_txstatus_tasklet);</div><div class='ctx'> </div><div class='hunk'>@@ -339,8 +323,10 @@ irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	mask = ~reg;</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) {</div><div class='add'>+		rt2x00_set_field32(&amp;mask, INT_MASK_CSR_TX_FIFO_STATUS, 1);</div><div class='ctx'> 		rt2800mmio_fetch_txstatus(rt2x00dev);</div><div class='del'>-		tasklet_schedule(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='add'>+		if (!kfifo_is_empty(&amp;rt2x00dev-&gt;txstatus_fifo))</div><div class='add'>+			tasklet_schedule(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rt2x00_get_field32(reg, INT_SOURCE_CSR_PRE_TBTT))</div><div class='hunk'>@@ -440,6 +426,9 @@ void rt2800mmio_start_queue(struct data_queue *queue)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800mmio_start_queue);</div><div class='ctx'> </div><div class='add'>+/* 200 ms */</div><div class='add'>+#define TXSTATUS_TIMEOUT 200000000</div><div class='add'>+</div><div class='ctx'> void rt2800mmio_kick_queue(struct data_queue *queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt2x00_dev *rt2x00dev = queue-&gt;rt2x00dev;</div><div class='hunk'>@@ -454,6 +443,8 @@ void rt2800mmio_kick_queue(struct data_queue *queue)</div><div class='ctx'> 		entry = rt2x00queue_get_entry(queue, Q_INDEX);</div><div class='ctx'> 		rt2x00mmio_register_write(rt2x00dev, TX_CTX_IDX(queue-&gt;qid),</div><div class='ctx'> 					  entry-&gt;entry_idx);</div><div class='add'>+		hrtimer_start(&amp;rt2x00dev-&gt;txstatus_timer,</div><div class='add'>+			      TXSTATUS_TIMEOUT, HRTIMER_MODE_REL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QID_MGMT:</div><div class='ctx'> 		entry = rt2x00queue_get_entry(queue, Q_INDEX);</div><div class='hunk'>@@ -498,11 +489,8 @@ void rt2800mmio_flush_queue(struct data_queue *queue, bool drop)</div><div class='ctx'> 		 * For TX queues schedule completion tasklet to catch</div><div class='ctx'> 		 * tx status timeouts, othewise just wait.</div><div class='ctx'> 		 */</div><div class='del'>-		if (tx_queue) {</div><div class='del'>-			tasklet_disable(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='del'>-			rt2800mmio_txdone(rt2x00dev);</div><div class='del'>-			tasklet_enable(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='del'>-		}</div><div class='add'>+		if (tx_queue)</div><div class='add'>+			queue_work(rt2x00dev-&gt;workqueue, &amp;rt2x00dev-&gt;txdone_work);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait for a little while to give the driver</div><div class='hunk'>@@ -640,6 +628,10 @@ void rt2800mmio_clear_entry(struct queue_entry *entry)</div><div class='ctx'> 		word = rt2x00_desc_read(entry_priv-&gt;desc, 1);</div><div class='ctx'> 		rt2x00_set_field32(&amp;word, TXD_W1_DMA_DONE, 1);</div><div class='ctx'> 		rt2x00_desc_write(entry_priv-&gt;desc, 1, word);</div><div class='add'>+</div><div class='add'>+		/* If last entry stop txstatus timer */</div><div class='add'>+		if (entry-&gt;queue-&gt;length == 1)</div><div class='add'>+			hrtimer_cancel(&amp;rt2x00dev-&gt;txstatus_timer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800mmio_clear_entry);</div><div class='hunk'>@@ -772,6 +764,70 @@ int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2800mmio_enable_radio);</div><div class='ctx'> </div><div class='add'>+static void rt2800mmio_work_txdone(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00_dev *rt2x00dev =</div><div class='add'>+	    container_of(work, struct rt2x00_dev, txdone_work);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (!kfifo_is_empty(&amp;rt2x00dev-&gt;txstatus_fifo) ||</div><div class='add'>+	       rt2800_txstatus_timeout(rt2x00dev)) {</div><div class='add'>+</div><div class='add'>+		tasklet_disable(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='add'>+		rt2800_txdone(rt2x00dev, UINT_MAX);</div><div class='add'>+		rt2800_txdone_nostatus(rt2x00dev);</div><div class='add'>+		tasklet_enable(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rt2800_txstatus_pending(rt2x00dev))</div><div class='add'>+		hrtimer_start(&amp;rt2x00dev-&gt;txstatus_timer,</div><div class='add'>+			      TXSTATUS_TIMEOUT, HRTIMER_MODE_REL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart rt2800mmio_tx_sta_fifo_timeout(struct hrtimer *timer)</div><div class='add'>+{</div><div class='add'>+	struct rt2x00_dev *rt2x00dev =</div><div class='add'>+	    container_of(timer, struct rt2x00_dev, txstatus_timer);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &amp;rt2x00dev-&gt;flags))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!rt2800_txstatus_pending(rt2x00dev))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rt2800mmio_fetch_txstatus(rt2x00dev);</div><div class='add'>+	if (!kfifo_is_empty(&amp;rt2x00dev-&gt;txstatus_fifo))</div><div class='add'>+		tasklet_schedule(&amp;rt2x00dev-&gt;txstatus_tasklet);</div><div class='add'>+	else</div><div class='add'>+		queue_work(rt2x00dev-&gt;workqueue, &amp;rt2x00dev-&gt;txdone_work);</div><div class='add'>+out:</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rt2800mmio_probe_hw(struct rt2x00_dev *rt2x00dev)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = rt2800_probe_hw(rt2x00dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set txstatus timer function.</div><div class='add'>+	 */</div><div class='add'>+	rt2x00dev-&gt;txstatus_timer.function = rt2800mmio_tx_sta_fifo_timeout;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Overwrite TX done handler</div><div class='add'>+	 */</div><div class='add'>+	INIT_WORK(&amp;rt2x00dev-&gt;txdone_work, rt2800mmio_work_txdone);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(rt2800mmio_probe_hw);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR(DRV_PROJECT);</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_DESCRIPTION("rt2800 MMIO library");</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h<br/>index 3a513273f414..ca58e6c3a4e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.h</a></div><div class='hunk'>@@ -153,6 +153,7 @@ void rt2800mmio_stop_queue(struct data_queue *queue);</div><div class='ctx'> void rt2800mmio_queue_init(struct data_queue *queue);</div><div class='ctx'> </div><div class='ctx'> /* Initialization functions */</div><div class='add'>+int rt2800mmio_probe_hw(struct rt2x00_dev *rt2x00dev);</div><div class='ctx'> bool rt2800mmio_get_entry_state(struct queue_entry *entry);</div><div class='ctx'> void rt2800mmio_clear_entry(struct queue_entry *entry);</div><div class='ctx'> int rt2800mmio_init_queues(struct rt2x00_dev *rt2x00dev);</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800pci.c b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c<br/>index 0291441ac548..43e1b1ee96bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800pci.c</a></div><div class='hunk'>@@ -346,7 +346,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {</div><div class='ctx'> 	.tbtt_tasklet		= rt2800mmio_tbtt_tasklet,</div><div class='ctx'> 	.rxdone_tasklet		= rt2800mmio_rxdone_tasklet,</div><div class='ctx'> 	.autowake_tasklet	= rt2800mmio_autowake_tasklet,</div><div class='del'>-	.probe_hw		= rt2800_probe_hw,</div><div class='add'>+	.probe_hw		= rt2800mmio_probe_hw,</div><div class='ctx'> 	.get_firmware_name	= rt2800pci_get_firmware_name,</div><div class='ctx'> 	.check_firmware		= rt2800_check_firmware,</div><div class='ctx'> 	.load_firmware		= rt2800_load_firmware,</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800soc.c b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c<br/>index a502816214ab..4e9e38771a56 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800soc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800soc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800soc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800soc.c</a></div><div class='hunk'>@@ -51,9 +51,16 @@ static bool rt2800soc_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> </div><div class='ctx'> static void rt2800soc_disable_radio(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> {</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='ctx'> 	rt2800_disable_radio(rt2x00dev);</div><div class='ctx'> 	rt2x00mmio_register_write(rt2x00dev, PWR_PIN_CFG, 0);</div><div class='del'>-	rt2x00mmio_register_write(rt2x00dev, TX_PIN_CFG, 0);</div><div class='add'>+</div><div class='add'>+	reg = 0;</div><div class='add'>+	if (rt2x00_rt(rt2x00dev, RT3883))</div><div class='add'>+		rt2x00_set_field32(&amp;reg, TX_PIN_CFG_RFTR_EN, 1);</div><div class='add'>+</div><div class='add'>+	rt2x00mmio_register_write(rt2x00dev, TX_PIN_CFG, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt2800soc_set_device_state(struct rt2x00_dev *rt2x00dev,</div><div class='hunk'>@@ -185,7 +192,7 @@ static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = {</div><div class='ctx'> 	.tbtt_tasklet		= rt2800mmio_tbtt_tasklet,</div><div class='ctx'> 	.rxdone_tasklet		= rt2800mmio_rxdone_tasklet,</div><div class='ctx'> 	.autowake_tasklet	= rt2800mmio_autowake_tasklet,</div><div class='del'>-	.probe_hw		= rt2800_probe_hw,</div><div class='add'>+	.probe_hw		= rt2800mmio_probe_hw,</div><div class='ctx'> 	.get_firmware_name	= rt2800soc_get_firmware_name,</div><div class='ctx'> 	.check_firmware		= rt2800soc_check_firmware,</div><div class='ctx'> 	.load_firmware		= rt2800soc_load_firmware,</div><div class='hunk'>@@ -203,7 +210,7 @@ static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = {</div><div class='ctx'> 	.start_queue		= rt2800mmio_start_queue,</div><div class='ctx'> 	.kick_queue		= rt2800mmio_kick_queue,</div><div class='ctx'> 	.stop_queue		= rt2800mmio_stop_queue,</div><div class='del'>-	.flush_queue		= rt2x00mmio_flush_queue,</div><div class='add'>+	.flush_queue		= rt2800mmio_flush_queue,</div><div class='ctx'> 	.write_tx_desc		= rt2800mmio_write_tx_desc,</div><div class='ctx'> 	.write_tx_data		= rt2800_write_tx_data,</div><div class='ctx'> 	.write_beacon		= rt2800_write_beacon,</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c<br/>index 19eabf16147b..b5f75df9b563 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2800usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2800usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2800usb.c</a></div><div class='hunk'>@@ -100,22 +100,6 @@ static void rt2800usb_stop_queue(struct data_queue *queue)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * test if there is an entry in any TX queue for which DMA is done</div><div class='del'>- * but the TX status has not been returned yet</div><div class='del'>- */</div><div class='del'>-static bool rt2800usb_txstatus_pending(struct rt2x00_dev *rt2x00dev)</div><div class='del'>-{</div><div class='del'>-	struct data_queue *queue;</div><div class='del'>-</div><div class='del'>-	tx_queue_for_each(rt2x00dev, queue) {</div><div class='del'>-		if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=</div><div class='del'>-		    rt2x00queue_get_entry(queue, Q_INDEX_DONE))</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='ctx'> #define TXSTATUS_READ_INTERVAL 1000000</div><div class='ctx'> </div><div class='ctx'> static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,</div><div class='hunk'>@@ -145,7 +129,7 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	if (rt2800_txstatus_timeout(rt2x00dev))</div><div class='ctx'> 		queue_work(rt2x00dev-&gt;workqueue, &amp;rt2x00dev-&gt;txdone_work);</div><div class='ctx'> </div><div class='del'>-	if (rt2800usb_txstatus_pending(rt2x00dev)) {</div><div class='add'>+	if (rt2800_txstatus_pending(rt2x00dev)) {</div><div class='ctx'> 		/* Read register after 1 ms */</div><div class='ctx'> 		hrtimer_start(&amp;rt2x00dev-&gt;txstatus_timer,</div><div class='ctx'> 			      TXSTATUS_READ_INTERVAL,</div><div class='hunk'>@@ -160,7 +144,7 @@ stop_reading:</div><div class='ctx'> 	 * clear_bit someone could do rt2x00usb_interrupt_txdone, so recheck</div><div class='ctx'> 	 * here again if status reading is needed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (rt2800usb_txstatus_pending(rt2x00dev) &amp;&amp;</div><div class='add'>+	if (rt2800_txstatus_pending(rt2x00dev) &amp;&amp;</div><div class='ctx'> 	    !test_and_set_bit(TX_STATUS_READING, &amp;rt2x00dev-&gt;flags))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -480,7 +464,7 @@ static void rt2800usb_work_txdone(struct work_struct *work)</div><div class='ctx'> 	while (!kfifo_is_empty(&amp;rt2x00dev-&gt;txstatus_fifo) ||</div><div class='ctx'> 	       rt2800_txstatus_timeout(rt2x00dev)) {</div><div class='ctx'> </div><div class='del'>-		rt2800_txdone(rt2x00dev);</div><div class='add'>+		rt2800_txdone(rt2x00dev, UINT_MAX);</div><div class='ctx'> </div><div class='ctx'> 		rt2800_txdone_nostatus(rt2x00dev);</div><div class='ctx'> </div><div class='hunk'>@@ -489,7 +473,7 @@ static void rt2800usb_work_txdone(struct work_struct *work)</div><div class='ctx'> 		 * if the medium is busy, thus the TX_STA_FIFO entry is</div><div class='ctx'> 		 * also delayed -&gt; use a timer to retrieve it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (rt2800usb_txstatus_pending(rt2x00dev))</div><div class='add'>+		if (rt2800_txstatus_pending(rt2x00dev))</div><div class='ctx'> 			rt2800usb_async_read_tx_status(rt2x00dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -562,13 +546,13 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,</div><div class='ctx'> 		 * stripped it from the frame. Signal this to mac80211.</div><div class='ctx'> 		 */</div><div class='ctx'> 		rxdesc-&gt;flags |= RX_FLAG_MMIC_STRIPPED;</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'> 		if (rxdesc-&gt;cipher_status == RX_CRYPTO_SUCCESS) {</div><div class='ctx'> 			rxdesc-&gt;flags |= RX_FLAG_DECRYPTED;</div><div class='ctx'> 		} else if (rxdesc-&gt;cipher_status == RX_CRYPTO_FAIL_MIC) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * In order to check the Michael Mic, the packet must have</div><div class='del'>-			 * been decrypted.  Mac80211 doesnt check the MMIC failure </div><div class='add'>+			 * been decrypted.  Mac80211 doesnt check the MMIC failure</div><div class='ctx'> 			 * flag to initiate MMIC countermeasures if the decoded flag</div><div class='ctx'> 			 * has not been set.</div><div class='ctx'> 			 */</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h<br/>index 4b1744e9fb78..9c6ef0ca932b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00.h</a></div><div class='hunk'>@@ -69,10 +69,10 @@</div><div class='ctx'> 	printk(KERN_ERR KBUILD_MODNAME ": %s: Error - " fmt,		\</div><div class='ctx'> 	       __func__, ##__VA_ARGS__)</div><div class='ctx'> #define rt2x00_err(dev, fmt, ...)					\</div><div class='del'>-	wiphy_err((dev)-&gt;hw-&gt;wiphy, "%s: Error - " fmt,			\</div><div class='add'>+	wiphy_err_ratelimited((dev)-&gt;hw-&gt;wiphy, "%s: Error - " fmt,	\</div><div class='ctx'> 		  __func__, ##__VA_ARGS__)</div><div class='ctx'> #define rt2x00_warn(dev, fmt, ...)					\</div><div class='del'>-	wiphy_warn((dev)-&gt;hw-&gt;wiphy, "%s: Warning - " fmt,		\</div><div class='add'>+	wiphy_warn_ratelimited((dev)-&gt;hw-&gt;wiphy, "%s: Warning - " fmt,	\</div><div class='ctx'> 		   __func__, ##__VA_ARGS__)</div><div class='ctx'> #define rt2x00_info(dev, fmt, ...)					\</div><div class='ctx'> 	wiphy_info((dev)-&gt;hw-&gt;wiphy, "%s: Info - " fmt,			\</div><div class='hunk'>@@ -673,7 +673,6 @@ enum rt2x00_state_flags {</div><div class='ctx'> 	CONFIG_CHANNEL_HT40,</div><div class='ctx'> 	CONFIG_POWERSAVING,</div><div class='ctx'> 	CONFIG_HT_DISABLED,</div><div class='del'>-	CONFIG_QOS_DISABLED,</div><div class='ctx'> 	CONFIG_MONITORING,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -981,8 +980,6 @@ struct rt2x00_dev {</div><div class='ctx'> 	 */</div><div class='ctx'> 	DECLARE_KFIFO_PTR(txstatus_fifo, u32);</div><div class='ctx'> </div><div class='del'>-	unsigned long last_nostatus_check;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Timer to ensure tx status reports are read (rt2800usb).</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1017,6 +1014,7 @@ struct rt2x00_dev {</div><div class='ctx'> 	unsigned int extra_tx_headroom;</div><div class='ctx'> </div><div class='ctx'> 	struct usb_anchor *anchor;</div><div class='add'>+	unsigned int num_proto_errs;</div><div class='ctx'> </div><div class='ctx'> 	/* Clock for System On Chip devices. */</div><div class='ctx'> 	struct clk *clk;</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c<br/>index 357c0941aaad..1b08b01db27b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00dev.c</a></div><div class='hunk'>@@ -1007,7 +1007,7 @@ void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr</div><div class='ctx'> 	const char *mac_addr;</div><div class='ctx'> </div><div class='ctx'> 	mac_addr = of_get_mac_address(rt2x00dev-&gt;dev-&gt;of_node);</div><div class='del'>-	if (mac_addr)</div><div class='add'>+	if (!IS_ERR(mac_addr))</div><div class='ctx'> 		ether_addr_copy(eeprom_mac_addr, mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(eeprom_mac_addr)) {</div><div class='hunk'>@@ -1391,6 +1391,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	mutex_init(&amp;rt2x00dev-&gt;conf_mutex);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rt2x00dev-&gt;bar_list);</div><div class='ctx'> 	spin_lock_init(&amp;rt2x00dev-&gt;bar_list_lock);</div><div class='add'>+	hrtimer_init(&amp;rt2x00dev-&gt;txstatus_timer, CLOCK_MONOTONIC,</div><div class='add'>+		     HRTIMER_MODE_REL);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1515,6 +1517,8 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;rt2x00dev-&gt;autowakeup_work);</div><div class='ctx'> 	cancel_work_sync(&amp;rt2x00dev-&gt;sleep_work);</div><div class='ctx'> </div><div class='add'>+	hrtimer_cancel(&amp;rt2x00dev-&gt;txstatus_timer);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Kill the tx status tasklet.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c<br/>index 2825560e2424..e8462f25d252 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00mac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00mac.c</a></div><div class='hunk'>@@ -642,19 +642,9 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			rt2x00dev-&gt;intf_associated--;</div><div class='ctx'> </div><div class='ctx'> 		rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev-&gt;intf_associated);</div><div class='del'>-</div><div class='del'>-		clear_bit(CONFIG_QOS_DISABLED, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Check for access point which do not support 802.11e . We have to</div><div class='del'>-	 * generate data frames sequence number in S/W for such AP, because</div><div class='del'>-	 * of H/W bug.</div><div class='del'>-	 */</div><div class='del'>-	if (changes &amp; BSS_CHANGED_QOS &amp;&amp; !bss_conf-&gt;qos)</div><div class='del'>-		set_bit(CONFIG_QOS_DISABLED, &amp;rt2x00dev-&gt;flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * When the erp information has changed, we should perform</div><div class='ctx'> 	 * additional configuration steps. For all other changes we are done.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h b/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h<br/>index 184a4148b2f8..03e6cdb0b5a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h</a></div><div class='hunk'>@@ -80,8 +80,6 @@ int rt2x00mmio_regbusy_read(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'>  *</div><div class='ctx'>  * @desc: Pointer to device descriptor</div><div class='ctx'>  * @desc_dma: DMA pointer to &amp;desc.</div><div class='del'>- * @data: Pointer to device's entry memory.</div><div class='del'>- * @data_dma: DMA pointer to &amp;data.</div><div class='ctx'>  */</div><div class='ctx'> struct queue_entry_priv_mmio {</div><div class='ctx'> 	__le32 *desc;</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c<br/>index 92ddc19e7bf7..03b206440208 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.c</a></div><div class='hunk'>@@ -201,15 +201,18 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	if (!rt2x00_has_cap_flag(rt2x00dev, REQUIRE_SW_SEQNO)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * rt2800 has a H/W (or F/W) bug, device incorrectly increase</div><div class='del'>-		 * seqno on retransmited data (non-QOS) frames. To workaround</div><div class='del'>-		 * the problem let's generate seqno in software if QOS is</div><div class='del'>-		 * disabled.</div><div class='add'>+		 * seqno on retransmitted data (non-QOS) and management frames.</div><div class='add'>+		 * To workaround the problem let's generate seqno in software.</div><div class='add'>+		 * Except for beacons which are transmitted periodically by H/W</div><div class='add'>+		 * hence hardware has to assign seqno for them.</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(CONFIG_QOS_DISABLED, &amp;rt2x00dev-&gt;flags))</div><div class='del'>-			__clear_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags);</div><div class='del'>-		else</div><div class='add'>+	    	if (ieee80211_is_beacon(hdr-&gt;frame_control)) {</div><div class='add'>+			__set_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags);</div><div class='ctx'> 			/* H/W will generate sequence number */</div><div class='ctx'> 			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__clear_bit(ENTRY_TXD_GENERATE_SEQ, &amp;txdesc-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -671,7 +674,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,</div><div class='ctx'> 	spin_lock(&amp;queue-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rt2x00queue_full(queue))) {</div><div class='del'>-		rt2x00_err(queue-&gt;rt2x00dev, "Dropping frame due to full tx queue %d\n",</div><div class='add'>+		rt2x00_dbg(queue-&gt;rt2x00dev, "Dropping frame due to full tx queue %d\n",</div><div class='ctx'> 			   queue-&gt;qid);</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1039,7 +1042,6 @@ void rt2x00queue_start_queues(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	tx_queue_for_each(rt2x00dev, queue)</div><div class='ctx'> 		rt2x00queue_start_queue(queue);</div><div class='del'>-	rt2x00dev-&gt;last_nostatus_check = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	rt2x00queue_start_queue(rt2x00dev-&gt;rx);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h<br/>index a15bae29917b..20113f861b9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.h</a></div><div class='hunk'>@@ -361,7 +361,6 @@ enum queue_entry_flags {</div><div class='ctx'> 	ENTRY_DATA_PENDING,</div><div class='ctx'> 	ENTRY_DATA_IO_FAILED,</div><div class='ctx'> 	ENTRY_DATA_STATUS_PENDING,</div><div class='del'>-	ENTRY_DATA_STATUS_SET,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -387,8 +386,6 @@ struct queue_entry {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int entry_idx;</div><div class='ctx'> </div><div class='del'>-	u32 status;</div><div class='del'>-</div><div class='ctx'> 	void *priv_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c<br/>index 086aad22743d..9cdd7f2c92b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ralink/rt2x00/rt2x00usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ralink/rt2x00/rt2x00usb.c</a></div><div class='hunk'>@@ -31,6 +31,22 @@</div><div class='ctx'> #include "rt2x00.h"</div><div class='ctx'> #include "rt2x00usb.h"</div><div class='ctx'> </div><div class='add'>+static bool rt2x00usb_check_usb_error(struct rt2x00_dev *rt2x00dev, int status)</div><div class='add'>+{</div><div class='add'>+	if (status == -ENODEV || status == -ENOENT)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (status == -EPROTO || status == -ETIMEDOUT)</div><div class='add'>+		rt2x00dev-&gt;num_proto_errs++;</div><div class='add'>+	else</div><div class='add'>+		rt2x00dev-&gt;num_proto_errs = 0;</div><div class='add'>+</div><div class='add'>+	if (rt2x00dev-&gt;num_proto_errs &gt; 3)</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='ctx'> /*</div><div class='ctx'>  * Interfacing with the HW.</div><div class='ctx'>  */</div><div class='hunk'>@@ -57,7 +73,7 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		if (status &gt;= 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		if (status == -ENODEV || status == -ENOENT) {</div><div class='add'>+		if (rt2x00usb_check_usb_error(rt2x00dev, status)) {</div><div class='ctx'> 			/* Device has disappeared. */</div><div class='ctx'> 			clear_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -321,7 +337,7 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void *data)</div><div class='ctx'> </div><div class='ctx'> 	status = usb_submit_urb(entry_priv-&gt;urb, GFP_ATOMIC);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		if (status == -ENODEV || status == -ENOENT)</div><div class='add'>+		if (rt2x00usb_check_usb_error(rt2x00dev, status))</div><div class='ctx'> 			clear_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 		set_bit(ENTRY_DATA_IO_FAILED, &amp;entry-&gt;flags);</div><div class='ctx'> 		rt2x00lib_dmadone(entry);</div><div class='hunk'>@@ -410,7 +426,7 @@ static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry, void *data)</div><div class='ctx'> </div><div class='ctx'> 	status = usb_submit_urb(entry_priv-&gt;urb, GFP_ATOMIC);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		if (status == -ENODEV || status == -ENOENT)</div><div class='add'>+		if (rt2x00usb_check_usb_error(rt2x00dev, status))</div><div class='ctx'> 			clear_bit(DEVICE_STATE_PRESENT, &amp;rt2x00dev-&gt;flags);</div><div class='ctx'> 		set_bit(ENTRY_DATA_IO_FAILED, &amp;entry-&gt;flags);</div><div class='ctx'> 		rt2x00lib_dmadone(entry);</div><div class='head'>diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c<br/>index 44a943d18b84..ee4d8106bba5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ray_cs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ray_cs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ray_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ray_cs.c</a></div><div class='hunk'>@@ -2795,6 +2795,8 @@ static int __init init_ray_cs(void)</div><div class='ctx'> 	rc = pcmcia_register_driver(&amp;ray_driver);</div><div class='ctx'> 	pr_debug("raylink init_module register_pcmcia_driver returns 0x%x\n",</div><div class='ctx'> 	      rc);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> 	proc_mkdir("driver/ray_cs", NULL);</div><div class='hunk'>@@ -2818,11 +2820,7 @@ static void __exit exit_ray_cs(void)</div><div class='ctx'> 	pr_debug("ray_cs: cleanup_module\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-	remove_proc_entry("driver/ray_cs/ray_cs", NULL);</div><div class='del'>-	remove_proc_entry("driver/ray_cs/essid", NULL);</div><div class='del'>-	remove_proc_entry("driver/ray_cs/net_type", NULL);</div><div class='del'>-	remove_proc_entry("driver/ray_cs/translate", NULL);</div><div class='del'>-	remove_proc_entry("driver/ray_cs", NULL);</div><div class='add'>+	remove_proc_subtree("driver/ray_cs", NULL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pcmcia_unregister_driver(&amp;ray_driver);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/Kconfig b/drivers/net/wireless/realtek/Kconfig<br/>index 3db988e689d7..9189fd672578 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/Kconfig</a></div><div class='hunk'>@@ -14,5 +14,6 @@ if WLAN_VENDOR_REALTEK</div><div class='ctx'> source "drivers/net/wireless/realtek/rtl818x/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/realtek/rtlwifi/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"</div><div class='add'>+source "drivers/net/wireless/realtek/rtw88/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # WLAN_VENDOR_REALTEK</div><div class='head'>diff --git a/drivers/net/wireless/realtek/Makefile b/drivers/net/wireless/realtek/Makefile<br/>index 9c78deb5eea9..118af9963d61 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/Makefile</a></div><div class='hunk'>@@ -6,4 +6,5 @@ obj-$(CONFIG_RTL8180)		+= rtl818x/</div><div class='ctx'> obj-$(CONFIG_RTL8187)		+= rtl818x/</div><div class='ctx'> obj-$(CONFIG_RTLWIFI)		+= rtlwifi/</div><div class='ctx'> obj-$(CONFIG_RTL8XXXU)		+= rtl8xxxu/</div><div class='add'>+obj-$(CONFIG_RTW88)		+= rtw88/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c<br/>index 217d2a7a43c7..ac746c322554 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/base.c</a></div><div class='hunk'>@@ -448,6 +448,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)</div><div class='ctx'> 	/* &lt;2&gt; work queue */</div><div class='ctx'> 	rtlpriv-&gt;works.hw = hw;</div><div class='ctx'> 	rtlpriv-&gt;works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv-&gt;cfg-&gt;name);</div><div class='add'>+	if (unlikely(!rtlpriv-&gt;works.rtl_wq)) {</div><div class='add'>+		pr_err("Failed to allocate work queue\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.watchdog_wq,</div><div class='ctx'> 			  (void *)rtl_watchdog_wq_callback);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.ips_nic_off_wq,</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c<br/>index 48ca52102cef..4055e0ab75ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/pci.c</a></div><div class='hunk'>@@ -499,16 +499,16 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 			memset(&amp;tcb_desc, 0, sizeof(struct rtl_tcb_desc));</div><div class='ctx'> </div><div class='del'>-			spin_lock_bh(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='add'>+			spin_lock(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='ctx'> 			if (!skb_queue_empty(&amp;mac-&gt;skb_waitq[tid]) &amp;&amp;</div><div class='ctx'> 			    (ring-&gt;entries - skb_queue_len(&amp;ring-&gt;queue) &gt;</div><div class='ctx'> 			     rtlhal-&gt;max_earlymode_num)) {</div><div class='ctx'> 				skb = skb_dequeue(&amp;mac-&gt;skb_waitq[tid]);</div><div class='ctx'> 			} else {</div><div class='del'>-				spin_unlock_bh(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='add'>+				spin_unlock(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_bh(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='add'>+			spin_unlock(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='ctx'> </div><div class='ctx'> 			/* Some macaddr can't do early mode. like</div><div class='ctx'> 			 * multicast/broadcast/no_qos data</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c<br/>index 203e7b574e84..e2e0bfbc24fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c</a></div><div class='hunk'>@@ -600,6 +600,8 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)</div><div class='ctx'> 		      u1rsvdpageloc, 3);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	rtstatus = rtl_cmd_send_packet(hw, skb);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c<br/>index 106011a24827..483dc8bdc555 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c</a></div><div class='hunk'>@@ -372,8 +372,9 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='ctx'> 	struct rx_fwinfo_88e *p_drvinfo;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='add'>+	u8 wake_match;</div><div class='ctx'> 	u32 phystatus = GET_RX_DESC_PHYST(pdesc);</div><div class='add'>+</div><div class='ctx'> 	status-&gt;packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);</div><div class='ctx'> 	if (status-&gt;packet_report_type == TX_REPORT2)</div><div class='ctx'> 		status-&gt;length = (u16)GET_RX_RPT2_DESC_PKT_LEN(pdesc);</div><div class='hunk'>@@ -399,18 +400,18 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 	status-&gt;is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status-&gt;rate);</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;macid = GET_RX_DESC_MACID(pdesc);</div><div class='del'>-	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(2);</div><div class='add'>+	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))</div><div class='add'>+		wake_match = BIT(2);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(1);</div><div class='add'>+		wake_match = BIT(1);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(0);</div><div class='add'>+		wake_match = BIT(0);</div><div class='ctx'> 	else</div><div class='del'>-		status-&gt;wake_match = 0;</div><div class='del'>-	if (status-&gt;wake_match)</div><div class='add'>+		wake_match = 0;</div><div class='add'>+	if (wake_match)</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,</div><div class='ctx'> 		"GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",</div><div class='del'>-		status-&gt;wake_match);</div><div class='add'>+		wake_match);</div><div class='ctx'> 	rx_status-&gt;freq = hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='ctx'> 	rx_status-&gt;band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c<br/>index 18c76990a089..86b1b88cc4ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c</a></div><div class='hunk'>@@ -623,6 +623,8 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,</div><div class='ctx'> 		      u1rsvdpageloc, 3);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd_send_packet)</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c<br/>index f3a336e0ea98..d259794a308b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c</a></div><div class='hunk'>@@ -42,12 +42,9 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='ctx'> 	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='ctx'> 	u32 tx_agc[2] = { 0, 0 }, tmpval = 0;</div><div class='del'>-	bool turbo_scanoff = false;</div><div class='ctx'> 	u8 idx1, idx2;</div><div class='ctx'> 	u8 *ptr;</div><div class='ctx'> </div><div class='del'>-	if ((rtlefuse-&gt;eeprom_regulatory != 0) || (rtlefuse-&gt;external_pa))</div><div class='del'>-		turbo_scanoff = true;</div><div class='ctx'> 	if (mac-&gt;act_scanning) {</div><div class='ctx'> 		tx_agc[RF90_PATH_A] = 0x3f3f3f3f;</div><div class='ctx'> 		tx_agc[RF90_PATH_B] = 0x3f3f3f3f;</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c<br/>index 7c5b54b71a92..67305ce915ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c</a></div><div class='hunk'>@@ -744,6 +744,8 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)</div><div class='ctx'> 		      u1rsvdpageloc, 3);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	rtstatus = rtl_cmd_send_packet(hw, skb);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c<br/>index 09cf8180e4ff..d297cfc0fd2b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c</a></div><div class='hunk'>@@ -331,6 +331,7 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct rx_fwinfo *p_drvinfo;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	u32 phystatus = GET_RX_DESC_PHYST(pdesc);</div><div class='add'>+	u8 wake_match;</div><div class='ctx'> </div><div class='ctx'> 	if (GET_RX_STATUS_DESC_RPT_SEL(pdesc) == 0)</div><div class='ctx'> 		status-&gt;packet_report_type = NORMAL_RX;</div><div class='hunk'>@@ -350,18 +351,18 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 	status-&gt;is_cck = RTL92EE_RX_HAL_IS_CCK_RATE(status-&gt;rate);</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;macid = GET_RX_DESC_MACID(pdesc);</div><div class='del'>-	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(2);</div><div class='add'>+	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))</div><div class='add'>+		wake_match = BIT(2);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(1);</div><div class='add'>+		wake_match = BIT(1);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(0);</div><div class='add'>+		wake_match = BIT(0);</div><div class='ctx'> 	else</div><div class='del'>-		status-&gt;wake_match = 0;</div><div class='del'>-	if (status-&gt;wake_match)</div><div class='add'>+		wake_match = 0;</div><div class='add'>+	if (wake_match)</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,</div><div class='ctx'> 			 "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",</div><div class='del'>-			 status-&gt;wake_match);</div><div class='add'>+			 wake_match);</div><div class='ctx'> 	rx_status-&gt;freq = hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='ctx'> 	rx_status-&gt;band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c<br/>index 514891ea2c64..d8260c7afe09 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c</a></div><div class='hunk'>@@ -663,7 +663,7 @@ void rtl8723e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rtl8723e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)</div><div class='add'>+static void rtl8723e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='ctx'> 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c<br/>index be451a6f7dbe..33481232fad0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c</a></div><div class='hunk'>@@ -448,6 +448,8 @@ void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)</div><div class='ctx'> 		      u1rsvdpageloc, 3);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	rtstatus = rtl_cmd_send_packet(hw, skb);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c<br/>index 6bab162e1bb8..655460f61bbc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c</a></div><div class='hunk'>@@ -1675,6 +1675,7 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw,</div><div class='ctx'> 					rtlhal-&gt;oem_id = RT_CID_819X_LENOVO;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='add'>+				break;</div><div class='ctx'> 			case 0x1025:</div><div class='ctx'> 				rtlhal-&gt;oem_id = RT_CID_819X_ACER;</div><div class='ctx'> 				break;</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c<br/>index 4d7fa27f55ca..aa56058af56e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c</a></div><div class='hunk'>@@ -562,6 +562,8 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,</div><div class='ctx'> 		      u1rsvdpageloc, sizeof(u1rsvdpageloc));</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	rtstatus = rtl_cmd_send_packet(hw, skb);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c<br/>index 9ada9a06c6ea..d87ba03fe78f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c</a></div><div class='hunk'>@@ -300,7 +300,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='ctx'> 	struct rx_fwinfo_8723be *p_drvinfo;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='add'>+	u8 wake_match;</div><div class='ctx'> 	u32 phystatus = GET_RX_DESC_PHYST(pdesc);</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;length = (u16)GET_RX_DESC_PKT_LEN(pdesc);</div><div class='hunk'>@@ -329,18 +329,18 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 		status-&gt;packet_report_type = NORMAL_RX;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(2);</div><div class='add'>+	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))</div><div class='add'>+		wake_match = BIT(2);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(1);</div><div class='add'>+		wake_match = BIT(1);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(0);</div><div class='add'>+		wake_match = BIT(0);</div><div class='ctx'> 	else</div><div class='del'>-		status-&gt;wake_match = 0;</div><div class='del'>-	if (status-&gt;wake_match)</div><div class='add'>+		wake_match = 0;</div><div class='add'>+	if (wake_match)</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,</div><div class='ctx'> 		"GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",</div><div class='del'>-		status-&gt;wake_match);</div><div class='add'>+		wake_match);</div><div class='ctx'> 	rx_status-&gt;freq = hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='ctx'> 	rx_status-&gt;band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c<br/>index dc0eb692088f..fe32d397d287 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c</a></div><div class='hunk'>@@ -1623,6 +1623,8 @@ out:</div><div class='ctx'> 		      &amp;reserved_page_packet_8812[0], totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet_8812, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	rtstatus = rtl_cmd_send_packet(hw, skb);</div><div class='hunk'>@@ -1759,6 +1761,8 @@ out:</div><div class='ctx'> 		      &amp;reserved_page_packet_8821[0], totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(totalpacketlen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='ctx'> 	skb_put_data(skb, &amp;reserved_page_packet_8821, totalpacketlen);</div><div class='ctx'> </div><div class='ctx'> 	rtstatus = rtl_cmd_send_packet(hw, skb);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c<br/>index db5e628b17ed..7b6faf38e09c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c</a></div><div class='hunk'>@@ -436,7 +436,7 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='ctx'> 	struct rx_fwinfo_8821ae *p_drvinfo;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='add'>+	u8 wake_match;</div><div class='ctx'> 	u32 phystatus = GET_RX_DESC_PHYST(pdesc);</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;length = (u16)GET_RX_DESC_PKT_LEN(pdesc);</div><div class='hunk'>@@ -473,18 +473,18 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,</div><div class='ctx'> 		status-&gt;packet_report_type = NORMAL_RX;</div><div class='ctx'> </div><div class='ctx'> 	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(2);</div><div class='add'>+		wake_match = BIT(2);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(1);</div><div class='add'>+		wake_match = BIT(1);</div><div class='ctx'> 	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))</div><div class='del'>-		status-&gt;wake_match = BIT(0);</div><div class='add'>+		wake_match = BIT(0);</div><div class='ctx'> 	else</div><div class='del'>-		status-&gt;wake_match = 0;</div><div class='add'>+		wake_match = 0;</div><div class='ctx'> </div><div class='del'>-	if (status-&gt;wake_match)</div><div class='add'>+	if (wake_match)</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,</div><div class='ctx'> 			 "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",</div><div class='del'>-			 status-&gt;wake_match);</div><div class='add'>+			 wake_match);</div><div class='ctx'> 	rx_status-&gt;freq = hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='ctx'> 	rx_status-&gt;band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h<br/>index e32e9ffa3192..518aaa875361 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/wifi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/realtek/rtlwifi/wifi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtlwifi/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtlwifi/wifi.h</a></div><div class='hunk'>@@ -2138,7 +2138,6 @@ struct rtl_stats {</div><div class='ctx'> 	u8 packet_report_type;</div><div class='ctx'> </div><div class='ctx'> 	u32 macid;</div><div class='del'>-	u8 wake_match;</div><div class='ctx'> 	u32 bt_rx_rssi_percentage;</div><div class='ctx'> 	u32 macid_valid_entry[2];</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig<br/>new file mode 100644<br/>index 000000000000..55b1bf3dd9b6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+menuconfig RTW88</div><div class='add'>+	tristate "Realtek 802.11ac wireless chips support"</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	help</div><div class='add'>+	  This module adds support for mac80211-based wireless drivers that</div><div class='add'>+	  enables Realtek IEEE 802.11ac wireless chipsets.</div><div class='add'>+</div><div class='add'>+	  If you choose to build a module, it'll be called rtw88.</div><div class='add'>+</div><div class='add'>+if RTW88</div><div class='add'>+</div><div class='add'>+config RTW88_CORE</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config RTW88_PCI</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config RTW88_8822BE</div><div class='add'>+	bool "Realtek 8822BE PCI wireless network adapter"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select RTW88_CORE</div><div class='add'>+	select RTW88_PCI</div><div class='add'>+	help</div><div class='add'>+	  Select this option will enable support for 8822BE chipset</div><div class='add'>+</div><div class='add'>+	  802.11ac PCIe wireless network adapter</div><div class='add'>+</div><div class='add'>+config RTW88_8822CE</div><div class='add'>+	bool "Realtek 8822CE PCI wireless network adapter"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select RTW88_CORE</div><div class='add'>+	select RTW88_PCI</div><div class='add'>+	help</div><div class='add'>+	  Select this option will enable support for 8822CE chipset</div><div class='add'>+</div><div class='add'>+	  802.11ac PCIe wireless network adapter</div><div class='add'>+</div><div class='add'>+config RTW88_DEBUG</div><div class='add'>+	bool "Realtek rtw88 debug support"</div><div class='add'>+	depends on RTW88_CORE</div><div class='add'>+	help</div><div class='add'>+	  Enable debug support</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y to simplify debug problems</div><div class='add'>+</div><div class='add'>+config RTW88_DEBUGFS</div><div class='add'>+	bool "Realtek rtw88 debugfs support"</div><div class='add'>+	depends on RTW88_CORE</div><div class='add'>+	help</div><div class='add'>+	  Enable debug support</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y to simplify debug problems</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/Makefile b/drivers/net/wireless/realtek/rtw88/Makefile<br/>new file mode 100644<br/>index 000000000000..e0bfefd154af<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/Makefile</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_RTW88_CORE)	+= rtw88.o</div><div class='add'>+rtw88-y += main.o \</div><div class='add'>+	   mac80211.o \</div><div class='add'>+	   util.o \</div><div class='add'>+	   debug.o \</div><div class='add'>+	   tx.o \</div><div class='add'>+	   rx.o \</div><div class='add'>+	   mac.o \</div><div class='add'>+	   phy.o \</div><div class='add'>+	   efuse.o \</div><div class='add'>+	   fw.o \</div><div class='add'>+	   ps.o \</div><div class='add'>+	   sec.o \</div><div class='add'>+	   regd.o</div><div class='add'>+</div><div class='add'>+rtw88-$(CONFIG_RTW88_8822BE)	+= rtw8822b.o rtw8822b_table.o</div><div class='add'>+rtw88-$(CONFIG_RTW88_8822CE)	+= rtw8822c.o rtw8822c_table.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_RTW88_PCI)		+= rtwpci.o</div><div class='add'>+rtwpci-objs			:= pci.o</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c<br/>new file mode 100644<br/>index 000000000000..f0ae26018f97<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/debug.c</a></div><div class='hunk'>@@ -0,0 +1,637 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "sec.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RTW88_DEBUGFS</div><div class='add'>+</div><div class='add'>+struct rtw_debugfs_priv {</div><div class='add'>+	struct rtw_dev *rtwdev;</div><div class='add'>+	int (*cb_read)(struct seq_file *m, void *v);</div><div class='add'>+	ssize_t (*cb_write)(struct file *filp, const char __user *buffer,</div><div class='add'>+			    size_t count, loff_t *loff);</div><div class='add'>+	union {</div><div class='add'>+		u32 cb_data;</div><div class='add'>+		u8 *buf;</div><div class='add'>+		struct {</div><div class='add'>+			u32 page_offset;</div><div class='add'>+			u32 page_num;</div><div class='add'>+		} rsvd_page;</div><div class='add'>+		struct {</div><div class='add'>+			u8 rf_path;</div><div class='add'>+			u32 rf_addr;</div><div class='add'>+			u32 rf_mask;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			u32 addr;</div><div class='add'>+			u32 len;</div><div class='add'>+		} read_reg;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtw_debugfs_single_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	return debugfs_priv-&gt;cb_read(m, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_common_write(struct file *filp,</div><div class='add'>+					const char __user *buffer,</div><div class='add'>+					size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return debugfs_priv-&gt;cb_write(filp, buffer, count, loff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_single_write(struct file *filp,</div><div class='add'>+					const char __user *buffer,</div><div class='add'>+					size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seqpriv = (struct seq_file *)filp-&gt;private_data;</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = seqpriv-&gt;private;</div><div class='add'>+</div><div class='add'>+	return debugfs_priv-&gt;cb_write(filp, buffer, count, loff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debugfs_single_open_rw(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	return single_open(filp, rtw_debugfs_single_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debugfs_close(struct inode *inode, struct file *filp)</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 file_operations file_ops_single_r = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = rtw_debugfs_single_open_rw,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = seq_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations file_ops_single_rw = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = rtw_debugfs_single_open_rw,</div><div class='add'>+	.release = single_release,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.write = rtw_debugfs_single_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations file_ops_common_write = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.write = rtw_debugfs_common_write,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.release = rtw_debugfs_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtw_debugfs_get_read_reg(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u32 val, len, addr;</div><div class='add'>+</div><div class='add'>+	len = debugfs_priv-&gt;read_reg.len;</div><div class='add'>+	addr = debugfs_priv-&gt;read_reg.addr;</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		val = rtw_read8(rtwdev, addr);</div><div class='add'>+		seq_printf(m, "reg 0x%03x: 0x%02x\n", addr, val);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		val = rtw_read16(rtwdev, addr);</div><div class='add'>+		seq_printf(m, "reg 0x%03x: 0x%04x\n", addr, val);</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		val = rtw_read32(rtwdev, addr);</div><div class='add'>+		seq_printf(m, "reg 0x%03x: 0x%08x\n", addr, val);</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 int rtw_debugfs_get_rf_read(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u32 val, addr, mask;</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	path = debugfs_priv-&gt;rf_path;</div><div class='add'>+	addr = debugfs_priv-&gt;rf_addr;</div><div class='add'>+	mask = debugfs_priv-&gt;rf_mask;</div><div class='add'>+</div><div class='add'>+	val = rtw_read_rf(rtwdev, path, addr, mask);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "rf_read path:%d addr:0x%08x mask:0x%08x val=0x%08x\n",</div><div class='add'>+		   path, addr, 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 rtw_debugfs_copy_from_user(char tmp[], int size,</div><div class='add'>+				      const char __user *buffer, size_t count,</div><div class='add'>+				      int num)</div><div class='add'>+{</div><div class='add'>+	int tmp_len;</div><div class='add'>+</div><div class='add'>+	if (count &lt; num)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	tmp_len = (count &gt; size - 1 ? size - 1 : count);</div><div class='add'>+</div><div class='add'>+	if (!buffer || copy_from_user(tmp, buffer, tmp_len))</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	tmp[tmp_len] = '\0';</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_set_read_reg(struct file *filp,</div><div class='add'>+					const char __user *buffer,</div><div class='add'>+					size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seqpriv = (struct seq_file *)filp-&gt;private_data;</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = seqpriv-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	char tmp[32 + 1];</div><div class='add'>+	u32 addr, len;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2);</div><div class='add'>+</div><div class='add'>+	num = sscanf(tmp, "%x %x", &amp;addr, &amp;len);</div><div class='add'>+</div><div class='add'>+	if (num !=  2)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	if (len != 1 &amp;&amp; len != 2 &amp;&amp; len != 4) {</div><div class='add'>+		rtw_warn(rtwdev, "read reg setting wrong len\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	debugfs_priv-&gt;read_reg.addr = addr;</div><div class='add'>+	debugfs_priv-&gt;read_reg.len = len;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debugfs_get_dump_cam(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u32 val, command;</div><div class='add'>+	u32 hw_key_idx = debugfs_priv-&gt;cb_data &lt;&lt; RTW_SEC_CAM_ENTRY_SHIFT;</div><div class='add'>+	u32 read_cmd = RTW_SEC_CMD_POLLING;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "cam entry%d\n", debugfs_priv-&gt;cb_data);</div><div class='add'>+	seq_puts(m, "0x0      0x1      0x2     0x3     ");</div><div class='add'>+	seq_puts(m, "0x4     0x5\n");</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	for (i = 0; i &lt;= 5; i++) {</div><div class='add'>+		command = read_cmd | (hw_key_idx + i);</div><div class='add'>+		rtw_write32(rtwdev, RTW_SEC_CMD_REG, command);</div><div class='add'>+		val = rtw_read32(rtwdev, RTW_SEC_READ_REG);</div><div class='add'>+		seq_printf(m, "%8.8x", val);</div><div class='add'>+		if (i &lt; 2)</div><div class='add'>+			seq_puts(m, " ");</div><div class='add'>+	}</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debugfs_get_rsvd_page(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u8 page_size = rtwdev-&gt;chip-&gt;page_size;</div><div class='add'>+	u32 buf_size = debugfs_priv-&gt;rsvd_page.page_num * page_size;</div><div class='add'>+	u32 offset = debugfs_priv-&gt;rsvd_page.page_offset * page_size;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf = vzalloc(buf_size);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = rtw_dump_drv_rsvd_page(rtwdev, offset, buf_size, (u32 *)buf);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to dump rsvd page\n");</div><div class='add'>+		vfree(buf);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; buf_size ; i += 8) {</div><div class='add'>+		if (i % page_size == 0)</div><div class='add'>+			seq_printf(m, "PAGE %d\n", (i + offset) / page_size);</div><div class='add'>+		seq_printf(m, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n",</div><div class='add'>+			   *(buf + i), *(buf + i + 1),</div><div class='add'>+			   *(buf + i + 2), *(buf + i + 3),</div><div class='add'>+			   *(buf + i + 4), *(buf + i + 5),</div><div class='add'>+			   *(buf + i + 6), *(buf + i + 7));</div><div class='add'>+	}</div><div class='add'>+	vfree(buf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_set_rsvd_page(struct file *filp,</div><div class='add'>+					 const char __user *buffer,</div><div class='add'>+					 size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seqpriv = (struct seq_file *)filp-&gt;private_data;</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = seqpriv-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	char tmp[32 + 1];</div><div class='add'>+	u32 offset, page_num;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2);</div><div class='add'>+</div><div class='add'>+	num = sscanf(tmp, "%d %d", &amp;offset, &amp;page_num);</div><div class='add'>+</div><div class='add'>+	if (num != 2) {</div><div class='add'>+		rtw_warn(rtwdev, "invalid arguments\n");</div><div class='add'>+		return num;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debugfs_priv-&gt;rsvd_page.page_offset = offset;</div><div class='add'>+	debugfs_priv-&gt;rsvd_page.page_num = page_num;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_set_single_input(struct file *filp,</div><div class='add'>+					    const char __user *buffer,</div><div class='add'>+					    size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seqpriv = (struct seq_file *)filp-&gt;private_data;</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = seqpriv-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	char tmp[32 + 1];</div><div class='add'>+	u32 input;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1);</div><div class='add'>+</div><div class='add'>+	num = kstrtoint(tmp, 0, &amp;input);</div><div class='add'>+</div><div class='add'>+	if (num) {</div><div class='add'>+		rtw_warn(rtwdev, "kstrtoint failed\n");</div><div class='add'>+		return num;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debugfs_priv-&gt;cb_data = input;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_set_write_reg(struct file *filp,</div><div class='add'>+					 const char __user *buffer,</div><div class='add'>+					 size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	char tmp[32 + 1];</div><div class='add'>+	u32 addr, val, len;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3);</div><div class='add'>+</div><div class='add'>+	/* write BB/MAC register */</div><div class='add'>+	num = sscanf(tmp, "%x %x %x", &amp;addr, &amp;val, &amp;len);</div><div class='add'>+</div><div class='add'>+	if (num !=  3)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_DEBUGFS,</div><div class='add'>+			"reg write8 0x%03x: 0x%08x\n", addr, val);</div><div class='add'>+		rtw_write8(rtwdev, addr, (u8)val);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_DEBUGFS,</div><div class='add'>+			"reg write16 0x%03x: 0x%08x\n", addr, val);</div><div class='add'>+		rtw_write16(rtwdev, addr, (u16)val);</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_DEBUGFS,</div><div class='add'>+			"reg write32 0x%03x: 0x%08x\n", addr, val);</div><div class='add'>+		rtw_write32(rtwdev, addr, (u32)val);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_DEBUGFS,</div><div class='add'>+			"error write length = %d\n", len);</div><div class='add'>+		break;</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 ssize_t rtw_debugfs_set_rf_write(struct file *filp,</div><div class='add'>+					const char __user *buffer,</div><div class='add'>+					size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	char tmp[32 + 1];</div><div class='add'>+	u32 path, addr, mask, val;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 4);</div><div class='add'>+</div><div class='add'>+	num = sscanf(tmp, "%x %x %x %x", &amp;path, &amp;addr, &amp;mask, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (num !=  4) {</div><div class='add'>+		rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n");</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, path, addr, mask, val);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_DEBUGFS,</div><div class='add'>+		"write_rf path:%d addr:0x%08x mask:0x%08x, val:0x%08x\n",</div><div class='add'>+		path, addr, mask, val);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rtw_debugfs_set_rf_read(struct file *filp,</div><div class='add'>+				       const char __user *buffer,</div><div class='add'>+				       size_t count, loff_t *loff)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seqpriv = (struct seq_file *)filp-&gt;private_data;</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = seqpriv-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	char tmp[32 + 1];</div><div class='add'>+	u32 path, addr, mask;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3);</div><div class='add'>+</div><div class='add'>+	num = sscanf(tmp, "%x %x %x", &amp;path, &amp;addr, &amp;mask);</div><div class='add'>+</div><div class='add'>+	if (num !=  3) {</div><div class='add'>+		rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n");</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debugfs_priv-&gt;rf_path = path;</div><div class='add'>+	debugfs_priv-&gt;rf_addr = addr;</div><div class='add'>+	debugfs_priv-&gt;rf_mask = mask;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debug_get_mac_page(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 page = debugfs_priv-&gt;cb_data;</div><div class='add'>+	int i, n;</div><div class='add'>+	int max = 0xff;</div><div class='add'>+</div><div class='add'>+	val = rtw_read32(rtwdev, debugfs_priv-&gt;cb_data);</div><div class='add'>+	for (n = 0; n &lt;= max; ) {</div><div class='add'>+		seq_printf(m, "\n%8.8x  ", n + page);</div><div class='add'>+		for (i = 0; i &lt; 4 &amp;&amp; n &lt;= max; i++, n += 4)</div><div class='add'>+			seq_printf(m, "%8.8x    ",</div><div class='add'>+				   rtw_read32(rtwdev, (page | n)));</div><div class='add'>+	}</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debug_get_bb_page(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 page = debugfs_priv-&gt;cb_data;</div><div class='add'>+	int i, n;</div><div class='add'>+	int max = 0xff;</div><div class='add'>+</div><div class='add'>+	val = rtw_read32(rtwdev, debugfs_priv-&gt;cb_data);</div><div class='add'>+	for (n = 0; n &lt;= max; ) {</div><div class='add'>+		seq_printf(m, "\n%8.8x  ", n + page);</div><div class='add'>+		for (i = 0; i &lt; 4 &amp;&amp; n &lt;= max; i++, n += 4)</div><div class='add'>+			seq_printf(m, "%8.8x    ",</div><div class='add'>+				   rtw_read32(rtwdev, (page | n)));</div><div class='add'>+	}</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_debug_get_rf_dump(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rtw_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='add'>+	struct rtw_dev *rtwdev = debugfs_priv-&gt;rtwdev;</div><div class='add'>+	u32 addr, offset, data;</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; rtwdev-&gt;hal.rf_path_num; path++) {</div><div class='add'>+		seq_printf(m, "RF path:%d\n", path);</div><div class='add'>+		for (addr = 0; addr &lt; 0x100; addr += 4) {</div><div class='add'>+			seq_printf(m, "%8.8x  ", addr);</div><div class='add'>+			for (offset = 0; offset &lt; 4; offset++) {</div><div class='add'>+				data = rtw_read_rf(rtwdev, path, addr + offset,</div><div class='add'>+						   0xffffffff);</div><div class='add'>+				seq_printf(m, "%8.8x    ", data);</div><div class='add'>+			}</div><div class='add'>+			seq_puts(m, "\n");</div><div class='add'>+		}</div><div class='add'>+		seq_puts(m, "\n");</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 rtw_debug_impl_mac(page, addr)				\</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_mac_ ##page = {	\</div><div class='add'>+	.cb_read = rtw_debug_get_mac_page,			\</div><div class='add'>+	.cb_data = addr,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+rtw_debug_impl_mac(0, 0x0000);</div><div class='add'>+rtw_debug_impl_mac(1, 0x0100);</div><div class='add'>+rtw_debug_impl_mac(2, 0x0200);</div><div class='add'>+rtw_debug_impl_mac(3, 0x0300);</div><div class='add'>+rtw_debug_impl_mac(4, 0x0400);</div><div class='add'>+rtw_debug_impl_mac(5, 0x0500);</div><div class='add'>+rtw_debug_impl_mac(6, 0x0600);</div><div class='add'>+rtw_debug_impl_mac(7, 0x0700);</div><div class='add'>+rtw_debug_impl_mac(10, 0x1000);</div><div class='add'>+rtw_debug_impl_mac(11, 0x1100);</div><div class='add'>+rtw_debug_impl_mac(12, 0x1200);</div><div class='add'>+rtw_debug_impl_mac(13, 0x1300);</div><div class='add'>+rtw_debug_impl_mac(14, 0x1400);</div><div class='add'>+rtw_debug_impl_mac(15, 0x1500);</div><div class='add'>+rtw_debug_impl_mac(16, 0x1600);</div><div class='add'>+rtw_debug_impl_mac(17, 0x1700);</div><div class='add'>+</div><div class='add'>+#define rtw_debug_impl_bb(page, addr)			\</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_bb_ ##page = {	\</div><div class='add'>+	.cb_read = rtw_debug_get_bb_page,			\</div><div class='add'>+	.cb_data = addr,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+rtw_debug_impl_bb(8, 0x0800);</div><div class='add'>+rtw_debug_impl_bb(9, 0x0900);</div><div class='add'>+rtw_debug_impl_bb(a, 0x0a00);</div><div class='add'>+rtw_debug_impl_bb(b, 0x0b00);</div><div class='add'>+rtw_debug_impl_bb(c, 0x0c00);</div><div class='add'>+rtw_debug_impl_bb(d, 0x0d00);</div><div class='add'>+rtw_debug_impl_bb(e, 0x0e00);</div><div class='add'>+rtw_debug_impl_bb(f, 0x0f00);</div><div class='add'>+rtw_debug_impl_bb(18, 0x1800);</div><div class='add'>+rtw_debug_impl_bb(19, 0x1900);</div><div class='add'>+rtw_debug_impl_bb(1a, 0x1a00);</div><div class='add'>+rtw_debug_impl_bb(1b, 0x1b00);</div><div class='add'>+rtw_debug_impl_bb(1c, 0x1c00);</div><div class='add'>+rtw_debug_impl_bb(1d, 0x1d00);</div><div class='add'>+rtw_debug_impl_bb(1e, 0x1e00);</div><div class='add'>+rtw_debug_impl_bb(1f, 0x1f00);</div><div class='add'>+rtw_debug_impl_bb(2c, 0x2c00);</div><div class='add'>+rtw_debug_impl_bb(2d, 0x2d00);</div><div class='add'>+rtw_debug_impl_bb(40, 0x4000);</div><div class='add'>+rtw_debug_impl_bb(41, 0x4100);</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_rf_dump = {</div><div class='add'>+	.cb_read = rtw_debug_get_rf_dump,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_write_reg = {</div><div class='add'>+	.cb_write = rtw_debugfs_set_write_reg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_rf_write = {</div><div class='add'>+	.cb_write = rtw_debugfs_set_rf_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_rf_read = {</div><div class='add'>+	.cb_write = rtw_debugfs_set_rf_read,</div><div class='add'>+	.cb_read = rtw_debugfs_get_rf_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_read_reg = {</div><div class='add'>+	.cb_write = rtw_debugfs_set_read_reg,</div><div class='add'>+	.cb_read = rtw_debugfs_get_read_reg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_dump_cam = {</div><div class='add'>+	.cb_write = rtw_debugfs_set_single_input,</div><div class='add'>+	.cb_read = rtw_debugfs_get_dump_cam,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_debugfs_priv rtw_debug_priv_rsvd_page = {</div><div class='add'>+	.cb_write = rtw_debugfs_set_rsvd_page,</div><div class='add'>+	.cb_read = rtw_debugfs_get_rsvd_page,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define rtw_debugfs_add_core(name, mode, fopname, parent)		\</div><div class='add'>+	do {								\</div><div class='add'>+		rtw_debug_priv_ ##name.rtwdev = rtwdev;			\</div><div class='add'>+		if (!debugfs_create_file(#name, mode,			\</div><div class='add'>+					 parent, &amp;rtw_debug_priv_ ##name,\</div><div class='add'>+					 &amp;file_ops_ ##fopname))		\</div><div class='add'>+			pr_debug("Unable to initialize debugfs:%s\n",	\</div><div class='add'>+			       #name);					\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define rtw_debugfs_add_w(name)						\</div><div class='add'>+	rtw_debugfs_add_core(name, S_IFREG | 0222, common_write, debugfs_topdir)</div><div class='add'>+#define rtw_debugfs_add_rw(name)					\</div><div class='add'>+	rtw_debugfs_add_core(name, S_IFREG | 0666, single_rw, debugfs_topdir)</div><div class='add'>+#define rtw_debugfs_add_r(name)						\</div><div class='add'>+	rtw_debugfs_add_core(name, S_IFREG | 0444, single_r, debugfs_topdir)</div><div class='add'>+</div><div class='add'>+void rtw_debugfs_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct dentry *debugfs_topdir = rtwdev-&gt;debugfs;</div><div class='add'>+</div><div class='add'>+	debugfs_topdir = debugfs_create_dir("rtw88",</div><div class='add'>+					    rtwdev-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='add'>+	rtw_debugfs_add_w(write_reg);</div><div class='add'>+	rtw_debugfs_add_rw(read_reg);</div><div class='add'>+	rtw_debugfs_add_w(rf_write);</div><div class='add'>+	rtw_debugfs_add_rw(rf_read);</div><div class='add'>+	rtw_debugfs_add_rw(dump_cam);</div><div class='add'>+	rtw_debugfs_add_rw(rsvd_page);</div><div class='add'>+	rtw_debugfs_add_r(mac_0);</div><div class='add'>+	rtw_debugfs_add_r(mac_1);</div><div class='add'>+	rtw_debugfs_add_r(mac_2);</div><div class='add'>+	rtw_debugfs_add_r(mac_3);</div><div class='add'>+	rtw_debugfs_add_r(mac_4);</div><div class='add'>+	rtw_debugfs_add_r(mac_5);</div><div class='add'>+	rtw_debugfs_add_r(mac_6);</div><div class='add'>+	rtw_debugfs_add_r(mac_7);</div><div class='add'>+	rtw_debugfs_add_r(bb_8);</div><div class='add'>+	rtw_debugfs_add_r(bb_9);</div><div class='add'>+	rtw_debugfs_add_r(bb_a);</div><div class='add'>+	rtw_debugfs_add_r(bb_b);</div><div class='add'>+	rtw_debugfs_add_r(bb_c);</div><div class='add'>+	rtw_debugfs_add_r(bb_d);</div><div class='add'>+	rtw_debugfs_add_r(bb_e);</div><div class='add'>+	rtw_debugfs_add_r(bb_f);</div><div class='add'>+	rtw_debugfs_add_r(mac_10);</div><div class='add'>+	rtw_debugfs_add_r(mac_11);</div><div class='add'>+	rtw_debugfs_add_r(mac_12);</div><div class='add'>+	rtw_debugfs_add_r(mac_13);</div><div class='add'>+	rtw_debugfs_add_r(mac_14);</div><div class='add'>+	rtw_debugfs_add_r(mac_15);</div><div class='add'>+	rtw_debugfs_add_r(mac_16);</div><div class='add'>+	rtw_debugfs_add_r(mac_17);</div><div class='add'>+	rtw_debugfs_add_r(bb_18);</div><div class='add'>+	rtw_debugfs_add_r(bb_19);</div><div class='add'>+	rtw_debugfs_add_r(bb_1a);</div><div class='add'>+	rtw_debugfs_add_r(bb_1b);</div><div class='add'>+	rtw_debugfs_add_r(bb_1c);</div><div class='add'>+	rtw_debugfs_add_r(bb_1d);</div><div class='add'>+	rtw_debugfs_add_r(bb_1e);</div><div class='add'>+	rtw_debugfs_add_r(bb_1f);</div><div class='add'>+	if (rtwdev-&gt;chip-&gt;id == RTW_CHIP_TYPE_8822C) {</div><div class='add'>+		rtw_debugfs_add_r(bb_2c);</div><div class='add'>+		rtw_debugfs_add_r(bb_2d);</div><div class='add'>+		rtw_debugfs_add_r(bb_40);</div><div class='add'>+		rtw_debugfs_add_r(bb_41);</div><div class='add'>+	}</div><div class='add'>+	rtw_debugfs_add_r(rf_dump);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_RTW88_DEBUGFS */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RTW88_DEBUG</div><div class='add'>+</div><div class='add'>+void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask,</div><div class='add'>+	       const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf = {</div><div class='add'>+		.fmt = fmt,</div><div class='add'>+	};</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	if (rtw_debug_mask &amp; mask)</div><div class='add'>+		dev_printk(KERN_DEBUG, rtwdev-&gt;dev, "%pV", &amp;vaf);</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__rtw_dbg);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_RTW88_DEBUG */</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/debug.h b/drivers/net/wireless/realtek/rtw88/debug.h<br/>new file mode 100644<br/>index 000000000000..45851cbbd2ab<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/debug.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_DEBUG_H</div><div class='add'>+#define __RTW_DEBUG_H</div><div class='add'>+</div><div class='add'>+enum rtw_debug_mask {</div><div class='add'>+	RTW_DBG_PCI		= 0x00000001,</div><div class='add'>+	RTW_DBG_TX		= 0x00000002,</div><div class='add'>+	RTW_DBG_RX		= 0x00000004,</div><div class='add'>+	RTW_DBG_PHY		= 0x00000008,</div><div class='add'>+	RTW_DBG_FW		= 0x00000010,</div><div class='add'>+	RTW_DBG_EFUSE		= 0x00000020,</div><div class='add'>+	RTW_DBG_COEX		= 0x00000040,</div><div class='add'>+	RTW_DBG_RFK		= 0x00000080,</div><div class='add'>+	RTW_DBG_REGD		= 0x00000100,</div><div class='add'>+	RTW_DBG_DEBUGFS		= 0x00000200,</div><div class='add'>+</div><div class='add'>+	RTW_DBG_ALL		= 0xffffffff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RTW88_DEBUGFS</div><div class='add'>+</div><div class='add'>+void rtw_debugfs_init(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void rtw_debugfs_init(struct rtw_dev *rtwdev) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_RTW88_DEBUGFS */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RTW88_DEBUG</div><div class='add'>+</div><div class='add'>+__printf(3, 4)</div><div class='add'>+void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask,</div><div class='add'>+	       const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+#define rtw_dbg(rtwdev, a...) __rtw_dbg(rtwdev, ##a)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask,</div><div class='add'>+			   const char *fmt, ...) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_RTW88_DEBUG */</div><div class='add'>+</div><div class='add'>+#define rtw_info(rtwdev, a...) dev_info(rtwdev-&gt;dev, ##a)</div><div class='add'>+#define rtw_warn(rtwdev, a...) dev_warn(rtwdev-&gt;dev, ##a)</div><div class='add'>+#define rtw_err(rtwdev, a...) dev_err(rtwdev-&gt;dev, ##a)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/efuse.c b/drivers/net/wireless/realtek/rtw88/efuse.c<br/>new file mode 100644<br/>index 000000000000..212c8376a8c9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/efuse.c</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "efuse.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+#define RTW_EFUSE_BANK_WIFI		0x0</div><div class='add'>+</div><div class='add'>+static void switch_efuse_bank(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_LDO_EFUSE_CTRL, BIT_MASK_EFUSE_BANK_SEL,</div><div class='add'>+			 RTW_EFUSE_BANK_WIFI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define invalid_efuse_header(hdr1, hdr2) \</div><div class='add'>+	((hdr1) == 0xff || (((hdr1) &amp; 0x1f) == 0xf &amp;&amp; (hdr2) == 0xff))</div><div class='add'>+#define invalid_efuse_content(word_en, i) \</div><div class='add'>+	(((word_en) &amp; BIT(i)) != 0x0)</div><div class='add'>+#define get_efuse_blk_idx_2_byte(hdr1, hdr2) \</div><div class='add'>+	((((hdr2) &amp; 0xf0) &gt;&gt; 1) | (((hdr1) &gt;&gt; 5) &amp; 0x07))</div><div class='add'>+#define get_efuse_blk_idx_1_byte(hdr1) \</div><div class='add'>+	(((hdr1) &amp; 0xf0) &gt;&gt; 4)</div><div class='add'>+#define block_idx_to_logical_idx(blk_idx, i) \</div><div class='add'>+	(((blk_idx) &lt;&lt; 3) + ((i) &lt;&lt; 1))</div><div class='add'>+</div><div class='add'>+/* efuse header format</div><div class='add'>+ *</div><div class='add'>+ * | 7        5   4    0 | 7        4   3          0 | 15  8  7   0 |</div><div class='add'>+ *   block[2:0]   0 1111   block[6:3]   word_en[3:0]   byte0  byte1</div><div class='add'>+ * | header 1 (optional) |          header 2         |    word N    |</div><div class='add'>+ *</div><div class='add'>+ * word_en: 4 bits each word. 0 -&gt; write; 1 -&gt; not write</div><div class='add'>+ * N: 1~4, depends on word_en</div><div class='add'>+ */</div><div class='add'>+static int rtw_dump_logical_efuse_map(struct rtw_dev *rtwdev, u8 *phy_map,</div><div class='add'>+				      u8 *log_map)</div><div class='add'>+{</div><div class='add'>+	u32 physical_size = rtwdev-&gt;efuse.physical_size;</div><div class='add'>+	u32 protect_size = rtwdev-&gt;efuse.protect_size;</div><div class='add'>+	u32 logical_size = rtwdev-&gt;efuse.logical_size;</div><div class='add'>+	u32 phy_idx, log_idx;</div><div class='add'>+	u8 hdr1, hdr2;</div><div class='add'>+	u8 blk_idx;</div><div class='add'>+	u8 word_en;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (phy_idx = 0; phy_idx &lt; physical_size - protect_size;) {</div><div class='add'>+		hdr1 = phy_map[phy_idx];</div><div class='add'>+		hdr2 = phy_map[phy_idx + 1];</div><div class='add'>+		if (invalid_efuse_header(hdr1, hdr2))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if ((hdr1 &amp; 0x1f) == 0xf) {</div><div class='add'>+			/* 2-byte header format */</div><div class='add'>+			blk_idx = get_efuse_blk_idx_2_byte(hdr1, hdr2);</div><div class='add'>+			word_en = hdr2 &amp; 0xf;</div><div class='add'>+			phy_idx += 2;</div><div class='add'>+		} else {</div><div class='add'>+			/* 1-byte header format */</div><div class='add'>+			blk_idx = get_efuse_blk_idx_1_byte(hdr1);</div><div class='add'>+			word_en = hdr1 &amp; 0xf;</div><div class='add'>+			phy_idx += 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			if (invalid_efuse_content(word_en, i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			log_idx = block_idx_to_logical_idx(blk_idx, i);</div><div class='add'>+			if (phy_idx + 1 &gt; physical_size - protect_size ||</div><div class='add'>+			    log_idx + 1 &gt; logical_size)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			log_map[log_idx] = phy_map[phy_idx];</div><div class='add'>+			log_map[log_idx + 1] = phy_map[phy_idx + 1];</div><div class='add'>+			phy_idx += 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'>+static int rtw_dump_physical_efuse_map(struct rtw_dev *rtwdev, u8 *map)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u32 size = rtwdev-&gt;efuse.physical_size;</div><div class='add'>+	u32 efuse_ctl;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 cnt;</div><div class='add'>+</div><div class='add'>+	switch_efuse_bank(rtwdev);</div><div class='add'>+</div><div class='add'>+	/* disable 2.5V LDO */</div><div class='add'>+	chip-&gt;ops-&gt;cfg_ldo25(rtwdev, false);</div><div class='add'>+</div><div class='add'>+	efuse_ctl = rtw_read32(rtwdev, REG_EFUSE_CTRL);</div><div class='add'>+</div><div class='add'>+	for (addr = 0; addr &lt; size; addr++) {</div><div class='add'>+		efuse_ctl &amp;= ~(BIT_MASK_EF_DATA | BITS_EF_ADDR);</div><div class='add'>+		efuse_ctl |= (addr &amp; BIT_MASK_EF_ADDR) &lt;&lt; BIT_SHIFT_EF_ADDR;</div><div class='add'>+		rtw_write32(rtwdev, REG_EFUSE_CTRL, efuse_ctl &amp; (~BIT_EF_FLAG));</div><div class='add'>+</div><div class='add'>+		cnt = 1000000;</div><div class='add'>+		do {</div><div class='add'>+			udelay(1);</div><div class='add'>+			efuse_ctl = rtw_read32(rtwdev, REG_EFUSE_CTRL);</div><div class='add'>+			if (--cnt == 0)</div><div class='add'>+				return -EBUSY;</div><div class='add'>+		} while (!(efuse_ctl &amp; BIT_EF_FLAG));</div><div class='add'>+</div><div class='add'>+		*(map + addr) = (u8)(efuse_ctl &amp; BIT_MASK_EF_DATA);</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 rtw_parse_efuse_map(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u32 phy_size = efuse-&gt;physical_size;</div><div class='add'>+	u32 log_size = efuse-&gt;logical_size;</div><div class='add'>+	u8 *phy_map = NULL;</div><div class='add'>+	u8 *log_map = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	phy_map = kmalloc(phy_size, GFP_KERNEL);</div><div class='add'>+	log_map = kmalloc(log_size, GFP_KERNEL);</div><div class='add'>+	if (!phy_map || !log_map) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_dump_physical_efuse_map(rtwdev, phy_map);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to dump efuse physical map\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(log_map, 0xff, log_size);</div><div class='add'>+	ret = rtw_dump_logical_efuse_map(rtwdev, phy_map, log_map);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to dump efuse logical map\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = chip-&gt;ops-&gt;read_efuse(rtwdev, log_map);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to read efuse map\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(log_map);</div><div class='add'>+	kfree(phy_map);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/efuse.h b/drivers/net/wireless/realtek/rtw88/efuse.h<br/>new file mode 100644<br/>index 000000000000..115bbe85946a<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/efuse.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/efuse.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_EFUSE_H__</div><div class='add'>+#define __RTW_EFUSE_H__</div><div class='add'>+</div><div class='add'>+#define EFUSE_HW_CAP_IGNORE		0</div><div class='add'>+#define EFUSE_HW_CAP_PTCL_VHT		3</div><div class='add'>+#define EFUSE_HW_CAP_SUPP_BW80		7</div><div class='add'>+#define EFUSE_HW_CAP_SUPP_BW40		6</div><div class='add'>+</div><div class='add'>+#define GET_EFUSE_HW_CAP_HCI(hw_cap)					       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(hw_cap) + 0x01), GENMASK(3, 0))</div><div class='add'>+#define GET_EFUSE_HW_CAP_BW(hw_cap)					       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(hw_cap) + 0x01), GENMASK(18, 16))</div><div class='add'>+#define GET_EFUSE_HW_CAP_NSS(hw_cap)					       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(hw_cap) + 0x01), GENMASK(20, 19))</div><div class='add'>+#define GET_EFUSE_HW_CAP_ANT_NUM(hw_cap)				       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(hw_cap) + 0x01), GENMASK(23, 21))</div><div class='add'>+#define GET_EFUSE_HW_CAP_PTCL(hw_cap)					       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(hw_cap) + 0x01), GENMASK(27, 26))</div><div class='add'>+</div><div class='add'>+int rtw_parse_efuse_map(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c<br/>new file mode 100644<br/>index 000000000000..cf4265cda224<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/fw.c</a></div><div class='hunk'>@@ -0,0 +1,633 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+void rtw_fw_c2h_cmd_handle_ext(struct rtw_dev *rtwdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_c2h_cmd *c2h;</div><div class='add'>+	u8 sub_cmd_id;</div><div class='add'>+</div><div class='add'>+	c2h = get_c2h_from_skb(skb);</div><div class='add'>+	sub_cmd_id = c2h-&gt;payload[0];</div><div class='add'>+</div><div class='add'>+	switch (sub_cmd_id) {</div><div class='add'>+	case C2H_CCX_RPT:</div><div class='add'>+		rtw_tx_report_handle(rtwdev, skb);</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'>+void rtw_fw_c2h_cmd_handle(struct rtw_dev *rtwdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_c2h_cmd *c2h;</div><div class='add'>+	u32 pkt_offset;</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	pkt_offset = *((u32 *)skb-&gt;cb);</div><div class='add'>+	c2h = (struct rtw_c2h_cmd *)(skb-&gt;data + pkt_offset);</div><div class='add'>+	len = skb-&gt;len - pkt_offset - 2;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "recv C2H, id=0x%02x, seq=0x%02x, len=%d\n",</div><div class='add'>+		c2h-&gt;id, c2h-&gt;seq, len);</div><div class='add'>+</div><div class='add'>+	switch (c2h-&gt;id) {</div><div class='add'>+	case C2H_HALMAC:</div><div class='add'>+		rtw_fw_c2h_cmd_handle_ext(rtwdev, skb);</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'>+void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, u8 *h2c)</div><div class='add'>+{</div><div class='add'>+	u8 box;</div><div class='add'>+	u8 box_state;</div><div class='add'>+	u32 box_reg, box_ex_reg;</div><div class='add'>+	u32 h2c_wait;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW,</div><div class='add'>+		"send H2C content %02x%02x%02x%02x %02x%02x%02x%02x\n",</div><div class='add'>+		h2c[3], h2c[2], h2c[1], h2c[0],</div><div class='add'>+		h2c[7], h2c[6], h2c[5], h2c[4]);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rtwdev-&gt;h2c.lock);</div><div class='add'>+</div><div class='add'>+	box = rtwdev-&gt;h2c.last_box_num;</div><div class='add'>+	switch (box) {</div><div class='add'>+	case 0:</div><div class='add'>+		box_reg = REG_HMEBOX0;</div><div class='add'>+		box_ex_reg = REG_HMEBOX0_EX;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		box_reg = REG_HMEBOX1;</div><div class='add'>+		box_ex_reg = REG_HMEBOX1_EX;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		box_reg = REG_HMEBOX2;</div><div class='add'>+		box_ex_reg = REG_HMEBOX2_EX;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		box_reg = REG_HMEBOX3;</div><div class='add'>+		box_ex_reg = REG_HMEBOX3_EX;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "invalid h2c mail box number\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	h2c_wait = 20;</div><div class='add'>+	do {</div><div class='add'>+		box_state = rtw_read8(rtwdev, REG_HMETFR);</div><div class='add'>+	} while ((box_state &gt;&gt; box) &amp; 0x1 &amp;&amp; --h2c_wait &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (!h2c_wait) {</div><div class='add'>+		rtw_err(rtwdev, "failed to send h2c command\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; 4; idx++)</div><div class='add'>+		rtw_write8(rtwdev, box_reg + idx, h2c[idx]);</div><div class='add'>+	for (idx = 0; idx &lt; 4; idx++)</div><div class='add'>+		rtw_write8(rtwdev, box_ex_reg + idx, h2c[idx + 4]);</div><div class='add'>+</div><div class='add'>+	if (++rtwdev-&gt;h2c.last_box_num &gt;= 4)</div><div class='add'>+		rtwdev-&gt;h2c.last_box_num = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;rtwdev-&gt;h2c.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_fw_send_h2c_packet(struct rtw_dev *rtwdev, u8 *h2c_pkt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rtwdev-&gt;h2c.lock);</div><div class='add'>+</div><div class='add'>+	FW_OFFLOAD_H2C_SET_SEQ_NUM(h2c_pkt, rtwdev-&gt;h2c.seq);</div><div class='add'>+	ret = rtw_hci_write_data_h2c(rtwdev, h2c_pkt, H2C_PKT_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		rtw_err(rtwdev, "failed to send h2c packet\n");</div><div class='add'>+	rtwdev-&gt;h2c.seq++;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;rtwdev-&gt;h2c.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+rtw_fw_send_general_info(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fifo_conf *fifo = &amp;rtwdev-&gt;fifo;</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+	u16 total_size = H2C_PKT_HDR_SIZE + 4;</div><div class='add'>+</div><div class='add'>+	rtw_h2c_pkt_set_header(h2c_pkt, H2C_PKT_GENERAL_INFO);</div><div class='add'>+</div><div class='add'>+	SET_PKT_H2C_TOTAL_LEN(h2c_pkt, total_size);</div><div class='add'>+</div><div class='add'>+	GENERAL_INFO_SET_FW_TX_BOUNDARY(h2c_pkt,</div><div class='add'>+					fifo-&gt;rsvd_fw_txbuf_addr -</div><div class='add'>+					fifo-&gt;rsvd_boundary);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_packet(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+rtw_fw_send_phydm_info(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+	u16 total_size = H2C_PKT_HDR_SIZE + 8;</div><div class='add'>+	u8 fw_rf_type = 0;</div><div class='add'>+</div><div class='add'>+	if (hal-&gt;rf_type == RF_1T1R)</div><div class='add'>+		fw_rf_type = FW_RF_1T1R;</div><div class='add'>+	else if (hal-&gt;rf_type == RF_2T2R)</div><div class='add'>+		fw_rf_type = FW_RF_2T2R;</div><div class='add'>+</div><div class='add'>+	rtw_h2c_pkt_set_header(h2c_pkt, H2C_PKT_PHYDM_INFO);</div><div class='add'>+</div><div class='add'>+	SET_PKT_H2C_TOTAL_LEN(h2c_pkt, total_size);</div><div class='add'>+	PHYDM_INFO_SET_REF_TYPE(h2c_pkt, efuse-&gt;rfe_option);</div><div class='add'>+	PHYDM_INFO_SET_RF_TYPE(h2c_pkt, fw_rf_type);</div><div class='add'>+	PHYDM_INFO_SET_CUT_VER(h2c_pkt, hal-&gt;cut_version);</div><div class='add'>+	PHYDM_INFO_SET_RX_ANT_STATUS(h2c_pkt, hal-&gt;antenna_tx);</div><div class='add'>+	PHYDM_INFO_SET_TX_ANT_STATUS(h2c_pkt, hal-&gt;antenna_rx);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_packet(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_fw_do_iqk(struct rtw_dev *rtwdev, struct rtw_iqk_para *para)</div><div class='add'>+{</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+	u16 total_size = H2C_PKT_HDR_SIZE + 1;</div><div class='add'>+</div><div class='add'>+	rtw_h2c_pkt_set_header(h2c_pkt, H2C_PKT_IQK);</div><div class='add'>+	SET_PKT_H2C_TOTAL_LEN(h2c_pkt, total_size);</div><div class='add'>+	IQK_SET_CLEAR(h2c_pkt, para-&gt;clear);</div><div class='add'>+	IQK_SET_SEGMENT_IQK(h2c_pkt, para-&gt;segment_iqk);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_packet(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_fw_send_rssi_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)</div><div class='add'>+{</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+	u8 rssi = ewma_rssi_read(&amp;si-&gt;avg_rssi);</div><div class='add'>+	bool stbc_en = si-&gt;stbc_en ? true : false;</div><div class='add'>+</div><div class='add'>+	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_RSSI_MONITOR);</div><div class='add'>+</div><div class='add'>+	SET_RSSI_INFO_MACID(h2c_pkt, si-&gt;mac_id);</div><div class='add'>+	SET_RSSI_INFO_RSSI(h2c_pkt, rssi);</div><div class='add'>+	SET_RSSI_INFO_STBC(h2c_pkt, stbc_en);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)</div><div class='add'>+{</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+	bool no_update = si-&gt;updated;</div><div class='add'>+	bool disable_pt = true;</div><div class='add'>+</div><div class='add'>+	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_RA_INFO);</div><div class='add'>+</div><div class='add'>+	SET_RA_INFO_MACID(h2c_pkt, si-&gt;mac_id);</div><div class='add'>+	SET_RA_INFO_RATE_ID(h2c_pkt, si-&gt;rate_id);</div><div class='add'>+	SET_RA_INFO_INIT_RA_LVL(h2c_pkt, si-&gt;init_ra_lv);</div><div class='add'>+	SET_RA_INFO_SGI_EN(h2c_pkt, si-&gt;sgi_enable);</div><div class='add'>+	SET_RA_INFO_BW_MODE(h2c_pkt, si-&gt;bw_mode);</div><div class='add'>+	SET_RA_INFO_LDPC(h2c_pkt, si-&gt;ldpc_en);</div><div class='add'>+	SET_RA_INFO_NO_UPDATE(h2c_pkt, no_update);</div><div class='add'>+	SET_RA_INFO_VHT_EN(h2c_pkt, si-&gt;vht_enable);</div><div class='add'>+	SET_RA_INFO_DIS_PT(h2c_pkt, disable_pt);</div><div class='add'>+	SET_RA_INFO_RA_MASK0(h2c_pkt, (si-&gt;ra_mask &amp; 0xff));</div><div class='add'>+	SET_RA_INFO_RA_MASK1(h2c_pkt, (si-&gt;ra_mask &amp; 0xff00) &gt;&gt; 8);</div><div class='add'>+	SET_RA_INFO_RA_MASK2(h2c_pkt, (si-&gt;ra_mask &amp; 0xff0000) &gt;&gt; 16);</div><div class='add'>+	SET_RA_INFO_RA_MASK3(h2c_pkt, (si-&gt;ra_mask &amp; 0xff000000) &gt;&gt; 24);</div><div class='add'>+</div><div class='add'>+	si-&gt;init_ra_lv = 0;</div><div class='add'>+	si-&gt;updated = true;</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_fw_media_status_report(struct rtw_dev *rtwdev, u8 mac_id, bool connect)</div><div class='add'>+{</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+</div><div class='add'>+	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_MEDIA_STATUS_RPT);</div><div class='add'>+	MEDIA_STATUS_RPT_SET_OP_MODE(h2c_pkt, connect);</div><div class='add'>+	MEDIA_STATUS_RPT_SET_MACID(h2c_pkt, mac_id);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_fw_set_pwr_mode(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+</div><div class='add'>+	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_SET_PWR_MODE);</div><div class='add'>+</div><div class='add'>+	SET_PWR_MODE_SET_MODE(h2c_pkt, conf-&gt;mode);</div><div class='add'>+	SET_PWR_MODE_SET_RLBM(h2c_pkt, conf-&gt;rlbm);</div><div class='add'>+	SET_PWR_MODE_SET_SMART_PS(h2c_pkt, conf-&gt;smart_ps);</div><div class='add'>+	SET_PWR_MODE_SET_AWAKE_INTERVAL(h2c_pkt, conf-&gt;awake_interval);</div><div class='add'>+	SET_PWR_MODE_SET_PORT_ID(h2c_pkt, conf-&gt;port_id);</div><div class='add'>+	SET_PWR_MODE_SET_PWR_STATE(h2c_pkt, conf-&gt;state);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 rtw_get_rsvd_page_location(struct rtw_dev *rtwdev,</div><div class='add'>+				     enum rtw_rsvd_packet_type type)</div><div class='add'>+{</div><div class='add'>+	struct rtw_rsvd_page *rsvd_pkt;</div><div class='add'>+	u8 location = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rsvd_pkt, &amp;rtwdev-&gt;rsvd_page_list, list) {</div><div class='add'>+		if (type == rsvd_pkt-&gt;type)</div><div class='add'>+			location = rsvd_pkt-&gt;page;</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 rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u8 h2c_pkt[H2C_PKT_SIZE] = {0};</div><div class='add'>+	u8 location = 0;</div><div class='add'>+</div><div class='add'>+	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_RSVD_PAGE);</div><div class='add'>+</div><div class='add'>+	location = rtw_get_rsvd_page_location(rtwdev, RSVD_PROBE_RESP);</div><div class='add'>+	*(h2c_pkt + 1) = location;</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "RSVD_PROBE_RESP loc: %d\n", location);</div><div class='add'>+</div><div class='add'>+	location = rtw_get_rsvd_page_location(rtwdev, RSVD_PS_POLL);</div><div class='add'>+	*(h2c_pkt + 2) = location;</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "RSVD_PS_POLL loc: %d\n", location);</div><div class='add'>+</div><div class='add'>+	location = rtw_get_rsvd_page_location(rtwdev, RSVD_NULL);</div><div class='add'>+	*(h2c_pkt + 3) = location;</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "RSVD_NULL loc: %d\n", location);</div><div class='add'>+</div><div class='add'>+	location = rtw_get_rsvd_page_location(rtwdev, RSVD_QOS_NULL);</div><div class='add'>+	*(h2c_pkt + 4) = location;</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "RSVD_QOS_NULL loc: %d\n", location);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+rtw_beacon_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb_new;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='add'>+	    !ieee80211_vif_is_mesh(vif)) {</div><div class='add'>+		skb_new = alloc_skb(1, GFP_KERNEL);</div><div class='add'>+		if (!skb_new)</div><div class='add'>+			return NULL;</div><div class='add'>+		skb_put(skb_new, 1);</div><div class='add'>+	} else {</div><div class='add'>+		skb_new = ieee80211_beacon_get(hw, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb_new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     enum rtw_rsvd_packet_type type)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb_new;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RSVD_BEACON:</div><div class='add'>+		skb_new = rtw_beacon_get(hw, vif);</div><div class='add'>+		break;</div><div class='add'>+	case RSVD_PS_POLL:</div><div class='add'>+		skb_new = ieee80211_pspoll_get(hw, vif);</div><div class='add'>+		break;</div><div class='add'>+	case RSVD_PROBE_RESP:</div><div class='add'>+		skb_new = ieee80211_proberesp_get(hw, vif);</div><div class='add'>+		break;</div><div class='add'>+	case RSVD_NULL:</div><div class='add'>+		skb_new = ieee80211_nullfunc_get(hw, vif, false);</div><div class='add'>+		break;</div><div class='add'>+	case RSVD_QOS_NULL:</div><div class='add'>+		skb_new = ieee80211_nullfunc_get(hw, vif, true);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb_new)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return skb_new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_fill_rsvd_page_desc(struct rtw_dev *rtwdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_tx_pkt_info pkt_info;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u8 *pkt_desc;</div><div class='add'>+</div><div class='add'>+	memset(&amp;pkt_info, 0, sizeof(pkt_info));</div><div class='add'>+	rtw_rsvd_page_pkt_info_update(rtwdev, &amp;pkt_info, skb);</div><div class='add'>+	pkt_desc = skb_push(skb, chip-&gt;tx_pkt_desc_sz);</div><div class='add'>+	memset(pkt_desc, 0, chip-&gt;tx_pkt_desc_sz);</div><div class='add'>+	rtw_tx_fill_tx_desc(&amp;pkt_info, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 rtw_len_to_page(unsigned int len, u8 page_size)</div><div class='add'>+{</div><div class='add'>+	return DIV_ROUND_UP(len, page_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_rsvd_page_list_to_buf(struct rtw_dev *rtwdev, u8 page_size,</div><div class='add'>+				      u8 page_margin, u32 page, u8 *buf,</div><div class='add'>+				      struct rtw_rsvd_page *rsvd_pkt)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = rsvd_pkt-&gt;skb;</div><div class='add'>+</div><div class='add'>+	if (rsvd_pkt-&gt;add_txdesc)</div><div class='add'>+		rtw_fill_rsvd_page_desc(rtwdev, skb);</div><div class='add'>+</div><div class='add'>+	if (page &gt;= 1)</div><div class='add'>+		memcpy(buf + page_margin + page_size * (page - 1),</div><div class='add'>+		       skb-&gt;data, skb-&gt;len);</div><div class='add'>+	else</div><div class='add'>+		memcpy(buf, skb-&gt;data, skb-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_add_rsvd_page(struct rtw_dev *rtwdev, enum rtw_rsvd_packet_type type,</div><div class='add'>+		       bool txdesc)</div><div class='add'>+{</div><div class='add'>+	struct rtw_rsvd_page *rsvd_pkt;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rsvd_pkt, &amp;rtwdev-&gt;rsvd_page_list, list) {</div><div class='add'>+		if (rsvd_pkt-&gt;type == type)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsvd_pkt = kmalloc(sizeof(*rsvd_pkt), GFP_KERNEL);</div><div class='add'>+	if (!rsvd_pkt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rsvd_pkt-&gt;type = type;</div><div class='add'>+	rsvd_pkt-&gt;add_txdesc = txdesc;</div><div class='add'>+	list_add_tail(&amp;rsvd_pkt-&gt;list, &amp;rtwdev-&gt;rsvd_page_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_reset_rsvd_page(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_rsvd_page *rsvd_pkt, *tmp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rsvd_pkt, tmp, &amp;rtwdev-&gt;rsvd_page_list, list) {</div><div class='add'>+		if (rsvd_pkt-&gt;type == RSVD_BEACON)</div><div class='add'>+			continue;</div><div class='add'>+		list_del(&amp;rsvd_pkt-&gt;list);</div><div class='add'>+		kfree(rsvd_pkt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_fw_write_data_rsvd_page(struct rtw_dev *rtwdev, u16 pg_addr,</div><div class='add'>+				u8 *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	u8 bckp[2];</div><div class='add'>+	u8 val;</div><div class='add'>+	u16 rsvd_pg_head;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pg_addr &amp;= BIT_MASK_BCN_HEAD_1_V1;</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_CTRL_2, pg_addr | BIT_BCN_VALID_V1);</div><div class='add'>+</div><div class='add'>+	val = rtw_read8(rtwdev, REG_CR + 1);</div><div class='add'>+	bckp[0] = val;</div><div class='add'>+	val |= BIT_ENSWBCN &gt;&gt; 8;</div><div class='add'>+	rtw_write8(rtwdev, REG_CR + 1, val);</div><div class='add'>+</div><div class='add'>+	val = rtw_read8(rtwdev, REG_FWHW_TXQ_CTRL + 2);</div><div class='add'>+	bckp[1] = val;</div><div class='add'>+	val &amp;= ~(BIT_EN_BCNQ_DL &gt;&gt; 16);</div><div class='add'>+	rtw_write8(rtwdev, REG_FWHW_TXQ_CTRL + 2, val);</div><div class='add'>+</div><div class='add'>+	ret = rtw_hci_write_data_rsvd_page(rtwdev, buf, size);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to write data to rsvd page\n");</div><div class='add'>+		goto restore;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!check_hw_ready(rtwdev, REG_FIFOPAGE_CTRL_2, BIT_BCN_VALID_V1, 1)) {</div><div class='add'>+		rtw_err(rtwdev, "error beacon valid\n");</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+restore:</div><div class='add'>+	rsvd_pg_head = rtwdev-&gt;fifo.rsvd_boundary;</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_CTRL_2,</div><div class='add'>+		    rsvd_pg_head | BIT_BCN_VALID_V1);</div><div class='add'>+	rtw_write8(rtwdev, REG_FWHW_TXQ_CTRL + 2, bckp[1]);</div><div class='add'>+	rtw_write8(rtwdev, REG_CR + 1, bckp[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 rtw_download_drv_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	u32 pg_size;</div><div class='add'>+	u32 pg_num = 0;</div><div class='add'>+	u16 pg_addr = 0;</div><div class='add'>+</div><div class='add'>+	pg_size = rtwdev-&gt;chip-&gt;page_size;</div><div class='add'>+	pg_num = size / pg_size + ((size &amp; (pg_size - 1)) ? 1 : 0);</div><div class='add'>+	if (pg_num &gt; rtwdev-&gt;fifo.rsvd_drv_pg_num)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pg_addr = rtwdev-&gt;fifo.rsvd_drv_addr;</div><div class='add'>+</div><div class='add'>+	return rtw_fw_write_data_rsvd_page(rtwdev, pg_addr, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev,</div><div class='add'>+			       struct ieee80211_vif *vif, u32 *size)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = rtwdev-&gt;hw;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct sk_buff *iter;</div><div class='add'>+	struct rtw_rsvd_page *rsvd_pkt;</div><div class='add'>+	u32 page = 0;</div><div class='add'>+	u8 total_page = 0;</div><div class='add'>+	u8 page_size, page_margin, tx_desc_sz;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	page_size = chip-&gt;page_size;</div><div class='add'>+	tx_desc_sz = chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	page_margin = page_size - tx_desc_sz;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rsvd_pkt, &amp;rtwdev-&gt;rsvd_page_list, list) {</div><div class='add'>+		iter = rtw_get_rsvd_page_skb(hw, vif, rsvd_pkt-&gt;type);</div><div class='add'>+		if (!iter) {</div><div class='add'>+			rtw_err(rtwdev, "fail to build rsvd packet\n");</div><div class='add'>+			goto release_skb;</div><div class='add'>+		}</div><div class='add'>+		rsvd_pkt-&gt;skb = iter;</div><div class='add'>+		rsvd_pkt-&gt;page = total_page;</div><div class='add'>+		if (rsvd_pkt-&gt;add_txdesc)</div><div class='add'>+			total_page += rtw_len_to_page(iter-&gt;len + tx_desc_sz,</div><div class='add'>+						      page_size);</div><div class='add'>+		else</div><div class='add'>+			total_page += rtw_len_to_page(iter-&gt;len, page_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (total_page &gt; rtwdev-&gt;fifo.rsvd_drv_pg_num) {</div><div class='add'>+		rtw_err(rtwdev, "rsvd page over size: %d\n", total_page);</div><div class='add'>+		goto release_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*size = (total_page - 1) * page_size + page_margin;</div><div class='add'>+	buf = kzalloc(*size, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		goto release_skb;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rsvd_pkt, &amp;rtwdev-&gt;rsvd_page_list, list) {</div><div class='add'>+		rtw_rsvd_page_list_to_buf(rtwdev, page_size, page_margin,</div><div class='add'>+					  page, buf, rsvd_pkt);</div><div class='add'>+		page += rtw_len_to_page(rsvd_pkt-&gt;skb-&gt;len, page_size);</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(rsvd_pkt, &amp;rtwdev-&gt;rsvd_page_list, list)</div><div class='add'>+		kfree_skb(rsvd_pkt-&gt;skb);</div><div class='add'>+</div><div class='add'>+	return buf;</div><div class='add'>+</div><div class='add'>+release_skb:</div><div class='add'>+	list_for_each_entry(rsvd_pkt, &amp;rtwdev-&gt;rsvd_page_list, list)</div><div class='add'>+		kfree_skb(rsvd_pkt-&gt;skb);</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'>+rtw_download_beacon(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = rtwdev-&gt;hw;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	skb = rtw_beacon_get(hw, vif);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		rtw_err(rtwdev, "failed to get beacon skb\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_download_drv_rsvd_page(rtwdev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	if (ret)</div><div class='add'>+		rtw_err(rtwdev, "failed to download drv rsvd page\n");</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</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'>+int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u32 size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf = rtw_build_rsvd_page(rtwdev, vif, &amp;size);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		rtw_err(rtwdev, "failed to build rsvd page pkt\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_download_drv_rsvd_page(rtwdev, buf, size);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to download drv rsvd page\n");</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_download_beacon(rtwdev, vif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to download beacon\n");</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_dump_drv_rsvd_page(struct rtw_dev *rtwdev,</div><div class='add'>+			   u32 offset, u32 size, u32 *buf)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fifo_conf *fifo = &amp;rtwdev-&gt;fifo;</div><div class='add'>+	u32 residue, i;</div><div class='add'>+	u16 start_pg;</div><div class='add'>+	u16 idx = 0;</div><div class='add'>+	u16 ctl;</div><div class='add'>+	u8 rcr;</div><div class='add'>+</div><div class='add'>+	if (size &amp; 0x3) {</div><div class='add'>+		rtw_warn(rtwdev, "should be 4-byte aligned\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset += fifo-&gt;rsvd_boundary &lt;&lt; TX_PAGE_SIZE_SHIFT;</div><div class='add'>+	residue = offset &amp; (FIFO_PAGE_SIZE - 1);</div><div class='add'>+	start_pg = offset &gt;&gt; FIFO_PAGE_SIZE_SHIFT;</div><div class='add'>+	start_pg += RSVD_PAGE_START_ADDR;</div><div class='add'>+</div><div class='add'>+	rcr = rtw_read8(rtwdev, REG_RCR + 2);</div><div class='add'>+	ctl = rtw_read16(rtwdev, REG_PKTBUF_DBG_CTRL) &amp; 0xf000;</div><div class='add'>+</div><div class='add'>+	/* disable rx clock gate */</div><div class='add'>+	rtw_write8(rtwdev, REG_RCR, rcr | BIT(3));</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rtw_write16(rtwdev, REG_PKTBUF_DBG_CTRL, start_pg | ctl);</div><div class='add'>+</div><div class='add'>+		for (i = FIFO_DUMP_ADDR + residue;</div><div class='add'>+		     i &lt; FIFO_DUMP_ADDR + FIFO_PAGE_SIZE; i += 4) {</div><div class='add'>+			buf[idx++] = rtw_read32(rtwdev, i);</div><div class='add'>+			size -= 4;</div><div class='add'>+			if (size == 0)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		residue = 0;</div><div class='add'>+		start_pg++;</div><div class='add'>+	} while (size);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rtw_write16(rtwdev, REG_PKTBUF_DBG_CTRL, ctl);</div><div class='add'>+	rtw_write8(rtwdev, REG_RCR + 2, rcr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/fw.h b/drivers/net/wireless/realtek/rtw88/fw.h<br/>new file mode 100644<br/>index 000000000000..703466393ecb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/fw.h</a></div><div class='hunk'>@@ -0,0 +1,222 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_FW_H_</div><div class='add'>+#define __RTW_FW_H_</div><div class='add'>+</div><div class='add'>+#define H2C_PKT_SIZE		32</div><div class='add'>+#define H2C_PKT_HDR_SIZE	8</div><div class='add'>+</div><div class='add'>+/* FW bin information */</div><div class='add'>+#define FW_HDR_SIZE			64</div><div class='add'>+#define FW_HDR_CHKSUM_SIZE		8</div><div class='add'>+#define FW_HDR_VERSION			4</div><div class='add'>+#define FW_HDR_SUBVERSION		6</div><div class='add'>+#define FW_HDR_SUBINDEX			7</div><div class='add'>+#define FW_HDR_MONTH			16</div><div class='add'>+#define FW_HDR_DATE			17</div><div class='add'>+#define FW_HDR_HOUR			18</div><div class='add'>+#define FW_HDR_MIN			19</div><div class='add'>+#define FW_HDR_YEAR			20</div><div class='add'>+#define FW_HDR_MEM_USAGE		24</div><div class='add'>+#define FW_HDR_H2C_FMT_VER		28</div><div class='add'>+#define FW_HDR_DMEM_ADDR		32</div><div class='add'>+#define FW_HDR_DMEM_SIZE		36</div><div class='add'>+#define FW_HDR_IMEM_SIZE		48</div><div class='add'>+#define FW_HDR_EMEM_SIZE		52</div><div class='add'>+#define FW_HDR_EMEM_ADDR		56</div><div class='add'>+#define FW_HDR_IMEM_ADDR		60</div><div class='add'>+</div><div class='add'>+#define FIFO_PAGE_SIZE_SHIFT		12</div><div class='add'>+#define FIFO_PAGE_SIZE			4096</div><div class='add'>+#define RSVD_PAGE_START_ADDR		0x780</div><div class='add'>+#define FIFO_DUMP_ADDR			0x8000</div><div class='add'>+</div><div class='add'>+enum rtw_c2h_cmd_id {</div><div class='add'>+	C2H_BT_INFO = 0x09,</div><div class='add'>+	C2H_HW_FEATURE_REPORT = 0x19,</div><div class='add'>+	C2H_HW_FEATURE_DUMP = 0xfd,</div><div class='add'>+	C2H_HALMAC = 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_c2h_cmd_id_ext {</div><div class='add'>+	C2H_CCX_RPT = 0x0f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_c2h_cmd {</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 seq;</div><div class='add'>+	u8 payload[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum rtw_rsvd_packet_type {</div><div class='add'>+	RSVD_BEACON,</div><div class='add'>+	RSVD_PS_POLL,</div><div class='add'>+	RSVD_PROBE_RESP,</div><div class='add'>+	RSVD_NULL,</div><div class='add'>+	RSVD_QOS_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_fw_rf_type {</div><div class='add'>+	FW_RF_1T2R = 0,</div><div class='add'>+	FW_RF_2T4R = 1,</div><div class='add'>+	FW_RF_2T2R = 2,</div><div class='add'>+	FW_RF_2T3R = 3,</div><div class='add'>+	FW_RF_1T1R = 4,</div><div class='add'>+	FW_RF_2T2R_GREEN = 5,</div><div class='add'>+	FW_RF_3T3R = 6,</div><div class='add'>+	FW_RF_3T4R = 7,</div><div class='add'>+	FW_RF_4T4R = 8,</div><div class='add'>+	FW_RF_MAX_TYPE = 0xF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_iqk_para {</div><div class='add'>+	u8 clear;</div><div class='add'>+	u8 segment_iqk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_rsvd_page {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	enum rtw_rsvd_packet_type type;</div><div class='add'>+	u8 page;</div><div class='add'>+	bool add_txdesc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* C2H */</div><div class='add'>+#define GET_CCX_REPORT_SEQNUM(c2h_payload)	(c2h_payload[8] &amp; 0xfc)</div><div class='add'>+#define GET_CCX_REPORT_STATUS(c2h_payload)	(c2h_payload[9] &amp; 0xc0)</div><div class='add'>+</div><div class='add'>+/* PKT H2C */</div><div class='add'>+#define H2C_PKT_CMD_ID 0xFF</div><div class='add'>+#define H2C_PKT_CATEGORY 0x01</div><div class='add'>+</div><div class='add'>+#define H2C_PKT_GENERAL_INFO 0x0D</div><div class='add'>+#define H2C_PKT_PHYDM_INFO 0x11</div><div class='add'>+#define H2C_PKT_IQK 0x0E</div><div class='add'>+</div><div class='add'>+#define SET_PKT_H2C_CATEGORY(h2c_pkt, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(6, 0))</div><div class='add'>+#define SET_PKT_H2C_CMD_ID(h2c_pkt, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(15, 8))</div><div class='add'>+#define SET_PKT_H2C_SUB_CMD_ID(h2c_pkt, value)                                 \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(31, 16))</div><div class='add'>+#define SET_PKT_H2C_TOTAL_LEN(h2c_pkt, value)                                  \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(15, 0))</div><div class='add'>+</div><div class='add'>+static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id)</div><div class='add'>+{</div><div class='add'>+	SET_PKT_H2C_CATEGORY(h2c_pkt, H2C_PKT_CATEGORY);</div><div class='add'>+	SET_PKT_H2C_CMD_ID(h2c_pkt, H2C_PKT_CMD_ID);</div><div class='add'>+	SET_PKT_H2C_SUB_CMD_ID(h2c_pkt, sub_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FW_OFFLOAD_H2C_SET_SEQ_NUM(h2c_pkt, value)                             \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(31, 16))</div><div class='add'>+#define GENERAL_INFO_SET_FW_TX_BOUNDARY(h2c_pkt, value)                        \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, GENMASK(23, 16))</div><div class='add'>+</div><div class='add'>+#define PHYDM_INFO_SET_REF_TYPE(h2c_pkt, value)                                \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, GENMASK(7, 0))</div><div class='add'>+#define PHYDM_INFO_SET_RF_TYPE(h2c_pkt, value)                                 \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, GENMASK(15, 8))</div><div class='add'>+#define PHYDM_INFO_SET_CUT_VER(h2c_pkt, value)                                 \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, GENMASK(23, 16))</div><div class='add'>+#define PHYDM_INFO_SET_RX_ANT_STATUS(h2c_pkt, value)                           \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, GENMASK(27, 24))</div><div class='add'>+#define PHYDM_INFO_SET_TX_ANT_STATUS(h2c_pkt, value)                           \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, GENMASK(31, 28))</div><div class='add'>+#define IQK_SET_CLEAR(h2c_pkt, value)                                          \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, BIT(0))</div><div class='add'>+#define IQK_SET_SEGMENT_IQK(h2c_pkt, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x02, value, BIT(1))</div><div class='add'>+</div><div class='add'>+/* Command H2C */</div><div class='add'>+#define H2C_CMD_RSVD_PAGE		0x0</div><div class='add'>+#define H2C_CMD_MEDIA_STATUS_RPT	0x01</div><div class='add'>+#define H2C_CMD_SET_PWR_MODE		0x20</div><div class='add'>+#define H2C_CMD_RA_INFO			0x40</div><div class='add'>+#define H2C_CMD_RSSI_MONITOR		0x42</div><div class='add'>+</div><div class='add'>+#define SET_H2C_CMD_ID_CLASS(h2c_pkt, value)				       \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(7, 0))</div><div class='add'>+</div><div class='add'>+#define MEDIA_STATUS_RPT_SET_OP_MODE(h2c_pkt, value)                           \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(8))</div><div class='add'>+#define MEDIA_STATUS_RPT_SET_MACID(h2c_pkt, value)                             \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(23, 16))</div><div class='add'>+</div><div class='add'>+#define SET_PWR_MODE_SET_MODE(h2c_pkt, value)                                  \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(14, 8))</div><div class='add'>+#define SET_PWR_MODE_SET_RLBM(h2c_pkt, value)                                  \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(19, 16))</div><div class='add'>+#define SET_PWR_MODE_SET_SMART_PS(h2c_pkt, value)                              \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(23, 20))</div><div class='add'>+#define SET_PWR_MODE_SET_AWAKE_INTERVAL(h2c_pkt, value)                        \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(31, 24))</div><div class='add'>+#define SET_PWR_MODE_SET_PORT_ID(h2c_pkt, value)                               \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(7, 5))</div><div class='add'>+#define SET_PWR_MODE_SET_PWR_STATE(h2c_pkt, value)                             \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(15, 8))</div><div class='add'>+#define SET_RSSI_INFO_MACID(h2c_pkt, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(15, 8))</div><div class='add'>+#define SET_RSSI_INFO_RSSI(h2c_pkt, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(31, 24))</div><div class='add'>+#define SET_RSSI_INFO_STBC(h2c_pkt, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, BIT(1))</div><div class='add'>+#define SET_RA_INFO_MACID(h2c_pkt, value)                                      \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(15, 8))</div><div class='add'>+#define SET_RA_INFO_RATE_ID(h2c_pkt, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(20, 16))</div><div class='add'>+#define SET_RA_INFO_INIT_RA_LVL(h2c_pkt, value)                                \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(22, 21))</div><div class='add'>+#define SET_RA_INFO_SGI_EN(h2c_pkt, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(23))</div><div class='add'>+#define SET_RA_INFO_BW_MODE(h2c_pkt, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(25, 24))</div><div class='add'>+#define SET_RA_INFO_LDPC(h2c_pkt, value)                                       \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(26))</div><div class='add'>+#define SET_RA_INFO_NO_UPDATE(h2c_pkt, value)                                  \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(27))</div><div class='add'>+#define SET_RA_INFO_VHT_EN(h2c_pkt, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(29, 28))</div><div class='add'>+#define SET_RA_INFO_DIS_PT(h2c_pkt, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(30))</div><div class='add'>+#define SET_RA_INFO_RA_MASK0(h2c_pkt, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(7, 0))</div><div class='add'>+#define SET_RA_INFO_RA_MASK1(h2c_pkt, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(15, 8))</div><div class='add'>+#define SET_RA_INFO_RA_MASK2(h2c_pkt, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(23, 16))</div><div class='add'>+#define SET_RA_INFO_RA_MASK3(h2c_pkt, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(31, 24))</div><div class='add'>+</div><div class='add'>+static inline struct rtw_c2h_cmd *get_c2h_from_skb(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 pkt_offset;</div><div class='add'>+</div><div class='add'>+	pkt_offset = *((u32 *)skb-&gt;cb);</div><div class='add'>+	return (struct rtw_c2h_cmd *)(skb-&gt;data + pkt_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_fw_c2h_cmd_handle(struct rtw_dev *rtwdev, struct sk_buff *skb);</div><div class='add'>+void rtw_fw_send_general_info(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_fw_send_phydm_info(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+void rtw_fw_do_iqk(struct rtw_dev *rtwdev, struct rtw_iqk_para *para);</div><div class='add'>+void rtw_fw_set_pwr_mode(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_fw_send_rssi_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si);</div><div class='add'>+void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si);</div><div class='add'>+void rtw_fw_media_status_report(struct rtw_dev *rtwdev, u8 mac_id, bool conn);</div><div class='add'>+void rtw_add_rsvd_page(struct rtw_dev *rtwdev, enum rtw_rsvd_packet_type type,</div><div class='add'>+		       bool txdesc);</div><div class='add'>+int rtw_fw_write_data_rsvd_page(struct rtw_dev *rtwdev, u16 pg_addr,</div><div class='add'>+				u8 *buf, u32 size);</div><div class='add'>+void rtw_reset_rsvd_page(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev,</div><div class='add'>+			      struct ieee80211_vif *vif);</div><div class='add'>+void rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_dump_drv_rsvd_page(struct rtw_dev *rtwdev,</div><div class='add'>+			   u32 offset, u32 size, u32 *buf);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/hci.h b/drivers/net/wireless/realtek/rtw88/hci.h<br/>new file mode 100644<br/>index 000000000000..2676582a85a0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/hci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/hci.h</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef	__RTW_HCI_H__</div><div class='add'>+#define __RTW_HCI_H__</div><div class='add'>+</div><div class='add'>+/* ops for PCI, USB and SDIO */</div><div class='add'>+struct rtw_hci_ops {</div><div class='add'>+	int (*tx)(struct rtw_dev *rtwdev,</div><div class='add'>+		  struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+		  struct sk_buff *skb);</div><div class='add'>+	int (*setup)(struct rtw_dev *rtwdev);</div><div class='add'>+	int (*start)(struct rtw_dev *rtwdev);</div><div class='add'>+	void (*stop)(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+	int (*write_data_rsvd_page)(struct rtw_dev *rtwdev, u8 *buf, u32 size);</div><div class='add'>+	int (*write_data_h2c)(struct rtw_dev *rtwdev, u8 *buf, u32 size);</div><div class='add'>+</div><div class='add'>+	u8 (*read8)(struct rtw_dev *rtwdev, u32 addr);</div><div class='add'>+	u16 (*read16)(struct rtw_dev *rtwdev, u32 addr);</div><div class='add'>+	u32 (*read32)(struct rtw_dev *rtwdev, u32 addr);</div><div class='add'>+	void (*write8)(struct rtw_dev *rtwdev, u32 addr, u8 val);</div><div class='add'>+	void (*write16)(struct rtw_dev *rtwdev, u32 addr, u16 val);</div><div class='add'>+	void (*write32)(struct rtw_dev *rtwdev, u32 addr, u32 val);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int rtw_hci_tx(struct rtw_dev *rtwdev,</div><div class='add'>+			     struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;tx(rtwdev, pkt_info, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rtw_hci_setup(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;setup(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rtw_hci_start(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;start(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_hci_stop(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtwdev-&gt;hci.ops-&gt;stop(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+rtw_hci_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;write_data_rsvd_page(rtwdev, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+rtw_hci_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;write_data_h2c(rtwdev, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 rtw_read8(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;read8(rtwdev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 rtw_read16(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;read16(rtwdev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 rtw_read32(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.ops-&gt;read32(rtwdev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write8(struct rtw_dev *rtwdev, u32 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	rtwdev-&gt;hci.ops-&gt;write8(rtwdev, addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write16(struct rtw_dev *rtwdev, u32 addr, u16 val)</div><div class='add'>+{</div><div class='add'>+	rtwdev-&gt;hci.ops-&gt;write16(rtwdev, addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write32(struct rtw_dev *rtwdev, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	rtwdev-&gt;hci.ops-&gt;write32(rtwdev, addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write8_set(struct rtw_dev *rtwdev, u32 addr, u8 bit)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = rtw_read8(rtwdev, addr);</div><div class='add'>+	rtw_write8(rtwdev, addr, val | bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_writ16_set(struct rtw_dev *rtwdev, u32 addr, u16 bit)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	val = rtw_read16(rtwdev, addr);</div><div class='add'>+	rtw_write16(rtwdev, addr, val | bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write32_set(struct rtw_dev *rtwdev, u32 addr, u32 bit)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = rtw_read32(rtwdev, addr);</div><div class='add'>+	rtw_write32(rtwdev, addr, val | bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write8_clr(struct rtw_dev *rtwdev, u32 addr, u8 bit)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = rtw_read8(rtwdev, addr);</div><div class='add'>+	rtw_write8(rtwdev, addr, val &amp; ~bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write16_clr(struct rtw_dev *rtwdev, u32 addr, u16 bit)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	val = rtw_read16(rtwdev, addr);</div><div class='add'>+	rtw_write16(rtwdev, addr, val &amp; ~bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_write32_clr(struct rtw_dev *rtwdev, u32 addr, u32 bit)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = rtw_read32(rtwdev, addr);</div><div class='add'>+	rtw_write32(rtwdev, addr, val &amp; ~bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+rtw_read_rf(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+	    u32 addr, u32 mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rtwdev-&gt;rf_lock, flags);</div><div class='add'>+	val = rtwdev-&gt;chip-&gt;ops-&gt;read_rf(rtwdev, rf_path, addr, mask);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtwdev-&gt;rf_lock, flags);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+rtw_write_rf(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+	     u32 addr, u32 mask, u32 data)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rtwdev-&gt;rf_lock, flags);</div><div class='add'>+	rtwdev-&gt;chip-&gt;ops-&gt;write_rf(rtwdev, rf_path, addr, mask, data);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtwdev-&gt;rf_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+rtw_read32_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 shift = __ffs(mask);</div><div class='add'>+	u32 orig;</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='add'>+	orig = rtw_read32(rtwdev, addr);</div><div class='add'>+	ret = (orig &amp; mask) &gt;&gt; shift;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+rtw_write32_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)</div><div class='add'>+{</div><div class='add'>+	u32 shift = __ffs(mask);</div><div class='add'>+	u32 orig;</div><div class='add'>+	u32 set;</div><div class='add'>+</div><div class='add'>+	WARN(addr &amp; 0x3, "should be 4-byte aligned, addr = 0x%08x\n", addr);</div><div class='add'>+</div><div class='add'>+	orig = rtw_read32(rtwdev, addr);</div><div class='add'>+	set = (orig &amp; ~mask) | ((data &lt;&lt; shift) &amp; mask);</div><div class='add'>+	rtw_write32(rtwdev, addr, set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+rtw_write8_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u8 data)</div><div class='add'>+{</div><div class='add'>+	u32 shift;</div><div class='add'>+	u8 orig, set;</div><div class='add'>+</div><div class='add'>+	mask &amp;= 0xff;</div><div class='add'>+	shift = __ffs(mask);</div><div class='add'>+</div><div class='add'>+	orig = rtw_read8(rtwdev, addr);</div><div class='add'>+	set = (orig &amp; ~mask) | ((data &lt;&lt; shift) &amp; mask);</div><div class='add'>+	rtw_write8(rtwdev, addr, set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum rtw_hci_type rtw_hci_type(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	return rtwdev-&gt;hci.type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c<br/>new file mode 100644<br/>index 000000000000..25a923bc6366<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/mac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/mac.c</a></div><div class='hunk'>@@ -0,0 +1,965 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+void rtw_set_channel_mac(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+			 u8 primary_ch_idx)</div><div class='add'>+{</div><div class='add'>+	u8 txsc40 = 0, txsc20 = 0;</div><div class='add'>+	u32 value32;</div><div class='add'>+	u8 value8;</div><div class='add'>+</div><div class='add'>+	txsc20 = primary_ch_idx;</div><div class='add'>+	if (txsc20 == 1 || txsc20 == 3)</div><div class='add'>+		txsc40 = 9;</div><div class='add'>+	else</div><div class='add'>+		txsc40 = 10;</div><div class='add'>+	rtw_write8(rtwdev, REG_DATA_SC,</div><div class='add'>+		   BIT_TXSC_20M(txsc20) | BIT_TXSC_40M(txsc40));</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_WMAC_TRXPTCL_CTL);</div><div class='add'>+	value32 &amp;= ~BIT_RFMOD;</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case RTW_CHANNEL_WIDTH_80:</div><div class='add'>+		value32 |= BIT_RFMOD_80M;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		value32 |= BIT_RFMOD_40M;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	rtw_write32(rtwdev, REG_WMAC_TRXPTCL_CTL, value32);</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_AFE_CTRL1) &amp; ~(BIT_MAC_CLK_SEL);</div><div class='add'>+	value32 |= (MAC_CLK_HW_DEF_80M &lt;&lt; BIT_SHIFT_MAC_CLK_SEL);</div><div class='add'>+	rtw_write32(rtwdev, REG_AFE_CTRL1, value32);</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_USTIME_TSF, MAC_CLK_SPEED);</div><div class='add'>+	rtw_write8(rtwdev, REG_USTIME_EDCA, MAC_CLK_SPEED);</div><div class='add'>+</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_CCK_CHECK);</div><div class='add'>+	value8 = value8 &amp; ~BIT_CHECK_CCK_EN;</div><div class='add'>+	if (channel &gt; 35)</div><div class='add'>+		value8 |= BIT_CHECK_CCK_EN;</div><div class='add'>+	rtw_write8(rtwdev, REG_CCK_CHECK, value8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_mac_pre_system_cfg(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u32 value32;</div><div class='add'>+	u8 value8;</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_RSV_CTRL, 0);</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_BT_DIG_CLK_EN);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_HCI_TYPE_USB:</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'>+	/* config PIN Mux */</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_PAD_CTRL1);</div><div class='add'>+	value32 |= BIT_PAPE_WLBT_SEL | BIT_LNAON_WLBT_SEL;</div><div class='add'>+	rtw_write32(rtwdev, REG_PAD_CTRL1, value32);</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_LED_CFG);</div><div class='add'>+	value32 &amp;= ~(BIT_PAPE_SEL_EN | BIT_LNAON_SEL_EN);</div><div class='add'>+	rtw_write32(rtwdev, REG_LED_CFG, value32);</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_GPIO_MUXCFG);</div><div class='add'>+	value32 |= BIT_WLRFE_4_5_EN;</div><div class='add'>+	rtw_write32(rtwdev, REG_GPIO_MUXCFG, value32);</div><div class='add'>+</div><div class='add'>+	/* disable BB/RF */</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_SYS_FUNC_EN);</div><div class='add'>+	value8 &amp;= ~(BIT_FEN_BB_RSTB | BIT_FEN_BB_GLB_RST);</div><div class='add'>+	rtw_write8(rtwdev, REG_SYS_FUNC_EN, value8);</div><div class='add'>+</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_RF_CTRL);</div><div class='add'>+	value8 &amp;= ~(BIT_RF_SDM_RSTB | BIT_RF_RSTB | BIT_RF_EN);</div><div class='add'>+	rtw_write8(rtwdev, REG_RF_CTRL, value8);</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_WLRF1);</div><div class='add'>+	value32 &amp;= ~BIT_WLRF1_BBRF_EN;</div><div class='add'>+	rtw_write32(rtwdev, REG_WLRF1, value32);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pwr_cmd_polling(struct rtw_dev *rtwdev,</div><div class='add'>+			       struct rtw_pwr_seq_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	u8 value;</div><div class='add'>+	u8 flag = 0;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 cnt = RTW_PWR_POLLING_CNT;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;base == RTW_PWR_ADDR_SDIO)</div><div class='add'>+		offset = cmd-&gt;offset | SDIO_LOCAL_OFFSET;</div><div class='add'>+	else</div><div class='add'>+		offset = cmd-&gt;offset;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		cnt--;</div><div class='add'>+		value = rtw_read8(rtwdev, offset);</div><div class='add'>+		value &amp;= cmd-&gt;mask;</div><div class='add'>+		if (value == (cmd-&gt;value &amp; cmd-&gt;mask))</div><div class='add'>+			return 0;</div><div class='add'>+		if (cnt == 0) {</div><div class='add'>+			if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_PCIE &amp;&amp;</div><div class='add'>+			    flag == 0) {</div><div class='add'>+				value = rtw_read8(rtwdev, REG_SYS_PW_CTRL);</div><div class='add'>+				value |= BIT(3);</div><div class='add'>+				rtw_write8(rtwdev, REG_SYS_PW_CTRL, value);</div><div class='add'>+				value &amp;= ~BIT(3);</div><div class='add'>+				rtw_write8(rtwdev, REG_SYS_PW_CTRL, value);</div><div class='add'>+				cnt = RTW_PWR_POLLING_CNT;</div><div class='add'>+				flag = 1;</div><div class='add'>+			} else {</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			udelay(50);</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_sub_pwr_seq_parser(struct rtw_dev *rtwdev, u8 intf_mask,</div><div class='add'>+				  u8 cut_mask, struct rtw_pwr_seq_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pwr_seq_cmd *cur_cmd;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u8 value;</div><div class='add'>+</div><div class='add'>+	for (cur_cmd = cmd; cur_cmd-&gt;cmd != RTW_PWR_CMD_END; cur_cmd++) {</div><div class='add'>+		if (!(cur_cmd-&gt;intf_mask &amp; intf_mask) ||</div><div class='add'>+		    !(cur_cmd-&gt;cut_mask &amp; cut_mask))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (cur_cmd-&gt;cmd) {</div><div class='add'>+		case RTW_PWR_CMD_WRITE:</div><div class='add'>+			offset = cur_cmd-&gt;offset;</div><div class='add'>+</div><div class='add'>+			if (cur_cmd-&gt;base == RTW_PWR_ADDR_SDIO)</div><div class='add'>+				offset |= SDIO_LOCAL_OFFSET;</div><div class='add'>+</div><div class='add'>+			value = rtw_read8(rtwdev, offset);</div><div class='add'>+			value &amp;= ~cur_cmd-&gt;mask;</div><div class='add'>+			value |= (cur_cmd-&gt;value &amp; cur_cmd-&gt;mask);</div><div class='add'>+			rtw_write8(rtwdev, offset, value);</div><div class='add'>+			break;</div><div class='add'>+		case RTW_PWR_CMD_POLLING:</div><div class='add'>+			if (rtw_pwr_cmd_polling(rtwdev, cur_cmd))</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		case RTW_PWR_CMD_DELAY:</div><div class='add'>+			if (cur_cmd-&gt;value == RTW_PWR_DELAY_US)</div><div class='add'>+				udelay(cur_cmd-&gt;offset);</div><div class='add'>+			else</div><div class='add'>+				mdelay(cur_cmd-&gt;offset);</div><div class='add'>+			break;</div><div class='add'>+		case RTW_PWR_CMD_READ:</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 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pwr_seq_parser(struct rtw_dev *rtwdev,</div><div class='add'>+			      struct rtw_pwr_seq_cmd **cmd_seq)</div><div class='add'>+{</div><div class='add'>+	u8 cut_mask;</div><div class='add'>+	u8 intf_mask;</div><div class='add'>+	u8 cut;</div><div class='add'>+	u32 idx = 0;</div><div class='add'>+	struct rtw_pwr_seq_cmd *cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cut = rtwdev-&gt;hal.cut_version;</div><div class='add'>+	cut_mask = cut_version_to_mask(cut);</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		intf_mask = BIT(2);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_HCI_TYPE_USB:</div><div class='add'>+		intf_mask = BIT(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'>+	do {</div><div class='add'>+		cmd = cmd_seq[idx];</div><div class='add'>+		if (!cmd)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = rtw_sub_pwr_seq_parser(rtwdev, intf_mask, cut_mask, cmd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		idx++;</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 rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_pwr_seq_cmd **pwr_seq;</div><div class='add'>+	u8 rpwm;</div><div class='add'>+	bool cur_pwr;</div><div class='add'>+</div><div class='add'>+	rpwm = rtw_read8(rtwdev, rtwdev-&gt;hci.rpwm_addr);</div><div class='add'>+</div><div class='add'>+	/* Check FW still exist or not */</div><div class='add'>+	if (rtw_read16(rtwdev, REG_MCUFW_CTRL) == 0xC078) {</div><div class='add'>+		rpwm = (rpwm ^ BIT_RPWM_TOGGLE) &amp; BIT_RPWM_TOGGLE;</div><div class='add'>+		rtw_write8(rtwdev, rtwdev-&gt;hci.rpwm_addr, rpwm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rtw_read8(rtwdev, REG_CR) == 0xea)</div><div class='add'>+		cur_pwr = false;</div><div class='add'>+	else if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB &amp;&amp;</div><div class='add'>+		 (rtw_read8(rtwdev, REG_SYS_STATUS1 + 1) &amp; BIT(0)))</div><div class='add'>+		cur_pwr = false;</div><div class='add'>+	else</div><div class='add'>+		cur_pwr = true;</div><div class='add'>+</div><div class='add'>+	if (pwr_on &amp;&amp; cur_pwr)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	pwr_seq = pwr_on ? chip-&gt;pwr_on_seq : chip-&gt;pwr_off_seq;</div><div class='add'>+	if (rtw_pwr_seq_parser(rtwdev, pwr_seq))</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 rtw_mac_init_system_cfg(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u8 sys_func_en = rtwdev-&gt;chip-&gt;sys_func_en;</div><div class='add'>+	u8 value8;</div><div class='add'>+	u32 value, tmp;</div><div class='add'>+</div><div class='add'>+	value = rtw_read32(rtwdev, REG_CPU_DMEM_CON);</div><div class='add'>+	value |= BIT_WL_PLATFORM_RST | BIT_DDMA_EN;</div><div class='add'>+	rtw_write32(rtwdev, REG_CPU_DMEM_CON, value);</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_SYS_FUNC_EN + 1, sys_func_en);</div><div class='add'>+	value8 = (rtw_read8(rtwdev, REG_CR_EXT + 3) &amp; 0xF0) | 0x0C;</div><div class='add'>+	rtw_write8(rtwdev, REG_CR_EXT + 3, value8);</div><div class='add'>+</div><div class='add'>+	/* disable boot-from-flash for driver's DL FW */</div><div class='add'>+	tmp = rtw_read32(rtwdev, REG_MCUFW_CTRL);</div><div class='add'>+	if (tmp &amp; BIT_BOOT_FSPI_EN) {</div><div class='add'>+		rtw_write32(rtwdev, REG_MCUFW_CTRL, tmp &amp; (~BIT_BOOT_FSPI_EN));</div><div class='add'>+		value = rtw_read32(rtwdev, REG_GPIO_MUXCFG) &amp; (~BIT_FSPI_EN);</div><div class='add'>+		rtw_write32(rtwdev, REG_GPIO_MUXCFG, value);</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 rtw_mac_power_on(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = rtw_mac_pre_system_cfg(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = rtw_mac_power_switch(rtwdev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = rtw_mac_init_system_cfg(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	rtw_err(rtwdev, "mac power on failed");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_mac_power_off(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_mac_power_switch(rtwdev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_firmware_size(const u8 *data, u32 size)</div><div class='add'>+{</div><div class='add'>+	u32 dmem_size;</div><div class='add'>+	u32 imem_size;</div><div class='add'>+	u32 emem_size;</div><div class='add'>+	u32 real_size;</div><div class='add'>+</div><div class='add'>+	dmem_size = le32_to_cpu(*((__le32 *)(data + FW_HDR_DMEM_SIZE)));</div><div class='add'>+	imem_size = le32_to_cpu(*((__le32 *)(data + FW_HDR_IMEM_SIZE)));</div><div class='add'>+	emem_size = ((*(data + FW_HDR_MEM_USAGE)) &amp; BIT(4)) ?</div><div class='add'>+		    le32_to_cpu(*((__le32 *)(data + FW_HDR_EMEM_SIZE))) : 0;</div><div class='add'>+</div><div class='add'>+	dmem_size += FW_HDR_CHKSUM_SIZE;</div><div class='add'>+	imem_size += FW_HDR_CHKSUM_SIZE;</div><div class='add'>+	emem_size += emem_size ? FW_HDR_CHKSUM_SIZE : 0;</div><div class='add'>+	real_size = FW_HDR_SIZE + dmem_size + imem_size + emem_size;</div><div class='add'>+	if (real_size != size)</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 void wlan_cpu_enable(struct rtw_dev *rtwdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	if (enable) {</div><div class='add'>+		/* cpu io interface enable */</div><div class='add'>+		rtw_write8_set(rtwdev, REG_RSV_CTRL + 1, BIT_WLMCU_IOIF);</div><div class='add'>+</div><div class='add'>+		/* cpu enable */</div><div class='add'>+		rtw_write8_set(rtwdev, REG_SYS_FUNC_EN + 1, BIT_FEN_CPUEN);</div><div class='add'>+	} else {</div><div class='add'>+		/* cpu io interface disable */</div><div class='add'>+		rtw_write8_clr(rtwdev, REG_SYS_FUNC_EN + 1, BIT_FEN_CPUEN);</div><div class='add'>+</div><div class='add'>+		/* cpu disable */</div><div class='add'>+		rtw_write8_clr(rtwdev, REG_RSV_CTRL + 1, BIT_WLMCU_IOIF);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DLFW_RESTORE_REG_NUM 6</div><div class='add'>+</div><div class='add'>+static void download_firmware_reg_backup(struct rtw_dev *rtwdev,</div><div class='add'>+					 struct rtw_backup_info *bckp)</div><div class='add'>+{</div><div class='add'>+	u8 tmp;</div><div class='add'>+	u8 bckp_idx = 0;</div><div class='add'>+</div><div class='add'>+	/* set HIQ to hi priority */</div><div class='add'>+	bckp[bckp_idx].len = 1;</div><div class='add'>+	bckp[bckp_idx].reg = REG_TXDMA_PQ_MAP + 1;</div><div class='add'>+	bckp[bckp_idx].val = rtw_read8(rtwdev, REG_TXDMA_PQ_MAP + 1);</div><div class='add'>+	bckp_idx++;</div><div class='add'>+	tmp = RTW_DMA_MAPPING_HIGH &lt;&lt; 6;</div><div class='add'>+	rtw_write8(rtwdev, REG_TXDMA_PQ_MAP + 1, tmp);</div><div class='add'>+</div><div class='add'>+	/* DLFW only use HIQ, map HIQ to hi priority */</div><div class='add'>+	bckp[bckp_idx].len = 1;</div><div class='add'>+	bckp[bckp_idx].reg = REG_CR;</div><div class='add'>+	bckp[bckp_idx].val = rtw_read8(rtwdev, REG_CR);</div><div class='add'>+	bckp_idx++;</div><div class='add'>+	bckp[bckp_idx].len = 4;</div><div class='add'>+	bckp[bckp_idx].reg = REG_H2CQ_CSR;</div><div class='add'>+	bckp[bckp_idx].val = BIT_H2CQ_FULL;</div><div class='add'>+	bckp_idx++;</div><div class='add'>+	tmp = BIT_HCI_TXDMA_EN | BIT_TXDMA_EN;</div><div class='add'>+	rtw_write8(rtwdev, REG_CR, tmp);</div><div class='add'>+	rtw_write32(rtwdev, REG_H2CQ_CSR, BIT_H2CQ_FULL);</div><div class='add'>+</div><div class='add'>+	/* Config hi priority queue and public priority queue page number */</div><div class='add'>+	bckp[bckp_idx].len = 2;</div><div class='add'>+	bckp[bckp_idx].reg = REG_FIFOPAGE_INFO_1;</div><div class='add'>+	bckp[bckp_idx].val = rtw_read16(rtwdev, REG_FIFOPAGE_INFO_1);</div><div class='add'>+	bckp_idx++;</div><div class='add'>+	bckp[bckp_idx].len = 4;</div><div class='add'>+	bckp[bckp_idx].reg = REG_RQPN_CTRL_2;</div><div class='add'>+	bckp[bckp_idx].val = rtw_read32(rtwdev, REG_RQPN_CTRL_2) | BIT_LD_RQPN;</div><div class='add'>+	bckp_idx++;</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_1, 0x200);</div><div class='add'>+	rtw_write32(rtwdev, REG_RQPN_CTRL_2, bckp[bckp_idx - 1].val);</div><div class='add'>+</div><div class='add'>+	/* Disable beacon related functions */</div><div class='add'>+	tmp = rtw_read8(rtwdev, REG_BCN_CTRL);</div><div class='add'>+	bckp[bckp_idx].len = 1;</div><div class='add'>+	bckp[bckp_idx].reg = REG_BCN_CTRL;</div><div class='add'>+	bckp[bckp_idx].val = tmp;</div><div class='add'>+	bckp_idx++;</div><div class='add'>+	tmp = (u8)((tmp &amp; (~BIT_EN_BCN_FUNCTION)) | BIT_DIS_TSF_UDT);</div><div class='add'>+	rtw_write8(rtwdev, REG_BCN_CTRL, tmp);</div><div class='add'>+</div><div class='add'>+	WARN(bckp_idx != DLFW_RESTORE_REG_NUM, "wrong backup number\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void download_firmware_reset_platform(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_CPU_DMEM_CON + 2, BIT_WL_PLATFORM_RST &gt;&gt; 16);</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_SYS_CLK_CTRL + 1, BIT_CPU_CLK_EN &gt;&gt; 8);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_CPU_DMEM_CON + 2, BIT_WL_PLATFORM_RST &gt;&gt; 16);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_SYS_CLK_CTRL + 1, BIT_CPU_CLK_EN &gt;&gt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void download_firmware_reg_restore(struct rtw_dev *rtwdev,</div><div class='add'>+					  struct rtw_backup_info *bckp,</div><div class='add'>+					  u8 bckp_num)</div><div class='add'>+{</div><div class='add'>+	rtw_restore_reg(rtwdev, bckp, bckp_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TX_DESC_SIZE 48</div><div class='add'>+</div><div class='add'>+static int send_firmware_pkt_rsvd_page(struct rtw_dev *rtwdev, u16 pg_addr,</div><div class='add'>+				       const u8 *data, u32 size)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf = kmemdup(data, size, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = rtw_fw_write_data_rsvd_page(rtwdev, pg_addr, buf, size);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+send_firmware_pkt(struct rtw_dev *rtwdev, u16 pg_addr, const u8 *data, u32 size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB &amp;&amp;</div><div class='add'>+	    !((size + TX_DESC_SIZE) &amp; (512 - 1)))</div><div class='add'>+		size += 1;</div><div class='add'>+</div><div class='add'>+	ret = send_firmware_pkt_rsvd_page(rtwdev, pg_addr, data, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		rtw_err(rtwdev, "failed to download rsvd page\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'>+iddma_enable(struct rtw_dev *rtwdev, u32 src, u32 dst, u32 ctrl)</div><div class='add'>+{</div><div class='add'>+	rtw_write32(rtwdev, REG_DDMA_CH0SA, src);</div><div class='add'>+	rtw_write32(rtwdev, REG_DDMA_CH0DA, dst);</div><div class='add'>+	rtw_write32(rtwdev, REG_DDMA_CH0CTRL, ctrl);</div><div class='add'>+</div><div class='add'>+	if (!check_hw_ready(rtwdev, REG_DDMA_CH0CTRL, BIT_DDMACH0_OWN, 0))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iddma_download_firmware(struct rtw_dev *rtwdev, u32 src, u32 dst,</div><div class='add'>+				   u32 len, u8 first)</div><div class='add'>+{</div><div class='add'>+	u32 ch0_ctrl = BIT_DDMACH0_CHKSUM_EN | BIT_DDMACH0_OWN;</div><div class='add'>+</div><div class='add'>+	if (!check_hw_ready(rtwdev, REG_DDMA_CH0CTRL, BIT_DDMACH0_OWN, 0))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ch0_ctrl |= len &amp; BIT_MASK_DDMACH0_DLEN;</div><div class='add'>+	if (!first)</div><div class='add'>+		ch0_ctrl |= BIT_DDMACH0_CHKSUM_CONT;</div><div class='add'>+</div><div class='add'>+	if (iddma_enable(rtwdev, src, dst, ch0_ctrl))</div><div class='add'>+		return -EBUSY;</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'>+check_fw_checksum(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u8 fw_ctrl;</div><div class='add'>+</div><div class='add'>+	fw_ctrl = rtw_read8(rtwdev, REG_MCUFW_CTRL);</div><div class='add'>+</div><div class='add'>+	if (rtw_read32(rtwdev, REG_DDMA_CH0CTRL) &amp; BIT_DDMACH0_CHKSUM_STS) {</div><div class='add'>+		if (addr &lt; OCPBASE_DMEM_88XX) {</div><div class='add'>+			fw_ctrl |= BIT_IMEM_DW_OK;</div><div class='add'>+			fw_ctrl &amp;= ~BIT_IMEM_CHKSUM_OK;</div><div class='add'>+			rtw_write8(rtwdev, REG_MCUFW_CTRL, fw_ctrl);</div><div class='add'>+		} else {</div><div class='add'>+			fw_ctrl |= BIT_DMEM_DW_OK;</div><div class='add'>+			fw_ctrl &amp;= ~BIT_DMEM_CHKSUM_OK;</div><div class='add'>+			rtw_write8(rtwdev, REG_MCUFW_CTRL, fw_ctrl);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rtw_err(rtwdev, "invalid fw checksum\n");</div><div class='add'>+</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (addr &lt; OCPBASE_DMEM_88XX) {</div><div class='add'>+		fw_ctrl |= (BIT_IMEM_DW_OK | BIT_IMEM_CHKSUM_OK);</div><div class='add'>+		rtw_write8(rtwdev, REG_MCUFW_CTRL, fw_ctrl);</div><div class='add'>+	} else {</div><div class='add'>+		fw_ctrl |= (BIT_DMEM_DW_OK | BIT_DMEM_CHKSUM_OK);</div><div class='add'>+		rtw_write8(rtwdev, REG_MCUFW_CTRL, fw_ctrl);</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'>+download_firmware_to_mem(struct rtw_dev *rtwdev, const u8 *data,</div><div class='add'>+			 u32 src, u32 dst, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u32 desc_size = chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	u8 first_part;</div><div class='add'>+	u32 mem_offset;</div><div class='add'>+	u32 residue_size;</div><div class='add'>+	u32 pkt_size;</div><div class='add'>+	u32 max_size = 0x1000;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mem_offset = 0;</div><div class='add'>+	first_part = 1;</div><div class='add'>+	residue_size = size;</div><div class='add'>+</div><div class='add'>+	val = rtw_read32(rtwdev, REG_DDMA_CH0CTRL);</div><div class='add'>+	val |= BIT_DDMACH0_RESET_CHKSUM_STS;</div><div class='add'>+	rtw_write32(rtwdev, REG_DDMA_CH0CTRL, val);</div><div class='add'>+</div><div class='add'>+	while (residue_size) {</div><div class='add'>+		if (residue_size &gt;= max_size)</div><div class='add'>+			pkt_size = max_size;</div><div class='add'>+		else</div><div class='add'>+			pkt_size = residue_size;</div><div class='add'>+</div><div class='add'>+		ret = send_firmware_pkt(rtwdev, (u16)(src &gt;&gt; 7),</div><div class='add'>+					data + mem_offset, pkt_size);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = iddma_download_firmware(rtwdev, OCPBASE_TXBUF_88XX +</div><div class='add'>+					      src + desc_size,</div><div class='add'>+					      dst + mem_offset, pkt_size,</div><div class='add'>+					      first_part);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		first_part = 0;</div><div class='add'>+		mem_offset += pkt_size;</div><div class='add'>+		residue_size -= pkt_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!check_fw_checksum(rtwdev, dst))</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 update_firmware_info(struct rtw_dev *rtwdev,</div><div class='add'>+				 struct rtw_fw_state *fw)</div><div class='add'>+{</div><div class='add'>+	const u8 *data = fw-&gt;firmware-&gt;data;</div><div class='add'>+</div><div class='add'>+	fw-&gt;h2c_version =</div><div class='add'>+		le16_to_cpu(*((__le16 *)(data + FW_HDR_H2C_FMT_VER)));</div><div class='add'>+	fw-&gt;version =</div><div class='add'>+		le16_to_cpu(*((__le16 *)(data + FW_HDR_VERSION)));</div><div class='add'>+	fw-&gt;sub_version = *(data + FW_HDR_SUBVERSION);</div><div class='add'>+	fw-&gt;sub_index = *(data + FW_HDR_SUBINDEX);</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "fw h2c version: %x\n", fw-&gt;h2c_version);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "fw version:     %x\n", fw-&gt;version);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "fw sub version: %x\n", fw-&gt;sub_version);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_FW, "fw sub index:   %x\n", fw-&gt;sub_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+start_download_firmware(struct rtw_dev *rtwdev, const u8 *data, u32 size)</div><div class='add'>+{</div><div class='add'>+	const u8 *cur_fw;</div><div class='add'>+	u16 val;</div><div class='add'>+	u32 imem_size;</div><div class='add'>+	u32 dmem_size;</div><div class='add'>+	u32 emem_size;</div><div class='add'>+	u32 addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dmem_size = le32_to_cpu(*((__le32 *)(data + FW_HDR_DMEM_SIZE)));</div><div class='add'>+	imem_size = le32_to_cpu(*((__le32 *)(data + FW_HDR_IMEM_SIZE)));</div><div class='add'>+	emem_size = ((*(data + FW_HDR_MEM_USAGE)) &amp; BIT(4)) ?</div><div class='add'>+		    le32_to_cpu(*((__le32 *)(data + FW_HDR_EMEM_SIZE))) : 0;</div><div class='add'>+	dmem_size += FW_HDR_CHKSUM_SIZE;</div><div class='add'>+	imem_size += FW_HDR_CHKSUM_SIZE;</div><div class='add'>+	emem_size += emem_size ? FW_HDR_CHKSUM_SIZE : 0;</div><div class='add'>+</div><div class='add'>+	val = (u16)(rtw_read16(rtwdev, REG_MCUFW_CTRL) &amp; 0x3800);</div><div class='add'>+	val |= BIT_MCUFWDL_EN;</div><div class='add'>+	rtw_write16(rtwdev, REG_MCUFW_CTRL, val);</div><div class='add'>+</div><div class='add'>+	cur_fw = data + FW_HDR_SIZE;</div><div class='add'>+	addr = le32_to_cpu(*((__le32 *)(data + FW_HDR_DMEM_ADDR)));</div><div class='add'>+	addr &amp;= ~BIT(31);</div><div class='add'>+	ret = download_firmware_to_mem(rtwdev, cur_fw, 0, addr, dmem_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cur_fw = data + FW_HDR_SIZE + dmem_size;</div><div class='add'>+	addr = le32_to_cpu(*((__le32 *)(data + FW_HDR_IMEM_ADDR)));</div><div class='add'>+	addr &amp;= ~BIT(31);</div><div class='add'>+	ret = download_firmware_to_mem(rtwdev, cur_fw, 0, addr, imem_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (emem_size) {</div><div class='add'>+		cur_fw = data + FW_HDR_SIZE + dmem_size + imem_size;</div><div class='add'>+		addr = le32_to_cpu(*((__le32 *)(data + FW_HDR_EMEM_ADDR)));</div><div class='add'>+		addr &amp;= ~BIT(31);</div><div class='add'>+		ret = download_firmware_to_mem(rtwdev, cur_fw, 0, addr,</div><div class='add'>+					       emem_size);</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 download_firmware_validate(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u32 fw_key;</div><div class='add'>+</div><div class='add'>+	if (!check_hw_ready(rtwdev, REG_MCUFW_CTRL, FW_READY_MASK, FW_READY)) {</div><div class='add'>+		fw_key = rtw_read32(rtwdev, REG_FW_DBG7) &amp; FW_KEY_MASK;</div><div class='add'>+		if (fw_key == ILLEGAL_KEY_GROUP)</div><div class='add'>+			rtw_err(rtwdev, "invalid fw key\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 download_firmware_end_flow(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u16 fw_ctrl;</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, REG_TXDMA_STATUS, BTI_PAGE_OVF);</div><div class='add'>+</div><div class='add'>+	/* Check IMEM &amp; DMEM checksum is OK or not */</div><div class='add'>+	fw_ctrl = rtw_read16(rtwdev, REG_MCUFW_CTRL);</div><div class='add'>+	if ((fw_ctrl &amp; BIT_CHECK_SUM_OK) != BIT_CHECK_SUM_OK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fw_ctrl = (fw_ctrl | BIT_FW_DW_RDY) &amp; ~BIT_MCUFWDL_EN;</div><div class='add'>+	rtw_write16(rtwdev, REG_MCUFW_CTRL, fw_ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw)</div><div class='add'>+{</div><div class='add'>+	struct rtw_backup_info bckp[DLFW_RESTORE_REG_NUM];</div><div class='add'>+	const u8 *data = fw-&gt;firmware-&gt;data;</div><div class='add'>+	u32 size = fw-&gt;firmware-&gt;size;</div><div class='add'>+	u32 ltecoex_bckp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!check_firmware_size(data, size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!ltecoex_read_reg(rtwdev, 0x38, &amp;ltecoex_bckp))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	wlan_cpu_enable(rtwdev, false);</div><div class='add'>+</div><div class='add'>+	download_firmware_reg_backup(rtwdev, bckp);</div><div class='add'>+	download_firmware_reset_platform(rtwdev);</div><div class='add'>+</div><div class='add'>+	ret = start_download_firmware(rtwdev, data, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto dlfw_fail;</div><div class='add'>+</div><div class='add'>+	download_firmware_reg_restore(rtwdev, bckp, DLFW_RESTORE_REG_NUM);</div><div class='add'>+</div><div class='add'>+	download_firmware_end_flow(rtwdev);</div><div class='add'>+</div><div class='add'>+	wlan_cpu_enable(rtwdev, true);</div><div class='add'>+</div><div class='add'>+	if (!ltecoex_reg_write(rtwdev, 0x38, ltecoex_bckp))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = download_firmware_validate(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto dlfw_fail;</div><div class='add'>+</div><div class='add'>+	update_firmware_info(rtwdev, fw);</div><div class='add'>+</div><div class='add'>+	/* reset desc and index */</div><div class='add'>+	rtw_hci_setup(rtwdev);</div><div class='add'>+</div><div class='add'>+	rtwdev-&gt;h2c.last_box_num = 0;</div><div class='add'>+	rtwdev-&gt;h2c.seq = 0;</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_general_info(rtwdev);</div><div class='add'>+	rtw_fw_send_phydm_info(rtwdev);</div><div class='add'>+</div><div class='add'>+	rtw_flag_set(rtwdev, RTW_FLAG_FW_RUNNING);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dlfw_fail:</div><div class='add'>+	/* Disable FWDL_EN */</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_MCUFW_CTRL, BIT_MCUFWDL_EN);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_SYS_FUNC_EN + 1, BIT_FEN_CPUEN);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int txdma_queue_mapping(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_rqpn *rqpn = NULL;</div><div class='add'>+	u16 txdma_pq_map = 0;</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		rqpn = &amp;chip-&gt;rqpn_table[1];</div><div class='add'>+		break;</div><div class='add'>+	case RTW_HCI_TYPE_USB:</div><div class='add'>+		if (rtwdev-&gt;hci.bulkout_num == 2)</div><div class='add'>+			rqpn = &amp;chip-&gt;rqpn_table[2];</div><div class='add'>+		else if (rtwdev-&gt;hci.bulkout_num == 3)</div><div class='add'>+			rqpn = &amp;chip-&gt;rqpn_table[3];</div><div class='add'>+		else if (rtwdev-&gt;hci.bulkout_num == 4)</div><div class='add'>+			rqpn = &amp;chip-&gt;rqpn_table[4];</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</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'>+	txdma_pq_map |= BIT_TXDMA_HIQ_MAP(rqpn-&gt;dma_map_hi);</div><div class='add'>+	txdma_pq_map |= BIT_TXDMA_MGQ_MAP(rqpn-&gt;dma_map_mg);</div><div class='add'>+	txdma_pq_map |= BIT_TXDMA_BKQ_MAP(rqpn-&gt;dma_map_bk);</div><div class='add'>+	txdma_pq_map |= BIT_TXDMA_BEQ_MAP(rqpn-&gt;dma_map_be);</div><div class='add'>+	txdma_pq_map |= BIT_TXDMA_VIQ_MAP(rqpn-&gt;dma_map_vi);</div><div class='add'>+	txdma_pq_map |= BIT_TXDMA_VOQ_MAP(rqpn-&gt;dma_map_vo);</div><div class='add'>+	rtw_write16(rtwdev, REG_TXDMA_PQ_MAP, txdma_pq_map);</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_CR, 0);</div><div class='add'>+	rtw_write8(rtwdev, REG_CR, MAC_TRX_ENABLE);</div><div class='add'>+	rtw_write32(rtwdev, REG_H2CQ_CSR, BIT_H2CQ_FULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_trx_fifo_info(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fifo_conf *fifo = &amp;rtwdev-&gt;fifo;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u16 cur_pg_addr;</div><div class='add'>+	u8 csi_buf_pg_num = chip-&gt;csi_buf_pg_num;</div><div class='add'>+</div><div class='add'>+	/* config rsvd page num */</div><div class='add'>+	fifo-&gt;rsvd_drv_pg_num = 8;</div><div class='add'>+	fifo-&gt;txff_pg_num = chip-&gt;txff_size &gt;&gt; 7;</div><div class='add'>+	fifo-&gt;rsvd_pg_num = fifo-&gt;rsvd_drv_pg_num +</div><div class='add'>+			   RSVD_PG_H2C_EXTRAINFO_NUM +</div><div class='add'>+			   RSVD_PG_H2C_STATICINFO_NUM +</div><div class='add'>+			   RSVD_PG_H2CQ_NUM +</div><div class='add'>+			   RSVD_PG_CPU_INSTRUCTION_NUM +</div><div class='add'>+			   RSVD_PG_FW_TXBUF_NUM +</div><div class='add'>+			   csi_buf_pg_num;</div><div class='add'>+</div><div class='add'>+	if (fifo-&gt;rsvd_pg_num &gt; fifo-&gt;txff_pg_num)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fifo-&gt;acq_pg_num = fifo-&gt;txff_pg_num - fifo-&gt;rsvd_pg_num;</div><div class='add'>+	fifo-&gt;rsvd_boundary = fifo-&gt;txff_pg_num - fifo-&gt;rsvd_pg_num;</div><div class='add'>+</div><div class='add'>+	cur_pg_addr = fifo-&gt;txff_pg_num;</div><div class='add'>+	cur_pg_addr -= csi_buf_pg_num;</div><div class='add'>+	fifo-&gt;rsvd_csibuf_addr = cur_pg_addr;</div><div class='add'>+	cur_pg_addr -= RSVD_PG_FW_TXBUF_NUM;</div><div class='add'>+	fifo-&gt;rsvd_fw_txbuf_addr = cur_pg_addr;</div><div class='add'>+	cur_pg_addr -= RSVD_PG_CPU_INSTRUCTION_NUM;</div><div class='add'>+	fifo-&gt;rsvd_cpu_instr_addr = cur_pg_addr;</div><div class='add'>+	cur_pg_addr -= RSVD_PG_H2CQ_NUM;</div><div class='add'>+	fifo-&gt;rsvd_h2cq_addr = cur_pg_addr;</div><div class='add'>+	cur_pg_addr -= RSVD_PG_H2C_STATICINFO_NUM;</div><div class='add'>+	fifo-&gt;rsvd_h2c_sta_info_addr = cur_pg_addr;</div><div class='add'>+	cur_pg_addr -= RSVD_PG_H2C_EXTRAINFO_NUM;</div><div class='add'>+	fifo-&gt;rsvd_h2c_info_addr = cur_pg_addr;</div><div class='add'>+	cur_pg_addr -= fifo-&gt;rsvd_drv_pg_num;</div><div class='add'>+	fifo-&gt;rsvd_drv_addr = cur_pg_addr;</div><div class='add'>+</div><div class='add'>+	if (fifo-&gt;rsvd_boundary != fifo-&gt;rsvd_drv_addr) {</div><div class='add'>+		rtw_err(rtwdev, "wrong rsvd driver address\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 int priority_queue_cfg(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fifo_conf *fifo = &amp;rtwdev-&gt;fifo;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_page_table *pg_tbl = NULL;</div><div class='add'>+	u16 pubq_num;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = set_trx_fifo_info(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		pg_tbl = &amp;chip-&gt;page_table[1];</div><div class='add'>+		break;</div><div class='add'>+	case RTW_HCI_TYPE_USB:</div><div class='add'>+		if (rtwdev-&gt;hci.bulkout_num == 2)</div><div class='add'>+			pg_tbl = &amp;chip-&gt;page_table[2];</div><div class='add'>+		else if (rtwdev-&gt;hci.bulkout_num == 3)</div><div class='add'>+			pg_tbl = &amp;chip-&gt;page_table[3];</div><div class='add'>+		else if (rtwdev-&gt;hci.bulkout_num == 4)</div><div class='add'>+			pg_tbl = &amp;chip-&gt;page_table[4];</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</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'>+	pubq_num = fifo-&gt;acq_pg_num - pg_tbl-&gt;hq_num - pg_tbl-&gt;lq_num -</div><div class='add'>+		   pg_tbl-&gt;nq_num - pg_tbl-&gt;exq_num - pg_tbl-&gt;gapq_num;</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_1, pg_tbl-&gt;hq_num);</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_2, pg_tbl-&gt;lq_num);</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_3, pg_tbl-&gt;nq_num);</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_4, pg_tbl-&gt;exq_num);</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_INFO_5, pubq_num);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_RQPN_CTRL_2, BIT_LD_RQPN);</div><div class='add'>+</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_CTRL_2, fifo-&gt;rsvd_boundary);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_FWHW_TXQ_CTRL + 2, BIT_EN_WR_FREE_TAIL &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	rtw_write16(rtwdev, REG_BCNQ_BDNY_V1, fifo-&gt;rsvd_boundary);</div><div class='add'>+	rtw_write16(rtwdev, REG_FIFOPAGE_CTRL_2 + 2, fifo-&gt;rsvd_boundary);</div><div class='add'>+	rtw_write16(rtwdev, REG_BCNQ1_BDNY_V1, fifo-&gt;rsvd_boundary);</div><div class='add'>+	rtw_write32(rtwdev, REG_RXFF_BNDY, chip-&gt;rxff_size - C2H_PKT_BUF - 1);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_AUTO_LLT_V1, BIT_AUTO_INIT_LLT_V1);</div><div class='add'>+</div><div class='add'>+	if (!check_hw_ready(rtwdev, REG_AUTO_LLT_V1, BIT_AUTO_INIT_LLT_V1, 0))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_CR + 3, 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 init_h2c(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fifo_conf *fifo = &amp;rtwdev-&gt;fifo;</div><div class='add'>+	u8 value8;</div><div class='add'>+	u32 value32;</div><div class='add'>+	u32 h2cq_addr;</div><div class='add'>+	u32 h2cq_size;</div><div class='add'>+	u32 h2cq_free;</div><div class='add'>+	u32 wp, rp;</div><div class='add'>+</div><div class='add'>+	h2cq_addr = fifo-&gt;rsvd_h2cq_addr &lt;&lt; TX_PAGE_SIZE_SHIFT;</div><div class='add'>+	h2cq_size = RSVD_PG_H2CQ_NUM &lt;&lt; TX_PAGE_SIZE_SHIFT;</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_H2C_HEAD);</div><div class='add'>+	value32 = (value32 &amp; 0xFFFC0000) | h2cq_addr;</div><div class='add'>+	rtw_write32(rtwdev, REG_H2C_HEAD, value32);</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_H2C_READ_ADDR);</div><div class='add'>+	value32 = (value32 &amp; 0xFFFC0000) | h2cq_addr;</div><div class='add'>+	rtw_write32(rtwdev, REG_H2C_READ_ADDR, value32);</div><div class='add'>+</div><div class='add'>+	value32 = rtw_read32(rtwdev, REG_H2C_TAIL);</div><div class='add'>+	value32 &amp;= 0xFFFC0000;</div><div class='add'>+	value32 |= (h2cq_addr + h2cq_size);</div><div class='add'>+	rtw_write32(rtwdev, REG_H2C_TAIL, value32);</div><div class='add'>+</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_H2C_INFO);</div><div class='add'>+	value8 = (u8)((value8 &amp; 0xFC) | 0x01);</div><div class='add'>+	rtw_write8(rtwdev, REG_H2C_INFO, value8);</div><div class='add'>+</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_H2C_INFO);</div><div class='add'>+	value8 = (u8)((value8 &amp; 0xFB) | 0x04);</div><div class='add'>+	rtw_write8(rtwdev, REG_H2C_INFO, value8);</div><div class='add'>+</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_TXDMA_OFFSET_CHK + 1);</div><div class='add'>+	value8 = (u8)((value8 &amp; 0x7f) | 0x80);</div><div class='add'>+	rtw_write8(rtwdev, REG_TXDMA_OFFSET_CHK + 1, value8);</div><div class='add'>+</div><div class='add'>+	wp = rtw_read32(rtwdev, REG_H2C_PKT_WRITEADDR) &amp; 0x3FFFF;</div><div class='add'>+	rp = rtw_read32(rtwdev, REG_H2C_PKT_READADDR) &amp; 0x3FFFF;</div><div class='add'>+	h2cq_free = wp &gt;= rp ? h2cq_size - (wp - rp) : rp - wp;</div><div class='add'>+</div><div class='add'>+	if (h2cq_size != h2cq_free) {</div><div class='add'>+		rtw_err(rtwdev, "H2C queue mismatch\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 int rtw_init_trx_cfg(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = txdma_queue_mapping(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = priority_queue_cfg(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = init_h2c(rtwdev);</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 rtw_drv_info_cfg(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u8 value8;</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_RX_DRVINFO_SZ, PHY_STATUS_SIZE);</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_TRXFF_BNDY + 1);</div><div class='add'>+	value8 &amp;= 0xF0;</div><div class='add'>+	/* For rxdesc len = 0 issue */</div><div class='add'>+	value8 |= 0xF;</div><div class='add'>+	rtw_write8(rtwdev, REG_TRXFF_BNDY + 1, value8);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_RCR, BIT_APP_PHYSTS);</div><div class='add'>+	rtw_write32_clr(rtwdev, REG_WMAC_OPTION_FUNCTION + 4, BIT(8) | BIT(9));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_mac_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_init_trx_cfg(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = chip-&gt;ops-&gt;mac_init(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_drv_info_cfg(rtwdev);</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/wireless/realtek/rtw88/mac.h b/drivers/net/wireless/realtek/rtw88/mac.h<br/>new file mode 100644<br/>index 000000000000..efe6f731f240<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/mac.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/mac.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_MAC_H__</div><div class='add'>+#define __RTW_MAC_H__</div><div class='add'>+</div><div class='add'>+#define RTW_HW_PORT_NUM		5</div><div class='add'>+#define cut_version_to_mask(cut) (0x1 &lt;&lt; ((cut) + 1))</div><div class='add'>+#define SDIO_LOCAL_OFFSET	0x10250000</div><div class='add'>+#define DDMA_POLLING_COUNT	1000</div><div class='add'>+#define C2H_PKT_BUF		256</div><div class='add'>+#define PHY_STATUS_SIZE		4</div><div class='add'>+#define ILLEGAL_KEY_GROUP	0xFAAAAA00</div><div class='add'>+</div><div class='add'>+/* HW memory address */</div><div class='add'>+#define OCPBASE_TXBUF_88XX		0x18780000</div><div class='add'>+#define OCPBASE_DMEM_88XX		0x00200000</div><div class='add'>+#define OCPBASE_EMEM_88XX		0x00100000</div><div class='add'>+</div><div class='add'>+#define RSVD_PG_DRV_NUM			16</div><div class='add'>+#define RSVD_PG_H2C_EXTRAINFO_NUM	24</div><div class='add'>+#define RSVD_PG_H2C_STATICINFO_NUM	8</div><div class='add'>+#define RSVD_PG_H2CQ_NUM		8</div><div class='add'>+#define RSVD_PG_CPU_INSTRUCTION_NUM	0</div><div class='add'>+#define RSVD_PG_FW_TXBUF_NUM		4</div><div class='add'>+</div><div class='add'>+void rtw_set_channel_mac(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+			 u8 primary_ch_idx);</div><div class='add'>+int rtw_mac_power_on(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_mac_power_off(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw);</div><div class='add'>+int rtw_mac_init(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c<br/>new file mode 100644<br/>index 000000000000..abded63f138d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/mac80211.c</a></div><div class='hunk'>@@ -0,0 +1,481 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "sec.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "ps.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static void rtw_ops_tx(struct ieee80211_hw *hw,</div><div class='add'>+		       struct ieee80211_tx_control *control,</div><div class='add'>+		       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_tx_pkt_info pkt_info = {0};</div><div class='add'>+</div><div class='add'>+	if (!rtw_flag_check(rtwdev, RTW_FLAG_RUNNING))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rtw_tx_pkt_info_update(rtwdev, &amp;pkt_info, control, skb);</div><div class='add'>+	if (rtw_hci_tx(rtwdev, &amp;pkt_info, skb))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ieee80211_free_txskb(hw, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_ops_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	ret = rtw_core_start(rtwdev);</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&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 void rtw_ops_stop(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	rtw_core_stop(rtwdev);</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_ops_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_IDLE) {</div><div class='add'>+		if (hw-&gt;conf.flags &amp; IEEE80211_CONF_IDLE) {</div><div class='add'>+			rtw_enter_ips(rtwdev);</div><div class='add'>+		} else {</div><div class='add'>+			ret = rtw_leave_ips(rtwdev);</div><div class='add'>+			if (ret) {</div><div class='add'>+				rtw_err(rtwdev, "failed to leave idle state\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'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)</div><div class='add'>+		rtw_set_channel(rtwdev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtw_vif_port rtw_vif_port[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.mac_addr	= {.addr = 0x0610},</div><div class='add'>+		.bssid		= {.addr = 0x0618},</div><div class='add'>+		.net_type	= {.addr = 0x0100, .mask = 0x30000},</div><div class='add'>+		.aid		= {.addr = 0x06a8, .mask = 0x7ff},</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.mac_addr	= {.addr = 0x0700},</div><div class='add'>+		.bssid		= {.addr = 0x0708},</div><div class='add'>+		.net_type	= {.addr = 0x0100, .mask = 0xc0000},</div><div class='add'>+		.aid		= {.addr = 0x0710, .mask = 0x7ff},</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.mac_addr	= {.addr = 0x1620},</div><div class='add'>+		.bssid		= {.addr = 0x1628},</div><div class='add'>+		.net_type	= {.addr = 0x1100, .mask = 0x3},</div><div class='add'>+		.aid		= {.addr = 0x1600, .mask = 0x7ff},</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.mac_addr	= {.addr = 0x1630},</div><div class='add'>+		.bssid		= {.addr = 0x1638},</div><div class='add'>+		.net_type	= {.addr = 0x1100, .mask = 0xc},</div><div class='add'>+		.aid		= {.addr = 0x1604, .mask = 0x7ff},</div><div class='add'>+	},</div><div class='add'>+	[4] = {</div><div class='add'>+		.mac_addr	= {.addr = 0x1640},</div><div class='add'>+		.bssid		= {.addr = 0x1648},</div><div class='add'>+		.net_type	= {.addr = 0x1100, .mask = 0x30},</div><div class='add'>+		.aid		= {.addr = 0x1608, .mask = 0x7ff},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtw_ops_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_vif *rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+	enum rtw_net_type net_type;</div><div class='add'>+	u32 config = 0;</div><div class='add'>+	u8 port = 0;</div><div class='add'>+</div><div class='add'>+	rtwvif-&gt;port = port;</div><div class='add'>+	rtwvif-&gt;vif = vif;</div><div class='add'>+	rtwvif-&gt;stats.tx_unicast = 0;</div><div class='add'>+	rtwvif-&gt;stats.rx_unicast = 0;</div><div class='add'>+	rtwvif-&gt;stats.tx_cnt = 0;</div><div class='add'>+	rtwvif-&gt;stats.rx_cnt = 0;</div><div class='add'>+	rtwvif-&gt;in_lps = false;</div><div class='add'>+	rtwvif-&gt;conf = &amp;rtw_vif_port[port];</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+		net_type = RTW_NET_AP_MODE;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		net_type = RTW_NET_AD_HOC;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+	default:</div><div class='add'>+		net_type = RTW_NET_NO_LINK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(rtwvif-&gt;mac_addr, vif-&gt;addr);</div><div class='add'>+	config |= PORT_SET_MAC_ADDR;</div><div class='add'>+	rtwvif-&gt;net_type = net_type;</div><div class='add'>+	config |= PORT_SET_NET_TYPE;</div><div class='add'>+	rtw_vif_port_config(rtwdev, rtwvif, config);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	rtw_info(rtwdev, "start vif %pM on port %d\n", vif-&gt;addr, rtwvif-&gt;port);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_ops_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_vif *rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u32 config = 0;</div><div class='add'>+</div><div class='add'>+	rtw_info(rtwdev, "stop vif %pM on port %d\n", vif-&gt;addr, rtwvif-&gt;port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	eth_zero_addr(rtwvif-&gt;mac_addr);</div><div class='add'>+	config |= PORT_SET_MAC_ADDR;</div><div class='add'>+	rtwvif-&gt;net_type = RTW_NET_NO_LINK;</div><div class='add'>+	config |= PORT_SET_NET_TYPE;</div><div class='add'>+	rtw_vif_port_config(rtwdev, rtwvif, config);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_ops_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+				     unsigned int changed_flags,</div><div class='add'>+				     unsigned int *new_flags,</div><div class='add'>+				     u64 multicast)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	*new_flags &amp;= FIF_ALLMULTI | FIF_OTHER_BSS | FIF_FCSFAIL |</div><div class='add'>+		      FIF_BCN_PRBRESP_PROMISC;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (changed_flags &amp; FIF_ALLMULTI) {</div><div class='add'>+		if (*new_flags &amp; FIF_ALLMULTI)</div><div class='add'>+			rtwdev-&gt;hal.rcr |= BIT_AM | BIT_AB;</div><div class='add'>+		else</div><div class='add'>+			rtwdev-&gt;hal.rcr &amp;= ~(BIT_AM | BIT_AB);</div><div class='add'>+	}</div><div class='add'>+	if (changed_flags &amp; FIF_FCSFAIL) {</div><div class='add'>+		if (*new_flags &amp; FIF_FCSFAIL)</div><div class='add'>+			rtwdev-&gt;hal.rcr |= BIT_ACRC32;</div><div class='add'>+		else</div><div class='add'>+			rtwdev-&gt;hal.rcr &amp;= ~(BIT_ACRC32);</div><div class='add'>+	}</div><div class='add'>+	if (changed_flags &amp; FIF_OTHER_BSS) {</div><div class='add'>+		if (*new_flags &amp; FIF_OTHER_BSS)</div><div class='add'>+			rtwdev-&gt;hal.rcr |= BIT_AAP;</div><div class='add'>+		else</div><div class='add'>+			rtwdev-&gt;hal.rcr &amp;= ~(BIT_AAP);</div><div class='add'>+	}</div><div class='add'>+	if (changed_flags &amp; FIF_BCN_PRBRESP_PROMISC) {</div><div class='add'>+		if (*new_flags &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='add'>+			rtwdev-&gt;hal.rcr &amp;= ~(BIT_CBSSID_BCN | BIT_CBSSID_DATA);</div><div class='add'>+		else</div><div class='add'>+			rtwdev-&gt;hal.rcr |= BIT_CBSSID_BCN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RX,</div><div class='add'>+		"config rx filter, changed=0x%08x, new=0x%08x, rcr=0x%08x\n",</div><div class='add'>+		changed_flags, *new_flags, rtwdev-&gt;hal.rcr);</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, REG_RCR, rtwdev-&gt;hal.rcr);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *conf,</div><div class='add'>+				     u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_vif *rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u32 config = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+		enum rtw_net_type net_type;</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;assoc) {</div><div class='add'>+			net_type = RTW_NET_MGD_LINKED;</div><div class='add'>+			chip-&gt;ops-&gt;do_iqk(rtwdev);</div><div class='add'>+</div><div class='add'>+			rtwvif-&gt;aid = conf-&gt;aid;</div><div class='add'>+			rtw_add_rsvd_page(rtwdev, RSVD_PS_POLL, true);</div><div class='add'>+			rtw_add_rsvd_page(rtwdev, RSVD_QOS_NULL, true);</div><div class='add'>+			rtw_add_rsvd_page(rtwdev, RSVD_NULL, true);</div><div class='add'>+			rtw_fw_download_rsvd_page(rtwdev, vif);</div><div class='add'>+			rtw_send_rsvd_page_h2c(rtwdev);</div><div class='add'>+		} else {</div><div class='add'>+			net_type = RTW_NET_NO_LINK;</div><div class='add'>+			rtwvif-&gt;aid = 0;</div><div class='add'>+			rtw_reset_rsvd_page(rtwdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rtwvif-&gt;net_type = net_type;</div><div class='add'>+		config |= PORT_SET_NET_TYPE;</div><div class='add'>+		config |= PORT_SET_AID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BSSID) {</div><div class='add'>+		ether_addr_copy(rtwvif-&gt;bssid, conf-&gt;bssid);</div><div class='add'>+		config |= PORT_SET_BSSID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BEACON)</div><div class='add'>+		rtw_fw_download_rsvd_page(rtwdev, vif);</div><div class='add'>+</div><div class='add'>+	rtw_vif_port_config(rtwdev, rtwvif, config);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 rtw_acquire_macid(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long mac_id;</div><div class='add'>+</div><div class='add'>+	mac_id = find_first_zero_bit(rtwdev-&gt;mac_id_map, RTW_MAX_MAC_ID_NUM);</div><div class='add'>+	if (mac_id &lt; RTW_MAX_MAC_ID_NUM)</div><div class='add'>+		set_bit(mac_id, rtwdev-&gt;mac_id_map);</div><div class='add'>+</div><div class='add'>+	return mac_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_release_macid(struct rtw_dev *rtwdev, u8 mac_id)</div><div class='add'>+{</div><div class='add'>+	clear_bit(mac_id, rtwdev-&gt;mac_id_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_ops_sta_add(struct ieee80211_hw *hw,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_sta_info *si = (struct rtw_sta_info *)sta-&gt;drv_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	si-&gt;mac_id = rtw_acquire_macid(rtwdev);</div><div class='add'>+	if (si-&gt;mac_id &gt;= RTW_MAX_MAC_ID_NUM) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	si-&gt;sta = sta;</div><div class='add'>+	si-&gt;vif = vif;</div><div class='add'>+	si-&gt;init_ra_lv = 1;</div><div class='add'>+	ewma_rssi_init(&amp;si-&gt;avg_rssi);</div><div class='add'>+</div><div class='add'>+	rtw_update_sta_info(rtwdev, si);</div><div class='add'>+	rtw_fw_media_status_report(rtwdev, si-&gt;mac_id, true);</div><div class='add'>+</div><div class='add'>+	rtwdev-&gt;sta_cnt++;</div><div class='add'>+</div><div class='add'>+	rtw_info(rtwdev, "sta %pM joined with macid %d\n",</div><div class='add'>+		 sta-&gt;addr, si-&gt;mac_id);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_ops_sta_remove(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_sta_info *si = (struct rtw_sta_info *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	rtw_release_macid(rtwdev, si-&gt;mac_id);</div><div class='add'>+	rtw_fw_media_status_report(rtwdev, si-&gt;mac_id, false);</div><div class='add'>+</div><div class='add'>+	rtwdev-&gt;sta_cnt--;</div><div class='add'>+</div><div class='add'>+	rtw_info(rtwdev, "sta %pM with macid %d left\n",</div><div class='add'>+		 sta-&gt;addr, si-&gt;mac_id);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			   struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+			   struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_sec_desc *sec = &amp;rtwdev-&gt;sec;</div><div class='add'>+	u8 hw_key_type;</div><div class='add'>+	u8 hw_key_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		hw_key_type = RTW_CAM_WEP40;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		hw_key_type = RTW_CAM_WEP104;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		hw_key_type = RTW_CAM_TKIP;</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		hw_key_type = RTW_CAM_AES;</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		/* suppress error messages */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE) {</div><div class='add'>+		hw_key_idx = rtw_sec_get_free_cam(sec);</div><div class='add'>+	} else {</div><div class='add'>+		/* multiple interfaces? */</div><div class='add'>+		hw_key_idx = key-&gt;keyidx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_key_idx &gt; sec-&gt;total_cam_num) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SET_KEY:</div><div class='add'>+		/* need sw generated IV */</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+		key-&gt;hw_key_idx = hw_key_idx;</div><div class='add'>+		rtw_sec_write_cam(rtwdev, sec, sta, key,</div><div class='add'>+				  hw_key_type, hw_key_idx);</div><div class='add'>+		break;</div><div class='add'>+	case DISABLE_KEY:</div><div class='add'>+		rtw_sec_clear_cam(rtwdev, sec, key-&gt;hw_key_idx);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&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 int rtw_ops_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_ampdu_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	u16 tid = params-&gt;tid;</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;action) {</div><div class='add'>+	case IEEE80211_AMPDU_TX_START:</div><div class='add'>+		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='add'>+		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -ENOTSUPP;</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 rtw_ops_sw_scan_start(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  const u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_vif *rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	rtw_leave_lps(rtwdev, rtwvif);</div><div class='add'>+</div><div class='add'>+	rtw_flag_set(rtwdev, RTW_FLAG_DIG_DISABLE);</div><div class='add'>+	rtw_flag_set(rtwdev, RTW_FLAG_SCANNING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_ops_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	rtw_flag_clear(rtwdev, RTW_FLAG_SCANNING);</div><div class='add'>+	rtw_flag_clear(rtwdev, RTW_FLAG_DIG_DISABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ieee80211_ops rtw_ops = {</div><div class='add'>+	.tx			= rtw_ops_tx,</div><div class='add'>+	.start			= rtw_ops_start,</div><div class='add'>+	.stop			= rtw_ops_stop,</div><div class='add'>+	.config			= rtw_ops_config,</div><div class='add'>+	.add_interface		= rtw_ops_add_interface,</div><div class='add'>+	.remove_interface	= rtw_ops_remove_interface,</div><div class='add'>+	.configure_filter	= rtw_ops_configure_filter,</div><div class='add'>+	.bss_info_changed	= rtw_ops_bss_info_changed,</div><div class='add'>+	.sta_add		= rtw_ops_sta_add,</div><div class='add'>+	.sta_remove		= rtw_ops_sta_remove,</div><div class='add'>+	.set_key		= rtw_ops_set_key,</div><div class='add'>+	.ampdu_action		= rtw_ops_ampdu_action,</div><div class='add'>+	.sw_scan_start		= rtw_ops_sw_scan_start,</div><div class='add'>+	.sw_scan_complete	= rtw_ops_sw_scan_complete,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(rtw_ops);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c<br/>new file mode 100644<br/>index 000000000000..f447361f7573<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/main.c</a></div><div class='hunk'>@@ -0,0 +1,1211 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "ps.h"</div><div class='add'>+#include "sec.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "efuse.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static bool rtw_fw_support_lps;</div><div class='add'>+unsigned int rtw_debug_mask;</div><div class='add'>+EXPORT_SYMBOL(rtw_debug_mask);</div><div class='add'>+</div><div class='add'>+module_param_named(support_lps, rtw_fw_support_lps, bool, 0644);</div><div class='add'>+module_param_named(debug_mask, rtw_debug_mask, uint, 0644);</div><div class='add'>+</div><div class='add'>+MODULE_PARM_DESC(support_lps, "Set Y to enable LPS support");</div><div class='add'>+MODULE_PARM_DESC(debug_mask, "Debugging mask");</div><div class='add'>+</div><div class='add'>+static struct ieee80211_channel rtw_channeltable_2g[] = {</div><div class='add'>+	{.center_freq = 2412, .hw_value = 1,},</div><div class='add'>+	{.center_freq = 2417, .hw_value = 2,},</div><div class='add'>+	{.center_freq = 2422, .hw_value = 3,},</div><div class='add'>+	{.center_freq = 2427, .hw_value = 4,},</div><div class='add'>+	{.center_freq = 2432, .hw_value = 5,},</div><div class='add'>+	{.center_freq = 2437, .hw_value = 6,},</div><div class='add'>+	{.center_freq = 2442, .hw_value = 7,},</div><div class='add'>+	{.center_freq = 2447, .hw_value = 8,},</div><div class='add'>+	{.center_freq = 2452, .hw_value = 9,},</div><div class='add'>+	{.center_freq = 2457, .hw_value = 10,},</div><div class='add'>+	{.center_freq = 2462, .hw_value = 11,},</div><div class='add'>+	{.center_freq = 2467, .hw_value = 12,},</div><div class='add'>+	{.center_freq = 2472, .hw_value = 13,},</div><div class='add'>+	{.center_freq = 2484, .hw_value = 14,},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_channel rtw_channeltable_5g[] = {</div><div class='add'>+	{.center_freq = 5180, .hw_value = 36,},</div><div class='add'>+	{.center_freq = 5200, .hw_value = 40,},</div><div class='add'>+	{.center_freq = 5220, .hw_value = 44,},</div><div class='add'>+	{.center_freq = 5240, .hw_value = 48,},</div><div class='add'>+	{.center_freq = 5260, .hw_value = 52,},</div><div class='add'>+	{.center_freq = 5280, .hw_value = 56,},</div><div class='add'>+	{.center_freq = 5300, .hw_value = 60,},</div><div class='add'>+	{.center_freq = 5320, .hw_value = 64,},</div><div class='add'>+	{.center_freq = 5500, .hw_value = 100,},</div><div class='add'>+	{.center_freq = 5520, .hw_value = 104,},</div><div class='add'>+	{.center_freq = 5540, .hw_value = 108,},</div><div class='add'>+	{.center_freq = 5560, .hw_value = 112,},</div><div class='add'>+	{.center_freq = 5580, .hw_value = 116,},</div><div class='add'>+	{.center_freq = 5600, .hw_value = 120,},</div><div class='add'>+	{.center_freq = 5620, .hw_value = 124,},</div><div class='add'>+	{.center_freq = 5640, .hw_value = 128,},</div><div class='add'>+	{.center_freq = 5660, .hw_value = 132,},</div><div class='add'>+	{.center_freq = 5680, .hw_value = 136,},</div><div class='add'>+	{.center_freq = 5700, .hw_value = 140,},</div><div class='add'>+	{.center_freq = 5745, .hw_value = 149,},</div><div class='add'>+	{.center_freq = 5765, .hw_value = 153,},</div><div class='add'>+	{.center_freq = 5785, .hw_value = 157,},</div><div class='add'>+	{.center_freq = 5805, .hw_value = 161,},</div><div class='add'>+	{.center_freq = 5825, .hw_value = 165,</div><div class='add'>+	 .flags = IEEE80211_CHAN_NO_HT40MINUS},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_rate rtw_ratetable[] = {</div><div class='add'>+	{.bitrate = 10, .hw_value = 0x00,},</div><div class='add'>+	{.bitrate = 20, .hw_value = 0x01,},</div><div class='add'>+	{.bitrate = 55, .hw_value = 0x02,},</div><div class='add'>+	{.bitrate = 110, .hw_value = 0x03,},</div><div class='add'>+	{.bitrate = 60, .hw_value = 0x04,},</div><div class='add'>+	{.bitrate = 90, .hw_value = 0x05,},</div><div class='add'>+	{.bitrate = 120, .hw_value = 0x06,},</div><div class='add'>+	{.bitrate = 180, .hw_value = 0x07,},</div><div class='add'>+	{.bitrate = 240, .hw_value = 0x08,},</div><div class='add'>+	{.bitrate = 360, .hw_value = 0x09,},</div><div class='add'>+	{.bitrate = 480, .hw_value = 0x0a,},</div><div class='add'>+	{.bitrate = 540, .hw_value = 0x0b,},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_supported_band rtw_band_2ghz = {</div><div class='add'>+	.band = NL80211_BAND_2GHZ,</div><div class='add'>+</div><div class='add'>+	.channels = rtw_channeltable_2g,</div><div class='add'>+	.n_channels = ARRAY_SIZE(rtw_channeltable_2g),</div><div class='add'>+</div><div class='add'>+	.bitrates = rtw_ratetable,</div><div class='add'>+	.n_bitrates = ARRAY_SIZE(rtw_ratetable),</div><div class='add'>+</div><div class='add'>+	.ht_cap = {0},</div><div class='add'>+	.vht_cap = {0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_supported_band rtw_band_5ghz = {</div><div class='add'>+	.band = NL80211_BAND_5GHZ,</div><div class='add'>+</div><div class='add'>+	.channels = rtw_channeltable_5g,</div><div class='add'>+	.n_channels = ARRAY_SIZE(rtw_channeltable_5g),</div><div class='add'>+</div><div class='add'>+	/* 5G has no CCK rates */</div><div class='add'>+	.bitrates = rtw_ratetable + 4,</div><div class='add'>+	.n_bitrates = ARRAY_SIZE(rtw_ratetable) - 4,</div><div class='add'>+</div><div class='add'>+	.ht_cap = {0},</div><div class='add'>+	.vht_cap = {0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_watch_dog_iter_data {</div><div class='add'>+	struct rtw_vif *rtwvif;</div><div class='add'>+	bool active;</div><div class='add'>+	u8 assoc_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtw_vif_watch_dog_iter(void *data, u8 *mac,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_watch_dog_iter_data *iter_data = data;</div><div class='add'>+	struct rtw_vif *rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		if (vif-&gt;bss_conf.assoc) {</div><div class='add'>+			iter_data-&gt;assoc_cnt++;</div><div class='add'>+			iter_data-&gt;rtwvif = rtwvif;</div><div class='add'>+		}</div><div class='add'>+		if (rtwvif-&gt;stats.tx_cnt &gt; RTW_LPS_THRESHOLD ||</div><div class='add'>+		    rtwvif-&gt;stats.rx_cnt &gt; RTW_LPS_THRESHOLD)</div><div class='add'>+			iter_data-&gt;active = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* only STATION mode can enter lps */</div><div class='add'>+		iter_data-&gt;active = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtwvif-&gt;stats.tx_unicast = 0;</div><div class='add'>+	rtwvif-&gt;stats.rx_unicast = 0;</div><div class='add'>+	rtwvif-&gt;stats.tx_cnt = 0;</div><div class='add'>+	rtwvif-&gt;stats.rx_cnt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* process TX/RX statistics periodically for hardware,</div><div class='add'>+ * the information helps hardware to enhance performance</div><div class='add'>+ */</div><div class='add'>+static void rtw_watch_dog_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,</div><div class='add'>+					      watch_dog_work.work);</div><div class='add'>+	struct rtw_watch_dog_iter_data data = {};</div><div class='add'>+</div><div class='add'>+	if (!rtw_flag_check(rtwdev, RTW_FLAG_RUNNING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(rtwdev-&gt;hw, &amp;rtwdev-&gt;watch_dog_work,</div><div class='add'>+				     RTW_WATCH_DOG_DELAY_TIME);</div><div class='add'>+</div><div class='add'>+	/* reset tx/rx statictics */</div><div class='add'>+	rtwdev-&gt;stats.tx_unicast = 0;</div><div class='add'>+	rtwdev-&gt;stats.rx_unicast = 0;</div><div class='add'>+	rtwdev-&gt;stats.tx_cnt = 0;</div><div class='add'>+	rtwdev-&gt;stats.rx_cnt = 0;</div><div class='add'>+</div><div class='add'>+	rtw_iterate_vifs(rtwdev, rtw_vif_watch_dog_iter, &amp;data);</div><div class='add'>+</div><div class='add'>+	/* fw supports only one station associated to enter lps, if there are</div><div class='add'>+	 * more than two stations associated to the AP, then we can not enter</div><div class='add'>+	 * lps, because fw does not handle the overlapped beacon interval</div><div class='add'>+	 */</div><div class='add'>+	if (rtw_fw_support_lps &amp;&amp;</div><div class='add'>+	    data.rtwvif &amp;&amp; !data.active &amp;&amp; data.assoc_cnt == 1)</div><div class='add'>+		rtw_enter_lps(rtwdev, data.rtwvif);</div><div class='add'>+</div><div class='add'>+	if (rtw_flag_check(rtwdev, RTW_FLAG_SCANNING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtw_phy_dynamic_mechanism(rtwdev);</div><div class='add'>+</div><div class='add'>+	rtwdev-&gt;watch_dog_cnt++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_c2h_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = container_of(work, struct rtw_dev, c2h_work);</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(&amp;rtwdev-&gt;c2h_queue, skb, tmp) {</div><div class='add'>+		skb_unlink(skb, &amp;rtwdev-&gt;c2h_queue);</div><div class='add'>+		rtw_fw_c2h_cmd_handle(rtwdev, skb);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_get_channel_params(struct cfg80211_chan_def *chandef,</div><div class='add'>+			    struct rtw_channel_params *chan_params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *channel = chandef-&gt;chan;</div><div class='add'>+	enum nl80211_chan_width width = chandef-&gt;width;</div><div class='add'>+	u32 primary_freq, center_freq;</div><div class='add'>+	u8 center_chan;</div><div class='add'>+	u8 bandwidth = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+	u8 primary_chan_idx = 0;</div><div class='add'>+</div><div class='add'>+	center_chan = channel-&gt;hw_value;</div><div class='add'>+	primary_freq = channel-&gt;center_freq;</div><div class='add'>+	center_freq = chandef-&gt;center_freq1;</div><div class='add'>+</div><div class='add'>+	switch (width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+		bandwidth = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+		primary_chan_idx = 0;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		bandwidth = RTW_CHANNEL_WIDTH_40;</div><div class='add'>+		if (primary_freq &gt; center_freq) {</div><div class='add'>+			primary_chan_idx = 1;</div><div class='add'>+			center_chan -= 2;</div><div class='add'>+		} else {</div><div class='add'>+			primary_chan_idx = 2;</div><div class='add'>+			center_chan += 2;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		bandwidth = RTW_CHANNEL_WIDTH_80;</div><div class='add'>+		if (primary_freq &gt; center_freq) {</div><div class='add'>+			if (primary_freq - center_freq == 10) {</div><div class='add'>+				primary_chan_idx = 1;</div><div class='add'>+				center_chan -= 2;</div><div class='add'>+			} else {</div><div class='add'>+				primary_chan_idx = 3;</div><div class='add'>+				center_chan -= 6;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (center_freq - primary_freq == 10) {</div><div class='add'>+				primary_chan_idx = 2;</div><div class='add'>+				center_chan += 2;</div><div class='add'>+			} else {</div><div class='add'>+				primary_chan_idx = 4;</div><div class='add'>+				center_chan += 6;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		center_chan = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chan_params-&gt;center_chan = center_chan;</div><div class='add'>+	chan_params-&gt;bandwidth = bandwidth;</div><div class='add'>+	chan_params-&gt;primary_chan_idx = primary_chan_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_set_channel(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = rtwdev-&gt;hw;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_channel_params ch_param;</div><div class='add'>+	u8 center_chan, bandwidth, primary_chan_idx;</div><div class='add'>+</div><div class='add'>+	rtw_get_channel_params(&amp;hw-&gt;conf.chandef, &amp;ch_param);</div><div class='add'>+	if (WARN(ch_param.center_chan == 0, "Invalid channel\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	center_chan = ch_param.center_chan;</div><div class='add'>+	bandwidth = ch_param.bandwidth;</div><div class='add'>+	primary_chan_idx = ch_param.primary_chan_idx;</div><div class='add'>+</div><div class='add'>+	hal-&gt;current_band_width = bandwidth;</div><div class='add'>+	hal-&gt;current_channel = center_chan;</div><div class='add'>+	hal-&gt;current_band_type = center_chan &gt; 14 ? RTW_BAND_5G : RTW_BAND_2G;</div><div class='add'>+	chip-&gt;ops-&gt;set_channel(rtwdev, center_chan, bandwidth, primary_chan_idx);</div><div class='add'>+</div><div class='add'>+	rtw_phy_set_tx_power_level(rtwdev, center_chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_vif_write_addr(struct rtw_dev *rtwdev, u32 start, u8 *addr)</div><div class='add'>+{</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'>+		rtw_write8(rtwdev, start + i, addr[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_vif_port_config(struct rtw_dev *rtwdev,</div><div class='add'>+			 struct rtw_vif *rtwvif,</div><div class='add'>+			 u32 config)</div><div class='add'>+{</div><div class='add'>+	u32 addr, mask;</div><div class='add'>+</div><div class='add'>+	if (config &amp; PORT_SET_MAC_ADDR) {</div><div class='add'>+		addr = rtwvif-&gt;conf-&gt;mac_addr.addr;</div><div class='add'>+		rtw_vif_write_addr(rtwdev, addr, rtwvif-&gt;mac_addr);</div><div class='add'>+	}</div><div class='add'>+	if (config &amp; PORT_SET_BSSID) {</div><div class='add'>+		addr = rtwvif-&gt;conf-&gt;bssid.addr;</div><div class='add'>+		rtw_vif_write_addr(rtwdev, addr, rtwvif-&gt;bssid);</div><div class='add'>+	}</div><div class='add'>+	if (config &amp; PORT_SET_NET_TYPE) {</div><div class='add'>+		addr = rtwvif-&gt;conf-&gt;net_type.addr;</div><div class='add'>+		mask = rtwvif-&gt;conf-&gt;net_type.mask;</div><div class='add'>+		rtw_write32_mask(rtwdev, addr, mask, rtwvif-&gt;net_type);</div><div class='add'>+	}</div><div class='add'>+	if (config &amp; PORT_SET_AID) {</div><div class='add'>+		addr = rtwvif-&gt;conf-&gt;aid.addr;</div><div class='add'>+		mask = rtwvif-&gt;conf-&gt;aid.mask;</div><div class='add'>+		rtw_write32_mask(rtwdev, addr, mask, rtwvif-&gt;aid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 hw_bw_cap_to_bitamp(u8 bw_cap)</div><div class='add'>+{</div><div class='add'>+	u8 bw = 0;</div><div class='add'>+</div><div class='add'>+	switch (bw_cap) {</div><div class='add'>+	case EFUSE_HW_CAP_IGNORE:</div><div class='add'>+	case EFUSE_HW_CAP_SUPP_BW80:</div><div class='add'>+		bw |= BIT(RTW_CHANNEL_WIDTH_80);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case EFUSE_HW_CAP_SUPP_BW40:</div><div class='add'>+		bw |= BIT(RTW_CHANNEL_WIDTH_40);</div><div class='add'>+		/* fall through */</div><div class='add'>+	default:</div><div class='add'>+		bw |= BIT(RTW_CHANNEL_WIDTH_20);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_hw_config_rf_ant_num(struct rtw_dev *rtwdev, u8 hw_ant_num)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+</div><div class='add'>+	if (hw_ant_num == EFUSE_HW_CAP_IGNORE ||</div><div class='add'>+	    hw_ant_num &gt;= hal-&gt;rf_path_num)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (hw_ant_num) {</div><div class='add'>+	case 1:</div><div class='add'>+		hal-&gt;rf_type = RF_1T1R;</div><div class='add'>+		hal-&gt;rf_path_num = 1;</div><div class='add'>+		hal-&gt;antenna_tx = BB_PATH_A;</div><div class='add'>+		hal-&gt;antenna_rx = BB_PATH_A;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "invalid hw configuration from efuse\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 get_vht_ra_mask(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	u64 ra_mask = 0;</div><div class='add'>+	u16 mcs_map = le16_to_cpu(sta-&gt;vht_cap.vht_mcs.rx_mcs_map);</div><div class='add'>+	u8 vht_mcs_cap;</div><div class='add'>+	int i, nss;</div><div class='add'>+</div><div class='add'>+	/* 4SS, every two bits for MCS7/8/9 */</div><div class='add'>+	for (i = 0, nss = 12; i &lt; 4; i++, mcs_map &gt;&gt;= 2, nss += 10) {</div><div class='add'>+		vht_mcs_cap = mcs_map &amp; 0x3;</div><div class='add'>+		switch (vht_mcs_cap) {</div><div class='add'>+		case 2: /* MCS9 */</div><div class='add'>+			ra_mask |= 0x3ffULL &lt;&lt; nss;</div><div class='add'>+			break;</div><div class='add'>+		case 1: /* MCS8 */</div><div class='add'>+			ra_mask |= 0x1ffULL &lt;&lt; nss;</div><div class='add'>+			break;</div><div class='add'>+		case 0: /* MCS7 */</div><div class='add'>+			ra_mask |= 0x0ffULL &lt;&lt; nss;</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'>+	return ra_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_rate_id(u8 wireless_set, enum rtw_bandwidth bw_mode, u8 tx_num)</div><div class='add'>+{</div><div class='add'>+	u8 rate_id = 0;</div><div class='add'>+</div><div class='add'>+	switch (wireless_set) {</div><div class='add'>+	case WIRELESS_CCK:</div><div class='add'>+		rate_id = RTW_RATEID_B_20M;</div><div class='add'>+		break;</div><div class='add'>+	case WIRELESS_OFDM:</div><div class='add'>+		rate_id = RTW_RATEID_G;</div><div class='add'>+		break;</div><div class='add'>+	case WIRELESS_CCK | WIRELESS_OFDM:</div><div class='add'>+		rate_id = RTW_RATEID_BG;</div><div class='add'>+		break;</div><div class='add'>+	case WIRELESS_OFDM | WIRELESS_HT:</div><div class='add'>+		if (tx_num == 1)</div><div class='add'>+			rate_id = RTW_RATEID_GN_N1SS;</div><div class='add'>+		else if (tx_num == 2)</div><div class='add'>+			rate_id = RTW_RATEID_GN_N2SS;</div><div class='add'>+		else if (tx_num == 3)</div><div class='add'>+			rate_id = RTW_RATEID_ARFR5_N_3SS;</div><div class='add'>+		break;</div><div class='add'>+	case WIRELESS_CCK | WIRELESS_OFDM | WIRELESS_HT:</div><div class='add'>+		if (bw_mode == RTW_CHANNEL_WIDTH_40) {</div><div class='add'>+			if (tx_num == 1)</div><div class='add'>+				rate_id = RTW_RATEID_BGN_40M_1SS;</div><div class='add'>+			else if (tx_num == 2)</div><div class='add'>+				rate_id = RTW_RATEID_BGN_40M_2SS;</div><div class='add'>+			else if (tx_num == 3)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR5_N_3SS;</div><div class='add'>+			else if (tx_num == 4)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR7_N_4SS;</div><div class='add'>+		} else {</div><div class='add'>+			if (tx_num == 1)</div><div class='add'>+				rate_id = RTW_RATEID_BGN_20M_1SS;</div><div class='add'>+			else if (tx_num == 2)</div><div class='add'>+				rate_id = RTW_RATEID_BGN_20M_2SS;</div><div class='add'>+			else if (tx_num == 3)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR5_N_3SS;</div><div class='add'>+			else if (tx_num == 4)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR7_N_4SS;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WIRELESS_OFDM | WIRELESS_VHT:</div><div class='add'>+		if (tx_num == 1)</div><div class='add'>+			rate_id = RTW_RATEID_ARFR1_AC_1SS;</div><div class='add'>+		else if (tx_num == 2)</div><div class='add'>+			rate_id = RTW_RATEID_ARFR0_AC_2SS;</div><div class='add'>+		else if (tx_num == 3)</div><div class='add'>+			rate_id = RTW_RATEID_ARFR4_AC_3SS;</div><div class='add'>+		else if (tx_num == 4)</div><div class='add'>+			rate_id = RTW_RATEID_ARFR6_AC_4SS;</div><div class='add'>+		break;</div><div class='add'>+	case WIRELESS_CCK | WIRELESS_OFDM | WIRELESS_VHT:</div><div class='add'>+		if (bw_mode &gt;= RTW_CHANNEL_WIDTH_80) {</div><div class='add'>+			if (tx_num == 1)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR1_AC_1SS;</div><div class='add'>+			else if (tx_num == 2)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR0_AC_2SS;</div><div class='add'>+			else if (tx_num == 3)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR4_AC_3SS;</div><div class='add'>+			else if (tx_num == 4)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR6_AC_4SS;</div><div class='add'>+		} else {</div><div class='add'>+			if (tx_num == 1)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR2_AC_2G_1SS;</div><div class='add'>+			else if (tx_num == 2)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR3_AC_2G_2SS;</div><div class='add'>+			else if (tx_num == 3)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR4_AC_3SS;</div><div class='add'>+			else if (tx_num == 4)</div><div class='add'>+				rate_id = RTW_RATEID_ARFR6_AC_4SS;</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 rate_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RA_MASK_CCK_RATES	0x0000f</div><div class='add'>+#define RA_MASK_OFDM_RATES	0x00ff0</div><div class='add'>+#define RA_MASK_HT_RATES_1SS	(0xff000ULL &lt;&lt; 0)</div><div class='add'>+#define RA_MASK_HT_RATES_2SS	(0xff000ULL &lt;&lt; 8)</div><div class='add'>+#define RA_MASK_HT_RATES_3SS	(0xff000ULL &lt;&lt; 16)</div><div class='add'>+#define RA_MASK_HT_RATES	(RA_MASK_HT_RATES_1SS | \</div><div class='add'>+				 RA_MASK_HT_RATES_2SS | \</div><div class='add'>+				 RA_MASK_HT_RATES_3SS)</div><div class='add'>+#define RA_MASK_VHT_RATES_1SS	(0x3ff000ULL &lt;&lt; 0)</div><div class='add'>+#define RA_MASK_VHT_RATES_2SS	(0x3ff000ULL &lt;&lt; 10)</div><div class='add'>+#define RA_MASK_VHT_RATES_3SS	(0x3ff000ULL &lt;&lt; 20)</div><div class='add'>+#define RA_MASK_VHT_RATES	(RA_MASK_VHT_RATES_1SS | \</div><div class='add'>+				 RA_MASK_VHT_RATES_2SS | \</div><div class='add'>+				 RA_MASK_VHT_RATES_3SS)</div><div class='add'>+#define RA_MASK_CCK_IN_HT	0x00005</div><div class='add'>+#define RA_MASK_CCK_IN_VHT	0x00005</div><div class='add'>+#define RA_MASK_OFDM_IN_VHT	0x00010</div><div class='add'>+#define RA_MASK_OFDM_IN_HT_2G	0x00010</div><div class='add'>+#define RA_MASK_OFDM_IN_HT_5G	0x00030</div><div class='add'>+</div><div class='add'>+void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = si-&gt;sta;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 rssi_level;</div><div class='add'>+	u8 wireless_set;</div><div class='add'>+	u8 bw_mode;</div><div class='add'>+	u8 rate_id;</div><div class='add'>+	u8 rf_type = RF_1T1R;</div><div class='add'>+	u8 stbc_en = 0;</div><div class='add'>+	u8 ldpc_en = 0;</div><div class='add'>+	u8 tx_num = 1;</div><div class='add'>+	u64 ra_mask = 0;</div><div class='add'>+	bool is_vht_enable = false;</div><div class='add'>+	bool is_support_sgi = false;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		is_vht_enable = true;</div><div class='add'>+		ra_mask |= get_vht_ra_mask(sta);</div><div class='add'>+		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXSTBC_MASK)</div><div class='add'>+			stbc_en = VHT_STBC_EN;</div><div class='add'>+		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC)</div><div class='add'>+			ldpc_en = VHT_LDPC_EN;</div><div class='add'>+		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='add'>+			is_support_sgi = true;</div><div class='add'>+	} else if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+		ra_mask |= (sta-&gt;ht_cap.mcs.rx_mask[NL80211_BAND_5GHZ] &lt;&lt; 20) |</div><div class='add'>+			   (sta-&gt;ht_cap.mcs.rx_mask[NL80211_BAND_2GHZ] &lt;&lt; 12);</div><div class='add'>+		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_RX_STBC)</div><div class='add'>+			stbc_en = HT_STBC_EN;</div><div class='add'>+		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING)</div><div class='add'>+			ldpc_en = HT_LDPC_EN;</div><div class='add'>+		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20 ||</div><div class='add'>+		    sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='add'>+			is_support_sgi = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hal-&gt;current_band_type == RTW_BAND_5G) {</div><div class='add'>+		ra_mask |= (u64)sta-&gt;supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 4;</div><div class='add'>+		if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+			ra_mask &amp;= RA_MASK_VHT_RATES | RA_MASK_OFDM_IN_VHT;</div><div class='add'>+			wireless_set = WIRELESS_OFDM | WIRELESS_VHT;</div><div class='add'>+		} else if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+			ra_mask &amp;= RA_MASK_HT_RATES | RA_MASK_OFDM_IN_HT_5G;</div><div class='add'>+			wireless_set = WIRELESS_OFDM | WIRELESS_HT;</div><div class='add'>+		} else {</div><div class='add'>+			wireless_set = WIRELESS_OFDM;</div><div class='add'>+		}</div><div class='add'>+	} else if (hal-&gt;current_band_type == RTW_BAND_2G) {</div><div class='add'>+		ra_mask |= sta-&gt;supp_rates[NL80211_BAND_2GHZ];</div><div class='add'>+		if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+			ra_mask &amp;= RA_MASK_VHT_RATES | RA_MASK_CCK_IN_VHT |</div><div class='add'>+				   RA_MASK_OFDM_IN_VHT;</div><div class='add'>+			wireless_set = WIRELESS_CCK | WIRELESS_OFDM |</div><div class='add'>+				       WIRELESS_HT | WIRELESS_VHT;</div><div class='add'>+		} else if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+			ra_mask &amp;= RA_MASK_HT_RATES | RA_MASK_CCK_IN_HT |</div><div class='add'>+				   RA_MASK_OFDM_IN_HT_2G;</div><div class='add'>+			wireless_set = WIRELESS_CCK | WIRELESS_OFDM |</div><div class='add'>+				       WIRELESS_HT;</div><div class='add'>+		} else if (sta-&gt;supp_rates[0] &lt;= 0xf) {</div><div class='add'>+			wireless_set = WIRELESS_CCK;</div><div class='add'>+		} else {</div><div class='add'>+			wireless_set = WIRELESS_CCK | WIRELESS_OFDM;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rtw_err(rtwdev, "Unknown band type\n");</div><div class='add'>+		wireless_set = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (efuse-&gt;hw_cap.nss == 1) {</div><div class='add'>+		ra_mask &amp;= RA_MASK_VHT_RATES_1SS;</div><div class='add'>+		ra_mask &amp;= RA_MASK_HT_RATES_1SS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (sta-&gt;bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		bw_mode = RTW_CHANNEL_WIDTH_80;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		bw_mode = RTW_CHANNEL_WIDTH_40;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bw_mode = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;vht_cap.vht_supported &amp;&amp; ra_mask &amp; 0xffc00000) {</div><div class='add'>+		tx_num = 2;</div><div class='add'>+		rf_type = RF_2T2R;</div><div class='add'>+	} else if (sta-&gt;ht_cap.ht_supported &amp;&amp; ra_mask &amp; 0xfff00000) {</div><div class='add'>+		tx_num = 2;</div><div class='add'>+		rf_type = RF_2T2R;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate_id = get_rate_id(wireless_set, bw_mode, tx_num);</div><div class='add'>+</div><div class='add'>+	if (wireless_set != WIRELESS_CCK) {</div><div class='add'>+		rssi_level = si-&gt;rssi_level;</div><div class='add'>+		if (rssi_level == 0)</div><div class='add'>+			ra_mask &amp;= 0xffffffffffffffffULL;</div><div class='add'>+		else if (rssi_level == 1)</div><div class='add'>+			ra_mask &amp;= 0xfffffffffffffff0ULL;</div><div class='add'>+		else if (rssi_level == 2)</div><div class='add'>+			ra_mask &amp;= 0xffffffffffffefe0ULL;</div><div class='add'>+		else if (rssi_level == 3)</div><div class='add'>+			ra_mask &amp;= 0xffffffffffffcfc0ULL;</div><div class='add'>+		else if (rssi_level == 4)</div><div class='add'>+			ra_mask &amp;= 0xffffffffffff8f80ULL;</div><div class='add'>+		else if (rssi_level &gt;= 5)</div><div class='add'>+			ra_mask &amp;= 0xffffffffffff0f00ULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	si-&gt;bw_mode = bw_mode;</div><div class='add'>+	si-&gt;stbc_en = stbc_en;</div><div class='add'>+	si-&gt;ldpc_en = ldpc_en;</div><div class='add'>+	si-&gt;rf_type = rf_type;</div><div class='add'>+	si-&gt;wireless_set = wireless_set;</div><div class='add'>+	si-&gt;sgi_enable = is_support_sgi;</div><div class='add'>+	si-&gt;vht_enable = is_vht_enable;</div><div class='add'>+	si-&gt;ra_mask = ra_mask;</div><div class='add'>+	si-&gt;rate_id = rate_id;</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_ra_info(rtwdev, si);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_power_on(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_fw_state *fw = &amp;rtwdev-&gt;fw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_hci_setup(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup hci\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* power on MAC before firmware downloaded */</div><div class='add'>+	ret = rtw_mac_power_on(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to power on mac\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;fw-&gt;completion);</div><div class='add'>+	if (!fw-&gt;firmware) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rtw_err(rtwdev, "failed to load firmware\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_download_firmware(rtwdev, fw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to download firmware\n");</div><div class='add'>+		goto err_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* config mac after firmware downloaded */</div><div class='add'>+	ret = rtw_mac_init(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to configure mac\n");</div><div class='add'>+		goto err_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;ops-&gt;phy_set_param(rtwdev);</div><div class='add'>+</div><div class='add'>+	ret = rtw_hci_start(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to start hci\n");</div><div class='add'>+		goto err_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_off:</div><div class='add'>+	rtw_mac_power_off(rtwdev);</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'>+int rtw_core_start(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_power_on(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rtw_sec_enable_sec_engine(rtwdev);</div><div class='add'>+</div><div class='add'>+	/* rcr reset after powered on */</div><div class='add'>+	rtw_write32(rtwdev, REG_RCR, rtwdev-&gt;hal.rcr);</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(rtwdev-&gt;hw, &amp;rtwdev-&gt;watch_dog_work,</div><div class='add'>+				     RTW_WATCH_DOG_DELAY_TIME);</div><div class='add'>+</div><div class='add'>+	rtw_flag_set(rtwdev, RTW_FLAG_RUNNING);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_power_off(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtwdev-&gt;hci.ops-&gt;stop(rtwdev);</div><div class='add'>+	rtw_mac_power_off(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_core_stop(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_flag_clear(rtwdev, RTW_FLAG_RUNNING);</div><div class='add'>+	rtw_flag_clear(rtwdev, RTW_FLAG_FW_RUNNING);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;rtwdev-&gt;watch_dog_work);</div><div class='add'>+</div><div class='add'>+	rtw_power_off(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_init_ht_cap(struct rtw_dev *rtwdev,</div><div class='add'>+			    struct ieee80211_sta_ht_cap *ht_cap)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+</div><div class='add'>+	ht_cap-&gt;ht_supported = true;</div><div class='add'>+	ht_cap-&gt;cap = 0;</div><div class='add'>+	ht_cap-&gt;cap |= IEEE80211_HT_CAP_SGI_20 |</div><div class='add'>+			IEEE80211_HT_CAP_MAX_AMSDU |</div><div class='add'>+			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='add'>+			(1 &lt;&lt; IEEE80211_HT_CAP_RX_STBC_SHIFT);</div><div class='add'>+	if (efuse-&gt;hw_cap.bw &amp; BIT(RTW_CHANNEL_WIDTH_40))</div><div class='add'>+		ht_cap-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40 |</div><div class='add'>+				IEEE80211_HT_CAP_DSSSCCK40 |</div><div class='add'>+				IEEE80211_HT_CAP_SGI_40;</div><div class='add'>+	ht_cap-&gt;ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='add'>+	ht_cap-&gt;ampdu_density = IEEE80211_HT_MPDU_DENSITY_16;</div><div class='add'>+	ht_cap-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='add'>+	if (efuse-&gt;hw_cap.nss &gt; 1) {</div><div class='add'>+		ht_cap-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='add'>+		ht_cap-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='add'>+		ht_cap-&gt;mcs.rx_mask[4] = 0x01;</div><div class='add'>+		ht_cap-&gt;mcs.rx_highest = cpu_to_le16(300);</div><div class='add'>+	} else {</div><div class='add'>+		ht_cap-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='add'>+		ht_cap-&gt;mcs.rx_mask[1] = 0x00;</div><div class='add'>+		ht_cap-&gt;mcs.rx_mask[4] = 0x01;</div><div class='add'>+		ht_cap-&gt;mcs.rx_highest = cpu_to_le16(150);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_init_vht_cap(struct rtw_dev *rtwdev,</div><div class='add'>+			     struct ieee80211_sta_vht_cap *vht_cap)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u16 mcs_map;</div><div class='add'>+	__le16 highest;</div><div class='add'>+</div><div class='add'>+	if (efuse-&gt;hw_cap.ptcl != EFUSE_HW_CAP_IGNORE &amp;&amp;</div><div class='add'>+	    efuse-&gt;hw_cap.ptcl != EFUSE_HW_CAP_PTCL_VHT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vht_cap-&gt;vht_supported = true;</div><div class='add'>+	vht_cap-&gt;cap = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='add'>+		       IEEE80211_VHT_CAP_RXLDPC |</div><div class='add'>+		       IEEE80211_VHT_CAP_SHORT_GI_80 |</div><div class='add'>+		       IEEE80211_VHT_CAP_TXSTBC |</div><div class='add'>+		       IEEE80211_VHT_CAP_RXSTBC_1 |</div><div class='add'>+		       IEEE80211_VHT_CAP_HTC_VHT |</div><div class='add'>+		       IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |</div><div class='add'>+		       0;</div><div class='add'>+	mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; 0 |</div><div class='add'>+		  IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 4 |</div><div class='add'>+		  IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 6 |</div><div class='add'>+		  IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 8 |</div><div class='add'>+		  IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 10 |</div><div class='add'>+		  IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 12 |</div><div class='add'>+		  IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 14;</div><div class='add'>+	if (efuse-&gt;hw_cap.nss &gt; 1) {</div><div class='add'>+		highest = cpu_to_le16(780);</div><div class='add'>+		mcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; 2;</div><div class='add'>+	} else {</div><div class='add'>+		highest = cpu_to_le16(390);</div><div class='add'>+		mcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vht_cap-&gt;vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);</div><div class='add'>+	vht_cap-&gt;vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);</div><div class='add'>+	vht_cap-&gt;vht_mcs.rx_highest = highest;</div><div class='add'>+	vht_cap-&gt;vht_mcs.tx_highest = highest;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_set_supported_band(struct ieee80211_hw *hw,</div><div class='add'>+				   struct rtw_chip_info *chip)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;band &amp; RTW_BAND_2G) {</div><div class='add'>+		sband = kmemdup(&amp;rtw_band_2ghz, sizeof(*sband), GFP_KERNEL);</div><div class='add'>+		if (!sband)</div><div class='add'>+			goto err_out;</div><div class='add'>+		if (chip-&gt;ht_supported)</div><div class='add'>+			rtw_init_ht_cap(rtwdev, &amp;sband-&gt;ht_cap);</div><div class='add'>+		hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ] = sband;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;band &amp; RTW_BAND_5G) {</div><div class='add'>+		sband = kmemdup(&amp;rtw_band_5ghz, sizeof(*sband), GFP_KERNEL);</div><div class='add'>+		if (!sband)</div><div class='add'>+			goto err_out;</div><div class='add'>+		if (chip-&gt;ht_supported)</div><div class='add'>+			rtw_init_ht_cap(rtwdev, &amp;sband-&gt;ht_cap);</div><div class='add'>+		if (chip-&gt;vht_supported)</div><div class='add'>+			rtw_init_vht_cap(rtwdev, &amp;sband-&gt;vht_cap);</div><div class='add'>+		hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ] = sband;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	rtw_err(rtwdev, "failed to set supported band\n");</div><div class='add'>+	kfree(sband);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_unset_supported_band(struct ieee80211_hw *hw,</div><div class='add'>+				     struct rtw_chip_info *chip)</div><div class='add'>+{</div><div class='add'>+	kfree(hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ]);</div><div class='add'>+	kfree(hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_load_firmware_cb(const struct firmware *firmware, void *context)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = context;</div><div class='add'>+	struct rtw_fw_state *fw = &amp;rtwdev-&gt;fw;</div><div class='add'>+</div><div class='add'>+	if (!firmware)</div><div class='add'>+		rtw_err(rtwdev, "failed to request firmware\n");</div><div class='add'>+</div><div class='add'>+	fw-&gt;firmware = firmware;</div><div class='add'>+	complete_all(&amp;fw-&gt;completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_load_firmware(struct rtw_dev *rtwdev, const char *fw_name)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fw_state *fw = &amp;rtwdev-&gt;fw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;fw-&gt;completion);</div><div class='add'>+</div><div class='add'>+	ret = request_firmware_nowait(THIS_MODULE, true, fw_name, rtwdev-&gt;dev,</div><div class='add'>+				      GFP_KERNEL, rtwdev, rtw_load_firmware_cb);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "async firmware request failed\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 rtw_chip_parameter_setup(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u32 wl_bt_pwr_ctrl;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		rtwdev-&gt;hci.rpwm_addr = 0x03d9;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rtw_err(rtwdev, "unsupported hci type\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wl_bt_pwr_ctrl = rtw_read32(rtwdev, REG_WL_BT_PWR_CTRL);</div><div class='add'>+	if (wl_bt_pwr_ctrl &amp; BIT_BT_FUNC_EN)</div><div class='add'>+		rtwdev-&gt;efuse.btcoex = true;</div><div class='add'>+	hal-&gt;chip_version = rtw_read32(rtwdev, REG_SYS_CFG1);</div><div class='add'>+	hal-&gt;fab_version = BIT_GET_VENDOR_ID(hal-&gt;chip_version) &gt;&gt; 2;</div><div class='add'>+	hal-&gt;cut_version = BIT_GET_CHIP_VER(hal-&gt;chip_version);</div><div class='add'>+	hal-&gt;mp_chip = (hal-&gt;chip_version &amp; BIT_RTL_ID) ? 0 : 1;</div><div class='add'>+	if (hal-&gt;chip_version &amp; BIT_RF_TYPE_ID) {</div><div class='add'>+		hal-&gt;rf_type = RF_2T2R;</div><div class='add'>+		hal-&gt;rf_path_num = 2;</div><div class='add'>+		hal-&gt;antenna_tx = BB_PATH_AB;</div><div class='add'>+		hal-&gt;antenna_rx = BB_PATH_AB;</div><div class='add'>+	} else {</div><div class='add'>+		hal-&gt;rf_type = RF_1T1R;</div><div class='add'>+		hal-&gt;rf_path_num = 1;</div><div class='add'>+		hal-&gt;antenna_tx = BB_PATH_A;</div><div class='add'>+		hal-&gt;antenna_rx = BB_PATH_A;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hal-&gt;fab_version == 2)</div><div class='add'>+		hal-&gt;fab_version = 1;</div><div class='add'>+	else if (hal-&gt;fab_version == 1)</div><div class='add'>+		hal-&gt;fab_version = 2;</div><div class='add'>+</div><div class='add'>+	efuse-&gt;physical_size = chip-&gt;phy_efuse_size;</div><div class='add'>+	efuse-&gt;logical_size = chip-&gt;log_efuse_size;</div><div class='add'>+	efuse-&gt;protect_size = chip-&gt;ptct_efuse_size;</div><div class='add'>+</div><div class='add'>+	/* default use ack */</div><div class='add'>+	rtwdev-&gt;hal.rcr |= BIT_VHT_DACK;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_chip_efuse_enable(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fw_state *fw = &amp;rtwdev-&gt;fw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_hci_setup(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup hci\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_mac_power_on(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to power on mac\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_C2HEVT, C2H_HW_FEATURE_DUMP);</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;fw-&gt;completion);</div><div class='add'>+	if (!fw-&gt;firmware) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rtw_err(rtwdev, "failed to load firmware\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_download_firmware(rtwdev, fw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to download firmware\n");</div><div class='add'>+		goto err_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_off:</div><div class='add'>+	rtw_mac_power_off(rtwdev);</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 int rtw_dump_hw_feature(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u8 hw_feature[HW_FEATURE_LEN];</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 bw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	id = rtw_read8(rtwdev, REG_C2HEVT);</div><div class='add'>+	if (id != C2H_HW_FEATURE_REPORT) {</div><div class='add'>+		rtw_err(rtwdev, "failed to read hw feature report\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HW_FEATURE_LEN; i++)</div><div class='add'>+		hw_feature[i] = rtw_read8(rtwdev, REG_C2HEVT + 2 + i);</div><div class='add'>+</div><div class='add'>+	rtw_write8(rtwdev, REG_C2HEVT, 0);</div><div class='add'>+</div><div class='add'>+	bw = GET_EFUSE_HW_CAP_BW(hw_feature);</div><div class='add'>+	efuse-&gt;hw_cap.bw = hw_bw_cap_to_bitamp(bw);</div><div class='add'>+	efuse-&gt;hw_cap.hci = GET_EFUSE_HW_CAP_HCI(hw_feature);</div><div class='add'>+	efuse-&gt;hw_cap.nss = GET_EFUSE_HW_CAP_NSS(hw_feature);</div><div class='add'>+	efuse-&gt;hw_cap.ptcl = GET_EFUSE_HW_CAP_PTCL(hw_feature);</div><div class='add'>+	efuse-&gt;hw_cap.ant_num = GET_EFUSE_HW_CAP_ANT_NUM(hw_feature);</div><div class='add'>+</div><div class='add'>+	rtw_hw_config_rf_ant_num(rtwdev, efuse-&gt;hw_cap.ant_num);</div><div class='add'>+</div><div class='add'>+	if (efuse-&gt;hw_cap.nss == EFUSE_HW_CAP_IGNORE)</div><div class='add'>+		efuse-&gt;hw_cap.nss = rtwdev-&gt;hal.rf_path_num;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_EFUSE,</div><div class='add'>+		"hw cap: hci=0x%02x, bw=0x%02x, ptcl=0x%02x, ant_num=%d, nss=%d\n",</div><div class='add'>+		efuse-&gt;hw_cap.hci, efuse-&gt;hw_cap.bw, efuse-&gt;hw_cap.ptcl,</div><div class='add'>+		efuse-&gt;hw_cap.ant_num, efuse-&gt;hw_cap.nss);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_chip_efuse_disable(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_hci_stop(rtwdev);</div><div class='add'>+	rtw_mac_power_off(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_chip_efuse_info_setup(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* power on mac to read efuse */</div><div class='add'>+	ret = rtw_chip_efuse_enable(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtw_parse_efuse_map(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtw_dump_hw_feature(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtw_check_supported_rfe(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (efuse-&gt;crystal_cap == 0xff)</div><div class='add'>+		efuse-&gt;crystal_cap = 0;</div><div class='add'>+	if (efuse-&gt;pa_type_2g == 0xff)</div><div class='add'>+		efuse-&gt;pa_type_2g = 0;</div><div class='add'>+	if (efuse-&gt;pa_type_5g == 0xff)</div><div class='add'>+		efuse-&gt;pa_type_5g = 0;</div><div class='add'>+	if (efuse-&gt;lna_type_2g == 0xff)</div><div class='add'>+		efuse-&gt;lna_type_2g = 0;</div><div class='add'>+	if (efuse-&gt;lna_type_5g == 0xff)</div><div class='add'>+		efuse-&gt;lna_type_5g = 0;</div><div class='add'>+	if (efuse-&gt;channel_plan == 0xff)</div><div class='add'>+		efuse-&gt;channel_plan = 0x7f;</div><div class='add'>+	if (efuse-&gt;bt_setting &amp; BIT(0))</div><div class='add'>+		efuse-&gt;share_ant = true;</div><div class='add'>+	if (efuse-&gt;regd == 0xff)</div><div class='add'>+		efuse-&gt;regd = 0;</div><div class='add'>+</div><div class='add'>+	efuse-&gt;ext_pa_2g = efuse-&gt;pa_type_2g &amp; BIT(4) ? 1 : 0;</div><div class='add'>+	efuse-&gt;ext_lna_2g = efuse-&gt;lna_type_2g &amp; BIT(3) ? 1 : 0;</div><div class='add'>+	efuse-&gt;ext_pa_5g = efuse-&gt;pa_type_5g &amp; BIT(0) ? 1 : 0;</div><div class='add'>+	efuse-&gt;ext_lna_2g = efuse-&gt;lna_type_5g &amp; BIT(3) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	rtw_chip_efuse_disable(rtwdev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_chip_board_info_setup(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	const struct rtw_rfe_def *rfe_def = rtw_get_rfe_def(rtwdev);</div><div class='add'>+</div><div class='add'>+	if (!rfe_def)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	rtw_phy_setup_phy_cond(rtwdev, 0);</div><div class='add'>+</div><div class='add'>+	rtw_hw_init_tx_power(hal);</div><div class='add'>+	rtw_load_table(rtwdev, rfe_def-&gt;phy_pg_tbl);</div><div class='add'>+	rtw_load_table(rtwdev, rfe_def-&gt;txpwr_lmt_tbl);</div><div class='add'>+	rtw_phy_tx_power_by_rate_config(hal);</div><div class='add'>+	rtw_phy_tx_power_limit_config(hal);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_chip_info_setup(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_chip_parameter_setup(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup chip parameters\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_chip_efuse_info_setup(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup chip efuse info\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_chip_board_info_setup(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup chip board info\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_chip_info_setup);</div><div class='add'>+</div><div class='add'>+int rtw_core_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;rtwdev-&gt;rsvd_page_list);</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;rtwdev-&gt;tx_report.purge_timer,</div><div class='add'>+		    rtw_tx_report_purge_timer, 0);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;rtwdev-&gt;watch_dog_work, rtw_watch_dog_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;rtwdev-&gt;lps_work, rtw_lps_work);</div><div class='add'>+	INIT_WORK(&amp;rtwdev-&gt;c2h_work, rtw_c2h_work);</div><div class='add'>+	skb_queue_head_init(&amp;rtwdev-&gt;c2h_queue);</div><div class='add'>+	skb_queue_head_init(&amp;rtwdev-&gt;tx_report.queue);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;rtwdev-&gt;dm_lock);</div><div class='add'>+	spin_lock_init(&amp;rtwdev-&gt;rf_lock);</div><div class='add'>+	spin_lock_init(&amp;rtwdev-&gt;h2c.lock);</div><div class='add'>+	spin_lock_init(&amp;rtwdev-&gt;tx_report.q_lock);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	mutex_init(&amp;rtwdev-&gt;hal.tx_power_mutex);</div><div class='add'>+</div><div class='add'>+	rtwdev-&gt;sec.total_cam_num = 32;</div><div class='add'>+	rtwdev-&gt;hal.current_channel = 1;</div><div class='add'>+	set_bit(RTW_BC_MC_MACID, rtwdev-&gt;mac_id_map);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	rtw_add_rsvd_page(rtwdev, RSVD_BEACON, false);</div><div class='add'>+	mutex_unlock(&amp;rtwdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* default rx filter setting */</div><div class='add'>+	rtwdev-&gt;hal.rcr = BIT_APP_FCS | BIT_APP_MIC | BIT_APP_ICV |</div><div class='add'>+			  BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |</div><div class='add'>+			  BIT_AB | BIT_AM | BIT_APM;</div><div class='add'>+</div><div class='add'>+	ret = rtw_load_firmware(rtwdev, rtwdev-&gt;chip-&gt;fw_name);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_warn(rtwdev, "no firmware loaded\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(rtw_core_init);</div><div class='add'>+</div><div class='add'>+void rtw_core_deinit(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_fw_state *fw = &amp;rtwdev-&gt;fw;</div><div class='add'>+	struct rtw_rsvd_page *rsvd_pkt, *tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (fw-&gt;firmware)</div><div class='add'>+		release_firmware(fw-&gt;firmware);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rtwdev-&gt;tx_report.q_lock, flags);</div><div class='add'>+	skb_queue_purge(&amp;rtwdev-&gt;tx_report.queue);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtwdev-&gt;tx_report.q_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rsvd_pkt, tmp, &amp;rtwdev-&gt;rsvd_page_list, list) {</div><div class='add'>+		list_del(&amp;rsvd_pkt-&gt;list);</div><div class='add'>+		kfree(rsvd_pkt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;rtwdev-&gt;mutex);</div><div class='add'>+	mutex_destroy(&amp;rtwdev-&gt;hal.tx_power_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_core_deinit);</div><div class='add'>+</div><div class='add'>+int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	int max_tx_headroom = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* TODO: USB &amp; SDIO may need extra room? */</div><div class='add'>+	max_tx_headroom = rtwdev-&gt;chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+</div><div class='add'>+	hw-&gt;extra_tx_headroom = max_tx_headroom;</div><div class='add'>+	hw-&gt;queues = IEEE80211_NUM_ACS;</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct rtw_sta_info);</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct rtw_vif);</div><div class='add'>+</div><div class='add'>+	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='add'>+	ieee80211_hw_set(hw, RX_INCLUDES_FCS);</div><div class='add'>+	ieee80211_hw_set(hw, AMPDU_AGGREGATION);</div><div class='add'>+	ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='add'>+	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+				     BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+				     BIT(NL80211_IFTYPE_ADHOC) |</div><div class='add'>+				     BIT(NL80211_IFTYPE_MESH_POINT);</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_TDLS |</div><div class='add'>+			    WIPHY_FLAG_TDLS_EXTERNAL_SETUP;</div><div class='add'>+</div><div class='add'>+	rtw_set_supported_band(hw, rtwdev-&gt;chip);</div><div class='add'>+	SET_IEEE80211_PERM_ADDR(hw, rtwdev-&gt;efuse.addr);</div><div class='add'>+</div><div class='add'>+	rtw_regd_init(rtwdev, rtw_regd_notifier);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_register_hw(hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to register hw\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (regulatory_hint(hw-&gt;wiphy, rtwdev-&gt;regd.alpha2))</div><div class='add'>+		rtw_err(rtwdev, "regulatory_hint fail\n");</div><div class='add'>+</div><div class='add'>+	rtw_debugfs_init(rtwdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_register_hw);</div><div class='add'>+</div><div class='add'>+void rtw_unregister_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+</div><div class='add'>+	ieee80211_unregister_hw(hw);</div><div class='add'>+	rtw_unset_supported_band(hw, chip);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_unregister_hw);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Realtek Corporation");</div><div class='add'>+MODULE_DESCRIPTION("Realtek 802.11ac wireless core module");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h<br/>new file mode 100644<br/>index 000000000000..00fc77fb9b54<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/main.h</a></div><div class='hunk'>@@ -0,0 +1,1104 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTK_MAIN_H_</div><div class='add'>+#define __RTK_MAIN_H_</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/average.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'>+</div><div class='add'>+#include "util.h"</div><div class='add'>+</div><div class='add'>+#define RTW_MAX_MAC_ID_NUM		32</div><div class='add'>+#define RTW_MAX_SEC_CAM_NUM		32</div><div class='add'>+</div><div class='add'>+#define RTW_WATCH_DOG_DELAY_TIME	round_jiffies_relative(HZ * 2)</div><div class='add'>+</div><div class='add'>+#define RFREG_MASK			0xfffff</div><div class='add'>+#define INV_RF_DATA			0xffffffff</div><div class='add'>+#define TX_PAGE_SIZE_SHIFT		7</div><div class='add'>+</div><div class='add'>+#define RTW_CHANNEL_WIDTH_MAX		3</div><div class='add'>+#define RTW_RF_PATH_MAX			4</div><div class='add'>+#define HW_FEATURE_LEN			13</div><div class='add'>+</div><div class='add'>+extern unsigned int rtw_debug_mask;</div><div class='add'>+extern const struct ieee80211_ops rtw_ops;</div><div class='add'>+extern struct rtw_chip_info rtw8822b_hw_spec;</div><div class='add'>+extern struct rtw_chip_info rtw8822c_hw_spec;</div><div class='add'>+</div><div class='add'>+#define RTW_MAX_CHANNEL_NUM_2G 14</div><div class='add'>+#define RTW_MAX_CHANNEL_NUM_5G 49</div><div class='add'>+</div><div class='add'>+struct rtw_dev;</div><div class='add'>+</div><div class='add'>+enum rtw_hci_type {</div><div class='add'>+	RTW_HCI_TYPE_PCIE,</div><div class='add'>+	RTW_HCI_TYPE_USB,</div><div class='add'>+	RTW_HCI_TYPE_SDIO,</div><div class='add'>+</div><div class='add'>+	RTW_HCI_TYPE_UNDEFINE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_hci {</div><div class='add'>+	struct rtw_hci_ops *ops;</div><div class='add'>+	enum rtw_hci_type type;</div><div class='add'>+</div><div class='add'>+	u32 rpwm_addr;</div><div class='add'>+</div><div class='add'>+	u8 bulkout_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_supported_band {</div><div class='add'>+	RTW_BAND_2G = 1 &lt;&lt; 0,</div><div class='add'>+	RTW_BAND_5G = 1 &lt;&lt; 1,</div><div class='add'>+	RTW_BAND_60G = 1 &lt;&lt; 2,</div><div class='add'>+</div><div class='add'>+	RTW_BAND_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_bandwidth {</div><div class='add'>+	RTW_CHANNEL_WIDTH_20	= 0,</div><div class='add'>+	RTW_CHANNEL_WIDTH_40	= 1,</div><div class='add'>+	RTW_CHANNEL_WIDTH_80	= 2,</div><div class='add'>+	RTW_CHANNEL_WIDTH_160	= 3,</div><div class='add'>+	RTW_CHANNEL_WIDTH_80_80	= 4,</div><div class='add'>+	RTW_CHANNEL_WIDTH_5	= 5,</div><div class='add'>+	RTW_CHANNEL_WIDTH_10	= 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_net_type {</div><div class='add'>+	RTW_NET_NO_LINK		= 0,</div><div class='add'>+	RTW_NET_AD_HOC		= 1,</div><div class='add'>+	RTW_NET_MGD_LINKED	= 2,</div><div class='add'>+	RTW_NET_AP_MODE		= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_rf_type {</div><div class='add'>+	RF_1T1R			= 0,</div><div class='add'>+	RF_1T2R			= 1,</div><div class='add'>+	RF_2T2R			= 2,</div><div class='add'>+	RF_2T3R			= 3,</div><div class='add'>+	RF_2T4R			= 4,</div><div class='add'>+	RF_3T3R			= 5,</div><div class='add'>+	RF_3T4R			= 6,</div><div class='add'>+	RF_4T4R			= 7,</div><div class='add'>+	RF_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_rf_path {</div><div class='add'>+	RF_PATH_A = 0,</div><div class='add'>+	RF_PATH_B = 1,</div><div class='add'>+	RF_PATH_C = 2,</div><div class='add'>+	RF_PATH_D = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_bb_path {</div><div class='add'>+	BB_PATH_A = BIT(0),</div><div class='add'>+	BB_PATH_B = BIT(1),</div><div class='add'>+	BB_PATH_C = BIT(2),</div><div class='add'>+	BB_PATH_D = BIT(3),</div><div class='add'>+</div><div class='add'>+	BB_PATH_AB = (BB_PATH_A | BB_PATH_B),</div><div class='add'>+	BB_PATH_AC = (BB_PATH_A | BB_PATH_C),</div><div class='add'>+	BB_PATH_AD = (BB_PATH_A | BB_PATH_D),</div><div class='add'>+	BB_PATH_BC = (BB_PATH_B | BB_PATH_C),</div><div class='add'>+	BB_PATH_BD = (BB_PATH_B | BB_PATH_D),</div><div class='add'>+	BB_PATH_CD = (BB_PATH_C | BB_PATH_D),</div><div class='add'>+</div><div class='add'>+	BB_PATH_ABC = (BB_PATH_A | BB_PATH_B | BB_PATH_C),</div><div class='add'>+	BB_PATH_ABD = (BB_PATH_A | BB_PATH_B | BB_PATH_D),</div><div class='add'>+	BB_PATH_ACD = (BB_PATH_A | BB_PATH_C | BB_PATH_D),</div><div class='add'>+	BB_PATH_BCD = (BB_PATH_B | BB_PATH_C | BB_PATH_D),</div><div class='add'>+</div><div class='add'>+	BB_PATH_ABCD = (BB_PATH_A | BB_PATH_B | BB_PATH_C | BB_PATH_D),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_rate_section {</div><div class='add'>+	RTW_RATE_SECTION_CCK = 0,</div><div class='add'>+	RTW_RATE_SECTION_OFDM,</div><div class='add'>+	RTW_RATE_SECTION_HT_1S,</div><div class='add'>+	RTW_RATE_SECTION_HT_2S,</div><div class='add'>+	RTW_RATE_SECTION_VHT_1S,</div><div class='add'>+	RTW_RATE_SECTION_VHT_2S,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	RTW_RATE_SECTION_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_wireless_set {</div><div class='add'>+	WIRELESS_CCK	= 0x00000001,</div><div class='add'>+	WIRELESS_OFDM	= 0x00000002,</div><div class='add'>+	WIRELESS_HT	= 0x00000004,</div><div class='add'>+	WIRELESS_VHT	= 0x00000008,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HT_STBC_EN	BIT(0)</div><div class='add'>+#define VHT_STBC_EN	BIT(1)</div><div class='add'>+#define HT_LDPC_EN	BIT(0)</div><div class='add'>+#define VHT_LDPC_EN	BIT(1)</div><div class='add'>+</div><div class='add'>+enum rtw_chip_type {</div><div class='add'>+	RTW_CHIP_TYPE_8822B,</div><div class='add'>+	RTW_CHIP_TYPE_8822C,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_tx_queue_type {</div><div class='add'>+	/* the order of AC queues matters */</div><div class='add'>+	RTW_TX_QUEUE_BK = 0x0,</div><div class='add'>+	RTW_TX_QUEUE_BE = 0x1,</div><div class='add'>+	RTW_TX_QUEUE_VI = 0x2,</div><div class='add'>+	RTW_TX_QUEUE_VO = 0x3,</div><div class='add'>+</div><div class='add'>+	RTW_TX_QUEUE_BCN = 0x4,</div><div class='add'>+	RTW_TX_QUEUE_MGMT = 0x5,</div><div class='add'>+	RTW_TX_QUEUE_HI0 = 0x6,</div><div class='add'>+	RTW_TX_QUEUE_H2C = 0x7,</div><div class='add'>+	/* keep it last */</div><div class='add'>+	RTK_MAX_TX_QUEUE_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_rx_queue_type {</div><div class='add'>+	RTW_RX_QUEUE_MPDU = 0x0,</div><div class='add'>+	RTW_RX_QUEUE_C2H = 0x1,</div><div class='add'>+	/* keep it last */</div><div class='add'>+	RTK_MAX_RX_QUEUE_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_rate_index {</div><div class='add'>+	RTW_RATEID_BGN_40M_2SS	= 0,</div><div class='add'>+	RTW_RATEID_BGN_40M_1SS	= 1,</div><div class='add'>+	RTW_RATEID_BGN_20M_2SS	= 2,</div><div class='add'>+	RTW_RATEID_BGN_20M_1SS	= 3,</div><div class='add'>+	RTW_RATEID_GN_N2SS	= 4,</div><div class='add'>+	RTW_RATEID_GN_N1SS	= 5,</div><div class='add'>+	RTW_RATEID_BG		= 6,</div><div class='add'>+	RTW_RATEID_G		= 7,</div><div class='add'>+	RTW_RATEID_B_20M	= 8,</div><div class='add'>+	RTW_RATEID_ARFR0_AC_2SS	= 9,</div><div class='add'>+	RTW_RATEID_ARFR1_AC_1SS	= 10,</div><div class='add'>+	RTW_RATEID_ARFR2_AC_2G_1SS = 11,</div><div class='add'>+	RTW_RATEID_ARFR3_AC_2G_2SS = 12,</div><div class='add'>+	RTW_RATEID_ARFR4_AC_3SS	= 13,</div><div class='add'>+	RTW_RATEID_ARFR5_N_3SS	= 14,</div><div class='add'>+	RTW_RATEID_ARFR7_N_4SS	= 15,</div><div class='add'>+	RTW_RATEID_ARFR6_AC_4SS	= 16</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_trx_desc_rate {</div><div class='add'>+	DESC_RATE1M	= 0x00,</div><div class='add'>+	DESC_RATE2M	= 0x01,</div><div class='add'>+	DESC_RATE5_5M	= 0x02,</div><div class='add'>+	DESC_RATE11M	= 0x03,</div><div class='add'>+</div><div class='add'>+	DESC_RATE6M	= 0x04,</div><div class='add'>+	DESC_RATE9M	= 0x05,</div><div class='add'>+	DESC_RATE12M	= 0x06,</div><div class='add'>+	DESC_RATE18M	= 0x07,</div><div class='add'>+	DESC_RATE24M	= 0x08,</div><div class='add'>+	DESC_RATE36M	= 0x09,</div><div class='add'>+	DESC_RATE48M	= 0x0a,</div><div class='add'>+	DESC_RATE54M	= 0x0b,</div><div class='add'>+</div><div class='add'>+	DESC_RATEMCS0	= 0x0c,</div><div class='add'>+	DESC_RATEMCS1	= 0x0d,</div><div class='add'>+	DESC_RATEMCS2	= 0x0e,</div><div class='add'>+	DESC_RATEMCS3	= 0x0f,</div><div class='add'>+	DESC_RATEMCS4	= 0x10,</div><div class='add'>+	DESC_RATEMCS5	= 0x11,</div><div class='add'>+	DESC_RATEMCS6	= 0x12,</div><div class='add'>+	DESC_RATEMCS7	= 0x13,</div><div class='add'>+	DESC_RATEMCS8	= 0x14,</div><div class='add'>+	DESC_RATEMCS9	= 0x15,</div><div class='add'>+	DESC_RATEMCS10	= 0x16,</div><div class='add'>+	DESC_RATEMCS11	= 0x17,</div><div class='add'>+	DESC_RATEMCS12	= 0x18,</div><div class='add'>+	DESC_RATEMCS13	= 0x19,</div><div class='add'>+	DESC_RATEMCS14	= 0x1a,</div><div class='add'>+	DESC_RATEMCS15	= 0x1b,</div><div class='add'>+	DESC_RATEMCS16	= 0x1c,</div><div class='add'>+	DESC_RATEMCS17	= 0x1d,</div><div class='add'>+	DESC_RATEMCS18	= 0x1e,</div><div class='add'>+	DESC_RATEMCS19	= 0x1f,</div><div class='add'>+	DESC_RATEMCS20	= 0x20,</div><div class='add'>+	DESC_RATEMCS21	= 0x21,</div><div class='add'>+	DESC_RATEMCS22	= 0x22,</div><div class='add'>+	DESC_RATEMCS23	= 0x23,</div><div class='add'>+	DESC_RATEMCS24	= 0x24,</div><div class='add'>+	DESC_RATEMCS25	= 0x25,</div><div class='add'>+	DESC_RATEMCS26	= 0x26,</div><div class='add'>+	DESC_RATEMCS27	= 0x27,</div><div class='add'>+	DESC_RATEMCS28	= 0x28,</div><div class='add'>+	DESC_RATEMCS29	= 0x29,</div><div class='add'>+	DESC_RATEMCS30	= 0x2a,</div><div class='add'>+	DESC_RATEMCS31	= 0x2b,</div><div class='add'>+</div><div class='add'>+	DESC_RATEVHT1SS_MCS0	= 0x2c,</div><div class='add'>+	DESC_RATEVHT1SS_MCS1	= 0x2d,</div><div class='add'>+	DESC_RATEVHT1SS_MCS2	= 0x2e,</div><div class='add'>+	DESC_RATEVHT1SS_MCS3	= 0x2f,</div><div class='add'>+	DESC_RATEVHT1SS_MCS4	= 0x30,</div><div class='add'>+	DESC_RATEVHT1SS_MCS5	= 0x31,</div><div class='add'>+	DESC_RATEVHT1SS_MCS6	= 0x32,</div><div class='add'>+	DESC_RATEVHT1SS_MCS7	= 0x33,</div><div class='add'>+	DESC_RATEVHT1SS_MCS8	= 0x34,</div><div class='add'>+	DESC_RATEVHT1SS_MCS9	= 0x35,</div><div class='add'>+</div><div class='add'>+	DESC_RATEVHT2SS_MCS0	= 0x36,</div><div class='add'>+	DESC_RATEVHT2SS_MCS1	= 0x37,</div><div class='add'>+	DESC_RATEVHT2SS_MCS2	= 0x38,</div><div class='add'>+	DESC_RATEVHT2SS_MCS3	= 0x39,</div><div class='add'>+	DESC_RATEVHT2SS_MCS4	= 0x3a,</div><div class='add'>+	DESC_RATEVHT2SS_MCS5	= 0x3b,</div><div class='add'>+	DESC_RATEVHT2SS_MCS6	= 0x3c,</div><div class='add'>+	DESC_RATEVHT2SS_MCS7	= 0x3d,</div><div class='add'>+	DESC_RATEVHT2SS_MCS8	= 0x3e,</div><div class='add'>+	DESC_RATEVHT2SS_MCS9	= 0x3f,</div><div class='add'>+</div><div class='add'>+	DESC_RATEVHT3SS_MCS0	= 0x40,</div><div class='add'>+	DESC_RATEVHT3SS_MCS1	= 0x41,</div><div class='add'>+	DESC_RATEVHT3SS_MCS2	= 0x42,</div><div class='add'>+	DESC_RATEVHT3SS_MCS3	= 0x43,</div><div class='add'>+	DESC_RATEVHT3SS_MCS4	= 0x44,</div><div class='add'>+	DESC_RATEVHT3SS_MCS5	= 0x45,</div><div class='add'>+	DESC_RATEVHT3SS_MCS6	= 0x46,</div><div class='add'>+	DESC_RATEVHT3SS_MCS7	= 0x47,</div><div class='add'>+	DESC_RATEVHT3SS_MCS8	= 0x48,</div><div class='add'>+	DESC_RATEVHT3SS_MCS9	= 0x49,</div><div class='add'>+</div><div class='add'>+	DESC_RATEVHT4SS_MCS0	= 0x4a,</div><div class='add'>+	DESC_RATEVHT4SS_MCS1	= 0x4b,</div><div class='add'>+	DESC_RATEVHT4SS_MCS2	= 0x4c,</div><div class='add'>+	DESC_RATEVHT4SS_MCS3	= 0x4d,</div><div class='add'>+	DESC_RATEVHT4SS_MCS4	= 0x4e,</div><div class='add'>+	DESC_RATEVHT4SS_MCS5	= 0x4f,</div><div class='add'>+	DESC_RATEVHT4SS_MCS6	= 0x50,</div><div class='add'>+	DESC_RATEVHT4SS_MCS7	= 0x51,</div><div class='add'>+	DESC_RATEVHT4SS_MCS8	= 0x52,</div><div class='add'>+	DESC_RATEVHT4SS_MCS9	= 0x53,</div><div class='add'>+</div><div class='add'>+	DESC_RATE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_regulatory_domains {</div><div class='add'>+	RTW_REGD_FCC	= 0,</div><div class='add'>+	RTW_REGD_MKK	= 1,</div><div class='add'>+	RTW_REGD_ETSI	= 2,</div><div class='add'>+	RTW_REGD_WW	= 3,</div><div class='add'>+</div><div class='add'>+	RTW_REGD_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_flags {</div><div class='add'>+	RTW_FLAG_RUNNING,</div><div class='add'>+	RTW_FLAG_FW_RUNNING,</div><div class='add'>+	RTW_FLAG_SCANNING,</div><div class='add'>+	RTW_FLAG_INACTIVE_PS,</div><div class='add'>+	RTW_FLAG_LEISURE_PS,</div><div class='add'>+	RTW_FLAG_DIG_DISABLE,</div><div class='add'>+</div><div class='add'>+	NUM_OF_RTW_FLAGS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* the power index is represented by differences, which cck-1s &amp; ht40-1s are</div><div class='add'>+ * the base values, so for 1s's differences, there are only ht20 &amp; ofdm</div><div class='add'>+ */</div><div class='add'>+struct rtw_2g_1s_pwr_idx_diff {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	s8 ofdm:4;</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+#else</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+	s8 ofdm:4;</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rtw_2g_ns_pwr_idx_diff {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+	s8 bw40:4;</div><div class='add'>+	s8 cck:4;</div><div class='add'>+	s8 ofdm:4;</div><div class='add'>+#else</div><div class='add'>+	s8 ofdm:4;</div><div class='add'>+	s8 cck:4;</div><div class='add'>+	s8 bw40:4;</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rtw_2g_txpwr_idx {</div><div class='add'>+	u8 cck_base[6];</div><div class='add'>+	u8 bw40_base[5];</div><div class='add'>+	struct rtw_2g_1s_pwr_idx_diff ht_1s_diff;</div><div class='add'>+	struct rtw_2g_ns_pwr_idx_diff ht_2s_diff;</div><div class='add'>+	struct rtw_2g_ns_pwr_idx_diff ht_3s_diff;</div><div class='add'>+	struct rtw_2g_ns_pwr_idx_diff ht_4s_diff;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_5g_ht_1s_pwr_idx_diff {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	s8 ofdm:4;</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+#else</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+	s8 ofdm:4;</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rtw_5g_ht_ns_pwr_idx_diff {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+	s8 bw40:4;</div><div class='add'>+#else</div><div class='add'>+	s8 bw40:4;</div><div class='add'>+	s8 bw20:4;</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rtw_5g_ofdm_ns_pwr_idx_diff {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	s8 ofdm_3s:4;</div><div class='add'>+	s8 ofdm_2s:4;</div><div class='add'>+	s8 ofdm_4s:4;</div><div class='add'>+	s8 res:4;</div><div class='add'>+#else</div><div class='add'>+	s8 res:4;</div><div class='add'>+	s8 ofdm_4s:4;</div><div class='add'>+	s8 ofdm_2s:4;</div><div class='add'>+	s8 ofdm_3s:4;</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rtw_5g_vht_ns_pwr_idx_diff {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	s8 bw160:4;</div><div class='add'>+	s8 bw80:4;</div><div class='add'>+#else</div><div class='add'>+	s8 bw80:4;</div><div class='add'>+	s8 bw160:4;</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rtw_5g_txpwr_idx {</div><div class='add'>+	u8 bw40_base[14];</div><div class='add'>+	struct rtw_5g_ht_1s_pwr_idx_diff ht_1s_diff;</div><div class='add'>+	struct rtw_5g_ht_ns_pwr_idx_diff ht_2s_diff;</div><div class='add'>+	struct rtw_5g_ht_ns_pwr_idx_diff ht_3s_diff;</div><div class='add'>+	struct rtw_5g_ht_ns_pwr_idx_diff ht_4s_diff;</div><div class='add'>+	struct rtw_5g_ofdm_ns_pwr_idx_diff ofdm_diff;</div><div class='add'>+	struct rtw_5g_vht_ns_pwr_idx_diff vht_1s_diff;</div><div class='add'>+	struct rtw_5g_vht_ns_pwr_idx_diff vht_2s_diff;</div><div class='add'>+	struct rtw_5g_vht_ns_pwr_idx_diff vht_3s_diff;</div><div class='add'>+	struct rtw_5g_vht_ns_pwr_idx_diff vht_4s_diff;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_txpwr_idx {</div><div class='add'>+	struct rtw_2g_txpwr_idx pwr_idx_2g;</div><div class='add'>+	struct rtw_5g_txpwr_idx pwr_idx_5g;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_timer_list {</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+	void (*function)(void *data);</div><div class='add'>+	void *args;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_channel_params {</div><div class='add'>+	u8 center_chan;</div><div class='add'>+	u8 bandwidth;</div><div class='add'>+	u8 primary_chan_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_hw_reg {</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_backup_info {</div><div class='add'>+	u8 len;</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_vif_port_set {</div><div class='add'>+	PORT_SET_MAC_ADDR	= BIT(0),</div><div class='add'>+	PORT_SET_BSSID		= BIT(1),</div><div class='add'>+	PORT_SET_NET_TYPE	= BIT(2),</div><div class='add'>+	PORT_SET_AID		= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_vif_port {</div><div class='add'>+	struct rtw_hw_reg mac_addr;</div><div class='add'>+	struct rtw_hw_reg bssid;</div><div class='add'>+	struct rtw_hw_reg net_type;</div><div class='add'>+	struct rtw_hw_reg aid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_tx_pkt_info {</div><div class='add'>+	u32 tx_pkt_size;</div><div class='add'>+	u8 offset;</div><div class='add'>+	u8 pkt_offset;</div><div class='add'>+	u8 mac_id;</div><div class='add'>+	u8 rate_id;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u8 qsel;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 sec_type;</div><div class='add'>+	u8 sn;</div><div class='add'>+	bool ampdu_en;</div><div class='add'>+	u8 ampdu_factor;</div><div class='add'>+	u8 ampdu_density;</div><div class='add'>+	u16 seq;</div><div class='add'>+	bool stbc;</div><div class='add'>+	bool ldpc;</div><div class='add'>+	bool dis_rate_fallback;</div><div class='add'>+	bool bmc;</div><div class='add'>+	bool use_rate;</div><div class='add'>+	bool ls;</div><div class='add'>+	bool fs;</div><div class='add'>+	bool short_gi;</div><div class='add'>+	bool report;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_rx_pkt_stat {</div><div class='add'>+	bool phy_status;</div><div class='add'>+	bool icv_err;</div><div class='add'>+	bool crc_err;</div><div class='add'>+	bool decrypted;</div><div class='add'>+	bool is_c2h;</div><div class='add'>+</div><div class='add'>+	s32 signal_power;</div><div class='add'>+	u16 pkt_len;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 drv_info_sz;</div><div class='add'>+	u8 shift;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u8 mac_id;</div><div class='add'>+	u8 cam_id;</div><div class='add'>+	u8 ppdu_cnt;</div><div class='add'>+	u32 tsf_low;</div><div class='add'>+	s8 rx_power[RTW_RF_PATH_MAX];</div><div class='add'>+	u8 rssi;</div><div class='add'>+	u8 rxsc;</div><div class='add'>+	struct rtw_sta_info *si;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_traffic_stats {</div><div class='add'>+	/* units in bytes */</div><div class='add'>+	u64 tx_unicast;</div><div class='add'>+	u64 rx_unicast;</div><div class='add'>+</div><div class='add'>+	/* count for packets */</div><div class='add'>+	u64 tx_cnt;</div><div class='add'>+	u64 rx_cnt;</div><div class='add'>+</div><div class='add'>+	/* units in Mbps */</div><div class='add'>+	u32 tx_throughput;</div><div class='add'>+	u32 rx_throughput;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_lps_mode {</div><div class='add'>+	RTW_MODE_ACTIVE	= 0,</div><div class='add'>+	RTW_MODE_LPS	= 1,</div><div class='add'>+	RTW_MODE_WMM_PS	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_pwr_state {</div><div class='add'>+	RTW_RF_OFF	= 0x0,</div><div class='add'>+	RTW_RF_ON	= 0x4,</div><div class='add'>+	RTW_ALL_ON	= 0xc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_lps_conf {</div><div class='add'>+	/* the interface to enter lps */</div><div class='add'>+	struct rtw_vif *rtwvif;</div><div class='add'>+	enum rtw_lps_mode mode;</div><div class='add'>+	enum rtw_pwr_state state;</div><div class='add'>+	u8 awake_interval;</div><div class='add'>+	u8 rlbm;</div><div class='add'>+	u8 smart_ps;</div><div class='add'>+	u8 port_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_hw_key_type {</div><div class='add'>+	RTW_CAM_NONE	= 0,</div><div class='add'>+	RTW_CAM_WEP40	= 1,</div><div class='add'>+	RTW_CAM_TKIP	= 2,</div><div class='add'>+	RTW_CAM_AES	= 4,</div><div class='add'>+	RTW_CAM_WEP104	= 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_cam_entry {</div><div class='add'>+	bool valid;</div><div class='add'>+	bool group;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u8 hw_key_type;</div><div class='add'>+	struct ieee80211_key_conf *key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_sec_desc {</div><div class='add'>+	/* search strategy */</div><div class='add'>+	bool default_key_search;</div><div class='add'>+</div><div class='add'>+	u32 total_cam_num;</div><div class='add'>+	struct rtw_cam_entry cam_table[RTW_MAX_SEC_CAM_NUM];</div><div class='add'>+	DECLARE_BITMAP(cam_map, RTW_MAX_SEC_CAM_NUM);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_tx_report {</div><div class='add'>+	/* protect the tx report queue */</div><div class='add'>+	spinlock_t q_lock;</div><div class='add'>+	struct sk_buff_head queue;</div><div class='add'>+	atomic_t sn;</div><div class='add'>+	struct timer_list purge_timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RTW_BC_MC_MACID 1</div><div class='add'>+DECLARE_EWMA(rssi, 10, 16);</div><div class='add'>+</div><div class='add'>+struct rtw_sta_info {</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	struct ewma_rssi avg_rssi;</div><div class='add'>+	u8 rssi_level;</div><div class='add'>+</div><div class='add'>+	u8 mac_id;</div><div class='add'>+	u8 rate_id;</div><div class='add'>+	enum rtw_bandwidth bw_mode;</div><div class='add'>+	enum rtw_rf_type rf_type;</div><div class='add'>+	enum rtw_wireless_set wireless_set;</div><div class='add'>+	u8 stbc_en:2;</div><div class='add'>+	u8 ldpc_en:2;</div><div class='add'>+	bool sgi_enable;</div><div class='add'>+	bool vht_enable;</div><div class='add'>+	bool updated;</div><div class='add'>+	u8 init_ra_lv;</div><div class='add'>+	u64 ra_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_vif {</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	enum rtw_net_type net_type;</div><div class='add'>+	u16 aid;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 port;</div><div class='add'>+	const struct rtw_vif_port *conf;</div><div class='add'>+</div><div class='add'>+	struct rtw_traffic_stats stats;</div><div class='add'>+	bool in_lps;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_regulatory {</div><div class='add'>+	char alpha2[2];</div><div class='add'>+	u8 chplan;</div><div class='add'>+	u8 txpwr_regd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_chip_ops {</div><div class='add'>+	int (*mac_init)(struct rtw_dev *rtwdev);</div><div class='add'>+	int (*read_efuse)(struct rtw_dev *rtwdev, u8 *map);</div><div class='add'>+	void (*phy_set_param)(struct rtw_dev *rtwdev);</div><div class='add'>+	void (*set_channel)(struct rtw_dev *rtwdev, u8 channel,</div><div class='add'>+			    u8 bandwidth, u8 primary_chan_idx);</div><div class='add'>+	void (*query_rx_desc)(struct rtw_dev *rtwdev, u8 *rx_desc,</div><div class='add'>+			      struct rtw_rx_pkt_stat *pkt_stat,</div><div class='add'>+			      struct ieee80211_rx_status *rx_status);</div><div class='add'>+	u32 (*read_rf)(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+		       u32 addr, u32 mask);</div><div class='add'>+	bool (*write_rf)(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			 u32 addr, u32 mask, u32 data);</div><div class='add'>+	void (*set_tx_power_index)(struct rtw_dev *rtwdev);</div><div class='add'>+	int (*rsvd_page_dump)(struct rtw_dev *rtwdev, u8 *buf, u32 offset,</div><div class='add'>+			      u32 size);</div><div class='add'>+	void (*set_antenna)(struct rtw_dev *rtwdev, u8 antenna_tx,</div><div class='add'>+			    u8 antenna_rx);</div><div class='add'>+	void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable);</div><div class='add'>+	void (*false_alarm_statistics)(struct rtw_dev *rtwdev);</div><div class='add'>+	void (*do_iqk)(struct rtw_dev *rtwdev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RTW_PWR_POLLING_CNT	20000</div><div class='add'>+</div><div class='add'>+#define RTW_PWR_CMD_READ	0x00</div><div class='add'>+#define RTW_PWR_CMD_WRITE	0x01</div><div class='add'>+#define RTW_PWR_CMD_POLLING	0x02</div><div class='add'>+#define RTW_PWR_CMD_DELAY	0x03</div><div class='add'>+#define RTW_PWR_CMD_END		0x04</div><div class='add'>+</div><div class='add'>+/* define the base address of each block */</div><div class='add'>+#define RTW_PWR_ADDR_MAC	0x00</div><div class='add'>+#define RTW_PWR_ADDR_USB	0x01</div><div class='add'>+#define RTW_PWR_ADDR_PCIE	0x02</div><div class='add'>+#define RTW_PWR_ADDR_SDIO	0x03</div><div class='add'>+</div><div class='add'>+#define RTW_PWR_INTF_SDIO_MSK	BIT(0)</div><div class='add'>+#define RTW_PWR_INTF_USB_MSK	BIT(1)</div><div class='add'>+#define RTW_PWR_INTF_PCI_MSK	BIT(2)</div><div class='add'>+#define RTW_PWR_INTF_ALL_MSK	(BIT(0) | BIT(1) | BIT(2) | BIT(3))</div><div class='add'>+</div><div class='add'>+#define RTW_PWR_CUT_A_MSK	BIT(1)</div><div class='add'>+#define RTW_PWR_CUT_B_MSK	BIT(2)</div><div class='add'>+#define RTW_PWR_CUT_C_MSK	BIT(3)</div><div class='add'>+#define RTW_PWR_CUT_D_MSK	BIT(4)</div><div class='add'>+#define RTW_PWR_CUT_E_MSK	BIT(5)</div><div class='add'>+#define RTW_PWR_CUT_F_MSK	BIT(6)</div><div class='add'>+#define RTW_PWR_CUT_G_MSK	BIT(7)</div><div class='add'>+#define RTW_PWR_CUT_ALL_MSK	0xFF</div><div class='add'>+</div><div class='add'>+enum rtw_pwr_seq_cmd_delay_unit {</div><div class='add'>+	RTW_PWR_DELAY_US,</div><div class='add'>+	RTW_PWR_DELAY_MS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_pwr_seq_cmd {</div><div class='add'>+	u16 offset;</div><div class='add'>+	u8 cut_mask;</div><div class='add'>+	u8 intf_mask;</div><div class='add'>+	u8 base:4;</div><div class='add'>+	u8 cmd:4;</div><div class='add'>+	u8 mask;</div><div class='add'>+	u8 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_chip_ver {</div><div class='add'>+	RTW_CHIP_VER_CUT_A = 0x00,</div><div class='add'>+	RTW_CHIP_VER_CUT_B = 0x01,</div><div class='add'>+	RTW_CHIP_VER_CUT_C = 0x02,</div><div class='add'>+	RTW_CHIP_VER_CUT_D = 0x03,</div><div class='add'>+	RTW_CHIP_VER_CUT_E = 0x04,</div><div class='add'>+	RTW_CHIP_VER_CUT_F = 0x05,</div><div class='add'>+	RTW_CHIP_VER_CUT_G = 0x06,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RTW_INTF_PHY_PLATFORM_ALL 0</div><div class='add'>+</div><div class='add'>+enum rtw_intf_phy_cut {</div><div class='add'>+	RTW_INTF_PHY_CUT_A = BIT(0),</div><div class='add'>+	RTW_INTF_PHY_CUT_B = BIT(1),</div><div class='add'>+	RTW_INTF_PHY_CUT_C = BIT(2),</div><div class='add'>+	RTW_INTF_PHY_CUT_D = BIT(3),</div><div class='add'>+	RTW_INTF_PHY_CUT_E = BIT(4),</div><div class='add'>+	RTW_INTF_PHY_CUT_F = BIT(5),</div><div class='add'>+	RTW_INTF_PHY_CUT_G = BIT(6),</div><div class='add'>+	RTW_INTF_PHY_CUT_ALL = 0xFFFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_ip_sel {</div><div class='add'>+	RTW_IP_SEL_PHY = 0,</div><div class='add'>+	RTW_IP_SEL_MAC = 1,</div><div class='add'>+	RTW_IP_SEL_DBI = 2,</div><div class='add'>+</div><div class='add'>+	RTW_IP_SEL_UNDEF = 0xFFFF</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_pq_map_id {</div><div class='add'>+	RTW_PQ_MAP_VO = 0x0,</div><div class='add'>+	RTW_PQ_MAP_VI = 0x1,</div><div class='add'>+	RTW_PQ_MAP_BE = 0x2,</div><div class='add'>+	RTW_PQ_MAP_BK = 0x3,</div><div class='add'>+	RTW_PQ_MAP_MG = 0x4,</div><div class='add'>+	RTW_PQ_MAP_HI = 0x5,</div><div class='add'>+	RTW_PQ_MAP_NUM = 0x6,</div><div class='add'>+</div><div class='add'>+	RTW_PQ_MAP_UNDEF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_dma_mapping {</div><div class='add'>+	RTW_DMA_MAPPING_EXTRA	= 0,</div><div class='add'>+	RTW_DMA_MAPPING_LOW	= 1,</div><div class='add'>+	RTW_DMA_MAPPING_NORMAL	= 2,</div><div class='add'>+	RTW_DMA_MAPPING_HIGH	= 3,</div><div class='add'>+</div><div class='add'>+	RTW_DMA_MAPPING_UNDEF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_rqpn {</div><div class='add'>+	enum rtw_dma_mapping dma_map_vo;</div><div class='add'>+	enum rtw_dma_mapping dma_map_vi;</div><div class='add'>+	enum rtw_dma_mapping dma_map_be;</div><div class='add'>+	enum rtw_dma_mapping dma_map_bk;</div><div class='add'>+	enum rtw_dma_mapping dma_map_mg;</div><div class='add'>+	enum rtw_dma_mapping dma_map_hi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_page_table {</div><div class='add'>+	u16 hq_num;</div><div class='add'>+	u16 nq_num;</div><div class='add'>+	u16 lq_num;</div><div class='add'>+	u16 exq_num;</div><div class='add'>+	u16 gapq_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_intf_phy_para {</div><div class='add'>+	u16 offset;</div><div class='add'>+	u16 value;</div><div class='add'>+	u16 ip_sel;</div><div class='add'>+	u16 cut_mask;</div><div class='add'>+	u16 platform;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_intf_phy_para_table {</div><div class='add'>+	struct rtw_intf_phy_para *usb2_para;</div><div class='add'>+	struct rtw_intf_phy_para *usb3_para;</div><div class='add'>+	struct rtw_intf_phy_para *gen1_para;</div><div class='add'>+	struct rtw_intf_phy_para *gen2_para;</div><div class='add'>+	u8 n_usb2_para;</div><div class='add'>+	u8 n_usb3_para;</div><div class='add'>+	u8 n_gen1_para;</div><div class='add'>+	u8 n_gen2_para;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_table {</div><div class='add'>+	const void *data;</div><div class='add'>+	const u32 size;</div><div class='add'>+	void (*parse)(struct rtw_dev *rtwdev, const struct rtw_table *tbl);</div><div class='add'>+	void (*do_cfg)(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		       u32 addr, u32 data);</div><div class='add'>+	enum rtw_rf_path rf_path;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void rtw_load_table(struct rtw_dev *rtwdev,</div><div class='add'>+				  const struct rtw_table *tbl)</div><div class='add'>+{</div><div class='add'>+	(*tbl-&gt;parse)(rtwdev, tbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum rtw_rfe_fem {</div><div class='add'>+	RTW_RFE_IFEM,</div><div class='add'>+	RTW_RFE_EFEM,</div><div class='add'>+	RTW_RFE_IFEM2G_EFEM5G,</div><div class='add'>+	RTW_RFE_NUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_rfe_def {</div><div class='add'>+	const struct rtw_table *phy_pg_tbl;</div><div class='add'>+	const struct rtw_table *txpwr_lmt_tbl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RTW_DEF_RFE(chip, bb_pg, pwrlmt) {				  \</div><div class='add'>+	.phy_pg_tbl = &amp;rtw ## chip ## _bb_pg_type ## bb_pg ## _tbl,	  \</div><div class='add'>+	.txpwr_lmt_tbl = &amp;rtw ## chip ## _txpwr_lmt_type ## pwrlmt ## _tbl, \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/* hardware configuration for each IC */</div><div class='add'>+struct rtw_chip_info {</div><div class='add'>+	struct rtw_chip_ops *ops;</div><div class='add'>+	u8 id;</div><div class='add'>+</div><div class='add'>+	const char *fw_name;</div><div class='add'>+	u8 tx_pkt_desc_sz;</div><div class='add'>+	u8 tx_buf_desc_sz;</div><div class='add'>+	u8 rx_pkt_desc_sz;</div><div class='add'>+	u8 rx_buf_desc_sz;</div><div class='add'>+	u32 phy_efuse_size;</div><div class='add'>+	u32 log_efuse_size;</div><div class='add'>+	u32 ptct_efuse_size;</div><div class='add'>+	u32 txff_size;</div><div class='add'>+	u32 rxff_size;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 page_size;</div><div class='add'>+	u8 csi_buf_pg_num;</div><div class='add'>+	u8 dig_max;</div><div class='add'>+	u8 dig_min;</div><div class='add'>+	u8 txgi_factor;</div><div class='add'>+	bool is_pwr_by_rate_dec;</div><div class='add'>+	u8 max_power_index;</div><div class='add'>+</div><div class='add'>+	bool ht_supported;</div><div class='add'>+	bool vht_supported;</div><div class='add'>+</div><div class='add'>+	/* init values */</div><div class='add'>+	u8 sys_func_en;</div><div class='add'>+	struct rtw_pwr_seq_cmd **pwr_on_seq;</div><div class='add'>+	struct rtw_pwr_seq_cmd **pwr_off_seq;</div><div class='add'>+	struct rtw_rqpn *rqpn_table;</div><div class='add'>+	struct rtw_page_table *page_table;</div><div class='add'>+	struct rtw_intf_phy_para_table *intf_table;</div><div class='add'>+</div><div class='add'>+	struct rtw_hw_reg *dig;</div><div class='add'>+	u32 rf_base_addr[2];</div><div class='add'>+	u32 rf_sipi_addr[2];</div><div class='add'>+</div><div class='add'>+	const struct rtw_table *mac_tbl;</div><div class='add'>+	const struct rtw_table *agc_tbl;</div><div class='add'>+	const struct rtw_table *bb_tbl;</div><div class='add'>+	const struct rtw_table *rf_tbl[RTW_RF_PATH_MAX];</div><div class='add'>+	const struct rtw_table *rfk_init_tbl;</div><div class='add'>+</div><div class='add'>+	const struct rtw_rfe_def *rfe_defs;</div><div class='add'>+	u32 rfe_defs_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_dm_info {</div><div class='add'>+	u32 cck_fa_cnt;</div><div class='add'>+	u32 ofdm_fa_cnt;</div><div class='add'>+	u32 total_fa_cnt;</div><div class='add'>+	u8 min_rssi;</div><div class='add'>+	u8 pre_min_rssi;</div><div class='add'>+	u16 fa_history[4];</div><div class='add'>+	u8 igi_history[4];</div><div class='add'>+	u8 igi_bitmap;</div><div class='add'>+	bool damping;</div><div class='add'>+	u8 damping_cnt;</div><div class='add'>+	u8 damping_rssi;</div><div class='add'>+</div><div class='add'>+	u8 cck_gi_u_bnd;</div><div class='add'>+	u8 cck_gi_l_bnd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_efuse {</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 physical_size;</div><div class='add'>+	u32 logical_size;</div><div class='add'>+	u32 protect_size;</div><div class='add'>+</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u8 channel_plan;</div><div class='add'>+	u8 country_code[2];</div><div class='add'>+	u8 rfe_option;</div><div class='add'>+	u8 thermal_meter;</div><div class='add'>+	u8 crystal_cap;</div><div class='add'>+	u8 ant_div_cfg;</div><div class='add'>+	u8 ant_div_type;</div><div class='add'>+	u8 regd;</div><div class='add'>+</div><div class='add'>+	u8 lna_type_2g;</div><div class='add'>+	u8 lna_type_5g;</div><div class='add'>+	u8 glna_type;</div><div class='add'>+	u8 alna_type;</div><div class='add'>+	bool ext_lna_2g;</div><div class='add'>+	bool ext_lna_5g;</div><div class='add'>+	u8 pa_type_2g;</div><div class='add'>+	u8 pa_type_5g;</div><div class='add'>+	u8 gpa_type;</div><div class='add'>+	u8 apa_type;</div><div class='add'>+	bool ext_pa_2g;</div><div class='add'>+	bool ext_pa_5g;</div><div class='add'>+</div><div class='add'>+	bool btcoex;</div><div class='add'>+	/* bt share antenna with wifi */</div><div class='add'>+	bool share_ant;</div><div class='add'>+	u8 bt_setting;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 hci;</div><div class='add'>+		u8 bw;</div><div class='add'>+		u8 ptcl;</div><div class='add'>+		u8 nss;</div><div class='add'>+		u8 ant_num;</div><div class='add'>+	} hw_cap;</div><div class='add'>+</div><div class='add'>+	struct rtw_txpwr_idx txpwr_idx_table[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_phy_cond {</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	u32 rfe:8;</div><div class='add'>+	u32 intf:4;</div><div class='add'>+	u32 pkg:4;</div><div class='add'>+	u32 plat:4;</div><div class='add'>+	u32 intf_rsvd:4;</div><div class='add'>+	u32 cut:4;</div><div class='add'>+	u32 branch:2;</div><div class='add'>+	u32 neg:1;</div><div class='add'>+	u32 pos:1;</div><div class='add'>+#else</div><div class='add'>+	u32 pos:1;</div><div class='add'>+	u32 neg:1;</div><div class='add'>+	u32 branch:2;</div><div class='add'>+	u32 cut:4;</div><div class='add'>+	u32 intf_rsvd:4;</div><div class='add'>+	u32 plat:4;</div><div class='add'>+	u32 pkg:4;</div><div class='add'>+	u32 intf:4;</div><div class='add'>+	u32 rfe:8;</div><div class='add'>+#endif</div><div class='add'>+	/* for intf:4 */</div><div class='add'>+	#define INTF_PCIE	BIT(0)</div><div class='add'>+	#define INTF_USB	BIT(1)</div><div class='add'>+	#define INTF_SDIO	BIT(2)</div><div class='add'>+	/* for branch:2 */</div><div class='add'>+	#define BRANCH_IF	0</div><div class='add'>+	#define BRANCH_ELIF	1</div><div class='add'>+	#define BRANCH_ELSE	2</div><div class='add'>+	#define BRANCH_ENDIF	3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_fifo_conf {</div><div class='add'>+	/* tx fifo information */</div><div class='add'>+	u16 rsvd_boundary;</div><div class='add'>+	u16 rsvd_pg_num;</div><div class='add'>+	u16 rsvd_drv_pg_num;</div><div class='add'>+	u16 txff_pg_num;</div><div class='add'>+	u16 acq_pg_num;</div><div class='add'>+	u16 rsvd_drv_addr;</div><div class='add'>+	u16 rsvd_h2c_info_addr;</div><div class='add'>+	u16 rsvd_h2c_sta_info_addr;</div><div class='add'>+	u16 rsvd_h2cq_addr;</div><div class='add'>+	u16 rsvd_cpu_instr_addr;</div><div class='add'>+	u16 rsvd_fw_txbuf_addr;</div><div class='add'>+	u16 rsvd_csibuf_addr;</div><div class='add'>+	enum rtw_dma_mapping pq_map[RTW_PQ_MAP_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_fw_state {</div><div class='add'>+	const struct firmware *firmware;</div><div class='add'>+	struct completion completion;</div><div class='add'>+	u16 version;</div><div class='add'>+	u8 sub_version;</div><div class='add'>+	u8 sub_index;</div><div class='add'>+	u16 h2c_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_hal {</div><div class='add'>+	u32 rcr;</div><div class='add'>+</div><div class='add'>+	u32 chip_version;</div><div class='add'>+	u8 fab_version;</div><div class='add'>+	u8 cut_version;</div><div class='add'>+	u8 mp_chip;</div><div class='add'>+	u8 oem_id;</div><div class='add'>+	struct rtw_phy_cond phy_cond;</div><div class='add'>+</div><div class='add'>+	u8 ps_mode;</div><div class='add'>+	u8 current_channel;</div><div class='add'>+	u8 current_band_width;</div><div class='add'>+	u8 current_band_type;</div><div class='add'>+	u8 sec_ch_offset;</div><div class='add'>+	u8 rf_type;</div><div class='add'>+	u8 rf_path_num;</div><div class='add'>+	u8 antenna_tx;</div><div class='add'>+	u8 antenna_rx;</div><div class='add'>+</div><div class='add'>+	/* protect tx power section */</div><div class='add'>+	struct mutex tx_power_mutex;</div><div class='add'>+	s8 tx_pwr_by_rate_offset_2g[RTW_RF_PATH_MAX]</div><div class='add'>+				   [DESC_RATE_MAX];</div><div class='add'>+	s8 tx_pwr_by_rate_offset_5g[RTW_RF_PATH_MAX]</div><div class='add'>+				   [DESC_RATE_MAX];</div><div class='add'>+	s8 tx_pwr_by_rate_base_2g[RTW_RF_PATH_MAX]</div><div class='add'>+				 [RTW_RATE_SECTION_MAX];</div><div class='add'>+	s8 tx_pwr_by_rate_base_5g[RTW_RF_PATH_MAX]</div><div class='add'>+				 [RTW_RATE_SECTION_MAX];</div><div class='add'>+	s8 tx_pwr_limit_2g[RTW_REGD_MAX]</div><div class='add'>+			  [RTW_CHANNEL_WIDTH_MAX]</div><div class='add'>+			  [RTW_RATE_SECTION_MAX]</div><div class='add'>+			  [RTW_MAX_CHANNEL_NUM_2G];</div><div class='add'>+	s8 tx_pwr_limit_5g[RTW_REGD_MAX]</div><div class='add'>+			  [RTW_CHANNEL_WIDTH_MAX]</div><div class='add'>+			  [RTW_RATE_SECTION_MAX]</div><div class='add'>+			  [RTW_MAX_CHANNEL_NUM_5G];</div><div class='add'>+	s8 tx_pwr_tbl[RTW_RF_PATH_MAX]</div><div class='add'>+		     [DESC_RATE_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_dev {</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	struct rtw_hci hci;</div><div class='add'>+</div><div class='add'>+	struct rtw_chip_info *chip;</div><div class='add'>+	struct rtw_hal hal;</div><div class='add'>+	struct rtw_fifo_conf fifo;</div><div class='add'>+	struct rtw_fw_state fw;</div><div class='add'>+	struct rtw_efuse efuse;</div><div class='add'>+	struct rtw_sec_desc sec;</div><div class='add'>+	struct rtw_traffic_stats stats;</div><div class='add'>+	struct rtw_regulatory regd;</div><div class='add'>+</div><div class='add'>+	struct rtw_dm_info dm_info;</div><div class='add'>+</div><div class='add'>+	/* ensures exclusive access from mac80211 callbacks */</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/* lock for dm to use */</div><div class='add'>+	spinlock_t dm_lock;</div><div class='add'>+</div><div class='add'>+	/* read/write rf register */</div><div class='add'>+	spinlock_t rf_lock;</div><div class='add'>+</div><div class='add'>+	/* watch dog every 2 sec */</div><div class='add'>+	struct delayed_work watch_dog_work;</div><div class='add'>+	u32 watch_dog_cnt;</div><div class='add'>+</div><div class='add'>+	struct list_head rsvd_page_list;</div><div class='add'>+</div><div class='add'>+	/* c2h cmd queue &amp; handler work */</div><div class='add'>+	struct sk_buff_head c2h_queue;</div><div class='add'>+	struct work_struct c2h_work;</div><div class='add'>+</div><div class='add'>+	struct rtw_tx_report tx_report;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		/* incicate the mail box to use with fw */</div><div class='add'>+		u8 last_box_num;</div><div class='add'>+		/* protect to send h2c to fw */</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+		u32 seq;</div><div class='add'>+	} h2c;</div><div class='add'>+</div><div class='add'>+	/* lps power state &amp; handler work */</div><div class='add'>+	struct rtw_lps_conf lps_conf;</div><div class='add'>+	struct delayed_work lps_work;</div><div class='add'>+</div><div class='add'>+	struct dentry *debugfs;</div><div class='add'>+</div><div class='add'>+	u8 sta_cnt;</div><div class='add'>+</div><div class='add'>+	DECLARE_BITMAP(mac_id_map, RTW_MAX_MAC_ID_NUM);</div><div class='add'>+	DECLARE_BITMAP(flags, NUM_OF_RTW_FLAGS);</div><div class='add'>+</div><div class='add'>+	u8 mp_mode;</div><div class='add'>+</div><div class='add'>+	/* hci related data, must be last */</div><div class='add'>+	u8 priv[0] __aligned(sizeof(void *));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "hci.h"</div><div class='add'>+</div><div class='add'>+static inline bool rtw_flag_check(struct rtw_dev *rtwdev, enum rtw_flags flag)</div><div class='add'>+{</div><div class='add'>+	return test_bit(flag, rtwdev-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_flag_clear(struct rtw_dev *rtwdev, enum rtw_flags flag)</div><div class='add'>+{</div><div class='add'>+	clear_bit(flag, rtwdev-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtw_flag_set(struct rtw_dev *rtwdev, enum rtw_flags flag)</div><div class='add'>+{</div><div class='add'>+	set_bit(flag, rtwdev-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_get_channel_params(struct cfg80211_chan_def *chandef,</div><div class='add'>+			    struct rtw_channel_params *ch_param);</div><div class='add'>+bool check_hw_ready(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 target);</div><div class='add'>+bool ltecoex_read_reg(struct rtw_dev *rtwdev, u16 offset, u32 *val);</div><div class='add'>+bool ltecoex_reg_write(struct rtw_dev *rtwdev, u16 offset, u32 value);</div><div class='add'>+void rtw_restore_reg(struct rtw_dev *rtwdev,</div><div class='add'>+		     struct rtw_backup_info *bckp, u32 num);</div><div class='add'>+void rtw_set_channel(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_vif_port_config(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif,</div><div class='add'>+			 u32 config);</div><div class='add'>+void rtw_tx_report_purge_timer(struct timer_list *t);</div><div class='add'>+void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si);</div><div class='add'>+int rtw_core_start(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_core_stop(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_chip_info_setup(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_core_init(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_core_deinit(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw);</div><div class='add'>+void rtw_unregister_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c<br/>new file mode 100644<br/>index 000000000000..cfe05ba7280d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/pci.c</a></div><div class='hunk'>@@ -0,0 +1,1211 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</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'>+#include "main.h"</div><div class='add'>+#include "pci.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static u32 rtw_pci_tx_queue_idx_addr[] = {</div><div class='add'>+	[RTW_TX_QUEUE_BK]	= RTK_PCI_TXBD_IDX_BKQ,</div><div class='add'>+	[RTW_TX_QUEUE_BE]	= RTK_PCI_TXBD_IDX_BEQ,</div><div class='add'>+	[RTW_TX_QUEUE_VI]	= RTK_PCI_TXBD_IDX_VIQ,</div><div class='add'>+	[RTW_TX_QUEUE_VO]	= RTK_PCI_TXBD_IDX_VOQ,</div><div class='add'>+	[RTW_TX_QUEUE_MGMT]	= RTK_PCI_TXBD_IDX_MGMTQ,</div><div class='add'>+	[RTW_TX_QUEUE_HI0]	= RTK_PCI_TXBD_IDX_HI0Q,</div><div class='add'>+	[RTW_TX_QUEUE_H2C]	= RTK_PCI_TXBD_IDX_H2CQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 rtw_pci_get_tx_qsel(struct sk_buff *skb, u8 queue)</div><div class='add'>+{</div><div class='add'>+	switch (queue) {</div><div class='add'>+	case RTW_TX_QUEUE_BCN:</div><div class='add'>+		return TX_DESC_QSEL_BEACON;</div><div class='add'>+	case RTW_TX_QUEUE_H2C:</div><div class='add'>+		return TX_DESC_QSEL_H2C;</div><div class='add'>+	case RTW_TX_QUEUE_MGMT:</div><div class='add'>+		return TX_DESC_QSEL_MGMT;</div><div class='add'>+	case RTW_TX_QUEUE_HI0:</div><div class='add'>+		return TX_DESC_QSEL_HIGH;</div><div class='add'>+	default:</div><div class='add'>+		return skb-&gt;priority;</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 rtw_pci_read8(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return readb(rtwpci-&gt;mmap + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 rtw_pci_read16(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return readw(rtwpci-&gt;mmap + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rtw_pci_read32(struct rtw_dev *rtwdev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return readl(rtwpci-&gt;mmap + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_write8(struct rtw_dev *rtwdev, u32 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	writeb(val, rtwpci-&gt;mmap + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_write16(struct rtw_dev *rtwdev, u32 addr, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	writew(val, rtwpci-&gt;mmap + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_write32(struct rtw_dev *rtwdev, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	writel(val, rtwpci-&gt;mmap + addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *rtw_pci_get_tx_desc(struct rtw_pci_tx_ring *tx_ring, u8 idx)</div><div class='add'>+{</div><div class='add'>+	int offset = tx_ring-&gt;r.desc_size * idx;</div><div class='add'>+</div><div class='add'>+	return tx_ring-&gt;r.head + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_free_tx_ring(struct rtw_dev *rtwdev,</div><div class='add'>+				 struct rtw_pci_tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(rtwdev-&gt;dev);</div><div class='add'>+	struct rtw_pci_tx_data *tx_data;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u8 *head = tx_ring-&gt;r.head;</div><div class='add'>+	u32 len = tx_ring-&gt;r.len;</div><div class='add'>+	int ring_sz = len * tx_ring-&gt;r.desc_size;</div><div class='add'>+</div><div class='add'>+	/* free every skb remained in tx list */</div><div class='add'>+	skb_queue_walk_safe(&amp;tx_ring-&gt;queue, skb, tmp) {</div><div class='add'>+		__skb_unlink(skb, &amp;tx_ring-&gt;queue);</div><div class='add'>+		tx_data = rtw_pci_get_tx_data(skb);</div><div class='add'>+		dma = tx_data-&gt;dma;</div><div class='add'>+</div><div class='add'>+		pci_unmap_single(pdev, dma, skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* free the ring itself */</div><div class='add'>+	pci_free_consistent(pdev, ring_sz, head, tx_ring-&gt;r.dma);</div><div class='add'>+	tx_ring-&gt;r.head = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_free_rx_ring(struct rtw_dev *rtwdev,</div><div class='add'>+				 struct rtw_pci_rx_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(rtwdev-&gt;dev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u8 *head = rx_ring-&gt;r.head;</div><div class='add'>+	int buf_sz = RTK_PCI_RX_BUF_SIZE;</div><div class='add'>+	int ring_sz = rx_ring-&gt;r.desc_size * rx_ring-&gt;r.len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_ring-&gt;r.len; i++) {</div><div class='add'>+		skb = rx_ring-&gt;buf[i];</div><div class='add'>+		if (!skb)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dma = *((dma_addr_t *)skb-&gt;cb);</div><div class='add'>+		pci_unmap_single(pdev, dma, buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		rx_ring-&gt;buf[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_free_consistent(pdev, ring_sz, head, rx_ring-&gt;r.dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_free_trx_ring(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	struct rtw_pci_tx_ring *tx_ring;</div><div class='add'>+	struct rtw_pci_rx_ring *rx_ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RTK_MAX_TX_QUEUE_NUM; i++) {</div><div class='add'>+		tx_ring = &amp;rtwpci-&gt;tx_rings[i];</div><div class='add'>+		rtw_pci_free_tx_ring(rtwdev, tx_ring);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RTK_MAX_RX_QUEUE_NUM; i++) {</div><div class='add'>+		rx_ring = &amp;rtwpci-&gt;rx_rings[i];</div><div class='add'>+		rtw_pci_free_rx_ring(rtwdev, rx_ring);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_init_tx_ring(struct rtw_dev *rtwdev,</div><div class='add'>+				struct rtw_pci_tx_ring *tx_ring,</div><div class='add'>+				u8 desc_size, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(rtwdev-&gt;dev);</div><div class='add'>+	int ring_sz = desc_size * len;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u8 *head;</div><div class='add'>+</div><div class='add'>+	head = pci_zalloc_consistent(pdev, ring_sz, &amp;dma);</div><div class='add'>+	if (!head) {</div><div class='add'>+		rtw_err(rtwdev, "failed to allocate tx ring\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;tx_ring-&gt;queue);</div><div class='add'>+	tx_ring-&gt;r.head = head;</div><div class='add'>+	tx_ring-&gt;r.dma = dma;</div><div class='add'>+	tx_ring-&gt;r.len = len;</div><div class='add'>+	tx_ring-&gt;r.desc_size = desc_size;</div><div class='add'>+	tx_ring-&gt;r.wp = 0;</div><div class='add'>+	tx_ring-&gt;r.rp = 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 rtw_pci_reset_rx_desc(struct rtw_dev *rtwdev, struct sk_buff *skb,</div><div class='add'>+				 struct rtw_pci_rx_ring *rx_ring,</div><div class='add'>+				 u32 idx, u32 desc_sz)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(rtwdev-&gt;dev);</div><div class='add'>+	struct rtw_pci_rx_buffer_desc *buf_desc;</div><div class='add'>+	int buf_sz = RTK_PCI_RX_BUF_SIZE;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dma = pci_map_single(pdev, skb-&gt;data, buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+	if (pci_dma_mapping_error(pdev, dma))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	*((dma_addr_t *)skb-&gt;cb) = dma;</div><div class='add'>+	buf_desc = (struct rtw_pci_rx_buffer_desc *)(rx_ring-&gt;r.head +</div><div class='add'>+						     idx * desc_sz);</div><div class='add'>+	memset(buf_desc, 0, sizeof(*buf_desc));</div><div class='add'>+	buf_desc-&gt;buf_size = cpu_to_le16(RTK_PCI_RX_BUF_SIZE);</div><div class='add'>+	buf_desc-&gt;dma = cpu_to_le32(dma);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_init_rx_ring(struct rtw_dev *rtwdev,</div><div class='add'>+				struct rtw_pci_rx_ring *rx_ring,</div><div class='add'>+				u8 desc_size, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(rtwdev-&gt;dev);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u8 *head;</div><div class='add'>+	int ring_sz = desc_size * len;</div><div class='add'>+	int buf_sz = RTK_PCI_RX_BUF_SIZE;</div><div class='add'>+	int i, allocated;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	head = pci_zalloc_consistent(pdev, ring_sz, &amp;dma);</div><div class='add'>+	if (!head) {</div><div class='add'>+		rtw_err(rtwdev, "failed to allocate rx ring\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	rx_ring-&gt;r.head = head;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		skb = dev_alloc_skb(buf_sz);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			allocated = i;</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(skb-&gt;data, 0, buf_sz);</div><div class='add'>+		rx_ring-&gt;buf[i] = skb;</div><div class='add'>+		ret = rtw_pci_reset_rx_desc(rtwdev, skb, rx_ring, i, desc_size);</div><div class='add'>+		if (ret) {</div><div class='add'>+			allocated = i;</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;r.dma = dma;</div><div class='add'>+	rx_ring-&gt;r.len = len;</div><div class='add'>+	rx_ring-&gt;r.desc_size = desc_size;</div><div class='add'>+	rx_ring-&gt;r.wp = 0;</div><div class='add'>+	rx_ring-&gt;r.rp = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	for (i = 0; i &lt; allocated; i++) {</div><div class='add'>+		skb = rx_ring-&gt;buf[i];</div><div class='add'>+		if (!skb)</div><div class='add'>+			continue;</div><div class='add'>+		dma = *((dma_addr_t *)skb-&gt;cb);</div><div class='add'>+		pci_unmap_single(pdev, dma, buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		rx_ring-&gt;buf[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+	pci_free_consistent(pdev, ring_sz, head, dma);</div><div class='add'>+</div><div class='add'>+	rtw_err(rtwdev, "failed to init rx buffer\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 rtw_pci_init_trx_ring(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	struct rtw_pci_tx_ring *tx_ring;</div><div class='add'>+	struct rtw_pci_rx_ring *rx_ring;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	int i = 0, j = 0, tx_alloced = 0, rx_alloced = 0;</div><div class='add'>+	int tx_desc_size, rx_desc_size;</div><div class='add'>+	u32 len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tx_desc_size = chip-&gt;tx_buf_desc_sz;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RTK_MAX_TX_QUEUE_NUM; i++) {</div><div class='add'>+		tx_ring = &amp;rtwpci-&gt;tx_rings[i];</div><div class='add'>+		len = max_num_of_tx_queue(i);</div><div class='add'>+		ret = rtw_pci_init_tx_ring(rtwdev, tx_ring, tx_desc_size, len);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_desc_size = chip-&gt;rx_buf_desc_sz;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; RTK_MAX_RX_QUEUE_NUM; j++) {</div><div class='add'>+		rx_ring = &amp;rtwpci-&gt;rx_rings[j];</div><div class='add'>+		ret = rtw_pci_init_rx_ring(rtwdev, rx_ring, rx_desc_size,</div><div class='add'>+					   RTK_MAX_RX_DESC_NUM);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	tx_alloced = i;</div><div class='add'>+	for (i = 0; i &lt; tx_alloced; i++) {</div><div class='add'>+		tx_ring = &amp;rtwpci-&gt;tx_rings[i];</div><div class='add'>+		rtw_pci_free_tx_ring(rtwdev, tx_ring);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_alloced = j;</div><div class='add'>+	for (j = 0; j &lt; rx_alloced; j++) {</div><div class='add'>+		rx_ring = &amp;rtwpci-&gt;rx_rings[j];</div><div class='add'>+		rtw_pci_free_rx_ring(rtwdev, rx_ring);</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 rtw_pci_deinit(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_pci_free_trx_ring(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rtwpci-&gt;irq_mask[0] = IMR_HIGHDOK |</div><div class='add'>+			      IMR_MGNTDOK |</div><div class='add'>+			      IMR_BKDOK |</div><div class='add'>+			      IMR_BEDOK |</div><div class='add'>+			      IMR_VIDOK |</div><div class='add'>+			      IMR_VODOK |</div><div class='add'>+			      IMR_ROK |</div><div class='add'>+			      IMR_BCNDMAINT_E |</div><div class='add'>+			      0;</div><div class='add'>+	rtwpci-&gt;irq_mask[1] = IMR_TXFOVW |</div><div class='add'>+			      0;</div><div class='add'>+	rtwpci-&gt;irq_mask[3] = IMR_H2CDOK |</div><div class='add'>+			      0;</div><div class='add'>+	spin_lock_init(&amp;rtwpci-&gt;irq_lock);</div><div class='add'>+	ret = rtw_pci_init_trx_ring(rtwdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_reset_buf_desc(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	u32 len;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	tmp = rtw_read8(rtwdev, RTK_PCI_CTRL + 3);</div><div class='add'>+	rtw_write8(rtwdev, RTK_PCI_CTRL + 3, tmp | 0xf7);</div><div class='add'>+</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BCN].r.dma;</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_BCNQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_H2C].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_H2C].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_H2C].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_H2C].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_H2CQ, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_H2CQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BK].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BK].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BK].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BK].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_BKQ, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_BKQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BE].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BE].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BE].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_BE].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_BEQ, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_BEQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VO].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VO].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VO].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VO].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_VOQ, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_VOQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VI].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VI].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VI].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_VI].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_VIQ, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_VIQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_MGMT].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_MGMT].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_MGMT].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_MGMT].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_MGMTQ, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_MGMTQ, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_HI0].r.len;</div><div class='add'>+	dma = rtwpci-&gt;tx_rings[RTW_TX_QUEUE_HI0].r.dma;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_HI0].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;tx_rings[RTW_TX_QUEUE_HI0].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_TXBD_NUM_HI0Q, len);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_HI0Q, dma);</div><div class='add'>+</div><div class='add'>+	len = rtwpci-&gt;rx_rings[RTW_RX_QUEUE_MPDU].r.len;</div><div class='add'>+	dma = rtwpci-&gt;rx_rings[RTW_RX_QUEUE_MPDU].r.dma;</div><div class='add'>+	rtwpci-&gt;rx_rings[RTW_RX_QUEUE_MPDU].r.rp = 0;</div><div class='add'>+	rtwpci-&gt;rx_rings[RTW_RX_QUEUE_MPDU].r.wp = 0;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_RXBD_NUM_MPDUQ, len &amp; 0xfff);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_RXBD_DESA_MPDUQ, dma);</div><div class='add'>+</div><div class='add'>+	/* reset read/write point */</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_TXBD_RWPTR_CLR, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	/* rest H2C Queue index */</div><div class='add'>+	rtw_write32_set(rtwdev, RTK_PCI_TXBD_H2CQ_CSR, BIT_CLR_H2CQ_HOST_IDX);</div><div class='add'>+	rtw_write32_set(rtwdev, RTK_PCI_TXBD_H2CQ_CSR, BIT_CLR_H2CQ_HW_IDX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_reset_trx_ring(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_pci_reset_buf_desc(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_enable_interrupt(struct rtw_dev *rtwdev,</div><div class='add'>+				     struct rtw_pci *rtwpci)</div><div class='add'>+{</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HIMR0, rtwpci-&gt;irq_mask[0]);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HIMR1, rtwpci-&gt;irq_mask[1]);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HIMR3, rtwpci-&gt;irq_mask[3]);</div><div class='add'>+	rtwpci-&gt;irq_enabled = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_disable_interrupt(struct rtw_dev *rtwdev,</div><div class='add'>+				      struct rtw_pci *rtwpci)</div><div class='add'>+{</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HIMR0, 0);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HIMR1, 0);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HIMR3, 0);</div><div class='add'>+	rtwpci-&gt;irq_enabled = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_setup(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_pci_reset_trx_ring(rtwdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_dma_reset(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci)</div><div class='add'>+{</div><div class='add'>+	/* reset dma and rx tag */</div><div class='add'>+	rtw_write32_set(rtwdev, RTK_PCI_CTRL,</div><div class='add'>+			BIT_RST_TRXDMA_INTF | BIT_RX_TAG_EN);</div><div class='add'>+	rtwpci-&gt;rx_tag = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_start(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	rtw_pci_dma_reset(rtwdev, rtwpci);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rtwpci-&gt;irq_lock, flags);</div><div class='add'>+	rtw_pci_enable_interrupt(rtwdev, rtwpci);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtwpci-&gt;irq_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 rtw_pci_stop(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rtwpci-&gt;irq_lock, flags);</div><div class='add'>+	rtw_pci_disable_interrupt(rtwdev, rtwpci);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtwpci-&gt;irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ac_to_hwq[] = {</div><div class='add'>+	[0] = RTW_TX_QUEUE_VO,</div><div class='add'>+	[1] = RTW_TX_QUEUE_VI,</div><div class='add'>+	[2] = RTW_TX_QUEUE_BE,</div><div class='add'>+	[3] = RTW_TX_QUEUE_BK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 rtw_hw_queue_mapping(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	u8 q_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	u8 queue;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ieee80211_is_beacon(fc)))</div><div class='add'>+		queue = RTW_TX_QUEUE_BCN;</div><div class='add'>+	else if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc)))</div><div class='add'>+		queue = RTW_TX_QUEUE_MGMT;</div><div class='add'>+	else</div><div class='add'>+		queue = ac_to_hwq[q_mapping];</div><div class='add'>+</div><div class='add'>+	return queue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_release_rsvd_page(struct rtw_pci *rtwpci,</div><div class='add'>+				      struct rtw_pci_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *prev = skb_dequeue(&amp;ring-&gt;queue);</div><div class='add'>+	struct rtw_pci_tx_data *tx_data;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	if (!prev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tx_data = rtw_pci_get_tx_data(prev);</div><div class='add'>+	dma = tx_data-&gt;dma;</div><div class='add'>+	pci_unmap_single(rtwpci-&gt;pdev, dma, prev-&gt;len,</div><div class='add'>+			 PCI_DMA_TODEVICE);</div><div class='add'>+	dev_kfree_skb_any(prev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_dma_check(struct rtw_dev *rtwdev,</div><div class='add'>+			      struct rtw_pci_rx_ring *rx_ring,</div><div class='add'>+			      u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_pci_rx_buffer_desc *buf_desc;</div><div class='add'>+	u32 desc_sz = chip-&gt;rx_buf_desc_sz;</div><div class='add'>+	u16 total_pkt_size;</div><div class='add'>+</div><div class='add'>+	buf_desc = (struct rtw_pci_rx_buffer_desc *)(rx_ring-&gt;r.head +</div><div class='add'>+						     idx * desc_sz);</div><div class='add'>+	total_pkt_size = le16_to_cpu(buf_desc-&gt;total_pkt_size);</div><div class='add'>+</div><div class='add'>+	/* rx tag mismatch, throw a warning */</div><div class='add'>+	if (total_pkt_size != rtwpci-&gt;rx_tag)</div><div class='add'>+		rtw_warn(rtwdev, "pci bus timeout, check dma status\n");</div><div class='add'>+</div><div class='add'>+	rtwpci-&gt;rx_tag = (rtwpci-&gt;rx_tag + 1) % RX_TAG_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_xmit(struct rtw_dev *rtwdev,</div><div class='add'>+			struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+			struct sk_buff *skb, u8 queue)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_pci_tx_ring *ring;</div><div class='add'>+	struct rtw_pci_tx_data *tx_data;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u32 tx_pkt_desc_sz = chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	u32 tx_buf_desc_sz = chip-&gt;tx_buf_desc_sz;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 psb_len;</div><div class='add'>+	u8 *pkt_desc;</div><div class='add'>+	struct rtw_pci_tx_buffer_desc *buf_desc;</div><div class='add'>+	u32 bd_idx;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rtwpci-&gt;tx_rings[queue];</div><div class='add'>+</div><div class='add'>+	size = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (queue == RTW_TX_QUEUE_BCN)</div><div class='add'>+		rtw_pci_release_rsvd_page(rtwpci, ring);</div><div class='add'>+	else if (!avail_desc(ring-&gt;r.wp, ring-&gt;r.rp, ring-&gt;r.len))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	pkt_desc = skb_push(skb, chip-&gt;tx_pkt_desc_sz);</div><div class='add'>+	memset(pkt_desc, 0, tx_pkt_desc_sz);</div><div class='add'>+	pkt_info-&gt;qsel = rtw_pci_get_tx_qsel(skb, queue);</div><div class='add'>+	rtw_tx_fill_tx_desc(pkt_info, skb);</div><div class='add'>+	dma = pci_map_single(rtwpci-&gt;pdev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+			     PCI_DMA_TODEVICE);</div><div class='add'>+	if (pci_dma_mapping_error(rtwpci-&gt;pdev, dma))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* after this we got dma mapped, there is no way back */</div><div class='add'>+	buf_desc = get_tx_buffer_desc(ring, tx_buf_desc_sz);</div><div class='add'>+	memset(buf_desc, 0, tx_buf_desc_sz);</div><div class='add'>+	psb_len = (skb-&gt;len - 1) / 128 + 1;</div><div class='add'>+	if (queue == RTW_TX_QUEUE_BCN)</div><div class='add'>+		psb_len |= 1 &lt;&lt; RTK_PCI_TXBD_OWN_OFFSET;</div><div class='add'>+</div><div class='add'>+	buf_desc[0].psb_len = cpu_to_le16(psb_len);</div><div class='add'>+	buf_desc[0].buf_size = cpu_to_le16(tx_pkt_desc_sz);</div><div class='add'>+	buf_desc[0].dma = cpu_to_le32(dma);</div><div class='add'>+	buf_desc[1].buf_size = cpu_to_le16(size);</div><div class='add'>+	buf_desc[1].dma = cpu_to_le32(dma + tx_pkt_desc_sz);</div><div class='add'>+</div><div class='add'>+	tx_data = rtw_pci_get_tx_data(skb);</div><div class='add'>+	tx_data-&gt;dma = dma;</div><div class='add'>+	tx_data-&gt;sn = pkt_info-&gt;sn;</div><div class='add'>+	skb_queue_tail(&amp;ring-&gt;queue, skb);</div><div class='add'>+</div><div class='add'>+	/* kick off tx queue */</div><div class='add'>+	if (queue != RTW_TX_QUEUE_BCN) {</div><div class='add'>+		if (++ring-&gt;r.wp &gt;= ring-&gt;r.len)</div><div class='add'>+			ring-&gt;r.wp = 0;</div><div class='add'>+		bd_idx = rtw_pci_tx_queue_idx_addr[queue];</div><div class='add'>+		rtw_write16(rtwdev, bd_idx, ring-&gt;r.wp &amp; 0xfff);</div><div class='add'>+	} else {</div><div class='add'>+		u32 reg_bcn_work;</div><div class='add'>+</div><div class='add'>+		reg_bcn_work = rtw_read8(rtwdev, RTK_PCI_TXBD_BCN_WORK);</div><div class='add'>+		reg_bcn_work |= BIT_PCI_BCNQ_FLAG;</div><div class='add'>+		rtw_write8(rtwdev, RTK_PCI_TXBD_BCN_WORK, reg_bcn_work);</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 rtw_pci_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf,</div><div class='add'>+					u32 size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct rtw_tx_pkt_info pkt_info;</div><div class='add'>+	u32 tx_pkt_desc_sz;</div><div class='add'>+	u32 length;</div><div class='add'>+</div><div class='add'>+	tx_pkt_desc_sz = rtwdev-&gt;chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	length = size + tx_pkt_desc_sz;</div><div class='add'>+	skb = dev_alloc_skb(length);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, tx_pkt_desc_sz);</div><div class='add'>+	memcpy((u8 *)skb_put(skb, size), buf, size);</div><div class='add'>+	memset(&amp;pkt_info, 0, sizeof(pkt_info));</div><div class='add'>+	pkt_info.tx_pkt_size = size;</div><div class='add'>+	pkt_info.offset = tx_pkt_desc_sz;</div><div class='add'>+</div><div class='add'>+	return rtw_pci_xmit(rtwdev, &amp;pkt_info, skb, RTW_TX_QUEUE_BCN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct rtw_tx_pkt_info pkt_info;</div><div class='add'>+	u32 tx_pkt_desc_sz;</div><div class='add'>+	u32 length;</div><div class='add'>+</div><div class='add'>+	tx_pkt_desc_sz = rtwdev-&gt;chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	length = size + tx_pkt_desc_sz;</div><div class='add'>+	skb = dev_alloc_skb(length);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, tx_pkt_desc_sz);</div><div class='add'>+	memcpy((u8 *)skb_put(skb, size), buf, size);</div><div class='add'>+	memset(&amp;pkt_info, 0, sizeof(pkt_info));</div><div class='add'>+	pkt_info.tx_pkt_size = size;</div><div class='add'>+</div><div class='add'>+	return rtw_pci_xmit(rtwdev, &amp;pkt_info, skb, RTW_TX_QUEUE_H2C);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_tx(struct rtw_dev *rtwdev,</div><div class='add'>+		      struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+		      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	struct rtw_pci_tx_ring *ring;</div><div class='add'>+	u8 queue = rtw_hw_queue_mapping(skb);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_pci_xmit(rtwdev, pkt_info, skb, queue);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rtwpci-&gt;tx_rings[queue];</div><div class='add'>+	if (avail_desc(ring-&gt;r.wp, ring-&gt;r.rp, ring-&gt;r.len) &lt; 2) {</div><div class='add'>+		ieee80211_stop_queue(rtwdev-&gt;hw, skb_get_queue_mapping(skb));</div><div class='add'>+		ring-&gt;queue_stopped = 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 void rtw_pci_tx_isr(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci,</div><div class='add'>+			   u8 hw_queue)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = rtwdev-&gt;hw;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct rtw_pci_tx_ring *ring;</div><div class='add'>+	struct rtw_pci_tx_data *tx_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 count;</div><div class='add'>+	u32 bd_idx_addr;</div><div class='add'>+	u32 bd_idx, cur_rp;</div><div class='add'>+	u16 q_map;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rtwpci-&gt;tx_rings[hw_queue];</div><div class='add'>+</div><div class='add'>+	bd_idx_addr = rtw_pci_tx_queue_idx_addr[hw_queue];</div><div class='add'>+	bd_idx = rtw_read32(rtwdev, bd_idx_addr);</div><div class='add'>+	cur_rp = bd_idx &gt;&gt; 16;</div><div class='add'>+	cur_rp &amp;= 0xfff;</div><div class='add'>+	if (cur_rp &gt;= ring-&gt;r.rp)</div><div class='add'>+		count = cur_rp - ring-&gt;r.rp;</div><div class='add'>+	else</div><div class='add'>+		count = ring-&gt;r.len - (ring-&gt;r.rp - cur_rp);</div><div class='add'>+</div><div class='add'>+	while (count--) {</div><div class='add'>+		skb = skb_dequeue(&amp;ring-&gt;queue);</div><div class='add'>+		tx_data = rtw_pci_get_tx_data(skb);</div><div class='add'>+		pci_unmap_single(rtwpci-&gt;pdev, tx_data-&gt;dma, skb-&gt;len,</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+		/* just free command packets from host to card */</div><div class='add'>+		if (hw_queue == RTW_TX_QUEUE_H2C) {</div><div class='add'>+			dev_kfree_skb_irq(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ring-&gt;queue_stopped &amp;&amp;</div><div class='add'>+		    avail_desc(ring-&gt;r.wp, ring-&gt;r.rp, ring-&gt;r.len) &gt; 4) {</div><div class='add'>+			q_map = skb_get_queue_mapping(skb);</div><div class='add'>+			ieee80211_wake_queue(hw, q_map);</div><div class='add'>+			ring-&gt;queue_stopped = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, rtwdev-&gt;chip-&gt;tx_pkt_desc_sz);</div><div class='add'>+</div><div class='add'>+		info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		/* enqueue to wait for tx report */</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS) {</div><div class='add'>+			rtw_tx_report_enqueue(rtwdev, skb, tx_data-&gt;sn);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* always ACK for others, then they won't be marked as drop */</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='add'>+		else</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+		ieee80211_tx_info_clear_status(info);</div><div class='add'>+		ieee80211_tx_status_irqsafe(hw, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;r.rp = cur_rp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_rx_isr(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci,</div><div class='add'>+			   u8 hw_queue)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_pci_rx_ring *ring;</div><div class='add'>+	struct rtw_rx_pkt_stat pkt_stat;</div><div class='add'>+	struct ieee80211_rx_status rx_status;</div><div class='add'>+	struct sk_buff *skb, *new;</div><div class='add'>+	u32 cur_wp, cur_rp, tmp;</div><div class='add'>+	u32 count;</div><div class='add'>+	u32 pkt_offset;</div><div class='add'>+	u32 pkt_desc_sz = chip-&gt;rx_pkt_desc_sz;</div><div class='add'>+	u32 buf_desc_sz = chip-&gt;rx_buf_desc_sz;</div><div class='add'>+	u8 *rx_desc;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rtwpci-&gt;rx_rings[RTW_RX_QUEUE_MPDU];</div><div class='add'>+</div><div class='add'>+	tmp = rtw_read32(rtwdev, RTK_PCI_RXBD_IDX_MPDUQ);</div><div class='add'>+	cur_wp = tmp &gt;&gt; 16;</div><div class='add'>+	cur_wp &amp;= 0xfff;</div><div class='add'>+	if (cur_wp &gt;= ring-&gt;r.wp)</div><div class='add'>+		count = cur_wp - ring-&gt;r.wp;</div><div class='add'>+	else</div><div class='add'>+		count = ring-&gt;r.len - (ring-&gt;r.wp - cur_wp);</div><div class='add'>+</div><div class='add'>+	cur_rp = ring-&gt;r.rp;</div><div class='add'>+	while (count--) {</div><div class='add'>+		rtw_pci_dma_check(rtwdev, ring, cur_rp);</div><div class='add'>+		skb = ring-&gt;buf[cur_rp];</div><div class='add'>+		dma = *((dma_addr_t *)skb-&gt;cb);</div><div class='add'>+		pci_unmap_single(rtwpci-&gt;pdev, dma, RTK_PCI_RX_BUF_SIZE,</div><div class='add'>+				 PCI_DMA_FROMDEVICE);</div><div class='add'>+		rx_desc = skb-&gt;data;</div><div class='add'>+		chip-&gt;ops-&gt;query_rx_desc(rtwdev, rx_desc, &amp;pkt_stat, &amp;rx_status);</div><div class='add'>+</div><div class='add'>+		/* offset from rx_desc to payload */</div><div class='add'>+		pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +</div><div class='add'>+			     pkt_stat.shift;</div><div class='add'>+</div><div class='add'>+		if (pkt_stat.is_c2h) {</div><div class='add'>+			/* keep rx_desc, halmac needs it */</div><div class='add'>+			skb_put(skb, pkt_stat.pkt_len + pkt_offset);</div><div class='add'>+</div><div class='add'>+			/* pass offset for further operation */</div><div class='add'>+			*((u32 *)skb-&gt;cb) = pkt_offset;</div><div class='add'>+			skb_queue_tail(&amp;rtwdev-&gt;c2h_queue, skb);</div><div class='add'>+			ieee80211_queue_work(rtwdev-&gt;hw, &amp;rtwdev-&gt;c2h_work);</div><div class='add'>+		} else {</div><div class='add'>+			/* remove rx_desc, maybe use skb_pull? */</div><div class='add'>+			skb_put(skb, pkt_stat.pkt_len);</div><div class='add'>+			skb_reserve(skb, pkt_offset);</div><div class='add'>+</div><div class='add'>+			/* alloc a smaller skb to mac80211 */</div><div class='add'>+			new = dev_alloc_skb(pkt_stat.pkt_len);</div><div class='add'>+			if (!new) {</div><div class='add'>+				new = skb;</div><div class='add'>+			} else {</div><div class='add'>+				skb_put_data(new, skb-&gt;data, skb-&gt;len);</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+			}</div><div class='add'>+			/* TODO: merge into rx.c */</div><div class='add'>+			rtw_rx_stats(rtwdev, pkt_stat.vif, skb);</div><div class='add'>+			memcpy(new-&gt;cb, &amp;rx_status, sizeof(rx_status));</div><div class='add'>+			ieee80211_rx_irqsafe(rtwdev-&gt;hw, new);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* skb delivered to mac80211, alloc a new one in rx ring */</div><div class='add'>+		new = dev_alloc_skb(RTK_PCI_RX_BUF_SIZE);</div><div class='add'>+		if (WARN(!new, "rx routine starvation\n"))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ring-&gt;buf[cur_rp] = new;</div><div class='add'>+		rtw_pci_reset_rx_desc(rtwdev, new, ring, cur_rp, buf_desc_sz);</div><div class='add'>+</div><div class='add'>+		/* host read next element in ring */</div><div class='add'>+		if (++cur_rp &gt;= ring-&gt;r.len)</div><div class='add'>+			cur_rp = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;r.rp = cur_rp;</div><div class='add'>+	ring-&gt;r.wp = cur_wp;</div><div class='add'>+	rtw_write16(rtwdev, RTK_PCI_RXBD_IDX_MPDUQ, ring-&gt;r.rp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_irq_recognized(struct rtw_dev *rtwdev,</div><div class='add'>+				   struct rtw_pci *rtwpci, u32 *irq_status)</div><div class='add'>+{</div><div class='add'>+	irq_status[0] = rtw_read32(rtwdev, RTK_PCI_HISR0);</div><div class='add'>+	irq_status[1] = rtw_read32(rtwdev, RTK_PCI_HISR1);</div><div class='add'>+	irq_status[3] = rtw_read32(rtwdev, RTK_PCI_HISR3);</div><div class='add'>+	irq_status[0] &amp;= rtwpci-&gt;irq_mask[0];</div><div class='add'>+	irq_status[1] &amp;= rtwpci-&gt;irq_mask[1];</div><div class='add'>+	irq_status[3] &amp;= rtwpci-&gt;irq_mask[3];</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HISR0, irq_status[0]);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HISR1, irq_status[1]);</div><div class='add'>+	rtw_write32(rtwdev, RTK_PCI_HISR3, irq_status[3]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rtw_pci_interrupt_handler(int irq, void *dev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = dev;</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	u32 irq_status[4];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rtwpci-&gt;irq_lock);</div><div class='add'>+	if (!rtwpci-&gt;irq_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rtw_pci_irq_recognized(rtwdev, rtwpci, irq_status);</div><div class='add'>+</div><div class='add'>+	if (irq_status[0] &amp; IMR_MGNTDOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_MGMT);</div><div class='add'>+	if (irq_status[0] &amp; IMR_HIGHDOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_HI0);</div><div class='add'>+	if (irq_status[0] &amp; IMR_BEDOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_BE);</div><div class='add'>+	if (irq_status[0] &amp; IMR_BKDOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_BK);</div><div class='add'>+	if (irq_status[0] &amp; IMR_VODOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_VO);</div><div class='add'>+	if (irq_status[0] &amp; IMR_VIDOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_VI);</div><div class='add'>+	if (irq_status[3] &amp; IMR_H2CDOK)</div><div class='add'>+		rtw_pci_tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_H2C);</div><div class='add'>+	if (irq_status[0] &amp; IMR_ROK)</div><div class='add'>+		rtw_pci_rx_isr(rtwdev, rtwpci, RTW_RX_QUEUE_MPDU);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;rtwpci-&gt;irq_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 int rtw_pci_io_mapping(struct rtw_dev *rtwdev,</div><div class='add'>+			      struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	unsigned long len;</div><div class='add'>+	u8 bar_id = 2;</div><div class='add'>+	int ret;</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'>+		rtw_err(rtwdev, "failed to request pci regions\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = pci_resource_len(pdev, bar_id);</div><div class='add'>+	rtwpci-&gt;mmap = pci_iomap(pdev, bar_id, len);</div><div class='add'>+	if (!rtwpci-&gt;mmap) {</div><div class='add'>+		rtw_err(rtwdev, "failed to map pci memory\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'>+static void rtw_pci_io_unmapping(struct rtw_dev *rtwdev,</div><div class='add'>+				 struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (rtwpci-&gt;mmap) {</div><div class='add'>+		pci_iounmap(pdev, rtwpci-&gt;mmap);</div><div class='add'>+		pci_release_regions(pdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_dbi_write8(struct rtw_dev *rtwdev, u16 addr, u8 data)</div><div class='add'>+{</div><div class='add'>+	u16 write_addr;</div><div class='add'>+	u16 remainder = addr &amp; 0x3;</div><div class='add'>+	u8 flag;</div><div class='add'>+	u8 cnt = 20;</div><div class='add'>+</div><div class='add'>+	write_addr = ((addr &amp; 0x0ffc) | (BIT(0) &lt;&lt; (remainder + 12)));</div><div class='add'>+	rtw_write8(rtwdev, REG_DBI_WDATA_V1 + remainder, data);</div><div class='add'>+	rtw_write16(rtwdev, REG_DBI_FLAG_V1, write_addr);</div><div class='add'>+	rtw_write8(rtwdev, REG_DBI_FLAG_V1 + 2, 0x01);</div><div class='add'>+</div><div class='add'>+	flag = rtw_read8(rtwdev, REG_DBI_FLAG_V1 + 2);</div><div class='add'>+	while (flag &amp;&amp; (cnt != 0)) {</div><div class='add'>+		udelay(10);</div><div class='add'>+		flag = rtw_read8(rtwdev, REG_DBI_FLAG_V1 + 2);</div><div class='add'>+		cnt--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN(flag, "DBI write fail\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_mdio_write(struct rtw_dev *rtwdev, u8 addr, u16 data, bool g1)</div><div class='add'>+{</div><div class='add'>+	u8 page;</div><div class='add'>+	u8 wflag;</div><div class='add'>+	u8 cnt;</div><div class='add'>+</div><div class='add'>+	rtw_write16(rtwdev, REG_MDIO_V1, data);</div><div class='add'>+</div><div class='add'>+	page = addr &lt; 0x20 ? 0 : 1;</div><div class='add'>+	page += g1 ? 0 : 2;</div><div class='add'>+	rtw_write8(rtwdev, REG_PCIE_MIX_CFG, addr &amp; 0x1f);</div><div class='add'>+	rtw_write8(rtwdev, REG_PCIE_MIX_CFG + 3, page);</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_PCIE_MIX_CFG, BIT_MDIO_WFLAG_V1, 1);</div><div class='add'>+	wflag = rtw_read32_mask(rtwdev, REG_PCIE_MIX_CFG, BIT_MDIO_WFLAG_V1);</div><div class='add'>+</div><div class='add'>+	cnt = 20;</div><div class='add'>+	while (wflag &amp;&amp; (cnt != 0)) {</div><div class='add'>+		udelay(10);</div><div class='add'>+		wflag = rtw_read32_mask(rtwdev, REG_PCIE_MIX_CFG,</div><div class='add'>+					BIT_MDIO_WFLAG_V1);</div><div class='add'>+		cnt--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN(wflag, "MDIO write fail\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_intf_phy_para *para;</div><div class='add'>+	u16 cut;</div><div class='add'>+	u16 value;</div><div class='add'>+	u16 offset;</div><div class='add'>+	u16 ip_sel;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cut = BIT(0) &lt;&lt; rtwdev-&gt;hal.cut_version;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;intf_table-&gt;n_gen1_para; i++) {</div><div class='add'>+		para = &amp;chip-&gt;intf_table-&gt;gen1_para[i];</div><div class='add'>+		if (!(para-&gt;cut_mask &amp; cut))</div><div class='add'>+			continue;</div><div class='add'>+		if (para-&gt;offset == 0xffff)</div><div class='add'>+			break;</div><div class='add'>+		offset = para-&gt;offset;</div><div class='add'>+		value = para-&gt;value;</div><div class='add'>+		ip_sel = para-&gt;ip_sel;</div><div class='add'>+		if (para-&gt;ip_sel == RTW_IP_SEL_PHY)</div><div class='add'>+			rtw_mdio_write(rtwdev, offset, value, true);</div><div class='add'>+		else</div><div class='add'>+			rtw_dbi_write8(rtwdev, offset, value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;intf_table-&gt;n_gen2_para; i++) {</div><div class='add'>+		para = &amp;chip-&gt;intf_table-&gt;gen2_para[i];</div><div class='add'>+		if (!(para-&gt;cut_mask &amp; cut))</div><div class='add'>+			continue;</div><div class='add'>+		if (para-&gt;offset == 0xffff)</div><div class='add'>+			break;</div><div class='add'>+		offset = para-&gt;offset;</div><div class='add'>+		value = para-&gt;value;</div><div class='add'>+		ip_sel = para-&gt;ip_sel;</div><div class='add'>+		if (para-&gt;ip_sel == RTW_IP_SEL_PHY)</div><div class='add'>+			rtw_mdio_write(rtwdev, offset, value, false);</div><div class='add'>+		else</div><div class='add'>+			rtw_dbi_write8(rtwdev, offset, value);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_claim(struct rtw_dev *rtwdev, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to enable pci device\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, rtwdev-&gt;hw);</div><div class='add'>+	SET_IEEE80211_DEV(rtwdev-&gt;hw, &amp;pdev-&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 void rtw_pci_declaim(struct rtw_dev *rtwdev, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	pci_clear_master(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_pci_setup_resource(struct rtw_dev *rtwdev, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_pci *rtwpci;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+	rtwpci-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	/* after this driver can access to hw registers */</div><div class='add'>+	ret = rtw_pci_io_mapping(rtwdev, pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to request pci io region\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_pci_init(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to allocate pci resources\n");</div><div class='add'>+		goto err_io_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_pci_phy_cfg(rtwdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_io_unmap:</div><div class='add'>+	rtw_pci_io_unmapping(rtwdev, pdev);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_destroy(struct rtw_dev *rtwdev, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	rtw_pci_deinit(rtwdev);</div><div class='add'>+	rtw_pci_io_unmapping(rtwdev, pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtw_hci_ops rtw_pci_ops = {</div><div class='add'>+	.tx = rtw_pci_tx,</div><div class='add'>+	.setup = rtw_pci_setup,</div><div class='add'>+	.start = rtw_pci_start,</div><div class='add'>+	.stop = rtw_pci_stop,</div><div class='add'>+</div><div class='add'>+	.read8 = rtw_pci_read8,</div><div class='add'>+	.read16 = rtw_pci_read16,</div><div class='add'>+	.read32 = rtw_pci_read32,</div><div class='add'>+	.write8 = rtw_pci_write8,</div><div class='add'>+	.write16 = rtw_pci_write16,</div><div class='add'>+	.write32 = rtw_pci_write32,</div><div class='add'>+	.write_data_rsvd_page = rtw_pci_write_data_rsvd_page,</div><div class='add'>+	.write_data_h2c = rtw_pci_write_data_h2c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtw_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 ieee80211_hw *hw;</div><div class='add'>+	struct rtw_dev *rtwdev;</div><div class='add'>+	int drv_data_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	drv_data_size = sizeof(struct rtw_dev) + sizeof(struct rtw_pci);</div><div class='add'>+	hw = ieee80211_alloc_hw(drv_data_size, &amp;rtw_ops);</div><div class='add'>+	if (!hw) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to allocate hw\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtwdev = hw-&gt;priv;</div><div class='add'>+	rtwdev-&gt;hw = hw;</div><div class='add'>+	rtwdev-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	rtwdev-&gt;chip = (struct rtw_chip_info *)id-&gt;driver_data;</div><div class='add'>+	rtwdev-&gt;hci.ops = &amp;rtw_pci_ops;</div><div class='add'>+	rtwdev-&gt;hci.type = RTW_HCI_TYPE_PCIE;</div><div class='add'>+</div><div class='add'>+	ret = rtw_core_init(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_release_hw;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_PCI,</div><div class='add'>+		"rtw88 pci probe: vendor=0x%4.04X device=0x%4.04X rev=%d\n",</div><div class='add'>+		pdev-&gt;vendor, pdev-&gt;device, pdev-&gt;revision);</div><div class='add'>+</div><div class='add'>+	ret = rtw_pci_claim(rtwdev, pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to claim pci device\n");</div><div class='add'>+		goto err_deinit_core;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_pci_setup_resource(rtwdev, pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup pci resources\n");</div><div class='add'>+		goto err_pci_declaim;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_chip_info_setup(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to setup chip information\n");</div><div class='add'>+		goto err_destroy_pci;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtw_register_hw(rtwdev, hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to register hw\n");</div><div class='add'>+		goto err_destroy_pci;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(pdev-&gt;irq, &amp;rtw_pci_interrupt_handler,</div><div class='add'>+			  IRQF_SHARED, KBUILD_MODNAME, rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ieee80211_unregister_hw(hw);</div><div class='add'>+		goto err_destroy_pci;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_destroy_pci:</div><div class='add'>+	rtw_pci_destroy(rtwdev, pdev);</div><div class='add'>+</div><div class='add'>+err_pci_declaim:</div><div class='add'>+	rtw_pci_declaim(rtwdev, pdev);</div><div class='add'>+</div><div class='add'>+err_deinit_core:</div><div class='add'>+	rtw_core_deinit(rtwdev);</div><div class='add'>+</div><div class='add'>+err_release_hw:</div><div class='add'>+	ieee80211_free_hw(hw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = pci_get_drvdata(pdev);</div><div class='add'>+	struct rtw_dev *rtwdev;</div><div class='add'>+	struct rtw_pci *rtwpci;</div><div class='add'>+</div><div class='add'>+	if (!hw)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtwdev = hw-&gt;priv;</div><div class='add'>+	rtwpci = (struct rtw_pci *)rtwdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	rtw_unregister_hw(rtwdev, hw);</div><div class='add'>+	rtw_pci_disable_interrupt(rtwdev, rtwpci);</div><div class='add'>+	rtw_pci_destroy(rtwdev, pdev);</div><div class='add'>+	rtw_pci_declaim(rtwdev, pdev);</div><div class='add'>+	free_irq(rtwpci-&gt;pdev-&gt;irq, rtwdev);</div><div class='add'>+	rtw_core_deinit(rtwdev);</div><div class='add'>+	ieee80211_free_hw(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id rtw_pci_id_table[] = {</div><div class='add'>+#ifdef CONFIG_RTW88_8822BE</div><div class='add'>+	{ RTK_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xB822, rtw8822b_hw_spec) },</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_RTW88_8822CE</div><div class='add'>+	{ RTK_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xC822, rtw8822c_hw_spec) },</div><div class='add'>+#endif</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, rtw_pci_id_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver rtw_pci_driver = {</div><div class='add'>+	.name = "rtw_pci",</div><div class='add'>+	.id_table = rtw_pci_id_table,</div><div class='add'>+	.probe = rtw_pci_probe,</div><div class='add'>+	.remove = rtw_pci_remove,</div><div class='add'>+};</div><div class='add'>+module_pci_driver(rtw_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Realtek Corporation");</div><div class='add'>+MODULE_DESCRIPTION("Realtek 802.11ac wireless PCI driver");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/pci.h b/drivers/net/wireless/realtek/rtw88/pci.h<br/>new file mode 100644<br/>index 000000000000..87824a4caba9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/pci.h</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(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTK_PCI_H_</div><div class='add'>+#define __RTK_PCI_H_</div><div class='add'>+</div><div class='add'>+#define RTK_PCI_DEVICE(vend, dev, hw_config)	\</div><div class='add'>+	PCI_DEVICE(vend, dev),			\</div><div class='add'>+	.driver_data = (kernel_ulong_t)&amp;(hw_config),</div><div class='add'>+</div><div class='add'>+#define RTK_DEFAULT_TX_DESC_NUM 128</div><div class='add'>+#define RTK_BEQ_TX_DESC_NUM	256</div><div class='add'>+</div><div class='add'>+#define RTK_MAX_RX_DESC_NUM	512</div><div class='add'>+/* 8K + rx desc size */</div><div class='add'>+#define RTK_PCI_RX_BUF_SIZE	(8192 + 24)</div><div class='add'>+</div><div class='add'>+#define RTK_PCI_CTRL		0x300</div><div class='add'>+#define BIT_RST_TRXDMA_INTF	BIT(20)</div><div class='add'>+#define BIT_RX_TAG_EN		BIT(15)</div><div class='add'>+#define REG_DBI_WDATA_V1	0x03E8</div><div class='add'>+#define REG_DBI_FLAG_V1		0x03F0</div><div class='add'>+#define REG_MDIO_V1		0x03F4</div><div class='add'>+#define REG_PCIE_MIX_CFG	0x03F8</div><div class='add'>+#define BIT_MDIO_WFLAG_V1	BIT(5)</div><div class='add'>+</div><div class='add'>+#define BIT_PCI_BCNQ_FLAG	BIT(4)</div><div class='add'>+#define RTK_PCI_TXBD_DESA_BCNQ	0x308</div><div class='add'>+#define RTK_PCI_TXBD_DESA_H2CQ	0x1320</div><div class='add'>+#define RTK_PCI_TXBD_DESA_MGMTQ	0x310</div><div class='add'>+#define RTK_PCI_TXBD_DESA_BKQ	0x330</div><div class='add'>+#define RTK_PCI_TXBD_DESA_BEQ	0x328</div><div class='add'>+#define RTK_PCI_TXBD_DESA_VIQ	0x320</div><div class='add'>+#define RTK_PCI_TXBD_DESA_VOQ	0x318</div><div class='add'>+#define RTK_PCI_TXBD_DESA_HI0Q	0x340</div><div class='add'>+#define RTK_PCI_RXBD_DESA_MPDUQ	0x338</div><div class='add'>+</div><div class='add'>+/* BCNQ is specialized for rsvd page, does not need to specify a number */</div><div class='add'>+#define RTK_PCI_TXBD_NUM_H2CQ	0x1328</div><div class='add'>+#define RTK_PCI_TXBD_NUM_MGMTQ	0x380</div><div class='add'>+#define RTK_PCI_TXBD_NUM_BKQ	0x38A</div><div class='add'>+#define RTK_PCI_TXBD_NUM_BEQ	0x388</div><div class='add'>+#define RTK_PCI_TXBD_NUM_VIQ	0x386</div><div class='add'>+#define RTK_PCI_TXBD_NUM_VOQ	0x384</div><div class='add'>+#define RTK_PCI_TXBD_NUM_HI0Q	0x38C</div><div class='add'>+#define RTK_PCI_RXBD_NUM_MPDUQ	0x382</div><div class='add'>+#define RTK_PCI_TXBD_IDX_H2CQ	0x132C</div><div class='add'>+#define RTK_PCI_TXBD_IDX_MGMTQ	0x3B0</div><div class='add'>+#define RTK_PCI_TXBD_IDX_BKQ	0x3AC</div><div class='add'>+#define RTK_PCI_TXBD_IDX_BEQ	0x3A8</div><div class='add'>+#define RTK_PCI_TXBD_IDX_VIQ	0x3A4</div><div class='add'>+#define RTK_PCI_TXBD_IDX_VOQ	0x3A0</div><div class='add'>+#define RTK_PCI_TXBD_IDX_HI0Q	0x3B8</div><div class='add'>+#define RTK_PCI_RXBD_IDX_MPDUQ	0x3B4</div><div class='add'>+</div><div class='add'>+#define RTK_PCI_TXBD_RWPTR_CLR	0x39C</div><div class='add'>+#define RTK_PCI_TXBD_H2CQ_CSR	0x1330</div><div class='add'>+</div><div class='add'>+#define BIT_CLR_H2CQ_HOST_IDX	BIT(16)</div><div class='add'>+#define BIT_CLR_H2CQ_HW_IDX	BIT(8)</div><div class='add'>+</div><div class='add'>+#define RTK_PCI_HIMR0		0x0B0</div><div class='add'>+#define RTK_PCI_HISR0		0x0B4</div><div class='add'>+#define RTK_PCI_HIMR1		0x0B8</div><div class='add'>+#define RTK_PCI_HISR1		0x0BC</div><div class='add'>+#define RTK_PCI_HIMR2		0x10B0</div><div class='add'>+#define RTK_PCI_HISR2		0x10B4</div><div class='add'>+#define RTK_PCI_HIMR3		0x10B8</div><div class='add'>+#define RTK_PCI_HISR3		0x10BC</div><div class='add'>+/* IMR 0 */</div><div class='add'>+#define IMR_TIMER2		BIT(31)</div><div class='add'>+#define IMR_TIMER1		BIT(30)</div><div class='add'>+#define IMR_PSTIMEOUT		BIT(29)</div><div class='add'>+#define IMR_GTINT4		BIT(28)</div><div class='add'>+#define IMR_GTINT3		BIT(27)</div><div class='add'>+#define IMR_TBDER		BIT(26)</div><div class='add'>+#define IMR_TBDOK		BIT(25)</div><div class='add'>+#define IMR_TSF_BIT32_TOGGLE	BIT(24)</div><div class='add'>+#define IMR_BCNDMAINT0		BIT(20)</div><div class='add'>+#define IMR_BCNDOK0		BIT(16)</div><div class='add'>+#define IMR_HSISR_IND_ON_INT	BIT(15)</div><div class='add'>+#define IMR_BCNDMAINT_E		BIT(14)</div><div class='add'>+#define IMR_ATIMEND		BIT(12)</div><div class='add'>+#define IMR_HISR1_IND_INT	BIT(11)</div><div class='add'>+#define IMR_C2HCMD		BIT(10)</div><div class='add'>+#define IMR_CPWM2		BIT(9)</div><div class='add'>+#define IMR_CPWM		BIT(8)</div><div class='add'>+#define IMR_HIGHDOK		BIT(7)</div><div class='add'>+#define IMR_MGNTDOK		BIT(6)</div><div class='add'>+#define IMR_BKDOK		BIT(5)</div><div class='add'>+#define IMR_BEDOK		BIT(4)</div><div class='add'>+#define IMR_VIDOK		BIT(3)</div><div class='add'>+#define IMR_VODOK		BIT(2)</div><div class='add'>+#define IMR_RDU			BIT(1)</div><div class='add'>+#define IMR_ROK			BIT(0)</div><div class='add'>+/* IMR 1 */</div><div class='add'>+#define IMR_TXFIFO_TH_INT	BIT(30)</div><div class='add'>+#define IMR_BTON_STS_UPDATE	BIT(29)</div><div class='add'>+#define IMR_MCUERR		BIT(28)</div><div class='add'>+#define IMR_BCNDMAINT7		BIT(27)</div><div class='add'>+#define IMR_BCNDMAINT6		BIT(26)</div><div class='add'>+#define IMR_BCNDMAINT5		BIT(25)</div><div class='add'>+#define IMR_BCNDMAINT4		BIT(24)</div><div class='add'>+#define IMR_BCNDMAINT3		BIT(23)</div><div class='add'>+#define IMR_BCNDMAINT2		BIT(22)</div><div class='add'>+#define IMR_BCNDMAINT1		BIT(21)</div><div class='add'>+#define IMR_BCNDOK7		BIT(20)</div><div class='add'>+#define IMR_BCNDOK6		BIT(19)</div><div class='add'>+#define IMR_BCNDOK5		BIT(18)</div><div class='add'>+#define IMR_BCNDOK4		BIT(17)</div><div class='add'>+#define IMR_BCNDOK3		BIT(16)</div><div class='add'>+#define IMR_BCNDOK2		BIT(15)</div><div class='add'>+#define IMR_BCNDOK1		BIT(14)</div><div class='add'>+#define IMR_ATIMEND_E		BIT(13)</div><div class='add'>+#define IMR_ATIMEND		BIT(12)</div><div class='add'>+#define IMR_TXERR		BIT(11)</div><div class='add'>+#define IMR_RXERR		BIT(10)</div><div class='add'>+#define IMR_TXFOVW		BIT(9)</div><div class='add'>+#define IMR_RXFOVW		BIT(8)</div><div class='add'>+#define IMR_CPU_MGQ_TXDONE	BIT(5)</div><div class='add'>+#define IMR_PS_TIMER_C		BIT(4)</div><div class='add'>+#define IMR_PS_TIMER_B		BIT(3)</div><div class='add'>+#define IMR_PS_TIMER_A		BIT(2)</div><div class='add'>+#define IMR_CPUMGQ_TX_TIMER	BIT(1)</div><div class='add'>+/* IMR 3 */</div><div class='add'>+#define IMR_H2CDOK		BIT(16)</div><div class='add'>+</div><div class='add'>+/* one element is reserved to know if the ring is closed */</div><div class='add'>+static inline int avail_desc(u32 wp, u32 rp, u32 len)</div><div class='add'>+{</div><div class='add'>+	if (rp &gt; wp)</div><div class='add'>+		return rp - wp - 1;</div><div class='add'>+	else</div><div class='add'>+		return len - wp + rp - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RTK_PCI_TXBD_OWN_OFFSET 15</div><div class='add'>+#define RTK_PCI_TXBD_BCN_WORK	0x383</div><div class='add'>+</div><div class='add'>+struct rtw_pci_tx_buffer_desc {</div><div class='add'>+	__le16 buf_size;</div><div class='add'>+	__le16 psb_len;</div><div class='add'>+	__le32 dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_pci_tx_data {</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u8 sn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_pci_ring {</div><div class='add'>+	u8 *head;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	u8 desc_size;</div><div class='add'>+</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 wp;</div><div class='add'>+	u32 rp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_pci_tx_ring {</div><div class='add'>+	struct rtw_pci_ring r;</div><div class='add'>+	struct sk_buff_head queue;</div><div class='add'>+	bool queue_stopped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_pci_rx_buffer_desc {</div><div class='add'>+	__le16 buf_size;</div><div class='add'>+	__le16 total_pkt_size;</div><div class='add'>+	__le32 dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_pci_rx_ring {</div><div class='add'>+	struct rtw_pci_ring r;</div><div class='add'>+	struct sk_buff *buf[RTK_MAX_RX_DESC_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RX_TAG_MAX	8192</div><div class='add'>+</div><div class='add'>+struct rtw_pci {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	/* used for pci interrupt */</div><div class='add'>+	spinlock_t irq_lock;</div><div class='add'>+	u32 irq_mask[4];</div><div class='add'>+	bool irq_enabled;</div><div class='add'>+</div><div class='add'>+	u16 rx_tag;</div><div class='add'>+	struct rtw_pci_tx_ring tx_rings[RTK_MAX_TX_QUEUE_NUM];</div><div class='add'>+	struct rtw_pci_rx_ring rx_rings[RTK_MAX_RX_QUEUE_NUM];</div><div class='add'>+</div><div class='add'>+	void __iomem *mmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 max_num_of_tx_queue(u8 queue)</div><div class='add'>+{</div><div class='add'>+	u32 max_num;</div><div class='add'>+</div><div class='add'>+	switch (queue) {</div><div class='add'>+	case RTW_TX_QUEUE_BE:</div><div class='add'>+		max_num = RTK_BEQ_TX_DESC_NUM;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_TX_QUEUE_BCN:</div><div class='add'>+		max_num = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		max_num = RTK_DEFAULT_TX_DESC_NUM;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct</div><div class='add'>+rtw_pci_tx_data *rtw_pci_get_tx_data(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct rtw_pci_tx_data) &gt;</div><div class='add'>+		     sizeof(info-&gt;status.status_driver_data));</div><div class='add'>+</div><div class='add'>+	return (struct rtw_pci_tx_data *)info-&gt;status.status_driver_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+struct rtw_pci_tx_buffer_desc *get_tx_buffer_desc(struct rtw_pci_tx_ring *ring,</div><div class='add'>+						  u32 size)</div><div class='add'>+{</div><div class='add'>+	u8 *buf_desc;</div><div class='add'>+</div><div class='add'>+	buf_desc = ring-&gt;r.head + ring-&gt;r.wp * size;</div><div class='add'>+	return (struct rtw_pci_tx_buffer_desc *)buf_desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c<br/>new file mode 100644<br/>index 000000000000..4381b360b5b5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/phy.c</a></div><div class='hunk'>@@ -0,0 +1,1727 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+struct phy_cfg_pair {</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union phy_table_tile {</div><div class='add'>+	struct rtw_phy_cond cond;</div><div class='add'>+	struct phy_cfg_pair cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct phy_pg_cfg_pair {</div><div class='add'>+	u32 band;</div><div class='add'>+	u32 rf_path;</div><div class='add'>+	u32 tx_num;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 bitmask;</div><div class='add'>+	u32 data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct txpwr_lmt_cfg_pair {</div><div class='add'>+	u8 regd;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 rs;</div><div class='add'>+	u8 ch;</div><div class='add'>+	s8 txpwr_lmt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 db_invert_table[12][8] = {</div><div class='add'>+	{10,		13,		16,		20,</div><div class='add'>+	 25,		32,		40,		50},</div><div class='add'>+	{64,		80,		101,		128,</div><div class='add'>+	 160,		201,		256,		318},</div><div class='add'>+	{401,		505,		635,		800,</div><div class='add'>+	 1007,		1268,		1596,		2010},</div><div class='add'>+	{316,		398,		501,		631,</div><div class='add'>+	 794,		1000,		1259,		1585},</div><div class='add'>+	{1995,		2512,		3162,		3981,</div><div class='add'>+	 5012,		6310,		7943,		10000},</div><div class='add'>+	{12589,		15849,		19953,		25119,</div><div class='add'>+	 31623,		39811,		50119,		63098},</div><div class='add'>+	{79433,		100000,		125893,		158489,</div><div class='add'>+	 199526,	251189,		316228,		398107},</div><div class='add'>+	{501187,	630957,		794328,		1000000,</div><div class='add'>+	 1258925,	1584893,	1995262,	2511886},</div><div class='add'>+	{3162278,	3981072,	5011872,	6309573,</div><div class='add'>+	 7943282,	1000000,	12589254,	15848932},</div><div class='add'>+	{19952623,	25118864,	31622777,	39810717,</div><div class='add'>+	 50118723,	63095734,	79432823,	100000000},</div><div class='add'>+	{125892541,	158489319,	199526232,	251188643,</div><div class='add'>+	 316227766,	398107171,	501187234,	630957345},</div><div class='add'>+	{794328235,	1000000000,	1258925412,	1584893192,</div><div class='add'>+	 1995262315,	2511886432U,	3162277660U,	3981071706U}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtw_phy_band_type {</div><div class='add'>+	PHY_BAND_2G	= 0,</div><div class='add'>+	PHY_BAND_5G	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void rtw_phy_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	u32 addr, mask;</div><div class='add'>+</div><div class='add'>+	dm_info-&gt;fa_history[3] = 0;</div><div class='add'>+	dm_info-&gt;fa_history[2] = 0;</div><div class='add'>+	dm_info-&gt;fa_history[1] = 0;</div><div class='add'>+	dm_info-&gt;fa_history[0] = 0;</div><div class='add'>+	dm_info-&gt;igi_bitmap = 0;</div><div class='add'>+	dm_info-&gt;igi_history[3] = 0;</div><div class='add'>+	dm_info-&gt;igi_history[2] = 0;</div><div class='add'>+	dm_info-&gt;igi_history[1] = 0;</div><div class='add'>+</div><div class='add'>+	addr = chip-&gt;dig[0].addr;</div><div class='add'>+	mask = chip-&gt;dig[0].mask;</div><div class='add'>+	dm_info-&gt;igi_history[0] = rtw_read32_mask(rtwdev, addr, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_dig_write(struct rtw_dev *rtwdev, u8 igi)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u32 addr, mask;</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; hal-&gt;rf_path_num; path++) {</div><div class='add'>+		addr = chip-&gt;dig[path].addr;</div><div class='add'>+		mask = chip-&gt;dig[path].mask;</div><div class='add'>+		rtw_write32_mask(rtwdev, addr, mask, igi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_stat_false_alarm(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+</div><div class='add'>+	chip-&gt;ops-&gt;false_alarm_statistics(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RA_FLOOR_TABLE_SIZE	7</div><div class='add'>+#define RA_FLOOR_UP_GAP		3</div><div class='add'>+</div><div class='add'>+static u8 rtw_phy_get_rssi_level(u8 old_level, u8 rssi)</div><div class='add'>+{</div><div class='add'>+	u8 table[RA_FLOOR_TABLE_SIZE] = {20, 34, 38, 42, 46, 50, 100};</div><div class='add'>+	u8 new_level = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RA_FLOOR_TABLE_SIZE; i++)</div><div class='add'>+		if (i &gt;= old_level)</div><div class='add'>+			table[i] += RA_FLOOR_UP_GAP;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RA_FLOOR_TABLE_SIZE; i++) {</div><div class='add'>+		if (rssi &lt; table[i]) {</div><div class='add'>+			new_level = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return new_level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtw_phy_stat_iter_data {</div><div class='add'>+	struct rtw_dev *rtwdev;</div><div class='add'>+	u8 min_rssi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtw_phy_stat_rssi_iter(void *data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct rtw_phy_stat_iter_data *iter_data = data;</div><div class='add'>+	struct rtw_dev *rtwdev = iter_data-&gt;rtwdev;</div><div class='add'>+	struct rtw_sta_info *si = (struct rtw_sta_info *)sta-&gt;drv_priv;</div><div class='add'>+	u8 rssi, rssi_level;</div><div class='add'>+</div><div class='add'>+	rssi = ewma_rssi_read(&amp;si-&gt;avg_rssi);</div><div class='add'>+	rssi_level = rtw_phy_get_rssi_level(si-&gt;rssi_level, rssi);</div><div class='add'>+</div><div class='add'>+	rtw_fw_send_rssi_info(rtwdev, si);</div><div class='add'>+</div><div class='add'>+	iter_data-&gt;min_rssi = min_t(u8, rssi, iter_data-&gt;min_rssi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_stat_rssi(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	struct rtw_phy_stat_iter_data data = {};</div><div class='add'>+</div><div class='add'>+	data.rtwdev = rtwdev;</div><div class='add'>+	data.min_rssi = U8_MAX;</div><div class='add'>+	rtw_iterate_stas_atomic(rtwdev, rtw_phy_stat_rssi_iter, &amp;data);</div><div class='add'>+</div><div class='add'>+	dm_info-&gt;pre_min_rssi = dm_info-&gt;min_rssi;</div><div class='add'>+	dm_info-&gt;min_rssi = data.min_rssi;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_statistics(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_phy_stat_rssi(rtwdev);</div><div class='add'>+	rtw_phy_stat_false_alarm(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DIG_PERF_FA_TH_LOW			250</div><div class='add'>+#define DIG_PERF_FA_TH_HIGH			500</div><div class='add'>+#define DIG_PERF_FA_TH_EXTRA_HIGH		750</div><div class='add'>+#define DIG_PERF_MAX				0x5a</div><div class='add'>+#define DIG_PERF_MID				0x40</div><div class='add'>+#define DIG_CVRG_FA_TH_LOW			2000</div><div class='add'>+#define DIG_CVRG_FA_TH_HIGH			4000</div><div class='add'>+#define DIG_CVRG_FA_TH_EXTRA_HIGH		5000</div><div class='add'>+#define DIG_CVRG_MAX				0x2a</div><div class='add'>+#define DIG_CVRG_MID				0x26</div><div class='add'>+#define DIG_CVRG_MIN				0x1c</div><div class='add'>+#define DIG_RSSI_GAIN_OFFSET			15</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+rtw_phy_dig_check_damping(struct rtw_dm_info *dm_info)</div><div class='add'>+{</div><div class='add'>+	u16 fa_lo = DIG_PERF_FA_TH_LOW;</div><div class='add'>+	u16 fa_hi = DIG_PERF_FA_TH_HIGH;</div><div class='add'>+	u16 *fa_history;</div><div class='add'>+	u8 *igi_history;</div><div class='add'>+	u8 damping_rssi;</div><div class='add'>+	u8 min_rssi;</div><div class='add'>+	u8 diff;</div><div class='add'>+	u8 igi_bitmap;</div><div class='add'>+	bool damping = false;</div><div class='add'>+</div><div class='add'>+	min_rssi = dm_info-&gt;min_rssi;</div><div class='add'>+	if (dm_info-&gt;damping) {</div><div class='add'>+		damping_rssi = dm_info-&gt;damping_rssi;</div><div class='add'>+		diff = min_rssi &gt; damping_rssi ? min_rssi - damping_rssi :</div><div class='add'>+						 damping_rssi - min_rssi;</div><div class='add'>+		if (diff &gt; 3 || dm_info-&gt;damping_cnt++ &gt; 20) {</div><div class='add'>+			dm_info-&gt;damping = false;</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'>+	igi_history = dm_info-&gt;igi_history;</div><div class='add'>+	fa_history = dm_info-&gt;fa_history;</div><div class='add'>+	igi_bitmap = dm_info-&gt;igi_bitmap &amp; 0xf;</div><div class='add'>+	switch (igi_bitmap) {</div><div class='add'>+	case 5:</div><div class='add'>+		/* down -&gt; up -&gt; down -&gt; up */</div><div class='add'>+		if (igi_history[0] &gt; igi_history[1] &amp;&amp;</div><div class='add'>+		    igi_history[2] &gt; igi_history[3] &amp;&amp;</div><div class='add'>+		    igi_history[0] - igi_history[1] &gt;= 2 &amp;&amp;</div><div class='add'>+		    igi_history[2] - igi_history[3] &gt;= 2 &amp;&amp;</div><div class='add'>+		    fa_history[0] &gt; fa_hi &amp;&amp; fa_history[1] &lt; fa_lo &amp;&amp;</div><div class='add'>+		    fa_history[2] &gt; fa_hi &amp;&amp; fa_history[3] &lt; fa_lo)</div><div class='add'>+			damping = true;</div><div class='add'>+		break;</div><div class='add'>+	case 9:</div><div class='add'>+		/* up -&gt; down -&gt; down -&gt; up */</div><div class='add'>+		if (igi_history[0] &gt; igi_history[1] &amp;&amp;</div><div class='add'>+		    igi_history[3] &gt; igi_history[2] &amp;&amp;</div><div class='add'>+		    igi_history[0] - igi_history[1] &gt;= 4 &amp;&amp;</div><div class='add'>+		    igi_history[3] - igi_history[2] &gt;= 2 &amp;&amp;</div><div class='add'>+		    fa_history[0] &gt; fa_hi &amp;&amp; fa_history[1] &lt; fa_lo &amp;&amp;</div><div class='add'>+		    fa_history[2] &lt; fa_lo &amp;&amp; fa_history[3] &gt; fa_hi)</div><div class='add'>+			damping = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (damping) {</div><div class='add'>+		dm_info-&gt;damping = true;</div><div class='add'>+		dm_info-&gt;damping_cnt = 0;</div><div class='add'>+		dm_info-&gt;damping_rssi = min_rssi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return damping;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_dig_get_boundary(struct rtw_dm_info *dm_info,</div><div class='add'>+				     u8 *upper, u8 *lower, bool linked)</div><div class='add'>+{</div><div class='add'>+	u8 dig_max, dig_min, dig_mid;</div><div class='add'>+	u8 min_rssi;</div><div class='add'>+</div><div class='add'>+	if (linked) {</div><div class='add'>+		dig_max = DIG_PERF_MAX;</div><div class='add'>+		dig_mid = DIG_PERF_MID;</div><div class='add'>+		/* 22B=0x1c, 22C=0x20 */</div><div class='add'>+		dig_min = 0x1c;</div><div class='add'>+		min_rssi = max_t(u8, dm_info-&gt;min_rssi, dig_min);</div><div class='add'>+	} else {</div><div class='add'>+		dig_max = DIG_CVRG_MAX;</div><div class='add'>+		dig_mid = DIG_CVRG_MID;</div><div class='add'>+		dig_min = DIG_CVRG_MIN;</div><div class='add'>+		min_rssi = dig_min;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DIG MAX should be bounded by minimum RSSI with offset +15 */</div><div class='add'>+	dig_max = min_t(u8, dig_max, min_rssi + DIG_RSSI_GAIN_OFFSET);</div><div class='add'>+</div><div class='add'>+	*lower = clamp_t(u8, min_rssi, dig_min, dig_mid);</div><div class='add'>+	*upper = clamp_t(u8, *lower + DIG_RSSI_GAIN_OFFSET, dig_min, dig_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_dig_get_threshold(struct rtw_dm_info *dm_info,</div><div class='add'>+				      u16 *fa_th, u8 *step, bool linked)</div><div class='add'>+{</div><div class='add'>+	u8 min_rssi, pre_min_rssi;</div><div class='add'>+</div><div class='add'>+	min_rssi = dm_info-&gt;min_rssi;</div><div class='add'>+	pre_min_rssi = dm_info-&gt;pre_min_rssi;</div><div class='add'>+	step[0] = 4;</div><div class='add'>+	step[1] = 3;</div><div class='add'>+	step[2] = 2;</div><div class='add'>+</div><div class='add'>+	if (linked) {</div><div class='add'>+		fa_th[0] = DIG_PERF_FA_TH_EXTRA_HIGH;</div><div class='add'>+		fa_th[1] = DIG_PERF_FA_TH_HIGH;</div><div class='add'>+		fa_th[2] = DIG_PERF_FA_TH_LOW;</div><div class='add'>+		if (pre_min_rssi &gt; min_rssi) {</div><div class='add'>+			step[0] = 6;</div><div class='add'>+			step[1] = 4;</div><div class='add'>+			step[2] = 2;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		fa_th[0] = DIG_CVRG_FA_TH_EXTRA_HIGH;</div><div class='add'>+		fa_th[1] = DIG_CVRG_FA_TH_HIGH;</div><div class='add'>+		fa_th[2] = DIG_CVRG_FA_TH_LOW;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_dig_recorder(struct rtw_dm_info *dm_info, u8 igi, u16 fa)</div><div class='add'>+{</div><div class='add'>+	u8 *igi_history;</div><div class='add'>+	u16 *fa_history;</div><div class='add'>+	u8 igi_bitmap;</div><div class='add'>+	bool up;</div><div class='add'>+</div><div class='add'>+	igi_bitmap = dm_info-&gt;igi_bitmap &lt;&lt; 1 &amp; 0xfe;</div><div class='add'>+	igi_history = dm_info-&gt;igi_history;</div><div class='add'>+	fa_history = dm_info-&gt;fa_history;</div><div class='add'>+</div><div class='add'>+	up = igi &gt; igi_history[0];</div><div class='add'>+	igi_bitmap |= up;</div><div class='add'>+</div><div class='add'>+	igi_history[3] = igi_history[2];</div><div class='add'>+	igi_history[2] = igi_history[1];</div><div class='add'>+	igi_history[1] = igi_history[0];</div><div class='add'>+	igi_history[0] = igi;</div><div class='add'>+</div><div class='add'>+	fa_history[3] = fa_history[2];</div><div class='add'>+	fa_history[2] = fa_history[1];</div><div class='add'>+	fa_history[1] = fa_history[0];</div><div class='add'>+	fa_history[0] = fa;</div><div class='add'>+</div><div class='add'>+	dm_info-&gt;igi_bitmap = igi_bitmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_dig(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	u8 upper_bound, lower_bound;</div><div class='add'>+	u8 pre_igi, cur_igi;</div><div class='add'>+	u16 fa_th[3], fa_cnt;</div><div class='add'>+	u8 level;</div><div class='add'>+	u8 step[3];</div><div class='add'>+	bool linked;</div><div class='add'>+</div><div class='add'>+	if (rtw_flag_check(rtwdev, RTW_FLAG_DIG_DISABLE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rtw_phy_dig_check_damping(dm_info))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	linked = !!rtwdev-&gt;sta_cnt;</div><div class='add'>+</div><div class='add'>+	fa_cnt = dm_info-&gt;total_fa_cnt;</div><div class='add'>+	pre_igi = dm_info-&gt;igi_history[0];</div><div class='add'>+</div><div class='add'>+	rtw_phy_dig_get_threshold(dm_info, fa_th, step, linked);</div><div class='add'>+</div><div class='add'>+	/* test the false alarm count from the highest threshold level first,</div><div class='add'>+	 * and increase it by corresponding step size</div><div class='add'>+	 *</div><div class='add'>+	 * note that the step size is offset by -2, compensate it afterall</div><div class='add'>+	 */</div><div class='add'>+	cur_igi = pre_igi;</div><div class='add'>+	for (level = 0; level &lt; 3; level++) {</div><div class='add'>+		if (fa_cnt &gt; fa_th[level]) {</div><div class='add'>+			cur_igi += step[level];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cur_igi -= 2;</div><div class='add'>+</div><div class='add'>+	/* calculate the upper/lower bound by the minimum rssi we have among</div><div class='add'>+	 * the peers connected with us, meanwhile make sure the igi value does</div><div class='add'>+	 * not beyond the hardware limitation</div><div class='add'>+	 */</div><div class='add'>+	rtw_phy_dig_get_boundary(dm_info, &amp;upper_bound, &amp;lower_bound, linked);</div><div class='add'>+	cur_igi = clamp_t(u8, cur_igi, lower_bound, upper_bound);</div><div class='add'>+</div><div class='add'>+	/* record current igi value and false alarm statistics for further</div><div class='add'>+	 * damping checks, and record the trend of igi values</div><div class='add'>+	 */</div><div class='add'>+	rtw_phy_dig_recorder(dm_info, cur_igi, fa_cnt);</div><div class='add'>+</div><div class='add'>+	if (cur_igi != pre_igi)</div><div class='add'>+		rtw_phy_dig_write(rtwdev, cur_igi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_ra_info_update_iter(void *data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = data;</div><div class='add'>+	struct rtw_sta_info *si = (struct rtw_sta_info *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	rtw_update_sta_info(rtwdev, si);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_phy_ra_info_update(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	if (rtwdev-&gt;watch_dog_cnt &amp; 0x3)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtw_iterate_stas_atomic(rtwdev, rtw_phy_ra_info_update_iter, rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_dynamic_mechanism(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	/* for further calculation */</div><div class='add'>+	rtw_phy_statistics(rtwdev);</div><div class='add'>+	rtw_phy_dig(rtwdev);</div><div class='add'>+	rtw_phy_ra_info_update(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FRAC_BITS 3</div><div class='add'>+</div><div class='add'>+static u8 rtw_phy_power_2_db(s8 power)</div><div class='add'>+{</div><div class='add'>+	if (power &lt;= -100 || power &gt;= 20)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (power &gt;= 0)</div><div class='add'>+		return 100;</div><div class='add'>+	else</div><div class='add'>+		return 100 + power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 rtw_phy_db_2_linear(u8 power_db)</div><div class='add'>+{</div><div class='add'>+	u8 i, j;</div><div class='add'>+	u64 linear;</div><div class='add'>+</div><div class='add'>+	/* 1dB ~ 96dB */</div><div class='add'>+	i = (power_db - 1) &gt;&gt; 3;</div><div class='add'>+	j = (power_db - 1) - (i &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	linear = db_invert_table[i][j];</div><div class='add'>+	linear = i &gt; 2 ? linear &lt;&lt; FRAC_BITS : linear;</div><div class='add'>+</div><div class='add'>+	return linear;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 rtw_phy_linear_2_db(u64 linear)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+	u8 j;</div><div class='add'>+	u32 dB;</div><div class='add'>+</div><div class='add'>+	if (linear &gt;= db_invert_table[11][7])</div><div class='add'>+		return 96; /* maximum 96 dB */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 12; i++) {</div><div class='add'>+		if (i &lt;= 2 &amp;&amp; (linear &lt;&lt; FRAC_BITS) &lt;= db_invert_table[i][7])</div><div class='add'>+			break;</div><div class='add'>+		else if (i &gt; 2 &amp;&amp; linear &lt;= db_invert_table[i][7])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; 8; j++) {</div><div class='add'>+		if (i &lt;= 2 &amp;&amp; (linear &lt;&lt; FRAC_BITS) &lt;= db_invert_table[i][j])</div><div class='add'>+			break;</div><div class='add'>+		else if (i &gt; 2 &amp;&amp; linear &lt;= db_invert_table[i][j])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (j == 0 &amp;&amp; i == 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (j == 0) {</div><div class='add'>+		if (i != 3) {</div><div class='add'>+			if (db_invert_table[i][0] - linear &gt;</div><div class='add'>+			    linear - db_invert_table[i - 1][7]) {</div><div class='add'>+				i = i - 1;</div><div class='add'>+				j = 7;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (db_invert_table[3][0] - linear &gt;</div><div class='add'>+			    linear - db_invert_table[2][7]) {</div><div class='add'>+				i = 2;</div><div class='add'>+				j = 7;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (db_invert_table[i][j] - linear &gt;</div><div class='add'>+		    linear - db_invert_table[i][j - 1]) {</div><div class='add'>+			j = j - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	dB = (i &lt;&lt; 3) + j + 1;</div><div class='add'>+</div><div class='add'>+	return dB;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 rtw_phy_rf_power_2_rssi(s8 *rf_power, u8 path_num)</div><div class='add'>+{</div><div class='add'>+	s8 power;</div><div class='add'>+	u8 power_db;</div><div class='add'>+	u64 linear;</div><div class='add'>+	u64 sum = 0;</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; path_num; path++) {</div><div class='add'>+		power = rf_power[path];</div><div class='add'>+		power_db = rtw_phy_power_2_db(power);</div><div class='add'>+		linear = rtw_phy_db_2_linear(power_db);</div><div class='add'>+		sum += linear;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sum = (sum + (1 &lt;&lt; (FRAC_BITS - 1))) &gt;&gt; FRAC_BITS;</div><div class='add'>+	switch (path_num) {</div><div class='add'>+	case 2:</div><div class='add'>+		sum &gt;&gt;= 1;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		sum = ((sum) + ((sum) &lt;&lt; 1) + ((sum) &lt;&lt; 3)) &gt;&gt; 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		sum &gt;&gt;= 2;</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 rtw_phy_linear_2_db(sum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 rtw_phy_read_rf(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+		    u32 addr, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	const u32 *base_addr = chip-&gt;rf_base_addr;</div><div class='add'>+	u32 val, direct_addr;</div><div class='add'>+</div><div class='add'>+	if (rf_path &gt;= hal-&gt;rf_path_num) {</div><div class='add'>+		rtw_err(rtwdev, "unsupported rf path (%d)\n", rf_path);</div><div class='add'>+		return INV_RF_DATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr &amp;= 0xff;</div><div class='add'>+	direct_addr = base_addr[rf_path] + (addr &lt;&lt; 2);</div><div class='add'>+	mask &amp;= RFREG_MASK;</div><div class='add'>+</div><div class='add'>+	val = rtw_read32_mask(rtwdev, direct_addr, mask);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool rtw_phy_write_rf_reg_sipi(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			       u32 addr, u32 mask, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u32 *sipi_addr = chip-&gt;rf_sipi_addr;</div><div class='add'>+	u32 data_and_addr;</div><div class='add'>+	u32 old_data = 0;</div><div class='add'>+	u32 shift;</div><div class='add'>+</div><div class='add'>+	if (rf_path &gt;= hal-&gt;rf_path_num) {</div><div class='add'>+		rtw_err(rtwdev, "unsupported rf path (%d)\n", rf_path);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr &amp;= 0xff;</div><div class='add'>+	mask &amp;= RFREG_MASK;</div><div class='add'>+</div><div class='add'>+	if (mask != RFREG_MASK) {</div><div class='add'>+		old_data = rtw_phy_read_rf(rtwdev, rf_path, addr, RFREG_MASK);</div><div class='add'>+</div><div class='add'>+		if (old_data == INV_RF_DATA) {</div><div class='add'>+			rtw_err(rtwdev, "Write fail, rf is disabled\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		shift = __ffs(mask);</div><div class='add'>+		data = ((old_data) &amp; (~mask)) | (data &lt;&lt; shift);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_and_addr = ((addr &lt;&lt; 20) | (data &amp; 0x000fffff)) &amp; 0x0fffffff;</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, sipi_addr[rf_path], data_and_addr);</div><div class='add'>+</div><div class='add'>+	udelay(13);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool rtw_phy_write_rf_reg(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			  u32 addr, u32 mask, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	const u32 *base_addr = chip-&gt;rf_base_addr;</div><div class='add'>+	u32 direct_addr;</div><div class='add'>+</div><div class='add'>+	if (rf_path &gt;= hal-&gt;rf_path_num) {</div><div class='add'>+		rtw_err(rtwdev, "unsupported rf path (%d)\n", rf_path);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr &amp;= 0xff;</div><div class='add'>+	direct_addr = base_addr[rf_path] + (addr &lt;&lt; 2);</div><div class='add'>+	mask &amp;= RFREG_MASK;</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RSV_CTRL, BITS_RFC_DIRECT, DISABLE_PI);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_WLRF1, BITS_RFC_DIRECT, DISABLE_PI);</div><div class='add'>+	rtw_write32_mask(rtwdev, direct_addr, mask, data);</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RSV_CTRL, BITS_RFC_DIRECT, ENABLE_PI);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_WLRF1, BITS_RFC_DIRECT, ENABLE_PI);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool rtw_phy_write_rf_reg_mix(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			      u32 addr, u32 mask, u32 data)</div><div class='add'>+{</div><div class='add'>+	if (addr != 0x00)</div><div class='add'>+		return rtw_phy_write_rf_reg(rtwdev, rf_path, addr, mask, data);</div><div class='add'>+</div><div class='add'>+	return rtw_phy_write_rf_reg_sipi(rtwdev, rf_path, addr, mask, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_setup_phy_cond(struct rtw_dev *rtwdev, u32 pkg)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	struct rtw_phy_cond cond = {0};</div><div class='add'>+</div><div class='add'>+	cond.cut = hal-&gt;cut_version ? hal-&gt;cut_version : 15;</div><div class='add'>+	cond.pkg = pkg ? pkg : 15;</div><div class='add'>+	cond.plat = 0x04;</div><div class='add'>+	cond.rfe = efuse-&gt;rfe_option;</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_USB:</div><div class='add'>+		cond.intf = INTF_USB;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_HCI_TYPE_SDIO:</div><div class='add'>+		cond.intf = INTF_SDIO;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+	default:</div><div class='add'>+		cond.intf = INTF_PCIE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hal-&gt;phy_cond = cond;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_PHY, "phy cond=0x%08x\n", *((u32 *)&amp;hal-&gt;phy_cond));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_positive(struct rtw_dev *rtwdev, struct rtw_phy_cond cond)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_phy_cond drv_cond = hal-&gt;phy_cond;</div><div class='add'>+</div><div class='add'>+	if (cond.cut &amp;&amp; cond.cut != drv_cond.cut)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cond.pkg &amp;&amp; cond.pkg != drv_cond.pkg)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cond.intf &amp;&amp; cond.intf != drv_cond.intf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cond.rfe != drv_cond.rfe)</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'>+void rtw_parse_tbl_phy_cond(struct rtw_dev *rtwdev, const struct rtw_table *tbl)</div><div class='add'>+{</div><div class='add'>+	const union phy_table_tile *p = tbl-&gt;data;</div><div class='add'>+	const union phy_table_tile *end = p + tbl-&gt;size / 2;</div><div class='add'>+	struct rtw_phy_cond pos_cond = {0};</div><div class='add'>+	bool is_matched = true, is_skipped = false;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(union phy_table_tile) != sizeof(struct phy_cfg_pair));</div><div class='add'>+</div><div class='add'>+	for (; p &lt; end; p++) {</div><div class='add'>+		if (p-&gt;cond.pos) {</div><div class='add'>+			switch (p-&gt;cond.branch) {</div><div class='add'>+			case BRANCH_ENDIF:</div><div class='add'>+				is_matched = true;</div><div class='add'>+				is_skipped = false;</div><div class='add'>+				break;</div><div class='add'>+			case BRANCH_ELSE:</div><div class='add'>+				is_matched = is_skipped ? false : true;</div><div class='add'>+				break;</div><div class='add'>+			case BRANCH_IF:</div><div class='add'>+			case BRANCH_ELIF:</div><div class='add'>+			default:</div><div class='add'>+				pos_cond = p-&gt;cond;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else if (p-&gt;cond.neg) {</div><div class='add'>+			if (!is_skipped) {</div><div class='add'>+				if (check_positive(rtwdev, pos_cond)) {</div><div class='add'>+					is_matched = true;</div><div class='add'>+					is_skipped = true;</div><div class='add'>+				} else {</div><div class='add'>+					is_matched = false;</div><div class='add'>+					is_skipped = false;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				is_matched = false;</div><div class='add'>+			}</div><div class='add'>+		} else if (is_matched) {</div><div class='add'>+			(*tbl-&gt;do_cfg)(rtwdev, tbl, p-&gt;cfg.addr, p-&gt;cfg.data);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_parse_tbl_bb_pg(struct rtw_dev *rtwdev, const struct rtw_table *tbl)</div><div class='add'>+{</div><div class='add'>+	const struct phy_pg_cfg_pair *p = tbl-&gt;data;</div><div class='add'>+	const struct phy_pg_cfg_pair *end = p + tbl-&gt;size / 6;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct phy_pg_cfg_pair) != sizeof(u32) * 6);</div><div class='add'>+</div><div class='add'>+	for (; p &lt; end; p++) {</div><div class='add'>+		if (p-&gt;addr == 0xfe || p-&gt;addr == 0xffe) {</div><div class='add'>+			msleep(50);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		phy_store_tx_power_by_rate(rtwdev, p-&gt;band, p-&gt;rf_path,</div><div class='add'>+					   p-&gt;tx_num, p-&gt;addr, p-&gt;bitmask,</div><div class='add'>+					   p-&gt;data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_parse_tbl_txpwr_lmt(struct rtw_dev *rtwdev,</div><div class='add'>+			     const struct rtw_table *tbl)</div><div class='add'>+{</div><div class='add'>+	const struct txpwr_lmt_cfg_pair *p = tbl-&gt;data;</div><div class='add'>+	const struct txpwr_lmt_cfg_pair *end = p + tbl-&gt;size / 6;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct txpwr_lmt_cfg_pair) != sizeof(u8) * 6);</div><div class='add'>+</div><div class='add'>+	for (; p &lt; end; p++) {</div><div class='add'>+		phy_set_tx_power_limit(rtwdev, p-&gt;regd, p-&gt;band,</div><div class='add'>+				       p-&gt;bw, p-&gt;rs,</div><div class='add'>+				       p-&gt;ch, p-&gt;txpwr_lmt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_cfg_mac(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		     u32 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	rtw_write8(rtwdev, addr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_cfg_agc(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		     u32 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	rtw_write32(rtwdev, addr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_cfg_bb(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		    u32 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	if (addr == 0xfe)</div><div class='add'>+		msleep(50);</div><div class='add'>+	else if (addr == 0xfd)</div><div class='add'>+		mdelay(5);</div><div class='add'>+	else if (addr == 0xfc)</div><div class='add'>+		mdelay(1);</div><div class='add'>+	else if (addr == 0xfb)</div><div class='add'>+		usleep_range(50, 60);</div><div class='add'>+	else if (addr == 0xfa)</div><div class='add'>+		udelay(5);</div><div class='add'>+	else if (addr == 0xf9)</div><div class='add'>+		udelay(1);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32(rtwdev, addr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_cfg_rf(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		    u32 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	if (addr == 0xffe) {</div><div class='add'>+		msleep(50);</div><div class='add'>+	} else if (addr == 0xfe) {</div><div class='add'>+		usleep_range(100, 110);</div><div class='add'>+	} else {</div><div class='add'>+		rtw_write_rf(rtwdev, tbl-&gt;rf_path, addr, RFREG_MASK, data);</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_load_rfk_table(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;rfk_init_tbl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtw_load_table(rtwdev, chip-&gt;rfk_init_tbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_load_tables(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u8 rf_path;</div><div class='add'>+</div><div class='add'>+	rtw_load_table(rtwdev, chip-&gt;mac_tbl);</div><div class='add'>+	rtw_load_table(rtwdev, chip-&gt;bb_tbl);</div><div class='add'>+	rtw_load_table(rtwdev, chip-&gt;agc_tbl);</div><div class='add'>+	rtw_load_rfk_table(rtwdev);</div><div class='add'>+</div><div class='add'>+	for (rf_path = 0; rf_path &lt; rtwdev-&gt;hal.rf_path_num; rf_path++) {</div><div class='add'>+		const struct rtw_table *tbl;</div><div class='add'>+</div><div class='add'>+		tbl = chip-&gt;rf_tbl[rf_path];</div><div class='add'>+		rtw_load_table(rtwdev, tbl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define bcd_to_dec_pwr_by_rate(val, i) bcd2bin(val &gt;&gt; (i * 8))</div><div class='add'>+</div><div class='add'>+#define RTW_MAX_POWER_INDEX		0x3F</div><div class='add'>+</div><div class='add'>+u8 rtw_cck_rates[] = { DESC_RATE1M, DESC_RATE2M, DESC_RATE5_5M, DESC_RATE11M };</div><div class='add'>+u8 rtw_ofdm_rates[] = {</div><div class='add'>+	DESC_RATE6M,  DESC_RATE9M,  DESC_RATE12M,</div><div class='add'>+	DESC_RATE18M, DESC_RATE24M, DESC_RATE36M,</div><div class='add'>+	DESC_RATE48M, DESC_RATE54M</div><div class='add'>+};</div><div class='add'>+u8 rtw_ht_1s_rates[] = {</div><div class='add'>+	DESC_RATEMCS0, DESC_RATEMCS1, DESC_RATEMCS2,</div><div class='add'>+	DESC_RATEMCS3, DESC_RATEMCS4, DESC_RATEMCS5,</div><div class='add'>+	DESC_RATEMCS6, DESC_RATEMCS7</div><div class='add'>+};</div><div class='add'>+u8 rtw_ht_2s_rates[] = {</div><div class='add'>+	DESC_RATEMCS8,  DESC_RATEMCS9,  DESC_RATEMCS10,</div><div class='add'>+	DESC_RATEMCS11, DESC_RATEMCS12, DESC_RATEMCS13,</div><div class='add'>+	DESC_RATEMCS14, DESC_RATEMCS15</div><div class='add'>+};</div><div class='add'>+u8 rtw_vht_1s_rates[] = {</div><div class='add'>+	DESC_RATEVHT1SS_MCS0, DESC_RATEVHT1SS_MCS1,</div><div class='add'>+	DESC_RATEVHT1SS_MCS2, DESC_RATEVHT1SS_MCS3,</div><div class='add'>+	DESC_RATEVHT1SS_MCS4, DESC_RATEVHT1SS_MCS5,</div><div class='add'>+	DESC_RATEVHT1SS_MCS6, DESC_RATEVHT1SS_MCS7,</div><div class='add'>+	DESC_RATEVHT1SS_MCS8, DESC_RATEVHT1SS_MCS9</div><div class='add'>+};</div><div class='add'>+u8 rtw_vht_2s_rates[] = {</div><div class='add'>+	DESC_RATEVHT2SS_MCS0, DESC_RATEVHT2SS_MCS1,</div><div class='add'>+	DESC_RATEVHT2SS_MCS2, DESC_RATEVHT2SS_MCS3,</div><div class='add'>+	DESC_RATEVHT2SS_MCS4, DESC_RATEVHT2SS_MCS5,</div><div class='add'>+	DESC_RATEVHT2SS_MCS6, DESC_RATEVHT2SS_MCS7,</div><div class='add'>+	DESC_RATEVHT2SS_MCS8, DESC_RATEVHT2SS_MCS9</div><div class='add'>+};</div><div class='add'>+u8 rtw_cck_size = ARRAY_SIZE(rtw_cck_rates);</div><div class='add'>+u8 rtw_ofdm_size = ARRAY_SIZE(rtw_ofdm_rates);</div><div class='add'>+u8 rtw_ht_1s_size = ARRAY_SIZE(rtw_ht_1s_rates);</div><div class='add'>+u8 rtw_ht_2s_size = ARRAY_SIZE(rtw_ht_2s_rates);</div><div class='add'>+u8 rtw_vht_1s_size = ARRAY_SIZE(rtw_vht_1s_rates);</div><div class='add'>+u8 rtw_vht_2s_size = ARRAY_SIZE(rtw_vht_2s_rates);</div><div class='add'>+u8 *rtw_rate_section[RTW_RATE_SECTION_MAX] = {</div><div class='add'>+	rtw_cck_rates, rtw_ofdm_rates,</div><div class='add'>+	rtw_ht_1s_rates, rtw_ht_2s_rates,</div><div class='add'>+	rtw_vht_1s_rates, rtw_vht_2s_rates</div><div class='add'>+};</div><div class='add'>+u8 rtw_rate_size[RTW_RATE_SECTION_MAX] = {</div><div class='add'>+	ARRAY_SIZE(rtw_cck_rates),</div><div class='add'>+	ARRAY_SIZE(rtw_ofdm_rates),</div><div class='add'>+	ARRAY_SIZE(rtw_ht_1s_rates),</div><div class='add'>+	ARRAY_SIZE(rtw_ht_2s_rates),</div><div class='add'>+	ARRAY_SIZE(rtw_vht_1s_rates),</div><div class='add'>+	ARRAY_SIZE(rtw_vht_2s_rates)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 rtw_channel_idx_5g[RTW_MAX_CHANNEL_NUM_5G] = {</div><div class='add'>+	36,  38,  40,  42,  44,  46,  48, /* Band 1 */</div><div class='add'>+	52,  54,  56,  58,  60,  62,  64, /* Band 2 */</div><div class='add'>+	100, 102, 104, 106, 108, 110, 112, /* Band 3 */</div><div class='add'>+	116, 118, 120, 122, 124, 126, 128, /* Band 3 */</div><div class='add'>+	132, 134, 136, 138, 140, 142, 144, /* Band 3 */</div><div class='add'>+	149, 151, 153, 155, 157, 159, 161, /* Band 4 */</div><div class='add'>+	165, 167, 169, 171, 173, 175, 177}; /* Band 4 */</div><div class='add'>+</div><div class='add'>+static int rtw_channel_to_idx(u8 band, u8 channel)</div><div class='add'>+{</div><div class='add'>+	int ch_idx;</div><div class='add'>+	u8 n_channel;</div><div class='add'>+</div><div class='add'>+	if (band == PHY_BAND_2G) {</div><div class='add'>+		ch_idx = channel - 1;</div><div class='add'>+		n_channel = RTW_MAX_CHANNEL_NUM_2G;</div><div class='add'>+	} else if (band == PHY_BAND_5G) {</div><div class='add'>+		n_channel = RTW_MAX_CHANNEL_NUM_5G;</div><div class='add'>+		for (ch_idx = 0; ch_idx &lt; n_channel; ch_idx++)</div><div class='add'>+			if (rtw_channel_idx_5g[ch_idx] == channel)</div><div class='add'>+				break;</div><div class='add'>+	} else {</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ch_idx &gt;= n_channel)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return ch_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 rtw_get_channel_group(u8 channel)</div><div class='add'>+{</div><div class='add'>+	switch (channel) {</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 36:</div><div class='add'>+	case 38:</div><div class='add'>+	case 40:</div><div class='add'>+	case 42:</div><div class='add'>+		return 0;</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+	case 44:</div><div class='add'>+	case 46:</div><div class='add'>+	case 48:</div><div class='add'>+	case 50:</div><div class='add'>+		return 1;</div><div class='add'>+	case 6:</div><div class='add'>+	case 7:</div><div class='add'>+	case 8:</div><div class='add'>+	case 52:</div><div class='add'>+	case 54:</div><div class='add'>+	case 56:</div><div class='add'>+	case 58:</div><div class='add'>+		return 2;</div><div class='add'>+	case 9:</div><div class='add'>+	case 10:</div><div class='add'>+	case 11:</div><div class='add'>+	case 60:</div><div class='add'>+	case 62:</div><div class='add'>+	case 64:</div><div class='add'>+		return 3;</div><div class='add'>+	case 12:</div><div class='add'>+	case 13:</div><div class='add'>+	case 100:</div><div class='add'>+	case 102:</div><div class='add'>+	case 104:</div><div class='add'>+	case 106:</div><div class='add'>+		return 4;</div><div class='add'>+	case 14:</div><div class='add'>+	case 108:</div><div class='add'>+	case 110:</div><div class='add'>+	case 112:</div><div class='add'>+	case 114:</div><div class='add'>+		return 5;</div><div class='add'>+	case 116:</div><div class='add'>+	case 118:</div><div class='add'>+	case 120:</div><div class='add'>+	case 122:</div><div class='add'>+		return 6;</div><div class='add'>+	case 124:</div><div class='add'>+	case 126:</div><div class='add'>+	case 128:</div><div class='add'>+	case 130:</div><div class='add'>+		return 7;</div><div class='add'>+	case 132:</div><div class='add'>+	case 134:</div><div class='add'>+	case 136:</div><div class='add'>+	case 138:</div><div class='add'>+		return 8;</div><div class='add'>+	case 140:</div><div class='add'>+	case 142:</div><div class='add'>+	case 144:</div><div class='add'>+		return 9;</div><div class='add'>+	case 149:</div><div class='add'>+	case 151:</div><div class='add'>+	case 153:</div><div class='add'>+	case 155:</div><div class='add'>+		return 10;</div><div class='add'>+	case 157:</div><div class='add'>+	case 159:</div><div class='add'>+	case 161:</div><div class='add'>+		return 11;</div><div class='add'>+	case 165:</div><div class='add'>+	case 167:</div><div class='add'>+	case 169:</div><div class='add'>+	case 171:</div><div class='add'>+		return 12;</div><div class='add'>+	case 173:</div><div class='add'>+	case 175:</div><div class='add'>+	case 177:</div><div class='add'>+		return 13;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 phy_get_2g_tx_power_index(struct rtw_dev *rtwdev,</div><div class='add'>+				    struct rtw_2g_txpwr_idx *pwr_idx_2g,</div><div class='add'>+				    enum rtw_bandwidth bandwidth,</div><div class='add'>+				    u8 rate, u8 group)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u8 tx_power;</div><div class='add'>+	bool mcs_rate;</div><div class='add'>+	bool above_2ss;</div><div class='add'>+	u8 factor = chip-&gt;txgi_factor;</div><div class='add'>+</div><div class='add'>+	if (rate &lt;= DESC_RATE11M)</div><div class='add'>+		tx_power = pwr_idx_2g-&gt;cck_base[group];</div><div class='add'>+	else</div><div class='add'>+		tx_power = pwr_idx_2g-&gt;bw40_base[group];</div><div class='add'>+</div><div class='add'>+	if (rate &gt;= DESC_RATE6M &amp;&amp; rate &lt;= DESC_RATE54M)</div><div class='add'>+		tx_power += pwr_idx_2g-&gt;ht_1s_diff.ofdm * factor;</div><div class='add'>+</div><div class='add'>+	mcs_rate = (rate &gt;= DESC_RATEMCS0 &amp;&amp; rate &lt;= DESC_RATEMCS15) ||</div><div class='add'>+		   (rate &gt;= DESC_RATEVHT1SS_MCS0 &amp;&amp;</div><div class='add'>+		    rate &lt;= DESC_RATEVHT2SS_MCS9);</div><div class='add'>+	above_2ss = (rate &gt;= DESC_RATEMCS8 &amp;&amp; rate &lt;= DESC_RATEMCS15) ||</div><div class='add'>+		    (rate &gt;= DESC_RATEVHT2SS_MCS0);</div><div class='add'>+</div><div class='add'>+	if (!mcs_rate)</div><div class='add'>+		return tx_power;</div><div class='add'>+</div><div class='add'>+	switch (bandwidth) {</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+		tx_power += pwr_idx_2g-&gt;ht_1s_diff.bw20 * factor;</div><div class='add'>+		if (above_2ss)</div><div class='add'>+			tx_power += pwr_idx_2g-&gt;ht_2s_diff.bw20 * factor;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		/* bw40 is the base power */</div><div class='add'>+		if (above_2ss)</div><div class='add'>+			tx_power += pwr_idx_2g-&gt;ht_2s_diff.bw40 * factor;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tx_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 phy_get_5g_tx_power_index(struct rtw_dev *rtwdev,</div><div class='add'>+				    struct rtw_5g_txpwr_idx *pwr_idx_5g,</div><div class='add'>+				    enum rtw_bandwidth bandwidth,</div><div class='add'>+				    u8 rate, u8 group)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	u8 tx_power;</div><div class='add'>+	u8 upper, lower;</div><div class='add'>+	bool mcs_rate;</div><div class='add'>+	bool above_2ss;</div><div class='add'>+	u8 factor = chip-&gt;txgi_factor;</div><div class='add'>+</div><div class='add'>+	tx_power = pwr_idx_5g-&gt;bw40_base[group];</div><div class='add'>+</div><div class='add'>+	mcs_rate = (rate &gt;= DESC_RATEMCS0 &amp;&amp; rate &lt;= DESC_RATEMCS15) ||</div><div class='add'>+		   (rate &gt;= DESC_RATEVHT1SS_MCS0 &amp;&amp;</div><div class='add'>+		    rate &lt;= DESC_RATEVHT2SS_MCS9);</div><div class='add'>+	above_2ss = (rate &gt;= DESC_RATEMCS8 &amp;&amp; rate &lt;= DESC_RATEMCS15) ||</div><div class='add'>+		    (rate &gt;= DESC_RATEVHT2SS_MCS0);</div><div class='add'>+</div><div class='add'>+	if (!mcs_rate) {</div><div class='add'>+		tx_power += pwr_idx_5g-&gt;ht_1s_diff.ofdm * factor;</div><div class='add'>+		return tx_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (bandwidth) {</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+		tx_power += pwr_idx_5g-&gt;ht_1s_diff.bw20 * factor;</div><div class='add'>+		if (above_2ss)</div><div class='add'>+			tx_power += pwr_idx_5g-&gt;ht_2s_diff.bw20 * factor;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		/* bw40 is the base power */</div><div class='add'>+		if (above_2ss)</div><div class='add'>+			tx_power += pwr_idx_5g-&gt;ht_2s_diff.bw40 * factor;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_80:</div><div class='add'>+		/* the base idx of bw80 is the average of bw40+/bw40- */</div><div class='add'>+		lower = pwr_idx_5g-&gt;bw40_base[group];</div><div class='add'>+		upper = pwr_idx_5g-&gt;bw40_base[group + 1];</div><div class='add'>+</div><div class='add'>+		tx_power = (lower + upper) / 2;</div><div class='add'>+		tx_power += pwr_idx_5g-&gt;vht_1s_diff.bw80 * factor;</div><div class='add'>+		if (above_2ss)</div><div class='add'>+			tx_power += pwr_idx_5g-&gt;vht_2s_diff.bw80 * factor;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tx_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set tx power level by path for each rates, note that the order of the rates</div><div class='add'>+ * are *very* important, bacause 8822B/8821C combines every four bytes of tx</div><div class='add'>+ * power index into a four-byte power index register, and calls set_tx_agc to</div><div class='add'>+ * write these values into hardware</div><div class='add'>+ */</div><div class='add'>+static</div><div class='add'>+void phy_set_tx_power_level_by_path(struct rtw_dev *rtwdev, u8 ch, u8 path)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 rs;</div><div class='add'>+</div><div class='add'>+	/* do not need cck rates if we are not in 2.4G */</div><div class='add'>+	if (hal-&gt;current_band_type == RTW_BAND_2G)</div><div class='add'>+		rs = RTW_RATE_SECTION_CCK;</div><div class='add'>+	else</div><div class='add'>+		rs = RTW_RATE_SECTION_OFDM;</div><div class='add'>+</div><div class='add'>+	for (; rs &lt; RTW_RATE_SECTION_MAX; rs++)</div><div class='add'>+		phy_set_tx_power_index_by_rs(rtwdev, ch, path, rs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hal-&gt;tx_power_mutex);</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; hal-&gt;rf_path_num; path++)</div><div class='add'>+		phy_set_tx_power_level_by_path(rtwdev, channel, path);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ops-&gt;set_tx_power_index(rtwdev);</div><div class='add'>+	mutex_unlock(&amp;hal-&gt;tx_power_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band,</div><div class='add'>+			  enum rtw_bandwidth bandwidth, u8 rf_path,</div><div class='add'>+			  u8 rate, u8 channel, u8 regd);</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+u8 phy_get_tx_power_index(void *adapter, u8 rf_path, u8 rate,</div><div class='add'>+			  enum rtw_bandwidth bandwidth, u8 channel, u8 regd)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = adapter;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_txpwr_idx *pwr_idx;</div><div class='add'>+	u8 tx_power;</div><div class='add'>+	u8 group;</div><div class='add'>+	u8 band;</div><div class='add'>+	s8 offset, limit;</div><div class='add'>+</div><div class='add'>+	pwr_idx = &amp;rtwdev-&gt;efuse.txpwr_idx_table[rf_path];</div><div class='add'>+	group = rtw_get_channel_group(channel);</div><div class='add'>+</div><div class='add'>+	/* base power index for 2.4G/5G */</div><div class='add'>+	if (channel &lt;= 14) {</div><div class='add'>+		band = PHY_BAND_2G;</div><div class='add'>+		tx_power = phy_get_2g_tx_power_index(rtwdev,</div><div class='add'>+						     &amp;pwr_idx-&gt;pwr_idx_2g,</div><div class='add'>+						     bandwidth, rate, group);</div><div class='add'>+		offset = hal-&gt;tx_pwr_by_rate_offset_2g[rf_path][rate];</div><div class='add'>+	} else {</div><div class='add'>+		band = PHY_BAND_5G;</div><div class='add'>+		tx_power = phy_get_5g_tx_power_index(rtwdev,</div><div class='add'>+						     &amp;pwr_idx-&gt;pwr_idx_5g,</div><div class='add'>+						     bandwidth, rate, group);</div><div class='add'>+		offset = hal-&gt;tx_pwr_by_rate_offset_5g[rf_path][rate];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limit = phy_get_tx_power_limit(rtwdev, band, bandwidth, rf_path,</div><div class='add'>+				       rate, channel, regd);</div><div class='add'>+</div><div class='add'>+	if (offset &gt; limit)</div><div class='add'>+		offset = limit;</div><div class='add'>+</div><div class='add'>+	tx_power += offset;</div><div class='add'>+</div><div class='add'>+	if (tx_power &gt; rtwdev-&gt;chip-&gt;max_power_index)</div><div class='add'>+		tx_power = rtwdev-&gt;chip-&gt;max_power_index;</div><div class='add'>+</div><div class='add'>+	return tx_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void phy_set_tx_power_index_by_rs(void *adapter, u8 ch, u8 path, u8 rs)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = adapter;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 regd = rtwdev-&gt;regd.txpwr_regd;</div><div class='add'>+	u8 *rates;</div><div class='add'>+	u8 size;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u8 pwr_idx;</div><div class='add'>+	u8 bw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (rs &gt;= RTW_RATE_SECTION_MAX)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rates = rtw_rate_section[rs];</div><div class='add'>+	size = rtw_rate_size[rs];</div><div class='add'>+	bw = hal-&gt;current_band_width;</div><div class='add'>+	for (i = 0; i &lt; size; i++) {</div><div class='add'>+		rate = rates[i];</div><div class='add'>+		pwr_idx = phy_get_tx_power_index(adapter, path, rate, bw, ch,</div><div class='add'>+						 regd);</div><div class='add'>+		hal-&gt;tx_pwr_tbl[path][rate] = pwr_idx;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 tbl_to_dec_pwr_by_rate(struct rtw_dev *rtwdev, u32 hex, u8 i)</div><div class='add'>+{</div><div class='add'>+	if (rtwdev-&gt;chip-&gt;is_pwr_by_rate_dec)</div><div class='add'>+		return bcd_to_dec_pwr_by_rate(hex, i);</div><div class='add'>+	else</div><div class='add'>+		return (hex &gt;&gt; (i * 8)) &amp; 0xFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void phy_get_rate_values_of_txpwr_by_rate(struct rtw_dev *rtwdev,</div><div class='add'>+						 u32 addr, u32 mask,</div><div class='add'>+						 u32 val, u8 *rate,</div><div class='add'>+						 u8 *pwr_by_rate, u8 *rate_num)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (addr) {</div><div class='add'>+	case 0xE00:</div><div class='add'>+	case 0x830:</div><div class='add'>+		rate[0] = DESC_RATE6M;</div><div class='add'>+		rate[1] = DESC_RATE9M;</div><div class='add'>+		rate[2] = DESC_RATE12M;</div><div class='add'>+		rate[3] = DESC_RATE18M;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xE04:</div><div class='add'>+	case 0x834:</div><div class='add'>+		rate[0] = DESC_RATE24M;</div><div class='add'>+		rate[1] = DESC_RATE36M;</div><div class='add'>+		rate[2] = DESC_RATE48M;</div><div class='add'>+		rate[3] = DESC_RATE54M;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xE08:</div><div class='add'>+		rate[0] = DESC_RATE1M;</div><div class='add'>+		pwr_by_rate[0] = bcd_to_dec_pwr_by_rate(val, 1);</div><div class='add'>+		*rate_num = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 0x86C:</div><div class='add'>+		if (mask == 0xffffff00) {</div><div class='add'>+			rate[0] = DESC_RATE2M;</div><div class='add'>+			rate[1] = DESC_RATE5_5M;</div><div class='add'>+			rate[2] = DESC_RATE11M;</div><div class='add'>+			for (i = 1; i &lt; 4; ++i)</div><div class='add'>+				pwr_by_rate[i - 1] =</div><div class='add'>+					tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+			*rate_num = 3;</div><div class='add'>+		} else if (mask == 0x000000ff) {</div><div class='add'>+			rate[0] = DESC_RATE11M;</div><div class='add'>+			pwr_by_rate[0] = bcd_to_dec_pwr_by_rate(val, 0);</div><div class='add'>+			*rate_num = 1;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 0xE10:</div><div class='add'>+	case 0x83C:</div><div class='add'>+		rate[0] = DESC_RATEMCS0;</div><div class='add'>+		rate[1] = DESC_RATEMCS1;</div><div class='add'>+		rate[2] = DESC_RATEMCS2;</div><div class='add'>+		rate[3] = DESC_RATEMCS3;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xE14:</div><div class='add'>+	case 0x848:</div><div class='add'>+		rate[0] = DESC_RATEMCS4;</div><div class='add'>+		rate[1] = DESC_RATEMCS5;</div><div class='add'>+		rate[2] = DESC_RATEMCS6;</div><div class='add'>+		rate[3] = DESC_RATEMCS7;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xE18:</div><div class='add'>+	case 0x84C:</div><div class='add'>+		rate[0] = DESC_RATEMCS8;</div><div class='add'>+		rate[1] = DESC_RATEMCS9;</div><div class='add'>+		rate[2] = DESC_RATEMCS10;</div><div class='add'>+		rate[3] = DESC_RATEMCS11;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xE1C:</div><div class='add'>+	case 0x868:</div><div class='add'>+		rate[0] = DESC_RATEMCS12;</div><div class='add'>+		rate[1] = DESC_RATEMCS13;</div><div class='add'>+		rate[2] = DESC_RATEMCS14;</div><div class='add'>+		rate[3] = DESC_RATEMCS15;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case 0x838:</div><div class='add'>+		rate[0] = DESC_RATE1M;</div><div class='add'>+		rate[1] = DESC_RATE2M;</div><div class='add'>+		rate[2] = DESC_RATE5_5M;</div><div class='add'>+		for (i = 1; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i - 1] = tbl_to_dec_pwr_by_rate(rtwdev,</div><div class='add'>+								    val, i);</div><div class='add'>+		*rate_num = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC20:</div><div class='add'>+	case 0xE20:</div><div class='add'>+	case 0x1820:</div><div class='add'>+	case 0x1A20:</div><div class='add'>+		rate[0] = DESC_RATE1M;</div><div class='add'>+		rate[1] = DESC_RATE2M;</div><div class='add'>+		rate[2] = DESC_RATE5_5M;</div><div class='add'>+		rate[3] = DESC_RATE11M;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC24:</div><div class='add'>+	case 0xE24:</div><div class='add'>+	case 0x1824:</div><div class='add'>+	case 0x1A24:</div><div class='add'>+		rate[0] = DESC_RATE6M;</div><div class='add'>+		rate[1] = DESC_RATE9M;</div><div class='add'>+		rate[2] = DESC_RATE12M;</div><div class='add'>+		rate[3] = DESC_RATE18M;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC28:</div><div class='add'>+	case 0xE28:</div><div class='add'>+	case 0x1828:</div><div class='add'>+	case 0x1A28:</div><div class='add'>+		rate[0] = DESC_RATE24M;</div><div class='add'>+		rate[1] = DESC_RATE36M;</div><div class='add'>+		rate[2] = DESC_RATE48M;</div><div class='add'>+		rate[3] = DESC_RATE54M;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC2C:</div><div class='add'>+	case 0xE2C:</div><div class='add'>+	case 0x182C:</div><div class='add'>+	case 0x1A2C:</div><div class='add'>+		rate[0] = DESC_RATEMCS0;</div><div class='add'>+		rate[1] = DESC_RATEMCS1;</div><div class='add'>+		rate[2] = DESC_RATEMCS2;</div><div class='add'>+		rate[3] = DESC_RATEMCS3;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC30:</div><div class='add'>+	case 0xE30:</div><div class='add'>+	case 0x1830:</div><div class='add'>+	case 0x1A30:</div><div class='add'>+		rate[0] = DESC_RATEMCS4;</div><div class='add'>+		rate[1] = DESC_RATEMCS5;</div><div class='add'>+		rate[2] = DESC_RATEMCS6;</div><div class='add'>+		rate[3] = DESC_RATEMCS7;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC34:</div><div class='add'>+	case 0xE34:</div><div class='add'>+	case 0x1834:</div><div class='add'>+	case 0x1A34:</div><div class='add'>+		rate[0] = DESC_RATEMCS8;</div><div class='add'>+		rate[1] = DESC_RATEMCS9;</div><div class='add'>+		rate[2] = DESC_RATEMCS10;</div><div class='add'>+		rate[3] = DESC_RATEMCS11;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC38:</div><div class='add'>+	case 0xE38:</div><div class='add'>+	case 0x1838:</div><div class='add'>+	case 0x1A38:</div><div class='add'>+		rate[0] = DESC_RATEMCS12;</div><div class='add'>+		rate[1] = DESC_RATEMCS13;</div><div class='add'>+		rate[2] = DESC_RATEMCS14;</div><div class='add'>+		rate[3] = DESC_RATEMCS15;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC3C:</div><div class='add'>+	case 0xE3C:</div><div class='add'>+	case 0x183C:</div><div class='add'>+	case 0x1A3C:</div><div class='add'>+		rate[0] = DESC_RATEVHT1SS_MCS0;</div><div class='add'>+		rate[1] = DESC_RATEVHT1SS_MCS1;</div><div class='add'>+		rate[2] = DESC_RATEVHT1SS_MCS2;</div><div class='add'>+		rate[3] = DESC_RATEVHT1SS_MCS3;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC40:</div><div class='add'>+	case 0xE40:</div><div class='add'>+	case 0x1840:</div><div class='add'>+	case 0x1A40:</div><div class='add'>+		rate[0] = DESC_RATEVHT1SS_MCS4;</div><div class='add'>+		rate[1] = DESC_RATEVHT1SS_MCS5;</div><div class='add'>+		rate[2] = DESC_RATEVHT1SS_MCS6;</div><div class='add'>+		rate[3] = DESC_RATEVHT1SS_MCS7;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC44:</div><div class='add'>+	case 0xE44:</div><div class='add'>+	case 0x1844:</div><div class='add'>+	case 0x1A44:</div><div class='add'>+		rate[0] = DESC_RATEVHT1SS_MCS8;</div><div class='add'>+		rate[1] = DESC_RATEVHT1SS_MCS9;</div><div class='add'>+		rate[2] = DESC_RATEVHT2SS_MCS0;</div><div class='add'>+		rate[3] = DESC_RATEVHT2SS_MCS1;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC48:</div><div class='add'>+	case 0xE48:</div><div class='add'>+	case 0x1848:</div><div class='add'>+	case 0x1A48:</div><div class='add'>+		rate[0] = DESC_RATEVHT2SS_MCS2;</div><div class='add'>+		rate[1] = DESC_RATEVHT2SS_MCS3;</div><div class='add'>+		rate[2] = DESC_RATEVHT2SS_MCS4;</div><div class='add'>+		rate[3] = DESC_RATEVHT2SS_MCS5;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xC4C:</div><div class='add'>+	case 0xE4C:</div><div class='add'>+	case 0x184C:</div><div class='add'>+	case 0x1A4C:</div><div class='add'>+		rate[0] = DESC_RATEVHT2SS_MCS6;</div><div class='add'>+		rate[1] = DESC_RATEVHT2SS_MCS7;</div><div class='add'>+		rate[2] = DESC_RATEVHT2SS_MCS8;</div><div class='add'>+		rate[3] = DESC_RATEVHT2SS_MCS9;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xCD8:</div><div class='add'>+	case 0xED8:</div><div class='add'>+	case 0x18D8:</div><div class='add'>+	case 0x1AD8:</div><div class='add'>+		rate[0] = DESC_RATEMCS16;</div><div class='add'>+		rate[1] = DESC_RATEMCS17;</div><div class='add'>+		rate[2] = DESC_RATEMCS18;</div><div class='add'>+		rate[3] = DESC_RATEMCS19;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xCDC:</div><div class='add'>+	case 0xEDC:</div><div class='add'>+	case 0x18DC:</div><div class='add'>+	case 0x1ADC:</div><div class='add'>+		rate[0] = DESC_RATEMCS20;</div><div class='add'>+		rate[1] = DESC_RATEMCS21;</div><div class='add'>+		rate[2] = DESC_RATEMCS22;</div><div class='add'>+		rate[3] = DESC_RATEMCS23;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xCE0:</div><div class='add'>+	case 0xEE0:</div><div class='add'>+	case 0x18E0:</div><div class='add'>+	case 0x1AE0:</div><div class='add'>+		rate[0] = DESC_RATEVHT3SS_MCS0;</div><div class='add'>+		rate[1] = DESC_RATEVHT3SS_MCS1;</div><div class='add'>+		rate[2] = DESC_RATEVHT3SS_MCS2;</div><div class='add'>+		rate[3] = DESC_RATEVHT3SS_MCS3;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xCE4:</div><div class='add'>+	case 0xEE4:</div><div class='add'>+	case 0x18E4:</div><div class='add'>+	case 0x1AE4:</div><div class='add'>+		rate[0] = DESC_RATEVHT3SS_MCS4;</div><div class='add'>+		rate[1] = DESC_RATEVHT3SS_MCS5;</div><div class='add'>+		rate[2] = DESC_RATEVHT3SS_MCS6;</div><div class='add'>+		rate[3] = DESC_RATEVHT3SS_MCS7;</div><div class='add'>+		for (i = 0; i &lt; 4; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xCE8:</div><div class='add'>+	case 0xEE8:</div><div class='add'>+	case 0x18E8:</div><div class='add'>+	case 0x1AE8:</div><div class='add'>+		rate[0] = DESC_RATEVHT3SS_MCS8;</div><div class='add'>+		rate[1] = DESC_RATEVHT3SS_MCS9;</div><div class='add'>+		for (i = 0; i &lt; 2; ++i)</div><div class='add'>+			pwr_by_rate[i] = tbl_to_dec_pwr_by_rate(rtwdev, val, i);</div><div class='add'>+		*rate_num = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rtw_warn(rtwdev, "invalid tx power index addr 0x%08x\n", addr);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void phy_store_tx_power_by_rate(void *adapter, u32 band, u32 rfpath, u32 txnum,</div><div class='add'>+				u32 regaddr, u32 bitmask, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = adapter;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 rate_num = 0;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u8 rates[RTW_RF_PATH_MAX] = {0};</div><div class='add'>+	s8 offset;</div><div class='add'>+	s8 pwr_by_rate[RTW_RF_PATH_MAX] = {0};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	phy_get_rate_values_of_txpwr_by_rate(rtwdev, regaddr, bitmask, data,</div><div class='add'>+					     rates, pwr_by_rate, &amp;rate_num);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(rfpath &gt;= RTW_RF_PATH_MAX ||</div><div class='add'>+		    (band != PHY_BAND_2G &amp;&amp; band != PHY_BAND_5G) ||</div><div class='add'>+		    rate_num &gt; RTW_RF_PATH_MAX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rate_num; i++) {</div><div class='add'>+		offset = pwr_by_rate[i];</div><div class='add'>+		rate = rates[i];</div><div class='add'>+		if (band == PHY_BAND_2G)</div><div class='add'>+			hal-&gt;tx_pwr_by_rate_offset_2g[rfpath][rate] = offset;</div><div class='add'>+		else if (band == PHY_BAND_5G)</div><div class='add'>+			hal-&gt;tx_pwr_by_rate_offset_5g[rfpath][rate] = offset;</div><div class='add'>+		else</div><div class='add'>+			continue;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void phy_tx_power_by_rate_config_by_path(struct rtw_hal *hal, u8 path,</div><div class='add'>+					 u8 rs, u8 size, u8 *rates)</div><div class='add'>+{</div><div class='add'>+	u8 rate;</div><div class='add'>+	u8 base_idx, rate_idx;</div><div class='add'>+	s8 base_2g, base_5g;</div><div class='add'>+</div><div class='add'>+	if (rs &gt;= RTW_RATE_SECTION_VHT_1S)</div><div class='add'>+		base_idx = rates[size - 3];</div><div class='add'>+	else</div><div class='add'>+		base_idx = rates[size - 1];</div><div class='add'>+	base_2g = hal-&gt;tx_pwr_by_rate_offset_2g[path][base_idx];</div><div class='add'>+	base_5g = hal-&gt;tx_pwr_by_rate_offset_5g[path][base_idx];</div><div class='add'>+	hal-&gt;tx_pwr_by_rate_base_2g[path][rs] = base_2g;</div><div class='add'>+	hal-&gt;tx_pwr_by_rate_base_5g[path][rs] = base_5g;</div><div class='add'>+	for (rate = 0; rate &lt; size; rate++) {</div><div class='add'>+		rate_idx = rates[rate];</div><div class='add'>+		hal-&gt;tx_pwr_by_rate_offset_2g[path][rate_idx] -= base_2g;</div><div class='add'>+		hal-&gt;tx_pwr_by_rate_offset_5g[path][rate_idx] -= base_5g;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_tx_power_by_rate_config(struct rtw_hal *hal)</div><div class='add'>+{</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; RTW_RF_PATH_MAX; path++) {</div><div class='add'>+		phy_tx_power_by_rate_config_by_path(hal, path,</div><div class='add'>+				RTW_RATE_SECTION_CCK,</div><div class='add'>+				rtw_cck_size, rtw_cck_rates);</div><div class='add'>+		phy_tx_power_by_rate_config_by_path(hal, path,</div><div class='add'>+				RTW_RATE_SECTION_OFDM,</div><div class='add'>+				rtw_ofdm_size, rtw_ofdm_rates);</div><div class='add'>+		phy_tx_power_by_rate_config_by_path(hal, path,</div><div class='add'>+				RTW_RATE_SECTION_HT_1S,</div><div class='add'>+				rtw_ht_1s_size, rtw_ht_1s_rates);</div><div class='add'>+		phy_tx_power_by_rate_config_by_path(hal, path,</div><div class='add'>+				RTW_RATE_SECTION_HT_2S,</div><div class='add'>+				rtw_ht_2s_size, rtw_ht_2s_rates);</div><div class='add'>+		phy_tx_power_by_rate_config_by_path(hal, path,</div><div class='add'>+				RTW_RATE_SECTION_VHT_1S,</div><div class='add'>+				rtw_vht_1s_size, rtw_vht_1s_rates);</div><div class='add'>+		phy_tx_power_by_rate_config_by_path(hal, path,</div><div class='add'>+				RTW_RATE_SECTION_VHT_2S,</div><div class='add'>+				rtw_vht_2s_size, rtw_vht_2s_rates);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+phy_tx_power_limit_config(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs)</div><div class='add'>+{</div><div class='add'>+	s8 base, orig;</div><div class='add'>+	u8 ch;</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; RTW_MAX_CHANNEL_NUM_2G; ch++) {</div><div class='add'>+		base = hal-&gt;tx_pwr_by_rate_base_2g[0][rs];</div><div class='add'>+		orig = hal-&gt;tx_pwr_limit_2g[regd][bw][rs][ch];</div><div class='add'>+		hal-&gt;tx_pwr_limit_2g[regd][bw][rs][ch] -= base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; RTW_MAX_CHANNEL_NUM_5G; ch++) {</div><div class='add'>+		base = hal-&gt;tx_pwr_by_rate_base_5g[0][rs];</div><div class='add'>+		hal-&gt;tx_pwr_limit_5g[regd][bw][rs][ch] -= base;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_phy_tx_power_limit_config(struct rtw_hal *hal)</div><div class='add'>+{</div><div class='add'>+	u8 regd, bw, rs;</div><div class='add'>+</div><div class='add'>+	for (regd = 0; regd &lt; RTW_REGD_MAX; regd++)</div><div class='add'>+		for (bw = 0; bw &lt; RTW_CHANNEL_WIDTH_MAX; bw++)</div><div class='add'>+			for (rs = 0; rs &lt; RTW_RATE_SECTION_MAX; rs++)</div><div class='add'>+				phy_tx_power_limit_config(hal, regd, bw, rs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s8 get_tx_power_limit(struct rtw_hal *hal, u8 bw, u8 rs, u8 ch, u8 regd)</div><div class='add'>+{</div><div class='add'>+	if (regd &gt; RTW_REGD_WW)</div><div class='add'>+		return RTW_MAX_POWER_INDEX;</div><div class='add'>+</div><div class='add'>+	return hal-&gt;tx_pwr_limit_2g[regd][bw][rs][ch];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band,</div><div class='add'>+			  enum rtw_bandwidth bw, u8 rf_path,</div><div class='add'>+			  u8 rate, u8 channel, u8 regd)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	s8 power_limit;</div><div class='add'>+	u8 rs;</div><div class='add'>+	int ch_idx;</div><div class='add'>+</div><div class='add'>+	if (rate &gt;= DESC_RATE1M &amp;&amp; rate &lt;= DESC_RATE11M)</div><div class='add'>+		rs = RTW_RATE_SECTION_CCK;</div><div class='add'>+	else if (rate &gt;= DESC_RATE6M &amp;&amp; rate &lt;= DESC_RATE54M)</div><div class='add'>+		rs = RTW_RATE_SECTION_OFDM;</div><div class='add'>+	else if (rate &gt;= DESC_RATEMCS0 &amp;&amp; rate &lt;= DESC_RATEMCS7)</div><div class='add'>+		rs = RTW_RATE_SECTION_HT_1S;</div><div class='add'>+	else if (rate &gt;= DESC_RATEMCS8 &amp;&amp; rate &lt;= DESC_RATEMCS15)</div><div class='add'>+		rs = RTW_RATE_SECTION_HT_2S;</div><div class='add'>+	else if (rate &gt;= DESC_RATEVHT1SS_MCS0 &amp;&amp; rate &lt;= DESC_RATEVHT1SS_MCS9)</div><div class='add'>+		rs = RTW_RATE_SECTION_VHT_1S;</div><div class='add'>+	else if (rate &gt;= DESC_RATEVHT2SS_MCS0 &amp;&amp; rate &lt;= DESC_RATEVHT2SS_MCS9)</div><div class='add'>+		rs = RTW_RATE_SECTION_VHT_2S;</div><div class='add'>+	else</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ch_idx = rtw_channel_to_idx(band, channel);</div><div class='add'>+	if (ch_idx &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	power_limit = get_tx_power_limit(hal, bw, rs, ch_idx, regd);</div><div class='add'>+</div><div class='add'>+	return power_limit;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	WARN(1, "invalid arguments, band=%d, bw=%d, path=%d, rate=%d, ch=%d\n",</div><div class='add'>+	     band, bw, rf_path, rate, channel);</div><div class='add'>+	return RTW_MAX_POWER_INDEX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void phy_set_tx_power_limit(struct rtw_dev *rtwdev, u8 regd, u8 band,</div><div class='add'>+			    u8 bw, u8 rs, u8 ch, s8 pwr_limit)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	int ch_idx;</div><div class='add'>+</div><div class='add'>+	pwr_limit = clamp_t(s8, pwr_limit,</div><div class='add'>+			    -RTW_MAX_POWER_INDEX, RTW_MAX_POWER_INDEX);</div><div class='add'>+	ch_idx = rtw_channel_to_idx(band, ch);</div><div class='add'>+</div><div class='add'>+	if (regd &gt;= RTW_REGD_MAX || bw &gt;= RTW_CHANNEL_WIDTH_MAX ||</div><div class='add'>+	    rs &gt;= RTW_RATE_SECTION_MAX || ch_idx &lt; 0) {</div><div class='add'>+		WARN(1,</div><div class='add'>+		     "wrong txpwr_lmt regd=%u, band=%u bw=%u, rs=%u, ch_idx=%u, pwr_limit=%d\n",</div><div class='add'>+		     regd, band, bw, rs, ch_idx, pwr_limit);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (band == PHY_BAND_2G)</div><div class='add'>+		hal-&gt;tx_pwr_limit_2g[regd][bw][rs][ch_idx] = pwr_limit;</div><div class='add'>+	else if (band == PHY_BAND_5G)</div><div class='add'>+		hal-&gt;tx_pwr_limit_5g[regd][bw][rs][ch_idx] = pwr_limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void rtw_hw_tx_power_limit_init(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs)</div><div class='add'>+{</div><div class='add'>+	u8 ch;</div><div class='add'>+</div><div class='add'>+	/* 2.4G channels */</div><div class='add'>+	for (ch = 0; ch &lt; RTW_MAX_CHANNEL_NUM_2G; ch++)</div><div class='add'>+		hal-&gt;tx_pwr_limit_2g[regd][bw][rs][ch] = RTW_MAX_POWER_INDEX;</div><div class='add'>+</div><div class='add'>+	/* 5G channels */</div><div class='add'>+	for (ch = 0; ch &lt; RTW_MAX_CHANNEL_NUM_5G; ch++)</div><div class='add'>+		hal-&gt;tx_pwr_limit_5g[regd][bw][rs][ch] = RTW_MAX_POWER_INDEX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_hw_init_tx_power(struct rtw_hal *hal)</div><div class='add'>+{</div><div class='add'>+	u8 regd, path, rate, rs, bw;</div><div class='add'>+</div><div class='add'>+	/* init tx power by rate offset */</div><div class='add'>+	for (path = 0; path &lt; RTW_RF_PATH_MAX; path++) {</div><div class='add'>+		for (rate = 0; rate &lt; DESC_RATE_MAX; rate++) {</div><div class='add'>+			hal-&gt;tx_pwr_by_rate_offset_2g[path][rate] = 0;</div><div class='add'>+			hal-&gt;tx_pwr_by_rate_offset_5g[path][rate] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* init tx power limit */</div><div class='add'>+	for (regd = 0; regd &lt; RTW_REGD_MAX; regd++)</div><div class='add'>+		for (bw = 0; bw &lt; RTW_CHANNEL_WIDTH_MAX; bw++)</div><div class='add'>+			for (rs = 0; rs &lt; RTW_RATE_SECTION_MAX; rs++)</div><div class='add'>+				rtw_hw_tx_power_limit_init(hal, regd, bw, rs);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/phy.h b/drivers/net/wireless/realtek/rtw88/phy.h<br/>new file mode 100644<br/>index 000000000000..ec03a2051e52<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/phy.h</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_PHY_H_</div><div class='add'>+#define __RTW_PHY_H_</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+extern u8 rtw_cck_rates[];</div><div class='add'>+extern u8 rtw_ofdm_rates[];</div><div class='add'>+extern u8 rtw_ht_1s_rates[];</div><div class='add'>+extern u8 rtw_ht_2s_rates[];</div><div class='add'>+extern u8 rtw_vht_1s_rates[];</div><div class='add'>+extern u8 rtw_vht_2s_rates[];</div><div class='add'>+extern u8 *rtw_rate_section[];</div><div class='add'>+extern u8 rtw_rate_size[];</div><div class='add'>+</div><div class='add'>+void rtw_phy_init(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_phy_dynamic_mechanism(struct rtw_dev *rtwdev);</div><div class='add'>+u8 rtw_phy_rf_power_2_rssi(s8 *rf_power, u8 path_num);</div><div class='add'>+u32 rtw_phy_read_rf(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+		    u32 addr, u32 mask);</div><div class='add'>+bool rtw_phy_write_rf_reg_sipi(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			       u32 addr, u32 mask, u32 data);</div><div class='add'>+bool rtw_phy_write_rf_reg(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			  u32 addr, u32 mask, u32 data);</div><div class='add'>+bool rtw_phy_write_rf_reg_mix(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,</div><div class='add'>+			      u32 addr, u32 mask, u32 data);</div><div class='add'>+void phy_store_tx_power_by_rate(void *adapter, u32 band, u32 rfpath, u32 txnum,</div><div class='add'>+				u32 regaddr, u32 bitmask, u32 data);</div><div class='add'>+void phy_set_tx_power_limit(struct rtw_dev *rtwdev, u8 regd, u8 band,</div><div class='add'>+			    u8 bw, u8 rs, u8 ch, s8 pwr_limit);</div><div class='add'>+void phy_set_tx_power_index_by_rs(void *adapter, u8 ch, u8 path, u8 rs);</div><div class='add'>+void rtw_phy_setup_phy_cond(struct rtw_dev *rtwdev, u32 pkg);</div><div class='add'>+void rtw_parse_tbl_phy_cond(struct rtw_dev *rtwdev, const struct rtw_table *tbl);</div><div class='add'>+void rtw_parse_tbl_bb_pg(struct rtw_dev *rtwdev, const struct rtw_table *tbl);</div><div class='add'>+void rtw_parse_tbl_txpwr_lmt(struct rtw_dev *rtwdev, const struct rtw_table *tbl);</div><div class='add'>+void rtw_phy_cfg_mac(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		     u32 addr, u32 data);</div><div class='add'>+void rtw_phy_cfg_agc(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		     u32 addr, u32 data);</div><div class='add'>+void rtw_phy_cfg_bb(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		    u32 addr, u32 data);</div><div class='add'>+void rtw_phy_cfg_rf(struct rtw_dev *rtwdev, const struct rtw_table *tbl,</div><div class='add'>+		    u32 addr, u32 data);</div><div class='add'>+void rtw_hw_init_tx_power(struct rtw_hal *hal);</div><div class='add'>+void rtw_phy_load_tables(struct rtw_dev *rtwdev);</div><div class='add'>+void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel);</div><div class='add'>+void rtw_phy_tx_power_by_rate_config(struct rtw_hal *hal);</div><div class='add'>+void rtw_phy_tx_power_limit_config(struct rtw_hal *hal);</div><div class='add'>+</div><div class='add'>+#define RTW_DECL_TABLE_PHY_COND_CORE(name, cfg, path)	\</div><div class='add'>+const struct rtw_table name ## _tbl = {			\</div><div class='add'>+	.data = name,					\</div><div class='add'>+	.size = ARRAY_SIZE(name),			\</div><div class='add'>+	.parse = rtw_parse_tbl_phy_cond,		\</div><div class='add'>+	.do_cfg = cfg,					\</div><div class='add'>+	.rf_path = path,				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RTW_DECL_TABLE_PHY_COND(name, cfg)		\</div><div class='add'>+	RTW_DECL_TABLE_PHY_COND_CORE(name, cfg, 0)</div><div class='add'>+</div><div class='add'>+#define RTW_DECL_TABLE_RF_RADIO(name, path)		\</div><div class='add'>+	RTW_DECL_TABLE_PHY_COND_CORE(name, rtw_phy_cfg_rf, RF_PATH_ ## path)</div><div class='add'>+</div><div class='add'>+#define RTW_DECL_TABLE_BB_PG(name)			\</div><div class='add'>+const struct rtw_table name ## _tbl = {			\</div><div class='add'>+	.data = name,					\</div><div class='add'>+	.size = ARRAY_SIZE(name),			\</div><div class='add'>+	.parse = rtw_parse_tbl_bb_pg,			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RTW_DECL_TABLE_TXPWR_LMT(name)			\</div><div class='add'>+const struct rtw_table name ## _tbl = {			\</div><div class='add'>+	.data = name,					\</div><div class='add'>+	.size = ARRAY_SIZE(name),			\</div><div class='add'>+	.parse = rtw_parse_tbl_txpwr_lmt,		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const struct rtw_rfe_def *rtw_get_rfe_def(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	const struct rtw_rfe_def *rfe_def = NULL;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;rfe_defs_size == 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (efuse-&gt;rfe_option &lt; chip-&gt;rfe_defs_size)</div><div class='add'>+		rfe_def = &amp;chip-&gt;rfe_defs[efuse-&gt;rfe_option];</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_PHY, "use rfe_def[%d]\n", efuse-&gt;rfe_option);</div><div class='add'>+	return rfe_def;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rtw_check_supported_rfe(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	const struct rtw_rfe_def *rfe_def = rtw_get_rfe_def(rtwdev);</div><div class='add'>+</div><div class='add'>+	if (!rfe_def || !rfe_def-&gt;phy_pg_tbl || !rfe_def-&gt;txpwr_lmt_tbl) {</div><div class='add'>+		rtw_err(rtwdev, "rfe %d isn't supported\n",</div><div class='add'>+			rtwdev-&gt;efuse.rfe_option);</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'>+void rtw_phy_dig_write(struct rtw_dev *rtwdev, u8 igi);</div><div class='add'>+</div><div class='add'>+#define	MASKBYTE0		0xff</div><div class='add'>+#define	MASKBYTE1		0xff00</div><div class='add'>+#define	MASKBYTE2		0xff0000</div><div class='add'>+#define	MASKBYTE3		0xff000000</div><div class='add'>+#define	MASKHWORD		0xffff0000</div><div class='add'>+#define	MASKLWORD		0x0000ffff</div><div class='add'>+#define	MASKDWORD		0xffffffff</div><div class='add'>+#define RFREG_MASK		0xfffff</div><div class='add'>+</div><div class='add'>+#define	MASK7BITS		0x7f</div><div class='add'>+#define	MASK12BITS		0xfff</div><div class='add'>+#define	MASKH4BITS		0xf0000000</div><div class='add'>+#define	MASK20BITS		0xfffff</div><div class='add'>+#define	MASK24BITS		0xffffff</div><div class='add'>+</div><div class='add'>+#define MASKH3BYTES		0xffffff00</div><div class='add'>+#define MASKL3BYTES		0x00ffffff</div><div class='add'>+#define MASKBYTE2HIGHNIBBLE	0x00f00000</div><div class='add'>+#define MASKBYTE3LOWNIBBLE	0x0f000000</div><div class='add'>+#define	MASKL3BYTES		0x00ffffff</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/ps.c b/drivers/net/wireless/realtek/rtw88/ps.c<br/>new file mode 100644<br/>index 000000000000..607bfa4317d9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/ps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/ps.c</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "ps.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static int rtw_ips_pwr_up(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_core_start(rtwdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		rtw_err(rtwdev, "leave idle state failed\n");</div><div class='add'>+</div><div class='add'>+	rtw_set_channel(rtwdev);</div><div class='add'>+	rtw_flag_clear(rtwdev, RTW_FLAG_INACTIVE_PS);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_enter_ips(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_flag_set(rtwdev, RTW_FLAG_INACTIVE_PS);</div><div class='add'>+</div><div class='add'>+	rtw_core_stop(rtwdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_restore_port_cfg_iter(void *data, u8 *mac,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = data;</div><div class='add'>+	struct rtw_vif *rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u32 config = ~0;</div><div class='add'>+</div><div class='add'>+	rtw_vif_port_config(rtwdev, rtwvif, config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_leave_ips(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtw_ips_pwr_up(rtwdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtw_err(rtwdev, "failed to leave ips state\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_iterate_vifs_atomic(rtwdev, rtw_restore_port_cfg_iter, rtwdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_leave_lps_core(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+</div><div class='add'>+	conf-&gt;state = RTW_ALL_ON;</div><div class='add'>+	conf-&gt;awake_interval = 1;</div><div class='add'>+	conf-&gt;rlbm = 0;</div><div class='add'>+	conf-&gt;smart_ps = 0;</div><div class='add'>+</div><div class='add'>+	rtw_fw_set_pwr_mode(rtwdev);</div><div class='add'>+	rtw_flag_clear(rtwdev, RTW_FLAG_LEISURE_PS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_enter_lps_core(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+</div><div class='add'>+	conf-&gt;state = RTW_RF_OFF;</div><div class='add'>+	conf-&gt;awake_interval = 1;</div><div class='add'>+	conf-&gt;rlbm = 1;</div><div class='add'>+	conf-&gt;smart_ps = 2;</div><div class='add'>+</div><div class='add'>+	rtw_fw_set_pwr_mode(rtwdev);</div><div class='add'>+	rtw_flag_set(rtwdev, RTW_FLAG_LEISURE_PS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_lps_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,</div><div class='add'>+					      lps_work.work);</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+	struct rtw_vif *rtwvif = conf-&gt;rtwvif;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!rtwvif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;mode == RTW_MODE_LPS)</div><div class='add'>+		rtw_enter_lps_core(rtwdev);</div><div class='add'>+	else</div><div class='add'>+		rtw_leave_lps_core(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_enter_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+</div><div class='add'>+	if (rtwvif-&gt;in_lps)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conf-&gt;mode = RTW_MODE_LPS;</div><div class='add'>+	conf-&gt;rtwvif = rtwvif;</div><div class='add'>+	rtwvif-&gt;in_lps = true;</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(rtwdev-&gt;hw, &amp;rtwdev-&gt;lps_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_leave_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+</div><div class='add'>+	if (!rtwvif-&gt;in_lps)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conf-&gt;mode = RTW_MODE_ACTIVE;</div><div class='add'>+	conf-&gt;rtwvif = rtwvif;</div><div class='add'>+	rtwvif-&gt;in_lps = false;</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(rtwdev-&gt;hw, &amp;rtwdev-&gt;lps_work, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool rtw_in_lps(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	return rtw_flag_check(rtwdev, RTW_FLAG_LEISURE_PS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_enter_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!rtwvif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rtwvif-&gt;in_lps)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conf-&gt;mode = RTW_MODE_LPS;</div><div class='add'>+	conf-&gt;rtwvif = rtwvif;</div><div class='add'>+	rtwvif-&gt;in_lps = true;</div><div class='add'>+</div><div class='add'>+	rtw_enter_lps_core(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_leave_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_lps_conf *conf = &amp;rtwdev-&gt;lps_conf;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!rtwvif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!rtwvif-&gt;in_lps)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conf-&gt;mode = RTW_MODE_ACTIVE;</div><div class='add'>+	conf-&gt;rtwvif = rtwvif;</div><div class='add'>+	rtwvif-&gt;in_lps = false;</div><div class='add'>+</div><div class='add'>+	rtw_leave_lps_core(rtwdev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/ps.h b/drivers/net/wireless/realtek/rtw88/ps.h<br/>new file mode 100644<br/>index 000000000000..09e57405dc1b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/ps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/ps.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_PS_H_</div><div class='add'>+#define __RTW_PS_H_</div><div class='add'>+</div><div class='add'>+#define RTW_LPS_THRESHOLD	2</div><div class='add'>+</div><div class='add'>+int rtw_enter_ips(struct rtw_dev *rtwdev);</div><div class='add'>+int rtw_leave_ips(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+void rtw_lps_work(struct work_struct *work);</div><div class='add'>+void rtw_enter_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);</div><div class='add'>+void rtw_leave_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);</div><div class='add'>+void rtw_enter_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);</div><div class='add'>+void rtw_leave_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);</div><div class='add'>+bool rtw_in_lps(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/reg.h b/drivers/net/wireless/realtek/rtw88/reg.h<br/>new file mode 100644<br/>index 000000000000..e2628f05812c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/reg.h</a></div><div class='hunk'>@@ -0,0 +1,421 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_REG_DEF_H__</div><div class='add'>+#define __RTW_REG_DEF_H__</div><div class='add'>+</div><div class='add'>+#define REG_SYS_FUNC_EN		0x0002</div><div class='add'>+#define BIT_FEN_CPUEN		BIT(2)</div><div class='add'>+#define BIT_FEN_BB_GLB_RST	BIT(1)</div><div class='add'>+#define BIT_FEN_BB_RSTB		BIT(0)</div><div class='add'>+#define REG_SYS_PW_CTRL		0x0004</div><div class='add'>+#define REG_SYS_CLK_CTRL	0x0008</div><div class='add'>+#define BIT_CPU_CLK_EN		BIT(14)</div><div class='add'>+</div><div class='add'>+#define REG_RSV_CTRL		0x001C</div><div class='add'>+#define DISABLE_PI		0x3</div><div class='add'>+#define ENABLE_PI		0x2</div><div class='add'>+#define BITS_RFC_DIRECT		(BIT(31) | BIT(30))</div><div class='add'>+#define BIT_WLMCU_IOIF		BIT(0)</div><div class='add'>+#define REG_RF_CTRL		0x001F</div><div class='add'>+#define BIT_RF_SDM_RSTB		BIT(2)</div><div class='add'>+#define BIT_RF_RSTB		BIT(1)</div><div class='add'>+#define BIT_RF_EN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_AFE_CTRL1		0x0024</div><div class='add'>+#define BIT_MAC_CLK_SEL		(BIT(20) | BIT(21))</div><div class='add'>+#define REG_EFUSE_CTRL		0x0030</div><div class='add'>+#define BIT_EF_FLAG		BIT(31)</div><div class='add'>+#define BIT_SHIFT_EF_ADDR	8</div><div class='add'>+#define BIT_MASK_EF_ADDR	0x3ff</div><div class='add'>+#define BIT_MASK_EF_DATA	0xff</div><div class='add'>+#define BITS_EF_ADDR		(BIT_MASK_EF_ADDR &lt;&lt; BIT_SHIFT_EF_ADDR)</div><div class='add'>+</div><div class='add'>+#define REG_LDO_EFUSE_CTRL	0x0034</div><div class='add'>+#define BIT_MASK_EFUSE_BANK_SEL	(BIT(8) | BIT(9))</div><div class='add'>+</div><div class='add'>+#define REG_GPIO_MUXCFG		0x0040</div><div class='add'>+#define BIT_FSPI_EN		BIT(19)</div><div class='add'>+#define BIT_WLRFE_4_5_EN	BIT(2)</div><div class='add'>+</div><div class='add'>+#define REG_LED_CFG		0x004C</div><div class='add'>+#define BIT_LNAON_SEL_EN	BIT(26)</div><div class='add'>+#define BIT_PAPE_SEL_EN		BIT(25)</div><div class='add'>+#define REG_PAD_CTRL1		0x0064</div><div class='add'>+#define BIT_PAPE_WLBT_SEL	BIT(29)</div><div class='add'>+#define BIT_LNAON_WLBT_SEL	BIT(28)</div><div class='add'>+#define REG_WL_BT_PWR_CTRL	0x0068</div><div class='add'>+#define BIT_BT_FUNC_EN		BIT(18)</div><div class='add'>+#define BIT_BT_DIG_CLK_EN	BIT(8)</div><div class='add'>+#define REG_HCI_OPT_CTRL	0x0074</div><div class='add'>+</div><div class='add'>+#define REG_MCUFW_CTRL		0x0080</div><div class='add'>+#define BIT_ANA_PORT_EN		BIT(22)</div><div class='add'>+#define BIT_MAC_PORT_EN		BIT(21)</div><div class='add'>+#define BIT_BOOT_FSPI_EN	BIT(20)</div><div class='add'>+#define BIT_FW_INIT_RDY		BIT(15)</div><div class='add'>+#define BIT_FW_DW_RDY		BIT(14)</div><div class='add'>+#define BIT_RPWM_TOGGLE		BIT(7)</div><div class='add'>+#define BIT_DMEM_CHKSUM_OK	BIT(6)</div><div class='add'>+#define BIT_DMEM_DW_OK		BIT(5)</div><div class='add'>+#define BIT_IMEM_CHKSUM_OK	BIT(4)</div><div class='add'>+#define BIT_IMEM_DW_OK		BIT(3)</div><div class='add'>+#define BIT_IMEM_BOOT_LOAD_CHECKSUM_OK BIT(2)</div><div class='add'>+#define BIT_MCUFWDL_EN		BIT(0)</div><div class='add'>+#define BIT_CHECK_SUM_OK	(BIT(4) | BIT(6))</div><div class='add'>+#define FW_READY		(BIT_FW_INIT_RDY | BIT_FW_DW_RDY |             \</div><div class='add'>+				 BIT_IMEM_DW_OK | BIT_DMEM_DW_OK |             \</div><div class='add'>+				 BIT_CHECK_SUM_OK)</div><div class='add'>+#define FW_READY_MASK		0xffff</div><div class='add'>+</div><div class='add'>+#define REG_WLRF1		0x00EC</div><div class='add'>+#define REG_SYS_CFG1		0x00F0</div><div class='add'>+#define	BIT_RTL_ID		BIT(23)</div><div class='add'>+#define BIT_RF_TYPE_ID		BIT(27)</div><div class='add'>+#define BIT_SHIFT_VENDOR_ID	16</div><div class='add'>+#define BIT_MASK_VENDOR_ID	0xf</div><div class='add'>+#define BIT_VENDOR_ID(x) (((x) &amp; BIT_MASK_VENDOR_ID) &lt;&lt; BIT_SHIFT_VENDOR_ID)</div><div class='add'>+#define BITS_VENDOR_ID		(BIT_MASK_VENDOR_ID &lt;&lt; BIT_SHIFT_VENDOR_ID)</div><div class='add'>+#define BIT_CLEAR_VENDOR_ID(x)	((x) &amp; (~BITS_VENDOR_ID))</div><div class='add'>+#define BIT_GET_VENDOR_ID(x) (((x) &gt;&gt; BIT_SHIFT_VENDOR_ID) &amp; BIT_MASK_VENDOR_ID)</div><div class='add'>+#define BIT_SHIFT_CHIP_VER	12</div><div class='add'>+#define BIT_MASK_CHIP_VER	0xf</div><div class='add'>+#define BIT_CHIP_VER(x)	 (((x) &amp; BIT_MASK_CHIP_VER) &lt;&lt; BIT_SHIFT_CHIP_VER)</div><div class='add'>+#define BITS_CHIP_VER		(BIT_MASK_CHIP_VER &lt;&lt; BIT_SHIFT_CHIP_VER)</div><div class='add'>+#define BIT_CLEAR_CHIP_VER(x)	((x) &amp; (~BITS_CHIP_VER))</div><div class='add'>+#define BIT_GET_CHIP_VER(x) (((x) &gt;&gt; BIT_SHIFT_CHIP_VER) &amp; BIT_MASK_CHIP_VER)</div><div class='add'>+#define REG_SYS_STATUS1		0x00F4</div><div class='add'>+#define REG_SYS_STATUS2		0x00F8</div><div class='add'>+#define REG_SYS_CFG2		0x00FC</div><div class='add'>+#define REG_WLRF1		0x00EC</div><div class='add'>+#define BIT_WLRF1_BBRF_EN	(BIT(24) | BIT(25) | BIT(26))</div><div class='add'>+#define REG_CR			0x0100</div><div class='add'>+#define BIT_32K_CAL_TMR_EN	BIT(10)</div><div class='add'>+#define BIT_MAC_SEC_EN		BIT(9)</div><div class='add'>+#define BIT_ENSWBCN		BIT(8)</div><div class='add'>+#define BIT_MACRXEN		BIT(7)</div><div class='add'>+#define BIT_MACTXEN		BIT(6)</div><div class='add'>+#define BIT_SCHEDULE_EN		BIT(5)</div><div class='add'>+#define BIT_PROTOCOL_EN		BIT(4)</div><div class='add'>+#define BIT_RXDMA_EN		BIT(3)</div><div class='add'>+#define BIT_TXDMA_EN		BIT(2)</div><div class='add'>+#define BIT_HCI_RXDMA_EN	BIT(1)</div><div class='add'>+#define BIT_HCI_TXDMA_EN	BIT(0)</div><div class='add'>+#define MAC_TRX_ENABLE	(BIT_HCI_TXDMA_EN | BIT_HCI_RXDMA_EN | BIT_TXDMA_EN | \</div><div class='add'>+			BIT_RXDMA_EN | BIT_PROTOCOL_EN | BIT_SCHEDULE_EN | \</div><div class='add'>+			BIT_MACTXEN | BIT_MACRXEN)</div><div class='add'>+#define BIT_SHIFT_TXDMA_VOQ_MAP	4</div><div class='add'>+#define BIT_MASK_TXDMA_VOQ_MAP	0x3</div><div class='add'>+#define BIT_TXDMA_VOQ_MAP(x)                                                   \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXDMA_VOQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_VOQ_MAP)</div><div class='add'>+#define BIT_SHIFT_TXDMA_VIQ_MAP	6</div><div class='add'>+#define BIT_MASK_TXDMA_VIQ_MAP	0x3</div><div class='add'>+#define BIT_TXDMA_VIQ_MAP(x)                                                   \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXDMA_VIQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_VIQ_MAP)</div><div class='add'>+#define REG_TXDMA_PQ_MAP	0x010C</div><div class='add'>+#define BIT_SHIFT_TXDMA_BEQ_MAP	8</div><div class='add'>+#define BIT_MASK_TXDMA_BEQ_MAP	0x3</div><div class='add'>+#define BIT_TXDMA_BEQ_MAP(x)                                                   \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXDMA_BEQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_BEQ_MAP)</div><div class='add'>+#define BIT_SHIFT_TXDMA_BKQ_MAP	10</div><div class='add'>+#define BIT_MASK_TXDMA_BKQ_MAP	0x3</div><div class='add'>+#define BIT_TXDMA_BKQ_MAP(x)                                                   \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXDMA_BKQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_BKQ_MAP)</div><div class='add'>+#define BIT_SHIFT_TXDMA_MGQ_MAP	12</div><div class='add'>+#define BIT_MASK_TXDMA_MGQ_MAP	0x3</div><div class='add'>+#define BIT_TXDMA_MGQ_MAP(x)                                                   \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXDMA_MGQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_MGQ_MAP)</div><div class='add'>+#define BIT_SHIFT_TXDMA_HIQ_MAP	14</div><div class='add'>+#define BIT_MASK_TXDMA_HIQ_MAP	0x3</div><div class='add'>+#define BIT_TXDMA_HIQ_MAP(x)                                                   \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXDMA_HIQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_HIQ_MAP)</div><div class='add'>+#define BIT_SHIFT_TXSC_40M	4</div><div class='add'>+#define BIT_MASK_TXSC_40M	0xf</div><div class='add'>+#define BIT_TXSC_40M(x)							       \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXSC_40M) &lt;&lt; BIT_SHIFT_TXSC_40M)</div><div class='add'>+#define BIT_SHIFT_TXSC_20M	0</div><div class='add'>+#define BIT_MASK_TXSC_20M	0xf</div><div class='add'>+#define BIT_TXSC_20M(x)							       \</div><div class='add'>+	(((x) &amp; BIT_MASK_TXSC_20M) &lt;&lt; BIT_SHIFT_TXSC_20M)</div><div class='add'>+#define BIT_SHIFT_MAC_CLK_SEL	20</div><div class='add'>+#define MAC_CLK_HW_DEF_80M	0</div><div class='add'>+#define MAC_CLK_HW_DEF_40M	1</div><div class='add'>+#define MAC_CLK_HW_DEF_20M	2</div><div class='add'>+#define MAC_CLK_SPEED		80</div><div class='add'>+</div><div class='add'>+#define REG_CR			0x0100</div><div class='add'>+#define REG_TRXFF_BNDY		0x0114</div><div class='add'>+#define REG_RXFF_BNDY		0x011C</div><div class='add'>+#define REG_PKTBUF_DBG_CTRL	0x0140</div><div class='add'>+#define REG_C2HEVT		0x01A0</div><div class='add'>+#define REG_HMETFR		0x01CC</div><div class='add'>+#define REG_HMEBOX0		0x01D0</div><div class='add'>+#define REG_HMEBOX1		0x01D4</div><div class='add'>+#define REG_HMEBOX2		0x01D8</div><div class='add'>+#define REG_HMEBOX3		0x01DC</div><div class='add'>+#define REG_HMEBOX0_EX		0x01F0</div><div class='add'>+#define REG_HMEBOX1_EX		0x01F4</div><div class='add'>+#define REG_HMEBOX2_EX		0x01F8</div><div class='add'>+#define REG_HMEBOX3_EX		0x01FC</div><div class='add'>+</div><div class='add'>+#define REG_FIFOPAGE_CTRL_2	0x0204</div><div class='add'>+#define BIT_BCN_VALID_V1	BIT(15)</div><div class='add'>+#define BIT_MASK_BCN_HEAD_1_V1	0xfff</div><div class='add'>+#define REG_AUTO_LLT_V1		0x0208</div><div class='add'>+#define BIT_AUTO_INIT_LLT_V1	BIT(0)</div><div class='add'>+#define REG_TXDMA_OFFSET_CHK	0x020C</div><div class='add'>+#define REG_TXDMA_STATUS	0x0210</div><div class='add'>+#define BTI_PAGE_OVF		BIT(2)</div><div class='add'>+#define REG_RQPN_CTRL_1		0x0228</div><div class='add'>+#define REG_RQPN_CTRL_2		0x022C</div><div class='add'>+#define BIT_LD_RQPN		BIT(31)</div><div class='add'>+#define REG_FIFOPAGE_INFO_1	0x0230</div><div class='add'>+#define REG_FIFOPAGE_INFO_2	0x0234</div><div class='add'>+#define REG_FIFOPAGE_INFO_3	0x0238</div><div class='add'>+#define REG_FIFOPAGE_INFO_4	0x023C</div><div class='add'>+#define REG_FIFOPAGE_INFO_5	0x0240</div><div class='add'>+#define REG_H2C_HEAD		0x0244</div><div class='add'>+#define REG_H2C_TAIL		0x0248</div><div class='add'>+#define REG_H2C_READ_ADDR	0x024C</div><div class='add'>+#define REG_H2C_INFO		0x0254</div><div class='add'>+</div><div class='add'>+#define REG_FWHW_TXQ_CTRL	0x0420</div><div class='add'>+#define BIT_EN_BCNQ_DL		BIT(22)</div><div class='add'>+#define BIT_EN_WR_FREE_TAIL	BIT(20)</div><div class='add'>+#define REG_BCNQ_BDNY_V1	0x0424</div><div class='add'>+#define REG_LIFETIME_EN		0x0426</div><div class='add'>+#define BIT_BA_PARSER_EN	BIT(5)</div><div class='add'>+#define REG_SPEC_SIFS		0x0428</div><div class='add'>+#define REG_DARFRC		0x0430</div><div class='add'>+#define REG_DARFRCH		0x0434</div><div class='add'>+#define REG_RARFRCH		0x043C</div><div class='add'>+#define REG_ARFR0		0x0444</div><div class='add'>+#define REG_ARFRH0		0x0448</div><div class='add'>+#define REG_ARFR1_V1		0x044C</div><div class='add'>+#define REG_ARFRH1_V1		0x0450</div><div class='add'>+#define REG_CCK_CHECK		0x0454</div><div class='add'>+#define BIT_CHECK_CCK_EN	BIT(7)</div><div class='add'>+#define REG_AMPDU_MAX_TIME_V1	0x0455</div><div class='add'>+#define REG_BCNQ1_BDNY_V1	0x0456</div><div class='add'>+#define REG_TX_HANG_CTRL	0x045E</div><div class='add'>+#define BIT_EN_EOF_V1		BIT(2)</div><div class='add'>+#define REG_DATA_SC		0x0483</div><div class='add'>+#define REG_ARFR4		0x049C</div><div class='add'>+#define REG_ARFRH4		0x04A0</div><div class='add'>+#define REG_ARFR5		0x04A4</div><div class='add'>+#define REG_ARFRH5		0x04A8</div><div class='add'>+#define REG_SW_AMPDU_BURST_MODE_CTRL 0x04BC</div><div class='add'>+#define BIT_PRE_TX_CMD		BIT(6)</div><div class='add'>+#define REG_PROT_MODE_CTRL	0x04C8</div><div class='add'>+#define REG_BAR_MODE_CTRL	0x04CC</div><div class='add'>+#define REG_PRECNT_CTRL		0x04E5</div><div class='add'>+#define BIT_EN_PRECNT		BIT(11)</div><div class='add'>+</div><div class='add'>+#define REG_EDCA_VO_PARAM	0x0500</div><div class='add'>+#define REG_EDCA_VI_PARAM	0x0504</div><div class='add'>+#define REG_EDCA_BE_PARAM	0x0508</div><div class='add'>+#define REG_EDCA_BK_PARAM	0x050C</div><div class='add'>+#define REG_PIFS		0x0512</div><div class='add'>+#define REG_SIFS		0x0514</div><div class='add'>+#define BIT_SHIFT_SIFS_OFDM_CTX	8</div><div class='add'>+#define BIT_SHIFT_SIFS_CCK_TRX	16</div><div class='add'>+#define BIT_SHIFT_SIFS_OFDM_TRX	24</div><div class='add'>+#define REG_SLOT		0x051B</div><div class='add'>+#define REG_TX_PTCL_CTRL	0x0520</div><div class='add'>+#define BIT_SIFS_BK_EN		BIT(12)</div><div class='add'>+#define REG_TXPAUSE		0x0522</div><div class='add'>+#define REG_RD_CTRL		0x0524</div><div class='add'>+#define BIT_DIS_TXOP_CFE	BIT(10)</div><div class='add'>+#define BIT_DIS_LSIG_CFE	BIT(9)</div><div class='add'>+#define BIT_DIS_STBC_CFE	BIT(8)</div><div class='add'>+#define REG_TBTT_PROHIBIT	0x0540</div><div class='add'>+#define BIT_SHIFT_TBTT_HOLD_TIME_AP 8</div><div class='add'>+#define REG_RD_NAV_NXT		0x0544</div><div class='add'>+#define REG_BCN_CTRL		0x0550</div><div class='add'>+#define BIT_DIS_TSF_UDT		BIT(4)</div><div class='add'>+#define BIT_EN_BCN_FUNCTION	BIT(3)</div><div class='add'>+#define REG_BCN_CTRL_CLINT0	0x0551</div><div class='add'>+#define REG_DRVERLYINT		0x0558</div><div class='add'>+#define REG_BCNDMATIM		0x0559</div><div class='add'>+#define REG_USTIME_TSF		0x055C</div><div class='add'>+#define REG_BCN_MAX_ERR		0x055D</div><div class='add'>+#define REG_RXTSF_OFFSET_CCK	0x055E</div><div class='add'>+#define REG_MISC_CTRL		0x0577</div><div class='add'>+#define BIT_EN_FREE_CNT		BIT(3)</div><div class='add'>+#define BIT_DIS_SECOND_CCA	(BIT(0) | BIT(1))</div><div class='add'>+#define REG_TIMER0_SRC_SEL	0x05B4</div><div class='add'>+#define BIT_TSFT_SEL_TIMER0	(BIT(4) | BIT(5) | BIT(6))</div><div class='add'>+</div><div class='add'>+#define REG_TCR			0x0604</div><div class='add'>+#define REG_RCR			0x0608</div><div class='add'>+#define BIT_APP_FCS		BIT(31)</div><div class='add'>+#define BIT_APP_MIC		BIT(30)</div><div class='add'>+#define BIT_APP_ICV		BIT(29)</div><div class='add'>+#define BIT_APP_PHYSTS		BIT(28)</div><div class='add'>+#define BIT_APP_BASSN		BIT(27)</div><div class='add'>+#define BIT_VHT_DACK		BIT(26)</div><div class='add'>+#define BIT_TCPOFLD_EN		BIT(25)</div><div class='add'>+#define BIT_ENMBID		BIT(24)</div><div class='add'>+#define BIT_LSIGEN		BIT(23)</div><div class='add'>+#define BIT_MFBEN		BIT(22)</div><div class='add'>+#define BIT_DISCHKPPDLLEN	BIT(21)</div><div class='add'>+#define BIT_PKTCTL_DLEN		BIT(20)</div><div class='add'>+#define BIT_TIM_PARSER_EN	BIT(18)</div><div class='add'>+#define BIT_BC_MD_EN		BIT(17)</div><div class='add'>+#define BIT_UC_MD_EN		BIT(16)</div><div class='add'>+#define BIT_RXSK_PERPKT		BIT(15)</div><div class='add'>+#define BIT_HTC_LOC_CTRL	BIT(14)</div><div class='add'>+#define BIT_RPFM_CAM_ENABLE	BIT(12)</div><div class='add'>+#define BIT_TA_BCN		BIT(11)</div><div class='add'>+#define BIT_DISDECMYPKT		BIT(10)</div><div class='add'>+#define BIT_AICV		BIT(9)</div><div class='add'>+#define BIT_ACRC32		BIT(8)</div><div class='add'>+#define BIT_CBSSID_BCN		BIT(7)</div><div class='add'>+#define BIT_CBSSID_DATA		BIT(6)</div><div class='add'>+#define BIT_APWRMGT		BIT(5)</div><div class='add'>+#define BIT_ADD3		BIT(4)</div><div class='add'>+#define BIT_AB			BIT(3)</div><div class='add'>+#define BIT_AM			BIT(2)</div><div class='add'>+#define BIT_APM			BIT(1)</div><div class='add'>+#define BIT_AAP			BIT(0)</div><div class='add'>+#define REG_RX_PKT_LIMIT	0x060C</div><div class='add'>+#define REG_RX_DRVINFO_SZ	0x060F</div><div class='add'>+#define BIT_APP_PHYSTS		BIT(28)</div><div class='add'>+#define REG_USTIME_EDCA		0x0638</div><div class='add'>+#define REG_ACKTO_CCK		0x0639</div><div class='add'>+#define REG_RESP_SIFS_CCK	0x063C</div><div class='add'>+#define REG_RESP_SIFS_OFDM	0x063E</div><div class='add'>+#define REG_ACKTO		0x0640</div><div class='add'>+#define REG_EIFS		0x0642</div><div class='add'>+#define REG_NAV_CTRL		0x0650</div><div class='add'>+#define REG_WMAC_TRXPTCL_CTL	0x0668</div><div class='add'>+#define BIT_RFMOD		(BIT(7) | BIT(8))</div><div class='add'>+#define BIT_RFMOD_80M		BIT(8)</div><div class='add'>+#define BIT_RFMOD_40M		BIT(7)</div><div class='add'>+#define REG_WMAC_TRXPTCL_CTL_H	0x066C</div><div class='add'>+#define REG_RXFLTMAP0		0x06A0</div><div class='add'>+#define REG_RXFLTMAP1		0x06A2</div><div class='add'>+#define REG_RXFLTMAP2		0x06A4</div><div class='add'>+#define REG_BBPSF_CTRL		0x06DC</div><div class='add'>+</div><div class='add'>+#define REG_WMAC_OPTION_FUNCTION 0x07D0</div><div class='add'>+#define REG_WMAC_OPTION_FUNCTION_1 0x07D4</div><div class='add'>+</div><div class='add'>+#define REG_ANAPAR_XTAL_0	0x1040</div><div class='add'>+#define REG_CPU_DMEM_CON	0x1080</div><div class='add'>+#define BIT_WL_PLATFORM_RST	BIT(16)</div><div class='add'>+#define BIT_WL_SECURITY_CLK	BIT(15)</div><div class='add'>+#define BIT_DDMA_EN		BIT(8)</div><div class='add'>+</div><div class='add'>+#define REG_H2C_PKT_READADDR	0x10D0</div><div class='add'>+#define REG_H2C_PKT_WRITEADDR	0x10D4</div><div class='add'>+#define REG_FW_DBG7		0x10FC</div><div class='add'>+#define FW_KEY_MASK		0xffffff00</div><div class='add'>+</div><div class='add'>+#define REG_CR_EXT		0x1100</div><div class='add'>+</div><div class='add'>+#define REG_DDMA_CH0SA		0x1200</div><div class='add'>+#define REG_DDMA_CH0DA		0x1204</div><div class='add'>+#define REG_DDMA_CH0CTRL	0x1208</div><div class='add'>+#define BIT_DDMACH0_OWN		BIT(31)</div><div class='add'>+#define BIT_DDMACH0_CHKSUM_EN	BIT(29)</div><div class='add'>+#define BIT_DDMACH0_CHKSUM_STS	BIT(27)</div><div class='add'>+#define BIT_DDMACH0_RESET_CHKSUM_STS BIT(25)</div><div class='add'>+#define BIT_DDMACH0_CHKSUM_CONT	BIT(24)</div><div class='add'>+#define BIT_MASK_DDMACH0_DLEN	0x3ffff</div><div class='add'>+</div><div class='add'>+#define REG_H2CQ_CSR		0x1330</div><div class='add'>+#define BIT_H2CQ_FULL		BIT(31)</div><div class='add'>+#define REG_FAST_EDCA_VOVI_SETTING 0x1448</div><div class='add'>+#define REG_FAST_EDCA_BEBK_SETTING 0x144C</div><div class='add'>+</div><div class='add'>+#define REG_RXPSF_CTRL		0x1610</div><div class='add'>+#define BIT_RXGCK_FIFOTHR_EN	BIT(28)</div><div class='add'>+</div><div class='add'>+#define BIT_SHIFT_RXGCK_VHT_FIFOTHR 26</div><div class='add'>+#define BIT_MASK_RXGCK_VHT_FIFOTHR 0x3</div><div class='add'>+#define BIT_RXGCK_VHT_FIFOTHR(x)                                               \</div><div class='add'>+	(((x) &amp; BIT_MASK_RXGCK_VHT_FIFOTHR) &lt;&lt; BIT_SHIFT_RXGCK_VHT_FIFOTHR)</div><div class='add'>+#define BITS_RXGCK_VHT_FIFOTHR                                                 \</div><div class='add'>+	(BIT_MASK_RXGCK_VHT_FIFOTHR &lt;&lt; BIT_SHIFT_RXGCK_VHT_FIFOTHR)</div><div class='add'>+</div><div class='add'>+#define BIT_SHIFT_RXGCK_HT_FIFOTHR 24</div><div class='add'>+#define BIT_MASK_RXGCK_HT_FIFOTHR 0x3</div><div class='add'>+#define BIT_RXGCK_HT_FIFOTHR(x)                                                \</div><div class='add'>+	(((x) &amp; BIT_MASK_RXGCK_HT_FIFOTHR) &lt;&lt; BIT_SHIFT_RXGCK_HT_FIFOTHR)</div><div class='add'>+#define BITS_RXGCK_HT_FIFOTHR                                                  \</div><div class='add'>+	(BIT_MASK_RXGCK_HT_FIFOTHR &lt;&lt; BIT_SHIFT_RXGCK_HT_FIFOTHR)</div><div class='add'>+</div><div class='add'>+#define BIT_SHIFT_RXGCK_OFDM_FIFOTHR 22</div><div class='add'>+#define BIT_MASK_RXGCK_OFDM_FIFOTHR 0x3</div><div class='add'>+#define BIT_RXGCK_OFDM_FIFOTHR(x)                                              \</div><div class='add'>+	(((x) &amp; BIT_MASK_RXGCK_OFDM_FIFOTHR) &lt;&lt; BIT_SHIFT_RXGCK_OFDM_FIFOTHR)</div><div class='add'>+#define BITS_RXGCK_OFDM_FIFOTHR                                                \</div><div class='add'>+	(BIT_MASK_RXGCK_OFDM_FIFOTHR &lt;&lt; BIT_SHIFT_RXGCK_OFDM_FIFOTHR)</div><div class='add'>+</div><div class='add'>+#define BIT_SHIFT_RXGCK_CCK_FIFOTHR 20</div><div class='add'>+#define BIT_MASK_RXGCK_CCK_FIFOTHR 0x3</div><div class='add'>+#define BIT_RXGCK_CCK_FIFOTHR(x)                                               \</div><div class='add'>+	(((x) &amp; BIT_MASK_RXGCK_CCK_FIFOTHR) &lt;&lt; BIT_SHIFT_RXGCK_CCK_FIFOTHR)</div><div class='add'>+#define BITS_RXGCK_CCK_FIFOTHR                                                 \</div><div class='add'>+	(BIT_MASK_RXGCK_CCK_FIFOTHR &lt;&lt; BIT_SHIFT_RXGCK_CCK_FIFOTHR)</div><div class='add'>+</div><div class='add'>+#define BIT_RXGCK_OFDMCCA_EN BIT(16)</div><div class='add'>+</div><div class='add'>+#define BIT_SHIFT_RXPSF_PKTLENTHR 13</div><div class='add'>+#define BIT_MASK_RXPSF_PKTLENTHR 0x7</div><div class='add'>+#define BIT_RXPSF_PKTLENTHR(x)                                                 \</div><div class='add'>+	(((x) &amp; BIT_MASK_RXPSF_PKTLENTHR) &lt;&lt; BIT_SHIFT_RXPSF_PKTLENTHR)</div><div class='add'>+#define BITS_RXPSF_PKTLENTHR                                                   \</div><div class='add'>+	(BIT_MASK_RXPSF_PKTLENTHR &lt;&lt; BIT_SHIFT_RXPSF_PKTLENTHR)</div><div class='add'>+#define BIT_CLEAR_RXPSF_PKTLENTHR(x) ((x) &amp; (~BITS_RXPSF_PKTLENTHR))</div><div class='add'>+#define BIT_SET_RXPSF_PKTLENTHR(x, v)                                          \</div><div class='add'>+	(BIT_CLEAR_RXPSF_PKTLENTHR(x) | BIT_RXPSF_PKTLENTHR(v))</div><div class='add'>+</div><div class='add'>+#define BIT_RXPSF_CTRLEN	BIT(12)</div><div class='add'>+#define BIT_RXPSF_VHTCHKEN	BIT(11)</div><div class='add'>+#define BIT_RXPSF_HTCHKEN	BIT(10)</div><div class='add'>+#define BIT_RXPSF_OFDMCHKEN	BIT(9)</div><div class='add'>+#define BIT_RXPSF_CCKCHKEN	BIT(8)</div><div class='add'>+#define BIT_RXPSF_OFDMRST	BIT(7)</div><div class='add'>+#define BIT_RXPSF_CCKRST	BIT(6)</div><div class='add'>+#define BIT_RXPSF_MHCHKEN	BIT(5)</div><div class='add'>+#define BIT_RXPSF_CONT_ERRCHKEN	BIT(4)</div><div class='add'>+#define BIT_RXPSF_ALL_ERRCHKEN	BIT(3)</div><div class='add'>+</div><div class='add'>+#define BIT_SHIFT_RXPSF_ERRTHR 0</div><div class='add'>+#define BIT_MASK_RXPSF_ERRTHR 0x7</div><div class='add'>+#define BIT_RXPSF_ERRTHR(x)                                                    \</div><div class='add'>+	(((x) &amp; BIT_MASK_RXPSF_ERRTHR) &lt;&lt; BIT_SHIFT_RXPSF_ERRTHR)</div><div class='add'>+#define BITS_RXPSF_ERRTHR (BIT_MASK_RXPSF_ERRTHR &lt;&lt; BIT_SHIFT_RXPSF_ERRTHR)</div><div class='add'>+#define BIT_CLEAR_RXPSF_ERRTHR(x) ((x) &amp; (~BITS_RXPSF_ERRTHR))</div><div class='add'>+#define BIT_GET_RXPSF_ERRTHR(x)                                                \</div><div class='add'>+	(((x) &gt;&gt; BIT_SHIFT_RXPSF_ERRTHR) &amp; BIT_MASK_RXPSF_ERRTHR)</div><div class='add'>+#define BIT_SET_RXPSF_ERRTHR(x, v)                                             \</div><div class='add'>+	(BIT_CLEAR_RXPSF_ERRTHR(x) | BIT_RXPSF_ERRTHR(v))</div><div class='add'>+</div><div class='add'>+#define REG_RXPSF_TYPE_CTRL	0x1614</div><div class='add'>+#define REG_GENERAL_OPTION	0x1664</div><div class='add'>+#define BIT_DUMMY_FCS_READY_MASK_EN BIT(9)</div><div class='add'>+</div><div class='add'>+#define REG_WL2LTECOEX_INDIRECT_ACCESS_CTRL_V1		0x1700</div><div class='add'>+#define REG_WL2LTECOEX_INDIRECT_ACCESS_WRITE_DATA_V1	0x1704</div><div class='add'>+#define REG_WL2LTECOEX_INDIRECT_ACCESS_READ_DATA_V1	0x1708</div><div class='add'>+#define LTECOEX_READY		BIT(29)</div><div class='add'>+#define LTECOEX_ACCESS_CTRL REG_WL2LTECOEX_INDIRECT_ACCESS_CTRL_V1</div><div class='add'>+#define LTECOEX_WRITE_DATA REG_WL2LTECOEX_INDIRECT_ACCESS_WRITE_DATA_V1</div><div class='add'>+#define LTECOEX_READ_DATA REG_WL2LTECOEX_INDIRECT_ACCESS_READ_DATA_V1</div><div class='add'>+</div><div class='add'>+#define RF_DTXLOK	0x08</div><div class='add'>+#define RF_CFGCH	0x18</div><div class='add'>+#define RF_LUTWA	0x33</div><div class='add'>+#define RF_LUTWD1	0x3e</div><div class='add'>+#define RF_LUTWD0	0x3f</div><div class='add'>+#define RF_XTALX2	0xb8</div><div class='add'>+#define RF_MALSEL	0xbe</div><div class='add'>+#define RF_LUTDBG	0xdf</div><div class='add'>+#define RF_LUTWE2	0xee</div><div class='add'>+#define RF_LUTWE	0xef</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c<br/>new file mode 100644<br/>index 000000000000..e7750a833a8e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/regd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/regd.c</a></div><div class='hunk'>@@ -0,0 +1,391 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+</div><div class='add'>+#define COUNTRY_CHPLAN_ENT(_alpha2, _chplan, _txpwr_regd) \</div><div class='add'>+	{.alpha2 = (_alpha2), \</div><div class='add'>+	 .chplan = (_chplan), \</div><div class='add'>+	 .txpwr_regd = (_txpwr_regd) \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/* If country code is not correctly defined in efuse,</div><div class='add'>+ * use worldwide country code and txpwr regd.</div><div class='add'>+ */</div><div class='add'>+static const struct rtw_regulatory rtw_defined_chplan =</div><div class='add'>+	COUNTRY_CHPLAN_ENT("00", RTW_CHPLAN_REALTEK_DEFINE, RTW_REGD_WW);</div><div class='add'>+</div><div class='add'>+static const struct rtw_regulatory all_chplan_map[] = {</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AD", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AF", RTW_CHPLAN_ETSI1_ETSI4, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AL", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AN", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AO", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AQ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AR", RTW_CHPLAN_FCC2_FCC7, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AS", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AT", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AU", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AW", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("AZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BB", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BD", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BF", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BH", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BJ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BN", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BO", RTW_CHPLAN_WORLD_FCC7, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BR", RTW_CHPLAN_FCC2_FCC1, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BS", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BW", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BY", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("BZ", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CA", RTW_CHPLAN_IC1_IC2, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CC", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CD", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CF", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CH", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CL", RTW_CHPLAN_WORLD_CHILE1, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CN", RTW_CHPLAN_WORLD_ETSI7, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CO", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CR", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CV", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CX", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CY", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("CZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("DE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("DJ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("DK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("DM", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("DO", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("DZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("EC", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("EE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("EG", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("EH", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ER", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ES", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ET", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("FI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("FJ", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("FK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("FM", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("FO", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("FR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GB", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GD", RTW_CHPLAN_FCC1_FCC7, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GF", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GH", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GL", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GN", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GP", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GQ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GS", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GT", RTW_CHPLAN_FCC2_FCC7, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GU", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GW", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("GY", RTW_CHPLAN_FCC1_NCC3, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("HK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("HM", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("HN", RTW_CHPLAN_WORLD_FCC5, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("HR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("HT", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("HU", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ID", RTW_CHPLAN_ETSI1_ETSI12, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IL", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IN", RTW_CHPLAN_WORLD_ETSI7, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IQ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IS", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("IT", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("JE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("JM", RTW_CHPLAN_WORLD_ETSI10, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("JO", RTW_CHPLAN_WORLD_ETSI8, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("JP", RTW_CHPLAN_MKK1_MKK1, RTW_REGD_MKK),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KE", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KH", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KN", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KR", RTW_CHPLAN_KCC1_KCC2, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KW", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KY", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("KZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LB", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LC", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LS", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LT", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LU", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LV", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("LY", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MA", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MC", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MD", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ME", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MF", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MH", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ML", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MN", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MO", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MP", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MQ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MS", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MT", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MU", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MV", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MW", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MX", RTW_CHPLAN_FCC2_FCC7, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MY", RTW_CHPLAN_WORLD_ETSI20, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("MZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NC", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NF", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NG", RTW_CHPLAN_WORLD_ETSI20, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NI", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NL", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NO", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NP", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NU", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("NZ", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("OM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PA", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PE", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PF", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PH", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PK", RTW_CHPLAN_WORLD_ETSI10, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PL", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PR", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PT", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PW", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("PY", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("QA", RTW_CHPLAN_WORLD_ETSI10, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("RE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("RO", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("RS", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("RU", RTW_CHPLAN_WORLD_ETSI14, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("RW", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SB", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SC", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SH", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SI", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SJ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SK", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SL", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SN", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SO", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SR", RTW_CHPLAN_FCC2_FCC17, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ST", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SV", RTW_CHPLAN_WORLD_FCC3, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SX", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("SZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TC", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TD", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TF", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TH", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TJ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TK", RTW_CHPLAN_WORLD_ACMA1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TN", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TO", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TR", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TT", RTW_CHPLAN_ETSI1_ETSI4, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TW", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("TZ", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("UA", RTW_CHPLAN_WORLD_ETSI3, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("UG", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("US", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("UY", RTW_CHPLAN_WORLD_FCC3, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("UZ", RTW_CHPLAN_WORLD_ETSI6, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("VA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("VC", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("VE", RTW_CHPLAN_WORLD_FCC3, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("VI", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("VN", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("VU", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("WF", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("WS", RTW_CHPLAN_FCC2_FCC11, RTW_REGD_FCC),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("YE", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("YT", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ZA", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ZM", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+	COUNTRY_CHPLAN_ENT("ZW", RTW_CHPLAN_WORLD_ETSI1, RTW_REGD_ETSI),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtw_regd_apply_beaconing_flags(struct wiphy *wiphy,</div><div class='add'>+					   enum nl80211_reg_initiator initiator)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct ieee80211_reg_rule *reg_rule;</div><div class='add'>+	struct ieee80211_channel *ch;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		if (!wiphy-&gt;bands[band])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sband = wiphy-&gt;bands[band];</div><div class='add'>+		for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+			ch = &amp;sband-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+			reg_rule = freq_reg_info(wiphy,</div><div class='add'>+						 MHZ_TO_KHZ(ch-&gt;center_freq));</div><div class='add'>+			if (IS_ERR(reg_rule))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ch-&gt;flags &amp;= ~IEEE80211_CHAN_DISABLED;</div><div class='add'>+</div><div class='add'>+			if (!(reg_rule-&gt;flags &amp; NL80211_RRF_NO_IR))</div><div class='add'>+				ch-&gt;flags &amp;= ~IEEE80211_CHAN_NO_IR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_regd_apply_hw_cap_flags(struct wiphy *wiphy)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_channel *ch;</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (efuse-&gt;hw_cap.bw &amp; BIT(RTW_CHANNEL_WIDTH_80))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	if (!sband)</div><div class='add'>+		goto out_5g;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+		ch-&gt;flags |= IEEE80211_CHAN_NO_80MHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_5g:</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	if (!sband)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+		ch-&gt;flags |= IEEE80211_CHAN_NO_80MHZ;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_regd_apply_world_flags(struct wiphy *wiphy,</div><div class='add'>+				       enum nl80211_reg_initiator initiator)</div><div class='add'>+{</div><div class='add'>+	rtw_regd_apply_beaconing_flags(wiphy, initiator);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtw_regulatory rtw_regd_find_reg_by_name(char *alpha2)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(all_chplan_map); i++) {</div><div class='add'>+		if (!memcmp(all_chplan_map[i].alpha2, alpha2, 2))</div><div class='add'>+			return all_chplan_map[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rtw_defined_chplan;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw_regd_notifier_apply(struct rtw_dev *rtwdev,</div><div class='add'>+				   struct wiphy *wiphy,</div><div class='add'>+				   struct regulatory_request *request)</div><div class='add'>+{</div><div class='add'>+	if (request-&gt;initiator == NL80211_REGDOM_SET_BY_USER)</div><div class='add'>+		return 0;</div><div class='add'>+	rtwdev-&gt;regd = rtw_regd_find_reg_by_name(request-&gt;alpha2);</div><div class='add'>+	rtw_regd_apply_world_flags(wiphy, request-&gt;initiator);</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'>+rtw_regd_init_wiphy(struct rtw_regulatory *reg, struct wiphy *wiphy,</div><div class='add'>+		    void (*reg_notifier)(struct wiphy *wiphy,</div><div class='add'>+					 struct regulatory_request *request))</div><div class='add'>+{</div><div class='add'>+	wiphy-&gt;reg_notifier = reg_notifier;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;regulatory_flags &amp;= ~REGULATORY_CUSTOM_REG;</div><div class='add'>+	wiphy-&gt;regulatory_flags &amp;= ~REGULATORY_STRICT_REG;</div><div class='add'>+	wiphy-&gt;regulatory_flags &amp;= ~REGULATORY_DISABLE_BEACON_HINTS;</div><div class='add'>+</div><div class='add'>+	rtw_regd_apply_hw_cap_flags(wiphy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtw_regd_init(struct rtw_dev *rtwdev,</div><div class='add'>+		  void (*reg_notifier)(struct wiphy *wiphy,</div><div class='add'>+				       struct regulatory_request *request))</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = rtwdev-&gt;hw-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+	if (!wiphy)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rtwdev-&gt;regd = rtw_regd_find_reg_by_name(rtwdev-&gt;efuse.country_code);</div><div class='add'>+	rtw_regd_init_wiphy(&amp;rtwdev-&gt;regd, wiphy, reg_notifier);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct rtw_dev *rtwdev = hw-&gt;priv;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+</div><div class='add'>+	rtw_regd_notifier_apply(rtwdev, wiphy, request);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_REGD,</div><div class='add'>+		"get alpha2 %c%c from initiator %d, mapping to chplan 0x%x, txregd %d\n",</div><div class='add'>+		request-&gt;alpha2[0], request-&gt;alpha2[1], request-&gt;initiator,</div><div class='add'>+		rtwdev-&gt;regd.chplan, rtwdev-&gt;regd.txpwr_regd);</div><div class='add'>+</div><div class='add'>+	rtw_phy_set_tx_power_level(rtwdev, hal-&gt;current_channel);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/regd.h b/drivers/net/wireless/realtek/rtw88/regd.h<br/>new file mode 100644<br/>index 000000000000..7784bb6d3ba7<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/regd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/regd.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_REGD_H_</div><div class='add'>+#define __RTW_REGD_H_</div><div class='add'>+</div><div class='add'>+#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR</div><div class='add'>+#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR</div><div class='add'>+enum rtw_chplan_id {</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI1 = 0x26,</div><div class='add'>+	RTW_CHPLAN_MKK1_MKK1 = 0x27,</div><div class='add'>+	RTW_CHPLAN_IC1_IC2 = 0x2B,</div><div class='add'>+	RTW_CHPLAN_WORLD_CHILE1 = 0x2D,</div><div class='add'>+	RTW_CHPLAN_WORLD_FCC3 = 0x30,</div><div class='add'>+	RTW_CHPLAN_WORLD_FCC5 = 0x32,</div><div class='add'>+	RTW_CHPLAN_FCC1_FCC7 = 0x34,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI3 = 0x36,</div><div class='add'>+	RTW_CHPLAN_ETSI1_ETSI12 = 0x3D,</div><div class='add'>+	RTW_CHPLAN_KCC1_KCC2 = 0x3E,</div><div class='add'>+	RTW_CHPLAN_ETSI1_ETSI4 = 0x42,</div><div class='add'>+	RTW_CHPLAN_FCC1_NCC3 = 0x44,</div><div class='add'>+	RTW_CHPLAN_WORLD_ACMA1 = 0x45,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI6 = 0x47,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI7 = 0x48,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI8 = 0x49,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI10 = 0x51,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI14 = 0x59,</div><div class='add'>+	RTW_CHPLAN_FCC2_FCC7 = 0x61,</div><div class='add'>+	RTW_CHPLAN_FCC2_FCC1 = 0x62,</div><div class='add'>+	RTW_CHPLAN_WORLD_FCC7 = 0x73,</div><div class='add'>+	RTW_CHPLAN_FCC2_FCC17 = 0x74,</div><div class='add'>+	RTW_CHPLAN_WORLD_ETSI20 = 0x75,</div><div class='add'>+	RTW_CHPLAN_FCC2_FCC11 = 0x76,</div><div class='add'>+	RTW_CHPLAN_REALTEK_DEFINE = 0x7f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct country_code_to_enum_rd {</div><div class='add'>+	u16 countrycode;</div><div class='add'>+	const char *iso_name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum country_code_type {</div><div class='add'>+	COUNTRY_CODE_FCC = 0,</div><div class='add'>+	COUNTRY_CODE_IC = 1,</div><div class='add'>+	COUNTRY_CODE_ETSI = 2,</div><div class='add'>+	COUNTRY_CODE_SPAIN = 3,</div><div class='add'>+	COUNTRY_CODE_FRANCE = 4,</div><div class='add'>+	COUNTRY_CODE_MKK = 5,</div><div class='add'>+	COUNTRY_CODE_MKK1 = 6,</div><div class='add'>+	COUNTRY_CODE_ISRAEL = 7,</div><div class='add'>+	COUNTRY_CODE_TELEC = 8,</div><div class='add'>+	COUNTRY_CODE_MIC = 9,</div><div class='add'>+	COUNTRY_CODE_GLOBAL_DOMAIN = 10,</div><div class='add'>+	COUNTRY_CODE_WORLD_WIDE_13 = 11,</div><div class='add'>+	COUNTRY_CODE_TELEC_NETGEAR = 12,</div><div class='add'>+	COUNTRY_CODE_WORLD_WIDE_13_5G_ALL = 13,</div><div class='add'>+</div><div class='add'>+	/* new channel plan above this */</div><div class='add'>+	COUNTRY_CODE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int rtw_regd_init(struct rtw_dev *rtwdev,</div><div class='add'>+		  void (*reg_notifier)(struct wiphy *wiphy,</div><div class='add'>+				       struct regulatory_request *request));</div><div class='add'>+void rtw_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c<br/>new file mode 100644<br/>index 000000000000..1172f6c0605b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822b.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822b.c</a></div><div class='hunk'>@@ -0,0 +1,1594 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "rtw8822b.h"</div><div class='add'>+#include "rtw8822b_table.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static void rtw8822b_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+				     u8 rx_path, bool is_tx2_path);</div><div class='add'>+</div><div class='add'>+static void rtw8822be_efuse_parsing(struct rtw_efuse *efuse,</div><div class='add'>+				    struct rtw8822b_efuse *map)</div><div class='add'>+{</div><div class='add'>+	ether_addr_copy(efuse-&gt;addr, map-&gt;e.mac_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	struct rtw8822b_efuse *map;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	map = (struct rtw8822b_efuse *)log_map;</div><div class='add'>+</div><div class='add'>+	efuse-&gt;rfe_option = map-&gt;rfe_option;</div><div class='add'>+	efuse-&gt;crystal_cap = map-&gt;xtal_k;</div><div class='add'>+	efuse-&gt;pa_type_2g = map-&gt;pa_type;</div><div class='add'>+	efuse-&gt;pa_type_5g = map-&gt;pa_type;</div><div class='add'>+	efuse-&gt;lna_type_2g = map-&gt;lna_type_2g[0];</div><div class='add'>+	efuse-&gt;lna_type_5g = map-&gt;lna_type_5g[0];</div><div class='add'>+	efuse-&gt;channel_plan = map-&gt;channel_plan;</div><div class='add'>+	efuse-&gt;country_code[0] = map-&gt;country_code[0];</div><div class='add'>+	efuse-&gt;country_code[1] = map-&gt;country_code[1];</div><div class='add'>+	efuse-&gt;bt_setting = map-&gt;rf_bt_setting;</div><div class='add'>+	efuse-&gt;regd = map-&gt;rf_board_option &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		efuse-&gt;txpwr_idx_table[i] = map-&gt;txpwr_idx_table[i];</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		rtw8822be_efuse_parsing(efuse, map);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* unsupported now */</div><div class='add'>+		return -ENOTSUPP;</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 rtw8822b_phy_rfe_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	/* chip top mux */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x64, BIT(29) | BIT(28), 0x3);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x4c, BIT(26) | BIT(25), 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x40, BIT(2), 0x1);</div><div class='add'>+</div><div class='add'>+	/* from s0 or s1 */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1990, 0x3f, 0x30);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1990, (BIT(11) | BIT(10)), 0x3);</div><div class='add'>+</div><div class='add'>+	/* input or output */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x974, 0x3f, 0x3f);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x974, (BIT(11) | BIT(10)), 0x3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_phy_set_param(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 crystal_cap;</div><div class='add'>+	bool is_tx2_path;</div><div class='add'>+</div><div class='add'>+	/* power on BB/RF domain */</div><div class='add'>+	rtw_write8_set(rtwdev, REG_SYS_FUNC_EN,</div><div class='add'>+		       BIT_FEN_BB_RSTB | BIT_FEN_BB_GLB_RST);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_RF_CTRL,</div><div class='add'>+		       BIT_RF_EN | BIT_RF_RSTB | BIT_RF_SDM_RSTB);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_WLRF1, BIT_WLRF1_BBRF_EN);</div><div class='add'>+</div><div class='add'>+	/* pre init before header files config */</div><div class='add'>+	rtw_write32_clr(rtwdev, REG_RXPSEL, BIT_RX_PSEL_RST);</div><div class='add'>+</div><div class='add'>+	rtw_phy_load_tables(rtwdev);</div><div class='add'>+</div><div class='add'>+	crystal_cap = rtwdev-&gt;efuse.crystal_cap &amp; 0x3F;</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x24, 0x7e000000, crystal_cap);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x28, 0x7e, crystal_cap);</div><div class='add'>+</div><div class='add'>+	/* post init after header files config */</div><div class='add'>+	rtw_write32_set(rtwdev, REG_RXPSEL, BIT_RX_PSEL_RST);</div><div class='add'>+</div><div class='add'>+	is_tx2_path = false;</div><div class='add'>+	rtw8822b_config_trx_mode(rtwdev, hal-&gt;antenna_tx, hal-&gt;antenna_rx,</div><div class='add'>+				 is_tx2_path);</div><div class='add'>+	rtw_phy_init(rtwdev);</div><div class='add'>+</div><div class='add'>+	rtw8822b_phy_rfe_init(rtwdev);</div><div class='add'>+</div><div class='add'>+	/* wifi path controller */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x70, 0x4000000, 1);</div><div class='add'>+	/* BB control */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x4c, 0x01800000, 0x2);</div><div class='add'>+	/* antenna mux switch */</div><div class='add'>+	rtw_write8(rtwdev, 0x974, 0xff);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1990, 0x300, 0);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0xcbc, 0x80000, 0x0);</div><div class='add'>+	/* SW control */</div><div class='add'>+	rtw_write8(rtwdev, 0xcb4, 0x77);</div><div class='add'>+	/* switch to WL side controller and gnt_wl gnt_bt debug signal */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x70, 0xff000000, 0x0e);</div><div class='add'>+	/* gnt_wl = 1, gnt_bt = 0 */</div><div class='add'>+	rtw_write32(rtwdev, 0x1704, 0x7700);</div><div class='add'>+	rtw_write32(rtwdev, 0x1700, 0xc00f0038);</div><div class='add'>+	/* switch for WL 2G */</div><div class='add'>+	rtw_write8(rtwdev, 0xcbd, 0x2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WLAN_SLOT_TIME		0x09</div><div class='add'>+#define WLAN_PIFS_TIME		0x19</div><div class='add'>+#define WLAN_SIFS_CCK_CONT_TX	0xA</div><div class='add'>+#define WLAN_SIFS_OFDM_CONT_TX	0xE</div><div class='add'>+#define WLAN_SIFS_CCK_TRX	0x10</div><div class='add'>+#define WLAN_SIFS_OFDM_TRX	0x10</div><div class='add'>+#define WLAN_VO_TXOP_LIMIT	0x186 /* unit : 32us */</div><div class='add'>+#define WLAN_VI_TXOP_LIMIT	0x3BC /* unit : 32us */</div><div class='add'>+#define WLAN_RDG_NAV		0x05</div><div class='add'>+#define WLAN_TXOP_NAV		0x1B</div><div class='add'>+#define WLAN_CCK_RX_TSF		0x30</div><div class='add'>+#define WLAN_OFDM_RX_TSF	0x30</div><div class='add'>+#define WLAN_TBTT_PROHIBIT	0x04 /* unit : 32us */</div><div class='add'>+#define WLAN_TBTT_HOLD_TIME	0x064 /* unit : 32us */</div><div class='add'>+#define WLAN_DRV_EARLY_INT	0x04</div><div class='add'>+#define WLAN_BCN_DMA_TIME	0x02</div><div class='add'>+</div><div class='add'>+#define WLAN_RX_FILTER0		0x0FFFFFFF</div><div class='add'>+#define WLAN_RX_FILTER2		0xFFFF</div><div class='add'>+#define WLAN_RCR_CFG		0xE400220E</div><div class='add'>+#define WLAN_RXPKT_MAX_SZ	12288</div><div class='add'>+#define WLAN_RXPKT_MAX_SZ_512	(WLAN_RXPKT_MAX_SZ &gt;&gt; 9)</div><div class='add'>+</div><div class='add'>+#define WLAN_AMPDU_MAX_TIME		0x70</div><div class='add'>+#define WLAN_RTS_LEN_TH			0xFF</div><div class='add'>+#define WLAN_RTS_TX_TIME_TH		0x08</div><div class='add'>+#define WLAN_MAX_AGG_PKT_LIMIT		0x20</div><div class='add'>+#define WLAN_RTS_MAX_AGG_PKT_LIMIT	0x20</div><div class='add'>+#define FAST_EDCA_VO_TH		0x06</div><div class='add'>+#define FAST_EDCA_VI_TH		0x06</div><div class='add'>+#define FAST_EDCA_BE_TH		0x06</div><div class='add'>+#define FAST_EDCA_BK_TH		0x06</div><div class='add'>+#define WLAN_BAR_RETRY_LIMIT		0x01</div><div class='add'>+#define WLAN_RA_TRY_RATE_AGG_LIMIT	0x08</div><div class='add'>+</div><div class='add'>+#define WLAN_TX_FUNC_CFG1		0x30</div><div class='add'>+#define WLAN_TX_FUNC_CFG2		0x30</div><div class='add'>+#define WLAN_MAC_OPT_NORM_FUNC1		0x98</div><div class='add'>+#define WLAN_MAC_OPT_LB_FUNC1		0x80</div><div class='add'>+#define WLAN_MAC_OPT_FUNC2		0x30810041</div><div class='add'>+</div><div class='add'>+#define WLAN_SIFS_CFG	(WLAN_SIFS_CCK_CONT_TX | \</div><div class='add'>+			(WLAN_SIFS_OFDM_CONT_TX &lt;&lt; BIT_SHIFT_SIFS_OFDM_CTX) | \</div><div class='add'>+			(WLAN_SIFS_CCK_TRX &lt;&lt; BIT_SHIFT_SIFS_CCK_TRX) | \</div><div class='add'>+			(WLAN_SIFS_OFDM_TRX &lt;&lt; BIT_SHIFT_SIFS_OFDM_TRX))</div><div class='add'>+</div><div class='add'>+#define WLAN_TBTT_TIME	(WLAN_TBTT_PROHIBIT |\</div><div class='add'>+			(WLAN_TBTT_HOLD_TIME &lt;&lt; BIT_SHIFT_TBTT_HOLD_TIME_AP))</div><div class='add'>+</div><div class='add'>+#define WLAN_NAV_CFG		(WLAN_RDG_NAV | (WLAN_TXOP_NAV &lt;&lt; 16))</div><div class='add'>+#define WLAN_RX_TSF_CFG		(WLAN_CCK_RX_TSF | (WLAN_OFDM_RX_TSF) &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+static int rtw8822b_mac_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u32 value32;</div><div class='add'>+</div><div class='add'>+	/* protocol configuration */</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_SW_AMPDU_BURST_MODE_CTRL, BIT_PRE_TX_CMD);</div><div class='add'>+	rtw_write8(rtwdev, REG_AMPDU_MAX_TIME_V1, WLAN_AMPDU_MAX_TIME);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_TX_HANG_CTRL, BIT_EN_EOF_V1);</div><div class='add'>+	value32 = WLAN_RTS_LEN_TH | (WLAN_RTS_TX_TIME_TH &lt;&lt; 8) |</div><div class='add'>+		  (WLAN_MAX_AGG_PKT_LIMIT &lt;&lt; 16) |</div><div class='add'>+		  (WLAN_RTS_MAX_AGG_PKT_LIMIT &lt;&lt; 24);</div><div class='add'>+	rtw_write32(rtwdev, REG_PROT_MODE_CTRL, value32);</div><div class='add'>+	rtw_write16(rtwdev, REG_BAR_MODE_CTRL + 2,</div><div class='add'>+		    WLAN_BAR_RETRY_LIMIT | WLAN_RA_TRY_RATE_AGG_LIMIT &lt;&lt; 8);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_VOVI_SETTING, FAST_EDCA_VO_TH);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_VOVI_SETTING + 2, FAST_EDCA_VI_TH);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_BEBK_SETTING, FAST_EDCA_BE_TH);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_BEBK_SETTING + 2, FAST_EDCA_BK_TH);</div><div class='add'>+	/* EDCA configuration */</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_TIMER0_SRC_SEL, BIT_TSFT_SEL_TIMER0);</div><div class='add'>+	rtw_write16(rtwdev, REG_TXPAUSE, 0x0000);</div><div class='add'>+	rtw_write8(rtwdev, REG_SLOT, WLAN_SLOT_TIME);</div><div class='add'>+	rtw_write8(rtwdev, REG_PIFS, WLAN_PIFS_TIME);</div><div class='add'>+	rtw_write32(rtwdev, REG_SIFS, WLAN_SIFS_CFG);</div><div class='add'>+	rtw_write16(rtwdev, REG_EDCA_VO_PARAM + 2, WLAN_VO_TXOP_LIMIT);</div><div class='add'>+	rtw_write16(rtwdev, REG_EDCA_VI_PARAM + 2, WLAN_VI_TXOP_LIMIT);</div><div class='add'>+	rtw_write32(rtwdev, REG_RD_NAV_NXT, WLAN_NAV_CFG);</div><div class='add'>+	rtw_write16(rtwdev, REG_RXTSF_OFFSET_CCK, WLAN_RX_TSF_CFG);</div><div class='add'>+	/* Set beacon cotnrol - enable TSF and other related functions */</div><div class='add'>+	rtw_write8_set(rtwdev, REG_BCN_CTRL, BIT_EN_BCN_FUNCTION);</div><div class='add'>+	/* Set send beacon related registers */</div><div class='add'>+	rtw_write32(rtwdev, REG_TBTT_PROHIBIT, WLAN_TBTT_TIME);</div><div class='add'>+	rtw_write8(rtwdev, REG_DRVERLYINT, WLAN_DRV_EARLY_INT);</div><div class='add'>+	rtw_write8(rtwdev, REG_BCNDMATIM, WLAN_BCN_DMA_TIME);</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_TX_PTCL_CTRL + 1, BIT_SIFS_BK_EN &gt;&gt; 8);</div><div class='add'>+	/* WMAC configuration */</div><div class='add'>+	rtw_write32(rtwdev, REG_RXFLTMAP0, WLAN_RX_FILTER0);</div><div class='add'>+	rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2);</div><div class='add'>+	rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG);</div><div class='add'>+	rtw_write8(rtwdev, REG_RX_PKT_LIMIT, WLAN_RXPKT_MAX_SZ_512);</div><div class='add'>+	rtw_write8(rtwdev, REG_TCR + 2, WLAN_TX_FUNC_CFG2);</div><div class='add'>+	rtw_write8(rtwdev, REG_TCR + 1, WLAN_TX_FUNC_CFG1);</div><div class='add'>+	rtw_write32(rtwdev, REG_WMAC_OPTION_FUNCTION + 8, WLAN_MAC_OPT_FUNC2);</div><div class='add'>+	rtw_write8(rtwdev, REG_WMAC_OPTION_FUNCTION + 4, WLAN_MAC_OPT_NORM_FUNC1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel_rfe_efem(struct rtw_dev *rtwdev, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	bool is_channel_2g = (channel &lt;= 14) ? true : false;</div><div class='add'>+</div><div class='add'>+	if (is_channel_2g) {</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL0, 0xffffff, 0x705770);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL8, MASKBYTE1, 0x57);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFECTL, BIT(4), 0);</div><div class='add'>+	} else {</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL0, 0xffffff, 0x177517);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL8, MASKBYTE1, 0x75);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFECTL, BIT(5), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write32s_mask(rtwdev, REG_RFEINV, BIT(11) | BIT(10) | 0x3f, 0x0);</div><div class='add'>+</div><div class='add'>+	if (hal-&gt;antenna_rx == BB_PATH_AB ||</div><div class='add'>+	    hal-&gt;antenna_tx == BB_PATH_AB) {</div><div class='add'>+		/* 2TX or 2RX */</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa501);</div><div class='add'>+	} else if (hal-&gt;antenna_rx == hal-&gt;antenna_tx) {</div><div class='add'>+		/* TXA+RXA or TXB+RXB */</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa500);</div><div class='add'>+	} else {</div><div class='add'>+		/* TXB+RXA or TXA+RXB */</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa005);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel_rfe_ifem(struct rtw_dev *rtwdev, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	bool is_channel_2g = (channel &lt;= 14) ? true : false;</div><div class='add'>+</div><div class='add'>+	if (is_channel_2g) {</div><div class='add'>+		/* signal source */</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL0, 0xffffff, 0x745774);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL8, MASKBYTE1, 0x57);</div><div class='add'>+	} else {</div><div class='add'>+		/* signal source */</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL0, 0xffffff, 0x477547);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_RFESEL8, MASKBYTE1, 0x75);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write32s_mask(rtwdev, REG_RFEINV, BIT(11) | BIT(10) | 0x3f, 0x0);</div><div class='add'>+</div><div class='add'>+	if (is_channel_2g) {</div><div class='add'>+		if (hal-&gt;antenna_rx == BB_PATH_AB ||</div><div class='add'>+		    hal-&gt;antenna_tx == BB_PATH_AB) {</div><div class='add'>+			/* 2TX or 2RX */</div><div class='add'>+			rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa501);</div><div class='add'>+		} else if (hal-&gt;antenna_rx == hal-&gt;antenna_tx) {</div><div class='add'>+			/* TXA+RXA or TXB+RXB */</div><div class='add'>+			rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa500);</div><div class='add'>+		} else {</div><div class='add'>+			/* TXB+RXA or TXA+RXB */</div><div class='add'>+			rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa005);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TRSW, MASKLWORD, 0xa5a5);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CCUT_IDX_1R_2G,</div><div class='add'>+	CCUT_IDX_2R_2G,</div><div class='add'>+	CCUT_IDX_1R_5G,</div><div class='add'>+	CCUT_IDX_2R_5G,</div><div class='add'>+	CCUT_IDX_NR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cca_ccut {</div><div class='add'>+	u32 reg82c[CCUT_IDX_NR];</div><div class='add'>+	u32 reg830[CCUT_IDX_NR];</div><div class='add'>+	u32 reg838[CCUT_IDX_NR];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cca_ccut cca_ifem_ccut = {</div><div class='add'>+	{0x75C97010, 0x75C97010, 0x75C97010, 0x75C97010}, /*Reg82C*/</div><div class='add'>+	{0x79a0eaaa, 0x79A0EAAC, 0x79a0eaaa, 0x79a0eaaa}, /*Reg830*/</div><div class='add'>+	{0x87765541, 0x87746341, 0x87765541, 0x87746341}, /*Reg838*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cca_ccut cca_efem_ccut = {</div><div class='add'>+	{0x75B86010, 0x75B76010, 0x75B86010, 0x75B76010}, /*Reg82C*/</div><div class='add'>+	{0x79A0EAA8, 0x79A0EAAC, 0x79A0EAA8, 0x79a0eaaa}, /*Reg830*/</div><div class='add'>+	{0x87766451, 0x87766431, 0x87766451, 0x87766431}, /*Reg838*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cca_ccut cca_ifem_ccut_ext = {</div><div class='add'>+	{0x75da8010, 0x75da8010, 0x75da8010, 0x75da8010}, /*Reg82C*/</div><div class='add'>+	{0x79a0eaaa, 0x97A0EAAC, 0x79a0eaaa, 0x79a0eaaa}, /*Reg830*/</div><div class='add'>+	{0x87765541, 0x86666341, 0x87765561, 0x86666361}, /*Reg838*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtw8822b_get_cca_val(const struct cca_ccut *cca_ccut, u8 col,</div><div class='add'>+				 u32 *reg82c, u32 *reg830, u32 *reg838)</div><div class='add'>+{</div><div class='add'>+	*reg82c = cca_ccut-&gt;reg82c[col];</div><div class='add'>+	*reg830 = cca_ccut-&gt;reg830[col];</div><div class='add'>+	*reg838 = cca_ccut-&gt;reg838[col];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtw8822b_rfe_info {</div><div class='add'>+	const struct cca_ccut *cca_ccut_2g;</div><div class='add'>+	const struct cca_ccut *cca_ccut_5g;</div><div class='add'>+	enum rtw_rfe_fem fem;</div><div class='add'>+	bool ifem_ext;</div><div class='add'>+	void (*rtw_set_channel_rfe)(struct rtw_dev *rtwdev, u8 channel);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define I2GE5G_CCUT(set_ch) {						\</div><div class='add'>+	.cca_ccut_2g = &amp;cca_ifem_ccut,					\</div><div class='add'>+	.cca_ccut_5g = &amp;cca_efem_ccut,					\</div><div class='add'>+	.fem = RTW_RFE_IFEM2G_EFEM5G,					\</div><div class='add'>+	.ifem_ext = false,						\</div><div class='add'>+	.rtw_set_channel_rfe = &amp;rtw8822b_set_channel_rfe_ ## set_ch,	\</div><div class='add'>+	}</div><div class='add'>+#define IFEM_EXT_CCUT(set_ch) {						\</div><div class='add'>+	.cca_ccut_2g = &amp;cca_ifem_ccut_ext,				\</div><div class='add'>+	.cca_ccut_5g = &amp;cca_ifem_ccut_ext,				\</div><div class='add'>+	.fem = RTW_RFE_IFEM,						\</div><div class='add'>+	.ifem_ext = true,						\</div><div class='add'>+	.rtw_set_channel_rfe = &amp;rtw8822b_set_channel_rfe_ ## set_ch,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct rtw8822b_rfe_info rtw8822b_rfe_info[] = {</div><div class='add'>+	[2] = I2GE5G_CCUT(efem),</div><div class='add'>+	[5] = IFEM_EXT_CCUT(ifem),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel_cca(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+				     const struct rtw8822b_rfe_info *rfe_info)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	const struct cca_ccut *cca_ccut;</div><div class='add'>+	u8 col;</div><div class='add'>+	u32 reg82c, reg830, reg838;</div><div class='add'>+	bool is_efem_cca = false, is_ifem_cca = false, is_rfe_type = false;</div><div class='add'>+</div><div class='add'>+	if (channel &lt;= 14) {</div><div class='add'>+		cca_ccut = rfe_info-&gt;cca_ccut_2g;</div><div class='add'>+</div><div class='add'>+		if (hal-&gt;antenna_rx == BB_PATH_A ||</div><div class='add'>+		    hal-&gt;antenna_rx == BB_PATH_B)</div><div class='add'>+			col = CCUT_IDX_1R_2G;</div><div class='add'>+		else</div><div class='add'>+			col = CCUT_IDX_2R_2G;</div><div class='add'>+	} else {</div><div class='add'>+		cca_ccut = rfe_info-&gt;cca_ccut_5g;</div><div class='add'>+</div><div class='add'>+		if (hal-&gt;antenna_rx == BB_PATH_A ||</div><div class='add'>+		    hal-&gt;antenna_rx == BB_PATH_B)</div><div class='add'>+			col = CCUT_IDX_1R_5G;</div><div class='add'>+		else</div><div class='add'>+			col = CCUT_IDX_2R_5G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw8822b_get_cca_val(cca_ccut, col, &amp;reg82c, &amp;reg830, &amp;reg838);</div><div class='add'>+</div><div class='add'>+	switch (rfe_info-&gt;fem) {</div><div class='add'>+	case RTW_RFE_IFEM:</div><div class='add'>+	default:</div><div class='add'>+		is_ifem_cca = true;</div><div class='add'>+		if (rfe_info-&gt;ifem_ext)</div><div class='add'>+			is_rfe_type = true;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_RFE_EFEM:</div><div class='add'>+		is_efem_cca = true;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_RFE_IFEM2G_EFEM5G:</div><div class='add'>+		if (channel &lt;= 14)</div><div class='add'>+			is_ifem_cca = true;</div><div class='add'>+		else</div><div class='add'>+			is_efem_cca = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_ifem_cca) {</div><div class='add'>+		if ((hal-&gt;cut_version == RTW_CHIP_VER_CUT_B &amp;&amp;</div><div class='add'>+		     (col == CCUT_IDX_2R_2G || col == CCUT_IDX_2R_5G) &amp;&amp;</div><div class='add'>+		     bw == RTW_CHANNEL_WIDTH_40) ||</div><div class='add'>+		    (!is_rfe_type &amp;&amp; col == CCUT_IDX_2R_5G &amp;&amp;</div><div class='add'>+		     bw == RTW_CHANNEL_WIDTH_40) ||</div><div class='add'>+		    (efuse-&gt;rfe_option == 5 &amp;&amp; col == CCUT_IDX_2R_5G))</div><div class='add'>+			reg830 = 0x79a0ea28;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CCASEL, MASKDWORD, reg82c);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_PDMFTH, MASKDWORD, reg830);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CCA2ND, MASKDWORD, reg838);</div><div class='add'>+</div><div class='add'>+	if (is_efem_cca &amp;&amp; !(hal-&gt;cut_version == RTW_CHIP_VER_CUT_B))</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_L1WT, MASKDWORD, 0x9194b2b9);</div><div class='add'>+</div><div class='add'>+	if (bw == RTW_CHANNEL_WIDTH_20 &amp;&amp;</div><div class='add'>+	    ((channel &gt;= 52 &amp;&amp; channel &lt;= 64) ||</div><div class='add'>+	     (channel &gt;= 100 &amp;&amp; channel &lt;= 144)))</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCA2ND, 0xf0, 0x4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 low_band[15] = {0x7, 0x6, 0x6, 0x5, 0x0, 0x0, 0x7, 0xff, 0x6,</div><div class='add'>+				0x5, 0x0, 0x0, 0x7, 0x6, 0x6};</div><div class='add'>+static const u8 middle_band[23] = {0x6, 0x5, 0x0, 0x0, 0x7, 0x6, 0x6, 0xff, 0x0,</div><div class='add'>+				   0x0, 0x7, 0x6, 0x6, 0x5, 0x0, 0xff, 0x7, 0x6,</div><div class='add'>+				   0x6, 0x5, 0x0, 0x0, 0x7};</div><div class='add'>+static const u8 high_band[15] = {0x5, 0x5, 0x0, 0x7, 0x7, 0x6, 0x5, 0xff, 0x0,</div><div class='add'>+				 0x7, 0x7, 0x6, 0x5, 0x5, 0x0};</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel_rf(struct rtw_dev *rtwdev, u8 channel, u8 bw)</div><div class='add'>+{</div><div class='add'>+#define RF18_BAND_MASK		(BIT(16) | BIT(9) | BIT(8))</div><div class='add'>+#define RF18_BAND_2G		(0)</div><div class='add'>+#define RF18_BAND_5G		(BIT(16) | BIT(8))</div><div class='add'>+#define RF18_CHANNEL_MASK	(MASKBYTE0)</div><div class='add'>+#define RF18_RFSI_MASK		(BIT(18) | BIT(17))</div><div class='add'>+#define RF18_RFSI_GE_CH80	(BIT(17))</div><div class='add'>+#define RF18_RFSI_GT_CH144	(BIT(18))</div><div class='add'>+#define RF18_BW_MASK		(BIT(11) | BIT(10))</div><div class='add'>+#define RF18_BW_20M		(BIT(11) | BIT(10))</div><div class='add'>+#define RF18_BW_40M		(BIT(11))</div><div class='add'>+#define RF18_BW_80M		(BIT(10))</div><div class='add'>+#define RFBE_MASK		(BIT(17) | BIT(16) | BIT(15))</div><div class='add'>+</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u32 rf_reg18, rf_reg_be;</div><div class='add'>+</div><div class='add'>+	rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);</div><div class='add'>+</div><div class='add'>+	rf_reg18 &amp;= ~(RF18_BAND_MASK | RF18_CHANNEL_MASK | RF18_RFSI_MASK |</div><div class='add'>+		      RF18_BW_MASK);</div><div class='add'>+</div><div class='add'>+	rf_reg18 |= (channel &lt;= 14 ? RF18_BAND_2G : RF18_BAND_5G);</div><div class='add'>+	rf_reg18 |= (channel &amp; RF18_CHANNEL_MASK);</div><div class='add'>+	if (channel &gt; 144)</div><div class='add'>+		rf_reg18 |= RF18_RFSI_GT_CH144;</div><div class='add'>+	else if (channel &gt;= 80)</div><div class='add'>+		rf_reg18 |= RF18_RFSI_GE_CH80;</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case RTW_CHANNEL_WIDTH_5:</div><div class='add'>+	case RTW_CHANNEL_WIDTH_10:</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		rf_reg18 |= RF18_BW_20M;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		rf_reg18 |= RF18_BW_40M;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_80:</div><div class='add'>+		rf_reg18 |= RF18_BW_80M;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (channel &lt;= 14)</div><div class='add'>+		rf_reg_be = 0x0;</div><div class='add'>+	else if (channel &gt;= 36 &amp;&amp; channel &lt;= 64)</div><div class='add'>+		rf_reg_be = low_band[(channel - 36) &gt;&gt; 1];</div><div class='add'>+	else if (channel &gt;= 100 &amp;&amp; channel &lt;= 144)</div><div class='add'>+		rf_reg_be = middle_band[(channel - 100) &gt;&gt; 1];</div><div class='add'>+	else if (channel &gt;= 149 &amp;&amp; channel &lt;= 177)</div><div class='add'>+		rf_reg_be = high_band[(channel - 149) &gt;&gt; 1];</div><div class='add'>+	else</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_MALSEL, RFBE_MASK, rf_reg_be);</div><div class='add'>+</div><div class='add'>+	/* need to set 0xdf[18]=1 before writing RF18 when channel 144 */</div><div class='add'>+	if (channel == 144)</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTDBG, BIT(18), 0x1);</div><div class='add'>+	else</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTDBG, BIT(18), 0x0);</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK, rf_reg18);</div><div class='add'>+	if (hal-&gt;rf_type &gt; RF_1T1R)</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_B, 0x18, RFREG_MASK, rf_reg18);</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_XTALX2, BIT(19), 0);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_XTALX2, BIT(19), 1);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_toggle_igi(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u32 igi;</div><div class='add'>+</div><div class='add'>+	igi = rtw_read32_mask(rtwdev, REG_RXIGI_A, 0x7f);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI_A, 0x7f, igi - 2);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI_A, 0x7f, igi);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI_B, 0x7f, igi - 2);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI_B, 0x7f, igi);</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXPSEL, MASKBYTE0, 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXPSEL, MASKBYTE0,</div><div class='add'>+			 hal-&gt;antenna_rx | (hal-&gt;antenna_rx &lt;&lt; 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel_rxdfir(struct rtw_dev *rtwdev, u8 bw)</div><div class='add'>+{</div><div class='add'>+	if (bw == RTW_CHANNEL_WIDTH_40) {</div><div class='add'>+		/* RX DFIR for BW40 */</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACBB0, BIT(29) | BIT(28), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACBBRXFIR, BIT(29) | BIT(28), 0x0);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TXDFIR, BIT(31), 0x0);</div><div class='add'>+	} else if (bw == RTW_CHANNEL_WIDTH_80) {</div><div class='add'>+		/* RX DFIR for BW80 */</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACBB0, BIT(29) | BIT(28), 0x2);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACBBRXFIR, BIT(29) | BIT(28), 0x1);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TXDFIR, BIT(31), 0x0);</div><div class='add'>+	} else {</div><div class='add'>+		/* RX DFIR for BW20, BW10 and BW5*/</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACBB0, BIT(29) | BIT(28), 0x2);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACBBRXFIR, BIT(29) | BIT(28), 0x2);</div><div class='add'>+		rtw_write32s_mask(rtwdev, REG_TXDFIR, BIT(31), 0x1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+				    u8 primary_ch_idx)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u8 rfe_option = efuse-&gt;rfe_option;</div><div class='add'>+	u32 val32;</div><div class='add'>+</div><div class='add'>+	if (channel &lt;= 14) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXPSEL, BIT(28), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCK_CHECK, BIT(7), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ENTXCCK, BIT(18), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCAMSK, 0x0000FC00, 15);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ACGG2TBL, 0x1f, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x96a);</div><div class='add'>+		if (channel == 14) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x00006577);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x0000);</div><div class='add'>+		} else {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x384f6577);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x1525);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RFEINV, 0x300, 0x2);</div><div class='add'>+	} else if (channel &gt; 35) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ENTXCCK, BIT(18), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCK_CHECK, BIT(7), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXPSEL, BIT(28), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCAMSK, 0x0000FC00, 34);</div><div class='add'>+</div><div class='add'>+		if (channel &gt;= 36 &amp;&amp; channel &lt;= 64)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ACGG2TBL, 0x1f, 0x1);</div><div class='add'>+		else if (channel &gt;= 100 &amp;&amp; channel &lt;= 144)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ACGG2TBL, 0x1f, 0x2);</div><div class='add'>+		else if (channel &gt;= 149)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ACGG2TBL, 0x1f, 0x3);</div><div class='add'>+</div><div class='add'>+		if (channel &gt;= 36 &amp;&amp; channel &lt;= 48)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x494);</div><div class='add'>+		else if (channel &gt;= 52 &amp;&amp; channel &lt;= 64)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x453);</div><div class='add'>+		else if (channel &gt;= 100 &amp;&amp; channel &lt;= 116)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x452);</div><div class='add'>+		else if (channel &gt;= 118 &amp;&amp; channel &lt;= 177)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x412);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, 0xcbc, 0x300, 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		val32 = rtw_read32_mask(rtwdev, REG_ADCCLK, MASKDWORD);</div><div class='add'>+		val32 &amp;= 0xFFCFFC00;</div><div class='add'>+		val32 |= (RTW_CHANNEL_WIDTH_20);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCCLK, MASKDWORD, val32);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC160, BIT(30), 0x1);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		if (primary_ch_idx == 1)</div><div class='add'>+			rtw_write32_set(rtwdev, REG_RXSB, BIT(4));</div><div class='add'>+		else</div><div class='add'>+			rtw_write32_clr(rtwdev, REG_RXSB, BIT(4));</div><div class='add'>+</div><div class='add'>+		val32 = rtw_read32_mask(rtwdev, REG_ADCCLK, MASKDWORD);</div><div class='add'>+		val32 &amp;= 0xFF3FF300;</div><div class='add'>+		val32 |= (((primary_ch_idx &amp; 0xf) &lt;&lt; 2) | RTW_CHANNEL_WIDTH_40);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCCLK, MASKDWORD, val32);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC160, BIT(30), 0x1);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_80:</div><div class='add'>+		val32 = rtw_read32_mask(rtwdev, REG_ADCCLK, MASKDWORD);</div><div class='add'>+		val32 &amp;= 0xFCEFCF00;</div><div class='add'>+		val32 |= (((primary_ch_idx &amp; 0xf) &lt;&lt; 2) | RTW_CHANNEL_WIDTH_80);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCCLK, MASKDWORD, val32);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC160, BIT(30), 0x1);</div><div class='add'>+</div><div class='add'>+		if (rfe_option == 2) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_L1PKWT, 0x0000f000, 0x6);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ADC40, BIT(10), 0x1);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_5:</div><div class='add'>+		val32 = rtw_read32_mask(rtwdev, REG_ADCCLK, MASKDWORD);</div><div class='add'>+		val32 &amp;= 0xEFEEFE00;</div><div class='add'>+		val32 |= ((BIT(6) | RTW_CHANNEL_WIDTH_20));</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCCLK, MASKDWORD, val32);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC160, BIT(30), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC40, BIT(31), 0x1);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_10:</div><div class='add'>+		val32 = rtw_read32_mask(rtwdev, REG_ADCCLK, MASKDWORD);</div><div class='add'>+		val32 &amp;= 0xEFFEFF00;</div><div class='add'>+		val32 |= ((BIT(7) | RTW_CHANNEL_WIDTH_20));</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCCLK, MASKDWORD, val32);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC160, BIT(30), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADC40, BIT(31), 0x1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_channel(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+				 u8 primary_chan_idx)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	const struct rtw8822b_rfe_info *rfe_info;</div><div class='add'>+</div><div class='add'>+	if (WARN(efuse-&gt;rfe_option &gt;= ARRAY_SIZE(rtw8822b_rfe_info),</div><div class='add'>+		 "rfe_option %d is out of boundary\n", efuse-&gt;rfe_option))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rfe_info = &amp;rtw8822b_rfe_info[efuse-&gt;rfe_option];</div><div class='add'>+</div><div class='add'>+	rtw8822b_set_channel_bb(rtwdev, channel, bw, primary_chan_idx);</div><div class='add'>+	rtw_set_channel_mac(rtwdev, channel, bw, primary_chan_idx);</div><div class='add'>+	rtw8822b_set_channel_rf(rtwdev, channel, bw);</div><div class='add'>+	rtw8822b_set_channel_rxdfir(rtwdev, bw);</div><div class='add'>+	rtw8822b_toggle_igi(rtwdev);</div><div class='add'>+	rtw8822b_set_channel_cca(rtwdev, channel, bw, rfe_info);</div><div class='add'>+	(*rfe_info-&gt;rtw_set_channel_rfe)(rtwdev, channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+				     u8 rx_path, bool is_tx2_path)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	const struct rtw8822b_rfe_info *rfe_info;</div><div class='add'>+	u8 ch = rtwdev-&gt;hal.current_channel;</div><div class='add'>+	u8 tx_path_sel, rx_path_sel;</div><div class='add'>+	int counter;</div><div class='add'>+</div><div class='add'>+	if (WARN(efuse-&gt;rfe_option &gt;= ARRAY_SIZE(rtw8822b_rfe_info),</div><div class='add'>+		 "rfe_option %d is out of boundary\n", efuse-&gt;rfe_option))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rfe_info = &amp;rtw8822b_rfe_info[efuse-&gt;rfe_option];</div><div class='add'>+</div><div class='add'>+	if ((tx_path | rx_path) &amp; BB_PATH_A)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_AGCTR_A, MASKLWORD, 0x3231);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_AGCTR_A, MASKLWORD, 0x1111);</div><div class='add'>+</div><div class='add'>+	if ((tx_path | rx_path) &amp; BB_PATH_B)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_AGCTR_B, MASKLWORD, 0x3231);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_AGCTR_B, MASKLWORD, 0x1111);</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CDDTXP, (BIT(19) | BIT(18)), 0x3);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_TXPSEL, (BIT(29) | BIT(28)), 0x1);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_TXPSEL, BIT(30), 0x1);</div><div class='add'>+</div><div class='add'>+	if (tx_path &amp; BB_PATH_A) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CDDTXP, 0xfff00000, 0x001);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCINI, 0xf0000000, 0x8);</div><div class='add'>+	} else if (tx_path &amp; BB_PATH_B) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CDDTXP, 0xfff00000, 0x002);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCINI, 0xf0000000, 0x4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_path == BB_PATH_A || tx_path == BB_PATH_B)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXPSEL1, 0xfff0, 0x01);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXPSEL1, 0xfff0, 0x43);</div><div class='add'>+</div><div class='add'>+	tx_path_sel = (tx_path &lt;&lt; 4) | tx_path;</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_TXPSEL, MASKBYTE0, tx_path_sel);</div><div class='add'>+</div><div class='add'>+	if (tx_path != BB_PATH_A &amp;&amp; tx_path != BB_PATH_B) {</div><div class='add'>+		if (is_tx2_path || rtwdev-&gt;mp_mode) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_CDDTXP, 0xfff00000, 0x043);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ADCINI, 0xf0000000, 0xc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXDESC, BIT(22), 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXDESC, BIT(18), 0x0);</div><div class='add'>+</div><div class='add'>+	if (rx_path &amp; BB_PATH_A)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCINI, 0x0f000000, 0x0);</div><div class='add'>+	else if (rx_path &amp; BB_PATH_B)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ADCINI, 0x0f000000, 0x5);</div><div class='add'>+</div><div class='add'>+	rx_path_sel = (rx_path &lt;&lt; 4) | rx_path;</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXPSEL, MASKBYTE0, rx_path_sel);</div><div class='add'>+</div><div class='add'>+	if (rx_path == BB_PATH_A || rx_path == BB_PATH_B) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ANTWT, BIT(16), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_HTSTFWT, BIT(28), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_MRC, BIT(23), 0x0);</div><div class='add'>+	} else {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ANTWT, BIT(16), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_HTSTFWT, BIT(28), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_MRC, BIT(23), 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (counter = 100; counter &gt; 0; counter--) {</div><div class='add'>+		u32 rf_reg33;</div><div class='add'>+</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE, RFREG_MASK, 0x80000);</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x00001);</div><div class='add'>+</div><div class='add'>+		udelay(2);</div><div class='add'>+		rf_reg33 = rtw_read_rf(rtwdev, RF_PATH_A, 0x33, RFREG_MASK);</div><div class='add'>+</div><div class='add'>+		if (rf_reg33 == 0x00001)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN(counter &lt;= 0, "write RF mode table fail\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE, RFREG_MASK, 0x80000);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x00001);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD1, RFREG_MASK, 0x00034);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x4080c);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE, RFREG_MASK, 0x00000);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE, RFREG_MASK, 0x00000);</div><div class='add'>+</div><div class='add'>+	rtw8822b_toggle_igi(rtwdev);</div><div class='add'>+	rtw8822b_set_channel_cca(rtwdev, 1, RTW_CHANNEL_WIDTH_20, rfe_info);</div><div class='add'>+	(*rfe_info-&gt;rtw_set_channel_rfe)(rtwdev, ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,</div><div class='add'>+				   struct rtw_rx_pkt_stat *pkt_stat)</div><div class='add'>+{</div><div class='add'>+	s8 min_rx_power = -120;</div><div class='add'>+	u8 pwdb = GET_PHY_STAT_P0_PWDB(phy_status);</div><div class='add'>+</div><div class='add'>+	pkt_stat-&gt;rx_power[RF_PATH_A] = pwdb - 110;</div><div class='add'>+	pkt_stat-&gt;rssi = rtw_phy_rf_power_2_rssi(pkt_stat-&gt;rx_power, 1);</div><div class='add'>+	pkt_stat-&gt;bw = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+	pkt_stat-&gt;signal_power = max(pkt_stat-&gt;rx_power[RF_PATH_A],</div><div class='add'>+				     min_rx_power);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_phy_status_page1(struct rtw_dev *rtwdev, u8 *phy_status,</div><div class='add'>+				   struct rtw_rx_pkt_stat *pkt_stat)</div><div class='add'>+{</div><div class='add'>+	u8 rxsc, bw;</div><div class='add'>+	s8 min_rx_power = -120;</div><div class='add'>+</div><div class='add'>+	if (pkt_stat-&gt;rate &gt; DESC_RATE11M &amp;&amp; pkt_stat-&gt;rate &lt; DESC_RATEMCS0)</div><div class='add'>+		rxsc = GET_PHY_STAT_P1_L_RXSC(phy_status);</div><div class='add'>+	else</div><div class='add'>+		rxsc = GET_PHY_STAT_P1_HT_RXSC(phy_status);</div><div class='add'>+</div><div class='add'>+	if (rxsc &gt;= 1 &amp;&amp; rxsc &lt;= 8)</div><div class='add'>+		bw = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+	else if (rxsc &gt;= 9 &amp;&amp; rxsc &lt;= 12)</div><div class='add'>+		bw = RTW_CHANNEL_WIDTH_40;</div><div class='add'>+	else if (rxsc &gt;= 13)</div><div class='add'>+		bw = RTW_CHANNEL_WIDTH_80;</div><div class='add'>+	else</div><div class='add'>+		bw = GET_PHY_STAT_P1_RF_MODE(phy_status);</div><div class='add'>+</div><div class='add'>+	pkt_stat-&gt;rx_power[RF_PATH_A] = GET_PHY_STAT_P1_PWDB_A(phy_status) - 110;</div><div class='add'>+	pkt_stat-&gt;rx_power[RF_PATH_B] = GET_PHY_STAT_P1_PWDB_B(phy_status) - 110;</div><div class='add'>+	pkt_stat-&gt;rssi = rtw_phy_rf_power_2_rssi(pkt_stat-&gt;rx_power, 2);</div><div class='add'>+	pkt_stat-&gt;bw = bw;</div><div class='add'>+	pkt_stat-&gt;signal_power = max3(pkt_stat-&gt;rx_power[RF_PATH_A],</div><div class='add'>+				      pkt_stat-&gt;rx_power[RF_PATH_B],</div><div class='add'>+				      min_rx_power);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_phy_status(struct rtw_dev *rtwdev, u8 *phy_status,</div><div class='add'>+			     struct rtw_rx_pkt_stat *pkt_stat)</div><div class='add'>+{</div><div class='add'>+	u8 page;</div><div class='add'>+</div><div class='add'>+	page = *phy_status &amp; 0xf;</div><div class='add'>+</div><div class='add'>+	switch (page) {</div><div class='add'>+	case 0:</div><div class='add'>+		query_phy_status_page0(rtwdev, phy_status, pkt_stat);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		query_phy_status_page1(rtwdev, phy_status, pkt_stat);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rtw_warn(rtwdev, "unused phy status page (%d)\n", page);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,</div><div class='add'>+				   struct rtw_rx_pkt_stat *pkt_stat,</div><div class='add'>+				   struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u32 desc_sz = rtwdev-&gt;chip-&gt;rx_pkt_desc_sz;</div><div class='add'>+	u8 *phy_status = NULL;</div><div class='add'>+</div><div class='add'>+	memset(pkt_stat, 0, sizeof(*pkt_stat));</div><div class='add'>+</div><div class='add'>+	pkt_stat-&gt;phy_status = GET_RX_DESC_PHYST(rx_desc);</div><div class='add'>+	pkt_stat-&gt;icv_err = GET_RX_DESC_ICV_ERR(rx_desc);</div><div class='add'>+	pkt_stat-&gt;crc_err = GET_RX_DESC_CRC32(rx_desc);</div><div class='add'>+	pkt_stat-&gt;decrypted = !GET_RX_DESC_SWDEC(rx_desc);</div><div class='add'>+	pkt_stat-&gt;is_c2h = GET_RX_DESC_C2H(rx_desc);</div><div class='add'>+	pkt_stat-&gt;pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);</div><div class='add'>+	pkt_stat-&gt;drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);</div><div class='add'>+	pkt_stat-&gt;shift = GET_RX_DESC_SHIFT(rx_desc);</div><div class='add'>+	pkt_stat-&gt;rate = GET_RX_DESC_RX_RATE(rx_desc);</div><div class='add'>+	pkt_stat-&gt;cam_id = GET_RX_DESC_MACID(rx_desc);</div><div class='add'>+	pkt_stat-&gt;ppdu_cnt = GET_RX_DESC_PPDU_CNT(rx_desc);</div><div class='add'>+	pkt_stat-&gt;tsf_low = GET_RX_DESC_TSFL(rx_desc);</div><div class='add'>+</div><div class='add'>+	/* drv_info_sz is in unit of 8-bytes */</div><div class='add'>+	pkt_stat-&gt;drv_info_sz *= 8;</div><div class='add'>+</div><div class='add'>+	/* c2h cmd pkt's rx/phy status is not interested */</div><div class='add'>+	if (pkt_stat-&gt;is_c2h)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat-&gt;shift +</div><div class='add'>+				       pkt_stat-&gt;drv_info_sz);</div><div class='add'>+	if (pkt_stat-&gt;phy_status) {</div><div class='add'>+		phy_status = rx_desc + desc_sz + pkt_stat-&gt;shift;</div><div class='add'>+		query_phy_status(rtwdev, phy_status, pkt_stat);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtw8822b_set_tx_power_index_by_rate(struct rtw_dev *rtwdev, u8 path, u8 rs)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	static const u32 offset_txagc[2] = {0x1d00, 0x1d80};</div><div class='add'>+	static u32 phy_pwr_idx;</div><div class='add'>+	u8 rate, rate_idx, pwr_index, shift;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; rtw_rate_size[rs]; j++) {</div><div class='add'>+		rate = rtw_rate_section[rs][j];</div><div class='add'>+		pwr_index = hal-&gt;tx_pwr_tbl[path][rate];</div><div class='add'>+		shift = rate &amp; 0x3;</div><div class='add'>+		phy_pwr_idx |= ((u32)pwr_index &lt;&lt; (shift * 8));</div><div class='add'>+		if (shift == 0x3) {</div><div class='add'>+			rate_idx = rate &amp; 0xfc;</div><div class='add'>+			rtw_write32(rtwdev, offset_txagc[path] + rate_idx,</div><div class='add'>+				    phy_pwr_idx);</div><div class='add'>+			phy_pwr_idx = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_set_tx_power_index(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	int rs, path;</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; hal-&gt;rf_path_num; path++) {</div><div class='add'>+		for (rs = 0; rs &lt; RTW_RATE_SECTION_MAX; rs++)</div><div class='add'>+			rtw8822b_set_tx_power_index_by_rate(rtwdev, path, rs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool rtw8822b_check_rf_path(u8 antenna)</div><div class='add'>+{</div><div class='add'>+	switch (antenna) {</div><div class='add'>+	case BB_PATH_A:</div><div class='add'>+	case BB_PATH_B:</div><div class='add'>+	case BB_PATH_AB:</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 void rtw8822b_set_antenna(struct rtw_dev *rtwdev, u8 antenna_tx,</div><div class='add'>+				 u8 antenna_rx)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_PHY, "config RF path, tx=0x%x rx=0x%x\n",</div><div class='add'>+		antenna_tx, antenna_rx);</div><div class='add'>+</div><div class='add'>+	if (!rtw8822b_check_rf_path(antenna_tx)) {</div><div class='add'>+		rtw_info(rtwdev, "unsupport tx path, set to default path ab\n");</div><div class='add'>+		antenna_tx = BB_PATH_AB;</div><div class='add'>+	}</div><div class='add'>+	if (!rtw8822b_check_rf_path(antenna_rx)) {</div><div class='add'>+		rtw_info(rtwdev, "unsupport rx path, set to default path ab\n");</div><div class='add'>+		antenna_rx = BB_PATH_AB;</div><div class='add'>+	}</div><div class='add'>+	hal-&gt;antenna_tx = antenna_tx;</div><div class='add'>+	hal-&gt;antenna_rx = antenna_rx;</div><div class='add'>+	rtw8822b_config_trx_mode(rtwdev, antenna_tx, antenna_rx, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_cfg_ldo25(struct rtw_dev *rtwdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	u8 ldo_pwr;</div><div class='add'>+</div><div class='add'>+	ldo_pwr = rtw_read8(rtwdev, REG_LDO_EFUSE_CTRL + 3);</div><div class='add'>+	ldo_pwr = enable ? ldo_pwr | BIT(7) : ldo_pwr &amp; ~BIT(7);</div><div class='add'>+	rtw_write8(rtwdev, REG_LDO_EFUSE_CTRL + 3, ldo_pwr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_false_alarm_statistics(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	u32 cck_enable;</div><div class='add'>+	u32 cck_fa_cnt;</div><div class='add'>+	u32 ofdm_fa_cnt;</div><div class='add'>+</div><div class='add'>+	cck_enable = rtw_read32(rtwdev, 0x808) &amp; BIT(28);</div><div class='add'>+	cck_fa_cnt = rtw_read16(rtwdev, 0xa5c);</div><div class='add'>+	ofdm_fa_cnt = rtw_read16(rtwdev, 0xf48);</div><div class='add'>+</div><div class='add'>+	dm_info-&gt;cck_fa_cnt = cck_fa_cnt;</div><div class='add'>+	dm_info-&gt;ofdm_fa_cnt = ofdm_fa_cnt;</div><div class='add'>+	dm_info-&gt;total_fa_cnt = ofdm_fa_cnt;</div><div class='add'>+	dm_info-&gt;total_fa_cnt += cck_enable ? cck_fa_cnt : 0;</div><div class='add'>+</div><div class='add'>+	rtw_write32_set(rtwdev, 0x9a4, BIT(17));</div><div class='add'>+	rtw_write32_clr(rtwdev, 0x9a4, BIT(17));</div><div class='add'>+	rtw_write32_clr(rtwdev, 0xa2c, BIT(15));</div><div class='add'>+	rtw_write32_set(rtwdev, 0xa2c, BIT(15));</div><div class='add'>+	rtw_write32_set(rtwdev, 0xb58, BIT(0));</div><div class='add'>+	rtw_write32_clr(rtwdev, 0xb58, BIT(0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822b_do_iqk(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	static int do_iqk_cnt;</div><div class='add'>+	struct rtw_iqk_para para = {.clear = 0, .segment_iqk = 0};</div><div class='add'>+	u32 rf_reg, iqk_fail_mask;</div><div class='add'>+	int counter;</div><div class='add'>+	bool reload;</div><div class='add'>+</div><div class='add'>+	rtw_fw_do_iqk(rtwdev, &amp;para);</div><div class='add'>+</div><div class='add'>+	for (counter = 0; counter &lt; 300; counter++) {</div><div class='add'>+		rf_reg = rtw_read_rf(rtwdev, RF_PATH_A, RF_DTXLOK, RFREG_MASK);</div><div class='add'>+		if (rf_reg == 0xabcde)</div><div class='add'>+			break;</div><div class='add'>+		msleep(20);</div><div class='add'>+	}</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_DTXLOK, RFREG_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	reload = !!rtw_read32_mask(rtwdev, REG_IQKFAILMSK, BIT(16));</div><div class='add'>+	iqk_fail_mask = rtw_read32_mask(rtwdev, REG_IQKFAILMSK, GENMASK(0, 7));</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_PHY,</div><div class='add'>+		"iqk counter=%d reload=%d do_iqk_cnt=%d n_iqk_fail(mask)=0x%02x\n",</div><div class='add'>+		counter, reload, ++do_iqk_cnt, iqk_fail_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822b[] = {</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), BIT(1)},</div><div class='add'>+	{0x004A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3) | BIT(4) | BIT(7), 0},</div><div class='add'>+	{0x0300,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x0301,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_cardemu_to_act_8822b[] = {</div><div class='add'>+	{0x0012,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0012,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0020,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0001,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_DELAY, 1, RTW_PWR_DELAY_MS},</div><div class='add'>+	{0x0000,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(4) | BIT(3) | BIT(2)), 0},</div><div class='add'>+	{0x0075,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0006,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), BIT(1)},</div><div class='add'>+	{0x0075,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0xFF1A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x0006,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(4) | BIT(3)), 0},</div><div class='add'>+	{0x10C3,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(0), 0},</div><div class='add'>+	{0x0020,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3), BIT(3)},</div><div class='add'>+	{0x10A8,</div><div class='add'>+	 RTW_PWR_CUT_C_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x10A9,</div><div class='add'>+	 RTW_PWR_CUT_C_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0xef},</div><div class='add'>+	{0x10AA,</div><div class='add'>+	 RTW_PWR_CUT_C_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x0c},</div><div class='add'>+	{0x0068,</div><div class='add'>+	 RTW_PWR_CUT_C_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(4), BIT(4)},</div><div class='add'>+	{0x0029,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0xF9},</div><div class='add'>+	{0x0024,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), 0},</div><div class='add'>+	{0x0074,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), BIT(5)},</div><div class='add'>+	{0x00AF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), BIT(5)},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_act_to_cardemu_8822b[] = {</div><div class='add'>+	{0x0003,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), 0},</div><div class='add'>+	{0x0093,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3), 0},</div><div class='add'>+	{0x001F,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x00EF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0xFF1A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x30},</div><div class='add'>+	{0x0049,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0006,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0002,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x10C3,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), BIT(1)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), 0},</div><div class='add'>+	{0x0020,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3), 0},</div><div class='add'>+	{0x0000,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), BIT(5)},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822b[] = {</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7), BIT(7)},</div><div class='add'>+	{0x0007,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x20},</div><div class='add'>+	{0x0067,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), BIT(2)},</div><div class='add'>+	{0x004A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0067,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), 0},</div><div class='add'>+	{0x0067,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(4), 0},</div><div class='add'>+	{0x004F,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0067,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0046,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(6), BIT(6)},</div><div class='add'>+	{0x0067,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), 0},</div><div class='add'>+	{0x0046,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7), BIT(7)},</div><div class='add'>+	{0x0062,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(4), BIT(4)},</div><div class='add'>+	{0x0081,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7) | BIT(6), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3)},</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), 0},</div><div class='add'>+	{0x0090,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0044,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x0040,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x90},</div><div class='add'>+	{0x0041,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x00},</div><div class='add'>+	{0x0042,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x04},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd *card_enable_flow_8822b[] = {</div><div class='add'>+	trans_carddis_to_cardemu_8822b,</div><div class='add'>+	trans_cardemu_to_act_8822b,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd *card_disable_flow_8822b[] = {</div><div class='add'>+	trans_act_to_cardemu_8822b,</div><div class='add'>+	trans_cardemu_to_carddis_8822b,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para usb2_param_8822b[] = {</div><div class='add'>+	{0xFFFF, 0x00,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para usb3_param_8822b[] = {</div><div class='add'>+	{0x0001, 0xA841,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_D,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0xFFFF, 0x0000,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para pcie_gen1_param_8822b[] = {</div><div class='add'>+	{0x0001, 0xA841,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0002, 0x60C6,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0008, 0x3596,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0009, 0x321C,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x000A, 0x9623,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0020, 0x94FF,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0021, 0xFFCF,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0026, 0xC006,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0029, 0xFF0E,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x002A, 0x1840,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0xFFFF, 0x0000,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para pcie_gen2_param_8822b[] = {</div><div class='add'>+	{0x0001, 0xA841,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0002, 0x60C6,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0008, 0x3597,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0009, 0x321C,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x000A, 0x9623,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0020, 0x94FF,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0021, 0xFFCF,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0026, 0xC006,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x0029, 0xFF0E,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0x002A, 0x3040,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_C,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+	{0xFFFF, 0x0000,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para_table phy_para_table_8822b = {</div><div class='add'>+	.usb2_para	= usb2_param_8822b,</div><div class='add'>+	.usb3_para	= usb3_param_8822b,</div><div class='add'>+	.gen1_para	= pcie_gen1_param_8822b,</div><div class='add'>+	.gen2_para	= pcie_gen2_param_8822b,</div><div class='add'>+	.n_usb2_para	= ARRAY_SIZE(usb2_param_8822b),</div><div class='add'>+	.n_usb3_para	= ARRAY_SIZE(usb2_param_8822b),</div><div class='add'>+	.n_gen1_para	= ARRAY_SIZE(pcie_gen1_param_8822b),</div><div class='add'>+	.n_gen2_para	= ARRAY_SIZE(pcie_gen2_param_8822b),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtw_rfe_def rtw8822b_rfe_defs[] = {</div><div class='add'>+	[2] = RTW_DEF_RFE(8822b, 2, 2),</div><div class='add'>+	[5] = RTW_DEF_RFE(8822b, 5, 5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_hw_reg rtw8822b_dig[] = {</div><div class='add'>+	[0] = { .addr = 0xc50, .mask = 0x7f },</div><div class='add'>+	[1] = { .addr = 0xe50, .mask = 0x7f },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_page_table page_table_8822b[] = {</div><div class='add'>+	{64, 64, 64, 64, 1},</div><div class='add'>+	{64, 64, 64, 64, 1},</div><div class='add'>+	{64, 64, 0, 0, 1},</div><div class='add'>+	{64, 64, 64, 0, 1},</div><div class='add'>+	{64, 64, 64, 64, 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_rqpn rqpn_table_8822b[] = {</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_HIGH,</div><div class='add'>+	 RTW_DMA_MAPPING_HIGH, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_HIGH, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_chip_ops rtw8822b_ops = {</div><div class='add'>+	.phy_set_param		= rtw8822b_phy_set_param,</div><div class='add'>+	.read_efuse		= rtw8822b_read_efuse,</div><div class='add'>+	.query_rx_desc		= rtw8822b_query_rx_desc,</div><div class='add'>+	.set_channel		= rtw8822b_set_channel,</div><div class='add'>+	.mac_init		= rtw8822b_mac_init,</div><div class='add'>+	.read_rf		= rtw_phy_read_rf,</div><div class='add'>+	.write_rf		= rtw_phy_write_rf_reg_sipi,</div><div class='add'>+	.set_tx_power_index	= rtw8822b_set_tx_power_index,</div><div class='add'>+	.set_antenna		= rtw8822b_set_antenna,</div><div class='add'>+	.cfg_ldo25		= rtw8822b_cfg_ldo25,</div><div class='add'>+	.false_alarm_statistics	= rtw8822b_false_alarm_statistics,</div><div class='add'>+	.do_iqk			= rtw8822b_do_iqk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_chip_info rtw8822b_hw_spec = {</div><div class='add'>+	.ops = &amp;rtw8822b_ops,</div><div class='add'>+	.id = RTW_CHIP_TYPE_8822B,</div><div class='add'>+	.fw_name = "rtw88/rtw8822b_fw.bin",</div><div class='add'>+	.tx_pkt_desc_sz = 48,</div><div class='add'>+	.tx_buf_desc_sz = 16,</div><div class='add'>+	.rx_pkt_desc_sz = 24,</div><div class='add'>+	.rx_buf_desc_sz = 8,</div><div class='add'>+	.phy_efuse_size = 1024,</div><div class='add'>+	.log_efuse_size = 768,</div><div class='add'>+	.ptct_efuse_size = 96,</div><div class='add'>+	.txff_size = 262144,</div><div class='add'>+	.rxff_size = 24576,</div><div class='add'>+	.txgi_factor = 1,</div><div class='add'>+	.is_pwr_by_rate_dec = true,</div><div class='add'>+	.max_power_index = 0x3f,</div><div class='add'>+	.csi_buf_pg_num = 0,</div><div class='add'>+	.band = RTW_BAND_2G | RTW_BAND_5G,</div><div class='add'>+	.page_size = 128,</div><div class='add'>+	.dig_min = 0x1c,</div><div class='add'>+	.ht_supported = true,</div><div class='add'>+	.vht_supported = true,</div><div class='add'>+	.sys_func_en = 0xDC,</div><div class='add'>+	.pwr_on_seq = card_enable_flow_8822b,</div><div class='add'>+	.pwr_off_seq = card_disable_flow_8822b,</div><div class='add'>+	.page_table = page_table_8822b,</div><div class='add'>+	.rqpn_table = rqpn_table_8822b,</div><div class='add'>+	.intf_table = &amp;phy_para_table_8822b,</div><div class='add'>+	.dig = rtw8822b_dig,</div><div class='add'>+	.rf_base_addr = {0x2800, 0x2c00},</div><div class='add'>+	.rf_sipi_addr = {0xc90, 0xe90},</div><div class='add'>+	.mac_tbl = &amp;rtw8822b_mac_tbl,</div><div class='add'>+	.agc_tbl = &amp;rtw8822b_agc_tbl,</div><div class='add'>+	.bb_tbl = &amp;rtw8822b_bb_tbl,</div><div class='add'>+	.rf_tbl = {&amp;rtw8822b_rf_a_tbl, &amp;rtw8822b_rf_b_tbl},</div><div class='add'>+	.rfe_defs = rtw8822b_rfe_defs,</div><div class='add'>+	.rfe_defs_size = ARRAY_SIZE(rtw8822b_rfe_defs),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(rtw8822b_hw_spec);</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE("rtw88/rtw8822b_fw.bin");</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.h b/drivers/net/wireless/realtek/rtw88/rtw8822b.h<br/>new file mode 100644<br/>index 000000000000..0cb93d7d4cfd<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822b.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822b.h</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW8822B_H__</div><div class='add'>+#define __RTW8822B_H__</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+#define RCR_VHT_ACK		BIT(26)</div><div class='add'>+</div><div class='add'>+struct rtw8822bu_efuse {</div><div class='add'>+	u8 res4[4];			/* 0xd0 */</div><div class='add'>+	u8 usb_optional_function;</div><div class='add'>+	u8 res5[0x1e];</div><div class='add'>+	u8 res6[2];</div><div class='add'>+	u8 serial[0x0b];		/* 0xf5 */</div><div class='add'>+	u8 vid;				/* 0x100 */</div><div class='add'>+	u8 res7;</div><div class='add'>+	u8 pid;</div><div class='add'>+	u8 res8[4];</div><div class='add'>+	u8 mac_addr[ETH_ALEN];		/* 0x107 */</div><div class='add'>+	u8 res9[2];</div><div class='add'>+	u8 vendor_name[0x07];</div><div class='add'>+	u8 res10[2];</div><div class='add'>+	u8 device_name[0x14];</div><div class='add'>+	u8 res11[0xcf];</div><div class='add'>+	u8 package_type;		/* 0x1fb */</div><div class='add'>+	u8 res12[0x4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw8822be_efuse {</div><div class='add'>+	u8 mac_addr[ETH_ALEN];		/* 0xd0 */</div><div class='add'>+	u8 vender_id[2];</div><div class='add'>+	u8 device_id[2];</div><div class='add'>+	u8 sub_vender_id[2];</div><div class='add'>+	u8 sub_device_id[2];</div><div class='add'>+	u8 pmc[2];</div><div class='add'>+	u8 exp_device_cap[2];</div><div class='add'>+	u8 msi_cap;</div><div class='add'>+	u8 ltr_cap;			/* 0xe3 */</div><div class='add'>+	u8 exp_link_control[2];</div><div class='add'>+	u8 link_cap[4];</div><div class='add'>+	u8 link_control[2];</div><div class='add'>+	u8 serial_number[8];</div><div class='add'>+	u8 res0:2;			/* 0xf4 */</div><div class='add'>+	u8 ltr_en:1;</div><div class='add'>+	u8 res1:2;</div><div class='add'>+	u8 obff:2;</div><div class='add'>+	u8 res2:3;</div><div class='add'>+	u8 obff_cap:2;</div><div class='add'>+	u8 res3:4;</div><div class='add'>+	u8 res4[3];</div><div class='add'>+	u8 class_code[3];</div><div class='add'>+	u8 pci_pm_L1_2_supp:1;</div><div class='add'>+	u8 pci_pm_L1_1_supp:1;</div><div class='add'>+	u8 aspm_pm_L1_2_supp:1;</div><div class='add'>+	u8 aspm_pm_L1_1_supp:1;</div><div class='add'>+	u8 L1_pm_substates_supp:1;</div><div class='add'>+	u8 res5:3;</div><div class='add'>+	u8 port_common_mode_restore_time;</div><div class='add'>+	u8 port_t_power_on_scale:2;</div><div class='add'>+	u8 res6:1;</div><div class='add'>+	u8 port_t_power_on_value:5;</div><div class='add'>+	u8 res7;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw8822b_efuse {</div><div class='add'>+	__le16 rtl_id;</div><div class='add'>+	u8 res0[0x0e];</div><div class='add'>+</div><div class='add'>+	/* power index for four RF paths */</div><div class='add'>+	struct rtw_txpwr_idx txpwr_idx_table[4];</div><div class='add'>+</div><div class='add'>+	u8 channel_plan;		/* 0xb8 */</div><div class='add'>+	u8 xtal_k;</div><div class='add'>+	u8 thermal_meter;</div><div class='add'>+	u8 iqk_lck;</div><div class='add'>+	u8 pa_type;			/* 0xbc */</div><div class='add'>+	u8 lna_type_2g[2];		/* 0xbd */</div><div class='add'>+	u8 lna_type_5g[2];</div><div class='add'>+	u8 rf_board_option;</div><div class='add'>+	u8 rf_feature_option;</div><div class='add'>+	u8 rf_bt_setting;</div><div class='add'>+	u8 eeprom_version;</div><div class='add'>+	u8 eeprom_customer_id;</div><div class='add'>+	u8 tx_bb_swing_setting_2g;</div><div class='add'>+	u8 tx_bb_swing_setting_5g;</div><div class='add'>+	u8 tx_pwr_calibrate_rate;</div><div class='add'>+	u8 rf_antenna_option;		/* 0xc9 */</div><div class='add'>+	u8 rfe_option;</div><div class='add'>+	u8 country_code[2];</div><div class='add'>+	u8 res[3];</div><div class='add'>+	union {</div><div class='add'>+		struct rtw8822bu_efuse u;</div><div class='add'>+		struct rtw8822be_efuse e;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)</div><div class='add'>+{</div><div class='add'>+	/* 0xC00-0xCFF and 0xE00-0xEFF have the same layout */</div><div class='add'>+	rtw_write32_mask(rtwdev, addr, mask, data);</div><div class='add'>+	rtw_write32_mask(rtwdev, addr + 0x200, mask, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define rtw_write32s_mask(rtwdev, addr, mask, data)			       \</div><div class='add'>+	do {								       \</div><div class='add'>+		BUILD_BUG_ON((addr) &lt; 0xC00 || (addr) &gt;= 0xD00);	       \</div><div class='add'>+									       \</div><div class='add'>+		_rtw_write32s_mask(rtwdev, addr, mask, data);		       \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* phy status page0 */</div><div class='add'>+#define GET_PHY_STAT_P0_PWDB(phy_stat)                                         \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(15, 8))</div><div class='add'>+</div><div class='add'>+/* phy status page1 */</div><div class='add'>+#define GET_PHY_STAT_P1_PWDB_A(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(15, 8))</div><div class='add'>+#define GET_PHY_STAT_P1_PWDB_B(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(23, 16))</div><div class='add'>+#define GET_PHY_STAT_P1_RF_MODE(phy_stat)                                      \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x03), GENMASK(29, 28))</div><div class='add'>+#define GET_PHY_STAT_P1_L_RXSC(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x01), GENMASK(11, 8))</div><div class='add'>+#define GET_PHY_STAT_P1_HT_RXSC(phy_stat)                                      \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x01), GENMASK(15, 12))</div><div class='add'>+</div><div class='add'>+#define REG_HTSTFWT	0x800</div><div class='add'>+#define REG_RXPSEL	0x808</div><div class='add'>+#define BIT_RX_PSEL_RST		(BIT(28) | BIT(29))</div><div class='add'>+#define REG_TXPSEL	0x80c</div><div class='add'>+#define REG_RXCCAMSK	0x814</div><div class='add'>+#define REG_CCASEL	0x82c</div><div class='add'>+#define REG_PDMFTH	0x830</div><div class='add'>+#define REG_CCA2ND	0x838</div><div class='add'>+#define REG_L1WT	0x83c</div><div class='add'>+#define REG_L1PKWT	0x840</div><div class='add'>+#define REG_MRC		0x850</div><div class='add'>+#define REG_CLKTRK	0x860</div><div class='add'>+#define REG_ADCCLK	0x8ac</div><div class='add'>+#define REG_ADC160	0x8c4</div><div class='add'>+#define REG_ADC40	0x8c8</div><div class='add'>+#define REG_CDDTXP	0x93c</div><div class='add'>+#define REG_TXPSEL1	0x940</div><div class='add'>+#define REG_ACBB0	0x948</div><div class='add'>+#define REG_ACBBRXFIR	0x94c</div><div class='add'>+#define REG_ACGG2TBL	0x958</div><div class='add'>+#define REG_RXSB	0xa00</div><div class='add'>+#define REG_ADCINI	0xa04</div><div class='add'>+#define REG_TXSF2	0xa24</div><div class='add'>+#define REG_TXSF6	0xa28</div><div class='add'>+#define REG_RXDESC	0xa2c</div><div class='add'>+#define REG_ENTXCCK	0xa80</div><div class='add'>+#define REG_AGCTR_A	0xc08</div><div class='add'>+#define REG_TXDFIR	0xc20</div><div class='add'>+#define REG_RXIGI_A	0xc50</div><div class='add'>+#define REG_TRSW	0xca0</div><div class='add'>+#define REG_RFESEL0	0xcb0</div><div class='add'>+#define REG_RFESEL8	0xcb4</div><div class='add'>+#define REG_RFECTL	0xcb8</div><div class='add'>+#define REG_RFEINV	0xcbc</div><div class='add'>+#define REG_AGCTR_B	0xe08</div><div class='add'>+#define REG_RXIGI_B	0xe50</div><div class='add'>+#define REG_ANTWT	0x1904</div><div class='add'>+#define REG_IQKFAILMSK	0x1bf0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b_table.c b/drivers/net/wireless/realtek/rtw88/rtw8822b_table.c<br/>new file mode 100644<br/>index 000000000000..2d2dfb495ce1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822b_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822b_table.c</a></div><div class='hunk'>@@ -0,0 +1,20783 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "rtw8822b_table.h"</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_mac[] = {</div><div class='add'>+	0x029, 0x000000F9,</div><div class='add'>+	0x420, 0x00000080,</div><div class='add'>+	0x421, 0x0000001F,</div><div class='add'>+	0x428, 0x0000000A,</div><div class='add'>+	0x429, 0x00000010,</div><div class='add'>+	0x430, 0x00000000,</div><div class='add'>+	0x431, 0x00000000,</div><div class='add'>+	0x432, 0x00000000,</div><div class='add'>+	0x433, 0x00000001,</div><div class='add'>+	0x434, 0x00000004,</div><div class='add'>+	0x435, 0x00000005,</div><div class='add'>+	0x436, 0x00000007,</div><div class='add'>+	0x437, 0x00000008,</div><div class='add'>+	0x43C, 0x00000004,</div><div class='add'>+	0x43D, 0x00000005,</div><div class='add'>+	0x43E, 0x00000007,</div><div class='add'>+	0x43F, 0x00000008,</div><div class='add'>+	0x440, 0x0000005D,</div><div class='add'>+	0x441, 0x00000001,</div><div class='add'>+	0x442, 0x00000000,</div><div class='add'>+	0x444, 0x00000010,</div><div class='add'>+	0x445, 0x000000F0,</div><div class='add'>+	0x446, 0x00000001,</div><div class='add'>+	0x447, 0x000000FE,</div><div class='add'>+	0x448, 0x00000000,</div><div class='add'>+	0x449, 0x00000000,</div><div class='add'>+	0x44A, 0x00000000,</div><div class='add'>+	0x44B, 0x00000040,</div><div class='add'>+	0x44C, 0x00000010,</div><div class='add'>+	0x44D, 0x000000F0,</div><div class='add'>+	0x44E, 0x0000003F,</div><div class='add'>+	0x44F, 0x00000000,</div><div class='add'>+	0x450, 0x00000000,</div><div class='add'>+	0x451, 0x00000000,</div><div class='add'>+	0x452, 0x00000000,</div><div class='add'>+	0x453, 0x00000040,</div><div class='add'>+	0x455, 0x00000070,</div><div class='add'>+	0x45E, 0x00000004,</div><div class='add'>+	0x49C, 0x00000010,</div><div class='add'>+	0x49D, 0x000000F0,</div><div class='add'>+	0x49E, 0x00000000,</div><div class='add'>+	0x49F, 0x00000006,</div><div class='add'>+	0x4A0, 0x000000E0,</div><div class='add'>+	0x4A1, 0x00000003,</div><div class='add'>+	0x4A2, 0x00000000,</div><div class='add'>+	0x4A3, 0x00000040,</div><div class='add'>+	0x4A4, 0x00000015,</div><div class='add'>+	0x4A5, 0x000000F0,</div><div class='add'>+	0x4A6, 0x00000000,</div><div class='add'>+	0x4A7, 0x00000006,</div><div class='add'>+	0x4A8, 0x000000E0,</div><div class='add'>+	0x4A9, 0x00000000,</div><div class='add'>+	0x4AA, 0x00000000,</div><div class='add'>+	0x4AB, 0x00000000,</div><div class='add'>+	0x7DA, 0x00000008,</div><div class='add'>+	0x1448, 0x00000006,</div><div class='add'>+	0x144A, 0x00000006,</div><div class='add'>+	0x144C, 0x00000006,</div><div class='add'>+	0x144E, 0x00000006,</div><div class='add'>+	0x4C8, 0x000000FF,</div><div class='add'>+	0x4C9, 0x00000008,</div><div class='add'>+	0x4CA, 0x00000020,</div><div class='add'>+	0x4CB, 0x00000020,</div><div class='add'>+	0x4CC, 0x000000FF,</div><div class='add'>+	0x4CD, 0x000000FF,</div><div class='add'>+	0x4CE, 0x00000001,</div><div class='add'>+	0x4CF, 0x00000008,</div><div class='add'>+	0x500, 0x00000026,</div><div class='add'>+	0x501, 0x000000A2,</div><div class='add'>+	0x502, 0x0000002F,</div><div class='add'>+	0x503, 0x00000000,</div><div class='add'>+	0x504, 0x00000028,</div><div class='add'>+	0x505, 0x000000A3,</div><div class='add'>+	0x506, 0x0000005E,</div><div class='add'>+	0x507, 0x00000000,</div><div class='add'>+	0x508, 0x0000002B,</div><div class='add'>+	0x509, 0x000000A4,</div><div class='add'>+	0x50A, 0x0000005E,</div><div class='add'>+	0x50B, 0x00000000,</div><div class='add'>+	0x50C, 0x0000004F,</div><div class='add'>+	0x50D, 0x000000A4,</div><div class='add'>+	0x50E, 0x00000000,</div><div class='add'>+	0x50F, 0x00000000,</div><div class='add'>+	0x512, 0x0000001C,</div><div class='add'>+	0x514, 0x0000000A,</div><div class='add'>+	0x516, 0x0000000A,</div><div class='add'>+	0x521, 0x0000002F,</div><div class='add'>+	0x525, 0x0000004F,</div><div class='add'>+	0x551, 0x00000010,</div><div class='add'>+	0x559, 0x00000002,</div><div class='add'>+	0x55C, 0x00000050,</div><div class='add'>+	0x55D, 0x000000FF,</div><div class='add'>+	0x577, 0x0000000B,</div><div class='add'>+	0x5BE, 0x00000064,</div><div class='add'>+	0x605, 0x00000030,</div><div class='add'>+	0x608, 0x0000000E,</div><div class='add'>+	0x609, 0x00000022,</div><div class='add'>+	0x60C, 0x00000018,</div><div class='add'>+	0x6A0, 0x000000FF,</div><div class='add'>+	0x6A1, 0x000000FF,</div><div class='add'>+	0x6A2, 0x000000FF,</div><div class='add'>+	0x6A3, 0x000000FF,</div><div class='add'>+	0x6A4, 0x000000FF,</div><div class='add'>+	0x6A5, 0x000000FF,</div><div class='add'>+	0x6DE, 0x00000084,</div><div class='add'>+	0x620, 0x000000FF,</div><div class='add'>+	0x621, 0x000000FF,</div><div class='add'>+	0x622, 0x000000FF,</div><div class='add'>+	0x623, 0x000000FF,</div><div class='add'>+	0x624, 0x000000FF,</div><div class='add'>+	0x625, 0x000000FF,</div><div class='add'>+	0x626, 0x000000FF,</div><div class='add'>+	0x627, 0x000000FF,</div><div class='add'>+	0x638, 0x00000050,</div><div class='add'>+	0x63C, 0x0000000A,</div><div class='add'>+	0x63D, 0x0000000A,</div><div class='add'>+	0x63E, 0x0000000E,</div><div class='add'>+	0x63F, 0x0000000E,</div><div class='add'>+	0x640, 0x00000040,</div><div class='add'>+	0x642, 0x00000040,</div><div class='add'>+	0x643, 0x00000000,</div><div class='add'>+	0x652, 0x000000C8,</div><div class='add'>+	0x66E, 0x00000005,</div><div class='add'>+	0x718, 0x00000040,</div><div class='add'>+	0x7D4, 0x00000098,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822b_mac, rtw_phy_cfg_mac);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_agc[] = {</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFE000003,</div><div class='add'>+	0x81C, 0xFD020003,</div><div class='add'>+	0x81C, 0xFC040003,</div><div class='add'>+	0x81C, 0xFB060003,</div><div class='add'>+	0x81C, 0xFA080003,</div><div class='add'>+	0x81C, 0xF90A0003,</div><div class='add'>+	0x81C, 0xF80C0003,</div><div class='add'>+	0x81C, 0xF70E0003,</div><div class='add'>+	0x81C, 0xF6100003,</div><div class='add'>+	0x81C, 0xF5120003,</div><div class='add'>+	0x81C, 0xF4140003,</div><div class='add'>+	0x81C, 0xF3160003,</div><div class='add'>+	0x81C, 0xF2180003,</div><div class='add'>+	0x81C, 0xF11A0003,</div><div class='add'>+	0x81C, 0xF01C0003,</div><div class='add'>+	0x81C, 0xEF1E0003,</div><div class='add'>+	0x81C, 0xEE200003,</div><div class='add'>+	0x81C, 0xED220003,</div><div class='add'>+	0x81C, 0xEC240003,</div><div class='add'>+	0x81C, 0xEB260003,</div><div class='add'>+	0x81C, 0xEA280003,</div><div class='add'>+	0x81C, 0xE92A0003,</div><div class='add'>+	0x81C, 0xE82C0003,</div><div class='add'>+	0x81C, 0xE72E0003,</div><div class='add'>+	0x81C, 0xE6300003,</div><div class='add'>+	0x81C, 0xE5320003,</div><div class='add'>+	0x81C, 0xC8340003,</div><div class='add'>+	0x81C, 0xC7360003,</div><div class='add'>+	0x81C, 0xC6380003,</div><div class='add'>+	0x81C, 0xC53A0003,</div><div class='add'>+	0x81C, 0xC43C0003,</div><div class='add'>+	0x81C, 0xC33E0003,</div><div class='add'>+	0x81C, 0xC2400003,</div><div class='add'>+	0x81C, 0xC1420003,</div><div class='add'>+	0x81C, 0xC0440003,</div><div class='add'>+	0x81C, 0xA3460003,</div><div class='add'>+	0x81C, 0xA2480003,</div><div class='add'>+	0x81C, 0xA14A0003,</div><div class='add'>+	0x81C, 0xA04C0003,</div><div class='add'>+	0x81C, 0x824E0003,</div><div class='add'>+	0x81C, 0x81500003,</div><div class='add'>+	0x81C, 0x80520003,</div><div class='add'>+	0x81C, 0x64540003,</div><div class='add'>+	0x81C, 0x63560003,</div><div class='add'>+	0x81C, 0x62580003,</div><div class='add'>+	0x81C, 0x445A0003,</div><div class='add'>+	0x81C, 0x435C0003,</div><div class='add'>+	0x81C, 0x425E0003,</div><div class='add'>+	0x81C, 0x41600003,</div><div class='add'>+	0x81C, 0x40620003,</div><div class='add'>+	0x81C, 0x05640003,</div><div class='add'>+	0x81C, 0x04660003,</div><div class='add'>+	0x81C, 0x03680003,</div><div class='add'>+	0x81C, 0x026A0003,</div><div class='add'>+	0x81C, 0x016C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xF5000003,</div><div class='add'>+	0x81C, 0xF4020003,</div><div class='add'>+	0x81C, 0xF3040003,</div><div class='add'>+	0x81C, 0xF2060003,</div><div class='add'>+	0x81C, 0xF1080003,</div><div class='add'>+	0x81C, 0xF00A0003,</div><div class='add'>+	0x81C, 0xEF0C0003,</div><div class='add'>+	0x81C, 0xEE0E0003,</div><div class='add'>+	0x81C, 0xED100003,</div><div class='add'>+	0x81C, 0xEC120003,</div><div class='add'>+	0x81C, 0xEB140003,</div><div class='add'>+	0x81C, 0xEA160003,</div><div class='add'>+	0x81C, 0xE9180003,</div><div class='add'>+	0x81C, 0xE81A0003,</div><div class='add'>+	0x81C, 0xE71C0003,</div><div class='add'>+	0x81C, 0xE61E0003,</div><div class='add'>+	0x81C, 0xE5200003,</div><div class='add'>+	0x81C, 0xE4220003,</div><div class='add'>+	0x81C, 0xE3240003,</div><div class='add'>+	0x81C, 0xE2260003,</div><div class='add'>+	0x81C, 0xE1280003,</div><div class='add'>+	0x81C, 0xE02A0003,</div><div class='add'>+	0x81C, 0xC32C0003,</div><div class='add'>+	0x81C, 0xC22E0003,</div><div class='add'>+	0x81C, 0xC1300003,</div><div class='add'>+	0x81C, 0xC0320003,</div><div class='add'>+	0x81C, 0xA4340003,</div><div class='add'>+	0x81C, 0xA3360003,</div><div class='add'>+	0x81C, 0xA2380003,</div><div class='add'>+	0x81C, 0xA13A0003,</div><div class='add'>+	0x81C, 0xA03C0003,</div><div class='add'>+	0x81C, 0x823E0003,</div><div class='add'>+	0x81C, 0x81400003,</div><div class='add'>+	0x81C, 0x80420003,</div><div class='add'>+	0x81C, 0x64440003,</div><div class='add'>+	0x81C, 0x63460003,</div><div class='add'>+	0x81C, 0x62480003,</div><div class='add'>+	0x81C, 0x614A0003,</div><div class='add'>+	0x81C, 0x604C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x42540003,</div><div class='add'>+	0x81C, 0x41560003,</div><div class='add'>+	0x81C, 0x40580003,</div><div class='add'>+	0x81C, 0x055A0003,</div><div class='add'>+	0x81C, 0x045C0003,</div><div class='add'>+	0x81C, 0x035E0003,</div><div class='add'>+	0x81C, 0x02600003,</div><div class='add'>+	0x81C, 0x01620003,</div><div class='add'>+	0x81C, 0x00640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFD000003,</div><div class='add'>+	0x81C, 0xFC020003,</div><div class='add'>+	0x81C, 0xFB040003,</div><div class='add'>+	0x81C, 0xFA060003,</div><div class='add'>+	0x81C, 0xF9080003,</div><div class='add'>+	0x81C, 0xF80A0003,</div><div class='add'>+	0x81C, 0xF70C0003,</div><div class='add'>+	0x81C, 0xF60E0003,</div><div class='add'>+	0x81C, 0xF5100003,</div><div class='add'>+	0x81C, 0xF4120003,</div><div class='add'>+	0x81C, 0xF3140003,</div><div class='add'>+	0x81C, 0xF2160003,</div><div class='add'>+	0x81C, 0xF1180003,</div><div class='add'>+	0x81C, 0xF01A0003,</div><div class='add'>+	0x81C, 0xEF1C0003,</div><div class='add'>+	0x81C, 0xEE1E0003,</div><div class='add'>+	0x81C, 0xED200003,</div><div class='add'>+	0x81C, 0xEC220003,</div><div class='add'>+	0x81C, 0xEB240003,</div><div class='add'>+	0x81C, 0xEA260003,</div><div class='add'>+	0x81C, 0xE9280003,</div><div class='add'>+	0x81C, 0xE82A0003,</div><div class='add'>+	0x81C, 0xE72C0003,</div><div class='add'>+	0x81C, 0xE62E0003,</div><div class='add'>+	0x81C, 0xE5300003,</div><div class='add'>+	0x81C, 0xC8320003,</div><div class='add'>+	0x81C, 0xC7340003,</div><div class='add'>+	0x81C, 0xC6360003,</div><div class='add'>+	0x81C, 0xC5380003,</div><div class='add'>+	0x81C, 0xC43A0003,</div><div class='add'>+	0x81C, 0xC33C0003,</div><div class='add'>+	0x81C, 0xC23E0003,</div><div class='add'>+	0x81C, 0xC1400003,</div><div class='add'>+	0x81C, 0xC0420003,</div><div class='add'>+	0x81C, 0xA5440003,</div><div class='add'>+	0x81C, 0xA4460003,</div><div class='add'>+	0x81C, 0xA3480003,</div><div class='add'>+	0x81C, 0xA24A0003,</div><div class='add'>+	0x81C, 0xA14C0003,</div><div class='add'>+	0x81C, 0x834E0003,</div><div class='add'>+	0x81C, 0x82500003,</div><div class='add'>+	0x81C, 0x81520003,</div><div class='add'>+	0x81C, 0x80540003,</div><div class='add'>+	0x81C, 0x65560003,</div><div class='add'>+	0x81C, 0x64580003,</div><div class='add'>+	0x81C, 0x635A0003,</div><div class='add'>+	0x81C, 0x625C0003,</div><div class='add'>+	0x81C, 0x435E0003,</div><div class='add'>+	0x81C, 0x42600003,</div><div class='add'>+	0x81C, 0x41620003,</div><div class='add'>+	0x81C, 0x40640003,</div><div class='add'>+	0x81C, 0x06660003,</div><div class='add'>+	0x81C, 0x05680003,</div><div class='add'>+	0x81C, 0x046A0003,</div><div class='add'>+	0x81C, 0x036C0003,</div><div class='add'>+	0x81C, 0x026E0003,</div><div class='add'>+	0x81C, 0x01700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFD000003,</div><div class='add'>+	0x81C, 0xFC020003,</div><div class='add'>+	0x81C, 0xFB040003,</div><div class='add'>+	0x81C, 0xFA060003,</div><div class='add'>+	0x81C, 0xF9080003,</div><div class='add'>+	0x81C, 0xF80A0003,</div><div class='add'>+	0x81C, 0xF70C0003,</div><div class='add'>+	0x81C, 0xF60E0003,</div><div class='add'>+	0x81C, 0xF5100003,</div><div class='add'>+	0x81C, 0xF4120003,</div><div class='add'>+	0x81C, 0xF3140003,</div><div class='add'>+	0x81C, 0xF2160003,</div><div class='add'>+	0x81C, 0xF1180003,</div><div class='add'>+	0x81C, 0xF01A0003,</div><div class='add'>+	0x81C, 0xEF1C0003,</div><div class='add'>+	0x81C, 0xEE1E0003,</div><div class='add'>+	0x81C, 0xED200003,</div><div class='add'>+	0x81C, 0xEC220003,</div><div class='add'>+	0x81C, 0xEB240003,</div><div class='add'>+	0x81C, 0xEA260003,</div><div class='add'>+	0x81C, 0xE9280003,</div><div class='add'>+	0x81C, 0xE82A0003,</div><div class='add'>+	0x81C, 0xE72C0003,</div><div class='add'>+	0x81C, 0xE62E0003,</div><div class='add'>+	0x81C, 0xE5300003,</div><div class='add'>+	0x81C, 0xC8320003,</div><div class='add'>+	0x81C, 0xC7340003,</div><div class='add'>+	0x81C, 0xC6360003,</div><div class='add'>+	0x81C, 0xC5380003,</div><div class='add'>+	0x81C, 0xC43A0003,</div><div class='add'>+	0x81C, 0xC33C0003,</div><div class='add'>+	0x81C, 0xC23E0003,</div><div class='add'>+	0x81C, 0xC1400003,</div><div class='add'>+	0x81C, 0xC0420003,</div><div class='add'>+	0x81C, 0xA5440003,</div><div class='add'>+	0x81C, 0xA4460003,</div><div class='add'>+	0x81C, 0xA3480003,</div><div class='add'>+	0x81C, 0xA24A0003,</div><div class='add'>+	0x81C, 0xA14C0003,</div><div class='add'>+	0x81C, 0x834E0003,</div><div class='add'>+	0x81C, 0x82500003,</div><div class='add'>+	0x81C, 0x81520003,</div><div class='add'>+	0x81C, 0x80540003,</div><div class='add'>+	0x81C, 0x65560003,</div><div class='add'>+	0x81C, 0x64580003,</div><div class='add'>+	0x81C, 0x635A0003,</div><div class='add'>+	0x81C, 0x625C0003,</div><div class='add'>+	0x81C, 0x435E0003,</div><div class='add'>+	0x81C, 0x42600003,</div><div class='add'>+	0x81C, 0x41620003,</div><div class='add'>+	0x81C, 0x40640003,</div><div class='add'>+	0x81C, 0x06660003,</div><div class='add'>+	0x81C, 0x05680003,</div><div class='add'>+	0x81C, 0x046A0003,</div><div class='add'>+	0x81C, 0x036C0003,</div><div class='add'>+	0x81C, 0x026E0003,</div><div class='add'>+	0x81C, 0x01700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xDC000003,</div><div class='add'>+	0x81C, 0xDB020003,</div><div class='add'>+	0x81C, 0xDA040003,</div><div class='add'>+	0x81C, 0xD9060003,</div><div class='add'>+	0x81C, 0xD8080003,</div><div class='add'>+	0x81C, 0xD70A0003,</div><div class='add'>+	0x81C, 0xD60C0003,</div><div class='add'>+	0x81C, 0xD50E0003,</div><div class='add'>+	0x81C, 0xD4100003,</div><div class='add'>+	0x81C, 0xD3120003,</div><div class='add'>+	0x81C, 0xD2140003,</div><div class='add'>+	0x81C, 0xD1160003,</div><div class='add'>+	0x81C, 0xD0180003,</div><div class='add'>+	0x81C, 0xB41A0003,</div><div class='add'>+	0x81C, 0xB31C0003,</div><div class='add'>+	0x81C, 0xB21E0003,</div><div class='add'>+	0x81C, 0xB1200003,</div><div class='add'>+	0x81C, 0xB0220003,</div><div class='add'>+	0x81C, 0xAF240003,</div><div class='add'>+	0x81C, 0xAE260003,</div><div class='add'>+	0x81C, 0xAD280003,</div><div class='add'>+	0x81C, 0xAC2A0003,</div><div class='add'>+	0x81C, 0xAB2C0003,</div><div class='add'>+	0x81C, 0x8C2E0003,</div><div class='add'>+	0x81C, 0x8B300003,</div><div class='add'>+	0x81C, 0x8A320003,</div><div class='add'>+	0x81C, 0x89340003,</div><div class='add'>+	0x81C, 0x88360003,</div><div class='add'>+	0x81C, 0x87380003,</div><div class='add'>+	0x81C, 0x863A0003,</div><div class='add'>+	0x81C, 0x853C0003,</div><div class='add'>+	0x81C, 0x693E0003,</div><div class='add'>+	0x81C, 0x68400003,</div><div class='add'>+	0x81C, 0x67420003,</div><div class='add'>+	0x81C, 0x66440003,</div><div class='add'>+	0x81C, 0x65460003,</div><div class='add'>+	0x81C, 0x48480003,</div><div class='add'>+	0x81C, 0x474A0003,</div><div class='add'>+	0x81C, 0x464C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x27540003,</div><div class='add'>+	0x81C, 0x26560003,</div><div class='add'>+	0x81C, 0x25580003,</div><div class='add'>+	0x81C, 0x245A0003,</div><div class='add'>+	0x81C, 0x235C0003,</div><div class='add'>+	0x81C, 0x045E0003,</div><div class='add'>+	0x81C, 0x03600003,</div><div class='add'>+	0x81C, 0x02620003,</div><div class='add'>+	0x81C, 0x01640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFD000003,</div><div class='add'>+	0x81C, 0xFC020003,</div><div class='add'>+	0x81C, 0xFB040003,</div><div class='add'>+	0x81C, 0xFA060003,</div><div class='add'>+	0x81C, 0xF9080003,</div><div class='add'>+	0x81C, 0xF80A0003,</div><div class='add'>+	0x81C, 0xF70C0003,</div><div class='add'>+	0x81C, 0xF60E0003,</div><div class='add'>+	0x81C, 0xF5100003,</div><div class='add'>+	0x81C, 0xF4120003,</div><div class='add'>+	0x81C, 0xF3140003,</div><div class='add'>+	0x81C, 0xF2160003,</div><div class='add'>+	0x81C, 0xF1180003,</div><div class='add'>+	0x81C, 0xF01A0003,</div><div class='add'>+	0x81C, 0xEF1C0003,</div><div class='add'>+	0x81C, 0xEE1E0003,</div><div class='add'>+	0x81C, 0xED200003,</div><div class='add'>+	0x81C, 0xEC220003,</div><div class='add'>+	0x81C, 0xEB240003,</div><div class='add'>+	0x81C, 0xEA260003,</div><div class='add'>+	0x81C, 0xE9280003,</div><div class='add'>+	0x81C, 0xE82A0003,</div><div class='add'>+	0x81C, 0xE72C0003,</div><div class='add'>+	0x81C, 0xE62E0003,</div><div class='add'>+	0x81C, 0xE5300003,</div><div class='add'>+	0x81C, 0xC8320003,</div><div class='add'>+	0x81C, 0xC7340003,</div><div class='add'>+	0x81C, 0xC6360003,</div><div class='add'>+	0x81C, 0xC5380003,</div><div class='add'>+	0x81C, 0xC43A0003,</div><div class='add'>+	0x81C, 0xC33C0003,</div><div class='add'>+	0x81C, 0xC23E0003,</div><div class='add'>+	0x81C, 0xC1400003,</div><div class='add'>+	0x81C, 0xC0420003,</div><div class='add'>+	0x81C, 0xA5440003,</div><div class='add'>+	0x81C, 0xA4460003,</div><div class='add'>+	0x81C, 0xA3480003,</div><div class='add'>+	0x81C, 0xA24A0003,</div><div class='add'>+	0x81C, 0xA14C0003,</div><div class='add'>+	0x81C, 0x834E0003,</div><div class='add'>+	0x81C, 0x82500003,</div><div class='add'>+	0x81C, 0x81520003,</div><div class='add'>+	0x81C, 0x80540003,</div><div class='add'>+	0x81C, 0x65560003,</div><div class='add'>+	0x81C, 0x64580003,</div><div class='add'>+	0x81C, 0x635A0003,</div><div class='add'>+	0x81C, 0x625C0003,</div><div class='add'>+	0x81C, 0x435E0003,</div><div class='add'>+	0x81C, 0x42600003,</div><div class='add'>+	0x81C, 0x41620003,</div><div class='add'>+	0x81C, 0x40640003,</div><div class='add'>+	0x81C, 0x06660003,</div><div class='add'>+	0x81C, 0x05680003,</div><div class='add'>+	0x81C, 0x046A0003,</div><div class='add'>+	0x81C, 0x036C0003,</div><div class='add'>+	0x81C, 0x026E0003,</div><div class='add'>+	0x81C, 0x01700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xF5000003,</div><div class='add'>+	0x81C, 0xF4020003,</div><div class='add'>+	0x81C, 0xF3040003,</div><div class='add'>+	0x81C, 0xF2060003,</div><div class='add'>+	0x81C, 0xF1080003,</div><div class='add'>+	0x81C, 0xF00A0003,</div><div class='add'>+	0x81C, 0xEF0C0003,</div><div class='add'>+	0x81C, 0xEE0E0003,</div><div class='add'>+	0x81C, 0xED100003,</div><div class='add'>+	0x81C, 0xEC120003,</div><div class='add'>+	0x81C, 0xEB140003,</div><div class='add'>+	0x81C, 0xEA160003,</div><div class='add'>+	0x81C, 0xE9180003,</div><div class='add'>+	0x81C, 0xE81A0003,</div><div class='add'>+	0x81C, 0xE71C0003,</div><div class='add'>+	0x81C, 0xE61E0003,</div><div class='add'>+	0x81C, 0xE5200003,</div><div class='add'>+	0x81C, 0xE4220003,</div><div class='add'>+	0x81C, 0xE3240003,</div><div class='add'>+	0x81C, 0xE2260003,</div><div class='add'>+	0x81C, 0xE1280003,</div><div class='add'>+	0x81C, 0xE02A0003,</div><div class='add'>+	0x81C, 0xC32C0003,</div><div class='add'>+	0x81C, 0xC22E0003,</div><div class='add'>+	0x81C, 0xC1300003,</div><div class='add'>+	0x81C, 0xC0320003,</div><div class='add'>+	0x81C, 0xA4340003,</div><div class='add'>+	0x81C, 0xA3360003,</div><div class='add'>+	0x81C, 0xA2380003,</div><div class='add'>+	0x81C, 0xA13A0003,</div><div class='add'>+	0x81C, 0xA03C0003,</div><div class='add'>+	0x81C, 0x823E0003,</div><div class='add'>+	0x81C, 0x81400003,</div><div class='add'>+	0x81C, 0x80420003,</div><div class='add'>+	0x81C, 0x64440003,</div><div class='add'>+	0x81C, 0x63460003,</div><div class='add'>+	0x81C, 0x62480003,</div><div class='add'>+	0x81C, 0x614A0003,</div><div class='add'>+	0x81C, 0x604C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x42540003,</div><div class='add'>+	0x81C, 0x41560003,</div><div class='add'>+	0x81C, 0x40580003,</div><div class='add'>+	0x81C, 0x055A0003,</div><div class='add'>+	0x81C, 0x045C0003,</div><div class='add'>+	0x81C, 0x035E0003,</div><div class='add'>+	0x81C, 0x02600003,</div><div class='add'>+	0x81C, 0x01620003,</div><div class='add'>+	0x81C, 0x00640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xF5000003,</div><div class='add'>+	0x81C, 0xF4020003,</div><div class='add'>+	0x81C, 0xF3040003,</div><div class='add'>+	0x81C, 0xF2060003,</div><div class='add'>+	0x81C, 0xF1080003,</div><div class='add'>+	0x81C, 0xF00A0003,</div><div class='add'>+	0x81C, 0xEF0C0003,</div><div class='add'>+	0x81C, 0xEE0E0003,</div><div class='add'>+	0x81C, 0xED100003,</div><div class='add'>+	0x81C, 0xEC120003,</div><div class='add'>+	0x81C, 0xEB140003,</div><div class='add'>+	0x81C, 0xEA160003,</div><div class='add'>+	0x81C, 0xE9180003,</div><div class='add'>+	0x81C, 0xE81A0003,</div><div class='add'>+	0x81C, 0xE71C0003,</div><div class='add'>+	0x81C, 0xE61E0003,</div><div class='add'>+	0x81C, 0xE5200003,</div><div class='add'>+	0x81C, 0xE4220003,</div><div class='add'>+	0x81C, 0xE3240003,</div><div class='add'>+	0x81C, 0xE2260003,</div><div class='add'>+	0x81C, 0xE1280003,</div><div class='add'>+	0x81C, 0xE02A0003,</div><div class='add'>+	0x81C, 0xC32C0003,</div><div class='add'>+	0x81C, 0xC22E0003,</div><div class='add'>+	0x81C, 0xC1300003,</div><div class='add'>+	0x81C, 0xC0320003,</div><div class='add'>+	0x81C, 0xA4340003,</div><div class='add'>+	0x81C, 0xA3360003,</div><div class='add'>+	0x81C, 0xA2380003,</div><div class='add'>+	0x81C, 0xA13A0003,</div><div class='add'>+	0x81C, 0xA03C0003,</div><div class='add'>+	0x81C, 0x823E0003,</div><div class='add'>+	0x81C, 0x81400003,</div><div class='add'>+	0x81C, 0x80420003,</div><div class='add'>+	0x81C, 0x64440003,</div><div class='add'>+	0x81C, 0x63460003,</div><div class='add'>+	0x81C, 0x62480003,</div><div class='add'>+	0x81C, 0x614A0003,</div><div class='add'>+	0x81C, 0x604C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x42540003,</div><div class='add'>+	0x81C, 0x41560003,</div><div class='add'>+	0x81C, 0x40580003,</div><div class='add'>+	0x81C, 0x055A0003,</div><div class='add'>+	0x81C, 0x045C0003,</div><div class='add'>+	0x81C, 0x035E0003,</div><div class='add'>+	0x81C, 0x02600003,</div><div class='add'>+	0x81C, 0x01620003,</div><div class='add'>+	0x81C, 0x00640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFE000003,</div><div class='add'>+	0x81C, 0xFD020003,</div><div class='add'>+	0x81C, 0xFC040003,</div><div class='add'>+	0x81C, 0xFB060003,</div><div class='add'>+	0x81C, 0xFA080003,</div><div class='add'>+	0x81C, 0xF90A0003,</div><div class='add'>+	0x81C, 0xF80C0003,</div><div class='add'>+	0x81C, 0xF70E0003,</div><div class='add'>+	0x81C, 0xF6100003,</div><div class='add'>+	0x81C, 0xF5120003,</div><div class='add'>+	0x81C, 0xF4140003,</div><div class='add'>+	0x81C, 0xF3160003,</div><div class='add'>+	0x81C, 0xF2180003,</div><div class='add'>+	0x81C, 0xF11A0003,</div><div class='add'>+	0x81C, 0xF01C0003,</div><div class='add'>+	0x81C, 0xEF1E0003,</div><div class='add'>+	0x81C, 0xEE200003,</div><div class='add'>+	0x81C, 0xED220003,</div><div class='add'>+	0x81C, 0xEC240003,</div><div class='add'>+	0x81C, 0xEB260003,</div><div class='add'>+	0x81C, 0xEA280003,</div><div class='add'>+	0x81C, 0xE92A0003,</div><div class='add'>+	0x81C, 0xE82C0003,</div><div class='add'>+	0x81C, 0xE72E0003,</div><div class='add'>+	0x81C, 0xE6300003,</div><div class='add'>+	0x81C, 0xE5320003,</div><div class='add'>+	0x81C, 0xC8340003,</div><div class='add'>+	0x81C, 0xC7360003,</div><div class='add'>+	0x81C, 0xC6380003,</div><div class='add'>+	0x81C, 0xC53A0003,</div><div class='add'>+	0x81C, 0xC43C0003,</div><div class='add'>+	0x81C, 0xC33E0003,</div><div class='add'>+	0x81C, 0xC2400003,</div><div class='add'>+	0x81C, 0xC1420003,</div><div class='add'>+	0x81C, 0xC0440003,</div><div class='add'>+	0x81C, 0xA3460003,</div><div class='add'>+	0x81C, 0xA2480003,</div><div class='add'>+	0x81C, 0xA14A0003,</div><div class='add'>+	0x81C, 0xA04C0003,</div><div class='add'>+	0x81C, 0x824E0003,</div><div class='add'>+	0x81C, 0x81500003,</div><div class='add'>+	0x81C, 0x80520003,</div><div class='add'>+	0x81C, 0x64540003,</div><div class='add'>+	0x81C, 0x63560003,</div><div class='add'>+	0x81C, 0x62580003,</div><div class='add'>+	0x81C, 0x445A0003,</div><div class='add'>+	0x81C, 0x435C0003,</div><div class='add'>+	0x81C, 0x425E0003,</div><div class='add'>+	0x81C, 0x41600003,</div><div class='add'>+	0x81C, 0x40620003,</div><div class='add'>+	0x81C, 0x05640003,</div><div class='add'>+	0x81C, 0x04660003,</div><div class='add'>+	0x81C, 0x03680003,</div><div class='add'>+	0x81C, 0x026A0003,</div><div class='add'>+	0x81C, 0x016C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xF5000003,</div><div class='add'>+	0x81C, 0xF4020003,</div><div class='add'>+	0x81C, 0xF3040003,</div><div class='add'>+	0x81C, 0xF2060003,</div><div class='add'>+	0x81C, 0xF1080003,</div><div class='add'>+	0x81C, 0xF00A0003,</div><div class='add'>+	0x81C, 0xEF0C0003,</div><div class='add'>+	0x81C, 0xEE0E0003,</div><div class='add'>+	0x81C, 0xED100003,</div><div class='add'>+	0x81C, 0xEC120003,</div><div class='add'>+	0x81C, 0xEB140003,</div><div class='add'>+	0x81C, 0xEA160003,</div><div class='add'>+	0x81C, 0xE9180003,</div><div class='add'>+	0x81C, 0xE81A0003,</div><div class='add'>+	0x81C, 0xE71C0003,</div><div class='add'>+	0x81C, 0xE61E0003,</div><div class='add'>+	0x81C, 0xE5200003,</div><div class='add'>+	0x81C, 0xE4220003,</div><div class='add'>+	0x81C, 0xE3240003,</div><div class='add'>+	0x81C, 0xE2260003,</div><div class='add'>+	0x81C, 0xE1280003,</div><div class='add'>+	0x81C, 0xE02A0003,</div><div class='add'>+	0x81C, 0xC32C0003,</div><div class='add'>+	0x81C, 0xC22E0003,</div><div class='add'>+	0x81C, 0xC1300003,</div><div class='add'>+	0x81C, 0xC0320003,</div><div class='add'>+	0x81C, 0xA4340003,</div><div class='add'>+	0x81C, 0xA3360003,</div><div class='add'>+	0x81C, 0xA2380003,</div><div class='add'>+	0x81C, 0xA13A0003,</div><div class='add'>+	0x81C, 0xA03C0003,</div><div class='add'>+	0x81C, 0x823E0003,</div><div class='add'>+	0x81C, 0x81400003,</div><div class='add'>+	0x81C, 0x80420003,</div><div class='add'>+	0x81C, 0x64440003,</div><div class='add'>+	0x81C, 0x63460003,</div><div class='add'>+	0x81C, 0x62480003,</div><div class='add'>+	0x81C, 0x614A0003,</div><div class='add'>+	0x81C, 0x604C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x42540003,</div><div class='add'>+	0x81C, 0x41560003,</div><div class='add'>+	0x81C, 0x40580003,</div><div class='add'>+	0x81C, 0x055A0003,</div><div class='add'>+	0x81C, 0x045C0003,</div><div class='add'>+	0x81C, 0x035E0003,</div><div class='add'>+	0x81C, 0x02600003,</div><div class='add'>+	0x81C, 0x01620003,</div><div class='add'>+	0x81C, 0x00640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFE000003,</div><div class='add'>+	0x81C, 0xFD020003,</div><div class='add'>+	0x81C, 0xFC040003,</div><div class='add'>+	0x81C, 0xFB060003,</div><div class='add'>+	0x81C, 0xFA080003,</div><div class='add'>+	0x81C, 0xF90A0003,</div><div class='add'>+	0x81C, 0xF80C0003,</div><div class='add'>+	0x81C, 0xF70E0003,</div><div class='add'>+	0x81C, 0xF6100003,</div><div class='add'>+	0x81C, 0xF5120003,</div><div class='add'>+	0x81C, 0xF4140003,</div><div class='add'>+	0x81C, 0xF3160003,</div><div class='add'>+	0x81C, 0xF2180003,</div><div class='add'>+	0x81C, 0xF11A0003,</div><div class='add'>+	0x81C, 0xF01C0003,</div><div class='add'>+	0x81C, 0xEF1E0003,</div><div class='add'>+	0x81C, 0xEE200003,</div><div class='add'>+	0x81C, 0xED220003,</div><div class='add'>+	0x81C, 0xEC240003,</div><div class='add'>+	0x81C, 0xEB260003,</div><div class='add'>+	0x81C, 0xEA280003,</div><div class='add'>+	0x81C, 0xE92A0003,</div><div class='add'>+	0x81C, 0xE82C0003,</div><div class='add'>+	0x81C, 0xE72E0003,</div><div class='add'>+	0x81C, 0xE6300003,</div><div class='add'>+	0x81C, 0xE5320003,</div><div class='add'>+	0x81C, 0xC8340003,</div><div class='add'>+	0x81C, 0xC7360003,</div><div class='add'>+	0x81C, 0xC6380003,</div><div class='add'>+	0x81C, 0xC53A0003,</div><div class='add'>+	0x81C, 0xC43C0003,</div><div class='add'>+	0x81C, 0xC33E0003,</div><div class='add'>+	0x81C, 0xC2400003,</div><div class='add'>+	0x81C, 0xC1420003,</div><div class='add'>+	0x81C, 0xC0440003,</div><div class='add'>+	0x81C, 0xA3460003,</div><div class='add'>+	0x81C, 0xA2480003,</div><div class='add'>+	0x81C, 0xA14A0003,</div><div class='add'>+	0x81C, 0xA04C0003,</div><div class='add'>+	0x81C, 0x824E0003,</div><div class='add'>+	0x81C, 0x81500003,</div><div class='add'>+	0x81C, 0x80520003,</div><div class='add'>+	0x81C, 0x64540003,</div><div class='add'>+	0x81C, 0x63560003,</div><div class='add'>+	0x81C, 0x62580003,</div><div class='add'>+	0x81C, 0x445A0003,</div><div class='add'>+	0x81C, 0x435C0003,</div><div class='add'>+	0x81C, 0x425E0003,</div><div class='add'>+	0x81C, 0x41600003,</div><div class='add'>+	0x81C, 0x40620003,</div><div class='add'>+	0x81C, 0x05640003,</div><div class='add'>+	0x81C, 0x04660003,</div><div class='add'>+	0x81C, 0x03680003,</div><div class='add'>+	0x81C, 0x026A0003,</div><div class='add'>+	0x81C, 0x016C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xF5000003,</div><div class='add'>+	0x81C, 0xF4020003,</div><div class='add'>+	0x81C, 0xF3040003,</div><div class='add'>+	0x81C, 0xF2060003,</div><div class='add'>+	0x81C, 0xF1080003,</div><div class='add'>+	0x81C, 0xF00A0003,</div><div class='add'>+	0x81C, 0xEF0C0003,</div><div class='add'>+	0x81C, 0xEE0E0003,</div><div class='add'>+	0x81C, 0xED100003,</div><div class='add'>+	0x81C, 0xEC120003,</div><div class='add'>+	0x81C, 0xEB140003,</div><div class='add'>+	0x81C, 0xEA160003,</div><div class='add'>+	0x81C, 0xE9180003,</div><div class='add'>+	0x81C, 0xE81A0003,</div><div class='add'>+	0x81C, 0xE71C0003,</div><div class='add'>+	0x81C, 0xE61E0003,</div><div class='add'>+	0x81C, 0xE5200003,</div><div class='add'>+	0x81C, 0xE4220003,</div><div class='add'>+	0x81C, 0xE3240003,</div><div class='add'>+	0x81C, 0xE2260003,</div><div class='add'>+	0x81C, 0xE1280003,</div><div class='add'>+	0x81C, 0xE02A0003,</div><div class='add'>+	0x81C, 0xC32C0003,</div><div class='add'>+	0x81C, 0xC22E0003,</div><div class='add'>+	0x81C, 0xC1300003,</div><div class='add'>+	0x81C, 0xC0320003,</div><div class='add'>+	0x81C, 0xA4340003,</div><div class='add'>+	0x81C, 0xA3360003,</div><div class='add'>+	0x81C, 0xA2380003,</div><div class='add'>+	0x81C, 0xA13A0003,</div><div class='add'>+	0x81C, 0xA03C0003,</div><div class='add'>+	0x81C, 0x823E0003,</div><div class='add'>+	0x81C, 0x81400003,</div><div class='add'>+	0x81C, 0x80420003,</div><div class='add'>+	0x81C, 0x64440003,</div><div class='add'>+	0x81C, 0x63460003,</div><div class='add'>+	0x81C, 0x62480003,</div><div class='add'>+	0x81C, 0x614A0003,</div><div class='add'>+	0x81C, 0x604C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x42540003,</div><div class='add'>+	0x81C, 0x41560003,</div><div class='add'>+	0x81C, 0x40580003,</div><div class='add'>+	0x81C, 0x055A0003,</div><div class='add'>+	0x81C, 0x045C0003,</div><div class='add'>+	0x81C, 0x035E0003,</div><div class='add'>+	0x81C, 0x02600003,</div><div class='add'>+	0x81C, 0x01620003,</div><div class='add'>+	0x81C, 0x00640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFD000003,</div><div class='add'>+	0x81C, 0xFC020003,</div><div class='add'>+	0x81C, 0xFB040003,</div><div class='add'>+	0x81C, 0xFA060003,</div><div class='add'>+	0x81C, 0xF9080003,</div><div class='add'>+	0x81C, 0xF80A0003,</div><div class='add'>+	0x81C, 0xF70C0003,</div><div class='add'>+	0x81C, 0xF60E0003,</div><div class='add'>+	0x81C, 0xF5100003,</div><div class='add'>+	0x81C, 0xF4120003,</div><div class='add'>+	0x81C, 0xF3140003,</div><div class='add'>+	0x81C, 0xF2160003,</div><div class='add'>+	0x81C, 0xF1180003,</div><div class='add'>+	0x81C, 0xF01A0003,</div><div class='add'>+	0x81C, 0xEF1C0003,</div><div class='add'>+	0x81C, 0xEE1E0003,</div><div class='add'>+	0x81C, 0xED200003,</div><div class='add'>+	0x81C, 0xEC220003,</div><div class='add'>+	0x81C, 0xEB240003,</div><div class='add'>+	0x81C, 0xEA260003,</div><div class='add'>+	0x81C, 0xE9280003,</div><div class='add'>+	0x81C, 0xE82A0003,</div><div class='add'>+	0x81C, 0xE72C0003,</div><div class='add'>+	0x81C, 0xE62E0003,</div><div class='add'>+	0x81C, 0xE5300003,</div><div class='add'>+	0x81C, 0xC8320003,</div><div class='add'>+	0x81C, 0xC7340003,</div><div class='add'>+	0x81C, 0xC6360003,</div><div class='add'>+	0x81C, 0xC5380003,</div><div class='add'>+	0x81C, 0xC43A0003,</div><div class='add'>+	0x81C, 0xC33C0003,</div><div class='add'>+	0x81C, 0xC23E0003,</div><div class='add'>+	0x81C, 0xC1400003,</div><div class='add'>+	0x81C, 0xC0420003,</div><div class='add'>+	0x81C, 0xA5440003,</div><div class='add'>+	0x81C, 0xA4460003,</div><div class='add'>+	0x81C, 0xA3480003,</div><div class='add'>+	0x81C, 0xA24A0003,</div><div class='add'>+	0x81C, 0xA14C0003,</div><div class='add'>+	0x81C, 0x834E0003,</div><div class='add'>+	0x81C, 0x82500003,</div><div class='add'>+	0x81C, 0x81520003,</div><div class='add'>+	0x81C, 0x80540003,</div><div class='add'>+	0x81C, 0x65560003,</div><div class='add'>+	0x81C, 0x64580003,</div><div class='add'>+	0x81C, 0x635A0003,</div><div class='add'>+	0x81C, 0x625C0003,</div><div class='add'>+	0x81C, 0x435E0003,</div><div class='add'>+	0x81C, 0x42600003,</div><div class='add'>+	0x81C, 0x41620003,</div><div class='add'>+	0x81C, 0x40640003,</div><div class='add'>+	0x81C, 0x06660003,</div><div class='add'>+	0x81C, 0x05680003,</div><div class='add'>+	0x81C, 0x046A0003,</div><div class='add'>+	0x81C, 0x036C0003,</div><div class='add'>+	0x81C, 0x026E0003,</div><div class='add'>+	0x81C, 0x01700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFE000003,</div><div class='add'>+	0x81C, 0xFD020003,</div><div class='add'>+	0x81C, 0xFC040003,</div><div class='add'>+	0x81C, 0xFB060003,</div><div class='add'>+	0x81C, 0xFA080003,</div><div class='add'>+	0x81C, 0xF90A0003,</div><div class='add'>+	0x81C, 0xF80C0003,</div><div class='add'>+	0x81C, 0xF70E0003,</div><div class='add'>+	0x81C, 0xF6100003,</div><div class='add'>+	0x81C, 0xF5120003,</div><div class='add'>+	0x81C, 0xF4140003,</div><div class='add'>+	0x81C, 0xF3160003,</div><div class='add'>+	0x81C, 0xF2180003,</div><div class='add'>+	0x81C, 0xF11A0003,</div><div class='add'>+	0x81C, 0xF01C0003,</div><div class='add'>+	0x81C, 0xEF1E0003,</div><div class='add'>+	0x81C, 0xEE200003,</div><div class='add'>+	0x81C, 0xED220003,</div><div class='add'>+	0x81C, 0xEC240003,</div><div class='add'>+	0x81C, 0xEB260003,</div><div class='add'>+	0x81C, 0xEA280003,</div><div class='add'>+	0x81C, 0xE92A0003,</div><div class='add'>+	0x81C, 0xE82C0003,</div><div class='add'>+	0x81C, 0xE72E0003,</div><div class='add'>+	0x81C, 0xE6300003,</div><div class='add'>+	0x81C, 0xE5320003,</div><div class='add'>+	0x81C, 0xC8340003,</div><div class='add'>+	0x81C, 0xC7360003,</div><div class='add'>+	0x81C, 0xC6380003,</div><div class='add'>+	0x81C, 0xC53A0003,</div><div class='add'>+	0x81C, 0xC43C0003,</div><div class='add'>+	0x81C, 0xC33E0003,</div><div class='add'>+	0x81C, 0xC2400003,</div><div class='add'>+	0x81C, 0xC1420003,</div><div class='add'>+	0x81C, 0xC0440003,</div><div class='add'>+	0x81C, 0xA3460003,</div><div class='add'>+	0x81C, 0xA2480003,</div><div class='add'>+	0x81C, 0xA14A0003,</div><div class='add'>+	0x81C, 0xA04C0003,</div><div class='add'>+	0x81C, 0x824E0003,</div><div class='add'>+	0x81C, 0x81500003,</div><div class='add'>+	0x81C, 0x80520003,</div><div class='add'>+	0x81C, 0x64540003,</div><div class='add'>+	0x81C, 0x63560003,</div><div class='add'>+	0x81C, 0x62580003,</div><div class='add'>+	0x81C, 0x445A0003,</div><div class='add'>+	0x81C, 0x435C0003,</div><div class='add'>+	0x81C, 0x425E0003,</div><div class='add'>+	0x81C, 0x41600003,</div><div class='add'>+	0x81C, 0x40620003,</div><div class='add'>+	0x81C, 0x05640003,</div><div class='add'>+	0x81C, 0x04660003,</div><div class='add'>+	0x81C, 0x03680003,</div><div class='add'>+	0x81C, 0x026A0003,</div><div class='add'>+	0x81C, 0x016C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFE000003,</div><div class='add'>+	0x81C, 0xFD020003,</div><div class='add'>+	0x81C, 0xFC040003,</div><div class='add'>+	0x81C, 0xFB060003,</div><div class='add'>+	0x81C, 0xFA080003,</div><div class='add'>+	0x81C, 0xF90A0003,</div><div class='add'>+	0x81C, 0xF80C0003,</div><div class='add'>+	0x81C, 0xF70E0003,</div><div class='add'>+	0x81C, 0xF6100003,</div><div class='add'>+	0x81C, 0xF5120003,</div><div class='add'>+	0x81C, 0xF4140003,</div><div class='add'>+	0x81C, 0xF3160003,</div><div class='add'>+	0x81C, 0xF2180003,</div><div class='add'>+	0x81C, 0xF11A0003,</div><div class='add'>+	0x81C, 0xF01C0003,</div><div class='add'>+	0x81C, 0xEF1E0003,</div><div class='add'>+	0x81C, 0xEE200003,</div><div class='add'>+	0x81C, 0xED220003,</div><div class='add'>+	0x81C, 0xEC240003,</div><div class='add'>+	0x81C, 0xEB260003,</div><div class='add'>+	0x81C, 0xEA280003,</div><div class='add'>+	0x81C, 0xE92A0003,</div><div class='add'>+	0x81C, 0xE82C0003,</div><div class='add'>+	0x81C, 0xE72E0003,</div><div class='add'>+	0x81C, 0xE6300003,</div><div class='add'>+	0x81C, 0xE5320003,</div><div class='add'>+	0x81C, 0xC8340003,</div><div class='add'>+	0x81C, 0xC7360003,</div><div class='add'>+	0x81C, 0xC6380003,</div><div class='add'>+	0x81C, 0xC53A0003,</div><div class='add'>+	0x81C, 0xC43C0003,</div><div class='add'>+	0x81C, 0xC33E0003,</div><div class='add'>+	0x81C, 0xC2400003,</div><div class='add'>+	0x81C, 0xC1420003,</div><div class='add'>+	0x81C, 0xC0440003,</div><div class='add'>+	0x81C, 0xA3460003,</div><div class='add'>+	0x81C, 0xA2480003,</div><div class='add'>+	0x81C, 0xA14A0003,</div><div class='add'>+	0x81C, 0xA04C0003,</div><div class='add'>+	0x81C, 0x824E0003,</div><div class='add'>+	0x81C, 0x81500003,</div><div class='add'>+	0x81C, 0x80520003,</div><div class='add'>+	0x81C, 0x64540003,</div><div class='add'>+	0x81C, 0x63560003,</div><div class='add'>+	0x81C, 0x62580003,</div><div class='add'>+	0x81C, 0x445A0003,</div><div class='add'>+	0x81C, 0x435C0003,</div><div class='add'>+	0x81C, 0x425E0003,</div><div class='add'>+	0x81C, 0x41600003,</div><div class='add'>+	0x81C, 0x40620003,</div><div class='add'>+	0x81C, 0x05640003,</div><div class='add'>+	0x81C, 0x04660003,</div><div class='add'>+	0x81C, 0x03680003,</div><div class='add'>+	0x81C, 0x026A0003,</div><div class='add'>+	0x81C, 0x016C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFC000003,</div><div class='add'>+	0x81C, 0xFB020003,</div><div class='add'>+	0x81C, 0xFA040003,</div><div class='add'>+	0x81C, 0xF9060003,</div><div class='add'>+	0x81C, 0xF8080003,</div><div class='add'>+	0x81C, 0xF70A0003,</div><div class='add'>+	0x81C, 0xF60C0003,</div><div class='add'>+	0x81C, 0xF50E0003,</div><div class='add'>+	0x81C, 0xF4100003,</div><div class='add'>+	0x81C, 0xF3120003,</div><div class='add'>+	0x81C, 0xF2140003,</div><div class='add'>+	0x81C, 0xF1160003,</div><div class='add'>+	0x81C, 0xF0180003,</div><div class='add'>+	0x81C, 0xEF1A0003,</div><div class='add'>+	0x81C, 0xEE1C0003,</div><div class='add'>+	0x81C, 0xED1E0003,</div><div class='add'>+	0x81C, 0xEC200003,</div><div class='add'>+	0x81C, 0xEB220003,</div><div class='add'>+	0x81C, 0xEA240003,</div><div class='add'>+	0x81C, 0xE9260003,</div><div class='add'>+	0x81C, 0xE8280003,</div><div class='add'>+	0x81C, 0xE72A0003,</div><div class='add'>+	0x81C, 0xE62C0003,</div><div class='add'>+	0x81C, 0xE52E0003,</div><div class='add'>+	0x81C, 0xC8300003,</div><div class='add'>+	0x81C, 0xC7320003,</div><div class='add'>+	0x81C, 0xC6340003,</div><div class='add'>+	0x81C, 0xC5360003,</div><div class='add'>+	0x81C, 0xC4380003,</div><div class='add'>+	0x81C, 0xC33A0003,</div><div class='add'>+	0x81C, 0xC23C0003,</div><div class='add'>+	0x81C, 0xC13E0003,</div><div class='add'>+	0x81C, 0xA4400003,</div><div class='add'>+	0x81C, 0xA3420003,</div><div class='add'>+	0x81C, 0xA2440003,</div><div class='add'>+	0x81C, 0xA1460003,</div><div class='add'>+	0x81C, 0xA0480003,</div><div class='add'>+	0x81C, 0x684A0003,</div><div class='add'>+	0x81C, 0x674C0003,</div><div class='add'>+	0x81C, 0x664E0003,</div><div class='add'>+	0x81C, 0x65500003,</div><div class='add'>+	0x81C, 0x64520003,</div><div class='add'>+	0x81C, 0x63540003,</div><div class='add'>+	0x81C, 0x44560003,</div><div class='add'>+	0x81C, 0x43580003,</div><div class='add'>+	0x81C, 0x425A0003,</div><div class='add'>+	0x81C, 0x415C0003,</div><div class='add'>+	0x81C, 0x405E0003,</div><div class='add'>+	0x81C, 0x23600003,</div><div class='add'>+	0x81C, 0x22620003,</div><div class='add'>+	0x81C, 0x21640003,</div><div class='add'>+	0x81C, 0x03660003,</div><div class='add'>+	0x81C, 0x02680003,</div><div class='add'>+	0x81C, 0x016A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFD000003,</div><div class='add'>+	0x81C, 0xFC020003,</div><div class='add'>+	0x81C, 0xFB040003,</div><div class='add'>+	0x81C, 0xFA060003,</div><div class='add'>+	0x81C, 0xF9080003,</div><div class='add'>+	0x81C, 0xF80A0003,</div><div class='add'>+	0x81C, 0xF70C0003,</div><div class='add'>+	0x81C, 0xF60E0003,</div><div class='add'>+	0x81C, 0xF5100003,</div><div class='add'>+	0x81C, 0xF4120003,</div><div class='add'>+	0x81C, 0xF3140003,</div><div class='add'>+	0x81C, 0xF2160003,</div><div class='add'>+	0x81C, 0xF1180003,</div><div class='add'>+	0x81C, 0xF01A0003,</div><div class='add'>+	0x81C, 0xEF1C0003,</div><div class='add'>+	0x81C, 0xEE1E0003,</div><div class='add'>+	0x81C, 0xED200003,</div><div class='add'>+	0x81C, 0xEC220003,</div><div class='add'>+	0x81C, 0xEB240003,</div><div class='add'>+	0x81C, 0xEA260003,</div><div class='add'>+	0x81C, 0xE9280003,</div><div class='add'>+	0x81C, 0xE82A0003,</div><div class='add'>+	0x81C, 0xE72C0003,</div><div class='add'>+	0x81C, 0xE62E0003,</div><div class='add'>+	0x81C, 0xE5300003,</div><div class='add'>+	0x81C, 0xC8320003,</div><div class='add'>+	0x81C, 0xC7340003,</div><div class='add'>+	0x81C, 0xC6360003,</div><div class='add'>+	0x81C, 0xC5380003,</div><div class='add'>+	0x81C, 0xC43A0003,</div><div class='add'>+	0x81C, 0xC33C0003,</div><div class='add'>+	0x81C, 0xC23E0003,</div><div class='add'>+	0x81C, 0xC1400003,</div><div class='add'>+	0x81C, 0xC0420003,</div><div class='add'>+	0x81C, 0xA5440003,</div><div class='add'>+	0x81C, 0xA4460003,</div><div class='add'>+	0x81C, 0xA3480003,</div><div class='add'>+	0x81C, 0xA24A0003,</div><div class='add'>+	0x81C, 0xA14C0003,</div><div class='add'>+	0x81C, 0x834E0003,</div><div class='add'>+	0x81C, 0x82500003,</div><div class='add'>+	0x81C, 0x81520003,</div><div class='add'>+	0x81C, 0x80540003,</div><div class='add'>+	0x81C, 0x65560003,</div><div class='add'>+	0x81C, 0x64580003,</div><div class='add'>+	0x81C, 0x635A0003,</div><div class='add'>+	0x81C, 0x625C0003,</div><div class='add'>+	0x81C, 0x435E0003,</div><div class='add'>+	0x81C, 0x42600003,</div><div class='add'>+	0x81C, 0x41620003,</div><div class='add'>+	0x81C, 0x40640003,</div><div class='add'>+	0x81C, 0x06660003,</div><div class='add'>+	0x81C, 0x05680003,</div><div class='add'>+	0x81C, 0x046A0003,</div><div class='add'>+	0x81C, 0x036C0003,</div><div class='add'>+	0x81C, 0x026E0003,</div><div class='add'>+	0x81C, 0x01700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xDC000003,</div><div class='add'>+	0x81C, 0xDB020003,</div><div class='add'>+	0x81C, 0xDA040003,</div><div class='add'>+	0x81C, 0xD9060003,</div><div class='add'>+	0x81C, 0xD8080003,</div><div class='add'>+	0x81C, 0xD70A0003,</div><div class='add'>+	0x81C, 0xD60C0003,</div><div class='add'>+	0x81C, 0xD50E0003,</div><div class='add'>+	0x81C, 0xD4100003,</div><div class='add'>+	0x81C, 0xD3120003,</div><div class='add'>+	0x81C, 0xD2140003,</div><div class='add'>+	0x81C, 0xD1160003,</div><div class='add'>+	0x81C, 0xD0180003,</div><div class='add'>+	0x81C, 0xB41A0003,</div><div class='add'>+	0x81C, 0xB31C0003,</div><div class='add'>+	0x81C, 0xB21E0003,</div><div class='add'>+	0x81C, 0xB1200003,</div><div class='add'>+	0x81C, 0xB0220003,</div><div class='add'>+	0x81C, 0xAF240003,</div><div class='add'>+	0x81C, 0xAE260003,</div><div class='add'>+	0x81C, 0xAD280003,</div><div class='add'>+	0x81C, 0xAC2A0003,</div><div class='add'>+	0x81C, 0xAB2C0003,</div><div class='add'>+	0x81C, 0x8C2E0003,</div><div class='add'>+	0x81C, 0x8B300003,</div><div class='add'>+	0x81C, 0x8A320003,</div><div class='add'>+	0x81C, 0x89340003,</div><div class='add'>+	0x81C, 0x88360003,</div><div class='add'>+	0x81C, 0x87380003,</div><div class='add'>+	0x81C, 0x863A0003,</div><div class='add'>+	0x81C, 0x853C0003,</div><div class='add'>+	0x81C, 0x693E0003,</div><div class='add'>+	0x81C, 0x68400003,</div><div class='add'>+	0x81C, 0x67420003,</div><div class='add'>+	0x81C, 0x66440003,</div><div class='add'>+	0x81C, 0x65460003,</div><div class='add'>+	0x81C, 0x48480003,</div><div class='add'>+	0x81C, 0x474A0003,</div><div class='add'>+	0x81C, 0x464C0003,</div><div class='add'>+	0x81C, 0x454E0003,</div><div class='add'>+	0x81C, 0x44500003,</div><div class='add'>+	0x81C, 0x43520003,</div><div class='add'>+	0x81C, 0x27540003,</div><div class='add'>+	0x81C, 0x26560003,</div><div class='add'>+	0x81C, 0x25580003,</div><div class='add'>+	0x81C, 0x245A0003,</div><div class='add'>+	0x81C, 0x235C0003,</div><div class='add'>+	0x81C, 0x045E0003,</div><div class='add'>+	0x81C, 0x03600003,</div><div class='add'>+	0x81C, 0x02620003,</div><div class='add'>+	0x81C, 0x01640003,</div><div class='add'>+	0x81C, 0x00660003,</div><div class='add'>+	0x81C, 0x00680003,</div><div class='add'>+	0x81C, 0x006A0003,</div><div class='add'>+	0x81C, 0x006C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000003,</div><div class='add'>+	0x81C, 0xFE000003,</div><div class='add'>+	0x81C, 0xFD020003,</div><div class='add'>+	0x81C, 0xFC040003,</div><div class='add'>+	0x81C, 0xFB060003,</div><div class='add'>+	0x81C, 0xFA080003,</div><div class='add'>+	0x81C, 0xF90A0003,</div><div class='add'>+	0x81C, 0xF80C0003,</div><div class='add'>+	0x81C, 0xF70E0003,</div><div class='add'>+	0x81C, 0xF6100003,</div><div class='add'>+	0x81C, 0xF5120003,</div><div class='add'>+	0x81C, 0xF4140003,</div><div class='add'>+	0x81C, 0xF3160003,</div><div class='add'>+	0x81C, 0xF2180003,</div><div class='add'>+	0x81C, 0xF11A0003,</div><div class='add'>+	0x81C, 0xF01C0003,</div><div class='add'>+	0x81C, 0xEF1E0003,</div><div class='add'>+	0x81C, 0xEE200003,</div><div class='add'>+	0x81C, 0xED220003,</div><div class='add'>+	0x81C, 0xEC240003,</div><div class='add'>+	0x81C, 0xEB260003,</div><div class='add'>+	0x81C, 0xEA280003,</div><div class='add'>+	0x81C, 0xE92A0003,</div><div class='add'>+	0x81C, 0xE82C0003,</div><div class='add'>+	0x81C, 0xE72E0003,</div><div class='add'>+	0x81C, 0xE6300003,</div><div class='add'>+	0x81C, 0xE5320003,</div><div class='add'>+	0x81C, 0xC8340003,</div><div class='add'>+	0x81C, 0xC7360003,</div><div class='add'>+	0x81C, 0xC6380003,</div><div class='add'>+	0x81C, 0xC53A0003,</div><div class='add'>+	0x81C, 0xC43C0003,</div><div class='add'>+	0x81C, 0xC33E0003,</div><div class='add'>+	0x81C, 0xC2400003,</div><div class='add'>+	0x81C, 0xC1420003,</div><div class='add'>+	0x81C, 0xC0440003,</div><div class='add'>+	0x81C, 0xA3460003,</div><div class='add'>+	0x81C, 0xA2480003,</div><div class='add'>+	0x81C, 0xA14A0003,</div><div class='add'>+	0x81C, 0xA04C0003,</div><div class='add'>+	0x81C, 0x824E0003,</div><div class='add'>+	0x81C, 0x81500003,</div><div class='add'>+	0x81C, 0x80520003,</div><div class='add'>+	0x81C, 0x64540003,</div><div class='add'>+	0x81C, 0x63560003,</div><div class='add'>+	0x81C, 0x62580003,</div><div class='add'>+	0x81C, 0x445A0003,</div><div class='add'>+	0x81C, 0x435C0003,</div><div class='add'>+	0x81C, 0x425E0003,</div><div class='add'>+	0x81C, 0x41600003,</div><div class='add'>+	0x81C, 0x40620003,</div><div class='add'>+	0x81C, 0x05640003,</div><div class='add'>+	0x81C, 0x04660003,</div><div class='add'>+	0x81C, 0x03680003,</div><div class='add'>+	0x81C, 0x026A0003,</div><div class='add'>+	0x81C, 0x016C0003,</div><div class='add'>+	0x81C, 0x006E0003,</div><div class='add'>+	0x81C, 0x00700003,</div><div class='add'>+	0x81C, 0x00720003,</div><div class='add'>+	0x81C, 0x00740003,</div><div class='add'>+	0x81C, 0x00760003,</div><div class='add'>+	0x81C, 0x00780003,</div><div class='add'>+	0x81C, 0x007A0003,</div><div class='add'>+	0x81C, 0x007C0003,</div><div class='add'>+	0x81C, 0x007E0003,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000103,</div><div class='add'>+	0x81C, 0xFC020103,</div><div class='add'>+	0x81C, 0xFB040103,</div><div class='add'>+	0x81C, 0xFA060103,</div><div class='add'>+	0x81C, 0xF9080103,</div><div class='add'>+	0x81C, 0xF80A0103,</div><div class='add'>+	0x81C, 0xF70C0103,</div><div class='add'>+	0x81C, 0xF60E0103,</div><div class='add'>+	0x81C, 0xF5100103,</div><div class='add'>+	0x81C, 0xF4120103,</div><div class='add'>+	0x81C, 0xF3140103,</div><div class='add'>+	0x81C, 0xF2160103,</div><div class='add'>+	0x81C, 0xF1180103,</div><div class='add'>+	0x81C, 0xF01A0103,</div><div class='add'>+	0x81C, 0xEE1C0103,</div><div class='add'>+	0x81C, 0xED1E0103,</div><div class='add'>+	0x81C, 0xEC200103,</div><div class='add'>+	0x81C, 0xEB220103,</div><div class='add'>+	0x81C, 0xEA240103,</div><div class='add'>+	0x81C, 0xE9260103,</div><div class='add'>+	0x81C, 0xE8280103,</div><div class='add'>+	0x81C, 0xE72A0103,</div><div class='add'>+	0x81C, 0xE62C0103,</div><div class='add'>+	0x81C, 0xE52E0103,</div><div class='add'>+	0x81C, 0xE4300103,</div><div class='add'>+	0x81C, 0xE3320103,</div><div class='add'>+	0x81C, 0xE2340103,</div><div class='add'>+	0x81C, 0xC5360103,</div><div class='add'>+	0x81C, 0xC4380103,</div><div class='add'>+	0x81C, 0xC33A0103,</div><div class='add'>+	0x81C, 0xC23C0103,</div><div class='add'>+	0x81C, 0xA53E0103,</div><div class='add'>+	0x81C, 0xA4400103,</div><div class='add'>+	0x81C, 0xA3420103,</div><div class='add'>+	0x81C, 0xA2440103,</div><div class='add'>+	0x81C, 0xA1460103,</div><div class='add'>+	0x81C, 0x83480103,</div><div class='add'>+	0x81C, 0x824A0103,</div><div class='add'>+	0x81C, 0x814C0103,</div><div class='add'>+	0x81C, 0x804E0103,</div><div class='add'>+	0x81C, 0x63500103,</div><div class='add'>+	0x81C, 0x62520103,</div><div class='add'>+	0x81C, 0x61540103,</div><div class='add'>+	0x81C, 0x43560103,</div><div class='add'>+	0x81C, 0x42580103,</div><div class='add'>+	0x81C, 0x415A0103,</div><div class='add'>+	0x81C, 0x405C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000103,</div><div class='add'>+	0x81C, 0xF7020103,</div><div class='add'>+	0x81C, 0xF6040103,</div><div class='add'>+	0x81C, 0xF5060103,</div><div class='add'>+	0x81C, 0xF4080103,</div><div class='add'>+	0x81C, 0xF30A0103,</div><div class='add'>+	0x81C, 0xF20C0103,</div><div class='add'>+	0x81C, 0xF10E0103,</div><div class='add'>+	0x81C, 0xF0100103,</div><div class='add'>+	0x81C, 0xEF120103,</div><div class='add'>+	0x81C, 0xEE140103,</div><div class='add'>+	0x81C, 0xED160103,</div><div class='add'>+	0x81C, 0xEC180103,</div><div class='add'>+	0x81C, 0xEB1A0103,</div><div class='add'>+	0x81C, 0xEA1C0103,</div><div class='add'>+	0x81C, 0xE91E0103,</div><div class='add'>+	0x81C, 0xE8200103,</div><div class='add'>+	0x81C, 0xE7220103,</div><div class='add'>+	0x81C, 0xE6240103,</div><div class='add'>+	0x81C, 0xE5260103,</div><div class='add'>+	0x81C, 0xE4280103,</div><div class='add'>+	0x81C, 0xE32A0103,</div><div class='add'>+	0x81C, 0xC32C0103,</div><div class='add'>+	0x81C, 0xC22E0103,</div><div class='add'>+	0x81C, 0xC1300103,</div><div class='add'>+	0x81C, 0xC0320103,</div><div class='add'>+	0x81C, 0xA3340103,</div><div class='add'>+	0x81C, 0xA2360103,</div><div class='add'>+	0x81C, 0xA1380103,</div><div class='add'>+	0x81C, 0xA03A0103,</div><div class='add'>+	0x81C, 0x823C0103,</div><div class='add'>+	0x81C, 0x813E0103,</div><div class='add'>+	0x81C, 0x80400103,</div><div class='add'>+	0x81C, 0x63420103,</div><div class='add'>+	0x81C, 0x62440103,</div><div class='add'>+	0x81C, 0x61460103,</div><div class='add'>+	0x81C, 0x60480103,</div><div class='add'>+	0x81C, 0x424A0103,</div><div class='add'>+	0x81C, 0x414C0103,</div><div class='add'>+	0x81C, 0x404E0103,</div><div class='add'>+	0x81C, 0x06500103,</div><div class='add'>+	0x81C, 0x05520103,</div><div class='add'>+	0x81C, 0x04540103,</div><div class='add'>+	0x81C, 0x03560103,</div><div class='add'>+	0x81C, 0x02580103,</div><div class='add'>+	0x81C, 0x015A0103,</div><div class='add'>+	0x81C, 0x005C0103,</div><div class='add'>+	0x81C, 0x005E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000103,</div><div class='add'>+	0x81C, 0xF7020103,</div><div class='add'>+	0x81C, 0xF6040103,</div><div class='add'>+	0x81C, 0xF5060103,</div><div class='add'>+	0x81C, 0xF4080103,</div><div class='add'>+	0x81C, 0xF30A0103,</div><div class='add'>+	0x81C, 0xF20C0103,</div><div class='add'>+	0x81C, 0xF10E0103,</div><div class='add'>+	0x81C, 0xF0100103,</div><div class='add'>+	0x81C, 0xEF120103,</div><div class='add'>+	0x81C, 0xEE140103,</div><div class='add'>+	0x81C, 0xED160103,</div><div class='add'>+	0x81C, 0xEC180103,</div><div class='add'>+	0x81C, 0xEB1A0103,</div><div class='add'>+	0x81C, 0xEA1C0103,</div><div class='add'>+	0x81C, 0xE91E0103,</div><div class='add'>+	0x81C, 0xE8200103,</div><div class='add'>+	0x81C, 0xE7220103,</div><div class='add'>+	0x81C, 0xE6240103,</div><div class='add'>+	0x81C, 0xE5260103,</div><div class='add'>+	0x81C, 0xE4280103,</div><div class='add'>+	0x81C, 0xE32A0103,</div><div class='add'>+	0x81C, 0xC32C0103,</div><div class='add'>+	0x81C, 0xC22E0103,</div><div class='add'>+	0x81C, 0xC1300103,</div><div class='add'>+	0x81C, 0xC0320103,</div><div class='add'>+	0x81C, 0xA3340103,</div><div class='add'>+	0x81C, 0xA2360103,</div><div class='add'>+	0x81C, 0xA1380103,</div><div class='add'>+	0x81C, 0xA03A0103,</div><div class='add'>+	0x81C, 0x823C0103,</div><div class='add'>+	0x81C, 0x813E0103,</div><div class='add'>+	0x81C, 0x80400103,</div><div class='add'>+	0x81C, 0x63420103,</div><div class='add'>+	0x81C, 0x62440103,</div><div class='add'>+	0x81C, 0x61460103,</div><div class='add'>+	0x81C, 0x60480103,</div><div class='add'>+	0x81C, 0x424A0103,</div><div class='add'>+	0x81C, 0x414C0103,</div><div class='add'>+	0x81C, 0x404E0103,</div><div class='add'>+	0x81C, 0x22500103,</div><div class='add'>+	0x81C, 0x21520103,</div><div class='add'>+	0x81C, 0x20540103,</div><div class='add'>+	0x81C, 0x03560103,</div><div class='add'>+	0x81C, 0x02580103,</div><div class='add'>+	0x81C, 0x015A0103,</div><div class='add'>+	0x81C, 0x005C0103,</div><div class='add'>+	0x81C, 0x005E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000103,</div><div class='add'>+	0x81C, 0xFD020103,</div><div class='add'>+	0x81C, 0xFC040103,</div><div class='add'>+	0x81C, 0xFB060103,</div><div class='add'>+	0x81C, 0xFA080103,</div><div class='add'>+	0x81C, 0xF90A0103,</div><div class='add'>+	0x81C, 0xF80C0103,</div><div class='add'>+	0x81C, 0xF70E0103,</div><div class='add'>+	0x81C, 0xF6100103,</div><div class='add'>+	0x81C, 0xF5120103,</div><div class='add'>+	0x81C, 0xF4140103,</div><div class='add'>+	0x81C, 0xF3160103,</div><div class='add'>+	0x81C, 0xF2180103,</div><div class='add'>+	0x81C, 0xF11A0103,</div><div class='add'>+	0x81C, 0xF01C0103,</div><div class='add'>+	0x81C, 0xEF1E0103,</div><div class='add'>+	0x81C, 0xEE200103,</div><div class='add'>+	0x81C, 0xED220103,</div><div class='add'>+	0x81C, 0xEC240103,</div><div class='add'>+	0x81C, 0xEB260103,</div><div class='add'>+	0x81C, 0xEA280103,</div><div class='add'>+	0x81C, 0xE92A0103,</div><div class='add'>+	0x81C, 0xE82C0103,</div><div class='add'>+	0x81C, 0xE72E0103,</div><div class='add'>+	0x81C, 0xE6300103,</div><div class='add'>+	0x81C, 0xE5320103,</div><div class='add'>+	0x81C, 0xE4340103,</div><div class='add'>+	0x81C, 0xE3360103,</div><div class='add'>+	0x81C, 0xC6380103,</div><div class='add'>+	0x81C, 0xC53A0103,</div><div class='add'>+	0x81C, 0xC43C0103,</div><div class='add'>+	0x81C, 0xC33E0103,</div><div class='add'>+	0x81C, 0xA5400103,</div><div class='add'>+	0x81C, 0xA4420103,</div><div class='add'>+	0x81C, 0xA3440103,</div><div class='add'>+	0x81C, 0xA2460103,</div><div class='add'>+	0x81C, 0xA1480103,</div><div class='add'>+	0x81C, 0xA04A0103,</div><div class='add'>+	0x81C, 0x824C0103,</div><div class='add'>+	0x81C, 0x814E0103,</div><div class='add'>+	0x81C, 0x80500103,</div><div class='add'>+	0x81C, 0x64520103,</div><div class='add'>+	0x81C, 0x63540103,</div><div class='add'>+	0x81C, 0x62560103,</div><div class='add'>+	0x81C, 0x61580103,</div><div class='add'>+	0x81C, 0x605A0103,</div><div class='add'>+	0x81C, 0x235C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000103,</div><div class='add'>+	0x81C, 0xF7020103,</div><div class='add'>+	0x81C, 0xF6040103,</div><div class='add'>+	0x81C, 0xF5060103,</div><div class='add'>+	0x81C, 0xF4080103,</div><div class='add'>+	0x81C, 0xF30A0103,</div><div class='add'>+	0x81C, 0xF20C0103,</div><div class='add'>+	0x81C, 0xF10E0103,</div><div class='add'>+	0x81C, 0xF0100103,</div><div class='add'>+	0x81C, 0xEF120103,</div><div class='add'>+	0x81C, 0xEE140103,</div><div class='add'>+	0x81C, 0xED160103,</div><div class='add'>+	0x81C, 0xEC180103,</div><div class='add'>+	0x81C, 0xEB1A0103,</div><div class='add'>+	0x81C, 0xEA1C0103,</div><div class='add'>+	0x81C, 0xE91E0103,</div><div class='add'>+	0x81C, 0xE8200103,</div><div class='add'>+	0x81C, 0xE7220103,</div><div class='add'>+	0x81C, 0xE6240103,</div><div class='add'>+	0x81C, 0xE5260103,</div><div class='add'>+	0x81C, 0xE4280103,</div><div class='add'>+	0x81C, 0xE32A0103,</div><div class='add'>+	0x81C, 0xC32C0103,</div><div class='add'>+	0x81C, 0xC22E0103,</div><div class='add'>+	0x81C, 0xC1300103,</div><div class='add'>+	0x81C, 0xC0320103,</div><div class='add'>+	0x81C, 0xA3340103,</div><div class='add'>+	0x81C, 0xA2360103,</div><div class='add'>+	0x81C, 0xA1380103,</div><div class='add'>+	0x81C, 0xA03A0103,</div><div class='add'>+	0x81C, 0x823C0103,</div><div class='add'>+	0x81C, 0x813E0103,</div><div class='add'>+	0x81C, 0x80400103,</div><div class='add'>+	0x81C, 0x63420103,</div><div class='add'>+	0x81C, 0x62440103,</div><div class='add'>+	0x81C, 0x61460103,</div><div class='add'>+	0x81C, 0x60480103,</div><div class='add'>+	0x81C, 0x424A0103,</div><div class='add'>+	0x81C, 0x414C0103,</div><div class='add'>+	0x81C, 0x404E0103,</div><div class='add'>+	0x81C, 0x22500103,</div><div class='add'>+	0x81C, 0x21520103,</div><div class='add'>+	0x81C, 0x20540103,</div><div class='add'>+	0x81C, 0x03560103,</div><div class='add'>+	0x81C, 0x02580103,</div><div class='add'>+	0x81C, 0x015A0103,</div><div class='add'>+	0x81C, 0x005C0103,</div><div class='add'>+	0x81C, 0x005E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000103,</div><div class='add'>+	0x81C, 0xFC020103,</div><div class='add'>+	0x81C, 0xFB040103,</div><div class='add'>+	0x81C, 0xFA060103,</div><div class='add'>+	0x81C, 0xF9080103,</div><div class='add'>+	0x81C, 0xF80A0103,</div><div class='add'>+	0x81C, 0xF70C0103,</div><div class='add'>+	0x81C, 0xF60E0103,</div><div class='add'>+	0x81C, 0xF5100103,</div><div class='add'>+	0x81C, 0xF4120103,</div><div class='add'>+	0x81C, 0xF3140103,</div><div class='add'>+	0x81C, 0xF2160103,</div><div class='add'>+	0x81C, 0xF1180103,</div><div class='add'>+	0x81C, 0xF01A0103,</div><div class='add'>+	0x81C, 0xEF1C0103,</div><div class='add'>+	0x81C, 0xEE1E0103,</div><div class='add'>+	0x81C, 0xED200103,</div><div class='add'>+	0x81C, 0xEC220103,</div><div class='add'>+	0x81C, 0xEB240103,</div><div class='add'>+	0x81C, 0xEA260103,</div><div class='add'>+	0x81C, 0xE9280103,</div><div class='add'>+	0x81C, 0xE82A0103,</div><div class='add'>+	0x81C, 0xE72C0103,</div><div class='add'>+	0x81C, 0xE62E0103,</div><div class='add'>+	0x81C, 0xE5300103,</div><div class='add'>+	0x81C, 0xE4320103,</div><div class='add'>+	0x81C, 0xE3340103,</div><div class='add'>+	0x81C, 0xE2360103,</div><div class='add'>+	0x81C, 0xC5380103,</div><div class='add'>+	0x81C, 0xC43A0103,</div><div class='add'>+	0x81C, 0xC33C0103,</div><div class='add'>+	0x81C, 0xC23E0103,</div><div class='add'>+	0x81C, 0xA5400103,</div><div class='add'>+	0x81C, 0xA4420103,</div><div class='add'>+	0x81C, 0xA3440103,</div><div class='add'>+	0x81C, 0xA2460103,</div><div class='add'>+	0x81C, 0xA1480103,</div><div class='add'>+	0x81C, 0x834A0103,</div><div class='add'>+	0x81C, 0x824C0103,</div><div class='add'>+	0x81C, 0x814E0103,</div><div class='add'>+	0x81C, 0x64500103,</div><div class='add'>+	0x81C, 0x63520103,</div><div class='add'>+	0x81C, 0x62540103,</div><div class='add'>+	0x81C, 0x61560103,</div><div class='add'>+	0x81C, 0x42580103,</div><div class='add'>+	0x81C, 0x415A0103,</div><div class='add'>+	0x81C, 0x405C0103,</div><div class='add'>+	0x81C, 0x065E0103,</div><div class='add'>+	0x81C, 0x05600103,</div><div class='add'>+	0x81C, 0x04620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFA000103,</div><div class='add'>+	0x81C, 0xF9020103,</div><div class='add'>+	0x81C, 0xF8040103,</div><div class='add'>+	0x81C, 0xF7060103,</div><div class='add'>+	0x81C, 0xF6080103,</div><div class='add'>+	0x81C, 0xF50A0103,</div><div class='add'>+	0x81C, 0xF40C0103,</div><div class='add'>+	0x81C, 0xF30E0103,</div><div class='add'>+	0x81C, 0xF2100103,</div><div class='add'>+	0x81C, 0xF1120103,</div><div class='add'>+	0x81C, 0xF0140103,</div><div class='add'>+	0x81C, 0xEF160103,</div><div class='add'>+	0x81C, 0xEE180103,</div><div class='add'>+	0x81C, 0xED1A0103,</div><div class='add'>+	0x81C, 0xEC1C0103,</div><div class='add'>+	0x81C, 0xEB1E0103,</div><div class='add'>+	0x81C, 0xEA200103,</div><div class='add'>+	0x81C, 0xE9220103,</div><div class='add'>+	0x81C, 0xE8240103,</div><div class='add'>+	0x81C, 0xE7260103,</div><div class='add'>+	0x81C, 0xE6280103,</div><div class='add'>+	0x81C, 0xE52A0103,</div><div class='add'>+	0x81C, 0xC42C0103,</div><div class='add'>+	0x81C, 0xC32E0103,</div><div class='add'>+	0x81C, 0xC2300103,</div><div class='add'>+	0x81C, 0xC1320103,</div><div class='add'>+	0x81C, 0xA4340103,</div><div class='add'>+	0x81C, 0xA3360103,</div><div class='add'>+	0x81C, 0xA2380103,</div><div class='add'>+	0x81C, 0xA13A0103,</div><div class='add'>+	0x81C, 0x833C0103,</div><div class='add'>+	0x81C, 0x823E0103,</div><div class='add'>+	0x81C, 0x81400103,</div><div class='add'>+	0x81C, 0x63420103,</div><div class='add'>+	0x81C, 0x62440103,</div><div class='add'>+	0x81C, 0x61460103,</div><div class='add'>+	0x81C, 0x60480103,</div><div class='add'>+	0x81C, 0x424A0103,</div><div class='add'>+	0x81C, 0x414C0103,</div><div class='add'>+	0x81C, 0x404E0103,</div><div class='add'>+	0x81C, 0x22500103,</div><div class='add'>+	0x81C, 0x21520103,</div><div class='add'>+	0x81C, 0x20540103,</div><div class='add'>+	0x81C, 0x03560103,</div><div class='add'>+	0x81C, 0x02580103,</div><div class='add'>+	0x81C, 0x015A0103,</div><div class='add'>+	0x81C, 0x005C0103,</div><div class='add'>+	0x81C, 0x005E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000103,</div><div class='add'>+	0x81C, 0xF7020103,</div><div class='add'>+	0x81C, 0xF6040103,</div><div class='add'>+	0x81C, 0xF5060103,</div><div class='add'>+	0x81C, 0xF4080103,</div><div class='add'>+	0x81C, 0xF30A0103,</div><div class='add'>+	0x81C, 0xF20C0103,</div><div class='add'>+	0x81C, 0xF10E0103,</div><div class='add'>+	0x81C, 0xF0100103,</div><div class='add'>+	0x81C, 0xEF120103,</div><div class='add'>+	0x81C, 0xEE140103,</div><div class='add'>+	0x81C, 0xED160103,</div><div class='add'>+	0x81C, 0xEC180103,</div><div class='add'>+	0x81C, 0xEB1A0103,</div><div class='add'>+	0x81C, 0xEA1C0103,</div><div class='add'>+	0x81C, 0xE91E0103,</div><div class='add'>+	0x81C, 0xE8200103,</div><div class='add'>+	0x81C, 0xE7220103,</div><div class='add'>+	0x81C, 0xE6240103,</div><div class='add'>+	0x81C, 0xE5260103,</div><div class='add'>+	0x81C, 0xE4280103,</div><div class='add'>+	0x81C, 0xE32A0103,</div><div class='add'>+	0x81C, 0xE22C0103,</div><div class='add'>+	0x81C, 0xC32E0103,</div><div class='add'>+	0x81C, 0xC2300103,</div><div class='add'>+	0x81C, 0xC1320103,</div><div class='add'>+	0x81C, 0xA3340103,</div><div class='add'>+	0x81C, 0xA2360103,</div><div class='add'>+	0x81C, 0xA1380103,</div><div class='add'>+	0x81C, 0xA03A0103,</div><div class='add'>+	0x81C, 0x823C0103,</div><div class='add'>+	0x81C, 0x813E0103,</div><div class='add'>+	0x81C, 0x80400103,</div><div class='add'>+	0x81C, 0x64420103,</div><div class='add'>+	0x81C, 0x63440103,</div><div class='add'>+	0x81C, 0x62460103,</div><div class='add'>+	0x81C, 0x61480103,</div><div class='add'>+	0x81C, 0x434A0103,</div><div class='add'>+	0x81C, 0x424C0103,</div><div class='add'>+	0x81C, 0x414E0103,</div><div class='add'>+	0x81C, 0x40500103,</div><div class='add'>+	0x81C, 0x22520103,</div><div class='add'>+	0x81C, 0x21540103,</div><div class='add'>+	0x81C, 0x20560103,</div><div class='add'>+	0x81C, 0x04580103,</div><div class='add'>+	0x81C, 0x035A0103,</div><div class='add'>+	0x81C, 0x025C0103,</div><div class='add'>+	0x81C, 0x015E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000103,</div><div class='add'>+	0x81C, 0xFC020103,</div><div class='add'>+	0x81C, 0xFB040103,</div><div class='add'>+	0x81C, 0xFA060103,</div><div class='add'>+	0x81C, 0xF9080103,</div><div class='add'>+	0x81C, 0xF80A0103,</div><div class='add'>+	0x81C, 0xF70C0103,</div><div class='add'>+	0x81C, 0xF60E0103,</div><div class='add'>+	0x81C, 0xF5100103,</div><div class='add'>+	0x81C, 0xF4120103,</div><div class='add'>+	0x81C, 0xF3140103,</div><div class='add'>+	0x81C, 0xF2160103,</div><div class='add'>+	0x81C, 0xF1180103,</div><div class='add'>+	0x81C, 0xF01A0103,</div><div class='add'>+	0x81C, 0xEF1C0103,</div><div class='add'>+	0x81C, 0xEE1E0103,</div><div class='add'>+	0x81C, 0xED200103,</div><div class='add'>+	0x81C, 0xEC220103,</div><div class='add'>+	0x81C, 0xEB240103,</div><div class='add'>+	0x81C, 0xEA260103,</div><div class='add'>+	0x81C, 0xE9280103,</div><div class='add'>+	0x81C, 0xE82A0103,</div><div class='add'>+	0x81C, 0xE72C0103,</div><div class='add'>+	0x81C, 0xE62E0103,</div><div class='add'>+	0x81C, 0xE5300103,</div><div class='add'>+	0x81C, 0xE4320103,</div><div class='add'>+	0x81C, 0xE3340103,</div><div class='add'>+	0x81C, 0xC6360103,</div><div class='add'>+	0x81C, 0xC5380103,</div><div class='add'>+	0x81C, 0xC43A0103,</div><div class='add'>+	0x81C, 0xC33C0103,</div><div class='add'>+	0x81C, 0xC23E0103,</div><div class='add'>+	0x81C, 0xA5400103,</div><div class='add'>+	0x81C, 0xA4420103,</div><div class='add'>+	0x81C, 0xA3440103,</div><div class='add'>+	0x81C, 0xA2460103,</div><div class='add'>+	0x81C, 0xA1480103,</div><div class='add'>+	0x81C, 0x834A0103,</div><div class='add'>+	0x81C, 0x824C0103,</div><div class='add'>+	0x81C, 0x814E0103,</div><div class='add'>+	0x81C, 0x63500103,</div><div class='add'>+	0x81C, 0x62520103,</div><div class='add'>+	0x81C, 0x61540103,</div><div class='add'>+	0x81C, 0x43560103,</div><div class='add'>+	0x81C, 0x42580103,</div><div class='add'>+	0x81C, 0x245A0103,</div><div class='add'>+	0x81C, 0x235C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x04620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000103,</div><div class='add'>+	0x81C, 0xF7020103,</div><div class='add'>+	0x81C, 0xF6040103,</div><div class='add'>+	0x81C, 0xF5060103,</div><div class='add'>+	0x81C, 0xF4080103,</div><div class='add'>+	0x81C, 0xF30A0103,</div><div class='add'>+	0x81C, 0xF20C0103,</div><div class='add'>+	0x81C, 0xF10E0103,</div><div class='add'>+	0x81C, 0xF0100103,</div><div class='add'>+	0x81C, 0xEF120103,</div><div class='add'>+	0x81C, 0xEE140103,</div><div class='add'>+	0x81C, 0xED160103,</div><div class='add'>+	0x81C, 0xEC180103,</div><div class='add'>+	0x81C, 0xEB1A0103,</div><div class='add'>+	0x81C, 0xEA1C0103,</div><div class='add'>+	0x81C, 0xE91E0103,</div><div class='add'>+	0x81C, 0xE8200103,</div><div class='add'>+	0x81C, 0xE7220103,</div><div class='add'>+	0x81C, 0xE6240103,</div><div class='add'>+	0x81C, 0xE5260103,</div><div class='add'>+	0x81C, 0xE4280103,</div><div class='add'>+	0x81C, 0xE32A0103,</div><div class='add'>+	0x81C, 0xE22C0103,</div><div class='add'>+	0x81C, 0xC32E0103,</div><div class='add'>+	0x81C, 0xC2300103,</div><div class='add'>+	0x81C, 0xC1320103,</div><div class='add'>+	0x81C, 0xA3340103,</div><div class='add'>+	0x81C, 0xA2360103,</div><div class='add'>+	0x81C, 0xA1380103,</div><div class='add'>+	0x81C, 0xA03A0103,</div><div class='add'>+	0x81C, 0x823C0103,</div><div class='add'>+	0x81C, 0x813E0103,</div><div class='add'>+	0x81C, 0x80400103,</div><div class='add'>+	0x81C, 0x64420103,</div><div class='add'>+	0x81C, 0x63440103,</div><div class='add'>+	0x81C, 0x62460103,</div><div class='add'>+	0x81C, 0x61480103,</div><div class='add'>+	0x81C, 0x434A0103,</div><div class='add'>+	0x81C, 0x424C0103,</div><div class='add'>+	0x81C, 0x414E0103,</div><div class='add'>+	0x81C, 0x40500103,</div><div class='add'>+	0x81C, 0x22520103,</div><div class='add'>+	0x81C, 0x21540103,</div><div class='add'>+	0x81C, 0x20560103,</div><div class='add'>+	0x81C, 0x04580103,</div><div class='add'>+	0x81C, 0x035A0103,</div><div class='add'>+	0x81C, 0x025C0103,</div><div class='add'>+	0x81C, 0x015E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000103,</div><div class='add'>+	0x81C, 0xFC020103,</div><div class='add'>+	0x81C, 0xFB040103,</div><div class='add'>+	0x81C, 0xFA060103,</div><div class='add'>+	0x81C, 0xF9080103,</div><div class='add'>+	0x81C, 0xF80A0103,</div><div class='add'>+	0x81C, 0xF70C0103,</div><div class='add'>+	0x81C, 0xF60E0103,</div><div class='add'>+	0x81C, 0xF5100103,</div><div class='add'>+	0x81C, 0xF4120103,</div><div class='add'>+	0x81C, 0xF3140103,</div><div class='add'>+	0x81C, 0xF2160103,</div><div class='add'>+	0x81C, 0xF1180103,</div><div class='add'>+	0x81C, 0xF01A0103,</div><div class='add'>+	0x81C, 0xEE1C0103,</div><div class='add'>+	0x81C, 0xED1E0103,</div><div class='add'>+	0x81C, 0xEC200103,</div><div class='add'>+	0x81C, 0xEB220103,</div><div class='add'>+	0x81C, 0xEA240103,</div><div class='add'>+	0x81C, 0xE9260103,</div><div class='add'>+	0x81C, 0xE8280103,</div><div class='add'>+	0x81C, 0xE72A0103,</div><div class='add'>+	0x81C, 0xE62C0103,</div><div class='add'>+	0x81C, 0xE52E0103,</div><div class='add'>+	0x81C, 0xE4300103,</div><div class='add'>+	0x81C, 0xE3320103,</div><div class='add'>+	0x81C, 0xE2340103,</div><div class='add'>+	0x81C, 0xC5360103,</div><div class='add'>+	0x81C, 0xC4380103,</div><div class='add'>+	0x81C, 0xC33A0103,</div><div class='add'>+	0x81C, 0xC23C0103,</div><div class='add'>+	0x81C, 0xA53E0103,</div><div class='add'>+	0x81C, 0xA4400103,</div><div class='add'>+	0x81C, 0xA3420103,</div><div class='add'>+	0x81C, 0xA2440103,</div><div class='add'>+	0x81C, 0xA1460103,</div><div class='add'>+	0x81C, 0x83480103,</div><div class='add'>+	0x81C, 0x824A0103,</div><div class='add'>+	0x81C, 0x814C0103,</div><div class='add'>+	0x81C, 0x804E0103,</div><div class='add'>+	0x81C, 0x63500103,</div><div class='add'>+	0x81C, 0x62520103,</div><div class='add'>+	0x81C, 0x61540103,</div><div class='add'>+	0x81C, 0x43560103,</div><div class='add'>+	0x81C, 0x42580103,</div><div class='add'>+	0x81C, 0x415A0103,</div><div class='add'>+	0x81C, 0x405C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000103,</div><div class='add'>+	0x81C, 0xF8020103,</div><div class='add'>+	0x81C, 0xF7040103,</div><div class='add'>+	0x81C, 0xF6060103,</div><div class='add'>+	0x81C, 0xF5080103,</div><div class='add'>+	0x81C, 0xF40A0103,</div><div class='add'>+	0x81C, 0xF30C0103,</div><div class='add'>+	0x81C, 0xF20E0103,</div><div class='add'>+	0x81C, 0xF1100103,</div><div class='add'>+	0x81C, 0xF0120103,</div><div class='add'>+	0x81C, 0xEF140103,</div><div class='add'>+	0x81C, 0xEE160103,</div><div class='add'>+	0x81C, 0xED180103,</div><div class='add'>+	0x81C, 0xEC1A0103,</div><div class='add'>+	0x81C, 0xEB1C0103,</div><div class='add'>+	0x81C, 0xEA1E0103,</div><div class='add'>+	0x81C, 0xE9200103,</div><div class='add'>+	0x81C, 0xE8220103,</div><div class='add'>+	0x81C, 0xE7240103,</div><div class='add'>+	0x81C, 0xE6260103,</div><div class='add'>+	0x81C, 0xE5280103,</div><div class='add'>+	0x81C, 0xE42A0103,</div><div class='add'>+	0x81C, 0xE32C0103,</div><div class='add'>+	0x81C, 0xC32E0103,</div><div class='add'>+	0x81C, 0xC2300103,</div><div class='add'>+	0x81C, 0xC1320103,</div><div class='add'>+	0x81C, 0xA4340103,</div><div class='add'>+	0x81C, 0xA3360103,</div><div class='add'>+	0x81C, 0xA2380103,</div><div class='add'>+	0x81C, 0xA13A0103,</div><div class='add'>+	0x81C, 0xA03C0103,</div><div class='add'>+	0x81C, 0x823E0103,</div><div class='add'>+	0x81C, 0x81400103,</div><div class='add'>+	0x81C, 0x80420103,</div><div class='add'>+	0x81C, 0x63440103,</div><div class='add'>+	0x81C, 0x62460103,</div><div class='add'>+	0x81C, 0x61480103,</div><div class='add'>+	0x81C, 0x604A0103,</div><div class='add'>+	0x81C, 0x244C0103,</div><div class='add'>+	0x81C, 0x234E0103,</div><div class='add'>+	0x81C, 0x22500103,</div><div class='add'>+	0x81C, 0x21520103,</div><div class='add'>+	0x81C, 0x20540103,</div><div class='add'>+	0x81C, 0x05560103,</div><div class='add'>+	0x81C, 0x04580103,</div><div class='add'>+	0x81C, 0x035A0103,</div><div class='add'>+	0x81C, 0x025C0103,</div><div class='add'>+	0x81C, 0x015E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000103,</div><div class='add'>+	0x81C, 0xFD020103,</div><div class='add'>+	0x81C, 0xFC040103,</div><div class='add'>+	0x81C, 0xFB060103,</div><div class='add'>+	0x81C, 0xFA080103,</div><div class='add'>+	0x81C, 0xF90A0103,</div><div class='add'>+	0x81C, 0xF80C0103,</div><div class='add'>+	0x81C, 0xF70E0103,</div><div class='add'>+	0x81C, 0xF6100103,</div><div class='add'>+	0x81C, 0xF5120103,</div><div class='add'>+	0x81C, 0xF4140103,</div><div class='add'>+	0x81C, 0xF3160103,</div><div class='add'>+	0x81C, 0xF2180103,</div><div class='add'>+	0x81C, 0xF11A0103,</div><div class='add'>+	0x81C, 0xF01C0103,</div><div class='add'>+	0x81C, 0xEF1E0103,</div><div class='add'>+	0x81C, 0xEE200103,</div><div class='add'>+	0x81C, 0xED220103,</div><div class='add'>+	0x81C, 0xEC240103,</div><div class='add'>+	0x81C, 0xEB260103,</div><div class='add'>+	0x81C, 0xEA280103,</div><div class='add'>+	0x81C, 0xE92A0103,</div><div class='add'>+	0x81C, 0xE82C0103,</div><div class='add'>+	0x81C, 0xE72E0103,</div><div class='add'>+	0x81C, 0xE6300103,</div><div class='add'>+	0x81C, 0xE5320103,</div><div class='add'>+	0x81C, 0xE4340103,</div><div class='add'>+	0x81C, 0xE3360103,</div><div class='add'>+	0x81C, 0xC6380103,</div><div class='add'>+	0x81C, 0xC53A0103,</div><div class='add'>+	0x81C, 0xC43C0103,</div><div class='add'>+	0x81C, 0xC33E0103,</div><div class='add'>+	0x81C, 0xA5400103,</div><div class='add'>+	0x81C, 0xA4420103,</div><div class='add'>+	0x81C, 0xA3440103,</div><div class='add'>+	0x81C, 0xA2460103,</div><div class='add'>+	0x81C, 0xA1480103,</div><div class='add'>+	0x81C, 0xA04A0103,</div><div class='add'>+	0x81C, 0x824C0103,</div><div class='add'>+	0x81C, 0x814E0103,</div><div class='add'>+	0x81C, 0x80500103,</div><div class='add'>+	0x81C, 0x64520103,</div><div class='add'>+	0x81C, 0x63540103,</div><div class='add'>+	0x81C, 0x62560103,</div><div class='add'>+	0x81C, 0x61580103,</div><div class='add'>+	0x81C, 0x605A0103,</div><div class='add'>+	0x81C, 0x235C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000103,</div><div class='add'>+	0x81C, 0xFB020103,</div><div class='add'>+	0x81C, 0xFA040103,</div><div class='add'>+	0x81C, 0xF9060103,</div><div class='add'>+	0x81C, 0xF8080103,</div><div class='add'>+	0x81C, 0xF70A0103,</div><div class='add'>+	0x81C, 0xF60C0103,</div><div class='add'>+	0x81C, 0xF50E0103,</div><div class='add'>+	0x81C, 0xF4100103,</div><div class='add'>+	0x81C, 0xF3120103,</div><div class='add'>+	0x81C, 0xF2140103,</div><div class='add'>+	0x81C, 0xF1160103,</div><div class='add'>+	0x81C, 0xF0180103,</div><div class='add'>+	0x81C, 0xEE1A0103,</div><div class='add'>+	0x81C, 0xED1C0103,</div><div class='add'>+	0x81C, 0xEC1E0103,</div><div class='add'>+	0x81C, 0xEB200103,</div><div class='add'>+	0x81C, 0xEA220103,</div><div class='add'>+	0x81C, 0xE9240103,</div><div class='add'>+	0x81C, 0xE8260103,</div><div class='add'>+	0x81C, 0xE7280103,</div><div class='add'>+	0x81C, 0xE62A0103,</div><div class='add'>+	0x81C, 0xE52C0103,</div><div class='add'>+	0x81C, 0xE42E0103,</div><div class='add'>+	0x81C, 0xE3300103,</div><div class='add'>+	0x81C, 0xE2320103,</div><div class='add'>+	0x81C, 0xE1340103,</div><div class='add'>+	0x81C, 0xC5360103,</div><div class='add'>+	0x81C, 0xC4380103,</div><div class='add'>+	0x81C, 0xC33A0103,</div><div class='add'>+	0x81C, 0xC23C0103,</div><div class='add'>+	0x81C, 0xA53E0103,</div><div class='add'>+	0x81C, 0xA4400103,</div><div class='add'>+	0x81C, 0xA3420103,</div><div class='add'>+	0x81C, 0xA2440103,</div><div class='add'>+	0x81C, 0xA1460103,</div><div class='add'>+	0x81C, 0x83480103,</div><div class='add'>+	0x81C, 0x824A0103,</div><div class='add'>+	0x81C, 0x814C0103,</div><div class='add'>+	0x81C, 0x804E0103,</div><div class='add'>+	0x81C, 0x63500103,</div><div class='add'>+	0x81C, 0x62520103,</div><div class='add'>+	0x81C, 0x61540103,</div><div class='add'>+	0x81C, 0x43560103,</div><div class='add'>+	0x81C, 0x42580103,</div><div class='add'>+	0x81C, 0x415A0103,</div><div class='add'>+	0x81C, 0x405C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000103,</div><div class='add'>+	0x81C, 0xFC020103,</div><div class='add'>+	0x81C, 0xFB040103,</div><div class='add'>+	0x81C, 0xFA060103,</div><div class='add'>+	0x81C, 0xF9080103,</div><div class='add'>+	0x81C, 0xF80A0103,</div><div class='add'>+	0x81C, 0xF70C0103,</div><div class='add'>+	0x81C, 0xF60E0103,</div><div class='add'>+	0x81C, 0xF5100103,</div><div class='add'>+	0x81C, 0xF4120103,</div><div class='add'>+	0x81C, 0xF3140103,</div><div class='add'>+	0x81C, 0xF2160103,</div><div class='add'>+	0x81C, 0xF1180103,</div><div class='add'>+	0x81C, 0xF01A0103,</div><div class='add'>+	0x81C, 0xEE1C0103,</div><div class='add'>+	0x81C, 0xED1E0103,</div><div class='add'>+	0x81C, 0xEC200103,</div><div class='add'>+	0x81C, 0xEB220103,</div><div class='add'>+	0x81C, 0xEA240103,</div><div class='add'>+	0x81C, 0xE9260103,</div><div class='add'>+	0x81C, 0xE8280103,</div><div class='add'>+	0x81C, 0xE72A0103,</div><div class='add'>+	0x81C, 0xE62C0103,</div><div class='add'>+	0x81C, 0xE52E0103,</div><div class='add'>+	0x81C, 0xE4300103,</div><div class='add'>+	0x81C, 0xE3320103,</div><div class='add'>+	0x81C, 0xE2340103,</div><div class='add'>+	0x81C, 0xC5360103,</div><div class='add'>+	0x81C, 0xC4380103,</div><div class='add'>+	0x81C, 0xC33A0103,</div><div class='add'>+	0x81C, 0xC23C0103,</div><div class='add'>+	0x81C, 0xA53E0103,</div><div class='add'>+	0x81C, 0xA4400103,</div><div class='add'>+	0x81C, 0xA3420103,</div><div class='add'>+	0x81C, 0xA2440103,</div><div class='add'>+	0x81C, 0xA1460103,</div><div class='add'>+	0x81C, 0x83480103,</div><div class='add'>+	0x81C, 0x824A0103,</div><div class='add'>+	0x81C, 0x814C0103,</div><div class='add'>+	0x81C, 0x804E0103,</div><div class='add'>+	0x81C, 0x63500103,</div><div class='add'>+	0x81C, 0x62520103,</div><div class='add'>+	0x81C, 0x61540103,</div><div class='add'>+	0x81C, 0x43560103,</div><div class='add'>+	0x81C, 0x42580103,</div><div class='add'>+	0x81C, 0x415A0103,</div><div class='add'>+	0x81C, 0x405C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000103,</div><div class='add'>+	0x81C, 0xFB020103,</div><div class='add'>+	0x81C, 0xFA040103,</div><div class='add'>+	0x81C, 0xF9060103,</div><div class='add'>+	0x81C, 0xF8080103,</div><div class='add'>+	0x81C, 0xF70A0103,</div><div class='add'>+	0x81C, 0xF60C0103,</div><div class='add'>+	0x81C, 0xF50E0103,</div><div class='add'>+	0x81C, 0xF4100103,</div><div class='add'>+	0x81C, 0xF3120103,</div><div class='add'>+	0x81C, 0xF2140103,</div><div class='add'>+	0x81C, 0xF1160103,</div><div class='add'>+	0x81C, 0xF0180103,</div><div class='add'>+	0x81C, 0xEF1A0103,</div><div class='add'>+	0x81C, 0xEE1C0103,</div><div class='add'>+	0x81C, 0xED1E0103,</div><div class='add'>+	0x81C, 0xEC200103,</div><div class='add'>+	0x81C, 0xEB220103,</div><div class='add'>+	0x81C, 0xEA240103,</div><div class='add'>+	0x81C, 0xE9260103,</div><div class='add'>+	0x81C, 0xE8280103,</div><div class='add'>+	0x81C, 0xE72A0103,</div><div class='add'>+	0x81C, 0xE62C0103,</div><div class='add'>+	0x81C, 0xE52E0103,</div><div class='add'>+	0x81C, 0xE4300103,</div><div class='add'>+	0x81C, 0xE3320103,</div><div class='add'>+	0x81C, 0xE2340103,</div><div class='add'>+	0x81C, 0xE1360103,</div><div class='add'>+	0x81C, 0xC3380103,</div><div class='add'>+	0x81C, 0xC23A0103,</div><div class='add'>+	0x81C, 0xC13C0103,</div><div class='add'>+	0x81C, 0xC03E0103,</div><div class='add'>+	0x81C, 0xA4400103,</div><div class='add'>+	0x81C, 0xA3420103,</div><div class='add'>+	0x81C, 0xA2440103,</div><div class='add'>+	0x81C, 0xA1460103,</div><div class='add'>+	0x81C, 0x82480103,</div><div class='add'>+	0x81C, 0x814A0103,</div><div class='add'>+	0x81C, 0x804C0103,</div><div class='add'>+	0x81C, 0x634E0103,</div><div class='add'>+	0x81C, 0x62500103,</div><div class='add'>+	0x81C, 0x61520103,</div><div class='add'>+	0x81C, 0x42540103,</div><div class='add'>+	0x81C, 0x41560103,</div><div class='add'>+	0x81C, 0x24580103,</div><div class='add'>+	0x81C, 0x235A0103,</div><div class='add'>+	0x81C, 0x225C0103,</div><div class='add'>+	0x81C, 0x215E0103,</div><div class='add'>+	0x81C, 0x20600103,</div><div class='add'>+	0x81C, 0x03620103,</div><div class='add'>+	0x81C, 0x02640103,</div><div class='add'>+	0x81C, 0x01660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000103,</div><div class='add'>+	0x81C, 0xFD020103,</div><div class='add'>+	0x81C, 0xFC040103,</div><div class='add'>+	0x81C, 0xFB060103,</div><div class='add'>+	0x81C, 0xFA080103,</div><div class='add'>+	0x81C, 0xF90A0103,</div><div class='add'>+	0x81C, 0xF80C0103,</div><div class='add'>+	0x81C, 0xF70E0103,</div><div class='add'>+	0x81C, 0xF6100103,</div><div class='add'>+	0x81C, 0xF5120103,</div><div class='add'>+	0x81C, 0xF4140103,</div><div class='add'>+	0x81C, 0xF3160103,</div><div class='add'>+	0x81C, 0xF2180103,</div><div class='add'>+	0x81C, 0xF11A0103,</div><div class='add'>+	0x81C, 0xF01C0103,</div><div class='add'>+	0x81C, 0xEF1E0103,</div><div class='add'>+	0x81C, 0xEE200103,</div><div class='add'>+	0x81C, 0xED220103,</div><div class='add'>+	0x81C, 0xEC240103,</div><div class='add'>+	0x81C, 0xEB260103,</div><div class='add'>+	0x81C, 0xEA280103,</div><div class='add'>+	0x81C, 0xE92A0103,</div><div class='add'>+	0x81C, 0xE82C0103,</div><div class='add'>+	0x81C, 0xE72E0103,</div><div class='add'>+	0x81C, 0xE6300103,</div><div class='add'>+	0x81C, 0xE5320103,</div><div class='add'>+	0x81C, 0xE4340103,</div><div class='add'>+	0x81C, 0xE3360103,</div><div class='add'>+	0x81C, 0xC6380103,</div><div class='add'>+	0x81C, 0xC53A0103,</div><div class='add'>+	0x81C, 0xC43C0103,</div><div class='add'>+	0x81C, 0xC33E0103,</div><div class='add'>+	0x81C, 0xA5400103,</div><div class='add'>+	0x81C, 0xA4420103,</div><div class='add'>+	0x81C, 0xA3440103,</div><div class='add'>+	0x81C, 0xA2460103,</div><div class='add'>+	0x81C, 0xA1480103,</div><div class='add'>+	0x81C, 0xA04A0103,</div><div class='add'>+	0x81C, 0x824C0103,</div><div class='add'>+	0x81C, 0x814E0103,</div><div class='add'>+	0x81C, 0x80500103,</div><div class='add'>+	0x81C, 0x64520103,</div><div class='add'>+	0x81C, 0x63540103,</div><div class='add'>+	0x81C, 0x62560103,</div><div class='add'>+	0x81C, 0x61580103,</div><div class='add'>+	0x81C, 0x605A0103,</div><div class='add'>+	0x81C, 0x235C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000103,</div><div class='add'>+	0x81C, 0xF7020103,</div><div class='add'>+	0x81C, 0xF6040103,</div><div class='add'>+	0x81C, 0xF5060103,</div><div class='add'>+	0x81C, 0xF4080103,</div><div class='add'>+	0x81C, 0xF30A0103,</div><div class='add'>+	0x81C, 0xF20C0103,</div><div class='add'>+	0x81C, 0xF10E0103,</div><div class='add'>+	0x81C, 0xF0100103,</div><div class='add'>+	0x81C, 0xEF120103,</div><div class='add'>+	0x81C, 0xEE140103,</div><div class='add'>+	0x81C, 0xED160103,</div><div class='add'>+	0x81C, 0xEC180103,</div><div class='add'>+	0x81C, 0xEB1A0103,</div><div class='add'>+	0x81C, 0xEA1C0103,</div><div class='add'>+	0x81C, 0xE91E0103,</div><div class='add'>+	0x81C, 0xE8200103,</div><div class='add'>+	0x81C, 0xE7220103,</div><div class='add'>+	0x81C, 0xE6240103,</div><div class='add'>+	0x81C, 0xE5260103,</div><div class='add'>+	0x81C, 0xE4280103,</div><div class='add'>+	0x81C, 0xE32A0103,</div><div class='add'>+	0x81C, 0xC32C0103,</div><div class='add'>+	0x81C, 0xC22E0103,</div><div class='add'>+	0x81C, 0xC1300103,</div><div class='add'>+	0x81C, 0xC0320103,</div><div class='add'>+	0x81C, 0xA3340103,</div><div class='add'>+	0x81C, 0xA2360103,</div><div class='add'>+	0x81C, 0xA1380103,</div><div class='add'>+	0x81C, 0xA03A0103,</div><div class='add'>+	0x81C, 0x823C0103,</div><div class='add'>+	0x81C, 0x813E0103,</div><div class='add'>+	0x81C, 0x80400103,</div><div class='add'>+	0x81C, 0x63420103,</div><div class='add'>+	0x81C, 0x62440103,</div><div class='add'>+	0x81C, 0x61460103,</div><div class='add'>+	0x81C, 0x60480103,</div><div class='add'>+	0x81C, 0x424A0103,</div><div class='add'>+	0x81C, 0x414C0103,</div><div class='add'>+	0x81C, 0x404E0103,</div><div class='add'>+	0x81C, 0x22500103,</div><div class='add'>+	0x81C, 0x21520103,</div><div class='add'>+	0x81C, 0x20540103,</div><div class='add'>+	0x81C, 0x03560103,</div><div class='add'>+	0x81C, 0x02580103,</div><div class='add'>+	0x81C, 0x015A0103,</div><div class='add'>+	0x81C, 0x005C0103,</div><div class='add'>+	0x81C, 0x005E0103,</div><div class='add'>+	0x81C, 0x00600103,</div><div class='add'>+	0x81C, 0x00620103,</div><div class='add'>+	0x81C, 0x00640103,</div><div class='add'>+	0x81C, 0x00660103,</div><div class='add'>+	0x81C, 0x00680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000103,</div><div class='add'>+	0x81C, 0xFD020103,</div><div class='add'>+	0x81C, 0xFC040103,</div><div class='add'>+	0x81C, 0xFB060103,</div><div class='add'>+	0x81C, 0xFA080103,</div><div class='add'>+	0x81C, 0xF90A0103,</div><div class='add'>+	0x81C, 0xF80C0103,</div><div class='add'>+	0x81C, 0xF70E0103,</div><div class='add'>+	0x81C, 0xF6100103,</div><div class='add'>+	0x81C, 0xF5120103,</div><div class='add'>+	0x81C, 0xF4140103,</div><div class='add'>+	0x81C, 0xF3160103,</div><div class='add'>+	0x81C, 0xF2180103,</div><div class='add'>+	0x81C, 0xF11A0103,</div><div class='add'>+	0x81C, 0xF01C0103,</div><div class='add'>+	0x81C, 0xEF1E0103,</div><div class='add'>+	0x81C, 0xEE200103,</div><div class='add'>+	0x81C, 0xED220103,</div><div class='add'>+	0x81C, 0xEC240103,</div><div class='add'>+	0x81C, 0xEB260103,</div><div class='add'>+	0x81C, 0xEA280103,</div><div class='add'>+	0x81C, 0xE92A0103,</div><div class='add'>+	0x81C, 0xE82C0103,</div><div class='add'>+	0x81C, 0xE72E0103,</div><div class='add'>+	0x81C, 0xE6300103,</div><div class='add'>+	0x81C, 0xE5320103,</div><div class='add'>+	0x81C, 0xE4340103,</div><div class='add'>+	0x81C, 0xE3360103,</div><div class='add'>+	0x81C, 0xC6380103,</div><div class='add'>+	0x81C, 0xC53A0103,</div><div class='add'>+	0x81C, 0xC43C0103,</div><div class='add'>+	0x81C, 0xC33E0103,</div><div class='add'>+	0x81C, 0xA5400103,</div><div class='add'>+	0x81C, 0xA4420103,</div><div class='add'>+	0x81C, 0xA3440103,</div><div class='add'>+	0x81C, 0xA2460103,</div><div class='add'>+	0x81C, 0xA1480103,</div><div class='add'>+	0x81C, 0xA04A0103,</div><div class='add'>+	0x81C, 0x824C0103,</div><div class='add'>+	0x81C, 0x814E0103,</div><div class='add'>+	0x81C, 0x80500103,</div><div class='add'>+	0x81C, 0x64520103,</div><div class='add'>+	0x81C, 0x63540103,</div><div class='add'>+	0x81C, 0x62560103,</div><div class='add'>+	0x81C, 0x61580103,</div><div class='add'>+	0x81C, 0x605A0103,</div><div class='add'>+	0x81C, 0x235C0103,</div><div class='add'>+	0x81C, 0x225E0103,</div><div class='add'>+	0x81C, 0x21600103,</div><div class='add'>+	0x81C, 0x20620103,</div><div class='add'>+	0x81C, 0x03640103,</div><div class='add'>+	0x81C, 0x02660103,</div><div class='add'>+	0x81C, 0x01680103,</div><div class='add'>+	0x81C, 0x006A0103,</div><div class='add'>+	0x81C, 0x006C0103,</div><div class='add'>+	0x81C, 0x006E0103,</div><div class='add'>+	0x81C, 0x00700103,</div><div class='add'>+	0x81C, 0x00720103,</div><div class='add'>+	0x81C, 0x00740103,</div><div class='add'>+	0x81C, 0x00760103,</div><div class='add'>+	0x81C, 0x00780103,</div><div class='add'>+	0x81C, 0x007A0103,</div><div class='add'>+	0x81C, 0x007C0103,</div><div class='add'>+	0x81C, 0x007E0103,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEE1A0203,</div><div class='add'>+	0x81C, 0xED1C0203,</div><div class='add'>+	0x81C, 0xEC1E0203,</div><div class='add'>+	0x81C, 0xEB200203,</div><div class='add'>+	0x81C, 0xEA220203,</div><div class='add'>+	0x81C, 0xE9240203,</div><div class='add'>+	0x81C, 0xE8260203,</div><div class='add'>+	0x81C, 0xE7280203,</div><div class='add'>+	0x81C, 0xE62A0203,</div><div class='add'>+	0x81C, 0xE52C0203,</div><div class='add'>+	0x81C, 0xE42E0203,</div><div class='add'>+	0x81C, 0xE3300203,</div><div class='add'>+	0x81C, 0xE2320203,</div><div class='add'>+	0x81C, 0xC6340203,</div><div class='add'>+	0x81C, 0xC5360203,</div><div class='add'>+	0x81C, 0xC4380203,</div><div class='add'>+	0x81C, 0xC33A0203,</div><div class='add'>+	0x81C, 0xA63C0203,</div><div class='add'>+	0x81C, 0xA53E0203,</div><div class='add'>+	0x81C, 0xA4400203,</div><div class='add'>+	0x81C, 0xA3420203,</div><div class='add'>+	0x81C, 0xA2440203,</div><div class='add'>+	0x81C, 0xA1460203,</div><div class='add'>+	0x81C, 0x83480203,</div><div class='add'>+	0x81C, 0x824A0203,</div><div class='add'>+	0x81C, 0x814C0203,</div><div class='add'>+	0x81C, 0x804E0203,</div><div class='add'>+	0x81C, 0x63500203,</div><div class='add'>+	0x81C, 0x62520203,</div><div class='add'>+	0x81C, 0x61540203,</div><div class='add'>+	0x81C, 0x42560203,</div><div class='add'>+	0x81C, 0x41580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x20600203,</div><div class='add'>+	0x81C, 0x04620203,</div><div class='add'>+	0x81C, 0x03640203,</div><div class='add'>+	0x81C, 0x02660203,</div><div class='add'>+	0x81C, 0x01680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000203,</div><div class='add'>+	0x81C, 0xF6020203,</div><div class='add'>+	0x81C, 0xF5040203,</div><div class='add'>+	0x81C, 0xF4060203,</div><div class='add'>+	0x81C, 0xF3080203,</div><div class='add'>+	0x81C, 0xF20A0203,</div><div class='add'>+	0x81C, 0xF10C0203,</div><div class='add'>+	0x81C, 0xF00E0203,</div><div class='add'>+	0x81C, 0xEF100203,</div><div class='add'>+	0x81C, 0xEE120203,</div><div class='add'>+	0x81C, 0xED140203,</div><div class='add'>+	0x81C, 0xEC160203,</div><div class='add'>+	0x81C, 0xEB180203,</div><div class='add'>+	0x81C, 0xEA1A0203,</div><div class='add'>+	0x81C, 0xE91C0203,</div><div class='add'>+	0x81C, 0xE81E0203,</div><div class='add'>+	0x81C, 0xE7200203,</div><div class='add'>+	0x81C, 0xE6220203,</div><div class='add'>+	0x81C, 0xE5240203,</div><div class='add'>+	0x81C, 0xE4260203,</div><div class='add'>+	0x81C, 0xE3280203,</div><div class='add'>+	0x81C, 0xC42A0203,</div><div class='add'>+	0x81C, 0xC32C0203,</div><div class='add'>+	0x81C, 0xC22E0203,</div><div class='add'>+	0x81C, 0xC1300203,</div><div class='add'>+	0x81C, 0xC0320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x63420203,</div><div class='add'>+	0x81C, 0x62440203,</div><div class='add'>+	0x81C, 0x61460203,</div><div class='add'>+	0x81C, 0x60480203,</div><div class='add'>+	0x81C, 0x424A0203,</div><div class='add'>+	0x81C, 0x414C0203,</div><div class='add'>+	0x81C, 0x404E0203,</div><div class='add'>+	0x81C, 0x06500203,</div><div class='add'>+	0x81C, 0x05520203,</div><div class='add'>+	0x81C, 0x04540203,</div><div class='add'>+	0x81C, 0x03560203,</div><div class='add'>+	0x81C, 0x02580203,</div><div class='add'>+	0x81C, 0x015A0203,</div><div class='add'>+	0x81C, 0x005C0203,</div><div class='add'>+	0x81C, 0x005E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000203,</div><div class='add'>+	0x81C, 0xF6020203,</div><div class='add'>+	0x81C, 0xF5040203,</div><div class='add'>+	0x81C, 0xF4060203,</div><div class='add'>+	0x81C, 0xF3080203,</div><div class='add'>+	0x81C, 0xF20A0203,</div><div class='add'>+	0x81C, 0xF10C0203,</div><div class='add'>+	0x81C, 0xF00E0203,</div><div class='add'>+	0x81C, 0xEF100203,</div><div class='add'>+	0x81C, 0xEE120203,</div><div class='add'>+	0x81C, 0xED140203,</div><div class='add'>+	0x81C, 0xEC160203,</div><div class='add'>+	0x81C, 0xEB180203,</div><div class='add'>+	0x81C, 0xEA1A0203,</div><div class='add'>+	0x81C, 0xE91C0203,</div><div class='add'>+	0x81C, 0xE81E0203,</div><div class='add'>+	0x81C, 0xE7200203,</div><div class='add'>+	0x81C, 0xE6220203,</div><div class='add'>+	0x81C, 0xE5240203,</div><div class='add'>+	0x81C, 0xE4260203,</div><div class='add'>+	0x81C, 0xE3280203,</div><div class='add'>+	0x81C, 0xC42A0203,</div><div class='add'>+	0x81C, 0xC32C0203,</div><div class='add'>+	0x81C, 0xC22E0203,</div><div class='add'>+	0x81C, 0xC1300203,</div><div class='add'>+	0x81C, 0xC0320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x64420203,</div><div class='add'>+	0x81C, 0x63440203,</div><div class='add'>+	0x81C, 0x62460203,</div><div class='add'>+	0x81C, 0x61480203,</div><div class='add'>+	0x81C, 0x604A0203,</div><div class='add'>+	0x81C, 0x414C0203,</div><div class='add'>+	0x81C, 0x404E0203,</div><div class='add'>+	0x81C, 0x22500203,</div><div class='add'>+	0x81C, 0x21520203,</div><div class='add'>+	0x81C, 0x20540203,</div><div class='add'>+	0x81C, 0x03560203,</div><div class='add'>+	0x81C, 0x02580203,</div><div class='add'>+	0x81C, 0x015A0203,</div><div class='add'>+	0x81C, 0x005C0203,</div><div class='add'>+	0x81C, 0x005E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEF1A0203,</div><div class='add'>+	0x81C, 0xEE1C0203,</div><div class='add'>+	0x81C, 0xED1E0203,</div><div class='add'>+	0x81C, 0xEC200203,</div><div class='add'>+	0x81C, 0xEB220203,</div><div class='add'>+	0x81C, 0xEA240203,</div><div class='add'>+	0x81C, 0xE9260203,</div><div class='add'>+	0x81C, 0xE8280203,</div><div class='add'>+	0x81C, 0xE72A0203,</div><div class='add'>+	0x81C, 0xE62C0203,</div><div class='add'>+	0x81C, 0xE52E0203,</div><div class='add'>+	0x81C, 0xE4300203,</div><div class='add'>+	0x81C, 0xE3320203,</div><div class='add'>+	0x81C, 0xE2340203,</div><div class='add'>+	0x81C, 0xC6360203,</div><div class='add'>+	0x81C, 0xC5380203,</div><div class='add'>+	0x81C, 0xC43A0203,</div><div class='add'>+	0x81C, 0xC33C0203,</div><div class='add'>+	0x81C, 0xA63E0203,</div><div class='add'>+	0x81C, 0xA5400203,</div><div class='add'>+	0x81C, 0xA4420203,</div><div class='add'>+	0x81C, 0xA3440203,</div><div class='add'>+	0x81C, 0xA2460203,</div><div class='add'>+	0x81C, 0xA1480203,</div><div class='add'>+	0x81C, 0x834A0203,</div><div class='add'>+	0x81C, 0x824C0203,</div><div class='add'>+	0x81C, 0x814E0203,</div><div class='add'>+	0x81C, 0x64500203,</div><div class='add'>+	0x81C, 0x63520203,</div><div class='add'>+	0x81C, 0x62540203,</div><div class='add'>+	0x81C, 0x61560203,</div><div class='add'>+	0x81C, 0x60580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x215C0203,</div><div class='add'>+	0x81C, 0x205E0203,</div><div class='add'>+	0x81C, 0x03600203,</div><div class='add'>+	0x81C, 0x02620203,</div><div class='add'>+	0x81C, 0x01640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000203,</div><div class='add'>+	0x81C, 0xF6020203,</div><div class='add'>+	0x81C, 0xF5040203,</div><div class='add'>+	0x81C, 0xF4060203,</div><div class='add'>+	0x81C, 0xF3080203,</div><div class='add'>+	0x81C, 0xF20A0203,</div><div class='add'>+	0x81C, 0xF10C0203,</div><div class='add'>+	0x81C, 0xF00E0203,</div><div class='add'>+	0x81C, 0xEF100203,</div><div class='add'>+	0x81C, 0xEE120203,</div><div class='add'>+	0x81C, 0xED140203,</div><div class='add'>+	0x81C, 0xEC160203,</div><div class='add'>+	0x81C, 0xEB180203,</div><div class='add'>+	0x81C, 0xEA1A0203,</div><div class='add'>+	0x81C, 0xE91C0203,</div><div class='add'>+	0x81C, 0xE81E0203,</div><div class='add'>+	0x81C, 0xE7200203,</div><div class='add'>+	0x81C, 0xE6220203,</div><div class='add'>+	0x81C, 0xE5240203,</div><div class='add'>+	0x81C, 0xE4260203,</div><div class='add'>+	0x81C, 0xE3280203,</div><div class='add'>+	0x81C, 0xC42A0203,</div><div class='add'>+	0x81C, 0xC32C0203,</div><div class='add'>+	0x81C, 0xC22E0203,</div><div class='add'>+	0x81C, 0xC1300203,</div><div class='add'>+	0x81C, 0xC0320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x64420203,</div><div class='add'>+	0x81C, 0x63440203,</div><div class='add'>+	0x81C, 0x62460203,</div><div class='add'>+	0x81C, 0x61480203,</div><div class='add'>+	0x81C, 0x604A0203,</div><div class='add'>+	0x81C, 0x414C0203,</div><div class='add'>+	0x81C, 0x404E0203,</div><div class='add'>+	0x81C, 0x22500203,</div><div class='add'>+	0x81C, 0x21520203,</div><div class='add'>+	0x81C, 0x20540203,</div><div class='add'>+	0x81C, 0x03560203,</div><div class='add'>+	0x81C, 0x02580203,</div><div class='add'>+	0x81C, 0x015A0203,</div><div class='add'>+	0x81C, 0x005C0203,</div><div class='add'>+	0x81C, 0x005E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEF1A0203,</div><div class='add'>+	0x81C, 0xEE1C0203,</div><div class='add'>+	0x81C, 0xED1E0203,</div><div class='add'>+	0x81C, 0xEC200203,</div><div class='add'>+	0x81C, 0xEB220203,</div><div class='add'>+	0x81C, 0xEA240203,</div><div class='add'>+	0x81C, 0xE9260203,</div><div class='add'>+	0x81C, 0xE8280203,</div><div class='add'>+	0x81C, 0xE72A0203,</div><div class='add'>+	0x81C, 0xE62C0203,</div><div class='add'>+	0x81C, 0xE52E0203,</div><div class='add'>+	0x81C, 0xE4300203,</div><div class='add'>+	0x81C, 0xE3320203,</div><div class='add'>+	0x81C, 0xE2340203,</div><div class='add'>+	0x81C, 0xE1360203,</div><div class='add'>+	0x81C, 0xC5380203,</div><div class='add'>+	0x81C, 0xC43A0203,</div><div class='add'>+	0x81C, 0xC33C0203,</div><div class='add'>+	0x81C, 0xC23E0203,</div><div class='add'>+	0x81C, 0xC1400203,</div><div class='add'>+	0x81C, 0xA3420203,</div><div class='add'>+	0x81C, 0xA2440203,</div><div class='add'>+	0x81C, 0xA1460203,</div><div class='add'>+	0x81C, 0xA0480203,</div><div class='add'>+	0x81C, 0x834A0203,</div><div class='add'>+	0x81C, 0x824C0203,</div><div class='add'>+	0x81C, 0x814E0203,</div><div class='add'>+	0x81C, 0x64500203,</div><div class='add'>+	0x81C, 0x63520203,</div><div class='add'>+	0x81C, 0x62540203,</div><div class='add'>+	0x81C, 0x61560203,</div><div class='add'>+	0x81C, 0x25580203,</div><div class='add'>+	0x81C, 0x245A0203,</div><div class='add'>+	0x81C, 0x235C0203,</div><div class='add'>+	0x81C, 0x225E0203,</div><div class='add'>+	0x81C, 0x21600203,</div><div class='add'>+	0x81C, 0x04620203,</div><div class='add'>+	0x81C, 0x03640203,</div><div class='add'>+	0x81C, 0x02660203,</div><div class='add'>+	0x81C, 0x01680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000203,</div><div class='add'>+	0x81C, 0xF8020203,</div><div class='add'>+	0x81C, 0xF7040203,</div><div class='add'>+	0x81C, 0xF6060203,</div><div class='add'>+	0x81C, 0xF5080203,</div><div class='add'>+	0x81C, 0xF40A0203,</div><div class='add'>+	0x81C, 0xF30C0203,</div><div class='add'>+	0x81C, 0xF20E0203,</div><div class='add'>+	0x81C, 0xF1100203,</div><div class='add'>+	0x81C, 0xF0120203,</div><div class='add'>+	0x81C, 0xEF140203,</div><div class='add'>+	0x81C, 0xEE160203,</div><div class='add'>+	0x81C, 0xED180203,</div><div class='add'>+	0x81C, 0xEC1A0203,</div><div class='add'>+	0x81C, 0xEB1C0203,</div><div class='add'>+	0x81C, 0xEA1E0203,</div><div class='add'>+	0x81C, 0xE9200203,</div><div class='add'>+	0x81C, 0xE8220203,</div><div class='add'>+	0x81C, 0xE7240203,</div><div class='add'>+	0x81C, 0xE6260203,</div><div class='add'>+	0x81C, 0xE5280203,</div><div class='add'>+	0x81C, 0xC42A0203,</div><div class='add'>+	0x81C, 0xC32C0203,</div><div class='add'>+	0x81C, 0xC22E0203,</div><div class='add'>+	0x81C, 0xC1300203,</div><div class='add'>+	0x81C, 0xC0320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x64420203,</div><div class='add'>+	0x81C, 0x63440203,</div><div class='add'>+	0x81C, 0x62460203,</div><div class='add'>+	0x81C, 0x61480203,</div><div class='add'>+	0x81C, 0x604A0203,</div><div class='add'>+	0x81C, 0x414C0203,</div><div class='add'>+	0x81C, 0x404E0203,</div><div class='add'>+	0x81C, 0x22500203,</div><div class='add'>+	0x81C, 0x21520203,</div><div class='add'>+	0x81C, 0x20540203,</div><div class='add'>+	0x81C, 0x03560203,</div><div class='add'>+	0x81C, 0x02580203,</div><div class='add'>+	0x81C, 0x015A0203,</div><div class='add'>+	0x81C, 0x005C0203,</div><div class='add'>+	0x81C, 0x005E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000203,</div><div class='add'>+	0x81C, 0xF7020203,</div><div class='add'>+	0x81C, 0xF6040203,</div><div class='add'>+	0x81C, 0xF5060203,</div><div class='add'>+	0x81C, 0xF4080203,</div><div class='add'>+	0x81C, 0xF30A0203,</div><div class='add'>+	0x81C, 0xF20C0203,</div><div class='add'>+	0x81C, 0xF10E0203,</div><div class='add'>+	0x81C, 0xF0100203,</div><div class='add'>+	0x81C, 0xEF120203,</div><div class='add'>+	0x81C, 0xEE140203,</div><div class='add'>+	0x81C, 0xED160203,</div><div class='add'>+	0x81C, 0xEC180203,</div><div class='add'>+	0x81C, 0xEB1A0203,</div><div class='add'>+	0x81C, 0xEA1C0203,</div><div class='add'>+	0x81C, 0xE91E0203,</div><div class='add'>+	0x81C, 0xE8200203,</div><div class='add'>+	0x81C, 0xE7220203,</div><div class='add'>+	0x81C, 0xE6240203,</div><div class='add'>+	0x81C, 0xE5260203,</div><div class='add'>+	0x81C, 0xE4280203,</div><div class='add'>+	0x81C, 0xE32A0203,</div><div class='add'>+	0x81C, 0xC42C0203,</div><div class='add'>+	0x81C, 0xC32E0203,</div><div class='add'>+	0x81C, 0xC2300203,</div><div class='add'>+	0x81C, 0xC1320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x65420203,</div><div class='add'>+	0x81C, 0x64440203,</div><div class='add'>+	0x81C, 0x63460203,</div><div class='add'>+	0x81C, 0x62480203,</div><div class='add'>+	0x81C, 0x614A0203,</div><div class='add'>+	0x81C, 0x424C0203,</div><div class='add'>+	0x81C, 0x414E0203,</div><div class='add'>+	0x81C, 0x40500203,</div><div class='add'>+	0x81C, 0x22520203,</div><div class='add'>+	0x81C, 0x21540203,</div><div class='add'>+	0x81C, 0x20560203,</div><div class='add'>+	0x81C, 0x04580203,</div><div class='add'>+	0x81C, 0x035A0203,</div><div class='add'>+	0x81C, 0x025C0203,</div><div class='add'>+	0x81C, 0x015E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000203,</div><div class='add'>+	0x81C, 0xFA020203,</div><div class='add'>+	0x81C, 0xF9040203,</div><div class='add'>+	0x81C, 0xF8060203,</div><div class='add'>+	0x81C, 0xF7080203,</div><div class='add'>+	0x81C, 0xF60A0203,</div><div class='add'>+	0x81C, 0xF50C0203,</div><div class='add'>+	0x81C, 0xF40E0203,</div><div class='add'>+	0x81C, 0xF3100203,</div><div class='add'>+	0x81C, 0xF2120203,</div><div class='add'>+	0x81C, 0xF1140203,</div><div class='add'>+	0x81C, 0xF0160203,</div><div class='add'>+	0x81C, 0xEF180203,</div><div class='add'>+	0x81C, 0xEE1A0203,</div><div class='add'>+	0x81C, 0xED1C0203,</div><div class='add'>+	0x81C, 0xEC1E0203,</div><div class='add'>+	0x81C, 0xEB200203,</div><div class='add'>+	0x81C, 0xEA220203,</div><div class='add'>+	0x81C, 0xE9240203,</div><div class='add'>+	0x81C, 0xE8260203,</div><div class='add'>+	0x81C, 0xE7280203,</div><div class='add'>+	0x81C, 0xE62A0203,</div><div class='add'>+	0x81C, 0xE52C0203,</div><div class='add'>+	0x81C, 0xE42E0203,</div><div class='add'>+	0x81C, 0xE3300203,</div><div class='add'>+	0x81C, 0xE2320203,</div><div class='add'>+	0x81C, 0xC6340203,</div><div class='add'>+	0x81C, 0xC5360203,</div><div class='add'>+	0x81C, 0xC4380203,</div><div class='add'>+	0x81C, 0xC33A0203,</div><div class='add'>+	0x81C, 0xC23C0203,</div><div class='add'>+	0x81C, 0xC13E0203,</div><div class='add'>+	0x81C, 0xC0400203,</div><div class='add'>+	0x81C, 0xA3420203,</div><div class='add'>+	0x81C, 0xA2440203,</div><div class='add'>+	0x81C, 0xA1460203,</div><div class='add'>+	0x81C, 0xA0480203,</div><div class='add'>+	0x81C, 0x824A0203,</div><div class='add'>+	0x81C, 0x814C0203,</div><div class='add'>+	0x81C, 0x804E0203,</div><div class='add'>+	0x81C, 0x63500203,</div><div class='add'>+	0x81C, 0x62520203,</div><div class='add'>+	0x81C, 0x61540203,</div><div class='add'>+	0x81C, 0x60560203,</div><div class='add'>+	0x81C, 0x24580203,</div><div class='add'>+	0x81C, 0x235A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x20600203,</div><div class='add'>+	0x81C, 0x03620203,</div><div class='add'>+	0x81C, 0x02640203,</div><div class='add'>+	0x81C, 0x01660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000203,</div><div class='add'>+	0x81C, 0xF7020203,</div><div class='add'>+	0x81C, 0xF6040203,</div><div class='add'>+	0x81C, 0xF5060203,</div><div class='add'>+	0x81C, 0xF4080203,</div><div class='add'>+	0x81C, 0xF30A0203,</div><div class='add'>+	0x81C, 0xF20C0203,</div><div class='add'>+	0x81C, 0xF10E0203,</div><div class='add'>+	0x81C, 0xF0100203,</div><div class='add'>+	0x81C, 0xEF120203,</div><div class='add'>+	0x81C, 0xEE140203,</div><div class='add'>+	0x81C, 0xED160203,</div><div class='add'>+	0x81C, 0xEC180203,</div><div class='add'>+	0x81C, 0xEB1A0203,</div><div class='add'>+	0x81C, 0xEA1C0203,</div><div class='add'>+	0x81C, 0xE91E0203,</div><div class='add'>+	0x81C, 0xE8200203,</div><div class='add'>+	0x81C, 0xE7220203,</div><div class='add'>+	0x81C, 0xE6240203,</div><div class='add'>+	0x81C, 0xE5260203,</div><div class='add'>+	0x81C, 0xE4280203,</div><div class='add'>+	0x81C, 0xE32A0203,</div><div class='add'>+	0x81C, 0xC42C0203,</div><div class='add'>+	0x81C, 0xC32E0203,</div><div class='add'>+	0x81C, 0xC2300203,</div><div class='add'>+	0x81C, 0xC1320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x65420203,</div><div class='add'>+	0x81C, 0x64440203,</div><div class='add'>+	0x81C, 0x63460203,</div><div class='add'>+	0x81C, 0x62480203,</div><div class='add'>+	0x81C, 0x614A0203,</div><div class='add'>+	0x81C, 0x424C0203,</div><div class='add'>+	0x81C, 0x414E0203,</div><div class='add'>+	0x81C, 0x40500203,</div><div class='add'>+	0x81C, 0x22520203,</div><div class='add'>+	0x81C, 0x21540203,</div><div class='add'>+	0x81C, 0x20560203,</div><div class='add'>+	0x81C, 0x04580203,</div><div class='add'>+	0x81C, 0x035A0203,</div><div class='add'>+	0x81C, 0x025C0203,</div><div class='add'>+	0x81C, 0x015E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEE1A0203,</div><div class='add'>+	0x81C, 0xED1C0203,</div><div class='add'>+	0x81C, 0xEC1E0203,</div><div class='add'>+	0x81C, 0xEB200203,</div><div class='add'>+	0x81C, 0xEA220203,</div><div class='add'>+	0x81C, 0xE9240203,</div><div class='add'>+	0x81C, 0xE8260203,</div><div class='add'>+	0x81C, 0xE7280203,</div><div class='add'>+	0x81C, 0xE62A0203,</div><div class='add'>+	0x81C, 0xE52C0203,</div><div class='add'>+	0x81C, 0xE42E0203,</div><div class='add'>+	0x81C, 0xE3300203,</div><div class='add'>+	0x81C, 0xE2320203,</div><div class='add'>+	0x81C, 0xC6340203,</div><div class='add'>+	0x81C, 0xC5360203,</div><div class='add'>+	0x81C, 0xC4380203,</div><div class='add'>+	0x81C, 0xC33A0203,</div><div class='add'>+	0x81C, 0xA63C0203,</div><div class='add'>+	0x81C, 0xA53E0203,</div><div class='add'>+	0x81C, 0xA4400203,</div><div class='add'>+	0x81C, 0xA3420203,</div><div class='add'>+	0x81C, 0xA2440203,</div><div class='add'>+	0x81C, 0xA1460203,</div><div class='add'>+	0x81C, 0x83480203,</div><div class='add'>+	0x81C, 0x824A0203,</div><div class='add'>+	0x81C, 0x814C0203,</div><div class='add'>+	0x81C, 0x804E0203,</div><div class='add'>+	0x81C, 0x63500203,</div><div class='add'>+	0x81C, 0x62520203,</div><div class='add'>+	0x81C, 0x61540203,</div><div class='add'>+	0x81C, 0x42560203,</div><div class='add'>+	0x81C, 0x41580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x20600203,</div><div class='add'>+	0x81C, 0x04620203,</div><div class='add'>+	0x81C, 0x03640203,</div><div class='add'>+	0x81C, 0x02660203,</div><div class='add'>+	0x81C, 0x01680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000203,</div><div class='add'>+	0x81C, 0xF8020203,</div><div class='add'>+	0x81C, 0xF7040203,</div><div class='add'>+	0x81C, 0xF6060203,</div><div class='add'>+	0x81C, 0xF5080203,</div><div class='add'>+	0x81C, 0xF40A0203,</div><div class='add'>+	0x81C, 0xF30C0203,</div><div class='add'>+	0x81C, 0xF20E0203,</div><div class='add'>+	0x81C, 0xF1100203,</div><div class='add'>+	0x81C, 0xF0120203,</div><div class='add'>+	0x81C, 0xEF140203,</div><div class='add'>+	0x81C, 0xEE160203,</div><div class='add'>+	0x81C, 0xED180203,</div><div class='add'>+	0x81C, 0xEC1A0203,</div><div class='add'>+	0x81C, 0xEB1C0203,</div><div class='add'>+	0x81C, 0xEA1E0203,</div><div class='add'>+	0x81C, 0xE9200203,</div><div class='add'>+	0x81C, 0xE8220203,</div><div class='add'>+	0x81C, 0xE7240203,</div><div class='add'>+	0x81C, 0xE6260203,</div><div class='add'>+	0x81C, 0xE5280203,</div><div class='add'>+	0x81C, 0xE42A0203,</div><div class='add'>+	0x81C, 0xC42C0203,</div><div class='add'>+	0x81C, 0xC32E0203,</div><div class='add'>+	0x81C, 0xC2300203,</div><div class='add'>+	0x81C, 0xC1320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x64420203,</div><div class='add'>+	0x81C, 0x63440203,</div><div class='add'>+	0x81C, 0x62460203,</div><div class='add'>+	0x81C, 0x61480203,</div><div class='add'>+	0x81C, 0x604A0203,</div><div class='add'>+	0x81C, 0x244C0203,</div><div class='add'>+	0x81C, 0x234E0203,</div><div class='add'>+	0x81C, 0x22500203,</div><div class='add'>+	0x81C, 0x21520203,</div><div class='add'>+	0x81C, 0x20540203,</div><div class='add'>+	0x81C, 0x05560203,</div><div class='add'>+	0x81C, 0x04580203,</div><div class='add'>+	0x81C, 0x035A0203,</div><div class='add'>+	0x81C, 0x025C0203,</div><div class='add'>+	0x81C, 0x015E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEF1A0203,</div><div class='add'>+	0x81C, 0xEE1C0203,</div><div class='add'>+	0x81C, 0xED1E0203,</div><div class='add'>+	0x81C, 0xEC200203,</div><div class='add'>+	0x81C, 0xEB220203,</div><div class='add'>+	0x81C, 0xEA240203,</div><div class='add'>+	0x81C, 0xE9260203,</div><div class='add'>+	0x81C, 0xE8280203,</div><div class='add'>+	0x81C, 0xE72A0203,</div><div class='add'>+	0x81C, 0xE62C0203,</div><div class='add'>+	0x81C, 0xE52E0203,</div><div class='add'>+	0x81C, 0xE4300203,</div><div class='add'>+	0x81C, 0xE3320203,</div><div class='add'>+	0x81C, 0xE2340203,</div><div class='add'>+	0x81C, 0xC6360203,</div><div class='add'>+	0x81C, 0xC5380203,</div><div class='add'>+	0x81C, 0xC43A0203,</div><div class='add'>+	0x81C, 0xC33C0203,</div><div class='add'>+	0x81C, 0xA63E0203,</div><div class='add'>+	0x81C, 0xA5400203,</div><div class='add'>+	0x81C, 0xA4420203,</div><div class='add'>+	0x81C, 0xA3440203,</div><div class='add'>+	0x81C, 0xA2460203,</div><div class='add'>+	0x81C, 0xA1480203,</div><div class='add'>+	0x81C, 0x834A0203,</div><div class='add'>+	0x81C, 0x824C0203,</div><div class='add'>+	0x81C, 0x814E0203,</div><div class='add'>+	0x81C, 0x64500203,</div><div class='add'>+	0x81C, 0x63520203,</div><div class='add'>+	0x81C, 0x62540203,</div><div class='add'>+	0x81C, 0x61560203,</div><div class='add'>+	0x81C, 0x60580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x215C0203,</div><div class='add'>+	0x81C, 0x205E0203,</div><div class='add'>+	0x81C, 0x03600203,</div><div class='add'>+	0x81C, 0x02620203,</div><div class='add'>+	0x81C, 0x01640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEE1A0203,</div><div class='add'>+	0x81C, 0xED1C0203,</div><div class='add'>+	0x81C, 0xEC1E0203,</div><div class='add'>+	0x81C, 0xEB200203,</div><div class='add'>+	0x81C, 0xEA220203,</div><div class='add'>+	0x81C, 0xE9240203,</div><div class='add'>+	0x81C, 0xE8260203,</div><div class='add'>+	0x81C, 0xE7280203,</div><div class='add'>+	0x81C, 0xE62A0203,</div><div class='add'>+	0x81C, 0xE52C0203,</div><div class='add'>+	0x81C, 0xE42E0203,</div><div class='add'>+	0x81C, 0xE3300203,</div><div class='add'>+	0x81C, 0xE2320203,</div><div class='add'>+	0x81C, 0xC6340203,</div><div class='add'>+	0x81C, 0xC5360203,</div><div class='add'>+	0x81C, 0xC4380203,</div><div class='add'>+	0x81C, 0xC33A0203,</div><div class='add'>+	0x81C, 0xA63C0203,</div><div class='add'>+	0x81C, 0xA53E0203,</div><div class='add'>+	0x81C, 0xA4400203,</div><div class='add'>+	0x81C, 0xA3420203,</div><div class='add'>+	0x81C, 0xA2440203,</div><div class='add'>+	0x81C, 0xA1460203,</div><div class='add'>+	0x81C, 0x83480203,</div><div class='add'>+	0x81C, 0x824A0203,</div><div class='add'>+	0x81C, 0x814C0203,</div><div class='add'>+	0x81C, 0x804E0203,</div><div class='add'>+	0x81C, 0x63500203,</div><div class='add'>+	0x81C, 0x62520203,</div><div class='add'>+	0x81C, 0x61540203,</div><div class='add'>+	0x81C, 0x42560203,</div><div class='add'>+	0x81C, 0x41580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x20600203,</div><div class='add'>+	0x81C, 0x04620203,</div><div class='add'>+	0x81C, 0x03640203,</div><div class='add'>+	0x81C, 0x02660203,</div><div class='add'>+	0x81C, 0x01680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEE1A0203,</div><div class='add'>+	0x81C, 0xED1C0203,</div><div class='add'>+	0x81C, 0xEC1E0203,</div><div class='add'>+	0x81C, 0xEB200203,</div><div class='add'>+	0x81C, 0xEA220203,</div><div class='add'>+	0x81C, 0xE9240203,</div><div class='add'>+	0x81C, 0xE8260203,</div><div class='add'>+	0x81C, 0xE7280203,</div><div class='add'>+	0x81C, 0xE62A0203,</div><div class='add'>+	0x81C, 0xE52C0203,</div><div class='add'>+	0x81C, 0xE42E0203,</div><div class='add'>+	0x81C, 0xE3300203,</div><div class='add'>+	0x81C, 0xE2320203,</div><div class='add'>+	0x81C, 0xC6340203,</div><div class='add'>+	0x81C, 0xC5360203,</div><div class='add'>+	0x81C, 0xC4380203,</div><div class='add'>+	0x81C, 0xC33A0203,</div><div class='add'>+	0x81C, 0xA63C0203,</div><div class='add'>+	0x81C, 0xA53E0203,</div><div class='add'>+	0x81C, 0xA4400203,</div><div class='add'>+	0x81C, 0xA3420203,</div><div class='add'>+	0x81C, 0xA2440203,</div><div class='add'>+	0x81C, 0xA1460203,</div><div class='add'>+	0x81C, 0x83480203,</div><div class='add'>+	0x81C, 0x824A0203,</div><div class='add'>+	0x81C, 0x814C0203,</div><div class='add'>+	0x81C, 0x804E0203,</div><div class='add'>+	0x81C, 0x63500203,</div><div class='add'>+	0x81C, 0x62520203,</div><div class='add'>+	0x81C, 0x61540203,</div><div class='add'>+	0x81C, 0x42560203,</div><div class='add'>+	0x81C, 0x41580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x20600203,</div><div class='add'>+	0x81C, 0x04620203,</div><div class='add'>+	0x81C, 0x03640203,</div><div class='add'>+	0x81C, 0x02660203,</div><div class='add'>+	0x81C, 0x01680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEF1A0203,</div><div class='add'>+	0x81C, 0xEE1C0203,</div><div class='add'>+	0x81C, 0xED1E0203,</div><div class='add'>+	0x81C, 0xEC200203,</div><div class='add'>+	0x81C, 0xEB220203,</div><div class='add'>+	0x81C, 0xEA240203,</div><div class='add'>+	0x81C, 0xE9260203,</div><div class='add'>+	0x81C, 0xE8280203,</div><div class='add'>+	0x81C, 0xE72A0203,</div><div class='add'>+	0x81C, 0xE62C0203,</div><div class='add'>+	0x81C, 0xE52E0203,</div><div class='add'>+	0x81C, 0xE4300203,</div><div class='add'>+	0x81C, 0xE3320203,</div><div class='add'>+	0x81C, 0xE2340203,</div><div class='add'>+	0x81C, 0xE1360203,</div><div class='add'>+	0x81C, 0xE0380203,</div><div class='add'>+	0x81C, 0xC33A0203,</div><div class='add'>+	0x81C, 0xC23C0203,</div><div class='add'>+	0x81C, 0xC13E0203,</div><div class='add'>+	0x81C, 0xA3400203,</div><div class='add'>+	0x81C, 0xA2420203,</div><div class='add'>+	0x81C, 0xA1440203,</div><div class='add'>+	0x81C, 0xA0460203,</div><div class='add'>+	0x81C, 0x83480203,</div><div class='add'>+	0x81C, 0x824A0203,</div><div class='add'>+	0x81C, 0x814C0203,</div><div class='add'>+	0x81C, 0x644E0203,</div><div class='add'>+	0x81C, 0x63500203,</div><div class='add'>+	0x81C, 0x62520203,</div><div class='add'>+	0x81C, 0x61540203,</div><div class='add'>+	0x81C, 0x42560203,</div><div class='add'>+	0x81C, 0x41580203,</div><div class='add'>+	0x81C, 0x235A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x04600203,</div><div class='add'>+	0x81C, 0x03620203,</div><div class='add'>+	0x81C, 0x02640203,</div><div class='add'>+	0x81C, 0x01660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000203,</div><div class='add'>+	0x81C, 0xFB020203,</div><div class='add'>+	0x81C, 0xFA040203,</div><div class='add'>+	0x81C, 0xF9060203,</div><div class='add'>+	0x81C, 0xF8080203,</div><div class='add'>+	0x81C, 0xF70A0203,</div><div class='add'>+	0x81C, 0xF60C0203,</div><div class='add'>+	0x81C, 0xF50E0203,</div><div class='add'>+	0x81C, 0xF4100203,</div><div class='add'>+	0x81C, 0xF3120203,</div><div class='add'>+	0x81C, 0xF2140203,</div><div class='add'>+	0x81C, 0xF1160203,</div><div class='add'>+	0x81C, 0xF0180203,</div><div class='add'>+	0x81C, 0xEF1A0203,</div><div class='add'>+	0x81C, 0xEE1C0203,</div><div class='add'>+	0x81C, 0xED1E0203,</div><div class='add'>+	0x81C, 0xEC200203,</div><div class='add'>+	0x81C, 0xEB220203,</div><div class='add'>+	0x81C, 0xEA240203,</div><div class='add'>+	0x81C, 0xE9260203,</div><div class='add'>+	0x81C, 0xE8280203,</div><div class='add'>+	0x81C, 0xE72A0203,</div><div class='add'>+	0x81C, 0xE62C0203,</div><div class='add'>+	0x81C, 0xE52E0203,</div><div class='add'>+	0x81C, 0xE4300203,</div><div class='add'>+	0x81C, 0xE3320203,</div><div class='add'>+	0x81C, 0xE2340203,</div><div class='add'>+	0x81C, 0xC6360203,</div><div class='add'>+	0x81C, 0xC5380203,</div><div class='add'>+	0x81C, 0xC43A0203,</div><div class='add'>+	0x81C, 0xC33C0203,</div><div class='add'>+	0x81C, 0xA63E0203,</div><div class='add'>+	0x81C, 0xA5400203,</div><div class='add'>+	0x81C, 0xA4420203,</div><div class='add'>+	0x81C, 0xA3440203,</div><div class='add'>+	0x81C, 0xA2460203,</div><div class='add'>+	0x81C, 0xA1480203,</div><div class='add'>+	0x81C, 0x834A0203,</div><div class='add'>+	0x81C, 0x824C0203,</div><div class='add'>+	0x81C, 0x814E0203,</div><div class='add'>+	0x81C, 0x64500203,</div><div class='add'>+	0x81C, 0x63520203,</div><div class='add'>+	0x81C, 0x62540203,</div><div class='add'>+	0x81C, 0x61560203,</div><div class='add'>+	0x81C, 0x60580203,</div><div class='add'>+	0x81C, 0x405A0203,</div><div class='add'>+	0x81C, 0x215C0203,</div><div class='add'>+	0x81C, 0x205E0203,</div><div class='add'>+	0x81C, 0x03600203,</div><div class='add'>+	0x81C, 0x02620203,</div><div class='add'>+	0x81C, 0x01640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000203,</div><div class='add'>+	0x81C, 0xF6020203,</div><div class='add'>+	0x81C, 0xF5040203,</div><div class='add'>+	0x81C, 0xF4060203,</div><div class='add'>+	0x81C, 0xF3080203,</div><div class='add'>+	0x81C, 0xF20A0203,</div><div class='add'>+	0x81C, 0xF10C0203,</div><div class='add'>+	0x81C, 0xF00E0203,</div><div class='add'>+	0x81C, 0xEF100203,</div><div class='add'>+	0x81C, 0xEE120203,</div><div class='add'>+	0x81C, 0xED140203,</div><div class='add'>+	0x81C, 0xEC160203,</div><div class='add'>+	0x81C, 0xEB180203,</div><div class='add'>+	0x81C, 0xEA1A0203,</div><div class='add'>+	0x81C, 0xE91C0203,</div><div class='add'>+	0x81C, 0xE81E0203,</div><div class='add'>+	0x81C, 0xE7200203,</div><div class='add'>+	0x81C, 0xE6220203,</div><div class='add'>+	0x81C, 0xE5240203,</div><div class='add'>+	0x81C, 0xE4260203,</div><div class='add'>+	0x81C, 0xE3280203,</div><div class='add'>+	0x81C, 0xC42A0203,</div><div class='add'>+	0x81C, 0xC32C0203,</div><div class='add'>+	0x81C, 0xC22E0203,</div><div class='add'>+	0x81C, 0xC1300203,</div><div class='add'>+	0x81C, 0xC0320203,</div><div class='add'>+	0x81C, 0xA3340203,</div><div class='add'>+	0x81C, 0xA2360203,</div><div class='add'>+	0x81C, 0xA1380203,</div><div class='add'>+	0x81C, 0xA03A0203,</div><div class='add'>+	0x81C, 0x823C0203,</div><div class='add'>+	0x81C, 0x813E0203,</div><div class='add'>+	0x81C, 0x80400203,</div><div class='add'>+	0x81C, 0x64420203,</div><div class='add'>+	0x81C, 0x63440203,</div><div class='add'>+	0x81C, 0x62460203,</div><div class='add'>+	0x81C, 0x61480203,</div><div class='add'>+	0x81C, 0x604A0203,</div><div class='add'>+	0x81C, 0x414C0203,</div><div class='add'>+	0x81C, 0x404E0203,</div><div class='add'>+	0x81C, 0x22500203,</div><div class='add'>+	0x81C, 0x21520203,</div><div class='add'>+	0x81C, 0x20540203,</div><div class='add'>+	0x81C, 0x03560203,</div><div class='add'>+	0x81C, 0x02580203,</div><div class='add'>+	0x81C, 0x015A0203,</div><div class='add'>+	0x81C, 0x005C0203,</div><div class='add'>+	0x81C, 0x005E0203,</div><div class='add'>+	0x81C, 0x00600203,</div><div class='add'>+	0x81C, 0x00620203,</div><div class='add'>+	0x81C, 0x00640203,</div><div class='add'>+	0x81C, 0x00660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000203,</div><div class='add'>+	0x81C, 0xFC020203,</div><div class='add'>+	0x81C, 0xFB040203,</div><div class='add'>+	0x81C, 0xFA060203,</div><div class='add'>+	0x81C, 0xF9080203,</div><div class='add'>+	0x81C, 0xF80A0203,</div><div class='add'>+	0x81C, 0xF70C0203,</div><div class='add'>+	0x81C, 0xF60E0203,</div><div class='add'>+	0x81C, 0xF5100203,</div><div class='add'>+	0x81C, 0xF4120203,</div><div class='add'>+	0x81C, 0xF3140203,</div><div class='add'>+	0x81C, 0xF2160203,</div><div class='add'>+	0x81C, 0xF1180203,</div><div class='add'>+	0x81C, 0xF01A0203,</div><div class='add'>+	0x81C, 0xEF1C0203,</div><div class='add'>+	0x81C, 0xEE1E0203,</div><div class='add'>+	0x81C, 0xED200203,</div><div class='add'>+	0x81C, 0xEC220203,</div><div class='add'>+	0x81C, 0xEB240203,</div><div class='add'>+	0x81C, 0xEA260203,</div><div class='add'>+	0x81C, 0xE9280203,</div><div class='add'>+	0x81C, 0xE82A0203,</div><div class='add'>+	0x81C, 0xE72C0203,</div><div class='add'>+	0x81C, 0xE62E0203,</div><div class='add'>+	0x81C, 0xE5300203,</div><div class='add'>+	0x81C, 0xE4320203,</div><div class='add'>+	0x81C, 0xE3340203,</div><div class='add'>+	0x81C, 0xC6360203,</div><div class='add'>+	0x81C, 0xC5380203,</div><div class='add'>+	0x81C, 0xC43A0203,</div><div class='add'>+	0x81C, 0xC33C0203,</div><div class='add'>+	0x81C, 0xA63E0203,</div><div class='add'>+	0x81C, 0xA5400203,</div><div class='add'>+	0x81C, 0xA4420203,</div><div class='add'>+	0x81C, 0xA3440203,</div><div class='add'>+	0x81C, 0xA2460203,</div><div class='add'>+	0x81C, 0xA1480203,</div><div class='add'>+	0x81C, 0x834A0203,</div><div class='add'>+	0x81C, 0x824C0203,</div><div class='add'>+	0x81C, 0x814E0203,</div><div class='add'>+	0x81C, 0x64500203,</div><div class='add'>+	0x81C, 0x63520203,</div><div class='add'>+	0x81C, 0x62540203,</div><div class='add'>+	0x81C, 0x61560203,</div><div class='add'>+	0x81C, 0x60580203,</div><div class='add'>+	0x81C, 0x235A0203,</div><div class='add'>+	0x81C, 0x225C0203,</div><div class='add'>+	0x81C, 0x215E0203,</div><div class='add'>+	0x81C, 0x20600203,</div><div class='add'>+	0x81C, 0x03620203,</div><div class='add'>+	0x81C, 0x02640203,</div><div class='add'>+	0x81C, 0x01660203,</div><div class='add'>+	0x81C, 0x00680203,</div><div class='add'>+	0x81C, 0x006A0203,</div><div class='add'>+	0x81C, 0x006C0203,</div><div class='add'>+	0x81C, 0x006E0203,</div><div class='add'>+	0x81C, 0x00700203,</div><div class='add'>+	0x81C, 0x00720203,</div><div class='add'>+	0x81C, 0x00740203,</div><div class='add'>+	0x81C, 0x00760203,</div><div class='add'>+	0x81C, 0x00780203,</div><div class='add'>+	0x81C, 0x007A0203,</div><div class='add'>+	0x81C, 0x007C0203,</div><div class='add'>+	0x81C, 0x007E0203,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000303,</div><div class='add'>+	0x81C, 0xFB020303,</div><div class='add'>+	0x81C, 0xFA040303,</div><div class='add'>+	0x81C, 0xF9060303,</div><div class='add'>+	0x81C, 0xF8080303,</div><div class='add'>+	0x81C, 0xF70A0303,</div><div class='add'>+	0x81C, 0xF60C0303,</div><div class='add'>+	0x81C, 0xF50E0303,</div><div class='add'>+	0x81C, 0xF4100303,</div><div class='add'>+	0x81C, 0xF3120303,</div><div class='add'>+	0x81C, 0xF2140303,</div><div class='add'>+	0x81C, 0xF1160303,</div><div class='add'>+	0x81C, 0xEF180303,</div><div class='add'>+	0x81C, 0xEE1A0303,</div><div class='add'>+	0x81C, 0xED1C0303,</div><div class='add'>+	0x81C, 0xEC1E0303,</div><div class='add'>+	0x81C, 0xEB200303,</div><div class='add'>+	0x81C, 0xEA220303,</div><div class='add'>+	0x81C, 0xE9240303,</div><div class='add'>+	0x81C, 0xE8260303,</div><div class='add'>+	0x81C, 0xE7280303,</div><div class='add'>+	0x81C, 0xE62A0303,</div><div class='add'>+	0x81C, 0xE52C0303,</div><div class='add'>+	0x81C, 0xE42E0303,</div><div class='add'>+	0x81C, 0xE3300303,</div><div class='add'>+	0x81C, 0xE2320303,</div><div class='add'>+	0x81C, 0xC6340303,</div><div class='add'>+	0x81C, 0xC5360303,</div><div class='add'>+	0x81C, 0xC4380303,</div><div class='add'>+	0x81C, 0xC33A0303,</div><div class='add'>+	0x81C, 0xA63C0303,</div><div class='add'>+	0x81C, 0xA53E0303,</div><div class='add'>+	0x81C, 0xA4400303,</div><div class='add'>+	0x81C, 0xA3420303,</div><div class='add'>+	0x81C, 0xA2440303,</div><div class='add'>+	0x81C, 0xA1460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x804E0303,</div><div class='add'>+	0x81C, 0x63500303,</div><div class='add'>+	0x81C, 0x62520303,</div><div class='add'>+	0x81C, 0x61540303,</div><div class='add'>+	0x81C, 0x42560303,</div><div class='add'>+	0x81C, 0x41580303,</div><div class='add'>+	0x81C, 0x405A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x04620303,</div><div class='add'>+	0x81C, 0x03640303,</div><div class='add'>+	0x81C, 0x02660303,</div><div class='add'>+	0x81C, 0x01680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000303,</div><div class='add'>+	0x81C, 0xF6020303,</div><div class='add'>+	0x81C, 0xF5040303,</div><div class='add'>+	0x81C, 0xF4060303,</div><div class='add'>+	0x81C, 0xF3080303,</div><div class='add'>+	0x81C, 0xF20A0303,</div><div class='add'>+	0x81C, 0xF10C0303,</div><div class='add'>+	0x81C, 0xF00E0303,</div><div class='add'>+	0x81C, 0xEF100303,</div><div class='add'>+	0x81C, 0xEE120303,</div><div class='add'>+	0x81C, 0xED140303,</div><div class='add'>+	0x81C, 0xEC160303,</div><div class='add'>+	0x81C, 0xEB180303,</div><div class='add'>+	0x81C, 0xEA1A0303,</div><div class='add'>+	0x81C, 0xE91C0303,</div><div class='add'>+	0x81C, 0xCA1E0303,</div><div class='add'>+	0x81C, 0xC9200303,</div><div class='add'>+	0x81C, 0xC8220303,</div><div class='add'>+	0x81C, 0xC7240303,</div><div class='add'>+	0x81C, 0xC6260303,</div><div class='add'>+	0x81C, 0xC5280303,</div><div class='add'>+	0x81C, 0xC42A0303,</div><div class='add'>+	0x81C, 0xC32C0303,</div><div class='add'>+	0x81C, 0xC22E0303,</div><div class='add'>+	0x81C, 0xC1300303,</div><div class='add'>+	0x81C, 0xA4320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x64420303,</div><div class='add'>+	0x81C, 0x63440303,</div><div class='add'>+	0x81C, 0x62460303,</div><div class='add'>+	0x81C, 0x61480303,</div><div class='add'>+	0x81C, 0x604A0303,</div><div class='add'>+	0x81C, 0x414C0303,</div><div class='add'>+	0x81C, 0x404E0303,</div><div class='add'>+	0x81C, 0x06500303,</div><div class='add'>+	0x81C, 0x05520303,</div><div class='add'>+	0x81C, 0x04540303,</div><div class='add'>+	0x81C, 0x03560303,</div><div class='add'>+	0x81C, 0x02580303,</div><div class='add'>+	0x81C, 0x015A0303,</div><div class='add'>+	0x81C, 0x005C0303,</div><div class='add'>+	0x81C, 0x005E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000303,</div><div class='add'>+	0x81C, 0xF6020303,</div><div class='add'>+	0x81C, 0xF5040303,</div><div class='add'>+	0x81C, 0xF4060303,</div><div class='add'>+	0x81C, 0xF3080303,</div><div class='add'>+	0x81C, 0xF20A0303,</div><div class='add'>+	0x81C, 0xF10C0303,</div><div class='add'>+	0x81C, 0xF00E0303,</div><div class='add'>+	0x81C, 0xEF100303,</div><div class='add'>+	0x81C, 0xEE120303,</div><div class='add'>+	0x81C, 0xED140303,</div><div class='add'>+	0x81C, 0xEC160303,</div><div class='add'>+	0x81C, 0xEB180303,</div><div class='add'>+	0x81C, 0xEA1A0303,</div><div class='add'>+	0x81C, 0xE91C0303,</div><div class='add'>+	0x81C, 0xCA1E0303,</div><div class='add'>+	0x81C, 0xC9200303,</div><div class='add'>+	0x81C, 0xC8220303,</div><div class='add'>+	0x81C, 0xC7240303,</div><div class='add'>+	0x81C, 0xC6260303,</div><div class='add'>+	0x81C, 0xC5280303,</div><div class='add'>+	0x81C, 0xC42A0303,</div><div class='add'>+	0x81C, 0xC32C0303,</div><div class='add'>+	0x81C, 0xC22E0303,</div><div class='add'>+	0x81C, 0xC1300303,</div><div class='add'>+	0x81C, 0xA4320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x64420303,</div><div class='add'>+	0x81C, 0x63440303,</div><div class='add'>+	0x81C, 0x62460303,</div><div class='add'>+	0x81C, 0x61480303,</div><div class='add'>+	0x81C, 0x604A0303,</div><div class='add'>+	0x81C, 0x414C0303,</div><div class='add'>+	0x81C, 0x404E0303,</div><div class='add'>+	0x81C, 0x22500303,</div><div class='add'>+	0x81C, 0x21520303,</div><div class='add'>+	0x81C, 0x20540303,</div><div class='add'>+	0x81C, 0x03560303,</div><div class='add'>+	0x81C, 0x02580303,</div><div class='add'>+	0x81C, 0x015A0303,</div><div class='add'>+	0x81C, 0x005C0303,</div><div class='add'>+	0x81C, 0x005E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000303,</div><div class='add'>+	0x81C, 0xFB020303,</div><div class='add'>+	0x81C, 0xFA040303,</div><div class='add'>+	0x81C, 0xF9060303,</div><div class='add'>+	0x81C, 0xF8080303,</div><div class='add'>+	0x81C, 0xF70A0303,</div><div class='add'>+	0x81C, 0xF60C0303,</div><div class='add'>+	0x81C, 0xF50E0303,</div><div class='add'>+	0x81C, 0xF4100303,</div><div class='add'>+	0x81C, 0xF3120303,</div><div class='add'>+	0x81C, 0xF2140303,</div><div class='add'>+	0x81C, 0xF1160303,</div><div class='add'>+	0x81C, 0xF0180303,</div><div class='add'>+	0x81C, 0xEF1A0303,</div><div class='add'>+	0x81C, 0xEE1C0303,</div><div class='add'>+	0x81C, 0xED1E0303,</div><div class='add'>+	0x81C, 0xEC200303,</div><div class='add'>+	0x81C, 0xEB220303,</div><div class='add'>+	0x81C, 0xEA240303,</div><div class='add'>+	0x81C, 0xE9260303,</div><div class='add'>+	0x81C, 0xE8280303,</div><div class='add'>+	0x81C, 0xE72A0303,</div><div class='add'>+	0x81C, 0xE62C0303,</div><div class='add'>+	0x81C, 0xE52E0303,</div><div class='add'>+	0x81C, 0xE4300303,</div><div class='add'>+	0x81C, 0xE3320303,</div><div class='add'>+	0x81C, 0xE2340303,</div><div class='add'>+	0x81C, 0xC6360303,</div><div class='add'>+	0x81C, 0xC5380303,</div><div class='add'>+	0x81C, 0xC43A0303,</div><div class='add'>+	0x81C, 0xC33C0303,</div><div class='add'>+	0x81C, 0xA63E0303,</div><div class='add'>+	0x81C, 0xA5400303,</div><div class='add'>+	0x81C, 0xA4420303,</div><div class='add'>+	0x81C, 0xA3440303,</div><div class='add'>+	0x81C, 0xA2460303,</div><div class='add'>+	0x81C, 0x84480303,</div><div class='add'>+	0x81C, 0x834A0303,</div><div class='add'>+	0x81C, 0x824C0303,</div><div class='add'>+	0x81C, 0x814E0303,</div><div class='add'>+	0x81C, 0x80500303,</div><div class='add'>+	0x81C, 0x63520303,</div><div class='add'>+	0x81C, 0x62540303,</div><div class='add'>+	0x81C, 0x61560303,</div><div class='add'>+	0x81C, 0x60580303,</div><div class='add'>+	0x81C, 0x225A0303,</div><div class='add'>+	0x81C, 0x055C0303,</div><div class='add'>+	0x81C, 0x045E0303,</div><div class='add'>+	0x81C, 0x03600303,</div><div class='add'>+	0x81C, 0x02620303,</div><div class='add'>+	0x81C, 0x01640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000303,</div><div class='add'>+	0x81C, 0xF6020303,</div><div class='add'>+	0x81C, 0xF5040303,</div><div class='add'>+	0x81C, 0xF4060303,</div><div class='add'>+	0x81C, 0xF3080303,</div><div class='add'>+	0x81C, 0xF20A0303,</div><div class='add'>+	0x81C, 0xF10C0303,</div><div class='add'>+	0x81C, 0xF00E0303,</div><div class='add'>+	0x81C, 0xEF100303,</div><div class='add'>+	0x81C, 0xEE120303,</div><div class='add'>+	0x81C, 0xED140303,</div><div class='add'>+	0x81C, 0xEC160303,</div><div class='add'>+	0x81C, 0xEB180303,</div><div class='add'>+	0x81C, 0xEA1A0303,</div><div class='add'>+	0x81C, 0xE91C0303,</div><div class='add'>+	0x81C, 0xCA1E0303,</div><div class='add'>+	0x81C, 0xC9200303,</div><div class='add'>+	0x81C, 0xC8220303,</div><div class='add'>+	0x81C, 0xC7240303,</div><div class='add'>+	0x81C, 0xC6260303,</div><div class='add'>+	0x81C, 0xC5280303,</div><div class='add'>+	0x81C, 0xC42A0303,</div><div class='add'>+	0x81C, 0xC32C0303,</div><div class='add'>+	0x81C, 0xC22E0303,</div><div class='add'>+	0x81C, 0xC1300303,</div><div class='add'>+	0x81C, 0xA4320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x64420303,</div><div class='add'>+	0x81C, 0x63440303,</div><div class='add'>+	0x81C, 0x62460303,</div><div class='add'>+	0x81C, 0x61480303,</div><div class='add'>+	0x81C, 0x604A0303,</div><div class='add'>+	0x81C, 0x414C0303,</div><div class='add'>+	0x81C, 0x404E0303,</div><div class='add'>+	0x81C, 0x22500303,</div><div class='add'>+	0x81C, 0x21520303,</div><div class='add'>+	0x81C, 0x20540303,</div><div class='add'>+	0x81C, 0x03560303,</div><div class='add'>+	0x81C, 0x02580303,</div><div class='add'>+	0x81C, 0x015A0303,</div><div class='add'>+	0x81C, 0x005C0303,</div><div class='add'>+	0x81C, 0x005E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000303,</div><div class='add'>+	0x81C, 0xFA020303,</div><div class='add'>+	0x81C, 0xF9040303,</div><div class='add'>+	0x81C, 0xF8060303,</div><div class='add'>+	0x81C, 0xF7080303,</div><div class='add'>+	0x81C, 0xF60A0303,</div><div class='add'>+	0x81C, 0xF50C0303,</div><div class='add'>+	0x81C, 0xF40E0303,</div><div class='add'>+	0x81C, 0xF3100303,</div><div class='add'>+	0x81C, 0xF2120303,</div><div class='add'>+	0x81C, 0xF1140303,</div><div class='add'>+	0x81C, 0xF0160303,</div><div class='add'>+	0x81C, 0xEF180303,</div><div class='add'>+	0x81C, 0xEE1A0303,</div><div class='add'>+	0x81C, 0xED1C0303,</div><div class='add'>+	0x81C, 0xEC1E0303,</div><div class='add'>+	0x81C, 0xEB200303,</div><div class='add'>+	0x81C, 0xEA220303,</div><div class='add'>+	0x81C, 0xE9240303,</div><div class='add'>+	0x81C, 0xE8260303,</div><div class='add'>+	0x81C, 0xE7280303,</div><div class='add'>+	0x81C, 0xE62A0303,</div><div class='add'>+	0x81C, 0xE52C0303,</div><div class='add'>+	0x81C, 0xE42E0303,</div><div class='add'>+	0x81C, 0xE3300303,</div><div class='add'>+	0x81C, 0xE2320303,</div><div class='add'>+	0x81C, 0xE1340303,</div><div class='add'>+	0x81C, 0xC5360303,</div><div class='add'>+	0x81C, 0xC4380303,</div><div class='add'>+	0x81C, 0xC33A0303,</div><div class='add'>+	0x81C, 0xC23C0303,</div><div class='add'>+	0x81C, 0xC13E0303,</div><div class='add'>+	0x81C, 0xA4400303,</div><div class='add'>+	0x81C, 0xA3420303,</div><div class='add'>+	0x81C, 0xA2440303,</div><div class='add'>+	0x81C, 0xA1460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x804E0303,</div><div class='add'>+	0x81C, 0x64500303,</div><div class='add'>+	0x81C, 0x63520303,</div><div class='add'>+	0x81C, 0x62540303,</div><div class='add'>+	0x81C, 0x61560303,</div><div class='add'>+	0x81C, 0x60580303,</div><div class='add'>+	0x81C, 0x235A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x04620303,</div><div class='add'>+	0x81C, 0x03640303,</div><div class='add'>+	0x81C, 0x02660303,</div><div class='add'>+	0x81C, 0x01680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000303,</div><div class='add'>+	0x81C, 0xF8020303,</div><div class='add'>+	0x81C, 0xF7040303,</div><div class='add'>+	0x81C, 0xF6060303,</div><div class='add'>+	0x81C, 0xF5080303,</div><div class='add'>+	0x81C, 0xF40A0303,</div><div class='add'>+	0x81C, 0xF30C0303,</div><div class='add'>+	0x81C, 0xF20E0303,</div><div class='add'>+	0x81C, 0xF1100303,</div><div class='add'>+	0x81C, 0xF0120303,</div><div class='add'>+	0x81C, 0xEF140303,</div><div class='add'>+	0x81C, 0xEE160303,</div><div class='add'>+	0x81C, 0xED180303,</div><div class='add'>+	0x81C, 0xEC1A0303,</div><div class='add'>+	0x81C, 0xEB1C0303,</div><div class='add'>+	0x81C, 0xEA1E0303,</div><div class='add'>+	0x81C, 0xC9200303,</div><div class='add'>+	0x81C, 0xC8220303,</div><div class='add'>+	0x81C, 0xC7240303,</div><div class='add'>+	0x81C, 0xC6260303,</div><div class='add'>+	0x81C, 0xC5280303,</div><div class='add'>+	0x81C, 0xC42A0303,</div><div class='add'>+	0x81C, 0xC32C0303,</div><div class='add'>+	0x81C, 0xC22E0303,</div><div class='add'>+	0x81C, 0xC1300303,</div><div class='add'>+	0x81C, 0xC0320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x64420303,</div><div class='add'>+	0x81C, 0x63440303,</div><div class='add'>+	0x81C, 0x62460303,</div><div class='add'>+	0x81C, 0x61480303,</div><div class='add'>+	0x81C, 0x604A0303,</div><div class='add'>+	0x81C, 0x414C0303,</div><div class='add'>+	0x81C, 0x404E0303,</div><div class='add'>+	0x81C, 0x22500303,</div><div class='add'>+	0x81C, 0x21520303,</div><div class='add'>+	0x81C, 0x20540303,</div><div class='add'>+	0x81C, 0x03560303,</div><div class='add'>+	0x81C, 0x02580303,</div><div class='add'>+	0x81C, 0x015A0303,</div><div class='add'>+	0x81C, 0x005C0303,</div><div class='add'>+	0x81C, 0x005E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000303,</div><div class='add'>+	0x81C, 0xF7020303,</div><div class='add'>+	0x81C, 0xF6040303,</div><div class='add'>+	0x81C, 0xF5060303,</div><div class='add'>+	0x81C, 0xF4080303,</div><div class='add'>+	0x81C, 0xF30A0303,</div><div class='add'>+	0x81C, 0xF20C0303,</div><div class='add'>+	0x81C, 0xF10E0303,</div><div class='add'>+	0x81C, 0xF0100303,</div><div class='add'>+	0x81C, 0xEF120303,</div><div class='add'>+	0x81C, 0xEE140303,</div><div class='add'>+	0x81C, 0xED160303,</div><div class='add'>+	0x81C, 0xEC180303,</div><div class='add'>+	0x81C, 0xEB1A0303,</div><div class='add'>+	0x81C, 0xEA1C0303,</div><div class='add'>+	0x81C, 0xE91E0303,</div><div class='add'>+	0x81C, 0xCA200303,</div><div class='add'>+	0x81C, 0xC9220303,</div><div class='add'>+	0x81C, 0xC8240303,</div><div class='add'>+	0x81C, 0xC7260303,</div><div class='add'>+	0x81C, 0xC6280303,</div><div class='add'>+	0x81C, 0xC52A0303,</div><div class='add'>+	0x81C, 0xC42C0303,</div><div class='add'>+	0x81C, 0xC32E0303,</div><div class='add'>+	0x81C, 0xC2300303,</div><div class='add'>+	0x81C, 0xC1320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x65420303,</div><div class='add'>+	0x81C, 0x64440303,</div><div class='add'>+	0x81C, 0x63460303,</div><div class='add'>+	0x81C, 0x62480303,</div><div class='add'>+	0x81C, 0x614A0303,</div><div class='add'>+	0x81C, 0x424C0303,</div><div class='add'>+	0x81C, 0x414E0303,</div><div class='add'>+	0x81C, 0x40500303,</div><div class='add'>+	0x81C, 0x22520303,</div><div class='add'>+	0x81C, 0x21540303,</div><div class='add'>+	0x81C, 0x20560303,</div><div class='add'>+	0x81C, 0x04580303,</div><div class='add'>+	0x81C, 0x035A0303,</div><div class='add'>+	0x81C, 0x025C0303,</div><div class='add'>+	0x81C, 0x015E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000303,</div><div class='add'>+	0x81C, 0xFA020303,</div><div class='add'>+	0x81C, 0xF9040303,</div><div class='add'>+	0x81C, 0xF8060303,</div><div class='add'>+	0x81C, 0xF7080303,</div><div class='add'>+	0x81C, 0xF60A0303,</div><div class='add'>+	0x81C, 0xF50C0303,</div><div class='add'>+	0x81C, 0xF40E0303,</div><div class='add'>+	0x81C, 0xF3100303,</div><div class='add'>+	0x81C, 0xF2120303,</div><div class='add'>+	0x81C, 0xF1140303,</div><div class='add'>+	0x81C, 0xF0160303,</div><div class='add'>+	0x81C, 0xEF180303,</div><div class='add'>+	0x81C, 0xEE1A0303,</div><div class='add'>+	0x81C, 0xED1C0303,</div><div class='add'>+	0x81C, 0xEC1E0303,</div><div class='add'>+	0x81C, 0xEB200303,</div><div class='add'>+	0x81C, 0xEA220303,</div><div class='add'>+	0x81C, 0xE9240303,</div><div class='add'>+	0x81C, 0xE8260303,</div><div class='add'>+	0x81C, 0xE7280303,</div><div class='add'>+	0x81C, 0xE62A0303,</div><div class='add'>+	0x81C, 0xE52C0303,</div><div class='add'>+	0x81C, 0xE42E0303,</div><div class='add'>+	0x81C, 0xE3300303,</div><div class='add'>+	0x81C, 0xE2320303,</div><div class='add'>+	0x81C, 0xC6340303,</div><div class='add'>+	0x81C, 0xC5360303,</div><div class='add'>+	0x81C, 0xC4380303,</div><div class='add'>+	0x81C, 0xC33A0303,</div><div class='add'>+	0x81C, 0xC23C0303,</div><div class='add'>+	0x81C, 0xC13E0303,</div><div class='add'>+	0x81C, 0xA4400303,</div><div class='add'>+	0x81C, 0xA3420303,</div><div class='add'>+	0x81C, 0xA2440303,</div><div class='add'>+	0x81C, 0xA1460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x804E0303,</div><div class='add'>+	0x81C, 0x63500303,</div><div class='add'>+	0x81C, 0x62520303,</div><div class='add'>+	0x81C, 0x43540303,</div><div class='add'>+	0x81C, 0x42560303,</div><div class='add'>+	0x81C, 0x41580303,</div><div class='add'>+	0x81C, 0x235A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x04620303,</div><div class='add'>+	0x81C, 0x03640303,</div><div class='add'>+	0x81C, 0x02660303,</div><div class='add'>+	0x81C, 0x01680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000303,</div><div class='add'>+	0x81C, 0xF7020303,</div><div class='add'>+	0x81C, 0xF6040303,</div><div class='add'>+	0x81C, 0xF5060303,</div><div class='add'>+	0x81C, 0xF4080303,</div><div class='add'>+	0x81C, 0xF30A0303,</div><div class='add'>+	0x81C, 0xF20C0303,</div><div class='add'>+	0x81C, 0xF10E0303,</div><div class='add'>+	0x81C, 0xF0100303,</div><div class='add'>+	0x81C, 0xEF120303,</div><div class='add'>+	0x81C, 0xEE140303,</div><div class='add'>+	0x81C, 0xED160303,</div><div class='add'>+	0x81C, 0xEC180303,</div><div class='add'>+	0x81C, 0xEB1A0303,</div><div class='add'>+	0x81C, 0xEA1C0303,</div><div class='add'>+	0x81C, 0xE91E0303,</div><div class='add'>+	0x81C, 0xCA200303,</div><div class='add'>+	0x81C, 0xC9220303,</div><div class='add'>+	0x81C, 0xC8240303,</div><div class='add'>+	0x81C, 0xC7260303,</div><div class='add'>+	0x81C, 0xC6280303,</div><div class='add'>+	0x81C, 0xC52A0303,</div><div class='add'>+	0x81C, 0xC42C0303,</div><div class='add'>+	0x81C, 0xC32E0303,</div><div class='add'>+	0x81C, 0xC2300303,</div><div class='add'>+	0x81C, 0xC1320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x65420303,</div><div class='add'>+	0x81C, 0x64440303,</div><div class='add'>+	0x81C, 0x63460303,</div><div class='add'>+	0x81C, 0x62480303,</div><div class='add'>+	0x81C, 0x614A0303,</div><div class='add'>+	0x81C, 0x424C0303,</div><div class='add'>+	0x81C, 0x414E0303,</div><div class='add'>+	0x81C, 0x40500303,</div><div class='add'>+	0x81C, 0x22520303,</div><div class='add'>+	0x81C, 0x21540303,</div><div class='add'>+	0x81C, 0x20560303,</div><div class='add'>+	0x81C, 0x04580303,</div><div class='add'>+	0x81C, 0x035A0303,</div><div class='add'>+	0x81C, 0x025C0303,</div><div class='add'>+	0x81C, 0x015E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000303,</div><div class='add'>+	0x81C, 0xFB020303,</div><div class='add'>+	0x81C, 0xFA040303,</div><div class='add'>+	0x81C, 0xF9060303,</div><div class='add'>+	0x81C, 0xF8080303,</div><div class='add'>+	0x81C, 0xF70A0303,</div><div class='add'>+	0x81C, 0xF60C0303,</div><div class='add'>+	0x81C, 0xF50E0303,</div><div class='add'>+	0x81C, 0xF4100303,</div><div class='add'>+	0x81C, 0xF3120303,</div><div class='add'>+	0x81C, 0xF2140303,</div><div class='add'>+	0x81C, 0xF1160303,</div><div class='add'>+	0x81C, 0xEF180303,</div><div class='add'>+	0x81C, 0xEE1A0303,</div><div class='add'>+	0x81C, 0xED1C0303,</div><div class='add'>+	0x81C, 0xEC1E0303,</div><div class='add'>+	0x81C, 0xEB200303,</div><div class='add'>+	0x81C, 0xEA220303,</div><div class='add'>+	0x81C, 0xE9240303,</div><div class='add'>+	0x81C, 0xE8260303,</div><div class='add'>+	0x81C, 0xE7280303,</div><div class='add'>+	0x81C, 0xE62A0303,</div><div class='add'>+	0x81C, 0xE52C0303,</div><div class='add'>+	0x81C, 0xE42E0303,</div><div class='add'>+	0x81C, 0xE3300303,</div><div class='add'>+	0x81C, 0xE2320303,</div><div class='add'>+	0x81C, 0xC6340303,</div><div class='add'>+	0x81C, 0xC5360303,</div><div class='add'>+	0x81C, 0xC4380303,</div><div class='add'>+	0x81C, 0xC33A0303,</div><div class='add'>+	0x81C, 0xA63C0303,</div><div class='add'>+	0x81C, 0xA53E0303,</div><div class='add'>+	0x81C, 0xA4400303,</div><div class='add'>+	0x81C, 0xA3420303,</div><div class='add'>+	0x81C, 0xA2440303,</div><div class='add'>+	0x81C, 0xA1460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x804E0303,</div><div class='add'>+	0x81C, 0x63500303,</div><div class='add'>+	0x81C, 0x62520303,</div><div class='add'>+	0x81C, 0x61540303,</div><div class='add'>+	0x81C, 0x42560303,</div><div class='add'>+	0x81C, 0x41580303,</div><div class='add'>+	0x81C, 0x405A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x04620303,</div><div class='add'>+	0x81C, 0x03640303,</div><div class='add'>+	0x81C, 0x02660303,</div><div class='add'>+	0x81C, 0x01680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000303,</div><div class='add'>+	0x81C, 0xF7020303,</div><div class='add'>+	0x81C, 0xF6040303,</div><div class='add'>+	0x81C, 0xF5060303,</div><div class='add'>+	0x81C, 0xF4080303,</div><div class='add'>+	0x81C, 0xF30A0303,</div><div class='add'>+	0x81C, 0xF20C0303,</div><div class='add'>+	0x81C, 0xF10E0303,</div><div class='add'>+	0x81C, 0xF0100303,</div><div class='add'>+	0x81C, 0xEF120303,</div><div class='add'>+	0x81C, 0xEE140303,</div><div class='add'>+	0x81C, 0xED160303,</div><div class='add'>+	0x81C, 0xEC180303,</div><div class='add'>+	0x81C, 0xEB1A0303,</div><div class='add'>+	0x81C, 0xEA1C0303,</div><div class='add'>+	0x81C, 0xE91E0303,</div><div class='add'>+	0x81C, 0xCA200303,</div><div class='add'>+	0x81C, 0xC9220303,</div><div class='add'>+	0x81C, 0xC8240303,</div><div class='add'>+	0x81C, 0xC7260303,</div><div class='add'>+	0x81C, 0xC6280303,</div><div class='add'>+	0x81C, 0xC52A0303,</div><div class='add'>+	0x81C, 0xC42C0303,</div><div class='add'>+	0x81C, 0xC32E0303,</div><div class='add'>+	0x81C, 0xC2300303,</div><div class='add'>+	0x81C, 0xC1320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x64420303,</div><div class='add'>+	0x81C, 0x63440303,</div><div class='add'>+	0x81C, 0x62460303,</div><div class='add'>+	0x81C, 0x61480303,</div><div class='add'>+	0x81C, 0x604A0303,</div><div class='add'>+	0x81C, 0x234C0303,</div><div class='add'>+	0x81C, 0x224E0303,</div><div class='add'>+	0x81C, 0x21500303,</div><div class='add'>+	0x81C, 0x20520303,</div><div class='add'>+	0x81C, 0x06540303,</div><div class='add'>+	0x81C, 0x05560303,</div><div class='add'>+	0x81C, 0x04580303,</div><div class='add'>+	0x81C, 0x035A0303,</div><div class='add'>+	0x81C, 0x025C0303,</div><div class='add'>+	0x81C, 0x015E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000303,</div><div class='add'>+	0x81C, 0xFB020303,</div><div class='add'>+	0x81C, 0xFA040303,</div><div class='add'>+	0x81C, 0xF9060303,</div><div class='add'>+	0x81C, 0xF8080303,</div><div class='add'>+	0x81C, 0xF70A0303,</div><div class='add'>+	0x81C, 0xF60C0303,</div><div class='add'>+	0x81C, 0xF50E0303,</div><div class='add'>+	0x81C, 0xF4100303,</div><div class='add'>+	0x81C, 0xF3120303,</div><div class='add'>+	0x81C, 0xF2140303,</div><div class='add'>+	0x81C, 0xF1160303,</div><div class='add'>+	0x81C, 0xF0180303,</div><div class='add'>+	0x81C, 0xEF1A0303,</div><div class='add'>+	0x81C, 0xEE1C0303,</div><div class='add'>+	0x81C, 0xED1E0303,</div><div class='add'>+	0x81C, 0xEC200303,</div><div class='add'>+	0x81C, 0xEB220303,</div><div class='add'>+	0x81C, 0xEA240303,</div><div class='add'>+	0x81C, 0xE9260303,</div><div class='add'>+	0x81C, 0xE8280303,</div><div class='add'>+	0x81C, 0xE72A0303,</div><div class='add'>+	0x81C, 0xE62C0303,</div><div class='add'>+	0x81C, 0xE52E0303,</div><div class='add'>+	0x81C, 0xE4300303,</div><div class='add'>+	0x81C, 0xE3320303,</div><div class='add'>+	0x81C, 0xE2340303,</div><div class='add'>+	0x81C, 0xC6360303,</div><div class='add'>+	0x81C, 0xC5380303,</div><div class='add'>+	0x81C, 0xC43A0303,</div><div class='add'>+	0x81C, 0xC33C0303,</div><div class='add'>+	0x81C, 0xA63E0303,</div><div class='add'>+	0x81C, 0xA5400303,</div><div class='add'>+	0x81C, 0xA4420303,</div><div class='add'>+	0x81C, 0xA3440303,</div><div class='add'>+	0x81C, 0xA2460303,</div><div class='add'>+	0x81C, 0x84480303,</div><div class='add'>+	0x81C, 0x834A0303,</div><div class='add'>+	0x81C, 0x824C0303,</div><div class='add'>+	0x81C, 0x814E0303,</div><div class='add'>+	0x81C, 0x80500303,</div><div class='add'>+	0x81C, 0x63520303,</div><div class='add'>+	0x81C, 0x62540303,</div><div class='add'>+	0x81C, 0x61560303,</div><div class='add'>+	0x81C, 0x60580303,</div><div class='add'>+	0x81C, 0x225A0303,</div><div class='add'>+	0x81C, 0x055C0303,</div><div class='add'>+	0x81C, 0x045E0303,</div><div class='add'>+	0x81C, 0x03600303,</div><div class='add'>+	0x81C, 0x02620303,</div><div class='add'>+	0x81C, 0x01640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000303,</div><div class='add'>+	0x81C, 0xFA020303,</div><div class='add'>+	0x81C, 0xF9040303,</div><div class='add'>+	0x81C, 0xF8060303,</div><div class='add'>+	0x81C, 0xF7080303,</div><div class='add'>+	0x81C, 0xF60A0303,</div><div class='add'>+	0x81C, 0xF50C0303,</div><div class='add'>+	0x81C, 0xF40E0303,</div><div class='add'>+	0x81C, 0xF3100303,</div><div class='add'>+	0x81C, 0xF2120303,</div><div class='add'>+	0x81C, 0xF1140303,</div><div class='add'>+	0x81C, 0xEF160303,</div><div class='add'>+	0x81C, 0xEE180303,</div><div class='add'>+	0x81C, 0xED1A0303,</div><div class='add'>+	0x81C, 0xEC1C0303,</div><div class='add'>+	0x81C, 0xEB1E0303,</div><div class='add'>+	0x81C, 0xEA200303,</div><div class='add'>+	0x81C, 0xE9220303,</div><div class='add'>+	0x81C, 0xE8240303,</div><div class='add'>+	0x81C, 0xE7260303,</div><div class='add'>+	0x81C, 0xE6280303,</div><div class='add'>+	0x81C, 0xE52A0303,</div><div class='add'>+	0x81C, 0xE42C0303,</div><div class='add'>+	0x81C, 0xE32E0303,</div><div class='add'>+	0x81C, 0xE2300303,</div><div class='add'>+	0x81C, 0xE1320303,</div><div class='add'>+	0x81C, 0xC6340303,</div><div class='add'>+	0x81C, 0xC5360303,</div><div class='add'>+	0x81C, 0xC4380303,</div><div class='add'>+	0x81C, 0xC33A0303,</div><div class='add'>+	0x81C, 0xA63C0303,</div><div class='add'>+	0x81C, 0xA53E0303,</div><div class='add'>+	0x81C, 0xA4400303,</div><div class='add'>+	0x81C, 0xA3420303,</div><div class='add'>+	0x81C, 0xA2440303,</div><div class='add'>+	0x81C, 0xA1460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x804E0303,</div><div class='add'>+	0x81C, 0x63500303,</div><div class='add'>+	0x81C, 0x62520303,</div><div class='add'>+	0x81C, 0x61540303,</div><div class='add'>+	0x81C, 0x42560303,</div><div class='add'>+	0x81C, 0x41580303,</div><div class='add'>+	0x81C, 0x405A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x04620303,</div><div class='add'>+	0x81C, 0x03640303,</div><div class='add'>+	0x81C, 0x02660303,</div><div class='add'>+	0x81C, 0x01680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000303,</div><div class='add'>+	0x81C, 0xFA020303,</div><div class='add'>+	0x81C, 0xF9040303,</div><div class='add'>+	0x81C, 0xF8060303,</div><div class='add'>+	0x81C, 0xF7080303,</div><div class='add'>+	0x81C, 0xF60A0303,</div><div class='add'>+	0x81C, 0xF50C0303,</div><div class='add'>+	0x81C, 0xF40E0303,</div><div class='add'>+	0x81C, 0xF3100303,</div><div class='add'>+	0x81C, 0xF2120303,</div><div class='add'>+	0x81C, 0xF1140303,</div><div class='add'>+	0x81C, 0xEF160303,</div><div class='add'>+	0x81C, 0xEE180303,</div><div class='add'>+	0x81C, 0xED1A0303,</div><div class='add'>+	0x81C, 0xEC1C0303,</div><div class='add'>+	0x81C, 0xEB1E0303,</div><div class='add'>+	0x81C, 0xEA200303,</div><div class='add'>+	0x81C, 0xE9220303,</div><div class='add'>+	0x81C, 0xE8240303,</div><div class='add'>+	0x81C, 0xE7260303,</div><div class='add'>+	0x81C, 0xE6280303,</div><div class='add'>+	0x81C, 0xE52A0303,</div><div class='add'>+	0x81C, 0xE42C0303,</div><div class='add'>+	0x81C, 0xE32E0303,</div><div class='add'>+	0x81C, 0xE2300303,</div><div class='add'>+	0x81C, 0xE1320303,</div><div class='add'>+	0x81C, 0xC6340303,</div><div class='add'>+	0x81C, 0xC5360303,</div><div class='add'>+	0x81C, 0xC4380303,</div><div class='add'>+	0x81C, 0xC33A0303,</div><div class='add'>+	0x81C, 0xA63C0303,</div><div class='add'>+	0x81C, 0xA53E0303,</div><div class='add'>+	0x81C, 0xA4400303,</div><div class='add'>+	0x81C, 0xA3420303,</div><div class='add'>+	0x81C, 0xA2440303,</div><div class='add'>+	0x81C, 0xA1460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x804E0303,</div><div class='add'>+	0x81C, 0x63500303,</div><div class='add'>+	0x81C, 0x62520303,</div><div class='add'>+	0x81C, 0x61540303,</div><div class='add'>+	0x81C, 0x42560303,</div><div class='add'>+	0x81C, 0x41580303,</div><div class='add'>+	0x81C, 0x405A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x04620303,</div><div class='add'>+	0x81C, 0x03640303,</div><div class='add'>+	0x81C, 0x02660303,</div><div class='add'>+	0x81C, 0x01680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000303,</div><div class='add'>+	0x81C, 0xFA020303,</div><div class='add'>+	0x81C, 0xF9040303,</div><div class='add'>+	0x81C, 0xF8060303,</div><div class='add'>+	0x81C, 0xF7080303,</div><div class='add'>+	0x81C, 0xF60A0303,</div><div class='add'>+	0x81C, 0xF50C0303,</div><div class='add'>+	0x81C, 0xF40E0303,</div><div class='add'>+	0x81C, 0xF3100303,</div><div class='add'>+	0x81C, 0xF2120303,</div><div class='add'>+	0x81C, 0xF1140303,</div><div class='add'>+	0x81C, 0xF0160303,</div><div class='add'>+	0x81C, 0xEF180303,</div><div class='add'>+	0x81C, 0xEE1A0303,</div><div class='add'>+	0x81C, 0xED1C0303,</div><div class='add'>+	0x81C, 0xEC1E0303,</div><div class='add'>+	0x81C, 0xEB200303,</div><div class='add'>+	0x81C, 0xEA220303,</div><div class='add'>+	0x81C, 0xE9240303,</div><div class='add'>+	0x81C, 0xE8260303,</div><div class='add'>+	0x81C, 0xE7280303,</div><div class='add'>+	0x81C, 0xE62A0303,</div><div class='add'>+	0x81C, 0xE52C0303,</div><div class='add'>+	0x81C, 0xE42E0303,</div><div class='add'>+	0x81C, 0xE3300303,</div><div class='add'>+	0x81C, 0xE2320303,</div><div class='add'>+	0x81C, 0xE1340303,</div><div class='add'>+	0x81C, 0xE0360303,</div><div class='add'>+	0x81C, 0xC3380303,</div><div class='add'>+	0x81C, 0xC23A0303,</div><div class='add'>+	0x81C, 0xC13C0303,</div><div class='add'>+	0x81C, 0xC03E0303,</div><div class='add'>+	0x81C, 0xA3400303,</div><div class='add'>+	0x81C, 0xA2420303,</div><div class='add'>+	0x81C, 0xA1440303,</div><div class='add'>+	0x81C, 0xA0460303,</div><div class='add'>+	0x81C, 0x83480303,</div><div class='add'>+	0x81C, 0x824A0303,</div><div class='add'>+	0x81C, 0x814C0303,</div><div class='add'>+	0x81C, 0x644E0303,</div><div class='add'>+	0x81C, 0x63500303,</div><div class='add'>+	0x81C, 0x62520303,</div><div class='add'>+	0x81C, 0x61540303,</div><div class='add'>+	0x81C, 0x24560303,</div><div class='add'>+	0x81C, 0x23580303,</div><div class='add'>+	0x81C, 0x225A0303,</div><div class='add'>+	0x81C, 0x215C0303,</div><div class='add'>+	0x81C, 0x055E0303,</div><div class='add'>+	0x81C, 0x04600303,</div><div class='add'>+	0x81C, 0x03620303,</div><div class='add'>+	0x81C, 0x02640303,</div><div class='add'>+	0x81C, 0x01660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000303,</div><div class='add'>+	0x81C, 0xFB020303,</div><div class='add'>+	0x81C, 0xFA040303,</div><div class='add'>+	0x81C, 0xF9060303,</div><div class='add'>+	0x81C, 0xF8080303,</div><div class='add'>+	0x81C, 0xF70A0303,</div><div class='add'>+	0x81C, 0xF60C0303,</div><div class='add'>+	0x81C, 0xF50E0303,</div><div class='add'>+	0x81C, 0xF4100303,</div><div class='add'>+	0x81C, 0xF3120303,</div><div class='add'>+	0x81C, 0xF2140303,</div><div class='add'>+	0x81C, 0xF1160303,</div><div class='add'>+	0x81C, 0xF0180303,</div><div class='add'>+	0x81C, 0xEF1A0303,</div><div class='add'>+	0x81C, 0xEE1C0303,</div><div class='add'>+	0x81C, 0xED1E0303,</div><div class='add'>+	0x81C, 0xEC200303,</div><div class='add'>+	0x81C, 0xEB220303,</div><div class='add'>+	0x81C, 0xEA240303,</div><div class='add'>+	0x81C, 0xE9260303,</div><div class='add'>+	0x81C, 0xE8280303,</div><div class='add'>+	0x81C, 0xE72A0303,</div><div class='add'>+	0x81C, 0xE62C0303,</div><div class='add'>+	0x81C, 0xE52E0303,</div><div class='add'>+	0x81C, 0xE4300303,</div><div class='add'>+	0x81C, 0xE3320303,</div><div class='add'>+	0x81C, 0xE2340303,</div><div class='add'>+	0x81C, 0xC6360303,</div><div class='add'>+	0x81C, 0xC5380303,</div><div class='add'>+	0x81C, 0xC43A0303,</div><div class='add'>+	0x81C, 0xC33C0303,</div><div class='add'>+	0x81C, 0xA63E0303,</div><div class='add'>+	0x81C, 0xA5400303,</div><div class='add'>+	0x81C, 0xA4420303,</div><div class='add'>+	0x81C, 0xA3440303,</div><div class='add'>+	0x81C, 0xA2460303,</div><div class='add'>+	0x81C, 0x84480303,</div><div class='add'>+	0x81C, 0x834A0303,</div><div class='add'>+	0x81C, 0x824C0303,</div><div class='add'>+	0x81C, 0x814E0303,</div><div class='add'>+	0x81C, 0x80500303,</div><div class='add'>+	0x81C, 0x63520303,</div><div class='add'>+	0x81C, 0x62540303,</div><div class='add'>+	0x81C, 0x61560303,</div><div class='add'>+	0x81C, 0x60580303,</div><div class='add'>+	0x81C, 0x225A0303,</div><div class='add'>+	0x81C, 0x055C0303,</div><div class='add'>+	0x81C, 0x045E0303,</div><div class='add'>+	0x81C, 0x03600303,</div><div class='add'>+	0x81C, 0x02620303,</div><div class='add'>+	0x81C, 0x01640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000303,</div><div class='add'>+	0x81C, 0xF6020303,</div><div class='add'>+	0x81C, 0xF5040303,</div><div class='add'>+	0x81C, 0xF4060303,</div><div class='add'>+	0x81C, 0xF3080303,</div><div class='add'>+	0x81C, 0xF20A0303,</div><div class='add'>+	0x81C, 0xF10C0303,</div><div class='add'>+	0x81C, 0xF00E0303,</div><div class='add'>+	0x81C, 0xEF100303,</div><div class='add'>+	0x81C, 0xEE120303,</div><div class='add'>+	0x81C, 0xED140303,</div><div class='add'>+	0x81C, 0xEC160303,</div><div class='add'>+	0x81C, 0xEB180303,</div><div class='add'>+	0x81C, 0xEA1A0303,</div><div class='add'>+	0x81C, 0xE91C0303,</div><div class='add'>+	0x81C, 0xCA1E0303,</div><div class='add'>+	0x81C, 0xC9200303,</div><div class='add'>+	0x81C, 0xC8220303,</div><div class='add'>+	0x81C, 0xC7240303,</div><div class='add'>+	0x81C, 0xC6260303,</div><div class='add'>+	0x81C, 0xC5280303,</div><div class='add'>+	0x81C, 0xC42A0303,</div><div class='add'>+	0x81C, 0xC32C0303,</div><div class='add'>+	0x81C, 0xC22E0303,</div><div class='add'>+	0x81C, 0xC1300303,</div><div class='add'>+	0x81C, 0xA4320303,</div><div class='add'>+	0x81C, 0xA3340303,</div><div class='add'>+	0x81C, 0xA2360303,</div><div class='add'>+	0x81C, 0xA1380303,</div><div class='add'>+	0x81C, 0xA03A0303,</div><div class='add'>+	0x81C, 0x823C0303,</div><div class='add'>+	0x81C, 0x813E0303,</div><div class='add'>+	0x81C, 0x80400303,</div><div class='add'>+	0x81C, 0x64420303,</div><div class='add'>+	0x81C, 0x63440303,</div><div class='add'>+	0x81C, 0x62460303,</div><div class='add'>+	0x81C, 0x61480303,</div><div class='add'>+	0x81C, 0x604A0303,</div><div class='add'>+	0x81C, 0x414C0303,</div><div class='add'>+	0x81C, 0x404E0303,</div><div class='add'>+	0x81C, 0x22500303,</div><div class='add'>+	0x81C, 0x21520303,</div><div class='add'>+	0x81C, 0x20540303,</div><div class='add'>+	0x81C, 0x03560303,</div><div class='add'>+	0x81C, 0x02580303,</div><div class='add'>+	0x81C, 0x015A0303,</div><div class='add'>+	0x81C, 0x005C0303,</div><div class='add'>+	0x81C, 0x005E0303,</div><div class='add'>+	0x81C, 0x00600303,</div><div class='add'>+	0x81C, 0x00620303,</div><div class='add'>+	0x81C, 0x00640303,</div><div class='add'>+	0x81C, 0x00660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000303,</div><div class='add'>+	0x81C, 0xFB020303,</div><div class='add'>+	0x81C, 0xFA040303,</div><div class='add'>+	0x81C, 0xF9060303,</div><div class='add'>+	0x81C, 0xF8080303,</div><div class='add'>+	0x81C, 0xF70A0303,</div><div class='add'>+	0x81C, 0xF60C0303,</div><div class='add'>+	0x81C, 0xF50E0303,</div><div class='add'>+	0x81C, 0xF4100303,</div><div class='add'>+	0x81C, 0xF3120303,</div><div class='add'>+	0x81C, 0xF2140303,</div><div class='add'>+	0x81C, 0xF1160303,</div><div class='add'>+	0x81C, 0xF0180303,</div><div class='add'>+	0x81C, 0xEF1A0303,</div><div class='add'>+	0x81C, 0xEE1C0303,</div><div class='add'>+	0x81C, 0xED1E0303,</div><div class='add'>+	0x81C, 0xEC200303,</div><div class='add'>+	0x81C, 0xEB220303,</div><div class='add'>+	0x81C, 0xEA240303,</div><div class='add'>+	0x81C, 0xE9260303,</div><div class='add'>+	0x81C, 0xE8280303,</div><div class='add'>+	0x81C, 0xE72A0303,</div><div class='add'>+	0x81C, 0xE62C0303,</div><div class='add'>+	0x81C, 0xE52E0303,</div><div class='add'>+	0x81C, 0xE4300303,</div><div class='add'>+	0x81C, 0xE3320303,</div><div class='add'>+	0x81C, 0xE2340303,</div><div class='add'>+	0x81C, 0xC6360303,</div><div class='add'>+	0x81C, 0xC5380303,</div><div class='add'>+	0x81C, 0xC43A0303,</div><div class='add'>+	0x81C, 0xC33C0303,</div><div class='add'>+	0x81C, 0xA63E0303,</div><div class='add'>+	0x81C, 0xA5400303,</div><div class='add'>+	0x81C, 0xA4420303,</div><div class='add'>+	0x81C, 0xA3440303,</div><div class='add'>+	0x81C, 0xA2460303,</div><div class='add'>+	0x81C, 0x84480303,</div><div class='add'>+	0x81C, 0x834A0303,</div><div class='add'>+	0x81C, 0x824C0303,</div><div class='add'>+	0x81C, 0x814E0303,</div><div class='add'>+	0x81C, 0x80500303,</div><div class='add'>+	0x81C, 0x63520303,</div><div class='add'>+	0x81C, 0x62540303,</div><div class='add'>+	0x81C, 0x61560303,</div><div class='add'>+	0x81C, 0x60580303,</div><div class='add'>+	0x81C, 0x235A0303,</div><div class='add'>+	0x81C, 0x225C0303,</div><div class='add'>+	0x81C, 0x215E0303,</div><div class='add'>+	0x81C, 0x20600303,</div><div class='add'>+	0x81C, 0x03620303,</div><div class='add'>+	0x81C, 0x02640303,</div><div class='add'>+	0x81C, 0x01660303,</div><div class='add'>+	0x81C, 0x00680303,</div><div class='add'>+	0x81C, 0x006A0303,</div><div class='add'>+	0x81C, 0x006C0303,</div><div class='add'>+	0x81C, 0x006E0303,</div><div class='add'>+	0x81C, 0x00700303,</div><div class='add'>+	0x81C, 0x00720303,</div><div class='add'>+	0x81C, 0x00740303,</div><div class='add'>+	0x81C, 0x00760303,</div><div class='add'>+	0x81C, 0x00780303,</div><div class='add'>+	0x81C, 0x007A0303,</div><div class='add'>+	0x81C, 0x007C0303,</div><div class='add'>+	0x81C, 0x007E0303,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF5000403,</div><div class='add'>+	0x81C, 0xF4020403,</div><div class='add'>+	0x81C, 0xF3040403,</div><div class='add'>+	0x81C, 0xF2060403,</div><div class='add'>+	0x81C, 0xF1080403,</div><div class='add'>+	0x81C, 0xF00A0403,</div><div class='add'>+	0x81C, 0xEF0C0403,</div><div class='add'>+	0x81C, 0xEE0E0403,</div><div class='add'>+	0x81C, 0xED100403,</div><div class='add'>+	0x81C, 0xEC120403,</div><div class='add'>+	0x81C, 0xEB140403,</div><div class='add'>+	0x81C, 0xEA160403,</div><div class='add'>+	0x81C, 0xE9180403,</div><div class='add'>+	0x81C, 0xE81A0403,</div><div class='add'>+	0x81C, 0xE71C0403,</div><div class='add'>+	0x81C, 0xE61E0403,</div><div class='add'>+	0x81C, 0xE5200403,</div><div class='add'>+	0x81C, 0xE4220403,</div><div class='add'>+	0x81C, 0xE3240403,</div><div class='add'>+	0x81C, 0xE2260403,</div><div class='add'>+	0x81C, 0xE1280403,</div><div class='add'>+	0x81C, 0xE02A0403,</div><div class='add'>+	0x81C, 0xC32C0403,</div><div class='add'>+	0x81C, 0xC22E0403,</div><div class='add'>+	0x81C, 0xC1300403,</div><div class='add'>+	0x81C, 0xC0320403,</div><div class='add'>+	0x81C, 0xA4340403,</div><div class='add'>+	0x81C, 0xA3360403,</div><div class='add'>+	0x81C, 0xA2380403,</div><div class='add'>+	0x81C, 0xA13A0403,</div><div class='add'>+	0x81C, 0xA03C0403,</div><div class='add'>+	0x81C, 0x823E0403,</div><div class='add'>+	0x81C, 0x81400403,</div><div class='add'>+	0x81C, 0x80420403,</div><div class='add'>+	0x81C, 0x64440403,</div><div class='add'>+	0x81C, 0x63460403,</div><div class='add'>+	0x81C, 0x62480403,</div><div class='add'>+	0x81C, 0x614A0403,</div><div class='add'>+	0x81C, 0x604C0403,</div><div class='add'>+	0x81C, 0x454E0403,</div><div class='add'>+	0x81C, 0x44500403,</div><div class='add'>+	0x81C, 0x43520403,</div><div class='add'>+	0x81C, 0x42540403,</div><div class='add'>+	0x81C, 0x41560403,</div><div class='add'>+	0x81C, 0x40580403,</div><div class='add'>+	0x81C, 0x055A0403,</div><div class='add'>+	0x81C, 0x045C0403,</div><div class='add'>+	0x81C, 0x035E0403,</div><div class='add'>+	0x81C, 0x02600403,</div><div class='add'>+	0x81C, 0x01620403,</div><div class='add'>+	0x81C, 0x00640403,</div><div class='add'>+	0x81C, 0x00660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF6000403,</div><div class='add'>+	0x81C, 0xF5020403,</div><div class='add'>+	0x81C, 0xF4040403,</div><div class='add'>+	0x81C, 0xF3060403,</div><div class='add'>+	0x81C, 0xF2080403,</div><div class='add'>+	0x81C, 0xF10A0403,</div><div class='add'>+	0x81C, 0xF00C0403,</div><div class='add'>+	0x81C, 0xEF0E0403,</div><div class='add'>+	0x81C, 0xD6100403,</div><div class='add'>+	0x81C, 0xD5120403,</div><div class='add'>+	0x81C, 0xD4140403,</div><div class='add'>+	0x81C, 0xD3160403,</div><div class='add'>+	0x81C, 0xD2180403,</div><div class='add'>+	0x81C, 0xD11A0403,</div><div class='add'>+	0x81C, 0xD01C0403,</div><div class='add'>+	0x81C, 0xCF1E0403,</div><div class='add'>+	0x81C, 0x95200403,</div><div class='add'>+	0x81C, 0x94220403,</div><div class='add'>+	0x81C, 0x93240403,</div><div class='add'>+	0x81C, 0x92260403,</div><div class='add'>+	0x81C, 0x91280403,</div><div class='add'>+	0x81C, 0x902A0403,</div><div class='add'>+	0x81C, 0x8F2C0403,</div><div class='add'>+	0x81C, 0x8E2E0403,</div><div class='add'>+	0x81C, 0x8D300403,</div><div class='add'>+	0x81C, 0x8C320403,</div><div class='add'>+	0x81C, 0x8B340403,</div><div class='add'>+	0x81C, 0x8A360403,</div><div class='add'>+	0x81C, 0x89380403,</div><div class='add'>+	0x81C, 0x883A0403,</div><div class='add'>+	0x81C, 0x873C0403,</div><div class='add'>+	0x81C, 0x863E0403,</div><div class='add'>+	0x81C, 0x68400403,</div><div class='add'>+	0x81C, 0x67420403,</div><div class='add'>+	0x81C, 0x66440403,</div><div class='add'>+	0x81C, 0x65460403,</div><div class='add'>+	0x81C, 0x64480403,</div><div class='add'>+	0x81C, 0x634A0403,</div><div class='add'>+	0x81C, 0x484C0403,</div><div class='add'>+	0x81C, 0x474E0403,</div><div class='add'>+	0x81C, 0x46500403,</div><div class='add'>+	0x81C, 0x45520403,</div><div class='add'>+	0x81C, 0x44540403,</div><div class='add'>+	0x81C, 0x27560403,</div><div class='add'>+	0x81C, 0x26580403,</div><div class='add'>+	0x81C, 0x255A0403,</div><div class='add'>+	0x81C, 0x245C0403,</div><div class='add'>+	0x81C, 0x235E0403,</div><div class='add'>+	0x81C, 0x04600403,</div><div class='add'>+	0x81C, 0x03620403,</div><div class='add'>+	0x81C, 0x02640403,</div><div class='add'>+	0x81C, 0x01660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF5000403,</div><div class='add'>+	0x81C, 0xF4020403,</div><div class='add'>+	0x81C, 0xF3040403,</div><div class='add'>+	0x81C, 0xF2060403,</div><div class='add'>+	0x81C, 0xF1080403,</div><div class='add'>+	0x81C, 0xF00A0403,</div><div class='add'>+	0x81C, 0xEF0C0403,</div><div class='add'>+	0x81C, 0xEE0E0403,</div><div class='add'>+	0x81C, 0xED100403,</div><div class='add'>+	0x81C, 0xEC120403,</div><div class='add'>+	0x81C, 0xEB140403,</div><div class='add'>+	0x81C, 0xEA160403,</div><div class='add'>+	0x81C, 0xE9180403,</div><div class='add'>+	0x81C, 0xE81A0403,</div><div class='add'>+	0x81C, 0xE71C0403,</div><div class='add'>+	0x81C, 0xE61E0403,</div><div class='add'>+	0x81C, 0xE5200403,</div><div class='add'>+	0x81C, 0xE4220403,</div><div class='add'>+	0x81C, 0xE3240403,</div><div class='add'>+	0x81C, 0xE2260403,</div><div class='add'>+	0x81C, 0xE1280403,</div><div class='add'>+	0x81C, 0xE02A0403,</div><div class='add'>+	0x81C, 0xC32C0403,</div><div class='add'>+	0x81C, 0xC22E0403,</div><div class='add'>+	0x81C, 0xC1300403,</div><div class='add'>+	0x81C, 0xC0320403,</div><div class='add'>+	0x81C, 0xA4340403,</div><div class='add'>+	0x81C, 0xA3360403,</div><div class='add'>+	0x81C, 0xA2380403,</div><div class='add'>+	0x81C, 0xA13A0403,</div><div class='add'>+	0x81C, 0xA03C0403,</div><div class='add'>+	0x81C, 0x823E0403,</div><div class='add'>+	0x81C, 0x81400403,</div><div class='add'>+	0x81C, 0x80420403,</div><div class='add'>+	0x81C, 0x64440403,</div><div class='add'>+	0x81C, 0x63460403,</div><div class='add'>+	0x81C, 0x62480403,</div><div class='add'>+	0x81C, 0x614A0403,</div><div class='add'>+	0x81C, 0x604C0403,</div><div class='add'>+	0x81C, 0x454E0403,</div><div class='add'>+	0x81C, 0x44500403,</div><div class='add'>+	0x81C, 0x43520403,</div><div class='add'>+	0x81C, 0x42540403,</div><div class='add'>+	0x81C, 0x41560403,</div><div class='add'>+	0x81C, 0x40580403,</div><div class='add'>+	0x81C, 0x055A0403,</div><div class='add'>+	0x81C, 0x045C0403,</div><div class='add'>+	0x81C, 0x035E0403,</div><div class='add'>+	0x81C, 0x02600403,</div><div class='add'>+	0x81C, 0x01620403,</div><div class='add'>+	0x81C, 0x00640403,</div><div class='add'>+	0x81C, 0x00660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF5000403,</div><div class='add'>+	0x81C, 0xF4020403,</div><div class='add'>+	0x81C, 0xF3040403,</div><div class='add'>+	0x81C, 0xF2060403,</div><div class='add'>+	0x81C, 0xF1080403,</div><div class='add'>+	0x81C, 0xF00A0403,</div><div class='add'>+	0x81C, 0xEF0C0403,</div><div class='add'>+	0x81C, 0xEE0E0403,</div><div class='add'>+	0x81C, 0xED100403,</div><div class='add'>+	0x81C, 0xEC120403,</div><div class='add'>+	0x81C, 0xEB140403,</div><div class='add'>+	0x81C, 0xEA160403,</div><div class='add'>+	0x81C, 0xE9180403,</div><div class='add'>+	0x81C, 0xE81A0403,</div><div class='add'>+	0x81C, 0xE71C0403,</div><div class='add'>+	0x81C, 0xE61E0403,</div><div class='add'>+	0x81C, 0xE5200403,</div><div class='add'>+	0x81C, 0xE4220403,</div><div class='add'>+	0x81C, 0xE3240403,</div><div class='add'>+	0x81C, 0xE2260403,</div><div class='add'>+	0x81C, 0xE1280403,</div><div class='add'>+	0x81C, 0xE02A0403,</div><div class='add'>+	0x81C, 0xC32C0403,</div><div class='add'>+	0x81C, 0xC22E0403,</div><div class='add'>+	0x81C, 0xC1300403,</div><div class='add'>+	0x81C, 0xC0320403,</div><div class='add'>+	0x81C, 0xA4340403,</div><div class='add'>+	0x81C, 0xA3360403,</div><div class='add'>+	0x81C, 0xA2380403,</div><div class='add'>+	0x81C, 0xA13A0403,</div><div class='add'>+	0x81C, 0xA03C0403,</div><div class='add'>+	0x81C, 0x823E0403,</div><div class='add'>+	0x81C, 0x81400403,</div><div class='add'>+	0x81C, 0x80420403,</div><div class='add'>+	0x81C, 0x64440403,</div><div class='add'>+	0x81C, 0x63460403,</div><div class='add'>+	0x81C, 0x62480403,</div><div class='add'>+	0x81C, 0x614A0403,</div><div class='add'>+	0x81C, 0x604C0403,</div><div class='add'>+	0x81C, 0x454E0403,</div><div class='add'>+	0x81C, 0x44500403,</div><div class='add'>+	0x81C, 0x43520403,</div><div class='add'>+	0x81C, 0x42540403,</div><div class='add'>+	0x81C, 0x41560403,</div><div class='add'>+	0x81C, 0x40580403,</div><div class='add'>+	0x81C, 0x055A0403,</div><div class='add'>+	0x81C, 0x045C0403,</div><div class='add'>+	0x81C, 0x035E0403,</div><div class='add'>+	0x81C, 0x02600403,</div><div class='add'>+	0x81C, 0x01620403,</div><div class='add'>+	0x81C, 0x00640403,</div><div class='add'>+	0x81C, 0x00660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF5000403,</div><div class='add'>+	0x81C, 0xF4020403,</div><div class='add'>+	0x81C, 0xF3040403,</div><div class='add'>+	0x81C, 0xF2060403,</div><div class='add'>+	0x81C, 0xF1080403,</div><div class='add'>+	0x81C, 0xF00A0403,</div><div class='add'>+	0x81C, 0xEF0C0403,</div><div class='add'>+	0x81C, 0xEE0E0403,</div><div class='add'>+	0x81C, 0xED100403,</div><div class='add'>+	0x81C, 0xEC120403,</div><div class='add'>+	0x81C, 0xEB140403,</div><div class='add'>+	0x81C, 0xEA160403,</div><div class='add'>+	0x81C, 0xE9180403,</div><div class='add'>+	0x81C, 0xE81A0403,</div><div class='add'>+	0x81C, 0xE71C0403,</div><div class='add'>+	0x81C, 0xE61E0403,</div><div class='add'>+	0x81C, 0xE5200403,</div><div class='add'>+	0x81C, 0xE4220403,</div><div class='add'>+	0x81C, 0xE3240403,</div><div class='add'>+	0x81C, 0xE2260403,</div><div class='add'>+	0x81C, 0xE1280403,</div><div class='add'>+	0x81C, 0xE02A0403,</div><div class='add'>+	0x81C, 0xC32C0403,</div><div class='add'>+	0x81C, 0xC22E0403,</div><div class='add'>+	0x81C, 0xC1300403,</div><div class='add'>+	0x81C, 0xC0320403,</div><div class='add'>+	0x81C, 0xA4340403,</div><div class='add'>+	0x81C, 0xA3360403,</div><div class='add'>+	0x81C, 0xA2380403,</div><div class='add'>+	0x81C, 0xA13A0403,</div><div class='add'>+	0x81C, 0xA03C0403,</div><div class='add'>+	0x81C, 0x823E0403,</div><div class='add'>+	0x81C, 0x81400403,</div><div class='add'>+	0x81C, 0x80420403,</div><div class='add'>+	0x81C, 0x64440403,</div><div class='add'>+	0x81C, 0x63460403,</div><div class='add'>+	0x81C, 0x62480403,</div><div class='add'>+	0x81C, 0x614A0403,</div><div class='add'>+	0x81C, 0x604C0403,</div><div class='add'>+	0x81C, 0x454E0403,</div><div class='add'>+	0x81C, 0x44500403,</div><div class='add'>+	0x81C, 0x43520403,</div><div class='add'>+	0x81C, 0x42540403,</div><div class='add'>+	0x81C, 0x41560403,</div><div class='add'>+	0x81C, 0x40580403,</div><div class='add'>+	0x81C, 0x055A0403,</div><div class='add'>+	0x81C, 0x045C0403,</div><div class='add'>+	0x81C, 0x035E0403,</div><div class='add'>+	0x81C, 0x02600403,</div><div class='add'>+	0x81C, 0x01620403,</div><div class='add'>+	0x81C, 0x00640403,</div><div class='add'>+	0x81C, 0x00660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF5000403,</div><div class='add'>+	0x81C, 0xF4020403,</div><div class='add'>+	0x81C, 0xF3040403,</div><div class='add'>+	0x81C, 0xF2060403,</div><div class='add'>+	0x81C, 0xF1080403,</div><div class='add'>+	0x81C, 0xF00A0403,</div><div class='add'>+	0x81C, 0xEF0C0403,</div><div class='add'>+	0x81C, 0xEE0E0403,</div><div class='add'>+	0x81C, 0xED100403,</div><div class='add'>+	0x81C, 0xEC120403,</div><div class='add'>+	0x81C, 0xEB140403,</div><div class='add'>+	0x81C, 0xEA160403,</div><div class='add'>+	0x81C, 0xE9180403,</div><div class='add'>+	0x81C, 0xE81A0403,</div><div class='add'>+	0x81C, 0xE71C0403,</div><div class='add'>+	0x81C, 0xE61E0403,</div><div class='add'>+	0x81C, 0xE5200403,</div><div class='add'>+	0x81C, 0xE4220403,</div><div class='add'>+	0x81C, 0xE3240403,</div><div class='add'>+	0x81C, 0xE2260403,</div><div class='add'>+	0x81C, 0xE1280403,</div><div class='add'>+	0x81C, 0xE02A0403,</div><div class='add'>+	0x81C, 0xC32C0403,</div><div class='add'>+	0x81C, 0xC22E0403,</div><div class='add'>+	0x81C, 0xC1300403,</div><div class='add'>+	0x81C, 0xC0320403,</div><div class='add'>+	0x81C, 0xA4340403,</div><div class='add'>+	0x81C, 0xA3360403,</div><div class='add'>+	0x81C, 0xA2380403,</div><div class='add'>+	0x81C, 0xA13A0403,</div><div class='add'>+	0x81C, 0xA03C0403,</div><div class='add'>+	0x81C, 0x823E0403,</div><div class='add'>+	0x81C, 0x81400403,</div><div class='add'>+	0x81C, 0x80420403,</div><div class='add'>+	0x81C, 0x64440403,</div><div class='add'>+	0x81C, 0x63460403,</div><div class='add'>+	0x81C, 0x62480403,</div><div class='add'>+	0x81C, 0x614A0403,</div><div class='add'>+	0x81C, 0x604C0403,</div><div class='add'>+	0x81C, 0x454E0403,</div><div class='add'>+	0x81C, 0x44500403,</div><div class='add'>+	0x81C, 0x43520403,</div><div class='add'>+	0x81C, 0x42540403,</div><div class='add'>+	0x81C, 0x41560403,</div><div class='add'>+	0x81C, 0x40580403,</div><div class='add'>+	0x81C, 0x055A0403,</div><div class='add'>+	0x81C, 0x045C0403,</div><div class='add'>+	0x81C, 0x035E0403,</div><div class='add'>+	0x81C, 0x02600403,</div><div class='add'>+	0x81C, 0x01620403,</div><div class='add'>+	0x81C, 0x00640403,</div><div class='add'>+	0x81C, 0x00660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xF6000403,</div><div class='add'>+	0x81C, 0xF5020403,</div><div class='add'>+	0x81C, 0xF4040403,</div><div class='add'>+	0x81C, 0xF3060403,</div><div class='add'>+	0x81C, 0xF2080403,</div><div class='add'>+	0x81C, 0xF10A0403,</div><div class='add'>+	0x81C, 0xF00C0403,</div><div class='add'>+	0x81C, 0xEF0E0403,</div><div class='add'>+	0x81C, 0xD6100403,</div><div class='add'>+	0x81C, 0xD5120403,</div><div class='add'>+	0x81C, 0xD4140403,</div><div class='add'>+	0x81C, 0xD3160403,</div><div class='add'>+	0x81C, 0xD2180403,</div><div class='add'>+	0x81C, 0xD11A0403,</div><div class='add'>+	0x81C, 0xD01C0403,</div><div class='add'>+	0x81C, 0xCF1E0403,</div><div class='add'>+	0x81C, 0x95200403,</div><div class='add'>+	0x81C, 0x94220403,</div><div class='add'>+	0x81C, 0x93240403,</div><div class='add'>+	0x81C, 0x92260403,</div><div class='add'>+	0x81C, 0x91280403,</div><div class='add'>+	0x81C, 0x902A0403,</div><div class='add'>+	0x81C, 0x8F2C0403,</div><div class='add'>+	0x81C, 0x8E2E0403,</div><div class='add'>+	0x81C, 0x8D300403,</div><div class='add'>+	0x81C, 0x8C320403,</div><div class='add'>+	0x81C, 0x8B340403,</div><div class='add'>+	0x81C, 0x8A360403,</div><div class='add'>+	0x81C, 0x89380403,</div><div class='add'>+	0x81C, 0x883A0403,</div><div class='add'>+	0x81C, 0x873C0403,</div><div class='add'>+	0x81C, 0x863E0403,</div><div class='add'>+	0x81C, 0x68400403,</div><div class='add'>+	0x81C, 0x67420403,</div><div class='add'>+	0x81C, 0x66440403,</div><div class='add'>+	0x81C, 0x65460403,</div><div class='add'>+	0x81C, 0x64480403,</div><div class='add'>+	0x81C, 0x634A0403,</div><div class='add'>+	0x81C, 0x484C0403,</div><div class='add'>+	0x81C, 0x474E0403,</div><div class='add'>+	0x81C, 0x46500403,</div><div class='add'>+	0x81C, 0x45520403,</div><div class='add'>+	0x81C, 0x44540403,</div><div class='add'>+	0x81C, 0x27560403,</div><div class='add'>+	0x81C, 0x26580403,</div><div class='add'>+	0x81C, 0x255A0403,</div><div class='add'>+	0x81C, 0x245C0403,</div><div class='add'>+	0x81C, 0x235E0403,</div><div class='add'>+	0x81C, 0x04600403,</div><div class='add'>+	0x81C, 0x03620403,</div><div class='add'>+	0x81C, 0x02640403,</div><div class='add'>+	0x81C, 0x01660403,</div><div class='add'>+	0x81C, 0x00680403,</div><div class='add'>+	0x81C, 0x006A0403,</div><div class='add'>+	0x81C, 0x006C0403,</div><div class='add'>+	0x81C, 0x006E0403,</div><div class='add'>+	0x81C, 0x00700403,</div><div class='add'>+	0x81C, 0x00720403,</div><div class='add'>+	0x81C, 0x00740403,</div><div class='add'>+	0x81C, 0x00760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF000403,</div><div class='add'>+	0x81C, 0xFF020403,</div><div class='add'>+	0x81C, 0xFE040403,</div><div class='add'>+	0x81C, 0xFD060403,</div><div class='add'>+	0x81C, 0xFC080403,</div><div class='add'>+	0x81C, 0xFB0A0403,</div><div class='add'>+	0x81C, 0xFA0C0403,</div><div class='add'>+	0x81C, 0xF90E0403,</div><div class='add'>+	0x81C, 0xF8100403,</div><div class='add'>+	0x81C, 0xF7120403,</div><div class='add'>+	0x81C, 0xF6140403,</div><div class='add'>+	0x81C, 0xF5160403,</div><div class='add'>+	0x81C, 0xF4180403,</div><div class='add'>+	0x81C, 0xF31A0403,</div><div class='add'>+	0x81C, 0xF21C0403,</div><div class='add'>+	0x81C, 0xD51E0403,</div><div class='add'>+	0x81C, 0xD4200403,</div><div class='add'>+	0x81C, 0xD3220403,</div><div class='add'>+	0x81C, 0xD2240403,</div><div class='add'>+	0x81C, 0xB6260403,</div><div class='add'>+	0x81C, 0xB5280403,</div><div class='add'>+	0x81C, 0xB42A0403,</div><div class='add'>+	0x81C, 0xB32C0403,</div><div class='add'>+	0x81C, 0xB22E0403,</div><div class='add'>+	0x81C, 0xB1300403,</div><div class='add'>+	0x81C, 0xB0320403,</div><div class='add'>+	0x81C, 0xAF340403,</div><div class='add'>+	0x81C, 0xAE360403,</div><div class='add'>+	0x81C, 0xAD380403,</div><div class='add'>+	0x81C, 0xAC3A0403,</div><div class='add'>+	0x81C, 0xAB3C0403,</div><div class='add'>+	0x81C, 0xAA3E0403,</div><div class='add'>+	0x81C, 0xA9400403,</div><div class='add'>+	0x81C, 0xA8420403,</div><div class='add'>+	0x81C, 0xA7440403,</div><div class='add'>+	0x81C, 0xA6460403,</div><div class='add'>+	0x81C, 0xA5480403,</div><div class='add'>+	0x81C, 0xA44A0403,</div><div class='add'>+	0x81C, 0xA34C0403,</div><div class='add'>+	0x81C, 0x854E0403,</div><div class='add'>+	0x81C, 0x84500403,</div><div class='add'>+	0x81C, 0x83520403,</div><div class='add'>+	0x81C, 0x82540403,</div><div class='add'>+	0x81C, 0x81560403,</div><div class='add'>+	0x81C, 0x80580403,</div><div class='add'>+	0x81C, 0x485A0403,</div><div class='add'>+	0x81C, 0x475C0403,</div><div class='add'>+	0x81C, 0x465E0403,</div><div class='add'>+	0x81C, 0x45600403,</div><div class='add'>+	0x81C, 0x44620403,</div><div class='add'>+	0x81C, 0x0A640403,</div><div class='add'>+	0x81C, 0x09660403,</div><div class='add'>+	0x81C, 0x08680403,</div><div class='add'>+	0x81C, 0x076A0403,</div><div class='add'>+	0x81C, 0x066C0403,</div><div class='add'>+	0x81C, 0x056E0403,</div><div class='add'>+	0x81C, 0x04700403,</div><div class='add'>+	0x81C, 0x03720403,</div><div class='add'>+	0x81C, 0x02740403,</div><div class='add'>+	0x81C, 0x01760403,</div><div class='add'>+	0x81C, 0x00780403,</div><div class='add'>+	0x81C, 0x007A0403,</div><div class='add'>+	0x81C, 0x007C0403,</div><div class='add'>+	0x81C, 0x007E0403,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEE1C0503,</div><div class='add'>+	0x81C, 0xED1E0503,</div><div class='add'>+	0x81C, 0xEC200503,</div><div class='add'>+	0x81C, 0xEB220503,</div><div class='add'>+	0x81C, 0xEA240503,</div><div class='add'>+	0x81C, 0xE9260503,</div><div class='add'>+	0x81C, 0xE8280503,</div><div class='add'>+	0x81C, 0xE72A0503,</div><div class='add'>+	0x81C, 0xE62C0503,</div><div class='add'>+	0x81C, 0xE52E0503,</div><div class='add'>+	0x81C, 0xE4300503,</div><div class='add'>+	0x81C, 0xE3320503,</div><div class='add'>+	0x81C, 0xE2340503,</div><div class='add'>+	0x81C, 0xC5360503,</div><div class='add'>+	0x81C, 0xC4380503,</div><div class='add'>+	0x81C, 0xC33A0503,</div><div class='add'>+	0x81C, 0xC23C0503,</div><div class='add'>+	0x81C, 0xA53E0503,</div><div class='add'>+	0x81C, 0xA4400503,</div><div class='add'>+	0x81C, 0xA3420503,</div><div class='add'>+	0x81C, 0xA2440503,</div><div class='add'>+	0x81C, 0xA1460503,</div><div class='add'>+	0x81C, 0x83480503,</div><div class='add'>+	0x81C, 0x824A0503,</div><div class='add'>+	0x81C, 0x814C0503,</div><div class='add'>+	0x81C, 0x804E0503,</div><div class='add'>+	0x81C, 0x63500503,</div><div class='add'>+	0x81C, 0x62520503,</div><div class='add'>+	0x81C, 0x61540503,</div><div class='add'>+	0x81C, 0x43560503,</div><div class='add'>+	0x81C, 0x42580503,</div><div class='add'>+	0x81C, 0x415A0503,</div><div class='add'>+	0x81C, 0x405C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBE000503,</div><div class='add'>+	0x81C, 0xBD020503,</div><div class='add'>+	0x81C, 0xBC040503,</div><div class='add'>+	0x81C, 0xBB060503,</div><div class='add'>+	0x81C, 0xBA080503,</div><div class='add'>+	0x81C, 0xB90A0503,</div><div class='add'>+	0x81C, 0xB80C0503,</div><div class='add'>+	0x81C, 0xB70E0503,</div><div class='add'>+	0x81C, 0xB6100503,</div><div class='add'>+	0x81C, 0xB5120503,</div><div class='add'>+	0x81C, 0xB4140503,</div><div class='add'>+	0x81C, 0xB3160503,</div><div class='add'>+	0x81C, 0xB2180503,</div><div class='add'>+	0x81C, 0xB11A0503,</div><div class='add'>+	0x81C, 0xB01C0503,</div><div class='add'>+	0x81C, 0xAF1E0503,</div><div class='add'>+	0x81C, 0xAE200503,</div><div class='add'>+	0x81C, 0xAD220503,</div><div class='add'>+	0x81C, 0xAC240503,</div><div class='add'>+	0x81C, 0xAB260503,</div><div class='add'>+	0x81C, 0x8D280503,</div><div class='add'>+	0x81C, 0x8C2A0503,</div><div class='add'>+	0x81C, 0x8B2C0503,</div><div class='add'>+	0x81C, 0x8A2E0503,</div><div class='add'>+	0x81C, 0x89300503,</div><div class='add'>+	0x81C, 0x88320503,</div><div class='add'>+	0x81C, 0x6A340503,</div><div class='add'>+	0x81C, 0x69360503,</div><div class='add'>+	0x81C, 0x68380503,</div><div class='add'>+	0x81C, 0x673A0503,</div><div class='add'>+	0x81C, 0x663C0503,</div><div class='add'>+	0x81C, 0x653E0503,</div><div class='add'>+	0x81C, 0x64400503,</div><div class='add'>+	0x81C, 0x63420503,</div><div class='add'>+	0x81C, 0x62440503,</div><div class='add'>+	0x81C, 0x61460503,</div><div class='add'>+	0x81C, 0x60480503,</div><div class='add'>+	0x81C, 0x424A0503,</div><div class='add'>+	0x81C, 0x414C0503,</div><div class='add'>+	0x81C, 0x404E0503,</div><div class='add'>+	0x81C, 0x06500503,</div><div class='add'>+	0x81C, 0x05520503,</div><div class='add'>+	0x81C, 0x04540503,</div><div class='add'>+	0x81C, 0x03560503,</div><div class='add'>+	0x81C, 0x02580503,</div><div class='add'>+	0x81C, 0x015A0503,</div><div class='add'>+	0x81C, 0x005C0503,</div><div class='add'>+	0x81C, 0x005E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000503,</div><div class='add'>+	0x81C, 0xF7020503,</div><div class='add'>+	0x81C, 0xF6040503,</div><div class='add'>+	0x81C, 0xF5060503,</div><div class='add'>+	0x81C, 0xF4080503,</div><div class='add'>+	0x81C, 0xF30A0503,</div><div class='add'>+	0x81C, 0xF20C0503,</div><div class='add'>+	0x81C, 0xF10E0503,</div><div class='add'>+	0x81C, 0xF0100503,</div><div class='add'>+	0x81C, 0xEF120503,</div><div class='add'>+	0x81C, 0xEE140503,</div><div class='add'>+	0x81C, 0xED160503,</div><div class='add'>+	0x81C, 0xEC180503,</div><div class='add'>+	0x81C, 0xEB1A0503,</div><div class='add'>+	0x81C, 0xEA1C0503,</div><div class='add'>+	0x81C, 0xE91E0503,</div><div class='add'>+	0x81C, 0xE8200503,</div><div class='add'>+	0x81C, 0xE7220503,</div><div class='add'>+	0x81C, 0xE6240503,</div><div class='add'>+	0x81C, 0xE5260503,</div><div class='add'>+	0x81C, 0xE4280503,</div><div class='add'>+	0x81C, 0xE32A0503,</div><div class='add'>+	0x81C, 0xC32C0503,</div><div class='add'>+	0x81C, 0xC22E0503,</div><div class='add'>+	0x81C, 0xC1300503,</div><div class='add'>+	0x81C, 0xC0320503,</div><div class='add'>+	0x81C, 0xA3340503,</div><div class='add'>+	0x81C, 0xA2360503,</div><div class='add'>+	0x81C, 0xA1380503,</div><div class='add'>+	0x81C, 0xA03A0503,</div><div class='add'>+	0x81C, 0x823C0503,</div><div class='add'>+	0x81C, 0x813E0503,</div><div class='add'>+	0x81C, 0x80400503,</div><div class='add'>+	0x81C, 0x63420503,</div><div class='add'>+	0x81C, 0x62440503,</div><div class='add'>+	0x81C, 0x61460503,</div><div class='add'>+	0x81C, 0x60480503,</div><div class='add'>+	0x81C, 0x424A0503,</div><div class='add'>+	0x81C, 0x414C0503,</div><div class='add'>+	0x81C, 0x404E0503,</div><div class='add'>+	0x81C, 0x22500503,</div><div class='add'>+	0x81C, 0x21520503,</div><div class='add'>+	0x81C, 0x20540503,</div><div class='add'>+	0x81C, 0x03560503,</div><div class='add'>+	0x81C, 0x02580503,</div><div class='add'>+	0x81C, 0x015A0503,</div><div class='add'>+	0x81C, 0x005C0503,</div><div class='add'>+	0x81C, 0x005E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000503,</div><div class='add'>+	0x81C, 0xFD020503,</div><div class='add'>+	0x81C, 0xFC040503,</div><div class='add'>+	0x81C, 0xFB060503,</div><div class='add'>+	0x81C, 0xFA080503,</div><div class='add'>+	0x81C, 0xF90A0503,</div><div class='add'>+	0x81C, 0xF80C0503,</div><div class='add'>+	0x81C, 0xF70E0503,</div><div class='add'>+	0x81C, 0xF6100503,</div><div class='add'>+	0x81C, 0xF5120503,</div><div class='add'>+	0x81C, 0xF4140503,</div><div class='add'>+	0x81C, 0xF3160503,</div><div class='add'>+	0x81C, 0xF2180503,</div><div class='add'>+	0x81C, 0xF11A0503,</div><div class='add'>+	0x81C, 0xF01C0503,</div><div class='add'>+	0x81C, 0xEF1E0503,</div><div class='add'>+	0x81C, 0xEE200503,</div><div class='add'>+	0x81C, 0xED220503,</div><div class='add'>+	0x81C, 0xEC240503,</div><div class='add'>+	0x81C, 0xEB260503,</div><div class='add'>+	0x81C, 0xEA280503,</div><div class='add'>+	0x81C, 0xE92A0503,</div><div class='add'>+	0x81C, 0xE82C0503,</div><div class='add'>+	0x81C, 0xE72E0503,</div><div class='add'>+	0x81C, 0xE6300503,</div><div class='add'>+	0x81C, 0xE5320503,</div><div class='add'>+	0x81C, 0xE4340503,</div><div class='add'>+	0x81C, 0xE3360503,</div><div class='add'>+	0x81C, 0xC6380503,</div><div class='add'>+	0x81C, 0xC53A0503,</div><div class='add'>+	0x81C, 0xC43C0503,</div><div class='add'>+	0x81C, 0xC33E0503,</div><div class='add'>+	0x81C, 0xA5400503,</div><div class='add'>+	0x81C, 0xA4420503,</div><div class='add'>+	0x81C, 0xA3440503,</div><div class='add'>+	0x81C, 0xA2460503,</div><div class='add'>+	0x81C, 0xA1480503,</div><div class='add'>+	0x81C, 0xA04A0503,</div><div class='add'>+	0x81C, 0x824C0503,</div><div class='add'>+	0x81C, 0x814E0503,</div><div class='add'>+	0x81C, 0x80500503,</div><div class='add'>+	0x81C, 0x64520503,</div><div class='add'>+	0x81C, 0x63540503,</div><div class='add'>+	0x81C, 0x62560503,</div><div class='add'>+	0x81C, 0x61580503,</div><div class='add'>+	0x81C, 0x605A0503,</div><div class='add'>+	0x81C, 0x235C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000503,</div><div class='add'>+	0x81C, 0xF7020503,</div><div class='add'>+	0x81C, 0xF6040503,</div><div class='add'>+	0x81C, 0xF5060503,</div><div class='add'>+	0x81C, 0xF4080503,</div><div class='add'>+	0x81C, 0xF30A0503,</div><div class='add'>+	0x81C, 0xF20C0503,</div><div class='add'>+	0x81C, 0xF10E0503,</div><div class='add'>+	0x81C, 0xF0100503,</div><div class='add'>+	0x81C, 0xEF120503,</div><div class='add'>+	0x81C, 0xEE140503,</div><div class='add'>+	0x81C, 0xED160503,</div><div class='add'>+	0x81C, 0xEC180503,</div><div class='add'>+	0x81C, 0xEB1A0503,</div><div class='add'>+	0x81C, 0xEA1C0503,</div><div class='add'>+	0x81C, 0xE91E0503,</div><div class='add'>+	0x81C, 0xE8200503,</div><div class='add'>+	0x81C, 0xE7220503,</div><div class='add'>+	0x81C, 0xE6240503,</div><div class='add'>+	0x81C, 0xE5260503,</div><div class='add'>+	0x81C, 0xE4280503,</div><div class='add'>+	0x81C, 0xE32A0503,</div><div class='add'>+	0x81C, 0xC32C0503,</div><div class='add'>+	0x81C, 0xC22E0503,</div><div class='add'>+	0x81C, 0xC1300503,</div><div class='add'>+	0x81C, 0xC0320503,</div><div class='add'>+	0x81C, 0xA3340503,</div><div class='add'>+	0x81C, 0xA2360503,</div><div class='add'>+	0x81C, 0xA1380503,</div><div class='add'>+	0x81C, 0xA03A0503,</div><div class='add'>+	0x81C, 0x823C0503,</div><div class='add'>+	0x81C, 0x813E0503,</div><div class='add'>+	0x81C, 0x80400503,</div><div class='add'>+	0x81C, 0x63420503,</div><div class='add'>+	0x81C, 0x62440503,</div><div class='add'>+	0x81C, 0x61460503,</div><div class='add'>+	0x81C, 0x60480503,</div><div class='add'>+	0x81C, 0x424A0503,</div><div class='add'>+	0x81C, 0x414C0503,</div><div class='add'>+	0x81C, 0x404E0503,</div><div class='add'>+	0x81C, 0x22500503,</div><div class='add'>+	0x81C, 0x21520503,</div><div class='add'>+	0x81C, 0x20540503,</div><div class='add'>+	0x81C, 0x03560503,</div><div class='add'>+	0x81C, 0x02580503,</div><div class='add'>+	0x81C, 0x015A0503,</div><div class='add'>+	0x81C, 0x005C0503,</div><div class='add'>+	0x81C, 0x005E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEF1C0503,</div><div class='add'>+	0x81C, 0xEE1E0503,</div><div class='add'>+	0x81C, 0xED200503,</div><div class='add'>+	0x81C, 0xEC220503,</div><div class='add'>+	0x81C, 0xEB240503,</div><div class='add'>+	0x81C, 0xEA260503,</div><div class='add'>+	0x81C, 0xE9280503,</div><div class='add'>+	0x81C, 0xE82A0503,</div><div class='add'>+	0x81C, 0xE72C0503,</div><div class='add'>+	0x81C, 0xE62E0503,</div><div class='add'>+	0x81C, 0xE5300503,</div><div class='add'>+	0x81C, 0xE4320503,</div><div class='add'>+	0x81C, 0xE3340503,</div><div class='add'>+	0x81C, 0xE2360503,</div><div class='add'>+	0x81C, 0xC5380503,</div><div class='add'>+	0x81C, 0xC43A0503,</div><div class='add'>+	0x81C, 0xC33C0503,</div><div class='add'>+	0x81C, 0xC23E0503,</div><div class='add'>+	0x81C, 0xA5400503,</div><div class='add'>+	0x81C, 0xA4420503,</div><div class='add'>+	0x81C, 0xA3440503,</div><div class='add'>+	0x81C, 0xA2460503,</div><div class='add'>+	0x81C, 0xA1480503,</div><div class='add'>+	0x81C, 0x834A0503,</div><div class='add'>+	0x81C, 0x824C0503,</div><div class='add'>+	0x81C, 0x814E0503,</div><div class='add'>+	0x81C, 0x64500503,</div><div class='add'>+	0x81C, 0x63520503,</div><div class='add'>+	0x81C, 0x62540503,</div><div class='add'>+	0x81C, 0x61560503,</div><div class='add'>+	0x81C, 0x42580503,</div><div class='add'>+	0x81C, 0x415A0503,</div><div class='add'>+	0x81C, 0x405C0503,</div><div class='add'>+	0x81C, 0x065E0503,</div><div class='add'>+	0x81C, 0x05600503,</div><div class='add'>+	0x81C, 0x04620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFA000503,</div><div class='add'>+	0x81C, 0xF9020503,</div><div class='add'>+	0x81C, 0xF8040503,</div><div class='add'>+	0x81C, 0xF7060503,</div><div class='add'>+	0x81C, 0xF6080503,</div><div class='add'>+	0x81C, 0xF50A0503,</div><div class='add'>+	0x81C, 0xF40C0503,</div><div class='add'>+	0x81C, 0xF30E0503,</div><div class='add'>+	0x81C, 0xF2100503,</div><div class='add'>+	0x81C, 0xF1120503,</div><div class='add'>+	0x81C, 0xF0140503,</div><div class='add'>+	0x81C, 0xEF160503,</div><div class='add'>+	0x81C, 0xEE180503,</div><div class='add'>+	0x81C, 0xED1A0503,</div><div class='add'>+	0x81C, 0xEC1C0503,</div><div class='add'>+	0x81C, 0xEB1E0503,</div><div class='add'>+	0x81C, 0xEA200503,</div><div class='add'>+	0x81C, 0xE9220503,</div><div class='add'>+	0x81C, 0xE8240503,</div><div class='add'>+	0x81C, 0xE7260503,</div><div class='add'>+	0x81C, 0xE6280503,</div><div class='add'>+	0x81C, 0xE52A0503,</div><div class='add'>+	0x81C, 0xC42C0503,</div><div class='add'>+	0x81C, 0xC32E0503,</div><div class='add'>+	0x81C, 0xC2300503,</div><div class='add'>+	0x81C, 0xC1320503,</div><div class='add'>+	0x81C, 0xA4340503,</div><div class='add'>+	0x81C, 0xA3360503,</div><div class='add'>+	0x81C, 0xA2380503,</div><div class='add'>+	0x81C, 0xA13A0503,</div><div class='add'>+	0x81C, 0x833C0503,</div><div class='add'>+	0x81C, 0x823E0503,</div><div class='add'>+	0x81C, 0x81400503,</div><div class='add'>+	0x81C, 0x63420503,</div><div class='add'>+	0x81C, 0x62440503,</div><div class='add'>+	0x81C, 0x61460503,</div><div class='add'>+	0x81C, 0x60480503,</div><div class='add'>+	0x81C, 0x424A0503,</div><div class='add'>+	0x81C, 0x414C0503,</div><div class='add'>+	0x81C, 0x404E0503,</div><div class='add'>+	0x81C, 0x22500503,</div><div class='add'>+	0x81C, 0x21520503,</div><div class='add'>+	0x81C, 0x20540503,</div><div class='add'>+	0x81C, 0x03560503,</div><div class='add'>+	0x81C, 0x02580503,</div><div class='add'>+	0x81C, 0x015A0503,</div><div class='add'>+	0x81C, 0x005C0503,</div><div class='add'>+	0x81C, 0x005E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBF000503,</div><div class='add'>+	0x81C, 0xBE020503,</div><div class='add'>+	0x81C, 0xBD040503,</div><div class='add'>+	0x81C, 0xBC060503,</div><div class='add'>+	0x81C, 0xBB080503,</div><div class='add'>+	0x81C, 0xBA0A0503,</div><div class='add'>+	0x81C, 0xB90C0503,</div><div class='add'>+	0x81C, 0xB80E0503,</div><div class='add'>+	0x81C, 0xB7100503,</div><div class='add'>+	0x81C, 0xB6120503,</div><div class='add'>+	0x81C, 0xB5140503,</div><div class='add'>+	0x81C, 0xB4160503,</div><div class='add'>+	0x81C, 0xB3180503,</div><div class='add'>+	0x81C, 0xB21A0503,</div><div class='add'>+	0x81C, 0xB11C0503,</div><div class='add'>+	0x81C, 0x931E0503,</div><div class='add'>+	0x81C, 0x92200503,</div><div class='add'>+	0x81C, 0x91220503,</div><div class='add'>+	0x81C, 0x90240503,</div><div class='add'>+	0x81C, 0x8F260503,</div><div class='add'>+	0x81C, 0x8E280503,</div><div class='add'>+	0x81C, 0x8D2A0503,</div><div class='add'>+	0x81C, 0x8C2C0503,</div><div class='add'>+	0x81C, 0x8B2E0503,</div><div class='add'>+	0x81C, 0x8A300503,</div><div class='add'>+	0x81C, 0x89320503,</div><div class='add'>+	0x81C, 0x88340503,</div><div class='add'>+	0x81C, 0x6A360503,</div><div class='add'>+	0x81C, 0x69380503,</div><div class='add'>+	0x81C, 0x683A0503,</div><div class='add'>+	0x81C, 0x673C0503,</div><div class='add'>+	0x81C, 0x663E0503,</div><div class='add'>+	0x81C, 0x65400503,</div><div class='add'>+	0x81C, 0x64420503,</div><div class='add'>+	0x81C, 0x63440503,</div><div class='add'>+	0x81C, 0x62460503,</div><div class='add'>+	0x81C, 0x61480503,</div><div class='add'>+	0x81C, 0x604A0503,</div><div class='add'>+	0x81C, 0x424C0503,</div><div class='add'>+	0x81C, 0x414E0503,</div><div class='add'>+	0x81C, 0x40500503,</div><div class='add'>+	0x81C, 0x06520503,</div><div class='add'>+	0x81C, 0x05540503,</div><div class='add'>+	0x81C, 0x04560503,</div><div class='add'>+	0x81C, 0x03580503,</div><div class='add'>+	0x81C, 0x025A0503,</div><div class='add'>+	0x81C, 0x015C0503,</div><div class='add'>+	0x81C, 0x005E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEF1C0503,</div><div class='add'>+	0x81C, 0xEE1E0503,</div><div class='add'>+	0x81C, 0xED200503,</div><div class='add'>+	0x81C, 0xEC220503,</div><div class='add'>+	0x81C, 0xEB240503,</div><div class='add'>+	0x81C, 0xEA260503,</div><div class='add'>+	0x81C, 0xE9280503,</div><div class='add'>+	0x81C, 0xE82A0503,</div><div class='add'>+	0x81C, 0xE72C0503,</div><div class='add'>+	0x81C, 0xE62E0503,</div><div class='add'>+	0x81C, 0xE5300503,</div><div class='add'>+	0x81C, 0xE4320503,</div><div class='add'>+	0x81C, 0xE3340503,</div><div class='add'>+	0x81C, 0xC6360503,</div><div class='add'>+	0x81C, 0xC5380503,</div><div class='add'>+	0x81C, 0xC43A0503,</div><div class='add'>+	0x81C, 0xC33C0503,</div><div class='add'>+	0x81C, 0xC23E0503,</div><div class='add'>+	0x81C, 0xA5400503,</div><div class='add'>+	0x81C, 0xA4420503,</div><div class='add'>+	0x81C, 0xA3440503,</div><div class='add'>+	0x81C, 0xA2460503,</div><div class='add'>+	0x81C, 0xA1480503,</div><div class='add'>+	0x81C, 0x834A0503,</div><div class='add'>+	0x81C, 0x824C0503,</div><div class='add'>+	0x81C, 0x814E0503,</div><div class='add'>+	0x81C, 0x63500503,</div><div class='add'>+	0x81C, 0x62520503,</div><div class='add'>+	0x81C, 0x61540503,</div><div class='add'>+	0x81C, 0x43560503,</div><div class='add'>+	0x81C, 0x42580503,</div><div class='add'>+	0x81C, 0x245A0503,</div><div class='add'>+	0x81C, 0x235C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x04620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000503,</div><div class='add'>+	0x81C, 0xF7020503,</div><div class='add'>+	0x81C, 0xF6040503,</div><div class='add'>+	0x81C, 0xF5060503,</div><div class='add'>+	0x81C, 0xF4080503,</div><div class='add'>+	0x81C, 0xF30A0503,</div><div class='add'>+	0x81C, 0xF20C0503,</div><div class='add'>+	0x81C, 0xF10E0503,</div><div class='add'>+	0x81C, 0xF0100503,</div><div class='add'>+	0x81C, 0xEF120503,</div><div class='add'>+	0x81C, 0xEE140503,</div><div class='add'>+	0x81C, 0xED160503,</div><div class='add'>+	0x81C, 0xEC180503,</div><div class='add'>+	0x81C, 0xEB1A0503,</div><div class='add'>+	0x81C, 0xEA1C0503,</div><div class='add'>+	0x81C, 0xE91E0503,</div><div class='add'>+	0x81C, 0xE8200503,</div><div class='add'>+	0x81C, 0xE7220503,</div><div class='add'>+	0x81C, 0xE6240503,</div><div class='add'>+	0x81C, 0xE5260503,</div><div class='add'>+	0x81C, 0xE4280503,</div><div class='add'>+	0x81C, 0xE32A0503,</div><div class='add'>+	0x81C, 0xE22C0503,</div><div class='add'>+	0x81C, 0xC32E0503,</div><div class='add'>+	0x81C, 0xC2300503,</div><div class='add'>+	0x81C, 0xC1320503,</div><div class='add'>+	0x81C, 0xA3340503,</div><div class='add'>+	0x81C, 0xA2360503,</div><div class='add'>+	0x81C, 0xA1380503,</div><div class='add'>+	0x81C, 0xA03A0503,</div><div class='add'>+	0x81C, 0x823C0503,</div><div class='add'>+	0x81C, 0x813E0503,</div><div class='add'>+	0x81C, 0x80400503,</div><div class='add'>+	0x81C, 0x64420503,</div><div class='add'>+	0x81C, 0x63440503,</div><div class='add'>+	0x81C, 0x62460503,</div><div class='add'>+	0x81C, 0x61480503,</div><div class='add'>+	0x81C, 0x434A0503,</div><div class='add'>+	0x81C, 0x424C0503,</div><div class='add'>+	0x81C, 0x414E0503,</div><div class='add'>+	0x81C, 0x40500503,</div><div class='add'>+	0x81C, 0x22520503,</div><div class='add'>+	0x81C, 0x21540503,</div><div class='add'>+	0x81C, 0x20560503,</div><div class='add'>+	0x81C, 0x04580503,</div><div class='add'>+	0x81C, 0x035A0503,</div><div class='add'>+	0x81C, 0x025C0503,</div><div class='add'>+	0x81C, 0x015E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEE1C0503,</div><div class='add'>+	0x81C, 0xED1E0503,</div><div class='add'>+	0x81C, 0xEC200503,</div><div class='add'>+	0x81C, 0xEB220503,</div><div class='add'>+	0x81C, 0xEA240503,</div><div class='add'>+	0x81C, 0xE9260503,</div><div class='add'>+	0x81C, 0xE8280503,</div><div class='add'>+	0x81C, 0xE72A0503,</div><div class='add'>+	0x81C, 0xE62C0503,</div><div class='add'>+	0x81C, 0xE52E0503,</div><div class='add'>+	0x81C, 0xE4300503,</div><div class='add'>+	0x81C, 0xE3320503,</div><div class='add'>+	0x81C, 0xE2340503,</div><div class='add'>+	0x81C, 0xC5360503,</div><div class='add'>+	0x81C, 0xC4380503,</div><div class='add'>+	0x81C, 0xC33A0503,</div><div class='add'>+	0x81C, 0xC23C0503,</div><div class='add'>+	0x81C, 0xA53E0503,</div><div class='add'>+	0x81C, 0xA4400503,</div><div class='add'>+	0x81C, 0xA3420503,</div><div class='add'>+	0x81C, 0xA2440503,</div><div class='add'>+	0x81C, 0xA1460503,</div><div class='add'>+	0x81C, 0x83480503,</div><div class='add'>+	0x81C, 0x824A0503,</div><div class='add'>+	0x81C, 0x814C0503,</div><div class='add'>+	0x81C, 0x804E0503,</div><div class='add'>+	0x81C, 0x63500503,</div><div class='add'>+	0x81C, 0x62520503,</div><div class='add'>+	0x81C, 0x61540503,</div><div class='add'>+	0x81C, 0x43560503,</div><div class='add'>+	0x81C, 0x42580503,</div><div class='add'>+	0x81C, 0x415A0503,</div><div class='add'>+	0x81C, 0x405C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000503,</div><div class='add'>+	0x81C, 0xF8020503,</div><div class='add'>+	0x81C, 0xF7040503,</div><div class='add'>+	0x81C, 0xF6060503,</div><div class='add'>+	0x81C, 0xF5080503,</div><div class='add'>+	0x81C, 0xF40A0503,</div><div class='add'>+	0x81C, 0xF30C0503,</div><div class='add'>+	0x81C, 0xF20E0503,</div><div class='add'>+	0x81C, 0xF1100503,</div><div class='add'>+	0x81C, 0xF0120503,</div><div class='add'>+	0x81C, 0xEF140503,</div><div class='add'>+	0x81C, 0xEE160503,</div><div class='add'>+	0x81C, 0xED180503,</div><div class='add'>+	0x81C, 0xEC1A0503,</div><div class='add'>+	0x81C, 0xEB1C0503,</div><div class='add'>+	0x81C, 0xEA1E0503,</div><div class='add'>+	0x81C, 0xE9200503,</div><div class='add'>+	0x81C, 0xE8220503,</div><div class='add'>+	0x81C, 0xE7240503,</div><div class='add'>+	0x81C, 0xE6260503,</div><div class='add'>+	0x81C, 0xE5280503,</div><div class='add'>+	0x81C, 0xE42A0503,</div><div class='add'>+	0x81C, 0xE32C0503,</div><div class='add'>+	0x81C, 0xC32E0503,</div><div class='add'>+	0x81C, 0xC2300503,</div><div class='add'>+	0x81C, 0xC1320503,</div><div class='add'>+	0x81C, 0xA4340503,</div><div class='add'>+	0x81C, 0xA3360503,</div><div class='add'>+	0x81C, 0xA2380503,</div><div class='add'>+	0x81C, 0xA13A0503,</div><div class='add'>+	0x81C, 0xA03C0503,</div><div class='add'>+	0x81C, 0x823E0503,</div><div class='add'>+	0x81C, 0x81400503,</div><div class='add'>+	0x81C, 0x80420503,</div><div class='add'>+	0x81C, 0x63440503,</div><div class='add'>+	0x81C, 0x62460503,</div><div class='add'>+	0x81C, 0x61480503,</div><div class='add'>+	0x81C, 0x604A0503,</div><div class='add'>+	0x81C, 0x244C0503,</div><div class='add'>+	0x81C, 0x234E0503,</div><div class='add'>+	0x81C, 0x22500503,</div><div class='add'>+	0x81C, 0x21520503,</div><div class='add'>+	0x81C, 0x20540503,</div><div class='add'>+	0x81C, 0x05560503,</div><div class='add'>+	0x81C, 0x04580503,</div><div class='add'>+	0x81C, 0x035A0503,</div><div class='add'>+	0x81C, 0x025C0503,</div><div class='add'>+	0x81C, 0x015E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000503,</div><div class='add'>+	0x81C, 0xFD020503,</div><div class='add'>+	0x81C, 0xFC040503,</div><div class='add'>+	0x81C, 0xFB060503,</div><div class='add'>+	0x81C, 0xFA080503,</div><div class='add'>+	0x81C, 0xF90A0503,</div><div class='add'>+	0x81C, 0xF80C0503,</div><div class='add'>+	0x81C, 0xF70E0503,</div><div class='add'>+	0x81C, 0xF6100503,</div><div class='add'>+	0x81C, 0xF5120503,</div><div class='add'>+	0x81C, 0xF4140503,</div><div class='add'>+	0x81C, 0xF3160503,</div><div class='add'>+	0x81C, 0xF2180503,</div><div class='add'>+	0x81C, 0xF11A0503,</div><div class='add'>+	0x81C, 0xF01C0503,</div><div class='add'>+	0x81C, 0xEF1E0503,</div><div class='add'>+	0x81C, 0xEE200503,</div><div class='add'>+	0x81C, 0xED220503,</div><div class='add'>+	0x81C, 0xEC240503,</div><div class='add'>+	0x81C, 0xEB260503,</div><div class='add'>+	0x81C, 0xEA280503,</div><div class='add'>+	0x81C, 0xE92A0503,</div><div class='add'>+	0x81C, 0xE82C0503,</div><div class='add'>+	0x81C, 0xE72E0503,</div><div class='add'>+	0x81C, 0xE6300503,</div><div class='add'>+	0x81C, 0xE5320503,</div><div class='add'>+	0x81C, 0xE4340503,</div><div class='add'>+	0x81C, 0xE3360503,</div><div class='add'>+	0x81C, 0xC6380503,</div><div class='add'>+	0x81C, 0xC53A0503,</div><div class='add'>+	0x81C, 0xC43C0503,</div><div class='add'>+	0x81C, 0xC33E0503,</div><div class='add'>+	0x81C, 0xA5400503,</div><div class='add'>+	0x81C, 0xA4420503,</div><div class='add'>+	0x81C, 0xA3440503,</div><div class='add'>+	0x81C, 0xA2460503,</div><div class='add'>+	0x81C, 0xA1480503,</div><div class='add'>+	0x81C, 0xA04A0503,</div><div class='add'>+	0x81C, 0x824C0503,</div><div class='add'>+	0x81C, 0x814E0503,</div><div class='add'>+	0x81C, 0x80500503,</div><div class='add'>+	0x81C, 0x64520503,</div><div class='add'>+	0x81C, 0x63540503,</div><div class='add'>+	0x81C, 0x62560503,</div><div class='add'>+	0x81C, 0x61580503,</div><div class='add'>+	0x81C, 0x605A0503,</div><div class='add'>+	0x81C, 0x235C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEE1C0503,</div><div class='add'>+	0x81C, 0xED1E0503,</div><div class='add'>+	0x81C, 0xEC200503,</div><div class='add'>+	0x81C, 0xEB220503,</div><div class='add'>+	0x81C, 0xEA240503,</div><div class='add'>+	0x81C, 0xE9260503,</div><div class='add'>+	0x81C, 0xE8280503,</div><div class='add'>+	0x81C, 0xE72A0503,</div><div class='add'>+	0x81C, 0xE62C0503,</div><div class='add'>+	0x81C, 0xE52E0503,</div><div class='add'>+	0x81C, 0xE4300503,</div><div class='add'>+	0x81C, 0xE3320503,</div><div class='add'>+	0x81C, 0xE2340503,</div><div class='add'>+	0x81C, 0xC5360503,</div><div class='add'>+	0x81C, 0xC4380503,</div><div class='add'>+	0x81C, 0xC33A0503,</div><div class='add'>+	0x81C, 0xC23C0503,</div><div class='add'>+	0x81C, 0xA53E0503,</div><div class='add'>+	0x81C, 0xA4400503,</div><div class='add'>+	0x81C, 0xA3420503,</div><div class='add'>+	0x81C, 0xA2440503,</div><div class='add'>+	0x81C, 0xA1460503,</div><div class='add'>+	0x81C, 0x83480503,</div><div class='add'>+	0x81C, 0x824A0503,</div><div class='add'>+	0x81C, 0x814C0503,</div><div class='add'>+	0x81C, 0x804E0503,</div><div class='add'>+	0x81C, 0x63500503,</div><div class='add'>+	0x81C, 0x62520503,</div><div class='add'>+	0x81C, 0x61540503,</div><div class='add'>+	0x81C, 0x43560503,</div><div class='add'>+	0x81C, 0x42580503,</div><div class='add'>+	0x81C, 0x415A0503,</div><div class='add'>+	0x81C, 0x405C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEE1C0503,</div><div class='add'>+	0x81C, 0xED1E0503,</div><div class='add'>+	0x81C, 0xEC200503,</div><div class='add'>+	0x81C, 0xEB220503,</div><div class='add'>+	0x81C, 0xEA240503,</div><div class='add'>+	0x81C, 0xE9260503,</div><div class='add'>+	0x81C, 0xE8280503,</div><div class='add'>+	0x81C, 0xE72A0503,</div><div class='add'>+	0x81C, 0xE62C0503,</div><div class='add'>+	0x81C, 0xE52E0503,</div><div class='add'>+	0x81C, 0xE4300503,</div><div class='add'>+	0x81C, 0xE3320503,</div><div class='add'>+	0x81C, 0xE2340503,</div><div class='add'>+	0x81C, 0xC5360503,</div><div class='add'>+	0x81C, 0xC4380503,</div><div class='add'>+	0x81C, 0xC33A0503,</div><div class='add'>+	0x81C, 0xC23C0503,</div><div class='add'>+	0x81C, 0xA53E0503,</div><div class='add'>+	0x81C, 0xA4400503,</div><div class='add'>+	0x81C, 0xA3420503,</div><div class='add'>+	0x81C, 0xA2440503,</div><div class='add'>+	0x81C, 0xA1460503,</div><div class='add'>+	0x81C, 0x83480503,</div><div class='add'>+	0x81C, 0x824A0503,</div><div class='add'>+	0x81C, 0x814C0503,</div><div class='add'>+	0x81C, 0x804E0503,</div><div class='add'>+	0x81C, 0x63500503,</div><div class='add'>+	0x81C, 0x62520503,</div><div class='add'>+	0x81C, 0x61540503,</div><div class='add'>+	0x81C, 0x43560503,</div><div class='add'>+	0x81C, 0x42580503,</div><div class='add'>+	0x81C, 0x415A0503,</div><div class='add'>+	0x81C, 0x405C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBF000503,</div><div class='add'>+	0x81C, 0xBF020503,</div><div class='add'>+	0x81C, 0xBF040503,</div><div class='add'>+	0x81C, 0xBF060503,</div><div class='add'>+	0x81C, 0xBF080503,</div><div class='add'>+	0x81C, 0xBF0A0503,</div><div class='add'>+	0x81C, 0xBE0C0503,</div><div class='add'>+	0x81C, 0xBD0E0503,</div><div class='add'>+	0x81C, 0xBC100503,</div><div class='add'>+	0x81C, 0xBB120503,</div><div class='add'>+	0x81C, 0xBA140503,</div><div class='add'>+	0x81C, 0xB9160503,</div><div class='add'>+	0x81C, 0xB8180503,</div><div class='add'>+	0x81C, 0xB71A0503,</div><div class='add'>+	0x81C, 0xB61C0503,</div><div class='add'>+	0x81C, 0xB51E0503,</div><div class='add'>+	0x81C, 0xB2200503,</div><div class='add'>+	0x81C, 0xB3220503,</div><div class='add'>+	0x81C, 0xB2240503,</div><div class='add'>+	0x81C, 0xB1260503,</div><div class='add'>+	0x81C, 0xB0280503,</div><div class='add'>+	0x81C, 0xAF2A0503,</div><div class='add'>+	0x81C, 0xAE2C0503,</div><div class='add'>+	0x81C, 0xAD2E0503,</div><div class='add'>+	0x81C, 0xAC300503,</div><div class='add'>+	0x81C, 0xAB320503,</div><div class='add'>+	0x81C, 0xAA340503,</div><div class='add'>+	0x81C, 0xC6360503,</div><div class='add'>+	0x81C, 0xC5380503,</div><div class='add'>+	0x81C, 0xC43A0503,</div><div class='add'>+	0x81C, 0xC33C0503,</div><div class='add'>+	0x81C, 0x883E0503,</div><div class='add'>+	0x81C, 0x87400503,</div><div class='add'>+	0x81C, 0x86420503,</div><div class='add'>+	0x81C, 0x85440503,</div><div class='add'>+	0x81C, 0x84460503,</div><div class='add'>+	0x81C, 0x83480503,</div><div class='add'>+	0x81C, 0x674A0503,</div><div class='add'>+	0x81C, 0x664C0503,</div><div class='add'>+	0x81C, 0x654E0503,</div><div class='add'>+	0x81C, 0x64500503,</div><div class='add'>+	0x81C, 0x27520503,</div><div class='add'>+	0x81C, 0x26540503,</div><div class='add'>+	0x81C, 0x25560503,</div><div class='add'>+	0x81C, 0x24580503,</div><div class='add'>+	0x81C, 0x235A0503,</div><div class='add'>+	0x81C, 0x225C0503,</div><div class='add'>+	0x81C, 0x215E0503,</div><div class='add'>+	0x81C, 0x20600503,</div><div class='add'>+	0x81C, 0x03620503,</div><div class='add'>+	0x81C, 0x02640503,</div><div class='add'>+	0x81C, 0x01660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000403,</div><div class='add'>+	0x81C, 0xFD000503,</div><div class='add'>+	0x81C, 0xFC020503,</div><div class='add'>+	0x81C, 0xFB040503,</div><div class='add'>+	0x81C, 0xFA060503,</div><div class='add'>+	0x81C, 0xF9080503,</div><div class='add'>+	0x81C, 0xF80A0503,</div><div class='add'>+	0x81C, 0xF70C0503,</div><div class='add'>+	0x81C, 0xF60E0503,</div><div class='add'>+	0x81C, 0xF5100503,</div><div class='add'>+	0x81C, 0xF4120503,</div><div class='add'>+	0x81C, 0xF3140503,</div><div class='add'>+	0x81C, 0xF2160503,</div><div class='add'>+	0x81C, 0xF1180503,</div><div class='add'>+	0x81C, 0xF01A0503,</div><div class='add'>+	0x81C, 0xEF1C0503,</div><div class='add'>+	0x81C, 0xEE1E0503,</div><div class='add'>+	0x81C, 0xED200503,</div><div class='add'>+	0x81C, 0xEC220503,</div><div class='add'>+	0x81C, 0xEB240503,</div><div class='add'>+	0x81C, 0xEA260503,</div><div class='add'>+	0x81C, 0xE9280503,</div><div class='add'>+	0x81C, 0xE82A0503,</div><div class='add'>+	0x81C, 0xE72C0503,</div><div class='add'>+	0x81C, 0xE62E0503,</div><div class='add'>+	0x81C, 0xE5300503,</div><div class='add'>+	0x81C, 0xE4320503,</div><div class='add'>+	0x81C, 0xE3340503,</div><div class='add'>+	0x81C, 0xC6360503,</div><div class='add'>+	0x81C, 0xC5380503,</div><div class='add'>+	0x81C, 0xC43A0503,</div><div class='add'>+	0x81C, 0xC33C0503,</div><div class='add'>+	0x81C, 0xA53E0503,</div><div class='add'>+	0x81C, 0xA4400503,</div><div class='add'>+	0x81C, 0xA3420503,</div><div class='add'>+	0x81C, 0xA2440503,</div><div class='add'>+	0x81C, 0xA1460503,</div><div class='add'>+	0x81C, 0xA0480503,</div><div class='add'>+	0x81C, 0x824A0503,</div><div class='add'>+	0x81C, 0x814C0503,</div><div class='add'>+	0x81C, 0x804E0503,</div><div class='add'>+	0x81C, 0x64500503,</div><div class='add'>+	0x81C, 0x63520503,</div><div class='add'>+	0x81C, 0x62540503,</div><div class='add'>+	0x81C, 0x61560503,</div><div class='add'>+	0x81C, 0x60580503,</div><div class='add'>+	0x81C, 0x235A0503,</div><div class='add'>+	0x81C, 0x225C0503,</div><div class='add'>+	0x81C, 0x215E0503,</div><div class='add'>+	0x81C, 0x20600503,</div><div class='add'>+	0x81C, 0x03620503,</div><div class='add'>+	0x81C, 0x02640503,</div><div class='add'>+	0x81C, 0x01660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000503,</div><div class='add'>+	0x81C, 0xF7020503,</div><div class='add'>+	0x81C, 0xF6040503,</div><div class='add'>+	0x81C, 0xF5060503,</div><div class='add'>+	0x81C, 0xF4080503,</div><div class='add'>+	0x81C, 0xF30A0503,</div><div class='add'>+	0x81C, 0xF20C0503,</div><div class='add'>+	0x81C, 0xF10E0503,</div><div class='add'>+	0x81C, 0xF0100503,</div><div class='add'>+	0x81C, 0xEF120503,</div><div class='add'>+	0x81C, 0xEE140503,</div><div class='add'>+	0x81C, 0xED160503,</div><div class='add'>+	0x81C, 0xEC180503,</div><div class='add'>+	0x81C, 0xEB1A0503,</div><div class='add'>+	0x81C, 0xEA1C0503,</div><div class='add'>+	0x81C, 0xE91E0503,</div><div class='add'>+	0x81C, 0xE8200503,</div><div class='add'>+	0x81C, 0xE7220503,</div><div class='add'>+	0x81C, 0xE6240503,</div><div class='add'>+	0x81C, 0xE5260503,</div><div class='add'>+	0x81C, 0xE4280503,</div><div class='add'>+	0x81C, 0xE32A0503,</div><div class='add'>+	0x81C, 0xC32C0503,</div><div class='add'>+	0x81C, 0xC22E0503,</div><div class='add'>+	0x81C, 0xC1300503,</div><div class='add'>+	0x81C, 0xC0320503,</div><div class='add'>+	0x81C, 0xA3340503,</div><div class='add'>+	0x81C, 0xA2360503,</div><div class='add'>+	0x81C, 0xA1380503,</div><div class='add'>+	0x81C, 0xA03A0503,</div><div class='add'>+	0x81C, 0x823C0503,</div><div class='add'>+	0x81C, 0x813E0503,</div><div class='add'>+	0x81C, 0x80400503,</div><div class='add'>+	0x81C, 0x63420503,</div><div class='add'>+	0x81C, 0x62440503,</div><div class='add'>+	0x81C, 0x61460503,</div><div class='add'>+	0x81C, 0x60480503,</div><div class='add'>+	0x81C, 0x424A0503,</div><div class='add'>+	0x81C, 0x414C0503,</div><div class='add'>+	0x81C, 0x404E0503,</div><div class='add'>+	0x81C, 0x22500503,</div><div class='add'>+	0x81C, 0x21520503,</div><div class='add'>+	0x81C, 0x20540503,</div><div class='add'>+	0x81C, 0x03560503,</div><div class='add'>+	0x81C, 0x02580503,</div><div class='add'>+	0x81C, 0x015A0503,</div><div class='add'>+	0x81C, 0x005C0503,</div><div class='add'>+	0x81C, 0x005E0503,</div><div class='add'>+	0x81C, 0x00600503,</div><div class='add'>+	0x81C, 0x00620503,</div><div class='add'>+	0x81C, 0x00640503,</div><div class='add'>+	0x81C, 0x00660503,</div><div class='add'>+	0x81C, 0x00680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFE000503,</div><div class='add'>+	0x81C, 0xFD020503,</div><div class='add'>+	0x81C, 0xFC040503,</div><div class='add'>+	0x81C, 0xFB060503,</div><div class='add'>+	0x81C, 0xFA080503,</div><div class='add'>+	0x81C, 0xF90A0503,</div><div class='add'>+	0x81C, 0xF80C0503,</div><div class='add'>+	0x81C, 0xF70E0503,</div><div class='add'>+	0x81C, 0xF6100503,</div><div class='add'>+	0x81C, 0xF5120503,</div><div class='add'>+	0x81C, 0xF4140503,</div><div class='add'>+	0x81C, 0xF3160503,</div><div class='add'>+	0x81C, 0xF2180503,</div><div class='add'>+	0x81C, 0xF11A0503,</div><div class='add'>+	0x81C, 0xF01C0503,</div><div class='add'>+	0x81C, 0xEF1E0503,</div><div class='add'>+	0x81C, 0xEE200503,</div><div class='add'>+	0x81C, 0xED220503,</div><div class='add'>+	0x81C, 0xEC240503,</div><div class='add'>+	0x81C, 0xEB260503,</div><div class='add'>+	0x81C, 0xEA280503,</div><div class='add'>+	0x81C, 0xE92A0503,</div><div class='add'>+	0x81C, 0xE82C0503,</div><div class='add'>+	0x81C, 0xE72E0503,</div><div class='add'>+	0x81C, 0xE6300503,</div><div class='add'>+	0x81C, 0xE5320503,</div><div class='add'>+	0x81C, 0xE4340503,</div><div class='add'>+	0x81C, 0xE3360503,</div><div class='add'>+	0x81C, 0xC6380503,</div><div class='add'>+	0x81C, 0xC53A0503,</div><div class='add'>+	0x81C, 0xC43C0503,</div><div class='add'>+	0x81C, 0xC33E0503,</div><div class='add'>+	0x81C, 0xA5400503,</div><div class='add'>+	0x81C, 0xA4420503,</div><div class='add'>+	0x81C, 0xA3440503,</div><div class='add'>+	0x81C, 0xA2460503,</div><div class='add'>+	0x81C, 0xA1480503,</div><div class='add'>+	0x81C, 0xA04A0503,</div><div class='add'>+	0x81C, 0x824C0503,</div><div class='add'>+	0x81C, 0x814E0503,</div><div class='add'>+	0x81C, 0x80500503,</div><div class='add'>+	0x81C, 0x64520503,</div><div class='add'>+	0x81C, 0x63540503,</div><div class='add'>+	0x81C, 0x62560503,</div><div class='add'>+	0x81C, 0x61580503,</div><div class='add'>+	0x81C, 0x605A0503,</div><div class='add'>+	0x81C, 0x235C0503,</div><div class='add'>+	0x81C, 0x225E0503,</div><div class='add'>+	0x81C, 0x21600503,</div><div class='add'>+	0x81C, 0x20620503,</div><div class='add'>+	0x81C, 0x03640503,</div><div class='add'>+	0x81C, 0x02660503,</div><div class='add'>+	0x81C, 0x01680503,</div><div class='add'>+	0x81C, 0x006A0503,</div><div class='add'>+	0x81C, 0x006C0503,</div><div class='add'>+	0x81C, 0x006E0503,</div><div class='add'>+	0x81C, 0x00700503,</div><div class='add'>+	0x81C, 0x00720503,</div><div class='add'>+	0x81C, 0x00740503,</div><div class='add'>+	0x81C, 0x00760503,</div><div class='add'>+	0x81C, 0x00780503,</div><div class='add'>+	0x81C, 0x007A0503,</div><div class='add'>+	0x81C, 0x007C0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0x81C, 0x007E0503,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEE1A0603,</div><div class='add'>+	0x81C, 0xED1C0603,</div><div class='add'>+	0x81C, 0xEC1E0603,</div><div class='add'>+	0x81C, 0xEB200603,</div><div class='add'>+	0x81C, 0xEA220603,</div><div class='add'>+	0x81C, 0xE9240603,</div><div class='add'>+	0x81C, 0xE8260603,</div><div class='add'>+	0x81C, 0xE7280603,</div><div class='add'>+	0x81C, 0xE62A0603,</div><div class='add'>+	0x81C, 0xE52C0603,</div><div class='add'>+	0x81C, 0xE42E0603,</div><div class='add'>+	0x81C, 0xE3300603,</div><div class='add'>+	0x81C, 0xE2320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0xA63C0603,</div><div class='add'>+	0x81C, 0xA53E0603,</div><div class='add'>+	0x81C, 0xA4400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0x83480603,</div><div class='add'>+	0x81C, 0x824A0603,</div><div class='add'>+	0x81C, 0x814C0603,</div><div class='add'>+	0x81C, 0x804E0603,</div><div class='add'>+	0x81C, 0x63500603,</div><div class='add'>+	0x81C, 0x62520603,</div><div class='add'>+	0x81C, 0x61540603,</div><div class='add'>+	0x81C, 0x42560603,</div><div class='add'>+	0x81C, 0x41580603,</div><div class='add'>+	0x81C, 0x405A0603,</div><div class='add'>+	0x81C, 0x225C0603,</div><div class='add'>+	0x81C, 0x215E0603,</div><div class='add'>+	0x81C, 0x20600603,</div><div class='add'>+	0x81C, 0x04620603,</div><div class='add'>+	0x81C, 0x03640603,</div><div class='add'>+	0x81C, 0x02660603,</div><div class='add'>+	0x81C, 0x01680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBD000603,</div><div class='add'>+	0x81C, 0xBC020603,</div><div class='add'>+	0x81C, 0xBB040603,</div><div class='add'>+	0x81C, 0xBA060603,</div><div class='add'>+	0x81C, 0xB9080603,</div><div class='add'>+	0x81C, 0xB80A0603,</div><div class='add'>+	0x81C, 0xB70C0603,</div><div class='add'>+	0x81C, 0xB60E0603,</div><div class='add'>+	0x81C, 0xB5100603,</div><div class='add'>+	0x81C, 0xB4120603,</div><div class='add'>+	0x81C, 0xB3140603,</div><div class='add'>+	0x81C, 0xB2160603,</div><div class='add'>+	0x81C, 0xB1180603,</div><div class='add'>+	0x81C, 0xB01A0603,</div><div class='add'>+	0x81C, 0xAF1C0603,</div><div class='add'>+	0x81C, 0xAE1E0603,</div><div class='add'>+	0x81C, 0xAD200603,</div><div class='add'>+	0x81C, 0x8F220603,</div><div class='add'>+	0x81C, 0x8E240603,</div><div class='add'>+	0x81C, 0x8D260603,</div><div class='add'>+	0x81C, 0x8C280603,</div><div class='add'>+	0x81C, 0x8B2A0603,</div><div class='add'>+	0x81C, 0x8A2C0603,</div><div class='add'>+	0x81C, 0x892E0603,</div><div class='add'>+	0x81C, 0x88300603,</div><div class='add'>+	0x81C, 0x6B320603,</div><div class='add'>+	0x81C, 0x6A340603,</div><div class='add'>+	0x81C, 0x69360603,</div><div class='add'>+	0x81C, 0x68380603,</div><div class='add'>+	0x81C, 0x673A0603,</div><div class='add'>+	0x81C, 0x663C0603,</div><div class='add'>+	0x81C, 0x653E0603,</div><div class='add'>+	0x81C, 0x64400603,</div><div class='add'>+	0x81C, 0x63420603,</div><div class='add'>+	0x81C, 0x62440603,</div><div class='add'>+	0x81C, 0x61460603,</div><div class='add'>+	0x81C, 0x60480603,</div><div class='add'>+	0x81C, 0x424A0603,</div><div class='add'>+	0x81C, 0x414C0603,</div><div class='add'>+	0x81C, 0x404E0603,</div><div class='add'>+	0x81C, 0x06500603,</div><div class='add'>+	0x81C, 0x05520603,</div><div class='add'>+	0x81C, 0x04540603,</div><div class='add'>+	0x81C, 0x03560603,</div><div class='add'>+	0x81C, 0x02580603,</div><div class='add'>+	0x81C, 0x015A0603,</div><div class='add'>+	0x81C, 0x005C0603,</div><div class='add'>+	0x81C, 0x005E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000603,</div><div class='add'>+	0x81C, 0xF6020603,</div><div class='add'>+	0x81C, 0xF5040603,</div><div class='add'>+	0x81C, 0xF4060603,</div><div class='add'>+	0x81C, 0xF3080603,</div><div class='add'>+	0x81C, 0xF20A0603,</div><div class='add'>+	0x81C, 0xF10C0603,</div><div class='add'>+	0x81C, 0xF00E0603,</div><div class='add'>+	0x81C, 0xEF100603,</div><div class='add'>+	0x81C, 0xEE120603,</div><div class='add'>+	0x81C, 0xED140603,</div><div class='add'>+	0x81C, 0xEC160603,</div><div class='add'>+	0x81C, 0xEB180603,</div><div class='add'>+	0x81C, 0xEA1A0603,</div><div class='add'>+	0x81C, 0xE91C0603,</div><div class='add'>+	0x81C, 0xE81E0603,</div><div class='add'>+	0x81C, 0xE7200603,</div><div class='add'>+	0x81C, 0xE6220603,</div><div class='add'>+	0x81C, 0xE5240603,</div><div class='add'>+	0x81C, 0xE4260603,</div><div class='add'>+	0x81C, 0xE3280603,</div><div class='add'>+	0x81C, 0xC42A0603,</div><div class='add'>+	0x81C, 0xC32C0603,</div><div class='add'>+	0x81C, 0xC22E0603,</div><div class='add'>+	0x81C, 0xC1300603,</div><div class='add'>+	0x81C, 0xC0320603,</div><div class='add'>+	0x81C, 0xA3340603,</div><div class='add'>+	0x81C, 0xA2360603,</div><div class='add'>+	0x81C, 0xA1380603,</div><div class='add'>+	0x81C, 0xA03A0603,</div><div class='add'>+	0x81C, 0x823C0603,</div><div class='add'>+	0x81C, 0x813E0603,</div><div class='add'>+	0x81C, 0x80400603,</div><div class='add'>+	0x81C, 0x64420603,</div><div class='add'>+	0x81C, 0x63440603,</div><div class='add'>+	0x81C, 0x62460603,</div><div class='add'>+	0x81C, 0x61480603,</div><div class='add'>+	0x81C, 0x604A0603,</div><div class='add'>+	0x81C, 0x414C0603,</div><div class='add'>+	0x81C, 0x404E0603,</div><div class='add'>+	0x81C, 0x22500603,</div><div class='add'>+	0x81C, 0x21520603,</div><div class='add'>+	0x81C, 0x20540603,</div><div class='add'>+	0x81C, 0x03560603,</div><div class='add'>+	0x81C, 0x02580603,</div><div class='add'>+	0x81C, 0x015A0603,</div><div class='add'>+	0x81C, 0x005C0603,</div><div class='add'>+	0x81C, 0x005E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEF1A0603,</div><div class='add'>+	0x81C, 0xEE1C0603,</div><div class='add'>+	0x81C, 0xED1E0603,</div><div class='add'>+	0x81C, 0xEC200603,</div><div class='add'>+	0x81C, 0xEB220603,</div><div class='add'>+	0x81C, 0xEA240603,</div><div class='add'>+	0x81C, 0xE9260603,</div><div class='add'>+	0x81C, 0xE8280603,</div><div class='add'>+	0x81C, 0xE72A0603,</div><div class='add'>+	0x81C, 0xE62C0603,</div><div class='add'>+	0x81C, 0xE52E0603,</div><div class='add'>+	0x81C, 0xE4300603,</div><div class='add'>+	0x81C, 0xE3320603,</div><div class='add'>+	0x81C, 0xE2340603,</div><div class='add'>+	0x81C, 0xC6360603,</div><div class='add'>+	0x81C, 0xC5380603,</div><div class='add'>+	0x81C, 0xC43A0603,</div><div class='add'>+	0x81C, 0xC33C0603,</div><div class='add'>+	0x81C, 0xA63E0603,</div><div class='add'>+	0x81C, 0xA5400603,</div><div class='add'>+	0x81C, 0xA4420603,</div><div class='add'>+	0x81C, 0xA3440603,</div><div class='add'>+	0x81C, 0xA2460603,</div><div class='add'>+	0x81C, 0xA1480603,</div><div class='add'>+	0x81C, 0x834A0603,</div><div class='add'>+	0x81C, 0x824C0603,</div><div class='add'>+	0x81C, 0x814E0603,</div><div class='add'>+	0x81C, 0x64500603,</div><div class='add'>+	0x81C, 0x63520603,</div><div class='add'>+	0x81C, 0x62540603,</div><div class='add'>+	0x81C, 0x61560603,</div><div class='add'>+	0x81C, 0x60580603,</div><div class='add'>+	0x81C, 0x405A0603,</div><div class='add'>+	0x81C, 0x215C0603,</div><div class='add'>+	0x81C, 0x205E0603,</div><div class='add'>+	0x81C, 0x03600603,</div><div class='add'>+	0x81C, 0x02620603,</div><div class='add'>+	0x81C, 0x01640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000603,</div><div class='add'>+	0x81C, 0xF6020603,</div><div class='add'>+	0x81C, 0xF5040603,</div><div class='add'>+	0x81C, 0xF4060603,</div><div class='add'>+	0x81C, 0xF3080603,</div><div class='add'>+	0x81C, 0xF20A0603,</div><div class='add'>+	0x81C, 0xF10C0603,</div><div class='add'>+	0x81C, 0xF00E0603,</div><div class='add'>+	0x81C, 0xEF100603,</div><div class='add'>+	0x81C, 0xEE120603,</div><div class='add'>+	0x81C, 0xED140603,</div><div class='add'>+	0x81C, 0xEC160603,</div><div class='add'>+	0x81C, 0xEB180603,</div><div class='add'>+	0x81C, 0xEA1A0603,</div><div class='add'>+	0x81C, 0xE91C0603,</div><div class='add'>+	0x81C, 0xE81E0603,</div><div class='add'>+	0x81C, 0xE7200603,</div><div class='add'>+	0x81C, 0xE6220603,</div><div class='add'>+	0x81C, 0xE5240603,</div><div class='add'>+	0x81C, 0xE4260603,</div><div class='add'>+	0x81C, 0xE3280603,</div><div class='add'>+	0x81C, 0xC42A0603,</div><div class='add'>+	0x81C, 0xC32C0603,</div><div class='add'>+	0x81C, 0xC22E0603,</div><div class='add'>+	0x81C, 0xC1300603,</div><div class='add'>+	0x81C, 0xC0320603,</div><div class='add'>+	0x81C, 0xA3340603,</div><div class='add'>+	0x81C, 0xA2360603,</div><div class='add'>+	0x81C, 0xA1380603,</div><div class='add'>+	0x81C, 0xA03A0603,</div><div class='add'>+	0x81C, 0x823C0603,</div><div class='add'>+	0x81C, 0x813E0603,</div><div class='add'>+	0x81C, 0x80400603,</div><div class='add'>+	0x81C, 0x64420603,</div><div class='add'>+	0x81C, 0x63440603,</div><div class='add'>+	0x81C, 0x62460603,</div><div class='add'>+	0x81C, 0x61480603,</div><div class='add'>+	0x81C, 0x604A0603,</div><div class='add'>+	0x81C, 0x414C0603,</div><div class='add'>+	0x81C, 0x404E0603,</div><div class='add'>+	0x81C, 0x22500603,</div><div class='add'>+	0x81C, 0x21520603,</div><div class='add'>+	0x81C, 0x20540603,</div><div class='add'>+	0x81C, 0x03560603,</div><div class='add'>+	0x81C, 0x02580603,</div><div class='add'>+	0x81C, 0x015A0603,</div><div class='add'>+	0x81C, 0x005C0603,</div><div class='add'>+	0x81C, 0x005E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEF1A0603,</div><div class='add'>+	0x81C, 0xEE1C0603,</div><div class='add'>+	0x81C, 0xED1E0603,</div><div class='add'>+	0x81C, 0xEC200603,</div><div class='add'>+	0x81C, 0xEB220603,</div><div class='add'>+	0x81C, 0xEA240603,</div><div class='add'>+	0x81C, 0xE9260603,</div><div class='add'>+	0x81C, 0xE8280603,</div><div class='add'>+	0x81C, 0xE72A0603,</div><div class='add'>+	0x81C, 0xE62C0603,</div><div class='add'>+	0x81C, 0xE52E0603,</div><div class='add'>+	0x81C, 0xE4300603,</div><div class='add'>+	0x81C, 0xE3320603,</div><div class='add'>+	0x81C, 0xE2340603,</div><div class='add'>+	0x81C, 0xE1360603,</div><div class='add'>+	0x81C, 0xC5380603,</div><div class='add'>+	0x81C, 0xC43A0603,</div><div class='add'>+	0x81C, 0xC33C0603,</div><div class='add'>+	0x81C, 0xC23E0603,</div><div class='add'>+	0x81C, 0xC1400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0xA0480603,</div><div class='add'>+	0x81C, 0x834A0603,</div><div class='add'>+	0x81C, 0x824C0603,</div><div class='add'>+	0x81C, 0x814E0603,</div><div class='add'>+	0x81C, 0x64500603,</div><div class='add'>+	0x81C, 0x63520603,</div><div class='add'>+	0x81C, 0x62540603,</div><div class='add'>+	0x81C, 0x61560603,</div><div class='add'>+	0x81C, 0x25580603,</div><div class='add'>+	0x81C, 0x245A0603,</div><div class='add'>+	0x81C, 0x235C0603,</div><div class='add'>+	0x81C, 0x225E0603,</div><div class='add'>+	0x81C, 0x21600603,</div><div class='add'>+	0x81C, 0x04620603,</div><div class='add'>+	0x81C, 0x03640603,</div><div class='add'>+	0x81C, 0x02660603,</div><div class='add'>+	0x81C, 0x01680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000603,</div><div class='add'>+	0x81C, 0xF8020603,</div><div class='add'>+	0x81C, 0xF7040603,</div><div class='add'>+	0x81C, 0xF6060603,</div><div class='add'>+	0x81C, 0xF5080603,</div><div class='add'>+	0x81C, 0xF40A0603,</div><div class='add'>+	0x81C, 0xF30C0603,</div><div class='add'>+	0x81C, 0xF20E0603,</div><div class='add'>+	0x81C, 0xF1100603,</div><div class='add'>+	0x81C, 0xF0120603,</div><div class='add'>+	0x81C, 0xEF140603,</div><div class='add'>+	0x81C, 0xEE160603,</div><div class='add'>+	0x81C, 0xED180603,</div><div class='add'>+	0x81C, 0xEC1A0603,</div><div class='add'>+	0x81C, 0xEB1C0603,</div><div class='add'>+	0x81C, 0xEA1E0603,</div><div class='add'>+	0x81C, 0xE9200603,</div><div class='add'>+	0x81C, 0xE8220603,</div><div class='add'>+	0x81C, 0xE7240603,</div><div class='add'>+	0x81C, 0xE6260603,</div><div class='add'>+	0x81C, 0xE5280603,</div><div class='add'>+	0x81C, 0xC42A0603,</div><div class='add'>+	0x81C, 0xC32C0603,</div><div class='add'>+	0x81C, 0xC22E0603,</div><div class='add'>+	0x81C, 0xC1300603,</div><div class='add'>+	0x81C, 0xC0320603,</div><div class='add'>+	0x81C, 0xA3340603,</div><div class='add'>+	0x81C, 0xA2360603,</div><div class='add'>+	0x81C, 0xA1380603,</div><div class='add'>+	0x81C, 0xA03A0603,</div><div class='add'>+	0x81C, 0x823C0603,</div><div class='add'>+	0x81C, 0x813E0603,</div><div class='add'>+	0x81C, 0x80400603,</div><div class='add'>+	0x81C, 0x64420603,</div><div class='add'>+	0x81C, 0x63440603,</div><div class='add'>+	0x81C, 0x62460603,</div><div class='add'>+	0x81C, 0x61480603,</div><div class='add'>+	0x81C, 0x604A0603,</div><div class='add'>+	0x81C, 0x414C0603,</div><div class='add'>+	0x81C, 0x404E0603,</div><div class='add'>+	0x81C, 0x22500603,</div><div class='add'>+	0x81C, 0x21520603,</div><div class='add'>+	0x81C, 0x20540603,</div><div class='add'>+	0x81C, 0x03560603,</div><div class='add'>+	0x81C, 0x02580603,</div><div class='add'>+	0x81C, 0x015A0603,</div><div class='add'>+	0x81C, 0x005C0603,</div><div class='add'>+	0x81C, 0x005E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBE000603,</div><div class='add'>+	0x81C, 0xBD020603,</div><div class='add'>+	0x81C, 0xBC040603,</div><div class='add'>+	0x81C, 0xBB060603,</div><div class='add'>+	0x81C, 0xBA080603,</div><div class='add'>+	0x81C, 0xB90A0603,</div><div class='add'>+	0x81C, 0xB80C0603,</div><div class='add'>+	0x81C, 0xB70E0603,</div><div class='add'>+	0x81C, 0xB6100603,</div><div class='add'>+	0x81C, 0xB5120603,</div><div class='add'>+	0x81C, 0xB4140603,</div><div class='add'>+	0x81C, 0xB3160603,</div><div class='add'>+	0x81C, 0xB2180603,</div><div class='add'>+	0x81C, 0xB11A0603,</div><div class='add'>+	0x81C, 0xB01C0603,</div><div class='add'>+	0x81C, 0x921E0603,</div><div class='add'>+	0x81C, 0x91200603,</div><div class='add'>+	0x81C, 0x90220603,</div><div class='add'>+	0x81C, 0x8F240603,</div><div class='add'>+	0x81C, 0x8E260603,</div><div class='add'>+	0x81C, 0x8D280603,</div><div class='add'>+	0x81C, 0x8C2A0603,</div><div class='add'>+	0x81C, 0x8B2C0603,</div><div class='add'>+	0x81C, 0x8A2E0603,</div><div class='add'>+	0x81C, 0x89300603,</div><div class='add'>+	0x81C, 0x88320603,</div><div class='add'>+	0x81C, 0x6B340603,</div><div class='add'>+	0x81C, 0x6A360603,</div><div class='add'>+	0x81C, 0x69380603,</div><div class='add'>+	0x81C, 0x683A0603,</div><div class='add'>+	0x81C, 0x673C0603,</div><div class='add'>+	0x81C, 0x663E0603,</div><div class='add'>+	0x81C, 0x65400603,</div><div class='add'>+	0x81C, 0x64420603,</div><div class='add'>+	0x81C, 0x63440603,</div><div class='add'>+	0x81C, 0x62460603,</div><div class='add'>+	0x81C, 0x61480603,</div><div class='add'>+	0x81C, 0x604A0603,</div><div class='add'>+	0x81C, 0x424C0603,</div><div class='add'>+	0x81C, 0x414E0603,</div><div class='add'>+	0x81C, 0x40500603,</div><div class='add'>+	0x81C, 0x06520603,</div><div class='add'>+	0x81C, 0x05540603,</div><div class='add'>+	0x81C, 0x04560603,</div><div class='add'>+	0x81C, 0x03580603,</div><div class='add'>+	0x81C, 0x025A0603,</div><div class='add'>+	0x81C, 0x015C0603,</div><div class='add'>+	0x81C, 0x005E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000603,</div><div class='add'>+	0x81C, 0xFA020603,</div><div class='add'>+	0x81C, 0xF9040603,</div><div class='add'>+	0x81C, 0xF8060603,</div><div class='add'>+	0x81C, 0xF7080603,</div><div class='add'>+	0x81C, 0xF60A0603,</div><div class='add'>+	0x81C, 0xF50C0603,</div><div class='add'>+	0x81C, 0xF40E0603,</div><div class='add'>+	0x81C, 0xF3100603,</div><div class='add'>+	0x81C, 0xF2120603,</div><div class='add'>+	0x81C, 0xF1140603,</div><div class='add'>+	0x81C, 0xF0160603,</div><div class='add'>+	0x81C, 0xEF180603,</div><div class='add'>+	0x81C, 0xEE1A0603,</div><div class='add'>+	0x81C, 0xED1C0603,</div><div class='add'>+	0x81C, 0xEC1E0603,</div><div class='add'>+	0x81C, 0xEB200603,</div><div class='add'>+	0x81C, 0xEA220603,</div><div class='add'>+	0x81C, 0xE9240603,</div><div class='add'>+	0x81C, 0xE8260603,</div><div class='add'>+	0x81C, 0xE7280603,</div><div class='add'>+	0x81C, 0xE62A0603,</div><div class='add'>+	0x81C, 0xE52C0603,</div><div class='add'>+	0x81C, 0xE42E0603,</div><div class='add'>+	0x81C, 0xE3300603,</div><div class='add'>+	0x81C, 0xE2320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0xC23C0603,</div><div class='add'>+	0x81C, 0xC13E0603,</div><div class='add'>+	0x81C, 0xC0400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0xA0480603,</div><div class='add'>+	0x81C, 0x824A0603,</div><div class='add'>+	0x81C, 0x814C0603,</div><div class='add'>+	0x81C, 0x804E0603,</div><div class='add'>+	0x81C, 0x63500603,</div><div class='add'>+	0x81C, 0x62520603,</div><div class='add'>+	0x81C, 0x61540603,</div><div class='add'>+	0x81C, 0x60560603,</div><div class='add'>+	0x81C, 0x24580603,</div><div class='add'>+	0x81C, 0x235A0603,</div><div class='add'>+	0x81C, 0x225C0603,</div><div class='add'>+	0x81C, 0x215E0603,</div><div class='add'>+	0x81C, 0x20600603,</div><div class='add'>+	0x81C, 0x03620603,</div><div class='add'>+	0x81C, 0x02640603,</div><div class='add'>+	0x81C, 0x01660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000603,</div><div class='add'>+	0x81C, 0xF7020603,</div><div class='add'>+	0x81C, 0xF6040603,</div><div class='add'>+	0x81C, 0xF5060603,</div><div class='add'>+	0x81C, 0xF4080603,</div><div class='add'>+	0x81C, 0xF30A0603,</div><div class='add'>+	0x81C, 0xF20C0603,</div><div class='add'>+	0x81C, 0xF10E0603,</div><div class='add'>+	0x81C, 0xF0100603,</div><div class='add'>+	0x81C, 0xEF120603,</div><div class='add'>+	0x81C, 0xEE140603,</div><div class='add'>+	0x81C, 0xED160603,</div><div class='add'>+	0x81C, 0xEC180603,</div><div class='add'>+	0x81C, 0xEB1A0603,</div><div class='add'>+	0x81C, 0xEA1C0603,</div><div class='add'>+	0x81C, 0xE91E0603,</div><div class='add'>+	0x81C, 0xE8200603,</div><div class='add'>+	0x81C, 0xE7220603,</div><div class='add'>+	0x81C, 0xE6240603,</div><div class='add'>+	0x81C, 0xE5260603,</div><div class='add'>+	0x81C, 0xE4280603,</div><div class='add'>+	0x81C, 0xE32A0603,</div><div class='add'>+	0x81C, 0xC42C0603,</div><div class='add'>+	0x81C, 0xC32E0603,</div><div class='add'>+	0x81C, 0xC2300603,</div><div class='add'>+	0x81C, 0xC1320603,</div><div class='add'>+	0x81C, 0xA3340603,</div><div class='add'>+	0x81C, 0xA2360603,</div><div class='add'>+	0x81C, 0xA1380603,</div><div class='add'>+	0x81C, 0xA03A0603,</div><div class='add'>+	0x81C, 0x823C0603,</div><div class='add'>+	0x81C, 0x813E0603,</div><div class='add'>+	0x81C, 0x80400603,</div><div class='add'>+	0x81C, 0x65420603,</div><div class='add'>+	0x81C, 0x64440603,</div><div class='add'>+	0x81C, 0x63460603,</div><div class='add'>+	0x81C, 0x62480603,</div><div class='add'>+	0x81C, 0x614A0603,</div><div class='add'>+	0x81C, 0x424C0603,</div><div class='add'>+	0x81C, 0x414E0603,</div><div class='add'>+	0x81C, 0x40500603,</div><div class='add'>+	0x81C, 0x22520603,</div><div class='add'>+	0x81C, 0x21540603,</div><div class='add'>+	0x81C, 0x20560603,</div><div class='add'>+	0x81C, 0x04580603,</div><div class='add'>+	0x81C, 0x035A0603,</div><div class='add'>+	0x81C, 0x025C0603,</div><div class='add'>+	0x81C, 0x015E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEE1A0603,</div><div class='add'>+	0x81C, 0xED1C0603,</div><div class='add'>+	0x81C, 0xEC1E0603,</div><div class='add'>+	0x81C, 0xEB200603,</div><div class='add'>+	0x81C, 0xEA220603,</div><div class='add'>+	0x81C, 0xE9240603,</div><div class='add'>+	0x81C, 0xE8260603,</div><div class='add'>+	0x81C, 0xE7280603,</div><div class='add'>+	0x81C, 0xE62A0603,</div><div class='add'>+	0x81C, 0xE52C0603,</div><div class='add'>+	0x81C, 0xE42E0603,</div><div class='add'>+	0x81C, 0xE3300603,</div><div class='add'>+	0x81C, 0xE2320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0xA63C0603,</div><div class='add'>+	0x81C, 0xA53E0603,</div><div class='add'>+	0x81C, 0xA4400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0x83480603,</div><div class='add'>+	0x81C, 0x824A0603,</div><div class='add'>+	0x81C, 0x814C0603,</div><div class='add'>+	0x81C, 0x804E0603,</div><div class='add'>+	0x81C, 0x63500603,</div><div class='add'>+	0x81C, 0x62520603,</div><div class='add'>+	0x81C, 0x61540603,</div><div class='add'>+	0x81C, 0x42560603,</div><div class='add'>+	0x81C, 0x41580603,</div><div class='add'>+	0x81C, 0x405A0603,</div><div class='add'>+	0x81C, 0x225C0603,</div><div class='add'>+	0x81C, 0x215E0603,</div><div class='add'>+	0x81C, 0x20600603,</div><div class='add'>+	0x81C, 0x04620603,</div><div class='add'>+	0x81C, 0x03640603,</div><div class='add'>+	0x81C, 0x02660603,</div><div class='add'>+	0x81C, 0x01680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000603,</div><div class='add'>+	0x81C, 0xF8020603,</div><div class='add'>+	0x81C, 0xF7040603,</div><div class='add'>+	0x81C, 0xF6060603,</div><div class='add'>+	0x81C, 0xF5080603,</div><div class='add'>+	0x81C, 0xF40A0603,</div><div class='add'>+	0x81C, 0xF30C0603,</div><div class='add'>+	0x81C, 0xF20E0603,</div><div class='add'>+	0x81C, 0xF1100603,</div><div class='add'>+	0x81C, 0xF0120603,</div><div class='add'>+	0x81C, 0xEF140603,</div><div class='add'>+	0x81C, 0xEE160603,</div><div class='add'>+	0x81C, 0xED180603,</div><div class='add'>+	0x81C, 0xEC1A0603,</div><div class='add'>+	0x81C, 0xEB1C0603,</div><div class='add'>+	0x81C, 0xEA1E0603,</div><div class='add'>+	0x81C, 0xE9200603,</div><div class='add'>+	0x81C, 0xE8220603,</div><div class='add'>+	0x81C, 0xE7240603,</div><div class='add'>+	0x81C, 0xE6260603,</div><div class='add'>+	0x81C, 0xE5280603,</div><div class='add'>+	0x81C, 0xE42A0603,</div><div class='add'>+	0x81C, 0xC42C0603,</div><div class='add'>+	0x81C, 0xC32E0603,</div><div class='add'>+	0x81C, 0xC2300603,</div><div class='add'>+	0x81C, 0xC1320603,</div><div class='add'>+	0x81C, 0xA3340603,</div><div class='add'>+	0x81C, 0xA2360603,</div><div class='add'>+	0x81C, 0xA1380603,</div><div class='add'>+	0x81C, 0xA03A0603,</div><div class='add'>+	0x81C, 0x823C0603,</div><div class='add'>+	0x81C, 0x813E0603,</div><div class='add'>+	0x81C, 0x80400603,</div><div class='add'>+	0x81C, 0x64420603,</div><div class='add'>+	0x81C, 0x63440603,</div><div class='add'>+	0x81C, 0x62460603,</div><div class='add'>+	0x81C, 0x61480603,</div><div class='add'>+	0x81C, 0x604A0603,</div><div class='add'>+	0x81C, 0x244C0603,</div><div class='add'>+	0x81C, 0x234E0603,</div><div class='add'>+	0x81C, 0x22500603,</div><div class='add'>+	0x81C, 0x21520603,</div><div class='add'>+	0x81C, 0x20540603,</div><div class='add'>+	0x81C, 0x05560603,</div><div class='add'>+	0x81C, 0x04580603,</div><div class='add'>+	0x81C, 0x035A0603,</div><div class='add'>+	0x81C, 0x025C0603,</div><div class='add'>+	0x81C, 0x015E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEF1A0603,</div><div class='add'>+	0x81C, 0xEE1C0603,</div><div class='add'>+	0x81C, 0xED1E0603,</div><div class='add'>+	0x81C, 0xEC200603,</div><div class='add'>+	0x81C, 0xEB220603,</div><div class='add'>+	0x81C, 0xEA240603,</div><div class='add'>+	0x81C, 0xE9260603,</div><div class='add'>+	0x81C, 0xE8280603,</div><div class='add'>+	0x81C, 0xE72A0603,</div><div class='add'>+	0x81C, 0xE62C0603,</div><div class='add'>+	0x81C, 0xE52E0603,</div><div class='add'>+	0x81C, 0xE4300603,</div><div class='add'>+	0x81C, 0xE3320603,</div><div class='add'>+	0x81C, 0xE2340603,</div><div class='add'>+	0x81C, 0xC6360603,</div><div class='add'>+	0x81C, 0xC5380603,</div><div class='add'>+	0x81C, 0xC43A0603,</div><div class='add'>+	0x81C, 0xC33C0603,</div><div class='add'>+	0x81C, 0xA63E0603,</div><div class='add'>+	0x81C, 0xA5400603,</div><div class='add'>+	0x81C, 0xA4420603,</div><div class='add'>+	0x81C, 0xA3440603,</div><div class='add'>+	0x81C, 0xA2460603,</div><div class='add'>+	0x81C, 0xA1480603,</div><div class='add'>+	0x81C, 0x834A0603,</div><div class='add'>+	0x81C, 0x824C0603,</div><div class='add'>+	0x81C, 0x814E0603,</div><div class='add'>+	0x81C, 0x64500603,</div><div class='add'>+	0x81C, 0x63520603,</div><div class='add'>+	0x81C, 0x62540603,</div><div class='add'>+	0x81C, 0x61560603,</div><div class='add'>+	0x81C, 0x60580603,</div><div class='add'>+	0x81C, 0x405A0603,</div><div class='add'>+	0x81C, 0x215C0603,</div><div class='add'>+	0x81C, 0x205E0603,</div><div class='add'>+	0x81C, 0x03600603,</div><div class='add'>+	0x81C, 0x02620603,</div><div class='add'>+	0x81C, 0x01640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEE1A0603,</div><div class='add'>+	0x81C, 0xED1C0603,</div><div class='add'>+	0x81C, 0xEC1E0603,</div><div class='add'>+	0x81C, 0xEB200603,</div><div class='add'>+	0x81C, 0xEA220603,</div><div class='add'>+	0x81C, 0xE9240603,</div><div class='add'>+	0x81C, 0xE8260603,</div><div class='add'>+	0x81C, 0xE7280603,</div><div class='add'>+	0x81C, 0xE62A0603,</div><div class='add'>+	0x81C, 0xE52C0603,</div><div class='add'>+	0x81C, 0xE42E0603,</div><div class='add'>+	0x81C, 0xE3300603,</div><div class='add'>+	0x81C, 0xE2320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0xA63C0603,</div><div class='add'>+	0x81C, 0xA53E0603,</div><div class='add'>+	0x81C, 0xA4400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0x83480603,</div><div class='add'>+	0x81C, 0x824A0603,</div><div class='add'>+	0x81C, 0x814C0603,</div><div class='add'>+	0x81C, 0x804E0603,</div><div class='add'>+	0x81C, 0x63500603,</div><div class='add'>+	0x81C, 0x62520603,</div><div class='add'>+	0x81C, 0x61540603,</div><div class='add'>+	0x81C, 0x42560603,</div><div class='add'>+	0x81C, 0x41580603,</div><div class='add'>+	0x81C, 0x405A0603,</div><div class='add'>+	0x81C, 0x225C0603,</div><div class='add'>+	0x81C, 0x215E0603,</div><div class='add'>+	0x81C, 0x20600603,</div><div class='add'>+	0x81C, 0x04620603,</div><div class='add'>+	0x81C, 0x03640603,</div><div class='add'>+	0x81C, 0x02660603,</div><div class='add'>+	0x81C, 0x01680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000603,</div><div class='add'>+	0x81C, 0xFB020603,</div><div class='add'>+	0x81C, 0xFA040603,</div><div class='add'>+	0x81C, 0xF9060603,</div><div class='add'>+	0x81C, 0xF8080603,</div><div class='add'>+	0x81C, 0xF70A0603,</div><div class='add'>+	0x81C, 0xF60C0603,</div><div class='add'>+	0x81C, 0xF50E0603,</div><div class='add'>+	0x81C, 0xF4100603,</div><div class='add'>+	0x81C, 0xF3120603,</div><div class='add'>+	0x81C, 0xF2140603,</div><div class='add'>+	0x81C, 0xF1160603,</div><div class='add'>+	0x81C, 0xF0180603,</div><div class='add'>+	0x81C, 0xEE1A0603,</div><div class='add'>+	0x81C, 0xED1C0603,</div><div class='add'>+	0x81C, 0xEC1E0603,</div><div class='add'>+	0x81C, 0xEB200603,</div><div class='add'>+	0x81C, 0xEA220603,</div><div class='add'>+	0x81C, 0xE9240603,</div><div class='add'>+	0x81C, 0xE8260603,</div><div class='add'>+	0x81C, 0xE7280603,</div><div class='add'>+	0x81C, 0xE62A0603,</div><div class='add'>+	0x81C, 0xE52C0603,</div><div class='add'>+	0x81C, 0xE42E0603,</div><div class='add'>+	0x81C, 0xE3300603,</div><div class='add'>+	0x81C, 0xE2320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0xA63C0603,</div><div class='add'>+	0x81C, 0xA53E0603,</div><div class='add'>+	0x81C, 0xA4400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0x83480603,</div><div class='add'>+	0x81C, 0x824A0603,</div><div class='add'>+	0x81C, 0x814C0603,</div><div class='add'>+	0x81C, 0x804E0603,</div><div class='add'>+	0x81C, 0x63500603,</div><div class='add'>+	0x81C, 0x62520603,</div><div class='add'>+	0x81C, 0x61540603,</div><div class='add'>+	0x81C, 0x42560603,</div><div class='add'>+	0x81C, 0x41580603,</div><div class='add'>+	0x81C, 0x405A0603,</div><div class='add'>+	0x81C, 0x225C0603,</div><div class='add'>+	0x81C, 0x215E0603,</div><div class='add'>+	0x81C, 0x20600603,</div><div class='add'>+	0x81C, 0x04620603,</div><div class='add'>+	0x81C, 0x03640603,</div><div class='add'>+	0x81C, 0x02660603,</div><div class='add'>+	0x81C, 0x01680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBF000603,</div><div class='add'>+	0x81C, 0xBF020603,</div><div class='add'>+	0x81C, 0xBF040603,</div><div class='add'>+	0x81C, 0xBF060603,</div><div class='add'>+	0x81C, 0xBF080603,</div><div class='add'>+	0x81C, 0xBE0A0603,</div><div class='add'>+	0x81C, 0xBD0C0603,</div><div class='add'>+	0x81C, 0xBC0E0603,</div><div class='add'>+	0x81C, 0xBB100603,</div><div class='add'>+	0x81C, 0xBA120603,</div><div class='add'>+	0x81C, 0xB9140603,</div><div class='add'>+	0x81C, 0xB8160603,</div><div class='add'>+	0x81C, 0xB7180603,</div><div class='add'>+	0x81C, 0xB61A0603,</div><div class='add'>+	0x81C, 0xB51C0603,</div><div class='add'>+	0x81C, 0xB41E0603,</div><div class='add'>+	0x81C, 0xB1200603,</div><div class='add'>+	0x81C, 0xB2220603,</div><div class='add'>+	0x81C, 0xB1240603,</div><div class='add'>+	0x81C, 0xB0260603,</div><div class='add'>+	0x81C, 0xAF280603,</div><div class='add'>+	0x81C, 0xAE2A0603,</div><div class='add'>+	0x81C, 0xAD2C0603,</div><div class='add'>+	0x81C, 0xAC2E0603,</div><div class='add'>+	0x81C, 0xAB300603,</div><div class='add'>+	0x81C, 0xAA320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0x883C0603,</div><div class='add'>+	0x81C, 0x873E0603,</div><div class='add'>+	0x81C, 0x86400603,</div><div class='add'>+	0x81C, 0x85420603,</div><div class='add'>+	0x81C, 0x84440603,</div><div class='add'>+	0x81C, 0x83460603,</div><div class='add'>+	0x81C, 0x67480603,</div><div class='add'>+	0x81C, 0x664A0603,</div><div class='add'>+	0x81C, 0x654C0603,</div><div class='add'>+	0x81C, 0x644E0603,</div><div class='add'>+	0x81C, 0x27500603,</div><div class='add'>+	0x81C, 0x26520603,</div><div class='add'>+	0x81C, 0x25540603,</div><div class='add'>+	0x81C, 0x24560603,</div><div class='add'>+	0x81C, 0x23580603,</div><div class='add'>+	0x81C, 0x225A0603,</div><div class='add'>+	0x81C, 0x215C0603,</div><div class='add'>+	0x81C, 0x205E0603,</div><div class='add'>+	0x81C, 0x03600603,</div><div class='add'>+	0x81C, 0x02620603,</div><div class='add'>+	0x81C, 0x01640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000403,</div><div class='add'>+	0x81C, 0xFB000603,</div><div class='add'>+	0x81C, 0xFA020603,</div><div class='add'>+	0x81C, 0xF9040603,</div><div class='add'>+	0x81C, 0xF8060603,</div><div class='add'>+	0x81C, 0xF7080603,</div><div class='add'>+	0x81C, 0xF60A0603,</div><div class='add'>+	0x81C, 0xF50C0603,</div><div class='add'>+	0x81C, 0xF40E0603,</div><div class='add'>+	0x81C, 0xF3100603,</div><div class='add'>+	0x81C, 0xF2120603,</div><div class='add'>+	0x81C, 0xF1140603,</div><div class='add'>+	0x81C, 0xF0160603,</div><div class='add'>+	0x81C, 0xEF180603,</div><div class='add'>+	0x81C, 0xEE1A0603,</div><div class='add'>+	0x81C, 0xED1C0603,</div><div class='add'>+	0x81C, 0xEC1E0603,</div><div class='add'>+	0x81C, 0xEB200603,</div><div class='add'>+	0x81C, 0xEA220603,</div><div class='add'>+	0x81C, 0xE9240603,</div><div class='add'>+	0x81C, 0xE8260603,</div><div class='add'>+	0x81C, 0xE7280603,</div><div class='add'>+	0x81C, 0xE62A0603,</div><div class='add'>+	0x81C, 0xE52C0603,</div><div class='add'>+	0x81C, 0xE42E0603,</div><div class='add'>+	0x81C, 0xE3300603,</div><div class='add'>+	0x81C, 0xE2320603,</div><div class='add'>+	0x81C, 0xC6340603,</div><div class='add'>+	0x81C, 0xC5360603,</div><div class='add'>+	0x81C, 0xC4380603,</div><div class='add'>+	0x81C, 0xC33A0603,</div><div class='add'>+	0x81C, 0xA63C0603,</div><div class='add'>+	0x81C, 0xA53E0603,</div><div class='add'>+	0x81C, 0xA4400603,</div><div class='add'>+	0x81C, 0xA3420603,</div><div class='add'>+	0x81C, 0xA2440603,</div><div class='add'>+	0x81C, 0xA1460603,</div><div class='add'>+	0x81C, 0x83480603,</div><div class='add'>+	0x81C, 0x824A0603,</div><div class='add'>+	0x81C, 0x814C0603,</div><div class='add'>+	0x81C, 0x644E0603,</div><div class='add'>+	0x81C, 0x63500603,</div><div class='add'>+	0x81C, 0x62520603,</div><div class='add'>+	0x81C, 0x61540603,</div><div class='add'>+	0x81C, 0x60560603,</div><div class='add'>+	0x81C, 0x40580603,</div><div class='add'>+	0x81C, 0x215A0603,</div><div class='add'>+	0x81C, 0x205C0603,</div><div class='add'>+	0x81C, 0x035E0603,</div><div class='add'>+	0x81C, 0x02600603,</div><div class='add'>+	0x81C, 0x01620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000603,</div><div class='add'>+	0x81C, 0xF6020603,</div><div class='add'>+	0x81C, 0xF5040603,</div><div class='add'>+	0x81C, 0xF4060603,</div><div class='add'>+	0x81C, 0xF3080603,</div><div class='add'>+	0x81C, 0xF20A0603,</div><div class='add'>+	0x81C, 0xF10C0603,</div><div class='add'>+	0x81C, 0xF00E0603,</div><div class='add'>+	0x81C, 0xEF100603,</div><div class='add'>+	0x81C, 0xEE120603,</div><div class='add'>+	0x81C, 0xED140603,</div><div class='add'>+	0x81C, 0xEC160603,</div><div class='add'>+	0x81C, 0xEB180603,</div><div class='add'>+	0x81C, 0xEA1A0603,</div><div class='add'>+	0x81C, 0xE91C0603,</div><div class='add'>+	0x81C, 0xE81E0603,</div><div class='add'>+	0x81C, 0xE7200603,</div><div class='add'>+	0x81C, 0xE6220603,</div><div class='add'>+	0x81C, 0xE5240603,</div><div class='add'>+	0x81C, 0xE4260603,</div><div class='add'>+	0x81C, 0xE3280603,</div><div class='add'>+	0x81C, 0xC42A0603,</div><div class='add'>+	0x81C, 0xC32C0603,</div><div class='add'>+	0x81C, 0xC22E0603,</div><div class='add'>+	0x81C, 0xC1300603,</div><div class='add'>+	0x81C, 0xC0320603,</div><div class='add'>+	0x81C, 0xA3340603,</div><div class='add'>+	0x81C, 0xA2360603,</div><div class='add'>+	0x81C, 0xA1380603,</div><div class='add'>+	0x81C, 0xA03A0603,</div><div class='add'>+	0x81C, 0x823C0603,</div><div class='add'>+	0x81C, 0x813E0603,</div><div class='add'>+	0x81C, 0x80400603,</div><div class='add'>+	0x81C, 0x64420603,</div><div class='add'>+	0x81C, 0x63440603,</div><div class='add'>+	0x81C, 0x62460603,</div><div class='add'>+	0x81C, 0x61480603,</div><div class='add'>+	0x81C, 0x604A0603,</div><div class='add'>+	0x81C, 0x414C0603,</div><div class='add'>+	0x81C, 0x404E0603,</div><div class='add'>+	0x81C, 0x22500603,</div><div class='add'>+	0x81C, 0x21520603,</div><div class='add'>+	0x81C, 0x20540603,</div><div class='add'>+	0x81C, 0x03560603,</div><div class='add'>+	0x81C, 0x02580603,</div><div class='add'>+	0x81C, 0x015A0603,</div><div class='add'>+	0x81C, 0x005C0603,</div><div class='add'>+	0x81C, 0x005E0603,</div><div class='add'>+	0x81C, 0x00600603,</div><div class='add'>+	0x81C, 0x00620603,</div><div class='add'>+	0x81C, 0x00640603,</div><div class='add'>+	0x81C, 0x00660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFD000603,</div><div class='add'>+	0x81C, 0xFC020603,</div><div class='add'>+	0x81C, 0xFB040603,</div><div class='add'>+	0x81C, 0xFA060603,</div><div class='add'>+	0x81C, 0xF9080603,</div><div class='add'>+	0x81C, 0xF80A0603,</div><div class='add'>+	0x81C, 0xF70C0603,</div><div class='add'>+	0x81C, 0xF60E0603,</div><div class='add'>+	0x81C, 0xF5100603,</div><div class='add'>+	0x81C, 0xF4120603,</div><div class='add'>+	0x81C, 0xF3140603,</div><div class='add'>+	0x81C, 0xF2160603,</div><div class='add'>+	0x81C, 0xF1180603,</div><div class='add'>+	0x81C, 0xF01A0603,</div><div class='add'>+	0x81C, 0xEF1C0603,</div><div class='add'>+	0x81C, 0xEE1E0603,</div><div class='add'>+	0x81C, 0xED200603,</div><div class='add'>+	0x81C, 0xEC220603,</div><div class='add'>+	0x81C, 0xEB240603,</div><div class='add'>+	0x81C, 0xEA260603,</div><div class='add'>+	0x81C, 0xE9280603,</div><div class='add'>+	0x81C, 0xE82A0603,</div><div class='add'>+	0x81C, 0xE72C0603,</div><div class='add'>+	0x81C, 0xE62E0603,</div><div class='add'>+	0x81C, 0xE5300603,</div><div class='add'>+	0x81C, 0xE4320603,</div><div class='add'>+	0x81C, 0xE3340603,</div><div class='add'>+	0x81C, 0xC6360603,</div><div class='add'>+	0x81C, 0xC5380603,</div><div class='add'>+	0x81C, 0xC43A0603,</div><div class='add'>+	0x81C, 0xC33C0603,</div><div class='add'>+	0x81C, 0xA63E0603,</div><div class='add'>+	0x81C, 0xA5400603,</div><div class='add'>+	0x81C, 0xA4420603,</div><div class='add'>+	0x81C, 0xA3440603,</div><div class='add'>+	0x81C, 0xA2460603,</div><div class='add'>+	0x81C, 0xA1480603,</div><div class='add'>+	0x81C, 0x834A0603,</div><div class='add'>+	0x81C, 0x824C0603,</div><div class='add'>+	0x81C, 0x814E0603,</div><div class='add'>+	0x81C, 0x64500603,</div><div class='add'>+	0x81C, 0x63520603,</div><div class='add'>+	0x81C, 0x62540603,</div><div class='add'>+	0x81C, 0x61560603,</div><div class='add'>+	0x81C, 0x60580603,</div><div class='add'>+	0x81C, 0x235A0603,</div><div class='add'>+	0x81C, 0x225C0603,</div><div class='add'>+	0x81C, 0x215E0603,</div><div class='add'>+	0x81C, 0x20600603,</div><div class='add'>+	0x81C, 0x03620603,</div><div class='add'>+	0x81C, 0x02640603,</div><div class='add'>+	0x81C, 0x01660603,</div><div class='add'>+	0x81C, 0x00680603,</div><div class='add'>+	0x81C, 0x006A0603,</div><div class='add'>+	0x81C, 0x006C0603,</div><div class='add'>+	0x81C, 0x006E0603,</div><div class='add'>+	0x81C, 0x00700603,</div><div class='add'>+	0x81C, 0x00720603,</div><div class='add'>+	0x81C, 0x00740603,</div><div class='add'>+	0x81C, 0x00760603,</div><div class='add'>+	0x81C, 0x00780603,</div><div class='add'>+	0x81C, 0x007A0603,</div><div class='add'>+	0x81C, 0x007C0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0x81C, 0x007E0603,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000703,</div><div class='add'>+	0x81C, 0xFB020703,</div><div class='add'>+	0x81C, 0xFA040703,</div><div class='add'>+	0x81C, 0xF9060703,</div><div class='add'>+	0x81C, 0xF8080703,</div><div class='add'>+	0x81C, 0xF70A0703,</div><div class='add'>+	0x81C, 0xF60C0703,</div><div class='add'>+	0x81C, 0xF50E0703,</div><div class='add'>+	0x81C, 0xF4100703,</div><div class='add'>+	0x81C, 0xF3120703,</div><div class='add'>+	0x81C, 0xF2140703,</div><div class='add'>+	0x81C, 0xF1160703,</div><div class='add'>+	0x81C, 0xEF180703,</div><div class='add'>+	0x81C, 0xEE1A0703,</div><div class='add'>+	0x81C, 0xED1C0703,</div><div class='add'>+	0x81C, 0xEC1E0703,</div><div class='add'>+	0x81C, 0xEB200703,</div><div class='add'>+	0x81C, 0xEA220703,</div><div class='add'>+	0x81C, 0xE9240703,</div><div class='add'>+	0x81C, 0xE8260703,</div><div class='add'>+	0x81C, 0xE7280703,</div><div class='add'>+	0x81C, 0xE62A0703,</div><div class='add'>+	0x81C, 0xE52C0703,</div><div class='add'>+	0x81C, 0xE42E0703,</div><div class='add'>+	0x81C, 0xE3300703,</div><div class='add'>+	0x81C, 0xE2320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xA63C0703,</div><div class='add'>+	0x81C, 0xA53E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0xA1460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x63500703,</div><div class='add'>+	0x81C, 0x62520703,</div><div class='add'>+	0x81C, 0x61540703,</div><div class='add'>+	0x81C, 0x42560703,</div><div class='add'>+	0x81C, 0x41580703,</div><div class='add'>+	0x81C, 0x405A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x04620703,</div><div class='add'>+	0x81C, 0x03640703,</div><div class='add'>+	0x81C, 0x02660703,</div><div class='add'>+	0x81C, 0x01680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBD000703,</div><div class='add'>+	0x81C, 0xBC020703,</div><div class='add'>+	0x81C, 0xBB040703,</div><div class='add'>+	0x81C, 0xBA060703,</div><div class='add'>+	0x81C, 0xB9080703,</div><div class='add'>+	0x81C, 0xB80A0703,</div><div class='add'>+	0x81C, 0xB70C0703,</div><div class='add'>+	0x81C, 0xB60E0703,</div><div class='add'>+	0x81C, 0xB5100703,</div><div class='add'>+	0x81C, 0xB4120703,</div><div class='add'>+	0x81C, 0xB3140703,</div><div class='add'>+	0x81C, 0xB2160703,</div><div class='add'>+	0x81C, 0xB1180703,</div><div class='add'>+	0x81C, 0xB01A0703,</div><div class='add'>+	0x81C, 0xAF1C0703,</div><div class='add'>+	0x81C, 0xAE1E0703,</div><div class='add'>+	0x81C, 0xAD200703,</div><div class='add'>+	0x81C, 0xAC220703,</div><div class='add'>+	0x81C, 0x8E240703,</div><div class='add'>+	0x81C, 0x8D260703,</div><div class='add'>+	0x81C, 0x8C280703,</div><div class='add'>+	0x81C, 0x6F2A0703,</div><div class='add'>+	0x81C, 0x6E2C0703,</div><div class='add'>+	0x81C, 0x6D2E0703,</div><div class='add'>+	0x81C, 0x6C300703,</div><div class='add'>+	0x81C, 0x6B320703,</div><div class='add'>+	0x81C, 0x6A340703,</div><div class='add'>+	0x81C, 0x69360703,</div><div class='add'>+	0x81C, 0x68380703,</div><div class='add'>+	0x81C, 0x673A0703,</div><div class='add'>+	0x81C, 0x663C0703,</div><div class='add'>+	0x81C, 0x653E0703,</div><div class='add'>+	0x81C, 0x64400703,</div><div class='add'>+	0x81C, 0x63420703,</div><div class='add'>+	0x81C, 0x62440703,</div><div class='add'>+	0x81C, 0x61460703,</div><div class='add'>+	0x81C, 0x60480703,</div><div class='add'>+	0x81C, 0x424A0703,</div><div class='add'>+	0x81C, 0x414C0703,</div><div class='add'>+	0x81C, 0x404E0703,</div><div class='add'>+	0x81C, 0x06500703,</div><div class='add'>+	0x81C, 0x05520703,</div><div class='add'>+	0x81C, 0x04540703,</div><div class='add'>+	0x81C, 0x03560703,</div><div class='add'>+	0x81C, 0x02580703,</div><div class='add'>+	0x81C, 0x015A0703,</div><div class='add'>+	0x81C, 0x005C0703,</div><div class='add'>+	0x81C, 0x005E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000703,</div><div class='add'>+	0x81C, 0xF6020703,</div><div class='add'>+	0x81C, 0xF5040703,</div><div class='add'>+	0x81C, 0xF4060703,</div><div class='add'>+	0x81C, 0xF3080703,</div><div class='add'>+	0x81C, 0xF20A0703,</div><div class='add'>+	0x81C, 0xF10C0703,</div><div class='add'>+	0x81C, 0xF00E0703,</div><div class='add'>+	0x81C, 0xEF100703,</div><div class='add'>+	0x81C, 0xEE120703,</div><div class='add'>+	0x81C, 0xED140703,</div><div class='add'>+	0x81C, 0xEC160703,</div><div class='add'>+	0x81C, 0xEB180703,</div><div class='add'>+	0x81C, 0xEA1A0703,</div><div class='add'>+	0x81C, 0xE91C0703,</div><div class='add'>+	0x81C, 0xCA1E0703,</div><div class='add'>+	0x81C, 0xC9200703,</div><div class='add'>+	0x81C, 0xC8220703,</div><div class='add'>+	0x81C, 0xC7240703,</div><div class='add'>+	0x81C, 0xC6260703,</div><div class='add'>+	0x81C, 0xC5280703,</div><div class='add'>+	0x81C, 0xC42A0703,</div><div class='add'>+	0x81C, 0xC32C0703,</div><div class='add'>+	0x81C, 0xC22E0703,</div><div class='add'>+	0x81C, 0xC1300703,</div><div class='add'>+	0x81C, 0xA4320703,</div><div class='add'>+	0x81C, 0xA3340703,</div><div class='add'>+	0x81C, 0xA2360703,</div><div class='add'>+	0x81C, 0xA1380703,</div><div class='add'>+	0x81C, 0xA03A0703,</div><div class='add'>+	0x81C, 0x823C0703,</div><div class='add'>+	0x81C, 0x813E0703,</div><div class='add'>+	0x81C, 0x80400703,</div><div class='add'>+	0x81C, 0x64420703,</div><div class='add'>+	0x81C, 0x63440703,</div><div class='add'>+	0x81C, 0x62460703,</div><div class='add'>+	0x81C, 0x61480703,</div><div class='add'>+	0x81C, 0x604A0703,</div><div class='add'>+	0x81C, 0x414C0703,</div><div class='add'>+	0x81C, 0x404E0703,</div><div class='add'>+	0x81C, 0x22500703,</div><div class='add'>+	0x81C, 0x21520703,</div><div class='add'>+	0x81C, 0x20540703,</div><div class='add'>+	0x81C, 0x03560703,</div><div class='add'>+	0x81C, 0x02580703,</div><div class='add'>+	0x81C, 0x015A0703,</div><div class='add'>+	0x81C, 0x005C0703,</div><div class='add'>+	0x81C, 0x005E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000703,</div><div class='add'>+	0x81C, 0xFB020703,</div><div class='add'>+	0x81C, 0xFA040703,</div><div class='add'>+	0x81C, 0xF9060703,</div><div class='add'>+	0x81C, 0xF8080703,</div><div class='add'>+	0x81C, 0xF70A0703,</div><div class='add'>+	0x81C, 0xF60C0703,</div><div class='add'>+	0x81C, 0xF50E0703,</div><div class='add'>+	0x81C, 0xF4100703,</div><div class='add'>+	0x81C, 0xF3120703,</div><div class='add'>+	0x81C, 0xF2140703,</div><div class='add'>+	0x81C, 0xF1160703,</div><div class='add'>+	0x81C, 0xF0180703,</div><div class='add'>+	0x81C, 0xEF1A0703,</div><div class='add'>+	0x81C, 0xEE1C0703,</div><div class='add'>+	0x81C, 0xED1E0703,</div><div class='add'>+	0x81C, 0xEC200703,</div><div class='add'>+	0x81C, 0xEB220703,</div><div class='add'>+	0x81C, 0xEA240703,</div><div class='add'>+	0x81C, 0xE9260703,</div><div class='add'>+	0x81C, 0xE8280703,</div><div class='add'>+	0x81C, 0xE72A0703,</div><div class='add'>+	0x81C, 0xE62C0703,</div><div class='add'>+	0x81C, 0xE52E0703,</div><div class='add'>+	0x81C, 0xE4300703,</div><div class='add'>+	0x81C, 0xE3320703,</div><div class='add'>+	0x81C, 0xE2340703,</div><div class='add'>+	0x81C, 0xC6360703,</div><div class='add'>+	0x81C, 0xC5380703,</div><div class='add'>+	0x81C, 0xC43A0703,</div><div class='add'>+	0x81C, 0xC33C0703,</div><div class='add'>+	0x81C, 0xA63E0703,</div><div class='add'>+	0x81C, 0xA5400703,</div><div class='add'>+	0x81C, 0xA4420703,</div><div class='add'>+	0x81C, 0xA3440703,</div><div class='add'>+	0x81C, 0xA2460703,</div><div class='add'>+	0x81C, 0x84480703,</div><div class='add'>+	0x81C, 0x834A0703,</div><div class='add'>+	0x81C, 0x824C0703,</div><div class='add'>+	0x81C, 0x814E0703,</div><div class='add'>+	0x81C, 0x80500703,</div><div class='add'>+	0x81C, 0x63520703,</div><div class='add'>+	0x81C, 0x62540703,</div><div class='add'>+	0x81C, 0x61560703,</div><div class='add'>+	0x81C, 0x60580703,</div><div class='add'>+	0x81C, 0x225A0703,</div><div class='add'>+	0x81C, 0x055C0703,</div><div class='add'>+	0x81C, 0x045E0703,</div><div class='add'>+	0x81C, 0x03600703,</div><div class='add'>+	0x81C, 0x02620703,</div><div class='add'>+	0x81C, 0x01640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000703,</div><div class='add'>+	0x81C, 0xF6020703,</div><div class='add'>+	0x81C, 0xF5040703,</div><div class='add'>+	0x81C, 0xF4060703,</div><div class='add'>+	0x81C, 0xF3080703,</div><div class='add'>+	0x81C, 0xF20A0703,</div><div class='add'>+	0x81C, 0xF10C0703,</div><div class='add'>+	0x81C, 0xF00E0703,</div><div class='add'>+	0x81C, 0xEF100703,</div><div class='add'>+	0x81C, 0xEE120703,</div><div class='add'>+	0x81C, 0xED140703,</div><div class='add'>+	0x81C, 0xEC160703,</div><div class='add'>+	0x81C, 0xEB180703,</div><div class='add'>+	0x81C, 0xEA1A0703,</div><div class='add'>+	0x81C, 0xE91C0703,</div><div class='add'>+	0x81C, 0xCA1E0703,</div><div class='add'>+	0x81C, 0xC9200703,</div><div class='add'>+	0x81C, 0xC8220703,</div><div class='add'>+	0x81C, 0xC7240703,</div><div class='add'>+	0x81C, 0xC6260703,</div><div class='add'>+	0x81C, 0xC5280703,</div><div class='add'>+	0x81C, 0xC42A0703,</div><div class='add'>+	0x81C, 0xC32C0703,</div><div class='add'>+	0x81C, 0xC22E0703,</div><div class='add'>+	0x81C, 0xC1300703,</div><div class='add'>+	0x81C, 0xA4320703,</div><div class='add'>+	0x81C, 0xA3340703,</div><div class='add'>+	0x81C, 0xA2360703,</div><div class='add'>+	0x81C, 0xA1380703,</div><div class='add'>+	0x81C, 0xA03A0703,</div><div class='add'>+	0x81C, 0x823C0703,</div><div class='add'>+	0x81C, 0x813E0703,</div><div class='add'>+	0x81C, 0x80400703,</div><div class='add'>+	0x81C, 0x64420703,</div><div class='add'>+	0x81C, 0x63440703,</div><div class='add'>+	0x81C, 0x62460703,</div><div class='add'>+	0x81C, 0x61480703,</div><div class='add'>+	0x81C, 0x604A0703,</div><div class='add'>+	0x81C, 0x414C0703,</div><div class='add'>+	0x81C, 0x404E0703,</div><div class='add'>+	0x81C, 0x22500703,</div><div class='add'>+	0x81C, 0x21520703,</div><div class='add'>+	0x81C, 0x20540703,</div><div class='add'>+	0x81C, 0x03560703,</div><div class='add'>+	0x81C, 0x02580703,</div><div class='add'>+	0x81C, 0x015A0703,</div><div class='add'>+	0x81C, 0x005C0703,</div><div class='add'>+	0x81C, 0x005E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000703,</div><div class='add'>+	0x81C, 0xFA020703,</div><div class='add'>+	0x81C, 0xF9040703,</div><div class='add'>+	0x81C, 0xF8060703,</div><div class='add'>+	0x81C, 0xF7080703,</div><div class='add'>+	0x81C, 0xF60A0703,</div><div class='add'>+	0x81C, 0xF50C0703,</div><div class='add'>+	0x81C, 0xF40E0703,</div><div class='add'>+	0x81C, 0xF3100703,</div><div class='add'>+	0x81C, 0xF2120703,</div><div class='add'>+	0x81C, 0xF1140703,</div><div class='add'>+	0x81C, 0xF0160703,</div><div class='add'>+	0x81C, 0xEF180703,</div><div class='add'>+	0x81C, 0xEE1A0703,</div><div class='add'>+	0x81C, 0xED1C0703,</div><div class='add'>+	0x81C, 0xEC1E0703,</div><div class='add'>+	0x81C, 0xEB200703,</div><div class='add'>+	0x81C, 0xEA220703,</div><div class='add'>+	0x81C, 0xE9240703,</div><div class='add'>+	0x81C, 0xE8260703,</div><div class='add'>+	0x81C, 0xE7280703,</div><div class='add'>+	0x81C, 0xE62A0703,</div><div class='add'>+	0x81C, 0xE52C0703,</div><div class='add'>+	0x81C, 0xE42E0703,</div><div class='add'>+	0x81C, 0xE3300703,</div><div class='add'>+	0x81C, 0xE2320703,</div><div class='add'>+	0x81C, 0xE1340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xC23C0703,</div><div class='add'>+	0x81C, 0xC13E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0xA1460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x64500703,</div><div class='add'>+	0x81C, 0x63520703,</div><div class='add'>+	0x81C, 0x62540703,</div><div class='add'>+	0x81C, 0x61560703,</div><div class='add'>+	0x81C, 0x60580703,</div><div class='add'>+	0x81C, 0x235A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x04620703,</div><div class='add'>+	0x81C, 0x03640703,</div><div class='add'>+	0x81C, 0x02660703,</div><div class='add'>+	0x81C, 0x01680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF9000703,</div><div class='add'>+	0x81C, 0xF8020703,</div><div class='add'>+	0x81C, 0xF7040703,</div><div class='add'>+	0x81C, 0xF6060703,</div><div class='add'>+	0x81C, 0xF5080703,</div><div class='add'>+	0x81C, 0xF40A0703,</div><div class='add'>+	0x81C, 0xF30C0703,</div><div class='add'>+	0x81C, 0xF20E0703,</div><div class='add'>+	0x81C, 0xF1100703,</div><div class='add'>+	0x81C, 0xF0120703,</div><div class='add'>+	0x81C, 0xEF140703,</div><div class='add'>+	0x81C, 0xEE160703,</div><div class='add'>+	0x81C, 0xED180703,</div><div class='add'>+	0x81C, 0xEC1A0703,</div><div class='add'>+	0x81C, 0xEB1C0703,</div><div class='add'>+	0x81C, 0xEA1E0703,</div><div class='add'>+	0x81C, 0xC9200703,</div><div class='add'>+	0x81C, 0xC8220703,</div><div class='add'>+	0x81C, 0xC7240703,</div><div class='add'>+	0x81C, 0xC6260703,</div><div class='add'>+	0x81C, 0xC5280703,</div><div class='add'>+	0x81C, 0xC42A0703,</div><div class='add'>+	0x81C, 0xC32C0703,</div><div class='add'>+	0x81C, 0xC22E0703,</div><div class='add'>+	0x81C, 0xC1300703,</div><div class='add'>+	0x81C, 0xC0320703,</div><div class='add'>+	0x81C, 0xA3340703,</div><div class='add'>+	0x81C, 0xA2360703,</div><div class='add'>+	0x81C, 0xA1380703,</div><div class='add'>+	0x81C, 0xA03A0703,</div><div class='add'>+	0x81C, 0x823C0703,</div><div class='add'>+	0x81C, 0x813E0703,</div><div class='add'>+	0x81C, 0x80400703,</div><div class='add'>+	0x81C, 0x64420703,</div><div class='add'>+	0x81C, 0x63440703,</div><div class='add'>+	0x81C, 0x62460703,</div><div class='add'>+	0x81C, 0x61480703,</div><div class='add'>+	0x81C, 0x604A0703,</div><div class='add'>+	0x81C, 0x414C0703,</div><div class='add'>+	0x81C, 0x404E0703,</div><div class='add'>+	0x81C, 0x22500703,</div><div class='add'>+	0x81C, 0x21520703,</div><div class='add'>+	0x81C, 0x20540703,</div><div class='add'>+	0x81C, 0x03560703,</div><div class='add'>+	0x81C, 0x02580703,</div><div class='add'>+	0x81C, 0x015A0703,</div><div class='add'>+	0x81C, 0x005C0703,</div><div class='add'>+	0x81C, 0x005E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBE000703,</div><div class='add'>+	0x81C, 0xBD020703,</div><div class='add'>+	0x81C, 0xBC040703,</div><div class='add'>+	0x81C, 0xBB060703,</div><div class='add'>+	0x81C, 0xBA080703,</div><div class='add'>+	0x81C, 0xB90A0703,</div><div class='add'>+	0x81C, 0xB80C0703,</div><div class='add'>+	0x81C, 0xB70E0703,</div><div class='add'>+	0x81C, 0xB6100703,</div><div class='add'>+	0x81C, 0xB5120703,</div><div class='add'>+	0x81C, 0xB4140703,</div><div class='add'>+	0x81C, 0xB3160703,</div><div class='add'>+	0x81C, 0xB2180703,</div><div class='add'>+	0x81C, 0xB11A0703,</div><div class='add'>+	0x81C, 0xB01C0703,</div><div class='add'>+	0x81C, 0x921E0703,</div><div class='add'>+	0x81C, 0x91200703,</div><div class='add'>+	0x81C, 0x90220703,</div><div class='add'>+	0x81C, 0x8F240703,</div><div class='add'>+	0x81C, 0x8E260703,</div><div class='add'>+	0x81C, 0x8D280703,</div><div class='add'>+	0x81C, 0x8C2A0703,</div><div class='add'>+	0x81C, 0x6F2C0703,</div><div class='add'>+	0x81C, 0x6E2E0703,</div><div class='add'>+	0x81C, 0x6D300703,</div><div class='add'>+	0x81C, 0x6C320703,</div><div class='add'>+	0x81C, 0x6B340703,</div><div class='add'>+	0x81C, 0x6A360703,</div><div class='add'>+	0x81C, 0x69380703,</div><div class='add'>+	0x81C, 0x683A0703,</div><div class='add'>+	0x81C, 0x673C0703,</div><div class='add'>+	0x81C, 0x663E0703,</div><div class='add'>+	0x81C, 0x65400703,</div><div class='add'>+	0x81C, 0x64420703,</div><div class='add'>+	0x81C, 0x63440703,</div><div class='add'>+	0x81C, 0x62460703,</div><div class='add'>+	0x81C, 0x61480703,</div><div class='add'>+	0x81C, 0x604A0703,</div><div class='add'>+	0x81C, 0x424C0703,</div><div class='add'>+	0x81C, 0x414E0703,</div><div class='add'>+	0x81C, 0x40500703,</div><div class='add'>+	0x81C, 0x06520703,</div><div class='add'>+	0x81C, 0x05540703,</div><div class='add'>+	0x81C, 0x04560703,</div><div class='add'>+	0x81C, 0x03580703,</div><div class='add'>+	0x81C, 0x025A0703,</div><div class='add'>+	0x81C, 0x015C0703,</div><div class='add'>+	0x81C, 0x005E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000703,</div><div class='add'>+	0x81C, 0xFA020703,</div><div class='add'>+	0x81C, 0xF9040703,</div><div class='add'>+	0x81C, 0xF8060703,</div><div class='add'>+	0x81C, 0xF7080703,</div><div class='add'>+	0x81C, 0xF60A0703,</div><div class='add'>+	0x81C, 0xF50C0703,</div><div class='add'>+	0x81C, 0xF40E0703,</div><div class='add'>+	0x81C, 0xF3100703,</div><div class='add'>+	0x81C, 0xF2120703,</div><div class='add'>+	0x81C, 0xF1140703,</div><div class='add'>+	0x81C, 0xF0160703,</div><div class='add'>+	0x81C, 0xEF180703,</div><div class='add'>+	0x81C, 0xEE1A0703,</div><div class='add'>+	0x81C, 0xED1C0703,</div><div class='add'>+	0x81C, 0xEC1E0703,</div><div class='add'>+	0x81C, 0xEB200703,</div><div class='add'>+	0x81C, 0xEA220703,</div><div class='add'>+	0x81C, 0xE9240703,</div><div class='add'>+	0x81C, 0xE8260703,</div><div class='add'>+	0x81C, 0xE7280703,</div><div class='add'>+	0x81C, 0xE62A0703,</div><div class='add'>+	0x81C, 0xE52C0703,</div><div class='add'>+	0x81C, 0xE42E0703,</div><div class='add'>+	0x81C, 0xE3300703,</div><div class='add'>+	0x81C, 0xE2320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xC23C0703,</div><div class='add'>+	0x81C, 0xC13E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0xA1460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x63500703,</div><div class='add'>+	0x81C, 0x62520703,</div><div class='add'>+	0x81C, 0x43540703,</div><div class='add'>+	0x81C, 0x42560703,</div><div class='add'>+	0x81C, 0x41580703,</div><div class='add'>+	0x81C, 0x235A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x04620703,</div><div class='add'>+	0x81C, 0x03640703,</div><div class='add'>+	0x81C, 0x02660703,</div><div class='add'>+	0x81C, 0x01680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000703,</div><div class='add'>+	0x81C, 0xF7020703,</div><div class='add'>+	0x81C, 0xF6040703,</div><div class='add'>+	0x81C, 0xF5060703,</div><div class='add'>+	0x81C, 0xF4080703,</div><div class='add'>+	0x81C, 0xF30A0703,</div><div class='add'>+	0x81C, 0xF20C0703,</div><div class='add'>+	0x81C, 0xF10E0703,</div><div class='add'>+	0x81C, 0xF0100703,</div><div class='add'>+	0x81C, 0xEF120703,</div><div class='add'>+	0x81C, 0xEE140703,</div><div class='add'>+	0x81C, 0xED160703,</div><div class='add'>+	0x81C, 0xEC180703,</div><div class='add'>+	0x81C, 0xEB1A0703,</div><div class='add'>+	0x81C, 0xEA1C0703,</div><div class='add'>+	0x81C, 0xE91E0703,</div><div class='add'>+	0x81C, 0xCA200703,</div><div class='add'>+	0x81C, 0xC9220703,</div><div class='add'>+	0x81C, 0xC8240703,</div><div class='add'>+	0x81C, 0xC7260703,</div><div class='add'>+	0x81C, 0xC6280703,</div><div class='add'>+	0x81C, 0xC52A0703,</div><div class='add'>+	0x81C, 0xC42C0703,</div><div class='add'>+	0x81C, 0xC32E0703,</div><div class='add'>+	0x81C, 0xC2300703,</div><div class='add'>+	0x81C, 0xC1320703,</div><div class='add'>+	0x81C, 0xA3340703,</div><div class='add'>+	0x81C, 0xA2360703,</div><div class='add'>+	0x81C, 0xA1380703,</div><div class='add'>+	0x81C, 0xA03A0703,</div><div class='add'>+	0x81C, 0x823C0703,</div><div class='add'>+	0x81C, 0x813E0703,</div><div class='add'>+	0x81C, 0x80400703,</div><div class='add'>+	0x81C, 0x65420703,</div><div class='add'>+	0x81C, 0x64440703,</div><div class='add'>+	0x81C, 0x63460703,</div><div class='add'>+	0x81C, 0x62480703,</div><div class='add'>+	0x81C, 0x614A0703,</div><div class='add'>+	0x81C, 0x424C0703,</div><div class='add'>+	0x81C, 0x414E0703,</div><div class='add'>+	0x81C, 0x40500703,</div><div class='add'>+	0x81C, 0x22520703,</div><div class='add'>+	0x81C, 0x21540703,</div><div class='add'>+	0x81C, 0x20560703,</div><div class='add'>+	0x81C, 0x04580703,</div><div class='add'>+	0x81C, 0x035A0703,</div><div class='add'>+	0x81C, 0x025C0703,</div><div class='add'>+	0x81C, 0x015E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x9000000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000703,</div><div class='add'>+	0x81C, 0xFB020703,</div><div class='add'>+	0x81C, 0xFA040703,</div><div class='add'>+	0x81C, 0xF9060703,</div><div class='add'>+	0x81C, 0xF8080703,</div><div class='add'>+	0x81C, 0xF70A0703,</div><div class='add'>+	0x81C, 0xF60C0703,</div><div class='add'>+	0x81C, 0xF50E0703,</div><div class='add'>+	0x81C, 0xF4100703,</div><div class='add'>+	0x81C, 0xF3120703,</div><div class='add'>+	0x81C, 0xF2140703,</div><div class='add'>+	0x81C, 0xF1160703,</div><div class='add'>+	0x81C, 0xEF180703,</div><div class='add'>+	0x81C, 0xEE1A0703,</div><div class='add'>+	0x81C, 0xED1C0703,</div><div class='add'>+	0x81C, 0xEC1E0703,</div><div class='add'>+	0x81C, 0xEB200703,</div><div class='add'>+	0x81C, 0xEA220703,</div><div class='add'>+	0x81C, 0xE9240703,</div><div class='add'>+	0x81C, 0xE8260703,</div><div class='add'>+	0x81C, 0xE7280703,</div><div class='add'>+	0x81C, 0xE62A0703,</div><div class='add'>+	0x81C, 0xE52C0703,</div><div class='add'>+	0x81C, 0xE42E0703,</div><div class='add'>+	0x81C, 0xE3300703,</div><div class='add'>+	0x81C, 0xE2320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xA63C0703,</div><div class='add'>+	0x81C, 0xA53E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0xA1460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x63500703,</div><div class='add'>+	0x81C, 0x62520703,</div><div class='add'>+	0x81C, 0x61540703,</div><div class='add'>+	0x81C, 0x42560703,</div><div class='add'>+	0x81C, 0x41580703,</div><div class='add'>+	0x81C, 0x405A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x04620703,</div><div class='add'>+	0x81C, 0x03640703,</div><div class='add'>+	0x81C, 0x02660703,</div><div class='add'>+	0x81C, 0x01680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x9000000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF8000703,</div><div class='add'>+	0x81C, 0xF7020703,</div><div class='add'>+	0x81C, 0xF6040703,</div><div class='add'>+	0x81C, 0xF5060703,</div><div class='add'>+	0x81C, 0xF4080703,</div><div class='add'>+	0x81C, 0xF30A0703,</div><div class='add'>+	0x81C, 0xF20C0703,</div><div class='add'>+	0x81C, 0xF10E0703,</div><div class='add'>+	0x81C, 0xF0100703,</div><div class='add'>+	0x81C, 0xEF120703,</div><div class='add'>+	0x81C, 0xEE140703,</div><div class='add'>+	0x81C, 0xED160703,</div><div class='add'>+	0x81C, 0xEC180703,</div><div class='add'>+	0x81C, 0xEB1A0703,</div><div class='add'>+	0x81C, 0xEA1C0703,</div><div class='add'>+	0x81C, 0xE91E0703,</div><div class='add'>+	0x81C, 0xCA200703,</div><div class='add'>+	0x81C, 0xC9220703,</div><div class='add'>+	0x81C, 0xC8240703,</div><div class='add'>+	0x81C, 0xC7260703,</div><div class='add'>+	0x81C, 0xC6280703,</div><div class='add'>+	0x81C, 0xC52A0703,</div><div class='add'>+	0x81C, 0xC42C0703,</div><div class='add'>+	0x81C, 0xC32E0703,</div><div class='add'>+	0x81C, 0xC2300703,</div><div class='add'>+	0x81C, 0xC1320703,</div><div class='add'>+	0x81C, 0xA3340703,</div><div class='add'>+	0x81C, 0xA2360703,</div><div class='add'>+	0x81C, 0xA1380703,</div><div class='add'>+	0x81C, 0xA03A0703,</div><div class='add'>+	0x81C, 0x823C0703,</div><div class='add'>+	0x81C, 0x813E0703,</div><div class='add'>+	0x81C, 0x80400703,</div><div class='add'>+	0x81C, 0x64420703,</div><div class='add'>+	0x81C, 0x63440703,</div><div class='add'>+	0x81C, 0x62460703,</div><div class='add'>+	0x81C, 0x61480703,</div><div class='add'>+	0x81C, 0x604A0703,</div><div class='add'>+	0x81C, 0x234C0703,</div><div class='add'>+	0x81C, 0x224E0703,</div><div class='add'>+	0x81C, 0x21500703,</div><div class='add'>+	0x81C, 0x20520703,</div><div class='add'>+	0x81C, 0x06540703,</div><div class='add'>+	0x81C, 0x05560703,</div><div class='add'>+	0x81C, 0x04580703,</div><div class='add'>+	0x81C, 0x035A0703,</div><div class='add'>+	0x81C, 0x025C0703,</div><div class='add'>+	0x81C, 0x015E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x9000000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000703,</div><div class='add'>+	0x81C, 0xFB020703,</div><div class='add'>+	0x81C, 0xFA040703,</div><div class='add'>+	0x81C, 0xF9060703,</div><div class='add'>+	0x81C, 0xF8080703,</div><div class='add'>+	0x81C, 0xF70A0703,</div><div class='add'>+	0x81C, 0xF60C0703,</div><div class='add'>+	0x81C, 0xF50E0703,</div><div class='add'>+	0x81C, 0xF4100703,</div><div class='add'>+	0x81C, 0xF3120703,</div><div class='add'>+	0x81C, 0xF2140703,</div><div class='add'>+	0x81C, 0xF1160703,</div><div class='add'>+	0x81C, 0xF0180703,</div><div class='add'>+	0x81C, 0xEF1A0703,</div><div class='add'>+	0x81C, 0xEE1C0703,</div><div class='add'>+	0x81C, 0xED1E0703,</div><div class='add'>+	0x81C, 0xEC200703,</div><div class='add'>+	0x81C, 0xEB220703,</div><div class='add'>+	0x81C, 0xEA240703,</div><div class='add'>+	0x81C, 0xE9260703,</div><div class='add'>+	0x81C, 0xE8280703,</div><div class='add'>+	0x81C, 0xE72A0703,</div><div class='add'>+	0x81C, 0xE62C0703,</div><div class='add'>+	0x81C, 0xE52E0703,</div><div class='add'>+	0x81C, 0xE4300703,</div><div class='add'>+	0x81C, 0xE3320703,</div><div class='add'>+	0x81C, 0xE2340703,</div><div class='add'>+	0x81C, 0xC6360703,</div><div class='add'>+	0x81C, 0xC5380703,</div><div class='add'>+	0x81C, 0xC43A0703,</div><div class='add'>+	0x81C, 0xC33C0703,</div><div class='add'>+	0x81C, 0xA63E0703,</div><div class='add'>+	0x81C, 0xA5400703,</div><div class='add'>+	0x81C, 0xA4420703,</div><div class='add'>+	0x81C, 0xA3440703,</div><div class='add'>+	0x81C, 0xA2460703,</div><div class='add'>+	0x81C, 0x84480703,</div><div class='add'>+	0x81C, 0x834A0703,</div><div class='add'>+	0x81C, 0x824C0703,</div><div class='add'>+	0x81C, 0x814E0703,</div><div class='add'>+	0x81C, 0x80500703,</div><div class='add'>+	0x81C, 0x63520703,</div><div class='add'>+	0x81C, 0x62540703,</div><div class='add'>+	0x81C, 0x61560703,</div><div class='add'>+	0x81C, 0x60580703,</div><div class='add'>+	0x81C, 0x225A0703,</div><div class='add'>+	0x81C, 0x055C0703,</div><div class='add'>+	0x81C, 0x045E0703,</div><div class='add'>+	0x81C, 0x03600703,</div><div class='add'>+	0x81C, 0x02620703,</div><div class='add'>+	0x81C, 0x01640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000703,</div><div class='add'>+	0x81C, 0xFA020703,</div><div class='add'>+	0x81C, 0xF9040703,</div><div class='add'>+	0x81C, 0xF8060703,</div><div class='add'>+	0x81C, 0xF7080703,</div><div class='add'>+	0x81C, 0xF60A0703,</div><div class='add'>+	0x81C, 0xF50C0703,</div><div class='add'>+	0x81C, 0xF40E0703,</div><div class='add'>+	0x81C, 0xF3100703,</div><div class='add'>+	0x81C, 0xF2120703,</div><div class='add'>+	0x81C, 0xF1140703,</div><div class='add'>+	0x81C, 0xEF160703,</div><div class='add'>+	0x81C, 0xEE180703,</div><div class='add'>+	0x81C, 0xED1A0703,</div><div class='add'>+	0x81C, 0xEC1C0703,</div><div class='add'>+	0x81C, 0xEB1E0703,</div><div class='add'>+	0x81C, 0xEA200703,</div><div class='add'>+	0x81C, 0xE9220703,</div><div class='add'>+	0x81C, 0xE8240703,</div><div class='add'>+	0x81C, 0xE7260703,</div><div class='add'>+	0x81C, 0xE6280703,</div><div class='add'>+	0x81C, 0xE52A0703,</div><div class='add'>+	0x81C, 0xE42C0703,</div><div class='add'>+	0x81C, 0xE32E0703,</div><div class='add'>+	0x81C, 0xE2300703,</div><div class='add'>+	0x81C, 0xE1320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xA63C0703,</div><div class='add'>+	0x81C, 0xA53E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0xA1460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x63500703,</div><div class='add'>+	0x81C, 0x62520703,</div><div class='add'>+	0x81C, 0x61540703,</div><div class='add'>+	0x81C, 0x42560703,</div><div class='add'>+	0x81C, 0x41580703,</div><div class='add'>+	0x81C, 0x405A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x04620703,</div><div class='add'>+	0x81C, 0x03640703,</div><div class='add'>+	0x81C, 0x02660703,</div><div class='add'>+	0x81C, 0x01680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFB000703,</div><div class='add'>+	0x81C, 0xFA020703,</div><div class='add'>+	0x81C, 0xF9040703,</div><div class='add'>+	0x81C, 0xF8060703,</div><div class='add'>+	0x81C, 0xF7080703,</div><div class='add'>+	0x81C, 0xF60A0703,</div><div class='add'>+	0x81C, 0xF50C0703,</div><div class='add'>+	0x81C, 0xF40E0703,</div><div class='add'>+	0x81C, 0xF3100703,</div><div class='add'>+	0x81C, 0xF2120703,</div><div class='add'>+	0x81C, 0xF1140703,</div><div class='add'>+	0x81C, 0xEF160703,</div><div class='add'>+	0x81C, 0xEE180703,</div><div class='add'>+	0x81C, 0xED1A0703,</div><div class='add'>+	0x81C, 0xEC1C0703,</div><div class='add'>+	0x81C, 0xEB1E0703,</div><div class='add'>+	0x81C, 0xEA200703,</div><div class='add'>+	0x81C, 0xE9220703,</div><div class='add'>+	0x81C, 0xE8240703,</div><div class='add'>+	0x81C, 0xE7260703,</div><div class='add'>+	0x81C, 0xE6280703,</div><div class='add'>+	0x81C, 0xE52A0703,</div><div class='add'>+	0x81C, 0xE42C0703,</div><div class='add'>+	0x81C, 0xE32E0703,</div><div class='add'>+	0x81C, 0xE2300703,</div><div class='add'>+	0x81C, 0xE1320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xA63C0703,</div><div class='add'>+	0x81C, 0xA53E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0xA1460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x63500703,</div><div class='add'>+	0x81C, 0x62520703,</div><div class='add'>+	0x81C, 0x61540703,</div><div class='add'>+	0x81C, 0x42560703,</div><div class='add'>+	0x81C, 0x41580703,</div><div class='add'>+	0x81C, 0x405A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x04620703,</div><div class='add'>+	0x81C, 0x03640703,</div><div class='add'>+	0x81C, 0x02660703,</div><div class='add'>+	0x81C, 0x01680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x9000000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xBF000703,</div><div class='add'>+	0x81C, 0xBF020703,</div><div class='add'>+	0x81C, 0xBF040703,</div><div class='add'>+	0x81C, 0xBF060703,</div><div class='add'>+	0x81C, 0xBF080703,</div><div class='add'>+	0x81C, 0xBE0A0703,</div><div class='add'>+	0x81C, 0xBD0C0703,</div><div class='add'>+	0x81C, 0xBC0E0703,</div><div class='add'>+	0x81C, 0xBB100703,</div><div class='add'>+	0x81C, 0xBA120703,</div><div class='add'>+	0x81C, 0xB9140703,</div><div class='add'>+	0x81C, 0xB8160703,</div><div class='add'>+	0x81C, 0xB7180703,</div><div class='add'>+	0x81C, 0xB61A0703,</div><div class='add'>+	0x81C, 0xB51C0703,</div><div class='add'>+	0x81C, 0xB41E0703,</div><div class='add'>+	0x81C, 0xB1200703,</div><div class='add'>+	0x81C, 0xB2220703,</div><div class='add'>+	0x81C, 0xB1240703,</div><div class='add'>+	0x81C, 0xB0260703,</div><div class='add'>+	0x81C, 0xAF280703,</div><div class='add'>+	0x81C, 0xAE2A0703,</div><div class='add'>+	0x81C, 0xAD2C0703,</div><div class='add'>+	0x81C, 0xAC2E0703,</div><div class='add'>+	0x81C, 0xAB300703,</div><div class='add'>+	0x81C, 0xAA320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0x883C0703,</div><div class='add'>+	0x81C, 0x873E0703,</div><div class='add'>+	0x81C, 0x86400703,</div><div class='add'>+	0x81C, 0x85420703,</div><div class='add'>+	0x81C, 0x84440703,</div><div class='add'>+	0x81C, 0x83460703,</div><div class='add'>+	0x81C, 0x67480703,</div><div class='add'>+	0x81C, 0x664A0703,</div><div class='add'>+	0x81C, 0x654C0703,</div><div class='add'>+	0x81C, 0x644E0703,</div><div class='add'>+	0x81C, 0x27500703,</div><div class='add'>+	0x81C, 0x26520703,</div><div class='add'>+	0x81C, 0x25540703,</div><div class='add'>+	0x81C, 0x24560703,</div><div class='add'>+	0x81C, 0x23580703,</div><div class='add'>+	0x81C, 0x225A0703,</div><div class='add'>+	0x81C, 0x215C0703,</div><div class='add'>+	0x81C, 0x205E0703,</div><div class='add'>+	0x81C, 0x03600703,</div><div class='add'>+	0x81C, 0x02620703,</div><div class='add'>+	0x81C, 0x01640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000403,</div><div class='add'>+	0x81C, 0xFB000703,</div><div class='add'>+	0x81C, 0xFA020703,</div><div class='add'>+	0x81C, 0xF9040703,</div><div class='add'>+	0x81C, 0xF8060703,</div><div class='add'>+	0x81C, 0xF7080703,</div><div class='add'>+	0x81C, 0xF60A0703,</div><div class='add'>+	0x81C, 0xF50C0703,</div><div class='add'>+	0x81C, 0xF40E0703,</div><div class='add'>+	0x81C, 0xF3100703,</div><div class='add'>+	0x81C, 0xF2120703,</div><div class='add'>+	0x81C, 0xF1140703,</div><div class='add'>+	0x81C, 0xF0160703,</div><div class='add'>+	0x81C, 0xEF180703,</div><div class='add'>+	0x81C, 0xEE1A0703,</div><div class='add'>+	0x81C, 0xED1C0703,</div><div class='add'>+	0x81C, 0xEC1E0703,</div><div class='add'>+	0x81C, 0xEB200703,</div><div class='add'>+	0x81C, 0xEA220703,</div><div class='add'>+	0x81C, 0xE9240703,</div><div class='add'>+	0x81C, 0xE8260703,</div><div class='add'>+	0x81C, 0xE7280703,</div><div class='add'>+	0x81C, 0xE62A0703,</div><div class='add'>+	0x81C, 0xE52C0703,</div><div class='add'>+	0x81C, 0xE42E0703,</div><div class='add'>+	0x81C, 0xE3300703,</div><div class='add'>+	0x81C, 0xE2320703,</div><div class='add'>+	0x81C, 0xC6340703,</div><div class='add'>+	0x81C, 0xC5360703,</div><div class='add'>+	0x81C, 0xC4380703,</div><div class='add'>+	0x81C, 0xC33A0703,</div><div class='add'>+	0x81C, 0xA63C0703,</div><div class='add'>+	0x81C, 0xA53E0703,</div><div class='add'>+	0x81C, 0xA4400703,</div><div class='add'>+	0x81C, 0xA3420703,</div><div class='add'>+	0x81C, 0xA2440703,</div><div class='add'>+	0x81C, 0x84460703,</div><div class='add'>+	0x81C, 0x83480703,</div><div class='add'>+	0x81C, 0x824A0703,</div><div class='add'>+	0x81C, 0x814C0703,</div><div class='add'>+	0x81C, 0x804E0703,</div><div class='add'>+	0x81C, 0x63500703,</div><div class='add'>+	0x81C, 0x62520703,</div><div class='add'>+	0x81C, 0x61540703,</div><div class='add'>+	0x81C, 0x60560703,</div><div class='add'>+	0x81C, 0x22580703,</div><div class='add'>+	0x81C, 0x055A0703,</div><div class='add'>+	0x81C, 0x045C0703,</div><div class='add'>+	0x81C, 0x035E0703,</div><div class='add'>+	0x81C, 0x02600703,</div><div class='add'>+	0x81C, 0x01620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x90000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x81C, 0xF7000703,</div><div class='add'>+	0x81C, 0xF6020703,</div><div class='add'>+	0x81C, 0xF5040703,</div><div class='add'>+	0x81C, 0xF4060703,</div><div class='add'>+	0x81C, 0xF3080703,</div><div class='add'>+	0x81C, 0xF20A0703,</div><div class='add'>+	0x81C, 0xF10C0703,</div><div class='add'>+	0x81C, 0xF00E0703,</div><div class='add'>+	0x81C, 0xEF100703,</div><div class='add'>+	0x81C, 0xEE120703,</div><div class='add'>+	0x81C, 0xED140703,</div><div class='add'>+	0x81C, 0xEC160703,</div><div class='add'>+	0x81C, 0xEB180703,</div><div class='add'>+	0x81C, 0xEA1A0703,</div><div class='add'>+	0x81C, 0xE91C0703,</div><div class='add'>+	0x81C, 0xCA1E0703,</div><div class='add'>+	0x81C, 0xC9200703,</div><div class='add'>+	0x81C, 0xC8220703,</div><div class='add'>+	0x81C, 0xC7240703,</div><div class='add'>+	0x81C, 0xC6260703,</div><div class='add'>+	0x81C, 0xC5280703,</div><div class='add'>+	0x81C, 0xC42A0703,</div><div class='add'>+	0x81C, 0xC32C0703,</div><div class='add'>+	0x81C, 0xC22E0703,</div><div class='add'>+	0x81C, 0xC1300703,</div><div class='add'>+	0x81C, 0xA4320703,</div><div class='add'>+	0x81C, 0xA3340703,</div><div class='add'>+	0x81C, 0xA2360703,</div><div class='add'>+	0x81C, 0xA1380703,</div><div class='add'>+	0x81C, 0xA03A0703,</div><div class='add'>+	0x81C, 0x823C0703,</div><div class='add'>+	0x81C, 0x813E0703,</div><div class='add'>+	0x81C, 0x80400703,</div><div class='add'>+	0x81C, 0x64420703,</div><div class='add'>+	0x81C, 0x63440703,</div><div class='add'>+	0x81C, 0x62460703,</div><div class='add'>+	0x81C, 0x61480703,</div><div class='add'>+	0x81C, 0x604A0703,</div><div class='add'>+	0x81C, 0x414C0703,</div><div class='add'>+	0x81C, 0x404E0703,</div><div class='add'>+	0x81C, 0x22500703,</div><div class='add'>+	0x81C, 0x21520703,</div><div class='add'>+	0x81C, 0x20540703,</div><div class='add'>+	0x81C, 0x03560703,</div><div class='add'>+	0x81C, 0x02580703,</div><div class='add'>+	0x81C, 0x015A0703,</div><div class='add'>+	0x81C, 0x005C0703,</div><div class='add'>+	0x81C, 0x005E0703,</div><div class='add'>+	0x81C, 0x00600703,</div><div class='add'>+	0x81C, 0x00620703,</div><div class='add'>+	0x81C, 0x00640703,</div><div class='add'>+	0x81C, 0x00660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x81C, 0xFC000703,</div><div class='add'>+	0x81C, 0xFB020703,</div><div class='add'>+	0x81C, 0xFA040703,</div><div class='add'>+	0x81C, 0xF9060703,</div><div class='add'>+	0x81C, 0xF8080703,</div><div class='add'>+	0x81C, 0xF70A0703,</div><div class='add'>+	0x81C, 0xF60C0703,</div><div class='add'>+	0x81C, 0xF50E0703,</div><div class='add'>+	0x81C, 0xF4100703,</div><div class='add'>+	0x81C, 0xF3120703,</div><div class='add'>+	0x81C, 0xF2140703,</div><div class='add'>+	0x81C, 0xF1160703,</div><div class='add'>+	0x81C, 0xF0180703,</div><div class='add'>+	0x81C, 0xEF1A0703,</div><div class='add'>+	0x81C, 0xEE1C0703,</div><div class='add'>+	0x81C, 0xED1E0703,</div><div class='add'>+	0x81C, 0xEC200703,</div><div class='add'>+	0x81C, 0xEB220703,</div><div class='add'>+	0x81C, 0xEA240703,</div><div class='add'>+	0x81C, 0xE9260703,</div><div class='add'>+	0x81C, 0xE8280703,</div><div class='add'>+	0x81C, 0xE72A0703,</div><div class='add'>+	0x81C, 0xE62C0703,</div><div class='add'>+	0x81C, 0xE52E0703,</div><div class='add'>+	0x81C, 0xE4300703,</div><div class='add'>+	0x81C, 0xE3320703,</div><div class='add'>+	0x81C, 0xE2340703,</div><div class='add'>+	0x81C, 0xC6360703,</div><div class='add'>+	0x81C, 0xC5380703,</div><div class='add'>+	0x81C, 0xC43A0703,</div><div class='add'>+	0x81C, 0xC33C0703,</div><div class='add'>+	0x81C, 0xA63E0703,</div><div class='add'>+	0x81C, 0xA5400703,</div><div class='add'>+	0x81C, 0xA4420703,</div><div class='add'>+	0x81C, 0xA3440703,</div><div class='add'>+	0x81C, 0xA2460703,</div><div class='add'>+	0x81C, 0x84480703,</div><div class='add'>+	0x81C, 0x834A0703,</div><div class='add'>+	0x81C, 0x824C0703,</div><div class='add'>+	0x81C, 0x814E0703,</div><div class='add'>+	0x81C, 0x80500703,</div><div class='add'>+	0x81C, 0x63520703,</div><div class='add'>+	0x81C, 0x62540703,</div><div class='add'>+	0x81C, 0x61560703,</div><div class='add'>+	0x81C, 0x60580703,</div><div class='add'>+	0x81C, 0x235A0703,</div><div class='add'>+	0x81C, 0x225C0703,</div><div class='add'>+	0x81C, 0x215E0703,</div><div class='add'>+	0x81C, 0x20600703,</div><div class='add'>+	0x81C, 0x03620703,</div><div class='add'>+	0x81C, 0x02640703,</div><div class='add'>+	0x81C, 0x01660703,</div><div class='add'>+	0x81C, 0x00680703,</div><div class='add'>+	0x81C, 0x006A0703,</div><div class='add'>+	0x81C, 0x006C0703,</div><div class='add'>+	0x81C, 0x006E0703,</div><div class='add'>+	0x81C, 0x00700703,</div><div class='add'>+	0x81C, 0x00720703,</div><div class='add'>+	0x81C, 0x00740703,</div><div class='add'>+	0x81C, 0x00760703,</div><div class='add'>+	0x81C, 0x00780703,</div><div class='add'>+	0x81C, 0x007A0703,</div><div class='add'>+	0x81C, 0x007C0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0x81C, 0x007E0703,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x80000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0xC50, 0x00000022,</div><div class='add'>+	0xC50, 0x00000020,</div><div class='add'>+	0xE50, 0x00000022,</div><div class='add'>+	0xE50, 0x00000020,</div><div class='add'>+	0x9000000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0xC50, 0x00000022,</div><div class='add'>+	0xC50, 0x00000020,</div><div class='add'>+	0xE50, 0x00000022,</div><div class='add'>+	0xE50, 0x00000020,</div><div class='add'>+	0x9000000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0xC50, 0x00000022,</div><div class='add'>+	0xC50, 0x00000020,</div><div class='add'>+	0xE50, 0x00000022,</div><div class='add'>+	0xE50, 0x00000020,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0xC50, 0x00000022,</div><div class='add'>+	0xC50, 0x00000020,</div><div class='add'>+	0xE50, 0x00000022,</div><div class='add'>+	0xE50, 0x00000020,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822b_agc, rtw_phy_cfg_agc);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_bb[] = {</div><div class='add'>+	0x800, 0x9020D010,</div><div class='add'>+	0x804, 0x800181A0,</div><div class='add'>+	0x808, 0x0E028233,</div><div class='add'>+	0x80C, 0x10000013,</div><div class='add'>+	0x810, 0x22101243,</div><div class='add'>+	0x814, 0x020C3D11,</div><div class='add'>+	0x818, 0x84A10385,</div><div class='add'>+	0x81C, 0x1E1E081F,</div><div class='add'>+	0x820, 0x0001AAAA,</div><div class='add'>+	0x824, 0x00030FE0,</div><div class='add'>+	0x828, 0x0000CCCC,</div><div class='add'>+	0x82C, 0x75CB7010,</div><div class='add'>+	0x830, 0x79A0EAAA,</div><div class='add'>+	0x834, 0x072E6986,</div><div class='add'>+	0x838, 0x87766441,</div><div class='add'>+	0x83C, 0x9194B2B7,</div><div class='add'>+	0x840, 0x171750E0,</div><div class='add'>+	0x844, 0x4D3D7CDB,</div><div class='add'>+	0x848, 0x4AD0408B,</div><div class='add'>+	0x84C, 0x6AFBF7A5,</div><div class='add'>+	0x850, 0x28A74706,</div><div class='add'>+	0x854, 0x0001520C,</div><div class='add'>+	0x858, 0x4060C000,</div><div class='add'>+	0x85C, 0x74010160,</div><div class='add'>+	0x860, 0x68A7C321,</div><div class='add'>+	0x864, 0x79F27032,</div><div class='add'>+	0x868, 0x8CA7A314,</div><div class='add'>+	0x86C, 0x778C2878,</div><div class='add'>+	0x870, 0x77777777,</div><div class='add'>+	0x874, 0x27612C2E,</div><div class='add'>+	0x878, 0xC0003152,</div><div class='add'>+	0x87C, 0x5C8FC000,</div><div class='add'>+	0x880, 0x00000000,</div><div class='add'>+	0x884, 0x00000000,</div><div class='add'>+	0x888, 0x00000000,</div><div class='add'>+	0x88C, 0x00000000,</div><div class='add'>+	0x890, 0x00000000,</div><div class='add'>+	0x894, 0x00000000,</div><div class='add'>+	0x898, 0x00000000,</div><div class='add'>+	0x89C, 0x00000000,</div><div class='add'>+	0x8A0, 0x00000013,</div><div class='add'>+	0x8A4, 0x7F7F7F7F,</div><div class='add'>+	0x8A8, 0x2202033E,</div><div class='add'>+	0x8AC, 0xF00F000A,</div><div class='add'>+	0x8B0, 0x00000600,</div><div class='add'>+	0x8B4, 0x000FC080,</div><div class='add'>+	0x8B8, 0xEC0057F7,</div><div class='add'>+	0x8BC, 0xACB520A3,</div><div class='add'>+	0x8C0, 0xFFE04020,</div><div class='add'>+	0x8C4, 0x47C00000,</div><div class='add'>+	0x8C8, 0x000251A5,</div><div class='add'>+	0x8CC, 0x08108492,</div><div class='add'>+	0x8D0, 0x0000B800,</div><div class='add'>+	0x8D4, 0x860308A0,</div><div class='add'>+	0x8D8, 0x29095612,</div><div class='add'>+	0x8DC, 0x00000000,</div><div class='add'>+	0x8E0, 0x32D16777,</div><div class='add'>+	0x8E4, 0x4C098935,</div><div class='add'>+	0x8E8, 0xFFFFC42C,</div><div class='add'>+	0x8EC, 0x99999999,</div><div class='add'>+	0x8F0, 0x00009999,</div><div class='add'>+	0x8F4, 0x00D80FA1,</div><div class='add'>+	0x8F8, 0x40000080,</div><div class='add'>+	0x8FC, 0x00000130,</div><div class='add'>+	0x900, 0x00800000,</div><div class='add'>+	0x904, 0x00000000,</div><div class='add'>+	0x908, 0x00000000,</div><div class='add'>+	0x90C, 0xD3000000,</div><div class='add'>+	0x910, 0x0000FC00,</div><div class='add'>+	0x914, 0xC6380000,</div><div class='add'>+	0x918, 0x1C1028C0,</div><div class='add'>+	0x91C, 0x64B11A1C,</div><div class='add'>+	0x920, 0xE0767233,</div><div class='add'>+	0x924, 0x855A2500,</div><div class='add'>+	0x928, 0x4AB0E4E4,</div><div class='add'>+	0x92C, 0xFFFEB200,</div><div class='add'>+	0x930, 0xFFFFFFFE,</div><div class='add'>+	0x934, 0x001FFFFF,</div><div class='add'>+	0x938, 0x00008480,</div><div class='add'>+	0x93C, 0xE41C0642,</div><div class='add'>+	0x940, 0x0E470430,</div><div class='add'>+	0x944, 0x00000000,</div><div class='add'>+	0x948, 0xAC000000,</div><div class='add'>+	0x94C, 0x10000083,</div><div class='add'>+	0x950, 0x32010080,</div><div class='add'>+	0x954, 0x84510080,</div><div class='add'>+	0x958, 0x00000001,</div><div class='add'>+	0x95C, 0x04248000,</div><div class='add'>+	0x960, 0x00000000,</div><div class='add'>+	0x964, 0x00000000,</div><div class='add'>+	0x968, 0x00000000,</div><div class='add'>+	0x96C, 0x00000000,</div><div class='add'>+	0x970, 0x00001FFF,</div><div class='add'>+	0x974, 0x44000FFF,</div><div class='add'>+	0x978, 0x00000000,</div><div class='add'>+	0x97C, 0x00000000,</div><div class='add'>+	0x980, 0x00000000,</div><div class='add'>+	0x984, 0x00000000,</div><div class='add'>+	0x988, 0x00000000,</div><div class='add'>+	0x98C, 0x43440000,</div><div class='add'>+	0x990, 0x27100000,</div><div class='add'>+	0x994, 0xFFFF0100,</div><div class='add'>+	0x998, 0xFFFFFF5C,</div><div class='add'>+	0x99C, 0xFFFFFFFF,</div><div class='add'>+	0x9A0, 0x000000FF,</div><div class='add'>+	0x9A4, 0x80000088,</div><div class='add'>+	0x9A8, 0x0C2F0000,</div><div class='add'>+	0x9AC, 0x01560000,</div><div class='add'>+	0x9B0, 0x70000000,</div><div class='add'>+	0x9B4, 0x00000000,</div><div class='add'>+	0x9B8, 0x00000000,</div><div class='add'>+	0x9BC, 0x00000000,</div><div class='add'>+	0x9C0, 0x00000000,</div><div class='add'>+	0x9C4, 0x00000000,</div><div class='add'>+	0x9C8, 0x00000000,</div><div class='add'>+	0x9CC, 0x00000000,</div><div class='add'>+	0x9D0, 0x00000000,</div><div class='add'>+	0x9D4, 0x00000000,</div><div class='add'>+	0x9D8, 0x00000000,</div><div class='add'>+	0x9DC, 0x00000000,</div><div class='add'>+	0x9E0, 0x00000000,</div><div class='add'>+	0x9E4, 0x02000402,</div><div class='add'>+	0x9E8, 0x000022D4,</div><div class='add'>+	0x9EC, 0x00000000,</div><div class='add'>+	0x9F0, 0x00010080,</div><div class='add'>+	0x9F4, 0x00000000,</div><div class='add'>+	0x9F8, 0x00000000,</div><div class='add'>+	0x9FC, 0xEFFFF7F7,</div><div class='add'>+	0xA00, 0x00D047C8,</div><div class='add'>+	0xA04, 0x81FF800C,</div><div class='add'>+	0xA08, 0x8C838300,</div><div class='add'>+	0xA0C, 0x2E20100F,</div><div class='add'>+	0xA10, 0x9500BB78,</div><div class='add'>+	0xA14, 0x1114D028,</div><div class='add'>+	0xA18, 0x00881117,</div><div class='add'>+	0xA1C, 0x89140F00,</div><div class='add'>+	0xA20, 0x84880000,</div><div class='add'>+	0xA24, 0x384F6577,</div><div class='add'>+	0xA28, 0x00001525,</div><div class='add'>+	0xA2C, 0x00920000,</div><div class='add'>+	0xA70, 0x101FFF00,</div><div class='add'>+	0xA74, 0x00000148,</div><div class='add'>+	0xA78, 0x00000900,</div><div class='add'>+	0xA7C, 0x225B0606,</div><div class='add'>+	0xA80, 0x218675B2,</div><div class='add'>+	0xA84, 0x80208C00,</div><div class='add'>+	0xA88, 0x040C0000,</div><div class='add'>+	0xA8C, 0x12345678,</div><div class='add'>+	0xA90, 0xABCDEF00,</div><div class='add'>+	0xA94, 0x001B1B89,</div><div class='add'>+	0xA98, 0x030A0000,</div><div class='add'>+	0xA9C, 0x00060000,</div><div class='add'>+	0xAA0, 0x00000000,</div><div class='add'>+	0xAA4, 0x0004000F,</div><div class='add'>+	0xAA8, 0x00000200,</div><div class='add'>+	0xB00, 0xE1000440,</div><div class='add'>+	0xB04, 0x00800000,</div><div class='add'>+	0xB08, 0xFF02030B,</div><div class='add'>+	0xB0C, 0x01EAA406,</div><div class='add'>+	0xB10, 0x00030690,</div><div class='add'>+	0xB14, 0x006000FA,</div><div class='add'>+	0xB18, 0x00000002,</div><div class='add'>+	0xB1C, 0x00000002,</div><div class='add'>+	0xB20, 0x4B00001F,</div><div class='add'>+	0xB24, 0x4E8E3E40,</div><div class='add'>+	0xB28, 0x03020100,</div><div class='add'>+	0xB2C, 0x07060504,</div><div class='add'>+	0xB30, 0x0B0A0908,</div><div class='add'>+	0xB34, 0x0F0E0D0C,</div><div class='add'>+	0xB38, 0x13121110,</div><div class='add'>+	0xB3C, 0x0000003A,</div><div class='add'>+	0xB40, 0x00000000,</div><div class='add'>+	0xB44, 0x80000000,</div><div class='add'>+	0xB48, 0x3F0000FA,</div><div class='add'>+	0xB4C, 0x88C80020,</div><div class='add'>+	0xB50, 0x00000000,</div><div class='add'>+	0xB54, 0x00004241,</div><div class='add'>+	0xB58, 0xE0008208,</div><div class='add'>+	0xB5C, 0x41EFFFF9,</div><div class='add'>+	0xB60, 0x00000000,</div><div class='add'>+	0xB64, 0x00200063,</div><div class='add'>+	0xB68, 0x0000003A,</div><div class='add'>+	0xB6C, 0x00000102,</div><div class='add'>+	0xB70, 0x4E6D1870,</div><div class='add'>+	0xB74, 0x03020100,</div><div class='add'>+	0xB78, 0x07060504,</div><div class='add'>+	0xB7C, 0x0B0A0908,</div><div class='add'>+	0xB80, 0x0F0E0D0C,</div><div class='add'>+	0xB84, 0x13121110,</div><div class='add'>+	0xB88, 0x00000000,</div><div class='add'>+	0xB8C, 0x00000000,</div><div class='add'>+	0xC00, 0x00000007,</div><div class='add'>+	0xC04, 0x00000020,</div><div class='add'>+	0xC08, 0x60403231,</div><div class='add'>+	0xC0C, 0x00012345,</div><div class='add'>+	0xC10, 0x00000100,</div><div class='add'>+	0xC14, 0x01000000,</div><div class='add'>+	0xC18, 0x00000000,</div><div class='add'>+	0xC1C, 0x40040053,</div><div class='add'>+	0xC20, 0x40020103,</div><div class='add'>+	0xC24, 0x00000000,</div><div class='add'>+	0xC28, 0x00000000,</div><div class='add'>+	0xC2C, 0x00000000,</div><div class='add'>+	0xC30, 0x00000000,</div><div class='add'>+	0xC34, 0x00000000,</div><div class='add'>+	0xC38, 0x00000000,</div><div class='add'>+	0xC3C, 0x00000000,</div><div class='add'>+	0xC40, 0x00000000,</div><div class='add'>+	0xC44, 0x00000000,</div><div class='add'>+	0xC48, 0x00000000,</div><div class='add'>+	0xC4C, 0x00000000,</div><div class='add'>+	0xC50, 0x00000020,</div><div class='add'>+	0xC54, 0x00000000,</div><div class='add'>+	0xC58, 0xD8020402,</div><div class='add'>+	0xC5C, 0xDE000120,</div><div class='add'>+	0xC68, 0x5979993F,</div><div class='add'>+	0xC6C, 0x0000122A,</div><div class='add'>+	0xC70, 0x99795979,</div><div class='add'>+	0xC74, 0x99795979,</div><div class='add'>+	0xC78, 0x99799979,</div><div class='add'>+	0xC7C, 0x99791979,</div><div class='add'>+	0xC80, 0x19791979,</div><div class='add'>+	0xC84, 0x19791979,</div><div class='add'>+	0xC88, 0x00000000,</div><div class='add'>+	0xC8C, 0x07000000,</div><div class='add'>+	0xC94, 0x01000100,</div><div class='add'>+	0xC98, 0x201C8000,</div><div class='add'>+	0xC9C, 0x00000000,</div><div class='add'>+	0xCA0, 0x0000A555,</div><div class='add'>+	0xCA4, 0x08040201,</div><div class='add'>+	0xCA8, 0x80402010,</div><div class='add'>+	0xCAC, 0x00000000,</div><div class='add'>+	0xCB0, 0x77777777,</div><div class='add'>+	0xCB4, 0x00007777,</div><div class='add'>+	0xCB8, 0x00000000,</div><div class='add'>+	0xCBC, 0x00000000,</div><div class='add'>+	0xCC0, 0x00000000,</div><div class='add'>+	0xCC4, 0x00000000,</div><div class='add'>+	0xCC8, 0x00000000,</div><div class='add'>+	0xCCC, 0x00000000,</div><div class='add'>+	0xCD0, 0x00000000,</div><div class='add'>+	0xCD4, 0x00000000,</div><div class='add'>+	0xCD8, 0x00000000,</div><div class='add'>+	0xCDC, 0x00000000,</div><div class='add'>+	0xCE0, 0x00000000,</div><div class='add'>+	0xCE4, 0x00000000,</div><div class='add'>+	0xCE8, 0x00000000,</div><div class='add'>+	0xCEC, 0x00000000,</div><div class='add'>+	0xE00, 0x00000007,</div><div class='add'>+	0xE04, 0x00000020,</div><div class='add'>+	0xE08, 0x60403231,</div><div class='add'>+	0xE0C, 0x00012345,</div><div class='add'>+	0xE10, 0x00000100,</div><div class='add'>+	0xE14, 0x01000000,</div><div class='add'>+	0xE18, 0x00000000,</div><div class='add'>+	0xE1C, 0x40040053,</div><div class='add'>+	0xE20, 0x40020103,</div><div class='add'>+	0xE24, 0x00000000,</div><div class='add'>+	0xE28, 0x00000000,</div><div class='add'>+	0xE2C, 0x00000000,</div><div class='add'>+	0xE30, 0x00000000,</div><div class='add'>+	0xE34, 0x00000000,</div><div class='add'>+	0xE38, 0x00000000,</div><div class='add'>+	0xE3C, 0x00000000,</div><div class='add'>+	0xE40, 0x00000000,</div><div class='add'>+	0xE44, 0x00000000,</div><div class='add'>+	0xE48, 0x00000000,</div><div class='add'>+	0xE4C, 0x00000000,</div><div class='add'>+	0xE50, 0x00000020,</div><div class='add'>+	0xE54, 0x00000000,</div><div class='add'>+	0xE58, 0xD8120402,</div><div class='add'>+	0xE5C, 0xDE000120,</div><div class='add'>+	0xE68, 0x5979993F,</div><div class='add'>+	0xE6C, 0x0000122A,</div><div class='add'>+	0xE70, 0x99795979,</div><div class='add'>+	0xE74, 0x99795979,</div><div class='add'>+	0xE78, 0x99799979,</div><div class='add'>+	0xE7C, 0x99791979,</div><div class='add'>+	0xE80, 0x19791979,</div><div class='add'>+	0xE84, 0x19791979,</div><div class='add'>+	0xE88, 0x00000000,</div><div class='add'>+	0xE8C, 0x07000000,</div><div class='add'>+	0xE94, 0x01000100,</div><div class='add'>+	0xE98, 0x201C8000,</div><div class='add'>+	0xE9C, 0x00000000,</div><div class='add'>+	0xEA0, 0x0000A555,</div><div class='add'>+	0xEA4, 0x08040201,</div><div class='add'>+	0xEA8, 0x80402010,</div><div class='add'>+	0xEAC, 0x00000000,</div><div class='add'>+	0xEB0, 0x77777777,</div><div class='add'>+	0xEB4, 0x00007777,</div><div class='add'>+	0xEB8, 0x00000000,</div><div class='add'>+	0xEBC, 0x00000000,</div><div class='add'>+	0xEC0, 0x00000000,</div><div class='add'>+	0xEC4, 0x00000000,</div><div class='add'>+	0xEC8, 0x00000000,</div><div class='add'>+	0xECC, 0x00000000,</div><div class='add'>+	0xED0, 0x00000000,</div><div class='add'>+	0xED4, 0x00000000,</div><div class='add'>+	0xED8, 0x00000000,</div><div class='add'>+	0xEDC, 0x00000000,</div><div class='add'>+	0xEE0, 0x00000000,</div><div class='add'>+	0xEE4, 0x00000000,</div><div class='add'>+	0xEE8, 0x00000000,</div><div class='add'>+	0xEEC, 0x00000000,</div><div class='add'>+	0x1900, 0x00000000,</div><div class='add'>+	0x1904, 0x00238000,</div><div class='add'>+	0x1908, 0x00000000,</div><div class='add'>+	0x190C, 0x00000000,</div><div class='add'>+	0x1910, 0x00000000,</div><div class='add'>+	0x1914, 0x00000000,</div><div class='add'>+	0x1918, 0x00000000,</div><div class='add'>+	0x191C, 0x00000000,</div><div class='add'>+	0x1920, 0x00000000,</div><div class='add'>+	0x1924, 0x00000000,</div><div class='add'>+	0x1928, 0x00000000,</div><div class='add'>+	0x192C, 0x00000000,</div><div class='add'>+	0x1930, 0x00000000,</div><div class='add'>+	0x1934, 0x00000000,</div><div class='add'>+	0x1938, 0x00000000,</div><div class='add'>+	0x193C, 0x00000000,</div><div class='add'>+	0x1940, 0x00000000,</div><div class='add'>+	0x1944, 0x00000000,</div><div class='add'>+	0x1948, 0x00000000,</div><div class='add'>+	0x194C, 0x00000000,</div><div class='add'>+	0x1950, 0x00000000,</div><div class='add'>+	0x1954, 0x00000000,</div><div class='add'>+	0x1958, 0x00000000,</div><div class='add'>+	0x195C, 0x00000000,</div><div class='add'>+	0x1960, 0x00000000,</div><div class='add'>+	0x1964, 0x00000000,</div><div class='add'>+	0x1968, 0x00000000,</div><div class='add'>+	0x196C, 0x00000000,</div><div class='add'>+	0x1970, 0x00000000,</div><div class='add'>+	0x1974, 0x00000000,</div><div class='add'>+	0x1978, 0x00000000,</div><div class='add'>+	0x197C, 0x00000000,</div><div class='add'>+	0x1980, 0x00000000,</div><div class='add'>+	0x1984, 0x03000000,</div><div class='add'>+	0x1988, 0x21401E88,</div><div class='add'>+	0x198C, 0x00004000,</div><div class='add'>+	0x1990, 0x00000000,</div><div class='add'>+	0x1994, 0x00000000,</div><div class='add'>+	0x1998, 0x00000053,</div><div class='add'>+	0x199C, 0x00000000,</div><div class='add'>+	0x19A0, 0x00000000,</div><div class='add'>+	0x19A4, 0x00000000,</div><div class='add'>+	0x19A8, 0x00000000,</div><div class='add'>+	0x19AC, 0x0E47E47F,</div><div class='add'>+	0x19B0, 0x00000000,</div><div class='add'>+	0x19B4, 0x0E47E47F,</div><div class='add'>+	0x19B8, 0x00000000,</div><div class='add'>+	0x19BC, 0x00000000,</div><div class='add'>+	0x19C0, 0x00000000,</div><div class='add'>+	0x19C4, 0x00000000,</div><div class='add'>+	0x19C8, 0x00000000,</div><div class='add'>+	0x19CC, 0x00000000,</div><div class='add'>+	0x19D0, 0x00000000,</div><div class='add'>+	0x19D4, 0xAAAAAAAA,</div><div class='add'>+	0x19D8, 0x00000AAA,</div><div class='add'>+	0x19DC, 0x133E0F37,</div><div class='add'>+	0x19E0, 0x00000000,</div><div class='add'>+	0x19E4, 0x00000000,</div><div class='add'>+	0x19E8, 0x00000000,</div><div class='add'>+	0x19EC, 0x00000000,</div><div class='add'>+	0x19F0, 0x00000000,</div><div class='add'>+	0x19F4, 0x00000000,</div><div class='add'>+	0x19F8, 0x01A00000,</div><div class='add'>+	0x19FC, 0x00000000,</div><div class='add'>+	0x1C00, 0x00000100,</div><div class='add'>+	0x1C04, 0x01000000,</div><div class='add'>+	0x1C08, 0x00000100,</div><div class='add'>+	0x1C0C, 0x01000000,</div><div class='add'>+	0x1C10, 0x00000100,</div><div class='add'>+	0x1C14, 0x01000000,</div><div class='add'>+	0x1C18, 0x00000100,</div><div class='add'>+	0x1C1C, 0x01000000,</div><div class='add'>+	0x1C20, 0x00000100,</div><div class='add'>+	0x1C24, 0x01000000,</div><div class='add'>+	0x1C28, 0x00000100,</div><div class='add'>+	0x1C2C, 0x01000000,</div><div class='add'>+	0x1C30, 0x00000100,</div><div class='add'>+	0x1C34, 0x01000000,</div><div class='add'>+	0x1C38, 0x00000000,</div><div class='add'>+	0x1C3C, 0x00000000,</div><div class='add'>+	0x1C40, 0x000C0100,</div><div class='add'>+	0x1C44, 0x000000F3,</div><div class='add'>+	0x1C48, 0x1A8249A8,</div><div class='add'>+	0x1C4C, 0x1461C826,</div><div class='add'>+	0x1C50, 0x0001469E,</div><div class='add'>+	0x1C54, 0x58D158D1,</div><div class='add'>+	0x1C58, 0x04490088,</div><div class='add'>+	0x1C5C, 0x04004400,</div><div class='add'>+	0x1C60, 0x00000000,</div><div class='add'>+	0x1C64, 0x04004400,</div><div class='add'>+	0x1C68, 0x00000100,</div><div class='add'>+	0x1C6C, 0x01000000,</div><div class='add'>+	0x1C70, 0x00000100,</div><div class='add'>+	0x1C74, 0x01000000,</div><div class='add'>+	0x1C78, 0x00000000,</div><div class='add'>+	0x1C7C, 0x00000010,</div><div class='add'>+	0x1C80, 0x5FFF5FFF,</div><div class='add'>+	0x1C84, 0x5FFF5FFF,</div><div class='add'>+	0x1C88, 0x5FFF5FFF,</div><div class='add'>+	0x1C8C, 0x5FFF5FFF,</div><div class='add'>+	0x1C90, 0x5FFF5FFF,</div><div class='add'>+	0x1C94, 0x5FFF5FFF,</div><div class='add'>+	0x1C98, 0x5FFF5FFF,</div><div class='add'>+	0x1C9C, 0x5FFF5FFF,</div><div class='add'>+	0x1CA0, 0x00000100,</div><div class='add'>+	0x1CA4, 0x01000000,</div><div class='add'>+	0x1CA8, 0x00000100,</div><div class='add'>+	0x1CAC, 0x5FFF5FFF,</div><div class='add'>+	0x1CB0, 0x00000100,</div><div class='add'>+	0x1CB4, 0x01000000,</div><div class='add'>+	0x1CB8, 0x00000000,</div><div class='add'>+	0x1CBC, 0x00000000,</div><div class='add'>+	0x1CC0, 0x00000100,</div><div class='add'>+	0x1CC4, 0x01000000,</div><div class='add'>+	0x1CC8, 0x00000100,</div><div class='add'>+	0x1CCC, 0x01000000,</div><div class='add'>+	0x1CD0, 0x00000100,</div><div class='add'>+	0x1CD4, 0x01000000,</div><div class='add'>+	0x1CD8, 0x00000100,</div><div class='add'>+	0x1CDC, 0x01000000,</div><div class='add'>+	0x1CE0, 0x00000100,</div><div class='add'>+	0x1CE4, 0x01000000,</div><div class='add'>+	0x1CE8, 0x00000100,</div><div class='add'>+	0x1CEC, 0x01000000,</div><div class='add'>+	0x1CF0, 0x00000100,</div><div class='add'>+	0x1CF4, 0x01000000,</div><div class='add'>+	0x1CF8, 0x00000000,</div><div class='add'>+	0x1CFC, 0x00000000,</div><div class='add'>+	0xC60, 0x70038040,</div><div class='add'>+	0xC60, 0x70038040,</div><div class='add'>+	0xC60, 0x70146040,</div><div class='add'>+	0xC60, 0x70246040,</div><div class='add'>+	0xC60, 0x70346040,</div><div class='add'>+	0xC60, 0x70446040,</div><div class='add'>+	0xC60, 0x70532040,</div><div class='add'>+	0xC60, 0x70646040,</div><div class='add'>+	0xC60, 0x70738040,</div><div class='add'>+	0xC60, 0x70838040,</div><div class='add'>+	0xC60, 0x70938040,</div><div class='add'>+	0xC60, 0x70A38040,</div><div class='add'>+	0xC60, 0x70B36040,</div><div class='add'>+	0xC60, 0x70C06040,</div><div class='add'>+	0xC60, 0x70D06040,</div><div class='add'>+	0xC60, 0x70E76040,</div><div class='add'>+	0xC60, 0x70F06040,</div><div class='add'>+	0xE60, 0x70038040,</div><div class='add'>+	0xE60, 0x70038040,</div><div class='add'>+	0xE60, 0x70146040,</div><div class='add'>+	0xE60, 0x70246040,</div><div class='add'>+	0xE60, 0x70346040,</div><div class='add'>+	0xE60, 0x70446040,</div><div class='add'>+	0xE60, 0x70532040,</div><div class='add'>+	0xE60, 0x70646040,</div><div class='add'>+	0xE60, 0x70738040,</div><div class='add'>+	0xE60, 0x70838040,</div><div class='add'>+	0xE60, 0x70938040,</div><div class='add'>+	0xE60, 0x70A38040,</div><div class='add'>+	0xE60, 0x70B36040,</div><div class='add'>+	0xE60, 0x70C06040,</div><div class='add'>+	0xE60, 0x70D06040,</div><div class='add'>+	0xE60, 0x70E76040,</div><div class='add'>+	0xE60, 0x70F06040,</div><div class='add'>+	0xC64, 0x00800000,</div><div class='add'>+	0xC64, 0x08800001,</div><div class='add'>+	0xC64, 0x00800002,</div><div class='add'>+	0xC64, 0x00800003,</div><div class='add'>+	0xC64, 0x00800004,</div><div class='add'>+	0xC64, 0x00800005,</div><div class='add'>+	0xC64, 0x00800006,</div><div class='add'>+	0xC64, 0x08800007,</div><div class='add'>+	0xC64, 0x00004000,</div><div class='add'>+	0xE64, 0x00800000,</div><div class='add'>+	0xE64, 0x08800001,</div><div class='add'>+	0xE64, 0x00800002,</div><div class='add'>+	0xE64, 0x00800003,</div><div class='add'>+	0xE64, 0x00800004,</div><div class='add'>+	0xE64, 0x00800005,</div><div class='add'>+	0xE64, 0x00800006,</div><div class='add'>+	0xE64, 0x08800007,</div><div class='add'>+	0xE64, 0x00004000,</div><div class='add'>+	0x1B00, 0xF8000008,</div><div class='add'>+	0x1B00, 0xF80A7008,</div><div class='add'>+	0x1B00, 0xF8015008,</div><div class='add'>+	0x1B00, 0xF8000008,</div><div class='add'>+	0x1B04, 0xE24629D2,</div><div class='add'>+	0x1B08, 0x00000080,</div><div class='add'>+	0x1B0C, 0x00000000,</div><div class='add'>+	0x1B10, 0x00011C00,</div><div class='add'>+	0x1B14, 0x00000000,</div><div class='add'>+	0x1B18, 0x00292903,</div><div class='add'>+	0x1B1C, 0xA2193C32,</div><div class='add'>+	0x1B20, 0x01840008,</div><div class='add'>+	0x1B24, 0x01860008,</div><div class='add'>+	0x1B28, 0x80060300,</div><div class='add'>+	0x1B2C, 0x00000003,</div><div class='add'>+	0x1B30, 0x20000000,</div><div class='add'>+	0x1B34, 0x00000800,</div><div class='add'>+	0x1B3C, 0x20000000,</div><div class='add'>+	0x1BC0, 0x01000000,</div><div class='add'>+	0x1BCC, 0x00000000,</div><div class='add'>+	0x1B00, 0xF800000A,</div><div class='add'>+	0x1B1C, 0xA2193C32,</div><div class='add'>+	0x1B20, 0x01840008,</div><div class='add'>+	0x1B24, 0x01860008,</div><div class='add'>+	0x1B28, 0x80060300,</div><div class='add'>+	0x1B2C, 0x00000003,</div><div class='add'>+	0x1B30, 0x20000000,</div><div class='add'>+	0x1B34, 0x00000800,</div><div class='add'>+	0x1B3C, 0x20000000,</div><div class='add'>+	0x1BC0, 0x01000000,</div><div class='add'>+	0x1BCC, 0x00000000,</div><div class='add'>+	0x1B00, 0xF8000000,</div><div class='add'>+	0x1B80, 0x00000007,</div><div class='add'>+	0x1B80, 0x090A0005,</div><div class='add'>+	0x1B80, 0x090A0007,</div><div class='add'>+	0x1B80, 0x0FFE0015,</div><div class='add'>+	0x1B80, 0x0FFE0017,</div><div class='add'>+	0x1B80, 0x00220025,</div><div class='add'>+	0x1B80, 0x00220027,</div><div class='add'>+	0x1B80, 0x00040035,</div><div class='add'>+	0x1B80, 0x00040037,</div><div class='add'>+	0x1B80, 0x05C00045,</div><div class='add'>+	0x1B80, 0x05C00047,</div><div class='add'>+	0x1B80, 0x00070055,</div><div class='add'>+	0x1B80, 0x00070057,</div><div class='add'>+	0x1B80, 0x64000065,</div><div class='add'>+	0x1B80, 0x64000067,</div><div class='add'>+	0x1B80, 0x00020075,</div><div class='add'>+	0x1B80, 0x00020077,</div><div class='add'>+	0x1B80, 0x00080085,</div><div class='add'>+	0x1B80, 0x00080087,</div><div class='add'>+	0x1B80, 0x80000095,</div><div class='add'>+	0x1B80, 0x80000097,</div><div class='add'>+	0x1B80, 0x090800A5,</div><div class='add'>+	0x1B80, 0x090800A7,</div><div class='add'>+	0x1B80, 0x0F0200B5,</div><div class='add'>+	0x1B80, 0x0F0200B7,</div><div class='add'>+	0x1B80, 0x002200C5,</div><div class='add'>+	0x1B80, 0x002200C7,</div><div class='add'>+	0x1B80, 0x000400D5,</div><div class='add'>+	0x1B80, 0x000400D7,</div><div class='add'>+	0x1B80, 0x05C000E5,</div><div class='add'>+	0x1B80, 0x05C000E7,</div><div class='add'>+	0x1B80, 0x000700F5,</div><div class='add'>+	0x1B80, 0x000700F7,</div><div class='add'>+	0x1B80, 0x64020105,</div><div class='add'>+	0x1B80, 0x64020107,</div><div class='add'>+	0x1B80, 0x00020115,</div><div class='add'>+	0x1B80, 0x00020117,</div><div class='add'>+	0x1B80, 0x00040125,</div><div class='add'>+	0x1B80, 0x00040127,</div><div class='add'>+	0x1B80, 0x4A000135,</div><div class='add'>+	0x1B80, 0x4A000137,</div><div class='add'>+	0x1B80, 0x4B040145,</div><div class='add'>+	0x1B80, 0x4B040147,</div><div class='add'>+	0x1B80, 0x85030155,</div><div class='add'>+	0x1B80, 0x85030157,</div><div class='add'>+	0x1B80, 0x40090165,</div><div class='add'>+	0x1B80, 0x40090167,</div><div class='add'>+	0x1B80, 0xE0280175,</div><div class='add'>+	0x1B80, 0xE0280177,</div><div class='add'>+	0x1B80, 0x4B050185,</div><div class='add'>+	0x1B80, 0x4B050187,</div><div class='add'>+	0x1B80, 0x86030195,</div><div class='add'>+	0x1B80, 0x86030197,</div><div class='add'>+	0x1B80, 0x400B01A5,</div><div class='add'>+	0x1B80, 0x400B01A7,</div><div class='add'>+	0x1B80, 0xE02801B5,</div><div class='add'>+	0x1B80, 0xE02801B7,</div><div class='add'>+	0x1B80, 0x4B0001C5,</div><div class='add'>+	0x1B80, 0x4B0001C7,</div><div class='add'>+	0x1B80, 0x000701D5,</div><div class='add'>+	0x1B80, 0x000701D7,</div><div class='add'>+	0x1B80, 0x4C0001E5,</div><div class='add'>+	0x1B80, 0x4C0001E7,</div><div class='add'>+	0x1B80, 0x000401F5,</div><div class='add'>+	0x1B80, 0x000401F7,</div><div class='add'>+	0x1B80, 0x4D040205,</div><div class='add'>+	0x1B80, 0x4D040207,</div><div class='add'>+	0x1B80, 0x2EF00215,</div><div class='add'>+	0x1B80, 0x2EF00217,</div><div class='add'>+	0x1B80, 0x00000225,</div><div class='add'>+	0x1B80, 0x00000227,</div><div class='add'>+	0x1B80, 0x20810235,</div><div class='add'>+	0x1B80, 0x20810237,</div><div class='add'>+	0x1B80, 0x23450245,</div><div class='add'>+	0x1B80, 0x23450247,</div><div class='add'>+	0x1B80, 0x4D000255,</div><div class='add'>+	0x1B80, 0x4D000257,</div><div class='add'>+	0x1B80, 0x00040265,</div><div class='add'>+	0x1B80, 0x00040267,</div><div class='add'>+	0x1B80, 0x30000275,</div><div class='add'>+	0x1B80, 0x30000277,</div><div class='add'>+	0x1B80, 0xE1D80285,</div><div class='add'>+	0x1B80, 0xE1D80287,</div><div class='add'>+	0x1B80, 0xF0110295,</div><div class='add'>+	0x1B80, 0xF0110297,</div><div class='add'>+	0x1B80, 0xF11102A5,</div><div class='add'>+	0x1B80, 0xF11102A7,</div><div class='add'>+	0x1B80, 0xF21102B5,</div><div class='add'>+	0x1B80, 0xF21102B7,</div><div class='add'>+	0x1B80, 0xF31102C5,</div><div class='add'>+	0x1B80, 0xF31102C7,</div><div class='add'>+	0x1B80, 0xF41102D5,</div><div class='add'>+	0x1B80, 0xF41102D7,</div><div class='add'>+	0x1B80, 0xF51102E5,</div><div class='add'>+	0x1B80, 0xF51102E7,</div><div class='add'>+	0x1B80, 0xF61102F5,</div><div class='add'>+	0x1B80, 0xF61102F7,</div><div class='add'>+	0x1B80, 0xF7110305,</div><div class='add'>+	0x1B80, 0xF7110307,</div><div class='add'>+	0x1B80, 0xF8110315,</div><div class='add'>+	0x1B80, 0xF8110317,</div><div class='add'>+	0x1B80, 0xF9110325,</div><div class='add'>+	0x1B80, 0xF9110327,</div><div class='add'>+	0x1B80, 0xFA110335,</div><div class='add'>+	0x1B80, 0xFA110337,</div><div class='add'>+	0x1B80, 0xFB110345,</div><div class='add'>+	0x1B80, 0xFB110347,</div><div class='add'>+	0x1B80, 0xFC110355,</div><div class='add'>+	0x1B80, 0xFC110357,</div><div class='add'>+	0x1B80, 0xFD110365,</div><div class='add'>+	0x1B80, 0xFD110367,</div><div class='add'>+	0x1B80, 0xFE110375,</div><div class='add'>+	0x1B80, 0xFE110377,</div><div class='add'>+	0x1B80, 0xFF110385,</div><div class='add'>+	0x1B80, 0xFF110387,</div><div class='add'>+	0x1B80, 0x00010395,</div><div class='add'>+	0x1B80, 0x00010397,</div><div class='add'>+	0x1B80, 0x305103A5,</div><div class='add'>+	0x1B80, 0x305103A7,</div><div class='add'>+	0x1B80, 0x306903B5,</div><div class='add'>+	0x1B80, 0x306903B7,</div><div class='add'>+	0x1B80, 0x30B403C5,</div><div class='add'>+	0x1B80, 0x30B403C7,</div><div class='add'>+	0x1B80, 0x30B703D5,</div><div class='add'>+	0x1B80, 0x30B703D7,</div><div class='add'>+	0x1B80, 0x306B03E5,</div><div class='add'>+	0x1B80, 0x306B03E7,</div><div class='add'>+	0x1B80, 0x307603F5,</div><div class='add'>+	0x1B80, 0x307603F7,</div><div class='add'>+	0x1B80, 0x30810405,</div><div class='add'>+	0x1B80, 0x30810407,</div><div class='add'>+	0x1B80, 0x30C10415,</div><div class='add'>+	0x1B80, 0x30C10417,</div><div class='add'>+	0x1B80, 0x30BB0425,</div><div class='add'>+	0x1B80, 0x30BB0427,</div><div class='add'>+	0x1B80, 0x30CF0435,</div><div class='add'>+	0x1B80, 0x30CF0437,</div><div class='add'>+	0x1B80, 0x30DA0445,</div><div class='add'>+	0x1B80, 0x30DA0447,</div><div class='add'>+	0x1B80, 0x30E50455,</div><div class='add'>+	0x1B80, 0x30E50457,</div><div class='add'>+	0x1B80, 0x304A0465,</div><div class='add'>+	0x1B80, 0x304A0467,</div><div class='add'>+	0x1B80, 0x31140475,</div><div class='add'>+	0x1B80, 0x31140477,</div><div class='add'>+	0x1B80, 0x31250485,</div><div class='add'>+	0x1B80, 0x31250487,</div><div class='add'>+	0x1B80, 0x313A0495,</div><div class='add'>+	0x1B80, 0x313A0497,</div><div class='add'>+	0x1B80, 0x4D0404A5,</div><div class='add'>+	0x1B80, 0x4D0404A7,</div><div class='add'>+	0x1B80, 0x2EF004B5,</div><div class='add'>+	0x1B80, 0x2EF004B7,</div><div class='add'>+	0x1B80, 0x000004C5,</div><div class='add'>+	0x1B80, 0x000004C7,</div><div class='add'>+	0x1B80, 0x208104D5,</div><div class='add'>+	0x1B80, 0x208104D7,</div><div class='add'>+	0x1B80, 0xA3B504E5,</div><div class='add'>+	0x1B80, 0xA3B504E7,</div><div class='add'>+	0x1B80, 0x4D0004F5,</div><div class='add'>+	0x1B80, 0x4D0004F7,</div><div class='add'>+	0x1B80, 0x30000505,</div><div class='add'>+	0x1B80, 0x30000507,</div><div class='add'>+	0x1B80, 0xE1650515,</div><div class='add'>+	0x1B80, 0xE1650517,</div><div class='add'>+	0x1B80, 0x4D040525,</div><div class='add'>+	0x1B80, 0x4D040527,</div><div class='add'>+	0x1B80, 0x20800535,</div><div class='add'>+	0x1B80, 0x20800537,</div><div class='add'>+	0x1B80, 0x00000545,</div><div class='add'>+	0x1B80, 0x00000547,</div><div class='add'>+	0x1B80, 0x4D000555,</div><div class='add'>+	0x1B80, 0x4D000557,</div><div class='add'>+	0x1B80, 0x55070565,</div><div class='add'>+	0x1B80, 0x55070567,</div><div class='add'>+	0x1B80, 0xE15D0575,</div><div class='add'>+	0x1B80, 0xE15D0577,</div><div class='add'>+	0x1B80, 0xE15D0585,</div><div class='add'>+	0x1B80, 0xE15D0587,</div><div class='add'>+	0x1B80, 0x4D040595,</div><div class='add'>+	0x1B80, 0x4D040597,</div><div class='add'>+	0x1B80, 0x208805A5,</div><div class='add'>+	0x1B80, 0x208805A7,</div><div class='add'>+	0x1B80, 0x020005B5,</div><div class='add'>+	0x1B80, 0x020005B7,</div><div class='add'>+	0x1B80, 0x4D0005C5,</div><div class='add'>+	0x1B80, 0x4D0005C7,</div><div class='add'>+	0x1B80, 0x550F05D5,</div><div class='add'>+	0x1B80, 0x550F05D7,</div><div class='add'>+	0x1B80, 0xE15D05E5,</div><div class='add'>+	0x1B80, 0xE15D05E7,</div><div class='add'>+	0x1B80, 0x4F0205F5,</div><div class='add'>+	0x1B80, 0x4F0205F7,</div><div class='add'>+	0x1B80, 0x4E000605,</div><div class='add'>+	0x1B80, 0x4E000607,</div><div class='add'>+	0x1B80, 0x53020615,</div><div class='add'>+	0x1B80, 0x53020617,</div><div class='add'>+	0x1B80, 0x52010625,</div><div class='add'>+	0x1B80, 0x52010627,</div><div class='add'>+	0x1B80, 0xE1610635,</div><div class='add'>+	0x1B80, 0xE1610637,</div><div class='add'>+	0x1B80, 0x4D080645,</div><div class='add'>+	0x1B80, 0x4D080647,</div><div class='add'>+	0x1B80, 0x57100655,</div><div class='add'>+	0x1B80, 0x57100657,</div><div class='add'>+	0x1B80, 0x57000665,</div><div class='add'>+	0x1B80, 0x57000667,</div><div class='add'>+	0x1B80, 0x4D000675,</div><div class='add'>+	0x1B80, 0x4D000677,</div><div class='add'>+	0x1B80, 0x00010685,</div><div class='add'>+	0x1B80, 0x00010687,</div><div class='add'>+	0x1B80, 0xE1650695,</div><div class='add'>+	0x1B80, 0xE1650697,</div><div class='add'>+	0x1B80, 0x000106A5,</div><div class='add'>+	0x1B80, 0x000106A7,</div><div class='add'>+	0x1B80, 0x308B06B5,</div><div class='add'>+	0x1B80, 0x308B06B7,</div><div class='add'>+	0x1B80, 0x002306C5,</div><div class='add'>+	0x1B80, 0x002306C7,</div><div class='add'>+	0x1B80, 0xE1CB06D5,</div><div class='add'>+	0x1B80, 0xE1CB06D7,</div><div class='add'>+	0x1B80, 0x000206E5,</div><div class='add'>+	0x1B80, 0x000206E7,</div><div class='add'>+	0x1B80, 0x54E906F5,</div><div class='add'>+	0x1B80, 0x54E906F7,</div><div class='add'>+	0x1B80, 0x0BA60705,</div><div class='add'>+	0x1B80, 0x0BA60707,</div><div class='add'>+	0x1B80, 0x00230715,</div><div class='add'>+	0x1B80, 0x00230717,</div><div class='add'>+	0x1B80, 0xE1CB0725,</div><div class='add'>+	0x1B80, 0xE1CB0727,</div><div class='add'>+	0x1B80, 0x00020735,</div><div class='add'>+	0x1B80, 0x00020737,</div><div class='add'>+	0x1B80, 0x4D300745,</div><div class='add'>+	0x1B80, 0x4D300747,</div><div class='add'>+	0x1B80, 0x30A40755,</div><div class='add'>+	0x1B80, 0x30A40757,</div><div class='add'>+	0x1B80, 0x30870765,</div><div class='add'>+	0x1B80, 0x30870767,</div><div class='add'>+	0x1B80, 0x00220775,</div><div class='add'>+	0x1B80, 0x00220777,</div><div class='add'>+	0x1B80, 0xE1CB0785,</div><div class='add'>+	0x1B80, 0xE1CB0787,</div><div class='add'>+	0x1B80, 0x00020795,</div><div class='add'>+	0x1B80, 0x00020797,</div><div class='add'>+	0x1B80, 0x54E807A5,</div><div class='add'>+	0x1B80, 0x54E807A7,</div><div class='add'>+	0x1B80, 0x0BA607B5,</div><div class='add'>+	0x1B80, 0x0BA607B7,</div><div class='add'>+	0x1B80, 0x002207C5,</div><div class='add'>+	0x1B80, 0x002207C7,</div><div class='add'>+	0x1B80, 0xE1CB07D5,</div><div class='add'>+	0x1B80, 0xE1CB07D7,</div><div class='add'>+	0x1B80, 0x000207E5,</div><div class='add'>+	0x1B80, 0x000207E7,</div><div class='add'>+	0x1B80, 0x4D3007F5,</div><div class='add'>+	0x1B80, 0x4D3007F7,</div><div class='add'>+	0x1B80, 0x30A40805,</div><div class='add'>+	0x1B80, 0x30A40807,</div><div class='add'>+	0x1B80, 0x63F10815,</div><div class='add'>+	0x1B80, 0x63F10817,</div><div class='add'>+	0x1B80, 0xE1650825,</div><div class='add'>+	0x1B80, 0xE1650827,</div><div class='add'>+	0x1B80, 0xE1CB0835,</div><div class='add'>+	0x1B80, 0xE1CB0837,</div><div class='add'>+	0x1B80, 0x63F40845,</div><div class='add'>+	0x1B80, 0x63F40847,</div><div class='add'>+	0x1B80, 0xE1650855,</div><div class='add'>+	0x1B80, 0xE1650857,</div><div class='add'>+	0x1B80, 0xE1CB0865,</div><div class='add'>+	0x1B80, 0xE1CB0867,</div><div class='add'>+	0x1B80, 0x0BA80875,</div><div class='add'>+	0x1B80, 0x0BA80877,</div><div class='add'>+	0x1B80, 0x63F80885,</div><div class='add'>+	0x1B80, 0x63F80887,</div><div class='add'>+	0x1B80, 0xE1650895,</div><div class='add'>+	0x1B80, 0xE1650897,</div><div class='add'>+	0x1B80, 0xE1CB08A5,</div><div class='add'>+	0x1B80, 0xE1CB08A7,</div><div class='add'>+	0x1B80, 0x0BA908B5,</div><div class='add'>+	0x1B80, 0x0BA908B7,</div><div class='add'>+	0x1B80, 0x63FC08C5,</div><div class='add'>+	0x1B80, 0x63FC08C7,</div><div class='add'>+	0x1B80, 0xE16508D5,</div><div class='add'>+	0x1B80, 0xE16508D7,</div><div class='add'>+	0x1B80, 0xE1CB08E5,</div><div class='add'>+	0x1B80, 0xE1CB08E7,</div><div class='add'>+	0x1B80, 0x63FF08F5,</div><div class='add'>+	0x1B80, 0x63FF08F7,</div><div class='add'>+	0x1B80, 0xE1650905,</div><div class='add'>+	0x1B80, 0xE1650907,</div><div class='add'>+	0x1B80, 0xE1CB0915,</div><div class='add'>+	0x1B80, 0xE1CB0917,</div><div class='add'>+	0x1B80, 0x63000925,</div><div class='add'>+	0x1B80, 0x63000927,</div><div class='add'>+	0x1B80, 0xE1650935,</div><div class='add'>+	0x1B80, 0xE1650937,</div><div class='add'>+	0x1B80, 0xE1CB0945,</div><div class='add'>+	0x1B80, 0xE1CB0947,</div><div class='add'>+	0x1B80, 0x63030955,</div><div class='add'>+	0x1B80, 0x63030957,</div><div class='add'>+	0x1B80, 0xE1650965,</div><div class='add'>+	0x1B80, 0xE1650967,</div><div class='add'>+	0x1B80, 0xE1CB0975,</div><div class='add'>+	0x1B80, 0xE1CB0977,</div><div class='add'>+	0x1B80, 0xF4D40985,</div><div class='add'>+	0x1B80, 0xF4D40987,</div><div class='add'>+	0x1B80, 0x63070995,</div><div class='add'>+	0x1B80, 0x63070997,</div><div class='add'>+	0x1B80, 0xE16509A5,</div><div class='add'>+	0x1B80, 0xE16509A7,</div><div class='add'>+	0x1B80, 0xE1CB09B5,</div><div class='add'>+	0x1B80, 0xE1CB09B7,</div><div class='add'>+	0x1B80, 0xF5DB09C5,</div><div class='add'>+	0x1B80, 0xF5DB09C7,</div><div class='add'>+	0x1B80, 0x630B09D5,</div><div class='add'>+	0x1B80, 0x630B09D7,</div><div class='add'>+	0x1B80, 0xE16509E5,</div><div class='add'>+	0x1B80, 0xE16509E7,</div><div class='add'>+	0x1B80, 0xE1CB09F5,</div><div class='add'>+	0x1B80, 0xE1CB09F7,</div><div class='add'>+	0x1B80, 0x630E0A05,</div><div class='add'>+	0x1B80, 0x630E0A07,</div><div class='add'>+	0x1B80, 0xE1650A15,</div><div class='add'>+	0x1B80, 0xE1650A17,</div><div class='add'>+	0x1B80, 0xE1CB0A25,</div><div class='add'>+	0x1B80, 0xE1CB0A27,</div><div class='add'>+	0x1B80, 0x4D300A35,</div><div class='add'>+	0x1B80, 0x4D300A37,</div><div class='add'>+	0x1B80, 0x55010A45,</div><div class='add'>+	0x1B80, 0x55010A47,</div><div class='add'>+	0x1B80, 0x57040A55,</div><div class='add'>+	0x1B80, 0x57040A57,</div><div class='add'>+	0x1B80, 0x57000A65,</div><div class='add'>+	0x1B80, 0x57000A67,</div><div class='add'>+	0x1B80, 0x96000A75,</div><div class='add'>+	0x1B80, 0x96000A77,</div><div class='add'>+	0x1B80, 0x57080A85,</div><div class='add'>+	0x1B80, 0x57080A87,</div><div class='add'>+	0x1B80, 0x57000A95,</div><div class='add'>+	0x1B80, 0x57000A97,</div><div class='add'>+	0x1B80, 0x95000AA5,</div><div class='add'>+	0x1B80, 0x95000AA7,</div><div class='add'>+	0x1B80, 0x4D000AB5,</div><div class='add'>+	0x1B80, 0x4D000AB7,</div><div class='add'>+	0x1B80, 0x6C070AC5,</div><div class='add'>+	0x1B80, 0x6C070AC7,</div><div class='add'>+	0x1B80, 0x7B200AD5,</div><div class='add'>+	0x1B80, 0x7B200AD7,</div><div class='add'>+	0x1B80, 0x7A000AE5,</div><div class='add'>+	0x1B80, 0x7A000AE7,</div><div class='add'>+	0x1B80, 0x79000AF5,</div><div class='add'>+	0x1B80, 0x79000AF7,</div><div class='add'>+	0x1B80, 0x7F200B05,</div><div class='add'>+	0x1B80, 0x7F200B07,</div><div class='add'>+	0x1B80, 0x7E000B15,</div><div class='add'>+	0x1B80, 0x7E000B17,</div><div class='add'>+	0x1B80, 0x7D000B25,</div><div class='add'>+	0x1B80, 0x7D000B27,</div><div class='add'>+	0x1B80, 0x00010B35,</div><div class='add'>+	0x1B80, 0x00010B37,</div><div class='add'>+	0x1B80, 0x62850B45,</div><div class='add'>+	0x1B80, 0x62850B47,</div><div class='add'>+	0x1B80, 0xE1650B55,</div><div class='add'>+	0x1B80, 0xE1650B57,</div><div class='add'>+	0x1B80, 0x00010B65,</div><div class='add'>+	0x1B80, 0x00010B67,</div><div class='add'>+	0x1B80, 0x5C320B75,</div><div class='add'>+	0x1B80, 0x5C320B77,</div><div class='add'>+	0x1B80, 0xE1C70B85,</div><div class='add'>+	0x1B80, 0xE1C70B87,</div><div class='add'>+	0x1B80, 0xE1930B95,</div><div class='add'>+	0x1B80, 0xE1930B97,</div><div class='add'>+	0x1B80, 0x00010BA5,</div><div class='add'>+	0x1B80, 0x00010BA7,</div><div class='add'>+	0x1B80, 0x5C320BB5,</div><div class='add'>+	0x1B80, 0x5C320BB7,</div><div class='add'>+	0x1B80, 0x63F40BC5,</div><div class='add'>+	0x1B80, 0x63F40BC7,</div><div class='add'>+	0x1B80, 0x62850BD5,</div><div class='add'>+	0x1B80, 0x62850BD7,</div><div class='add'>+	0x1B80, 0x0BB00BE5,</div><div class='add'>+	0x1B80, 0x0BB00BE7,</div><div class='add'>+	0x1B80, 0xE1650BF5,</div><div class='add'>+	0x1B80, 0xE1650BF7,</div><div class='add'>+	0x1B80, 0xE1CB0C05,</div><div class='add'>+	0x1B80, 0xE1CB0C07,</div><div class='add'>+	0x1B80, 0x5C320C15,</div><div class='add'>+	0x1B80, 0x5C320C17,</div><div class='add'>+	0x1B80, 0x63FC0C25,</div><div class='add'>+	0x1B80, 0x63FC0C27,</div><div class='add'>+	0x1B80, 0x62850C35,</div><div class='add'>+	0x1B80, 0x62850C37,</div><div class='add'>+	0x1B80, 0x0BB10C45,</div><div class='add'>+	0x1B80, 0x0BB10C47,</div><div class='add'>+	0x1B80, 0xE1650C55,</div><div class='add'>+	0x1B80, 0xE1650C57,</div><div class='add'>+	0x1B80, 0xE1CB0C65,</div><div class='add'>+	0x1B80, 0xE1CB0C67,</div><div class='add'>+	0x1B80, 0x63030C75,</div><div class='add'>+	0x1B80, 0x63030C77,</div><div class='add'>+	0x1B80, 0xE1650C85,</div><div class='add'>+	0x1B80, 0xE1650C87,</div><div class='add'>+	0x1B80, 0xE1CB0C95,</div><div class='add'>+	0x1B80, 0xE1CB0C97,</div><div class='add'>+	0x1B80, 0xF7040CA5,</div><div class='add'>+	0x1B80, 0xF7040CA7,</div><div class='add'>+	0x1B80, 0x630B0CB5,</div><div class='add'>+	0x1B80, 0x630B0CB7,</div><div class='add'>+	0x1B80, 0xE1650CC5,</div><div class='add'>+	0x1B80, 0xE1650CC7,</div><div class='add'>+	0x1B80, 0xE1CB0CD5,</div><div class='add'>+	0x1B80, 0xE1CB0CD7,</div><div class='add'>+	0x1B80, 0x00010CE5,</div><div class='add'>+	0x1B80, 0x00010CE7,</div><div class='add'>+	0x1B80, 0x30F30CF5,</div><div class='add'>+	0x1B80, 0x30F30CF7,</div><div class='add'>+	0x1B80, 0x00230D05,</div><div class='add'>+	0x1B80, 0x00230D07,</div><div class='add'>+	0x1B80, 0xE1D00D15,</div><div class='add'>+	0x1B80, 0xE1D00D17,</div><div class='add'>+	0x1B80, 0x00020D25,</div><div class='add'>+	0x1B80, 0x00020D27,</div><div class='add'>+	0x1B80, 0x54E90D35,</div><div class='add'>+	0x1B80, 0x54E90D37,</div><div class='add'>+	0x1B80, 0x0BA60D45,</div><div class='add'>+	0x1B80, 0x0BA60D47,</div><div class='add'>+	0x1B80, 0x00230D55,</div><div class='add'>+	0x1B80, 0x00230D57,</div><div class='add'>+	0x1B80, 0xE1D00D65,</div><div class='add'>+	0x1B80, 0xE1D00D67,</div><div class='add'>+	0x1B80, 0x00020D75,</div><div class='add'>+	0x1B80, 0x00020D77,</div><div class='add'>+	0x1B80, 0x4D100D85,</div><div class='add'>+	0x1B80, 0x4D100D87,</div><div class='add'>+	0x1B80, 0x30A40D95,</div><div class='add'>+	0x1B80, 0x30A40D97,</div><div class='add'>+	0x1B80, 0x30ED0DA5,</div><div class='add'>+	0x1B80, 0x30ED0DA7,</div><div class='add'>+	0x1B80, 0x00220DB5,</div><div class='add'>+	0x1B80, 0x00220DB7,</div><div class='add'>+	0x1B80, 0xE1D00DC5,</div><div class='add'>+	0x1B80, 0xE1D00DC7,</div><div class='add'>+	0x1B80, 0x00020DD5,</div><div class='add'>+	0x1B80, 0x00020DD7,</div><div class='add'>+	0x1B80, 0x54E80DE5,</div><div class='add'>+	0x1B80, 0x54E80DE7,</div><div class='add'>+	0x1B80, 0x0BA60DF5,</div><div class='add'>+	0x1B80, 0x0BA60DF7,</div><div class='add'>+	0x1B80, 0x00220E05,</div><div class='add'>+	0x1B80, 0x00220E07,</div><div class='add'>+	0x1B80, 0xE1D00E15,</div><div class='add'>+	0x1B80, 0xE1D00E17,</div><div class='add'>+	0x1B80, 0x00020E25,</div><div class='add'>+	0x1B80, 0x00020E27,</div><div class='add'>+	0x1B80, 0x4D100E35,</div><div class='add'>+	0x1B80, 0x4D100E37,</div><div class='add'>+	0x1B80, 0x30A40E45,</div><div class='add'>+	0x1B80, 0x30A40E47,</div><div class='add'>+	0x1B80, 0x5C320E55,</div><div class='add'>+	0x1B80, 0x5C320E57,</div><div class='add'>+	0x1B80, 0x54F00E65,</div><div class='add'>+	0x1B80, 0x54F00E67,</div><div class='add'>+	0x1B80, 0x67F10E75,</div><div class='add'>+	0x1B80, 0x67F10E77,</div><div class='add'>+	0x1B80, 0xE1930E85,</div><div class='add'>+	0x1B80, 0xE1930E87,</div><div class='add'>+	0x1B80, 0xE1D00E95,</div><div class='add'>+	0x1B80, 0xE1D00E97,</div><div class='add'>+	0x1B80, 0x67F40EA5,</div><div class='add'>+	0x1B80, 0x67F40EA7,</div><div class='add'>+	0x1B80, 0xE1930EB5,</div><div class='add'>+	0x1B80, 0xE1930EB7,</div><div class='add'>+	0x1B80, 0xE1D00EC5,</div><div class='add'>+	0x1B80, 0xE1D00EC7,</div><div class='add'>+	0x1B80, 0x5C320ED5,</div><div class='add'>+	0x1B80, 0x5C320ED7,</div><div class='add'>+	0x1B80, 0x54F10EE5,</div><div class='add'>+	0x1B80, 0x54F10EE7,</div><div class='add'>+	0x1B80, 0x0BA80EF5,</div><div class='add'>+	0x1B80, 0x0BA80EF7,</div><div class='add'>+	0x1B80, 0x67F80F05,</div><div class='add'>+	0x1B80, 0x67F80F07,</div><div class='add'>+	0x1B80, 0xE1930F15,</div><div class='add'>+	0x1B80, 0xE1930F17,</div><div class='add'>+	0x1B80, 0xE1D00F25,</div><div class='add'>+	0x1B80, 0xE1D00F27,</div><div class='add'>+	0x1B80, 0x5C320F35,</div><div class='add'>+	0x1B80, 0x5C320F37,</div><div class='add'>+	0x1B80, 0x54F10F45,</div><div class='add'>+	0x1B80, 0x54F10F47,</div><div class='add'>+	0x1B80, 0x0BA90F55,</div><div class='add'>+	0x1B80, 0x0BA90F57,</div><div class='add'>+	0x1B80, 0x67FC0F65,</div><div class='add'>+	0x1B80, 0x67FC0F67,</div><div class='add'>+	0x1B80, 0xE1930F75,</div><div class='add'>+	0x1B80, 0xE1930F77,</div><div class='add'>+	0x1B80, 0xE1D00F85,</div><div class='add'>+	0x1B80, 0xE1D00F87,</div><div class='add'>+	0x1B80, 0x67FF0F95,</div><div class='add'>+	0x1B80, 0x67FF0F97,</div><div class='add'>+	0x1B80, 0xE1930FA5,</div><div class='add'>+	0x1B80, 0xE1930FA7,</div><div class='add'>+	0x1B80, 0xE1D00FB5,</div><div class='add'>+	0x1B80, 0xE1D00FB7,</div><div class='add'>+	0x1B80, 0x5C320FC5,</div><div class='add'>+	0x1B80, 0x5C320FC7,</div><div class='add'>+	0x1B80, 0x54F20FD5,</div><div class='add'>+	0x1B80, 0x54F20FD7,</div><div class='add'>+	0x1B80, 0x67000FE5,</div><div class='add'>+	0x1B80, 0x67000FE7,</div><div class='add'>+	0x1B80, 0xE1930FF5,</div><div class='add'>+	0x1B80, 0xE1930FF7,</div><div class='add'>+	0x1B80, 0xE1D01005,</div><div class='add'>+	0x1B80, 0xE1D01007,</div><div class='add'>+	0x1B80, 0x67031015,</div><div class='add'>+	0x1B80, 0x67031017,</div><div class='add'>+	0x1B80, 0xE1931025,</div><div class='add'>+	0x1B80, 0xE1931027,</div><div class='add'>+	0x1B80, 0xE1D01035,</div><div class='add'>+	0x1B80, 0xE1D01037,</div><div class='add'>+	0x1B80, 0xF9CC1045,</div><div class='add'>+	0x1B80, 0xF9CC1047,</div><div class='add'>+	0x1B80, 0x67071055,</div><div class='add'>+	0x1B80, 0x67071057,</div><div class='add'>+	0x1B80, 0xE1931065,</div><div class='add'>+	0x1B80, 0xE1931067,</div><div class='add'>+	0x1B80, 0xE1D01075,</div><div class='add'>+	0x1B80, 0xE1D01077,</div><div class='add'>+	0x1B80, 0xFAD31085,</div><div class='add'>+	0x1B80, 0xFAD31087,</div><div class='add'>+	0x1B80, 0x5C321095,</div><div class='add'>+	0x1B80, 0x5C321097,</div><div class='add'>+	0x1B80, 0x54F310A5,</div><div class='add'>+	0x1B80, 0x54F310A7,</div><div class='add'>+	0x1B80, 0x670B10B5,</div><div class='add'>+	0x1B80, 0x670B10B7,</div><div class='add'>+	0x1B80, 0xE19310C5,</div><div class='add'>+	0x1B80, 0xE19310C7,</div><div class='add'>+	0x1B80, 0xE1D010D5,</div><div class='add'>+	0x1B80, 0xE1D010D7,</div><div class='add'>+	0x1B80, 0x670E10E5,</div><div class='add'>+	0x1B80, 0x670E10E7,</div><div class='add'>+	0x1B80, 0xE19310F5,</div><div class='add'>+	0x1B80, 0xE19310F7,</div><div class='add'>+	0x1B80, 0xE1D01105,</div><div class='add'>+	0x1B80, 0xE1D01107,</div><div class='add'>+	0x1B80, 0x4D101115,</div><div class='add'>+	0x1B80, 0x4D101117,</div><div class='add'>+	0x1B80, 0x30A41125,</div><div class='add'>+	0x1B80, 0x30A41127,</div><div class='add'>+	0x1B80, 0x00011135,</div><div class='add'>+	0x1B80, 0x00011137,</div><div class='add'>+	0x1B80, 0x6C001145,</div><div class='add'>+	0x1B80, 0x6C001147,</div><div class='add'>+	0x1B80, 0x00061155,</div><div class='add'>+	0x1B80, 0x00061157,</div><div class='add'>+	0x1B80, 0x53001165,</div><div class='add'>+	0x1B80, 0x53001167,</div><div class='add'>+	0x1B80, 0x57F71175,</div><div class='add'>+	0x1B80, 0x57F71177,</div><div class='add'>+	0x1B80, 0x58211185,</div><div class='add'>+	0x1B80, 0x58211187,</div><div class='add'>+	0x1B80, 0x592E1195,</div><div class='add'>+	0x1B80, 0x592E1197,</div><div class='add'>+	0x1B80, 0x5A3811A5,</div><div class='add'>+	0x1B80, 0x5A3811A7,</div><div class='add'>+	0x1B80, 0x5B4111B5,</div><div class='add'>+	0x1B80, 0x5B4111B7,</div><div class='add'>+	0x1B80, 0x000711C5,</div><div class='add'>+	0x1B80, 0x000711C7,</div><div class='add'>+	0x1B80, 0x5C0011D5,</div><div class='add'>+	0x1B80, 0x5C0011D7,</div><div class='add'>+	0x1B80, 0x4B0011E5,</div><div class='add'>+	0x1B80, 0x4B0011E7,</div><div class='add'>+	0x1B80, 0x4E8F11F5,</div><div class='add'>+	0x1B80, 0x4E8F11F7,</div><div class='add'>+	0x1B80, 0x4F151205,</div><div class='add'>+	0x1B80, 0x4F151207,</div><div class='add'>+	0x1B80, 0x00041215,</div><div class='add'>+	0x1B80, 0x00041217,</div><div class='add'>+	0x1B80, 0xE1B51225,</div><div class='add'>+	0x1B80, 0xE1B51227,</div><div class='add'>+	0x1B80, 0xAB001235,</div><div class='add'>+	0x1B80, 0xAB001237,</div><div class='add'>+	0x1B80, 0x00011245,</div><div class='add'>+	0x1B80, 0x00011247,</div><div class='add'>+	0x1B80, 0x6C001255,</div><div class='add'>+	0x1B80, 0x6C001257,</div><div class='add'>+	0x1B80, 0x00061265,</div><div class='add'>+	0x1B80, 0x00061267,</div><div class='add'>+	0x1B80, 0x53001275,</div><div class='add'>+	0x1B80, 0x53001277,</div><div class='add'>+	0x1B80, 0x57F71285,</div><div class='add'>+	0x1B80, 0x57F71287,</div><div class='add'>+	0x1B80, 0x58211295,</div><div class='add'>+	0x1B80, 0x58211297,</div><div class='add'>+	0x1B80, 0x592E12A5,</div><div class='add'>+	0x1B80, 0x592E12A7,</div><div class='add'>+	0x1B80, 0x5A3812B5,</div><div class='add'>+	0x1B80, 0x5A3812B7,</div><div class='add'>+	0x1B80, 0x5B4112C5,</div><div class='add'>+	0x1B80, 0x5B4112C7,</div><div class='add'>+	0x1B80, 0x000712D5,</div><div class='add'>+	0x1B80, 0x000712D7,</div><div class='add'>+	0x1B80, 0x5C0012E5,</div><div class='add'>+	0x1B80, 0x5C0012E7,</div><div class='add'>+	0x1B80, 0x4B4012F5,</div><div class='add'>+	0x1B80, 0x4B4012F7,</div><div class='add'>+	0x1B80, 0x4E971305,</div><div class='add'>+	0x1B80, 0x4E971307,</div><div class='add'>+	0x1B80, 0x4F111315,</div><div class='add'>+	0x1B80, 0x4F111317,</div><div class='add'>+	0x1B80, 0x00041325,</div><div class='add'>+	0x1B80, 0x00041327,</div><div class='add'>+	0x1B80, 0xE1B51335,</div><div class='add'>+	0x1B80, 0xE1B51337,</div><div class='add'>+	0x1B80, 0xAB001345,</div><div class='add'>+	0x1B80, 0xAB001347,</div><div class='add'>+	0x1B80, 0x8B001355,</div><div class='add'>+	0x1B80, 0x8B001357,</div><div class='add'>+	0x1B80, 0xAB001365,</div><div class='add'>+	0x1B80, 0xAB001367,</div><div class='add'>+	0x1B80, 0x8A191375,</div><div class='add'>+	0x1B80, 0x8A191377,</div><div class='add'>+	0x1B80, 0x301D1385,</div><div class='add'>+	0x1B80, 0x301D1387,</div><div class='add'>+	0x1B80, 0x00011395,</div><div class='add'>+	0x1B80, 0x00011397,</div><div class='add'>+	0x1B80, 0x6C0113A5,</div><div class='add'>+	0x1B80, 0x6C0113A7,</div><div class='add'>+	0x1B80, 0x000613B5,</div><div class='add'>+	0x1B80, 0x000613B7,</div><div class='add'>+	0x1B80, 0x530113C5,</div><div class='add'>+	0x1B80, 0x530113C7,</div><div class='add'>+	0x1B80, 0x57F713D5,</div><div class='add'>+	0x1B80, 0x57F713D7,</div><div class='add'>+	0x1B80, 0x582113E5,</div><div class='add'>+	0x1B80, 0x582113E7,</div><div class='add'>+	0x1B80, 0x592E13F5,</div><div class='add'>+	0x1B80, 0x592E13F7,</div><div class='add'>+	0x1B80, 0x5A381405,</div><div class='add'>+	0x1B80, 0x5A381407,</div><div class='add'>+	0x1B80, 0x5B411415,</div><div class='add'>+	0x1B80, 0x5B411417,</div><div class='add'>+	0x1B80, 0x00071425,</div><div class='add'>+	0x1B80, 0x00071427,</div><div class='add'>+	0x1B80, 0x5C001435,</div><div class='add'>+	0x1B80, 0x5C001437,</div><div class='add'>+	0x1B80, 0x4B001445,</div><div class='add'>+	0x1B80, 0x4B001447,</div><div class='add'>+	0x1B80, 0x4E871455,</div><div class='add'>+	0x1B80, 0x4E871457,</div><div class='add'>+	0x1B80, 0x4F111465,</div><div class='add'>+	0x1B80, 0x4F111467,</div><div class='add'>+	0x1B80, 0x00041475,</div><div class='add'>+	0x1B80, 0x00041477,</div><div class='add'>+	0x1B80, 0xE1B51485,</div><div class='add'>+	0x1B80, 0xE1B51487,</div><div class='add'>+	0x1B80, 0xAB001495,</div><div class='add'>+	0x1B80, 0xAB001497,</div><div class='add'>+	0x1B80, 0x000614A5,</div><div class='add'>+	0x1B80, 0x000614A7,</div><div class='add'>+	0x1B80, 0x577714B5,</div><div class='add'>+	0x1B80, 0x577714B7,</div><div class='add'>+	0x1B80, 0x000714C5,</div><div class='add'>+	0x1B80, 0x000714C7,</div><div class='add'>+	0x1B80, 0x4E8614D5,</div><div class='add'>+	0x1B80, 0x4E8614D7,</div><div class='add'>+	0x1B80, 0x000414E5,</div><div class='add'>+	0x1B80, 0x000414E7,</div><div class='add'>+	0x1B80, 0x000114F5,</div><div class='add'>+	0x1B80, 0x000114F7,</div><div class='add'>+	0x1B80, 0x00011505,</div><div class='add'>+	0x1B80, 0x00011507,</div><div class='add'>+	0x1B80, 0x7B241515,</div><div class='add'>+	0x1B80, 0x7B241517,</div><div class='add'>+	0x1B80, 0x7A401525,</div><div class='add'>+	0x1B80, 0x7A401527,</div><div class='add'>+	0x1B80, 0x79001535,</div><div class='add'>+	0x1B80, 0x79001537,</div><div class='add'>+	0x1B80, 0x55031545,</div><div class='add'>+	0x1B80, 0x55031547,</div><div class='add'>+	0x1B80, 0x315D1555,</div><div class='add'>+	0x1B80, 0x315D1557,</div><div class='add'>+	0x1B80, 0x7B1C1565,</div><div class='add'>+	0x1B80, 0x7B1C1567,</div><div class='add'>+	0x1B80, 0x7A401575,</div><div class='add'>+	0x1B80, 0x7A401577,</div><div class='add'>+	0x1B80, 0x550B1585,</div><div class='add'>+	0x1B80, 0x550B1587,</div><div class='add'>+	0x1B80, 0x315D1595,</div><div class='add'>+	0x1B80, 0x315D1597,</div><div class='add'>+	0x1B80, 0x7B2015A5,</div><div class='add'>+	0x1B80, 0x7B2015A7,</div><div class='add'>+	0x1B80, 0x7A0015B5,</div><div class='add'>+	0x1B80, 0x7A0015B7,</div><div class='add'>+	0x1B80, 0x551315C5,</div><div class='add'>+	0x1B80, 0x551315C7,</div><div class='add'>+	0x1B80, 0x740115D5,</div><div class='add'>+	0x1B80, 0x740115D7,</div><div class='add'>+	0x1B80, 0x740015E5,</div><div class='add'>+	0x1B80, 0x740015E7,</div><div class='add'>+	0x1B80, 0x8E0015F5,</div><div class='add'>+	0x1B80, 0x8E0015F7,</div><div class='add'>+	0x1B80, 0x00011605,</div><div class='add'>+	0x1B80, 0x00011607,</div><div class='add'>+	0x1B80, 0x57021615,</div><div class='add'>+	0x1B80, 0x57021617,</div><div class='add'>+	0x1B80, 0x57001625,</div><div class='add'>+	0x1B80, 0x57001627,</div><div class='add'>+	0x1B80, 0x97001635,</div><div class='add'>+	0x1B80, 0x97001637,</div><div class='add'>+	0x1B80, 0x00011645,</div><div class='add'>+	0x1B80, 0x00011647,</div><div class='add'>+	0x1B80, 0x4F781655,</div><div class='add'>+	0x1B80, 0x4F781657,</div><div class='add'>+	0x1B80, 0x53881665,</div><div class='add'>+	0x1B80, 0x53881667,</div><div class='add'>+	0x1B80, 0xE1731675,</div><div class='add'>+	0x1B80, 0xE1731677,</div><div class='add'>+	0x1B80, 0x54801685,</div><div class='add'>+	0x1B80, 0x54801687,</div><div class='add'>+	0x1B80, 0x54001695,</div><div class='add'>+	0x1B80, 0x54001697,</div><div class='add'>+	0x1B80, 0xE17316A5,</div><div class='add'>+	0x1B80, 0xE17316A7,</div><div class='add'>+	0x1B80, 0x548116B5,</div><div class='add'>+	0x1B80, 0x548116B7,</div><div class='add'>+	0x1B80, 0x540016C5,</div><div class='add'>+	0x1B80, 0x540016C7,</div><div class='add'>+	0x1B80, 0xE17316D5,</div><div class='add'>+	0x1B80, 0xE17316D7,</div><div class='add'>+	0x1B80, 0x548216E5,</div><div class='add'>+	0x1B80, 0x548216E7,</div><div class='add'>+	0x1B80, 0x540016F5,</div><div class='add'>+	0x1B80, 0x540016F7,</div><div class='add'>+	0x1B80, 0xE17E1705,</div><div class='add'>+	0x1B80, 0xE17E1707,</div><div class='add'>+	0x1B80, 0xBF1D1715,</div><div class='add'>+	0x1B80, 0xBF1D1717,</div><div class='add'>+	0x1B80, 0x301D1725,</div><div class='add'>+	0x1B80, 0x301D1727,</div><div class='add'>+	0x1B80, 0xE1511735,</div><div class='add'>+	0x1B80, 0xE1511737,</div><div class='add'>+	0x1B80, 0xE1561745,</div><div class='add'>+	0x1B80, 0xE1561747,</div><div class='add'>+	0x1B80, 0xE15A1755,</div><div class='add'>+	0x1B80, 0xE15A1757,</div><div class='add'>+	0x1B80, 0xE1611765,</div><div class='add'>+	0x1B80, 0xE1611767,</div><div class='add'>+	0x1B80, 0xE1C71775,</div><div class='add'>+	0x1B80, 0xE1C71777,</div><div class='add'>+	0x1B80, 0x55131785,</div><div class='add'>+	0x1B80, 0x55131787,</div><div class='add'>+	0x1B80, 0xE15D1795,</div><div class='add'>+	0x1B80, 0xE15D1797,</div><div class='add'>+	0x1B80, 0x551517A5,</div><div class='add'>+	0x1B80, 0x551517A7,</div><div class='add'>+	0x1B80, 0xE16117B5,</div><div class='add'>+	0x1B80, 0xE16117B7,</div><div class='add'>+	0x1B80, 0xE1C717C5,</div><div class='add'>+	0x1B80, 0xE1C717C7,</div><div class='add'>+	0x1B80, 0x000117D5,</div><div class='add'>+	0x1B80, 0x000117D7,</div><div class='add'>+	0x1B80, 0x54BF17E5,</div><div class='add'>+	0x1B80, 0x54BF17E7,</div><div class='add'>+	0x1B80, 0x54C017F5,</div><div class='add'>+	0x1B80, 0x54C017F7,</div><div class='add'>+	0x1B80, 0x54A31805,</div><div class='add'>+	0x1B80, 0x54A31807,</div><div class='add'>+	0x1B80, 0x54C11815,</div><div class='add'>+	0x1B80, 0x54C11817,</div><div class='add'>+	0x1B80, 0x54A41825,</div><div class='add'>+	0x1B80, 0x54A41827,</div><div class='add'>+	0x1B80, 0x4C181835,</div><div class='add'>+	0x1B80, 0x4C181837,</div><div class='add'>+	0x1B80, 0xBF071845,</div><div class='add'>+	0x1B80, 0xBF071847,</div><div class='add'>+	0x1B80, 0x54C21855,</div><div class='add'>+	0x1B80, 0x54C21857,</div><div class='add'>+	0x1B80, 0x54A41865,</div><div class='add'>+	0x1B80, 0x54A41867,</div><div class='add'>+	0x1B80, 0xBF041875,</div><div class='add'>+	0x1B80, 0xBF041877,</div><div class='add'>+	0x1B80, 0x54C11885,</div><div class='add'>+	0x1B80, 0x54C11887,</div><div class='add'>+	0x1B80, 0x54A31895,</div><div class='add'>+	0x1B80, 0x54A31897,</div><div class='add'>+	0x1B80, 0xBF0118A5,</div><div class='add'>+	0x1B80, 0xBF0118A7,</div><div class='add'>+	0x1B80, 0xE1D518B5,</div><div class='add'>+	0x1B80, 0xE1D518B7,</div><div class='add'>+	0x1B80, 0x54DF18C5,</div><div class='add'>+	0x1B80, 0x54DF18C7,</div><div class='add'>+	0x1B80, 0x000118D5,</div><div class='add'>+	0x1B80, 0x000118D7,</div><div class='add'>+	0x1B80, 0x54BF18E5,</div><div class='add'>+	0x1B80, 0x54BF18E7,</div><div class='add'>+	0x1B80, 0x54E518F5,</div><div class='add'>+	0x1B80, 0x54E518F7,</div><div class='add'>+	0x1B80, 0x050A1905,</div><div class='add'>+	0x1B80, 0x050A1907,</div><div class='add'>+	0x1B80, 0x54DF1915,</div><div class='add'>+	0x1B80, 0x54DF1917,</div><div class='add'>+	0x1B80, 0x00011925,</div><div class='add'>+	0x1B80, 0x00011927,</div><div class='add'>+	0x1B80, 0x7F201935,</div><div class='add'>+	0x1B80, 0x7F201937,</div><div class='add'>+	0x1B80, 0x7E001945,</div><div class='add'>+	0x1B80, 0x7E001947,</div><div class='add'>+	0x1B80, 0x7D001955,</div><div class='add'>+	0x1B80, 0x7D001957,</div><div class='add'>+	0x1B80, 0x55011965,</div><div class='add'>+	0x1B80, 0x55011967,</div><div class='add'>+	0x1B80, 0x5C311975,</div><div class='add'>+	0x1B80, 0x5C311977,</div><div class='add'>+	0x1B80, 0xE15D1985,</div><div class='add'>+	0x1B80, 0xE15D1987,</div><div class='add'>+	0x1B80, 0xE1611995,</div><div class='add'>+	0x1B80, 0xE1611997,</div><div class='add'>+	0x1B80, 0x548019A5,</div><div class='add'>+	0x1B80, 0x548019A7,</div><div class='add'>+	0x1B80, 0x540019B5,</div><div class='add'>+	0x1B80, 0x540019B7,</div><div class='add'>+	0x1B80, 0xE15D19C5,</div><div class='add'>+	0x1B80, 0xE15D19C7,</div><div class='add'>+	0x1B80, 0xE16119D5,</div><div class='add'>+	0x1B80, 0xE16119D7,</div><div class='add'>+	0x1B80, 0x548119E5,</div><div class='add'>+	0x1B80, 0x548119E7,</div><div class='add'>+	0x1B80, 0x540019F5,</div><div class='add'>+	0x1B80, 0x540019F7,</div><div class='add'>+	0x1B80, 0xE15D1A05,</div><div class='add'>+	0x1B80, 0xE15D1A07,</div><div class='add'>+	0x1B80, 0xE1611A15,</div><div class='add'>+	0x1B80, 0xE1611A17,</div><div class='add'>+	0x1B80, 0x54821A25,</div><div class='add'>+	0x1B80, 0x54821A27,</div><div class='add'>+	0x1B80, 0x54001A35,</div><div class='add'>+	0x1B80, 0x54001A37,</div><div class='add'>+	0x1B80, 0xE17E1A45,</div><div class='add'>+	0x1B80, 0xE17E1A47,</div><div class='add'>+	0x1B80, 0xBFE91A55,</div><div class='add'>+	0x1B80, 0xBFE91A57,</div><div class='add'>+	0x1B80, 0x301D1A65,</div><div class='add'>+	0x1B80, 0x301D1A67,</div><div class='add'>+	0x1B80, 0x00231A75,</div><div class='add'>+	0x1B80, 0x00231A77,</div><div class='add'>+	0x1B80, 0x7B201A85,</div><div class='add'>+	0x1B80, 0x7B201A87,</div><div class='add'>+	0x1B80, 0x7A001A95,</div><div class='add'>+	0x1B80, 0x7A001A97,</div><div class='add'>+	0x1B80, 0x79001AA5,</div><div class='add'>+	0x1B80, 0x79001AA7,</div><div class='add'>+	0x1B80, 0xE1CB1AB5,</div><div class='add'>+	0x1B80, 0xE1CB1AB7,</div><div class='add'>+	0x1B80, 0x00021AC5,</div><div class='add'>+	0x1B80, 0x00021AC7,</div><div class='add'>+	0x1B80, 0x00011AD5,</div><div class='add'>+	0x1B80, 0x00011AD7,</div><div class='add'>+	0x1B80, 0x00221AE5,</div><div class='add'>+	0x1B80, 0x00221AE7,</div><div class='add'>+	0x1B80, 0x7B201AF5,</div><div class='add'>+	0x1B80, 0x7B201AF7,</div><div class='add'>+	0x1B80, 0x7A001B05,</div><div class='add'>+	0x1B80, 0x7A001B07,</div><div class='add'>+	0x1B80, 0x79001B15,</div><div class='add'>+	0x1B80, 0x79001B17,</div><div class='add'>+	0x1B80, 0xE1CB1B25,</div><div class='add'>+	0x1B80, 0xE1CB1B27,</div><div class='add'>+	0x1B80, 0x00021B35,</div><div class='add'>+	0x1B80, 0x00021B37,</div><div class='add'>+	0x1B80, 0x00011B45,</div><div class='add'>+	0x1B80, 0x00011B47,</div><div class='add'>+	0x1B80, 0x74021B55,</div><div class='add'>+	0x1B80, 0x74021B57,</div><div class='add'>+	0x1B80, 0x003F1B65,</div><div class='add'>+	0x1B80, 0x003F1B67,</div><div class='add'>+	0x1B80, 0x74001B75,</div><div class='add'>+	0x1B80, 0x74001B77,</div><div class='add'>+	0x1B80, 0x00021B85,</div><div class='add'>+	0x1B80, 0x00021B87,</div><div class='add'>+	0x1B80, 0x00011B95,</div><div class='add'>+	0x1B80, 0x00011B97,</div><div class='add'>+	0x1B80, 0x4D041BA5,</div><div class='add'>+	0x1B80, 0x4D041BA7,</div><div class='add'>+	0x1B80, 0x2EF81BB5,</div><div class='add'>+	0x1B80, 0x2EF81BB7,</div><div class='add'>+	0x1B80, 0x00001BC5,</div><div class='add'>+	0x1B80, 0x00001BC7,</div><div class='add'>+	0x1B80, 0x23301BD5,</div><div class='add'>+	0x1B80, 0x23301BD7,</div><div class='add'>+	0x1B80, 0x00241BE5,</div><div class='add'>+	0x1B80, 0x00241BE7,</div><div class='add'>+	0x1B80, 0x23E01BF5,</div><div class='add'>+	0x1B80, 0x23E01BF7,</div><div class='add'>+	0x1B80, 0x003F1C05,</div><div class='add'>+	0x1B80, 0x003F1C07,</div><div class='add'>+	0x1B80, 0x23FC1C15,</div><div class='add'>+	0x1B80, 0x23FC1C17,</div><div class='add'>+	0x1B80, 0xBFCE1C25,</div><div class='add'>+	0x1B80, 0xBFCE1C27,</div><div class='add'>+	0x1B80, 0x2EF01C35,</div><div class='add'>+	0x1B80, 0x2EF01C37,</div><div class='add'>+	0x1B80, 0x00001C45,</div><div class='add'>+	0x1B80, 0x00001C47,</div><div class='add'>+	0x1B80, 0x4D001C55,</div><div class='add'>+	0x1B80, 0x4D001C57,</div><div class='add'>+	0x1B80, 0x00011C65,</div><div class='add'>+	0x1B80, 0x00011C67,</div><div class='add'>+	0x1B80, 0x549F1C75,</div><div class='add'>+	0x1B80, 0x549F1C77,</div><div class='add'>+	0x1B80, 0x54FF1C85,</div><div class='add'>+	0x1B80, 0x54FF1C87,</div><div class='add'>+	0x1B80, 0x54001C95,</div><div class='add'>+	0x1B80, 0x54001C97,</div><div class='add'>+	0x1B80, 0x00011CA5,</div><div class='add'>+	0x1B80, 0x00011CA7,</div><div class='add'>+	0x1B80, 0x5C311CB5,</div><div class='add'>+	0x1B80, 0x5C311CB7,</div><div class='add'>+	0x1B80, 0x07141CC5,</div><div class='add'>+	0x1B80, 0x07141CC7,</div><div class='add'>+	0x1B80, 0x54001CD5,</div><div class='add'>+	0x1B80, 0x54001CD7,</div><div class='add'>+	0x1B80, 0x5C321CE5,</div><div class='add'>+	0x1B80, 0x5C321CE7,</div><div class='add'>+	0x1B80, 0x00011CF5,</div><div class='add'>+	0x1B80, 0x00011CF7,</div><div class='add'>+	0x1B80, 0x5C321D05,</div><div class='add'>+	0x1B80, 0x5C321D07,</div><div class='add'>+	0x1B80, 0x07141D15,</div><div class='add'>+	0x1B80, 0x07141D17,</div><div class='add'>+	0x1B80, 0x54001D25,</div><div class='add'>+	0x1B80, 0x54001D27,</div><div class='add'>+	0x1B80, 0x5C311D35,</div><div class='add'>+	0x1B80, 0x5C311D37,</div><div class='add'>+	0x1B80, 0x00011D45,</div><div class='add'>+	0x1B80, 0x00011D47,</div><div class='add'>+	0x1B80, 0x4C981D55,</div><div class='add'>+	0x1B80, 0x4C981D57,</div><div class='add'>+	0x1B80, 0x4C181D65,</div><div class='add'>+	0x1B80, 0x4C181D67,</div><div class='add'>+	0x1B80, 0x00011D75,</div><div class='add'>+	0x1B80, 0x00011D77,</div><div class='add'>+	0x1B80, 0x5C321D85,</div><div class='add'>+	0x1B80, 0x5C321D87,</div><div class='add'>+	0x1B80, 0x62841D95,</div><div class='add'>+	0x1B80, 0x62841D97,</div><div class='add'>+	0x1B80, 0x66861DA5,</div><div class='add'>+	0x1B80, 0x66861DA7,</div><div class='add'>+	0x1B80, 0x6C031DB5,</div><div class='add'>+	0x1B80, 0x6C031DB7,</div><div class='add'>+	0x1B80, 0x7B201DC5,</div><div class='add'>+	0x1B80, 0x7B201DC7,</div><div class='add'>+	0x1B80, 0x7A001DD5,</div><div class='add'>+	0x1B80, 0x7A001DD7,</div><div class='add'>+	0x1B80, 0x79001DE5,</div><div class='add'>+	0x1B80, 0x79001DE7,</div><div class='add'>+	0x1B80, 0x7F201DF5,</div><div class='add'>+	0x1B80, 0x7F201DF7,</div><div class='add'>+	0x1B80, 0x7E001E05,</div><div class='add'>+	0x1B80, 0x7E001E07,</div><div class='add'>+	0x1B80, 0x7D001E15,</div><div class='add'>+	0x1B80, 0x7D001E17,</div><div class='add'>+	0x1B80, 0x09011E25,</div><div class='add'>+	0x1B80, 0x09011E27,</div><div class='add'>+	0x1B80, 0x0C011E35,</div><div class='add'>+	0x1B80, 0x0C011E37,</div><div class='add'>+	0x1B80, 0x0BA61E45,</div><div class='add'>+	0x1B80, 0x0BA61E47,</div><div class='add'>+	0x1B80, 0x00011E55,</div><div class='add'>+	0x1B80, 0x00011E57,</div><div class='add'>+	0x1B80, 0x00000006,</div><div class='add'>+	0x1B80, 0x00000002,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822b_bb, rtw_phy_cfg_bb);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_bb_pg_type2[] = {</div><div class='add'>+	0, 0, 0, 0x00000c20, 0xffffffff, 0x32343638,</div><div class='add'>+	0, 0, 0, 0x00000c24, 0xffffffff, 0x36384042,</div><div class='add'>+	0, 0, 0, 0x00000c28, 0xffffffff, 0x28303234,</div><div class='add'>+	0, 0, 0, 0x00000c2c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 0, 0, 0x00000c30, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 0, 1, 0x00000c34, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 0, 1, 0x00000c38, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 0, 0, 0x00000c3c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 0, 0, 0x00000c40, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 0, 0, 0x00000c44, 0xffffffff, 0x38402224,</div><div class='add'>+	0, 0, 1, 0x00000c48, 0xffffffff, 0x30323436,</div><div class='add'>+	0, 0, 1, 0x00000c4c, 0xffffffff, 0x22242628,</div><div class='add'>+	0, 1, 0, 0x00000e20, 0xffffffff, 0x32343638,</div><div class='add'>+	0, 1, 0, 0x00000e24, 0xffffffff, 0x36384042,</div><div class='add'>+	0, 1, 0, 0x00000e28, 0xffffffff, 0x28303234,</div><div class='add'>+	0, 1, 0, 0x00000e2c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 1, 0, 0x00000e30, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 1, 1, 0x00000e34, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 1, 1, 0x00000e38, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 1, 0, 0x00000e3c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 1, 0, 0x00000e40, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 1, 0, 0x00000e44, 0xffffffff, 0x38402224,</div><div class='add'>+	0, 1, 1, 0x00000e48, 0xffffffff, 0x30323436,</div><div class='add'>+	0, 1, 1, 0x00000e4c, 0xffffffff, 0x22242628,</div><div class='add'>+	1, 0, 0, 0x00000c24, 0xffffffff, 0x40424446,</div><div class='add'>+	1, 0, 0, 0x00000c28, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 0, 0, 0x00000c2c, 0xffffffff, 0x38404244,</div><div class='add'>+	1, 0, 0, 0x00000c30, 0xffffffff, 0x30323436,</div><div class='add'>+	1, 0, 1, 0x00000c34, 0xffffffff, 0x38404244,</div><div class='add'>+	1, 0, 1, 0x00000c38, 0xffffffff, 0x30323436,</div><div class='add'>+	1, 0, 0, 0x00000c3c, 0xffffffff, 0x38404244,</div><div class='add'>+	1, 0, 0, 0x00000c40, 0xffffffff, 0x30323436,</div><div class='add'>+	1, 0, 0, 0x00000c44, 0xffffffff, 0x42442628,</div><div class='add'>+	1, 0, 1, 0x00000c48, 0xffffffff, 0x34363840,</div><div class='add'>+	1, 0, 1, 0x00000c4c, 0xffffffff, 0x26283032,</div><div class='add'>+	1, 1, 0, 0x00000e24, 0xffffffff, 0x40424446,</div><div class='add'>+	1, 1, 0, 0x00000e28, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 1, 0, 0x00000e2c, 0xffffffff, 0x38404244,</div><div class='add'>+	1, 1, 0, 0x00000e30, 0xffffffff, 0x30323436,</div><div class='add'>+	1, 1, 1, 0x00000e34, 0xffffffff, 0x38404244,</div><div class='add'>+	1, 1, 1, 0x00000e38, 0xffffffff, 0x30323436,</div><div class='add'>+	1, 1, 0, 0x00000e3c, 0xffffffff, 0x38404244,</div><div class='add'>+	1, 1, 0, 0x00000e40, 0xffffffff, 0x30323436,</div><div class='add'>+	1, 1, 0, 0x00000e44, 0xffffffff, 0x42442628,</div><div class='add'>+	1, 1, 1, 0x00000e48, 0xffffffff, 0x34363840,</div><div class='add'>+	1, 1, 1, 0x00000e4c, 0xffffffff, 0x26283032</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_BB_PG(rtw8822b_bb_pg_type2);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_bb_pg_type5[] = {</div><div class='add'>+	0, 0, 0, 0x00000c20, 0xffffffff, 0x32343638,</div><div class='add'>+	0, 0, 0, 0x00000c24, 0xffffffff, 0x36384042,</div><div class='add'>+	0, 0, 0, 0x00000c28, 0xffffffff, 0x28303234,</div><div class='add'>+	0, 0, 0, 0x00000c2c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 0, 0, 0x00000c30, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 0, 1, 0x00000c34, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 0, 1, 0x00000c38, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 0, 0, 0x00000c3c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 0, 0, 0x00000c40, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 0, 0, 0x00000c44, 0xffffffff, 0x38402224,</div><div class='add'>+	0, 0, 1, 0x00000c48, 0xffffffff, 0x30323436,</div><div class='add'>+	0, 0, 1, 0x00000c4c, 0xffffffff, 0x22242628,</div><div class='add'>+	0, 1, 0, 0x00000e20, 0xffffffff, 0x32343638,</div><div class='add'>+	0, 1, 0, 0x00000e24, 0xffffffff, 0x36384042,</div><div class='add'>+	0, 1, 0, 0x00000e28, 0xffffffff, 0x28303234,</div><div class='add'>+	0, 1, 0, 0x00000e2c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 1, 0, 0x00000e30, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 1, 1, 0x00000e34, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 1, 1, 0x00000e38, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 1, 0, 0x00000e3c, 0xffffffff, 0x34363840,</div><div class='add'>+	0, 1, 0, 0x00000e40, 0xffffffff, 0x26283032,</div><div class='add'>+	0, 1, 0, 0x00000e44, 0xffffffff, 0x38402224,</div><div class='add'>+	0, 1, 1, 0x00000e48, 0xffffffff, 0x30323436,</div><div class='add'>+	0, 1, 1, 0x00000e4c, 0xffffffff, 0x22242628,</div><div class='add'>+	1, 0, 0, 0x00000c24, 0xffffffff, 0x34363840,</div><div class='add'>+	1, 0, 0, 0x00000c28, 0xffffffff, 0x26283032,</div><div class='add'>+	1, 0, 0, 0x00000c2c, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 0, 0, 0x00000c30, 0xffffffff, 0x24262830,</div><div class='add'>+	1, 0, 1, 0x00000c34, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 0, 1, 0x00000c38, 0xffffffff, 0x24262830,</div><div class='add'>+	1, 0, 0, 0x00000c3c, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 0, 0, 0x00000c40, 0xffffffff, 0x24262830,</div><div class='add'>+	1, 0, 0, 0x00000c44, 0xffffffff, 0x36382022,</div><div class='add'>+	1, 0, 1, 0x00000c48, 0xffffffff, 0x28303234,</div><div class='add'>+	1, 0, 1, 0x00000c4c, 0xffffffff, 0x20222426,</div><div class='add'>+	1, 1, 0, 0x00000e24, 0xffffffff, 0x34363840,</div><div class='add'>+	1, 1, 0, 0x00000e28, 0xffffffff, 0x26283032,</div><div class='add'>+	1, 1, 0, 0x00000e2c, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 1, 0, 0x00000e30, 0xffffffff, 0x24262830,</div><div class='add'>+	1, 1, 1, 0x00000e34, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 1, 1, 0x00000e38, 0xffffffff, 0x24262830,</div><div class='add'>+	1, 1, 0, 0x00000e3c, 0xffffffff, 0x32343638,</div><div class='add'>+	1, 1, 0, 0x00000e40, 0xffffffff, 0x24262830,</div><div class='add'>+	1, 1, 0, 0x00000e44, 0xffffffff, 0x36382022,</div><div class='add'>+	1, 1, 1, 0x00000e48, 0xffffffff, 0x28303234,</div><div class='add'>+	1, 1, 1, 0x00000e4c, 0xffffffff, 0x20222426</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_BB_PG(rtw8822b_bb_pg_type5);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_rf_a[] = {</div><div class='add'>+	0x000, 0x00030000,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x001, 0x0004002D,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x001, 0x00040029,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x018, 0x00010D24,</div><div class='add'>+	0x0EF, 0x00080000,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03E, 0x0000003F,</div><div class='add'>+	0x8300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000D0F4E,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0F4E,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03E, 0x00000034,</div><div class='add'>+	0x03F, 0x0004080E,</div><div class='add'>+	0x0EF, 0x00080000,</div><div class='add'>+	0x0DF, 0x00002449,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03E, 0x0000003F,</div><div class='add'>+	0x03F, 0x00060FDE,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00080000,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03E, 0x00000037,</div><div class='add'>+	0x03F, 0x0007EFCE,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00080000,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03E, 0x00000037,</div><div class='add'>+	0x03F, 0x000DEFCE,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x07F, 0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FB0F8,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0B1, 0x0007DBE4,</div><div class='add'>+	0x0B2, 0x000225D1,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x0007C330,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x0003C360,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0B3, 0x000FC760,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0B4, 0x00099DD0,</div><div class='add'>+	0x0B5, 0x000400FC,</div><div class='add'>+	0x0B6, 0x000187F0,</div><div class='add'>+	0x0B7, 0x00030018,</div><div class='add'>+	0x0B8, 0x00080800,</div><div class='add'>+	0x0B9, 0x00000000,</div><div class='add'>+	0x0BA, 0x00008000,</div><div class='add'>+	0x0BB, 0x00000000,</div><div class='add'>+	0x0BC, 0x00040030,</div><div class='add'>+	0x0BD, 0x00000000,</div><div class='add'>+	0x0BE, 0x00000000,</div><div class='add'>+	0x0BF, 0x00000000,</div><div class='add'>+	0x0C0, 0x00000000,</div><div class='add'>+	0x0C1, 0x00000000,</div><div class='add'>+	0x0C2, 0x00000000,</div><div class='add'>+	0x0C3, 0x00000000,</div><div class='add'>+	0x0C4, 0x00002402,</div><div class='add'>+	0x0C5, 0x00000009,</div><div class='add'>+	0x0C6, 0x00040299,</div><div class='add'>+	0x0C7, 0x00055555,</div><div class='add'>+	0x0C8, 0x0000C16C,</div><div class='add'>+	0x0C9, 0x0001C146,</div><div class='add'>+	0x0CA, 0x00000000,</div><div class='add'>+	0x0CB, 0x00000000,</div><div class='add'>+	0x0CC, 0x00000000,</div><div class='add'>+	0x0CD, 0x00000000,</div><div class='add'>+	0x0CE, 0x00090C00,</div><div class='add'>+	0x0CF, 0x0006D200,</div><div class='add'>+	0x0DF, 0x00000009,</div><div class='add'>+	0x018, 0x00010524,</div><div class='add'>+	0x089, 0x00000207,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FE186,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FE186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FE186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x08A, 0x000FF186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x08B, 0x00061E3C,</div><div class='add'>+	0x08C, 0x000112C7,</div><div class='add'>+	0x08D, 0x000F4988,</div><div class='add'>+	0x08E, 0x00064D40,</div><div class='add'>+	0x0EF, 0x00020000,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000DFF86,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000DFF86,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004084,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004108,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x0000490C,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005E00,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005862,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005948,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x0000000F,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000DFF86,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000DFF86,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x033, 0x0000000E,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x0000000D,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x0000000C,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x0000000B,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000017,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03E, 0x00004000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000DFF86,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0006,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000016,</div><div class='add'>+	0x03E, 0x00004080,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000015,</div><div class='add'>+	0x03E, 0x000040C8,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000014,</div><div class='add'>+	0x03E, 0x00004190,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000013,</div><div class='add'>+	0x03E, 0x00004998,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000012,</div><div class='add'>+	0x03E, 0x00005840,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000011,</div><div class='add'>+	0x03E, 0x000058C2,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x033, 0x00000010,</div><div class='add'>+	0x03E, 0x00005930,</div><div class='add'>+	0x03F, 0x000C3186,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00004000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x018, 0x00000401,</div><div class='add'>+	0x084, 0x00001209,</div><div class='add'>+	0x086, 0x000001A0,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x087, 0x00068080,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x087, 0x000E8180,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x088, 0x00070020,</div><div class='add'>+	0x0DE, 0x00000010,</div><div class='add'>+	0x0EF, 0x00008000,</div><div class='add'>+	0x033, 0x0000000F,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x033, 0x0000000E,</div><div class='add'>+	0x03F, 0x00000038,</div><div class='add'>+	0x033, 0x0000000D,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x0000000C,</div><div class='add'>+	0x03F, 0x00000028,</div><div class='add'>+	0x033, 0x0000000B,</div><div class='add'>+	0x03F, 0x00000020,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x00000018,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000010,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x00000038,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000028,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000020,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000018,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000010,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0B8, 0x00080A00,</div><div class='add'>+	0x0FE, 0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0FA,</div><div class='add'>+	0x0FE, 0x00000000,</div><div class='add'>+	0x0FE, 0x00000000,</div><div class='add'>+	0x0CA, 0x00080000,</div><div class='add'>+	0x0FE, 0x00000000,</div><div class='add'>+	0x0C9, 0x0001C141,</div><div class='add'>+	0x0FE, 0x00000000,</div><div class='add'>+	0x0FE, 0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0F8,</div><div class='add'>+	0x018, 0x00018D24,</div><div class='add'>+	0xFFE, 0x00000000,</div><div class='add'>+	0xFFE, 0x00000000,</div><div class='add'>+	0xFFE, 0x00000000,</div><div class='add'>+	0xFFE, 0x00000000,</div><div class='add'>+	0x018, 0x00010D24,</div><div class='add'>+	0x01B, 0x00075A40,</div><div class='add'>+	0x0EE, 0x00000002,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000004,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000004,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000004,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000004,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000004,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x00000004,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000000,</div><div class='add'>+	0x0EE, 0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D3D1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D2A1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D2A1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D3D1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D3D1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D3D1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D3D1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D2A1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D2A1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D2A1,</div><div class='add'>+	0x062, 0x0000D3A2,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D301,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D4A0,</div><div class='add'>+	0x062, 0x0000D203,</div><div class='add'>+	0x063, 0x00000062,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x061, 0x0005D3D0,</div><div class='add'>+	0x062, 0x0000D303,</div><div class='add'>+	0x063, 0x00000002,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A3,</div><div class='add'>+	0x030, 0x000093A3,</div><div class='add'>+	0x030, 0x0000A3A3,</div><div class='add'>+	0x030, 0x0000B3A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A3,</div><div class='add'>+	0x030, 0x000014A3,</div><div class='add'>+	0x030, 0x000024A3,</div><div class='add'>+	0x030, 0x000034A3,</div><div class='add'>+	0x030, 0x000044A3,</div><div class='add'>+	0x030, 0x000054A3,</div><div class='add'>+	0x030, 0x000064A3,</div><div class='add'>+	0x030, 0x000074A3,</div><div class='add'>+	0x030, 0x000084A3,</div><div class='add'>+	0x030, 0x000094A3,</div><div class='add'>+	0x030, 0x0000A4A3,</div><div class='add'>+	0x030, 0x0000B4A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000002A6,</div><div class='add'>+	0x030, 0x000012A6,</div><div class='add'>+	0x030, 0x000022A6,</div><div class='add'>+	0x030, 0x000032A6,</div><div class='add'>+	0x030, 0x000042A6,</div><div class='add'>+	0x030, 0x000052A6,</div><div class='add'>+	0x030, 0x000062A6,</div><div class='add'>+	0x030, 0x000072A6,</div><div class='add'>+	0x030, 0x000082A6,</div><div class='add'>+	0x030, 0x000092A6,</div><div class='add'>+	0x030, 0x0000A2A6,</div><div class='add'>+	0x030, 0x0000B2A6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000303,</div><div class='add'>+	0x030, 0x00001303,</div><div class='add'>+	0x030, 0x00002303,</div><div class='add'>+	0x030, 0x00003303,</div><div class='add'>+	0x030, 0x000043A4,</div><div class='add'>+	0x030, 0x000053A4,</div><div class='add'>+	0x030, 0x000063A4,</div><div class='add'>+	0x030, 0x000073A4,</div><div class='add'>+	0x030, 0x00008365,</div><div class='add'>+	0x030, 0x00009365,</div><div class='add'>+	0x030, 0x0000A365,</div><div class='add'>+	0x030, 0x0000B365,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000002A6,</div><div class='add'>+	0x030, 0x000012A6,</div><div class='add'>+	0x030, 0x000022A6,</div><div class='add'>+	0x030, 0x000032A6,</div><div class='add'>+	0x030, 0x000042A6,</div><div class='add'>+	0x030, 0x000052A6,</div><div class='add'>+	0x030, 0x000062A6,</div><div class='add'>+	0x030, 0x000072A6,</div><div class='add'>+	0x030, 0x000082A6,</div><div class='add'>+	0x030, 0x000092A6,</div><div class='add'>+	0x030, 0x0000A2A6,</div><div class='add'>+	0x030, 0x0000B2A6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003A3,</div><div class='add'>+	0x030, 0x000013A3,</div><div class='add'>+	0x030, 0x000023A3,</div><div class='add'>+	0x030, 0x000033A3,</div><div class='add'>+	0x030, 0x00004355,</div><div class='add'>+	0x030, 0x00005355,</div><div class='add'>+	0x030, 0x00006355,</div><div class='add'>+	0x030, 0x00007355,</div><div class='add'>+	0x030, 0x00008315,</div><div class='add'>+	0x030, 0x00009315,</div><div class='add'>+	0x030, 0x0000A315,</div><div class='add'>+	0x030, 0x0000B315,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A3,</div><div class='add'>+	0x030, 0x000014A3,</div><div class='add'>+	0x030, 0x000024A3,</div><div class='add'>+	0x030, 0x000034A3,</div><div class='add'>+	0x030, 0x000044A3,</div><div class='add'>+	0x030, 0x000054A3,</div><div class='add'>+	0x030, 0x000064A3,</div><div class='add'>+	0x030, 0x000074A3,</div><div class='add'>+	0x030, 0x000084A3,</div><div class='add'>+	0x030, 0x000094A3,</div><div class='add'>+	0x030, 0x0000A4A3,</div><div class='add'>+	0x030, 0x0000B4A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A3,</div><div class='add'>+	0x030, 0x000014A3,</div><div class='add'>+	0x030, 0x000024A3,</div><div class='add'>+	0x030, 0x000034A3,</div><div class='add'>+	0x030, 0x000044A3,</div><div class='add'>+	0x030, 0x000054A3,</div><div class='add'>+	0x030, 0x000064A3,</div><div class='add'>+	0x030, 0x000074A3,</div><div class='add'>+	0x030, 0x000084A3,</div><div class='add'>+	0x030, 0x000094A3,</div><div class='add'>+	0x030, 0x0000A4A3,</div><div class='add'>+	0x030, 0x0000B4A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000384,</div><div class='add'>+	0x030, 0x00001384,</div><div class='add'>+	0x030, 0x00002384,</div><div class='add'>+	0x030, 0x00003384,</div><div class='add'>+	0x030, 0x00004425,</div><div class='add'>+	0x030, 0x00005425,</div><div class='add'>+	0x030, 0x00006425,</div><div class='add'>+	0x030, 0x00007425,</div><div class='add'>+	0x030, 0x000084A6,</div><div class='add'>+	0x030, 0x000094A6,</div><div class='add'>+	0x030, 0x0000A4A6,</div><div class='add'>+	0x030, 0x0000B4A6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000463,</div><div class='add'>+	0x030, 0x00001463,</div><div class='add'>+	0x030, 0x00002463,</div><div class='add'>+	0x030, 0x00003463,</div><div class='add'>+	0x030, 0x00004545,</div><div class='add'>+	0x030, 0x00005545,</div><div class='add'>+	0x030, 0x00006545,</div><div class='add'>+	0x030, 0x00007545,</div><div class='add'>+	0x030, 0x00008565,</div><div class='add'>+	0x030, 0x00009565,</div><div class='add'>+	0x030, 0x0000A565,</div><div class='add'>+	0x030, 0x0000B565,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A3,</div><div class='add'>+	0x030, 0x000093A3,</div><div class='add'>+	0x030, 0x0000A3A3,</div><div class='add'>+	0x030, 0x0000B3A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A3,</div><div class='add'>+	0x030, 0x000014A3,</div><div class='add'>+	0x030, 0x000024A3,</div><div class='add'>+	0x030, 0x000034A3,</div><div class='add'>+	0x030, 0x000044A3,</div><div class='add'>+	0x030, 0x000054A3,</div><div class='add'>+	0x030, 0x000064A3,</div><div class='add'>+	0x030, 0x000074A3,</div><div class='add'>+	0x030, 0x000084A3,</div><div class='add'>+	0x030, 0x000094A3,</div><div class='add'>+	0x030, 0x0000A4A3,</div><div class='add'>+	0x030, 0x0000B4A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000443,</div><div class='add'>+	0x030, 0x00001443,</div><div class='add'>+	0x030, 0x00002443,</div><div class='add'>+	0x030, 0x00003443,</div><div class='add'>+	0x030, 0x000043A4,</div><div class='add'>+	0x030, 0x000053A4,</div><div class='add'>+	0x030, 0x000063A4,</div><div class='add'>+	0x030, 0x000073A4,</div><div class='add'>+	0x030, 0x00008365,</div><div class='add'>+	0x030, 0x00009365,</div><div class='add'>+	0x030, 0x0000A365,</div><div class='add'>+	0x030, 0x0000B365,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000443,</div><div class='add'>+	0x030, 0x00001443,</div><div class='add'>+	0x030, 0x00002443,</div><div class='add'>+	0x030, 0x00003443,</div><div class='add'>+	0x030, 0x00004483,</div><div class='add'>+	0x030, 0x00005483,</div><div class='add'>+	0x030, 0x00006483,</div><div class='add'>+	0x030, 0x00007483,</div><div class='add'>+	0x030, 0x000084A4,</div><div class='add'>+	0x030, 0x000094A4,</div><div class='add'>+	0x030, 0x0000A4A4,</div><div class='add'>+	0x030, 0x0000B4A4,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000361,</div><div class='add'>+	0x030, 0x00001361,</div><div class='add'>+	0x030, 0x00002361,</div><div class='add'>+	0x030, 0x00003361,</div><div class='add'>+	0x030, 0x00004443,</div><div class='add'>+	0x030, 0x00005443,</div><div class='add'>+	0x030, 0x00006443,</div><div class='add'>+	0x030, 0x00007443,</div><div class='add'>+	0x030, 0x00008424,</div><div class='add'>+	0x030, 0x00009424,</div><div class='add'>+	0x030, 0x0000A424,</div><div class='add'>+	0x030, 0x0000B424,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000334,</div><div class='add'>+	0x030, 0x00001334,</div><div class='add'>+	0x030, 0x00002334,</div><div class='add'>+	0x030, 0x00003334,</div><div class='add'>+	0x030, 0x000043A4,</div><div class='add'>+	0x030, 0x000053A4,</div><div class='add'>+	0x030, 0x000063A4,</div><div class='add'>+	0x030, 0x000073A4,</div><div class='add'>+	0x030, 0x00008365,</div><div class='add'>+	0x030, 0x00009365,</div><div class='add'>+	0x030, 0x0000A365,</div><div class='add'>+	0x030, 0x0000B365,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x00000403,</div><div class='add'>+	0x030, 0x00001403,</div><div class='add'>+	0x030, 0x00002403,</div><div class='add'>+	0x030, 0x00003403,</div><div class='add'>+	0x030, 0x000044A2,</div><div class='add'>+	0x030, 0x000054A2,</div><div class='add'>+	0x030, 0x000064A2,</div><div class='add'>+	0x030, 0x000074A2,</div><div class='add'>+	0x030, 0x000083A3,</div><div class='add'>+	0x030, 0x000093A3,</div><div class='add'>+	0x030, 0x0000A3A3,</div><div class='add'>+	0x030, 0x0000B3A3,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003A3,</div><div class='add'>+	0x030, 0x000013A3,</div><div class='add'>+	0x030, 0x000023A3,</div><div class='add'>+	0x030, 0x000033A3,</div><div class='add'>+	0x030, 0x000043A4,</div><div class='add'>+	0x030, 0x000053A4,</div><div class='add'>+	0x030, 0x000063A4,</div><div class='add'>+	0x030, 0x000073A4,</div><div class='add'>+	0x030, 0x00008365,</div><div class='add'>+	0x030, 0x00009365,</div><div class='add'>+	0x030, 0x0000A365,</div><div class='add'>+	0x030, 0x0000B365,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000002A6,</div><div class='add'>+	0x030, 0x000012A6,</div><div class='add'>+	0x030, 0x000022A6,</div><div class='add'>+	0x030, 0x000032A6,</div><div class='add'>+	0x030, 0x000042A6,</div><div class='add'>+	0x030, 0x000052A6,</div><div class='add'>+	0x030, 0x000062A6,</div><div class='add'>+	0x030, 0x000072A6,</div><div class='add'>+	0x030, 0x000082A6,</div><div class='add'>+	0x030, 0x000092A6,</div><div class='add'>+	0x030, 0x0000A2A6,</div><div class='add'>+	0x030, 0x0000B2A6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A0,</div><div class='add'>+	0x030, 0x000014A0,</div><div class='add'>+	0x030, 0x000024A0,</div><div class='add'>+	0x030, 0x000034A0,</div><div class='add'>+	0x030, 0x000044A0,</div><div class='add'>+	0x030, 0x000054A0,</div><div class='add'>+	0x030, 0x000064A0,</div><div class='add'>+	0x030, 0x000074A0,</div><div class='add'>+	0x030, 0x000084A0,</div><div class='add'>+	0x030, 0x000094A0,</div><div class='add'>+	0x030, 0x0000A4A0,</div><div class='add'>+	0x030, 0x0000B4A0,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000002A1,</div><div class='add'>+	0x030, 0x000012A1,</div><div class='add'>+	0x030, 0x000022A1,</div><div class='add'>+	0x030, 0x000032A1,</div><div class='add'>+	0x030, 0x000042A1,</div><div class='add'>+	0x030, 0x000052A1,</div><div class='add'>+	0x030, 0x000062A1,</div><div class='add'>+	0x030, 0x000072A1,</div><div class='add'>+	0x030, 0x000082A1,</div><div class='add'>+	0x030, 0x000092A1,</div><div class='add'>+	0x030, 0x0000A2A1,</div><div class='add'>+	0x030, 0x0000B2A1,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003A0,</div><div class='add'>+	0x030, 0x000013A0,</div><div class='add'>+	0x030, 0x000023A0,</div><div class='add'>+	0x030, 0x000033A0,</div><div class='add'>+	0x030, 0x000043A1,</div><div class='add'>+	0x030, 0x000053A1,</div><div class='add'>+	0x030, 0x000063A1,</div><div class='add'>+	0x030, 0x000073A1,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000002A1,</div><div class='add'>+	0x030, 0x000012A1,</div><div class='add'>+	0x030, 0x000022A1,</div><div class='add'>+	0x030, 0x000032A1,</div><div class='add'>+	0x030, 0x000042A1,</div><div class='add'>+	0x030, 0x000052A1,</div><div class='add'>+	0x030, 0x000062A1,</div><div class='add'>+	0x030, 0x000072A1,</div><div class='add'>+	0x030, 0x000082A1,</div><div class='add'>+	0x030, 0x000092A1,</div><div class='add'>+	0x030, 0x0000A2A1,</div><div class='add'>+	0x030, 0x0000B2A1,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003A0,</div><div class='add'>+	0x030, 0x000013A0,</div><div class='add'>+	0x030, 0x000023A0,</div><div class='add'>+	0x030, 0x000033A0,</div><div class='add'>+	0x030, 0x00004430,</div><div class='add'>+	0x030, 0x00005430,</div><div class='add'>+	0x030, 0x00006430,</div><div class='add'>+	0x030, 0x00007430,</div><div class='add'>+	0x030, 0x00008372,</div><div class='add'>+	0x030, 0x00009372,</div><div class='add'>+	0x030, 0x0000A372,</div><div class='add'>+	0x030, 0x0000B372,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A0,</div><div class='add'>+	0x030, 0x000014A0,</div><div class='add'>+	0x030, 0x000024A0,</div><div class='add'>+	0x030, 0x000034A0,</div><div class='add'>+	0x030, 0x000044A0,</div><div class='add'>+	0x030, 0x000054A0,</div><div class='add'>+	0x030, 0x000064A0,</div><div class='add'>+	0x030, 0x000074A0,</div><div class='add'>+	0x030, 0x000084A0,</div><div class='add'>+	0x030, 0x000094A0,</div><div class='add'>+	0x030, 0x0000A4A0,</div><div class='add'>+	0x030, 0x0000B4A0,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000004A0,</div><div class='add'>+	0x030, 0x000014A0,</div><div class='add'>+	0x030, 0x000024A0,</div><div class='add'>+	0x030, 0x000034A0,</div><div class='add'>+	0x030, 0x000044A0,</div><div class='add'>+	0x030, 0x000054A0,</div><div class='add'>+	0x030, 0x000064A0,</div><div class='add'>+	0x030, 0x000074A0,</div><div class='add'>+	0x030, 0x000084A0,</div><div class='add'>+	0x030, 0x000094A0,</div><div class='add'>+	0x030, 0x0000A4A0,</div><div class='add'>+	0x030, 0x0000B4A0,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000200,</div><div class='add'>+	0x030, 0x000003D0,</div><div class='add'>+	0x030, 0x000013D0,</div><div class='add'>+	0x030, 0x000023D0,</div><div class='add'>+	0x030, 0x000033D0,</div><div class='add'>+	0x030, 0x000043D0,</div><div class='add'>+	0x030, 0x000053D0,</div><div class='add'>+	0x030, 0x000063D0,</div><div class='add'>+	0x030, 0x000073D0,</div><div class='add'>+	0x030, 0x000083D0,</div><div class='add'>+	0x030, 0x000093D0,</div><div class='add'>+	0x030, 0x0000A3D0,</div><div class='add'>+	0x030, 0x0000B3D0,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A3,</div><div class='add'>+	0x030, 0x000013A3,</div><div class='add'>+	0x030, 0x000023A3,</div><div class='add'>+	0x030, 0x000033A3,</div><div class='add'>+	0x030, 0x000043A3,</div><div class='add'>+	0x030, 0x000053A3,</div><div class='add'>+	0x030, 0x000063A3,</div><div class='add'>+	0x030, 0x000073A3,</div><div class='add'>+	0x030, 0x000083A3,</div><div class='add'>+	0x030, 0x000093A3,</div><div class='add'>+	0x030, 0x0000A3A3,</div><div class='add'>+	0x030, 0x0000B3A3,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x00000203,</div><div class='add'>+	0x030, 0x00001203,</div><div class='add'>+	0x030, 0x00002203,</div><div class='add'>+	0x030, 0x00003203,</div><div class='add'>+	0x030, 0x00004203,</div><div class='add'>+	0x030, 0x00005203,</div><div class='add'>+	0x030, 0x00006203,</div><div class='add'>+	0x030, 0x00007203,</div><div class='add'>+	0x030, 0x00008203,</div><div class='add'>+	0x030, 0x00009203,</div><div class='add'>+	0x030, 0x0000A203,</div><div class='add'>+	0x030, 0x0000B203,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000080,</div><div class='add'>+	0x030, 0x000003A2,</div><div class='add'>+	0x030, 0x000013A2,</div><div class='add'>+	0x030, 0x000023A2,</div><div class='add'>+	0x030, 0x000033A2,</div><div class='add'>+	0x030, 0x000043A2,</div><div class='add'>+	0x030, 0x000053A2,</div><div class='add'>+	0x030, 0x000063A2,</div><div class='add'>+	0x030, 0x000073A2,</div><div class='add'>+	0x030, 0x000083A2,</div><div class='add'>+	0x030, 0x000093A2,</div><div class='add'>+	0x030, 0x0000A3A2,</div><div class='add'>+	0x030, 0x0000B3A2,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000764,</div><div class='add'>+	0x030, 0x00001632,</div><div class='add'>+	0x030, 0x00002421,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000777,</div><div class='add'>+	0x030, 0x00001442,</div><div class='add'>+	0x030, 0x00002222,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000776,</div><div class='add'>+	0x030, 0x00001455,</div><div class='add'>+	0x030, 0x00002335,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000660,</div><div class='add'>+	0x030, 0x00001443,</div><div class='add'>+	0x030, 0x00002221,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000764,</div><div class='add'>+	0x030, 0x00001632,</div><div class='add'>+	0x030, 0x00002421,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000764,</div><div class='add'>+	0x030, 0x00001632,</div><div class='add'>+	0x030, 0x00002421,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000767,</div><div class='add'>+	0x030, 0x00001442,</div><div class='add'>+	0x030, 0x00002222,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000765,</div><div class='add'>+	0x030, 0x00001632,</div><div class='add'>+	0x030, 0x00002451,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000764,</div><div class='add'>+	0x030, 0x00001632,</div><div class='add'>+	0x030, 0x00002421,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000777,</div><div class='add'>+	0x030, 0x00001454,</div><div class='add'>+	0x030, 0x00002224,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000777,</div><div class='add'>+	0x030, 0x00001442,</div><div class='add'>+	0x030, 0x00002222,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000777,</div><div class='add'>+	0x030, 0x00001442,</div><div class='add'>+	0x030, 0x00002222,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004777,</div><div class='add'>+	0x030, 0x00005777,</div><div class='add'>+	0x030, 0x00006777,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000775,</div><div class='add'>+	0x030, 0x00001422,</div><div class='add'>+	0x030, 0x00002210,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000775,</div><div class='add'>+	0x030, 0x00001343,</div><div class='add'>+	0x030, 0x00002210,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000645,</div><div class='add'>+	0x030, 0x00001333,</div><div class='add'>+	0x030, 0x00002011,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000040,</div><div class='add'>+	0x030, 0x00000764,</div><div class='add'>+	0x030, 0x00001632,</div><div class='add'>+	0x030, 0x00002421,</div><div class='add'>+	0x030, 0x00004000,</div><div class='add'>+	0x030, 0x00005000,</div><div class='add'>+	0x030, 0x00006000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00000800,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD0,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x0000042B,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000082A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000849,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4C,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000CAC,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CED,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CF0,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C29,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C69,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000CA8,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD0,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD0,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000CE5,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C0B,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C0E,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C2B,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C2E,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C89,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD0,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000086A,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x0000086D,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000870,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000891,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000894,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000008B5,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000008F5,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000068,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x0000042B,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000082A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000849,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4C,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000068,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x0000042B,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000082A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000849,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000084C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C4C,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000020,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x00000021,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x00000022,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x00000023,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x00000024,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x00000025,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x00000026,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000027,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x00000028,</div><div class='add'>+	0x03F, 0x00000CD0,</div><div class='add'>+	0x033, 0x00000029,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000002A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000C2A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000C2D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C6A,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CAA,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CAD,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CB0,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x0000042A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000829,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000848,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084B,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CAC,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CED,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF0,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x0000080B,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000080E,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000848,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000869,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x000008A9,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000C2A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000C2D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C6A,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CAA,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CAD,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CB0,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000C2A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000C2D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C6A,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CAA,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CAD,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CB0,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000068,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CE5,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000C10,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000C4A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CC9,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000C2A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000C2D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C6A,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CAA,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CAD,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CB0,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000086A,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x0000086D,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000870,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000891,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000894,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000008B5,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000008F5,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000068,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x0000042C,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000082B,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000C8B,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000C8E,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CEC,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000068,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006B,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000077,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x0000042C,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000082B,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000084D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C4D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000C8B,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000C8E,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CEC,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000060,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x00000061,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x00000062,</div><div class='add'>+	0x03F, 0x00000C2A,</div><div class='add'>+	0x033, 0x00000063,</div><div class='add'>+	0x03F, 0x00000C2D,</div><div class='add'>+	0x033, 0x00000064,</div><div class='add'>+	0x03F, 0x00000C6A,</div><div class='add'>+	0x033, 0x00000065,</div><div class='add'>+	0x03F, 0x00000CAA,</div><div class='add'>+	0x033, 0x00000066,</div><div class='add'>+	0x03F, 0x00000CAD,</div><div class='add'>+	0x033, 0x00000067,</div><div class='add'>+	0x03F, 0x00000CB0,</div><div class='add'>+	0x033, 0x00000068,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x00000069,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x0000006A,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000031,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000034,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000053,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000D1,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000031,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000034,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000053,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000D1,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000CAC,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CED,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CF0,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000C0A,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000C0D,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000C2A,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x00000C2D,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C6A,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF7,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000CE5,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000CE8,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000824,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000827,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000082A,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000082D,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C68,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C6B,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000CCA,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CCD,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000C08,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000C0B,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000C0E,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x00000C2B,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C2E,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C31,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000CCA,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CCD,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000086A,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x0000086D,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000870,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000891,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000894,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000008B5,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000008F5,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000429,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000828,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000847,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C6C,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CAF,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CD1,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF3,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF6,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000031,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000034,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000053,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000D1,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000047,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x0000004A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000004D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000050,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000053,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000094,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x0000042A,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000829,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000848,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084B,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4C,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000047,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x0000004A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000004D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000050,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000053,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000094,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x0000042A,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000829,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000848,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000084B,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C4C,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000CEB,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEE,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF1,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF4,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000007,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x0000000A,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x0000000D,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x0000002A,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x0000002D,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000030,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x0000006D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000070,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x000000ED,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x000000F0,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x000000F3,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x033, 0x000000A0,</div><div class='add'>+	0x03F, 0x00000C09,</div><div class='add'>+	0x033, 0x000000A1,</div><div class='add'>+	0x03F, 0x00000C0C,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x03F, 0x00000C0F,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x03F, 0x00000C2C,</div><div class='add'>+	0x033, 0x000000A4,</div><div class='add'>+	0x03F, 0x00000C2F,</div><div class='add'>+	0x033, 0x000000A5,</div><div class='add'>+	0x03F, 0x00000C8A,</div><div class='add'>+	0x033, 0x000000A6,</div><div class='add'>+	0x03F, 0x00000C8D,</div><div class='add'>+	0x033, 0x000000A7,</div><div class='add'>+	0x03F, 0x00000C90,</div><div class='add'>+	0x033, 0x000000A8,</div><div class='add'>+	0x03F, 0x00000CEF,</div><div class='add'>+	0x033, 0x000000A9,</div><div class='add'>+	0x03F, 0x00000CF2,</div><div class='add'>+	0x033, 0x000000AA,</div><div class='add'>+	0x03F, 0x00000CF5,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00000400,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x000008BB,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000008BB,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x000008BB,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x000008BB,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000047C,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x000004BB,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000004BB,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x000004BB,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x000004BB,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00000100,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00001726,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000F34,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000F34,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000F34,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000F34,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F400,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000808,</div><div class='add'>+	0x052, 0x00098002,</div><div class='add'>+	0x053, 0x0000FA47,</div><div class='add'>+	0x054, 0x00058032,</div><div class='add'>+	0x056, 0x00051000,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00082030,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x081, 0x0000F000,</div><div class='add'>+	0x087, 0x00016040,</div><div class='add'>+	0x051, 0x00000C00,</div><div class='add'>+	0x052, 0x0007C241,</div><div class='add'>+	0x053, 0x0001C069,</div><div class='add'>+	0x054, 0x00078032,</div><div class='add'>+	0x057, 0x0000CE0A,</div><div class='add'>+	0x058, 0x00058750,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000800,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000002,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000031,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000002,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000005,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000008,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x0000000B,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x0000000E,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002B,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002E,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000031,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x0000006E,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000071,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x00000074,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000003,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000006,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x00000009,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00000026,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00000029,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x0000002C,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x0000002F,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00000033,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00000036,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00000039,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x0000003C,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x0005142C,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x0005144B,</div><div class='add'>+	0x033, 0x00000002,</div><div class='add'>+	0x03F, 0x0005144E,</div><div class='add'>+	0x033, 0x00000003,</div><div class='add'>+	0x03F, 0x00051C69,</div><div class='add'>+	0x033, 0x00000004,</div><div class='add'>+	0x03F, 0x00051C6C,</div><div class='add'>+	0x033, 0x00000005,</div><div class='add'>+	0x03F, 0x00051C6F,</div><div class='add'>+	0x033, 0x00000006,</div><div class='add'>+	0x03F, 0x00051CEB,</div><div class='add'>+	0x033, 0x00000007,</div><div class='add'>+	0x03F, 0x00051CEE,</div><div class='add'>+	0x033, 0x00000008,</div><div class='add'>+	0x03F, 0x00051CF1,</div><div class='add'>+	0x033, 0x00000009,</div><div class='add'>+	0x03F, 0x00051CF4,</div><div class='add'>+	0x033, 0x0000000A,</div><div class='add'>+	0x03F, 0x00051CF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x0EF, 0x00000010,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x008, 0x0009C060,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x008, 0x0009C060,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x033, 0x000000A2,</div><div class='add'>+	0x0EF, 0x00080000,</div><div class='add'>+	0x03E, 0x0000593F,</div><div class='add'>+	0x8300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000D0F4F,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x03F, 0x000C0F4F,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x033, 0x000000A3,</div><div class='add'>+	0x0EF, 0x00080000,</div><div class='add'>+	0x03E, 0x00005934,</div><div class='add'>+	0x03F, 0x0005AFCF,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x83000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094400,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0CE, 0x00094C00,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00064700,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00072F00,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0CF, 0x00064700,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000096,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000004,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000056,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0x033, 0x00000000,</div><div class='add'>+	0x03F, 0x00000096,</div><div class='add'>+	0x033, 0x00000001,</div><div class='add'>+	0x03F, 0x000000D6,</div><div class='add'>+	0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x0B0, 0x000FF0FC,</div><div class='add'>+	0x0C4, 0x00081402,</div><div class='add'>+	0x0CC, 0x00082000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_RF_RADIO(rtw8822b_rf_a, A);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822b_rf_b[] = {</div><div class='add'>+		0x000, 0x00030000,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x001, 0x0004002D,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x001, 0x00040029,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x018, 0x00010D24,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x0000003F,</div><div class='add'>+	0x8300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x000D0F4E,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x000C0F4E,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00000034,</div><div class='add'>+		0x03F, 0x0004080E,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x0DF, 0x00002449,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x0000003F,</div><div class='add'>+		0x03F, 0x00060FDE,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000037,</div><div class='add'>+		0x03F, 0x0007EFCE,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000037,</div><div class='add'>+		0x03F, 0x000DEFCE,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0DF, 0x00000009,</div><div class='add'>+		0x018, 0x00010524,</div><div class='add'>+		0x089, 0x00000207,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FE186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FE186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000FF186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x08B, 0x00061E3C,</div><div class='add'>+		0x08C, 0x000112C7,</div><div class='add'>+		0x08D, 0x000F4988,</div><div class='add'>+		0x08E, 0x00064D40,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x000040C8,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00004190,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00004998,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00005840,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x000058C2,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00005930,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+	0x8300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x000040D0,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03E, 0x000040C8,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00004190,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00004998,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00005840,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x000058C2,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00005930,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000DFF86,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000DFF86,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C0006,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004040,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03E, 0x00004000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00004080,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+	0x8300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03E, 0x000040D0,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03E, 0x000040C8,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00004190,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00004998,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00005840,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x000058C2,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00005930,</div><div class='add'>+		0x03F, 0x000C3186,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00004000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000002,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x018, 0x00000401,</div><div class='add'>+		0x084, 0x00001209,</div><div class='add'>+		0x086, 0x000001A0,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x087, 0x00068080,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x087, 0x000E8180,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x088, 0x00070020,</div><div class='add'>+		0x0DE, 0x00000010,</div><div class='add'>+		0x0EF, 0x00008000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x00000038,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x00000028,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x00000020,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x00000018,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000010,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x00000038,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000028,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000020,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000018,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000010,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x018, 0x00018D24,</div><div class='add'>+		0xFFE, 0x00000000,</div><div class='add'>+		0xFFE, 0x00000000,</div><div class='add'>+		0xFFE, 0x00000000,</div><div class='add'>+		0xFFE, 0x00000000,</div><div class='add'>+		0x018, 0x00010D24,</div><div class='add'>+		0x01B, 0x00075A40,</div><div class='add'>+		0x0EE, 0x00000002,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000004,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000004,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000004,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000004,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000004,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x00000004,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D3D1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D3D1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D3D1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D3D1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D3D1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D2A1,</div><div class='add'>+		0x062, 0x0000D3A2,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D4A0,</div><div class='add'>+		0x062, 0x0000D203,</div><div class='add'>+		0x063, 0x00000062,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x061, 0x0005D3D0,</div><div class='add'>+		0x062, 0x0000D303,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000200,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A3,</div><div class='add'>+		0x030, 0x000053A3,</div><div class='add'>+		0x030, 0x000063A3,</div><div class='add'>+		0x030, 0x000073A3,</div><div class='add'>+		0x030, 0x000083A3,</div><div class='add'>+		0x030, 0x000093A3,</div><div class='add'>+		0x030, 0x0000A3A3,</div><div class='add'>+		0x030, 0x0000B3A3,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A3,</div><div class='add'>+		0x030, 0x000014A3,</div><div class='add'>+		0x030, 0x000024A3,</div><div class='add'>+		0x030, 0x000034A3,</div><div class='add'>+		0x030, 0x000044A3,</div><div class='add'>+		0x030, 0x000054A3,</div><div class='add'>+		0x030, 0x000064A3,</div><div class='add'>+		0x030, 0x000074A3,</div><div class='add'>+		0x030, 0x000084A3,</div><div class='add'>+		0x030, 0x000094A3,</div><div class='add'>+		0x030, 0x0000A4A3,</div><div class='add'>+		0x030, 0x0000B4A3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002A6,</div><div class='add'>+		0x030, 0x000012A6,</div><div class='add'>+		0x030, 0x000022A6,</div><div class='add'>+		0x030, 0x000032A6,</div><div class='add'>+		0x030, 0x000042A6,</div><div class='add'>+		0x030, 0x000052A6,</div><div class='add'>+		0x030, 0x000062A6,</div><div class='add'>+		0x030, 0x000072A6,</div><div class='add'>+		0x030, 0x000082A6,</div><div class='add'>+		0x030, 0x000092A6,</div><div class='add'>+		0x030, 0x0000A2A6,</div><div class='add'>+		0x030, 0x0000B2A6,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000303,</div><div class='add'>+		0x030, 0x00001303,</div><div class='add'>+		0x030, 0x00002303,</div><div class='add'>+		0x030, 0x00003303,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x00008365,</div><div class='add'>+		0x030, 0x00009365,</div><div class='add'>+		0x030, 0x0000A365,</div><div class='add'>+		0x030, 0x0000B365,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002A6,</div><div class='add'>+		0x030, 0x000012A6,</div><div class='add'>+		0x030, 0x000022A6,</div><div class='add'>+		0x030, 0x000032A6,</div><div class='add'>+		0x030, 0x000042A6,</div><div class='add'>+		0x030, 0x000052A6,</div><div class='add'>+		0x030, 0x000062A6,</div><div class='add'>+		0x030, 0x000072A6,</div><div class='add'>+		0x030, 0x000082A6,</div><div class='add'>+		0x030, 0x000092A6,</div><div class='add'>+		0x030, 0x0000A2A6,</div><div class='add'>+		0x030, 0x0000B2A6,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A4,</div><div class='add'>+		0x030, 0x000014A4,</div><div class='add'>+		0x030, 0x000024A4,</div><div class='add'>+		0x030, 0x000034A4,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x000083A5,</div><div class='add'>+		0x030, 0x000093A5,</div><div class='add'>+		0x030, 0x0000A3A5,</div><div class='add'>+		0x030, 0x0000B3A5,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A3,</div><div class='add'>+		0x030, 0x000014A3,</div><div class='add'>+		0x030, 0x000024A3,</div><div class='add'>+		0x030, 0x000034A3,</div><div class='add'>+		0x030, 0x000044A3,</div><div class='add'>+		0x030, 0x000054A3,</div><div class='add'>+		0x030, 0x000064A3,</div><div class='add'>+		0x030, 0x000074A3,</div><div class='add'>+		0x030, 0x000084A3,</div><div class='add'>+		0x030, 0x000094A3,</div><div class='add'>+		0x030, 0x0000A4A3,</div><div class='add'>+		0x030, 0x0000B4A3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A3,</div><div class='add'>+		0x030, 0x000014A3,</div><div class='add'>+		0x030, 0x000024A3,</div><div class='add'>+		0x030, 0x000034A3,</div><div class='add'>+		0x030, 0x000044A3,</div><div class='add'>+		0x030, 0x000054A3,</div><div class='add'>+		0x030, 0x000064A3,</div><div class='add'>+		0x030, 0x000074A3,</div><div class='add'>+		0x030, 0x000084A3,</div><div class='add'>+		0x030, 0x000094A3,</div><div class='add'>+		0x030, 0x0000A4A3,</div><div class='add'>+		0x030, 0x0000B4A3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002F4,</div><div class='add'>+		0x030, 0x000012F4,</div><div class='add'>+		0x030, 0x000022F4,</div><div class='add'>+		0x030, 0x000032F4,</div><div class='add'>+		0x030, 0x00004365,</div><div class='add'>+		0x030, 0x00005365,</div><div class='add'>+		0x030, 0x00006365,</div><div class='add'>+		0x030, 0x00007365,</div><div class='add'>+		0x030, 0x000082A4,</div><div class='add'>+		0x030, 0x000092A4,</div><div class='add'>+		0x030, 0x0000A2A4,</div><div class='add'>+		0x030, 0x0000B2A4,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000382,</div><div class='add'>+		0x030, 0x00001382,</div><div class='add'>+		0x030, 0x00002382,</div><div class='add'>+		0x030, 0x00003382,</div><div class='add'>+		0x030, 0x00004445,</div><div class='add'>+		0x030, 0x00005445,</div><div class='add'>+		0x030, 0x00006445,</div><div class='add'>+		0x030, 0x00007445,</div><div class='add'>+		0x030, 0x00008425,</div><div class='add'>+		0x030, 0x00009425,</div><div class='add'>+		0x030, 0x0000A425,</div><div class='add'>+		0x030, 0x0000B425,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A3,</div><div class='add'>+		0x030, 0x000053A3,</div><div class='add'>+		0x030, 0x000063A3,</div><div class='add'>+		0x030, 0x000073A3,</div><div class='add'>+		0x030, 0x000083A3,</div><div class='add'>+		0x030, 0x000093A3,</div><div class='add'>+		0x030, 0x0000A3A3,</div><div class='add'>+		0x030, 0x0000B3A3,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A3,</div><div class='add'>+		0x030, 0x000014A3,</div><div class='add'>+		0x030, 0x000024A3,</div><div class='add'>+		0x030, 0x000034A3,</div><div class='add'>+		0x030, 0x000044A3,</div><div class='add'>+		0x030, 0x000054A3,</div><div class='add'>+		0x030, 0x000064A3,</div><div class='add'>+		0x030, 0x000074A3,</div><div class='add'>+		0x030, 0x000084A3,</div><div class='add'>+		0x030, 0x000094A3,</div><div class='add'>+		0x030, 0x0000A4A3,</div><div class='add'>+		0x030, 0x0000B4A3,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000443,</div><div class='add'>+		0x030, 0x00001443,</div><div class='add'>+		0x030, 0x00002443,</div><div class='add'>+		0x030, 0x00003443,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x00008365,</div><div class='add'>+		0x030, 0x00009365,</div><div class='add'>+		0x030, 0x0000A365,</div><div class='add'>+		0x030, 0x0000B365,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000343,</div><div class='add'>+		0x030, 0x00001343,</div><div class='add'>+		0x030, 0x00002343,</div><div class='add'>+		0x030, 0x00003343,</div><div class='add'>+		0x030, 0x00004483,</div><div class='add'>+		0x030, 0x00005483,</div><div class='add'>+		0x030, 0x00006483,</div><div class='add'>+		0x030, 0x00007483,</div><div class='add'>+		0x030, 0x000083A4,</div><div class='add'>+		0x030, 0x000093A4,</div><div class='add'>+		0x030, 0x0000A3A4,</div><div class='add'>+		0x030, 0x0000B3A4,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x00004423,</div><div class='add'>+		0x030, 0x00005423,</div><div class='add'>+		0x030, 0x00006423,</div><div class='add'>+		0x030, 0x00007423,</div><div class='add'>+		0x030, 0x00008324,</div><div class='add'>+		0x030, 0x00009324,</div><div class='add'>+		0x030, 0x0000A324,</div><div class='add'>+		0x030, 0x0000B324,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000303,</div><div class='add'>+		0x030, 0x00001303,</div><div class='add'>+		0x030, 0x00002303,</div><div class='add'>+		0x030, 0x00003303,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x00008365,</div><div class='add'>+		0x030, 0x00009365,</div><div class='add'>+		0x030, 0x0000A365,</div><div class='add'>+		0x030, 0x0000B365,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000403,</div><div class='add'>+		0x030, 0x00001403,</div><div class='add'>+		0x030, 0x00002403,</div><div class='add'>+		0x030, 0x00003403,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x000083A3,</div><div class='add'>+		0x030, 0x000093A3,</div><div class='add'>+		0x030, 0x0000A3A3,</div><div class='add'>+		0x030, 0x0000B3A3,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A3,</div><div class='add'>+		0x030, 0x000013A3,</div><div class='add'>+		0x030, 0x000023A3,</div><div class='add'>+		0x030, 0x000033A3,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x00008365,</div><div class='add'>+		0x030, 0x00009365,</div><div class='add'>+		0x030, 0x0000A365,</div><div class='add'>+		0x030, 0x0000B365,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002A6,</div><div class='add'>+		0x030, 0x000012A6,</div><div class='add'>+		0x030, 0x000022A6,</div><div class='add'>+		0x030, 0x000032A6,</div><div class='add'>+		0x030, 0x000042A6,</div><div class='add'>+		0x030, 0x000052A6,</div><div class='add'>+		0x030, 0x000062A6,</div><div class='add'>+		0x030, 0x000072A6,</div><div class='add'>+		0x030, 0x000082A6,</div><div class='add'>+		0x030, 0x000092A6,</div><div class='add'>+		0x030, 0x0000A2A6,</div><div class='add'>+		0x030, 0x0000B2A6,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A0,</div><div class='add'>+		0x030, 0x000014A0,</div><div class='add'>+		0x030, 0x000024A0,</div><div class='add'>+		0x030, 0x000034A0,</div><div class='add'>+		0x030, 0x000044A0,</div><div class='add'>+		0x030, 0x000054A0,</div><div class='add'>+		0x030, 0x000064A0,</div><div class='add'>+		0x030, 0x000074A0,</div><div class='add'>+		0x030, 0x000084A0,</div><div class='add'>+		0x030, 0x000094A0,</div><div class='add'>+		0x030, 0x0000A4A0,</div><div class='add'>+		0x030, 0x0000B4A0,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002A1,</div><div class='add'>+		0x030, 0x000012A1,</div><div class='add'>+		0x030, 0x000022A1,</div><div class='add'>+		0x030, 0x000032A1,</div><div class='add'>+		0x030, 0x000042A1,</div><div class='add'>+		0x030, 0x000052A1,</div><div class='add'>+		0x030, 0x000062A1,</div><div class='add'>+		0x030, 0x000072A1,</div><div class='add'>+		0x030, 0x000082A1,</div><div class='add'>+		0x030, 0x000092A1,</div><div class='add'>+		0x030, 0x0000A2A1,</div><div class='add'>+		0x030, 0x0000B2A1,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A0,</div><div class='add'>+		0x030, 0x000014A0,</div><div class='add'>+		0x030, 0x000024A0,</div><div class='add'>+		0x030, 0x000034A0,</div><div class='add'>+		0x030, 0x000043A1,</div><div class='add'>+		0x030, 0x000053A1,</div><div class='add'>+		0x030, 0x000063A1,</div><div class='add'>+		0x030, 0x000073A1,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002A1,</div><div class='add'>+		0x030, 0x000012A1,</div><div class='add'>+		0x030, 0x000022A1,</div><div class='add'>+		0x030, 0x000032A1,</div><div class='add'>+		0x030, 0x000042A1,</div><div class='add'>+		0x030, 0x000052A1,</div><div class='add'>+		0x030, 0x000062A1,</div><div class='add'>+		0x030, 0x000072A1,</div><div class='add'>+		0x030, 0x000082A1,</div><div class='add'>+		0x030, 0x000092A1,</div><div class='add'>+		0x030, 0x0000A2A1,</div><div class='add'>+		0x030, 0x0000B2A1,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A1,</div><div class='add'>+		0x030, 0x000014A1,</div><div class='add'>+		0x030, 0x000024A1,</div><div class='add'>+		0x030, 0x000034A1,</div><div class='add'>+		0x030, 0x000043A1,</div><div class='add'>+		0x030, 0x000053A1,</div><div class='add'>+		0x030, 0x000063A1,</div><div class='add'>+		0x030, 0x000073A1,</div><div class='add'>+		0x030, 0x000083A1,</div><div class='add'>+		0x030, 0x000093A1,</div><div class='add'>+		0x030, 0x0000A3A1,</div><div class='add'>+		0x030, 0x0000B3A1,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A0,</div><div class='add'>+		0x030, 0x000014A0,</div><div class='add'>+		0x030, 0x000024A0,</div><div class='add'>+		0x030, 0x000034A0,</div><div class='add'>+		0x030, 0x000044A0,</div><div class='add'>+		0x030, 0x000054A0,</div><div class='add'>+		0x030, 0x000064A0,</div><div class='add'>+		0x030, 0x000074A0,</div><div class='add'>+		0x030, 0x000084A0,</div><div class='add'>+		0x030, 0x000094A0,</div><div class='add'>+		0x030, 0x0000A4A0,</div><div class='add'>+		0x030, 0x0000B4A0,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000004A0,</div><div class='add'>+		0x030, 0x000014A0,</div><div class='add'>+		0x030, 0x000024A0,</div><div class='add'>+		0x030, 0x000034A0,</div><div class='add'>+		0x030, 0x000044A0,</div><div class='add'>+		0x030, 0x000054A0,</div><div class='add'>+		0x030, 0x000064A0,</div><div class='add'>+		0x030, 0x000074A0,</div><div class='add'>+		0x030, 0x000084A0,</div><div class='add'>+		0x030, 0x000094A0,</div><div class='add'>+		0x030, 0x0000A4A0,</div><div class='add'>+		0x030, 0x0000B4A0,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x000002D0,</div><div class='add'>+		0x030, 0x000012D0,</div><div class='add'>+		0x030, 0x000022D0,</div><div class='add'>+		0x030, 0x000032D0,</div><div class='add'>+		0x030, 0x000042D0,</div><div class='add'>+		0x030, 0x000052D0,</div><div class='add'>+		0x030, 0x000062D0,</div><div class='add'>+		0x030, 0x000072D0,</div><div class='add'>+		0x030, 0x000082D0,</div><div class='add'>+		0x030, 0x000092D0,</div><div class='add'>+		0x030, 0x0000A2D0,</div><div class='add'>+		0x030, 0x0000B2D0,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000080,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A3,</div><div class='add'>+		0x030, 0x000013A3,</div><div class='add'>+		0x030, 0x000023A3,</div><div class='add'>+		0x030, 0x000033A3,</div><div class='add'>+		0x030, 0x000043A4,</div><div class='add'>+		0x030, 0x000053A4,</div><div class='add'>+		0x030, 0x000063A4,</div><div class='add'>+		0x030, 0x000073A4,</div><div class='add'>+		0x030, 0x000083A3,</div><div class='add'>+		0x030, 0x000093A3,</div><div class='add'>+		0x030, 0x0000A3A3,</div><div class='add'>+		0x030, 0x0000B3A3,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000203,</div><div class='add'>+		0x030, 0x00001203,</div><div class='add'>+		0x030, 0x00002203,</div><div class='add'>+		0x030, 0x00003203,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005203,</div><div class='add'>+		0x030, 0x00006203,</div><div class='add'>+		0x030, 0x00007203,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009203,</div><div class='add'>+		0x030, 0x0000A203,</div><div class='add'>+		0x030, 0x0000B203,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x000003A2,</div><div class='add'>+		0x030, 0x000013A2,</div><div class='add'>+		0x030, 0x000023A2,</div><div class='add'>+		0x030, 0x000033A2,</div><div class='add'>+		0x030, 0x000043A2,</div><div class='add'>+		0x030, 0x000053A2,</div><div class='add'>+		0x030, 0x000063A2,</div><div class='add'>+		0x030, 0x000073A2,</div><div class='add'>+		0x030, 0x000083A2,</div><div class='add'>+		0x030, 0x000093A2,</div><div class='add'>+		0x030, 0x0000A3A2,</div><div class='add'>+		0x030, 0x0000B3A2,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000040,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000764,</div><div class='add'>+		0x030, 0x00001632,</div><div class='add'>+		0x030, 0x00002421,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000777,</div><div class='add'>+		0x030, 0x00001442,</div><div class='add'>+		0x030, 0x00002222,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000764,</div><div class='add'>+		0x030, 0x00001452,</div><div class='add'>+		0x030, 0x00002220,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000660,</div><div class='add'>+		0x030, 0x00001341,</div><div class='add'>+		0x030, 0x00002220,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000764,</div><div class='add'>+		0x030, 0x00001632,</div><div class='add'>+		0x030, 0x00002421,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000764,</div><div class='add'>+		0x030, 0x00001632,</div><div class='add'>+		0x030, 0x00002421,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000767,</div><div class='add'>+		0x030, 0x00001442,</div><div class='add'>+		0x030, 0x00002222,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000765,</div><div class='add'>+		0x030, 0x00001632,</div><div class='add'>+		0x030, 0x00002451,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000764,</div><div class='add'>+		0x030, 0x00001632,</div><div class='add'>+		0x030, 0x00002421,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000777,</div><div class='add'>+		0x030, 0x00001442,</div><div class='add'>+		0x030, 0x00002222,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000776,</div><div class='add'>+		0x030, 0x00001442,</div><div class='add'>+		0x030, 0x00002222,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000777,</div><div class='add'>+		0x030, 0x00001442,</div><div class='add'>+		0x030, 0x00002222,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004777,</div><div class='add'>+		0x030, 0x00005777,</div><div class='add'>+		0x030, 0x00006777,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000775,</div><div class='add'>+		0x030, 0x00001422,</div><div class='add'>+		0x030, 0x00002210,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000775,</div><div class='add'>+		0x030, 0x00001222,</div><div class='add'>+		0x030, 0x00002210,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000645,</div><div class='add'>+		0x030, 0x00001333,</div><div class='add'>+		0x030, 0x00002011,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000764,</div><div class='add'>+		0x030, 0x00001632,</div><div class='add'>+		0x030, 0x00002421,</div><div class='add'>+		0x030, 0x00004000,</div><div class='add'>+		0x030, 0x00005000,</div><div class='add'>+		0x030, 0x00006000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000800,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x0000042C,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000082B,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084D,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4E,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C6E,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000CAD,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CED,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CF0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000082B,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000889,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x000008AA,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000CE5,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000C25,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000C28,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000C2B,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000C68,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C6B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C6E,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000CEA,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CED,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CF0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000068,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x0000042B,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000082A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000849,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4C,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000068,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x0000042B,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000082A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000849,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000084C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C4C,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000CD0,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000C0A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000C0D,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000C2A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000C2D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C6A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CAA,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CAD,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CB0,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x0000042A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000829,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000848,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084B,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CAC,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CED,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF0,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000842,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000845,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000866,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x000008A6,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x000008C8,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000C0A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000C0D,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000C2A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000C2D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C6A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CAA,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CAD,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CB0,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000C0A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000C0D,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000C2A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000C2D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C6A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CAA,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CAD,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CB0,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000068,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CE5,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000C0A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000C0D,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000C10,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000C4A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CC9,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000C0A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000C0D,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000C2A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000C2D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C6A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CAA,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CAD,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CB0,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CEA,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CED,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF0,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000068,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x0000042C,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000082B,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4E,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C8C,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000C8F,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CEC,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000068,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006B,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000077,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x0000042C,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000082B,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000084D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C4E,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000C8C,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000C8F,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CEC,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000C0A,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000C0D,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000C2A,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000C2D,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000C6A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000CAA,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000CAD,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000CB0,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x83000000,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000031,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000034,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000053,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000056,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000D1,</div><div class='add'>+	0x93000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000031,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000034,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000053,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000056,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000D1,</div><div class='add'>+	0x93000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x0000042A,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000829,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000848,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084B,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4C,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000CAC,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CED,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CF0,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x93000008,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000826,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000829,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000082C,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000082F,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000086C,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+	0x93000009,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000a,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000CE5,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+	0x9300000d,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x0000080A,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000080D,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000810,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C68,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C6B,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000CAB,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CAE,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000e,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000C08,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000C0B,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000C0E,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x00000C2B,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C2E,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C31,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000CAB,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CAE,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000CEA,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CED,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CF0,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000010,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000011,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000429,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000828,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000847,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C6C,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CAF,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CD1,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF3,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF6,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000031,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000034,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000053,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000056,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000D1,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x90000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000047,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x0000004A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000004D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000050,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000053,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000056,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000094,</div><div class='add'>+	0x90000003,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x0000042A,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000829,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000848,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084B,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4C,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CEC,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000047,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x0000004A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000004D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000050,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000053,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000056,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000094,</div><div class='add'>+	0x90000005,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x0000042A,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000829,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000848,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000084B,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C4C,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000CEC,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000007,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x0000000A,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x0000000D,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x0000002D,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000030,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000070,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x000000ED,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x000000F0,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x000000F3,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x000000A0,</div><div class='add'>+		0x03F, 0x00000C09,</div><div class='add'>+		0x033, 0x000000A1,</div><div class='add'>+		0x03F, 0x00000C0C,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x03F, 0x00000C0F,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x03F, 0x00000C2C,</div><div class='add'>+		0x033, 0x000000A4,</div><div class='add'>+		0x03F, 0x00000C2F,</div><div class='add'>+		0x033, 0x000000A5,</div><div class='add'>+		0x03F, 0x00000C8A,</div><div class='add'>+		0x033, 0x000000A6,</div><div class='add'>+		0x03F, 0x00000C8D,</div><div class='add'>+		0x033, 0x000000A7,</div><div class='add'>+		0x03F, 0x00000C90,</div><div class='add'>+		0x033, 0x000000A8,</div><div class='add'>+		0x03F, 0x00000CEF,</div><div class='add'>+		0x033, 0x000000A9,</div><div class='add'>+		0x03F, 0x00000CF2,</div><div class='add'>+		0x033, 0x000000AA,</div><div class='add'>+		0x03F, 0x00000CF5,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000400,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x000004FB,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x000004FB,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x000004FB,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x000004FB,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000265A,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x000004BB,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x000004BB,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x000004BB,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x000004BB,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000100,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000745,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000F34,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000F34,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000F34,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000F34,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F400,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000808,</div><div class='add'>+		0x052, 0x00098002,</div><div class='add'>+		0x053, 0x0000FA47,</div><div class='add'>+		0x054, 0x00058032,</div><div class='add'>+		0x056, 0x00051000,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00082030,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000F000,</div><div class='add'>+		0x087, 0x00016040,</div><div class='add'>+		0x051, 0x00000C00,</div><div class='add'>+		0x052, 0x0007C241,</div><div class='add'>+		0x053, 0x0001C069,</div><div class='add'>+		0x054, 0x00078032,</div><div class='add'>+		0x057, 0x0000CE0A,</div><div class='add'>+		0x058, 0x00058750,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000800,</div><div class='add'>+	0x83000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x93000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000002,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000031,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+	0x93000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x93000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x9300000b,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x9300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0005142C,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0005142F,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00051432,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00051CA5,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00051CA8,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00051CAB,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x00051CEB,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00051CEE,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00051CF1,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00051CF4,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x00051CF7,</div><div class='add'>+	0x9300000f,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0005142C,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0005144B,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00051868,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0005186B,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x0005186E,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00051871,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x00051874,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00051895,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000518B6,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x000518F6,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x00051CF7,</div><div class='add'>+	0x93000012,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000002,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000005,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000008,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x0000000B,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x0000000E,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002B,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002E,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000031,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x0000006E,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000071,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x00000074,</div><div class='add'>+	0x90000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x90000004,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x90000006,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0x90000007,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000003,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000006,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000009,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000026,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000029,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x0000002C,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x0000002F,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000033,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00000036,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000039,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x0000003C,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0005142C,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0005142F,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00051432,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00051C87,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00051C8A,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00051C8D,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x00051CEB,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00051CEE,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x00051CF1,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00051CF4,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x00051CF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x8300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000010,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x008, 0x0009C060,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x008, 0x0009C060,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x033, 0x000000A2,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x03E, 0x0000593F,</div><div class='add'>+	0x8300000c,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x000D0F4F,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x000C0F4F,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x033, 0x000000A3,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x03E, 0x00005934,</div><div class='add'>+		0x03F, 0x0005AFCF,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_RF_RADIO(rtw8822b_rf_b, B);</div><div class='add'>+</div><div class='add'>+static const u8 rtw8822b_txpwr_lmt_type2[] = {</div><div class='add'>+	0, 0, 0, 0, 1, 32, 2, 0, 0, 0, 1, 28, 1, 0, 0, 0, 1, 30,</div><div class='add'>+	0, 0, 0, 0, 2, 32, 2, 0, 0, 0, 2, 28, 1, 0, 0, 0, 2, 30,</div><div class='add'>+	0, 0, 0, 0, 3, 32, 2, 0, 0, 0, 3, 28, 1, 0, 0, 0, 3, 30,</div><div class='add'>+	0, 0, 0, 0, 4, 32, 2, 0, 0, 0, 4, 28, 1, 0, 0, 0, 4, 30,</div><div class='add'>+	0, 0, 0, 0, 5, 32, 2, 0, 0, 0, 5, 28, 1, 0, 0, 0, 5, 30,</div><div class='add'>+	0, 0, 0, 0, 6, 32, 2, 0, 0, 0, 6, 28, 1, 0, 0, 0, 6, 30,</div><div class='add'>+	0, 0, 0, 0, 7, 32, 2, 0, 0, 0, 7, 28, 1, 0, 0, 0, 7, 30,</div><div class='add'>+	0, 0, 0, 0, 8, 32, 2, 0, 0, 0, 8, 28, 1, 0, 0, 0, 8, 30,</div><div class='add'>+	0, 0, 0, 0, 9, 32, 2, 0, 0, 0, 9, 28, 1, 0, 0, 0, 9, 30,</div><div class='add'>+	0, 0, 0, 0, 10, 32, 2, 0, 0, 0, 10, 28, 1, 0, 0, 0, 10, 30,</div><div class='add'>+	0, 0, 0, 0, 11, 32, 2, 0, 0, 0, 11, 28, 1, 0, 0, 0, 11, 30,</div><div class='add'>+	0, 0, 0, 0, 12, 26, 2, 0, 0, 0, 12, 28, 1, 0, 0, 0, 12, 30,</div><div class='add'>+	0, 0, 0, 0, 13, 20, 2, 0, 0, 0, 13, 28, 1, 0, 0, 0, 13, 28,</div><div class='add'>+	0, 0, 0, 0, 14, 63, 2, 0, 0, 0, 14, 63, 1, 0, 0, 0, 14, 32,</div><div class='add'>+	0, 0, 0, 1, 1, 26, 2, 0, 0, 1, 1, 30, 1, 0, 0, 1, 1, 34,</div><div class='add'>+	0, 0, 0, 1, 2, 30, 2, 0, 0, 1, 2, 30, 1, 0, 0, 1, 2, 34,</div><div class='add'>+	0, 0, 0, 1, 3, 32, 2, 0, 0, 1, 3, 30, 1, 0, 0, 1, 3, 34,</div><div class='add'>+	0, 0, 0, 1, 4, 34, 2, 0, 0, 1, 4, 30, 1, 0, 0, 1, 4, 34,</div><div class='add'>+	0, 0, 0, 1, 5, 34, 2, 0, 0, 1, 5, 30, 1, 0, 0, 1, 5, 34,</div><div class='add'>+	0, 0, 0, 1, 6, 34, 2, 0, 0, 1, 6, 30, 1, 0, 0, 1, 6, 34,</div><div class='add'>+	0, 0, 0, 1, 7, 34, 2, 0, 0, 1, 7, 30, 1, 0, 0, 1, 7, 34,</div><div class='add'>+	0, 0, 0, 1, 8, 34, 2, 0, 0, 1, 8, 30, 1, 0, 0, 1, 8, 34,</div><div class='add'>+	0, 0, 0, 1, 9, 32, 2, 0, 0, 1, 9, 30, 1, 0, 0, 1, 9, 34,</div><div class='add'>+	0, 0, 0, 1, 10, 30, 2, 0, 0, 1, 10, 30, 1, 0, 0, 1, 10, 34,</div><div class='add'>+	0, 0, 0, 1, 11, 28, 2, 0, 0, 1, 11, 30, 1, 0, 0, 1, 11, 34,</div><div class='add'>+	0, 0, 0, 1, 12, 22, 2, 0, 0, 1, 12, 30, 1, 0, 0, 1, 12, 34,</div><div class='add'>+	0, 0, 0, 1, 13, 14, 2, 0, 0, 1, 13, 30, 1, 0, 0, 1, 13, 34,</div><div class='add'>+	0, 0, 0, 1, 14, 63, 2, 0, 0, 1, 14, 63, 1, 0, 0, 1, 14, 63,</div><div class='add'>+	0, 0, 0, 2, 1, 26, 2, 0, 0, 2, 1, 30, 1, 0, 0, 2, 1, 34,</div><div class='add'>+	0, 0, 0, 2, 2, 30, 2, 0, 0, 2, 2, 30, 1, 0, 0, 2, 2, 34,</div><div class='add'>+	0, 0, 0, 2, 3, 32, 2, 0, 0, 2, 3, 30, 1, 0, 0, 2, 3, 34,</div><div class='add'>+	0, 0, 0, 2, 4, 34, 2, 0, 0, 2, 4, 30, 1, 0, 0, 2, 4, 34,</div><div class='add'>+	0, 0, 0, 2, 5, 34, 2, 0, 0, 2, 5, 30, 1, 0, 0, 2, 5, 34,</div><div class='add'>+	0, 0, 0, 2, 6, 34, 2, 0, 0, 2, 6, 30, 1, 0, 0, 2, 6, 34,</div><div class='add'>+	0, 0, 0, 2, 7, 34, 2, 0, 0, 2, 7, 30, 1, 0, 0, 2, 7, 34,</div><div class='add'>+	0, 0, 0, 2, 8, 34, 2, 0, 0, 2, 8, 30, 1, 0, 0, 2, 8, 34,</div><div class='add'>+	0, 0, 0, 2, 9, 32, 2, 0, 0, 2, 9, 30, 1, 0, 0, 2, 9, 34,</div><div class='add'>+	0, 0, 0, 2, 10, 30, 2, 0, 0, 2, 10, 30, 1, 0, 0, 2, 10, 34,</div><div class='add'>+	0, 0, 0, 2, 11, 26, 2, 0, 0, 2, 11, 30, 1, 0, 0, 2, 11, 34,</div><div class='add'>+	0, 0, 0, 2, 12, 20, 2, 0, 0, 2, 12, 30, 1, 0, 0, 2, 12, 34,</div><div class='add'>+	0, 0, 0, 2, 13, 14, 2, 0, 0, 2, 13, 30, 1, 0, 0, 2, 13, 34,</div><div class='add'>+	0, 0, 0, 2, 14, 63, 2, 0, 0, 2, 14, 63, 1, 0, 0, 2, 14, 63,</div><div class='add'>+	0, 0, 0, 3, 1, 26, 2, 0, 0, 3, 1, 18, 1, 0, 0, 3, 1, 30,</div><div class='add'>+	0, 0, 0, 3, 2, 28, 2, 0, 0, 3, 2, 18, 1, 0, 0, 3, 2, 30,</div><div class='add'>+	0, 0, 0, 3, 3, 30, 2, 0, 0, 3, 3, 18, 1, 0, 0, 3, 3, 30,</div><div class='add'>+	0, 0, 0, 3, 4, 30, 2, 0, 0, 3, 4, 18, 1, 0, 0, 3, 4, 30,</div><div class='add'>+	0, 0, 0, 3, 5, 32, 2, 0, 0, 3, 5, 18, 1, 0, 0, 3, 5, 30,</div><div class='add'>+	0, 0, 0, 3, 6, 32, 2, 0, 0, 3, 6, 18, 1, 0, 0, 3, 6, 30,</div><div class='add'>+	0, 0, 0, 3, 7, 32, 2, 0, 0, 3, 7, 18, 1, 0, 0, 3, 7, 30,</div><div class='add'>+	0, 0, 0, 3, 8, 30, 2, 0, 0, 3, 8, 18, 1, 0, 0, 3, 8, 30,</div><div class='add'>+	0, 0, 0, 3, 9, 30, 2, 0, 0, 3, 9, 18, 1, 0, 0, 3, 9, 30,</div><div class='add'>+	0, 0, 0, 3, 10, 28, 2, 0, 0, 3, 10, 18, 1, 0, 0, 3, 10, 30,</div><div class='add'>+	0, 0, 0, 3, 11, 26, 2, 0, 0, 3, 11, 18, 1, 0, 0, 3, 11, 30,</div><div class='add'>+	0, 0, 0, 3, 12, 20, 2, 0, 0, 3, 12, 18, 1, 0, 0, 3, 12, 30,</div><div class='add'>+	0, 0, 0, 3, 13, 14, 2, 0, 0, 3, 13, 18, 1, 0, 0, 3, 13, 30,</div><div class='add'>+	0, 0, 0, 3, 14, 63, 2, 0, 0, 3, 14, 63, 1, 0, 0, 3, 14, 63,</div><div class='add'>+	0, 0, 1, 2, 1, 63, 2, 0, 1, 2, 1, 63, 1, 0, 1, 2, 1, 63,</div><div class='add'>+	0, 0, 1, 2, 2, 63, 2, 0, 1, 2, 2, 63, 1, 0, 1, 2, 2, 63,</div><div class='add'>+	0, 0, 1, 2, 3, 26, 2, 0, 1, 2, 3, 30, 1, 0, 1, 2, 3, 34,</div><div class='add'>+	0, 0, 1, 2, 4, 26, 2, 0, 1, 2, 4, 30, 1, 0, 1, 2, 4, 34,</div><div class='add'>+	0, 0, 1, 2, 5, 30, 2, 0, 1, 2, 5, 30, 1, 0, 1, 2, 5, 34,</div><div class='add'>+	0, 0, 1, 2, 6, 32, 2, 0, 1, 2, 6, 30, 1, 0, 1, 2, 6, 34,</div><div class='add'>+	0, 0, 1, 2, 7, 30, 2, 0, 1, 2, 7, 30, 1, 0, 1, 2, 7, 34,</div><div class='add'>+	0, 0, 1, 2, 8, 26, 2, 0, 1, 2, 8, 30, 1, 0, 1, 2, 8, 34,</div><div class='add'>+	0, 0, 1, 2, 9, 26, 2, 0, 1, 2, 9, 30, 1, 0, 1, 2, 9, 34,</div><div class='add'>+	0, 0, 1, 2, 10, 20, 2, 0, 1, 2, 10, 30, 1, 0, 1, 2, 10, 34,</div><div class='add'>+	0, 0, 1, 2, 11, 14, 2, 0, 1, 2, 11, 30, 1, 0, 1, 2, 11, 34,</div><div class='add'>+	0, 0, 1, 2, 12, 63, 2, 0, 1, 2, 12, 63, 1, 0, 1, 2, 12, 63,</div><div class='add'>+	0, 0, 1, 2, 13, 63, 2, 0, 1, 2, 13, 63, 1, 0, 1, 2, 13, 63,</div><div class='add'>+	0, 0, 1, 2, 14, 63, 2, 0, 1, 2, 14, 63, 1, 0, 1, 2, 14, 63,</div><div class='add'>+	0, 0, 1, 3, 1, 63, 2, 0, 1, 3, 1, 63, 1, 0, 1, 3, 1, 63,</div><div class='add'>+	0, 0, 1, 3, 2, 63, 2, 0, 1, 3, 2, 63, 1, 0, 1, 3, 2, 63,</div><div class='add'>+	0, 0, 1, 3, 3, 24, 2, 0, 1, 3, 3, 18, 1, 0, 1, 3, 3, 30,</div><div class='add'>+	0, 0, 1, 3, 4, 24, 2, 0, 1, 3, 4, 18, 1, 0, 1, 3, 4, 30,</div><div class='add'>+	0, 0, 1, 3, 5, 26, 2, 0, 1, 3, 5, 18, 1, 0, 1, 3, 5, 30,</div><div class='add'>+	0, 0, 1, 3, 6, 28, 2, 0, 1, 3, 6, 18, 1, 0, 1, 3, 6, 30,</div><div class='add'>+	0, 0, 1, 3, 7, 26, 2, 0, 1, 3, 7, 18, 1, 0, 1, 3, 7, 30,</div><div class='add'>+	0, 0, 1, 3, 8, 26, 2, 0, 1, 3, 8, 18, 1, 0, 1, 3, 8, 30,</div><div class='add'>+	0, 0, 1, 3, 9, 26, 2, 0, 1, 3, 9, 18, 1, 0, 1, 3, 9, 30,</div><div class='add'>+	0, 0, 1, 3, 10, 20, 2, 0, 1, 3, 10, 18, 1, 0, 1, 3, 10, 30,</div><div class='add'>+	0, 0, 1, 3, 11, 14, 2, 0, 1, 3, 11, 18, 1, 0, 1, 3, 11, 30,</div><div class='add'>+	0, 0, 1, 3, 12, 63, 2, 0, 1, 3, 12, 63, 1, 0, 1, 3, 12, 63,</div><div class='add'>+	0, 0, 1, 3, 13, 63, 2, 0, 1, 3, 13, 63, 1, 0, 1, 3, 13, 63,</div><div class='add'>+	0, 0, 1, 3, 14, 63, 2, 0, 1, 3, 14, 63, 1, 0, 1, 3, 14, 63,</div><div class='add'>+	0, 1, 0, 1, 36, 36, 2, 1, 0, 1, 36, 32, 1, 1, 0, 1, 36, 30,</div><div class='add'>+	0, 1, 0, 1, 40, 38, 2, 1, 0, 1, 40, 32, 1, 1, 0, 1, 40, 30,</div><div class='add'>+	0, 1, 0, 1, 44, 38, 2, 1, 0, 1, 44, 32, 1, 1, 0, 1, 44, 30,</div><div class='add'>+	0, 1, 0, 1, 48, 38, 2, 1, 0, 1, 48, 32, 1, 1, 0, 1, 48, 30,</div><div class='add'>+	0, 1, 0, 1, 52, 38, 2, 1, 0, 1, 52, 32, 1, 1, 0, 1, 52, 28,</div><div class='add'>+	0, 1, 0, 1, 56, 38, 2, 1, 0, 1, 56, 32, 1, 1, 0, 1, 56, 28,</div><div class='add'>+	0, 1, 0, 1, 60, 38, 2, 1, 0, 1, 60, 32, 1, 1, 0, 1, 60, 28,</div><div class='add'>+	0, 1, 0, 1, 64, 34, 2, 1, 0, 1, 64, 32, 1, 1, 0, 1, 64, 28,</div><div class='add'>+	0, 1, 0, 1, 100, 32, 2, 1, 0, 1, 100, 32, 1, 1, 0, 1, 100, 32,</div><div class='add'>+	0, 1, 0, 1, 104, 38, 2, 1, 0, 1, 104, 32, 1, 1, 0, 1, 104, 32,</div><div class='add'>+	0, 1, 0, 1, 108, 38, 2, 1, 0, 1, 108, 32, 1, 1, 0, 1, 108, 32,</div><div class='add'>+	0, 1, 0, 1, 112, 38, 2, 1, 0, 1, 112, 32, 1, 1, 0, 1, 112, 32,</div><div class='add'>+	0, 1, 0, 1, 116, 38, 2, 1, 0, 1, 116, 32, 1, 1, 0, 1, 116, 32,</div><div class='add'>+	0, 1, 0, 1, 120, 38, 2, 1, 0, 1, 120, 32, 1, 1, 0, 1, 120, 32,</div><div class='add'>+	0, 1, 0, 1, 124, 38, 2, 1, 0, 1, 124, 32, 1, 1, 0, 1, 124, 32,</div><div class='add'>+	0, 1, 0, 1, 128, 38, 2, 1, 0, 1, 128, 32, 1, 1, 0, 1, 128, 32,</div><div class='add'>+	0, 1, 0, 1, 132, 38, 2, 1, 0, 1, 132, 32, 1, 1, 0, 1, 132, 32,</div><div class='add'>+	0, 1, 0, 1, 136, 38, 2, 1, 0, 1, 136, 32, 1, 1, 0, 1, 136, 32,</div><div class='add'>+	0, 1, 0, 1, 140, 34, 2, 1, 0, 1, 140, 32, 1, 1, 0, 1, 140, 32,</div><div class='add'>+	0, 1, 0, 1, 144, 34, 2, 1, 0, 1, 144, 32, 1, 1, 0, 1, 144, 63,</div><div class='add'>+	0, 1, 0, 1, 149, 38, 2, 1, 0, 1, 149, 63, 1, 1, 0, 1, 149, 63,</div><div class='add'>+	0, 1, 0, 1, 153, 38, 2, 1, 0, 1, 153, 63, 1, 1, 0, 1, 153, 63,</div><div class='add'>+	0, 1, 0, 1, 157, 38, 2, 1, 0, 1, 157, 63, 1, 1, 0, 1, 157, 63,</div><div class='add'>+	0, 1, 0, 1, 161, 38, 2, 1, 0, 1, 161, 63, 1, 1, 0, 1, 161, 63,</div><div class='add'>+	0, 1, 0, 1, 165, 38, 2, 1, 0, 1, 165, 63, 1, 1, 0, 1, 165, 63,</div><div class='add'>+	0, 1, 0, 2, 36, 36, 2, 1, 0, 2, 36, 32, 1, 1, 0, 2, 36, 28,</div><div class='add'>+	0, 1, 0, 2, 40, 38, 2, 1, 0, 2, 40, 32, 1, 1, 0, 2, 40, 28,</div><div class='add'>+	0, 1, 0, 2, 44, 38, 2, 1, 0, 2, 44, 32, 1, 1, 0, 2, 44, 28,</div><div class='add'>+	0, 1, 0, 2, 48, 38, 2, 1, 0, 2, 48, 32, 1, 1, 0, 2, 48, 28,</div><div class='add'>+	0, 1, 0, 2, 52, 38, 2, 1, 0, 2, 52, 32, 1, 1, 0, 2, 52, 28,</div><div class='add'>+	0, 1, 0, 2, 56, 38, 2, 1, 0, 2, 56, 32, 1, 1, 0, 2, 56, 28,</div><div class='add'>+	0, 1, 0, 2, 60, 38, 2, 1, 0, 2, 60, 32, 1, 1, 0, 2, 60, 28,</div><div class='add'>+	0, 1, 0, 2, 64, 34, 2, 1, 0, 2, 64, 32, 1, 1, 0, 2, 64, 28,</div><div class='add'>+	0, 1, 0, 2, 100, 32, 2, 1, 0, 2, 100, 32, 1, 1, 0, 2, 100, 32,</div><div class='add'>+	0, 1, 0, 2, 104, 38, 2, 1, 0, 2, 104, 32, 1, 1, 0, 2, 104, 32,</div><div class='add'>+	0, 1, 0, 2, 108, 38, 2, 1, 0, 2, 108, 32, 1, 1, 0, 2, 108, 32,</div><div class='add'>+	0, 1, 0, 2, 112, 38, 2, 1, 0, 2, 112, 32, 1, 1, 0, 2, 112, 32,</div><div class='add'>+	0, 1, 0, 2, 116, 38, 2, 1, 0, 2, 116, 32, 1, 1, 0, 2, 116, 32,</div><div class='add'>+	0, 1, 0, 2, 120, 38, 2, 1, 0, 2, 120, 32, 1, 1, 0, 2, 120, 32,</div><div class='add'>+	0, 1, 0, 2, 124, 38, 2, 1, 0, 2, 124, 32, 1, 1, 0, 2, 124, 32,</div><div class='add'>+	0, 1, 0, 2, 128, 38, 2, 1, 0, 2, 128, 32, 1, 1, 0, 2, 128, 32,</div><div class='add'>+	0, 1, 0, 2, 132, 38, 2, 1, 0, 2, 132, 32, 1, 1, 0, 2, 132, 32,</div><div class='add'>+	0, 1, 0, 2, 136, 38, 2, 1, 0, 2, 136, 32, 1, 1, 0, 2, 136, 32,</div><div class='add'>+	0, 1, 0, 2, 140, 32, 2, 1, 0, 2, 140, 32, 1, 1, 0, 2, 140, 32,</div><div class='add'>+	0, 1, 0, 2, 144, 26, 2, 1, 0, 2, 144, 63, 1, 1, 0, 2, 144, 63,</div><div class='add'>+	0, 1, 0, 2, 149, 38, 2, 1, 0, 2, 149, 63, 1, 1, 0, 2, 149, 63,</div><div class='add'>+	0, 1, 0, 2, 153, 38, 2, 1, 0, 2, 153, 63, 1, 1, 0, 2, 153, 63,</div><div class='add'>+	0, 1, 0, 2, 157, 38, 2, 1, 0, 2, 157, 63, 1, 1, 0, 2, 157, 63,</div><div class='add'>+	0, 1, 0, 2, 161, 38, 2, 1, 0, 2, 161, 63, 1, 1, 0, 2, 161, 63,</div><div class='add'>+	0, 1, 0, 2, 165, 38, 2, 1, 0, 2, 165, 63, 1, 1, 0, 2, 165, 63,</div><div class='add'>+	0, 1, 0, 3, 36, 34, 2, 1, 0, 3, 36, 20, 1, 1, 0, 3, 36, 22,</div><div class='add'>+	0, 1, 0, 3, 40, 36, 2, 1, 0, 3, 40, 20, 1, 1, 0, 3, 40, 22,</div><div class='add'>+	0, 1, 0, 3, 44, 36, 2, 1, 0, 3, 44, 20, 1, 1, 0, 3, 44, 22,</div><div class='add'>+	0, 1, 0, 3, 48, 36, 2, 1, 0, 3, 48, 20, 1, 1, 0, 3, 48, 22,</div><div class='add'>+	0, 1, 0, 3, 52, 36, 2, 1, 0, 3, 52, 20, 1, 1, 0, 3, 52, 22,</div><div class='add'>+	0, 1, 0, 3, 56, 36, 2, 1, 0, 3, 56, 20, 1, 1, 0, 3, 56, 22,</div><div class='add'>+	0, 1, 0, 3, 60, 36, 2, 1, 0, 3, 60, 20, 1, 1, 0, 3, 60, 22,</div><div class='add'>+	0, 1, 0, 3, 64, 34, 2, 1, 0, 3, 64, 20, 1, 1, 0, 3, 64, 22,</div><div class='add'>+	0, 1, 0, 3, 100, 32, 2, 1, 0, 3, 100, 20, 1, 1, 0, 3, 100, 30,</div><div class='add'>+	0, 1, 0, 3, 104, 36, 2, 1, 0, 3, 104, 20, 1, 1, 0, 3, 104, 30,</div><div class='add'>+	0, 1, 0, 3, 108, 38, 2, 1, 0, 3, 108, 20, 1, 1, 0, 3, 108, 30,</div><div class='add'>+	0, 1, 0, 3, 112, 38, 2, 1, 0, 3, 112, 20, 1, 1, 0, 3, 112, 30,</div><div class='add'>+	0, 1, 0, 3, 116, 38, 2, 1, 0, 3, 116, 20, 1, 1, 0, 3, 116, 30,</div><div class='add'>+	0, 1, 0, 3, 120, 38, 2, 1, 0, 3, 120, 20, 1, 1, 0, 3, 120, 30,</div><div class='add'>+	0, 1, 0, 3, 124, 38, 2, 1, 0, 3, 124, 20, 1, 1, 0, 3, 124, 30,</div><div class='add'>+	0, 1, 0, 3, 128, 38, 2, 1, 0, 3, 128, 20, 1, 1, 0, 3, 128, 30,</div><div class='add'>+	0, 1, 0, 3, 132, 38, 2, 1, 0, 3, 132, 20, 1, 1, 0, 3, 132, 30,</div><div class='add'>+	0, 1, 0, 3, 136, 36, 2, 1, 0, 3, 136, 20, 1, 1, 0, 3, 136, 30,</div><div class='add'>+	0, 1, 0, 3, 140, 32, 2, 1, 0, 3, 140, 20, 1, 1, 0, 3, 140, 30,</div><div class='add'>+	0, 1, 0, 3, 144, 26, 2, 1, 0, 3, 144, 63, 1, 1, 0, 3, 144, 63,</div><div class='add'>+	0, 1, 0, 3, 149, 38, 2, 1, 0, 3, 149, 63, 1, 1, 0, 3, 149, 63,</div><div class='add'>+	0, 1, 0, 3, 153, 38, 2, 1, 0, 3, 153, 63, 1, 1, 0, 3, 153, 63,</div><div class='add'>+	0, 1, 0, 3, 157, 38, 2, 1, 0, 3, 157, 63, 1, 1, 0, 3, 157, 63,</div><div class='add'>+	0, 1, 0, 3, 161, 38, 2, 1, 0, 3, 161, 63, 1, 1, 0, 3, 161, 63,</div><div class='add'>+	0, 1, 0, 3, 165, 38, 2, 1, 0, 3, 165, 63, 1, 1, 0, 3, 165, 63,</div><div class='add'>+	0, 1, 1, 2, 38, 28, 2, 1, 1, 2, 38, 30, 1, 1, 1, 2, 38, 30,</div><div class='add'>+	0, 1, 1, 2, 46, 36, 2, 1, 1, 2, 46, 30, 1, 1, 1, 2, 46, 30,</div><div class='add'>+	0, 1, 1, 2, 54, 36, 2, 1, 1, 2, 54, 30, 1, 1, 1, 2, 54, 30,</div><div class='add'>+	0, 1, 1, 2, 62, 30, 2, 1, 1, 2, 62, 30, 1, 1, 1, 2, 62, 30,</div><div class='add'>+	0, 1, 1, 2, 102, 30, 2, 1, 1, 2, 102, 30, 1, 1, 1, 2, 102, 30,</div><div class='add'>+	0, 1, 1, 2, 110, 36, 2, 1, 1, 2, 110, 30, 1, 1, 1, 2, 110, 30,</div><div class='add'>+	0, 1, 1, 2, 118, 36, 2, 1, 1, 2, 118, 30, 1, 1, 1, 2, 118, 30,</div><div class='add'>+	0, 1, 1, 2, 126, 36, 2, 1, 1, 2, 126, 30, 1, 1, 1, 2, 126, 30,</div><div class='add'>+	0, 1, 1, 2, 134, 36, 2, 1, 1, 2, 134, 30, 1, 1, 1, 2, 134, 30,</div><div class='add'>+	0, 1, 1, 2, 142, 30, 2, 1, 1, 2, 142, 63, 1, 1, 1, 2, 142, 63,</div><div class='add'>+	0, 1, 1, 2, 151, 36, 2, 1, 1, 2, 151, 63, 1, 1, 1, 2, 151, 63,</div><div class='add'>+	0, 1, 1, 2, 159, 36, 2, 1, 1, 2, 159, 63, 1, 1, 1, 2, 159, 63,</div><div class='add'>+	0, 1, 1, 3, 38, 26, 2, 1, 1, 3, 38, 20, 1, 1, 1, 3, 38, 22,</div><div class='add'>+	0, 1, 1, 3, 46, 36, 2, 1, 1, 3, 46, 20, 1, 1, 1, 3, 46, 22,</div><div class='add'>+	0, 1, 1, 3, 54, 36, 2, 1, 1, 3, 54, 20, 1, 1, 1, 3, 54, 22,</div><div class='add'>+	0, 1, 1, 3, 62, 28, 2, 1, 1, 3, 62, 20, 1, 1, 1, 3, 62, 22,</div><div class='add'>+	0, 1, 1, 3, 102, 28, 2, 1, 1, 3, 102, 20, 1, 1, 1, 3, 102, 30,</div><div class='add'>+	0, 1, 1, 3, 110, 36, 2, 1, 1, 3, 110, 20, 1, 1, 1, 3, 110, 30,</div><div class='add'>+	0, 1, 1, 3, 118, 36, 2, 1, 1, 3, 118, 20, 1, 1, 1, 3, 118, 30,</div><div class='add'>+	0, 1, 1, 3, 126, 36, 2, 1, 1, 3, 126, 20, 1, 1, 1, 3, 126, 30,</div><div class='add'>+	0, 1, 1, 3, 134, 36, 2, 1, 1, 3, 134, 20, 1, 1, 1, 3, 134, 30,</div><div class='add'>+	0, 1, 1, 3, 142, 30, 2, 1, 1, 3, 142, 63, 1, 1, 1, 3, 142, 63,</div><div class='add'>+	0, 1, 1, 3, 151, 36, 2, 1, 1, 3, 151, 63, 1, 1, 1, 3, 151, 63,</div><div class='add'>+	0, 1, 1, 3, 159, 36, 2, 1, 1, 3, 159, 63, 1, 1, 1, 3, 159, 63,</div><div class='add'>+	0, 1, 2, 4, 42, 26, 2, 1, 2, 4, 42, 30, 1, 1, 2, 4, 42, 28,</div><div class='add'>+	0, 1, 2, 4, 58, 26, 2, 1, 2, 4, 58, 30, 1, 1, 2, 4, 58, 28,</div><div class='add'>+	0, 1, 2, 4, 106, 26, 2, 1, 2, 4, 106, 30, 1, 1, 2, 4, 106, 30,</div><div class='add'>+	0, 1, 2, 4, 122, 36, 2, 1, 2, 4, 122, 30, 1, 1, 2, 4, 122, 30,</div><div class='add'>+	0, 1, 2, 4, 138, 36, 2, 1, 2, 4, 138, 63, 1, 1, 2, 4, 138, 63,</div><div class='add'>+	0, 1, 2, 4, 155, 36, 2, 1, 2, 4, 155, 63, 1, 1, 2, 4, 155, 63,</div><div class='add'>+	0, 1, 2, 5, 42, 24, 2, 1, 2, 5, 42, 20, 1, 1, 2, 5, 42, 22,</div><div class='add'>+	0, 1, 2, 5, 58, 24, 2, 1, 2, 5, 58, 20, 1, 1, 2, 5, 58, 22,</div><div class='add'>+	0, 1, 2, 5, 106, 26, 2, 1, 2, 5, 106, 20, 1, 1, 2, 5, 106, 30,</div><div class='add'>+	0, 1, 2, 5, 122, 36, 2, 1, 2, 5, 122, 20, 1, 1, 2, 5, 122, 30,</div><div class='add'>+	0, 1, 2, 5, 138, 36, 2, 1, 2, 5, 138, 63, 1, 1, 2, 5, 138, 63,</div><div class='add'>+	0, 1, 2, 5, 155, 36, 2, 1, 2, 5, 155, 63, 1, 1, 2, 5, 155, 63</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_TXPWR_LMT(rtw8822b_txpwr_lmt_type2);</div><div class='add'>+</div><div class='add'>+static const u8 rtw8822b_txpwr_lmt_type5[] = {</div><div class='add'>+	0, 0, 0, 0, 1, 32, 2, 0, 0, 0, 1, 28, 1, 0, 0, 0, 1, 30,</div><div class='add'>+	0, 0, 0, 0, 2, 32, 2, 0, 0, 0, 2, 28, 1, 0, 0, 0, 2, 30,</div><div class='add'>+	0, 0, 0, 0, 3, 32, 2, 0, 0, 0, 3, 28, 1, 0, 0, 0, 3, 30,</div><div class='add'>+	0, 0, 0, 0, 4, 32, 2, 0, 0, 0, 4, 28, 1, 0, 0, 0, 4, 30,</div><div class='add'>+	0, 0, 0, 0, 5, 32, 2, 0, 0, 0, 5, 28, 1, 0, 0, 0, 5, 30,</div><div class='add'>+	0, 0, 0, 0, 6, 32, 2, 0, 0, 0, 6, 28, 1, 0, 0, 0, 6, 30,</div><div class='add'>+	0, 0, 0, 0, 7, 32, 2, 0, 0, 0, 7, 28, 1, 0, 0, 0, 7, 30,</div><div class='add'>+	0, 0, 0, 0, 8, 32, 2, 0, 0, 0, 8, 28, 1, 0, 0, 0, 8, 30,</div><div class='add'>+	0, 0, 0, 0, 9, 32, 2, 0, 0, 0, 9, 28, 1, 0, 0, 0, 9, 30,</div><div class='add'>+	0, 0, 0, 0, 10, 32, 2, 0, 0, 0, 10, 28, 1, 0, 0, 0, 10, 30,</div><div class='add'>+	0, 0, 0, 0, 11, 32, 2, 0, 0, 0, 11, 28, 1, 0, 0, 0, 11, 30,</div><div class='add'>+	0, 0, 0, 0, 12, 26, 2, 0, 0, 0, 12, 28, 1, 0, 0, 0, 12, 30,</div><div class='add'>+	0, 0, 0, 0, 13, 20, 2, 0, 0, 0, 13, 28, 1, 0, 0, 0, 13, 28,</div><div class='add'>+	0, 0, 0, 0, 14, 63, 2, 0, 0, 0, 14, 63, 1, 0, 0, 0, 14, 32,</div><div class='add'>+	0, 0, 0, 1, 1, 26, 2, 0, 0, 1, 1, 30, 1, 0, 0, 1, 1, 34,</div><div class='add'>+	0, 0, 0, 1, 2, 30, 2, 0, 0, 1, 2, 30, 1, 0, 0, 1, 2, 34,</div><div class='add'>+	0, 0, 0, 1, 3, 32, 2, 0, 0, 1, 3, 30, 1, 0, 0, 1, 3, 34,</div><div class='add'>+	0, 0, 0, 1, 4, 34, 2, 0, 0, 1, 4, 30, 1, 0, 0, 1, 4, 34,</div><div class='add'>+	0, 0, 0, 1, 5, 34, 2, 0, 0, 1, 5, 30, 1, 0, 0, 1, 5, 34,</div><div class='add'>+	0, 0, 0, 1, 6, 34, 2, 0, 0, 1, 6, 30, 1, 0, 0, 1, 6, 34,</div><div class='add'>+	0, 0, 0, 1, 7, 34, 2, 0, 0, 1, 7, 30, 1, 0, 0, 1, 7, 34,</div><div class='add'>+	0, 0, 0, 1, 8, 34, 2, 0, 0, 1, 8, 30, 1, 0, 0, 1, 8, 34,</div><div class='add'>+	0, 0, 0, 1, 9, 32, 2, 0, 0, 1, 9, 30, 1, 0, 0, 1, 9, 34,</div><div class='add'>+	0, 0, 0, 1, 10, 30, 2, 0, 0, 1, 10, 30, 1, 0, 0, 1, 10, 34,</div><div class='add'>+	0, 0, 0, 1, 11, 28, 2, 0, 0, 1, 11, 30, 1, 0, 0, 1, 11, 34,</div><div class='add'>+	0, 0, 0, 1, 12, 22, 2, 0, 0, 1, 12, 30, 1, 0, 0, 1, 12, 34,</div><div class='add'>+	0, 0, 0, 1, 13, 14, 2, 0, 0, 1, 13, 30, 1, 0, 0, 1, 13, 34,</div><div class='add'>+	0, 0, 0, 1, 14, 63, 2, 0, 0, 1, 14, 63, 1, 0, 0, 1, 14, 63,</div><div class='add'>+	0, 0, 0, 2, 1, 26, 2, 0, 0, 2, 1, 30, 1, 0, 0, 2, 1, 34,</div><div class='add'>+	0, 0, 0, 2, 2, 30, 2, 0, 0, 2, 2, 30, 1, 0, 0, 2, 2, 34,</div><div class='add'>+	0, 0, 0, 2, 3, 32, 2, 0, 0, 2, 3, 30, 1, 0, 0, 2, 3, 34,</div><div class='add'>+	0, 0, 0, 2, 4, 34, 2, 0, 0, 2, 4, 30, 1, 0, 0, 2, 4, 34,</div><div class='add'>+	0, 0, 0, 2, 5, 34, 2, 0, 0, 2, 5, 30, 1, 0, 0, 2, 5, 34,</div><div class='add'>+	0, 0, 0, 2, 6, 34, 2, 0, 0, 2, 6, 30, 1, 0, 0, 2, 6, 34,</div><div class='add'>+	0, 0, 0, 2, 7, 34, 2, 0, 0, 2, 7, 30, 1, 0, 0, 2, 7, 34,</div><div class='add'>+	0, 0, 0, 2, 8, 34, 2, 0, 0, 2, 8, 30, 1, 0, 0, 2, 8, 34,</div><div class='add'>+	0, 0, 0, 2, 9, 32, 2, 0, 0, 2, 9, 30, 1, 0, 0, 2, 9, 34,</div><div class='add'>+	0, 0, 0, 2, 10, 30, 2, 0, 0, 2, 10, 30, 1, 0, 0, 2, 10, 34,</div><div class='add'>+	0, 0, 0, 2, 11, 26, 2, 0, 0, 2, 11, 30, 1, 0, 0, 2, 11, 34,</div><div class='add'>+	0, 0, 0, 2, 12, 20, 2, 0, 0, 2, 12, 30, 1, 0, 0, 2, 12, 34,</div><div class='add'>+	0, 0, 0, 2, 13, 14, 2, 0, 0, 2, 13, 30, 1, 0, 0, 2, 13, 34,</div><div class='add'>+	0, 0, 0, 2, 14, 63, 2, 0, 0, 2, 14, 63, 1, 0, 0, 2, 14, 63,</div><div class='add'>+	0, 0, 0, 3, 1, 26, 2, 0, 0, 3, 1, 18, 1, 0, 0, 3, 1, 30,</div><div class='add'>+	0, 0, 0, 3, 2, 28, 2, 0, 0, 3, 2, 18, 1, 0, 0, 3, 2, 30,</div><div class='add'>+	0, 0, 0, 3, 3, 30, 2, 0, 0, 3, 3, 18, 1, 0, 0, 3, 3, 30,</div><div class='add'>+	0, 0, 0, 3, 4, 30, 2, 0, 0, 3, 4, 18, 1, 0, 0, 3, 4, 30,</div><div class='add'>+	0, 0, 0, 3, 5, 32, 2, 0, 0, 3, 5, 18, 1, 0, 0, 3, 5, 30,</div><div class='add'>+	0, 0, 0, 3, 6, 32, 2, 0, 0, 3, 6, 18, 1, 0, 0, 3, 6, 30,</div><div class='add'>+	0, 0, 0, 3, 7, 32, 2, 0, 0, 3, 7, 18, 1, 0, 0, 3, 7, 30,</div><div class='add'>+	0, 0, 0, 3, 8, 30, 2, 0, 0, 3, 8, 18, 1, 0, 0, 3, 8, 30,</div><div class='add'>+	0, 0, 0, 3, 9, 30, 2, 0, 0, 3, 9, 18, 1, 0, 0, 3, 9, 30,</div><div class='add'>+	0, 0, 0, 3, 10, 28, 2, 0, 0, 3, 10, 18, 1, 0, 0, 3, 10, 30,</div><div class='add'>+	0, 0, 0, 3, 11, 26, 2, 0, 0, 3, 11, 18, 1, 0, 0, 3, 11, 30,</div><div class='add'>+	0, 0, 0, 3, 12, 20, 2, 0, 0, 3, 12, 18, 1, 0, 0, 3, 12, 30,</div><div class='add'>+	0, 0, 0, 3, 13, 14, 2, 0, 0, 3, 13, 18, 1, 0, 0, 3, 13, 30,</div><div class='add'>+	0, 0, 0, 3, 14, 63, 2, 0, 0, 3, 14, 63, 1, 0, 0, 3, 14, 63,</div><div class='add'>+	0, 0, 1, 2, 1, 63, 2, 0, 1, 2, 1, 63, 1, 0, 1, 2, 1, 63,</div><div class='add'>+	0, 0, 1, 2, 2, 63, 2, 0, 1, 2, 2, 63, 1, 0, 1, 2, 2, 63,</div><div class='add'>+	0, 0, 1, 2, 3, 26, 2, 0, 1, 2, 3, 30, 1, 0, 1, 2, 3, 34,</div><div class='add'>+	0, 0, 1, 2, 4, 26, 2, 0, 1, 2, 4, 30, 1, 0, 1, 2, 4, 34,</div><div class='add'>+	0, 0, 1, 2, 5, 30, 2, 0, 1, 2, 5, 30, 1, 0, 1, 2, 5, 34,</div><div class='add'>+	0, 0, 1, 2, 6, 32, 2, 0, 1, 2, 6, 30, 1, 0, 1, 2, 6, 34,</div><div class='add'>+	0, 0, 1, 2, 7, 30, 2, 0, 1, 2, 7, 30, 1, 0, 1, 2, 7, 34,</div><div class='add'>+	0, 0, 1, 2, 8, 26, 2, 0, 1, 2, 8, 30, 1, 0, 1, 2, 8, 34,</div><div class='add'>+	0, 0, 1, 2, 9, 26, 2, 0, 1, 2, 9, 30, 1, 0, 1, 2, 9, 34,</div><div class='add'>+	0, 0, 1, 2, 10, 20, 2, 0, 1, 2, 10, 30, 1, 0, 1, 2, 10, 34,</div><div class='add'>+	0, 0, 1, 2, 11, 14, 2, 0, 1, 2, 11, 30, 1, 0, 1, 2, 11, 34,</div><div class='add'>+	0, 0, 1, 2, 12, 63, 2, 0, 1, 2, 12, 63, 1, 0, 1, 2, 12, 63,</div><div class='add'>+	0, 0, 1, 2, 13, 63, 2, 0, 1, 2, 13, 63, 1, 0, 1, 2, 13, 63,</div><div class='add'>+	0, 0, 1, 2, 14, 63, 2, 0, 1, 2, 14, 63, 1, 0, 1, 2, 14, 63,</div><div class='add'>+	0, 0, 1, 3, 1, 63, 2, 0, 1, 3, 1, 63, 1, 0, 1, 3, 1, 63,</div><div class='add'>+	0, 0, 1, 3, 2, 63, 2, 0, 1, 3, 2, 63, 1, 0, 1, 3, 2, 63,</div><div class='add'>+	0, 0, 1, 3, 3, 24, 2, 0, 1, 3, 3, 18, 1, 0, 1, 3, 3, 30,</div><div class='add'>+	0, 0, 1, 3, 4, 24, 2, 0, 1, 3, 4, 18, 1, 0, 1, 3, 4, 30,</div><div class='add'>+	0, 0, 1, 3, 5, 26, 2, 0, 1, 3, 5, 18, 1, 0, 1, 3, 5, 30,</div><div class='add'>+	0, 0, 1, 3, 6, 28, 2, 0, 1, 3, 6, 18, 1, 0, 1, 3, 6, 30,</div><div class='add'>+	0, 0, 1, 3, 7, 26, 2, 0, 1, 3, 7, 18, 1, 0, 1, 3, 7, 30,</div><div class='add'>+	0, 0, 1, 3, 8, 26, 2, 0, 1, 3, 8, 18, 1, 0, 1, 3, 8, 30,</div><div class='add'>+	0, 0, 1, 3, 9, 26, 2, 0, 1, 3, 9, 18, 1, 0, 1, 3, 9, 30,</div><div class='add'>+	0, 0, 1, 3, 10, 20, 2, 0, 1, 3, 10, 18, 1, 0, 1, 3, 10, 30,</div><div class='add'>+	0, 0, 1, 3, 11, 14, 2, 0, 1, 3, 11, 18, 1, 0, 1, 3, 11, 30,</div><div class='add'>+	0, 0, 1, 3, 12, 63, 2, 0, 1, 3, 12, 63, 1, 0, 1, 3, 12, 63,</div><div class='add'>+	0, 0, 1, 3, 13, 63, 2, 0, 1, 3, 13, 63, 1, 0, 1, 3, 13, 63,</div><div class='add'>+	0, 0, 1, 3, 14, 63, 2, 0, 1, 3, 14, 63, 1, 0, 1, 3, 14, 63,</div><div class='add'>+	0, 1, 0, 1, 36, 30, 2, 1, 0, 1, 36, 32, 1, 1, 0, 1, 36, 30,</div><div class='add'>+	0, 1, 0, 1, 40, 32, 2, 1, 0, 1, 40, 32, 1, 1, 0, 1, 40, 30,</div><div class='add'>+	0, 1, 0, 1, 44, 32, 2, 1, 0, 1, 44, 32, 1, 1, 0, 1, 44, 30,</div><div class='add'>+	0, 1, 0, 1, 48, 32, 2, 1, 0, 1, 48, 32, 1, 1, 0, 1, 48, 30,</div><div class='add'>+	0, 1, 0, 1, 52, 32, 2, 1, 0, 1, 52, 32, 1, 1, 0, 1, 52, 28,</div><div class='add'>+	0, 1, 0, 1, 56, 32, 2, 1, 0, 1, 56, 32, 1, 1, 0, 1, 56, 28,</div><div class='add'>+	0, 1, 0, 1, 60, 32, 2, 1, 0, 1, 60, 32, 1, 1, 0, 1, 60, 28,</div><div class='add'>+	0, 1, 0, 1, 64, 28, 2, 1, 0, 1, 64, 32, 1, 1, 0, 1, 64, 28,</div><div class='add'>+	0, 1, 0, 1, 100, 26, 2, 1, 0, 1, 100, 32, 1, 1, 0, 1, 100, 32,</div><div class='add'>+	0, 1, 0, 1, 104, 32, 2, 1, 0, 1, 104, 32, 1, 1, 0, 1, 104, 32,</div><div class='add'>+	0, 1, 0, 1, 108, 32, 2, 1, 0, 1, 108, 32, 1, 1, 0, 1, 108, 32,</div><div class='add'>+	0, 1, 0, 1, 112, 32, 2, 1, 0, 1, 112, 32, 1, 1, 0, 1, 112, 32,</div><div class='add'>+	0, 1, 0, 1, 116, 32, 2, 1, 0, 1, 116, 32, 1, 1, 0, 1, 116, 32,</div><div class='add'>+	0, 1, 0, 1, 120, 32, 2, 1, 0, 1, 120, 32, 1, 1, 0, 1, 120, 32,</div><div class='add'>+	0, 1, 0, 1, 124, 32, 2, 1, 0, 1, 124, 32, 1, 1, 0, 1, 124, 32,</div><div class='add'>+	0, 1, 0, 1, 128, 32, 2, 1, 0, 1, 128, 32, 1, 1, 0, 1, 128, 32,</div><div class='add'>+	0, 1, 0, 1, 132, 32, 2, 1, 0, 1, 132, 32, 1, 1, 0, 1, 132, 32,</div><div class='add'>+	0, 1, 0, 1, 136, 32, 2, 1, 0, 1, 136, 32, 1, 1, 0, 1, 136, 32,</div><div class='add'>+	0, 1, 0, 1, 140, 28, 2, 1, 0, 1, 140, 32, 1, 1, 0, 1, 140, 32,</div><div class='add'>+	0, 1, 0, 1, 144, 28, 2, 1, 0, 1, 144, 63, 1, 1, 0, 1, 144, 63,</div><div class='add'>+	0, 1, 0, 1, 149, 32, 2, 1, 0, 1, 149, 63, 1, 1, 0, 1, 149, 63,</div><div class='add'>+	0, 1, 0, 1, 153, 32, 2, 1, 0, 1, 153, 63, 1, 1, 0, 1, 153, 63,</div><div class='add'>+	0, 1, 0, 1, 157, 32, 2, 1, 0, 1, 157, 63, 1, 1, 0, 1, 157, 63,</div><div class='add'>+	0, 1, 0, 1, 161, 32, 2, 1, 0, 1, 161, 63, 1, 1, 0, 1, 161, 63,</div><div class='add'>+	0, 1, 0, 1, 165, 32, 2, 1, 0, 1, 165, 63, 1, 1, 0, 1, 165, 63,</div><div class='add'>+	0, 1, 0, 2, 36, 30, 2, 1, 0, 2, 36, 32, 1, 1, 0, 2, 36, 28,</div><div class='add'>+	0, 1, 0, 2, 40, 32, 2, 1, 0, 2, 40, 32, 1, 1, 0, 2, 40, 28,</div><div class='add'>+	0, 1, 0, 2, 44, 32, 2, 1, 0, 2, 44, 32, 1, 1, 0, 2, 44, 28,</div><div class='add'>+	0, 1, 0, 2, 48, 32, 2, 1, 0, 2, 48, 32, 1, 1, 0, 2, 48, 28,</div><div class='add'>+	0, 1, 0, 2, 52, 32, 2, 1, 0, 2, 52, 32, 1, 1, 0, 2, 52, 28,</div><div class='add'>+	0, 1, 0, 2, 56, 32, 2, 1, 0, 2, 56, 32, 1, 1, 0, 2, 56, 28,</div><div class='add'>+	0, 1, 0, 2, 60, 32, 2, 1, 0, 2, 60, 32, 1, 1, 0, 2, 60, 28,</div><div class='add'>+	0, 1, 0, 2, 64, 28, 2, 1, 0, 2, 64, 32, 1, 1, 0, 2, 64, 28,</div><div class='add'>+	0, 1, 0, 2, 100, 26, 2, 1, 0, 2, 100, 32, 1, 1, 0, 2, 100, 32,</div><div class='add'>+	0, 1, 0, 2, 104, 32, 2, 1, 0, 2, 104, 32, 1, 1, 0, 2, 104, 32,</div><div class='add'>+	0, 1, 0, 2, 108, 32, 2, 1, 0, 2, 108, 32, 1, 1, 0, 2, 108, 32,</div><div class='add'>+	0, 1, 0, 2, 112, 32, 2, 1, 0, 2, 112, 32, 1, 1, 0, 2, 112, 32,</div><div class='add'>+	0, 1, 0, 2, 116, 32, 2, 1, 0, 2, 116, 32, 1, 1, 0, 2, 116, 32,</div><div class='add'>+	0, 1, 0, 2, 120, 32, 2, 1, 0, 2, 120, 32, 1, 1, 0, 2, 120, 32,</div><div class='add'>+	0, 1, 0, 2, 124, 32, 2, 1, 0, 2, 124, 32, 1, 1, 0, 2, 124, 32,</div><div class='add'>+	0, 1, 0, 2, 128, 32, 2, 1, 0, 2, 128, 32, 1, 1, 0, 2, 128, 32,</div><div class='add'>+	0, 1, 0, 2, 132, 32, 2, 1, 0, 2, 132, 32, 1, 1, 0, 2, 132, 32,</div><div class='add'>+	0, 1, 0, 2, 136, 32, 2, 1, 0, 2, 136, 32, 1, 1, 0, 2, 136, 32,</div><div class='add'>+	0, 1, 0, 2, 140, 26, 2, 1, 0, 2, 140, 32, 1, 1, 0, 2, 140, 32,</div><div class='add'>+	0, 1, 0, 2, 144, 26, 2, 1, 0, 2, 144, 63, 1, 1, 0, 2, 144, 63,</div><div class='add'>+	0, 1, 0, 2, 149, 32, 2, 1, 0, 2, 149, 63, 1, 1, 0, 2, 149, 63,</div><div class='add'>+	0, 1, 0, 2, 153, 32, 2, 1, 0, 2, 153, 63, 1, 1, 0, 2, 153, 63,</div><div class='add'>+	0, 1, 0, 2, 157, 32, 2, 1, 0, 2, 157, 63, 1, 1, 0, 2, 157, 63,</div><div class='add'>+	0, 1, 0, 2, 161, 32, 2, 1, 0, 2, 161, 63, 1, 1, 0, 2, 161, 63,</div><div class='add'>+	0, 1, 0, 2, 165, 32, 2, 1, 0, 2, 165, 63, 1, 1, 0, 2, 165, 63,</div><div class='add'>+	0, 1, 0, 3, 36, 28, 2, 1, 0, 3, 36, 20, 1, 1, 0, 3, 36, 22,</div><div class='add'>+	0, 1, 0, 3, 40, 30, 2, 1, 0, 3, 40, 20, 1, 1, 0, 3, 40, 22,</div><div class='add'>+	0, 1, 0, 3, 44, 30, 2, 1, 0, 3, 44, 20, 1, 1, 0, 3, 44, 22,</div><div class='add'>+	0, 1, 0, 3, 48, 30, 2, 1, 0, 3, 48, 20, 1, 1, 0, 3, 48, 22,</div><div class='add'>+	0, 1, 0, 3, 52, 30, 2, 1, 0, 3, 52, 20, 1, 1, 0, 3, 52, 22,</div><div class='add'>+	0, 1, 0, 3, 56, 30, 2, 1, 0, 3, 56, 20, 1, 1, 0, 3, 56, 22,</div><div class='add'>+	0, 1, 0, 3, 60, 30, 2, 1, 0, 3, 60, 20, 1, 1, 0, 3, 60, 22,</div><div class='add'>+	0, 1, 0, 3, 64, 28, 2, 1, 0, 3, 64, 20, 1, 1, 0, 3, 64, 22,</div><div class='add'>+	0, 1, 0, 3, 100, 26, 2, 1, 0, 3, 100, 20, 1, 1, 0, 3, 100, 30,</div><div class='add'>+	0, 1, 0, 3, 104, 30, 2, 1, 0, 3, 104, 20, 1, 1, 0, 3, 104, 30,</div><div class='add'>+	0, 1, 0, 3, 108, 32, 2, 1, 0, 3, 108, 20, 1, 1, 0, 3, 108, 30,</div><div class='add'>+	0, 1, 0, 3, 112, 32, 2, 1, 0, 3, 112, 20, 1, 1, 0, 3, 112, 30,</div><div class='add'>+	0, 1, 0, 3, 116, 32, 2, 1, 0, 3, 116, 20, 1, 1, 0, 3, 116, 30,</div><div class='add'>+	0, 1, 0, 3, 120, 32, 2, 1, 0, 3, 120, 20, 1, 1, 0, 3, 120, 30,</div><div class='add'>+	0, 1, 0, 3, 124, 32, 2, 1, 0, 3, 124, 20, 1, 1, 0, 3, 124, 30,</div><div class='add'>+	0, 1, 0, 3, 128, 32, 2, 1, 0, 3, 128, 20, 1, 1, 0, 3, 128, 30,</div><div class='add'>+	0, 1, 0, 3, 132, 32, 2, 1, 0, 3, 132, 20, 1, 1, 0, 3, 132, 30,</div><div class='add'>+	0, 1, 0, 3, 136, 30, 2, 1, 0, 3, 136, 20, 1, 1, 0, 3, 136, 30,</div><div class='add'>+	0, 1, 0, 3, 140, 26, 2, 1, 0, 3, 140, 20, 1, 1, 0, 3, 140, 30,</div><div class='add'>+	0, 1, 0, 3, 144, 26, 2, 1, 0, 3, 144, 63, 1, 1, 0, 3, 144, 63,</div><div class='add'>+	0, 1, 0, 3, 149, 32, 2, 1, 0, 3, 149, 63, 1, 1, 0, 3, 149, 63,</div><div class='add'>+	0, 1, 0, 3, 153, 32, 2, 1, 0, 3, 153, 63, 1, 1, 0, 3, 153, 63,</div><div class='add'>+	0, 1, 0, 3, 157, 32, 2, 1, 0, 3, 157, 63, 1, 1, 0, 3, 157, 63,</div><div class='add'>+	0, 1, 0, 3, 161, 32, 2, 1, 0, 3, 161, 63, 1, 1, 0, 3, 161, 63,</div><div class='add'>+	0, 1, 0, 3, 165, 32, 2, 1, 0, 3, 165, 63, 1, 1, 0, 3, 165, 63,</div><div class='add'>+	0, 1, 1, 2, 38, 22, 2, 1, 1, 2, 38, 30, 1, 1, 1, 2, 38, 30,</div><div class='add'>+	0, 1, 1, 2, 46, 30, 2, 1, 1, 2, 46, 30, 1, 1, 1, 2, 46, 30,</div><div class='add'>+	0, 1, 1, 2, 54, 30, 2, 1, 1, 2, 54, 30, 1, 1, 1, 2, 54, 30,</div><div class='add'>+	0, 1, 1, 2, 62, 24, 2, 1, 1, 2, 62, 30, 1, 1, 1, 2, 62, 30,</div><div class='add'>+	0, 1, 1, 2, 102, 24, 2, 1, 1, 2, 102, 30, 1, 1, 1, 2, 102, 30,</div><div class='add'>+	0, 1, 1, 2, 110, 30, 2, 1, 1, 2, 110, 30, 1, 1, 1, 2, 110, 30,</div><div class='add'>+	0, 1, 1, 2, 118, 30, 2, 1, 1, 2, 118, 30, 1, 1, 1, 2, 118, 30,</div><div class='add'>+	0, 1, 1, 2, 126, 30, 2, 1, 1, 2, 126, 30, 1, 1, 1, 2, 126, 30,</div><div class='add'>+	0, 1, 1, 2, 134, 30, 2, 1, 1, 2, 134, 30, 1, 1, 1, 2, 134, 30,</div><div class='add'>+	0, 1, 1, 2, 142, 30, 2, 1, 1, 2, 142, 63, 1, 1, 1, 2, 142, 63,</div><div class='add'>+	0, 1, 1, 2, 151, 30, 2, 1, 1, 2, 151, 63, 1, 1, 1, 2, 151, 63,</div><div class='add'>+	0, 1, 1, 2, 159, 30, 2, 1, 1, 2, 159, 63, 1, 1, 1, 2, 159, 63,</div><div class='add'>+	0, 1, 1, 3, 38, 20, 2, 1, 1, 3, 38, 20, 1, 1, 1, 3, 38, 22,</div><div class='add'>+	0, 1, 1, 3, 46, 30, 2, 1, 1, 3, 46, 20, 1, 1, 1, 3, 46, 22,</div><div class='add'>+	0, 1, 1, 3, 54, 30, 2, 1, 1, 3, 54, 20, 1, 1, 1, 3, 54, 22,</div><div class='add'>+	0, 1, 1, 3, 62, 22, 2, 1, 1, 3, 62, 20, 1, 1, 1, 3, 62, 22,</div><div class='add'>+	0, 1, 1, 3, 102, 22, 2, 1, 1, 3, 102, 20, 1, 1, 1, 3, 102, 30,</div><div class='add'>+	0, 1, 1, 3, 110, 30, 2, 1, 1, 3, 110, 20, 1, 1, 1, 3, 110, 30,</div><div class='add'>+	0, 1, 1, 3, 118, 30, 2, 1, 1, 3, 118, 20, 1, 1, 1, 3, 118, 30,</div><div class='add'>+	0, 1, 1, 3, 126, 30, 2, 1, 1, 3, 126, 20, 1, 1, 1, 3, 126, 30,</div><div class='add'>+	0, 1, 1, 3, 134, 30, 2, 1, 1, 3, 134, 20, 1, 1, 1, 3, 134, 30,</div><div class='add'>+	0, 1, 1, 3, 142, 30, 2, 1, 1, 3, 142, 63, 1, 1, 1, 3, 142, 63,</div><div class='add'>+	0, 1, 1, 3, 151, 30, 2, 1, 1, 3, 151, 63, 1, 1, 1, 3, 151, 63,</div><div class='add'>+	0, 1, 1, 3, 159, 30, 2, 1, 1, 3, 159, 63, 1, 1, 1, 3, 159, 63,</div><div class='add'>+	0, 1, 2, 4, 42, 20, 2, 1, 2, 4, 42, 30, 1, 1, 2, 4, 42, 28,</div><div class='add'>+	0, 1, 2, 4, 58, 20, 2, 1, 2, 4, 58, 30, 1, 1, 2, 4, 58, 28,</div><div class='add'>+	0, 1, 2, 4, 106, 20, 2, 1, 2, 4, 106, 30, 1, 1, 2, 4, 106, 30,</div><div class='add'>+	0, 1, 2, 4, 122, 30, 2, 1, 2, 4, 122, 30, 1, 1, 2, 4, 122, 30,</div><div class='add'>+	0, 1, 2, 4, 138, 30, 2, 1, 2, 4, 138, 63, 1, 1, 2, 4, 138, 63,</div><div class='add'>+	0, 1, 2, 4, 155, 30, 2, 1, 2, 4, 155, 63, 1, 1, 2, 4, 155, 63,</div><div class='add'>+	0, 1, 2, 5, 42, 18, 2, 1, 2, 5, 42, 20, 1, 1, 2, 5, 42, 22,</div><div class='add'>+	0, 1, 2, 5, 58, 18, 2, 1, 2, 5, 58, 20, 1, 1, 2, 5, 58, 22,</div><div class='add'>+	0, 1, 2, 5, 106, 20, 2, 1, 2, 5, 106, 20, 1, 1, 2, 5, 106, 30,</div><div class='add'>+	0, 1, 2, 5, 122, 30, 2, 1, 2, 5, 122, 20, 1, 1, 2, 5, 122, 30,</div><div class='add'>+	0, 1, 2, 5, 138, 30, 2, 1, 2, 5, 138, 63, 1, 1, 2, 5, 138, 63,</div><div class='add'>+	0, 1, 2, 5, 155, 30, 2, 1, 2, 5, 155, 63, 1, 1, 2, 5, 155, 63,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_TXPWR_LMT(rtw8822b_txpwr_lmt_type5);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b_table.h b/drivers/net/wireless/realtek/rtw88/rtw8822b_table.h<br/>new file mode 100644<br/>index 000000000000..d4c268889368<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822b_table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822b_table.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW8822B_TABLE_H__</div><div class='add'>+#define __RTW8822B_TABLE_H__</div><div class='add'>+</div><div class='add'>+extern const struct rtw_table rtw8822b_mac_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_agc_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_bb_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_bb_pg_type2_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_bb_pg_type5_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_rf_a_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_rf_b_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_txpwr_lmt_type2_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822b_txpwr_lmt_type5_tbl;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c<br/>new file mode 100644<br/>index 000000000000..b4f7242e5aa3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822c.c</a></div><div class='hunk'>@@ -0,0 +1,1890 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "rtw8822c.h"</div><div class='add'>+#include "rtw8822c_table.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+				     u8 rx_path, bool is_tx2_path);</div><div class='add'>+</div><div class='add'>+static void rtw8822ce_efuse_parsing(struct rtw_efuse *efuse,</div><div class='add'>+				    struct rtw8822c_efuse *map)</div><div class='add'>+{</div><div class='add'>+	ether_addr_copy(efuse-&gt;addr, map-&gt;e.mac_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	struct rtw8822c_efuse *map;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	map = (struct rtw8822c_efuse *)log_map;</div><div class='add'>+</div><div class='add'>+	efuse-&gt;rfe_option = map-&gt;rfe_option;</div><div class='add'>+	efuse-&gt;crystal_cap = map-&gt;xtal_k;</div><div class='add'>+	efuse-&gt;channel_plan = map-&gt;channel_plan;</div><div class='add'>+	efuse-&gt;country_code[0] = map-&gt;country_code[0];</div><div class='add'>+	efuse-&gt;country_code[1] = map-&gt;country_code[1];</div><div class='add'>+	efuse-&gt;bt_setting = map-&gt;rf_bt_setting;</div><div class='add'>+	efuse-&gt;regd = map-&gt;rf_board_option &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		efuse-&gt;txpwr_idx_table[i] = map-&gt;txpwr_idx_table[i];</div><div class='add'>+</div><div class='add'>+	switch (rtw_hci_type(rtwdev)) {</div><div class='add'>+	case RTW_HCI_TYPE_PCIE:</div><div class='add'>+		rtw8822ce_efuse_parsing(efuse, map);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* unsupported now */</div><div class='add'>+		return -ENOTSUPP;</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 rtw8822c_header_file_init(struct rtw_dev *rtwdev, bool pre)</div><div class='add'>+{</div><div class='add'>+	rtw_write32_set(rtwdev, REG_3WIRE, BIT_3WIRE_TX_EN | BIT_3WIRE_RX_EN);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_3WIRE, BIT_3WIRE_PI_ON);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_3WIRE2, BIT_3WIRE_TX_EN | BIT_3WIRE_RX_EN);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_3WIRE2, BIT_3WIRE_PI_ON);</div><div class='add'>+</div><div class='add'>+	if (pre)</div><div class='add'>+		rtw_write32_clr(rtwdev, REG_ENCCK, BIT_CCK_OFDM_BLK_EN);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32_set(rtwdev, REG_ENCCK, BIT_CCK_OFDM_BLK_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_backup_reg(struct rtw_dev *rtwdev,</div><div class='add'>+				    struct rtw_backup_info *backup,</div><div class='add'>+				    struct rtw_backup_info *backup_rf)</div><div class='add'>+{</div><div class='add'>+	u32 path, i;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 rf_addr[DACK_RF_8822C] = {0x8f};</div><div class='add'>+	u32 addrs[DACK_REG_8822C] = {0x180c, 0x1810, 0x410c, 0x4110,</div><div class='add'>+				     0x1c3c, 0x1c24, 0x1d70, 0x9b4,</div><div class='add'>+				     0x1a00, 0x1a14, 0x1d58, 0x1c38,</div><div class='add'>+				     0x1e24, 0x1e28, 0x1860, 0x4160};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DACK_REG_8822C; i++) {</div><div class='add'>+		backup[i].len = 4;</div><div class='add'>+		backup[i].reg = addrs[i];</div><div class='add'>+		backup[i].val = rtw_read32(rtwdev, addrs[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; DACK_PATH_8822C; path++) {</div><div class='add'>+		for (i = 0; i &lt; DACK_RF_8822C; i++) {</div><div class='add'>+			reg = rf_addr[i];</div><div class='add'>+			val = rtw_read_rf(rtwdev, path, reg, RFREG_MASK);</div><div class='add'>+			backup_rf[path * i + i].reg = reg;</div><div class='add'>+			backup_rf[path * i + i].val = val;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_restore_reg(struct rtw_dev *rtwdev,</div><div class='add'>+				     struct rtw_backup_info *backup,</div><div class='add'>+				     struct rtw_backup_info *backup_rf)</div><div class='add'>+{</div><div class='add'>+	u32 path, i;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	rtw_restore_reg(rtwdev, backup, DACK_REG_8822C);</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; DACK_PATH_8822C; path++) {</div><div class='add'>+		for (i = 0; i &lt; DACK_RF_8822C; i++) {</div><div class='add'>+			val = backup_rf[path * i + i].val;</div><div class='add'>+			reg = backup_rf[path * i + i].reg;</div><div class='add'>+			rtw_write_rf(rtwdev, path, reg, RFREG_MASK, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_rf_minmax_cmp(struct rtw_dev *rtwdev, u32 value,</div><div class='add'>+				   u32 *min, u32 *max)</div><div class='add'>+{</div><div class='add'>+	if (value &gt;= 0x200) {</div><div class='add'>+		if (*min &gt;= 0x200) {</div><div class='add'>+			if (*min &gt; value)</div><div class='add'>+				*min = value;</div><div class='add'>+		} else {</div><div class='add'>+			*min = value;</div><div class='add'>+		}</div><div class='add'>+		if (*max &gt;= 0x200) {</div><div class='add'>+			if (*max &lt; value)</div><div class='add'>+				*max = value;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (*min &lt; 0x200) {</div><div class='add'>+			if (*min &gt; value)</div><div class='add'>+				*min = value;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (*max  &gt;= 0x200) {</div><div class='add'>+			*max = value;</div><div class='add'>+		} else {</div><div class='add'>+			if (*max &lt; value)</div><div class='add'>+				*max = value;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void swap_u32(u32 *v1, u32 *v2)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = *v1;</div><div class='add'>+	*v1 = *v2;</div><div class='add'>+	*v2 = tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, u32 *v1, u32 *v2)</div><div class='add'>+{</div><div class='add'>+	if (*v1 &gt;= 0x200 &amp;&amp; *v2 &gt;= 0x200) {</div><div class='add'>+		if (*v1 &gt; *v2)</div><div class='add'>+			swap_u32(v1, v2);</div><div class='add'>+	} else if (*v1 &lt; 0x200 &amp;&amp; *v2 &lt; 0x200) {</div><div class='add'>+		if (*v1 &gt; *v2)</div><div class='add'>+			swap_u32(v1, v2);</div><div class='add'>+	} else if (*v1 &lt; 0x200 &amp;&amp; *v2 &gt;= 0x200) {</div><div class='add'>+		swap_u32(v1, v2);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, u32 *iv, u32 *qv)</div><div class='add'>+{</div><div class='add'>+	u32 i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DACK_SN_8822C - 1; i++) {</div><div class='add'>+		for (j = 0; j &lt; (DACK_SN_8822C - 1 - i) ; j++) {</div><div class='add'>+			__rtw8822c_dac_iq_sort(rtwdev, &amp;iv[j], &amp;iv[j + 1]);</div><div class='add'>+			__rtw8822c_dac_iq_sort(rtwdev, &amp;qv[j], &amp;qv[j + 1]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_iq_offset(struct rtw_dev *rtwdev, u32 *vec, u32 *val)</div><div class='add'>+{</div><div class='add'>+	u32 p, m, t, i;</div><div class='add'>+</div><div class='add'>+	m = 0;</div><div class='add'>+	p = 0;</div><div class='add'>+	for (i = 10; i &lt; DACK_SN_8822C - 10; i++) {</div><div class='add'>+		if (vec[i] &gt; 0x200)</div><div class='add'>+			m = (0x400 - vec[i]) + m;</div><div class='add'>+		else</div><div class='add'>+			p = vec[i] + p;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p &gt; m) {</div><div class='add'>+		t = p - m;</div><div class='add'>+		t = t / (DACK_SN_8822C - 20);</div><div class='add'>+	} else {</div><div class='add'>+		t = m - p;</div><div class='add'>+		t = t / (DACK_SN_8822C - 20);</div><div class='add'>+		if (t != 0x0)</div><div class='add'>+			t = 0x400 - t;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rtw8822c_get_path_base_addr(u8 path)</div><div class='add'>+{</div><div class='add'>+	u32 base_addr;</div><div class='add'>+</div><div class='add'>+	switch (path) {</div><div class='add'>+	case RF_PATH_A:</div><div class='add'>+		base_addr = 0x1800;</div><div class='add'>+		break;</div><div class='add'>+	case RF_PATH_B:</div><div class='add'>+		base_addr = 0x4100;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return base_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool rtw8822c_dac_iq_check(struct rtw_dev *rtwdev, u32 value)</div><div class='add'>+{</div><div class='add'>+	bool ret = true;</div><div class='add'>+</div><div class='add'>+	if ((value &gt;= 0x200 &amp;&amp; (0x400 - value) &gt; 0x64) ||</div><div class='add'>+	    (value &lt; 0x200 &amp;&amp; value &gt; 0x64)) {</div><div class='add'>+		ret = false;</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] Error overflow\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'>+static void rtw8822c_dac_cal_iq_sample(struct rtw_dev *rtwdev, u32 *iv, u32 *qv)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+	int i = 0, cnt = 0;</div><div class='add'>+</div><div class='add'>+	while (i &lt; DACK_SN_8822C &amp;&amp; cnt &lt; 10000) {</div><div class='add'>+		cnt++;</div><div class='add'>+		temp = rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff);</div><div class='add'>+		iv[i] = (temp &amp; 0x3ff000) &gt;&gt; 12;</div><div class='add'>+		qv[i] = temp &amp; 0x3ff;</div><div class='add'>+</div><div class='add'>+		if (rtw8822c_dac_iq_check(rtwdev, iv[i]) &amp;&amp;</div><div class='add'>+		    rtw8822c_dac_iq_check(rtwdev, qv[i]))</div><div class='add'>+			i++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_iq_search(struct rtw_dev *rtwdev,</div><div class='add'>+				       u32 *iv, u32 *qv,</div><div class='add'>+				       u32 *i_value, u32 *q_value)</div><div class='add'>+{</div><div class='add'>+	u32 i_max = 0, q_max = 0, i_min = 0, q_min = 0;</div><div class='add'>+	u32 i_delta, q_delta;</div><div class='add'>+	u32 temp;</div><div class='add'>+	int i, cnt = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		i_min = iv[0];</div><div class='add'>+		i_max = iv[0];</div><div class='add'>+		q_min = qv[0];</div><div class='add'>+		q_max = qv[0];</div><div class='add'>+		for (i = 0; i &lt; DACK_SN_8822C; i++) {</div><div class='add'>+			rtw8822c_rf_minmax_cmp(rtwdev, iv[i], &amp;i_min, &amp;i_max);</div><div class='add'>+			rtw8822c_rf_minmax_cmp(rtwdev, qv[i], &amp;q_min, &amp;q_max);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i_max &lt; 0x200 &amp;&amp; i_min &lt; 0x200)</div><div class='add'>+			i_delta = i_max - i_min;</div><div class='add'>+		else if (i_max &gt;= 0x200 &amp;&amp; i_min &gt;= 0x200)</div><div class='add'>+			i_delta = i_max - i_min;</div><div class='add'>+		else</div><div class='add'>+			i_delta = i_max + (0x400 - i_min);</div><div class='add'>+</div><div class='add'>+		if (q_max &lt; 0x200 &amp;&amp; q_min &lt; 0x200)</div><div class='add'>+			q_delta = q_max - q_min;</div><div class='add'>+		else if (q_max &gt;= 0x200 &amp;&amp; q_min &gt;= 0x200)</div><div class='add'>+			q_delta = q_max - q_min;</div><div class='add'>+		else</div><div class='add'>+			q_delta = q_max + (0x400 - q_min);</div><div class='add'>+</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK,</div><div class='add'>+			"[DACK] i: min=0x%08x, max=0x%08x, delta=0x%08x\n",</div><div class='add'>+			i_min, i_max, i_delta);</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK,</div><div class='add'>+			"[DACK] q: min=0x%08x, max=0x%08x, delta=0x%08x\n",</div><div class='add'>+			q_min, q_max, q_delta);</div><div class='add'>+</div><div class='add'>+		rtw8822c_dac_iq_sort(rtwdev, iv, qv);</div><div class='add'>+</div><div class='add'>+		if (i_delta &gt; 5 || q_delta &gt; 5) {</div><div class='add'>+			temp = rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff);</div><div class='add'>+			iv[0] = (temp &amp; 0x3ff000) &gt;&gt; 12;</div><div class='add'>+			qv[0] = temp &amp; 0x3ff;</div><div class='add'>+			temp = rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff);</div><div class='add'>+			iv[DACK_SN_8822C - 1] = (temp &amp; 0x3ff000) &gt;&gt; 12;</div><div class='add'>+			qv[DACK_SN_8822C - 1] = temp &amp; 0x3ff;</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (cnt++ &lt; 100);</div><div class='add'>+</div><div class='add'>+	rtw8822c_dac_iq_offset(rtwdev, iv, i_value);</div><div class='add'>+	rtw8822c_dac_iq_offset(rtwdev, qv, q_value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_rf_mode(struct rtw_dev *rtwdev,</div><div class='add'>+				     u32 *i_value, u32 *q_value)</div><div class='add'>+{</div><div class='add'>+	u32 iv[DACK_SN_8822C], qv[DACK_SN_8822C];</div><div class='add'>+	u32 rf_a, rf_b;</div><div class='add'>+</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	rf_a = rtw_read_rf(rtwdev, RF_PATH_A, 0x0, RFREG_MASK);</div><div class='add'>+	rf_b = rtw_read_rf(rtwdev, RF_PATH_B, 0x0, RFREG_MASK);</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] RF path-A=0x%05x\n", rf_a);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] RF path-B=0x%05x\n", rf_b);</div><div class='add'>+</div><div class='add'>+	rtw8822c_dac_cal_iq_sample(rtwdev, iv, qv);</div><div class='add'>+	rtw8822c_dac_cal_iq_search(rtwdev, iv, qv, i_value, q_value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_bb_setting(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1d58, 0xff8, 0x1ff);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1a00, 0x3, 0x2);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1a14, 0x300, 0x3);</div><div class='add'>+	rtw_write32(rtwdev, 0x1d70, 0x7e7e7e7e);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x180c, 0x3, 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x410c, 0x3, 0x0);</div><div class='add'>+	rtw_write32(rtwdev, 0x1b00, 0x00000008);</div><div class='add'>+	rtw_write8(rtwdev, 0x1bcc, 0x3f);</div><div class='add'>+	rtw_write32(rtwdev, 0x1b00, 0x0000000a);</div><div class='add'>+	rtw_write8(rtwdev, 0x1bcc, 0x3f);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1e24, BIT(31), 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1e28, 0xf, 0x3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_adc(struct rtw_dev *rtwdev,</div><div class='add'>+				 u8 path, u32 *adc_ic, u32 *adc_qc)</div><div class='add'>+{</div><div class='add'>+	u32 ic = 0, qc = 0, temp = 0;</div><div class='add'>+	u32 base_addr;</div><div class='add'>+	u32 path_sel;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] ADCK path(%d)\n", path);</div><div class='add'>+</div><div class='add'>+	base_addr = rtw8822c_get_path_base_addr(path);</div><div class='add'>+	switch (path) {</div><div class='add'>+	case RF_PATH_A:</div><div class='add'>+		path_sel = 0xa0000;</div><div class='add'>+		break;</div><div class='add'>+	case RF_PATH_B:</div><div class='add'>+		path_sel = 0x80000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ADCK step1 */</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0x30, BIT(30), 0x0);</div><div class='add'>+	if (path == RF_PATH_B)</div><div class='add'>+		rtw_write32(rtwdev, base_addr + 0x30, 0x30db8041);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x60, 0xf0040ff0);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x0c, 0xdff00220);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02dd08c4);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x0c, 0x10000260);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, 0x0, RFREG_MASK, 0x10000);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_B, 0x0, RFREG_MASK, 0x10000);</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] ADCK count=%d\n", i);</div><div class='add'>+		rtw_write32(rtwdev, 0x1c3c, path_sel + 0x8003);</div><div class='add'>+		rtw_write32(rtwdev, 0x1c24, 0x00010002);</div><div class='add'>+		rtw8822c_dac_cal_rf_mode(rtwdev, &amp;ic, &amp;qc);</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK,</div><div class='add'>+			"[DACK] before: i=0x%x, q=0x%x\n", ic, qc);</div><div class='add'>+</div><div class='add'>+		/* compensation value */</div><div class='add'>+		if (ic != 0x0) {</div><div class='add'>+			ic = 0x400 - ic;</div><div class='add'>+			*adc_ic = ic;</div><div class='add'>+		}</div><div class='add'>+		if (qc != 0x0) {</div><div class='add'>+			qc = 0x400 - qc;</div><div class='add'>+			*adc_qc = qc;</div><div class='add'>+		}</div><div class='add'>+		temp = (ic &amp; 0x3ff) | ((qc &amp; 0x3ff) &lt;&lt; 10);</div><div class='add'>+		rtw_write32(rtwdev, base_addr + 0x68, temp);</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] ADCK 0x%08x=0x08%x\n",</div><div class='add'>+			base_addr + 0x68, temp);</div><div class='add'>+		/* check ADC DC offset */</div><div class='add'>+		rtw_write32(rtwdev, 0x1c3c, path_sel + 0x8103);</div><div class='add'>+		rtw8822c_dac_cal_rf_mode(rtwdev, &amp;ic, &amp;qc);</div><div class='add'>+		rtw_dbg(rtwdev, RTW_DBG_RFK,</div><div class='add'>+			"[DACK] after:  i=0x%08x, q=0x%08x\n", ic, qc);</div><div class='add'>+		if (ic &gt;= 0x200)</div><div class='add'>+			ic = 0x400 - ic;</div><div class='add'>+		if (qc &gt;= 0x200)</div><div class='add'>+			qc = 0x400 - qc;</div><div class='add'>+		if (ic &lt; 5 &amp;&amp; qc &lt; 5)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ADCK step2 */</div><div class='add'>+	rtw_write32(rtwdev, 0x1c3c, 0x00000003);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x0c, 0x10000260);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c4);</div><div class='add'>+</div><div class='add'>+	/* release pull low switch on IQ path */</div><div class='add'>+	rtw_write_rf(rtwdev, path, 0x8f, BIT(13), 0x1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_step1(struct rtw_dev *rtwdev, u8 path)</div><div class='add'>+{</div><div class='add'>+	u32 base_addr;</div><div class='add'>+</div><div class='add'>+	base_addr = rtw8822c_get_path_base_addr(path);</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x0c, 0xdff00220);</div><div class='add'>+	if (path == RF_PATH_A) {</div><div class='add'>+		rtw_write32(rtwdev, base_addr + 0x60, 0xf0040ff0);</div><div class='add'>+		rtw_write32(rtwdev, 0x1c38, 0xffffffff);</div><div class='add'>+	}</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c5);</div><div class='add'>+	rtw_write32(rtwdev, 0x9b4, 0xdb66db00);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb0, 0x0a11fb88);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xbc, 0x0008ff81);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xc0, 0x0003d208);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xcc, 0x0a11fb88);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xd8, 0x0008ff81);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xdc, 0x0003d208);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb8, 0x60000000);</div><div class='add'>+	mdelay(2);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xbc, 0x000aff8d);</div><div class='add'>+	mdelay(2);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb0, 0x0a11fb89);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xcc, 0x0a11fb89);</div><div class='add'>+	mdelay(1);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb8, 0x62000000);</div><div class='add'>+	mdelay(20);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xd4, 0x62000000);</div><div class='add'>+	mdelay(20);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb8, 0x02000000);</div><div class='add'>+	mdelay(20);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xbc, 0x0008ff87);</div><div class='add'>+	rtw_write32(rtwdev, 0x9b4, 0xdb6db600);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c5);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xbc, 0x0008ff87);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x60, 0xf0000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_step2(struct rtw_dev *rtwdev,</div><div class='add'>+				   u8 path, u32 *ic_out, u32 *qc_out)</div><div class='add'>+{</div><div class='add'>+	u32 base_addr;</div><div class='add'>+	u32 ic, qc, ic_in, qc_in;</div><div class='add'>+</div><div class='add'>+	base_addr = rtw8822c_get_path_base_addr(path);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xbc, 0xf0000000, 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xc0, 0xf, 0x8);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xd8, 0xf0000000, 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xdc, 0xf, 0x8);</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, 0x1b00, 0x00000008);</div><div class='add'>+	rtw_write8(rtwdev, 0x1bcc, 0x03f);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x0c, 0xdff00220);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c5);</div><div class='add'>+	rtw_write32(rtwdev, 0x1c3c, 0x00088103);</div><div class='add'>+</div><div class='add'>+	rtw8822c_dac_cal_rf_mode(rtwdev, &amp;ic_in, &amp;qc_in);</div><div class='add'>+	ic = ic_in;</div><div class='add'>+	qc = qc_in;</div><div class='add'>+</div><div class='add'>+	/* compensation value */</div><div class='add'>+	if (ic != 0x0)</div><div class='add'>+		ic = 0x400 - ic;</div><div class='add'>+	if (qc != 0x0)</div><div class='add'>+		qc = 0x400 - qc;</div><div class='add'>+	if (ic &lt; 0x300) {</div><div class='add'>+		ic = ic * 2 * 6 / 5;</div><div class='add'>+		ic = ic + 0x80;</div><div class='add'>+	} else {</div><div class='add'>+		ic = (0x400 - ic) * 2 * 6 / 5;</div><div class='add'>+		ic = 0x7f - ic;</div><div class='add'>+	}</div><div class='add'>+	if (qc &lt; 0x300) {</div><div class='add'>+		qc = qc * 2 * 6 / 5;</div><div class='add'>+		qc = qc + 0x80;</div><div class='add'>+	} else {</div><div class='add'>+		qc = (0x400 - qc) * 2 * 6 / 5;</div><div class='add'>+		qc = 0x7f - qc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ic_out = ic;</div><div class='add'>+	*qc_out = qc;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] before i=0x%x, q=0x%x\n", ic_in, qc_in);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] after  i=0x%x, q=0x%x\n", ic, qc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_step3(struct rtw_dev *rtwdev, u8 path,</div><div class='add'>+				   u32 adc_ic, u32 adc_qc,</div><div class='add'>+				   u32 *ic_in, u32 *qc_in,</div><div class='add'>+				   u32 *i_out, u32 *q_out)</div><div class='add'>+{</div><div class='add'>+	u32 base_addr;</div><div class='add'>+	u32 ic, qc;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	base_addr = rtw8822c_get_path_base_addr(path);</div><div class='add'>+	ic = *ic_in;</div><div class='add'>+	qc = *qc_in;</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x0c, 0xdff00220);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c5);</div><div class='add'>+	rtw_write32(rtwdev, 0x9b4, 0xdb66db00);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb0, 0x0a11fb88);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xbc, 0xc008ff81);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xc0, 0x0003d208);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xbc, 0xf0000000, ic &amp; 0xf);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xc0, 0xf, (ic &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xcc, 0x0a11fb88);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xd8, 0xe008ff81);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xdc, 0x0003d208);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xd8, 0xf0000000, qc &amp; 0xf);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xdc, 0xf, (qc &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb8, 0x60000000);</div><div class='add'>+	mdelay(2);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xbc, 0xe, 0x6);</div><div class='add'>+	mdelay(2);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb0, 0x0a11fb89);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xcc, 0x0a11fb89);</div><div class='add'>+	mdelay(1);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb8, 0x62000000);</div><div class='add'>+	mdelay(20);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xd4, 0x62000000);</div><div class='add'>+	mdelay(20);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0xb8, 0x02000000);</div><div class='add'>+	mdelay(20);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xbc, 0xe, 0x3);</div><div class='add'>+	rtw_write32(rtwdev, 0x9b4, 0xdb6db600);</div><div class='add'>+</div><div class='add'>+	/* check DAC DC offset */</div><div class='add'>+	temp = ((adc_ic + 0x10) &amp; 0x3ff) | (((adc_qc + 0x10) &amp; 0x3ff) &lt;&lt; 10);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x68, temp);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c5);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x60, 0xf0000000);</div><div class='add'>+	rtw8822c_dac_cal_rf_mode(rtwdev, &amp;ic, &amp;qc);</div><div class='add'>+	if (ic &gt;= 0x10)</div><div class='add'>+		ic = ic - 0x10;</div><div class='add'>+	else</div><div class='add'>+		ic = 0x400 - (0x10 - ic);</div><div class='add'>+</div><div class='add'>+	if (qc &gt;= 0x10)</div><div class='add'>+		qc = qc - 0x10;</div><div class='add'>+	else</div><div class='add'>+		qc = 0x400 - (0x10 - qc);</div><div class='add'>+</div><div class='add'>+	*i_out = ic;</div><div class='add'>+	*q_out = qc;</div><div class='add'>+</div><div class='add'>+	if (ic &gt;= 0x200)</div><div class='add'>+		ic = 0x400 - ic;</div><div class='add'>+	if (qc &gt;= 0x200)</div><div class='add'>+		qc = 0x400 - qc;</div><div class='add'>+</div><div class='add'>+	*ic_in = ic;</div><div class='add'>+	*qc_in = qc;</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK,</div><div class='add'>+		"[DACK] after  DACK i=0x%x, q=0x%x\n", *i_out, *q_out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_dac_cal_step4(struct rtw_dev *rtwdev, u8 path)</div><div class='add'>+{</div><div class='add'>+	u32 base_addr = rtw8822c_get_path_base_addr(path);</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x68, 0x0);</div><div class='add'>+	rtw_write32(rtwdev, base_addr + 0x10, 0x02d508c4);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0xbc, 0x1, 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, base_addr + 0x30, BIT(30), 0x1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_rf_dac_cal(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_backup_info backup_rf[DACK_RF_8822C * DACK_PATH_8822C];</div><div class='add'>+	struct rtw_backup_info backup[DACK_REG_8822C];</div><div class='add'>+	u32 ic = 0, qc = 0, i;</div><div class='add'>+	u32 i_a = 0x0, q_a = 0x0, i_b = 0x0, q_b = 0x0;</div><div class='add'>+	u32 ic_a = 0x0, qc_a = 0x0, ic_b = 0x0, qc_b = 0x0;</div><div class='add'>+	u32 adc_ic_a = 0x0, adc_qc_a = 0x0, adc_ic_b = 0x0, adc_qc_b = 0x0;</div><div class='add'>+</div><div class='add'>+	rtw8822c_dac_backup_reg(rtwdev, backup, backup_rf);</div><div class='add'>+</div><div class='add'>+	rtw8822c_dac_bb_setting(rtwdev);</div><div class='add'>+</div><div class='add'>+	/* path-A */</div><div class='add'>+	rtw8822c_dac_cal_adc(rtwdev, RF_PATH_A, &amp;adc_ic_a, &amp;adc_qc_a);</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		rtw8822c_dac_cal_step1(rtwdev, RF_PATH_A);</div><div class='add'>+		rtw8822c_dac_cal_step2(rtwdev, RF_PATH_A, &amp;ic, &amp;qc);</div><div class='add'>+		ic_a = ic;</div><div class='add'>+		qc_a = qc;</div><div class='add'>+</div><div class='add'>+		rtw8822c_dac_cal_step3(rtwdev, RF_PATH_A, adc_ic_a, adc_qc_a,</div><div class='add'>+				       &amp;ic, &amp;qc, &amp;i_a, &amp;q_a);</div><div class='add'>+</div><div class='add'>+		if (ic &lt; 5 &amp;&amp; qc &lt; 5)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	rtw8822c_dac_cal_step4(rtwdev, RF_PATH_A);</div><div class='add'>+</div><div class='add'>+	/* path-B */</div><div class='add'>+	rtw8822c_dac_cal_adc(rtwdev, RF_PATH_B, &amp;adc_ic_b, &amp;adc_qc_b);</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		rtw8822c_dac_cal_step1(rtwdev, RF_PATH_B);</div><div class='add'>+		rtw8822c_dac_cal_step2(rtwdev, RF_PATH_B, &amp;ic, &amp;qc);</div><div class='add'>+		ic_b = ic;</div><div class='add'>+		qc_b = qc;</div><div class='add'>+</div><div class='add'>+		rtw8822c_dac_cal_step3(rtwdev, RF_PATH_B, adc_ic_b, adc_qc_b,</div><div class='add'>+				       &amp;ic, &amp;qc, &amp;i_b, &amp;q_b);</div><div class='add'>+</div><div class='add'>+		if (ic &lt; 5 &amp;&amp; qc &lt; 5)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	rtw8822c_dac_cal_step4(rtwdev, RF_PATH_B);</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, 0x1b00, 0x00000008);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x4130, BIT(30), 0x1);</div><div class='add'>+	rtw_write8(rtwdev, 0x1bcc, 0x0);</div><div class='add'>+	rtw_write32(rtwdev, 0x1b00, 0x0000000a);</div><div class='add'>+	rtw_write8(rtwdev, 0x1bcc, 0x0);</div><div class='add'>+</div><div class='add'>+	rtw8822c_dac_restore_reg(rtwdev, backup, backup_rf);</div><div class='add'>+</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] path A: ic=0x%x, qc=0x%x\n", ic_a, qc_a);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] path B: ic=0x%x, qc=0x%x\n", ic_b, qc_b);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] path A: i=0x%x, q=0x%x\n", i_a, q_a);</div><div class='add'>+	rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] path B: i=0x%x, q=0x%x\n", i_b, q_b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_rf_x2_check(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u8 x2k_busy;</div><div class='add'>+</div><div class='add'>+	mdelay(1);</div><div class='add'>+	x2k_busy = rtw_read_rf(rtwdev, RF_PATH_A, 0xb8, BIT(15));</div><div class='add'>+	if (x2k_busy == 1) {</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, 0xb8, RFREG_MASK, 0xC4440);</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, 0xba, RFREG_MASK, 0x6840D);</div><div class='add'>+		rtw_write_rf(rtwdev, RF_PATH_A, 0xb8, RFREG_MASK, 0x80440);</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_rf_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	rtw8822c_rf_dac_cal(rtwdev);</div><div class='add'>+	rtw8822c_rf_x2_check(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 crystal_cap;</div><div class='add'>+	u8 cck_gi_u_bnd_msb = 0;</div><div class='add'>+	u8 cck_gi_u_bnd_lsb = 0;</div><div class='add'>+	u8 cck_gi_l_bnd_msb = 0;</div><div class='add'>+	u8 cck_gi_l_bnd_lsb = 0;</div><div class='add'>+	bool is_tx2_path;</div><div class='add'>+</div><div class='add'>+	/* power on BB/RF domain */</div><div class='add'>+	rtw_write8_set(rtwdev, REG_SYS_FUNC_EN,</div><div class='add'>+		       BIT_FEN_BB_GLB_RST | BIT_FEN_BB_RSTB);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_RF_CTRL,</div><div class='add'>+		       BIT_RF_EN | BIT_RF_RSTB | BIT_RF_SDM_RSTB);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_WLRF1, BIT_WLRF1_BBRF_EN);</div><div class='add'>+</div><div class='add'>+	/* pre init before header files config */</div><div class='add'>+	rtw8822c_header_file_init(rtwdev, true);</div><div class='add'>+</div><div class='add'>+	rtw_phy_load_tables(rtwdev);</div><div class='add'>+</div><div class='add'>+	crystal_cap = rtwdev-&gt;efuse.crystal_cap &amp; 0x7f;</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_ANAPAR_XTAL_0, 0xfffc00,</div><div class='add'>+			 crystal_cap | (crystal_cap &lt;&lt; 7));</div><div class='add'>+</div><div class='add'>+	/* post init after header files config */</div><div class='add'>+	rtw8822c_header_file_init(rtwdev, false);</div><div class='add'>+</div><div class='add'>+	is_tx2_path = false;</div><div class='add'>+	rtw8822c_config_trx_mode(rtwdev, hal-&gt;antenna_tx, hal-&gt;antenna_rx,</div><div class='add'>+				 is_tx2_path);</div><div class='add'>+	rtw_phy_init(rtwdev);</div><div class='add'>+</div><div class='add'>+	cck_gi_u_bnd_msb = (u8)rtw_read32_mask(rtwdev, 0x1a98, 0xc000);</div><div class='add'>+	cck_gi_u_bnd_lsb = (u8)rtw_read32_mask(rtwdev, 0x1aa8, 0xf0000);</div><div class='add'>+	cck_gi_l_bnd_msb = (u8)rtw_read32_mask(rtwdev, 0x1a98, 0xc0);</div><div class='add'>+	cck_gi_l_bnd_lsb = (u8)rtw_read32_mask(rtwdev, 0x1a70, 0x0f000000);</div><div class='add'>+</div><div class='add'>+	dm_info-&gt;cck_gi_u_bnd = ((cck_gi_u_bnd_msb &lt;&lt; 4) | (cck_gi_u_bnd_lsb));</div><div class='add'>+	dm_info-&gt;cck_gi_l_bnd = ((cck_gi_l_bnd_msb &lt;&lt; 4) | (cck_gi_l_bnd_lsb));</div><div class='add'>+</div><div class='add'>+	rtw8822c_rf_init(rtwdev);</div><div class='add'>+	/* wifi path controller */</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x70, 0xff000000, 0x0e);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1704, 0xffffffff, 0x7700);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1700, 0xffffffff, 0xc00f0038);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x6c0, 0xffffffff, 0xaaaaaaaa);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x6c4, 0xffffffff, 0xaaaaaaaa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WLAN_TXQ_RPT_EN		0x1F</div><div class='add'>+#define WLAN_SLOT_TIME		0x09</div><div class='add'>+#define WLAN_PIFS_TIME		0x1C</div><div class='add'>+#define WLAN_SIFS_CCK_CONT_TX	0x0A</div><div class='add'>+#define WLAN_SIFS_OFDM_CONT_TX	0x0E</div><div class='add'>+#define WLAN_SIFS_CCK_TRX	0x0A</div><div class='add'>+#define WLAN_SIFS_OFDM_TRX	0x10</div><div class='add'>+#define WLAN_NAV_MAX		0xC8</div><div class='add'>+#define WLAN_RDG_NAV		0x05</div><div class='add'>+#define WLAN_TXOP_NAV		0x1B</div><div class='add'>+#define WLAN_CCK_RX_TSF		0x30</div><div class='add'>+#define WLAN_OFDM_RX_TSF	0x30</div><div class='add'>+#define WLAN_TBTT_PROHIBIT	0x04 /* unit : 32us */</div><div class='add'>+#define WLAN_TBTT_HOLD_TIME	0x064 /* unit : 32us */</div><div class='add'>+#define WLAN_DRV_EARLY_INT	0x04</div><div class='add'>+#define WLAN_BCN_CTRL_CLT0	0x10</div><div class='add'>+#define WLAN_BCN_DMA_TIME	0x02</div><div class='add'>+#define WLAN_BCN_MAX_ERR	0xFF</div><div class='add'>+#define WLAN_SIFS_CCK_DUR_TUNE	0x0A</div><div class='add'>+#define WLAN_SIFS_OFDM_DUR_TUNE	0x10</div><div class='add'>+#define WLAN_SIFS_CCK_CTX	0x0A</div><div class='add'>+#define WLAN_SIFS_CCK_IRX	0x0A</div><div class='add'>+#define WLAN_SIFS_OFDM_CTX	0x0E</div><div class='add'>+#define WLAN_SIFS_OFDM_IRX	0x0E</div><div class='add'>+#define WLAN_EIFS_DUR_TUNE	0x40</div><div class='add'>+#define WLAN_EDCA_VO_PARAM	0x002FA226</div><div class='add'>+#define WLAN_EDCA_VI_PARAM	0x005EA328</div><div class='add'>+#define WLAN_EDCA_BE_PARAM	0x005EA42B</div><div class='add'>+#define WLAN_EDCA_BK_PARAM	0x0000A44F</div><div class='add'>+</div><div class='add'>+#define WLAN_RX_FILTER0		0xFFFFFFFF</div><div class='add'>+#define WLAN_RX_FILTER2		0xFFFF</div><div class='add'>+#define WLAN_RCR_CFG		0xE400220E</div><div class='add'>+#define WLAN_RXPKT_MAX_SZ	12288</div><div class='add'>+#define WLAN_RXPKT_MAX_SZ_512	(WLAN_RXPKT_MAX_SZ &gt;&gt; 9)</div><div class='add'>+</div><div class='add'>+#define WLAN_AMPDU_MAX_TIME		0x70</div><div class='add'>+#define WLAN_RTS_LEN_TH			0xFF</div><div class='add'>+#define WLAN_RTS_TX_TIME_TH		0x08</div><div class='add'>+#define WLAN_MAX_AGG_PKT_LIMIT		0x20</div><div class='add'>+#define WLAN_RTS_MAX_AGG_PKT_LIMIT	0x20</div><div class='add'>+#define WLAN_PRE_TXCNT_TIME_TH		0x1E0</div><div class='add'>+#define FAST_EDCA_VO_TH		0x06</div><div class='add'>+#define FAST_EDCA_VI_TH		0x06</div><div class='add'>+#define FAST_EDCA_BE_TH		0x06</div><div class='add'>+#define FAST_EDCA_BK_TH		0x06</div><div class='add'>+#define WLAN_BAR_RETRY_LIMIT		0x01</div><div class='add'>+#define WLAN_BAR_ACK_TYPE		0x05</div><div class='add'>+#define WLAN_RA_TRY_RATE_AGG_LIMIT	0x08</div><div class='add'>+#define WLAN_RESP_TXRATE		0x84</div><div class='add'>+#define WLAN_ACK_TO			0x21</div><div class='add'>+#define WLAN_ACK_TO_CCK			0x6A</div><div class='add'>+#define WLAN_DATA_RATE_FB_CNT_1_4	0x01000000</div><div class='add'>+#define WLAN_DATA_RATE_FB_CNT_5_8	0x08070504</div><div class='add'>+#define WLAN_RTS_RATE_FB_CNT_5_8	0x08070504</div><div class='add'>+#define WLAN_DATA_RATE_FB_RATE0		0xFE01F010</div><div class='add'>+#define WLAN_DATA_RATE_FB_RATE0_H	0x40000000</div><div class='add'>+#define WLAN_RTS_RATE_FB_RATE1		0x003FF010</div><div class='add'>+#define WLAN_RTS_RATE_FB_RATE1_H	0x40000000</div><div class='add'>+#define WLAN_RTS_RATE_FB_RATE4		0x0600F010</div><div class='add'>+#define WLAN_RTS_RATE_FB_RATE4_H	0x400003E0</div><div class='add'>+#define WLAN_RTS_RATE_FB_RATE5		0x0600F015</div><div class='add'>+#define WLAN_RTS_RATE_FB_RATE5_H	0x000000E0</div><div class='add'>+</div><div class='add'>+#define WLAN_TX_FUNC_CFG1		0x30</div><div class='add'>+#define WLAN_TX_FUNC_CFG2		0x30</div><div class='add'>+#define WLAN_MAC_OPT_NORM_FUNC1		0x98</div><div class='add'>+#define WLAN_MAC_OPT_LB_FUNC1		0x80</div><div class='add'>+#define WLAN_MAC_OPT_FUNC2		0x30810041</div><div class='add'>+</div><div class='add'>+#define WLAN_SIFS_CFG	(WLAN_SIFS_CCK_CONT_TX | \</div><div class='add'>+			(WLAN_SIFS_OFDM_CONT_TX &lt;&lt; BIT_SHIFT_SIFS_OFDM_CTX) | \</div><div class='add'>+			(WLAN_SIFS_CCK_TRX &lt;&lt; BIT_SHIFT_SIFS_CCK_TRX) | \</div><div class='add'>+			(WLAN_SIFS_OFDM_TRX &lt;&lt; BIT_SHIFT_SIFS_OFDM_TRX))</div><div class='add'>+</div><div class='add'>+#define WLAN_SIFS_DUR_TUNE	(WLAN_SIFS_CCK_DUR_TUNE | \</div><div class='add'>+				(WLAN_SIFS_OFDM_DUR_TUNE &lt;&lt; 8))</div><div class='add'>+</div><div class='add'>+#define WLAN_TBTT_TIME	(WLAN_TBTT_PROHIBIT |\</div><div class='add'>+			(WLAN_TBTT_HOLD_TIME &lt;&lt; BIT_SHIFT_TBTT_HOLD_TIME_AP))</div><div class='add'>+</div><div class='add'>+#define WLAN_NAV_CFG		(WLAN_RDG_NAV | (WLAN_TXOP_NAV &lt;&lt; 16))</div><div class='add'>+#define WLAN_RX_TSF_CFG		(WLAN_CCK_RX_TSF | (WLAN_OFDM_RX_TSF) &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+#define MAC_CLK_SPEED	80 /* 80M */</div><div class='add'>+#define EFUSE_PCB_INFO_OFFSET	0xCA</div><div class='add'>+</div><div class='add'>+static int rtw8822c_mac_init(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u8 value8;</div><div class='add'>+	u16 value16;</div><div class='add'>+	u32 value32;</div><div class='add'>+	u16 pre_txcnt;</div><div class='add'>+</div><div class='add'>+	/* txq control */</div><div class='add'>+	value8 = rtw_read8(rtwdev, REG_FWHW_TXQ_CTRL);</div><div class='add'>+	value8 |= (BIT(7) &amp; ~BIT(1) &amp; ~BIT(2));</div><div class='add'>+	rtw_write8(rtwdev, REG_FWHW_TXQ_CTRL, value8);</div><div class='add'>+	rtw_write8(rtwdev, REG_FWHW_TXQ_CTRL + 1, WLAN_TXQ_RPT_EN);</div><div class='add'>+	/* sifs control */</div><div class='add'>+	rtw_write16(rtwdev, REG_SPEC_SIFS, WLAN_SIFS_DUR_TUNE);</div><div class='add'>+	rtw_write32(rtwdev, REG_SIFS, WLAN_SIFS_CFG);</div><div class='add'>+	rtw_write16(rtwdev, REG_RESP_SIFS_CCK,</div><div class='add'>+		    WLAN_SIFS_CCK_CTX | WLAN_SIFS_CCK_IRX &lt;&lt; 8);</div><div class='add'>+	rtw_write16(rtwdev, REG_RESP_SIFS_OFDM,</div><div class='add'>+		    WLAN_SIFS_OFDM_CTX | WLAN_SIFS_OFDM_IRX &lt;&lt; 8);</div><div class='add'>+	/* rate fallback control */</div><div class='add'>+	rtw_write32(rtwdev, REG_DARFRC, WLAN_DATA_RATE_FB_CNT_1_4);</div><div class='add'>+	rtw_write32(rtwdev, REG_DARFRCH, WLAN_DATA_RATE_FB_CNT_5_8);</div><div class='add'>+	rtw_write32(rtwdev, REG_RARFRCH, WLAN_RTS_RATE_FB_CNT_5_8);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFR0, WLAN_DATA_RATE_FB_RATE0);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFRH0, WLAN_DATA_RATE_FB_RATE0_H);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFR1_V1, WLAN_RTS_RATE_FB_RATE1);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFRH1_V1, WLAN_RTS_RATE_FB_RATE1_H);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFR4, WLAN_RTS_RATE_FB_RATE4);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFRH4, WLAN_RTS_RATE_FB_RATE4_H);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFR5, WLAN_RTS_RATE_FB_RATE5);</div><div class='add'>+	rtw_write32(rtwdev, REG_ARFRH5, WLAN_RTS_RATE_FB_RATE5_H);</div><div class='add'>+	/* protocol configuration */</div><div class='add'>+	rtw_write8(rtwdev, REG_AMPDU_MAX_TIME_V1, WLAN_AMPDU_MAX_TIME);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_TX_HANG_CTRL, BIT_EN_EOF_V1);</div><div class='add'>+	pre_txcnt = WLAN_PRE_TXCNT_TIME_TH | BIT_EN_PRECNT;</div><div class='add'>+	rtw_write8(rtwdev, REG_PRECNT_CTRL, (u8)(pre_txcnt &amp; 0xFF));</div><div class='add'>+	rtw_write8(rtwdev, REG_PRECNT_CTRL + 1, (u8)(pre_txcnt &gt;&gt; 8));</div><div class='add'>+	value32 = WLAN_RTS_LEN_TH | (WLAN_RTS_TX_TIME_TH &lt;&lt; 8) |</div><div class='add'>+		  (WLAN_MAX_AGG_PKT_LIMIT &lt;&lt; 16) |</div><div class='add'>+		  (WLAN_RTS_MAX_AGG_PKT_LIMIT &lt;&lt; 24);</div><div class='add'>+	rtw_write32(rtwdev, REG_PROT_MODE_CTRL, value32);</div><div class='add'>+	rtw_write16(rtwdev, REG_BAR_MODE_CTRL + 2,</div><div class='add'>+		    WLAN_BAR_RETRY_LIMIT | WLAN_RA_TRY_RATE_AGG_LIMIT &lt;&lt; 8);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_VOVI_SETTING, FAST_EDCA_VO_TH);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_VOVI_SETTING + 2, FAST_EDCA_VI_TH);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_BEBK_SETTING, FAST_EDCA_BE_TH);</div><div class='add'>+	rtw_write8(rtwdev, REG_FAST_EDCA_BEBK_SETTING + 2, FAST_EDCA_BK_TH);</div><div class='add'>+	/* close BA parser */</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_LIFETIME_EN, BIT_BA_PARSER_EN);</div><div class='add'>+	rtw_write32_clr(rtwdev, REG_RRSR, BITS_RRSR_RSC);</div><div class='add'>+</div><div class='add'>+	/* EDCA configuration */</div><div class='add'>+	rtw_write32(rtwdev, REG_EDCA_VO_PARAM, WLAN_EDCA_VO_PARAM);</div><div class='add'>+	rtw_write32(rtwdev, REG_EDCA_VI_PARAM, WLAN_EDCA_VI_PARAM);</div><div class='add'>+	rtw_write32(rtwdev, REG_EDCA_BE_PARAM, WLAN_EDCA_BE_PARAM);</div><div class='add'>+	rtw_write32(rtwdev, REG_EDCA_BK_PARAM, WLAN_EDCA_BK_PARAM);</div><div class='add'>+	rtw_write8(rtwdev, REG_PIFS, WLAN_PIFS_TIME);</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_TX_PTCL_CTRL + 1, BIT_SIFS_BK_EN &gt;&gt; 8);</div><div class='add'>+	rtw_write8_set(rtwdev, REG_RD_CTRL + 1,</div><div class='add'>+		       (BIT_DIS_TXOP_CFE | BIT_DIS_LSIG_CFE |</div><div class='add'>+			BIT_DIS_STBC_CFE) &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	/* MAC clock configuration */</div><div class='add'>+	rtw_write32_clr(rtwdev, REG_AFE_CTRL1, BIT_MAC_CLK_SEL);</div><div class='add'>+	rtw_write8(rtwdev, REG_USTIME_TSF, MAC_CLK_SPEED);</div><div class='add'>+	rtw_write8(rtwdev, REG_USTIME_EDCA, MAC_CLK_SPEED);</div><div class='add'>+</div><div class='add'>+	rtw_write8_set(rtwdev, REG_MISC_CTRL,</div><div class='add'>+		       BIT_EN_FREE_CNT | BIT_DIS_SECOND_CCA);</div><div class='add'>+	rtw_write8_clr(rtwdev, REG_TIMER0_SRC_SEL, BIT_TSFT_SEL_TIMER0);</div><div class='add'>+	rtw_write16(rtwdev, REG_TXPAUSE, 0x0000);</div><div class='add'>+	rtw_write8(rtwdev, REG_SLOT, WLAN_SLOT_TIME);</div><div class='add'>+	rtw_write32(rtwdev, REG_RD_NAV_NXT, WLAN_NAV_CFG);</div><div class='add'>+	rtw_write16(rtwdev, REG_RXTSF_OFFSET_CCK, WLAN_RX_TSF_CFG);</div><div class='add'>+	/* Set beacon cotnrol - enable TSF and other related functions */</div><div class='add'>+	rtw_write8_set(rtwdev, REG_BCN_CTRL, BIT_EN_BCN_FUNCTION);</div><div class='add'>+	/* Set send beacon related registers */</div><div class='add'>+	rtw_write32(rtwdev, REG_TBTT_PROHIBIT, WLAN_TBTT_TIME);</div><div class='add'>+	rtw_write8(rtwdev, REG_DRVERLYINT, WLAN_DRV_EARLY_INT);</div><div class='add'>+	rtw_write8(rtwdev, REG_BCN_CTRL_CLINT0, WLAN_BCN_CTRL_CLT0);</div><div class='add'>+	rtw_write8(rtwdev, REG_BCNDMATIM, WLAN_BCN_DMA_TIME);</div><div class='add'>+	rtw_write8(rtwdev, REG_BCN_MAX_ERR, WLAN_BCN_MAX_ERR);</div><div class='add'>+</div><div class='add'>+	/* WMAC configuration */</div><div class='add'>+	rtw_write8(rtwdev, REG_BBPSF_CTRL + 2, WLAN_RESP_TXRATE);</div><div class='add'>+	rtw_write8(rtwdev, REG_ACKTO, WLAN_ACK_TO);</div><div class='add'>+	rtw_write8(rtwdev, REG_ACKTO_CCK, WLAN_ACK_TO_CCK);</div><div class='add'>+	rtw_write16(rtwdev, REG_EIFS, WLAN_EIFS_DUR_TUNE);</div><div class='add'>+	rtw_write8(rtwdev, REG_NAV_CTRL + 2, WLAN_NAV_MAX);</div><div class='add'>+	rtw_write8(rtwdev, REG_WMAC_TRXPTCL_CTL_H  + 2, WLAN_BAR_ACK_TYPE);</div><div class='add'>+	rtw_write32(rtwdev, REG_RXFLTMAP0, WLAN_RX_FILTER0);</div><div class='add'>+	rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2);</div><div class='add'>+	rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG);</div><div class='add'>+	rtw_write8(rtwdev, REG_RX_PKT_LIMIT, WLAN_RXPKT_MAX_SZ_512);</div><div class='add'>+	rtw_write8(rtwdev, REG_TCR + 2, WLAN_TX_FUNC_CFG2);</div><div class='add'>+	rtw_write8(rtwdev, REG_TCR + 1, WLAN_TX_FUNC_CFG1);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_GENERAL_OPTION, BIT_DUMMY_FCS_READY_MASK_EN);</div><div class='add'>+	rtw_write32(rtwdev, REG_WMAC_OPTION_FUNCTION + 8, WLAN_MAC_OPT_FUNC2);</div><div class='add'>+	rtw_write8(rtwdev, REG_WMAC_OPTION_FUNCTION_1, WLAN_MAC_OPT_NORM_FUNC1);</div><div class='add'>+</div><div class='add'>+	/* init low power */</div><div class='add'>+	value16 = rtw_read16(rtwdev, REG_RXPSF_CTRL + 2) &amp; 0xF00F;</div><div class='add'>+	value16 |= (BIT_RXGCK_VHT_FIFOTHR(1) | BIT_RXGCK_HT_FIFOTHR(1) |</div><div class='add'>+		    BIT_RXGCK_OFDM_FIFOTHR(1) | BIT_RXGCK_CCK_FIFOTHR(1)) &gt;&gt; 16;</div><div class='add'>+	rtw_write16(rtwdev, REG_RXPSF_CTRL + 2, value16);</div><div class='add'>+	value16 = 0;</div><div class='add'>+	value16 = BIT_SET_RXPSF_PKTLENTHR(value16, 1);</div><div class='add'>+	value16 |= BIT_RXPSF_CTRLEN | BIT_RXPSF_VHTCHKEN | BIT_RXPSF_HTCHKEN</div><div class='add'>+		| BIT_RXPSF_OFDMCHKEN | BIT_RXPSF_CCKCHKEN</div><div class='add'>+		| BIT_RXPSF_OFDMRST;</div><div class='add'>+	rtw_write16(rtwdev, REG_RXPSF_CTRL, value16);</div><div class='add'>+	rtw_write32(rtwdev, REG_RXPSF_TYPE_CTRL, 0xFFFFFFFF);</div><div class='add'>+	/* rx ignore configuration */</div><div class='add'>+	value16 = rtw_read16(rtwdev, REG_RXPSF_CTRL);</div><div class='add'>+	value16 &amp;= ~(BIT_RXPSF_MHCHKEN | BIT_RXPSF_CCKRST |</div><div class='add'>+		     BIT_RXPSF_CONT_ERRCHKEN);</div><div class='add'>+	value16 = BIT_SET_RXPSF_ERRTHR(value16, 0x07);</div><div class='add'>+	rtw_write16(rtwdev, REG_RXPSF_CTRL, value16);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_set_channel_rf(struct rtw_dev *rtwdev, u8 channel, u8 bw)</div><div class='add'>+{</div><div class='add'>+#define RF18_BAND_MASK		(BIT(16) | BIT(9) | BIT(8))</div><div class='add'>+#define RF18_BAND_2G		(0)</div><div class='add'>+#define RF18_BAND_5G		(BIT(16) | BIT(8))</div><div class='add'>+#define RF18_CHANNEL_MASK	(MASKBYTE0)</div><div class='add'>+#define RF18_RFSI_MASK		(BIT(18) | BIT(17))</div><div class='add'>+#define RF18_RFSI_GE_CH80	(BIT(17))</div><div class='add'>+#define RF18_RFSI_GT_CH140	(BIT(18))</div><div class='add'>+#define RF18_BW_MASK		(BIT(13) | BIT(12))</div><div class='add'>+#define RF18_BW_20M		(BIT(13) | BIT(12))</div><div class='add'>+#define RF18_BW_40M		(BIT(13))</div><div class='add'>+#define RF18_BW_80M		(BIT(12))</div><div class='add'>+</div><div class='add'>+	u32 rf_reg18 = 0;</div><div class='add'>+	u32 rf_rxbb = 0;</div><div class='add'>+</div><div class='add'>+	rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);</div><div class='add'>+</div><div class='add'>+	rf_reg18 &amp;= ~(RF18_BAND_MASK | RF18_CHANNEL_MASK | RF18_RFSI_MASK |</div><div class='add'>+		      RF18_BW_MASK);</div><div class='add'>+</div><div class='add'>+	rf_reg18 |= (channel &lt;= 14 ? RF18_BAND_2G : RF18_BAND_5G);</div><div class='add'>+	rf_reg18 |= (channel &amp; RF18_CHANNEL_MASK);</div><div class='add'>+	if (channel &gt; 144)</div><div class='add'>+		rf_reg18 |= RF18_RFSI_GT_CH140;</div><div class='add'>+	else if (channel &gt;= 80)</div><div class='add'>+		rf_reg18 |= RF18_RFSI_GE_CH80;</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case RTW_CHANNEL_WIDTH_5:</div><div class='add'>+	case RTW_CHANNEL_WIDTH_10:</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		rf_reg18 |= RF18_BW_20M;</div><div class='add'>+		rf_rxbb = 0x18;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		/* RF bandwidth */</div><div class='add'>+		rf_reg18 |= RF18_BW_40M;</div><div class='add'>+		rf_rxbb = 0x10;</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_80:</div><div class='add'>+		rf_reg18 |= RF18_BW_80M;</div><div class='add'>+		rf_rxbb = 0x8;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, 0x04, 0x01);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, 0x1f, 0x12);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, 0xfffff, rf_rxbb);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, 0x04, 0x00);</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_B, RF_LUTWE2, 0x04, 0x01);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_B, RF_LUTWA, 0x1f, 0x12);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_B, RF_LUTWD0, 0xfffff, rf_rxbb);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_B, RF_LUTWE2, 0x04, 0x00);</div><div class='add'>+</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK, rf_reg18);</div><div class='add'>+	rtw_write_rf(rtwdev, RF_PATH_B, RF_CFGCH, RFREG_MASK, rf_reg18);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_toggle_igi(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	u32 igi;</div><div class='add'>+</div><div class='add'>+	igi = rtw_read32_mask(rtwdev, REG_RXIGI, 0x7f);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI, 0x7f, igi - 2);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI, 0x7f00, igi - 2);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI, 0x7f, igi);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_RXIGI, 0x7f00, igi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+				    u8 primary_ch_idx)</div><div class='add'>+{</div><div class='add'>+	if (channel &lt;= 14) {</div><div class='add'>+		rtw_write32_clr(rtwdev, REG_BGCTRL, BITS_RX_IQ_WEIGHT);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0xf0000000, 0x8);</div><div class='add'>+		rtw_write32_set(rtwdev, REG_TXF4, BIT(20));</div><div class='add'>+		rtw_write32_clr(rtwdev, REG_CCK_CHECK, BIT_CHECK_CCK_EN);</div><div class='add'>+		rtw_write32_clr(rtwdev, REG_CCKTXONLY, BIT_BB_CCK_CHECK_EN);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCAMSK, 0x3F000000, 0xF);</div><div class='add'>+</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXAGCCTL0, 0x1f0, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXAGCCTL, 0x1f0, 0x0);</div><div class='add'>+		if (channel == 13 || channel == 14)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x969);</div><div class='add'>+		else if (channel == 11 || channel == 12)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x96a);</div><div class='add'>+		else</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x9aa);</div><div class='add'>+		if (channel == 14) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF0, MASKHWORD, 0x3da0);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF1, MASKDWORD,</div><div class='add'>+					 0x4962c931);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF2, MASKLWORD, 0x6aa3);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF3, MASKHWORD, 0xaa7b);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF4, MASKLWORD, 0xf3d7);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF5, MASKDWORD, 0x0);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF6, MASKDWORD,</div><div class='add'>+					 0xff012455);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF7, MASKDWORD, 0xffff);</div><div class='add'>+		} else {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF0, MASKHWORD, 0x5284);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF1, MASKDWORD,</div><div class='add'>+					 0x3e18fec8);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF2, MASKLWORD, 0x0a88);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF3, MASKHWORD, 0xacc4);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF4, MASKLWORD, 0xc8b2);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF5, MASKDWORD,</div><div class='add'>+					 0x00faf0de);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF6, MASKDWORD,</div><div class='add'>+					 0x00122344);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXF7, MASKDWORD,</div><div class='add'>+					 0x0fffffff);</div><div class='add'>+		}</div><div class='add'>+		if (channel == 13)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXDFIR0, 0x70, 0x3);</div><div class='add'>+		else</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXDFIR0, 0x70, 0x1);</div><div class='add'>+	} else if (channel &gt; 35) {</div><div class='add'>+		rtw_write32_set(rtwdev, REG_CCKTXONLY, BIT_BB_CCK_CHECK_EN);</div><div class='add'>+		rtw_write32_set(rtwdev, REG_CCK_CHECK, BIT_CHECK_CCK_EN);</div><div class='add'>+		rtw_write32_set(rtwdev, REG_BGCTRL, BITS_RX_IQ_WEIGHT);</div><div class='add'>+		rtw_write32_clr(rtwdev, REG_TXF4, BIT(20));</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0xf0000000, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCAMSK, 0x3F000000, 0x22);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXDFIR0, 0x70, 0x3);</div><div class='add'>+		if (channel &gt;= 36 &amp;&amp; channel &lt;= 64) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXAGCCTL0, 0x1f0, 0x1);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXAGCCTL, 0x1f0, 0x1);</div><div class='add'>+		} else if (channel &gt;= 100 &amp;&amp; channel &lt;= 144) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXAGCCTL0, 0x1f0, 0x2);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXAGCCTL, 0x1f0, 0x2);</div><div class='add'>+		} else if (channel &gt;= 149) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXAGCCTL0, 0x1f0, 0x3);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXAGCCTL, 0x1f0, 0x3);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (channel &gt;= 36 &amp;&amp; channel &lt;= 51)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x494);</div><div class='add'>+		else if (channel &gt;= 52 &amp;&amp; channel &lt;= 55)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x493);</div><div class='add'>+		else if (channel &gt;= 56 &amp;&amp; channel &lt;= 111)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x453);</div><div class='add'>+		else if (channel &gt;= 112 &amp;&amp; channel &lt;= 119)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x452);</div><div class='add'>+		else if (channel &gt;= 120 &amp;&amp; channel &lt;= 172)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x412);</div><div class='add'>+		else if (channel &gt;= 173 &amp;&amp; channel &lt;= 177)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_SCOTRK, 0xfff, 0x411);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case RTW_CHANNEL_WIDTH_20:</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_DFIRBW, 0x3FF0, 0x19B);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xf, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xffc0, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXCLK, 0x700, 0x7);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXCLK, 0x700000, 0x6);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_40:</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCKSB, BIT(4),</div><div class='add'>+				 (primary_ch_idx == 1 ? 1 : 0));</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xf, 0x5);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xc0, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xff00,</div><div class='add'>+				 (primary_ch_idx | (primary_ch_idx &lt;&lt; 4)));</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_80:</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xf, 0xa);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xc0, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xff00,</div><div class='add'>+				 (primary_ch_idx | (primary_ch_idx &lt;&lt; 4)));</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_5:</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_DFIRBW, 0x3FF0, 0x2AB);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xf, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xffc0, 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXCLK, 0x700, 0x4);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXCLK, 0x700000, 0x4);</div><div class='add'>+		break;</div><div class='add'>+	case RTW_CHANNEL_WIDTH_10:</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_DFIRBW, 0x3FF0, 0x2AB);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xf, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXBWCTL, 0xffc0, 0x2);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXCLK, 0x700, 0x6);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXCLK, 0x700000, 0x5);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_set_channel(struct rtw_dev *rtwdev, u8 channel, u8 bw,</div><div class='add'>+				 u8 primary_chan_idx)</div><div class='add'>+{</div><div class='add'>+	rtw8822c_set_channel_bb(rtwdev, channel, bw, primary_chan_idx);</div><div class='add'>+	rtw_set_channel_mac(rtwdev, channel, bw, primary_chan_idx);</div><div class='add'>+	rtw8822c_set_channel_rf(rtwdev, channel, bw);</div><div class='add'>+	rtw8822c_toggle_igi(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_cck_rx_path(struct rtw_dev *rtwdev, u8 rx_path)</div><div class='add'>+{</div><div class='add'>+	if (rx_path == BB_PATH_A || rx_path == BB_PATH_B) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCANRX, 0x00060000, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCANRX, 0x00600000, 0x0);</div><div class='add'>+	} else if (rx_path == BB_PATH_AB) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCANRX, 0x00600000, 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_CCANRX, 0x00060000, 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_path == BB_PATH_A)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0x0f000000, 0x0);</div><div class='add'>+	else if (rx_path == BB_PATH_B)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0x0f000000, 0x5);</div><div class='add'>+	else if (rx_path == BB_PATH_AB)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0x0f000000, 0x1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_ofdm_rx_path(struct rtw_dev *rtwdev, u8 rx_path)</div><div class='add'>+{</div><div class='add'>+	if (rx_path == BB_PATH_A || rx_path == BB_PATH_B) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXFNCTL, 0x300, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXFNCTL, 0x600000, 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_AGCSWSH, BIT(17), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ANTWTPD, BIT(20), 0x0);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_MRCM, BIT(24), 0x0);</div><div class='add'>+	} else if (rx_path == BB_PATH_AB) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXFNCTL, 0x300, 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXFNCTL, 0x600000, 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_AGCSWSH, BIT(17), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ANTWTPD, BIT(20), 0x1);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_MRCM, BIT(24), 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x824, 0x0f000000, rx_path);</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x824, 0x000f0000, rx_path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_rx_path(struct rtw_dev *rtwdev, u8 rx_path)</div><div class='add'>+{</div><div class='add'>+	rtw8822c_config_cck_rx_path(rtwdev, rx_path);</div><div class='add'>+	rtw8822c_config_ofdm_rx_path(rtwdev, rx_path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_cck_tx_path(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+					bool is_tx2_path)</div><div class='add'>+{</div><div class='add'>+	if (tx_path == BB_PATH_A) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0xf0000000, 0x8);</div><div class='add'>+	} else if (tx_path == BB_PATH_B) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0xf0000000, 0x4);</div><div class='add'>+	} else {</div><div class='add'>+		if (is_tx2_path)</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0xf0000000, 0xc);</div><div class='add'>+		else</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_RXCCKSEL, 0xf0000000, 0x8);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_ofdm_tx_path(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+					 bool is_tx2_path)</div><div class='add'>+{</div><div class='add'>+	if (tx_path == BB_PATH_A) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ANTMAP0, 0xff, 0x11);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXLGMAP, 0xff, 0x0);</div><div class='add'>+	} else if (tx_path == BB_PATH_B) {</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ANTMAP0, 0xff, 0x12);</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_TXLGMAP, 0xff, 0x0);</div><div class='add'>+	} else {</div><div class='add'>+		if (is_tx2_path) {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ANTMAP0, 0xff, 0x33);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXLGMAP, 0xffff, 0x0404);</div><div class='add'>+		} else {</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_ANTMAP0, 0xff, 0x31);</div><div class='add'>+			rtw_write32_mask(rtwdev, REG_TXLGMAP, 0xffff, 0x0400);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_tx_path(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+				    bool is_tx2_path)</div><div class='add'>+{</div><div class='add'>+	rtw8822c_config_cck_tx_path(rtwdev, tx_path, is_tx2_path);</div><div class='add'>+	rtw8822c_config_ofdm_tx_path(rtwdev, tx_path, is_tx2_path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path,</div><div class='add'>+				     u8 rx_path, bool is_tx2_path)</div><div class='add'>+{</div><div class='add'>+	if ((tx_path | rx_path) &amp; BB_PATH_A)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ORITXCODE, MASK20BITS, 0x33312);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ORITXCODE, MASK20BITS, 0x11111);</div><div class='add'>+	if ((tx_path | rx_path) &amp; BB_PATH_B)</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ORITXCODE2, MASK20BITS, 0x33312);</div><div class='add'>+	else</div><div class='add'>+		rtw_write32_mask(rtwdev, REG_ORITXCODE2, MASK20BITS, 0x11111);</div><div class='add'>+</div><div class='add'>+	rtw8822c_config_rx_path(rtwdev, rx_path);</div><div class='add'>+	rtw8822c_config_tx_path(rtwdev, tx_path, is_tx2_path);</div><div class='add'>+</div><div class='add'>+	rtw8822c_toggle_igi(rtwdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,</div><div class='add'>+				   struct rtw_rx_pkt_stat *pkt_stat)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	u8 l_bnd, u_bnd;</div><div class='add'>+	u8 gain_a, gain_b;</div><div class='add'>+	s8 rx_power[RTW_RF_PATH_MAX];</div><div class='add'>+	s8 min_rx_power = -120;</div><div class='add'>+</div><div class='add'>+	rx_power[RF_PATH_A] = GET_PHY_STAT_P0_PWDB_A(phy_status);</div><div class='add'>+	rx_power[RF_PATH_B] = GET_PHY_STAT_P0_PWDB_B(phy_status);</div><div class='add'>+	l_bnd = dm_info-&gt;cck_gi_l_bnd;</div><div class='add'>+	u_bnd = dm_info-&gt;cck_gi_u_bnd;</div><div class='add'>+	gain_a = GET_PHY_STAT_P0_GAIN_A(phy_status);</div><div class='add'>+	gain_b = GET_PHY_STAT_P0_GAIN_B(phy_status);</div><div class='add'>+	if (gain_a &lt; l_bnd)</div><div class='add'>+		rx_power[RF_PATH_A] += (l_bnd - gain_a) &lt;&lt; 1;</div><div class='add'>+	else if (gain_a &gt; u_bnd)</div><div class='add'>+		rx_power[RF_PATH_A] -= (gain_a - u_bnd) &lt;&lt; 1;</div><div class='add'>+	if (gain_b &lt; l_bnd)</div><div class='add'>+		rx_power[RF_PATH_A] += (l_bnd - gain_b) &lt;&lt; 1;</div><div class='add'>+	else if (gain_b &gt; u_bnd)</div><div class='add'>+		rx_power[RF_PATH_A] -= (gain_b - u_bnd) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	rx_power[RF_PATH_A] -= 110;</div><div class='add'>+	rx_power[RF_PATH_B] -= 110;</div><div class='add'>+</div><div class='add'>+	pkt_stat-&gt;rx_power[RF_PATH_A] = max3(rx_power[RF_PATH_A],</div><div class='add'>+					     rx_power[RF_PATH_B],</div><div class='add'>+					     min_rx_power);</div><div class='add'>+	pkt_stat-&gt;rssi = rtw_phy_rf_power_2_rssi(pkt_stat-&gt;rx_power, 1);</div><div class='add'>+	pkt_stat-&gt;bw = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+	pkt_stat-&gt;signal_power = max(pkt_stat-&gt;rx_power[RF_PATH_A],</div><div class='add'>+				     min_rx_power);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_phy_status_page1(struct rtw_dev *rtwdev, u8 *phy_status,</div><div class='add'>+				   struct rtw_rx_pkt_stat *pkt_stat)</div><div class='add'>+{</div><div class='add'>+	u8 rxsc, bw;</div><div class='add'>+	s8 min_rx_power = -120;</div><div class='add'>+</div><div class='add'>+	if (pkt_stat-&gt;rate &gt; DESC_RATE11M &amp;&amp; pkt_stat-&gt;rate &lt; DESC_RATEMCS0)</div><div class='add'>+		rxsc = GET_PHY_STAT_P1_L_RXSC(phy_status);</div><div class='add'>+	else</div><div class='add'>+		rxsc = GET_PHY_STAT_P1_HT_RXSC(phy_status);</div><div class='add'>+</div><div class='add'>+	if (rxsc &gt;= 9 &amp;&amp; rxsc &lt;= 12)</div><div class='add'>+		bw = RTW_CHANNEL_WIDTH_40;</div><div class='add'>+	else if (rxsc &gt;= 13)</div><div class='add'>+		bw = RTW_CHANNEL_WIDTH_80;</div><div class='add'>+	else</div><div class='add'>+		bw = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+</div><div class='add'>+	pkt_stat-&gt;rx_power[RF_PATH_A] = GET_PHY_STAT_P1_PWDB_A(phy_status) - 110;</div><div class='add'>+	pkt_stat-&gt;rx_power[RF_PATH_B] = GET_PHY_STAT_P1_PWDB_B(phy_status) - 110;</div><div class='add'>+	pkt_stat-&gt;rssi = rtw_phy_rf_power_2_rssi(pkt_stat-&gt;rx_power, 2);</div><div class='add'>+	pkt_stat-&gt;bw = bw;</div><div class='add'>+	pkt_stat-&gt;signal_power = max3(pkt_stat-&gt;rx_power[RF_PATH_A],</div><div class='add'>+				      pkt_stat-&gt;rx_power[RF_PATH_B],</div><div class='add'>+				      min_rx_power);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_phy_status(struct rtw_dev *rtwdev, u8 *phy_status,</div><div class='add'>+			     struct rtw_rx_pkt_stat *pkt_stat)</div><div class='add'>+{</div><div class='add'>+	u8 page;</div><div class='add'>+</div><div class='add'>+	page = *phy_status &amp; 0xf;</div><div class='add'>+</div><div class='add'>+	switch (page) {</div><div class='add'>+	case 0:</div><div class='add'>+		query_phy_status_page0(rtwdev, phy_status, pkt_stat);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		query_phy_status_page1(rtwdev, phy_status, pkt_stat);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rtw_warn(rtwdev, "unused phy status page (%d)\n", page);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,</div><div class='add'>+				   struct rtw_rx_pkt_stat *pkt_stat,</div><div class='add'>+				   struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u32 desc_sz = rtwdev-&gt;chip-&gt;rx_pkt_desc_sz;</div><div class='add'>+	u8 *phy_status = NULL;</div><div class='add'>+</div><div class='add'>+	memset(pkt_stat, 0, sizeof(*pkt_stat));</div><div class='add'>+</div><div class='add'>+	pkt_stat-&gt;phy_status = GET_RX_DESC_PHYST(rx_desc);</div><div class='add'>+	pkt_stat-&gt;icv_err = GET_RX_DESC_ICV_ERR(rx_desc);</div><div class='add'>+	pkt_stat-&gt;crc_err = GET_RX_DESC_CRC32(rx_desc);</div><div class='add'>+	pkt_stat-&gt;decrypted = !GET_RX_DESC_SWDEC(rx_desc);</div><div class='add'>+	pkt_stat-&gt;is_c2h = GET_RX_DESC_C2H(rx_desc);</div><div class='add'>+	pkt_stat-&gt;pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);</div><div class='add'>+	pkt_stat-&gt;drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);</div><div class='add'>+	pkt_stat-&gt;shift = GET_RX_DESC_SHIFT(rx_desc);</div><div class='add'>+	pkt_stat-&gt;rate = GET_RX_DESC_RX_RATE(rx_desc);</div><div class='add'>+	pkt_stat-&gt;cam_id = GET_RX_DESC_MACID(rx_desc);</div><div class='add'>+	pkt_stat-&gt;ppdu_cnt = GET_RX_DESC_PPDU_CNT(rx_desc);</div><div class='add'>+	pkt_stat-&gt;tsf_low = GET_RX_DESC_TSFL(rx_desc);</div><div class='add'>+</div><div class='add'>+	/* drv_info_sz is in unit of 8-bytes */</div><div class='add'>+	pkt_stat-&gt;drv_info_sz *= 8;</div><div class='add'>+</div><div class='add'>+	/* c2h cmd pkt's rx/phy status is not interested */</div><div class='add'>+	if (pkt_stat-&gt;is_c2h)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat-&gt;shift +</div><div class='add'>+				       pkt_stat-&gt;drv_info_sz);</div><div class='add'>+	if (pkt_stat-&gt;phy_status) {</div><div class='add'>+		phy_status = rx_desc + desc_sz + pkt_stat-&gt;shift;</div><div class='add'>+		query_phy_status(rtwdev, phy_status, pkt_stat);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtw8822c_set_write_tx_power_ref(struct rtw_dev *rtwdev, u8 *tx_pwr_ref_cck,</div><div class='add'>+				u8 *tx_pwr_ref_ofdm)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u32 txref_cck[2] = {0x18a0, 0x41a0};</div><div class='add'>+	u32 txref_ofdm[2] = {0x18e8, 0x41e8};</div><div class='add'>+	u8 path;</div><div class='add'>+</div><div class='add'>+	for (path = 0; path &lt; hal-&gt;rf_path_num; path++) {</div><div class='add'>+		rtw_write32_mask(rtwdev, 0x1c90, BIT(15), 0);</div><div class='add'>+		rtw_write32_mask(rtwdev, txref_cck[path], 0x7f0000,</div><div class='add'>+				 tx_pwr_ref_cck[path]);</div><div class='add'>+	}</div><div class='add'>+	for (path = 0; path &lt; hal-&gt;rf_path_num; path++) {</div><div class='add'>+		rtw_write32_mask(rtwdev, 0x1c90, BIT(15), 0);</div><div class='add'>+		rtw_write32_mask(rtwdev, txref_ofdm[path], 0x1fc00,</div><div class='add'>+				 tx_pwr_ref_ofdm[path]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_set_tx_power_diff(struct rtw_dev *rtwdev, u8 rate,</div><div class='add'>+				       s8 *diff_idx)</div><div class='add'>+{</div><div class='add'>+	u32 offset_txagc = 0x3a00;</div><div class='add'>+	u8 rate_idx = rate &amp; 0xfc;</div><div class='add'>+	u8 pwr_idx[4];</div><div class='add'>+	u32 phy_pwr_idx;</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'>+		pwr_idx[i] = diff_idx[i] &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	phy_pwr_idx = pwr_idx[0] |</div><div class='add'>+		      (pwr_idx[1] &lt;&lt; 8) |</div><div class='add'>+		      (pwr_idx[2] &lt;&lt; 16) |</div><div class='add'>+		      (pwr_idx[3] &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, 0x1c90, BIT(15), 0x0);</div><div class='add'>+	rtw_write32_mask(rtwdev, offset_txagc + rate_idx, MASKDWORD,</div><div class='add'>+			 phy_pwr_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_set_tx_power_index(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_hal *hal = &amp;rtwdev-&gt;hal;</div><div class='add'>+	u8 rs, rate, j;</div><div class='add'>+	u8 pwr_ref_cck[2] = {hal-&gt;tx_pwr_tbl[RF_PATH_A][DESC_RATE11M],</div><div class='add'>+			     hal-&gt;tx_pwr_tbl[RF_PATH_B][DESC_RATE11M]};</div><div class='add'>+	u8 pwr_ref_ofdm[2] = {hal-&gt;tx_pwr_tbl[RF_PATH_A][DESC_RATEMCS7],</div><div class='add'>+			      hal-&gt;tx_pwr_tbl[RF_PATH_B][DESC_RATEMCS7]};</div><div class='add'>+	s8 diff_a, diff_b;</div><div class='add'>+	u8 pwr_a, pwr_b;</div><div class='add'>+	s8 diff_idx[4];</div><div class='add'>+</div><div class='add'>+	rtw8822c_set_write_tx_power_ref(rtwdev, pwr_ref_cck, pwr_ref_ofdm);</div><div class='add'>+	for (rs = 0; rs &lt; RTW_RATE_SECTION_MAX; rs++) {</div><div class='add'>+		for (j = 0; j &lt; rtw_rate_size[rs]; j++) {</div><div class='add'>+			rate = rtw_rate_section[rs][j];</div><div class='add'>+			pwr_a = hal-&gt;tx_pwr_tbl[RF_PATH_A][rate];</div><div class='add'>+			pwr_b = hal-&gt;tx_pwr_tbl[RF_PATH_B][rate];</div><div class='add'>+			if (rs == 0) {</div><div class='add'>+				diff_a = (s8)pwr_a - (s8)pwr_ref_cck[0];</div><div class='add'>+				diff_b = (s8)pwr_b - (s8)pwr_ref_cck[1];</div><div class='add'>+			} else {</div><div class='add'>+				diff_a = (s8)pwr_a - (s8)pwr_ref_ofdm[0];</div><div class='add'>+				diff_b = (s8)pwr_b - (s8)pwr_ref_ofdm[1];</div><div class='add'>+			}</div><div class='add'>+			diff_idx[rate % 4] = min(diff_a, diff_b);</div><div class='add'>+			if (rate % 4 == 3)</div><div class='add'>+				rtw8822c_set_tx_power_diff(rtwdev, rate - 3,</div><div class='add'>+							   diff_idx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_cfg_ldo25(struct rtw_dev *rtwdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	u8 ldo_pwr;</div><div class='add'>+</div><div class='add'>+	ldo_pwr = rtw_read8(rtwdev, REG_ANAPARLDO_POW_MAC);</div><div class='add'>+	ldo_pwr = enable ? ldo_pwr | BIT_LDOE25_PON : ldo_pwr &amp; ~BIT_LDOE25_PON;</div><div class='add'>+	rtw_write8(rtwdev, REG_ANAPARLDO_POW_MAC, ldo_pwr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_false_alarm_statistics(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dm_info *dm_info = &amp;rtwdev-&gt;dm_info;</div><div class='add'>+	u32 cck_enable;</div><div class='add'>+	u32 cck_fa_cnt;</div><div class='add'>+	u32 ofdm_fa_cnt;</div><div class='add'>+	u32 ofdm_tx_counter;</div><div class='add'>+</div><div class='add'>+	cck_enable = rtw_read32(rtwdev, REG_ENCCK) &amp; BIT_CCK_BLK_EN;</div><div class='add'>+	cck_fa_cnt = rtw_read16(rtwdev, REG_CCK_FACNT);</div><div class='add'>+	ofdm_fa_cnt = rtw_read16(rtwdev, REG_OFDM_FACNT);</div><div class='add'>+	ofdm_tx_counter = rtw_read16(rtwdev, REG_OFDM_TXCNT);</div><div class='add'>+	ofdm_fa_cnt -= ofdm_tx_counter;</div><div class='add'>+</div><div class='add'>+	dm_info-&gt;cck_fa_cnt = cck_fa_cnt;</div><div class='add'>+	dm_info-&gt;ofdm_fa_cnt = ofdm_fa_cnt;</div><div class='add'>+	dm_info-&gt;total_fa_cnt = ofdm_fa_cnt;</div><div class='add'>+	dm_info-&gt;total_fa_cnt += cck_enable ? cck_fa_cnt : 0;</div><div class='add'>+</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CCANRX, BIT_CCK_FA_RST, 0);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CCANRX, BIT_CCK_FA_RST, 2);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CCANRX, BIT_OFDM_FA_RST, 0);</div><div class='add'>+	rtw_write32_mask(rtwdev, REG_CCANRX, BIT_OFDM_FA_RST, 2);</div><div class='add'>+	rtw_write32_set(rtwdev, REG_CNT_CTRL, BIT_ALL_CNT_RST);</div><div class='add'>+	rtw_write32_clr(rtwdev, REG_CNT_CTRL, BIT_ALL_CNT_RST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw8822c_do_iqk(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822c[] = {</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), BIT(1)},</div><div class='add'>+	{0x002E,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), BIT(2)},</div><div class='add'>+	{0x002D,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x007F,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7), 0},</div><div class='add'>+	{0x004A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3) | BIT(4) | BIT(7), 0},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_cardemu_to_act_8822c[] = {</div><div class='add'>+	{0x0000,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(4) | BIT(3) | BIT(2)), 0},</div><div class='add'>+	{0x0075,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0006,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), BIT(1)},</div><div class='add'>+	{0x0075,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0xFF1A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x002E,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3), 0},</div><div class='add'>+	{0x0006,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(4) | BIT(3)), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(0), 0},</div><div class='add'>+	{0x0074,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), BIT(5)},</div><div class='add'>+	{0x0071,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(4), 0},</div><div class='add'>+	{0x0062,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(7) | BIT(6) | BIT(5)),</div><div class='add'>+	 (BIT(7) | BIT(6) | BIT(5))},</div><div class='add'>+	{0x0061,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(7) | BIT(6) | BIT(5)), 0},</div><div class='add'>+	{0x001F,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(7) | BIT(6)), BIT(7)},</div><div class='add'>+	{0x00EF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, (BIT(7) | BIT(6)), BIT(7)},</div><div class='add'>+	{0x1045,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(4), BIT(4)},</div><div class='add'>+	{0x0010,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), BIT(2)},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_act_to_cardemu_8822c[] = {</div><div class='add'>+	{0x0093,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3), 0},</div><div class='add'>+	{0x001F,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x00EF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0},</div><div class='add'>+	{0x1045,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(4), 0},</div><div class='add'>+	{0xFF1A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x30},</div><div class='add'>+	{0x0049,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0006,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0x0002,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), BIT(1)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_POLLING, BIT(1), 0},</div><div class='add'>+	{0x0000,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), BIT(5)},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8822c[] = {</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7), BIT(7)},</div><div class='add'>+	{0x0007,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, 0xFF, 0x00},</div><div class='add'>+	{0x0067,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(5), 0},</div><div class='add'>+	{0x004A,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), 0},</div><div class='add'>+	{0x0081,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(7) | BIT(6), 0},</div><div class='add'>+	{0x0090,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(1), 0},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(3) | BIT(4), BIT(3)},</div><div class='add'>+	{0x0005,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_PCI_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_MAC,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(2), BIT(2)},</div><div class='add'>+	{0x0086,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_SDIO_MSK,</div><div class='add'>+	 RTW_PWR_ADDR_SDIO,</div><div class='add'>+	 RTW_PWR_CMD_WRITE, BIT(0), BIT(0)},</div><div class='add'>+	{0xFFFF,</div><div class='add'>+	 RTW_PWR_CUT_ALL_MSK,</div><div class='add'>+	 RTW_PWR_INTF_ALL_MSK,</div><div class='add'>+	 0,</div><div class='add'>+	 RTW_PWR_CMD_END, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd *card_enable_flow_8822c[] = {</div><div class='add'>+	trans_carddis_to_cardemu_8822c,</div><div class='add'>+	trans_cardemu_to_act_8822c,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_pwr_seq_cmd *card_disable_flow_8822c[] = {</div><div class='add'>+	trans_act_to_cardemu_8822c,</div><div class='add'>+	trans_cardemu_to_carddis_8822c,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para usb2_param_8822c[] = {</div><div class='add'>+	{0xFFFF, 0x00,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para usb3_param_8822c[] = {</div><div class='add'>+	{0xFFFF, 0x0000,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para pcie_gen1_param_8822c[] = {</div><div class='add'>+	{0xFFFF, 0x0000,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para pcie_gen2_param_8822c[] = {</div><div class='add'>+	{0xFFFF, 0x0000,</div><div class='add'>+	 RTW_IP_SEL_PHY,</div><div class='add'>+	 RTW_INTF_PHY_CUT_ALL,</div><div class='add'>+	 RTW_INTF_PHY_PLATFORM_ALL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_intf_phy_para_table phy_para_table_8822c = {</div><div class='add'>+	.usb2_para	= usb2_param_8822c,</div><div class='add'>+	.usb3_para	= usb3_param_8822c,</div><div class='add'>+	.gen1_para	= pcie_gen1_param_8822c,</div><div class='add'>+	.gen2_para	= pcie_gen2_param_8822c,</div><div class='add'>+	.n_usb2_para	= ARRAY_SIZE(usb2_param_8822c),</div><div class='add'>+	.n_usb3_para	= ARRAY_SIZE(usb2_param_8822c),</div><div class='add'>+	.n_gen1_para	= ARRAY_SIZE(pcie_gen1_param_8822c),</div><div class='add'>+	.n_gen2_para	= ARRAY_SIZE(pcie_gen2_param_8822c),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtw_rfe_def rtw8822c_rfe_defs[] = {</div><div class='add'>+	[0] = RTW_DEF_RFE(8822c, 0, 0),</div><div class='add'>+	[1] = RTW_DEF_RFE(8822c, 0, 0),</div><div class='add'>+	[2] = RTW_DEF_RFE(8822c, 0, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_hw_reg rtw8822c_dig[] = {</div><div class='add'>+	[0] = { .addr = 0x1d70, .mask = 0x7f },</div><div class='add'>+	[1] = { .addr = 0x1d70, .mask = 0x7f00 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_page_table page_table_8822c[] = {</div><div class='add'>+	{64, 64, 64, 64, 1},</div><div class='add'>+	{64, 64, 64, 64, 1},</div><div class='add'>+	{64, 64, 0, 0, 1},</div><div class='add'>+	{64, 64, 64, 0, 1},</div><div class='add'>+	{64, 64, 64, 64, 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_rqpn rqpn_table_8822c[] = {</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_HIGH,</div><div class='add'>+	 RTW_DMA_MAPPING_HIGH, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_HIGH, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,</div><div class='add'>+	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,</div><div class='add'>+	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rtw_chip_ops rtw8822c_ops = {</div><div class='add'>+	.phy_set_param		= rtw8822c_phy_set_param,</div><div class='add'>+	.read_efuse		= rtw8822c_read_efuse,</div><div class='add'>+	.query_rx_desc		= rtw8822c_query_rx_desc,</div><div class='add'>+	.set_channel		= rtw8822c_set_channel,</div><div class='add'>+	.mac_init		= rtw8822c_mac_init,</div><div class='add'>+	.read_rf		= rtw_phy_read_rf,</div><div class='add'>+	.write_rf		= rtw_phy_write_rf_reg_mix,</div><div class='add'>+	.set_tx_power_index	= rtw8822c_set_tx_power_index,</div><div class='add'>+	.cfg_ldo25		= rtw8822c_cfg_ldo25,</div><div class='add'>+	.false_alarm_statistics	= rtw8822c_false_alarm_statistics,</div><div class='add'>+	.do_iqk			= rtw8822c_do_iqk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw_chip_info rtw8822c_hw_spec = {</div><div class='add'>+	.ops = &amp;rtw8822c_ops,</div><div class='add'>+	.id = RTW_CHIP_TYPE_8822C,</div><div class='add'>+	.fw_name = "rtw88/rtw8822c_fw.bin",</div><div class='add'>+	.tx_pkt_desc_sz = 48,</div><div class='add'>+	.tx_buf_desc_sz = 16,</div><div class='add'>+	.rx_pkt_desc_sz = 24,</div><div class='add'>+	.rx_buf_desc_sz = 8,</div><div class='add'>+	.phy_efuse_size = 512,</div><div class='add'>+	.log_efuse_size = 768,</div><div class='add'>+	.ptct_efuse_size = 124,</div><div class='add'>+	.txff_size = 262144,</div><div class='add'>+	.rxff_size = 24576,</div><div class='add'>+	.txgi_factor = 2,</div><div class='add'>+	.is_pwr_by_rate_dec = false,</div><div class='add'>+	.max_power_index = 0x7f,</div><div class='add'>+	.csi_buf_pg_num = 50,</div><div class='add'>+	.band = RTW_BAND_2G | RTW_BAND_5G,</div><div class='add'>+	.page_size = 128,</div><div class='add'>+	.dig_min = 0x20,</div><div class='add'>+	.ht_supported = true,</div><div class='add'>+	.vht_supported = true,</div><div class='add'>+	.sys_func_en = 0xD8,</div><div class='add'>+	.pwr_on_seq = card_enable_flow_8822c,</div><div class='add'>+	.pwr_off_seq = card_disable_flow_8822c,</div><div class='add'>+	.page_table = page_table_8822c,</div><div class='add'>+	.rqpn_table = rqpn_table_8822c,</div><div class='add'>+	.intf_table = &amp;phy_para_table_8822c,</div><div class='add'>+	.dig = rtw8822c_dig,</div><div class='add'>+	.rf_base_addr = {0x3c00, 0x4c00},</div><div class='add'>+	.rf_sipi_addr = {0x1808, 0x4108},</div><div class='add'>+	.mac_tbl = &amp;rtw8822c_mac_tbl,</div><div class='add'>+	.agc_tbl = &amp;rtw8822c_agc_tbl,</div><div class='add'>+	.bb_tbl = &amp;rtw8822c_bb_tbl,</div><div class='add'>+	.rfk_init_tbl = &amp;rtw8822c_array_mp_cal_init_tbl,</div><div class='add'>+	.rf_tbl = {&amp;rtw8822c_rf_a_tbl, &amp;rtw8822c_rf_b_tbl},</div><div class='add'>+	.rfe_defs = rtw8822c_rfe_defs,</div><div class='add'>+	.rfe_defs_size = ARRAY_SIZE(rtw8822c_rfe_defs),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(rtw8822c_hw_spec);</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE("rtw88/rtw8822c_fw.bin");</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h<br/>new file mode 100644<br/>index 000000000000..d3bd9850baa0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822c.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822c.h</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW8822C_H__</div><div class='add'>+#define __RTW8822C_H__</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+struct rtw8822cu_efuse {</div><div class='add'>+	u8 res0[0x30];			/* 0x120 */</div><div class='add'>+	u8 vid[2];			/* 0x150 */</div><div class='add'>+	u8 pid[2];</div><div class='add'>+	u8 res1[3];</div><div class='add'>+	u8 mac_addr[ETH_ALEN];		/* 0x157 */</div><div class='add'>+	u8 res2[0x3d];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw8822ce_efuse {</div><div class='add'>+	u8 mac_addr[ETH_ALEN];		/* 0x120 */</div><div class='add'>+	u8 vender_id[2];</div><div class='add'>+	u8 device_id[2];</div><div class='add'>+	u8 sub_vender_id[2];</div><div class='add'>+	u8 sub_device_id[2];</div><div class='add'>+	u8 pmc[2];</div><div class='add'>+	u8 exp_device_cap[2];</div><div class='add'>+	u8 msi_cap;</div><div class='add'>+	u8 ltr_cap;			/* 0x133 */</div><div class='add'>+	u8 exp_link_control[2];</div><div class='add'>+	u8 link_cap[4];</div><div class='add'>+	u8 link_control[2];</div><div class='add'>+	u8 serial_number[8];</div><div class='add'>+	u8 res0:2;			/* 0x144 */</div><div class='add'>+	u8 ltr_en:1;</div><div class='add'>+	u8 res1:2;</div><div class='add'>+	u8 obff:2;</div><div class='add'>+	u8 res2:3;</div><div class='add'>+	u8 obff_cap:2;</div><div class='add'>+	u8 res3:4;</div><div class='add'>+	u8 class_code[3];</div><div class='add'>+	u8 res4;</div><div class='add'>+	u8 pci_pm_L1_2_supp:1;</div><div class='add'>+	u8 pci_pm_L1_1_supp:1;</div><div class='add'>+	u8 aspm_pm_L1_2_supp:1;</div><div class='add'>+	u8 aspm_pm_L1_1_supp:1;</div><div class='add'>+	u8 L1_pm_substates_supp:1;</div><div class='add'>+	u8 res5:3;</div><div class='add'>+	u8 port_common_mode_restore_time;</div><div class='add'>+	u8 port_t_power_on_scale:2;</div><div class='add'>+	u8 res6:1;</div><div class='add'>+	u8 port_t_power_on_value:5;</div><div class='add'>+	u8 res7;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtw8822c_efuse {</div><div class='add'>+	__le16 rtl_id;</div><div class='add'>+	u8 res0[0x0e];</div><div class='add'>+</div><div class='add'>+	/* power index for four RF paths */</div><div class='add'>+	struct rtw_txpwr_idx txpwr_idx_table[4];</div><div class='add'>+</div><div class='add'>+	u8 channel_plan;		/* 0xb8 */</div><div class='add'>+	u8 xtal_k;</div><div class='add'>+	u8 res1;</div><div class='add'>+	u8 iqk_lck;</div><div class='add'>+	u8 res2[5];			/* 0xbc */</div><div class='add'>+	u8 rf_board_option;</div><div class='add'>+	u8 rf_feature_option;</div><div class='add'>+	u8 rf_bt_setting;</div><div class='add'>+	u8 eeprom_version;</div><div class='add'>+	u8 eeprom_customer_id;</div><div class='add'>+	u8 tx_bb_swing_setting_2g;</div><div class='add'>+	u8 tx_bb_swing_setting_5g;</div><div class='add'>+	u8 tx_pwr_calibrate_rate;</div><div class='add'>+	u8 rf_antenna_option;		/* 0xc9 */</div><div class='add'>+	u8 rfe_option;</div><div class='add'>+	u8 country_code[2];</div><div class='add'>+	u8 res3[3];</div><div class='add'>+	u8 path_a_thermal;		/* 0xd0 */</div><div class='add'>+	u8 path_b_thermal;</div><div class='add'>+	u8 res4[2];</div><div class='add'>+	u8 rx_gain_gap_2g_ofdm;</div><div class='add'>+	u8 res5;</div><div class='add'>+	u8 rx_gain_gap_2g_cck;</div><div class='add'>+	u8 res6;</div><div class='add'>+	u8 rx_gain_gap_5gl;</div><div class='add'>+	u8 res7;</div><div class='add'>+	u8 rx_gain_gap_5gm;</div><div class='add'>+	u8 res8;</div><div class='add'>+	u8 rx_gain_gap_5gh;</div><div class='add'>+	u8 res9;</div><div class='add'>+	u8 res10[0x42];</div><div class='add'>+	union {</div><div class='add'>+		struct rtw8822cu_efuse u;</div><div class='add'>+		struct rtw8822ce_efuse e;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DACK_PATH_8822C		2</div><div class='add'>+#define DACK_REG_8822C		16</div><div class='add'>+#define DACK_RF_8822C		1</div><div class='add'>+#define DACK_SN_8822C		100</div><div class='add'>+</div><div class='add'>+/* phy status page0 */</div><div class='add'>+#define GET_PHY_STAT_P0_PWDB_A(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(15, 8))</div><div class='add'>+#define GET_PHY_STAT_P0_PWDB_B(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x04), GENMASK(7, 0))</div><div class='add'>+#define GET_PHY_STAT_P0_GAIN_A(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(21, 16))</div><div class='add'>+#define GET_PHY_STAT_P0_GAIN_B(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x04), GENMASK(29, 24))</div><div class='add'>+</div><div class='add'>+/* phy status page1 */</div><div class='add'>+#define GET_PHY_STAT_P1_PWDB_A(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(15, 8))</div><div class='add'>+#define GET_PHY_STAT_P1_PWDB_B(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(23, 16))</div><div class='add'>+#define GET_PHY_STAT_P1_L_RXSC(phy_stat)                                       \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x01), GENMASK(11, 8))</div><div class='add'>+#define GET_PHY_STAT_P1_HT_RXSC(phy_stat)                                      \</div><div class='add'>+	le32_get_bits(*((__le32 *)(phy_stat) + 0x01), GENMASK(15, 12))</div><div class='add'>+</div><div class='add'>+#define REG_ANAPARLDO_POW_MAC	0x0029</div><div class='add'>+#define BIT_LDOE25_PON		BIT(0)</div><div class='add'>+#define REG_RRSR		0x0440</div><div class='add'>+#define BITS_RRSR_RSC		(BIT(21) | BIT(22))</div><div class='add'>+</div><div class='add'>+#define REG_TXDFIR0	0x808</div><div class='add'>+#define REG_DFIRBW	0x810</div><div class='add'>+#define REG_ANTMAP0	0x820</div><div class='add'>+#define REG_ANTMAP	0x824</div><div class='add'>+#define REG_DYMPRITH	0x86c</div><div class='add'>+#define REG_DYMENTH0	0x870</div><div class='add'>+#define REG_DYMENTH	0x874</div><div class='add'>+#define REG_DYMTHMIN	0x8a4</div><div class='add'>+#define REG_TXBWCTL	0x9b0</div><div class='add'>+#define REG_TXCLK	0x9b4</div><div class='add'>+#define REG_SCOTRK	0xc30</div><div class='add'>+#define REG_MRCM	0xc38</div><div class='add'>+#define REG_AGCSWSH	0xc44</div><div class='add'>+#define REG_ANTWTPD	0xc54</div><div class='add'>+#define REG_ORITXCODE	0x1800</div><div class='add'>+#define REG_3WIRE	0x180c</div><div class='add'>+#define BIT_3WIRE_TX_EN		BIT(0)</div><div class='add'>+#define BIT_3WIRE_RX_EN		BIT(1)</div><div class='add'>+#define BIT_3WIRE_PI_ON		BIT(28)</div><div class='add'>+#define REG_RXAGCCTL0	0x18ac</div><div class='add'>+#define REG_CCKSB	0x1a00</div><div class='add'>+#define REG_RXCCKSEL	0x1a04</div><div class='add'>+#define REG_BGCTRL	0x1a14</div><div class='add'>+#define BITS_RX_IQ_WEIGHT	(BIT(8) | BIT(9))</div><div class='add'>+#define REG_TXF0	0x1a20</div><div class='add'>+#define REG_TXF1	0x1a24</div><div class='add'>+#define REG_TXF2	0x1a28</div><div class='add'>+#define REG_CCANRX	0x1a2c</div><div class='add'>+#define BIT_CCK_FA_RST		(BIT(14) | BIT(15))</div><div class='add'>+#define BIT_OFDM_FA_RST		(BIT(12) | BIT(13))</div><div class='add'>+#define REG_CCK_FACNT	0x1a5c</div><div class='add'>+#define REG_CCKTXONLY	0x1a80</div><div class='add'>+#define BIT_BB_CCK_CHECK_EN	BIT(18)</div><div class='add'>+#define REG_TXF3	0x1a98</div><div class='add'>+#define REG_TXF4	0x1a9c</div><div class='add'>+#define REG_TXF5	0x1aa0</div><div class='add'>+#define REG_TXF6	0x1aac</div><div class='add'>+#define REG_TXF7	0x1ab0</div><div class='add'>+#define REG_TXANT	0x1c28</div><div class='add'>+#define REG_ENCCK	0x1c3c</div><div class='add'>+#define BIT_CCK_BLK_EN		BIT(1)</div><div class='add'>+#define BIT_CCK_OFDM_BLK_EN	(BIT(0) | BIT(1))</div><div class='add'>+#define REG_CCAMSK	0x1c80</div><div class='add'>+#define REG_RXFNCTL	0x1d30</div><div class='add'>+#define REG_RXIGI	0x1d70</div><div class='add'>+#define REG_ENFN	0x1e24</div><div class='add'>+#define REG_TXANTSEG	0x1e28</div><div class='add'>+#define REG_TXLGMAP	0x1e2c</div><div class='add'>+#define REG_CCKPATH	0x1e5c</div><div class='add'>+#define REG_CNT_CTRL	0x1eb4</div><div class='add'>+#define BIT_ALL_CNT_RST		BIT(25)</div><div class='add'>+#define REG_OFDM_FACNT	0x2d00</div><div class='add'>+#define REG_OFDM_TXCNT	0x2de0</div><div class='add'>+#define REG_ORITXCODE2	0x4100</div><div class='add'>+#define REG_3WIRE2	0x410c</div><div class='add'>+#define REG_RXAGCCTL	0x41ac</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c<br/>new file mode 100644<br/>index 000000000000..49044f510c6c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.c</a></div><div class='hunk'>@@ -0,0 +1,11753 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "rtw8822c_table.h"</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_mac[] = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822c_mac, rtw_phy_cfg_mac);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_agc[] = {</div><div class='add'>+		0x1D90, 0x300001FF,</div><div class='add'>+		0x1D90, 0x300101FF,</div><div class='add'>+		0x1D90, 0x300201FE,</div><div class='add'>+		0x1D90, 0x300301FD,</div><div class='add'>+		0x1D90, 0x300401FC,</div><div class='add'>+		0x1D90, 0x300501FB,</div><div class='add'>+		0x1D90, 0x300601FA,</div><div class='add'>+		0x1D90, 0x300701F9,</div><div class='add'>+		0x1D90, 0x300801F8,</div><div class='add'>+		0x1D90, 0x300901F7,</div><div class='add'>+		0x1D90, 0x300A01F6,</div><div class='add'>+		0x1D90, 0x300B01F5,</div><div class='add'>+		0x1D90, 0x300C01F4,</div><div class='add'>+		0x1D90, 0x300D01F3,</div><div class='add'>+		0x1D90, 0x300E01F2,</div><div class='add'>+		0x1D90, 0x300F01F1,</div><div class='add'>+		0x1D90, 0x301001F0,</div><div class='add'>+		0x1D90, 0x301101EF,</div><div class='add'>+		0x1D90, 0x301201EE,</div><div class='add'>+		0x1D90, 0x301301ED,</div><div class='add'>+		0x1D90, 0x301401EC,</div><div class='add'>+		0x1D90, 0x301501EB,</div><div class='add'>+		0x1D90, 0x30160192,</div><div class='add'>+		0x1D90, 0x30170191,</div><div class='add'>+		0x1D90, 0x30180190,</div><div class='add'>+		0x1D90, 0x3019018F,</div><div class='add'>+		0x1D90, 0x301A018E,</div><div class='add'>+		0x1D90, 0x301B018D,</div><div class='add'>+		0x1D90, 0x301C018C,</div><div class='add'>+		0x1D90, 0x301D018B,</div><div class='add'>+		0x1D90, 0x301E018A,</div><div class='add'>+		0x1D90, 0x301F0189,</div><div class='add'>+		0x1D90, 0x30200188,</div><div class='add'>+		0x1D90, 0x30210187,</div><div class='add'>+		0x1D90, 0x30220186,</div><div class='add'>+		0x1D90, 0x30230185,</div><div class='add'>+		0x1D90, 0x3024014B,</div><div class='add'>+		0x1D90, 0x3025014A,</div><div class='add'>+		0x1D90, 0x30260149,</div><div class='add'>+		0x1D90, 0x30270148,</div><div class='add'>+		0x1D90, 0x30280147,</div><div class='add'>+		0x1D90, 0x30290146,</div><div class='add'>+		0x1D90, 0x302A0145,</div><div class='add'>+		0x1D90, 0x302B0144,</div><div class='add'>+		0x1D90, 0x302C0143,</div><div class='add'>+		0x1D90, 0x302D0142,</div><div class='add'>+		0x1D90, 0x302E00C8,</div><div class='add'>+		0x1D90, 0x302F00C7,</div><div class='add'>+		0x1D90, 0x303000C6,</div><div class='add'>+		0x1D90, 0x303100C5,</div><div class='add'>+		0x1D90, 0x303200C4,</div><div class='add'>+		0x1D90, 0x30330088,</div><div class='add'>+		0x1D90, 0x30340087,</div><div class='add'>+		0x1D90, 0x30350086,</div><div class='add'>+		0x1D90, 0x30360045,</div><div class='add'>+		0x1D90, 0x30370044,</div><div class='add'>+		0x1D90, 0x30380043,</div><div class='add'>+		0x1D90, 0x30390023,</div><div class='add'>+		0x1D90, 0x303A0022,</div><div class='add'>+		0x1D90, 0x303B0021,</div><div class='add'>+		0x1D90, 0x303C0020,</div><div class='add'>+		0x1D90, 0x303D0002,</div><div class='add'>+		0x1D90, 0x303E0001,</div><div class='add'>+		0x1D90, 0x303F0000,</div><div class='add'>+		0x1D90, 0x304000FF,</div><div class='add'>+		0x1D90, 0x304100FF,</div><div class='add'>+		0x1D90, 0x304200FF,</div><div class='add'>+		0x1D90, 0x304300FF,</div><div class='add'>+		0x1D90, 0x304400FE,</div><div class='add'>+		0x1D90, 0x304500FD,</div><div class='add'>+		0x1D90, 0x304600FC,</div><div class='add'>+		0x1D90, 0x304700FB,</div><div class='add'>+		0x1D90, 0x304800FA,</div><div class='add'>+		0x1D90, 0x304900F9,</div><div class='add'>+		0x1D90, 0x304A00F8,</div><div class='add'>+		0x1D90, 0x304B00F7,</div><div class='add'>+		0x1D90, 0x304C00F6,</div><div class='add'>+		0x1D90, 0x304D00F5,</div><div class='add'>+		0x1D90, 0x304E00F4,</div><div class='add'>+		0x1D90, 0x304F00F3,</div><div class='add'>+		0x1D90, 0x305000F2,</div><div class='add'>+		0x1D90, 0x305100F1,</div><div class='add'>+		0x1D90, 0x305200F0,</div><div class='add'>+		0x1D90, 0x305300EF,</div><div class='add'>+		0x1D90, 0x305400EE,</div><div class='add'>+		0x1D90, 0x305500ED,</div><div class='add'>+		0x1D90, 0x305600EC,</div><div class='add'>+		0x1D90, 0x305700EB,</div><div class='add'>+		0x1D90, 0x305800EA,</div><div class='add'>+		0x1D90, 0x305900E9,</div><div class='add'>+		0x1D90, 0x305A00E8,</div><div class='add'>+		0x1D90, 0x305B00E7,</div><div class='add'>+		0x1D90, 0x305C00E6,</div><div class='add'>+		0x1D90, 0x305D00C7,</div><div class='add'>+		0x1D90, 0x305E00C6,</div><div class='add'>+		0x1D90, 0x305F00C5,</div><div class='add'>+		0x1D90, 0x306000C4,</div><div class='add'>+		0x1D90, 0x306100C3,</div><div class='add'>+		0x1D90, 0x306200C2,</div><div class='add'>+		0x1D90, 0x306300A4,</div><div class='add'>+		0x1D90, 0x306400A3,</div><div class='add'>+		0x1D90, 0x306500A2,</div><div class='add'>+		0x1D90, 0x30660086,</div><div class='add'>+		0x1D90, 0x30670085,</div><div class='add'>+		0x1D90, 0x30680084,</div><div class='add'>+		0x1D90, 0x30690083,</div><div class='add'>+		0x1D90, 0x306A0082,</div><div class='add'>+		0x1D90, 0x306B0069,</div><div class='add'>+		0x1D90, 0x306C0068,</div><div class='add'>+		0x1D90, 0x306D0067,</div><div class='add'>+		0x1D90, 0x306E0066,</div><div class='add'>+		0x1D90, 0x306F0065,</div><div class='add'>+		0x1D90, 0x30700064,</div><div class='add'>+		0x1D90, 0x30710063,</div><div class='add'>+		0x1D90, 0x30720044,</div><div class='add'>+		0x1D90, 0x30730043,</div><div class='add'>+		0x1D90, 0x30740042,</div><div class='add'>+		0x1D90, 0x30750025,</div><div class='add'>+		0x1D90, 0x30760024,</div><div class='add'>+		0x1D90, 0x30770023,</div><div class='add'>+		0x1D90, 0x30780022,</div><div class='add'>+		0x1D90, 0x30790021,</div><div class='add'>+		0x1D90, 0x307A0020,</div><div class='add'>+		0x1D90, 0x307B0003,</div><div class='add'>+		0x1D90, 0x307C0002,</div><div class='add'>+		0x1D90, 0x307D0001,</div><div class='add'>+		0x1D90, 0x307E0000,</div><div class='add'>+		0x1D90, 0x307F0000,</div><div class='add'>+		0x1D90, 0x308000FF,</div><div class='add'>+		0x1D90, 0x308100FF,</div><div class='add'>+		0x1D90, 0x308200FF,</div><div class='add'>+		0x1D90, 0x308300FF,</div><div class='add'>+		0x1D90, 0x308400FE,</div><div class='add'>+		0x1D90, 0x308500FD,</div><div class='add'>+		0x1D90, 0x308600FC,</div><div class='add'>+		0x1D90, 0x308700FB,</div><div class='add'>+		0x1D90, 0x308800FA,</div><div class='add'>+		0x1D90, 0x308900F9,</div><div class='add'>+		0x1D90, 0x308A00F8,</div><div class='add'>+		0x1D90, 0x308B00F7,</div><div class='add'>+		0x1D90, 0x308C00F6,</div><div class='add'>+		0x1D90, 0x308D00F5,</div><div class='add'>+		0x1D90, 0x308E00F4,</div><div class='add'>+		0x1D90, 0x308F00F3,</div><div class='add'>+		0x1D90, 0x309000F2,</div><div class='add'>+		0x1D90, 0x309100F1,</div><div class='add'>+		0x1D90, 0x309200F0,</div><div class='add'>+		0x1D90, 0x309300EF,</div><div class='add'>+		0x1D90, 0x309400EE,</div><div class='add'>+		0x1D90, 0x309500ED,</div><div class='add'>+		0x1D90, 0x309600EC,</div><div class='add'>+		0x1D90, 0x309700EB,</div><div class='add'>+		0x1D90, 0x309800EA,</div><div class='add'>+		0x1D90, 0x309900E9,</div><div class='add'>+		0x1D90, 0x309A00E8,</div><div class='add'>+		0x1D90, 0x309B00E7,</div><div class='add'>+		0x1D90, 0x309C00E6,</div><div class='add'>+		0x1D90, 0x309D00C7,</div><div class='add'>+		0x1D90, 0x309E00C6,</div><div class='add'>+		0x1D90, 0x309F00C5,</div><div class='add'>+		0x1D90, 0x30A000C4,</div><div class='add'>+		0x1D90, 0x30A100C3,</div><div class='add'>+		0x1D90, 0x30A200C2,</div><div class='add'>+		0x1D90, 0x30A300A4,</div><div class='add'>+		0x1D90, 0x30A400A3,</div><div class='add'>+		0x1D90, 0x30A500A2,</div><div class='add'>+		0x1D90, 0x30A60086,</div><div class='add'>+		0x1D90, 0x30A70085,</div><div class='add'>+		0x1D90, 0x30A80084,</div><div class='add'>+		0x1D90, 0x30A90083,</div><div class='add'>+		0x1D90, 0x30AA0082,</div><div class='add'>+		0x1D90, 0x30AB0069,</div><div class='add'>+		0x1D90, 0x30AC0068,</div><div class='add'>+		0x1D90, 0x30AD0067,</div><div class='add'>+		0x1D90, 0x30AE0066,</div><div class='add'>+		0x1D90, 0x30AF0065,</div><div class='add'>+		0x1D90, 0x30B00064,</div><div class='add'>+		0x1D90, 0x30B10063,</div><div class='add'>+		0x1D90, 0x30B20044,</div><div class='add'>+		0x1D90, 0x30B30043,</div><div class='add'>+		0x1D90, 0x30B40042,</div><div class='add'>+		0x1D90, 0x30B50025,</div><div class='add'>+		0x1D90, 0x30B60024,</div><div class='add'>+		0x1D90, 0x30B70023,</div><div class='add'>+		0x1D90, 0x30B80022,</div><div class='add'>+		0x1D90, 0x30B90021,</div><div class='add'>+		0x1D90, 0x30BA0020,</div><div class='add'>+		0x1D90, 0x30BB0003,</div><div class='add'>+		0x1D90, 0x30BC0002,</div><div class='add'>+		0x1D90, 0x30BD0001,</div><div class='add'>+		0x1D90, 0x30BE0000,</div><div class='add'>+		0x1D90, 0x30BF0000,</div><div class='add'>+		0x1D90, 0x30C000FF,</div><div class='add'>+		0x1D90, 0x30C100FF,</div><div class='add'>+		0x1D90, 0x30C200FF,</div><div class='add'>+		0x1D90, 0x30C300FF,</div><div class='add'>+		0x1D90, 0x30C400FE,</div><div class='add'>+		0x1D90, 0x30C500FD,</div><div class='add'>+		0x1D90, 0x30C600FC,</div><div class='add'>+		0x1D90, 0x30C700FB,</div><div class='add'>+		0x1D90, 0x30C800FA,</div><div class='add'>+		0x1D90, 0x30C900F9,</div><div class='add'>+		0x1D90, 0x30CA00F8,</div><div class='add'>+		0x1D90, 0x30CB00F7,</div><div class='add'>+		0x1D90, 0x30CC00F6,</div><div class='add'>+		0x1D90, 0x30CD00F5,</div><div class='add'>+		0x1D90, 0x30CE00F4,</div><div class='add'>+		0x1D90, 0x30CF00F3,</div><div class='add'>+		0x1D90, 0x30D000F2,</div><div class='add'>+		0x1D90, 0x30D100F1,</div><div class='add'>+		0x1D90, 0x30D200F0,</div><div class='add'>+		0x1D90, 0x30D300EF,</div><div class='add'>+		0x1D90, 0x30D400EE,</div><div class='add'>+		0x1D90, 0x30D500ED,</div><div class='add'>+		0x1D90, 0x30D600EC,</div><div class='add'>+		0x1D90, 0x30D700EB,</div><div class='add'>+		0x1D90, 0x30D800EA,</div><div class='add'>+		0x1D90, 0x30D900E9,</div><div class='add'>+		0x1D90, 0x30DA00E8,</div><div class='add'>+		0x1D90, 0x30DB00E7,</div><div class='add'>+		0x1D90, 0x30DC00E6,</div><div class='add'>+		0x1D90, 0x30DD00C7,</div><div class='add'>+		0x1D90, 0x30DE00C6,</div><div class='add'>+		0x1D90, 0x30DF00C5,</div><div class='add'>+		0x1D90, 0x30E000C4,</div><div class='add'>+		0x1D90, 0x30E100C3,</div><div class='add'>+		0x1D90, 0x30E200C2,</div><div class='add'>+		0x1D90, 0x30E300A4,</div><div class='add'>+		0x1D90, 0x30E400A3,</div><div class='add'>+		0x1D90, 0x30E500A2,</div><div class='add'>+		0x1D90, 0x30E60086,</div><div class='add'>+		0x1D90, 0x30E70085,</div><div class='add'>+		0x1D90, 0x30E80084,</div><div class='add'>+		0x1D90, 0x30E90083,</div><div class='add'>+		0x1D90, 0x30EA0082,</div><div class='add'>+		0x1D90, 0x30EB0069,</div><div class='add'>+		0x1D90, 0x30EC0068,</div><div class='add'>+		0x1D90, 0x30ED0067,</div><div class='add'>+		0x1D90, 0x30EE0066,</div><div class='add'>+		0x1D90, 0x30EF0065,</div><div class='add'>+		0x1D90, 0x30F00064,</div><div class='add'>+		0x1D90, 0x30F10063,</div><div class='add'>+		0x1D90, 0x30F20044,</div><div class='add'>+		0x1D90, 0x30F30043,</div><div class='add'>+		0x1D90, 0x30F40042,</div><div class='add'>+		0x1D90, 0x30F50025,</div><div class='add'>+		0x1D90, 0x30F60024,</div><div class='add'>+		0x1D90, 0x30F70023,</div><div class='add'>+		0x1D90, 0x30F80022,</div><div class='add'>+		0x1D90, 0x30F90021,</div><div class='add'>+		0x1D90, 0x30FA0020,</div><div class='add'>+		0x1D90, 0x30FB0003,</div><div class='add'>+		0x1D90, 0x30FC0002,</div><div class='add'>+		0x1D90, 0x30FD0001,</div><div class='add'>+		0x1D90, 0x30FE0000,</div><div class='add'>+		0x1D90, 0x30FF0000,</div><div class='add'>+		0x1D90, 0x310001FF,</div><div class='add'>+		0x1D90, 0x310101FF,</div><div class='add'>+		0x1D90, 0x310201FF,</div><div class='add'>+		0x1D90, 0x310301FF,</div><div class='add'>+		0x1D90, 0x310401FF,</div><div class='add'>+		0x1D90, 0x310501FF,</div><div class='add'>+		0x1D90, 0x310601FF,</div><div class='add'>+		0x1D90, 0x310701FF,</div><div class='add'>+		0x1D90, 0x310801FF,</div><div class='add'>+		0x1D90, 0x310901FE,</div><div class='add'>+		0x1D90, 0x310A01FD,</div><div class='add'>+		0x1D90, 0x310B01FC,</div><div class='add'>+		0x1D90, 0x310C01FB,</div><div class='add'>+		0x1D90, 0x310D01FA,</div><div class='add'>+		0x1D90, 0x310E01F9,</div><div class='add'>+		0x1D90, 0x310F01F8,</div><div class='add'>+		0x1D90, 0x311001F7,</div><div class='add'>+		0x1D90, 0x311101F6,</div><div class='add'>+		0x1D90, 0x311201F5,</div><div class='add'>+		0x1D90, 0x311301F4,</div><div class='add'>+		0x1D90, 0x311401F3,</div><div class='add'>+		0x1D90, 0x311501F2,</div><div class='add'>+		0x1D90, 0x311601F1,</div><div class='add'>+		0x1D90, 0x311701F0,</div><div class='add'>+		0x1D90, 0x311801EF,</div><div class='add'>+		0x1D90, 0x311901EE,</div><div class='add'>+		0x1D90, 0x311A01ED,</div><div class='add'>+		0x1D90, 0x311B01EC,</div><div class='add'>+		0x1D90, 0x311C01EB,</div><div class='add'>+		0x1D90, 0x311D0192,</div><div class='add'>+		0x1D90, 0x311E0191,</div><div class='add'>+		0x1D90, 0x311F0190,</div><div class='add'>+		0x1D90, 0x3120018F,</div><div class='add'>+		0x1D90, 0x3121018E,</div><div class='add'>+		0x1D90, 0x3122018D,</div><div class='add'>+		0x1D90, 0x3123018C,</div><div class='add'>+		0x1D90, 0x3124018B,</div><div class='add'>+		0x1D90, 0x3125018A,</div><div class='add'>+		0x1D90, 0x31260189,</div><div class='add'>+		0x1D90, 0x31270188,</div><div class='add'>+		0x1D90, 0x31280187,</div><div class='add'>+		0x1D90, 0x31290186,</div><div class='add'>+		0x1D90, 0x312A0185,</div><div class='add'>+		0x1D90, 0x312B0149,</div><div class='add'>+		0x1D90, 0x312C0148,</div><div class='add'>+		0x1D90, 0x312D0147,</div><div class='add'>+		0x1D90, 0x312E0146,</div><div class='add'>+		0x1D90, 0x312F0145,</div><div class='add'>+		0x1D90, 0x31300144,</div><div class='add'>+		0x1D90, 0x31310143,</div><div class='add'>+		0x1D90, 0x31320142,</div><div class='add'>+		0x1D90, 0x31330141,</div><div class='add'>+		0x1D90, 0x31340140,</div><div class='add'>+		0x1D90, 0x313500C7,</div><div class='add'>+		0x1D90, 0x313600C6,</div><div class='add'>+		0x1D90, 0x313700C5,</div><div class='add'>+		0x1D90, 0x313800C4,</div><div class='add'>+		0x1D90, 0x313900C3,</div><div class='add'>+		0x1D90, 0x313A0088,</div><div class='add'>+		0x1D90, 0x313B0087,</div><div class='add'>+		0x1D90, 0x313C0086,</div><div class='add'>+		0x1D90, 0x313D0045,</div><div class='add'>+		0x1D90, 0x313E0044,</div><div class='add'>+		0x1D90, 0x313F0043,</div><div class='add'>+		0x1D90, 0x314001FF,</div><div class='add'>+		0x1D90, 0x314101FF,</div><div class='add'>+		0x1D90, 0x314201FF,</div><div class='add'>+		0x1D90, 0x314301FF,</div><div class='add'>+		0x1D90, 0x314401FF,</div><div class='add'>+		0x1D90, 0x314501FF,</div><div class='add'>+		0x1D90, 0x314601FF,</div><div class='add'>+		0x1D90, 0x314701FE,</div><div class='add'>+		0x1D90, 0x314801FD,</div><div class='add'>+		0x1D90, 0x314901FC,</div><div class='add'>+		0x1D90, 0x314A01FB,</div><div class='add'>+		0x1D90, 0x314B01FA,</div><div class='add'>+		0x1D90, 0x314C01F9,</div><div class='add'>+		0x1D90, 0x314D01F8,</div><div class='add'>+		0x1D90, 0x314E01F7,</div><div class='add'>+		0x1D90, 0x314F01F6,</div><div class='add'>+		0x1D90, 0x315001F5,</div><div class='add'>+		0x1D90, 0x315101F4,</div><div class='add'>+		0x1D90, 0x315201F3,</div><div class='add'>+		0x1D90, 0x315301F2,</div><div class='add'>+		0x1D90, 0x315401F1,</div><div class='add'>+		0x1D90, 0x315501F0,</div><div class='add'>+		0x1D90, 0x315601EF,</div><div class='add'>+		0x1D90, 0x315701EE,</div><div class='add'>+		0x1D90, 0x315801ED,</div><div class='add'>+		0x1D90, 0x315901EC,</div><div class='add'>+		0x1D90, 0x315A01EB,</div><div class='add'>+		0x1D90, 0x315B01EA,</div><div class='add'>+		0x1D90, 0x315C01E9,</div><div class='add'>+		0x1D90, 0x315D018F,</div><div class='add'>+		0x1D90, 0x315E018E,</div><div class='add'>+		0x1D90, 0x315F018D,</div><div class='add'>+		0x1D90, 0x3160018C,</div><div class='add'>+		0x1D90, 0x3161018B,</div><div class='add'>+		0x1D90, 0x3162018A,</div><div class='add'>+		0x1D90, 0x31630189,</div><div class='add'>+		0x1D90, 0x31640188,</div><div class='add'>+		0x1D90, 0x31650187,</div><div class='add'>+		0x1D90, 0x31660186,</div><div class='add'>+		0x1D90, 0x31670185,</div><div class='add'>+		0x1D90, 0x31680184,</div><div class='add'>+		0x1D90, 0x31690183,</div><div class='add'>+		0x1D90, 0x316A0182,</div><div class='add'>+		0x1D90, 0x316B0149,</div><div class='add'>+		0x1D90, 0x316C0148,</div><div class='add'>+		0x1D90, 0x316D0147,</div><div class='add'>+		0x1D90, 0x316E0146,</div><div class='add'>+		0x1D90, 0x316F0145,</div><div class='add'>+		0x1D90, 0x31700144,</div><div class='add'>+		0x1D90, 0x31710143,</div><div class='add'>+		0x1D90, 0x31720142,</div><div class='add'>+		0x1D90, 0x31730141,</div><div class='add'>+		0x1D90, 0x31740140,</div><div class='add'>+		0x1D90, 0x317500C7,</div><div class='add'>+		0x1D90, 0x317600C6,</div><div class='add'>+		0x1D90, 0x317700C5,</div><div class='add'>+		0x1D90, 0x317800C4,</div><div class='add'>+		0x1D90, 0x317900C3,</div><div class='add'>+		0x1D90, 0x317A0088,</div><div class='add'>+		0x1D90, 0x317B0087,</div><div class='add'>+		0x1D90, 0x317C0086,</div><div class='add'>+		0x1D90, 0x317D0045,</div><div class='add'>+		0x1D90, 0x317E0044,</div><div class='add'>+		0x1D90, 0x317F0043,</div><div class='add'>+		0x1D90, 0x318001FE,</div><div class='add'>+		0x1D90, 0x318101FD,</div><div class='add'>+		0x1D90, 0x318201FC,</div><div class='add'>+		0x1D90, 0x318301FB,</div><div class='add'>+		0x1D90, 0x318401FA,</div><div class='add'>+		0x1D90, 0x318501F9,</div><div class='add'>+		0x1D90, 0x318601F8,</div><div class='add'>+		0x1D90, 0x318701F7,</div><div class='add'>+		0x1D90, 0x318801F6,</div><div class='add'>+		0x1D90, 0x318901F5,</div><div class='add'>+		0x1D90, 0x318A01F4,</div><div class='add'>+		0x1D90, 0x318B01F3,</div><div class='add'>+		0x1D90, 0x318C01F2,</div><div class='add'>+		0x1D90, 0x318D01F1,</div><div class='add'>+		0x1D90, 0x318E01F0,</div><div class='add'>+		0x1D90, 0x318F01EF,</div><div class='add'>+		0x1D90, 0x319001EE,</div><div class='add'>+		0x1D90, 0x319101ED,</div><div class='add'>+		0x1D90, 0x319201EC,</div><div class='add'>+		0x1D90, 0x319301EB,</div><div class='add'>+		0x1D90, 0x319401EA,</div><div class='add'>+		0x1D90, 0x319501E9,</div><div class='add'>+		0x1D90, 0x3196018F,</div><div class='add'>+		0x1D90, 0x3197018E,</div><div class='add'>+		0x1D90, 0x3198018D,</div><div class='add'>+		0x1D90, 0x3199018C,</div><div class='add'>+		0x1D90, 0x319A018B,</div><div class='add'>+		0x1D90, 0x319B018A,</div><div class='add'>+		0x1D90, 0x319C0189,</div><div class='add'>+		0x1D90, 0x319D0188,</div><div class='add'>+		0x1D90, 0x319E0187,</div><div class='add'>+		0x1D90, 0x319F0186,</div><div class='add'>+		0x1D90, 0x31A00185,</div><div class='add'>+		0x1D90, 0x31A10184,</div><div class='add'>+		0x1D90, 0x31A20183,</div><div class='add'>+		0x1D90, 0x31A30182,</div><div class='add'>+		0x1D90, 0x31A40149,</div><div class='add'>+		0x1D90, 0x31A50148,</div><div class='add'>+		0x1D90, 0x31A60147,</div><div class='add'>+		0x1D90, 0x31A70146,</div><div class='add'>+		0x1D90, 0x31A80145,</div><div class='add'>+		0x1D90, 0x31A90144,</div><div class='add'>+		0x1D90, 0x31AA0143,</div><div class='add'>+		0x1D90, 0x31AB0142,</div><div class='add'>+		0x1D90, 0x31AC0141,</div><div class='add'>+		0x1D90, 0x31AD0140,</div><div class='add'>+		0x1D90, 0x31AE00C7,</div><div class='add'>+		0x1D90, 0x31AF00C6,</div><div class='add'>+		0x1D90, 0x31B000C5,</div><div class='add'>+		0x1D90, 0x31B100C4,</div><div class='add'>+		0x1D90, 0x31B200C3,</div><div class='add'>+		0x1D90, 0x31B30088,</div><div class='add'>+		0x1D90, 0x31B40087,</div><div class='add'>+		0x1D90, 0x31B50086,</div><div class='add'>+		0x1D90, 0x31B60045,</div><div class='add'>+		0x1D90, 0x31B70044,</div><div class='add'>+		0x1D90, 0x31B80043,</div><div class='add'>+		0x1D90, 0x31B90023,</div><div class='add'>+		0x1D90, 0x31BA0022,</div><div class='add'>+		0x1D90, 0x31BB0021,</div><div class='add'>+		0x1D90, 0x31BC0020,</div><div class='add'>+		0x1D90, 0x31BD0002,</div><div class='add'>+		0x1D90, 0x31BE0001,</div><div class='add'>+		0x1D90, 0x31BF0000,</div><div class='add'>+		0x1D70, 0x22222222,</div><div class='add'>+		0x1D70, 0x20202020,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822c_agc, rtw_phy_cfg_agc);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_bb[] = {</div><div class='add'>+		0x1D0C, 0x00410000,</div><div class='add'>+		0x1C3C, 0x01038040,</div><div class='add'>+		0x1C90, 0x00E49708,</div><div class='add'>+		0x800, 0x00000000,</div><div class='add'>+		0x804, 0xD6300000,</div><div class='add'>+		0x808, 0x60956093,</div><div class='add'>+		0x80C, 0x00000025,</div><div class='add'>+		0x810, 0x11B019B0,</div><div class='add'>+		0x814, 0x00904080,</div><div class='add'>+		0x818, 0xC30056F1,</div><div class='add'>+		0x81C, 0x00050000,</div><div class='add'>+		0x820, 0x11111133,</div><div class='add'>+		0x824, 0xC3C3CCC4,</div><div class='add'>+		0x828, 0x30FB186C,</div><div class='add'>+		0x82C, 0x185D6556,</div><div class='add'>+		0x830, 0x1751145B,</div><div class='add'>+		0x834, 0x776995D7,</div><div class='add'>+		0x838, 0x74777A7D,</div><div class='add'>+		0x83C, 0xF9AA9982,</div><div class='add'>+		0x840, 0x89AA9ABB,</div><div class='add'>+		0x844, 0x0DEEDDC1,</div><div class='add'>+		0x848, 0xCDEEDEFF,</div><div class='add'>+		0x84C, 0xFFFF5555,</div><div class='add'>+		0x850, 0x6F7A727D,</div><div class='add'>+		0x854, 0x6C776F7A,</div><div class='add'>+		0x858, 0x6F7A6C77,</div><div class='add'>+		0x85C, 0x69746974,</div><div class='add'>+		0x860, 0x6F7A6C77,</div><div class='add'>+		0x864, 0x6C776C77,</div><div class='add'>+		0x868, 0x727D6F7A,</div><div class='add'>+		0x86C, 0x69D7B196,</div><div class='add'>+		0x870, 0x1A6D769B,</div><div class='add'>+		0x874, 0x55823917,</div><div class='add'>+		0x878, 0x00C025BD,</div><div class='add'>+		0x87C, 0x4140557D,</div><div class='add'>+		0x880, 0x9A1D9D47,</div><div class='add'>+		0x884, 0x1DE7134F,</div><div class='add'>+		0x888, 0x2857A857,</div><div class='add'>+		0x88C, 0x520E8A24,</div><div class='add'>+		0x890, 0x8F628C44,</div><div class='add'>+		0x894, 0x72745F43,</div><div class='add'>+		0x898, 0x03F02F0D,</div><div class='add'>+		0x89C, 0x5DB6886F,</div><div class='add'>+		0x8A0, 0x07DC309F,</div><div class='add'>+		0x8A4, 0x09412495,</div><div class='add'>+		0x8A8, 0x222222A9,</div><div class='add'>+		0x8AC, 0x89628C44,</div><div class='add'>+		0x8B0, 0x72745F43,</div><div class='add'>+		0x8B4, 0x03F02F0D,</div><div class='add'>+		0x8B8, 0x55B6886F,</div><div class='add'>+		0x8BC, 0x07D0309F,</div><div class='add'>+		0x8C0, 0x70404023,</div><div class='add'>+		0x8C4, 0x00440001,</div><div class='add'>+		0x8C8, 0x7A7A2E26,</div><div class='add'>+		0x8CC, 0x25297777,</div><div class='add'>+		0x8D0, 0x6CEB6DCE,</div><div class='add'>+		0x8D4, 0x0005A632,</div><div class='add'>+		0x8D8, 0x00000000,</div><div class='add'>+		0x8DC, 0x00000000,</div><div class='add'>+		0x8E0, 0x00000000,</div><div class='add'>+		0x8E4, 0x00000000,</div><div class='add'>+		0x8E8, 0x00000000,</div><div class='add'>+		0x8EC, 0x00000000,</div><div class='add'>+		0x8F0, 0x00000000,</div><div class='add'>+		0x8F4, 0x00000000,</div><div class='add'>+		0x8F8, 0x25239843,</div><div class='add'>+		0x900, 0x00000000,</div><div class='add'>+		0x904, 0x00000000,</div><div class='add'>+		0x908, 0x000008CB,</div><div class='add'>+		0x90C, 0x00000000,</div><div class='add'>+		0x910, 0x00000000,</div><div class='add'>+		0x914, 0x20000000,</div><div class='add'>+		0x918, 0x20000000,</div><div class='add'>+		0x91C, 0x20000000,</div><div class='add'>+		0x920, 0x20000000,</div><div class='add'>+		0x924, 0x00000000,</div><div class='add'>+		0x928, 0x0000003A,</div><div class='add'>+		0x92C, 0x0000003A,</div><div class='add'>+		0x930, 0x0000003A,</div><div class='add'>+		0x934, 0x0000003A,</div><div class='add'>+		0x938, 0x0000000F,</div><div class='add'>+		0x93C, 0x00000000,</div><div class='add'>+		0x940, 0x4E1F3E81,</div><div class='add'>+		0x944, 0x4E1F3E81,</div><div class='add'>+		0x948, 0x4E1F3E81,</div><div class='add'>+		0x94C, 0x4E1F3E81,</div><div class='add'>+		0x950, 0x03020100,</div><div class='add'>+		0x954, 0x07060504,</div><div class='add'>+		0x958, 0x0B0A0908,</div><div class='add'>+		0x95C, 0x0F0E0D0C,</div><div class='add'>+		0x960, 0x13121110,</div><div class='add'>+		0x964, 0x17161514,</div><div class='add'>+		0x968, 0x03020100,</div><div class='add'>+		0x96C, 0x07060504,</div><div class='add'>+		0x970, 0x0B0A0908,</div><div class='add'>+		0x974, 0x0F0E0D0C,</div><div class='add'>+		0x978, 0x13121110,</div><div class='add'>+		0x97C, 0x17161514,</div><div class='add'>+		0x980, 0x03020100,</div><div class='add'>+		0x984, 0x07060504,</div><div class='add'>+		0x988, 0x0B0A0908,</div><div class='add'>+		0x98C, 0x0F0E0D0C,</div><div class='add'>+		0x990, 0x13121110,</div><div class='add'>+		0x994, 0x17161514,</div><div class='add'>+		0x998, 0x03020100,</div><div class='add'>+		0x99C, 0x07060504,</div><div class='add'>+		0x9A0, 0x0B0A0908,</div><div class='add'>+		0x9A4, 0x0F0E0D0C,</div><div class='add'>+		0x9A8, 0x13121110,</div><div class='add'>+		0x9AC, 0x17161514,</div><div class='add'>+		0x9B0, 0x00002200,</div><div class='add'>+		0x9B4, 0xDB6FFF00,</div><div class='add'>+		0x9B8, 0x00400064,</div><div class='add'>+		0x9BC, 0x00000000,</div><div class='add'>+		0x9C0, 0x01010101,</div><div class='add'>+		0x9C4, 0x00640064,</div><div class='add'>+		0x9C8, 0x00640064,</div><div class='add'>+		0x9CC, 0x00007777,</div><div class='add'>+		0x9D0, 0x00000000,</div><div class='add'>+		0x9D4, 0x00000000,</div><div class='add'>+		0x9D8, 0x00000000,</div><div class='add'>+		0x9DC, 0x00000000,</div><div class='add'>+		0x9E0, 0x00000000,</div><div class='add'>+		0x9E4, 0x00000000,</div><div class='add'>+		0x9E8, 0x00000000,</div><div class='add'>+		0x9EC, 0x00000000,</div><div class='add'>+		0x9F0, 0x100024E0,</div><div class='add'>+		0x9F4, 0x00000000,</div><div class='add'>+		0x9F8, 0x00000000,</div><div class='add'>+		0xA00, 0x02001208,</div><div class='add'>+		0xA04, 0x00000000,</div><div class='add'>+		0xA08, 0x00000000,</div><div class='add'>+		0xA0C, 0x00000000,</div><div class='add'>+		0xA10, 0x00000000,</div><div class='add'>+		0xA14, 0x00000000,</div><div class='add'>+		0xA18, 0x00000000,</div><div class='add'>+		0xA1C, 0x00000000,</div><div class='add'>+		0xA20, 0xEB31B333,</div><div class='add'>+		0xA24, 0x00275485,</div><div class='add'>+		0xA28, 0x00166366,</div><div class='add'>+		0xA2C, 0x00275485,</div><div class='add'>+		0xA30, 0x00166366,</div><div class='add'>+		0xA34, 0x00275485,</div><div class='add'>+		0xA38, 0x00200400,</div><div class='add'>+		0xA3C, 0x00200400,</div><div class='add'>+		0xA40, 0xB35DC5BD,</div><div class='add'>+		0xA44, 0x3033BEBD,</div><div class='add'>+		0xA48, 0x2A521254,</div><div class='add'>+		0xA4C, 0xA2733345,</div><div class='add'>+		0xA50, 0x617BE003,</div><div class='add'>+		0xA54, 0x50000968,</div><div class='add'>+		0xA58, 0x00020000,</div><div class='add'>+		0xA5C, 0x01000000,</div><div class='add'>+		0xA60, 0x02000000,</div><div class='add'>+		0xA64, 0x03000000,</div><div class='add'>+		0xA68, 0x00020000,</div><div class='add'>+		0xA6C, 0x00000000,</div><div class='add'>+		0xA70, 0x00000000,</div><div class='add'>+		0xA74, 0x00000000,</div><div class='add'>+		0xA78, 0x00000000,</div><div class='add'>+		0xA7C, 0x00000000,</div><div class='add'>+		0xA80, 0x00000000,</div><div class='add'>+		0xA84, 0x00000000,</div><div class='add'>+		0xA88, 0x00000000,</div><div class='add'>+		0xA8C, 0x00000000,</div><div class='add'>+		0xA90, 0x00000000,</div><div class='add'>+		0xA94, 0x00000000,</div><div class='add'>+		0xA98, 0x00000000,</div><div class='add'>+		0xA9C, 0x00000000,</div><div class='add'>+		0xAA0, 0x00000000,</div><div class='add'>+		0xAA4, 0x00000000,</div><div class='add'>+		0xAA8, 0x00000000,</div><div class='add'>+		0xAAC, 0x00000000,</div><div class='add'>+		0xAB0, 0x00000000,</div><div class='add'>+		0xAB4, 0x00000000,</div><div class='add'>+		0xAB8, 0x00000000,</div><div class='add'>+		0xABC, 0x00000000,</div><div class='add'>+		0xAC0, 0x00000000,</div><div class='add'>+		0xAC4, 0x00000000,</div><div class='add'>+		0xAC8, 0x00000000,</div><div class='add'>+		0xACC, 0x00000000,</div><div class='add'>+		0xAD0, 0x00000000,</div><div class='add'>+		0xAD4, 0x00000000,</div><div class='add'>+		0xAD8, 0x00000000,</div><div class='add'>+		0xADC, 0x00000000,</div><div class='add'>+		0xAE0, 0x00000000,</div><div class='add'>+		0xAE4, 0x00000000,</div><div class='add'>+		0xAE8, 0x00000000,</div><div class='add'>+		0xAEC, 0x00000000,</div><div class='add'>+		0xAF0, 0x00000000,</div><div class='add'>+		0xAF4, 0x00000000,</div><div class='add'>+		0xAF8, 0x00000000,</div><div class='add'>+		0xB00, 0x00000000,</div><div class='add'>+		0xB04, 0x00000000,</div><div class='add'>+		0xB08, 0x00000000,</div><div class='add'>+		0xB0C, 0x00000000,</div><div class='add'>+		0xB10, 0x00000000,</div><div class='add'>+		0xB14, 0x00000000,</div><div class='add'>+		0xB18, 0x00000000,</div><div class='add'>+		0xB1C, 0x00000000,</div><div class='add'>+		0xB20, 0x00000000,</div><div class='add'>+		0xB24, 0x00000000,</div><div class='add'>+		0xB28, 0x00000000,</div><div class='add'>+		0xB2C, 0x00000000,</div><div class='add'>+		0xB30, 0x00000000,</div><div class='add'>+		0xB34, 0x00000000,</div><div class='add'>+		0xB38, 0x00000000,</div><div class='add'>+		0xB3C, 0x00000000,</div><div class='add'>+		0xB40, 0x00000000,</div><div class='add'>+		0xB44, 0x00000000,</div><div class='add'>+		0xB48, 0x00000000,</div><div class='add'>+		0xB4C, 0x00000000,</div><div class='add'>+		0xB50, 0x00000000,</div><div class='add'>+		0xB54, 0x00000000,</div><div class='add'>+		0xB58, 0x00060100,</div><div class='add'>+		0xB5C, 0x00000000,</div><div class='add'>+		0xB60, 0x00000000,</div><div class='add'>+		0xB64, 0x00000000,</div><div class='add'>+		0xB68, 0x00000000,</div><div class='add'>+		0xB6C, 0x00000000,</div><div class='add'>+		0xB70, 0x00000000,</div><div class='add'>+		0xB74, 0x00000000,</div><div class='add'>+		0xB78, 0x00000000,</div><div class='add'>+		0xB7C, 0x00000000,</div><div class='add'>+		0xB80, 0x00000000,</div><div class='add'>+		0xB84, 0x00000000,</div><div class='add'>+		0xB88, 0x00000000,</div><div class='add'>+		0xB8C, 0x00000000,</div><div class='add'>+		0xB90, 0x00000000,</div><div class='add'>+		0xB94, 0x00000000,</div><div class='add'>+		0xB98, 0x00000000,</div><div class='add'>+		0xB9C, 0x00000000,</div><div class='add'>+		0xBA0, 0x00000000,</div><div class='add'>+		0xBA4, 0x00000000,</div><div class='add'>+		0xBA8, 0x00000000,</div><div class='add'>+		0xBAC, 0x00000000,</div><div class='add'>+		0xBB0, 0x00000000,</div><div class='add'>+		0xBB4, 0x00000000,</div><div class='add'>+		0xBB8, 0x00000000,</div><div class='add'>+		0xBBC, 0x00000000,</div><div class='add'>+		0xBC0, 0x00000000,</div><div class='add'>+		0xBC4, 0x00000000,</div><div class='add'>+		0xBC8, 0x00000000,</div><div class='add'>+		0xBCC, 0x00000000,</div><div class='add'>+		0xBD0, 0x00000000,</div><div class='add'>+		0xBD4, 0x00000000,</div><div class='add'>+		0xBD8, 0x00000000,</div><div class='add'>+		0xBDC, 0x00000000,</div><div class='add'>+		0xBE0, 0x00000000,</div><div class='add'>+		0xBE4, 0x00000000,</div><div class='add'>+		0xBE8, 0x00000000,</div><div class='add'>+		0xBEC, 0x00000000,</div><div class='add'>+		0xBF0, 0x00000000,</div><div class='add'>+		0xBF4, 0x00000000,</div><div class='add'>+		0xBF8, 0x00000000,</div><div class='add'>+		0xC00, 0x1C8BA0D6,</div><div class='add'>+		0xC04, 0x00000001,</div><div class='add'>+		0xC08, 0x00000000,</div><div class='add'>+		0xC0C, 0x02F1D8B7,</div><div class='add'>+		0xC10, 0x000000B0,</div><div class='add'>+		0xC14, 0x0000D891,</div><div class='add'>+		0xC18, 0x00087672,</div><div class='add'>+		0xC1C, 0x15260000,</div><div class='add'>+		0xC20, 0x00000000,</div><div class='add'>+		0xC24, 0x40600000,</div><div class='add'>+		0xC28, 0x06400F76,</div><div class='add'>+		0xC2C, 0xE30020E1,</div><div class='add'>+		0xC30, 0x140C9494,</div><div class='add'>+		0xC34, 0x00A04946,</div><div class='add'>+		0xC38, 0x011D4820,</div><div class='add'>+		0xC3C, 0x168DB61B,</div><div class='add'>+		0xC40, 0x009C50F8,</div><div class='add'>+		0xC44, 0x2013BAD1,</div><div class='add'>+		0xC48, 0xFFFFF7CC,</div><div class='add'>+		0xC4C, 0xA000FFFF,</div><div class='add'>+		0xC50, 0x20D0F800,</div><div class='add'>+		0xC54, 0x941A0200,</div><div class='add'>+		0xC58, 0x18380111,</div><div class='add'>+		0xC5C, 0x006E01B8,</div><div class='add'>+		0xC60, 0x2CA5555B,</div><div class='add'>+		0xC64, 0x0210005F,</div><div class='add'>+		0xC68, 0x039A5300,</div><div class='add'>+		0xC6C, 0x0265C2BA,</div><div class='add'>+		0xC70, 0x000CEB21,</div><div class='add'>+		0xC74, 0x0E149CA1,</div><div class='add'>+		0xC78, 0x1AB4956B,</div><div class='add'>+		0xC7C, 0x00000ABF,</div><div class='add'>+		0xC80, 0xC02A8799,</div><div class='add'>+		0xC84, 0x06C636C6,</div><div class='add'>+		0xC88, 0x08090202,</div><div class='add'>+		0xC8C, 0x00204048,</div><div class='add'>+		0xC90, 0x00F85F85,</div><div class='add'>+		0xC94, 0x00000F85,</div><div class='add'>+		0xC98, 0x58385858,</div><div class='add'>+		0xC9C, 0x18382838,</div><div class='add'>+		0xCA0, 0x00002838,</div><div class='add'>+		0xCA4, 0x3A253A3A,</div><div class='add'>+		0xCA8, 0x10251A25,</div><div class='add'>+		0xCAC, 0x00001025,</div><div class='add'>+		0xCB0, 0x3A133A3A,</div><div class='add'>+		0xCB4, 0x08130D13,</div><div class='add'>+		0xCB8, 0x00000813,</div><div class='add'>+		0xCBC, 0x001F1066,</div><div class='add'>+		0xCC0, 0x88A00400,</div><div class='add'>+		0xCC4, 0x00200400,</div><div class='add'>+		0xCC8, 0x0B200400,</div><div class='add'>+		0xCCC, 0x00600400,</div><div class='add'>+		0xCD0, 0x00000092,</div><div class='add'>+		0xCD4, 0x22220000,</div><div class='add'>+		0xCD8, 0x22222222,</div><div class='add'>+		0xCDC, 0x22222222,</div><div class='add'>+		0xCE0, 0x22222222,</div><div class='add'>+		0xCE4, 0x22222222,</div><div class='add'>+		0xCE8, 0x00002222,</div><div class='add'>+		0xCEC, 0x00000000,</div><div class='add'>+		0xCF0, 0x00000000,</div><div class='add'>+		0xCF4, 0x00000000,</div><div class='add'>+		0xCF8, 0x00000000,</div><div class='add'>+		0xD00, 0x1083A10A,</div><div class='add'>+		0xD04, 0x0EC42948,</div><div class='add'>+		0xD08, 0x10852108,</div><div class='add'>+		0xD0C, 0x0CC41D08,</div><div class='add'>+		0xD10, 0x108620EC,</div><div class='add'>+		0xD14, 0x0CA42108,</div><div class='add'>+		0xD18, 0x107620E8,</div><div class='add'>+		0xD1C, 0x0E742108,</div><div class='add'>+		0xD20, 0x0E8618C8,</div><div class='add'>+		0xD24, 0x00000108,</div><div class='add'>+		0xD28, 0x288C224C,</div><div class='add'>+		0xD2C, 0x11C6320C,</div><div class='add'>+		0xD30, 0x30CEBD98,</div><div class='add'>+		0xD34, 0x10C31908,</div><div class='add'>+		0xD38, 0x310A318C,</div><div class='add'>+		0xD3C, 0x18C41D08,</div><div class='add'>+		0xD40, 0x28CC4190,</div><div class='add'>+		0xD44, 0x19062108,</div><div class='add'>+		0xD48, 0x294A5A17,</div><div class='add'>+		0xD4C, 0x00000108,</div><div class='add'>+		0xD50, 0x10A3A908,</div><div class='add'>+		0xD54, 0x10842148,</div><div class='add'>+		0xD58, 0x14C5314A,</div><div class='add'>+		0xD5C, 0x1086258C,</div><div class='add'>+		0xD60, 0x10A42948,</div><div class='add'>+		0xD64, 0x10842108,</div><div class='add'>+		0xD68, 0x08C42108,</div><div class='add'>+		0xD6C, 0x10842148,</div><div class='add'>+		0xD70, 0x08822084,</div><div class='add'>+		0xD74, 0x10841D04,</div><div class='add'>+		0xD78, 0x08421088,</div><div class='add'>+		0xD7C, 0x1083A104,</div><div class='add'>+		0xD80, 0x10842108,</div><div class='add'>+		0xD84, 0x1085294A,</div><div class='add'>+		0xD88, 0x08822104,</div><div class='add'>+		0xD8C, 0x10852948,</div><div class='add'>+		0xD90, 0x08421084,</div><div class='add'>+		0xD94, 0x10852104,</div><div class='add'>+		0xD98, 0x08421084,</div><div class='add'>+		0xD9C, 0x10863184,</div><div class='add'>+		0xDA0, 0x1083B10A,</div><div class='add'>+		0xDA4, 0x10842148,</div><div class='add'>+		0xDA8, 0x1984718C,</div><div class='add'>+		0xDAC, 0x108C33AF,</div><div class='add'>+		0xDB0, 0x00000000,</div><div class='add'>+		0xDB4, 0x00000000,</div><div class='add'>+		0xDB8, 0x00000000,</div><div class='add'>+		0xDBC, 0x00000000,</div><div class='add'>+		0xDC0, 0x00000000,</div><div class='add'>+		0xDC4, 0x00000000,</div><div class='add'>+		0xDC8, 0x00000000,</div><div class='add'>+		0xDCC, 0x00000000,</div><div class='add'>+		0xDD0, 0x00000000,</div><div class='add'>+		0xDD4, 0x00000000,</div><div class='add'>+		0xDD8, 0x00000000,</div><div class='add'>+		0xDDC, 0x00000000,</div><div class='add'>+		0xDE0, 0x00000000,</div><div class='add'>+		0xDE4, 0x00000000,</div><div class='add'>+		0xDE8, 0x00000000,</div><div class='add'>+		0xDEC, 0x00000000,</div><div class='add'>+		0xDF0, 0x00000000,</div><div class='add'>+		0xDF4, 0x00000000,</div><div class='add'>+		0xDF8, 0x00000000,</div><div class='add'>+		0x1800, 0x00033312,</div><div class='add'>+		0x1804, 0x00033312,</div><div class='add'>+		0x180C, 0x17F40060,</div><div class='add'>+		0x1810, 0x62F508C4,</div><div class='add'>+		0x1814, 0x506AA5B4,</div><div class='add'>+		0x1818, 0x000014FF,</div><div class='add'>+		0x181C, 0x00000000,</div><div class='add'>+		0x1820, 0x02D508CC,</div><div class='add'>+		0x1824, 0x506AA5B4,</div><div class='add'>+		0x1828, 0x000004FD,</div><div class='add'>+		0x182C, 0x00000000,</div><div class='add'>+		0x1834, 0x00000000,</div><div class='add'>+		0x1838, 0x20000000,</div><div class='add'>+		0x183C, 0x00000000,</div><div class='add'>+		0x1840, 0x00000000,</div><div class='add'>+		0x1844, 0x00000000,</div><div class='add'>+		0x1848, 0x00000000,</div><div class='add'>+		0x184C, 0x00000000,</div><div class='add'>+		0x1850, 0x00000000,</div><div class='add'>+		0x1854, 0x00000000,</div><div class='add'>+		0x1858, 0x00000000,</div><div class='add'>+		0x185C, 0x00000000,</div><div class='add'>+		0x1860, 0xF0040FF8,</div><div class='add'>+		0x1864, 0x7F000000,</div><div class='add'>+		0x1868, 0x00000000,</div><div class='add'>+		0x186C, 0x0000FF00,</div><div class='add'>+		0x1870, 0x00000000,</div><div class='add'>+		0x1874, 0x00000000,</div><div class='add'>+		0x1878, 0x00000000,</div><div class='add'>+		0x187C, 0x00000000,</div><div class='add'>+		0x1880, 0x00000000,</div><div class='add'>+		0x1884, 0x02B00000,</div><div class='add'>+		0x1888, 0x00000000,</div><div class='add'>+		0x188C, 0x00000000,</div><div class='add'>+		0x1890, 0x00000000,</div><div class='add'>+		0x1894, 0x00000000,</div><div class='add'>+		0x1898, 0x00000000,</div><div class='add'>+		0x18A0, 0x00510000,</div><div class='add'>+		0x18A4, 0x183C1F7F,</div><div class='add'>+		0x18A8, 0x0A02C99A,</div><div class='add'>+		0x18AC, 0x00004200,</div><div class='add'>+		0x18B0, 0x0809FB08,</div><div class='add'>+		0x18B0, 0x0809FB09,</div><div class='add'>+		0x18B4, 0x00000000,</div><div class='add'>+		0x18B8, 0x00000000,</div><div class='add'>+		0x18BC, 0x00C3FF80,</div><div class='add'>+		0x18C0, 0x0002D100,</div><div class='add'>+		0x18C4, 0x00000004,</div><div class='add'>+		0x18C8, 0x001FFFE0,</div><div class='add'>+		0x18CC, 0x0809FB08,</div><div class='add'>+		0x18CC, 0x0809FB09,</div><div class='add'>+		0x18D0, 0x00000000,</div><div class='add'>+		0x18D4, 0x00000000,</div><div class='add'>+		0x18D8, 0x00C3FF80,</div><div class='add'>+		0x18DC, 0x0002D100,</div><div class='add'>+		0x18E0, 0x00000004,</div><div class='add'>+		0x18E4, 0x001FFFE0,</div><div class='add'>+		0x18E8, 0x00800000,</div><div class='add'>+		0x18EC, 0x1EC08000,</div><div class='add'>+		0x18F0, 0x7F000064,</div><div class='add'>+		0x18F4, 0x1F7DE75C,</div><div class='add'>+		0x18F8, 0x7F7F7F7F,</div><div class='add'>+		0x18FC, 0x7F7F7F7F,</div><div class='add'>+		0x1900, 0xA7A7A7A7,</div><div class='add'>+		0x1904, 0x95959595,</div><div class='add'>+		0x1908, 0x00777788,</div><div class='add'>+		0x190C, 0x77776666,</div><div class='add'>+		0x1910, 0x00033333,</div><div class='add'>+		0x1914, 0xAAAC875A,</div><div class='add'>+		0x1918, 0x2AA2A8A2,</div><div class='add'>+		0x191C, 0x2AAAA8A2,</div><div class='add'>+		0x1920, 0x00878766,</div><div class='add'>+		0x1924, 0x000C4924,</div><div class='add'>+		0x1928, 0x5669B6C0,</div><div class='add'>+		0x192C, 0x00409190,</div><div class='add'>+		0x1930, 0xB85C0492,</div><div class='add'>+		0x1934, 0x00B4A298,</div><div class='add'>+		0x1938, 0x00030151,</div><div class='add'>+		0x193C, 0x0058C618,</div><div class='add'>+		0x1940, 0x41000000,</div><div class='add'>+		0x1944, 0x00000BCB,</div><div class='add'>+		0x1948, 0xAAAAAAAA,</div><div class='add'>+		0x194C, 0x00B99999,</div><div class='add'>+		0x1950, 0x88886665,</div><div class='add'>+		0x1954, 0x08888888,</div><div class='add'>+		0x1958, 0x00000618,</div><div class='add'>+		0x195C, 0x00000000,</div><div class='add'>+		0x1960, 0x00000000,</div><div class='add'>+		0x1964, 0x00000000,</div><div class='add'>+		0x1968, 0x00000000,</div><div class='add'>+		0x196C, 0x00000000,</div><div class='add'>+		0x1970, 0x00000000,</div><div class='add'>+		0x1974, 0x00000000,</div><div class='add'>+		0x1978, 0x00000000,</div><div class='add'>+		0x197C, 0x00000000,</div><div class='add'>+		0x1980, 0x00000000,</div><div class='add'>+		0x1984, 0x00000000,</div><div class='add'>+		0x1988, 0x00000000,</div><div class='add'>+		0x198C, 0x00000000,</div><div class='add'>+		0x1990, 0x00000000,</div><div class='add'>+		0x1994, 0x00000000,</div><div class='add'>+		0x1998, 0x00000000,</div><div class='add'>+		0x199C, 0x00000000,</div><div class='add'>+		0x19A0, 0x00000000,</div><div class='add'>+		0x19A4, 0x00000000,</div><div class='add'>+		0x19A8, 0x00000000,</div><div class='add'>+		0x19AC, 0x00000000,</div><div class='add'>+		0x19B0, 0x00000000,</div><div class='add'>+		0x19B4, 0x00000000,</div><div class='add'>+		0x19B8, 0x00000000,</div><div class='add'>+		0x19BC, 0x00000000,</div><div class='add'>+		0x19C0, 0x00000000,</div><div class='add'>+		0x19C4, 0x00000000,</div><div class='add'>+		0x19C8, 0x00000000,</div><div class='add'>+		0x19CC, 0x00000000,</div><div class='add'>+		0x19D0, 0x00000000,</div><div class='add'>+		0x19D4, 0x00000000,</div><div class='add'>+		0x19D8, 0x00000000,</div><div class='add'>+		0x19DC, 0x00000000,</div><div class='add'>+		0x19E0, 0x00000000,</div><div class='add'>+		0x19E4, 0x00000000,</div><div class='add'>+		0x19E8, 0x00000000,</div><div class='add'>+		0x19EC, 0x00000000,</div><div class='add'>+		0x19F0, 0x00000000,</div><div class='add'>+		0x19F4, 0x00000000,</div><div class='add'>+		0x19F8, 0x00000000,</div><div class='add'>+		0x1C00, 0x00000000,</div><div class='add'>+		0x1C04, 0x00000000,</div><div class='add'>+		0x1C08, 0x00000000,</div><div class='add'>+		0x1C0C, 0x00000000,</div><div class='add'>+		0x1C10, 0x00000000,</div><div class='add'>+		0x1C14, 0x00000000,</div><div class='add'>+		0x1C18, 0x00000000,</div><div class='add'>+		0x1C1C, 0x00000000,</div><div class='add'>+		0x1C20, 0x03C23F00,</div><div class='add'>+		0x1C24, 0xF101F002,</div><div class='add'>+		0x1C28, 0x0FFE0010,</div><div class='add'>+		0x1C2C, 0x453090FF,</div><div class='add'>+		0x1C30, 0xFE0090FE,</div><div class='add'>+		0x1C34, 0xE4E42000,</div><div class='add'>+		0x1C38, 0xFFA1005E,</div><div class='add'>+		0x1C40, 0x8F588837,</div><div class='add'>+		0x1C44, 0x04400300,</div><div class='add'>+		0x1C48, 0x00000000,</div><div class='add'>+		0x1C4C, 0x00000200,</div><div class='add'>+		0x1C50, 0x8E588837,</div><div class='add'>+		0x1C54, 0x04400300,</div><div class='add'>+		0x1C58, 0x00000000,</div><div class='add'>+		0x1C5C, 0xFFFFFFFF,</div><div class='add'>+		0x1C60, 0x0F030032,</div><div class='add'>+		0x1C64, 0x360F0000,</div><div class='add'>+		0x1C68, 0x007F0000,</div><div class='add'>+		0x1C6C, 0x00010000,</div><div class='add'>+		0x1C70, 0x00037FFE,</div><div class='add'>+		0x1C74, 0x00000000,</div><div class='add'>+		0x1C78, 0x00020000,</div><div class='add'>+		0x1C7C, 0x00310000,</div><div class='add'>+		0x1C80, 0x0E38E000,</div><div class='add'>+		0x1C84, 0x245120D4,</div><div class='add'>+		0x1C88, 0xC8400483,</div><div class='add'>+		0x1C8C, 0x40005A20,</div><div class='add'>+		0x1C94, 0x00000000,</div><div class='add'>+		0x1C98, 0x00000000,</div><div class='add'>+		0x1C9C, 0x00000000,</div><div class='add'>+		0x1CA0, 0x00000000,</div><div class='add'>+		0x1CA4, 0x20000000,</div><div class='add'>+		0x1CA8, 0x0E000000,</div><div class='add'>+		0x1CAC, 0xE424A2CC,</div><div class='add'>+		0x1CB0, 0x00000000,</div><div class='add'>+		0x1CB4, 0x00000000,</div><div class='add'>+		0x1CB8, 0x24800000,</div><div class='add'>+		0x1CBC, 0x60004800,</div><div class='add'>+		0x1CC0, 0x24800000,</div><div class='add'>+		0x1CC4, 0x60004800,</div><div class='add'>+		0x1CC8, 0xF0444900,</div><div class='add'>+		0x1CCC, 0x030300F1,</div><div class='add'>+		0x1CD0, 0x0F000000,</div><div class='add'>+		0x1CD4, 0x02024B00,</div><div class='add'>+		0x1CD8, 0x04000000,</div><div class='add'>+		0x1CDC, 0x10000000,</div><div class='add'>+		0x1CE0, 0x60000000,</div><div class='add'>+		0x1CE4, 0x00000000,</div><div class='add'>+		0x1CE8, 0xC0000000,</div><div class='add'>+		0x1CEC, 0x00000000,</div><div class='add'>+		0x1CF0, 0x00000000,</div><div class='add'>+		0x1CF4, 0xE4000000,</div><div class='add'>+		0x1CF8, 0x00000000,</div><div class='add'>+		0x1D00, 0x00000000,</div><div class='add'>+		0x1D04, 0x08A3C000,</div><div class='add'>+		0x1D08, 0xA0000000,</div><div class='add'>+		0x1D10, 0x08B5BBBB,</div><div class='add'>+		0x1D14, 0x77777777,</div><div class='add'>+		0x1D18, 0x99999999,</div><div class='add'>+		0x1D1C, 0x99999999,</div><div class='add'>+		0x1D20, 0x000081E0,</div><div class='add'>+		0x1D24, 0x00000000,</div><div class='add'>+		0x1D28, 0x00000000,</div><div class='add'>+		0x1D2C, 0xC0000000,</div><div class='add'>+		0x1D30, 0x50009C00,</div><div class='add'>+		0x1D34, 0x00000000,</div><div class='add'>+		0x1D38, 0x00000000,</div><div class='add'>+		0x1D3C, 0xF8000000,</div><div class='add'>+		0x1D40, 0x00000000,</div><div class='add'>+		0x1D44, 0x74740000,</div><div class='add'>+		0x1D48, 0x14147474,</div><div class='add'>+		0x1D4C, 0x00FFFF14,</div><div class='add'>+		0x1D50, 0x00000000,</div><div class='add'>+		0x1D54, 0x03A00000,</div><div class='add'>+		0x1D58, 0x80800000,</div><div class='add'>+		0x1D5C, 0x00000000,</div><div class='add'>+		0x1D60, 0x00000000,</div><div class='add'>+		0x1D64, 0x88000000,</div><div class='add'>+		0x1D68, 0x00000000,</div><div class='add'>+		0x1D6C, 0x666D8001,</div><div class='add'>+		0x1D70, 0x20202020,</div><div class='add'>+		0x1D74, 0x4E4E4E4E,</div><div class='add'>+		0x1D78, 0x18189818,</div><div class='add'>+		0x1D7C, 0x0005A000,</div><div class='add'>+		0x1D80, 0x00080000,</div><div class='add'>+		0x1D84, 0x00080000,</div><div class='add'>+		0x1D88, 0x000000EF,</div><div class='add'>+		0x1D8C, 0x0C0C0C0C,</div><div class='add'>+		0x1D90, 0x103F003F,</div><div class='add'>+		0x1D94, 0x00000000,</div><div class='add'>+		0x1D98, 0x00000000,</div><div class='add'>+		0x1D9C, 0x00000000,</div><div class='add'>+		0x1DA0, 0x00000000,</div><div class='add'>+		0x1DA4, 0x00000000,</div><div class='add'>+		0x1DA8, 0x00000000,</div><div class='add'>+		0x1DAC, 0x00000000,</div><div class='add'>+		0x1DB0, 0x00000000,</div><div class='add'>+		0x1DB4, 0x00000000,</div><div class='add'>+		0x1DB8, 0x00000000,</div><div class='add'>+		0x1DBC, 0x00000000,</div><div class='add'>+		0x1DC0, 0x00000000,</div><div class='add'>+		0x1DC4, 0x00000000,</div><div class='add'>+		0x1DC8, 0x00000000,</div><div class='add'>+		0x1DCC, 0x00000000,</div><div class='add'>+		0x1DD0, 0x00000000,</div><div class='add'>+		0x1DD4, 0x00000000,</div><div class='add'>+		0x1DD8, 0x00000000,</div><div class='add'>+		0x1DDC, 0x1FDF0000,</div><div class='add'>+		0x1DE0, 0x01010000,</div><div class='add'>+		0x1DE4, 0x05210123,</div><div class='add'>+		0x1DE8, 0xFFFF4848,</div><div class='add'>+		0x1DEC, 0x00000000,</div><div class='add'>+		0x1DF0, 0x00000000,</div><div class='add'>+		0x1DF4, 0x80000002,</div><div class='add'>+		0x1DF8, 0x00000000,</div><div class='add'>+		0x1E00, 0x00000000,</div><div class='add'>+		0x1E04, 0x00000000,</div><div class='add'>+		0x1E08, 0x00000000,</div><div class='add'>+		0x1E0C, 0x00000000,</div><div class='add'>+		0x1E10, 0x00000000,</div><div class='add'>+		0x1E14, 0x00000000,</div><div class='add'>+		0x1E18, 0x00000000,</div><div class='add'>+		0x1E1C, 0x00000000,</div><div class='add'>+		0x1E20, 0x00000000,</div><div class='add'>+		0x1E24, 0x80003000,</div><div class='add'>+		0x1E28, 0x000CC0C3,</div><div class='add'>+		0x1E2C, 0xE4E40404,</div><div class='add'>+		0x1E30, 0xE4E4E4E4,</div><div class='add'>+		0x1E34, 0xF3001234,</div><div class='add'>+		0x1E38, 0x00000000,</div><div class='add'>+		0x1E3C, 0x00000000,</div><div class='add'>+		0x1E40, 0x00000000,</div><div class='add'>+		0x1E44, 0x00000000,</div><div class='add'>+		0x1E48, 0x00000000,</div><div class='add'>+		0x1E4C, 0x00000000,</div><div class='add'>+		0x1E50, 0x00000000,</div><div class='add'>+		0x1E54, 0x00000000,</div><div class='add'>+		0x1E58, 0x00000000,</div><div class='add'>+		0x1E5C, 0xC1000000,</div><div class='add'>+		0x1E60, 0x00000000,</div><div class='add'>+		0x1E64, 0xF3A00001,</div><div class='add'>+		0x1E68, 0x0028846E,</div><div class='add'>+		0x1E6C, 0x40274906,</div><div class='add'>+		0x1E70, 0x00001000,</div><div class='add'>+		0x1E74, 0x00000000,</div><div class='add'>+		0x1E78, 0x00000000,</div><div class='add'>+		0x1E7C, 0x00000000,</div><div class='add'>+		0x1E80, 0x00000000,</div><div class='add'>+		0x1E84, 0x00000000,</div><div class='add'>+		0x1E84, 0x40000000,</div><div class='add'>+		0x1E84, 0x41000000,</div><div class='add'>+		0x1E84, 0x42000000,</div><div class='add'>+		0x1E84, 0x43000000,</div><div class='add'>+		0x1E84, 0x44000000,</div><div class='add'>+		0x1E84, 0x45000000,</div><div class='add'>+		0x1E84, 0x46000000,</div><div class='add'>+		0x1E84, 0x47000000,</div><div class='add'>+		0x1E84, 0x48000000,</div><div class='add'>+		0x1E84, 0x49000000,</div><div class='add'>+		0x1E84, 0x4A000000,</div><div class='add'>+		0x1E84, 0x4B000000,</div><div class='add'>+		0x1E84, 0x4C000000,</div><div class='add'>+		0x1E84, 0x4D000000,</div><div class='add'>+		0x1E84, 0x4E000000,</div><div class='add'>+		0x1E84, 0x4F000000,</div><div class='add'>+		0x1E84, 0x50000000,</div><div class='add'>+		0x1E84, 0x51000000,</div><div class='add'>+		0x1E84, 0x52000000,</div><div class='add'>+		0x1E84, 0x53000000,</div><div class='add'>+		0x1E84, 0x54000000,</div><div class='add'>+		0x1E84, 0x55000000,</div><div class='add'>+		0x1E84, 0x56000000,</div><div class='add'>+		0x1E84, 0x57000000,</div><div class='add'>+		0x1E84, 0x58000000,</div><div class='add'>+		0x1E84, 0x59000000,</div><div class='add'>+		0x1E84, 0x5A000000,</div><div class='add'>+		0x1E84, 0x5B000000,</div><div class='add'>+		0x1E84, 0x5C000000,</div><div class='add'>+		0x1E84, 0x5D000000,</div><div class='add'>+		0x1E84, 0x5E000000,</div><div class='add'>+		0x1E84, 0x5F000000,</div><div class='add'>+		0x1E84, 0x60000000,</div><div class='add'>+		0x1E84, 0x61000000,</div><div class='add'>+		0x1E84, 0x62000000,</div><div class='add'>+		0x1E84, 0x63000000,</div><div class='add'>+		0x1E84, 0x64000000,</div><div class='add'>+		0x1E84, 0x65000000,</div><div class='add'>+		0x1E84, 0x66000000,</div><div class='add'>+		0x1E84, 0x67000000,</div><div class='add'>+		0x1E84, 0x68000000,</div><div class='add'>+		0x1E84, 0x69000000,</div><div class='add'>+		0x1E84, 0x6A000000,</div><div class='add'>+		0x1E84, 0x6B000000,</div><div class='add'>+		0x1E84, 0x6C000000,</div><div class='add'>+		0x1E84, 0x6D000000,</div><div class='add'>+		0x1E84, 0x6E000000,</div><div class='add'>+		0x1E84, 0x6F000000,</div><div class='add'>+		0x1E84, 0x70000000,</div><div class='add'>+		0x1E84, 0x71000000,</div><div class='add'>+		0x1E84, 0x72000000,</div><div class='add'>+		0x1E84, 0x73000000,</div><div class='add'>+		0x1E84, 0x74000000,</div><div class='add'>+		0x1E84, 0x75000000,</div><div class='add'>+		0x1E84, 0x76000000,</div><div class='add'>+		0x1E84, 0x77000000,</div><div class='add'>+		0x1E84, 0x78000000,</div><div class='add'>+		0x1E84, 0x79000000,</div><div class='add'>+		0x1E84, 0x7A000000,</div><div class='add'>+		0x1E84, 0x7B000000,</div><div class='add'>+		0x1E84, 0x7C000000,</div><div class='add'>+		0x1E84, 0x7D000000,</div><div class='add'>+		0x1E84, 0x7E000000,</div><div class='add'>+		0x1E84, 0x7F000000,</div><div class='add'>+		0x1E84, 0x80000000,</div><div class='add'>+		0x1E84, 0x00000000,</div><div class='add'>+		0x1E88, 0x0200FC1C,</div><div class='add'>+		0x1E8C, 0x00000000,</div><div class='add'>+		0x1E90, 0x00000000,</div><div class='add'>+		0x1E94, 0x04000000,</div><div class='add'>+		0x1E98, 0x00000000,</div><div class='add'>+		0x1E9C, 0x00000000,</div><div class='add'>+		0x1EA0, 0x00000000,</div><div class='add'>+		0x1EA4, 0x00000000,</div><div class='add'>+		0x1EA8, 0xAA464646,</div><div class='add'>+		0x1EAC, 0x01800030,</div><div class='add'>+		0x1EB0, 0x00003002,</div><div class='add'>+		0x1EB4, 0x31800002,</div><div class='add'>+		0x1EB8, 0x00000000,</div><div class='add'>+		0x1EBC, 0x00000000,</div><div class='add'>+		0x1EC0, 0x00000000,</div><div class='add'>+		0x1EC4, 0x00000000,</div><div class='add'>+		0x1EC8, 0x00000000,</div><div class='add'>+		0x1ECC, 0x00000000,</div><div class='add'>+		0x1ED0, 0x00000000,</div><div class='add'>+		0x1ED4, 0x8000000A,</div><div class='add'>+		0x1ED8, 0x800B03E8,</div><div class='add'>+		0x1EDC, 0x83E90FFF,</div><div class='add'>+		0x1EE0, 0x8000FFFF,</div><div class='add'>+		0x1EE4, 0x70000000,</div><div class='add'>+		0x1EE8, 0x00000000,</div><div class='add'>+		0x1EEC, 0x0280A933,</div><div class='add'>+		0x1EF0, 0x00000A80,</div><div class='add'>+		0x1EF4, 0x00001266,</div><div class='add'>+		0x1EF8, 0x01000100,</div><div class='add'>+		0x3A00, 0x0004080C,</div><div class='add'>+		0x3A04, 0x1C202428,</div><div class='add'>+		0x3A08, 0x0C101418,</div><div class='add'>+		0x3A0C, 0x181C2024,</div><div class='add'>+		0x3A10, 0x080C1014,</div><div class='add'>+		0x3A14, 0x181C2024,</div><div class='add'>+		0x3A18, 0x080C1014,</div><div class='add'>+		0x3A1C, 0x00000000,</div><div class='add'>+		0x3A20, 0x00000000,</div><div class='add'>+		0x3A24, 0x00000000,</div><div class='add'>+		0x3A28, 0x00000000,</div><div class='add'>+		0x3A2C, 0x181C2024,</div><div class='add'>+		0x3A30, 0x080C1014,</div><div class='add'>+		0x3A34, 0x20240004,</div><div class='add'>+		0x3A38, 0x1014181C,</div><div class='add'>+		0x3A3C, 0x0004080C,</div><div class='add'>+		0x3A40, 0x00000000,</div><div class='add'>+		0x3A44, 0x00000000,</div><div class='add'>+		0x3A48, 0x00000000,</div><div class='add'>+		0x3A4C, 0x00000000,</div><div class='add'>+		0x3A50, 0x00000000,</div><div class='add'>+		0x3A54, 0x00000000,</div><div class='add'>+		0x3A58, 0x00000000,</div><div class='add'>+		0x3A5C, 0x00000000,</div><div class='add'>+		0x3A60, 0x00000000,</div><div class='add'>+		0x3A64, 0x00000000,</div><div class='add'>+		0x3A68, 0x00000000,</div><div class='add'>+		0x3A6C, 0x00000000,</div><div class='add'>+		0x3A70, 0x00000000,</div><div class='add'>+		0x3A74, 0x00000000,</div><div class='add'>+		0x3A78, 0x00000000,</div><div class='add'>+		0x3A7C, 0x00000000,</div><div class='add'>+		0x3A80, 0x00000000,</div><div class='add'>+		0x3A84, 0x00000000,</div><div class='add'>+		0x3A88, 0x00000000,</div><div class='add'>+		0x3A8C, 0x00000000,</div><div class='add'>+		0x3A90, 0x00000000,</div><div class='add'>+		0x3A94, 0x00000000,</div><div class='add'>+		0x3A98, 0x00000000,</div><div class='add'>+		0x3A9C, 0x00000000,</div><div class='add'>+		0x3AA0, 0x00000000,</div><div class='add'>+		0x3AA4, 0x00000000,</div><div class='add'>+		0x4000, 0xA6A6A6A6,</div><div class='add'>+		0x4004, 0x95959595,</div><div class='add'>+		0x4008, 0x00777777,</div><div class='add'>+		0x400C, 0x77776666,</div><div class='add'>+		0x4010, 0x00033333,</div><div class='add'>+		0x4014, 0xAAAC875A,</div><div class='add'>+		0x4018, 0x2AA2A8A2,</div><div class='add'>+		0x401C, 0x2AAAA8A2,</div><div class='add'>+		0x4020, 0x00878766,</div><div class='add'>+		0x4024, 0x000C4924,</div><div class='add'>+		0x4028, 0x5669B6C0,</div><div class='add'>+		0x402C, 0x00409190,</div><div class='add'>+		0x4030, 0xB85C0492,</div><div class='add'>+		0x4034, 0x00B4A298,</div><div class='add'>+		0x4038, 0x00030151,</div><div class='add'>+		0x403C, 0x0058C618,</div><div class='add'>+		0x4040, 0x41000000,</div><div class='add'>+		0x4044, 0x00000BCB,</div><div class='add'>+		0x4048, 0xAAAAAAAA,</div><div class='add'>+		0x404C, 0x00B98989,</div><div class='add'>+		0x4050, 0x88886665,</div><div class='add'>+		0x4054, 0x08888888,</div><div class='add'>+		0x4058, 0x00000618,</div><div class='add'>+		0x405C, 0x00000000,</div><div class='add'>+		0x4060, 0x00000000,</div><div class='add'>+		0x4064, 0x00000000,</div><div class='add'>+		0x4068, 0x00000000,</div><div class='add'>+		0x406C, 0x00000000,</div><div class='add'>+		0x4070, 0x00000000,</div><div class='add'>+		0x4074, 0x00000000,</div><div class='add'>+		0x4078, 0x00000000,</div><div class='add'>+		0x407C, 0x00000000,</div><div class='add'>+		0x4080, 0x00000000,</div><div class='add'>+		0x4084, 0x00000000,</div><div class='add'>+		0x4088, 0x00000000,</div><div class='add'>+		0x408C, 0x00000000,</div><div class='add'>+		0x4090, 0x00000000,</div><div class='add'>+		0x4094, 0x00000000,</div><div class='add'>+		0x4098, 0x00000000,</div><div class='add'>+		0x409C, 0x00000000,</div><div class='add'>+		0x40A0, 0x00000000,</div><div class='add'>+		0x40A4, 0x00000000,</div><div class='add'>+		0x40A8, 0x00000000,</div><div class='add'>+		0x40AC, 0x00000000,</div><div class='add'>+		0x40B0, 0x00000000,</div><div class='add'>+		0x40B4, 0x00000000,</div><div class='add'>+		0x40B8, 0x00000000,</div><div class='add'>+		0x40BC, 0x00000000,</div><div class='add'>+		0x40C0, 0x00000000,</div><div class='add'>+		0x40C4, 0x00000000,</div><div class='add'>+		0x40C8, 0x00000000,</div><div class='add'>+		0x40CC, 0x00000000,</div><div class='add'>+		0x40D0, 0x00000000,</div><div class='add'>+		0x40D4, 0x00000000,</div><div class='add'>+		0x40D8, 0x00000000,</div><div class='add'>+		0x40DC, 0x00000000,</div><div class='add'>+		0x40E0, 0x00000000,</div><div class='add'>+		0x40E4, 0x00000000,</div><div class='add'>+		0x40E8, 0x00000000,</div><div class='add'>+		0x40EC, 0x00000000,</div><div class='add'>+		0x40F0, 0x00000000,</div><div class='add'>+		0x40F4, 0x00000000,</div><div class='add'>+		0x40F8, 0x00000000,</div><div class='add'>+		0x4100, 0x00033312,</div><div class='add'>+		0x4104, 0x00033312,</div><div class='add'>+		0x410C, 0x17F40060,</div><div class='add'>+		0x4110, 0x62D508C4,</div><div class='add'>+		0x4114, 0x506AA5B4,</div><div class='add'>+		0x4118, 0x000014FF,</div><div class='add'>+		0x411C, 0x00000000,</div><div class='add'>+		0x4120, 0x02D508CC,</div><div class='add'>+		0x4124, 0x506AA5B4,</div><div class='add'>+		0x4128, 0x000004FD,</div><div class='add'>+		0x412C, 0x00000000,</div><div class='add'>+		0x4134, 0x00000000,</div><div class='add'>+		0x4138, 0x20000000,</div><div class='add'>+		0x413C, 0x00000000,</div><div class='add'>+		0x4140, 0x00000000,</div><div class='add'>+		0x4144, 0x00000000,</div><div class='add'>+		0x4148, 0x00000000,</div><div class='add'>+		0x414C, 0x00000000,</div><div class='add'>+		0x4150, 0x00000000,</div><div class='add'>+		0x4154, 0x00000000,</div><div class='add'>+		0x4158, 0x00000000,</div><div class='add'>+		0x415C, 0x00000000,</div><div class='add'>+		0x4160, 0xF0040FF8,</div><div class='add'>+		0x4164, 0x7F000000,</div><div class='add'>+		0x4168, 0x00000000,</div><div class='add'>+		0x416C, 0x00008000,</div><div class='add'>+		0x4170, 0x00000000,</div><div class='add'>+		0x4174, 0x00000000,</div><div class='add'>+		0x4178, 0x00000000,</div><div class='add'>+		0x417C, 0x00000000,</div><div class='add'>+		0x4180, 0x00000000,</div><div class='add'>+		0x4184, 0x02B00000,</div><div class='add'>+		0x4188, 0x00000000,</div><div class='add'>+		0x418C, 0x00000000,</div><div class='add'>+		0x4190, 0x00000000,</div><div class='add'>+		0x4194, 0x00000000,</div><div class='add'>+		0x4198, 0x00000000,</div><div class='add'>+		0x41A0, 0x00510000,</div><div class='add'>+		0x41A4, 0x183C1F7F,</div><div class='add'>+		0x41A8, 0x1402C99A,</div><div class='add'>+		0x41AC, 0x00004200,</div><div class='add'>+		0x41B0, 0x0809FB08,</div><div class='add'>+		0x41B0, 0x0809FB09,</div><div class='add'>+		0x41B4, 0x00000000,</div><div class='add'>+		0x41B8, 0x00000000,</div><div class='add'>+		0x41BC, 0x00C3FF80,</div><div class='add'>+		0x41C0, 0x0002D100,</div><div class='add'>+		0x41C4, 0x00000004,</div><div class='add'>+		0x41C8, 0x001FFFE0,</div><div class='add'>+		0x41CC, 0x0809FB08,</div><div class='add'>+		0x41CC, 0x0809FB09,</div><div class='add'>+		0x41D0, 0x00000000,</div><div class='add'>+		0x41D4, 0x00000000,</div><div class='add'>+		0x41D8, 0x00C3FF80,</div><div class='add'>+		0x41DC, 0x0002D100,</div><div class='add'>+		0x41E0, 0x00000004,</div><div class='add'>+		0x41E4, 0x001FFFE0,</div><div class='add'>+		0x41E8, 0x00000200,</div><div class='add'>+		0x41EC, 0x1E008000,</div><div class='add'>+		0x41F0, 0x7F000064,</div><div class='add'>+		0x41F4, 0x1F7DE75C,</div><div class='add'>+		0x41F8, 0x7F7F7F7F,</div><div class='add'>+		0x41FC, 0x7F7F7F7F,</div><div class='add'>+		0x1830, 0x700B8001,</div><div class='add'>+		0x1830, 0x700B8001,</div><div class='add'>+		0x1830, 0x70144001,</div><div class='add'>+		0x1830, 0x70244001,</div><div class='add'>+		0x1830, 0x70344001,</div><div class='add'>+		0x1830, 0x70444001,</div><div class='add'>+		0x1830, 0x705B8001,</div><div class='add'>+		0x1830, 0x70644001,</div><div class='add'>+		0x1830, 0x707B8001,</div><div class='add'>+		0x1830, 0x708B8001,</div><div class='add'>+		0x1830, 0x709B8001,</div><div class='add'>+		0x1830, 0x70AB8001,</div><div class='add'>+		0x1830, 0x70BB8001,</div><div class='add'>+		0x1830, 0x70CB8001,</div><div class='add'>+		0x1830, 0x70DB8001,</div><div class='add'>+		0x1830, 0x70EB8001,</div><div class='add'>+		0x1830, 0x70FB8001,</div><div class='add'>+		0x1830, 0x70FB8001,</div><div class='add'>+		0x4130, 0x700B8001,</div><div class='add'>+		0x4130, 0x700B8001,</div><div class='add'>+		0x4130, 0x70144001,</div><div class='add'>+		0x4130, 0x70244001,</div><div class='add'>+		0x4130, 0x70344001,</div><div class='add'>+		0x4130, 0x70444001,</div><div class='add'>+		0x4130, 0x705B8001,</div><div class='add'>+		0x4130, 0x70644001,</div><div class='add'>+		0x4130, 0x707B8001,</div><div class='add'>+		0x4130, 0x708B8001,</div><div class='add'>+		0x4130, 0x709B8001,</div><div class='add'>+		0x4130, 0x70AB8001,</div><div class='add'>+		0x4130, 0x70BB8001,</div><div class='add'>+		0x4130, 0x70CB8001,</div><div class='add'>+		0x4130, 0x70DB8001,</div><div class='add'>+		0x4130, 0x70EB8001,</div><div class='add'>+		0x4130, 0x70FB8001,</div><div class='add'>+		0x4130, 0x70FB8001,</div><div class='add'>+		0x1A00, 0x00D047C8,</div><div class='add'>+		0x1A04, 0xC0000008,</div><div class='add'>+		0x1A08, 0x88838300,</div><div class='add'>+		0x1A0C, 0x2E20100F,</div><div class='add'>+		0x1A10, 0x9500BB78,</div><div class='add'>+		0x1A14, 0x111440A8,</div><div class='add'>+		0x1A18, 0x00881117,</div><div class='add'>+		0x1A1C, 0x89140F00,</div><div class='add'>+		0x1A20, 0x52840000,</div><div class='add'>+		0x1A24, 0x3E18FEC8,</div><div class='add'>+		0x1A28, 0x00150A88,</div><div class='add'>+		0x1A2C, 0x12988000,</div><div class='add'>+		0x1A30, 0x10114007,</div><div class='add'>+		0x1A34, 0x1011C007,</div><div class='add'>+		0x1A38, 0x00000000,</div><div class='add'>+		0x1A3C, 0x00000000,</div><div class='add'>+		0x1A40, 0x00000000,</div><div class='add'>+		0x1A44, 0x00000000,</div><div class='add'>+		0x1A48, 0x000C0000,</div><div class='add'>+		0x1A4C, 0xB00000C0,</div><div class='add'>+		0x1A50, 0x22040700,</div><div class='add'>+		0x1A54, 0x09003000,</div><div class='add'>+		0x1A58, 0x00000881,</div><div class='add'>+		0x1A5C, 0x00000128,</div><div class='add'>+		0x1A60, 0x85830000,</div><div class='add'>+		0x1A64, 0x00000128,</div><div class='add'>+		0x1A68, 0x00222211,</div><div class='add'>+		0x1A6C, 0x00000000,</div><div class='add'>+		0x1A70, 0x00008000,</div><div class='add'>+		0x1A74, 0x00000048,</div><div class='add'>+		0x1A78, 0x000089F0,</div><div class='add'>+		0x1A7C, 0x225B0606,</div><div class='add'>+		0x1A80, 0x208A7532,</div><div class='add'>+		0x1A84, 0x85200200,</div><div class='add'>+		0x1A88, 0x048C0000,</div><div class='add'>+		0x1A8C, 0x00000000,</div><div class='add'>+		0x1A90, 0x00000000,</div><div class='add'>+		0x1A94, 0x00000000,</div><div class='add'>+		0x1A98, 0xACC4C040,</div><div class='add'>+		0x1A9C, 0x0016C8B2,</div><div class='add'>+		0x1AA0, 0x00FAF0DE,</div><div class='add'>+		0x1AA4, 0x00020000,</div><div class='add'>+		0x1AA8, 0xBA0F0004,</div><div class='add'>+		0x1AAC, 0x00122344,</div><div class='add'>+		0x1AB0, 0x0FFFFFFF,</div><div class='add'>+		0x1AB4, 0x0F201402,</div><div class='add'>+		0x1AB8, 0x00000000,</div><div class='add'>+		0x1ABC, 0xC2008080,</div><div class='add'>+		0x1AC0, 0x54D0A742,</div><div class='add'>+		0x1AC4, 0x00000000,</div><div class='add'>+		0x1AC8, 0x00000807,</div><div class='add'>+		0x1ACC, 0x00000707,</div><div class='add'>+		0x1AD0, 0xA33529AD,</div><div class='add'>+		0x1AD4, 0x0D8D8452,</div><div class='add'>+		0x1AD8, 0x08024024,</div><div class='add'>+		0x1ADC, 0x000DB001,</div><div class='add'>+		0x1AE0, 0x00600391,</div><div class='add'>+		0x1AE4, 0x08000080,</div><div class='add'>+		0x1AE8, 0x00000002,</div><div class='add'>+		0x1AEC, 0x00000000,</div><div class='add'>+		0x1AF0, 0x00000000,</div><div class='add'>+		0x1AF4, 0x00000000,</div><div class='add'>+		0x1AF8, 0x00000000,</div><div class='add'>+		0x1AFC, 0x00000000,</div><div class='add'>+		0x1D0C, 0x00400000,</div><div class='add'>+		0x1D0C, 0x00410000,</div><div class='add'>+		0x1EE8, 0x00000003,</div><div class='add'>+		0xC0C, 0x02F1D8BF,</div><div class='add'>+		0x1D94, 0x40000000,</div><div class='add'>+		0x1D94, 0x40010000,</div><div class='add'>+		0x1D94, 0x40020000,</div><div class='add'>+		0x1D94, 0x40030000,</div><div class='add'>+		0x1D94, 0x40040000,</div><div class='add'>+		0x1D94, 0x40050000,</div><div class='add'>+		0x1D94, 0x40060000,</div><div class='add'>+		0x1D94, 0x40070000,</div><div class='add'>+		0x1D94, 0x40080000,</div><div class='add'>+		0x1D94, 0x40090000,</div><div class='add'>+		0x1D94, 0x400A0000,</div><div class='add'>+		0x1D94, 0x400B0000,</div><div class='add'>+		0x1D94, 0x400C0000,</div><div class='add'>+		0x1D94, 0x400D0000,</div><div class='add'>+		0x1D94, 0x400E0000,</div><div class='add'>+		0x1D94, 0x400F0000,</div><div class='add'>+		0x1D94, 0x40100000,</div><div class='add'>+		0x1D94, 0x40110000,</div><div class='add'>+		0x1D94, 0x40120000,</div><div class='add'>+		0x1D94, 0x40130000,</div><div class='add'>+		0x1D94, 0x40140000,</div><div class='add'>+		0x1D94, 0x40150000,</div><div class='add'>+		0x1D94, 0x40160000,</div><div class='add'>+		0x1D94, 0x40170000,</div><div class='add'>+		0x1D94, 0x40180000,</div><div class='add'>+		0x1D94, 0x40190000,</div><div class='add'>+		0x1D94, 0x401A0000,</div><div class='add'>+		0x1D94, 0x401B0000,</div><div class='add'>+		0x1D94, 0x401C0000,</div><div class='add'>+		0x1D94, 0x401D0000,</div><div class='add'>+		0x1D94, 0x401E0000,</div><div class='add'>+		0x1D94, 0x401F0000,</div><div class='add'>+		0x1D94, 0x40200000,</div><div class='add'>+		0x1D94, 0x40210000,</div><div class='add'>+		0x1D94, 0x40220000,</div><div class='add'>+		0x1D94, 0x40230000,</div><div class='add'>+		0x1D94, 0x40240000,</div><div class='add'>+		0x1D94, 0x40250000,</div><div class='add'>+		0x1D94, 0x40260000,</div><div class='add'>+		0x1D94, 0x40270000,</div><div class='add'>+		0x1D94, 0x40280000,</div><div class='add'>+		0x1D94, 0x40290000,</div><div class='add'>+		0x1D94, 0x402A0000,</div><div class='add'>+		0x1D94, 0x402B0000,</div><div class='add'>+		0x1D94, 0x402C0000,</div><div class='add'>+		0x1D94, 0x402D0000,</div><div class='add'>+		0x1D94, 0x402E0000,</div><div class='add'>+		0x1D94, 0x402F0000,</div><div class='add'>+		0x1D94, 0x40300000,</div><div class='add'>+		0x1D94, 0x40310000,</div><div class='add'>+		0x1D94, 0x40320000,</div><div class='add'>+		0x1D94, 0x40330000,</div><div class='add'>+		0x1D94, 0x40340000,</div><div class='add'>+		0x1D94, 0x40350000,</div><div class='add'>+		0x1D94, 0x40360000,</div><div class='add'>+		0x1D94, 0x40370000,</div><div class='add'>+		0x1D94, 0x40380000,</div><div class='add'>+		0x1D94, 0x40390000,</div><div class='add'>+		0x1D94, 0x403A0000,</div><div class='add'>+		0x1D94, 0x403B0000,</div><div class='add'>+		0x1D94, 0x403C0000,</div><div class='add'>+		0x1D94, 0x403D0000,</div><div class='add'>+		0x1D94, 0x403E0000,</div><div class='add'>+		0x1D94, 0x403F0000,</div><div class='add'>+		0x1D94, 0x40400000,</div><div class='add'>+		0x1D94, 0x40410000,</div><div class='add'>+		0x1D94, 0x40420000,</div><div class='add'>+		0x1D94, 0x40430000,</div><div class='add'>+		0x1D94, 0x40440000,</div><div class='add'>+		0x1D94, 0x40450000,</div><div class='add'>+		0x1D94, 0x40460000,</div><div class='add'>+		0x1D94, 0x40470000,</div><div class='add'>+		0x1D94, 0x40480000,</div><div class='add'>+		0x1D94, 0x40490000,</div><div class='add'>+		0x1D94, 0x404A0000,</div><div class='add'>+		0x1D94, 0x404B0000,</div><div class='add'>+		0x1D94, 0x404C0000,</div><div class='add'>+		0x1D94, 0x404D0000,</div><div class='add'>+		0x1D94, 0x404E0000,</div><div class='add'>+		0x1D94, 0x404F0000,</div><div class='add'>+		0x1D94, 0x40500000,</div><div class='add'>+		0x1D94, 0x40510000,</div><div class='add'>+		0x1D94, 0x40520000,</div><div class='add'>+		0x1D94, 0x40530000,</div><div class='add'>+		0x1D94, 0x40540000,</div><div class='add'>+		0x1D94, 0x40550000,</div><div class='add'>+		0x1D94, 0x40560000,</div><div class='add'>+		0x1D94, 0x40570000,</div><div class='add'>+		0x1D94, 0x40580000,</div><div class='add'>+		0x1D94, 0x40590000,</div><div class='add'>+		0x1D94, 0x405A0000,</div><div class='add'>+		0x1D94, 0x405B0000,</div><div class='add'>+		0x1D94, 0x405C0000,</div><div class='add'>+		0x1D94, 0x405D0000,</div><div class='add'>+		0x1D94, 0x405E0000,</div><div class='add'>+		0x1D94, 0x405F0000,</div><div class='add'>+		0x1D94, 0x40600000,</div><div class='add'>+		0x1D94, 0x40610000,</div><div class='add'>+		0x1D94, 0x40620000,</div><div class='add'>+		0x1D94, 0x40630000,</div><div class='add'>+		0x1D94, 0x40640000,</div><div class='add'>+		0x1D94, 0x40650000,</div><div class='add'>+		0x1D94, 0x40660000,</div><div class='add'>+		0x1D94, 0x40670000,</div><div class='add'>+		0x1D94, 0x40680000,</div><div class='add'>+		0x1D94, 0x40690000,</div><div class='add'>+		0x1D94, 0x406A0000,</div><div class='add'>+		0x1D94, 0x406B0000,</div><div class='add'>+		0x1D94, 0x406C0000,</div><div class='add'>+		0x1D94, 0x406D0000,</div><div class='add'>+		0x1D94, 0x406E0000,</div><div class='add'>+		0x1D94, 0x406F0000,</div><div class='add'>+		0x1D94, 0x40700000,</div><div class='add'>+		0x1D94, 0x40710000,</div><div class='add'>+		0x1D94, 0x40720000,</div><div class='add'>+		0x1D94, 0x40730000,</div><div class='add'>+		0x1D94, 0x40740000,</div><div class='add'>+		0x1D94, 0x40750000,</div><div class='add'>+		0x1D94, 0x40760000,</div><div class='add'>+		0x1D94, 0x40770000,</div><div class='add'>+		0x1D94, 0x40780000,</div><div class='add'>+		0x1D94, 0x40790000,</div><div class='add'>+		0x1D94, 0x407A0000,</div><div class='add'>+		0x1D94, 0x407B0000,</div><div class='add'>+		0x1D94, 0x407C0000,</div><div class='add'>+		0x1D94, 0x407D0000,</div><div class='add'>+		0x1D94, 0x407E0000,</div><div class='add'>+		0x1D94, 0x407F0000,</div><div class='add'>+		0x1D94, 0x40800000,</div><div class='add'>+		0x1D94, 0x40810000,</div><div class='add'>+		0x1D94, 0x40820000,</div><div class='add'>+		0x1D94, 0x40830000,</div><div class='add'>+		0x1D94, 0x40840000,</div><div class='add'>+		0x1D94, 0x40850000,</div><div class='add'>+		0x1D94, 0x40860000,</div><div class='add'>+		0x1D94, 0x40870000,</div><div class='add'>+		0x1D94, 0x40880000,</div><div class='add'>+		0x1D94, 0x40890000,</div><div class='add'>+		0x1D94, 0x408A0000,</div><div class='add'>+		0x1D94, 0x408B0000,</div><div class='add'>+		0x1D94, 0x408C0000,</div><div class='add'>+		0x1D94, 0x408D0000,</div><div class='add'>+		0x1D94, 0x408E0000,</div><div class='add'>+		0x1D94, 0x408F0000,</div><div class='add'>+		0x1D94, 0x40900000,</div><div class='add'>+		0x1D94, 0x40910000,</div><div class='add'>+		0x1D94, 0x40920000,</div><div class='add'>+		0x1D94, 0x40930000,</div><div class='add'>+		0x1D94, 0x40940000,</div><div class='add'>+		0x1D94, 0x40950000,</div><div class='add'>+		0x1D94, 0x40960000,</div><div class='add'>+		0x1D94, 0x40970000,</div><div class='add'>+		0x1D94, 0x40980000,</div><div class='add'>+		0x1D94, 0x40990000,</div><div class='add'>+		0x1D94, 0x409A0000,</div><div class='add'>+		0x1D94, 0x409B0000,</div><div class='add'>+		0x1D94, 0x409C0000,</div><div class='add'>+		0x1D94, 0x409D0000,</div><div class='add'>+		0x1D94, 0x409E0000,</div><div class='add'>+		0x1D94, 0x409F0000,</div><div class='add'>+		0x1D94, 0x40A00000,</div><div class='add'>+		0x1D94, 0x40A10000,</div><div class='add'>+		0x1D94, 0x40A20000,</div><div class='add'>+		0x1D94, 0x40A30000,</div><div class='add'>+		0x1D94, 0x40A40000,</div><div class='add'>+		0x1D94, 0x40A50000,</div><div class='add'>+		0x1D94, 0x40A60000,</div><div class='add'>+		0x1D94, 0x40A70000,</div><div class='add'>+		0x1D94, 0x40A80000,</div><div class='add'>+		0x1D94, 0x40A90000,</div><div class='add'>+		0x1D94, 0x40AA0000,</div><div class='add'>+		0x1D94, 0x40AB0000,</div><div class='add'>+		0x1D94, 0x40AC0000,</div><div class='add'>+		0x1D94, 0x40AD0000,</div><div class='add'>+		0x1D94, 0x40AE0000,</div><div class='add'>+		0x1D94, 0x40AF0000,</div><div class='add'>+		0x1D94, 0x40B00000,</div><div class='add'>+		0x1D94, 0x40B10000,</div><div class='add'>+		0x1D94, 0x40B20000,</div><div class='add'>+		0x1D94, 0x40B30000,</div><div class='add'>+		0x1D94, 0x40B40000,</div><div class='add'>+		0x1D94, 0x40B50000,</div><div class='add'>+		0x1D94, 0x40B60000,</div><div class='add'>+		0x1D94, 0x40B70000,</div><div class='add'>+		0x1D94, 0x40B80000,</div><div class='add'>+		0x1D94, 0x40B90000,</div><div class='add'>+		0x1D94, 0x40BA0000,</div><div class='add'>+		0x1D94, 0x40BB0000,</div><div class='add'>+		0x1D94, 0x40BC0000,</div><div class='add'>+		0x1D94, 0x40BD0000,</div><div class='add'>+		0x1D94, 0x40BE0000,</div><div class='add'>+		0x1D94, 0x40BF0000,</div><div class='add'>+		0x1D94, 0x40C00000,</div><div class='add'>+		0x1D94, 0x40C10000,</div><div class='add'>+		0x1D94, 0x40C20000,</div><div class='add'>+		0x1D94, 0x40C30000,</div><div class='add'>+		0x1D94, 0x40C40000,</div><div class='add'>+		0x1D94, 0x40C50000,</div><div class='add'>+		0x1D94, 0x40C60000,</div><div class='add'>+		0x1D94, 0x40C70000,</div><div class='add'>+		0x1D94, 0x40C80000,</div><div class='add'>+		0x1D94, 0x40C90000,</div><div class='add'>+		0x1D94, 0x40CA0000,</div><div class='add'>+		0x1D94, 0x40CB0000,</div><div class='add'>+		0x1D94, 0x40CC0000,</div><div class='add'>+		0x1D94, 0x40CD0000,</div><div class='add'>+		0x1D94, 0x40CE0000,</div><div class='add'>+		0x1D94, 0x40CF0000,</div><div class='add'>+		0x1D94, 0x40D00000,</div><div class='add'>+		0x1D94, 0x40D10000,</div><div class='add'>+		0x1D94, 0x40D20000,</div><div class='add'>+		0x1D94, 0x40D30000,</div><div class='add'>+		0x1D94, 0x40D40000,</div><div class='add'>+		0x1D94, 0x40D50000,</div><div class='add'>+		0x1D94, 0x40D60000,</div><div class='add'>+		0x1D94, 0x40D70000,</div><div class='add'>+		0x1D94, 0x40D80000,</div><div class='add'>+		0x1D94, 0x40D90000,</div><div class='add'>+		0x1D94, 0x40DA0000,</div><div class='add'>+		0x1D94, 0x40DB0000,</div><div class='add'>+		0x1D94, 0x40DC0000,</div><div class='add'>+		0x1D94, 0x40DD0000,</div><div class='add'>+		0x1D94, 0x40DE0000,</div><div class='add'>+		0x1D94, 0x40DF0000,</div><div class='add'>+		0x1D94, 0x40E00000,</div><div class='add'>+		0x1D94, 0x40E10000,</div><div class='add'>+		0x1D94, 0x40E20000,</div><div class='add'>+		0x1D94, 0x40E30000,</div><div class='add'>+		0x1D94, 0x40E40000,</div><div class='add'>+		0x1D94, 0x40E50000,</div><div class='add'>+		0x1D94, 0x40E60000,</div><div class='add'>+		0x1D94, 0x40E70000,</div><div class='add'>+		0x1D94, 0x40E80000,</div><div class='add'>+		0x1D94, 0x40E90000,</div><div class='add'>+		0x1D94, 0x40EA0000,</div><div class='add'>+		0x1D94, 0x40EB0000,</div><div class='add'>+		0x1D94, 0x40EC0000,</div><div class='add'>+		0x1D94, 0x40ED0000,</div><div class='add'>+		0x1D94, 0x40EE0000,</div><div class='add'>+		0x1D94, 0x40EF0000,</div><div class='add'>+		0x1D94, 0x40F00000,</div><div class='add'>+		0x1D94, 0x40F10000,</div><div class='add'>+		0x1D94, 0x40F20000,</div><div class='add'>+		0x1D94, 0x40F30000,</div><div class='add'>+		0x1D94, 0x40F40000,</div><div class='add'>+		0x1D94, 0x40F50000,</div><div class='add'>+		0x1D94, 0x40F60000,</div><div class='add'>+		0x1D94, 0x40F70000,</div><div class='add'>+		0x1D94, 0x40F80000,</div><div class='add'>+		0x1D94, 0x40F90000,</div><div class='add'>+		0x1D94, 0x40FA0000,</div><div class='add'>+		0x1D94, 0x40FB0000,</div><div class='add'>+		0x1D94, 0x40FC0000,</div><div class='add'>+		0x1D94, 0x40FD0000,</div><div class='add'>+		0x1D94, 0x40FE0000,</div><div class='add'>+		0x1D94, 0x40FF0000,</div><div class='add'>+		0xC0C, 0x02F1D8B7,</div><div class='add'>+		0x1EE8, 0x00000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822c_bb, rtw_phy_cfg_bb);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_bb_pg_type0[] = {</div><div class='add'>+	0, 0, 0, 0x00000c20, 0xffffffff, 0x484c5054,</div><div class='add'>+	0, 0, 0, 0x00000c24, 0xffffffff, 0x54585c60,</div><div class='add'>+	0, 0, 0, 0x00000c28, 0xffffffff, 0x44484c50,</div><div class='add'>+	0, 0, 0, 0x00000c2c, 0xffffffff, 0x5054585c,</div><div class='add'>+	0, 0, 0, 0x00000c30, 0xffffffff, 0x4044484c,</div><div class='add'>+	0, 0, 1, 0x00000c34, 0xffffffff, 0x5054585c,</div><div class='add'>+	0, 0, 1, 0x00000c38, 0xffffffff, 0x4044484c,</div><div class='add'>+	0, 0, 0, 0x00000c3c, 0xffffffff, 0x5054585c,</div><div class='add'>+	0, 0, 0, 0x00000c40, 0xffffffff, 0x4044484c,</div><div class='add'>+	0, 0, 0, 0x00000c44, 0xffffffff, 0x585c383c,</div><div class='add'>+	0, 0, 1, 0x00000c48, 0xffffffff, 0x484c5054,</div><div class='add'>+	0, 0, 1, 0x00000c4c, 0xffffffff, 0x383c4044,</div><div class='add'>+	0, 1, 0, 0x00000e20, 0xffffffff, 0x484c5054,</div><div class='add'>+	0, 1, 0, 0x00000e24, 0xffffffff, 0x54585c60,</div><div class='add'>+	0, 1, 0, 0x00000e28, 0xffffffff, 0x44484c50,</div><div class='add'>+	0, 1, 0, 0x00000e2c, 0xffffffff, 0x5054585c,</div><div class='add'>+	0, 1, 0, 0x00000e30, 0xffffffff, 0x4044484c,</div><div class='add'>+	0, 1, 1, 0x00000e34, 0xffffffff, 0x5054585c,</div><div class='add'>+	0, 1, 1, 0x00000e38, 0xffffffff, 0x4044484c,</div><div class='add'>+	0, 1, 0, 0x00000e3c, 0xffffffff, 0x5054585c,</div><div class='add'>+	0, 1, 0, 0x00000e40, 0xffffffff, 0x4044484c,</div><div class='add'>+	0, 1, 0, 0x00000e44, 0xffffffff, 0x585c383c,</div><div class='add'>+	0, 1, 1, 0x00000e48, 0xffffffff, 0x484c5054,</div><div class='add'>+	0, 1, 1, 0x00000e4c, 0xffffffff, 0x383c4044,</div><div class='add'>+	1, 0, 0, 0x00000c24, 0xffffffff, 0x54585c60,</div><div class='add'>+	1, 0, 0, 0x00000c28, 0xffffffff, 0x44484c50,</div><div class='add'>+	1, 0, 0, 0x00000c2c, 0xffffffff, 0x5054585c,</div><div class='add'>+	1, 0, 0, 0x00000c30, 0xffffffff, 0x4044484c,</div><div class='add'>+	1, 0, 1, 0x00000c34, 0xffffffff, 0x5054585c,</div><div class='add'>+	1, 0, 1, 0x00000c38, 0xffffffff, 0x4044484c,</div><div class='add'>+	1, 0, 0, 0x00000c3c, 0xffffffff, 0x5054585c,</div><div class='add'>+	1, 0, 0, 0x00000c40, 0xffffffff, 0x4044484c,</div><div class='add'>+	1, 0, 0, 0x00000c44, 0xffffffff, 0x585c383c,</div><div class='add'>+	1, 0, 1, 0x00000c48, 0xffffffff, 0x484c5054,</div><div class='add'>+	1, 0, 1, 0x00000c4c, 0xffffffff, 0x383c4044,</div><div class='add'>+	1, 1, 0, 0x00000e24, 0xffffffff, 0x54585c60,</div><div class='add'>+	1, 1, 0, 0x00000e28, 0xffffffff, 0x44484c50,</div><div class='add'>+	1, 1, 0, 0x00000e2c, 0xffffffff, 0x5054585c,</div><div class='add'>+	1, 1, 0, 0x00000e30, 0xffffffff, 0x4044484c,</div><div class='add'>+	1, 1, 1, 0x00000e34, 0xffffffff, 0x5054585c,</div><div class='add'>+	1, 1, 1, 0x00000e38, 0xffffffff, 0x4044484c,</div><div class='add'>+	1, 1, 0, 0x00000e3c, 0xffffffff, 0x5054585c,</div><div class='add'>+	1, 1, 0, 0x00000e40, 0xffffffff, 0x4044484c,</div><div class='add'>+	1, 1, 0, 0x00000e44, 0xffffffff, 0x585c383c,</div><div class='add'>+	1, 1, 1, 0x00000e48, 0xffffffff, 0x484c5054,</div><div class='add'>+	1, 1, 1, 0x00000e4c, 0xffffffff, 0x383c4044</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_BB_PG(rtw8822c_bb_pg_type0);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_rf_a[] = {</div><div class='add'>+		0x000, 0x00030000,</div><div class='add'>+		0x018, 0x00013124,</div><div class='add'>+		0x093, 0x0008483F,</div><div class='add'>+		0x0DE, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000B9140,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000B9140,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000FC01,</div><div class='add'>+		0x081, 0x0002FC01,</div><div class='add'>+		0x081, 0x0003FC01,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000033,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000043,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000053,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000E7DE3,</div><div class='add'>+		0x08B, 0x0008FE00,</div><div class='add'>+		0x0EE, 0x00000008,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000023,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000023,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x0EF, 0x00004000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000000F,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x01B, 0x00003A40,</div><div class='add'>+		0x061, 0x0000D233,</div><div class='add'>+		0x062, 0x0004D232,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000C02,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000200,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000233,</div><div class='add'>+		0x030, 0x00001233,</div><div class='add'>+		0x030, 0x00002233,</div><div class='add'>+		0x030, 0x00003233,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005233,</div><div class='add'>+		0x030, 0x00006233,</div><div class='add'>+		0x030, 0x00007233,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009233,</div><div class='add'>+		0x030, 0x0000A233,</div><div class='add'>+		0x030, 0x0000B233,</div><div class='add'>+		0x030, 0x0000C233,</div><div class='add'>+		0x030, 0x0000D233,</div><div class='add'>+		0x030, 0x0000E203,</div><div class='add'>+		0x030, 0x0000F233,</div><div class='add'>+		0x030, 0x00010233,</div><div class='add'>+		0x030, 0x00011233,</div><div class='add'>+		0x030, 0x00012203,</div><div class='add'>+		0x030, 0x00013233,</div><div class='add'>+		0x030, 0x00014233,</div><div class='add'>+		0x030, 0x00015233,</div><div class='add'>+		0x030, 0x00016203,</div><div class='add'>+		0x030, 0x00017233,</div><div class='add'>+		0x030, 0x00018203,</div><div class='add'>+		0x030, 0x00019233,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000080,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000232,</div><div class='add'>+		0x030, 0x00001232,</div><div class='add'>+		0x030, 0x00002232,</div><div class='add'>+		0x030, 0x00003232,</div><div class='add'>+		0x030, 0x00004232,</div><div class='add'>+		0x030, 0x00005232,</div><div class='add'>+		0x030, 0x00006232,</div><div class='add'>+		0x030, 0x00007232,</div><div class='add'>+		0x030, 0x00008232,</div><div class='add'>+		0x030, 0x00009232,</div><div class='add'>+		0x030, 0x0000A232,</div><div class='add'>+		0x030, 0x0000B232,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000040,</div><div class='add'>+		0x030, 0x00000770,</div><div class='add'>+		0x030, 0x00001770,</div><div class='add'>+		0x030, 0x00002440,</div><div class='add'>+		0x030, 0x00003440,</div><div class='add'>+		0x030, 0x00004330,</div><div class='add'>+		0x030, 0x00005330,</div><div class='add'>+		0x030, 0x00008770,</div><div class='add'>+		0x030, 0x0000A440,</div><div class='add'>+		0x030, 0x0000C330,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EE, 0x00010000,</div><div class='add'>+		0x033, 0x00000200,</div><div class='add'>+		0x03F, 0x0000006A,</div><div class='add'>+		0x033, 0x00000201,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000202,</div><div class='add'>+		0x03F, 0x0000046A,</div><div class='add'>+		0x033, 0x00000203,</div><div class='add'>+		0x03F, 0x0000086A,</div><div class='add'>+		0x033, 0x00000204,</div><div class='add'>+		0x03F, 0x00000C89,</div><div class='add'>+		0x033, 0x00000205,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000206,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000207,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000208,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000209,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000020A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+		0x033, 0x00000280,</div><div class='add'>+		0x03F, 0x0000006A,</div><div class='add'>+		0x033, 0x00000281,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000282,</div><div class='add'>+		0x03F, 0x0000046A,</div><div class='add'>+		0x033, 0x00000283,</div><div class='add'>+		0x03F, 0x0000086A,</div><div class='add'>+		0x033, 0x00000284,</div><div class='add'>+		0x03F, 0x00000C89,</div><div class='add'>+		0x033, 0x00000285,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000286,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000287,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000288,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000289,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000028A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+		0x033, 0x00000300,</div><div class='add'>+		0x03F, 0x0000006A,</div><div class='add'>+		0x033, 0x00000301,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000302,</div><div class='add'>+		0x03F, 0x0000046A,</div><div class='add'>+		0x033, 0x00000303,</div><div class='add'>+		0x03F, 0x0000086A,</div><div class='add'>+		0x033, 0x00000304,</div><div class='add'>+		0x03F, 0x00000C89,</div><div class='add'>+		0x033, 0x00000305,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000306,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000307,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000308,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000309,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000030A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x051, 0x0003C800,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x052, 0x000942CA,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x053, 0x000090F9,</div><div class='add'>+		0x054, 0x00088000,</div><div class='add'>+		0x057, 0x0004C80A,</div><div class='add'>+		0x0EF, 0x00000020,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00010E46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00030246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00031E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000EA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00021E46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00002A46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EE, 0x00010000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000487,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000887,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000947,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D48,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D88,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000DE8,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000487,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000887,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000947,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D48,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D88,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000DE8,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x05C, 0x000FCC00,</div><div class='add'>+		0x067, 0x0000A505,</div><div class='add'>+		0x0D3, 0x00000542,</div><div class='add'>+		0x043, 0x00005000,</div><div class='add'>+		0x07F, 0x00000000,</div><div class='add'>+		0x0B0, 0x0001F0FC,</div><div class='add'>+		0x0B1, 0x0007DBE4,</div><div class='add'>+		0x0B2, 0x00022400,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0B4, 0x00099D40,</div><div class='add'>+		0x0B5, 0x0004103F,</div><div class='add'>+		0x0B6, 0x000187F8,</div><div class='add'>+		0x0B7, 0x00030018,</div><div class='add'>+		0x0BC, 0x00000008,</div><div class='add'>+		0x0D3, 0x00000542,</div><div class='add'>+		0x0DD, 0x00000500,</div><div class='add'>+		0x0BB, 0x00040010,</div><div class='add'>+		0x0B0, 0x0001F0FA,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0CA, 0x00080000,</div><div class='add'>+		0x0CA, 0x00080001,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0B0, 0x0001F0F8,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C700,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x018, 0x0001B124,</div><div class='add'>+		0xFFE, 0x00000000,</div><div class='add'>+		0xFFE, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0B3, 0x0007C760,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x018, 0x00013124,</div><div class='add'>+		0x0CC, 0x0000F000,</div><div class='add'>+		0x0CD, 0x00089600,</div><div class='add'>+		0x018, 0x00013108,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0B8, 0x000C0440,</div><div class='add'>+		0x0BA, 0x000E840D,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x018, 0x00013124,</div><div class='add'>+		0x059, 0x000A0000,</div><div class='add'>+		0x05A, 0x00060000,</div><div class='add'>+		0x05B, 0x00014000,</div><div class='add'>+		0x0ED, 0x00000008,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000000F,</div><div class='add'>+		0x0ED, 0x00000000,</div><div class='add'>+		0x0EE, 0x00000002,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x0ED, 0x00000200,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x000F45A4,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x000F49A4,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x000F49A4,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x000F69A4,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x000F69A4,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x000F69A4,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000F6DA4,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x000F6DA4,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000F6DA4,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x000F8DA4,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000F8DA4,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000F8DA4,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000F91A4,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000F91A4,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000F91A4,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000FB1A4,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03F, 0x000FB1A4,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03F, 0x000FB1A4,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03F, 0x000FB5A4,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03F, 0x000FB5A4,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x000FD9A4,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x000FD9A4,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000FF9A4,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x000FF9A4,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FFDA4,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x000FFDA4,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000FFDA4,</div><div class='add'>+		0x0ED, 0x00000000,</div><div class='add'>+		0x092, 0x00084800,</div><div class='add'>+		0x092, 0x00084801,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x092, 0x00084800,</div><div class='add'>+		0x08F, 0x0000182C,</div><div class='add'>+		0x088, 0x0004326B,</div><div class='add'>+		0x019, 0x00000005,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_RF_RADIO(rtw8822c_rf_a, A);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_rf_b[] = {</div><div class='add'>+		0x000, 0x00030000,</div><div class='add'>+		0x018, 0x00013124,</div><div class='add'>+		0x093, 0x0008483F,</div><div class='add'>+		0x0EF, 0x00080000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00091020,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0DE, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000B9140,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000B9140,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x08E, 0x000A5540,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x081, 0x0000FC01,</div><div class='add'>+		0x081, 0x0002FC01,</div><div class='add'>+		0x081, 0x0003FC01,</div><div class='add'>+		0x085, 0x0006A06C,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000002A,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000010,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00010000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000003F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000003E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000003D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000003C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000003B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000003A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000039,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000038,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000037,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000036,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000035,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000034,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000033,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000004F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000004E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000004D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000004C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000004B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000004A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000049,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000048,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000047,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000046,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000045,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000044,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000043,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773C0,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3C0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF3E8,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000005F,</div><div class='add'>+		0x03F, 0x000773E8,</div><div class='add'>+		0x033, 0x0000005E,</div><div class='add'>+		0x03F, 0x000FF3A0,</div><div class='add'>+		0x033, 0x0000005D,</div><div class='add'>+		0x03F, 0x00000380,</div><div class='add'>+		0x033, 0x0000005C,</div><div class='add'>+		0x03F, 0x000FF380,</div><div class='add'>+		0x033, 0x0000005B,</div><div class='add'>+		0x03F, 0x00000300,</div><div class='add'>+		0x033, 0x0000005A,</div><div class='add'>+		0x03F, 0x000002A8,</div><div class='add'>+		0x033, 0x00000059,</div><div class='add'>+		0x03F, 0x00000280,</div><div class='add'>+		0x033, 0x00000058,</div><div class='add'>+		0x03F, 0x000FF280,</div><div class='add'>+		0x033, 0x00000057,</div><div class='add'>+		0x03F, 0x00000200,</div><div class='add'>+		0x033, 0x00000056,</div><div class='add'>+		0x03F, 0x000001C0,</div><div class='add'>+		0x033, 0x00000055,</div><div class='add'>+		0x03F, 0x00000180,</div><div class='add'>+		0x033, 0x00000054,</div><div class='add'>+		0x03F, 0x00000040,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000053,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x08A, 0x000E7DE3,</div><div class='add'>+		0x08B, 0x0008FE00,</div><div class='add'>+		0x0EE, 0x00000008,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x00000023,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03F, 0x00000023,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x0EF, 0x00004000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03F, 0x0000000F,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002F81C,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001C86,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00020000,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00001910,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00001C02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000F02,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002B,</div><div class='add'>+		0x03E, 0x00000F00,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002C,</div><div class='add'>+		0x03E, 0x00000086,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002D,</div><div class='add'>+		0x03E, 0x00000002,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002E,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x00020000,</div><div class='add'>+		0x033, 0x0000002F,</div><div class='add'>+		0x03E, 0x00000000,</div><div class='add'>+		0x03F, 0x0002C010,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x01B, 0x00003A40,</div><div class='add'>+		0x061, 0x0000D233,</div><div class='add'>+		0x062, 0x0004D232,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000002,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x063, 0x00000C02,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000200,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000237,</div><div class='add'>+		0x030, 0x00001237,</div><div class='add'>+		0x030, 0x00002237,</div><div class='add'>+		0x030, 0x00003237,</div><div class='add'>+		0x030, 0x00004207,</div><div class='add'>+		0x030, 0x00005237,</div><div class='add'>+		0x030, 0x00006237,</div><div class='add'>+		0x030, 0x00007237,</div><div class='add'>+		0x030, 0x00008207,</div><div class='add'>+		0x030, 0x00009237,</div><div class='add'>+		0x030, 0x0000A237,</div><div class='add'>+		0x030, 0x0000B237,</div><div class='add'>+		0x030, 0x0000C237,</div><div class='add'>+		0x030, 0x0000D237,</div><div class='add'>+		0x030, 0x0000E207,</div><div class='add'>+		0x030, 0x0000F237,</div><div class='add'>+		0x030, 0x00010237,</div><div class='add'>+		0x030, 0x00011237,</div><div class='add'>+		0x030, 0x00012207,</div><div class='add'>+		0x030, 0x00013237,</div><div class='add'>+		0x030, 0x00014237,</div><div class='add'>+		0x030, 0x00015237,</div><div class='add'>+		0x030, 0x00016207,</div><div class='add'>+		0x030, 0x00017237,</div><div class='add'>+		0x030, 0x00018207,</div><div class='add'>+		0x030, 0x00019237,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000233,</div><div class='add'>+		0x030, 0x00001233,</div><div class='add'>+		0x030, 0x00002233,</div><div class='add'>+		0x030, 0x00003233,</div><div class='add'>+		0x030, 0x00004203,</div><div class='add'>+		0x030, 0x00005233,</div><div class='add'>+		0x030, 0x00006233,</div><div class='add'>+		0x030, 0x00007233,</div><div class='add'>+		0x030, 0x00008203,</div><div class='add'>+		0x030, 0x00009233,</div><div class='add'>+		0x030, 0x0000A233,</div><div class='add'>+		0x030, 0x0000B233,</div><div class='add'>+		0x030, 0x0000C233,</div><div class='add'>+		0x030, 0x0000D233,</div><div class='add'>+		0x030, 0x0000E203,</div><div class='add'>+		0x030, 0x0000F233,</div><div class='add'>+		0x030, 0x00010233,</div><div class='add'>+		0x030, 0x00011233,</div><div class='add'>+		0x030, 0x00012203,</div><div class='add'>+		0x030, 0x00013233,</div><div class='add'>+		0x030, 0x00014233,</div><div class='add'>+		0x030, 0x00015233,</div><div class='add'>+		0x030, 0x00016203,</div><div class='add'>+		0x030, 0x00017233,</div><div class='add'>+		0x030, 0x00018203,</div><div class='add'>+		0x030, 0x00019233,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000080,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000334,</div><div class='add'>+		0x030, 0x00001334,</div><div class='add'>+		0x030, 0x00002334,</div><div class='add'>+		0x030, 0x00003334,</div><div class='add'>+		0x030, 0x00004334,</div><div class='add'>+		0x030, 0x00005334,</div><div class='add'>+		0x030, 0x00006334,</div><div class='add'>+		0x030, 0x00007334,</div><div class='add'>+		0x030, 0x00008334,</div><div class='add'>+		0x030, 0x00009334,</div><div class='add'>+		0x030, 0x0000A334,</div><div class='add'>+		0x030, 0x0000B334,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x030, 0x00000232,</div><div class='add'>+		0x030, 0x00001232,</div><div class='add'>+		0x030, 0x00002232,</div><div class='add'>+		0x030, 0x00003232,</div><div class='add'>+		0x030, 0x00004232,</div><div class='add'>+		0x030, 0x00005232,</div><div class='add'>+		0x030, 0x00006232,</div><div class='add'>+		0x030, 0x00007232,</div><div class='add'>+		0x030, 0x00008232,</div><div class='add'>+		0x030, 0x00009232,</div><div class='add'>+		0x030, 0x0000A232,</div><div class='add'>+		0x030, 0x0000B232,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EF, 0x00000040,</div><div class='add'>+		0x030, 0x00000770,</div><div class='add'>+		0x030, 0x00001770,</div><div class='add'>+		0x030, 0x00002440,</div><div class='add'>+		0x030, 0x00003440,</div><div class='add'>+		0x030, 0x00004330,</div><div class='add'>+		0x030, 0x00005330,</div><div class='add'>+		0x030, 0x00008770,</div><div class='add'>+		0x030, 0x0000A440,</div><div class='add'>+		0x030, 0x0000C330,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EE, 0x00010000,</div><div class='add'>+		0x033, 0x00000200,</div><div class='add'>+		0x03F, 0x0000006A,</div><div class='add'>+		0x033, 0x00000201,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000202,</div><div class='add'>+		0x03F, 0x0000046A,</div><div class='add'>+		0x033, 0x00000203,</div><div class='add'>+		0x03F, 0x0000086A,</div><div class='add'>+		0x033, 0x00000204,</div><div class='add'>+		0x03F, 0x00000C89,</div><div class='add'>+		0x033, 0x00000205,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000206,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000207,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000208,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000209,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000020A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+		0x033, 0x00000280,</div><div class='add'>+		0x03F, 0x0000006A,</div><div class='add'>+		0x033, 0x00000281,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000282,</div><div class='add'>+		0x03F, 0x0000046A,</div><div class='add'>+		0x033, 0x00000283,</div><div class='add'>+		0x03F, 0x0000086A,</div><div class='add'>+		0x033, 0x00000284,</div><div class='add'>+		0x03F, 0x00000C89,</div><div class='add'>+		0x033, 0x00000285,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000286,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000287,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000288,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000289,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000028A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+		0x033, 0x00000300,</div><div class='add'>+		0x03F, 0x0000006A,</div><div class='add'>+		0x033, 0x00000301,</div><div class='add'>+		0x03F, 0x0000006D,</div><div class='add'>+		0x033, 0x00000302,</div><div class='add'>+		0x03F, 0x0000046A,</div><div class='add'>+		0x033, 0x00000303,</div><div class='add'>+		0x03F, 0x0000086A,</div><div class='add'>+		0x033, 0x00000304,</div><div class='add'>+		0x03F, 0x00000C89,</div><div class='add'>+		0x033, 0x00000305,</div><div class='add'>+		0x03F, 0x00000CE8,</div><div class='add'>+		0x033, 0x00000306,</div><div class='add'>+		0x03F, 0x00000CEB,</div><div class='add'>+		0x033, 0x00000307,</div><div class='add'>+		0x03F, 0x00000CEE,</div><div class='add'>+		0x033, 0x00000308,</div><div class='add'>+		0x03F, 0x00000CF1,</div><div class='add'>+		0x033, 0x00000309,</div><div class='add'>+		0x03F, 0x00000CF4,</div><div class='add'>+		0x033, 0x0000030A,</div><div class='add'>+		0x03F, 0x00000CF7,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x051, 0x0003C800,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x052, 0x000902CA,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x052, 0x000942C0,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x053, 0x000090F9,</div><div class='add'>+		0x054, 0x00088000,</div><div class='add'>+		0x057, 0x0004C80A,</div><div class='add'>+		0x0EF, 0x00000020,</div><div class='add'>+		0x033, 0x00000000,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000001,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000002,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000003,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000004,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000005,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000006,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000007,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000008,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0000C246,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000009,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000A,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000B,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000C,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000D,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000E,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000000F,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000010,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000011,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00024246,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002C246,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000012,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000013,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000014,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000015,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000016,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001D,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001E,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000001F,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0002CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03E, 0x00000020,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x03F, 0x0001CA46,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x03F, 0x00008E46,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EF, 0x00000000,</div><div class='add'>+		0x0EE, 0x00010000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000060,</div><div class='add'>+		0x03F, 0x00000487,</div><div class='add'>+		0x033, 0x00000061,</div><div class='add'>+		0x03F, 0x00000887,</div><div class='add'>+		0x033, 0x00000062,</div><div class='add'>+		0x03F, 0x00000947,</div><div class='add'>+		0x033, 0x00000063,</div><div class='add'>+		0x03F, 0x00000D48,</div><div class='add'>+		0x033, 0x00000064,</div><div class='add'>+		0x03F, 0x00000D88,</div><div class='add'>+		0x033, 0x00000065,</div><div class='add'>+		0x03F, 0x00000DE8,</div><div class='add'>+		0x033, 0x00000066,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000067,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000068,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000069,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000006A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+	0x81000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x91000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x92000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000001,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0x93000002,	0x00000000,	0x40000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000468,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000868,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000909,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D0A,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D4A,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000D8B,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xA0000000,	0x00000000,</div><div class='add'>+		0x033, 0x00000020,</div><div class='add'>+		0x03F, 0x00000487,</div><div class='add'>+		0x033, 0x00000021,</div><div class='add'>+		0x03F, 0x00000887,</div><div class='add'>+		0x033, 0x00000022,</div><div class='add'>+		0x03F, 0x00000947,</div><div class='add'>+		0x033, 0x00000023,</div><div class='add'>+		0x03F, 0x00000D48,</div><div class='add'>+		0x033, 0x00000024,</div><div class='add'>+		0x03F, 0x00000D88,</div><div class='add'>+		0x033, 0x00000025,</div><div class='add'>+		0x03F, 0x00000DE8,</div><div class='add'>+		0x033, 0x00000026,</div><div class='add'>+		0x03F, 0x00000DEB,</div><div class='add'>+		0x033, 0x00000027,</div><div class='add'>+		0x03F, 0x00000DEE,</div><div class='add'>+		0x033, 0x00000028,</div><div class='add'>+		0x03F, 0x00000DF1,</div><div class='add'>+		0x033, 0x00000029,</div><div class='add'>+		0x03F, 0x00000DF4,</div><div class='add'>+		0x033, 0x0000002A,</div><div class='add'>+		0x03F, 0x00000DF7,</div><div class='add'>+	0xB0000000,	0x00000000,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x05C, 0x000FCC00,</div><div class='add'>+		0x067, 0x0000A505,</div><div class='add'>+		0x0D3, 0x00000542,</div><div class='add'>+		0x043, 0x00005000,</div><div class='add'>+		0x059, 0x000A0000,</div><div class='add'>+		0x05A, 0x00060000,</div><div class='add'>+		0x05B, 0x00014000,</div><div class='add'>+		0x001, 0x00040000,</div><div class='add'>+		0x0EE, 0x00000002,</div><div class='add'>+		0x033, 0x00000017,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000018,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x00000019,</div><div class='add'>+		0x03F, 0x00000000,</div><div class='add'>+		0x033, 0x0000001A,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x0000001B,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x033, 0x0000001C,</div><div class='add'>+		0x03F, 0x0000003F,</div><div class='add'>+		0x0EE, 0x00000000,</div><div class='add'>+		0x092, 0x00084800,</div><div class='add'>+		0x092, 0x00084801,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x0FE, 0x00000000,</div><div class='add'>+		0x092, 0x00084800,</div><div class='add'>+		0x08F, 0x0000182C,</div><div class='add'>+		0x088, 0x0004326B,</div><div class='add'>+		0x019, 0x00000005,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_RF_RADIO(rtw8822c_rf_b, B);</div><div class='add'>+</div><div class='add'>+static const u8 rtw8822c_txpwr_lmt_type0[] = {</div><div class='add'>+	0, 0, 0, 0, 1, 72, 2, 0, 0, 0, 1, 60,</div><div class='add'>+	0, 0, 0, 0, 2, 72, 2, 0, 0, 0, 2, 60,</div><div class='add'>+	0, 0, 0, 0, 3, 76, 2, 0, 0, 0, 3, 60,</div><div class='add'>+	0, 0, 0, 0, 4, 76, 2, 0, 0, 0, 4, 60,</div><div class='add'>+	0, 0, 0, 0, 5, 76, 2, 0, 0, 0, 5, 60,</div><div class='add'>+	0, 0, 0, 0, 6, 76, 2, 0, 0, 0, 6, 60,</div><div class='add'>+	0, 0, 0, 0, 7, 76, 2, 0, 0, 0, 7, 60,</div><div class='add'>+	0, 0, 0, 0, 8, 76, 2, 0, 0, 0, 8, 60,</div><div class='add'>+	0, 0, 0, 0, 9, 76, 2, 0, 0, 0, 9, 60,</div><div class='add'>+	0, 0, 0, 0, 10, 72, 2, 0, 0, 0, 10, 60,</div><div class='add'>+	0, 0, 0, 0, 11, 72, 2, 0, 0, 0, 11, 60,</div><div class='add'>+	0, 0, 0, 0, 12, 52, 2, 0, 0, 0, 12, 60,</div><div class='add'>+	0, 0, 0, 0, 13, 48, 2, 0, 0, 0, 13, 60,</div><div class='add'>+	0, 0, 0, 0, 14, 127, 2, 0, 0, 0, 14, 127,</div><div class='add'>+	0, 0, 0, 1, 1, 52, 2, 0, 0, 1, 1, 60,</div><div class='add'>+	0, 0, 0, 1, 2, 60, 2, 0, 0, 1, 2, 60,</div><div class='add'>+	0, 0, 0, 1, 3, 64, 2, 0, 0, 1, 3, 60,</div><div class='add'>+	0, 0, 0, 1, 4, 68, 2, 0, 0, 1, 4, 60,</div><div class='add'>+	0, 0, 0, 1, 5, 76, 2, 0, 0, 1, 5, 60,</div><div class='add'>+	0, 0, 0, 1, 6, 76, 2, 0, 0, 1, 6, 60,</div><div class='add'>+	0, 0, 0, 1, 7, 76, 2, 0, 0, 1, 7, 60,</div><div class='add'>+	0, 0, 0, 1, 8, 68, 2, 0, 0, 1, 8, 60,</div><div class='add'>+	0, 0, 0, 1, 9, 64, 2, 0, 0, 1, 9, 60,</div><div class='add'>+	0, 0, 0, 1, 10, 60, 2, 0, 0, 1, 10, 60,</div><div class='add'>+	0, 0, 0, 1, 11, 52, 2, 0, 0, 1, 11, 60,</div><div class='add'>+	0, 0, 0, 1, 12, 40, 2, 0, 0, 1, 12, 60,</div><div class='add'>+	0, 0, 0, 1, 13, 28, 2, 0, 0, 1, 13, 60,</div><div class='add'>+	0, 0, 0, 1, 14, 127, 2, 0, 0, 1, 14, 127,</div><div class='add'>+	0, 0, 0, 2, 1, 52, 2, 0, 0, 2, 1, 60,</div><div class='add'>+	0, 0, 0, 2, 2, 60, 2, 0, 0, 2, 2, 60,</div><div class='add'>+	0, 0, 0, 2, 3, 64, 2, 0, 0, 2, 3, 60,</div><div class='add'>+	0, 0, 0, 2, 4, 68, 2, 0, 0, 2, 4, 60,</div><div class='add'>+	0, 0, 0, 2, 5, 76, 2, 0, 0, 2, 5, 60,</div><div class='add'>+	0, 0, 0, 2, 6, 76, 2, 0, 0, 2, 6, 60,</div><div class='add'>+	0, 0, 0, 2, 7, 76, 2, 0, 0, 2, 7, 60,</div><div class='add'>+	0, 0, 0, 2, 8, 68, 2, 0, 0, 2, 8, 60,</div><div class='add'>+	0, 0, 0, 2, 9, 64, 2, 0, 0, 2, 9, 60,</div><div class='add'>+	0, 0, 0, 2, 10, 60, 2, 0, 0, 2, 10, 60,</div><div class='add'>+	0, 0, 0, 2, 11, 52, 2, 0, 0, 2, 11, 60,</div><div class='add'>+	0, 0, 0, 2, 12, 40, 2, 0, 0, 2, 12, 60,</div><div class='add'>+	0, 0, 0, 2, 13, 28, 2, 0, 0, 2, 13, 60,</div><div class='add'>+	0, 0, 0, 2, 14, 127, 2, 0, 0, 2, 14, 127,</div><div class='add'>+	0, 0, 0, 3, 1, 52, 2, 0, 0, 3, 1, 36,</div><div class='add'>+	0, 0, 0, 3, 2, 60, 2, 0, 0, 3, 2, 36,</div><div class='add'>+	0, 0, 0, 3, 3, 64, 2, 0, 0, 3, 3, 36,</div><div class='add'>+	0, 0, 0, 3, 4, 68, 2, 0, 0, 3, 4, 36,</div><div class='add'>+	0, 0, 0, 3, 5, 76, 2, 0, 0, 3, 5, 36,</div><div class='add'>+	0, 0, 0, 3, 6, 76, 2, 0, 0, 3, 6, 36,</div><div class='add'>+	0, 0, 0, 3, 7, 76, 2, 0, 0, 3, 7, 36,</div><div class='add'>+	0, 0, 0, 3, 8, 68, 2, 0, 0, 3, 8, 36,</div><div class='add'>+	0, 0, 0, 3, 9, 64, 2, 0, 0, 3, 9, 36,</div><div class='add'>+	0, 0, 0, 3, 10, 60, 2, 0, 0, 3, 10, 36,</div><div class='add'>+	0, 0, 0, 3, 11, 52, 2, 0, 0, 3, 11, 36,</div><div class='add'>+	0, 0, 0, 3, 12, 40, 2, 0, 0, 3, 12, 36,</div><div class='add'>+	0, 0, 0, 3, 13, 28, 2, 0, 0, 3, 13, 36,</div><div class='add'>+	0, 0, 0, 3, 14, 127, 2, 0, 0, 3, 14, 127,</div><div class='add'>+	0, 0, 1, 2, 1, 127, 2, 0, 1, 2, 1, 127,</div><div class='add'>+	0, 0, 1, 2, 2, 127, 2, 0, 1, 2, 2, 127,</div><div class='add'>+	0, 0, 1, 2, 3, 52, 2, 0, 1, 2, 3, 60,</div><div class='add'>+	0, 0, 1, 2, 4, 52, 2, 0, 1, 2, 4, 60,</div><div class='add'>+	0, 0, 1, 2, 5, 60, 2, 0, 1, 2, 5, 60,</div><div class='add'>+	0, 0, 1, 2, 6, 64, 2, 0, 1, 2, 6, 60,</div><div class='add'>+	0, 0, 1, 2, 7, 60, 2, 0, 1, 2, 7, 60,</div><div class='add'>+	0, 0, 1, 2, 8, 52, 2, 0, 1, 2, 8, 60,</div><div class='add'>+	0, 0, 1, 2, 9, 52, 2, 0, 1, 2, 9, 60,</div><div class='add'>+	0, 0, 1, 2, 10, 40, 2, 0, 1, 2, 10, 60,</div><div class='add'>+	0, 0, 1, 2, 11, 28, 2, 0, 1, 2, 11, 60,</div><div class='add'>+	0, 0, 1, 2, 12, 127, 2, 0, 1, 2, 12, 127,</div><div class='add'>+	0, 0, 1, 2, 13, 127, 2, 0, 1, 2, 13, 127,</div><div class='add'>+	0, 0, 1, 2, 14, 127, 2, 0, 1, 2, 14, 127,</div><div class='add'>+	0, 0, 1, 3, 1, 127, 2, 0, 1, 3, 1, 127,</div><div class='add'>+	0, 0, 1, 3, 2, 127, 2, 0, 1, 3, 2, 127,</div><div class='add'>+	0, 0, 1, 3, 3, 48, 2, 0, 1, 3, 3, 36,</div><div class='add'>+	0, 0, 1, 3, 4, 48, 2, 0, 1, 3, 4, 36,</div><div class='add'>+	0, 0, 1, 3, 5, 60, 2, 0, 1, 3, 5, 36,</div><div class='add'>+	0, 0, 1, 3, 6, 64, 2, 0, 1, 3, 6, 36,</div><div class='add'>+	0, 0, 1, 3, 7, 60, 2, 0, 1, 3, 7, 36,</div><div class='add'>+	0, 0, 1, 3, 8, 52, 2, 0, 1, 3, 8, 36,</div><div class='add'>+	0, 0, 1, 3, 9, 52, 2, 0, 1, 3, 9, 36,</div><div class='add'>+	0, 0, 1, 3, 10, 40, 2, 0, 1, 3, 10, 36,</div><div class='add'>+	0, 0, 1, 3, 11, 26, 2, 0, 1, 3, 11, 36,</div><div class='add'>+	0, 0, 1, 3, 12, 127, 2, 0, 1, 3, 12, 127,</div><div class='add'>+	0, 0, 1, 3, 13, 127, 2, 0, 1, 3, 13, 127,</div><div class='add'>+	0, 0, 1, 3, 14, 127, 2, 0, 1, 3, 14, 127,</div><div class='add'>+	0, 1, 0, 1, 36, 74, 2, 1, 0, 1, 36, 62,</div><div class='add'>+	0, 1, 0, 1, 40, 80, 2, 1, 0, 1, 40, 62,</div><div class='add'>+	0, 1, 0, 1, 44, 80, 2, 1, 0, 1, 44, 62,</div><div class='add'>+	0, 1, 0, 1, 48, 80, 2, 1, 0, 1, 48, 62,</div><div class='add'>+	0, 1, 0, 1, 52, 80, 2, 1, 0, 1, 52, 62,</div><div class='add'>+	0, 1, 0, 1, 56, 80, 2, 1, 0, 1, 56, 62,</div><div class='add'>+	0, 1, 0, 1, 60, 80, 2, 1, 0, 1, 60, 62,</div><div class='add'>+	0, 1, 0, 1, 64, 74, 2, 1, 0, 1, 64, 62,</div><div class='add'>+	0, 1, 0, 1, 100, 72, 2, 1, 0, 1, 100, 62,</div><div class='add'>+	0, 1, 0, 1, 104, 80, 2, 1, 0, 1, 104, 62,</div><div class='add'>+	0, 1, 0, 1, 108, 80, 2, 1, 0, 1, 108, 62,</div><div class='add'>+	0, 1, 0, 1, 112, 80, 2, 1, 0, 1, 112, 62,</div><div class='add'>+	0, 1, 0, 1, 116, 80, 2, 1, 0, 1, 116, 62,</div><div class='add'>+	0, 1, 0, 1, 120, 80, 2, 1, 0, 1, 120, 62,</div><div class='add'>+	0, 1, 0, 1, 124, 80, 2, 1, 0, 1, 124, 62,</div><div class='add'>+	0, 1, 0, 1, 128, 80, 2, 1, 0, 1, 128, 62,</div><div class='add'>+	0, 1, 0, 1, 132, 80, 2, 1, 0, 1, 132, 62,</div><div class='add'>+	0, 1, 0, 1, 136, 80, 2, 1, 0, 1, 136, 62,</div><div class='add'>+	0, 1, 0, 1, 140, 72, 2, 1, 0, 1, 140, 62,</div><div class='add'>+	0, 1, 0, 1, 144, 80, 2, 1, 0, 1, 144, 127,</div><div class='add'>+	0, 1, 0, 1, 149, 80, 2, 1, 0, 1, 149, 127,</div><div class='add'>+	0, 1, 0, 1, 153, 80, 2, 1, 0, 1, 153, 127,</div><div class='add'>+	0, 1, 0, 1, 157, 80, 2, 1, 0, 1, 157, 127,</div><div class='add'>+	0, 1, 0, 1, 161, 80, 2, 1, 0, 1, 161, 127,</div><div class='add'>+	0, 1, 0, 1, 165, 80, 2, 1, 0, 1, 165, 127,</div><div class='add'>+	0, 1, 0, 2, 36, 72, 2, 1, 0, 2, 36, 62,</div><div class='add'>+	0, 1, 0, 2, 40, 80, 2, 1, 0, 2, 40, 62,</div><div class='add'>+	0, 1, 0, 2, 44, 80, 2, 1, 0, 2, 44, 62,</div><div class='add'>+	0, 1, 0, 2, 48, 80, 2, 1, 0, 2, 48, 62,</div><div class='add'>+	0, 1, 0, 2, 52, 80, 2, 1, 0, 2, 52, 62,</div><div class='add'>+	0, 1, 0, 2, 56, 80, 2, 1, 0, 2, 56, 62,</div><div class='add'>+	0, 1, 0, 2, 60, 80, 2, 1, 0, 2, 60, 62,</div><div class='add'>+	0, 1, 0, 2, 64, 74, 2, 1, 0, 2, 64, 62,</div><div class='add'>+	0, 1, 0, 2, 100, 70, 2, 1, 0, 2, 100, 62,</div><div class='add'>+	0, 1, 0, 2, 104, 80, 2, 1, 0, 2, 104, 62,</div><div class='add'>+	0, 1, 0, 2, 108, 80, 2, 1, 0, 2, 108, 62,</div><div class='add'>+	0, 1, 0, 2, 112, 80, 2, 1, 0, 2, 112, 62,</div><div class='add'>+	0, 1, 0, 2, 116, 80, 2, 1, 0, 2, 116, 62,</div><div class='add'>+	0, 1, 0, 2, 120, 80, 2, 1, 0, 2, 120, 62,</div><div class='add'>+	0, 1, 0, 2, 124, 80, 2, 1, 0, 2, 124, 62,</div><div class='add'>+	0, 1, 0, 2, 128, 80, 2, 1, 0, 2, 128, 62,</div><div class='add'>+	0, 1, 0, 2, 132, 80, 2, 1, 0, 2, 132, 62,</div><div class='add'>+	0, 1, 0, 2, 136, 80, 2, 1, 0, 2, 136, 62,</div><div class='add'>+	0, 1, 0, 2, 140, 70, 2, 1, 0, 2, 140, 62,</div><div class='add'>+	0, 1, 0, 2, 144, 80, 2, 1, 0, 2, 144, 127,</div><div class='add'>+	0, 1, 0, 2, 149, 80, 2, 1, 0, 2, 149, 127,</div><div class='add'>+	0, 1, 0, 2, 153, 80, 2, 1, 0, 2, 153, 127,</div><div class='add'>+	0, 1, 0, 2, 157, 80, 2, 1, 0, 2, 157, 127,</div><div class='add'>+	0, 1, 0, 2, 161, 80, 2, 1, 0, 2, 161, 127,</div><div class='add'>+	0, 1, 0, 2, 165, 80, 2, 1, 0, 2, 165, 127,</div><div class='add'>+	0, 1, 0, 3, 36, 68, 2, 1, 0, 3, 36, 38,</div><div class='add'>+	0, 1, 0, 3, 40, 68, 2, 1, 0, 3, 40, 38,</div><div class='add'>+	0, 1, 0, 3, 44, 68, 2, 1, 0, 3, 44, 38,</div><div class='add'>+	0, 1, 0, 3, 48, 68, 2, 1, 0, 3, 48, 38,</div><div class='add'>+	0, 1, 0, 3, 52, 68, 2, 1, 0, 3, 52, 38,</div><div class='add'>+	0, 1, 0, 3, 56, 68, 2, 1, 0, 3, 56, 38,</div><div class='add'>+	0, 1, 0, 3, 60, 66, 2, 1, 0, 3, 60, 38,</div><div class='add'>+	0, 1, 0, 3, 64, 68, 2, 1, 0, 3, 64, 38,</div><div class='add'>+	0, 1, 0, 3, 100, 60, 2, 1, 0, 3, 100, 38,</div><div class='add'>+	0, 1, 0, 3, 104, 68, 2, 1, 0, 3, 104, 38,</div><div class='add'>+	0, 1, 0, 3, 108, 68, 2, 1, 0, 3, 108, 38,</div><div class='add'>+	0, 1, 0, 3, 112, 68, 2, 1, 0, 3, 112, 38,</div><div class='add'>+	0, 1, 0, 3, 116, 68, 2, 1, 0, 3, 116, 38,</div><div class='add'>+	0, 1, 0, 3, 120, 68, 2, 1, 0, 3, 120, 38,</div><div class='add'>+	0, 1, 0, 3, 124, 68, 2, 1, 0, 3, 124, 38,</div><div class='add'>+	0, 1, 0, 3, 128, 68, 2, 1, 0, 3, 128, 38,</div><div class='add'>+	0, 1, 0, 3, 132, 68, 2, 1, 0, 3, 132, 38,</div><div class='add'>+	0, 1, 0, 3, 136, 68, 2, 1, 0, 3, 136, 38,</div><div class='add'>+	0, 1, 0, 3, 140, 60, 2, 1, 0, 3, 140, 38,</div><div class='add'>+	0, 1, 0, 3, 144, 68, 2, 1, 0, 3, 144, 127,</div><div class='add'>+	0, 1, 0, 3, 149, 80, 2, 1, 0, 3, 149, 127,</div><div class='add'>+	0, 1, 0, 3, 153, 80, 2, 1, 0, 3, 153, 127,</div><div class='add'>+	0, 1, 0, 3, 157, 80, 2, 1, 0, 3, 157, 127,</div><div class='add'>+	0, 1, 0, 3, 161, 80, 2, 1, 0, 3, 161, 127,</div><div class='add'>+	0, 1, 0, 3, 165, 80, 2, 1, 0, 3, 165, 127,</div><div class='add'>+	0, 1, 1, 2, 38, 66, 2, 1, 1, 2, 38, 64,</div><div class='add'>+	0, 1, 1, 2, 46, 72, 2, 1, 1, 2, 46, 64,</div><div class='add'>+	0, 1, 1, 2, 54, 72, 2, 1, 1, 2, 54, 64,</div><div class='add'>+	0, 1, 1, 2, 62, 64, 2, 1, 1, 2, 62, 64,</div><div class='add'>+	0, 1, 1, 2, 102, 58, 2, 1, 1, 2, 102, 64,</div><div class='add'>+	0, 1, 1, 2, 110, 74, 2, 1, 1, 2, 110, 64,</div><div class='add'>+	0, 1, 1, 2, 118, 74, 2, 1, 1, 2, 118, 64,</div><div class='add'>+	0, 1, 1, 2, 126, 74, 2, 1, 1, 2, 126, 64,</div><div class='add'>+	0, 1, 1, 2, 134, 74, 2, 1, 1, 2, 134, 64,</div><div class='add'>+	0, 1, 1, 2, 142, 74, 2, 1, 1, 2, 142, 127,</div><div class='add'>+	0, 1, 1, 2, 151, 74, 2, 1, 1, 2, 151, 127,</div><div class='add'>+	0, 1, 1, 2, 159, 74, 2, 1, 1, 2, 159, 127,</div><div class='add'>+	0, 1, 1, 3, 38, 60, 2, 1, 1, 3, 38, 40,</div><div class='add'>+	0, 1, 1, 3, 46, 68, 2, 1, 1, 3, 46, 40,</div><div class='add'>+	0, 1, 1, 3, 54, 68, 2, 1, 1, 3, 54, 40,</div><div class='add'>+	0, 1, 1, 3, 62, 58, 2, 1, 1, 3, 62, 40,</div><div class='add'>+	0, 1, 1, 3, 102, 54, 2, 1, 1, 3, 102, 40,</div><div class='add'>+	0, 1, 1, 3, 110, 68, 2, 1, 1, 3, 110, 40,</div><div class='add'>+	0, 1, 1, 3, 118, 68, 2, 1, 1, 3, 118, 40,</div><div class='add'>+	0, 1, 1, 3, 126, 68, 2, 1, 1, 3, 126, 40,</div><div class='add'>+	0, 1, 1, 3, 134, 68, 2, 1, 1, 3, 134, 40,</div><div class='add'>+	0, 1, 1, 3, 142, 68, 2, 1, 1, 3, 142, 127,</div><div class='add'>+	0, 1, 1, 3, 151, 74, 2, 1, 1, 3, 151, 127,</div><div class='add'>+	0, 1, 1, 3, 159, 74, 2, 1, 1, 3, 159, 127,</div><div class='add'>+	0, 1, 2, 4, 42, 64, 2, 1, 2, 4, 42, 64,</div><div class='add'>+	0, 1, 2, 4, 58, 62, 2, 1, 2, 4, 58, 64,</div><div class='add'>+	0, 1, 2, 4, 106, 58, 2, 1, 2, 4, 106, 64,</div><div class='add'>+	0, 1, 2, 4, 122, 72, 2, 1, 2, 4, 122, 64,</div><div class='add'>+	0, 1, 2, 4, 138, 72, 2, 1, 2, 4, 138, 127,</div><div class='add'>+	0, 1, 2, 4, 155, 72, 2, 1, 2, 4, 155, 127,</div><div class='add'>+	0, 1, 2, 5, 42, 54, 2, 1, 2, 5, 42, 40,</div><div class='add'>+	0, 1, 2, 5, 58, 52, 2, 1, 2, 5, 58, 40,</div><div class='add'>+	0, 1, 2, 5, 106, 50, 2, 1, 2, 5, 106, 40,</div><div class='add'>+	0, 1, 2, 5, 122, 66, 2, 1, 2, 5, 122, 40,</div><div class='add'>+	0, 1, 2, 5, 138, 66, 2, 1, 2, 5, 138, 127,</div><div class='add'>+	0, 1, 2, 5, 155, 62, 2, 1, 2, 5, 155, 127</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_TXPWR_LMT(rtw8822c_txpwr_lmt_type0);</div><div class='add'>+</div><div class='add'>+static const u32 rtw8822c_array_mp_cal_init[] = {</div><div class='add'>+	0x1b00, 0x00000008,</div><div class='add'>+	0x1b00, 0x00A70008,</div><div class='add'>+	0x1b00, 0x00150008,</div><div class='add'>+	0x1b00, 0x00000008,</div><div class='add'>+	0x1b04, 0xE2462952,</div><div class='add'>+	0x1b08, 0x00000080,</div><div class='add'>+	0x1b0c, 0x00000000,</div><div class='add'>+	0x1b10, 0x00010C00,</div><div class='add'>+	0x1b14, 0x00000000,</div><div class='add'>+	0x1b18, 0x00292903,</div><div class='add'>+	0x1b1c, 0xA218FC32,</div><div class='add'>+	0x1b20, 0x01040008,</div><div class='add'>+	0x1b24, 0x00060008,</div><div class='add'>+	0x1b28, 0x00060300,</div><div class='add'>+	0x1b2C, 0x00180018,</div><div class='add'>+	0x1b30, 0x40000000,</div><div class='add'>+	0x1b34, 0x00000800,</div><div class='add'>+	0x1b38, 0x40000000,</div><div class='add'>+	0x1b3C, 0x40000000,</div><div class='add'>+	0x1b98, 0x00000000,</div><div class='add'>+	0x1b9c, 0x00000000,</div><div class='add'>+	0x1bc0, 0x01000000,</div><div class='add'>+	0x1bcc, 0x00000000,</div><div class='add'>+	0x1be4, 0x00000000,</div><div class='add'>+	0x1bec, 0x40000000,</div><div class='add'>+	0x1b40, 0x40000000,</div><div class='add'>+	0x1b44, 0x20004064,</div><div class='add'>+	0x1b48, 0x0005002D,</div><div class='add'>+	0x1b4c, 0x00000000,</div><div class='add'>+	0x1b60, 0x1F100000,</div><div class='add'>+	0x1b64, 0x12000000,</div><div class='add'>+	0x1b4c, 0x00000000,</div><div class='add'>+	0x1b4c, 0x008a0000,</div><div class='add'>+	0x1b50, 0x000003BE,</div><div class='add'>+	0x1b4c, 0x018a0000,</div><div class='add'>+	0x1b50, 0x0000057A,</div><div class='add'>+	0x1b4c, 0x028a0000,</div><div class='add'>+	0x1b50, 0x000006C8,</div><div class='add'>+	0x1b4c, 0x038a0000,</div><div class='add'>+	0x1b50, 0x000007E0,</div><div class='add'>+	0x1b4c, 0x048a0000,</div><div class='add'>+	0x1b50, 0x000008D5,</div><div class='add'>+	0x1b4c, 0x058a0000,</div><div class='add'>+	0x1b50, 0x000009B2,</div><div class='add'>+	0x1b4c, 0x068a0000,</div><div class='add'>+	0x1b50, 0x00000A7D,</div><div class='add'>+	0x1b4c, 0x078a0000,</div><div class='add'>+	0x1b50, 0x00000B3A,</div><div class='add'>+	0x1b4c, 0x088a0000,</div><div class='add'>+	0x1b50, 0x00000BEB,</div><div class='add'>+	0x1b4c, 0x098a0000,</div><div class='add'>+	0x1b50, 0x00000C92,</div><div class='add'>+	0x1b4c, 0x0A8a0000,</div><div class='add'>+	0x1b50, 0x00000D31,</div><div class='add'>+	0x1b4c, 0x0B8a0000,</div><div class='add'>+	0x1b50, 0x00000DC9,</div><div class='add'>+	0x1b4c, 0x0C8a0000,</div><div class='add'>+	0x1b50, 0x00000E5A,</div><div class='add'>+	0x1b4c, 0x0D8a0000,</div><div class='add'>+	0x1b50, 0x00000EE6,</div><div class='add'>+	0x1b4c, 0x0E8a0000,</div><div class='add'>+	0x1b50, 0x00000F6D,</div><div class='add'>+	0x1b4c, 0x0F8a0000,</div><div class='add'>+	0x1b50, 0x00000FF0,</div><div class='add'>+	0x1b4c, 0x108a0000,</div><div class='add'>+	0x1b50, 0x0000106F,</div><div class='add'>+	0x1b4c, 0x118a0000,</div><div class='add'>+	0x1b50, 0x000010E9,</div><div class='add'>+	0x1b4c, 0x128a0000,</div><div class='add'>+	0x1b50, 0x00001161,</div><div class='add'>+	0x1b4c, 0x138a0000,</div><div class='add'>+	0x1b50, 0x000011D5,</div><div class='add'>+	0x1b4c, 0x148a0000,</div><div class='add'>+	0x1b50, 0x00001247,</div><div class='add'>+	0x1b4c, 0x158a0000,</div><div class='add'>+	0x1b50, 0x000012B5,</div><div class='add'>+	0x1b4c, 0x168a0000,</div><div class='add'>+	0x1b50, 0x00001322,</div><div class='add'>+	0x1b4c, 0x178a0000,</div><div class='add'>+	0x1b50, 0x0000138B,</div><div class='add'>+	0x1b4c, 0x188a0000,</div><div class='add'>+	0x1b50, 0x000013F3,</div><div class='add'>+	0x1b4c, 0x198a0000,</div><div class='add'>+	0x1b50, 0x00001459,</div><div class='add'>+	0x1b4c, 0x1A8a0000,</div><div class='add'>+	0x1b50, 0x000014BD,</div><div class='add'>+	0x1b4c, 0x1B8a0000,</div><div class='add'>+	0x1b50, 0x0000151E,</div><div class='add'>+	0x1b4c, 0x1C8a0000,</div><div class='add'>+	0x1b50, 0x0000157F,</div><div class='add'>+	0x1b4c, 0x1D8a0000,</div><div class='add'>+	0x1b50, 0x000015DD,</div><div class='add'>+	0x1b4c, 0x1E8a0000,</div><div class='add'>+	0x1b50, 0x0000163A,</div><div class='add'>+	0x1b4c, 0x1F8a0000,</div><div class='add'>+	0x1b50, 0x00001695,</div><div class='add'>+	0x1b4c, 0x208a0000,</div><div class='add'>+	0x1b50, 0x000016EF,</div><div class='add'>+	0x1b4c, 0x218a0000,</div><div class='add'>+	0x1b50, 0x00001748,</div><div class='add'>+	0x1b4c, 0x228a0000,</div><div class='add'>+	0x1b50, 0x0000179F,</div><div class='add'>+	0x1b4c, 0x238a0000,</div><div class='add'>+	0x1b50, 0x000017F5,</div><div class='add'>+	0x1b4c, 0x248a0000,</div><div class='add'>+	0x1b50, 0x0000184A,</div><div class='add'>+	0x1b4c, 0x258a0000,</div><div class='add'>+	0x1b50, 0x0000189E,</div><div class='add'>+	0x1b4c, 0x268a0000,</div><div class='add'>+	0x1b50, 0x000018F1,</div><div class='add'>+	0x1b4c, 0x278a0000,</div><div class='add'>+	0x1b50, 0x00001942,</div><div class='add'>+	0x1b4c, 0x288a0000,</div><div class='add'>+	0x1b50, 0x00001993,</div><div class='add'>+	0x1b4c, 0x298a0000,</div><div class='add'>+	0x1b50, 0x000019E2,</div><div class='add'>+	0x1b4c, 0x2A8a0000,</div><div class='add'>+	0x1b50, 0x00001A31,</div><div class='add'>+	0x1b4c, 0x2B8a0000,</div><div class='add'>+	0x1b50, 0x00001A7F,</div><div class='add'>+	0x1b4c, 0x2C8a0000,</div><div class='add'>+	0x1b50, 0x00001ACC,</div><div class='add'>+	0x1b4c, 0x2D8a0000,</div><div class='add'>+	0x1b50, 0x00001B18,</div><div class='add'>+	0x1b4c, 0x2E8a0000,</div><div class='add'>+	0x1b50, 0x00001B63,</div><div class='add'>+	0x1b4c, 0x2F8a0000,</div><div class='add'>+	0x1b50, 0x00001BAD,</div><div class='add'>+	0x1b4c, 0x308a0000,</div><div class='add'>+	0x1b50, 0x00001BF7,</div><div class='add'>+	0x1b4c, 0x318a0000,</div><div class='add'>+	0x1b50, 0x00001C40,</div><div class='add'>+	0x1b4c, 0x328a0000,</div><div class='add'>+	0x1b50, 0x00001C88,</div><div class='add'>+	0x1b4c, 0x338a0000,</div><div class='add'>+	0x1b50, 0x00001CCF,</div><div class='add'>+	0x1b4c, 0x348a0000,</div><div class='add'>+	0x1b50, 0x00001D16,</div><div class='add'>+	0x1b4c, 0x358a0000,</div><div class='add'>+	0x1b50, 0x00001D5C,</div><div class='add'>+	0x1b4c, 0x368a0000,</div><div class='add'>+	0x1b50, 0x00001DA2,</div><div class='add'>+	0x1b4c, 0x378a0000,</div><div class='add'>+	0x1b50, 0x00001DE6,</div><div class='add'>+	0x1b4c, 0x388a0000,</div><div class='add'>+	0x1b50, 0x00001E2B,</div><div class='add'>+	0x1b4c, 0x398a0000,</div><div class='add'>+	0x1b50, 0x00001E6E,</div><div class='add'>+	0x1b4c, 0x3A8a0000,</div><div class='add'>+	0x1b50, 0x00001EB1,</div><div class='add'>+	0x1b4c, 0x3B8a0000,</div><div class='add'>+	0x1b50, 0x00001EF4,</div><div class='add'>+	0x1b4c, 0x3C8a0000,</div><div class='add'>+	0x1b50, 0x00001F35,</div><div class='add'>+	0x1b4c, 0x3D8a0000,</div><div class='add'>+	0x1b50, 0x00001F77,</div><div class='add'>+	0x1b4c, 0x3E8a0000,</div><div class='add'>+	0x1b50, 0x00001FB8,</div><div class='add'>+	0x1b4c, 0x3F8a0000,</div><div class='add'>+	0x1b50, 0x00001FF8,</div><div class='add'>+	0x1b4c, 0x00000000,</div><div class='add'>+	0x1b50, 0x00000000,</div><div class='add'>+	0x1b58, 0x00890000,</div><div class='add'>+	0x1b5C, 0x3C6B3FFF,</div><div class='add'>+	0x1b58, 0x02890000,</div><div class='add'>+	0x1b5C, 0x35D9390A,</div><div class='add'>+	0x1b58, 0x04890000,</div><div class='add'>+	0x1b5C, 0x2FFE32D6,</div><div class='add'>+	0x1b58, 0x06890000,</div><div class='add'>+	0x1b5C, 0x2AC62D4F,</div><div class='add'>+	0x1b58, 0x08890000,</div><div class='add'>+	0x1b5C, 0x261F2862,</div><div class='add'>+	0x1b58, 0x0A890000,</div><div class='add'>+	0x1b5C, 0x21FA23FD,</div><div class='add'>+	0x1b58, 0x0C890000,</div><div class='add'>+	0x1b5C, 0x1E482013,</div><div class='add'>+	0x1b58, 0x0E890000,</div><div class='add'>+	0x1b5C, 0x1AFD1C96,</div><div class='add'>+	0x1b58, 0x10890000,</div><div class='add'>+	0x1b5C, 0x180E197B,</div><div class='add'>+	0x1b58, 0x12890000,</div><div class='add'>+	0x1b5C, 0x157016B5,</div><div class='add'>+	0x1b58, 0x14890000,</div><div class='add'>+	0x1b5C, 0x131B143D,</div><div class='add'>+	0x1b58, 0x16890000,</div><div class='add'>+	0x1b5C, 0x1107120A,</div><div class='add'>+	0x1b58, 0x18890000,</div><div class='add'>+	0x1b5C, 0x0F2D1013,</div><div class='add'>+	0x1b58, 0x1A890000,</div><div class='add'>+	0x1b5C, 0x0D870E54,</div><div class='add'>+	0x1b58, 0x1C890000,</div><div class='add'>+	0x1b5C, 0x0C0E0CC5,</div><div class='add'>+	0x1b58, 0x1E890000,</div><div class='add'>+	0x1b5C, 0x0ABF0B62,</div><div class='add'>+	0x1b58, 0x20890000,</div><div class='add'>+	0x1b5C, 0x09930A25,</div><div class='add'>+	0x1b58, 0x22890000,</div><div class='add'>+	0x1b5C, 0x0889090A,</div><div class='add'>+	0x1b58, 0x24890000,</div><div class='add'>+	0x1b5C, 0x079B080F,</div><div class='add'>+	0x1b58, 0x26890000,</div><div class='add'>+	0x1b5C, 0x06C7072E,</div><div class='add'>+	0x1b58, 0x28890000,</div><div class='add'>+	0x1b5C, 0x060B0666,</div><div class='add'>+	0x1b58, 0x2A890000,</div><div class='add'>+	0x1b5C, 0x056305B4,</div><div class='add'>+	0x1b58, 0x2C890000,</div><div class='add'>+	0x1b5C, 0x04CD0515,</div><div class='add'>+	0x1b58, 0x2E890000,</div><div class='add'>+	0x1b5C, 0x04470488,</div><div class='add'>+	0x1b58, 0x30890000,</div><div class='add'>+	0x1b5C, 0x03D0040A,</div><div class='add'>+	0x1b58, 0x32890000,</div><div class='add'>+	0x1b5C, 0x03660399,</div><div class='add'>+	0x1b58, 0x34890000,</div><div class='add'>+	0x1b5C, 0x03070335,</div><div class='add'>+	0x1b58, 0x36890000,</div><div class='add'>+	0x1b5C, 0x02B302DC,</div><div class='add'>+	0x1b58, 0x38890000,</div><div class='add'>+	0x1b5C, 0x0268028C,</div><div class='add'>+	0x1b58, 0x3A890000,</div><div class='add'>+	0x1b5C, 0x02250245,</div><div class='add'>+	0x1b58, 0x3C890000,</div><div class='add'>+	0x1b5C, 0x01E90206,</div><div class='add'>+	0x1b58, 0x3E890000,</div><div class='add'>+	0x1b5C, 0x01B401CE,</div><div class='add'>+	0x1b58, 0x40890000,</div><div class='add'>+	0x1b5C, 0x0185019C,</div><div class='add'>+	0x1b58, 0x42890000,</div><div class='add'>+	0x1b5C, 0x015A016F,</div><div class='add'>+	0x1b58, 0x44890000,</div><div class='add'>+	0x1b5C, 0x01350147,</div><div class='add'>+	0x1b58, 0x46890000,</div><div class='add'>+	0x1b5C, 0x01130123,</div><div class='add'>+	0x1b58, 0x48890000,</div><div class='add'>+	0x1b5C, 0x00F50104,</div><div class='add'>+	0x1b58, 0x4A890000,</div><div class='add'>+	0x1b5C, 0x00DA00E7,</div><div class='add'>+	0x1b58, 0x4C890000,</div><div class='add'>+	0x1b5C, 0x00C300CE,</div><div class='add'>+	0x1b58, 0x4E890000,</div><div class='add'>+	0x1b5C, 0x00AE00B8,</div><div class='add'>+	0x1b58, 0x50890000,</div><div class='add'>+	0x1b5C, 0x009B00A4,</div><div class='add'>+	0x1b58, 0x52890000,</div><div class='add'>+	0x1b5C, 0x008A0092,</div><div class='add'>+	0x1b58, 0x54890000,</div><div class='add'>+	0x1b5C, 0x007B0082,</div><div class='add'>+	0x1b58, 0x56890000,</div><div class='add'>+	0x1b5C, 0x006E0074,</div><div class='add'>+	0x1b58, 0x58890000,</div><div class='add'>+	0x1b5C, 0x00620067,</div><div class='add'>+	0x1b58, 0x5A890000,</div><div class='add'>+	0x1b5C, 0x0057005C,</div><div class='add'>+	0x1b58, 0x5C890000,</div><div class='add'>+	0x1b5C, 0x004E0052,</div><div class='add'>+	0x1b58, 0x5E890000,</div><div class='add'>+	0x1b5C, 0x00450049,</div><div class='add'>+	0x1b58, 0x60890000,</div><div class='add'>+	0x1b5C, 0x003E0041,</div><div class='add'>+	0x1b58, 0x62890000,</div><div class='add'>+	0x1b5C, 0x0037003A,</div><div class='add'>+	0x1b58, 0x62010000,</div><div class='add'>+	0x1b00, 0x0000000A,</div><div class='add'>+	0x1b00, 0x00A7000A,</div><div class='add'>+	0x1b00, 0x0015000A,</div><div class='add'>+	0x1b00, 0x0000000A,</div><div class='add'>+	0x1b04, 0xE2462952,</div><div class='add'>+	0x1b08, 0x00000080,</div><div class='add'>+	0x1b0c, 0x00000000,</div><div class='add'>+	0x1b10, 0x00010C00,</div><div class='add'>+	0x1b14, 0x00000000,</div><div class='add'>+	0x1b18, 0x00292903,</div><div class='add'>+	0x1b1c, 0xA218FC32,</div><div class='add'>+	0x1b20, 0x01040008,</div><div class='add'>+	0x1b24, 0x00060008,</div><div class='add'>+	0x1b28, 0x00060300,</div><div class='add'>+	0x1b2C, 0x00180018,</div><div class='add'>+	0x1b30, 0x40000000,</div><div class='add'>+	0x1b34, 0x00000800,</div><div class='add'>+	0x1b38, 0x40000000,</div><div class='add'>+	0x1b3C, 0x40000000,</div><div class='add'>+	0x1b98, 0x00000000,</div><div class='add'>+	0x1b9c, 0x00000000,</div><div class='add'>+	0x1bc0, 0x01000000,</div><div class='add'>+	0x1bcc, 0x00000000,</div><div class='add'>+	0x1be4, 0x00000000,</div><div class='add'>+	0x1bec, 0x40000000,</div><div class='add'>+	0x1b60, 0x1F100000,</div><div class='add'>+	0x1b64, 0x12000000,</div><div class='add'>+	0x1b58, 0x00890000,</div><div class='add'>+	0x1b5C, 0x3C6B3FFF,</div><div class='add'>+	0x1b58, 0x02890000,</div><div class='add'>+	0x1b5C, 0x35D9390A,</div><div class='add'>+	0x1b58, 0x04890000,</div><div class='add'>+	0x1b5C, 0x2FFE32D6,</div><div class='add'>+	0x1b58, 0x06890000,</div><div class='add'>+	0x1b5C, 0x2AC62D4F,</div><div class='add'>+	0x1b58, 0x08890000,</div><div class='add'>+	0x1b5C, 0x261F2862,</div><div class='add'>+	0x1b58, 0x0A890000,</div><div class='add'>+	0x1b5C, 0x21FA23FD,</div><div class='add'>+	0x1b58, 0x0C890000,</div><div class='add'>+	0x1b5C, 0x1E482013,</div><div class='add'>+	0x1b58, 0x0E890000,</div><div class='add'>+	0x1b5C, 0x1AFD1C96,</div><div class='add'>+	0x1b58, 0x10890000,</div><div class='add'>+	0x1b5C, 0x180E197B,</div><div class='add'>+	0x1b58, 0x12890000,</div><div class='add'>+	0x1b5C, 0x157016B5,</div><div class='add'>+	0x1b58, 0x14890000,</div><div class='add'>+	0x1b5C, 0x131B143D,</div><div class='add'>+	0x1b58, 0x16890000,</div><div class='add'>+	0x1b5C, 0x1107120A,</div><div class='add'>+	0x1b58, 0x18890000,</div><div class='add'>+	0x1b5C, 0x0F2D1013,</div><div class='add'>+	0x1b58, 0x1A890000,</div><div class='add'>+	0x1b5C, 0x0D870E54,</div><div class='add'>+	0x1b58, 0x1C890000,</div><div class='add'>+	0x1b5C, 0x0C0E0CC5,</div><div class='add'>+	0x1b58, 0x1E890000,</div><div class='add'>+	0x1b5C, 0x0ABF0B62,</div><div class='add'>+	0x1b58, 0x20890000,</div><div class='add'>+	0x1b5C, 0x09930A25,</div><div class='add'>+	0x1b58, 0x22890000,</div><div class='add'>+	0x1b5C, 0x0889090A,</div><div class='add'>+	0x1b58, 0x24890000,</div><div class='add'>+	0x1b5C, 0x079B080F,</div><div class='add'>+	0x1b58, 0x26890000,</div><div class='add'>+	0x1b5C, 0x06C7072E,</div><div class='add'>+	0x1b58, 0x28890000,</div><div class='add'>+	0x1b5C, 0x060B0666,</div><div class='add'>+	0x1b58, 0x2A890000,</div><div class='add'>+	0x1b5C, 0x056305B4,</div><div class='add'>+	0x1b58, 0x2C890000,</div><div class='add'>+	0x1b5C, 0x04CD0515,</div><div class='add'>+	0x1b58, 0x2E890000,</div><div class='add'>+	0x1b5C, 0x04470488,</div><div class='add'>+	0x1b58, 0x30890000,</div><div class='add'>+	0x1b5C, 0x03D0040A,</div><div class='add'>+	0x1b58, 0x32890000,</div><div class='add'>+	0x1b5C, 0x03660399,</div><div class='add'>+	0x1b58, 0x34890000,</div><div class='add'>+	0x1b5C, 0x03070335,</div><div class='add'>+	0x1b58, 0x36890000,</div><div class='add'>+	0x1b5C, 0x02B302DC,</div><div class='add'>+	0x1b58, 0x38890000,</div><div class='add'>+	0x1b5C, 0x0268028C,</div><div class='add'>+	0x1b58, 0x3A890000,</div><div class='add'>+	0x1b5C, 0x02250245,</div><div class='add'>+	0x1b58, 0x3C890000,</div><div class='add'>+	0x1b5C, 0x01E90206,</div><div class='add'>+	0x1b58, 0x3E890000,</div><div class='add'>+	0x1b5C, 0x01B401CE,</div><div class='add'>+	0x1b58, 0x40890000,</div><div class='add'>+	0x1b5C, 0x0185019C,</div><div class='add'>+	0x1b58, 0x42890000,</div><div class='add'>+	0x1b5C, 0x015A016F,</div><div class='add'>+	0x1b58, 0x44890000,</div><div class='add'>+	0x1b5C, 0x01350147,</div><div class='add'>+	0x1b58, 0x46890000,</div><div class='add'>+	0x1b5C, 0x01130123,</div><div class='add'>+	0x1b58, 0x48890000,</div><div class='add'>+	0x1b5C, 0x00F50104,</div><div class='add'>+	0x1b58, 0x4A890000,</div><div class='add'>+	0x1b5C, 0x00DA00E7,</div><div class='add'>+	0x1b58, 0x4C890000,</div><div class='add'>+	0x1b5C, 0x00C300CE,</div><div class='add'>+	0x1b58, 0x4E890000,</div><div class='add'>+	0x1b5C, 0x00AE00B8,</div><div class='add'>+	0x1b58, 0x50890000,</div><div class='add'>+	0x1b5C, 0x009B00A4,</div><div class='add'>+	0x1b58, 0x52890000,</div><div class='add'>+	0x1b5C, 0x008A0092,</div><div class='add'>+	0x1b58, 0x54890000,</div><div class='add'>+	0x1b5C, 0x007B0082,</div><div class='add'>+	0x1b58, 0x56890000,</div><div class='add'>+	0x1b5C, 0x006E0074,</div><div class='add'>+	0x1b58, 0x58890000,</div><div class='add'>+	0x1b5C, 0x00620067,</div><div class='add'>+	0x1b58, 0x5A890000,</div><div class='add'>+	0x1b5C, 0x0057005C,</div><div class='add'>+	0x1b58, 0x5C890000,</div><div class='add'>+	0x1b5C, 0x004E0052,</div><div class='add'>+	0x1b58, 0x5E890000,</div><div class='add'>+	0x1b5C, 0x00450049,</div><div class='add'>+	0x1b58, 0x60890000,</div><div class='add'>+	0x1b5C, 0x003E0041,</div><div class='add'>+	0x1b58, 0x62890000,</div><div class='add'>+	0x1b5C, 0x0037003A,</div><div class='add'>+	0x1b58, 0x62010000,</div><div class='add'>+	0x1b00, 0x0000000C,</div><div class='add'>+	0x1bd4, 0x000000F0,</div><div class='add'>+	0x1bb8, 0x20202020,</div><div class='add'>+	0x1bbc, 0x20202020,</div><div class='add'>+	0x1bc0, 0x20202020,</div><div class='add'>+	0x1bc4, 0x20202020,</div><div class='add'>+	0x1bc8, 0x04040404,</div><div class='add'>+	0x1bcc, 0x04040404,</div><div class='add'>+	0x1bd0, 0x04040404,</div><div class='add'>+	0x1bd8, 0x04040404,</div><div class='add'>+	0x1bdc, 0x20202020,</div><div class='add'>+	0x1be0, 0x04040404,</div><div class='add'>+	0x1be4, 0x77472F17,</div><div class='add'>+	0x1be8, 0xEFBFA78F,</div><div class='add'>+	0x1bec, 0x00000000,</div><div class='add'>+	0x1bf0, 0x1F1F1939,</div><div class='add'>+	0x1b04, 0x0000005B,</div><div class='add'>+	0x1b08, 0xB000C000,</div><div class='add'>+	0x1b5c, 0x0000005B,</div><div class='add'>+	0x1b60, 0xB000C000,</div><div class='add'>+	0x1bb4, 0x20000000,</div><div class='add'>+	0x1b00, 0x00000008,</div><div class='add'>+	0x1b80, 0x00000007,</div><div class='add'>+	0x1b80, 0x00080005,</div><div class='add'>+	0x1b80, 0x00080007,</div><div class='add'>+	0x1b80, 0x80000015,</div><div class='add'>+	0x1b80, 0x80000017,</div><div class='add'>+	0x1b80, 0x09080025,</div><div class='add'>+	0x1b80, 0x09080027,</div><div class='add'>+	0x1b80, 0x0f020035,</div><div class='add'>+	0x1b80, 0x0f020037,</div><div class='add'>+	0x1b80, 0x00220045,</div><div class='add'>+	0x1b80, 0x00220047,</div><div class='add'>+	0x1b80, 0x00040055,</div><div class='add'>+	0x1b80, 0x00040057,</div><div class='add'>+	0x1b80, 0x05c00065,</div><div class='add'>+	0x1b80, 0x05c00067,</div><div class='add'>+	0x1b80, 0x00070075,</div><div class='add'>+	0x1b80, 0x00070077,</div><div class='add'>+	0x1b80, 0x64020085,</div><div class='add'>+	0x1b80, 0x64020087,</div><div class='add'>+	0x1b80, 0x00020095,</div><div class='add'>+	0x1b80, 0x00020097,</div><div class='add'>+	0x1b80, 0x000400a5,</div><div class='add'>+	0x1b80, 0x000400a7,</div><div class='add'>+	0x1b80, 0x4a0000b5,</div><div class='add'>+	0x1b80, 0x4a0000b7,</div><div class='add'>+	0x1b80, 0x4b0400c5,</div><div class='add'>+	0x1b80, 0x4b0400c7,</div><div class='add'>+	0x1b80, 0x860300d5,</div><div class='add'>+	0x1b80, 0x860300d7,</div><div class='add'>+	0x1b80, 0x400900e5,</div><div class='add'>+	0x1b80, 0x400900e7,</div><div class='add'>+	0x1b80, 0xe02700f5,</div><div class='add'>+	0x1b80, 0xe02700f7,</div><div class='add'>+	0x1b80, 0x4b050105,</div><div class='add'>+	0x1b80, 0x4b050107,</div><div class='add'>+	0x1b80, 0x87030115,</div><div class='add'>+	0x1b80, 0x87030117,</div><div class='add'>+	0x1b80, 0x400b0125,</div><div class='add'>+	0x1b80, 0x400b0127,</div><div class='add'>+	0x1b80, 0xe0270135,</div><div class='add'>+	0x1b80, 0xe0270137,</div><div class='add'>+	0x1b80, 0x4b060145,</div><div class='add'>+	0x1b80, 0x4b060147,</div><div class='add'>+	0x1b80, 0x88030155,</div><div class='add'>+	0x1b80, 0x88030157,</div><div class='add'>+	0x1b80, 0x400d0165,</div><div class='add'>+	0x1b80, 0x400d0167,</div><div class='add'>+	0x1b80, 0xe0270175,</div><div class='add'>+	0x1b80, 0xe0270177,</div><div class='add'>+	0x1b80, 0x4b000185,</div><div class='add'>+	0x1b80, 0x4b000187,</div><div class='add'>+	0x1b80, 0x00070195,</div><div class='add'>+	0x1b80, 0x00070197,</div><div class='add'>+	0x1b80, 0x4c0001a5,</div><div class='add'>+	0x1b80, 0x4c0001a7,</div><div class='add'>+	0x1b80, 0x000401b5,</div><div class='add'>+	0x1b80, 0x000401b7,</div><div class='add'>+	0x1b80, 0x400801c5,</div><div class='add'>+	0x1b80, 0x400801c7,</div><div class='add'>+	0x1b80, 0x505501d5,</div><div class='add'>+	0x1b80, 0x505501d7,</div><div class='add'>+	0x1b80, 0x090a01e5,</div><div class='add'>+	0x1b80, 0x090a01e7,</div><div class='add'>+	0x1b80, 0x0ffe01f5,</div><div class='add'>+	0x1b80, 0x0ffe01f7,</div><div class='add'>+	0x1b80, 0x00220205,</div><div class='add'>+	0x1b80, 0x00220207,</div><div class='add'>+	0x1b80, 0x00040215,</div><div class='add'>+	0x1b80, 0x00040217,</div><div class='add'>+	0x1b80, 0x05c00225,</div><div class='add'>+	0x1b80, 0x05c00227,</div><div class='add'>+	0x1b80, 0x00070235,</div><div class='add'>+	0x1b80, 0x00070237,</div><div class='add'>+	0x1b80, 0x64000245,</div><div class='add'>+	0x1b80, 0x64000247,</div><div class='add'>+	0x1b80, 0x00020255,</div><div class='add'>+	0x1b80, 0x00020257,</div><div class='add'>+	0x1b80, 0x30000265,</div><div class='add'>+	0x1b80, 0x30000267,</div><div class='add'>+	0x1b80, 0xa5100275,</div><div class='add'>+	0x1b80, 0xa5100277,</div><div class='add'>+	0x1b80, 0xe3520285,</div><div class='add'>+	0x1b80, 0xe3520287,</div><div class='add'>+	0x1b80, 0xf01d0295,</div><div class='add'>+	0x1b80, 0xf01d0297,</div><div class='add'>+	0x1b80, 0xf11d02a5,</div><div class='add'>+	0x1b80, 0xf11d02a7,</div><div class='add'>+	0x1b80, 0xf21d02b5,</div><div class='add'>+	0x1b80, 0xf21d02b7,</div><div class='add'>+	0x1b80, 0xf31d02c5,</div><div class='add'>+	0x1b80, 0xf31d02c7,</div><div class='add'>+	0x1b80, 0xf41d02d5,</div><div class='add'>+	0x1b80, 0xf41d02d7,</div><div class='add'>+	0x1b80, 0xf51d02e5,</div><div class='add'>+	0x1b80, 0xf51d02e7,</div><div class='add'>+	0x1b80, 0xf61d02f5,</div><div class='add'>+	0x1b80, 0xf61d02f7,</div><div class='add'>+	0x1b80, 0xf71d0305,</div><div class='add'>+	0x1b80, 0xf71d0307,</div><div class='add'>+	0x1b80, 0xf81d0315,</div><div class='add'>+	0x1b80, 0xf81d0317,</div><div class='add'>+	0x1b80, 0xf91d0325,</div><div class='add'>+	0x1b80, 0xf91d0327,</div><div class='add'>+	0x1b80, 0xfa1d0335,</div><div class='add'>+	0x1b80, 0xfa1d0337,</div><div class='add'>+	0x1b80, 0xfb1d0345,</div><div class='add'>+	0x1b80, 0xfb1d0347,</div><div class='add'>+	0x1b80, 0xfc1d0355,</div><div class='add'>+	0x1b80, 0xfc1d0357,</div><div class='add'>+	0x1b80, 0xfd1d0365,</div><div class='add'>+	0x1b80, 0xfd1d0367,</div><div class='add'>+	0x1b80, 0xf21d0375,</div><div class='add'>+	0x1b80, 0xf21d0377,</div><div class='add'>+	0x1b80, 0xf31d0385,</div><div class='add'>+	0x1b80, 0xf31d0387,</div><div class='add'>+	0x1b80, 0xf41d0395,</div><div class='add'>+	0x1b80, 0xf41d0397,</div><div class='add'>+	0x1b80, 0xf51d03a5,</div><div class='add'>+	0x1b80, 0xf51d03a7,</div><div class='add'>+	0x1b80, 0xf61d03b5,</div><div class='add'>+	0x1b80, 0xf61d03b7,</div><div class='add'>+	0x1b80, 0xf71d03c5,</div><div class='add'>+	0x1b80, 0xf71d03c7,</div><div class='add'>+	0x1b80, 0xf81d03d5,</div><div class='add'>+	0x1b80, 0xf81d03d7,</div><div class='add'>+	0x1b80, 0xf91d03e5,</div><div class='add'>+	0x1b80, 0xf91d03e7,</div><div class='add'>+	0x1b80, 0xfa1d03f5,</div><div class='add'>+	0x1b80, 0xfa1d03f7,</div><div class='add'>+	0x1b80, 0xfb1d0405,</div><div class='add'>+	0x1b80, 0xfb1d0407,</div><div class='add'>+	0x1b80, 0xfc1d0415,</div><div class='add'>+	0x1b80, 0xfc1d0417,</div><div class='add'>+	0x1b80, 0xfd1d0425,</div><div class='add'>+	0x1b80, 0xfd1d0427,</div><div class='add'>+	0x1b80, 0xfe1d0435,</div><div class='add'>+	0x1b80, 0xfe1d0437,</div><div class='add'>+	0x1b80, 0xff1d0445,</div><div class='add'>+	0x1b80, 0xff1d0447,</div><div class='add'>+	0x1b80, 0x00010455,</div><div class='add'>+	0x1b80, 0x00010457,</div><div class='add'>+	0x1b80, 0x30620465,</div><div class='add'>+	0x1b80, 0x30620467,</div><div class='add'>+	0x1b80, 0x307a0475,</div><div class='add'>+	0x1b80, 0x307a0477,</div><div class='add'>+	0x1b80, 0x307c0485,</div><div class='add'>+	0x1b80, 0x307c0487,</div><div class='add'>+	0x1b80, 0x30eb0495,</div><div class='add'>+	0x1b80, 0x30eb0497,</div><div class='add'>+	0x1b80, 0x308004a5,</div><div class='add'>+	0x1b80, 0x308004a7,</div><div class='add'>+	0x1b80, 0x308c04b5,</div><div class='add'>+	0x1b80, 0x308c04b7,</div><div class='add'>+	0x1b80, 0x309804c5,</div><div class='add'>+	0x1b80, 0x309804c7,</div><div class='add'>+	0x1b80, 0x307f04d5,</div><div class='add'>+	0x1b80, 0x307f04d7,</div><div class='add'>+	0x1b80, 0x308b04e5,</div><div class='add'>+	0x1b80, 0x308b04e7,</div><div class='add'>+	0x1b80, 0x309704f5,</div><div class='add'>+	0x1b80, 0x309704f7,</div><div class='add'>+	0x1b80, 0x30ef0505,</div><div class='add'>+	0x1b80, 0x30ef0507,</div><div class='add'>+	0x1b80, 0x30fa0515,</div><div class='add'>+	0x1b80, 0x30fa0517,</div><div class='add'>+	0x1b80, 0x31050525,</div><div class='add'>+	0x1b80, 0x31050527,</div><div class='add'>+	0x1b80, 0x316a0535,</div><div class='add'>+	0x1b80, 0x316a0537,</div><div class='add'>+	0x1b80, 0x307a0545,</div><div class='add'>+	0x1b80, 0x307a0547,</div><div class='add'>+	0x1b80, 0x30e90555,</div><div class='add'>+	0x1b80, 0x30e90557,</div><div class='add'>+	0x1b80, 0x31870565,</div><div class='add'>+	0x1b80, 0x31870567,</div><div class='add'>+	0x1b80, 0x31a00575,</div><div class='add'>+	0x1b80, 0x31a00577,</div><div class='add'>+	0x1b80, 0x31ba0585,</div><div class='add'>+	0x1b80, 0x31ba0587,</div><div class='add'>+	0x1b80, 0x31c20595,</div><div class='add'>+	0x1b80, 0x31c20597,</div><div class='add'>+	0x1b80, 0x31ca05a5,</div><div class='add'>+	0x1b80, 0x31ca05a7,</div><div class='add'>+	0x1b80, 0x31d205b5,</div><div class='add'>+	0x1b80, 0x31d205b7,</div><div class='add'>+	0x1b80, 0x31da05c5,</div><div class='add'>+	0x1b80, 0x31da05c7,</div><div class='add'>+	0x1b80, 0x31e905d5,</div><div class='add'>+	0x1b80, 0x31e905d7,</div><div class='add'>+	0x1b80, 0x31f805e5,</div><div class='add'>+	0x1b80, 0x31f805e7,</div><div class='add'>+	0x1b80, 0x31fe05f5,</div><div class='add'>+	0x1b80, 0x31fe05f7,</div><div class='add'>+	0x1b80, 0x32040605,</div><div class='add'>+	0x1b80, 0x32040607,</div><div class='add'>+	0x1b80, 0x320a0615,</div><div class='add'>+	0x1b80, 0x320a0617,</div><div class='add'>+	0x1b80, 0xe2eb0625,</div><div class='add'>+	0x1b80, 0xe2eb0627,</div><div class='add'>+	0x1b80, 0x4d040635,</div><div class='add'>+	0x1b80, 0x4d040637,</div><div class='add'>+	0x1b80, 0x20800645,</div><div class='add'>+	0x1b80, 0x20800647,</div><div class='add'>+	0x1b80, 0x00000655,</div><div class='add'>+	0x1b80, 0x00000657,</div><div class='add'>+	0x1b80, 0x4d000665,</div><div class='add'>+	0x1b80, 0x4d000667,</div><div class='add'>+	0x1b80, 0x55070675,</div><div class='add'>+	0x1b80, 0x55070677,</div><div class='add'>+	0x1b80, 0xe2e30685,</div><div class='add'>+	0x1b80, 0xe2e30687,</div><div class='add'>+	0x1b80, 0xe2e30695,</div><div class='add'>+	0x1b80, 0xe2e30697,</div><div class='add'>+	0x1b80, 0x4d0406a5,</div><div class='add'>+	0x1b80, 0x4d0406a7,</div><div class='add'>+	0x1b80, 0x208806b5,</div><div class='add'>+	0x1b80, 0x208806b7,</div><div class='add'>+	0x1b80, 0x020006c5,</div><div class='add'>+	0x1b80, 0x020006c7,</div><div class='add'>+	0x1b80, 0x4d0006d5,</div><div class='add'>+	0x1b80, 0x4d0006d7,</div><div class='add'>+	0x1b80, 0x550f06e5,</div><div class='add'>+	0x1b80, 0x550f06e7,</div><div class='add'>+	0x1b80, 0xe2e306f5,</div><div class='add'>+	0x1b80, 0xe2e306f7,</div><div class='add'>+	0x1b80, 0x4f020705,</div><div class='add'>+	0x1b80, 0x4f020707,</div><div class='add'>+	0x1b80, 0x4e000715,</div><div class='add'>+	0x1b80, 0x4e000717,</div><div class='add'>+	0x1b80, 0x53020725,</div><div class='add'>+	0x1b80, 0x53020727,</div><div class='add'>+	0x1b80, 0x52010735,</div><div class='add'>+	0x1b80, 0x52010737,</div><div class='add'>+	0x1b80, 0xe2e70745,</div><div class='add'>+	0x1b80, 0xe2e70747,</div><div class='add'>+	0x1b80, 0x4d080755,</div><div class='add'>+	0x1b80, 0x4d080757,</div><div class='add'>+	0x1b80, 0x57100765,</div><div class='add'>+	0x1b80, 0x57100767,</div><div class='add'>+	0x1b80, 0x57000775,</div><div class='add'>+	0x1b80, 0x57000777,</div><div class='add'>+	0x1b80, 0x4d000785,</div><div class='add'>+	0x1b80, 0x4d000787,</div><div class='add'>+	0x1b80, 0x00010795,</div><div class='add'>+	0x1b80, 0x00010797,</div><div class='add'>+	0x1b80, 0xe2eb07a5,</div><div class='add'>+	0x1b80, 0xe2eb07a7,</div><div class='add'>+	0x1b80, 0x000107b5,</div><div class='add'>+	0x1b80, 0x000107b7,</div><div class='add'>+	0x1b80, 0x620607c5,</div><div class='add'>+	0x1b80, 0x620607c7,</div><div class='add'>+	0x1b80, 0xe2eb07d5,</div><div class='add'>+	0x1b80, 0xe2eb07d7,</div><div class='add'>+	0x1b80, 0x000107e5,</div><div class='add'>+	0x1b80, 0x000107e7,</div><div class='add'>+	0x1b80, 0x620607f5,</div><div class='add'>+	0x1b80, 0x620607f7,</div><div class='add'>+	0x1b80, 0x30ad0805,</div><div class='add'>+	0x1b80, 0x30ad0807,</div><div class='add'>+	0x1b80, 0x00260815,</div><div class='add'>+	0x1b80, 0x00260817,</div><div class='add'>+	0x1b80, 0xe3450825,</div><div class='add'>+	0x1b80, 0xe3450827,</div><div class='add'>+	0x1b80, 0x00020835,</div><div class='add'>+	0x1b80, 0x00020837,</div><div class='add'>+	0x1b80, 0x54ec0845,</div><div class='add'>+	0x1b80, 0x54ec0847,</div><div class='add'>+	0x1b80, 0x0ba60855,</div><div class='add'>+	0x1b80, 0x0ba60857,</div><div class='add'>+	0x1b80, 0x00260865,</div><div class='add'>+	0x1b80, 0x00260867,</div><div class='add'>+	0x1b80, 0xe3450875,</div><div class='add'>+	0x1b80, 0xe3450877,</div><div class='add'>+	0x1b80, 0x00020885,</div><div class='add'>+	0x1b80, 0x00020887,</div><div class='add'>+	0x1b80, 0x63c30895,</div><div class='add'>+	0x1b80, 0x63c30897,</div><div class='add'>+	0x1b80, 0x30d908a5,</div><div class='add'>+	0x1b80, 0x30d908a7,</div><div class='add'>+	0x1b80, 0x620608b5,</div><div class='add'>+	0x1b80, 0x620608b7,</div><div class='add'>+	0x1b80, 0x30a508c5,</div><div class='add'>+	0x1b80, 0x30a508c7,</div><div class='add'>+	0x1b80, 0x002408d5,</div><div class='add'>+	0x1b80, 0x002408d7,</div><div class='add'>+	0x1b80, 0xe34508e5,</div><div class='add'>+	0x1b80, 0xe34508e7,</div><div class='add'>+	0x1b80, 0x000208f5,</div><div class='add'>+	0x1b80, 0x000208f7,</div><div class='add'>+	0x1b80, 0x54ea0905,</div><div class='add'>+	0x1b80, 0x54ea0907,</div><div class='add'>+	0x1b80, 0x0ba60915,</div><div class='add'>+	0x1b80, 0x0ba60917,</div><div class='add'>+	0x1b80, 0x00240925,</div><div class='add'>+	0x1b80, 0x00240927,</div><div class='add'>+	0x1b80, 0xe3450935,</div><div class='add'>+	0x1b80, 0xe3450937,</div><div class='add'>+	0x1b80, 0x00020945,</div><div class='add'>+	0x1b80, 0x00020947,</div><div class='add'>+	0x1b80, 0x63c30955,</div><div class='add'>+	0x1b80, 0x63c30957,</div><div class='add'>+	0x1b80, 0x30d90965,</div><div class='add'>+	0x1b80, 0x30d90967,</div><div class='add'>+	0x1b80, 0x62060975,</div><div class='add'>+	0x1b80, 0x62060977,</div><div class='add'>+	0x1b80, 0x6c100985,</div><div class='add'>+	0x1b80, 0x6c100987,</div><div class='add'>+	0x1b80, 0x6d0f0995,</div><div class='add'>+	0x1b80, 0x6d0f0997,</div><div class='add'>+	0x1b80, 0xe2eb09a5,</div><div class='add'>+	0x1b80, 0xe2eb09a7,</div><div class='add'>+	0x1b80, 0xe34509b5,</div><div class='add'>+	0x1b80, 0xe34509b7,</div><div class='add'>+	0x1b80, 0x6c2409c5,</div><div class='add'>+	0x1b80, 0x6c2409c7,</div><div class='add'>+	0x1b80, 0xe2eb09d5,</div><div class='add'>+	0x1b80, 0xe2eb09d7,</div><div class='add'>+	0x1b80, 0xe34509e5,</div><div class='add'>+	0x1b80, 0xe34509e7,</div><div class='add'>+	0x1b80, 0x6c4409f5,</div><div class='add'>+	0x1b80, 0x6c4409f7,</div><div class='add'>+	0x1b80, 0xe2eb0a05,</div><div class='add'>+	0x1b80, 0xe2eb0a07,</div><div class='add'>+	0x1b80, 0xe3450a15,</div><div class='add'>+	0x1b80, 0xe3450a17,</div><div class='add'>+	0x1b80, 0x6c640a25,</div><div class='add'>+	0x1b80, 0x6c640a27,</div><div class='add'>+	0x1b80, 0xe2eb0a35,</div><div class='add'>+	0x1b80, 0xe2eb0a37,</div><div class='add'>+	0x1b80, 0xe3450a45,</div><div class='add'>+	0x1b80, 0xe3450a47,</div><div class='add'>+	0x1b80, 0x0baa0a55,</div><div class='add'>+	0x1b80, 0x0baa0a57,</div><div class='add'>+	0x1b80, 0x6c840a65,</div><div class='add'>+	0x1b80, 0x6c840a67,</div><div class='add'>+	0x1b80, 0x6d0f0a75,</div><div class='add'>+	0x1b80, 0x6d0f0a77,</div><div class='add'>+	0x1b80, 0xe2eb0a85,</div><div class='add'>+	0x1b80, 0xe2eb0a87,</div><div class='add'>+	0x1b80, 0xe3450a95,</div><div class='add'>+	0x1b80, 0xe3450a97,</div><div class='add'>+	0x1b80, 0x6ca40aa5,</div><div class='add'>+	0x1b80, 0x6ca40aa7,</div><div class='add'>+	0x1b80, 0xe2eb0ab5,</div><div class='add'>+	0x1b80, 0xe2eb0ab7,</div><div class='add'>+	0x1b80, 0xe3450ac5,</div><div class='add'>+	0x1b80, 0xe3450ac7,</div><div class='add'>+	0x1b80, 0x0bac0ad5,</div><div class='add'>+	0x1b80, 0x0bac0ad7,</div><div class='add'>+	0x1b80, 0x6cc40ae5,</div><div class='add'>+	0x1b80, 0x6cc40ae7,</div><div class='add'>+	0x1b80, 0x6d0f0af5,</div><div class='add'>+	0x1b80, 0x6d0f0af7,</div><div class='add'>+	0x1b80, 0xe2eb0b05,</div><div class='add'>+	0x1b80, 0xe2eb0b07,</div><div class='add'>+	0x1b80, 0xe3450b15,</div><div class='add'>+	0x1b80, 0xe3450b17,</div><div class='add'>+	0x1b80, 0x6ce40b25,</div><div class='add'>+	0x1b80, 0x6ce40b27,</div><div class='add'>+	0x1b80, 0xe2eb0b35,</div><div class='add'>+	0x1b80, 0xe2eb0b37,</div><div class='add'>+	0x1b80, 0xe3450b45,</div><div class='add'>+	0x1b80, 0xe3450b47,</div><div class='add'>+	0x1b80, 0x6cf40b55,</div><div class='add'>+	0x1b80, 0x6cf40b57,</div><div class='add'>+	0x1b80, 0xe2eb0b65,</div><div class='add'>+	0x1b80, 0xe2eb0b67,</div><div class='add'>+	0x1b80, 0xe3450b75,</div><div class='add'>+	0x1b80, 0xe3450b77,</div><div class='add'>+	0x1b80, 0x6c0c0b85,</div><div class='add'>+	0x1b80, 0x6c0c0b87,</div><div class='add'>+	0x1b80, 0x6d000b95,</div><div class='add'>+	0x1b80, 0x6d000b97,</div><div class='add'>+	0x1b80, 0xe2eb0ba5,</div><div class='add'>+	0x1b80, 0xe2eb0ba7,</div><div class='add'>+	0x1b80, 0xe3450bb5,</div><div class='add'>+	0x1b80, 0xe3450bb7,</div><div class='add'>+	0x1b80, 0x6c1c0bc5,</div><div class='add'>+	0x1b80, 0x6c1c0bc7,</div><div class='add'>+	0x1b80, 0xe2eb0bd5,</div><div class='add'>+	0x1b80, 0xe2eb0bd7,</div><div class='add'>+	0x1b80, 0xe3450be5,</div><div class='add'>+	0x1b80, 0xe3450be7,</div><div class='add'>+	0x1b80, 0x6c3c0bf5,</div><div class='add'>+	0x1b80, 0x6c3c0bf7,</div><div class='add'>+	0x1b80, 0xe2eb0c05,</div><div class='add'>+	0x1b80, 0xe2eb0c07,</div><div class='add'>+	0x1b80, 0xe3450c15,</div><div class='add'>+	0x1b80, 0xe3450c17,</div><div class='add'>+	0x1b80, 0xf4bf0c25,</div><div class='add'>+	0x1b80, 0xf4bf0c27,</div><div class='add'>+	0x1b80, 0xf7be0c35,</div><div class='add'>+	0x1b80, 0xf7be0c37,</div><div class='add'>+	0x1b80, 0x6c5c0c45,</div><div class='add'>+	0x1b80, 0x6c5c0c47,</div><div class='add'>+	0x1b80, 0xe2eb0c55,</div><div class='add'>+	0x1b80, 0xe2eb0c57,</div><div class='add'>+	0x1b80, 0xe3450c65,</div><div class='add'>+	0x1b80, 0xe3450c67,</div><div class='add'>+	0x1b80, 0x6c7c0c75,</div><div class='add'>+	0x1b80, 0x6c7c0c77,</div><div class='add'>+	0x1b80, 0xe2eb0c85,</div><div class='add'>+	0x1b80, 0xe2eb0c87,</div><div class='add'>+	0x1b80, 0xe3450c95,</div><div class='add'>+	0x1b80, 0xe3450c97,</div><div class='add'>+	0x1b80, 0xf5c30ca5,</div><div class='add'>+	0x1b80, 0xf5c30ca7,</div><div class='add'>+	0x1b80, 0xf8c20cb5,</div><div class='add'>+	0x1b80, 0xf8c20cb7,</div><div class='add'>+	0x1b80, 0x6c9c0cc5,</div><div class='add'>+	0x1b80, 0x6c9c0cc7,</div><div class='add'>+	0x1b80, 0xe2eb0cd5,</div><div class='add'>+	0x1b80, 0xe2eb0cd7,</div><div class='add'>+	0x1b80, 0xe3450ce5,</div><div class='add'>+	0x1b80, 0xe3450ce7,</div><div class='add'>+	0x1b80, 0x6cbc0cf5,</div><div class='add'>+	0x1b80, 0x6cbc0cf7,</div><div class='add'>+	0x1b80, 0xe2eb0d05,</div><div class='add'>+	0x1b80, 0xe2eb0d07,</div><div class='add'>+	0x1b80, 0xe3450d15,</div><div class='add'>+	0x1b80, 0xe3450d17,</div><div class='add'>+	0x1b80, 0x6cdc0d25,</div><div class='add'>+	0x1b80, 0x6cdc0d27,</div><div class='add'>+	0x1b80, 0xe2eb0d35,</div><div class='add'>+	0x1b80, 0xe2eb0d37,</div><div class='add'>+	0x1b80, 0xe3450d45,</div><div class='add'>+	0x1b80, 0xe3450d47,</div><div class='add'>+	0x1b80, 0x6cf00d55,</div><div class='add'>+	0x1b80, 0x6cf00d57,</div><div class='add'>+	0x1b80, 0xe2eb0d65,</div><div class='add'>+	0x1b80, 0xe2eb0d67,</div><div class='add'>+	0x1b80, 0xe3450d75,</div><div class='add'>+	0x1b80, 0xe3450d77,</div><div class='add'>+	0x1b80, 0x63c30d85,</div><div class='add'>+	0x1b80, 0x63c30d87,</div><div class='add'>+	0x1b80, 0x55010d95,</div><div class='add'>+	0x1b80, 0x55010d97,</div><div class='add'>+	0x1b80, 0x57040da5,</div><div class='add'>+	0x1b80, 0x57040da7,</div><div class='add'>+	0x1b80, 0x57000db5,</div><div class='add'>+	0x1b80, 0x57000db7,</div><div class='add'>+	0x1b80, 0x96000dc5,</div><div class='add'>+	0x1b80, 0x96000dc7,</div><div class='add'>+	0x1b80, 0x57080dd5,</div><div class='add'>+	0x1b80, 0x57080dd7,</div><div class='add'>+	0x1b80, 0x57000de5,</div><div class='add'>+	0x1b80, 0x57000de7,</div><div class='add'>+	0x1b80, 0x95000df5,</div><div class='add'>+	0x1b80, 0x95000df7,</div><div class='add'>+	0x1b80, 0x4d000e05,</div><div class='add'>+	0x1b80, 0x4d000e07,</div><div class='add'>+	0x1b80, 0x63050e15,</div><div class='add'>+	0x1b80, 0x63050e17,</div><div class='add'>+	0x1b80, 0x7b400e25,</div><div class='add'>+	0x1b80, 0x7b400e27,</div><div class='add'>+	0x1b80, 0x7a000e35,</div><div class='add'>+	0x1b80, 0x7a000e37,</div><div class='add'>+	0x1b80, 0x79000e45,</div><div class='add'>+	0x1b80, 0x79000e47,</div><div class='add'>+	0x1b80, 0x7f400e55,</div><div class='add'>+	0x1b80, 0x7f400e57,</div><div class='add'>+	0x1b80, 0x7e000e65,</div><div class='add'>+	0x1b80, 0x7e000e67,</div><div class='add'>+	0x1b80, 0x7d000e75,</div><div class='add'>+	0x1b80, 0x7d000e77,</div><div class='add'>+	0x1b80, 0x00010e85,</div><div class='add'>+	0x1b80, 0x00010e87,</div><div class='add'>+	0x1b80, 0xe3170e95,</div><div class='add'>+	0x1b80, 0xe3170e97,</div><div class='add'>+	0x1b80, 0x00010ea5,</div><div class='add'>+	0x1b80, 0x00010ea7,</div><div class='add'>+	0x1b80, 0x5c320eb5,</div><div class='add'>+	0x1b80, 0x5c320eb7,</div><div class='add'>+	0x1b80, 0xe3410ec5,</div><div class='add'>+	0x1b80, 0xe3410ec7,</div><div class='add'>+	0x1b80, 0xe3170ed5,</div><div class='add'>+	0x1b80, 0xe3170ed7,</div><div class='add'>+	0x1b80, 0x00010ee5,</div><div class='add'>+	0x1b80, 0x00010ee7,</div><div class='add'>+	0x1b80, 0x31260ef5,</div><div class='add'>+	0x1b80, 0x31260ef7,</div><div class='add'>+	0x1b80, 0x00260f05,</div><div class='add'>+	0x1b80, 0x00260f07,</div><div class='add'>+	0x1b80, 0xe34a0f15,</div><div class='add'>+	0x1b80, 0xe34a0f17,</div><div class='add'>+	0x1b80, 0x00020f25,</div><div class='add'>+	0x1b80, 0x00020f27,</div><div class='add'>+	0x1b80, 0x54ec0f35,</div><div class='add'>+	0x1b80, 0x54ec0f37,</div><div class='add'>+	0x1b80, 0x0ba60f45,</div><div class='add'>+	0x1b80, 0x0ba60f47,</div><div class='add'>+	0x1b80, 0x00260f55,</div><div class='add'>+	0x1b80, 0x00260f57,</div><div class='add'>+	0x1b80, 0xe34a0f65,</div><div class='add'>+	0x1b80, 0xe34a0f67,</div><div class='add'>+	0x1b80, 0x00020f75,</div><div class='add'>+	0x1b80, 0x00020f77,</div><div class='add'>+	0x1b80, 0x63830f85,</div><div class='add'>+	0x1b80, 0x63830f87,</div><div class='add'>+	0x1b80, 0x30d90f95,</div><div class='add'>+	0x1b80, 0x30d90f97,</div><div class='add'>+	0x1b80, 0x311a0fa5,</div><div class='add'>+	0x1b80, 0x311a0fa7,</div><div class='add'>+	0x1b80, 0x00240fb5,</div><div class='add'>+	0x1b80, 0x00240fb7,</div><div class='add'>+	0x1b80, 0xe34a0fc5,</div><div class='add'>+	0x1b80, 0xe34a0fc7,</div><div class='add'>+	0x1b80, 0x00020fd5,</div><div class='add'>+	0x1b80, 0x00020fd7,</div><div class='add'>+	0x1b80, 0x54ea0fe5,</div><div class='add'>+	0x1b80, 0x54ea0fe7,</div><div class='add'>+	0x1b80, 0x0ba60ff5,</div><div class='add'>+	0x1b80, 0x0ba60ff7,</div><div class='add'>+	0x1b80, 0x00241005,</div><div class='add'>+	0x1b80, 0x00241007,</div><div class='add'>+	0x1b80, 0xe34a1015,</div><div class='add'>+	0x1b80, 0xe34a1017,</div><div class='add'>+	0x1b80, 0x00021025,</div><div class='add'>+	0x1b80, 0x00021027,</div><div class='add'>+	0x1b80, 0x63831035,</div><div class='add'>+	0x1b80, 0x63831037,</div><div class='add'>+	0x1b80, 0x30d91045,</div><div class='add'>+	0x1b80, 0x30d91047,</div><div class='add'>+	0x1b80, 0x5c321055,</div><div class='add'>+	0x1b80, 0x5c321057,</div><div class='add'>+	0x1b80, 0x54e61065,</div><div class='add'>+	0x1b80, 0x54e61067,</div><div class='add'>+	0x1b80, 0x6e101075,</div><div class='add'>+	0x1b80, 0x6e101077,</div><div class='add'>+	0x1b80, 0x6f0f1085,</div><div class='add'>+	0x1b80, 0x6f0f1087,</div><div class='add'>+	0x1b80, 0xe3171095,</div><div class='add'>+	0x1b80, 0xe3171097,</div><div class='add'>+	0x1b80, 0xe34a10a5,</div><div class='add'>+	0x1b80, 0xe34a10a7,</div><div class='add'>+	0x1b80, 0x5c3210b5,</div><div class='add'>+	0x1b80, 0x5c3210b7,</div><div class='add'>+	0x1b80, 0x54e710c5,</div><div class='add'>+	0x1b80, 0x54e710c7,</div><div class='add'>+	0x1b80, 0x6e2410d5,</div><div class='add'>+	0x1b80, 0x6e2410d7,</div><div class='add'>+	0x1b80, 0xe31710e5,</div><div class='add'>+	0x1b80, 0xe31710e7,</div><div class='add'>+	0x1b80, 0xe34a10f5,</div><div class='add'>+	0x1b80, 0xe34a10f7,</div><div class='add'>+	0x1b80, 0x5c321105,</div><div class='add'>+	0x1b80, 0x5c321107,</div><div class='add'>+	0x1b80, 0x54e81115,</div><div class='add'>+	0x1b80, 0x54e81117,</div><div class='add'>+	0x1b80, 0x6e441125,</div><div class='add'>+	0x1b80, 0x6e441127,</div><div class='add'>+	0x1b80, 0xe3171135,</div><div class='add'>+	0x1b80, 0xe3171137,</div><div class='add'>+	0x1b80, 0xe34a1145,</div><div class='add'>+	0x1b80, 0xe34a1147,</div><div class='add'>+	0x1b80, 0x5c321155,</div><div class='add'>+	0x1b80, 0x5c321157,</div><div class='add'>+	0x1b80, 0x54e91165,</div><div class='add'>+	0x1b80, 0x54e91167,</div><div class='add'>+	0x1b80, 0x6e641175,</div><div class='add'>+	0x1b80, 0x6e641177,</div><div class='add'>+	0x1b80, 0xe3171185,</div><div class='add'>+	0x1b80, 0xe3171187,</div><div class='add'>+	0x1b80, 0xe34a1195,</div><div class='add'>+	0x1b80, 0xe34a1197,</div><div class='add'>+	0x1b80, 0x5c3211a5,</div><div class='add'>+	0x1b80, 0x5c3211a7,</div><div class='add'>+	0x1b80, 0x54ea11b5,</div><div class='add'>+	0x1b80, 0x54ea11b7,</div><div class='add'>+	0x1b80, 0x0baa11c5,</div><div class='add'>+	0x1b80, 0x0baa11c7,</div><div class='add'>+	0x1b80, 0x6e8411d5,</div><div class='add'>+	0x1b80, 0x6e8411d7,</div><div class='add'>+	0x1b80, 0x6f0f11e5,</div><div class='add'>+	0x1b80, 0x6f0f11e7,</div><div class='add'>+	0x1b80, 0xe31711f5,</div><div class='add'>+	0x1b80, 0xe31711f7,</div><div class='add'>+	0x1b80, 0xe34a1205,</div><div class='add'>+	0x1b80, 0xe34a1207,</div><div class='add'>+	0x1b80, 0x5c321215,</div><div class='add'>+	0x1b80, 0x5c321217,</div><div class='add'>+	0x1b80, 0x54eb1225,</div><div class='add'>+	0x1b80, 0x54eb1227,</div><div class='add'>+	0x1b80, 0x6ea41235,</div><div class='add'>+	0x1b80, 0x6ea41237,</div><div class='add'>+	0x1b80, 0xe3171245,</div><div class='add'>+	0x1b80, 0xe3171247,</div><div class='add'>+	0x1b80, 0xe34a1255,</div><div class='add'>+	0x1b80, 0xe34a1257,</div><div class='add'>+	0x1b80, 0x5c321265,</div><div class='add'>+	0x1b80, 0x5c321267,</div><div class='add'>+	0x1b80, 0x54ec1275,</div><div class='add'>+	0x1b80, 0x54ec1277,</div><div class='add'>+	0x1b80, 0x0bac1285,</div><div class='add'>+	0x1b80, 0x0bac1287,</div><div class='add'>+	0x1b80, 0x6ec41295,</div><div class='add'>+	0x1b80, 0x6ec41297,</div><div class='add'>+	0x1b80, 0x6f0f12a5,</div><div class='add'>+	0x1b80, 0x6f0f12a7,</div><div class='add'>+	0x1b80, 0xe31712b5,</div><div class='add'>+	0x1b80, 0xe31712b7,</div><div class='add'>+	0x1b80, 0xe34a12c5,</div><div class='add'>+	0x1b80, 0xe34a12c7,</div><div class='add'>+	0x1b80, 0x5c3212d5,</div><div class='add'>+	0x1b80, 0x5c3212d7,</div><div class='add'>+	0x1b80, 0x54ed12e5,</div><div class='add'>+	0x1b80, 0x54ed12e7,</div><div class='add'>+	0x1b80, 0x6ee412f5,</div><div class='add'>+	0x1b80, 0x6ee412f7,</div><div class='add'>+	0x1b80, 0xe3171305,</div><div class='add'>+	0x1b80, 0xe3171307,</div><div class='add'>+	0x1b80, 0xe34a1315,</div><div class='add'>+	0x1b80, 0xe34a1317,</div><div class='add'>+	0x1b80, 0x5c321325,</div><div class='add'>+	0x1b80, 0x5c321327,</div><div class='add'>+	0x1b80, 0x54ee1335,</div><div class='add'>+	0x1b80, 0x54ee1337,</div><div class='add'>+	0x1b80, 0x6ef41345,</div><div class='add'>+	0x1b80, 0x6ef41347,</div><div class='add'>+	0x1b80, 0xe3171355,</div><div class='add'>+	0x1b80, 0xe3171357,</div><div class='add'>+	0x1b80, 0xe34a1365,</div><div class='add'>+	0x1b80, 0xe34a1367,</div><div class='add'>+	0x1b80, 0x5c321375,</div><div class='add'>+	0x1b80, 0x5c321377,</div><div class='add'>+	0x1b80, 0x54ef1385,</div><div class='add'>+	0x1b80, 0x54ef1387,</div><div class='add'>+	0x1b80, 0x6e0c1395,</div><div class='add'>+	0x1b80, 0x6e0c1397,</div><div class='add'>+	0x1b80, 0x6f0013a5,</div><div class='add'>+	0x1b80, 0x6f0013a7,</div><div class='add'>+	0x1b80, 0xe31713b5,</div><div class='add'>+	0x1b80, 0xe31713b7,</div><div class='add'>+	0x1b80, 0xe34a13c5,</div><div class='add'>+	0x1b80, 0xe34a13c7,</div><div class='add'>+	0x1b80, 0x5c3213d5,</div><div class='add'>+	0x1b80, 0x5c3213d7,</div><div class='add'>+	0x1b80, 0x54f013e5,</div><div class='add'>+	0x1b80, 0x54f013e7,</div><div class='add'>+	0x1b80, 0x6e1c13f5,</div><div class='add'>+	0x1b80, 0x6e1c13f7,</div><div class='add'>+	0x1b80, 0xe3171405,</div><div class='add'>+	0x1b80, 0xe3171407,</div><div class='add'>+	0x1b80, 0xe34a1415,</div><div class='add'>+	0x1b80, 0xe34a1417,</div><div class='add'>+	0x1b80, 0x5c321425,</div><div class='add'>+	0x1b80, 0x5c321427,</div><div class='add'>+	0x1b80, 0x54f11435,</div><div class='add'>+	0x1b80, 0x54f11437,</div><div class='add'>+	0x1b80, 0x6e3c1445,</div><div class='add'>+	0x1b80, 0x6e3c1447,</div><div class='add'>+	0x1b80, 0xe3171455,</div><div class='add'>+	0x1b80, 0xe3171457,</div><div class='add'>+	0x1b80, 0xe34a1465,</div><div class='add'>+	0x1b80, 0xe34a1467,</div><div class='add'>+	0x1b80, 0xfaa91475,</div><div class='add'>+	0x1b80, 0xfaa91477,</div><div class='add'>+	0x1b80, 0x5c321485,</div><div class='add'>+	0x1b80, 0x5c321487,</div><div class='add'>+	0x1b80, 0x54f21495,</div><div class='add'>+	0x1b80, 0x54f21497,</div><div class='add'>+	0x1b80, 0x6e5c14a5,</div><div class='add'>+	0x1b80, 0x6e5c14a7,</div><div class='add'>+	0x1b80, 0xe31714b5,</div><div class='add'>+	0x1b80, 0xe31714b7,</div><div class='add'>+	0x1b80, 0xe34a14c5,</div><div class='add'>+	0x1b80, 0xe34a14c7,</div><div class='add'>+	0x1b80, 0x5c3214d5,</div><div class='add'>+	0x1b80, 0x5c3214d7,</div><div class='add'>+	0x1b80, 0x54f314e5,</div><div class='add'>+	0x1b80, 0x54f314e7,</div><div class='add'>+	0x1b80, 0x6e7c14f5,</div><div class='add'>+	0x1b80, 0x6e7c14f7,</div><div class='add'>+	0x1b80, 0xe3171505,</div><div class='add'>+	0x1b80, 0xe3171507,</div><div class='add'>+	0x1b80, 0xe34a1515,</div><div class='add'>+	0x1b80, 0xe34a1517,</div><div class='add'>+	0x1b80, 0xfba91525,</div><div class='add'>+	0x1b80, 0xfba91527,</div><div class='add'>+	0x1b80, 0x5c321535,</div><div class='add'>+	0x1b80, 0x5c321537,</div><div class='add'>+	0x1b80, 0x54f41545,</div><div class='add'>+	0x1b80, 0x54f41547,</div><div class='add'>+	0x1b80, 0x6e9c1555,</div><div class='add'>+	0x1b80, 0x6e9c1557,</div><div class='add'>+	0x1b80, 0xe3171565,</div><div class='add'>+	0x1b80, 0xe3171567,</div><div class='add'>+	0x1b80, 0xe34a1575,</div><div class='add'>+	0x1b80, 0xe34a1577,</div><div class='add'>+	0x1b80, 0x5c321585,</div><div class='add'>+	0x1b80, 0x5c321587,</div><div class='add'>+	0x1b80, 0x54f51595,</div><div class='add'>+	0x1b80, 0x54f51597,</div><div class='add'>+	0x1b80, 0x6ebc15a5,</div><div class='add'>+	0x1b80, 0x6ebc15a7,</div><div class='add'>+	0x1b80, 0xe31715b5,</div><div class='add'>+	0x1b80, 0xe31715b7,</div><div class='add'>+	0x1b80, 0xe34a15c5,</div><div class='add'>+	0x1b80, 0xe34a15c7,</div><div class='add'>+	0x1b80, 0x5c3215d5,</div><div class='add'>+	0x1b80, 0x5c3215d7,</div><div class='add'>+	0x1b80, 0x54f615e5,</div><div class='add'>+	0x1b80, 0x54f615e7,</div><div class='add'>+	0x1b80, 0x6edc15f5,</div><div class='add'>+	0x1b80, 0x6edc15f7,</div><div class='add'>+	0x1b80, 0xe3171605,</div><div class='add'>+	0x1b80, 0xe3171607,</div><div class='add'>+	0x1b80, 0xe34a1615,</div><div class='add'>+	0x1b80, 0xe34a1617,</div><div class='add'>+	0x1b80, 0x5c321625,</div><div class='add'>+	0x1b80, 0x5c321627,</div><div class='add'>+	0x1b80, 0x54f71635,</div><div class='add'>+	0x1b80, 0x54f71637,</div><div class='add'>+	0x1b80, 0x6ef01645,</div><div class='add'>+	0x1b80, 0x6ef01647,</div><div class='add'>+	0x1b80, 0xe3171655,</div><div class='add'>+	0x1b80, 0xe3171657,</div><div class='add'>+	0x1b80, 0xe34a1665,</div><div class='add'>+	0x1b80, 0xe34a1667,</div><div class='add'>+	0x1b80, 0x63831675,</div><div class='add'>+	0x1b80, 0x63831677,</div><div class='add'>+	0x1b80, 0x30d91685,</div><div class='add'>+	0x1b80, 0x30d91687,</div><div class='add'>+	0x1b80, 0x00011695,</div><div class='add'>+	0x1b80, 0x00011697,</div><div class='add'>+	0x1b80, 0x000416a5,</div><div class='add'>+	0x1b80, 0x000416a7,</div><div class='add'>+	0x1b80, 0x550116b5,</div><div class='add'>+	0x1b80, 0x550116b7,</div><div class='add'>+	0x1b80, 0x5c3116c5,</div><div class='add'>+	0x1b80, 0x5c3116c7,</div><div class='add'>+	0x1b80, 0x5f8216d5,</div><div class='add'>+	0x1b80, 0x5f8216d7,</div><div class='add'>+	0x1b80, 0x660516e5,</div><div class='add'>+	0x1b80, 0x660516e7,</div><div class='add'>+	0x1b80, 0x000616f5,</div><div class='add'>+	0x1b80, 0x000616f7,</div><div class='add'>+	0x1b80, 0x5d801705,</div><div class='add'>+	0x1b80, 0x5d801707,</div><div class='add'>+	0x1b80, 0x09001715,</div><div class='add'>+	0x1b80, 0x09001717,</div><div class='add'>+	0x1b80, 0x0a011725,</div><div class='add'>+	0x1b80, 0x0a011727,</div><div class='add'>+	0x1b80, 0x0b401735,</div><div class='add'>+	0x1b80, 0x0b401737,</div><div class='add'>+	0x1b80, 0x0d001745,</div><div class='add'>+	0x1b80, 0x0d001747,</div><div class='add'>+	0x1b80, 0x0f011755,</div><div class='add'>+	0x1b80, 0x0f011757,</div><div class='add'>+	0x1b80, 0x002a1765,</div><div class='add'>+	0x1b80, 0x002a1767,</div><div class='add'>+	0x1b80, 0x055a1775,</div><div class='add'>+	0x1b80, 0x055a1777,</div><div class='add'>+	0x1b80, 0x05db1785,</div><div class='add'>+	0x1b80, 0x05db1787,</div><div class='add'>+	0x1b80, 0xe3351795,</div><div class='add'>+	0x1b80, 0xe3351797,</div><div class='add'>+	0x1b80, 0xe2e317a5,</div><div class='add'>+	0x1b80, 0xe2e317a7,</div><div class='add'>+	0x1b80, 0x000617b5,</div><div class='add'>+	0x1b80, 0x000617b7,</div><div class='add'>+	0x1b80, 0x06da17c5,</div><div class='add'>+	0x1b80, 0x06da17c7,</div><div class='add'>+	0x1b80, 0x07db17d5,</div><div class='add'>+	0x1b80, 0x07db17d7,</div><div class='add'>+	0x1b80, 0xe33517e5,</div><div class='add'>+	0x1b80, 0xe33517e7,</div><div class='add'>+	0x1b80, 0xe2e317f5,</div><div class='add'>+	0x1b80, 0xe2e317f7,</div><div class='add'>+	0x1b80, 0xe32c1805,</div><div class='add'>+	0x1b80, 0xe32c1807,</div><div class='add'>+	0x1b80, 0x00021815,</div><div class='add'>+	0x1b80, 0x00021817,</div><div class='add'>+	0x1b80, 0xe3311825,</div><div class='add'>+	0x1b80, 0xe3311827,</div><div class='add'>+	0x1b80, 0x5d001835,</div><div class='add'>+	0x1b80, 0x5d001837,</div><div class='add'>+	0x1b80, 0x00041845,</div><div class='add'>+	0x1b80, 0x00041847,</div><div class='add'>+	0x1b80, 0x5fa21855,</div><div class='add'>+	0x1b80, 0x5fa21857,</div><div class='add'>+	0x1b80, 0x00011865,</div><div class='add'>+	0x1b80, 0x00011867,</div><div class='add'>+	0x1b80, 0xe2571875,</div><div class='add'>+	0x1b80, 0xe2571877,</div><div class='add'>+	0x1b80, 0x74081885,</div><div class='add'>+	0x1b80, 0x74081887,</div><div class='add'>+	0x1b80, 0xe2a11895,</div><div class='add'>+	0x1b80, 0xe2a11897,</div><div class='add'>+	0x1b80, 0xe28318a5,</div><div class='add'>+	0x1b80, 0xe28318a7,</div><div class='add'>+	0x1b80, 0xe2c118b5,</div><div class='add'>+	0x1b80, 0xe2c118b7,</div><div class='add'>+	0x1b80, 0xb90018c5,</div><div class='add'>+	0x1b80, 0xb90018c7,</div><div class='add'>+	0x1b80, 0x990018d5,</div><div class='add'>+	0x1b80, 0x990018d7,</div><div class='add'>+	0x1b80, 0x000618e5,</div><div class='add'>+	0x1b80, 0x000618e7,</div><div class='add'>+	0x1b80, 0x770018f5,</div><div class='add'>+	0x1b80, 0x770018f7,</div><div class='add'>+	0x1b80, 0x00041905,</div><div class='add'>+	0x1b80, 0x00041907,</div><div class='add'>+	0x1b80, 0x49041915,</div><div class='add'>+	0x1b80, 0x49041917,</div><div class='add'>+	0x1b80, 0x4bb01925,</div><div class='add'>+	0x1b80, 0x4bb01927,</div><div class='add'>+	0x1b80, 0x00061935,</div><div class='add'>+	0x1b80, 0x00061937,</div><div class='add'>+	0x1b80, 0x75041945,</div><div class='add'>+	0x1b80, 0x75041947,</div><div class='add'>+	0x1b80, 0x77081955,</div><div class='add'>+	0x1b80, 0x77081957,</div><div class='add'>+	0x1b80, 0x00071965,</div><div class='add'>+	0x1b80, 0x00071967,</div><div class='add'>+	0x1b80, 0x77101975,</div><div class='add'>+	0x1b80, 0x77101977,</div><div class='add'>+	0x1b80, 0x00041985,</div><div class='add'>+	0x1b80, 0x00041987,</div><div class='add'>+	0x1b80, 0x44801995,</div><div class='add'>+	0x1b80, 0x44801997,</div><div class='add'>+	0x1b80, 0x45ff19a5,</div><div class='add'>+	0x1b80, 0x45ff19a7,</div><div class='add'>+	0x1b80, 0x463f19b5,</div><div class='add'>+	0x1b80, 0x463f19b7,</div><div class='add'>+	0x1b80, 0x473119c5,</div><div class='add'>+	0x1b80, 0x473119c7,</div><div class='add'>+	0x1b80, 0x400819d5,</div><div class='add'>+	0x1b80, 0x400819d7,</div><div class='add'>+	0x1b80, 0xe23e19e5,</div><div class='add'>+	0x1b80, 0xe23e19e7,</div><div class='add'>+	0x1b80, 0x000119f5,</div><div class='add'>+	0x1b80, 0x000119f7,</div><div class='add'>+	0x1b80, 0xe2571a05,</div><div class='add'>+	0x1b80, 0xe2571a07,</div><div class='add'>+	0x1b80, 0x74081a15,</div><div class='add'>+	0x1b80, 0x74081a17,</div><div class='add'>+	0x1b80, 0xe2b11a25,</div><div class='add'>+	0x1b80, 0xe2b11a27,</div><div class='add'>+	0x1b80, 0xe2831a35,</div><div class='add'>+	0x1b80, 0xe2831a37,</div><div class='add'>+	0x1b80, 0xe2c71a45,</div><div class='add'>+	0x1b80, 0xe2c71a47,</div><div class='add'>+	0x1b80, 0xb9001a55,</div><div class='add'>+	0x1b80, 0xb9001a57,</div><div class='add'>+	0x1b80, 0x99001a65,</div><div class='add'>+	0x1b80, 0x99001a67,</div><div class='add'>+	0x1b80, 0x00061a75,</div><div class='add'>+	0x1b80, 0x00061a77,</div><div class='add'>+	0x1b80, 0x77001a85,</div><div class='add'>+	0x1b80, 0x77001a87,</div><div class='add'>+	0x1b80, 0x00051a95,</div><div class='add'>+	0x1b80, 0x00051a97,</div><div class='add'>+	0x1b80, 0x61041aa5,</div><div class='add'>+	0x1b80, 0x61041aa7,</div><div class='add'>+	0x1b80, 0x63b01ab5,</div><div class='add'>+	0x1b80, 0x63b01ab7,</div><div class='add'>+	0x1b80, 0x00061ac5,</div><div class='add'>+	0x1b80, 0x00061ac7,</div><div class='add'>+	0x1b80, 0x75081ad5,</div><div class='add'>+	0x1b80, 0x75081ad7,</div><div class='add'>+	0x1b80, 0x77081ae5,</div><div class='add'>+	0x1b80, 0x77081ae7,</div><div class='add'>+	0x1b80, 0x00071af5,</div><div class='add'>+	0x1b80, 0x00071af7,</div><div class='add'>+	0x1b80, 0x77201b05,</div><div class='add'>+	0x1b80, 0x77201b07,</div><div class='add'>+	0x1b80, 0x00051b15,</div><div class='add'>+	0x1b80, 0x00051b17,</div><div class='add'>+	0x1b80, 0x5c801b25,</div><div class='add'>+	0x1b80, 0x5c801b27,</div><div class='add'>+	0x1b80, 0x5dff1b35,</div><div class='add'>+	0x1b80, 0x5dff1b37,</div><div class='add'>+	0x1b80, 0x5e3f1b45,</div><div class='add'>+	0x1b80, 0x5e3f1b47,</div><div class='add'>+	0x1b80, 0x5f311b55,</div><div class='add'>+	0x1b80, 0x5f311b57,</div><div class='add'>+	0x1b80, 0x00041b65,</div><div class='add'>+	0x1b80, 0x00041b67,</div><div class='add'>+	0x1b80, 0x400a1b75,</div><div class='add'>+	0x1b80, 0x400a1b77,</div><div class='add'>+	0x1b80, 0xe23e1b85,</div><div class='add'>+	0x1b80, 0xe23e1b87,</div><div class='add'>+	0x1b80, 0x00011b95,</div><div class='add'>+	0x1b80, 0x00011b97,</div><div class='add'>+	0x1b80, 0xe2571ba5,</div><div class='add'>+	0x1b80, 0xe2571ba7,</div><div class='add'>+	0x1b80, 0x74081bb5,</div><div class='add'>+	0x1b80, 0x74081bb7,</div><div class='add'>+	0x1b80, 0xe2a11bc5,</div><div class='add'>+	0x1b80, 0xe2a11bc7,</div><div class='add'>+	0x1b80, 0xe2831bd5,</div><div class='add'>+	0x1b80, 0xe2831bd7,</div><div class='add'>+	0x1b80, 0xe2c11be5,</div><div class='add'>+	0x1b80, 0xe2c11be7,</div><div class='add'>+	0x1b80, 0xe2cd1bf5,</div><div class='add'>+	0x1b80, 0xe2cd1bf7,</div><div class='add'>+	0x1b80, 0xe2101c05,</div><div class='add'>+	0x1b80, 0xe2101c07,</div><div class='add'>+	0x1b80, 0x00011c15,</div><div class='add'>+	0x1b80, 0x00011c17,</div><div class='add'>+	0x1b80, 0xe2571c25,</div><div class='add'>+	0x1b80, 0xe2571c27,</div><div class='add'>+	0x1b80, 0x74081c35,</div><div class='add'>+	0x1b80, 0x74081c37,</div><div class='add'>+	0x1b80, 0xe2b11c45,</div><div class='add'>+	0x1b80, 0xe2b11c47,</div><div class='add'>+	0x1b80, 0xe2831c55,</div><div class='add'>+	0x1b80, 0xe2831c57,</div><div class='add'>+	0x1b80, 0xe2c71c65,</div><div class='add'>+	0x1b80, 0xe2c71c67,</div><div class='add'>+	0x1b80, 0xe2cd1c75,</div><div class='add'>+	0x1b80, 0xe2cd1c77,</div><div class='add'>+	0x1b80, 0xe2261c85,</div><div class='add'>+	0x1b80, 0xe2261c87,</div><div class='add'>+	0x1b80, 0x00011c95,</div><div class='add'>+	0x1b80, 0x00011c97,</div><div class='add'>+	0x1b80, 0xe26d1ca5,</div><div class='add'>+	0x1b80, 0xe26d1ca7,</div><div class='add'>+	0x1b80, 0x74001cb5,</div><div class='add'>+	0x1b80, 0x74001cb7,</div><div class='add'>+	0x1b80, 0xe2a11cc5,</div><div class='add'>+	0x1b80, 0xe2a11cc7,</div><div class='add'>+	0x1b80, 0xe2921cd5,</div><div class='add'>+	0x1b80, 0xe2921cd7,</div><div class='add'>+	0x1b80, 0xe2c11ce5,</div><div class='add'>+	0x1b80, 0xe2c11ce7,</div><div class='add'>+	0x1b80, 0xe2cd1cf5,</div><div class='add'>+	0x1b80, 0xe2cd1cf7,</div><div class='add'>+	0x1b80, 0xe2101d05,</div><div class='add'>+	0x1b80, 0xe2101d07,</div><div class='add'>+	0x1b80, 0x00011d15,</div><div class='add'>+	0x1b80, 0x00011d17,</div><div class='add'>+	0x1b80, 0xe26d1d25,</div><div class='add'>+	0x1b80, 0xe26d1d27,</div><div class='add'>+	0x1b80, 0x74001d35,</div><div class='add'>+	0x1b80, 0x74001d37,</div><div class='add'>+	0x1b80, 0xe2b11d45,</div><div class='add'>+	0x1b80, 0xe2b11d47,</div><div class='add'>+	0x1b80, 0xe2921d55,</div><div class='add'>+	0x1b80, 0xe2921d57,</div><div class='add'>+	0x1b80, 0xe2c71d65,</div><div class='add'>+	0x1b80, 0xe2c71d67,</div><div class='add'>+	0x1b80, 0xe2cd1d75,</div><div class='add'>+	0x1b80, 0xe2cd1d77,</div><div class='add'>+	0x1b80, 0xe2261d85,</div><div class='add'>+	0x1b80, 0xe2261d87,</div><div class='add'>+	0x1b80, 0x00011d95,</div><div class='add'>+	0x1b80, 0x00011d97,</div><div class='add'>+	0x1b80, 0x00041da5,</div><div class='add'>+	0x1b80, 0x00041da7,</div><div class='add'>+	0x1b80, 0x445b1db5,</div><div class='add'>+	0x1b80, 0x445b1db7,</div><div class='add'>+	0x1b80, 0x47b01dc5,</div><div class='add'>+	0x1b80, 0x47b01dc7,</div><div class='add'>+	0x1b80, 0x47301dd5,</div><div class='add'>+	0x1b80, 0x47301dd7,</div><div class='add'>+	0x1b80, 0x47001de5,</div><div class='add'>+	0x1b80, 0x47001de7,</div><div class='add'>+	0x1b80, 0x00061df5,</div><div class='add'>+	0x1b80, 0x00061df7,</div><div class='add'>+	0x1b80, 0x77081e05,</div><div class='add'>+	0x1b80, 0x77081e07,</div><div class='add'>+	0x1b80, 0x00041e15,</div><div class='add'>+	0x1b80, 0x00041e17,</div><div class='add'>+	0x1b80, 0x49401e25,</div><div class='add'>+	0x1b80, 0x49401e27,</div><div class='add'>+	0x1b80, 0x4bb01e35,</div><div class='add'>+	0x1b80, 0x4bb01e37,</div><div class='add'>+	0x1b80, 0x00071e45,</div><div class='add'>+	0x1b80, 0x00071e47,</div><div class='add'>+	0x1b80, 0x54401e55,</div><div class='add'>+	0x1b80, 0x54401e57,</div><div class='add'>+	0x1b80, 0x00041e65,</div><div class='add'>+	0x1b80, 0x00041e67,</div><div class='add'>+	0x1b80, 0x40081e75,</div><div class='add'>+	0x1b80, 0x40081e77,</div><div class='add'>+	0x1b80, 0x00011e85,</div><div class='add'>+	0x1b80, 0x00011e87,</div><div class='add'>+	0x1b80, 0x00051e95,</div><div class='add'>+	0x1b80, 0x00051e97,</div><div class='add'>+	0x1b80, 0x5c5b1ea5,</div><div class='add'>+	0x1b80, 0x5c5b1ea7,</div><div class='add'>+	0x1b80, 0x5fb01eb5,</div><div class='add'>+	0x1b80, 0x5fb01eb7,</div><div class='add'>+	0x1b80, 0x5f301ec5,</div><div class='add'>+	0x1b80, 0x5f301ec7,</div><div class='add'>+	0x1b80, 0x5f001ed5,</div><div class='add'>+	0x1b80, 0x5f001ed7,</div><div class='add'>+	0x1b80, 0x00061ee5,</div><div class='add'>+	0x1b80, 0x00061ee7,</div><div class='add'>+	0x1b80, 0x77081ef5,</div><div class='add'>+	0x1b80, 0x77081ef7,</div><div class='add'>+	0x1b80, 0x00051f05,</div><div class='add'>+	0x1b80, 0x00051f07,</div><div class='add'>+	0x1b80, 0x61401f15,</div><div class='add'>+	0x1b80, 0x61401f17,</div><div class='add'>+	0x1b80, 0x63b01f25,</div><div class='add'>+	0x1b80, 0x63b01f27,</div><div class='add'>+	0x1b80, 0x00071f35,</div><div class='add'>+	0x1b80, 0x00071f37,</div><div class='add'>+	0x1b80, 0x54401f45,</div><div class='add'>+	0x1b80, 0x54401f47,</div><div class='add'>+	0x1b80, 0x00041f55,</div><div class='add'>+	0x1b80, 0x00041f57,</div><div class='add'>+	0x1b80, 0x40081f65,</div><div class='add'>+	0x1b80, 0x40081f67,</div><div class='add'>+	0x1b80, 0x00011f75,</div><div class='add'>+	0x1b80, 0x00011f77,</div><div class='add'>+	0x1b80, 0xe2571f85,</div><div class='add'>+	0x1b80, 0xe2571f87,</div><div class='add'>+	0x1b80, 0x74081f95,</div><div class='add'>+	0x1b80, 0x74081f97,</div><div class='add'>+	0x1b80, 0xe2a11fa5,</div><div class='add'>+	0x1b80, 0xe2a11fa7,</div><div class='add'>+	0x1b80, 0x00041fb5,</div><div class='add'>+	0x1b80, 0x00041fb7,</div><div class='add'>+	0x1b80, 0x40081fc5,</div><div class='add'>+	0x1b80, 0x40081fc7,</div><div class='add'>+	0x1b80, 0x00011fd5,</div><div class='add'>+	0x1b80, 0x00011fd7,</div><div class='add'>+	0x1b80, 0xe2571fe5,</div><div class='add'>+	0x1b80, 0xe2571fe7,</div><div class='add'>+	0x1b80, 0x74081ff5,</div><div class='add'>+	0x1b80, 0x74081ff7,</div><div class='add'>+	0x1b80, 0xe2b12005,</div><div class='add'>+	0x1b80, 0xe2b12007,</div><div class='add'>+	0x1b80, 0x00042015,</div><div class='add'>+	0x1b80, 0x00042017,</div><div class='add'>+	0x1b80, 0x40082025,</div><div class='add'>+	0x1b80, 0x40082027,</div><div class='add'>+	0x1b80, 0x00012035,</div><div class='add'>+	0x1b80, 0x00012037,</div><div class='add'>+	0x1b80, 0xe26d2045,</div><div class='add'>+	0x1b80, 0xe26d2047,</div><div class='add'>+	0x1b80, 0x74002055,</div><div class='add'>+	0x1b80, 0x74002057,</div><div class='add'>+	0x1b80, 0xe2a12065,</div><div class='add'>+	0x1b80, 0xe2a12067,</div><div class='add'>+	0x1b80, 0x00042075,</div><div class='add'>+	0x1b80, 0x00042077,</div><div class='add'>+	0x1b80, 0x40082085,</div><div class='add'>+	0x1b80, 0x40082087,</div><div class='add'>+	0x1b80, 0x00012095,</div><div class='add'>+	0x1b80, 0x00012097,</div><div class='add'>+	0x1b80, 0xe26d20a5,</div><div class='add'>+	0x1b80, 0xe26d20a7,</div><div class='add'>+	0x1b80, 0x740020b5,</div><div class='add'>+	0x1b80, 0x740020b7,</div><div class='add'>+	0x1b80, 0xe2b120c5,</div><div class='add'>+	0x1b80, 0xe2b120c7,</div><div class='add'>+	0x1b80, 0x000420d5,</div><div class='add'>+	0x1b80, 0x000420d7,</div><div class='add'>+	0x1b80, 0x400820e5,</div><div class='add'>+	0x1b80, 0x400820e7,</div><div class='add'>+	0x1b80, 0x000120f5,</div><div class='add'>+	0x1b80, 0x000120f7,</div><div class='add'>+	0x1b80, 0x00042105,</div><div class='add'>+	0x1b80, 0x00042107,</div><div class='add'>+	0x1b80, 0x49042115,</div><div class='add'>+	0x1b80, 0x49042117,</div><div class='add'>+	0x1b80, 0x4bb02125,</div><div class='add'>+	0x1b80, 0x4bb02127,</div><div class='add'>+	0x1b80, 0x00062135,</div><div class='add'>+	0x1b80, 0x00062137,</div><div class='add'>+	0x1b80, 0x75042145,</div><div class='add'>+	0x1b80, 0x75042147,</div><div class='add'>+	0x1b80, 0x77082155,</div><div class='add'>+	0x1b80, 0x77082157,</div><div class='add'>+	0x1b80, 0x00042165,</div><div class='add'>+	0x1b80, 0x00042167,</div><div class='add'>+	0x1b80, 0x44802175,</div><div class='add'>+	0x1b80, 0x44802177,</div><div class='add'>+	0x1b80, 0x45ff2185,</div><div class='add'>+	0x1b80, 0x45ff2187,</div><div class='add'>+	0x1b80, 0x463f2195,</div><div class='add'>+	0x1b80, 0x463f2197,</div><div class='add'>+	0x1b80, 0x473121a5,</div><div class='add'>+	0x1b80, 0x473121a7,</div><div class='add'>+	0x1b80, 0x400821b5,</div><div class='add'>+	0x1b80, 0x400821b7,</div><div class='add'>+	0x1b80, 0xe23e21c5,</div><div class='add'>+	0x1b80, 0xe23e21c7,</div><div class='add'>+	0x1b80, 0x000421d5,</div><div class='add'>+	0x1b80, 0x000421d7,</div><div class='add'>+	0x1b80, 0x400c21e5,</div><div class='add'>+	0x1b80, 0x400c21e7,</div><div class='add'>+	0x1b80, 0x000621f5,</div><div class='add'>+	0x1b80, 0x000621f7,</div><div class='add'>+	0x1b80, 0x75002205,</div><div class='add'>+	0x1b80, 0x75002207,</div><div class='add'>+	0x1b80, 0x00042215,</div><div class='add'>+	0x1b80, 0x00042217,</div><div class='add'>+	0x1b80, 0x445b2225,</div><div class='add'>+	0x1b80, 0x445b2227,</div><div class='add'>+	0x1b80, 0x47002235,</div><div class='add'>+	0x1b80, 0x47002237,</div><div class='add'>+	0x1b80, 0x40082245,</div><div class='add'>+	0x1b80, 0x40082247,</div><div class='add'>+	0x1b80, 0x00012255,</div><div class='add'>+	0x1b80, 0x00012257,</div><div class='add'>+	0x1b80, 0x00052265,</div><div class='add'>+	0x1b80, 0x00052267,</div><div class='add'>+	0x1b80, 0x61042275,</div><div class='add'>+	0x1b80, 0x61042277,</div><div class='add'>+	0x1b80, 0x63b02285,</div><div class='add'>+	0x1b80, 0x63b02287,</div><div class='add'>+	0x1b80, 0x00062295,</div><div class='add'>+	0x1b80, 0x00062297,</div><div class='add'>+	0x1b80, 0x750822a5,</div><div class='add'>+	0x1b80, 0x750822a7,</div><div class='add'>+	0x1b80, 0x770822b5,</div><div class='add'>+	0x1b80, 0x770822b7,</div><div class='add'>+	0x1b80, 0x000522c5,</div><div class='add'>+	0x1b80, 0x000522c7,</div><div class='add'>+	0x1b80, 0x5c8022d5,</div><div class='add'>+	0x1b80, 0x5c8022d7,</div><div class='add'>+	0x1b80, 0x5dff22e5,</div><div class='add'>+	0x1b80, 0x5dff22e7,</div><div class='add'>+	0x1b80, 0x5e3f22f5,</div><div class='add'>+	0x1b80, 0x5e3f22f7,</div><div class='add'>+	0x1b80, 0x5f312305,</div><div class='add'>+	0x1b80, 0x5f312307,</div><div class='add'>+	0x1b80, 0x00042315,</div><div class='add'>+	0x1b80, 0x00042317,</div><div class='add'>+	0x1b80, 0x400a2325,</div><div class='add'>+	0x1b80, 0x400a2327,</div><div class='add'>+	0x1b80, 0xe23e2335,</div><div class='add'>+	0x1b80, 0xe23e2337,</div><div class='add'>+	0x1b80, 0x00042345,</div><div class='add'>+	0x1b80, 0x00042347,</div><div class='add'>+	0x1b80, 0x400c2355,</div><div class='add'>+	0x1b80, 0x400c2357,</div><div class='add'>+	0x1b80, 0x00062365,</div><div class='add'>+	0x1b80, 0x00062367,</div><div class='add'>+	0x1b80, 0x75002375,</div><div class='add'>+	0x1b80, 0x75002377,</div><div class='add'>+	0x1b80, 0x00052385,</div><div class='add'>+	0x1b80, 0x00052387,</div><div class='add'>+	0x1b80, 0x5c5b2395,</div><div class='add'>+	0x1b80, 0x5c5b2397,</div><div class='add'>+	0x1b80, 0x5f0023a5,</div><div class='add'>+	0x1b80, 0x5f0023a7,</div><div class='add'>+	0x1b80, 0x000423b5,</div><div class='add'>+	0x1b80, 0x000423b7,</div><div class='add'>+	0x1b80, 0x400823c5,</div><div class='add'>+	0x1b80, 0x400823c7,</div><div class='add'>+	0x1b80, 0x000123d5,</div><div class='add'>+	0x1b80, 0x000123d7,</div><div class='add'>+	0x1b80, 0x000723e5,</div><div class='add'>+	0x1b80, 0x000723e7,</div><div class='add'>+	0x1b80, 0x4c1223f5,</div><div class='add'>+	0x1b80, 0x4c1223f7,</div><div class='add'>+	0x1b80, 0x4e202405,</div><div class='add'>+	0x1b80, 0x4e202407,</div><div class='add'>+	0x1b80, 0x00052415,</div><div class='add'>+	0x1b80, 0x00052417,</div><div class='add'>+	0x1b80, 0x598f2425,</div><div class='add'>+	0x1b80, 0x598f2427,</div><div class='add'>+	0x1b80, 0x40022435,</div><div class='add'>+	0x1b80, 0x40022437,</div><div class='add'>+	0x1b80, 0x4c012445,</div><div class='add'>+	0x1b80, 0x4c012447,</div><div class='add'>+	0x1b80, 0x4c002455,</div><div class='add'>+	0x1b80, 0x4c002457,</div><div class='add'>+	0x1b80, 0xab002465,</div><div class='add'>+	0x1b80, 0xab002467,</div><div class='add'>+	0x1b80, 0x40032475,</div><div class='add'>+	0x1b80, 0x40032477,</div><div class='add'>+	0x1b80, 0x49802485,</div><div class='add'>+	0x1b80, 0x49802487,</div><div class='add'>+	0x1b80, 0x56c02495,</div><div class='add'>+	0x1b80, 0x56c02497,</div><div class='add'>+	0x1b80, 0x540224a5,</div><div class='add'>+	0x1b80, 0x540224a7,</div><div class='add'>+	0x1b80, 0x4c0124b5,</div><div class='add'>+	0x1b80, 0x4c0124b7,</div><div class='add'>+	0x1b80, 0x4c0024c5,</div><div class='add'>+	0x1b80, 0x4c0024c7,</div><div class='add'>+	0x1b80, 0xab0024d5,</div><div class='add'>+	0x1b80, 0xab0024d7,</div><div class='add'>+	0x1b80, 0x540024e5,</div><div class='add'>+	0x1b80, 0x540024e7,</div><div class='add'>+	0x1b80, 0x000724f5,</div><div class='add'>+	0x1b80, 0x000724f7,</div><div class='add'>+	0x1b80, 0x4c002505,</div><div class='add'>+	0x1b80, 0x4c002507,</div><div class='add'>+	0x1b80, 0x4e002515,</div><div class='add'>+	0x1b80, 0x4e002517,</div><div class='add'>+	0x1b80, 0x00052525,</div><div class='add'>+	0x1b80, 0x00052527,</div><div class='add'>+	0x1b80, 0x40042535,</div><div class='add'>+	0x1b80, 0x40042537,</div><div class='add'>+	0x1b80, 0x4c012545,</div><div class='add'>+	0x1b80, 0x4c012547,</div><div class='add'>+	0x1b80, 0x4c002555,</div><div class='add'>+	0x1b80, 0x4c002557,</div><div class='add'>+	0x1b80, 0x00012565,</div><div class='add'>+	0x1b80, 0x00012567,</div><div class='add'>+	0x1b80, 0x00042575,</div><div class='add'>+	0x1b80, 0x00042577,</div><div class='add'>+	0x1b80, 0x44802585,</div><div class='add'>+	0x1b80, 0x44802587,</div><div class='add'>+	0x1b80, 0x4b002595,</div><div class='add'>+	0x1b80, 0x4b002597,</div><div class='add'>+	0x1b80, 0x000525a5,</div><div class='add'>+	0x1b80, 0x000525a7,</div><div class='add'>+	0x1b80, 0x5c8025b5,</div><div class='add'>+	0x1b80, 0x5c8025b7,</div><div class='add'>+	0x1b80, 0x630025c5,</div><div class='add'>+	0x1b80, 0x630025c7,</div><div class='add'>+	0x1b80, 0x000725d5,</div><div class='add'>+	0x1b80, 0x000725d7,</div><div class='add'>+	0x1b80, 0x780c25e5,</div><div class='add'>+	0x1b80, 0x780c25e7,</div><div class='add'>+	0x1b80, 0x791925f5,</div><div class='add'>+	0x1b80, 0x791925f7,</div><div class='add'>+	0x1b80, 0x7a002605,</div><div class='add'>+	0x1b80, 0x7a002607,</div><div class='add'>+	0x1b80, 0x7b822615,</div><div class='add'>+	0x1b80, 0x7b822617,</div><div class='add'>+	0x1b80, 0x7b022625,</div><div class='add'>+	0x1b80, 0x7b022627,</div><div class='add'>+	0x1b80, 0x78142635,</div><div class='add'>+	0x1b80, 0x78142637,</div><div class='add'>+	0x1b80, 0x79ee2645,</div><div class='add'>+	0x1b80, 0x79ee2647,</div><div class='add'>+	0x1b80, 0x7a012655,</div><div class='add'>+	0x1b80, 0x7a012657,</div><div class='add'>+	0x1b80, 0x7b832665,</div><div class='add'>+	0x1b80, 0x7b832667,</div><div class='add'>+	0x1b80, 0x7b032675,</div><div class='add'>+	0x1b80, 0x7b032677,</div><div class='add'>+	0x1b80, 0x78282685,</div><div class='add'>+	0x1b80, 0x78282687,</div><div class='add'>+	0x1b80, 0x79b42695,</div><div class='add'>+	0x1b80, 0x79b42697,</div><div class='add'>+	0x1b80, 0x7a0026a5,</div><div class='add'>+	0x1b80, 0x7a0026a7,</div><div class='add'>+	0x1b80, 0x7b0026b5,</div><div class='add'>+	0x1b80, 0x7b0026b7,</div><div class='add'>+	0x1b80, 0x000126c5,</div><div class='add'>+	0x1b80, 0x000126c7,</div><div class='add'>+	0x1b80, 0x000426d5,</div><div class='add'>+	0x1b80, 0x000426d7,</div><div class='add'>+	0x1b80, 0x448026e5,</div><div class='add'>+	0x1b80, 0x448026e7,</div><div class='add'>+	0x1b80, 0x4b0026f5,</div><div class='add'>+	0x1b80, 0x4b0026f7,</div><div class='add'>+	0x1b80, 0x00052705,</div><div class='add'>+	0x1b80, 0x00052707,</div><div class='add'>+	0x1b80, 0x5c802715,</div><div class='add'>+	0x1b80, 0x5c802717,</div><div class='add'>+	0x1b80, 0x63002725,</div><div class='add'>+	0x1b80, 0x63002727,</div><div class='add'>+	0x1b80, 0x00072735,</div><div class='add'>+	0x1b80, 0x00072737,</div><div class='add'>+	0x1b80, 0x78102745,</div><div class='add'>+	0x1b80, 0x78102747,</div><div class='add'>+	0x1b80, 0x79132755,</div><div class='add'>+	0x1b80, 0x79132757,</div><div class='add'>+	0x1b80, 0x7a002765,</div><div class='add'>+	0x1b80, 0x7a002767,</div><div class='add'>+	0x1b80, 0x7b802775,</div><div class='add'>+	0x1b80, 0x7b802777,</div><div class='add'>+	0x1b80, 0x7b002785,</div><div class='add'>+	0x1b80, 0x7b002787,</div><div class='add'>+	0x1b80, 0x78db2795,</div><div class='add'>+	0x1b80, 0x78db2797,</div><div class='add'>+	0x1b80, 0x790027a5,</div><div class='add'>+	0x1b80, 0x790027a7,</div><div class='add'>+	0x1b80, 0x7a0027b5,</div><div class='add'>+	0x1b80, 0x7a0027b7,</div><div class='add'>+	0x1b80, 0x7b8127c5,</div><div class='add'>+	0x1b80, 0x7b8127c7,</div><div class='add'>+	0x1b80, 0x7b0127d5,</div><div class='add'>+	0x1b80, 0x7b0127d7,</div><div class='add'>+	0x1b80, 0x782827e5,</div><div class='add'>+	0x1b80, 0x782827e7,</div><div class='add'>+	0x1b80, 0x79b427f5,</div><div class='add'>+	0x1b80, 0x79b427f7,</div><div class='add'>+	0x1b80, 0x7a002805,</div><div class='add'>+	0x1b80, 0x7a002807,</div><div class='add'>+	0x1b80, 0x7b002815,</div><div class='add'>+	0x1b80, 0x7b002817,</div><div class='add'>+	0x1b80, 0x00012825,</div><div class='add'>+	0x1b80, 0x00012827,</div><div class='add'>+	0x1b80, 0x00072835,</div><div class='add'>+	0x1b80, 0x00072837,</div><div class='add'>+	0x1b80, 0x783e2845,</div><div class='add'>+	0x1b80, 0x783e2847,</div><div class='add'>+	0x1b80, 0x79f92855,</div><div class='add'>+	0x1b80, 0x79f92857,</div><div class='add'>+	0x1b80, 0x7a012865,</div><div class='add'>+	0x1b80, 0x7a012867,</div><div class='add'>+	0x1b80, 0x7b822875,</div><div class='add'>+	0x1b80, 0x7b822877,</div><div class='add'>+	0x1b80, 0x7b022885,</div><div class='add'>+	0x1b80, 0x7b022887,</div><div class='add'>+	0x1b80, 0x78a92895,</div><div class='add'>+	0x1b80, 0x78a92897,</div><div class='add'>+	0x1b80, 0x79ed28a5,</div><div class='add'>+	0x1b80, 0x79ed28a7,</div><div class='add'>+	0x1b80, 0x7b8328b5,</div><div class='add'>+	0x1b80, 0x7b8328b7,</div><div class='add'>+	0x1b80, 0x7b0328c5,</div><div class='add'>+	0x1b80, 0x7b0328c7,</div><div class='add'>+	0x1b80, 0x782828d5,</div><div class='add'>+	0x1b80, 0x782828d7,</div><div class='add'>+	0x1b80, 0x79b428e5,</div><div class='add'>+	0x1b80, 0x79b428e7,</div><div class='add'>+	0x1b80, 0x7a0028f5,</div><div class='add'>+	0x1b80, 0x7a0028f7,</div><div class='add'>+	0x1b80, 0x7b002905,</div><div class='add'>+	0x1b80, 0x7b002907,</div><div class='add'>+	0x1b80, 0x00012915,</div><div class='add'>+	0x1b80, 0x00012917,</div><div class='add'>+	0x1b80, 0x00072925,</div><div class='add'>+	0x1b80, 0x00072927,</div><div class='add'>+	0x1b80, 0x78ae2935,</div><div class='add'>+	0x1b80, 0x78ae2937,</div><div class='add'>+	0x1b80, 0x79fa2945,</div><div class='add'>+	0x1b80, 0x79fa2947,</div><div class='add'>+	0x1b80, 0x7a012955,</div><div class='add'>+	0x1b80, 0x7a012957,</div><div class='add'>+	0x1b80, 0x7b802965,</div><div class='add'>+	0x1b80, 0x7b802967,</div><div class='add'>+	0x1b80, 0x7b002975,</div><div class='add'>+	0x1b80, 0x7b002977,</div><div class='add'>+	0x1b80, 0x787a2985,</div><div class='add'>+	0x1b80, 0x787a2987,</div><div class='add'>+	0x1b80, 0x79f12995,</div><div class='add'>+	0x1b80, 0x79f12997,</div><div class='add'>+	0x1b80, 0x7b8129a5,</div><div class='add'>+	0x1b80, 0x7b8129a7,</div><div class='add'>+	0x1b80, 0x7b0129b5,</div><div class='add'>+	0x1b80, 0x7b0129b7,</div><div class='add'>+	0x1b80, 0x782829c5,</div><div class='add'>+	0x1b80, 0x782829c7,</div><div class='add'>+	0x1b80, 0x79b429d5,</div><div class='add'>+	0x1b80, 0x79b429d7,</div><div class='add'>+	0x1b80, 0x7a0029e5,</div><div class='add'>+	0x1b80, 0x7a0029e7,</div><div class='add'>+	0x1b80, 0x7b0029f5,</div><div class='add'>+	0x1b80, 0x7b0029f7,</div><div class='add'>+	0x1b80, 0x00012a05,</div><div class='add'>+	0x1b80, 0x00012a07,</div><div class='add'>+	0x1b80, 0x00072a15,</div><div class='add'>+	0x1b80, 0x00072a17,</div><div class='add'>+	0x1b80, 0x75002a25,</div><div class='add'>+	0x1b80, 0x75002a27,</div><div class='add'>+	0x1b80, 0x76022a35,</div><div class='add'>+	0x1b80, 0x76022a37,</div><div class='add'>+	0x1b80, 0x77152a45,</div><div class='add'>+	0x1b80, 0x77152a47,</div><div class='add'>+	0x1b80, 0x00062a55,</div><div class='add'>+	0x1b80, 0x00062a57,</div><div class='add'>+	0x1b80, 0x74002a65,</div><div class='add'>+	0x1b80, 0x74002a67,</div><div class='add'>+	0x1b80, 0x76002a75,</div><div class='add'>+	0x1b80, 0x76002a77,</div><div class='add'>+	0x1b80, 0x77002a85,</div><div class='add'>+	0x1b80, 0x77002a87,</div><div class='add'>+	0x1b80, 0x75102a95,</div><div class='add'>+	0x1b80, 0x75102a97,</div><div class='add'>+	0x1b80, 0x75002aa5,</div><div class='add'>+	0x1b80, 0x75002aa7,</div><div class='add'>+	0x1b80, 0xb3002ab5,</div><div class='add'>+	0x1b80, 0xb3002ab7,</div><div class='add'>+	0x1b80, 0x93002ac5,</div><div class='add'>+	0x1b80, 0x93002ac7,</div><div class='add'>+	0x1b80, 0x00072ad5,</div><div class='add'>+	0x1b80, 0x00072ad7,</div><div class='add'>+	0x1b80, 0x76002ae5,</div><div class='add'>+	0x1b80, 0x76002ae7,</div><div class='add'>+	0x1b80, 0x77002af5,</div><div class='add'>+	0x1b80, 0x77002af7,</div><div class='add'>+	0x1b80, 0x00012b05,</div><div class='add'>+	0x1b80, 0x00012b07,</div><div class='add'>+	0x1b80, 0x00072b15,</div><div class='add'>+	0x1b80, 0x00072b17,</div><div class='add'>+	0x1b80, 0x75002b25,</div><div class='add'>+	0x1b80, 0x75002b27,</div><div class='add'>+	0x1b80, 0x76022b35,</div><div class='add'>+	0x1b80, 0x76022b37,</div><div class='add'>+	0x1b80, 0x77252b45,</div><div class='add'>+	0x1b80, 0x77252b47,</div><div class='add'>+	0x1b80, 0x00062b55,</div><div class='add'>+	0x1b80, 0x00062b57,</div><div class='add'>+	0x1b80, 0x74002b65,</div><div class='add'>+	0x1b80, 0x74002b67,</div><div class='add'>+	0x1b80, 0x76002b75,</div><div class='add'>+	0x1b80, 0x76002b77,</div><div class='add'>+	0x1b80, 0x77012b85,</div><div class='add'>+	0x1b80, 0x77012b87,</div><div class='add'>+	0x1b80, 0x75102b95,</div><div class='add'>+	0x1b80, 0x75102b97,</div><div class='add'>+	0x1b80, 0x75002ba5,</div><div class='add'>+	0x1b80, 0x75002ba7,</div><div class='add'>+	0x1b80, 0xb3002bb5,</div><div class='add'>+	0x1b80, 0xb3002bb7,</div><div class='add'>+	0x1b80, 0x93002bc5,</div><div class='add'>+	0x1b80, 0x93002bc7,</div><div class='add'>+	0x1b80, 0x00072bd5,</div><div class='add'>+	0x1b80, 0x00072bd7,</div><div class='add'>+	0x1b80, 0x76002be5,</div><div class='add'>+	0x1b80, 0x76002be7,</div><div class='add'>+	0x1b80, 0x77002bf5,</div><div class='add'>+	0x1b80, 0x77002bf7,</div><div class='add'>+	0x1b80, 0x00012c05,</div><div class='add'>+	0x1b80, 0x00012c07,</div><div class='add'>+	0x1b80, 0x00042c15,</div><div class='add'>+	0x1b80, 0x00042c17,</div><div class='add'>+	0x1b80, 0x44802c25,</div><div class='add'>+	0x1b80, 0x44802c27,</div><div class='add'>+	0x1b80, 0x47302c35,</div><div class='add'>+	0x1b80, 0x47302c37,</div><div class='add'>+	0x1b80, 0x00062c45,</div><div class='add'>+	0x1b80, 0x00062c47,</div><div class='add'>+	0x1b80, 0x776c2c55,</div><div class='add'>+	0x1b80, 0x776c2c57,</div><div class='add'>+	0x1b80, 0x00012c65,</div><div class='add'>+	0x1b80, 0x00012c67,</div><div class='add'>+	0x1b80, 0x00052c75,</div><div class='add'>+	0x1b80, 0x00052c77,</div><div class='add'>+	0x1b80, 0x5c802c85,</div><div class='add'>+	0x1b80, 0x5c802c87,</div><div class='add'>+	0x1b80, 0x5f302c95,</div><div class='add'>+	0x1b80, 0x5f302c97,</div><div class='add'>+	0x1b80, 0x00062ca5,</div><div class='add'>+	0x1b80, 0x00062ca7,</div><div class='add'>+	0x1b80, 0x776d2cb5,</div><div class='add'>+	0x1b80, 0x776d2cb7,</div><div class='add'>+	0x1b80, 0x00012cc5,</div><div class='add'>+	0x1b80, 0x00012cc7,</div><div class='add'>+	0x1b80, 0xb9002cd5,</div><div class='add'>+	0x1b80, 0xb9002cd7,</div><div class='add'>+	0x1b80, 0x99002ce5,</div><div class='add'>+	0x1b80, 0x99002ce7,</div><div class='add'>+	0x1b80, 0x00062cf5,</div><div class='add'>+	0x1b80, 0x00062cf7,</div><div class='add'>+	0x1b80, 0x77002d05,</div><div class='add'>+	0x1b80, 0x77002d07,</div><div class='add'>+	0x1b80, 0x98052d15,</div><div class='add'>+	0x1b80, 0x98052d17,</div><div class='add'>+	0x1b80, 0x00042d25,</div><div class='add'>+	0x1b80, 0x00042d27,</div><div class='add'>+	0x1b80, 0x40082d35,</div><div class='add'>+	0x1b80, 0x40082d37,</div><div class='add'>+	0x1b80, 0x4a022d45,</div><div class='add'>+	0x1b80, 0x4a022d47,</div><div class='add'>+	0x1b80, 0x30192d55,</div><div class='add'>+	0x1b80, 0x30192d57,</div><div class='add'>+	0x1b80, 0x00012d65,</div><div class='add'>+	0x1b80, 0x00012d67,</div><div class='add'>+	0x1b80, 0x7b482d75,</div><div class='add'>+	0x1b80, 0x7b482d77,</div><div class='add'>+	0x1b80, 0x7a902d85,</div><div class='add'>+	0x1b80, 0x7a902d87,</div><div class='add'>+	0x1b80, 0x79002d95,</div><div class='add'>+	0x1b80, 0x79002d97,</div><div class='add'>+	0x1b80, 0x55032da5,</div><div class='add'>+	0x1b80, 0x55032da7,</div><div class='add'>+	0x1b80, 0x32e32db5,</div><div class='add'>+	0x1b80, 0x32e32db7,</div><div class='add'>+	0x1b80, 0x7b382dc5,</div><div class='add'>+	0x1b80, 0x7b382dc7,</div><div class='add'>+	0x1b80, 0x7a802dd5,</div><div class='add'>+	0x1b80, 0x7a802dd7,</div><div class='add'>+	0x1b80, 0x550b2de5,</div><div class='add'>+	0x1b80, 0x550b2de7,</div><div class='add'>+	0x1b80, 0x32e32df5,</div><div class='add'>+	0x1b80, 0x32e32df7,</div><div class='add'>+	0x1b80, 0x7b402e05,</div><div class='add'>+	0x1b80, 0x7b402e07,</div><div class='add'>+	0x1b80, 0x7a002e15,</div><div class='add'>+	0x1b80, 0x7a002e17,</div><div class='add'>+	0x1b80, 0x55132e25,</div><div class='add'>+	0x1b80, 0x55132e27,</div><div class='add'>+	0x1b80, 0x74012e35,</div><div class='add'>+	0x1b80, 0x74012e37,</div><div class='add'>+	0x1b80, 0x74002e45,</div><div class='add'>+	0x1b80, 0x74002e47,</div><div class='add'>+	0x1b80, 0x8e002e55,</div><div class='add'>+	0x1b80, 0x8e002e57,</div><div class='add'>+	0x1b80, 0x00012e65,</div><div class='add'>+	0x1b80, 0x00012e67,</div><div class='add'>+	0x1b80, 0x57022e75,</div><div class='add'>+	0x1b80, 0x57022e77,</div><div class='add'>+	0x1b80, 0x57002e85,</div><div class='add'>+	0x1b80, 0x57002e87,</div><div class='add'>+	0x1b80, 0x97002e95,</div><div class='add'>+	0x1b80, 0x97002e97,</div><div class='add'>+	0x1b80, 0x00012ea5,</div><div class='add'>+	0x1b80, 0x00012ea7,</div><div class='add'>+	0x1b80, 0x4f782eb5,</div><div class='add'>+	0x1b80, 0x4f782eb7,</div><div class='add'>+	0x1b80, 0x53882ec5,</div><div class='add'>+	0x1b80, 0x53882ec7,</div><div class='add'>+	0x1b80, 0xe2f72ed5,</div><div class='add'>+	0x1b80, 0xe2f72ed7,</div><div class='add'>+	0x1b80, 0x54802ee5,</div><div class='add'>+	0x1b80, 0x54802ee7,</div><div class='add'>+	0x1b80, 0x54002ef5,</div><div class='add'>+	0x1b80, 0x54002ef7,</div><div class='add'>+	0x1b80, 0x54812f05,</div><div class='add'>+	0x1b80, 0x54812f07,</div><div class='add'>+	0x1b80, 0x54002f15,</div><div class='add'>+	0x1b80, 0x54002f17,</div><div class='add'>+	0x1b80, 0x54822f25,</div><div class='add'>+	0x1b80, 0x54822f27,</div><div class='add'>+	0x1b80, 0x54002f35,</div><div class='add'>+	0x1b80, 0x54002f37,</div><div class='add'>+	0x1b80, 0xe3022f45,</div><div class='add'>+	0x1b80, 0xe3022f47,</div><div class='add'>+	0x1b80, 0xbf1d2f55,</div><div class='add'>+	0x1b80, 0xbf1d2f57,</div><div class='add'>+	0x1b80, 0x30192f65,</div><div class='add'>+	0x1b80, 0x30192f67,</div><div class='add'>+	0x1b80, 0xe2d72f75,</div><div class='add'>+	0x1b80, 0xe2d72f77,</div><div class='add'>+	0x1b80, 0xe2dc2f85,</div><div class='add'>+	0x1b80, 0xe2dc2f87,</div><div class='add'>+	0x1b80, 0xe2e02f95,</div><div class='add'>+	0x1b80, 0xe2e02f97,</div><div class='add'>+	0x1b80, 0xe2e72fa5,</div><div class='add'>+	0x1b80, 0xe2e72fa7,</div><div class='add'>+	0x1b80, 0xe3412fb5,</div><div class='add'>+	0x1b80, 0xe3412fb7,</div><div class='add'>+	0x1b80, 0x55132fc5,</div><div class='add'>+	0x1b80, 0x55132fc7,</div><div class='add'>+	0x1b80, 0xe2e32fd5,</div><div class='add'>+	0x1b80, 0xe2e32fd7,</div><div class='add'>+	0x1b80, 0x55152fe5,</div><div class='add'>+	0x1b80, 0x55152fe7,</div><div class='add'>+	0x1b80, 0xe2e72ff5,</div><div class='add'>+	0x1b80, 0xe2e72ff7,</div><div class='add'>+	0x1b80, 0xe3413005,</div><div class='add'>+	0x1b80, 0xe3413007,</div><div class='add'>+	0x1b80, 0x00013015,</div><div class='add'>+	0x1b80, 0x00013017,</div><div class='add'>+	0x1b80, 0x54bf3025,</div><div class='add'>+	0x1b80, 0x54bf3027,</div><div class='add'>+	0x1b80, 0x54c03035,</div><div class='add'>+	0x1b80, 0x54c03037,</div><div class='add'>+	0x1b80, 0x54a33045,</div><div class='add'>+	0x1b80, 0x54a33047,</div><div class='add'>+	0x1b80, 0x54c13055,</div><div class='add'>+	0x1b80, 0x54c13057,</div><div class='add'>+	0x1b80, 0x54a43065,</div><div class='add'>+	0x1b80, 0x54a43067,</div><div class='add'>+	0x1b80, 0x4c183075,</div><div class='add'>+	0x1b80, 0x4c183077,</div><div class='add'>+	0x1b80, 0xbf073085,</div><div class='add'>+	0x1b80, 0xbf073087,</div><div class='add'>+	0x1b80, 0x54c23095,</div><div class='add'>+	0x1b80, 0x54c23097,</div><div class='add'>+	0x1b80, 0x54a430a5,</div><div class='add'>+	0x1b80, 0x54a430a7,</div><div class='add'>+	0x1b80, 0xbf0430b5,</div><div class='add'>+	0x1b80, 0xbf0430b7,</div><div class='add'>+	0x1b80, 0x54c130c5,</div><div class='add'>+	0x1b80, 0x54c130c7,</div><div class='add'>+	0x1b80, 0x54a330d5,</div><div class='add'>+	0x1b80, 0x54a330d7,</div><div class='add'>+	0x1b80, 0xbf0130e5,</div><div class='add'>+	0x1b80, 0xbf0130e7,</div><div class='add'>+	0x1b80, 0xe34f30f5,</div><div class='add'>+	0x1b80, 0xe34f30f7,</div><div class='add'>+	0x1b80, 0x54df3105,</div><div class='add'>+	0x1b80, 0x54df3107,</div><div class='add'>+	0x1b80, 0x00013115,</div><div class='add'>+	0x1b80, 0x00013117,</div><div class='add'>+	0x1b80, 0x54bf3125,</div><div class='add'>+	0x1b80, 0x54bf3127,</div><div class='add'>+	0x1b80, 0x54e53135,</div><div class='add'>+	0x1b80, 0x54e53137,</div><div class='add'>+	0x1b80, 0x050a3145,</div><div class='add'>+	0x1b80, 0x050a3147,</div><div class='add'>+	0x1b80, 0x54df3155,</div><div class='add'>+	0x1b80, 0x54df3157,</div><div class='add'>+	0x1b80, 0x00013165,</div><div class='add'>+	0x1b80, 0x00013167,</div><div class='add'>+	0x1b80, 0x7f403175,</div><div class='add'>+	0x1b80, 0x7f403177,</div><div class='add'>+	0x1b80, 0x7e003185,</div><div class='add'>+	0x1b80, 0x7e003187,</div><div class='add'>+	0x1b80, 0x7d003195,</div><div class='add'>+	0x1b80, 0x7d003197,</div><div class='add'>+	0x1b80, 0x550131a5,</div><div class='add'>+	0x1b80, 0x550131a7,</div><div class='add'>+	0x1b80, 0x5c3131b5,</div><div class='add'>+	0x1b80, 0x5c3131b7,</div><div class='add'>+	0x1b80, 0xe2e331c5,</div><div class='add'>+	0x1b80, 0xe2e331c7,</div><div class='add'>+	0x1b80, 0xe2e731d5,</div><div class='add'>+	0x1b80, 0xe2e731d7,</div><div class='add'>+	0x1b80, 0x548031e5,</div><div class='add'>+	0x1b80, 0x548031e7,</div><div class='add'>+	0x1b80, 0x540031f5,</div><div class='add'>+	0x1b80, 0x540031f7,</div><div class='add'>+	0x1b80, 0x54813205,</div><div class='add'>+	0x1b80, 0x54813207,</div><div class='add'>+	0x1b80, 0x54003215,</div><div class='add'>+	0x1b80, 0x54003217,</div><div class='add'>+	0x1b80, 0x54823225,</div><div class='add'>+	0x1b80, 0x54823227,</div><div class='add'>+	0x1b80, 0x54003235,</div><div class='add'>+	0x1b80, 0x54003237,</div><div class='add'>+	0x1b80, 0xe3023245,</div><div class='add'>+	0x1b80, 0xe3023247,</div><div class='add'>+	0x1b80, 0xbfed3255,</div><div class='add'>+	0x1b80, 0xbfed3257,</div><div class='add'>+	0x1b80, 0x30193265,</div><div class='add'>+	0x1b80, 0x30193267,</div><div class='add'>+	0x1b80, 0x74023275,</div><div class='add'>+	0x1b80, 0x74023277,</div><div class='add'>+	0x1b80, 0x003f3285,</div><div class='add'>+	0x1b80, 0x003f3287,</div><div class='add'>+	0x1b80, 0x74003295,</div><div class='add'>+	0x1b80, 0x74003297,</div><div class='add'>+	0x1b80, 0x000232a5,</div><div class='add'>+	0x1b80, 0x000232a7,</div><div class='add'>+	0x1b80, 0x000132b5,</div><div class='add'>+	0x1b80, 0x000132b7,</div><div class='add'>+	0x1b80, 0x000632c5,</div><div class='add'>+	0x1b80, 0x000632c7,</div><div class='add'>+	0x1b80, 0x5a8032d5,</div><div class='add'>+	0x1b80, 0x5a8032d7,</div><div class='add'>+	0x1b80, 0x5a0032e5,</div><div class='add'>+	0x1b80, 0x5a0032e7,</div><div class='add'>+	0x1b80, 0x920032f5,</div><div class='add'>+	0x1b80, 0x920032f7,</div><div class='add'>+	0x1b80, 0x00013305,</div><div class='add'>+	0x1b80, 0x00013307,</div><div class='add'>+	0x1b80, 0x5b8f3315,</div><div class='add'>+	0x1b80, 0x5b8f3317,</div><div class='add'>+	0x1b80, 0x5b0f3325,</div><div class='add'>+	0x1b80, 0x5b0f3327,</div><div class='add'>+	0x1b80, 0x91003335,</div><div class='add'>+	0x1b80, 0x91003337,</div><div class='add'>+	0x1b80, 0x00013345,</div><div class='add'>+	0x1b80, 0x00013347,</div><div class='add'>+	0x1b80, 0x00063355,</div><div class='add'>+	0x1b80, 0x00063357,</div><div class='add'>+	0x1b80, 0x5d803365,</div><div class='add'>+	0x1b80, 0x5d803367,</div><div class='add'>+	0x1b80, 0x5e563375,</div><div class='add'>+	0x1b80, 0x5e563377,</div><div class='add'>+	0x1b80, 0x00043385,</div><div class='add'>+	0x1b80, 0x00043387,</div><div class='add'>+	0x1b80, 0x4d083395,</div><div class='add'>+	0x1b80, 0x4d083397,</div><div class='add'>+	0x1b80, 0x571033a5,</div><div class='add'>+	0x1b80, 0x571033a7,</div><div class='add'>+	0x1b80, 0x570033b5,</div><div class='add'>+	0x1b80, 0x570033b7,</div><div class='add'>+	0x1b80, 0x4d0033c5,</div><div class='add'>+	0x1b80, 0x4d0033c7,</div><div class='add'>+	0x1b80, 0x000633d5,</div><div class='add'>+	0x1b80, 0x000633d7,</div><div class='add'>+	0x1b80, 0x5d0033e5,</div><div class='add'>+	0x1b80, 0x5d0033e7,</div><div class='add'>+	0x1b80, 0x000433f5,</div><div class='add'>+	0x1b80, 0x000433f7,</div><div class='add'>+	0x1b80, 0x00013405,</div><div class='add'>+	0x1b80, 0x00013407,</div><div class='add'>+	0x1b80, 0x549f3415,</div><div class='add'>+	0x1b80, 0x549f3417,</div><div class='add'>+	0x1b80, 0x54ff3425,</div><div class='add'>+	0x1b80, 0x54ff3427,</div><div class='add'>+	0x1b80, 0x54003435,</div><div class='add'>+	0x1b80, 0x54003437,</div><div class='add'>+	0x1b80, 0x00013445,</div><div class='add'>+	0x1b80, 0x00013447,</div><div class='add'>+	0x1b80, 0x5c313455,</div><div class='add'>+	0x1b80, 0x5c313457,</div><div class='add'>+	0x1b80, 0x07143465,</div><div class='add'>+	0x1b80, 0x07143467,</div><div class='add'>+	0x1b80, 0x54003475,</div><div class='add'>+	0x1b80, 0x54003477,</div><div class='add'>+	0x1b80, 0x5c323485,</div><div class='add'>+	0x1b80, 0x5c323487,</div><div class='add'>+	0x1b80, 0x00013495,</div><div class='add'>+	0x1b80, 0x00013497,</div><div class='add'>+	0x1b80, 0x5c3234a5,</div><div class='add'>+	0x1b80, 0x5c3234a7,</div><div class='add'>+	0x1b80, 0x071434b5,</div><div class='add'>+	0x1b80, 0x071434b7,</div><div class='add'>+	0x1b80, 0x540034c5,</div><div class='add'>+	0x1b80, 0x540034c7,</div><div class='add'>+	0x1b80, 0x5c3134d5,</div><div class='add'>+	0x1b80, 0x5c3134d7,</div><div class='add'>+	0x1b80, 0x000134e5,</div><div class='add'>+	0x1b80, 0x000134e7,</div><div class='add'>+	0x1b80, 0x4c9834f5,</div><div class='add'>+	0x1b80, 0x4c9834f7,</div><div class='add'>+	0x1b80, 0x4c183505,</div><div class='add'>+	0x1b80, 0x4c183507,</div><div class='add'>+	0x1b80, 0x00013515,</div><div class='add'>+	0x1b80, 0x00013517,</div><div class='add'>+	0x1b80, 0x5c323525,</div><div class='add'>+	0x1b80, 0x5c323527,</div><div class='add'>+	0x1b80, 0x62043535,</div><div class='add'>+	0x1b80, 0x62043537,</div><div class='add'>+	0x1b80, 0x63033545,</div><div class='add'>+	0x1b80, 0x63033547,</div><div class='add'>+	0x1b80, 0x66073555,</div><div class='add'>+	0x1b80, 0x66073557,</div><div class='add'>+	0x1b80, 0x7b403565,</div><div class='add'>+	0x1b80, 0x7b403567,</div><div class='add'>+	0x1b80, 0x7a003575,</div><div class='add'>+	0x1b80, 0x7a003577,</div><div class='add'>+	0x1b80, 0x79003585,</div><div class='add'>+	0x1b80, 0x79003587,</div><div class='add'>+	0x1b80, 0x7f403595,</div><div class='add'>+	0x1b80, 0x7f403597,</div><div class='add'>+	0x1b80, 0x7e0035a5,</div><div class='add'>+	0x1b80, 0x7e0035a7,</div><div class='add'>+	0x1b80, 0x7d0035b5,</div><div class='add'>+	0x1b80, 0x7d0035b7,</div><div class='add'>+	0x1b80, 0x090135c5,</div><div class='add'>+	0x1b80, 0x090135c7,</div><div class='add'>+	0x1b80, 0x0c0135d5,</div><div class='add'>+	0x1b80, 0x0c0135d7,</div><div class='add'>+	0x1b80, 0x0ba635e5,</div><div class='add'>+	0x1b80, 0x0ba635e7,</div><div class='add'>+	0x1b80, 0x000135f5,</div><div class='add'>+	0x1b80, 0x000135f7,</div><div class='add'>+	0x1b80, 0x00000006,</div><div class='add'>+	0x1b80, 0x00000002,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+RTW_DECL_TABLE_PHY_COND(rtw8822c_array_mp_cal_init, rtw_phy_cfg_bb);</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h<br/>new file mode 100644<br/>index 000000000000..06e207dd8e5f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW8822C_TABLE_H__</div><div class='add'>+#define __RTW8822C_TABLE_H__</div><div class='add'>+</div><div class='add'>+extern const struct rtw_table rtw8822c_mac_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_agc_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_bb_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_bb_pg_type0_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_rf_a_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_rf_b_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_txpwr_lmt_type0_tbl;</div><div class='add'>+extern const struct rtw_table rtw8822c_array_mp_cal_init_tbl;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rx.c b/drivers/net/wireless/realtek/rtw88/rx.c<br/>new file mode 100644<br/>index 000000000000..4d837f0c6d5f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rx.c</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "ps.h"</div><div class='add'>+</div><div class='add'>+void rtw_rx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,</div><div class='add'>+		  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct rtw_vif *rtwvif;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data(hdr-&gt;frame_control))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!is_broadcast_ether_addr(hdr-&gt;addr1) &amp;&amp;</div><div class='add'>+	    !is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='add'>+		rtwdev-&gt;stats.rx_unicast += skb-&gt;len;</div><div class='add'>+		rtwdev-&gt;stats.rx_cnt++;</div><div class='add'>+		if (vif) {</div><div class='add'>+			rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+			rtwvif-&gt;stats.rx_unicast += skb-&gt;len;</div><div class='add'>+			rtwvif-&gt;stats.rx_cnt++;</div><div class='add'>+			if (rtwvif-&gt;stats.rx_cnt &gt; RTW_LPS_THRESHOLD)</div><div class='add'>+				rtw_leave_lps_irqsafe(rtwdev, rtwvif);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_rx_stats);</div><div class='add'>+</div><div class='add'>+struct rtw_rx_addr_match_data {</div><div class='add'>+	struct rtw_dev *rtwdev;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct rtw_rx_pkt_stat *pkt_stat;</div><div class='add'>+	u8 *bssid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rtw_rx_addr_match_iter(void *data, u8 *mac,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct rtw_rx_addr_match_data *iter_data = data;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_hdr *hdr = iter_data-&gt;hdr;</div><div class='add'>+	struct rtw_dev *rtwdev = iter_data-&gt;rtwdev;</div><div class='add'>+	struct rtw_sta_info *si;</div><div class='add'>+	struct rtw_rx_pkt_stat *pkt_stat = iter_data-&gt;pkt_stat;</div><div class='add'>+	u8 *bssid = iter_data-&gt;bssid;</div><div class='add'>+</div><div class='add'>+	if (ether_addr_equal(vif-&gt;bss_conf.bssid, bssid) &amp;&amp;</div><div class='add'>+	    (ether_addr_equal(vif-&gt;addr, hdr-&gt;addr1) ||</div><div class='add'>+	     ieee80211_is_beacon(hdr-&gt;frame_control)))</div><div class='add'>+		sta = ieee80211_find_sta_by_ifaddr(rtwdev-&gt;hw, hdr-&gt;addr2,</div><div class='add'>+						   vif-&gt;addr);</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	si = (struct rtw_sta_info *)sta-&gt;drv_priv;</div><div class='add'>+	ewma_rssi_add(&amp;si-&gt;avg_rssi, pkt_stat-&gt;rssi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_rx_addr_match(struct rtw_dev *rtwdev,</div><div class='add'>+			      struct rtw_rx_pkt_stat *pkt_stat,</div><div class='add'>+			      struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	struct rtw_rx_addr_match_data data = {};</div><div class='add'>+</div><div class='add'>+	if (pkt_stat-&gt;crc_err || pkt_stat-&gt;icv_err || !pkt_stat-&gt;phy_status ||</div><div class='add'>+	    ieee80211_is_ctl(hdr-&gt;frame_control))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	data.rtwdev = rtwdev;</div><div class='add'>+	data.hdr = hdr;</div><div class='add'>+	data.pkt_stat = pkt_stat;</div><div class='add'>+	data.bssid = get_hdr_bssid(hdr);</div><div class='add'>+</div><div class='add'>+	rtw_iterate_vifs_atomic(rtwdev, rtw_rx_addr_match_iter, &amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,</div><div class='add'>+			   struct rtw_rx_pkt_stat *pkt_stat,</div><div class='add'>+			   struct ieee80211_hdr *hdr,</div><div class='add'>+			   struct ieee80211_rx_status *rx_status,</div><div class='add'>+			   u8 *phy_status)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = rtwdev-&gt;hw;</div><div class='add'>+</div><div class='add'>+	memset(rx_status, 0, sizeof(*rx_status));</div><div class='add'>+	rx_status-&gt;freq = hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='add'>+	rx_status-&gt;band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='add'>+	if (pkt_stat-&gt;crc_err)</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+	if (pkt_stat-&gt;decrypted)</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+</div><div class='add'>+	if (pkt_stat-&gt;rate &gt;= DESC_RATEVHT1SS_MCS0)</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+	else if (pkt_stat-&gt;rate &gt;= DESC_RATEMCS0)</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+</div><div class='add'>+	if (pkt_stat-&gt;rate &gt;= DESC_RATEVHT1SS_MCS0 &amp;&amp;</div><div class='add'>+	    pkt_stat-&gt;rate &lt;= DESC_RATEVHT1SS_MCS9) {</div><div class='add'>+		rx_status-&gt;nss = 1;</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATEVHT1SS_MCS0;</div><div class='add'>+	} else if (pkt_stat-&gt;rate &gt;= DESC_RATEVHT2SS_MCS0 &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &lt;= DESC_RATEVHT2SS_MCS9) {</div><div class='add'>+		rx_status-&gt;nss = 2;</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATEVHT2SS_MCS0;</div><div class='add'>+	} else if (pkt_stat-&gt;rate &gt;= DESC_RATEVHT3SS_MCS0 &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &lt;= DESC_RATEVHT3SS_MCS9) {</div><div class='add'>+		rx_status-&gt;nss = 3;</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATEVHT3SS_MCS0;</div><div class='add'>+	} else if (pkt_stat-&gt;rate &gt;= DESC_RATEVHT4SS_MCS0 &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &lt;= DESC_RATEVHT4SS_MCS9) {</div><div class='add'>+		rx_status-&gt;nss = 4;</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATEVHT4SS_MCS0;</div><div class='add'>+	} else if (pkt_stat-&gt;rate &gt;= DESC_RATEMCS0 &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &lt;= DESC_RATEMCS15) {</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATEMCS0;</div><div class='add'>+	} else if (rx_status-&gt;band == NL80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &gt;= DESC_RATE6M &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &lt;= DESC_RATE54M) {</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATE6M;</div><div class='add'>+	} else if (rx_status-&gt;band == NL80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &gt;= DESC_RATE1M &amp;&amp;</div><div class='add'>+		   pkt_stat-&gt;rate &lt;= DESC_RATE54M) {</div><div class='add'>+		rx_status-&gt;rate_idx = pkt_stat-&gt;rate - DESC_RATE1M;</div><div class='add'>+	} else {</div><div class='add'>+		rx_status-&gt;rate_idx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_MACTIME_START;</div><div class='add'>+	rx_status-&gt;mactime = pkt_stat-&gt;tsf_low;</div><div class='add'>+</div><div class='add'>+	if (pkt_stat-&gt;bw == RTW_CHANNEL_WIDTH_80)</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+	else if (pkt_stat-&gt;bw == RTW_CHANNEL_WIDTH_40)</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+	else</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_20;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;signal = pkt_stat-&gt;signal_power;</div><div class='add'>+</div><div class='add'>+	rtw_rx_addr_match(rtwdev, pkt_stat, hdr);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/rx.h b/drivers/net/wireless/realtek/rtw88/rx.h<br/>new file mode 100644<br/>index 000000000000..383f3b2babc1<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/rx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/rx.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_RX_H_</div><div class='add'>+#define __RTW_RX_H_</div><div class='add'>+</div><div class='add'>+#define GET_RX_DESC_PHYST(rxdesc)                                              \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(26))</div><div class='add'>+#define GET_RX_DESC_ICV_ERR(rxdesc)                                            \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(15))</div><div class='add'>+#define GET_RX_DESC_CRC32(rxdesc)                                              \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(14))</div><div class='add'>+#define GET_RX_DESC_SWDEC(rxdesc)                                              \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(27))</div><div class='add'>+#define GET_RX_DESC_C2H(rxdesc)                                                \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x02), BIT(28))</div><div class='add'>+#define GET_RX_DESC_PKT_LEN(rxdesc)                                            \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(13, 0))</div><div class='add'>+#define GET_RX_DESC_DRV_INFO_SIZE(rxdesc)                                      \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(19, 16))</div><div class='add'>+#define GET_RX_DESC_SHIFT(rxdesc)                                              \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(25, 24))</div><div class='add'>+#define GET_RX_DESC_RX_RATE(rxdesc)                                            \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x03), GENMASK(6, 0))</div><div class='add'>+#define GET_RX_DESC_MACID(rxdesc)                                              \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x01), GENMASK(6, 0))</div><div class='add'>+#define GET_RX_DESC_PPDU_CNT(rxdesc)                                           \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x02), GENMASK(30, 29))</div><div class='add'>+#define GET_RX_DESC_TSFL(rxdesc)                                               \</div><div class='add'>+	le32_get_bits(*((__le32 *)(rxdesc) + 0x05), GENMASK(31, 0))</div><div class='add'>+</div><div class='add'>+void rtw_rx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,</div><div class='add'>+		  struct sk_buff *skb);</div><div class='add'>+void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,</div><div class='add'>+			   struct rtw_rx_pkt_stat *pkt_stat,</div><div class='add'>+			   struct ieee80211_hdr *hdr,</div><div class='add'>+			   struct ieee80211_rx_status *rx_status,</div><div class='add'>+			   u8 *phy_status);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/sec.c b/drivers/net/wireless/realtek/rtw88/sec.c<br/>new file mode 100644<br/>index 000000000000..c594fc02804d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/sec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/sec.c</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "sec.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+</div><div class='add'>+int rtw_sec_get_free_cam(struct rtw_sec_desc *sec)</div><div class='add'>+{</div><div class='add'>+	/* if default key search is enabled, the first 4 cam entries</div><div class='add'>+	 * are used to direct map to group key with its key-&gt;key_idx, so</div><div class='add'>+	 * driver should use cam entries after 4 to install pairwise key</div><div class='add'>+	 */</div><div class='add'>+	if (sec-&gt;default_key_search)</div><div class='add'>+		return find_next_zero_bit(sec-&gt;cam_map, RTW_MAX_SEC_CAM_NUM,</div><div class='add'>+					  RTW_SEC_DEFAULT_KEY_NUM);</div><div class='add'>+</div><div class='add'>+	return find_first_zero_bit(sec-&gt;cam_map, RTW_MAX_SEC_CAM_NUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_sec_write_cam(struct rtw_dev *rtwdev,</div><div class='add'>+		       struct rtw_sec_desc *sec,</div><div class='add'>+		       struct ieee80211_sta *sta,</div><div class='add'>+		       struct ieee80211_key_conf *key,</div><div class='add'>+		       u8 hw_key_type, u8 hw_key_idx)</div><div class='add'>+{</div><div class='add'>+	struct rtw_cam_entry *cam = &amp;sec-&gt;cam_table[hw_key_idx];</div><div class='add'>+	u32 write_cmd;</div><div class='add'>+	u32 command;</div><div class='add'>+	u32 content;</div><div class='add'>+	u32 addr;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	set_bit(hw_key_idx, sec-&gt;cam_map);</div><div class='add'>+	cam-&gt;valid = true;</div><div class='add'>+	cam-&gt;group = !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE);</div><div class='add'>+	cam-&gt;hw_key_type = hw_key_type;</div><div class='add'>+	cam-&gt;key = key;</div><div class='add'>+	if (sta)</div><div class='add'>+		ether_addr_copy(cam-&gt;addr, sta-&gt;addr);</div><div class='add'>+	else</div><div class='add'>+		eth_broadcast_addr(cam-&gt;addr);</div><div class='add'>+</div><div class='add'>+	write_cmd = RTW_SEC_CMD_WRITE_ENABLE | RTW_SEC_CMD_POLLING;</div><div class='add'>+	addr = hw_key_idx &lt;&lt; RTW_SEC_CAM_ENTRY_SHIFT;</div><div class='add'>+	for (i = 5; i &gt;= 0; i--) {</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 0:</div><div class='add'>+			content = ((key-&gt;keyidx &amp; 0x3))		|</div><div class='add'>+				  ((hw_key_type &amp; 0x7)	&lt;&lt; 2)	|</div><div class='add'>+				  (cam-&gt;group		&lt;&lt; 6)	|</div><div class='add'>+				  (cam-&gt;valid		&lt;&lt; 15)	|</div><div class='add'>+				  (cam-&gt;addr[0]		&lt;&lt; 16)	|</div><div class='add'>+				  (cam-&gt;addr[1]		&lt;&lt; 24);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			content = (cam-&gt;addr[2])		|</div><div class='add'>+				  (cam-&gt;addr[3]		&lt;&lt; 8)	|</div><div class='add'>+				  (cam-&gt;addr[4]		&lt;&lt; 16)	|</div><div class='add'>+				  (cam-&gt;addr[5]		&lt;&lt; 24);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			j = (i - 2) &lt;&lt; 2;</div><div class='add'>+			content = (key-&gt;key[j])			|</div><div class='add'>+				  (key-&gt;key[j + 1]	&lt;&lt; 8)	|</div><div class='add'>+				  (key-&gt;key[j + 2]	&lt;&lt; 16)	|</div><div class='add'>+				  (key-&gt;key[j + 3]	&lt;&lt; 24);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		command = write_cmd | (addr + i);</div><div class='add'>+		rtw_write32(rtwdev, RTW_SEC_WRITE_REG, content);</div><div class='add'>+		rtw_write32(rtwdev, RTW_SEC_CMD_REG, command);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_sec_clear_cam(struct rtw_dev *rtwdev,</div><div class='add'>+		       struct rtw_sec_desc *sec,</div><div class='add'>+		       u8 hw_key_idx)</div><div class='add'>+{</div><div class='add'>+	struct rtw_cam_entry *cam = &amp;sec-&gt;cam_table[hw_key_idx];</div><div class='add'>+	u32 write_cmd;</div><div class='add'>+	u32 command;</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	clear_bit(hw_key_idx, sec-&gt;cam_map);</div><div class='add'>+	cam-&gt;valid = false;</div><div class='add'>+	cam-&gt;key = NULL;</div><div class='add'>+	eth_zero_addr(cam-&gt;addr);</div><div class='add'>+</div><div class='add'>+	write_cmd = RTW_SEC_CMD_WRITE_ENABLE | RTW_SEC_CMD_POLLING;</div><div class='add'>+	addr = hw_key_idx &lt;&lt; RTW_SEC_CAM_ENTRY_SHIFT;</div><div class='add'>+	command = write_cmd | addr;</div><div class='add'>+	rtw_write32(rtwdev, RTW_SEC_WRITE_REG, 0);</div><div class='add'>+	rtw_write32(rtwdev, RTW_SEC_CMD_REG, command);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_sec_enable_sec_engine(struct rtw_dev *rtwdev)</div><div class='add'>+{</div><div class='add'>+	struct rtw_sec_desc *sec = &amp;rtwdev-&gt;sec;</div><div class='add'>+	u16 ctrl_reg;</div><div class='add'>+	u16 sec_config;</div><div class='add'>+</div><div class='add'>+	/* default use default key search for now */</div><div class='add'>+	sec-&gt;default_key_search = true;</div><div class='add'>+</div><div class='add'>+	ctrl_reg = rtw_read16(rtwdev, REG_CR);</div><div class='add'>+	ctrl_reg |= RTW_SEC_ENGINE_EN;</div><div class='add'>+	rtw_write16(rtwdev, REG_CR, ctrl_reg);</div><div class='add'>+</div><div class='add'>+	sec_config = rtw_read16(rtwdev, RTW_SEC_CONFIG);</div><div class='add'>+</div><div class='add'>+	sec_config |= RTW_SEC_TX_DEC_EN | RTW_SEC_RX_DEC_EN;</div><div class='add'>+	if (sec-&gt;default_key_search)</div><div class='add'>+		sec_config |= RTW_SEC_TX_UNI_USE_DK | RTW_SEC_RX_UNI_USE_DK |</div><div class='add'>+			      RTW_SEC_TX_BC_USE_DK | RTW_SEC_RX_BC_USE_DK;</div><div class='add'>+</div><div class='add'>+	rtw_write16(rtwdev, RTW_SEC_CONFIG, sec_config);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/sec.h b/drivers/net/wireless/realtek/rtw88/sec.h<br/>new file mode 100644<br/>index 000000000000..8c50a895c797<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/sec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/sec.h</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_SEC_H_</div><div class='add'>+#define __RTW_SEC_H_</div><div class='add'>+</div><div class='add'>+#define RTW_SEC_CMD_REG			0x670</div><div class='add'>+#define RTW_SEC_WRITE_REG		0x674</div><div class='add'>+#define RTW_SEC_READ_REG		0x678</div><div class='add'>+#define RTW_SEC_CONFIG			0x680</div><div class='add'>+</div><div class='add'>+#define RTW_SEC_CAM_ENTRY_SHIFT		3</div><div class='add'>+#define RTW_SEC_DEFAULT_KEY_NUM		4</div><div class='add'>+#define RTW_SEC_CMD_WRITE_ENABLE	BIT(16)</div><div class='add'>+#define RTW_SEC_CMD_CLEAR		BIT(30)</div><div class='add'>+#define RTW_SEC_CMD_POLLING		BIT(31)</div><div class='add'>+</div><div class='add'>+#define RTW_SEC_TX_UNI_USE_DK		BIT(0)</div><div class='add'>+#define RTW_SEC_RX_UNI_USE_DK		BIT(1)</div><div class='add'>+#define RTW_SEC_TX_DEC_EN		BIT(2)</div><div class='add'>+#define RTW_SEC_RX_DEC_EN		BIT(3)</div><div class='add'>+#define RTW_SEC_TX_BC_USE_DK		BIT(6)</div><div class='add'>+#define RTW_SEC_RX_BC_USE_DK		BIT(7)</div><div class='add'>+</div><div class='add'>+#define RTW_SEC_ENGINE_EN		BIT(9)</div><div class='add'>+</div><div class='add'>+int rtw_sec_get_free_cam(struct rtw_sec_desc *sec);</div><div class='add'>+void rtw_sec_write_cam(struct rtw_dev *rtwdev,</div><div class='add'>+		       struct rtw_sec_desc *sec,</div><div class='add'>+		       struct ieee80211_sta *sta,</div><div class='add'>+		       struct ieee80211_key_conf *key,</div><div class='add'>+		       u8 hw_key_type, u8 hw_key_idx);</div><div class='add'>+void rtw_sec_clear_cam(struct rtw_dev *rtwdev,</div><div class='add'>+		       struct rtw_sec_desc *sec,</div><div class='add'>+		       u8 hw_key_idx);</div><div class='add'>+void rtw_sec_enable_sec_engine(struct rtw_dev *rtwdev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c<br/>new file mode 100644<br/>index 000000000000..e32faf8bead9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/tx.c</a></div><div class='hunk'>@@ -0,0 +1,367 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "ps.h"</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void rtw_tx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,</div><div class='add'>+		  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct rtw_vif *rtwvif;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data(hdr-&gt;frame_control))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!is_broadcast_ether_addr(hdr-&gt;addr1) &amp;&amp;</div><div class='add'>+	    !is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='add'>+		rtwdev-&gt;stats.tx_unicast += skb-&gt;len;</div><div class='add'>+		rtwdev-&gt;stats.tx_cnt++;</div><div class='add'>+		if (vif) {</div><div class='add'>+			rtwvif = (struct rtw_vif *)vif-&gt;drv_priv;</div><div class='add'>+			rtwvif-&gt;stats.tx_unicast += skb-&gt;len;</div><div class='add'>+			rtwvif-&gt;stats.tx_cnt++;</div><div class='add'>+			if (rtwvif-&gt;stats.tx_cnt &gt; RTW_LPS_THRESHOLD)</div><div class='add'>+				rtw_leave_lps_irqsafe(rtwdev, rtwvif);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__le32 *txdesc = (__le32 *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	SET_TX_DESC_TXPKTSIZE(txdesc,  pkt_info-&gt;tx_pkt_size);</div><div class='add'>+	SET_TX_DESC_OFFSET(txdesc, pkt_info-&gt;offset);</div><div class='add'>+	SET_TX_DESC_PKT_OFFSET(txdesc, pkt_info-&gt;pkt_offset);</div><div class='add'>+	SET_TX_DESC_QSEL(txdesc, pkt_info-&gt;qsel);</div><div class='add'>+	SET_TX_DESC_BMC(txdesc, pkt_info-&gt;bmc);</div><div class='add'>+	SET_TX_DESC_RATE_ID(txdesc, pkt_info-&gt;rate_id);</div><div class='add'>+	SET_TX_DESC_DATARATE(txdesc, pkt_info-&gt;rate);</div><div class='add'>+	SET_TX_DESC_DISDATAFB(txdesc, pkt_info-&gt;dis_rate_fallback);</div><div class='add'>+	SET_TX_DESC_USE_RATE(txdesc, pkt_info-&gt;use_rate);</div><div class='add'>+	SET_TX_DESC_SEC_TYPE(txdesc, pkt_info-&gt;sec_type);</div><div class='add'>+	SET_TX_DESC_DATA_BW(txdesc, pkt_info-&gt;bw);</div><div class='add'>+	SET_TX_DESC_SW_SEQ(txdesc, pkt_info-&gt;seq);</div><div class='add'>+	SET_TX_DESC_MAX_AGG_NUM(txdesc, pkt_info-&gt;ampdu_factor);</div><div class='add'>+	SET_TX_DESC_AMPDU_DENSITY(txdesc, pkt_info-&gt;ampdu_density);</div><div class='add'>+	SET_TX_DESC_DATA_STBC(txdesc, pkt_info-&gt;stbc);</div><div class='add'>+	SET_TX_DESC_DATA_LDPC(txdesc, pkt_info-&gt;ldpc);</div><div class='add'>+	SET_TX_DESC_AGG_EN(txdesc, pkt_info-&gt;ampdu_en);</div><div class='add'>+	SET_TX_DESC_LS(txdesc, pkt_info-&gt;ls);</div><div class='add'>+	SET_TX_DESC_DATA_SHORT(txdesc, pkt_info-&gt;short_gi);</div><div class='add'>+	SET_TX_DESC_SPE_RPT(txdesc, pkt_info-&gt;report);</div><div class='add'>+	SET_TX_DESC_SW_DEFINE(txdesc, pkt_info-&gt;sn);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_tx_fill_tx_desc);</div><div class='add'>+</div><div class='add'>+static u8 get_tx_ampdu_factor(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	u8 exp = sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+</div><div class='add'>+	/* the least ampdu factor is 8K, and the value in the tx desc is the</div><div class='add'>+	 * max aggregation num, which represents val * 2 packets can be</div><div class='add'>+	 * aggregated in an AMPDU, so here we should use 8/2=4 as the base</div><div class='add'>+	 */</div><div class='add'>+	return (BIT(2) &lt;&lt; exp) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_tx_ampdu_density(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	return sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_highest_ht_tx_rate(struct rtw_dev *rtwdev,</div><div class='add'>+				 struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	u8 rate;</div><div class='add'>+</div><div class='add'>+	if (rtwdev-&gt;hal.rf_type == RF_2T2R &amp;&amp; sta-&gt;ht_cap.mcs.rx_mask[1] != 0)</div><div class='add'>+		rate = DESC_RATEMCS15;</div><div class='add'>+	else</div><div class='add'>+		rate = DESC_RATEMCS7;</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_highest_vht_tx_rate(struct rtw_dev *rtwdev,</div><div class='add'>+				  struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct rtw_efuse *efuse = &amp;rtwdev-&gt;efuse;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u16 tx_mcs_map;</div><div class='add'>+</div><div class='add'>+	tx_mcs_map = le16_to_cpu(sta-&gt;vht_cap.vht_mcs.tx_mcs_map);</div><div class='add'>+	if (efuse-&gt;hw_cap.nss == 1) {</div><div class='add'>+		switch (tx_mcs_map &amp; 0x3) {</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_7:</div><div class='add'>+			rate = DESC_RATEVHT1SS_MCS7;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_8:</div><div class='add'>+			rate = DESC_RATEVHT1SS_MCS8;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_9:</div><div class='add'>+			rate = DESC_RATEVHT1SS_MCS9;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (efuse-&gt;hw_cap.nss &gt;= 2) {</div><div class='add'>+		switch ((tx_mcs_map &amp; 0xc) &gt;&gt; 2) {</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_7:</div><div class='add'>+			rate = DESC_RATEVHT2SS_MCS7;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_8:</div><div class='add'>+			rate = DESC_RATEVHT2SS_MCS8;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_9:</div><div class='add'>+			rate = DESC_RATEVHT2SS_MCS9;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rate = DESC_RATEVHT1SS_MCS9;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_tx_report_enable(struct rtw_dev *rtwdev,</div><div class='add'>+				 struct rtw_tx_pkt_info *pkt_info)</div><div class='add'>+{</div><div class='add'>+	struct rtw_tx_report *tx_report = &amp;rtwdev-&gt;tx_report;</div><div class='add'>+</div><div class='add'>+	/* [11:8], reserved, fills with zero</div><div class='add'>+	 * [7:2],  tx report sequence number</div><div class='add'>+	 * [1:0],  firmware use, fills with zero</div><div class='add'>+	 */</div><div class='add'>+	pkt_info-&gt;sn = (atomic_inc_return(&amp;tx_report-&gt;sn) &lt;&lt; 2) &amp; 0xfc;</div><div class='add'>+	pkt_info-&gt;report = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_tx_report_purge_timer(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct rtw_dev *rtwdev = from_timer(rtwdev, t, tx_report.purge_timer);</div><div class='add'>+	struct rtw_tx_report *tx_report = &amp;rtwdev-&gt;tx_report;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_len(&amp;tx_report-&gt;queue) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN(1, "purge skb(s) not reported by firmware\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tx_report-&gt;q_lock, flags);</div><div class='add'>+	skb_queue_purge(&amp;tx_report-&gt;queue);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tx_report-&gt;q_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn)</div><div class='add'>+{</div><div class='add'>+	struct rtw_tx_report *tx_report = &amp;rtwdev-&gt;tx_report;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 *drv_data;</div><div class='add'>+</div><div class='add'>+	/* pass sn to tx report handler through driver data */</div><div class='add'>+	drv_data = (u8 *)IEEE80211_SKB_CB(skb)-&gt;status.status_driver_data;</div><div class='add'>+	*drv_data = sn;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tx_report-&gt;q_lock, flags);</div><div class='add'>+	__skb_queue_tail(&amp;tx_report-&gt;queue, skb);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tx_report-&gt;q_lock, flags);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;tx_report-&gt;purge_timer, jiffies + RTW_TX_PROBE_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtw_tx_report_enqueue);</div><div class='add'>+</div><div class='add'>+static void rtw_tx_report_tx_status(struct rtw_dev *rtwdev,</div><div class='add'>+				    struct sk_buff *skb, bool acked)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	ieee80211_tx_info_clear_status(info);</div><div class='add'>+	if (acked)</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+	else</div><div class='add'>+		info-&gt;flags &amp;= ~IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_status_irqsafe(rtwdev-&gt;hw, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_tx_report_handle(struct rtw_dev *rtwdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_tx_report *tx_report = &amp;rtwdev-&gt;tx_report;</div><div class='add'>+	struct rtw_c2h_cmd *c2h;</div><div class='add'>+	struct sk_buff *cur, *tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 sn, st;</div><div class='add'>+	u8 *n;</div><div class='add'>+</div><div class='add'>+	c2h = get_c2h_from_skb(skb);</div><div class='add'>+</div><div class='add'>+	sn = GET_CCX_REPORT_SEQNUM(c2h-&gt;payload);</div><div class='add'>+	st = GET_CCX_REPORT_STATUS(c2h-&gt;payload);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tx_report-&gt;q_lock, flags);</div><div class='add'>+	skb_queue_walk_safe(&amp;tx_report-&gt;queue, cur, tmp) {</div><div class='add'>+		n = (u8 *)IEEE80211_SKB_CB(cur)-&gt;status.status_driver_data;</div><div class='add'>+		if (*n == sn) {</div><div class='add'>+			__skb_unlink(cur, &amp;tx_report-&gt;queue);</div><div class='add'>+			rtw_tx_report_tx_status(rtwdev, cur, st == 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;tx_report-&gt;q_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_tx_mgmt_pkt_info_update(struct rtw_dev *rtwdev,</div><div class='add'>+					struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+					struct ieee80211_tx_control *control,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	pkt_info-&gt;use_rate = true;</div><div class='add'>+	pkt_info-&gt;rate_id = 6;</div><div class='add'>+	pkt_info-&gt;dis_rate_fallback = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtw_tx_data_pkt_info_update(struct rtw_dev *rtwdev,</div><div class='add'>+					struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+					struct ieee80211_tx_control *control,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = control-&gt;sta;</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct rtw_sta_info *si;</div><div class='add'>+	u16 seq;</div><div class='add'>+	u8 ampdu_factor = 0;</div><div class='add'>+	u8 ampdu_density = 0;</div><div class='add'>+	bool ampdu_en = false;</div><div class='add'>+	u8 rate = DESC_RATE6M;</div><div class='add'>+	u8 rate_id = 6;</div><div class='add'>+	u8 bw = RTW_CHANNEL_WIDTH_20;</div><div class='add'>+	bool stbc = false;</div><div class='add'>+	bool ldpc = false;</div><div class='add'>+</div><div class='add'>+	seq = (le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	/* for broadcast/multicast, use default values */</div><div class='add'>+	if (!sta)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) {</div><div class='add'>+		ampdu_en = true;</div><div class='add'>+		ampdu_factor = get_tx_ampdu_factor(sta);</div><div class='add'>+		ampdu_density = get_tx_ampdu_density(sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;vht_cap.vht_supported)</div><div class='add'>+		rate = get_highest_vht_tx_rate(rtwdev, sta);</div><div class='add'>+	else if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		rate = get_highest_ht_tx_rate(rtwdev, sta);</div><div class='add'>+	else if (sta-&gt;supp_rates[0] &lt;= 0xf)</div><div class='add'>+		rate = DESC_RATE11M;</div><div class='add'>+	else</div><div class='add'>+		rate = DESC_RATE54M;</div><div class='add'>+</div><div class='add'>+	si = (struct rtw_sta_info *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	bw = si-&gt;bw_mode;</div><div class='add'>+	rate_id = si-&gt;rate_id;</div><div class='add'>+	stbc = si-&gt;stbc_en;</div><div class='add'>+	ldpc = si-&gt;ldpc_en;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	pkt_info-&gt;seq = seq;</div><div class='add'>+	pkt_info-&gt;ampdu_factor = ampdu_factor;</div><div class='add'>+	pkt_info-&gt;ampdu_density = ampdu_density;</div><div class='add'>+	pkt_info-&gt;ampdu_en = ampdu_en;</div><div class='add'>+	pkt_info-&gt;rate = rate;</div><div class='add'>+	pkt_info-&gt;rate_id = rate_id;</div><div class='add'>+	pkt_info-&gt;bw = bw;</div><div class='add'>+	pkt_info-&gt;stbc = stbc;</div><div class='add'>+	pkt_info-&gt;ldpc = ldpc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,</div><div class='add'>+			    struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+			    struct ieee80211_tx_control *control,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct rtw_sta_info *si;</div><div class='add'>+	struct ieee80211_vif *vif = NULL;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	u8 sec_type = 0;</div><div class='add'>+	bool bmc;</div><div class='add'>+</div><div class='add'>+	if (control-&gt;sta) {</div><div class='add'>+		si = (struct rtw_sta_info *)control-&gt;sta-&gt;drv_priv;</div><div class='add'>+		vif = si-&gt;vif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_mgmt(fc) || ieee80211_is_nullfunc(fc))</div><div class='add'>+		rtw_tx_mgmt_pkt_info_update(rtwdev, pkt_info, control, skb);</div><div class='add'>+	else if (ieee80211_is_data(fc))</div><div class='add'>+		rtw_tx_data_pkt_info_update(rtwdev, pkt_info, control, skb);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;control.hw_key) {</div><div class='add'>+		struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+</div><div class='add'>+		switch (key-&gt;cipher) {</div><div class='add'>+		case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+			sec_type = 0x01;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+			sec_type = 0x03;</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'>+	bmc = is_broadcast_ether_addr(hdr-&gt;addr1) ||</div><div class='add'>+	      is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS)</div><div class='add'>+		rtw_tx_report_enable(rtwdev, pkt_info);</div><div class='add'>+</div><div class='add'>+	pkt_info-&gt;bmc = bmc;</div><div class='add'>+	pkt_info-&gt;sec_type = sec_type;</div><div class='add'>+	pkt_info-&gt;tx_pkt_size = skb-&gt;len;</div><div class='add'>+	pkt_info-&gt;offset = chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	pkt_info-&gt;qsel = skb-&gt;priority;</div><div class='add'>+	pkt_info-&gt;ls = true;</div><div class='add'>+</div><div class='add'>+	/* maybe merge with tx status ? */</div><div class='add'>+	rtw_tx_stats(rtwdev, vif, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_rsvd_page_pkt_info_update(struct rtw_dev *rtwdev,</div><div class='add'>+				   struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct rtw_chip_info *chip = rtwdev-&gt;chip;</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	bool bmc;</div><div class='add'>+</div><div class='add'>+	bmc = is_broadcast_ether_addr(hdr-&gt;addr1) ||</div><div class='add'>+	      is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+	pkt_info-&gt;use_rate = true;</div><div class='add'>+	pkt_info-&gt;rate_id = 6;</div><div class='add'>+	pkt_info-&gt;dis_rate_fallback = true;</div><div class='add'>+	pkt_info-&gt;bmc = bmc;</div><div class='add'>+	pkt_info-&gt;tx_pkt_size = skb-&gt;len;</div><div class='add'>+	pkt_info-&gt;offset = chip-&gt;tx_pkt_desc_sz;</div><div class='add'>+	pkt_info-&gt;qsel = skb-&gt;priority;</div><div class='add'>+	pkt_info-&gt;ls = true;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h<br/>new file mode 100644<br/>index 000000000000..8338dbf55576<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/tx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/tx.h</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_TX_H_</div><div class='add'>+#define __RTW_TX_H_</div><div class='add'>+</div><div class='add'>+#define RTK_TX_MAX_AGG_NUM_MASK		0x1f</div><div class='add'>+</div><div class='add'>+#define RTW_TX_PROBE_TIMEOUT		msecs_to_jiffies(500)</div><div class='add'>+</div><div class='add'>+#define SET_TX_DESC_TXPKTSIZE(txdesc, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, GENMASK(15, 0))</div><div class='add'>+#define SET_TX_DESC_OFFSET(txdesc, value)                                      \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, GENMASK(23, 16))</div><div class='add'>+#define SET_TX_DESC_PKT_OFFSET(txdesc, value)                                  \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(28, 24))</div><div class='add'>+#define SET_TX_DESC_QSEL(txdesc, value)                                        \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(12, 8))</div><div class='add'>+#define SET_TX_DESC_BMC(txdesc, value)                                         \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(24))</div><div class='add'>+#define SET_TX_DESC_RATE_ID(txdesc, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(20, 16))</div><div class='add'>+#define SET_TX_DESC_DATARATE(txdesc, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, GENMASK(6, 0))</div><div class='add'>+#define SET_TX_DESC_DISDATAFB(txdesc, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(10))</div><div class='add'>+#define SET_TX_DESC_USE_RATE(txdesc, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(8))</div><div class='add'>+#define SET_TX_DESC_SEC_TYPE(txdesc, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(23, 22))</div><div class='add'>+#define SET_TX_DESC_DATA_BW(txdesc, value)                                     \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, GENMASK(6, 5))</div><div class='add'>+#define SET_TX_DESC_SW_SEQ(txdesc, value)                                      \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, GENMASK(23, 12))</div><div class='add'>+#define SET_TX_DESC_MAX_AGG_NUM(txdesc, value)                                 \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, GENMASK(21, 17))</div><div class='add'>+#define SET_TX_DESC_AMPDU_DENSITY(txdesc, value)                               \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, GENMASK(22, 20))</div><div class='add'>+#define SET_TX_DESC_DATA_STBC(txdesc, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, GENMASK(9, 8))</div><div class='add'>+#define SET_TX_DESC_DATA_LDPC(txdesc, value)                                   \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(7))</div><div class='add'>+#define SET_TX_DESC_AGG_EN(txdesc, value)                                      \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(12))</div><div class='add'>+#define SET_TX_DESC_LS(txdesc, value)                                          \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(26))</div><div class='add'>+#define SET_TX_DESC_DATA_SHORT(txdesc, value)				       \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(4))</div><div class='add'>+#define SET_TX_DESC_SPE_RPT(tx_desc, value)                                    \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(19))</div><div class='add'>+#define SET_TX_DESC_SW_DEFINE(tx_desc, value)                                  \</div><div class='add'>+	le32p_replace_bits((__le32 *)(txdesc) + 0x06, value, GENMASK(11, 0))</div><div class='add'>+</div><div class='add'>+enum rtw_tx_desc_queue_select {</div><div class='add'>+	TX_DESC_QSEL_TID0	= 0,</div><div class='add'>+	TX_DESC_QSEL_TID1	= 1,</div><div class='add'>+	TX_DESC_QSEL_TID2	= 2,</div><div class='add'>+	TX_DESC_QSEL_TID3	= 3,</div><div class='add'>+	TX_DESC_QSEL_TID4	= 4,</div><div class='add'>+	TX_DESC_QSEL_TID5	= 5,</div><div class='add'>+	TX_DESC_QSEL_TID6	= 6,</div><div class='add'>+	TX_DESC_QSEL_TID7	= 7,</div><div class='add'>+	TX_DESC_QSEL_TID8	= 8,</div><div class='add'>+	TX_DESC_QSEL_TID9	= 9,</div><div class='add'>+	TX_DESC_QSEL_TID10	= 10,</div><div class='add'>+	TX_DESC_QSEL_TID11	= 11,</div><div class='add'>+	TX_DESC_QSEL_TID12	= 12,</div><div class='add'>+	TX_DESC_QSEL_TID13	= 13,</div><div class='add'>+	TX_DESC_QSEL_TID14	= 14,</div><div class='add'>+	TX_DESC_QSEL_TID15	= 15,</div><div class='add'>+	TX_DESC_QSEL_BEACON	= 16,</div><div class='add'>+	TX_DESC_QSEL_HIGH	= 17,</div><div class='add'>+	TX_DESC_QSEL_MGMT	= 18,</div><div class='add'>+	TX_DESC_QSEL_H2C	= 19,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,</div><div class='add'>+			    struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+			    struct ieee80211_tx_control *control,</div><div class='add'>+			    struct sk_buff *skb);</div><div class='add'>+void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb);</div><div class='add'>+void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn);</div><div class='add'>+void rtw_tx_report_handle(struct rtw_dev *rtwdev, struct sk_buff *skb);</div><div class='add'>+void rtw_rsvd_page_pkt_info_update(struct rtw_dev *rtwdev,</div><div class='add'>+				   struct rtw_tx_pkt_info *pkt_info,</div><div class='add'>+				   struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/realtek/rtw88/util.c b/drivers/net/wireless/realtek/rtw88/util.c<br/>new file mode 100644<br/>index 000000000000..212070c2baa8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/util.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "main.h"</div><div class='add'>+#include "util.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+</div><div class='add'>+bool check_hw_ready(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 target)</div><div class='add'>+{</div><div class='add'>+	u32 cnt;</div><div class='add'>+</div><div class='add'>+	for (cnt = 0; cnt &lt; 1000; cnt++) {</div><div class='add'>+		if (rtw_read32_mask(rtwdev, addr, mask) == target)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		udelay(10);</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 ltecoex_read_reg(struct rtw_dev *rtwdev, u16 offset, u32 *val)</div><div class='add'>+{</div><div class='add'>+	if (!check_hw_ready(rtwdev, LTECOEX_ACCESS_CTRL, LTECOEX_READY, 1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, LTECOEX_ACCESS_CTRL, 0x800F0000 | offset);</div><div class='add'>+	*val = rtw_read32(rtwdev, LTECOEX_READ_DATA);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ltecoex_reg_write(struct rtw_dev *rtwdev, u16 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	if (!check_hw_ready(rtwdev, LTECOEX_ACCESS_CTRL, LTECOEX_READY, 1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rtw_write32(rtwdev, LTECOEX_WRITE_DATA, value);</div><div class='add'>+	rtw_write32(rtwdev, LTECOEX_ACCESS_CTRL, 0xC00F0000 | offset);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtw_restore_reg(struct rtw_dev *rtwdev,</div><div class='add'>+		     struct rtw_backup_info *bckp, u32 num)</div><div class='add'>+{</div><div class='add'>+	u8 len;</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; num; i++, bckp++) {</div><div class='add'>+		len = bckp-&gt;len;</div><div class='add'>+		reg = bckp-&gt;reg;</div><div class='add'>+		val = bckp-&gt;val;</div><div class='add'>+</div><div class='add'>+		switch (len) {</div><div class='add'>+		case 1:</div><div class='add'>+			rtw_write8(rtwdev, reg, (u8)val);</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			rtw_write16(rtwdev, reg, (u16)val);</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			rtw_write32(rtwdev, reg, (u32)val);</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='head'>diff --git a/drivers/net/wireless/realtek/rtw88/util.h b/drivers/net/wireless/realtek/rtw88/util.h<br/>new file mode 100644<br/>index 000000000000..7bd2843b0bce<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/realtek/rtw88/util.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/realtek/rtw88/util.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright(c) 2018-2019  Realtek Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __RTW_UTIL_H__</div><div class='add'>+#define __RTW_UTIL_H__</div><div class='add'>+</div><div class='add'>+struct rtw_dev;</div><div class='add'>+</div><div class='add'>+#define rtw_iterate_vifs(rtwdev, iterator, data)                               \</div><div class='add'>+	ieee80211_iterate_active_interfaces(rtwdev-&gt;hw,                        \</div><div class='add'>+			IEEE80211_IFACE_ITER_NORMAL, iterator, data)</div><div class='add'>+#define rtw_iterate_vifs_atomic(rtwdev, iterator, data)                        \</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(rtwdev-&gt;hw,                 \</div><div class='add'>+			IEEE80211_IFACE_ITER_NORMAL, iterator, data)</div><div class='add'>+#define rtw_iterate_stas_atomic(rtwdev, iterator, data)                        \</div><div class='add'>+	ieee80211_iterate_stations_atomic(rtwdev-&gt;hw, iterator, data)</div><div class='add'>+</div><div class='add'>+static inline u8 *get_hdr_bssid(struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	u8 *bssid;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_tods(fc))</div><div class='add'>+		bssid = hdr-&gt;addr1;</div><div class='add'>+	else if (ieee80211_has_fromds(fc))</div><div class='add'>+		bssid = hdr-&gt;addr2;</div><div class='add'>+	else</div><div class='add'>+		bssid = hdr-&gt;addr3;</div><div class='add'>+</div><div class='add'>+	return bssid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c<br/>index 51e4e92d95a0..e07a1152cec1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rndis_wlan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rndis_wlan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rndis_wlan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rndis_wlan.c</a></div><div class='hunk'>@@ -1707,7 +1707,7 @@ static struct ndis_80211_pmkid *get_device_pmkids(struct usbnet *usbdev)</div><div class='ctx'> 	int len, ret, max_pmkids;</div><div class='ctx'> </div><div class='ctx'> 	max_pmkids = priv-&gt;wdev.wiphy-&gt;max_num_pmkids;</div><div class='del'>-	len = sizeof(*pmkids) + max_pmkids * sizeof(pmkids-&gt;bssid_info[0]);</div><div class='add'>+	len = struct_size(pmkids, bssid_info, max_pmkids);</div><div class='ctx'> </div><div class='ctx'> 	pmkids = kzalloc(len, GFP_KERNEL);</div><div class='ctx'> 	if (!pmkids)</div><div class='hunk'>@@ -1740,7 +1740,7 @@ static int set_device_pmkids(struct usbnet *usbdev,</div><div class='ctx'> 	int ret, len, num_pmkids;</div><div class='ctx'> </div><div class='ctx'> 	num_pmkids = le32_to_cpu(pmkids-&gt;bssid_info_count);</div><div class='del'>-	len = sizeof(*pmkids) + num_pmkids * sizeof(pmkids-&gt;bssid_info[0]);</div><div class='add'>+	len = struct_size(pmkids, bssid_info, num_pmkids);</div><div class='ctx'> 	pmkids-&gt;length = cpu_to_le32(len);</div><div class='ctx'> </div><div class='ctx'> 	debug_print_pmkids(usbdev, pmkids, __func__);</div><div class='hunk'>@@ -1761,7 +1761,7 @@ static struct ndis_80211_pmkid *remove_pmkid(struct usbnet *usbdev,</div><div class='ctx'> 						struct cfg80211_pmksa *pmksa,</div><div class='ctx'> 						int max_pmkids)</div><div class='ctx'> {</div><div class='del'>-	int i, newlen, err;</div><div class='add'>+	int i, err;</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> </div><div class='ctx'> 	count = le32_to_cpu(pmkids-&gt;bssid_info_count);</div><div class='hunk'>@@ -1786,9 +1786,7 @@ static struct ndis_80211_pmkid *remove_pmkid(struct usbnet *usbdev,</div><div class='ctx'> 		pmkids-&gt;bssid_info[i] = pmkids-&gt;bssid_info[i + 1];</div><div class='ctx'> </div><div class='ctx'> 	count--;</div><div class='del'>-	newlen = sizeof(*pmkids) + count * sizeof(pmkids-&gt;bssid_info[0]);</div><div class='del'>-</div><div class='del'>-	pmkids-&gt;length = cpu_to_le32(newlen);</div><div class='add'>+	pmkids-&gt;length = cpu_to_le32(struct_size(pmkids, bssid_info, count));</div><div class='ctx'> 	pmkids-&gt;bssid_info_count = cpu_to_le32(count);</div><div class='ctx'> </div><div class='ctx'> 	return pmkids;</div><div class='hunk'>@@ -1831,7 +1829,7 @@ static struct ndis_80211_pmkid *update_pmkid(struct usbnet *usbdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add new pmkid */</div><div class='del'>-	newlen = sizeof(*pmkids) + (count + 1) * sizeof(pmkids-&gt;bssid_info[0]);</div><div class='add'>+	newlen = struct_size(pmkids, bssid_info, count + 1);</div><div class='ctx'> </div><div class='ctx'> 	new_pmkids = krealloc(pmkids, newlen, GFP_KERNEL);</div><div class='ctx'> 	if (!new_pmkids) {</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c<br/>index 1dbaab2a96b7..f84250bdb8cf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_hal.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_hal.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_hal.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_91x_hal.c</a></div><div class='hunk'>@@ -31,6 +31,13 @@ static struct ta_metadata metadata_flash_content[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ta_metadata metadata[] = {{"pmemdata_dummy", 0x00000000},</div><div class='add'>+	{"rsi/rs9116_wlan.rps", 0x00000000},</div><div class='add'>+	{"rsi/rs9116_wlan_bt_classic.rps", 0x00000000},</div><div class='add'>+	{"rsi/pmemdata_dummy", 0x00000000},</div><div class='add'>+	{"rsi/rs9116_wlan_bt_classic.rps", 0x00000000}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int rsi_send_pkt_to_bus(struct rsi_common *common, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct rsi_hw *adapter = common-&gt;priv;</div><div class='hunk'>@@ -829,21 +836,18 @@ static int auto_fw_upgrade(struct rsi_hw *adapter, u8 *flash_content,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsi_load_firmware(struct rsi_hw *adapter)</div><div class='add'>+static int rsi_hal_prepare_fwload(struct rsi_hw *adapter)</div><div class='ctx'> {</div><div class='del'>-	struct rsi_common *common = adapter-&gt;priv;</div><div class='ctx'> 	struct rsi_host_intf_ops *hif_ops = adapter-&gt;host_intf_ops;</div><div class='del'>-	const struct firmware *fw_entry = NULL;</div><div class='del'>-	u32 regout_val = 0, content_size;</div><div class='del'>-	u16 tmp_regout_val = 0;</div><div class='del'>-	struct ta_metadata *metadata_p;</div><div class='add'>+	u32 regout_val = 0;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	bl_start_cmd_timer(adapter, BL_CMD_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	while (!adapter-&gt;blcmd_timer_expired) {</div><div class='ctx'> 		status = hif_ops-&gt;master_reg_read(adapter, SWBL_REGOUT,</div><div class='del'>-					      &amp;regout_val, 2);</div><div class='add'>+						  &amp;regout_val,</div><div class='add'>+						  RSI_COMMON_REG_SIZE);</div><div class='ctx'> 		if (status &lt; 0) {</div><div class='ctx'> 			rsi_dbg(ERR_ZONE,</div><div class='ctx'> 				"%s: REGOUT read failed\n", __func__);</div><div class='hunk'>@@ -865,13 +869,26 @@ static int rsi_load_firmware(struct rsi_hw *adapter)</div><div class='ctx'> 		(regout_val &amp; 0xff));</div><div class='ctx'> </div><div class='ctx'> 	status = hif_ops-&gt;master_reg_write(adapter, SWBL_REGOUT,</div><div class='del'>-					(REGOUT_INVALID | REGOUT_INVALID &lt;&lt; 8),</div><div class='del'>-					2);</div><div class='del'>-	if (status &lt; 0) {</div><div class='add'>+					   (REGOUT_INVALID |</div><div class='add'>+					    REGOUT_INVALID &lt;&lt; 8),</div><div class='add'>+					   RSI_COMMON_REG_SIZE);</div><div class='add'>+	if (status &lt; 0)</div><div class='ctx'> 		rsi_dbg(ERR_ZONE, "%s: REGOUT writing failed..\n", __func__);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-	mdelay(1);</div><div class='add'>+	else</div><div class='add'>+		rsi_dbg(INFO_ZONE,</div><div class='add'>+			"===&gt; Device is ready to load firmware &lt;===\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rsi_load_9113_firmware(struct rsi_hw *adapter)</div><div class='add'>+{</div><div class='add'>+	struct rsi_common *common = adapter-&gt;priv;</div><div class='add'>+	const struct firmware *fw_entry = NULL;</div><div class='add'>+	u32 content_size;</div><div class='add'>+	u16 tmp_regout_val = 0;</div><div class='add'>+	struct ta_metadata *metadata_p;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	status = bl_cmd(adapter, CONFIG_AUTO_READ_MODE, CMD_PASS,</div><div class='ctx'> 			"AUTO_READ_CMD");</div><div class='hunk'>@@ -902,13 +919,15 @@ static int rsi_load_firmware(struct rsi_hw *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* Get the firmware version */</div><div class='ctx'> 	common-&gt;lmac_ver.ver.info.fw_ver[0] =</div><div class='del'>-		fw_entry-&gt;data[LMAC_VER_OFFSET] &amp; 0xFF;</div><div class='add'>+		fw_entry-&gt;data[LMAC_VER_OFFSET_9113] &amp; 0xFF;</div><div class='ctx'> 	common-&gt;lmac_ver.ver.info.fw_ver[1] =</div><div class='del'>-		fw_entry-&gt;data[LMAC_VER_OFFSET + 1] &amp; 0xFF;</div><div class='del'>-	common-&gt;lmac_ver.major = fw_entry-&gt;data[LMAC_VER_OFFSET + 2] &amp; 0xFF;</div><div class='add'>+		fw_entry-&gt;data[LMAC_VER_OFFSET_9113 + 1] &amp; 0xFF;</div><div class='add'>+	common-&gt;lmac_ver.major =</div><div class='add'>+		fw_entry-&gt;data[LMAC_VER_OFFSET_9113 + 2] &amp; 0xFF;</div><div class='ctx'> 	common-&gt;lmac_ver.release_num =</div><div class='del'>-		fw_entry-&gt;data[LMAC_VER_OFFSET + 3] &amp; 0xFF;</div><div class='del'>-	common-&gt;lmac_ver.minor = fw_entry-&gt;data[LMAC_VER_OFFSET + 4] &amp; 0xFF;</div><div class='add'>+		fw_entry-&gt;data[LMAC_VER_OFFSET_9113 + 3] &amp; 0xFF;</div><div class='add'>+	common-&gt;lmac_ver.minor =</div><div class='add'>+		fw_entry-&gt;data[LMAC_VER_OFFSET_9113 + 4] &amp; 0xFF;</div><div class='ctx'> 	common-&gt;lmac_ver.patch_num = 0;</div><div class='ctx'> 	rsi_print_version(common);</div><div class='ctx'> </div><div class='hunk'>@@ -977,19 +996,161 @@ fail:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rsi_load_9116_firmware(struct rsi_hw *adapter)</div><div class='add'>+{</div><div class='add'>+	struct rsi_common *common = adapter-&gt;priv;</div><div class='add'>+	struct rsi_host_intf_ops *hif_ops = adapter-&gt;host_intf_ops;</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+	struct ta_metadata *metadata_p;</div><div class='add'>+	u8 *ta_firmware, *fw_p;</div><div class='add'>+	struct bootload_ds bootload_ds;</div><div class='add'>+	u32 instructions_sz, base_address;</div><div class='add'>+	u16 block_size = adapter-&gt;block_size;</div><div class='add'>+	u32 dest, len;</div><div class='add'>+	int status, cnt;</div><div class='add'>+</div><div class='add'>+	rsi_dbg(INIT_ZONE, "***** Load 9116 TA Instructions *****\n");</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;rsi_host_intf == RSI_HOST_INTF_USB) {</div><div class='add'>+		status = bl_cmd(adapter, POLLING_MODE, CMD_PASS,</div><div class='add'>+				"POLLING_MODE");</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = hif_ops-&gt;master_reg_write(adapter, MEM_ACCESS_CTRL_FROM_HOST,</div><div class='add'>+					   RAM_384K_ACCESS_FROM_TA,</div><div class='add'>+					   RSI_9116_REG_SIZE);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "%s: Unable to access full RAM memory\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	metadata_p = &amp;metadata[adapter-&gt;priv-&gt;coex_mode];</div><div class='add'>+	rsi_dbg(INIT_ZONE, "%s: loading file %s\n", __func__, metadata_p-&gt;name);</div><div class='add'>+	status = request_firmware(&amp;fw_entry, metadata_p-&gt;name, adapter-&gt;device);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "%s: Failed to open file %s\n",</div><div class='add'>+			__func__, metadata_p-&gt;name);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ta_firmware = kmemdup(fw_entry-&gt;data, fw_entry-&gt;size, GFP_KERNEL);</div><div class='add'>+	if (!ta_firmware)</div><div class='add'>+		goto fail_release_fw;</div><div class='add'>+	fw_p = ta_firmware;</div><div class='add'>+	instructions_sz = fw_entry-&gt;size;</div><div class='add'>+	rsi_dbg(INFO_ZONE, "FW Length = %d bytes\n", instructions_sz);</div><div class='add'>+</div><div class='add'>+	common-&gt;lmac_ver.major = ta_firmware[LMAC_VER_OFFSET_9116];</div><div class='add'>+	common-&gt;lmac_ver.minor = ta_firmware[LMAC_VER_OFFSET_9116 + 1];</div><div class='add'>+	common-&gt;lmac_ver.release_num = ta_firmware[LMAC_VER_OFFSET_9116 + 2];</div><div class='add'>+	common-&gt;lmac_ver.patch_num = ta_firmware[LMAC_VER_OFFSET_9116 + 3];</div><div class='add'>+	common-&gt;lmac_ver.ver.info.fw_ver[0] =</div><div class='add'>+		ta_firmware[LMAC_VER_OFFSET_9116 + 4];</div><div class='add'>+</div><div class='add'>+	if (instructions_sz % FW_ALIGN_SIZE)</div><div class='add'>+		instructions_sz +=</div><div class='add'>+			(FW_ALIGN_SIZE - (instructions_sz % FW_ALIGN_SIZE));</div><div class='add'>+	rsi_dbg(INFO_ZONE, "instructions_sz : %d\n", instructions_sz);</div><div class='add'>+</div><div class='add'>+	if (*(u16 *)fw_p == RSI_9116_FW_MAGIC_WORD) {</div><div class='add'>+		memcpy(&amp;bootload_ds, fw_p, sizeof(struct bootload_ds));</div><div class='add'>+		fw_p += le16_to_cpu(bootload_ds.offset);</div><div class='add'>+		rsi_dbg(INFO_ZONE, "FW start = %x\n", *(u32 *)fw_p);</div><div class='add'>+</div><div class='add'>+		cnt = 0;</div><div class='add'>+		do {</div><div class='add'>+			rsi_dbg(ERR_ZONE, "%s: Loading chunk %d\n",</div><div class='add'>+				__func__, cnt);</div><div class='add'>+</div><div class='add'>+			dest = le32_to_cpu(bootload_ds.bl_entry[cnt].dst_addr);</div><div class='add'>+			len = le32_to_cpu(bootload_ds.bl_entry[cnt].control) &amp;</div><div class='add'>+			      RSI_BL_CTRL_LEN_MASK;</div><div class='add'>+			rsi_dbg(INFO_ZONE, "length %d destination %x\n",</div><div class='add'>+				len, dest);</div><div class='add'>+</div><div class='add'>+			status = hif_ops-&gt;load_data_master_write(adapter, dest,</div><div class='add'>+								 len,</div><div class='add'>+								 block_size,</div><div class='add'>+								 fw_p);</div><div class='add'>+			if (status &lt; 0) {</div><div class='add'>+				rsi_dbg(ERR_ZONE,</div><div class='add'>+					"Failed to load chunk %d\n", cnt);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			fw_p += len;</div><div class='add'>+			if (le32_to_cpu(bootload_ds.bl_entry[cnt].control) &amp;</div><div class='add'>+			    RSI_BL_CTRL_LAST_ENTRY)</div><div class='add'>+				break;</div><div class='add'>+			cnt++;</div><div class='add'>+		} while (1);</div><div class='add'>+	} else {</div><div class='add'>+		base_address = metadata_p-&gt;address;</div><div class='add'>+		status = hif_ops-&gt;load_data_master_write(adapter,</div><div class='add'>+							 base_address,</div><div class='add'>+							 instructions_sz,</div><div class='add'>+							 block_size,</div><div class='add'>+							 ta_firmware);</div><div class='add'>+	}</div><div class='add'>+	if (status) {</div><div class='add'>+		rsi_dbg(ERR_ZONE,</div><div class='add'>+			"%s: Unable to load %s blk\n",</div><div class='add'>+			__func__, metadata_p-&gt;name);</div><div class='add'>+		goto fail_free_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsi_dbg(INIT_ZONE, "%s: Successfully loaded %s instructions\n",</div><div class='add'>+		__func__, metadata_p-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;rsi_host_intf == RSI_HOST_INTF_SDIO) {</div><div class='add'>+		if (hif_ops-&gt;ta_reset(adapter))</div><div class='add'>+			rsi_dbg(ERR_ZONE, "Unable to put ta in reset\n");</div><div class='add'>+	} else {</div><div class='add'>+		if (bl_cmd(adapter, JUMP_TO_ZERO_PC,</div><div class='add'>+			   CMD_PASS, "JUMP_TO_ZERO") &lt; 0)</div><div class='add'>+			rsi_dbg(INFO_ZONE, "Jump to zero command failed\n");</div><div class='add'>+		else</div><div class='add'>+			rsi_dbg(INFO_ZONE, "Jump to zero command successful\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fail_free_fw:</div><div class='add'>+	kfree(ta_firmware);</div><div class='add'>+fail_release_fw:</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int rsi_hal_device_init(struct rsi_hw *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rsi_common *common = adapter-&gt;priv;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	switch (adapter-&gt;device_model) {</div><div class='ctx'> 	case RSI_DEV_9113:</div><div class='del'>-		if (rsi_load_firmware(adapter)) {</div><div class='add'>+		status = rsi_hal_prepare_fwload(adapter);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		if (rsi_load_9113_firmware(adapter)) {</div><div class='ctx'> 			rsi_dbg(ERR_ZONE,</div><div class='ctx'> 				"%s: Failed to load TA instructions\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case RSI_DEV_9116:</div><div class='add'>+		status = rsi_hal_prepare_fwload(adapter);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		if (rsi_load_9116_firmware(adapter)) {</div><div class='add'>+			rsi_dbg(ERR_ZONE,</div><div class='add'>+				"%s: Failed to load firmware to 9116 device\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c<br/>index 831046e760f8..49df3bb08d41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_mac80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_mac80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_mac80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_91x_mac80211.c</a></div><div class='hunk'>@@ -188,27 +188,27 @@ bool rsi_is_cipher_wep(struct rsi_common *common)</div><div class='ctx'>  * @adapter: Pointer to the adapter structure.</div><div class='ctx'>  * @band: Operating band to be set.</div><div class='ctx'>  *</div><div class='del'>- * Return: None.</div><div class='add'>+ * Return: int - 0 on success, negative error on failure.</div><div class='ctx'>  */</div><div class='del'>-static void rsi_register_rates_channels(struct rsi_hw *adapter, int band)</div><div class='add'>+static int rsi_register_rates_channels(struct rsi_hw *adapter, int band)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_supported_band *sbands = &amp;adapter-&gt;sbands[band];</div><div class='ctx'> 	void *channels = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (band == NL80211_BAND_2GHZ) {</div><div class='del'>-		channels = kmalloc(sizeof(rsi_2ghz_channels), GFP_KERNEL);</div><div class='del'>-		memcpy(channels,</div><div class='del'>-		       rsi_2ghz_channels,</div><div class='del'>-		       sizeof(rsi_2ghz_channels));</div><div class='add'>+		channels = kmemdup(rsi_2ghz_channels, sizeof(rsi_2ghz_channels),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!channels)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		sbands-&gt;band = NL80211_BAND_2GHZ;</div><div class='ctx'> 		sbands-&gt;n_channels = ARRAY_SIZE(rsi_2ghz_channels);</div><div class='ctx'> 		sbands-&gt;bitrates = rsi_rates;</div><div class='ctx'> 		sbands-&gt;n_bitrates = ARRAY_SIZE(rsi_rates);</div><div class='ctx'> 	} else {</div><div class='del'>-		channels = kmalloc(sizeof(rsi_5ghz_channels), GFP_KERNEL);</div><div class='del'>-		memcpy(channels,</div><div class='del'>-		       rsi_5ghz_channels,</div><div class='del'>-		       sizeof(rsi_5ghz_channels));</div><div class='add'>+		channels = kmemdup(rsi_5ghz_channels, sizeof(rsi_5ghz_channels),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!channels)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		sbands-&gt;band = NL80211_BAND_5GHZ;</div><div class='ctx'> 		sbands-&gt;n_channels = ARRAY_SIZE(rsi_5ghz_channels);</div><div class='ctx'> 		sbands-&gt;bitrates = &amp;rsi_rates[4];</div><div class='hunk'>@@ -227,6 +227,7 @@ static void rsi_register_rates_channels(struct rsi_hw *adapter, int band)</div><div class='ctx'> 	sbands-&gt;ht_cap.mcs.rx_mask[0] = 0xff;</div><div class='ctx'> 	sbands-&gt;ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='ctx'> 	/* sbands-&gt;ht_cap.mcs.rx_highest = 0x82; */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rsi_mac80211_hw_scan_start(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -2064,11 +2065,16 @@ int rsi_mac80211_attach(struct rsi_common *common)</div><div class='ctx'> 	wiphy-&gt;available_antennas_rx = 1;</div><div class='ctx'> 	wiphy-&gt;available_antennas_tx = 1;</div><div class='ctx'> </div><div class='del'>-	rsi_register_rates_channels(adapter, NL80211_BAND_2GHZ);</div><div class='add'>+	status = rsi_register_rates_channels(adapter, NL80211_BAND_2GHZ);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> 	wiphy-&gt;bands[NL80211_BAND_2GHZ] =</div><div class='ctx'> 		&amp;adapter-&gt;sbands[NL80211_BAND_2GHZ];</div><div class='ctx'> 	if (common-&gt;num_supp_bands &gt; 1) {</div><div class='del'>-		rsi_register_rates_channels(adapter, NL80211_BAND_5GHZ);</div><div class='add'>+		status = rsi_register_rates_channels(adapter,</div><div class='add'>+						     NL80211_BAND_5GHZ);</div><div class='add'>+		if (status)</div><div class='add'>+			return status;</div><div class='ctx'> 		wiphy-&gt;bands[NL80211_BAND_5GHZ] =</div><div class='ctx'> 			&amp;adapter-&gt;sbands[NL80211_BAND_5GHZ];</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c<br/>index 844f2fac298f..6c7f26ef6476 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_mgmt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_mgmt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_mgmt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_91x_mgmt.c</a></div><div class='hunk'>@@ -209,6 +209,59 @@ static struct bootup_params boot_params_40 = {</div><div class='ctx'> 	.beacon_resedue_alg_en = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct bootup_params_9116 boot_params_9116_20 = {</div><div class='add'>+	.magic_number = cpu_to_le16(LOADED_TOKEN),</div><div class='add'>+	.valid = cpu_to_le32(VALID_20),</div><div class='add'>+	.device_clk_info_9116 = {{</div><div class='add'>+		.pll_config_9116_g = {</div><div class='add'>+			.pll_ctrl_set_reg = cpu_to_le16(0xd518),</div><div class='add'>+			.pll_ctrl_clr_reg = cpu_to_le16(0x2ae7),</div><div class='add'>+			.pll_modem_conig_reg = cpu_to_le16(0x2000),</div><div class='add'>+			.soc_clk_config_reg = cpu_to_le16(0x0c18),</div><div class='add'>+			.adc_dac_strm1_config_reg = cpu_to_le16(0x1100),</div><div class='add'>+			.adc_dac_strm2_config_reg = cpu_to_le16(0x6600),</div><div class='add'>+		},</div><div class='add'>+		.switch_clk_9116_g = {</div><div class='add'>+			.switch_clk_info =</div><div class='add'>+				cpu_to_le32((RSI_SWITCH_TASS_CLK |</div><div class='add'>+					    RSI_SWITCH_WLAN_BBP_LMAC_CLK_REG |</div><div class='add'>+					    RSI_SWITCH_BBP_LMAC_CLK_REG)),</div><div class='add'>+			.tass_clock_reg = cpu_to_le32(0x083C0503),</div><div class='add'>+			.wlan_bbp_lmac_clk_reg_val = cpu_to_le32(0x01042001),</div><div class='add'>+			.zbbt_bbp_lmac_clk_reg_val = cpu_to_le32(0x02010001),</div><div class='add'>+			.bbp_lmac_clk_en_val = cpu_to_le32(0x0000003b),</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 struct bootup_params_9116 boot_params_9116_40 = {</div><div class='add'>+	.magic_number = cpu_to_le16(LOADED_TOKEN),</div><div class='add'>+	.valid = cpu_to_le32(VALID_40),</div><div class='add'>+	.device_clk_info_9116 = {{</div><div class='add'>+		.pll_config_9116_g = {</div><div class='add'>+			.pll_ctrl_set_reg = cpu_to_le16(0xd518),</div><div class='add'>+			.pll_ctrl_clr_reg = cpu_to_le16(0x2ae7),</div><div class='add'>+			.pll_modem_conig_reg = cpu_to_le16(0x3000),</div><div class='add'>+			.soc_clk_config_reg = cpu_to_le16(0x0c18),</div><div class='add'>+			.adc_dac_strm1_config_reg = cpu_to_le16(0x0000),</div><div class='add'>+			.adc_dac_strm2_config_reg = cpu_to_le16(0x6600),</div><div class='add'>+		},</div><div class='add'>+		.switch_clk_9116_g = {</div><div class='add'>+			.switch_clk_info =</div><div class='add'>+				cpu_to_le32((RSI_SWITCH_TASS_CLK |</div><div class='add'>+					    RSI_SWITCH_WLAN_BBP_LMAC_CLK_REG |</div><div class='add'>+					    RSI_SWITCH_BBP_LMAC_CLK_REG |</div><div class='add'>+					    RSI_MODEM_CLK_160MHZ)),</div><div class='add'>+			.tass_clock_reg = cpu_to_le32(0x083C0503),</div><div class='add'>+			.wlan_bbp_lmac_clk_reg_val = cpu_to_le32(0x01042002),</div><div class='add'>+			.zbbt_bbp_lmac_clk_reg_val = cpu_to_le32(0x04010002),</div><div class='add'>+			.bbp_lmac_clk_en_val = cpu_to_le32(0x0000003b),</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 u16 mcs[] = {13, 26, 39, 52, 78, 104, 117, 130};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -235,6 +288,14 @@ static void rsi_set_default_parameters(struct rsi_common *common)</div><div class='ctx'> 	common-&gt;obm_ant_sel_val = 2;</div><div class='ctx'> 	common-&gt;beacon_interval = RSI_BEACON_INTERVAL;</div><div class='ctx'> 	common-&gt;dtim_cnt = RSI_DTIM_COUNT;</div><div class='add'>+	common-&gt;w9116_features.pll_mode = 0x0;</div><div class='add'>+	common-&gt;w9116_features.rf_type = 1;</div><div class='add'>+	common-&gt;w9116_features.wireless_mode = 0;</div><div class='add'>+	common-&gt;w9116_features.enable_ppe = 0;</div><div class='add'>+	common-&gt;w9116_features.afe_type = 1;</div><div class='add'>+	common-&gt;w9116_features.dpd = 0;</div><div class='add'>+	common-&gt;w9116_features.sifs_tx_enable = 0;</div><div class='add'>+	common-&gt;w9116_features.ps_options = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void init_bgscan_params(struct rsi_common *common)</div><div class='hunk'>@@ -363,6 +424,10 @@ static int rsi_load_radio_caps(struct rsi_common *common)</div><div class='ctx'> 	}</div><div class='ctx'> 	radio_caps-&gt;radio_info |= radio_id;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;device_model == RSI_DEV_9116 &amp;&amp;</div><div class='add'>+	    common-&gt;channel_width == BW_20MHZ)</div><div class='add'>+		radio_caps-&gt;radio_cfg_info &amp;= ~0x3;</div><div class='add'>+</div><div class='ctx'> 	radio_caps-&gt;sifs_tx_11n = cpu_to_le16(SIFS_TX_11N_VALUE);</div><div class='ctx'> 	radio_caps-&gt;sifs_tx_11b = cpu_to_le16(SIFS_TX_11B_VALUE);</div><div class='ctx'> 	radio_caps-&gt;slot_rx_11n = cpu_to_le16(SHORT_SLOT_VALUE);</div><div class='hunk'>@@ -378,14 +443,16 @@ static int rsi_load_radio_caps(struct rsi_common *common)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (ii = 0; ii &lt; NUM_EDCA_QUEUES; ii++) {</div><div class='del'>-		radio_caps-&gt;qos_params[ii].cont_win_min_q =</div><div class='del'>-			cpu_to_le16(common-&gt;edca_params[ii].cw_min);</div><div class='del'>-		radio_caps-&gt;qos_params[ii].cont_win_max_q =</div><div class='del'>-			cpu_to_le16(common-&gt;edca_params[ii].cw_max);</div><div class='del'>-		radio_caps-&gt;qos_params[ii].aifsn_val_q =</div><div class='del'>-			cpu_to_le16((common-&gt;edca_params[ii].aifs) &lt;&lt; 8);</div><div class='del'>-		radio_caps-&gt;qos_params[ii].txop_q =</div><div class='del'>-			cpu_to_le16(common-&gt;edca_params[ii].txop);</div><div class='add'>+		if (common-&gt;edca_params[ii].cw_max &gt; 0) {</div><div class='add'>+			radio_caps-&gt;qos_params[ii].cont_win_min_q =</div><div class='add'>+				cpu_to_le16(common-&gt;edca_params[ii].cw_min);</div><div class='add'>+			radio_caps-&gt;qos_params[ii].cont_win_max_q =</div><div class='add'>+				cpu_to_le16(common-&gt;edca_params[ii].cw_max);</div><div class='add'>+			radio_caps-&gt;qos_params[ii].aifsn_val_q =</div><div class='add'>+				cpu_to_le16(common-&gt;edca_params[ii].aifs &lt;&lt; 8);</div><div class='add'>+			radio_caps-&gt;qos_params[ii].txop_q =</div><div class='add'>+				cpu_to_le16(common-&gt;edca_params[ii].txop);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	radio_caps-&gt;qos_params[BROADCAST_HW_Q].txop_q = cpu_to_le16(0xffff);</div><div class='hunk'>@@ -893,6 +960,50 @@ static int rsi_load_bootup_params(struct rsi_common *common)</div><div class='ctx'> 	return rsi_send_internal_mgmt_frame(common, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rsi_load_9116_bootup_params(struct rsi_common *common)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct rsi_boot_params_9116 *boot_params;</div><div class='add'>+</div><div class='add'>+	rsi_dbg(MGMT_TX_ZONE, "%s: Sending boot params frame\n", __func__);</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(sizeof(struct rsi_boot_params_9116));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(skb-&gt;data, 0, sizeof(struct rsi_boot_params));</div><div class='add'>+	boot_params = (struct rsi_boot_params_9116 *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (common-&gt;channel_width == BW_40MHZ) {</div><div class='add'>+		memcpy(&amp;boot_params-&gt;bootup_params,</div><div class='add'>+		       &amp;boot_params_9116_40,</div><div class='add'>+		       sizeof(struct bootup_params_9116));</div><div class='add'>+		rsi_dbg(MGMT_TX_ZONE, "%s: Packet 40MHZ &lt;=== %d\n", __func__,</div><div class='add'>+			UMAC_CLK_40BW);</div><div class='add'>+		boot_params-&gt;umac_clk = cpu_to_le16(UMAC_CLK_40BW);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(&amp;boot_params-&gt;bootup_params,</div><div class='add'>+		       &amp;boot_params_9116_20,</div><div class='add'>+		       sizeof(struct bootup_params_9116));</div><div class='add'>+		if (boot_params_20.valid != cpu_to_le32(VALID_20)) {</div><div class='add'>+			boot_params-&gt;umac_clk = cpu_to_le16(UMAC_CLK_20BW);</div><div class='add'>+			rsi_dbg(MGMT_TX_ZONE,</div><div class='add'>+				"%s: Packet 20MHZ &lt;=== %d\n", __func__,</div><div class='add'>+				UMAC_CLK_20BW);</div><div class='add'>+		} else {</div><div class='add'>+			boot_params-&gt;umac_clk = cpu_to_le16(UMAC_CLK_40MHZ);</div><div class='add'>+			rsi_dbg(MGMT_TX_ZONE,</div><div class='add'>+				"%s: Packet 20MHZ &lt;=== %d\n", __func__,</div><div class='add'>+				UMAC_CLK_40MHZ);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rsi_set_len_qno(&amp;boot_params-&gt;desc_dword0.len_qno,</div><div class='add'>+			sizeof(struct bootup_params_9116), RSI_WIFI_MGMT_Q);</div><div class='add'>+	boot_params-&gt;desc_dword0.frame_type = BOOTUP_PARAMS_REQUEST;</div><div class='add'>+	skb_put(skb, sizeof(struct rsi_boot_params_9116));</div><div class='add'>+</div><div class='add'>+	return rsi_send_internal_mgmt_frame(common, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * rsi_send_reset_mac() - This function prepares reset MAC request and sends an</div><div class='ctx'>  *			  internal management frame to indicate it to firmware.</div><div class='hunk'>@@ -921,6 +1032,11 @@ static int rsi_send_reset_mac(struct rsi_common *common)</div><div class='ctx'> 	mgmt_frame-&gt;desc_word[1] = cpu_to_le16(RESET_MAC_REQ);</div><div class='ctx'> 	mgmt_frame-&gt;desc_word[4] = cpu_to_le16(RETRY_COUNT &lt;&lt; 8);</div><div class='ctx'> </div><div class='add'>+#define RSI_9116_DEF_TA_AGGR	3</div><div class='add'>+	if (common-&gt;priv-&gt;device_model == RSI_DEV_9116)</div><div class='add'>+		mgmt_frame-&gt;desc_word[3] |=</div><div class='add'>+			cpu_to_le16(RSI_9116_DEF_TA_AGGR &lt;&lt; 8);</div><div class='add'>+</div><div class='ctx'> 	skb_put(skb, FRAME_DESC_SZ);</div><div class='ctx'> </div><div class='ctx'> 	return rsi_send_internal_mgmt_frame(common, skb);</div><div class='hunk'>@@ -971,7 +1087,10 @@ int rsi_band_check(struct rsi_common *common,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (common-&gt;channel_width != prev_bw) {</div><div class='del'>-		status = rsi_load_bootup_params(common);</div><div class='add'>+		if (adapter-&gt;device_model == RSI_DEV_9116)</div><div class='add'>+			status = rsi_load_9116_bootup_params(common);</div><div class='add'>+		else</div><div class='add'>+			status = rsi_load_bootup_params(common);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			return status;</div><div class='ctx'> </div><div class='hunk'>@@ -1546,6 +1665,47 @@ int rsi_send_ps_request(struct rsi_hw *adapter, bool enable,</div><div class='ctx'> 	return rsi_send_internal_mgmt_frame(common, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rsi_send_w9116_features(struct rsi_common *common)</div><div class='add'>+{</div><div class='add'>+	struct rsi_wlan_9116_features *w9116_features;</div><div class='add'>+	u16 frame_len = sizeof(struct rsi_wlan_9116_features);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	rsi_dbg(MGMT_TX_ZONE,</div><div class='add'>+		"%s: Sending wlan 9116 features\n", __func__);</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(frame_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(skb-&gt;data, 0, frame_len);</div><div class='add'>+</div><div class='add'>+	w9116_features = (struct rsi_wlan_9116_features *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	w9116_features-&gt;pll_mode = common-&gt;w9116_features.pll_mode;</div><div class='add'>+	w9116_features-&gt;rf_type = common-&gt;w9116_features.rf_type;</div><div class='add'>+	w9116_features-&gt;wireless_mode = common-&gt;w9116_features.wireless_mode;</div><div class='add'>+	w9116_features-&gt;enable_ppe = common-&gt;w9116_features.enable_ppe;</div><div class='add'>+	w9116_features-&gt;afe_type = common-&gt;w9116_features.afe_type;</div><div class='add'>+	if (common-&gt;w9116_features.dpd)</div><div class='add'>+		w9116_features-&gt;feature_enable |= cpu_to_le32(RSI_DPD);</div><div class='add'>+	if (common-&gt;w9116_features.sifs_tx_enable)</div><div class='add'>+		w9116_features-&gt;feature_enable |=</div><div class='add'>+			cpu_to_le32(RSI_SIFS_TX_ENABLE);</div><div class='add'>+	if (common-&gt;w9116_features.ps_options &amp; RSI_DUTY_CYCLING)</div><div class='add'>+		w9116_features-&gt;feature_enable |= cpu_to_le32(RSI_DUTY_CYCLING);</div><div class='add'>+	if (common-&gt;w9116_features.ps_options &amp; RSI_END_OF_FRAME)</div><div class='add'>+		w9116_features-&gt;feature_enable |= cpu_to_le32(RSI_END_OF_FRAME);</div><div class='add'>+	w9116_features-&gt;feature_enable |=</div><div class='add'>+		cpu_to_le32((common-&gt;w9116_features.ps_options &amp; ~0x3) &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	rsi_set_len_qno(&amp;w9116_features-&gt;desc.desc_dword0.len_qno,</div><div class='add'>+			frame_len - FRAME_DESC_SZ, RSI_WIFI_MGMT_Q);</div><div class='add'>+	w9116_features-&gt;desc.desc_dword0.frame_type = FEATURES_ENABLE;</div><div class='add'>+	skb_put(skb, frame_len);</div><div class='add'>+</div><div class='add'>+	return rsi_send_internal_mgmt_frame(common, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * rsi_set_antenna() - This function send antenna configuration request</div><div class='ctx'>  *		       to device</div><div class='hunk'>@@ -1766,15 +1926,26 @@ static int rsi_handle_ta_confirm_type(struct rsi_common *common,</div><div class='ctx'> 		rsi_dbg(FSM_ZONE, "%s: Boot up params confirm received\n",</div><div class='ctx'> 			__func__);</div><div class='ctx'> 		if (common-&gt;fsm_state == FSM_BOOT_PARAMS_SENT) {</div><div class='del'>-			adapter-&gt;eeprom.length = (IEEE80211_ADDR_LEN +</div><div class='del'>-						  WLAN_MAC_MAGIC_WORD_LEN +</div><div class='del'>-						  WLAN_HOST_MODE_LEN);</div><div class='del'>-			adapter-&gt;eeprom.offset = WLAN_MAC_EEPROM_ADDR;</div><div class='del'>-			if (rsi_eeprom_read(common)) {</div><div class='del'>-				common-&gt;fsm_state = FSM_CARD_NOT_READY;</div><div class='del'>-				goto out;</div><div class='add'>+			if (adapter-&gt;device_model == RSI_DEV_9116) {</div><div class='add'>+				common-&gt;band = NL80211_BAND_5GHZ;</div><div class='add'>+				common-&gt;num_supp_bands = 2;</div><div class='add'>+</div><div class='add'>+				if (rsi_send_reset_mac(common))</div><div class='add'>+					goto out;</div><div class='add'>+				else</div><div class='add'>+					common-&gt;fsm_state = FSM_RESET_MAC_SENT;</div><div class='add'>+			} else {</div><div class='add'>+				adapter-&gt;eeprom.length =</div><div class='add'>+					(IEEE80211_ADDR_LEN +</div><div class='add'>+					 WLAN_MAC_MAGIC_WORD_LEN +</div><div class='add'>+					 WLAN_HOST_MODE_LEN);</div><div class='add'>+				adapter-&gt;eeprom.offset = WLAN_MAC_EEPROM_ADDR;</div><div class='add'>+				if (rsi_eeprom_read(common)) {</div><div class='add'>+					common-&gt;fsm_state = FSM_CARD_NOT_READY;</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+				common-&gt;fsm_state = FSM_EEPROM_READ_MAC_ADDR;</div><div class='ctx'> 			}</div><div class='del'>-			common-&gt;fsm_state = FSM_EEPROM_READ_MAC_ADDR;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rsi_dbg(INFO_ZONE,</div><div class='ctx'> 				"%s: Received bootup params cfm in %d state\n",</div><div class='hunk'>@@ -1853,6 +2024,12 @@ static int rsi_handle_ta_confirm_type(struct rsi_common *common,</div><div class='ctx'> 	case RADIO_CAPABILITIES:</div><div class='ctx'> 		if (common-&gt;fsm_state == FSM_RADIO_CAPS_SENT) {</div><div class='ctx'> 			common-&gt;rf_reset = 1;</div><div class='add'>+			if (adapter-&gt;device_model == RSI_DEV_9116 &amp;&amp;</div><div class='add'>+			    rsi_send_w9116_features(common)) {</div><div class='add'>+				rsi_dbg(ERR_ZONE,</div><div class='add'>+					"Failed to send 9116 features\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 			if (rsi_program_bb_rf(common)) {</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -1925,6 +2102,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> int rsi_handle_card_ready(struct rsi_common *common, u8 *msg)</div><div class='ctx'> {</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='ctx'> 	switch (common-&gt;fsm_state) {</div><div class='ctx'> 	case FSM_CARD_NOT_READY:</div><div class='ctx'> 		rsi_dbg(INIT_ZONE, "Card ready indication from Common HAL\n");</div><div class='hunk'>@@ -1936,14 +2115,29 @@ int rsi_handle_card_ready(struct rsi_common *common, u8 *msg)</div><div class='ctx'> 	case FSM_COMMON_DEV_PARAMS_SENT:</div><div class='ctx'> 		rsi_dbg(INIT_ZONE, "Card ready indication from WLAN HAL\n");</div><div class='ctx'> </div><div class='add'>+		if (common-&gt;priv-&gt;device_model == RSI_DEV_9116) {</div><div class='add'>+			if (msg[16] != MAGIC_WORD) {</div><div class='add'>+				rsi_dbg(FSM_ZONE,</div><div class='add'>+					"%s: [EEPROM_READ] Invalid token\n",</div><div class='add'>+					__func__);</div><div class='add'>+				common-&gt;fsm_state = FSM_CARD_NOT_READY;</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			memcpy(common-&gt;mac_addr, &amp;msg[20], ETH_ALEN);</div><div class='add'>+			rsi_dbg(INIT_ZONE, "MAC Addr %pM", common-&gt;mac_addr);</div><div class='add'>+		}</div><div class='ctx'> 		/* Get usb buffer status register address */</div><div class='ctx'> 		common-&gt;priv-&gt;usb_buffer_status_reg = *(u32 *)&amp;msg[8];</div><div class='ctx'> 		rsi_dbg(INFO_ZONE, "USB buffer status register = %x\n",</div><div class='ctx'> 			common-&gt;priv-&gt;usb_buffer_status_reg);</div><div class='ctx'> </div><div class='del'>-		if (rsi_load_bootup_params(common)) {</div><div class='add'>+		if (common-&gt;priv-&gt;device_model == RSI_DEV_9116)</div><div class='add'>+			status = rsi_load_9116_bootup_params(common);</div><div class='add'>+		else</div><div class='add'>+			status = rsi_load_bootup_params(common);</div><div class='add'>+		if (status &lt; 0) {</div><div class='ctx'> 			common-&gt;fsm_state = FSM_CARD_NOT_READY;</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			return status;</div><div class='ctx'> 		}</div><div class='ctx'> 		common-&gt;fsm_state = FSM_BOOT_PARAMS_SENT;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c<br/>index 3430d7a0899e..f9c67ed473d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_sdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_91x_sdio.c</a></div><div class='hunk'>@@ -923,6 +923,70 @@ static int rsi_sdio_reinit_device(struct rsi_hw *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rsi_sdio_ta_reset(struct rsi_hw *adapter)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	status = rsi_sdio_master_access_msword(adapter, TA_BASE_ADDR);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE,</div><div class='add'>+			"Unable to set ms word to common reg\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsi_dbg(INIT_ZONE, "%s: Bring TA out of reset\n", __func__);</div><div class='add'>+	put_unaligned_le32(TA_HOLD_THREAD_VALUE, data);</div><div class='add'>+	addr = TA_HOLD_THREAD_REG | RSI_SD_REQUEST_MASTER;</div><div class='add'>+	status = rsi_sdio_write_register_multiple(adapter, addr,</div><div class='add'>+						  (u8 *)&amp;data,</div><div class='add'>+						  RSI_9116_REG_SIZE);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "Unable to hold TA threads\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(TA_SOFT_RST_CLR, data);</div><div class='add'>+	addr = TA_SOFT_RESET_REG | RSI_SD_REQUEST_MASTER;</div><div class='add'>+	status = rsi_sdio_write_register_multiple(adapter, addr,</div><div class='add'>+						  (u8 *)&amp;data,</div><div class='add'>+						  RSI_9116_REG_SIZE);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "Unable to get TA out of reset\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(TA_PC_ZERO, data);</div><div class='add'>+	addr = TA_TH0_PC_REG | RSI_SD_REQUEST_MASTER;</div><div class='add'>+	status = rsi_sdio_write_register_multiple(adapter, addr,</div><div class='add'>+						  (u8 *)&amp;data,</div><div class='add'>+						  RSI_9116_REG_SIZE);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "Unable to Reset TA PC value\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(TA_RELEASE_THREAD_VALUE, data);</div><div class='add'>+	addr = TA_RELEASE_THREAD_REG | RSI_SD_REQUEST_MASTER;</div><div class='add'>+	status = rsi_sdio_write_register_multiple(adapter, addr,</div><div class='add'>+						  (u8 *)&amp;data,</div><div class='add'>+						  RSI_9116_REG_SIZE);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "Unable to release TA threads\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = rsi_sdio_master_access_msword(adapter, MISC_CFG_BASE_ADDR);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "Unable to set ms word to common reg\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	rsi_dbg(INIT_ZONE, "***** TA Reset done *****\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct rsi_host_intf_ops sdio_host_intf_ops = {</div><div class='ctx'> 	.write_pkt		= rsi_sdio_host_intf_write_pkt,</div><div class='ctx'> 	.read_pkt		= rsi_sdio_host_intf_read_pkt,</div><div class='hunk'>@@ -933,6 +997,7 @@ static struct rsi_host_intf_ops sdio_host_intf_ops = {</div><div class='ctx'> 	.master_reg_write	= rsi_sdio_master_reg_write,</div><div class='ctx'> 	.load_data_master_write	= rsi_sdio_load_data_master_write,</div><div class='ctx'> 	.reinit_device          = rsi_sdio_reinit_device,</div><div class='add'>+	.ta_reset		= rsi_sdio_ta_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -949,7 +1014,7 @@ static int rsi_probe(struct sdio_func *pfunction,</div><div class='ctx'> {</div><div class='ctx'> 	struct rsi_hw *adapter;</div><div class='ctx'> 	struct rsi_91x_sdiodev *sdev;</div><div class='del'>-	int status;</div><div class='add'>+	int status = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	rsi_dbg(INIT_ZONE, "%s: Init function called\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -968,6 +1033,20 @@ static int rsi_probe(struct sdio_func *pfunction,</div><div class='ctx'> 		status = -EIO;</div><div class='ctx'> 		goto fail_free_adapter;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (pfunction-&gt;device == RSI_SDIO_PID_9113) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "%s: 9113 module detected\n", __func__);</div><div class='add'>+		adapter-&gt;device_model = RSI_DEV_9113;</div><div class='add'>+	} else  if (pfunction-&gt;device == RSI_SDIO_PID_9116) {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "%s: 9116 module detected\n", __func__);</div><div class='add'>+		adapter-&gt;device_model = RSI_DEV_9116;</div><div class='add'>+	} else {</div><div class='add'>+		rsi_dbg(ERR_ZONE,</div><div class='add'>+			"%s: Unsupported RSI device id 0x%x\n", __func__,</div><div class='add'>+			pfunction-&gt;device);</div><div class='add'>+		goto fail_free_adapter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sdev = (struct rsi_91x_sdiodev *)adapter-&gt;rsi_dev;</div><div class='ctx'> 	rsi_init_event(&amp;sdev-&gt;rx_thread.event);</div><div class='ctx'> 	status = rsi_create_kthread(adapter-&gt;priv, &amp;sdev-&gt;rx_thread,</div><div class='hunk'>@@ -1088,16 +1167,41 @@ static void rsi_reset_chip(struct rsi_hw *adapter)</div><div class='ctx'> 	 * and any pending dma transfers to rf spi in device to finish.</div><div class='ctx'> 	 */</div><div class='ctx'> 	msleep(100);</div><div class='del'>-</div><div class='del'>-	ulp_read_write(adapter, RSI_ULP_RESET_REG, RSI_ULP_WRITE_0, 32);</div><div class='del'>-	ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_1, RSI_ULP_WRITE_2, 32);</div><div class='del'>-	ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_2, RSI_ULP_WRITE_0, 32);</div><div class='del'>-	ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_1, RSI_ULP_WRITE_50,</div><div class='del'>-		       32);</div><div class='del'>-	ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_2, RSI_ULP_WRITE_0,</div><div class='del'>-		       32);</div><div class='del'>-	ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_ENABLE,</div><div class='del'>-		       RSI_ULP_TIMER_ENABLE, 32);</div><div class='add'>+	if (adapter-&gt;device_model != RSI_DEV_9116) {</div><div class='add'>+		ulp_read_write(adapter, RSI_ULP_RESET_REG, RSI_ULP_WRITE_0, 32);</div><div class='add'>+		ulp_read_write(adapter,</div><div class='add'>+			       RSI_WATCH_DOG_TIMER_1, RSI_ULP_WRITE_2, 32);</div><div class='add'>+		ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_2, RSI_ULP_WRITE_0,</div><div class='add'>+			       32);</div><div class='add'>+		ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_1,</div><div class='add'>+			       RSI_ULP_WRITE_50, 32);</div><div class='add'>+		ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_2,</div><div class='add'>+			       RSI_ULP_WRITE_0, 32);</div><div class='add'>+		ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_ENABLE,</div><div class='add'>+			       RSI_ULP_TIMER_ENABLE, 32);</div><div class='add'>+	} else {</div><div class='add'>+		if ((rsi_sdio_master_reg_write(adapter,</div><div class='add'>+					       NWP_WWD_INTERRUPT_TIMER,</div><div class='add'>+					       NWP_WWD_INT_TIMER_CLKS,</div><div class='add'>+					       RSI_9116_REG_SIZE)) &lt; 0) {</div><div class='add'>+			rsi_dbg(ERR_ZONE, "Failed to write to intr timer\n");</div><div class='add'>+		}</div><div class='add'>+		if ((rsi_sdio_master_reg_write(adapter,</div><div class='add'>+					       NWP_WWD_SYSTEM_RESET_TIMER,</div><div class='add'>+					       NWP_WWD_SYS_RESET_TIMER_CLKS,</div><div class='add'>+					       RSI_9116_REG_SIZE)) &lt; 0) {</div><div class='add'>+			rsi_dbg(ERR_ZONE,</div><div class='add'>+				"Failed to write to system reset timer\n");</div><div class='add'>+		}</div><div class='add'>+		if ((rsi_sdio_master_reg_write(adapter,</div><div class='add'>+					       NWP_WWD_MODE_AND_RSTART,</div><div class='add'>+					       NWP_WWD_TIMER_DISABLE,</div><div class='add'>+					       RSI_9116_REG_SIZE)) &lt; 0) {</div><div class='add'>+			rsi_dbg(ERR_ZONE,</div><div class='add'>+				"Failed to write to mode and restart\n");</div><div class='add'>+		}</div><div class='add'>+		rsi_dbg(ERR_ZONE, "***** Watch Dog Reset Successful *****\n");</div><div class='add'>+	}</div><div class='ctx'> 	/* This msleep will be sufficient for the ulp</div><div class='ctx'> 	 * read write operations to complete for chip reset.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1415,7 +1519,8 @@ static const struct dev_pm_ops rsi_pm_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct sdio_device_id rsi_dev_table[] =  {</div><div class='del'>-	{ SDIO_DEVICE(RSI_SDIO_VID_9113, RSI_SDIO_PID_9113) },</div><div class='add'>+	{ SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9113) },</div><div class='add'>+	{ SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9116) },</div><div class='ctx'> 	{ /* Blank */},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c<br/>index ac0ef5ea6ffb..f5048d4b8cb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_91x_usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_91x_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_91x_usb.c</a></div><div class='hunk'>@@ -213,7 +213,7 @@ static int rsi_usb_reg_read(struct usb_device *usbdev,</div><div class='ctx'>  */</div><div class='ctx'> static int rsi_usb_reg_write(struct usb_device *usbdev,</div><div class='ctx'> 			     u32 reg,</div><div class='del'>-			     u16 value,</div><div class='add'>+			     u32 value,</div><div class='ctx'> 			     u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *usb_reg_buf;</div><div class='hunk'>@@ -226,17 +226,17 @@ static int rsi_usb_reg_write(struct usb_device *usbdev,</div><div class='ctx'> 	if (!usb_reg_buf)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	usb_reg_buf[0] = (value &amp; 0x00ff);</div><div class='del'>-	usb_reg_buf[1] = (value &amp; 0xff00) &gt;&gt; 8;</div><div class='del'>-	usb_reg_buf[2] = 0x0;</div><div class='del'>-	usb_reg_buf[3] = 0x0;</div><div class='add'>+	usb_reg_buf[0] = (cpu_to_le32(value) &amp; 0x00ff);</div><div class='add'>+	usb_reg_buf[1] = (cpu_to_le32(value) &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+	usb_reg_buf[2] = (cpu_to_le32(value) &amp; 0x00ff0000) &gt;&gt; 16;</div><div class='add'>+	usb_reg_buf[3] = (cpu_to_le32(value) &amp; 0xff000000) &gt;&gt; 24;</div><div class='ctx'> </div><div class='ctx'> 	status = usb_control_msg(usbdev,</div><div class='ctx'> 				 usb_sndctrlpipe(usbdev, 0),</div><div class='ctx'> 				 USB_VENDOR_REGISTER_WRITE,</div><div class='ctx'> 				 RSI_USB_REQ_OUT,</div><div class='del'>-				 ((reg &amp; 0xffff0000) &gt;&gt; 16),</div><div class='del'>-				 (reg &amp; 0xffff),</div><div class='add'>+				 ((cpu_to_le32(reg) &amp; 0xffff0000) &gt;&gt; 16),</div><div class='add'>+				 (cpu_to_le32(reg) &amp; 0xffff),</div><div class='ctx'> 				 (void *)usb_reg_buf,</div><div class='ctx'> 				 len,</div><div class='ctx'> 				 USB_CTRL_SET_TIMEOUT);</div><div class='hunk'>@@ -263,8 +263,10 @@ static void rsi_rx_done_handler(struct urb *urb)</div><div class='ctx'> 	struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)rx_cb-&gt;data;</div><div class='ctx'> 	int status = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;status)</div><div class='del'>-		goto out;</div><div class='add'>+	if (urb-&gt;status) {</div><div class='add'>+		dev_kfree_skb(rx_cb-&gt;rx_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;actual_length &lt;= 0 ||</div><div class='ctx'> 	    urb-&gt;actual_length &gt; rx_cb-&gt;rx_skb-&gt;len) {</div><div class='hunk'>@@ -698,26 +700,47 @@ static int rsi_reset_card(struct rsi_hw *adapter)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_1,</div><div class='del'>-				 RSI_ULP_WRITE_2, 32);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-	ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_2,</div><div class='del'>-				 RSI_ULP_WRITE_0, 32);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-	ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_1,</div><div class='del'>-				 RSI_ULP_WRITE_50, 32);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-	ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_2,</div><div class='del'>-				 RSI_ULP_WRITE_0, 32);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-	ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_ENABLE,</div><div class='del'>-				 RSI_ULP_TIMER_ENABLE, 32);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto fail;</div><div class='add'>+	if (adapter-&gt;device_model != RSI_DEV_9116) {</div><div class='add'>+		ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_1,</div><div class='add'>+					 RSI_ULP_WRITE_2, 32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto fail;</div><div class='add'>+		ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_2,</div><div class='add'>+					 RSI_ULP_WRITE_0, 32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto fail;</div><div class='add'>+		ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_1,</div><div class='add'>+					 RSI_ULP_WRITE_50, 32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto fail;</div><div class='add'>+		ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_DELAY_TIMER_2,</div><div class='add'>+					 RSI_ULP_WRITE_0, 32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto fail;</div><div class='add'>+		ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_ENABLE,</div><div class='add'>+					 RSI_ULP_TIMER_ENABLE, 32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto fail;</div><div class='add'>+	} else {</div><div class='add'>+		if ((rsi_usb_master_reg_write(adapter,</div><div class='add'>+					      NWP_WWD_INTERRUPT_TIMER,</div><div class='add'>+					      NWP_WWD_INT_TIMER_CLKS,</div><div class='add'>+					      RSI_9116_REG_SIZE)) &lt; 0) {</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		if ((rsi_usb_master_reg_write(adapter,</div><div class='add'>+					      NWP_WWD_SYSTEM_RESET_TIMER,</div><div class='add'>+					      NWP_WWD_SYS_RESET_TIMER_CLKS,</div><div class='add'>+					      RSI_9116_REG_SIZE)) &lt; 0) {</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		if ((rsi_usb_master_reg_write(adapter,</div><div class='add'>+					      NWP_WWD_MODE_AND_RSTART,</div><div class='add'>+					      NWP_WWD_TIMER_DISABLE,</div><div class='add'>+					      RSI_9116_REG_SIZE)) &lt; 0) {</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rsi_dbg(INFO_ZONE, "Reset card done\n");</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -763,6 +786,18 @@ static int rsi_probe(struct usb_interface *pfunction,</div><div class='ctx'> </div><div class='ctx'> 	rsi_dbg(ERR_ZONE, "%s: Initialized os intf ops\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (id &amp;&amp; id-&gt;idProduct == RSI_USB_PID_9113) {</div><div class='add'>+		rsi_dbg(INIT_ZONE, "%s: 9113 module detected\n", __func__);</div><div class='add'>+		adapter-&gt;device_model = RSI_DEV_9113;</div><div class='add'>+	} else if (id &amp;&amp; id-&gt;idProduct == RSI_USB_PID_9116) {</div><div class='add'>+		rsi_dbg(INIT_ZONE, "%s: 9116 module detected\n", __func__);</div><div class='add'>+		adapter-&gt;device_model = RSI_DEV_9116;</div><div class='add'>+	} else {</div><div class='add'>+		rsi_dbg(ERR_ZONE, "%s: Unsupported RSI device id 0x%x\n",</div><div class='add'>+			__func__, id-&gt;idProduct);</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev = (struct rsi_91x_usbdev *)adapter-&gt;rsi_dev;</div><div class='ctx'> </div><div class='ctx'> 	status = rsi_usb_reg_read(dev-&gt;usbdev, FW_STATUS_REG, &amp;fw_status, 2);</div><div class='hunk'>@@ -845,7 +880,8 @@ static int rsi_resume(struct usb_interface *intf)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id rsi_dev_table[] = {</div><div class='del'>-	{ USB_DEVICE(RSI_USB_VID_9113, RSI_USB_PID_9113) },</div><div class='add'>+	{ USB_DEVICE(RSI_USB_VENDOR_ID, RSI_USB_PID_9113) },</div><div class='add'>+	{ USB_DEVICE(RSI_USB_VENDOR_ID, RSI_USB_PID_9116) },</div><div class='ctx'> 	{ /* Blank */},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_boot_params.h b/drivers/net/wireless/rsi/rsi_boot_params.h<br/>index ad903b22440e..c1cf19d1e376 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_boot_params.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_boot_params.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_boot_params.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_boot_params.h</a></div><div class='hunk'>@@ -80,6 +80,15 @@ struct pll_config {</div><div class='ctx'> 	struct afepll_info afepll_info_g;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct pll_config_9116 {</div><div class='add'>+	__le16 pll_ctrl_set_reg;</div><div class='add'>+	__le16 pll_ctrl_clr_reg;</div><div class='add'>+	__le16 pll_modem_conig_reg;</div><div class='add'>+	__le16 soc_clk_config_reg;</div><div class='add'>+	__le16 adc_dac_strm1_config_reg;</div><div class='add'>+	__le16 adc_dac_strm2_config_reg;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* structure to store configs related to UMAC clk programming */</div><div class='ctx'> struct switch_clk {</div><div class='ctx'> 	__le16 switch_clk_info;</div><div class='hunk'>@@ -93,11 +102,32 @@ struct switch_clk {</div><div class='ctx'> 	__le16 qspi_uart_clock_reg_config;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define RSI_SWITCH_TASS_CLK			BIT(0)</div><div class='add'>+#define RSI_SWITCH_QSPI_CLK			BIT(1)</div><div class='add'>+#define RSI_SWITCH_SLP_CLK_2_32			BIT(2)</div><div class='add'>+#define RSI_SWITCH_WLAN_BBP_LMAC_CLK_REG	BIT(3)</div><div class='add'>+#define RSI_SWITCH_ZBBT_BBP_LMAC_CLK_REG	BIT(4)</div><div class='add'>+#define RSI_SWITCH_BBP_LMAC_CLK_REG		BIT(5)</div><div class='add'>+#define RSI_MODEM_CLK_160MHZ			BIT(6)</div><div class='add'>+</div><div class='add'>+struct switch_clk_9116 {</div><div class='add'>+	__le32 switch_clk_info;</div><div class='add'>+	__le32 tass_clock_reg;</div><div class='add'>+	__le32 wlan_bbp_lmac_clk_reg_val;</div><div class='add'>+	__le32 zbbt_bbp_lmac_clk_reg_val;</div><div class='add'>+	__le32 bbp_lmac_clk_en_val;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct device_clk_info {</div><div class='ctx'> 	struct pll_config pll_config_g;</div><div class='ctx'> 	struct switch_clk switch_clk_g;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct device_clk_info_9116 {</div><div class='add'>+	struct pll_config_9116 pll_config_9116_g;</div><div class='add'>+	struct switch_clk_9116 switch_clk_9116_g;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct bootup_params {</div><div class='ctx'> 	__le16 magic_number;</div><div class='ctx'> 	__le16 crystal_good_time;</div><div class='hunk'>@@ -127,4 +157,37 @@ struct bootup_params {</div><div class='ctx'> 	__le32 max_threshold_to_avoid_sleep;</div><div class='ctx'> 	u8 beacon_resedue_alg_en;</div><div class='ctx'> } __packed;</div><div class='add'>+</div><div class='add'>+struct bootup_params_9116 {</div><div class='add'>+	__le16 magic_number;</div><div class='add'>+#define LOADED_TOKEN  0x5AA5   /* Bootup params are installed by host</div><div class='add'>+				* or OTP/FLASH (Bootloader)</div><div class='add'>+				*/</div><div class='add'>+#define ROM_TOKEN     0x55AA   /* Bootup params are taken from ROM</div><div class='add'>+				* itself in MCU mode.</div><div class='add'>+				*/</div><div class='add'>+	__le16 crystal_good_time;</div><div class='add'>+	__le32 valid;</div><div class='add'>+	__le32 reserved_for_valids;</div><div class='add'>+	__le16 bootup_mode_info;</div><div class='add'>+#define BT_COEXIST		BIT(0)</div><div class='add'>+#define BOOTUP_MODE		(BIT(2) | BIT(1))</div><div class='add'>+#define CUR_DEV_MODE_9116	(bootup_params_9116.bootup_mode_info &gt;&gt; 1)</div><div class='add'>+	__le16 digital_loop_back_params;</div><div class='add'>+	__le16 rtls_timestamp_en;</div><div class='add'>+	__le16 host_spi_intr_cfg;</div><div class='add'>+	struct device_clk_info_9116 device_clk_info_9116[1];</div><div class='add'>+	__le32 buckboost_wakeup_cnt;</div><div class='add'>+	__le16 pmu_wakeup_wait;</div><div class='add'>+	u8 shutdown_wait_time;</div><div class='add'>+	u8 pmu_slp_clkout_sel;</div><div class='add'>+	__le32 wdt_prog_value;</div><div class='add'>+	__le32 wdt_soc_rst_delay;</div><div class='add'>+	__le32 dcdc_operation_mode;</div><div class='add'>+	__le32 soc_reset_wait_cnt;</div><div class='add'>+	__le32 waiting_time_at_fresh_sleep;</div><div class='add'>+	__le32 max_threshold_to_avoid_sleep;</div><div class='add'>+	u8 beacon_resedue_alg_en;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_hal.h b/drivers/net/wireless/rsi/rsi_hal.h<br/>index 327638cdd30b..46e36df9e8e3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_hal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_hal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_hal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_hal.h</a></div><div class='hunk'>@@ -70,6 +70,21 @@</div><div class='ctx'> #define RSI_WATCH_DOG_DELAY_TIMER_2		0x16f</div><div class='ctx'> #define RSI_WATCH_DOG_TIMER_ENABLE		0x170</div><div class='ctx'> </div><div class='add'>+/* Watchdog timer addresses for 9116 */</div><div class='add'>+#define NWP_AHB_BASE_ADDR		0x41300000</div><div class='add'>+#define NWP_WWD_INTERRUPT_TIMER		(NWP_AHB_BASE_ADDR + 0x300)</div><div class='add'>+#define NWP_WWD_SYSTEM_RESET_TIMER	(NWP_AHB_BASE_ADDR + 0x304)</div><div class='add'>+#define NWP_WWD_WINDOW_TIMER		(NWP_AHB_BASE_ADDR + 0x308)</div><div class='add'>+#define NWP_WWD_TIMER_SETTINGS		(NWP_AHB_BASE_ADDR + 0x30C)</div><div class='add'>+#define NWP_WWD_MODE_AND_RSTART		(NWP_AHB_BASE_ADDR + 0x310)</div><div class='add'>+#define NWP_WWD_RESET_BYPASS		(NWP_AHB_BASE_ADDR + 0x314)</div><div class='add'>+#define NWP_FSM_INTR_MASK_REG		(NWP_AHB_BASE_ADDR + 0x104)</div><div class='add'>+</div><div class='add'>+/* Watchdog timer values */</div><div class='add'>+#define NWP_WWD_INT_TIMER_CLKS		5</div><div class='add'>+#define NWP_WWD_SYS_RESET_TIMER_CLKS	4</div><div class='add'>+#define NWP_WWD_TIMER_DISABLE		0xAA0001</div><div class='add'>+</div><div class='ctx'> #define RSI_ULP_WRITE_0			00</div><div class='ctx'> #define RSI_ULP_WRITE_2			02</div><div class='ctx'> #define RSI_ULP_WRITE_50		50</div><div class='hunk'>@@ -113,9 +128,18 @@</div><div class='ctx'> #define BBP_INFO_40MHZ 0x6</div><div class='ctx'> </div><div class='ctx'> #define FW_FLASH_OFFSET			0x820</div><div class='del'>-#define LMAC_VER_OFFSET			(FW_FLASH_OFFSET + 0x200)</div><div class='add'>+#define LMAC_VER_OFFSET_9113		(FW_FLASH_OFFSET + 0x200)</div><div class='add'>+#define LMAC_VER_OFFSET_9116		0x22C2</div><div class='ctx'> #define MAX_DWORD_ALIGN_BYTES		64</div><div class='ctx'> #define RSI_COMMON_REG_SIZE		2</div><div class='add'>+#define RSI_9116_REG_SIZE		4</div><div class='add'>+#define FW_ALIGN_SIZE			4</div><div class='add'>+#define RSI_9116_FW_MAGIC_WORD		0x5aa5</div><div class='add'>+</div><div class='add'>+#define MEM_ACCESS_CTRL_FROM_HOST	0x41300000</div><div class='add'>+#define RAM_384K_ACCESS_FROM_TA		(BIT(2) | BIT(3) | BIT(4) | BIT(5) | \</div><div class='add'>+					 BIT(20) | BIT(21) | BIT(22) | \</div><div class='add'>+					 BIT(23) | BIT(24) | BIT(25))</div><div class='ctx'> </div><div class='ctx'> struct bl_header {</div><div class='ctx'> 	__le32 flags;</div><div class='hunk'>@@ -130,6 +154,24 @@ struct ta_metadata {</div><div class='ctx'> 	unsigned int address;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define RSI_BL_CTRL_LEN_MASK			0xFFFFFF</div><div class='add'>+#define RSI_BL_CTRL_SPI_32BIT_MODE		BIT(27)</div><div class='add'>+#define RSI_BL_CTRL_REL_TA_SOFTRESET		BIT(28)</div><div class='add'>+#define RSI_BL_CTRL_START_FROM_ROM_PC		BIT(29)</div><div class='add'>+#define RSI_BL_CTRL_SPI_8BIT_MODE		BIT(30)</div><div class='add'>+#define RSI_BL_CTRL_LAST_ENTRY			BIT(31)</div><div class='add'>+struct bootload_entry {</div><div class='add'>+	__le32 control;</div><div class='add'>+	__le32 dst_addr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bootload_ds {</div><div class='add'>+	__le16 fixed_pattern;</div><div class='add'>+	__le16 offset;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	struct bootload_entry bl_entry[7];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct rsi_mgmt_desc {</div><div class='ctx'> 	__le16 len_qno;</div><div class='ctx'> 	u8 frame_type;</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h<br/>index 35d13f35e9b0..73a19e43106b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_main.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_main.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_main.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_main.h</a></div><div class='hunk'>@@ -111,9 +111,13 @@ extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...);</div><div class='ctx'> #define RSI_WOW_ENABLED			BIT(0)</div><div class='ctx'> #define RSI_WOW_NO_CONNECTION		BIT(1)</div><div class='ctx'> </div><div class='del'>-#define RSI_DEV_9113		1</div><div class='ctx'> #define RSI_MAX_RX_PKTS		64</div><div class='ctx'> </div><div class='add'>+enum rsi_dev_model {</div><div class='add'>+	RSI_DEV_9113 = 0,</div><div class='add'>+	RSI_DEV_9116</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct version_info {</div><div class='ctx'> 	u16 major;</div><div class='ctx'> 	u16 minor;</div><div class='hunk'>@@ -215,6 +219,17 @@ enum rsi_dfs_regions {</div><div class='ctx'> 	RSI_REGION_WORLD</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct rsi_9116_features {</div><div class='add'>+	u8 pll_mode;</div><div class='add'>+	u8 rf_type;</div><div class='add'>+	u8 wireless_mode;</div><div class='add'>+	u8 afe_type;</div><div class='add'>+	u8 enable_ppe;</div><div class='add'>+	u8 dpd;</div><div class='add'>+	u32 sifs_tx_enable;</div><div class='add'>+	u32 ps_options;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct rsi_common {</div><div class='ctx'> 	struct rsi_hw *priv;</div><div class='ctx'> 	struct vif_priv vif_info[RSI_MAX_VIFS];</div><div class='hunk'>@@ -310,6 +325,7 @@ struct rsi_common {</div><div class='ctx'> </div><div class='ctx'> 	struct cfg80211_scan_request *hwscan;</div><div class='ctx'> 	struct rsi_bgscan_params bgscan;</div><div class='add'>+	struct rsi_9116_features w9116_features;</div><div class='ctx'> 	u8 bgscan_en;</div><div class='ctx'> 	u8 mac_ops_resumed;</div><div class='ctx'> };</div><div class='hunk'>@@ -329,7 +345,7 @@ struct eeprom_read {</div><div class='ctx'> </div><div class='ctx'> struct rsi_hw {</div><div class='ctx'> 	struct rsi_common *priv;</div><div class='del'>-	u8 device_model;</div><div class='add'>+	enum rsi_dev_model device_model;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct ieee80211_vif *vifs[RSI_MAX_VIFS];</div><div class='ctx'> 	struct ieee80211_tx_queue_params edca_params[NUM_EDCA_QUEUES];</div><div class='hunk'>@@ -381,6 +397,7 @@ struct rsi_host_intf_ops {</div><div class='ctx'> 				      u32 instructions_size, u16 block_size,</div><div class='ctx'> 				      u8 *fw);</div><div class='ctx'> 	int (*reinit_device)(struct rsi_hw *adapter);</div><div class='add'>+	int (*ta_reset)(struct rsi_hw *adapter);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum rsi_host_intf rsi_get_host_intf(void *priv);</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_mgmt.h b/drivers/net/wireless/rsi/rsi_mgmt.h<br/>index ea83faa15c7e..2ce2dcf57441 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_mgmt.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_mgmt.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_mgmt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_mgmt.h</a></div><div class='hunk'>@@ -294,6 +294,7 @@ enum cmd_frame_type {</div><div class='ctx'> 	COMMON_DEV_CONFIG = 0x28,</div><div class='ctx'> 	RADIO_PARAMS_UPDATE = 0x29,</div><div class='ctx'> 	WOWLAN_CONFIG_PARAMS = 0x2B,</div><div class='add'>+	FEATURES_ENABLE = 0x33,</div><div class='ctx'> 	WOWLAN_WAKEUP_REASON = 0xc5</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -351,6 +352,15 @@ struct rsi_boot_params {</div><div class='ctx'> 	struct bootup_params bootup_params;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rsi_boot_params_9116 {</div><div class='add'>+	struct rsi_cmd_desc_dword0 desc_dword0;</div><div class='add'>+	struct rsi_cmd_desc_dword1 desc_dword1;</div><div class='add'>+	struct rsi_cmd_desc_dword2 desc_dword2;</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	__le16 umac_clk;</div><div class='add'>+	struct bootup_params_9116 bootup_params;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct rsi_peer_notify {</div><div class='ctx'> 	struct rsi_cmd_desc desc;</div><div class='ctx'> 	u8 mac_addr[6];</div><div class='hunk'>@@ -654,6 +664,22 @@ struct rsi_bgscan_probe {</div><div class='ctx'> 	__le16 probe_req_length;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define RSI_DUTY_CYCLING	BIT(0)</div><div class='add'>+#define RSI_END_OF_FRAME	BIT(1)</div><div class='add'>+#define RSI_SIFS_TX_ENABLE	BIT(2)</div><div class='add'>+#define RSI_DPD			BIT(3)</div><div class='add'>+struct rsi_wlan_9116_features {</div><div class='add'>+	struct rsi_cmd_desc desc;</div><div class='add'>+	u8 pll_mode;</div><div class='add'>+	u8 rf_type;</div><div class='add'>+	u8 wireless_mode;</div><div class='add'>+	u8 enable_ppe;</div><div class='add'>+	u8 afe_type;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	__le16 reserved2;</div><div class='add'>+	__le32 feature_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline u32 rsi_get_queueno(u8 *addr, u16 offset)</div><div class='ctx'> {</div><div class='ctx'> 	return (le16_to_cpu(*(__le16 *)&amp;addr[offset]) &amp; 0x7000) &gt;&gt; 12;</div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_sdio.h b/drivers/net/wireless/rsi/rsi_sdio.h<br/>index 66dcd2ec9051..c5cfb6238f73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_sdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_sdio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_sdio.h</a></div><div class='hunk'>@@ -28,8 +28,9 @@</div><div class='ctx'> #include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='ctx'> #include "rsi_main.h"</div><div class='ctx'> </div><div class='del'>-#define RSI_SDIO_VID_9113    0x041B</div><div class='add'>+#define RSI_SDIO_VENDOR_ID   0x041B</div><div class='ctx'> #define RSI_SDIO_PID_9113    0x9330</div><div class='add'>+#define RSI_SDIO_PID_9116    0x9116</div><div class='ctx'> </div><div class='ctx'> enum sdio_interrupt_type {</div><div class='ctx'> 	BUFFER_FULL         = 0x0,</div><div class='hunk'>@@ -91,7 +92,7 @@ enum sdio_interrupt_type {</div><div class='ctx'> #define TA_SOFT_RST_SET              BIT(0)</div><div class='ctx'> #define TA_PC_ZERO                   0</div><div class='ctx'> #define TA_HOLD_THREAD_VALUE         0xF</div><div class='del'>-#define TA_RELEASE_THREAD_VALUE      cpu_to_le32(0xF)</div><div class='add'>+#define TA_RELEASE_THREAD_VALUE      0xF</div><div class='ctx'> #define TA_BASE_ADDR                 0x2200</div><div class='ctx'> #define MISC_CFG_BASE_ADDR           0x4105</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rsi/rsi_usb.h b/drivers/net/wireless/rsi/rsi_usb.h<br/>index 5b2eddd1a2ee..8702f434b569 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_usb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/rsi/rsi_usb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/rsi/rsi_usb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/rsi/rsi_usb.h</a></div><div class='hunk'>@@ -22,8 +22,9 @@</div><div class='ctx'> #include "rsi_main.h"</div><div class='ctx'> #include "rsi_common.h"</div><div class='ctx'> </div><div class='del'>-#define RSI_USB_VID_9113	0x1618</div><div class='add'>+#define RSI_USB_VENDOR_ID	0x1618</div><div class='ctx'> #define RSI_USB_PID_9113	0x9113</div><div class='add'>+#define RSI_USB_PID_9116	0x9116</div><div class='ctx'> </div><div class='ctx'> #define USB_INTERNAL_REG_1           0x25000</div><div class='ctx'> #define RSI_USB_READY_MAGIC_NUM      0xab</div><div class='head'>diff --git a/drivers/net/wireless/st/cw1200/main.c b/drivers/net/wireless/st/cw1200/main.c<br/>index 90dc979f260b..c1608f0bf6d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/st/cw1200/main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/st/cw1200/main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/st/cw1200/main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/st/cw1200/main.c</a></div><div class='hunk'>@@ -345,6 +345,11 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr,</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;wsm_cmd_mux);</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;conf_mutex);</div><div class='ctx'> 	priv-&gt;workqueue = create_singlethread_workqueue("cw1200_wq");</div><div class='add'>+	if (!priv-&gt;workqueue) {</div><div class='add'>+		ieee80211_free_hw(hw);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sema_init(&amp;priv-&gt;scan.lock, 1);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;scan.work, cw1200_scan_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;priv-&gt;scan.probe_work, cw1200_probe_work);</div><div class='head'>diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c<br/>index 348be0aed97e..0415a064f6e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ti/wlcore/cmd.c</a></div><div class='hunk'>@@ -1700,14 +1700,14 @@ void wlcore_set_pending_regdomain_ch(struct wl1271 *wl, u16 channel,</div><div class='ctx'> 	ch_bit_idx = wlcore_get_reg_conf_ch_idx(band, channel);</div><div class='ctx'> </div><div class='ctx'> 	if (ch_bit_idx &gt;= 0 &amp;&amp; ch_bit_idx &lt;= WL1271_MAX_CHANNELS)</div><div class='del'>-		set_bit(ch_bit_idx, (long *)wl-&gt;reg_ch_conf_pending);</div><div class='add'>+		__set_bit_le(ch_bit_idx, (long *)wl-&gt;reg_ch_conf_pending);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_regdomain_dfs_config *cmd = NULL;</div><div class='ctx'> 	int ret = 0, i, b, ch_bit_idx;</div><div class='del'>-	u32 tmp_ch_bitmap[2];</div><div class='add'>+	__le32 tmp_ch_bitmap[2] __aligned(sizeof(unsigned long));</div><div class='ctx'> 	struct wiphy *wiphy = wl-&gt;hw-&gt;wiphy;</div><div class='ctx'> 	struct ieee80211_supported_band *band;</div><div class='ctx'> 	bool timeout = false;</div><div class='hunk'>@@ -1717,7 +1717,7 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "cmd reg domain config");</div><div class='ctx'> </div><div class='del'>-	memset(tmp_ch_bitmap, 0, sizeof(tmp_ch_bitmap));</div><div class='add'>+	memcpy(tmp_ch_bitmap, wl-&gt;reg_ch_conf_pending, sizeof(tmp_ch_bitmap));</div><div class='ctx'> </div><div class='ctx'> 	for (b = NL80211_BAND_2GHZ; b &lt;= NL80211_BAND_5GHZ; b++) {</div><div class='ctx'> 		band = wiphy-&gt;bands[b];</div><div class='hunk'>@@ -1738,13 +1738,10 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)</div><div class='ctx'> 			if (ch_bit_idx &lt; 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			set_bit(ch_bit_idx, (long *)tmp_ch_bitmap);</div><div class='add'>+			__set_bit_le(ch_bit_idx, (long *)tmp_ch_bitmap);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tmp_ch_bitmap[0] |= wl-&gt;reg_ch_conf_pending[0];</div><div class='del'>-	tmp_ch_bitmap[1] |= wl-&gt;reg_ch_conf_pending[1];</div><div class='del'>-</div><div class='ctx'> 	if (!memcmp(tmp_ch_bitmap, wl-&gt;reg_ch_conf_last, sizeof(tmp_ch_bitmap)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1754,8 +1751,8 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;ch_bit_map1 = cpu_to_le32(tmp_ch_bitmap[0]);</div><div class='del'>-	cmd-&gt;ch_bit_map2 = cpu_to_le32(tmp_ch_bitmap[1]);</div><div class='add'>+	cmd-&gt;ch_bit_map1 = tmp_ch_bitmap[0];</div><div class='add'>+	cmd-&gt;ch_bit_map2 = tmp_ch_bitmap[1];</div><div class='ctx'> 	cmd-&gt;dfs_region = wl-&gt;dfs_region;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD,</div><div class='head'>diff --git a/drivers/net/wireless/ti/wlcore/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c<br/>index dcb2c8b0feb6..affefaaea1ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/testmode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/testmode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/testmode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ti/wlcore/testmode.c</a></div><div class='hunk'>@@ -372,8 +372,8 @@ int wl1271_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	u32 nla_cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nla_parse(tb, WL1271_TM_ATTR_MAX, data, len, wl1271_tm_policy,</div><div class='del'>-			NULL);</div><div class='add'>+	err = nla_parse_deprecated(tb, WL1271_TM_ATTR_MAX, data, len,</div><div class='add'>+				   wl1271_tm_policy, NULL);</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/wireless/ti/wlcore/vendor_cmd.c b/drivers/net/wireless/ti/wlcore/vendor_cmd.c<br/>index 7f34ec077ee5..75756fb8e7b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/vendor_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/vendor_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/vendor_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ti/wlcore/vendor_cmd.c</a></div><div class='hunk'>@@ -41,8 +41,8 @@ wlcore_vendor_cmd_smart_config_start(struct wiphy *wiphy,</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, MAX_WLCORE_VENDOR_ATTR, data, data_len,</div><div class='del'>-			wlcore_vendor_attr_policy, NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, MAX_WLCORE_VENDOR_ATTR, data, data_len,</div><div class='add'>+				   wlcore_vendor_attr_policy, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -122,8 +122,8 @@ wlcore_vendor_cmd_smart_config_set_group_key(struct wiphy *wiphy,</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, MAX_WLCORE_VENDOR_ATTR, data, data_len,</div><div class='del'>-			wlcore_vendor_attr_policy, NULL);</div><div class='add'>+	ret = nla_parse_deprecated(tb, MAX_WLCORE_VENDOR_ATTR, data, data_len,</div><div class='add'>+				   wlcore_vendor_attr_policy, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h<br/>index dd14850b0603..870eea3e7a27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/wlcore.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/ti/wlcore/wlcore.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/ti/wlcore/wlcore.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/ti/wlcore/wlcore.h</a></div><div class='hunk'>@@ -320,9 +320,9 @@ struct wl1271 {</div><div class='ctx'> 	bool watchdog_recovery;</div><div class='ctx'> </div><div class='ctx'> 	/* Reg domain last configuration */</div><div class='del'>-	u32 reg_ch_conf_last[2]  __aligned(8);</div><div class='add'>+	DECLARE_BITMAP(reg_ch_conf_last, 64);</div><div class='ctx'> 	/* Reg domain pending configuration */</div><div class='del'>-	u32 reg_ch_conf_pending[2];</div><div class='add'>+	DECLARE_BITMAP(reg_ch_conf_pending, 64);</div><div class='ctx'> </div><div class='ctx'> 	/* Pointer that holds DMA-friendly block for the mailbox */</div><div class='ctx'> 	void *mbox;</div><div class='head'>diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c<br/>index c2cda3acd4af..a094d5b3383c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/zydas/zd1211rw/zd_usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/wireless/zydas/zd1211rw/zd_usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/wireless/zydas/zd1211rw/zd_usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/wireless/zydas/zd1211rw/zd_usb.c</a></div><div class='hunk'>@@ -1917,8 +1917,7 @@ int zd_usb_iowrite16v_async(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,</div><div class='ctx'> 	if (!urb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	req_len = sizeof(struct usb_req_write_regs) +</div><div class='del'>-		  count * sizeof(struct reg_data);</div><div class='add'>+	req_len = struct_size(req, reg_writes, count);</div><div class='ctx'> 	req = kmalloc(req_len, GFP_KERNEL);</div><div class='ctx'> 	if (!req) {</div><div class='ctx'> 		r = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h<br/>index 936c0b3e0ba2..05847eb91a1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netback/common.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netback/common.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netback/common.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/xen-netback/common.h</a></div><div class='hunk'>@@ -248,6 +248,22 @@ struct xenvif_hash {</div><div class='ctx'> 	struct xenvif_hash_cache cache;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct backend_info {</div><div class='add'>+	struct xenbus_device *dev;</div><div class='add'>+	struct xenvif *vif;</div><div class='add'>+</div><div class='add'>+	/* This is the state that will be reflected in xenstore when any</div><div class='add'>+	 * active hotplug script completes.</div><div class='add'>+	 */</div><div class='add'>+	enum xenbus_state state;</div><div class='add'>+</div><div class='add'>+	enum xenbus_state frontend_state;</div><div class='add'>+	struct xenbus_watch hotplug_status_watch;</div><div class='add'>+	u8 have_hotplug_status_watch:1;</div><div class='add'>+</div><div class='add'>+	const char *hotplug_script;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct xenvif {</div><div class='ctx'> 	/* Unique identifier for this interface. */</div><div class='ctx'> 	domid_t          domid;</div><div class='hunk'>@@ -283,6 +299,8 @@ struct xenvif {</div><div class='ctx'> 	struct xenbus_watch credit_watch;</div><div class='ctx'> 	struct xenbus_watch mcast_ctrl_watch;</div><div class='ctx'> </div><div class='add'>+	struct backend_info *be;</div><div class='add'>+</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='head'>diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c<br/>index 6da12518e693..783198844dd7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netback/interface.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netback/interface.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netback/interface.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/xen-netback/interface.c</a></div><div class='hunk'>@@ -148,8 +148,7 @@ void xenvif_wake_queue(struct xenvif_queue *queue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			       struct net_device *sb_dev,</div><div class='del'>-			       select_queue_fallback_t fallback)</div><div class='add'>+			       struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xenvif *vif = netdev_priv(dev);</div><div class='ctx'> 	unsigned int size = vif-&gt;hash.size;</div><div class='hunk'>@@ -162,7 +161,8 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;hash.alg == XEN_NETIF_CTRL_HASH_ALGORITHM_NONE)</div><div class='del'>-		return fallback(dev, skb, NULL) % dev-&gt;real_num_tx_queues;</div><div class='add'>+		return netdev_pick_tx(dev, skb, NULL) %</div><div class='add'>+		       dev-&gt;real_num_tx_queues;</div><div class='ctx'> </div><div class='ctx'> 	xenvif_set_skb_hash(vif, skb);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c<br/>index 330ddb64930f..41c9e8f2e520 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netback/xenbus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netback/xenbus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netback/xenbus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/xen-netback/xenbus.c</a></div><div class='hunk'>@@ -22,22 +22,6 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> </div><div class='del'>-struct backend_info {</div><div class='del'>-	struct xenbus_device *dev;</div><div class='del'>-	struct xenvif *vif;</div><div class='del'>-</div><div class='del'>-	/* This is the state that will be reflected in xenstore when any</div><div class='del'>-	 * active hotplug script completes.</div><div class='del'>-	 */</div><div class='del'>-	enum xenbus_state state;</div><div class='del'>-</div><div class='del'>-	enum xenbus_state frontend_state;</div><div class='del'>-	struct xenbus_watch hotplug_status_watch;</div><div class='del'>-	u8 have_hotplug_status_watch:1;</div><div class='del'>-</div><div class='del'>-	const char *hotplug_script;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int connect_data_rings(struct backend_info *be,</div><div class='ctx'> 			      struct xenvif_queue *queue);</div><div class='ctx'> static void connect(struct backend_info *be);</div><div class='hunk'>@@ -472,6 +456,7 @@ static int backend_create_xenvif(struct backend_info *be)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	be-&gt;vif = vif;</div><div class='add'>+	vif-&gt;be = be;</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;dev-&gt;dev.kobj, KOBJ_ONLINE);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c<br/>index c914c24f880b..8d33970a2950 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netfront.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/net/xen-netfront.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/net/xen-netfront.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/net/xen-netfront.c</a></div><div class='hunk'>@@ -543,8 +543,7 @@ static int xennet_count_skb_slots(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 xennet_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			       struct net_device *sb_dev,</div><div class='del'>-			       select_queue_fallback_t fallback)</div><div class='add'>+			       struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int num_queues = dev-&gt;real_num_tx_queues;</div><div class='ctx'> 	u32 hash;</div><div class='hunk'>@@ -2038,7 +2037,7 @@ static void netback_changed(struct xenbus_device *dev,</div><div class='ctx'> 	case XenbusStateClosed:</div><div class='ctx'> 		if (dev-&gt;state == XenbusStateClosed)</div><div class='ctx'> 			break;</div><div class='del'>-		/* Missed the backend's CLOSING state -- fallthrough */</div><div class='add'>+		/* Fall through - Missed the backend's CLOSING state. */</div><div class='ctx'> 	case XenbusStateClosing:</div><div class='ctx'> 		xenbus_frontend_closed(dev);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c<br/>index 8a04c5e02999..0f43bb389566 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/mei_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/mei_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/mei_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/mei_phy.c</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- * MEI Library for mei bus nfc device access</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2013  Intel 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) 2013, Intel Corporation.</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='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'>+ * MEI Library for mei bus nfc device access</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c<br/>index eb5eddf1794e..5dad8847a9b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/microread/mei.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/microread/mei.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/microread/mei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/microread/mei.c</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- * HCI based Driver for Inside Secure microread NFC Chip</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2013  Intel 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) 2013 Intel Corporation. All rights reserved.</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='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'>+ * HCI based Driver for Inside Secure microread NFC Chip</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='head'>diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c<br/>index a0cc1cc45292..5961f14259e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/pn533/pn533.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/pn533/pn533.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/pn533/pn533.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/pn533/pn533.c</a></div><div class='hunk'>@@ -2147,6 +2147,7 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* jumbo frame ? */</div><div class='ctx'> 		if (skb-&gt;len &gt; PN533_CMD_DATAEXCH_DATA_MAXLEN) {</div><div class='hunk'>@@ -2273,6 +2274,7 @@ static void pn533_wq_mi_recv(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		skb_put_u8(skb, 1); /*TG*/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c<br/>index ad57a8ec00d6..579bc599f545 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/pn544/mei.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/pn544/mei.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/pn544/mei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/pn544/mei.c</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='del'>- * HCI based Driver for NXP pn544 NFC Chip</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2013  Intel Corporation. All rights reserved.</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 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'>+ * HCI based Driver for NXP pn544 NFC Chip</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/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c<br/>index b7828fb252f2..b681073ae8ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/s3fwrn5/firmware.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/s3fwrn5/firmware.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/s3fwrn5/firmware.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/s3fwrn5/firmware.c</a></div><div class='hunk'>@@ -449,7 +449,6 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)</div><div class='ctx'> 		SHASH_DESC_ON_STACK(desc, tfm);</div><div class='ctx'> </div><div class='ctx'> 		desc-&gt;tfm = tfm;</div><div class='del'>-		desc-&gt;flags = CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 		ret = crypto_shash_digest(desc, fw-&gt;image, image_size,</div><div class='ctx'> 					  hash_data);</div><div class='head'>diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c<br/>index fd08be2917e6..c005997493af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/st21nfca/dep.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/st21nfca/dep.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/st21nfca/dep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/st21nfca/dep.c</a></div><div class='hunk'>@@ -400,6 +400,7 @@ static int st21nfca_tm_event_send_data(struct nfc_hci_dev *hdev,</div><div class='ctx'> 		default:</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -619,6 +620,7 @@ static void st21nfca_im_recv_dep_res_cb(void *context, struct sk_buff *skb,</div><div class='ctx'> 		switch (ST21NFCA_NFC_DEP_PFB_TYPE(dep_res-&gt;pfb)) {</div><div class='ctx'> 		case ST21NFCA_NFC_DEP_PFB_ACK_NACK_PDU:</div><div class='ctx'> 			pr_err("Received a ACK/NACK PDU\n");</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		case ST21NFCA_NFC_DEP_PFB_I_PDU:</div><div class='ctx'> 			info-&gt;dep_info.curr_nfc_dep_pni =</div><div class='ctx'> 			    ST21NFCA_NFC_DEP_PFB_PNI(dep_res-&gt;pfb + 1);</div><div class='head'>diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c<br/>index 2b26f762fbc3..99727a2edda0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/st95hf/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nfc/st95hf/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nfc/st95hf/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nfc/st95hf/core.c</a></div><div class='hunk'>@@ -781,9 +781,7 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void  *st95hfcontext)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	int res_len;</div><div class='ctx'> 	static bool wtx;</div><div class='del'>-	struct device *dev;</div><div class='ctx'> 	struct device *spidevice;</div><div class='del'>-	struct nfc_digital_dev *nfcddev;</div><div class='ctx'> 	struct sk_buff *skb_resp;</div><div class='ctx'> 	struct st95hf_context *stcontext  =</div><div class='ctx'> 		(struct st95hf_context *)st95hfcontext;</div><div class='hunk'>@@ -828,8 +826,6 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void  *st95hfcontext)</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = &amp;stcontext-&gt;nfcdev-&gt;dev;</div><div class='del'>-	nfcddev = stcontext-&gt;ddev;</div><div class='ctx'> 	if (skb_resp-&gt;data[2] == WTX_REQ_FROM_TAG) {</div><div class='ctx'> 		/* Request for new FWT from tag */</div><div class='ctx'> 		result = st95hf_handle_wtx(stcontext, true, skb_resp-&gt;data[3]);</div><div class='hunk'>@@ -1074,6 +1070,12 @@ static const struct spi_device_id st95hf_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(spi, st95hf_id);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id st95hf_spi_of_match[] = {</div><div class='add'>+        { .compatible = "st,st95hf" },</div><div class='add'>+        { },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, st95hf_spi_of_match);</div><div class='add'>+</div><div class='ctx'> static int st95hf_probe(struct spi_device *nfc_spi_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1260,6 +1262,7 @@ static struct spi_driver st95hf_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "st95hf",</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='add'>+		.of_match_table = of_match_ptr(st95hf_spi_of_match),</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table = st95hf_id,</div><div class='ctx'> 	.probe = st95hf_probe,</div><div class='head'>diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c<br/>index 1dede87dd54f..dcf234680535 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ntb/hw/idt/ntb_hw_idt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ntb/hw/idt/ntb_hw_idt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ntb/hw/idt/ntb_hw_idt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ntb/hw/idt/ntb_hw_idt.c</a></div><div class='hunk'>@@ -358,8 +358,6 @@ static void idt_sw_write(struct idt_ntb_dev *ndev,</div><div class='ctx'> 	iowrite32((u32)reg, ndev-&gt;cfgspc + (ptrdiff_t)IDT_NT_GASAADDR);</div><div class='ctx'> 	/* Put the new value of the register */</div><div class='ctx'> 	iowrite32(data, ndev-&gt;cfgspc + (ptrdiff_t)IDT_NT_GASADATA);</div><div class='del'>-	/* Make sure the PCIe transactions are executed */</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	/* Unlock GASA registers operations */</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ndev-&gt;gasa_lock, irqflags);</div><div class='ctx'> }</div><div class='hunk'>@@ -750,7 +748,6 @@ static void idt_ntb_local_link_enable(struct idt_ntb_dev *ndev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;ndev-&gt;mtbl_lock, irqflags);</div><div class='ctx'> 	idt_nt_write(ndev, IDT_NT_NTMTBLADDR, ndev-&gt;part);</div><div class='ctx'> 	idt_nt_write(ndev, IDT_NT_NTMTBLDATA, mtbldata);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ndev-&gt;mtbl_lock, irqflags);</div><div class='ctx'> </div><div class='ctx'> 	/* Notify the peers by setting and clearing the global signal bit */</div><div class='hunk'>@@ -778,7 +775,6 @@ static void idt_ntb_local_link_disable(struct idt_ntb_dev *ndev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;ndev-&gt;mtbl_lock, irqflags);</div><div class='ctx'> 	idt_nt_write(ndev, IDT_NT_NTMTBLADDR, ndev-&gt;part);</div><div class='ctx'> 	idt_nt_write(ndev, IDT_NT_NTMTBLDATA, 0);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ndev-&gt;mtbl_lock, irqflags);</div><div class='ctx'> </div><div class='ctx'> 	/* Notify the peers by setting and clearing the global signal bit */</div><div class='hunk'>@@ -1339,7 +1335,6 @@ static int idt_ntb_peer_mw_set_trans(struct ntb_dev *ntb, int pidx, int widx,</div><div class='ctx'> 		idt_nt_write(ndev, IDT_NT_LUTLDATA, (u32)addr);</div><div class='ctx'> 		idt_nt_write(ndev, IDT_NT_LUTMDATA, (u32)(addr &gt;&gt; 32));</div><div class='ctx'> 		idt_nt_write(ndev, IDT_NT_LUTUDATA, data);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ndev-&gt;lut_lock, irqflags);</div><div class='ctx'> 		/* Limit address isn't specified since size is fixed for LUT */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1393,7 +1388,6 @@ static int idt_ntb_peer_mw_clear_trans(struct ntb_dev *ntb, int pidx,</div><div class='ctx'> 		idt_nt_write(ndev, IDT_NT_LUTLDATA, 0);</div><div class='ctx'> 		idt_nt_write(ndev, IDT_NT_LUTMDATA, 0);</div><div class='ctx'> 		idt_nt_write(ndev, IDT_NT_LUTUDATA, 0);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ndev-&gt;lut_lock, irqflags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1812,7 +1806,6 @@ static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,</div><div class='ctx'> 	/* Set the route and send the data */</div><div class='ctx'> 	idt_sw_write(ndev, partdata_tbl[ndev-&gt;part].msgctl[midx], swpmsgctl);</div><div class='ctx'> 	idt_nt_write(ndev, ntdata_tbl.msgs[midx].out, msg);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	/* Unlock the messages routing table */</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ndev-&gt;msg_locks[midx], irqflags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c<br/>index 2a9d6b0d1f19..11a6cd374004 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ntb/test/ntb_perf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ntb/test/ntb_perf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ntb/test/ntb_perf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ntb/test/ntb_perf.c</a></div><div class='hunk'>@@ -284,11 +284,9 @@ static int perf_spad_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,</div><div class='ctx'> 		ntb_peer_spad_write(perf-&gt;ntb, peer-&gt;pidx,</div><div class='ctx'> 				    PERF_SPAD_HDATA(perf-&gt;gidx),</div><div class='ctx'> 				    upper_32_bits(data));</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		ntb_peer_spad_write(perf-&gt;ntb, peer-&gt;pidx,</div><div class='ctx'> 				    PERF_SPAD_CMD(perf-&gt;gidx),</div><div class='ctx'> 				    cmd);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		ntb_peer_db_set(perf-&gt;ntb, PERF_SPAD_NOTIFY(peer-&gt;gidx));</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(&amp;perf-&gt;ntb-&gt;dev, "DB ring peer %#llx\n",</div><div class='hunk'>@@ -379,7 +377,6 @@ static int perf_msg_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,</div><div class='ctx'> </div><div class='ctx'> 		ntb_peer_msg_write(perf-&gt;ntb, peer-&gt;pidx, PERF_MSG_HDATA,</div><div class='ctx'> 				   upper_32_bits(data));</div><div class='del'>-		mmiowb();</div><div class='ctx'> </div><div class='ctx'> 		/* This call shall trigger peer message event */</div><div class='ctx'> 		ntb_peer_msg_write(perf-&gt;ntb, peer-&gt;pidx, PERF_MSG_CMD, cmd);</div><div class='head'>diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c<br/>index b72a303176c7..9486acc08402 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/btt_devs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/btt_devs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/btt_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/btt_devs.c</a></div><div class='hunk'>@@ -198,14 +198,15 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	nd_btt-&gt;id = ida_simple_get(&amp;nd_region-&gt;btt_ida, 0, 0, GFP_KERNEL);</div><div class='del'>-	if (nd_btt-&gt;id &lt; 0) {</div><div class='del'>-		kfree(nd_btt);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (nd_btt-&gt;id &lt; 0)</div><div class='add'>+		goto out_nd_btt;</div><div class='ctx'> </div><div class='ctx'> 	nd_btt-&gt;lbasize = lbasize;</div><div class='del'>-	if (uuid)</div><div class='add'>+	if (uuid) {</div><div class='ctx'> 		uuid = kmemdup(uuid, 16, GFP_KERNEL);</div><div class='add'>+		if (!uuid)</div><div class='add'>+			goto out_put_id;</div><div class='add'>+	}</div><div class='ctx'> 	nd_btt-&gt;uuid = uuid;</div><div class='ctx'> 	dev = &amp;nd_btt-&gt;dev;</div><div class='ctx'> 	dev_set_name(dev, "btt%d.%d", nd_region-&gt;id, nd_btt-&gt;id);</div><div class='hunk'>@@ -220,6 +221,13 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return dev;</div><div class='add'>+</div><div class='add'>+out_put_id:</div><div class='add'>+	ida_simple_remove(&amp;nd_region-&gt;btt_ida, nd_btt-&gt;id);</div><div class='add'>+</div><div class='add'>+out_nd_btt:</div><div class='add'>+	kfree(nd_btt);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct device *nd_btt_create(struct nd_region *nd_region)</div><div class='head'>diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c<br/>index 7bbff0af29b2..7ff684159f29 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/bus.c</a></div><div class='hunk'>@@ -581,7 +581,7 @@ int __nd_driver_register(struct nd_device_driver *nd_drv, struct module *owner,</div><div class='ctx'> 	struct device_driver *drv = &amp;nd_drv-&gt;drv;</div><div class='ctx'> </div><div class='ctx'> 	if (!nd_drv-&gt;type) {</div><div class='del'>-		pr_debug("driver type bitmask not set (%pf)\n",</div><div class='add'>+		pr_debug("driver type bitmask not set (%ps)\n",</div><div class='ctx'> 				__builtin_return_address(0));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c<br/>index 91b9abbf689c..ecbab2d66e38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/dimm_devs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/dimm_devs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/dimm_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/dimm_devs.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static int validate_dimm(struct nvdimm_drvdata *ndd)</div><div class='ctx'> </div><div class='ctx'> 	rc = nvdimm_check_config_data(ndd-&gt;dev);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		dev_dbg(ndd-&gt;dev, "%pf: %s error: %d\n",</div><div class='add'>+		dev_dbg(ndd-&gt;dev, "%ps: %s error: %d\n",</div><div class='ctx'> 				__builtin_return_address(0), __func__, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c<br/>index 7849bf1812c4..f293556cbbf6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/namespace_devs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/namespace_devs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/namespace_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/namespace_devs.c</a></div><div class='hunk'>@@ -2249,9 +2249,12 @@ static struct device *create_namespace_blk(struct nd_region *nd_region,</div><div class='ctx'> 	if (!nsblk-&gt;uuid)</div><div class='ctx'> 		goto blk_err;</div><div class='ctx'> 	memcpy(name, nd_label-&gt;name, NSLABEL_NAME_LEN);</div><div class='del'>-	if (name[0])</div><div class='add'>+	if (name[0]) {</div><div class='ctx'> 		nsblk-&gt;alt_name = kmemdup(name, NSLABEL_NAME_LEN,</div><div class='ctx'> 				GFP_KERNEL);</div><div class='add'>+		if (!nsblk-&gt;alt_name)</div><div class='add'>+			goto blk_err;</div><div class='add'>+	}</div><div class='ctx'> 	res = nsblk_add_resource(nd_region, ndd, nsblk,</div><div class='ctx'> 			__le64_to_cpu(nd_label-&gt;dpa));</div><div class='ctx'> 	if (!res)</div><div class='head'>diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c<br/>index d271bd731af7..01f40672507f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/pfn_devs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/pfn_devs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/pfn_devs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/pfn_devs.c</a></div><div class='hunk'>@@ -391,7 +391,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn)</div><div class='ctx'> 		bb_present = badblocks_check(&amp;nd_region-&gt;bb, meta_start,</div><div class='ctx'> 				meta_num, &amp;first_bad, &amp;num_bad);</div><div class='ctx'> 		if (bb_present) {</div><div class='del'>-			dev_dbg(&amp;nd_pfn-&gt;dev, "meta: %x badblocks at %lx\n",</div><div class='add'>+			dev_dbg(&amp;nd_pfn-&gt;dev, "meta: %x badblocks at %llx\n",</div><div class='ctx'> 					num_bad, first_bad);</div><div class='ctx'> 			nsoff = ALIGN_DOWN((nd_region-&gt;ndr_start</div><div class='ctx'> 					+ (first_bad &lt;&lt; 9)) - nsio-&gt;res.start,</div><div class='hunk'>@@ -410,7 +410,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn)</div><div class='ctx'> 			}</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				dev_err(&amp;nd_pfn-&gt;dev,</div><div class='del'>-					"error clearing %x badblocks at %lx\n",</div><div class='add'>+					"error clearing %x badblocks at %llx\n",</div><div class='ctx'> 					num_bad, first_bad);</div><div class='ctx'> 				return rc;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c<br/>index bc2f700feef8..0279eb1da3ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/pmem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/pmem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/pmem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/pmem.c</a></div><div class='hunk'>@@ -113,13 +113,13 @@ static void write_pmem(void *pmem_addr, struct page *page,</div><div class='ctx'> </div><div class='ctx'> 	while (len) {</div><div class='ctx'> 		mem = kmap_atomic(page);</div><div class='del'>-		chunk = min_t(unsigned int, len, PAGE_SIZE);</div><div class='add'>+		chunk = min_t(unsigned int, len, PAGE_SIZE - off);</div><div class='ctx'> 		memcpy_flushcache(pmem_addr, mem + off, chunk);</div><div class='ctx'> 		kunmap_atomic(mem);</div><div class='ctx'> 		len -= chunk;</div><div class='ctx'> 		off = 0;</div><div class='ctx'> 		page++;</div><div class='del'>-		pmem_addr += PAGE_SIZE;</div><div class='add'>+		pmem_addr += chunk;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -132,7 +132,7 @@ static blk_status_t read_pmem(struct page *page, unsigned int off,</div><div class='ctx'> </div><div class='ctx'> 	while (len) {</div><div class='ctx'> 		mem = kmap_atomic(page);</div><div class='del'>-		chunk = min_t(unsigned int, len, PAGE_SIZE);</div><div class='add'>+		chunk = min_t(unsigned int, len, PAGE_SIZE - off);</div><div class='ctx'> 		rem = memcpy_mcsafe(mem + off, pmem_addr, chunk);</div><div class='ctx'> 		kunmap_atomic(mem);</div><div class='ctx'> 		if (rem)</div><div class='hunk'>@@ -140,7 +140,7 @@ static blk_status_t read_pmem(struct page *page, unsigned int off,</div><div class='ctx'> 		len -= chunk;</div><div class='ctx'> 		off = 0;</div><div class='ctx'> 		page++;</div><div class='del'>-		pmem_addr += PAGE_SIZE;</div><div class='add'>+		pmem_addr += chunk;</div><div class='ctx'> 	}</div><div class='ctx'> 	return BLK_STS_OK;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c<br/>index f8bb746a549f..a570f2263a42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/security.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvdimm/security.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvdimm/security.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvdimm/security.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@ static bool key_revalidate = true;</div><div class='ctx'> module_param(key_revalidate, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(key_revalidate, "Require key validation at init.");</div><div class='ctx'> </div><div class='add'>+static const char zero_key[NVDIMM_PASSPHRASE_LEN];</div><div class='add'>+</div><div class='ctx'> static void *key_data(struct key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct encrypted_key_payload *epayload = dereference_key_locked(key);</div><div class='hunk'>@@ -75,6 +77,16 @@ static struct key *nvdimm_request_key(struct nvdimm *nvdimm)</div><div class='ctx'> 	return key;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const void *nvdimm_get_key_payload(struct nvdimm *nvdimm,</div><div class='add'>+		struct key **key)</div><div class='add'>+{</div><div class='add'>+	*key = nvdimm_request_key(nvdimm);</div><div class='add'>+	if (!*key)</div><div class='add'>+		return zero_key;</div><div class='add'>+</div><div class='add'>+	return key_data(*key);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct key *nvdimm_lookup_user_key(struct nvdimm *nvdimm,</div><div class='ctx'> 		key_serial_t id, int subclass)</div><div class='ctx'> {</div><div class='hunk'>@@ -105,36 +117,57 @@ static struct key *nvdimm_lookup_user_key(struct nvdimm *nvdimm,</div><div class='ctx'> 	return key;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct key *nvdimm_key_revalidate(struct nvdimm *nvdimm)</div><div class='add'>+static const void *nvdimm_get_user_key_payload(struct nvdimm *nvdimm,</div><div class='add'>+		key_serial_t id, int subclass, struct key **key)</div><div class='add'>+{</div><div class='add'>+	*key = NULL;</div><div class='add'>+	if (id == 0) {</div><div class='add'>+		if (subclass == NVDIMM_BASE_KEY)</div><div class='add'>+			return zero_key;</div><div class='add'>+		else</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*key = nvdimm_lookup_user_key(nvdimm, id, subclass);</div><div class='add'>+	if (!*key)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return key_data(*key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int nvdimm_key_revalidate(struct nvdimm *nvdimm)</div><div class='ctx'> {</div><div class='ctx'> 	struct key *key;</div><div class='ctx'> 	int rc;</div><div class='add'>+	const void *data;</div><div class='ctx'> </div><div class='ctx'> 	if (!nvdimm-&gt;sec.ops-&gt;change_key)</div><div class='del'>-		return NULL;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	key = nvdimm_request_key(nvdimm);</div><div class='del'>-	if (!key)</div><div class='del'>-		return NULL;</div><div class='add'>+	data = nvdimm_get_key_payload(nvdimm, &amp;key);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Send the same key to the hardware as new and old key to</div><div class='ctx'> 	 * verify that the key is good.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = nvdimm-&gt;sec.ops-&gt;change_key(nvdimm, key_data(key),</div><div class='del'>-			key_data(key), NVDIMM_USER);</div><div class='add'>+	rc = nvdimm-&gt;sec.ops-&gt;change_key(nvdimm, data, data, NVDIMM_USER);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		nvdimm_put_key(key);</div><div class='del'>-		key = NULL;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	return key;</div><div class='add'>+</div><div class='add'>+	nvdimm_put_key(key);</div><div class='add'>+	nvdimm-&gt;sec.state = nvdimm_security_state(nvdimm, NVDIMM_USER);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __nvdimm_security_unlock(struct nvdimm *nvdimm)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;nvdimm-&gt;dev;</div><div class='ctx'> 	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);</div><div class='del'>-	struct key *key = NULL;</div><div class='add'>+	struct key *key;</div><div class='add'>+	const void *data;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* The bus lock should be held at the top level of the call stack */</div><div class='hunk'>@@ -160,16 +193,11 @@ static int __nvdimm_security_unlock(struct nvdimm *nvdimm)</div><div class='ctx'> 		if (!key_revalidate)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		key = nvdimm_key_revalidate(nvdimm);</div><div class='del'>-		if (!key)</div><div class='del'>-			return nvdimm_security_freeze(nvdimm);</div><div class='add'>+		return nvdimm_key_revalidate(nvdimm);</div><div class='ctx'> 	} else</div><div class='del'>-		key = nvdimm_request_key(nvdimm);</div><div class='add'>+		data = nvdimm_get_key_payload(nvdimm, &amp;key);</div><div class='ctx'> </div><div class='del'>-	if (!key)</div><div class='del'>-		return -ENOKEY;</div><div class='del'>-</div><div class='del'>-	rc = nvdimm-&gt;sec.ops-&gt;unlock(nvdimm, key_data(key));</div><div class='add'>+	rc = nvdimm-&gt;sec.ops-&gt;unlock(nvdimm, data);</div><div class='ctx'> 	dev_dbg(dev, "key: %d unlock: %s\n", key_serial(key),</div><div class='ctx'> 			rc == 0 ? "success" : "fail");</div><div class='ctx'> </div><div class='hunk'>@@ -195,6 +223,7 @@ int nvdimm_security_disable(struct nvdimm *nvdimm, unsigned int keyid)</div><div class='ctx'> 	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);</div><div class='ctx'> 	struct key *key;</div><div class='ctx'> 	int rc;</div><div class='add'>+	const void *data;</div><div class='ctx'> </div><div class='ctx'> 	/* The bus lock should be held at the top level of the call stack */</div><div class='ctx'> 	lockdep_assert_held(&amp;nvdimm_bus-&gt;reconfig_mutex);</div><div class='hunk'>@@ -214,11 +243,12 @@ int nvdimm_security_disable(struct nvdimm *nvdimm, unsigned int keyid)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = nvdimm_lookup_user_key(nvdimm, keyid, NVDIMM_BASE_KEY);</div><div class='del'>-	if (!key)</div><div class='add'>+	data = nvdimm_get_user_key_payload(nvdimm, keyid,</div><div class='add'>+			NVDIMM_BASE_KEY, &amp;key);</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return -ENOKEY;</div><div class='ctx'> </div><div class='del'>-	rc = nvdimm-&gt;sec.ops-&gt;disable(nvdimm, key_data(key));</div><div class='add'>+	rc = nvdimm-&gt;sec.ops-&gt;disable(nvdimm, data);</div><div class='ctx'> 	dev_dbg(dev, "key: %d disable: %s\n", key_serial(key),</div><div class='ctx'> 			rc == 0 ? "success" : "fail");</div><div class='ctx'> </div><div class='hunk'>@@ -235,6 +265,7 @@ int nvdimm_security_update(struct nvdimm *nvdimm, unsigned int keyid,</div><div class='ctx'> 	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);</div><div class='ctx'> 	struct key *key, *newkey;</div><div class='ctx'> 	int rc;</div><div class='add'>+	const void *data, *newdata;</div><div class='ctx'> </div><div class='ctx'> 	/* The bus lock should be held at the top level of the call stack */</div><div class='ctx'> 	lockdep_assert_held(&amp;nvdimm_bus-&gt;reconfig_mutex);</div><div class='hunk'>@@ -249,22 +280,19 @@ int nvdimm_security_update(struct nvdimm *nvdimm, unsigned int keyid,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (keyid == 0)</div><div class='del'>-		key = NULL;</div><div class='del'>-	else {</div><div class='del'>-		key = nvdimm_lookup_user_key(nvdimm, keyid, NVDIMM_BASE_KEY);</div><div class='del'>-		if (!key)</div><div class='del'>-			return -ENOKEY;</div><div class='del'>-	}</div><div class='add'>+	data = nvdimm_get_user_key_payload(nvdimm, keyid,</div><div class='add'>+			NVDIMM_BASE_KEY, &amp;key);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOKEY;</div><div class='ctx'> </div><div class='del'>-	newkey = nvdimm_lookup_user_key(nvdimm, new_keyid, NVDIMM_NEW_KEY);</div><div class='del'>-	if (!newkey) {</div><div class='add'>+	newdata = nvdimm_get_user_key_payload(nvdimm, new_keyid,</div><div class='add'>+			NVDIMM_NEW_KEY, &amp;newkey);</div><div class='add'>+	if (!newdata) {</div><div class='ctx'> 		nvdimm_put_key(key);</div><div class='ctx'> 		return -ENOKEY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = nvdimm-&gt;sec.ops-&gt;change_key(nvdimm, key ? key_data(key) : NULL,</div><div class='del'>-			key_data(newkey), pass_type);</div><div class='add'>+	rc = nvdimm-&gt;sec.ops-&gt;change_key(nvdimm, data, newdata, pass_type);</div><div class='ctx'> 	dev_dbg(dev, "key: %d %d update%s: %s\n",</div><div class='ctx'> 			key_serial(key), key_serial(newkey),</div><div class='ctx'> 			pass_type == NVDIMM_MASTER ? "(master)" : "(user)",</div><div class='hunk'>@@ -286,8 +314,9 @@ int nvdimm_security_erase(struct nvdimm *nvdimm, unsigned int keyid,</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;nvdimm-&gt;dev;</div><div class='ctx'> 	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);</div><div class='del'>-	struct key *key;</div><div class='add'>+	struct key *key = NULL;</div><div class='ctx'> 	int rc;</div><div class='add'>+	const void *data;</div><div class='ctx'> </div><div class='ctx'> 	/* The bus lock should be held at the top level of the call stack */</div><div class='ctx'> 	lockdep_assert_held(&amp;nvdimm_bus-&gt;reconfig_mutex);</div><div class='hunk'>@@ -319,11 +348,12 @@ int nvdimm_security_erase(struct nvdimm *nvdimm, unsigned int keyid,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = nvdimm_lookup_user_key(nvdimm, keyid, NVDIMM_BASE_KEY);</div><div class='del'>-	if (!key)</div><div class='add'>+	data = nvdimm_get_user_key_payload(nvdimm, keyid,</div><div class='add'>+			NVDIMM_BASE_KEY, &amp;key);</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return -ENOKEY;</div><div class='ctx'> </div><div class='del'>-	rc = nvdimm-&gt;sec.ops-&gt;erase(nvdimm, key_data(key), pass_type);</div><div class='add'>+	rc = nvdimm-&gt;sec.ops-&gt;erase(nvdimm, data, pass_type);</div><div class='ctx'> 	dev_dbg(dev, "key: %d erase%s: %s\n", key_serial(key),</div><div class='ctx'> 			pass_type == NVDIMM_MASTER ? "(master)" : "(user)",</div><div class='ctx'> 			rc == 0 ? "success" : "fail");</div><div class='hunk'>@@ -337,8 +367,9 @@ int nvdimm_security_overwrite(struct nvdimm *nvdimm, unsigned int keyid)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;nvdimm-&gt;dev;</div><div class='ctx'> 	struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);</div><div class='del'>-	struct key *key;</div><div class='add'>+	struct key *key = NULL;</div><div class='ctx'> 	int rc;</div><div class='add'>+	const void *data;</div><div class='ctx'> </div><div class='ctx'> 	/* The bus lock should be held at the top level of the call stack */</div><div class='ctx'> 	lockdep_assert_held(&amp;nvdimm_bus-&gt;reconfig_mutex);</div><div class='hunk'>@@ -368,15 +399,12 @@ int nvdimm_security_overwrite(struct nvdimm *nvdimm, unsigned int keyid)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (keyid == 0)</div><div class='del'>-		key = NULL;</div><div class='del'>-	else {</div><div class='del'>-		key = nvdimm_lookup_user_key(nvdimm, keyid, NVDIMM_BASE_KEY);</div><div class='del'>-		if (!key)</div><div class='del'>-			return -ENOKEY;</div><div class='del'>-	}</div><div class='add'>+	data = nvdimm_get_user_key_payload(nvdimm, keyid,</div><div class='add'>+			NVDIMM_BASE_KEY, &amp;key);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOKEY;</div><div class='ctx'> </div><div class='del'>-	rc = nvdimm-&gt;sec.ops-&gt;overwrite(nvdimm, key ? key_data(key) : NULL);</div><div class='add'>+	rc = nvdimm-&gt;sec.ops-&gt;overwrite(nvdimm, data);</div><div class='ctx'> 	dev_dbg(dev, "key: %d overwrite submission: %s\n", key_serial(key),</div><div class='ctx'> 			rc == 0 ? "success" : "fail");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c<br/>index 470601980794..a6644a2c3ef7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/core.c</a></div><div class='hunk'>@@ -288,7 +288,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)</div><div class='ctx'> 				"Cancelling I/O %d", req-&gt;tag);</div><div class='ctx'> </div><div class='ctx'> 	nvme_req(req)-&gt;status = NVME_SC_ABORT_REQ;</div><div class='del'>-	blk_mq_complete_request(req);</div><div class='add'>+	blk_mq_complete_request_sync(req);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nvme_cancel_request);</div><div class='hunk'>@@ -388,7 +388,7 @@ static void nvme_free_ns_head(struct kref *ref)</div><div class='ctx'> 	nvme_mpath_remove_disk(head);</div><div class='ctx'> 	ida_simple_remove(&amp;head-&gt;subsys-&gt;ns_ida, head-&gt;instance);</div><div class='ctx'> 	list_del_init(&amp;head-&gt;entry);</div><div class='del'>-	cleanup_srcu_struct_quiesced(&amp;head-&gt;srcu);</div><div class='add'>+	cleanup_srcu_struct(&amp;head-&gt;srcu);</div><div class='ctx'> 	nvme_put_subsystem(head-&gt;subsys);</div><div class='ctx'> 	kfree(head);</div><div class='ctx'> }</div><div class='hunk'>@@ -1105,7 +1105,7 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,</div><div class='ctx'> </div><div class='ctx'> 	error = nvme_submit_sync_cmd(ctrl-&gt;admin_q, &amp;c, id, sizeof(*id));</div><div class='ctx'> 	if (error) {</div><div class='del'>-		dev_warn(ctrl-&gt;device, "Identify namespace failed\n");</div><div class='add'>+		dev_warn(ctrl-&gt;device, "Identify namespace failed (%d)\n", error);</div><div class='ctx'> 		kfree(id);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1588,9 +1588,13 @@ static bool nvme_ns_ids_equal(struct nvme_ns_ids *a, struct nvme_ns_ids *b)</div><div class='ctx'> static void nvme_update_disk_info(struct gendisk *disk,</div><div class='ctx'> 		struct nvme_ns *ns, struct nvme_id_ns *id)</div><div class='ctx'> {</div><div class='del'>-	sector_t capacity = le64_to_cpup(&amp;id-&gt;nsze) &lt;&lt; (ns-&gt;lba_shift - 9);</div><div class='add'>+	sector_t capacity = le64_to_cpu(id-&gt;nsze) &lt;&lt; (ns-&gt;lba_shift - 9);</div><div class='ctx'> 	unsigned short bs = 1 &lt;&lt; ns-&gt;lba_shift;</div><div class='ctx'> </div><div class='add'>+	if (ns-&gt;lba_shift &gt; PAGE_SHIFT) {</div><div class='add'>+		/* unsupported block size, set capacity to 0 later */</div><div class='add'>+		bs = (1 &lt;&lt; 9);</div><div class='add'>+	}</div><div class='ctx'> 	blk_mq_freeze_queue(disk-&gt;queue);</div><div class='ctx'> 	blk_integrity_unregister(disk);</div><div class='ctx'> </div><div class='hunk'>@@ -1601,7 +1605,8 @@ static void nvme_update_disk_info(struct gendisk *disk,</div><div class='ctx'> 	if (ns-&gt;ms &amp;&amp; !ns-&gt;ext &amp;&amp;</div><div class='ctx'> 	    (ns-&gt;ctrl-&gt;ops-&gt;flags &amp; NVME_F_METADATA_SUPPORTED))</div><div class='ctx'> 		nvme_init_integrity(disk, ns-&gt;ms, ns-&gt;pi_type);</div><div class='del'>-	if (ns-&gt;ms &amp;&amp; !nvme_ns_has_pi(ns) &amp;&amp; !blk_get_integrity(disk))</div><div class='add'>+	if ((ns-&gt;ms &amp;&amp; !nvme_ns_has_pi(ns) &amp;&amp; !blk_get_integrity(disk)) ||</div><div class='add'>+	    ns-&gt;lba_shift &gt; PAGE_SHIFT)</div><div class='ctx'> 		capacity = 0;</div><div class='ctx'> </div><div class='ctx'> 	set_capacity(disk, capacity);</div><div class='hunk'>@@ -2549,7 +2554,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)</div><div class='ctx'> 	ctrl-&gt;crdt[2] = le16_to_cpu(id-&gt;crdt3);</div><div class='ctx'> </div><div class='ctx'> 	ctrl-&gt;oacs = le16_to_cpu(id-&gt;oacs);</div><div class='del'>-	ctrl-&gt;oncs = le16_to_cpup(&amp;id-&gt;oncs);</div><div class='add'>+	ctrl-&gt;oncs = le16_to_cpu(id-&gt;oncs);</div><div class='ctx'> 	ctrl-&gt;oaes = le32_to_cpu(id-&gt;oaes);</div><div class='ctx'> 	atomic_set(&amp;ctrl-&gt;abort_limit, id-&gt;acl + 1);</div><div class='ctx'> 	ctrl-&gt;vwc = id-&gt;vwc;</div><div class='hunk'>@@ -3874,10 +3879,37 @@ void nvme_start_queues(struct nvme_ctrl *ctrl)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nvme_start_queues);</div><div class='ctx'> </div><div class='del'>-int __init nvme_core_init(void)</div><div class='add'>+/*</div><div class='add'>+ * Check we didn't inadvertently grow the command structure sizes:</div><div class='add'>+ */</div><div class='add'>+static inline void _nvme_check_size(void)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_common_command) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_rw_command) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_identify) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_features) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_download_firmware) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_format_cmd) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_dsm_cmd) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_write_zeroes_cmd) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_abort_cmd) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_get_log_page_command) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_command) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_id_ctrl) != NVME_IDENTIFY_DATA_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_id_ns) != NVME_IDENTIFY_DATA_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_lba_range_type) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_smart_log) != 512);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_dbbuf) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_directive_cmd) != 64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init nvme_core_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	_nvme_check_size();</div><div class='add'>+</div><div class='ctx'> 	nvme_wq = alloc_workqueue("nvme-wq",</div><div class='ctx'> 			WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_SYSFS, 0);</div><div class='ctx'> 	if (!nvme_wq)</div><div class='hunk'>@@ -3924,7 +3956,7 @@ out:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit nvme_core_exit(void)</div><div class='add'>+static void __exit nvme_core_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	ida_destroy(&amp;nvme_subsystems_ida);</div><div class='ctx'> 	class_destroy(nvme_subsys_class);</div><div class='head'>diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c<br/>index d4cb826f58ff..592d1e61ef7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/fabrics.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/fabrics.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/fabrics.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/fabrics.c</a></div><div class='hunk'>@@ -1188,6 +1188,7 @@ static void __exit nvmf_exit(void)</div><div class='ctx'> 	class_destroy(nvmf_class);</div><div class='ctx'> 	nvmf_host_put(nvmf_default_host);</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvmf_common_command) != 64);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct nvmf_connect_command) != 64);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct nvmf_property_get_command) != 64);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct nvmf_property_set_command) != 64);</div><div class='head'>diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c<br/>index f3b9d91ba0df..9544eb60f725 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/fc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/fc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/fc.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include "fabrics.h"</div><div class='ctx'> #include &lt;linux/nvme-fc-driver.h&gt;</div><div class='ctx'> #include &lt;linux/nvme-fc.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;scsi/scsi_transport_fc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* *************************** Data Structures/Defines ****************** */</div><div class='ctx'> </div><div class='hunk'>@@ -1845,7 +1845,7 @@ nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx)</div><div class='ctx'> 	memset(queue, 0, sizeof(*queue));</div><div class='ctx'> 	queue-&gt;ctrl = ctrl;</div><div class='ctx'> 	queue-&gt;qnum = idx;</div><div class='del'>-	atomic_set(&amp;queue-&gt;csn, 1);</div><div class='add'>+	atomic_set(&amp;queue-&gt;csn, 0);</div><div class='ctx'> 	queue-&gt;dev = ctrl-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (idx &gt; 0)</div><div class='hunk'>@@ -1887,7 +1887,7 @@ nvme_fc_free_queue(struct nvme_fc_queue *queue)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	queue-&gt;connection_id = 0;</div><div class='del'>-	atomic_set(&amp;queue-&gt;csn, 1);</div><div class='add'>+	atomic_set(&amp;queue-&gt;csn, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2183,7 +2183,6 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_fc_cmd_iu *cmdiu = &amp;op-&gt;cmd_iu;</div><div class='ctx'> 	struct nvme_command *sqe = &amp;cmdiu-&gt;sqe;</div><div class='del'>-	u32 csn;</div><div class='ctx'> 	int ret, opstate;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2198,8 +2197,6 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,</div><div class='ctx'> </div><div class='ctx'> 	/* format the FC-NVME CMD IU and fcp_req */</div><div class='ctx'> 	cmdiu-&gt;connection_id = cpu_to_be64(queue-&gt;connection_id);</div><div class='del'>-	csn = atomic_inc_return(&amp;queue-&gt;csn);</div><div class='del'>-	cmdiu-&gt;csn = cpu_to_be32(csn);</div><div class='ctx'> 	cmdiu-&gt;data_len = cpu_to_be32(data_len);</div><div class='ctx'> 	switch (io_dir) {</div><div class='ctx'> 	case NVMEFC_FCP_WRITE:</div><div class='hunk'>@@ -2257,11 +2254,24 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,</div><div class='ctx'> 	if (!(op-&gt;flags &amp; FCOP_FLAGS_AEN))</div><div class='ctx'> 		blk_mq_start_request(op-&gt;rq);</div><div class='ctx'> </div><div class='add'>+	cmdiu-&gt;csn = cpu_to_be32(atomic_inc_return(&amp;queue-&gt;csn));</div><div class='ctx'> 	ret = ctrl-&gt;lport-&gt;ops-&gt;fcp_io(&amp;ctrl-&gt;lport-&gt;localport,</div><div class='ctx'> 					&amp;ctrl-&gt;rport-&gt;remoteport,</div><div class='ctx'> 					queue-&gt;lldd_handle, &amp;op-&gt;fcp_req);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the lld fails to send the command is there an issue with</div><div class='add'>+		 * the csn value?  If the command that fails is the Connect,</div><div class='add'>+		 * no - as the connection won't be live.  If it is a command</div><div class='add'>+		 * post-connect, it's possible a gap in csn may be created.</div><div class='add'>+		 * Does this matter?  As Linux initiators don't send fused</div><div class='add'>+		 * commands, no.  The gap would exist, but as there's nothing</div><div class='add'>+		 * that depends on csn order to be delivered on the target</div><div class='add'>+		 * side, it shouldn't hurt.  It would be difficult for a</div><div class='add'>+		 * target to even detect the csn gap as it has no idea when the</div><div class='add'>+		 * cmd with the csn was supposed to arrive.</div><div class='add'>+		 */</div><div class='ctx'> 		opstate = atomic_xchg(&amp;op-&gt;state, FCPOP_STATE_COMPLETE);</div><div class='ctx'> 		__nvme_fc_fcpop_chk_teardowns(ctrl, op, opstate);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c<br/>index 2839bb70badf..5c9429d41120 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/multipath.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/multipath.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/multipath.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/multipath.c</a></div><div class='hunk'>@@ -232,6 +232,14 @@ static blk_qc_t nvme_ns_head_make_request(struct request_queue *q,</div><div class='ctx'> 	blk_qc_t ret = BLK_QC_T_NONE;</div><div class='ctx'> 	int srcu_idx;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The namespace might be going away and the bio might</div><div class='add'>+	 * be moved to a different queue via blk_steal_bios(),</div><div class='add'>+	 * so we need to use the bio_split pool from the original</div><div class='add'>+	 * queue to allocate the bvecs from.</div><div class='add'>+	 */</div><div class='add'>+	blk_queue_split(q, &amp;bio);</div><div class='add'>+</div><div class='ctx'> 	srcu_idx = srcu_read_lock(&amp;head-&gt;srcu);</div><div class='ctx'> 	ns = nvme_find_path(head);</div><div class='ctx'> 	if (likely(ns)) {</div><div class='hunk'>@@ -404,15 +412,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)</div><div class='ctx'> static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc,</div><div class='ctx'> 		struct nvme_ns *ns)</div><div class='ctx'> {</div><div class='del'>-	enum nvme_ana_state old;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;ns-&gt;head-&gt;lock);</div><div class='del'>-	old = ns-&gt;ana_state;</div><div class='ctx'> 	ns-&gt;ana_grpid = le32_to_cpu(desc-&gt;grpid);</div><div class='ctx'> 	ns-&gt;ana_state = desc-&gt;state;</div><div class='ctx'> 	clear_bit(NVME_NS_ANA_PENDING, &amp;ns-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (nvme_state_is_live(ns-&gt;ana_state) &amp;&amp; !nvme_state_is_live(old))</div><div class='add'>+	if (nvme_state_is_live(ns-&gt;ana_state))</div><div class='ctx'> 		nvme_mpath_set_live(ns);</div><div class='ctx'> 	mutex_unlock(&amp;ns-&gt;head-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -424,7 +429,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,</div><div class='ctx'> 	unsigned *nr_change_groups = data;</div><div class='ctx'> 	struct nvme_ns *ns;</div><div class='ctx'> </div><div class='del'>-	dev_info(ctrl-&gt;device, "ANA group %d: %s.\n",</div><div class='add'>+	dev_dbg(ctrl-&gt;device, "ANA group %d: %s.\n",</div><div class='ctx'> 			le32_to_cpu(desc-&gt;grpid),</div><div class='ctx'> 			nvme_ana_state_names[desc-&gt;state]);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h<br/>index 527d64545023..5ee75b5ff83f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/nvme.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/nvme.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/nvme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/nvme.h</a></div><div class='hunk'>@@ -577,7 +577,4 @@ static inline struct nvme_ns *nvme_get_ns_from_dev(struct device *dev)</div><div class='ctx'> 	return dev_to_disk(dev)-&gt;private_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init nvme_core_init(void);</div><div class='del'>-void __exit nvme_core_exit(void);</div><div class='del'>-</div><div class='ctx'> #endif /* _NVME_H */</div><div class='head'>diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c<br/>index a90cf5d63aac..3e4fb891a95a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/pci.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static int io_queue_depth_set(const char *val, const struct kernel_param *kp)</div><div class='ctx'> </div><div class='ctx'> static int queue_count_set(const char *val, const struct kernel_param *kp)</div><div class='ctx'> {</div><div class='del'>-	int n = 0, ret;</div><div class='add'>+	int n, ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = kstrtoint(val, 10, &amp;n);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -177,7 +177,6 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl)</div><div class='ctx'>  * commands and one for I/O commands).</div><div class='ctx'>  */</div><div class='ctx'> struct nvme_queue {</div><div class='del'>-	struct device *q_dmadev;</div><div class='ctx'> 	struct nvme_dev *dev;</div><div class='ctx'> 	spinlock_t sq_lock;</div><div class='ctx'> 	struct nvme_command *sq_cmds;</div><div class='hunk'>@@ -189,7 +188,7 @@ struct nvme_queue {</div><div class='ctx'> 	dma_addr_t cq_dma_addr;</div><div class='ctx'> 	u32 __iomem *q_db;</div><div class='ctx'> 	u16 q_depth;</div><div class='del'>-	s16 cq_vector;</div><div class='add'>+	u16 cq_vector;</div><div class='ctx'> 	u16 sq_tail;</div><div class='ctx'> 	u16 last_sq_tail;</div><div class='ctx'> 	u16 cq_head;</div><div class='hunk'>@@ -200,6 +199,7 @@ struct nvme_queue {</div><div class='ctx'> #define NVMEQ_ENABLED		0</div><div class='ctx'> #define NVMEQ_SQ_CMB		1</div><div class='ctx'> #define NVMEQ_DELETE_ERROR	2</div><div class='add'>+#define NVMEQ_POLLED		3</div><div class='ctx'> 	u32 *dbbuf_sq_db;</div><div class='ctx'> 	u32 *dbbuf_cq_db;</div><div class='ctx'> 	u32 *dbbuf_sq_ei;</div><div class='hunk'>@@ -208,10 +208,10 @@ struct nvme_queue {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The nvme_iod describes the data in an I/O, including the list of PRP</div><div class='del'>- * entries.  You can't see it in this data structure because C doesn't let</div><div class='del'>- * me express that.  Use nvme_init_iod to ensure there's enough space</div><div class='del'>- * allocated to store the PRP list.</div><div class='add'>+ * The nvme_iod describes the data in an I/O.</div><div class='add'>+ *</div><div class='add'>+ * The sg pointer contains the list of PRP/SGL chunk allocations in addition</div><div class='add'>+ * to the actual struct scatterlist.</div><div class='ctx'>  */</div><div class='ctx'> struct nvme_iod {</div><div class='ctx'> 	struct nvme_request req;</div><div class='hunk'>@@ -220,33 +220,12 @@ struct nvme_iod {</div><div class='ctx'> 	int aborted;</div><div class='ctx'> 	int npages;		/* In the PRP list. 0 means small pool in use */</div><div class='ctx'> 	int nents;		/* Used in scatterlist */</div><div class='del'>-	int length;		/* Of data, in bytes */</div><div class='ctx'> 	dma_addr_t first_dma;</div><div class='del'>-	struct scatterlist meta_sg; /* metadata requires single contiguous buffer */</div><div class='add'>+	unsigned int dma_len;	/* length of single DMA segment mapping */</div><div class='add'>+	dma_addr_t meta_dma;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='del'>-	struct scatterlist inline_sg[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check we didin't inadvertently grow the command struct</div><div class='del'>- */</div><div class='del'>-static inline void _nvme_check_size(void)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_rw_command) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_create_cq) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_create_sq) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_delete_queue) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_features) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_format_cmd) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_abort_cmd) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_command) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_id_ctrl) != NVME_IDENTIFY_DATA_SIZE);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_id_ns) != NVME_IDENTIFY_DATA_SIZE);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_lba_range_type) != 64);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_smart_log) != 512);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct nvme_dbbuf) != 64);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned int max_io_queues(void)</div><div class='ctx'> {</div><div class='ctx'> 	return num_possible_cpus() + write_queues + poll_queues;</div><div class='hunk'>@@ -372,12 +351,6 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Max size of iod being embedded in the request payload</div><div class='del'>- */</div><div class='del'>-#define NVME_INT_PAGES		2</div><div class='del'>-#define NVME_INT_BYTES(dev)	(NVME_INT_PAGES * (dev)-&gt;ctrl.page_size)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Will slightly overestimate the number of pages needed.  This is OK</div><div class='ctx'>  * as it only leads to a small amount of wasted memory for the lifetime of</div><div class='ctx'>  * the I/O.</div><div class='hunk'>@@ -411,15 +384,6 @@ static unsigned int nvme_pci_iod_alloc_size(struct nvme_dev *dev,</div><div class='ctx'> 	return alloc_size + sizeof(struct scatterlist) * nseg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int nvme_pci_cmd_size(struct nvme_dev *dev, bool use_sgl)</div><div class='del'>-{</div><div class='del'>-	unsigned int alloc_size = nvme_pci_iod_alloc_size(dev,</div><div class='del'>-				    NVME_INT_BYTES(dev), NVME_INT_PAGES,</div><div class='del'>-				    use_sgl);</div><div class='del'>-</div><div class='del'>-	return sizeof(struct nvme_iod) + alloc_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,</div><div class='ctx'> 				unsigned int hctx_idx)</div><div class='ctx'> {</div><div class='hunk'>@@ -584,37 +548,26 @@ static inline bool nvme_pci_use_sgls(struct nvme_dev *dev, struct request *req)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static blk_status_t nvme_init_iod(struct request *rq, struct nvme_dev *dev)</div><div class='add'>+static void nvme_unmap_data(struct nvme_dev *dev, struct request *req)</div><div class='ctx'> {</div><div class='del'>-	struct nvme_iod *iod = blk_mq_rq_to_pdu(rq);</div><div class='del'>-	int nseg = blk_rq_nr_phys_segments(rq);</div><div class='del'>-	unsigned int size = blk_rq_payload_bytes(rq);</div><div class='del'>-</div><div class='del'>-	iod-&gt;use_sgl = nvme_pci_use_sgls(dev, rq);</div><div class='add'>+	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='add'>+	enum dma_data_direction dma_dir = rq_data_dir(req) ?</div><div class='add'>+			DMA_TO_DEVICE : DMA_FROM_DEVICE;</div><div class='add'>+	const int last_prp = dev-&gt;ctrl.page_size / sizeof(__le64) - 1;</div><div class='add'>+	dma_addr_t dma_addr = iod-&gt;first_dma, next_dma_addr;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (nseg &gt; NVME_INT_PAGES || size &gt; NVME_INT_BYTES(dev)) {</div><div class='del'>-		iod-&gt;sg = mempool_alloc(dev-&gt;iod_mempool, GFP_ATOMIC);</div><div class='del'>-		if (!iod-&gt;sg)</div><div class='del'>-			return BLK_STS_RESOURCE;</div><div class='del'>-	} else {</div><div class='del'>-		iod-&gt;sg = iod-&gt;inline_sg;</div><div class='add'>+	if (iod-&gt;dma_len) {</div><div class='add'>+		dma_unmap_page(dev-&gt;dev, dma_addr, iod-&gt;dma_len, dma_dir);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iod-&gt;aborted = 0;</div><div class='del'>-	iod-&gt;npages = -1;</div><div class='del'>-	iod-&gt;nents = 0;</div><div class='del'>-	iod-&gt;length = size;</div><div class='del'>-</div><div class='del'>-	return BLK_STS_OK;</div><div class='del'>-}</div><div class='add'>+	WARN_ON_ONCE(!iod-&gt;nents);</div><div class='ctx'> </div><div class='del'>-static void nvme_free_iod(struct nvme_dev *dev, struct request *req)</div><div class='del'>-{</div><div class='del'>-	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='del'>-	const int last_prp = dev-&gt;ctrl.page_size / sizeof(__le64) - 1;</div><div class='del'>-	dma_addr_t dma_addr = iod-&gt;first_dma, next_dma_addr;</div><div class='add'>+	/* P2PDMA requests do not need to be unmapped */</div><div class='add'>+	if (!is_pci_p2pdma_page(sg_page(iod-&gt;sg)))</div><div class='add'>+		dma_unmap_sg(dev-&gt;dev, iod-&gt;sg, iod-&gt;nents, rq_dma_dir(req));</div><div class='ctx'> </div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (iod-&gt;npages == 0)</div><div class='ctx'> 		dma_pool_free(dev-&gt;prp_small_pool, nvme_pci_iod_list(req)[0],</div><div class='hunk'>@@ -638,8 +591,7 @@ static void nvme_free_iod(struct nvme_dev *dev, struct request *req)</div><div class='ctx'> 		dma_addr = next_dma_addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iod-&gt;sg != iod-&gt;inline_sg)</div><div class='del'>-		mempool_free(iod-&gt;sg, dev-&gt;iod_mempool);</div><div class='add'>+	mempool_free(iod-&gt;sg, dev-&gt;iod_mempool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nvme_print_sgl(struct scatterlist *sgl, int nents)</div><div class='hunk'>@@ -829,80 +781,104 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev,</div><div class='ctx'> 	return BLK_STS_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static blk_status_t nvme_setup_prp_simple(struct nvme_dev *dev,</div><div class='add'>+		struct request *req, struct nvme_rw_command *cmnd,</div><div class='add'>+		struct bio_vec *bv)</div><div class='add'>+{</div><div class='add'>+	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='add'>+	unsigned int first_prp_len = dev-&gt;ctrl.page_size - bv-&gt;bv_offset;</div><div class='add'>+</div><div class='add'>+	iod-&gt;first_dma = dma_map_bvec(dev-&gt;dev, bv, rq_dma_dir(req), 0);</div><div class='add'>+	if (dma_mapping_error(dev-&gt;dev, iod-&gt;first_dma))</div><div class='add'>+		return BLK_STS_RESOURCE;</div><div class='add'>+	iod-&gt;dma_len = bv-&gt;bv_len;</div><div class='add'>+</div><div class='add'>+	cmnd-&gt;dptr.prp1 = cpu_to_le64(iod-&gt;first_dma);</div><div class='add'>+	if (bv-&gt;bv_len &gt; first_prp_len)</div><div class='add'>+		cmnd-&gt;dptr.prp2 = cpu_to_le64(iod-&gt;first_dma + first_prp_len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static blk_status_t nvme_setup_sgl_simple(struct nvme_dev *dev,</div><div class='add'>+		struct request *req, struct nvme_rw_command *cmnd,</div><div class='add'>+		struct bio_vec *bv)</div><div class='add'>+{</div><div class='add'>+	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='add'>+</div><div class='add'>+	iod-&gt;first_dma = dma_map_bvec(dev-&gt;dev, bv, rq_dma_dir(req), 0);</div><div class='add'>+	if (dma_mapping_error(dev-&gt;dev, iod-&gt;first_dma))</div><div class='add'>+		return BLK_STS_RESOURCE;</div><div class='add'>+	iod-&gt;dma_len = bv-&gt;bv_len;</div><div class='add'>+</div><div class='add'>+	cmnd-&gt;flags = NVME_CMD_SGL_METABUF;</div><div class='add'>+	cmnd-&gt;dptr.sgl.addr = cpu_to_le64(iod-&gt;first_dma);</div><div class='add'>+	cmnd-&gt;dptr.sgl.length = cpu_to_le32(iod-&gt;dma_len);</div><div class='add'>+	cmnd-&gt;dptr.sgl.type = NVME_SGL_FMT_DATA_DESC &lt;&lt; 4;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,</div><div class='ctx'> 		struct nvme_command *cmnd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='del'>-	struct request_queue *q = req-&gt;q;</div><div class='del'>-	enum dma_data_direction dma_dir = rq_data_dir(req) ?</div><div class='del'>-			DMA_TO_DEVICE : DMA_FROM_DEVICE;</div><div class='del'>-	blk_status_t ret = BLK_STS_IOERR;</div><div class='add'>+	blk_status_t ret = BLK_STS_RESOURCE;</div><div class='ctx'> 	int nr_mapped;</div><div class='ctx'> </div><div class='add'>+	if (blk_rq_nr_phys_segments(req) == 1) {</div><div class='add'>+		struct bio_vec bv = req_bvec(req);</div><div class='add'>+</div><div class='add'>+		if (!is_pci_p2pdma_page(bv.bv_page)) {</div><div class='add'>+			if (bv.bv_offset + bv.bv_len &lt;= dev-&gt;ctrl.page_size * 2)</div><div class='add'>+				return nvme_setup_prp_simple(dev, req,</div><div class='add'>+							     &amp;cmnd-&gt;rw, &amp;bv);</div><div class='add'>+</div><div class='add'>+			if (iod-&gt;nvmeq-&gt;qid &amp;&amp;</div><div class='add'>+			    dev-&gt;ctrl.sgls &amp; ((1 &lt;&lt; 0) | (1 &lt;&lt; 1)))</div><div class='add'>+				return nvme_setup_sgl_simple(dev, req,</div><div class='add'>+							     &amp;cmnd-&gt;rw, &amp;bv);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iod-&gt;dma_len = 0;</div><div class='add'>+	iod-&gt;sg = mempool_alloc(dev-&gt;iod_mempool, GFP_ATOMIC);</div><div class='add'>+	if (!iod-&gt;sg)</div><div class='add'>+		return BLK_STS_RESOURCE;</div><div class='ctx'> 	sg_init_table(iod-&gt;sg, blk_rq_nr_phys_segments(req));</div><div class='del'>-	iod-&gt;nents = blk_rq_map_sg(q, req, iod-&gt;sg);</div><div class='add'>+	iod-&gt;nents = blk_rq_map_sg(req-&gt;q, req, iod-&gt;sg);</div><div class='ctx'> 	if (!iod-&gt;nents)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = BLK_STS_RESOURCE;</div><div class='del'>-</div><div class='ctx'> 	if (is_pci_p2pdma_page(sg_page(iod-&gt;sg)))</div><div class='ctx'> 		nr_mapped = pci_p2pdma_map_sg(dev-&gt;dev, iod-&gt;sg, iod-&gt;nents,</div><div class='del'>-					  dma_dir);</div><div class='add'>+					      rq_dma_dir(req));</div><div class='ctx'> 	else</div><div class='ctx'> 		nr_mapped = dma_map_sg_attrs(dev-&gt;dev, iod-&gt;sg, iod-&gt;nents,</div><div class='del'>-					     dma_dir,  DMA_ATTR_NO_WARN);</div><div class='add'>+					     rq_dma_dir(req), DMA_ATTR_NO_WARN);</div><div class='ctx'> 	if (!nr_mapped)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	iod-&gt;use_sgl = nvme_pci_use_sgls(dev, req);</div><div class='ctx'> 	if (iod-&gt;use_sgl)</div><div class='ctx'> 		ret = nvme_pci_setup_sgls(dev, req, &amp;cmnd-&gt;rw, nr_mapped);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = nvme_pci_setup_prps(dev, req, &amp;cmnd-&gt;rw);</div><div class='del'>-</div><div class='del'>-	if (ret != BLK_STS_OK)</div><div class='del'>-		goto out_unmap;</div><div class='del'>-</div><div class='del'>-	ret = BLK_STS_IOERR;</div><div class='del'>-	if (blk_integrity_rq(req)) {</div><div class='del'>-		if (blk_rq_count_integrity_sg(q, req-&gt;bio) != 1)</div><div class='del'>-			goto out_unmap;</div><div class='del'>-</div><div class='del'>-		sg_init_table(&amp;iod-&gt;meta_sg, 1);</div><div class='del'>-		if (blk_rq_map_integrity_sg(q, req-&gt;bio, &amp;iod-&gt;meta_sg) != 1)</div><div class='del'>-			goto out_unmap;</div><div class='del'>-</div><div class='del'>-		if (!dma_map_sg(dev-&gt;dev, &amp;iod-&gt;meta_sg, 1, dma_dir))</div><div class='del'>-			goto out_unmap;</div><div class='del'>-</div><div class='del'>-		cmnd-&gt;rw.metadata = cpu_to_le64(sg_dma_address(&amp;iod-&gt;meta_sg));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return BLK_STS_OK;</div><div class='del'>-</div><div class='del'>-out_unmap:</div><div class='del'>-	dma_unmap_sg(dev-&gt;dev, iod-&gt;sg, iod-&gt;nents, dma_dir);</div><div class='ctx'> out:</div><div class='add'>+	if (ret != BLK_STS_OK)</div><div class='add'>+		nvme_unmap_data(dev, req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nvme_unmap_data(struct nvme_dev *dev, struct request *req)</div><div class='add'>+static blk_status_t nvme_map_metadata(struct nvme_dev *dev, struct request *req,</div><div class='add'>+		struct nvme_command *cmnd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='del'>-	enum dma_data_direction dma_dir = rq_data_dir(req) ?</div><div class='del'>-			DMA_TO_DEVICE : DMA_FROM_DEVICE;</div><div class='del'>-</div><div class='del'>-	if (iod-&gt;nents) {</div><div class='del'>-		/* P2PDMA requests do not need to be unmapped */</div><div class='del'>-		if (!is_pci_p2pdma_page(sg_page(iod-&gt;sg)))</div><div class='del'>-			dma_unmap_sg(dev-&gt;dev, iod-&gt;sg, iod-&gt;nents, dma_dir);</div><div class='del'>-</div><div class='del'>-		if (blk_integrity_rq(req))</div><div class='del'>-			dma_unmap_sg(dev-&gt;dev, &amp;iod-&gt;meta_sg, 1, dma_dir);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	nvme_cleanup_cmd(req);</div><div class='del'>-	nvme_free_iod(dev, req);</div><div class='add'>+	iod-&gt;meta_dma = dma_map_bvec(dev-&gt;dev, rq_integrity_vec(req),</div><div class='add'>+			rq_dma_dir(req), 0);</div><div class='add'>+	if (dma_mapping_error(dev-&gt;dev, iod-&gt;meta_dma))</div><div class='add'>+		return BLK_STS_IOERR;</div><div class='add'>+	cmnd-&gt;rw.metadata = cpu_to_le64(iod-&gt;meta_dma);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -915,9 +891,14 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	struct nvme_queue *nvmeq = hctx-&gt;driver_data;</div><div class='ctx'> 	struct nvme_dev *dev = nvmeq-&gt;dev;</div><div class='ctx'> 	struct request *req = bd-&gt;rq;</div><div class='add'>+	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='ctx'> 	struct nvme_command cmnd;</div><div class='ctx'> 	blk_status_t ret;</div><div class='ctx'> </div><div class='add'>+	iod-&gt;aborted = 0;</div><div class='add'>+	iod-&gt;npages = -1;</div><div class='add'>+	iod-&gt;nents = 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We should not need to do this, but we're still using this to</div><div class='ctx'> 	 * ensure we can drain requests on a dying queue.</div><div class='hunk'>@@ -929,21 +910,23 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = nvme_init_iod(req, dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_free_cmd;</div><div class='del'>-</div><div class='ctx'> 	if (blk_rq_nr_phys_segments(req)) {</div><div class='ctx'> 		ret = nvme_map_data(dev, req, &amp;cmnd);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out_cleanup_iod;</div><div class='add'>+			goto out_free_cmd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (blk_integrity_rq(req)) {</div><div class='add'>+		ret = nvme_map_metadata(dev, req, &amp;cmnd);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unmap_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_start_request(req);</div><div class='ctx'> 	nvme_submit_cmd(nvmeq, &amp;cmnd, bd-&gt;last);</div><div class='ctx'> 	return BLK_STS_OK;</div><div class='del'>-out_cleanup_iod:</div><div class='del'>-	nvme_free_iod(dev, req);</div><div class='add'>+out_unmap_data:</div><div class='add'>+	nvme_unmap_data(dev, req);</div><div class='ctx'> out_free_cmd:</div><div class='ctx'> 	nvme_cleanup_cmd(req);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -952,8 +935,14 @@ out_free_cmd:</div><div class='ctx'> static void nvme_pci_complete_rq(struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);</div><div class='add'>+	struct nvme_dev *dev = iod-&gt;nvmeq-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	nvme_unmap_data(iod-&gt;nvmeq-&gt;dev, req);</div><div class='add'>+	nvme_cleanup_cmd(req);</div><div class='add'>+	if (blk_integrity_rq(req))</div><div class='add'>+		dma_unmap_page(dev-&gt;dev, iod-&gt;meta_dma,</div><div class='add'>+			       rq_integrity_vec(req)-&gt;bv_len, rq_data_dir(req));</div><div class='add'>+	if (blk_rq_nr_phys_segments(req))</div><div class='add'>+		nvme_unmap_data(dev, req);</div><div class='ctx'> 	nvme_complete_rq(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1088,7 +1077,7 @@ static int nvme_poll_irqdisable(struct nvme_queue *nvmeq, unsigned int tag)</div><div class='ctx'> 	 * using the CQ lock.  For normal interrupt driven threads we have</div><div class='ctx'> 	 * to disable the interrupt to avoid racing with it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (nvmeq-&gt;cq_vector == -1) {</div><div class='add'>+	if (test_bit(NVMEQ_POLLED, &amp;nvmeq-&gt;flags)) {</div><div class='ctx'> 		spin_lock(&amp;nvmeq-&gt;cq_poll_lock);</div><div class='ctx'> 		found = nvme_process_cq(nvmeq, &amp;start, &amp;end, tag);</div><div class='ctx'> 		spin_unlock(&amp;nvmeq-&gt;cq_poll_lock);</div><div class='hunk'>@@ -1148,7 +1137,7 @@ static int adapter_alloc_cq(struct nvme_dev *dev, u16 qid,</div><div class='ctx'> 	struct nvme_command c;</div><div class='ctx'> 	int flags = NVME_QUEUE_PHYS_CONTIG;</div><div class='ctx'> </div><div class='del'>-	if (vector != -1)</div><div class='add'>+	if (!test_bit(NVMEQ_POLLED, &amp;nvmeq-&gt;flags))</div><div class='ctx'> 		flags |= NVME_CQ_IRQ_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1161,10 +1150,7 @@ static int adapter_alloc_cq(struct nvme_dev *dev, u16 qid,</div><div class='ctx'> 	c.create_cq.cqid = cpu_to_le16(qid);</div><div class='ctx'> 	c.create_cq.qsize = cpu_to_le16(nvmeq-&gt;q_depth - 1);</div><div class='ctx'> 	c.create_cq.cq_flags = cpu_to_le16(flags);</div><div class='del'>-	if (vector != -1)</div><div class='del'>-		c.create_cq.irq_vector = cpu_to_le16(vector);</div><div class='del'>-	else</div><div class='del'>-		c.create_cq.irq_vector = 0;</div><div class='add'>+	c.create_cq.irq_vector = cpu_to_le16(vector);</div><div class='ctx'> </div><div class='ctx'> 	return nvme_submit_sync_cmd(dev-&gt;ctrl.admin_q, &amp;c, NULL, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1271,6 +1257,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)</div><div class='ctx'> 	struct nvme_dev *dev = nvmeq-&gt;dev;</div><div class='ctx'> 	struct request *abort_req;</div><div class='ctx'> 	struct nvme_command cmd;</div><div class='add'>+	bool shutdown = false;</div><div class='ctx'> 	u32 csts = readl(dev-&gt;bar + NVME_REG_CSTS);</div><div class='ctx'> </div><div class='ctx'> 	/* If PCI error recovery process is happening, we cannot reset or</div><div class='hunk'>@@ -1307,12 +1294,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)</div><div class='ctx'> 	 * shutdown, so we return BLK_EH_DONE.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (dev-&gt;ctrl.state) {</div><div class='add'>+	case NVME_CTRL_DELETING:</div><div class='add'>+		shutdown = true;</div><div class='ctx'> 	case NVME_CTRL_CONNECTING:</div><div class='ctx'> 	case NVME_CTRL_RESETTING:</div><div class='ctx'> 		dev_warn_ratelimited(dev-&gt;ctrl.device,</div><div class='ctx'> 			 "I/O %d QID %d timeout, disable controller\n",</div><div class='ctx'> 			 req-&gt;tag, nvmeq-&gt;qid);</div><div class='del'>-		nvme_dev_disable(dev, false);</div><div class='add'>+		nvme_dev_disable(dev, shutdown);</div><div class='ctx'> 		nvme_req(req)-&gt;flags |= NVME_REQ_CANCELLED;</div><div class='ctx'> 		return BLK_EH_DONE;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1371,16 +1360,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)</div><div class='ctx'> </div><div class='ctx'> static void nvme_free_queue(struct nvme_queue *nvmeq)</div><div class='ctx'> {</div><div class='del'>-	dma_free_coherent(nvmeq-&gt;q_dmadev, CQ_SIZE(nvmeq-&gt;q_depth),</div><div class='add'>+	dma_free_coherent(nvmeq-&gt;dev-&gt;dev, CQ_SIZE(nvmeq-&gt;q_depth),</div><div class='ctx'> 				(void *)nvmeq-&gt;cqes, nvmeq-&gt;cq_dma_addr);</div><div class='ctx'> 	if (!nvmeq-&gt;sq_cmds)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_clear_bit(NVMEQ_SQ_CMB, &amp;nvmeq-&gt;flags)) {</div><div class='del'>-		pci_free_p2pmem(to_pci_dev(nvmeq-&gt;q_dmadev),</div><div class='add'>+		pci_free_p2pmem(to_pci_dev(nvmeq-&gt;dev-&gt;dev),</div><div class='ctx'> 				nvmeq-&gt;sq_cmds, SQ_SIZE(nvmeq-&gt;q_depth));</div><div class='ctx'> 	} else {</div><div class='del'>-		dma_free_coherent(nvmeq-&gt;q_dmadev, SQ_SIZE(nvmeq-&gt;q_depth),</div><div class='add'>+		dma_free_coherent(nvmeq-&gt;dev-&gt;dev, SQ_SIZE(nvmeq-&gt;q_depth),</div><div class='ctx'> 				nvmeq-&gt;sq_cmds, nvmeq-&gt;sq_dma_addr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1410,10 +1399,8 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq)</div><div class='ctx'> 	nvmeq-&gt;dev-&gt;online_queues--;</div><div class='ctx'> 	if (!nvmeq-&gt;qid &amp;&amp; nvmeq-&gt;dev-&gt;ctrl.admin_q)</div><div class='ctx'> 		blk_mq_quiesce_queue(nvmeq-&gt;dev-&gt;ctrl.admin_q);</div><div class='del'>-	if (nvmeq-&gt;cq_vector == -1)</div><div class='del'>-		return 0;</div><div class='del'>-	pci_free_irq(to_pci_dev(nvmeq-&gt;dev-&gt;dev), nvmeq-&gt;cq_vector, nvmeq);</div><div class='del'>-	nvmeq-&gt;cq_vector = -1;</div><div class='add'>+	if (!test_and_clear_bit(NVMEQ_POLLED, &amp;nvmeq-&gt;flags))</div><div class='add'>+		pci_free_irq(to_pci_dev(nvmeq-&gt;dev-&gt;dev), nvmeq-&gt;cq_vector, nvmeq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1498,7 +1485,6 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)</div><div class='ctx'> 	if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth))</div><div class='ctx'> 		goto free_cqdma;</div><div class='ctx'> </div><div class='del'>-	nvmeq-&gt;q_dmadev = dev-&gt;dev;</div><div class='ctx'> 	nvmeq-&gt;dev = dev;</div><div class='ctx'> 	spin_lock_init(&amp;nvmeq-&gt;sq_lock);</div><div class='ctx'> 	spin_lock_init(&amp;nvmeq-&gt;cq_poll_lock);</div><div class='hunk'>@@ -1507,7 +1493,6 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)</div><div class='ctx'> 	nvmeq-&gt;q_db = &amp;dev-&gt;dbs[qid * 2 * dev-&gt;db_stride];</div><div class='ctx'> 	nvmeq-&gt;q_depth = depth;</div><div class='ctx'> 	nvmeq-&gt;qid = qid;</div><div class='del'>-	nvmeq-&gt;cq_vector = -1;</div><div class='ctx'> 	dev-&gt;ctrl.queue_count++;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1552,7 +1537,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_dev *dev = nvmeq-&gt;dev;</div><div class='ctx'> 	int result;</div><div class='del'>-	s16 vector;</div><div class='add'>+	u16 vector = 0;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(NVMEQ_DELETE_ERROR, &amp;nvmeq-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1563,7 +1548,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled)</div><div class='ctx'> 	if (!polled)</div><div class='ctx'> 		vector = dev-&gt;num_vecs == 1 ? 0 : qid;</div><div class='ctx'> 	else</div><div class='del'>-		vector = -1;</div><div class='add'>+		set_bit(NVMEQ_POLLED, &amp;nvmeq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	result = adapter_alloc_cq(dev, qid, nvmeq, vector);</div><div class='ctx'> 	if (result)</div><div class='hunk'>@@ -1578,7 +1563,8 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled)</div><div class='ctx'> 	nvmeq-&gt;cq_vector = vector;</div><div class='ctx'> 	nvme_init_queue(nvmeq, qid);</div><div class='ctx'> </div><div class='del'>-	if (vector != -1) {</div><div class='add'>+	if (!polled) {</div><div class='add'>+		nvmeq-&gt;cq_vector = vector;</div><div class='ctx'> 		result = queue_request_irq(nvmeq);</div><div class='ctx'> 		if (result &lt; 0)</div><div class='ctx'> 			goto release_sq;</div><div class='hunk'>@@ -1588,7 +1574,6 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled)</div><div class='ctx'> 	return result;</div><div class='ctx'> </div><div class='ctx'> release_sq:</div><div class='del'>-	nvmeq-&gt;cq_vector = -1;</div><div class='ctx'> 	dev-&gt;online_queues--;</div><div class='ctx'> 	adapter_delete_sq(dev, qid);</div><div class='ctx'> release_cq:</div><div class='hunk'>@@ -1639,7 +1624,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)</div><div class='ctx'> 		dev-&gt;admin_tagset.queue_depth = NVME_AQ_MQ_TAG_DEPTH;</div><div class='ctx'> 		dev-&gt;admin_tagset.timeout = ADMIN_TIMEOUT;</div><div class='ctx'> 		dev-&gt;admin_tagset.numa_node = dev_to_node(dev-&gt;dev);</div><div class='del'>-		dev-&gt;admin_tagset.cmd_size = nvme_pci_cmd_size(dev, false);</div><div class='add'>+		dev-&gt;admin_tagset.cmd_size = sizeof(struct nvme_iod);</div><div class='ctx'> 		dev-&gt;admin_tagset.flags = BLK_MQ_F_NO_SCHED;</div><div class='ctx'> 		dev-&gt;admin_tagset.driver_data = dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1730,7 +1715,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)</div><div class='ctx'> 	nvme_init_queue(nvmeq, 0);</div><div class='ctx'> 	result = queue_request_irq(nvmeq);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		nvmeq-&gt;cq_vector = -1;</div><div class='add'>+		dev-&gt;online_queues--;</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2171,10 +2156,8 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)</div><div class='ctx'> 	 * number of interrupts.</div><div class='ctx'> 	 */</div><div class='ctx'> 	result = queue_request_irq(adminq);</div><div class='del'>-	if (result) {</div><div class='del'>-		adminq-&gt;cq_vector = -1;</div><div class='add'>+	if (result)</div><div class='ctx'> 		return result;</div><div class='del'>-	}</div><div class='ctx'> 	set_bit(NVMEQ_ENABLED, &amp;adminq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	result = nvme_create_io_queues(dev);</div><div class='hunk'>@@ -2286,11 +2269,7 @@ static int nvme_dev_add(struct nvme_dev *dev)</div><div class='ctx'> 		dev-&gt;tagset.numa_node = dev_to_node(dev-&gt;dev);</div><div class='ctx'> 		dev-&gt;tagset.queue_depth =</div><div class='ctx'> 				min_t(int, dev-&gt;q_depth, BLK_MQ_MAX_DEPTH) - 1;</div><div class='del'>-		dev-&gt;tagset.cmd_size = nvme_pci_cmd_size(dev, false);</div><div class='del'>-		if ((dev-&gt;ctrl.sgls &amp; ((1 &lt;&lt; 0) | (1 &lt;&lt; 1))) &amp;&amp; sgl_threshold) {</div><div class='del'>-			dev-&gt;tagset.cmd_size = max(dev-&gt;tagset.cmd_size,</div><div class='del'>-					nvme_pci_cmd_size(dev, true));</div><div class='del'>-		}</div><div class='add'>+		dev-&gt;tagset.cmd_size = sizeof(struct nvme_iod);</div><div class='ctx'> 		dev-&gt;tagset.flags = BLK_MQ_F_SHOULD_MERGE;</div><div class='ctx'> 		dev-&gt;tagset.driver_data = dev;</div><div class='ctx'> </div><div class='hunk'>@@ -2438,8 +2417,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)</div><div class='ctx'> 	 * must flush all entered requests to their failed completion to avoid</div><div class='ctx'> 	 * deadlocking blk-mq hot-cpu notifier.</div><div class='ctx'> 	 */</div><div class='del'>-	if (shutdown)</div><div class='add'>+	if (shutdown) {</div><div class='ctx'> 		nvme_start_queues(&amp;dev-&gt;ctrl);</div><div class='add'>+		if (dev-&gt;ctrl.admin_q &amp;&amp; !blk_queue_dying(dev-&gt;ctrl.admin_q))</div><div class='add'>+			blk_mq_unquiesce_queue(dev-&gt;ctrl.admin_q);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;shutdown_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2979,6 +2961,9 @@ static struct pci_driver nvme_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init nvme_init(void)</div><div class='ctx'> {</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_create_cq) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_create_sq) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_delete_queue) != 64);</div><div class='ctx'> 	BUILD_BUG_ON(IRQ_AFFINITY_MAX_SETS &lt; 2);</div><div class='ctx'> 	return pci_register_driver(&amp;nvme_driver);</div><div class='ctx'> }</div><div class='hunk'>@@ -2987,7 +2972,6 @@ static void __exit nvme_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;nvme_driver);</div><div class='ctx'> 	flush_workqueue(nvme_wq);</div><div class='del'>-	_nvme_check_size();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Matthew Wilcox &lt;willy@linux.intel.com&gt;");</div><div class='head'>diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c<br/>index 11a5ecae78c8..e1824c2e0a1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/rdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/rdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/rdma.c</a></div><div class='hunk'>@@ -914,8 +914,9 @@ static void nvme_rdma_teardown_admin_queue(struct nvme_rdma_ctrl *ctrl,</div><div class='ctx'> {</div><div class='ctx'> 	blk_mq_quiesce_queue(ctrl-&gt;ctrl.admin_q);</div><div class='ctx'> 	nvme_rdma_stop_queue(&amp;ctrl-&gt;queues[0]);</div><div class='del'>-	blk_mq_tagset_busy_iter(&amp;ctrl-&gt;admin_tag_set, nvme_cancel_request,</div><div class='del'>-			&amp;ctrl-&gt;ctrl);</div><div class='add'>+	if (ctrl-&gt;ctrl.admin_tagset)</div><div class='add'>+		blk_mq_tagset_busy_iter(ctrl-&gt;ctrl.admin_tagset,</div><div class='add'>+			nvme_cancel_request, &amp;ctrl-&gt;ctrl);</div><div class='ctx'> 	blk_mq_unquiesce_queue(ctrl-&gt;ctrl.admin_q);</div><div class='ctx'> 	nvme_rdma_destroy_admin_queue(ctrl, remove);</div><div class='ctx'> }</div><div class='hunk'>@@ -926,8 +927,9 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl,</div><div class='ctx'> 	if (ctrl-&gt;ctrl.queue_count &gt; 1) {</div><div class='ctx'> 		nvme_stop_queues(&amp;ctrl-&gt;ctrl);</div><div class='ctx'> 		nvme_rdma_stop_io_queues(ctrl);</div><div class='del'>-		blk_mq_tagset_busy_iter(&amp;ctrl-&gt;tag_set, nvme_cancel_request,</div><div class='del'>-				&amp;ctrl-&gt;ctrl);</div><div class='add'>+		if (ctrl-&gt;ctrl.tagset)</div><div class='add'>+			blk_mq_tagset_busy_iter(ctrl-&gt;ctrl.tagset,</div><div class='add'>+				nvme_cancel_request, &amp;ctrl-&gt;ctrl);</div><div class='ctx'> 		if (remove)</div><div class='ctx'> 			nvme_start_queues(&amp;ctrl-&gt;ctrl);</div><div class='ctx'> 		nvme_rdma_destroy_io_queues(ctrl, remove);</div><div class='head'>diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c<br/>index e7e08889865e..2b107a1d152b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/tcp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/host/tcp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/host/tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/host/tcp.c</a></div><div class='hunk'>@@ -473,7 +473,6 @@ static int nvme_tcp_handle_c2h_data(struct nvme_tcp_queue *queue,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nvme_tcp_handle_comp(struct nvme_tcp_queue *queue,</div><div class='hunk'>@@ -627,14 +626,13 @@ static int nvme_tcp_recv_pdu(struct nvme_tcp_queue *queue, struct sk_buff *skb,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nvme_tcp_end_request(struct request *rq, __le16 status)</div><div class='add'>+static inline void nvme_tcp_end_request(struct request *rq, u16 status)</div><div class='ctx'> {</div><div class='ctx'> 	union nvme_result res = {};</div><div class='ctx'> </div><div class='ctx'> 	nvme_end_request(rq, cpu_to_le16(status &lt;&lt; 1), res);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,</div><div class='ctx'> 			      unsigned int *offset, size_t *len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1425,7 +1423,8 @@ static int nvme_tcp_start_queue(struct nvme_ctrl *nctrl, int idx)</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		set_bit(NVME_TCP_Q_LIVE, &amp;ctrl-&gt;queues[idx].flags);</div><div class='ctx'> 	} else {</div><div class='del'>-		__nvme_tcp_stop_queue(&amp;ctrl-&gt;queues[idx]);</div><div class='add'>+		if (test_bit(NVME_TCP_Q_ALLOCATED, &amp;ctrl-&gt;queues[idx].flags))</div><div class='add'>+			__nvme_tcp_stop_queue(&amp;ctrl-&gt;queues[idx]);</div><div class='ctx'> 		dev_err(nctrl-&gt;device,</div><div class='ctx'> 			"failed to connect queue: %d ret=%d\n", idx, ret);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1535,7 +1534,7 @@ out_free_queue:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)</div><div class='add'>+static int __nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1565,7 +1564,7 @@ static unsigned int nvme_tcp_nr_io_queues(struct nvme_ctrl *ctrl)</div><div class='ctx'> 	return nr_io_queues;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nvme_alloc_io_queues(struct nvme_ctrl *ctrl)</div><div class='add'>+static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int nr_io_queues;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1582,7 +1581,7 @@ static int nvme_alloc_io_queues(struct nvme_ctrl *ctrl)</div><div class='ctx'> 	dev_info(ctrl-&gt;device,</div><div class='ctx'> 		"creating %d I/O queues.\n", nr_io_queues);</div><div class='ctx'> </div><div class='del'>-	return nvme_tcp_alloc_io_queues(ctrl);</div><div class='add'>+	return __nvme_tcp_alloc_io_queues(ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nvme_tcp_destroy_io_queues(struct nvme_ctrl *ctrl, bool remove)</div><div class='hunk'>@@ -1599,7 +1598,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = nvme_alloc_io_queues(ctrl);</div><div class='add'>+	ret = nvme_tcp_alloc_io_queues(ctrl);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1710,7 +1709,9 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl,</div><div class='ctx'> {</div><div class='ctx'> 	blk_mq_quiesce_queue(ctrl-&gt;admin_q);</div><div class='ctx'> 	nvme_tcp_stop_queue(ctrl, 0);</div><div class='del'>-	blk_mq_tagset_busy_iter(ctrl-&gt;admin_tagset, nvme_cancel_request, ctrl);</div><div class='add'>+	if (ctrl-&gt;admin_tagset)</div><div class='add'>+		blk_mq_tagset_busy_iter(ctrl-&gt;admin_tagset,</div><div class='add'>+			nvme_cancel_request, ctrl);</div><div class='ctx'> 	blk_mq_unquiesce_queue(ctrl-&gt;admin_q);</div><div class='ctx'> 	nvme_tcp_destroy_admin_queue(ctrl, remove);</div><div class='ctx'> }</div><div class='hunk'>@@ -1722,7 +1723,9 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,</div><div class='ctx'> 		return;</div><div class='ctx'> 	nvme_stop_queues(ctrl);</div><div class='ctx'> 	nvme_tcp_stop_io_queues(ctrl);</div><div class='del'>-	blk_mq_tagset_busy_iter(ctrl-&gt;tagset, nvme_cancel_request, ctrl);</div><div class='add'>+	if (ctrl-&gt;tagset)</div><div class='add'>+		blk_mq_tagset_busy_iter(ctrl-&gt;tagset,</div><div class='add'>+			nvme_cancel_request, ctrl);</div><div class='ctx'> 	if (remove)</div><div class='ctx'> 		nvme_start_queues(ctrl);</div><div class='ctx'> 	nvme_tcp_destroy_io_queues(ctrl, remove);</div><div class='head'>diff --git a/drivers/nvme/target/Kconfig b/drivers/nvme/target/Kconfig<br/>index d94f25cde019..3ef0a4e5eed6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/Kconfig</a></div><div class='hunk'>@@ -3,6 +3,7 @@ config NVME_TARGET</div><div class='ctx'> 	tristate "NVMe Target support"</div><div class='ctx'> 	depends on BLOCK</div><div class='ctx'> 	depends on CONFIGFS_FS</div><div class='add'>+	select SGL_ALLOC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enabled target side support for the NVMe protocol, that is</div><div class='ctx'> 	  it allows the Linux kernel to implement NVMe subsystems and</div><div class='head'>diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c<br/>index 76250181fee0..9f72d515fc4b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/admin-cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/admin-cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/admin-cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/admin-cmd.c</a></div><div class='hunk'>@@ -24,6 +24,11 @@ u32 nvmet_get_log_page_len(struct nvme_command *cmd)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u64 nvmet_get_log_page_offset(struct nvme_command *cmd)</div><div class='add'>+{</div><div class='add'>+	return le64_to_cpu(cmd-&gt;get_log_page.lpo);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nvmet_execute_get_log_page_noop(struct nvmet_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	nvmet_req_complete(req, nvmet_zero_sgl(req, 0, req-&gt;data_len));</div><div class='head'>diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c<br/>index adb79545cdd7..08dd5af357f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/configfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/configfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/configfs.c</a></div><div class='hunk'>@@ -898,8 +898,8 @@ static struct config_group *nvmet_subsys_make(struct config_group *group,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	subsys = nvmet_subsys_alloc(name, NVME_NQN_NVME);</div><div class='del'>-	if (!subsys)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	if (IS_ERR(subsys))</div><div class='add'>+		return ERR_CAST(subsys);</div><div class='ctx'> </div><div class='ctx'> 	config_group_init_type_name(&amp;subsys-&gt;group, name, &amp;nvmet_subsys_type);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c<br/>index 2d73b66e3686..7734a6acff85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/core.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/pci-p2pdma.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "nvmet.h"</div><div class='ctx'> </div><div class='hunk'>@@ -214,6 +215,8 @@ void nvmet_ns_changed(struct nvmet_subsys *subsys, u32 nsid)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvmet_ctrl *ctrl;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;subsys-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(ctrl, &amp;subsys-&gt;ctrls, subsys_entry) {</div><div class='ctx'> 		nvmet_add_to_changed_ns_log(ctrl, cpu_to_le32(nsid));</div><div class='ctx'> 		if (nvmet_aen_bit_disabled(ctrl, NVME_AEN_BIT_NS_ATTR))</div><div class='hunk'>@@ -494,13 +497,14 @@ int nvmet_ns_enable(struct nvmet_ns *ns)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;subsys-&gt;lock);</div><div class='del'>-	ret = -EMFILE;</div><div class='del'>-	if (subsys-&gt;nr_namespaces == NVMET_MAX_NAMESPACES)</div><div class='del'>-		goto out_unlock;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	if (ns-&gt;enabled)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	ret = -EMFILE;</div><div class='add'>+	if (subsys-&gt;nr_namespaces == NVMET_MAX_NAMESPACES)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='ctx'> 	ret = nvmet_bdev_ns_enable(ns);</div><div class='ctx'> 	if (ret == -ENOTBLK)</div><div class='ctx'> 		ret = nvmet_file_ns_enable(ns);</div><div class='hunk'>@@ -509,7 +513,7 @@ int nvmet_ns_enable(struct nvmet_ns *ns)</div><div class='ctx'> </div><div class='ctx'> 	ret = nvmet_p2pmem_ns_enable(ns);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out_dev_disable;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ctrl, &amp;subsys-&gt;ctrls, subsys_entry)</div><div class='ctx'> 		nvmet_p2pmem_ns_add_p2p(ctrl, ns);</div><div class='hunk'>@@ -550,7 +554,7 @@ out_unlock:</div><div class='ctx'> out_dev_put:</div><div class='ctx'> 	list_for_each_entry(ctrl, &amp;subsys-&gt;ctrls, subsys_entry)</div><div class='ctx'> 		pci_dev_put(radix_tree_delete(&amp;ctrl-&gt;p2p_ns_map, ns-&gt;nsid));</div><div class='del'>-</div><div class='add'>+out_dev_disable:</div><div class='ctx'> 	nvmet_ns_dev_disable(ns);</div><div class='ctx'> 	goto out_unlock;</div><div class='ctx'> }</div><div class='hunk'>@@ -644,7 +648,7 @@ static void nvmet_update_sq_head(struct nvmet_req *req)</div><div class='ctx'> 		} while (cmpxchg(&amp;req-&gt;sq-&gt;sqhd, old_sqhd, new_sqhd) !=</div><div class='ctx'> 					old_sqhd);</div><div class='ctx'> 	}</div><div class='del'>-	req-&gt;rsp-&gt;sq_head = cpu_to_le16(req-&gt;sq-&gt;sqhd &amp; 0x0000FFFF);</div><div class='add'>+	req-&gt;cqe-&gt;sq_head = cpu_to_le16(req-&gt;sq-&gt;sqhd &amp; 0x0000FFFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nvmet_set_error(struct nvmet_req *req, u16 status)</div><div class='hunk'>@@ -653,7 +657,7 @@ static void nvmet_set_error(struct nvmet_req *req, u16 status)</div><div class='ctx'> 	struct nvme_error_slot *new_error_slot;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	req-&gt;rsp-&gt;status = cpu_to_le16(status &lt;&lt; 1);</div><div class='add'>+	req-&gt;cqe-&gt;status = cpu_to_le16(status &lt;&lt; 1);</div><div class='ctx'> </div><div class='ctx'> 	if (!ctrl || req-&gt;error_loc == NVMET_NO_ERROR_LOC)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -673,15 +677,15 @@ static void nvmet_set_error(struct nvmet_req *req, u16 status)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctrl-&gt;error_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* set the more bit for this request */</div><div class='del'>-	req-&gt;rsp-&gt;status |= cpu_to_le16(1 &lt;&lt; 14);</div><div class='add'>+	req-&gt;cqe-&gt;status |= cpu_to_le16(1 &lt;&lt; 14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __nvmet_req_complete(struct nvmet_req *req, u16 status)</div><div class='ctx'> {</div><div class='ctx'> 	if (!req-&gt;sq-&gt;sqhd_disabled)</div><div class='ctx'> 		nvmet_update_sq_head(req);</div><div class='del'>-	req-&gt;rsp-&gt;sq_id = cpu_to_le16(req-&gt;sq-&gt;qid);</div><div class='del'>-	req-&gt;rsp-&gt;command_id = req-&gt;cmd-&gt;common.command_id;</div><div class='add'>+	req-&gt;cqe-&gt;sq_id = cpu_to_le16(req-&gt;sq-&gt;qid);</div><div class='add'>+	req-&gt;cqe-&gt;command_id = req-&gt;cmd-&gt;common.command_id;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(status))</div><div class='ctx'> 		nvmet_set_error(req, status);</div><div class='hunk'>@@ -838,8 +842,8 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,</div><div class='ctx'> 	req-&gt;sg = NULL;</div><div class='ctx'> 	req-&gt;sg_cnt = 0;</div><div class='ctx'> 	req-&gt;transfer_len = 0;</div><div class='del'>-	req-&gt;rsp-&gt;status = 0;</div><div class='del'>-	req-&gt;rsp-&gt;sq_head = 0;</div><div class='add'>+	req-&gt;cqe-&gt;status = 0;</div><div class='add'>+	req-&gt;cqe-&gt;sq_head = 0;</div><div class='ctx'> 	req-&gt;ns = NULL;</div><div class='ctx'> 	req-&gt;error_loc = NVMET_NO_ERROR_LOC;</div><div class='ctx'> 	req-&gt;error_slba = 0;</div><div class='hunk'>@@ -1066,7 +1070,7 @@ u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid,</div><div class='ctx'> 	if (!subsys) {</div><div class='ctx'> 		pr_warn("connect request for invalid subsystem %s!\n",</div><div class='ctx'> 			subsysnqn);</div><div class='del'>-		req-&gt;rsp-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(subsysnqn);</div><div class='add'>+		req-&gt;cqe-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(subsysnqn);</div><div class='ctx'> 		return NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1087,7 +1091,7 @@ u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid,</div><div class='ctx'> </div><div class='ctx'> 	pr_warn("could not find controller %d for subsys %s / host %s\n",</div><div class='ctx'> 		cntlid, subsysnqn, hostnqn);</div><div class='del'>-	req-&gt;rsp-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(cntlid);</div><div class='add'>+	req-&gt;cqe-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(cntlid);</div><div class='ctx'> 	status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1185,7 +1189,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,</div><div class='ctx'> 	if (!subsys) {</div><div class='ctx'> 		pr_warn("connect request for invalid subsystem %s!\n",</div><div class='ctx'> 			subsysnqn);</div><div class='del'>-		req-&gt;rsp-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(subsysnqn);</div><div class='add'>+		req-&gt;cqe-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(subsysnqn);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1194,7 +1198,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,</div><div class='ctx'> 	if (!nvmet_host_allowed(subsys, hostnqn)) {</div><div class='ctx'> 		pr_info("connect by host %s for subsystem %s not allowed\n",</div><div class='ctx'> 			hostnqn, subsysnqn);</div><div class='del'>-		req-&gt;rsp-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(hostnqn);</div><div class='add'>+		req-&gt;cqe-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(hostnqn);</div><div class='ctx'> 		up_read(&amp;nvmet_config_sem);</div><div class='ctx'> 		status = NVME_SC_CONNECT_INVALID_HOST | NVME_SC_DNR;</div><div class='ctx'> 		goto out_put_subsystem;</div><div class='hunk'>@@ -1364,7 +1368,7 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,</div><div class='ctx'> </div><div class='ctx'> 	subsys = kzalloc(sizeof(*subsys), GFP_KERNEL);</div><div class='ctx'> 	if (!subsys)</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	subsys-&gt;ver = NVME_VS(1, 3, 0); /* NVMe 1.3.0 */</div><div class='ctx'> 	/* generate a random serial number as our controllers are ephemeral: */</div><div class='hunk'>@@ -1380,14 +1384,14 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_err("%s: Unknown Subsystem type - %d\n", __func__, type);</div><div class='ctx'> 		kfree(subsys);</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> 	subsys-&gt;type = type;</div><div class='ctx'> 	subsys-&gt;subsysnqn = kstrndup(subsysnqn, NVMF_NQN_SIZE,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!subsys-&gt;subsysnqn) {</div><div class='ctx'> 		kfree(subsys);</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kref_init(&amp;subsys-&gt;ref);</div><div class='head'>diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c<br/>index c872b47a88f3..5baf269f3f8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/discovery.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/discovery.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/discovery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/discovery.c</a></div><div class='hunk'>@@ -30,14 +30,17 @@ void nvmet_port_disc_changed(struct nvmet_port *port,</div><div class='ctx'> {</div><div class='ctx'> 	struct nvmet_ctrl *ctrl;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;nvmet_config_sem);</div><div class='ctx'> 	nvmet_genctr++;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;nvmet_disc_subsys-&gt;lock);</div><div class='ctx'> 	list_for_each_entry(ctrl, &amp;nvmet_disc_subsys-&gt;ctrls, subsys_entry) {</div><div class='ctx'> 		if (subsys &amp;&amp; !nvmet_host_allowed(subsys, ctrl-&gt;hostnqn))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		__nvmet_disc_changed(port, ctrl);</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;nvmet_disc_subsys-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __nvmet_subsys_disc_changed(struct nvmet_port *port,</div><div class='hunk'>@@ -46,12 +49,14 @@ static void __nvmet_subsys_disc_changed(struct nvmet_port *port,</div><div class='ctx'> {</div><div class='ctx'> 	struct nvmet_ctrl *ctrl;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;nvmet_disc_subsys-&gt;lock);</div><div class='ctx'> 	list_for_each_entry(ctrl, &amp;nvmet_disc_subsys-&gt;ctrls, subsys_entry) {</div><div class='ctx'> 		if (host &amp;&amp; strcmp(nvmet_host_name(host), ctrl-&gt;hostnqn))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		__nvmet_disc_changed(port, ctrl);</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;nvmet_disc_subsys-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nvmet_subsys_disc_changed(struct nvmet_subsys *subsys,</div><div class='hunk'>@@ -131,54 +136,76 @@ static void nvmet_set_disc_traddr(struct nvmet_req *req, struct nvmet_port *port</div><div class='ctx'> 		memcpy(traddr, port-&gt;disc_addr.traddr, NVMF_TRADDR_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t discovery_log_entries(struct nvmet_req *req)</div><div class='add'>+{</div><div class='add'>+	struct nvmet_ctrl *ctrl = req-&gt;sq-&gt;ctrl;</div><div class='add'>+	struct nvmet_subsys_link *p;</div><div class='add'>+	struct nvmet_port *r;</div><div class='add'>+	size_t entries = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;req-&gt;port-&gt;subsystems, entry) {</div><div class='add'>+		if (!nvmet_host_allowed(p-&gt;subsys, ctrl-&gt;hostnqn))</div><div class='add'>+			continue;</div><div class='add'>+		entries++;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(r, &amp;req-&gt;port-&gt;referrals, entry)</div><div class='add'>+		entries++;</div><div class='add'>+	return entries;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nvmet_execute_get_disc_log_page(struct nvmet_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	const int entry_size = sizeof(struct nvmf_disc_rsp_page_entry);</div><div class='ctx'> 	struct nvmet_ctrl *ctrl = req-&gt;sq-&gt;ctrl;</div><div class='ctx'> 	struct nvmf_disc_rsp_page_hdr *hdr;</div><div class='add'>+	u64 offset = nvmet_get_log_page_offset(req-&gt;cmd);</div><div class='ctx'> 	size_t data_len = nvmet_get_log_page_len(req-&gt;cmd);</div><div class='del'>-	size_t alloc_len = max(data_len, sizeof(*hdr));</div><div class='del'>-	int residual_len = data_len - sizeof(*hdr);</div><div class='add'>+	size_t alloc_len;</div><div class='ctx'> 	struct nvmet_subsys_link *p;</div><div class='ctx'> 	struct nvmet_port *r;</div><div class='ctx'> 	u32 numrec = 0;</div><div class='ctx'> 	u16 status = 0;</div><div class='add'>+	void *buffer;</div><div class='add'>+</div><div class='add'>+	/* Spec requires dword aligned offsets */</div><div class='add'>+	if (offset &amp; 0x3) {</div><div class='add'>+		status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure we're passing at least a buffer of response header size.</div><div class='ctx'> 	 * If host provided data len is less than the header size, only the</div><div class='ctx'> 	 * number of bytes requested by host will be sent to host.</div><div class='ctx'> 	 */</div><div class='del'>-	hdr = kzalloc(alloc_len, GFP_KERNEL);</div><div class='del'>-	if (!hdr) {</div><div class='add'>+	down_read(&amp;nvmet_config_sem);</div><div class='add'>+	alloc_len = sizeof(*hdr) + entry_size * discovery_log_entries(req);</div><div class='add'>+	buffer = kzalloc(alloc_len, GFP_KERNEL);</div><div class='add'>+	if (!buffer) {</div><div class='add'>+		up_read(&amp;nvmet_config_sem);</div><div class='ctx'> 		status = NVME_SC_INTERNAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;nvmet_config_sem);</div><div class='add'>+	hdr = buffer;</div><div class='ctx'> 	list_for_each_entry(p, &amp;req-&gt;port-&gt;subsystems, entry) {</div><div class='add'>+		char traddr[NVMF_TRADDR_SIZE];</div><div class='add'>+</div><div class='ctx'> 		if (!nvmet_host_allowed(p-&gt;subsys, ctrl-&gt;hostnqn))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (residual_len &gt;= entry_size) {</div><div class='del'>-			char traddr[NVMF_TRADDR_SIZE];</div><div class='del'>-</div><div class='del'>-			nvmet_set_disc_traddr(req, req-&gt;port, traddr);</div><div class='del'>-			nvmet_format_discovery_entry(hdr, req-&gt;port,</div><div class='del'>-					p-&gt;subsys-&gt;subsysnqn, traddr,</div><div class='del'>-					NVME_NQN_NVME, numrec);</div><div class='del'>-			residual_len -= entry_size;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		nvmet_set_disc_traddr(req, req-&gt;port, traddr);</div><div class='add'>+		nvmet_format_discovery_entry(hdr, req-&gt;port,</div><div class='add'>+				p-&gt;subsys-&gt;subsysnqn, traddr,</div><div class='add'>+				NVME_NQN_NVME, numrec);</div><div class='ctx'> 		numrec++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(r, &amp;req-&gt;port-&gt;referrals, entry) {</div><div class='del'>-		if (residual_len &gt;= entry_size) {</div><div class='del'>-			nvmet_format_discovery_entry(hdr, r,</div><div class='del'>-					NVME_DISC_SUBSYS_NAME,</div><div class='del'>-					r-&gt;disc_addr.traddr,</div><div class='del'>-					NVME_NQN_DISC, numrec);</div><div class='del'>-			residual_len -= entry_size;</div><div class='del'>-		}</div><div class='add'>+		nvmet_format_discovery_entry(hdr, r,</div><div class='add'>+				NVME_DISC_SUBSYS_NAME,</div><div class='add'>+				r-&gt;disc_addr.traddr,</div><div class='add'>+				NVME_NQN_DISC, numrec);</div><div class='ctx'> 		numrec++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -190,8 +217,8 @@ static void nvmet_execute_get_disc_log_page(struct nvmet_req *req)</div><div class='ctx'> </div><div class='ctx'> 	up_read(&amp;nvmet_config_sem);</div><div class='ctx'> </div><div class='del'>-	status = nvmet_copy_to_sgl(req, 0, hdr, data_len);</div><div class='del'>-	kfree(hdr);</div><div class='add'>+	status = nvmet_copy_to_sgl(req, 0, buffer + offset, data_len);</div><div class='add'>+	kfree(buffer);</div><div class='ctx'> out:</div><div class='ctx'> 	nvmet_req_complete(req, status);</div><div class='ctx'> }</div><div class='hunk'>@@ -350,8 +377,8 @@ int __init nvmet_init_discovery(void)</div><div class='ctx'> {</div><div class='ctx'> 	nvmet_disc_subsys =</div><div class='ctx'> 		nvmet_subsys_alloc(NVME_DISC_SUBSYS_NAME, NVME_NQN_DISC);</div><div class='del'>-	if (!nvmet_disc_subsys)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (IS_ERR(nvmet_disc_subsys))</div><div class='add'>+		return PTR_ERR(nvmet_disc_subsys);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/target/fabrics-cmd.c b/drivers/nvme/target/fabrics-cmd.c<br/>index 3a76ebc3d155..3b9f79aba98f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/fabrics-cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/fabrics-cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/fabrics-cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/fabrics-cmd.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static void nvmet_execute_prop_get(struct nvmet_req *req)</div><div class='ctx'> 			offsetof(struct nvmf_property_get_command, attrib);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;rsp-&gt;result.u64 = cpu_to_le64(val);</div><div class='add'>+	req-&gt;cqe-&gt;result.u64 = cpu_to_le64(val);</div><div class='ctx'> 	nvmet_req_complete(req, status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,7 @@ static u16 nvmet_install_queue(struct nvmet_ctrl *ctrl, struct nvmet_req *req)</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;cattr &amp; NVME_CONNECT_DISABLE_SQFLOW) {</div><div class='ctx'> 		req-&gt;sq-&gt;sqhd_disabled = true;</div><div class='del'>-		req-&gt;rsp-&gt;sq_head = cpu_to_le16(0xffff);</div><div class='add'>+		req-&gt;cqe-&gt;sq_head = cpu_to_le16(0xffff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ctrl-&gt;ops-&gt;install_queue) {</div><div class='hunk'>@@ -158,7 +158,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* zero out initial completion result, assign values as needed */</div><div class='del'>-	req-&gt;rsp-&gt;result.u32 = 0;</div><div class='add'>+	req-&gt;cqe-&gt;result.u32 = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;recfmt != 0) {</div><div class='ctx'> 		pr_warn("invalid connect version (%d).\n",</div><div class='hunk'>@@ -172,7 +172,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)</div><div class='ctx'> 		pr_warn("connect attempt for invalid controller ID %#x\n",</div><div class='ctx'> 			d-&gt;cntlid);</div><div class='ctx'> 		status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;</div><div class='del'>-		req-&gt;rsp-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(cntlid);</div><div class='add'>+		req-&gt;cqe-&gt;result.u32 = IPO_IATTR_CONNECT_DATA(cntlid);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +195,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)</div><div class='ctx'> </div><div class='ctx'> 	pr_info("creating controller %d for subsystem %s for NQN %s.\n",</div><div class='ctx'> 		ctrl-&gt;cntlid, ctrl-&gt;subsys-&gt;subsysnqn, ctrl-&gt;hostnqn);</div><div class='del'>-	req-&gt;rsp-&gt;result.u16 = cpu_to_le16(ctrl-&gt;cntlid);</div><div class='add'>+	req-&gt;cqe-&gt;result.u16 = cpu_to_le16(ctrl-&gt;cntlid);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(d);</div><div class='hunk'>@@ -222,7 +222,7 @@ static void nvmet_execute_io_connect(struct nvmet_req *req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* zero out initial completion result, assign values as needed */</div><div class='del'>-	req-&gt;rsp-&gt;result.u32 = 0;</div><div class='add'>+	req-&gt;cqe-&gt;result.u32 = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;recfmt != 0) {</div><div class='ctx'> 		pr_warn("invalid connect version (%d).\n",</div><div class='hunk'>@@ -240,14 +240,14 @@ static void nvmet_execute_io_connect(struct nvmet_req *req)</div><div class='ctx'> 	if (unlikely(qid &gt; ctrl-&gt;subsys-&gt;max_qid)) {</div><div class='ctx'> 		pr_warn("invalid queue id (%d)\n", qid);</div><div class='ctx'> 		status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;</div><div class='del'>-		req-&gt;rsp-&gt;result.u32 = IPO_IATTR_CONNECT_SQE(qid);</div><div class='add'>+		req-&gt;cqe-&gt;result.u32 = IPO_IATTR_CONNECT_SQE(qid);</div><div class='ctx'> 		goto out_ctrl_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = nvmet_install_queue(ctrl, req);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		/* pass back cntlid that had the issue of installing queue */</div><div class='del'>-		req-&gt;rsp-&gt;result.u16 = cpu_to_le16(ctrl-&gt;cntlid);</div><div class='add'>+		req-&gt;cqe-&gt;result.u16 = cpu_to_le16(ctrl-&gt;cntlid);</div><div class='ctx'> 		goto out_ctrl_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c<br/>index 98b7b1f4ee96..508661af0f50 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/fc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/fc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/fc.c</a></div><div class='hunk'>@@ -128,12 +128,12 @@ struct nvmet_fc_tgt_queue {</div><div class='ctx'> 	struct nvmet_cq			nvme_cq;</div><div class='ctx'> 	struct nvmet_sq			nvme_sq;</div><div class='ctx'> 	struct nvmet_fc_tgt_assoc	*assoc;</div><div class='del'>-	struct nvmet_fc_fcp_iod		*fod;		/* array of fcp_iods */</div><div class='ctx'> 	struct list_head		fod_list;</div><div class='ctx'> 	struct list_head		pending_cmd_list;</div><div class='ctx'> 	struct list_head		avail_defer_list;</div><div class='ctx'> 	struct workqueue_struct		*work_q;</div><div class='ctx'> 	struct kref			ref;</div><div class='add'>+	struct nvmet_fc_fcp_iod		fod[];		/* array of fcp_iods */</div><div class='ctx'> } __aligned(sizeof(unsigned long long));</div><div class='ctx'> </div><div class='ctx'> struct nvmet_fc_tgt_assoc {</div><div class='hunk'>@@ -588,9 +588,7 @@ nvmet_fc_alloc_target_queue(struct nvmet_fc_tgt_assoc *assoc,</div><div class='ctx'> 	if (qid &gt; NVMET_NR_QUEUES)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	queue = kzalloc((sizeof(*queue) +</div><div class='del'>-				(sizeof(struct nvmet_fc_fcp_iod) * sqsize)),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	queue = kzalloc(struct_size(queue, fod, sqsize), GFP_KERNEL);</div><div class='ctx'> 	if (!queue)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -603,7 +601,6 @@ nvmet_fc_alloc_target_queue(struct nvmet_fc_tgt_assoc *assoc,</div><div class='ctx'> 	if (!queue-&gt;work_q)</div><div class='ctx'> 		goto out_a_put;</div><div class='ctx'> </div><div class='del'>-	queue-&gt;fod = (struct nvmet_fc_fcp_iod *)&amp;queue[1];</div><div class='ctx'> 	queue-&gt;qid = qid;</div><div class='ctx'> 	queue-&gt;sqsize = sqsize;</div><div class='ctx'> 	queue-&gt;assoc = assoc;</div><div class='hunk'>@@ -2187,7 +2184,7 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fod-&gt;req.cmd = &amp;fod-&gt;cmdiubuf.sqe;</div><div class='del'>-	fod-&gt;req.rsp = &amp;fod-&gt;rspiubuf.cqe;</div><div class='add'>+	fod-&gt;req.cqe = &amp;fod-&gt;rspiubuf.cqe;</div><div class='ctx'> 	fod-&gt;req.port = tgtport-&gt;pe-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	/* clear any response payload */</div><div class='head'>diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c<br/>index a065dbfc43b1..3efc52f9c309 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/io-cmd-bdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/io-cmd-bdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/io-cmd-bdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/io-cmd-bdev.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req,</div><div class='ctx'> 			GFP_KERNEL, 0, bio);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='ctx'> 		req-&gt;error_slba = le64_to_cpu(range-&gt;slba);</div><div class='del'>-		return blk_to_nvme_status(req, errno_to_blk_status(ret));</div><div class='add'>+		return errno_to_nvme_status(req, ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NVME_SC_SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -252,7 +252,6 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_write_zeroes_cmd *write_zeroes = &amp;req-&gt;cmd-&gt;write_zeroes;</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='del'>-	u16 status = NVME_SC_SUCCESS;</div><div class='ctx'> 	sector_t sector;</div><div class='ctx'> 	sector_t nr_sector;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -264,13 +263,12 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req)</div><div class='ctx'> </div><div class='ctx'> 	ret = __blkdev_issue_zeroout(req-&gt;ns-&gt;bdev, sector, nr_sector,</div><div class='ctx'> 			GFP_KERNEL, &amp;bio, 0);</div><div class='del'>-	status = blk_to_nvme_status(req, errno_to_blk_status(ret));</div><div class='ctx'> 	if (bio) {</div><div class='ctx'> 		bio-&gt;bi_private = req;</div><div class='ctx'> 		bio-&gt;bi_end_io = nvmet_bio_done;</div><div class='ctx'> 		submit_bio(bio);</div><div class='ctx'> 	} else {</div><div class='del'>-		nvmet_req_complete(req, status);</div><div class='add'>+		nvmet_req_complete(req, errno_to_nvme_status(req, ret));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c<br/>index 3e43212d3c1c..05453f5d1448 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/io-cmd-file.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/io-cmd-file.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/io-cmd-file.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/io-cmd-file.c</a></div><div class='hunk'>@@ -49,7 +49,12 @@ int nvmet_file_ns_enable(struct nvmet_ns *ns)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	ns-&gt;size = stat.size;</div><div class='del'>-	ns-&gt;blksize_shift = file_inode(ns-&gt;file)-&gt;i_blkbits;</div><div class='add'>+	/*</div><div class='add'>+	 * i_blkbits can be greater than the universally accepted upper bound,</div><div class='add'>+	 * so make sure we export a sane namespace lba_shift.</div><div class='add'>+	 */</div><div class='add'>+	ns-&gt;blksize_shift = min_t(u8,</div><div class='add'>+			file_inode(ns-&gt;file)-&gt;i_blkbits, 12);</div><div class='ctx'> </div><div class='ctx'> 	ns-&gt;bvec_cache = kmem_cache_create("nvmet-bvec",</div><div class='ctx'> 			NVMET_MAX_MPOOL_BVEC * sizeof(struct bio_vec),</div><div class='hunk'>@@ -75,11 +80,11 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nvmet_file_init_bvec(struct bio_vec *bv, struct sg_page_iter *iter)</div><div class='add'>+static void nvmet_file_init_bvec(struct bio_vec *bv, struct scatterlist *sg)</div><div class='ctx'> {</div><div class='del'>-	bv-&gt;bv_page = sg_page_iter_page(iter);</div><div class='del'>-	bv-&gt;bv_offset = iter-&gt;sg-&gt;offset;</div><div class='del'>-	bv-&gt;bv_len = PAGE_SIZE - iter-&gt;sg-&gt;offset;</div><div class='add'>+	bv-&gt;bv_page = sg_page(sg);</div><div class='add'>+	bv-&gt;bv_offset = sg-&gt;offset;</div><div class='add'>+	bv-&gt;bv_len = sg-&gt;length;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos,</div><div class='hunk'>@@ -128,14 +133,14 @@ static void nvmet_file_io_done(struct kiocb *iocb, long ret, long ret2)</div><div class='ctx'> </div><div class='ctx'> static bool nvmet_file_execute_io(struct nvmet_req *req, int ki_flags)</div><div class='ctx'> {</div><div class='del'>-	ssize_t nr_bvec = DIV_ROUND_UP(req-&gt;data_len, PAGE_SIZE);</div><div class='del'>-	struct sg_page_iter sg_pg_iter;</div><div class='add'>+	ssize_t nr_bvec = req-&gt;sg_cnt;</div><div class='ctx'> 	unsigned long bv_cnt = 0;</div><div class='ctx'> 	bool is_sync = false;</div><div class='ctx'> 	size_t len = 0, total_len = 0;</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='ctx'> 	loff_t pos;</div><div class='del'>-</div><div class='add'>+	int i;</div><div class='add'>+	struct scatterlist *sg;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;f.mpool_alloc &amp;&amp; nr_bvec &gt; NVMET_MAX_MPOOL_BVEC)</div><div class='ctx'> 		is_sync = true;</div><div class='hunk'>@@ -147,8 +152,8 @@ static bool nvmet_file_execute_io(struct nvmet_req *req, int ki_flags)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req-&gt;f.iocb, 0, sizeof(struct kiocb));</div><div class='del'>-	for_each_sg_page(req-&gt;sg, &amp;sg_pg_iter, req-&gt;sg_cnt, 0) {</div><div class='del'>-		nvmet_file_init_bvec(&amp;req-&gt;f.bvec[bv_cnt], &amp;sg_pg_iter);</div><div class='add'>+	for_each_sg(req-&gt;sg, sg, req-&gt;sg_cnt, i) {</div><div class='add'>+		nvmet_file_init_bvec(&amp;req-&gt;f.bvec[bv_cnt], sg);</div><div class='ctx'> 		len += req-&gt;f.bvec[bv_cnt].bv_len;</div><div class='ctx'> 		total_len += req-&gt;f.bvec[bv_cnt].bv_len;</div><div class='ctx'> 		bv_cnt++;</div><div class='hunk'>@@ -225,7 +230,7 @@ static void nvmet_file_submit_buffered_io(struct nvmet_req *req)</div><div class='ctx'> </div><div class='ctx'> static void nvmet_file_execute_rw(struct nvmet_req *req)</div><div class='ctx'> {</div><div class='del'>-	ssize_t nr_bvec = DIV_ROUND_UP(req-&gt;data_len, PAGE_SIZE);</div><div class='add'>+	ssize_t nr_bvec = req-&gt;sg_cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (!req-&gt;sg_cnt || !nr_bvec) {</div><div class='ctx'> 		nvmet_req_complete(req, 0);</div><div class='head'>diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c<br/>index b9f623ab01f3..9e211ad6bdd3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/loop.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/loop.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/loop.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/loop.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> struct nvme_loop_iod {</div><div class='ctx'> 	struct nvme_request	nvme_req;</div><div class='ctx'> 	struct nvme_command	cmd;</div><div class='del'>-	struct nvme_completion	rsp;</div><div class='add'>+	struct nvme_completion	cqe;</div><div class='ctx'> 	struct nvmet_req	req;</div><div class='ctx'> 	struct nvme_loop_queue	*queue;</div><div class='ctx'> 	struct work_struct	work;</div><div class='hunk'>@@ -94,7 +94,7 @@ static void nvme_loop_queue_response(struct nvmet_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvme_loop_queue *queue =</div><div class='ctx'> 		container_of(req-&gt;sq, struct nvme_loop_queue, nvme_sq);</div><div class='del'>-	struct nvme_completion *cqe = req-&gt;rsp;</div><div class='add'>+	struct nvme_completion *cqe = req-&gt;cqe;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * AEN requests are special as they don't time out and can</div><div class='hunk'>@@ -129,20 +129,6 @@ static void nvme_loop_execute_work(struct work_struct *work)</div><div class='ctx'> 	nvmet_req_execute(&amp;iod-&gt;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum blk_eh_timer_return</div><div class='del'>-nvme_loop_timeout(struct request *rq, bool reserved)</div><div class='del'>-{</div><div class='del'>-	struct nvme_loop_iod *iod = blk_mq_rq_to_pdu(rq);</div><div class='del'>-</div><div class='del'>-	/* queue error recovery */</div><div class='del'>-	nvme_reset_ctrl(&amp;iod-&gt;queue-&gt;ctrl-&gt;ctrl);</div><div class='del'>-</div><div class='del'>-	/* fail with DNR on admin cmd timeout */</div><div class='del'>-	nvme_req(rq)-&gt;status = NVME_SC_ABORT_REQ | NVME_SC_DNR;</div><div class='del'>-</div><div class='del'>-	return BLK_EH_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 		const struct blk_mq_queue_data *bd)</div><div class='ctx'> {</div><div class='hunk'>@@ -207,7 +193,7 @@ static int nvme_loop_init_iod(struct nvme_loop_ctrl *ctrl,</div><div class='ctx'> 		struct nvme_loop_iod *iod, unsigned int queue_idx)</div><div class='ctx'> {</div><div class='ctx'> 	iod-&gt;req.cmd = &amp;iod-&gt;cmd;</div><div class='del'>-	iod-&gt;req.rsp = &amp;iod-&gt;rsp;</div><div class='add'>+	iod-&gt;req.cqe = &amp;iod-&gt;cqe;</div><div class='ctx'> 	iod-&gt;queue = &amp;ctrl-&gt;queues[queue_idx];</div><div class='ctx'> 	INIT_WORK(&amp;iod-&gt;work, nvme_loop_execute_work);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -253,7 +239,6 @@ static const struct blk_mq_ops nvme_loop_mq_ops = {</div><div class='ctx'> 	.complete	= nvme_loop_complete_rq,</div><div class='ctx'> 	.init_request	= nvme_loop_init_request,</div><div class='ctx'> 	.init_hctx	= nvme_loop_init_hctx,</div><div class='del'>-	.timeout	= nvme_loop_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct blk_mq_ops nvme_loop_admin_mq_ops = {</div><div class='hunk'>@@ -261,7 +246,6 @@ static const struct blk_mq_ops nvme_loop_admin_mq_ops = {</div><div class='ctx'> 	.complete	= nvme_loop_complete_rq,</div><div class='ctx'> 	.init_request	= nvme_loop_init_request,</div><div class='ctx'> 	.init_hctx	= nvme_loop_init_admin_hctx,</div><div class='del'>-	.timeout	= nvme_loop_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)</div><div class='head'>diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h<br/>index 51e49efd7849..c25d88fc9dec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/nvmet.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/nvmet.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/nvmet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/nvmet.h</a></div><div class='hunk'>@@ -284,7 +284,7 @@ struct nvmet_fabrics_ops {</div><div class='ctx'> </div><div class='ctx'> struct nvmet_req {</div><div class='ctx'> 	struct nvme_command	*cmd;</div><div class='del'>-	struct nvme_completion	*rsp;</div><div class='add'>+	struct nvme_completion	*cqe;</div><div class='ctx'> 	struct nvmet_sq		*sq;</div><div class='ctx'> 	struct nvmet_cq		*cq;</div><div class='ctx'> 	struct nvmet_ns		*ns;</div><div class='hunk'>@@ -322,7 +322,7 @@ extern struct workqueue_struct *buffered_io_wq;</div><div class='ctx'> </div><div class='ctx'> static inline void nvmet_set_result(struct nvmet_req *req, u32 result)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;rsp-&gt;result.u32 = cpu_to_le32(result);</div><div class='add'>+	req-&gt;cqe-&gt;result.u32 = cpu_to_le32(result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -428,6 +428,7 @@ u16 nvmet_copy_from_sgl(struct nvmet_req *req, off_t off, void *buf,</div><div class='ctx'> u16 nvmet_zero_sgl(struct nvmet_req *req, off_t off, size_t len);</div><div class='ctx'> </div><div class='ctx'> u32 nvmet_get_log_page_len(struct nvme_command *cmd);</div><div class='add'>+u64 nvmet_get_log_page_offset(struct nvme_command *cmd);</div><div class='ctx'> </div><div class='ctx'> extern struct list_head *nvmet_ports;</div><div class='ctx'> void nvmet_port_disc_changed(struct nvmet_port *port,</div><div class='head'>diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c<br/>index ef893addf341..36d906a7f70d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/rdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/rdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/rdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/rdma.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ static inline bool nvmet_rdma_need_data_out(struct nvmet_rdma_rsp *rsp)</div><div class='ctx'> {</div><div class='ctx'> 	return !nvme_is_write(rsp-&gt;req.cmd) &amp;&amp;</div><div class='ctx'> 		rsp-&gt;req.transfer_len &amp;&amp;</div><div class='del'>-		!rsp-&gt;req.rsp-&gt;status &amp;&amp;</div><div class='add'>+		!rsp-&gt;req.cqe-&gt;status &amp;&amp;</div><div class='ctx'> 		!(rsp-&gt;flags &amp; NVMET_RDMA_REQ_INLINE_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -364,16 +364,17 @@ static int nvmet_rdma_alloc_rsp(struct nvmet_rdma_device *ndev,</div><div class='ctx'> 		struct nvmet_rdma_rsp *r)</div><div class='ctx'> {</div><div class='ctx'> 	/* NVMe CQE / RDMA SEND */</div><div class='del'>-	r-&gt;req.rsp = kmalloc(sizeof(*r-&gt;req.rsp), GFP_KERNEL);</div><div class='del'>-	if (!r-&gt;req.rsp)</div><div class='add'>+	r-&gt;req.cqe = kmalloc(sizeof(*r-&gt;req.cqe), GFP_KERNEL);</div><div class='add'>+	if (!r-&gt;req.cqe)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	r-&gt;send_sge.addr = ib_dma_map_single(ndev-&gt;device, r-&gt;req.rsp,</div><div class='del'>-			sizeof(*r-&gt;req.rsp), DMA_TO_DEVICE);</div><div class='add'>+	r-&gt;send_sge.addr = ib_dma_map_single(ndev-&gt;device, r-&gt;req.cqe,</div><div class='add'>+			sizeof(*r-&gt;req.cqe), DMA_TO_DEVICE);</div><div class='ctx'> 	if (ib_dma_mapping_error(ndev-&gt;device, r-&gt;send_sge.addr))</div><div class='ctx'> 		goto out_free_rsp;</div><div class='ctx'> </div><div class='del'>-	r-&gt;send_sge.length = sizeof(*r-&gt;req.rsp);</div><div class='add'>+	r-&gt;req.p2p_client = &amp;ndev-&gt;device-&gt;dev;</div><div class='add'>+	r-&gt;send_sge.length = sizeof(*r-&gt;req.cqe);</div><div class='ctx'> 	r-&gt;send_sge.lkey = ndev-&gt;pd-&gt;local_dma_lkey;</div><div class='ctx'> </div><div class='ctx'> 	r-&gt;send_cqe.done = nvmet_rdma_send_done;</div><div class='hunk'>@@ -388,7 +389,7 @@ static int nvmet_rdma_alloc_rsp(struct nvmet_rdma_device *ndev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_free_rsp:</div><div class='del'>-	kfree(r-&gt;req.rsp);</div><div class='add'>+	kfree(r-&gt;req.cqe);</div><div class='ctx'> out:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -397,8 +398,8 @@ static void nvmet_rdma_free_rsp(struct nvmet_rdma_device *ndev,</div><div class='ctx'> 		struct nvmet_rdma_rsp *r)</div><div class='ctx'> {</div><div class='ctx'> 	ib_dma_unmap_single(ndev-&gt;device, r-&gt;send_sge.addr,</div><div class='del'>-				sizeof(*r-&gt;req.rsp), DMA_TO_DEVICE);</div><div class='del'>-	kfree(r-&gt;req.rsp);</div><div class='add'>+				sizeof(*r-&gt;req.cqe), DMA_TO_DEVICE);</div><div class='add'>+	kfree(r-&gt;req.cqe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -763,8 +764,6 @@ static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue,</div><div class='ctx'> 		cmd-&gt;send_sge.addr, cmd-&gt;send_sge.length,</div><div class='ctx'> 		DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;req.p2p_client = &amp;queue-&gt;dev-&gt;device-&gt;dev;</div><div class='del'>-</div><div class='ctx'> 	if (!nvmet_req_init(&amp;cmd-&gt;req, &amp;queue-&gt;nvme_cq,</div><div class='ctx'> 			&amp;queue-&gt;nvme_sq, &amp;nvmet_rdma_ops))</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c<br/>index ad0df786fe93..69b83fa0c76c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/tcp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvme/target/tcp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvme/target/tcp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvme/target/tcp.c</a></div><div class='hunk'>@@ -161,14 +161,14 @@ static inline bool nvmet_tcp_has_data_in(struct nvmet_tcp_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> static inline bool nvmet_tcp_need_data_in(struct nvmet_tcp_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	return nvmet_tcp_has_data_in(cmd) &amp;&amp; !cmd-&gt;req.rsp-&gt;status;</div><div class='add'>+	return nvmet_tcp_has_data_in(cmd) &amp;&amp; !cmd-&gt;req.cqe-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool nvmet_tcp_need_data_out(struct nvmet_tcp_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	return !nvme_is_write(cmd-&gt;req.cmd) &amp;&amp;</div><div class='ctx'> 		cmd-&gt;req.transfer_len &gt; 0 &amp;&amp;</div><div class='del'>-		!cmd-&gt;req.rsp-&gt;status;</div><div class='add'>+		!cmd-&gt;req.cqe-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool nvmet_tcp_has_inline_data(struct nvmet_tcp_cmd *cmd)</div><div class='hunk'>@@ -371,13 +371,14 @@ static void nvmet_setup_c2h_data_pdu(struct nvmet_tcp_cmd *cmd)</div><div class='ctx'> 	cmd-&gt;state = NVMET_TCP_SEND_DATA_PDU;</div><div class='ctx'> </div><div class='ctx'> 	pdu-&gt;hdr.type = nvme_tcp_c2h_data;</div><div class='del'>-	pdu-&gt;hdr.flags = NVME_TCP_F_DATA_LAST;</div><div class='add'>+	pdu-&gt;hdr.flags = NVME_TCP_F_DATA_LAST | (queue-&gt;nvme_sq.sqhd_disabled ?</div><div class='add'>+						NVME_TCP_F_DATA_SUCCESS : 0);</div><div class='ctx'> 	pdu-&gt;hdr.hlen = sizeof(*pdu);</div><div class='ctx'> 	pdu-&gt;hdr.pdo = pdu-&gt;hdr.hlen + hdgst;</div><div class='ctx'> 	pdu-&gt;hdr.plen =</div><div class='ctx'> 		cpu_to_le32(pdu-&gt;hdr.hlen + hdgst +</div><div class='ctx'> 				cmd-&gt;req.transfer_len + ddgst);</div><div class='del'>-	pdu-&gt;command_id = cmd-&gt;req.rsp-&gt;command_id;</div><div class='add'>+	pdu-&gt;command_id = cmd-&gt;req.cqe-&gt;command_id;</div><div class='ctx'> 	pdu-&gt;data_length = cpu_to_le32(cmd-&gt;req.transfer_len);</div><div class='ctx'> 	pdu-&gt;data_offset = cpu_to_le32(cmd-&gt;wbytes_done);</div><div class='ctx'> </div><div class='hunk'>@@ -542,8 +543,19 @@ static int nvmet_try_send_data(struct nvmet_tcp_cmd *cmd)</div><div class='ctx'> 		cmd-&gt;state = NVMET_TCP_SEND_DDGST;</div><div class='ctx'> 		cmd-&gt;offset = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		nvmet_setup_response_pdu(cmd);</div><div class='add'>+		if (queue-&gt;nvme_sq.sqhd_disabled) {</div><div class='add'>+			cmd-&gt;queue-&gt;snd_cmd = NULL;</div><div class='add'>+			nvmet_tcp_put_cmd(cmd);</div><div class='add'>+		} else {</div><div class='add'>+			nvmet_setup_response_pdu(cmd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;nvme_sq.sqhd_disabled) {</div><div class='add'>+		kfree(cmd-&gt;iov);</div><div class='add'>+		sgl_free(cmd-&gt;req.sg);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -619,7 +631,13 @@ static int nvmet_try_send_ddgst(struct nvmet_tcp_cmd *cmd)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;offset += ret;</div><div class='del'>-	nvmet_setup_response_pdu(cmd);</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;nvme_sq.sqhd_disabled) {</div><div class='add'>+		cmd-&gt;queue-&gt;snd_cmd = NULL;</div><div class='add'>+		nvmet_tcp_put_cmd(cmd);</div><div class='add'>+	} else {</div><div class='add'>+		nvmet_setup_response_pdu(cmd);</div><div class='add'>+	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -756,12 +774,6 @@ static int nvmet_tcp_handle_icreq(struct nvmet_tcp_queue *queue)</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (icreq-&gt;maxr2t != 0) {</div><div class='del'>-		pr_err("queue %d: unsupported maxr2t %d\n", queue-&gt;idx,</div><div class='del'>-			le32_to_cpu(icreq-&gt;maxr2t) + 1);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	queue-&gt;hdr_digest = !!(icreq-&gt;digest &amp; NVME_TCP_HDR_DIGEST_ENABLE);</div><div class='ctx'> 	queue-&gt;data_digest = !!(icreq-&gt;digest &amp; NVME_TCP_DATA_DIGEST_ENABLE);</div><div class='ctx'> 	if (queue-&gt;hdr_digest || queue-&gt;data_digest) {</div><div class='hunk'>@@ -1206,7 +1218,7 @@ static int nvmet_tcp_alloc_cmd(struct nvmet_tcp_queue *queue,</div><div class='ctx'> 			sizeof(*c-&gt;rsp_pdu) + hdgst, GFP_KERNEL | __GFP_ZERO);</div><div class='ctx'> 	if (!c-&gt;rsp_pdu)</div><div class='ctx'> 		goto out_free_cmd;</div><div class='del'>-	c-&gt;req.rsp = &amp;c-&gt;rsp_pdu-&gt;cqe;</div><div class='add'>+	c-&gt;req.cqe = &amp;c-&gt;rsp_pdu-&gt;cqe;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;data_pdu = page_frag_alloc(&amp;queue-&gt;pf_cache,</div><div class='ctx'> 			sizeof(*c-&gt;data_pdu) + hdgst, GFP_KERNEL | __GFP_ZERO);</div><div class='head'>diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig<br/>index 530d570724c9..6b2c4254c2fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/Kconfig</a></div><div class='hunk'>@@ -13,6 +13,16 @@ menuconfig NVMEM</div><div class='ctx'> </div><div class='ctx'> if NVMEM</div><div class='ctx'> </div><div class='add'>+config NVMEM_SYSFS</div><div class='add'>+	bool "/sys/bus/nvmem/devices/*/nvmem (sysfs interface)"</div><div class='add'>+	depends on SYSFS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	 Say Y here to add a sysfs interface for NVMEM.</div><div class='add'>+</div><div class='add'>+	 This interface is mostly used by userspace applications to</div><div class='add'>+	 read/write directly into nvmem.</div><div class='add'>+</div><div class='ctx'> config NVMEM_IMX_IIM</div><div class='ctx'> 	tristate "i.MX IC Identification Module support"</div><div class='ctx'> 	depends on ARCH_MXC || COMPILE_TEST</div><div class='hunk'>@@ -25,8 +35,8 @@ config NVMEM_IMX_IIM</div><div class='ctx'> 	  will be called nvmem-imx-iim.</div><div class='ctx'> </div><div class='ctx'> config NVMEM_IMX_OCOTP</div><div class='del'>-	tristate "i.MX6 On-Chip OTP Controller support"</div><div class='del'>-	depends on SOC_IMX6 || SOC_IMX7D || COMPILE_TEST</div><div class='add'>+	tristate "i.MX 6/7/8 On-Chip OTP Controller support"</div><div class='add'>+	depends on ARCH_MXC || COMPILE_TEST</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a driver for the On-Chip OTP Controller (OCOTP) available on</div><div class='hunk'>@@ -113,6 +123,16 @@ config NVMEM_BCM_OCOTP</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called nvmem-bcm-ocotp.</div><div class='ctx'> </div><div class='add'>+config NVMEM_STM32_ROMEM</div><div class='add'>+	tristate "STMicroelectronics STM32 factory-programmed memory support"</div><div class='add'>+	depends on ARCH_STM32 || COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  Say y here to enable read-only access for STMicroelectronics STM32</div><div class='add'>+	  factory-programmed memory area.</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 nvmem-stm32-romem.</div><div class='add'>+</div><div class='ctx'> config NVMEM_SUNXI_SID</div><div class='ctx'> 	tristate "Allwinner SoCs SID support"</div><div class='ctx'> 	depends on ARCH_SUNXI</div><div class='head'>diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile<br/>index 2ece8ffffdda..c1fe4768dfef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/Makefile</a></div><div class='hunk'>@@ -6,6 +6,9 @@</div><div class='ctx'> obj-$(CONFIG_NVMEM)		+= nvmem_core.o</div><div class='ctx'> nvmem_core-y			:= core.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_NVMEM_SYSFS)	+= nvmem_sysfs.o</div><div class='add'>+nvmem_sysfs-y			:= nvmem-sysfs.o</div><div class='add'>+</div><div class='ctx'> # Devices</div><div class='ctx'> obj-$(CONFIG_NVMEM_BCM_OCOTP)	+= nvmem-bcm-ocotp.o</div><div class='ctx'> nvmem-bcm-ocotp-y		:= bcm-ocotp.o</div><div class='hunk'>@@ -26,6 +29,8 @@ nvmem_qfprom-y			:= qfprom.o</div><div class='ctx'> obj-$(CONFIG_ROCKCHIP_EFUSE)	+= nvmem_rockchip_efuse.o</div><div class='ctx'> nvmem_rockchip_efuse-y		:= rockchip-efuse.o</div><div class='ctx'> obj-$(CONFIG_NVMEM_SUNXI_SID)	+= nvmem_sunxi_sid.o</div><div class='add'>+nvmem_stm32_romem-y 		:= stm32-romem.o</div><div class='add'>+obj-$(CONFIG_NVMEM_STM32_ROMEM) += nvmem_stm32_romem.o</div><div class='ctx'> nvmem_sunxi_sid-y		:= sunxi_sid.o</div><div class='ctx'> obj-$(CONFIG_UNIPHIER_EFUSE)	+= nvmem-uniphier-efuse.o</div><div class='ctx'> nvmem-uniphier-efuse-y		:= uniphier-efuse.o</div><div class='head'>diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c<br/>index f24008b66826..c7892c3da91f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/core.c</a></div><div class='hunk'>@@ -17,27 +17,7 @@</div><div class='ctx'> #include &lt;linux/nvmem-provider.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-struct nvmem_device {</div><div class='del'>-	struct module		*owner;</div><div class='del'>-	struct device		dev;</div><div class='del'>-	int			stride;</div><div class='del'>-	int			word_size;</div><div class='del'>-	int			id;</div><div class='del'>-	struct kref		refcnt;</div><div class='del'>-	size_t			size;</div><div class='del'>-	bool			read_only;</div><div class='del'>-	int			flags;</div><div class='del'>-	enum nvmem_type		type;</div><div class='del'>-	struct bin_attribute	eeprom;</div><div class='del'>-	struct device		*base_dev;</div><div class='del'>-	struct list_head	cells;</div><div class='del'>-	nvmem_reg_read_t	reg_read;</div><div class='del'>-	nvmem_reg_write_t	reg_write;</div><div class='del'>-	void *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define FLAG_COMPAT		BIT(0)</div><div class='add'>+#include "nvmem.h"</div><div class='ctx'> </div><div class='ctx'> struct nvmem_cell {</div><div class='ctx'> 	const char		*name;</div><div class='hunk'>@@ -61,18 +41,7 @@ static LIST_HEAD(nvmem_lookup_list);</div><div class='ctx'> </div><div class='ctx'> static BLOCKING_NOTIFIER_HEAD(nvmem_notifier);</div><div class='ctx'> </div><div class='del'>-static const char * const nvmem_type_str[] = {</div><div class='del'>-	[NVMEM_TYPE_UNKNOWN] = "Unknown",</div><div class='del'>-	[NVMEM_TYPE_EEPROM] = "EEPROM",</div><div class='del'>-	[NVMEM_TYPE_OTP] = "OTP",</div><div class='del'>-	[NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='del'>-static struct lock_class_key eeprom_lock_key;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define to_nvmem_device(d) container_of(d, struct nvmem_device, dev)</div><div class='ctx'> static int nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,</div><div class='ctx'> 			  void *val, size_t bytes)</div><div class='ctx'> {</div><div class='hunk'>@@ -91,187 +60,6 @@ static int nvmem_reg_write(struct nvmem_device *nvmem, unsigned int offset,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t type_show(struct device *dev,</div><div class='del'>-			 struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct nvmem_device *nvmem = to_nvmem_device(dev);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%s\n", nvmem_type_str[nvmem-&gt;type]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR_RO(type);</div><div class='del'>-</div><div class='del'>-static struct attribute *nvmem_attrs[] = {</div><div class='del'>-	&amp;dev_attr_type.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,</div><div class='del'>-				    struct bin_attribute *attr,</div><div class='del'>-				    char *buf, loff_t pos, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct nvmem_device *nvmem;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (attr-&gt;private)</div><div class='del'>-		dev = attr-&gt;private;</div><div class='del'>-	else</div><div class='del'>-		dev = container_of(kobj, struct device, kobj);</div><div class='del'>-	nvmem = to_nvmem_device(dev);</div><div class='del'>-</div><div class='del'>-	/* Stop the user from reading */</div><div class='del'>-	if (pos &gt;= nvmem-&gt;size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (count &lt; nvmem-&gt;word_size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (pos + count &gt; nvmem-&gt;size)</div><div class='del'>-		count = nvmem-&gt;size - pos;</div><div class='del'>-</div><div class='del'>-	count = round_down(count, nvmem-&gt;word_size);</div><div class='del'>-</div><div class='del'>-	rc = nvmem_reg_read(nvmem, pos, buf, count);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,</div><div class='del'>-				     struct bin_attribute *attr,</div><div class='del'>-				     char *buf, loff_t pos, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct nvmem_device *nvmem;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (attr-&gt;private)</div><div class='del'>-		dev = attr-&gt;private;</div><div class='del'>-	else</div><div class='del'>-		dev = container_of(kobj, struct device, kobj);</div><div class='del'>-	nvmem = to_nvmem_device(dev);</div><div class='del'>-</div><div class='del'>-	/* Stop the user from writing */</div><div class='del'>-	if (pos &gt;= nvmem-&gt;size)</div><div class='del'>-		return -EFBIG;</div><div class='del'>-</div><div class='del'>-	if (count &lt; nvmem-&gt;word_size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (pos + count &gt; nvmem-&gt;size)</div><div class='del'>-		count = nvmem-&gt;size - pos;</div><div class='del'>-</div><div class='del'>-	count = round_down(count, nvmem-&gt;word_size);</div><div class='del'>-</div><div class='del'>-	rc = nvmem_reg_write(nvmem, pos, buf, count);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* default read/write permissions */</div><div class='del'>-static struct bin_attribute bin_attr_rw_nvmem = {</div><div class='del'>-	.attr	= {</div><div class='del'>-		.name	= "nvmem",</div><div class='del'>-		.mode	= 0644,</div><div class='del'>-	},</div><div class='del'>-	.read	= bin_attr_nvmem_read,</div><div class='del'>-	.write	= bin_attr_nvmem_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bin_attribute *nvmem_bin_rw_attributes[] = {</div><div class='del'>-	&amp;bin_attr_rw_nvmem,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group nvmem_bin_rw_group = {</div><div class='del'>-	.bin_attrs	= nvmem_bin_rw_attributes,</div><div class='del'>-	.attrs		= nvmem_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group *nvmem_rw_dev_groups[] = {</div><div class='del'>-	&amp;nvmem_bin_rw_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* read only permission */</div><div class='del'>-static struct bin_attribute bin_attr_ro_nvmem = {</div><div class='del'>-	.attr	= {</div><div class='del'>-		.name	= "nvmem",</div><div class='del'>-		.mode	= 0444,</div><div class='del'>-	},</div><div class='del'>-	.read	= bin_attr_nvmem_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bin_attribute *nvmem_bin_ro_attributes[] = {</div><div class='del'>-	&amp;bin_attr_ro_nvmem,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group nvmem_bin_ro_group = {</div><div class='del'>-	.bin_attrs	= nvmem_bin_ro_attributes,</div><div class='del'>-	.attrs		= nvmem_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group *nvmem_ro_dev_groups[] = {</div><div class='del'>-	&amp;nvmem_bin_ro_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* default read/write permissions, root only */</div><div class='del'>-static struct bin_attribute bin_attr_rw_root_nvmem = {</div><div class='del'>-	.attr	= {</div><div class='del'>-		.name	= "nvmem",</div><div class='del'>-		.mode	= 0600,</div><div class='del'>-	},</div><div class='del'>-	.read	= bin_attr_nvmem_read,</div><div class='del'>-	.write	= bin_attr_nvmem_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bin_attribute *nvmem_bin_rw_root_attributes[] = {</div><div class='del'>-	&amp;bin_attr_rw_root_nvmem,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group nvmem_bin_rw_root_group = {</div><div class='del'>-	.bin_attrs	= nvmem_bin_rw_root_attributes,</div><div class='del'>-	.attrs		= nvmem_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group *nvmem_rw_root_dev_groups[] = {</div><div class='del'>-	&amp;nvmem_bin_rw_root_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* read only permission, root only */</div><div class='del'>-static struct bin_attribute bin_attr_ro_root_nvmem = {</div><div class='del'>-	.attr	= {</div><div class='del'>-		.name	= "nvmem",</div><div class='del'>-		.mode	= 0400,</div><div class='del'>-	},</div><div class='del'>-	.read	= bin_attr_nvmem_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bin_attribute *nvmem_bin_ro_root_attributes[] = {</div><div class='del'>-	&amp;bin_attr_ro_root_nvmem,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group nvmem_bin_ro_root_group = {</div><div class='del'>-	.bin_attrs	= nvmem_bin_ro_root_attributes,</div><div class='del'>-	.attrs		= nvmem_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct attribute_group *nvmem_ro_root_dev_groups[] = {</div><div class='del'>-	&amp;nvmem_bin_ro_root_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void nvmem_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvmem_device *nvmem = to_nvmem_device(dev);</div><div class='hunk'>@@ -422,43 +210,6 @@ err:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * nvmem_setup_compat() - Create an additional binary entry in</div><div class='del'>- * drivers sys directory, to be backwards compatible with the older</div><div class='del'>- * drivers/misc/eeprom drivers.</div><div class='del'>- */</div><div class='del'>-static int nvmem_setup_compat(struct nvmem_device *nvmem,</div><div class='del'>-			      const struct nvmem_config *config)</div><div class='del'>-{</div><div class='del'>-	int rval;</div><div class='del'>-</div><div class='del'>-	if (!config-&gt;base_dev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (nvmem-&gt;read_only)</div><div class='del'>-		nvmem-&gt;eeprom = bin_attr_ro_root_nvmem;</div><div class='del'>-	else</div><div class='del'>-		nvmem-&gt;eeprom = bin_attr_rw_root_nvmem;</div><div class='del'>-	nvmem-&gt;eeprom.attr.name = "eeprom";</div><div class='del'>-	nvmem-&gt;eeprom.size = nvmem-&gt;size;</div><div class='del'>-#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='del'>-	nvmem-&gt;eeprom.attr.key = &amp;eeprom_lock_key;</div><div class='del'>-#endif</div><div class='del'>-	nvmem-&gt;eeprom.private = &amp;nvmem-&gt;dev;</div><div class='del'>-	nvmem-&gt;base_dev = config-&gt;base_dev;</div><div class='del'>-</div><div class='del'>-	rval = device_create_bin_file(nvmem-&gt;base_dev, &amp;nvmem-&gt;eeprom);</div><div class='del'>-	if (rval) {</div><div class='del'>-		dev_err(&amp;nvmem-&gt;dev,</div><div class='del'>-			"Failed to create eeprom binary file %d\n", rval);</div><div class='del'>-		return rval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nvmem-&gt;flags |= FLAG_COMPAT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nvmem_register_notifier() - Register a notifier block for nvmem events.</div><div class='ctx'>  *</div><div class='hunk'>@@ -651,14 +402,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)</div><div class='ctx'> 	nvmem-&gt;read_only = device_property_present(config-&gt;dev, "read-only") ||</div><div class='ctx'> 			   config-&gt;read_only || !nvmem-&gt;reg_write;</div><div class='ctx'> </div><div class='del'>-	if (config-&gt;root_only)</div><div class='del'>-		nvmem-&gt;dev.groups = nvmem-&gt;read_only ?</div><div class='del'>-			nvmem_ro_root_dev_groups :</div><div class='del'>-			nvmem_rw_root_dev_groups;</div><div class='del'>-	else</div><div class='del'>-		nvmem-&gt;dev.groups = nvmem-&gt;read_only ?</div><div class='del'>-			nvmem_ro_dev_groups :</div><div class='del'>-			nvmem_rw_dev_groups;</div><div class='add'>+	nvmem-&gt;dev.groups = nvmem_sysfs_get_groups(nvmem, config);</div><div class='ctx'> </div><div class='ctx'> 	device_initialize(&amp;nvmem-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -669,7 +413,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)</div><div class='ctx'> 		goto err_put_device;</div><div class='ctx'> </div><div class='ctx'> 	if (config-&gt;compat) {</div><div class='del'>-		rval = nvmem_setup_compat(nvmem, config);</div><div class='add'>+		rval = nvmem_sysfs_setup_compat(nvmem, config);</div><div class='ctx'> 		if (rval)</div><div class='ctx'> 			goto err_device_del;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -696,7 +440,7 @@ err_remove_cells:</div><div class='ctx'> 	nvmem_device_remove_all_cells(nvmem);</div><div class='ctx'> err_teardown_compat:</div><div class='ctx'> 	if (config-&gt;compat)</div><div class='del'>-		device_remove_bin_file(nvmem-&gt;base_dev, &amp;nvmem-&gt;eeprom);</div><div class='add'>+		nvmem_sysfs_remove_compat(nvmem, config);</div><div class='ctx'> err_device_del:</div><div class='ctx'> 	device_del(&amp;nvmem-&gt;dev);</div><div class='ctx'> err_put_device:</div><div class='hunk'>@@ -1166,7 +910,7 @@ EXPORT_SYMBOL_GPL(nvmem_cell_put);</div><div class='ctx'> static void nvmem_shift_read_buffer_in_place(struct nvmem_cell *cell, void *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *p, *b;</div><div class='del'>-	int i, bit_offset = cell-&gt;bit_offset;</div><div class='add'>+	int i, extra, bit_offset = cell-&gt;bit_offset;</div><div class='ctx'> </div><div class='ctx'> 	p = b = buf;</div><div class='ctx'> 	if (bit_offset) {</div><div class='hunk'>@@ -1181,11 +925,16 @@ static void nvmem_shift_read_buffer_in_place(struct nvmem_cell *cell, void *buf)</div><div class='ctx'> 			p = b;</div><div class='ctx'> 			*b++ &gt;&gt;= bit_offset;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* result fits in less bytes */</div><div class='del'>-		if (cell-&gt;bytes != DIV_ROUND_UP(cell-&gt;nbits, BITS_PER_BYTE))</div><div class='del'>-			*p-- = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* point to the msb */</div><div class='add'>+		p += cell-&gt;bytes - 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* result fits in less bytes */</div><div class='add'>+	extra = cell-&gt;bytes - DIV_ROUND_UP(cell-&gt;nbits, BITS_PER_BYTE);</div><div class='add'>+	while (--extra &gt;= 0)</div><div class='add'>+		*p-- = 0;</div><div class='add'>+</div><div class='ctx'> 	/* clear msb bits if any leftover in the last byte */</div><div class='ctx'> 	*p &amp;= GENMASK((cell-&gt;nbits%BITS_PER_BYTE) - 1, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1335,6 +1084,43 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len)</div><div class='ctx'> EXPORT_SYMBOL_GPL(nvmem_cell_write);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nvmem_cell_read_u16() - Read a cell value as an u16</div><div class='add'>+ *</div><div class='add'>+ * @dev: Device that requests the nvmem cell.</div><div class='add'>+ * @cell_id: Name of nvmem cell to read.</div><div class='add'>+ * @val: pointer to output value.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative errno.</div><div class='add'>+ */</div><div class='add'>+int nvmem_cell_read_u16(struct device *dev, const char *cell_id, u16 *val)</div><div class='add'>+{</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	cell = nvmem_cell_get(dev, cell_id);</div><div class='add'>+	if (IS_ERR(cell))</div><div class='add'>+		return PTR_ERR(cell);</div><div class='add'>+</div><div class='add'>+	buf = nvmem_cell_read(cell, &amp;len);</div><div class='add'>+	if (IS_ERR(buf)) {</div><div class='add'>+		nvmem_cell_put(cell);</div><div class='add'>+		return PTR_ERR(buf);</div><div class='add'>+	}</div><div class='add'>+	if (len != sizeof(*val)) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		nvmem_cell_put(cell);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	memcpy(val, buf, sizeof(*val));</div><div class='add'>+	kfree(buf);</div><div class='add'>+	nvmem_cell_put(cell);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nvmem_cell_read_u16);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nvmem_cell_read_u32() - Read a cell value as an u32</div><div class='ctx'>  *</div><div class='ctx'>  * @dev: Device that requests the nvmem cell.</div><div class='head'>diff --git a/drivers/nvmem/imx-iim.c b/drivers/nvmem/imx-iim.c<br/>index 6651e4cdc002..34582293b985 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/imx-iim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/imx-iim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/imx-iim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/imx-iim.c</a></div><div class='hunk'>@@ -104,7 +104,6 @@ static int imx_iim_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct of_device_id *of_id;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	struct iim_priv *iim;</div><div class='ctx'> 	struct nvmem_device *nvmem;</div><div class='ctx'> 	struct nvmem_config cfg = {};</div><div class='hunk'>@@ -114,8 +113,7 @@ static int imx_iim_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!iim)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	iim-&gt;base = devm_ioremap_resource(dev, res);</div><div class='add'>+	iim-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(iim-&gt;base))</div><div class='ctx'> 		return PTR_ERR(iim-&gt;base);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c<br/>index 08a9b1ef8ae4..4cf7b61e4bf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/imx-ocotp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/imx-ocotp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/imx-ocotp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/imx-ocotp.c</a></div><div class='hunk'>@@ -444,6 +444,12 @@ static const struct ocotp_params imx7ulp_params = {</div><div class='ctx'> 	.bank_address_words = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ocotp_params imx8mq_params = {</div><div class='add'>+	.nregs = 256,</div><div class='add'>+	.bank_address_words = 4,</div><div class='add'>+	.set_timing = imx_ocotp_set_imx7_timing,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id imx_ocotp_dt_ids[] = {</div><div class='ctx'> 	{ .compatible = "fsl,imx6q-ocotp",  .data = &amp;imx6q_params },</div><div class='ctx'> 	{ .compatible = "fsl,imx6sl-ocotp", .data = &amp;imx6sl_params },</div><div class='hunk'>@@ -453,6 +459,7 @@ static const struct of_device_id imx_ocotp_dt_ids[] = {</div><div class='ctx'> 	{ .compatible = "fsl,imx7d-ocotp",  .data = &amp;imx7d_params },</div><div class='ctx'> 	{ .compatible = "fsl,imx6sll-ocotp", .data = &amp;imx6sll_params },</div><div class='ctx'> 	{ .compatible = "fsl,imx7ulp-ocotp", .data = &amp;imx7ulp_params },</div><div class='add'>+	{ .compatible = "fsl,imx8mq-ocotp", .data = &amp;imx8mq_params },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids);</div><div class='hunk'>@@ -460,7 +467,6 @@ MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids);</div><div class='ctx'> static int imx_ocotp_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	struct ocotp_priv *priv;</div><div class='ctx'> 	struct nvmem_device *nvmem;</div><div class='ctx'> </div><div class='hunk'>@@ -470,8 +476,7 @@ static int imx_ocotp_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	priv-&gt;base = devm_ioremap_resource(dev, res);</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'> 		return PTR_ERR(priv-&gt;base);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvmem/mxs-ocotp.c b/drivers/nvmem/mxs-ocotp.c<br/>index 53122f59c4b2..fbb7db6ee1f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/mxs-ocotp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/mxs-ocotp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/mxs-ocotp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/mxs-ocotp.c</a></div><div class='hunk'>@@ -145,7 +145,6 @@ static int mxs_ocotp_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	const struct mxs_data *data;</div><div class='ctx'> 	struct mxs_ocotp *otp;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	const struct of_device_id *match;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -157,8 +156,7 @@ static int mxs_ocotp_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!otp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	otp-&gt;base = devm_ioremap_resource(dev, res);</div><div class='add'>+	otp-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(otp-&gt;base))</div><div class='ctx'> 		return PTR_ERR(otp-&gt;base);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/nvmem/nvmem-sysfs.c b/drivers/nvmem/nvmem-sysfs.c<br/>new file mode 100644<br/>index 000000000000..6f303b91f6e7<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/nvmem-sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/nvmem-sysfs.c</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019, Linaro Limited</div><div class='add'>+ */</div><div class='add'>+#include "nvmem.h"</div><div class='add'>+</div><div class='add'>+static const char * const nvmem_type_str[] = {</div><div class='add'>+	[NVMEM_TYPE_UNKNOWN] = "Unknown",</div><div class='add'>+	[NVMEM_TYPE_EEPROM] = "EEPROM",</div><div class='add'>+	[NVMEM_TYPE_OTP] = "OTP",</div><div class='add'>+	[NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+static struct lock_class_key eeprom_lock_key;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static ssize_t type_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct nvmem_device *nvmem = to_nvmem_device(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", nvmem_type_str[nvmem-&gt;type]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RO(type);</div><div class='add'>+</div><div class='add'>+static struct attribute *nvmem_attrs[] = {</div><div class='add'>+	&amp;dev_attr_type.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,</div><div class='add'>+				    struct bin_attribute *attr,</div><div class='add'>+				    char *buf, loff_t pos, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct nvmem_device *nvmem;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;private)</div><div class='add'>+		dev = attr-&gt;private;</div><div class='add'>+	else</div><div class='add'>+		dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	nvmem = to_nvmem_device(dev);</div><div class='add'>+</div><div class='add'>+	/* Stop the user from reading */</div><div class='add'>+	if (pos &gt;= nvmem-&gt;size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (count &lt; nvmem-&gt;word_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pos + count &gt; nvmem-&gt;size)</div><div class='add'>+		count = nvmem-&gt;size - pos;</div><div class='add'>+</div><div class='add'>+	count = round_down(count, nvmem-&gt;word_size);</div><div class='add'>+</div><div class='add'>+	rc = nvmem-&gt;reg_read(nvmem-&gt;priv, pos, buf, count);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,</div><div class='add'>+				     struct bin_attribute *attr,</div><div class='add'>+				     char *buf, loff_t pos, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct nvmem_device *nvmem;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;private)</div><div class='add'>+		dev = attr-&gt;private;</div><div class='add'>+	else</div><div class='add'>+		dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	nvmem = to_nvmem_device(dev);</div><div class='add'>+</div><div class='add'>+	/* Stop the user from writing */</div><div class='add'>+	if (pos &gt;= nvmem-&gt;size)</div><div class='add'>+		return -EFBIG;</div><div class='add'>+</div><div class='add'>+	if (count &lt; nvmem-&gt;word_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pos + count &gt; nvmem-&gt;size)</div><div class='add'>+		count = nvmem-&gt;size - pos;</div><div class='add'>+</div><div class='add'>+	count = round_down(count, nvmem-&gt;word_size);</div><div class='add'>+</div><div class='add'>+	rc = nvmem-&gt;reg_write(nvmem-&gt;priv, pos, buf, count);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* default read/write permissions */</div><div class='add'>+static struct bin_attribute bin_attr_rw_nvmem = {</div><div class='add'>+	.attr	= {</div><div class='add'>+		.name	= "nvmem",</div><div class='add'>+		.mode	= 0644,</div><div class='add'>+	},</div><div class='add'>+	.read	= bin_attr_nvmem_read,</div><div class='add'>+	.write	= bin_attr_nvmem_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bin_attribute *nvmem_bin_rw_attributes[] = {</div><div class='add'>+	&amp;bin_attr_rw_nvmem,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group nvmem_bin_rw_group = {</div><div class='add'>+	.bin_attrs	= nvmem_bin_rw_attributes,</div><div class='add'>+	.attrs		= nvmem_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *nvmem_rw_dev_groups[] = {</div><div class='add'>+	&amp;nvmem_bin_rw_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* read only permission */</div><div class='add'>+static struct bin_attribute bin_attr_ro_nvmem = {</div><div class='add'>+	.attr	= {</div><div class='add'>+		.name	= "nvmem",</div><div class='add'>+		.mode	= 0444,</div><div class='add'>+	},</div><div class='add'>+	.read	= bin_attr_nvmem_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bin_attribute *nvmem_bin_ro_attributes[] = {</div><div class='add'>+	&amp;bin_attr_ro_nvmem,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group nvmem_bin_ro_group = {</div><div class='add'>+	.bin_attrs	= nvmem_bin_ro_attributes,</div><div class='add'>+	.attrs		= nvmem_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *nvmem_ro_dev_groups[] = {</div><div class='add'>+	&amp;nvmem_bin_ro_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* default read/write permissions, root only */</div><div class='add'>+static struct bin_attribute bin_attr_rw_root_nvmem = {</div><div class='add'>+	.attr	= {</div><div class='add'>+		.name	= "nvmem",</div><div class='add'>+		.mode	= 0600,</div><div class='add'>+	},</div><div class='add'>+	.read	= bin_attr_nvmem_read,</div><div class='add'>+	.write	= bin_attr_nvmem_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bin_attribute *nvmem_bin_rw_root_attributes[] = {</div><div class='add'>+	&amp;bin_attr_rw_root_nvmem,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group nvmem_bin_rw_root_group = {</div><div class='add'>+	.bin_attrs	= nvmem_bin_rw_root_attributes,</div><div class='add'>+	.attrs		= nvmem_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *nvmem_rw_root_dev_groups[] = {</div><div class='add'>+	&amp;nvmem_bin_rw_root_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* read only permission, root only */</div><div class='add'>+static struct bin_attribute bin_attr_ro_root_nvmem = {</div><div class='add'>+	.attr	= {</div><div class='add'>+		.name	= "nvmem",</div><div class='add'>+		.mode	= 0400,</div><div class='add'>+	},</div><div class='add'>+	.read	= bin_attr_nvmem_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bin_attribute *nvmem_bin_ro_root_attributes[] = {</div><div class='add'>+	&amp;bin_attr_ro_root_nvmem,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group nvmem_bin_ro_root_group = {</div><div class='add'>+	.bin_attrs	= nvmem_bin_ro_root_attributes,</div><div class='add'>+	.attrs		= nvmem_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *nvmem_ro_root_dev_groups[] = {</div><div class='add'>+	&amp;nvmem_bin_ro_root_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct attribute_group **nvmem_sysfs_get_groups(</div><div class='add'>+					struct nvmem_device *nvmem,</div><div class='add'>+					const struct nvmem_config *config)</div><div class='add'>+{</div><div class='add'>+	if (config-&gt;root_only)</div><div class='add'>+		return nvmem-&gt;read_only ?</div><div class='add'>+			nvmem_ro_root_dev_groups :</div><div class='add'>+			nvmem_rw_root_dev_groups;</div><div class='add'>+</div><div class='add'>+	return nvmem-&gt;read_only ? nvmem_ro_dev_groups : nvmem_rw_dev_groups;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nvmem_setup_compat() - Create an additional binary entry in</div><div class='add'>+ * drivers sys directory, to be backwards compatible with the older</div><div class='add'>+ * drivers/misc/eeprom drivers.</div><div class='add'>+ */</div><div class='add'>+int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,</div><div class='add'>+			      const struct nvmem_config *config)</div><div class='add'>+{</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	if (!config-&gt;compat)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!config-&gt;base_dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nvmem-&gt;read_only)</div><div class='add'>+		nvmem-&gt;eeprom = bin_attr_ro_root_nvmem;</div><div class='add'>+	else</div><div class='add'>+		nvmem-&gt;eeprom = bin_attr_rw_root_nvmem;</div><div class='add'>+	nvmem-&gt;eeprom.attr.name = "eeprom";</div><div class='add'>+	nvmem-&gt;eeprom.size = nvmem-&gt;size;</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+	nvmem-&gt;eeprom.attr.key = &amp;eeprom_lock_key;</div><div class='add'>+#endif</div><div class='add'>+	nvmem-&gt;eeprom.private = &amp;nvmem-&gt;dev;</div><div class='add'>+	nvmem-&gt;base_dev = config-&gt;base_dev;</div><div class='add'>+</div><div class='add'>+	rval = device_create_bin_file(nvmem-&gt;base_dev, &amp;nvmem-&gt;eeprom);</div><div class='add'>+	if (rval) {</div><div class='add'>+		dev_err(&amp;nvmem-&gt;dev,</div><div class='add'>+			"Failed to create eeprom binary file %d\n", rval);</div><div class='add'>+		return rval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nvmem-&gt;flags |= FLAG_COMPAT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,</div><div class='add'>+			      const struct nvmem_config *config)</div><div class='add'>+{</div><div class='add'>+	if (config-&gt;compat)</div><div class='add'>+		device_remove_bin_file(nvmem-&gt;base_dev, &amp;nvmem-&gt;eeprom);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/nvmem/nvmem.h b/drivers/nvmem/nvmem.h<br/>new file mode 100644<br/>index 000000000000..eb8ed7121fa3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/nvmem.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/nvmem.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'>+#ifndef _DRIVERS_NVMEM_H</div><div class='add'>+#define _DRIVERS_NVMEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-provider.h&gt;</div><div class='add'>+</div><div class='add'>+struct nvmem_device {</div><div class='add'>+	struct module		*owner;</div><div class='add'>+	struct device		dev;</div><div class='add'>+	int			stride;</div><div class='add'>+	int			word_size;</div><div class='add'>+	int			id;</div><div class='add'>+	struct kref		refcnt;</div><div class='add'>+	size_t			size;</div><div class='add'>+	bool			read_only;</div><div class='add'>+	int			flags;</div><div class='add'>+	enum nvmem_type		type;</div><div class='add'>+	struct bin_attribute	eeprom;</div><div class='add'>+	struct device		*base_dev;</div><div class='add'>+	struct list_head	cells;</div><div class='add'>+	nvmem_reg_read_t	reg_read;</div><div class='add'>+	nvmem_reg_write_t	reg_write;</div><div class='add'>+	void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_nvmem_device(d) container_of(d, struct nvmem_device, dev)</div><div class='add'>+#define FLAG_COMPAT		BIT(0)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NVMEM_SYSFS</div><div class='add'>+const struct attribute_group **nvmem_sysfs_get_groups(</div><div class='add'>+					struct nvmem_device *nvmem,</div><div class='add'>+					const struct nvmem_config *config);</div><div class='add'>+int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,</div><div class='add'>+			      const struct nvmem_config *config);</div><div class='add'>+void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,</div><div class='add'>+			      const struct nvmem_config *config);</div><div class='add'>+#else</div><div class='add'>+static inline const struct attribute_group **nvmem_sysfs_get_groups(</div><div class='add'>+					struct nvmem_device *nvmem,</div><div class='add'>+					const struct nvmem_config *config)</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 nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,</div><div class='add'>+				      const struct nvmem_config *config)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+static inline void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,</div><div class='add'>+			      const struct nvmem_config *config)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NVMEM_SYSFS */</div><div class='add'>+</div><div class='add'>+#endif /* _DRIVERS_NVMEM_H */</div><div class='head'>diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c<br/>new file mode 100644<br/>index 000000000000..354be526897f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/stm32-romem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/stm32-romem.c</a></div><div class='hunk'>@@ -0,0 +1,202 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * STM32 Factory-programmed memory read access driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved</div><div class='add'>+ * Author: Fabrice Gasnier &lt;fabrice.gasnier@st.com&gt; for STMicroelectronics.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/arm-smccc.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+</div><div class='add'>+/* BSEC secure service access from non-secure */</div><div class='add'>+#define STM32_SMC_BSEC			0x82001003</div><div class='add'>+#define STM32_SMC_READ_SHADOW		0x01</div><div class='add'>+#define STM32_SMC_PROG_OTP		0x02</div><div class='add'>+#define STM32_SMC_WRITE_SHADOW		0x03</div><div class='add'>+#define STM32_SMC_READ_OTP		0x04</div><div class='add'>+</div><div class='add'>+/* shadow registers offest */</div><div class='add'>+#define STM32MP15_BSEC_DATA0		0x200</div><div class='add'>+</div><div class='add'>+/* 32 (x 32-bits) lower shadow registers */</div><div class='add'>+#define STM32MP15_BSEC_NUM_LOWER	32</div><div class='add'>+</div><div class='add'>+struct stm32_romem_cfg {</div><div class='add'>+	int size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32_romem_priv {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct nvmem_config cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_romem_read(void *context, unsigned int offset, void *buf,</div><div class='add'>+			    size_t bytes)</div><div class='add'>+{</div><div class='add'>+	struct stm32_romem_priv *priv = context;</div><div class='add'>+	u8 *buf8 = buf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; offset + bytes; i++)</div><div class='add'>+		*buf8++ = readb_relaxed(priv-&gt;base + i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_bsec_smc(u8 op, u32 otp, u32 data, u32 *result)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_HAVE_ARM_SMCCC)</div><div class='add'>+	struct arm_smccc_res res;</div><div class='add'>+</div><div class='add'>+	arm_smccc_smc(STM32_SMC_BSEC, op, otp, data, 0, 0, 0, 0, &amp;res);</div><div class='add'>+	if (res.a0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='add'>+		*result = (u32)res.a1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+#else</div><div class='add'>+	return -ENXIO;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_bsec_read(void *context, unsigned int offset, void *buf,</div><div class='add'>+			   size_t bytes)</div><div class='add'>+{</div><div class='add'>+	struct stm32_romem_priv *priv = context;</div><div class='add'>+	struct device *dev = priv-&gt;cfg.dev;</div><div class='add'>+	u32 roffset, rbytes, val;</div><div class='add'>+	u8 *buf8 = buf, *val8 = (u8 *)&amp;val;</div><div class='add'>+	int i, j = 0, ret, skip_bytes, size;</div><div class='add'>+</div><div class='add'>+	/* Round unaligned access to 32-bits */</div><div class='add'>+	roffset = rounddown(offset, 4);</div><div class='add'>+	skip_bytes = offset &amp; 0x3;</div><div class='add'>+	rbytes = roundup(bytes + skip_bytes, 4);</div><div class='add'>+</div><div class='add'>+	if (roffset + rbytes &gt; priv-&gt;cfg.size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = roffset; (i &lt; roffset + rbytes); i += 4) {</div><div class='add'>+		u32 otp = i &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+		if (otp &lt; STM32MP15_BSEC_NUM_LOWER) {</div><div class='add'>+			/* read lower data from shadow registers */</div><div class='add'>+			val = readl_relaxed(</div><div class='add'>+				priv-&gt;base + STM32MP15_BSEC_DATA0 + i);</div><div class='add'>+		} else {</div><div class='add'>+			ret = stm32_bsec_smc(STM32_SMC_READ_SHADOW, otp, 0,</div><div class='add'>+					     &amp;val);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(dev, "Can't read data%d (%d)\n", otp,</div><div class='add'>+					ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* skip first bytes in case of unaligned read */</div><div class='add'>+		if (skip_bytes)</div><div class='add'>+			size = min(bytes, (size_t)(4 - skip_bytes));</div><div class='add'>+		else</div><div class='add'>+			size = min(bytes, (size_t)4);</div><div class='add'>+		memcpy(&amp;buf8[j], &amp;val8[skip_bytes], size);</div><div class='add'>+		bytes -= size;</div><div class='add'>+		j += size;</div><div class='add'>+		skip_bytes = 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 stm32_bsec_write(void *context, unsigned int offset, void *buf,</div><div class='add'>+			    size_t bytes)</div><div class='add'>+{</div><div class='add'>+	struct stm32_romem_priv *priv = context;</div><div class='add'>+	struct device *dev = priv-&gt;cfg.dev;</div><div class='add'>+	u32 *buf32 = buf;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* Allow only writing complete 32-bits aligned words */</div><div class='add'>+	if ((bytes % 4) || (offset % 4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; offset + bytes; i += 4) {</div><div class='add'>+		ret = stm32_bsec_smc(STM32_SMC_PROG_OTP, i &gt;&gt; 2, *buf32++,</div><div class='add'>+				     NULL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Can't write data%d (%d)\n", i &gt;&gt; 2, 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 stm32_romem_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	const struct stm32_romem_cfg *cfg;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct stm32_romem_priv *priv;</div><div class='add'>+	struct resource *res;</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'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	priv-&gt;base = devm_ioremap_resource(dev, res);</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'>+	priv-&gt;cfg.name = "stm32-romem";</div><div class='add'>+	priv-&gt;cfg.word_size = 1;</div><div class='add'>+	priv-&gt;cfg.stride = 1;</div><div class='add'>+	priv-&gt;cfg.dev = dev;</div><div class='add'>+	priv-&gt;cfg.priv = priv;</div><div class='add'>+	priv-&gt;cfg.owner = THIS_MODULE;</div><div class='add'>+</div><div class='add'>+	cfg = (const struct stm32_romem_cfg *)</div><div class='add'>+		of_match_device(dev-&gt;driver-&gt;of_match_table, dev)-&gt;data;</div><div class='add'>+	if (!cfg) {</div><div class='add'>+		priv-&gt;cfg.read_only = true;</div><div class='add'>+		priv-&gt;cfg.size = resource_size(res);</div><div class='add'>+		priv-&gt;cfg.reg_read = stm32_romem_read;</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;cfg.size = cfg-&gt;size;</div><div class='add'>+		priv-&gt;cfg.reg_read = stm32_bsec_read;</div><div class='add'>+		priv-&gt;cfg.reg_write = stm32_bsec_write;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(devm_nvmem_register(dev, &amp;priv-&gt;cfg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct stm32_romem_cfg stm32mp15_bsec_cfg = {</div><div class='add'>+	.size = 384, /* 96 x 32-bits data words */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id stm32_romem_of_match[] = {</div><div class='add'>+	{ .compatible = "st,stm32f4-otp", }, {</div><div class='add'>+		.compatible = "st,stm32mp15-bsec",</div><div class='add'>+		.data = (void *)&amp;stm32mp15_bsec_cfg,</div><div class='add'>+	}, {</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, stm32_romem_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver stm32_romem_driver = {</div><div class='add'>+	.probe = stm32_romem_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "stm32-romem",</div><div class='add'>+		.of_match_table = of_match_ptr(stm32_romem_of_match),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(stm32_romem_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Fabrice Gasnier &lt;fabrice.gasnier@st.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("STMicroelectronics STM32 RO-MEM");</div><div class='add'>+MODULE_ALIAS("platform:nvmem-stm32-romem");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c<br/>index 570a2e354f30..a079a80ddf2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/sunxi_sid.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/nvmem/sunxi_sid.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/nvmem/sunxi_sid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/nvmem/sunxi_sid.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Allwinner sunXi SoCs Security ID support.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2013 Oliver Schinagl &lt;oliver@schinagl.nl&gt;</div><div class='ctx'>  * Copyright (C) 2014 Maxime Ripard &lt;maxime.ripard@free-electrons.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 as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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/device.h&gt;</div><div class='hunk'>@@ -35,13 +26,6 @@</div><div class='ctx'> #define SUN8I_SID_OP_LOCK	(0xAC &lt;&lt; 8)</div><div class='ctx'> #define SUN8I_SID_READ		BIT(1)</div><div class='ctx'> </div><div class='del'>-static struct nvmem_config econfig = {</div><div class='del'>-	.name = "sunxi-sid",</div><div class='del'>-	.read_only = true,</div><div class='del'>-	.stride = 4,</div><div class='del'>-	.word_size = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct sunxi_sid_cfg {</div><div class='ctx'> 	u32	value_offset;</div><div class='ctx'> 	u32	size;</div><div class='hunk'>@@ -53,33 +37,12 @@ struct sunxi_sid {</div><div class='ctx'> 	u32			value_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* We read the entire key, due to a 32 bit read alignment requirement. Since we</div><div class='del'>- * want to return the requested byte, this results in somewhat slower code and</div><div class='del'>- * uses 4 times more reads as needed but keeps code simpler. Since the SID is</div><div class='del'>- * only very rarely probed, this is not really an issue.</div><div class='del'>- */</div><div class='del'>-static u8 sunxi_sid_read_byte(const struct sunxi_sid *sid,</div><div class='del'>-			      const unsigned int offset)</div><div class='del'>-{</div><div class='del'>-	u32 sid_key;</div><div class='del'>-</div><div class='del'>-	sid_key = ioread32be(sid-&gt;base + round_down(offset, 4));</div><div class='del'>-	sid_key &gt;&gt;= (offset % 4) * 8;</div><div class='del'>-</div><div class='del'>-	return sid_key; /* Only return the last byte */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sunxi_sid_read(void *context, unsigned int offset,</div><div class='ctx'> 			  void *val, size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct sunxi_sid *sid = context;</div><div class='del'>-	u8 *buf = val;</div><div class='ctx'> </div><div class='del'>-	/* Offset the read operation to the real position of SID */</div><div class='del'>-	offset += sid-&gt;value_offset;</div><div class='del'>-</div><div class='del'>-	while (bytes--)</div><div class='del'>-		*buf++ = sunxi_sid_read_byte(sid, offset++);</div><div class='add'>+	memcpy_fromio(val, sid-&gt;base + sid-&gt;value_offset + offset, bytes);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -115,36 +78,34 @@ static int sun8i_sid_register_readout(const struct sunxi_sid *sid,</div><div class='ctx'>  * to be not reliable at all.</div><div class='ctx'>  * Read by the registers instead.</div><div class='ctx'>  */</div><div class='del'>-static int sun8i_sid_read_byte_by_reg(const struct sunxi_sid *sid,</div><div class='del'>-				      const unsigned int offset,</div><div class='del'>-				      u8 *out)</div><div class='del'>-{</div><div class='del'>-	u32 word;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = sun8i_sid_register_readout(sid, offset &amp; ~0x03, &amp;word);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*out = (word &gt;&gt; ((offset &amp; 0x3) * 8)) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int sun8i_sid_read_by_reg(void *context, unsigned int offset,</div><div class='ctx'> 				 void *val, size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct sunxi_sid *sid = context;</div><div class='del'>-	u8 *buf = val;</div><div class='add'>+	u32 word;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	while (bytes--) {</div><div class='del'>-		ret = sun8i_sid_read_byte_by_reg(sid, offset++, buf++);</div><div class='add'>+	/* .stride = 4 so offset is guaranteed to be aligned */</div><div class='add'>+	while (bytes &gt;= 4) {</div><div class='add'>+		ret = sun8i_sid_register_readout(sid, offset, val);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+</div><div class='add'>+		val += 4;</div><div class='add'>+		offset += 4;</div><div class='add'>+		bytes -= 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!bytes)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Handle any trailing bytes */</div><div class='add'>+	ret = sun8i_sid_register_readout(sid, offset, &amp;word);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memcpy(val, &amp;word, bytes);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,9 +113,10 @@ static int sunxi_sid_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct resource *res;</div><div class='add'>+	struct nvmem_config *nvmem_cfg;</div><div class='ctx'> 	struct nvmem_device *nvmem;</div><div class='ctx'> 	struct sunxi_sid *sid;</div><div class='del'>-	int i, size;</div><div class='add'>+	int size;</div><div class='ctx'> 	char *randomness;</div><div class='ctx'> 	const struct sunxi_sid_cfg *cfg;</div><div class='ctx'> </div><div class='hunk'>@@ -174,14 +136,23 @@ static int sunxi_sid_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	size = cfg-&gt;size;</div><div class='ctx'> </div><div class='del'>-	econfig.size = size;</div><div class='del'>-	econfig.dev = dev;</div><div class='add'>+	nvmem_cfg = devm_kzalloc(dev, sizeof(*nvmem_cfg), GFP_KERNEL);</div><div class='add'>+	if (!nvmem_cfg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nvmem_cfg-&gt;dev = dev;</div><div class='add'>+	nvmem_cfg-&gt;name = "sunxi-sid";</div><div class='add'>+	nvmem_cfg-&gt;read_only = true;</div><div class='add'>+	nvmem_cfg-&gt;size = cfg-&gt;size;</div><div class='add'>+	nvmem_cfg-&gt;word_size = 1;</div><div class='add'>+	nvmem_cfg-&gt;stride = 4;</div><div class='add'>+	nvmem_cfg-&gt;priv = sid;</div><div class='ctx'> 	if (cfg-&gt;need_register_readout)</div><div class='del'>-		econfig.reg_read = sun8i_sid_read_by_reg;</div><div class='add'>+		nvmem_cfg-&gt;reg_read = sun8i_sid_read_by_reg;</div><div class='ctx'> 	else</div><div class='del'>-		econfig.reg_read = sunxi_sid_read;</div><div class='del'>-	econfig.priv = sid;</div><div class='del'>-	nvmem = devm_nvmem_register(dev, &amp;econfig);</div><div class='add'>+		nvmem_cfg-&gt;reg_read = sunxi_sid_read;</div><div class='add'>+</div><div class='add'>+	nvmem = devm_nvmem_register(dev, nvmem_cfg);</div><div class='ctx'> 	if (IS_ERR(nvmem))</div><div class='ctx'> 		return PTR_ERR(nvmem);</div><div class='ctx'> </div><div class='hunk'>@@ -189,9 +160,7 @@ static int sunxi_sid_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!randomness)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		econfig.reg_read(sid, i, &amp;randomness[i], 1);</div><div class='del'>-</div><div class='add'>+	nvmem_cfg-&gt;reg_read(sid, 0, randomness, size);</div><div class='ctx'> 	add_device_randomness(randomness, size);</div><div class='ctx'> 	kfree(randomness);</div><div class='ctx'> </div><div class='hunk'>@@ -219,11 +188,19 @@ static const struct sunxi_sid_cfg sun50i_a64_cfg = {</div><div class='ctx'> 	.size = 0x100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct sunxi_sid_cfg sun50i_h6_cfg = {</div><div class='add'>+	.value_offset = 0x200,</div><div class='add'>+	.size = 0x200,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id sunxi_sid_of_match[] = {</div><div class='ctx'> 	{ .compatible = "allwinner,sun4i-a10-sid", .data = &amp;sun4i_a10_cfg },</div><div class='ctx'> 	{ .compatible = "allwinner,sun7i-a20-sid", .data = &amp;sun7i_a20_cfg },</div><div class='add'>+	{ .compatible = "allwinner,sun8i-a83t-sid", .data = &amp;sun50i_a64_cfg },</div><div class='ctx'> 	{ .compatible = "allwinner,sun8i-h3-sid", .data = &amp;sun8i_h3_cfg },</div><div class='ctx'> 	{ .compatible = "allwinner,sun50i-a64-sid", .data = &amp;sun50i_a64_cfg },</div><div class='add'>+	{ .compatible = "allwinner,sun50i-h5-sid", .data = &amp;sun50i_a64_cfg },</div><div class='add'>+	{ .compatible = "allwinner,sun50i-h6-sid", .data = &amp;sun50i_h6_cfg },</div><div class='ctx'> 	{/* sentinel */},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);</div><div class='head'>diff --git a/drivers/of/address.c b/drivers/of/address.c<br/>index 2270373b30ab..978427a9d5e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/address.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/address.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/address.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/address.c</a></div><div class='hunk'>@@ -569,6 +569,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,</div><div class='ctx'>  * relative to that node.</div><div class='ctx'>  */</div><div class='ctx'> static u64 __of_translate_address(struct device_node *dev,</div><div class='add'>+				  struct device_node *(*get_parent)(const struct device_node *),</div><div class='ctx'> 				  const __be32 *in_addr, const char *rprop,</div><div class='ctx'> 				  struct device_node **host)</div><div class='ctx'> {</div><div class='hunk'>@@ -585,7 +586,7 @@ static u64 __of_translate_address(struct device_node *dev,</div><div class='ctx'> </div><div class='ctx'> 	*host = NULL;</div><div class='ctx'> 	/* Get parent &amp; match bus type */</div><div class='del'>-	parent = of_get_parent(dev);</div><div class='add'>+	parent = get_parent(dev);</div><div class='ctx'> 	if (parent == NULL)</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	bus = of_match_bus(parent);</div><div class='hunk'>@@ -609,7 +610,7 @@ static u64 __of_translate_address(struct device_node *dev,</div><div class='ctx'> 		/* Switch to parent bus */</div><div class='ctx'> 		of_node_put(dev);</div><div class='ctx'> 		dev = parent;</div><div class='del'>-		parent = of_get_parent(dev);</div><div class='add'>+		parent = get_parent(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* If root, we have finished */</div><div class='ctx'> 		if (parent == NULL) {</div><div class='hunk'>@@ -665,7 +666,8 @@ u64 of_translate_address(struct device_node *dev, const __be32 *in_addr)</div><div class='ctx'> 	struct device_node *host;</div><div class='ctx'> 	u64 ret;</div><div class='ctx'> </div><div class='del'>-	ret = __of_translate_address(dev, in_addr, "ranges", &amp;host);</div><div class='add'>+	ret = __of_translate_address(dev, of_get_parent,</div><div class='add'>+				     in_addr, "ranges", &amp;host);</div><div class='ctx'> 	if (host) {</div><div class='ctx'> 		of_node_put(host);</div><div class='ctx'> 		return OF_BAD_ADDR;</div><div class='hunk'>@@ -675,12 +677,31 @@ u64 of_translate_address(struct device_node *dev, const __be32 *in_addr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_translate_address);</div><div class='ctx'> </div><div class='add'>+static struct device_node *__of_get_dma_parent(const struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct of_phandle_args args;</div><div class='add'>+	int ret, index;</div><div class='add'>+</div><div class='add'>+	index = of_property_match_string(np, "interconnect-names", "dma-mem");</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return of_get_parent(np);</div><div class='add'>+</div><div class='add'>+	ret = of_parse_phandle_with_args(np, "interconnects",</div><div class='add'>+					 "#interconnect-cells",</div><div class='add'>+					 index, &amp;args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return of_get_parent(np);</div><div class='add'>+</div><div class='add'>+	return of_node_get(args.np);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *host;</div><div class='ctx'> 	u64 ret;</div><div class='ctx'> </div><div class='del'>-	ret = __of_translate_address(dev, in_addr, "dma-ranges", &amp;host);</div><div class='add'>+	ret = __of_translate_address(dev, __of_get_dma_parent,</div><div class='add'>+				     in_addr, "dma-ranges", &amp;host);</div><div class='ctx'> </div><div class='ctx'> 	if (host) {</div><div class='ctx'> 		of_node_put(host);</div><div class='hunk'>@@ -736,7 +757,8 @@ static u64 of_translate_ioport(struct device_node *dev, const __be32 *in_addr,</div><div class='ctx'> 	unsigned long port;</div><div class='ctx'> 	struct device_node *host;</div><div class='ctx'> </div><div class='del'>-	taddr = __of_translate_address(dev, in_addr, "ranges", &amp;host);</div><div class='add'>+	taddr = __of_translate_address(dev, of_get_parent,</div><div class='add'>+				       in_addr, "ranges", &amp;host);</div><div class='ctx'> 	if (host) {</div><div class='ctx'> 		/* host-specific port access */</div><div class='ctx'> 		port = logic_pio_trans_hwaddr(&amp;host-&gt;fwnode, taddr, size);</div><div class='hunk'>@@ -908,9 +930,15 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='add'>+		struct device_node *parent;</div><div class='add'>+</div><div class='ctx'> 		naddr = of_n_addr_cells(node);</div><div class='ctx'> 		nsize = of_n_size_cells(node);</div><div class='del'>-		node = of_get_next_parent(node);</div><div class='add'>+</div><div class='add'>+		parent = __of_get_dma_parent(node);</div><div class='add'>+		of_node_put(node);</div><div class='add'>+</div><div class='add'>+		node = parent;</div><div class='ctx'> 		if (!node)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/of/base.c b/drivers/of/base.c<br/>index 5226e898476e..20e0e7ee4edf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/base.c</a></div><div class='hunk'>@@ -1350,8 +1350,9 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)</div><div class='ctx'> 		 * property data length</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (it-&gt;cur + count &gt; it-&gt;list_end) {</div><div class='del'>-			pr_err("%pOF: arguments longer than property\n",</div><div class='del'>-			       it-&gt;parent);</div><div class='add'>+			pr_err("%pOF: %s = %d found %d\n",</div><div class='add'>+			       it-&gt;parent, it-&gt;cells_name,</div><div class='add'>+			       count, it-&gt;cell_count);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/of/device.c b/drivers/of/device.c<br/>index 3717f2a20d0d..da8158392010 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/device.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * of_match_device - Tell if a struct device matches an of_device_id list</div><div class='del'>- * @ids: array of of device match structures to search in</div><div class='add'>+ * @matches: array of of device match structures to search in</div><div class='ctx'>  * @dev: the of device structure to match against</div><div class='ctx'>  *</div><div class='ctx'>  * Used by a driver to check whether an platform_device present in the</div><div class='head'>diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c<br/>index 4734223ab702..de893c9616a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/fdt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/fdt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/fdt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/fdt.c</a></div><div class='hunk'>@@ -1091,7 +1091,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,</div><div class='ctx'> 	/* Retrieve command line */</div><div class='ctx'> 	p = of_get_flat_dt_prop(node, "bootargs", &amp;l);</div><div class='ctx'> 	if (p != NULL &amp;&amp; l &gt; 0)</div><div class='del'>-		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));</div><div class='add'>+		strlcpy(data, p, min(l, COMMAND_LINE_SIZE));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CONFIG_CMDLINE is meant to be a default in case nothing else</div><div class='head'>diff --git a/drivers/of/irq.c b/drivers/of/irq.c<br/>index e1f6f392a4c0..7f84bb4903ca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/irq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/irq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/irq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/irq.c</a></div><div class='hunk'>@@ -500,7 +500,7 @@ void __init of_irq_init(const struct of_device_id *matches)</div><div class='ctx'> 		 * pointer, interrupt-parent device_node etc.</div><div class='ctx'> 		 */</div><div class='ctx'> 		desc = kzalloc(sizeof(*desc), GFP_KERNEL);</div><div class='del'>-		if (WARN_ON(!desc)) {</div><div class='add'>+		if (!desc) {</div><div class='ctx'> 			of_node_put(np);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c<br/>index 810ab0fbcccb..9649cd53e955 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/of_net.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/of_net.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/of_net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/of_net.c</a></div><div class='hunk'>@@ -7,10 +7,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/nvmem-consumer.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * of_get_phy_mode - Get phy mode for given device_node</div><div class='hunk'>@@ -48,12 +49,52 @@ static const void *of_get_mac_addr(struct device_node *np, const char *name)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const void *of_get_mac_addr_nvmem(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	struct property *pp;</div><div class='add'>+	struct platform_device *pdev = of_find_device_by_node(np);</div><div class='add'>+</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	ret = nvmem_get_mac_address(&amp;pdev-&gt;dev, &amp;mac);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	pp = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pp), GFP_KERNEL);</div><div class='add'>+	if (!pp)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	pp-&gt;name = "nvmem-mac-address";</div><div class='add'>+	pp-&gt;length = ETH_ALEN;</div><div class='add'>+	pp-&gt;value = devm_kmemdup(&amp;pdev-&gt;dev, mac, ETH_ALEN, GFP_KERNEL);</div><div class='add'>+	if (!pp-&gt;value) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_add_property(np, pp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	return pp-&gt;value;</div><div class='add'>+free:</div><div class='add'>+	devm_kfree(&amp;pdev-&gt;dev, pp-&gt;value);</div><div class='add'>+	devm_kfree(&amp;pdev-&gt;dev, pp);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Search the device tree for the best MAC address to use.  'mac-address' is</div><div class='ctx'>  * checked first, because that is supposed to contain to "most recent" MAC</div><div class='ctx'>  * address. If that isn't set, then 'local-mac-address' is checked next,</div><div class='del'>- * because that is the default address.  If that isn't set, then the obsolete</div><div class='del'>- * 'address' is checked, just in case we're using an old device tree.</div><div class='add'>+ * because that is the default address. If that isn't set, then the obsolete</div><div class='add'>+ * 'address' is checked, just in case we're using an old device tree. If any</div><div class='add'>+ * of the above isn't set, then try to get MAC address from nvmem cell named</div><div class='add'>+ * 'mac-address'.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that the 'address' property is supposed to contain a virtual address of</div><div class='ctx'>  * the register set, but some DTS files have redefined that property to be the</div><div class='hunk'>@@ -65,6 +106,8 @@ static const void *of_get_mac_addr(struct device_node *np, const char *name)</div><div class='ctx'>  * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In</div><div class='ctx'>  * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists</div><div class='ctx'>  * but is all zeros.</div><div class='add'>+ *</div><div class='add'>+ * Return: Will be a valid pointer on success and ERR_PTR in case of error.</div><div class='ctx'> */</div><div class='ctx'> const void *of_get_mac_address(struct device_node *np)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,6 +121,10 @@ const void *of_get_mac_address(struct device_node *np)</div><div class='ctx'> 	if (addr)</div><div class='ctx'> 		return addr;</div><div class='ctx'> </div><div class='del'>-	return of_get_mac_addr(np, "address");</div><div class='add'>+	addr = of_get_mac_addr(np, "address");</div><div class='add'>+	if (addr)</div><div class='add'>+		return addr;</div><div class='add'>+</div><div class='add'>+	return of_get_mac_addr_nvmem(np);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_get_mac_address);</div><div class='head'>diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c<br/>index 6a36bc0b3d64..89e190e94af7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/of_reserved_mem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/of_reserved_mem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/of_reserved_mem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/of_reserved_mem.c</a></div><div class='hunk'>@@ -171,6 +171,7 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)</div><div class='ctx'> {</div><div class='ctx'> 	extern const struct of_device_id __reservedmem_of_table[];</div><div class='ctx'> 	const struct of_device_id *i;</div><div class='add'>+	int ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	for (i = __reservedmem_of_table; i &lt; &amp;__rmem_of_table_sentinel; i++) {</div><div class='ctx'> 		reservedmem_of_init_fn initfn = i-&gt;data;</div><div class='hunk'>@@ -179,13 +180,14 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)</div><div class='ctx'> 		if (!of_flat_dt_is_compatible(rmem-&gt;fdt_node, compat))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (initfn(rmem) == 0) {</div><div class='add'>+		ret = initfn(rmem);</div><div class='add'>+		if (ret == 0) {</div><div class='ctx'> 			pr_info("initialized node %s, compatible id %s\n",</div><div class='ctx'> 				rmem-&gt;name, compat);</div><div class='del'>-			return 0;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOENT;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init __rmem_cmp(const void *a, const void *b)</div><div class='hunk'>@@ -245,7 +247,9 @@ void __init fdt_init_reserved_mem(void)</div><div class='ctx'> 		int len;</div><div class='ctx'> 		const __be32 *prop;</div><div class='ctx'> 		int err = 0;</div><div class='add'>+		int nomap;</div><div class='ctx'> </div><div class='add'>+		nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;</div><div class='ctx'> 		prop = of_get_flat_dt_prop(node, "phandle", &amp;len);</div><div class='ctx'> 		if (!prop)</div><div class='ctx'> 			prop = of_get_flat_dt_prop(node, "linux,phandle", &amp;len);</div><div class='hunk'>@@ -255,8 +259,16 @@ void __init fdt_init_reserved_mem(void)</div><div class='ctx'> 		if (rmem-&gt;size == 0)</div><div class='ctx'> 			err = __reserved_mem_alloc_size(node, rmem-&gt;name,</div><div class='ctx'> 						 &amp;rmem-&gt;base, &amp;rmem-&gt;size);</div><div class='del'>-		if (err == 0)</div><div class='del'>-			__reserved_mem_init_node(rmem);</div><div class='add'>+		if (err == 0) {</div><div class='add'>+			err = __reserved_mem_init_node(rmem);</div><div class='add'>+			if (err != 0 &amp;&amp; err != -ENOENT) {</div><div class='add'>+				pr_info("node %s compatible matching fail\n",</div><div class='add'>+					rmem-&gt;name);</div><div class='add'>+				memblock_free(rmem-&gt;base, rmem-&gt;size);</div><div class='add'>+				if (nomap)</div><div class='add'>+					memblock_add(rmem-&gt;base, rmem-&gt;size);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/of/property.c b/drivers/of/property.c<br/>index 8631efa1daa1..d7fa75e31f22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/property.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/property.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/property.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/property.c</a></div><div class='hunk'>@@ -659,7 +659,7 @@ EXPORT_SYMBOL(of_graph_get_next_endpoint);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: An 'endpoint' node pointer which is identified by reg and at the same</div><div class='ctx'>  * is the child of a port node identified by port_reg. reg and port_reg are</div><div class='del'>- * ignored when they are -1.</div><div class='add'>+ * ignored when they are -1. Use of_node_put() on the pointer when done.</div><div class='ctx'>  */</div><div class='ctx'> struct device_node *of_graph_get_endpoint_by_regs(</div><div class='ctx'> 	const struct device_node *parent, int port_reg, int reg)</div><div class='head'>diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c<br/>index cccde756b510..3832a5de4602 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/unittest.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/of/unittest.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/of/unittest.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/of/unittest.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static void __init of_unittest_check_phandles(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		nh = kzalloc(sizeof(*nh), GFP_KERNEL);</div><div class='del'>-		if (WARN_ON(!nh))</div><div class='add'>+		if (!nh)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		nh-&gt;np = np;</div><div class='hunk'>@@ -1199,12 +1199,9 @@ static int __init unittest_data_add(void)</div><div class='ctx'> </div><div class='ctx'> 	/* creating copy */</div><div class='ctx'> 	unittest_data = kmemdup(__dtb_testcases_begin, size, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!unittest_data) {</div><div class='del'>-		pr_warn("%s: Failed to allocate memory for unittest_data; "</div><div class='del'>-			"not running tests\n", __func__);</div><div class='add'>+	if (!unittest_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	of_fdt_unflatten_tree(unittest_data, NULL, &amp;unittest_data_node);</div><div class='ctx'> 	if (!unittest_data_node) {</div><div class='ctx'> 		pr_warn("%s: No tree to attach; not running tests\n", __func__);</div><div class='hunk'>@@ -1845,10 +1842,8 @@ static int unittest_i2c_bus_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev_dbg(dev, "%s for node @%pOF\n", __func__, np);</div><div class='ctx'> </div><div class='ctx'> 	std = devm_kzalloc(dev, sizeof(*std), GFP_KERNEL);</div><div class='del'>-	if (!std) {</div><div class='del'>-		dev_err(dev, "Failed to allocate unittest i2c data\n");</div><div class='add'>+	if (!std)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* link them together */</div><div class='ctx'> 	std-&gt;pdev = pdev;</div><div class='head'>diff --git a/drivers/opp/core.c b/drivers/opp/core.c<br/>index 0420f7e8ad5b..0e7703fe733f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/opp/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/opp/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/opp/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/opp/core.c</a></div><div class='hunk'>@@ -526,6 +526,60 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dev_pm_opp_find_freq_ceil_by_volt() - Find OPP with highest frequency for</div><div class='add'>+ *					 target voltage.</div><div class='add'>+ * @dev:	Device for which we do this operation.</div><div class='add'>+ * @u_volt:	Target voltage.</div><div class='add'>+ *</div><div class='add'>+ * Search for OPP with highest (ceil) frequency and has voltage &lt;= u_volt.</div><div class='add'>+ *</div><div class='add'>+ * Return: matching *opp, else returns ERR_PTR in case of error which should be</div><div class='add'>+ * handled using IS_ERR.</div><div class='add'>+ *</div><div class='add'>+ * Error return values can be:</div><div class='add'>+ * EINVAL:	bad parameters</div><div class='add'>+ *</div><div class='add'>+ * The callers are required to call dev_pm_opp_put() for the returned OPP after</div><div class='add'>+ * use.</div><div class='add'>+ */</div><div class='add'>+struct dev_pm_opp *dev_pm_opp_find_freq_ceil_by_volt(struct device *dev,</div><div class='add'>+						     unsigned long u_volt)</div><div class='add'>+{</div><div class='add'>+	struct opp_table *opp_table;</div><div class='add'>+	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);</div><div class='add'>+</div><div class='add'>+	if (!dev || !u_volt) {</div><div class='add'>+		dev_err(dev, "%s: Invalid argument volt=%lu\n", __func__,</div><div class='add'>+			u_volt);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opp_table = _find_opp_table(dev);</div><div class='add'>+	if (IS_ERR(opp_table))</div><div class='add'>+		return ERR_CAST(opp_table);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+		if (temp_opp-&gt;available) {</div><div class='add'>+			if (temp_opp-&gt;supplies[0].u_volt &gt; u_volt)</div><div class='add'>+				break;</div><div class='add'>+			opp = temp_opp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Increment the reference count of OPP */</div><div class='add'>+	if (!IS_ERR(opp))</div><div class='add'>+		dev_pm_opp_get(opp);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='add'>+	return opp;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil_by_volt);</div><div class='add'>+</div><div class='ctx'> static int _set_opp_voltage(struct device *dev, struct regulator *reg,</div><div class='ctx'> 			    struct dev_pm_opp_supply *supply)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c<br/>index 1be571c20062..6bad04cbb1d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parisc/iosapic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parisc/iosapic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parisc/iosapic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parisc/iosapic.c</a></div><div class='hunk'>@@ -157,8 +157,12 @@</div><div class='ctx'> #define DBG_IRT(x...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define COMPARE_IRTE_ADDR(irte, hpa)	((irte)-&gt;dest_iosapic_addr == (hpa))</div><div class='add'>+#else</div><div class='ctx'> #define COMPARE_IRTE_ADDR(irte, hpa)	\</div><div class='del'>-		((irte)-&gt;dest_iosapic_addr == F_EXTEND(hpa))</div><div class='add'>+		((irte)-&gt;dest_iosapic_addr == ((hpa) | 0xffffffff00000000ULL))</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define IOSAPIC_REG_SELECT              0x00</div><div class='ctx'> #define IOSAPIC_REG_WINDOW              0x10</div><div class='head'>diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c<br/>index 0c6e8b44b4ed..c60b465f6fe4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parisc/led.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parisc/led.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parisc/led.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parisc/led.c</a></div><div class='hunk'>@@ -568,6 +568,9 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DISPLAY_MODEL_LASI:</div><div class='add'>+		/* Skip to register LED in QEMU */</div><div class='add'>+		if (running_on_qemu)</div><div class='add'>+			return 1;</div><div class='ctx'> 		LED_DATA_REG = data_reg;</div><div class='ctx'> 		led_func_ptr = led_LASI_driver;</div><div class='ctx'> 		printk(KERN_INFO "LED display at %lx registered\n", LED_DATA_REG);</div><div class='head'>diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c<br/>index 56dd83a45e55..5484a46dafda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/daisy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/daisy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/daisy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parport/daisy.c</a></div><div class='hunk'>@@ -213,12 +213,10 @@ void parport_daisy_fini(struct parport *port)</div><div class='ctx'> struct pardevice *parport_open(int devnum, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct daisydev *p = topology;</div><div class='del'>-	struct pardev_cb par_cb;</div><div class='ctx'> 	struct parport *port;</div><div class='ctx'> 	struct pardevice *dev;</div><div class='ctx'> 	int daisy;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;par_cb, 0, sizeof(par_cb));</div><div class='ctx'> 	spin_lock(&amp;topology_lock);</div><div class='ctx'> 	while (p &amp;&amp; p-&gt;devnum != devnum)</div><div class='ctx'> 		p = p-&gt;next;</div><div class='hunk'>@@ -232,7 +230,7 @@ struct pardevice *parport_open(int devnum, const char *name)</div><div class='ctx'> 	port = parport_get_port(p-&gt;port);</div><div class='ctx'> 	spin_unlock(&amp;topology_lock);</div><div class='ctx'> </div><div class='del'>-	dev = parport_register_dev_model(port, name, &amp;par_cb, devnum);</div><div class='add'>+	dev = parport_register_device(port, name, NULL, NULL, NULL, 0, NULL);</div><div class='ctx'> 	parport_put_port(port);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -482,31 +480,3 @@ static int assign_addrs(struct parport *port)</div><div class='ctx'> 	kfree(deviceid);</div><div class='ctx'> 	return detected;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int daisy_drv_probe(struct pardevice *par_dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = par_dev-&gt;dev.driver;</div><div class='del'>-</div><div class='del'>-	if (strcmp(drv-&gt;name, "daisy_drv"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (strcmp(par_dev-&gt;name, daisy_dev_name))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct parport_driver daisy_driver = {</div><div class='del'>-	.name = "daisy_drv",</div><div class='del'>-	.probe = daisy_drv_probe,</div><div class='del'>-	.devmodel = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int daisy_drv_init(void)</div><div class='del'>-{</div><div class='del'>-	return parport_register_driver(&amp;daisy_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void daisy_drv_exit(void)</div><div class='del'>-{</div><div class='del'>-	parport_unregister_driver(&amp;daisy_driver);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c<br/>index f12b9da69255..90fb73575495 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/ieee1284.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/ieee1284.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/ieee1284.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parport/ieee1284.c</a></div><div class='hunk'>@@ -722,7 +722,7 @@ ssize_t parport_read (struct parport *port, void *buffer, size_t len)</div><div class='ctx'> 		if (parport_negotiate (port, IEEE1284_MODE_NIBBLE)) {</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through to NIBBLE */</div><div class='add'>+		/* fall through - to NIBBLE */</div><div class='ctx'> 	case IEEE1284_MODE_NIBBLE:</div><div class='ctx'> 		DPRINTK (KERN_DEBUG "%s: Using nibble mode\n", port-&gt;name);</div><div class='ctx'> 		fn = port-&gt;ops-&gt;nibble_read_data;</div><div class='head'>diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c<br/>index e9b52e4a4648..e77044c2bf62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/parport_cs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/parport_cs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/parport_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parport/parport_cs.c</a></div><div class='hunk'>@@ -158,8 +158,9 @@ static int parport_config(struct pcmcia_device *link)</div><div class='ctx'>     return 0;</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='del'>-    parport_cs_release(link);</div><div class='del'>-    return -ENODEV;</div><div class='add'>+	parport_cs_release(link);</div><div class='add'>+	kfree(link-&gt;priv);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> } /* parport_config */</div><div class='ctx'> </div><div class='ctx'> static void parport_cs_release(struct pcmcia_device *link)</div><div class='head'>diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c<br/>index e5e6a463a941..e035174ba205 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/probe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/probe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parport/probe.c</a></div><div class='hunk'>@@ -257,7 +257,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,</div><div class='ctx'> ssize_t parport_device_id (int devnum, char *buffer, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t retval = -ENXIO;</div><div class='del'>-	struct pardevice *dev = parport_open(devnum, daisy_dev_name);</div><div class='add'>+	struct pardevice *dev = parport_open (devnum, "Device ID probe");</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/share.c b/drivers/parport/share.c<br/>index 0171b8dbcdcd..5dc53d420ca8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/share.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/parport/share.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/parport/share.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/parport/share.c</a></div><div class='hunk'>@@ -137,19 +137,11 @@ static struct bus_type parport_bus_type = {</div><div class='ctx'> </div><div class='ctx'> int parport_bus_init(void)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = bus_register(&amp;parport_bus_type);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-	daisy_drv_init();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return bus_register(&amp;parport_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void parport_bus_exit(void)</div><div class='ctx'> {</div><div class='del'>-	daisy_drv_exit();</div><div class='ctx'> 	bus_unregister(&amp;parport_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig<br/>index 6012f3059acd..011c57cae4b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/controller/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/controller/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/controller/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/controller/Kconfig</a></div><div class='hunk'>@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759</div><div class='ctx'> </div><div class='ctx'> config VMD</div><div class='ctx'> 	depends on PCI_MSI &amp;&amp; X86_64 &amp;&amp; SRCU</div><div class='add'>+	select X86_DEV_DMA_OPS</div><div class='ctx'> 	tristate "Intel Volume Management Device Driver"</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Adds support for the Intel Volume Management Device (VMD). VMD is a</div><div class='head'>diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c<br/>index cf6816b55b5e..999a5509e57e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/controller/vmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/controller/vmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/controller/vmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/controller/vmd.c</a></div><div class='hunk'>@@ -95,10 +95,8 @@ struct vmd_dev {</div><div class='ctx'> 	struct irq_domain	*irq_domain;</div><div class='ctx'> 	struct pci_bus		*bus;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_DEV_DMA_OPS</div><div class='ctx'> 	struct dma_map_ops	dma_ops;</div><div class='ctx'> 	struct dma_domain	dma_domain;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct vmd_dev *vmd_from_bus(struct pci_bus *bus)</div><div class='hunk'>@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = {</div><div class='ctx'> 	.chip		= &amp;vmd_msi_controller,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_DEV_DMA_OPS</div><div class='ctx'> /*</div><div class='ctx'>  * VMD replaces the requester ID with its own.  DMA mappings for devices in a</div><div class='ctx'>  * VMD domain need to be mapped for the VMD, not the device requiring</div><div class='hunk'>@@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)</div><div class='ctx'> 	add_dma_domain(domain);</div><div class='ctx'> }</div><div class='ctx'> #undef ASSIGN_VMD_DMA_OPS</div><div class='del'>-#else</div><div class='del'>-static void vmd_teardown_dma_ops(struct vmd_dev *vmd) {}</div><div class='del'>-static void vmd_setup_dma_ops(struct vmd_dev *vmd) {}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus,</div><div class='ctx'> 				  unsigned int devfn, int reg, int len)</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c<br/>index 3f3df4c29f6e..905282a8ddaa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/hotplug/pciehp_ctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/hotplug/pciehp_ctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/hotplug/pciehp_ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/hotplug/pciehp_ctrl.c</a></div><div class='hunk'>@@ -115,6 +115,10 @@ static void remove_board(struct controller *ctrl, bool safe_removal)</div><div class='ctx'> 		 * removed from the slot/adapter.</div><div class='ctx'> 		 */</div><div class='ctx'> 		msleep(1000);</div><div class='add'>+</div><div class='add'>+		/* Ignore link or presence changes caused by power off */</div><div class='add'>+		atomic_and(~(PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_PDC),</div><div class='add'>+			   &amp;ctrl-&gt;pending_events);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* turn off Green LED */</div><div class='head'>diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c<br/>index 71853befd435..cae630fe6387 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pci-driver.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pci-driver.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pci-driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pci-driver.c</a></div><div class='hunk'>@@ -578,7 +578,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)</div><div class='ctx'> 		if (!pci_dev-&gt;state_saved &amp;&amp; pci_dev-&gt;current_state != PCI_D0</div><div class='ctx'> 		    &amp;&amp; pci_dev-&gt;current_state != PCI_UNKNOWN) {</div><div class='ctx'> 			WARN_ONCE(pci_dev-&gt;current_state != prev,</div><div class='del'>-				"PCI PM: Device state not saved by %pF\n",</div><div class='add'>+				"PCI PM: Device state not saved by %pS\n",</div><div class='ctx'> 				drv-&gt;suspend);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -605,7 +605,7 @@ static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)</div><div class='ctx'> 		if (!pci_dev-&gt;state_saved &amp;&amp; pci_dev-&gt;current_state != PCI_D0</div><div class='ctx'> 		    &amp;&amp; pci_dev-&gt;current_state != PCI_UNKNOWN) {</div><div class='ctx'> 			WARN_ONCE(pci_dev-&gt;current_state != prev,</div><div class='del'>-				"PCI PM: Device state not saved by %pF\n",</div><div class='add'>+				"PCI PM: Device state not saved by %pS\n",</div><div class='ctx'> 				drv-&gt;suspend_late);</div><div class='ctx'> 			goto Fixup;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -773,7 +773,7 @@ static int pci_pm_suspend(struct device *dev)</div><div class='ctx'> 		if (!pci_dev-&gt;state_saved &amp;&amp; pci_dev-&gt;current_state != PCI_D0</div><div class='ctx'> 		    &amp;&amp; pci_dev-&gt;current_state != PCI_UNKNOWN) {</div><div class='ctx'> 			WARN_ONCE(pci_dev-&gt;current_state != prev,</div><div class='del'>-				"PCI PM: State of device not saved by %pF\n",</div><div class='add'>+				"PCI PM: State of device not saved by %pS\n",</div><div class='ctx'> 				pm-&gt;suspend);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -821,7 +821,7 @@ static int pci_pm_suspend_noirq(struct device *dev)</div><div class='ctx'> 		if (!pci_dev-&gt;state_saved &amp;&amp; pci_dev-&gt;current_state != PCI_D0</div><div class='ctx'> 		    &amp;&amp; pci_dev-&gt;current_state != PCI_UNKNOWN) {</div><div class='ctx'> 			WARN_ONCE(pci_dev-&gt;current_state != prev,</div><div class='del'>-				"PCI PM: State of device not saved by %pF\n",</div><div class='add'>+				"PCI PM: State of device not saved by %pS\n",</div><div class='ctx'> 				pm-&gt;suspend_noirq);</div><div class='ctx'> 			goto Fixup;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1260,11 +1260,11 @@ static int pci_pm_runtime_suspend(struct device *dev)</div><div class='ctx'> 		 * log level.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (error == -EBUSY || error == -EAGAIN) {</div><div class='del'>-			dev_dbg(dev, "can't suspend now (%pf returned %d)\n",</div><div class='add'>+			dev_dbg(dev, "can't suspend now (%ps returned %d)\n",</div><div class='ctx'> 				pm-&gt;runtime_suspend, error);</div><div class='ctx'> 			return error;</div><div class='ctx'> 		} else if (error) {</div><div class='del'>-			dev_err(dev, "can't suspend (%pf returned %d)\n",</div><div class='add'>+			dev_err(dev, "can't suspend (%ps returned %d)\n",</div><div class='ctx'> 				pm-&gt;runtime_suspend, error);</div><div class='ctx'> 			return error;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1276,7 +1276,7 @@ static int pci_pm_runtime_suspend(struct device *dev)</div><div class='ctx'> 	    &amp;&amp; !pci_dev-&gt;state_saved &amp;&amp; pci_dev-&gt;current_state != PCI_D0</div><div class='ctx'> 	    &amp;&amp; pci_dev-&gt;current_state != PCI_UNKNOWN) {</div><div class='ctx'> 		WARN_ONCE(pci_dev-&gt;current_state != prev,</div><div class='del'>-			"PCI PM: State of device not saved by %pF\n",</div><div class='add'>+			"PCI PM: State of device not saved by %pS\n",</div><div class='ctx'> 			pm-&gt;runtime_suspend);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c<br/>index 7c1b362f599a..766f5779db92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pci.c</a></div><div class='hunk'>@@ -6262,8 +6262,7 @@ static int __init pci_setup(char *str)</div><div class='ctx'> 			} else if (!strncmp(str, "pcie_scan_all", 13)) {</div><div class='ctx'> 				pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS);</div><div class='ctx'> 			} else if (!strncmp(str, "disable_acs_redir=", 18)) {</div><div class='del'>-				disable_acs_redir_param =</div><div class='del'>-					kstrdup(str + 18, GFP_KERNEL);</div><div class='add'>+				disable_acs_redir_param = str + 18;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				printk(KERN_ERR "PCI: Unknown option `%s'\n",</div><div class='ctx'> 						str);</div><div class='hunk'>@@ -6274,3 +6273,19 @@ static int __init pci_setup(char *str)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> early_param("pci", pci_setup);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'disable_acs_redir_param' is initialized in pci_setup(), above, to point</div><div class='add'>+ * to data in the __initdata section which will be freed after the init</div><div class='add'>+ * sequence is complete. We can't allocate memory in pci_setup() because some</div><div class='add'>+ * architectures do not have any memory allocation service available during</div><div class='add'>+ * an early_param() call. So we allocate memory and copy the variable here</div><div class='add'>+ * before the init section is freed.</div><div class='add'>+ */</div><div class='add'>+static int __init pci_realloc_setup_params(void)</div><div class='add'>+{</div><div class='add'>+	disable_acs_redir_param = kstrdup(disable_acs_redir_param, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+pure_initcall(pci_realloc_setup_params);</div><div class='head'>diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h<br/>index 224d88634115..d994839a3e24 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pci.h</a></div><div class='hunk'>@@ -273,6 +273,7 @@ enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev);</div><div class='ctx'> u32 pcie_bandwidth_capable(struct pci_dev *dev, enum pci_bus_speed *speed,</div><div class='ctx'> 			   enum pcie_link_width *width);</div><div class='ctx'> void __pcie_print_link_status(struct pci_dev *dev, bool verbose);</div><div class='add'>+void pcie_report_downtraining(struct pci_dev *dev);</div><div class='ctx'> </div><div class='ctx'> /* Single Root I/O Virtualization */</div><div class='ctx'> struct pci_sriov {</div><div class='head'>diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig<br/>index 5cbdbca904ac..362eb8cfa53b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pcie/Kconfig</a></div><div class='hunk'>@@ -142,3 +142,11 @@ config PCIE_PTM</div><div class='ctx'> </div><div class='ctx'> 	  This is only useful if you have devices that support PTM, but it</div><div class='ctx'> 	  is safe to enable even if you don't.</div><div class='add'>+</div><div class='add'>+config PCIE_BW</div><div class='add'>+	bool "PCI Express Bandwidth Change Notification"</div><div class='add'>+	depends on PCIEPORTBUS</div><div class='add'>+	help</div><div class='add'>+	  This enables PCI Express Bandwidth Change Notification.  If</div><div class='add'>+	  you know link width or rate changes occur only to correct</div><div class='add'>+	  unreliable links, you may answer Y.</div><div class='head'>diff --git a/drivers/pci/pcie/Makefile b/drivers/pci/pcie/Makefile<br/>index f1d7bc1e5efa..efb9d2e71e9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pcie/Makefile</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> # Makefile for PCI Express features and port driver</div><div class='ctx'> </div><div class='ctx'> pcieportdrv-y			:= portdrv_core.o portdrv_pci.o err.o</div><div class='del'>-pcieportdrv-y			+= bw_notification.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCIEPORTBUS)	+= pcieportdrv.o</div><div class='ctx'> </div><div class='hunk'>@@ -13,3 +12,4 @@ obj-$(CONFIG_PCIEAER_INJECT)	+= aer_inject.o</div><div class='ctx'> obj-$(CONFIG_PCIE_PME)		+= pme.o</div><div class='ctx'> obj-$(CONFIG_PCIE_DPC)		+= dpc.o</div><div class='ctx'> obj-$(CONFIG_PCIE_PTM)		+= ptm.o</div><div class='add'>+obj-$(CONFIG_PCIE_BW)		+= bw_notification.o</div><div class='head'>diff --git a/drivers/pci/pcie/bw_notification.c b/drivers/pci/pcie/bw_notification.c<br/>index d2eae3b7cc0f..4fa9e3523ee1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/bw_notification.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/bw_notification.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/bw_notification.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pcie/bw_notification.c</a></div><div class='hunk'>@@ -30,6 +30,8 @@ static void pcie_enable_link_bandwidth_notification(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 lnk_ctl;</div><div class='ctx'> </div><div class='add'>+	pcie_capability_write_word(dev, PCI_EXP_LNKSTA, PCI_EXP_LNKSTA_LBMS);</div><div class='add'>+</div><div class='ctx'> 	pcie_capability_read_word(dev, PCI_EXP_LNKCTL, &amp;lnk_ctl);</div><div class='ctx'> 	lnk_ctl |= PCI_EXP_LNKCTL_LBMIE;</div><div class='ctx'> 	pcie_capability_write_word(dev, PCI_EXP_LNKCTL, lnk_ctl);</div><div class='hunk'>@@ -44,11 +46,10 @@ static void pcie_disable_link_bandwidth_notification(struct pci_dev *dev)</div><div class='ctx'> 	pcie_capability_write_word(dev, PCI_EXP_LNKCTL, lnk_ctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t pcie_bw_notification_handler(int irq, void *context)</div><div class='add'>+static irqreturn_t pcie_bw_notification_irq(int irq, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_device *srv = context;</div><div class='ctx'> 	struct pci_dev *port = srv-&gt;port;</div><div class='del'>-	struct pci_dev *dev;</div><div class='ctx'> 	u16 link_status, events;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -58,17 +59,26 @@ static irqreturn_t pcie_bw_notification_handler(int irq, void *context)</div><div class='ctx'> 	if (ret != PCIBIOS_SUCCESSFUL || !events)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='add'>+	pcie_capability_write_word(port, PCI_EXP_LNKSTA, events);</div><div class='add'>+	pcie_update_link_speed(port-&gt;subordinate, link_status);</div><div class='add'>+	return IRQ_WAKE_THREAD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t pcie_bw_notification_handler(int irq, void *context)</div><div class='add'>+{</div><div class='add'>+	struct pcie_device *srv = context;</div><div class='add'>+	struct pci_dev *port = srv-&gt;port;</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Print status from downstream devices, not this root port or</div><div class='ctx'> 	 * downstream switch port.</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;port-&gt;subordinate-&gt;devices, bus_list)</div><div class='del'>-		__pcie_print_link_status(dev, false);</div><div class='add'>+		pcie_report_downtraining(dev);</div><div class='ctx'> 	up_read(&amp;pci_bus_sem);</div><div class='ctx'> </div><div class='del'>-	pcie_update_link_speed(port-&gt;subordinate, link_status);</div><div class='del'>-	pcie_capability_write_word(port, PCI_EXP_LNKSTA, events);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +90,8 @@ static int pcie_bandwidth_notification_probe(struct pcie_device *srv)</div><div class='ctx'> 	if (!pcie_link_bandwidth_notification_supported(srv-&gt;port))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ret = request_threaded_irq(srv-&gt;irq, NULL, pcie_bw_notification_handler,</div><div class='add'>+	ret = request_threaded_irq(srv-&gt;irq, pcie_bw_notification_irq,</div><div class='add'>+				   pcie_bw_notification_handler,</div><div class='ctx'> 				   IRQF_SHARED, "PCIe BW notif", srv);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h<br/>index 1d50dc58ac40..944827a8c7d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/portdrv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/portdrv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/portdrv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pcie/portdrv.h</a></div><div class='hunk'>@@ -49,7 +49,11 @@ int pcie_dpc_init(void);</div><div class='ctx'> static inline int pcie_dpc_init(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCIE_BW</div><div class='ctx'> int pcie_bandwidth_notification_init(void);</div><div class='add'>+#else</div><div class='add'>+static inline int pcie_bandwidth_notification_init(void) { return 0; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Port Type */</div><div class='ctx'> #define PCIE_ANY_PORT			(~0)</div><div class='head'>diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c<br/>index 7d04f9d087a6..1b330129089f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/portdrv_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/pcie/portdrv_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/pcie/portdrv_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/pcie/portdrv_core.c</a></div><div class='hunk'>@@ -55,7 +55,8 @@ static int pcie_message_numbers(struct pci_dev *dev, int mask,</div><div class='ctx'> 	 * 7.8.2, 7.10.10, 7.31.2.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (mask &amp; (PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP)) {</div><div class='add'>+	if (mask &amp; (PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP |</div><div class='add'>+		    PCIE_PORT_SERVICE_BWNOTIF)) {</div><div class='ctx'> 		pcie_capability_read_word(dev, PCI_EXP_FLAGS, &amp;reg16);</div><div class='ctx'> 		*pme = (reg16 &amp; PCI_EXP_FLAGS_IRQ) &gt;&gt; 9;</div><div class='ctx'> 		nvec = *pme + 1;</div><div class='head'>diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c<br/>index 2ec0df04e0dc..7e12d0163863 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/probe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/probe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/probe.c</a></div><div class='hunk'>@@ -2388,7 +2388,7 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pcie_report_downtraining(struct pci_dev *dev)</div><div class='add'>+void pcie_report_downtraining(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!pci_is_pcie(dev))</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c<br/>index a59ad09ce911..eb0afc275901 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/quirks.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/quirks.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/quirks.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ static ktime_t fixup_debug_start(struct pci_dev *dev,</div><div class='ctx'> 				 void (*fn)(struct pci_dev *dev))</div><div class='ctx'> {</div><div class='ctx'> 	if (initcall_debug)</div><div class='del'>-		pci_info(dev, "calling  %pF @ %i\n", fn, task_pid_nr(current));</div><div class='add'>+		pci_info(dev, "calling  %pS @ %i\n", fn, task_pid_nr(current));</div><div class='ctx'> </div><div class='ctx'> 	return ktime_get();</div><div class='ctx'> }</div><div class='hunk'>@@ -51,7 +51,7 @@ static void fixup_debug_report(struct pci_dev *dev, ktime_t calltime,</div><div class='ctx'> 	delta = ktime_sub(rettime, calltime);</div><div class='ctx'> 	duration = (unsigned long long) ktime_to_ns(delta) &gt;&gt; 10;</div><div class='ctx'> 	if (initcall_debug || duration &gt; 10000)</div><div class='del'>-		pci_info(dev, "%pF took %lld usecs\n", fn, duration);</div><div class='add'>+		pci_info(dev, "%pS took %lld usecs\n", fn, duration);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,</div><div class='hunk'>@@ -3877,6 +3877,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9128,</div><div class='ctx'> /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c14 */</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9130,</div><div class='ctx'> 			 quirk_dma_func1_alias);</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9170,</div><div class='add'>+			 quirk_dma_func1_alias);</div><div class='ctx'> /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c47 + c57 */</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9172,</div><div class='ctx'> 			 quirk_dma_func1_alias);</div><div class='head'>diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c<br/>index e22766c79fe9..0f7b80144863 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/switch/switchtec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pci/switch/switchtec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pci/switch/switchtec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pci/switch/switchtec.c</a></div><div class='hunk'>@@ -390,7 +390,7 @@ static int switchtec_dev_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 		return PTR_ERR(stuser);</div><div class='ctx'> </div><div class='ctx'> 	filp-&gt;private_data = stuser;</div><div class='del'>-	nonseekable_open(inode, filp);</div><div class='add'>+	stream_open(inode, filp);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;stdev-&gt;dev, "%s: %p\n", __func__, stuser);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig<br/>index af9bc178495d..a94e586a58b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/perf/Kconfig</a></div><div class='hunk'>@@ -52,6 +52,15 @@ config ARM_PMU_ACPI</div><div class='ctx'> 	depends on ARM_PMU &amp;&amp; ACPI</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='add'>+config ARM_SMMU_V3_PMU</div><div class='add'>+	 tristate "ARM SMMUv3 Performance Monitors Extension"</div><div class='add'>+	 depends on ARM64 &amp;&amp; ACPI &amp;&amp; ARM_SMMU_V3</div><div class='add'>+	   help</div><div class='add'>+	   Provides support for the ARM SMMUv3 Performance Monitor Counter</div><div class='add'>+	   Groups (PMCG), which provide monitoring of transactions passing</div><div class='add'>+	   through the SMMU and allow the resulting information to be filtered</div><div class='add'>+	   based on the Stream ID of the corresponding master.</div><div class='add'>+</div><div class='ctx'> config ARM_DSU_PMU</div><div class='ctx'> 	tristate "ARM DynamIQ Shared Unit (DSU) PMU"</div><div class='ctx'> 	depends on ARM64</div><div class='head'>diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile<br/>index 909f27fd9db3..30489941f3d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/perf/Makefile</a></div><div class='hunk'>@@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_CCN) += arm-ccn.o</div><div class='ctx'> obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o</div><div class='ctx'> obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o</div><div class='ctx'> obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o</div><div class='add'>+obj-$(CONFIG_ARM_SMMU_V3_PMU) += arm_smmuv3_pmu.o</div><div class='ctx'> obj-$(CONFIG_HISI_PMU) += hisilicon/</div><div class='ctx'> obj-$(CONFIG_QCOM_L2_PMU)	+= qcom_l2_pmu.o</div><div class='ctx'> obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o</div><div class='head'>diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c<br/>index bfd03e023308..8f8606b9bc9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/arm-cci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/arm-cci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/arm-cci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/perf/arm-cci.c</a></div><div class='hunk'>@@ -1684,21 +1684,24 @@ static int cci_pmu_probe(struct platform_device *pdev)</div><div class='ctx'> 	raw_spin_lock_init(&amp;cci_pmu-&gt;hw_events.pmu_lock);</div><div class='ctx'> 	mutex_init(&amp;cci_pmu-&gt;reserve_mutex);</div><div class='ctx'> 	atomic_set(&amp;cci_pmu-&gt;active_events, 0);</div><div class='del'>-	cci_pmu-&gt;cpu = get_cpu();</div><div class='del'>-</div><div class='del'>-	ret = cci_pmu_init(cci_pmu, pdev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		put_cpu();</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	cci_pmu-&gt;cpu = raw_smp_processor_id();</div><div class='add'>+	g_cci_pmu = cci_pmu;</div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_CCI_ONLINE,</div><div class='ctx'> 				  "perf/arm/cci:online", NULL,</div><div class='ctx'> 				  cci_pmu_offline_cpu);</div><div class='del'>-	put_cpu();</div><div class='del'>-	g_cci_pmu = cci_pmu;</div><div class='add'>+</div><div class='add'>+	ret = cci_pmu_init(cci_pmu, pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_pmu_init;</div><div class='add'>+</div><div class='ctx'> 	pr_info("ARM %s PMU driver probed", cci_pmu-&gt;model-&gt;name);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error_pmu_init:</div><div class='add'>+	cpuhp_remove_state(CPUHP_AP_PERF_ARM_CCI_ONLINE);</div><div class='add'>+	g_cci_pmu = NULL;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cci_pmu_remove(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c<br/>index 2ae76026e947..0bb52d9bdcf7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/arm-ccn.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/perf/arm-ccn.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/arm-ccn.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/perf/arm-ccn.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ struct arm_ccn_dt {</div><div class='ctx'> </div><div class='ctx'> 	struct hrtimer hrtimer;</div><div class='ctx'> </div><div class='del'>-	cpumask_t cpu;</div><div class='add'>+	unsigned int cpu;</div><div class='ctx'> 	struct hlist_node node;</div><div class='ctx'> </div><div class='ctx'> 	struct pmu pmu;</div><div class='hunk'>@@ -559,7 +559,7 @@ static ssize_t arm_ccn_pmu_cpumask_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_ccn *ccn = pmu_to_arm_ccn(dev_get_drvdata(dev));</div><div class='ctx'> </div><div class='del'>-	return cpumap_print_to_pagebuf(true, buf, &amp;ccn-&gt;dt.cpu);</div><div class='add'>+	return cpumap_print_to_pagebuf(true, buf, cpumask_of(ccn-&gt;dt.cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct device_attribute arm_ccn_pmu_cpumask_attr =</div><div class='hunk'>@@ -759,7 +759,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event)</div><div class='ctx'> 	 * mitigate this, we enforce CPU assignment to one, selected</div><div class='ctx'> 	 * processor (the one described in the "cpumask" attribute).</div><div class='ctx'> 	 */</div><div class='del'>-	event-&gt;cpu = cpumask_first(&amp;ccn-&gt;dt.cpu);</div><div class='add'>+	event-&gt;cpu = ccn-&gt;dt.cpu;</div><div class='ctx'> </div><div class='ctx'> 	node_xp = CCN_CONFIG_NODE(event-&gt;attr.config);</div><div class='ctx'> 	type = CCN_CONFIG_TYPE(event-&gt;attr.config);</div><div class='hunk'>@@ -1215,15 +1215,15 @@ static int arm_ccn_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)</div><div class='ctx'> 	struct arm_ccn *ccn = container_of(dt, struct arm_ccn, dt);</div><div class='ctx'> 	unsigned int target;</div><div class='ctx'> </div><div class='del'>-	if (!cpumask_test_and_clear_cpu(cpu, &amp;dt-&gt;cpu))</div><div class='add'>+	if (cpu != dt-&gt;cpu)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	target = cpumask_any_but(cpu_online_mask, cpu);</div><div class='ctx'> 	if (target &gt;= nr_cpu_ids)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	perf_pmu_migrate_context(&amp;dt-&gt;pmu, cpu, target);</div><div class='del'>-	cpumask_set_cpu(target, &amp;dt-&gt;cpu);</div><div class='add'>+	dt-&gt;cpu = target;</div><div class='ctx'> 	if (ccn-&gt;irq)</div><div class='del'>-		WARN_ON(irq_set_affinity_hint(ccn-&gt;irq, &amp;dt-&gt;cpu) != 0);</div><div class='add'>+		WARN_ON(irq_set_affinity_hint(ccn-&gt;irq, cpumask_of(dt-&gt;cpu)));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1299,29 +1299,30 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Pick one CPU which we will use to collect data from CCN... */</div><div class='del'>-	cpumask_set_cpu(get_cpu(), &amp;ccn-&gt;dt.cpu);</div><div class='add'>+	ccn-&gt;dt.cpu = raw_smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	/* Also make sure that the overflow interrupt is handled by this CPU */</div><div class='ctx'> 	if (ccn-&gt;irq) {</div><div class='del'>-		err = irq_set_affinity_hint(ccn-&gt;irq, &amp;ccn-&gt;dt.cpu);</div><div class='add'>+		err = irq_set_affinity_hint(ccn-&gt;irq, cpumask_of(ccn-&gt;dt.cpu));</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(ccn-&gt;dev, "Failed to set interrupt affinity!\n");</div><div class='ctx'> 			goto error_set_affinity;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cpuhp_state_add_instance_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE,</div><div class='add'>+					 &amp;ccn-&gt;dt.node);</div><div class='add'>+</div><div class='ctx'> 	err = perf_pmu_register(&amp;ccn-&gt;dt.pmu, name, -1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error_pmu_register;</div><div class='ctx'> </div><div class='del'>-	cpuhp_state_add_instance_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE,</div><div class='del'>-					 &amp;ccn-&gt;dt.node);</div><div class='del'>-	put_cpu();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error_pmu_register:</div><div class='add'>+	cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE,</div><div class='add'>+					    &amp;ccn-&gt;dt.node);</div><div class='ctx'> error_set_affinity:</div><div class='del'>-	put_cpu();</div><div class='ctx'> error_choose_name:</div><div class='ctx'> 	ida_simple_remove(&amp;arm_ccn_pmu_ida, ccn-&gt;dt.id);</div><div class='ctx'> 	for (i = 0; i &lt; ccn-&gt;num_xps; i++)</div><div class='head'>diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c<br/>new file mode 100644<br/>index 000000000000..da71c741cb46<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/perf/arm_smmuv3_pmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/perf/arm_smmuv3_pmu.c</a></div><div class='hunk'>@@ -0,0 +1,865 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This driver adds support for perf events to use the Performance</div><div class='add'>+ * Monitor Counter Groups (PMCG) associated with an SMMUv3 node</div><div class='add'>+ * to monitor that node.</div><div class='add'>+ *</div><div class='add'>+ * SMMUv3 PMCG devices are named as smmuv3_pmcg_&lt;phys_addr_page&gt; where</div><div class='add'>+ * &lt;phys_addr_page&gt; is the physical page address of the SMMU PMCG wrapped</div><div class='add'>+ * to 4K boundary. For example, the PMCG at 0xff88840000 is named</div><div class='add'>+ * smmuv3_pmcg_ff88840</div><div class='add'>+ *</div><div class='add'>+ * Filtering by stream id is done by specifying filtering parameters</div><div class='add'>+ * with the event. options are:</div><div class='add'>+ *   filter_enable    - 0 = no filtering, 1 = filtering enabled</div><div class='add'>+ *   filter_span      - 0 = exact match, 1 = pattern match</div><div class='add'>+ *   filter_stream_id - pattern to filter against</div><div class='add'>+ *</div><div class='add'>+ * To match a partial StreamID where the X most-significant bits must match</div><div class='add'>+ * but the Y least-significant bits might differ, STREAMID is programmed</div><div class='add'>+ * with a value that contains:</div><div class='add'>+ *  STREAMID[Y - 1] == 0.</div><div class='add'>+ *  STREAMID[Y - 2:0] == 1 (where Y &gt; 1).</div><div class='add'>+ * The remainder of implemented bits of STREAMID (X bits, from bit Y upwards)</div><div class='add'>+ * contain a value to match from the corresponding bits of event StreamID.</div><div class='add'>+ *</div><div class='add'>+ * Example: perf stat -e smmuv3_pmcg_ff88840/transaction,filter_enable=1,</div><div class='add'>+ *                    filter_span=1,filter_stream_id=0x42/ -a netperf</div><div class='add'>+ * Applies filter pattern 0x42 to transaction events, which means events</div><div class='add'>+ * matching stream ids 0x42 and 0x43 are counted. Further filtering</div><div class='add'>+ * information is available in the SMMU documentation.</div><div class='add'>+ *</div><div class='add'>+ * SMMU events are not attributable to a CPU, so task mode and sampling</div><div class='add'>+ * are not supported.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/acpi_iort.h&gt;</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/cpuhotplug.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/device.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/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/msi.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define SMMU_PMCG_EVCNTR0               0x0</div><div class='add'>+#define SMMU_PMCG_EVCNTR(n, stride)     (SMMU_PMCG_EVCNTR0 + (n) * (stride))</div><div class='add'>+#define SMMU_PMCG_EVTYPER0              0x400</div><div class='add'>+#define SMMU_PMCG_EVTYPER(n)            (SMMU_PMCG_EVTYPER0 + (n) * 4)</div><div class='add'>+#define SMMU_PMCG_SID_SPAN_SHIFT        29</div><div class='add'>+#define SMMU_PMCG_SMR0                  0xA00</div><div class='add'>+#define SMMU_PMCG_SMR(n)                (SMMU_PMCG_SMR0 + (n) * 4)</div><div class='add'>+#define SMMU_PMCG_CNTENSET0             0xC00</div><div class='add'>+#define SMMU_PMCG_CNTENCLR0             0xC20</div><div class='add'>+#define SMMU_PMCG_INTENSET0             0xC40</div><div class='add'>+#define SMMU_PMCG_INTENCLR0             0xC60</div><div class='add'>+#define SMMU_PMCG_OVSCLR0               0xC80</div><div class='add'>+#define SMMU_PMCG_OVSSET0               0xCC0</div><div class='add'>+#define SMMU_PMCG_CFGR                  0xE00</div><div class='add'>+#define SMMU_PMCG_CFGR_SID_FILTER_TYPE  BIT(23)</div><div class='add'>+#define SMMU_PMCG_CFGR_MSI              BIT(21)</div><div class='add'>+#define SMMU_PMCG_CFGR_RELOC_CTRS       BIT(20)</div><div class='add'>+#define SMMU_PMCG_CFGR_SIZE             GENMASK(13, 8)</div><div class='add'>+#define SMMU_PMCG_CFGR_NCTR             GENMASK(5, 0)</div><div class='add'>+#define SMMU_PMCG_CR                    0xE04</div><div class='add'>+#define SMMU_PMCG_CR_ENABLE             BIT(0)</div><div class='add'>+#define SMMU_PMCG_CEID0                 0xE20</div><div class='add'>+#define SMMU_PMCG_CEID1                 0xE28</div><div class='add'>+#define SMMU_PMCG_IRQ_CTRL              0xE50</div><div class='add'>+#define SMMU_PMCG_IRQ_CTRL_IRQEN        BIT(0)</div><div class='add'>+#define SMMU_PMCG_IRQ_CFG0              0xE58</div><div class='add'>+#define SMMU_PMCG_IRQ_CFG1              0xE60</div><div class='add'>+#define SMMU_PMCG_IRQ_CFG2              0xE64</div><div class='add'>+</div><div class='add'>+/* MSI config fields */</div><div class='add'>+#define MSI_CFG0_ADDR_MASK              GENMASK_ULL(51, 2)</div><div class='add'>+#define MSI_CFG2_MEMATTR_DEVICE_nGnRE   0x1</div><div class='add'>+</div><div class='add'>+#define SMMU_PMCG_DEFAULT_FILTER_SPAN   1</div><div class='add'>+#define SMMU_PMCG_DEFAULT_FILTER_SID    GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define SMMU_PMCG_MAX_COUNTERS          64</div><div class='add'>+#define SMMU_PMCG_ARCH_MAX_EVENTS       128</div><div class='add'>+</div><div class='add'>+#define SMMU_PMCG_PA_SHIFT              12</div><div class='add'>+</div><div class='add'>+#define SMMU_PMCG_EVCNTR_RDONLY         BIT(0)</div><div class='add'>+</div><div class='add'>+static int cpuhp_state_num;</div><div class='add'>+</div><div class='add'>+struct smmu_pmu {</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	struct perf_event *events[SMMU_PMCG_MAX_COUNTERS];</div><div class='add'>+	DECLARE_BITMAP(used_counters, SMMU_PMCG_MAX_COUNTERS);</div><div class='add'>+	DECLARE_BITMAP(supported_events, SMMU_PMCG_ARCH_MAX_EVENTS);</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	unsigned int on_cpu;</div><div class='add'>+	struct pmu pmu;</div><div class='add'>+	unsigned int num_counters;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+	void __iomem *reloc_base;</div><div class='add'>+	u64 counter_mask;</div><div class='add'>+	u32 options;</div><div class='add'>+	bool global_filter;</div><div class='add'>+	u32 global_filter_span;</div><div class='add'>+	u32 global_filter_sid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_smmu_pmu(p) (container_of(p, struct smmu_pmu, pmu))</div><div class='add'>+</div><div class='add'>+#define SMMU_PMU_EVENT_ATTR_EXTRACTOR(_name, _config, _start, _end)        \</div><div class='add'>+	static inline u32 get_##_name(struct perf_event *event)            \</div><div class='add'>+	{                                                                  \</div><div class='add'>+		return FIELD_GET(GENMASK_ULL(_end, _start),                \</div><div class='add'>+				 event-&gt;attr._config);                     \</div><div class='add'>+	}                                                                  \</div><div class='add'>+</div><div class='add'>+SMMU_PMU_EVENT_ATTR_EXTRACTOR(event, config, 0, 15);</div><div class='add'>+SMMU_PMU_EVENT_ATTR_EXTRACTOR(filter_stream_id, config1, 0, 31);</div><div class='add'>+SMMU_PMU_EVENT_ATTR_EXTRACTOR(filter_span, config1, 32, 32);</div><div class='add'>+SMMU_PMU_EVENT_ATTR_EXTRACTOR(filter_enable, config1, 33, 33);</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_enable(struct pmu *pmu)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(pmu);</div><div class='add'>+</div><div class='add'>+	writel(SMMU_PMCG_IRQ_CTRL_IRQEN,</div><div class='add'>+	       smmu_pmu-&gt;reg_base + SMMU_PMCG_IRQ_CTRL);</div><div class='add'>+	writel(SMMU_PMCG_CR_ENABLE, smmu_pmu-&gt;reg_base + SMMU_PMCG_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_disable(struct pmu *pmu)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(pmu);</div><div class='add'>+</div><div class='add'>+	writel(0, smmu_pmu-&gt;reg_base + SMMU_PMCG_CR);</div><div class='add'>+	writel(0, smmu_pmu-&gt;reg_base + SMMU_PMCG_IRQ_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_counter_set_value(struct smmu_pmu *smmu_pmu,</div><div class='add'>+					      u32 idx, u64 value)</div><div class='add'>+{</div><div class='add'>+	if (smmu_pmu-&gt;counter_mask &amp; BIT(32))</div><div class='add'>+		writeq(value, smmu_pmu-&gt;reloc_base + SMMU_PMCG_EVCNTR(idx, 8));</div><div class='add'>+	else</div><div class='add'>+		writel(value, smmu_pmu-&gt;reloc_base + SMMU_PMCG_EVCNTR(idx, 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 smmu_pmu_counter_get_value(struct smmu_pmu *smmu_pmu, u32 idx)</div><div class='add'>+{</div><div class='add'>+	u64 value;</div><div class='add'>+</div><div class='add'>+	if (smmu_pmu-&gt;counter_mask &amp; BIT(32))</div><div class='add'>+		value = readq(smmu_pmu-&gt;reloc_base + SMMU_PMCG_EVCNTR(idx, 8));</div><div class='add'>+	else</div><div class='add'>+		value = readl(smmu_pmu-&gt;reloc_base + SMMU_PMCG_EVCNTR(idx, 4));</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_counter_enable(struct smmu_pmu *smmu_pmu, u32 idx)</div><div class='add'>+{</div><div class='add'>+	writeq(BIT(idx), smmu_pmu-&gt;reg_base + SMMU_PMCG_CNTENSET0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_counter_disable(struct smmu_pmu *smmu_pmu, u32 idx)</div><div class='add'>+{</div><div class='add'>+	writeq(BIT(idx), smmu_pmu-&gt;reg_base + SMMU_PMCG_CNTENCLR0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_interrupt_enable(struct smmu_pmu *smmu_pmu, u32 idx)</div><div class='add'>+{</div><div class='add'>+	writeq(BIT(idx), smmu_pmu-&gt;reg_base + SMMU_PMCG_INTENSET0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_interrupt_disable(struct smmu_pmu *smmu_pmu,</div><div class='add'>+					      u32 idx)</div><div class='add'>+{</div><div class='add'>+	writeq(BIT(idx), smmu_pmu-&gt;reg_base + SMMU_PMCG_INTENCLR0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_set_evtyper(struct smmu_pmu *smmu_pmu, u32 idx,</div><div class='add'>+					u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, smmu_pmu-&gt;reg_base + SMMU_PMCG_EVTYPER(idx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smmu_pmu_set_smr(struct smmu_pmu *smmu_pmu, u32 idx, u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, smmu_pmu-&gt;reg_base + SMMU_PMCG_SMR(idx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_event_update(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+	u64 delta, prev, now;</div><div class='add'>+	u32 idx = hwc-&gt;idx;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		prev = local64_read(&amp;hwc-&gt;prev_count);</div><div class='add'>+		now = smmu_pmu_counter_get_value(smmu_pmu, idx);</div><div class='add'>+	} while (local64_cmpxchg(&amp;hwc-&gt;prev_count, prev, now) != prev);</div><div class='add'>+</div><div class='add'>+	/* handle overflow. */</div><div class='add'>+	delta = now - prev;</div><div class='add'>+	delta &amp;= smmu_pmu-&gt;counter_mask;</div><div class='add'>+</div><div class='add'>+	local64_add(delta, &amp;event-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_set_period(struct smmu_pmu *smmu_pmu,</div><div class='add'>+				struct hw_perf_event *hwc)</div><div class='add'>+{</div><div class='add'>+	u32 idx = hwc-&gt;idx;</div><div class='add'>+	u64 new;</div><div class='add'>+</div><div class='add'>+	if (smmu_pmu-&gt;options &amp; SMMU_PMCG_EVCNTR_RDONLY) {</div><div class='add'>+		/*</div><div class='add'>+		 * On platforms that require this quirk, if the counter starts</div><div class='add'>+		 * at &lt; half_counter value and wraps, the current logic of</div><div class='add'>+		 * handling the overflow may not work. It is expected that,</div><div class='add'>+		 * those platforms will have full 64 counter bits implemented</div><div class='add'>+		 * so that such a possibility is remote(eg: HiSilicon HIP08).</div><div class='add'>+		 */</div><div class='add'>+		new = smmu_pmu_counter_get_value(smmu_pmu, idx);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * We limit the max period to half the max counter value</div><div class='add'>+		 * of the counter size, so that even in the case of extreme</div><div class='add'>+		 * interrupt latency the counter will (hopefully) not wrap</div><div class='add'>+		 * past its initial value.</div><div class='add'>+		 */</div><div class='add'>+		new = smmu_pmu-&gt;counter_mask &gt;&gt; 1;</div><div class='add'>+		smmu_pmu_counter_set_value(smmu_pmu, idx, new);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local64_set(&amp;hwc-&gt;prev_count, new);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_set_event_filter(struct perf_event *event,</div><div class='add'>+				      int idx, u32 span, u32 sid)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+	u32 evtyper;</div><div class='add'>+</div><div class='add'>+	evtyper = get_event(event) | span &lt;&lt; SMMU_PMCG_SID_SPAN_SHIFT;</div><div class='add'>+	smmu_pmu_set_evtyper(smmu_pmu, idx, evtyper);</div><div class='add'>+	smmu_pmu_set_smr(smmu_pmu, idx, sid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_apply_event_filter(struct smmu_pmu *smmu_pmu,</div><div class='add'>+				       struct perf_event *event, int idx)</div><div class='add'>+{</div><div class='add'>+	u32 span, sid;</div><div class='add'>+	unsigned int num_ctrs = smmu_pmu-&gt;num_counters;</div><div class='add'>+	bool filter_en = !!get_filter_enable(event);</div><div class='add'>+</div><div class='add'>+	span = filter_en ? get_filter_span(event) :</div><div class='add'>+			   SMMU_PMCG_DEFAULT_FILTER_SPAN;</div><div class='add'>+	sid = filter_en ? get_filter_stream_id(event) :</div><div class='add'>+			   SMMU_PMCG_DEFAULT_FILTER_SID;</div><div class='add'>+</div><div class='add'>+	/* Support individual filter settings */</div><div class='add'>+	if (!smmu_pmu-&gt;global_filter) {</div><div class='add'>+		smmu_pmu_set_event_filter(event, idx, span, sid);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Requested settings same as current global settings*/</div><div class='add'>+	if (span == smmu_pmu-&gt;global_filter_span &amp;&amp;</div><div class='add'>+	    sid == smmu_pmu-&gt;global_filter_sid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!bitmap_empty(smmu_pmu-&gt;used_counters, num_ctrs))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	smmu_pmu_set_event_filter(event, 0, span, sid);</div><div class='add'>+	smmu_pmu-&gt;global_filter_span = span;</div><div class='add'>+	smmu_pmu-&gt;global_filter_sid = sid;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_get_event_idx(struct smmu_pmu *smmu_pmu,</div><div class='add'>+				  struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	int idx, err;</div><div class='add'>+	unsigned int num_ctrs = smmu_pmu-&gt;num_counters;</div><div class='add'>+</div><div class='add'>+	idx = find_first_zero_bit(smmu_pmu-&gt;used_counters, num_ctrs);</div><div class='add'>+	if (idx == num_ctrs)</div><div class='add'>+		/* The counters are all in use. */</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	err = smmu_pmu_apply_event_filter(smmu_pmu, event, idx);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	set_bit(idx, smmu_pmu-&gt;used_counters);</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Implementation of abstract pmu functionality required by</div><div class='add'>+ * the core perf events code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_event_init(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+	struct device *dev = smmu_pmu-&gt;dev;</div><div class='add'>+	struct perf_event *sibling;</div><div class='add'>+	u16 event_id;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;attr.type != event-&gt;pmu-&gt;type)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (hwc-&gt;sample_period) {</div><div class='add'>+		dev_dbg(dev, "Sampling not supported\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event-&gt;cpu &lt; 0) {</div><div class='add'>+		dev_dbg(dev, "Per-task mode not supported\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify specified event is supported on this PMU */</div><div class='add'>+	event_id = get_event(event);</div><div class='add'>+	if (event_id &lt; SMMU_PMCG_ARCH_MAX_EVENTS &amp;&amp;</div><div class='add'>+	    (!test_bit(event_id, smmu_pmu-&gt;supported_events))) {</div><div class='add'>+		dev_dbg(dev, "Invalid event %d for this PMU\n", event_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't allow groups with mixed PMUs, except for s/w events */</div><div class='add'>+	if (event-&gt;group_leader-&gt;pmu != event-&gt;pmu &amp;&amp;</div><div class='add'>+	    !is_software_event(event-&gt;group_leader)) {</div><div class='add'>+		dev_dbg(dev, "Can't create mixed PMU group\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_sibling_event(sibling, event-&gt;group_leader) {</div><div class='add'>+		if (sibling-&gt;pmu != event-&gt;pmu &amp;&amp;</div><div class='add'>+		    !is_software_event(sibling)) {</div><div class='add'>+			dev_dbg(dev, "Can't create mixed PMU group\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwc-&gt;idx = -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure all events are on the same cpu so all events are in the</div><div class='add'>+	 * same cpu context, to avoid races on pmu_enable etc.</div><div class='add'>+	 */</div><div class='add'>+	event-&gt;cpu = smmu_pmu-&gt;on_cpu;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_event_start(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	int idx = hwc-&gt;idx;</div><div class='add'>+</div><div class='add'>+	hwc-&gt;state = 0;</div><div class='add'>+</div><div class='add'>+	smmu_pmu_set_period(smmu_pmu, hwc);</div><div class='add'>+</div><div class='add'>+	smmu_pmu_counter_enable(smmu_pmu, idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_event_stop(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	int idx = hwc-&gt;idx;</div><div class='add'>+</div><div class='add'>+	if (hwc-&gt;state &amp; PERF_HES_STOPPED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	smmu_pmu_counter_disable(smmu_pmu, idx);</div><div class='add'>+	/* As the counter gets updated on _start, ignore PERF_EF_UPDATE */</div><div class='add'>+	smmu_pmu_event_update(event);</div><div class='add'>+	hwc-&gt;state |= PERF_HES_STOPPED | PERF_HES_UPTODATE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_event_add(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	int idx;</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+</div><div class='add'>+	idx = smmu_pmu_get_event_idx(smmu_pmu, event);</div><div class='add'>+	if (idx &lt; 0)</div><div class='add'>+		return idx;</div><div class='add'>+</div><div class='add'>+	hwc-&gt;idx = idx;</div><div class='add'>+	hwc-&gt;state = PERF_HES_STOPPED | PERF_HES_UPTODATE;</div><div class='add'>+	smmu_pmu-&gt;events[idx] = event;</div><div class='add'>+	local64_set(&amp;hwc-&gt;prev_count, 0);</div><div class='add'>+</div><div class='add'>+	smmu_pmu_interrupt_enable(smmu_pmu, idx);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; PERF_EF_START)</div><div class='add'>+		smmu_pmu_event_start(event, flags);</div><div class='add'>+</div><div class='add'>+	/* Propagate changes to the userspace mapping. */</div><div class='add'>+	perf_event_update_userpage(event);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_event_del(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(event-&gt;pmu);</div><div class='add'>+	int idx = hwc-&gt;idx;</div><div class='add'>+</div><div class='add'>+	smmu_pmu_event_stop(event, flags | PERF_EF_UPDATE);</div><div class='add'>+	smmu_pmu_interrupt_disable(smmu_pmu, idx);</div><div class='add'>+	smmu_pmu-&gt;events[idx] = NULL;</div><div class='add'>+	clear_bit(idx, smmu_pmu-&gt;used_counters);</div><div class='add'>+</div><div class='add'>+	perf_event_update_userpage(event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_event_read(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	smmu_pmu_event_update(event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cpumask */</div><div class='add'>+</div><div class='add'>+static ssize_t smmu_pmu_cpumask_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr,</div><div class='add'>+				     char *buf)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(dev_get_drvdata(dev));</div><div class='add'>+</div><div class='add'>+	return cpumap_print_to_pagebuf(true, buf, cpumask_of(smmu_pmu-&gt;on_cpu));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute smmu_pmu_cpumask_attr =</div><div class='add'>+		__ATTR(cpumask, 0444, smmu_pmu_cpumask_show, NULL);</div><div class='add'>+</div><div class='add'>+static struct attribute *smmu_pmu_cpumask_attrs[] = {</div><div class='add'>+	&amp;smmu_pmu_cpumask_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group smmu_pmu_cpumask_group = {</div><div class='add'>+	.attrs = smmu_pmu_cpumask_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Events */</div><div class='add'>+</div><div class='add'>+static ssize_t smmu_pmu_event_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr, char *page)</div><div class='add'>+{</div><div class='add'>+	struct perf_pmu_events_attr *pmu_attr;</div><div class='add'>+</div><div class='add'>+	pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr);</div><div class='add'>+</div><div class='add'>+	return sprintf(page, "event=0x%02llx\n", pmu_attr-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SMMU_EVENT_ATTR(name, config) \</div><div class='add'>+	PMU_EVENT_ATTR(name, smmu_event_attr_##name, \</div><div class='add'>+		       config, smmu_pmu_event_show)</div><div class='add'>+SMMU_EVENT_ATTR(cycles, 0);</div><div class='add'>+SMMU_EVENT_ATTR(transaction, 1);</div><div class='add'>+SMMU_EVENT_ATTR(tlb_miss, 2);</div><div class='add'>+SMMU_EVENT_ATTR(config_cache_miss, 3);</div><div class='add'>+SMMU_EVENT_ATTR(trans_table_walk_access, 4);</div><div class='add'>+SMMU_EVENT_ATTR(config_struct_access, 5);</div><div class='add'>+SMMU_EVENT_ATTR(pcie_ats_trans_rq, 6);</div><div class='add'>+SMMU_EVENT_ATTR(pcie_ats_trans_passed, 7);</div><div class='add'>+</div><div class='add'>+static struct attribute *smmu_pmu_events[] = {</div><div class='add'>+	&amp;smmu_event_attr_cycles.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_transaction.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_tlb_miss.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_config_cache_miss.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_trans_table_walk_access.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_config_struct_access.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_pcie_ats_trans_rq.attr.attr,</div><div class='add'>+	&amp;smmu_event_attr_pcie_ats_trans_passed.attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static umode_t smmu_pmu_event_is_visible(struct kobject *kobj,</div><div class='add'>+					 struct attribute *attr, int unused)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = kobj_to_dev(kobj);</div><div class='add'>+	struct smmu_pmu *smmu_pmu = to_smmu_pmu(dev_get_drvdata(dev));</div><div class='add'>+	struct perf_pmu_events_attr *pmu_attr;</div><div class='add'>+</div><div class='add'>+	pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr.attr);</div><div class='add'>+</div><div class='add'>+	if (test_bit(pmu_attr-&gt;id, smmu_pmu-&gt;supported_events))</div><div class='add'>+		return attr-&gt;mode;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct attribute_group smmu_pmu_events_group = {</div><div class='add'>+	.name = "events",</div><div class='add'>+	.attrs = smmu_pmu_events,</div><div class='add'>+	.is_visible = smmu_pmu_event_is_visible,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Formats */</div><div class='add'>+PMU_FORMAT_ATTR(event,		   "config:0-15");</div><div class='add'>+PMU_FORMAT_ATTR(filter_stream_id,  "config1:0-31");</div><div class='add'>+PMU_FORMAT_ATTR(filter_span,	   "config1:32");</div><div class='add'>+PMU_FORMAT_ATTR(filter_enable,	   "config1:33");</div><div class='add'>+</div><div class='add'>+static struct attribute *smmu_pmu_formats[] = {</div><div class='add'>+	&amp;format_attr_event.attr,</div><div class='add'>+	&amp;format_attr_filter_stream_id.attr,</div><div class='add'>+	&amp;format_attr_filter_span.attr,</div><div class='add'>+	&amp;format_attr_filter_enable.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group smmu_pmu_format_group = {</div><div class='add'>+	.name = "format",</div><div class='add'>+	.attrs = smmu_pmu_formats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *smmu_pmu_attr_grps[] = {</div><div class='add'>+	&amp;smmu_pmu_cpumask_group,</div><div class='add'>+	&amp;smmu_pmu_events_group,</div><div class='add'>+	&amp;smmu_pmu_format_group,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic device handlers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu;</div><div class='add'>+	unsigned int target;</div><div class='add'>+</div><div class='add'>+	smmu_pmu = hlist_entry_safe(node, struct smmu_pmu, node);</div><div class='add'>+	if (cpu != smmu_pmu-&gt;on_cpu)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	target = cpumask_any_but(cpu_online_mask, cpu);</div><div class='add'>+	if (target &gt;= nr_cpu_ids)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	perf_pmu_migrate_context(&amp;smmu_pmu-&gt;pmu, cpu, target);</div><div class='add'>+	smmu_pmu-&gt;on_cpu = target;</div><div class='add'>+	WARN_ON(irq_set_affinity_hint(smmu_pmu-&gt;irq, cpumask_of(target)));</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 smmu_pmu_handle_irq(int irq_num, void *data)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = data;</div><div class='add'>+	u64 ovsr;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	ovsr = readq(smmu_pmu-&gt;reloc_base + SMMU_PMCG_OVSSET0);</div><div class='add'>+	if (!ovsr)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	writeq(ovsr, smmu_pmu-&gt;reloc_base + SMMU_PMCG_OVSCLR0);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(idx, (unsigned long *)&amp;ovsr, smmu_pmu-&gt;num_counters) {</div><div class='add'>+		struct perf_event *event = smmu_pmu-&gt;events[idx];</div><div class='add'>+		struct hw_perf_event *hwc;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(!event))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		smmu_pmu_event_update(event);</div><div class='add'>+		hwc = &amp;event-&gt;hw;</div><div class='add'>+</div><div class='add'>+		smmu_pmu_set_period(smmu_pmu, hwc);</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 smmu_pmu_free_msis(void *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = data;</div><div class='add'>+</div><div class='add'>+	platform_msi_domain_free_irqs(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)</div><div class='add'>+{</div><div class='add'>+	phys_addr_t doorbell;</div><div class='add'>+	struct device *dev = msi_desc_to_dev(desc);</div><div class='add'>+	struct smmu_pmu *pmu = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	doorbell = (((u64)msg-&gt;address_hi) &lt;&lt; 32) | msg-&gt;address_lo;</div><div class='add'>+	doorbell &amp;= MSI_CFG0_ADDR_MASK;</div><div class='add'>+</div><div class='add'>+	writeq_relaxed(doorbell, pmu-&gt;reg_base + SMMU_PMCG_IRQ_CFG0);</div><div class='add'>+	writel_relaxed(msg-&gt;data, pmu-&gt;reg_base + SMMU_PMCG_IRQ_CFG1);</div><div class='add'>+	writel_relaxed(MSI_CFG2_MEMATTR_DEVICE_nGnRE,</div><div class='add'>+		       pmu-&gt;reg_base + SMMU_PMCG_IRQ_CFG2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_setup_msi(struct smmu_pmu *pmu)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *desc;</div><div class='add'>+	struct device *dev = pmu-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Clear MSI address reg */</div><div class='add'>+	writeq_relaxed(0, pmu-&gt;reg_base + SMMU_PMCG_IRQ_CFG0);</div><div class='add'>+</div><div class='add'>+	/* MSI supported or not */</div><div class='add'>+	if (!(readl(pmu-&gt;reg_base + SMMU_PMCG_CFGR) &amp; SMMU_PMCG_CFGR_MSI))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = platform_msi_domain_alloc_irqs(dev, 1, smmu_pmu_write_msi_msg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_warn(dev, "failed to allocate MSIs\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = first_msi_entry(dev);</div><div class='add'>+	if (desc)</div><div class='add'>+		pmu-&gt;irq = desc-&gt;irq;</div><div class='add'>+</div><div class='add'>+	/* Add callback to free MSIs on teardown */</div><div class='add'>+	devm_add_action(dev, smmu_pmu_free_msis, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_setup_irq(struct smmu_pmu *pmu)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = IRQF_NOBALANCING | IRQF_SHARED | IRQF_NO_THREAD;</div><div class='add'>+	int irq, ret = -ENXIO;</div><div class='add'>+</div><div class='add'>+	smmu_pmu_setup_msi(pmu);</div><div class='add'>+</div><div class='add'>+	irq = pmu-&gt;irq;</div><div class='add'>+	if (irq)</div><div class='add'>+		ret = devm_request_irq(pmu-&gt;dev, irq, smmu_pmu_handle_irq,</div><div class='add'>+				       flags, "smmuv3-pmu", pmu);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_reset(struct smmu_pmu *smmu_pmu)</div><div class='add'>+{</div><div class='add'>+	u64 counter_present_mask = GENMASK_ULL(smmu_pmu-&gt;num_counters - 1, 0);</div><div class='add'>+</div><div class='add'>+	smmu_pmu_disable(&amp;smmu_pmu-&gt;pmu);</div><div class='add'>+</div><div class='add'>+	/* Disable counter and interrupt */</div><div class='add'>+	writeq_relaxed(counter_present_mask,</div><div class='add'>+		       smmu_pmu-&gt;reg_base + SMMU_PMCG_CNTENCLR0);</div><div class='add'>+	writeq_relaxed(counter_present_mask,</div><div class='add'>+		       smmu_pmu-&gt;reg_base + SMMU_PMCG_INTENCLR0);</div><div class='add'>+	writeq_relaxed(counter_present_mask,</div><div class='add'>+		       smmu_pmu-&gt;reloc_base + SMMU_PMCG_OVSCLR0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_get_acpi_options(struct smmu_pmu *smmu_pmu)</div><div class='add'>+{</div><div class='add'>+	u32 model;</div><div class='add'>+</div><div class='add'>+	model = *(u32 *)dev_get_platdata(smmu_pmu-&gt;dev);</div><div class='add'>+</div><div class='add'>+	switch (model) {</div><div class='add'>+	case IORT_SMMU_V3_PMCG_HISI_HIP08:</div><div class='add'>+		/* HiSilicon Erratum 162001800 */</div><div class='add'>+		smmu_pmu-&gt;options |= SMMU_PMCG_EVCNTR_RDONLY;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_notice(smmu_pmu-&gt;dev, "option mask 0x%x\n", smmu_pmu-&gt;options);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu;</div><div class='add'>+	struct resource *res_0, *res_1;</div><div class='add'>+	u32 cfgr, reg_size;</div><div class='add'>+	u64 ceid_64[2];</div><div class='add'>+	int irq, err;</div><div class='add'>+	char *name;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	smmu_pmu = devm_kzalloc(dev, sizeof(*smmu_pmu), GFP_KERNEL);</div><div class='add'>+	if (!smmu_pmu)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	smmu_pmu-&gt;dev = dev;</div><div class='add'>+	platform_set_drvdata(pdev, smmu_pmu);</div><div class='add'>+</div><div class='add'>+	smmu_pmu-&gt;pmu = (struct pmu) {</div><div class='add'>+		.task_ctx_nr    = perf_invalid_context,</div><div class='add'>+		.pmu_enable	= smmu_pmu_enable,</div><div class='add'>+		.pmu_disable	= smmu_pmu_disable,</div><div class='add'>+		.event_init	= smmu_pmu_event_init,</div><div class='add'>+		.add		= smmu_pmu_event_add,</div><div class='add'>+		.del		= smmu_pmu_event_del,</div><div class='add'>+		.start		= smmu_pmu_event_start,</div><div class='add'>+		.stop		= smmu_pmu_event_stop,</div><div class='add'>+		.read		= smmu_pmu_event_read,</div><div class='add'>+		.attr_groups	= smmu_pmu_attr_grps,</div><div class='add'>+		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	res_0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	smmu_pmu-&gt;reg_base = devm_ioremap_resource(dev, res_0);</div><div class='add'>+	if (IS_ERR(smmu_pmu-&gt;reg_base))</div><div class='add'>+		return PTR_ERR(smmu_pmu-&gt;reg_base);</div><div class='add'>+</div><div class='add'>+	cfgr = readl_relaxed(smmu_pmu-&gt;reg_base + SMMU_PMCG_CFGR);</div><div class='add'>+</div><div class='add'>+	/* Determine if page 1 is present */</div><div class='add'>+	if (cfgr &amp; SMMU_PMCG_CFGR_RELOC_CTRS) {</div><div class='add'>+		res_1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+		smmu_pmu-&gt;reloc_base = devm_ioremap_resource(dev, res_1);</div><div class='add'>+		if (IS_ERR(smmu_pmu-&gt;reloc_base))</div><div class='add'>+			return PTR_ERR(smmu_pmu-&gt;reloc_base);</div><div class='add'>+	} else {</div><div class='add'>+		smmu_pmu-&gt;reloc_base = smmu_pmu-&gt;reg_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &gt; 0)</div><div class='add'>+		smmu_pmu-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	ceid_64[0] = readq_relaxed(smmu_pmu-&gt;reg_base + SMMU_PMCG_CEID0);</div><div class='add'>+	ceid_64[1] = readq_relaxed(smmu_pmu-&gt;reg_base + SMMU_PMCG_CEID1);</div><div class='add'>+	bitmap_from_arr32(smmu_pmu-&gt;supported_events, (u32 *)ceid_64,</div><div class='add'>+			  SMMU_PMCG_ARCH_MAX_EVENTS);</div><div class='add'>+</div><div class='add'>+	smmu_pmu-&gt;num_counters = FIELD_GET(SMMU_PMCG_CFGR_NCTR, cfgr) + 1;</div><div class='add'>+</div><div class='add'>+	smmu_pmu-&gt;global_filter = !!(cfgr &amp; SMMU_PMCG_CFGR_SID_FILTER_TYPE);</div><div class='add'>+</div><div class='add'>+	reg_size = FIELD_GET(SMMU_PMCG_CFGR_SIZE, cfgr);</div><div class='add'>+	smmu_pmu-&gt;counter_mask = GENMASK_ULL(reg_size, 0);</div><div class='add'>+</div><div class='add'>+	smmu_pmu_reset(smmu_pmu);</div><div class='add'>+</div><div class='add'>+	err = smmu_pmu_setup_irq(smmu_pmu);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Setup irq failed, PMU @%pa\n", &amp;res_0-&gt;start);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	name = devm_kasprintf(&amp;pdev-&gt;dev, GFP_KERNEL, "smmuv3_pmcg_%llx",</div><div class='add'>+			      (res_0-&gt;start) &gt;&gt; SMMU_PMCG_PA_SHIFT);</div><div class='add'>+	if (!name) {</div><div class='add'>+		dev_err(dev, "Create name failed, PMU @%pa\n", &amp;res_0-&gt;start);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smmu_pmu_get_acpi_options(smmu_pmu);</div><div class='add'>+</div><div class='add'>+	/* Pick one CPU to be the preferred one to use */</div><div class='add'>+	smmu_pmu-&gt;on_cpu = raw_smp_processor_id();</div><div class='add'>+	WARN_ON(irq_set_affinity_hint(smmu_pmu-&gt;irq,</div><div class='add'>+				      cpumask_of(smmu_pmu-&gt;on_cpu)));</div><div class='add'>+</div><div class='add'>+	err = cpuhp_state_add_instance_nocalls(cpuhp_state_num,</div><div class='add'>+					       &amp;smmu_pmu-&gt;node);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",</div><div class='add'>+			err, &amp;res_0-&gt;start);</div><div class='add'>+		goto out_cpuhp_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = perf_pmu_register(&amp;smmu_pmu-&gt;pmu, name, -1);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Error %d registering PMU @%pa\n",</div><div class='add'>+			err, &amp;res_0-&gt;start);</div><div class='add'>+		goto out_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Registered PMU @ %pa using %d counters with %s filter settings\n",</div><div class='add'>+		 &amp;res_0-&gt;start, smmu_pmu-&gt;num_counters,</div><div class='add'>+		 smmu_pmu-&gt;global_filter ? "Global(Counter0)" :</div><div class='add'>+		 "Individual");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &amp;smmu_pmu-&gt;node);</div><div class='add'>+out_cpuhp_err:</div><div class='add'>+	put_cpu();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smmu_pmu_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	perf_pmu_unregister(&amp;smmu_pmu-&gt;pmu);</div><div class='add'>+	cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &amp;smmu_pmu-&gt;node);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smmu_pmu_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct smmu_pmu *smmu_pmu = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	smmu_pmu_disable(&amp;smmu_pmu-&gt;pmu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver smmu_pmu_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "arm-smmu-v3-pmcg",</div><div class='add'>+	},</div><div class='add'>+	.probe = smmu_pmu_probe,</div><div class='add'>+	.remove = smmu_pmu_remove,</div><div class='add'>+	.shutdown = smmu_pmu_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init arm_smmu_pmu_init(void)</div><div class='add'>+{</div><div class='add'>+	cpuhp_state_num = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN,</div><div class='add'>+						  "perf/arm/pmcg:online",</div><div class='add'>+						  NULL,</div><div class='add'>+						  smmu_pmu_offline_cpu);</div><div class='add'>+	if (cpuhp_state_num &lt; 0)</div><div class='add'>+		return cpuhp_state_num;</div><div class='add'>+</div><div class='add'>+	return platform_driver_register(&amp;smmu_pmu_driver);</div><div class='add'>+}</div><div class='add'>+module_init(arm_smmu_pmu_init);</div><div class='add'>+</div><div class='add'>+static void __exit arm_smmu_pmu_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;smmu_pmu_driver);</div><div class='add'>+	cpuhp_remove_multi_state(cpuhp_state_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(arm_smmu_pmu_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("PMU driver for ARM SMMUv3 Performance Monitors Extension");</div><div class='add'>+MODULE_AUTHOR("Neil Leeder &lt;nleeder@codeaurora.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Shameer Kolothum &lt;shameerali.kolothum.thodi@huawei.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/allwinner/Kconfig b/drivers/phy/allwinner/Kconfig<br/>index fb1204bcc454..53772d35b36e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/allwinner/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/allwinner/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/allwinner/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/allwinner/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> #</div><div class='ctx'> config PHY_SUN4I_USB</div><div class='ctx'> 	tristate "Allwinner sunxi SoC USB PHY driver"</div><div class='del'>-	depends on ARCH_SUNXI &amp;&amp; HAS_IOMEM &amp;&amp; OF</div><div class='add'>+	depends on ARCH_SUNXI || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOMEM</div><div class='ctx'> 	depends on RESET_CONTROLLER</div><div class='ctx'> 	depends on EXTCON</div><div class='ctx'> 	depends on POWER_SUPPLY</div><div class='hunk'>@@ -19,7 +20,8 @@ config PHY_SUN4I_USB</div><div class='ctx'> </div><div class='ctx'> config PHY_SUN6I_MIPI_DPHY</div><div class='ctx'> 	tristate "Allwinner A31 MIPI D-PHY Support"</div><div class='del'>-	depends on ARCH_SUNXI &amp;&amp; HAS_IOMEM &amp;&amp; OF</div><div class='add'>+	depends on ARCH_SUNXI || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOMEM</div><div class='ctx'> 	depends on RESET_CONTROLLER</div><div class='ctx'> 	select GENERIC_PHY</div><div class='ctx'> 	select GENERIC_PHY_MIPI_DPHY</div><div class='hunk'>@@ -31,7 +33,8 @@ config PHY_SUN6I_MIPI_DPHY</div><div class='ctx'> </div><div class='ctx'> config PHY_SUN9I_USB</div><div class='ctx'> 	tristate "Allwinner sun9i SoC USB PHY driver"</div><div class='del'>-	depends on ARCH_SUNXI &amp;&amp; HAS_IOMEM &amp;&amp; OF</div><div class='add'>+	depends on ARCH_SUNXI || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOMEM</div><div class='ctx'> 	depends on RESET_CONTROLLER</div><div class='ctx'> 	depends on USB_SUPPORT</div><div class='ctx'> 	select USB_COMMON</div><div class='head'>diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c<br/>index 5163097b43df..cc5af961778d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/allwinner/phy-sun4i-usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/allwinner/phy-sun4i-usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/allwinner/phy-sun4i-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/allwinner/phy-sun4i-usb.c</a></div><div class='hunk'>@@ -485,8 +485,11 @@ static int sun4i_usb_phy_set_mode(struct phy *_phy,</div><div class='ctx'> 	struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);</div><div class='ctx'> 	int new_mode;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;index != 0)</div><div class='add'>+	if (phy-&gt;index != 0) {</div><div class='add'>+		if (mode == PHY_MODE_USB_HOST)</div><div class='add'>+			return 0;</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case PHY_MODE_USB_HOST:</div><div class='hunk'>@@ -551,6 +554,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)</div><div class='ctx'> 	struct sun4i_usb_phy_data *data =</div><div class='ctx'> 		container_of(work, struct sun4i_usb_phy_data, detect.work);</div><div class='ctx'> 	struct phy *phy0 = data-&gt;phys[0].phy;</div><div class='add'>+	struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);</div><div class='ctx'> 	bool force_session_end, id_notify = false, vbus_notify = false;</div><div class='ctx'> 	int id_det, vbus_det;</div><div class='ctx'> </div><div class='hunk'>@@ -607,6 +611,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)</div><div class='ctx'> 			mutex_unlock(&amp;phy0-&gt;mutex);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Enable PHY0 passby for host mode only. */</div><div class='add'>+		sun4i_usb_phy_passby(phy, !id_det);</div><div class='add'>+</div><div class='ctx'> 		/* Re-route PHY0 if necessary */</div><div class='ctx'> 		if (data-&gt;cfg-&gt;phy0_dual_route)</div><div class='ctx'> 			sun4i_usb_phy0_reroute(data, id_det);</div><div class='head'>diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig<br/>index 23fe1cda2f70..4c08c1ccdd04 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/amlogic/Kconfig</a></div><div class='hunk'>@@ -36,3 +36,25 @@ config PHY_MESON_GXL_USB3</div><div class='ctx'> 	  Enable this to support the Meson USB3 PHY and OTG detection</div><div class='ctx'> 	  IP block found in Meson GXL and GXM SoCs.</div><div class='ctx'> 	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config PHY_MESON_G12A_USB2</div><div class='add'>+	tristate "Meson G12A USB2 PHY driver"</div><div class='add'>+	default ARCH_MESON</div><div class='add'>+	depends on OF &amp;&amp; (ARCH_MESON || COMPILE_TEST)</div><div class='add'>+	select GENERIC_PHY</div><div class='add'>+	select REGMAP_MMIO</div><div class='add'>+	help</div><div class='add'>+	  Enable this to support the Meson USB2 PHYs found in Meson</div><div class='add'>+	  G12A SoCs.</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config PHY_MESON_G12A_USB3_PCIE</div><div class='add'>+	tristate "Meson G12A USB3+PCIE Combo PHY driver"</div><div class='add'>+	default ARCH_MESON</div><div class='add'>+	depends on OF &amp;&amp; (ARCH_MESON || COMPILE_TEST)</div><div class='add'>+	select GENERIC_PHY</div><div class='add'>+	select REGMAP_MMIO</div><div class='add'>+	help</div><div class='add'>+	  Enable this to support the Meson USB3 + PCIE Combo PHY found</div><div class='add'>+	  in Meson G12A SoCs.</div><div class='add'>+	  If unsure, say N.</div><div class='head'>diff --git a/drivers/phy/amlogic/Makefile b/drivers/phy/amlogic/Makefile<br/>index 4fd8848c194d..fdd008e1b19b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/amlogic/Makefile</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='ctx'> obj-$(CONFIG_PHY_MESON8B_USB2)		+= phy-meson8b-usb2.o</div><div class='ctx'> obj-$(CONFIG_PHY_MESON_GXL_USB2)	+= phy-meson-gxl-usb2.o</div><div class='add'>+obj-$(CONFIG_PHY_MESON_G12A_USB2)	+= phy-meson-g12a-usb2.o</div><div class='ctx'> obj-$(CONFIG_PHY_MESON_GXL_USB3)	+= phy-meson-gxl-usb3.o</div><div class='add'>+obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE)	+= phy-meson-g12a-usb3-pcie.o</div><div class='head'>diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb2.c b/drivers/phy/amlogic/phy-meson-g12a-usb2.c<br/>new file mode 100644<br/>index 000000000000..9065ffc85eb4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/phy-meson-g12a-usb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/amlogic/phy-meson-g12a-usb2.c</a></div><div class='hunk'>@@ -0,0 +1,341 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Meson G12A USB2 PHY driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Martin Blumenstingl &lt;martin.blumenstingl@googlemail.com&gt;</div><div class='add'>+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved</div><div class='add'>+ * Copyright (C) 2019 BayLibre, SAS</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.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/bitops.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/io.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/regmap.h&gt;</div><div class='add'>+#include &lt;linux/reset.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'>+#define PHY_CTRL_R0						0x0</div><div class='add'>+#define PHY_CTRL_R1						0x4</div><div class='add'>+#define PHY_CTRL_R2						0x8</div><div class='add'>+#define PHY_CTRL_R3						0xc</div><div class='add'>+	#define PHY_CTRL_R3_SQUELCH_REF				GENMASK(1, 0)</div><div class='add'>+	#define PHY_CTRL_R3_HSDIC_REF				GENMASK(3, 2)</div><div class='add'>+	#define PHY_CTRL_R3_DISC_THRESH				GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R4						0x10</div><div class='add'>+	#define PHY_CTRL_R4_CALIB_CODE_7_0			GENMASK(7, 0)</div><div class='add'>+	#define PHY_CTRL_R4_CALIB_CODE_15_8			GENMASK(15, 8)</div><div class='add'>+	#define PHY_CTRL_R4_CALIB_CODE_23_16			GENMASK(23, 16)</div><div class='add'>+	#define PHY_CTRL_R4_I_C2L_CAL_EN			BIT(24)</div><div class='add'>+	#define PHY_CTRL_R4_I_C2L_CAL_RESET_N			BIT(25)</div><div class='add'>+	#define PHY_CTRL_R4_I_C2L_CAL_DONE			BIT(26)</div><div class='add'>+	#define PHY_CTRL_R4_TEST_BYPASS_MODE_EN			BIT(27)</div><div class='add'>+	#define PHY_CTRL_R4_I_C2L_BIAS_TRIM_1_0			GENMASK(29, 28)</div><div class='add'>+	#define PHY_CTRL_R4_I_C2L_BIAS_TRIM_3_2			GENMASK(31, 30)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R5						0x14</div><div class='add'>+#define PHY_CTRL_R6						0x18</div><div class='add'>+#define PHY_CTRL_R7						0x1c</div><div class='add'>+#define PHY_CTRL_R8						0x20</div><div class='add'>+#define PHY_CTRL_R9						0x24</div><div class='add'>+#define PHY_CTRL_R10						0x28</div><div class='add'>+#define PHY_CTRL_R11						0x2c</div><div class='add'>+#define PHY_CTRL_R12						0x30</div><div class='add'>+#define PHY_CTRL_R13						0x34</div><div class='add'>+	#define PHY_CTRL_R13_CUSTOM_PATTERN_19			GENMASK(7, 0)</div><div class='add'>+	#define PHY_CTRL_R13_LOAD_STAT				BIT(14)</div><div class='add'>+	#define PHY_CTRL_R13_UPDATE_PMA_SIGNALS			BIT(15)</div><div class='add'>+	#define PHY_CTRL_R13_MIN_COUNT_FOR_SYNC_DET		GENMASK(20, 16)</div><div class='add'>+	#define PHY_CTRL_R13_CLEAR_HOLD_HS_DISCONNECT		BIT(21)</div><div class='add'>+	#define PHY_CTRL_R13_BYPASS_HOST_DISCONNECT_VAL		BIT(22)</div><div class='add'>+	#define PHY_CTRL_R13_BYPASS_HOST_DISCONNECT_EN		BIT(23)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_HS_EN			BIT(24)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_FS_EN			BIT(25)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_LS_EN			BIT(26)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_HS_OE			BIT(27)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_FS_OE			BIT(28)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_HS_RX_EN			BIT(29)</div><div class='add'>+	#define PHY_CTRL_R13_I_C2L_FSLS_RX_EN			BIT(30)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R14						0x38</div><div class='add'>+	#define PHY_CTRL_R14_I_RDP_EN				BIT(0)</div><div class='add'>+	#define PHY_CTRL_R14_I_RPU_SW1_EN			BIT(1)</div><div class='add'>+	#define PHY_CTRL_R14_I_RPU_SW2_EN			GENMASK(2, 3)</div><div class='add'>+	#define PHY_CTRL_R14_PG_RSTN				BIT(4)</div><div class='add'>+	#define PHY_CTRL_R14_I_C2L_DATA_16_8			BIT(5)</div><div class='add'>+	#define PHY_CTRL_R14_I_C2L_ASSERT_SINGLE_EN_ZERO	BIT(6)</div><div class='add'>+	#define PHY_CTRL_R14_BYPASS_CTRL_7_0			GENMASK(15, 8)</div><div class='add'>+	#define PHY_CTRL_R14_BYPASS_CTRL_15_8			GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R15						0x3c</div><div class='add'>+#define PHY_CTRL_R16						0x40</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_M				GENMASK(8, 0)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_N				GENMASK(14, 10)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_TDC_MODE			BIT(20)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_SDM_EN			BIT(21)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_LOAD				BIT(22)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_DCO_SDM_EN			BIT(23)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_LOCK_LONG			GENMASK(25, 24)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_LOCK_F			BIT(26)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_FAST_LOCK			BIT(27)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_EN				BIT(28)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_RESET				BIT(29)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_LOCK				BIT(30)</div><div class='add'>+	#define PHY_CTRL_R16_MPLL_LOCK_DIG			BIT(31)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R17						0x44</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_FRAC_IN			GENMASK(13, 0)</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_FIX_EN			BIT(16)</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_LAMBDA1			GENMASK(19, 17)</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_LAMBDA0			GENMASK(22, 20)</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_FILTER_MODE			BIT(23)</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_FILTER_PVT2			GENMASK(27, 24)</div><div class='add'>+	#define PHY_CTRL_R17_MPLL_FILTER_PVT1			GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R18						0x48</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_LKW_SEL			GENMASK(1, 0)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_LK_W				GENMASK(5, 2)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_LK_S				GENMASK(11, 6)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_DCO_M_EN			BIT(12)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_DCO_CLK_SEL			BIT(13)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_PFD_GAIN			GENMASK(15, 14)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_ROU				GENMASK(18, 16)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_DATA_SEL			GENMASK(21, 19)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_BIAS_ADJ			GENMASK(23, 22)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_BB_MODE			GENMASK(25, 24)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_ALPHA				GENMASK(28, 26)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_ADJ_LDO			GENMASK(30, 29)</div><div class='add'>+	#define PHY_CTRL_R18_MPLL_ACG_RANGE			BIT(31)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R19						0x4c</div><div class='add'>+#define PHY_CTRL_R20						0x50</div><div class='add'>+	#define PHY_CTRL_R20_USB2_IDDET_EN			BIT(0)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_OTG_VBUS_TRIM_2_0		GENMASK(3, 1)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_OTG_VBUSDET_EN		BIT(4)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_AMON_EN			BIT(5)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_CAL_CODE_R5			BIT(6)</div><div class='add'>+	#define PHY_CTRL_R20_BYPASS_OTG_DET			BIT(7)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_DMON_EN			BIT(8)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_DMON_SEL_3_0			GENMASK(12, 9)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_EDGE_DRV_EN			BIT(13)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_EDGE_DRV_TRIM_1_0		GENMASK(15, 14)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_BGR_ADJ_4_0			GENMASK(20, 16)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_BGR_START			BIT(21)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_BGR_VREF_4_0			GENMASK(28, 24)</div><div class='add'>+	#define PHY_CTRL_R20_USB2_BGR_DBG_1_0			GENMASK(30, 29)</div><div class='add'>+	#define PHY_CTRL_R20_BYPASS_CAL_DONE_R5			BIT(31)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R21						0x54</div><div class='add'>+	#define PHY_CTRL_R21_USB2_BGR_FORCE			BIT(0)</div><div class='add'>+	#define PHY_CTRL_R21_USB2_CAL_ACK_EN			BIT(1)</div><div class='add'>+	#define PHY_CTRL_R21_USB2_OTG_ACA_EN			BIT(2)</div><div class='add'>+	#define PHY_CTRL_R21_USB2_TX_STRG_PD			BIT(3)</div><div class='add'>+	#define PHY_CTRL_R21_USB2_OTG_ACA_TRIM_1_0		GENMASK(5, 4)</div><div class='add'>+	#define PHY_CTRL_R21_BYPASS_UTMI_CNTR			GENMASK(15, 6)</div><div class='add'>+	#define PHY_CTRL_R21_BYPASS_UTMI_REG			GENMASK(25, 20)</div><div class='add'>+</div><div class='add'>+#define PHY_CTRL_R22						0x58</div><div class='add'>+#define PHY_CTRL_R23						0x5c</div><div class='add'>+</div><div class='add'>+#define RESET_COMPLETE_TIME					1000</div><div class='add'>+#define PLL_RESET_COMPLETE_TIME					100</div><div class='add'>+</div><div class='add'>+struct phy_meson_g12a_usb2_priv {</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	struct regmap		*regmap;</div><div class='add'>+	struct clk		*clk;</div><div class='add'>+	struct reset_control	*reset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config phy_meson_g12a_usb2_regmap_conf = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = PHY_CTRL_R23,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phy_meson_g12a_usb2_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct phy_meson_g12a_usb2_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reset_control_reset(priv-&gt;reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	udelay(RESET_COMPLETE_TIME);</div><div class='add'>+</div><div class='add'>+	/* usb2_otg_aca_en == 0 */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, PHY_CTRL_R21,</div><div class='add'>+			   PHY_CTRL_R21_USB2_OTG_ACA_EN, 0);</div><div class='add'>+</div><div class='add'>+	/* PLL Setup : 24MHz * 20 / 1 = 480MHz */</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R16,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R16_MPLL_M, 20) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R16_MPLL_N, 1) |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_LOAD |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R16_MPLL_LOCK_LONG, 1) |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_FAST_LOCK |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_EN |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_RESET);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R17,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R17_MPLL_FRAC_IN, 0) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R17_MPLL_LAMBDA1, 7) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R17_MPLL_LAMBDA0, 7) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R17_MPLL_FILTER_PVT2, 2) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R17_MPLL_FILTER_PVT1, 9));</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R18,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_LKW_SEL, 1) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_LK_W, 9) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_LK_S, 0x27) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_PFD_GAIN, 1) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_ROU, 7) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_DATA_SEL, 3) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_BIAS_ADJ, 1) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_BB_MODE, 0) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_ALPHA, 3) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R18_MPLL_ADJ_LDO, 1) |</div><div class='add'>+		     PHY_CTRL_R18_MPLL_ACG_RANGE);</div><div class='add'>+</div><div class='add'>+	udelay(PLL_RESET_COMPLETE_TIME);</div><div class='add'>+</div><div class='add'>+	/* UnReset PLL */</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R16,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R16_MPLL_M, 20) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R16_MPLL_N, 1) |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_LOAD |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R16_MPLL_LOCK_LONG, 1) |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_FAST_LOCK |</div><div class='add'>+		     PHY_CTRL_R16_MPLL_EN);</div><div class='add'>+</div><div class='add'>+	/* PHY Tuning */</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R20,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R20_USB2_OTG_VBUS_TRIM_2_0, 4) |</div><div class='add'>+		     PHY_CTRL_R20_USB2_OTG_VBUSDET_EN |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R20_USB2_DMON_SEL_3_0, 15) |</div><div class='add'>+		     PHY_CTRL_R20_USB2_EDGE_DRV_EN |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R20_USB2_EDGE_DRV_TRIM_1_0, 3) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R20_USB2_BGR_ADJ_4_0, 0) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R20_USB2_BGR_VREF_4_0, 0) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R20_USB2_BGR_DBG_1_0, 0));</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R4,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_7_0, 0xf) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_15_8, 0xf) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_23_16, 0xf) |</div><div class='add'>+		     PHY_CTRL_R4_TEST_BYPASS_MODE_EN |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R4_I_C2L_BIAS_TRIM_1_0, 0) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R4_I_C2L_BIAS_TRIM_3_2, 0));</div><div class='add'>+</div><div class='add'>+	/* Tuning Disconnect Threshold */</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R3,</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R3_SQUELCH_REF, 0) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R3_HSDIC_REF, 1) |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R3_DISC_THRESH, 3));</div><div class='add'>+</div><div class='add'>+	/* Analog Settings */</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R14, 0);</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_CTRL_R13,</div><div class='add'>+		     PHY_CTRL_R13_UPDATE_PMA_SIGNALS |</div><div class='add'>+		     FIELD_PREP(PHY_CTRL_R13_MIN_COUNT_FOR_SYNC_DET, 7));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phy_meson_g12a_usb2_exit(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct phy_meson_g12a_usb2_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+</div><div class='add'>+	return reset_control_reset(priv-&gt;reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set_mode is not needed, mode setting is handled via the UTMI bus */</div><div class='add'>+static const struct phy_ops phy_meson_g12a_usb2_ops = {</div><div class='add'>+	.init		= phy_meson_g12a_usb2_init,</div><div class='add'>+	.exit		= phy_meson_g12a_usb2_exit,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phy_meson_g12a_usb2_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 phy_provider *phy_provider;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct phy_meson_g12a_usb2_priv *priv;</div><div class='add'>+	struct phy *phy;</div><div class='add'>+	void __iomem *base;</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;dev = dev;</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init_mmio(dev, base,</div><div class='add'>+					     &amp;phy_meson_g12a_usb2_regmap_conf);</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'>+	priv-&gt;clk = devm_clk_get(dev, "xtal");</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;reset = devm_reset_control_get(dev, "phy");</div><div class='add'>+	if (IS_ERR(priv-&gt;reset))</div><div class='add'>+		return PTR_ERR(priv-&gt;reset);</div><div class='add'>+</div><div class='add'>+	ret = reset_control_deassert(priv-&gt;reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	phy = devm_phy_create(dev, NULL, &amp;phy_meson_g12a_usb2_ops);</div><div class='add'>+	if (IS_ERR(phy)) {</div><div class='add'>+		ret = PTR_ERR(phy);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(dev, "failed to create PHY\n");</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy_set_bus_width(phy, 8);</div><div class='add'>+	phy_set_drvdata(phy, priv);</div><div class='add'>+</div><div class='add'>+	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(phy_provider);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id phy_meson_g12a_usb2_of_match[] = {</div><div class='add'>+	{ .compatible = "amlogic,g12a-usb2-phy", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, phy_meson_g12a_usb2_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver phy_meson_g12a_usb2_driver = {</div><div class='add'>+	.probe	= phy_meson_g12a_usb2_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name		= "phy-meson-g12a-usb2",</div><div class='add'>+		.of_match_table	= phy_meson_g12a_usb2_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(phy_meson_g12a_usb2_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Martin Blumenstingl &lt;martin.blumenstingl@googlemail.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Neil Armstrong &lt;narmstrong@baylibre.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Meson G12A USB2 PHY driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c<br/>new file mode 100644<br/>index 000000000000..6233a7979a93<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c</a></div><div class='hunk'>@@ -0,0 +1,413 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Amlogic G12A USB3 + PCIE Combo PHY driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved</div><div class='add'>+ * Copyright (C) 2019 BayLibre, SAS</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.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/bitops.h&gt;</div><div class='add'>+#include &lt;linux/clk.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/phy/phy.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/platform_device.h&gt;</div><div class='add'>+#include &lt;dt-bindings/phy/phy.h&gt;</div><div class='add'>+</div><div class='add'>+#define PHY_R0							0x00</div><div class='add'>+	#define PHY_R0_PCIE_POWER_STATE				GENMASK(4, 0)</div><div class='add'>+	#define PHY_R0_PCIE_USB3_SWITCH				GENMASK(6, 5)</div><div class='add'>+</div><div class='add'>+#define PHY_R1							0x04</div><div class='add'>+	#define PHY_R1_PHY_TX1_TERM_OFFSET			GENMASK(4, 0)</div><div class='add'>+	#define PHY_R1_PHY_TX0_TERM_OFFSET			GENMASK(9, 5)</div><div class='add'>+	#define PHY_R1_PHY_RX1_EQ				GENMASK(12, 10)</div><div class='add'>+	#define PHY_R1_PHY_RX0_EQ				GENMASK(15, 13)</div><div class='add'>+	#define PHY_R1_PHY_LOS_LEVEL				GENMASK(20, 16)</div><div class='add'>+	#define PHY_R1_PHY_LOS_BIAS				GENMASK(23, 21)</div><div class='add'>+	#define PHY_R1_PHY_REF_CLKDIV2				BIT(24)</div><div class='add'>+	#define PHY_R1_PHY_MPLL_MULTIPLIER			GENMASK(31, 25)</div><div class='add'>+</div><div class='add'>+#define PHY_R2							0x08</div><div class='add'>+	#define PHY_R2_PCS_TX_DEEMPH_GEN2_6DB			GENMASK(5, 0)</div><div class='add'>+	#define PHY_R2_PCS_TX_DEEMPH_GEN2_3P5DB			GENMASK(11, 6)</div><div class='add'>+	#define PHY_R2_PCS_TX_DEEMPH_GEN1			GENMASK(17, 12)</div><div class='add'>+	#define PHY_R2_PHY_TX_VBOOST_LVL			GENMASK(20, 18)</div><div class='add'>+</div><div class='add'>+#define PHY_R4							0x10</div><div class='add'>+	#define PHY_R4_PHY_CR_WRITE				BIT(0)</div><div class='add'>+	#define PHY_R4_PHY_CR_READ				BIT(1)</div><div class='add'>+	#define PHY_R4_PHY_CR_DATA_IN				GENMASK(17, 2)</div><div class='add'>+	#define PHY_R4_PHY_CR_CAP_DATA				BIT(18)</div><div class='add'>+	#define PHY_R4_PHY_CR_CAP_ADDR				BIT(19)</div><div class='add'>+</div><div class='add'>+#define PHY_R5							0x14</div><div class='add'>+	#define PHY_R5_PHY_CR_DATA_OUT				GENMASK(15, 0)</div><div class='add'>+	#define PHY_R5_PHY_CR_ACK				BIT(16)</div><div class='add'>+	#define PHY_R5_PHY_BS_OUT				BIT(17)</div><div class='add'>+</div><div class='add'>+struct phy_g12a_usb3_pcie_priv {</div><div class='add'>+	struct regmap		*regmap;</div><div class='add'>+	struct regmap		*regmap_cr;</div><div class='add'>+	struct clk		*clk_ref;</div><div class='add'>+	struct reset_control	*reset;</div><div class='add'>+	struct phy		*phy;</div><div class='add'>+	unsigned int		mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config phy_g12a_usb3_pcie_regmap_conf = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = PHY_R5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phy_g12a_usb3_pcie_cr_bus_addr(struct phy_g12a_usb3_pcie_priv *priv,</div><div class='add'>+					  unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int val, reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	reg = FIELD_PREP(PHY_R4_PHY_CR_DATA_IN, addr);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg | PHY_R4_PHY_CR_CAP_ADDR);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       (val &amp; PHY_R5_PHY_CR_ACK),</div><div class='add'>+				       5, 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       !(val &amp; PHY_R5_PHY_CR_ACK),</div><div class='add'>+				       5, 1000);</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 phy_g12a_usb3_pcie_cr_bus_read(void *context, unsigned int addr,</div><div class='add'>+					  unsigned int *data)</div><div class='add'>+{</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv = context;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = phy_g12a_usb3_pcie_cr_bus_addr(priv, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, 0);</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, PHY_R4_PHY_CR_READ);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       (val &amp; PHY_R5_PHY_CR_ACK),</div><div class='add'>+				       5, 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*data = FIELD_GET(PHY_R5_PHY_CR_DATA_OUT, val);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, 0);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       !(val &amp; PHY_R5_PHY_CR_ACK),</div><div class='add'>+				       5, 1000);</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 phy_g12a_usb3_pcie_cr_bus_write(void *context, unsigned int addr,</div><div class='add'>+					   unsigned int data)</div><div class='add'>+{</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv = context;</div><div class='add'>+	unsigned int val, reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = phy_g12a_usb3_pcie_cr_bus_addr(priv, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reg = FIELD_PREP(PHY_R4_PHY_CR_DATA_IN, data);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg | PHY_R4_PHY_CR_CAP_DATA);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       (val &amp; PHY_R5_PHY_CR_ACK),</div><div class='add'>+				       5, 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       (val &amp; PHY_R5_PHY_CR_ACK) == 0,</div><div class='add'>+				       5, 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg | PHY_R4_PHY_CR_WRITE);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       (val &amp; PHY_R5_PHY_CR_ACK),</div><div class='add'>+				       5, 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, PHY_R4, reg);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, PHY_R5, val,</div><div class='add'>+				       (val &amp; PHY_R5_PHY_CR_ACK) == 0,</div><div class='add'>+				       5, 1000);</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 regmap_config phy_g12a_usb3_pcie_cr_regmap_conf = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+	.reg_read = phy_g12a_usb3_pcie_cr_bus_read,</div><div class='add'>+	.reg_write = phy_g12a_usb3_pcie_cr_bus_write,</div><div class='add'>+	.max_register = 0xffff,</div><div class='add'>+	.fast_io = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phy_g12a_usb3_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+	int data, ret;</div><div class='add'>+</div><div class='add'>+	/* Switch PHY to USB3 */</div><div class='add'>+	/* TODO figure out how to handle when PCIe was set in the bootloader */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, PHY_R0,</div><div class='add'>+			   PHY_R0_PCIE_USB3_SWITCH,</div><div class='add'>+			   PHY_R0_PCIE_USB3_SWITCH);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * WORKAROUND: There is SSPHY suspend bug due to</div><div class='add'>+	 * which USB enumerates</div><div class='add'>+	 * in HS mode instead of SS mode. Workaround it by asserting</div><div class='add'>+	 * LANE0.TX_ALT_BLOCK.EN_ALT_BUS to enable TX to use alt bus</div><div class='add'>+	 * mode</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap_cr, 0x102d, BIT(7), BIT(7));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap_cr, 0x1010, 0xff0, 20);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fix RX Equalization setting as follows</div><div class='add'>+	 * LANE0.RX_OVRD_IN_HI. RX_EQ_EN set to 0</div><div class='add'>+	 * LANE0.RX_OVRD_IN_HI.RX_EQ_EN_OVRD set to 1</div><div class='add'>+	 * LANE0.RX_OVRD_IN_HI.RX_EQ set to 3</div><div class='add'>+	 * LANE0.RX_OVRD_IN_HI.RX_EQ_OVRD set to 1</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap_cr, 0x1006, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data &amp;= ~BIT(6);</div><div class='add'>+	data |= BIT(7);</div><div class='add'>+	data &amp;= ~(0x7 &lt;&lt; 8);</div><div class='add'>+	data |= (0x3 &lt;&lt; 8);</div><div class='add'>+	data |= (1 &lt;&lt; 11);</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap_cr, 0x1006, 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'>+	 * Set EQ and TX launch amplitudes as follows</div><div class='add'>+	 * LANE0.TX_OVRD_DRV_LO.PREEMPH set to 22</div><div class='add'>+	 * LANE0.TX_OVRD_DRV_LO.AMPLITUDE set to 127</div><div class='add'>+	 * LANE0.TX_OVRD_DRV_LO.EN set to 1.</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap_cr, 0x1002, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data &amp;= ~0x3f80;</div><div class='add'>+	data |= (0x16 &lt;&lt; 7);</div><div class='add'>+	data &amp;= ~0x7f;</div><div class='add'>+	data |= (0x7f | BIT(14));</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap_cr, 0x1002, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* MPLL_LOOP_CTL.PROP_CNTRL = 8 */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap_cr, 0x30, 0xf &lt;&lt; 4, 8 &lt;&lt; 4);</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, PHY_R2,</div><div class='add'>+			PHY_R2_PHY_TX_VBOOST_LVL,</div><div class='add'>+			FIELD_PREP(PHY_R2_PHY_TX_VBOOST_LVL, 0x4));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, PHY_R1,</div><div class='add'>+			PHY_R1_PHY_LOS_BIAS | PHY_R1_PHY_LOS_LEVEL,</div><div class='add'>+			FIELD_PREP(PHY_R1_PHY_LOS_BIAS, 4) |</div><div class='add'>+			FIELD_PREP(PHY_R1_PHY_LOS_LEVEL, 9));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phy_g12a_usb3_pcie_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reset_control_reset(priv-&gt;reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mode == PHY_TYPE_USB3)</div><div class='add'>+		return phy_g12a_usb3_init(phy);</div><div class='add'>+</div><div class='add'>+	/* Power UP PCIE */</div><div class='add'>+	/* TODO figure out when the bootloader has set USB3 mode before */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, PHY_R0,</div><div class='add'>+			   PHY_R0_PCIE_POWER_STATE,</div><div class='add'>+			   FIELD_PREP(PHY_R0_PCIE_POWER_STATE, 0x1c));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phy_g12a_usb3_pcie_exit(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+</div><div class='add'>+	return reset_control_reset(priv-&gt;reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phy *phy_g12a_usb3_pcie_xlate(struct device *dev,</div><div class='add'>+					    struct of_phandle_args *args)</div><div class='add'>+{</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	unsigned int mode;</div><div class='add'>+</div><div class='add'>+	if (args-&gt;args_count &lt; 1) {</div><div class='add'>+		dev_err(dev, "invalid number of arguments\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mode = args-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	if (mode != PHY_TYPE_USB3 &amp;&amp; mode != PHY_TYPE_PCIE) {</div><div class='add'>+		dev_err(dev, "invalid phy mode select argument\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phy_ops phy_g12a_usb3_pcie_ops = {</div><div class='add'>+	.init		= phy_g12a_usb3_pcie_init,</div><div class='add'>+	.exit		= phy_g12a_usb3_pcie_exit,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int phy_g12a_usb3_pcie_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 *np = dev-&gt;of_node;</div><div class='add'>+	struct phy_g12a_usb3_pcie_priv *priv;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct phy_provider *phy_provider;</div><div class='add'>+	void __iomem *base;</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'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init_mmio(dev, base,</div><div class='add'>+					     &amp;phy_g12a_usb3_pcie_regmap_conf);</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'>+	priv-&gt;regmap_cr = devm_regmap_init(dev, NULL, priv,</div><div class='add'>+					   &amp;phy_g12a_usb3_pcie_cr_regmap_conf);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap_cr))</div><div class='add'>+		return PTR_ERR(priv-&gt;regmap_cr);</div><div class='add'>+</div><div class='add'>+	priv-&gt;clk_ref = devm_clk_get(dev, "ref_clk");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk_ref))</div><div class='add'>+		return PTR_ERR(priv-&gt;clk_ref);</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk_ref);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_disable_clk_ref;</div><div class='add'>+</div><div class='add'>+	priv-&gt;reset = devm_reset_control_array_get(dev, false, false);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset))</div><div class='add'>+		return PTR_ERR(priv-&gt;reset);</div><div class='add'>+</div><div class='add'>+	priv-&gt;phy = devm_phy_create(dev, np, &amp;phy_g12a_usb3_pcie_ops);</div><div class='add'>+	if (IS_ERR(priv-&gt;phy)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;phy);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(dev, "failed to create PHY\n");</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy_set_drvdata(priv-&gt;phy, priv);</div><div class='add'>+	dev_set_drvdata(dev, priv);</div><div class='add'>+</div><div class='add'>+	phy_provider = devm_of_phy_provider_register(dev,</div><div class='add'>+						     phy_g12a_usb3_pcie_xlate);</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(phy_provider);</div><div class='add'>+</div><div class='add'>+err_disable_clk_ref:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_ref);</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 phy_g12a_usb3_pcie_of_match[] = {</div><div class='add'>+	{ .compatible = "amlogic,g12a-usb3-pcie-phy", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, phy_g12a_usb3_pcie_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver phy_g12a_usb3_pcie_driver = {</div><div class='add'>+	.probe	= phy_g12a_usb3_pcie_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name		= "phy-g12a-usb3-pcie",</div><div class='add'>+		.of_match_table	= phy_g12a_usb3_pcie_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(phy_g12a_usb3_pcie_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Neil Armstrong &lt;narmstrong@baylibre.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Amlogic G12A USB3 + PCIE Combo PHY driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c<br/>index 148ef0bdb9c1..4cbee412f2b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/phy-meson-gxl-usb2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/amlogic/phy-meson-gxl-usb2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/amlogic/phy-meson-gxl-usb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/amlogic/phy-meson-gxl-usb2.c</a></div><div class='hunk'>@@ -261,14 +261,9 @@ static int phy_meson_gxl_usb2_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(priv-&gt;regmap))</div><div class='ctx'> 		return PTR_ERR(priv-&gt;regmap);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk = devm_clk_get(dev, "phy");</div><div class='del'>-	if (IS_ERR(priv-&gt;clk)) {</div><div class='del'>-		ret = PTR_ERR(priv-&gt;clk);</div><div class='del'>-		if (ret == -ENOENT)</div><div class='del'>-			priv-&gt;clk = NULL;</div><div class='del'>-		else</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;clk = devm_clk_get_optional(dev, "phy");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk))</div><div class='add'>+		return PTR_ERR(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;reset = devm_reset_control_get_optional_shared(dev, "phy");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;reset))</div><div class='head'>diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig<br/>index aa917a61071d..f30f4819c3bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/broadcom/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/broadcom/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/broadcom/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/broadcom/Kconfig</a></div><div class='hunk'>@@ -10,6 +10,17 @@ config PHY_CYGNUS_PCIE</div><div class='ctx'> 	  Enable this to support the Broadcom Cygnus PCIe PHY.</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config PHY_BCM_SR_USB</div><div class='add'>+	tristate "Broadcom Stingray USB PHY driver"</div><div class='add'>+	depends on OF &amp;&amp; (ARCH_BCM_IPROC || COMPILE_TEST)</div><div class='add'>+	select GENERIC_PHY</div><div class='add'>+	default ARCH_BCM_IPROC</div><div class='add'>+	help</div><div class='add'>+	  Enable this to support the Broadcom Stingray USB PHY</div><div class='add'>+	  driver. It supports all versions of Superspeed and</div><div class='add'>+	  Highspeed PHYs.</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config BCM_KONA_USB2_PHY</div><div class='ctx'> 	tristate "Broadcom Kona USB2 PHY Driver"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='head'>diff --git a/drivers/phy/broadcom/Makefile b/drivers/phy/broadcom/Makefile<br/>index 0f60184e6662..f453c7d3ffff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/broadcom/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/broadcom/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/broadcom/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/broadcom/Makefile</a></div><div class='hunk'>@@ -11,3 +11,4 @@ obj-$(CONFIG_PHY_BRCM_USB)		+= phy-brcm-usb-dvr.o</div><div class='ctx'> phy-brcm-usb-dvr-objs := phy-brcm-usb.o phy-brcm-usb-init.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PHY_BCM_SR_PCIE)		+= phy-bcm-sr-pcie.o</div><div class='add'>+obj-$(CONFIG_PHY_BCM_SR_USB)		+= phy-bcm-sr-usb.o</div><div class='head'>diff --git a/drivers/phy/broadcom/phy-bcm-sr-usb.c b/drivers/phy/broadcom/phy-bcm-sr-usb.c<br/>new file mode 100644<br/>index 000000000000..fe6c58910e4c<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/broadcom/phy-bcm-sr-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/broadcom/phy-bcm-sr-usb.c</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016-2018 Broadcom</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/io.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/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+enum bcm_usb_phy_version {</div><div class='add'>+	BCM_SR_USB_COMBO_PHY,</div><div class='add'>+	BCM_SR_USB_HS_PHY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bcm_usb_phy_reg {</div><div class='add'>+	PLL_NDIV_FRAC,</div><div class='add'>+	PLL_NDIV_INT,</div><div class='add'>+	PLL_CTRL,</div><div class='add'>+	PHY_CTRL,</div><div class='add'>+	PHY_PLL_CTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* USB PHY registers */</div><div class='add'>+</div><div class='add'>+static const u8 bcm_usb_combo_phy_ss[] = {</div><div class='add'>+	[PLL_CTRL]		= 0x18,</div><div class='add'>+	[PHY_CTRL]		= 0x14,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 bcm_usb_combo_phy_hs[] = {</div><div class='add'>+	[PLL_NDIV_FRAC]	= 0x04,</div><div class='add'>+	[PLL_NDIV_INT]	= 0x08,</div><div class='add'>+	[PLL_CTRL]	= 0x0c,</div><div class='add'>+	[PHY_CTRL]	= 0x10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HSPLL_NDIV_INT_VAL	0x13</div><div class='add'>+#define HSPLL_NDIV_FRAC_VAL	0x1005</div><div class='add'>+</div><div class='add'>+static const u8 bcm_usb_hs_phy[] = {</div><div class='add'>+	[PLL_NDIV_FRAC]	= 0x0,</div><div class='add'>+	[PLL_NDIV_INT]	= 0x4,</div><div class='add'>+	[PLL_CTRL]	= 0x8,</div><div class='add'>+	[PHY_CTRL]	= 0xc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum pll_ctrl_bits {</div><div class='add'>+	PLL_RESETB,</div><div class='add'>+	SSPLL_SUSPEND_EN,</div><div class='add'>+	PLL_SEQ_START,</div><div class='add'>+	PLL_LOCK,</div><div class='add'>+	PLL_PDIV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 u3pll_ctrl[] = {</div><div class='add'>+	[PLL_RESETB]		= 0,</div><div class='add'>+	[SSPLL_SUSPEND_EN]	= 1,</div><div class='add'>+	[PLL_SEQ_START]		= 2,</div><div class='add'>+	[PLL_LOCK]		= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HSPLL_PDIV_MASK		0xF</div><div class='add'>+#define HSPLL_PDIV_VAL		0x1</div><div class='add'>+</div><div class='add'>+static const u8 u2pll_ctrl[] = {</div><div class='add'>+	[PLL_PDIV]	= 1,</div><div class='add'>+	[PLL_RESETB]	= 5,</div><div class='add'>+	[PLL_LOCK]	= 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bcm_usb_phy_ctrl_bits {</div><div class='add'>+	CORERDY,</div><div class='add'>+	AFE_LDO_PWRDWNB,</div><div class='add'>+	AFE_PLL_PWRDWNB,</div><div class='add'>+	AFE_BG_PWRDWNB,</div><div class='add'>+	PHY_ISO,</div><div class='add'>+	PHY_RESETB,</div><div class='add'>+	PHY_PCTL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PHY_PCTL_MASK	0xffff</div><div class='add'>+/*</div><div class='add'>+ * 0x0806 of PCTL_VAL has below bits set</div><div class='add'>+ * BIT-8 : refclk divider 1</div><div class='add'>+ * BIT-3:2: device mode; mode is not effect</div><div class='add'>+ * BIT-1: soft reset active low</div><div class='add'>+ */</div><div class='add'>+#define HSPHY_PCTL_VAL	0x0806</div><div class='add'>+#define SSPHY_PCTL_VAL	0x0006</div><div class='add'>+</div><div class='add'>+static const u8 u3phy_ctrl[] = {</div><div class='add'>+	[PHY_RESETB]	= 1,</div><div class='add'>+	[PHY_PCTL]	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 u2phy_ctrl[] = {</div><div class='add'>+	[CORERDY]		= 0,</div><div class='add'>+	[AFE_LDO_PWRDWNB]	= 1,</div><div class='add'>+	[AFE_PLL_PWRDWNB]	= 2,</div><div class='add'>+	[AFE_BG_PWRDWNB]	= 3,</div><div class='add'>+	[PHY_ISO]		= 4,</div><div class='add'>+	[PHY_RESETB]		= 5,</div><div class='add'>+	[PHY_PCTL]		= 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcm_usb_phy_cfg {</div><div class='add'>+	uint32_t type;</div><div class='add'>+	uint32_t version;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	struct phy *phy;</div><div class='add'>+	const u8 *offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PLL_LOCK_RETRY_COUNT	1000</div><div class='add'>+</div><div class='add'>+enum bcm_usb_phy_type {</div><div class='add'>+	USB_HS_PHY,</div><div class='add'>+	USB_SS_PHY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_BCM_SR_USB_COMBO_PHYS	2</div><div class='add'>+</div><div class='add'>+static inline void bcm_usb_reg32_clrbits(void __iomem *addr, uint32_t clear)</div><div class='add'>+{</div><div class='add'>+	writel(readl(addr) &amp; ~clear, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bcm_usb_reg32_setbits(void __iomem *addr, uint32_t set)</div><div class='add'>+{</div><div class='add'>+	writel(readl(addr) | set, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm_usb_pll_lock_check(void __iomem *addr, u32 bit)</div><div class='add'>+{</div><div class='add'>+	int retry;</div><div class='add'>+	u32 rd_data;</div><div class='add'>+</div><div class='add'>+	retry = PLL_LOCK_RETRY_COUNT;</div><div class='add'>+	do {</div><div class='add'>+		rd_data = readl(addr);</div><div class='add'>+		if (rd_data &amp; bit)</div><div class='add'>+			return 0;</div><div class='add'>+		udelay(1);</div><div class='add'>+	} while (--retry &gt; 0);</div><div class='add'>+</div><div class='add'>+	pr_err("%s: FAIL\n", __func__);</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm_usb_ss_phy_init(struct bcm_usb_phy_cfg *phy_cfg)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	void __iomem *regs = phy_cfg-&gt;regs;</div><div class='add'>+	const u8 *offset;</div><div class='add'>+	u32 rd_data;</div><div class='add'>+</div><div class='add'>+	offset = phy_cfg-&gt;offset;</div><div class='add'>+</div><div class='add'>+	/* Set pctl with mode and soft reset */</div><div class='add'>+	rd_data = readl(regs + offset[PHY_CTRL]);</div><div class='add'>+	rd_data &amp;= ~(PHY_PCTL_MASK &lt;&lt; u3phy_ctrl[PHY_PCTL]);</div><div class='add'>+	rd_data |= (SSPHY_PCTL_VAL &lt;&lt; u3phy_ctrl[PHY_PCTL]);</div><div class='add'>+	writel(rd_data, regs + offset[PHY_CTRL]);</div><div class='add'>+</div><div class='add'>+	bcm_usb_reg32_clrbits(regs + offset[PLL_CTRL],</div><div class='add'>+			      BIT(u3pll_ctrl[SSPLL_SUSPEND_EN]));</div><div class='add'>+	bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],</div><div class='add'>+			      BIT(u3pll_ctrl[PLL_SEQ_START]));</div><div class='add'>+	bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],</div><div class='add'>+			      BIT(u3pll_ctrl[PLL_RESETB]));</div><div class='add'>+</div><div class='add'>+	/* Maximum timeout for PLL reset done */</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	ret = bcm_usb_pll_lock_check(regs + offset[PLL_CTRL],</div><div class='add'>+				     BIT(u3pll_ctrl[PLL_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 bcm_usb_hs_phy_init(struct bcm_usb_phy_cfg *phy_cfg)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	void __iomem *regs = phy_cfg-&gt;regs;</div><div class='add'>+	const u8 *offset;</div><div class='add'>+	u32 rd_data;</div><div class='add'>+</div><div class='add'>+	offset = phy_cfg-&gt;offset;</div><div class='add'>+</div><div class='add'>+	writel(HSPLL_NDIV_INT_VAL, regs + offset[PLL_NDIV_INT]);</div><div class='add'>+	writel(HSPLL_NDIV_FRAC_VAL, regs + offset[PLL_NDIV_FRAC]);</div><div class='add'>+</div><div class='add'>+	rd_data = readl(regs + offset[PLL_CTRL]);</div><div class='add'>+	rd_data &amp;= ~(HSPLL_PDIV_MASK &lt;&lt; u2pll_ctrl[PLL_PDIV]);</div><div class='add'>+	rd_data |= (HSPLL_PDIV_VAL &lt;&lt; u2pll_ctrl[PLL_PDIV]);</div><div class='add'>+	writel(rd_data, regs + offset[PLL_CTRL]);</div><div class='add'>+</div><div class='add'>+	/* Set Core Ready high */</div><div class='add'>+	bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],</div><div class='add'>+			      BIT(u2phy_ctrl[CORERDY]));</div><div class='add'>+</div><div class='add'>+	/* Maximum timeout for Core Ready done */</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],</div><div class='add'>+			      BIT(u2pll_ctrl[PLL_RESETB]));</div><div class='add'>+	bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],</div><div class='add'>+			      BIT(u2phy_ctrl[PHY_RESETB]));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	rd_data = readl(regs + offset[PHY_CTRL]);</div><div class='add'>+	rd_data &amp;= ~(PHY_PCTL_MASK &lt;&lt; u2phy_ctrl[PHY_PCTL]);</div><div class='add'>+	rd_data |= (HSPHY_PCTL_VAL &lt;&lt; u2phy_ctrl[PHY_PCTL]);</div><div class='add'>+	writel(rd_data, regs + offset[PHY_CTRL]);</div><div class='add'>+</div><div class='add'>+	/* Maximum timeout for PLL reset done */</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	ret = bcm_usb_pll_lock_check(regs + offset[PLL_CTRL],</div><div class='add'>+				     BIT(u2pll_ctrl[PLL_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 bcm_usb_phy_reset(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct bcm_usb_phy_cfg *phy_cfg = phy_get_drvdata(phy);</div><div class='add'>+	void __iomem *regs = phy_cfg-&gt;regs;</div><div class='add'>+	const u8 *offset;</div><div class='add'>+</div><div class='add'>+	offset = phy_cfg-&gt;offset;</div><div class='add'>+</div><div class='add'>+	if (phy_cfg-&gt;type == USB_HS_PHY) {</div><div class='add'>+		bcm_usb_reg32_clrbits(regs + offset[PHY_CTRL],</div><div class='add'>+				      BIT(u2phy_ctrl[CORERDY]));</div><div class='add'>+		bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],</div><div class='add'>+				      BIT(u2phy_ctrl[CORERDY]));</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 bcm_usb_phy_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct bcm_usb_phy_cfg *phy_cfg = phy_get_drvdata(phy);</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (phy_cfg-&gt;type == USB_SS_PHY)</div><div class='add'>+		ret = bcm_usb_ss_phy_init(phy_cfg);</div><div class='add'>+	else if (phy_cfg-&gt;type == USB_HS_PHY)</div><div class='add'>+		ret = bcm_usb_hs_phy_init(phy_cfg);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phy_ops sr_phy_ops = {</div><div class='add'>+	.init		= bcm_usb_phy_init,</div><div class='add'>+	.reset		= bcm_usb_phy_reset,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct phy *bcm_usb_phy_xlate(struct device *dev,</div><div class='add'>+				     struct of_phandle_args *args)</div><div class='add'>+{</div><div class='add'>+	struct bcm_usb_phy_cfg *phy_cfg;</div><div class='add'>+	int phy_idx;</div><div class='add'>+</div><div class='add'>+	phy_cfg = dev_get_drvdata(dev);</div><div class='add'>+	if (!phy_cfg)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (phy_cfg-&gt;version == BCM_SR_USB_COMBO_PHY) {</div><div class='add'>+		phy_idx = args-&gt;args[0];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(phy_idx &gt; 1))</div><div class='add'>+			return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+		return phy_cfg[phy_idx].phy;</div><div class='add'>+	} else</div><div class='add'>+		return phy_cfg-&gt;phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm_usb_phy_create(struct device *dev, struct device_node *node,</div><div class='add'>+			      void __iomem *regs, uint32_t version)</div><div class='add'>+{</div><div class='add'>+	struct bcm_usb_phy_cfg *phy_cfg;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	if (version == BCM_SR_USB_COMBO_PHY) {</div><div class='add'>+		phy_cfg = devm_kzalloc(dev, NUM_BCM_SR_USB_COMBO_PHYS *</div><div class='add'>+				       sizeof(struct bcm_usb_phy_cfg),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+		if (!phy_cfg)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		for (idx = 0; idx &lt; NUM_BCM_SR_USB_COMBO_PHYS; idx++) {</div><div class='add'>+			phy_cfg[idx].regs = regs;</div><div class='add'>+			phy_cfg[idx].version = version;</div><div class='add'>+			if (idx == 0) {</div><div class='add'>+				phy_cfg[idx].offset = bcm_usb_combo_phy_hs;</div><div class='add'>+				phy_cfg[idx].type = USB_HS_PHY;</div><div class='add'>+			} else {</div><div class='add'>+				phy_cfg[idx].offset = bcm_usb_combo_phy_ss;</div><div class='add'>+				phy_cfg[idx].type = USB_SS_PHY;</div><div class='add'>+			}</div><div class='add'>+			phy_cfg[idx].phy = devm_phy_create(dev, node,</div><div class='add'>+							   &amp;sr_phy_ops);</div><div class='add'>+			if (IS_ERR(phy_cfg[idx].phy))</div><div class='add'>+				return PTR_ERR(phy_cfg[idx].phy);</div><div class='add'>+</div><div class='add'>+			phy_set_drvdata(phy_cfg[idx].phy, &amp;phy_cfg[idx]);</div><div class='add'>+		}</div><div class='add'>+	} else if (version == BCM_SR_USB_HS_PHY) {</div><div class='add'>+		phy_cfg = devm_kzalloc(dev, sizeof(struct bcm_usb_phy_cfg),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+		if (!phy_cfg)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		phy_cfg-&gt;regs = regs;</div><div class='add'>+		phy_cfg-&gt;version = version;</div><div class='add'>+		phy_cfg-&gt;offset = bcm_usb_hs_phy;</div><div class='add'>+		phy_cfg-&gt;type = USB_HS_PHY;</div><div class='add'>+		phy_cfg-&gt;phy = devm_phy_create(dev, node, &amp;sr_phy_ops);</div><div class='add'>+		if (IS_ERR(phy_cfg-&gt;phy))</div><div class='add'>+			return PTR_ERR(phy_cfg-&gt;phy);</div><div class='add'>+</div><div class='add'>+		phy_set_drvdata(phy_cfg-&gt;phy, phy_cfg);</div><div class='add'>+	} else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, phy_cfg);</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 of_device_id bcm_usb_phy_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,sr-usb-combo-phy",</div><div class='add'>+		.data = (void *)BCM_SR_USB_COMBO_PHY,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,sr-usb-hs-phy",</div><div class='add'>+		.data = (void *)BCM_SR_USB_HS_PHY,</div><div class='add'>+	},</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, bcm_usb_phy_of_match);</div><div class='add'>+</div><div class='add'>+static int bcm_usb_phy_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 *dn = dev-&gt;of_node;</div><div class='add'>+	const struct of_device_id *of_id;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	int ret;</div><div class='add'>+	enum bcm_usb_phy_version version;</div><div class='add'>+	struct phy_provider *phy_provider;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(regs))</div><div class='add'>+		return PTR_ERR(regs);</div><div class='add'>+</div><div class='add'>+	of_id = of_match_node(bcm_usb_phy_of_match, dn);</div><div class='add'>+	if (of_id)</div><div class='add'>+		version = (enum bcm_usb_phy_version)of_id-&gt;data;</div><div class='add'>+	else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = bcm_usb_phy_create(dev, dn, regs, version);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	phy_provider = devm_of_phy_provider_register(dev, bcm_usb_phy_xlate);</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(phy_provider);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver bcm_usb_phy_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "phy-bcm-sr-usb",</div><div class='add'>+		.of_match_table = bcm_usb_phy_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = bcm_usb_phy_probe,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(bcm_usb_phy_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Broadcom");</div><div class='add'>+MODULE_DESCRIPTION("Broadcom stingray USB Phy driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c<br/>index d6ea5ce8afa5..0c4833da7be0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/freescale/phy-fsl-imx8mq-usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/freescale/phy-fsl-imx8mq-usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/freescale/phy-fsl-imx8mq-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/freescale/phy-fsl-imx8mq-usb.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/phy/phy.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PHY_CTRL0			0x0</div><div class='ctx'> #define PHY_CTRL0_REF_SSP_EN		BIT(2)</div><div class='hunk'>@@ -24,6 +25,7 @@ struct imx8mq_usb_phy {</div><div class='ctx'> 	struct phy *phy;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	void __iomem *base;</div><div class='add'>+	struct regulator *vbus;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int imx8mq_usb_phy_init(struct phy *phy)</div><div class='hunk'>@@ -55,6 +57,11 @@ static int imx8mq_usb_phy_init(struct phy *phy)</div><div class='ctx'> static int imx8mq_phy_power_on(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct imx8mq_usb_phy *imx_phy = phy_get_drvdata(phy);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regulator_enable(imx_phy-&gt;vbus);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return clk_prepare_enable(imx_phy-&gt;clk);</div><div class='ctx'> }</div><div class='hunk'>@@ -64,6 +71,7 @@ static int imx8mq_phy_power_off(struct phy *phy)</div><div class='ctx'> 	struct imx8mq_usb_phy *imx_phy = phy_get_drvdata(phy);</div><div class='ctx'> </div><div class='ctx'> 	clk_disable_unprepare(imx_phy-&gt;clk);</div><div class='add'>+	regulator_disable(imx_phy-&gt;vbus);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -101,6 +109,10 @@ static int imx8mq_usb_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(imx_phy-&gt;phy))</div><div class='ctx'> 		return PTR_ERR(imx_phy-&gt;phy);</div><div class='ctx'> </div><div class='add'>+	imx_phy-&gt;vbus = devm_regulator_get(dev, "vbus");</div><div class='add'>+	if (IS_ERR(imx_phy-&gt;vbus))</div><div class='add'>+		return PTR_ERR(imx_phy-&gt;vbus);</div><div class='add'>+</div><div class='ctx'> 	phy_set_drvdata(imx_phy-&gt;phy, imx_phy);</div><div class='ctx'> </div><div class='ctx'> 	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);</div><div class='head'>diff --git a/drivers/phy/hisilicon/Kconfig b/drivers/phy/hisilicon/Kconfig<br/>index b40ee54a1a50..3c142f08987c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/hisilicon/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/hisilicon/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/hisilicon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/hisilicon/Kconfig</a></div><div class='hunk'>@@ -12,6 +12,16 @@ config PHY_HI6220_USB</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.</div><div class='ctx'> </div><div class='add'>+config PHY_HI3660_USB</div><div class='add'>+	tristate "hi3660 USB PHY support"</div><div class='add'>+	depends on (ARCH_HISI &amp;&amp; ARM64) || COMPILE_TEST</div><div class='add'>+	select GENERIC_PHY</div><div class='add'>+	select MFD_SYSCON</div><div class='add'>+	help</div><div class='add'>+	  Enable this to support the HISILICON HI3660 USB PHY.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.</div><div class='add'>+</div><div class='ctx'> config PHY_HISTB_COMBPHY</div><div class='ctx'> 	tristate "HiSilicon STB SoCs COMBPHY support"</div><div class='ctx'> 	depends on (ARCH_HISI &amp;&amp; ARM64) || COMPILE_TEST</div><div class='head'>diff --git a/drivers/phy/hisilicon/Makefile b/drivers/phy/hisilicon/Makefile<br/>index f662a4fe18d8..75ba64e2faf8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/hisilicon/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/hisilicon/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/hisilicon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/hisilicon/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> obj-$(CONFIG_PHY_HI6220_USB)		+= phy-hi6220-usb.o</div><div class='add'>+obj-$(CONFIG_PHY_HI3660_USB)		+= phy-hi3660-usb3.o</div><div class='ctx'> obj-$(CONFIG_PHY_HISTB_COMBPHY)		+= phy-histb-combphy.o</div><div class='ctx'> obj-$(CONFIG_PHY_HISI_INNO_USB2)	+= phy-hisi-inno-usb2.o</div><div class='ctx'> obj-$(CONFIG_PHY_HIX5HD2_SATA)		+= phy-hix5hd2-sata.o</div><div class='head'>diff --git a/drivers/phy/hisilicon/phy-hi3660-usb3.c b/drivers/phy/hisilicon/phy-hi3660-usb3.c<br/>new file mode 100644<br/>index 000000000000..cc0af2c044d0<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/hisilicon/phy-hi3660-usb3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/hisilicon/phy-hi3660-usb3.c</a></div><div class='hunk'>@@ -0,0 +1,233 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Phy provider for USB 3.0 controller on HiSilicon 3660 platform</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017-2018 Hilisicon Electronics Co., Ltd.</div><div class='add'>+ *		http://www.huawei.com</div><div class='add'>+ *</div><div class='add'>+ * Authors: Yu Chen &lt;chenyu56@huawei.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/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/module.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/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define PERI_CRG_CLK_EN4			0x40</div><div class='add'>+#define PERI_CRG_CLK_DIS4			0x44</div><div class='add'>+#define GT_CLK_USB3OTG_REF			BIT(0)</div><div class='add'>+#define GT_ACLK_USB3OTG				BIT(1)</div><div class='add'>+</div><div class='add'>+#define PERI_CRG_RSTEN4				0x90</div><div class='add'>+#define PERI_CRG_RSTDIS4			0x94</div><div class='add'>+#define IP_RST_USB3OTGPHY_POR			BIT(3)</div><div class='add'>+#define IP_RST_USB3OTG				BIT(5)</div><div class='add'>+</div><div class='add'>+#define PERI_CRG_ISODIS				0x148</div><div class='add'>+#define USB_REFCLK_ISO_EN			BIT(25)</div><div class='add'>+</div><div class='add'>+#define PCTRL_PERI_CTRL3			0x10</div><div class='add'>+#define PCTRL_PERI_CTRL3_MSK_START		16</div><div class='add'>+#define USB_TCXO_EN				BIT(1)</div><div class='add'>+</div><div class='add'>+#define PCTRL_PERI_CTRL24			0x64</div><div class='add'>+#define SC_CLK_USB3PHY_3MUX1_SEL		BIT(25)</div><div class='add'>+</div><div class='add'>+#define USBOTG3_CTRL0				0x00</div><div class='add'>+#define SC_USB3PHY_ABB_GT_EN			BIT(15)</div><div class='add'>+</div><div class='add'>+#define USBOTG3_CTRL2				0x08</div><div class='add'>+#define USBOTG3CTRL2_POWERDOWN_HSP		BIT(0)</div><div class='add'>+#define USBOTG3CTRL2_POWERDOWN_SSP		BIT(1)</div><div class='add'>+</div><div class='add'>+#define USBOTG3_CTRL3				0x0C</div><div class='add'>+#define USBOTG3_CTRL3_VBUSVLDEXT		BIT(6)</div><div class='add'>+#define USBOTG3_CTRL3_VBUSVLDEXTSEL		BIT(5)</div><div class='add'>+</div><div class='add'>+#define USBOTG3_CTRL4				0x10</div><div class='add'>+</div><div class='add'>+#define USBOTG3_CTRL7				0x1c</div><div class='add'>+#define REF_SSP_EN				BIT(16)</div><div class='add'>+</div><div class='add'>+/* This value config the default txtune parameter of the usb 2.0 phy */</div><div class='add'>+#define HI3660_USB_DEFAULT_PHY_PARAM		0x1c466e3</div><div class='add'>+</div><div class='add'>+struct hi3660_priv {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *peri_crg;</div><div class='add'>+	struct regmap *pctrl;</div><div class='add'>+	struct regmap *otg_bc;</div><div class='add'>+	u32 eye_diagram_param;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hi3660_phy_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct hi3660_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+	u32 val, mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* usb refclk iso disable */</div><div class='add'>+	ret = regmap_write(priv-&gt;peri_crg, PERI_CRG_ISODIS, USB_REFCLK_ISO_EN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* enable usb_tcxo_en */</div><div class='add'>+	val = USB_TCXO_EN | (USB_TCXO_EN &lt;&lt; PCTRL_PERI_CTRL3_MSK_START);</div><div class='add'>+	ret = regmap_write(priv-&gt;pctrl, PCTRL_PERI_CTRL3, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* assert phy */</div><div class='add'>+	val = IP_RST_USB3OTGPHY_POR | IP_RST_USB3OTG;</div><div class='add'>+	ret = regmap_write(priv-&gt;peri_crg, PERI_CRG_RSTEN4, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* enable phy ref clk */</div><div class='add'>+	val = SC_USB3PHY_ABB_GT_EN;</div><div class='add'>+	mask = val;</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;otg_bc, USBOTG3_CTRL0, mask, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	val = REF_SSP_EN;</div><div class='add'>+	mask = val;</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;otg_bc, USBOTG3_CTRL7, mask, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* exit from IDDQ mode */</div><div class='add'>+	mask = USBOTG3CTRL2_POWERDOWN_HSP | USBOTG3CTRL2_POWERDOWN_SSP;</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;otg_bc, USBOTG3_CTRL2, mask, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* delay for exit from IDDQ mode */</div><div class='add'>+	usleep_range(100, 120);</div><div class='add'>+</div><div class='add'>+	/* deassert phy */</div><div class='add'>+	val = IP_RST_USB3OTGPHY_POR | IP_RST_USB3OTG;</div><div class='add'>+	ret = regmap_write(priv-&gt;peri_crg, PERI_CRG_RSTDIS4, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* delay for phy deasserted */</div><div class='add'>+	usleep_range(10000, 15000);</div><div class='add'>+</div><div class='add'>+	/* fake vbus valid signal */</div><div class='add'>+	val = USBOTG3_CTRL3_VBUSVLDEXT | USBOTG3_CTRL3_VBUSVLDEXTSEL;</div><div class='add'>+	mask = val;</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;otg_bc, USBOTG3_CTRL3, mask, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* delay for vbus valid */</div><div class='add'>+	usleep_range(100, 120);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;otg_bc, USBOTG3_CTRL4,</div><div class='add'>+			priv-&gt;eye_diagram_param);</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'>+out:</div><div class='add'>+	dev_err(priv-&gt;dev, "failed to init phy ret: %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hi3660_phy_exit(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct hi3660_priv *priv = phy_get_drvdata(phy);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* assert phy */</div><div class='add'>+	val = IP_RST_USB3OTGPHY_POR;</div><div class='add'>+	ret = regmap_write(priv-&gt;peri_crg, PERI_CRG_RSTEN4, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* disable usb_tcxo_en */</div><div class='add'>+	val = USB_TCXO_EN &lt;&lt; PCTRL_PERI_CTRL3_MSK_START;</div><div class='add'>+	ret = regmap_write(priv-&gt;pctrl, PCTRL_PERI_CTRL3, val);</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'>+out:</div><div class='add'>+	dev_err(priv-&gt;dev, "failed to exit phy ret: %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phy_ops hi3660_phy_ops = {</div><div class='add'>+	.init		= hi3660_phy_init,</div><div class='add'>+	.exit		= hi3660_phy_exit,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hi3660_phy_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct phy_provider *phy_provider;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct phy *phy;</div><div class='add'>+	struct hi3660_priv *priv;</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;dev = dev;</div><div class='add'>+	priv-&gt;peri_crg = syscon_regmap_lookup_by_phandle(dev-&gt;of_node,</div><div class='add'>+					"hisilicon,pericrg-syscon");</div><div class='add'>+	if (IS_ERR(priv-&gt;peri_crg)) {</div><div class='add'>+		dev_err(dev, "no hisilicon,pericrg-syscon\n");</div><div class='add'>+		return PTR_ERR(priv-&gt;peri_crg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;pctrl = syscon_regmap_lookup_by_phandle(dev-&gt;of_node,</div><div class='add'>+					"hisilicon,pctrl-syscon");</div><div class='add'>+	if (IS_ERR(priv-&gt;pctrl)) {</div><div class='add'>+		dev_err(dev, "no hisilicon,pctrl-syscon\n");</div><div class='add'>+		return PTR_ERR(priv-&gt;pctrl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* node of hi3660 phy is a sub-node of usb3_otg_bc */</div><div class='add'>+	priv-&gt;otg_bc = syscon_node_to_regmap(dev-&gt;parent-&gt;of_node);</div><div class='add'>+	if (IS_ERR(priv-&gt;otg_bc)) {</div><div class='add'>+		dev_err(dev, "no hisilicon,usb3-otg-bc-syscon\n");</div><div class='add'>+		return PTR_ERR(priv-&gt;otg_bc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(dev-&gt;of_node, "hisilicon,eye-diagram-param",</div><div class='add'>+		&amp;(priv-&gt;eye_diagram_param)))</div><div class='add'>+		priv-&gt;eye_diagram_param = HI3660_USB_DEFAULT_PHY_PARAM;</div><div class='add'>+</div><div class='add'>+	phy = devm_phy_create(dev, NULL, &amp;hi3660_phy_ops);</div><div class='add'>+	if (IS_ERR(phy))</div><div class='add'>+		return PTR_ERR(phy);</div><div class='add'>+</div><div class='add'>+	phy_set_drvdata(phy, priv);</div><div class='add'>+	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);</div><div class='add'>+	return PTR_ERR_OR_ZERO(phy_provider);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id hi3660_phy_of_match[] = {</div><div class='add'>+	{.compatible = "hisilicon,hi3660-usb-phy",},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, hi3660_phy_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver hi3660_phy_driver = {</div><div class='add'>+	.probe	= hi3660_phy_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "hi3660-usb-phy",</div><div class='add'>+		.of_match_table	= hi3660_phy_of_match,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+module_platform_driver(hi3660_phy_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Yu Chen &lt;chenyu56@huawei.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("Hilisicon Hi3660 USB3 PHY Driver");</div><div class='head'>diff --git a/drivers/phy/marvell/phy-mvebu-a3700-utmi.c b/drivers/phy/marvell/phy-mvebu-a3700-utmi.c<br/>index 94a29dea57af..ded900b06f5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/marvell/phy-mvebu-a3700-utmi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/marvell/phy-mvebu-a3700-utmi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/marvell/phy-mvebu-a3700-utmi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/marvell/phy-mvebu-a3700-utmi.c</a></div><div class='hunk'>@@ -266,7 +266,6 @@ static struct platform_driver mvebu_a3700_utmi_driver = {</div><div class='ctx'> 	.probe	= mvebu_a3700_utmi_phy_probe,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name		= "mvebu-a3700-utmi-phy",</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='ctx'> 		.of_match_table	= mvebu_a3700_utmi_of_match,</div><div class='ctx'> 	 },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/phy/mediatek/Kconfig b/drivers/phy/mediatek/Kconfig<br/>index 8857d00b3c65..b5a89dbd3fe7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/mediatek/Kconfig</a></div><div class='hunk'>@@ -13,6 +13,16 @@ config PHY_MTK_TPHY</div><div class='ctx'> 	  multi-ports is first version, otherwise is second veriosn,</div><div class='ctx'> 	  so you can easily distinguish them by banks layout.</div><div class='ctx'> </div><div class='add'>+config PHY_MTK_UFS</div><div class='add'>+	tristate "MediaTek UFS M-PHY driver"</div><div class='add'>+	depends on ARCH_MEDIATEK &amp;&amp; OF</div><div class='add'>+	select GENERIC_PHY</div><div class='add'>+	help</div><div class='add'>+	  Support for UFS M-PHY on MediaTek chipsets.</div><div class='add'>+	  Enable this to provide vendor-specific probing,</div><div class='add'>+	  initialization, power on and power off flow of</div><div class='add'>+	  specified M-PHYs.</div><div class='add'>+</div><div class='ctx'> config PHY_MTK_XSPHY</div><div class='ctx'>     tristate "MediaTek XS-PHY Driver"</div><div class='ctx'>     depends on ARCH_MEDIATEK &amp;&amp; OF</div><div class='head'>diff --git a/drivers/phy/mediatek/Makefile b/drivers/phy/mediatek/Makefile<br/>index ee49edc97ee9..08a8e6a97b1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/mediatek/Makefile</a></div><div class='hunk'>@@ -4,4 +4,5 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PHY_MTK_TPHY)		+= phy-mtk-tphy.o</div><div class='add'>+obj-$(CONFIG_PHY_MTK_UFS)		+= phy-mtk-ufs.o</div><div class='ctx'> obj-$(CONFIG_PHY_MTK_XSPHY)		+= phy-mtk-xsphy.o</div><div class='head'>diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c<br/>index 5b6a470ca145..cb2ed3b25068 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/phy-mtk-tphy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mediatek/phy-mtk-tphy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/phy-mtk-tphy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/mediatek/phy-mtk-tphy.c</a></div><div class='hunk'>@@ -1103,13 +1103,9 @@ static int mtk_tphy_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* it's deprecated, make it optional for backward compatibility */</div><div class='del'>-	tphy-&gt;u3phya_ref = devm_clk_get(dev, "u3phya_ref");</div><div class='del'>-	if (IS_ERR(tphy-&gt;u3phya_ref)) {</div><div class='del'>-		if (PTR_ERR(tphy-&gt;u3phya_ref) == -EPROBE_DEFER)</div><div class='del'>-			return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-		tphy-&gt;u3phya_ref = NULL;</div><div class='del'>-	}</div><div class='add'>+	tphy-&gt;u3phya_ref = devm_clk_get_optional(dev, "u3phya_ref");</div><div class='add'>+	if (IS_ERR(tphy-&gt;u3phya_ref))</div><div class='add'>+		return PTR_ERR(tphy-&gt;u3phya_ref);</div><div class='ctx'> </div><div class='ctx'> 	tphy-&gt;src_ref_clk = U3P_REF_CLK;</div><div class='ctx'> 	tphy-&gt;src_coef = U3P_SLEW_RATE_COEF;</div><div class='head'>diff --git a/drivers/phy/mediatek/phy-mtk-ufs.c b/drivers/phy/mediatek/phy-mtk-ufs.c<br/>new file mode 100644<br/>index 000000000000..cf94f5c35dc5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mediatek/phy-mtk-ufs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/mediatek/phy-mtk-ufs.c</a></div><div class='hunk'>@@ -0,0 +1,245 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ * Author: Stanley Chu &lt;stanley.chu@mediatek.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/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/module.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'>+/* mphy register and offsets */</div><div class='add'>+#define MP_GLB_DIG_8C               0x008C</div><div class='add'>+#define FRC_PLL_ISO_EN              BIT(8)</div><div class='add'>+#define PLL_ISO_EN                  BIT(9)</div><div class='add'>+#define FRC_FRC_PWR_ON              BIT(10)</div><div class='add'>+#define PLL_PWR_ON                  BIT(11)</div><div class='add'>+</div><div class='add'>+#define MP_LN_DIG_RX_9C             0xA09C</div><div class='add'>+#define FSM_DIFZ_FRC                BIT(18)</div><div class='add'>+</div><div class='add'>+#define MP_LN_DIG_RX_AC             0xA0AC</div><div class='add'>+#define FRC_RX_SQ_EN                BIT(0)</div><div class='add'>+#define RX_SQ_EN                    BIT(1)</div><div class='add'>+</div><div class='add'>+#define MP_LN_RX_44                 0xB044</div><div class='add'>+#define FRC_CDR_PWR_ON              BIT(17)</div><div class='add'>+#define CDR_PWR_ON                  BIT(18)</div><div class='add'>+#define FRC_CDR_ISO_EN              BIT(19)</div><div class='add'>+#define CDR_ISO_EN                  BIT(20)</div><div class='add'>+</div><div class='add'>+struct ufs_mtk_phy {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void __iomem *mmio;</div><div class='add'>+	struct clk *mp_clk;</div><div class='add'>+	struct clk *unipro_clk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 mphy_readl(struct ufs_mtk_phy *phy, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return readl(phy-&gt;mmio + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mphy_writel(struct ufs_mtk_phy *phy, u32 val, u32 reg)</div><div class='add'>+{</div><div class='add'>+	writel(val, phy-&gt;mmio + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mphy_set_bit(struct ufs_mtk_phy *phy, u32 reg, u32 bit)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = mphy_readl(phy, reg);</div><div class='add'>+	val |= bit;</div><div class='add'>+	mphy_writel(phy, val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mphy_clr_bit(struct ufs_mtk_phy *phy, u32 reg, u32 bit)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = mphy_readl(phy, reg);</div><div class='add'>+	val &amp;= ~bit;</div><div class='add'>+	mphy_writel(phy, val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ufs_mtk_phy *get_ufs_mtk_phy(struct phy *generic_phy)</div><div class='add'>+{</div><div class='add'>+	return (struct ufs_mtk_phy *)phy_get_drvdata(generic_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_phy_clk_init(struct ufs_mtk_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	phy-&gt;unipro_clk = devm_clk_get(dev, "unipro");</div><div class='add'>+	if (IS_ERR(phy-&gt;unipro_clk)) {</div><div class='add'>+		dev_err(dev, "failed to get clock: unipro");</div><div class='add'>+		return PTR_ERR(phy-&gt;unipro_clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;mp_clk = devm_clk_get(dev, "mp");</div><div class='add'>+	if (IS_ERR(phy-&gt;mp_clk)) {</div><div class='add'>+		dev_err(dev, "failed to get clock: mp");</div><div class='add'>+		return PTR_ERR(phy-&gt;mp_clk);</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 ufs_mtk_phy_set_active(struct ufs_mtk_phy *phy)</div><div class='add'>+{</div><div class='add'>+	/* release DA_MP_PLL_PWR_ON */</div><div class='add'>+	mphy_set_bit(phy, MP_GLB_DIG_8C, PLL_PWR_ON);</div><div class='add'>+	mphy_clr_bit(phy, MP_GLB_DIG_8C, FRC_FRC_PWR_ON);</div><div class='add'>+</div><div class='add'>+	/* release DA_MP_PLL_ISO_EN */</div><div class='add'>+	mphy_clr_bit(phy, MP_GLB_DIG_8C, PLL_ISO_EN);</div><div class='add'>+	mphy_clr_bit(phy, MP_GLB_DIG_8C, FRC_PLL_ISO_EN);</div><div class='add'>+</div><div class='add'>+	/* release DA_MP_CDR_PWR_ON */</div><div class='add'>+	mphy_set_bit(phy, MP_LN_RX_44, CDR_PWR_ON);</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_RX_44, FRC_CDR_PWR_ON);</div><div class='add'>+</div><div class='add'>+	/* release DA_MP_CDR_ISO_EN */</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_RX_44, CDR_ISO_EN);</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_RX_44, FRC_CDR_ISO_EN);</div><div class='add'>+</div><div class='add'>+	/* release DA_MP_RX0_SQ_EN */</div><div class='add'>+	mphy_set_bit(phy, MP_LN_DIG_RX_AC, RX_SQ_EN);</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_DIG_RX_AC, FRC_RX_SQ_EN);</div><div class='add'>+</div><div class='add'>+	/* delay 1us to wait DIFZ stable */</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	/* release DIFZ */</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_DIG_RX_9C, FSM_DIFZ_FRC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ufs_mtk_phy_set_deep_hibern(struct ufs_mtk_phy *phy)</div><div class='add'>+{</div><div class='add'>+	/* force DIFZ */</div><div class='add'>+	mphy_set_bit(phy, MP_LN_DIG_RX_9C, FSM_DIFZ_FRC);</div><div class='add'>+</div><div class='add'>+	/* force DA_MP_RX0_SQ_EN */</div><div class='add'>+	mphy_set_bit(phy, MP_LN_DIG_RX_AC, FRC_RX_SQ_EN);</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_DIG_RX_AC, RX_SQ_EN);</div><div class='add'>+</div><div class='add'>+	/* force DA_MP_CDR_ISO_EN */</div><div class='add'>+	mphy_set_bit(phy, MP_LN_RX_44, FRC_CDR_ISO_EN);</div><div class='add'>+	mphy_set_bit(phy, MP_LN_RX_44, CDR_ISO_EN);</div><div class='add'>+</div><div class='add'>+	/* force DA_MP_CDR_PWR_ON */</div><div class='add'>+	mphy_set_bit(phy, MP_LN_RX_44, FRC_CDR_PWR_ON);</div><div class='add'>+	mphy_clr_bit(phy, MP_LN_RX_44, CDR_PWR_ON);</div><div class='add'>+</div><div class='add'>+	/* force DA_MP_PLL_ISO_EN */</div><div class='add'>+	mphy_set_bit(phy, MP_GLB_DIG_8C, FRC_PLL_ISO_EN);</div><div class='add'>+	mphy_set_bit(phy, MP_GLB_DIG_8C, PLL_ISO_EN);</div><div class='add'>+</div><div class='add'>+	/* force DA_MP_PLL_PWR_ON */</div><div class='add'>+	mphy_set_bit(phy, MP_GLB_DIG_8C, FRC_FRC_PWR_ON);</div><div class='add'>+	mphy_clr_bit(phy, MP_GLB_DIG_8C, PLL_PWR_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_phy_power_on(struct phy *generic_phy)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_phy *phy = get_ufs_mtk_phy(generic_phy);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(phy-&gt;unipro_clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(phy-&gt;dev, "unipro_clk enable failed %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(phy-&gt;mp_clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(phy-&gt;dev, "mp_clk enable failed %d\n", ret);</div><div class='add'>+		goto out_unprepare_unipro_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ufs_mtk_phy_set_active(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unprepare_unipro_clk:</div><div class='add'>+	clk_disable_unprepare(phy-&gt;unipro_clk);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_phy_power_off(struct phy *generic_phy)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_phy *phy = get_ufs_mtk_phy(generic_phy);</div><div class='add'>+</div><div class='add'>+	ufs_mtk_phy_set_deep_hibern(phy);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(phy-&gt;unipro_clk);</div><div class='add'>+	clk_disable_unprepare(phy-&gt;mp_clk);</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 phy_ops ufs_mtk_phy_ops = {</div><div class='add'>+	.power_on       = ufs_mtk_phy_power_on,</div><div class='add'>+	.power_off      = ufs_mtk_phy_power_off,</div><div class='add'>+	.owner          = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_phy_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 phy *generic_phy;</div><div class='add'>+	struct phy_provider *phy_provider;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct ufs_mtk_phy *phy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);</div><div class='add'>+	if (!phy)</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'>+	phy-&gt;mmio = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(phy-&gt;mmio))</div><div class='add'>+		return PTR_ERR(phy-&gt;mmio);</div><div class='add'>+</div><div class='add'>+	phy-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	ret = ufs_mtk_phy_clk_init(phy);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	generic_phy = devm_phy_create(dev, NULL, &amp;ufs_mtk_phy_ops);</div><div class='add'>+	if (IS_ERR(generic_phy))</div><div class='add'>+		return PTR_ERR(generic_phy);</div><div class='add'>+</div><div class='add'>+	phy_set_drvdata(generic_phy, phy);</div><div class='add'>+</div><div class='add'>+	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);</div><div class='add'>+</div><div class='add'>+	return PTR_ERR_OR_ZERO(phy_provider);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ufs_mtk_phy_of_match[] = {</div><div class='add'>+	{.compatible = "mediatek,mt8183-ufsphy"},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ufs_mtk_phy_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver ufs_mtk_phy_driver = {</div><div class='add'>+	.probe = ufs_mtk_phy_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.of_match_table = ufs_mtk_phy_of_match,</div><div class='add'>+		.name = "ufs_mtk_phy",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(ufs_mtk_phy_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Universal Flash Storage (UFS) MediaTek MPHY");</div><div class='add'>+MODULE_AUTHOR("Stanley Chu &lt;stanley.chu@mediatek.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/motorola/Kconfig b/drivers/phy/motorola/Kconfig<br/>index 82651524ffb9..718f8729701d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/motorola/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/motorola/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/motorola/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/motorola/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,7 @@ config PHY_CPCAP_USB</div><div class='ctx'> </div><div class='ctx'> config PHY_MAPPHONE_MDM6600</div><div class='ctx'> 	tristate "Motorola Mapphone MDM6600 modem USB PHY driver"</div><div class='del'>-	depends on OF &amp;&amp; USB_SUPPORT</div><div class='add'>+	depends on OF &amp;&amp; USB_SUPPORT &amp;&amp; GPIOLIB</div><div class='ctx'> 	select GENERIC_PHY</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable this for MDM6600 USB modem to work on Motorola phones</div><div class='head'>diff --git a/drivers/phy/mscc/phy-ocelot-serdes.c b/drivers/phy/mscc/phy-ocelot-serdes.c<br/>index 77c46f639fbf..76f596365176 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mscc/phy-ocelot-serdes.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/mscc/phy-ocelot-serdes.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/mscc/phy-ocelot-serdes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/mscc/phy-ocelot-serdes.c</a></div><div class='hunk'>@@ -31,6 +31,238 @@ struct serdes_macro {</div><div class='ctx'> 	struct serdes_ctrl	*ctrl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MCB_S6G_CFG_TIMEOUT     50</div><div class='add'>+</div><div class='add'>+static int __serdes_write_mcb_s6g(struct regmap *regmap, u8 macro, u32 op)</div><div class='add'>+{</div><div class='add'>+	unsigned int regval = 0;</div><div class='add'>+</div><div class='add'>+	regmap_write(regmap, HSIO_MCB_S6G_ADDR_CFG, op |</div><div class='add'>+		     HSIO_MCB_S6G_ADDR_CFG_SERDES6G_ADDR(BIT(macro)));</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(regmap, HSIO_MCB_S6G_ADDR_CFG, regval,</div><div class='add'>+					(regval &amp; op) != op, 100,</div><div class='add'>+					MCB_S6G_CFG_TIMEOUT * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_commit_mcb_s6g(struct regmap *regmap, u8 macro)</div><div class='add'>+{</div><div class='add'>+	return __serdes_write_mcb_s6g(regmap, macro,</div><div class='add'>+		HSIO_MCB_S6G_ADDR_CFG_SERDES6G_WR_ONE_SHOT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_update_mcb_s6g(struct regmap *regmap, u8 macro)</div><div class='add'>+{</div><div class='add'>+	return __serdes_write_mcb_s6g(regmap, macro,</div><div class='add'>+		HSIO_MCB_S6G_ADDR_CFG_SERDES6G_RD_ONE_SHOT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_init_s6g(struct regmap *regmap, u8 serdes, int mode)</div><div class='add'>+{</div><div class='add'>+	u32 pll_fsm_ctrl_data;</div><div class='add'>+	u32 ob_ena1v_mode;</div><div class='add'>+	u32 des_bw_ana;</div><div class='add'>+	u32 ob_ena_cas;</div><div class='add'>+	u32 if_mode;</div><div class='add'>+	u32 ob_lev;</div><div class='add'>+	u32 qrate;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mode == PHY_INTERFACE_MODE_QSGMII) {</div><div class='add'>+		pll_fsm_ctrl_data = 120;</div><div class='add'>+		ob_ena1v_mode = 0;</div><div class='add'>+		ob_ena_cas = 0;</div><div class='add'>+		des_bw_ana = 5;</div><div class='add'>+		ob_lev = 24;</div><div class='add'>+		if_mode = 3;</div><div class='add'>+		qrate = 0;</div><div class='add'>+	} else {</div><div class='add'>+		pll_fsm_ctrl_data = 60;</div><div class='add'>+		ob_ena1v_mode = 1;</div><div class='add'>+		ob_ena_cas = 2;</div><div class='add'>+		des_bw_ana = 3;</div><div class='add'>+		ob_lev = 48;</div><div class='add'>+		if_mode = 1;</div><div class='add'>+		qrate = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = serdes_update_mcb_s6g(regmap, serdes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Test pattern */</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_COMMON_CFG,</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_SYS_RST, 0);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_PLL_CFG,</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_FSM_ENA, 0);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SIG_DET_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_REG_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SAM_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_EQZ_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_CONCUR |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_CAL_ENA,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SIG_DET_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_REG_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SAM_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_EQZ_ENA |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_CONCUR);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG1,</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FRC_OFFSET |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FRC_LP |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FRC_MID |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FRC_HP |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_OFFSET |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_LP |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_MID |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_HP,</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_OFFSET |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_HP |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_LP |</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_FILT_MID);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG2,</div><div class='add'>+			   HSIO_S6G_IB_CFG2_IB_UREG_M,</div><div class='add'>+			   HSIO_S6G_IB_CFG2_IB_UREG(4));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG3,</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_OFFSET_M |</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_LP_M |</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_MID_M |</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_HP_M,</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_OFFSET(31) |</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_LP(1) |</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_MID(31) |</div><div class='add'>+			   HSIO_S6G_IB_CFG3_IB_INI_HP(0));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_MISC_CFG,</div><div class='add'>+			   HSIO_S6G_MISC_CFG_LANE_RST,</div><div class='add'>+			   HSIO_S6G_MISC_CFG_LANE_RST);</div><div class='add'>+</div><div class='add'>+	ret = serdes_commit_mcb_s6g(regmap, serdes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* OB + DES + IB + SER CFG */</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_OB_CFG,</div><div class='add'>+			   HSIO_S6G_OB_CFG_OB_IDLE |</div><div class='add'>+			   HSIO_S6G_OB_CFG_OB_ENA1V_MODE |</div><div class='add'>+			   HSIO_S6G_OB_CFG_OB_POST0_M |</div><div class='add'>+			   HSIO_S6G_OB_CFG_OB_PREC_M,</div><div class='add'>+			   (ob_ena1v_mode ? HSIO_S6G_OB_CFG_OB_ENA1V_MODE : 0) |</div><div class='add'>+			   HSIO_S6G_OB_CFG_OB_POST0(0) |</div><div class='add'>+			   HSIO_S6G_OB_CFG_OB_PREC(0));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_OB_CFG1,</div><div class='add'>+			   HSIO_S6G_OB_CFG1_OB_ENA_CAS_M |</div><div class='add'>+			   HSIO_S6G_OB_CFG1_OB_LEV_M,</div><div class='add'>+			   HSIO_S6G_OB_CFG1_OB_LEV(ob_lev) |</div><div class='add'>+			   HSIO_S6G_OB_CFG1_OB_ENA_CAS(ob_ena_cas));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_DES_CFG,</div><div class='add'>+			   HSIO_S6G_DES_CFG_DES_PHS_CTRL_M |</div><div class='add'>+			   HSIO_S6G_DES_CFG_DES_CPMD_SEL_M |</div><div class='add'>+			   HSIO_S6G_DES_CFG_DES_BW_ANA_M,</div><div class='add'>+			   HSIO_S6G_DES_CFG_DES_PHS_CTRL(2) |</div><div class='add'>+			   HSIO_S6G_DES_CFG_DES_CPMD_SEL(0) |</div><div class='add'>+			   HSIO_S6G_DES_CFG_DES_BW_ANA(des_bw_ana));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL_M |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET_M,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET(0) |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL(0));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG1,</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_TSDET_M,</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_TSDET(16));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_SER_CFG,</div><div class='add'>+			   HSIO_S6G_SER_CFG_SER_ALISEL_M |</div><div class='add'>+			   HSIO_S6G_SER_CFG_SER_ENALI,</div><div class='add'>+			   HSIO_S6G_SER_CFG_SER_ALISEL(0));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_PLL_CFG,</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_DIV4 |</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_ENA_ROT |</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_FSM_CTRL_DATA_M |</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_ROT_DIR |</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_ROT_FRQ,</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_FSM_CTRL_DATA</div><div class='add'>+			   (pll_fsm_ctrl_data));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_COMMON_CFG,</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_SYS_RST |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_ENA_LANE |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_PWD_RX |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_PWD_TX |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_HRATE |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_QRATE |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_ENA_ELOOP |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_ENA_FLOOP |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_IF_MODE_M,</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_SYS_RST |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_ENA_LANE |</div><div class='add'>+			   (qrate ? HSIO_S6G_COMMON_CFG_QRATE : 0) |</div><div class='add'>+			   HSIO_S6G_COMMON_CFG_IF_MODE(if_mode));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_MISC_CFG,</div><div class='add'>+			   HSIO_S6G_MISC_CFG_LANE_RST |</div><div class='add'>+			   HSIO_S6G_MISC_CFG_DES_100FX_CPMD_ENA |</div><div class='add'>+			   HSIO_S6G_MISC_CFG_RX_LPI_MODE_ENA |</div><div class='add'>+			   HSIO_S6G_MISC_CFG_TX_LPI_MODE_ENA,</div><div class='add'>+			   HSIO_S6G_MISC_CFG_LANE_RST |</div><div class='add'>+			   HSIO_S6G_MISC_CFG_RX_LPI_MODE_ENA);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = serdes_commit_mcb_s6g(regmap, serdes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_PLL_CFG,</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_FSM_ENA,</div><div class='add'>+			   HSIO_S6G_PLL_CFG_PLL_FSM_ENA);</div><div class='add'>+</div><div class='add'>+	ret = serdes_commit_mcb_s6g(regmap, serdes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Wait for PLL bringup */</div><div class='add'>+	msleep(20);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_CAL_ENA,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_CAL_ENA);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_MISC_CFG,</div><div class='add'>+			   HSIO_S6G_MISC_CFG_LANE_RST, 0);</div><div class='add'>+</div><div class='add'>+	ret = serdes_commit_mcb_s6g(regmap, serdes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Wait for calibration */</div><div class='add'>+	msleep(60);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET_M |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL_M,</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET(0) |</div><div class='add'>+			   HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL(7));</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, HSIO_S6G_IB_CFG1,</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_TSDET_M,</div><div class='add'>+			   HSIO_S6G_IB_CFG1_IB_TSDET(3));</div><div class='add'>+</div><div class='add'>+	/* IB CFG */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define MCB_S1G_CFG_TIMEOUT     50</div><div class='ctx'> </div><div class='ctx'> static int __serdes_write_mcb_s1g(struct regmap *regmap, u8 macro, u32 op)</div><div class='hunk'>@@ -110,7 +342,7 @@ struct serdes_mux {</div><div class='ctx'> 	u32			mux;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SERDES_MUX(_idx, _port, _mode, _submode, _mask, _mux) {		\</div><div class='add'>+#define SERDES_MUX(_idx, _port, _mode, _submode, _mask, _mux) { \</div><div class='ctx'> 	.idx = _idx,						\</div><div class='ctx'> 	.port = _port,						\</div><div class='ctx'> 	.mode = _mode,						\</div><div class='hunk'>@@ -191,8 +423,12 @@ static int serdes_set_mode(struct phy *phy, enum phy_mode mode, int submode)</div><div class='ctx'> </div><div class='ctx'> 		if (macro-&gt;idx &lt;= SERDES1G_MAX)</div><div class='ctx'> 			return serdes_init_s1g(macro-&gt;ctrl-&gt;regs, macro-&gt;idx);</div><div class='add'>+		else if (macro-&gt;idx &lt;= SERDES6G_MAX)</div><div class='add'>+			return serdes_init_s6g(macro-&gt;ctrl-&gt;regs,</div><div class='add'>+					       macro-&gt;idx - (SERDES1G_MAX + 1),</div><div class='add'>+					       ocelot_serdes_muxes[i].submode);</div><div class='ctx'> </div><div class='del'>-		/* SERDES6G and PCIe not supported yet */</div><div class='add'>+		/* PCIe not supported yet */</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c<br/>index cb38f6e8614c..c147ba843f0b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/phy-core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/phy-core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/phy-core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/phy-core.c</a></div><div class='hunk'>@@ -384,10 +384,16 @@ int phy_reset(struct phy *phy)</div><div class='ctx'> 	if (!phy || !phy-&gt;ops-&gt;reset)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ret = phy_pm_runtime_get_sync(phy);</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret != -ENOTSUPP)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;phy-&gt;mutex);</div><div class='ctx'> 	ret = phy-&gt;ops-&gt;reset(phy);</div><div class='ctx'> 	mutex_unlock(&amp;phy-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	phy_pm_runtime_put(phy);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(phy_reset);</div><div class='hunk'>@@ -564,6 +570,11 @@ void phy_put(struct phy *phy)</div><div class='ctx'> 	if (!phy || IS_ERR(phy))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;phy-&gt;mutex);</div><div class='add'>+	if (phy-&gt;ops-&gt;release)</div><div class='add'>+		phy-&gt;ops-&gt;release(phy);</div><div class='add'>+	mutex_unlock(&amp;phy-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	module_put(phy-&gt;ops-&gt;owner);</div><div class='ctx'> 	put_device(&amp;phy-&gt;dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c<br/>index 08d6f6f7f039..cd91b4179b10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-qmp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-qmp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-qmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-qmp.c</a></div><div class='hunk'>@@ -242,6 +242,88 @@ static const struct qmp_phy_init_tbl msm8996_pcie_pcs_tbl[] = {</div><div class='ctx'> 	QMP_PHY_INIT_CFG(QPHY_TXDEEMPH_M3P5DB_V0, 0x0e),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct qmp_phy_init_tbl msm8998_pcie_serdes_tbl[] = {</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN, 0x14),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_IVCO, 0x0f),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_CONFIG, 0x06),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP_EN, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_RESETSM_CNTRL, 0x20),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE0, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE0, 0xc9),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_TIMER1, 0xff),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_TIMER2, 0x3f),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SVS_MODE_CLK_SEL, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORE_CLK_EN, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORECLK_DIV_MODE0, 0x0a),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_EP_DIV, 0x19),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_ENABLE1, 0x90),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE0, 0x82),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_DIV_FRAC_START3_MODE0, 0x03),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_DIV_FRAC_START2_MODE0, 0x55),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_DIV_FRAC_START1_MODE0, 0x55),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP3_MODE0, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE0, 0x0d),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE0, 0x04),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_HSCLK_SEL, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE0, 0x08),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE0, 0x16),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE0, 0x34),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_CONFIG, 0x06),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x33),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYS_CLK_CTRL, 0x02),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_BUF_ENABLE, 0x07),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_EN_SEL, 0x04),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE0, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE0, 0x3f),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_BG_TIMER, 0x09),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_EN_CENTER, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_PER1, 0x40),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_PER2, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_ADJ_PER1, 0x02),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_ADJ_PER2, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_STEP_SIZE1, 0x7e),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_STEP_SIZE2, 0x15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmp_phy_init_tbl msm8998_pcie_tx_tbl[] = {</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_TX_RES_CODE_LANE_OFFSET_TX, 0x02),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_TX_RCV_DETECT_LVL_2, 0x12),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_TX_HIGHZ_DRVR_EN, 0x10),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_TX_LANE_MODE_1, 0x06),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmp_phy_init_tbl msm8998_pcie_rx_tbl[] = {</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_CNTRL, 0x03),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_ENABLES, 0x1c),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_DEGLITCH_CNTRL, 0x14),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL2, 0x0a),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1a),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4b),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_GAIN, 0x04),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_GAIN_HALF, 0x04),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQ_OFFSET_ADAPTOR_CNTRL1, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_OFFSET_ADAPTOR_CNTRL2, 0x80),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_INTERFACE_MODE, 0x40),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_PI_CONTROLS, 0x71),</div><div class='add'>+	QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW, 0x40),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmp_phy_init_tbl msm8998_pcie_pcs_tbl[] = {</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_ENDPOINT_REFCLK_DRIVE, 0x04),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_OSC_DTCT_ACTIONS, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_PWRUP_RESET_DLY_TIME_AUXCLK, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_MSB, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_LSB, 0x20),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_LP_WAKEUP_DLY_TIME_AUXCLK_MSB, 0x00),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_LP_WAKEUP_DLY_TIME_AUXCLK, 0x01),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_PLL_LOCK_CHK_DLY_TIME, 0x73),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SIGDET_LVL, 0x99),</div><div class='add'>+	QMP_PHY_INIT_CFG(QPHY_V3_PCS_SIGDET_CNTRL, 0x03),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct qmp_phy_init_tbl msm8996_usb3_serdes_tbl[] = {</div><div class='ctx'> 	QMP_PHY_INIT_CFG(QSERDES_COM_SYSCLK_EN_SEL, 0x14),</div><div class='ctx'> 	QMP_PHY_INIT_CFG(QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x08),</div><div class='hunk'>@@ -897,6 +979,7 @@ struct qmp_phy {</div><div class='ctx'>  * @init_count: phy common block initialization count</div><div class='ctx'>  * @phy_initialized: indicate if PHY has been initialized</div><div class='ctx'>  * @mode: current PHY mode</div><div class='add'>+ * @ufs_reset: optional UFS PHY reset handle</div><div class='ctx'>  */</div><div class='ctx'> struct qcom_qmp {</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -914,6 +997,8 @@ struct qcom_qmp {</div><div class='ctx'> 	int init_count;</div><div class='ctx'> 	bool phy_initialized;</div><div class='ctx'> 	enum phy_mode mode;</div><div class='add'>+</div><div class='add'>+	struct reset_control *ufs_reset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void qphy_setbits(void __iomem *base, u32 offset, u32 val)</div><div class='hunk'>@@ -1146,6 +1231,31 @@ static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {</div><div class='ctx'> 	.no_pcs_sw_reset	= true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct qmp_phy_cfg msm8998_pciephy_cfg = {</div><div class='add'>+	.type			= PHY_TYPE_PCIE,</div><div class='add'>+	.nlanes			= 1,</div><div class='add'>+</div><div class='add'>+	.serdes_tbl		= msm8998_pcie_serdes_tbl,</div><div class='add'>+	.serdes_tbl_num		= ARRAY_SIZE(msm8998_pcie_serdes_tbl),</div><div class='add'>+	.tx_tbl			= msm8998_pcie_tx_tbl,</div><div class='add'>+	.tx_tbl_num		= ARRAY_SIZE(msm8998_pcie_tx_tbl),</div><div class='add'>+	.rx_tbl			= msm8998_pcie_rx_tbl,</div><div class='add'>+	.rx_tbl_num		= ARRAY_SIZE(msm8998_pcie_rx_tbl),</div><div class='add'>+	.pcs_tbl		= msm8998_pcie_pcs_tbl,</div><div class='add'>+	.pcs_tbl_num		= ARRAY_SIZE(msm8998_pcie_pcs_tbl),</div><div class='add'>+	.clk_list		= msm8996_phy_clk_l,</div><div class='add'>+	.num_clks		= ARRAY_SIZE(msm8996_phy_clk_l),</div><div class='add'>+	.reset_list		= ipq8074_pciephy_reset_l,</div><div class='add'>+	.num_resets		= ARRAY_SIZE(ipq8074_pciephy_reset_l),</div><div class='add'>+	.vreg_list		= qmp_phy_vreg_l,</div><div class='add'>+	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),</div><div class='add'>+	.regs			= pciephy_regs_layout,</div><div class='add'>+</div><div class='add'>+	.start_ctrl             = SERDES_START | PCS_START,</div><div class='add'>+	.pwrdn_ctrl		= SW_PWRDN | REFCLK_DRV_DSBL,</div><div class='add'>+	.mask_com_pcs_ready	= PCS_READY,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct qmp_phy_cfg msm8998_usb3phy_cfg = {</div><div class='ctx'> 	.type                   = PHY_TYPE_USB3,</div><div class='ctx'> 	.nlanes                 = 1,</div><div class='hunk'>@@ -1314,6 +1424,7 @@ static int qcom_qmp_phy_com_exit(struct qcom_qmp *qmp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	reset_control_assert(qmp-&gt;ufs_reset);</div><div class='ctx'> 	if (cfg-&gt;has_phy_com_ctrl) {</div><div class='ctx'> 		qphy_setbits(serdes, cfg-&gt;regs[QPHY_COM_START_CONTROL],</div><div class='ctx'> 			     SERDES_START | PCS_START);</div><div class='hunk'>@@ -1335,8 +1446,7 @@ static int qcom_qmp_phy_com_exit(struct qcom_qmp *qmp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* PHY Initialization */</div><div class='del'>-static int qcom_qmp_phy_init(struct phy *phy)</div><div class='add'>+static int qcom_qmp_phy_enable(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct qmp_phy *qphy = phy_get_drvdata(phy);</div><div class='ctx'> 	struct qcom_qmp *qmp = qphy-&gt;qmp;</div><div class='hunk'>@@ -1351,6 +1461,33 @@ static int qcom_qmp_phy_init(struct phy *phy)</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(qmp-&gt;dev, "Initializing QMP phy\n");</div><div class='ctx'> </div><div class='add'>+	if (cfg-&gt;no_pcs_sw_reset) {</div><div class='add'>+		/*</div><div class='add'>+		 * Get UFS reset, which is delayed until now to avoid a</div><div class='add'>+		 * circular dependency where UFS needs its PHY, but the PHY</div><div class='add'>+		 * needs this UFS reset.</div><div class='add'>+		 */</div><div class='add'>+		if (!qmp-&gt;ufs_reset) {</div><div class='add'>+			qmp-&gt;ufs_reset =</div><div class='add'>+				devm_reset_control_get_exclusive(qmp-&gt;dev,</div><div class='add'>+								 "ufsphy");</div><div class='add'>+</div><div class='add'>+			if (IS_ERR(qmp-&gt;ufs_reset)) {</div><div class='add'>+				ret = PTR_ERR(qmp-&gt;ufs_reset);</div><div class='add'>+				dev_err(qmp-&gt;dev,</div><div class='add'>+					"failed to get UFS reset: %d\n",</div><div class='add'>+					ret);</div><div class='add'>+</div><div class='add'>+				qmp-&gt;ufs_reset = NULL;</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = reset_control_assert(qmp-&gt;ufs_reset);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_lane_rst;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = qcom_qmp_phy_com_init(qphy);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1383,14 +1520,9 @@ static int qcom_qmp_phy_init(struct phy *phy)</div><div class='ctx'> 				       cfg-&gt;rx_tbl, cfg-&gt;rx_tbl_num);</div><div class='ctx'> </div><div class='ctx'> 	qcom_qmp_phy_configure(pcs, cfg-&gt;regs, cfg-&gt;pcs_tbl, cfg-&gt;pcs_tbl_num);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * UFS PHY requires the deassert of software reset before serdes start.</div><div class='del'>-	 * For UFS PHYs that do not have software reset control bits, defer</div><div class='del'>-	 * starting serdes until the power on callback.</div><div class='del'>-	 */</div><div class='del'>-	if ((cfg-&gt;type == PHY_TYPE_UFS) &amp;&amp; cfg-&gt;no_pcs_sw_reset)</div><div class='del'>-		goto out;</div><div class='add'>+	ret = reset_control_deassert(qmp-&gt;ufs_reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_lane_rst;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pull out PHY from POWER DOWN state.</div><div class='hunk'>@@ -1403,7 +1535,9 @@ static int qcom_qmp_phy_init(struct phy *phy)</div><div class='ctx'> 		usleep_range(cfg-&gt;pwrdn_delay_min, cfg-&gt;pwrdn_delay_max);</div><div class='ctx'> </div><div class='ctx'> 	/* Pull PHY out of reset state */</div><div class='del'>-	qphy_clrbits(pcs, cfg-&gt;regs[QPHY_SW_RESET], SW_RESET);</div><div class='add'>+	if (!cfg-&gt;no_pcs_sw_reset)</div><div class='add'>+		qphy_clrbits(pcs, cfg-&gt;regs[QPHY_SW_RESET], SW_RESET);</div><div class='add'>+</div><div class='ctx'> 	if (cfg-&gt;has_phy_dp_com_ctrl)</div><div class='ctx'> 		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);</div><div class='ctx'> </div><div class='hunk'>@@ -1420,11 +1554,10 @@ static int qcom_qmp_phy_init(struct phy *phy)</div><div class='ctx'> 		goto err_pcs_ready;</div><div class='ctx'> 	}</div><div class='ctx'> 	qmp-&gt;phy_initialized = true;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> err_pcs_ready:</div><div class='add'>+	reset_control_assert(qmp-&gt;ufs_reset);</div><div class='ctx'> 	clk_disable_unprepare(qphy-&gt;pipe_clk);</div><div class='ctx'> err_clk_enable:</div><div class='ctx'> 	if (cfg-&gt;has_lane_rst)</div><div class='hunk'>@@ -1435,7 +1568,7 @@ err_lane_rst:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qcom_qmp_phy_exit(struct phy *phy)</div><div class='add'>+static int qcom_qmp_phy_disable(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct qmp_phy *qphy = phy_get_drvdata(phy);</div><div class='ctx'> 	struct qcom_qmp *qmp = qphy-&gt;qmp;</div><div class='hunk'>@@ -1463,44 +1596,6 @@ static int qcom_qmp_phy_exit(struct phy *phy)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qcom_qmp_phy_poweron(struct phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct qmp_phy *qphy = phy_get_drvdata(phy);</div><div class='del'>-	struct qcom_qmp *qmp = qphy-&gt;qmp;</div><div class='del'>-	const struct qmp_phy_cfg *cfg = qmp-&gt;cfg;</div><div class='del'>-	void __iomem *pcs = qphy-&gt;pcs;</div><div class='del'>-	void __iomem *status;</div><div class='del'>-	unsigned int mask, val;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;type != PHY_TYPE_UFS)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For UFS PHY that has not software reset control, serdes start</div><div class='del'>-	 * should only happen when UFS driver explicitly calls phy_power_on</div><div class='del'>-	 * after it deasserts software reset.</div><div class='del'>-	 */</div><div class='del'>-	if (cfg-&gt;no_pcs_sw_reset &amp;&amp; !qmp-&gt;phy_initialized &amp;&amp;</div><div class='del'>-	    (qmp-&gt;init_count != 0)) {</div><div class='del'>-		/* start SerDes and Phy-Coding-Sublayer */</div><div class='del'>-		qphy_setbits(pcs, cfg-&gt;regs[QPHY_START_CTRL], cfg-&gt;start_ctrl);</div><div class='del'>-</div><div class='del'>-		status = pcs + cfg-&gt;regs[QPHY_PCS_READY_STATUS];</div><div class='del'>-		mask = cfg-&gt;mask_pcs_ready;</div><div class='del'>-</div><div class='del'>-		ret = readl_poll_timeout(status, val, !(val &amp; mask), 1,</div><div class='del'>-					 PHY_INIT_COMPLETE_TIMEOUT);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(qmp-&gt;dev, "phy initialization timed-out\n");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		qmp-&gt;phy_initialized = true;</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 qcom_qmp_phy_set_mode(struct phy *phy,</div><div class='ctx'> 				 enum phy_mode mode, int submode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1750,9 +1845,15 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct phy_ops qcom_qmp_phy_gen_ops = {</div><div class='del'>-	.init		= qcom_qmp_phy_init,</div><div class='del'>-	.exit		= qcom_qmp_phy_exit,</div><div class='del'>-	.power_on	= qcom_qmp_phy_poweron,</div><div class='add'>+	.init		= qcom_qmp_phy_enable,</div><div class='add'>+	.exit		= qcom_qmp_phy_disable,</div><div class='add'>+	.set_mode	= qcom_qmp_phy_set_mode,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct phy_ops qcom_qmp_ufs_ops = {</div><div class='add'>+	.power_on	= qcom_qmp_phy_enable,</div><div class='add'>+	.power_off	= qcom_qmp_phy_disable,</div><div class='ctx'> 	.set_mode	= qcom_qmp_phy_set_mode,</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='hunk'>@@ -1763,6 +1864,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)</div><div class='ctx'> 	struct qcom_qmp *qmp = dev_get_drvdata(dev);</div><div class='ctx'> 	struct phy *generic_phy;</div><div class='ctx'> 	struct qmp_phy *qphy;</div><div class='add'>+	const struct phy_ops *ops = &amp;qcom_qmp_phy_gen_ops;</div><div class='ctx'> 	char prop_name[MAX_PROP_NAME];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1849,7 +1951,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	generic_phy = devm_phy_create(dev, np, &amp;qcom_qmp_phy_gen_ops);</div><div class='add'>+	if (qmp-&gt;cfg-&gt;type == PHY_TYPE_UFS)</div><div class='add'>+		ops = &amp;qcom_qmp_ufs_ops;</div><div class='add'>+</div><div class='add'>+	generic_phy = devm_phy_create(dev, np, ops);</div><div class='ctx'> 	if (IS_ERR(generic_phy)) {</div><div class='ctx'> 		ret = PTR_ERR(generic_phy);</div><div class='ctx'> 		dev_err(dev, "failed to create qphy %d\n", ret);</div><div class='hunk'>@@ -1873,6 +1978,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {</div><div class='ctx'> 		.compatible = "qcom,msm8996-qmp-usb3-phy",</div><div class='ctx'> 		.data = &amp;msm8996_usb3phy_cfg,</div><div class='ctx'> 	}, {</div><div class='add'>+		.compatible = "qcom,msm8998-qmp-pcie-phy",</div><div class='add'>+		.data = &amp;msm8998_pciephy_cfg,</div><div class='add'>+	}, {</div><div class='ctx'> 		.compatible = "qcom,msm8998-qmp-ufs-phy",</div><div class='ctx'> 		.data = &amp;sdm845_ufsphy_cfg,</div><div class='ctx'> 	}, {</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h b/drivers/phy/qualcomm/phy-qcom-qmp.h<br/>index a1b6cdee9a08..335ea5d7ef40 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-qmp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-qmp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-qmp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-qmp.h</a></div><div class='hunk'>@@ -241,6 +241,7 @@</div><div class='ctx'> #define QSERDES_V3_RX_RX_BAND				0x110</div><div class='ctx'> #define QSERDES_V3_RX_RX_INTERFACE_MODE			0x11c</div><div class='ctx'> #define QSERDES_V3_RX_RX_MODE_00			0x164</div><div class='add'>+#define QSERDES_V3_RX_RX_MODE_01			0x168</div><div class='ctx'> </div><div class='ctx'> /* Only for QMP V3 PHY - PCS registers */</div><div class='ctx'> #define QPHY_V3_PCS_POWER_DOWN_CONTROL			0x004</div><div class='hunk'>@@ -280,6 +281,7 @@</div><div class='ctx'> #define QPHY_V3_PCS_TSYNC_RSYNC_TIME			0x08c</div><div class='ctx'> #define QPHY_V3_PCS_PWRUP_RESET_DLY_TIME_AUXCLK		0x0a0</div><div class='ctx'> #define QPHY_V3_PCS_LP_WAKEUP_DLY_TIME_AUXCLK		0x0a4</div><div class='add'>+#define QPHY_V3_PCS_PLL_LOCK_CHK_DLY_TIME		0x0a8</div><div class='ctx'> #define QPHY_V3_PCS_LFPS_TX_ECSTART_EQTLOCK		0x0b0</div><div class='ctx'> #define QPHY_V3_PCS_RXEQTRAINING_WAIT_TIME		0x0b8</div><div class='ctx'> #define QPHY_V3_PCS_RXEQTRAINING_RUN_TIME		0x0bc</div><div class='hunk'>@@ -292,13 +294,23 @@</div><div class='ctx'> #define QPHY_V3_PCS_RX_MIN_HIBERN8_TIME			0x138</div><div class='ctx'> #define QPHY_V3_PCS_RX_SIGDET_CTRL1			0x13c</div><div class='ctx'> #define QPHY_V3_PCS_RX_SIGDET_CTRL2			0x140</div><div class='add'>+#define QPHY_V3_PCS_LP_WAKEUP_DLY_TIME_AUXCLK_MSB	0x1a8</div><div class='add'>+#define QPHY_V3_PCS_OSC_DTCT_ACTIONS			0x1ac</div><div class='add'>+#define QPHY_V3_PCS_SIGDET_CNTRL			0x1b0</div><div class='ctx'> #define QPHY_V3_PCS_TX_MID_TERM_CTRL1			0x1bc</div><div class='ctx'> #define QPHY_V3_PCS_MULTI_LANE_CTRL1			0x1c4</div><div class='ctx'> #define QPHY_V3_PCS_RX_SIGDET_LVL			0x1d8</div><div class='add'>+#define QPHY_V3_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_LSB	0x1dc</div><div class='add'>+#define QPHY_V3_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_MSB	0x1e0</div><div class='ctx'> #define QPHY_V3_PCS_REFGEN_REQ_CONFIG1			0x20c</div><div class='ctx'> #define QPHY_V3_PCS_REFGEN_REQ_CONFIG2			0x210</div><div class='ctx'> </div><div class='ctx'> /* Only for QMP V3 PHY - PCS_MISC registers */</div><div class='ctx'> #define QPHY_V3_PCS_MISC_CLAMP_ENABLE			0x0c</div><div class='add'>+#define QPHY_V3_PCS_MISC_OSC_DTCT_CONFIG2		0x2c</div><div class='add'>+#define QPHY_V3_PCS_MISC_PCIE_INT_AUX_CLK_CONFIG1	0x44</div><div class='add'>+#define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG2		0x54</div><div class='add'>+#define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG4		0x5c</div><div class='add'>+#define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG5		0x60</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c<br/>index 8fd7ce139772..1cbf1d6f28ce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-qusb2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-qusb2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-qusb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-qusb2.c</a></div><div class='hunk'>@@ -822,14 +822,9 @@ static int qusb2_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qphy-&gt;iface_clk = devm_clk_get(dev, "iface");</div><div class='del'>-	if (IS_ERR(qphy-&gt;iface_clk)) {</div><div class='del'>-		ret = PTR_ERR(qphy-&gt;iface_clk);</div><div class='del'>-		if (ret == -EPROBE_DEFER)</div><div class='del'>-			return ret;</div><div class='del'>-		qphy-&gt;iface_clk = NULL;</div><div class='del'>-		dev_dbg(dev, "failed to get iface clk, %d\n", ret);</div><div class='del'>-	}</div><div class='add'>+	qphy-&gt;iface_clk = devm_clk_get_optional(dev, "iface");</div><div class='add'>+	if (IS_ERR(qphy-&gt;iface_clk))</div><div class='add'>+		return PTR_ERR(qphy-&gt;iface_clk);</div><div class='ctx'> </div><div class='ctx'> 	qphy-&gt;phy_reset = devm_reset_control_get_by_index(&amp;pdev-&gt;dev, 0);</div><div class='ctx'> 	if (IS_ERR(qphy-&gt;phy_reset)) {</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-i.h b/drivers/phy/qualcomm/phy-qcom-ufs-i.h<br/>index f798fb64de94..109ddd67be82 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs-i.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs-i.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs-i.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-ufs-i.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/phy/phy.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -96,11 +97,10 @@ struct ufs_qcom_phy {</div><div class='ctx'> 	char name[UFS_QCOM_PHY_NAME_LEN];</div><div class='ctx'> 	struct ufs_qcom_phy_calibration *cached_regs;</div><div class='ctx'> 	int cached_regs_table_size;</div><div class='del'>-	bool is_powered_on;</div><div class='del'>-	bool is_started;</div><div class='ctx'> 	struct ufs_qcom_phy_specific_ops *phy_spec_ops;</div><div class='ctx'> </div><div class='ctx'> 	enum phy_mode mode;</div><div class='add'>+	struct reset_control *ufs_reset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -115,6 +115,7 @@ struct ufs_qcom_phy {</div><div class='ctx'>  * and writes to QSERDES_RX_SIGDET_CNTRL attribute</div><div class='ctx'>  */</div><div class='ctx'> struct ufs_qcom_phy_specific_ops {</div><div class='add'>+	int (*calibrate)(struct ufs_qcom_phy *ufs_qcom_phy, bool is_rate_B);</div><div class='ctx'> 	void (*start_serdes)(struct ufs_qcom_phy *phy);</div><div class='ctx'> 	int (*is_physical_coding_sublayer_ready)(struct ufs_qcom_phy *phy);</div><div class='ctx'> 	void (*set_tx_lane_enable)(struct ufs_qcom_phy *phy, u32 val);</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c<br/>index 1e0d4f2046a4..4815546f228c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c</a></div><div class='hunk'>@@ -42,28 +42,6 @@ void ufs_qcom_phy_qmp_14nm_advertise_quirks(struct ufs_qcom_phy *phy_common)</div><div class='ctx'> 		UFS_QCOM_PHY_QUIRK_HIBERN8_EXIT_AFTER_PHY_PWR_COLLAPSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ufs_qcom_phy_qmp_14nm_init(struct phy *generic_phy)</div><div class='del'>-{</div><div class='del'>-	struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);</div><div class='del'>-	bool is_rate_B = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (phy_common-&gt;mode == PHY_MODE_UFS_HS_B)</div><div class='del'>-		is_rate_B = true;</div><div class='del'>-</div><div class='del'>-	ret = ufs_qcom_phy_qmp_14nm_phy_calibrate(phy_common, is_rate_B);</div><div class='del'>-	if (!ret)</div><div class='del'>-		/* phy calibrated, but yet to be started */</div><div class='del'>-		phy_common-&gt;is_started = false;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ufs_qcom_phy_qmp_14nm_exit(struct phy *generic_phy)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static</div><div class='ctx'> int ufs_qcom_phy_qmp_14nm_set_mode(struct phy *generic_phy,</div><div class='ctx'> 				   enum phy_mode mode, int submode)</div><div class='hunk'>@@ -124,8 +102,6 @@ static int ufs_qcom_phy_qmp_14nm_is_pcs_ready(struct ufs_qcom_phy *phy_common)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct phy_ops ufs_qcom_phy_qmp_14nm_phy_ops = {</div><div class='del'>-	.init		= ufs_qcom_phy_qmp_14nm_init,</div><div class='del'>-	.exit		= ufs_qcom_phy_qmp_14nm_exit,</div><div class='ctx'> 	.power_on	= ufs_qcom_phy_power_on,</div><div class='ctx'> 	.power_off	= ufs_qcom_phy_power_off,</div><div class='ctx'> 	.set_mode	= ufs_qcom_phy_qmp_14nm_set_mode,</div><div class='hunk'>@@ -133,6 +109,7 @@ static const struct phy_ops ufs_qcom_phy_qmp_14nm_phy_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ufs_qcom_phy_specific_ops phy_14nm_ops = {</div><div class='add'>+	.calibrate		= ufs_qcom_phy_qmp_14nm_phy_calibrate,</div><div class='ctx'> 	.start_serdes		= ufs_qcom_phy_qmp_14nm_start_serdes,</div><div class='ctx'> 	.is_physical_coding_sublayer_ready = ufs_qcom_phy_qmp_14nm_is_pcs_ready,</div><div class='ctx'> 	.set_tx_lane_enable	= ufs_qcom_phy_qmp_14nm_set_tx_lane_enable,</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c<br/>index aef40f7a41d4..f1cf819e12ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c</a></div><div class='hunk'>@@ -61,28 +61,6 @@ void ufs_qcom_phy_qmp_20nm_advertise_quirks(struct ufs_qcom_phy *phy_common)</div><div class='ctx'> 		UFS_QCOM_PHY_QUIRK_HIBERN8_EXIT_AFTER_PHY_PWR_COLLAPSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ufs_qcom_phy_qmp_20nm_init(struct phy *generic_phy)</div><div class='del'>-{</div><div class='del'>-	struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);</div><div class='del'>-	bool is_rate_B = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (phy_common-&gt;mode == PHY_MODE_UFS_HS_B)</div><div class='del'>-		is_rate_B = true;</div><div class='del'>-</div><div class='del'>-	ret = ufs_qcom_phy_qmp_20nm_phy_calibrate(phy_common, is_rate_B);</div><div class='del'>-	if (!ret)</div><div class='del'>-		/* phy calibrated, but yet to be started */</div><div class='del'>-		phy_common-&gt;is_started = false;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ufs_qcom_phy_qmp_20nm_exit(struct phy *generic_phy)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static</div><div class='ctx'> int ufs_qcom_phy_qmp_20nm_set_mode(struct phy *generic_phy,</div><div class='ctx'> 				   enum phy_mode mode, int submode)</div><div class='hunk'>@@ -182,8 +160,6 @@ static int ufs_qcom_phy_qmp_20nm_is_pcs_ready(struct ufs_qcom_phy *phy_common)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct phy_ops ufs_qcom_phy_qmp_20nm_phy_ops = {</div><div class='del'>-	.init		= ufs_qcom_phy_qmp_20nm_init,</div><div class='del'>-	.exit		= ufs_qcom_phy_qmp_20nm_exit,</div><div class='ctx'> 	.power_on	= ufs_qcom_phy_power_on,</div><div class='ctx'> 	.power_off	= ufs_qcom_phy_power_off,</div><div class='ctx'> 	.set_mode	= ufs_qcom_phy_qmp_20nm_set_mode,</div><div class='hunk'>@@ -191,6 +167,7 @@ static const struct phy_ops ufs_qcom_phy_qmp_20nm_phy_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ufs_qcom_phy_specific_ops phy_20nm_ops = {</div><div class='add'>+	.calibrate		= ufs_qcom_phy_qmp_20nm_phy_calibrate,</div><div class='ctx'> 	.start_serdes		= ufs_qcom_phy_qmp_20nm_start_serdes,</div><div class='ctx'> 	.is_physical_coding_sublayer_ready = ufs_qcom_phy_qmp_20nm_is_pcs_ready,</div><div class='ctx'> 	.set_tx_lane_enable	= ufs_qcom_phy_qmp_20nm_set_tx_lane_enable,</div><div class='head'>diff --git a/drivers/phy/qualcomm/phy-qcom-ufs.c b/drivers/phy/qualcomm/phy-qcom-ufs.c<br/>index f2979ccad00a..45404e31e672 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/qualcomm/phy-qcom-ufs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/qualcomm/phy-qcom-ufs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/qualcomm/phy-qcom-ufs.c</a></div><div class='hunk'>@@ -147,6 +147,21 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ufs_qcom_phy_generic_probe);</div><div class='ctx'> </div><div class='add'>+static int ufs_qcom_phy_get_reset(struct ufs_qcom_phy *phy_common)</div><div class='add'>+{</div><div class='add'>+	struct reset_control *reset;</div><div class='add'>+</div><div class='add'>+	if (phy_common-&gt;ufs_reset)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reset = devm_reset_control_get_exclusive_by_index(phy_common-&gt;dev, 0);</div><div class='add'>+	if (IS_ERR(reset))</div><div class='add'>+		return PTR_ERR(reset);</div><div class='add'>+</div><div class='add'>+	phy_common-&gt;ufs_reset = reset;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __ufs_qcom_phy_clk_get(struct device *dev,</div><div class='ctx'> 			 const char *name, struct clk **clk_out, bool err_print)</div><div class='ctx'> {</div><div class='hunk'>@@ -459,7 +474,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Turn OFF M-PHY RMMI interface clocks */</div><div class='del'>-void ufs_qcom_phy_disable_iface_clk(struct ufs_qcom_phy *phy)</div><div class='add'>+static void ufs_qcom_phy_disable_iface_clk(struct ufs_qcom_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	if (phy-&gt;is_iface_clk_enabled) {</div><div class='ctx'> 		clk_disable_unprepare(phy-&gt;tx_iface_clk);</div><div class='hunk'>@@ -528,23 +543,38 @@ int ufs_qcom_phy_power_on(struct phy *generic_phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);</div><div class='ctx'> 	struct device *dev = phy_common-&gt;dev;</div><div class='add'>+	bool is_rate_B = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (phy_common-&gt;is_powered_on)</div><div class='del'>-		return 0;</div><div class='add'>+	err = ufs_qcom_phy_get_reset(phy_common);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (!phy_common-&gt;is_started) {</div><div class='del'>-		err = ufs_qcom_phy_start_serdes(phy_common);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	err = reset_control_assert(phy_common-&gt;ufs_reset);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-		err = ufs_qcom_phy_is_pcs_ready(phy_common);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	if (phy_common-&gt;mode == PHY_MODE_UFS_HS_B)</div><div class='add'>+		is_rate_B = true;</div><div class='ctx'> </div><div class='del'>-		phy_common-&gt;is_started = true;</div><div class='add'>+	err = phy_common-&gt;phy_spec_ops-&gt;calibrate(phy_common, is_rate_B);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = reset_control_deassert(phy_common-&gt;ufs_reset);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to assert UFS PHY reset");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = ufs_qcom_phy_start_serdes(phy_common);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ufs_qcom_phy_is_pcs_ready(phy_common);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = ufs_qcom_phy_enable_vreg(dev, &amp;phy_common-&gt;vdda_phy);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "%s enable vdda_phy failed, err=%d\n",</div><div class='hunk'>@@ -587,7 +617,6 @@ int ufs_qcom_phy_power_on(struct phy *generic_phy)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phy_common-&gt;is_powered_on = true;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_disable_ref_clk:</div><div class='hunk'>@@ -607,9 +636,6 @@ int ufs_qcom_phy_power_off(struct phy *generic_phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy);</div><div class='ctx'> </div><div class='del'>-	if (!phy_common-&gt;is_powered_on)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	phy_common-&gt;phy_spec_ops-&gt;power_control(phy_common, false);</div><div class='ctx'> </div><div class='ctx'> 	if (phy_common-&gt;vddp_ref_clk.reg)</div><div class='hunk'>@@ -620,8 +646,7 @@ int ufs_qcom_phy_power_off(struct phy *generic_phy)</div><div class='ctx'> </div><div class='ctx'> 	ufs_qcom_phy_disable_vreg(phy_common-&gt;dev, &amp;phy_common-&gt;vdda_pll);</div><div class='ctx'> 	ufs_qcom_phy_disable_vreg(phy_common-&gt;dev, &amp;phy_common-&gt;vdda_phy);</div><div class='del'>-	phy_common-&gt;is_powered_on = false;</div><div class='del'>-</div><div class='add'>+	reset_control_assert(phy_common-&gt;ufs_reset);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ufs_qcom_phy_power_off);</div><div class='head'>diff --git a/drivers/phy/renesas/Kconfig b/drivers/phy/renesas/Kconfig<br/>index e340a925bbb1..111bdcae775c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/renesas/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/renesas/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/renesas/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/renesas/Kconfig</a></div><div class='hunk'>@@ -19,7 +19,7 @@ config PHY_RCAR_GEN3_PCIE</div><div class='ctx'> config PHY_RCAR_GEN3_USB2</div><div class='ctx'> 	tristate "Renesas R-Car generation 3 USB 2.0 PHY driver"</div><div class='ctx'> 	depends on ARCH_RENESAS</div><div class='del'>-	depends on EXTCON</div><div class='add'>+	depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in</div><div class='ctx'> 	depends on USB_SUPPORT</div><div class='ctx'> 	select GENERIC_PHY</div><div class='ctx'> 	select USB_COMMON</div><div class='head'>diff --git a/drivers/phy/renesas/phy-rcar-gen2.c b/drivers/phy/renesas/phy-rcar-gen2.c<br/>index 72eeb066912d..8dc5710d9c98 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/renesas/phy-rcar-gen2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/renesas/phy-rcar-gen2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/renesas/phy-rcar-gen2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/renesas/phy-rcar-gen2.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2014 Renesas Solutions Corp.</div><div class='ctx'>  * Copyright (C) 2014 Cogent Embedded, Inc.</div><div class='add'>+ * Copyright (C) 2019 Renesas Electronics Corp.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -15,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define USBHS_LPSTS			0x02</div><div class='ctx'> #define USBHS_UGCTRL			0x80</div><div class='hunk'>@@ -35,6 +37,8 @@</div><div class='ctx'> #define USBHS_UGCTRL2_USB0SEL		0x00000030</div><div class='ctx'> #define USBHS_UGCTRL2_USB0SEL_PCI	0x00000010</div><div class='ctx'> #define USBHS_UGCTRL2_USB0SEL_HS_USB	0x00000030</div><div class='add'>+#define USBHS_UGCTRL2_USB0SEL_USB20	0x00000010</div><div class='add'>+#define USBHS_UGCTRL2_USB0SEL_HS_USB20	0x00000020</div><div class='ctx'> </div><div class='ctx'> /* USB General status register (UGSTS) */</div><div class='ctx'> #define USBHS_UGSTS_LOCK		0x00000100 /* From technical update */</div><div class='hunk'>@@ -64,6 +68,11 @@ struct rcar_gen2_phy_driver {</div><div class='ctx'> 	struct rcar_gen2_channel *channels;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct rcar_gen2_phy_data {</div><div class='add'>+	const struct phy_ops *gen2_phy_ops;</div><div class='add'>+	const u32 (*select_value)[PHYS_PER_CHANNEL];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int rcar_gen2_phy_init(struct phy *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_gen2_phy *phy = phy_get_drvdata(p);</div><div class='hunk'>@@ -180,6 +189,60 @@ static int rcar_gen2_phy_power_off(struct phy *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rz_g1c_phy_power_on(struct phy *p)</div><div class='add'>+{</div><div class='add'>+	struct rcar_gen2_phy *phy = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen2_phy_driver *drv = phy-&gt;channel-&gt;drv;</div><div class='add'>+	void __iomem *base = drv-&gt;base;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;drv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Power on USBHS PHY */</div><div class='add'>+	value = readl(base + USBHS_UGCTRL);</div><div class='add'>+	value &amp;= ~USBHS_UGCTRL_PLLRESET;</div><div class='add'>+	writel(value, base + USBHS_UGCTRL);</div><div class='add'>+</div><div class='add'>+	/* As per the data sheet wait 340 micro sec for power stable */</div><div class='add'>+	udelay(340);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;select_value == USBHS_UGCTRL2_USB0SEL_HS_USB20) {</div><div class='add'>+		value = readw(base + USBHS_LPSTS);</div><div class='add'>+		value |= USBHS_LPSTS_SUSPM;</div><div class='add'>+		writew(value, base + USBHS_LPSTS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;drv-&gt;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 rz_g1c_phy_power_off(struct phy *p)</div><div class='add'>+{</div><div class='add'>+	struct rcar_gen2_phy *phy = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen2_phy_driver *drv = phy-&gt;channel-&gt;drv;</div><div class='add'>+	void __iomem *base = drv-&gt;base;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;drv-&gt;lock, flags);</div><div class='add'>+	/* Power off USBHS PHY */</div><div class='add'>+	if (phy-&gt;select_value == USBHS_UGCTRL2_USB0SEL_HS_USB20) {</div><div class='add'>+		value = readw(base + USBHS_LPSTS);</div><div class='add'>+		value &amp;= ~USBHS_LPSTS_SUSPM;</div><div class='add'>+		writew(value, base + USBHS_LPSTS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = readl(base + USBHS_UGCTRL);</div><div class='add'>+	value |= USBHS_UGCTRL_PLLRESET;</div><div class='add'>+	writel(value, base + USBHS_UGCTRL);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;drv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct phy_ops rcar_gen2_phy_ops = {</div><div class='ctx'> 	.init		= rcar_gen2_phy_init,</div><div class='ctx'> 	.exit		= rcar_gen2_phy_exit,</div><div class='hunk'>@@ -188,12 +251,55 @@ static const struct phy_ops rcar_gen2_phy_ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct phy_ops rz_g1c_phy_ops = {</div><div class='add'>+	.init		= rcar_gen2_phy_init,</div><div class='add'>+	.exit		= rcar_gen2_phy_exit,</div><div class='add'>+	.power_on	= rz_g1c_phy_power_on,</div><div class='add'>+	.power_off	= rz_g1c_phy_power_off,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 pci_select_value[][PHYS_PER_CHANNEL] = {</div><div class='add'>+	[0]	= { USBHS_UGCTRL2_USB0SEL_PCI, USBHS_UGCTRL2_USB0SEL_HS_USB },</div><div class='add'>+	[2]	= { USBHS_UGCTRL2_USB2SEL_PCI, USBHS_UGCTRL2_USB2SEL_USB30 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 usb20_select_value[][PHYS_PER_CHANNEL] = {</div><div class='add'>+	{ USBHS_UGCTRL2_USB0SEL_USB20, USBHS_UGCTRL2_USB0SEL_HS_USB20 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_gen2_phy_data rcar_gen2_usb_phy_data = {</div><div class='add'>+	.gen2_phy_ops = &amp;rcar_gen2_phy_ops,</div><div class='add'>+	.select_value = pci_select_value,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_gen2_phy_data rz_g1c_usb_phy_data = {</div><div class='add'>+	.gen2_phy_ops = &amp;rz_g1c_phy_ops,</div><div class='add'>+	.select_value = usb20_select_value,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id rcar_gen2_phy_match_table[] = {</div><div class='del'>-	{ .compatible = "renesas,usb-phy-r8a7790" },</div><div class='del'>-	{ .compatible = "renesas,usb-phy-r8a7791" },</div><div class='del'>-	{ .compatible = "renesas,usb-phy-r8a7794" },</div><div class='del'>-	{ .compatible = "renesas,rcar-gen2-usb-phy" },</div><div class='del'>-	{ }</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb-phy-r8a77470",</div><div class='add'>+		.data = &amp;rz_g1c_usb_phy_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb-phy-r8a7790",</div><div class='add'>+		.data = &amp;rcar_gen2_usb_phy_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb-phy-r8a7791",</div><div class='add'>+		.data = &amp;rcar_gen2_usb_phy_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb-phy-r8a7794",</div><div class='add'>+		.data = &amp;rcar_gen2_usb_phy_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,rcar-gen2-usb-phy",</div><div class='add'>+		.data = &amp;rcar_gen2_usb_phy_data,</div><div class='add'>+	},</div><div class='add'>+	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, rcar_gen2_phy_match_table);</div><div class='ctx'> </div><div class='hunk'>@@ -224,11 +330,6 @@ static const u32 select_mask[] = {</div><div class='ctx'> 	[2]	= USBHS_UGCTRL2_USB2SEL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 select_value[][PHYS_PER_CHANNEL] = {</div><div class='del'>-	[0]	= { USBHS_UGCTRL2_USB0SEL_PCI, USBHS_UGCTRL2_USB0SEL_HS_USB },</div><div class='del'>-	[2]	= { USBHS_UGCTRL2_USB2SEL_PCI, USBHS_UGCTRL2_USB2SEL_USB30 },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int rcar_gen2_phy_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -238,6 +339,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	const struct rcar_gen2_phy_data *data;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;of_node) {</div><div class='hunk'>@@ -266,6 +368,10 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 	drv-&gt;clk = clk;</div><div class='ctx'> 	drv-&gt;base = base;</div><div class='ctx'> </div><div class='add'>+	data = of_device_get_match_data(dev);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	drv-&gt;num_channels = of_get_child_count(dev-&gt;of_node);</div><div class='ctx'> 	drv-&gt;channels = devm_kcalloc(dev, drv-&gt;num_channels,</div><div class='ctx'> 				     sizeof(struct rcar_gen2_channel),</div><div class='hunk'>@@ -294,10 +400,10 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 			phy-&gt;channel = channel;</div><div class='ctx'> 			phy-&gt;number = n;</div><div class='del'>-			phy-&gt;select_value = select_value[channel_num][n];</div><div class='add'>+			phy-&gt;select_value = data-&gt;select_value[channel_num][n];</div><div class='ctx'> </div><div class='ctx'> 			phy-&gt;phy = devm_phy_create(dev, NULL,</div><div class='del'>-						   &amp;rcar_gen2_phy_ops);</div><div class='add'>+						   data-&gt;gen2_phy_ops);</div><div class='ctx'> 			if (IS_ERR(phy-&gt;phy)) {</div><div class='ctx'> 				dev_err(dev, "Failed to create PHY\n");</div><div class='ctx'> 				return PTR_ERR(phy-&gt;phy);</div><div class='head'>diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c<br/>index 0a34782aaaa2..1322185a00a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/renesas/phy-rcar-gen3-usb2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/renesas/phy-rcar-gen3-usb2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/renesas/phy-rcar-gen3-usb2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/renesas/phy-rcar-gen3-usb2.c</a></div><div class='hunk'>@@ -37,11 +37,8 @@</div><div class='ctx'> </div><div class='ctx'> /* INT_ENABLE */</div><div class='ctx'> #define USB2_INT_ENABLE_UCOM_INTEN	BIT(3)</div><div class='del'>-#define USB2_INT_ENABLE_USBH_INTB_EN	BIT(2)</div><div class='del'>-#define USB2_INT_ENABLE_USBH_INTA_EN	BIT(1)</div><div class='del'>-#define USB2_INT_ENABLE_INIT		(USB2_INT_ENABLE_UCOM_INTEN | \</div><div class='del'>-					 USB2_INT_ENABLE_USBH_INTB_EN | \</div><div class='del'>-					 USB2_INT_ENABLE_USBH_INTA_EN)</div><div class='add'>+#define USB2_INT_ENABLE_USBH_INTB_EN	BIT(2)	/* For EHCI */</div><div class='add'>+#define USB2_INT_ENABLE_USBH_INTA_EN	BIT(1)	/* For OHCI */</div><div class='ctx'> </div><div class='ctx'> /* USBCTR */</div><div class='ctx'> #define USB2_USBCTR_DIRPD	BIT(2)</div><div class='hunk'>@@ -78,10 +75,35 @@</div><div class='ctx'> #define USB2_ADPCTRL_IDPULLUP		BIT(5)	/* 1 = ID sampling is enabled */</div><div class='ctx'> #define USB2_ADPCTRL_DRVVBUS		BIT(4)</div><div class='ctx'> </div><div class='add'>+#define NUM_OF_PHYS			4</div><div class='add'>+enum rcar_gen3_phy_index {</div><div class='add'>+	PHY_INDEX_BOTH_HC,</div><div class='add'>+	PHY_INDEX_OHCI,</div><div class='add'>+	PHY_INDEX_EHCI,</div><div class='add'>+	PHY_INDEX_HSUSB</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 rcar_gen3_int_enable[NUM_OF_PHYS] = {</div><div class='add'>+	USB2_INT_ENABLE_USBH_INTB_EN | USB2_INT_ENABLE_USBH_INTA_EN,</div><div class='add'>+	USB2_INT_ENABLE_USBH_INTA_EN,</div><div class='add'>+	USB2_INT_ENABLE_USBH_INTB_EN,</div><div class='add'>+	0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rcar_gen3_phy {</div><div class='add'>+	struct phy *phy;</div><div class='add'>+	struct rcar_gen3_chan *ch;</div><div class='add'>+	u32 int_enable_bits;</div><div class='add'>+	bool initialized;</div><div class='add'>+	bool otg_initialized;</div><div class='add'>+	bool powered;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct rcar_gen3_chan {</div><div class='ctx'> 	void __iomem *base;</div><div class='add'>+	struct device *dev;	/* platform_device's device */</div><div class='ctx'> 	struct extcon_dev *extcon;</div><div class='del'>-	struct phy *phy;</div><div class='add'>+	struct rcar_gen3_phy rphys[NUM_OF_PHYS];</div><div class='ctx'> 	struct regulator *vbus;</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	enum usb_dr_mode dr_mode;</div><div class='hunk'>@@ -120,7 +142,7 @@ static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host)</div><div class='ctx'> 	void __iomem *usb2_base = ch-&gt;base;</div><div class='ctx'> 	u32 val = readl(usb2_base + USB2_COMMCTRL);</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;ch-&gt;phy-&gt;dev, "%s: %08x, %d\n", __func__, val, host);</div><div class='add'>+	dev_vdbg(ch-&gt;dev, "%s: %08x, %d\n", __func__, val, host);</div><div class='ctx'> 	if (host)</div><div class='ctx'> 		val &amp;= ~USB2_COMMCTRL_OTG_PERI;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -133,7 +155,7 @@ static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm)</div><div class='ctx'> 	void __iomem *usb2_base = ch-&gt;base;</div><div class='ctx'> 	u32 val = readl(usb2_base + USB2_LINECTRL1);</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;ch-&gt;phy-&gt;dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm);</div><div class='add'>+	dev_vdbg(ch-&gt;dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm);</div><div class='ctx'> 	val &amp;= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD);</div><div class='ctx'> 	if (dp)</div><div class='ctx'> 		val |= USB2_LINECTRL1_DP_RPD;</div><div class='hunk'>@@ -147,7 +169,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)</div><div class='ctx'> 	void __iomem *usb2_base = ch-&gt;base;</div><div class='ctx'> 	u32 val = readl(usb2_base + USB2_ADPCTRL);</div><div class='ctx'> </div><div class='del'>-	dev_vdbg(&amp;ch-&gt;phy-&gt;dev, "%s: %08x, %d\n", __func__, val, vbus);</div><div class='add'>+	dev_vdbg(ch-&gt;dev, "%s: %08x, %d\n", __func__, val, vbus);</div><div class='ctx'> 	if (vbus)</div><div class='ctx'> 		val |= USB2_ADPCTRL_DRVVBUS;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -249,6 +271,42 @@ static enum phy_mode rcar_gen3_get_phy_mode(struct rcar_gen3_chan *ch)</div><div class='ctx'> 	return PHY_MODE_USB_DEVICE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool rcar_gen3_is_any_rphy_initialized(struct rcar_gen3_chan *ch)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_OF_PHYS; i++) {</div><div class='add'>+		if (ch-&gt;rphys[i].initialized)</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 bool rcar_gen3_needs_init_otg(struct rcar_gen3_chan *ch)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_OF_PHYS; i++) {</div><div class='add'>+		if (ch-&gt;rphys[i].otg_initialized)</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 rcar_gen3_are_all_rphys_power_off(struct rcar_gen3_chan *ch)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_OF_PHYS; i++) {</div><div class='add'>+		if (ch-&gt;rphys[i].powered)</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='ctx'> static ssize_t role_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -256,7 +314,7 @@ static ssize_t role_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	bool is_b_device;</div><div class='ctx'> 	enum phy_mode cur_mode, new_mode;</div><div class='ctx'> </div><div class='del'>-	if (!ch-&gt;is_otg_channel || !ch-&gt;phy-&gt;init_count)</div><div class='add'>+	if (!ch-&gt;is_otg_channel || !rcar_gen3_is_any_rphy_initialized(ch))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (!strncmp(buf, "host", strlen("host")))</div><div class='hunk'>@@ -294,7 +352,7 @@ static ssize_t role_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_gen3_chan *ch = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	if (!ch-&gt;is_otg_channel || !ch-&gt;phy-&gt;init_count)</div><div class='add'>+	if (!ch-&gt;is_otg_channel || !rcar_gen3_is_any_rphy_initialized(ch))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%s\n", rcar_gen3_is_host(ch) ? "host" :</div><div class='hunk'>@@ -328,37 +386,62 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)</div><div class='ctx'> </div><div class='ctx'> static int rcar_gen3_phy_usb2_init(struct phy *p)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_gen3_chan *channel = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_phy *rphy = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_chan *channel = rphy-&gt;ch;</div><div class='ctx'> 	void __iomem *usb2_base = channel-&gt;base;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize USB2 part */</div><div class='del'>-	writel(USB2_INT_ENABLE_INIT, usb2_base + USB2_INT_ENABLE);</div><div class='add'>+	val = readl(usb2_base + USB2_INT_ENABLE);</div><div class='add'>+	val |= USB2_INT_ENABLE_UCOM_INTEN | rphy-&gt;int_enable_bits;</div><div class='add'>+	writel(val, usb2_base + USB2_INT_ENABLE);</div><div class='ctx'> 	writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);</div><div class='ctx'> 	writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize otg part */</div><div class='del'>-	if (channel-&gt;is_otg_channel)</div><div class='del'>-		rcar_gen3_init_otg(channel);</div><div class='add'>+	if (channel-&gt;is_otg_channel) {</div><div class='add'>+		if (rcar_gen3_needs_init_otg(channel))</div><div class='add'>+			rcar_gen3_init_otg(channel);</div><div class='add'>+		rphy-&gt;otg_initialized = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rphy-&gt;initialized = 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 rcar_gen3_phy_usb2_exit(struct phy *p)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_gen3_chan *channel = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_phy *rphy = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_chan *channel = rphy-&gt;ch;</div><div class='add'>+	void __iomem *usb2_base = channel-&gt;base;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	rphy-&gt;initialized = false;</div><div class='add'>+</div><div class='add'>+	if (channel-&gt;is_otg_channel)</div><div class='add'>+		rphy-&gt;otg_initialized = false;</div><div class='ctx'> </div><div class='del'>-	writel(0, channel-&gt;base + USB2_INT_ENABLE);</div><div class='add'>+	val = readl(usb2_base + USB2_INT_ENABLE);</div><div class='add'>+	val &amp;= ~rphy-&gt;int_enable_bits;</div><div class='add'>+	if (!rcar_gen3_is_any_rphy_initialized(channel))</div><div class='add'>+		val &amp;= ~USB2_INT_ENABLE_UCOM_INTEN;</div><div class='add'>+	writel(val, usb2_base + USB2_INT_ENABLE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rcar_gen3_phy_usb2_power_on(struct phy *p)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_gen3_chan *channel = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_phy *rphy = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_chan *channel = rphy-&gt;ch;</div><div class='ctx'> 	void __iomem *usb2_base = channel-&gt;base;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!rcar_gen3_are_all_rphys_power_off(channel))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (channel-&gt;vbus) {</div><div class='ctx'> 		ret = regulator_enable(channel-&gt;vbus);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -371,14 +454,22 @@ static int rcar_gen3_phy_usb2_power_on(struct phy *p)</div><div class='ctx'> 	val &amp;= ~USB2_USBCTR_PLL_RST;</div><div class='ctx'> 	writel(val, usb2_base + USB2_USBCTR);</div><div class='ctx'> </div><div class='add'>+	rphy-&gt;powered = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rcar_gen3_phy_usb2_power_off(struct phy *p)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_gen3_chan *channel = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_phy *rphy = phy_get_drvdata(p);</div><div class='add'>+	struct rcar_gen3_chan *channel = rphy-&gt;ch;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	rphy-&gt;powered = false;</div><div class='add'>+</div><div class='add'>+	if (!rcar_gen3_are_all_rphys_power_off(channel))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (channel-&gt;vbus)</div><div class='ctx'> 		ret = regulator_disable(channel-&gt;vbus);</div><div class='ctx'> </div><div class='hunk'>@@ -393,6 +484,12 @@ static const struct phy_ops rcar_gen3_phy_usb2_ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct phy_ops rz_g1c_phy_usb2_ops = {</div><div class='add'>+	.init		= rcar_gen3_phy_usb2_init,</div><div class='add'>+	.exit		= rcar_gen3_phy_usb2_exit,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_gen3_chan *ch = _ch;</div><div class='hunk'>@@ -401,7 +498,7 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)</div><div class='ctx'> 	irqreturn_t ret = IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; USB2_OBINT_BITS) {</div><div class='del'>-		dev_vdbg(&amp;ch-&gt;phy-&gt;dev, "%s: %08x\n", __func__, status);</div><div class='add'>+		dev_vdbg(ch-&gt;dev, "%s: %08x\n", __func__, status);</div><div class='ctx'> 		writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);</div><div class='ctx'> 		rcar_gen3_device_recognition(ch);</div><div class='ctx'> 		ret = IRQ_HANDLED;</div><div class='hunk'>@@ -411,11 +508,27 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {</div><div class='del'>-	{ .compatible = "renesas,usb2-phy-r8a7795" },</div><div class='del'>-	{ .compatible = "renesas,usb2-phy-r8a7796" },</div><div class='del'>-	{ .compatible = "renesas,usb2-phy-r8a77965" },</div><div class='del'>-	{ .compatible = "renesas,rcar-gen3-usb2-phy" },</div><div class='del'>-	{ }</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb2-phy-r8a77470",</div><div class='add'>+		.data = &amp;rz_g1c_phy_usb2_ops,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb2-phy-r8a7795",</div><div class='add'>+		.data = &amp;rcar_gen3_phy_usb2_ops,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb2-phy-r8a7796",</div><div class='add'>+		.data = &amp;rcar_gen3_phy_usb2_ops,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,usb2-phy-r8a77965",</div><div class='add'>+		.data = &amp;rcar_gen3_phy_usb2_ops,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,rcar-gen3-usb2-phy",</div><div class='add'>+		.data = &amp;rcar_gen3_phy_usb2_ops,</div><div class='add'>+	},</div><div class='add'>+	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, rcar_gen3_phy_usb2_match_table);</div><div class='ctx'> </div><div class='hunk'>@@ -425,13 +538,54 @@ static const unsigned int rcar_gen3_phy_cable[] = {</div><div class='ctx'> 	EXTCON_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct phy *rcar_gen3_phy_usb2_xlate(struct device *dev,</div><div class='add'>+					    struct of_phandle_args *args)</div><div class='add'>+{</div><div class='add'>+	struct rcar_gen3_chan *ch = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (args-&gt;args_count == 0)	/* For old version dts */</div><div class='add'>+		return ch-&gt;rphys[PHY_INDEX_BOTH_HC].phy;</div><div class='add'>+	else if (args-&gt;args_count &gt; 1)	/* Prevent invalid args count */</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	if (args-&gt;args[0] &gt;= NUM_OF_PHYS)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	return ch-&gt;rphys[args-&gt;args[0]].phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum usb_dr_mode rcar_gen3_get_dr_mode(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	enum usb_dr_mode candidate = USB_DR_MODE_UNKNOWN;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If one of device nodes has other dr_mode except UNKNOWN,</div><div class='add'>+	 * this function returns UNKNOWN. To achieve backward compatibility,</div><div class='add'>+	 * this loop starts the index as 0.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; NUM_OF_PHYS; i++) {</div><div class='add'>+		enum usb_dr_mode mode = of_usb_get_dr_mode_by_phy(np, i);</div><div class='add'>+</div><div class='add'>+		if (mode != USB_DR_MODE_UNKNOWN) {</div><div class='add'>+			if (candidate == USB_DR_MODE_UNKNOWN)</div><div class='add'>+				candidate = mode;</div><div class='add'>+			else if (candidate != mode)</div><div class='add'>+				return USB_DR_MODE_UNKNOWN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return candidate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct rcar_gen3_chan *channel;</div><div class='ctx'> 	struct phy_provider *provider;</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	int irq, ret = 0;</div><div class='add'>+	const struct phy_ops *phy_usb2_ops;</div><div class='add'>+	int irq, ret = 0, i;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;of_node) {</div><div class='ctx'> 		dev_err(dev, "This driver needs device tree\n");</div><div class='hunk'>@@ -457,7 +611,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)</div><div class='ctx'> 			dev_err(dev, "No irq handler (%d)\n", irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	channel-&gt;dr_mode = of_usb_get_dr_mode_by_phy(dev-&gt;of_node, 0);</div><div class='add'>+	channel-&gt;dr_mode = rcar_gen3_get_dr_mode(dev-&gt;of_node);</div><div class='ctx'> 	if (channel-&gt;dr_mode != USB_DR_MODE_UNKNOWN) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -481,11 +635,21 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * And then, phy-core will manage runtime pm for this device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pm_runtime_enable(dev);</div><div class='del'>-	channel-&gt;phy = devm_phy_create(dev, NULL, &amp;rcar_gen3_phy_usb2_ops);</div><div class='del'>-	if (IS_ERR(channel-&gt;phy)) {</div><div class='del'>-		dev_err(dev, "Failed to create USB2 PHY\n");</div><div class='del'>-		ret = PTR_ERR(channel-&gt;phy);</div><div class='del'>-		goto error;</div><div class='add'>+	phy_usb2_ops = of_device_get_match_data(dev);</div><div class='add'>+	if (!phy_usb2_ops)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_OF_PHYS; i++) {</div><div class='add'>+		channel-&gt;rphys[i].phy = devm_phy_create(dev, NULL,</div><div class='add'>+							phy_usb2_ops);</div><div class='add'>+		if (IS_ERR(channel-&gt;rphys[i].phy)) {</div><div class='add'>+			dev_err(dev, "Failed to create USB2 PHY\n");</div><div class='add'>+			ret = PTR_ERR(channel-&gt;rphys[i].phy);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		channel-&gt;rphys[i].ch = channel;</div><div class='add'>+		channel-&gt;rphys[i].int_enable_bits = rcar_gen3_int_enable[i];</div><div class='add'>+		phy_set_drvdata(channel-&gt;rphys[i].phy, &amp;channel-&gt;rphys[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	channel-&gt;vbus = devm_regulator_get_optional(dev, "vbus");</div><div class='hunk'>@@ -498,9 +662,9 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, channel);</div><div class='del'>-	phy_set_drvdata(channel-&gt;phy, channel);</div><div class='add'>+	channel-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);</div><div class='add'>+	provider = devm_of_phy_provider_register(dev, rcar_gen3_phy_usb2_xlate);</div><div class='ctx'> 	if (IS_ERR(provider)) {</div><div class='ctx'> 		dev_err(dev, "Failed to register PHY provider\n");</div><div class='ctx'> 		ret = PTR_ERR(provider);</div><div class='head'>diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c<br/>index 19bf84f0bc67..b804c6bf4b55 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/rockchip/phy-rockchip-emmc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/rockchip/phy-rockchip-emmc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/rockchip/phy-rockchip-emmc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/rockchip/phy-rockchip-emmc.c</a></div><div class='hunk'>@@ -87,6 +87,7 @@ struct rockchip_emmc_phy {</div><div class='ctx'> 	unsigned int	reg_offset;</div><div class='ctx'> 	struct regmap	*reg_base;</div><div class='ctx'> 	struct clk	*emmcclk;</div><div class='add'>+	unsigned int drive_impedance;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int rockchip_emmc_phy_power(struct phy *phy, bool on_off)</div><div class='hunk'>@@ -281,10 +282,10 @@ static int rockchip_emmc_phy_power_on(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct rockchip_emmc_phy *rk_phy = phy_get_drvdata(phy);</div><div class='ctx'> </div><div class='del'>-	/* Drive impedance: 50 Ohm */</div><div class='add'>+	/* Drive impedance: from DTS */</div><div class='ctx'> 	regmap_write(rk_phy-&gt;reg_base,</div><div class='ctx'> 		     rk_phy-&gt;reg_offset + GRF_EMMCPHY_CON6,</div><div class='del'>-		     HIWORD_UPDATE(PHYCTRL_DR_50OHM,</div><div class='add'>+		     HIWORD_UPDATE(rk_phy-&gt;drive_impedance,</div><div class='ctx'> 				   PHYCTRL_DR_MASK,</div><div class='ctx'> 				   PHYCTRL_DR_SHIFT));</div><div class='ctx'> </div><div class='hunk'>@@ -314,6 +315,26 @@ static const struct phy_ops ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u32 convert_drive_impedance_ohm(struct platform_device *pdev, u32 dr_ohm)</div><div class='add'>+{</div><div class='add'>+	switch (dr_ohm) {</div><div class='add'>+	case 100:</div><div class='add'>+		return PHYCTRL_DR_100OHM;</div><div class='add'>+	case 66:</div><div class='add'>+		return PHYCTRL_DR_66OHM;</div><div class='add'>+	case 50:</div><div class='add'>+		return PHYCTRL_DR_50OHM;</div><div class='add'>+	case 40:</div><div class='add'>+		return PHYCTRL_DR_40OHM;</div><div class='add'>+	case 33:</div><div class='add'>+		return PHYCTRL_DR_33OHM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;pdev-&gt;dev, "Invalid value %u for drive-impedance-ohm.\n",</div><div class='add'>+		 dr_ohm);</div><div class='add'>+	return PHYCTRL_DR_50OHM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rockchip_emmc_phy_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -322,6 +343,7 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct phy_provider *phy_provider;</div><div class='ctx'> 	struct regmap *grf;</div><div class='ctx'> 	unsigned int reg_offset;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;parent || !dev-&gt;parent-&gt;of_node)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -344,6 +366,10 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	rk_phy-&gt;reg_offset = reg_offset;</div><div class='ctx'> 	rk_phy-&gt;reg_base = grf;</div><div class='add'>+	rk_phy-&gt;drive_impedance = PHYCTRL_DR_50OHM;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(dev-&gt;of_node, "drive-impedance-ohm", &amp;val))</div><div class='add'>+		rk_phy-&gt;drive_impedance = convert_drive_impedance_ohm(pdev, val);</div><div class='ctx'> </div><div class='ctx'> 	generic_phy = devm_phy_create(dev, dev-&gt;of_node, &amp;ops);</div><div class='ctx'> 	if (IS_ERR(generic_phy)) {</div><div class='head'>diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c<br/>index e32edeebcd63..8ad366ee6ada 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/rockchip/phy-rockchip-typec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/rockchip/phy-rockchip-typec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/rockchip/phy-rockchip-typec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/rockchip/phy-rockchip-typec.c</a></div><div class='hunk'>@@ -400,7 +400,7 @@ struct phy_reg {</div><div class='ctx'> 	u32 addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct phy_reg usb3_pll_cfg[] = {</div><div class='add'>+static struct phy_reg usb3_pll_cfg[] = {</div><div class='ctx'> 	{ 0xf0,		CMN_PLL0_VCOCAL_INIT },</div><div class='ctx'> 	{ 0x18,		CMN_PLL0_VCOCAL_ITER },</div><div class='ctx'> 	{ 0xd0,		CMN_PLL0_INTDIV },</div><div class='hunk'>@@ -417,7 +417,7 @@ struct phy_reg usb3_pll_cfg[] = {</div><div class='ctx'> 	{ 0x8,		CMN_DIAG_PLL0_LF_PROG },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct phy_reg dp_pll_cfg[] = {</div><div class='add'>+static struct phy_reg dp_pll_cfg[] = {</div><div class='ctx'> 	{ 0xf0,		CMN_PLL1_VCOCAL_INIT },</div><div class='ctx'> 	{ 0x18,		CMN_PLL1_VCOCAL_ITER },</div><div class='ctx'> 	{ 0x30b9,	CMN_PLL1_VCOCAL_START },</div><div class='head'>diff --git a/drivers/phy/socionext/phy-uniphier-usb3hs.c b/drivers/phy/socionext/phy-uniphier-usb3hs.c<br/>index b1b048be6166..50f379fc4e06 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/socionext/phy-uniphier-usb3hs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/socionext/phy-uniphier-usb3hs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/socionext/phy-uniphier-usb3hs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/socionext/phy-uniphier-usb3hs.c</a></div><div class='hunk'>@@ -335,13 +335,9 @@ static int uniphier_u3hsphy_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(priv-&gt;clk_parent))</div><div class='ctx'> 		return PTR_ERR(priv-&gt;clk_parent);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk_ext = devm_clk_get(dev, "phy-ext");</div><div class='del'>-	if (IS_ERR(priv-&gt;clk_ext)) {</div><div class='del'>-		if (PTR_ERR(priv-&gt;clk_ext) == -ENOENT)</div><div class='del'>-			priv-&gt;clk_ext = NULL;</div><div class='del'>-		else</div><div class='del'>-			return PTR_ERR(priv-&gt;clk_ext);</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;clk_ext = devm_clk_get_optional(dev, "phy-ext");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk_ext))</div><div class='add'>+		return PTR_ERR(priv-&gt;clk_ext);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;rst = devm_reset_control_get_shared(dev, "phy");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;rst))</div><div class='head'>diff --git a/drivers/phy/socionext/phy-uniphier-usb3ss.c b/drivers/phy/socionext/phy-uniphier-usb3ss.c<br/>index 4be95679c7d8..ec231e40ef2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/socionext/phy-uniphier-usb3ss.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/socionext/phy-uniphier-usb3ss.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/socionext/phy-uniphier-usb3ss.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/socionext/phy-uniphier-usb3ss.c</a></div><div class='hunk'>@@ -238,13 +238,9 @@ static int uniphier_u3ssphy_probe(struct platform_device *pdev)</div><div class='ctx'> 		if (IS_ERR(priv-&gt;clk))</div><div class='ctx'> 			return PTR_ERR(priv-&gt;clk);</div><div class='ctx'> </div><div class='del'>-		priv-&gt;clk_ext = devm_clk_get(dev, "phy-ext");</div><div class='del'>-		if (IS_ERR(priv-&gt;clk_ext)) {</div><div class='del'>-			if (PTR_ERR(priv-&gt;clk_ext) == -ENOENT)</div><div class='del'>-				priv-&gt;clk_ext = NULL;</div><div class='del'>-			else</div><div class='del'>-				return PTR_ERR(priv-&gt;clk_ext);</div><div class='del'>-		}</div><div class='add'>+		priv-&gt;clk_ext = devm_clk_get_optional(dev, "phy-ext");</div><div class='add'>+		if (IS_ERR(priv-&gt;clk_ext))</div><div class='add'>+			return PTR_ERR(priv-&gt;clk_ext);</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;rst = devm_reset_control_get_shared(dev, "phy");</div><div class='ctx'> 		if (IS_ERR(priv-&gt;rst))</div><div class='head'>diff --git a/drivers/phy/tegra/Makefile b/drivers/phy/tegra/Makefile<br/>index 898589238fd9..a93cd9a499b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/tegra/Makefile</a></div><div class='hunk'>@@ -4,3 +4,4 @@ phy-tegra-xusb-y += xusb.o</div><div class='ctx'> phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_124_SOC) += xusb-tegra124.o</div><div class='ctx'> phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_132_SOC) += xusb-tegra124.o</div><div class='ctx'> phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_210_SOC) += xusb-tegra210.o</div><div class='add'>+phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_186_SOC) += xusb-tegra186.o</div><div class='head'>diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c<br/>new file mode 100644<br/>index 000000000000..6f3afaf9398f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/xusb-tegra186.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/tegra/xusb-tegra186.c</a></div><div class='hunk'>@@ -0,0 +1,899 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.</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/io.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/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;soc/tegra/fuse.h&gt;</div><div class='add'>+</div><div class='add'>+#include "xusb.h"</div><div class='add'>+</div><div class='add'>+/* FUSE USB_CALIB registers */</div><div class='add'>+#define HS_CURR_LEVEL_PADX_SHIFT(x)	((x) ? (11 + (x - 1) * 6) : 0)</div><div class='add'>+#define HS_CURR_LEVEL_PAD_MASK		0x3f</div><div class='add'>+#define HS_TERM_RANGE_ADJ_SHIFT		7</div><div class='add'>+#define HS_TERM_RANGE_ADJ_MASK		0xf</div><div class='add'>+#define HS_SQUELCH_SHIFT		29</div><div class='add'>+#define HS_SQUELCH_MASK			0x7</div><div class='add'>+</div><div class='add'>+#define RPD_CTRL_SHIFT			0</div><div class='add'>+#define RPD_CTRL_MASK			0x1f</div><div class='add'>+</div><div class='add'>+/* XUSB PADCTL registers */</div><div class='add'>+#define XUSB_PADCTL_USB2_PAD_MUX	0x4</div><div class='add'>+#define  USB2_PORT_SHIFT(x)		((x) * 2)</div><div class='add'>+#define  USB2_PORT_MASK			0x3</div><div class='add'>+#define   PORT_XUSB			1</div><div class='add'>+#define  HSIC_PORT_SHIFT(x)		((x) + 20)</div><div class='add'>+#define  HSIC_PORT_MASK			0x1</div><div class='add'>+#define   PORT_HSIC			0</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_USB2_PORT_CAP	0x8</div><div class='add'>+#define XUSB_PADCTL_SS_PORT_CAP		0xc</div><div class='add'>+#define  PORTX_CAP_SHIFT(x)		((x) * 4)</div><div class='add'>+#define  PORT_CAP_MASK			0x3</div><div class='add'>+#define   PORT_CAP_DISABLED		0x0</div><div class='add'>+#define   PORT_CAP_HOST			0x1</div><div class='add'>+#define   PORT_CAP_DEVICE		0x2</div><div class='add'>+#define   PORT_CAP_OTG			0x3</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_ELPG_PROGRAM		0x20</div><div class='add'>+#define  USB2_PORT_WAKE_INTERRUPT_ENABLE(x)		BIT(x)</div><div class='add'>+#define  USB2_PORT_WAKEUP_EVENT(x)			BIT((x) +  7)</div><div class='add'>+#define  SS_PORT_WAKE_INTERRUPT_ENABLE(x)		BIT((x) + 14)</div><div class='add'>+#define  SS_PORT_WAKEUP_EVENT(x)			BIT((x) + 21)</div><div class='add'>+#define  USB2_HSIC_PORT_WAKE_INTERRUPT_ENABLE(x)	BIT((x) + 28)</div><div class='add'>+#define  USB2_HSIC_PORT_WAKEUP_EVENT(x)			BIT((x) + 30)</div><div class='add'>+#define  ALL_WAKE_EVENTS						\</div><div class='add'>+	(USB2_PORT_WAKEUP_EVENT(0) | USB2_PORT_WAKEUP_EVENT(1) |	\</div><div class='add'>+	USB2_PORT_WAKEUP_EVENT(2) | SS_PORT_WAKEUP_EVENT(0) |		\</div><div class='add'>+	SS_PORT_WAKEUP_EVENT(1) | SS_PORT_WAKEUP_EVENT(2) |		\</div><div class='add'>+	USB2_HSIC_PORT_WAKEUP_EVENT(0))</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_ELPG_PROGRAM_1		0x24</div><div class='add'>+#define  SSPX_ELPG_CLAMP_EN(x)			BIT(0 + (x) * 3)</div><div class='add'>+#define  SSPX_ELPG_CLAMP_EN_EARLY(x)		BIT(1 + (x) * 3)</div><div class='add'>+#define  SSPX_ELPG_VCORE_DOWN(x)		BIT(2 + (x) * 3)</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_USB2_OTG_PADX_CTL0(x)	(0x88 + (x) * 0x40)</div><div class='add'>+#define  HS_CURR_LEVEL(x)			((x) &amp; 0x3f)</div><div class='add'>+#define  TERM_SEL				BIT(25)</div><div class='add'>+#define  USB2_OTG_PD				BIT(26)</div><div class='add'>+#define  USB2_OTG_PD2				BIT(27)</div><div class='add'>+#define  USB2_OTG_PD2_OVRD_EN			BIT(28)</div><div class='add'>+#define  USB2_OTG_PD_ZI				BIT(29)</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_USB2_OTG_PADX_CTL1(x)	(0x8c + (x) * 0x40)</div><div class='add'>+#define  USB2_OTG_PD_DR				BIT(2)</div><div class='add'>+#define  TERM_RANGE_ADJ(x)			(((x) &amp; 0xf) &lt;&lt; 3)</div><div class='add'>+#define  RPD_CTRL(x)				(((x) &amp; 0x1f) &lt;&lt; 26)</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_USB2_BIAS_PAD_CTL0		0x284</div><div class='add'>+#define  BIAS_PAD_PD				BIT(11)</div><div class='add'>+#define  HS_SQUELCH_LEVEL(x)			(((x) &amp; 0x7) &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_USB2_BIAS_PAD_CTL1		0x288</div><div class='add'>+#define  USB2_TRK_START_TIMER(x)		(((x) &amp; 0x7f) &lt;&lt; 12)</div><div class='add'>+#define  USB2_TRK_DONE_RESET_TIMER(x)		(((x) &amp; 0x7f) &lt;&lt; 19)</div><div class='add'>+#define  USB2_PD_TRK				BIT(26)</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_HSIC_PADX_CTL0(x)		(0x300 + (x) * 0x20)</div><div class='add'>+#define  HSIC_PD_TX_DATA0			BIT(1)</div><div class='add'>+#define  HSIC_PD_TX_STROBE			BIT(3)</div><div class='add'>+#define  HSIC_PD_RX_DATA0			BIT(4)</div><div class='add'>+#define  HSIC_PD_RX_STROBE			BIT(6)</div><div class='add'>+#define  HSIC_PD_ZI_DATA0			BIT(7)</div><div class='add'>+#define  HSIC_PD_ZI_STROBE			BIT(9)</div><div class='add'>+#define  HSIC_RPD_DATA0				BIT(13)</div><div class='add'>+#define  HSIC_RPD_STROBE			BIT(15)</div><div class='add'>+#define  HSIC_RPU_DATA0				BIT(16)</div><div class='add'>+#define  HSIC_RPU_STROBE			BIT(18)</div><div class='add'>+</div><div class='add'>+#define XUSB_PADCTL_HSIC_PAD_TRK_CTL0		0x340</div><div class='add'>+#define  HSIC_TRK_START_TIMER(x)		(((x) &amp; 0x7f) &lt;&lt; 5)</div><div class='add'>+#define  HSIC_TRK_DONE_RESET_TIMER(x)		(((x) &amp; 0x7f) &lt;&lt; 12)</div><div class='add'>+#define  HSIC_PD_TRK				BIT(19)</div><div class='add'>+</div><div class='add'>+#define USB2_VBUS_ID				0x360</div><div class='add'>+#define  VBUS_OVERRIDE				BIT(14)</div><div class='add'>+#define  ID_OVERRIDE(x)				(((x) &amp; 0xf) &lt;&lt; 18)</div><div class='add'>+#define  ID_OVERRIDE_FLOATING			ID_OVERRIDE(8)</div><div class='add'>+#define  ID_OVERRIDE_GROUNDED			ID_OVERRIDE(0)</div><div class='add'>+</div><div class='add'>+#define TEGRA186_LANE(_name, _offset, _shift, _mask, _type)		\</div><div class='add'>+	{								\</div><div class='add'>+		.name = _name,						\</div><div class='add'>+		.offset = _offset,					\</div><div class='add'>+		.shift = _shift,					\</div><div class='add'>+		.mask = _mask,						\</div><div class='add'>+		.num_funcs = ARRAY_SIZE(tegra186_##_type##_functions),	\</div><div class='add'>+		.funcs = tegra186_##_type##_functions,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+struct tegra_xusb_fuse_calibration {</div><div class='add'>+	u32 *hs_curr_level;</div><div class='add'>+	u32 hs_squelch;</div><div class='add'>+	u32 hs_term_range_adj;</div><div class='add'>+	u32 rpd_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tegra186_xusb_padctl {</div><div class='add'>+	struct tegra_xusb_padctl base;</div><div class='add'>+</div><div class='add'>+	struct tegra_xusb_fuse_calibration calib;</div><div class='add'>+</div><div class='add'>+	/* UTMI bias and tracking */</div><div class='add'>+	struct clk *usb2_trk_clk;</div><div class='add'>+	unsigned int bias_pad_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct tegra186_xusb_padctl *</div><div class='add'>+to_tegra186_xusb_padctl(struct tegra_xusb_padctl *padctl)</div><div class='add'>+{</div><div class='add'>+	return container_of(padctl, struct tegra186_xusb_padctl, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* USB 2.0 UTMI PHY support */</div><div class='add'>+static struct tegra_xusb_lane *</div><div class='add'>+tegra186_usb2_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,</div><div class='add'>+			 unsigned int index)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb2_lane *usb2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	usb2 = kzalloc(sizeof(*usb2), GFP_KERNEL);</div><div class='add'>+	if (!usb2)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;usb2-&gt;base.list);</div><div class='add'>+	usb2-&gt;base.soc = &amp;pad-&gt;soc-&gt;lanes[index];</div><div class='add'>+	usb2-&gt;base.index = index;</div><div class='add'>+	usb2-&gt;base.pad = pad;</div><div class='add'>+	usb2-&gt;base.np = np;</div><div class='add'>+</div><div class='add'>+	err = tegra_xusb_lane_parse_dt(&amp;usb2-&gt;base, np);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(usb2);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;usb2-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra186_usb2_lane_remove(struct tegra_xusb_lane *lane)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb2_lane *usb2 = to_usb2_lane(lane);</div><div class='add'>+</div><div class='add'>+	kfree(usb2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_lane_ops tegra186_usb2_lane_ops = {</div><div class='add'>+	.probe = tegra186_usb2_lane_probe,</div><div class='add'>+	.remove = tegra186_usb2_lane_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl)</div><div class='add'>+{</div><div class='add'>+	struct tegra186_xusb_padctl *priv = to_tegra186_xusb_padctl(padctl);</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	u32 value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;padctl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;bias_pad_enable++ &gt; 0) {</div><div class='add'>+		mutex_unlock(&amp;padctl-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(priv-&gt;usb2_trk_clk);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		dev_warn(dev, "failed to enable USB2 trk clock: %d\n", err);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_BIAS_PAD_CTL1);</div><div class='add'>+	value &amp;= ~USB2_TRK_START_TIMER(~0);</div><div class='add'>+	value |= USB2_TRK_START_TIMER(0x1e);</div><div class='add'>+	value &amp;= ~USB2_TRK_DONE_RESET_TIMER(~0);</div><div class='add'>+	value |= USB2_TRK_DONE_RESET_TIMER(0xa);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_BIAS_PAD_CTL1);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_BIAS_PAD_CTL0);</div><div class='add'>+	value &amp;= ~BIAS_PAD_PD;</div><div class='add'>+	value &amp;= ~HS_SQUELCH_LEVEL(~0);</div><div class='add'>+	value |= HS_SQUELCH_LEVEL(priv-&gt;calib.hs_squelch);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_BIAS_PAD_CTL0);</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_BIAS_PAD_CTL1);</div><div class='add'>+	value &amp;= ~USB2_PD_TRK;</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_BIAS_PAD_CTL1);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;padctl-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra186_utmi_bias_pad_power_off(struct tegra_xusb_padctl *padctl)</div><div class='add'>+{</div><div class='add'>+	struct tegra186_xusb_padctl *priv = to_tegra186_xusb_padctl(padctl);</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;padctl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(priv-&gt;bias_pad_enable == 0)) {</div><div class='add'>+		mutex_unlock(&amp;padctl-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (--priv-&gt;bias_pad_enable &gt; 0) {</div><div class='add'>+		mutex_unlock(&amp;padctl-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_BIAS_PAD_CTL1);</div><div class='add'>+	value |= USB2_PD_TRK;</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_BIAS_PAD_CTL1);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;usb2_trk_clk);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;padctl-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_phy_xusb_utmi_pad_power_on(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	struct tegra_xusb_usb2_port *port;</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	port = tegra_xusb_find_usb2_port(padctl, index);</div><div class='add'>+	if (!port) {</div><div class='add'>+		dev_err(dev, "no port found for USB2 lane %u\n", index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tegra186_utmi_bias_pad_power_on(padctl);</div><div class='add'>+</div><div class='add'>+	udelay(2);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));</div><div class='add'>+	value &amp;= ~USB2_OTG_PD;</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));</div><div class='add'>+	value &amp;= ~USB2_OTG_PD_DR;</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));</div><div class='add'>+	value |= USB2_OTG_PD;</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));</div><div class='add'>+	value |= USB2_OTG_PD_DR;</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));</div><div class='add'>+</div><div class='add'>+	udelay(2);</div><div class='add'>+</div><div class='add'>+	tegra186_utmi_bias_pad_power_off(padctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra186_utmi_phy_power_on(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_usb2_lane *usb2 = to_usb2_lane(lane);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	struct tegra186_xusb_padctl *priv = to_tegra186_xusb_padctl(padctl);</div><div class='add'>+	struct tegra_xusb_usb2_port *port;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	port = tegra_xusb_find_usb2_port(padctl, index);</div><div class='add'>+	if (!port) {</div><div class='add'>+		dev_err(dev, "no port found for USB2 lane %u\n", index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_PAD_MUX);</div><div class='add'>+	value &amp;= ~(USB2_PORT_MASK &lt;&lt; USB2_PORT_SHIFT(index));</div><div class='add'>+	value |= (PORT_XUSB &lt;&lt; USB2_PORT_SHIFT(index));</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_PAD_MUX);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_PORT_CAP);</div><div class='add'>+	value &amp;= ~(PORT_CAP_MASK &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+</div><div class='add'>+	if (port-&gt;mode == USB_DR_MODE_UNKNOWN)</div><div class='add'>+		value |= (PORT_CAP_DISABLED &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+	else if (port-&gt;mode == USB_DR_MODE_PERIPHERAL)</div><div class='add'>+		value |= (PORT_CAP_DEVICE &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+	else if (port-&gt;mode == USB_DR_MODE_HOST)</div><div class='add'>+		value |= (PORT_CAP_HOST &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+	else if (port-&gt;mode == USB_DR_MODE_OTG)</div><div class='add'>+		value |= (PORT_CAP_OTG &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_PORT_CAP);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));</div><div class='add'>+	value &amp;= ~USB2_OTG_PD_ZI;</div><div class='add'>+	value |= TERM_SEL;</div><div class='add'>+	value &amp;= ~HS_CURR_LEVEL(~0);</div><div class='add'>+</div><div class='add'>+	if (usb2-&gt;hs_curr_level_offset) {</div><div class='add'>+		int hs_current_level;</div><div class='add'>+</div><div class='add'>+		hs_current_level = (int)priv-&gt;calib.hs_curr_level[index] +</div><div class='add'>+						usb2-&gt;hs_curr_level_offset;</div><div class='add'>+</div><div class='add'>+		if (hs_current_level &lt; 0)</div><div class='add'>+			hs_current_level = 0;</div><div class='add'>+		if (hs_current_level &gt; 0x3f)</div><div class='add'>+			hs_current_level = 0x3f;</div><div class='add'>+</div><div class='add'>+		value |= HS_CURR_LEVEL(hs_current_level);</div><div class='add'>+	} else {</div><div class='add'>+		value |= HS_CURR_LEVEL(priv-&gt;calib.hs_curr_level[index]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));</div><div class='add'>+	value &amp;= ~TERM_RANGE_ADJ(~0);</div><div class='add'>+	value |= TERM_RANGE_ADJ(priv-&gt;calib.hs_term_range_adj);</div><div class='add'>+	value &amp;= ~RPD_CTRL(~0);</div><div class='add'>+	value |= RPD_CTRL(priv-&gt;calib.rpd_ctrl);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));</div><div class='add'>+</div><div class='add'>+	/* TODO: pad power saving */</div><div class='add'>+	tegra_phy_xusb_utmi_pad_power_on(phy);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra186_utmi_phy_power_off(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	/* TODO: pad power saving */</div><div class='add'>+	tegra_phy_xusb_utmi_pad_power_down(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra186_utmi_phy_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	struct tegra_xusb_usb2_port *port;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port = tegra_xusb_find_usb2_port(padctl, index);</div><div class='add'>+	if (!port) {</div><div class='add'>+		dev_err(dev, "no port found for USB2 lane %u\n", index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port-&gt;supply &amp;&amp; port-&gt;mode == USB_DR_MODE_HOST) {</div><div class='add'>+		err = regulator_enable(port-&gt;supply);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "failed to enable port %u VBUS: %d\n",</div><div class='add'>+				index, 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 tegra186_utmi_phy_exit(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	struct tegra_xusb_usb2_port *port;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port = tegra_xusb_find_usb2_port(padctl, index);</div><div class='add'>+	if (!port) {</div><div class='add'>+		dev_err(dev, "no port found for USB2 lane %u\n", index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port-&gt;supply &amp;&amp; port-&gt;mode == USB_DR_MODE_HOST) {</div><div class='add'>+		err = regulator_disable(port-&gt;supply);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "failed to disable port %u VBUS: %d\n",</div><div class='add'>+				index, 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 const struct phy_ops utmi_phy_ops = {</div><div class='add'>+	.init = tegra186_utmi_phy_init,</div><div class='add'>+	.exit = tegra186_utmi_phy_exit,</div><div class='add'>+	.power_on = tegra186_utmi_phy_power_on,</div><div class='add'>+	.power_off = tegra186_utmi_phy_power_off,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tegra_xusb_pad *</div><div class='add'>+tegra186_usb2_pad_probe(struct tegra_xusb_padctl *padctl,</div><div class='add'>+			const struct tegra_xusb_pad_soc *soc,</div><div class='add'>+			struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct tegra186_xusb_padctl *priv = to_tegra186_xusb_padctl(padctl);</div><div class='add'>+	struct tegra_xusb_usb2_pad *usb2;</div><div class='add'>+	struct tegra_xusb_pad *pad;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	usb2 = kzalloc(sizeof(*usb2), GFP_KERNEL);</div><div class='add'>+	if (!usb2)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	pad = &amp;usb2-&gt;base;</div><div class='add'>+	pad-&gt;ops = &amp;tegra186_usb2_lane_ops;</div><div class='add'>+	pad-&gt;soc = soc;</div><div class='add'>+</div><div class='add'>+	err = tegra_xusb_pad_init(pad, padctl, np);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(usb2);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;usb2_trk_clk = devm_clk_get(&amp;pad-&gt;dev, "trk");</div><div class='add'>+	if (IS_ERR(priv-&gt;usb2_trk_clk)) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;usb2_trk_clk);</div><div class='add'>+		dev_dbg(&amp;pad-&gt;dev, "failed to get usb2 trk clock: %d\n", err);</div><div class='add'>+		goto unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = tegra_xusb_pad_register(pad, &amp;utmi_phy_ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto unregister;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pad-&gt;dev, pad);</div><div class='add'>+</div><div class='add'>+	return pad;</div><div class='add'>+</div><div class='add'>+unregister:</div><div class='add'>+	device_unregister(&amp;pad-&gt;dev);</div><div class='add'>+out:</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra186_usb2_pad_remove(struct tegra_xusb_pad *pad)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb2_pad *usb2 = to_usb2_pad(pad);</div><div class='add'>+</div><div class='add'>+	kfree(usb2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_pad_ops tegra186_usb2_pad_ops = {</div><div class='add'>+	.probe = tegra186_usb2_pad_probe,</div><div class='add'>+	.remove = tegra186_usb2_pad_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const tegra186_usb2_functions[] = {</div><div class='add'>+	"xusb",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_lane_soc tegra186_usb2_lanes[] = {</div><div class='add'>+	TEGRA186_LANE("usb2-0", 0,  0, 0, usb2),</div><div class='add'>+	TEGRA186_LANE("usb2-1", 0,  0, 0, usb2),</div><div class='add'>+	TEGRA186_LANE("usb2-2", 0,  0, 0, usb2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_pad_soc tegra186_usb2_pad = {</div><div class='add'>+	.name = "usb2",</div><div class='add'>+	.num_lanes = ARRAY_SIZE(tegra186_usb2_lanes),</div><div class='add'>+	.lanes = tegra186_usb2_lanes,</div><div class='add'>+	.ops = &amp;tegra186_usb2_pad_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tegra186_usb2_port_enable(struct tegra_xusb_port *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 tegra186_usb2_port_disable(struct tegra_xusb_port *port)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tegra_xusb_lane *</div><div class='add'>+tegra186_usb2_port_map(struct tegra_xusb_port *port)</div><div class='add'>+{</div><div class='add'>+	return tegra_xusb_find_lane(port-&gt;padctl, "usb2", port-&gt;index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_port_ops tegra186_usb2_port_ops = {</div><div class='add'>+	.enable = tegra186_usb2_port_enable,</div><div class='add'>+	.disable = tegra186_usb2_port_disable,</div><div class='add'>+	.map = tegra186_usb2_port_map,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SuperSpeed PHY support */</div><div class='add'>+static struct tegra_xusb_lane *</div><div class='add'>+tegra186_usb3_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,</div><div class='add'>+			 unsigned int index)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb3_lane *usb3;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	usb3 = kzalloc(sizeof(*usb3), GFP_KERNEL);</div><div class='add'>+	if (!usb3)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;usb3-&gt;base.list);</div><div class='add'>+	usb3-&gt;base.soc = &amp;pad-&gt;soc-&gt;lanes[index];</div><div class='add'>+	usb3-&gt;base.index = index;</div><div class='add'>+	usb3-&gt;base.pad = pad;</div><div class='add'>+	usb3-&gt;base.np = np;</div><div class='add'>+</div><div class='add'>+	err = tegra_xusb_lane_parse_dt(&amp;usb3-&gt;base, np);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(usb3);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;usb3-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra186_usb3_lane_remove(struct tegra_xusb_lane *lane)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb3_lane *usb3 = to_usb3_lane(lane);</div><div class='add'>+</div><div class='add'>+	kfree(usb3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_lane_ops tegra186_usb3_lane_ops = {</div><div class='add'>+	.probe = tegra186_usb3_lane_probe,</div><div class='add'>+	.remove = tegra186_usb3_lane_remove,</div><div class='add'>+};</div><div class='add'>+static int tegra186_usb3_port_enable(struct tegra_xusb_port *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 tegra186_usb3_port_disable(struct tegra_xusb_port *port)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tegra_xusb_lane *</div><div class='add'>+tegra186_usb3_port_map(struct tegra_xusb_port *port)</div><div class='add'>+{</div><div class='add'>+	return tegra_xusb_find_lane(port-&gt;padctl, "usb3", port-&gt;index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_port_ops tegra186_usb3_port_ops = {</div><div class='add'>+	.enable = tegra186_usb3_port_enable,</div><div class='add'>+	.disable = tegra186_usb3_port_disable,</div><div class='add'>+	.map = tegra186_usb3_port_map,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tegra186_usb3_phy_power_on(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	struct tegra_xusb_usb3_port *port;</div><div class='add'>+	struct tegra_xusb_usb2_port *usb2;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	port = tegra_xusb_find_usb3_port(padctl, index);</div><div class='add'>+	if (!port) {</div><div class='add'>+		dev_err(dev, "no port found for USB3 lane %u\n", index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb2 = tegra_xusb_find_usb2_port(padctl, port-&gt;port);</div><div class='add'>+	if (!usb2) {</div><div class='add'>+		dev_err(dev, "no companion port found for USB3 lane %u\n",</div><div class='add'>+			index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;padctl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_SS_PORT_CAP);</div><div class='add'>+	value &amp;= ~(PORT_CAP_MASK &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+</div><div class='add'>+	if (usb2-&gt;mode == USB_DR_MODE_UNKNOWN)</div><div class='add'>+		value |= (PORT_CAP_DISABLED &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+	else if (usb2-&gt;mode == USB_DR_MODE_PERIPHERAL)</div><div class='add'>+		value |= (PORT_CAP_DEVICE &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+	else if (usb2-&gt;mode == USB_DR_MODE_HOST)</div><div class='add'>+		value |= (PORT_CAP_HOST &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+	else if (usb2-&gt;mode == USB_DR_MODE_OTG)</div><div class='add'>+		value |= (PORT_CAP_OTG &lt;&lt; PORTX_CAP_SHIFT(index));</div><div class='add'>+</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_SS_PORT_CAP);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+	value &amp;= ~SSPX_ELPG_VCORE_DOWN(index);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+	value &amp;= ~SSPX_ELPG_CLAMP_EN_EARLY(index);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+	value &amp;= ~SSPX_ELPG_CLAMP_EN(index);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;padctl-&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 int tegra186_usb3_phy_power_off(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_lane *lane = phy_get_drvdata(phy);</div><div class='add'>+	struct tegra_xusb_padctl *padctl = lane-&gt;pad-&gt;padctl;</div><div class='add'>+	struct tegra_xusb_usb3_port *port;</div><div class='add'>+	unsigned int index = lane-&gt;index;</div><div class='add'>+	struct device *dev = padctl-&gt;dev;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	port = tegra_xusb_find_usb3_port(padctl, index);</div><div class='add'>+	if (!port) {</div><div class='add'>+		dev_err(dev, "no port found for USB3 lane %u\n", index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;padctl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+	value |= SSPX_ELPG_CLAMP_EN_EARLY(index);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+	value |= SSPX_ELPG_CLAMP_EN(index);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+</div><div class='add'>+	usleep_range(250, 350);</div><div class='add'>+</div><div class='add'>+	value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+	value |= SSPX_ELPG_VCORE_DOWN(index);</div><div class='add'>+	padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM_1);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;padctl-&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 int tegra186_usb3_phy_init(struct phy *phy)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra186_usb3_phy_exit(struct phy *phy)</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 phy_ops usb3_phy_ops = {</div><div class='add'>+	.init = tegra186_usb3_phy_init,</div><div class='add'>+	.exit = tegra186_usb3_phy_exit,</div><div class='add'>+	.power_on = tegra186_usb3_phy_power_on,</div><div class='add'>+	.power_off = tegra186_usb3_phy_power_off,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tegra_xusb_pad *</div><div class='add'>+tegra186_usb3_pad_probe(struct tegra_xusb_padctl *padctl,</div><div class='add'>+			const struct tegra_xusb_pad_soc *soc,</div><div class='add'>+			struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb3_pad *usb3;</div><div class='add'>+	struct tegra_xusb_pad *pad;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	usb3 = kzalloc(sizeof(*usb3), GFP_KERNEL);</div><div class='add'>+	if (!usb3)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	pad = &amp;usb3-&gt;base;</div><div class='add'>+	pad-&gt;ops = &amp;tegra186_usb3_lane_ops;</div><div class='add'>+	pad-&gt;soc = soc;</div><div class='add'>+</div><div class='add'>+	err = tegra_xusb_pad_init(pad, padctl, np);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(usb3);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = tegra_xusb_pad_register(pad, &amp;usb3_phy_ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto unregister;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pad-&gt;dev, pad);</div><div class='add'>+</div><div class='add'>+	return pad;</div><div class='add'>+</div><div class='add'>+unregister:</div><div class='add'>+	device_unregister(&amp;pad-&gt;dev);</div><div class='add'>+out:</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra186_usb3_pad_remove(struct tegra_xusb_pad *pad)</div><div class='add'>+{</div><div class='add'>+	struct tegra_xusb_usb2_pad *usb2 = to_usb2_pad(pad);</div><div class='add'>+</div><div class='add'>+	kfree(usb2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_pad_ops tegra186_usb3_pad_ops = {</div><div class='add'>+	.probe = tegra186_usb3_pad_probe,</div><div class='add'>+	.remove = tegra186_usb3_pad_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const tegra186_usb3_functions[] = {</div><div class='add'>+	"xusb",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_lane_soc tegra186_usb3_lanes[] = {</div><div class='add'>+	TEGRA186_LANE("usb3-0", 0,  0, 0, usb3),</div><div class='add'>+	TEGRA186_LANE("usb3-1", 0,  0, 0, usb3),</div><div class='add'>+	TEGRA186_LANE("usb3-2", 0,  0, 0, usb3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_pad_soc tegra186_usb3_pad = {</div><div class='add'>+	.name = "usb3",</div><div class='add'>+	.num_lanes = ARRAY_SIZE(tegra186_usb3_lanes),</div><div class='add'>+	.lanes = tegra186_usb3_lanes,</div><div class='add'>+	.ops = &amp;tegra186_usb3_pad_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_pad_soc * const tegra186_pads[] = {</div><div class='add'>+	&amp;tegra186_usb2_pad,</div><div class='add'>+	&amp;tegra186_usb3_pad,</div><div class='add'>+#if 0 /* TODO implement */</div><div class='add'>+	&amp;tegra186_hsic_pad,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+tegra186_xusb_read_fuse_calibration(struct tegra186_xusb_padctl *padctl)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = padctl-&gt;base.dev;</div><div class='add'>+	unsigned int i, count;</div><div class='add'>+	u32 value, *level;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	count = padctl-&gt;base.soc-&gt;ports.usb2.count;</div><div class='add'>+</div><div class='add'>+	level = devm_kcalloc(dev, count, sizeof(u32), GFP_KERNEL);</div><div class='add'>+	if (!level)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = tegra_fuse_readl(TEGRA_FUSE_SKU_CALIB_0, &amp;value);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to read calibration fuse: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "FUSE_USB_CALIB_0 %#x\n", value);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		level[i] = (value &gt;&gt; HS_CURR_LEVEL_PADX_SHIFT(i)) &amp;</div><div class='add'>+				HS_CURR_LEVEL_PAD_MASK;</div><div class='add'>+</div><div class='add'>+	padctl-&gt;calib.hs_curr_level = level;</div><div class='add'>+</div><div class='add'>+	padctl-&gt;calib.hs_squelch = (value &gt;&gt; HS_SQUELCH_SHIFT) &amp;</div><div class='add'>+					HS_SQUELCH_MASK;</div><div class='add'>+	padctl-&gt;calib.hs_term_range_adj = (value &gt;&gt; HS_TERM_RANGE_ADJ_SHIFT) &amp;</div><div class='add'>+						HS_TERM_RANGE_ADJ_MASK;</div><div class='add'>+</div><div class='add'>+	err = tegra_fuse_readl(TEGRA_FUSE_USB_CALIB_EXT_0, &amp;value);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to read calibration fuse: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "FUSE_USB_CALIB_EXT_0 %#x\n", value);</div><div class='add'>+</div><div class='add'>+	padctl-&gt;calib.rpd_ctrl = (value &gt;&gt; RPD_CTRL_SHIFT) &amp; RPD_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 struct tegra_xusb_padctl *</div><div class='add'>+tegra186_xusb_padctl_probe(struct device *dev,</div><div class='add'>+			   const struct tegra_xusb_padctl_soc *soc)</div><div class='add'>+{</div><div class='add'>+	struct tegra186_xusb_padctl *priv;</div><div class='add'>+	int err;</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 ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	priv-&gt;base.dev = dev;</div><div class='add'>+	priv-&gt;base.soc = soc;</div><div class='add'>+</div><div class='add'>+	err = tegra186_xusb_read_fuse_calibration(priv);</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 &amp;priv-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra186_xusb_padctl_remove(struct tegra_xusb_padctl *padctl)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_xusb_padctl_ops tegra186_xusb_padctl_ops = {</div><div class='add'>+	.probe = tegra186_xusb_padctl_probe,</div><div class='add'>+	.remove = tegra186_xusb_padctl_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const tegra186_xusb_padctl_supply_names[] = {</div><div class='add'>+	"avdd-pll-erefeut",</div><div class='add'>+	"avdd-usb",</div><div class='add'>+	"vclamp-usb",</div><div class='add'>+	"vddio-hsic",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct tegra_xusb_padctl_soc tegra186_xusb_padctl_soc = {</div><div class='add'>+	.num_pads = ARRAY_SIZE(tegra186_pads),</div><div class='add'>+	.pads = tegra186_pads,</div><div class='add'>+	.ports = {</div><div class='add'>+		.usb2 = {</div><div class='add'>+			.ops = &amp;tegra186_usb2_port_ops,</div><div class='add'>+			.count = 3,</div><div class='add'>+		},</div><div class='add'>+#if 0 /* TODO implement */</div><div class='add'>+		.hsic = {</div><div class='add'>+			.ops = &amp;tegra186_hsic_port_ops,</div><div class='add'>+			.count = 1,</div><div class='add'>+		},</div><div class='add'>+#endif</div><div class='add'>+		.usb3 = {</div><div class='add'>+			.ops = &amp;tegra186_usb3_port_ops,</div><div class='add'>+			.count = 3,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.ops = &amp;tegra186_xusb_padctl_ops,</div><div class='add'>+	.supply_names = tegra186_xusb_padctl_supply_names,</div><div class='add'>+	.num_supplies = ARRAY_SIZE(tegra186_xusb_padctl_supply_names),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(tegra186_xusb_padctl_soc);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("JC Kuo &lt;jckuo@nvidia.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("NVIDIA Tegra186 XUSB Pad Controller driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c<br/>index 5b3b8863363e..0417213ed68b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/xusb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/xusb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/xusb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/tegra/xusb.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.</div><div class='add'>+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms and conditions of the GNU General Public License,</div><div class='hunk'>@@ -68,6 +68,12 @@ static const struct of_device_id tegra_xusb_padctl_of_match[] = {</div><div class='ctx'> 		.data = &amp;tegra210_xusb_padctl_soc,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_ARCH_TEGRA_186_SOC)</div><div class='add'>+	{</div><div class='add'>+		.compatible = "nvidia,tegra186-xusb-padctl",</div><div class='add'>+		.data = &amp;tegra186_xusb_padctl_soc,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, tegra_xusb_padctl_of_match);</div><div class='hunk'>@@ -313,6 +319,10 @@ static void tegra_xusb_lane_program(struct tegra_xusb_lane *lane)</div><div class='ctx'> 	const struct tegra_xusb_lane_soc *soc = lane-&gt;soc;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='add'>+	/* skip single function lanes */</div><div class='add'>+	if (soc-&gt;num_funcs &lt; 2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* choose function */</div><div class='ctx'> 	value = padctl_readl(padctl, soc-&gt;offset);</div><div class='ctx'> 	value &amp;= ~(soc-&gt;mask &lt;&lt; soc-&gt;shift);</div><div class='hunk'>@@ -542,13 +552,34 @@ static void tegra_xusb_port_unregister(struct tegra_xusb_port *port)</div><div class='ctx'> 	device_unregister(&amp;port-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *const modes[] = {</div><div class='add'>+	[USB_DR_MODE_UNKNOWN] = "",</div><div class='add'>+	[USB_DR_MODE_HOST] = "host",</div><div class='add'>+	[USB_DR_MODE_PERIPHERAL] = "peripheral",</div><div class='add'>+	[USB_DR_MODE_OTG] = "otg",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int tegra_xusb_usb2_port_parse_dt(struct tegra_xusb_usb2_port *usb2)</div><div class='ctx'> {</div><div class='ctx'> 	struct tegra_xusb_port *port = &amp;usb2-&gt;base;</div><div class='ctx'> 	struct device_node *np = port-&gt;dev.of_node;</div><div class='add'>+	const char *mode;</div><div class='ctx'> </div><div class='ctx'> 	usb2-&gt;internal = of_property_read_bool(np, "nvidia,internal");</div><div class='ctx'> </div><div class='add'>+	if (!of_property_read_string(np, "mode", &amp;mode)) {</div><div class='add'>+		int err = match_string(modes, ARRAY_SIZE(modes), mode);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "invalid value %s for \"mode\"\n",</div><div class='add'>+				mode);</div><div class='add'>+			usb2-&gt;mode = USB_DR_MODE_UNKNOWN;</div><div class='add'>+		} else {</div><div class='add'>+			usb2-&gt;mode = err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		usb2-&gt;mode = USB_DR_MODE_HOST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	usb2-&gt;supply = devm_regulator_get(&amp;port-&gt;dev, "vbus");</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(usb2-&gt;supply);</div><div class='ctx'> }</div><div class='hunk'>@@ -839,6 +870,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct tegra_xusb_padctl *padctl;</div><div class='ctx'> 	const struct of_device_id *match;</div><div class='ctx'> 	struct resource *res;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* for backwards compatibility with old device trees */</div><div class='hunk'>@@ -876,14 +908,38 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	padctl-&gt;supplies = devm_kcalloc(&amp;pdev-&gt;dev, padctl-&gt;soc-&gt;num_supplies,</div><div class='add'>+					sizeof(*padctl-&gt;supplies), GFP_KERNEL);</div><div class='add'>+	if (!padctl-&gt;supplies) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; padctl-&gt;soc-&gt;num_supplies; i++)</div><div class='add'>+		padctl-&gt;supplies[i].supply = padctl-&gt;soc-&gt;supply_names[i];</div><div class='add'>+</div><div class='add'>+	err = devm_regulator_bulk_get(&amp;pdev-&gt;dev, padctl-&gt;soc-&gt;num_supplies,</div><div class='add'>+				      padctl-&gt;supplies);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to get regulators: %d\n", err);</div><div class='add'>+		goto remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = reset_control_deassert(padctl-&gt;rst);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto remove;</div><div class='ctx'> </div><div class='add'>+	err = regulator_bulk_enable(padctl-&gt;soc-&gt;num_supplies,</div><div class='add'>+				    padctl-&gt;supplies);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to enable supplies: %d\n", err);</div><div class='add'>+		goto reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = tegra_xusb_setup_pads(padctl);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to setup pads: %d\n", err);</div><div class='del'>-		goto reset;</div><div class='add'>+		goto power_down;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = tegra_xusb_setup_ports(padctl);</div><div class='hunk'>@@ -896,6 +952,8 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> remove_pads:</div><div class='ctx'> 	tegra_xusb_remove_pads(padctl);</div><div class='add'>+power_down:</div><div class='add'>+	regulator_bulk_disable(padctl-&gt;soc-&gt;num_supplies, padctl-&gt;supplies);</div><div class='ctx'> reset:</div><div class='ctx'> 	reset_control_assert(padctl-&gt;rst);</div><div class='ctx'> remove:</div><div class='hunk'>@@ -911,6 +969,11 @@ static int tegra_xusb_padctl_remove(struct platform_device *pdev)</div><div class='ctx'> 	tegra_xusb_remove_ports(padctl);</div><div class='ctx'> 	tegra_xusb_remove_pads(padctl);</div><div class='ctx'> </div><div class='add'>+	err = regulator_bulk_disable(padctl-&gt;soc-&gt;num_supplies,</div><div class='add'>+				     padctl-&gt;supplies);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to disable supplies: %d\n", err);</div><div class='add'>+</div><div class='ctx'> 	err = reset_control_assert(padctl-&gt;rst);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to assert reset: %d\n", err);</div><div class='head'>diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h<br/>index b49dbc36efa3..e0028b9fe702 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/xusb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/tegra/xusb.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/tegra/xusb.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/tegra/xusb.h</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/usb/otg.h&gt;</div><div class='add'>+</div><div class='ctx'> /* legacy entry points for backwards-compatibility */</div><div class='ctx'> int tegra_xusb_padctl_legacy_probe(struct platform_device *pdev);</div><div class='ctx'> int tegra_xusb_padctl_legacy_remove(struct platform_device *pdev);</div><div class='hunk'>@@ -54,10 +56,21 @@ struct tegra_xusb_lane {</div><div class='ctx'> int tegra_xusb_lane_parse_dt(struct tegra_xusb_lane *lane,</div><div class='ctx'> 			     struct device_node *np);</div><div class='ctx'> </div><div class='add'>+struct tegra_xusb_usb3_lane {</div><div class='add'>+	struct tegra_xusb_lane base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct tegra_xusb_usb3_lane *</div><div class='add'>+to_usb3_lane(struct tegra_xusb_lane *lane)</div><div class='add'>+{</div><div class='add'>+	return container_of(lane, struct tegra_xusb_usb3_lane, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct tegra_xusb_usb2_lane {</div><div class='ctx'> 	struct tegra_xusb_lane base;</div><div class='ctx'> </div><div class='ctx'> 	u32 hs_curr_level_offset;</div><div class='add'>+	bool powered_on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct tegra_xusb_usb2_lane *</div><div class='hunk'>@@ -168,6 +181,19 @@ int tegra_xusb_pad_register(struct tegra_xusb_pad *pad,</div><div class='ctx'> 			    const struct phy_ops *ops);</div><div class='ctx'> void tegra_xusb_pad_unregister(struct tegra_xusb_pad *pad);</div><div class='ctx'> </div><div class='add'>+struct tegra_xusb_usb3_pad {</div><div class='add'>+	struct tegra_xusb_pad base;</div><div class='add'>+</div><div class='add'>+	unsigned int enable;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct tegra_xusb_usb3_pad *</div><div class='add'>+to_usb3_pad(struct tegra_xusb_pad *pad)</div><div class='add'>+{</div><div class='add'>+	return container_of(pad, struct tegra_xusb_usb3_pad, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct tegra_xusb_usb2_pad {</div><div class='ctx'> 	struct tegra_xusb_pad base;</div><div class='ctx'> </div><div class='hunk'>@@ -271,6 +297,7 @@ struct tegra_xusb_usb2_port {</div><div class='ctx'> 	struct tegra_xusb_port base;</div><div class='ctx'> </div><div class='ctx'> 	struct regulator *supply;</div><div class='add'>+	enum usb_dr_mode mode;</div><div class='ctx'> 	bool internal;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -367,6 +394,9 @@ struct tegra_xusb_padctl_soc {</div><div class='ctx'> 	} ports;</div><div class='ctx'> </div><div class='ctx'> 	const struct tegra_xusb_padctl_ops *ops;</div><div class='add'>+</div><div class='add'>+	const char * const *supply_names;</div><div class='add'>+	unsigned int num_supplies;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tegra_xusb_padctl {</div><div class='hunk'>@@ -390,6 +420,8 @@ struct tegra_xusb_padctl {</div><div class='ctx'> 	unsigned int enable;</div><div class='ctx'> </div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	struct regulator_bulk_data *supplies;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void padctl_writel(struct tegra_xusb_padctl *padctl, u32 value,</div><div class='hunk'>@@ -417,5 +449,8 @@ extern const struct tegra_xusb_padctl_soc tegra124_xusb_padctl_soc;</div><div class='ctx'> #if defined(CONFIG_ARCH_TEGRA_210_SOC)</div><div class='ctx'> extern const struct tegra_xusb_padctl_soc tegra210_xusb_padctl_soc;</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_ARCH_TEGRA_186_SOC)</div><div class='add'>+extern const struct tegra_xusb_padctl_soc tegra186_xusb_padctl_soc;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __PHY_TEGRA_XUSB_H */</div><div class='head'>diff --git a/drivers/phy/ti/Kconfig b/drivers/phy/ti/Kconfig<br/>index 103efc456a12..781514efded3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/ti/Kconfig</a></div><div class='hunk'>@@ -20,6 +20,18 @@ config PHY_DM816X_USB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable this for dm816x USB to work.</div><div class='ctx'> </div><div class='add'>+config PHY_AM654_SERDES</div><div class='add'>+	tristate "TI AM654 SERDES support"</div><div class='add'>+	depends on OF &amp;&amp; ARCH_K3 || COMPILE_TEST</div><div class='add'>+	depends on COMMON_CLK</div><div class='add'>+	select GENERIC_PHY</div><div class='add'>+	select MULTIPLEXER</div><div class='add'>+	select REGMAP_MMIO</div><div class='add'>+	select MUX_MMIO</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for TI AM654 SerDes PHY used for</div><div class='add'>+	  PCIe.</div><div class='add'>+</div><div class='ctx'> config OMAP_CONTROL_PHY</div><div class='ctx'> 	tristate "OMAP CONTROL PHY Driver"</div><div class='ctx'> 	depends on ARCH_OMAP2PLUS || COMPILE_TEST</div><div class='hunk'>@@ -37,7 +49,7 @@ config OMAP_USB2</div><div class='ctx'> 	depends on USB_SUPPORT</div><div class='ctx'> 	select GENERIC_PHY</div><div class='ctx'> 	select USB_PHY</div><div class='del'>-	select OMAP_CONTROL_PHY if ARCH_OMAP2PLUS</div><div class='add'>+	select OMAP_CONTROL_PHY if ARCH_OMAP2PLUS || COMPILE_TEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable this to support the transceiver that is part of SOC. This</div><div class='ctx'> 	  driver takes care of all the PHY functionality apart from comparator.</div><div class='head'>diff --git a/drivers/phy/ti/Makefile b/drivers/phy/ti/Makefile<br/>index bea8f25a137a..bff901eb0ecc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/ti/Makefile</a></div><div class='hunk'>@@ -6,4 +6,5 @@ obj-$(CONFIG_OMAP_USB2)			+= phy-omap-usb2.o</div><div class='ctx'> obj-$(CONFIG_TI_PIPE3)			+= phy-ti-pipe3.o</div><div class='ctx'> obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o</div><div class='ctx'> obj-$(CONFIG_TWL4030_USB)		+= phy-twl4030-usb.o</div><div class='add'>+obj-$(CONFIG_PHY_AM654_SERDES)		+= phy-am654-serdes.o</div><div class='ctx'> obj-$(CONFIG_PHY_TI_GMII_SEL)		+= phy-gmii-sel.o</div><div class='head'>diff --git a/drivers/phy/ti/phy-am654-serdes.c b/drivers/phy/ti/phy-am654-serdes.c<br/>new file mode 100644<br/>index 000000000000..d3769200cb9b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/phy-am654-serdes.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/ti/phy-am654-serdes.c</a></div><div class='hunk'>@@ -0,0 +1,658 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/**</div><div class='add'>+ * PCIe SERDES driver for AM654x SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 - 2019 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ * Author: Kishon Vijay Abraham I &lt;kishon@ti.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.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/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/mux/consumer.h&gt;</div><div class='add'>+#include &lt;linux/of_address.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/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define CMU_R07C		0x7c</div><div class='add'>+</div><div class='add'>+#define COMLANE_R138		0xb38</div><div class='add'>+#define VERSION			0x70</div><div class='add'>+</div><div class='add'>+#define COMLANE_R190		0xb90</div><div class='add'>+</div><div class='add'>+#define COMLANE_R194		0xb94</div><div class='add'>+</div><div class='add'>+#define SERDES_CTRL		0x1fd0</div><div class='add'>+</div><div class='add'>+#define WIZ_LANEXCTL_STS	0x1fe0</div><div class='add'>+#define TX0_DISABLE_STATE	0x4</div><div class='add'>+#define TX0_SLEEP_STATE		0x5</div><div class='add'>+#define TX0_SNOOZE_STATE	0x6</div><div class='add'>+#define TX0_ENABLE_STATE	0x7</div><div class='add'>+</div><div class='add'>+#define RX0_DISABLE_STATE	0x4</div><div class='add'>+#define RX0_SLEEP_STATE		0x5</div><div class='add'>+#define RX0_SNOOZE_STATE	0x6</div><div class='add'>+#define RX0_ENABLE_STATE	0x7</div><div class='add'>+</div><div class='add'>+#define WIZ_PLL_CTRL		0x1ff4</div><div class='add'>+#define PLL_DISABLE_STATE	0x4</div><div class='add'>+#define PLL_SLEEP_STATE		0x5</div><div class='add'>+#define PLL_SNOOZE_STATE	0x6</div><div class='add'>+#define PLL_ENABLE_STATE	0x7</div><div class='add'>+</div><div class='add'>+#define PLL_LOCK_TIME		100000	/* in microseconds */</div><div class='add'>+#define SLEEP_TIME		100	/* in microseconds */</div><div class='add'>+</div><div class='add'>+#define LANE_USB3		0x0</div><div class='add'>+#define LANE_PCIE0_LANE0	0x1</div><div class='add'>+</div><div class='add'>+#define LANE_PCIE1_LANE0	0x0</div><div class='add'>+#define LANE_PCIE0_LANE1	0x1</div><div class='add'>+</div><div class='add'>+#define SERDES_NUM_CLOCKS	3</div><div class='add'>+</div><div class='add'>+#define AM654_SERDES_CTRL_CLKSEL_MASK	GENMASK(7, 4)</div><div class='add'>+#define AM654_SERDES_CTRL_CLKSEL_SHIFT	4</div><div class='add'>+</div><div class='add'>+struct serdes_am654_clk_mux {</div><div class='add'>+	struct clk_hw	hw;</div><div class='add'>+	struct regmap	*regmap;</div><div class='add'>+	unsigned int	reg;</div><div class='add'>+	int		clk_id;</div><div class='add'>+	struct clk_init_data clk_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_serdes_am654_clk_mux(_hw)	\</div><div class='add'>+		container_of(_hw, struct serdes_am654_clk_mux, hw)</div><div class='add'>+</div><div class='add'>+static struct regmap_config serdes_am654_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'>+	.fast_io = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_field cmu_master_cdn_o = REG_FIELD(CMU_R07C, 24, 24);</div><div class='add'>+static const struct reg_field config_version = REG_FIELD(COMLANE_R138, 16, 23);</div><div class='add'>+static const struct reg_field l1_master_cdn_o = REG_FIELD(COMLANE_R190, 9, 9);</div><div class='add'>+static const struct reg_field cmu_ok_i_0 = REG_FIELD(COMLANE_R194, 19, 19);</div><div class='add'>+static const struct reg_field por_en = REG_FIELD(SERDES_CTRL, 29, 29);</div><div class='add'>+static const struct reg_field tx0_enable = REG_FIELD(WIZ_LANEXCTL_STS, 29, 31);</div><div class='add'>+static const struct reg_field rx0_enable = REG_FIELD(WIZ_LANEXCTL_STS, 13, 15);</div><div class='add'>+static const struct reg_field pll_enable = REG_FIELD(WIZ_PLL_CTRL, 29, 31);</div><div class='add'>+static const struct reg_field pll_ok = REG_FIELD(WIZ_PLL_CTRL, 28, 28);</div><div class='add'>+</div><div class='add'>+struct serdes_am654 {</div><div class='add'>+	struct regmap		*regmap;</div><div class='add'>+	struct regmap_field	*cmu_master_cdn_o;</div><div class='add'>+	struct regmap_field	*config_version;</div><div class='add'>+	struct regmap_field	*l1_master_cdn_o;</div><div class='add'>+	struct regmap_field	*cmu_ok_i_0;</div><div class='add'>+	struct regmap_field	*por_en;</div><div class='add'>+	struct regmap_field	*tx0_enable;</div><div class='add'>+	struct regmap_field	*rx0_enable;</div><div class='add'>+	struct regmap_field	*pll_enable;</div><div class='add'>+	struct regmap_field	*pll_ok;</div><div class='add'>+</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	struct mux_control	*control;</div><div class='add'>+	bool			busy;</div><div class='add'>+	u32			type;</div><div class='add'>+	struct device_node	*of_node;</div><div class='add'>+	struct clk_onecell_data	clk_data;</div><div class='add'>+	struct clk		*clks[SERDES_NUM_CLOCKS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int serdes_am654_enable_pll(struct serdes_am654 *phy)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;pll_enable, PLL_ENABLE_STATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_field_read_poll_timeout(phy-&gt;pll_ok, val, val, 1000,</div><div class='add'>+					      PLL_LOCK_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void serdes_am654_disable_pll(struct serdes_am654 *phy)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = phy-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;pll_enable, PLL_DISABLE_STATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev, "Failed to disable PLL\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_am654_enable_txrx(struct serdes_am654 *phy)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Enable TX */</div><div class='add'>+	ret = regmap_field_write(phy-&gt;tx0_enable, TX0_ENABLE_STATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Enable RX */</div><div class='add'>+	ret = regmap_field_write(phy-&gt;rx0_enable, RX0_ENABLE_STATE);</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 serdes_am654_disable_txrx(struct serdes_am654 *phy)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Disable TX */</div><div class='add'>+	ret = regmap_field_write(phy-&gt;tx0_enable, TX0_DISABLE_STATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Disable RX */</div><div class='add'>+	ret = regmap_field_write(phy-&gt;rx0_enable, RX0_DISABLE_STATE);</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 serdes_am654_power_on(struct phy *x)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *phy = phy_get_drvdata(x);</div><div class='add'>+	struct device *dev = phy-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = serdes_am654_enable_pll(phy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to enable PLL\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = serdes_am654_enable_txrx(phy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to enable TX RX\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_field_read_poll_timeout(phy-&gt;cmu_ok_i_0, val, val,</div><div class='add'>+					      SLEEP_TIME, PLL_LOCK_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_am654_power_off(struct phy *x)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *phy = phy_get_drvdata(x);</div><div class='add'>+</div><div class='add'>+	serdes_am654_disable_txrx(phy);</div><div class='add'>+	serdes_am654_disable_pll(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_am654_init(struct phy *x)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *phy = phy_get_drvdata(x);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;config_version, VERSION);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;cmu_master_cdn_o, 0x1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;l1_master_cdn_o, 0x1);</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 serdes_am654_reset(struct phy *x)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *phy = phy_get_drvdata(x);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;por_en, 0x1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdelay(1);</div><div class='add'>+</div><div class='add'>+	ret = regmap_field_write(phy-&gt;por_en, 0x0);</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 serdes_am654_release(struct phy *x)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *phy = phy_get_drvdata(x);</div><div class='add'>+</div><div class='add'>+	phy-&gt;type = PHY_NONE;</div><div class='add'>+	phy-&gt;busy = false;</div><div class='add'>+	mux_control_deselect(phy-&gt;control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct phy *serdes_am654_xlate(struct device *dev, struct of_phandle_args</div><div class='add'>+				 *args)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *am654_phy;</div><div class='add'>+	struct phy *phy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	phy = of_phy_simple_xlate(dev, args);</div><div class='add'>+	if (IS_ERR(phy))</div><div class='add'>+		return phy;</div><div class='add'>+</div><div class='add'>+	am654_phy = phy_get_drvdata(phy);</div><div class='add'>+	if (am654_phy-&gt;busy)</div><div class='add'>+		return ERR_PTR(-EBUSY);</div><div class='add'>+</div><div class='add'>+	ret = mux_control_select(am654_phy-&gt;control, args-&gt;args[1]);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to select SERDES Lane Function\n");</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;busy = true;</div><div class='add'>+	am654_phy-&gt;type = args-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	return phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phy_ops ops = {</div><div class='add'>+	.reset		= serdes_am654_reset,</div><div class='add'>+	.init		= serdes_am654_init,</div><div class='add'>+	.power_on	= serdes_am654_power_on,</div><div class='add'>+	.power_off	= serdes_am654_power_off,</div><div class='add'>+	.release	= serdes_am654_release,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SERDES_NUM_MUX_COMBINATIONS 16</div><div class='add'>+</div><div class='add'>+#define LICLK 0</div><div class='add'>+#define EXT_REFCLK 1</div><div class='add'>+#define RICLK 2</div><div class='add'>+</div><div class='add'>+static const int</div><div class='add'>+serdes_am654_mux_table[SERDES_NUM_MUX_COMBINATIONS][SERDES_NUM_CLOCKS] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Each combination maps to one of</div><div class='add'>+	 * "Figure 12-1986. SerDes Reference Clock Distribution"</div><div class='add'>+	 * in TRM.</div><div class='add'>+	 */</div><div class='add'>+	 /* Parent of CMU refclk, Left output, Right output</div><div class='add'>+	  * either of EXT_REFCLK, LICLK, RICLK</div><div class='add'>+	  */</div><div class='add'>+	{ EXT_REFCLK, EXT_REFCLK, EXT_REFCLK },	/* 0000 */</div><div class='add'>+	{ RICLK, EXT_REFCLK, EXT_REFCLK },	/* 0001 */</div><div class='add'>+	{ EXT_REFCLK, RICLK, LICLK },		/* 0010 */</div><div class='add'>+	{ RICLK, RICLK, EXT_REFCLK },		/* 0011 */</div><div class='add'>+	{ LICLK, EXT_REFCLK, EXT_REFCLK },	/* 0100 */</div><div class='add'>+	{ EXT_REFCLK, EXT_REFCLK, EXT_REFCLK },	/* 0101 */</div><div class='add'>+	{ LICLK, RICLK, LICLK },		/* 0110 */</div><div class='add'>+	{ EXT_REFCLK, RICLK, LICLK },		/* 0111 */</div><div class='add'>+	{ EXT_REFCLK, EXT_REFCLK, LICLK },	/* 1000 */</div><div class='add'>+	{ RICLK, EXT_REFCLK, LICLK },		/* 1001 */</div><div class='add'>+	{ EXT_REFCLK, RICLK, EXT_REFCLK },	/* 1010 */</div><div class='add'>+	{ RICLK, RICLK, EXT_REFCLK },		/* 1011 */</div><div class='add'>+	{ LICLK, EXT_REFCLK, LICLK },		/* 1100 */</div><div class='add'>+	{ EXT_REFCLK, EXT_REFCLK, LICLK },	/* 1101 */</div><div class='add'>+	{ LICLK, RICLK, EXT_REFCLK },		/* 1110 */</div><div class='add'>+	{ EXT_REFCLK, RICLK, EXT_REFCLK },	/* 1111 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 serdes_am654_clk_mux_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654_clk_mux *mux = to_serdes_am654_clk_mux(hw);</div><div class='add'>+	struct regmap *regmap = mux-&gt;regmap;</div><div class='add'>+	unsigned int reg = mux-&gt;reg;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	regmap_read(regmap, reg, &amp;val);</div><div class='add'>+	val &amp;= AM654_SERDES_CTRL_CLKSEL_MASK;</div><div class='add'>+	val &gt;&gt;= AM654_SERDES_CTRL_CLKSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	return serdes_am654_mux_table[val][mux-&gt;clk_id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_am654_clk_mux_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654_clk_mux *mux = to_serdes_am654_clk_mux(hw);</div><div class='add'>+	struct regmap *regmap = mux-&gt;regmap;</div><div class='add'>+	unsigned int reg = mux-&gt;reg;</div><div class='add'>+	int clk_id = mux-&gt;clk_id;</div><div class='add'>+	int parents[SERDES_NUM_CLOCKS];</div><div class='add'>+	const int *p;</div><div class='add'>+	u32 val;</div><div class='add'>+	int found, i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* get existing setting */</div><div class='add'>+	regmap_read(regmap, reg, &amp;val);</div><div class='add'>+	val &amp;= AM654_SERDES_CTRL_CLKSEL_MASK;</div><div class='add'>+	val &gt;&gt;= AM654_SERDES_CTRL_CLKSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SERDES_NUM_CLOCKS; i++)</div><div class='add'>+		parents[i] = serdes_am654_mux_table[val][i];</div><div class='add'>+</div><div class='add'>+	/* change parent of this clock. others left intact */</div><div class='add'>+	parents[clk_id] = index;</div><div class='add'>+</div><div class='add'>+	/* Find the match */</div><div class='add'>+	for (val = 0; val &lt; SERDES_NUM_MUX_COMBINATIONS; val++) {</div><div class='add'>+		p = serdes_am654_mux_table[val];</div><div class='add'>+		found = 1;</div><div class='add'>+		for (i = 0; i &lt; SERDES_NUM_CLOCKS; i++) {</div><div class='add'>+			if (parents[i] != p[i]) {</div><div class='add'>+				found = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (found)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!found) {</div><div class='add'>+		/*</div><div class='add'>+		 * This can never happen, unless we missed</div><div class='add'>+		 * a valid combination in serdes_am654_mux_table.</div><div class='add'>+		 */</div><div class='add'>+		WARN(1, "Failed to find the parent of %s clock\n",</div><div class='add'>+		     hw-&gt;init-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val &lt;&lt;= AM654_SERDES_CTRL_CLKSEL_SHIFT;</div><div class='add'>+	ret = regmap_update_bits(regmap, reg, AM654_SERDES_CTRL_CLKSEL_MASK,</div><div class='add'>+				 val);</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 clk_ops serdes_am654_clk_mux_ops = {</div><div class='add'>+	.set_parent = serdes_am654_clk_mux_set_parent,</div><div class='add'>+	.get_parent = serdes_am654_clk_mux_get_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int serdes_am654_clk_register(struct serdes_am654 *am654_phy,</div><div class='add'>+				     const char *clock_name, int clock_num)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node = am654_phy-&gt;of_node;</div><div class='add'>+	struct device *dev = am654_phy-&gt;dev;</div><div class='add'>+	struct serdes_am654_clk_mux *mux;</div><div class='add'>+	struct device_node *regmap_node;</div><div class='add'>+	const char **parent_names;</div><div class='add'>+	struct clk_init_data *init;</div><div class='add'>+	unsigned int num_parents;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	const __be32 *addr;</div><div class='add'>+	unsigned int reg;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL);</div><div class='add'>+	if (!mux)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init = &amp;mux-&gt;clk_data;</div><div class='add'>+</div><div class='add'>+	regmap_node = of_parse_phandle(node, "ti,serdes-clk", 0);</div><div class='add'>+	of_node_put(regmap_node);</div><div class='add'>+	if (!regmap_node) {</div><div class='add'>+		dev_err(dev, "Fail to get serdes-clk node\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap = syscon_node_to_regmap(regmap_node-&gt;parent);</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='add'>+		dev_err(dev, "Fail to get Syscon regmap\n");</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_parents = of_clk_get_parent_count(node);</div><div class='add'>+	if (num_parents &lt; 2) {</div><div class='add'>+		dev_err(dev, "SERDES clock must have parents\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	parent_names = devm_kzalloc(dev, (sizeof(char *) * num_parents),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!parent_names)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	of_clk_parent_fill(node, parent_names, num_parents);</div><div class='add'>+</div><div class='add'>+	addr = of_get_address(regmap_node, 0, NULL, NULL);</div><div class='add'>+	if (!addr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	reg = be32_to_cpu(*addr);</div><div class='add'>+</div><div class='add'>+	init-&gt;ops = &amp;serdes_am654_clk_mux_ops;</div><div class='add'>+	init-&gt;flags = CLK_SET_RATE_NO_REPARENT;</div><div class='add'>+	init-&gt;parent_names = parent_names;</div><div class='add'>+	init-&gt;num_parents = num_parents;</div><div class='add'>+	init-&gt;name = clock_name;</div><div class='add'>+</div><div class='add'>+	mux-&gt;regmap = regmap;</div><div class='add'>+	mux-&gt;reg = reg;</div><div class='add'>+	mux-&gt;clk_id = clock_num;</div><div class='add'>+	mux-&gt;hw.init = init;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_register(dev, &amp;mux-&gt;hw);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;clks[clock_num] = clk;</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 of_device_id serdes_am654_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "ti,phy-am654-serdes",</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, serdes_am654_id_table);</div><div class='add'>+</div><div class='add'>+static int serdes_am654_regfield_init(struct serdes_am654 *am654_phy)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = am654_phy-&gt;regmap;</div><div class='add'>+	struct device *dev = am654_phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;cmu_master_cdn_o = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							      cmu_master_cdn_o);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;cmu_master_cdn_o)) {</div><div class='add'>+		dev_err(dev, "CMU_MASTER_CDN_O reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;cmu_master_cdn_o);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;config_version = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							    config_version);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;config_version)) {</div><div class='add'>+		dev_err(dev, "CONFIG_VERSION reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;config_version);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;l1_master_cdn_o = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							     l1_master_cdn_o);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;l1_master_cdn_o)) {</div><div class='add'>+		dev_err(dev, "L1_MASTER_CDN_O reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;l1_master_cdn_o);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;cmu_ok_i_0 = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							cmu_ok_i_0);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;cmu_ok_i_0)) {</div><div class='add'>+		dev_err(dev, "CMU_OK_I_0 reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;cmu_ok_i_0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;por_en = devm_regmap_field_alloc(dev, regmap, por_en);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;por_en)) {</div><div class='add'>+		dev_err(dev, "POR_EN reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;por_en);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;tx0_enable = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							tx0_enable);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;tx0_enable)) {</div><div class='add'>+		dev_err(dev, "TX0_ENABLE reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;tx0_enable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;rx0_enable = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							rx0_enable);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;rx0_enable)) {</div><div class='add'>+		dev_err(dev, "RX0_ENABLE reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;rx0_enable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;pll_enable = devm_regmap_field_alloc(dev, regmap,</div><div class='add'>+							pll_enable);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;pll_enable)) {</div><div class='add'>+		dev_err(dev, "PLL_ENABLE reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;pll_enable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;pll_ok = devm_regmap_field_alloc(dev, regmap, pll_ok);</div><div class='add'>+	if (IS_ERR(am654_phy-&gt;pll_ok)) {</div><div class='add'>+		dev_err(dev, "PLL_OK reg field init failed\n");</div><div class='add'>+		return PTR_ERR(am654_phy-&gt;pll_ok);</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 serdes_am654_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct phy_provider *phy_provider;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct device_node *node = dev-&gt;of_node;</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	struct serdes_am654 *am654_phy;</div><div class='add'>+	struct mux_control *control;</div><div class='add'>+	const char *clock_name;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct phy *phy;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	am654_phy = devm_kzalloc(dev, sizeof(*am654_phy), GFP_KERNEL);</div><div class='add'>+	if (!am654_phy)</div><div class='add'>+		return -ENOMEM;</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'>+	regmap = devm_regmap_init_mmio(dev, base, &amp;serdes_am654_regmap_config);</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='add'>+		dev_err(dev, "Failed to initialize regmap\n");</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	control = devm_mux_control_get(dev, NULL);</div><div class='add'>+	if (IS_ERR(control))</div><div class='add'>+		return PTR_ERR(control);</div><div class='add'>+</div><div class='add'>+	am654_phy-&gt;dev = dev;</div><div class='add'>+	am654_phy-&gt;of_node = node;</div><div class='add'>+	am654_phy-&gt;regmap = regmap;</div><div class='add'>+	am654_phy-&gt;control = control;</div><div class='add'>+	am654_phy-&gt;type = PHY_NONE;</div><div class='add'>+</div><div class='add'>+	ret = serdes_am654_regfield_init(am654_phy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to initialize regfields\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, am654_phy);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SERDES_NUM_CLOCKS; i++) {</div><div class='add'>+		ret = of_property_read_string_index(node, "clock-output-names",</div><div class='add'>+						    i, &amp;clock_name);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Failed to get clock name\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = serdes_am654_clk_register(am654_phy, clock_name, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Failed to initialize clock %s\n",</div><div class='add'>+				clock_name);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_data = &amp;am654_phy-&gt;clk_data;</div><div class='add'>+	clk_data-&gt;clks = am654_phy-&gt;clks;</div><div class='add'>+	clk_data-&gt;clk_num = SERDES_NUM_CLOCKS;</div><div class='add'>+	ret = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+</div><div class='add'>+	phy = devm_phy_create(dev, NULL, &amp;ops);</div><div class='add'>+	if (IS_ERR(phy))</div><div class='add'>+		return PTR_ERR(phy);</div><div class='add'>+</div><div class='add'>+	phy_set_drvdata(phy, am654_phy);</div><div class='add'>+	phy_provider = devm_of_phy_provider_register(dev, serdes_am654_xlate);</div><div class='add'>+	if (IS_ERR(phy_provider)) {</div><div class='add'>+		ret = PTR_ERR(phy_provider);</div><div class='add'>+		goto clk_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clk_err:</div><div class='add'>+	of_clk_del_provider(node);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serdes_am654_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct serdes_am654 *am654_phy = platform_get_drvdata(pdev);</div><div class='add'>+	struct device_node *node = am654_phy-&gt;of_node;</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	of_clk_del_provider(node);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver serdes_am654_driver = {</div><div class='add'>+	.probe		= serdes_am654_probe,</div><div class='add'>+	.remove		= serdes_am654_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "phy-am654",</div><div class='add'>+		.of_match_table = serdes_am654_id_table,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(serdes_am654_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Texas Instruments Inc.");</div><div class='add'>+MODULE_DESCRIPTION("TI AM654x SERDES driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/phy/ti/phy-ti-pipe3.c b/drivers/phy/ti/phy-ti-pipe3.c<br/>index 68ce4a082b9b..739aaa0eb0ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/phy-ti-pipe3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/phy-ti-pipe3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/phy-ti-pipe3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/ti/phy-ti-pipe3.c</a></div><div class='hunk'>@@ -56,51 +56,73 @@</div><div class='ctx'> </div><div class='ctx'> #define SATA_PLL_SOFT_RESET	BIT(18)</div><div class='ctx'> </div><div class='del'>-#define PIPE3_PHY_PWRCTL_CLK_CMD_MASK	0x003FC000</div><div class='add'>+#define PIPE3_PHY_PWRCTL_CLK_CMD_MASK	GENMASK(21, 14)</div><div class='ctx'> #define PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT	14</div><div class='ctx'> </div><div class='del'>-#define PIPE3_PHY_PWRCTL_CLK_FREQ_MASK	0xFFC00000</div><div class='add'>+#define PIPE3_PHY_PWRCTL_CLK_FREQ_MASK	GENMASK(31, 22)</div><div class='ctx'> #define PIPE3_PHY_PWRCTL_CLK_FREQ_SHIFT	22</div><div class='ctx'> </div><div class='del'>-#define PIPE3_PHY_TX_RX_POWERON		0x3</div><div class='del'>-#define PIPE3_PHY_TX_RX_POWEROFF	0x0</div><div class='add'>+#define PIPE3_PHY_RX_POWERON       (0x1 &lt;&lt; PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT)</div><div class='add'>+#define PIPE3_PHY_TX_POWERON       (0x2 &lt;&lt; PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define PCIE_PCS_MASK			0xFF0000</div><div class='ctx'> #define PCIE_PCS_DELAY_COUNT_SHIFT	0x10</div><div class='ctx'> </div><div class='del'>-#define PCIEPHYRX_ANA_PROGRAMMABILITY	0x0000000C</div><div class='add'>+#define PIPE3_PHY_RX_ANA_PROGRAMMABILITY	0x0000000C</div><div class='ctx'> #define INTERFACE_MASK			GENMASK(31, 27)</div><div class='ctx'> #define INTERFACE_SHIFT			27</div><div class='add'>+#define INTERFACE_MODE_USBSS		BIT(4)</div><div class='add'>+#define INTERFACE_MODE_SATA_1P5		BIT(3)</div><div class='add'>+#define INTERFACE_MODE_SATA_3P0		BIT(2)</div><div class='add'>+#define INTERFACE_MODE_PCIE		BIT(0)</div><div class='add'>+</div><div class='ctx'> #define LOSD_MASK			GENMASK(17, 14)</div><div class='ctx'> #define LOSD_SHIFT			14</div><div class='ctx'> #define MEM_PLLDIV			GENMASK(6, 5)</div><div class='ctx'> </div><div class='del'>-#define PCIEPHYRX_TRIM			0x0000001C</div><div class='del'>-#define MEM_DLL_TRIM_SEL		GENMASK(31, 30)</div><div class='add'>+#define PIPE3_PHY_RX_TRIM		0x0000001C</div><div class='add'>+#define MEM_DLL_TRIM_SEL_MASK		GENMASK(31, 30)</div><div class='ctx'> #define MEM_DLL_TRIM_SHIFT		30</div><div class='ctx'> </div><div class='del'>-#define PCIEPHYRX_DLL			0x00000024</div><div class='del'>-#define MEM_DLL_PHINT_RATE		GENMASK(31, 30)</div><div class='add'>+#define PIPE3_PHY_RX_DLL		0x00000024</div><div class='add'>+#define MEM_DLL_PHINT_RATE_MASK		GENMASK(31, 30)</div><div class='add'>+#define MEM_DLL_PHINT_RATE_SHIFT	30</div><div class='ctx'> </div><div class='del'>-#define PCIEPHYRX_DIGITAL_MODES		0x00000028</div><div class='add'>+#define PIPE3_PHY_RX_DIGITAL_MODES		0x00000028</div><div class='add'>+#define MEM_HS_RATE_MASK		GENMASK(28, 27)</div><div class='add'>+#define MEM_HS_RATE_SHIFT		27</div><div class='add'>+#define MEM_OVRD_HS_RATE		BIT(26)</div><div class='add'>+#define MEM_OVRD_HS_RATE_SHIFT		26</div><div class='ctx'> #define MEM_CDR_FASTLOCK		BIT(23)</div><div class='del'>-#define MEM_CDR_LBW			GENMASK(22, 21)</div><div class='del'>-#define MEM_CDR_STEPCNT			GENMASK(20, 19)</div><div class='add'>+#define MEM_CDR_FASTLOCK_SHIFT		23</div><div class='add'>+#define MEM_CDR_LBW_MASK		GENMASK(22, 21)</div><div class='add'>+#define MEM_CDR_LBW_SHIFT		21</div><div class='add'>+#define MEM_CDR_STEPCNT_MASK		GENMASK(20, 19)</div><div class='add'>+#define MEM_CDR_STEPCNT_SHIFT		19</div><div class='ctx'> #define MEM_CDR_STL_MASK		GENMASK(18, 16)</div><div class='ctx'> #define MEM_CDR_STL_SHIFT		16</div><div class='ctx'> #define MEM_CDR_THR_MASK		GENMASK(15, 13)</div><div class='ctx'> #define MEM_CDR_THR_SHIFT		13</div><div class='ctx'> #define MEM_CDR_THR_MODE		BIT(12)</div><div class='del'>-#define MEM_CDR_CDR_2NDO_SDM_MODE	BIT(11)</div><div class='del'>-#define MEM_OVRD_HS_RATE		BIT(26)</div><div class='del'>-</div><div class='del'>-#define PCIEPHYRX_EQUALIZER		0x00000038</div><div class='del'>-#define MEM_EQLEV			GENMASK(31, 16)</div><div class='del'>-#define MEM_EQFTC			GENMASK(15, 11)</div><div class='del'>-#define MEM_EQCTL			GENMASK(10, 7)</div><div class='add'>+#define MEM_CDR_THR_MODE_SHIFT		12</div><div class='add'>+#define MEM_CDR_2NDO_SDM_MODE		BIT(11)</div><div class='add'>+#define MEM_CDR_2NDO_SDM_MODE_SHIFT	11</div><div class='add'>+</div><div class='add'>+#define PIPE3_PHY_RX_EQUALIZER		0x00000038</div><div class='add'>+#define MEM_EQLEV_MASK			GENMASK(31, 16)</div><div class='add'>+#define MEM_EQLEV_SHIFT			16</div><div class='add'>+#define MEM_EQFTC_MASK			GENMASK(15, 11)</div><div class='add'>+#define MEM_EQFTC_SHIFT			11</div><div class='add'>+#define MEM_EQCTL_MASK			GENMASK(10, 7)</div><div class='ctx'> #define MEM_EQCTL_SHIFT			7</div><div class='ctx'> #define MEM_OVRD_EQLEV			BIT(2)</div><div class='add'>+#define MEM_OVRD_EQLEV_SHIFT		2</div><div class='ctx'> #define MEM_OVRD_EQFTC			BIT(1)</div><div class='add'>+#define MEM_OVRD_EQFTC_SHIFT		1</div><div class='add'>+</div><div class='add'>+#define SATA_PHY_RX_IO_AND_A2D_OVERRIDES	0x44</div><div class='add'>+#define MEM_CDR_LOS_SOURCE_MASK		GENMASK(10, 9)</div><div class='add'>+#define MEM_CDR_LOS_SOURCE_SHIFT	9</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is an Empirical value that works, need to confirm the actual</div><div class='hunk'>@@ -110,6 +132,10 @@</div><div class='ctx'> #define PLL_IDLE_TIME	100	/* in milliseconds */</div><div class='ctx'> #define PLL_LOCK_TIME	100	/* in milliseconds */</div><div class='ctx'> </div><div class='add'>+enum pipe3_mode { PIPE3_MODE_PCIE = 1,</div><div class='add'>+		  PIPE3_MODE_SATA,</div><div class='add'>+		  PIPE3_MODE_USBSS };</div><div class='add'>+</div><div class='ctx'> struct pipe3_dpll_params {</div><div class='ctx'> 	u16	m;</div><div class='ctx'> 	u8	n;</div><div class='hunk'>@@ -123,6 +149,27 @@ struct pipe3_dpll_map {</div><div class='ctx'> 	struct pipe3_dpll_params params;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct pipe3_settings {</div><div class='add'>+	u8 ana_interface;</div><div class='add'>+	u8 ana_losd;</div><div class='add'>+	u8 dig_fastlock;</div><div class='add'>+	u8 dig_lbw;</div><div class='add'>+	u8 dig_stepcnt;</div><div class='add'>+	u8 dig_stl;</div><div class='add'>+	u8 dig_thr;</div><div class='add'>+	u8 dig_thr_mode;</div><div class='add'>+	u8 dig_2ndo_sdm_mode;</div><div class='add'>+	u8 dig_hs_rate;</div><div class='add'>+	u8 dig_ovrd_hs_rate;</div><div class='add'>+	u8 dll_trim_sel;</div><div class='add'>+	u8 dll_phint_rate;</div><div class='add'>+	u8 eq_lev;</div><div class='add'>+	u8 eq_ftc;</div><div class='add'>+	u8 eq_ctl;</div><div class='add'>+	u8 eq_ovrd_lev;</div><div class='add'>+	u8 eq_ovrd_ftc;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ti_pipe3 {</div><div class='ctx'> 	void __iomem		*pll_ctrl_base;</div><div class='ctx'> 	void __iomem		*phy_rx;</div><div class='hunk'>@@ -141,6 +188,8 @@ struct ti_pipe3 {</div><div class='ctx'> 	unsigned int		power_reg; /* power reg. index within syscon */</div><div class='ctx'> 	unsigned int		pcie_pcs_reg; /* pcs reg. index in syscon */</div><div class='ctx'> 	bool			sata_refclk_enabled;</div><div class='add'>+	enum pipe3_mode		mode;</div><div class='add'>+	struct pipe3_settings	settings;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pipe3_dpll_map dpll_map_usb[] = {</div><div class='hunk'>@@ -163,6 +212,89 @@ static struct pipe3_dpll_map dpll_map_sata[] = {</div><div class='ctx'> 	{ },					/* Terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct pipe3_data {</div><div class='add'>+	enum pipe3_mode mode;</div><div class='add'>+	struct pipe3_dpll_map *dpll_map;</div><div class='add'>+	struct pipe3_settings settings;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pipe3_data data_usb = {</div><div class='add'>+	.mode = PIPE3_MODE_USBSS,</div><div class='add'>+	.dpll_map = dpll_map_usb,</div><div class='add'>+	.settings = {</div><div class='add'>+	/* DRA75x TRM Table 26-17 Preferred USB3_PHY_RX SCP Register Settings */</div><div class='add'>+		.ana_interface = INTERFACE_MODE_USBSS,</div><div class='add'>+		.ana_losd = 0xa,</div><div class='add'>+		.dig_fastlock = 1,</div><div class='add'>+		.dig_lbw = 3,</div><div class='add'>+		.dig_stepcnt = 0,</div><div class='add'>+		.dig_stl = 0x3,</div><div class='add'>+		.dig_thr = 1,</div><div class='add'>+		.dig_thr_mode = 1,</div><div class='add'>+		.dig_2ndo_sdm_mode = 0,</div><div class='add'>+		.dig_hs_rate = 0,</div><div class='add'>+		.dig_ovrd_hs_rate = 1,</div><div class='add'>+		.dll_trim_sel = 0x2,</div><div class='add'>+		.dll_phint_rate = 0x3,</div><div class='add'>+		.eq_lev = 0,</div><div class='add'>+		.eq_ftc = 0,</div><div class='add'>+		.eq_ctl = 0x9,</div><div class='add'>+		.eq_ovrd_lev = 0,</div><div class='add'>+		.eq_ovrd_ftc = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pipe3_data data_sata = {</div><div class='add'>+	.mode = PIPE3_MODE_SATA,</div><div class='add'>+	.dpll_map = dpll_map_sata,</div><div class='add'>+	.settings = {</div><div class='add'>+	/* DRA75x TRM Table 26-9 Preferred SATA_PHY_RX SCP Register Settings */</div><div class='add'>+		.ana_interface = INTERFACE_MODE_SATA_3P0,</div><div class='add'>+		.ana_losd = 0x5,</div><div class='add'>+		.dig_fastlock = 1,</div><div class='add'>+		.dig_lbw = 3,</div><div class='add'>+		.dig_stepcnt = 0,</div><div class='add'>+		.dig_stl = 0x3,</div><div class='add'>+		.dig_thr = 1,</div><div class='add'>+		.dig_thr_mode = 1,</div><div class='add'>+		.dig_2ndo_sdm_mode = 0,</div><div class='add'>+		.dig_hs_rate = 0,	/* Not in TRM preferred settings */</div><div class='add'>+		.dig_ovrd_hs_rate = 0,	/* Not in TRM preferred settings */</div><div class='add'>+		.dll_trim_sel = 0x1,</div><div class='add'>+		.dll_phint_rate = 0x2,	/* for 1.5 GHz DPLL clock */</div><div class='add'>+		.eq_lev = 0,</div><div class='add'>+		.eq_ftc = 0x1f,</div><div class='add'>+		.eq_ctl = 0,</div><div class='add'>+		.eq_ovrd_lev = 1,</div><div class='add'>+		.eq_ovrd_ftc = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pipe3_data data_pcie = {</div><div class='add'>+	.mode = PIPE3_MODE_PCIE,</div><div class='add'>+	.settings = {</div><div class='add'>+	/* DRA75x TRM Table 26-62 Preferred PCIe_PHY_RX SCP Register Settings */</div><div class='add'>+		.ana_interface = INTERFACE_MODE_PCIE,</div><div class='add'>+		.ana_losd = 0xa,</div><div class='add'>+		.dig_fastlock = 1,</div><div class='add'>+		.dig_lbw = 3,</div><div class='add'>+		.dig_stepcnt = 0,</div><div class='add'>+		.dig_stl = 0x3,</div><div class='add'>+		.dig_thr = 1,</div><div class='add'>+		.dig_thr_mode = 1,</div><div class='add'>+		.dig_2ndo_sdm_mode = 0,</div><div class='add'>+		.dig_hs_rate = 0,</div><div class='add'>+		.dig_ovrd_hs_rate = 0,</div><div class='add'>+		.dll_trim_sel = 0x2,</div><div class='add'>+		.dll_phint_rate = 0x3,</div><div class='add'>+		.eq_lev = 0,</div><div class='add'>+		.eq_ftc = 0x1f,</div><div class='add'>+		.eq_ctl = 1,</div><div class='add'>+		.eq_ovrd_lev = 0,</div><div class='add'>+		.eq_ovrd_ftc = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline u32 ti_pipe3_readl(void __iomem *addr, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	return __raw_readl(addr + offset);</div><div class='hunk'>@@ -196,7 +328,6 @@ static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy);</div><div class='ctx'> </div><div class='ctx'> static int ti_pipe3_power_off(struct phy *x)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ti_pipe3 *phy = phy_get_drvdata(x);</div><div class='ctx'> </div><div class='hunk'>@@ -205,13 +336,13 @@ static int ti_pipe3_power_off(struct phy *x)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	val = PIPE3_PHY_TX_RX_POWEROFF &lt;&lt; PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT;</div><div class='del'>-</div><div class='ctx'> 	ret = regmap_update_bits(phy-&gt;phy_power_syscon, phy-&gt;power_reg,</div><div class='del'>-				 PIPE3_PHY_PWRCTL_CLK_CMD_MASK, val);</div><div class='add'>+				 PIPE3_PHY_PWRCTL_CLK_CMD_MASK, 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ti_pipe3_calibrate(struct ti_pipe3 *phy);</div><div class='add'>+</div><div class='ctx'> static int ti_pipe3_power_on(struct phy *x)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -219,6 +350,7 @@ static int ti_pipe3_power_on(struct phy *x)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long rate;</div><div class='ctx'> 	struct ti_pipe3 *phy = phy_get_drvdata(x);</div><div class='add'>+	bool rx_pending = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!phy-&gt;phy_power_syscon) {</div><div class='ctx'> 		omap_control_phy_power(phy-&gt;control_dev, 1);</div><div class='hunk'>@@ -231,14 +363,35 @@ static int ti_pipe3_power_on(struct phy *x)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	rate = rate / 1000000;</div><div class='del'>-	mask = OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_MASK |</div><div class='del'>-		  OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_MASK;</div><div class='del'>-	val = PIPE3_PHY_TX_RX_POWERON &lt;&lt; PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT;</div><div class='del'>-	val |= rate &lt;&lt; OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_SHIFT;</div><div class='del'>-</div><div class='add'>+	mask = OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_MASK;</div><div class='add'>+	val = rate &lt;&lt; OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_SHIFT;</div><div class='ctx'> 	ret = regmap_update_bits(phy-&gt;phy_power_syscon, phy-&gt;power_reg,</div><div class='ctx'> 				 mask, val);</div><div class='del'>-	return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * For PCIe, TX and RX must be powered on simultaneously.</div><div class='add'>+	 * For USB and SATA, TX must be powered on before RX</div><div class='add'>+	 */</div><div class='add'>+	mask = OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_MASK;</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_SATA || phy-&gt;mode == PIPE3_MODE_USBSS) {</div><div class='add'>+		val = PIPE3_PHY_TX_POWERON;</div><div class='add'>+		rx_pending = true;</div><div class='add'>+	} else {</div><div class='add'>+		val = PIPE3_PHY_TX_POWERON | PIPE3_PHY_RX_POWERON;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(phy-&gt;phy_power_syscon, phy-&gt;power_reg,</div><div class='add'>+			   mask, val);</div><div class='add'>+</div><div class='add'>+	if (rx_pending) {</div><div class='add'>+		val = PIPE3_PHY_TX_POWERON | PIPE3_PHY_RX_POWERON;</div><div class='add'>+		regmap_update_bits(phy-&gt;phy_power_syscon, phy-&gt;power_reg,</div><div class='add'>+				   mask, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_PCIE)</div><div class='add'>+		ti_pipe3_calibrate(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ti_pipe3_dpll_wait_lock(struct ti_pipe3 *phy)</div><div class='hunk'>@@ -300,32 +453,55 @@ static int ti_pipe3_dpll_program(struct ti_pipe3 *phy)</div><div class='ctx'> static void ti_pipe3_calibrate(struct ti_pipe3 *phy)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='add'>+	struct pipe3_settings *s = &amp;phy-&gt;settings;</div><div class='ctx'> </div><div class='del'>-	val = ti_pipe3_readl(phy-&gt;phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY);</div><div class='add'>+	val = ti_pipe3_readl(phy-&gt;phy_rx, PIPE3_PHY_RX_ANA_PROGRAMMABILITY);</div><div class='ctx'> 	val &amp;= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV);</div><div class='del'>-	val = (0x1 &lt;&lt; INTERFACE_SHIFT | 0xA &lt;&lt; LOSD_SHIFT);</div><div class='del'>-	ti_pipe3_writel(phy-&gt;phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY, val);</div><div class='del'>-</div><div class='del'>-	val = ti_pipe3_readl(phy-&gt;phy_rx, PCIEPHYRX_DIGITAL_MODES);</div><div class='del'>-	val &amp;= ~(MEM_CDR_STEPCNT | MEM_CDR_STL_MASK | MEM_CDR_THR_MASK |</div><div class='del'>-		 MEM_CDR_CDR_2NDO_SDM_MODE | MEM_OVRD_HS_RATE);</div><div class='del'>-	val |= (MEM_CDR_FASTLOCK | MEM_CDR_LBW | 0x3 &lt;&lt; MEM_CDR_STL_SHIFT |</div><div class='del'>-		0x1 &lt;&lt; MEM_CDR_THR_SHIFT | MEM_CDR_THR_MODE);</div><div class='del'>-	ti_pipe3_writel(phy-&gt;phy_rx, PCIEPHYRX_DIGITAL_MODES, val);</div><div class='del'>-</div><div class='del'>-	val = ti_pipe3_readl(phy-&gt;phy_rx, PCIEPHYRX_TRIM);</div><div class='del'>-	val &amp;= ~MEM_DLL_TRIM_SEL;</div><div class='del'>-	val |= 0x2 &lt;&lt; MEM_DLL_TRIM_SHIFT;</div><div class='del'>-	ti_pipe3_writel(phy-&gt;phy_rx, PCIEPHYRX_TRIM, val);</div><div class='del'>-</div><div class='del'>-	val = ti_pipe3_readl(phy-&gt;phy_rx, PCIEPHYRX_DLL);</div><div class='del'>-	val |= MEM_DLL_PHINT_RATE;</div><div class='del'>-	ti_pipe3_writel(phy-&gt;phy_rx, PCIEPHYRX_DLL, val);</div><div class='del'>-</div><div class='del'>-	val = ti_pipe3_readl(phy-&gt;phy_rx, PCIEPHYRX_EQUALIZER);</div><div class='del'>-	val &amp;= ~(MEM_EQLEV | MEM_EQCTL | MEM_OVRD_EQLEV | MEM_OVRD_EQFTC);</div><div class='del'>-	val |= MEM_EQFTC | 0x1 &lt;&lt; MEM_EQCTL_SHIFT;</div><div class='del'>-	ti_pipe3_writel(phy-&gt;phy_rx, PCIEPHYRX_EQUALIZER, val);</div><div class='add'>+	val |= (s-&gt;ana_interface &lt;&lt; INTERFACE_SHIFT | s-&gt;ana_losd &lt;&lt; LOSD_SHIFT);</div><div class='add'>+	ti_pipe3_writel(phy-&gt;phy_rx, PIPE3_PHY_RX_ANA_PROGRAMMABILITY, val);</div><div class='add'>+</div><div class='add'>+	val = ti_pipe3_readl(phy-&gt;phy_rx, PIPE3_PHY_RX_DIGITAL_MODES);</div><div class='add'>+	val &amp;= ~(MEM_HS_RATE_MASK | MEM_OVRD_HS_RATE | MEM_CDR_FASTLOCK |</div><div class='add'>+		 MEM_CDR_LBW_MASK | MEM_CDR_STEPCNT_MASK | MEM_CDR_STL_MASK |</div><div class='add'>+		 MEM_CDR_THR_MASK | MEM_CDR_THR_MODE | MEM_CDR_2NDO_SDM_MODE);</div><div class='add'>+	val |= s-&gt;dig_hs_rate &lt;&lt; MEM_HS_RATE_SHIFT |</div><div class='add'>+		s-&gt;dig_ovrd_hs_rate &lt;&lt; MEM_OVRD_HS_RATE_SHIFT |</div><div class='add'>+		s-&gt;dig_fastlock &lt;&lt; MEM_CDR_FASTLOCK_SHIFT |</div><div class='add'>+		s-&gt;dig_lbw &lt;&lt; MEM_CDR_LBW_SHIFT |</div><div class='add'>+		s-&gt;dig_stepcnt &lt;&lt; MEM_CDR_STEPCNT_SHIFT |</div><div class='add'>+		s-&gt;dig_stl &lt;&lt; MEM_CDR_STL_SHIFT |</div><div class='add'>+		s-&gt;dig_thr &lt;&lt; MEM_CDR_THR_SHIFT |</div><div class='add'>+		s-&gt;dig_thr_mode &lt;&lt; MEM_CDR_THR_MODE_SHIFT |</div><div class='add'>+		s-&gt;dig_2ndo_sdm_mode &lt;&lt; MEM_CDR_2NDO_SDM_MODE_SHIFT;</div><div class='add'>+	ti_pipe3_writel(phy-&gt;phy_rx, PIPE3_PHY_RX_DIGITAL_MODES, val);</div><div class='add'>+</div><div class='add'>+	val = ti_pipe3_readl(phy-&gt;phy_rx, PIPE3_PHY_RX_TRIM);</div><div class='add'>+	val &amp;= ~MEM_DLL_TRIM_SEL_MASK;</div><div class='add'>+	val |= s-&gt;dll_trim_sel &lt;&lt; MEM_DLL_TRIM_SHIFT;</div><div class='add'>+	ti_pipe3_writel(phy-&gt;phy_rx, PIPE3_PHY_RX_TRIM, val);</div><div class='add'>+</div><div class='add'>+	val = ti_pipe3_readl(phy-&gt;phy_rx, PIPE3_PHY_RX_DLL);</div><div class='add'>+	val &amp;= ~MEM_DLL_PHINT_RATE_MASK;</div><div class='add'>+	val |= s-&gt;dll_phint_rate &lt;&lt; MEM_DLL_PHINT_RATE_SHIFT;</div><div class='add'>+	ti_pipe3_writel(phy-&gt;phy_rx, PIPE3_PHY_RX_DLL, val);</div><div class='add'>+</div><div class='add'>+	val = ti_pipe3_readl(phy-&gt;phy_rx, PIPE3_PHY_RX_EQUALIZER);</div><div class='add'>+	val &amp;= ~(MEM_EQLEV_MASK | MEM_EQFTC_MASK | MEM_EQCTL_MASK |</div><div class='add'>+		 MEM_OVRD_EQLEV | MEM_OVRD_EQFTC);</div><div class='add'>+	val |= s-&gt;eq_lev &lt;&lt; MEM_EQLEV_SHIFT |</div><div class='add'>+		s-&gt;eq_ftc &lt;&lt; MEM_EQFTC_SHIFT |</div><div class='add'>+		s-&gt;eq_ctl &lt;&lt; MEM_EQCTL_SHIFT |</div><div class='add'>+		s-&gt;eq_ovrd_lev &lt;&lt; MEM_OVRD_EQLEV_SHIFT |</div><div class='add'>+		s-&gt;eq_ovrd_ftc &lt;&lt; MEM_OVRD_EQFTC_SHIFT;</div><div class='add'>+	ti_pipe3_writel(phy-&gt;phy_rx, PIPE3_PHY_RX_EQUALIZER, val);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_SATA) {</div><div class='add'>+		val = ti_pipe3_readl(phy-&gt;phy_rx,</div><div class='add'>+				     SATA_PHY_RX_IO_AND_A2D_OVERRIDES);</div><div class='add'>+		val &amp;= ~MEM_CDR_LOS_SOURCE_MASK;</div><div class='add'>+		ti_pipe3_writel(phy-&gt;phy_rx, SATA_PHY_RX_IO_AND_A2D_OVERRIDES,</div><div class='add'>+				val);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ti_pipe3_init(struct phy *x)</div><div class='hunk'>@@ -340,7 +516,7 @@ static int ti_pipe3_init(struct phy *x)</div><div class='ctx'> 	 * as recommended in AM572x TRM SPRUHZ6, section 18.5.2.2, table</div><div class='ctx'> 	 * 18-1804.</div><div class='ctx'> 	 */</div><div class='del'>-	if (of_device_is_compatible(phy-&gt;dev-&gt;of_node, "ti,phy-pipe3-pcie")) {</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_PCIE) {</div><div class='ctx'> 		if (!phy-&gt;pcs_syscon) {</div><div class='ctx'> 			omap_control_pcie_pcs(phy-&gt;control_dev, 0x96);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -349,12 +525,7 @@ static int ti_pipe3_init(struct phy *x)</div><div class='ctx'> 		val = 0x96 &lt;&lt; OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT;</div><div class='ctx'> 		ret = regmap_update_bits(phy-&gt;pcs_syscon, phy-&gt;pcie_pcs_reg,</div><div class='ctx'> 					 PCIE_PCS_MASK, val);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ti_pipe3_calibrate(phy);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Bring it out of IDLE if it is IDLE */</div><div class='hunk'>@@ -367,8 +538,7 @@ static int ti_pipe3_init(struct phy *x)</div><div class='ctx'> </div><div class='ctx'> 	/* SATA has issues if re-programmed when locked */</div><div class='ctx'> 	val = ti_pipe3_readl(phy-&gt;pll_ctrl_base, PLL_STATUS);</div><div class='del'>-	if ((val &amp; PLL_LOCK) &amp;&amp; of_device_is_compatible(phy-&gt;dev-&gt;of_node,</div><div class='del'>-							"ti,phy-pipe3-sata"))</div><div class='add'>+	if ((val &amp; PLL_LOCK) &amp;&amp; phy-&gt;mode == PIPE3_MODE_SATA)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Program the DPLL */</div><div class='hunk'>@@ -378,6 +548,8 @@ static int ti_pipe3_init(struct phy *x)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ti_pipe3_calibrate(phy);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -390,12 +562,11 @@ static int ti_pipe3_exit(struct phy *x)</div><div class='ctx'> 	/* If dpll_reset_syscon is not present we wont power down SATA DPLL</div><div class='ctx'> 	 * due to Errata i783</div><div class='ctx'> 	 */</div><div class='del'>-	if (of_device_is_compatible(phy-&gt;dev-&gt;of_node, "ti,phy-pipe3-sata") &amp;&amp;</div><div class='del'>-	    !phy-&gt;dpll_reset_syscon)</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_SATA &amp;&amp; !phy-&gt;dpll_reset_syscon)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* PCIe doesn't have internal DPLL */</div><div class='del'>-	if (!of_device_is_compatible(phy-&gt;dev-&gt;of_node, "ti,phy-pipe3-pcie")) {</div><div class='add'>+	if (phy-&gt;mode != PIPE3_MODE_PCIE) {</div><div class='ctx'> 		/* Put DPLL in IDLE mode */</div><div class='ctx'> 		val = ti_pipe3_readl(phy-&gt;pll_ctrl_base, PLL_CONFIGURATION2);</div><div class='ctx'> 		val |= PLL_IDLE;</div><div class='hunk'>@@ -418,7 +589,7 @@ static int ti_pipe3_exit(struct phy *x)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* i783: SATA needs control bit toggle after PLL unlock */</div><div class='del'>-	if (of_device_is_compatible(phy-&gt;dev-&gt;of_node, "ti,phy-pipe3-sata")) {</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_SATA) {</div><div class='ctx'> 		regmap_update_bits(phy-&gt;dpll_reset_syscon, phy-&gt;dpll_reset_reg,</div><div class='ctx'> 				   SATA_PLL_SOFT_RESET, SATA_PLL_SOFT_RESET);</div><div class='ctx'> 		regmap_update_bits(phy-&gt;dpll_reset_syscon, phy-&gt;dpll_reset_reg,</div><div class='hunk'>@@ -443,7 +614,6 @@ static int ti_pipe3_get_clk(struct ti_pipe3 *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	struct device *dev = phy-&gt;dev;</div><div class='del'>-	struct device_node *node = dev-&gt;of_node;</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;refclk = devm_clk_get(dev, "refclk");</div><div class='ctx'> 	if (IS_ERR(phy-&gt;refclk)) {</div><div class='hunk'>@@ -451,11 +621,11 @@ static int ti_pipe3_get_clk(struct ti_pipe3 *phy)</div><div class='ctx'> 		/* older DTBs have missing refclk in SATA PHY</div><div class='ctx'> 		 * so don't bail out in case of SATA PHY.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!of_device_is_compatible(node, "ti,phy-pipe3-sata"))</div><div class='add'>+		if (phy-&gt;mode != PIPE3_MODE_SATA)</div><div class='ctx'> 			return PTR_ERR(phy-&gt;refclk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!of_device_is_compatible(node, "ti,phy-pipe3-sata")) {</div><div class='add'>+	if (phy-&gt;mode != PIPE3_MODE_SATA) {</div><div class='ctx'> 		phy-&gt;wkupclk = devm_clk_get(dev, "wkupclk");</div><div class='ctx'> 		if (IS_ERR(phy-&gt;wkupclk)) {</div><div class='ctx'> 			dev_err(dev, "unable to get wkupclk\n");</div><div class='hunk'>@@ -465,8 +635,7 @@ static int ti_pipe3_get_clk(struct ti_pipe3 *phy)</div><div class='ctx'> 		phy-&gt;wkupclk = ERR_PTR(-ENODEV);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!of_device_is_compatible(node, "ti,phy-pipe3-pcie") ||</div><div class='del'>-	    phy-&gt;phy_power_syscon) {</div><div class='add'>+	if (phy-&gt;mode != PIPE3_MODE_PCIE || phy-&gt;phy_power_syscon) {</div><div class='ctx'> 		phy-&gt;sys_clk = devm_clk_get(dev, "sysclk");</div><div class='ctx'> 		if (IS_ERR(phy-&gt;sys_clk)) {</div><div class='ctx'> 			dev_err(dev, "unable to get sysclk\n");</div><div class='hunk'>@@ -474,7 +643,7 @@ static int ti_pipe3_get_clk(struct ti_pipe3 *phy)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_device_is_compatible(node, "ti,phy-pipe3-pcie")) {</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_PCIE) {</div><div class='ctx'> 		clk = devm_clk_get(dev, "dpll_ref");</div><div class='ctx'> 		if (IS_ERR(clk)) {</div><div class='ctx'> 			dev_err(dev, "unable to get dpll ref clk\n");</div><div class='hunk'>@@ -546,7 +715,7 @@ static int ti_pipe3_get_sysctrl(struct ti_pipe3 *phy)</div><div class='ctx'> 		phy-&gt;control_dev = &amp;control_pdev-&gt;dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_device_is_compatible(node, "ti,phy-pipe3-pcie")) {</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_PCIE) {</div><div class='ctx'> 		phy-&gt;pcs_syscon = syscon_regmap_lookup_by_phandle(node,</div><div class='ctx'> 								  "syscon-pcs");</div><div class='ctx'> 		if (IS_ERR(phy-&gt;pcs_syscon)) {</div><div class='hunk'>@@ -564,7 +733,7 @@ static int ti_pipe3_get_sysctrl(struct ti_pipe3 *phy)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_device_is_compatible(node, "ti,phy-pipe3-sata")) {</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_SATA) {</div><div class='ctx'> 		phy-&gt;dpll_reset_syscon = syscon_regmap_lookup_by_phandle(node,</div><div class='ctx'> 							"syscon-pllreset");</div><div class='ctx'> 		if (IS_ERR(phy-&gt;dpll_reset_syscon)) {</div><div class='hunk'>@@ -589,12 +758,8 @@ static int ti_pipe3_get_tx_rx_base(struct ti_pipe3 *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct device *dev = phy-&gt;dev;</div><div class='del'>-	struct device_node *node = dev-&gt;of_node;</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> </div><div class='del'>-	if (!of_device_is_compatible(node, "ti,phy-pipe3-pcie"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,</div><div class='ctx'> 					   "phy_rx");</div><div class='ctx'> 	phy-&gt;phy_rx = devm_ioremap_resource(dev, res);</div><div class='hunk'>@@ -611,24 +776,12 @@ static int ti_pipe3_get_tx_rx_base(struct ti_pipe3 *phy)</div><div class='ctx'> static int ti_pipe3_get_pll_base(struct ti_pipe3 *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	const struct of_device_id *match;</div><div class='ctx'> 	struct device *dev = phy-&gt;dev;</div><div class='del'>-	struct device_node *node = dev-&gt;of_node;</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> </div><div class='del'>-	if (of_device_is_compatible(node, "ti,phy-pipe3-pcie"))</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_PCIE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	match = of_match_device(ti_pipe3_id_table, dev);</div><div class='del'>-	if (!match)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	phy-&gt;dpll_map = (struct pipe3_dpll_map *)match-&gt;data;</div><div class='del'>-	if (!phy-&gt;dpll_map) {</div><div class='del'>-		dev_err(dev, "no DPLL data\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,</div><div class='ctx'> 					   "pll_ctrl");</div><div class='ctx'> 	phy-&gt;pll_ctrl_base = devm_ioremap_resource(dev, res);</div><div class='hunk'>@@ -640,15 +793,29 @@ static int ti_pipe3_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct ti_pipe3 *phy;</div><div class='ctx'> 	struct phy *generic_phy;</div><div class='ctx'> 	struct phy_provider *phy_provider;</div><div class='del'>-	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	struct pipe3_data *data;</div><div class='ctx'> </div><div class='ctx'> 	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);</div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;dev		= dev;</div><div class='add'>+	match = of_match_device(ti_pipe3_id_table, dev);</div><div class='add'>+	if (!match)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data = (struct pipe3_data *)match-&gt;data;</div><div class='add'>+	if (!data) {</div><div class='add'>+		dev_err(dev, "no driver data\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;dev = dev;</div><div class='add'>+	phy-&gt;mode = data-&gt;mode;</div><div class='add'>+	phy-&gt;dpll_map = data-&gt;dpll_map;</div><div class='add'>+	phy-&gt;settings = data-&gt;settings;</div><div class='ctx'> </div><div class='ctx'> 	ret = ti_pipe3_get_pll_base(phy);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -672,7 +839,7 @@ static int ti_pipe3_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prevent auto-disable of refclk for SATA PHY due to Errata i783</div><div class='ctx'> 	 */</div><div class='del'>-	if (of_device_is_compatible(node, "ti,phy-pipe3-sata")) {</div><div class='add'>+	if (phy-&gt;mode == PIPE3_MODE_SATA) {</div><div class='ctx'> 		if (!IS_ERR(phy-&gt;refclk)) {</div><div class='ctx'> 			clk_prepare_enable(phy-&gt;refclk);</div><div class='ctx'> 			phy-&gt;sata_refclk_enabled = true;</div><div class='hunk'>@@ -762,18 +929,19 @@ static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy)</div><div class='ctx'> static const struct of_device_id ti_pipe3_id_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,phy-usb3",</div><div class='del'>-		.data = dpll_map_usb,</div><div class='add'>+		.data = &amp;data_usb,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,omap-usb3",</div><div class='del'>-		.data = dpll_map_usb,</div><div class='add'>+		.data = &amp;data_usb,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,phy-pipe3-sata",</div><div class='del'>-		.data = dpll_map_sata,</div><div class='add'>+		.data = &amp;data_sata,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "ti,phy-pipe3-pcie",</div><div class='add'>+		.data = &amp;data_pcie,</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/phy/ti/phy-twl4030-usb.c b/drivers/phy/ti/phy-twl4030-usb.c<br/>index c267afb68f07..176e16a36553 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/phy-twl4030-usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/phy/ti/phy-twl4030-usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/phy/ti/phy-twl4030-usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/phy/ti/phy-twl4030-usb.c</a></div><div class='hunk'>@@ -172,6 +172,7 @@ struct twl4030_usb {</div><div class='ctx'> </div><div class='ctx'> 	int			irq;</div><div class='ctx'> 	enum musb_vbus_id_status linkstat;</div><div class='add'>+	atomic_t		connected;</div><div class='ctx'> 	bool			vbus_supplied;</div><div class='ctx'> 	bool			musb_mailbox_pending;</div><div class='ctx'> </div><div class='hunk'>@@ -575,39 +576,29 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)</div><div class='ctx'> {</div><div class='ctx'> 	struct twl4030_usb *twl = _twl;</div><div class='ctx'> 	enum musb_vbus_id_status status;</div><div class='del'>-	bool status_changed = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	status = twl4030_usb_linkstat(twl);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;twl-&gt;lock);</div><div class='del'>-	if (status &gt;= 0 &amp;&amp; status != twl-&gt;linkstat) {</div><div class='del'>-		status_changed =</div><div class='del'>-			cable_present(twl-&gt;linkstat) !=</div><div class='del'>-			cable_present(status);</div><div class='del'>-		twl-&gt;linkstat = status;</div><div class='del'>-	}</div><div class='add'>+	twl-&gt;linkstat = status;</div><div class='ctx'> 	mutex_unlock(&amp;twl-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (status_changed) {</div><div class='del'>-		/* FIXME add a set_power() method so that B-devices can</div><div class='del'>-		 * configure the charger appropriately.  It's not always</div><div class='del'>-		 * correct to consume VBUS power, and how much current to</div><div class='del'>-		 * consume is a function of the USB configuration chosen</div><div class='del'>-		 * by the host.</div><div class='del'>-		 *</div><div class='del'>-		 * REVISIT usb_gadget_vbus_connect(...) as needed, ditto</div><div class='del'>-		 * its disconnect() sibling, when changing to/from the</div><div class='del'>-		 * USB_LINK_VBUS state.  musb_hdrc won't care until it</div><div class='del'>-		 * starts to handle softconnect right.</div><div class='del'>-		 */</div><div class='del'>-		if (cable_present(status)) {</div><div class='add'>+	if (cable_present(status)) {</div><div class='add'>+		if (atomic_add_unless(&amp;twl-&gt;connected, 1, 1)) {</div><div class='add'>+			dev_dbg(twl-&gt;dev, "%s: cable connected %i\n",</div><div class='add'>+				__func__, status);</div><div class='ctx'> 			pm_runtime_get_sync(twl-&gt;dev);</div><div class='del'>-		} else {</div><div class='add'>+			twl-&gt;musb_mailbox_pending = true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (atomic_add_unless(&amp;twl-&gt;connected, -1, 0)) {</div><div class='add'>+			dev_dbg(twl-&gt;dev, "%s: cable disconnected %i\n",</div><div class='add'>+				__func__, status);</div><div class='ctx'> 			pm_runtime_mark_last_busy(twl-&gt;dev);</div><div class='ctx'> 			pm_runtime_put_autosuspend(twl-&gt;dev);</div><div class='add'>+			twl-&gt;musb_mailbox_pending = true;</div><div class='ctx'> 		}</div><div class='del'>-		twl-&gt;musb_mailbox_pending = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (twl-&gt;musb_mailbox_pending) {</div><div class='ctx'> 		err = musb_mailbox(status);</div><div class='head'>diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig<br/>index 2764d713fea8..19d8af9a36a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/Kconfig</a></div><div class='hunk'>@@ -108,6 +108,14 @@ config PINCTRL_AMD</div><div class='ctx'> 	  Requires ACPI/FDT device enumeration code to set up a platform</div><div class='ctx'> 	  device.</div><div class='ctx'> </div><div class='add'>+config PINCTRL_BM1880</div><div class='add'>+	bool "Bitmain BM1880 Pinctrl driver"</div><div class='add'>+	depends on OF &amp;&amp; (ARCH_BITMAIN || COMPILE_TEST)</div><div class='add'>+	default ARCH_BITMAIN</div><div class='add'>+	select PINMUX</div><div class='add'>+	help</div><div class='add'>+	  Pinctrl driver for Bitmain BM1880 SoC.</div><div class='add'>+</div><div class='ctx'> config PINCTRL_DA850_PUPD</div><div class='ctx'> 	tristate "TI DA850/OMAP-L138/AM18XX pullup/pulldown groups"</div><div class='ctx'> 	depends on OF &amp;&amp; (ARCH_DAVINCI_DA850 || COMPILE_TEST)</div><div class='head'>diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile<br/>index 712184b74a5c..62df40647e02 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/Makefile</a></div><div class='hunk'>@@ -14,6 +14,7 @@ obj-$(CONFIG_PINCTRL_AXP209)	+= pinctrl-axp209.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_AT91)	+= pinctrl-at91.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_AT91PIO4)	+= pinctrl-at91-pio4.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_AMD)	+= pinctrl-amd.o</div><div class='add'>+obj-$(CONFIG_PINCTRL_BM1880)	+= pinctrl-bm1880.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_DIGICOLOR)	+= pinctrl-digicolor.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o</div><div class='head'>diff --git a/drivers/pinctrl/cirrus/Kconfig b/drivers/pinctrl/cirrus/Kconfig<br/>index 27013e5949bc..74af07e25174 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/cirrus/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/cirrus/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/cirrus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/cirrus/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,13 @@</div><div class='add'>+config PINCTRL_LOCHNAGAR</div><div class='add'>+	tristate "Cirrus Logic Lochnagar pinctrl driver"</div><div class='add'>+	depends on MFD_LOCHNAGAR</div><div class='add'>+	select PINMUX</div><div class='add'>+	select PINCONF</div><div class='add'>+	select GENERIC_PINCONF</div><div class='add'>+	help</div><div class='add'>+	  This driver supports configuring the GPIO and other pin configuration</div><div class='add'>+	  of the Cirrus Logic Lochnagar audio development board.</div><div class='add'>+</div><div class='ctx'> # This is all selected by the Madera MFD driver Kconfig options</div><div class='ctx'> config PINCTRL_MADERA</div><div class='ctx'> 	tristate</div><div class='head'>diff --git a/drivers/pinctrl/cirrus/Makefile b/drivers/pinctrl/cirrus/Makefile<br/>index 6e4938cde9e3..20baebf438f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/cirrus/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/cirrus/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/cirrus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/cirrus/Makefile</a></div><div class='hunk'>@@ -1,4 +1,6 @@</div><div class='ctx'> # Cirrus Logic pinctrl drivers</div><div class='add'>+obj-$(CONFIG_PINCTRL_LOCHNAGAR)	+= pinctrl-lochnagar.o</div><div class='add'>+</div><div class='ctx'> pinctrl-madera-objs		:= pinctrl-madera-core.o</div><div class='ctx'> ifeq ($(CONFIG_PINCTRL_CS47L35),y)</div><div class='ctx'> pinctrl-madera-objs		+= pinctrl-cs47l35.o</div><div class='head'>diff --git a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c<br/>new file mode 100644<br/>index 000000000000..670ac53a3141<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/cirrus/pinctrl-lochnagar.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/cirrus/pinctrl-lochnagar.c</a></div><div class='hunk'>@@ -0,0 +1,1235 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Lochnagar pin and GPIO control</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017-2018 Cirrus Logic, Inc. and</div><div class='add'>+ *                         Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Charles Keepax &lt;ckeepax@opensource.cirrus.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.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'>+#include &lt;linux/pinctrl/pinctrl.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinmux.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinconf.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinconf-generic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/lochnagar.h&gt;</div><div class='add'>+#include &lt;linux/mfd/lochnagar1_regs.h&gt;</div><div class='add'>+#include &lt;linux/mfd/lochnagar2_regs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/lochnagar.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../pinctrl-utils.h"</div><div class='add'>+</div><div class='add'>+#define LN2_NUM_GPIO_CHANNELS	16</div><div class='add'>+</div><div class='add'>+#define LN_CDC_AIF1_STR		"codec-aif1"</div><div class='add'>+#define LN_CDC_AIF2_STR		"codec-aif2"</div><div class='add'>+#define LN_CDC_AIF3_STR		"codec-aif3"</div><div class='add'>+#define LN_DSP_AIF1_STR		"dsp-aif1"</div><div class='add'>+#define LN_DSP_AIF2_STR		"dsp-aif2"</div><div class='add'>+#define LN_PSIA1_STR		"psia1"</div><div class='add'>+#define LN_PSIA2_STR		"psia2"</div><div class='add'>+#define LN_GF_AIF1_STR		"gf-aif1"</div><div class='add'>+#define LN_GF_AIF2_STR		"gf-aif2"</div><div class='add'>+#define LN_GF_AIF3_STR		"gf-aif3"</div><div class='add'>+#define LN_GF_AIF4_STR		"gf-aif4"</div><div class='add'>+#define LN_SPDIF_AIF_STR	"spdif-aif"</div><div class='add'>+#define LN_USB_AIF1_STR		"usb-aif1"</div><div class='add'>+#define LN_USB_AIF2_STR		"usb-aif2"</div><div class='add'>+#define LN_ADAT_AIF_STR		"adat-aif"</div><div class='add'>+#define LN_SOUNDCARD_AIF_STR	"soundcard-aif"</div><div class='add'>+</div><div class='add'>+#define LN_PIN_GPIO(REV, ID, NAME, REG, SHIFT, INVERT) \</div><div class='add'>+static const struct lochnagar_pin lochnagar##REV##_##ID##_pin = { \</div><div class='add'>+	.name = NAME, .type = LN_PTYPE_GPIO, .reg = LOCHNAGAR##REV##_##REG, \</div><div class='add'>+	.shift = LOCHNAGAR##REV##_##SHIFT##_SHIFT, .invert = INVERT, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LN_PIN_SAIF(REV, ID, NAME) \</div><div class='add'>+static const struct lochnagar_pin lochnagar##REV##_##ID##_pin = \</div><div class='add'>+	{ .name = NAME, .type = LN_PTYPE_AIF, }</div><div class='add'>+</div><div class='add'>+#define LN_PIN_AIF(REV, ID) \</div><div class='add'>+	LN_PIN_SAIF(REV, ID##_BCLK,  LN_##ID##_STR"-bclk"); \</div><div class='add'>+	LN_PIN_SAIF(REV, ID##_LRCLK, LN_##ID##_STR"-lrclk"); \</div><div class='add'>+	LN_PIN_SAIF(REV, ID##_RXDAT, LN_##ID##_STR"-rxdat"); \</div><div class='add'>+	LN_PIN_SAIF(REV, ID##_TXDAT, LN_##ID##_STR"-txdat")</div><div class='add'>+</div><div class='add'>+#define LN1_PIN_GPIO(ID, NAME, REG, SHIFT, INVERT) \</div><div class='add'>+	LN_PIN_GPIO(1, ID, NAME, REG, SHIFT, INVERT)</div><div class='add'>+</div><div class='add'>+#define LN1_PIN_MUX(ID, NAME) \</div><div class='add'>+static const struct lochnagar_pin lochnagar1_##ID##_pin = \</div><div class='add'>+	{ .name = NAME, .type = LN_PTYPE_MUX, .reg = LOCHNAGAR1_##ID, }</div><div class='add'>+</div><div class='add'>+#define LN1_PIN_AIF(ID) LN_PIN_AIF(1, ID)</div><div class='add'>+</div><div class='add'>+#define LN2_PIN_GPIO(ID, NAME, REG, SHIFT, INVERT) \</div><div class='add'>+	LN_PIN_GPIO(2, ID, NAME, REG, SHIFT, INVERT)</div><div class='add'>+</div><div class='add'>+#define LN2_PIN_MUX(ID, NAME) \</div><div class='add'>+static const struct lochnagar_pin lochnagar2_##ID##_pin = \</div><div class='add'>+	{ .name = NAME, .type = LN_PTYPE_MUX, .reg = LOCHNAGAR2_GPIO_##ID, }</div><div class='add'>+</div><div class='add'>+#define LN2_PIN_AIF(ID) LN_PIN_AIF(2, ID)</div><div class='add'>+</div><div class='add'>+#define LN2_PIN_GAI(ID) \</div><div class='add'>+	LN2_PIN_MUX(ID##_BCLK,  LN_##ID##_STR"-bclk"); \</div><div class='add'>+	LN2_PIN_MUX(ID##_LRCLK, LN_##ID##_STR"-lrclk"); \</div><div class='add'>+	LN2_PIN_MUX(ID##_RXDAT, LN_##ID##_STR"-rxdat"); \</div><div class='add'>+	LN2_PIN_MUX(ID##_TXDAT, LN_##ID##_STR"-txdat")</div><div class='add'>+</div><div class='add'>+#define LN_PIN(REV, ID) [LOCHNAGAR##REV##_PIN_##ID] = { \</div><div class='add'>+	.number = LOCHNAGAR##REV##_PIN_##ID, \</div><div class='add'>+	.name = lochnagar##REV##_##ID##_pin.name, \</div><div class='add'>+	.drv_data = (void *)&amp;lochnagar##REV##_##ID##_pin, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LN1_PIN(ID) LN_PIN(1, ID)</div><div class='add'>+#define LN2_PIN(ID) LN_PIN(2, ID)</div><div class='add'>+</div><div class='add'>+#define LN_PINS(REV, ID) \</div><div class='add'>+	LN_PIN(REV, ID##_BCLK), LN_PIN(REV, ID##_LRCLK), \</div><div class='add'>+	LN_PIN(REV, ID##_RXDAT), LN_PIN(REV, ID##_TXDAT)</div><div class='add'>+</div><div class='add'>+#define LN1_PINS(ID) LN_PINS(1, ID)</div><div class='add'>+#define LN2_PINS(ID) LN_PINS(2, ID)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	LOCHNAGAR1_PIN_GF_GPIO2 = LOCHNAGAR1_PIN_NUM_GPIOS,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_GPIO3,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_GPIO7,</div><div class='add'>+	LOCHNAGAR1_PIN_LED1,</div><div class='add'>+	LOCHNAGAR1_PIN_LED2,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF1_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF1_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF1_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF1_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF2_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF2_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF2_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF2_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF3_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF3_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF3_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_CDC_AIF3_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF1_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF1_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF1_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF1_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF2_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF2_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF2_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_DSP_AIF2_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA1_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA1_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA1_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA1_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA2_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA2_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA2_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_PSIA2_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_SPDIF_AIF_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_SPDIF_AIF_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_SPDIF_AIF_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_SPDIF_AIF_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF3_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF3_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF3_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF3_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF4_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF4_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF4_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF4_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF1_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF1_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF1_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF1_TXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF2_BCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF2_RXDAT,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF2_LRCLK,</div><div class='add'>+	LOCHNAGAR1_PIN_GF_AIF2_TXDAT,</div><div class='add'>+</div><div class='add'>+	LOCHNAGAR2_PIN_SPDIF_AIF_BCLK = LOCHNAGAR2_PIN_NUM_GPIOS,</div><div class='add'>+	LOCHNAGAR2_PIN_SPDIF_AIF_LRCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_SPDIF_AIF_RXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_SPDIF_AIF_TXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF1_BCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF1_LRCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF1_RXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF1_TXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF2_BCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF2_LRCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF2_RXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_USB_AIF2_TXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_ADAT_AIF_BCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_ADAT_AIF_LRCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_ADAT_AIF_RXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_ADAT_AIF_TXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_SOUNDCARD_AIF_BCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_SOUNDCARD_AIF_LRCLK,</div><div class='add'>+	LOCHNAGAR2_PIN_SOUNDCARD_AIF_RXDAT,</div><div class='add'>+	LOCHNAGAR2_PIN_SOUNDCARD_AIF_TXDAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum lochnagar_pin_type {</div><div class='add'>+	LN_PTYPE_GPIO,</div><div class='add'>+	LN_PTYPE_MUX,</div><div class='add'>+	LN_PTYPE_AIF,</div><div class='add'>+	LN_PTYPE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lochnagar_pin {</div><div class='add'>+	const char name[20];</div><div class='add'>+</div><div class='add'>+	enum lochnagar_pin_type type;</div><div class='add'>+</div><div class='add'>+	unsigned int reg;</div><div class='add'>+	int shift;</div><div class='add'>+	bool invert;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+LN1_PIN_GPIO(CDC_RESET,    "codec-reset",    RST,      CDC_RESET,    1);</div><div class='add'>+LN1_PIN_GPIO(DSP_RESET,    "dsp-reset",      RST,      DSP_RESET,    1);</div><div class='add'>+LN1_PIN_GPIO(CDC_CIF1MODE, "codec-cif1mode", I2C_CTRL, CDC_CIF_MODE, 0);</div><div class='add'>+LN1_PIN_MUX(GF_GPIO2,      "gf-gpio2");</div><div class='add'>+LN1_PIN_MUX(GF_GPIO3,      "gf-gpio3");</div><div class='add'>+LN1_PIN_MUX(GF_GPIO7,      "gf-gpio7");</div><div class='add'>+LN1_PIN_MUX(LED1,          "led1");</div><div class='add'>+LN1_PIN_MUX(LED2,          "led2");</div><div class='add'>+LN1_PIN_AIF(CDC_AIF1);</div><div class='add'>+LN1_PIN_AIF(CDC_AIF2);</div><div class='add'>+LN1_PIN_AIF(CDC_AIF3);</div><div class='add'>+LN1_PIN_AIF(DSP_AIF1);</div><div class='add'>+LN1_PIN_AIF(DSP_AIF2);</div><div class='add'>+LN1_PIN_AIF(PSIA1);</div><div class='add'>+LN1_PIN_AIF(PSIA2);</div><div class='add'>+LN1_PIN_AIF(SPDIF_AIF);</div><div class='add'>+LN1_PIN_AIF(GF_AIF1);</div><div class='add'>+LN1_PIN_AIF(GF_AIF2);</div><div class='add'>+LN1_PIN_AIF(GF_AIF3);</div><div class='add'>+LN1_PIN_AIF(GF_AIF4);</div><div class='add'>+</div><div class='add'>+LN2_PIN_GPIO(CDC_RESET,    "codec-reset",    MINICARD_RESETS, CDC_RESET,     1);</div><div class='add'>+LN2_PIN_GPIO(DSP_RESET,    "dsp-reset",      MINICARD_RESETS, DSP_RESET,     1);</div><div class='add'>+LN2_PIN_GPIO(CDC_CIF1MODE, "codec-cif1mode", COMMS_CTRL4,     CDC_CIF1MODE,  0);</div><div class='add'>+LN2_PIN_GPIO(CDC_LDOENA,   "codec-ldoena",   POWER_CTRL,      PWR_ENA,       0);</div><div class='add'>+LN2_PIN_GPIO(SPDIF_HWMODE, "spdif-hwmode",   SPDIF_CTRL,      SPDIF_HWMODE,  0);</div><div class='add'>+LN2_PIN_GPIO(SPDIF_RESET,  "spdif-reset",    SPDIF_CTRL,      SPDIF_RESET,   1);</div><div class='add'>+LN2_PIN_MUX(FPGA_GPIO1,    "fpga-gpio1");</div><div class='add'>+LN2_PIN_MUX(FPGA_GPIO2,    "fpga-gpio2");</div><div class='add'>+LN2_PIN_MUX(FPGA_GPIO3,    "fpga-gpio3");</div><div class='add'>+LN2_PIN_MUX(FPGA_GPIO4,    "fpga-gpio4");</div><div class='add'>+LN2_PIN_MUX(FPGA_GPIO5,    "fpga-gpio5");</div><div class='add'>+LN2_PIN_MUX(FPGA_GPIO6,    "fpga-gpio6");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO1,     "codec-gpio1");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO2,     "codec-gpio2");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO3,     "codec-gpio3");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO4,     "codec-gpio4");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO5,     "codec-gpio5");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO6,     "codec-gpio6");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO7,     "codec-gpio7");</div><div class='add'>+LN2_PIN_MUX(CDC_GPIO8,     "codec-gpio8");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO1,     "dsp-gpio1");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO2,     "dsp-gpio2");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO3,     "dsp-gpio3");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO4,     "dsp-gpio4");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO5,     "dsp-gpio5");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO6,     "dsp-gpio6");</div><div class='add'>+LN2_PIN_MUX(GF_GPIO2,      "gf-gpio2");</div><div class='add'>+LN2_PIN_MUX(GF_GPIO3,      "gf-gpio3");</div><div class='add'>+LN2_PIN_MUX(GF_GPIO7,      "gf-gpio7");</div><div class='add'>+LN2_PIN_MUX(DSP_UART1_RX,  "dsp-uart1-rx");</div><div class='add'>+LN2_PIN_MUX(DSP_UART1_TX,  "dsp-uart1-tx");</div><div class='add'>+LN2_PIN_MUX(DSP_UART2_RX,  "dsp-uart2-rx");</div><div class='add'>+LN2_PIN_MUX(DSP_UART2_TX,  "dsp-uart2-tx");</div><div class='add'>+LN2_PIN_MUX(GF_UART2_RX,   "gf-uart2-rx");</div><div class='add'>+LN2_PIN_MUX(GF_UART2_TX,   "gf-uart2-tx");</div><div class='add'>+LN2_PIN_MUX(USB_UART_RX,   "usb-uart-rx");</div><div class='add'>+LN2_PIN_MUX(CDC_PDMCLK1,   "codec-pdmclk1");</div><div class='add'>+LN2_PIN_MUX(CDC_PDMDAT1,   "codec-pdmdat1");</div><div class='add'>+LN2_PIN_MUX(CDC_PDMCLK2,   "codec-pdmclk2");</div><div class='add'>+LN2_PIN_MUX(CDC_PDMDAT2,   "codec-pdmdat2");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICCLK1,  "codec-dmicclk1");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICDAT1,  "codec-dmicdat1");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICCLK2,  "codec-dmicclk2");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICDAT2,  "codec-dmicdat2");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICCLK3,  "codec-dmicclk3");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICDAT3,  "codec-dmicdat3");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICCLK4,  "codec-dmicclk4");</div><div class='add'>+LN2_PIN_MUX(CDC_DMICDAT4,  "codec-dmicdat4");</div><div class='add'>+LN2_PIN_MUX(DSP_DMICCLK1,  "dsp-dmicclk1");</div><div class='add'>+LN2_PIN_MUX(DSP_DMICDAT1,  "dsp-dmicdat1");</div><div class='add'>+LN2_PIN_MUX(DSP_DMICCLK2,  "dsp-dmicclk2");</div><div class='add'>+LN2_PIN_MUX(DSP_DMICDAT2,  "dsp-dmicdat2");</div><div class='add'>+LN2_PIN_MUX(I2C2_SCL,      "i2c2-scl");</div><div class='add'>+LN2_PIN_MUX(I2C2_SDA,      "i2c2-sda");</div><div class='add'>+LN2_PIN_MUX(I2C3_SCL,      "i2c3-scl");</div><div class='add'>+LN2_PIN_MUX(I2C3_SDA,      "i2c3-sda");</div><div class='add'>+LN2_PIN_MUX(I2C4_SCL,      "i2c4-scl");</div><div class='add'>+LN2_PIN_MUX(I2C4_SDA,      "i2c4-sda");</div><div class='add'>+LN2_PIN_MUX(DSP_STANDBY,   "dsp-standby");</div><div class='add'>+LN2_PIN_MUX(CDC_MCLK1,     "codec-mclk1");</div><div class='add'>+LN2_PIN_MUX(CDC_MCLK2,     "codec-mclk2");</div><div class='add'>+LN2_PIN_MUX(DSP_CLKIN,     "dsp-clkin");</div><div class='add'>+LN2_PIN_MUX(PSIA1_MCLK,    "psia1-mclk");</div><div class='add'>+LN2_PIN_MUX(PSIA2_MCLK,    "psia2-mclk");</div><div class='add'>+LN2_PIN_MUX(GF_GPIO1,      "gf-gpio1");</div><div class='add'>+LN2_PIN_MUX(GF_GPIO5,      "gf-gpio5");</div><div class='add'>+LN2_PIN_MUX(DSP_GPIO20,    "dsp-gpio20");</div><div class='add'>+LN2_PIN_GAI(CDC_AIF1);</div><div class='add'>+LN2_PIN_GAI(CDC_AIF2);</div><div class='add'>+LN2_PIN_GAI(CDC_AIF3);</div><div class='add'>+LN2_PIN_GAI(DSP_AIF1);</div><div class='add'>+LN2_PIN_GAI(DSP_AIF2);</div><div class='add'>+LN2_PIN_GAI(PSIA1);</div><div class='add'>+LN2_PIN_GAI(PSIA2);</div><div class='add'>+LN2_PIN_GAI(GF_AIF1);</div><div class='add'>+LN2_PIN_GAI(GF_AIF2);</div><div class='add'>+LN2_PIN_GAI(GF_AIF3);</div><div class='add'>+LN2_PIN_GAI(GF_AIF4);</div><div class='add'>+LN2_PIN_AIF(SPDIF_AIF);</div><div class='add'>+LN2_PIN_AIF(USB_AIF1);</div><div class='add'>+LN2_PIN_AIF(USB_AIF2);</div><div class='add'>+LN2_PIN_AIF(ADAT_AIF);</div><div class='add'>+LN2_PIN_AIF(SOUNDCARD_AIF);</div><div class='add'>+</div><div class='add'>+static const struct pinctrl_pin_desc lochnagar1_pins[] = {</div><div class='add'>+	LN1_PIN(CDC_RESET),      LN1_PIN(DSP_RESET),    LN1_PIN(CDC_CIF1MODE),</div><div class='add'>+	LN1_PIN(GF_GPIO2),       LN1_PIN(GF_GPIO3),     LN1_PIN(GF_GPIO7),</div><div class='add'>+	LN1_PIN(LED1),           LN1_PIN(LED2),</div><div class='add'>+	LN1_PINS(CDC_AIF1),      LN1_PINS(CDC_AIF2),    LN1_PINS(CDC_AIF3),</div><div class='add'>+	LN1_PINS(DSP_AIF1),      LN1_PINS(DSP_AIF2),</div><div class='add'>+	LN1_PINS(PSIA1),         LN1_PINS(PSIA2),</div><div class='add'>+	LN1_PINS(SPDIF_AIF),</div><div class='add'>+	LN1_PINS(GF_AIF1),       LN1_PINS(GF_AIF2),</div><div class='add'>+	LN1_PINS(GF_AIF3),       LN1_PINS(GF_AIF4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct pinctrl_pin_desc lochnagar2_pins[] = {</div><div class='add'>+	LN2_PIN(CDC_RESET),      LN2_PIN(DSP_RESET),    LN2_PIN(CDC_CIF1MODE),</div><div class='add'>+	LN2_PIN(CDC_LDOENA),</div><div class='add'>+	LN2_PIN(SPDIF_HWMODE),   LN2_PIN(SPDIF_RESET),</div><div class='add'>+	LN2_PIN(FPGA_GPIO1),     LN2_PIN(FPGA_GPIO2),   LN2_PIN(FPGA_GPIO3),</div><div class='add'>+	LN2_PIN(FPGA_GPIO4),     LN2_PIN(FPGA_GPIO5),   LN2_PIN(FPGA_GPIO6),</div><div class='add'>+	LN2_PIN(CDC_GPIO1),      LN2_PIN(CDC_GPIO2),    LN2_PIN(CDC_GPIO3),</div><div class='add'>+	LN2_PIN(CDC_GPIO4),      LN2_PIN(CDC_GPIO5),    LN2_PIN(CDC_GPIO6),</div><div class='add'>+	LN2_PIN(CDC_GPIO7),      LN2_PIN(CDC_GPIO8),</div><div class='add'>+	LN2_PIN(DSP_GPIO1),      LN2_PIN(DSP_GPIO2),    LN2_PIN(DSP_GPIO3),</div><div class='add'>+	LN2_PIN(DSP_GPIO4),      LN2_PIN(DSP_GPIO5),    LN2_PIN(DSP_GPIO6),</div><div class='add'>+	LN2_PIN(DSP_GPIO20),</div><div class='add'>+	LN2_PIN(GF_GPIO1),       LN2_PIN(GF_GPIO2),     LN2_PIN(GF_GPIO3),</div><div class='add'>+	LN2_PIN(GF_GPIO5),       LN2_PIN(GF_GPIO7),</div><div class='add'>+	LN2_PINS(CDC_AIF1),      LN2_PINS(CDC_AIF2),    LN2_PINS(CDC_AIF3),</div><div class='add'>+	LN2_PINS(DSP_AIF1),      LN2_PINS(DSP_AIF2),</div><div class='add'>+	LN2_PINS(PSIA1),         LN2_PINS(PSIA2),</div><div class='add'>+	LN2_PINS(GF_AIF1),       LN2_PINS(GF_AIF2),</div><div class='add'>+	LN2_PINS(GF_AIF3),       LN2_PINS(GF_AIF4),</div><div class='add'>+	LN2_PIN(DSP_UART1_RX),   LN2_PIN(DSP_UART1_TX),</div><div class='add'>+	LN2_PIN(DSP_UART2_RX),   LN2_PIN(DSP_UART2_TX),</div><div class='add'>+	LN2_PIN(GF_UART2_RX),    LN2_PIN(GF_UART2_TX),</div><div class='add'>+	LN2_PIN(USB_UART_RX),</div><div class='add'>+	LN2_PIN(CDC_PDMCLK1),    LN2_PIN(CDC_PDMDAT1),</div><div class='add'>+	LN2_PIN(CDC_PDMCLK2),    LN2_PIN(CDC_PDMDAT2),</div><div class='add'>+	LN2_PIN(CDC_DMICCLK1),   LN2_PIN(CDC_DMICDAT1),</div><div class='add'>+	LN2_PIN(CDC_DMICCLK2),   LN2_PIN(CDC_DMICDAT2),</div><div class='add'>+	LN2_PIN(CDC_DMICCLK3),   LN2_PIN(CDC_DMICDAT3),</div><div class='add'>+	LN2_PIN(CDC_DMICCLK4),   LN2_PIN(CDC_DMICDAT4),</div><div class='add'>+	LN2_PIN(DSP_DMICCLK1),   LN2_PIN(DSP_DMICDAT1),</div><div class='add'>+	LN2_PIN(DSP_DMICCLK2),   LN2_PIN(DSP_DMICDAT2),</div><div class='add'>+	LN2_PIN(I2C2_SCL),       LN2_PIN(I2C2_SDA),</div><div class='add'>+	LN2_PIN(I2C3_SCL),       LN2_PIN(I2C3_SDA),</div><div class='add'>+	LN2_PIN(I2C4_SCL),       LN2_PIN(I2C4_SDA),</div><div class='add'>+	LN2_PIN(DSP_STANDBY),</div><div class='add'>+	LN2_PIN(CDC_MCLK1),      LN2_PIN(CDC_MCLK2),</div><div class='add'>+	LN2_PIN(DSP_CLKIN),</div><div class='add'>+	LN2_PIN(PSIA1_MCLK),     LN2_PIN(PSIA2_MCLK),</div><div class='add'>+	LN2_PINS(SPDIF_AIF),</div><div class='add'>+	LN2_PINS(USB_AIF1),      LN2_PINS(USB_AIF2),</div><div class='add'>+	LN2_PINS(ADAT_AIF),</div><div class='add'>+	LN2_PINS(SOUNDCARD_AIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LN_AIF_PINS(REV, ID) \</div><div class='add'>+	LOCHNAGAR##REV##_PIN_##ID##_BCLK, \</div><div class='add'>+	LOCHNAGAR##REV##_PIN_##ID##_LRCLK, \</div><div class='add'>+	LOCHNAGAR##REV##_PIN_##ID##_TXDAT, \</div><div class='add'>+	LOCHNAGAR##REV##_PIN_##ID##_RXDAT,</div><div class='add'>+</div><div class='add'>+#define LN1_AIF(ID, CTRL) \</div><div class='add'>+static const struct lochnagar_aif lochnagar1_##ID##_aif = { \</div><div class='add'>+	.name = LN_##ID##_STR, \</div><div class='add'>+	.pins = { LN_AIF_PINS(1, ID) }, \</div><div class='add'>+	.src_reg = LOCHNAGAR1_##ID##_SEL, \</div><div class='add'>+	.src_mask = LOCHNAGAR1_SRC_MASK, \</div><div class='add'>+	.ctrl_reg = LOCHNAGAR1_##CTRL, \</div><div class='add'>+	.ena_mask = LOCHNAGAR1_##ID##_ENA_MASK, \</div><div class='add'>+	.master_mask = LOCHNAGAR1_##ID##_LRCLK_DIR_MASK | \</div><div class='add'>+		       LOCHNAGAR1_##ID##_BCLK_DIR_MASK, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LN2_AIF(ID) \</div><div class='add'>+static const struct lochnagar_aif lochnagar2_##ID##_aif = { \</div><div class='add'>+	.name = LN_##ID##_STR, \</div><div class='add'>+	.pins = { LN_AIF_PINS(2, ID) }, \</div><div class='add'>+	.src_reg = LOCHNAGAR2_##ID##_CTRL,  \</div><div class='add'>+	.src_mask = LOCHNAGAR2_AIF_SRC_MASK, \</div><div class='add'>+	.ctrl_reg = LOCHNAGAR2_##ID##_CTRL, \</div><div class='add'>+	.ena_mask = LOCHNAGAR2_AIF_ENA_MASK, \</div><div class='add'>+	.master_mask = LOCHNAGAR2_AIF_LRCLK_DIR_MASK | \</div><div class='add'>+		       LOCHNAGAR2_AIF_BCLK_DIR_MASK, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct lochnagar_aif {</div><div class='add'>+	const char name[16];</div><div class='add'>+</div><div class='add'>+	unsigned int pins[4];</div><div class='add'>+</div><div class='add'>+	u16 src_reg;</div><div class='add'>+	u16 src_mask;</div><div class='add'>+</div><div class='add'>+	u16 ctrl_reg;</div><div class='add'>+	u16 ena_mask;</div><div class='add'>+	u16 master_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+LN1_AIF(CDC_AIF1,      CDC_AIF_CTRL1);</div><div class='add'>+LN1_AIF(CDC_AIF2,      CDC_AIF_CTRL1);</div><div class='add'>+LN1_AIF(CDC_AIF3,      CDC_AIF_CTRL2);</div><div class='add'>+LN1_AIF(DSP_AIF1,      DSP_AIF);</div><div class='add'>+LN1_AIF(DSP_AIF2,      DSP_AIF);</div><div class='add'>+LN1_AIF(PSIA1,         PSIA_AIF);</div><div class='add'>+LN1_AIF(PSIA2,         PSIA_AIF);</div><div class='add'>+LN1_AIF(GF_AIF1,       GF_AIF1);</div><div class='add'>+LN1_AIF(GF_AIF2,       GF_AIF2);</div><div class='add'>+LN1_AIF(GF_AIF3,       GF_AIF1);</div><div class='add'>+LN1_AIF(GF_AIF4,       GF_AIF2);</div><div class='add'>+LN1_AIF(SPDIF_AIF,     EXT_AIF_CTRL);</div><div class='add'>+</div><div class='add'>+LN2_AIF(CDC_AIF1);</div><div class='add'>+LN2_AIF(CDC_AIF2);</div><div class='add'>+LN2_AIF(CDC_AIF3);</div><div class='add'>+LN2_AIF(DSP_AIF1);</div><div class='add'>+LN2_AIF(DSP_AIF2);</div><div class='add'>+LN2_AIF(PSIA1);</div><div class='add'>+LN2_AIF(PSIA2);</div><div class='add'>+LN2_AIF(GF_AIF1);</div><div class='add'>+LN2_AIF(GF_AIF2);</div><div class='add'>+LN2_AIF(GF_AIF3);</div><div class='add'>+LN2_AIF(GF_AIF4);</div><div class='add'>+LN2_AIF(SPDIF_AIF);</div><div class='add'>+LN2_AIF(USB_AIF1);</div><div class='add'>+LN2_AIF(USB_AIF2);</div><div class='add'>+LN2_AIF(ADAT_AIF);</div><div class='add'>+LN2_AIF(SOUNDCARD_AIF);</div><div class='add'>+</div><div class='add'>+#define LN2_OP_AIF	0x00</div><div class='add'>+#define LN2_OP_GPIO	0xFE</div><div class='add'>+</div><div class='add'>+#define LN_FUNC(NAME, TYPE, OP) \</div><div class='add'>+	{ .name = NAME, .type = LN_FTYPE_##TYPE, .op = OP }</div><div class='add'>+</div><div class='add'>+#define LN_FUNC_PIN(REV, ID, OP) \</div><div class='add'>+	LN_FUNC(lochnagar##REV##_##ID##_pin.name, PIN, OP)</div><div class='add'>+</div><div class='add'>+#define LN1_FUNC_PIN(ID, OP) LN_FUNC_PIN(1, ID, OP)</div><div class='add'>+#define LN2_FUNC_PIN(ID, OP) LN_FUNC_PIN(2, ID, OP)</div><div class='add'>+</div><div class='add'>+#define LN_FUNC_AIF(REV, ID, OP) \</div><div class='add'>+	LN_FUNC(lochnagar##REV##_##ID##_aif.name, AIF, OP)</div><div class='add'>+</div><div class='add'>+#define LN1_FUNC_AIF(ID, OP) LN_FUNC_AIF(1, ID, OP)</div><div class='add'>+#define LN2_FUNC_AIF(ID, OP) LN_FUNC_AIF(2, ID, OP)</div><div class='add'>+</div><div class='add'>+#define LN2_FUNC_GAI(ID, OP, BOP, LROP, RXOP, TXOP) \</div><div class='add'>+	LN2_FUNC_AIF(ID, OP), \</div><div class='add'>+	LN_FUNC(lochnagar2_##ID##_BCLK_pin.name, PIN, BOP), \</div><div class='add'>+	LN_FUNC(lochnagar2_##ID##_LRCLK_pin.name, PIN, LROP), \</div><div class='add'>+	LN_FUNC(lochnagar2_##ID##_RXDAT_pin.name, PIN, RXOP), \</div><div class='add'>+	LN_FUNC(lochnagar2_##ID##_TXDAT_pin.name, PIN, TXOP)</div><div class='add'>+</div><div class='add'>+enum lochnagar_func_type {</div><div class='add'>+	LN_FTYPE_PIN,</div><div class='add'>+	LN_FTYPE_AIF,</div><div class='add'>+	LN_FTYPE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lochnagar_func {</div><div class='add'>+	const char * const name;</div><div class='add'>+</div><div class='add'>+	enum lochnagar_func_type type;</div><div class='add'>+</div><div class='add'>+	u8 op;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct lochnagar_func lochnagar1_funcs[] = {</div><div class='add'>+	LN_FUNC("dsp-gpio1",       PIN, 0x01),</div><div class='add'>+	LN_FUNC("dsp-gpio2",       PIN, 0x02),</div><div class='add'>+	LN_FUNC("dsp-gpio3",       PIN, 0x03),</div><div class='add'>+	LN_FUNC("codec-gpio1",     PIN, 0x04),</div><div class='add'>+	LN_FUNC("codec-gpio2",     PIN, 0x05),</div><div class='add'>+	LN_FUNC("codec-gpio3",     PIN, 0x06),</div><div class='add'>+	LN_FUNC("codec-gpio4",     PIN, 0x07),</div><div class='add'>+	LN_FUNC("codec-gpio5",     PIN, 0x08),</div><div class='add'>+	LN_FUNC("codec-gpio6",     PIN, 0x09),</div><div class='add'>+	LN_FUNC("codec-gpio7",     PIN, 0x0A),</div><div class='add'>+	LN_FUNC("codec-gpio8",     PIN, 0x0B),</div><div class='add'>+	LN1_FUNC_PIN(GF_GPIO2,          0x0C),</div><div class='add'>+	LN1_FUNC_PIN(GF_GPIO3,          0x0D),</div><div class='add'>+	LN1_FUNC_PIN(GF_GPIO7,          0x0E),</div><div class='add'>+</div><div class='add'>+	LN1_FUNC_AIF(SPDIF_AIF,         0x01),</div><div class='add'>+	LN1_FUNC_AIF(PSIA1,             0x02),</div><div class='add'>+	LN1_FUNC_AIF(PSIA2,             0x03),</div><div class='add'>+	LN1_FUNC_AIF(CDC_AIF1,          0x04),</div><div class='add'>+	LN1_FUNC_AIF(CDC_AIF2,          0x05),</div><div class='add'>+	LN1_FUNC_AIF(CDC_AIF3,          0x06),</div><div class='add'>+	LN1_FUNC_AIF(DSP_AIF1,          0x07),</div><div class='add'>+	LN1_FUNC_AIF(DSP_AIF2,          0x08),</div><div class='add'>+	LN1_FUNC_AIF(GF_AIF3,           0x09),</div><div class='add'>+	LN1_FUNC_AIF(GF_AIF4,           0x0A),</div><div class='add'>+	LN1_FUNC_AIF(GF_AIF1,           0x0B),</div><div class='add'>+	LN1_FUNC_AIF(GF_AIF2,           0x0C),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct lochnagar_func lochnagar2_funcs[] = {</div><div class='add'>+	LN_FUNC("aif",             PIN, LN2_OP_AIF),</div><div class='add'>+	LN2_FUNC_PIN(FPGA_GPIO1,        0x01),</div><div class='add'>+	LN2_FUNC_PIN(FPGA_GPIO2,        0x02),</div><div class='add'>+	LN2_FUNC_PIN(FPGA_GPIO3,        0x03),</div><div class='add'>+	LN2_FUNC_PIN(FPGA_GPIO4,        0x04),</div><div class='add'>+	LN2_FUNC_PIN(FPGA_GPIO5,        0x05),</div><div class='add'>+	LN2_FUNC_PIN(FPGA_GPIO6,        0x06),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO1,         0x07),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO2,         0x08),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO3,         0x09),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO4,         0x0A),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO5,         0x0B),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO6,         0x0C),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO7,         0x0D),</div><div class='add'>+	LN2_FUNC_PIN(CDC_GPIO8,         0x0E),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO1,         0x0F),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO2,         0x10),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO3,         0x11),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO4,         0x12),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO5,         0x13),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO6,         0x14),</div><div class='add'>+	LN2_FUNC_PIN(GF_GPIO2,          0x15),</div><div class='add'>+	LN2_FUNC_PIN(GF_GPIO3,          0x16),</div><div class='add'>+	LN2_FUNC_PIN(GF_GPIO7,          0x17),</div><div class='add'>+	LN2_FUNC_PIN(GF_GPIO1,          0x18),</div><div class='add'>+	LN2_FUNC_PIN(GF_GPIO5,          0x19),</div><div class='add'>+	LN2_FUNC_PIN(DSP_GPIO20,        0x1A),</div><div class='add'>+	LN_FUNC("codec-clkout",    PIN, 0x20),</div><div class='add'>+	LN_FUNC("dsp-clkout",      PIN, 0x21),</div><div class='add'>+	LN_FUNC("pmic-32k",        PIN, 0x22),</div><div class='add'>+	LN_FUNC("spdif-clkout",    PIN, 0x23),</div><div class='add'>+	LN_FUNC("clk-12m288",      PIN, 0x24),</div><div class='add'>+	LN_FUNC("clk-11m2986",     PIN, 0x25),</div><div class='add'>+	LN_FUNC("clk-24m576",      PIN, 0x26),</div><div class='add'>+	LN_FUNC("clk-22m5792",     PIN, 0x27),</div><div class='add'>+	LN_FUNC("xmos-mclk",       PIN, 0x29),</div><div class='add'>+	LN_FUNC("gf-clkout1",      PIN, 0x2A),</div><div class='add'>+	LN_FUNC("gf-mclk1",        PIN, 0x2B),</div><div class='add'>+	LN_FUNC("gf-mclk3",        PIN, 0x2C),</div><div class='add'>+	LN_FUNC("gf-mclk2",        PIN, 0x2D),</div><div class='add'>+	LN_FUNC("gf-clkout2",      PIN, 0x2E),</div><div class='add'>+	LN2_FUNC_PIN(CDC_MCLK1,         0x2F),</div><div class='add'>+	LN2_FUNC_PIN(CDC_MCLK2,         0x30),</div><div class='add'>+	LN2_FUNC_PIN(DSP_CLKIN,         0x31),</div><div class='add'>+	LN2_FUNC_PIN(PSIA1_MCLK,        0x32),</div><div class='add'>+	LN2_FUNC_PIN(PSIA2_MCLK,        0x33),</div><div class='add'>+	LN_FUNC("spdif-mclk",      PIN, 0x34),</div><div class='add'>+	LN_FUNC("codec-irq",       PIN, 0x42),</div><div class='add'>+	LN2_FUNC_PIN(CDC_RESET,         0x43),</div><div class='add'>+	LN2_FUNC_PIN(DSP_RESET,         0x44),</div><div class='add'>+	LN_FUNC("dsp-irq",         PIN, 0x45),</div><div class='add'>+	LN2_FUNC_PIN(DSP_STANDBY,       0x46),</div><div class='add'>+	LN2_FUNC_PIN(CDC_PDMCLK1,       0x90),</div><div class='add'>+	LN2_FUNC_PIN(CDC_PDMDAT1,       0x91),</div><div class='add'>+	LN2_FUNC_PIN(CDC_PDMCLK2,       0x92),</div><div class='add'>+	LN2_FUNC_PIN(CDC_PDMDAT2,       0x93),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICCLK1,      0xA0),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICDAT1,      0xA1),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICCLK2,      0xA2),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICDAT2,      0xA3),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICCLK3,      0xA4),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICDAT3,      0xA5),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICCLK4,      0xA6),</div><div class='add'>+	LN2_FUNC_PIN(CDC_DMICDAT4,      0xA7),</div><div class='add'>+	LN2_FUNC_PIN(DSP_DMICCLK1,      0xA8),</div><div class='add'>+	LN2_FUNC_PIN(DSP_DMICDAT1,      0xA9),</div><div class='add'>+	LN2_FUNC_PIN(DSP_DMICCLK2,      0xAA),</div><div class='add'>+	LN2_FUNC_PIN(DSP_DMICDAT2,      0xAB),</div><div class='add'>+	LN2_FUNC_PIN(DSP_UART1_RX,      0xC0),</div><div class='add'>+	LN2_FUNC_PIN(DSP_UART1_TX,      0xC1),</div><div class='add'>+	LN2_FUNC_PIN(DSP_UART2_RX,      0xC2),</div><div class='add'>+	LN2_FUNC_PIN(DSP_UART2_TX,      0xC3),</div><div class='add'>+	LN2_FUNC_PIN(GF_UART2_RX,       0xC4),</div><div class='add'>+	LN2_FUNC_PIN(GF_UART2_TX,       0xC5),</div><div class='add'>+	LN2_FUNC_PIN(USB_UART_RX,       0xC6),</div><div class='add'>+	LN_FUNC("usb-uart-tx",     PIN, 0xC7),</div><div class='add'>+	LN2_FUNC_PIN(I2C2_SCL,          0xE0),</div><div class='add'>+	LN2_FUNC_PIN(I2C2_SDA,          0xE1),</div><div class='add'>+	LN2_FUNC_PIN(I2C3_SCL,          0xE2),</div><div class='add'>+	LN2_FUNC_PIN(I2C3_SDA,          0xE3),</div><div class='add'>+	LN2_FUNC_PIN(I2C4_SCL,          0xE4),</div><div class='add'>+	LN2_FUNC_PIN(I2C4_SDA,          0xE5),</div><div class='add'>+</div><div class='add'>+	LN2_FUNC_AIF(SPDIF_AIF,         0x01),</div><div class='add'>+	LN2_FUNC_GAI(PSIA1,             0x02, 0x50, 0x51, 0x52, 0x53),</div><div class='add'>+	LN2_FUNC_GAI(PSIA2,             0x03, 0x54, 0x55, 0x56, 0x57),</div><div class='add'>+	LN2_FUNC_GAI(CDC_AIF1,          0x04, 0x59, 0x5B, 0x5A, 0x58),</div><div class='add'>+	LN2_FUNC_GAI(CDC_AIF2,          0x05, 0x5D, 0x5F, 0x5E, 0x5C),</div><div class='add'>+	LN2_FUNC_GAI(CDC_AIF3,          0x06, 0x61, 0x62, 0x63, 0x60),</div><div class='add'>+	LN2_FUNC_GAI(DSP_AIF1,          0x07, 0x65, 0x67, 0x66, 0x64),</div><div class='add'>+	LN2_FUNC_GAI(DSP_AIF2,          0x08, 0x69, 0x6B, 0x6A, 0x68),</div><div class='add'>+	LN2_FUNC_GAI(GF_AIF3,           0x09, 0x6D, 0x6F, 0x6C, 0x6E),</div><div class='add'>+	LN2_FUNC_GAI(GF_AIF4,           0x0A, 0x71, 0x73, 0x70, 0x72),</div><div class='add'>+	LN2_FUNC_GAI(GF_AIF1,           0x0B, 0x75, 0x77, 0x74, 0x76),</div><div class='add'>+	LN2_FUNC_GAI(GF_AIF2,           0x0C, 0x79, 0x7B, 0x78, 0x7A),</div><div class='add'>+	LN2_FUNC_AIF(USB_AIF1,          0x0D),</div><div class='add'>+	LN2_FUNC_AIF(USB_AIF2,          0x0E),</div><div class='add'>+	LN2_FUNC_AIF(ADAT_AIF,          0x0F),</div><div class='add'>+	LN2_FUNC_AIF(SOUNDCARD_AIF,     0x10),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LN_GROUP_PIN(REV, ID) { \</div><div class='add'>+	.name = lochnagar##REV##_##ID##_pin.name, \</div><div class='add'>+	.type = LN_FTYPE_PIN, \</div><div class='add'>+	.pins = &amp;lochnagar##REV##_pins[LOCHNAGAR##REV##_PIN_##ID].number, \</div><div class='add'>+	.npins = 1, \</div><div class='add'>+	.priv = &amp;lochnagar##REV##_pins[LOCHNAGAR##REV##_PIN_##ID], \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LN_GROUP_AIF(REV, ID) { \</div><div class='add'>+	.name = lochnagar##REV##_##ID##_aif.name, \</div><div class='add'>+	.type = LN_FTYPE_AIF, \</div><div class='add'>+	.pins = lochnagar##REV##_##ID##_aif.pins, \</div><div class='add'>+	.npins = ARRAY_SIZE(lochnagar##REV##_##ID##_aif.pins), \</div><div class='add'>+	.priv = &amp;lochnagar##REV##_##ID##_aif, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LN1_GROUP_PIN(ID) LN_GROUP_PIN(1, ID)</div><div class='add'>+#define LN2_GROUP_PIN(ID) LN_GROUP_PIN(2, ID)</div><div class='add'>+</div><div class='add'>+#define LN1_GROUP_AIF(ID) LN_GROUP_AIF(1, ID)</div><div class='add'>+#define LN2_GROUP_AIF(ID) LN_GROUP_AIF(2, ID)</div><div class='add'>+</div><div class='add'>+#define LN2_GROUP_GAI(ID) \</div><div class='add'>+	LN2_GROUP_AIF(ID), \</div><div class='add'>+	LN2_GROUP_PIN(ID##_BCLK), LN2_GROUP_PIN(ID##_LRCLK), \</div><div class='add'>+	LN2_GROUP_PIN(ID##_RXDAT), LN2_GROUP_PIN(ID##_TXDAT)</div><div class='add'>+</div><div class='add'>+struct lochnagar_group {</div><div class='add'>+	const char * const name;</div><div class='add'>+</div><div class='add'>+	enum lochnagar_func_type type;</div><div class='add'>+</div><div class='add'>+	const unsigned int *pins;</div><div class='add'>+	unsigned int npins;</div><div class='add'>+</div><div class='add'>+	const void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct lochnagar_group lochnagar1_groups[] = {</div><div class='add'>+	LN1_GROUP_PIN(GF_GPIO2),       LN1_GROUP_PIN(GF_GPIO3),</div><div class='add'>+	LN1_GROUP_PIN(GF_GPIO7),</div><div class='add'>+	LN1_GROUP_PIN(LED1),           LN1_GROUP_PIN(LED2),</div><div class='add'>+	LN1_GROUP_AIF(CDC_AIF1),       LN1_GROUP_AIF(CDC_AIF2),</div><div class='add'>+	LN1_GROUP_AIF(CDC_AIF3),</div><div class='add'>+	LN1_GROUP_AIF(DSP_AIF1),       LN1_GROUP_AIF(DSP_AIF2),</div><div class='add'>+	LN1_GROUP_AIF(PSIA1),          LN1_GROUP_AIF(PSIA2),</div><div class='add'>+	LN1_GROUP_AIF(GF_AIF1),        LN1_GROUP_AIF(GF_AIF2),</div><div class='add'>+	LN1_GROUP_AIF(GF_AIF3),        LN1_GROUP_AIF(GF_AIF4),</div><div class='add'>+	LN1_GROUP_AIF(SPDIF_AIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct lochnagar_group lochnagar2_groups[] = {</div><div class='add'>+	LN2_GROUP_PIN(FPGA_GPIO1),     LN2_GROUP_PIN(FPGA_GPIO2),</div><div class='add'>+	LN2_GROUP_PIN(FPGA_GPIO3),     LN2_GROUP_PIN(FPGA_GPIO4),</div><div class='add'>+	LN2_GROUP_PIN(FPGA_GPIO5),     LN2_GROUP_PIN(FPGA_GPIO6),</div><div class='add'>+	LN2_GROUP_PIN(CDC_GPIO1),      LN2_GROUP_PIN(CDC_GPIO2),</div><div class='add'>+	LN2_GROUP_PIN(CDC_GPIO3),      LN2_GROUP_PIN(CDC_GPIO4),</div><div class='add'>+	LN2_GROUP_PIN(CDC_GPIO5),      LN2_GROUP_PIN(CDC_GPIO6),</div><div class='add'>+	LN2_GROUP_PIN(CDC_GPIO7),      LN2_GROUP_PIN(CDC_GPIO8),</div><div class='add'>+	LN2_GROUP_PIN(DSP_GPIO1),      LN2_GROUP_PIN(DSP_GPIO2),</div><div class='add'>+	LN2_GROUP_PIN(DSP_GPIO3),      LN2_GROUP_PIN(DSP_GPIO4),</div><div class='add'>+	LN2_GROUP_PIN(DSP_GPIO5),      LN2_GROUP_PIN(DSP_GPIO6),</div><div class='add'>+	LN2_GROUP_PIN(DSP_GPIO20),</div><div class='add'>+	LN2_GROUP_PIN(GF_GPIO1),</div><div class='add'>+	LN2_GROUP_PIN(GF_GPIO2),       LN2_GROUP_PIN(GF_GPIO5),</div><div class='add'>+	LN2_GROUP_PIN(GF_GPIO3),       LN2_GROUP_PIN(GF_GPIO7),</div><div class='add'>+	LN2_GROUP_PIN(DSP_UART1_RX),   LN2_GROUP_PIN(DSP_UART1_TX),</div><div class='add'>+	LN2_GROUP_PIN(DSP_UART2_RX),   LN2_GROUP_PIN(DSP_UART2_TX),</div><div class='add'>+	LN2_GROUP_PIN(GF_UART2_RX),    LN2_GROUP_PIN(GF_UART2_TX),</div><div class='add'>+	LN2_GROUP_PIN(USB_UART_RX),</div><div class='add'>+	LN2_GROUP_PIN(CDC_PDMCLK1),    LN2_GROUP_PIN(CDC_PDMDAT1),</div><div class='add'>+	LN2_GROUP_PIN(CDC_PDMCLK2),    LN2_GROUP_PIN(CDC_PDMDAT2),</div><div class='add'>+	LN2_GROUP_PIN(CDC_DMICCLK1),   LN2_GROUP_PIN(CDC_DMICDAT1),</div><div class='add'>+	LN2_GROUP_PIN(CDC_DMICCLK2),   LN2_GROUP_PIN(CDC_DMICDAT2),</div><div class='add'>+	LN2_GROUP_PIN(CDC_DMICCLK3),   LN2_GROUP_PIN(CDC_DMICDAT3),</div><div class='add'>+	LN2_GROUP_PIN(CDC_DMICCLK4),   LN2_GROUP_PIN(CDC_DMICDAT4),</div><div class='add'>+	LN2_GROUP_PIN(DSP_DMICCLK1),   LN2_GROUP_PIN(DSP_DMICDAT1),</div><div class='add'>+	LN2_GROUP_PIN(DSP_DMICCLK2),   LN2_GROUP_PIN(DSP_DMICDAT2),</div><div class='add'>+	LN2_GROUP_PIN(I2C2_SCL),       LN2_GROUP_PIN(I2C2_SDA),</div><div class='add'>+	LN2_GROUP_PIN(I2C3_SCL),       LN2_GROUP_PIN(I2C3_SDA),</div><div class='add'>+	LN2_GROUP_PIN(I2C4_SCL),       LN2_GROUP_PIN(I2C4_SDA),</div><div class='add'>+	LN2_GROUP_PIN(DSP_STANDBY),</div><div class='add'>+	LN2_GROUP_PIN(CDC_MCLK1),      LN2_GROUP_PIN(CDC_MCLK2),</div><div class='add'>+	LN2_GROUP_PIN(DSP_CLKIN),</div><div class='add'>+	LN2_GROUP_PIN(PSIA1_MCLK),     LN2_GROUP_PIN(PSIA2_MCLK),</div><div class='add'>+	LN2_GROUP_GAI(CDC_AIF1),       LN2_GROUP_GAI(CDC_AIF2),</div><div class='add'>+	LN2_GROUP_GAI(CDC_AIF3),</div><div class='add'>+	LN2_GROUP_GAI(DSP_AIF1),       LN2_GROUP_GAI(DSP_AIF2),</div><div class='add'>+	LN2_GROUP_GAI(PSIA1),          LN2_GROUP_GAI(PSIA2),</div><div class='add'>+	LN2_GROUP_GAI(GF_AIF1),        LN2_GROUP_GAI(GF_AIF2),</div><div class='add'>+	LN2_GROUP_GAI(GF_AIF3),        LN2_GROUP_GAI(GF_AIF4),</div><div class='add'>+	LN2_GROUP_AIF(SPDIF_AIF),</div><div class='add'>+	LN2_GROUP_AIF(USB_AIF1),       LN2_GROUP_AIF(USB_AIF2),</div><div class='add'>+	LN2_GROUP_AIF(ADAT_AIF),</div><div class='add'>+	LN2_GROUP_AIF(SOUNDCARD_AIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lochnagar_func_groups {</div><div class='add'>+	const char **groups;</div><div class='add'>+	unsigned int ngroups;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lochnagar_pin_priv {</div><div class='add'>+	struct lochnagar *lochnagar;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	const struct lochnagar_func *funcs;</div><div class='add'>+	unsigned int nfuncs;</div><div class='add'>+</div><div class='add'>+	const struct pinctrl_pin_desc *pins;</div><div class='add'>+	unsigned int npins;</div><div class='add'>+</div><div class='add'>+	const struct lochnagar_group *groups;</div><div class='add'>+	unsigned int ngroups;</div><div class='add'>+</div><div class='add'>+	struct lochnagar_func_groups func_groups[LN_FTYPE_COUNT];</div><div class='add'>+</div><div class='add'>+	struct gpio_chip gpio_chip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lochnagar_get_groups_count(struct pinctrl_dev *pctldev)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;ngroups;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *lochnagar_get_group_name(struct pinctrl_dev *pctldev,</div><div class='add'>+					    unsigned int group_idx)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;groups[group_idx].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar_get_group_pins(struct pinctrl_dev *pctldev,</div><div class='add'>+				    unsigned int group_idx,</div><div class='add'>+				    const unsigned int **pins,</div><div class='add'>+				    unsigned int *num_pins)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	*pins = priv-&gt;groups[group_idx].pins;</div><div class='add'>+	*num_pins = priv-&gt;groups[group_idx].npins;</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 pinctrl_ops lochnagar_pin_group_ops = {</div><div class='add'>+	.get_groups_count = lochnagar_get_groups_count,</div><div class='add'>+	.get_group_name = lochnagar_get_group_name,</div><div class='add'>+	.get_group_pins = lochnagar_get_group_pins,</div><div class='add'>+	.dt_node_to_map = pinconf_generic_dt_node_to_map_all,</div><div class='add'>+	.dt_free_map = pinctrl_utils_free_map,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lochnagar_get_funcs_count(struct pinctrl_dev *pctldev)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;nfuncs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *lochnagar_get_func_name(struct pinctrl_dev *pctldev,</div><div class='add'>+					   unsigned int func_idx)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;funcs[func_idx].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar_get_func_groups(struct pinctrl_dev *pctldev,</div><div class='add'>+				     unsigned int func_idx,</div><div class='add'>+				     const char * const **groups,</div><div class='add'>+				     unsigned int * const num_groups)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+	int func_type;</div><div class='add'>+</div><div class='add'>+	func_type = priv-&gt;funcs[func_idx].type;</div><div class='add'>+</div><div class='add'>+	*groups = priv-&gt;func_groups[func_type].groups;</div><div class='add'>+	*num_groups = priv-&gt;func_groups[func_type].ngroups;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar2_get_gpio_chan(struct lochnagar_pin_priv *priv,</div><div class='add'>+				    unsigned int op)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = priv-&gt;lochnagar-&gt;regmap;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int free = -1;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LN2_NUM_GPIO_CHANNELS; i++) {</div><div class='add'>+		ret = regmap_read(regmap, LOCHNAGAR2_GPIO_CHANNEL1 + i, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val &amp;= LOCHNAGAR2_GPIO_CHANNEL_SRC_MASK;</div><div class='add'>+</div><div class='add'>+		if (val == op)</div><div class='add'>+			return i + 1;</div><div class='add'>+</div><div class='add'>+		if (free &lt; 0 &amp;&amp; !val)</div><div class='add'>+			free = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (free &gt;= 0) {</div><div class='add'>+		ret = regmap_update_bits(regmap,</div><div class='add'>+					 LOCHNAGAR2_GPIO_CHANNEL1 + free,</div><div class='add'>+					 LOCHNAGAR2_GPIO_CHANNEL_SRC_MASK, op);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		free++;</div><div class='add'>+</div><div class='add'>+		dev_dbg(priv-&gt;dev, "Set channel %d to 0x%x\n", free, op);</div><div class='add'>+</div><div class='add'>+		return free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar_pin_set_mux(struct lochnagar_pin_priv *priv,</div><div class='add'>+				 const struct lochnagar_pin *pin,</div><div class='add'>+				 unsigned int op)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;lochnagar-&gt;type) {</div><div class='add'>+	case LOCHNAGAR1:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = lochnagar2_get_gpio_chan(priv, op);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(priv-&gt;dev, "Failed to get channel for %s: %d\n",</div><div class='add'>+				pin-&gt;name, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		op = ret;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "Set pin %s to 0x%x\n", pin-&gt;name, op);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;lochnagar-&gt;regmap, pin-&gt;reg, op);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to set %s mux: %d\n",</div><div class='add'>+			pin-&gt;name, 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 lochnagar_aif_set_mux(struct lochnagar_pin_priv *priv,</div><div class='add'>+				 const struct lochnagar_group *group,</div><div class='add'>+				 unsigned int op)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = priv-&gt;lochnagar-&gt;regmap;</div><div class='add'>+	const struct lochnagar_aif *aif = group-&gt;priv;</div><div class='add'>+	const struct lochnagar_pin *pin;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, aif-&gt;src_reg, aif-&gt;src_mask, op);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to set %s source: %d\n",</div><div class='add'>+			group-&gt;name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, aif-&gt;ctrl_reg,</div><div class='add'>+				 aif-&gt;ena_mask, aif-&gt;ena_mask);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to set %s enable: %d\n",</div><div class='add'>+			group-&gt;name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; group-&gt;npins; i++) {</div><div class='add'>+		pin = priv-&gt;pins[group-&gt;pins[i]].drv_data;</div><div class='add'>+</div><div class='add'>+		if (pin-&gt;type != LN_PTYPE_MUX)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev_dbg(priv-&gt;dev, "Set pin %s to AIF\n", pin-&gt;name);</div><div class='add'>+</div><div class='add'>+		ret = regmap_update_bits(regmap, pin-&gt;reg,</div><div class='add'>+					 LOCHNAGAR2_GPIO_SRC_MASK,</div><div class='add'>+					 LN2_OP_AIF);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "Failed to set %s to AIF: %d\n",</div><div class='add'>+				pin-&gt;name, 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 lochnagar_set_mux(struct pinctrl_dev *pctldev,</div><div class='add'>+			     unsigned int func_idx, unsigned int group_idx)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+	const struct lochnagar_func *func = &amp;priv-&gt;funcs[func_idx];</div><div class='add'>+	const struct lochnagar_group *group = &amp;priv-&gt;groups[group_idx];</div><div class='add'>+	const struct lochnagar_pin *pin;</div><div class='add'>+</div><div class='add'>+	switch (func-&gt;type) {</div><div class='add'>+	case LN_FTYPE_AIF:</div><div class='add'>+		dev_dbg(priv-&gt;dev, "Set group %s to %s\n",</div><div class='add'>+			group-&gt;name, func-&gt;name);</div><div class='add'>+</div><div class='add'>+		return lochnagar_aif_set_mux(priv, group, func-&gt;op);</div><div class='add'>+	case LN_FTYPE_PIN:</div><div class='add'>+		pin = priv-&gt;pins[*group-&gt;pins].drv_data;</div><div class='add'>+</div><div class='add'>+		dev_dbg(priv-&gt;dev, "Set pin %s to %s\n", pin-&gt;name, func-&gt;name);</div><div class='add'>+</div><div class='add'>+		return lochnagar_pin_set_mux(priv, pin, func-&gt;op);</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 lochnagar_gpio_request(struct pinctrl_dev *pctldev,</div><div class='add'>+				  struct pinctrl_gpio_range *range,</div><div class='add'>+				  unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+	struct lochnagar *lochnagar = priv-&gt;lochnagar;</div><div class='add'>+	const struct lochnagar_pin *pin = priv-&gt;pins[offset].drv_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "Requesting GPIO %s\n", pin-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (lochnagar-&gt;type == LOCHNAGAR1 || pin-&gt;type != LN_PTYPE_MUX)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = lochnagar2_get_gpio_chan(priv, LN2_OP_GPIO);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to get low channel: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = lochnagar2_get_gpio_chan(priv, LN2_OP_GPIO | 0x1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to get high channel: %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 int lochnagar_gpio_set_direction(struct pinctrl_dev *pctldev,</div><div class='add'>+					struct pinctrl_gpio_range *range,</div><div class='add'>+					unsigned int offset,</div><div class='add'>+					bool input)</div><div class='add'>+{</div><div class='add'>+	/* The GPIOs only support output */</div><div class='add'>+	if (input)</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 pinmux_ops lochnagar_pin_mux_ops = {</div><div class='add'>+	.get_functions_count = lochnagar_get_funcs_count,</div><div class='add'>+	.get_function_name = lochnagar_get_func_name,</div><div class='add'>+	.get_function_groups = lochnagar_get_func_groups,</div><div class='add'>+	.set_mux = lochnagar_set_mux,</div><div class='add'>+</div><div class='add'>+	.gpio_request_enable = lochnagar_gpio_request,</div><div class='add'>+	.gpio_set_direction = lochnagar_gpio_set_direction,</div><div class='add'>+</div><div class='add'>+	.strict = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lochnagar_aif_set_master(struct lochnagar_pin_priv *priv,</div><div class='add'>+				    unsigned int group_idx, bool master)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap = priv-&gt;lochnagar-&gt;regmap;</div><div class='add'>+	const struct lochnagar_group *group = &amp;priv-&gt;groups[group_idx];</div><div class='add'>+	const struct lochnagar_aif *aif = group-&gt;priv;</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (group-&gt;type != LN_FTYPE_AIF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!master)</div><div class='add'>+		val = aif-&gt;master_mask;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "Set AIF %s to %s\n",</div><div class='add'>+		group-&gt;name, master ? "master" : "slave");</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, aif-&gt;ctrl_reg, aif-&gt;master_mask, val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to set %s mode: %d\n",</div><div class='add'>+			group-&gt;name, 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 lochnagar_conf_group_set(struct pinctrl_dev *pctldev,</div><div class='add'>+				    unsigned int group_idx,</div><div class='add'>+				    unsigned long *configs,</div><div class='add'>+				    unsigned int num_configs)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_configs; i++) {</div><div class='add'>+		unsigned int param = pinconf_to_config_param(*configs);</div><div class='add'>+</div><div class='add'>+		switch (param) {</div><div class='add'>+		case PIN_CONFIG_OUTPUT_ENABLE:</div><div class='add'>+			ret = lochnagar_aif_set_master(priv, group_idx, true);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			break;</div><div class='add'>+		case PIN_CONFIG_INPUT_ENABLE:</div><div class='add'>+			ret = lochnagar_aif_set_master(priv, group_idx, false);</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'>+			return -ENOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		configs++;</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 pinconf_ops lochnagar_pin_conf_ops = {</div><div class='add'>+	.pin_config_group_set = lochnagar_conf_group_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct pinctrl_desc lochnagar_pin_desc = {</div><div class='add'>+	.name = "lochnagar-pinctrl",</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.pctlops = &amp;lochnagar_pin_group_ops,</div><div class='add'>+	.pmxops = &amp;lochnagar_pin_mux_ops,</div><div class='add'>+	.confops = &amp;lochnagar_pin_conf_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void lochnagar_gpio_set(struct gpio_chip *chip,</div><div class='add'>+			       unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_pin_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	struct lochnagar *lochnagar = priv-&gt;lochnagar;</div><div class='add'>+	const struct lochnagar_pin *pin = priv-&gt;pins[offset].drv_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	value = !!value;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "Set GPIO %s to %s\n",</div><div class='add'>+		pin-&gt;name, value ? "high" : "low");</div><div class='add'>+</div><div class='add'>+	switch (pin-&gt;type) {</div><div class='add'>+	case LN_PTYPE_MUX:</div><div class='add'>+		value |= LN2_OP_GPIO;</div><div class='add'>+</div><div class='add'>+		ret = lochnagar_pin_set_mux(priv, pin, value);</div><div class='add'>+		break;</div><div class='add'>+	case LN_PTYPE_GPIO:</div><div class='add'>+		if (pin-&gt;invert)</div><div class='add'>+			value = !value;</div><div class='add'>+</div><div class='add'>+		ret = regmap_update_bits(lochnagar-&gt;regmap, pin-&gt;reg,</div><div class='add'>+					 BIT(pin-&gt;shift), value &lt;&lt; pin-&gt;shift);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(chip-&gt;parent, "Failed to set %s value: %d\n",</div><div class='add'>+			pin-&gt;name, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar_gpio_direction_out(struct gpio_chip *chip,</div><div class='add'>+					unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	lochnagar_gpio_set(chip, offset, value);</div><div class='add'>+</div><div class='add'>+	return pinctrl_gpio_direction_output(chip-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lochnagar_fill_func_groups(struct lochnagar_pin_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar_func_groups *funcs;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ngroups; i++)</div><div class='add'>+		priv-&gt;func_groups[priv-&gt;groups[i].type].ngroups++;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LN_FTYPE_COUNT; i++) {</div><div class='add'>+		funcs = &amp;priv-&gt;func_groups[i];</div><div class='add'>+</div><div class='add'>+		if (!funcs-&gt;ngroups)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		funcs-&gt;groups = devm_kcalloc(priv-&gt;dev, funcs-&gt;ngroups,</div><div class='add'>+					     sizeof(*funcs-&gt;groups),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+		if (!funcs-&gt;groups)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		funcs-&gt;ngroups = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ngroups; i++) {</div><div class='add'>+		funcs = &amp;priv-&gt;func_groups[priv-&gt;groups[i].type];</div><div class='add'>+</div><div class='add'>+		funcs-&gt;groups[funcs-&gt;ngroups++] = priv-&gt;groups[i].name;</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 lochnagar_pin_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct lochnagar *lochnagar = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	struct lochnagar_pin_priv *priv;</div><div class='add'>+	struct pinctrl_desc *desc;</div><div class='add'>+	struct pinctrl_dev *pctl;</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'>+	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;dev = dev;</div><div class='add'>+	priv-&gt;lochnagar = lochnagar;</div><div class='add'>+</div><div class='add'>+	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);</div><div class='add'>+	if (!desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	*desc = lochnagar_pin_desc;</div><div class='add'>+</div><div class='add'>+	priv-&gt;gpio_chip.label = dev_name(dev);</div><div class='add'>+	priv-&gt;gpio_chip.request = gpiochip_generic_request;</div><div class='add'>+	priv-&gt;gpio_chip.free = gpiochip_generic_free;</div><div class='add'>+	priv-&gt;gpio_chip.direction_output = lochnagar_gpio_direction_out;</div><div class='add'>+	priv-&gt;gpio_chip.set = lochnagar_gpio_set;</div><div class='add'>+	priv-&gt;gpio_chip.can_sleep = true;</div><div class='add'>+	priv-&gt;gpio_chip.parent = dev;</div><div class='add'>+	priv-&gt;gpio_chip.base = -1;</div><div class='add'>+#ifdef CONFIG_OF_GPIO</div><div class='add'>+	priv-&gt;gpio_chip.of_node = dev-&gt;of_node;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	switch (lochnagar-&gt;type) {</div><div class='add'>+	case LOCHNAGAR1:</div><div class='add'>+		priv-&gt;funcs = lochnagar1_funcs;</div><div class='add'>+		priv-&gt;nfuncs = ARRAY_SIZE(lochnagar1_funcs);</div><div class='add'>+		priv-&gt;pins = lochnagar1_pins;</div><div class='add'>+		priv-&gt;npins = ARRAY_SIZE(lochnagar1_pins);</div><div class='add'>+		priv-&gt;groups = lochnagar1_groups;</div><div class='add'>+		priv-&gt;ngroups = ARRAY_SIZE(lochnagar1_groups);</div><div class='add'>+</div><div class='add'>+		priv-&gt;gpio_chip.ngpio = LOCHNAGAR1_PIN_NUM_GPIOS;</div><div class='add'>+		break;</div><div class='add'>+	case LOCHNAGAR2:</div><div class='add'>+		priv-&gt;funcs = lochnagar2_funcs;</div><div class='add'>+		priv-&gt;nfuncs = ARRAY_SIZE(lochnagar2_funcs);</div><div class='add'>+		priv-&gt;pins = lochnagar2_pins;</div><div class='add'>+		priv-&gt;npins = ARRAY_SIZE(lochnagar2_pins);</div><div class='add'>+		priv-&gt;groups = lochnagar2_groups;</div><div class='add'>+		priv-&gt;ngroups = ARRAY_SIZE(lochnagar2_groups);</div><div class='add'>+</div><div class='add'>+		priv-&gt;gpio_chip.ngpio = LOCHNAGAR2_PIN_NUM_GPIOS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Unknown Lochnagar type: %d\n", lochnagar-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = lochnagar_fill_func_groups(priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	desc-&gt;pins = priv-&gt;pins;</div><div class='add'>+	desc-&gt;npins = priv-&gt;npins;</div><div class='add'>+</div><div class='add'>+	pctl = devm_pinctrl_register(dev, desc, priv);</div><div class='add'>+	if (IS_ERR(pctl)) {</div><div class='add'>+		ret = PTR_ERR(pctl);</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to register pinctrl: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_gpiochip_add_data(dev, &amp;priv-&gt;gpio_chip, priv);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to register gpiochip: %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 of_device_id lochnagar_of_match[] = {</div><div class='add'>+	{ .compatible = "cirrus,lochnagar-pinctrl" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, lochnagar_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver lochnagar_pin_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "lochnagar-pinctrl",</div><div class='add'>+		.of_match_table = of_match_ptr(lochnagar_of_match),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.probe = lochnagar_pin_probe,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(lochnagar_pin_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Charles Keepax &lt;ckeepax@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Pinctrl driver for Cirrus Logic Lochnagar Board");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c<br/>index 188001beb298..83ff9532bae6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-imx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-imx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/freescale/pinctrl-imx.c</a></div><div class='hunk'>@@ -449,7 +449,7 @@ static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pin_reg = &amp;ipctl-&gt;pin_regs[pin_id];</div><div class='del'>-		if (!pin_reg || pin_reg-&gt;conf_reg == -1) {</div><div class='add'>+		if (pin_reg-&gt;conf_reg == -1) {</div><div class='ctx'> 			seq_puts(s, "N/A");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -785,7 +785,6 @@ int imx_pinctrl_probe(struct platform_device *pdev,</div><div class='ctx'> 	struct pinctrl_desc *imx_pinctrl_desc;</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	struct imx_pinctrl *ipctl;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	struct regmap *gpr;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='hunk'>@@ -817,8 +816,7 @@ int imx_pinctrl_probe(struct platform_device *pdev,</div><div class='ctx'> 			ipctl-&gt;pin_regs[i].conf_reg = -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-		ipctl-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+		ipctl-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 		if (IS_ERR(ipctl-&gt;base))</div><div class='ctx'> 			return PTR_ERR(ipctl-&gt;base);</div><div class='ctx'> </div><div class='hunk'>@@ -887,3 +885,22 @@ free:</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int __maybe_unused imx_pinctrl_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct imx_pinctrl *ipctl = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return pinctrl_force_sleep(ipctl-&gt;pctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused imx_pinctrl_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct imx_pinctrl *ipctl = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return pinctrl_force_default(ipctl-&gt;pctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct dev_pm_ops imx_pinctrl_pm_ops = {</div><div class='add'>+	SET_LATE_SYSTEM_SLEEP_PM_OPS(imx_pinctrl_suspend,</div><div class='add'>+					imx_pinctrl_resume)</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h<br/>index 98a4889af4ef..333d32b947b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-imx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-imx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-imx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/freescale/pinctrl-imx.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> struct platform_device;</div><div class='ctx'> </div><div class='ctx'> extern struct pinmux_ops imx_pmx_ops;</div><div class='add'>+extern const struct dev_pm_ops imx_pinctrl_pm_ops;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct imx_pin_mmio - MMIO pin configurations</div><div class='head'>diff --git a/drivers/pinctrl/freescale/pinctrl-imx8mq.c b/drivers/pinctrl/freescale/pinctrl-imx8mq.c<br/>index 8d39af541d5f..50aa1c00c4b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-imx8mq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-imx8mq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-imx8mq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/freescale/pinctrl-imx8mq.c</a></div><div class='hunk'>@@ -339,6 +339,7 @@ static struct platform_driver imx8mq_pinctrl_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "imx8mq-pinctrl",</div><div class='ctx'> 		.of_match_table = of_match_ptr(imx8mq_pinctrl_of_match),</div><div class='add'>+		.pm = &amp;imx_pinctrl_pm_ops,</div><div class='ctx'> 		.suppress_bind_attrs = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = imx8mq_pinctrl_probe,</div><div class='head'>diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c b/drivers/pinctrl/freescale/pinctrl-scu.c<br/>index 83e69c0f39e6..73bf1d9f9cc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-scu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/freescale/pinctrl-scu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/freescale/pinctrl-scu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/freescale/pinctrl-scu.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ struct imx_sc_msg_resp_pad_get {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct imx_sc_ipc *pinctrl_ipc_handle;</div><div class='add'>+static struct imx_sc_ipc *pinctrl_ipc_handle;</div><div class='ctx'> </div><div class='ctx'> int imx_pinctrl_sc_ipc_init(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c<br/>index 241384ead4ed..18d9ad504194 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-baytrail.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-baytrail.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-baytrail.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/intel/pinctrl-baytrail.c</a></div><div class='hunk'>@@ -1710,6 +1710,8 @@ static int byt_gpio_probe(struct byt_gpio *vg)</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	vg-&gt;saved_context = devm_kcalloc(&amp;vg-&gt;pdev-&gt;dev, gc-&gt;ngpio,</div><div class='ctx'> 				       sizeof(*vg-&gt;saved_context), GFP_KERNEL);</div><div class='add'>+	if (!vg-&gt;saved_context)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> #endif</div><div class='ctx'> 	ret = devm_gpiochip_add_data(&amp;vg-&gt;pdev-&gt;dev, gc, vg);</div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/drivers/pinctrl/intel/pinctrl-cedarfork.c b/drivers/pinctrl/intel/pinctrl-cedarfork.c<br/>index b7d632f1dbf6..aa6f9040d3d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-cedarfork.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-cedarfork.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-cedarfork.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/intel/pinctrl-cedarfork.c</a></div><div class='hunk'>@@ -91,13 +91,13 @@ static const struct pinctrl_pin_desc cdf_pins[] = {</div><div class='ctx'> 	PINCTRL_PIN(43, "MEMTRIP_N"),</div><div class='ctx'> 	PINCTRL_PIN(44, "UART0_RXD"),</div><div class='ctx'> 	PINCTRL_PIN(45, "UART0_TXD"),</div><div class='del'>-	PINCTRL_PIN(46, "UART1_RXD"),</div><div class='del'>-	PINCTRL_PIN(47, "UART1_TXD"),</div><div class='add'>+	PINCTRL_PIN(46, "GBE_UART_RXD"),</div><div class='add'>+	PINCTRL_PIN(47, "GBE_UART_TXD"),</div><div class='ctx'> 	/* WEST01 */</div><div class='ctx'> 	PINCTRL_PIN(48, "GBE_GPIO13"),</div><div class='ctx'> 	PINCTRL_PIN(49, "AUX_PWR"),</div><div class='del'>-	PINCTRL_PIN(50, "CPU_GP_2"),</div><div class='del'>-	PINCTRL_PIN(51, "CPU_GP_3"),</div><div class='add'>+	PINCTRL_PIN(50, "UART0_RTS"),</div><div class='add'>+	PINCTRL_PIN(51, "UART0_CTS"),</div><div class='ctx'> 	PINCTRL_PIN(52, "FAN_PWM_0"),</div><div class='ctx'> 	PINCTRL_PIN(53, "FAN_PWM_1"),</div><div class='ctx'> 	PINCTRL_PIN(54, "FAN_PWM_2"),</div><div class='hunk'>@@ -201,8 +201,8 @@ static const struct pinctrl_pin_desc cdf_pins[] = {</div><div class='ctx'> 	/* WESTF */</div><div class='ctx'> 	PINCTRL_PIN(145, "NAC_RMII_CLK"),</div><div class='ctx'> 	PINCTRL_PIN(146, "NAC_RGMII_CLK"),</div><div class='del'>-	PINCTRL_PIN(147, "NAC_SPARE0"),</div><div class='del'>-	PINCTRL_PIN(148, "NAC_SPARE1"),</div><div class='add'>+	PINCTRL_PIN(147, "NAC_GBE_SMB_CLK_TX_N2S"),</div><div class='add'>+	PINCTRL_PIN(148, "NAC_GBE_SMB_DATA_TX_N2S"),</div><div class='ctx'> 	PINCTRL_PIN(149, "NAC_SPARE2"),</div><div class='ctx'> 	PINCTRL_PIN(150, "NAC_INIT_SX_WAKE_N"),</div><div class='ctx'> 	PINCTRL_PIN(151, "NAC_GBE_GPIO0_S2N"),</div><div class='hunk'>@@ -219,8 +219,8 @@ static const struct pinctrl_pin_desc cdf_pins[] = {</div><div class='ctx'> 	PINCTRL_PIN(162, "NAC_NCSI_TXD1"),</div><div class='ctx'> 	PINCTRL_PIN(163, "NAC_NCSI_ARB_OUT"),</div><div class='ctx'> 	PINCTRL_PIN(164, "NAC_NCSI_OE_N"),</div><div class='del'>-	PINCTRL_PIN(165, "NAC_GBE_SMB_CLK"),</div><div class='del'>-	PINCTRL_PIN(166, "NAC_GBE_SMB_DATA"),</div><div class='add'>+	PINCTRL_PIN(165, "NAC_GBE_SMB_CLK_RX_S2N"),</div><div class='add'>+	PINCTRL_PIN(166, "NAC_GBE_SMB_DATA_RX_S2N"),</div><div class='ctx'> 	PINCTRL_PIN(167, "NAC_GBE_SMB_ALRT_N"),</div><div class='ctx'> 	/* EAST2 */</div><div class='ctx'> 	PINCTRL_PIN(168, "USB_OC0_N"),</div><div class='hunk'>@@ -232,7 +232,7 @@ static const struct pinctrl_pin_desc cdf_pins[] = {</div><div class='ctx'> 	PINCTRL_PIN(174, "GBE_GPIO5"),</div><div class='ctx'> 	PINCTRL_PIN(175, "GBE_GPIO6"),</div><div class='ctx'> 	PINCTRL_PIN(176, "GBE_GPIO7"),</div><div class='del'>-	PINCTRL_PIN(177, "GBE_GPIO8"),</div><div class='add'>+	PINCTRL_PIN(177, "SPI_TPM_CS_N"),</div><div class='ctx'> 	PINCTRL_PIN(178, "GBE_GPIO9"),</div><div class='ctx'> 	PINCTRL_PIN(179, "GBE_GPIO10"),</div><div class='ctx'> 	PINCTRL_PIN(180, "GBE_GPIO11"),</div><div class='head'>diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c<br/>index 3b1818184207..d7acbb79cdf7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-intel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-intel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/intel/pinctrl-intel.c</a></div><div class='hunk'>@@ -81,6 +81,7 @@ struct intel_pad_context {</div><div class='ctx'> </div><div class='ctx'> struct intel_community_context {</div><div class='ctx'> 	u32 *intmask;</div><div class='add'>+	u32 *hostown;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct intel_pinctrl_context {</div><div class='hunk'>@@ -1284,7 +1285,7 @@ static int intel_pinctrl_pm_init(struct intel_pinctrl *pctrl)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pctrl-&gt;ncommunities; i++) {</div><div class='ctx'> 		struct intel_community *community = &amp;pctrl-&gt;communities[i];</div><div class='del'>-		u32 *intmask;</div><div class='add'>+		u32 *intmask, *hostown;</div><div class='ctx'> </div><div class='ctx'> 		intmask = devm_kcalloc(pctrl-&gt;dev, community-&gt;ngpps,</div><div class='ctx'> 				       sizeof(*intmask), GFP_KERNEL);</div><div class='hunk'>@@ -1292,6 +1293,13 @@ static int intel_pinctrl_pm_init(struct intel_pinctrl *pctrl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		communities[i].intmask = intmask;</div><div class='add'>+</div><div class='add'>+		hostown = devm_kcalloc(pctrl-&gt;dev, community-&gt;ngpps,</div><div class='add'>+				       sizeof(*hostown), GFP_KERNEL);</div><div class='add'>+		if (!hostown)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		communities[i].hostown = hostown;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pctrl-&gt;context.pads = pads;</div><div class='hunk'>@@ -1466,7 +1474,7 @@ static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned int</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int intel_pinctrl_suspend(struct device *dev)</div><div class='add'>+int intel_pinctrl_suspend_noirq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel_pinctrl *pctrl = dev_get_drvdata(dev);</div><div class='ctx'> 	struct intel_community_context *communities;</div><div class='hunk'>@@ -1501,11 +1509,15 @@ int intel_pinctrl_suspend(struct device *dev)</div><div class='ctx'> 		base = community-&gt;regs + community-&gt;ie_offset;</div><div class='ctx'> 		for (gpp = 0; gpp &lt; community-&gt;ngpps; gpp++)</div><div class='ctx'> 			communities[i].intmask[gpp] = readl(base + gpp * 4);</div><div class='add'>+</div><div class='add'>+		base = community-&gt;regs + community-&gt;hostown_offset;</div><div class='add'>+		for (gpp = 0; gpp &lt; community-&gt;ngpps; gpp++)</div><div class='add'>+			communities[i].hostown[gpp] = readl(base + gpp * 4);</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(intel_pinctrl_suspend);</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_pinctrl_suspend_noirq);</div><div class='ctx'> </div><div class='ctx'> static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)</div><div class='ctx'> {</div><div class='hunk'>@@ -1527,7 +1539,32 @@ static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int intel_pinctrl_resume(struct device *dev)</div><div class='add'>+static u32</div><div class='add'>+intel_gpio_is_requested(struct gpio_chip *chip, int base, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	u32 requested = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		if (gpiochip_is_requested(chip, base + i))</div><div class='add'>+			requested |= BIT(i);</div><div class='add'>+</div><div class='add'>+	return requested;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+intel_gpio_update_pad_mode(void __iomem *hostown, u32 mask, u32 value)</div><div class='add'>+{</div><div class='add'>+	u32 curr, updated;</div><div class='add'>+</div><div class='add'>+	curr = readl(hostown);</div><div class='add'>+	updated = (curr &amp; ~mask) | (value &amp; mask);</div><div class='add'>+	writel(updated, hostown);</div><div class='add'>+</div><div class='add'>+	return curr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int intel_pinctrl_resume_noirq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel_pinctrl *pctrl = dev_get_drvdata(dev);</div><div class='ctx'> 	const struct intel_community_context *communities;</div><div class='hunk'>@@ -1585,11 +1622,30 @@ int intel_pinctrl_resume(struct device *dev)</div><div class='ctx'> 			dev_dbg(dev, "restored mask %d/%u %#08x\n", i, gpp,</div><div class='ctx'> 				readl(base + gpp * 4));</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		base = community-&gt;regs + community-&gt;hostown_offset;</div><div class='add'>+		for (gpp = 0; gpp &lt; community-&gt;ngpps; gpp++) {</div><div class='add'>+			const struct intel_padgroup *padgrp = &amp;community-&gt;gpps[gpp];</div><div class='add'>+			u32 requested = 0, value = 0;</div><div class='add'>+			u32 saved = communities[i].hostown[gpp];</div><div class='add'>+</div><div class='add'>+			if (padgrp-&gt;gpio_base &lt; 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			requested = intel_gpio_is_requested(&amp;pctrl-&gt;chip,</div><div class='add'>+					padgrp-&gt;gpio_base, padgrp-&gt;size);</div><div class='add'>+			value = intel_gpio_update_pad_mode(base + gpp * 4,</div><div class='add'>+					requested, saved);</div><div class='add'>+			if ((value ^ saved) &amp; requested) {</div><div class='add'>+				dev_warn(dev, "restore hostown %d/%u %#8x-&gt;%#8x\n",</div><div class='add'>+					i, gpp, value, saved);</div><div class='add'>+			}</div><div class='add'>+		}</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(intel_pinctrl_resume);</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_pinctrl_resume_noirq);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mathias Nyman &lt;mathias.nyman@linux.intel.com&gt;");</div><div class='head'>diff --git a/drivers/pinctrl/intel/pinctrl-intel.h b/drivers/pinctrl/intel/pinctrl-intel.h<br/>index b8a07d37d18f..a8e958f1dcf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-intel.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/intel/pinctrl-intel.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/intel/pinctrl-intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/intel/pinctrl-intel.h</a></div><div class='hunk'>@@ -177,13 +177,14 @@ int intel_pinctrl_probe_by_hid(struct platform_device *pdev);</div><div class='ctx'> int intel_pinctrl_probe_by_uid(struct platform_device *pdev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='del'>-int intel_pinctrl_suspend(struct device *dev);</div><div class='del'>-int intel_pinctrl_resume(struct device *dev);</div><div class='add'>+int intel_pinctrl_suspend_noirq(struct device *dev);</div><div class='add'>+int intel_pinctrl_resume_noirq(struct device *dev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define INTEL_PINCTRL_PM_OPS(_name)						  \</div><div class='del'>-const struct dev_pm_ops _name = {						  \</div><div class='del'>-	SET_LATE_SYSTEM_SLEEP_PM_OPS(intel_pinctrl_suspend, intel_pinctrl_resume) \</div><div class='add'>+#define INTEL_PINCTRL_PM_OPS(_name)					\</div><div class='add'>+const struct dev_pm_ops _name = {					\</div><div class='add'>+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pinctrl_suspend_noirq,	\</div><div class='add'>+				      intel_pinctrl_resume_noirq)	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* PINCTRL_INTEL_H */</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig<br/>index a005cbccb4f7..26ed5dca1460 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/Kconfig</a></div><div class='hunk'>@@ -113,6 +113,13 @@ config PINCTRL_MT8183</div><div class='ctx'> 	default ARM64 &amp;&amp; ARCH_MEDIATEK</div><div class='ctx'> 	select PINCTRL_MTK_PARIS</div><div class='ctx'> </div><div class='add'>+config PINCTRL_MT8516</div><div class='add'>+	bool "Mediatek MT8516 pin control"</div><div class='add'>+	depends on OF</div><div class='add'>+	depends on ARM64 || COMPILE_TEST</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_MEDIATEK</div><div class='add'>+	select PINCTRL_MTK</div><div class='add'>+</div><div class='ctx'> # For PMIC</div><div class='ctx'> config PINCTRL_MT6397</div><div class='ctx'> 	bool "Mediatek MT6397 pin control"</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile<br/>index 4b4e2eaf6f2d..a74325abd877 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/Makefile</a></div><div class='hunk'>@@ -17,4 +17,5 @@ obj-$(CONFIG_PINCTRL_MT7623)	+= pinctrl-mt7623.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_MT7629)	+= pinctrl-mt7629.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_MT8173)	+= pinctrl-mt8173.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_MT8183)	+= pinctrl-mt8183.o</div><div class='add'>+obj-$(CONFIG_PINCTRL_MT8516)	+= pinctrl-mt8516.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_MT6397)	+= pinctrl-mt6397.o</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8183.c b/drivers/pinctrl/mediatek/pinctrl-mt8183.c<br/>index 6262fd3678ea..2c7409ed16fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mt8183.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mt8183.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mt8183.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/pinctrl-mt8183.c</a></div><div class='hunk'>@@ -472,6 +472,51 @@ static const struct mtk_pin_field_calc mt8183_pin_r1_range[] = {</div><div class='ctx'> 	PIN_FIELD_BASE(133, 133, 8, 0x0D0, 0x10, 13, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct mtk_pin_field_calc mt8183_pin_e1e0en_range[] = {</div><div class='add'>+	PIN_FIELD_BASE(48, 48, 3, 0x0F0, 0x10, 20, 1),</div><div class='add'>+	PIN_FIELD_BASE(49, 49, 3, 0x0F0, 0x10, 15, 1),</div><div class='add'>+	PIN_FIELD_BASE(50, 50, 4, 0x0F0, 0x10, 12, 1),</div><div class='add'>+	PIN_FIELD_BASE(51, 51, 4, 0x0F0, 0x10, 7, 1),</div><div class='add'>+	PIN_FIELD_BASE(81, 81, 5, 0x0F0, 0x10, 12, 1),</div><div class='add'>+	PIN_FIELD_BASE(82, 82, 5, 0x0F0, 0x10, 9, 1),</div><div class='add'>+	PIN_FIELD_BASE(83, 83, 5, 0x0F0, 0x10, 19, 1),</div><div class='add'>+	PIN_FIELD_BASE(84, 84, 5, 0x0F0, 0x10, 22, 1),</div><div class='add'>+	PIN_FIELD_BASE(103, 103, 6, 0x0F0, 0x10, 24, 1),</div><div class='add'>+	PIN_FIELD_BASE(104, 104, 6, 0x0F0, 0x10, 14, 1),</div><div class='add'>+	PIN_FIELD_BASE(105, 105, 6, 0x0F0, 0x10, 27, 1),</div><div class='add'>+	PIN_FIELD_BASE(106, 106, 6, 0x0F0, 0x10, 17, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_pin_field_calc mt8183_pin_e0_range[] = {</div><div class='add'>+	PIN_FIELD_BASE(48, 48, 3, 0x0F0, 0x10, 21, 1),</div><div class='add'>+	PIN_FIELD_BASE(49, 49, 3, 0x0F0, 0x10, 16, 1),</div><div class='add'>+	PIN_FIELD_BASE(50, 50, 4, 0x0F0, 0x10, 13, 1),</div><div class='add'>+	PIN_FIELD_BASE(51, 51, 4, 0x0F0, 0x10, 8, 1),</div><div class='add'>+	PIN_FIELD_BASE(81, 81, 5, 0x0F0, 0x10, 13, 1),</div><div class='add'>+	PIN_FIELD_BASE(82, 82, 5, 0x0F0, 0x10, 10, 1),</div><div class='add'>+	PIN_FIELD_BASE(83, 83, 5, 0x0F0, 0x10, 20, 1),</div><div class='add'>+	PIN_FIELD_BASE(84, 84, 5, 0x0F0, 0x10, 23, 1),</div><div class='add'>+	PIN_FIELD_BASE(103, 103, 6, 0x0F0, 0x10, 25, 1),</div><div class='add'>+	PIN_FIELD_BASE(104, 104, 6, 0x0F0, 0x10, 15, 1),</div><div class='add'>+	PIN_FIELD_BASE(105, 105, 6, 0x0F0, 0x10, 28, 1),</div><div class='add'>+	PIN_FIELD_BASE(106, 106, 6, 0x0F0, 0x10, 18, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_pin_field_calc mt8183_pin_e1_range[] = {</div><div class='add'>+	PIN_FIELD_BASE(48, 48, 3, 0x0F0, 0x10, 22, 1),</div><div class='add'>+	PIN_FIELD_BASE(49, 49, 3, 0x0F0, 0x10, 17, 1),</div><div class='add'>+	PIN_FIELD_BASE(50, 50, 4, 0x0F0, 0x10, 14, 1),</div><div class='add'>+	PIN_FIELD_BASE(51, 51, 4, 0x0F0, 0x10, 9, 1),</div><div class='add'>+	PIN_FIELD_BASE(81, 81, 5, 0x0F0, 0x10, 14, 1),</div><div class='add'>+	PIN_FIELD_BASE(82, 82, 5, 0x0F0, 0x10, 11, 1),</div><div class='add'>+	PIN_FIELD_BASE(83, 83, 5, 0x0F0, 0x10, 21, 1),</div><div class='add'>+	PIN_FIELD_BASE(84, 84, 5, 0x0F0, 0x10, 24, 1),</div><div class='add'>+	PIN_FIELD_BASE(103, 103, 6, 0x0F0, 0x10, 26, 1),</div><div class='add'>+	PIN_FIELD_BASE(104, 104, 6, 0x0F0, 0x10, 16, 1),</div><div class='add'>+	PIN_FIELD_BASE(105, 105, 6, 0x0F0, 0x10, 29, 1),</div><div class='add'>+	PIN_FIELD_BASE(106, 106, 6, 0x0F0, 0x10, 19, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct mtk_pin_reg_calc mt8183_reg_cals[PINCTRL_PIN_REG_MAX] = {</div><div class='ctx'> 	[PINCTRL_PIN_REG_MODE] = MTK_RANGE(mt8183_pin_mode_range),</div><div class='ctx'> 	[PINCTRL_PIN_REG_DIR] = MTK_RANGE(mt8183_pin_dir_range),</div><div class='hunk'>@@ -485,6 +530,9 @@ static const struct mtk_pin_reg_calc mt8183_reg_cals[PINCTRL_PIN_REG_MAX] = {</div><div class='ctx'> 	[PINCTRL_PIN_REG_PUPD] = MTK_RANGE(mt8183_pin_pupd_range),</div><div class='ctx'> 	[PINCTRL_PIN_REG_R0] = MTK_RANGE(mt8183_pin_r0_range),</div><div class='ctx'> 	[PINCTRL_PIN_REG_R1] = MTK_RANGE(mt8183_pin_r1_range),</div><div class='add'>+	[PINCTRL_PIN_REG_DRV_EN] = MTK_RANGE(mt8183_pin_e1e0en_range),</div><div class='add'>+	[PINCTRL_PIN_REG_DRV_E0] = MTK_RANGE(mt8183_pin_e0_range),</div><div class='add'>+	[PINCTRL_PIN_REG_DRV_E1] = MTK_RANGE(mt8183_pin_e1_range),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char * const mt8183_pinctrl_register_base_names[] = {</div><div class='hunk'>@@ -517,6 +565,8 @@ static const struct mtk_pin_soc mt8183_data = {</div><div class='ctx'> 	.drive_get = mtk_pinconf_drive_get_rev1,</div><div class='ctx'> 	.adv_pull_get = mtk_pinconf_adv_pull_get,</div><div class='ctx'> 	.adv_pull_set = mtk_pinconf_adv_pull_set,</div><div class='add'>+	.adv_drive_get = mtk_pinconf_adv_drive_get,</div><div class='add'>+	.adv_drive_set = mtk_pinconf_adv_drive_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id mt8183_pinctrl_of_match[] = {</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c<br/>new file mode 100644<br/>index 000000000000..b375426aa61e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mt8516.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/pinctrl-mt8516.c</a></div><div class='hunk'>@@ -0,0 +1,362 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019 MediaTek Inc.</div><div class='add'>+ * Author: Min.Guo &lt;min.guo@mediatek.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/mt65xx.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/module.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinctrl.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'>+#include "pinctrl-mtk-common.h"</div><div class='add'>+#include "pinctrl-mtk-mt8516.h"</div><div class='add'>+</div><div class='add'>+static const struct mtk_drv_group_desc mt8516_drv_grp[] = {</div><div class='add'>+	/* 0E4E8SR 4/8/12/16 */</div><div class='add'>+	MTK_DRV_GRP(4, 16, 1, 2, 4),</div><div class='add'>+	/* 0E2E4SR  2/4/6/8 */</div><div class='add'>+	MTK_DRV_GRP(2, 8, 1, 2, 2),</div><div class='add'>+	/* E8E4E2  2/4/6/8/10/12/14/16 */</div><div class='add'>+	MTK_DRV_GRP(2, 16, 0, 2, 2)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_pin_drv_grp mt8516_pin_drv[] = {</div><div class='add'>+	MTK_PIN_DRV_GRP(0, 0xd00, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(1, 0xd00, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(2, 0xd00, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(3, 0xd00, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(4, 0xd00, 0, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(5, 0xd00, 4, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(6, 0xd00, 4, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(7, 0xd00, 4, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(8, 0xd00, 4, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(9, 0xd00, 4, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(10, 0xd00, 4, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(11, 0xd00, 8, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(12, 0xd00, 8, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(13, 0xd00, 8, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(14, 0xd00, 12, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(15, 0xd00, 12, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(16, 0xd00, 12, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(17, 0xd00, 12, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(18, 0xd10, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(19, 0xd10, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(20, 0xd10, 0, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(21, 0xd00, 12, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(22, 0xd00, 12, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(23, 0xd00, 12, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(24, 0xd00, 8, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(25, 0xd00, 8, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(26, 0xd10, 4, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(27, 0xd10, 4, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(28, 0xd10, 4, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(29, 0xd10, 4, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(30, 0xd10, 4, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(31, 0xd10, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(32, 0xd10, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(33, 0xd10, 8, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(34, 0xd10, 12, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(35, 0xd10, 12, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(36, 0xd20, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(37, 0xd20, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(38, 0xd20, 0, 0),</div><div class='add'>+	MTK_PIN_DRV_GRP(39, 0xd20, 0, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(40, 0xd20, 4, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(41, 0xd20, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(42, 0xd20, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(43, 0xd20, 8, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(44, 0xd20, 12, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(45, 0xd20, 12, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(46, 0xd20, 12, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(47, 0xd20, 12, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(48, 0xd30, 0, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(49, 0xd30, 0, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(50, 0xd30, 0, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(51, 0xd30, 0, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(54, 0xd30, 8, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(55, 0xd30, 12, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(56, 0xd30, 12, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(57, 0xd30, 12, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(62, 0xd40, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(63, 0xd40, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(64, 0xd40, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(65, 0xd40, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(66, 0xd40, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(67, 0xd40, 8, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(68, 0xd40, 12, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(69, 0xd50, 0, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(70, 0xd50, 4, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(71, 0xd50, 4, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(72, 0xd50, 4, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(73, 0xd50, 4, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(100, 0xd50, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(101, 0xd50, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(102, 0xd50, 8, 1),</div><div class='add'>+	MTK_PIN_DRV_GRP(103, 0xd50, 8, 1),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(104, 0xd50, 12, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(105, 0xd60, 0, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(106, 0xd60, 4, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(107, 0xd60, 4, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(108, 0xd60, 4, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(109, 0xd60, 4, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(110, 0xd70, 0, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(111, 0xd70, 0, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(112, 0xd70, 0, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(113, 0xd70, 0, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(114, 0xd70, 4, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(115, 0xd60, 12, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(116, 0xd60, 8, 2),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_DRV_GRP(117, 0xd70, 0, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(118, 0xd70, 0, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(119, 0xd70, 0, 2),</div><div class='add'>+	MTK_PIN_DRV_GRP(120, 0xd70, 0, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_pin_spec_pupd_set_samereg mt8516_spec_pupd[] = {</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(14, 0xe50, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(15, 0xe60, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(16, 0xe60, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(17, 0xe60, 10, 9, 8),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(21, 0xe60, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(22, 0xe70, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(23, 0xe70, 6, 5, 4),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(40, 0xe80, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(41, 0xe80, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(42, 0xe90, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(43, 0xe90, 6, 5, 4),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(68, 0xe50, 10, 9, 8),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(69, 0xe50, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(70, 0xe40, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(71, 0xe40, 10, 9, 8),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(72, 0xe40, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(73, 0xe50, 2, 1, 0),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(104, 0xe40, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(105, 0xe30, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(106, 0xe20, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(107, 0xe30, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(108, 0xe30, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(109, 0xe30, 10, 9, 8),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(110, 0xe10, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(111, 0xe10, 10, 9, 8),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(112, 0xe10, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(113, 0xe10, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(114, 0xe20, 10, 9, 8),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(115, 0xe20, 2, 1, 0),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(116, 0xe20, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(117, 0xe00, 14, 13, 12),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(118, 0xe00, 10, 9, 8),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(119, 0xe00, 6, 5, 4),</div><div class='add'>+	MTK_PIN_PUPD_SPEC_SR(120, 0xe00, 2, 1, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt8516_spec_pull_set(struct regmap *regmap, unsigned int pin,</div><div class='add'>+			unsigned char align, bool isup, unsigned int r1r0)</div><div class='add'>+{</div><div class='add'>+	return mtk_pctrl_spec_pull_set_samereg(regmap, mt8516_spec_pupd,</div><div class='add'>+		ARRAY_SIZE(mt8516_spec_pupd), pin, align, isup, r1r0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mtk_pin_ies_smt_set mt8516_ies_set[] = {</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(0, 6, 0x900, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(7, 10, 0x900, 3),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(11, 13, 0x900, 12),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(14, 17, 0x900, 13),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(18, 20, 0x910, 10),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(21, 23, 0x900, 13),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(24, 25, 0x900, 12),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(26, 30, 0x900, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(31, 33, 0x900, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(34, 39, 0x900, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(40, 40, 0x910, 11),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(41, 43, 0x900, 10),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(44, 47, 0x900, 11),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(48, 51, 0x900, 14),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(52, 53, 0x910, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(54, 54, 0x910, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(55, 57, 0x910, 4),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(58, 59, 0x900, 15),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(60, 61, 0x910, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(62, 65, 0x910, 5),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(66, 67, 0x910, 6),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(68, 68, 0x930, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(69, 69, 0x930, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(70, 70, 0x930, 6),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(71, 71, 0x930, 5),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(72, 72, 0x930, 4),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(73, 73, 0x930, 3),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(100, 103, 0x910, 7),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(104, 104, 0x920, 12),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(105, 105, 0x920, 11),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(106, 106, 0x930, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(107, 107, 0x920, 15),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(108, 108, 0x920, 14),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(109, 109, 0x920, 13),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(110, 110, 0x920, 9),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(111, 111, 0x920, 8),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(112, 112, 0x920, 7),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(113, 113, 0x920, 6),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(114, 114, 0x920, 10),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(115, 115, 0x920, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(116, 116, 0x920, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(117, 117, 0x920, 5),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(118, 118, 0x920, 4),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(119, 119, 0x920, 3),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(120, 120, 0x920, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(121, 124, 0x910, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_pin_ies_smt_set mt8516_smt_set[] = {</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(0, 6, 0xA00, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(7, 10, 0xA00, 3),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(11, 13, 0xA00, 12),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(14, 17, 0xA00, 13),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(18, 20, 0xA10, 10),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(21, 23, 0xA00, 13),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(24, 25, 0xA00, 12),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(26, 30, 0xA00, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(31, 33, 0xA00, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(34, 39, 0xA900, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(40, 40, 0xA10, 11),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(41, 43, 0xA00, 10),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(44, 47, 0xA00, 11),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(48, 51, 0xA00, 14),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(52, 53, 0xA10, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(54, 54, 0xA10, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(55, 57, 0xA10, 4),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(58, 59, 0xA00, 15),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(60, 61, 0xA10, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(62, 65, 0xA10, 5),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(66, 67, 0xA10, 6),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(68, 68, 0xA30, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(69, 69, 0xA30, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(70, 70, 0xA30, 3),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(71, 71, 0xA30, 4),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(72, 72, 0xA30, 5),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(73, 73, 0xA30, 6),</div><div class='add'>+</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(100, 103, 0xA10, 7),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(104, 104, 0xA20, 12),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(105, 105, 0xA20, 11),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(106, 106, 0xA30, 13),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(107, 107, 0xA20, 14),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(108, 108, 0xA20, 15),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(109, 109, 0xA30, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(110, 110, 0xA20, 9),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(111, 111, 0xA20, 8),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(112, 112, 0xA20, 7),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(113, 113, 0xA20, 6),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(114, 114, 0xA20, 10),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(115, 115, 0xA20, 1),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(116, 116, 0xA20, 0),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(117, 117, 0xA20, 5),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(118, 118, 0xA20, 4),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(119, 119, 0xA20, 3),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(120, 120, 0xA20, 2),</div><div class='add'>+	MTK_PIN_IES_SMT_SPEC(121, 124, 0xA10, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt8516_ies_smt_set(struct regmap *regmap, unsigned int pin,</div><div class='add'>+		unsigned char align, int value, enum pin_config_param arg)</div><div class='add'>+{</div><div class='add'>+	if (arg == PIN_CONFIG_INPUT_ENABLE)</div><div class='add'>+		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8516_ies_set,</div><div class='add'>+			ARRAY_SIZE(mt8516_ies_set), pin, align, value);</div><div class='add'>+	else if (arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)</div><div class='add'>+		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8516_smt_set,</div><div class='add'>+			ARRAY_SIZE(mt8516_smt_set), pin, align, value);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mtk_pinctrl_devdata mt8516_pinctrl_data = {</div><div class='add'>+	.pins = mtk_pins_mt8516,</div><div class='add'>+	.npins = ARRAY_SIZE(mtk_pins_mt8516),</div><div class='add'>+	.grp_desc = mt8516_drv_grp,</div><div class='add'>+	.n_grp_cls = ARRAY_SIZE(mt8516_drv_grp),</div><div class='add'>+	.pin_drv_grp = mt8516_pin_drv,</div><div class='add'>+	.n_pin_drv_grps = ARRAY_SIZE(mt8516_pin_drv),</div><div class='add'>+	.spec_pull_set = mt8516_spec_pull_set,</div><div class='add'>+	.spec_ies_smt_set = mt8516_ies_smt_set,</div><div class='add'>+	.dir_offset = 0x0000,</div><div class='add'>+	.pullen_offset = 0x0500,</div><div class='add'>+	.pullsel_offset = 0x0600,</div><div class='add'>+	.dout_offset = 0x0100,</div><div class='add'>+	.din_offset = 0x0200,</div><div class='add'>+	.pinmux_offset = 0x0300,</div><div class='add'>+	.type1_start = 125,</div><div class='add'>+	.type1_end = 125,</div><div class='add'>+	.port_shf = 4,</div><div class='add'>+	.port_mask = 0xf,</div><div class='add'>+	.port_align = 4,</div><div class='add'>+	.eint_hw = {</div><div class='add'>+		.port_mask = 7,</div><div class='add'>+		.ports     = 6,</div><div class='add'>+		.ap_num    = 169,</div><div class='add'>+		.db_cnt    = 64,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt8516_pinctrl_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return mtk_pctrl_init(pdev, &amp;mt8516_pinctrl_data, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mt8516_pctrl_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "mediatek,mt8516-pinctrl",</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, mt8516_pctrl_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver mtk_pinctrl_driver = {</div><div class='add'>+	.probe = mt8516_pinctrl_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "mediatek-mt8516-pinctrl",</div><div class='add'>+		.of_match_table = mt8516_pctrl_match,</div><div class='add'>+		.pm = &amp;mtk_eint_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init mtk_pinctrl_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;mtk_pinctrl_driver);</div><div class='add'>+}</div><div class='add'>+arch_initcall(mtk_pinctrl_init);</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c<br/>index b1c368455d30..20e1c890e73b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c</a></div><div class='hunk'>@@ -674,3 +674,52 @@ int mtk_pinconf_adv_pull_get(struct mtk_pinctrl *hw,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw,</div><div class='add'>+			      const struct mtk_pin_desc *desc, u32 arg)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int en = arg &amp; 1;</div><div class='add'>+	int e0 = !!(arg &amp; 2);</div><div class='add'>+	int e1 = !!(arg &amp; 4);</div><div class='add'>+</div><div class='add'>+	err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DRV_EN, en);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!en)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DRV_E0, e0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DRV_E1, e1);</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'>+int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,</div><div class='add'>+			      const struct mtk_pin_desc *desc, u32 *val)</div><div class='add'>+{</div><div class='add'>+	u32 en, e0, e1;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV_EN, &amp;en);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV_E0, &amp;e0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV_E1, &amp;e1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*val = (en | e0 &lt;&lt; 1 | e1 &lt;&lt; 2) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h<br/>index 6d24522739d9..1b7da42aa1d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h</a></div><div class='hunk'>@@ -63,6 +63,9 @@ enum {</div><div class='ctx'> 	PINCTRL_PIN_REG_IES,</div><div class='ctx'> 	PINCTRL_PIN_REG_PULLEN,</div><div class='ctx'> 	PINCTRL_PIN_REG_PULLSEL,</div><div class='add'>+	PINCTRL_PIN_REG_DRV_EN,</div><div class='add'>+	PINCTRL_PIN_REG_DRV_E0,</div><div class='add'>+	PINCTRL_PIN_REG_DRV_E1,</div><div class='ctx'> 	PINCTRL_PIN_REG_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -224,6 +227,10 @@ struct mtk_pin_soc {</div><div class='ctx'> 	int (*adv_pull_get)(struct mtk_pinctrl *hw,</div><div class='ctx'> 			    const struct mtk_pin_desc *desc, bool pullup,</div><div class='ctx'> 			    u32 *val);</div><div class='add'>+	int (*adv_drive_set)(struct mtk_pinctrl *hw,</div><div class='add'>+			     const struct mtk_pin_desc *desc, u32 arg);</div><div class='add'>+	int (*adv_drive_get)(struct mtk_pinctrl *hw,</div><div class='add'>+			     const struct mtk_pin_desc *desc, u32 *val);</div><div class='ctx'> </div><div class='ctx'> 	/* Specific driver data */</div><div class='ctx'> 	void				*driver_data;</div><div class='hunk'>@@ -287,5 +294,9 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,</div><div class='ctx'> int mtk_pinconf_adv_pull_get(struct mtk_pinctrl *hw,</div><div class='ctx'> 			     const struct mtk_pin_desc *desc, bool pullup,</div><div class='ctx'> 			     u32 *val);</div><div class='add'>+int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw,</div><div class='add'>+			      const struct mtk_pin_desc *desc, u32 arg);</div><div class='add'>+int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,</div><div class='add'>+			      const struct mtk_pin_desc *desc, u32 *val);</div><div class='ctx'> </div><div class='ctx'> #endif /* __PINCTRL_MTK_COMMON_V2_H */</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h<br/>new file mode 100644<br/>index 000000000000..f7a4c6e4a026<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h</a></div><div class='hunk'>@@ -0,0 +1,1182 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef __PINCTRL_MTK_MT8516_H</div><div class='add'>+#define __PINCTRL_MTK_MT8516_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pinctrl/pinctrl.h&gt;</div><div class='add'>+#include "pinctrl-mtk-common.h"</div><div class='add'>+</div><div class='add'>+static const struct mtk_desc_pin mtk_pins_mt8516[] = {</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(0, "EINT0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 0),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO0"),</div><div class='add'>+		MTK_FUNCTION(1, "PWM_B"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S2_BCK"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_TXD0"),</div><div class='add'>+		MTK_FUNCTION(6, "SQICS"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[6]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(1, "EINT1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 1),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO1"),</div><div class='add'>+		MTK_FUNCTION(1, "PWM_C"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S2_DI"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_TXD1"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_TDO"),</div><div class='add'>+		MTK_FUNCTION(6, "SQISO"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[7]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(2, "EINT2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 2),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO2"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM0"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S2_LRCK"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_TXD2"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_DBGACK_N"),</div><div class='add'>+		MTK_FUNCTION(6, "SQISI"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[8]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(3, "EINT3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 3),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO3"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM1"),</div><div class='add'>+		MTK_FUNCTION(3, "SPI_MI"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_TXD3"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_DBGI_N"),</div><div class='add'>+		MTK_FUNCTION(6, "SQIWP"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[9]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(4, "EINT4"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 4),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO4"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM2"),</div><div class='add'>+		MTK_FUNCTION(3, "SPI_MO"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_TXC"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_TCK"),</div><div class='add'>+		MTK_FUNCTION(6, "CONN_MCU_AICE_JCKC"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[10]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(5, "EINT5"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 5),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO5"),</div><div class='add'>+		MTK_FUNCTION(1, "UCTS2"),</div><div class='add'>+		MTK_FUNCTION(3, "SPI_CSB"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_RXER"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_TDI"),</div><div class='add'>+		MTK_FUNCTION(6, "CONN_TEST_CK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[11]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(6, "EINT6"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 6),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO6"),</div><div class='add'>+		MTK_FUNCTION(1, "URTS2"),</div><div class='add'>+		MTK_FUNCTION(3, "SPI_CLK"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_RXC"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_TRST_B"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[12]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(7, "EINT7"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 7),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO7"),</div><div class='add'>+		MTK_FUNCTION(1, "SQIRST"),</div><div class='add'>+		MTK_FUNCTION(3, "SDA1_0"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_RXDV"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_TMS"),</div><div class='add'>+		MTK_FUNCTION(6, "CONN_MCU_AICE_JMSC"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[13]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(8, "EINT8"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 8),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO8"),</div><div class='add'>+		MTK_FUNCTION(1, "SQICK"),</div><div class='add'>+		MTK_FUNCTION(2, "CLKM3"),</div><div class='add'>+		MTK_FUNCTION(3, "SCL1_0"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_RXD0"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL0"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[14]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(9, "EINT9"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 9),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO9"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM4"),</div><div class='add'>+		MTK_FUNCTION(2, "SDA2_0"),</div><div class='add'>+		MTK_FUNCTION(3, "EXT_FRAME_SYNC"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_RXD1"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL1"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[15]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(10, "EINT10"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 10),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO10"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM5"),</div><div class='add'>+		MTK_FUNCTION(2, "SCL2_0"),</div><div class='add'>+		MTK_FUNCTION(3, "EXT_FRAME_SYNC"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_RXD2"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL2"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[16]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(11, "EINT11"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 11),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO11"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM4"),</div><div class='add'>+		MTK_FUNCTION(2, "PWM_C"),</div><div class='add'>+		MTK_FUNCTION(3, "CONN_TEST_CK"),</div><div class='add'>+		MTK_FUNCTION(4, "ANT_SEL3"),</div><div class='add'>+		MTK_FUNCTION(6, "EXT_RXD3"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[17]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(12, "EINT12"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 12),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO12"),</div><div class='add'>+		MTK_FUNCTION(1, "CLKM5"),</div><div class='add'>+		MTK_FUNCTION(2, "PWM_A"),</div><div class='add'>+		MTK_FUNCTION(3, "SPDIF_OUT"),</div><div class='add'>+		MTK_FUNCTION(4, "ANT_SEL4"),</div><div class='add'>+		MTK_FUNCTION(6, "EXT_TXEN"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[18]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(13, "EINT13"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 13),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO13"),</div><div class='add'>+		MTK_FUNCTION(3, "TSF_IN"),</div><div class='add'>+		MTK_FUNCTION(4, "ANT_SEL5"),</div><div class='add'>+		MTK_FUNCTION(6, "SPDIF_IN"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[19]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(14, "EINT14"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 14),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO14"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO1"),</div><div class='add'>+		MTK_FUNCTION(3, "TDM_RX_MCK"),</div><div class='add'>+		MTK_FUNCTION(4, "ANT_SEL1"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_DBGACK_N"),</div><div class='add'>+		MTK_FUNCTION(6, "NCLE"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[8]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(15, "EINT15"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 15),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO15"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_LRCK"),</div><div class='add'>+		MTK_FUNCTION(3, "TDM_RX_BCK"),</div><div class='add'>+		MTK_FUNCTION(4, "ANT_SEL2"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_DBGI_N"),</div><div class='add'>+		MTK_FUNCTION(6, "NCEB1"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[9]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(16, "EINT16"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 16),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO16"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_BCK"),</div><div class='add'>+		MTK_FUNCTION(3, "TDM_RX_LRCK"),</div><div class='add'>+		MTK_FUNCTION(4, "ANT_SEL3"),</div><div class='add'>+		MTK_FUNCTION(5, "CONN_MCU_TRST_B"),</div><div class='add'>+		MTK_FUNCTION(6, "NCEB0"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[10]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(17, "EINT17"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 17),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO17"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_MCK"),</div><div class='add'>+		MTK_FUNCTION(3, "TDM_RX_DI"),</div><div class='add'>+		MTK_FUNCTION(4, "IDDIG"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL4"),</div><div class='add'>+		MTK_FUNCTION(6, "NREB"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[11]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(18, "EINT18"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 18),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO18"),</div><div class='add'>+		MTK_FUNCTION(2, "USB_DRVVBUS"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S3_LRCK"),</div><div class='add'>+		MTK_FUNCTION(4, "CLKM1"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL3"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_BCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[20]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(19, "EINT19"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 19),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO19"),</div><div class='add'>+		MTK_FUNCTION(1, "UCTS1"),</div><div class='add'>+		MTK_FUNCTION(2, "IDDIG"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S3_BCK"),</div><div class='add'>+		MTK_FUNCTION(4, "CLKM2"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL4"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_DI"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[21]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(20, "EINT20"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 20),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO20"),</div><div class='add'>+		MTK_FUNCTION(1, "URTS1"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S3_DO"),</div><div class='add'>+		MTK_FUNCTION(4, "CLKM3"),</div><div class='add'>+		MTK_FUNCTION(5, "ANT_SEL5"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_LRCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[22]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(21, "EINT21"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 21),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO21"),</div><div class='add'>+		MTK_FUNCTION(1, "NRNB"),</div><div class='add'>+		MTK_FUNCTION(2, "ANT_SEL0"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S_8CH_DO4"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[31]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(22, "EINT22"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 22),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO22"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO2"),</div><div class='add'>+		MTK_FUNCTION(3, "TSF_IN"),</div><div class='add'>+		MTK_FUNCTION(4, "USB_DRVVBUS"),</div><div class='add'>+		MTK_FUNCTION(5, "SPDIF_OUT"),</div><div class='add'>+		MTK_FUNCTION(6, "NRE_C"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[12]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(23, "EINT23"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 23),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO23"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO3"),</div><div class='add'>+		MTK_FUNCTION(3, "CLKM0"),</div><div class='add'>+		MTK_FUNCTION(4, "IR"),</div><div class='add'>+		MTK_FUNCTION(5, "SPDIF_IN"),</div><div class='add'>+		MTK_FUNCTION(6, "NDQS_C"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[13]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(24, "EINT24"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 24),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO24"),</div><div class='add'>+		MTK_FUNCTION(3, "ANT_SEL1"),</div><div class='add'>+		MTK_FUNCTION(4, "UCTS2"),</div><div class='add'>+		MTK_FUNCTION(5, "PWM_A"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S0_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[0]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(25, "EINT25"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 25),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO25"),</div><div class='add'>+		MTK_FUNCTION(3, "ANT_SEL0"),</div><div class='add'>+		MTK_FUNCTION(4, "URTS2"),</div><div class='add'>+		MTK_FUNCTION(5, "PWM_B"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S_8CH_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[1]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(26, "PWRAP_SPI0_MI"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 26),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO26"),</div><div class='add'>+		MTK_FUNCTION(1, "PWRAP_SPI0_MO"),</div><div class='add'>+		MTK_FUNCTION(2, "PWRAP_SPI0_MI")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(27, "PWRAP_SPI0_MO"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 27),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO27"),</div><div class='add'>+		MTK_FUNCTION(1, "PWRAP_SPI0_MI"),</div><div class='add'>+		MTK_FUNCTION(2, "PWRAP_SPI0_MO")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(28, "PWRAP_INT"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 28),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO28"),</div><div class='add'>+		MTK_FUNCTION(1, "I2S0_MCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S_8CH_MCK"),</div><div class='add'>+		MTK_FUNCTION(5, "I2S2_MCK"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S3_MCK")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(29, "PWRAP_SPI0_CK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 29),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO29"),</div><div class='add'>+		MTK_FUNCTION(1, "PWRAP_SPI0_CK")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(30, "PWRAP_SPI0_CSN"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 30),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO30"),</div><div class='add'>+		MTK_FUNCTION(1, "PWRAP_SPI0_CSN")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(31, "RTC32K_CK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 31),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO31"),</div><div class='add'>+		MTK_FUNCTION(1, "RTC32K_CK")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(32, "WATCHDOG"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 32),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO32"),</div><div class='add'>+		MTK_FUNCTION(1, "WATCHDOG")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(33, "SRCLKENA"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 33),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO33"),</div><div class='add'>+		MTK_FUNCTION(1, "SRCLKENA0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(34, "URXD2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 34),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO34"),</div><div class='add'>+		MTK_FUNCTION(1, "URXD2"),</div><div class='add'>+		MTK_FUNCTION(3, "UTXD2"),</div><div class='add'>+		MTK_FUNCTION(4, "DBG_SCL"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[0]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(35, "UTXD2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 35),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO35"),</div><div class='add'>+		MTK_FUNCTION(1, "UTXD2"),</div><div class='add'>+		MTK_FUNCTION(3, "URXD2"),</div><div class='add'>+		MTK_FUNCTION(4, "DBG_SDA"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S3_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[1]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(36, "MRG_CLK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 36),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO36"),</div><div class='add'>+		MTK_FUNCTION(1, "MRG_CLK"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_BCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S3_BCK"),</div><div class='add'>+		MTK_FUNCTION(5, "PCM0_CLK"),</div><div class='add'>+		MTK_FUNCTION(6, "IR"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[2]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(37, "MRG_SYNC"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 37),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO37"),</div><div class='add'>+		MTK_FUNCTION(1, "MRG_SYNC"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_LRCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S3_LRCK"),</div><div class='add'>+		MTK_FUNCTION(5, "PCM0_SYNC"),</div><div class='add'>+		MTK_FUNCTION(6, "EXT_COL"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[3]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(38, "MRG_DI"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 38),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO38"),</div><div class='add'>+		MTK_FUNCTION(1, "MRG_DI"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_DI"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S3_DO"),</div><div class='add'>+		MTK_FUNCTION(5, "PCM0_DI"),</div><div class='add'>+		MTK_FUNCTION(6, "EXT_MDIO"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[4]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(39, "MRG_DO"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 39),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO39"),</div><div class='add'>+		MTK_FUNCTION(1, "MRG_DO"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_MCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S3_MCK"),</div><div class='add'>+		MTK_FUNCTION(5, "PCM0_DO"),</div><div class='add'>+		MTK_FUNCTION(6, "EXT_MDC"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[5]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(40, "KPROW0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 40),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO40"),</div><div class='add'>+		MTK_FUNCTION(1, "KPROW0"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[4]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(41, "KPROW1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 41),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO41"),</div><div class='add'>+		MTK_FUNCTION(1, "KPROW1"),</div><div class='add'>+		MTK_FUNCTION(2, "IDDIG"),</div><div class='add'>+		MTK_FUNCTION(3, "EXT_FRAME_SYNC"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[5]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(42, "KPCOL0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 42),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO42"),</div><div class='add'>+		MTK_FUNCTION(1, "KPCOL0"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[6]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(43, "KPCOL1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 43),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO43"),</div><div class='add'>+		MTK_FUNCTION(1, "KPCOL1"),</div><div class='add'>+		MTK_FUNCTION(2, "USB_DRVVBUS"),</div><div class='add'>+		MTK_FUNCTION(3, "EXT_FRAME_SYNC"),</div><div class='add'>+		MTK_FUNCTION(4, "TSF_IN"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[7]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(44, "JTMS"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 44),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO44"),</div><div class='add'>+		MTK_FUNCTION(1, "JTMS"),</div><div class='add'>+		MTK_FUNCTION(2, "CONN_MCU_TMS"),</div><div class='add'>+		MTK_FUNCTION(3, "CONN_MCU_AICE_JMSC")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(45, "JTCK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 45),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO45"),</div><div class='add'>+		MTK_FUNCTION(1, "JTCK"),</div><div class='add'>+		MTK_FUNCTION(2, "CONN_MCU_TCK"),</div><div class='add'>+		MTK_FUNCTION(3, "CONN_MCU_AICE_JCKC")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(46, "JTDI"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 46),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO46"),</div><div class='add'>+		MTK_FUNCTION(1, "JTDI"),</div><div class='add'>+		MTK_FUNCTION(2, "CONN_MCU_TDI")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(47, "JTDO"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 47),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO47"),</div><div class='add'>+		MTK_FUNCTION(1, "JTDO"),</div><div class='add'>+		MTK_FUNCTION(2, "CONN_MCU_TDO")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(48, "SPI_CS"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 48),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO48"),</div><div class='add'>+		MTK_FUNCTION(1, "SPI_CSB"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_DI"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S2_BCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[23]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(49, "SPI_CK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 49),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO49"),</div><div class='add'>+		MTK_FUNCTION(1, "SPI_CLK"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_LRCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S2_DI"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[24]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(50, "SPI_MI"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 50),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO50"),</div><div class='add'>+		MTK_FUNCTION(1, "SPI_MI"),</div><div class='add'>+		MTK_FUNCTION(2, "SPI_MO"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_BCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S2_LRCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[25]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(51, "SPI_MO"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 51),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO51"),</div><div class='add'>+		MTK_FUNCTION(1, "SPI_MO"),</div><div class='add'>+		MTK_FUNCTION(2, "SPI_MI"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_MCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S2_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[26]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(52, "SDA1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 52),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO52"),</div><div class='add'>+		MTK_FUNCTION(1, "SDA1_0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(53, "SCL1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 53),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO53"),</div><div class='add'>+		MTK_FUNCTION(1, "SCL1_0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(54, "GPIO54"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 54),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO54"),</div><div class='add'>+		MTK_FUNCTION(2, "PWM_B"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[2]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(55, "I2S_DATA_IN"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 55),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO55"),</div><div class='add'>+		MTK_FUNCTION(1, "I2S0_DI"),</div><div class='add'>+		MTK_FUNCTION(2, "UCTS0"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S3_DO"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S_8CH_DO1"),</div><div class='add'>+		MTK_FUNCTION(5, "PWM_A"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_BCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[28]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(56, "I2S_LRCK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 56),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO56"),</div><div class='add'>+		MTK_FUNCTION(1, "I2S0_LRCK"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S3_LRCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S_8CH_LRCK"),</div><div class='add'>+		MTK_FUNCTION(5, "PWM_B"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_DI"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[29]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(57, "I2S_BCK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 57),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO57"),</div><div class='add'>+		MTK_FUNCTION(1, "I2S0_BCK"),</div><div class='add'>+		MTK_FUNCTION(2, "URTS0"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S3_BCK"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S_8CH_BCK"),</div><div class='add'>+		MTK_FUNCTION(5, "PWM_C"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S2_LRCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[30]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(58, "SDA0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 58),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO58"),</div><div class='add'>+		MTK_FUNCTION(1, "SDA0_0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(59, "SCL0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 59),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO59"),</div><div class='add'>+		MTK_FUNCTION(1, "SCL0_0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(60, "SDA2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 60),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO60"),</div><div class='add'>+		MTK_FUNCTION(1, "SDA2_0"),</div><div class='add'>+		MTK_FUNCTION(2, "PWM_B")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(61, "SCL2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 61),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO61"),</div><div class='add'>+		MTK_FUNCTION(1, "SCL2_0"),</div><div class='add'>+		MTK_FUNCTION(2, "PWM_C")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(62, "URXD0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 62),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO62"),</div><div class='add'>+		MTK_FUNCTION(1, "URXD0"),</div><div class='add'>+		MTK_FUNCTION(2, "UTXD0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(63, "UTXD0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 63),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO63"),</div><div class='add'>+		MTK_FUNCTION(1, "UTXD0"),</div><div class='add'>+		MTK_FUNCTION(2, "URXD0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(64, "URXD1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 64),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO64"),</div><div class='add'>+		MTK_FUNCTION(1, "URXD1"),</div><div class='add'>+		MTK_FUNCTION(2, "UTXD1"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[27]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(65, "UTXD1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 65),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO65"),</div><div class='add'>+		MTK_FUNCTION(1, "UTXD1"),</div><div class='add'>+		MTK_FUNCTION(2, "URXD1"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_A[31]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(66, "LCM_RST"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 66),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO66"),</div><div class='add'>+		MTK_FUNCTION(1, "LCM_RST"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S0_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[3]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(67, "GPIO67"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 67),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO67"),</div><div class='add'>+		MTK_FUNCTION(3, "I2S_8CH_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[14]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(68, "MSDC2_CMD"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 68),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO68"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC2_CMD"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO4"),</div><div class='add'>+		MTK_FUNCTION(3, "SDA1_0"),</div><div class='add'>+		MTK_FUNCTION(5, "USB_SDA"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S3_BCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[15]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(69, "MSDC2_CLK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 69),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO69"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC2_CLK"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO3"),</div><div class='add'>+		MTK_FUNCTION(3, "SCL1_0"),</div><div class='add'>+		MTK_FUNCTION(5, "USB_SCL"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S3_LRCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[16]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(70, "MSDC2_DAT0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 70),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO70"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC2_DAT0"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO2"),</div><div class='add'>+		MTK_FUNCTION(5, "UTXD0"),</div><div class='add'>+		MTK_FUNCTION(6, "I2S3_DO"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[17]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(71, "MSDC2_DAT1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 71),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO71"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC2_DAT1"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_DO1"),</div><div class='add'>+		MTK_FUNCTION(3, "PWM_A"),</div><div class='add'>+		MTK_FUNCTION(4, "I2S3_MCK"),</div><div class='add'>+		MTK_FUNCTION(5, "URXD0"),</div><div class='add'>+		MTK_FUNCTION(6, "PWM_B"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[18]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(72, "MSDC2_DAT2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 72),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO72"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC2_DAT2"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_LRCK"),</div><div class='add'>+		MTK_FUNCTION(3, "SDA2_0"),</div><div class='add'>+		MTK_FUNCTION(5, "UTXD1"),</div><div class='add'>+		MTK_FUNCTION(6, "PWM_C"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[19]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(73, "MSDC2_DAT3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 73),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO73"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC2_DAT3"),</div><div class='add'>+		MTK_FUNCTION(2, "I2S_8CH_BCK"),</div><div class='add'>+		MTK_FUNCTION(3, "SCL2_0"),</div><div class='add'>+		MTK_FUNCTION(4, "EXT_FRAME_SYNC"),</div><div class='add'>+		MTK_FUNCTION(5, "URXD1"),</div><div class='add'>+		MTK_FUNCTION(6, "PWM_A"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[20]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(74, "TDN3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 74),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO74"),</div><div class='add'>+		MTK_FUNCTION(1, "TDN3")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(75, "TDP3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 75),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO75"),</div><div class='add'>+		MTK_FUNCTION(1, "TDP3")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(76, "TDN2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 76),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO76"),</div><div class='add'>+		MTK_FUNCTION(1, "TDN2")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(77, "TDP2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 77),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO77"),</div><div class='add'>+		MTK_FUNCTION(1, "TDP2")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(78, "TCN"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 78),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO78"),</div><div class='add'>+		MTK_FUNCTION(1, "TCN")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(79, "TCP"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 79),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO79"),</div><div class='add'>+		MTK_FUNCTION(1, "TCP")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(80, "TDN1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 80),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO80"),</div><div class='add'>+		MTK_FUNCTION(1, "TDN1")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(81, "TDP1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 81),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO81"),</div><div class='add'>+		MTK_FUNCTION(1, "TDP1")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(82, "TDN0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 82),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO82"),</div><div class='add'>+		MTK_FUNCTION(1, "TDN0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(83, "TDP0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 83),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO83"),</div><div class='add'>+		MTK_FUNCTION(1, "TDP0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(84, "RDN0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 84),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO84"),</div><div class='add'>+		MTK_FUNCTION(1, "RDN0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(85, "RDP0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 85),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO85"),</div><div class='add'>+		MTK_FUNCTION(1, "RDP0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(86, "RDN1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 86),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO86"),</div><div class='add'>+		MTK_FUNCTION(1, "RDN1")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(87, "RDP1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 87),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO87"),</div><div class='add'>+		MTK_FUNCTION(1, "RDP1")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(88, "RCN"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 88),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO88"),</div><div class='add'>+		MTK_FUNCTION(1, "RCN")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(89, "RCP"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 89),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO89"),</div><div class='add'>+		MTK_FUNCTION(1, "RCP")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(90, "RDN2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 90),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO90"),</div><div class='add'>+		MTK_FUNCTION(1, "RDN2"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT8")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(91, "RDP2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 91),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO91"),</div><div class='add'>+		MTK_FUNCTION(1, "RDP2"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT9")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(92, "RDN3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 92),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO92"),</div><div class='add'>+		MTK_FUNCTION(1, "RDN3"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT4")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(93, "RDP3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 93),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO93"),</div><div class='add'>+		MTK_FUNCTION(1, "RDP3"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT5")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(94, "RCN_A"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 94),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO94"),</div><div class='add'>+		MTK_FUNCTION(1, "RCN_A"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT6")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(95, "RCP_A"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 95),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO95"),</div><div class='add'>+		MTK_FUNCTION(1, "RCP_A"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT7")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(96, "RDN1_A"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 96),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO96"),</div><div class='add'>+		MTK_FUNCTION(1, "RDN1_A"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT2"),</div><div class='add'>+		MTK_FUNCTION(3, "CMCSD2")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(97, "RDP1_A"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 97),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO97"),</div><div class='add'>+		MTK_FUNCTION(1, "RDP1_A"),</div><div class='add'>+		MTK_FUNCTION(2, "CMDAT3"),</div><div class='add'>+		MTK_FUNCTION(3, "CMCSD3")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(98, "RDN0_A"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 98),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO98"),</div><div class='add'>+		MTK_FUNCTION(1, "RDN0_A"),</div><div class='add'>+		MTK_FUNCTION(2, "CMHSYNC")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(99, "RDP0_A"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 99),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO99"),</div><div class='add'>+		MTK_FUNCTION(1, "RDP0_A"),</div><div class='add'>+		MTK_FUNCTION(2, "CMVSYNC")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(100, "CMDAT0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 100),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO100"),</div><div class='add'>+		MTK_FUNCTION(1, "CMDAT0"),</div><div class='add'>+		MTK_FUNCTION(2, "CMCSD0"),</div><div class='add'>+		MTK_FUNCTION(3, "ANT_SEL2"),</div><div class='add'>+		MTK_FUNCTION(5, "TDM_RX_MCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[21]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(101, "CMDAT1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 101),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO101"),</div><div class='add'>+		MTK_FUNCTION(1, "CMDAT1"),</div><div class='add'>+		MTK_FUNCTION(2, "CMCSD1"),</div><div class='add'>+		MTK_FUNCTION(3, "ANT_SEL3"),</div><div class='add'>+		MTK_FUNCTION(4, "CMFLASH"),</div><div class='add'>+		MTK_FUNCTION(5, "TDM_RX_BCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[22]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(102, "CMMCLK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 102),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO102"),</div><div class='add'>+		MTK_FUNCTION(1, "CMMCLK"),</div><div class='add'>+		MTK_FUNCTION(3, "ANT_SEL4"),</div><div class='add'>+		MTK_FUNCTION(5, "TDM_RX_LRCK"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[23]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(103, "CMPCLK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 103),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO103"),</div><div class='add'>+		MTK_FUNCTION(1, "CMPCLK"),</div><div class='add'>+		MTK_FUNCTION(2, "CMCSK"),</div><div class='add'>+		MTK_FUNCTION(3, "ANT_SEL5"),</div><div class='add'>+		MTK_FUNCTION(5, " TDM_RX_DI"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[24]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(104, "MSDC1_CMD"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 104),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO104"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC1_CMD"),</div><div class='add'>+		MTK_FUNCTION(4, "SQICS"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[25]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(105, "MSDC1_CLK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 105),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO105"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC1_CLK"),</div><div class='add'>+		MTK_FUNCTION(4, "SQISO"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[26]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(106, "MSDC1_DAT0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 106),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO106"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC1_DAT0"),</div><div class='add'>+		MTK_FUNCTION(4, "SQISI"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[27]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(107, "MSDC1_DAT1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 107),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO107"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC1_DAT1"),</div><div class='add'>+		MTK_FUNCTION(4, "SQIWP"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[28]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(108, "MSDC1_DAT2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 108),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO108"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC1_DAT2"),</div><div class='add'>+		MTK_FUNCTION(4, "SQIRST"),</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[29]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(109, "MSDC1_DAT3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 109),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO109"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC1_DAT3"),</div><div class='add'>+		MTK_FUNCTION(4, "SQICK"), /* WIP */</div><div class='add'>+		MTK_FUNCTION(7, "DBG_MON_B[30]")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(110, "MSDC0_DAT7"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 110),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO110"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT7"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD7")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(111, "MSDC0_DAT6"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 111),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO111"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT6"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD6")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(112, "MSDC0_DAT5"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 112),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO112"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT5"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD4")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(113, "MSDC0_DAT4"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 113),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO113"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT4"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD3")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(114, "MSDC0_RSTB"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 114),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO114"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_RSTB"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD0")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(115, "MSDC0_CMD"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 115),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO115"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_CMD"),</div><div class='add'>+		MTK_FUNCTION(4, "NALE")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(116, "MSDC0_CLK"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 116),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO116"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_CLK"),</div><div class='add'>+		MTK_FUNCTION(4, "NWEB")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(117, "MSDC0_DAT3"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 117),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO117"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT3"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD1")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(118, "MSDC0_DAT2"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 118),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO118"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT2"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD5")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(119, "MSDC0_DAT1"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 119),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO119"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT1"),</div><div class='add'>+		MTK_FUNCTION(4, "NLD8")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(120, "MSDC0_DAT0"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 120),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO120"),</div><div class='add'>+		MTK_FUNCTION(1, "MSDC0_DAT0"),</div><div class='add'>+		MTK_FUNCTION(4, "WATCHDOG"),</div><div class='add'>+		MTK_FUNCTION(5, "NLD2")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(121, "GPIO121"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 121),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO121")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(122, "GPIO122"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 122),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO122")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(123, "GPIO123"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 123),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO123")</div><div class='add'>+	),</div><div class='add'>+	MTK_PIN(</div><div class='add'>+		PINCTRL_PIN(124, "GPIO124"),</div><div class='add'>+		NULL, "mt8516",</div><div class='add'>+		MTK_EINT_FUNCTION(0, 124),</div><div class='add'>+		MTK_FUNCTION(0, "GPIO124")</div><div class='add'>+	),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __PINCTRL_MTK_MT8516_H */</div><div class='head'>diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c<br/>index b59e10852bfb..d3b34e9a7507 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-paris.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/mediatek/pinctrl-paris.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/mediatek/pinctrl-paris.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/mediatek/pinctrl-paris.c</a></div><div class='hunk'>@@ -20,12 +20,14 @@</div><div class='ctx'> #define MTK_PIN_CONFIG_RDSEL	(PIN_CONFIG_END + 2)</div><div class='ctx'> #define MTK_PIN_CONFIG_PU_ADV	(PIN_CONFIG_END + 3)</div><div class='ctx'> #define MTK_PIN_CONFIG_PD_ADV	(PIN_CONFIG_END + 4)</div><div class='add'>+#define MTK_PIN_CONFIG_DRV_ADV	(PIN_CONFIG_END + 5)</div><div class='ctx'> </div><div class='ctx'> static const struct pinconf_generic_params mtk_custom_bindings[] = {</div><div class='ctx'> 	{"mediatek,tdsel",	MTK_PIN_CONFIG_TDSEL,		0},</div><div class='ctx'> 	{"mediatek,rdsel",	MTK_PIN_CONFIG_RDSEL,		0},</div><div class='ctx'> 	{"mediatek,pull-up-adv", MTK_PIN_CONFIG_PU_ADV,		1},</div><div class='ctx'> 	{"mediatek,pull-down-adv", MTK_PIN_CONFIG_PD_ADV,	1},</div><div class='add'>+	{"mediatek,drive-strength-adv", MTK_PIN_CONFIG_DRV_ADV,	2},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='hunk'>@@ -34,6 +36,7 @@ static const struct pin_config_item mtk_conf_items[] = {</div><div class='ctx'> 	PCONFDUMP(MTK_PIN_CONFIG_RDSEL, "rdsel", NULL, true),</div><div class='ctx'> 	PCONFDUMP(MTK_PIN_CONFIG_PU_ADV, "pu-adv", NULL, true),</div><div class='ctx'> 	PCONFDUMP(MTK_PIN_CONFIG_PD_ADV, "pd-adv", NULL, true),</div><div class='add'>+	PCONFDUMP(MTK_PIN_CONFIG_DRV_ADV, "drive-strength-adv", NULL, true),</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +179,15 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,</div><div class='ctx'> 			return -ENOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case MTK_PIN_CONFIG_DRV_ADV:</div><div class='add'>+		if (hw-&gt;soc-&gt;adv_drive_get) {</div><div class='add'>+			err = hw-&gt;soc-&gt;adv_drive_get(hw, desc, &amp;ret);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			return -ENOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -311,6 +323,15 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,</div><div class='ctx'> 			return -ENOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case MTK_PIN_CONFIG_DRV_ADV:</div><div class='add'>+		if (hw-&gt;soc-&gt;adv_drive_set) {</div><div class='add'>+			err = hw-&gt;soc-&gt;adv_drive_set(hw, desc, arg);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			return -ENOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c<br/>index 6689995fa3aa..e18ebb2c78d9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-amd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-amd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-amd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-amd.c</a></div><div class='hunk'>@@ -930,8 +930,8 @@ static int amd_gpio_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = devm_request_irq(&amp;pdev-&gt;dev, irq_base, amd_gpio_irq_handler, 0,</div><div class='del'>-			       KBUILD_MODNAME, gpio_dev);</div><div class='add'>+	ret = devm_request_irq(&amp;pdev-&gt;dev, irq_base, amd_gpio_irq_handler,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, gpio_dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-artpec6.c b/drivers/pinctrl/pinctrl-artpec6.c<br/>index d89dc43c5757..e3239cf926f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-artpec6.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-artpec6.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-artpec6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-artpec6.c</a></div><div class='hunk'>@@ -688,8 +688,9 @@ static void artpec6_pmx_select_func(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int artpec6_pmx_enable(struct pinctrl_dev *pctldev, unsigned int function,</div><div class='del'>-		       unsigned int group)</div><div class='add'>+static int artpec6_pmx_set(struct pinctrl_dev *pctldev,</div><div class='add'>+			   unsigned int function,</div><div class='add'>+			   unsigned int group)</div><div class='ctx'> {</div><div class='ctx'> 	struct artpec6_pmx *pmx = pinctrl_dev_get_drvdata(pctldev);</div><div class='ctx'> </div><div class='hunk'>@@ -702,18 +703,6 @@ int artpec6_pmx_enable(struct pinctrl_dev *pctldev, unsigned int function,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void artpec6_pmx_disable(struct pinctrl_dev *pctldev, unsigned int function,</div><div class='del'>-			 unsigned int group)</div><div class='del'>-{</div><div class='del'>-	struct artpec6_pmx *pmx = pinctrl_dev_get_drvdata(pctldev);</div><div class='del'>-</div><div class='del'>-	dev_dbg(pmx-&gt;dev, "disabling %s function for pin group %s\n",</div><div class='del'>-		artpec6_pmx_get_fname(pctldev, function),</div><div class='del'>-		artpec6_get_group_name(pctldev, group));</div><div class='del'>-</div><div class='del'>-	artpec6_pmx_select_func(pctldev, function, group, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int artpec6_pmx_request_gpio(struct pinctrl_dev *pctldev,</div><div class='ctx'> 				    struct pinctrl_gpio_range *range,</div><div class='ctx'> 				    unsigned int pin)</div><div class='hunk'>@@ -737,7 +726,7 @@ static const struct pinmux_ops artpec6_pmx_ops = {</div><div class='ctx'> 	.get_functions_count	= artpec6_pmx_get_functions_count,</div><div class='ctx'> 	.get_function_name	= artpec6_pmx_get_fname,</div><div class='ctx'> 	.get_function_groups	= artpec6_pmx_get_fgroups,</div><div class='del'>-	.set_mux		= artpec6_pmx_enable,</div><div class='add'>+	.set_mux		= artpec6_pmx_set,</div><div class='ctx'> 	.gpio_request_enable = artpec6_pmx_request_gpio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c<br/>index afd0b533c40a..4fcf7262bed9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-axp209.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-axp209.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-axp209.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-axp209.c</a></div><div class='hunk'>@@ -366,6 +366,8 @@ static int axp20x_build_funcs_groups(struct platform_device *pdev)</div><div class='ctx'> 		pctl-&gt;funcs[i].groups = devm_kcalloc(&amp;pdev-&gt;dev,</div><div class='ctx'> 						     npins, sizeof(char *),</div><div class='ctx'> 						     GFP_KERNEL);</div><div class='add'>+		if (!pctl-&gt;funcs[i].groups)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		for (pin = 0; pin &lt; npins; pin++)</div><div class='ctx'> 			pctl-&gt;funcs[i].groups[pin] = pctl-&gt;desc-&gt;pins[pin].name;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-bm1880.c b/drivers/pinctrl/pinctrl-bm1880.c<br/>new file mode 100644<br/>index 000000000000..446b07d8fbfc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-bm1880.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-bm1880.c</a></div><div class='hunk'>@@ -0,0 +1,965 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Bitmain BM1880 SoC Pinctrl driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Linaro Ltd.</div><div class='add'>+ * Author: Manivannan Sadhasivam &lt;manivannan.sadhasivam@linaro.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.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/pinctrl/pinctrl.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinmux.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinconf-generic.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "pinctrl-utils.h"</div><div class='add'>+</div><div class='add'>+#define BM1880_REG_MUX 0x20</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct bm1880_pinctrl - driver data</div><div class='add'>+ * @base:	Pinctrl base address</div><div class='add'>+ * @pctrl:	Pinctrl device</div><div class='add'>+ * @groups:	Pingroups</div><div class='add'>+ * @ngroups:	Number of @groups</div><div class='add'>+ * @funcs:	Pinmux functions</div><div class='add'>+ * @nfuncs:	Number of @funcs</div><div class='add'>+ */</div><div class='add'>+struct bm1880_pinctrl {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct pinctrl_dev *pctrldev;</div><div class='add'>+	const struct bm1880_pctrl_group *groups;</div><div class='add'>+	unsigned int ngroups;</div><div class='add'>+	const struct bm1880_pinmux_function *funcs;</div><div class='add'>+	unsigned int nfuncs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct bm1880_pctrl_group - pinctrl group</div><div class='add'>+ * @name:	Name of the group</div><div class='add'>+ * @pins:	Array of pins belonging to this group</div><div class='add'>+ * @npins:	Number of @pins</div><div class='add'>+ */</div><div class='add'>+struct bm1880_pctrl_group {</div><div class='add'>+	const char *name;</div><div class='add'>+	const unsigned int *pins;</div><div class='add'>+	const unsigned int npins;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct bm1880_pinmux_function - a pinmux function</div><div class='add'>+ * @name:	Name of the pinmux function.</div><div class='add'>+ * @groups:	List of pingroups for this function.</div><div class='add'>+ * @ngroups:	Number of entries in @groups.</div><div class='add'>+ * @mux_val:	Selector for this function</div><div class='add'>+ * @mux_mask:   Mask for function specific selector</div><div class='add'>+ * @mux:	Offset of function specific mux</div><div class='add'>+ * @mux_shift:	Shift for function specific selector</div><div class='add'>+ */</div><div class='add'>+struct bm1880_pinmux_function {</div><div class='add'>+	const char *name;</div><div class='add'>+	const char * const *groups;</div><div class='add'>+	unsigned int ngroups;</div><div class='add'>+	u32 mux_val;</div><div class='add'>+	u32 mux_mask;</div><div class='add'>+	u32 mux;</div><div class='add'>+	u8 mux_shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct pinctrl_pin_desc bm1880_pins[] = {</div><div class='add'>+	PINCTRL_PIN(0,   "MIO0"),</div><div class='add'>+	PINCTRL_PIN(1,   "MIO1"),</div><div class='add'>+	PINCTRL_PIN(2,   "MIO2"),</div><div class='add'>+	PINCTRL_PIN(3,   "MIO3"),</div><div class='add'>+	PINCTRL_PIN(4,   "MIO4"),</div><div class='add'>+	PINCTRL_PIN(5,   "MIO5"),</div><div class='add'>+	PINCTRL_PIN(6,   "MIO6"),</div><div class='add'>+	PINCTRL_PIN(7,   "MIO7"),</div><div class='add'>+	PINCTRL_PIN(8,   "MIO8"),</div><div class='add'>+	PINCTRL_PIN(9,   "MIO9"),</div><div class='add'>+	PINCTRL_PIN(10,   "MIO10"),</div><div class='add'>+	PINCTRL_PIN(11,   "MIO11"),</div><div class='add'>+	PINCTRL_PIN(12,   "MIO12"),</div><div class='add'>+	PINCTRL_PIN(13,   "MIO13"),</div><div class='add'>+	PINCTRL_PIN(14,   "MIO14"),</div><div class='add'>+	PINCTRL_PIN(15,   "MIO15"),</div><div class='add'>+	PINCTRL_PIN(16,   "MIO16"),</div><div class='add'>+	PINCTRL_PIN(17,   "MIO17"),</div><div class='add'>+	PINCTRL_PIN(18,   "MIO18"),</div><div class='add'>+	PINCTRL_PIN(19,   "MIO19"),</div><div class='add'>+	PINCTRL_PIN(20,   "MIO20"),</div><div class='add'>+	PINCTRL_PIN(21,   "MIO21"),</div><div class='add'>+	PINCTRL_PIN(22,   "MIO22"),</div><div class='add'>+	PINCTRL_PIN(23,   "MIO23"),</div><div class='add'>+	PINCTRL_PIN(24,   "MIO24"),</div><div class='add'>+	PINCTRL_PIN(25,   "MIO25"),</div><div class='add'>+	PINCTRL_PIN(26,   "MIO26"),</div><div class='add'>+	PINCTRL_PIN(27,   "MIO27"),</div><div class='add'>+	PINCTRL_PIN(28,   "MIO28"),</div><div class='add'>+	PINCTRL_PIN(29,   "MIO29"),</div><div class='add'>+	PINCTRL_PIN(30,   "MIO30"),</div><div class='add'>+	PINCTRL_PIN(31,   "MIO31"),</div><div class='add'>+	PINCTRL_PIN(32,   "MIO32"),</div><div class='add'>+	PINCTRL_PIN(33,   "MIO33"),</div><div class='add'>+	PINCTRL_PIN(34,   "MIO34"),</div><div class='add'>+	PINCTRL_PIN(35,   "MIO35"),</div><div class='add'>+	PINCTRL_PIN(36,   "MIO36"),</div><div class='add'>+	PINCTRL_PIN(37,   "MIO37"),</div><div class='add'>+	PINCTRL_PIN(38,   "MIO38"),</div><div class='add'>+	PINCTRL_PIN(39,   "MIO39"),</div><div class='add'>+	PINCTRL_PIN(40,   "MIO40"),</div><div class='add'>+	PINCTRL_PIN(41,   "MIO41"),</div><div class='add'>+	PINCTRL_PIN(42,   "MIO42"),</div><div class='add'>+	PINCTRL_PIN(43,   "MIO43"),</div><div class='add'>+	PINCTRL_PIN(44,   "MIO44"),</div><div class='add'>+	PINCTRL_PIN(45,   "MIO45"),</div><div class='add'>+	PINCTRL_PIN(46,   "MIO46"),</div><div class='add'>+	PINCTRL_PIN(47,   "MIO47"),</div><div class='add'>+	PINCTRL_PIN(48,   "MIO48"),</div><div class='add'>+	PINCTRL_PIN(49,   "MIO49"),</div><div class='add'>+	PINCTRL_PIN(50,   "MIO50"),</div><div class='add'>+	PINCTRL_PIN(51,   "MIO51"),</div><div class='add'>+	PINCTRL_PIN(52,   "MIO52"),</div><div class='add'>+	PINCTRL_PIN(53,   "MIO53"),</div><div class='add'>+	PINCTRL_PIN(54,   "MIO54"),</div><div class='add'>+	PINCTRL_PIN(55,   "MIO55"),</div><div class='add'>+	PINCTRL_PIN(56,   "MIO56"),</div><div class='add'>+	PINCTRL_PIN(57,   "MIO57"),</div><div class='add'>+	PINCTRL_PIN(58,   "MIO58"),</div><div class='add'>+	PINCTRL_PIN(59,   "MIO59"),</div><div class='add'>+	PINCTRL_PIN(60,   "MIO60"),</div><div class='add'>+	PINCTRL_PIN(61,   "MIO61"),</div><div class='add'>+	PINCTRL_PIN(62,   "MIO62"),</div><div class='add'>+	PINCTRL_PIN(63,   "MIO63"),</div><div class='add'>+	PINCTRL_PIN(64,   "MIO64"),</div><div class='add'>+	PINCTRL_PIN(65,   "MIO65"),</div><div class='add'>+	PINCTRL_PIN(66,   "MIO66"),</div><div class='add'>+	PINCTRL_PIN(67,   "MIO67"),</div><div class='add'>+	PINCTRL_PIN(68,   "MIO68"),</div><div class='add'>+	PINCTRL_PIN(69,   "MIO69"),</div><div class='add'>+	PINCTRL_PIN(70,   "MIO70"),</div><div class='add'>+	PINCTRL_PIN(71,   "MIO71"),</div><div class='add'>+	PINCTRL_PIN(72,   "MIO72"),</div><div class='add'>+	PINCTRL_PIN(73,   "MIO73"),</div><div class='add'>+	PINCTRL_PIN(74,   "MIO74"),</div><div class='add'>+	PINCTRL_PIN(75,   "MIO75"),</div><div class='add'>+	PINCTRL_PIN(76,   "MIO76"),</div><div class='add'>+	PINCTRL_PIN(77,   "MIO77"),</div><div class='add'>+	PINCTRL_PIN(78,   "MIO78"),</div><div class='add'>+	PINCTRL_PIN(79,   "MIO79"),</div><div class='add'>+	PINCTRL_PIN(80,   "MIO80"),</div><div class='add'>+	PINCTRL_PIN(81,   "MIO81"),</div><div class='add'>+	PINCTRL_PIN(82,   "MIO82"),</div><div class='add'>+	PINCTRL_PIN(83,   "MIO83"),</div><div class='add'>+	PINCTRL_PIN(84,   "MIO84"),</div><div class='add'>+	PINCTRL_PIN(85,   "MIO85"),</div><div class='add'>+	PINCTRL_PIN(86,   "MIO86"),</div><div class='add'>+	PINCTRL_PIN(87,   "MIO87"),</div><div class='add'>+	PINCTRL_PIN(88,   "MIO88"),</div><div class='add'>+	PINCTRL_PIN(89,   "MIO89"),</div><div class='add'>+	PINCTRL_PIN(90,   "MIO90"),</div><div class='add'>+	PINCTRL_PIN(91,   "MIO91"),</div><div class='add'>+	PINCTRL_PIN(92,   "MIO92"),</div><div class='add'>+	PINCTRL_PIN(93,   "MIO93"),</div><div class='add'>+	PINCTRL_PIN(94,   "MIO94"),</div><div class='add'>+	PINCTRL_PIN(95,   "MIO95"),</div><div class='add'>+	PINCTRL_PIN(96,   "MIO96"),</div><div class='add'>+	PINCTRL_PIN(97,   "MIO97"),</div><div class='add'>+	PINCTRL_PIN(98,   "MIO98"),</div><div class='add'>+	PINCTRL_PIN(99,   "MIO99"),</div><div class='add'>+	PINCTRL_PIN(100,   "MIO100"),</div><div class='add'>+	PINCTRL_PIN(101,   "MIO101"),</div><div class='add'>+	PINCTRL_PIN(102,   "MIO102"),</div><div class='add'>+	PINCTRL_PIN(103,   "MIO103"),</div><div class='add'>+	PINCTRL_PIN(104,   "MIO104"),</div><div class='add'>+	PINCTRL_PIN(105,   "MIO105"),</div><div class='add'>+	PINCTRL_PIN(106,   "MIO106"),</div><div class='add'>+	PINCTRL_PIN(107,   "MIO107"),</div><div class='add'>+	PINCTRL_PIN(108,   "MIO108"),</div><div class='add'>+	PINCTRL_PIN(109,   "MIO109"),</div><div class='add'>+	PINCTRL_PIN(110,   "MIO110"),</div><div class='add'>+	PINCTRL_PIN(111,   "MIO111"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bm1880_pinmux_functions {</div><div class='add'>+	F_nand, F_spi, F_emmc, F_sdio, F_eth0, F_pwm0, F_pwm1, F_pwm2,</div><div class='add'>+	F_pwm3, F_pwm4, F_pwm5, F_pwm6, F_pwm7, F_pwm8, F_pwm9, F_pwm10,</div><div class='add'>+	F_pwm11, F_pwm12, F_pwm13, F_pwm14, F_pwm15, F_pwm16, F_pwm17,</div><div class='add'>+	F_pwm18, F_pwm19, F_pwm20, F_pwm21, F_pwm22, F_pwm23, F_pwm24,</div><div class='add'>+	F_pwm25, F_pwm26, F_pwm27, F_pwm28, F_pwm29, F_pwm30, F_pwm31,</div><div class='add'>+	F_pwm32, F_pwm33, F_pwm34, F_pwm35, F_pwm36, F_pwm37, F_i2c0, F_i2c1,</div><div class='add'>+	F_i2c2, F_i2c3, F_i2c4, F_uart0, F_uart1, F_uart2, F_uart3, F_uart4,</div><div class='add'>+	F_uart5, F_uart6, F_uart7, F_uart8, F_uart9, F_uart10, F_uart11,</div><div class='add'>+	F_uart12, F_uart13, F_uart14, F_uart15, F_gpio0, F_gpio1, F_gpio2,</div><div class='add'>+	F_gpio3, F_gpio4, F_gpio5, F_gpio6, F_gpio7, F_gpio8, F_gpio9, F_gpio10,</div><div class='add'>+	F_gpio11, F_gpio12, F_gpio13, F_gpio14, F_gpio15, F_gpio16, F_gpio17,</div><div class='add'>+	F_gpio18, F_gpio19, F_gpio20, F_gpio21, F_gpio22, F_gpio23, F_gpio24,</div><div class='add'>+	F_gpio25, F_gpio26, F_gpio27, F_gpio28, F_gpio29, F_gpio30, F_gpio31,</div><div class='add'>+	F_gpio32, F_gpio33, F_gpio34, F_gpio35, F_gpio36, F_gpio37, F_gpio38,</div><div class='add'>+	F_gpio39, F_gpio40, F_gpio41, F_gpio42, F_gpio43, F_gpio44, F_gpio45,</div><div class='add'>+	F_gpio46, F_gpio47, F_gpio48, F_gpio49, F_gpio50, F_gpio51, F_gpio52,</div><div class='add'>+	F_gpio53, F_gpio54, F_gpio55, F_gpio56, F_gpio57, F_gpio58, F_gpio59,</div><div class='add'>+	F_gpio60, F_gpio61, F_gpio62, F_gpio63, F_gpio64, F_gpio65, F_gpio66,</div><div class='add'>+	F_gpio67, F_eth1, F_i2s0, F_i2s0_mclkin, F_i2s1, F_i2s1_mclkin, F_spi0,</div><div class='add'>+	F_max</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int nand_pins[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,</div><div class='add'>+					  10, 11, 12, 13, 14, 15, 16 };</div><div class='add'>+static const unsigned int spi_pins[] = { 0, 1, 8, 10, 11, 12, 13 };</div><div class='add'>+static const unsigned int emmc_pins[] = { 2, 3, 4, 5, 6, 7, 9, 14, 15, 16 };</div><div class='add'>+static const unsigned int sdio_pins[] = { 17, 18, 19, 20, 21, 22, 23, 24,</div><div class='add'>+					  25, 26 };</div><div class='add'>+static const unsigned int eth0_pins[] = { 27, 28, 29, 30, 31, 32, 33, 34, 35,</div><div class='add'>+					  36, 37, 38, 39, 40, 41, 42 };</div><div class='add'>+static const unsigned int pwm0_pins[] = { 29 };</div><div class='add'>+static const unsigned int pwm1_pins[] = { 30 };</div><div class='add'>+static const unsigned int pwm2_pins[] = { 34 };</div><div class='add'>+static const unsigned int pwm3_pins[] = { 35 };</div><div class='add'>+static const unsigned int pwm4_pins[] = { 43 };</div><div class='add'>+static const unsigned int pwm5_pins[] = { 44 };</div><div class='add'>+static const unsigned int pwm6_pins[] = { 45 };</div><div class='add'>+static const unsigned int pwm7_pins[] = { 46 };</div><div class='add'>+static const unsigned int pwm8_pins[] = { 47 };</div><div class='add'>+static const unsigned int pwm9_pins[] = { 48 };</div><div class='add'>+static const unsigned int pwm10_pins[] = { 49 };</div><div class='add'>+static const unsigned int pwm11_pins[] = { 50 };</div><div class='add'>+static const unsigned int pwm12_pins[] = { 51 };</div><div class='add'>+static const unsigned int pwm13_pins[] = { 52 };</div><div class='add'>+static const unsigned int pwm14_pins[] = { 53 };</div><div class='add'>+static const unsigned int pwm15_pins[] = { 54 };</div><div class='add'>+static const unsigned int pwm16_pins[] = { 55 };</div><div class='add'>+static const unsigned int pwm17_pins[] = { 56 };</div><div class='add'>+static const unsigned int pwm18_pins[] = { 57 };</div><div class='add'>+static const unsigned int pwm19_pins[] = { 58 };</div><div class='add'>+static const unsigned int pwm20_pins[] = { 59 };</div><div class='add'>+static const unsigned int pwm21_pins[] = { 60 };</div><div class='add'>+static const unsigned int pwm22_pins[] = { 61 };</div><div class='add'>+static const unsigned int pwm23_pins[] = { 62 };</div><div class='add'>+static const unsigned int pwm24_pins[] = { 97 };</div><div class='add'>+static const unsigned int pwm25_pins[] = { 98 };</div><div class='add'>+static const unsigned int pwm26_pins[] = { 99 };</div><div class='add'>+static const unsigned int pwm27_pins[] = { 100 };</div><div class='add'>+static const unsigned int pwm28_pins[] = { 101 };</div><div class='add'>+static const unsigned int pwm29_pins[] = { 102 };</div><div class='add'>+static const unsigned int pwm30_pins[] = { 103 };</div><div class='add'>+static const unsigned int pwm31_pins[] = { 104 };</div><div class='add'>+static const unsigned int pwm32_pins[] = { 105 };</div><div class='add'>+static const unsigned int pwm33_pins[] = { 106 };</div><div class='add'>+static const unsigned int pwm34_pins[] = { 107 };</div><div class='add'>+static const unsigned int pwm35_pins[] = { 108 };</div><div class='add'>+static const unsigned int pwm36_pins[] = { 109 };</div><div class='add'>+static const unsigned int pwm37_pins[] = { 110 };</div><div class='add'>+static const unsigned int i2c0_pins[] = { 63, 64 };</div><div class='add'>+static const unsigned int i2c1_pins[] = { 65, 66 };</div><div class='add'>+static const unsigned int i2c2_pins[] = { 67, 68 };</div><div class='add'>+static const unsigned int i2c3_pins[] = { 69, 70 };</div><div class='add'>+static const unsigned int i2c4_pins[] = { 71, 72 };</div><div class='add'>+static const unsigned int uart0_pins[] = { 73, 74 };</div><div class='add'>+static const unsigned int uart1_pins[] = { 75, 76 };</div><div class='add'>+static const unsigned int uart2_pins[] = { 77, 78 };</div><div class='add'>+static const unsigned int uart3_pins[] = { 79, 80 };</div><div class='add'>+static const unsigned int uart4_pins[] = { 81, 82 };</div><div class='add'>+static const unsigned int uart5_pins[] = { 83, 84 };</div><div class='add'>+static const unsigned int uart6_pins[] = { 85, 86 };</div><div class='add'>+static const unsigned int uart7_pins[] = { 87, 88 };</div><div class='add'>+static const unsigned int uart8_pins[] = { 89, 90 };</div><div class='add'>+static const unsigned int uart9_pins[] = { 91, 92 };</div><div class='add'>+static const unsigned int uart10_pins[] = { 93, 94 };</div><div class='add'>+static const unsigned int uart11_pins[] = { 95, 96 };</div><div class='add'>+static const unsigned int uart12_pins[] = { 73, 74, 75, 76 };</div><div class='add'>+static const unsigned int uart13_pins[] = { 77, 78, 83, 84 };</div><div class='add'>+static const unsigned int uart14_pins[] = { 79, 80, 85, 86 };</div><div class='add'>+static const unsigned int uart15_pins[] = { 81, 82, 87, 88 };</div><div class='add'>+static const unsigned int gpio0_pins[] = { 97 };</div><div class='add'>+static const unsigned int gpio1_pins[] = { 98 };</div><div class='add'>+static const unsigned int gpio2_pins[] = { 99 };</div><div class='add'>+static const unsigned int gpio3_pins[] = { 100 };</div><div class='add'>+static const unsigned int gpio4_pins[] = { 101 };</div><div class='add'>+static const unsigned int gpio5_pins[] = { 102 };</div><div class='add'>+static const unsigned int gpio6_pins[] = { 103 };</div><div class='add'>+static const unsigned int gpio7_pins[] = { 104 };</div><div class='add'>+static const unsigned int gpio8_pins[] = { 105 };</div><div class='add'>+static const unsigned int gpio9_pins[] = { 106 };</div><div class='add'>+static const unsigned int gpio10_pins[] = { 107 };</div><div class='add'>+static const unsigned int gpio11_pins[] = { 108 };</div><div class='add'>+static const unsigned int gpio12_pins[] = { 109 };</div><div class='add'>+static const unsigned int gpio13_pins[] = { 110 };</div><div class='add'>+static const unsigned int gpio14_pins[] = { 43 };</div><div class='add'>+static const unsigned int gpio15_pins[] = { 44 };</div><div class='add'>+static const unsigned int gpio16_pins[] = { 45 };</div><div class='add'>+static const unsigned int gpio17_pins[] = { 46 };</div><div class='add'>+static const unsigned int gpio18_pins[] = { 47 };</div><div class='add'>+static const unsigned int gpio19_pins[] = { 48 };</div><div class='add'>+static const unsigned int gpio20_pins[] = { 49 };</div><div class='add'>+static const unsigned int gpio21_pins[] = { 50 };</div><div class='add'>+static const unsigned int gpio22_pins[] = { 51 };</div><div class='add'>+static const unsigned int gpio23_pins[] = { 52 };</div><div class='add'>+static const unsigned int gpio24_pins[] = { 53 };</div><div class='add'>+static const unsigned int gpio25_pins[] = { 54 };</div><div class='add'>+static const unsigned int gpio26_pins[] = { 55 };</div><div class='add'>+static const unsigned int gpio27_pins[] = { 56 };</div><div class='add'>+static const unsigned int gpio28_pins[] = { 57 };</div><div class='add'>+static const unsigned int gpio29_pins[] = { 58 };</div><div class='add'>+static const unsigned int gpio30_pins[] = { 59 };</div><div class='add'>+static const unsigned int gpio31_pins[] = { 60 };</div><div class='add'>+static const unsigned int gpio32_pins[] = { 61 };</div><div class='add'>+static const unsigned int gpio33_pins[] = { 62 };</div><div class='add'>+static const unsigned int gpio34_pins[] = { 63 };</div><div class='add'>+static const unsigned int gpio35_pins[] = { 64 };</div><div class='add'>+static const unsigned int gpio36_pins[] = { 65 };</div><div class='add'>+static const unsigned int gpio37_pins[] = { 66 };</div><div class='add'>+static const unsigned int gpio38_pins[] = { 67 };</div><div class='add'>+static const unsigned int gpio39_pins[] = { 68 };</div><div class='add'>+static const unsigned int gpio40_pins[] = { 69 };</div><div class='add'>+static const unsigned int gpio41_pins[] = { 70 };</div><div class='add'>+static const unsigned int gpio42_pins[] = { 71 };</div><div class='add'>+static const unsigned int gpio43_pins[] = { 72 };</div><div class='add'>+static const unsigned int gpio44_pins[] = { 73 };</div><div class='add'>+static const unsigned int gpio45_pins[] = { 74 };</div><div class='add'>+static const unsigned int gpio46_pins[] = { 75 };</div><div class='add'>+static const unsigned int gpio47_pins[] = { 76 };</div><div class='add'>+static const unsigned int gpio48_pins[] = { 77 };</div><div class='add'>+static const unsigned int gpio49_pins[] = { 78 };</div><div class='add'>+static const unsigned int gpio50_pins[] = { 79 };</div><div class='add'>+static const unsigned int gpio51_pins[] = { 80 };</div><div class='add'>+static const unsigned int gpio52_pins[] = { 81 };</div><div class='add'>+static const unsigned int gpio53_pins[] = { 82 };</div><div class='add'>+static const unsigned int gpio54_pins[] = { 83 };</div><div class='add'>+static const unsigned int gpio55_pins[] = { 84 };</div><div class='add'>+static const unsigned int gpio56_pins[] = { 85 };</div><div class='add'>+static const unsigned int gpio57_pins[] = { 86 };</div><div class='add'>+static const unsigned int gpio58_pins[] = { 87 };</div><div class='add'>+static const unsigned int gpio59_pins[] = { 88 };</div><div class='add'>+static const unsigned int gpio60_pins[] = { 89 };</div><div class='add'>+static const unsigned int gpio61_pins[] = { 90 };</div><div class='add'>+static const unsigned int gpio62_pins[] = { 91 };</div><div class='add'>+static const unsigned int gpio63_pins[] = { 92 };</div><div class='add'>+static const unsigned int gpio64_pins[] = { 93 };</div><div class='add'>+static const unsigned int gpio65_pins[] = { 94 };</div><div class='add'>+static const unsigned int gpio66_pins[] = { 95 };</div><div class='add'>+static const unsigned int gpio67_pins[] = { 96 };</div><div class='add'>+static const unsigned int eth1_pins[] = { 43, 44, 45, 46, 47, 48, 49, 50, 51,</div><div class='add'>+					  52, 53, 54, 55, 56, 57, 58 };</div><div class='add'>+static const unsigned int i2s0_pins[] = { 87, 88, 89, 90, 91 };</div><div class='add'>+static const unsigned int i2s0_mclkin_pins[] = { 97 };</div><div class='add'>+static const unsigned int i2s1_pins[] = { 92, 93, 94, 95, 96 };</div><div class='add'>+static const unsigned int i2s1_mclkin_pins[] = { 98 };</div><div class='add'>+static const unsigned int spi0_pins[] = { 59, 60, 61, 62 };</div><div class='add'>+</div><div class='add'>+#define BM1880_PINCTRL_GRP(nm) \</div><div class='add'>+	{ \</div><div class='add'>+		.name = #nm "_grp", \</div><div class='add'>+		.pins = nm ## _pins, \</div><div class='add'>+		.npins = ARRAY_SIZE(nm ## _pins), \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct bm1880_pctrl_group bm1880_pctrl_groups[] = {</div><div class='add'>+	BM1880_PINCTRL_GRP(nand),</div><div class='add'>+	BM1880_PINCTRL_GRP(spi),</div><div class='add'>+	BM1880_PINCTRL_GRP(emmc),</div><div class='add'>+	BM1880_PINCTRL_GRP(sdio),</div><div class='add'>+	BM1880_PINCTRL_GRP(eth0),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm0),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm1),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm2),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm3),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm4),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm5),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm6),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm7),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm8),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm9),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm10),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm11),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm12),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm13),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm14),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm15),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm16),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm17),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm18),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm19),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm20),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm21),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm22),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm23),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm24),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm25),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm26),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm27),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm28),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm29),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm30),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm31),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm32),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm33),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm34),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm35),</div><div class='add'>+	BM1880_PINCTRL_GRP(pwm36),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2c0),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2c1),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2c2),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2c3),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2c4),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart0),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart1),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart2),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart3),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart4),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart5),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart6),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart7),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart8),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart9),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart10),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart11),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart12),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart13),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart14),</div><div class='add'>+	BM1880_PINCTRL_GRP(uart15),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio0),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio1),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio2),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio3),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio4),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio5),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio6),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio7),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio8),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio9),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio10),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio11),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio12),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio13),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio14),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio15),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio16),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio17),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio18),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio19),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio20),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio21),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio22),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio23),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio24),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio25),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio26),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio27),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio28),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio29),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio30),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio31),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio32),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio33),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio34),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio35),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio36),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio37),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio38),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio39),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio40),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio41),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio42),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio43),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio44),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio45),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio46),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio47),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio48),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio49),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio50),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio51),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio52),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio53),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio54),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio55),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio56),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio57),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio58),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio59),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio60),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio61),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio62),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio63),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio64),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio65),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio66),</div><div class='add'>+	BM1880_PINCTRL_GRP(gpio67),</div><div class='add'>+	BM1880_PINCTRL_GRP(eth1),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2s0),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2s0_mclkin),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2s1),</div><div class='add'>+	BM1880_PINCTRL_GRP(i2s1_mclkin),</div><div class='add'>+	BM1880_PINCTRL_GRP(spi0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const nand_group[] = { "nand_grp" };</div><div class='add'>+static const char * const spi_group[] = { "spi_grp" };</div><div class='add'>+static const char * const emmc_group[] = { "emmc_grp" };</div><div class='add'>+static const char * const sdio_group[] = { "sdio_grp" };</div><div class='add'>+static const char * const eth0_group[] = { "eth0_grp" };</div><div class='add'>+static const char * const pwm0_group[] = { "pwm0_grp" };</div><div class='add'>+static const char * const pwm1_group[] = { "pwm1_grp" };</div><div class='add'>+static const char * const pwm2_group[] = { "pwm2_grp" };</div><div class='add'>+static const char * const pwm3_group[] = { "pwm3_grp" };</div><div class='add'>+static const char * const pwm4_group[] = { "pwm4_grp" };</div><div class='add'>+static const char * const pwm5_group[] = { "pwm5_grp" };</div><div class='add'>+static const char * const pwm6_group[] = { "pwm6_grp" };</div><div class='add'>+static const char * const pwm7_group[] = { "pwm7_grp" };</div><div class='add'>+static const char * const pwm8_group[] = { "pwm8_grp" };</div><div class='add'>+static const char * const pwm9_group[] = { "pwm9_grp" };</div><div class='add'>+static const char * const pwm10_group[] = { "pwm10_grp" };</div><div class='add'>+static const char * const pwm11_group[] = { "pwm11_grp" };</div><div class='add'>+static const char * const pwm12_group[] = { "pwm12_grp" };</div><div class='add'>+static const char * const pwm13_group[] = { "pwm13_grp" };</div><div class='add'>+static const char * const pwm14_group[] = { "pwm14_grp" };</div><div class='add'>+static const char * const pwm15_group[] = { "pwm15_grp" };</div><div class='add'>+static const char * const pwm16_group[] = { "pwm16_grp" };</div><div class='add'>+static const char * const pwm17_group[] = { "pwm17_grp" };</div><div class='add'>+static const char * const pwm18_group[] = { "pwm18_grp" };</div><div class='add'>+static const char * const pwm19_group[] = { "pwm19_grp" };</div><div class='add'>+static const char * const pwm20_group[] = { "pwm20_grp" };</div><div class='add'>+static const char * const pwm21_group[] = { "pwm21_grp" };</div><div class='add'>+static const char * const pwm22_group[] = { "pwm22_grp" };</div><div class='add'>+static const char * const pwm23_group[] = { "pwm23_grp" };</div><div class='add'>+static const char * const pwm24_group[] = { "pwm24_grp" };</div><div class='add'>+static const char * const pwm25_group[] = { "pwm25_grp" };</div><div class='add'>+static const char * const pwm26_group[] = { "pwm26_grp" };</div><div class='add'>+static const char * const pwm27_group[] = { "pwm27_grp" };</div><div class='add'>+static const char * const pwm28_group[] = { "pwm28_grp" };</div><div class='add'>+static const char * const pwm29_group[] = { "pwm29_grp" };</div><div class='add'>+static const char * const pwm30_group[] = { "pwm30_grp" };</div><div class='add'>+static const char * const pwm31_group[] = { "pwm31_grp" };</div><div class='add'>+static const char * const pwm32_group[] = { "pwm32_grp" };</div><div class='add'>+static const char * const pwm33_group[] = { "pwm33_grp" };</div><div class='add'>+static const char * const pwm34_group[] = { "pwm34_grp" };</div><div class='add'>+static const char * const pwm35_group[] = { "pwm35_grp" };</div><div class='add'>+static const char * const pwm36_group[] = { "pwm36_grp" };</div><div class='add'>+static const char * const pwm37_group[] = { "pwm37_grp" };</div><div class='add'>+static const char * const i2c0_group[] = { "i2c0_grp" };</div><div class='add'>+static const char * const i2c1_group[] = { "i2c1_grp" };</div><div class='add'>+static const char * const i2c2_group[] = { "i2c2_grp" };</div><div class='add'>+static const char * const i2c3_group[] = { "i2c3_grp" };</div><div class='add'>+static const char * const i2c4_group[] = { "i2c4_grp" };</div><div class='add'>+static const char * const uart0_group[] = { "uart0_grp" };</div><div class='add'>+static const char * const uart1_group[] = { "uart1_grp" };</div><div class='add'>+static const char * const uart2_group[] = { "uart2_grp" };</div><div class='add'>+static const char * const uart3_group[] = { "uart3_grp" };</div><div class='add'>+static const char * const uart4_group[] = { "uart4_grp" };</div><div class='add'>+static const char * const uart5_group[] = { "uart5_grp" };</div><div class='add'>+static const char * const uart6_group[] = { "uart6_grp" };</div><div class='add'>+static const char * const uart7_group[] = { "uart7_grp" };</div><div class='add'>+static const char * const uart8_group[] = { "uart8_grp" };</div><div class='add'>+static const char * const uart9_group[] = { "uart9_grp" };</div><div class='add'>+static const char * const uart10_group[] = { "uart10_grp" };</div><div class='add'>+static const char * const uart11_group[] = { "uart11_grp" };</div><div class='add'>+static const char * const uart12_group[] = { "uart12_grp" };</div><div class='add'>+static const char * const uart13_group[] = { "uart13_grp" };</div><div class='add'>+static const char * const uart14_group[] = { "uart14_grp" };</div><div class='add'>+static const char * const uart15_group[] = { "uart15_grp" };</div><div class='add'>+static const char * const gpio0_group[] = { "gpio0_grp" };</div><div class='add'>+static const char * const gpio1_group[] = { "gpio1_grp" };</div><div class='add'>+static const char * const gpio2_group[] = { "gpio2_grp" };</div><div class='add'>+static const char * const gpio3_group[] = { "gpio3_grp" };</div><div class='add'>+static const char * const gpio4_group[] = { "gpio4_grp" };</div><div class='add'>+static const char * const gpio5_group[] = { "gpio5_grp" };</div><div class='add'>+static const char * const gpio6_group[] = { "gpio6_grp" };</div><div class='add'>+static const char * const gpio7_group[] = { "gpio7_grp" };</div><div class='add'>+static const char * const gpio8_group[] = { "gpio8_grp" };</div><div class='add'>+static const char * const gpio9_group[] = { "gpio9_grp" };</div><div class='add'>+static const char * const gpio10_group[] = { "gpio10_grp" };</div><div class='add'>+static const char * const gpio11_group[] = { "gpio11_grp" };</div><div class='add'>+static const char * const gpio12_group[] = { "gpio12_grp" };</div><div class='add'>+static const char * const gpio13_group[] = { "gpio13_grp" };</div><div class='add'>+static const char * const gpio14_group[] = { "gpio14_grp" };</div><div class='add'>+static const char * const gpio15_group[] = { "gpio15_grp" };</div><div class='add'>+static const char * const gpio16_group[] = { "gpio16_grp" };</div><div class='add'>+static const char * const gpio17_group[] = { "gpio17_grp" };</div><div class='add'>+static const char * const gpio18_group[] = { "gpio18_grp" };</div><div class='add'>+static const char * const gpio19_group[] = { "gpio19_grp" };</div><div class='add'>+static const char * const gpio20_group[] = { "gpio20_grp" };</div><div class='add'>+static const char * const gpio21_group[] = { "gpio21_grp" };</div><div class='add'>+static const char * const gpio22_group[] = { "gpio22_grp" };</div><div class='add'>+static const char * const gpio23_group[] = { "gpio23_grp" };</div><div class='add'>+static const char * const gpio24_group[] = { "gpio24_grp" };</div><div class='add'>+static const char * const gpio25_group[] = { "gpio25_grp" };</div><div class='add'>+static const char * const gpio26_group[] = { "gpio26_grp" };</div><div class='add'>+static const char * const gpio27_group[] = { "gpio27_grp" };</div><div class='add'>+static const char * const gpio28_group[] = { "gpio28_grp" };</div><div class='add'>+static const char * const gpio29_group[] = { "gpio29_grp" };</div><div class='add'>+static const char * const gpio30_group[] = { "gpio30_grp" };</div><div class='add'>+static const char * const gpio31_group[] = { "gpio31_grp" };</div><div class='add'>+static const char * const gpio32_group[] = { "gpio32_grp" };</div><div class='add'>+static const char * const gpio33_group[] = { "gpio33_grp" };</div><div class='add'>+static const char * const gpio34_group[] = { "gpio34_grp" };</div><div class='add'>+static const char * const gpio35_group[] = { "gpio35_grp" };</div><div class='add'>+static const char * const gpio36_group[] = { "gpio36_grp" };</div><div class='add'>+static const char * const gpio37_group[] = { "gpio37_grp" };</div><div class='add'>+static const char * const gpio38_group[] = { "gpio38_grp" };</div><div class='add'>+static const char * const gpio39_group[] = { "gpio39_grp" };</div><div class='add'>+static const char * const gpio40_group[] = { "gpio40_grp" };</div><div class='add'>+static const char * const gpio41_group[] = { "gpio41_grp" };</div><div class='add'>+static const char * const gpio42_group[] = { "gpio42_grp" };</div><div class='add'>+static const char * const gpio43_group[] = { "gpio43_grp" };</div><div class='add'>+static const char * const gpio44_group[] = { "gpio44_grp" };</div><div class='add'>+static const char * const gpio45_group[] = { "gpio45_grp" };</div><div class='add'>+static const char * const gpio46_group[] = { "gpio46_grp" };</div><div class='add'>+static const char * const gpio47_group[] = { "gpio47_grp" };</div><div class='add'>+static const char * const gpio48_group[] = { "gpio48_grp" };</div><div class='add'>+static const char * const gpio49_group[] = { "gpio49_grp" };</div><div class='add'>+static const char * const gpio50_group[] = { "gpio50_grp" };</div><div class='add'>+static const char * const gpio51_group[] = { "gpio51_grp" };</div><div class='add'>+static const char * const gpio52_group[] = { "gpio52_grp" };</div><div class='add'>+static const char * const gpio53_group[] = { "gpio53_grp" };</div><div class='add'>+static const char * const gpio54_group[] = { "gpio54_grp" };</div><div class='add'>+static const char * const gpio55_group[] = { "gpio55_grp" };</div><div class='add'>+static const char * const gpio56_group[] = { "gpio56_grp" };</div><div class='add'>+static const char * const gpio57_group[] = { "gpio57_grp" };</div><div class='add'>+static const char * const gpio58_group[] = { "gpio58_grp" };</div><div class='add'>+static const char * const gpio59_group[] = { "gpio59_grp" };</div><div class='add'>+static const char * const gpio60_group[] = { "gpio60_grp" };</div><div class='add'>+static const char * const gpio61_group[] = { "gpio61_grp" };</div><div class='add'>+static const char * const gpio62_group[] = { "gpio62_grp" };</div><div class='add'>+static const char * const gpio63_group[] = { "gpio63_grp" };</div><div class='add'>+static const char * const gpio64_group[] = { "gpio64_grp" };</div><div class='add'>+static const char * const gpio65_group[] = { "gpio65_grp" };</div><div class='add'>+static const char * const gpio66_group[] = { "gpio66_grp" };</div><div class='add'>+static const char * const gpio67_group[] = { "gpio67_grp" };</div><div class='add'>+static const char * const eth1_group[] = { "eth1_grp" };</div><div class='add'>+static const char * const i2s0_group[] = { "i2s0_grp" };</div><div class='add'>+static const char * const i2s0_mclkin_group[] = { "i2s0_mclkin_grp" };</div><div class='add'>+static const char * const i2s1_group[] = { "i2s1_grp" };</div><div class='add'>+static const char * const i2s1_mclkin_group[] = { "i2s1_mclkin_grp" };</div><div class='add'>+static const char * const spi0_group[] = { "spi0_grp" };</div><div class='add'>+</div><div class='add'>+#define BM1880_PINMUX_FUNCTION(fname, mval, mask)	\</div><div class='add'>+	[F_##fname] = {					\</div><div class='add'>+		.name = #fname,				\</div><div class='add'>+		.groups = fname##_group,		\</div><div class='add'>+		.ngroups = ARRAY_SIZE(fname##_group),	\</div><div class='add'>+		.mux_val = mval,			\</div><div class='add'>+		.mux_mask = mask,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define BM1880_PINMUX_FUNCTION_MUX(fname, mval, mask, offset, shift)\</div><div class='add'>+	[F_##fname] = {					\</div><div class='add'>+		.name = #fname,				\</div><div class='add'>+		.groups = fname##_group,		\</div><div class='add'>+		.ngroups = ARRAY_SIZE(fname##_group),	\</div><div class='add'>+		.mux_val = mval,			\</div><div class='add'>+		.mux_mask = mask,			\</div><div class='add'>+		.mux = offset,				\</div><div class='add'>+		.mux_shift = shift,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct bm1880_pinmux_function bm1880_pmux_functions[] = {</div><div class='add'>+	BM1880_PINMUX_FUNCTION(nand, 2, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(spi, 0, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(emmc, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(sdio, 0, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(eth0, 0, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm0, 2, 0x0F, 0x50, 0x00),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm1, 2, 0x0F, 0x50, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm2, 2, 0x0F, 0x50, 0x08),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm3, 2, 0x0F, 0x50, 0x0C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm4, 2, 0x0F, 0x50, 0x10),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm5, 2, 0x0F, 0x50, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm6, 2, 0x0F, 0x50, 0x18),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm7, 2, 0x0F, 0x50, 0x1C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm8, 2, 0x0F, 0x54, 0x00),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm9, 2, 0x0F, 0x54, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm10, 2, 0x0F, 0x54, 0x08),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm11, 2, 0x0F, 0x54, 0x0C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm12, 2, 0x0F, 0x54, 0x10),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm13, 2, 0x0F, 0x54, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm14, 2, 0x0F, 0x54, 0x18),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm15, 2, 0x0F, 0x54, 0x1C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm16, 2, 0x0F, 0x58, 0x00),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm17, 2, 0x0F, 0x58, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm18, 2, 0x0F, 0x58, 0x08),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm19, 2, 0x0F, 0x58, 0x0C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm20, 2, 0x0F, 0x58, 0x10),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm21, 2, 0x0F, 0x58, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm22, 2, 0x0F, 0x58, 0x18),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm23, 2, 0x0F, 0x58, 0x1C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm24, 2, 0x0F, 0x5C, 0x00),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm25, 2, 0x0F, 0x5C, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm26, 2, 0x0F, 0x5C, 0x08),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm27, 2, 0x0F, 0x5C, 0x0C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm28, 2, 0x0F, 0x5C, 0x10),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm29, 2, 0x0F, 0x5C, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm30, 2, 0x0F, 0x5C, 0x18),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm31, 2, 0x0F, 0x5C, 0x1C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm32, 2, 0x0F, 0x60, 0x00),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm33, 2, 0x0F, 0x60, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm34, 2, 0x0F, 0x60, 0x08),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm35, 2, 0x0F, 0x60, 0x0C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm36, 2, 0x0F, 0x60, 0x10),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(pwm37, 2, 0x0F, 0x60, 0x1C),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2c0, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2c1, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2c2, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2c3, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2c4, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart0, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart1, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart2, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart3, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart4, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart5, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart6, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart7, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart8, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart9, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart10, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart11, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart12, 3, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart13, 3, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart14, 3, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(uart15, 3, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio0, 0, 0x03, 0x4E0, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio1, 0, 0x03, 0x4E4, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio2, 0, 0x03, 0x4E4, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio3, 0, 0x03, 0x4E8, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio4, 0, 0x03, 0x4E8, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio5, 0, 0x03, 0x4EC, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio6, 0, 0x03, 0x4EC, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio7, 0, 0x03, 0x4F0, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio8, 0, 0x03, 0x4F0, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio9, 0, 0x03, 0x4F4, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio10, 0, 0x03, 0x4F4, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio11, 0, 0x03, 0x4F8, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio12, 1, 0x03, 0x4F8, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio13, 1, 0x03, 0x4FC, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio14, 0, 0x03, 0x474, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio15, 0, 0x03, 0x478, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio16, 0, 0x03, 0x478, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio17, 0, 0x03, 0x47C, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio18, 0, 0x03, 0x47C, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio19, 0, 0x03, 0x480, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio20, 0, 0x03, 0x480, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio21, 0, 0x03, 0x484, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio22, 0, 0x03, 0x484, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio23, 0, 0x03, 0x488, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio24, 0, 0x03, 0x488, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio25, 0, 0x03, 0x48C, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio26, 0, 0x03, 0x48C, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio27, 0, 0x03, 0x490, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio28, 0, 0x03, 0x490, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio29, 0, 0x03, 0x494, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio30, 0, 0x03, 0x494, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio31, 0, 0x03, 0x498, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio32, 0, 0x03, 0x498, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio33, 0, 0x03, 0x49C, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio34, 0, 0x03, 0x49C, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio35, 0, 0x03, 0x4A0, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio36, 0, 0x03, 0x4A0, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio37, 0, 0x03, 0x4A4, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio38, 0, 0x03, 0x4A4, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio39, 0, 0x03, 0x4A8, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio40, 0, 0x03, 0x4A8, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio41, 0, 0x03, 0x4AC, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio42, 0, 0x03, 0x4AC, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio43, 0, 0x03, 0x4B0, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio44, 0, 0x03, 0x4B0, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio45, 0, 0x03, 0x4B4, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio46, 0, 0x03, 0x4B4, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio47, 0, 0x03, 0x4B8, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio48, 0, 0x03, 0x4B8, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio49, 0, 0x03, 0x4BC, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio50, 0, 0x03, 0x4BC, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio51, 0, 0x03, 0x4C0, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio52, 0, 0x03, 0x4C0, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio53, 0, 0x03, 0x4C4, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio54, 0, 0x03, 0x4C4, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio55, 0, 0x03, 0x4C8, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio56, 0, 0x03, 0x4C8, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio57, 0, 0x03, 0x4CC, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio58, 0, 0x03, 0x4CC, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio59, 0, 0x03, 0x4D0, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio60, 0, 0x03, 0x4D0, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio61, 0, 0x03, 0x4D4, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio62, 0, 0x03, 0x4D4, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio63, 0, 0x03, 0x4D8, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio64, 0, 0x03, 0x4D8, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio65, 0, 0x03, 0x4DC, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio66, 0, 0x03, 0x4DC, 0x14),</div><div class='add'>+	BM1880_PINMUX_FUNCTION_MUX(gpio67, 0, 0x03, 0x4E0, 0x04),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(eth1, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2s0, 2, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2s0_mclkin, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2s1, 2, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(i2s1_mclkin, 1, 0x03),</div><div class='add'>+	BM1880_PINMUX_FUNCTION(spi0, 1, 0x03),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bm1880_pctrl_get_groups_count(struct pinctrl_dev *pctldev)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return pctrl-&gt;ngroups;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *bm1880_pctrl_get_group_name(struct pinctrl_dev *pctldev,</div><div class='add'>+					       unsigned int selector)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return pctrl-&gt;groups[selector].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bm1880_pctrl_get_group_pins(struct pinctrl_dev *pctldev,</div><div class='add'>+				       unsigned int selector,</div><div class='add'>+				       const unsigned int **pins,</div><div class='add'>+				       unsigned int *num_pins)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	*pins = pctrl-&gt;groups[selector].pins;</div><div class='add'>+	*num_pins = pctrl-&gt;groups[selector].npins;</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 pinctrl_ops bm1880_pctrl_ops = {</div><div class='add'>+	.get_groups_count = bm1880_pctrl_get_groups_count,</div><div class='add'>+	.get_group_name = bm1880_pctrl_get_group_name,</div><div class='add'>+	.get_group_pins = bm1880_pctrl_get_group_pins,</div><div class='add'>+	.dt_node_to_map = pinconf_generic_dt_node_to_map_all,</div><div class='add'>+	.dt_free_map = pinctrl_utils_free_map,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* pinmux */</div><div class='add'>+static int bm1880_pmux_get_functions_count(struct pinctrl_dev *pctldev)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return pctrl-&gt;nfuncs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *bm1880_pmux_get_function_name(struct pinctrl_dev *pctldev,</div><div class='add'>+						 unsigned int selector)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	return pctrl-&gt;funcs[selector].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bm1880_pmux_get_function_groups(struct pinctrl_dev *pctldev,</div><div class='add'>+					   unsigned int selector,</div><div class='add'>+					   const char * const **groups,</div><div class='add'>+					   unsigned * const num_groups)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+</div><div class='add'>+	*groups = pctrl-&gt;funcs[selector].groups;</div><div class='add'>+	*num_groups = pctrl-&gt;funcs[selector].ngroups;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bm1880_pinmux_set_mux(struct pinctrl_dev *pctldev,</div><div class='add'>+				 unsigned int function,</div><div class='add'>+				 unsigned int  group)</div><div class='add'>+{</div><div class='add'>+	struct bm1880_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+	const struct bm1880_pctrl_group *pgrp = &amp;pctrl-&gt;groups[group];</div><div class='add'>+	const struct bm1880_pinmux_function *func = &amp;pctrl-&gt;funcs[function];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (func-&gt;mux) {</div><div class='add'>+		u32 regval = readl_relaxed(pctrl-&gt;base + BM1880_REG_MUX +</div><div class='add'>+					   func-&gt;mux);</div><div class='add'>+</div><div class='add'>+		regval &amp;= ~(func-&gt;mux_mask &lt;&lt; func-&gt;mux_shift);</div><div class='add'>+		regval |= func-&gt;mux_val &lt;&lt; func-&gt;mux_shift;</div><div class='add'>+		writel_relaxed(regval, pctrl-&gt;base + BM1880_REG_MUX +</div><div class='add'>+			       func-&gt;mux);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; pgrp-&gt;npins; i++) {</div><div class='add'>+			unsigned int pin = pgrp-&gt;pins[i];</div><div class='add'>+			u32 offset = (pin &gt;&gt; 1) &lt;&lt; 2;</div><div class='add'>+			u32 mux_offset = ((!((pin + 1) &amp; 1) &lt;&lt; 4) + 4);</div><div class='add'>+			u32 regval = readl_relaxed(pctrl-&gt;base +</div><div class='add'>+						   BM1880_REG_MUX + offset);</div><div class='add'>+</div><div class='add'>+			regval &amp;= ~(func-&gt;mux_mask &lt;&lt; mux_offset);</div><div class='add'>+			regval |= func-&gt;mux_val &lt;&lt; mux_offset;</div><div class='add'>+</div><div class='add'>+			writel_relaxed(regval, pctrl-&gt;base +</div><div class='add'>+				       BM1880_REG_MUX + offset);</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 const struct pinmux_ops bm1880_pinmux_ops = {</div><div class='add'>+	.get_functions_count = bm1880_pmux_get_functions_count,</div><div class='add'>+	.get_function_name = bm1880_pmux_get_function_name,</div><div class='add'>+	.get_function_groups = bm1880_pmux_get_function_groups,</div><div class='add'>+	.set_mux = bm1880_pinmux_set_mux,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinctrl_desc bm1880_desc = {</div><div class='add'>+	.name = "bm1880_pinctrl",</div><div class='add'>+	.pins = bm1880_pins,</div><div class='add'>+	.npins = ARRAY_SIZE(bm1880_pins),</div><div class='add'>+	.pctlops = &amp;bm1880_pctrl_ops,</div><div class='add'>+	.pmxops = &amp;bm1880_pinmux_ops,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bm1880_pinctrl_probe(struct platform_device *pdev)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct bm1880_pinctrl *pctrl;</div><div class='add'>+</div><div class='add'>+	pctrl = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pctrl), GFP_KERNEL);</div><div class='add'>+	if (!pctrl)</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'>+	pctrl-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(pctrl-&gt;base))</div><div class='add'>+		return PTR_ERR(pctrl-&gt;base);</div><div class='add'>+</div><div class='add'>+	pctrl-&gt;groups = bm1880_pctrl_groups;</div><div class='add'>+	pctrl-&gt;ngroups = ARRAY_SIZE(bm1880_pctrl_groups);</div><div class='add'>+	pctrl-&gt;funcs = bm1880_pmux_functions;</div><div class='add'>+	pctrl-&gt;nfuncs = ARRAY_SIZE(bm1880_pmux_functions);</div><div class='add'>+</div><div class='add'>+	pctrl-&gt;pctrldev = devm_pinctrl_register(&amp;pdev-&gt;dev, &amp;bm1880_desc,</div><div class='add'>+						pctrl);</div><div class='add'>+	if (IS_ERR(pctrl-&gt;pctrldev))</div><div class='add'>+		return PTR_ERR(pctrl-&gt;pctrldev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, pctrl);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "BM1880 pinctrl driver initialized\n");</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 of_device_id bm1880_pinctrl_of_match[] = {</div><div class='add'>+	{ .compatible = "bitmain,bm1880-pinctrl" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver bm1880_pinctrl_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "pinctrl-bm1880",</div><div class='add'>+		.of_match_table = of_match_ptr(bm1880_pinctrl_of_match),</div><div class='add'>+	},</div><div class='add'>+	.probe = bm1880_pinctrl_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bm1880_pinctrl_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;bm1880_pinctrl_driver);</div><div class='add'>+}</div><div class='add'>+arch_initcall(bm1880_pinctrl_init);</div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c<br/>index 5d7a8514def9..fd9d6f026d70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-mcp23s08.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-mcp23s08.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-mcp23s08.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-mcp23s08.c</a></div><div class='hunk'>@@ -266,7 +266,6 @@ static int mcp_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,</div><div class='ctx'> 		status = (data &amp; BIT(pin)) ? 1 : 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev_err(mcp-&gt;dev, "Invalid config param %04x\n", param);</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +292,7 @@ static int mcp_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,</div><div class='ctx'> 			ret = mcp_set_bit(mcp, MCP_GPPU, pin, arg);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			dev_err(mcp-&gt;dev, "Invalid config param %04x\n", param);</div><div class='add'>+			dev_dbg(mcp-&gt;dev, "Invalid config param %04x\n", param);</div><div class='ctx'> 			return -ENOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c<br/>index aa5f949ef219..5b0678f310e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-pistachio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-pistachio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-pistachio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-pistachio.c</a></div><div class='hunk'>@@ -1367,6 +1367,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)</div><div class='ctx'> 		if (!of_find_property(child, "gpio-controller", NULL)) {</div><div class='ctx'> 			dev_err(pctl-&gt;dev,</div><div class='ctx'> 				"No gpio-controller property for bank %u\n", i);</div><div class='add'>+			of_node_put(child);</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1374,6 +1375,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)</div><div class='ctx'> 		irq = irq_of_parse_and_map(child, 0);</div><div class='ctx'> 		if (irq &lt; 0) {</div><div class='ctx'> 			dev_err(pctl-&gt;dev, "No IRQ for bank %u: %d\n", i, irq);</div><div class='add'>+			of_node_put(child);</div><div class='ctx'> 			ret = irq;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c<br/>index 9cfe9d0520ac..021e37b7689e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-rza1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-rza1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-rza1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-rza1.c</a></div><div class='hunk'>@@ -620,14 +620,7 @@ static void rza1_pin_reset(struct rza1_port *port, unsigned int pin)</div><div class='ctx'> static inline int rza1_pin_get_direction(struct rza1_port *port,</div><div class='ctx'> 					 unsigned int pin)</div><div class='ctx'> {</div><div class='del'>-	unsigned long irqflags;</div><div class='del'>-	int input;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;port-&gt;lock, irqflags);</div><div class='del'>-	input = rza1_get_bit(port, RZA1_PM_REG, pin);</div><div class='del'>-	spin_unlock_irqrestore(&amp;port-&gt;lock, irqflags);</div><div class='del'>-</div><div class='del'>-	return !!input;</div><div class='add'>+	return !!rza1_get_bit(port, RZA1_PM_REG, pin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -671,14 +664,7 @@ static inline void rza1_pin_set(struct rza1_port *port, unsigned int pin,</div><div class='ctx'> </div><div class='ctx'> static inline int rza1_pin_get(struct rza1_port *port, unsigned int pin)</div><div class='ctx'> {</div><div class='del'>-	unsigned long irqflags;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;port-&gt;lock, irqflags);</div><div class='del'>-	val = rza1_get_bit(port, RZA1_PPR_REG, pin);</div><div class='del'>-	spin_unlock_irqrestore(&amp;port-&gt;lock, irqflags);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='add'>+	return rza1_get_bit(port, RZA1_PPR_REG, pin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c<br/>index e66af93f2cbf..195b442a2343 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-st.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/pinctrl-st.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/pinctrl-st.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/pinctrl-st.c</a></div><div class='hunk'>@@ -1170,7 +1170,7 @@ static int st_pctl_dt_parse_groups(struct device_node *np,</div><div class='ctx'> 	struct property *pp;</div><div class='ctx'> 	struct st_pinconf *conf;</div><div class='ctx'> 	struct device_node *pins;</div><div class='del'>-	int i = 0, npins = 0, nr_props;</div><div class='add'>+	int i = 0, npins = 0, nr_props, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	pins = of_get_child_by_name(np, "st,pins");</div><div class='ctx'> 	if (!pins)</div><div class='hunk'>@@ -1185,7 +1185,8 @@ static int st_pctl_dt_parse_groups(struct device_node *np,</div><div class='ctx'> 			npins++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pr_warn("Invalid st,pins in %pOFn node\n", np);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_put_node;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1195,8 +1196,10 @@ static int st_pctl_dt_parse_groups(struct device_node *np,</div><div class='ctx'> 	grp-&gt;pin_conf = devm_kcalloc(info-&gt;dev,</div><div class='ctx'> 					npins, sizeof(*conf), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (!grp-&gt;pins || !grp-&gt;pin_conf)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!grp-&gt;pins || !grp-&gt;pin_conf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* &lt;bank offset mux direction rt_type rt_delay rt_clk&gt; */</div><div class='ctx'> 	for_each_property_of_node(pins, pp) {</div><div class='hunk'>@@ -1229,9 +1232,11 @@ static int st_pctl_dt_parse_groups(struct device_node *np,</div><div class='ctx'> 		}</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='ctx'> 	of_node_put(pins);</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'> static int st_pctl_parse_functions(struct device_node *np,</div><div class='head'>diff --git a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c<br/>index 44c6b753f692..85ddf49a5188 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/samsung/pinctrl-exynos-arm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/samsung/pinctrl-exynos-arm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/samsung/pinctrl-exynos-arm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/samsung/pinctrl-exynos-arm.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@ s5pv210_retention_init(struct samsung_pinctrl_drv_data *drvdata,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clk_base = of_iomap(np, 0);</div><div class='add'>+	of_node_put(np);</div><div class='ctx'> 	if (!clk_base) {</div><div class='ctx'> 		pr_err("%s: failed to map clock registers\n", __func__);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig<br/>index e941ba60d4b7..2dd716b016a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/Kconfig</a></div><div class='hunk'>@@ -3,201 +3,183 @@</div><div class='ctx'> # Renesas SH and SH Mobile PINCTRL drivers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-if ARCH_RENESAS || SUPERH</div><div class='del'>-</div><div class='ctx'> config PINCTRL_SH_PFC</div><div class='add'>+	bool "Renesas SoC pin control support" if COMPILE_TEST &amp;&amp; !(ARCH_RENESAS || SUPERH)</div><div class='add'>+	default y if ARCH_RENESAS || SUPERH</div><div class='ctx'> 	select PINMUX</div><div class='ctx'> 	select PINCONF</div><div class='ctx'> 	select GENERIC_PINCONF</div><div class='del'>-	def_bool y</div><div class='add'>+	select PINCTRL_PFC_EMEV2 if ARCH_EMEV2</div><div class='add'>+	select PINCTRL_PFC_R8A73A4 if ARCH_R8A73A4</div><div class='add'>+	select PINCTRL_PFC_R8A7740 if ARCH_R8A7740</div><div class='add'>+	select PINCTRL_PFC_R8A7743 if ARCH_R8A7743</div><div class='add'>+	select PINCTRL_PFC_R8A7744 if ARCH_R8A7744</div><div class='add'>+	select PINCTRL_PFC_R8A7745 if ARCH_R8A7745</div><div class='add'>+	select PINCTRL_PFC_R8A77470 if ARCH_R8A77470</div><div class='add'>+	select PINCTRL_PFC_R8A774A1 if ARCH_R8A774A1</div><div class='add'>+	select PINCTRL_PFC_R8A774C0 if ARCH_R8A774C0</div><div class='add'>+	select PINCTRL_PFC_R8A7778 if ARCH_R8A7778</div><div class='add'>+	select PINCTRL_PFC_R8A7779 if ARCH_R8A7779</div><div class='add'>+	select PINCTRL_PFC_R8A7790 if ARCH_R8A7790</div><div class='add'>+	select PINCTRL_PFC_R8A7791 if ARCH_R8A7791</div><div class='add'>+	select PINCTRL_PFC_R8A7792 if ARCH_R8A7792</div><div class='add'>+	select PINCTRL_PFC_R8A7793 if ARCH_R8A7793</div><div class='add'>+	select PINCTRL_PFC_R8A7794 if ARCH_R8A7794</div><div class='add'>+	select PINCTRL_PFC_R8A7795 if ARCH_R8A7795</div><div class='add'>+	select PINCTRL_PFC_R8A7796 if ARCH_R8A7796</div><div class='add'>+	select PINCTRL_PFC_R8A77965 if ARCH_R8A77965</div><div class='add'>+	select PINCTRL_PFC_R8A77970 if ARCH_R8A77970</div><div class='add'>+	select PINCTRL_PFC_R8A77980 if ARCH_R8A77980</div><div class='add'>+	select PINCTRL_PFC_R8A77990 if ARCH_R8A77990</div><div class='add'>+	select PINCTRL_PFC_R8A77995 if ARCH_R8A77995</div><div class='add'>+	select PINCTRL_PFC_SH7203 if CPU_SUBTYPE_SH7203</div><div class='add'>+	select PINCTRL_PFC_SH7264 if CPU_SUBTYPE_SH7264</div><div class='add'>+	select PINCTRL_PFC_SH7269 if CPU_SUBTYPE_SH7269</div><div class='add'>+	select PINCTRL_PFC_SH73A0 if ARCH_SH73A0</div><div class='add'>+	select PINCTRL_PFC_SH7720 if CPU_SUBTYPE_SH7720</div><div class='add'>+	select PINCTRL_PFC_SH7722 if CPU_SUBTYPE_SH7722</div><div class='add'>+	select PINCTRL_PFC_SH7723 if CPU_SUBTYPE_SH7723</div><div class='add'>+	select PINCTRL_PFC_SH7724 if CPU_SUBTYPE_SH7724</div><div class='add'>+	select PINCTRL_PFC_SH7734 if CPU_SUBTYPE_SH7734</div><div class='add'>+	select PINCTRL_PFC_SH7757 if CPU_SUBTYPE_SH7757</div><div class='add'>+	select PINCTRL_PFC_SH7785 if CPU_SUBTYPE_SH7785</div><div class='add'>+	select PINCTRL_PFC_SH7786 if CPU_SUBTYPE_SH7786</div><div class='add'>+	select PINCTRL_PFC_SHX3 if CPU_SUBTYPE_SHX3</div><div class='ctx'> 	help</div><div class='del'>-	  This enables pin control drivers for SH and SH Mobile platforms</div><div class='add'>+	  This enables pin control drivers for Renesas SuperH and ARM platforms</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SH_PFC_GPIO</div><div class='ctx'> 	select GPIOLIB</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='ctx'> 	bool</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables pin control and GPIO drivers for SH/SH Mobile platforms</div><div class='ctx'> </div><div class='add'>+config PINCTRL_SH_FUNC_GPIO</div><div class='add'>+	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  This enables legacy function GPIOs for SH platforms</div><div class='add'>+</div><div class='ctx'> config PINCTRL_PFC_EMEV2</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_EMEV2</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "Emma Mobile AV2 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A73A4</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A73A4</div><div class='add'>+	bool "R-Mobile APE6 pin control support" if COMPILE_TEST</div><div class='ctx'> 	select PINCTRL_SH_PFC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7740</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7740</div><div class='add'>+	bool "R-Mobile A1 pin control support" if COMPILE_TEST</div><div class='ctx'> 	select PINCTRL_SH_PFC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7743</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7743</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "RZ/G1M pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7744</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7744</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "RZ/G1N pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7745</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A7745</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "RZ/G1E pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A77470</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A77470</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "RZ/G1C pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A774A1</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A774A1</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "RZ/G2M pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A774C0</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A774C0</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "RZ/G2E pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7778</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7778</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car M1A pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7779</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7779</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car H1 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7790</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7790</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car H2 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7791</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7791</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car M2-W pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7792</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7792</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car V2H pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7793</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7793</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car M2-N pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7794</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7794</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car E2 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7795</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A7795</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car H3 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A7796</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A7796</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car M3-W pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A77965</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A77965</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car M3-N pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A77970</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A77970</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car V3M pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A77980</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_R8A77980</div><div class='del'>-	select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car V3H pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A77990</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A77990</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car E3 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_R8A77995</div><div class='del'>-        def_bool y</div><div class='del'>-        depends on ARCH_R8A77995</div><div class='del'>-        select PINCTRL_SH_PFC</div><div class='add'>+	bool "R-Car D3 pin control support" if COMPILE_TEST</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7203</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7203</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7203 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7264</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7264</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7264 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7269</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7269</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7269 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH73A0</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on ARCH_SH73A0</div><div class='add'>+	bool "SH-Mobile AG5 pin control support" if COMPILE_TEST</div><div class='ctx'> 	select PINCTRL_SH_PFC_GPIO</div><div class='ctx'> 	select REGULATOR</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7720</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7720</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7720 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7722</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7722</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7722 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7723</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7723</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH-Mobile R2 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7724</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7724</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH-Mobile R2R pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7734</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7734</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7734 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7757</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7757</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7757 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7785</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7785</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7785 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SH7786</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SH7786</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='add'>+	bool "SH7786 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_PFC_SHX3</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on CPU_SUBTYPE_SHX3</div><div class='del'>-	select PINCTRL_SH_PFC_GPIO</div><div class='del'>-endif</div><div class='add'>+	bool "SH-X3 pin control support" if COMPILE_TEST</div><div class='add'>+	select PINCTRL_SH_FUNC_GPIO</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/sh-pfc/Makefile<br/>index 82ebb2a91ee0..8c95abcfcc00 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/Makefile</a></div><div class='hunk'>@@ -38,3 +38,18 @@ obj-$(CONFIG_PINCTRL_PFC_SH7757)	+= pfc-sh7757.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_PFC_SH7785)	+= pfc-sh7785.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_PFC_SH7786)	+= pfc-sh7786.o</div><div class='ctx'> obj-$(CONFIG_PINCTRL_PFC_SHX3)		+= pfc-shx3.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_COMPILE_TEST),y)</div><div class='add'>+CFLAGS_pfc-sh7203.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a</div><div class='add'>+CFLAGS_pfc-sh7264.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a</div><div class='add'>+CFLAGS_pfc-sh7269.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a</div><div class='add'>+CFLAGS_pfc-sh7720.o	+= -I$(srctree)/arch/sh/include/cpu-sh3</div><div class='add'>+CFLAGS_pfc-sh7722.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-sh7723.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-sh7724.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-sh7734.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-sh7757.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-sh7785.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-sh7786.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+CFLAGS_pfc-shx3.o	+= -I$(srctree)/arch/sh/include/cpu-sh4</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c<br/>index f1cfcc8c6544..3f989f5cb021 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/core.c</a></div><div class='hunk'>@@ -571,6 +571,13 @@ static const struct of_device_id sh_pfc_of_table[] = {</div><div class='ctx'> 		.compatible = "renesas,pfc-r8a7795",</div><div class='ctx'> 		.data = &amp;r8a7795_pinmux_info,</div><div class='ctx'> 	},</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	{</div><div class='add'>+		/* For sanity checks only (nothing matches against this) */</div><div class='add'>+		.compatible = "renesas,pfc-r8a77950",	/* R-Car H3 ES1.0 */</div><div class='add'>+		.data = &amp;r8a7795es1_pinmux_info,</div><div class='add'>+	},</div><div class='add'>+#endif /* DEBUG */</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PINCTRL_PFC_R8A7796</div><div class='ctx'> 	{</div><div class='hunk'>@@ -709,6 +716,128 @@ static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; }</div><div class='ctx'> #define DEV_PM_OPS	NULL</div><div class='ctx'> #endif /* CONFIG_PM_SLEEP &amp;&amp; CONFIG_ARM_PSCI_FW */</div><div class='ctx'> </div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static bool is0s(const u16 *enum_ids, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		if (enum_ids[i])</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 sh_pfc_errors;</div><div class='add'>+static unsigned int sh_pfc_warnings;</div><div class='add'>+</div><div class='add'>+static void sh_pfc_check_cfg_reg(const char *drvname,</div><div class='add'>+				 const struct pinmux_cfg_reg *cfg_reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, n, rw, fw;</div><div class='add'>+</div><div class='add'>+	if (cfg_reg-&gt;field_width) {</div><div class='add'>+		/* Checked at build time */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, n = 0, rw = 0; (fw = cfg_reg-&gt;var_field_width[i]); i++) {</div><div class='add'>+		if (fw &gt; 3 &amp;&amp; is0s(&amp;cfg_reg-&gt;enum_ids[n], 1 &lt;&lt; fw)) {</div><div class='add'>+			pr_warn("%s: reg 0x%x: reserved field [%u:%u] can be split to reduce table size\n",</div><div class='add'>+				drvname, cfg_reg-&gt;reg, rw, rw + fw - 1);</div><div class='add'>+			sh_pfc_warnings++;</div><div class='add'>+		}</div><div class='add'>+		n += 1 &lt;&lt; fw;</div><div class='add'>+		rw += fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rw != cfg_reg-&gt;reg_width) {</div><div class='add'>+		pr_err("%s: reg 0x%x: var_field_width declares %u instead of %u bits\n",</div><div class='add'>+		       drvname, cfg_reg-&gt;reg, rw, cfg_reg-&gt;reg_width);</div><div class='add'>+		sh_pfc_errors++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n != cfg_reg-&gt;nr_enum_ids) {</div><div class='add'>+		pr_err("%s: reg 0x%x: enum_ids[] has %u instead of %u values\n",</div><div class='add'>+		       drvname, cfg_reg-&gt;reg, cfg_reg-&gt;nr_enum_ids, n);</div><div class='add'>+		sh_pfc_errors++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sh_pfc_check_info(const struct sh_pfc_soc_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct sh_pfc_function *func;</div><div class='add'>+	const char *drvname = info-&gt;name;</div><div class='add'>+	unsigned int *refcnts;</div><div class='add'>+	unsigned int i, j, k;</div><div class='add'>+</div><div class='add'>+	pr_info("Checking %s\n", drvname);</div><div class='add'>+</div><div class='add'>+	/* Check groups and functions */</div><div class='add'>+	refcnts = kcalloc(info-&gt;nr_groups, sizeof(*refcnts), GFP_KERNEL);</div><div class='add'>+	if (!refcnts)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;nr_functions; i++) {</div><div class='add'>+		func = &amp;info-&gt;functions[i];</div><div class='add'>+		for (j = 0; j &lt; func-&gt;nr_groups; j++) {</div><div class='add'>+			for (k = 0; k &lt; info-&gt;nr_groups; k++) {</div><div class='add'>+				if (!strcmp(func-&gt;groups[j],</div><div class='add'>+					    info-&gt;groups[k].name)) {</div><div class='add'>+					refcnts[k]++;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (k == info-&gt;nr_groups) {</div><div class='add'>+				pr_err("%s: function %s: group %s not found\n",</div><div class='add'>+				       drvname, func-&gt;name, func-&gt;groups[j]);</div><div class='add'>+				sh_pfc_errors++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;nr_groups; i++) {</div><div class='add'>+		if (!refcnts[i]) {</div><div class='add'>+			pr_err("%s: orphan group %s\n", drvname,</div><div class='add'>+			       info-&gt;groups[i].name);</div><div class='add'>+			sh_pfc_errors++;</div><div class='add'>+		} else if (refcnts[i] &gt; 1) {</div><div class='add'>+			pr_err("%s: group %s referred by %u functions\n",</div><div class='add'>+			       drvname, info-&gt;groups[i].name, refcnts[i]);</div><div class='add'>+			sh_pfc_warnings++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(refcnts);</div><div class='add'>+</div><div class='add'>+	/* Check config register descriptions */</div><div class='add'>+	for (i = 0; info-&gt;cfg_regs &amp;&amp; info-&gt;cfg_regs[i].reg; i++)</div><div class='add'>+		sh_pfc_check_cfg_reg(drvname, &amp;info-&gt;cfg_regs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sh_pfc_check_driver(const struct platform_driver *pdrv)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	pr_warn("Checking builtin pinmux tables\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; pdrv-&gt;id_table[i].name[0]; i++)</div><div class='add'>+		sh_pfc_check_info((void *)pdrv-&gt;id_table[i].driver_data);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+	for (i = 0; pdrv-&gt;driver.of_match_table[i].compatible[0]; i++)</div><div class='add'>+		sh_pfc_check_info(pdrv-&gt;driver.of_match_table[i].data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pr_warn("Detected %u errors and %u warnings\n", sh_pfc_errors,</div><div class='add'>+		sh_pfc_warnings);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !DEBUG */</div><div class='add'>+static inline void sh_pfc_check_driver(struct platform_driver *pdrv) {}</div><div class='add'>+#endif /* !DEBUG */</div><div class='add'>+</div><div class='ctx'> static int sh_pfc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_OF</div><div class='hunk'>@@ -840,6 +969,7 @@ static struct platform_driver sh_pfc_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init sh_pfc_init(void)</div><div class='ctx'> {</div><div class='add'>+	sh_pfc_check_driver(&amp;sh_pfc_driver);</div><div class='ctx'> 	return platform_driver_register(&amp;sh_pfc_driver);</div><div class='ctx'> }</div><div class='ctx'> postcore_initcall(sh_pfc_init);</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c<br/>index 4f3a34ee1cd4..97c1332c1045 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/gpio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/gpio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/gpio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/gpio.c</a></div><div class='hunk'>@@ -252,7 +252,7 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)</div><div class='ctx'>  * Function GPIOs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUPERH</div><div class='add'>+#ifdef CONFIG_PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> static int gpio_function_request(struct gpio_chip *gc, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	static bool __print_once;</div><div class='hunk'>@@ -292,7 +292,7 @@ static int gpio_function_setup(struct sh_pfc_chip *chip)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_PINCTRL_SH_FUNC_GPIO */</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------------------</div><div class='ctx'>  * Register/unregister</div><div class='hunk'>@@ -369,7 +369,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_OF) &amp;&amp; pfc-&gt;dev-&gt;of_node)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUPERH</div><div class='add'>+#ifdef CONFIG_PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register the GPIO to pin mappings. As pins with GPIO ports</div><div class='ctx'> 	 * must come first in the ranges, skip the pins without GPIO</div><div class='hunk'>@@ -397,7 +397,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)</div><div class='ctx'> 	chip = sh_pfc_add_gpiochip(pfc, gpio_function_setup, NULL);</div><div class='ctx'> 	if (IS_ERR(chip))</div><div class='ctx'> 		return PTR_ERR(chip);</div><div class='del'>-#endif /* CONFIG_SUPERH */</div><div class='add'>+#endif /* CONFIG_PINCTRL_SH_FUNC_GPIO */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-emev2.c b/drivers/pinctrl/sh-pfc/pfc-emev2.c<br/>index 310c6f3ee7cc..0af1ef82a1a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-emev2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-emev2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-emev2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-emev2.c</a></div><div class='hunk'>@@ -1433,7 +1433,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe0140200, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe0140200, 32, 1, GROUP(</div><div class='ctx'> 		0, PORT31_FN,				/* PIN: J18  */</div><div class='ctx'> 		0, PORT30_FN,				/* PIN: H18  */</div><div class='ctx'> 		0, PORT29_FN,				/* PIN: G18  */</div><div class='hunk'>@@ -1466,9 +1466,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_JT_SEL, PORT2_FN,			/* PIN: V9   */</div><div class='ctx'> 		0, PORT1_FN,				/* PIN: U10  */</div><div class='ctx'> 		0, PORT0_FN,				/* PIN: V10  */</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe0140204, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe0140204, 32, 1, GROUP(</div><div class='ctx'> 		FN_SDI1_CMD, PORT63_FN,			/* PIN: AC21 */</div><div class='ctx'> 		FN_SDI1_CKI, PORT62_FN,			/* PIN: AA23 */</div><div class='ctx'> 		FN_SDI1_CKO, PORT61_FN,			/* PIN: AB22 */</div><div class='hunk'>@@ -1501,9 +1501,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_LCD3_R2, PORT34_FN,			/* PIN: A19  */</div><div class='ctx'> 		FN_LCD3_R1, PORT33_FN,			/* PIN: B20  */</div><div class='ctx'> 		FN_LCD3_R0, PORT32_FN,			/* PIN: A20  */</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe0140208, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe0140208, 32, 1, GROUP(</div><div class='ctx'> 		FN_AB_1_0_PORT95, PORT95_FN,		/* PIN: L21  */</div><div class='ctx'> 		FN_AB_1_0_PORT94, PORT94_FN,		/* PIN: K21  */</div><div class='ctx'> 		FN_AB_1_0_PORT93, PORT93_FN,		/* PIN: J21  */</div><div class='hunk'>@@ -1536,9 +1536,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SDI1_DATA2, PORT66_FN,		/* PIN: AB19 */</div><div class='ctx'> 		FN_SDI1_DATA1, PORT65_FN,		/* PIN: AB20 */</div><div class='ctx'> 		FN_SDI1_DATA0, PORT64_FN,		/* PIN: AB21 */</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe014020c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe014020c, 32, 1, GROUP(</div><div class='ctx'> 		FN_NTSC_DATA4, PORT127_FN,		/* PIN: T20  */</div><div class='ctx'> 		FN_NTSC_DATA3, PORT126_FN,		/* PIN: R18  */</div><div class='ctx'> 		FN_NTSC_DATA2, PORT125_FN,		/* PIN: R20  */</div><div class='hunk'>@@ -1571,9 +1571,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_AB_9_8_PORT98, PORT98_FN,		/* PIN: M20  */</div><div class='ctx'> 		FN_AB_9_8_PORT97, PORT97_FN,		/* PIN: N21  */</div><div class='ctx'> 		FN_AB_A20, PORT96_FN,			/* PIN: M21  */</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe0140210, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe0140210, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		FN_UART_1_0_PORT158, PORT158_FN,	/* PIN: AB10 */</div><div class='ctx'> 		FN_UART_1_0_PORT157, PORT157_FN,	/* PIN: AA10 */</div><div class='hunk'>@@ -1606,11 +1606,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_NTSC_DATA7, PORT130_FN,		/* PIN: U18  */</div><div class='ctx'> 		FN_NTSC_DATA6, PORT129_FN,		/* PIN: U20  */</div><div class='ctx'> 		FN_NTSC_DATA5, PORT128_FN,		/* PIN: T18  */</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("CHG_PINSEL_LCD3", 0xe0140284, 32,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			1, 1, 1, 1, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,</div><div class='add'>+				   2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* 31 - 12 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1624,11 +1626,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* 1 - 0 */</div><div class='ctx'> 		FN_SEL_LCD3_1_0_00, FN_SEL_LCD3_1_0_01, 0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("CHG_PINSEL_UART", 0xe0140288, 32,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* 31 - 2 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1636,11 +1640,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* 1 - 0 */</div><div class='ctx'> 		FN_SEL_UART_1_0_00, FN_SEL_UART_1_0_01, 0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("CHG_PINSEL_IIC", 0xe014028c, 32,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* 31 - 2 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1648,11 +1654,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* 1 - 0 */</div><div class='ctx'> 		FN_SEL_IIC_1_0_00, FN_SEL_IIC_1_0_01, 0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("CHG_PINSEL_AB", 0xe0140294, 32,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* 31 - 14 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1673,11 +1680,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SEL_AB_3_2_10, FN_SEL_AB_3_2_11,</div><div class='ctx'> 		/* 1 - 0 */</div><div class='ctx'> 		FN_SEL_AB_1_0_00, 0, FN_SEL_AB_1_0_10, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("CHG_PINSEL_USI", 0xe0140298, 32,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,</div><div class='add'>+				   2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* 31 - 10 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1692,11 +1701,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SEL_USI_3_2_00, FN_SEL_USI_3_2_01, 0, 0,</div><div class='ctx'> 		/* 1 - 0 */</div><div class='ctx'> 		FN_SEL_USI_1_0_00, FN_SEL_USI_1_0_01, 0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("CHG_PINSEL_HSI", 0xe01402a8, 32,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* 31 - 2 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1704,7 +1715,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* 1 - 0 */</div><div class='ctx'> 		FN_SEL_HSI_1_0_00, FN_SEL_HSI_1_0_01, 0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c<br/>index 5acbacb3727f..bf12849defdb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a73a4.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a73a4.c</a></div><div class='hunk'>@@ -2284,7 +2284,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	PORTCR(328, 0xe6053148),</div><div class='ctx'> 	PORTCR(329, 0xe6053149),</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("MSEL1CR", 0xe605800c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL1CR", 0xe605800c, 32, 1, GROUP(</div><div class='ctx'> 			MSEL1CR_31_0, MSEL1CR_31_1,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='hunk'>@@ -2317,9 +2317,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			MSEL1CR_02_0, MSEL1CR_02_1,</div><div class='ctx'> 			MSEL1CR_01_0, MSEL1CR_01_1,</div><div class='ctx'> 			MSEL1CR_00_0, MSEL1CR_00_1,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL3CR", 0xe6058020, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL3CR", 0xe6058020, 32, 1, GROUP(</div><div class='ctx'> 			MSEL3CR_31_0, MSEL3CR_31_1,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='hunk'>@@ -2352,9 +2352,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL3CR_01_0, MSEL3CR_01_1,</div><div class='ctx'> 			MSEL3CR_00_0, MSEL3CR_00_1,</div><div class='del'>-			}</div><div class='add'>+			))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL4CR", 0xe6058024, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL4CR", 0xe6058024, 32, 1, GROUP(</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL4CR_30_0, MSEL4CR_30_1,</div><div class='ctx'> 			MSEL4CR_29_0, MSEL4CR_29_1,</div><div class='hunk'>@@ -2387,9 +2387,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL4CR_01_0, MSEL4CR_01_1,</div><div class='ctx'> 			0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL5CR", 0xe6058028, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL5CR", 0xe6058028, 32, 1, GROUP(</div><div class='ctx'> 			MSEL5CR_31_0, MSEL5CR_31_1,</div><div class='ctx'> 			MSEL5CR_30_0, MSEL5CR_30_1,</div><div class='ctx'> 			MSEL5CR_29_0, MSEL5CR_29_1,</div><div class='hunk'>@@ -2422,9 +2422,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL8CR", 0xe6058034, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL8CR", 0xe6058034, 32, 1, GROUP(</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='hunk'>@@ -2457,14 +2457,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL8CR_01_0, MSEL8CR_01_1,</div><div class='ctx'> 			MSEL8CR_00_0, MSEL8CR_00_1,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054000, 32, GROUP(</div><div class='ctx'> 			0, PORT30_DATA, PORT29_DATA, PORT28_DATA,</div><div class='ctx'> 			PORT27_DATA, PORT26_DATA, PORT25_DATA, PORT24_DATA,</div><div class='ctx'> 			PORT23_DATA, PORT22_DATA, PORT21_DATA, PORT20_DATA,</div><div class='hunk'>@@ -2473,9 +2473,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT11_DATA, PORT10_DATA, PORT9_DATA, PORT8_DATA,</div><div class='ctx'> 			PORT7_DATA, PORT6_DATA, PORT5_DATA, PORT4_DATA,</div><div class='ctx'> 			PORT3_DATA, PORT2_DATA, PORT1_DATA, PORT0_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD063_032DR", 0xe6055000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD063_032DR", 0xe6055000, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='hunk'>@@ -2484,9 +2484,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			0, 0, 0, PORT40_DATA,</div><div class='ctx'> 			PORT39_DATA, PORT38_DATA, PORT37_DATA, PORT36_DATA,</div><div class='ctx'> 			PORT35_DATA, PORT34_DATA, PORT33_DATA, PORT32_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTL095_064DR", 0xe6054004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL095_064DR", 0xe6054004, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, PORT85_DATA, PORT84_DATA,</div><div class='hunk'>@@ -2495,9 +2495,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT75_DATA, PORT74_DATA, PORT73_DATA, PORT72_DATA,</div><div class='ctx'> 			PORT71_DATA, PORT70_DATA, PORT69_DATA, PORT68_DATA,</div><div class='ctx'> 			PORT67_DATA, PORT66_DATA, PORT65_DATA, PORT64_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD127_096DR", 0xe6055004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD127_096DR", 0xe6055004, 32, GROUP(</div><div class='ctx'> 			0, PORT126_DATA, PORT125_DATA, PORT124_DATA,</div><div class='ctx'> 			PORT123_DATA, PORT122_DATA, PORT121_DATA, PORT120_DATA,</div><div class='ctx'> 			PORT119_DATA, PORT118_DATA, PORT117_DATA, PORT116_DATA,</div><div class='hunk'>@@ -2506,9 +2506,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT107_DATA, PORT106_DATA, PORT105_DATA, PORT104_DATA,</div><div class='ctx'> 			PORT103_DATA, PORT102_DATA, PORT101_DATA, PORT100_DATA,</div><div class='ctx'> 			PORT99_DATA, PORT98_DATA, PORT97_DATA, PORT96_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD159_128DR", 0xe6055008, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD159_128DR", 0xe6055008, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='hunk'>@@ -2517,9 +2517,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, PORT134_DATA, PORT133_DATA, PORT132_DATA,</div><div class='ctx'> 			PORT131_DATA, PORT130_DATA, PORT129_DATA, PORT128_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056000, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='hunk'>@@ -2528,9 +2528,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT171_DATA, PORT170_DATA, PORT169_DATA, PORT168_DATA,</div><div class='ctx'> 			PORT167_DATA, PORT166_DATA, PORT165_DATA, PORT164_DATA,</div><div class='ctx'> 			PORT163_DATA, PORT162_DATA, PORT161_DATA, PORT160_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe6056004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe6056004, 32, GROUP(</div><div class='ctx'> 			0, PORT222_DATA, PORT221_DATA, PORT220_DATA,</div><div class='ctx'> 			PORT219_DATA, PORT218_DATA, PORT217_DATA, PORT216_DATA,</div><div class='ctx'> 			PORT215_DATA, PORT214_DATA, PORT213_DATA, PORT212_DATA,</div><div class='hunk'>@@ -2539,9 +2539,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT203_DATA, PORT202_DATA, PORT201_DATA, PORT200_DATA,</div><div class='ctx'> 			PORT199_DATA, PORT198_DATA, PORT197_DATA, PORT196_DATA,</div><div class='ctx'> 			PORT195_DATA, PORT194_DATA, PORT193_DATA, PORT192_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR255_224DR", 0xe6056008, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR255_224DR", 0xe6056008, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, PORT250_DATA, PORT249_DATA, PORT248_DATA,</div><div class='ctx'> 			PORT247_DATA, PORT246_DATA, PORT245_DATA, PORT244_DATA,</div><div class='hunk'>@@ -2550,9 +2550,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT235_DATA, PORT234_DATA, PORT233_DATA, PORT232_DATA,</div><div class='ctx'> 			PORT231_DATA, PORT230_DATA, PORT229_DATA, PORT228_DATA,</div><div class='ctx'> 			PORT227_DATA, PORT226_DATA, PORT225_DATA, PORT224_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR287_256DR", 0xe605600C, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR287_256DR", 0xe605600C, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			PORT283_DATA, PORT282_DATA, PORT281_DATA, PORT280_DATA,</div><div class='ctx'> 			PORT279_DATA, PORT278_DATA, PORT277_DATA, PORT276_DATA,</div><div class='hunk'>@@ -2561,9 +2561,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT267_DATA, PORT266_DATA, PORT265_DATA, PORT264_DATA,</div><div class='ctx'> 			PORT263_DATA, PORT262_DATA, PORT261_DATA, PORT260_DATA,</div><div class='ctx'> 			PORT259_DATA, PORT258_DATA, PORT257_DATA, PORT256_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTU319_288DR", 0xe6057000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTU319_288DR", 0xe6057000, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, PORT308_DATA,</div><div class='hunk'>@@ -2572,9 +2572,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT299_DATA, PORT298_DATA, PORT297_DATA, PORT296_DATA,</div><div class='ctx'> 			PORT295_DATA, PORT294_DATA, PORT293_DATA, PORT292_DATA,</div><div class='ctx'> 			PORT291_DATA, PORT290_DATA, PORT289_DATA, PORT288_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTU351_320DR", 0xe6057004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTU351_320DR", 0xe6057004, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='hunk'>@@ -2583,7 +2583,7 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			0, 0, PORT329_DATA, PORT328_DATA,</div><div class='ctx'> 			PORT327_DATA, PORT326_DATA, PORT325_DATA, PORT324_DATA,</div><div class='ctx'> 			PORT323_DATA, PORT322_DATA, PORT321_DATA, PORT320_DATA,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c<br/>index 6d761e62c6c8..696a0f6fc1da 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7740.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7740.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7740.c</a></div><div class='hunk'>@@ -3436,7 +3436,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	PORTCR(210,	0xe60530d2), /* PORT210CR */</div><div class='ctx'> 	PORTCR(211,	0xe60530d3), /* PORT211CR */</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("MSEL1CR", 0xe605800c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL1CR", 0xe605800c, 32, 1, GROUP(</div><div class='ctx'> 			MSEL1CR_31_0,	MSEL1CR_31_1,</div><div class='ctx'> 			MSEL1CR_30_0,	MSEL1CR_30_1,</div><div class='ctx'> 			MSEL1CR_29_0,	MSEL1CR_29_1,</div><div class='hunk'>@@ -3461,9 +3461,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			MSEL1CR_2_0,	MSEL1CR_2_1,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL1CR_0_0,	MSEL1CR_0_1,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL3CR", 0xE6058020, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL3CR", 0xE6058020, 32, 1, GROUP(</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3474,9 +3474,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			MSEL3CR_6_0,	MSEL3CR_6_1,</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='del'>-			}</div><div class='add'>+			))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL4CR", 0xE6058024, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL4CR", 0xE6058024, 32, 1, GROUP(</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3493,9 +3493,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			MSEL4CR_1_0,	MSEL4CR_1_1,</div><div class='ctx'> 			0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL5CR", 0xE6058028, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL5CR", 0xE6058028, 32, 1, GROUP(</div><div class='ctx'> 			MSEL5CR_31_0,	MSEL5CR_31_1,</div><div class='ctx'> 			MSEL5CR_30_0,	MSEL5CR_30_1,</div><div class='ctx'> 			MSEL5CR_29_0,	MSEL5CR_29_1,</div><div class='hunk'>@@ -3528,13 +3528,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			MSEL5CR_2_0,	MSEL5CR_2_1,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL5CR_0_0,	MSEL5CR_0_1,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054800, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054800, 32, GROUP(</div><div class='ctx'> 		PORT31_DATA,	PORT30_DATA,	PORT29_DATA,	PORT28_DATA,</div><div class='ctx'> 		PORT27_DATA,	PORT26_DATA,	PORT25_DATA,	PORT24_DATA,</div><div class='ctx'> 		PORT23_DATA,	PORT22_DATA,	PORT21_DATA,	PORT20_DATA,</div><div class='hunk'>@@ -3542,9 +3542,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT15_DATA,	PORT14_DATA,	PORT13_DATA,	PORT12_DATA,</div><div class='ctx'> 		PORT11_DATA,	PORT10_DATA,	PORT9_DATA,	PORT8_DATA,</div><div class='ctx'> 		PORT7_DATA,	PORT6_DATA,	PORT5_DATA,	PORT4_DATA,</div><div class='del'>-		PORT3_DATA,	PORT2_DATA,	PORT1_DATA,	PORT0_DATA }</div><div class='add'>+		PORT3_DATA,	PORT2_DATA,	PORT1_DATA,	PORT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTL063_032DR", 0xe6054804, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL063_032DR", 0xe6054804, 32, GROUP(</div><div class='ctx'> 		PORT63_DATA,	PORT62_DATA,	PORT61_DATA,	PORT60_DATA,</div><div class='ctx'> 		PORT59_DATA,	PORT58_DATA,	PORT57_DATA,	PORT56_DATA,</div><div class='ctx'> 		PORT55_DATA,	PORT54_DATA,	PORT53_DATA,	PORT52_DATA,</div><div class='hunk'>@@ -3552,9 +3552,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT47_DATA,	PORT46_DATA,	PORT45_DATA,	PORT44_DATA,</div><div class='ctx'> 		PORT43_DATA,	PORT42_DATA,	PORT41_DATA,	PORT40_DATA,</div><div class='ctx'> 		PORT39_DATA,	PORT38_DATA,	PORT37_DATA,	PORT36_DATA,</div><div class='del'>-		PORT35_DATA,	PORT34_DATA,	PORT33_DATA,	PORT32_DATA }</div><div class='add'>+		PORT35_DATA,	PORT34_DATA,	PORT33_DATA,	PORT32_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTL095_064DR", 0xe6054808, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL095_064DR", 0xe6054808, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -3562,9 +3562,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT79_DATA,	PORT78_DATA,	PORT77_DATA,	PORT76_DATA,</div><div class='ctx'> 		PORT75_DATA,	PORT74_DATA,	PORT73_DATA,	PORT72_DATA,</div><div class='ctx'> 		PORT71_DATA,	PORT70_DATA,	PORT69_DATA,	PORT68_DATA,</div><div class='del'>-		PORT67_DATA,	PORT66_DATA,	PORT65_DATA,	PORT64_DATA }</div><div class='add'>+		PORT67_DATA,	PORT66_DATA,	PORT65_DATA,	PORT64_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD095_064DR", 0xe6055808, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD095_064DR", 0xe6055808, 32, GROUP(</div><div class='ctx'> 		PORT95_DATA,	PORT94_DATA,	PORT93_DATA,	PORT92_DATA,</div><div class='ctx'> 		PORT91_DATA,	PORT90_DATA,	PORT89_DATA,	PORT88_DATA,</div><div class='ctx'> 		PORT87_DATA,	PORT86_DATA,	PORT85_DATA,	PORT84_DATA,</div><div class='hunk'>@@ -3572,9 +3572,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD127_096DR", 0xe605580c, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD127_096DR", 0xe605580c, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -3582,9 +3582,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT111_DATA,	PORT110_DATA,	PORT109_DATA,	PORT108_DATA,</div><div class='ctx'> 		PORT107_DATA,	PORT106_DATA,	PORT105_DATA,	PORT104_DATA,</div><div class='ctx'> 		PORT103_DATA,	PORT102_DATA,	PORT101_DATA,	PORT100_DATA,</div><div class='del'>-		PORT99_DATA,	PORT98_DATA,	PORT97_DATA,	PORT96_DATA }</div><div class='add'>+		PORT99_DATA,	PORT98_DATA,	PORT97_DATA,	PORT96_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR127_096DR", 0xe605680C, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR127_096DR", 0xe605680C, 32, GROUP(</div><div class='ctx'> 		PORT127_DATA,	PORT126_DATA,	PORT125_DATA,	PORT124_DATA,</div><div class='ctx'> 		PORT123_DATA,	PORT122_DATA,	PORT121_DATA,	PORT120_DATA,</div><div class='ctx'> 		PORT119_DATA,	PORT118_DATA,	PORT117_DATA,	PORT116_DATA,</div><div class='hunk'>@@ -3592,9 +3592,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR159_128DR", 0xe6056810, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR159_128DR", 0xe6056810, 32, GROUP(</div><div class='ctx'> 		PORT159_DATA,	PORT158_DATA,	PORT157_DATA,	PORT156_DATA,</div><div class='ctx'> 		PORT155_DATA,	PORT154_DATA,	PORT153_DATA,	PORT152_DATA,</div><div class='ctx'> 		PORT151_DATA,	PORT150_DATA,	PORT149_DATA,	PORT148_DATA,</div><div class='hunk'>@@ -3602,9 +3602,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT143_DATA,	PORT142_DATA,	PORT141_DATA,	PORT140_DATA,</div><div class='ctx'> 		PORT139_DATA,	PORT138_DATA,	PORT137_DATA,	PORT136_DATA,</div><div class='ctx'> 		PORT135_DATA,	PORT134_DATA,	PORT133_DATA,	PORT132_DATA,</div><div class='del'>-		PORT131_DATA,	PORT130_DATA,	PORT129_DATA,	PORT128_DATA }</div><div class='add'>+		PORT131_DATA,	PORT130_DATA,	PORT129_DATA,	PORT128_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056814, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056814, 32, GROUP(</div><div class='ctx'> 		PORT191_DATA,	PORT190_DATA,	PORT189_DATA,	PORT188_DATA,</div><div class='ctx'> 		PORT187_DATA,	PORT186_DATA,	PORT185_DATA,	PORT184_DATA,</div><div class='ctx'> 		PORT183_DATA,	PORT182_DATA,	PORT181_DATA,	PORT180_DATA,</div><div class='hunk'>@@ -3612,9 +3612,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT175_DATA,	PORT174_DATA,	PORT173_DATA,	PORT172_DATA,</div><div class='ctx'> 		PORT171_DATA,	PORT170_DATA,	PORT169_DATA,	PORT168_DATA,</div><div class='ctx'> 		PORT167_DATA,	PORT166_DATA,	PORT165_DATA,	PORT164_DATA,</div><div class='del'>-		PORT163_DATA,	PORT162_DATA,	PORT161_DATA,	PORT160_DATA }</div><div class='add'>+		PORT163_DATA,	PORT162_DATA,	PORT161_DATA,	PORT160_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe6056818, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe6056818, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -3622,9 +3622,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		PORT207_DATA,	PORT206_DATA,	PORT205_DATA,	PORT204_DATA,</div><div class='ctx'> 		PORT203_DATA,	PORT202_DATA,	PORT201_DATA,	PORT200_DATA,</div><div class='ctx'> 		PORT199_DATA,	PORT198_DATA,	PORT197_DATA,	PORT196_DATA,</div><div class='del'>-		PORT195_DATA,	PORT194_DATA,	PORT193_DATA,	PORT192_DATA }</div><div class='add'>+		PORT195_DATA,	PORT194_DATA,	PORT193_DATA,	PORT192_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTU223_192DR", 0xe6057818, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTU223_192DR", 0xe6057818, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -3632,7 +3632,7 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77470.c b/drivers/pinctrl/sh-pfc/pfc-r8a77470.c<br/>index 4359aeb35dbd..c05dc1490486 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77470.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77470.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77470.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a77470.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * Copyright (C) 2018 Renesas Electronics Corp.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sh_pfc.h"</div><div class='hunk'>@@ -2540,7 +2541,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2572,9 +2573,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_USB1_OVC,</div><div class='ctx'> 		GP_0_2_FN, FN_USB1_PWEN,</div><div class='ctx'> 		GP_0_1_FN, FN_USB0_OVC,</div><div class='del'>-		GP_0_0_FN, FN_USB0_PWEN, }</div><div class='add'>+		GP_0_0_FN, FN_USB0_PWEN, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2606,9 +2607,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP1_23_20,</div><div class='ctx'> 		GP_1_2_FN, FN_IP1_19_16,</div><div class='ctx'> 		GP_1_1_FN, FN_IP1_15_12,</div><div class='del'>-		GP_1_0_FN, FN_IP1_11_8, }</div><div class='add'>+		GP_1_0_FN, FN_IP1_11_8, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN, FN_IP8_3_0,</div><div class='ctx'> 		GP_2_30_FN, FN_IP7_31_28,</div><div class='ctx'> 		GP_2_29_FN, FN_IP7_27_24,</div><div class='hunk'>@@ -2640,9 +2641,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_IP4_19_16,</div><div class='ctx'> 		GP_2_2_FN, FN_IP4_15_12,</div><div class='ctx'> 		GP_2_1_FN, FN_IP4_11_8,</div><div class='del'>-		GP_2_0_FN, FN_IP4_7_4, }</div><div class='add'>+		GP_2_0_FN, FN_IP4_7_4, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		GP_3_29_FN, FN_IP10_19_16,</div><div class='hunk'>@@ -2674,9 +2675,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_IP8_19_16,</div><div class='ctx'> 		GP_3_2_FN, FN_IP8_15_12,</div><div class='ctx'> 		GP_3_1_FN, FN_IP8_11_8,</div><div class='del'>-		GP_3_0_FN, FN_IP8_7_4, }</div><div class='add'>+		GP_3_0_FN, FN_IP8_7_4, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2708,9 +2709,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_IP11_3_0,</div><div class='ctx'> 		GP_4_2_FN, FN_IP10_31_28,</div><div class='ctx'> 		GP_4_1_FN, FN_IP10_27_24,</div><div class='del'>-		GP_4_0_FN, FN_IP10_23_20, }</div><div class='add'>+		GP_4_0_FN, FN_IP10_23_20, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1, GROUP(</div><div class='ctx'> 		GP_5_31_FN, FN_IP17_27_24,</div><div class='ctx'> 		GP_5_30_FN, FN_IP17_23_20,</div><div class='ctx'> 		GP_5_29_FN, FN_IP17_19_16,</div><div class='hunk'>@@ -2742,10 +2743,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_IP14_11_8,</div><div class='ctx'> 		GP_5_2_FN, FN_IP14_7_4,</div><div class='ctx'> 		GP_5_1_FN, FN_IP14_3_0,</div><div class='del'>-		GP_5_0_FN, FN_IP13_31_28, }</div><div class='add'>+		GP_5_0_FN, FN_IP13_31_28, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xE6060040, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31_28 [4] */</div><div class='ctx'> 		FN_SD0_WP, FN_IRQ7, FN_CAN0_TX_A, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2769,10 +2771,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP0_3_0 [4] */</div><div class='ctx'> 		FN_SD0_CLK, 0, 0, FN_SSI_SCK1_C, FN_RX3_C, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xE6060044, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31_28 [4] */</div><div class='ctx'> 		FN_D5, FN_HRX2, FN_SCL1_B, FN_PWM2_C, FN_TCLK2_B, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2796,10 +2799,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP1_3_0 [4] */</div><div class='ctx'> 		FN_MMC0_D4, FN_SD1_CD, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xE6060048, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31_28 [4] */</div><div class='ctx'> 		FN_D13, FN_MSIOF2_SYNC_A, 0, FN_RX4_C, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2823,10 +2827,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP2_3_0 [4] */</div><div class='ctx'> 		FN_D6, FN_HTX2, FN_SDA1_B, FN_PWM4_C, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xE606004C, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP3_31_28 [4] */</div><div class='ctx'> 		FN_QSPI0_SSL, FN_WE1_N, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2851,10 +2856,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP3_3_0 [4] */</div><div class='ctx'> 		FN_D14, FN_MSIOF2_SS1, 0, FN_TX4_C, FN_CAN1_RX_B,</div><div class='ctx'> 		0, FN_AVB_AVTP_CAPTURE_A,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xE6060050, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP4_31_28 [4] */</div><div class='ctx'> 		FN_DU0_DR6, 0, FN_RX2_C, 0, 0, 0, FN_A6, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2878,10 +2884,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP4_3_0 [4] */</div><div class='ctx'> 		FN_EX_WAIT0, FN_CAN_CLK_B, FN_SCIF_CLK_A, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xE6060054, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP5_31_28 [4] */</div><div class='ctx'> 		FN_DU0_DG6, 0, FN_HRX1_C, 0, 0, 0, FN_A14,  0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2905,10 +2912,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP5_3_0 [4] */</div><div class='ctx'> 		FN_DU0_DR7, 0, FN_TX2_C, 0, FN_PWM2_B, 0, FN_A7, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xE6060058, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP6_31_28 [4] */</div><div class='ctx'> 		FN_DU0_DB6, 0, 0, 0, 0, 0, FN_A22, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2932,10 +2940,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP6_3_0 [4] */</div><div class='ctx'> 		FN_DU0_DG7, 0, FN_HTX1_C, 0,  FN_PWM6_B, 0, FN_A15,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xE606005C, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP7_31_28 [4] */</div><div class='ctx'> 		FN_DU0_DISP, 0, 0, 0, FN_CAN1_RX_C, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2959,10 +2968,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP7_3_0 [4] */</div><div class='ctx'> 		FN_DU0_DB7, 0, 0, 0, 0, 0, FN_A23, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xE6060060, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP8_31_28 [4] */</div><div class='ctx'> 		FN_VI1_DATA5, 0, 0, 0, FN_AVB_RXD4, FN_ETH_LINK, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2986,10 +2996,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP8_3_0 [4] */</div><div class='ctx'> 		FN_DU0_CDE, 0, 0, 0, FN_CAN1_TX_C, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xE6060064, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP9_31_28 [4] */</div><div class='ctx'> 		FN_VI1_DATA9, 0, 0, FN_SDA2_B, FN_AVB_TXD0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3013,10 +3024,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP9_3_0 [4] */</div><div class='ctx'> 		FN_VI1_DATA6, 0, 0, 0, FN_AVB_RXD5, FN_ETH_TXD1, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xE6060068, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP10_31_28 [4] */</div><div class='ctx'> 		FN_SCL1_A, FN_RX4_A, FN_PWM5_D, FN_DU1_DR0, 0, 0,</div><div class='ctx'> 		FN_SSI_SCK6_B, FN_VI0_G0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3041,10 +3053,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP10_3_0 [4] */</div><div class='ctx'> 		FN_VI1_DATA10, 0, 0, FN_CAN0_RX_B, FN_AVB_TXD1, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR11", 0xE606006C, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP11_31_28 [4] */</div><div class='ctx'> 		FN_HRX1_A, FN_SCL4_A, FN_PWM6_A, FN_DU1_DG0, FN_RX0_A, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3072,10 +3085,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP11_3_0 [4] */</div><div class='ctx'> 		FN_SDA1_A, FN_TX4_A, 0, FN_DU1_DR1, 0, 0, FN_SSI_WS6_B,</div><div class='del'>-		FN_VI0_G1, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		FN_VI0_G1, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR12", 0xE6060070, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP12_31_28 [4] */</div><div class='ctx'> 		FN_SD2_DAT2, FN_RX2_A, 0, FN_DU1_DB0, FN_SSI_SDATA2_B, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3099,10 +3113,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP12_3_0 [4] */</div><div class='ctx'> 		FN_HTX1_A, FN_SDA4_A, 0, FN_DU1_DG1, FN_TX0_A, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR13", 0xE6060074, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP13_31_28 [4] */</div><div class='ctx'> 		FN_SSI_SCK5_A, 0, 0, FN_DU1_DOTCLKOUT1, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3127,10 +3142,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP13_3_0 [4] */</div><div class='ctx'> 		FN_SD2_DAT3, FN_TX2_A, 0, FN_DU1_DB1, FN_SSI_WS9_B, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR14", 0xE6060078, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP14_31_28 [4] */</div><div class='ctx'> 		FN_SSI_SDATA7_A, 0, 0, FN_IRQ8, FN_AUDIO_CLKA_D, FN_CAN_CLK_D,</div><div class='ctx'> 		FN_VI0_G5, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3154,10 +3170,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP14_3_0 [4] */</div><div class='ctx'> 		FN_SSI_WS5_A, 0, FN_SCL3_C, FN_DU1_DOTCLKIN, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR15", 0xE606007C, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP15_31_28 [4] */</div><div class='ctx'> 		FN_SSI_WS4_A, 0, FN_AVB_PHY_INT, 0, 0, 0, FN_VI0_R5, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3181,10 +3198,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_VI0_G7, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP15_3_0 [4] */</div><div class='ctx'> 		FN_SSI_SCK0129_A, FN_MSIOF1_RXD_A, FN_RX5_D, 0, 0, 0,</div><div class='del'>-		FN_VI0_G6, 0, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		FN_VI0_G6, 0, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR16", 0xE6060080, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP16_31_28 [4] */</div><div class='ctx'> 		FN_SSI_SDATA2_A, FN_HRTS1_N_B, 0, 0, 0, 0,</div><div class='ctx'> 		FN_VI0_DATA4_VI0_B4, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3209,10 +3227,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_DACK2, FN_VI0_CLK, FN_AVB_COL, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP16_3_0 [4] */</div><div class='ctx'> 		FN_SSI_SDATA4_A, 0, FN_AVB_CRS, 0, 0, 0, FN_VI0_R6, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR17", 0xE6060084, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP17_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP17_27_24 [4] */</div><div class='hunk'>@@ -3235,11 +3254,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_VI0_DATA6_VI0_B6, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP17_3_0 [4] */</div><div class='ctx'> 		FN_SSI_SCK9_A, FN_RX2_B, FN_SCL3_E, 0, 0, FN_EX_WAIT1,</div><div class='del'>-		FN_VI0_DATA5_VI0_B5, 0, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		FN_VI0_DATA5_VI0_B5, 0, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xE60600C0, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 2, 1, 3, 3,</div><div class='del'>-				 1, 2, 3, 3, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 2, 1,</div><div class='add'>+				   3, 3, 1, 2, 3, 3, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='hunk'>@@ -3282,11 +3302,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SEL_I2C00_0, FN_SEL_I2C00_1, FN_SEL_I2C00_2, FN_SEL_I2C00_3,</div><div class='ctx'> 		FN_SEL_I2C00_4, 0, 0, 0,</div><div class='ctx'> 		/* SEL_AVB [1] */</div><div class='del'>-		FN_SEL_AVB_0, FN_SEL_AVB_1, }</div><div class='add'>+		FN_SEL_AVB_0, FN_SEL_AVB_1, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xE60600C4, 32,</div><div class='del'>-			     1, 3, 3, 2, 2, 1, 2, 2,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 1) {</div><div class='add'>+			     GROUP(1, 3, 3, 2, 2, 1, 2, 2, 2, 1, 1, 1,</div><div class='add'>+				   1, 1, 2, 1, 1, 2, 2, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_SCIFCLK [1] */</div><div class='ctx'> 		FN_SEL_SCIFCLK_0, FN_SEL_SCIFCLK_1,</div><div class='ctx'> 		/* SEL_SCIF5 [3] */</div><div class='hunk'>@@ -3328,11 +3349,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_HSCIF1 [2] */</div><div class='ctx'> 		FN_SEL_HSCIF1_0, FN_SEL_HSCIF1_1, FN_SEL_HSCIF1_2, 0,</div><div class='ctx'> 		/* SEL_HSCIF0 [1] */</div><div class='del'>-		FN_SEL_HSCIF0_0, FN_SEL_HSCIF0_1,}</div><div class='add'>+		FN_SEL_HSCIF0_0, FN_SEL_HSCIF0_1, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE60600C8, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-				 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,</div><div class='add'>+				   2, 2, 2, 2, 2, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='hunk'>@@ -3374,7 +3396,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_SSI1 [2] */</div><div class='ctx'> 		FN_SEL_SSI1_0, FN_SEL_SSI1_1, FN_SEL_SSI1_2, FN_SEL_SSI1_3,</div><div class='ctx'> 		/* SEL_SSI0 [2] */</div><div class='del'>-		FN_SEL_SSI0_0, FN_SEL_SSI0_1, 0, 0, }</div><div class='add'>+		FN_SEL_SSI0_0, FN_SEL_SSI0_1, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7778.c b/drivers/pinctrl/sh-pfc/pfc-r8a7778.c<br/>index 068b5e6334d1..49fe52d35f30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7778.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7778.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7778.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7778.c</a></div><div class='hunk'>@@ -2104,7 +2104,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xfffc0004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xfffc0004, 32, 1, GROUP(</div><div class='ctx'> 		GP_0_31_FN,	FN_IP1_14_11,</div><div class='ctx'> 		GP_0_30_FN,	FN_IP1_10_8,</div><div class='ctx'> 		GP_0_29_FN,	FN_IP1_7_5,</div><div class='hunk'>@@ -2136,9 +2136,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	FN_IP0_4_2,</div><div class='ctx'> 		GP_0_2_FN,	FN_PENC1,</div><div class='ctx'> 		GP_0_1_FN,	FN_PENC0,</div><div class='del'>-		GP_0_0_FN,	FN_IP0_1_0 }</div><div class='add'>+		GP_0_0_FN,	FN_IP0_1_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xfffc0008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xfffc0008, 32, 1, GROUP(</div><div class='ctx'> 		GP_1_31_FN,	FN_IP4_6_4,</div><div class='ctx'> 		GP_1_30_FN,	FN_IP4_3_1,</div><div class='ctx'> 		GP_1_29_FN,	FN_IP4_0,</div><div class='hunk'>@@ -2170,9 +2170,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	FN_IP1_27_25,</div><div class='ctx'> 		GP_1_2_FN,	FN_IP1_24,</div><div class='ctx'> 		GP_1_1_FN,	FN_WE0,</div><div class='del'>-		GP_1_0_FN,	FN_IP1_23_21 }</div><div class='add'>+		GP_1_0_FN,	FN_IP1_23_21 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xfffc000c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xfffc000c, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN,	FN_IP6_7,</div><div class='ctx'> 		GP_2_30_FN,	FN_IP6_6_5,</div><div class='ctx'> 		GP_2_29_FN,	FN_IP6_4_2,</div><div class='hunk'>@@ -2204,9 +2204,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	FN_IP4_12_11,</div><div class='ctx'> 		GP_2_2_FN,	FN_IP4_10_9,</div><div class='ctx'> 		GP_2_1_FN,	FN_IP4_8,</div><div class='del'>-		GP_2_0_FN,	FN_IP4_7 }</div><div class='add'>+		GP_2_0_FN,	FN_IP4_7 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xfffc0010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xfffc0010, 32, 1, GROUP(</div><div class='ctx'> 		GP_3_31_FN,	FN_IP8_10_9,</div><div class='ctx'> 		GP_3_30_FN,	FN_IP8_8_6,</div><div class='ctx'> 		GP_3_29_FN,	FN_IP8_5_3,</div><div class='hunk'>@@ -2238,9 +2238,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	FN_IP6_10,</div><div class='ctx'> 		GP_3_2_FN,	FN_SSI_SCK34,</div><div class='ctx'> 		GP_3_1_FN,	FN_IP6_9,</div><div class='del'>-		GP_3_0_FN,	FN_IP6_8 }</div><div class='add'>+		GP_3_0_FN,	FN_IP6_8 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xfffc0014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xfffc0014, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2272,12 +2272,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	FN_IP8_21_19,</div><div class='ctx'> 		GP_4_2_FN,	FN_IP8_18_16,</div><div class='ctx'> 		GP_4_1_FN,	FN_IP8_15_14,</div><div class='del'>-		GP_4_0_FN,	FN_IP8_13_11 }</div><div class='add'>+		GP_4_0_FN,	FN_IP8_13_11 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xfffc0020, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 3, 4, 3, 3, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 3, 4, 3, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31 [1] */</div><div class='ctx'> 		0,	0,</div><div class='ctx'> 		/* IP0_30 [1] */</div><div class='hunk'>@@ -2328,10 +2329,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_TX2_E,	FN_SDA2_B,		0,		0,</div><div class='ctx'> 		/* IP0_1_0 [2] */</div><div class='ctx'> 		FN_PRESETOUT,	0,	FN_PWM1,	0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xfffc0024, 32,</div><div class='del'>-			     1, 1, 2, 3, 1, 3, 3, 1, 2, 4, 3, 3, 3, 1, 1) {</div><div class='add'>+			     GROUP(1, 1, 2, 3, 1, 3, 3, 1, 2, 4, 3, 3,</div><div class='add'>+				   3, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31 [1] */</div><div class='ctx'> 		0,	0,</div><div class='ctx'> 		/* IP1_30 [1] */</div><div class='hunk'>@@ -2371,11 +2374,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_A21,		FN_HSPI_CLK1_B,</div><div class='ctx'> 		/* IP1_0 [1] */</div><div class='ctx'> 		FN_A20,		FN_HSPI_CS1_B,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xfffc0028, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 3, 2, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 3, 2, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31 [1] */</div><div class='ctx'> 		FN_MLB_CLK,	FN_IRQ1_A,</div><div class='ctx'> 		/* IP2_30 [1] */</div><div class='hunk'>@@ -2423,11 +2427,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP2_2_0 [3] */</div><div class='ctx'> 		FN_SD1_CLK_A,	FN_MMC_CLK,	0,	FN_ATACS00,</div><div class='ctx'> 		FN_EX_CS2,	0,		0,	0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xfffc002c, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 3, 3, 2,</div><div class='del'>-			     3, 3, 3, 2, 3, 3, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 3, 3, 2, 3, 3, 3, 2,</div><div class='add'>+				   3, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP3_31 [1] */</div><div class='ctx'> 		FN_DU0_DR6,	FN_LCDOUT6,</div><div class='ctx'> 		/* IP3_30 [1] */</div><div class='hunk'>@@ -2465,10 +2470,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SDSELF_B,	0,		0,		0,</div><div class='ctx'> 		/* IP3_1_0 [2] */</div><div class='ctx'> 		FN_MLB_SIG,	FN_RX5_B,	FN_SDA3_A,	FN_IRQ2_A,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xfffc0030, 32,</div><div class='del'>-			     1, 2, 2, 2, 4, 4, 2, 2, 2, 2, 1, 1, 3, 3, 1) {</div><div class='add'>+			     GROUP(1, 2, 2, 2, 4, 4, 2, 2, 2, 2, 1, 1,</div><div class='add'>+				   3, 3, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP4_31 [1] */</div><div class='ctx'> 		0,	0,</div><div class='ctx'> 		/* IP4_30_29 [2] */</div><div class='hunk'>@@ -2507,10 +2514,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_TX1_D,	FN_CAN0_TX_A,	FN_ADICHS0,	0,</div><div class='ctx'> 		/* IP4_0 [1] */</div><div class='ctx'> 		FN_DU0_DR7,	FN_LCDOUT7,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xfffc0034, 32,</div><div class='del'>-			     1, 2, 3, 3, 2, 3, 3, 2, 1, 2, 2, 1, 1, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 2, 3, 3, 2, 3, 3, 2, 1, 2, 2, 1,</div><div class='add'>+				   1, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> </div><div class='ctx'> 		/* IP5_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2551,11 +2560,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_VI1_DATA10_B,	FN_DU0_DB6,	FN_LCDOUT22,	0,</div><div class='ctx'> 		/* IP5_1_0 [2] */</div><div class='ctx'> 		FN_VI0_R5_B,		FN_DU0_DB5,	FN_LCDOUT21,	0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xfffc0038, 32,</div><div class='del'>-			     2, 2, 2, 2, 2, 1, 2, 2, 1, 2,</div><div class='del'>-			     1, 2, 1, 1, 1, 1, 2, 3, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 1, 2,</div><div class='add'>+				   1, 1, 1, 1, 2, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP6_31_30 [2] */</div><div class='ctx'> 		FN_SD0_DAT2,	0,	FN_SUB_TDI,	0,</div><div class='ctx'> 		/* IP6_29_28 [2] */</div><div class='hunk'>@@ -2602,10 +2612,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP6_1_0 [2] */</div><div class='ctx'> 		FN_SSI_SCK6,		FN_HSPI_RX2_A,</div><div class='ctx'> 		FN_FMCLK_B,		FN_CAN1_TX_B,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xfffc003c, 32,</div><div class='del'>-			     3, 4, 3, 1, 3, 3, 3, 3, 3, 2, 2, 2) {</div><div class='add'>+			     GROUP(3, 4, 3, 1, 3, 3, 3, 3, 3, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> </div><div class='ctx'> 		/* IP7_31_29 [3] */</div><div class='ctx'> 		FN_VI0_HSYNC,	FN_SD2_CD_B,	FN_VI1_DATA2,	FN_DU1_DR2,</div><div class='hunk'>@@ -2641,10 +2652,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SD0_CD,	0,		FN_TX5_A,	0,</div><div class='ctx'> 		/* IP7_1_0 [2] */</div><div class='ctx'> 		FN_SD0_DAT3,	0,		FN_IRQ1_B,	0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xfffc0040, 32,</div><div class='del'>-			     1, 1, 3, 3, 2, 3, 3, 2, 3, 2, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 3, 3, 2, 3, 3, 2, 3, 2, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP8_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP8_30 [1] */</div><div class='hunk'>@@ -2681,10 +2693,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP8_2_0 [3] */</div><div class='ctx'> 		FN_VI0_VSYNC,		FN_SD2_WP_B,	FN_VI1_DATA3,	FN_DU1_DR3,</div><div class='ctx'> 		0,			FN_HSPI_TX1_A,	FN_TX3_B,	0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xfffc0044, 32,</div><div class='del'>-			     1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP9_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP9_30 [1] */</div><div class='hunk'>@@ -2723,10 +2736,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP9_2_0 [3] */</div><div class='ctx'> 		FN_VI0_G4,	FN_SD2_DAT0_B,	FN_VI1_DATA6,	FN_DU1_DR6,</div><div class='ctx'> 		0,		FN_HRTS1_B,	0,		0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xfffc0048, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 4, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 4,</div><div class='add'>+				   3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> </div><div class='ctx'> 		/* IP10_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2772,11 +2787,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_ATARD1,	FN_ETH_MDC,</div><div class='ctx'> 		FN_SDA1_B,	0,</div><div class='ctx'> 		0,		0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xfffc0050, 32,</div><div class='del'>-			     1, 1, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2,</div><div class='del'>-			     1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(1, 1, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2,</div><div class='add'>+				   1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> </div><div class='ctx'> 		/* SEL 31  [1] */</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2835,11 +2851,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SEL_WAIT2_A,		FN_SEL_WAIT2_B,</div><div class='ctx'> 		/* SEL_0 (WAIT1) [1] */</div><div class='ctx'> 		FN_SEL_WAIT1_A,		FN_SEL_WAIT1_B,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xfffc0054, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> </div><div class='ctx'> 		/* SEL_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2899,7 +2916,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SEL_I2C2_C,		0,</div><div class='ctx'> 		/* SEL_0 (I2C1) [1] */</div><div class='ctx'> 		FN_SEL_I2C1_A,		FN_SEL_I2C1_B,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c<br/>index 64bace100316..0c121b28ec3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7779.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7779.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7779.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7779.c</a></div><div class='hunk'>@@ -1595,6 +1595,92 @@ static const unsigned int ether_magic_pins[] = {</div><div class='ctx'> static const unsigned int ether_magic_mux[] = {</div><div class='ctx'> 	ETH_MAGIC_MARK,</div><div class='ctx'> };</div><div class='add'>+/* - HSCIF0 ----------------------------------------------------------------- */</div><div class='add'>+static const unsigned int hscif0_data_pins[] = {</div><div class='add'>+	/* TX, RX */</div><div class='add'>+	RCAR_GP_PIN(4, 20), RCAR_GP_PIN(4, 21)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_data_mux[] = {</div><div class='add'>+	HTX0_MARK, HRX0_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_data_b_pins[] = {</div><div class='add'>+	/* TX, RX */</div><div class='add'>+	RCAR_GP_PIN(3, 12), RCAR_GP_PIN(3, 13)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_data_b_mux[] = {</div><div class='add'>+	HTX0_B_MARK, HRX0_B_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_ctrl_pins[] = {</div><div class='add'>+	/* CTS, RTS */</div><div class='add'>+	RCAR_GP_PIN(4, 18), RCAR_GP_PIN(4, 19)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_ctrl_mux[] = {</div><div class='add'>+	HCTS0_MARK, HRTS0_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_ctrl_b_pins[] = {</div><div class='add'>+	/* CTS, RTS */</div><div class='add'>+	RCAR_GP_PIN(3, 9), RCAR_GP_PIN(3, 10)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_ctrl_b_mux[] = {</div><div class='add'>+	HCTS0_B_MARK, HRTS0_B_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_clk_pins[] = {</div><div class='add'>+	/* SCK */</div><div class='add'>+	RCAR_GP_PIN(4, 17)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_clk_mux[] = {</div><div class='add'>+	HSCK0_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_clk_b_pins[] = {</div><div class='add'>+	/* SCK */</div><div class='add'>+	RCAR_GP_PIN(3, 11)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif0_clk_b_mux[] = {</div><div class='add'>+	HSCK0_B_MARK</div><div class='add'>+};</div><div class='add'>+/* - HSCIF1 ----------------------------------------------------------------- */</div><div class='add'>+static const unsigned int hscif1_data_pins[] = {</div><div class='add'>+	/* TX, RX */</div><div class='add'>+	RCAR_GP_PIN(0, 19), RCAR_GP_PIN(0, 20)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_data_mux[] = {</div><div class='add'>+	HTX1_MARK, HRX1_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_data_b_pins[] = {</div><div class='add'>+	/* TX, RX */</div><div class='add'>+	RCAR_GP_PIN(2, 2), RCAR_GP_PIN(2, 3)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_data_b_mux[] = {</div><div class='add'>+	HTX1_B_MARK, HRX1_B_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_ctrl_pins[] = {</div><div class='add'>+	/* CTS, RTS */</div><div class='add'>+	RCAR_GP_PIN(0, 21), RCAR_GP_PIN(0, 22)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_ctrl_mux[] = {</div><div class='add'>+	HCTS1_MARK, HRTS1_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_ctrl_b_pins[] = {</div><div class='add'>+	/* CTS, RTS */</div><div class='add'>+	RCAR_GP_PIN(2, 7), RCAR_GP_PIN(2, 6)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_ctrl_b_mux[] = {</div><div class='add'>+	HCTS1_B_MARK, HRTS1_B_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_clk_pins[] = {</div><div class='add'>+	/* SCK */</div><div class='add'>+	RCAR_GP_PIN(0, 18)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_clk_mux[] = {</div><div class='add'>+	HSCK1_MARK</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_clk_b_pins[] = {</div><div class='add'>+	/* SCK */</div><div class='add'>+	RCAR_GP_PIN(2, 4)</div><div class='add'>+};</div><div class='add'>+static const unsigned int hscif1_clk_b_mux[] = {</div><div class='add'>+	HSCK1_B_MARK</div><div class='add'>+};</div><div class='ctx'> /* - HSPI0 ------------------------------------------------------------------ */</div><div class='ctx'> static const unsigned int hspi0_pins[] = {</div><div class='ctx'> 	/* CLK, CS, RX, TX */</div><div class='hunk'>@@ -2618,6 +2704,18 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {</div><div class='ctx'> 	SH_PFC_PIN_GROUP(ether_rmii),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(ether_link),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(ether_magic),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif0_data),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif0_data_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif0_ctrl),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif0_ctrl_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif0_clk),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif0_clk_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif1_data),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif1_data_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif1_ctrl),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif1_ctrl_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif1_clk),</div><div class='add'>+	SH_PFC_PIN_GROUP(hscif1_clk_b),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hspi0),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hspi1),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hspi1_b),</div><div class='hunk'>@@ -2783,6 +2881,24 @@ static const char * const ether_groups[] = {</div><div class='ctx'> 	"ether_magic",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const char * const hscif0_groups[] = {</div><div class='add'>+	"hscif0_data",</div><div class='add'>+	"hscif0_data_b",</div><div class='add'>+	"hscif0_ctrl",</div><div class='add'>+	"hscif0_ctrl_b",</div><div class='add'>+	"hscif0_clk",</div><div class='add'>+	"hscif0_clk_b",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const hscif1_groups[] = {</div><div class='add'>+	"hscif1_data",</div><div class='add'>+	"hscif1_data_b",</div><div class='add'>+	"hscif1_ctrl",</div><div class='add'>+	"hscif1_ctrl_b",</div><div class='add'>+	"hscif1_clk",</div><div class='add'>+	"hscif1_clk_b",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const char * const hspi0_groups[] = {</div><div class='ctx'> 	"hspi0",</div><div class='ctx'> };</div><div class='hunk'>@@ -3005,6 +3121,8 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> 	SH_PFC_FUNCTION(du0),</div><div class='ctx'> 	SH_PFC_FUNCTION(du1),</div><div class='ctx'> 	SH_PFC_FUNCTION(ether),</div><div class='add'>+	SH_PFC_FUNCTION(hscif0),</div><div class='add'>+	SH_PFC_FUNCTION(hscif1),</div><div class='ctx'> 	SH_PFC_FUNCTION(hspi0),</div><div class='ctx'> 	SH_PFC_FUNCTION(hspi1),</div><div class='ctx'> 	SH_PFC_FUNCTION(hspi2),</div><div class='hunk'>@@ -3036,7 +3154,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xfffc0004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xfffc0004, 32, 1, GROUP(</div><div class='ctx'> 		GP_0_31_FN, FN_IP3_31_29,</div><div class='ctx'> 		GP_0_30_FN, FN_IP3_26_24,</div><div class='ctx'> 		GP_0_29_FN, FN_IP3_22_21,</div><div class='hunk'>@@ -3068,9 +3186,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_A17,</div><div class='ctx'> 		GP_0_2_FN, FN_IP0_7_6,</div><div class='ctx'> 		GP_0_1_FN, FN_AVS2,</div><div class='del'>-		GP_0_0_FN, FN_AVS1 }</div><div class='add'>+		GP_0_0_FN, FN_AVS1 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xfffc0008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xfffc0008, 32, 1, GROUP(</div><div class='ctx'> 		GP_1_31_FN, FN_IP5_23_21,</div><div class='ctx'> 		GP_1_30_FN, FN_IP5_20_17,</div><div class='ctx'> 		GP_1_29_FN, FN_IP5_16_15,</div><div class='hunk'>@@ -3102,9 +3220,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP4_10_8,</div><div class='ctx'> 		GP_1_2_FN, FN_IP4_7_5,</div><div class='ctx'> 		GP_1_1_FN, FN_IP4_4_2,</div><div class='del'>-		GP_1_0_FN, FN_IP4_1_0 }</div><div class='add'>+		GP_1_0_FN, FN_IP4_1_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xfffc000c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xfffc000c, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN, FN_IP10_28_26,</div><div class='ctx'> 		GP_2_30_FN, FN_IP10_25_24,</div><div class='ctx'> 		GP_2_29_FN, FN_IP10_23_21,</div><div class='hunk'>@@ -3136,9 +3254,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_IP8_24_23,</div><div class='ctx'> 		GP_2_2_FN, FN_IP8_22_21,</div><div class='ctx'> 		GP_2_1_FN, FN_IP8_20,</div><div class='del'>-		GP_2_0_FN, FN_IP5_27_24 }</div><div class='add'>+		GP_2_0_FN, FN_IP5_27_24 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xfffc0010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xfffc0010, 32, 1, GROUP(</div><div class='ctx'> 		GP_3_31_FN, FN_IP6_3_2,</div><div class='ctx'> 		GP_3_30_FN, FN_IP6_1_0,</div><div class='ctx'> 		GP_3_29_FN, FN_IP5_30_29,</div><div class='hunk'>@@ -3170,9 +3288,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_IP11_8_6,</div><div class='ctx'> 		GP_3_2_FN, FN_IP11_5_3,</div><div class='ctx'> 		GP_3_1_FN, FN_IP11_2_0,</div><div class='del'>-		GP_3_0_FN, FN_IP10_31_29 }</div><div class='add'>+		GP_3_0_FN, FN_IP10_31_29 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xfffc0014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xfffc0014, 32, 1, GROUP(</div><div class='ctx'> 		GP_4_31_FN, FN_IP8_19,</div><div class='ctx'> 		GP_4_30_FN, FN_IP8_18,</div><div class='ctx'> 		GP_4_29_FN, FN_IP8_17_16,</div><div class='hunk'>@@ -3204,9 +3322,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_IP6_11_9,</div><div class='ctx'> 		GP_4_2_FN, FN_IP6_8,</div><div class='ctx'> 		GP_4_1_FN, FN_IP6_7_6,</div><div class='del'>-		GP_4_0_FN, FN_IP6_5_4 }</div><div class='add'>+		GP_4_0_FN, FN_IP6_5_4 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xfffc0018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xfffc0018, 32, 1, GROUP(</div><div class='ctx'> 		GP_5_31_FN, FN_IP3_5,</div><div class='ctx'> 		GP_5_30_FN, FN_IP3_4,</div><div class='ctx'> 		GP_5_29_FN, FN_IP3_3,</div><div class='hunk'>@@ -3238,9 +3356,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_A4,</div><div class='ctx'> 		GP_5_2_FN, FN_A3,</div><div class='ctx'> 		GP_5_1_FN, FN_A2,</div><div class='del'>-		GP_5_0_FN, FN_A1 }</div><div class='add'>+		GP_5_0_FN, FN_A1 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xfffc001c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xfffc001c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3255,11 +3373,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN, FN_IP3_15,</div><div class='ctx'> 		GP_6_2_FN, FN_IP3_8,</div><div class='ctx'> 		GP_6_1_FN, FN_IP3_7,</div><div class='del'>-		GP_6_0_FN, FN_IP3_6 }</div><div class='add'>+		GP_6_0_FN, FN_IP3_6 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xfffc0020, 32,</div><div class='del'>-			     1, 3, 2, 1, 2, 4, 3, 2, 2, 2, 2, 2, 3, 3) {</div><div class='add'>+			     GROUP(1, 3, 2, 1, 2, 4, 3, 2, 2, 2, 2, 2, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP0_30_28 [3] */</div><div class='hunk'>@@ -3294,10 +3413,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_ATADIR0, FN_SDSELF, FN_HCTS1, FN_TX4_C,</div><div class='ctx'> 		/* IP0_2_0 [3] */</div><div class='ctx'> 		FN_USB_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,</div><div class='del'>-		FN_SCIF_CLK, FN_TCLK0_C, 0, 0 }</div><div class='add'>+		FN_SCIF_CLK, FN_TCLK0_C, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xfffc0024, 32,</div><div class='del'>-			     3, 4, 2, 2, 2, 4, 4, 4, 3, 2, 2) {</div><div class='add'>+			     GROUP(3, 4, 2, 2, 2, 4, 4, 4, 3, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31_29 [3] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP1_28_25 [4] */</div><div class='hunk'>@@ -3332,10 +3452,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP1_3_2 [2] */</div><div class='ctx'> 		FN_EX_CS1, FN_MMC0_D7, FN_FD7, 0,</div><div class='ctx'> 		/* IP1_1_0 [2] */</div><div class='del'>-		FN_EX_CS0, FN_RX3_C_IRDA_RX_C, FN_MMC0_D6, FN_FD6 }</div><div class='add'>+		FN_EX_CS0, FN_RX3_C_IRDA_RX_C, FN_MMC0_D6, FN_FD6 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xfffc0028, 32,</div><div class='del'>-			     1, 3, 1, 1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(1, 3, 1, 1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP2_30_28 [3] */</div><div class='hunk'>@@ -3378,11 +3499,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_HRX0, FN_RX1, FN_SCKZ, FN_RTS0_C_TANS_C,</div><div class='ctx'> 		FN_SUB_TDI, FN_CC5_STATE3, FN_CC5_STATE11, FN_CC5_STATE19,</div><div class='ctx'> 		FN_CC5_STATE27, FN_CC5_STATE35, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xfffc002c, 32,</div><div class='del'>-			     3, 1, 1, 3, 1, 2, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 3, 3, 1, 1, 1, 1, 1, 1, 3) {</div><div class='add'>+			     GROUP(3, 1, 1, 3, 1, 2, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   3, 3, 1, 1, 1, 1, 1, 1, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP3_31_29 [3] */</div><div class='ctx'> 	    FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, FN_QCPV_QDE, FN_CAN1_TX, FN_TX2_C,</div><div class='ctx'> 	    FN_SCL2_C, FN_REMOCON, 0, 0,</div><div class='hunk'>@@ -3429,11 +3551,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_DU0_DG2, FN_LCDOUT10,</div><div class='ctx'> 	    /* IP3_2_0 [3] */</div><div class='ctx'> 	    FN_DU0_DG1, FN_LCDOUT9, FN_DACK1, FN_SDA2,</div><div class='del'>-	    FN_AUDATA3, 0, 0, 0 }</div><div class='add'>+	    FN_AUDATA3, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xfffc0030, 32,</div><div class='del'>-			     3, 1, 1, 1, 1, 1, 1, 3, 3,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 3, 3, 3, 2) {</div><div class='add'>+			     GROUP(3, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 3, 3, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP4_31_29 [3] */</div><div class='ctx'> 	    FN_DU1_DB0, FN_VI2_DATA4_VI2_B4, FN_SCL2_B, FN_SD3_DAT0,</div><div class='ctx'> 	    FN_TX5, FN_SCK0_D, 0, 0,</div><div class='hunk'>@@ -3477,11 +3600,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_DU0_CDE, FN_QPOLB, FN_CAN1_RX, FN_RX2_C,</div><div class='ctx'> 	    FN_DREQ0_B, FN_SSI_SCK78_B, FN_SCK0_B, 0,</div><div class='ctx'> 	    /* IP4_1_0 [2] */</div><div class='del'>-	    FN_DU0_DISP, FN_QPOLA, FN_CAN_CLK_C, FN_SCK2_C }</div><div class='add'>+	    FN_DU0_DISP, FN_QPOLA, FN_CAN_CLK_C, FN_SCK2_C ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xfffc0034, 32,</div><div class='del'>-			     1, 2, 1, 4, 3, 4, 2, 2,</div><div class='del'>-			     2, 2, 1, 1, 1, 1, 1, 1, 3) {</div><div class='add'>+			     GROUP(1, 2, 1, 4, 3, 4, 2, 2, 2, 2, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP5_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP5_30_29 [2] */</div><div class='hunk'>@@ -3523,10 +3647,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_DU1_DB2, FN_VI2_R4,</div><div class='ctx'> 	    /* IP5_2_0 [3] */</div><div class='ctx'> 	    FN_DU1_DB1, FN_VI2_DATA5_VI2_B5, FN_SDA2_B, FN_SD3_DAT1,</div><div class='del'>-	    FN_RX5, FN_RTS0_D_TANS_D, 0, 0 }</div><div class='add'>+	    FN_RX5, FN_RTS0_D_TANS_D, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xfffc0038, 32,</div><div class='del'>-			     1, 2, 2, 2, 2, 3, 2, 3, 3, 3, 1, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 2, 2, 2, 2, 3, 2, 3, 3, 3, 1, 2,</div><div class='add'>+				   2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP6_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP6_30_29 [2] */</div><div class='hunk'>@@ -3560,10 +3686,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP6_3_2 [2] */</div><div class='ctx'> 	    FN_SSI_WS0129, FN_CAN_DEBUGOUT2, FN_MOUT2, 0,</div><div class='ctx'> 	    /* IP6_1_0 [2] */</div><div class='del'>-	    FN_SSI_SCK0129, FN_CAN_DEBUGOUT1, FN_MOUT1, 0 }</div><div class='add'>+	    FN_SSI_SCK0129, FN_CAN_DEBUGOUT1, FN_MOUT1, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xfffc003c, 32,</div><div class='del'>-			     1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 2, 2) {</div><div class='add'>+			     GROUP(1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3,</div><div class='add'>+				   3, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP7_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP7_30_29 [2] */</div><div class='hunk'>@@ -3596,10 +3724,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP7_3_2 [2] */</div><div class='ctx'> 	    FN_SSI_SDATA6, FN_ADICHS2, FN_CAN_CLK, FN_IECLK_B,</div><div class='ctx'> 	    /* IP7_1_0 [2] */</div><div class='del'>-	    FN_SSI_WS6, FN_ADICHS1, FN_CAN0_RX, FN_IETX_B }</div><div class='add'>+	    FN_SSI_WS6, FN_ADICHS1, FN_CAN0_RX, FN_IETX_B ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xfffc0040, 32,</div><div class='del'>-			     1, 3, 3, 2, 2, 1, 1, 1, 2, 4, 4, 4, 4) {</div><div class='add'>+			     GROUP(1, 3, 3, 2, 2, 1, 1, 1, 2, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP8_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP8_30_28 [3] */</div><div class='hunk'>@@ -3639,11 +3768,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_HSPI_CLK0, FN_CTS0, FN_USB_OVC0, FN_AD_CLK,</div><div class='ctx'> 	    FN_CC5_STATE4, FN_CC5_STATE12, FN_CC5_STATE20, FN_CC5_STATE28,</div><div class='ctx'> 	    FN_CC5_STATE36, 0, 0, 0,</div><div class='del'>-	    0, 0, 0, 0 }</div><div class='add'>+	    0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xfffc0044, 32,</div><div class='del'>-			     2, 2, 2, 2, 2, 3, 3, 2, 2,</div><div class='del'>-			     2, 2, 1, 1, 1, 1, 2, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 1,</div><div class='add'>+				   1, 1, 1, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP9_31_30 [2] */</div><div class='ctx'> 	    0, 0, 0, 0,</div><div class='ctx'> 	    /* IP9_29_28 [2] */</div><div class='hunk'>@@ -3679,10 +3809,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP9_3_2 [2] */</div><div class='ctx'> 	    FN_VI0_DATA1_VI0_B1, FN_HCTS1_B, FN_MT1_PWM, 0,</div><div class='ctx'> 	    /* IP9_1_0 [2] */</div><div class='del'>-	    FN_VI0_DATA0_VI0_B0, FN_HRTS1_B, FN_MT1_VCXO, 0 }</div><div class='add'>+	    FN_VI0_DATA0_VI0_B0, FN_HRTS1_B, FN_MT1_VCXO, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xfffc0048, 32,</div><div class='del'>-			     3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP10_31_29 [3] */</div><div class='ctx'> 	    FN_VI1_VSYNC, FN_AUDIO_CLKOUT_C, FN_SSI_WS4, FN_SIM_CLK,</div><div class='ctx'> 	    FN_GPS_MAG_C, FN_SPV_TRST, FN_SCL3, 0,</div><div class='hunk'>@@ -3714,10 +3845,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_DACK0_C, FN_DRACK0_C, 0, 0,</div><div class='ctx'> 	    /* IP10_2_0 [3] */</div><div class='ctx'> 	    FN_VI0_R0, FN_SSI_SDATA7_C, FN_SCK1_C, FN_DREQ1_B,</div><div class='del'>-	    FN_ARM_TRACEDATA_10, FN_DREQ0_C, 0, 0 }</div><div class='add'>+	    FN_ARM_TRACEDATA_10, FN_DREQ0_C, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR11", 0xfffc004c, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP11_31_30 [2] */</div><div class='ctx'> 	    0, 0, 0, 0,</div><div class='ctx'> 	    /* IP11_29_27 [3] */</div><div class='hunk'>@@ -3749,10 +3881,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_ADICS_B_SAMP_B, 0, 0, 0,</div><div class='ctx'> 	    /* IP11_2_0 [3] */</div><div class='ctx'> 	    FN_VI1_DATA0_VI1_B0, FN_SD2_DAT0, FN_SIM_RST, FN_SPV_TCK,</div><div class='del'>-	    FN_ADICLK_B, 0, 0, 0 }</div><div class='add'>+	    FN_ADICLK_B, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR12", 0xfffc0050, 32,</div><div class='del'>-			     4, 4, 4, 2, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(4, 4, 4, 2, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP12_31_28 [4] */</div><div class='ctx'> 	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -3781,11 +3914,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    FN_SCL1_C, FN_HTX0_B, 0, 0,</div><div class='ctx'> 	    /* IP12_2_0 [3] */</div><div class='ctx'> 	    FN_VI1_G2, FN_VI3_DATA2, FN_SSI_WS1, FN_TS_SPSYNC1,</div><div class='del'>-	    FN_SCK2, FN_HSCK0_B, 0, 0 }</div><div class='add'>+	    FN_SCK2, FN_HSCK0_B, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL", 0xfffc0090, 32,</div><div class='del'>-			     2, 2, 3, 3, 2, 2, 2, 2, 2,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 2, 1, 2) {</div><div class='add'>+			     GROUP(2, 2, 3, 3, 2, 2, 2, 2, 2, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 2, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* SEL_SCIF5 [2] */</div><div class='ctx'> 	    FN_SEL_SCIF5_0, FN_SEL_SCIF5_1, FN_SEL_SCIF5_2, FN_SEL_SCIF5_3,</div><div class='ctx'> 	    /* SEL_SCIF4 [2] */</div><div class='hunk'>@@ -3825,11 +3959,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* SEL_EXBUS1 [1] */</div><div class='ctx'> 	    FN_SEL_EXBUS1_0, FN_SEL_EXBUS1_1,</div><div class='ctx'> 	    /* SEL_EXBUS0 [2] */</div><div class='del'>-	    FN_SEL_EXBUS0_0, FN_SEL_EXBUS0_1, FN_SEL_EXBUS0_2, 0 }</div><div class='add'>+	    FN_SEL_EXBUS0_0, FN_SEL_EXBUS0_1, FN_SEL_EXBUS0_2, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xfffc0094, 32,</div><div class='del'>-			     2, 2, 2, 2, 1, 1, 1, 3, 1,</div><div class='del'>-			     2, 2, 2, 2, 1, 1, 2, 1, 2, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 1, 1, 1, 3, 1, 2, 2, 2,</div><div class='add'>+				   2, 1, 1, 2, 1, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* SEL_TMU1 [2] */</div><div class='ctx'> 	    FN_SEL_TMU1_0, FN_SEL_TMU1_1, FN_SEL_TMU1_2, 0,</div><div class='ctx'> 	    /* SEL_TMU0 [2] */</div><div class='hunk'>@@ -3868,7 +4003,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* SEL_I2C2 [2] */</div><div class='ctx'> 	    FN_SEL_I2C2_0, FN_SEL_I2C2_1, FN_SEL_I2C2_2, FN_SEL_I2C2_3,</div><div class='ctx'> 	    /* SEL_I2C1 [2] */</div><div class='del'>-	    FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, FN_SEL_I2C1_3 }</div><div class='add'>+	    FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, FN_SEL_I2C1_3 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c<br/>index a84229cb8cd4..c41a6761cf9d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7790.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7790.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7790.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7790.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  * Copyright (C) 2012  Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.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/sys_soc.h&gt;</div><div class='hunk'>@@ -4744,7 +4745,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1, GROUP(</div><div class='ctx'> 		GP_0_31_FN, FN_IP3_17_15,</div><div class='ctx'> 		GP_0_30_FN, FN_IP3_14_12,</div><div class='ctx'> 		GP_0_29_FN, FN_IP3_11_8,</div><div class='hunk'>@@ -4776,9 +4777,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_IP0_11_9,</div><div class='ctx'> 		GP_0_2_FN, FN_IP0_8_6,</div><div class='ctx'> 		GP_0_1_FN, FN_IP0_5_3,</div><div class='del'>-		GP_0_0_FN, FN_IP0_2_0 }</div><div class='add'>+		GP_0_0_FN, FN_IP0_2_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		GP_1_29_FN, FN_IP6_13_11,</div><div class='hunk'>@@ -4810,9 +4811,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP3_28_26,</div><div class='ctx'> 		GP_1_2_FN, FN_IP3_25_23,</div><div class='ctx'> 		GP_1_1_FN, FN_IP3_22_20,</div><div class='del'>-		GP_1_0_FN, FN_IP3_19_18, }</div><div class='add'>+		GP_1_0_FN, FN_IP3_19_18, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		GP_2_29_FN, FN_IP7_15_13,</div><div class='hunk'>@@ -4844,9 +4845,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_IP8_3_2,</div><div class='ctx'> 		GP_2_2_FN, FN_IP8_1_0,</div><div class='ctx'> 		GP_2_1_FN, FN_IP7_30_29,</div><div class='del'>-		GP_2_0_FN, FN_IP7_28_27 }</div><div class='add'>+		GP_2_0_FN, FN_IP7_28_27 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1, GROUP(</div><div class='ctx'> 		GP_3_31_FN, FN_IP11_21_18,</div><div class='ctx'> 		GP_3_30_FN, FN_IP11_17_15,</div><div class='ctx'> 		GP_3_29_FN, FN_IP11_14_13,</div><div class='hunk'>@@ -4878,9 +4879,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_IP9_3_2,</div><div class='ctx'> 		GP_3_2_FN, FN_IP9_1_0,</div><div class='ctx'> 		GP_3_1_FN, FN_IP8_30_29,</div><div class='del'>-		GP_3_0_FN, FN_IP8_28 }</div><div class='add'>+		GP_3_0_FN, FN_IP8_28 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1, GROUP(</div><div class='ctx'> 		GP_4_31_FN, FN_IP14_18_16,</div><div class='ctx'> 		GP_4_30_FN, FN_IP14_15_12,</div><div class='ctx'> 		GP_4_29_FN, FN_IP14_11_9,</div><div class='hunk'>@@ -4912,9 +4913,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_IP11_31_30,</div><div class='ctx'> 		GP_4_2_FN, FN_IP11_29_27,</div><div class='ctx'> 		GP_4_1_FN, FN_IP11_26_24,</div><div class='del'>-		GP_4_0_FN, FN_IP11_23_22 }</div><div class='add'>+		GP_4_0_FN, FN_IP11_23_22 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1, GROUP(</div><div class='ctx'> 		GP_5_31_FN, FN_IP7_24_22,</div><div class='ctx'> 		GP_5_30_FN, FN_IP7_21_19,</div><div class='ctx'> 		GP_5_29_FN, FN_IP7_18_16,</div><div class='hunk'>@@ -4946,10 +4947,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_IP14_30_28,</div><div class='ctx'> 		GP_5_2_FN, FN_IP14_27_25,</div><div class='ctx'> 		GP_5_1_FN, FN_IP14_24_22,</div><div class='del'>-		GP_5_0_FN, FN_IP14_21_19 }</div><div class='add'>+		GP_5_0_FN, FN_IP14_21_19 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xE6060020, 32,</div><div class='del'>-			     1, 4, 4, 3, 4, 4, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 4, 4, 3, 4, 4, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP0_30_27 [4] */</div><div class='hunk'>@@ -4982,10 +4984,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0,</div><div class='ctx'> 		/* IP0_2_0 [3] */</div><div class='ctx'> 		FN_D0, FN_MSIOF3_SCK_B, FN_VI3_DATA0, FN_VI0_G4, FN_VI0_G4_B,</div><div class='del'>-		0, 0, 0, }</div><div class='add'>+		0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xE6060024, 32,</div><div class='del'>-			     2, 2, 2, 4, 4, 3, 3, 4, 4, 4) {</div><div class='add'>+			     GROUP(2, 2, 2, 4, 4, 3, 3, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP1_29_28 [2] */</div><div class='hunk'>@@ -5019,10 +5022,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP1_3_0 [4] */</div><div class='ctx'> 		FN_D9, FN_SCIFA1_RXD_C, FN_AVB_TXD1, 0,</div><div class='ctx'> 		FN_VI0_G1, FN_VI0_G1_B, FN_VI2_DATA1_VI2_B1,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xE6060028, 32,</div><div class='del'>-			     3, 3, 4, 4, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(3, 3, 4, 4, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31_29 [3] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP2_28_26 [3] */</div><div class='hunk'>@@ -5048,10 +5052,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP2_5_3 [3] */</div><div class='ctx'> 		FN_A3, FN_PWM6, FN_MSIOF1_SS2_B, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP2_2_0 [3] */</div><div class='del'>-		FN_A2, FN_PWM5, FN_MSIOF1_SS1_B, 0, 0, 0, 0, 0,	}</div><div class='add'>+		FN_A2, FN_PWM5, FN_MSIOF1_SS1_B, 0, 0, 0, 0, 0,	))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xE606002C, 32,</div><div class='del'>-			     3, 3, 3, 3, 2, 3, 3, 4, 4, 4) {</div><div class='add'>+			     GROUP(3, 3, 3, 3, 2, 3, 3, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP3_31_29 [3] */</div><div class='ctx'> 		FN_A20, FN_SPCLK, FN_VI1_R3, FN_VI1_R3_B, FN_VI2_G4,</div><div class='ctx'> 		0, 0, 0,</div><div class='hunk'>@@ -5081,10 +5086,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP3_3_0 [4] */</div><div class='ctx'> 		FN_A11, FN_SCIFB2_CTS_N_B, FN_MSIOF2_SCK, FN_VI1_R0,</div><div class='ctx'> 		FN_VI1_R0_B, FN_VI2_G0, FN_VI2_DATA3_VI2_B3_B, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xE6060030, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP4_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP4_29_27 [3] */</div><div class='hunk'>@@ -5114,10 +5120,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_A22, FN_MISO_IO1, FN_VI1_R5, FN_VI1_R5_B, FN_VI2_G6, 0, 0, 0,</div><div class='ctx'> 		/* IP4_2_0 [3] */</div><div class='ctx'> 		FN_A21, FN_MOSI_IO0, FN_VI1_R4, FN_VI1_R4_B, FN_VI2_G5, 0, 0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xE6060034, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 3, 2, 3, 4, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 3, 2, 3, 4, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP5_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP5_29_27 [3] */</div><div class='hunk'>@@ -5151,10 +5158,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_INTC_EN0_N, FN_I2C1_SCL,</div><div class='ctx'> 		/* IP5_2_0 [3] */</div><div class='ctx'> 		FN_EX_CS3_N, FN_GPS_MAG, FN_VI3_FIELD, FN_VI1_G1, FN_VI1_G1_B,</div><div class='del'>-		FN_VI2_R3, 0, 0, }</div><div class='add'>+		FN_VI2_R3, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xE6060038, 32,</div><div class='del'>-			     3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3) {</div><div class='add'>+			     GROUP(3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP6_31_29 [3] */</div><div class='ctx'> 		FN_ETH_REF_CLK, 0, FN_HCTS0_N_E,</div><div class='ctx'> 		FN_STP_IVCXO27_1_B, FN_HRX0_F, 0, 0, 0,</div><div class='hunk'>@@ -5187,10 +5195,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SSI_SDATA7_C, FN_SSI_SCK78_B, 0, 0, 0,</div><div class='ctx'> 		/* IP6_2_0 [3] */</div><div class='ctx'> 		FN_DACK0, FN_IRQ0, FN_INTC_IRQ0_N, FN_SSI_SCK6_B,</div><div class='del'>-		FN_VI1_VSYNC_N, FN_VI1_VSYNC_N_B, FN_SSI_WS78_C, 0, }</div><div class='add'>+		FN_VI1_VSYNC_N, FN_VI1_VSYNC_N_B, FN_SSI_WS78_C, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xE606003C, 32,</div><div class='del'>-			     1, 2, 2, 2, 3, 3, 3, 3, 3, 2, 2, 3, 3) {</div><div class='add'>+			     GROUP(1, 2, 2, 2, 3, 3, 3, 3, 3, 2, 2, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP7_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP7_30_29 [2] */</div><div class='hunk'>@@ -5222,11 +5231,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_ETH_TXD1, 0, FN_HTX0_F, FN_BPFCLK_G, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP7_2_0 [3] */</div><div class='ctx'> 		FN_ETH_MDIO, 0, FN_HRTS0_N_E,</div><div class='del'>-		FN_SIM0_D_C, FN_HCTS0_N_F, 0, 0, 0, }</div><div class='add'>+		FN_SIM0_D_C, FN_HCTS0_N_F, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xE6060040, 32,</div><div class='del'>-			     1, 2, 1, 1, 1, 2, 2, 2, 2, 2, 2,</div><div class='del'>-			     2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 2, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2,</div><div class='add'>+				   2, 2, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP8_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP8_30_29 [2] */</div><div class='hunk'>@@ -5263,10 +5273,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP8_3_2 [2] */</div><div class='ctx'> 		FN_VI0_DATA2_VI0_B2, FN_ATAWR0_N, FN_AVB_RXD4, 0,</div><div class='ctx'> 		/* IP8_1_0 [2] */</div><div class='del'>-		FN_VI0_DATA1_VI0_B1, FN_ATARD0_N, FN_AVB_RXD3, 0, }</div><div class='add'>+		FN_VI0_DATA1_VI0_B1, FN_ATARD0_N, FN_AVB_RXD3, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xE6060044, 32,</div><div class='del'>-			     4, 2, 2, 2, 2, 2, 2, 4, 4, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(4, 2, 2, 2, 2, 2, 2, 4, 4, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP9_31_28 [4] */</div><div class='ctx'> 		FN_SD1_CD, FN_MMC1_D6, FN_TS_SDEN1, FN_USB1_EXTP,</div><div class='ctx'> 		FN_GLO_SS, FN_VI0_CLK_B, FN_IIC2_SCL_D, FN_I2C2_SCL_D,</div><div class='hunk'>@@ -5298,10 +5309,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP9_3_2 [2] */</div><div class='ctx'> 		FN_SD0_DAT1, FN_SCIFB1_TXD_B, FN_VI1_DATA3_VI1_B3_B, 0,</div><div class='ctx'> 		/* IP9_1_0 [2] */</div><div class='del'>-		FN_SD0_DAT0, FN_SCIFB1_RXD_B, FN_VI1_DATA2_VI1_B2_B, 0, }</div><div class='add'>+		FN_SD0_DAT0, FN_SCIFB1_RXD_B, FN_VI1_DATA2_VI1_B2_B, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xE6060048, 32,</div><div class='del'>-			     2, 4, 3, 4, 4, 4, 4, 3, 4) {</div><div class='add'>+			     GROUP(2, 4, 3, 4, 4, 4, 4, 3, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP10_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP10_29_26 [4] */</div><div class='hunk'>@@ -5337,10 +5349,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP10_3_0 [4] */</div><div class='ctx'> 		FN_SD1_WP, FN_MMC1_D7, FN_TS_SPSYNC1, FN_USB1_IDIN,</div><div class='ctx'> 		FN_GLO_RFON, FN_VI1_CLK_B, FN_IIC2_SDA_D, FN_I2C2_SDA_D,</div><div class='del'>-		FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,</div><div class='del'>-			     2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4) {</div><div class='add'>+			     GROUP(2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP11_31_30 [2] */</div><div class='ctx'> 		FN_SSI_SCK0129, FN_CAN_CLK_B, FN_MOUT0, 0,</div><div class='ctx'> 		/* IP11_29_27 [3] */</div><div class='hunk'>@@ -5372,10 +5385,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP11_3_0 [4] */</div><div class='ctx'> 		FN_SD2_WP, FN_MMC0_D5, FN_TS_SCK0_B, FN_USB2_IDIN,</div><div class='ctx'> 		FN_GLO_I1, FN_VI0_DATA7_VI0_B7_B, FN_HRTS0_N_D,</div><div class='del'>-		FN_TS_SCK1_B, FN_GLO_I1_B, FN_VI3_DATA7_B, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		FN_TS_SCK1_B, FN_GLO_I1_B, FN_VI3_DATA7_B, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR12", 0xE6060050, 32,</div><div class='del'>-			     1, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP12_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP12_30_28 [3] */</div><div class='hunk'>@@ -5411,10 +5425,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP12_3_2 [2] */</div><div class='ctx'> 		FN_SSI_SDATA0, FN_CAN0_RX_B, FN_MOUT2, 0,</div><div class='ctx'> 		/* IP12_1_0 [2] */</div><div class='del'>-		FN_SSI_WS0129, FN_CAN0_TX_B, FN_MOUT1, 0, }</div><div class='add'>+		FN_SSI_WS0129, FN_CAN0_TX_B, FN_MOUT1, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR13", 0xE6060054, 32,</div><div class='del'>-			     1, 2, 3, 3, 4, 3, 3, 3, 3, 4, 3) {</div><div class='add'>+			     GROUP(1, 2, 3, 3, 4, 3, 3, 3, 3, 4, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP13_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP13_30_29 [2] */</div><div class='hunk'>@@ -5447,10 +5462,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_BPFCLK_F, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP13_2_0 [3] */</div><div class='ctx'> 		FN_SSI_SDATA5, FN_SCIFB1_TXD, FN_IETX_B, FN_DU2_DR2,</div><div class='del'>-		FN_LCDOUT2, FN_CAN_DEBUGOUT5, 0, 0, }</div><div class='add'>+		FN_LCDOUT2, FN_CAN_DEBUGOUT5, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR14", 0xE6060058, 32,</div><div class='del'>-			     1, 3, 3, 3, 3, 3, 4, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 3, 3, 3, 3, 3, 4, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP14_30 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP14_30_28 [3] */</div><div class='hunk'>@@ -5485,10 +5501,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP14_2_0 [3] */</div><div class='ctx'> 		FN_AUDIO_CLKB, FN_SCIF_CLK, FN_CAN0_RX_D,</div><div class='ctx'> 		FN_DVC_MUTE, FN_CAN0_RX_C, FN_CAN_DEBUGOUT15,</div><div class='del'>-		FN_REMOCON, 0, }</div><div class='add'>+		FN_REMOCON, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR15", 0xE606005C, 32,</div><div class='del'>-			     2, 2, 2, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 2, 2, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP15_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP15_29_28 [2] */</div><div class='hunk'>@@ -5520,10 +5537,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_IIC2_SCL, FN_I2C2_SCL, 0,</div><div class='ctx'> 		/* IP15_2_0 [3] */</div><div class='ctx'> 		FN_SCIFA2_SCK, FN_FMCLK, FN_SCK2, FN_MSIOF3_SCK, FN_DU2_DG7,</div><div class='del'>-		FN_LCDOUT15, FN_SCIF_CLK_B, 0, }</div><div class='add'>+		FN_LCDOUT15, FN_SCIF_CLK_B, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR16", 0xE6060160, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 4, 1, 1, 3, 3) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 4, 1, 1, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP16_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -5551,11 +5569,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_SCIFA2_RXD_B, 0,</div><div class='ctx'> 		/* IP16_2_0 [3] */</div><div class='ctx'> 		FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2,</div><div class='del'>-		FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, 0, }</div><div class='add'>+		FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL", 0xE6060090, 32,</div><div class='del'>-			     3, 2, 2, 3, 2, 1, 1, 1, 2, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1) {</div><div class='add'>+			     GROUP(3, 2, 2, 3, 2, 1, 1, 1, 2, 1, 2, 1,</div><div class='add'>+				   1, 1, 1, 2, 1, 1, 2, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_SCIF1 [3] */</div><div class='ctx'> 		FN_SEL_SCIF1_0, FN_SEL_SCIF1_1, FN_SEL_SCIF1_2, FN_SEL_SCIF1_3,</div><div class='ctx'> 		FN_SEL_SCIF1_4, 0, 0, 0,</div><div class='hunk'>@@ -5601,11 +5620,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_SOF3 [1] */</div><div class='ctx'> 		FN_SEL_SOF3_0, FN_SEL_SOF3_1,</div><div class='ctx'> 		/* SEL_SOF0 [1] */</div><div class='del'>-		FN_SEL_SOF0_0, FN_SEL_SOF0_1, }</div><div class='add'>+		FN_SEL_SOF0_0, FN_SEL_SOF0_1, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,</div><div class='del'>-			     3, 1, 1, 1, 2, 1, 2, 1, 2,</div><div class='del'>-			     1, 1, 1, 3, 3, 2, 3, 2, 2) {</div><div class='add'>+			     GROUP(3, 1, 1, 1, 2, 1, 2, 1, 2, 1, 1, 1,</div><div class='add'>+				   3, 3, 2, 3, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED [3] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* SEL_TMU1 [1] */</div><div class='hunk'>@@ -5643,11 +5663,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_SIM [2] */</div><div class='ctx'> 		FN_SEL_SIM_0, FN_SEL_SIM_1, FN_SEL_SIM_2, 0,</div><div class='ctx'> 		/* SEL_SSI8 [2] */</div><div class='del'>-		FN_SEL_SSI8_0, FN_SEL_SSI8_1, FN_SEL_SSI8_2, 0, }</div><div class='add'>+		FN_SEL_SSI8_0, FN_SEL_SSI8_1, FN_SEL_SSI8_2, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL3", 0xE6060098, 32,</div><div class='del'>-			     1, 1, 2, 4, 4, 2, 2,</div><div class='del'>-			     4, 2, 3, 2, 3, 2) {</div><div class='add'>+			     GROUP(1, 1, 2, 4, 4, 2, 2, 4, 2, 3, 2, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_IICDVFS [1] */</div><div class='ctx'> 		FN_SEL_IICDVFS_0, FN_SEL_IICDVFS_1,</div><div class='ctx'> 		/* SEL_IIC0 [1] */</div><div class='hunk'>@@ -5678,7 +5698,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SEL_I2C2_0, FN_SEL_I2C2_1, FN_SEL_I2C2_2, FN_SEL_I2C2_3,</div><div class='ctx'> 		FN_SEL_I2C2_4, 0, 0, 0,</div><div class='ctx'> 		/* SEL_I2C1 [2] */</div><div class='del'>-		FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, 0, }</div><div class='add'>+		FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c<br/>index d8b13d4e9bbf..1292ec8d268f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7791.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7791.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7791.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7791.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * Copyright (C) 2014-2017 Cogent Embedded, Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sh_pfc.h"</div><div class='hunk'>@@ -5427,7 +5428,7 @@ static const struct {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1, GROUP(</div><div class='ctx'> 		GP_0_31_FN, FN_IP1_22_20,</div><div class='ctx'> 		GP_0_30_FN, FN_IP1_19_17,</div><div class='ctx'> 		GP_0_29_FN, FN_IP1_16_14,</div><div class='hunk'>@@ -5459,9 +5460,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_IP0_3,</div><div class='ctx'> 		GP_0_2_FN, FN_IP0_2,</div><div class='ctx'> 		GP_0_1_FN, FN_IP0_1,</div><div class='del'>-		GP_0_0_FN, FN_IP0_0, }</div><div class='add'>+		GP_0_0_FN, FN_IP0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5493,9 +5494,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP2_2_0,</div><div class='ctx'> 		GP_1_2_FN, FN_IP1_31_29,</div><div class='ctx'> 		GP_1_1_FN, FN_IP1_28_26,</div><div class='del'>-		GP_1_0_FN, FN_IP1_25_23, }</div><div class='add'>+		GP_1_0_FN, FN_IP1_25_23, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN, FN_IP6_7_6,</div><div class='ctx'> 		GP_2_30_FN, FN_IP6_5_3,</div><div class='ctx'> 		GP_2_29_FN, FN_IP6_2_0,</div><div class='hunk'>@@ -5527,9 +5528,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_IP4_4_2,</div><div class='ctx'> 		GP_2_2_FN, FN_IP4_1_0,</div><div class='ctx'> 		GP_2_1_FN, FN_IP3_30_28,</div><div class='del'>-		GP_2_0_FN, FN_IP3_27_25 }</div><div class='add'>+		GP_2_0_FN, FN_IP3_27_25 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1, GROUP(</div><div class='ctx'> 		GP_3_31_FN, FN_IP9_18_17,</div><div class='ctx'> 		GP_3_30_FN, FN_IP9_16,</div><div class='ctx'> 		GP_3_29_FN, FN_IP9_15_13,</div><div class='hunk'>@@ -5561,9 +5562,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_IP7_12_11,</div><div class='ctx'> 		GP_3_2_FN, FN_IP7_10_9,</div><div class='ctx'> 		GP_3_1_FN, FN_IP7_8_6,</div><div class='del'>-		GP_3_0_FN, FN_IP7_5_3 }</div><div class='add'>+		GP_3_0_FN, FN_IP7_5_3 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1, GROUP(</div><div class='ctx'> 		GP_4_31_FN, FN_IP15_5_4,</div><div class='ctx'> 		GP_4_30_FN, FN_IP15_3_2,</div><div class='ctx'> 		GP_4_29_FN, FN_IP15_1_0,</div><div class='hunk'>@@ -5595,9 +5596,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_IP9_24_23,</div><div class='ctx'> 		GP_4_2_FN, FN_IP9_22_21,</div><div class='ctx'> 		GP_4_1_FN, FN_IP9_20_19,</div><div class='del'>-		GP_4_0_FN, FN_VI0_CLK }</div><div class='add'>+		GP_4_0_FN, FN_VI0_CLK ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1, GROUP(</div><div class='ctx'> 		GP_5_31_FN, FN_IP3_24_22,</div><div class='ctx'> 		GP_5_30_FN, FN_IP13_9_7,</div><div class='ctx'> 		GP_5_29_FN, FN_IP13_6_5,</div><div class='hunk'>@@ -5629,9 +5630,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_IP11_18_17,</div><div class='ctx'> 		GP_5_2_FN, FN_IP11_16_15,</div><div class='ctx'> 		GP_5_1_FN, FN_IP11_14_12,</div><div class='del'>-		GP_5_0_FN, FN_IP11_11_9 }</div><div class='add'>+		GP_5_0_FN, FN_IP11_11_9 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xE606001C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xE606001C, 32, 1, GROUP(</div><div class='ctx'> 		GP_6_31_FN, FN_DU0_DOTCLKIN,</div><div class='ctx'> 		GP_6_30_FN, FN_USB1_OVC,</div><div class='ctx'> 		GP_6_29_FN, FN_IP14_31_29,</div><div class='hunk'>@@ -5663,9 +5664,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN, FN_IP13_13,</div><div class='ctx'> 		GP_6_2_FN, FN_IP13_12,</div><div class='ctx'> 		GP_6_1_FN, FN_IP13_11,</div><div class='del'>-		GP_6_0_FN, FN_IP13_10 }</div><div class='add'>+		GP_6_0_FN, FN_IP13_10 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR7", 0xE6060074, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR7", 0xE6060074, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5697,11 +5698,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_7_3_FN, FN_IP15_26_24,</div><div class='ctx'> 		GP_7_2_FN, FN_IP15_23_21,</div><div class='ctx'> 		GP_7_1_FN, FN_IP15_20_18,</div><div class='del'>-		GP_7_0_FN, FN_IP15_17_15 }</div><div class='add'>+		GP_7_0_FN, FN_IP15_17_15 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xE6060020, 32,</div><div class='del'>-			     1, 2, 2, 2, 2, 2, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(1, 2, 2, 2, 2, 2, 2, 3, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP0_30_29 [2] */</div><div class='hunk'>@@ -5756,10 +5758,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP0_1 [1] */</div><div class='ctx'> 		FN_D1, 0,</div><div class='ctx'> 		/* IP0_0 [1] */</div><div class='del'>-		FN_D0, 0, }</div><div class='add'>+		FN_D0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xE6060024, 32,</div><div class='del'>-			     3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31_29 [3] */</div><div class='ctx'> 		FN_A18, FN_DREQ1, FN_SCIFA1_RXD_C, 0, FN_SCIFB1_RXD_C,</div><div class='ctx'> 		0, 0, 0,</div><div class='hunk'>@@ -5792,10 +5795,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_A8, FN_MSIOF1_SS1, FN_I2C0_SCL, 0,</div><div class='ctx'> 		/* IP1_1_0 [2] */</div><div class='ctx'> 		FN_A7, FN_MSIOF1_SYNC,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xE6060028, 32,</div><div class='del'>-			     2, 3, 2, 2, 2, 2, 3, 3, 3, 3, 2, 2, 3) {</div><div class='add'>+			     GROUP(2, 3, 2, 2, 2, 2, 3, 3, 3, 3, 2, 2, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP2_29_27 [3] */</div><div class='hunk'>@@ -5828,10 +5832,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_A20, FN_SPCLK, 0, 0,</div><div class='ctx'> 		/* IP2_2_0 [3] */</div><div class='ctx'> 		FN_A19, FN_DACK1, FN_SCIFA1_TXD_C, 0,</div><div class='del'>-		FN_SCIFB1_TXD_C, 0, FN_SCIFB1_SCK_B, 0, }</div><div class='add'>+		FN_SCIFB1_TXD_C, 0, FN_SCIFB1_SCK_B, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xE606002C, 32,</div><div class='del'>-			     1, 3, 3, 3, 2, 2, 2, 2, 2, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 3, 3, 3, 2, 2, 2, 2, 2, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP3_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP3_30_28 [3] */</div><div class='hunk'>@@ -5866,10 +5871,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_SCIFB1_RXD_B, FN_PWM1, FN_TPU_TO1, 0,</div><div class='ctx'> 		/* IP3_2_0 [3] */</div><div class='ctx'> 		FN_EX_CS4_N, FN_ATARD0_N, FN_MSIOF2_RXD, 0, FN_EX_WAIT2,</div><div class='del'>-		0, 0, 0, }</div><div class='add'>+		0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xE6060030, 32,</div><div class='del'>-			     1, 3, 2, 2, 2, 1, 1, 1, 3, 3, 3, 2, 3, 3, 2) {</div><div class='add'>+			     GROUP(1, 3, 2, 2, 2, 1, 1, 1, 3, 3, 3, 2,</div><div class='add'>+				   3, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP4_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP4_30_28 [3] */</div><div class='hunk'>@@ -5908,10 +5915,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_MSIOF2_SYNC_C, FN_GLO_I0_D,</div><div class='ctx'> 		0, 0, 0,</div><div class='ctx'> 		/* IP4_1_0 [2] */</div><div class='del'>-		FN_SSI_SDATA0, FN_I2C0_SCL_B, FN_IIC0_SCL_B, FN_MSIOF2_SCK_C, }</div><div class='add'>+		FN_SSI_SDATA0, FN_I2C0_SCL_B, FN_IIC0_SCL_B, FN_MSIOF2_SCK_C,</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xE6060034, 32,</div><div class='del'>-			     3, 3, 2, 2, 2, 3, 2, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(3, 3, 2, 2, 2, 3, 2, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP5_31_29 [3] */</div><div class='ctx'> 		FN_SSI_SDATA9, FN_RX3_D, FN_CAN0_RX_D,</div><div class='ctx'> 		0, 0, 0, 0, 0,</div><div class='hunk'>@@ -5946,10 +5955,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP5_2_0 [3] */</div><div class='ctx'> 		FN_SSI_WS5, FN_MSIOF1_SYNC_C, FN_TS_SCK0, FN_GLO_I1,</div><div class='ctx'> 		FN_MSIOF2_TXD_D, FN_VI1_R3_B,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xE6060038, 32,</div><div class='del'>-			     2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 2, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 2, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP6_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP6_29_27 [3] */</div><div class='hunk'>@@ -5986,10 +5996,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP6_2_0 [3] */</div><div class='ctx'> 		FN_AUDIO_CLKB, FN_STP_OPWM_0_B, FN_MSIOF1_SCK_B,</div><div class='ctx'> 		FN_SCIF_CLK, FN_DVC_MUTE, FN_BPFCLK_E,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xE606003C, 32,</div><div class='del'>-			     2, 3, 3, 3, 2, 2, 2, 2, 2, 2, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 2, 2, 2, 2, 2, 2, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP7_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP7_29_27 [3] */</div><div class='hunk'>@@ -6027,10 +6038,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP7_2_0 [3] */</div><div class='ctx'> 		FN_IRQ9, FN_DU1_DOTCLKIN_B, FN_CAN_CLK_D, FN_GPS_MAG_C,</div><div class='ctx'> 		FN_SCIF_CLK_B, FN_GPS_MAG_D,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xE6060040, 32,</div><div class='del'>-			     1, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP8_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP8_30_28 [3] */</div><div class='hunk'>@@ -6070,10 +6082,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP8_2_0 [3] */</div><div class='ctx'> 		FN_DU1_DG3, FN_LCDOUT11, FN_VI1_DATA5_B, 0, FN_SSI_WS78_B,</div><div class='del'>-		0, 0, 0, }</div><div class='add'>+		0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xE6060044, 32,</div><div class='del'>-			     3, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 1, 1, 3, 3) {</div><div class='add'>+			     GROUP(3, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3,</div><div class='add'>+				   1, 1, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP9_31_29 [3] */</div><div class='ctx'> 		FN_VI0_G0, FN_IIC1_SCL, FN_STP_IVCXO27_0_C, FN_I2C4_SCL,</div><div class='ctx'> 		FN_HCTS2_N, FN_SCIFB2_CTS_N, FN_ATAWR1_N, 0,</div><div class='hunk'>@@ -6113,10 +6127,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0,</div><div class='ctx'> 		/* IP9_2_0 [3] */</div><div class='ctx'> 		FN_DU1_DB6, FN_LCDOUT22, FN_I2C3_SCL_C, FN_RX3, FN_SCIFA3_RXD,</div><div class='del'>-		0, 0, 0, }</div><div class='add'>+		0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xE6060048, 32,</div><div class='del'>-			     3, 2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(3, 2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP10_31_29 [3] */</div><div class='ctx'> 		FN_VI0_R4, FN_VI2_DATA5, FN_GLO_SCLK_B, FN_TX0_C, FN_I2C1_SCL_D,</div><div class='ctx'> 		0, 0, 0,</div><div class='hunk'>@@ -6150,11 +6165,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_HSCK2, FN_SCIFB2_SCK, FN_ATARD1_N, 0,</div><div class='ctx'> 		/* IP10_2_0 [3] */</div><div class='ctx'> 		FN_VI0_G1, FN_IIC1_SDA, FN_STP_ISCLK_0_C, FN_I2C4_SDA,</div><div class='del'>-		FN_HRTS2_N, FN_SCIFB2_RTS_N, FN_ATADIR1_N, 0, }</div><div class='add'>+		FN_HRTS2_N, FN_SCIFB2_RTS_N, FN_ATADIR1_N, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,</div><div class='del'>-			     2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,</div><div class='del'>-			     3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,</div><div class='add'>+				   2, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP11_31_30 [2] */</div><div class='ctx'> 		FN_ETH_CRS_DV, FN_AVB_LINK, FN_I2C2_SDA_C, 0,</div><div class='ctx'> 		/* IP11_29_28 [2] */</div><div class='hunk'>@@ -6197,10 +6213,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0,</div><div class='ctx'> 		/* IP11_2_0 [3] */</div><div class='ctx'> 		FN_VI0_R5, FN_VI2_DATA6, FN_GLO_SDATA_B, FN_RX0_C,</div><div class='del'>-		FN_I2C1_SDA_D, 0, 0, 0, }</div><div class='add'>+		FN_I2C1_SDA_D, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR12", 0xE6060050, 32,</div><div class='del'>-			     2, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 2, 2) {</div><div class='add'>+			     GROUP(2, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP12_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP12_29_27 [3] */</div><div class='hunk'>@@ -6238,11 +6255,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP12_3_2 [2] */</div><div class='ctx'> 		FN_ETH_RXD0, FN_AVB_PHY_INT, FN_I2C3_SDA, FN_IIC0_SDA,</div><div class='ctx'> 		/* IP12_1_0 [2] */</div><div class='del'>-		FN_ETH_RX_ER, FN_AVB_CRS, FN_I2C3_SCL, FN_IIC0_SCL, }</div><div class='add'>+		FN_ETH_RX_ER, FN_AVB_CRS, FN_I2C3_SCL, FN_IIC0_SCL, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR13", 0xE6060054, 32,</div><div class='del'>-			     1, 3, 1, 1, 1, 2, 1, 3, 3, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     3, 2, 2, 3) {</div><div class='add'>+			     GROUP(1, 3, 1, 1, 1, 2, 1, 3, 3, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 3, 2, 2, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP13_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP13_30_28 [3] */</div><div class='hunk'>@@ -6289,10 +6307,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP13_2_0 [3] */</div><div class='ctx'> 		FN_STP_ISD_0, FN_AVB_TX_ER, FN_SCIFB2_SCK_C,</div><div class='ctx'> 		FN_ADICLK_B, FN_MSIOF0_SS1_C,</div><div class='del'>-		0, 0, 0, }</div><div class='add'>+		0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR14", 0xE6060058, 32,</div><div class='del'>-			     3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 2) {</div><div class='add'>+			     GROUP(3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP14_31_29 [3] */</div><div class='ctx'> 		FN_MSIOF0_SS2, FN_MMC_D7, FN_ADICHS2, FN_RX0_E,</div><div class='ctx'> 		FN_VI1_VSYNC_N_C, FN_IIC0_SDA_C, FN_VI1_G5_B, 0,</div><div class='hunk'>@@ -6332,10 +6352,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP14_2 [1] */</div><div class='ctx'> 		FN_SD2_CLK, FN_MMC_CLK,</div><div class='ctx'> 		/* IP14_1_0 [2] */</div><div class='del'>-		FN_SD1_WP, FN_PWM1_B, FN_I2C1_SDA_C, 0, }</div><div class='add'>+		FN_SD1_WP, FN_PWM1_B, FN_I2C1_SDA_C, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR15", 0xE606005C, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP15_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP15_29_27 [3] */</div><div class='hunk'>@@ -6373,10 +6394,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP15_3_2 [2] */</div><div class='ctx'> 		FN_SIM0_CLK, FN_IECLK, FN_CAN_CLK_C, 0,</div><div class='ctx'> 		/* IP15_1_0 [2] */</div><div class='del'>-		FN_SIM0_RST, FN_IETX, FN_CAN1_TX_D, 0, }</div><div class='add'>+		FN_SIM0_RST, FN_IETX, FN_CAN1_TX_D, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR16", 0xE6060160, 32,</div><div class='del'>-			     4, 4, 4, 4, 4, 2, 2, 2, 3, 3) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 2, 2, 2, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP16_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -6405,11 +6427,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP16_2_0 [3] */</div><div class='ctx'> 		FN_HRX1, FN_SCIFB1_RXD, FN_VI1_R0_B,</div><div class='ctx'> 		FN_GLO_SDATA_C, FN_VI1_DATA6_C,</div><div class='del'>-		0, 0, 0, }</div><div class='add'>+		0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL", 0xE6060090, 32,</div><div class='del'>-			     1, 2, 2, 2, 3, 2, 1, 1, 1, 1,</div><div class='del'>-			     3, 2, 2, 2, 1, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 2, 2, 2, 3, 2, 1, 1, 1, 1, 3, 2,</div><div class='add'>+				   2, 2, 1, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* SEL_SCIF1 [2] */</div><div class='hunk'>@@ -6450,11 +6473,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_TSIF0 [2] */</div><div class='ctx'> 		FN_SEL_TSIF0_0, FN_SEL_TSIF0_1, FN_SEL_TSIF0_2, FN_SEL_TSIF0_3,</div><div class='ctx'> 		/* SEL_SOF0 [2] */</div><div class='del'>-		FN_SEL_SOF0_0, FN_SEL_SOF0_1, FN_SEL_SOF0_2, 0, }</div><div class='add'>+		FN_SEL_SOF0_0, FN_SEL_SOF0_1, FN_SEL_SOF0_2, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,</div><div class='del'>-			     3, 1, 1, 3, 2, 1, 1, 2, 2,</div><div class='del'>-			     1, 3, 2, 1, 2, 2, 2, 1, 1, 1) {</div><div class='add'>+			     GROUP(3, 1, 1, 3, 2, 1, 1, 2, 2, 1, 3, 2,</div><div class='add'>+				   1, 2, 2, 2, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_SCIF0 [3] */</div><div class='ctx'> 		FN_SEL_SCIF0_0, FN_SEL_SCIF0_1, FN_SEL_SCIF0_2,</div><div class='ctx'> 		FN_SEL_SCIF0_3, FN_SEL_SCIF0_4,</div><div class='hunk'>@@ -6498,11 +6522,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* SEL_SSI8 [1] */</div><div class='del'>-		FN_SEL_SSI8_0, FN_SEL_SSI8_1, }</div><div class='add'>+		FN_SEL_SSI8_0, FN_SEL_SSI8_1, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL3", 0xE6060098, 32,</div><div class='del'>-			     2, 2, 2, 2, 2, 2, 2, 2,</div><div class='del'>-			     1, 1, 2, 2, 3, 2, 2, 2, 1) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2,</div><div class='add'>+				   3, 2, 2, 2, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_HSCIF2 [2] */</div><div class='ctx'> 		FN_SEL_HSCIF2_0, FN_SEL_HSCIF2_1,</div><div class='ctx'> 		FN_SEL_HSCIF2_2, FN_SEL_HSCIF2_3,</div><div class='hunk'>@@ -6540,11 +6565,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* RESERVED [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL4", 0xE606009C, 32,</div><div class='del'>-			     3, 2, 2, 1, 1, 1, 1, 3, 2,</div><div class='del'>-			     2, 3, 1, 1, 1, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(3, 2, 2, 1, 1, 1, 1, 3, 2, 2, 3, 1,</div><div class='add'>+				   1, 1, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_SOF1 [3] */</div><div class='ctx'> 		FN_SEL_SOF1_0, FN_SEL_SOF1_1, FN_SEL_SOF1_2, FN_SEL_SOF1_3,</div><div class='ctx'> 		FN_SEL_SOF1_4,</div><div class='hunk'>@@ -6586,7 +6612,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* RESERVED [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED [2] */</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c<br/>index d36da5652de6..bbace1478613 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7792.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7792.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7792.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7792.c</a></div><div class='hunk'>@@ -1988,7 +1988,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2020,9 +2020,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_IP0_3,</div><div class='ctx'> 		GP_0_2_FN, FN_IP0_2,</div><div class='ctx'> 		GP_0_1_FN, FN_IP0_1,</div><div class='del'>-		GP_0_0_FN, FN_IP0_0 }</div><div class='add'>+		GP_0_0_FN, FN_IP0_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2054,9 +2054,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP1_8,</div><div class='ctx'> 		GP_1_2_FN, FN_IP1_7,</div><div class='ctx'> 		GP_1_1_FN, FN_IP1_6,</div><div class='del'>-		GP_1_0_FN, FN_IP1_5, }</div><div class='add'>+		GP_1_0_FN, FN_IP1_5, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN, FN_A15,</div><div class='ctx'> 		GP_2_30_FN, FN_A14,</div><div class='ctx'> 		GP_2_29_FN, FN_A13,</div><div class='hunk'>@@ -2088,9 +2088,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_D3,</div><div class='ctx'> 		GP_2_2_FN, FN_D2,</div><div class='ctx'> 		GP_2_1_FN, FN_D1,</div><div class='del'>-		GP_2_0_FN, FN_D0 }</div><div class='add'>+		GP_2_0_FN, FN_D0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2122,9 +2122,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_A19,</div><div class='ctx'> 		GP_3_2_FN, FN_A18,</div><div class='ctx'> 		GP_3_1_FN, FN_A17,</div><div class='del'>-		GP_3_0_FN, FN_A16 }</div><div class='add'>+		GP_3_0_FN, FN_A16 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2156,9 +2156,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_VI0_VSYNC_N,</div><div class='ctx'> 		GP_4_2_FN, FN_VI0_HSYNC_N,</div><div class='ctx'> 		GP_4_1_FN, FN_VI0_CLKENB,</div><div class='del'>-		GP_4_0_FN, FN_VI0_CLK }</div><div class='add'>+		GP_4_0_FN, FN_VI0_CLK ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2190,9 +2190,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_VI1_VSYNC_N,</div><div class='ctx'> 		GP_5_2_FN, FN_VI1_HSYNC_N,</div><div class='ctx'> 		GP_5_1_FN, FN_VI1_CLKENB,</div><div class='del'>-		GP_5_0_FN, FN_VI1_CLK }</div><div class='add'>+		GP_5_0_FN, FN_VI1_CLK ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xE606001C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xE606001C, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2224,9 +2224,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN, FN_IP2_3,</div><div class='ctx'> 		GP_6_2_FN, FN_IP2_2,</div><div class='ctx'> 		GP_6_1_FN, FN_IP2_1,</div><div class='del'>-		GP_6_0_FN, FN_IP2_0 }</div><div class='add'>+		GP_6_0_FN, FN_IP2_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR7", 0xE6060020, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR7", 0xE6060020, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2258,9 +2258,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_7_3_FN, FN_IP3_3,</div><div class='ctx'> 		GP_7_2_FN, FN_IP3_2,</div><div class='ctx'> 		GP_7_1_FN, FN_IP3_1,</div><div class='del'>-		GP_7_0_FN, FN_IP3_0 }</div><div class='add'>+		GP_7_0_FN, FN_IP3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR8", 0xE6060024, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR8", 0xE6060024, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2292,9 +2292,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_8_3_FN, FN_IP4_3_2,</div><div class='ctx'> 		GP_8_2_FN, FN_IP4_1,</div><div class='ctx'> 		GP_8_1_FN, FN_IP4_0,</div><div class='del'>-		GP_8_0_FN, FN_VI4_CLK }</div><div class='add'>+		GP_8_0_FN, FN_VI4_CLK ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR9", 0xE6060028, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR9", 0xE6060028, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2326,9 +2326,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_9_3_FN, FN_IP5_2,</div><div class='ctx'> 		GP_9_2_FN, FN_IP5_1,</div><div class='ctx'> 		GP_9_1_FN, FN_IP5_0,</div><div class='del'>-		GP_9_0_FN, FN_VI5_CLK }</div><div class='add'>+		GP_9_0_FN, FN_VI5_CLK ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR10", 0xE606002C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR10", 0xE606002C, 32, 1, GROUP(</div><div class='ctx'> 		GP_10_31_FN, FN_CAN1_RX,</div><div class='ctx'> 		GP_10_30_FN, FN_CAN1_TX,</div><div class='ctx'> 		GP_10_29_FN, FN_CAN_CLK,</div><div class='hunk'>@@ -2360,9 +2360,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_10_3_FN, FN_IP6_2,</div><div class='ctx'> 		GP_10_2_FN, FN_HRTS0_N,</div><div class='ctx'> 		GP_10_1_FN, FN_IP6_1,</div><div class='del'>-		GP_10_0_FN, FN_IP6_0 }</div><div class='add'>+		GP_10_0_FN, FN_IP6_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR11", 0xE6060030, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR11", 0xE6060030, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		GP_11_29_FN, FN_AVS2,</div><div class='hunk'>@@ -2394,13 +2394,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_11_3_FN, FN_IP7_6,</div><div class='ctx'> 		GP_11_2_FN, FN_IP7_5_4,</div><div class='ctx'> 		GP_11_1_FN, FN_IP7_3_2,</div><div class='del'>-		GP_11_0_FN, FN_IP7_1_0 }</div><div class='add'>+		GP_11_0_FN, FN_IP7_1_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xE6060040, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP0_27_24 [4] */</div><div class='hunk'>@@ -2452,13 +2453,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP0_1 [1] */</div><div class='ctx'> 		FN_DU0_DR1_DATA1, 0,</div><div class='ctx'> 		/* IP0_0 [1] */</div><div class='del'>-		FN_DU0_DR0_DATA0, 0 }</div><div class='add'>+		FN_DU0_DR0_DATA0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xE6060044, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP1_27_24 [4] */</div><div class='hunk'>@@ -2510,13 +2512,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP1_1 [1] */</div><div class='ctx'> 		FN_DU0_EXVSYNC_DU0_VSYNC, 0,</div><div class='ctx'> 		/* IP1_0 [1] */</div><div class='del'>-		FN_DU0_EXHSYNC_DU0_HSYNC, 0 }</div><div class='add'>+		FN_DU0_EXHSYNC_DU0_HSYNC, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xE6060048, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     4, 3, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   4, 3, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP2_27_24 [4] */</div><div class='hunk'>@@ -2558,13 +2561,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP2_1 [1] */</div><div class='ctx'> 		FN_VI2_CLKENB, FN_AVB_RX_DV,</div><div class='ctx'> 		/* IP2_0 [1] */</div><div class='del'>-		FN_VI2_CLK, FN_AVB_RX_CLK }</div><div class='add'>+		FN_VI2_CLK, FN_AVB_RX_CLK ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xE606004C, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   4, 4,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP3_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP3_27_24 [4] */</div><div class='hunk'>@@ -2604,12 +2608,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP3_1 [1] */</div><div class='ctx'> 		FN_VI3_CLKENB, FN_AVB_TXD4,</div><div class='ctx'> 		/* IP3_0 [1] */</div><div class='del'>-		FN_VI3_CLK, FN_AVB_TX_CLK }</div><div class='add'>+		FN_VI3_CLK, FN_AVB_TX_CLK ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xE6060050, 32,</div><div class='del'>-			     4, 3, 1,</div><div class='del'>-			     1, 1, 1, 2, 2, 2,</div><div class='del'>-			     2, 2, 2, 2, 2, 1, 2, 1, 1) {</div><div class='add'>+			     GROUP(4, 3, 1,</div><div class='add'>+				   1, 1, 1, 2, 2, 2,</div><div class='add'>+				   2, 2, 2, 2, 2, 1, 2, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP4_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP4_27_25 [3] */</div><div class='hunk'>@@ -2645,13 +2650,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP4_1 [1] */</div><div class='ctx'> 		FN_VI4_HSYNC_N, FN_VI0_D13_G5_Y5,</div><div class='ctx'> 		/* IP4_0 [1] */</div><div class='del'>-		FN_VI4_CLKENB, FN_VI0_D12_G4_Y4 }</div><div class='add'>+		FN_VI4_CLKENB, FN_VI0_D12_G4_Y4 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xE6060054, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     4, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   4, 4,</div><div class='add'>+				   4, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP5_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP5_27_24 [4] */</div><div class='hunk'>@@ -2685,13 +2691,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP5_1 [1] */</div><div class='ctx'> 		FN_VI5_HSYNC_N, FN_VI1_D13_G5_Y5_B,</div><div class='ctx'> 		/* IP5_0 [1] */</div><div class='del'>-		FN_VI5_CLKENB, FN_VI1_D12_G4_Y4_B }</div><div class='add'>+		FN_VI5_CLKENB, FN_VI1_D12_G4_Y4_B ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xE6060058, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     4, 1, 2, 1,</div><div class='del'>-			     2, 2, 2, 2,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   4, 1, 2, 1,</div><div class='add'>+				   2, 2, 2, 2,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP6_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP6_27_24 [4] */</div><div class='hunk'>@@ -2727,13 +2734,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP6_1 [1] */</div><div class='ctx'> 		FN_MSIOF0_SYNC, FN_HCTS0_N,</div><div class='ctx'> 		/* IP6_0 [1] */</div><div class='del'>-		FN_MSIOF0_SCK, FN_HSCK0 }</div><div class='add'>+		FN_MSIOF0_SCK, FN_HSCK0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xE606005C, 32,</div><div class='del'>-			     4, 4,</div><div class='del'>-			     3, 1, 1, 1, 1, 1,</div><div class='del'>-			     2, 2, 2, 2,</div><div class='del'>-			     1, 1, 2, 2, 2) {</div><div class='add'>+			     GROUP(4, 4,</div><div class='add'>+				   3, 1, 1, 1, 1, 1,</div><div class='add'>+				   2, 2, 2, 2,</div><div class='add'>+				   1, 1, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP7_31_28 [4] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP7_27_24 [4] */</div><div class='hunk'>@@ -2767,7 +2775,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP7_3_2 [2] */</div><div class='ctx'> 		FN_PWM1, FN_TCLK2, FN_FSO_CFE_1, 0,</div><div class='ctx'> 		/* IP7_1_0 [2] */</div><div class='del'>-		FN_PWM0, FN_TCLK1, FN_FSO_CFE_0, 0 }</div><div class='add'>+		FN_PWM0, FN_TCLK1, FN_FSO_CFE_0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c<br/>index 958a5f714c93..1ff4969d8381 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7794.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7794.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7794.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7794.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  * Copyright (C) 2015-2017 Cogent Embedded, Inc. &lt;source@cogentembedded.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sys_soc.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -4617,7 +4618,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xE6060004, 32, 1, GROUP(</div><div class='ctx'> 		GP_0_31_FN, FN_IP2_17_16,</div><div class='ctx'> 		GP_0_30_FN, FN_IP2_15_14,</div><div class='ctx'> 		GP_0_29_FN, FN_IP2_13_12,</div><div class='hunk'>@@ -4649,9 +4650,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_IP0_27_26,</div><div class='ctx'> 		GP_0_2_FN, FN_IP0_25,</div><div class='ctx'> 		GP_0_1_FN, FN_IP0_24,</div><div class='del'>-		GP_0_0_FN, FN_IP0_23_22, }</div><div class='add'>+		GP_0_0_FN, FN_IP0_23_22, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xE6060008, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4683,9 +4684,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP2_29_27,</div><div class='ctx'> 		GP_1_2_FN, FN_IP2_26_24,</div><div class='ctx'> 		GP_1_1_FN, FN_IP2_23_21,</div><div class='del'>-		GP_1_0_FN, FN_IP2_20_18, }</div><div class='add'>+		GP_1_0_FN, FN_IP2_20_18, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xE606000C, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN, FN_IP6_7_6,</div><div class='ctx'> 		GP_2_30_FN, FN_IP6_5_4,</div><div class='ctx'> 		GP_2_29_FN, FN_IP6_3_2,</div><div class='hunk'>@@ -4717,9 +4718,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_IP4_11_10,</div><div class='ctx'> 		GP_2_2_FN, FN_IP4_9_8,</div><div class='ctx'> 		GP_2_1_FN, FN_IP4_7_5,</div><div class='del'>-		GP_2_0_FN, FN_IP4_4_2 }</div><div class='add'>+		GP_2_0_FN, FN_IP4_4_2 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xE6060010, 32, 1, GROUP(</div><div class='ctx'> 		GP_3_31_FN, FN_IP8_22_20,</div><div class='ctx'> 		GP_3_30_FN, FN_IP8_19_17,</div><div class='ctx'> 		GP_3_29_FN, FN_IP8_16_15,</div><div class='hunk'>@@ -4751,9 +4752,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_IP6_11,</div><div class='ctx'> 		GP_3_2_FN, FN_IP6_10,</div><div class='ctx'> 		GP_3_1_FN, FN_IP6_9,</div><div class='del'>-		GP_3_0_FN, FN_IP6_8 }</div><div class='add'>+		GP_3_0_FN, FN_IP6_8 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xE6060014, 32, 1, GROUP(</div><div class='ctx'> 		GP_4_31_FN, FN_IP11_17_16,</div><div class='ctx'> 		GP_4_30_FN, FN_IP11_15_14,</div><div class='ctx'> 		GP_4_29_FN, FN_IP11_13_11,</div><div class='hunk'>@@ -4785,9 +4786,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_IP9_2_0,</div><div class='ctx'> 		GP_4_2_FN, FN_IP8_31_29,</div><div class='ctx'> 		GP_4_1_FN, FN_IP8_28_26,</div><div class='del'>-		GP_4_0_FN, FN_IP8_25_23 }</div><div class='add'>+		GP_4_0_FN, FN_IP8_25_23 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xE6060018, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4819,9 +4820,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_IP11_29_27,</div><div class='ctx'> 		GP_5_2_FN, FN_IP11_26_24,</div><div class='ctx'> 		GP_5_1_FN, FN_IP11_23_21,</div><div class='del'>-		GP_5_0_FN, FN_IP11_20_18 }</div><div class='add'>+		GP_5_0_FN, FN_IP11_20_18 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xE606001C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xE606001C, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4853,11 +4854,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN, FN_SD0_DATA1,</div><div class='ctx'> 		GP_6_2_FN, FN_SD0_DATA0,</div><div class='ctx'> 		GP_6_1_FN, FN_SD0_CMD,</div><div class='del'>-		GP_6_0_FN, FN_SD0_CLK }</div><div class='add'>+		GP_6_0_FN, FN_SD0_CLK ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xE6060020, 32,</div><div class='del'>-			     2, 2, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(2, 2, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP0_31_30 [2] */</div><div class='ctx'> 		FN_D5, FN_SCIF4_RXD_B, FN_I2C0_SCL_D, 0,</div><div class='ctx'> 		/* IP0_29_28 [2] */</div><div class='hunk'>@@ -4907,11 +4909,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP0_1 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP0_0 [1] */</div><div class='del'>-		FN_SD1_CD, FN_CAN0_RX, }</div><div class='add'>+		FN_SD1_CD, FN_CAN0_RX, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xE6060024, 32,</div><div class='del'>-			     2, 2, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 3, 2, 2,</div><div class='del'>-			     2, 2) {</div><div class='add'>+			     GROUP(2, 2, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2,</div><div class='add'>+				   3, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP1_31_30 [2] */</div><div class='ctx'> 		FN_A6, FN_SCIFB0_CTS_N, FN_SCIFA4_RXD_B, FN_TPUTO2_C,</div><div class='ctx'> 		/* IP1_29_28 [2] */</div><div class='hunk'>@@ -4947,10 +4950,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP1_3_2 [2] */</div><div class='ctx'> 		FN_D7, FN_IRQ3, FN_TCLK1, FN_PWM6_B,</div><div class='ctx'> 		/* IP1_1_0 [2] */</div><div class='del'>-		FN_D6, FN_SCIF4_TXD_B, FN_I2C0_SDA_D, 0, }</div><div class='add'>+		FN_D6, FN_SCIF4_TXD_B, FN_I2C0_SDA_D, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xE6060028, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31_30 [2] */</div><div class='ctx'> 		FN_A20, FN_SPCLK, 0, 0,</div><div class='ctx'> 		/* IP2_29_27 [3] */</div><div class='hunk'>@@ -4982,10 +4986,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP2_3_2 [2] */</div><div class='ctx'> 		FN_A8, FN_MSIOF1_RXD, FN_SCIFA0_RXD_B, 0,</div><div class='ctx'> 		/* IP2_1_0 [2] */</div><div class='del'>-		FN_A7, FN_SCIFB0_RTS_N, FN_SCIFA4_TXD_B, 0, }</div><div class='add'>+		FN_A7, FN_SCIFB0_RTS_N, FN_SCIFA4_TXD_B, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xE606002C, 32,</div><div class='del'>-			     1, 1, 3, 3, 3, 3, 3, 2, 1, 1, 1, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(1, 1, 3, 3, 3, 3, 3, 2, 1, 1, 1, 2,</div><div class='add'>+				   2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP3_31 [1] */</div><div class='ctx'> 		FN_RD_WR_N, FN_ATAG1_N,</div><div class='ctx'> 		/* IP3_30 [1] */</div><div class='hunk'>@@ -5022,10 +5028,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP3_3_2 [2] */</div><div class='ctx'> 		FN_A22, FN_MISO_IO1, 0, FN_ATADIR1_N,</div><div class='ctx'> 		/* IP3_1_0 [2] */</div><div class='del'>-		FN_A21, FN_MOSI_IO0, 0, 0, }</div><div class='add'>+		FN_A21, FN_MOSI_IO0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xE6060030, 32,</div><div class='del'>-			     2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 3, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 3, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP4_31_30 [2] */</div><div class='ctx'> 		FN_DU0_DG4, FN_LCDOUT12, 0, 0,</div><div class='ctx'> 		/* IP4_29_28 [2] */</div><div class='hunk'>@@ -5057,10 +5064,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_DU0_DR0, FN_LCDOUT16, FN_SCIF5_RXD_C, FN_I2C2_SCL_D,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP4_1_0 [2] */</div><div class='del'>-		FN_EX_WAIT0, FN_CAN_CLK_B, FN_SCIF_CLK, 0, }</div><div class='add'>+		FN_EX_WAIT0, FN_CAN_CLK_B, FN_SCIF_CLK, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xE6060034, 32,</div><div class='del'>-			     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3,</div><div class='add'>+				   2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP5_31_30 [2] */</div><div class='ctx'> 		FN_DU0_EXHSYNC_DU0_HSYNC, FN_QSTH_QHS, 0, 0,</div><div class='ctx'> 		/* IP5_29_28 [2] */</div><div class='hunk'>@@ -5092,11 +5101,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP5_3_2 [2] */</div><div class='ctx'> 		FN_DU0_DG6, FN_LCDOUT14, 0, 0,</div><div class='ctx'> 		/* IP5_1_0 [2] */</div><div class='del'>-		FN_DU0_DG5, FN_LCDOUT13, 0, 0, }</div><div class='add'>+		FN_DU0_DG5, FN_LCDOUT13, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xE6060038, 32,</div><div class='del'>-			     3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,</div><div class='del'>-			     2, 2) {</div><div class='add'>+			     GROUP(3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP6_31_29 [3] */</div><div class='ctx'> 		FN_ETH_MDIO, FN_VI0_G0, FN_MSIOF2_RXD_B, FN_I2C5_SCL_D,</div><div class='ctx'> 		FN_AVB_TX_CLK, FN_ADIDATA, 0, 0,</div><div class='hunk'>@@ -5138,10 +5148,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, FN_QCPV_QDE, 0,</div><div class='ctx'> 		0,</div><div class='ctx'> 		/* IP6_1_0 [2] */</div><div class='del'>-		FN_DU0_EXVSYNC_DU0_VSYNC, FN_QSTB_QHE, 0, 0, }</div><div class='add'>+		FN_DU0_EXVSYNC_DU0_VSYNC, FN_QSTB_QHE, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xE606003C, 32,</div><div class='del'>-			     1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP7_31 [1] */</div><div class='ctx'> 		FN_DREQ0_N, FN_SCIFB1_RXD,</div><div class='ctx'> 		/* IP7_30 [1] */</div><div class='hunk'>@@ -5175,10 +5186,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_AVB_TXD1, FN_ADICLK, 0, 0,</div><div class='ctx'> 		/* IP7_2_0 [3] */</div><div class='ctx'> 		FN_ETH_CRS_DV, FN_VI0_G1, FN_MSIOF2_TXD_B, FN_I2C5_SDA_D,</div><div class='del'>-		FN_AVB_TXD0, FN_ADICS_SAMP, 0, 0, }</div><div class='add'>+		FN_AVB_TXD0, FN_ADICS_SAMP, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xE6060040, 32,</div><div class='del'>-			     3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP8_31_29 [3] */</div><div class='ctx'> 		FN_MSIOF0_RXD, FN_SCIF5_RXD, FN_I2C2_SCL_C, FN_DU1_DR2,</div><div class='ctx'> 		0, FN_TS_SDEN_D, FN_FMCLK_C, 0,</div><div class='hunk'>@@ -5210,10 +5222,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_AVB_MDIO, FN_SSI_SCK78_B, 0, 0,</div><div class='ctx'> 		/* IP8_2_0 [3] */</div><div class='ctx'> 		FN_ETH_MDC, FN_VI0_R3, FN_SCIF3_TXD_B, FN_I2C4_SDA_E,</div><div class='del'>-		FN_AVB_MDC, FN_SSI_SDATA6_B, 0, 0, }</div><div class='add'>+		FN_AVB_MDC, FN_SSI_SDATA6_B, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xE6060044, 32,</div><div class='del'>-			     1, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP9_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP9_30_28 [3] */</div><div class='hunk'>@@ -5246,10 +5259,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, FN_TPUTO1_C, 0, 0,</div><div class='ctx'> 		/* IP9_2_0 [3] */</div><div class='ctx'> 		FN_MSIOF0_TXD, FN_SCIF5_TXD, FN_I2C2_SDA_C, FN_DU1_DR3,</div><div class='del'>-		0, FN_TS_SPSYNC_D, FN_FMIN_C, 0, }</div><div class='add'>+		0, FN_TS_SPSYNC_D, FN_FMIN_C, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xE6060048, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP10_31_30 [2] */</div><div class='ctx'> 		FN_SSI_SCK5, FN_SCIFA3_SCK, FN_DU1_DOTCLKIN, 0,</div><div class='ctx'> 		/* IP10_29_27 [3] */</div><div class='hunk'>@@ -5281,10 +5295,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP10_2_0 [3] */</div><div class='ctx'> 		FN_SCIF1_RXD, FN_I2C5_SCL, FN_DU1_DG6, FN_SSI_SCK2_B,</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP11_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP11_29_27 [3] */</div><div class='hunk'>@@ -5316,10 +5331,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP11_2_0 [3] */</div><div class='ctx'> 		FN_SSI_WS5, FN_SCIFA3_RXD, FN_I2C3_SCL_C, FN_DU1_DOTCLKOUT0,</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR12", 0xE6060050, 32,</div><div class='del'>-			     2, 3, 3, 3, 3, 3, 2, 2, 2, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 3, 3, 2, 2, 2, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP12_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		/* IP12_29_27 [3] */</div><div class='hunk'>@@ -5351,10 +5367,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_CAN1_RX_C, FN_DACK1_B, 0, 0,</div><div class='ctx'> 		/* IP12_2_0 [3] */</div><div class='ctx'> 		FN_SSI_SCK34, FN_MSIOF1_SYNC_B, FN_SCIFA1_SCK_C, FN_ADICHS0_B,</div><div class='del'>-		0, FN_DREQ1_N_B, 0, 0, }</div><div class='add'>+		0, FN_DREQ1_N_B, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR13", 0xE6060054, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP13_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP13_30 [1] */</div><div class='hunk'>@@ -5391,11 +5408,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_VI1_DATA4, 0, FN_ATACS10_N, FN_ETH_REFCLK_B, 0,</div><div class='ctx'> 		/* IP13_2_0 [3] */</div><div class='ctx'> 		FN_SSI_WS2, FN_HSCIF1_HCTS_N_B, FN_SCIFA0_RXD_D, FN_VI1_DATA3,</div><div class='del'>-		0, FN_ATACS00_N, FN_ETH_LINK_B, 0, }</div><div class='add'>+		0, FN_ATACS00_N, FN_ETH_LINK_B, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL", 0xE6060090, 32,</div><div class='del'>-			     2, 1, 2, 3, 4, 1, 1, 3, 3, 3, 3, 3,</div><div class='del'>-			     2, 1) {</div><div class='add'>+			     GROUP(2, 1, 2, 3, 4, 1, 1, 3, 3, 3, 3, 3, 2, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_ADG [2] */</div><div class='ctx'> 		FN_SEL_ADG_0, FN_SEL_ADG_1, FN_SEL_ADG_2, FN_SEL_ADG_3,</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='hunk'>@@ -5429,11 +5446,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_I2C05 [2] */</div><div class='ctx'> 		FN_SEL_I2C05_0, FN_SEL_I2C05_1, FN_SEL_I2C05_2, FN_SEL_I2C05_3,</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,</div><div class='del'>-			     2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1,</div><div class='del'>-			     2, 2, 2, 1, 1, 2) {</div><div class='add'>+			     GROUP(2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1,</div><div class='add'>+				   2, 2, 1, 1, 2, 2, 2, 1, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_IEB [2] */</div><div class='ctx'> 		FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, 0,</div><div class='ctx'> 		/* SEL_IIC0 [2] */</div><div class='hunk'>@@ -5480,11 +5498,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL_HSCIF1 [1] */</div><div class='ctx'> 		FN_SEL_HSCIF1_0, FN_SEL_HSCIF1_1,</div><div class='ctx'> 		/* RESERVED [2] */</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL3", 0xE6060098, 32,</div><div class='del'>-			     2, 2, 2, 1, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(2, 2, 2, 1, 3, 2, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL_SCIF0 [2] */</div><div class='ctx'> 		FN_SEL_SCIF0_0, FN_SEL_SCIF0_1, FN_SEL_SCIF0_2, FN_SEL_SCIF0_3,</div><div class='ctx'> 		/* SEL_SCIF1 [2] */</div><div class='hunk'>@@ -5537,7 +5556,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* RESERVED [1] */</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c<br/>index 287cfbb7e992..f16dfbad3f17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * Copyright (C) 2015-2017  Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -153,11 +154,11 @@</div><div class='ctx'> #define GPSR5_11	F_(RX2_A,		IP12_7_4)</div><div class='ctx'> #define GPSR5_10	F_(TX2_A,		IP12_3_0)</div><div class='ctx'> #define GPSR5_9		F_(SCK2,		IP11_31_28)</div><div class='del'>-#define GPSR5_8		F_(RTS1_N_TANS,		IP11_27_24)</div><div class='add'>+#define GPSR5_8		F_(RTS1_N,		IP11_27_24)</div><div class='ctx'> #define GPSR5_7		F_(CTS1_N,		IP11_23_20)</div><div class='ctx'> #define GPSR5_6		F_(TX1_A,		IP11_19_16)</div><div class='ctx'> #define GPSR5_5		F_(RX1_A,		IP11_15_12)</div><div class='del'>-#define GPSR5_4		F_(RTS0_N_TANS,		IP11_11_8)</div><div class='add'>+#define GPSR5_4		F_(RTS0_N,		IP11_11_8)</div><div class='ctx'> #define GPSR5_3		F_(CTS0_N,		IP11_7_4)</div><div class='ctx'> #define GPSR5_2		F_(TX0,			IP11_3_0)</div><div class='ctx'> #define GPSR5_1		F_(RX0,			IP10_31_28)</div><div class='hunk'>@@ -198,8 +199,8 @@</div><div class='ctx'> #define GPSR6_0		F_(SSI_SCK01239,	IP13_23_20)</div><div class='ctx'> </div><div class='ctx'> /* GPSR7 */</div><div class='del'>-#define GPSR7_3		FM(HDMI1_CEC)</div><div class='del'>-#define GPSR7_2		FM(HDMI0_CEC)</div><div class='add'>+#define GPSR7_3		FM(GP7_03)</div><div class='add'>+#define GPSR7_2		FM(GP7_02)</div><div class='ctx'> #define GPSR7_1		FM(AVS2)</div><div class='ctx'> #define GPSR7_0		FM(AVS1)</div><div class='ctx'> </div><div class='hunk'>@@ -210,7 +211,7 @@</div><div class='ctx'> #define IP0_11_8	FM(AVB_PHY_INT)		F_(0, 0)	FM(MSIOF2_SYNC_C)	FM(RX4_A)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_15_12	FM(AVB_LINK)		F_(0, 0)	FM(MSIOF2_SCK_C)	FM(TX4_A)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_19_16	FM(AVB_AVTP_MATCH_A)	F_(0, 0)	FM(MSIOF2_RXD_C)	FM(CTS4_N_A)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP0_23_20	FM(AVB_AVTP_CAPTURE_A)	F_(0, 0)	FM(MSIOF2_TXD_C)	FM(RTS4_N_TANS_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP0_23_20	FM(AVB_AVTP_CAPTURE_A)	F_(0, 0)	FM(MSIOF2_TXD_C)	FM(RTS4_N_A)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_27_24	FM(IRQ0)		FM(QPOLB)	F_(0, 0)		FM(DU_CDE)			FM(VI4_DATA0_B)	FM(CAN0_TX_B)	FM(CANFD0_TX_B)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_31_28	FM(IRQ1)		FM(QPOLA)	F_(0, 0)		FM(DU_DISP)			FM(VI4_DATA1_B)	FM(CAN0_RX_B)	FM(CANFD0_RX_B)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP1_3_0		FM(IRQ2)		FM(QCPV_QDE)	F_(0, 0)		FM(DU_EXODDF_DU_ODDF_DISP_CDE)	FM(VI4_DATA2_B)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		FM(PWM3_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -232,7 +233,7 @@</div><div class='ctx'> #define IP2_27_24	FM(A7)			FM(LCDOUT23)	FM(MSIOF2_SS2_A)	FM(TX4_B)			FM(VI4_DATA15)	FM(VI5_DATA15)	FM(DU_DB7)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_31_28	FM(A8)			FM(RX3_B)	FM(MSIOF2_SYNC_A)	FM(HRX4_B)			F_(0, 0)	F_(0, 0)	F_(0, 0)		FM(SDA6_A)	FM(AVB_AVTP_MATCH_B)	FM(PWM1_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_3_0		FM(A9)			F_(0, 0)	FM(MSIOF2_SCK_A)	FM(CTS4_N_B)			F_(0, 0)	FM(VI5_VSYNC_N)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP3_7_4		FM(A10)			F_(0, 0)	FM(MSIOF2_RXD_A)	FM(RTS4_N_TANS_B)		F_(0, 0)	FM(VI5_HSYNC_N)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP3_7_4		FM(A10)			F_(0, 0)	FM(MSIOF2_RXD_A)	FM(RTS4_N_B)			F_(0, 0)	FM(VI5_HSYNC_N)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_11_8	FM(A11)			FM(TX3_B)	FM(MSIOF2_TXD_A)	FM(HTX4_B)			FM(HSCK4)	FM(VI5_FIELD)	F_(0, 0)		FM(SCL6_A)	FM(AVB_AVTP_CAPTURE_B)	FM(PWM2_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_15_12	FM(A12)			FM(LCDOUT12)	FM(MSIOF3_SCK_C)	F_(0, 0)			FM(HRX4_A)	FM(VI5_DATA8)	FM(DU_DG4)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_19_16	FM(A13)			FM(LCDOUT13)	FM(MSIOF3_SYNC_C)	F_(0, 0)			FM(HTX4_A)	FM(VI5_DATA9)	FM(DU_DG5)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -248,7 +249,7 @@</div><div class='ctx'> #define IP4_27_24	FM(RD_N)		F_(0, 0)	FM(MSIOF3_SYNC_D)	FM(RX3_A)			FM(HRX3_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)	FM(CAN0_TX_A)		FM(CANFD0_TX_A)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_31_28	FM(RD_WR_N)		F_(0, 0)	FM(MSIOF3_RXD_D)	FM(TX3_A)			FM(HTX3_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)	FM(CAN0_RX_A)		FM(CANFD0_RX_A)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_3_0		FM(WE0_N)		F_(0, 0)	FM(MSIOF3_TXD_D)	FM(CTS3_N)			FM(HCTS3_N)	F_(0, 0)	F_(0, 0)		FM(SCL6_B)	FM(CAN_CLK)		F_(0, 0)	FM(IECLK_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP5_7_4		FM(WE1_N)		F_(0, 0)	FM(MSIOF3_SS1_D)	FM(RTS3_N_TANS)			FM(HRTS3_N)	F_(0, 0)	F_(0, 0)		FM(SDA6_B)	FM(CAN1_RX)		FM(CANFD1_RX)	FM(IERX_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP5_7_4		FM(WE1_N)		F_(0, 0)	FM(MSIOF3_SS1_D)	FM(RTS3_N)			FM(HRTS3_N)	F_(0, 0)	F_(0, 0)		FM(SDA6_B)	FM(CAN1_RX)		FM(CANFD1_RX)	FM(IERX_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_11_8	FM(EX_WAIT0_A)		FM(QCLK)	F_(0, 0)		F_(0, 0)			FM(VI4_CLK)	F_(0, 0)	FM(DU_DOTCLKOUT0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_15_12	FM(D0)			FM(MSIOF2_SS1_B)FM(MSIOF3_SCK_A)	F_(0, 0)			FM(VI4_DATA16)	FM(VI5_DATA0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_19_16	FM(D1)			FM(MSIOF2_SS2_B)FM(MSIOF3_SYNC_A)	F_(0, 0)			FM(VI4_DATA17)	FM(VI5_DATA1)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -261,7 +262,7 @@</div><div class='ctx'> #define IP6_15_12	FM(D8)			FM(LCDOUT0)	FM(MSIOF2_SCK_D)	FM(SCK4_C)			FM(VI4_DATA0_A)	F_(0, 0)	FM(DU_DR0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_19_16	FM(D9)			FM(LCDOUT1)	FM(MSIOF2_SYNC_D)	F_(0, 0)			FM(VI4_DATA1_A)	F_(0, 0)	FM(DU_DR1)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_23_20	FM(D10)			FM(LCDOUT2)	FM(MSIOF2_RXD_D)	FM(HRX3_B)			FM(VI4_DATA2_A)	FM(CTS4_N_C)	FM(DU_DR2)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_27_24	FM(D11)			FM(LCDOUT3)	FM(MSIOF2_TXD_D)	FM(HTX3_B)			FM(VI4_DATA3_A)	FM(RTS4_N_TANS_C)FM(DU_DR3)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_27_24	FM(D11)			FM(LCDOUT3)	FM(MSIOF2_TXD_D)	FM(HTX3_B)			FM(VI4_DATA3_A)	FM(RTS4_N_C)	FM(DU_DR3)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_31_28	FM(D12)			FM(LCDOUT4)	FM(MSIOF2_SS1_D)	FM(RX4_C)			FM(VI4_DATA4_A)	F_(0, 0)	FM(DU_DR4)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_3_0		FM(D13)			FM(LCDOUT5)	FM(MSIOF2_SS2_D)	FM(TX4_C)			FM(VI4_DATA5_A)	F_(0, 0)	FM(DU_DR5)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_7_4		FM(D14)			FM(LCDOUT6)	FM(MSIOF3_SS1_A)	FM(HRX3_C)			FM(VI4_DATA6_A)	F_(0, 0)	FM(DU_DR6)		FM(SCL6_C)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -299,11 +300,11 @@</div><div class='ctx'> #define IP10_31_28	FM(RX0)			FM(HRX1_B)	F_(0, 0)		F_(0, 0)			F_(0, 0)	FM(TS_SCK0_C)	FM(STP_ISCLK_0_C)	FM(RIF0_D0_B)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_3_0	FM(TX0)			FM(HTX1_B)	F_(0, 0)		F_(0, 0)			F_(0, 0)	FM(TS_SPSYNC0_C)FM(STP_ISSYNC_0_C)	FM(RIF0_D1_B)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_7_4	FM(CTS0_N)		FM(HCTS1_N_B)	FM(MSIOF1_SYNC_B)	F_(0, 0)			F_(0, 0)	FM(TS_SPSYNC1_C)FM(STP_ISSYNC_1_C)	FM(RIF1_SYNC_B)	FM(AUDIO_CLKOUT_C)	FM(ADICS_SAMP)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP11_11_8	FM(RTS0_N_TANS)		FM(HRTS1_N_B)	FM(MSIOF1_SS1_B)	FM(AUDIO_CLKA_B)		FM(SCL2_A)	F_(0, 0)	FM(STP_IVCXO27_1_C)	FM(RIF0_SYNC_B)	F_(0, 0)		FM(ADICHS1)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP11_11_8	FM(RTS0_N)		FM(HRTS1_N_B)	FM(MSIOF1_SS1_B)	FM(AUDIO_CLKA_B)		FM(SCL2_A)	F_(0, 0)	FM(STP_IVCXO27_1_C)	FM(RIF0_SYNC_B)	F_(0, 0)		FM(ADICHS1)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_15_12	FM(RX1_A)		FM(HRX1_A)	F_(0, 0)		F_(0, 0)			F_(0, 0)	FM(TS_SDAT0_C)	FM(STP_ISD_0_C)		FM(RIF1_CLK_C)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_19_16	FM(TX1_A)		FM(HTX1_A)	F_(0, 0)		F_(0, 0)			F_(0, 0)	FM(TS_SDEN0_C)	FM(STP_ISEN_0_C)	FM(RIF1_D0_C)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_23_20	FM(CTS1_N)		FM(HCTS1_N_A)	FM(MSIOF1_RXD_B)	F_(0, 0)			F_(0, 0)	FM(TS_SDEN1_C)	FM(STP_ISEN_1_C)	FM(RIF1_D0_B)	F_(0, 0)		FM(ADIDATA)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP11_27_24	FM(RTS1_N_TANS)		FM(HRTS1_N_A)	FM(MSIOF1_TXD_B)	F_(0, 0)			F_(0, 0)	FM(TS_SDAT1_C)	FM(STP_ISD_1_C)		FM(RIF1_D1_B)	F_(0, 0)		FM(ADICHS0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP11_27_24	FM(RTS1_N)		FM(HRTS1_N_A)	FM(MSIOF1_TXD_B)	F_(0, 0)			F_(0, 0)	FM(TS_SDAT1_C)	FM(STP_ISD_1_C)		FM(RIF1_D1_B)	F_(0, 0)		FM(ADICHS0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_31_28	FM(SCK2)		FM(SCIF_CLK_B)	FM(MSIOF1_SCK_B)	F_(0, 0)			F_(0, 0)	FM(TS_SCK1_C)	FM(STP_ISCLK_1_C)	FM(RIF1_CLK_B)	F_(0, 0)		FM(ADICLK)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP12_3_0	FM(TX2_A)		F_(0, 0)	F_(0, 0)		FM(SD2_CD_B)			FM(SCL1_A)	F_(0, 0)	FM(FMCLK_A)		FM(RIF1_D1_C)	F_(0, 0)		FM(FSO_CFE_0_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP12_7_4	FM(RX2_A)		F_(0, 0)	F_(0, 0)		FM(SD2_WP_B)			FM(SDA1_A)	F_(0, 0)	FM(FMIN_A)		FM(RIF1_SYNC_C)	F_(0, 0)		FM(FSO_CFE_1_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -339,7 +340,7 @@</div><div class='ctx'> #define IP15_23_20	FM(SSI_SDATA7)		FM(HCTS2_N_B)	FM(MSIOF1_RXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SDEN1_A)	FM(STP_ISEN_1_A)	FM(RIF1_D0_A)	FM(RIF3_D0_A)		F_(0, 0)	FM(TCLK2_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP15_27_24	FM(SSI_SDATA8)		FM(HRTS2_N_B)	FM(MSIOF1_TXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SPSYNC1_A)FM(STP_ISSYNC_1_A)	FM(RIF1_D1_A)	FM(RIF3_D1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP15_31_28	FM(SSI_SDATA9_A)	FM(HSCK2_B)	FM(MSIOF1_SS1_C)	FM(HSCK1_A)			FM(SSI_WS1_B)	FM(SCK1)	FM(STP_IVCXO27_1_A)	FM(SCK5)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP16_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(CC5_OSCOUT)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP16_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_7_4	FM(AUDIO_CLKB_B)	FM(SCIF_CLK_A)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	FM(STP_IVCXO27_1_D)	FM(REMOCON_A)	F_(0, 0)		F_(0, 0)	FM(TCLK1_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_11_8	FM(USB0_PWEN)		F_(0, 0)	F_(0, 0)		FM(SIM0_RST_C)			F_(0, 0)	FM(TS_SCK1_D)	FM(STP_ISCLK_1_D)	FM(BPFCLK_B)	FM(RIF3_CLK_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_15_12	FM(USB0_OVC)		F_(0, 0)	F_(0, 0)		FM(SIM0_D_C)			F_(0, 0)	FM(TS_SDAT1_D)	FM(STP_ISD_1_D)		F_(0, 0)	FM(RIF3_SYNC_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -576,8 +577,8 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_SINGLE(AVS1),</div><div class='ctx'> 	PINMUX_SINGLE(AVS2),</div><div class='del'>-	PINMUX_SINGLE(HDMI0_CEC),</div><div class='del'>-	PINMUX_SINGLE(HDMI1_CEC),</div><div class='add'>+	PINMUX_SINGLE(GP7_02),</div><div class='add'>+	PINMUX_SINGLE(GP7_03),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_RXD),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_SCK),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_TXD),</div><div class='hunk'>@@ -616,7 +617,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_PHYS_MSEL(IP0_23_20, AVB_AVTP_CAPTURE_A,	I2C_SEL_5_0,	SEL_ETHERAVB_0),</div><div class='ctx'> 	PINMUX_IPSR_PHYS_MSEL(IP0_23_20, MSIOF2_TXD_C,		I2C_SEL_5_0,	SEL_MSIOF2_2),</div><div class='del'>-	PINMUX_IPSR_PHYS_MSEL(IP0_23_20, RTS4_N_TANS_A,		I2C_SEL_5_0,	SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_23_20, RTS4_N_A,		I2C_SEL_5_0,	SEL_SCIF4_0),</div><div class='ctx'> 	PINMUX_IPSR_PHYS(IP0_23_20,	SDA5,			I2C_SEL_5_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_27_24,	IRQ0),</div><div class='hunk'>@@ -756,7 +757,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_7_4,	A10),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP3_7_4,	MSIOF2_RXD_A,		SEL_MSIOF2_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP3_7_4,	RTS4_N_TANS_B,		SEL_SCIF4_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP3_7_4,	RTS4_N_B,		SEL_SCIF4_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_7_4,	VI5_HSYNC_N),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_11_8,	A11),</div><div class='hunk'>@@ -859,7 +860,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_7_4,	WE1_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP5_7_4,	MSIOF3_SS1_D,		SEL_MSIOF3_3),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP5_7_4,	RTS3_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP5_7_4,	RTS3_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_7_4,	HRTS3_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP5_7_4,	SDA6_B,			SEL_I2C6_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_7_4,	CAN1_RX),</div><div class='hunk'>@@ -940,7 +941,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP6_27_24,	MSIOF2_TXD_D,		SEL_MSIOF2_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP6_27_24,	HTX3_B,			SEL_HSCIF3_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP6_27_24,	VI4_DATA3_A,		SEL_VIN4_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP6_27_24,	RTS4_N_TANS_C,		SEL_SCIF4_2),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP6_27_24,	RTS4_N_C,		SEL_SCIF4_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_27_24,	DU_DR3),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_31_28,	D12),</div><div class='hunk'>@@ -1112,7 +1113,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_7_4,	AUDIO_CLKOUT_C,		SEL_ADG_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,	ADICS_SAMP),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_GPSR(IP11_11_8,	RTS0_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP11_11_8,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	HRTS1_N_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	MSIOF1_SS1_B,		SEL_MSIOF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	AUDIO_CLKA_B,		SEL_ADG_1),</div><div class='hunk'>@@ -1141,7 +1142,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_23_20,	RIF1_D0_B,		SEL_DRIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_23_20,	ADIDATA),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_GPSR(IP11_27_24,	RTS1_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP11_27_24,	RTS1_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	HRTS1_N_A,		SEL_HSCIF1_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	MSIOF1_TXD_B,		SEL_MSIOF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	TS_SDAT1_C,		SEL_TSIF1_2),</div><div class='hunk'>@@ -1358,7 +1359,6 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR16 */</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP16_3_0,	AUDIO_CLKA_A,		SEL_ADG_0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP16_3_0,	CC5_OSCOUT),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP16_7_4,	AUDIO_CLKB_B,		SEL_ADG_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP16_7_4,	SCIF_CLK_A,		SEL_SCIF1_0),</div><div class='hunk'>@@ -2071,22 +2071,6 @@ static const unsigned int du_disp_pins[] = {</div><div class='ctx'> static const unsigned int du_disp_mux[] = {</div><div class='ctx'> 	DU_DISP_MARK,</div><div class='ctx'> };</div><div class='del'>-/* - HDMI ------------------------------------------------------------------- */</div><div class='del'>-static const unsigned int hdmi0_cec_pins[] = {</div><div class='del'>-	/* HDMI0_CEC */</div><div class='del'>-	RCAR_GP_PIN(7, 2),</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi0_cec_mux[] = {</div><div class='del'>-	HDMI0_CEC_MARK,</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi1_cec_pins[] = {</div><div class='del'>-	/* HDMI1_CEC */</div><div class='del'>-	RCAR_GP_PIN(7, 3),</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi1_cec_mux[] = {</div><div class='del'>-	HDMI1_CEC_MARK,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* - HSCIF0 ----------------------------------------------------------------- */</div><div class='ctx'> static const unsigned int hscif0_data_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -3235,7 +3219,7 @@ static const unsigned int scif0_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(5, 4), RCAR_GP_PIN(5, 3),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif0_ctrl_mux[] = {</div><div class='del'>-	RTS0_N_TANS_MARK, CTS0_N_MARK,</div><div class='add'>+	RTS0_N_MARK, CTS0_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> /* - SCIF1 ------------------------------------------------------------------ */</div><div class='ctx'> static const unsigned int scif1_data_a_pins[] = {</div><div class='hunk'>@@ -3257,7 +3241,7 @@ static const unsigned int scif1_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(5, 8), RCAR_GP_PIN(5, 7),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_ctrl_mux[] = {</div><div class='del'>-	RTS1_N_TANS_MARK, CTS1_N_MARK,</div><div class='add'>+	RTS1_N_MARK, CTS1_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif1_data_b_pins[] = {</div><div class='hunk'>@@ -3309,7 +3293,7 @@ static const unsigned int scif3_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(1, 26), RCAR_GP_PIN(1, 25),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif3_ctrl_mux[] = {</div><div class='del'>-	RTS3_N_TANS_MARK, CTS3_N_MARK,</div><div class='add'>+	RTS3_N_MARK, CTS3_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif3_data_b_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -3338,7 +3322,7 @@ static const unsigned int scif4_ctrl_a_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(2, 14), RCAR_GP_PIN(2, 13),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_ctrl_a_mux[] = {</div><div class='del'>-	RTS4_N_TANS_A_MARK, CTS4_N_A_MARK,</div><div class='add'>+	RTS4_N_A_MARK, CTS4_N_A_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_data_b_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -3359,7 +3343,7 @@ static const unsigned int scif4_ctrl_b_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(1, 10), RCAR_GP_PIN(1, 9),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_ctrl_b_mux[] = {</div><div class='del'>-	RTS4_N_TANS_B_MARK, CTS4_N_B_MARK,</div><div class='add'>+	RTS4_N_B_MARK, CTS4_N_B_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_data_c_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -3380,7 +3364,7 @@ static const unsigned int scif4_ctrl_c_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(0, 11), RCAR_GP_PIN(0, 10),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_ctrl_c_mux[] = {</div><div class='del'>-	RTS4_N_TANS_C_MARK, CTS4_N_C_MARK,</div><div class='add'>+	RTS4_N_C_MARK, CTS4_N_C_MARK,</div><div class='ctx'> };</div><div class='ctx'> /* - SCIF5 ------------------------------------------------------------------ */</div><div class='ctx'> static const unsigned int scif5_data_pins[] = {</div><div class='hunk'>@@ -3944,8 +3928,6 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {</div><div class='ctx'> 	SH_PFC_PIN_GROUP(du_oddf),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(du_cde),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(du_disp),</div><div class='del'>-	SH_PFC_PIN_GROUP(hdmi0_cec),</div><div class='del'>-	SH_PFC_PIN_GROUP(hdmi1_cec),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif0_data),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif0_clk),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif0_ctrl),</div><div class='hunk'>@@ -4299,14 +4281,6 @@ static const char * const du_groups[] = {</div><div class='ctx'> 	"du_disp",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char * const hdmi0_groups[] = {</div><div class='del'>-	"hdmi0_cec",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char * const hdmi1_groups[] = {</div><div class='del'>-	"hdmi1_cec",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const char * const hscif0_groups[] = {</div><div class='ctx'> 	"hscif0_data",</div><div class='ctx'> 	"hscif0_clk",</div><div class='hunk'>@@ -4694,8 +4668,6 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> 	SH_PFC_FUNCTION(drif2),</div><div class='ctx'> 	SH_PFC_FUNCTION(drif3),</div><div class='ctx'> 	SH_PFC_FUNCTION(du),</div><div class='del'>-	SH_PFC_FUNCTION(hdmi0),</div><div class='del'>-	SH_PFC_FUNCTION(hdmi1),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif0),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif1),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif2),</div><div class='hunk'>@@ -4745,7 +4717,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4777,9 +4749,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4811,9 +4783,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4845,9 +4817,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4879,9 +4851,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4913,9 +4885,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4947,9 +4919,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1, GROUP(</div><div class='ctx'> 		GP_6_31_FN,	GPSR6_31,</div><div class='ctx'> 		GP_6_30_FN,	GPSR6_30,</div><div class='ctx'> 		GP_6_29_FN,	GPSR6_29,</div><div class='hunk'>@@ -4981,9 +4953,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN,	GPSR6_3,</div><div class='ctx'> 		GP_6_2_FN,	GPSR6_2,</div><div class='ctx'> 		GP_6_1_FN,	GPSR6_1,</div><div class='del'>-		GP_6_0_FN,	GPSR6_0, }</div><div class='add'>+		GP_6_0_FN,	GPSR6_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5015,14 +4987,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_7_3_FN, GPSR7_3,</div><div class='ctx'> 		GP_7_2_FN, GPSR7_2,</div><div class='ctx'> 		GP_7_1_FN, GPSR7_1,</div><div class='del'>-		GP_7_0_FN, GPSR7_0, }</div><div class='add'>+		GP_7_0_FN, GPSR7_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -5030,9 +5002,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -5040,9 +5012,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -5050,9 +5022,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -5060,9 +5032,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -5070,9 +5042,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -5080,9 +5052,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -5090,9 +5062,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -5100,9 +5072,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP7_15_12</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -5110,9 +5082,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -5120,9 +5092,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -5130,9 +5102,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4, GROUP(</div><div class='ctx'> 		IP11_31_28</div><div class='ctx'> 		IP11_27_24</div><div class='ctx'> 		IP11_23_20</div><div class='hunk'>@@ -5140,9 +5112,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP11_15_12</div><div class='ctx'> 		IP11_11_8</div><div class='ctx'> 		IP11_7_4</div><div class='del'>-		IP11_3_0 }</div><div class='add'>+		IP11_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4, GROUP(</div><div class='ctx'> 		IP12_31_28</div><div class='ctx'> 		IP12_27_24</div><div class='ctx'> 		IP12_23_20</div><div class='hunk'>@@ -5150,9 +5122,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP12_15_12</div><div class='ctx'> 		IP12_11_8</div><div class='ctx'> 		IP12_7_4</div><div class='del'>-		IP12_3_0 }</div><div class='add'>+		IP12_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4, GROUP(</div><div class='ctx'> 		IP13_31_28</div><div class='ctx'> 		IP13_27_24</div><div class='ctx'> 		IP13_23_20</div><div class='hunk'>@@ -5160,9 +5132,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP13_15_12</div><div class='ctx'> 		IP13_11_8</div><div class='ctx'> 		IP13_7_4</div><div class='del'>-		IP13_3_0 }</div><div class='add'>+		IP13_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4, GROUP(</div><div class='ctx'> 		IP14_31_28</div><div class='ctx'> 		IP14_27_24</div><div class='ctx'> 		IP14_23_20</div><div class='hunk'>@@ -5170,9 +5142,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP14_15_12</div><div class='ctx'> 		IP14_11_8</div><div class='ctx'> 		IP14_7_4</div><div class='del'>-		IP14_3_0 }</div><div class='add'>+		IP14_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4, GROUP(</div><div class='ctx'> 		IP15_31_28</div><div class='ctx'> 		IP15_27_24</div><div class='ctx'> 		IP15_23_20</div><div class='hunk'>@@ -5180,9 +5152,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP15_15_12</div><div class='ctx'> 		IP15_11_8</div><div class='ctx'> 		IP15_7_4</div><div class='del'>-		IP15_3_0 }</div><div class='add'>+		IP15_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4, GROUP(</div><div class='ctx'> 		IP16_31_28</div><div class='ctx'> 		IP16_27_24</div><div class='ctx'> 		IP16_23_20</div><div class='hunk'>@@ -5190,9 +5162,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP16_15_12</div><div class='ctx'> 		IP16_11_8</div><div class='ctx'> 		IP16_7_4</div><div class='del'>-		IP16_3_0 }</div><div class='add'>+		IP16_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4, GROUP(</div><div class='ctx'> 		/* IP17_31_28 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP17_27_24 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP17_23_20 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -5200,7 +5172,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP17_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP17_11_8  */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP17_7_4</div><div class='del'>-		IP17_3_0 }</div><div class='add'>+		IP17_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -5208,8 +5180,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     1, 2, 2, 3, 1, 1, 2, 1, 1, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 1) {</div><div class='add'>+			     GROUP(1, 2, 2, 3, 1, 1, 2, 1, 1, 1, 2, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		0, 0, /* RESERVED 31 */</div><div class='ctx'> 		MOD_SEL0_30_29</div><div class='ctx'> 		MOD_SEL0_28_27</div><div class='hunk'>@@ -5232,11 +5205,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_5_4</div><div class='ctx'> 		MOD_SEL0_3</div><div class='ctx'> 		MOD_SEL0_2_1</div><div class='del'>-		0, 0, /* RESERVED 0 */ }</div><div class='add'>+		0, 0, /* RESERVED 0 */ ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,</div><div class='del'>-			     2, 3, 1, 2, 3, 1, 1, 2, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(2, 3, 1, 2, 3, 1, 1, 2, 1, 2, 1, 1,</div><div class='add'>+				   1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL1_31_30</div><div class='ctx'> 		MOD_SEL1_29_28_27</div><div class='ctx'> 		MOD_SEL1_26</div><div class='hunk'>@@ -5259,11 +5233,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL1_3</div><div class='ctx'> 		MOD_SEL1_2</div><div class='ctx'> 		MOD_SEL1_1</div><div class='del'>-		MOD_SEL1_0 }</div><div class='add'>+		MOD_SEL1_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xe6060508, 32,</div><div class='del'>-			     1, 1, 1, 1, 4, 4, 4,</div><div class='del'>-			     4, 4, 4, 1, 2, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 1, 2, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL2_31</div><div class='ctx'> 		MOD_SEL2_30</div><div class='ctx'> 		MOD_SEL2_29</div><div class='hunk'>@@ -5291,7 +5265,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* RESERVED 2, 1 */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		MOD_SEL2_0 }</div><div class='add'>+		MOD_SEL2_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='hunk'>@@ -5412,8 +5386,8 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> 		{ RCAR_GP_PIN(0, 15),   24, 3 },	/* D15 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  0),   20, 3 },	/* AVS1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  1),   16, 3 },	/* AVS2 */</div><div class='del'>-		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* HDMI0_CEC */</div><div class='del'>-		{ RCAR_GP_PIN(7,  3),    8, 3 },	/* HDMI1_CEC */</div><div class='add'>+		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* GP7_02 */</div><div class='add'>+		{ RCAR_GP_PIN(7,  3),    8, 3 },	/* GP7_03 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 7),  4, 2 },	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 8),  0, 2 },	/* DU_DOTCLKIN1 */</div><div class='ctx'> 	} },</div><div class='hunk'>@@ -5474,11 +5448,11 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> 		{ RCAR_GP_PIN(5,  3),  0, 3 },	/* CTS0 */</div><div class='ctx'> 	} },</div><div class='ctx'> 	{ PINMUX_DRIVE_REG("DRVCTRL18", 0xe6060348) {</div><div class='del'>-		{ RCAR_GP_PIN(5,  4), 28, 3 },	/* RTS0_TANS */</div><div class='add'>+		{ RCAR_GP_PIN(5,  4), 28, 3 },	/* RTS0 */</div><div class='ctx'> 		{ RCAR_GP_PIN(5,  5), 24, 3 },	/* RX1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(5,  6), 20, 3 },	/* TX1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(5,  7), 16, 3 },	/* CTS1 */</div><div class='del'>-		{ RCAR_GP_PIN(5,  8), 12, 3 },	/* RTS1_TANS */</div><div class='add'>+		{ RCAR_GP_PIN(5,  8), 12, 3 },	/* RTS1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(5,  9),  8, 3 },	/* SCK2 */</div><div class='ctx'> 		{ RCAR_GP_PIN(5, 10),  4, 3 },	/* TX2 */</div><div class='ctx'> 		{ RCAR_GP_PIN(5, 11),  0, 3 },	/* RX2 */</div><div class='hunk'>@@ -5547,10 +5521,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='ctx'> 	POCCTRL,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='ctx'> 	[POCCTRL] = { 0xe6060380, },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -5668,8 +5644,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {</div><div class='ctx'> 		[25] = RCAR_GP_PIN(0, 15),	/* D15 */</div><div class='ctx'> 		[26] = RCAR_GP_PIN(7,  0),	/* AVS1 */</div><div class='ctx'> 		[27] = RCAR_GP_PIN(7,  1),	/* AVS2 */</div><div class='del'>-		[28] = RCAR_GP_PIN(7,  2),	/* HDMI0_CEC */</div><div class='del'>-		[29] = RCAR_GP_PIN(7,  3),	/* HDMI1_CEC */</div><div class='add'>+		[28] = RCAR_GP_PIN(7,  2),	/* GP7_02 */</div><div class='add'>+		[29] = RCAR_GP_PIN(7,  3),	/* GP7_03 */</div><div class='ctx'> 		[30] = PIN_A_NUMBER('P', 7),	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		[31] = PIN_A_NUMBER('P', 8),	/* DU_DOTCLKIN1 */</div><div class='ctx'> 	} },</div><div class='hunk'>@@ -5724,11 +5700,11 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {</div><div class='ctx'> 		[13] = RCAR_GP_PIN(5,  1),	/* RX0 */</div><div class='ctx'> 		[14] = RCAR_GP_PIN(5,  2),	/* TX0 */</div><div class='ctx'> 		[15] = RCAR_GP_PIN(5,  3),	/* CTS0_N */</div><div class='del'>-		[16] = RCAR_GP_PIN(5,  4),	/* RTS0_N_TANS */</div><div class='add'>+		[16] = RCAR_GP_PIN(5,  4),	/* RTS0_N */</div><div class='ctx'> 		[17] = RCAR_GP_PIN(5,  5),	/* RX1_A */</div><div class='ctx'> 		[18] = RCAR_GP_PIN(5,  6),	/* TX1_A */</div><div class='ctx'> 		[19] = RCAR_GP_PIN(5,  7),	/* CTS1_N */</div><div class='del'>-		[20] = RCAR_GP_PIN(5,  8),	/* RTS1_N_TANS */</div><div class='add'>+		[20] = RCAR_GP_PIN(5,  8),	/* RTS1_N */</div><div class='ctx'> 		[21] = RCAR_GP_PIN(5,  9),	/* SCK2 */</div><div class='ctx'> 		[22] = RCAR_GP_PIN(5, 10),	/* TX2_A */</div><div class='ctx'> 		[23] = RCAR_GP_PIN(5, 11),	/* RX2_A */</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c<br/>index db9add1405c5..68bcb8980b16 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7795.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7795.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7795.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7795.c</a></div><div class='hunk'>@@ -2,9 +2,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * R8A7795 ES2.0+ processor support - PFC hardware block.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2015-2017 Renesas Electronics Corporation</div><div class='add'>+ * Copyright (C) 2015-2019 Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sys_soc.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -200,8 +201,8 @@</div><div class='ctx'> #define GPSR6_0		F_(SSI_SCK01239,		IP14_23_20)</div><div class='ctx'> </div><div class='ctx'> /* GPSR7 */</div><div class='del'>-#define GPSR7_3		FM(HDMI1_CEC)</div><div class='del'>-#define GPSR7_2		FM(HDMI0_CEC)</div><div class='add'>+#define GPSR7_3		FM(GP7_03)</div><div class='add'>+#define GPSR7_2		FM(GP7_02)</div><div class='ctx'> #define GPSR7_1		FM(AVS2)</div><div class='ctx'> #define GPSR7_0		FM(AVS1)</div><div class='ctx'> </div><div class='hunk'>@@ -350,7 +351,7 @@</div><div class='ctx'> #define IP16_23_20	FM(SSI_SDATA7)		FM(HCTS2_N_B)	FM(MSIOF1_RXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SDEN1_A)	FM(STP_ISEN_1_A)	FM(RIF1_D0_A)	FM(RIF3_D0_A)		F_(0, 0)	FM(TCLK2_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_27_24	FM(SSI_SDATA8)		FM(HRTS2_N_B)	FM(MSIOF1_TXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SPSYNC1_A)FM(STP_ISSYNC_1_A)	FM(RIF1_D1_A)	FM(RIF3_D1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_31_28	FM(SSI_SDATA9_A)	FM(HSCK2_B)	FM(MSIOF1_SS1_C)	FM(HSCK1_A)			FM(SSI_WS1_B)	FM(SCK1)	FM(STP_IVCXO27_1_A)	FM(SCK5_A)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP17_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(CC5_OSCOUT)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP17_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_7_4	FM(AUDIO_CLKB_B)	FM(SCIF_CLK_A)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	FM(STP_IVCXO27_1_D)	FM(REMOCON_A)	F_(0, 0)		F_(0, 0)	FM(TCLK1_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_11_8	FM(USB0_PWEN)		F_(0, 0)	F_(0, 0)		FM(SIM0_RST_C)			F_(0, 0)	FM(TS_SCK1_D)	FM(STP_ISCLK_1_D)	FM(BPFCLK_B)	FM(RIF3_CLK_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) FM(HSCK2_C) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_15_12	FM(USB0_OVC)		F_(0, 0)	F_(0, 0)		FM(SIM0_D_C)			F_(0, 0)	FM(TS_SDAT1_D)	FM(STP_ISD_1_D)		F_(0, 0)	FM(RIF3_SYNC_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) FM(HRX2_C) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -461,7 +462,7 @@ FM(IP16_31_28)	IP16_31_28	FM(IP17_31_28)	IP17_31_28</div><div class='ctx'> #define MOD_SEL0_9_8		FM(SEL_DRIF1_0)		FM(SEL_DRIF1_1)		FM(SEL_DRIF1_2)		F_(0, 0)</div><div class='ctx'> #define MOD_SEL0_7_6		FM(SEL_DRIF0_0)		FM(SEL_DRIF0_1)		FM(SEL_DRIF0_2)		F_(0, 0)</div><div class='ctx'> #define MOD_SEL0_5		FM(SEL_CANFD0_0)	FM(SEL_CANFD0_1)</div><div class='del'>-#define MOD_SEL0_4_3		FM(SEL_ADG_A_0)		FM(SEL_ADG_A_1)		FM(SEL_ADG_A_2)		FM(SEL_ADG_A_3)</div><div class='add'>+#define MOD_SEL0_4_3		FM(SEL_ADGA_0)		FM(SEL_ADGA_1)		FM(SEL_ADGA_2)		FM(SEL_ADGA_3)</div><div class='ctx'> </div><div class='ctx'> /* MOD_SEL1 */			/* 0 */			/* 1 */			/* 2 */			/* 3 */			/* 4 */			/* 5 */			/* 6 */			/* 7 */</div><div class='ctx'> #define MOD_SEL1_31_30		FM(SEL_TSIF1_0)		FM(SEL_TSIF1_1)		FM(SEL_TSIF1_2)		FM(SEL_TSIF1_3)</div><div class='hunk'>@@ -497,8 +498,8 @@ FM(IP16_31_28)	IP16_31_28	FM(IP17_31_28)	IP17_31_28</div><div class='ctx'> #define MOD_SEL2_21		FM(SEL_SSI2_0)		FM(SEL_SSI2_1)</div><div class='ctx'> #define MOD_SEL2_20		FM(SEL_SSI9_0)		FM(SEL_SSI9_1)</div><div class='ctx'> #define MOD_SEL2_19		FM(SEL_TIMER_TMU2_0)	FM(SEL_TIMER_TMU2_1)</div><div class='del'>-#define MOD_SEL2_18		FM(SEL_ADG_B_0)		FM(SEL_ADG_B_1)</div><div class='del'>-#define MOD_SEL2_17		FM(SEL_ADG_C_0)		FM(SEL_ADG_C_1)</div><div class='add'>+#define MOD_SEL2_18		FM(SEL_ADGB_0)		FM(SEL_ADGB_1)</div><div class='add'>+#define MOD_SEL2_17		FM(SEL_ADGC_0)		FM(SEL_ADGC_1)</div><div class='ctx'> #define MOD_SEL2_0		FM(SEL_VIN4_0)		FM(SEL_VIN4_1)</div><div class='ctx'> </div><div class='ctx'> #define PINMUX_MOD_SELS	\</div><div class='hunk'>@@ -590,8 +591,8 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_SINGLE(AVS1),</div><div class='ctx'> 	PINMUX_SINGLE(AVS2),</div><div class='ctx'> 	PINMUX_SINGLE(CLKOUT),</div><div class='del'>-	PINMUX_SINGLE(HDMI0_CEC),</div><div class='del'>-	PINMUX_SINGLE(HDMI1_CEC),</div><div class='add'>+	PINMUX_SINGLE(GP7_02),</div><div class='add'>+	PINMUX_SINGLE(GP7_03),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_RXD),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_SCK),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_TXD),</div><div class='hunk'>@@ -1129,7 +1130,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_27_24,	SCK0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	HSCK1_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	MSIOF1_SS2_B,		SEL_MSIOF1_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADG_C_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADGC_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	SDA2_A,			SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	SIM0_RST_B,		SEL_SIMCARD_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	STP_OPWM_0_C,		SEL_SSP1_0_2),</div><div class='hunk'>@@ -1162,7 +1163,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP12_11_8,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	HRTS1_N_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	MSIOF1_SS1_B,		SEL_MSIOF1_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADG_A_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADGA_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	SCL2_A,			SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	STP_IVCXO27_1_C,	SEL_SSP1_1_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	RIF0_SYNC_B,		SEL_DRIF0_1),</div><div class='hunk'>@@ -1221,7 +1222,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP13_11_8,	HSCK0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	MSIOF1_SCK_D,		SEL_MSIOF1_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADG_B_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADGB_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	SSI_SDATA1_B,		SEL_SSI1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	TS_SCK0_D,		SEL_TSIF0_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	STP_ISCLK_0_D,		SEL_SSP1_0_3),</div><div class='hunk'>@@ -1268,7 +1269,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	MSIOF0_SS1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	RX5_A,			SEL_SCIF5_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	NFWP_N_A),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADG_A_2),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADGA_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	SSI_SCK2_A,		SEL_SSI2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	STP_IVCXO27_0_C,	SEL_SSP1_0_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	AUDIO_CLKOUT3_A),</div><div class='hunk'>@@ -1277,7 +1278,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_7_4,	MSIOF0_SS2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	TX5_A,			SEL_SCIF5_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	MSIOF1_SS2_D,		SEL_MSIOF1_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADG_C_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADGC_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_WS2_A,		SEL_SSI2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	STP_OPWM_0_D,		SEL_SSP1_0_3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_7_4,	AUDIO_CLKOUT_D),</div><div class='hunk'>@@ -1408,10 +1409,9 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP16_31_28,	SCK5_A,			SEL_SCIF5_0),</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR17 */</div><div class='del'>-	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADG_A_0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP17_3_0,	CC5_OSCOUT),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADGA_0),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADG_B_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADGB_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	SCIF_CLK_A,		SEL_SCIF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	STP_IVCXO27_1_D,	SEL_SSP1_1_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	REMOCON_A,		SEL_REMOCON_0),</div><div class='hunk'>@@ -2131,22 +2131,6 @@ static const unsigned int du_disp_mux[] = {</div><div class='ctx'> 	DU_DISP_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* - HDMI ------------------------------------------------------------------- */</div><div class='del'>-static const unsigned int hdmi0_cec_pins[] = {</div><div class='del'>-	/* HDMI0_CEC */</div><div class='del'>-	RCAR_GP_PIN(7, 2),</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi0_cec_mux[] = {</div><div class='del'>-	HDMI0_CEC_MARK,</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi1_cec_pins[] = {</div><div class='del'>-	/* HDMI1_CEC */</div><div class='del'>-	RCAR_GP_PIN(7, 3),</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi1_cec_mux[] = {</div><div class='del'>-	HDMI1_CEC_MARK,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* - HSCIF0 ----------------------------------------------------------------- */</div><div class='ctx'> static const unsigned int hscif0_data_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -4225,8 +4209,6 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {</div><div class='ctx'> 	SH_PFC_PIN_GROUP(du_oddf),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(du_cde),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(du_disp),</div><div class='del'>-	SH_PFC_PIN_GROUP(hdmi0_cec),</div><div class='del'>-	SH_PFC_PIN_GROUP(hdmi1_cec),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif0_data),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif0_clk),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif0_ctrl),</div><div class='hunk'>@@ -4611,14 +4593,6 @@ static const char * const du_groups[] = {</div><div class='ctx'> 	"du_disp",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char * const hdmi0_groups[] = {</div><div class='del'>-	"hdmi0_cec",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char * const hdmi1_groups[] = {</div><div class='del'>-	"hdmi1_cec",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const char * const hscif0_groups[] = {</div><div class='ctx'> 	"hscif0_data",</div><div class='ctx'> 	"hscif0_clk",</div><div class='hunk'>@@ -5037,8 +5011,6 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> 	SH_PFC_FUNCTION(drif2),</div><div class='ctx'> 	SH_PFC_FUNCTION(drif3),</div><div class='ctx'> 	SH_PFC_FUNCTION(du),</div><div class='del'>-	SH_PFC_FUNCTION(hdmi0),</div><div class='del'>-	SH_PFC_FUNCTION(hdmi1),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif0),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif1),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif2),</div><div class='hunk'>@@ -5088,7 +5060,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5120,9 +5092,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5154,9 +5126,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5188,9 +5160,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5222,9 +5194,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5256,9 +5228,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5290,9 +5262,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1, GROUP(</div><div class='ctx'> 		GP_6_31_FN,	GPSR6_31,</div><div class='ctx'> 		GP_6_30_FN,	GPSR6_30,</div><div class='ctx'> 		GP_6_29_FN,	GPSR6_29,</div><div class='hunk'>@@ -5324,9 +5296,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN,	GPSR6_3,</div><div class='ctx'> 		GP_6_2_FN,	GPSR6_2,</div><div class='ctx'> 		GP_6_1_FN,	GPSR6_1,</div><div class='del'>-		GP_6_0_FN,	GPSR6_0, }</div><div class='add'>+		GP_6_0_FN,	GPSR6_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5358,14 +5330,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_7_3_FN, GPSR7_3,</div><div class='ctx'> 		GP_7_2_FN, GPSR7_2,</div><div class='ctx'> 		GP_7_1_FN, GPSR7_1,</div><div class='del'>-		GP_7_0_FN, GPSR7_0, }</div><div class='add'>+		GP_7_0_FN, GPSR7_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -5373,9 +5345,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -5383,9 +5355,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -5393,9 +5365,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -5403,9 +5375,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -5413,9 +5385,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -5423,9 +5395,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -5433,9 +5405,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -5443,9 +5415,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP7_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -5453,9 +5425,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -5463,9 +5435,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -5473,9 +5445,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4, GROUP(</div><div class='ctx'> 		IP11_31_28</div><div class='ctx'> 		IP11_27_24</div><div class='ctx'> 		IP11_23_20</div><div class='hunk'>@@ -5483,9 +5455,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP11_15_12</div><div class='ctx'> 		IP11_11_8</div><div class='ctx'> 		IP11_7_4</div><div class='del'>-		IP11_3_0 }</div><div class='add'>+		IP11_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4, GROUP(</div><div class='ctx'> 		IP12_31_28</div><div class='ctx'> 		IP12_27_24</div><div class='ctx'> 		IP12_23_20</div><div class='hunk'>@@ -5493,9 +5465,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP12_15_12</div><div class='ctx'> 		IP12_11_8</div><div class='ctx'> 		IP12_7_4</div><div class='del'>-		IP12_3_0 }</div><div class='add'>+		IP12_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4, GROUP(</div><div class='ctx'> 		IP13_31_28</div><div class='ctx'> 		IP13_27_24</div><div class='ctx'> 		IP13_23_20</div><div class='hunk'>@@ -5503,9 +5475,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP13_15_12</div><div class='ctx'> 		IP13_11_8</div><div class='ctx'> 		IP13_7_4</div><div class='del'>-		IP13_3_0 }</div><div class='add'>+		IP13_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4, GROUP(</div><div class='ctx'> 		IP14_31_28</div><div class='ctx'> 		IP14_27_24</div><div class='ctx'> 		IP14_23_20</div><div class='hunk'>@@ -5513,9 +5485,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP14_15_12</div><div class='ctx'> 		IP14_11_8</div><div class='ctx'> 		IP14_7_4</div><div class='del'>-		IP14_3_0 }</div><div class='add'>+		IP14_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4, GROUP(</div><div class='ctx'> 		IP15_31_28</div><div class='ctx'> 		IP15_27_24</div><div class='ctx'> 		IP15_23_20</div><div class='hunk'>@@ -5523,9 +5495,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP15_15_12</div><div class='ctx'> 		IP15_11_8</div><div class='ctx'> 		IP15_7_4</div><div class='del'>-		IP15_3_0 }</div><div class='add'>+		IP15_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4, GROUP(</div><div class='ctx'> 		IP16_31_28</div><div class='ctx'> 		IP16_27_24</div><div class='ctx'> 		IP16_23_20</div><div class='hunk'>@@ -5533,9 +5505,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP16_15_12</div><div class='ctx'> 		IP16_11_8</div><div class='ctx'> 		IP16_7_4</div><div class='del'>-		IP16_3_0 }</div><div class='add'>+		IP16_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4, GROUP(</div><div class='ctx'> 		IP17_31_28</div><div class='ctx'> 		IP17_27_24</div><div class='ctx'> 		IP17_23_20</div><div class='hunk'>@@ -5543,9 +5515,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP17_15_12</div><div class='ctx'> 		IP17_11_8</div><div class='ctx'> 		IP17_7_4</div><div class='del'>-		IP17_3_0 }</div><div class='add'>+		IP17_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR18", 0xe6060248, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR18", 0xe6060248, 32, 4, GROUP(</div><div class='ctx'> 		/* IP18_31_28 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_27_24 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_23_20 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -5553,7 +5525,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP18_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_11_8  */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP18_7_4</div><div class='del'>-		IP18_3_0 }</div><div class='add'>+		IP18_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -5561,8 +5533,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     3, 2, 3, 1, 1, 1, 1, 1, 2, 1,</div><div class='del'>-			     1, 2, 1, 1, 1, 2, 2, 1, 2, 3) {</div><div class='add'>+			     GROUP(3, 2, 3, 1, 1, 1, 1, 1, 2, 1, 1, 2,</div><div class='add'>+				   1, 1, 1, 2, 2, 1, 2, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL0_31_30_29</div><div class='ctx'> 		MOD_SEL0_28_27</div><div class='ctx'> 		MOD_SEL0_26_25_24</div><div class='hunk'>@@ -5583,11 +5556,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_5</div><div class='ctx'> 		MOD_SEL0_4_3</div><div class='ctx'> 		/* RESERVED 2, 1, 0 */</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,</div><div class='del'>-			     2, 3, 1, 2, 3, 1, 1, 2, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(2, 3, 1, 2, 3, 1, 1, 2, 1, 2, 1, 1,</div><div class='add'>+				   1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL1_31_30</div><div class='ctx'> 		MOD_SEL1_29_28_27</div><div class='ctx'> 		MOD_SEL1_26</div><div class='hunk'>@@ -5610,11 +5584,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL1_3</div><div class='ctx'> 		MOD_SEL1_2</div><div class='ctx'> 		MOD_SEL1_1</div><div class='del'>-		MOD_SEL1_0 }</div><div class='add'>+		MOD_SEL1_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xe6060508, 32,</div><div class='del'>-			     1, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     4, 4, 4, 3, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 4, 4, 4, 3, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL2_31</div><div class='ctx'> 		MOD_SEL2_30</div><div class='ctx'> 		MOD_SEL2_29</div><div class='hunk'>@@ -5641,7 +5616,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED 3, 2, 1 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		MOD_SEL2_0 }</div><div class='add'>+		MOD_SEL2_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='hunk'>@@ -5762,8 +5737,8 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> 		{ RCAR_GP_PIN(0, 15),   24, 3 },	/* D15 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  0),   20, 3 },	/* AVS1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  1),   16, 3 },	/* AVS2 */</div><div class='del'>-		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* HDMI0_CEC */</div><div class='del'>-		{ RCAR_GP_PIN(7,  3),    8, 3 },	/* HDMI1_CEC */</div><div class='add'>+		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* GP7_02 */</div><div class='add'>+		{ RCAR_GP_PIN(7,  3),    8, 3 },	/* GP7_03 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 7),  4, 2 },	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 8),  0, 2 },	/* DU_DOTCLKIN1 */</div><div class='ctx'> 	} },</div><div class='hunk'>@@ -5897,10 +5872,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='ctx'> 	POCCTRL,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='ctx'> 	[POCCTRL] = { 0xe6060380, },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -6017,8 +5994,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {</div><div class='ctx'> 		[25] = RCAR_GP_PIN(0, 15),	/* D15 */</div><div class='ctx'> 		[26] = RCAR_GP_PIN(7,  0),	/* AVS1 */</div><div class='ctx'> 		[27] = RCAR_GP_PIN(7,  1),	/* AVS2 */</div><div class='del'>-		[28] = RCAR_GP_PIN(7,  2),	/* HDMI0_CEC */</div><div class='del'>-		[29] = RCAR_GP_PIN(7,  3),	/* HDMI1_CEC */</div><div class='add'>+		[28] = RCAR_GP_PIN(7,  2),	/* GP7_02 */</div><div class='add'>+		[29] = RCAR_GP_PIN(7,  3),	/* GP7_03 */</div><div class='ctx'> 		[30] = PIN_A_NUMBER('P', 7),	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		[31] = PIN_A_NUMBER('P', 8),	/* DU_DOTCLKIN1 */</div><div class='ctx'> 	} },</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c<br/>index 72348a4f2ece..38cce690db70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7796.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a7796.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a7796.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a7796.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * R8A7796 processor support - PFC hardware block.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2016-2017 Renesas Electronics Corp.</div><div class='add'>+ * Copyright (C) 2016-2019 Renesas Electronics Corp.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * Copyright (C) 2015  Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -206,7 +207,7 @@</div><div class='ctx'> </div><div class='ctx'> /* GPSR7 */</div><div class='ctx'> #define GPSR7_3		FM(GP7_03)</div><div class='del'>-#define GPSR7_2		FM(HDMI0_CEC)</div><div class='add'>+#define GPSR7_2		FM(GP7_02)</div><div class='ctx'> #define GPSR7_1		FM(AVS2)</div><div class='ctx'> #define GPSR7_0		FM(AVS1)</div><div class='ctx'> </div><div class='hunk'>@@ -355,7 +356,7 @@</div><div class='ctx'> #define IP16_23_20	FM(SSI_SDATA7)		FM(HCTS2_N_B)	FM(MSIOF1_RXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SDEN1_A)	FM(STP_ISEN_1_A)	FM(RIF1_D0_A)	FM(RIF3_D0_A)		F_(0, 0)	FM(TCLK2_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_27_24	FM(SSI_SDATA8)		FM(HRTS2_N_B)	FM(MSIOF1_TXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SPSYNC1_A)FM(STP_ISSYNC_1_A)	FM(RIF1_D1_A)	FM(RIF3_D1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_31_28	FM(SSI_SDATA9_A)	FM(HSCK2_B)	FM(MSIOF1_SS1_C)	FM(HSCK1_A)			FM(SSI_WS1_B)	FM(SCK1)	FM(STP_IVCXO27_1_A)	FM(SCK5_A)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP17_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(CC5_OSCOUT)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP17_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_7_4	FM(AUDIO_CLKB_B)	FM(SCIF_CLK_A)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	FM(STP_IVCXO27_1_D)	FM(REMOCON_A)	F_(0, 0)		F_(0, 0)	FM(TCLK1_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_11_8	FM(USB0_PWEN)		F_(0, 0)	F_(0, 0)		FM(SIM0_RST_C)			F_(0, 0)	FM(TS_SCK1_D)	FM(STP_ISCLK_1_D)	FM(BPFCLK_B)	FM(RIF3_CLK_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) FM(HSCK2_C) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_15_12	FM(USB0_OVC)		F_(0, 0)	F_(0, 0)		FM(SIM0_D_C)			F_(0, 0)	FM(TS_SDAT1_D)	FM(STP_ISD_1_D)		F_(0, 0)	FM(RIF3_SYNC_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) FM(HRX2_C) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -466,7 +467,7 @@ FM(IP16_31_28)	IP16_31_28	FM(IP17_31_28)	IP17_31_28</div><div class='ctx'> #define MOD_SEL0_9_8		FM(SEL_DRIF1_0)		FM(SEL_DRIF1_1)		FM(SEL_DRIF1_2)		F_(0, 0)</div><div class='ctx'> #define MOD_SEL0_7_6		FM(SEL_DRIF0_0)		FM(SEL_DRIF0_1)		FM(SEL_DRIF0_2)		F_(0, 0)</div><div class='ctx'> #define MOD_SEL0_5		FM(SEL_CANFD0_0)	FM(SEL_CANFD0_1)</div><div class='del'>-#define MOD_SEL0_4_3		FM(SEL_ADG_A_0)		FM(SEL_ADG_A_1)		FM(SEL_ADG_A_2)		FM(SEL_ADG_A_3)</div><div class='add'>+#define MOD_SEL0_4_3		FM(SEL_ADGA_0)		FM(SEL_ADGA_1)		FM(SEL_ADGA_2)		FM(SEL_ADGA_3)</div><div class='ctx'> </div><div class='ctx'> /* MOD_SEL1 */			/* 0 */			/* 1 */			/* 2 */			/* 3 */			/* 4 */			/* 5 */			/* 6 */			/* 7 */</div><div class='ctx'> #define MOD_SEL1_31_30		FM(SEL_TSIF1_0)		FM(SEL_TSIF1_1)		FM(SEL_TSIF1_2)		FM(SEL_TSIF1_3)</div><div class='hunk'>@@ -499,12 +500,12 @@ FM(IP16_31_28)	IP16_31_28	FM(IP17_31_28)	IP17_31_28</div><div class='ctx'> #define MOD_SEL2_28_27		FM(SEL_FM_0)		FM(SEL_FM_1)		FM(SEL_FM_2)		FM(SEL_FM_3)</div><div class='ctx'> #define MOD_SEL2_26		FM(SEL_SCIF5_0)		FM(SEL_SCIF5_1)</div><div class='ctx'> #define MOD_SEL2_25_24_23	FM(SEL_I2C6_0)		FM(SEL_I2C6_1)		FM(SEL_I2C6_2)		F_(0, 0)		F_(0, 0)		F_(0, 0)		F_(0, 0)		F_(0, 0)</div><div class='del'>-#define MOD_SEL2_22		FM(SEL_NDFC_0)		FM(SEL_NDFC_1)</div><div class='add'>+#define MOD_SEL2_22		FM(SEL_NDF_0)		FM(SEL_NDF_1)</div><div class='ctx'> #define MOD_SEL2_21		FM(SEL_SSI2_0)		FM(SEL_SSI2_1)</div><div class='ctx'> #define MOD_SEL2_20		FM(SEL_SSI9_0)		FM(SEL_SSI9_1)</div><div class='ctx'> #define MOD_SEL2_19		FM(SEL_TIMER_TMU2_0)	FM(SEL_TIMER_TMU2_1)</div><div class='del'>-#define MOD_SEL2_18		FM(SEL_ADG_B_0)		FM(SEL_ADG_B_1)</div><div class='del'>-#define MOD_SEL2_17		FM(SEL_ADG_C_0)		FM(SEL_ADG_C_1)</div><div class='add'>+#define MOD_SEL2_18		FM(SEL_ADGB_0)		FM(SEL_ADGB_1)</div><div class='add'>+#define MOD_SEL2_17		FM(SEL_ADGC_0)		FM(SEL_ADGC_1)</div><div class='ctx'> #define MOD_SEL2_0		FM(SEL_VIN4_0)		FM(SEL_VIN4_1)</div><div class='ctx'> </div><div class='ctx'> #define PINMUX_MOD_SELS	\</div><div class='hunk'>@@ -597,7 +598,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_SINGLE(AVS2),</div><div class='ctx'> 	PINMUX_SINGLE(CLKOUT),</div><div class='ctx'> 	PINMUX_SINGLE(GP7_03),</div><div class='del'>-	PINMUX_SINGLE(HDMI0_CEC),</div><div class='add'>+	PINMUX_SINGLE(GP7_02),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_RXD),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_SCK),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_TXD),</div><div class='hunk'>@@ -1021,35 +1022,35 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_15_12,	SD1_CMD),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_15_12,	MSIOF1_SYNC_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_15_12,	NFCE_N_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_15_12,	NFCE_N_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_15_12,	SIM0_D_A,		SEL_SIMCARD_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_15_12,	STP_IVCXO27_1_B,	SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_19_16,	SD1_DAT0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_19_16,	SD2_DAT4),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,	MSIOF1_RXD_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_19_16,	NFWP_N_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_19_16,	NFWP_N_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,	TS_SCK1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,	STP_ISCLK_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_23_20,	SD1_DAT1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_23_20,	SD2_DAT5),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_23_20,	MSIOF1_TXD_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_23_20,	NFDATA14_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_23_20,	NFDATA14_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_23_20,	TS_SPSYNC1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_23_20,	STP_ISSYNC_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_27_24,	SD1_DAT2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_27_24,	SD2_DAT6),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_27_24,	MSIOF1_SS1_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_27_24,	NFDATA15_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_27_24,	NFDATA15_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_27_24,	TS_SDAT1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_27_24,	STP_ISD_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_31_28,	SD1_DAT3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_31_28,	SD2_DAT7),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_31_28,	MSIOF1_SS2_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_31_28,	NFRB_N_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_31_28,	NFRB_N_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_31_28,	TS_SDEN1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_31_28,	STP_ISEN_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='hunk'>@@ -1115,28 +1116,28 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,	NFCLE),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_11_8,	SD0_CD),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_11_8,	NFDATA14_A,		SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_11_8,	NFDATA14_A,		SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	SCL2_B,			SEL_I2C2_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	SIM0_RST_A,		SEL_SIMCARD_0),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_15_12,	SD0_WP),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_15_12,	NFDATA15_A,		SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_15_12,	NFDATA15_A,		SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_15_12,	SDA2_B,			SEL_I2C2_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_19_16,	SD1_CD,			I2C_SEL_0_0),</div><div class='del'>-	PINMUX_IPSR_PHYS_MSEL(IP11_19_16, NFRB_N_A,		I2C_SEL_0_0,	SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP11_19_16, NFRB_N_A,		I2C_SEL_0_0,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_PHYS_MSEL(IP11_19_16, SIM0_CLK_B,		I2C_SEL_0_0,	SEL_SIMCARD_1),</div><div class='ctx'> 	PINMUX_IPSR_PHYS(IP11_19_16,	SCL0,			I2C_SEL_0_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_23_20,	SD1_WP,			I2C_SEL_0_0),</div><div class='del'>-	PINMUX_IPSR_PHYS_MSEL(IP11_23_20, NFCE_N_A,		I2C_SEL_0_0,	SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP11_23_20, NFCE_N_A,		I2C_SEL_0_0,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_PHYS_MSEL(IP11_23_20, SIM0_D_B,		I2C_SEL_0_0,	SEL_SIMCARD_1),</div><div class='ctx'> 	PINMUX_IPSR_PHYS(IP11_23_20,	SDA0,			I2C_SEL_0_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_27_24,	SCK0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	HSCK1_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	MSIOF1_SS2_B,		SEL_MSIOF1_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADG_C_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADGC_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	SDA2_A,			SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	SIM0_RST_B,		SEL_SIMCARD_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	STP_OPWM_0_C,		SEL_SSP1_0_2),</div><div class='hunk'>@@ -1169,7 +1170,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP12_11_8,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	HRTS1_N_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	MSIOF1_SS1_B,		SEL_MSIOF1_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADG_A_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADGA_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	SCL2_A,			SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	STP_IVCXO27_1_C,	SEL_SSP1_1_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	RIF0_SYNC_B,		SEL_DRIF0_1),</div><div class='hunk'>@@ -1228,7 +1229,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP13_11_8,	HSCK0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	MSIOF1_SCK_D,		SEL_MSIOF1_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADG_B_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADGB_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	SSI_SDATA1_B,		SEL_SSI1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	TS_SCK0_D,		SEL_TSIF0_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	STP_ISCLK_0_D,		SEL_SSP1_0_3),</div><div class='hunk'>@@ -1274,8 +1275,8 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	/* IPSR14 */</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	MSIOF0_SS1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	RX5_A,			SEL_SCIF5_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_3_0,	NFWP_N_A,		SEL_NDFC_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADG_A_2),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_3_0,	NFWP_N_A,		SEL_NDF_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADGA_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	SSI_SCK2_A,		SEL_SSI2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	STP_IVCXO27_0_C,	SEL_SSP1_0_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	AUDIO_CLKOUT3_A),</div><div class='hunk'>@@ -1284,7 +1285,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_7_4,	MSIOF0_SS2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	TX5_A,			SEL_SCIF5_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	MSIOF1_SS2_D,		SEL_MSIOF1_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADG_C_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADGC_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_WS2_A,		SEL_SSI2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	STP_OPWM_0_D,		SEL_SSP1_0_3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_7_4,	AUDIO_CLKOUT_D),</div><div class='hunk'>@@ -1412,10 +1413,9 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP16_31_28,	SCK5_A,			SEL_SCIF5_0),</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR17 */</div><div class='del'>-	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADG_A_0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP17_3_0,	CC5_OSCOUT),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADGA_0),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADG_B_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADGB_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	SCIF_CLK_A,		SEL_SCIF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	STP_IVCXO27_1_D,	SEL_SSP1_1_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	REMOCON_A,		SEL_REMOCON_0),</div><div class='hunk'>@@ -1499,11 +1499,6 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_C,			SEL_FM_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_D,			SEL_FM_3),</div><div class='ctx'> </div><div class='del'>-	/* I2C */</div><div class='del'>-	PINMUX_IPSR_NOGP(0,		I2C_SEL_0_1),</div><div class='del'>-	PINMUX_IPSR_NOGP(0,		I2C_SEL_3_1),</div><div class='del'>-	PINMUX_IPSR_NOGP(0,		I2C_SEL_5_1),</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Static pins can not be muxed between different functions but</div><div class='ctx'>  * still need mark entries in the pinmux list. Add each static</div><div class='hunk'>@@ -2140,15 +2135,6 @@ static const unsigned int du_disp_mux[] = {</div><div class='ctx'> 	DU_DISP_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* - HDMI ------------------------------------------------------------------- */</div><div class='del'>-static const unsigned int hdmi0_cec_pins[] = {</div><div class='del'>-	/* HDMI0_CEC */</div><div class='del'>-	RCAR_GP_PIN(7, 2),</div><div class='del'>-};</div><div class='del'>-static const unsigned int hdmi0_cec_mux[] = {</div><div class='del'>-	HDMI0_CEC_MARK,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* - HSCIF0 ----------------------------------------------------------------- */</div><div class='ctx'> static const unsigned int hscif0_data_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -4124,8 +4110,8 @@ static const unsigned int vin5_clk_mux[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='del'>-	struct sh_pfc_pin_group common[310];</div><div class='del'>-	struct sh_pfc_pin_group automotive[33];</div><div class='add'>+	struct sh_pfc_pin_group common[312];</div><div class='add'>+	struct sh_pfc_pin_group automotive[30];</div><div class='ctx'> } pinmux_groups = {</div><div class='ctx'> 	.common = {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(audio_clk_a_a),</div><div class='hunk'>@@ -4160,6 +4146,9 @@ static const struct {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(can0_data_b),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(can1_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(can_clk),</div><div class='add'>+		SH_PFC_PIN_GROUP(canfd0_data_a),</div><div class='add'>+		SH_PFC_PIN_GROUP(canfd0_data_b),</div><div class='add'>+		SH_PFC_PIN_GROUP(canfd1_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_rgb666),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_rgb888),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_clk_out_0),</div><div class='hunk'>@@ -4168,7 +4157,6 @@ static const struct {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_oddf),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_cde),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_disp),</div><div class='del'>-		SH_PFC_PIN_GROUP(hdmi0_cec),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(hscif0_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(hscif0_clk),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(hscif0_ctrl),</div><div class='hunk'>@@ -4440,9 +4428,6 @@ static const struct {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(vin5_clk),</div><div class='ctx'> 	},</div><div class='ctx'> 	.automotive = {</div><div class='del'>-		SH_PFC_PIN_GROUP(canfd0_data_a),</div><div class='del'>-		SH_PFC_PIN_GROUP(canfd0_data_b),</div><div class='del'>-		SH_PFC_PIN_GROUP(canfd1_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(drif0_ctrl_a),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(drif0_data0_a),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(drif0_data1_a),</div><div class='hunk'>@@ -4585,10 +4570,6 @@ static const char * const du_groups[] = {</div><div class='ctx'> 	"du_disp",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char * const hdmi0_groups[] = {</div><div class='del'>-	"hdmi0_cec",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const char * const hscif0_groups[] = {</div><div class='ctx'> 	"hscif0_data",</div><div class='ctx'> 	"hscif0_clk",</div><div class='hunk'>@@ -4982,8 +4963,8 @@ static const char * const vin5_groups[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='del'>-	struct sh_pfc_function common[48];</div><div class='del'>-	struct sh_pfc_function automotive[6];</div><div class='add'>+	struct sh_pfc_function common[49];</div><div class='add'>+	struct sh_pfc_function automotive[4];</div><div class='ctx'> } pinmux_functions = {</div><div class='ctx'> 	.common = {</div><div class='ctx'> 		SH_PFC_FUNCTION(audio_clk),</div><div class='hunk'>@@ -4991,8 +4972,9 @@ static const struct {</div><div class='ctx'> 		SH_PFC_FUNCTION(can0),</div><div class='ctx'> 		SH_PFC_FUNCTION(can1),</div><div class='ctx'> 		SH_PFC_FUNCTION(can_clk),</div><div class='add'>+		SH_PFC_FUNCTION(canfd0),</div><div class='add'>+		SH_PFC_FUNCTION(canfd1),</div><div class='ctx'> 		SH_PFC_FUNCTION(du),</div><div class='del'>-		SH_PFC_FUNCTION(hdmi0),</div><div class='ctx'> 		SH_PFC_FUNCTION(hscif0),</div><div class='ctx'> 		SH_PFC_FUNCTION(hscif1),</div><div class='ctx'> 		SH_PFC_FUNCTION(hscif2),</div><div class='hunk'>@@ -5036,8 +5018,6 @@ static const struct {</div><div class='ctx'> 		SH_PFC_FUNCTION(vin5),</div><div class='ctx'> 	},</div><div class='ctx'> 	.automotive = {</div><div class='del'>-		SH_PFC_FUNCTION(canfd0),</div><div class='del'>-		SH_PFC_FUNCTION(canfd1),</div><div class='ctx'> 		SH_PFC_FUNCTION(drif0),</div><div class='ctx'> 		SH_PFC_FUNCTION(drif1),</div><div class='ctx'> 		SH_PFC_FUNCTION(drif2),</div><div class='hunk'>@@ -5048,7 +5028,7 @@ static const struct {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5080,9 +5060,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5114,9 +5094,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5148,9 +5128,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5182,9 +5162,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5216,9 +5196,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5250,9 +5230,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1, GROUP(</div><div class='ctx'> 		GP_6_31_FN,	GPSR6_31,</div><div class='ctx'> 		GP_6_30_FN,	GPSR6_30,</div><div class='ctx'> 		GP_6_29_FN,	GPSR6_29,</div><div class='hunk'>@@ -5284,9 +5264,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN,	GPSR6_3,</div><div class='ctx'> 		GP_6_2_FN,	GPSR6_2,</div><div class='ctx'> 		GP_6_1_FN,	GPSR6_1,</div><div class='del'>-		GP_6_0_FN,	GPSR6_0, }</div><div class='add'>+		GP_6_0_FN,	GPSR6_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5318,14 +5298,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_7_3_FN, GPSR7_3,</div><div class='ctx'> 		GP_7_2_FN, GPSR7_2,</div><div class='ctx'> 		GP_7_1_FN, GPSR7_1,</div><div class='del'>-		GP_7_0_FN, GPSR7_0, }</div><div class='add'>+		GP_7_0_FN, GPSR7_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -5333,9 +5313,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -5343,9 +5323,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -5353,9 +5333,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -5363,9 +5343,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -5373,9 +5353,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -5383,9 +5363,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -5393,9 +5373,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -5403,9 +5383,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP7_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -5413,9 +5393,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -5423,9 +5403,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -5433,9 +5413,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4, GROUP(</div><div class='ctx'> 		IP11_31_28</div><div class='ctx'> 		IP11_27_24</div><div class='ctx'> 		IP11_23_20</div><div class='hunk'>@@ -5443,9 +5423,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP11_15_12</div><div class='ctx'> 		IP11_11_8</div><div class='ctx'> 		IP11_7_4</div><div class='del'>-		IP11_3_0 }</div><div class='add'>+		IP11_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4, GROUP(</div><div class='ctx'> 		IP12_31_28</div><div class='ctx'> 		IP12_27_24</div><div class='ctx'> 		IP12_23_20</div><div class='hunk'>@@ -5453,9 +5433,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP12_15_12</div><div class='ctx'> 		IP12_11_8</div><div class='ctx'> 		IP12_7_4</div><div class='del'>-		IP12_3_0 }</div><div class='add'>+		IP12_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4, GROUP(</div><div class='ctx'> 		IP13_31_28</div><div class='ctx'> 		IP13_27_24</div><div class='ctx'> 		IP13_23_20</div><div class='hunk'>@@ -5463,9 +5443,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP13_15_12</div><div class='ctx'> 		IP13_11_8</div><div class='ctx'> 		IP13_7_4</div><div class='del'>-		IP13_3_0 }</div><div class='add'>+		IP13_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4, GROUP(</div><div class='ctx'> 		IP14_31_28</div><div class='ctx'> 		IP14_27_24</div><div class='ctx'> 		IP14_23_20</div><div class='hunk'>@@ -5473,9 +5453,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP14_15_12</div><div class='ctx'> 		IP14_11_8</div><div class='ctx'> 		IP14_7_4</div><div class='del'>-		IP14_3_0 }</div><div class='add'>+		IP14_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4, GROUP(</div><div class='ctx'> 		IP15_31_28</div><div class='ctx'> 		IP15_27_24</div><div class='ctx'> 		IP15_23_20</div><div class='hunk'>@@ -5483,9 +5463,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP15_15_12</div><div class='ctx'> 		IP15_11_8</div><div class='ctx'> 		IP15_7_4</div><div class='del'>-		IP15_3_0 }</div><div class='add'>+		IP15_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4, GROUP(</div><div class='ctx'> 		IP16_31_28</div><div class='ctx'> 		IP16_27_24</div><div class='ctx'> 		IP16_23_20</div><div class='hunk'>@@ -5493,9 +5473,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP16_15_12</div><div class='ctx'> 		IP16_11_8</div><div class='ctx'> 		IP16_7_4</div><div class='del'>-		IP16_3_0 }</div><div class='add'>+		IP16_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4, GROUP(</div><div class='ctx'> 		IP17_31_28</div><div class='ctx'> 		IP17_27_24</div><div class='ctx'> 		IP17_23_20</div><div class='hunk'>@@ -5503,9 +5483,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP17_15_12</div><div class='ctx'> 		IP17_11_8</div><div class='ctx'> 		IP17_7_4</div><div class='del'>-		IP17_3_0 }</div><div class='add'>+		IP17_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR18", 0xe6060248, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR18", 0xe6060248, 32, 4, GROUP(</div><div class='ctx'> 		/* IP18_31_28 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_27_24 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_23_20 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -5513,7 +5493,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP18_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_11_8  */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP18_7_4</div><div class='del'>-		IP18_3_0 }</div><div class='add'>+		IP18_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -5521,8 +5501,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     3, 2, 3, 1, 1, 1, 1, 1, 2, 1,</div><div class='del'>-			     1, 2, 1, 1, 1, 2, 2, 1, 2, 3) {</div><div class='add'>+			     GROUP(3, 2, 3, 1, 1, 1, 1, 1, 2, 1, 1, 2,</div><div class='add'>+				   1, 1, 1, 2, 2, 1, 2, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL0_31_30_29</div><div class='ctx'> 		MOD_SEL0_28_27</div><div class='ctx'> 		MOD_SEL0_26_25_24</div><div class='hunk'>@@ -5543,11 +5524,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_5</div><div class='ctx'> 		MOD_SEL0_4_3</div><div class='ctx'> 		/* RESERVED 2, 1, 0 */</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,</div><div class='del'>-			     2, 3, 1, 2, 3, 1, 1, 2, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(2, 3, 1, 2, 3, 1, 1, 2, 1, 2, 1, 1,</div><div class='add'>+				   1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL1_31_30</div><div class='ctx'> 		MOD_SEL1_29_28_27</div><div class='ctx'> 		MOD_SEL1_26</div><div class='hunk'>@@ -5570,11 +5552,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL1_3</div><div class='ctx'> 		MOD_SEL1_2</div><div class='ctx'> 		MOD_SEL1_1</div><div class='del'>-		MOD_SEL1_0 }</div><div class='add'>+		MOD_SEL1_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xe6060508, 32,</div><div class='del'>-			     1, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     4, 4, 4, 3, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 4, 4, 4, 3, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL2_31</div><div class='ctx'> 		MOD_SEL2_30</div><div class='ctx'> 		MOD_SEL2_29</div><div class='hunk'>@@ -5600,7 +5583,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED 3, 2, 1 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		MOD_SEL2_0 }</div><div class='add'>+		MOD_SEL2_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='hunk'>@@ -5721,7 +5704,7 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> 		{ RCAR_GP_PIN(0, 15),   24, 3 },	/* D15 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  0),   20, 3 },	/* AVS1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  1),   16, 3 },	/* AVS2 */</div><div class='del'>-		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* HDMI0_CEC */</div><div class='add'>+		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* GP7_02 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  3),    8, 3 },	/* GP7_03 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 7),  4, 2 },	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 8),  0, 2 },	/* DU_DOTCLKIN1 */</div><div class='hunk'>@@ -5855,10 +5838,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='ctx'> 	POCCTRL,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='ctx'> 	[POCCTRL] = { 0xe6060380, },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -5975,7 +5960,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {</div><div class='ctx'> 		[25] = RCAR_GP_PIN(0, 15),	/* D15 */</div><div class='ctx'> 		[26] = RCAR_GP_PIN(7,  0),	/* AVS1 */</div><div class='ctx'> 		[27] = RCAR_GP_PIN(7,  1),	/* AVS2 */</div><div class='del'>-		[28] = RCAR_GP_PIN(7,  2),	/* HDMI0_CEC */</div><div class='add'>+		[28] = RCAR_GP_PIN(7,  2),	/* GP7_02 */</div><div class='ctx'> 		[29] = RCAR_GP_PIN(7,  3),	/* GP7_03 */</div><div class='ctx'> 		[30] = PIN_A_NUMBER('P', 7),	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		[31] = PIN_A_NUMBER('P', 8),	/* DU_DOTCLKIN1 */</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c b/drivers/pinctrl/sh-pfc/pfc-r8a77965.c<br/>index 14c4b671cddf..090024355eba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77965.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77965.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77965.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a77965.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * R8A77965 processor support - PFC hardware block.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2018 Jacopo Mondi &lt;jacopo+renesas@jmondi.org&gt;</div><div class='del'>- * Copyright (C) 2016 Renesas Electronics Corp.</div><div class='add'>+ * Copyright (C) 2016-2019 Renesas Electronics Corp.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  * Copyright (C) 2015  Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -207,7 +208,7 @@</div><div class='ctx'> </div><div class='ctx'> /* GPSR7 */</div><div class='ctx'> #define GPSR7_3		FM(GP7_03)</div><div class='del'>-#define GPSR7_2		FM(HDMI0_CEC)</div><div class='add'>+#define GPSR7_2		FM(GP7_02)</div><div class='ctx'> #define GPSR7_1		FM(AVS2)</div><div class='ctx'> #define GPSR7_0		FM(AVS1)</div><div class='ctx'> </div><div class='hunk'>@@ -356,7 +357,7 @@</div><div class='ctx'> #define IP16_23_20	FM(SSI_SDATA7)		FM(HCTS2_N_B)	FM(MSIOF1_RXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SDEN1_A)	FM(STP_ISEN_1_A)	FM(RIF1_D0_A)	FM(RIF3_D0_A)		F_(0, 0)	FM(TCLK2_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_27_24	FM(SSI_SDATA8)		FM(HRTS2_N_B)	FM(MSIOF1_TXD_C)	F_(0, 0)			F_(0, 0)	FM(TS_SPSYNC1_A)FM(STP_ISSYNC_1_A)	FM(RIF1_D1_A)	FM(RIF3_D1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP16_31_28	FM(SSI_SDATA9_A)	FM(HSCK2_B)	FM(MSIOF1_SS1_C)	FM(HSCK1_A)			FM(SSI_WS1_B)	FM(SCK1)	FM(STP_IVCXO27_1_A)	FM(SCK5_A)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP17_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(CC5_OSCOUT)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP17_3_0	FM(AUDIO_CLKA_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_7_4	FM(AUDIO_CLKB_B)	FM(SCIF_CLK_A)	F_(0, 0)		F_(0, 0)			F_(0, 0)	F_(0, 0)	FM(STP_IVCXO27_1_D)	FM(REMOCON_A)	F_(0, 0)		F_(0, 0)	FM(TCLK1_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_11_8	FM(USB0_PWEN)		F_(0, 0)	F_(0, 0)		FM(SIM0_RST_C)			F_(0, 0)	FM(TS_SCK1_D)	FM(STP_ISCLK_1_D)	FM(BPFCLK_B)	FM(RIF3_CLK_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) FM(HSCK2_C) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP17_15_12	FM(USB0_OVC)		F_(0, 0)	F_(0, 0)		FM(SIM0_D_C)			F_(0, 0)	FM(TS_SDAT1_D)	FM(STP_ISD_1_D)		F_(0, 0)	FM(RIF3_SYNC_B)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) FM(HRX2_C) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -467,7 +468,7 @@ FM(IP16_31_28)	IP16_31_28	FM(IP17_31_28)	IP17_31_28</div><div class='ctx'> #define MOD_SEL0_9_8		FM(SEL_DRIF1_0)		FM(SEL_DRIF1_1)		FM(SEL_DRIF1_2)		F_(0, 0)</div><div class='ctx'> #define MOD_SEL0_7_6		FM(SEL_DRIF0_0)		FM(SEL_DRIF0_1)		FM(SEL_DRIF0_2)		F_(0, 0)</div><div class='ctx'> #define MOD_SEL0_5		FM(SEL_CANFD0_0)	FM(SEL_CANFD0_1)</div><div class='del'>-#define MOD_SEL0_4_3		FM(SEL_ADG_A_0)		FM(SEL_ADG_A_1)		FM(SEL_ADG_A_2)		FM(SEL_ADG_A_3)</div><div class='add'>+#define MOD_SEL0_4_3		FM(SEL_ADGA_0)		FM(SEL_ADGA_1)		FM(SEL_ADGA_2)		FM(SEL_ADGA_3)</div><div class='ctx'> </div><div class='ctx'> /* MOD_SEL1 */			/* 0 */			/* 1 */			/* 2 */			/* 3 */			/* 4 */			/* 5 */			/* 6 */			/* 7 */</div><div class='ctx'> #define MOD_SEL1_31_30		FM(SEL_TSIF1_0)		FM(SEL_TSIF1_1)		FM(SEL_TSIF1_2)		FM(SEL_TSIF1_3)</div><div class='hunk'>@@ -500,12 +501,12 @@ FM(IP16_31_28)	IP16_31_28	FM(IP17_31_28)	IP17_31_28</div><div class='ctx'> #define MOD_SEL2_28_27		FM(SEL_FM_0)		FM(SEL_FM_1)		FM(SEL_FM_2)		FM(SEL_FM_3)</div><div class='ctx'> #define MOD_SEL2_26		FM(SEL_SCIF5_0)		FM(SEL_SCIF5_1)</div><div class='ctx'> #define MOD_SEL2_25_24_23	FM(SEL_I2C6_0)		FM(SEL_I2C6_1)		FM(SEL_I2C6_2)		F_(0, 0)		F_(0, 0)		F_(0, 0)		F_(0, 0)		F_(0, 0)</div><div class='del'>-#define MOD_SEL2_22		FM(SEL_NDFC_0)		FM(SEL_NDFC_1)</div><div class='add'>+#define MOD_SEL2_22		FM(SEL_NDF_0)		FM(SEL_NDF_1)</div><div class='ctx'> #define MOD_SEL2_21		FM(SEL_SSI2_0)		FM(SEL_SSI2_1)</div><div class='ctx'> #define MOD_SEL2_20		FM(SEL_SSI9_0)		FM(SEL_SSI9_1)</div><div class='ctx'> #define MOD_SEL2_19		FM(SEL_TIMER_TMU2_0)	FM(SEL_TIMER_TMU2_1)</div><div class='del'>-#define MOD_SEL2_18		FM(SEL_ADG_B_0)		FM(SEL_ADG_B_1)</div><div class='del'>-#define MOD_SEL2_17		FM(SEL_ADG_C_0)		FM(SEL_ADG_C_1)</div><div class='add'>+#define MOD_SEL2_18		FM(SEL_ADGB_0)		FM(SEL_ADGB_1)</div><div class='add'>+#define MOD_SEL2_17		FM(SEL_ADGC_0)		FM(SEL_ADGC_1)</div><div class='ctx'> #define MOD_SEL2_0		FM(SEL_VIN4_0)		FM(SEL_VIN4_1)</div><div class='ctx'> </div><div class='ctx'> #define PINMUX_MOD_SELS	\</div><div class='hunk'>@@ -557,6 +558,9 @@ MOD_SEL0_4_3		MOD_SEL1_4 \</div><div class='ctx'> 	FM(DU_DOTCLKIN0) FM(DU_DOTCLKIN1) FM(DU_DOTCLKIN3) \</div><div class='ctx'> 	FM(TMS) FM(TDO) FM(ASEBRK) FM(MLB_REF) FM(TDI) FM(TCK) FM(TRST) FM(EXTALR)</div><div class='ctx'> </div><div class='add'>+#define PINMUX_PHYS \</div><div class='add'>+	FM(SCL0) FM(SDA0) FM(SCL3) FM(SDA3) FM(SCL5) FM(SDA5)</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	PINMUX_RESERVED = 0,</div><div class='ctx'> </div><div class='hunk'>@@ -582,6 +586,7 @@ enum {</div><div class='ctx'> 	PINMUX_IPSR</div><div class='ctx'> 	PINMUX_MOD_SELS</div><div class='ctx'> 	PINMUX_STATIC</div><div class='add'>+	PINMUX_PHYS</div><div class='ctx'> 	PINMUX_MARK_END,</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -594,7 +599,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_SINGLE(AVS2),</div><div class='ctx'> 	PINMUX_SINGLE(CLKOUT),</div><div class='ctx'> 	PINMUX_SINGLE(GP7_03),</div><div class='del'>-	PINMUX_SINGLE(HDMI0_CEC),</div><div class='add'>+	PINMUX_SINGLE(GP7_02),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_RXD),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_SCK),</div><div class='ctx'> 	PINMUX_SINGLE(MSIOF0_TXD),</div><div class='hunk'>@@ -619,13 +624,15 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP0_15_12,	TX4_A,			SEL_SCIF4_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_19_16,	FSCLKST2_N_A),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP0_19_16,	AVB_AVTP_MATCH_A,	SEL_ETHERAVB_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP0_19_16,	MSIOF2_RXD_C,		SEL_MSIOF2_2),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP0_19_16,	CTS4_N_A,		SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_19_16,	AVB_AVTP_MATCH_A,	I2C_SEL_5_0, SEL_ETHERAVB_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_19_16,	MSIOF2_RXD_C,	I2C_SEL_5_0, SEL_MSIOF2_2),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_19_16,	CTS4_N_A,	I2C_SEL_5_0, SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_PHYS(IP0_19_16,	SCL5,			I2C_SEL_5_1),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP0_23_20,	AVB_AVTP_CAPTURE_A,	SEL_ETHERAVB_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP0_23_20,	MSIOF2_TXD_C,		SEL_MSIOF2_2),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP0_23_20,	RTS4_N_A,		SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_23_20,	AVB_AVTP_CAPTURE_A,	I2C_SEL_5_0, SEL_ETHERAVB_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_23_20,	MSIOF2_TXD_C,		I2C_SEL_5_0, SEL_MSIOF2_2),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP0_23_20,	RTS4_N_A,		I2C_SEL_5_0, SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_PHYS(IP0_23_20,	SDA5,			I2C_SEL_5_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_27_24,	IRQ0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_27_24,	QPOLB),</div><div class='hunk'>@@ -678,14 +685,16 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP1_19_16,	VI4_DATA6_B,		SEL_VIN4_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP1_19_16,	IECLK_B,		SEL_IEBUS_1),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_23_20,	PWM1_A,			SEL_PWM1_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_23_20,	HRX3_D,			SEL_HSCIF3_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_23_20,	VI4_DATA7_B,		SEL_VIN4_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_23_20,	IERX_B,			SEL_IEBUS_1),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_23_20,	PWM1_A,		I2C_SEL_3_0,	SEL_PWM1_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_23_20,	HRX3_D,		I2C_SEL_3_0,	SEL_HSCIF3_3),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_23_20,	VI4_DATA7_B,	I2C_SEL_3_0,	SEL_VIN4_1),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_23_20,	IERX_B,		I2C_SEL_3_0,	SEL_IEBUS_1),</div><div class='add'>+	PINMUX_IPSR_PHYS(IP0_23_20,	SCL3,		I2C_SEL_3_1),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_27_24,	PWM2_A,			SEL_PWM2_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_27_24,	HTX3_D,			SEL_HSCIF3_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP1_27_24,	IETX_B,			SEL_IEBUS_1),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_27_24,	PWM2_A,		I2C_SEL_3_0,	SEL_PWM2_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_27_24,	HTX3_D,		I2C_SEL_3_0,	SEL_HSCIF3_3),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP1_27_24,	IETX_B,		I2C_SEL_3_0,	SEL_IEBUS_1),</div><div class='add'>+	PINMUX_IPSR_PHYS(IP1_27_24,	SDA3,		I2C_SEL_3_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP1_31_28,	A0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP1_31_28,	LCDOUT16),</div><div class='hunk'>@@ -1016,35 +1025,35 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_15_12,	SD1_CMD),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_15_12,	MSIOF1_SYNC_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_15_12,	NFCE_N_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_15_12,	NFCE_N_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_15_12,	SIM0_D_A,		SEL_SIMCARD_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_15_12,	STP_IVCXO27_1_B,	SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_19_16,	SD1_DAT0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_19_16,	SD2_DAT4),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,	MSIOF1_RXD_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_19_16,	NFWP_N_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_19_16,	NFWP_N_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,	TS_SCK1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,	STP_ISCLK_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_23_20,	SD1_DAT1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_23_20,	SD2_DAT5),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_23_20,	MSIOF1_TXD_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_23_20,	NFDATA14_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_23_20,	NFDATA14_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_23_20,	TS_SPSYNC1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_23_20,	STP_ISSYNC_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_27_24,	SD1_DAT2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_27_24,	SD2_DAT6),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_27_24,	MSIOF1_SS1_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_27_24,	NFDATA15_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_27_24,	NFDATA15_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_27_24,	TS_SDAT1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_27_24,	STP_ISD_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_31_28,	SD1_DAT3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_31_28,	SD2_DAT7),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_31_28,	MSIOF1_SS2_G,		SEL_MSIOF1_6),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_31_28,	NFRB_N_B,		SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_31_28,	NFRB_N_B,		SEL_NDF_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_31_28,	TS_SDEN1_B,		SEL_TSIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_31_28,	STP_ISEN_1_B,		SEL_SSP1_1_1),</div><div class='ctx'> </div><div class='hunk'>@@ -1111,26 +1120,28 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,	NFCLE),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_11_8,	SD0_CD),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_11_8,	NFDATA14_A,		SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_11_8,	NFDATA14_A,		SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	SCL2_B,			SEL_I2C2_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,	SIM0_RST_A,		SEL_SIMCARD_0),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_15_12,	SD0_WP),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_15_12,	NFDATA15_A,		SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_15_12,	NFDATA15_A,		SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_15_12,	SDA2_B,			SEL_I2C2_1),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_GPSR(IP11_19_16,	SD1_CD),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_19_16,	NFRB_N_A,		SEL_NDFC_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_19_16,	SIM0_CLK_B,		SEL_SIMCARD_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_19_16,	SD1_CD,			I2C_SEL_0_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP11_19_16,	NFRB_N_A,	I2C_SEL_0_0, SEL_NDF_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP11_19_16,	SIM0_CLK_B,	I2C_SEL_0_0, SEL_SIMCARD_1),</div><div class='add'>+	PINMUX_IPSR_PHYS(IP11_19_16,	SCL0,			I2C_SEL_0_1),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_GPSR(IP11_23_20,	SD1_WP),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_23_20,	NFCE_N_A,		SEL_NDFC_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_23_20,	SIM0_D_B,		SEL_SIMCARD_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_23_20,	SD1_WP,			I2C_SEL_0_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP11_23_20,	NFCE_N_A,	I2C_SEL_0_0, SEL_NDF_0),</div><div class='add'>+	PINMUX_IPSR_PHYS_MSEL(IP11_23_20,	SIM0_D_B,	I2C_SEL_0_0, SEL_SIMCARD_1),</div><div class='add'>+	PINMUX_IPSR_PHYS(IP11_23_20,	SDA0,			I2C_SEL_0_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_27_24,	SCK0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	HSCK1_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	MSIOF1_SS2_B,		SEL_MSIOF1_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADG_C_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADGC_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	SDA2_A,			SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	SIM0_RST_B,		SEL_SIMCARD_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,	STP_OPWM_0_C,		SEL_SSP1_0_2),</div><div class='hunk'>@@ -1163,7 +1174,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP12_11_8,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	HRTS1_N_B,		SEL_HSCIF1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	MSIOF1_SS1_B,		SEL_MSIOF1_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADG_A_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADGA_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	SCL2_A,			SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	STP_IVCXO27_1_C,	SEL_SSP1_1_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_11_8,	RIF0_SYNC_B,		SEL_DRIF0_1),</div><div class='hunk'>@@ -1222,7 +1233,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP13_11_8,	HSCK0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	MSIOF1_SCK_D,		SEL_MSIOF1_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADG_B_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADGB_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	SSI_SDATA1_B,		SEL_SSI1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	TS_SCK0_D,		SEL_TSIF0_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_11_8,	STP_ISCLK_0_D,		SEL_SSP1_0_3),</div><div class='hunk'>@@ -1268,8 +1279,8 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	/* IPSR14 */</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	MSIOF0_SS1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	RX5_A,			SEL_SCIF5_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_3_0,	NFWP_N_A,		SEL_NDFC_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADG_A_2),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_3_0,	NFWP_N_A,		SEL_NDF_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADGA_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	SSI_SCK2_A,		SEL_SSI2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_3_0,	STP_IVCXO27_0_C,	SEL_SSP1_0_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_3_0,	AUDIO_CLKOUT3_A),</div><div class='hunk'>@@ -1278,7 +1289,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_7_4,	MSIOF0_SS2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	TX5_A,			SEL_SCIF5_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	MSIOF1_SS2_D,		SEL_MSIOF1_3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADG_C_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADGC_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_WS2_A,		SEL_SSI2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP14_7_4,	STP_OPWM_0_D,		SEL_SSP1_0_3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP14_7_4,	AUDIO_CLKOUT_D),</div><div class='hunk'>@@ -1407,10 +1418,9 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP16_31_28,	SCK5_A,			SEL_SCIF5_0),</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR17 */</div><div class='del'>-	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADG_A_0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP17_3_0,	CC5_OSCOUT),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADGA_0),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADG_B_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADGB_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	SCIF_CLK_A,		SEL_SCIF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	STP_IVCXO27_1_D,	SEL_SSP1_1_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP17_7_4,	REMOCON_A,		SEL_REMOCON_0),</div><div class='hunk'>@@ -1494,11 +1504,6 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_C,			SEL_FM_2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_D,			SEL_FM_3),</div><div class='ctx'> </div><div class='del'>-	/* I2C */</div><div class='del'>-	PINMUX_IPSR_NOGP(0,		I2C_SEL_0_1),</div><div class='del'>-	PINMUX_IPSR_NOGP(0,		I2C_SEL_3_1),</div><div class='del'>-	PINMUX_IPSR_NOGP(0,		I2C_SEL_5_1),</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Static pins can not be muxed between different functions but</div><div class='ctx'>  * still need mark entries in the pinmux list. Add each static</div><div class='hunk'>@@ -2478,52 +2483,92 @@ static const unsigned int hscif4_data_b_mux[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - I2C -------------------------------------------------------------------- */</div><div class='add'>+static const unsigned int i2c0_pins[] = {</div><div class='add'>+	/* SCL, SDA */</div><div class='add'>+	RCAR_GP_PIN(3, 14), RCAR_GP_PIN(3, 15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int i2c0_mux[] = {</div><div class='add'>+	SCL0_MARK, SDA0_MARK,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c1_a_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(5, 11), RCAR_GP_PIN(5, 10),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c1_a_mux[] = {</div><div class='ctx'> 	SDA1_A_MARK, SCL1_A_MARK,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c1_b_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(5, 24), RCAR_GP_PIN(5, 23),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c1_b_mux[] = {</div><div class='ctx'> 	SDA1_B_MARK, SCL1_B_MARK,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c2_a_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(5, 0), RCAR_GP_PIN(5, 4),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c2_a_mux[] = {</div><div class='ctx'> 	SDA2_A_MARK, SCL2_A_MARK,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c2_b_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(3, 13), RCAR_GP_PIN(3, 12),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c2_b_mux[] = {</div><div class='ctx'> 	SDA2_B_MARK, SCL2_B_MARK,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static const unsigned int i2c3_pins[] = {</div><div class='add'>+	/* SCL, SDA */</div><div class='add'>+	RCAR_GP_PIN(2, 7), RCAR_GP_PIN(2, 8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int i2c3_mux[] = {</div><div class='add'>+	SCL3_MARK, SDA3_MARK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int i2c5_pins[] = {</div><div class='add'>+	/* SCL, SDA */</div><div class='add'>+	RCAR_GP_PIN(2, 13), RCAR_GP_PIN(2, 14),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int i2c5_mux[] = {</div><div class='add'>+	SCL5_MARK, SDA5_MARK,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c6_a_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(1, 8), RCAR_GP_PIN(1, 11),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c6_a_mux[] = {</div><div class='ctx'> 	SDA6_A_MARK, SCL6_A_MARK,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c6_b_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(1, 26), RCAR_GP_PIN(1, 25),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c6_b_mux[] = {</div><div class='ctx'> 	SDA6_B_MARK, SCL6_B_MARK,</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c6_c_pins[] = {</div><div class='ctx'> 	/* SDA, SCL */</div><div class='ctx'> 	RCAR_GP_PIN(0, 15), RCAR_GP_PIN(0, 14),</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static const unsigned int i2c6_c_mux[] = {</div><div class='ctx'> 	SDA6_C_MARK, SCL6_C_MARK,</div><div class='ctx'> };</div><div class='hunk'>@@ -4413,10 +4458,13 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif4_clk),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif4_ctrl),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(hscif4_data_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(i2c0),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c1_a),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c1_b),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c2_a),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c2_b),</div><div class='add'>+	SH_PFC_PIN_GROUP(i2c3),</div><div class='add'>+	SH_PFC_PIN_GROUP(i2c5),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c6_a),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c6_b),</div><div class='ctx'> 	SH_PFC_PIN_GROUP(i2c6_c),</div><div class='hunk'>@@ -4807,6 +4855,10 @@ static const char * const hscif4_groups[] = {</div><div class='ctx'> 	"hscif4_data_b",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const char * const i2c0_groups[] = {</div><div class='add'>+	"i2c0",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const char * const i2c1_groups[] = {</div><div class='ctx'> 	"i2c1_a",</div><div class='ctx'> 	"i2c1_b",</div><div class='hunk'>@@ -4817,6 +4869,14 @@ static const char * const i2c2_groups[] = {</div><div class='ctx'> 	"i2c2_b",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const char * const i2c3_groups[] = {</div><div class='add'>+	"i2c3",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const i2c5_groups[] = {</div><div class='add'>+	"i2c5",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const char * const i2c6_groups[] = {</div><div class='ctx'> 	"i2c6_a",</div><div class='ctx'> 	"i2c6_b",</div><div class='hunk'>@@ -5166,8 +5226,11 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif2),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif3),</div><div class='ctx'> 	SH_PFC_FUNCTION(hscif4),</div><div class='add'>+	SH_PFC_FUNCTION(i2c0),</div><div class='ctx'> 	SH_PFC_FUNCTION(i2c1),</div><div class='ctx'> 	SH_PFC_FUNCTION(i2c2),</div><div class='add'>+	SH_PFC_FUNCTION(i2c3),</div><div class='add'>+	SH_PFC_FUNCTION(i2c5),</div><div class='ctx'> 	SH_PFC_FUNCTION(i2c6),</div><div class='ctx'> 	SH_PFC_FUNCTION(intc_ex),</div><div class='ctx'> 	SH_PFC_FUNCTION(msiof0),</div><div class='hunk'>@@ -5205,7 +5268,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5237,9 +5300,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5271,9 +5334,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5305,9 +5368,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5339,9 +5402,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5373,9 +5436,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5407,9 +5470,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1, GROUP(</div><div class='ctx'> 		GP_6_31_FN,	GPSR6_31,</div><div class='ctx'> 		GP_6_30_FN,	GPSR6_30,</div><div class='ctx'> 		GP_6_29_FN,	GPSR6_29,</div><div class='hunk'>@@ -5441,9 +5504,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN,	GPSR6_3,</div><div class='ctx'> 		GP_6_2_FN,	GPSR6_2,</div><div class='ctx'> 		GP_6_1_FN,	GPSR6_1,</div><div class='del'>-		GP_6_0_FN,	GPSR6_0, }</div><div class='add'>+		GP_6_0_FN,	GPSR6_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR7", 0xe606011c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -5475,14 +5538,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_7_3_FN, GPSR7_3,</div><div class='ctx'> 		GP_7_2_FN, GPSR7_2,</div><div class='ctx'> 		GP_7_1_FN, GPSR7_1,</div><div class='del'>-		GP_7_0_FN, GPSR7_0, }</div><div class='add'>+		GP_7_0_FN, GPSR7_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -5490,9 +5553,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -5500,9 +5563,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -5510,9 +5573,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -5520,9 +5583,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -5530,9 +5593,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -5540,9 +5603,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -5550,9 +5613,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -5560,9 +5623,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP7_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -5570,9 +5633,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -5580,9 +5643,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -5590,9 +5653,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4, GROUP(</div><div class='ctx'> 		IP11_31_28</div><div class='ctx'> 		IP11_27_24</div><div class='ctx'> 		IP11_23_20</div><div class='hunk'>@@ -5600,9 +5663,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP11_15_12</div><div class='ctx'> 		IP11_11_8</div><div class='ctx'> 		IP11_7_4</div><div class='del'>-		IP11_3_0 }</div><div class='add'>+		IP11_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4, GROUP(</div><div class='ctx'> 		IP12_31_28</div><div class='ctx'> 		IP12_27_24</div><div class='ctx'> 		IP12_23_20</div><div class='hunk'>@@ -5610,9 +5673,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP12_15_12</div><div class='ctx'> 		IP12_11_8</div><div class='ctx'> 		IP12_7_4</div><div class='del'>-		IP12_3_0 }</div><div class='add'>+		IP12_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4, GROUP(</div><div class='ctx'> 		IP13_31_28</div><div class='ctx'> 		IP13_27_24</div><div class='ctx'> 		IP13_23_20</div><div class='hunk'>@@ -5620,9 +5683,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP13_15_12</div><div class='ctx'> 		IP13_11_8</div><div class='ctx'> 		IP13_7_4</div><div class='del'>-		IP13_3_0 }</div><div class='add'>+		IP13_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4, GROUP(</div><div class='ctx'> 		IP14_31_28</div><div class='ctx'> 		IP14_27_24</div><div class='ctx'> 		IP14_23_20</div><div class='hunk'>@@ -5630,9 +5693,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP14_15_12</div><div class='ctx'> 		IP14_11_8</div><div class='ctx'> 		IP14_7_4</div><div class='del'>-		IP14_3_0 }</div><div class='add'>+		IP14_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4, GROUP(</div><div class='ctx'> 		IP15_31_28</div><div class='ctx'> 		IP15_27_24</div><div class='ctx'> 		IP15_23_20</div><div class='hunk'>@@ -5640,9 +5703,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP15_15_12</div><div class='ctx'> 		IP15_11_8</div><div class='ctx'> 		IP15_7_4</div><div class='del'>-		IP15_3_0 }</div><div class='add'>+		IP15_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR16", 0xe6060240, 32, 4, GROUP(</div><div class='ctx'> 		IP16_31_28</div><div class='ctx'> 		IP16_27_24</div><div class='ctx'> 		IP16_23_20</div><div class='hunk'>@@ -5650,9 +5713,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP16_15_12</div><div class='ctx'> 		IP16_11_8</div><div class='ctx'> 		IP16_7_4</div><div class='del'>-		IP16_3_0 }</div><div class='add'>+		IP16_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4, GROUP(</div><div class='ctx'> 		IP17_31_28</div><div class='ctx'> 		IP17_27_24</div><div class='ctx'> 		IP17_23_20</div><div class='hunk'>@@ -5660,9 +5723,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP17_15_12</div><div class='ctx'> 		IP17_11_8</div><div class='ctx'> 		IP17_7_4</div><div class='del'>-		IP17_3_0 }</div><div class='add'>+		IP17_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR18", 0xe6060248, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR18", 0xe6060248, 32, 4, GROUP(</div><div class='ctx'> 		/* IP18_31_28 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_27_24 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_23_20 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -5670,7 +5733,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP18_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP18_11_8  */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP18_7_4</div><div class='del'>-		IP18_3_0 }</div><div class='add'>+		IP18_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -5678,8 +5741,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     3, 2, 3, 1, 1, 1, 1, 1, 2, 1,</div><div class='del'>-			     1, 2, 1, 1, 1, 2, 2, 1, 2, 3) {</div><div class='add'>+			     GROUP(3, 2, 3, 1, 1, 1, 1, 1, 2, 1, 1, 2,</div><div class='add'>+				   1, 1, 1, 2, 2, 1, 2, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL0_31_30_29</div><div class='ctx'> 		MOD_SEL0_28_27</div><div class='ctx'> 		MOD_SEL0_26_25_24</div><div class='hunk'>@@ -5700,11 +5764,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_5</div><div class='ctx'> 		MOD_SEL0_4_3</div><div class='ctx'> 		/* RESERVED 2, 1, 0 */</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,</div><div class='del'>-			     2, 3, 1, 2, 3, 1, 1, 2, 1,</div><div class='del'>-			     2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(2, 3, 1, 2, 3, 1, 1, 2, 1, 2, 1, 1,</div><div class='add'>+				   1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL1_31_30</div><div class='ctx'> 		MOD_SEL1_29_28_27</div><div class='ctx'> 		MOD_SEL1_26</div><div class='hunk'>@@ -5727,11 +5792,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL1_3</div><div class='ctx'> 		MOD_SEL1_2</div><div class='ctx'> 		MOD_SEL1_1</div><div class='del'>-		MOD_SEL1_0 }</div><div class='add'>+		MOD_SEL1_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xe6060508, 32,</div><div class='del'>-			     1, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-			     4, 4, 4, 3, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 4, 4, 4, 3, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL2_31</div><div class='ctx'> 		MOD_SEL2_30</div><div class='ctx'> 		MOD_SEL2_29</div><div class='hunk'>@@ -5757,7 +5823,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED 3, 2, 1 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		MOD_SEL2_0 }</div><div class='add'>+		MOD_SEL2_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='hunk'>@@ -5878,7 +5944,7 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> 		{ RCAR_GP_PIN(0, 15),   24, 3 },	/* D15 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  0),   20, 3 },	/* AVS1 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  1),   16, 3 },	/* AVS2 */</div><div class='del'>-		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* HDMI0_CEC */</div><div class='add'>+		{ RCAR_GP_PIN(7,  2),   12, 3 },	/* GP7_02 */</div><div class='ctx'> 		{ RCAR_GP_PIN(7,  3),    8, 3 },	/* GP7_03 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 7),  4, 2 },	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		{ PIN_A_NUMBER('P', 8),  0, 2 },	/* DU_DOTCLKIN1 */</div><div class='hunk'>@@ -6012,10 +6078,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='ctx'> 	POCCTRL,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='ctx'> 	[POCCTRL] = { 0xe6060380, },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -6132,7 +6200,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {</div><div class='ctx'> 		[25] = RCAR_GP_PIN(0, 15),	/* D15 */</div><div class='ctx'> 		[26] = RCAR_GP_PIN(7,  0),	/* AVS1 */</div><div class='ctx'> 		[27] = RCAR_GP_PIN(7,  1),	/* AVS2 */</div><div class='del'>-		[28] = RCAR_GP_PIN(7,  2),	/* HDMI0_CEC */</div><div class='add'>+		[28] = RCAR_GP_PIN(7,  2),	/* GP7_02 */</div><div class='ctx'> 		[29] = RCAR_GP_PIN(7,  3),	/* GP7_03 */</div><div class='ctx'> 		[30] = PIN_A_NUMBER('P', 7),	/* DU_DOTCLKIN0 */</div><div class='ctx'> 		[31] = PIN_A_NUMBER('P', 8),	/* DU_DOTCLKIN1 */</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c<br/>index c5e67ba29f7c..2d76b548b942 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77970.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77970.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77970.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a77970.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  * Copyright (C) 2015  Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.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'> </div><div class='hunk'>@@ -171,19 +172,19 @@</div><div class='ctx'> #define IP2_15_12	FM(DU_EXHSYNC_DU_HSYNC)		FM(HRX0)		F_(0, 0)	FM(A19)		FM(IRQ3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_19_16	FM(DU_EXVSYNC_DU_VSYNC)		FM(MSIOF3_SCK)		F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_23_20	FM(DU_EXODDF_DU_ODDF_DISP_CDE)	FM(MSIOF3_SYNC)		F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP2_27_24	FM(IRQ0)			FM(CC5_OSCOUT)		F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP2_27_24	FM(IRQ0)			F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_31_28	FM(VI0_CLK)			FM(MSIOF2_SCK)		FM(SCK3)	F_(0, 0)	FM(HSCK3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_3_0		FM(VI0_CLKENB)			FM(MSIOF2_RXD)		FM(RX3)		FM(RD_WR_N)	FM(HCTS3_N)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_7_4		FM(VI0_HSYNC_N)			FM(MSIOF2_TXD)		FM(TX3)		F_(0, 0)	FM(HRTS3_N)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_11_8	FM(VI0_VSYNC_N)			FM(MSIOF2_SYNC)		FM(CTS3_N)	F_(0, 0)	FM(HTX3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP3_15_12	FM(VI0_DATA0)			FM(MSIOF2_SS1)		FM(RTS3_N_TANS)	F_(0, 0)	FM(HRX3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP3_15_12	FM(VI0_DATA0)			FM(MSIOF2_SS1)		FM(RTS3_N)	F_(0, 0)	FM(HRX3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_19_16	FM(VI0_DATA1)			FM(MSIOF2_SS2)		FM(SCK1)	F_(0, 0)	FM(SPEEDIN_A)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_23_20	FM(VI0_DATA2)			FM(AVB0_AVTP_PPS)	FM(SDA3_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_27_24	FM(VI0_DATA3)			FM(HSCK1)		FM(SCL3_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_31_28	FM(VI0_DATA4)			FM(HRTS1_N)		FM(RX1_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_3_0		FM(VI0_DATA5)			FM(HCTS1_N)		FM(TX1_A)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_7_4		FM(VI0_DATA6)			FM(HTX1)		FM(CTS1_N)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP4_11_8	FM(VI0_DATA7)			FM(HRX1)		FM(RTS1_N_TANS)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP4_11_8	FM(VI0_DATA7)			FM(HRX1)		FM(RTS1_N)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_15_12	FM(VI0_DATA8)			FM(HSCK2)		FM(PWM0_A)	FM(A22)		F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_19_16	FM(VI0_DATA9)			FM(HCTS2_N)		FM(PWM1_A)	FM(A23)		FM(FSO_CFE_0_N_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_23_20	FM(VI0_DATA10)			FM(HRTS2_N)		FM(PWM2_A)	FM(A24)		FM(FSO_CFE_1_N_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -198,18 +199,18 @@</div><div class='ctx'> #define IP5_27_24	FM(VI1_DATA2)			FM(CANFD0_TX_B)		F_(0, 0)	FM(D5)		FM(MMC_D0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_31_28	FM(VI1_DATA3)			FM(CANFD0_RX_B)		F_(0, 0)	FM(D6)		FM(MMC_D1)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_3_0		FM(VI1_DATA4)			FM(CANFD_CLK_B)		F_(0, 0)	FM(D7)		FM(MMC_D2)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_7_4		FM(VI1_DATA5)			F_(0,0)			FM(SCK4)	FM(D8)		FM(MMC_D3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_11_8	FM(VI1_DATA6)			F_(0,0)			FM(RX4)		FM(D9)		FM(MMC_CLK)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_15_12	FM(VI1_DATA7)			F_(0,0)			FM(TX4)		FM(D10)		FM(MMC_D4)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_19_16	FM(VI1_DATA8)			F_(0,0)			FM(CTS4_N)	FM(D11)		FM(MMC_D5)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_23_20	FM(VI1_DATA9)			F_(0,0)			FM(RTS4_N_TANS)	FM(D12)		FM(MMC_D6)		FM(SCL3_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_27_24	FM(VI1_DATA10)			F_(0,0)			F_(0, 0)	FM(D13)		FM(MMC_D7)		FM(SDA3_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_7_4		FM(VI1_DATA5)			F_(0, 0)		FM(SCK4)	FM(D8)		FM(MMC_D3)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_11_8	FM(VI1_DATA6)			F_(0, 0)		FM(RX4)		FM(D9)		FM(MMC_CLK)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_15_12	FM(VI1_DATA7)			F_(0, 0)		FM(TX4)		FM(D10)		FM(MMC_D4)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_19_16	FM(VI1_DATA8)			F_(0, 0)		FM(CTS4_N)	FM(D11)		FM(MMC_D5)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_23_20	FM(VI1_DATA9)			F_(0, 0)		FM(RTS4_N)	FM(D12)		FM(MMC_D6)		FM(SCL3_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_27_24	FM(VI1_DATA10)			F_(0, 0)		F_(0, 0)	FM(D13)		FM(MMC_D7)		FM(SDA3_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_31_28	FM(VI1_DATA11)			FM(SCL4)		FM(IRQ4)	FM(D14)		FM(MMC_WP)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_3_0		FM(VI1_FIELD)			FM(SDA4)		FM(IRQ5)	FM(D15)		FM(MMC_CD)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_7_4		FM(SCL0)			FM(DU_DR0)		FM(TPU0TO0)	FM(CLKOUT)	F_(0, 0)		FM(MSIOF0_RXD)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_11_8	FM(SDA0)			FM(DU_DR1)		FM(TPU0TO1)	FM(BS_N)	FM(SCK0)		FM(MSIOF0_TXD)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_15_12	FM(SCL1)			FM(DU_DG0)		FM(TPU0TO2)	FM(RD_N)	FM(CTS0_N)		FM(MSIOF0_SCK)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP7_19_16	FM(SDA1)			FM(DU_DG1)		FM(TPU0TO3)	FM(WE0_N)	FM(RTS0_N_TANS)		FM(MSIOF0_SYNC)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP7_19_16	FM(SDA1)			FM(DU_DG1)		FM(TPU0TO3)	FM(WE0_N)	FM(RTS0_N)		FM(MSIOF0_SYNC)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_23_20	FM(SCL2)			FM(DU_DB0)		FM(TCLK1_A)	FM(WE1_N)	FM(RX0)			FM(MSIOF0_SS1)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_27_24	FM(SDA2)			FM(DU_DB1)		FM(TCLK2_A)	FM(EX_WAIT0)	FM(TX0)			FM(MSIOF0_SS2)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_31_28	FM(AVB0_AVTP_CAPTURE)		F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(FSCLKST2_N_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -470,7 +471,6 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_23_20,	MSIOF3_SYNC),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_27_24,	IRQ0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP2_27_24,	CC5_OSCOUT),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_31_28,	VI0_CLK),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_31_28,	MSIOF2_SCK),</div><div class='hunk'>@@ -496,7 +496,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,	VI0_DATA0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,	MSIOF2_SS1),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP3_15_12,	RTS3_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP3_15_12,	RTS3_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,	HRX3),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_19_16,	VI0_DATA1),</div><div class='hunk'>@@ -527,7 +527,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_11_8,	VI0_DATA7),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_11_8,	HRX1),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP4_11_8,	RTS1_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP4_11_8,	RTS1_N),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_15_12,	VI0_DATA8),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_15_12,	HSCK2),</div><div class='hunk'>@@ -617,7 +617,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_19_16,	MMC_D5),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_23_20,	VI1_DATA9),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP6_23_20,	RTS4_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP6_23_20,	RTS4_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_23_20,	D12),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_23_20,	MMC_D6),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP6_23_20,	SCL3_B,	SEL_I2C3_1),</div><div class='hunk'>@@ -664,7 +664,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	DU_DG1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	TPU0TO3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	WE0_N),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP7_19_16,	RTS0_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP7_19_16,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	MSIOF0_SYNC),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_23_20,	SCL2),</div><div class='hunk'>@@ -1468,7 +1468,7 @@ static const unsigned int scif0_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(4, 3), RCAR_GP_PIN(4, 2),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif0_ctrl_mux[] = {</div><div class='del'>-	RTS0_N_TANS_MARK, CTS0_N_MARK,</div><div class='add'>+	RTS0_N_MARK, CTS0_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF1 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -1491,7 +1491,7 @@ static const unsigned int scif1_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(2, 11), RCAR_GP_PIN(2, 10),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_ctrl_mux[] = {</div><div class='del'>-	RTS1_N_TANS_MARK, CTS1_N_MARK,</div><div class='add'>+	RTS1_N_MARK, CTS1_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_data_b_pins[] = {</div><div class='ctx'> 	/* RX, TX */</div><div class='hunk'>@@ -1521,7 +1521,7 @@ static const unsigned int scif3_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 3),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif3_ctrl_mux[] = {</div><div class='del'>-	RTS3_N_TANS_MARK, CTS3_N_MARK,</div><div class='add'>+	RTS3_N_MARK, CTS3_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF4 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -1544,7 +1544,7 @@ static const unsigned int scif4_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(3, 13), RCAR_GP_PIN(3, 12),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_ctrl_mux[] = {</div><div class='del'>-	RTS4_N_TANS_MARK, CTS4_N_MARK,</div><div class='add'>+	RTS4_N_MARK, CTS4_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - TMU -------------------------------------------------------------------- */</div><div class='hunk'>@@ -2072,7 +2072,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2104,9 +2104,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2138,9 +2138,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2172,9 +2172,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2206,9 +2206,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2240,9 +2240,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2274,14 +2274,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -2289,9 +2289,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -2299,9 +2299,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -2309,9 +2309,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -2319,9 +2319,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -2329,9 +2329,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -2339,9 +2339,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -2349,9 +2349,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -2359,9 +2359,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP7_15_12</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -2369,7 +2369,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -2377,8 +2377,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     4, 4, 4, 4, 4,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED 31, 30, 29, 28 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED 27, 26, 25, 24 */</div><div class='hunk'>@@ -2400,21 +2401,23 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_3</div><div class='ctx'> 		MOD_SEL0_2</div><div class='ctx'> 		MOD_SEL0_1</div><div class='del'>-		MOD_SEL0_0 }</div><div class='add'>+		MOD_SEL0_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='del'>-	IOCTRL30,</div><div class='del'>-	IOCTRL31,</div><div class='del'>-	IOCTRL32,</div><div class='add'>+	POCCTRL0,</div><div class='add'>+	POCCTRL1,</div><div class='add'>+	POCCTRL2,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='del'>-	[IOCTRL30] = { 0xe6060380 },</div><div class='del'>-	[IOCTRL31] = { 0xe6060384 },</div><div class='del'>-	[IOCTRL32] = { 0xe6060388 },</div><div class='add'>+	[POCCTRL0] = { 0xe6060380 },</div><div class='add'>+	[POCCTRL1] = { 0xe6060384 },</div><div class='add'>+	[POCCTRL2] = { 0xe6060388 },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2423,13 +2426,13 @@ static int r8a77970_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin,</div><div class='ctx'> {</div><div class='ctx'> 	int bit = pin &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-	*pocctrl = pinmux_ioctrl_regs[IOCTRL30].reg;</div><div class='add'>+	*pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(0, 0) &amp;&amp; pin &lt;= RCAR_GP_PIN(0, 21))</div><div class='ctx'> 		return bit;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(2, 0) &amp;&amp; pin &lt;= RCAR_GP_PIN(2, 9))</div><div class='ctx'> 		return bit + 22;</div><div class='ctx'> </div><div class='del'>-	*pocctrl = pinmux_ioctrl_regs[IOCTRL31].reg;</div><div class='add'>+	*pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(2, 10) &amp;&amp; pin &lt;= RCAR_GP_PIN(2, 16))</div><div class='ctx'> 		return bit - 10;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(3, 0) &amp;&amp; pin &lt;= RCAR_GP_PIN(3, 16))</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c<br/>index b807b67ae143..473da65890a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77980.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77980.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77980.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a77980.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  * Copyright (C) 2015 Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.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'> </div><div class='hunk'>@@ -186,7 +187,7 @@</div><div class='ctx'> #define IP0_7_4		FM(DU_DR3)			FM(RX4)			FM(GETHER_RMII_RX_ER)	FM(A1)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_11_8	FM(DU_DR4)			FM(TX4)			FM(GETHER_RMII_RXD0)	FM(A2)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_15_12	FM(DU_DR5)			FM(CTS4_N)		FM(GETHER_RMII_RXD1)	FM(A3)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP0_19_16	FM(DU_DR6)			FM(RTS4_N_TANS)		FM(GETHER_RMII_TXD_EN)	FM(A4)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP0_19_16	FM(DU_DR6)			FM(RTS4_N)		FM(GETHER_RMII_TXD_EN)	FM(A4)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_23_20	FM(DU_DR7)			F_(0, 0)		FM(GETHER_RMII_TXD0)	FM(A5)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_27_24	FM(DU_DG2)			F_(0, 0)		FM(GETHER_RMII_TXD1)	FM(A6)		F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP0_31_28	FM(DU_DG3)			FM(CPG_CPCKOUT)		FM(GETHER_RMII_REFCLK)	FM(A7)		FM(PWMFSW0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -204,19 +205,19 @@</div><div class='ctx'> #define IP2_15_12	FM(DU_EXHSYNC_DU_HSYNC)		FM(MSIOF3_SS2)		FM(GETHER_PHY_INT_B)	FM(A19)		FM(FXR_TXENA_N)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_19_16	FM(DU_EXVSYNC_DU_VSYNC)		FM(MSIOF3_SCK)		F_(0, 0)		F_(0, 0)	FM(FXR_TXENB_N)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_23_20	FM(DU_EXODDF_DU_ODDF_DISP_CDE)	FM(MSIOF3_SYNC)		F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP2_27_24	FM(IRQ0)			FM(CC5_OSCOUT)		F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP2_27_24	FM(IRQ0)			F_(0, 0)		F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP2_31_28	FM(VI0_CLK)			FM(MSIOF2_SCK)		FM(SCK3)		F_(0, 0)	FM(HSCK3)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_3_0		FM(VI0_CLKENB)			FM(MSIOF2_RXD)		FM(RX3)			FM(RD_WR_N)	FM(HCTS3_N)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_7_4		FM(VI0_HSYNC_N)			FM(MSIOF2_TXD)		FM(TX3)			F_(0, 0)	FM(HRTS3_N)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_11_8	FM(VI0_VSYNC_N)			FM(MSIOF2_SYNC)		FM(CTS3_N)		F_(0, 0)	FM(HTX3)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP3_15_12	FM(VI0_DATA0)			FM(MSIOF2_SS1)		FM(RTS3_N_TANS)		F_(0, 0)	FM(HRX3)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP3_15_12	FM(VI0_DATA0)			FM(MSIOF2_SS1)		FM(RTS3_N)		F_(0, 0)	FM(HRX3)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_19_16	FM(VI0_DATA1)			FM(MSIOF2_SS2)		FM(SCK1)		F_(0, 0)	FM(SPEEDIN_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_23_20	FM(VI0_DATA2)			FM(AVB_AVTP_PPS)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_27_24	FM(VI0_DATA3)			FM(HSCK1)		F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_31_28	FM(VI0_DATA4)			FM(HRTS1_N)		FM(RX1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_3_0		FM(VI0_DATA5)			FM(HCTS1_N)		FM(TX1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_7_4		FM(VI0_DATA6)			FM(HTX1)		FM(CTS1_N)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP4_11_8	FM(VI0_DATA7)			FM(HRX1)		FM(RTS1_N_TANS)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP4_11_8	FM(VI0_DATA7)			FM(HRX1)		FM(RTS1_N)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_15_12	FM(VI0_DATA8)			FM(HSCK2)		F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_19_16	FM(VI0_DATA9)			FM(HCTS2_N)		FM(PWM1_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP4_23_20	FM(VI0_DATA10)			FM(HRTS2_N)		FM(PWM2_A)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -242,7 +243,7 @@</div><div class='ctx'> #define IP7_7_4		FM(SCL0)			F_(0, 0)		F_(0, 0)		FM(CLKOUT)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_11_8	FM(SDA0)			F_(0, 0)		F_(0, 0)		FM(BS_N)	FM(SCK0)	FM(HSCK0_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_15_12	FM(SCL1)			F_(0, 0)		FM(TPU0TO2)		FM(RD_N)	FM(CTS0_N)	FM(HCTS0_N_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP7_19_16	FM(SDA1)			F_(0, 0)		FM(TPU0TO3)		FM(WE0_N)	FM(RTS0_N_TANS)	FM(HRTS0_N_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP7_19_16	FM(SDA1)			F_(0, 0)		FM(TPU0TO3)		FM(WE0_N)	FM(RTS0_N)	FM(HRTS0_N_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_23_20	FM(SCL2)			F_(0, 0)		F_(0, 0)		FM(WE1_N)	FM(RX0)		FM(HRX0_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_27_24	FM(SDA2)			F_(0, 0)		F_(0, 0)		FM(EX_WAIT0)	FM(TX0)		FM(HTX0_B)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP7_31_28	FM(AVB_AVTP_MATCH)		FM(TPU0TO0)		F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -469,7 +470,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_15_12,	A3),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_19_16,	DU_DR6),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP0_19_16,	RTS4_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP0_19_16,	RTS4_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_19_16,	GETHER_RMII_TXD_EN),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP0_19_16,	A4),</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +555,6 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_23_20,	MSIOF3_SYNC),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_27_24,	IRQ0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP2_27_24,	CC5_OSCOUT),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_31_28,	VI0_CLK),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP2_31_28,	MSIOF2_SCK),</div><div class='hunk'>@@ -580,7 +580,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,	VI0_DATA0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,	MSIOF2_SS1),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP3_15_12,	RTS3_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP3_15_12,	RTS3_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,	HRX3),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_19_16,	VI0_DATA1),</div><div class='hunk'>@@ -609,7 +609,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_11_8,	VI0_DATA7),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_11_8,	HRX1),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP4_11_8,	RTS1_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP4_11_8,	RTS1_N),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_15_12,	VI0_DATA8),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP4_15_12,	HSCK2),</div><div class='hunk'>@@ -728,7 +728,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	SDA1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	TPU0TO3),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_19_16,	WE0_N),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP7_19_16,	RTS0_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP7_19_16,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP1_23_20,	HRTS0_N_B, SEL_HSCIF0_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP7_23_20,	SCL2),</div><div class='hunk'>@@ -1726,11 +1726,11 @@ static const unsigned int scif0_clk_mux[] = {</div><div class='ctx'> 	SCK0_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif0_ctrl_pins[] = {</div><div class='del'>-	/* RTS0#/TANS, CTS0# */</div><div class='add'>+	/* RTS0#, CTS0# */</div><div class='ctx'> 	RCAR_GP_PIN(4, 3), RCAR_GP_PIN(4, 2),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif0_ctrl_mux[] = {</div><div class='del'>-	RTS0_N_TANS_MARK, CTS0_N_MARK,</div><div class='add'>+	RTS0_N_MARK, CTS0_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF1 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -1749,11 +1749,11 @@ static const unsigned int scif1_clk_mux[] = {</div><div class='ctx'> 	SCK1_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_ctrl_pins[] = {</div><div class='del'>-	/* RTS1#/TANS, CTS1# */</div><div class='add'>+	/* RTS1#, CTS1# */</div><div class='ctx'> 	RCAR_GP_PIN(2, 11), RCAR_GP_PIN(2, 10),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_ctrl_mux[] = {</div><div class='del'>-	RTS1_N_TANS_MARK, CTS1_N_MARK,</div><div class='add'>+	RTS1_N_MARK, CTS1_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_data_b_pins[] = {</div><div class='ctx'> 	/* RX1, TX1 */</div><div class='hunk'>@@ -1779,11 +1779,11 @@ static const unsigned int scif3_clk_mux[] = {</div><div class='ctx'> 	SCK3_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif3_ctrl_pins[] = {</div><div class='del'>-	/* RTS3#/TANS, CTS3# */</div><div class='add'>+	/* RTS3#, CTS3# */</div><div class='ctx'> 	RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 3),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif3_ctrl_mux[] = {</div><div class='del'>-	RTS3_N_TANS_MARK, CTS3_N_MARK,</div><div class='add'>+	RTS3_N_MARK, CTS3_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF4 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -1802,11 +1802,11 @@ static const unsigned int scif4_clk_mux[] = {</div><div class='ctx'> 	SCK4_MARK,</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_ctrl_pins[] = {</div><div class='del'>-	/* RTS4#/TANS, CTS4# */</div><div class='add'>+	/* RTS4#, CTS4# */</div><div class='ctx'> 	RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 3),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif4_ctrl_mux[] = {</div><div class='del'>-	RTS4_N_TANS_MARK, CTS4_N_MARK,</div><div class='add'>+	RTS4_N_MARK, CTS4_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF Clock ------------------------------------------------------------- */</div><div class='hunk'>@@ -2474,7 +2474,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2506,9 +2506,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2540,9 +2540,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		GP_2_29_FN,	GPSR2_29,</div><div class='hunk'>@@ -2574,9 +2574,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2608,9 +2608,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2642,9 +2642,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2676,14 +2676,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -2691,9 +2691,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -2701,9 +2701,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -2711,9 +2711,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -2721,9 +2721,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -2731,9 +2731,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -2741,9 +2741,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -2751,9 +2751,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -2761,9 +2761,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP7_15_12</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -2771,9 +2771,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -2781,9 +2781,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -2791,7 +2791,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -2799,8 +2799,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     4, 4, 4, 4, 4,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,</div><div class='add'>+				   1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED 31, 30, 29, 28 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,	0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED 27, 26, 25, 24 */</div><div class='hunk'>@@ -2822,23 +2823,25 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		MOD_SEL0_2</div><div class='ctx'> 		MOD_SEL0_1</div><div class='del'>-		MOD_SEL0_0 }</div><div class='add'>+		MOD_SEL0_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='del'>-	IOCTRL30,</div><div class='del'>-	IOCTRL31,</div><div class='del'>-	IOCTRL32,</div><div class='del'>-	IOCTRL33,</div><div class='add'>+	POCCTRL0,</div><div class='add'>+	POCCTRL1,</div><div class='add'>+	POCCTRL2,</div><div class='add'>+	POCCTRL3,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='del'>-	[IOCTRL30] = { 0xe6060380, },</div><div class='del'>-	[IOCTRL31] = { 0xe6060384, },</div><div class='del'>-	[IOCTRL32] = { 0xe6060388, },</div><div class='del'>-	[IOCTRL33] = { 0xe606038c, },</div><div class='add'>+	[POCCTRL0] = { 0xe6060380, },</div><div class='add'>+	[POCCTRL1] = { 0xe6060384, },</div><div class='add'>+	[POCCTRL2] = { 0xe6060388, },</div><div class='add'>+	[POCCTRL3] = { 0xe606038c, },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2847,20 +2850,20 @@ static int r8a77980_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin,</div><div class='ctx'> {</div><div class='ctx'> 	int bit = pin &amp; 0x1f;</div><div class='ctx'> </div><div class='del'>-	*pocctrl = pinmux_ioctrl_regs[IOCTRL30].reg;</div><div class='add'>+	*pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(0, 0) &amp;&amp; pin &lt;= RCAR_GP_PIN(0, 21))</div><div class='ctx'> 		return bit;</div><div class='ctx'> 	else if (pin &gt;= RCAR_GP_PIN(2, 0) &amp;&amp; pin &lt;= RCAR_GP_PIN(2, 9))</div><div class='ctx'> 		return bit + 22;</div><div class='ctx'> </div><div class='del'>-	*pocctrl = pinmux_ioctrl_regs[IOCTRL31].reg;</div><div class='add'>+	*pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(2, 10) &amp;&amp; pin &lt;= RCAR_GP_PIN(2, 16))</div><div class='ctx'> 		return bit - 10;</div><div class='ctx'> 	if ((pin &gt;= RCAR_GP_PIN(2, 17) &amp;&amp; pin &lt;= RCAR_GP_PIN(2, 24)) ||</div><div class='ctx'> 	    (pin &gt;= RCAR_GP_PIN(3,  0) &amp;&amp; pin &lt;= RCAR_GP_PIN(3, 16)))</div><div class='ctx'> 		return bit + 7;</div><div class='ctx'> </div><div class='del'>-	*pocctrl = pinmux_ioctrl_regs[IOCTRL32].reg;</div><div class='add'>+	*pocctrl = pinmux_ioctrl_regs[POCCTRL2].reg;</div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(2, 25) &amp;&amp; pin &lt;= RCAR_GP_PIN(2, 29))</div><div class='ctx'> 		return pin - 25;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c<br/>index 151640c30e9d..91a837b02a36 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77990.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77990.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77990.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a77990.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * R8A77990 processor support - PFC hardware block.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2018 Renesas Electronics Corp.</div><div class='add'>+ * Copyright (C) 2018-2019 Renesas Electronics Corp.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * Copyright (C) 2016-2017 Renesas Electronics Corp.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -165,7 +166,7 @@</div><div class='ctx'> #define GPSR5_7		F_(SCK2_A,		IP12_7_4)</div><div class='ctx'> #define GPSR5_6		F_(TX1,			IP12_3_0)</div><div class='ctx'> #define GPSR5_5		F_(RX1,			IP11_31_28)</div><div class='del'>-#define GPSR5_4		F_(RTS0_N_TANS_A,	IP11_23_20)</div><div class='add'>+#define GPSR5_4		F_(RTS0_N_A,		IP11_23_20)</div><div class='ctx'> #define GPSR5_3		F_(CTS0_N_A,		IP11_19_16)</div><div class='ctx'> #define GPSR5_2		F_(TX0_A,		IP11_15_12)</div><div class='ctx'> #define GPSR5_1		F_(RX0_A,		IP11_11_8)</div><div class='hunk'>@@ -219,7 +220,7 @@</div><div class='ctx'> #define IP3_3_0		FM(A1)			FM(IRQ1)		FM(PWM3_A)		FM(DU_DOTCLKIN1)	FM(VI5_DATA0_A)		FM(DU_DISP_CDE) FM(SDA6_B)	FM(IETX)	FM(QCPV_QDE)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_7_4		FM(A2)			FM(IRQ2)		FM(AVB_AVTP_PPS)	FM(VI4_CLKENB)		FM(VI5_DATA1_A)		FM(DU_DISP)	FM(SCL6_B)	F_(0, 0)	FM(QSTVB_QVE)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_11_8	FM(A3)			FM(CTS4_N_A)		FM(PWM4_A)		FM(VI4_DATA12)		F_(0, 0)		FM(DU_DOTCLKOUT0) FM(HTX3_D)	FM(IECLK)	FM(LCDOUT12)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP3_15_12	FM(A4)			FM(RTS4_N_TANS_A)	FM(MSIOF3_SYNC_B)	FM(VI4_DATA8)		FM(PWM2_B)		FM(DU_DG4)	FM(RIF2_CLK_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP3_15_12	FM(A4)			FM(RTS4_N_A)		FM(MSIOF3_SYNC_B)	FM(VI4_DATA8)		FM(PWM2_B)		FM(DU_DG4)	FM(RIF2_CLK_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_19_16	FM(A5)			FM(SCK4_A)		FM(MSIOF3_SCK_B)	FM(VI4_DATA9)		FM(PWM3_B)		F_(0, 0)	FM(RIF2_SYNC_B)	F_(0, 0)	FM(QPOLA)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_23_20	FM(A6)			FM(RX4_A)		FM(MSIOF3_RXD_B)	FM(VI4_DATA10)		F_(0, 0)		F_(0, 0)	FM(RIF2_D0_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP3_27_24	FM(A7)			FM(TX4_A)		FM(MSIOF3_TXD_B)	FM(VI4_DATA11)		F_(0, 0)		F_(0, 0)	FM(RIF2_D1_B)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -240,10 +241,10 @@</div><div class='ctx'> #define IP5_15_12	FM(CS0_N)		FM(SCL5)		F_(0, 0)		F_(0, 0)		F_(0, 0)		FM(DU_DR0)	FM(VI4_DATA2_B)	F_(0, 0)	FM(LCDOUT16)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_19_16	FM(WE0_N)		FM(SDA5)		F_(0, 0)		F_(0, 0)		F_(0, 0)		FM(DU_DR1)	FM(VI4_DATA3_B)	F_(0, 0)	FM(LCDOUT17)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_23_20	FM(D0)			FM(MSIOF3_SCK_A)	F_(0, 0)		F_(0, 0)		F_(0, 0)		FM(DU_DR2)	FM(CTS4_N_C)	F_(0, 0)	FM(LCDOUT18)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP5_27_24	FM(D1)			FM(MSIOF3_SYNC_A)	FM(SCK3_A)		FM(VI4_DATA23)		FM(VI5_CLKENB_A)	FM(DU_DB7)	FM(RTS4_N_TANS_C) F_(0, 0)	FM(LCDOUT7)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP5_27_24	FM(D1)			FM(MSIOF3_SYNC_A)	FM(SCK3_A)		FM(VI4_DATA23)		FM(VI5_CLKENB_A)	FM(DU_DB7)	FM(RTS4_N_C)	F_(0, 0)	FM(LCDOUT7)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP5_31_28	FM(D2)			FM(MSIOF3_RXD_A)	FM(RX5_C)		F_(0, 0)		FM(VI5_DATA14_A)	FM(DU_DR3)	FM(RX4_C)	F_(0, 0)	FM(LCDOUT19)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_3_0		FM(D3)			FM(MSIOF3_TXD_A)	FM(TX5_C)		F_(0, 0)		FM(VI5_DATA15_A)	FM(DU_DR4)	FM(TX4_C)	F_(0, 0)	FM(LCDOUT20)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP6_7_4		FM(D4)			FM(CANFD1_TX)		FM(HSCK3_B)		FM(CAN1_TX)		FM(RTS3_N_TANS_A)	FM(MSIOF3_SS2_A) F_(0, 0)	FM(VI5_DATA1_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP6_7_4		FM(D4)			FM(CANFD1_TX)		FM(HSCK3_B)		FM(CAN1_TX)		FM(RTS3_N_A)		FM(MSIOF3_SS2_A) F_(0, 0)	FM(VI5_DATA1_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_11_8	FM(D5)			FM(RX3_A)		FM(HRX3_B)		F_(0, 0)		F_(0, 0)		FM(DU_DR5)	FM(VI4_DATA4_B)	F_(0, 0)	FM(LCDOUT21)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_15_12	FM(D6)			FM(TX3_A)		FM(HTX3_B)		F_(0, 0)		F_(0, 0)		FM(DU_DR6)	FM(VI4_DATA5_B)	F_(0, 0)	FM(LCDOUT22)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP6_19_16	FM(D7)			FM(CANFD1_RX)		FM(IRQ5)		FM(CAN1_RX)		FM(CTS3_N_A)		F_(0, 0)	F_(0, 0)	FM(VI5_DATA2_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -289,8 +290,8 @@</div><div class='ctx'> #define IP11_11_8	FM(RX0_A)		FM(HRX1_A)		FM(SSI_SCK2_A)		FM(RIF1_SYNC)		F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(TS_SCK1)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_15_12	FM(TX0_A)		FM(HTX1_A)		FM(SSI_WS2_A)		FM(RIF1_D0)		F_(0, 0)		F_(0, 0)	F_(0, 0)	FM(TS_SDAT1)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_19_16	FM(CTS0_N_A)		FM(NFDATA14_A)		FM(AUDIO_CLKOUT_A)	FM(RIF1_D1)		FM(SCIF_CLK_A)		FM(FMCLK_A)	F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP11_23_20	FM(RTS0_N_TANS_A)	FM(NFDATA15_A)		FM(AUDIO_CLKOUT1_A)	FM(RIF1_CLK)		FM(SCL2_A)		FM(FMIN_A)	F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP11_27_24	FM(SCK0_A)		FM(HSCK1_A)		FM(USB3HS0_ID)		FM(RTS1_N_TANS)		FM(SDA2_A)		FM(FMCLK_C)	F_(0, 0)	F_(0, 0)	FM(USB0_ID)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP11_23_20	FM(RTS0_N_A)		FM(NFDATA15_A)		FM(AUDIO_CLKOUT1_A)	FM(RIF1_CLK)		FM(SCL2_A)		FM(FMIN_A)	F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP11_27_24	FM(SCK0_A)		FM(HSCK1_A)		FM(USB3HS0_ID)		FM(RTS1_N)		FM(SDA2_A)		FM(FMCLK_C)	F_(0, 0)	F_(0, 0)	FM(USB0_ID)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_31_28	FM(RX1)			FM(HRX2_B)		FM(SSI_SCK9_B)		FM(AUDIO_CLKOUT1_B)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> </div><div class='ctx'> /* IPSRx */		/* 0 */			/* 1 */			/* 2 */			/* 3 */			/* 4 */			/* 5 */		/* 6 */		/* 7 */		/* 8 */		/* 9 - F */</div><div class='hunk'>@@ -414,7 +415,7 @@ FM(IP12_31_28)	IP12_31_28	FM(IP13_31_28)	IP13_31_28	FM(IP14_31_28)	IP14_31_28	FM</div><div class='ctx'> #define MOD_SEL0_22		FM(SEL_HSCIF2_0)		FM(SEL_HSCIF2_1)</div><div class='ctx'> #define MOD_SEL0_21_20	   REV4(FM(SEL_I2C1_0),			FM(SEL_I2C1_1),			FM(SEL_I2C1_2),			FM(SEL_I2C1_3))</div><div class='ctx'> #define MOD_SEL0_19_18_17  REV8(FM(SEL_I2C2_0),			FM(SEL_I2C2_1),			FM(SEL_I2C2_2),			FM(SEL_I2C2_3),		FM(SEL_I2C2_4),		F_(0, 0),	F_(0, 0),	F_(0, 0))</div><div class='del'>-#define MOD_SEL0_16		FM(SEL_NDFC_0)			FM(SEL_NDFC_1)</div><div class='add'>+#define MOD_SEL0_16		FM(SEL_NDF_0)			FM(SEL_NDF_1)</div><div class='ctx'> #define MOD_SEL0_15		FM(SEL_PWM0_0)			FM(SEL_PWM0_1)</div><div class='ctx'> #define MOD_SEL0_14		FM(SEL_PWM1_0)			FM(SEL_PWM1_1)</div><div class='ctx'> #define MOD_SEL0_13_12	   REV4(FM(SEL_PWM2_0),			FM(SEL_PWM2_1),			FM(SEL_PWM2_2),			F_(0, 0))</div><div class='hunk'>@@ -429,8 +430,6 @@ FM(IP12_31_28)	IP12_31_28	FM(IP13_31_28)	IP13_31_28	FM(IP14_31_28)	IP14_31_28	FM</div><div class='ctx'> #define MOD_SEL0_1_0	   REV4(FM(SEL_SPEED_PULSE_IF_0),	FM(SEL_SPEED_PULSE_IF_1),	FM(SEL_SPEED_PULSE_IF_2),	F_(0, 0))</div><div class='ctx'> </div><div class='ctx'> /* MOD_SEL1 */			/* 0 */				/* 1 */				/* 2 */				/* 3 */			/* 4 */			/* 5 */		/* 6 */		/* 7 */</div><div class='del'>-#define MOD_SEL1_31		FM(SEL_SIMCARD_0)		FM(SEL_SIMCARD_1)</div><div class='del'>-#define MOD_SEL1_30		FM(SEL_SSI2_0)			FM(SEL_SSI2_1)</div><div class='ctx'> #define MOD_SEL1_29		FM(SEL_TIMER_TMU_0)		FM(SEL_TIMER_TMU_1)</div><div class='ctx'> #define MOD_SEL1_28		FM(SEL_USB_20_CH0_0)		FM(SEL_USB_20_CH0_1)</div><div class='ctx'> #define MOD_SEL1_26		FM(SEL_DRIF2_0)			FM(SEL_DRIF2_1)</div><div class='hunk'>@@ -451,8 +450,7 @@ FM(IP12_31_28)	IP12_31_28	FM(IP13_31_28)	IP13_31_28	FM(IP14_31_28)	IP14_31_28	FM</div><div class='ctx'> </div><div class='ctx'> #define PINMUX_MOD_SELS	\</div><div class='ctx'> \</div><div class='del'>-			MOD_SEL1_31 \</div><div class='del'>-MOD_SEL0_30_29		MOD_SEL1_30 \</div><div class='add'>+MOD_SEL0_30_29 \</div><div class='ctx'> 			MOD_SEL1_29 \</div><div class='ctx'> MOD_SEL0_28		MOD_SEL1_28 \</div><div class='ctx'> MOD_SEL0_27_26 \</div><div class='hunk'>@@ -671,7 +669,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_11_8,		LCDOUT12),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,		A4),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP3_15_12,		RTS4_N_TANS_A,	SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP3_15_12,		RTS4_N_A,	SEL_SCIF4_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP3_15_12,		MSIOF3_SYNC_B,	SEL_MSIOF3_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP3_15_12,		VI4_DATA8),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP3_15_12,		PWM2_B,		SEL_PWM2_1),</div><div class='hunk'>@@ -821,7 +819,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_27_24,		VI4_DATA23),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP5_27_24,		VI5_CLKENB_A,	SEL_VIN5_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_27_24,		DU_DB7),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP5_27_24,		RTS4_N_TANS_C,	SEL_SCIF4_2),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP5_27_24,		RTS4_N_C,	SEL_SCIF4_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_27_24,		LCDOUT7),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP5_31_28,		D2),</div><div class='hunk'>@@ -845,7 +843,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_7_4,		CANFD1_TX),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP6_7_4,		HSCK3_B,	SEL_HSCIF3_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_7_4,		CAN1_TX),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP6_7_4,		RTS3_N_TANS_A,	SEL_SCIF3_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP6_7_4,		RTS3_N_A,	SEL_SCIF3_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP6_7_4,		MSIOF3_SS2_A),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP6_7_4,		VI5_DATA1_B,	SEL_VIN5_1),</div><div class='ctx'> </div><div class='hunk'>@@ -984,23 +982,23 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP8_19_16,		REMOCON_C,	SEL_REMOCON_2),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_23_20,		SD1_CLK),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_23_20,		NFDATA14_B,	SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_23_20,		NFDATA14_B,	SEL_NDF_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_27_24,		SD1_CMD),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_27_24,		NFDATA15_B,	SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_27_24,		NFDATA15_B,	SEL_NDF_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP8_31_28,		SD1_DAT0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP8_31_28,		NFWP_N_B,	SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP8_31_28,		NFWP_N_B,	SEL_NDF_1),</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR9 */</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP9_3_0,		SD1_DAT1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP9_3_0,		NFCE_N_B,	SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP9_3_0,		NFCE_N_B,	SEL_NDF_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP9_7_4,		SD1_DAT2),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP9_7_4,		NFALE_B,	SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP9_7_4,		NFALE_B,	SEL_NDF_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP9_11_8,		SD1_DAT3),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP9_11_8,		NFRB_N_B,	SEL_NDFC_1),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP9_11_8,		NFRB_N_B,	SEL_NDF_1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP9_15_12,		SD3_CLK),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP9_15_12,		NFWE_N),</div><div class='hunk'>@@ -1037,57 +1035,57 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_23_20,		NFCLE),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_27_24,		SD0_CD),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP10_27_24,		NFALE_A),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP10_27_24,		NFALE_A,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_27_24,		SD3_CD),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP10_27_24,		RIF0_CLK_B,	SEL_DRIF0_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP10_27_24,		SCL2_B,		SEL_I2C2_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP10_27_24,		TCLK1_A,	SEL_TIMER_TMU_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP10_27_24,		SSI_SCK2_B,	SEL_SSI2_1),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP10_27_24,		SSI_SCK2_B),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_27_24,		TS_SCK0),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_31_28,		SD0_WP),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP10_31_28,		NFRB_N_A),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP10_31_28,		NFRB_N_A,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_31_28,		SD3_WP),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP10_31_28,		RIF0_D0_B,	SEL_DRIF0_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP10_31_28,		SDA2_B,		SEL_I2C2_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP10_31_28,		TCLK2_A,	SEL_TIMER_TMU_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP10_31_28,		SSI_WS2_B,	SEL_SSI2_1),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP10_31_28,		SSI_WS2_B),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP10_31_28,		TS_SDAT0),</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR11 */</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_3_0,		SD1_CD),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_3_0,		NFCE_N_A,	SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_3_0,		NFCE_N_A,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_3_0,		SSI_SCK1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_3_0,		RIF0_D1_B,	SEL_DRIF0_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_3_0,		TS_SDEN0),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,		SD1_WP),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_7_4,		NFWP_N_A,	SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_7_4,		NFWP_N_A,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,		SSI_WS1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_7_4,		RIF0_SYNC_B,	SEL_DRIF0_1),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,		TS_SPSYNC0),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,		RX0_A,		SEL_SCIF0_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_11_8,		HRX1_A,		SEL_HSCIF1_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_11_8,		SSI_SCK2_A,	SEL_SSI2_0),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP11_11_8,		SSI_SCK2_A),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_11_8,		RIF1_SYNC),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_11_8,		TS_SCK1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_15_12,		TX0_A,		SEL_SCIF0_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_15_12,		HTX1_A),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_15_12,		SSI_WS2_A,	SEL_SSI2_0),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP11_15_12,		SSI_WS2_A),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_15_12,		RIF1_D0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_15_12,		TS_SDAT1),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_19_16,		CTS0_N_A,	SEL_SCIF0_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_19_16,		NFDATA14_A,	SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_19_16,		NFDATA14_A,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_19_16,		AUDIO_CLKOUT_A),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_19_16,		RIF1_D1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_19_16,		SCIF_CLK_A,	SEL_SCIF_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_19_16,		FMCLK_A,	SEL_FM_0),</div><div class='ctx'> </div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_23_20,		RTS0_N_TANS_A,	SEL_SCIF0_0),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP11_23_20,		NFDATA15_A,	SEL_NDFC_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_23_20,		RTS0_N_A,	SEL_SCIF0_0),</div><div class='add'>+	PINMUX_IPSR_MSEL(IP11_23_20,		NFDATA15_A,	SEL_NDF_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_23_20,		AUDIO_CLKOUT1_A),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_23_20,		RIF1_CLK),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_23_20,		SCL2_A,		SEL_I2C2_0),</div><div class='hunk'>@@ -1096,7 +1094,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,		SCK0_A,		SEL_SCIF0_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,		HSCK1_A,	SEL_HSCIF1_0),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_27_24,		USB3HS0_ID),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP11_27_24,		RTS1_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP11_27_24,		RTS1_N),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,		SDA2_A,		SEL_I2C2_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_27_24,		FMCLK_C,	SEL_FM_2),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_27_24,		USB0_ID),</div><div class='hunk'>@@ -1180,7 +1178,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_19_16,		RIF0_D1_A,	SEL_DRIF0_0),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_19_16,		SDA1_B,		SEL_I2C1_1),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_19_16,		TCLK2_B,	SEL_TIMER_TMU_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP13_19_16,		SIM0_D_A,	SEL_SIMCARD_0),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP13_19_16,		SIM0_D_A),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP13_23_20,		MLB_DAT),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP13_23_20,		TX0_B,		SEL_SCIF0_1),</div><div class='hunk'>@@ -1248,7 +1246,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP15_15_12,		TPU0TO2),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP15_15_12,		SDA1_D,		SEL_I2C1_3),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP15_15_12,		FSO_CFE_1_N_B,	SEL_FSO_1),</div><div class='del'>-	PINMUX_IPSR_MSEL(IP15_15_12,		SIM0_D_B,	SEL_SIMCARD_1),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP15_15_12,		SIM0_D_B),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP15_19_16,		SSI_SDATA6),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP15_19_16,		HRTS2_N_A,	SEL_HSCIF2_0),</div><div class='hunk'>@@ -2839,7 +2837,7 @@ static const unsigned int scif0_ctrl_a_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif0_ctrl_a_mux[] = {</div><div class='del'>-	RTS0_N_TANS_A_MARK, CTS0_N_A_MARK,</div><div class='add'>+	RTS0_N_A_MARK, CTS0_N_A_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif0_data_b_pins[] = {</div><div class='hunk'>@@ -2885,7 +2883,7 @@ static const unsigned int scif1_ctrl_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif1_ctrl_mux[] = {</div><div class='del'>-	RTS1_N_TANS_MARK, CTS1_N_MARK,</div><div class='add'>+	RTS1_N_MARK, CTS1_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF2 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -2941,7 +2939,7 @@ static const unsigned int scif3_ctrl_a_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif3_ctrl_a_mux[] = {</div><div class='del'>-	RTS3_N_TANS_A_MARK, CTS3_N_A_MARK,</div><div class='add'>+	RTS3_N_A_MARK, CTS3_N_A_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif3_data_b_pins[] = {</div><div class='hunk'>@@ -2996,7 +2994,7 @@ static const unsigned int scif4_ctrl_a_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif4_ctrl_a_mux[] = {</div><div class='del'>-	RTS4_N_TANS_A_MARK, CTS4_N_A_MARK,</div><div class='add'>+	RTS4_N_A_MARK, CTS4_N_A_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif4_data_b_pins[] = {</div><div class='hunk'>@@ -3032,7 +3030,7 @@ static const unsigned int scif4_ctrl_c_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int scif4_ctrl_c_mux[] = {</div><div class='del'>-	RTS4_N_TANS_C_MARK, CTS4_N_C_MARK,</div><div class='add'>+	RTS4_N_C_MARK, CTS4_N_C_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF5 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -3766,8 +3764,8 @@ static const unsigned int vin5_clk_b_mux[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='del'>-	struct sh_pfc_pin_group common[245];</div><div class='del'>-	struct sh_pfc_pin_group automotive[23];</div><div class='add'>+	struct sh_pfc_pin_group common[247];</div><div class='add'>+	struct sh_pfc_pin_group automotive[21];</div><div class='ctx'> } pinmux_groups = {</div><div class='ctx'> 	.common = {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(audio_clk_a),</div><div class='hunk'>@@ -3798,6 +3796,8 @@ static const struct {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(can0_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(can1_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(can_clk),</div><div class='add'>+		SH_PFC_PIN_GROUP(canfd0_data),</div><div class='add'>+		SH_PFC_PIN_GROUP(canfd1_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_rgb666),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_rgb888),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(du_clk_in_0),</div><div class='hunk'>@@ -4017,8 +4017,6 @@ static const struct {</div><div class='ctx'> 		SH_PFC_PIN_GROUP(vin5_clk_b),</div><div class='ctx'> 	},</div><div class='ctx'> 	.automotive = {</div><div class='del'>-		SH_PFC_PIN_GROUP(canfd0_data),</div><div class='del'>-		SH_PFC_PIN_GROUP(canfd1_data),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(drif0_ctrl_a),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(drif0_data0_a),</div><div class='ctx'> 		SH_PFC_PIN_GROUP(drif0_data1_a),</div><div class='hunk'>@@ -4465,8 +4463,8 @@ static const char * const vin5_groups[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='del'>-	struct sh_pfc_function common[45];</div><div class='del'>-	struct sh_pfc_function automotive[6];</div><div class='add'>+	struct sh_pfc_function common[47];</div><div class='add'>+	struct sh_pfc_function automotive[4];</div><div class='ctx'> } pinmux_functions = {</div><div class='ctx'> 	.common = {</div><div class='ctx'> 		SH_PFC_FUNCTION(audio_clk),</div><div class='hunk'>@@ -4474,6 +4472,8 @@ static const struct {</div><div class='ctx'> 		SH_PFC_FUNCTION(can0),</div><div class='ctx'> 		SH_PFC_FUNCTION(can1),</div><div class='ctx'> 		SH_PFC_FUNCTION(can_clk),</div><div class='add'>+		SH_PFC_FUNCTION(canfd0),</div><div class='add'>+		SH_PFC_FUNCTION(canfd1),</div><div class='ctx'> 		SH_PFC_FUNCTION(du),</div><div class='ctx'> 		SH_PFC_FUNCTION(hscif0),</div><div class='ctx'> 		SH_PFC_FUNCTION(hscif1),</div><div class='hunk'>@@ -4516,8 +4516,6 @@ static const struct {</div><div class='ctx'> 		SH_PFC_FUNCTION(vin5),</div><div class='ctx'> 	},</div><div class='ctx'> 	.automotive = {</div><div class='del'>-		SH_PFC_FUNCTION(canfd0),</div><div class='del'>-		SH_PFC_FUNCTION(canfd1),</div><div class='ctx'> 		SH_PFC_FUNCTION(drif0),</div><div class='ctx'> 		SH_PFC_FUNCTION(drif1),</div><div class='ctx'> 		SH_PFC_FUNCTION(drif2),</div><div class='hunk'>@@ -4528,7 +4526,7 @@ static const struct {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4560,9 +4558,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4594,9 +4592,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4628,9 +4626,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4662,9 +4660,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4696,9 +4694,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4730,9 +4728,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -4764,14 +4762,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN,	GPSR6_3,</div><div class='ctx'> 		GP_6_2_FN,	GPSR6_2,</div><div class='ctx'> 		GP_6_1_FN,	GPSR6_1,</div><div class='del'>-		GP_6_0_FN,	GPSR6_0, }</div><div class='add'>+		GP_6_0_FN,	GPSR6_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -4779,9 +4777,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -4789,9 +4787,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -4799,9 +4797,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -4809,9 +4807,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -4819,9 +4817,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -4829,9 +4827,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -4839,9 +4837,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -4849,9 +4847,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP7_15_12</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -4859,9 +4857,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -4869,9 +4867,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -4879,9 +4877,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4, GROUP(</div><div class='ctx'> 		IP11_31_28</div><div class='ctx'> 		IP11_27_24</div><div class='ctx'> 		IP11_23_20</div><div class='hunk'>@@ -4889,9 +4887,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP11_15_12</div><div class='ctx'> 		IP11_11_8</div><div class='ctx'> 		IP11_7_4</div><div class='del'>-		IP11_3_0 }</div><div class='add'>+		IP11_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4, GROUP(</div><div class='ctx'> 		IP12_31_28</div><div class='ctx'> 		IP12_27_24</div><div class='ctx'> 		IP12_23_20</div><div class='hunk'>@@ -4899,9 +4897,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP12_15_12</div><div class='ctx'> 		IP12_11_8</div><div class='ctx'> 		IP12_7_4</div><div class='del'>-		IP12_3_0 }</div><div class='add'>+		IP12_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4, GROUP(</div><div class='ctx'> 		IP13_31_28</div><div class='ctx'> 		IP13_27_24</div><div class='ctx'> 		IP13_23_20</div><div class='hunk'>@@ -4909,9 +4907,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP13_15_12</div><div class='ctx'> 		IP13_11_8</div><div class='ctx'> 		IP13_7_4</div><div class='del'>-		IP13_3_0 }</div><div class='add'>+		IP13_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR14", 0xe6060238, 32, 4, GROUP(</div><div class='ctx'> 		IP14_31_28</div><div class='ctx'> 		IP14_27_24</div><div class='ctx'> 		IP14_23_20</div><div class='hunk'>@@ -4919,9 +4917,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP14_15_12</div><div class='ctx'> 		IP14_11_8</div><div class='ctx'> 		IP14_7_4</div><div class='del'>-		IP14_3_0 }</div><div class='add'>+		IP14_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR15", 0xe606023c, 32, 4, GROUP(</div><div class='ctx'> 		IP15_31_28</div><div class='ctx'> 		IP15_27_24</div><div class='ctx'> 		IP15_23_20</div><div class='hunk'>@@ -4929,7 +4927,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP15_15_12</div><div class='ctx'> 		IP15_11_8</div><div class='ctx'> 		IP15_7_4</div><div class='del'>-		IP15_3_0 }</div><div class='add'>+		IP15_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -4937,8 +4935,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     1, 2, 1, 2, 1, 1, 1, 1, 2, 3, 1,</div><div class='del'>-			     1, 1, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2) {</div><div class='add'>+			     GROUP(1, 2, 1, 2, 1, 1, 1, 1, 2, 3, 1, 1,</div><div class='add'>+				   1, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED 31 */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		MOD_SEL0_30_29</div><div class='hunk'>@@ -4962,13 +4961,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_4</div><div class='ctx'> 		MOD_SEL0_3</div><div class='ctx'> 		MOD_SEL0_2</div><div class='del'>-		MOD_SEL0_1_0 }</div><div class='add'>+		MOD_SEL0_1_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1,</div><div class='del'>-			     1, 2, 2, 2, 1, 1, 2, 1, 4) {</div><div class='del'>-		MOD_SEL1_31</div><div class='del'>-		MOD_SEL1_30</div><div class='add'>+			     GROUP(2, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1,</div><div class='add'>+				   2, 2, 2, 1, 1, 2, 1, 4),</div><div class='add'>+			     GROUP(</div><div class='add'>+		/* RESERVED 31, 30 */</div><div class='add'>+		0, 0, 0, 0,</div><div class='ctx'> 		MOD_SEL1_29</div><div class='ctx'> 		MOD_SEL1_28</div><div class='ctx'> 		/* RESERVED 27 */</div><div class='hunk'>@@ -4989,17 +4989,19 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL1_6_5</div><div class='ctx'> 		MOD_SEL1_4</div><div class='ctx'> 		/* RESERVED 3, 2, 1, 0  */</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ioctrl_regs {</div><div class='del'>-	IOCTRL30,</div><div class='add'>+	POCCTRL0,</div><div class='add'>+	TDSELCTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='del'>-	[IOCTRL30] = { 0xe6060380, },</div><div class='add'>+	[POCCTRL0] = { 0xe6060380, },</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -5008,7 +5010,7 @@ static int r8a77990_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin,</div><div class='ctx'> {</div><div class='ctx'> 	int bit = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	*pocctrl = pinmux_ioctrl_regs[IOCTRL30].reg;</div><div class='add'>+	*pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg;</div><div class='ctx'> </div><div class='ctx'> 	if (pin &gt;= RCAR_GP_PIN(3, 0) &amp;&amp; pin &lt;= RCAR_GP_PIN(3, 11))</div><div class='ctx'> 		bit = pin &amp; 0x1f;</div><div class='hunk'>@@ -5124,7 +5126,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {</div><div class='ctx'> 	} },</div><div class='ctx'> 	{ PINMUX_BIAS_REG("PUEN3", 0xe606040c, "PUD3", 0xe606044c) {</div><div class='ctx'> 		 [0] = RCAR_GP_PIN(5,  0),	/* SCK0_A */</div><div class='del'>-		 [1] = RCAR_GP_PIN(5,  4),	/* RTS0#/TANS_A */</div><div class='add'>+		 [1] = RCAR_GP_PIN(5,  4),	/* RTS0#_A */</div><div class='ctx'> 		 [2] = RCAR_GP_PIN(5,  3),	/* CTS0#_A */</div><div class='ctx'> 		 [3] = RCAR_GP_PIN(5,  2),	/* TX0_A */</div><div class='ctx'> 		 [4] = RCAR_GP_PIN(5,  1),	/* RX0_A */</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c b/drivers/pinctrl/sh-pfc/pfc-r8a77995.c<br/>index 9e377e3b9cb3..dd87085d48cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77995.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-r8a77995.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-r8a77995.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-r8a77995.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * Copyright (C) 2015  Renesas Electronics Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -287,7 +288,7 @@</div><div class='ctx'> #define IP10_23_20	FM(SSI_SDATA4_A)	FM(HTX0)		FM(SCL2_A)		FM(CAN1_RX_B)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP10_27_24	FM(SSI_WS4_A)		FM(HRX0)		FM(SDA2_A)		FM(CAN1_TX_B)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP10_31_28	FM(SCL1)		FM(CTS1_N)		F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP11_3_0	FM(SDA1)		FM(RTS1_N_TANS)		F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP11_3_0	FM(SDA1)		FM(RTS1_N)		F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_7_4	FM(MSIOF1_SCK)		FM(AVB0_AVTP_PPS_B)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_11_8	FM(MSIOF1_TXD)		FM(AVB0_AVTP_CAPTURE_B)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP11_15_12	FM(MSIOF1_RXD)		FM(AVB0_AVTP_MATCH_B)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -298,7 +299,7 @@</div><div class='ctx'> </div><div class='ctx'> /* IPSRx */		/* 0 */			/* 1 */			/* 2 */			/* 3 */		/* 4 */			/* 5 */		/* 6  - F */</div><div class='ctx'> #define IP12_3_0	FM(RX1_A)		FM(CTS0_N)		FM(TPU0TO0_B)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='del'>-#define IP12_7_4	FM(TX1_A)		FM(RTS0_N_TANS)		FM(TPU0TO1_B)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='add'>+#define IP12_7_4	FM(TX1_A)		FM(RTS0_N)		FM(TPU0TO1_B)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP12_11_8	FM(SCK2)		FM(MSIOF1_SS1)		FM(TPU0TO3_B)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP12_15_12	FM(TPU0TO0_A)		FM(AVB0_AVTP_CAPTURE_A)	FM(HCTS0_N)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='ctx'> #define IP12_19_16	FM(TPU0TO1_A)		FM(AVB0_AVTP_MATCH_A)	FM(HRTS0_N)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)</div><div class='hunk'>@@ -857,7 +858,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> </div><div class='ctx'> 	/* IPSR11 */</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_3_0,	SDA1),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP11_3_0,	RTS1_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP11_3_0,	RTS1_N),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP11_7_4,	MSIOF1_SCK),</div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP11_7_4,	AVB0_AVTP_PPS_B, SEL_ETHERAVB_1),</div><div class='hunk'>@@ -892,7 +893,7 @@ static const u16 pinmux_data[] = {</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP12_3_0,	TPU0TO0_B),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_MSEL(IP12_7_4,	TX1_A, SEL_SCIF1_0),</div><div class='del'>-	PINMUX_IPSR_GPSR(IP12_7_4,	RTS0_N_TANS),</div><div class='add'>+	PINMUX_IPSR_GPSR(IP12_7_4,	RTS0_N),</div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP12_7_4,	TPU0TO1_B),</div><div class='ctx'> </div><div class='ctx'> 	PINMUX_IPSR_GPSR(IP12_11_8,	SCK2),</div><div class='hunk'>@@ -1704,7 +1705,7 @@ static const unsigned int scif0_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(4, 24), RCAR_GP_PIN(4, 23),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif0_ctrl_mux[] = {</div><div class='del'>-	RTS0_N_TANS_MARK, CTS0_N_MARK,</div><div class='add'>+	RTS0_N_MARK, CTS0_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> /* - SCIF1 ------------------------------------------------------------------ */</div><div class='ctx'> static const unsigned int scif1_data_a_pins[] = {</div><div class='hunk'>@@ -1740,7 +1741,7 @@ static const unsigned int scif1_ctrl_pins[] = {</div><div class='ctx'> 	RCAR_GP_PIN(4, 11), RCAR_GP_PIN(4, 10),</div><div class='ctx'> };</div><div class='ctx'> static const unsigned int scif1_ctrl_mux[] = {</div><div class='del'>-	RTS1_N_TANS_MARK, CTS1_N_MARK,</div><div class='add'>+	RTS1_N_MARK, CTS1_N_MARK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* - SCIF2 ------------------------------------------------------------------ */</div><div class='hunk'>@@ -2374,7 +2375,7 @@ static const struct sh_pfc_function pinmux_functions[] = {</div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	FN_##y</div><div class='ctx'> #define FM(x)		FN_##x</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xe6060100, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2406,9 +2407,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN,	GPSR0_3,</div><div class='ctx'> 		GP_0_2_FN,	GPSR0_2,</div><div class='ctx'> 		GP_0_1_FN,	GPSR0_1,</div><div class='del'>-		GP_0_0_FN,	GPSR0_0, }</div><div class='add'>+		GP_0_0_FN,	GPSR0_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xe6060104, 32, 1, GROUP(</div><div class='ctx'> 		GP_1_31_FN,	GPSR1_31,</div><div class='ctx'> 		GP_1_30_FN,	GPSR1_30,</div><div class='ctx'> 		GP_1_29_FN,	GPSR1_29,</div><div class='hunk'>@@ -2440,9 +2441,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN,	GPSR1_3,</div><div class='ctx'> 		GP_1_2_FN,	GPSR1_2,</div><div class='ctx'> 		GP_1_1_FN,	GPSR1_1,</div><div class='del'>-		GP_1_0_FN,	GPSR1_0, }</div><div class='add'>+		GP_1_0_FN,	GPSR1_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xe6060108, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN,	GPSR2_31,</div><div class='ctx'> 		GP_2_30_FN,	GPSR2_30,</div><div class='ctx'> 		GP_2_29_FN,	GPSR2_29,</div><div class='hunk'>@@ -2474,9 +2475,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN,	GPSR2_3,</div><div class='ctx'> 		GP_2_2_FN,	GPSR2_2,</div><div class='ctx'> 		GP_2_1_FN,	GPSR2_1,</div><div class='del'>-		GP_2_0_FN,	GPSR2_0, }</div><div class='add'>+		GP_2_0_FN,	GPSR2_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xe606010c, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2508,9 +2509,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN,	GPSR3_3,</div><div class='ctx'> 		GP_3_2_FN,	GPSR3_2,</div><div class='ctx'> 		GP_3_1_FN,	GPSR3_1,</div><div class='del'>-		GP_3_0_FN,	GPSR3_0, }</div><div class='add'>+		GP_3_0_FN,	GPSR3_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xe6060110, 32, 1, GROUP(</div><div class='ctx'> 		GP_4_31_FN,	GPSR4_31,</div><div class='ctx'> 		GP_4_30_FN,	GPSR4_30,</div><div class='ctx'> 		GP_4_29_FN,	GPSR4_29,</div><div class='hunk'>@@ -2542,9 +2543,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN,	GPSR4_3,</div><div class='ctx'> 		GP_4_2_FN,	GPSR4_2,</div><div class='ctx'> 		GP_4_1_FN,	GPSR4_1,</div><div class='del'>-		GP_4_0_FN,	GPSR4_0, }</div><div class='add'>+		GP_4_0_FN,	GPSR4_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xe6060114, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2576,9 +2577,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN,	GPSR5_3,</div><div class='ctx'> 		GP_5_2_FN,	GPSR5_2,</div><div class='ctx'> 		GP_5_1_FN,	GPSR5_1,</div><div class='del'>-		GP_5_0_FN,	GPSR5_0, }</div><div class='add'>+		GP_5_0_FN,	GPSR5_0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xe6060118, 32, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2610,14 +2611,14 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_6_3_FN,	GPSR6_3,</div><div class='ctx'> 		GP_6_2_FN,	GPSR6_2,</div><div class='ctx'> 		GP_6_1_FN,	GPSR6_1,</div><div class='del'>-		GP_6_0_FN,	GPSR6_0, }</div><div class='add'>+		GP_6_0_FN,	GPSR6_0, ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='ctx'> </div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR0", 0xe6060200, 32, 4, GROUP(</div><div class='ctx'> 		IP0_31_28</div><div class='ctx'> 		IP0_27_24</div><div class='ctx'> 		IP0_23_20</div><div class='hunk'>@@ -2625,9 +2626,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP0_15_12</div><div class='ctx'> 		IP0_11_8</div><div class='ctx'> 		IP0_7_4</div><div class='del'>-		IP0_3_0 }</div><div class='add'>+		IP0_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR1", 0xe6060204, 32, 4, GROUP(</div><div class='ctx'> 		IP1_31_28</div><div class='ctx'> 		IP1_27_24</div><div class='ctx'> 		IP1_23_20</div><div class='hunk'>@@ -2635,9 +2636,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP1_15_12</div><div class='ctx'> 		IP1_11_8</div><div class='ctx'> 		IP1_7_4</div><div class='del'>-		IP1_3_0 }</div><div class='add'>+		IP1_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR2", 0xe6060208, 32, 4, GROUP(</div><div class='ctx'> 		IP2_31_28</div><div class='ctx'> 		IP2_27_24</div><div class='ctx'> 		IP2_23_20</div><div class='hunk'>@@ -2645,9 +2646,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP2_15_12</div><div class='ctx'> 		IP2_11_8</div><div class='ctx'> 		IP2_7_4</div><div class='del'>-		IP2_3_0 }</div><div class='add'>+		IP2_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR3", 0xe606020c, 32, 4, GROUP(</div><div class='ctx'> 		IP3_31_28</div><div class='ctx'> 		IP3_27_24</div><div class='ctx'> 		IP3_23_20</div><div class='hunk'>@@ -2655,9 +2656,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP3_15_12</div><div class='ctx'> 		IP3_11_8</div><div class='ctx'> 		IP3_7_4</div><div class='del'>-		IP3_3_0 }</div><div class='add'>+		IP3_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR4", 0xe6060210, 32, 4, GROUP(</div><div class='ctx'> 		IP4_31_28</div><div class='ctx'> 		IP4_27_24</div><div class='ctx'> 		IP4_23_20</div><div class='hunk'>@@ -2665,9 +2666,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP4_15_12</div><div class='ctx'> 		IP4_11_8</div><div class='ctx'> 		IP4_7_4</div><div class='del'>-		IP4_3_0 }</div><div class='add'>+		IP4_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR5", 0xe6060214, 32, 4, GROUP(</div><div class='ctx'> 		IP5_31_28</div><div class='ctx'> 		IP5_27_24</div><div class='ctx'> 		IP5_23_20</div><div class='hunk'>@@ -2675,9 +2676,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP5_15_12</div><div class='ctx'> 		IP5_11_8</div><div class='ctx'> 		IP5_7_4</div><div class='del'>-		IP5_3_0 }</div><div class='add'>+		IP5_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR6", 0xe6060218, 32, 4, GROUP(</div><div class='ctx'> 		IP6_31_28</div><div class='ctx'> 		IP6_27_24</div><div class='ctx'> 		IP6_23_20</div><div class='hunk'>@@ -2685,9 +2686,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP6_15_12</div><div class='ctx'> 		IP6_11_8</div><div class='ctx'> 		IP6_7_4</div><div class='del'>-		IP6_3_0 }</div><div class='add'>+		IP6_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR7", 0xe606021c, 32, 4, GROUP(</div><div class='ctx'> 		IP7_31_28</div><div class='ctx'> 		IP7_27_24</div><div class='ctx'> 		IP7_23_20</div><div class='hunk'>@@ -2695,9 +2696,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP7_15_12</div><div class='ctx'> 		IP7_11_8</div><div class='ctx'> 		IP7_7_4</div><div class='del'>-		IP7_3_0 }</div><div class='add'>+		IP7_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR8", 0xe6060220, 32, 4, GROUP(</div><div class='ctx'> 		IP8_31_28</div><div class='ctx'> 		IP8_27_24</div><div class='ctx'> 		IP8_23_20</div><div class='hunk'>@@ -2705,9 +2706,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP8_15_12</div><div class='ctx'> 		IP8_11_8</div><div class='ctx'> 		IP8_7_4</div><div class='del'>-		IP8_3_0 }</div><div class='add'>+		IP8_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR9", 0xe6060224, 32, 4, GROUP(</div><div class='ctx'> 		IP9_31_28</div><div class='ctx'> 		IP9_27_24</div><div class='ctx'> 		IP9_23_20</div><div class='hunk'>@@ -2715,9 +2716,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP9_15_12</div><div class='ctx'> 		IP9_11_8</div><div class='ctx'> 		IP9_7_4</div><div class='del'>-		IP9_3_0 }</div><div class='add'>+		IP9_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR10", 0xe6060228, 32, 4, GROUP(</div><div class='ctx'> 		IP10_31_28</div><div class='ctx'> 		IP10_27_24</div><div class='ctx'> 		IP10_23_20</div><div class='hunk'>@@ -2725,9 +2726,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP10_15_12</div><div class='ctx'> 		IP10_11_8</div><div class='ctx'> 		IP10_7_4</div><div class='del'>-		IP10_3_0 }</div><div class='add'>+		IP10_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR11", 0xe606022c, 32, 4, GROUP(</div><div class='ctx'> 		IP11_31_28</div><div class='ctx'> 		IP11_27_24</div><div class='ctx'> 		IP11_23_20</div><div class='hunk'>@@ -2735,9 +2736,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP11_15_12</div><div class='ctx'> 		IP11_11_8</div><div class='ctx'> 		IP11_7_4</div><div class='del'>-		IP11_3_0 }</div><div class='add'>+		IP11_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR12", 0xe6060230, 32, 4, GROUP(</div><div class='ctx'> 		IP12_31_28</div><div class='ctx'> 		IP12_27_24</div><div class='ctx'> 		IP12_23_20</div><div class='hunk'>@@ -2745,9 +2746,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		IP12_15_12</div><div class='ctx'> 		IP12_11_8</div><div class='ctx'> 		IP12_7_4</div><div class='del'>-		IP12_3_0 }</div><div class='add'>+		IP12_3_0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IPSR13", 0xe6060234, 32, 4, GROUP(</div><div class='ctx'> 		/* IP13_31_28 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP13_27_24 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP13_23_20 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2755,7 +2756,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP13_15_12 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* IP13_11_8  */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		IP13_7_4</div><div class='del'>-		IP13_3_0 }</div><div class='add'>+		IP13_3_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #undef F_</div><div class='ctx'> #undef FM</div><div class='hunk'>@@ -2763,8 +2764,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> #define F_(x, y)	x,</div><div class='ctx'> #define FM(x)		FN_##x,</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL0", 0xe6060500, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1,</div><div class='add'>+				   1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* RESERVED 31 */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		MOD_SEL0_30</div><div class='hunk'>@@ -2792,11 +2794,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		MOD_SEL0_3</div><div class='ctx'> 		MOD_SEL0_2</div><div class='ctx'> 		MOD_SEL0_1</div><div class='del'>-		MOD_SEL0_0 }</div><div class='add'>+		MOD_SEL0_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,</div><div class='del'>-			     1, 1, 1, 1, 1, 1, 2, 4, 4,</div><div class='del'>-			     4, 4, 4, 4) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 2, 4, 4, 4, 4, 4, 4),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		MOD_SEL1_31</div><div class='ctx'> 		MOD_SEL1_30</div><div class='ctx'> 		MOD_SEL1_29</div><div class='hunk'>@@ -2816,7 +2818,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* RESERVED 7, 6, 5, 4  */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* RESERVED 3, 2, 1, 0  */</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='hunk'>@@ -2833,6 +2835,15 @@ static int r8a77995_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, u32 *po</div><div class='ctx'> 	return bit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum ioctrl_regs {</div><div class='add'>+	TDSELCTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {</div><div class='add'>+	[TDSELCTRL] = { 0xe60603c0, },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct sh_pfc_soc_operations r8a77995_pinmux_ops = {</div><div class='ctx'> 	.pin_to_pocctrl = r8a77995_pin_to_pocctrl,</div><div class='ctx'> };</div><div class='hunk'>@@ -2852,6 +2863,7 @@ const struct sh_pfc_soc_info r8a77995_pinmux_info = {</div><div class='ctx'> 	.nr_functions = ARRAY_SIZE(pinmux_functions),</div><div class='ctx'> </div><div class='ctx'> 	.cfg_regs = pinmux_config_regs,</div><div class='add'>+	.ioctrl_regs = pinmux_ioctrl_regs,</div><div class='ctx'> </div><div class='ctx'> 	.pinmux_data = pinmux_data,</div><div class='ctx'> 	.pinmux_data_size = ARRAY_SIZE(pinmux_data),</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7203.c b/drivers/pinctrl/sh-pfc/pfc-sh7203.c<br/>index 9ee468a9bd0e..811a6f2cb1fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7203.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7203.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7203.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7203.c</a></div><div class='hunk'>@@ -1073,7 +1073,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PBIORL", 0xfffe3886, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBIORL", 0xfffe3886, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1089,9 +1089,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCRL4", 0xfffe3890, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCRL4", 0xfffe3890, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1099,9 +1099,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB12MD_00, PB12MD_01, PB12MD_10, PB12MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCRL3", 0xfffe3892, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCRL3", 0xfffe3892, 16, 4, GROUP(</div><div class='ctx'> 		PB11MD_0, PB11MD_1,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1112,9 +1112,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB8MD_00, PB8MD_01, PB8MD_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCRL2", 0xfffe3894, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCRL2", 0xfffe3894, 16, 4, GROUP(</div><div class='ctx'> 		PB7MD_00, PB7MD_01, PB7MD_10, PB7MD_11,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1125,9 +1125,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB4MD_00, PB4MD_01, PB4MD_10, PB4MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCRL1", 0xfffe3896, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCRL1", 0xfffe3896, 16, 4, GROUP(</div><div class='ctx'> 		PB3MD_00, PB3MD_01, PB3MD_10, PB3MD_11,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1138,9 +1138,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB0MD_00, PB0MD_01, PB0MD_10, PB0MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("IFCR", 0xfffe38a2, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("IFCR", 0xfffe38a2, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1148,9 +1148,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB12IRQ_00, PB12IRQ_01, PB12IRQ_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCIORL", 0xfffe3906, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCIORL", 0xfffe3906, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PC14_IN, PC14_OUT,</div><div class='ctx'> 		PC13_IN, PC13_OUT,</div><div class='hunk'>@@ -1166,9 +1166,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC3_IN, PC3_OUT,</div><div class='ctx'> 		PC2_IN, PC2_OUT,</div><div class='ctx'> 		PC1_IN, PC1_OUT,</div><div class='del'>-		PC0_IN, PC0_OUT }</div><div class='add'>+		PC0_IN, PC0_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCRL4", 0xfffe3910, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCRL4", 0xfffe3910, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC14MD_0, PC14MD_1,</div><div class='hunk'>@@ -1178,9 +1178,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC12MD_0, PC12MD_1,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCRL3", 0xfffe3912, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCRL3", 0xfffe3912, 16, 4, GROUP(</div><div class='ctx'> 		PC11MD_00, PC11MD_01, PC11MD_10, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1191,9 +1191,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC8MD_0, PC8MD_1,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCRL2", 0xfffe3914, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCRL2", 0xfffe3914, 16, 4, GROUP(</div><div class='ctx'> 		PC7MD_0, PC7MD_1,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1204,9 +1204,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC4MD_0, PC4MD_1,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCRL1", 0xfffe3916, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCRL1", 0xfffe3916, 16, 4, GROUP(</div><div class='ctx'> 		PC3MD_0, PC3MD_1,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1217,9 +1217,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC0MD_00, PC0MD_01, PC0MD_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDIORL", 0xfffe3986, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDIORL", 0xfffe3986, 16, 1, GROUP(</div><div class='ctx'> 		PD15_IN, PD15_OUT,</div><div class='ctx'> 		PD14_IN, PD14_OUT,</div><div class='ctx'> 		PD13_IN, PD13_OUT,</div><div class='hunk'>@@ -1235,9 +1235,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PD3_IN, PD3_OUT,</div><div class='ctx'> 		PD2_IN, PD2_OUT,</div><div class='ctx'> 		PD1_IN, PD1_OUT,</div><div class='del'>-		PD0_IN, PD0_OUT }</div><div class='add'>+		PD0_IN, PD0_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCRL4", 0xfffe3990, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCRL4", 0xfffe3990, 16, 4, GROUP(</div><div class='ctx'> 		PD15MD_000, PD15MD_001, PD15MD_010, 0,</div><div class='ctx'> 		PD15MD_100, PD15MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1252,9 +1252,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PD12MD_000, PD12MD_001, PD12MD_010, 0,</div><div class='ctx'> 		PD12MD_100, PD12MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCRL3", 0xfffe3992, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCRL3", 0xfffe3992, 16, 4, GROUP(</div><div class='ctx'> 		PD11MD_000, PD11MD_001, PD11MD_010, 0,</div><div class='ctx'> 		PD11MD_100, PD11MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1269,9 +1269,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PD8MD_000, PD8MD_001, PD8MD_010, 0,</div><div class='ctx'> 		PD8MD_100, PD8MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCRL2", 0xfffe3994, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCRL2", 0xfffe3994, 16, 4, GROUP(</div><div class='ctx'> 		PD7MD_000, PD7MD_001, PD7MD_010, PD7MD_011,</div><div class='ctx'> 		PD7MD_100, PD7MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1286,9 +1286,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PD4MD_000, PD4MD_001, PD4MD_010, PD4MD_011,</div><div class='ctx'> 		PD4MD_100, PD4MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCRL1", 0xfffe3996, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCRL1", 0xfffe3996, 16, 4, GROUP(</div><div class='ctx'> 		PD3MD_000, PD3MD_001, PD3MD_010, PD3MD_011,</div><div class='ctx'> 		PD3MD_100, PD3MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1303,9 +1303,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PD0MD_000, PD0MD_001, PD0MD_010, PD0MD_011,</div><div class='ctx'> 		PD0MD_100, PD0MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PEIORL", 0xfffe3a06, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PEIORL", 0xfffe3a06, 16, 1, GROUP(</div><div class='ctx'> 		PE15_IN, PE15_OUT,</div><div class='ctx'> 		PE14_IN, PE14_OUT,</div><div class='ctx'> 		PE13_IN, PE13_OUT,</div><div class='hunk'>@@ -1321,9 +1321,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PE3_IN, PE3_OUT,</div><div class='ctx'> 		PE2_IN, PE2_OUT,</div><div class='ctx'> 		PE1_IN, PE1_OUT,</div><div class='del'>-		PE0_IN, PE0_OUT }</div><div class='add'>+		PE0_IN, PE0_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECRL4", 0xfffe3a10, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECRL4", 0xfffe3a10, 16, 4, GROUP(</div><div class='ctx'> 		PE15MD_00, PE15MD_01, 0, PE15MD_11,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1334,9 +1334,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PE12MD_00, 0, 0, PE12MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECRL3", 0xfffe3a12, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECRL3", 0xfffe3a12, 16, 4, GROUP(</div><div class='ctx'> 		PE11MD_000, PE11MD_001, PE11MD_010, 0,</div><div class='ctx'> 		PE11MD_100, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1349,9 +1349,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PE8MD_00, PE8MD_01, PE8MD_10, PE8MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECRL2", 0xfffe3a14, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECRL2", 0xfffe3a14, 16, 4, GROUP(</div><div class='ctx'> 		PE7MD_000, PE7MD_001, PE7MD_010, PE7MD_011,</div><div class='ctx'> 		PE7MD_100, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1366,9 +1366,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PE4MD_000, PE4MD_001, PE4MD_010, PE4MD_011,</div><div class='ctx'> 		PE4MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECRL1", 0xfffe3a16, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECRL1", 0xfffe3a16, 16, 4, GROUP(</div><div class='ctx'> 		PE3MD_00, PE3MD_01, 0, PE3MD_11,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1380,9 +1380,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PE0MD_000, PE0MD_001, 0, PE0MD_011,</div><div class='ctx'> 		PE0MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFIORH", 0xfffe3a84, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFIORH", 0xfffe3a84, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PF30_IN, PF30_OUT,</div><div class='ctx'> 		PF29_IN, PF29_OUT,</div><div class='hunk'>@@ -1398,9 +1398,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF19_IN, PF19_OUT,</div><div class='ctx'> 		PF18_IN, PF18_OUT,</div><div class='ctx'> 		PF17_IN, PF17_OUT,</div><div class='del'>-		PF16_IN, PF16_OUT }</div><div class='add'>+		PF16_IN, PF16_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFIORL", 0xfffe3a86, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFIORL", 0xfffe3a86, 16, 1, GROUP(</div><div class='ctx'> 		PF15_IN, PF15_OUT,</div><div class='ctx'> 		PF14_IN, PF14_OUT,</div><div class='ctx'> 		PF13_IN, PF13_OUT,</div><div class='hunk'>@@ -1416,9 +1416,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF3_IN, PF3_OUT,</div><div class='ctx'> 		PF2_IN, PF2_OUT,</div><div class='ctx'> 		PF1_IN, PF1_OUT,</div><div class='del'>-		PF0_IN, PF0_OUT }</div><div class='add'>+		PF0_IN, PF0_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRH4", 0xfffe3a88, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRH4", 0xfffe3a88, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF30MD_0, PF30MD_1,</div><div class='hunk'>@@ -1428,9 +1428,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF28MD_0, PF28MD_1,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRH3", 0xfffe3a8a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRH3", 0xfffe3a8a, 16, 4, GROUP(</div><div class='ctx'> 		PF27MD_0, PF27MD_1,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1441,9 +1441,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF24MD_0, PF24MD_1,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRH2", 0xfffe3a8c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRH2", 0xfffe3a8c, 16, 4, GROUP(</div><div class='ctx'> 		PF23MD_00, PF23MD_01, PF23MD_10, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1454,9 +1454,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF20MD_00, PF20MD_01, PF20MD_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRH1", 0xfffe3a8e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRH1", 0xfffe3a8e, 16, 4, GROUP(</div><div class='ctx'> 		PF19MD_00, PF19MD_01, PF19MD_10, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1467,9 +1467,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF16MD_00, PF16MD_01, PF16MD_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRL4", 0xfffe3a90, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRL4", 0xfffe3a90, 16, 4, GROUP(</div><div class='ctx'> 		PF15MD_00, PF15MD_01, PF15MD_10, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1480,9 +1480,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF12MD_00, PF12MD_01, PF12MD_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRL3", 0xfffe3a92, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRL3", 0xfffe3a92, 16, 4, GROUP(</div><div class='ctx'> 		PF11MD_00, PF11MD_01, PF11MD_10, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1493,9 +1493,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF8MD_00, PF8MD_01, PF8MD_10, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRL2", 0xfffe3a94, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRL2", 0xfffe3a94, 16, 4, GROUP(</div><div class='ctx'> 		PF7MD_00, PF7MD_01, PF7MD_10, PF7MD_11,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1506,9 +1506,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF4MD_00, PF4MD_01, PF4MD_10, PF4MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCRL1", 0xfffe3a96, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCRL1", 0xfffe3a96, 16, 4, GROUP(</div><div class='ctx'> 		PF3MD_00, PF3MD_01, PF3MD_10, PF3MD_11,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1519,53 +1519,53 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF0MD_00, PF0MD_01, PF0MD_10, PF0MD_11,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADRL", 0xfffe3802, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADRL", 0xfffe3802, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA,</div><div class='del'>-		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA }</div><div class='add'>+		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDRL", 0xfffe3882, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDRL", 0xfffe3882, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, PB12_DATA,</div><div class='ctx'> 		PB11_DATA, PB10_DATA, PB9_DATA, PB8_DATA,</div><div class='ctx'> 		PB7_DATA, PB6_DATA, PB5_DATA, PB4_DATA,</div><div class='del'>-		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA }</div><div class='add'>+		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDRL", 0xfffe3902, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDRL", 0xfffe3902, 16, GROUP(</div><div class='ctx'> 		0, PC14_DATA, PC13_DATA, PC12_DATA,</div><div class='ctx'> 		PC11_DATA, PC10_DATA, PC9_DATA, PC8_DATA,</div><div class='ctx'> 		PC7_DATA, PC6_DATA, PC5_DATA, PC4_DATA,</div><div class='del'>-		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA }</div><div class='add'>+		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDRL", 0xfffe3982, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDRL", 0xfffe3982, 16, GROUP(</div><div class='ctx'> 		PD15_DATA, PD14_DATA, PD13_DATA, PD12_DATA,</div><div class='ctx'> 		PD11_DATA, PD10_DATA, PD9_DATA, PD8_DATA,</div><div class='ctx'> 		PD7_DATA, PD6_DATA, PD5_DATA, PD4_DATA,</div><div class='del'>-		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA }</div><div class='add'>+		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDRL", 0xfffe3a02, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDRL", 0xfffe3a02, 16, GROUP(</div><div class='ctx'> 		PE15_DATA, PE14_DATA, PE13_DATA, PE12_DATA,</div><div class='ctx'> 		PE11_DATA, PE10_DATA, PE9_DATA, PE8_DATA,</div><div class='ctx'> 		PE7_DATA, PE6_DATA, PE5_DATA, PE4_DATA,</div><div class='del'>-		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA }</div><div class='add'>+		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDRH", 0xfffe3a80, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDRH", 0xfffe3a80, 16, GROUP(</div><div class='ctx'> 		0, PF30_DATA, PF29_DATA, PF28_DATA,</div><div class='ctx'> 		PF27_DATA, PF26_DATA, PF25_DATA, PF24_DATA,</div><div class='ctx'> 		PF23_DATA, PF22_DATA, PF21_DATA, PF20_DATA,</div><div class='del'>-		PF19_DATA, PF18_DATA, PF17_DATA, PF16_DATA }</div><div class='add'>+		PF19_DATA, PF18_DATA, PF17_DATA, PF16_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDRL", 0xfffe3a82, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDRL", 0xfffe3a82, 16, GROUP(</div><div class='ctx'> 		PF15_DATA, PF14_DATA, PF13_DATA, PF12_DATA,</div><div class='ctx'> 		PF11_DATA, PF10_DATA, PF9_DATA, PF8_DATA,</div><div class='ctx'> 		PF7_DATA, PF6_DATA, PF5_DATA, PF4_DATA,</div><div class='del'>-		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA }</div><div class='add'>+		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7264.c b/drivers/pinctrl/sh-pfc/pfc-sh7264.c<br/>index 501de63e6c5f..4a95867deb8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7264.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7264.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7264.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7264.c</a></div><div class='hunk'>@@ -1466,17 +1466,17 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PAIOR0", 0xfffe3812, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PAIOR0", 0xfffe3812, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PA3_IN, PA3_OUT,</div><div class='ctx'> 		PA2_IN, PA2_OUT,</div><div class='ctx'> 		PA1_IN, PA1_OUT,</div><div class='del'>-		PA0_IN,	PA0_OUT }</div><div class='add'>+		PA0_IN,	PA0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PBCR5", 0xfffe3824, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR5", 0xfffe3824, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PB22MD_00, PB22MD_01, PB22MD_10, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1484,10 +1484,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB21MD_0, PB21MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB20MD_1, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> </div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR4", 0xfffe3826, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR4", 0xfffe3826, 16, 4, GROUP(</div><div class='ctx'> 		0, PB19MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB18MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1495,9 +1495,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PB17MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB16MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR3", 0xfffe3828, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR3", 0xfffe3828, 16, 4, GROUP(</div><div class='ctx'> 		0, PB15MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB14MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1505,9 +1505,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PB13MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB12MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR2", 0xfffe382a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR2", 0xfffe382a, 16, 4, GROUP(</div><div class='ctx'> 		0, PB11MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB10MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1515,9 +1515,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PB9MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB8MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR1", 0xfffe382c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR1", 0xfffe382c, 16, 4, GROUP(</div><div class='ctx'> 		0, PB7MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB6MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1525,9 +1525,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PB5MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB4MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR0", 0xfffe382e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR0", 0xfffe382e, 16, 4, GROUP(</div><div class='ctx'> 		0, PB3MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB2MD_1, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1535,10 +1535,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PB1MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PBIOR1", 0xfffe3830, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBIOR1", 0xfffe3830, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1548,10 +1548,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB19_IN, PB19_OUT,</div><div class='ctx'> 		PB18_IN, PB18_OUT,</div><div class='ctx'> 		PB17_IN, PB17_OUT,</div><div class='del'>-		PB16_IN, PB16_OUT }</div><div class='add'>+		PB16_IN, PB16_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PBIOR0", 0xfffe3832, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBIOR0", 0xfffe3832, 16, 1, GROUP(</div><div class='ctx'> 		PB15_IN, PB15_OUT,</div><div class='ctx'> 		PB14_IN, PB14_OUT,</div><div class='ctx'> 		PB13_IN, PB13_OUT,</div><div class='hunk'>@@ -1567,10 +1567,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB3_IN, PB3_OUT,</div><div class='ctx'> 		PB2_IN, PB2_OUT,</div><div class='ctx'> 		PB1_IN, PB1_OUT,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PCCR2", 0xfffe384a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR2", 0xfffe384a, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC10MD_0, PC10MD_1, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1578,9 +1578,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC9MD_0, PC9MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC8MD_00, PC8MD_01, PC8MD_10, PC8MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR1", 0xfffe384c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR1", 0xfffe384c, 16, 4, GROUP(</div><div class='ctx'> 		PC7MD_00, PC7MD_01, PC7MD_10, PC7MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC6MD_00, PC6MD_01, PC6MD_10, PC6MD_11, 0, 0, 0, 0,</div><div class='hunk'>@@ -1588,9 +1588,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC5MD_00, PC5MD_01, PC5MD_10, PC5MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC4MD_0, PC4MD_1, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR0", 0xfffe384e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR0", 0xfffe384e, 16, 4, GROUP(</div><div class='ctx'> 		PC3MD_0, PC3MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC2MD_0, PC2MD_1, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1598,10 +1598,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC1MD_0, PC1MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC0MD_0, PC0MD_1, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PCIOR0", 0xfffe3852, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCIOR0", 0xfffe3852, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC10_IN, PC10_OUT,</div><div class='ctx'> 		PC9_IN, PC9_OUT,</div><div class='hunk'>@@ -1614,10 +1614,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC2_IN, PC2_OUT,</div><div class='ctx'> 		PC1_IN, PC1_OUT,</div><div class='ctx'> 		PC0_IN, PC0_OUT</div><div class='del'>-	 }</div><div class='add'>+	 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PDCR3", 0xfffe3868, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR3", 0xfffe3868, 16, 4, GROUP(</div><div class='ctx'> 		0, PD15MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD14MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1625,9 +1625,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PD13MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD12MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR2", 0xfffe386a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR2", 0xfffe386a, 16, 4, GROUP(</div><div class='ctx'> 		0, PD11MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD10MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1635,9 +1635,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PD9MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD8MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR1", 0xfffe386c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR1", 0xfffe386c, 16, 4, GROUP(</div><div class='ctx'> 		0, PD7MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD6MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1645,9 +1645,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PD5MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD4MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR0", 0xfffe386e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR0", 0xfffe386e, 16, 4, GROUP(</div><div class='ctx'> 		0, PD3MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD2MD_01, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1655,10 +1655,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, PD1MD_01, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PD0MD_01, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PDIOR0", 0xfffe3872, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDIOR0", 0xfffe3872, 16, 1, GROUP(</div><div class='ctx'> 		PD15_IN, PD15_OUT,</div><div class='ctx'> 		PD14_IN, PD14_OUT,</div><div class='ctx'> 		PD13_IN, PD13_OUT,</div><div class='hunk'>@@ -1674,10 +1674,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PD3_IN, PD3_OUT,</div><div class='ctx'> 		PD2_IN, PD2_OUT,</div><div class='ctx'> 		PD1_IN, PD1_OUT,</div><div class='del'>-		PD0_IN, PD0_OUT }</div><div class='add'>+		PD0_IN, PD0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PECR1", 0xfffe388c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR1", 0xfffe388c, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1685,10 +1685,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PE5MD_00, PE5MD_01, 0, PE5MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PE4MD_00, PE4MD_01, 0, PE4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PECR0", 0xfffe388e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR0", 0xfffe388e, 16, 4, GROUP(</div><div class='ctx'> 		PE3MD_00, PE3MD_01, 0, PE3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PE2MD_00, PE2MD_01, 0, PE2MD_11, 0, 0, 0, 0,</div><div class='hunk'>@@ -1697,10 +1697,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PE1MD_100, PE1MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PE0MD_00, PE0MD_01, PE0MD_10, PE0MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PEIOR0", 0xfffe3892, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PEIOR0", 0xfffe3892, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1709,19 +1709,19 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PE3_IN, PE3_OUT,</div><div class='ctx'> 		PE2_IN, PE2_OUT,</div><div class='ctx'> 		PE1_IN, PE1_OUT,</div><div class='del'>-		PE0_IN, PE0_OUT }</div><div class='add'>+		PE0_IN, PE0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFCR3", 0xfffe38a8, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR3", 0xfffe38a8, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF12MD_000, PF12MD_001, 0, PF12MD_011,</div><div class='ctx'> 		PF12MD_100, PF12MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFCR2", 0xfffe38aa, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR2", 0xfffe38aa, 16, 4, GROUP(</div><div class='ctx'> 		PF11MD_000, PF11MD_001, PF11MD_010, PF11MD_011,</div><div class='ctx'> 		PF11MD_100, PF11MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1732,10 +1732,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF9MD_100, PF9MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF8MD_00, PF8MD_01, PF8MD_10, PF8MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFCR1", 0xfffe38ac, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR1", 0xfffe38ac, 16, 4, GROUP(</div><div class='ctx'> 		PF7MD_000, PF7MD_001, PF7MD_010, PF7MD_011,</div><div class='ctx'> 		PF7MD_100, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1747,10 +1747,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF4MD_000, PF4MD_001, PF4MD_010, PF4MD_011,</div><div class='ctx'> 		PF4MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFCR0", 0xfffe38ae, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR0", 0xfffe38ae, 16, 4, GROUP(</div><div class='ctx'> 		PF3MD_000, PF3MD_001, PF3MD_010, PF3MD_011,</div><div class='ctx'> 		PF3MD_100, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1762,10 +1762,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF0MD_000, PF0MD_001, PF0MD_010, PF0MD_011,</div><div class='ctx'> 		PF0MD_100, PF0MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF12_IN, PF12_OUT,</div><div class='ctx'> 		PF11_IN, PF11_OUT,</div><div class='hunk'>@@ -1779,10 +1779,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF3_IN, PF3_OUT,</div><div class='ctx'> 		PF2_IN, PF2_OUT,</div><div class='ctx'> 		PF1_IN, PF1_OUT,</div><div class='del'>-		PF0_IN, PF0_OUT }</div><div class='add'>+		PF0_IN, PF0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR7", 0xfffe38c0, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR7", 0xfffe38c0, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1791,10 +1791,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG0MD_000, PG0MD_001, PG0MD_010, PG0MD_011,</div><div class='ctx'> 		PG0MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR6", 0xfffe38c2, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR6", 0xfffe38c2, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1802,10 +1802,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG24MD_00, PG24MD_01, PG24MD_10, PG24MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR5", 0xfffe38c4, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR5", 0xfffe38c4, 16, 4, GROUP(</div><div class='ctx'> 		PG23MD_00, PG23MD_01, PG23MD_10, PG23MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG22MD_00, PG22MD_01, PG22MD_10, PG22MD_11, 0, 0, 0, 0,</div><div class='hunk'>@@ -1814,10 +1814,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG20MD_000, PG20MD_001, PG20MD_010, PG20MD_011,</div><div class='ctx'> 		PG20MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR4", 0xfffe38c6, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR4", 0xfffe38c6, 16, 4, GROUP(</div><div class='ctx'> 		PG19MD_000, PG19MD_001, PG19MD_010, PG19MD_011,</div><div class='ctx'> 		PG19MD_100, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1829,10 +1829,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG16MD_000, PG16MD_001, PG16MD_010, PG16MD_011,</div><div class='ctx'> 		PG16MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR3", 0xfffe38c8, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR3", 0xfffe38c8, 16, 4, GROUP(</div><div class='ctx'> 		PG15MD_000, PG15MD_001, PG15MD_010, PG15MD_011,</div><div class='ctx'> 		PG15MD_100, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1844,9 +1844,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG12MD_000, PG12MD_001, PG12MD_010, 0,</div><div class='ctx'> 		PG12MD_100, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR2", 0xfffe38ca, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR2", 0xfffe38ca, 16, 4, GROUP(</div><div class='ctx'> 		PG11MD_000, PG11MD_001, PG11MD_010, PG11MD_011,</div><div class='ctx'> 		PG11MD_100, PG11MD_101, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1858,10 +1858,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG8MD_000, PG8MD_001, PG8MD_010, PG8MD_011,</div><div class='ctx'> 		PG8MD_100, PG8MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR1", 0xfffe38cc, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR1", 0xfffe38cc, 16, 4, GROUP(</div><div class='ctx'> 		PG7MD_00, PG7MD_01, PG7MD_10, PG7MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG6MD_00, PG6MD_01, PG6MD_10, PG6MD_11, 0, 0, 0, 0,</div><div class='hunk'>@@ -1869,9 +1869,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG5MD_00, PG5MD_01, PG5MD_10, PG5MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG4MD_00, PG4MD_01, PG4MD_10, PG4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR0", 0xfffe38ce, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR0", 0xfffe38ce, 16, 4, GROUP(</div><div class='ctx'> 		PG3MD_00, PG3MD_01, PG3MD_10, PG3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG2MD_00, PG2MD_01, PG2MD_10, PG2MD_11, 0, 0, 0, 0,</div><div class='hunk'>@@ -1879,9 +1879,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG1MD_00, PG1MD_01, PG1MD_10, PG1MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGIOR1", 0xfffe38d0, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGIOR1", 0xfffe38d0, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG24_IN, PG24_OUT,</div><div class='hunk'>@@ -1892,10 +1892,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG19_IN, PG19_OUT,</div><div class='ctx'> 		PG18_IN, PG18_OUT,</div><div class='ctx'> 		PG17_IN, PG17_OUT,</div><div class='del'>-		PG16_IN, PG16_OUT }</div><div class='add'>+		PG16_IN, PG16_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGIOR0", 0xfffe38d2, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGIOR0", 0xfffe38d2, 16, 1, GROUP(</div><div class='ctx'> 		PG15_IN, PG15_OUT,</div><div class='ctx'> 		PG14_IN, PG14_OUT,</div><div class='ctx'> 		PG13_IN, PG13_OUT,</div><div class='hunk'>@@ -1912,10 +1912,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG2_IN, PG2_OUT,</div><div class='ctx'> 		PG1_IN, PG1_OUT,</div><div class='ctx'> 		PG0_IN, PG0_OUT</div><div class='del'>-	 }</div><div class='add'>+	 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PHCR1", 0xfffe38ec, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR1", 0xfffe38ec, 16, 4, GROUP(</div><div class='ctx'> 		PH7MD_0, PH7MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PH6MD_0, PH6MD_1, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1923,10 +1923,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PH5MD_0, PH5MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PH4MD_0, PH4MD_1, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PHCR0", 0xfffe38ee, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR0", 0xfffe38ee, 16, 4, GROUP(</div><div class='ctx'> 		PH3MD_0, PH3MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PH2MD_0, PH2MD_1, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1934,10 +1934,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PH1MD_0, PH1MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PH0MD_0, PH0MD_1, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PJCR2", 0xfffe390a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR2", 0xfffe390a, 16, 4, GROUP(</div><div class='ctx'> 		PJ11MD_00, PJ11MD_01, PJ11MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ10MD_00, PJ10MD_01, PJ10MD_10, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1945,9 +1945,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ9MD_00, PJ9MD_01, PJ9MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ8MD_00, PJ8MD_01, PJ8MD_10, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR1", 0xfffe390c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR1", 0xfffe390c, 16, 4, GROUP(</div><div class='ctx'> 		PJ7MD_00, PJ7MD_01, PJ7MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ6MD_00, PJ6MD_01, PJ6MD_10, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1955,9 +1955,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ5MD_00, PJ5MD_01, PJ5MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ4MD_00, PJ4MD_01, PJ4MD_10, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR0", 0xfffe390e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR0", 0xfffe390e, 16, 4, GROUP(</div><div class='ctx'> 		PJ3MD_00, PJ3MD_01, PJ3MD_10, PJ3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ2MD_000, PJ2MD_001, PJ2MD_010, PJ2MD_011,</div><div class='hunk'>@@ -1968,9 +1968,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ0MD_000, PJ0MD_001, PJ0MD_010, PJ0MD_011,</div><div class='ctx'> 		PJ0MD_100, PJ0MD_101, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJIOR0", 0xfffe3912, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJIOR0", 0xfffe3912, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ11_IN, PJ11_OUT,</div><div class='ctx'> 		PJ10_IN, PJ10_OUT,</div><div class='hunk'>@@ -1983,10 +1983,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ3_IN, PJ3_OUT,</div><div class='ctx'> 		PJ2_IN, PJ2_OUT,</div><div class='ctx'> 		PJ1_IN, PJ1_OUT,</div><div class='del'>-		PJ0_IN, PJ0_OUT }</div><div class='add'>+		PJ0_IN, PJ0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PKCR2", 0xfffe392a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR2", 0xfffe392a, 16, 4, GROUP(</div><div class='ctx'> 		PK11MD_00, PK11MD_01, PK11MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PK10MD_00, PK10MD_01, PK10MD_10, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1994,10 +1994,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PK9MD_00, PK9MD_01, PK9MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PK8MD_00, PK8MD_01, PK8MD_10, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PKCR1", 0xfffe392c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR1", 0xfffe392c, 16, 4, GROUP(</div><div class='ctx'> 		PK7MD_00, PK7MD_01, PK7MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PK6MD_00, PK6MD_01, PK6MD_10, 0,  0, 0, 0, 0,</div><div class='hunk'>@@ -2005,9 +2005,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PK5MD_00, PK5MD_01, PK5MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PK4MD_00, PK4MD_01, PK4MD_10, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR0", 0xfffe392e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR0", 0xfffe392e, 16, 4, GROUP(</div><div class='ctx'> 		PK3MD_00, PK3MD_01, PK3MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PK2MD_00, PK2MD_01, PK2MD_10, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2015,10 +2015,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PK1MD_00, PK1MD_01, PK1MD_10, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PK0MD_00, PK0MD_01, PK0MD_10, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PKIOR0", 0xfffe3932, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKIOR0", 0xfffe3932, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PJ11_IN, PJ11_OUT,</div><div class='ctx'> 		PJ10_IN, PJ10_OUT,</div><div class='hunk'>@@ -2031,85 +2031,85 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ3_IN, PJ3_OUT,</div><div class='ctx'> 		PJ2_IN, PJ2_OUT,</div><div class='ctx'> 		PJ1_IN, PJ1_OUT,</div><div class='del'>-		PJ0_IN, PJ0_OUT }</div><div class='add'>+		PJ0_IN, PJ0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR1", 0xfffe3814, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR1", 0xfffe3814, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, PA3_DATA,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, PA2_DATA }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, PA2_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PADR0", 0xfffe3816, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR0", 0xfffe3816, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, PA1_DATA,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, PA0_DATA }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, PA0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PBDR1", 0xfffe3834, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR1", 0xfffe3834, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB22_DATA, PB21_DATA, PB20_DATA,</div><div class='del'>-		PB19_DATA, PB18_DATA, PB17_DATA, PB16_DATA }</div><div class='add'>+		PB19_DATA, PB18_DATA, PB17_DATA, PB16_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PBDR0", 0xfffe3836, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR0", 0xfffe3836, 16, GROUP(</div><div class='ctx'> 		PB15_DATA, PB14_DATA, PB13_DATA, PB12_DATA,</div><div class='ctx'> 		PB11_DATA, PB10_DATA, PB9_DATA, PB8_DATA,</div><div class='ctx'> 		PB7_DATA, PB6_DATA, PB5_DATA, PB4_DATA,</div><div class='del'>-		PB3_DATA, PB2_DATA, PB1_DATA, 0 }</div><div class='add'>+		PB3_DATA, PB2_DATA, PB1_DATA, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PCDR0", 0xfffe3856, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR0", 0xfffe3856, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, PC10_DATA, PC9_DATA, PC8_DATA,</div><div class='ctx'> 		PC7_DATA, PC6_DATA, PC5_DATA, PC4_DATA,</div><div class='del'>-		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA }</div><div class='add'>+		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PDDR0", 0xfffe3876, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR0", 0xfffe3876, 16, GROUP(</div><div class='ctx'> 		PD15_DATA, PD14_DATA, PD13_DATA, PD12_DATA,</div><div class='ctx'> 		PD11_DATA, PD10_DATA, PD9_DATA, PD8_DATA,</div><div class='ctx'> 		PD7_DATA, PD6_DATA, PD5_DATA, PD4_DATA,</div><div class='del'>-		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA }</div><div class='add'>+		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PEDR0", 0xfffe3896, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR0", 0xfffe3896, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, PE5_DATA, PE4_DATA,</div><div class='del'>-		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA }</div><div class='add'>+		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PFDR0", 0xfffe38b6, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR0", 0xfffe38b6, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, PF12_DATA,</div><div class='ctx'> 		PF11_DATA, PF10_DATA, PF9_DATA, PF8_DATA,</div><div class='ctx'> 		PF7_DATA, PF6_DATA, PF5_DATA, PF4_DATA,</div><div class='del'>-		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA }</div><div class='add'>+		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PGDR1", 0xfffe38d4, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR1", 0xfffe38d4, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, PG24_DATA,</div><div class='ctx'> 		PG23_DATA, PG22_DATA, PG21_DATA, PG20_DATA,</div><div class='del'>-		PG19_DATA, PG18_DATA, PG17_DATA, PG16_DATA }</div><div class='add'>+		PG19_DATA, PG18_DATA, PG17_DATA, PG16_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PGDR0", 0xfffe38d6, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR0", 0xfffe38d6, 16, GROUP(</div><div class='ctx'> 		PG15_DATA, PG14_DATA, PG13_DATA, PG12_DATA,</div><div class='ctx'> 		PG11_DATA, PG10_DATA, PG9_DATA, PG8_DATA,</div><div class='ctx'> 		PG7_DATA, PG6_DATA, PG5_DATA, PG4_DATA,</div><div class='del'>-		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA }</div><div class='add'>+		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR0", 0xfffe3916, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR0", 0xfffe3916, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, PJ12_DATA,</div><div class='ctx'> 		PJ11_DATA, PJ10_DATA, PJ9_DATA, PJ8_DATA,</div><div class='ctx'> 		PJ7_DATA, PJ6_DATA, PJ5_DATA, PJ4_DATA,</div><div class='del'>-		PJ3_DATA, PJ2_DATA, PJ1_DATA, PJ0_DATA }</div><div class='add'>+		PJ3_DATA, PJ2_DATA, PJ1_DATA, PJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR0", 0xfffe3936, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR0", 0xfffe3936, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, PK12_DATA,</div><div class='ctx'> 		PK11_DATA, PK10_DATA, PK9_DATA, PK8_DATA,</div><div class='ctx'> 		PK7_DATA, PK6_DATA, PK5_DATA, PK4_DATA,</div><div class='del'>-		PK3_DATA, PK2_DATA, PK1_DATA, PK0_DATA }</div><div class='add'>+		PK3_DATA, PK2_DATA, PK1_DATA, PK0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7269.c b/drivers/pinctrl/sh-pfc/pfc-sh7269.c<br/>index a95997a389a4..6cbb18ef77dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7269.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7269.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7269.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7269.c</a></div><div class='hunk'>@@ -1951,13 +1951,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	/* where Field_Width is 1 for single mode registers or 4 for upto 16</div><div class='ctx'> 	   mode registers and modes are described in assending order [0..16] */</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PAIOR0", 0xfffe3812, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PAIOR0", 0xfffe3812, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, PA1_IN, PA1_OUT,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, PA0_IN, PA0_OUT }</div><div class='add'>+		0, 0, 0, 0, 0, 0, PA0_IN, PA0_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR5", 0xfffe3824, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR5", 0xfffe3824, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB22MD_000, PB22MD_001, PB22MD_010, PB22MD_011,</div><div class='hunk'>@@ -1969,9 +1969,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PB20MD_000, PB20MD_001, PB20MD_010, PB20MD_011,</div><div class='ctx'> 		PB20MD_100, PB20MD_101, PB20MD_110, PB20MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR4", 0xfffe3826, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR4", 0xfffe3826, 16, 4, GROUP(</div><div class='ctx'> 		PB19MD_000, PB19MD_001, PB19MD_010, PB19MD_011,</div><div class='ctx'> 		PB19MD_100, PB19MD_101, PB19MD_110, PB19MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -1986,9 +1986,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PB16MD_000, PB16MD_001, PB16MD_010, PB16MD_011,</div><div class='ctx'> 		PB16MD_100, PB16MD_101, PB16MD_110, PB16MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR3", 0xfffe3828, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR3", 0xfffe3828, 16, 4, GROUP(</div><div class='ctx'> 		PB15MD_000, PB15MD_001, PB15MD_010, PB15MD_011,</div><div class='ctx'> 		PB15MD_100, PB15MD_101, PB15MD_110, PB15MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2002,9 +2002,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB12MD_00, PB12MD_01, PB12MD_10, PB12MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR2", 0xfffe382a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR2", 0xfffe382a, 16, 4, GROUP(</div><div class='ctx'> 		PB11MD_00, PB11MD_01, PB11MD_10, PB11MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2015,9 +2015,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB8MD_00, PB8MD_01, PB8MD_10, PB8MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR1", 0xfffe382c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR1", 0xfffe382c, 16, 4, GROUP(</div><div class='ctx'> 		PB7MD_00, PB7MD_01, PB7MD_10, PB7MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2028,9 +2028,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PB4MD_00, PB4MD_01, PB4MD_10, PB4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR0", 0xfffe382e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR0", 0xfffe382e, 16, 4, GROUP(</div><div class='ctx'> 		PB3MD_00, PB3MD_01, PB3MD_10, PB3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2040,10 +2040,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB1MD_00, PB1MD_01, PB1MD_10, PB1MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PBIOR1", 0xfffe3830, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBIOR1", 0xfffe3830, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2053,9 +2053,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB19_IN, PB19_OUT,</div><div class='ctx'> 		PB18_IN, PB18_OUT,</div><div class='ctx'> 		PB17_IN, PB17_OUT,</div><div class='del'>-		PB16_IN, PB16_OUT }</div><div class='add'>+		PB16_IN, PB16_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBIOR0", 0xfffe3832, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBIOR0", 0xfffe3832, 16, 1, GROUP(</div><div class='ctx'> 		PB15_IN, PB15_OUT,</div><div class='ctx'> 		PB14_IN, PB14_OUT,</div><div class='ctx'> 		PB13_IN, PB13_OUT,</div><div class='hunk'>@@ -2071,10 +2071,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB3_IN, PB3_OUT,</div><div class='ctx'> 		PB2_IN, PB2_OUT,</div><div class='ctx'> 		PB1_IN, PB1_OUT,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PCCR2", 0xfffe384a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR2", 0xfffe384a, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2083,9 +2083,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PC8MD_000, PC8MD_001, PC8MD_010, PC8MD_011,</div><div class='ctx'> 		PC8MD_100, PC8MD_101, PC8MD_110, PC8MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR1", 0xfffe384c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR1", 0xfffe384c, 16, 4, GROUP(</div><div class='ctx'> 		PC7MD_000, PC7MD_001, PC7MD_010, PC7MD_011,</div><div class='ctx'> 		PC7MD_100, PC7MD_101, PC7MD_110, PC7MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2099,9 +2099,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC4MD_00, PC4MD_01, PC4MD_10, PC4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR0", 0xfffe384e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR0", 0xfffe384e, 16, 4, GROUP(</div><div class='ctx'> 		PC3MD_00, PC3MD_01, PC3MD_10, PC3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2112,10 +2112,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PC0MD_0, PC0MD_1, 0, 0, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PCIOR0", 0xfffe3852, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCIOR0", 0xfffe3852, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC8_IN, PC8_OUT,</div><div class='ctx'> 		PC7_IN, PC7_OUT,</div><div class='hunk'>@@ -2125,10 +2125,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC3_IN, PC3_OUT,</div><div class='ctx'> 		PC2_IN, PC2_OUT,</div><div class='ctx'> 		PC1_IN, PC1_OUT,</div><div class='del'>-		PC0_IN, PC0_OUT }</div><div class='add'>+		PC0_IN, PC0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PDCR3", 0xfffe3868, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR3", 0xfffe3868, 16, 4, GROUP(</div><div class='ctx'> 		PD15MD_00, PD15MD_01, PD15MD_10, PD15MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2139,9 +2139,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PD12MD_00, PD12MD_01, PD12MD_10, PD12MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR2", 0xfffe386a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR2", 0xfffe386a, 16, 4, GROUP(</div><div class='ctx'> 		PD11MD_00, PD11MD_01, PD11MD_10, PD11MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2152,9 +2152,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PD8MD_00, PD8MD_01, PD8MD_10, PD8MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR1", 0xfffe386c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR1", 0xfffe386c, 16, 4, GROUP(</div><div class='ctx'> 		PD7MD_00, PD7MD_01, PD7MD_10, PD7MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2165,9 +2165,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PD4MD_00, PD4MD_01, PD4MD_10, PD4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR0", 0xfffe386e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR0", 0xfffe386e, 16, 4, GROUP(</div><div class='ctx'> 		PD3MD_00, PD3MD_01, PD3MD_10, PD3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2178,10 +2178,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PD0MD_00, PD0MD_01, PD0MD_10, PD0MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PDIOR0", 0xfffe3872, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDIOR0", 0xfffe3872, 16, 1, GROUP(</div><div class='ctx'> 		PD15_IN, PD15_OUT,</div><div class='ctx'> 		PD14_IN, PD14_OUT,</div><div class='ctx'> 		PD13_IN, PD13_OUT,</div><div class='hunk'>@@ -2197,10 +2197,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PD3_IN, PD3_OUT,</div><div class='ctx'> 		PD2_IN, PD2_OUT,</div><div class='ctx'> 		PD1_IN, PD1_OUT,</div><div class='del'>-		PD0_IN, PD0_OUT }</div><div class='add'>+		PD0_IN, PD0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PECR1", 0xfffe388c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR1", 0xfffe388c, 16, 4, GROUP(</div><div class='ctx'> 		PE7MD_00, PE7MD_01, PE7MD_10, PE7MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2211,9 +2211,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PE4MD_00, PE4MD_01, PE4MD_10, PE4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR0", 0xfffe388e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR0", 0xfffe388e, 16, 4, GROUP(</div><div class='ctx'> 		PE3MD_000, PE3MD_001, PE3MD_010, PE3MD_011,</div><div class='ctx'> 		PE3MD_100, PE3MD_101, PE3MD_110, PE3MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2227,9 +2227,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PE0MD_00, PE0MD_01, PE0MD_10, PE0MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PEIOR0", 0xfffe3892, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PEIOR0", 0xfffe3892, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PE7_IN, PE7_OUT,</div><div class='hunk'>@@ -2239,10 +2239,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PE3_IN, PE3_OUT,</div><div class='ctx'> 		PE2_IN, PE2_OUT,</div><div class='ctx'> 		PE1_IN, PE1_OUT,</div><div class='del'>-		PE0_IN, PE0_OUT }</div><div class='add'>+		PE0_IN, PE0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFCR6", 0xfffe38a2, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR6", 0xfffe38a2, 16, 4, GROUP(</div><div class='ctx'> 		PF23MD_000, PF23MD_001, PF23MD_010, PF23MD_011,</div><div class='ctx'> 		PF23MD_100, PF23MD_101, PF23MD_110, PF23MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2257,9 +2257,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF20MD_000, PF20MD_001, PF20MD_010, PF20MD_011,</div><div class='ctx'> 		PF20MD_100, PF20MD_101, PF20MD_110, PF20MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR5", 0xfffe38a4, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR5", 0xfffe38a4, 16, 4, GROUP(</div><div class='ctx'> 		PF19MD_000, PF19MD_001, PF19MD_010, PF19MD_011,</div><div class='ctx'> 		PF19MD_100, PF19MD_101, PF19MD_110, PF19MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2274,9 +2274,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF16MD_000, PF16MD_001, PF16MD_010, PF16MD_011,</div><div class='ctx'> 		PF16MD_100, PF16MD_101, PF16MD_110, PF16MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR4", 0xfffe38a6, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR4", 0xfffe38a6, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2285,9 +2285,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF15MD_000, PF15MD_001, PF15MD_010, PF15MD_011,</div><div class='ctx'> 		PF15MD_100, PF15MD_101, PF15MD_110, PF15MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR3", 0xfffe38a8, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR3", 0xfffe38a8, 16, 4, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PF14MD_000, PF14MD_001, PF14MD_010, PF14MD_011,</div><div class='hunk'>@@ -2300,9 +2300,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF12MD_000, PF12MD_001, PF12MD_010, PF12MD_011,</div><div class='ctx'> 		PF12MD_100, PF12MD_101, PF12MD_110, PF12MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR2", 0xfffe38aa, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR2", 0xfffe38aa, 16, 4, GROUP(</div><div class='ctx'> 		PF11MD_000, PF11MD_001, PF11MD_010, PF11MD_011,</div><div class='ctx'> 		PF11MD_100, PF11MD_101, PF11MD_110, PF11MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2317,9 +2317,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF8MD_000, PF8MD_001, PF8MD_010, PF8MD_011,</div><div class='ctx'> 		PF8MD_100, PF8MD_101, PF8MD_110, PF8MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR1", 0xfffe38ac, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR1", 0xfffe38ac, 16, 4, GROUP(</div><div class='ctx'> 		PF7MD_000, PF7MD_001, PF7MD_010, PF7MD_011,</div><div class='ctx'> 		PF7MD_100, PF7MD_101, PF7MD_110, PF7MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2334,9 +2334,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF4MD_000, PF4MD_001, PF4MD_010, PF4MD_011,</div><div class='ctx'> 		PF4MD_100, PF4MD_101, PF4MD_110, PF4MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR0", 0xfffe38ae, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR0", 0xfffe38ae, 16, 4, GROUP(</div><div class='ctx'> 		PF3MD_000, PF3MD_001, PF3MD_010, PF3MD_011,</div><div class='ctx'> 		PF3MD_100, PF3MD_101, PF3MD_110, PF3MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2351,10 +2351,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PF0MD_000, PF0MD_001, PF0MD_010, PF0MD_011,</div><div class='ctx'> 		PF0MD_100, PF0MD_101, PF0MD_110, PF0MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PFIOR1", 0xfffe38b0, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFIOR1", 0xfffe38b0, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF23_IN, PF23_OUT,</div><div class='hunk'>@@ -2364,9 +2364,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF19_IN, PF19_OUT,</div><div class='ctx'> 		PF18_IN, PF18_OUT,</div><div class='ctx'> 		PF17_IN, PF17_OUT,</div><div class='del'>-		PF16_IN, PF16_OUT }</div><div class='add'>+		PF16_IN, PF16_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1, GROUP(</div><div class='ctx'> 		PF15_IN, PF15_OUT,</div><div class='ctx'> 		PF14_IN, PF14_OUT,</div><div class='ctx'> 		PF13_IN, PF13_OUT,</div><div class='hunk'>@@ -2382,10 +2382,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF3_IN, PF3_OUT,</div><div class='ctx'> 		PF2_IN, PF2_OUT,</div><div class='ctx'> 		PF1_IN, PF1_OUT,</div><div class='del'>-		PF0_IN, PF0_OUT }</div><div class='add'>+		PF0_IN, PF0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR6", 0xfffe38c2, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR6", 0xfffe38c2, 16, 4, GROUP(</div><div class='ctx'> 		PG27MD_00, PG27MD_01, PG27MD_10, PG27MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2396,9 +2396,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PG24MD_00, PG24MD_01, PG24MD_10, PG24MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR5", 0xfffe38c4, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR5", 0xfffe38c4, 16, 4, GROUP(</div><div class='ctx'> 		PG23MD_000, PG23MD_001, PG23MD_010, PG23MD_011,</div><div class='ctx'> 		PG23MD_100, PG23MD_101, PG23MD_110, PG23MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2413,9 +2413,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PG20MD_000, PG20MD_001, PG20MD_010, PG20MD_011,</div><div class='ctx'> 		PG20MD_100, PG20MD_101, PG20MD_110, PG20MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR4", 0xfffe38c6, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR4", 0xfffe38c6, 16, 4, GROUP(</div><div class='ctx'> 		PG19MD_000, PG19MD_001, PG19MD_010, PG19MD_011,</div><div class='ctx'> 		PG19MD_100, PG19MD_101, PG19MD_110, PG19MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2428,9 +2428,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PG16MD_00, PG16MD_01, PG16MD_10, PG16MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR3", 0xfffe38c8, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR3", 0xfffe38c8, 16, 4, GROUP(</div><div class='ctx'> 		PG15MD_00, PG15MD_01, PG15MD_10, PG15MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2441,9 +2441,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PG12MD_00, PG12MD_01, PG12MD_10, PG12MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR2", 0xfffe38ca, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR2", 0xfffe38ca, 16, 4, GROUP(</div><div class='ctx'> 		PG11MD_000, PG11MD_001, PG11MD_010, PG11MD_011,</div><div class='ctx'> 		PG11MD_100, PG11MD_101, PG11MD_110, PG11MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2458,10 +2458,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PG8MD_000, PG8MD_001, PG8MD_010, PG8MD_011,</div><div class='ctx'> 		PG8MD_100, PG8MD_101, PG8MD_110, PG8MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGCR1", 0xfffe38cc, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR1", 0xfffe38cc, 16, 4, GROUP(</div><div class='ctx'> 		PG7MD_000, PG7MD_001, PG7MD_010, PG7MD_011,</div><div class='ctx'> 		PG7MD_100, PG7MD_101, PG7MD_110, PG7MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2476,9 +2476,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PG4MD_000, PG4MD_001, PG4MD_010, PG4MD_011,</div><div class='ctx'> 		PG4MD_100, PG4MD_101, PG4MD_110, PG4MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR0", 0xfffe38ce, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR0", 0xfffe38ce, 16, 4, GROUP(</div><div class='ctx'> 		PG3MD_000, PG3MD_001, PG3MD_010, PG3MD_011,</div><div class='ctx'> 		PG3MD_100, PG3MD_101, PG3MD_110, PG3MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2493,10 +2493,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PG0MD_000, PG0MD_001, PG0MD_010, PG0MD_011,</div><div class='ctx'> 		PG0MD_100, PG0MD_101, PG0MD_110, PG0MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PGIOR1", 0xfffe38d0, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGIOR1", 0xfffe38d0, 16, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG27_IN, PG27_OUT,</div><div class='ctx'> 		PG26_IN, PG26_OUT,</div><div class='hunk'>@@ -2509,9 +2509,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG19_IN, PG19_OUT,</div><div class='ctx'> 		PG18_IN, PG18_OUT,</div><div class='ctx'> 		PG17_IN, PG17_OUT,</div><div class='del'>-		PG16_IN, PG16_OUT }</div><div class='add'>+		PG16_IN, PG16_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGIOR0", 0xfffe38d2, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGIOR0", 0xfffe38d2, 16, 1, GROUP(</div><div class='ctx'> 		PG15_IN, PG15_OUT,</div><div class='ctx'> 		PG14_IN, PG14_OUT,</div><div class='ctx'> 		PG13_IN, PG13_OUT,</div><div class='hunk'>@@ -2527,10 +2527,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG3_IN, PG3_OUT,</div><div class='ctx'> 		PG2_IN, PG2_OUT,</div><div class='ctx'> 		PG1_IN, PG1_OUT,</div><div class='del'>-		PG0_IN, PG0_OUT }</div><div class='add'>+		PG0_IN, PG0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PHCR1", 0xfffe38ec, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR1", 0xfffe38ec, 16, 4, GROUP(</div><div class='ctx'> 		PH7MD_00, PH7MD_01, PH7MD_10, PH7MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2541,10 +2541,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PH4MD_00, PH4MD_01, PH4MD_10, PH4MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PHCR0", 0xfffe38ee, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR0", 0xfffe38ee, 16, 4, GROUP(</div><div class='ctx'> 		PH3MD_00, PH3MD_01, PH3MD_10, PH3MD_11, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2555,10 +2555,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='ctx'> 		PH0MD_00, PH0MD_01, PH0MD_10, PH0MD_11, 0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PJCR7", 0xfffe3900, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR7", 0xfffe3900, 16, 4, GROUP(</div><div class='ctx'> 		PJ31MD_0, PJ31MD_1, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> </div><div class='hunk'>@@ -2572,9 +2572,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ28MD_000, PJ28MD_001, PJ28MD_010, PJ28MD_011,</div><div class='ctx'> 		PJ28MD_100, PJ28MD_101, PJ28MD_110, PJ28MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR6", 0xfffe3902, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR6", 0xfffe3902, 16, 4, GROUP(</div><div class='ctx'> 		PJ27MD_000, PJ27MD_001, PJ27MD_010, PJ27MD_011,</div><div class='ctx'> 		PJ27MD_100, PJ27MD_101, PJ27MD_110, PJ27MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2589,9 +2589,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ24MD_000, PJ24MD_001, PJ24MD_010, PJ24MD_011,</div><div class='ctx'> 		PJ24MD_100, PJ24MD_101, PJ24MD_110, PJ24MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR5", 0xfffe3904, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR5", 0xfffe3904, 16, 4, GROUP(</div><div class='ctx'> 		PJ23MD_000, PJ23MD_001, PJ23MD_010, PJ23MD_011,</div><div class='ctx'> 		PJ23MD_100, PJ23MD_101, PJ23MD_110, PJ23MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2606,9 +2606,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ20MD_000, PJ20MD_001, PJ20MD_010, PJ20MD_011,</div><div class='ctx'> 		PJ20MD_100, PJ20MD_101, PJ20MD_110, PJ20MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR4", 0xfffe3906, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR4", 0xfffe3906, 16, 4, GROUP(</div><div class='ctx'> 		PJ19MD_000, PJ19MD_001, PJ19MD_010, PJ19MD_011,</div><div class='ctx'> 		PJ19MD_100, PJ19MD_101, PJ19MD_110, PJ19MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2623,9 +2623,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ16MD_000, PJ16MD_001, PJ16MD_010, PJ16MD_011,</div><div class='ctx'> 		PJ16MD_100, PJ16MD_101, PJ16MD_110, PJ16MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR3", 0xfffe3908, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR3", 0xfffe3908, 16, 4, GROUP(</div><div class='ctx'> 		PJ15MD_000, PJ15MD_001, PJ15MD_010, PJ15MD_011,</div><div class='ctx'> 		PJ15MD_100, PJ15MD_101, PJ15MD_110, PJ15MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2640,9 +2640,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ12MD_000, PJ12MD_001, PJ12MD_010, PJ12MD_011,</div><div class='ctx'> 		PJ12MD_100, PJ12MD_101, PJ12MD_110, PJ12MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR2", 0xfffe390a, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR2", 0xfffe390a, 16, 4, GROUP(</div><div class='ctx'> 		PJ11MD_000, PJ11MD_001, PJ11MD_010, PJ11MD_011,</div><div class='ctx'> 		PJ11MD_100, PJ11MD_101, PJ11MD_110, PJ11MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2657,9 +2657,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ8MD_000, PJ8MD_001, PJ8MD_010, PJ8MD_011,</div><div class='ctx'> 		PJ8MD_100, PJ8MD_101, PJ8MD_110, PJ8MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR1", 0xfffe390c, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR1", 0xfffe390c, 16, 4, GROUP(</div><div class='ctx'> 		PJ7MD_000, PJ7MD_001, PJ7MD_010, PJ7MD_011,</div><div class='ctx'> 		PJ7MD_100, PJ7MD_101, PJ7MD_110, PJ7MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2674,9 +2674,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ4MD_000, PJ4MD_001, PJ4MD_010, PJ4MD_011,</div><div class='ctx'> 		PJ4MD_100, PJ4MD_101, PJ4MD_110, PJ4MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR0", 0xfffe390e, 16, 4) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR0", 0xfffe390e, 16, 4, GROUP(</div><div class='ctx'> 		PJ3MD_000, PJ3MD_001, PJ3MD_010, PJ3MD_011,</div><div class='ctx'> 		PJ3MD_100, PJ3MD_101, PJ3MD_110, PJ3MD_111,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='hunk'>@@ -2691,10 +2691,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> </div><div class='ctx'> 		PJ0MD_000, PJ0MD_001, PJ0MD_010, PJ0MD_011,</div><div class='ctx'> 		PJ0MD_100, PJ0MD_101, PJ0MD_110, PJ0MD_111,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PJIOR1", 0xfffe3910, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJIOR1", 0xfffe3910, 16, 1, GROUP(</div><div class='ctx'> 		PJ31_IN, PJ31_OUT,</div><div class='ctx'> 		PJ30_IN, PJ30_OUT,</div><div class='ctx'> 		PJ29_IN, PJ29_OUT,</div><div class='hunk'>@@ -2710,9 +2710,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ19_IN, PJ19_OUT,</div><div class='ctx'> 		PJ18_IN, PJ18_OUT,</div><div class='ctx'> 		PJ17_IN, PJ17_OUT,</div><div class='del'>-		PJ16_IN, PJ16_OUT }</div><div class='add'>+		PJ16_IN, PJ16_OUT ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJIOR0", 0xfffe3912, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJIOR0", 0xfffe3912, 16, 1, GROUP(</div><div class='ctx'> 		PJ15_IN, PJ15_OUT,</div><div class='ctx'> 		PJ14_IN, PJ14_OUT,</div><div class='ctx'> 		PJ13_IN, PJ13_OUT,</div><div class='hunk'>@@ -2728,86 +2728,86 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ3_IN, PJ3_OUT,</div><div class='ctx'> 		PJ2_IN, PJ2_OUT,</div><div class='ctx'> 		PJ1_IN, PJ1_OUT,</div><div class='del'>-		PJ0_IN, PJ0_OUT }</div><div class='add'>+		PJ0_IN, PJ0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR0", 0xfffe3816, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR0", 0xfffe3816, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, PA1_DATA,</div><div class='del'>-		0, 0, 0, 0, 0, 0, 0, PA0_DATA }</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, PA0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PBDR1", 0xfffe3834, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR1", 0xfffe3834, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, PB22_DATA, PB21_DATA, PB20_DATA,</div><div class='del'>-		PB19_DATA, PB18_DATA, PB17_DATA, PB16_DATA }</div><div class='add'>+		PB19_DATA, PB18_DATA, PB17_DATA, PB16_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR0", 0xfffe3836, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR0", 0xfffe3836, 16, GROUP(</div><div class='ctx'> 		PB15_DATA, PB14_DATA, PB13_DATA, PB12_DATA,</div><div class='ctx'> 		PB11_DATA, PB10_DATA, PB9_DATA, PB8_DATA,</div><div class='ctx'> 		PB7_DATA, PB6_DATA, PB5_DATA, PB4_DATA,</div><div class='del'>-		PB3_DATA, PB2_DATA, PB1_DATA, 0 }</div><div class='add'>+		PB3_DATA, PB2_DATA, PB1_DATA, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PCDR0", 0xfffe3856, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR0", 0xfffe3856, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, PC8_DATA,</div><div class='ctx'> 		PC7_DATA, PC6_DATA, PC5_DATA, PC4_DATA,</div><div class='del'>-		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA }</div><div class='add'>+		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PDDR0", 0xfffe3876, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR0", 0xfffe3876, 16, GROUP(</div><div class='ctx'> 		PD15_DATA, PD14_DATA, PD13_DATA, PD12_DATA,</div><div class='ctx'> 		PD11_DATA, PD10_DATA, PD9_DATA, PD8_DATA,</div><div class='ctx'> 		PD7_DATA, PD6_DATA, PD5_DATA, PD4_DATA,</div><div class='del'>-		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA }</div><div class='add'>+		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PEDR0", 0xfffe3896, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR0", 0xfffe3896, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PE7_DATA, PE6_DATA, PE5_DATA, PE4_DATA,</div><div class='del'>-		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA }</div><div class='add'>+		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PFDR1", 0xfffe38b4, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR1", 0xfffe38b4, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF23_DATA, PF22_DATA, PF21_DATA, PF20_DATA,</div><div class='del'>-		PF19_DATA, PF18_DATA, PF17_DATA, PF16_DATA }</div><div class='add'>+		PF19_DATA, PF18_DATA, PF17_DATA, PF16_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR0", 0xfffe38b6, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR0", 0xfffe38b6, 16, GROUP(</div><div class='ctx'> 		PF15_DATA, PF14_DATA, PF13_DATA, PF12_DATA,</div><div class='ctx'> 		PF11_DATA, PF10_DATA, PF9_DATA, PF8_DATA,</div><div class='ctx'> 		PF7_DATA, PF6_DATA, PF5_DATA, PF4_DATA,</div><div class='del'>-		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA }</div><div class='add'>+		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PGDR1", 0xfffe38d4, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR1", 0xfffe38d4, 16, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PG27_DATA, PG26_DATA, PG25_DATA, PG24_DATA,</div><div class='ctx'> 		PG23_DATA, PG22_DATA, PG21_DATA, PG20_DATA,</div><div class='del'>-		PG19_DATA, PG18_DATA, PG17_DATA, PG16_DATA }</div><div class='add'>+		PG19_DATA, PG18_DATA, PG17_DATA, PG16_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR0", 0xfffe38d6, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR0", 0xfffe38d6, 16, GROUP(</div><div class='ctx'> 		PG15_DATA, PG14_DATA, PG13_DATA, PG12_DATA,</div><div class='ctx'> 		PG11_DATA, PG10_DATA, PG9_DATA, PG8_DATA,</div><div class='ctx'> 		PG7_DATA, PG6_DATA, PG5_DATA, PG4_DATA,</div><div class='del'>-		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA }</div><div class='add'>+		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_DATA_REG("PJDR1", 0xfffe3914, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR1", 0xfffe3914, 16, GROUP(</div><div class='ctx'> 		PJ31_DATA, PJ30_DATA, PJ29_DATA, PJ28_DATA,</div><div class='ctx'> 		PJ27_DATA, PJ26_DATA, PJ25_DATA, PJ24_DATA,</div><div class='ctx'> 		PJ23_DATA, PJ22_DATA, PJ21_DATA, PJ20_DATA,</div><div class='del'>-		PJ19_DATA, PJ18_DATA, PJ17_DATA, PJ16_DATA }</div><div class='add'>+		PJ19_DATA, PJ18_DATA, PJ17_DATA, PJ16_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR0", 0xfffe3916, 16) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR0", 0xfffe3916, 16, GROUP(</div><div class='ctx'> 		PJ15_DATA, PJ14_DATA, PJ13_DATA, PJ12_DATA,</div><div class='ctx'> 		PJ11_DATA, PJ10_DATA, PJ9_DATA, PJ8_DATA,</div><div class='ctx'> 		PJ7_DATA, PJ6_DATA, PJ5_DATA, PJ4_DATA,</div><div class='del'>-		PJ3_DATA, PJ2_DATA, PJ1_DATA, PJ0_DATA }</div><div class='add'>+		PJ3_DATA, PJ2_DATA, PJ1_DATA, PJ0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ }</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c<br/>index ef3da8bf1d87..e1276d143117 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh73a0.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh73a0.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh73a0.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh73a0.c</a></div><div class='hunk'>@@ -3971,7 +3971,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	PORTCR(308, 0xe6052134), /* PORT308CR */</div><div class='ctx'> 	PORTCR(309, 0xe6052135), /* PORT309CR */</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("MSEL2CR", 0xe605801c, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL2CR", 0xe605801c, 32, 1, GROUP(</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='hunk'>@@ -4004,9 +4004,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			MSEL2CR_MSEL2_0, MSEL2CR_MSEL2_1,</div><div class='ctx'> 			MSEL2CR_MSEL1_0, MSEL2CR_MSEL1_1,</div><div class='ctx'> 			MSEL2CR_MSEL0_0, MSEL2CR_MSEL0_1,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL3CR", 0xe6058020, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL3CR", 0xe6058020, 32, 1, GROUP(</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='hunk'>@@ -4039,9 +4039,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			MSEL3CR_MSEL2_0, MSEL3CR_MSEL2_1,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSEL4CR", 0xe6058024, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL4CR", 0xe6058024, 32, 1, GROUP(</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL4CR_MSEL29_0, MSEL4CR_MSEL29_1,</div><div class='hunk'>@@ -4074,13 +4074,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			0, 0,</div><div class='ctx'> 			MSEL4CR_MSEL1_0, MSEL4CR_MSEL1_1,</div><div class='ctx'> 			0, 0,</div><div class='del'>-		}</div><div class='add'>+		))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054000, 32, GROUP(</div><div class='ctx'> 			PORT31_DATA, PORT30_DATA, PORT29_DATA, PORT28_DATA,</div><div class='ctx'> 			PORT27_DATA, PORT26_DATA, PORT25_DATA, PORT24_DATA,</div><div class='ctx'> 			PORT23_DATA, PORT22_DATA, PORT21_DATA, PORT20_DATA,</div><div class='hunk'>@@ -4088,9 +4088,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT15_DATA, PORT14_DATA, PORT13_DATA, PORT12_DATA,</div><div class='ctx'> 			PORT11_DATA, PORT10_DATA, PORT9_DATA, PORT8_DATA,</div><div class='ctx'> 			PORT7_DATA, PORT6_DATA, PORT5_DATA, PORT4_DATA,</div><div class='del'>-			PORT3_DATA, PORT2_DATA, PORT1_DATA, PORT0_DATA }</div><div class='add'>+			PORT3_DATA, PORT2_DATA, PORT1_DATA, PORT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD063_032DR", 0xe6055000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD063_032DR", 0xe6055000, 32, GROUP(</div><div class='ctx'> 			PORT63_DATA, PORT62_DATA, PORT61_DATA, PORT60_DATA,</div><div class='ctx'> 			PORT59_DATA, PORT58_DATA, PORT57_DATA, PORT56_DATA,</div><div class='ctx'> 			PORT55_DATA, PORT54_DATA, PORT53_DATA, PORT52_DATA,</div><div class='hunk'>@@ -4098,9 +4098,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT47_DATA, PORT46_DATA, PORT45_DATA, PORT44_DATA,</div><div class='ctx'> 			PORT43_DATA, PORT42_DATA, PORT41_DATA, PORT40_DATA,</div><div class='ctx'> 			PORT39_DATA, PORT38_DATA, PORT37_DATA, PORT36_DATA,</div><div class='del'>-			PORT35_DATA, PORT34_DATA, PORT33_DATA, PORT32_DATA }</div><div class='add'>+			PORT35_DATA, PORT34_DATA, PORT33_DATA, PORT32_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTD095_064DR", 0xe6055004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD095_064DR", 0xe6055004, 32, GROUP(</div><div class='ctx'> 			PORT95_DATA, PORT94_DATA, PORT93_DATA, PORT92_DATA,</div><div class='ctx'> 			PORT91_DATA, PORT90_DATA, PORT89_DATA, PORT88_DATA,</div><div class='ctx'> 			PORT87_DATA, PORT86_DATA, PORT85_DATA, PORT84_DATA,</div><div class='hunk'>@@ -4108,9 +4108,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT79_DATA, PORT78_DATA, PORT77_DATA, PORT76_DATA,</div><div class='ctx'> 			PORT75_DATA, PORT74_DATA, PORT73_DATA, PORT72_DATA,</div><div class='ctx'> 			PORT71_DATA, PORT70_DATA, PORT69_DATA, PORT68_DATA,</div><div class='del'>-			PORT67_DATA, PORT66_DATA, PORT65_DATA, PORT64_DATA }</div><div class='add'>+			PORT67_DATA, PORT66_DATA, PORT65_DATA, PORT64_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR127_096DR", 0xe6056000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR127_096DR", 0xe6056000, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, PORT118_DATA, PORT117_DATA, PORT116_DATA,</div><div class='hunk'>@@ -4118,9 +4118,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT111_DATA, PORT110_DATA, PORT109_DATA, PORT108_DATA,</div><div class='ctx'> 			PORT107_DATA, PORT106_DATA, PORT105_DATA, PORT104_DATA,</div><div class='ctx'> 			PORT103_DATA, PORT102_DATA, PORT101_DATA, PORT100_DATA,</div><div class='del'>-			PORT99_DATA, PORT98_DATA, PORT97_DATA, PORT96_DATA }</div><div class='add'>+			PORT99_DATA, PORT98_DATA, PORT97_DATA, PORT96_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR159_128DR", 0xe6056004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR159_128DR", 0xe6056004, 32, GROUP(</div><div class='ctx'> 			PORT159_DATA, PORT158_DATA, PORT157_DATA, PORT156_DATA,</div><div class='ctx'> 			PORT155_DATA, PORT154_DATA, PORT153_DATA, PORT152_DATA,</div><div class='ctx'> 			PORT151_DATA, PORT150_DATA, PORT149_DATA, PORT148_DATA,</div><div class='hunk'>@@ -4128,9 +4128,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT143_DATA, PORT142_DATA, PORT141_DATA, PORT140_DATA,</div><div class='ctx'> 			PORT139_DATA, PORT138_DATA, PORT137_DATA, PORT136_DATA,</div><div class='ctx'> 			PORT135_DATA, PORT134_DATA, PORT133_DATA, PORT132_DATA,</div><div class='del'>-			PORT131_DATA, PORT130_DATA, PORT129_DATA, PORT128_DATA }</div><div class='add'>+			PORT131_DATA, PORT130_DATA, PORT129_DATA, PORT128_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056008, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056008, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='hunk'>@@ -4138,9 +4138,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, PORT164_DATA,</div><div class='del'>-			PORT163_DATA, PORT162_DATA, PORT161_DATA, PORT160_DATA }</div><div class='add'>+			PORT163_DATA, PORT162_DATA, PORT161_DATA, PORT160_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe605600C, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe605600C, 32, GROUP(</div><div class='ctx'> 			PORT223_DATA, PORT222_DATA, PORT221_DATA, PORT220_DATA,</div><div class='ctx'> 			PORT219_DATA, PORT218_DATA, PORT217_DATA, PORT216_DATA,</div><div class='ctx'> 			PORT215_DATA, PORT214_DATA, PORT213_DATA, PORT212_DATA,</div><div class='hunk'>@@ -4148,9 +4148,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT207_DATA, PORT206_DATA, PORT205_DATA, PORT204_DATA,</div><div class='ctx'> 			PORT203_DATA, PORT202_DATA, PORT201_DATA, PORT200_DATA,</div><div class='ctx'> 			PORT199_DATA, PORT198_DATA, PORT197_DATA, PORT196_DATA,</div><div class='del'>-			PORT195_DATA, PORT194_DATA, PORT193_DATA, PORT192_DATA }</div><div class='add'>+			PORT195_DATA, PORT194_DATA, PORT193_DATA, PORT192_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTU255_224DR", 0xe6057000, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTU255_224DR", 0xe6057000, 32, GROUP(</div><div class='ctx'> 			PORT255_DATA, PORT254_DATA, PORT253_DATA, PORT252_DATA,</div><div class='ctx'> 			PORT251_DATA, PORT250_DATA, PORT249_DATA, PORT248_DATA,</div><div class='ctx'> 			PORT247_DATA, PORT246_DATA, PORT245_DATA, PORT244_DATA,</div><div class='hunk'>@@ -4158,9 +4158,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT239_DATA, PORT238_DATA, PORT237_DATA, PORT236_DATA,</div><div class='ctx'> 			PORT235_DATA, PORT234_DATA, PORT233_DATA, PORT232_DATA,</div><div class='ctx'> 			PORT231_DATA, PORT230_DATA, PORT229_DATA, PORT228_DATA,</div><div class='del'>-			PORT227_DATA, PORT226_DATA, PORT225_DATA, PORT224_DATA }</div><div class='add'>+			PORT227_DATA, PORT226_DATA, PORT225_DATA, PORT224_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTU287_256DR", 0xe6057004, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTU287_256DR", 0xe6057004, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, PORT282_DATA, PORT281_DATA, PORT280_DATA,</div><div class='ctx'> 			PORT279_DATA, PORT278_DATA, PORT277_DATA, PORT276_DATA,</div><div class='hunk'>@@ -4168,9 +4168,9 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT271_DATA, PORT270_DATA, PORT269_DATA, PORT268_DATA,</div><div class='ctx'> 			PORT267_DATA, PORT266_DATA, PORT265_DATA, PORT264_DATA,</div><div class='ctx'> 			PORT263_DATA, PORT262_DATA, PORT261_DATA, PORT260_DATA,</div><div class='del'>-			PORT259_DATA, PORT258_DATA, PORT257_DATA, PORT256_DATA }</div><div class='add'>+			PORT259_DATA, PORT258_DATA, PORT257_DATA, PORT256_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PORTR319_288DR", 0xe6056010, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR319_288DR", 0xe6056010, 32, GROUP(</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, 0, 0,</div><div class='ctx'> 			0, 0, PORT309_DATA, PORT308_DATA,</div><div class='hunk'>@@ -4178,7 +4178,7 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 			PORT303_DATA, PORT302_DATA, PORT301_DATA, PORT300_DATA,</div><div class='ctx'> 			PORT299_DATA, PORT298_DATA, PORT297_DATA, PORT296_DATA,</div><div class='ctx'> 			PORT295_DATA, PORT294_DATA, PORT293_DATA, PORT292_DATA,</div><div class='del'>-			PORT291_DATA, PORT290_DATA, PORT289_DATA, PORT288_DATA }</div><div class='add'>+			PORT291_DATA, PORT290_DATA, PORT289_DATA, PORT288_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7720.c b/drivers/pinctrl/sh-pfc/pfc-sh7720.c<br/>index 65694bfaa08d..37bcae6b3208 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7720.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7720.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7720.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7720.c</a></div><div class='hunk'>@@ -925,7 +925,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2, GROUP(</div><div class='ctx'> 		PTA7_FN, PTA7_OUT, 0, PTA7_IN,</div><div class='ctx'> 		PTA6_FN, PTA6_OUT, 0, PTA6_IN,</div><div class='ctx'> 		PTA5_FN, PTA5_OUT, 0, PTA5_IN,</div><div class='hunk'>@@ -933,9 +933,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTA3_FN, PTA3_OUT, 0, PTA3_IN,</div><div class='ctx'> 		PTA2_FN, PTA2_OUT, 0, PTA2_IN,</div><div class='ctx'> 		PTA1_FN, PTA1_OUT, 0, PTA1_IN,</div><div class='del'>-		PTA0_FN, PTA0_OUT, 0, PTA0_IN }</div><div class='add'>+		PTA0_FN, PTA0_OUT, 0, PTA0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2, GROUP(</div><div class='ctx'> 		PTB7_FN, PTB7_OUT, 0, PTB7_IN,</div><div class='ctx'> 		PTB6_FN, PTB6_OUT, 0, PTB6_IN,</div><div class='ctx'> 		PTB5_FN, PTB5_OUT, 0, PTB5_IN,</div><div class='hunk'>@@ -943,9 +943,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTB3_FN, PTB3_OUT, 0, PTB3_IN,</div><div class='ctx'> 		PTB2_FN, PTB2_OUT, 0, PTB2_IN,</div><div class='ctx'> 		PTB1_FN, PTB1_OUT, 0, PTB1_IN,</div><div class='del'>-		PTB0_FN, PTB0_OUT, 0, PTB0_IN }</div><div class='add'>+		PTB0_FN, PTB0_OUT, 0, PTB0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2, GROUP(</div><div class='ctx'> 		PTC7_FN, PTC7_OUT, 0, PTC7_IN,</div><div class='ctx'> 		PTC6_FN, PTC6_OUT, 0, PTC6_IN,</div><div class='ctx'> 		PTC5_FN, PTC5_OUT, 0, PTC5_IN,</div><div class='hunk'>@@ -953,9 +953,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTC3_FN, PTC3_OUT, 0, PTC3_IN,</div><div class='ctx'> 		PTC2_FN, PTC2_OUT, 0, PTC2_IN,</div><div class='ctx'> 		PTC1_FN, PTC1_OUT, 0, PTC1_IN,</div><div class='del'>-		PTC0_FN, PTC0_OUT, 0, PTC0_IN }</div><div class='add'>+		PTC0_FN, PTC0_OUT, 0, PTC0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2, GROUP(</div><div class='ctx'> 		PTD7_FN, PTD7_OUT, 0, PTD7_IN,</div><div class='ctx'> 		PTD6_FN, PTD6_OUT, 0, PTD6_IN,</div><div class='ctx'> 		PTD5_FN, PTD5_OUT, 0, PTD5_IN,</div><div class='hunk'>@@ -963,9 +963,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTD3_FN, PTD3_OUT, 0, PTD3_IN,</div><div class='ctx'> 		PTD2_FN, PTD2_OUT, 0, PTD2_IN,</div><div class='ctx'> 		PTD1_FN, PTD1_OUT, 0, PTD1_IN,</div><div class='del'>-		PTD0_FN, PTD0_OUT, 0, PTD0_IN }</div><div class='add'>+		PTD0_FN, PTD0_OUT, 0, PTD0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTE6_FN, 0, 0, PTE6_IN,</div><div class='ctx'> 		PTE5_FN, 0, 0, PTE5_IN,</div><div class='hunk'>@@ -973,9 +973,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTE3_FN, PTE3_OUT, 0, PTE3_IN,</div><div class='ctx'> 		PTE2_FN, PTE2_OUT, 0, PTE2_IN,</div><div class='ctx'> 		PTE1_FN, PTE1_OUT, 0, PTE1_IN,</div><div class='del'>-		PTE0_FN, PTE0_OUT, 0, PTE0_IN }</div><div class='add'>+		PTE0_FN, PTE0_OUT, 0, PTE0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTF6_FN, 0, 0, PTF6_IN,</div><div class='ctx'> 		PTF5_FN, 0, 0, PTF5_IN,</div><div class='hunk'>@@ -983,9 +983,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTF3_FN, 0, 0, PTF3_IN,</div><div class='ctx'> 		PTF2_FN, 0, 0, PTF2_IN,</div><div class='ctx'> 		PTF1_FN, 0, 0, PTF1_IN,</div><div class='del'>-		PTF0_FN, 0, 0, PTF0_IN }</div><div class='add'>+		PTF0_FN, 0, 0, PTF0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTG6_FN, PTG6_OUT, 0, PTG6_IN,</div><div class='ctx'> 		PTG5_FN, PTG5_OUT, 0, PTG5_IN,</div><div class='hunk'>@@ -993,9 +993,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTG3_FN, PTG3_OUT, 0, PTG3_IN,</div><div class='ctx'> 		PTG2_FN, PTG2_OUT, 0, PTG2_IN,</div><div class='ctx'> 		PTG1_FN, PTG1_OUT, 0, PTG1_IN,</div><div class='del'>-		PTG0_FN, PTG0_OUT, 0, PTG0_IN }</div><div class='add'>+		PTG0_FN, PTG0_OUT, 0, PTG0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTH6_FN, PTH6_OUT, 0, PTH6_IN,</div><div class='ctx'> 		PTH5_FN, PTH5_OUT, 0, PTH5_IN,</div><div class='hunk'>@@ -1003,9 +1003,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTH3_FN, PTH3_OUT, 0, PTH3_IN,</div><div class='ctx'> 		PTH2_FN, PTH2_OUT, 0, PTH2_IN,</div><div class='ctx'> 		PTH1_FN, PTH1_OUT, 0, PTH1_IN,</div><div class='del'>-		PTH0_FN, PTH0_OUT, 0, PTH0_IN }</div><div class='add'>+		PTH0_FN, PTH0_OUT, 0, PTH0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTJ6_FN, PTJ6_OUT, 0, PTJ6_IN,</div><div class='ctx'> 		PTJ5_FN, PTJ5_OUT, 0, PTJ5_IN,</div><div class='hunk'>@@ -1013,9 +1013,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTJ3_FN, PTJ3_OUT, 0, PTJ3_IN,</div><div class='ctx'> 		PTJ2_FN, PTJ2_OUT, 0, PTJ2_IN,</div><div class='ctx'> 		PTJ1_FN, PTJ1_OUT, 0, PTJ1_IN,</div><div class='del'>-		PTJ0_FN, PTJ0_OUT, 0, PTJ0_IN }</div><div class='add'>+		PTJ0_FN, PTJ0_OUT, 0, PTJ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1023,9 +1023,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTK3_FN, PTK3_OUT, 0, PTK3_IN,</div><div class='ctx'> 		PTK2_FN, PTK2_OUT, 0, PTK2_IN,</div><div class='ctx'> 		PTK1_FN, PTK1_OUT, 0, PTK1_IN,</div><div class='del'>-		PTK0_FN, PTK0_OUT, 0, PTK0_IN }</div><div class='add'>+		PTK0_FN, PTK0_OUT, 0, PTK0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2, GROUP(</div><div class='ctx'> 		PTL7_FN, PTL7_OUT, 0, PTL7_IN,</div><div class='ctx'> 		PTL6_FN, PTL6_OUT, 0, PTL6_IN,</div><div class='ctx'> 		PTL5_FN, PTL5_OUT, 0, PTL5_IN,</div><div class='hunk'>@@ -1033,9 +1033,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTL3_FN, PTL3_OUT, 0, PTL3_IN,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2, GROUP(</div><div class='ctx'> 		PTM7_FN, PTM7_OUT, 0, PTM7_IN,</div><div class='ctx'> 		PTM6_FN, PTM6_OUT, 0, PTM6_IN,</div><div class='ctx'> 		PTM5_FN, PTM5_OUT, 0, PTM5_IN,</div><div class='hunk'>@@ -1043,9 +1043,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTM3_FN, PTM3_OUT, 0, PTM3_IN,</div><div class='ctx'> 		PTM2_FN, PTM2_OUT, 0, PTM2_IN,</div><div class='ctx'> 		PTM1_FN, PTM1_OUT, 0, PTM1_IN,</div><div class='del'>-		PTM0_FN, PTM0_OUT, 0, PTM0_IN }</div><div class='add'>+		PTM0_FN, PTM0_OUT, 0, PTM0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PPCR", 0xa4050118, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PPCR", 0xa4050118, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1053,9 +1053,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTP3_FN, PTP3_OUT, 0, PTP3_IN,</div><div class='ctx'> 		PTP2_FN, PTP2_OUT, 0, PTP2_IN,</div><div class='ctx'> 		PTP1_FN, PTP1_OUT, 0, PTP1_IN,</div><div class='del'>-		PTP0_FN, PTP0_OUT, 0, PTP0_IN }</div><div class='add'>+		PTP0_FN, PTP0_OUT, 0, PTP0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PRCR", 0xa405011a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PRCR", 0xa405011a, 16, 2, GROUP(</div><div class='ctx'> 		PTR7_FN, PTR7_OUT, 0, PTR7_IN,</div><div class='ctx'> 		PTR6_FN, PTR6_OUT, 0, PTR6_IN,</div><div class='ctx'> 		PTR5_FN, PTR5_OUT, 0, PTR5_IN,</div><div class='hunk'>@@ -1063,9 +1063,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTR3_FN, PTR3_OUT, 0, PTR3_IN,</div><div class='ctx'> 		PTR2_FN, PTR2_OUT, 0, PTR2_IN,</div><div class='ctx'> 		PTR1_FN, PTR1_OUT, 0, PTR1_IN,</div><div class='del'>-		PTR0_FN, PTR0_OUT, 0, PTR0_IN }</div><div class='add'>+		PTR0_FN, PTR0_OUT, 0, PTR0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSCR", 0xa405011c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSCR", 0xa405011c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1073,9 +1073,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTS3_FN, PTS3_OUT, 0, PTS3_IN,</div><div class='ctx'> 		PTS2_FN, PTS2_OUT, 0, PTS2_IN,</div><div class='ctx'> 		PTS1_FN, PTS1_OUT, 0, PTS1_IN,</div><div class='del'>-		PTS0_FN, PTS0_OUT, 0, PTS0_IN }</div><div class='add'>+		PTS0_FN, PTS0_OUT, 0, PTS0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PTCR", 0xa405011e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PTCR", 0xa405011e, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1083,9 +1083,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTT3_FN, PTT3_OUT, 0, PTT3_IN,</div><div class='ctx'> 		PTT2_FN, PTT2_OUT, 0, PTT2_IN,</div><div class='ctx'> 		PTT1_FN, PTT1_OUT, 0, PTT1_IN,</div><div class='del'>-		PTT0_FN, PTT0_OUT, 0, PTT0_IN }</div><div class='add'>+		PTT0_FN, PTT0_OUT, 0, PTT0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PUCR", 0xa4050120, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PUCR", 0xa4050120, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1093,9 +1093,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTU3_FN, PTU3_OUT, 0, PTU3_IN,</div><div class='ctx'> 		PTU2_FN, PTU2_OUT, 0, PTU2_IN,</div><div class='ctx'> 		PTU1_FN, PTU1_OUT, 0, PTU1_IN,</div><div class='del'>-		PTU0_FN, PTU0_OUT, 0, PTU0_IN }</div><div class='add'>+		PTU0_FN, PTU0_OUT, 0, PTU0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PVCR", 0xa4050122, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PVCR", 0xa4050122, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1103,83 +1103,83 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTV3_FN, PTV3_OUT, 0, PTV3_IN,</div><div class='ctx'> 		PTV2_FN, PTV2_OUT, 0, PTV2_IN,</div><div class='ctx'> 		PTV1_FN, PTV1_OUT, 0, PTV1_IN,</div><div class='del'>-		PTV0_FN, PTV0_OUT, 0, PTV0_IN }</div><div class='add'>+		PTV0_FN, PTV0_OUT, 0, PTV0_IN ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xa4050140, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xa4050140, 8, GROUP(</div><div class='ctx'> 		PTA7_DATA, PTA6_DATA, PTA5_DATA, PTA4_DATA,</div><div class='del'>-		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA }</div><div class='add'>+		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xa4050142, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xa4050142, 8, GROUP(</div><div class='ctx'> 		PTB7_DATA, PTB6_DATA, PTB5_DATA, PTB4_DATA,</div><div class='del'>-		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA }</div><div class='add'>+		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xa4050144, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xa4050144, 8, GROUP(</div><div class='ctx'> 		PTC7_DATA, PTC6_DATA, PTC5_DATA, PTC4_DATA,</div><div class='del'>-		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA }</div><div class='add'>+		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8, GROUP(</div><div class='ctx'> 		PTD7_DATA, PTD6_DATA, PTD5_DATA, PTD4_DATA,</div><div class='del'>-		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA }</div><div class='add'>+		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xa4050148, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xa4050148, 8, GROUP(</div><div class='ctx'> 		0, PTE6_DATA, PTE5_DATA, PTE4_DATA,</div><div class='del'>-		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA }</div><div class='add'>+		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xa405014a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xa405014a, 8, GROUP(</div><div class='ctx'> 		0, PTF6_DATA, PTF5_DATA, PTF4_DATA,</div><div class='del'>-		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA }</div><div class='add'>+		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xa405014c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xa405014c, 8, GROUP(</div><div class='ctx'> 		0, PTG6_DATA, PTG5_DATA, PTG4_DATA,</div><div class='del'>-		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA }</div><div class='add'>+		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xa405014e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xa405014e, 8, GROUP(</div><div class='ctx'> 		0, PTH6_DATA, PTH5_DATA, PTH4_DATA,</div><div class='del'>-		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA }</div><div class='add'>+		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xa4050150, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xa4050150, 8, GROUP(</div><div class='ctx'> 		0, PTJ6_DATA, PTJ5_DATA, PTJ4_DATA,</div><div class='del'>-		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA }</div><div class='add'>+		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR", 0xa4050152, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR", 0xa4050152, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA }</div><div class='add'>+		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PLDR", 0xa4050154, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PLDR", 0xa4050154, 8, GROUP(</div><div class='ctx'> 		PTL7_DATA, PTL6_DATA, PTL5_DATA, PTL4_DATA,</div><div class='del'>-		PTL3_DATA, 0, 0, 0 }</div><div class='add'>+		PTL3_DATA, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PMDR", 0xa4050156, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PMDR", 0xa4050156, 8, GROUP(</div><div class='ctx'> 		PTM7_DATA, PTM6_DATA, PTM5_DATA, PTM4_DATA,</div><div class='del'>-		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA }</div><div class='add'>+		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PPDR", 0xa4050158, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PPDR", 0xa4050158, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTP4_DATA,</div><div class='del'>-		PTP3_DATA, PTP2_DATA, PTP1_DATA, PTP0_DATA }</div><div class='add'>+		PTP3_DATA, PTP2_DATA, PTP1_DATA, PTP0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PRDR", 0xa405015a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PRDR", 0xa405015a, 8, GROUP(</div><div class='ctx'> 		PTR7_DATA, PTR6_DATA, PTR5_DATA, PTR4_DATA,</div><div class='del'>-		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA }</div><div class='add'>+		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PSDR", 0xa405015c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PSDR", 0xa405015c, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTS4_DATA,</div><div class='del'>-		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA }</div><div class='add'>+		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PTDR", 0xa405015e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PTDR", 0xa405015e, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTT4_DATA,</div><div class='del'>-		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA }</div><div class='add'>+		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PUDR", 0xa4050160, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PUDR", 0xa4050160, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTU4_DATA,</div><div class='del'>-		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA }</div><div class='add'>+		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PVDR", 0xa4050162, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PVDR", 0xa4050162, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTV4_DATA,</div><div class='del'>-		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA }</div><div class='add'>+		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/drivers/pinctrl/sh-pfc/pfc-sh7722.c<br/>index 0e733bffdb38..95295be4e703 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7722.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7722.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7722.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7722.c</a></div><div class='hunk'>@@ -1237,7 +1237,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2, GROUP(</div><div class='ctx'> 		VIO_D7_SCIF1_SCK, PTA7_OUT, 0, PTA7_IN,</div><div class='ctx'> 		VIO_D6_SCIF1_RXD, 0, 0, PTA6_IN,</div><div class='ctx'> 		VIO_D5_SCIF1_TXD, PTA5_OUT, 0, PTA5_IN,</div><div class='hunk'>@@ -1245,9 +1245,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		VIO_D3, 0, 0, PTA3_IN,</div><div class='ctx'> 		VIO_D2, 0, 0, PTA2_IN,</div><div class='ctx'> 		VIO_D1, 0, 0, PTA1_IN,</div><div class='del'>-		VIO_D0_LCDLCLK, 0, 0, PTA0_IN }</div><div class='add'>+		VIO_D0_LCDLCLK, 0, 0, PTA0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2, GROUP(</div><div class='ctx'> 		HPD55, PTB7_OUT, 0, PTB7_IN,</div><div class='ctx'> 		HPD54, PTB6_OUT, 0, PTB6_IN,</div><div class='ctx'> 		HPD53, PTB5_OUT, 0, PTB5_IN,</div><div class='hunk'>@@ -1255,9 +1255,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		HPD51, PTB3_OUT, 0, PTB3_IN,</div><div class='ctx'> 		HPD50, PTB2_OUT, 0, PTB2_IN,</div><div class='ctx'> 		HPD49, PTB1_OUT, 0, PTB1_IN,</div><div class='del'>-		HPD48, PTB0_OUT, 0, PTB0_IN }</div><div class='add'>+		HPD48, PTB0_OUT, 0, PTB0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, PTC7_IN,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		IOIS16, 0, 0, PTC5_IN,</div><div class='hunk'>@@ -1265,9 +1265,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		HPDQM6, PTC3_OUT, 0, PTC3_IN,</div><div class='ctx'> 		HPDQM5, PTC2_OUT, 0, PTC2_IN,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		HPDQM4, PTC0_OUT, 0, PTC0_IN }</div><div class='add'>+		HPDQM4, PTC0_OUT, 0, PTC0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2, GROUP(</div><div class='ctx'> 		SDHICD, 0, 0, PTD7_IN,</div><div class='ctx'> 		SDHIWP, PTD6_OUT, 0, PTD6_IN,</div><div class='ctx'> 		SDHID3, PTD5_OUT, 0, PTD5_IN,</div><div class='hunk'>@@ -1275,9 +1275,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		SDHID1, PTD3_OUT, 0, PTD3_IN,</div><div class='ctx'> 		SDHID0, PTD2_OUT, 0, PTD2_IN,</div><div class='ctx'> 		SDHICMD, PTD1_OUT, 0, PTD1_IN,</div><div class='del'>-		SDHICLK, PTD0_OUT, 0, 0 }</div><div class='add'>+		SDHICLK, PTD0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2, GROUP(</div><div class='ctx'> 		A25, PTE7_OUT, 0, PTE7_IN,</div><div class='ctx'> 		A24, PTE6_OUT, 0, PTE6_IN,</div><div class='ctx'> 		A23, PTE5_OUT, 0, PTE5_IN,</div><div class='hunk'>@@ -1285,9 +1285,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		IRQ5, PTE1_OUT, 0, PTE1_IN,</div><div class='del'>-		IRQ4_BS, PTE0_OUT, 0, PTE0_IN }</div><div class='add'>+		IRQ4_BS, PTE0_OUT, 0, PTE0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTF6, PTF6_OUT, 0, PTF6_IN,</div><div class='ctx'> 		SIOSCK_SIUBOBT, PTF5_OUT, 0, PTF5_IN,</div><div class='hunk'>@@ -1295,9 +1295,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		SIOSTRB0_SIUBIBT, PTF3_OUT, 0, PTF3_IN,</div><div class='ctx'> 		SIOD_SIUBILR, PTF2_OUT, 0, PTF2_IN,</div><div class='ctx'> 		SIORXD_SIUBISLD, 0, 0, PTF1_IN,</div><div class='del'>-		SIOTXD_SIUBOSLD, PTF0_OUT, 0, 0 }</div><div class='add'>+		SIOTXD_SIUBOSLD, PTF0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1305,9 +1305,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		AUDATA3, PTG3_OUT, 0, 0,</div><div class='ctx'> 		AUDATA2, PTG2_OUT, 0, 0,</div><div class='ctx'> 		AUDATA1, PTG1_OUT, 0, 0,</div><div class='del'>-		AUDATA0, PTG0_OUT, 0, 0 }</div><div class='add'>+		AUDATA0, PTG0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2, GROUP(</div><div class='ctx'> 		LCDVCPWC_LCDVCPWC2, PTH7_OUT, 0, 0,</div><div class='ctx'> 		LCDVSYN2_DACK, PTH6_OUT, 0, PTH6_IN,</div><div class='ctx'> 		LCDVSYN, PTH5_OUT, 0, PTH5_IN,</div><div class='hunk'>@@ -1315,9 +1315,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		LCDHSYN_LCDCS, PTH3_OUT, 0, 0,</div><div class='ctx'> 		LCDDON_LCDDON2, PTH2_OUT, 0, 0,</div><div class='ctx'> 		LCDD17_DV_HSYNC, PTH1_OUT, 0, PTH1_IN,</div><div class='del'>-		LCDD16_DV_VSYNC, PTH0_OUT, 0, PTH0_IN }</div><div class='add'>+		LCDD16_DV_VSYNC, PTH0_OUT, 0, PTH0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2, GROUP(</div><div class='ctx'> 		STATUS0, PTJ7_OUT, 0, 0,</div><div class='ctx'> 		0, PTJ6_OUT, 0, 0,</div><div class='ctx'> 		PDSTATUS, PTJ5_OUT, 0, 0,</div><div class='hunk'>@@ -1325,9 +1325,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		IRQ1, PTJ1_OUT, 0, PTJ1_IN,</div><div class='del'>-		IRQ0, PTJ0_OUT, 0, PTJ0_IN }</div><div class='add'>+		IRQ0, PTJ0_OUT, 0, PTJ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		SIUAILR_SIOF1_SS2, PTK6_OUT, 0, PTK6_IN,</div><div class='ctx'> 		SIUAIBT_SIOF1_SS1, PTK5_OUT, 0, PTK5_IN,</div><div class='hunk'>@@ -1335,9 +1335,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		SIUAOBT_SIOF1_SCK, PTK3_OUT, 0, PTK3_IN,</div><div class='ctx'> 		SIUAISLD_SIOF1_RXD, 0, 0, PTK2_IN,</div><div class='ctx'> 		SIUAOSLD_SIOF1_TXD, PTK1_OUT, 0, 0,</div><div class='del'>-		PTK0, PTK0_OUT, 0, PTK0_IN }</div><div class='add'>+		PTK0, PTK0_OUT, 0, PTK0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2, GROUP(</div><div class='ctx'> 		LCDD15_DV_D15, PTL7_OUT, 0, PTL7_IN,</div><div class='ctx'> 		LCDD14_DV_D14, PTL6_OUT, 0, PTL6_IN,</div><div class='ctx'> 		LCDD13_DV_D13, PTL5_OUT, 0, PTL5_IN,</div><div class='hunk'>@@ -1345,9 +1345,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		LCDD11_DV_D11, PTL3_OUT, 0, PTL3_IN,</div><div class='ctx'> 		LCDD10_DV_D10, PTL2_OUT, 0, PTL2_IN,</div><div class='ctx'> 		LCDD9_DV_D9, PTL1_OUT, 0, PTL1_IN,</div><div class='del'>-		LCDD8_DV_D8, PTL0_OUT, 0, PTL0_IN }</div><div class='add'>+		LCDD8_DV_D8, PTL0_OUT, 0, PTL0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2, GROUP(</div><div class='ctx'> 		LCDD7_DV_D7, PTM7_OUT, 0, PTM7_IN,</div><div class='ctx'> 		LCDD6_DV_D6, PTM6_OUT, 0, PTM6_IN,</div><div class='ctx'> 		LCDD5_DV_D5, PTM5_OUT, 0, PTM5_IN,</div><div class='hunk'>@@ -1355,9 +1355,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		LCDD3_DV_D3, PTM3_OUT, 0, PTM3_IN,</div><div class='ctx'> 		LCDD2_DV_D2, PTM2_OUT, 0, PTM2_IN,</div><div class='ctx'> 		LCDD1_DV_D1, PTM1_OUT, 0, PTM1_IN,</div><div class='del'>-		LCDD0_DV_D0, PTM0_OUT, 0, PTM0_IN }</div><div class='add'>+		LCDD0_DV_D0, PTM0_OUT, 0, PTM0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PNCR", 0xa4050118, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PNCR", 0xa4050118, 16, 2, GROUP(</div><div class='ctx'> 		HPD63, PTN7_OUT, 0, PTN7_IN,</div><div class='ctx'> 		HPD62, PTN6_OUT, 0, PTN6_IN,</div><div class='ctx'> 		HPD61, PTN5_OUT, 0, PTN5_IN,</div><div class='hunk'>@@ -1365,9 +1365,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		HPD59, PTN3_OUT, 0, PTN3_IN,</div><div class='ctx'> 		HPD58, PTN2_OUT, 0, PTN2_IN,</div><div class='ctx'> 		HPD57, PTN1_OUT, 0, PTN1_IN,</div><div class='del'>-		HPD56, PTN0_OUT, 0, PTN0_IN }</div><div class='add'>+		HPD56, PTN0_OUT, 0, PTN0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PQCR", 0xa405011a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PQCR", 0xa405011a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		SIOF0_SS2_SIM_RST, PTQ6_OUT, 0, 0,</div><div class='ctx'> 		SIOF0_SS1_TS_SPSYNC, PTQ5_OUT, 0, PTQ5_IN,</div><div class='hunk'>@@ -1375,9 +1375,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		SIOF0_SCK_TS_SCK, PTQ3_OUT, 0, PTQ3_IN,</div><div class='ctx'> 		PTQ2, 0, 0, PTQ2_IN,</div><div class='ctx'> 		PTQ1, PTQ1_OUT, 0, 0,</div><div class='del'>-		PTQ0, PTQ0_OUT, 0, PTQ0_IN }</div><div class='add'>+		PTQ0, PTQ0_OUT, 0, PTQ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PRCR", 0xa405011c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PRCR", 0xa405011c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1385,9 +1385,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		CS6B_CE1B_LCDCS2, PTR3_OUT, 0, 0,</div><div class='ctx'> 		WAIT, 0, 0, PTR2_IN,</div><div class='ctx'> 		LCDDCK_LCDWR, PTR1_OUT, 0, 0,</div><div class='del'>-		LCDVEPWC_LCDVEPWC2, PTR0_OUT, 0, 0 }</div><div class='add'>+		LCDVEPWC_LCDVEPWC2, PTR0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSCR", 0xa405011e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSCR", 0xa405011e, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1395,9 +1395,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		SCIF0_RTS_SIUAOSPD, PTS3_OUT, 0, 0,</div><div class='ctx'> 		SCIF0_SCK_TPUTO, PTS2_OUT, 0, PTS2_IN,</div><div class='ctx'> 		SCIF0_RXD, 0, 0, PTS1_IN,</div><div class='del'>-		SCIF0_TXD, PTS0_OUT, 0, 0 }</div><div class='add'>+		SCIF0_TXD, PTS0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PTCR", 0xa4050140, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PTCR", 0xa4050140, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1405,9 +1405,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FWE, PTT3_OUT, 0, PTT3_IN,</div><div class='ctx'> 		FSC, PTT2_OUT, 0, PTT2_IN,</div><div class='ctx'> 		DREQ0, 0, 0, PTT1_IN,</div><div class='del'>-		FCDE, PTT0_OUT, 0, 0 }</div><div class='add'>+		FCDE, PTT0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PUCR", 0xa4050142, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PUCR", 0xa4050142, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1415,9 +1415,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		NAF1_VIO_D9, PTU3_OUT, 0, PTU3_IN,</div><div class='ctx'> 		NAF0_VIO_D8, PTU2_OUT, 0, PTU2_IN,</div><div class='ctx'> 		FRB_VIO_CLK2, 0, 0, PTU1_IN,</div><div class='del'>-		FCE_VIO_HD2, PTU0_OUT, 0, PTU0_IN }</div><div class='add'>+		FCE_VIO_HD2, PTU0_OUT, 0, PTU0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PVCR", 0xa4050144, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PVCR", 0xa4050144, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1425,9 +1425,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		NAF6_VIO_D14, PTV3_OUT, 0, PTV3_IN,</div><div class='ctx'> 		NAF5_VIO_D13, PTV2_OUT, 0, PTV2_IN,</div><div class='ctx'> 		NAF4_VIO_D12, PTV1_OUT, 0, PTV1_IN,</div><div class='del'>-		NAF3_VIO_D11, PTV0_OUT, 0, PTV0_IN }</div><div class='add'>+		NAF3_VIO_D11, PTV0_OUT, 0, PTV0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PWCR", 0xa4050146, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PWCR", 0xa4050146, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		VIO_FLD_SCIF2_CTS, 0, 0, PTW6_IN,</div><div class='ctx'> 		VIO_CKO_SCIF2_RTS, PTW5_OUT, 0, 0,</div><div class='hunk'>@@ -1435,9 +1435,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		VIO_STEM_SCIF2_TXD, PTW3_OUT, 0, PTW3_IN,</div><div class='ctx'> 		VIO_HD_SCIF2_RXD, PTW2_OUT, 0, PTW2_IN,</div><div class='ctx'> 		VIO_VD_SCIF1_CTS, PTW1_OUT, 0, PTW1_IN,</div><div class='del'>-		VIO_CLK_SCIF1_RTS, PTW0_OUT, 0, PTW0_IN }</div><div class='add'>+		VIO_CLK_SCIF1_RTS, PTW0_OUT, 0, PTW0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PXCR", 0xa4050148, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PXCR", 0xa4050148, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		CS6A_CE2B, PTX6_OUT, 0, PTX6_IN,</div><div class='ctx'> 		LCDD23, PTX5_OUT, 0, PTX5_IN,</div><div class='hunk'>@@ -1445,9 +1445,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		LCDD21, PTX3_OUT, 0, PTX3_IN,</div><div class='ctx'> 		LCDD20, PTX2_OUT, 0, PTX2_IN,</div><div class='ctx'> 		LCDD19_DV_CLKI, PTX1_OUT, 0, PTX1_IN,</div><div class='del'>-		LCDD18_DV_CLK, PTX0_OUT, 0, PTX0_IN }</div><div class='add'>+		LCDD18_DV_CLK, PTX0_OUT, 0, PTX0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PYCR", 0xa405014a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PYCR", 0xa405014a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		KEYOUT5_IN5, PTY5_OUT, 0, PTY5_IN,</div><div class='hunk'>@@ -1455,9 +1455,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		KEYOUT3, PTY3_OUT, 0, PTY3_IN,</div><div class='ctx'> 		KEYOUT2, PTY2_OUT, 0, PTY2_IN,</div><div class='ctx'> 		KEYOUT1, PTY1_OUT, 0, 0,</div><div class='del'>-		KEYOUT0, PTY0_OUT, 0, PTY0_IN }</div><div class='add'>+		KEYOUT0, PTY0_OUT, 0, PTY0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PZCR", 0xa405014c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PZCR", 0xa405014c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		KEYIN4_IRQ7, 0, 0, PTZ5_IN,</div><div class='hunk'>@@ -1465,9 +1465,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		KEYIN2, 0, 0, PTZ3_IN,</div><div class='ctx'> 		KEYIN1, 0, 0, PTZ2_IN,</div><div class='ctx'> 		KEYIN0_IRQ6, 0, 0, PTZ1_IN,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELA", 0xa405014e, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELA", 0xa405014e, 16, 1, GROUP(</div><div class='ctx'> 		PSA15_KEYIN0, PSA15_IRQ6,</div><div class='ctx'> 		PSA14_KEYIN4, PSA14_IRQ7,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1483,9 +1483,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELB", 0xa4050150, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELB", 0xa4050150, 16, 1, GROUP(</div><div class='ctx'> 		PSB15_SIOTXD, PSB15_SIUBOSLD,</div><div class='ctx'> 		PSB14_SIORXD, PSB14_SIUBISLD,</div><div class='ctx'> 		PSB13_SIOD, PSB13_SIUBILR,</div><div class='hunk'>@@ -1501,9 +1501,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSB3_SIOF0_SS1, PSB3_TS_SPSYNC,</div><div class='ctx'> 		PSB2_SIOF0_SS2, PSB2_SIM_RST,</div><div class='ctx'> 		PSB1_SIUMCKA, PSB1_SIOF1_MCK,</div><div class='del'>-		PSB0_SIUAOSLD, PSB0_SIOF1_TXD }</div><div class='add'>+		PSB0_SIUAOSLD, PSB0_SIOF1_TXD ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELC", 0xa4050152, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELC", 0xa4050152, 16, 1, GROUP(</div><div class='ctx'> 		PSC15_SIUAISLD, PSC15_SIOF1_RXD,</div><div class='ctx'> 		PSC14_SIUAOBT, PSC14_SIOF1_SCK,</div><div class='ctx'> 		PSC13_SIUAOLR, PSC13_SIOF1_SYNC,</div><div class='hunk'>@@ -1519,9 +1519,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		PSC0_NAF, PSC0_VIO }</div><div class='add'>+		PSC0_NAF, PSC0_VIO ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELD", 0xa4050154, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELD", 0xa4050154, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PSD13_VIO, PSD13_SCIF2,</div><div class='hunk'>@@ -1537,9 +1537,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSD3_LCDVEPWC_LCDVCPWC, PSD3_LCDVEPWC2_LCDVCPWC2,</div><div class='ctx'> 		PSD2_LCDDON, PSD2_LCDDON2,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		PSD0_LCDD19_LCDD0, PSD0_DV }</div><div class='add'>+		PSD0_LCDD19_LCDD0, PSD0_DV ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELE", 0xa4050156, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELE", 0xa4050156, 16, 1, GROUP(</div><div class='ctx'> 		PSE15_SIOF0_MCK_IRQ3, PSE15_SIM_D,</div><div class='ctx'> 		PSE14_SIOF0_TXD_IRDA_OUT, PSE14_SIM_CLK,</div><div class='ctx'> 		PSE13_SIOF0_RXD_IRDA_IN, PSE13_TS_SDAT,</div><div class='hunk'>@@ -1555,9 +1555,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSE3_FLCTL, PSE3_VIO,</div><div class='ctx'> 		PSE2_NAF2, PSE2_VIO_D10,</div><div class='ctx'> 		PSE1_NAF1, PSE1_VIO_D9,</div><div class='del'>-		PSE0_NAF0, PSE0_VIO_D8 }</div><div class='add'>+		PSE0_NAF0, PSE0_VIO_D8 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("HIZCRA", 0xa4050158, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("HIZCRA", 0xa4050158, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		HIZA14_KEYSC, HIZA14_HIZ,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1573,9 +1573,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("HIZCRB", 0xa405015a, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("HIZCRB", 0xa405015a, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1591,9 +1591,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		HIZB1_VIO, HIZB1_HIZ,</div><div class='del'>-		HIZB0_VIO, HIZB0_HIZ }</div><div class='add'>+		HIZB0_VIO, HIZB0_HIZ ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("HIZCRC", 0xa405015c, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("HIZCRC", 0xa405015c, 16, 1, GROUP(</div><div class='ctx'> 		HIZC15_IRQ7, HIZC15_HIZ,</div><div class='ctx'> 		HIZC14_IRQ6, HIZC14_HIZ,</div><div class='ctx'> 		HIZC13_IRQ5, HIZC13_HIZ,</div><div class='hunk'>@@ -1609,9 +1609,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("MSELCRB", 0xa4050182, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("MSELCRB", 0xa4050182, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1627,103 +1627,103 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0 }</div><div class='add'>+		0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xa4050120, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xa4050120, 8, GROUP(</div><div class='ctx'> 		PTA7_DATA, PTA6_DATA, PTA5_DATA, PTA4_DATA,</div><div class='del'>-		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA }</div><div class='add'>+		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xa4050122, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xa4050122, 8, GROUP(</div><div class='ctx'> 		PTB7_DATA, PTB6_DATA, PTB5_DATA, PTB4_DATA,</div><div class='del'>-		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA }</div><div class='add'>+		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xa4050124, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xa4050124, 8, GROUP(</div><div class='ctx'> 		PTC7_DATA, 0, PTC5_DATA, PTC4_DATA,</div><div class='del'>-		PTC3_DATA, PTC2_DATA, 0, PTC0_DATA }</div><div class='add'>+		PTC3_DATA, PTC2_DATA, 0, PTC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8, GROUP(</div><div class='ctx'> 		PTD7_DATA, PTD6_DATA, PTD5_DATA, PTD4_DATA,</div><div class='del'>-		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA }</div><div class='add'>+		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xa4050128, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xa4050128, 8, GROUP(</div><div class='ctx'> 		PTE7_DATA, PTE6_DATA, PTE5_DATA, PTE4_DATA,</div><div class='del'>-		0, 0, PTE1_DATA, PTE0_DATA }</div><div class='add'>+		0, 0, PTE1_DATA, PTE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xa405012a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xa405012a, 8, GROUP(</div><div class='ctx'> 		0, PTF6_DATA, PTF5_DATA, PTF4_DATA,</div><div class='del'>-		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA }</div><div class='add'>+		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xa405012c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xa405012c, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTG4_DATA,</div><div class='del'>-		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA }</div><div class='add'>+		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xa405012e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xa405012e, 8, GROUP(</div><div class='ctx'> 		PTH7_DATA, PTH6_DATA, PTH5_DATA, PTH4_DATA,</div><div class='del'>-		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA }</div><div class='add'>+		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xa4050130, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xa4050130, 8, GROUP(</div><div class='ctx'> 		PTJ7_DATA, PTJ6_DATA, PTJ5_DATA, 0,</div><div class='del'>-		0, 0, PTJ1_DATA, PTJ0_DATA }</div><div class='add'>+		0, 0, PTJ1_DATA, PTJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR", 0xa4050132, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR", 0xa4050132, 8, GROUP(</div><div class='ctx'> 		0, PTK6_DATA, PTK5_DATA, PTK4_DATA,</div><div class='del'>-		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA }</div><div class='add'>+		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PLDR", 0xa4050134, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PLDR", 0xa4050134, 8, GROUP(</div><div class='ctx'> 		PTL7_DATA, PTL6_DATA, PTL5_DATA, PTL4_DATA,</div><div class='del'>-		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA }</div><div class='add'>+		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PMDR", 0xa4050136, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PMDR", 0xa4050136, 8, GROUP(</div><div class='ctx'> 		PTM7_DATA, PTM6_DATA, PTM5_DATA, PTM4_DATA,</div><div class='del'>-		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA }</div><div class='add'>+		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PNDR", 0xa4050138, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PNDR", 0xa4050138, 8, GROUP(</div><div class='ctx'> 		PTN7_DATA, PTN6_DATA, PTN5_DATA, PTN4_DATA,</div><div class='del'>-		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA }</div><div class='add'>+		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PQDR", 0xa405013a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PQDR", 0xa405013a, 8, GROUP(</div><div class='ctx'> 		0, PTQ6_DATA, PTQ5_DATA, PTQ4_DATA,</div><div class='del'>-		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA }</div><div class='add'>+		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PRDR", 0xa405013c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PRDR", 0xa405013c, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTR4_DATA,</div><div class='del'>-		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA }</div><div class='add'>+		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PSDR", 0xa405013e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PSDR", 0xa405013e, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTS4_DATA,</div><div class='del'>-		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA }</div><div class='add'>+		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PTDR", 0xa4050160, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PTDR", 0xa4050160, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTT4_DATA,</div><div class='del'>-		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA }</div><div class='add'>+		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PUDR", 0xa4050162, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PUDR", 0xa4050162, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTU4_DATA,</div><div class='del'>-		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA }</div><div class='add'>+		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PVDR", 0xa4050164, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PVDR", 0xa4050164, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PTV4_DATA,</div><div class='del'>-		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA }</div><div class='add'>+		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PWDR", 0xa4050166, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PWDR", 0xa4050166, 8, GROUP(</div><div class='ctx'> 		0, PTW6_DATA, PTW5_DATA, PTW4_DATA,</div><div class='del'>-		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA }</div><div class='add'>+		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PXDR", 0xa4050168, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PXDR", 0xa4050168, 8, GROUP(</div><div class='ctx'> 		0, PTX6_DATA, PTX5_DATA, PTX4_DATA,</div><div class='del'>-		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA }</div><div class='add'>+		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PYDR", 0xa405016a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PYDR", 0xa405016a, 8, GROUP(</div><div class='ctx'> 		0, PTY6_DATA, PTY5_DATA, PTY4_DATA,</div><div class='del'>-		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA }</div><div class='add'>+		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PZDR", 0xa405016c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PZDR", 0xa405016c, 8, GROUP(</div><div class='ctx'> 		0, 0, PTZ5_DATA, PTZ4_DATA,</div><div class='del'>-		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA }</div><div class='add'>+		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7723.c b/drivers/pinctrl/sh-pfc/pfc-sh7723.c<br/>index 86f9a88726b7..6f08f527c010 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7723.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7723.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7723.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7723.c</a></div><div class='hunk'>@@ -1507,7 +1507,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2, GROUP(</div><div class='ctx'> 		PTA7_FN, PTA7_OUT, 0, PTA7_IN,</div><div class='ctx'> 		PTA6_FN, PTA6_OUT, 0, PTA6_IN,</div><div class='ctx'> 		PTA5_FN, PTA5_OUT, 0, PTA5_IN,</div><div class='hunk'>@@ -1515,9 +1515,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTA3_FN, PTA3_OUT, 0, PTA3_IN,</div><div class='ctx'> 		PTA2_FN, PTA2_OUT, 0, PTA2_IN,</div><div class='ctx'> 		PTA1_FN, PTA1_OUT, 0, PTA1_IN,</div><div class='del'>-		PTA0_FN, PTA0_OUT, 0, PTA0_IN }</div><div class='add'>+		PTA0_FN, PTA0_OUT, 0, PTA0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2, GROUP(</div><div class='ctx'> 		PTB7_FN, PTB7_OUT, 0, PTB7_IN,</div><div class='ctx'> 		PTB6_FN, PTB6_OUT, 0, PTB6_IN,</div><div class='ctx'> 		PTB5_FN, PTB5_OUT, 0, PTB5_IN,</div><div class='hunk'>@@ -1525,9 +1525,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTB3_FN, PTB3_OUT, 0, PTB3_IN,</div><div class='ctx'> 		PTB2_FN, PTB2_OUT, 0, PTB2_IN,</div><div class='ctx'> 		PTB1_FN, PTB1_OUT, 0, PTB1_IN,</div><div class='del'>-		PTB0_FN, PTB0_OUT, 0, PTB0_IN }</div><div class='add'>+		PTB0_FN, PTB0_OUT, 0, PTB0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2, GROUP(</div><div class='ctx'> 		PTC7_FN, PTC7_OUT, 0, PTC7_IN,</div><div class='ctx'> 		PTC6_FN, PTC6_OUT, 0, PTC6_IN,</div><div class='ctx'> 		PTC5_FN, PTC5_OUT, 0, PTC5_IN,</div><div class='hunk'>@@ -1535,9 +1535,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTC3_FN, PTC3_OUT, 0, PTC3_IN,</div><div class='ctx'> 		PTC2_FN, PTC2_OUT, 0, PTC2_IN,</div><div class='ctx'> 		PTC1_FN, PTC1_OUT, 0, PTC1_IN,</div><div class='del'>-		PTC0_FN, PTC0_OUT, 0, PTC0_IN }</div><div class='add'>+		PTC0_FN, PTC0_OUT, 0, PTC0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2, GROUP(</div><div class='ctx'> 		PTD7_FN, PTD7_OUT, 0, PTD7_IN,</div><div class='ctx'> 		PTD6_FN, PTD6_OUT, 0, PTD6_IN,</div><div class='ctx'> 		PTD5_FN, PTD5_OUT, 0, PTD5_IN,</div><div class='hunk'>@@ -1545,9 +1545,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTD3_FN, PTD3_OUT, 0, PTD3_IN,</div><div class='ctx'> 		PTD2_FN, PTD2_OUT, 0, PTD2_IN,</div><div class='ctx'> 		PTD1_FN, PTD1_OUT, 0, PTD1_IN,</div><div class='del'>-		PTD0_FN, PTD0_OUT, 0, PTD0_IN }</div><div class='add'>+		PTD0_FN, PTD0_OUT, 0, PTD0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTE5_FN, PTE5_OUT, 0, PTE5_IN,</div><div class='hunk'>@@ -1555,9 +1555,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTE3_FN, PTE3_OUT, 0, PTE3_IN,</div><div class='ctx'> 		PTE2_FN, PTE2_OUT, 0, PTE2_IN,</div><div class='ctx'> 		PTE1_FN, PTE1_OUT, 0, PTE1_IN,</div><div class='del'>-		PTE0_FN, PTE0_OUT, 0, PTE0_IN }</div><div class='add'>+		PTE0_FN, PTE0_OUT, 0, PTE0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2, GROUP(</div><div class='ctx'> 		PTF7_FN, PTF7_OUT, 0, PTF7_IN,</div><div class='ctx'> 		PTF6_FN, PTF6_OUT, 0, PTF6_IN,</div><div class='ctx'> 		PTF5_FN, PTF5_OUT, 0, PTF5_IN,</div><div class='hunk'>@@ -1565,9 +1565,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTF3_FN, PTF3_OUT, 0, PTF3_IN,</div><div class='ctx'> 		PTF2_FN, PTF2_OUT, 0, PTF2_IN,</div><div class='ctx'> 		PTF1_FN, PTF1_OUT, 0, PTF1_IN,</div><div class='del'>-		PTF0_FN, PTF0_OUT, 0, PTF0_IN }</div><div class='add'>+		PTF0_FN, PTF0_OUT, 0, PTF0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTG5_FN, PTG5_OUT, 0, 0,</div><div class='hunk'>@@ -1575,9 +1575,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTG3_FN, PTG3_OUT, 0, 0,</div><div class='ctx'> 		PTG2_FN, PTG2_OUT, 0, 0,</div><div class='ctx'> 		PTG1_FN, PTG1_OUT, 0, 0,</div><div class='del'>-		PTG0_FN, PTG0_OUT, 0, 0 }</div><div class='add'>+		PTG0_FN, PTG0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2, GROUP(</div><div class='ctx'> 		PTH7_FN, PTH7_OUT, 0, PTH7_IN,</div><div class='ctx'> 		PTH6_FN, PTH6_OUT, 0, PTH6_IN,</div><div class='ctx'> 		PTH5_FN, PTH5_OUT, 0, PTH5_IN,</div><div class='hunk'>@@ -1585,9 +1585,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTH3_FN, PTH3_OUT, 0, PTH3_IN,</div><div class='ctx'> 		PTH2_FN, PTH2_OUT, 0, PTH2_IN,</div><div class='ctx'> 		PTH1_FN, PTH1_OUT, 0, PTH1_IN,</div><div class='del'>-		PTH0_FN, PTH0_OUT, 0, PTH0_IN }</div><div class='add'>+		PTH0_FN, PTH0_OUT, 0, PTH0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2, GROUP(</div><div class='ctx'> 		PTJ7_FN, PTJ7_OUT, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTJ5_FN, PTJ5_OUT, 0, 0,</div><div class='hunk'>@@ -1595,9 +1595,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTJ3_FN, PTJ3_OUT, 0, PTJ3_IN,</div><div class='ctx'> 		PTJ2_FN, PTJ2_OUT, 0, PTJ2_IN,</div><div class='ctx'> 		PTJ1_FN, PTJ1_OUT, 0, PTJ1_IN,</div><div class='del'>-		PTJ0_FN, PTJ0_OUT, 0, PTJ0_IN }</div><div class='add'>+		PTJ0_FN, PTJ0_OUT, 0, PTJ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2, GROUP(</div><div class='ctx'> 		PTK7_FN, PTK7_OUT, 0, PTK7_IN,</div><div class='ctx'> 		PTK6_FN, PTK6_OUT, 0, PTK6_IN,</div><div class='ctx'> 		PTK5_FN, PTK5_OUT, 0, PTK5_IN,</div><div class='hunk'>@@ -1605,9 +1605,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTK3_FN, PTK3_OUT, 0, PTK3_IN,</div><div class='ctx'> 		PTK2_FN, PTK2_OUT, 0, PTK2_IN,</div><div class='ctx'> 		PTK1_FN, PTK1_OUT, 0, PTK1_IN,</div><div class='del'>-		PTK0_FN, PTK0_OUT, 0, PTK0_IN }</div><div class='add'>+		PTK0_FN, PTK0_OUT, 0, PTK0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2, GROUP(</div><div class='ctx'> 		PTL7_FN, PTL7_OUT, 0, PTL7_IN,</div><div class='ctx'> 		PTL6_FN, PTL6_OUT, 0, PTL6_IN,</div><div class='ctx'> 		PTL5_FN, PTL5_OUT, 0, PTL5_IN,</div><div class='hunk'>@@ -1615,9 +1615,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTL3_FN, PTL3_OUT, 0, PTL3_IN,</div><div class='ctx'> 		PTL2_FN, PTL2_OUT, 0, PTL2_IN,</div><div class='ctx'> 		PTL1_FN, PTL1_OUT, 0, PTL1_IN,</div><div class='del'>-		PTL0_FN, PTL0_OUT, 0, PTL0_IN }</div><div class='add'>+		PTL0_FN, PTL0_OUT, 0, PTL0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2, GROUP(</div><div class='ctx'> 		PTM7_FN, PTM7_OUT, 0, PTM7_IN,</div><div class='ctx'> 		PTM6_FN, PTM6_OUT, 0, PTM6_IN,</div><div class='ctx'> 		PTM5_FN, PTM5_OUT, 0, PTM5_IN,</div><div class='hunk'>@@ -1625,9 +1625,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTM3_FN, PTM3_OUT, 0, PTM3_IN,</div><div class='ctx'> 		PTM2_FN, PTM2_OUT, 0, PTM2_IN,</div><div class='ctx'> 		PTM1_FN, PTM1_OUT, 0, PTM1_IN,</div><div class='del'>-		PTM0_FN, PTM0_OUT, 0, PTM0_IN }</div><div class='add'>+		PTM0_FN, PTM0_OUT, 0, PTM0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PNCR", 0xa4050118, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PNCR", 0xa4050118, 16, 2, GROUP(</div><div class='ctx'> 		PTN7_FN, PTN7_OUT, 0, PTN7_IN,</div><div class='ctx'> 		PTN6_FN, PTN6_OUT, 0, PTN6_IN,</div><div class='ctx'> 		PTN5_FN, PTN5_OUT, 0, PTN5_IN,</div><div class='hunk'>@@ -1635,9 +1635,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTN3_FN, PTN3_OUT, 0, PTN3_IN,</div><div class='ctx'> 		PTN2_FN, PTN2_OUT, 0, PTN2_IN,</div><div class='ctx'> 		PTN1_FN, PTN1_OUT, 0, PTN1_IN,</div><div class='del'>-		PTN0_FN, PTN0_OUT, 0, PTN0_IN }</div><div class='add'>+		PTN0_FN, PTN0_OUT, 0, PTN0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PQCR", 0xa405011a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PQCR", 0xa405011a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1645,9 +1645,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTQ3_FN, 0, 0, PTQ3_IN,</div><div class='ctx'> 		PTQ2_FN, 0, 0, PTQ2_IN,</div><div class='ctx'> 		PTQ1_FN, 0, 0, PTQ1_IN,</div><div class='del'>-		PTQ0_FN, 0, 0, PTQ0_IN }</div><div class='add'>+		PTQ0_FN, 0, 0, PTQ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PRCR", 0xa405011c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PRCR", 0xa405011c, 16, 2, GROUP(</div><div class='ctx'> 		PTR7_FN, PTR7_OUT, 0, PTR7_IN,</div><div class='ctx'> 		PTR6_FN, PTR6_OUT, 0, PTR6_IN,</div><div class='ctx'> 		PTR5_FN, PTR5_OUT, 0, PTR5_IN,</div><div class='hunk'>@@ -1655,9 +1655,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTR3_FN, 0, 0, PTR3_IN,</div><div class='ctx'> 		PTR2_FN, 0, 0, PTR2_IN,</div><div class='ctx'> 		PTR1_FN, PTR1_OUT, 0, PTR1_IN,</div><div class='del'>-		PTR0_FN, PTR0_OUT, 0, PTR0_IN }</div><div class='add'>+		PTR0_FN, PTR0_OUT, 0, PTR0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSCR", 0xa405011e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSCR", 0xa405011e, 16, 2, GROUP(</div><div class='ctx'> 		PTS7_FN, PTS7_OUT, 0, PTS7_IN,</div><div class='ctx'> 		PTS6_FN, PTS6_OUT, 0, PTS6_IN,</div><div class='ctx'> 		PTS5_FN, PTS5_OUT, 0, PTS5_IN,</div><div class='hunk'>@@ -1665,9 +1665,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTS3_FN, PTS3_OUT, 0, PTS3_IN,</div><div class='ctx'> 		PTS2_FN, PTS2_OUT, 0, PTS2_IN,</div><div class='ctx'> 		PTS1_FN, PTS1_OUT, 0, PTS1_IN,</div><div class='del'>-		PTS0_FN, PTS0_OUT, 0, PTS0_IN }</div><div class='add'>+		PTS0_FN, PTS0_OUT, 0, PTS0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PTCR", 0xa4050140, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PTCR", 0xa4050140, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTT5_FN, PTT5_OUT, 0, PTT5_IN,</div><div class='hunk'>@@ -1675,9 +1675,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTT3_FN, PTT3_OUT, 0, PTT3_IN,</div><div class='ctx'> 		PTT2_FN, PTT2_OUT, 0, PTT2_IN,</div><div class='ctx'> 		PTT1_FN, PTT1_OUT, 0, PTT1_IN,</div><div class='del'>-		PTT0_FN, PTT0_OUT, 0, PTT0_IN }</div><div class='add'>+		PTT0_FN, PTT0_OUT, 0, PTT0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PUCR", 0xa4050142, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PUCR", 0xa4050142, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTU5_FN, PTU5_OUT, 0, PTU5_IN,</div><div class='hunk'>@@ -1685,9 +1685,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTU3_FN, PTU3_OUT, 0, PTU3_IN,</div><div class='ctx'> 		PTU2_FN, PTU2_OUT, 0, PTU2_IN,</div><div class='ctx'> 		PTU1_FN, PTU1_OUT, 0, PTU1_IN,</div><div class='del'>-		PTU0_FN, PTU0_OUT, 0, PTU0_IN }</div><div class='add'>+		PTU0_FN, PTU0_OUT, 0, PTU0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PVCR", 0xa4050144, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PVCR", 0xa4050144, 16, 2, GROUP(</div><div class='ctx'> 		PTV7_FN, PTV7_OUT, 0, PTV7_IN,</div><div class='ctx'> 		PTV6_FN, PTV6_OUT, 0, PTV6_IN,</div><div class='ctx'> 		PTV5_FN, PTV5_OUT, 0, PTV5_IN,</div><div class='hunk'>@@ -1695,9 +1695,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTV3_FN, PTV3_OUT, 0, PTV3_IN,</div><div class='ctx'> 		PTV2_FN, PTV2_OUT, 0, PTV2_IN,</div><div class='ctx'> 		PTV1_FN, PTV1_OUT, 0, PTV1_IN,</div><div class='del'>-		PTV0_FN, PTV0_OUT, 0, PTV0_IN }</div><div class='add'>+		PTV0_FN, PTV0_OUT, 0, PTV0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PWCR", 0xa4050146, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PWCR", 0xa4050146, 16, 2, GROUP(</div><div class='ctx'> 		PTW7_FN, PTW7_OUT, 0, PTW7_IN,</div><div class='ctx'> 		PTW6_FN, PTW6_OUT, 0, PTW6_IN,</div><div class='ctx'> 		PTW5_FN, PTW5_OUT, 0, PTW5_IN,</div><div class='hunk'>@@ -1705,9 +1705,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTW3_FN, PTW3_OUT, 0, PTW3_IN,</div><div class='ctx'> 		PTW2_FN, PTW2_OUT, 0, PTW2_IN,</div><div class='ctx'> 		PTW1_FN, PTW1_OUT, 0, PTW1_IN,</div><div class='del'>-		PTW0_FN, PTW0_OUT, 0, PTW0_IN }</div><div class='add'>+		PTW0_FN, PTW0_OUT, 0, PTW0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PXCR", 0xa4050148, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PXCR", 0xa4050148, 16, 2, GROUP(</div><div class='ctx'> 		PTX7_FN, PTX7_OUT, 0, PTX7_IN,</div><div class='ctx'> 		PTX6_FN, PTX6_OUT, 0, PTX6_IN,</div><div class='ctx'> 		PTX5_FN, PTX5_OUT, 0, PTX5_IN,</div><div class='hunk'>@@ -1715,9 +1715,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTX3_FN, PTX3_OUT, 0, PTX3_IN,</div><div class='ctx'> 		PTX2_FN, PTX2_OUT, 0, PTX2_IN,</div><div class='ctx'> 		PTX1_FN, PTX1_OUT, 0, PTX1_IN,</div><div class='del'>-		PTX0_FN, PTX0_OUT, 0, PTX0_IN }</div><div class='add'>+		PTX0_FN, PTX0_OUT, 0, PTX0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PYCR", 0xa405014a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PYCR", 0xa405014a, 16, 2, GROUP(</div><div class='ctx'> 		PTY7_FN, PTY7_OUT, 0, PTY7_IN,</div><div class='ctx'> 		PTY6_FN, PTY6_OUT, 0, PTY6_IN,</div><div class='ctx'> 		PTY5_FN, PTY5_OUT, 0, PTY5_IN,</div><div class='hunk'>@@ -1725,9 +1725,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTY3_FN, PTY3_OUT, 0, PTY3_IN,</div><div class='ctx'> 		PTY2_FN, PTY2_OUT, 0, PTY2_IN,</div><div class='ctx'> 		PTY1_FN, PTY1_OUT, 0, PTY1_IN,</div><div class='del'>-		PTY0_FN, PTY0_OUT, 0, PTY0_IN }</div><div class='add'>+		PTY0_FN, PTY0_OUT, 0, PTY0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PZCR", 0xa405014c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PZCR", 0xa405014c, 16, 2, GROUP(</div><div class='ctx'> 		PTZ7_FN, PTZ7_OUT, 0, PTZ7_IN,</div><div class='ctx'> 		PTZ6_FN, PTZ6_OUT, 0, PTZ6_IN,</div><div class='ctx'> 		PTZ5_FN, PTZ5_OUT, 0, PTZ5_IN,</div><div class='hunk'>@@ -1735,9 +1735,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTZ3_FN, PTZ3_OUT, 0, PTZ3_IN,</div><div class='ctx'> 		PTZ2_FN, PTZ2_OUT, 0, PTZ2_IN,</div><div class='ctx'> 		PTZ1_FN, PTZ1_OUT, 0, PTZ1_IN,</div><div class='del'>-		PTZ0_FN, PTZ0_OUT, 0, PTZ0_IN }</div><div class='add'>+		PTZ0_FN, PTZ0_OUT, 0, PTZ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELA", 0xa405014e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELA", 0xa405014e, 16, 2, GROUP(</div><div class='ctx'> 		PSA15_PSA14_FN1, PSA15_PSA14_FN2, 0, 0,</div><div class='ctx'> 		PSA13_PSA12_FN1, PSA13_PSA12_FN2, 0, 0,</div><div class='ctx'> 		PSA11_PSA10_FN1, PSA11_PSA10_FN2, 0, 0,</div><div class='hunk'>@@ -1745,9 +1745,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PSA5_PSA4_FN1, PSA5_PSA4_FN2, PSA5_PSA4_FN3, 0,</div><div class='ctx'> 		PSA3_PSA2_FN1, PSA3_PSA2_FN2, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELB", 0xa4050150, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELB", 0xa4050150, 16, 2, GROUP(</div><div class='ctx'> 		PSB15_PSB14_FN1, PSB15_PSB14_FN2, 0, 0,</div><div class='ctx'> 		PSB13_PSB12_LCDC_RGB, PSB13_PSB12_LCDC_SYS, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1755,9 +1755,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSB7_PSB6_FN1, PSB7_PSB6_FN2, 0, 0,</div><div class='ctx'> 		PSB5_PSB4_FN1, PSB5_PSB4_FN2, 0, 0,</div><div class='ctx'> 		PSB3_PSB2_FN1, PSB3_PSB2_FN2, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELC", 0xa4050152, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELC", 0xa4050152, 16, 2, GROUP(</div><div class='ctx'> 		PSC15_PSC14_FN1, PSC15_PSC14_FN2, 0, 0,</div><div class='ctx'> 		PSC13_PSC12_FN1, PSC13_PSC12_FN2, 0, 0,</div><div class='ctx'> 		PSC11_PSC10_FN1, PSC11_PSC10_FN2, PSC11_PSC10_FN3, 0,</div><div class='hunk'>@@ -1765,9 +1765,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSC7_PSC6_FN1, PSC7_PSC6_FN2, PSC7_PSC6_FN3, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELD", 0xa4050154, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELD", 0xa4050154, 16, 2, GROUP(</div><div class='ctx'> 		PSD15_PSD14_FN1, PSD15_PSD14_FN2, 0, 0,</div><div class='ctx'> 		PSD13_PSD12_FN1, PSD13_PSD12_FN2, 0, 0,</div><div class='ctx'> 		PSD11_PSD10_FN1, PSD11_PSD10_FN2, PSD11_PSD10_FN3, 0,</div><div class='hunk'>@@ -1775,103 +1775,103 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSD7_PSD6_FN1, PSD7_PSD6_FN2, 0, 0,</div><div class='ctx'> 		PSD5_PSD4_FN1, PSD5_PSD4_FN2, 0, 0,</div><div class='ctx'> 		PSD3_PSD2_FN1, PSD3_PSD2_FN2, 0, 0,</div><div class='del'>-		PSD1_PSD0_FN1, PSD1_PSD0_FN2, 0, 0 }</div><div class='add'>+		PSD1_PSD0_FN1, PSD1_PSD0_FN2, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xa4050120, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xa4050120, 8, GROUP(</div><div class='ctx'> 		PTA7_DATA, PTA6_DATA, PTA5_DATA, PTA4_DATA,</div><div class='del'>-		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA }</div><div class='add'>+		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xa4050122, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xa4050122, 8, GROUP(</div><div class='ctx'> 		PTB7_DATA, PTB6_DATA, PTB5_DATA, PTB4_DATA,</div><div class='del'>-		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA }</div><div class='add'>+		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xa4050124, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xa4050124, 8, GROUP(</div><div class='ctx'> 		PTC7_DATA, PTC6_DATA, PTC5_DATA, PTC4_DATA,</div><div class='del'>-		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA }</div><div class='add'>+		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8, GROUP(</div><div class='ctx'> 		PTD7_DATA, PTD6_DATA, PTD5_DATA, PTD4_DATA,</div><div class='del'>-		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA }</div><div class='add'>+		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xa4050128, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xa4050128, 8, GROUP(</div><div class='ctx'> 		0, 0, PTE5_DATA, PTE4_DATA,</div><div class='del'>-		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA }</div><div class='add'>+		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xa405012a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xa405012a, 8, GROUP(</div><div class='ctx'> 		PTF7_DATA, PTF6_DATA, PTF5_DATA, PTF4_DATA,</div><div class='del'>-		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA }</div><div class='add'>+		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xa405012c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xa405012c, 8, GROUP(</div><div class='ctx'> 		0, 0, PTG5_DATA, PTG4_DATA,</div><div class='del'>-		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA }</div><div class='add'>+		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xa405012e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xa405012e, 8, GROUP(</div><div class='ctx'> 		PTH7_DATA, PTH6_DATA, PTH5_DATA, PTH4_DATA,</div><div class='del'>-		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA }</div><div class='add'>+		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xa4050130, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xa4050130, 8, GROUP(</div><div class='ctx'> 		PTJ7_DATA, 0, PTJ5_DATA, 0,</div><div class='del'>-		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA }</div><div class='add'>+		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR", 0xa4050132, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR", 0xa4050132, 8, GROUP(</div><div class='ctx'> 		PTK7_DATA, PTK6_DATA, PTK5_DATA, PTK4_DATA,</div><div class='del'>-		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA }</div><div class='add'>+		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PLDR", 0xa4050134, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PLDR", 0xa4050134, 8, GROUP(</div><div class='ctx'> 		PTL7_DATA, PTL6_DATA, PTL5_DATA, PTL4_DATA,</div><div class='del'>-		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA }</div><div class='add'>+		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PMDR", 0xa4050136, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PMDR", 0xa4050136, 8, GROUP(</div><div class='ctx'> 		PTM7_DATA, PTM6_DATA, PTM5_DATA, PTM4_DATA,</div><div class='del'>-		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA }</div><div class='add'>+		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PNDR", 0xa4050138, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PNDR", 0xa4050138, 8, GROUP(</div><div class='ctx'> 		PTN7_DATA, PTN6_DATA, PTN5_DATA, PTN4_DATA,</div><div class='del'>-		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA }</div><div class='add'>+		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PQDR", 0xa405013a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PQDR", 0xa405013a, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA }</div><div class='add'>+		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PRDR", 0xa405013c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PRDR", 0xa405013c, 8, GROUP(</div><div class='ctx'> 		PTR7_DATA, PTR6_DATA, PTR5_DATA, PTR4_DATA,</div><div class='del'>-		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA }</div><div class='add'>+		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PSDR", 0xa405013e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PSDR", 0xa405013e, 8, GROUP(</div><div class='ctx'> 		PTS7_DATA, PTS6_DATA, PTS5_DATA, PTS4_DATA,</div><div class='del'>-		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA }</div><div class='add'>+		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PTDR", 0xa4050160, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PTDR", 0xa4050160, 8, GROUP(</div><div class='ctx'> 		0, 0, PTT5_DATA, PTT4_DATA,</div><div class='del'>-		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA }</div><div class='add'>+		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PUDR", 0xa4050162, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PUDR", 0xa4050162, 8, GROUP(</div><div class='ctx'> 		0, 0, PTU5_DATA, PTU4_DATA,</div><div class='del'>-		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA }</div><div class='add'>+		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PVDR", 0xa4050164, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PVDR", 0xa4050164, 8, GROUP(</div><div class='ctx'> 		PTV7_DATA, PTV6_DATA, PTV5_DATA, PTV4_DATA,</div><div class='del'>-		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA }</div><div class='add'>+		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PWDR", 0xa4050166, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PWDR", 0xa4050166, 8, GROUP(</div><div class='ctx'> 		PTW7_DATA, PTW6_DATA, PTW5_DATA, PTW4_DATA,</div><div class='del'>-		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA }</div><div class='add'>+		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PXDR", 0xa4050168, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PXDR", 0xa4050168, 8, GROUP(</div><div class='ctx'> 		PTX7_DATA, PTX6_DATA, PTX5_DATA, PTX4_DATA,</div><div class='del'>-		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA }</div><div class='add'>+		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PYDR", 0xa405016a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PYDR", 0xa405016a, 8, GROUP(</div><div class='ctx'> 		PTY7_DATA, PTY6_DATA, PTY5_DATA, PTY4_DATA,</div><div class='del'>-		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA }</div><div class='add'>+		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PZDR", 0xa405016c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PZDR", 0xa405016c, 8, GROUP(</div><div class='ctx'> 		PTZ7_DATA, PTZ6_DATA, PTZ5_DATA, PTZ4_DATA,</div><div class='del'>-		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA }</div><div class='add'>+		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7724.c b/drivers/pinctrl/sh-pfc/pfc-sh7724.c<br/>index 2cc4aa7df613..7a18afecda2c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7724.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7724.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7724.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7724.c</a></div><div class='hunk'>@@ -1739,7 +1739,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xa4050100, 16, 2, GROUP(</div><div class='ctx'> 		PTA7_FN, PTA7_OUT, 0, PTA7_IN,</div><div class='ctx'> 		PTA6_FN, PTA6_OUT, 0, PTA6_IN,</div><div class='ctx'> 		PTA5_FN, PTA5_OUT, 0, PTA5_IN,</div><div class='hunk'>@@ -1747,9 +1747,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTA3_FN, PTA3_OUT, 0, PTA3_IN,</div><div class='ctx'> 		PTA2_FN, PTA2_OUT, 0, PTA2_IN,</div><div class='ctx'> 		PTA1_FN, PTA1_OUT, 0, PTA1_IN,</div><div class='del'>-		PTA0_FN, PTA0_OUT, 0, PTA0_IN }</div><div class='add'>+		PTA0_FN, PTA0_OUT, 0, PTA0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2, GROUP(</div><div class='ctx'> 		PTB7_FN, PTB7_OUT, 0, PTB7_IN,</div><div class='ctx'> 		PTB6_FN, PTB6_OUT, 0, PTB6_IN,</div><div class='ctx'> 		PTB5_FN, PTB5_OUT, 0, PTB5_IN,</div><div class='hunk'>@@ -1757,9 +1757,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTB3_FN, PTB3_OUT, 0, PTB3_IN,</div><div class='ctx'> 		PTB2_FN, PTB2_OUT, 0, PTB2_IN,</div><div class='ctx'> 		PTB1_FN, PTB1_OUT, 0, PTB1_IN,</div><div class='del'>-		PTB0_FN, PTB0_OUT, 0, PTB0_IN }</div><div class='add'>+		PTB0_FN, PTB0_OUT, 0, PTB0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2, GROUP(</div><div class='ctx'> 		PTC7_FN, PTC7_OUT, 0, PTC7_IN,</div><div class='ctx'> 		PTC6_FN, PTC6_OUT, 0, PTC6_IN,</div><div class='ctx'> 		PTC5_FN, PTC5_OUT, 0, PTC5_IN,</div><div class='hunk'>@@ -1767,9 +1767,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTC3_FN, PTC3_OUT, 0, PTC3_IN,</div><div class='ctx'> 		PTC2_FN, PTC2_OUT, 0, PTC2_IN,</div><div class='ctx'> 		PTC1_FN, PTC1_OUT, 0, PTC1_IN,</div><div class='del'>-		PTC0_FN, PTC0_OUT, 0, PTC0_IN }</div><div class='add'>+		PTC0_FN, PTC0_OUT, 0, PTC0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xa4050106, 16, 2, GROUP(</div><div class='ctx'> 		PTD7_FN, PTD7_OUT, 0, PTD7_IN,</div><div class='ctx'> 		PTD6_FN, PTD6_OUT, 0, PTD6_IN,</div><div class='ctx'> 		PTD5_FN, PTD5_OUT, 0, PTD5_IN,</div><div class='hunk'>@@ -1777,9 +1777,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTD3_FN, PTD3_OUT, 0, PTD3_IN,</div><div class='ctx'> 		PTD2_FN, PTD2_OUT, 0, PTD2_IN,</div><div class='ctx'> 		PTD1_FN, PTD1_OUT, 0, PTD1_IN,</div><div class='del'>-		PTD0_FN, PTD0_OUT, 0, PTD0_IN }</div><div class='add'>+		PTD0_FN, PTD0_OUT, 0, PTD0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xa4050108, 16, 2, GROUP(</div><div class='ctx'> 		PTE7_FN, PTE7_OUT, 0, PTE7_IN,</div><div class='ctx'> 		PTE6_FN, PTE6_OUT, 0, PTE6_IN,</div><div class='ctx'> 		PTE5_FN, PTE5_OUT, 0, PTE5_IN,</div><div class='hunk'>@@ -1787,9 +1787,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTE3_FN, PTE3_OUT, 0, PTE3_IN,</div><div class='ctx'> 		PTE2_FN, PTE2_OUT, 0, PTE2_IN,</div><div class='ctx'> 		PTE1_FN, PTE1_OUT, 0, PTE1_IN,</div><div class='del'>-		PTE0_FN, PTE0_OUT, 0, PTE0_IN }</div><div class='add'>+		PTE0_FN, PTE0_OUT, 0, PTE0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xa405010a, 16, 2, GROUP(</div><div class='ctx'> 		PTF7_FN, PTF7_OUT, 0, PTF7_IN,</div><div class='ctx'> 		PTF6_FN, PTF6_OUT, 0, PTF6_IN,</div><div class='ctx'> 		PTF5_FN, PTF5_OUT, 0, PTF5_IN,</div><div class='hunk'>@@ -1797,9 +1797,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTF3_FN, PTF3_OUT, 0, PTF3_IN,</div><div class='ctx'> 		PTF2_FN, PTF2_OUT, 0, PTF2_IN,</div><div class='ctx'> 		PTF1_FN, PTF1_OUT, 0, PTF1_IN,</div><div class='del'>-		PTF0_FN, PTF0_OUT, 0, PTF0_IN }</div><div class='add'>+		PTF0_FN, PTF0_OUT, 0, PTF0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xa405010c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTG5_FN, PTG5_OUT, 0, 0,</div><div class='hunk'>@@ -1807,9 +1807,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTG3_FN, PTG3_OUT, 0, 0,</div><div class='ctx'> 		PTG2_FN, PTG2_OUT, 0, 0,</div><div class='ctx'> 		PTG1_FN, PTG1_OUT, 0, 0,</div><div class='del'>-		PTG0_FN, PTG0_OUT, 0, 0 }</div><div class='add'>+		PTG0_FN, PTG0_OUT, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xa405010e, 16, 2, GROUP(</div><div class='ctx'> 		PTH7_FN, PTH7_OUT, 0, PTH7_IN,</div><div class='ctx'> 		PTH6_FN, PTH6_OUT, 0, PTH6_IN,</div><div class='ctx'> 		PTH5_FN, PTH5_OUT, 0, PTH5_IN,</div><div class='hunk'>@@ -1817,9 +1817,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTH3_FN, PTH3_OUT, 0, PTH3_IN,</div><div class='ctx'> 		PTH2_FN, PTH2_OUT, 0, PTH2_IN,</div><div class='ctx'> 		PTH1_FN, PTH1_OUT, 0, PTH1_IN,</div><div class='del'>-		PTH0_FN, PTH0_OUT, 0, PTH0_IN }</div><div class='add'>+		PTH0_FN, PTH0_OUT, 0, PTH0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xa4050110, 16, 2, GROUP(</div><div class='ctx'> 		PTJ7_FN, PTJ7_OUT, 0, 0,</div><div class='ctx'> 		PTJ6_FN, PTJ6_OUT, 0, 0,</div><div class='ctx'> 		PTJ5_FN, PTJ5_OUT, 0, 0,</div><div class='hunk'>@@ -1827,9 +1827,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTJ3_FN, PTJ3_OUT, 0, PTJ3_IN,</div><div class='ctx'> 		PTJ2_FN, PTJ2_OUT, 0, PTJ2_IN,</div><div class='ctx'> 		PTJ1_FN, PTJ1_OUT, 0, PTJ1_IN,</div><div class='del'>-		PTJ0_FN, PTJ0_OUT, 0, PTJ0_IN }</div><div class='add'>+		PTJ0_FN, PTJ0_OUT, 0, PTJ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR", 0xa4050112, 16, 2, GROUP(</div><div class='ctx'> 		PTK7_FN, PTK7_OUT, 0, PTK7_IN,</div><div class='ctx'> 		PTK6_FN, PTK6_OUT, 0, PTK6_IN,</div><div class='ctx'> 		PTK5_FN, PTK5_OUT, 0, PTK5_IN,</div><div class='hunk'>@@ -1837,9 +1837,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTK3_FN, PTK3_OUT, 0, PTK3_IN,</div><div class='ctx'> 		PTK2_FN, PTK2_OUT, 0, PTK2_IN,</div><div class='ctx'> 		PTK1_FN, PTK1_OUT, 0, PTK1_IN,</div><div class='del'>-		PTK0_FN, PTK0_OUT, 0, PTK0_IN }</div><div class='add'>+		PTK0_FN, PTK0_OUT, 0, PTK0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PLCR", 0xa4050114, 16, 2, GROUP(</div><div class='ctx'> 		PTL7_FN, PTL7_OUT, 0, PTL7_IN,</div><div class='ctx'> 		PTL6_FN, PTL6_OUT, 0, PTL6_IN,</div><div class='ctx'> 		PTL5_FN, PTL5_OUT, 0, PTL5_IN,</div><div class='hunk'>@@ -1847,9 +1847,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTL3_FN, PTL3_OUT, 0, PTL3_IN,</div><div class='ctx'> 		PTL2_FN, PTL2_OUT, 0, PTL2_IN,</div><div class='ctx'> 		PTL1_FN, PTL1_OUT, 0, PTL1_IN,</div><div class='del'>-		PTL0_FN, PTL0_OUT, 0, PTL0_IN }</div><div class='add'>+		PTL0_FN, PTL0_OUT, 0, PTL0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PMCR", 0xa4050116, 16, 2, GROUP(</div><div class='ctx'> 		PTM7_FN, PTM7_OUT, 0, PTM7_IN,</div><div class='ctx'> 		PTM6_FN, PTM6_OUT, 0, PTM6_IN,</div><div class='ctx'> 		PTM5_FN, PTM5_OUT, 0, PTM5_IN,</div><div class='hunk'>@@ -1857,9 +1857,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTM3_FN, PTM3_OUT, 0, PTM3_IN,</div><div class='ctx'> 		PTM2_FN, PTM2_OUT, 0, PTM2_IN,</div><div class='ctx'> 		PTM1_FN, PTM1_OUT, 0, PTM1_IN,</div><div class='del'>-		PTM0_FN, PTM0_OUT, 0, PTM0_IN }</div><div class='add'>+		PTM0_FN, PTM0_OUT, 0, PTM0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PNCR", 0xa4050118, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PNCR", 0xa4050118, 16, 2, GROUP(</div><div class='ctx'> 		PTN7_FN, PTN7_OUT, 0, PTN7_IN,</div><div class='ctx'> 		PTN6_FN, PTN6_OUT, 0, PTN6_IN,</div><div class='ctx'> 		PTN5_FN, PTN5_OUT, 0, PTN5_IN,</div><div class='hunk'>@@ -1867,9 +1867,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTN3_FN, PTN3_OUT, 0, PTN3_IN,</div><div class='ctx'> 		PTN2_FN, PTN2_OUT, 0, PTN2_IN,</div><div class='ctx'> 		PTN1_FN, PTN1_OUT, 0, PTN1_IN,</div><div class='del'>-		PTN0_FN, PTN0_OUT, 0, PTN0_IN }</div><div class='add'>+		PTN0_FN, PTN0_OUT, 0, PTN0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PQCR", 0xa405011a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PQCR", 0xa405011a, 16, 2, GROUP(</div><div class='ctx'> 		PTQ7_FN, PTQ7_OUT, 0, PTQ7_IN,</div><div class='ctx'> 		PTQ6_FN, PTQ6_OUT, 0, PTQ6_IN,</div><div class='ctx'> 		PTQ5_FN, PTQ5_OUT, 0, PTQ5_IN,</div><div class='hunk'>@@ -1877,9 +1877,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTQ3_FN, PTQ3_OUT, 0, PTQ3_IN,</div><div class='ctx'> 		PTQ2_FN, PTQ2_OUT, 0, PTQ2_IN,</div><div class='ctx'> 		PTQ1_FN, PTQ1_OUT, 0, PTQ1_IN,</div><div class='del'>-		PTQ0_FN, PTQ0_OUT, 0, PTQ0_IN }</div><div class='add'>+		PTQ0_FN, PTQ0_OUT, 0, PTQ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PRCR", 0xa405011c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PRCR", 0xa405011c, 16, 2, GROUP(</div><div class='ctx'> 		PTR7_FN, PTR7_OUT, 0, PTR7_IN,</div><div class='ctx'> 		PTR6_FN, PTR6_OUT, 0, PTR6_IN,</div><div class='ctx'> 		PTR5_FN, PTR5_OUT, 0, PTR5_IN,</div><div class='hunk'>@@ -1887,9 +1887,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTR3_FN, 0,        0, PTR3_IN,</div><div class='ctx'> 		PTR2_FN, 0,        0, PTR2_IN,</div><div class='ctx'> 		PTR1_FN, PTR1_OUT, 0, PTR1_IN,</div><div class='del'>-		PTR0_FN, PTR0_OUT, 0, PTR0_IN }</div><div class='add'>+		PTR0_FN, PTR0_OUT, 0, PTR0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSCR", 0xa405011e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSCR", 0xa405011e, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PTS6_FN, PTS6_OUT, 0, PTS6_IN,</div><div class='ctx'> 		PTS5_FN, PTS5_OUT, 0, PTS5_IN,</div><div class='hunk'>@@ -1897,9 +1897,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTS3_FN, PTS3_OUT, 0, PTS3_IN,</div><div class='ctx'> 		PTS2_FN, PTS2_OUT, 0, PTS2_IN,</div><div class='ctx'> 		PTS1_FN, PTS1_OUT, 0, PTS1_IN,</div><div class='del'>-		PTS0_FN, PTS0_OUT, 0, PTS0_IN }</div><div class='add'>+		PTS0_FN, PTS0_OUT, 0, PTS0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PTCR", 0xa4050140, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PTCR", 0xa4050140, 16, 2, GROUP(</div><div class='ctx'> 		PTT7_FN, PTT7_OUT, 0, PTT7_IN,</div><div class='ctx'> 		PTT6_FN, PTT6_OUT, 0, PTT6_IN,</div><div class='ctx'> 		PTT5_FN, PTT5_OUT, 0, PTT5_IN,</div><div class='hunk'>@@ -1907,9 +1907,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTT3_FN, PTT3_OUT, 0, PTT3_IN,</div><div class='ctx'> 		PTT2_FN, PTT2_OUT, 0, PTT2_IN,</div><div class='ctx'> 		PTT1_FN, PTT1_OUT, 0, PTT1_IN,</div><div class='del'>-		PTT0_FN, PTT0_OUT, 0, PTT0_IN }</div><div class='add'>+		PTT0_FN, PTT0_OUT, 0, PTT0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PUCR", 0xa4050142, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PUCR", 0xa4050142, 16, 2, GROUP(</div><div class='ctx'> 		PTU7_FN, PTU7_OUT, 0, PTU7_IN,</div><div class='ctx'> 		PTU6_FN, PTU6_OUT, 0, PTU6_IN,</div><div class='ctx'> 		PTU5_FN, PTU5_OUT, 0, PTU5_IN,</div><div class='hunk'>@@ -1917,9 +1917,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTU3_FN, PTU3_OUT, 0, PTU3_IN,</div><div class='ctx'> 		PTU2_FN, PTU2_OUT, 0, PTU2_IN,</div><div class='ctx'> 		PTU1_FN, PTU1_OUT, 0, PTU1_IN,</div><div class='del'>-		PTU0_FN, PTU0_OUT, 0, PTU0_IN }</div><div class='add'>+		PTU0_FN, PTU0_OUT, 0, PTU0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PVCR", 0xa4050144, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PVCR", 0xa4050144, 16, 2, GROUP(</div><div class='ctx'> 		PTV7_FN, PTV7_OUT, 0, PTV7_IN,</div><div class='ctx'> 		PTV6_FN, PTV6_OUT, 0, PTV6_IN,</div><div class='ctx'> 		PTV5_FN, PTV5_OUT, 0, PTV5_IN,</div><div class='hunk'>@@ -1927,9 +1927,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTV3_FN, PTV3_OUT, 0, PTV3_IN,</div><div class='ctx'> 		PTV2_FN, PTV2_OUT, 0, PTV2_IN,</div><div class='ctx'> 		PTV1_FN, PTV1_OUT, 0, PTV1_IN,</div><div class='del'>-		PTV0_FN, PTV0_OUT, 0, PTV0_IN }</div><div class='add'>+		PTV0_FN, PTV0_OUT, 0, PTV0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PWCR", 0xa4050146, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PWCR", 0xa4050146, 16, 2, GROUP(</div><div class='ctx'> 		PTW7_FN, PTW7_OUT, 0, PTW7_IN,</div><div class='ctx'> 		PTW6_FN, PTW6_OUT, 0, PTW6_IN,</div><div class='ctx'> 		PTW5_FN, PTW5_OUT, 0, PTW5_IN,</div><div class='hunk'>@@ -1937,9 +1937,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTW3_FN, PTW3_OUT, 0, PTW3_IN,</div><div class='ctx'> 		PTW2_FN, PTW2_OUT, 0, PTW2_IN,</div><div class='ctx'> 		PTW1_FN, PTW1_OUT, 0, PTW1_IN,</div><div class='del'>-		PTW0_FN, PTW0_OUT, 0, PTW0_IN }</div><div class='add'>+		PTW0_FN, PTW0_OUT, 0, PTW0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PXCR", 0xa4050148, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PXCR", 0xa4050148, 16, 2, GROUP(</div><div class='ctx'> 		PTX7_FN, PTX7_OUT, 0, PTX7_IN,</div><div class='ctx'> 		PTX6_FN, PTX6_OUT, 0, PTX6_IN,</div><div class='ctx'> 		PTX5_FN, PTX5_OUT, 0, PTX5_IN,</div><div class='hunk'>@@ -1947,9 +1947,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTX3_FN, PTX3_OUT, 0, PTX3_IN,</div><div class='ctx'> 		PTX2_FN, PTX2_OUT, 0, PTX2_IN,</div><div class='ctx'> 		PTX1_FN, PTX1_OUT, 0, PTX1_IN,</div><div class='del'>-		PTX0_FN, PTX0_OUT, 0, PTX0_IN }</div><div class='add'>+		PTX0_FN, PTX0_OUT, 0, PTX0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PYCR", 0xa405014a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PYCR", 0xa405014a, 16, 2, GROUP(</div><div class='ctx'> 		PTY7_FN, PTY7_OUT, 0, PTY7_IN,</div><div class='ctx'> 		PTY6_FN, PTY6_OUT, 0, PTY6_IN,</div><div class='ctx'> 		PTY5_FN, PTY5_OUT, 0, PTY5_IN,</div><div class='hunk'>@@ -1957,9 +1957,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTY3_FN, PTY3_OUT, 0, PTY3_IN,</div><div class='ctx'> 		PTY2_FN, PTY2_OUT, 0, PTY2_IN,</div><div class='ctx'> 		PTY1_FN, PTY1_OUT, 0, PTY1_IN,</div><div class='del'>-		PTY0_FN, PTY0_OUT, 0, PTY0_IN }</div><div class='add'>+		PTY0_FN, PTY0_OUT, 0, PTY0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PZCR", 0xa405014c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PZCR", 0xa405014c, 16, 2, GROUP(</div><div class='ctx'> 		PTZ7_FN, PTZ7_OUT, 0, PTZ7_IN,</div><div class='ctx'> 		PTZ6_FN, PTZ6_OUT, 0, PTZ6_IN,</div><div class='ctx'> 		PTZ5_FN, PTZ5_OUT, 0, PTZ5_IN,</div><div class='hunk'>@@ -1967,9 +1967,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTZ3_FN, PTZ3_OUT, 0, PTZ3_IN,</div><div class='ctx'> 		PTZ2_FN, PTZ2_OUT, 0, PTZ2_IN,</div><div class='ctx'> 		PTZ1_FN, PTZ1_OUT, 0, PTZ1_IN,</div><div class='del'>-		PTZ0_FN, PTZ0_OUT, 0, PTZ0_IN }</div><div class='add'>+		PTZ0_FN, PTZ0_OUT, 0, PTZ0_IN ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELA", 0xa405014e, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELA", 0xa405014e, 16, 1, GROUP(</div><div class='ctx'> 		PSA15_0, PSA15_1,</div><div class='ctx'> 		PSA14_0, PSA14_1,</div><div class='ctx'> 		PSA13_0, PSA13_1,</div><div class='hunk'>@@ -1985,9 +1985,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSA3_0,  PSA3_1,</div><div class='ctx'> 		PSA2_0,  PSA2_1,</div><div class='ctx'> 		PSA1_0,  PSA1_1,</div><div class='del'>-		PSA0_0,  PSA0_1}</div><div class='add'>+		PSA0_0,  PSA0_1))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELB", 0xa4050150, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELB", 0xa4050150, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PSB14_0, PSB14_1,</div><div class='ctx'> 		PSB13_0, PSB13_1,</div><div class='hunk'>@@ -2003,9 +2003,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSB3_0,  PSB3_1,</div><div class='ctx'> 		PSB2_0,  PSB2_1,</div><div class='ctx'> 		PSB1_0,  PSB1_1,</div><div class='del'>-		PSB0_0,  PSB0_1}</div><div class='add'>+		PSB0_0,  PSB0_1))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELC", 0xa4050152, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELC", 0xa4050152, 16, 1, GROUP(</div><div class='ctx'> 		PSC15_0, PSC15_1,</div><div class='ctx'> 		PSC14_0, PSC14_1,</div><div class='ctx'> 		PSC13_0, PSC13_1,</div><div class='hunk'>@@ -2021,9 +2021,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PSC2_0,  PSC2_1,</div><div class='ctx'> 		PSC1_0,  PSC1_1,</div><div class='del'>-		PSC0_0,  PSC0_1}</div><div class='add'>+		PSC0_0,  PSC0_1))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELD", 0xa4050154, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELD", 0xa4050154, 16, 1, GROUP(</div><div class='ctx'> 		PSD15_0, PSD15_1,</div><div class='ctx'> 		PSD14_0, PSD14_1,</div><div class='ctx'> 		PSD13_0, PSD13_1,</div><div class='hunk'>@@ -2039,9 +2039,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSD3_0,  PSD3_1,</div><div class='ctx'> 		PSD2_0,  PSD2_1,</div><div class='ctx'> 		PSD1_0,  PSD1_1,</div><div class='del'>-		PSD0_0,  PSD0_1}</div><div class='add'>+		PSD0_0,  PSD0_1))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSELE", 0xa4050156, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSELE", 0xa4050156, 16, 1, GROUP(</div><div class='ctx'> 		PSE15_0, PSE15_1,</div><div class='ctx'> 		PSE14_0, PSE14_1,</div><div class='ctx'> 		PSE13_0, PSE13_1,</div><div class='hunk'>@@ -2057,103 +2057,103 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PSE3_0,  PSE3_1,</div><div class='ctx'> 		PSE2_0,  PSE2_1,</div><div class='ctx'> 		PSE1_0,  PSE1_1,</div><div class='del'>-		PSE0_0,  PSE0_1}</div><div class='add'>+		PSE0_0,  PSE0_1))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xa4050120, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xa4050120, 8, GROUP(</div><div class='ctx'> 		PTA7_DATA, PTA6_DATA, PTA5_DATA, PTA4_DATA,</div><div class='del'>-		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA }</div><div class='add'>+		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xa4050122, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xa4050122, 8, GROUP(</div><div class='ctx'> 		PTB7_DATA, PTB6_DATA, PTB5_DATA, PTB4_DATA,</div><div class='del'>-		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA }</div><div class='add'>+		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xa4050124, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xa4050124, 8, GROUP(</div><div class='ctx'> 		PTC7_DATA, PTC6_DATA, PTC5_DATA, PTC4_DATA,</div><div class='del'>-		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA }</div><div class='add'>+		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xa4050126, 8, GROUP(</div><div class='ctx'> 		PTD7_DATA, PTD6_DATA, PTD5_DATA, PTD4_DATA,</div><div class='del'>-		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA }</div><div class='add'>+		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xa4050128, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xa4050128, 8, GROUP(</div><div class='ctx'> 		PTE7_DATA, PTE6_DATA, PTE5_DATA, PTE4_DATA,</div><div class='del'>-		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA }</div><div class='add'>+		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xa405012a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xa405012a, 8, GROUP(</div><div class='ctx'> 		PTF7_DATA, PTF6_DATA, PTF5_DATA, PTF4_DATA,</div><div class='del'>-		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA }</div><div class='add'>+		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xa405012c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xa405012c, 8, GROUP(</div><div class='ctx'> 		0,         0,         PTG5_DATA, PTG4_DATA,</div><div class='del'>-		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA }</div><div class='add'>+		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xa405012e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xa405012e, 8, GROUP(</div><div class='ctx'> 		PTH7_DATA, PTH6_DATA, PTH5_DATA, PTH4_DATA,</div><div class='del'>-		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA }</div><div class='add'>+		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xa4050130, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xa4050130, 8, GROUP(</div><div class='ctx'> 		PTJ7_DATA, PTJ6_DATA, PTJ5_DATA, 0,</div><div class='del'>-		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA }</div><div class='add'>+		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR", 0xa4050132, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR", 0xa4050132, 8, GROUP(</div><div class='ctx'> 		PTK7_DATA, PTK6_DATA, PTK5_DATA, PTK4_DATA,</div><div class='del'>-		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA }</div><div class='add'>+		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PLDR", 0xa4050134, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PLDR", 0xa4050134, 8, GROUP(</div><div class='ctx'> 		PTL7_DATA, PTL6_DATA, PTL5_DATA, PTL4_DATA,</div><div class='del'>-		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA }</div><div class='add'>+		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PMDR", 0xa4050136, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PMDR", 0xa4050136, 8, GROUP(</div><div class='ctx'> 		PTM7_DATA, PTM6_DATA, PTM5_DATA, PTM4_DATA,</div><div class='del'>-		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA }</div><div class='add'>+		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PNDR", 0xa4050138, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PNDR", 0xa4050138, 8, GROUP(</div><div class='ctx'> 		PTN7_DATA, PTN6_DATA, PTN5_DATA, PTN4_DATA,</div><div class='del'>-		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA }</div><div class='add'>+		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PQDR", 0xa405013a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PQDR", 0xa405013a, 8, GROUP(</div><div class='ctx'> 		PTQ7_DATA, PTQ6_DATA, PTQ5_DATA, PTQ4_DATA,</div><div class='del'>-		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA }</div><div class='add'>+		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PRDR", 0xa405013c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PRDR", 0xa405013c, 8, GROUP(</div><div class='ctx'> 		PTR7_DATA, PTR6_DATA, PTR5_DATA, PTR4_DATA,</div><div class='del'>-		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA }</div><div class='add'>+		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PSDR", 0xa405013e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PSDR", 0xa405013e, 8, GROUP(</div><div class='ctx'> 		0,         PTS6_DATA, PTS5_DATA, PTS4_DATA,</div><div class='del'>-		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA }</div><div class='add'>+		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PTDR", 0xa4050160, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PTDR", 0xa4050160, 8, GROUP(</div><div class='ctx'> 		PTT7_DATA, PTT6_DATA, PTT5_DATA, PTT4_DATA,</div><div class='del'>-		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA }</div><div class='add'>+		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PUDR", 0xa4050162, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PUDR", 0xa4050162, 8, GROUP(</div><div class='ctx'> 		PTU7_DATA, PTU6_DATA, PTU5_DATA, PTU4_DATA,</div><div class='del'>-		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA }</div><div class='add'>+		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PVDR", 0xa4050164, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PVDR", 0xa4050164, 8, GROUP(</div><div class='ctx'> 		PTV7_DATA, PTV6_DATA, PTV5_DATA, PTV4_DATA,</div><div class='del'>-		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA }</div><div class='add'>+		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PWDR", 0xa4050166, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PWDR", 0xa4050166, 8, GROUP(</div><div class='ctx'> 		PTW7_DATA, PTW6_DATA, PTW5_DATA, PTW4_DATA,</div><div class='del'>-		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA }</div><div class='add'>+		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PXDR", 0xa4050168, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PXDR", 0xa4050168, 8, GROUP(</div><div class='ctx'> 		PTX7_DATA, PTX6_DATA, PTX5_DATA, PTX4_DATA,</div><div class='del'>-		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA }</div><div class='add'>+		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PYDR", 0xa405016a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PYDR", 0xa405016a, 8, GROUP(</div><div class='ctx'> 		PTY7_DATA, PTY6_DATA, PTY5_DATA, PTY4_DATA,</div><div class='del'>-		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA }</div><div class='add'>+		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PZDR", 0xa405016c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PZDR", 0xa405016c, 8, GROUP(</div><div class='ctx'> 		PTZ7_DATA, PTZ6_DATA, PTZ5_DATA, PTZ4_DATA,</div><div class='del'>-		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA }</div><div class='add'>+		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/sh-pfc/pfc-sh7734.c<br/>index 748a32a3af82..fac7b4699121 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7734.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7734.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7734.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7734.c</a></div><div class='hunk'>@@ -1635,7 +1635,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR0", 0xFFFC0004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xFFFC0004, 32, 1, GROUP(</div><div class='ctx'> 		GP_0_31_FN, FN_IP2_2_0,</div><div class='ctx'> 		GP_0_30_FN, FN_IP1_31_29,</div><div class='ctx'> 		GP_0_29_FN, FN_IP1_28_26,</div><div class='hunk'>@@ -1667,9 +1667,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_0_3_FN, FN_IP1_15_14,</div><div class='ctx'> 		GP_0_2_FN, FN_IP1_13_12,</div><div class='ctx'> 		GP_0_1_FN, FN_IP1_11_10,</div><div class='del'>-		GP_0_0_FN, FN_IP1_9_8 }</div><div class='add'>+		GP_0_0_FN, FN_IP1_9_8 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR1", 0xFFFC0008, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xFFFC0008, 32, 1, GROUP(</div><div class='ctx'> 		GP_1_31_FN, FN_IP11_25_23,</div><div class='ctx'> 		GP_1_30_FN, FN_IP2_13_11,</div><div class='ctx'> 		GP_1_29_FN, FN_IP2_10_8,</div><div class='hunk'>@@ -1701,9 +1701,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_1_3_FN, FN_IP11_22_21,</div><div class='ctx'> 		GP_1_2_FN, FN_IP11_20_19,</div><div class='ctx'> 		GP_1_1_FN, FN_IP3_29_27,</div><div class='del'>-		GP_1_0_FN, FN_IP3_20 }</div><div class='add'>+		GP_1_0_FN, FN_IP3_20 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR2", 0xFFFC000C, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xFFFC000C, 32, 1, GROUP(</div><div class='ctx'> 		GP_2_31_FN, FN_IP4_31_30,</div><div class='ctx'> 		GP_2_30_FN, FN_IP5_2_0,</div><div class='ctx'> 		GP_2_29_FN, FN_IP5_5_3,</div><div class='hunk'>@@ -1735,9 +1735,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_2_3_FN, FN_IP4_2_0,</div><div class='ctx'> 		GP_2_2_FN, FN_IP11_11_10,</div><div class='ctx'> 		GP_2_1_FN, FN_IP11_9_7,</div><div class='del'>-		GP_2_0_FN, FN_IP11_6_4 }</div><div class='add'>+		GP_2_0_FN, FN_IP11_6_4 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR3", 0xFFFC0010, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xFFFC0010, 32, 1, GROUP(</div><div class='ctx'> 		GP_3_31_FN, FN_IP9_1_0,</div><div class='ctx'> 		GP_3_30_FN, FN_IP8_19_18,</div><div class='ctx'> 		GP_3_29_FN, FN_IP8_17_16,</div><div class='hunk'>@@ -1769,10 +1769,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_3_3_FN, FN_IP6_9_8,</div><div class='ctx'> 		GP_3_2_FN, FN_IP6_7_6,</div><div class='ctx'> 		GP_3_1_FN, FN_IP6_5_3,</div><div class='del'>-		GP_3_0_FN, FN_IP6_2_0 }</div><div class='add'>+		GP_3_0_FN, FN_IP6_2_0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("GPSR4", 0xFFFC0014, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xFFFC0014, 32, 1, GROUP(</div><div class='ctx'> 		GP_4_31_FN, FN_IP10_24_23,</div><div class='ctx'> 		GP_4_30_FN, FN_IP10_22,</div><div class='ctx'> 		GP_4_29_FN, FN_IP11_18_16,</div><div class='hunk'>@@ -1804,9 +1804,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_4_3_FN, FN_IP9_25_24,</div><div class='ctx'> 		GP_4_2_FN, FN_IP9_23_22,</div><div class='ctx'> 		GP_4_1_FN, FN_IP9_21_20,</div><div class='del'>-		GP_4_0_FN, FN_IP9_19_18 }</div><div class='add'>+		GP_4_0_FN, FN_IP9_19_18 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("GPSR5", 0xFFFC0018, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xFFFC0018, 32, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, /* 31 - 28 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, /* 27 - 24 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, /* 23 - 20 */</div><div class='hunk'>@@ -1819,12 +1819,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_FN, FN_IRQ3_B,</div><div class='ctx'> 		GP_5_2_FN, FN_IRQ2_B,</div><div class='ctx'> 		GP_5_1_FN, FN_IP11_3,</div><div class='del'>-		GP_5_0_FN, FN_IP10_25 }</div><div class='add'>+		GP_5_0_FN, FN_IP10_25 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR0", 0xFFFC001C, 32,</div><div class='del'>-			2, 2, 2, 2, 2, 2, 2, 2,</div><div class='del'>-			2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			GROUP(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2),</div><div class='add'>+			GROUP(</div><div class='ctx'> 		/* IP0_31_30 [2] */</div><div class='ctx'> 		FN_A15, FN_ST0_VCO_CLKIN, FN_LCD_DATA15_A,</div><div class='ctx'> 			FN_TIOC3D_C,</div><div class='hunk'>@@ -1857,10 +1857,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP0_3_2 [2] */</div><div class='ctx'> 		FN_A1, FN_ST0_REQ, FN_LCD_DATA1_A, FN_TCLKB_C,</div><div class='ctx'> 		/* IP0_1_0 [2] */</div><div class='del'>-		FN_A0, FN_ST0_CLKIN, FN_LCD_DATA0_A, FN_TCLKA_C }</div><div class='add'>+		FN_A0, FN_ST0_CLKIN, FN_LCD_DATA0_A, FN_TCLKA_C ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR1", 0xFFFC0020, 32,</div><div class='del'>-			3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			GROUP(3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2),</div><div class='add'>+			GROUP(</div><div class='ctx'> 		/* IP1_31_29 [3] */</div><div class='ctx'> 		FN_D3, FN_SD0_DAT3_A, FN_MMC_D3_A, FN_ST1_D6,</div><div class='ctx'> 			FN_FD3_A, 0, 0, 0,</div><div class='hunk'>@@ -1892,10 +1893,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* IP1_3_2 [2] */</div><div class='ctx'> 		FN_A17, FN_ST1_VCO_CLKIN, FN_LCD_CL1_A,	FN_TIOC4B_C,</div><div class='ctx'> 		/* IP1_1_0 [2] */</div><div class='del'>-		FN_A16, FN_ST0_PWM, FN_LCD_DON_A, FN_TIOC4A_C }</div><div class='add'>+		FN_A16, FN_ST0_PWM, FN_LCD_DON_A, FN_TIOC4A_C ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR2", 0xFFFC0024, 32,</div><div class='del'>-			     1, 3, 3, 2, 3, 3, 3, 3, 3, 3, 2, 3) {</div><div class='add'>+			     GROUP(1, 3, 3, 2, 3, 3, 3, 3, 3, 3, 2, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* IP2_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* IP2_30_28 [3] */</div><div class='hunk'>@@ -1928,10 +1930,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_D5, FN_SD0_WP_A, FN_MMC_D5_A, FN_FD5_A,</div><div class='ctx'> 		/* IP2_2_0 [3] */</div><div class='ctx'> 		FN_D4, FN_SD0_CD_A, FN_MMC_D4_A, FN_ST1_D7,</div><div class='del'>-			FN_FD4_A, 0, 0, 0 }</div><div class='add'>+			FN_FD4_A, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR3", 0xFFFC0028, 32,</div><div class='del'>-				2, 3, 3, 3, 1, 2, 3, 3, 3, 3, 3, 1, 2) {</div><div class='add'>+			     GROUP(2, 3, 3, 3, 1, 2, 3, 3, 3, 3, 3, 1, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP3_31_30 [2] */</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 	    /* IP3_29_27 [3] */</div><div class='hunk'>@@ -1965,10 +1968,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP3_2 [1] */</div><div class='ctx'> 		FN_CS1_A26, FN_QIO3_B,</div><div class='ctx'> 	    /* IP3_1_0 [2] */</div><div class='del'>-		FN_D15, FN_SCK2_B, 0, 0 }</div><div class='add'>+		FN_D15, FN_SCK2_B, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR4", 0xFFFC002C, 32,</div><div class='del'>-				2, 2, 2, 2, 2, 2 , 2, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP4_31_30 [2] */</div><div class='ctx'> 		0, FN_SCK2_A, FN_VI0_G3, 0,</div><div class='ctx'> 	    /* IP4_29_28 [2] */</div><div class='hunk'>@@ -2000,10 +2004,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 			FN_ET0_RX_DV, 0, 0, 0,</div><div class='ctx'> 	    /* IP4_2_0 [3] */</div><div class='ctx'> 		FN_HCTS0_A, FN_CTS1_A, FN_VI0_FIELD, FN_RMII0_RXD1_A,</div><div class='del'>-			FN_ET0_ERXD7, 0, 0, 0 }</div><div class='add'>+			FN_ET0_ERXD7, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR5", 0xFFFC0030, 32,</div><div class='del'>-				1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3,</div><div class='add'>+				   3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP5_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP5_30 [1] */</div><div class='hunk'>@@ -2040,11 +2046,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, FN_ET0_ERXD2_B,</div><div class='ctx'> 	    /* IP5_2_0 [3] */</div><div class='ctx'> 		FN_SD2_CLK_A, FN_RX2_A, FN_VI0_G4, 0,</div><div class='del'>-		FN_ET0_RX_CLK_B, 0, 0, 0 }</div><div class='add'>+		FN_ET0_RX_CLK_B, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR6", 0xFFFC0034, 32,</div><div class='del'>-				1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-				3, 3, 2, 2, 2, 2, 2, 2, 3, 3) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 2, 2,</div><div class='add'>+				   2, 2, 2, 2, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP5_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP6_30 [1] */</div><div class='hunk'>@@ -2084,10 +2091,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_TCLKB_A, FN_HIFD01, 0, 0,</div><div class='ctx'> 	    /* IP6_2_0 [3] */</div><div class='ctx'> 		FN_DU0_DR0, FN_SCIF_CLK_B, FN_HRX0_D, FN_IETX_A,</div><div class='del'>-		FN_TCLKA_A, FN_HIFD00, 0, 0 }</div><div class='add'>+		FN_TCLKA_A, FN_HIFD00, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xFFFC0038, 32,</div><div class='del'>-			     1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP7_31 [1] */</div><div class='ctx'> 	    0, 0,</div><div class='ctx'> 	    /* IP7_30_29 [2] */</div><div class='hunk'>@@ -2120,10 +2128,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_HIFD11, 0, 0, 0,</div><div class='ctx'> 	    /* IP7_2_0 [3] */</div><div class='ctx'> 		FN_DU0_DG2, FN_RTS1_C, FN_RMII0_MDC_B, FN_TIOC2A_A,</div><div class='del'>-		FN_HIFD10, 0, 0, 0 }</div><div class='add'>+		FN_HIFD10, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR8", 0xFFFC003C, 32,</div><div class='del'>-			     2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2,</div><div class='add'>+				   2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP9_31_30 [2] */</div><div class='ctx'> 	    0, 0, 0, 0,</div><div class='ctx'> 	    /* IP8_29_28 [2] */</div><div class='hunk'>@@ -2156,11 +2166,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP8_3_2 [2] */</div><div class='ctx'> 		FN_DU0_DB6, 0, FN_HIFRDY, 0,</div><div class='ctx'> 	    /* IP8_1_0 [2] */</div><div class='del'>-		FN_DU0_DB5, 0, FN_HIFDREQ, 0 }</div><div class='add'>+		FN_DU0_DB5, 0, FN_HIFDREQ, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR9", 0xFFFC0040, 32,</div><div class='del'>-			     2, 2, 2, 2, 2, 2, 2, 2,</div><div class='del'>-			     2, 2, 2, 2, 2, 2, 2, 2) {</div><div class='add'>+			     GROUP(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,</div><div class='add'>+				   2, 2, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP9_31_30 [2] */</div><div class='ctx'> 	    0, 0, 0, 0,</div><div class='ctx'> 	    /* IP9_29_28 [2] */</div><div class='hunk'>@@ -2192,11 +2203,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP9_3_2 [2] */</div><div class='ctx'> 		FN_VI1_0_A, 0, FN_FD1_B, FN_LCD_DATA1_B,</div><div class='ctx'> 	    /* IP9_1_0 [2] */</div><div class='del'>-		FN_VI1_CLK_A, 0, FN_FD0_B, FN_LCD_DATA0_B }</div><div class='add'>+		FN_VI1_CLK_A, 0, FN_FD0_B, FN_LCD_DATA0_B ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR10", 0xFFFC0044, 32,</div><div class='del'>-					2, 2, 2, 1, 2, 1, 3,</div><div class='del'>-					3, 1, 3, 3, 3, 3, 3) {</div><div class='add'>+			     GROUP(2, 2, 2, 1, 2, 1, 3, 3, 1, 3, 3, 3, 3, 3),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP9_31_30 [2] */</div><div class='ctx'> 	    0, 0, 0, 0,</div><div class='ctx'> 	    /* IP10_29_28 [2] */</div><div class='hunk'>@@ -2231,10 +2242,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		FN_LCD_DON_B, 0, 0,</div><div class='ctx'> 	    /* IP10_2_0 [3] */</div><div class='ctx'> 		FN_SSI_SCK23, FN_VI1_4_B, FN_RX1_D, FN_FCLE_B,</div><div class='del'>-		FN_LCD_DATA15_B, 0, 0, 0 }</div><div class='add'>+		FN_LCD_DATA15_B, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("IPSR11", 0xFFFC0048, 32,</div><div class='del'>-			3, 1, 2, 3, 2, 2, 3, 3, 1, 2, 3, 3, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(3, 1, 2, 3, 2, 2, 3, 3, 1, 2, 3, 3,</div><div class='add'>+				   1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 	    /* IP11_31_29 [3] */</div><div class='ctx'> 	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 	    /* IP11_28 [1] */</div><div class='hunk'>@@ -2271,11 +2284,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 	    /* IP11_1 [1] */</div><div class='ctx'> 		FN_SDA1, FN_RX1_E,</div><div class='ctx'> 	    /* IP11_0 [1] */</div><div class='del'>-		FN_SCL1, FN_SCIF_CLK_C }</div><div class='add'>+		FN_SCL1, FN_SCIF_CLK_C ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xFFFC004C, 32,</div><div class='del'>-				3, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 2,</div><div class='del'>-				1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) {</div><div class='add'>+			     GROUP(3, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2,</div><div class='add'>+				   2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL1_31_29 [3] */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		/* SEL1_28 [1] */</div><div class='hunk'>@@ -2327,11 +2341,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL1_1 [1] */</div><div class='ctx'> 		FN_SEL_MMC_0, FN_SEL_MMC_1,</div><div class='ctx'> 		/* SEL1_0 [1] */</div><div class='del'>-		FN_SEL_INTC_0, FN_SEL_INTC_1 }</div><div class='add'>+		FN_SEL_INTC_0, FN_SEL_INTC_1 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xFFFC0050, 32,</div><div class='del'>-				1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-				1, 1, 1, 2, 2, 1, 2, 2, 3, 2, 3, 2, 2) {</div><div class='add'>+			     GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,</div><div class='add'>+				   2, 1, 2, 2, 3, 2, 3, 2, 2),</div><div class='add'>+			     GROUP(</div><div class='ctx'> 		/* SEL2_31 [1] */</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		/* SEL2_30 [1] */</div><div class='hunk'>@@ -2375,15 +2390,20 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		/* SEL2_3_2 [2] */</div><div class='ctx'> 		FN_SEL_SCIF0_0, FN_SEL_SCIF0_1, FN_SEL_SCIF0_2, 0,</div><div class='ctx'> 		/* SEL2_1_0 [2] */</div><div class='del'>-		FN_SEL_SCIF_CLK_0, FN_SEL_SCIF_CLK_1, FN_SEL_SCIF_CLK_2, 0  }</div><div class='add'>+		FN_SEL_SCIF_CLK_0, FN_SEL_SCIF_CLK_1, FN_SEL_SCIF_CLK_2, 0  ))</div><div class='ctx'> 	},</div><div class='ctx'> 	/* GPIO 0 - 5*/</div><div class='del'>-	{ PINMUX_CFG_REG("INOUTSEL0", 0xFFC40004, 32, 1) { GP_INOUTSEL(0) } },</div><div class='del'>-	{ PINMUX_CFG_REG("INOUTSEL1", 0xFFC41004, 32, 1) { GP_INOUTSEL(1) } },</div><div class='del'>-	{ PINMUX_CFG_REG("INOUTSEL2", 0xFFC42004, 32, 1) { GP_INOUTSEL(2) } },</div><div class='del'>-	{ PINMUX_CFG_REG("INOUTSEL3", 0xFFC43004, 32, 1) { GP_INOUTSEL(3) } },</div><div class='del'>-	{ PINMUX_CFG_REG("INOUTSEL4", 0xFFC44004, 32, 1) { GP_INOUTSEL(4) } },</div><div class='del'>-	{ PINMUX_CFG_REG("INOUTSEL5", 0xffc45004, 32, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL0", 0xFFC40004, 32, 1, GROUP(GP_INOUTSEL(0)))</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL1", 0xFFC41004, 32, 1, GROUP(GP_INOUTSEL(1)))</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL2", 0xFFC42004, 32, 1, GROUP(GP_INOUTSEL(2)))</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL3", 0xFFC43004, 32, 1, GROUP(GP_INOUTSEL(3)))</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL4", 0xFFC44004, 32, 1, GROUP(GP_INOUTSEL(4)))</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL5", 0xffc45004, 32, 1, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 31 - 24 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 23 - 16 */</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, /* 15 - 12 */</div><div class='hunk'>@@ -2398,24 +2418,24 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		GP_5_3_IN, GP_5_3_OUT,</div><div class='ctx'> 		GP_5_2_IN, GP_5_2_OUT,</div><div class='ctx'> 		GP_5_1_IN, GP_5_1_OUT,</div><div class='del'>-		GP_5_0_IN, GP_5_0_OUT }</div><div class='add'>+		GP_5_0_IN, GP_5_0_OUT ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='ctx'> 	/* GPIO 0 - 5*/</div><div class='del'>-	{ PINMUX_DATA_REG("INDT0", 0xFFC4000C, 32) { GP_INDT(0) } },</div><div class='del'>-	{ PINMUX_DATA_REG("INDT1", 0xFFC4100C, 32) { GP_INDT(1) } },</div><div class='del'>-	{ PINMUX_DATA_REG("INDT2", 0xFFC4200C, 32) { GP_INDT(2) } },</div><div class='del'>-	{ PINMUX_DATA_REG("INDT3", 0xFFC4300C, 32) { GP_INDT(3) } },</div><div class='del'>-	{ PINMUX_DATA_REG("INDT4", 0xFFC4400C, 32) { GP_INDT(4) } },</div><div class='del'>-	{ PINMUX_DATA_REG("INDT5", 0xFFC4500C, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("INDT0", 0xFFC4000C, 32, GROUP(GP_INDT(0))) },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT1", 0xFFC4100C, 32, GROUP(GP_INDT(1))) },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT2", 0xFFC4200C, 32, GROUP(GP_INDT(2))) },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT3", 0xFFC4300C, 32, GROUP(GP_INDT(3))) },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT4", 0xFFC4400C, 32, GROUP(GP_INDT(4))) },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT5", 0xFFC4500C, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		GP_5_11_DATA, GP_5_10_DATA, GP_5_9_DATA, GP_5_8_DATA,</div><div class='ctx'> 		GP_5_7_DATA, GP_5_6_DATA, GP_5_5_DATA, GP_5_4_DATA,</div><div class='del'>-		GP_5_3_DATA, GP_5_2_DATA, GP_5_1_DATA, GP_5_0_DATA }</div><div class='add'>+		GP_5_3_DATA, GP_5_2_DATA, GP_5_1_DATA, GP_5_0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7757.c b/drivers/pinctrl/sh-pfc/pfc-sh7757.c<br/>index b16090690ee3..064e987b09cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7757.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7757.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7757.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7757.c</a></div><div class='hunk'>@@ -1683,7 +1683,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xffec0000, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xffec0000, 16, 2, GROUP(</div><div class='ctx'> 		PTA7_FN, PTA7_OUT, PTA7_IN, 0,</div><div class='ctx'> 		PTA6_FN, PTA6_OUT, PTA6_IN, 0,</div><div class='ctx'> 		PTA5_FN, PTA5_OUT, PTA5_IN, 0,</div><div class='hunk'>@@ -1691,9 +1691,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTA3_FN, PTA3_OUT, PTA3_IN, 0,</div><div class='ctx'> 		PTA2_FN, PTA2_OUT, PTA2_IN, 0,</div><div class='ctx'> 		PTA1_FN, PTA1_OUT, PTA1_IN, 0,</div><div class='del'>-		PTA0_FN, PTA0_OUT, PTA0_IN, 0 }</div><div class='add'>+		PTA0_FN, PTA0_OUT, PTA0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xffec0002, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xffec0002, 16, 2, GROUP(</div><div class='ctx'> 		PTB7_FN, PTB7_OUT, PTB7_IN, 0,</div><div class='ctx'> 		PTB6_FN, PTB6_OUT, PTB6_IN, 0,</div><div class='ctx'> 		PTB5_FN, PTB5_OUT, PTB5_IN, 0,</div><div class='hunk'>@@ -1701,9 +1701,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTB3_FN, PTB3_OUT, PTB3_IN, 0,</div><div class='ctx'> 		PTB2_FN, PTB2_OUT, PTB2_IN, 0,</div><div class='ctx'> 		PTB1_FN, PTB1_OUT, PTB1_IN, 0,</div><div class='del'>-		PTB0_FN, PTB0_OUT, PTB0_IN, 0 }</div><div class='add'>+		PTB0_FN, PTB0_OUT, PTB0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xffec0004, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xffec0004, 16, 2, GROUP(</div><div class='ctx'> 		PTC7_FN, PTC7_OUT, PTC7_IN, 0,</div><div class='ctx'> 		PTC6_FN, PTC6_OUT, PTC6_IN, 0,</div><div class='ctx'> 		PTC5_FN, PTC5_OUT, PTC5_IN, 0,</div><div class='hunk'>@@ -1711,9 +1711,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTC3_FN, PTC3_OUT, PTC3_IN, 0,</div><div class='ctx'> 		PTC2_FN, PTC2_OUT, PTC2_IN, 0,</div><div class='ctx'> 		PTC1_FN, PTC1_OUT, PTC1_IN, 0,</div><div class='del'>-		PTC0_FN, PTC0_OUT, PTC0_IN, 0 }</div><div class='add'>+		PTC0_FN, PTC0_OUT, PTC0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xffec0006, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xffec0006, 16, 2, GROUP(</div><div class='ctx'> 		PTD7_FN, PTD7_OUT, PTD7_IN, 0,</div><div class='ctx'> 		PTD6_FN, PTD6_OUT, PTD6_IN, 0,</div><div class='ctx'> 		PTD5_FN, PTD5_OUT, PTD5_IN, 0,</div><div class='hunk'>@@ -1721,9 +1721,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTD3_FN, PTD3_OUT, PTD3_IN, 0,</div><div class='ctx'> 		PTD2_FN, PTD2_OUT, PTD2_IN, 0,</div><div class='ctx'> 		PTD1_FN, PTD1_OUT, PTD1_IN, 0,</div><div class='del'>-		PTD0_FN, PTD0_OUT, PTD0_IN, 0 }</div><div class='add'>+		PTD0_FN, PTD0_OUT, PTD0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xffec0008, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xffec0008, 16, 2, GROUP(</div><div class='ctx'> 		PTE7_FN, PTE7_OUT, PTE7_IN, 0,</div><div class='ctx'> 		PTE6_FN, PTE6_OUT, PTE6_IN, 0,</div><div class='ctx'> 		PTE5_FN, PTE5_OUT, PTE5_IN, 0,</div><div class='hunk'>@@ -1731,9 +1731,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTE3_FN, PTE3_OUT, PTE3_IN, 0,</div><div class='ctx'> 		PTE2_FN, PTE2_OUT, PTE2_IN, 0,</div><div class='ctx'> 		PTE1_FN, PTE1_OUT, PTE1_IN, 0,</div><div class='del'>-		PTE0_FN, PTE0_OUT, PTE0_IN, 0 }</div><div class='add'>+		PTE0_FN, PTE0_OUT, PTE0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xffec000a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xffec000a, 16, 2, GROUP(</div><div class='ctx'> 		PTF7_FN, PTF7_OUT, PTF7_IN, 0,</div><div class='ctx'> 		PTF6_FN, PTF6_OUT, PTF6_IN, 0,</div><div class='ctx'> 		PTF5_FN, PTF5_OUT, PTF5_IN, 0,</div><div class='hunk'>@@ -1741,9 +1741,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTF3_FN, PTF3_OUT, PTF3_IN, 0,</div><div class='ctx'> 		PTF2_FN, PTF2_OUT, PTF2_IN, 0,</div><div class='ctx'> 		PTF1_FN, PTF1_OUT, PTF1_IN, 0,</div><div class='del'>-		PTF0_FN, PTF0_OUT, PTF0_IN, 0 }</div><div class='add'>+		PTF0_FN, PTF0_OUT, PTF0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xffec000c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xffec000c, 16, 2, GROUP(</div><div class='ctx'> 		PTG7_FN, PTG7_OUT, PTG7_IN, 0,</div><div class='ctx'> 		PTG6_FN, PTG6_OUT, PTG6_IN, 0,</div><div class='ctx'> 		PTG5_FN, PTG5_OUT, PTG5_IN, 0,</div><div class='hunk'>@@ -1751,9 +1751,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTG3_FN, PTG3_OUT, PTG3_IN, 0,</div><div class='ctx'> 		PTG2_FN, PTG2_OUT, PTG2_IN, 0,</div><div class='ctx'> 		PTG1_FN, PTG1_OUT, PTG1_IN, 0,</div><div class='del'>-		PTG0_FN, PTG0_OUT, PTG0_IN, 0 }</div><div class='add'>+		PTG0_FN, PTG0_OUT, PTG0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xffec000e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xffec000e, 16, 2, GROUP(</div><div class='ctx'> 		PTH7_FN, PTH7_OUT, PTH7_IN, 0,</div><div class='ctx'> 		PTH6_FN, PTH6_OUT, PTH6_IN, 0,</div><div class='ctx'> 		PTH5_FN, PTH5_OUT, PTH5_IN, 0,</div><div class='hunk'>@@ -1761,9 +1761,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTH3_FN, PTH3_OUT, PTH3_IN, 0,</div><div class='ctx'> 		PTH2_FN, PTH2_OUT, PTH2_IN, 0,</div><div class='ctx'> 		PTH1_FN, PTH1_OUT, PTH1_IN, 0,</div><div class='del'>-		PTH0_FN, PTH0_OUT, PTH0_IN, 0 }</div><div class='add'>+		PTH0_FN, PTH0_OUT, PTH0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PICR", 0xffec0010, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PICR", 0xffec0010, 16, 2, GROUP(</div><div class='ctx'> 		PTI7_FN, PTI7_OUT, PTI7_IN, 0,</div><div class='ctx'> 		PTI6_FN, PTI6_OUT, PTI6_IN, 0,</div><div class='ctx'> 		PTI5_FN, PTI5_OUT, PTI5_IN, 0,</div><div class='hunk'>@@ -1771,9 +1771,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTI3_FN, PTI3_OUT, PTI3_IN, 0,</div><div class='ctx'> 		PTI2_FN, PTI2_OUT, PTI2_IN, 0,</div><div class='ctx'> 		PTI1_FN, PTI1_OUT, PTI1_IN, 0,</div><div class='del'>-		PTI0_FN, PTI0_OUT, PTI0_IN, 0 }</div><div class='add'>+		PTI0_FN, PTI0_OUT, PTI0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xffec0012, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xffec0012, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,	/* reserved: always set 1 */</div><div class='ctx'> 		PTJ6_FN, PTJ6_OUT, PTJ6_IN, 0,</div><div class='ctx'> 		PTJ5_FN, PTJ5_OUT, PTJ5_IN, 0,</div><div class='hunk'>@@ -1781,9 +1781,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTJ3_FN, PTJ3_OUT, PTJ3_IN, 0,</div><div class='ctx'> 		PTJ2_FN, PTJ2_OUT, PTJ2_IN, 0,</div><div class='ctx'> 		PTJ1_FN, PTJ1_OUT, PTJ1_IN, 0,</div><div class='del'>-		PTJ0_FN, PTJ0_OUT, PTJ0_IN, 0 }</div><div class='add'>+		PTJ0_FN, PTJ0_OUT, PTJ0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR", 0xffec0014, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR", 0xffec0014, 16, 2, GROUP(</div><div class='ctx'> 		PTK7_FN, PTK7_OUT, PTK7_IN, 0,</div><div class='ctx'> 		PTK6_FN, PTK6_OUT, PTK6_IN, 0,</div><div class='ctx'> 		PTK5_FN, PTK5_OUT, PTK5_IN, 0,</div><div class='hunk'>@@ -1791,9 +1791,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTK3_FN, PTK3_OUT, PTK3_IN, 0,</div><div class='ctx'> 		PTK2_FN, PTK2_OUT, PTK2_IN, 0,</div><div class='ctx'> 		PTK1_FN, PTK1_OUT, PTK1_IN, 0,</div><div class='del'>-		PTK0_FN, PTK0_OUT, PTK0_IN, 0 }</div><div class='add'>+		PTK0_FN, PTK0_OUT, PTK0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PLCR", 0xffec0016, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PLCR", 0xffec0016, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,	/* reserved: always set 1 */</div><div class='ctx'> 		PTL6_FN, PTL6_OUT, PTL6_IN, 0,</div><div class='ctx'> 		PTL5_FN, PTL5_OUT, PTL5_IN, 0,</div><div class='hunk'>@@ -1801,9 +1801,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTL3_FN, PTL3_OUT, PTL3_IN, 0,</div><div class='ctx'> 		PTL2_FN, PTL2_OUT, PTL2_IN, 0,</div><div class='ctx'> 		PTL1_FN, PTL1_OUT, PTL1_IN, 0,</div><div class='del'>-		PTL0_FN, PTL0_OUT, PTL0_IN, 0 }</div><div class='add'>+		PTL0_FN, PTL0_OUT, PTL0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PMCR", 0xffec0018, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PMCR", 0xffec0018, 16, 2, GROUP(</div><div class='ctx'> 		PTM7_FN, PTM7_OUT, PTM7_IN, 0,</div><div class='ctx'> 		PTM6_FN, PTM6_OUT, PTM6_IN, 0,</div><div class='ctx'> 		PTM5_FN, PTM5_OUT, PTM5_IN, 0,</div><div class='hunk'>@@ -1811,9 +1811,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTM3_FN, PTM3_OUT, PTM3_IN, 0,</div><div class='ctx'> 		PTM2_FN, PTM2_OUT, PTM2_IN, 0,</div><div class='ctx'> 		PTM1_FN, PTM1_OUT, PTM1_IN, 0,</div><div class='del'>-		PTM0_FN, PTM0_OUT, PTM0_IN, 0 }</div><div class='add'>+		PTM0_FN, PTM0_OUT, PTM0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PNCR", 0xffec001a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PNCR", 0xffec001a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,	/* reserved: always set 1 */</div><div class='ctx'> 		PTN6_FN, PTN6_OUT, PTN6_IN, 0,</div><div class='ctx'> 		PTN5_FN, PTN5_OUT, PTN5_IN, 0,</div><div class='hunk'>@@ -1821,9 +1821,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTN3_FN, PTN3_OUT, PTN3_IN, 0,</div><div class='ctx'> 		PTN2_FN, PTN2_OUT, PTN2_IN, 0,</div><div class='ctx'> 		PTN1_FN, PTN1_OUT, PTN1_IN, 0,</div><div class='del'>-		PTN0_FN, PTN0_OUT, PTN0_IN, 0 }</div><div class='add'>+		PTN0_FN, PTN0_OUT, PTN0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("POCR", 0xffec001c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("POCR", 0xffec001c, 16, 2, GROUP(</div><div class='ctx'> 		PTO7_FN, PTO7_OUT, PTO7_IN, 0,</div><div class='ctx'> 		PTO6_FN, PTO6_OUT, PTO6_IN, 0,</div><div class='ctx'> 		PTO5_FN, PTO5_OUT, PTO5_IN, 0,</div><div class='hunk'>@@ -1831,10 +1831,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTO3_FN, PTO3_OUT, PTO3_IN, 0,</div><div class='ctx'> 		PTO2_FN, PTO2_OUT, PTO2_IN, 0,</div><div class='ctx'> 		PTO1_FN, PTO1_OUT, PTO1_IN, 0,</div><div class='del'>-		PTO0_FN, PTO0_OUT, PTO0_IN, 0 }</div><div class='add'>+		PTO0_FN, PTO0_OUT, PTO0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #if 0	/* FIXME: Remove it? */</div><div class='del'>-	{ PINMUX_CFG_REG("PPCR", 0xffec001e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PPCR", 0xffec001e, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,	/* reserved: always set 1 */</div><div class='ctx'> 		PTP6_FN, PTP6_OUT, PTP6_IN, 0,</div><div class='ctx'> 		PTP5_FN, PTP5_OUT, PTP5_IN, 0,</div><div class='hunk'>@@ -1842,10 +1842,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTP3_FN, PTP3_OUT, PTP3_IN, 0,</div><div class='ctx'> 		PTP2_FN, PTP2_OUT, PTP2_IN, 0,</div><div class='ctx'> 		PTP1_FN, PTP1_OUT, PTP1_IN, 0,</div><div class='del'>-		PTP0_FN, PTP0_OUT, PTP0_IN, 0 }</div><div class='add'>+		PTP0_FN, PTP0_OUT, PTP0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-	{ PINMUX_CFG_REG("PQCR", 0xffec0020, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PQCR", 0xffec0020, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,	/* reserved: always set 1 */</div><div class='ctx'> 		PTQ6_FN, PTQ6_OUT, PTQ6_IN, 0,</div><div class='ctx'> 		PTQ5_FN, PTQ5_OUT, PTQ5_IN, 0,</div><div class='hunk'>@@ -1853,9 +1853,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTQ3_FN, PTQ3_OUT, PTQ3_IN, 0,</div><div class='ctx'> 		PTQ2_FN, PTQ2_OUT, PTQ2_IN, 0,</div><div class='ctx'> 		PTQ1_FN, PTQ1_OUT, PTQ1_IN, 0,</div><div class='del'>-		PTQ0_FN, PTQ0_OUT, PTQ0_IN, 0 }</div><div class='add'>+		PTQ0_FN, PTQ0_OUT, PTQ0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PRCR", 0xffec0022, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PRCR", 0xffec0022, 16, 2, GROUP(</div><div class='ctx'> 		PTR7_FN, PTR7_OUT, PTR7_IN, 0,</div><div class='ctx'> 		PTR6_FN, PTR6_OUT, PTR6_IN, 0,</div><div class='ctx'> 		PTR5_FN, PTR5_OUT, PTR5_IN, 0,</div><div class='hunk'>@@ -1863,9 +1863,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTR3_FN, PTR3_OUT, PTR3_IN, 0,</div><div class='ctx'> 		PTR2_FN, PTR2_OUT, PTR2_IN, 0,</div><div class='ctx'> 		PTR1_FN, PTR1_OUT, PTR1_IN, 0,</div><div class='del'>-		PTR0_FN, PTR0_OUT, PTR0_IN, 0 }</div><div class='add'>+		PTR0_FN, PTR0_OUT, PTR0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSCR", 0xffec0024, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSCR", 0xffec0024, 16, 2, GROUP(</div><div class='ctx'> 		PTS7_FN, PTS7_OUT, PTS7_IN, 0,</div><div class='ctx'> 		PTS6_FN, PTS6_OUT, PTS6_IN, 0,</div><div class='ctx'> 		PTS5_FN, PTS5_OUT, PTS5_IN, 0,</div><div class='hunk'>@@ -1873,9 +1873,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTS3_FN, PTS3_OUT, PTS3_IN, 0,</div><div class='ctx'> 		PTS2_FN, PTS2_OUT, PTS2_IN, 0,</div><div class='ctx'> 		PTS1_FN, PTS1_OUT, PTS1_IN, 0,</div><div class='del'>-		PTS0_FN, PTS0_OUT, PTS0_IN, 0 }</div><div class='add'>+		PTS0_FN, PTS0_OUT, PTS0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PTCR", 0xffec0026, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PTCR", 0xffec0026, 16, 2, GROUP(</div><div class='ctx'> 		PTT7_FN, PTT7_OUT, PTT7_IN, 0,</div><div class='ctx'> 		PTT6_FN, PTT6_OUT, PTT6_IN, 0,</div><div class='ctx'> 		PTT5_FN, PTT5_OUT, PTT5_IN, 0,</div><div class='hunk'>@@ -1883,9 +1883,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTT3_FN, PTT3_OUT, PTT3_IN, 0,</div><div class='ctx'> 		PTT2_FN, PTT2_OUT, PTT2_IN, 0,</div><div class='ctx'> 		PTT1_FN, PTT1_OUT, PTT1_IN, 0,</div><div class='del'>-		PTT0_FN, PTT0_OUT, PTT0_IN, 0 }</div><div class='add'>+		PTT0_FN, PTT0_OUT, PTT0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PUCR", 0xffec0028, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PUCR", 0xffec0028, 16, 2, GROUP(</div><div class='ctx'> 		PTU7_FN, PTU7_OUT, PTU7_IN, 0,</div><div class='ctx'> 		PTU6_FN, PTU6_OUT, PTU6_IN, 0,</div><div class='ctx'> 		PTU5_FN, PTU5_OUT, PTU5_IN, 0,</div><div class='hunk'>@@ -1893,9 +1893,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTU3_FN, PTU3_OUT, PTU3_IN, 0,</div><div class='ctx'> 		PTU2_FN, PTU2_OUT, PTU2_IN, 0,</div><div class='ctx'> 		PTU1_FN, PTU1_OUT, PTU1_IN, 0,</div><div class='del'>-		PTU0_FN, PTU0_OUT, PTU0_IN, 0 }</div><div class='add'>+		PTU0_FN, PTU0_OUT, PTU0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PVCR", 0xffec002a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PVCR", 0xffec002a, 16, 2, GROUP(</div><div class='ctx'> 		PTV7_FN, PTV7_OUT, PTV7_IN, 0,</div><div class='ctx'> 		PTV6_FN, PTV6_OUT, PTV6_IN, 0,</div><div class='ctx'> 		PTV5_FN, PTV5_OUT, PTV5_IN, 0,</div><div class='hunk'>@@ -1903,9 +1903,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTV3_FN, PTV3_OUT, PTV3_IN, 0,</div><div class='ctx'> 		PTV2_FN, PTV2_OUT, PTV2_IN, 0,</div><div class='ctx'> 		PTV1_FN, PTV1_OUT, PTV1_IN, 0,</div><div class='del'>-		PTV0_FN, PTV0_OUT, PTV0_IN, 0 }</div><div class='add'>+		PTV0_FN, PTV0_OUT, PTV0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PWCR", 0xffec002c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PWCR", 0xffec002c, 16, 2, GROUP(</div><div class='ctx'> 		PTW7_FN, PTW7_OUT, PTW7_IN, 0,</div><div class='ctx'> 		PTW6_FN, PTW6_OUT, PTW6_IN, 0,</div><div class='ctx'> 		PTW5_FN, PTW5_OUT, PTW5_IN, 0,</div><div class='hunk'>@@ -1913,9 +1913,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTW3_FN, PTW3_OUT, PTW3_IN, 0,</div><div class='ctx'> 		PTW2_FN, PTW2_OUT, PTW2_IN, 0,</div><div class='ctx'> 		PTW1_FN, PTW1_OUT, PTW1_IN, 0,</div><div class='del'>-		PTW0_FN, PTW0_OUT, PTW0_IN, 0 }</div><div class='add'>+		PTW0_FN, PTW0_OUT, PTW0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PXCR", 0xffec002e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PXCR", 0xffec002e, 16, 2, GROUP(</div><div class='ctx'> 		PTX7_FN, PTX7_OUT, PTX7_IN, 0,</div><div class='ctx'> 		PTX6_FN, PTX6_OUT, PTX6_IN, 0,</div><div class='ctx'> 		PTX5_FN, PTX5_OUT, PTX5_IN, 0,</div><div class='hunk'>@@ -1923,9 +1923,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTX3_FN, PTX3_OUT, PTX3_IN, 0,</div><div class='ctx'> 		PTX2_FN, PTX2_OUT, PTX2_IN, 0,</div><div class='ctx'> 		PTX1_FN, PTX1_OUT, PTX1_IN, 0,</div><div class='del'>-		PTX0_FN, PTX0_OUT, PTX0_IN, 0 }</div><div class='add'>+		PTX0_FN, PTX0_OUT, PTX0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PYCR", 0xffec0030, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PYCR", 0xffec0030, 16, 2, GROUP(</div><div class='ctx'> 		PTY7_FN, PTY7_OUT, PTY7_IN, 0,</div><div class='ctx'> 		PTY6_FN, PTY6_OUT, PTY6_IN, 0,</div><div class='ctx'> 		PTY5_FN, PTY5_OUT, PTY5_IN, 0,</div><div class='hunk'>@@ -1933,9 +1933,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTY3_FN, PTY3_OUT, PTY3_IN, 0,</div><div class='ctx'> 		PTY2_FN, PTY2_OUT, PTY2_IN, 0,</div><div class='ctx'> 		PTY1_FN, PTY1_OUT, PTY1_IN, 0,</div><div class='del'>-		PTY0_FN, PTY0_OUT, PTY0_IN, 0 }</div><div class='add'>+		PTY0_FN, PTY0_OUT, PTY0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PZCR", 0xffec0032, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PZCR", 0xffec0032, 16, 2, GROUP(</div><div class='ctx'> 		PTZ7_FN, PTZ7_OUT, PTZ7_IN, 0,</div><div class='ctx'> 		PTZ6_FN, PTZ6_OUT, PTZ6_IN, 0,</div><div class='ctx'> 		PTZ5_FN, PTZ5_OUT, PTZ5_IN, 0,</div><div class='hunk'>@@ -1943,10 +1943,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PTZ3_FN, PTZ3_OUT, PTZ3_IN, 0,</div><div class='ctx'> 		PTZ2_FN, PTZ2_OUT, PTZ2_IN, 0,</div><div class='ctx'> 		PTZ1_FN, PTZ1_OUT, PTZ1_IN, 0,</div><div class='del'>-		PTZ0_FN, PTZ0_OUT, PTZ0_IN, 0 }</div><div class='add'>+		PTZ0_FN, PTZ0_OUT, PTZ0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PSEL0", 0xffec0070, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL0", 0xffec0070, 16, 1, GROUP(</div><div class='ctx'> 		PS0_15_FN1, PS0_15_FN2,</div><div class='ctx'> 		PS0_14_FN1, PS0_14_FN2,</div><div class='ctx'> 		PS0_13_FN1, PS0_13_FN2,</div><div class='hunk'>@@ -1962,9 +1962,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PS0_3_FN1, PS0_3_FN2,</div><div class='ctx'> 		PS0_2_FN1, PS0_2_FN2,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL1", 0xffec0072, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL1", 0xffec0072, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1980,9 +1980,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PS1_2_FN1, PS1_2_FN2,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL2", 0xffec0074, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL2", 0xffec0074, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PS2_13_FN1, PS2_13_FN2,</div><div class='hunk'>@@ -1998,9 +1998,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PS2_2_FN1, PS2_2_FN2,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL3", 0xffec0076, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL3", 0xffec0076, 16, 1, GROUP(</div><div class='ctx'> 		PS3_15_FN1, PS3_15_FN2,</div><div class='ctx'> 		PS3_14_FN1, PS3_14_FN2,</div><div class='ctx'> 		PS3_13_FN1, PS3_13_FN2,</div><div class='hunk'>@@ -2016,10 +2016,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PS3_2_FN1, PS3_2_FN2,</div><div class='ctx'> 		PS3_1_FN1, PS3_1_FN2,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-	{ PINMUX_CFG_REG("PSEL4", 0xffec0078, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL4", 0xffec0078, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		PS4_14_FN1, PS4_14_FN2,</div><div class='ctx'> 		PS4_13_FN1, PS4_13_FN2,</div><div class='hunk'>@@ -2035,9 +2035,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PS4_3_FN1, PS4_3_FN2,</div><div class='ctx'> 		PS4_2_FN1, PS4_2_FN2,</div><div class='ctx'> 		PS4_1_FN1, PS4_1_FN2,</div><div class='del'>-		PS4_0_FN1, PS4_0_FN2, }</div><div class='add'>+		PS4_0_FN1, PS4_0_FN2, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL5", 0xffec007a, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL5", 0xffec007a, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -2053,9 +2053,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PS5_3_FN1, PS5_3_FN2,</div><div class='ctx'> 		PS5_2_FN1, PS5_2_FN2,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL6", 0xffec007c, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL6", 0xffec007c, 16, 1, GROUP(</div><div class='ctx'> 		PS6_15_FN1, PS6_15_FN2,</div><div class='ctx'> 		PS6_14_FN1, PS6_14_FN2,</div><div class='ctx'> 		PS6_13_FN1, PS6_13_FN2,</div><div class='hunk'>@@ -2071,9 +2071,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PS6_3_FN1, PS6_3_FN2,</div><div class='ctx'> 		PS6_2_FN1, PS6_2_FN2,</div><div class='ctx'> 		PS6_1_FN1, PS6_1_FN2,</div><div class='del'>-		PS6_0_FN1, PS6_0_FN2, }</div><div class='add'>+		PS6_0_FN1, PS6_0_FN2, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL7", 0xffec0082, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL7", 0xffec0082, 16, 1, GROUP(</div><div class='ctx'> 		PS7_15_FN1, PS7_15_FN2,</div><div class='ctx'> 		PS7_14_FN1, PS7_14_FN2,</div><div class='ctx'> 		PS7_13_FN1, PS7_13_FN2,</div><div class='hunk'>@@ -2089,9 +2089,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PSEL8", 0xffec0084, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("PSEL8", 0xffec0084, 16, 1, GROUP(</div><div class='ctx'> 		PS8_15_FN1, PS8_15_FN2,</div><div class='ctx'> 		PS8_14_FN1, PS8_14_FN2,</div><div class='ctx'> 		PS8_13_FN1, PS8_13_FN2,</div><div class='hunk'>@@ -2107,115 +2107,115 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='del'>-		0, 0, }</div><div class='add'>+		0, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xffec0034, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xffec0034, 8, GROUP(</div><div class='ctx'> 		PTA7_DATA, PTA6_DATA, PTA5_DATA, PTA4_DATA,</div><div class='del'>-		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA }</div><div class='add'>+		PTA3_DATA, PTA2_DATA, PTA1_DATA, PTA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xffec0036, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xffec0036, 8, GROUP(</div><div class='ctx'> 		PTB7_DATA, PTB6_DATA, PTB5_DATA, PTB4_DATA,</div><div class='del'>-		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA }</div><div class='add'>+		PTB3_DATA, PTB2_DATA, PTB1_DATA, PTB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xffec0038, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xffec0038, 8, GROUP(</div><div class='ctx'> 		PTC7_DATA, PTC6_DATA, PTC5_DATA, PTC4_DATA,</div><div class='del'>-		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA }</div><div class='add'>+		PTC3_DATA, PTC2_DATA, PTC1_DATA, PTC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xffec003a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xffec003a, 8, GROUP(</div><div class='ctx'> 		PTD7_DATA, PTD6_DATA, PTD5_DATA, PTD4_DATA,</div><div class='del'>-		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA }</div><div class='add'>+		PTD3_DATA, PTD2_DATA, PTD1_DATA, PTD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xffec003c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xffec003c, 8, GROUP(</div><div class='ctx'> 		PTE7_DATA, PTE6_DATA, PTE5_DATA, PTE4_DATA,</div><div class='del'>-		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA }</div><div class='add'>+		PTE3_DATA, PTE2_DATA, PTE1_DATA, PTE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xffec003e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xffec003e, 8, GROUP(</div><div class='ctx'> 		PTF7_DATA, PTF6_DATA, PTF5_DATA, PTF4_DATA,</div><div class='del'>-		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA }</div><div class='add'>+		PTF3_DATA, PTF2_DATA, PTF1_DATA, PTF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xffec0040, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xffec0040, 8, GROUP(</div><div class='ctx'> 		PTG7_DATA, PTG6_DATA, PTG5_DATA, PTG4_DATA,</div><div class='del'>-		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA }</div><div class='add'>+		PTG3_DATA, PTG2_DATA, PTG1_DATA, PTG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xffec0042, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xffec0042, 8, GROUP(</div><div class='ctx'> 		PTH7_DATA, PTH6_DATA, PTH5_DATA, PTH4_DATA,</div><div class='del'>-		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA }</div><div class='add'>+		PTH3_DATA, PTH2_DATA, PTH1_DATA, PTH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PIDR", 0xffec0044, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PIDR", 0xffec0044, 8, GROUP(</div><div class='ctx'> 		PTI7_DATA, PTI6_DATA, PTI5_DATA, PTI4_DATA,</div><div class='del'>-		PTI3_DATA, PTI2_DATA, PTI1_DATA, PTI0_DATA }</div><div class='add'>+		PTI3_DATA, PTI2_DATA, PTI1_DATA, PTI0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xffec0046, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xffec0046, 8, GROUP(</div><div class='ctx'> 		0, PTJ6_DATA, PTJ5_DATA, PTJ4_DATA,</div><div class='del'>-		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA }</div><div class='add'>+		PTJ3_DATA, PTJ2_DATA, PTJ1_DATA, PTJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR", 0xffec0048, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR", 0xffec0048, 8, GROUP(</div><div class='ctx'> 		PTK7_DATA, PTK6_DATA, PTK5_DATA, PTK4_DATA,</div><div class='del'>-		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA }</div><div class='add'>+		PTK3_DATA, PTK2_DATA, PTK1_DATA, PTK0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PLDR", 0xffec004a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PLDR", 0xffec004a, 8, GROUP(</div><div class='ctx'> 		0, PTL6_DATA, PTL5_DATA, PTL4_DATA,</div><div class='del'>-		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA }</div><div class='add'>+		PTL3_DATA, PTL2_DATA, PTL1_DATA, PTL0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PMDR", 0xffec004c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PMDR", 0xffec004c, 8, GROUP(</div><div class='ctx'> 		PTM7_DATA, PTM6_DATA, PTM5_DATA, PTM4_DATA,</div><div class='del'>-		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA }</div><div class='add'>+		PTM3_DATA, PTM2_DATA, PTM1_DATA, PTM0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PNDR", 0xffec004e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PNDR", 0xffec004e, 8, GROUP(</div><div class='ctx'> 		0, PTN6_DATA, PTN5_DATA, PTN4_DATA,</div><div class='del'>-		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA }</div><div class='add'>+		PTN3_DATA, PTN2_DATA, PTN1_DATA, PTN0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PODR", 0xffec0050, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PODR", 0xffec0050, 8, GROUP(</div><div class='ctx'> 		PTO7_DATA, PTO6_DATA, PTO5_DATA, PTO4_DATA,</div><div class='del'>-		PTO3_DATA, PTO2_DATA, PTO1_DATA, PTO0_DATA }</div><div class='add'>+		PTO3_DATA, PTO2_DATA, PTO1_DATA, PTO0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PPDR", 0xffec0052, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PPDR", 0xffec0052, 8, GROUP(</div><div class='ctx'> 		PTP7_DATA, PTP6_DATA, PTP5_DATA, PTP4_DATA,</div><div class='del'>-		PTP3_DATA, PTP2_DATA, PTP1_DATA, PTP0_DATA }</div><div class='add'>+		PTP3_DATA, PTP2_DATA, PTP1_DATA, PTP0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PQDR", 0xffec0054, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PQDR", 0xffec0054, 8, GROUP(</div><div class='ctx'> 		0, PTQ6_DATA, PTQ5_DATA, PTQ4_DATA,</div><div class='del'>-		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA }</div><div class='add'>+		PTQ3_DATA, PTQ2_DATA, PTQ1_DATA, PTQ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PRDR", 0xffec0056, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PRDR", 0xffec0056, 8, GROUP(</div><div class='ctx'> 		PTR7_DATA, PTR6_DATA, PTR5_DATA, PTR4_DATA,</div><div class='del'>-		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA }</div><div class='add'>+		PTR3_DATA, PTR2_DATA, PTR1_DATA, PTR0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PSDR", 0xffec0058, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PSDR", 0xffec0058, 8, GROUP(</div><div class='ctx'> 		PTS7_DATA, PTS6_DATA, PTS5_DATA, PTS4_DATA,</div><div class='del'>-		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA }</div><div class='add'>+		PTS3_DATA, PTS2_DATA, PTS1_DATA, PTS0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PTDR", 0xffec005a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PTDR", 0xffec005a, 8, GROUP(</div><div class='ctx'> 		PTT7_DATA, PTT6_DATA, PTT5_DATA, PTT4_DATA,</div><div class='del'>-		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA }</div><div class='add'>+		PTT3_DATA, PTT2_DATA, PTT1_DATA, PTT0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PUDR", 0xffec005c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PUDR", 0xffec005c, 8, GROUP(</div><div class='ctx'> 		PTU7_DATA, PTU6_DATA, PTU5_DATA, PTU4_DATA,</div><div class='del'>-		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA }</div><div class='add'>+		PTU3_DATA, PTU2_DATA, PTU1_DATA, PTU0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PVDR", 0xffec005e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PVDR", 0xffec005e, 8, GROUP(</div><div class='ctx'> 		PTV7_DATA, PTV6_DATA, PTV5_DATA, PTV4_DATA,</div><div class='del'>-		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA }</div><div class='add'>+		PTV3_DATA, PTV2_DATA, PTV1_DATA, PTV0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PWDR", 0xffec0060, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PWDR", 0xffec0060, 8, GROUP(</div><div class='ctx'> 		PTW7_DATA, PTW6_DATA, PTW5_DATA, PTW4_DATA,</div><div class='del'>-		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA }</div><div class='add'>+		PTW3_DATA, PTW2_DATA, PTW1_DATA, PTW0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PXDR", 0xffec0062, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PXDR", 0xffec0062, 8, GROUP(</div><div class='ctx'> 		PTX7_DATA, PTX6_DATA, PTX5_DATA, PTX4_DATA,</div><div class='del'>-		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA }</div><div class='add'>+		PTX3_DATA, PTX2_DATA, PTX1_DATA, PTX0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PYDR", 0xffec0064, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PYDR", 0xffec0064, 8, GROUP(</div><div class='ctx'> 		PTY7_DATA, PTY6_DATA, PTY5_DATA, PTY4_DATA,</div><div class='del'>-		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA }</div><div class='add'>+		PTY3_DATA, PTY2_DATA, PTY1_DATA, PTY0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PZDR", 0xffec0066, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PZDR", 0xffec0066, 8, GROUP(</div><div class='ctx'> 		PTZ7_DATA, PTZ6_DATA, PTZ5_DATA, PTZ4_DATA,</div><div class='del'>-		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA }</div><div class='add'>+		PTZ3_DATA, PTZ2_DATA, PTZ1_DATA, PTZ0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7785.c b/drivers/pinctrl/sh-pfc/pfc-sh7785.c<br/>index 193179f7fdd9..c4c1e288c53e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7785.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7785.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7785.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7785.c</a></div><div class='hunk'>@@ -985,7 +985,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xffe70000, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xffe70000, 16, 2, GROUP(</div><div class='ctx'> 		PA7_FN, PA7_OUT, PA7_IN, 0,</div><div class='ctx'> 		PA6_FN, PA6_OUT, PA6_IN, 0,</div><div class='ctx'> 		PA5_FN, PA5_OUT, PA5_IN, 0,</div><div class='hunk'>@@ -993,9 +993,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PA3_FN, PA3_OUT, PA3_IN, 0,</div><div class='ctx'> 		PA2_FN, PA2_OUT, PA2_IN, 0,</div><div class='ctx'> 		PA1_FN, PA1_OUT, PA1_IN, 0,</div><div class='del'>-		PA0_FN, PA0_OUT, PA0_IN, 0 }</div><div class='add'>+		PA0_FN, PA0_OUT, PA0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xffe70002, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xffe70002, 16, 2, GROUP(</div><div class='ctx'> 		PB7_FN, PB7_OUT, PB7_IN, 0,</div><div class='ctx'> 		PB6_FN, PB6_OUT, PB6_IN, 0,</div><div class='ctx'> 		PB5_FN, PB5_OUT, PB5_IN, 0,</div><div class='hunk'>@@ -1003,9 +1003,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB3_FN, PB3_OUT, PB3_IN, 0,</div><div class='ctx'> 		PB2_FN, PB2_OUT, PB2_IN, 0,</div><div class='ctx'> 		PB1_FN, PB1_OUT, PB1_IN, 0,</div><div class='del'>-		PB0_FN, PB0_OUT, PB0_IN, 0 }</div><div class='add'>+		PB0_FN, PB0_OUT, PB0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xffe70004, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xffe70004, 16, 2, GROUP(</div><div class='ctx'> 		PC7_FN, PC7_OUT, PC7_IN, 0,</div><div class='ctx'> 		PC6_FN, PC6_OUT, PC6_IN, 0,</div><div class='ctx'> 		PC5_FN, PC5_OUT, PC5_IN, 0,</div><div class='hunk'>@@ -1013,9 +1013,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC3_FN, PC3_OUT, PC3_IN, 0,</div><div class='ctx'> 		PC2_FN, PC2_OUT, PC2_IN, 0,</div><div class='ctx'> 		PC1_FN, PC1_OUT, PC1_IN, 0,</div><div class='del'>-		PC0_FN, PC0_OUT, PC0_IN, 0 }</div><div class='add'>+		PC0_FN, PC0_OUT, PC0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xffe70006, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xffe70006, 16, 2, GROUP(</div><div class='ctx'> 		PD7_FN, PD7_OUT, PD7_IN, 0,</div><div class='ctx'> 		PD6_FN, PD6_OUT, PD6_IN, 0,</div><div class='ctx'> 		PD5_FN, PD5_OUT, PD5_IN, 0,</div><div class='hunk'>@@ -1023,9 +1023,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PD3_FN, PD3_OUT, PD3_IN, 0,</div><div class='ctx'> 		PD2_FN, PD2_OUT, PD2_IN, 0,</div><div class='ctx'> 		PD1_FN, PD1_OUT, PD1_IN, 0,</div><div class='del'>-		PD0_FN, PD0_OUT, PD0_IN, 0 }</div><div class='add'>+		PD0_FN, PD0_OUT, PD0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xffe70008, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xffe70008, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PE5_FN, PE5_OUT, PE5_IN, 0,</div><div class='hunk'>@@ -1033,9 +1033,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PE3_FN, PE3_OUT, PE3_IN, 0,</div><div class='ctx'> 		PE2_FN, PE2_OUT, PE2_IN, 0,</div><div class='ctx'> 		PE1_FN, PE1_OUT, PE1_IN, 0,</div><div class='del'>-		PE0_FN, PE0_OUT, PE0_IN, 0 }</div><div class='add'>+		PE0_FN, PE0_OUT, PE0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xffe7000a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xffe7000a, 16, 2, GROUP(</div><div class='ctx'> 		PF7_FN, PF7_OUT, PF7_IN, 0,</div><div class='ctx'> 		PF6_FN, PF6_OUT, PF6_IN, 0,</div><div class='ctx'> 		PF5_FN, PF5_OUT, PF5_IN, 0,</div><div class='hunk'>@@ -1043,9 +1043,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF3_FN, PF3_OUT, PF3_IN, 0,</div><div class='ctx'> 		PF2_FN, PF2_OUT, PF2_IN, 0,</div><div class='ctx'> 		PF1_FN, PF1_OUT, PF1_IN, 0,</div><div class='del'>-		PF0_FN, PF0_OUT, PF0_IN, 0 }</div><div class='add'>+		PF0_FN, PF0_OUT, PF0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xffe7000c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xffe7000c, 16, 2, GROUP(</div><div class='ctx'> 		PG7_FN, PG7_OUT, PG7_IN, 0,</div><div class='ctx'> 		PG6_FN, PG6_OUT, PG6_IN, 0,</div><div class='ctx'> 		PG5_FN, PG5_OUT, PG5_IN, 0,</div><div class='hunk'>@@ -1053,9 +1053,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PG3_FN, PG3_OUT, PG3_IN, 0,</div><div class='ctx'> 		PG2_FN, PG2_OUT, PG2_IN, 0,</div><div class='ctx'> 		PG1_FN, PG1_OUT, PG1_IN, 0,</div><div class='del'>-		PG0_FN, PG0_OUT, PG0_IN, 0 }</div><div class='add'>+		PG0_FN, PG0_OUT, PG0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xffe7000e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xffe7000e, 16, 2, GROUP(</div><div class='ctx'> 		PH7_FN, PH7_OUT, PH7_IN, 0,</div><div class='ctx'> 		PH6_FN, PH6_OUT, PH6_IN, 0,</div><div class='ctx'> 		PH5_FN, PH5_OUT, PH5_IN, 0,</div><div class='hunk'>@@ -1063,9 +1063,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PH3_FN, PH3_OUT, PH3_IN, 0,</div><div class='ctx'> 		PH2_FN, PH2_OUT, PH2_IN, 0,</div><div class='ctx'> 		PH1_FN, PH1_OUT, PH1_IN, 0,</div><div class='del'>-		PH0_FN, PH0_OUT, PH0_IN, 0 }</div><div class='add'>+		PH0_FN, PH0_OUT, PH0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xffe70010, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xffe70010, 16, 2, GROUP(</div><div class='ctx'> 		PJ7_FN, PJ7_OUT, PJ7_IN, 0,</div><div class='ctx'> 		PJ6_FN, PJ6_OUT, PJ6_IN, 0,</div><div class='ctx'> 		PJ5_FN, PJ5_OUT, PJ5_IN, 0,</div><div class='hunk'>@@ -1073,9 +1073,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ3_FN, PJ3_OUT, PJ3_IN, 0,</div><div class='ctx'> 		PJ2_FN, PJ2_OUT, PJ2_IN, 0,</div><div class='ctx'> 		PJ1_FN, PJ1_OUT, PJ1_IN, 0,</div><div class='del'>-		PJ0_FN, PJ0_OUT, PJ0_IN, 0 }</div><div class='add'>+		PJ0_FN, PJ0_OUT, PJ0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PKCR", 0xffe70012, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PKCR", 0xffe70012, 16, 2, GROUP(</div><div class='ctx'> 		PK7_FN, PK7_OUT, PK7_IN, 0,</div><div class='ctx'> 		PK6_FN, PK6_OUT, PK6_IN, 0,</div><div class='ctx'> 		PK5_FN, PK5_OUT, PK5_IN, 0,</div><div class='hunk'>@@ -1083,9 +1083,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PK3_FN, PK3_OUT, PK3_IN, 0,</div><div class='ctx'> 		PK2_FN, PK2_OUT, PK2_IN, 0,</div><div class='ctx'> 		PK1_FN, PK1_OUT, PK1_IN, 0,</div><div class='del'>-		PK0_FN, PK0_OUT, PK0_IN, 0 }</div><div class='add'>+		PK0_FN, PK0_OUT, PK0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PLCR", 0xffe70014, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PLCR", 0xffe70014, 16, 2, GROUP(</div><div class='ctx'> 		PL7_FN, PL7_OUT, PL7_IN, 0,</div><div class='ctx'> 		PL6_FN, PL6_OUT, PL6_IN, 0,</div><div class='ctx'> 		PL5_FN, PL5_OUT, PL5_IN, 0,</div><div class='hunk'>@@ -1093,9 +1093,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PL3_FN, PL3_OUT, PL3_IN, 0,</div><div class='ctx'> 		PL2_FN, PL2_OUT, PL2_IN, 0,</div><div class='ctx'> 		PL1_FN, PL1_OUT, PL1_IN, 0,</div><div class='del'>-		PL0_FN, PL0_OUT, PL0_IN, 0 }</div><div class='add'>+		PL0_FN, PL0_OUT, PL0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PMCR", 0xffe70016, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PMCR", 0xffe70016, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1103,9 +1103,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PM1_FN, PM1_OUT, PM1_IN, 0,</div><div class='del'>-		PM0_FN, PM0_OUT, PM0_IN, 0 }</div><div class='add'>+		PM0_FN, PM0_OUT, PM0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PNCR", 0xffe70018, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PNCR", 0xffe70018, 16, 2, GROUP(</div><div class='ctx'> 		PN7_FN, PN7_OUT, PN7_IN, 0,</div><div class='ctx'> 		PN6_FN, PN6_OUT, PN6_IN, 0,</div><div class='ctx'> 		PN5_FN, PN5_OUT, PN5_IN, 0,</div><div class='hunk'>@@ -1113,9 +1113,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PN3_FN, PN3_OUT, PN3_IN, 0,</div><div class='ctx'> 		PN2_FN, PN2_OUT, PN2_IN, 0,</div><div class='ctx'> 		PN1_FN, PN1_OUT, PN1_IN, 0,</div><div class='del'>-		PN0_FN, PN0_OUT, PN0_IN, 0 }</div><div class='add'>+		PN0_FN, PN0_OUT, PN0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PPCR", 0xffe7001a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PPCR", 0xffe7001a, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		PP5_FN, PP5_OUT, PP5_IN, 0,</div><div class='hunk'>@@ -1123,9 +1123,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PP3_FN, PP3_OUT, PP3_IN, 0,</div><div class='ctx'> 		PP2_FN, PP2_OUT, PP2_IN, 0,</div><div class='ctx'> 		PP1_FN, PP1_OUT, PP1_IN, 0,</div><div class='del'>-		PP0_FN, PP0_OUT, PP0_IN, 0 }</div><div class='add'>+		PP0_FN, PP0_OUT, PP0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PQCR", 0xffe7001c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PQCR", 0xffe7001c, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1133,9 +1133,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PQ3_FN, PQ3_OUT, PQ3_IN, 0,</div><div class='ctx'> 		PQ2_FN, PQ2_OUT, PQ2_IN, 0,</div><div class='ctx'> 		PQ1_FN, PQ1_OUT, PQ1_IN, 0,</div><div class='del'>-		PQ0_FN, PQ0_OUT, PQ0_IN, 0 }</div><div class='add'>+		PQ0_FN, PQ0_OUT, PQ0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PRCR", 0xffe7001e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PRCR", 0xffe7001e, 16, 2, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1143,9 +1143,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PR3_FN, PR3_OUT, PR3_IN, 0,</div><div class='ctx'> 		PR2_FN, PR2_OUT, PR2_IN, 0,</div><div class='ctx'> 		PR1_FN, PR1_OUT, PR1_IN, 0,</div><div class='del'>-		PR0_FN, PR0_OUT, PR0_IN, 0 }</div><div class='add'>+		PR0_FN, PR0_OUT, PR0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("P1MSELR", 0xffe70080, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("P1MSELR", 0xffe70080, 16, 1, GROUP(</div><div class='ctx'> 		P1MSEL15_0, P1MSEL15_1,</div><div class='ctx'> 		P1MSEL14_0, P1MSEL14_1,</div><div class='ctx'> 		P1MSEL13_0, P1MSEL13_1,</div><div class='hunk'>@@ -1161,9 +1161,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		P1MSEL3_0, P1MSEL3_1,</div><div class='ctx'> 		P1MSEL2_0, P1MSEL2_1,</div><div class='ctx'> 		P1MSEL1_0, P1MSEL1_1,</div><div class='del'>-		P1MSEL0_0, P1MSEL0_1 }</div><div class='add'>+		P1MSEL0_0, P1MSEL0_1 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("P2MSELR", 0xffe70082, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("P2MSELR", 0xffe70082, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		0, 0,</div><div class='hunk'>@@ -1179,75 +1179,75 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		P2MSEL2_0, P2MSEL2_1,</div><div class='ctx'> 		P2MSEL1_0, P2MSEL1_1,</div><div class='del'>-		P2MSEL0_0, P2MSEL0_1 }</div><div class='add'>+		P2MSEL0_0, P2MSEL0_1 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xffe70020, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xffe70020, 8, GROUP(</div><div class='ctx'> 		PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA,</div><div class='del'>-		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA }</div><div class='add'>+		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xffe70022, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xffe70022, 8, GROUP(</div><div class='ctx'> 		PB7_DATA, PB6_DATA, PB5_DATA, PB4_DATA,</div><div class='del'>-		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA }</div><div class='add'>+		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xffe70024, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xffe70024, 8, GROUP(</div><div class='ctx'> 		PC7_DATA, PC6_DATA, PC5_DATA, PC4_DATA,</div><div class='del'>-		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA }</div><div class='add'>+		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xffe70026, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xffe70026, 8, GROUP(</div><div class='ctx'> 		PD7_DATA, PD6_DATA, PD5_DATA, PD4_DATA,</div><div class='del'>-		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA }</div><div class='add'>+		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xffe70028, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xffe70028, 8, GROUP(</div><div class='ctx'> 		0, 0, PE5_DATA, PE4_DATA,</div><div class='del'>-		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA }</div><div class='add'>+		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xffe7002a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xffe7002a, 8, GROUP(</div><div class='ctx'> 		PF7_DATA, PF6_DATA, PF5_DATA, PF4_DATA,</div><div class='del'>-		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA }</div><div class='add'>+		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xffe7002c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xffe7002c, 8, GROUP(</div><div class='ctx'> 		PG7_DATA, PG6_DATA, PG5_DATA, PG4_DATA,</div><div class='del'>-		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA }</div><div class='add'>+		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xffe7002e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xffe7002e, 8, GROUP(</div><div class='ctx'> 		PH7_DATA, PH6_DATA, PH5_DATA, PH4_DATA,</div><div class='del'>-		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA }</div><div class='add'>+		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xffe70030, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xffe70030, 8, GROUP(</div><div class='ctx'> 		PJ7_DATA, PJ6_DATA, PJ5_DATA, PJ4_DATA,</div><div class='del'>-		PJ3_DATA, PJ2_DATA, PJ1_DATA, PJ0_DATA }</div><div class='add'>+		PJ3_DATA, PJ2_DATA, PJ1_DATA, PJ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PKDR", 0xffe70032, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PKDR", 0xffe70032, 8, GROUP(</div><div class='ctx'> 		PK7_DATA, PK6_DATA, PK5_DATA, PK4_DATA,</div><div class='del'>-		PK3_DATA, PK2_DATA, PK1_DATA, PK0_DATA }</div><div class='add'>+		PK3_DATA, PK2_DATA, PK1_DATA, PK0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PLDR", 0xffe70034, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PLDR", 0xffe70034, 8, GROUP(</div><div class='ctx'> 		PL7_DATA, PL6_DATA, PL5_DATA, PL4_DATA,</div><div class='del'>-		PL3_DATA, PL2_DATA, PL1_DATA, PL0_DATA }</div><div class='add'>+		PL3_DATA, PL2_DATA, PL1_DATA, PL0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PMDR", 0xffe70036, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PMDR", 0xffe70036, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, PM1_DATA, PM0_DATA }</div><div class='add'>+		0, 0, PM1_DATA, PM0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PNDR", 0xffe70038, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PNDR", 0xffe70038, 8, GROUP(</div><div class='ctx'> 		PN7_DATA, PN6_DATA, PN5_DATA, PN4_DATA,</div><div class='del'>-		PN3_DATA, PN2_DATA, PN1_DATA, PN0_DATA }</div><div class='add'>+		PN3_DATA, PN2_DATA, PN1_DATA, PN0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PPDR", 0xffe7003a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PPDR", 0xffe7003a, 8, GROUP(</div><div class='ctx'> 		0, 0, PP5_DATA, PP4_DATA,</div><div class='del'>-		PP3_DATA, PP2_DATA, PP1_DATA, PP0_DATA }</div><div class='add'>+		PP3_DATA, PP2_DATA, PP1_DATA, PP0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PQDR", 0xffe7003c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PQDR", 0xffe7003c, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, PQ4_DATA,</div><div class='del'>-		PQ3_DATA, PQ2_DATA, PQ1_DATA, PQ0_DATA }</div><div class='add'>+		PQ3_DATA, PQ2_DATA, PQ1_DATA, PQ0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PRDR", 0xffe7003e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PRDR", 0xffe7003e, 8, GROUP(</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		PR3_DATA, PR2_DATA, PR1_DATA, PR0_DATA }</div><div class='add'>+		PR3_DATA, PR2_DATA, PR1_DATA, PR0_DATA ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7786.c b/drivers/pinctrl/sh-pfc/pfc-sh7786.c<br/>index cc2657c4f85c..b8a098cd7721 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7786.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-sh7786.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-sh7786.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-sh7786.c</a></div><div class='hunk'>@@ -627,7 +627,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PACR", 0xffcc0000, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PACR", 0xffcc0000, 16, 2, GROUP(</div><div class='ctx'> 		PA7_FN, PA7_OUT, PA7_IN, 0,</div><div class='ctx'> 		PA6_FN, PA6_OUT, PA6_IN, 0,</div><div class='ctx'> 		PA5_FN, PA5_OUT, PA5_IN, 0,</div><div class='hunk'>@@ -635,9 +635,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PA3_FN, PA3_OUT, PA3_IN, 0,</div><div class='ctx'> 		PA2_FN, PA2_OUT, PA2_IN, 0,</div><div class='ctx'> 		PA1_FN, PA1_OUT, PA1_IN, 0,</div><div class='del'>-		PA0_FN, PA0_OUT, PA0_IN, 0 }</div><div class='add'>+		PA0_FN, PA0_OUT, PA0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PBCR", 0xffcc0002, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PBCR", 0xffcc0002, 16, 2, GROUP(</div><div class='ctx'> 		PB7_FN, PB7_OUT, PB7_IN, 0,</div><div class='ctx'> 		PB6_FN, PB6_OUT, PB6_IN, 0,</div><div class='ctx'> 		PB5_FN, PB5_OUT, PB5_IN, 0,</div><div class='hunk'>@@ -645,9 +645,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB3_FN, PB3_OUT, PB3_IN, 0,</div><div class='ctx'> 		PB2_FN, PB2_OUT, PB2_IN, 0,</div><div class='ctx'> 		PB1_FN, PB1_OUT, PB1_IN, 0,</div><div class='del'>-		PB0_FN, PB0_OUT, PB0_IN, 0 }</div><div class='add'>+		PB0_FN, PB0_OUT, PB0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCCR", 0xffcc0004, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCCR", 0xffcc0004, 16, 2, GROUP(</div><div class='ctx'> 		PC7_FN, PC7_OUT, PC7_IN, 0,</div><div class='ctx'> 		PC6_FN, PC6_OUT, PC6_IN, 0,</div><div class='ctx'> 		PC5_FN, PC5_OUT, PC5_IN, 0,</div><div class='hunk'>@@ -655,9 +655,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PC3_FN, PC3_OUT, PC3_IN, 0,</div><div class='ctx'> 		PC2_FN, PC2_OUT, PC2_IN, 0,</div><div class='ctx'> 		PC1_FN, PC1_OUT, PC1_IN, 0,</div><div class='del'>-		PC0_FN, PC0_OUT, PC0_IN, 0 }</div><div class='add'>+		PC0_FN, PC0_OUT, PC0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PDCR", 0xffcc0006, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PDCR", 0xffcc0006, 16, 2, GROUP(</div><div class='ctx'> 		PD7_FN, PD7_OUT, PD7_IN, 0,</div><div class='ctx'> 		PD6_FN, PD6_OUT, PD6_IN, 0,</div><div class='ctx'> 		PD5_FN, PD5_OUT, PD5_IN, 0,</div><div class='hunk'>@@ -665,9 +665,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PD3_FN, PD3_OUT, PD3_IN, 0,</div><div class='ctx'> 		PD2_FN, PD2_OUT, PD2_IN, 0,</div><div class='ctx'> 		PD1_FN, PD1_OUT, PD1_IN, 0,</div><div class='del'>-		PD0_FN, PD0_OUT, PD0_IN, 0 }</div><div class='add'>+		PD0_FN, PD0_OUT, PD0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PECR", 0xffcc0008, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PECR", 0xffcc0008, 16, 2, GROUP(</div><div class='ctx'> 		PE7_FN, PE7_OUT, PE7_IN, 0,</div><div class='ctx'> 		PE6_FN, PE6_OUT, PE6_IN, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -675,9 +675,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PFCR", 0xffcc000a, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PFCR", 0xffcc000a, 16, 2, GROUP(</div><div class='ctx'> 		PF7_FN, PF7_OUT, PF7_IN, 0,</div><div class='ctx'> 		PF6_FN, PF6_OUT, PF6_IN, 0,</div><div class='ctx'> 		PF5_FN, PF5_OUT, PF5_IN, 0,</div><div class='hunk'>@@ -685,9 +685,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF3_FN, PF3_OUT, PF3_IN, 0,</div><div class='ctx'> 		PF2_FN, PF2_OUT, PF2_IN, 0,</div><div class='ctx'> 		PF1_FN, PF1_OUT, PF1_IN, 0,</div><div class='del'>-		PF0_FN, PF0_OUT, PF0_IN, 0 }</div><div class='add'>+		PF0_FN, PF0_OUT, PF0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGCR", 0xffcc000c, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGCR", 0xffcc000c, 16, 2, GROUP(</div><div class='ctx'> 		PG7_FN, PG7_OUT, PG7_IN, 0,</div><div class='ctx'> 		PG6_FN, PG6_OUT, PG6_IN, 0,</div><div class='ctx'> 		PG5_FN, PG5_OUT, PG5_IN, 0,</div><div class='hunk'>@@ -695,9 +695,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PHCR", 0xffcc000e, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PHCR", 0xffcc000e, 16, 2, GROUP(</div><div class='ctx'> 		PH7_FN, PH7_OUT, PH7_IN, 0,</div><div class='ctx'> 		PH6_FN, PH6_OUT, PH6_IN, 0,</div><div class='ctx'> 		PH5_FN, PH5_OUT, PH5_IN, 0,</div><div class='hunk'>@@ -705,9 +705,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PH3_FN, PH3_OUT, PH3_IN, 0,</div><div class='ctx'> 		PH2_FN, PH2_OUT, PH2_IN, 0,</div><div class='ctx'> 		PH1_FN, PH1_OUT, PH1_IN, 0,</div><div class='del'>-		PH0_FN, PH0_OUT, PH0_IN, 0 }</div><div class='add'>+		PH0_FN, PH0_OUT, PH0_IN, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PJCR", 0xffcc0010, 16, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PJCR", 0xffcc0010, 16, 2, GROUP(</div><div class='ctx'> 		PJ7_FN, PJ7_OUT, PJ7_IN, 0,</div><div class='ctx'> 		PJ6_FN, PJ6_OUT, PJ6_IN, 0,</div><div class='ctx'> 		PJ5_FN, PJ5_OUT, PJ5_IN, 0,</div><div class='hunk'>@@ -715,9 +715,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PJ3_FN, PJ3_OUT, PJ3_IN, 0,</div><div class='ctx'> 		PJ2_FN, PJ2_OUT, PJ2_IN, 0,</div><div class='ctx'> 		PJ1_FN, PJ1_OUT, PJ1_IN, 0,</div><div class='del'>-		0, 0, 0, 0, }</div><div class='add'>+		0, 0, 0, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("P1MSELR", 0xffcc0080, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("P1MSELR", 0xffcc0080, 16, 1, GROUP(</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		P1MSEL14_0, P1MSEL14_1,</div><div class='ctx'> 		P1MSEL13_0, P1MSEL13_1,</div><div class='hunk'>@@ -733,9 +733,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		P1MSEL3_0,  P1MSEL3_1,</div><div class='ctx'> 		P1MSEL2_0,  P1MSEL2_1,</div><div class='ctx'> 		P1MSEL1_0,  P1MSEL1_1,</div><div class='del'>-		P1MSEL0_0,  P1MSEL0_1 }</div><div class='add'>+		P1MSEL0_0,  P1MSEL0_1 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("P2MSELR", 0xffcc0082, 16, 1) {</div><div class='add'>+	{ PINMUX_CFG_REG("P2MSELR", 0xffcc0082, 16, 1, GROUP(</div><div class='ctx'> 		P2MSEL15_0, P2MSEL15_1,</div><div class='ctx'> 		P2MSEL14_0, P2MSEL14_1,</div><div class='ctx'> 		P2MSEL13_0, P2MSEL13_1,</div><div class='hunk'>@@ -751,47 +751,47 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		P2MSEL3_0,  P2MSEL3_1,</div><div class='ctx'> 		P2MSEL2_0,  P2MSEL2_1,</div><div class='ctx'> 		P2MSEL1_0,  P2MSEL1_1,</div><div class='del'>-		P2MSEL0_0,  P2MSEL0_1 }</div><div class='add'>+		P2MSEL0_0,  P2MSEL0_1 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PADR", 0xffcc0020, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PADR", 0xffcc0020, 8, GROUP(</div><div class='ctx'> 		PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA,</div><div class='del'>-		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA }</div><div class='add'>+		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PBDR", 0xffcc0022, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PBDR", 0xffcc0022, 8, GROUP(</div><div class='ctx'> 		PB7_DATA, PB6_DATA, PB5_DATA, PB4_DATA,</div><div class='del'>-		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA }</div><div class='add'>+		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDR", 0xffcc0024, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDR", 0xffcc0024, 8, GROUP(</div><div class='ctx'> 		PC7_DATA, PC6_DATA, PC5_DATA, PC4_DATA,</div><div class='del'>-		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA }</div><div class='add'>+		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PDDR", 0xffcc0026, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PDDR", 0xffcc0026, 8, GROUP(</div><div class='ctx'> 		PD7_DATA, PD6_DATA, PD5_DATA, PD4_DATA,</div><div class='del'>-		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA }</div><div class='add'>+		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEDR", 0xffcc0028, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEDR", 0xffcc0028, 8, GROUP(</div><div class='ctx'> 		PE7_DATA, PE6_DATA,</div><div class='del'>-		0, 0, 0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PFDR", 0xffcc002a, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PFDR", 0xffcc002a, 8, GROUP(</div><div class='ctx'> 		PF7_DATA, PF6_DATA, PF5_DATA, PF4_DATA,</div><div class='del'>-		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA }</div><div class='add'>+		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGDR", 0xffcc002c, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGDR", 0xffcc002c, 8, GROUP(</div><div class='ctx'> 		PG7_DATA, PG6_DATA, PG5_DATA, 0,</div><div class='del'>-		0, 0, 0, 0 }</div><div class='add'>+		0, 0, 0, 0 ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PHDR", 0xffcc002e, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PHDR", 0xffcc002e, 8, GROUP(</div><div class='ctx'> 		PH7_DATA, PH6_DATA, PH5_DATA, PH4_DATA,</div><div class='del'>-		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA }</div><div class='add'>+		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PJDR", 0xffcc0030, 8) {</div><div class='add'>+	{ PINMUX_DATA_REG("PJDR", 0xffcc0030, 8, GROUP(</div><div class='ctx'> 		PJ7_DATA, PJ6_DATA, PJ5_DATA, PJ4_DATA,</div><div class='del'>-		PJ3_DATA, PJ2_DATA, PJ1_DATA, 0 }</div><div class='add'>+		PJ3_DATA, PJ2_DATA, PJ1_DATA, 0 ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/sh-pfc/pfc-shx3.c<br/>index 905ae00cc6f1..22e812850964 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-shx3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/pfc-shx3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/pfc-shx3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/pfc-shx3.c</a></div><div class='hunk'>@@ -431,7 +431,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='del'>-	{ PINMUX_CFG_REG("PABCR", 0xffc70000, 32, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PABCR", 0xffc70000, 32, 2, GROUP(</div><div class='ctx'> 		PA7_FN, PA7_OUT, PA7_IN, 0,</div><div class='ctx'> 		PA6_FN, PA6_OUT, PA6_IN, 0,</div><div class='ctx'> 		PA5_FN, PA5_OUT, PA5_IN, 0,</div><div class='hunk'>@@ -447,9 +447,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PB3_FN, PB3_OUT, PB3_IN, 0,</div><div class='ctx'> 		PB2_FN, PB2_OUT, PB2_IN, 0,</div><div class='ctx'> 		PB1_FN, PB1_OUT, PB1_IN, 0,</div><div class='del'>-		PB0_FN, PB0_OUT, PB0_IN, 0, },</div><div class='add'>+		PB0_FN, PB0_OUT, PB0_IN, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PCDCR", 0xffc70004, 32, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PCDCR", 0xffc70004, 32, 2, GROUP(</div><div class='ctx'> 		PC7_FN, PC7_OUT, PC7_IN, 0,</div><div class='ctx'> 		PC6_FN, PC6_OUT, PC6_IN, 0,</div><div class='ctx'> 		PC5_FN, PC5_OUT, PC5_IN, 0,</div><div class='hunk'>@@ -465,9 +465,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PD3_FN, PD3_OUT, PD3_IN, 0,</div><div class='ctx'> 		PD2_FN, PD2_OUT, PD2_IN, 0,</div><div class='ctx'> 		PD1_FN, PD1_OUT, PD1_IN, 0,</div><div class='del'>-		PD0_FN, PD0_OUT, PD0_IN, 0, },</div><div class='add'>+		PD0_FN, PD0_OUT, PD0_IN, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PEFCR", 0xffc70008, 32, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PEFCR", 0xffc70008, 32, 2, GROUP(</div><div class='ctx'> 		PE7_FN, PE7_OUT, PE7_IN, 0,</div><div class='ctx'> 		PE6_FN, PE6_OUT, PE6_IN, 0,</div><div class='ctx'> 		PE5_FN, PE5_OUT, PE5_IN, 0,</div><div class='hunk'>@@ -483,9 +483,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PF3_FN, PF3_OUT, PF3_IN, 0,</div><div class='ctx'> 		PF2_FN, PF2_OUT, PF2_IN, 0,</div><div class='ctx'> 		PF1_FN, PF1_OUT, PF1_IN, 0,</div><div class='del'>-		PF0_FN, PF0_OUT, PF0_IN, 0, },</div><div class='add'>+		PF0_FN, PF0_OUT, PF0_IN, 0, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_CFG_REG("PGHCR", 0xffc7000c, 32, 2) {</div><div class='add'>+	{ PINMUX_CFG_REG("PGHCR", 0xffc7000c, 32, 2, GROUP(</div><div class='ctx'> 		PG7_FN, PG7_OUT, PG7_IN, 0,</div><div class='ctx'> 		PG6_FN, PG6_OUT, PG6_IN, 0,</div><div class='ctx'> 		PG5_FN, PG5_OUT, PG5_IN, 0,</div><div class='hunk'>@@ -501,43 +501,43 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='ctx'> 		PH3_FN, PH3_OUT, PH3_IN, 0,</div><div class='ctx'> 		PH2_FN, PH2_OUT, PH2_IN, 0,</div><div class='ctx'> 		PH1_FN, PH1_OUT, PH1_IN, 0,</div><div class='del'>-		PH0_FN, PH0_OUT, PH0_IN, 0, },</div><div class='add'>+		PH0_FN, PH0_OUT, PH0_IN, 0, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='del'>-	{ PINMUX_DATA_REG("PABDR", 0xffc70010, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PABDR", 0xffc70010, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA,</div><div class='ctx'> 		PA3_DATA, PA2_DATA, PA1_DATA, PA0_DATA,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PB7_DATA, PB6_DATA, PB5_DATA, PB4_DATA,</div><div class='del'>-		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA, },</div><div class='add'>+		PB3_DATA, PB2_DATA, PB1_DATA, PB0_DATA, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PCDDR", 0xffc70014, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PCDDR", 0xffc70014, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PC7_DATA, PC6_DATA, PC5_DATA, PC4_DATA,</div><div class='ctx'> 		PC3_DATA, PC2_DATA, PC1_DATA, PC0_DATA,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PD7_DATA, PD6_DATA, PD5_DATA, PD4_DATA,</div><div class='del'>-		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA, },</div><div class='add'>+		PD3_DATA, PD2_DATA, PD1_DATA, PD0_DATA, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PEFDR", 0xffc70018, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PEFDR", 0xffc70018, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PE7_DATA, PE6_DATA, PE5_DATA, PE4_DATA,</div><div class='ctx'> 		PE3_DATA, PE2_DATA, PE1_DATA, PE0_DATA,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PF7_DATA, PF6_DATA, PF5_DATA, PF4_DATA,</div><div class='del'>-		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA, },</div><div class='add'>+		PF3_DATA, PF2_DATA, PF1_DATA, PF0_DATA, ))</div><div class='ctx'> 	},</div><div class='del'>-	{ PINMUX_DATA_REG("PGHDR", 0xffc7001c, 32) {</div><div class='add'>+	{ PINMUX_DATA_REG("PGHDR", 0xffc7001c, 32, GROUP(</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		PG7_DATA, PG6_DATA, PG5_DATA, PG4_DATA,</div><div class='ctx'> 		PG3_DATA, PG2_DATA, PG1_DATA, PG0_DATA,</div><div class='ctx'> 		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		0, 0, PH5_DATA, PH4_DATA,</div><div class='del'>-		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA, },</div><div class='add'>+		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA, ))</div><div class='ctx'> 	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h<br/>index 56016cb76769..7db5819eea7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/sh_pfc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sh-pfc/sh_pfc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sh-pfc/sh_pfc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sh-pfc/sh_pfc.h</a></div><div class='hunk'>@@ -111,40 +111,54 @@ struct pinmux_func {</div><div class='ctx'> struct pinmux_cfg_reg {</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	u8 reg_width, field_width;</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	u16 nr_enum_ids;	/* for variable width regs only */</div><div class='add'>+#define SET_NR_ENUM_IDS(n)	.nr_enum_ids = n,</div><div class='add'>+#else</div><div class='add'>+#define SET_NR_ENUM_IDS(n)</div><div class='add'>+#endif</div><div class='ctx'> 	const u16 *enum_ids;</div><div class='ctx'> 	const u8 *var_field_width;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define GROUP(...)	__VA_ARGS__</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Describe a config register consisting of several fields of the same width</div><div class='ctx'>  *   - name: Register name (unused, for documentation purposes only)</div><div class='ctx'>  *   - r: Physical register address</div><div class='ctx'>  *   - r_width: Width of the register (in bits)</div><div class='ctx'>  *   - f_width: Width of the fixed-width register fields (in bits)</div><div class='del'>- * This macro must be followed by initialization data: For each register field</div><div class='del'>- * (from left to right, i.e. MSB to LSB), 2^f_width enum IDs must be specified,</div><div class='del'>- * one for each possible combination of the register field bit values.</div><div class='add'>+ *   - ids: For each register field (from left to right, i.e. MSB to LSB),</div><div class='add'>+ *          2^f_width enum IDs must be specified, one for each possible</div><div class='add'>+ *          combination of the register field bit values, all wrapped using</div><div class='add'>+ *          the GROUP() macro.</div><div class='ctx'>  */</div><div class='del'>-#define PINMUX_CFG_REG(name, r, r_width, f_width) \</div><div class='add'>+#define PINMUX_CFG_REG(name, r, r_width, f_width, ids)			\</div><div class='ctx'> 	.reg = r, .reg_width = r_width,					\</div><div class='del'>-	.field_width = f_width + BUILD_BUG_ON_ZERO(r_width % f_width),	\</div><div class='del'>-	.enum_ids = (const u16 [(r_width / f_width) * (1 &lt;&lt; f_width)])</div><div class='add'>+	.field_width = f_width + BUILD_BUG_ON_ZERO(r_width % f_width) +	\</div><div class='add'>+	BUILD_BUG_ON_ZERO(sizeof((const u16 []) { ids }) / sizeof(u16) != \</div><div class='add'>+			  (r_width / f_width) * (1 &lt;&lt; f_width)),	\</div><div class='add'>+	.enum_ids = (const u16 [(r_width / f_width) * (1 &lt;&lt; f_width)])	\</div><div class='add'>+		{ ids }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Describe a config register consisting of several fields of different widths</div><div class='ctx'>  *   - name: Register name (unused, for documentation purposes only)</div><div class='ctx'>  *   - r: Physical register address</div><div class='ctx'>  *   - r_width: Width of the register (in bits)</div><div class='del'>- *   - var_fw0, var_fwn...: List of widths of the register fields (in bits),</div><div class='del'>- *                          From left to right (i.e. MSB to LSB)</div><div class='del'>- * This macro must be followed by initialization data: For each register field</div><div class='del'>- * (from left to right, i.e. MSB to LSB), 2^var_fwi enum IDs must be specified,</div><div class='del'>- * one for each possible combination of the register field bit values.</div><div class='add'>+ *   - f_widths: List of widths of the register fields (in bits), from left</div><div class='add'>+ *               to right (i.e. MSB to LSB), wrapped using the GROUP() macro.</div><div class='add'>+ *   - ids: For each register field (from left to right, i.e. MSB to LSB),</div><div class='add'>+ *          2^f_widths[i] enum IDs must be specified, one for each possible</div><div class='add'>+ *          combination of the register field bit values, all wrapped using</div><div class='add'>+ *          the GROUP() macro.</div><div class='ctx'>  */</div><div class='del'>-#define PINMUX_CFG_REG_VAR(name, r, r_width, var_fw0, var_fwn...) \</div><div class='del'>-	.reg = r, .reg_width = r_width,	\</div><div class='del'>-	.var_field_width = (const u8 []) { var_fw0, var_fwn, 0 }, \</div><div class='del'>-	.enum_ids = (const u16 [])</div><div class='add'>+#define PINMUX_CFG_REG_VAR(name, r, r_width, f_widths, ids)		\</div><div class='add'>+	.reg = r, .reg_width = r_width,					\</div><div class='add'>+	.var_field_width = (const u8 []) { f_widths, 0 },		\</div><div class='add'>+	SET_NR_ENUM_IDS(sizeof((const u16 []) { ids }) / sizeof(u16))	\</div><div class='add'>+	.enum_ids = (const u16 []) { ids }</div><div class='ctx'> </div><div class='ctx'> struct pinmux_drive_reg_field {</div><div class='ctx'> 	u16 pin;</div><div class='hunk'>@@ -187,12 +201,14 @@ struct pinmux_data_reg {</div><div class='ctx'>  *   - name: Register name (unused, for documentation purposes only)</div><div class='ctx'>  *   - r: Physical register address</div><div class='ctx'>  *   - r_width: Width of the register (in bits)</div><div class='del'>- * This macro must be followed by initialization data: For each register bit</div><div class='del'>- * (from left to right, i.e. MSB to LSB), one enum ID must be specified.</div><div class='add'>+ *   - ids: For each register bit (from left to right, i.e. MSB to LSB), one</div><div class='add'>+ *          enum ID must be specified, all wrapped using the GROUP() macro.</div><div class='ctx'>  */</div><div class='del'>-#define PINMUX_DATA_REG(name, r, r_width) \</div><div class='del'>-	.reg = r, .reg_width = r_width,	\</div><div class='del'>-	.enum_ids = (const u16 [r_width]) \</div><div class='add'>+#define PINMUX_DATA_REG(name, r, r_width, ids)				\</div><div class='add'>+	.reg = r, .reg_width = r_width +				\</div><div class='add'>+	BUILD_BUG_ON_ZERO(sizeof((const u16 []) { ids }) / sizeof(u16) != \</div><div class='add'>+			  r_width),					\</div><div class='add'>+	.enum_ids = (const u16 [r_width]) { ids }</div><div class='ctx'> </div><div class='ctx'> struct pinmux_irq {</div><div class='ctx'> 	const short *gpios;</div><div class='hunk'>@@ -261,7 +277,7 @@ struct sh_pfc_soc_info {</div><div class='ctx'> 	const struct sh_pfc_function *functions;</div><div class='ctx'> 	unsigned int nr_functions;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUPERH</div><div class='add'>+#ifdef CONFIG_PINCTRL_SH_FUNC_GPIO</div><div class='ctx'> 	const struct pinmux_func *func_gpios;</div><div class='ctx'> 	unsigned int nr_func_gpios;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -402,8 +418,8 @@ extern const struct sh_pfc_soc_info shx3_pinmux_info;</div><div class='ctx'> /*</div><div class='ctx'>  * Describe a pinmux configuration in which a pin is physically multiplexed</div><div class='ctx'>  * with other pins.</div><div class='del'>- *   - ipsr: IPSR field</div><div class='del'>- *   - fn: Function name, also referring to the IPSR field</div><div class='add'>+ *   - ipsr: IPSR field (unused, for documentation purposes only)</div><div class='add'>+ *   - fn: Function name</div><div class='ctx'>  *   - psel: Physical multiplexing selector</div><div class='ctx'>  */</div><div class='ctx'> #define PINMUX_IPSR_PHYS(ipsr, fn, psel) \</div><div class='hunk'>@@ -663,7 +679,9 @@ extern const struct sh_pfc_soc_info shx3_pinmux_info;</div><div class='ctx'>  */</div><div class='ctx'> #define PORTCR(nr, reg)							\</div><div class='ctx'> 	{								\</div><div class='del'>-		PINMUX_CFG_REG_VAR("PORT" nr "CR", reg, 8, 2, 2, 1, 3) {\</div><div class='add'>+		PINMUX_CFG_REG_VAR("PORT" nr "CR", reg, 8,		\</div><div class='add'>+				   GROUP(2, 2, 1, 3),			\</div><div class='add'>+				   GROUP(				\</div><div class='ctx'> 			/* PULMD[1:0], handled by .set_bias() */	\</div><div class='ctx'> 			0, 0, 0, 0,					\</div><div class='ctx'> 			/* IE and OE */					\</div><div class='hunk'>@@ -675,7 +693,7 @@ extern const struct sh_pfc_soc_info shx3_pinmux_info;</div><div class='ctx'> 			PORT##nr##_FN2, PORT##nr##_FN3,			\</div><div class='ctx'> 			PORT##nr##_FN4, PORT##nr##_FN5,			\</div><div class='ctx'> 			PORT##nr##_FN6, PORT##nr##_FN7			\</div><div class='del'>-		}							\</div><div class='add'>+		))							\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c<br/>index 0b9ff5aa6bb5..2317ccf63321 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/stm32/pinctrl-stm32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/stm32/pinctrl-stm32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/stm32/pinctrl-stm32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/stm32/pinctrl-stm32.c</a></div><div class='hunk'>@@ -95,6 +95,9 @@ struct stm32_pinctrl {</div><div class='ctx'> 	struct regmap		*regmap;</div><div class='ctx'> 	struct regmap_field	*irqmux[STM32_GPIO_PINS_PER_BANK];</div><div class='ctx'> 	struct hwspinlock *hwlock;</div><div class='add'>+	struct stm32_desc_pin *pins;</div><div class='add'>+	u32 npins;</div><div class='add'>+	u32 pkg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int stm32_gpio_pin(int gpio)</div><div class='hunk'>@@ -358,8 +361,8 @@ static bool stm32_pctrl_is_function_valid(struct stm32_pinctrl *pctl,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pctl-&gt;match_data-&gt;npins; i++) {</div><div class='del'>-		const struct stm32_desc_pin *pin = pctl-&gt;match_data-&gt;pins + i;</div><div class='add'>+	for (i = 0; i &lt; pctl-&gt;npins; i++) {</div><div class='add'>+		const struct stm32_desc_pin *pin = pctl-&gt;pins + i;</div><div class='ctx'> 		const struct stm32_desc_function *func = pin-&gt;functions;</div><div class='ctx'> </div><div class='ctx'> 		if (pin-&gt;pin.number != pin_num)</div><div class='hunk'>@@ -1119,23 +1122,35 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct irq_domain *stm32_pctrl_get_irq_domain(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent;</div><div class='add'>+	struct irq_domain *domain;</div><div class='add'>+</div><div class='add'>+	if (!of_find_property(np, "interrupt-parent", NULL))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	parent = of_irq_find_parent(np);</div><div class='add'>+	if (!parent)</div><div class='add'>+		return ERR_PTR(-ENXIO);</div><div class='add'>+</div><div class='add'>+	domain = irq_find_host(parent);</div><div class='add'>+	if (!domain)</div><div class='add'>+		/* domain not registered yet */</div><div class='add'>+		return ERR_PTR(-EPROBE_DEFER);</div><div class='add'>+</div><div class='add'>+	return domain;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int stm32_pctrl_dt_setup_irq(struct platform_device *pdev,</div><div class='ctx'> 			   struct stm32_pinctrl *pctl)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node, *parent;</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct regmap *rm;</div><div class='ctx'> 	int offset, ret, i;</div><div class='ctx'> 	int mask, mask_width;</div><div class='ctx'> </div><div class='del'>-	parent = of_irq_find_parent(np);</div><div class='del'>-	if (!parent)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	pctl-&gt;domain = irq_find_host(parent);</div><div class='del'>-	if (!pctl-&gt;domain)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='ctx'> 	pctl-&gt;regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");</div><div class='ctx'> 	if (IS_ERR(pctl-&gt;regmap))</div><div class='ctx'> 		return PTR_ERR(pctl-&gt;regmap);</div><div class='hunk'>@@ -1175,7 +1190,7 @@ static int stm32_pctrl_build_state(struct platform_device *pdev)</div><div class='ctx'> 	struct stm32_pinctrl *pctl = platform_get_drvdata(pdev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pctl-&gt;ngroups = pctl-&gt;match_data-&gt;npins;</div><div class='add'>+	pctl-&gt;ngroups = pctl-&gt;npins;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate groups */</div><div class='ctx'> 	pctl-&gt;groups = devm_kcalloc(&amp;pdev-&gt;dev, pctl-&gt;ngroups,</div><div class='hunk'>@@ -1189,19 +1204,50 @@ static int stm32_pctrl_build_state(struct platform_device *pdev)</div><div class='ctx'> 	if (!pctl-&gt;grp_names)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pctl-&gt;match_data-&gt;npins; i++) {</div><div class='del'>-		const struct stm32_desc_pin *pin = pctl-&gt;match_data-&gt;pins + i;</div><div class='add'>+	for (i = 0; i &lt; pctl-&gt;npins; i++) {</div><div class='add'>+		const struct stm32_desc_pin *pin = pctl-&gt;pins + i;</div><div class='ctx'> 		struct stm32_pinctrl_group *group = pctl-&gt;groups + i;</div><div class='ctx'> </div><div class='ctx'> 		group-&gt;name = pin-&gt;pin.name;</div><div class='ctx'> 		group-&gt;pin = pin-&gt;pin.number;</div><div class='del'>-</div><div class='ctx'> 		pctl-&gt;grp_names[i] = pin-&gt;pin.name;</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 stm32_pctrl_create_pins_tab(struct stm32_pinctrl *pctl,</div><div class='add'>+				       struct stm32_desc_pin *pins)</div><div class='add'>+{</div><div class='add'>+	const struct stm32_desc_pin *p;</div><div class='add'>+	int i, nb_pins_available = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pctl-&gt;match_data-&gt;npins; i++) {</div><div class='add'>+		p = pctl-&gt;match_data-&gt;pins + i;</div><div class='add'>+		if (pctl-&gt;pkg &amp;&amp; !(pctl-&gt;pkg &amp; p-&gt;pkg))</div><div class='add'>+			continue;</div><div class='add'>+		pins-&gt;pin = p-&gt;pin;</div><div class='add'>+		pins-&gt;functions = p-&gt;functions;</div><div class='add'>+		pins++;</div><div class='add'>+		nb_pins_available++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pctl-&gt;npins = nb_pins_available;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stm32_pctl_get_package(struct device_node *np,</div><div class='add'>+				   struct stm32_pinctrl *pctl)</div><div class='add'>+{</div><div class='add'>+	if (of_property_read_u32(np, "st,package", &amp;pctl-&gt;pkg)) {</div><div class='add'>+		pctl-&gt;pkg = 0;</div><div class='add'>+		dev_warn(pctl-&gt;dev, "No package detected, use default one\n");</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(pctl-&gt;dev, "package detected: %x\n", pctl-&gt;pkg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int stm32_pctl_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='hunk'>@@ -1230,6 +1276,11 @@ int stm32_pctl_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, pctl);</div><div class='ctx'> </div><div class='add'>+	/* check for IRQ controller (may require deferred probe) */</div><div class='add'>+	pctl-&gt;domain = stm32_pctrl_get_irq_domain(np);</div><div class='add'>+	if (IS_ERR(pctl-&gt;domain))</div><div class='add'>+		return PTR_ERR(pctl-&gt;domain);</div><div class='add'>+</div><div class='ctx'> 	/* hwspinlock is optional */</div><div class='ctx'> 	hwlock_id = of_hwspin_lock_get_id(pdev-&gt;dev.of_node, 0);</div><div class='ctx'> 	if (hwlock_id &lt; 0) {</div><div class='hunk'>@@ -1241,30 +1292,43 @@ int stm32_pctl_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pctl-&gt;dev = dev;</div><div class='ctx'> 	pctl-&gt;match_data = match-&gt;data;</div><div class='add'>+</div><div class='add'>+	/*  get package information */</div><div class='add'>+	stm32_pctl_get_package(np, pctl);</div><div class='add'>+</div><div class='add'>+	pctl-&gt;pins = devm_kcalloc(pctl-&gt;dev, pctl-&gt;match_data-&gt;npins,</div><div class='add'>+				  sizeof(*pctl-&gt;pins), GFP_KERNEL);</div><div class='add'>+	if (!pctl-&gt;pins)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = stm32_pctrl_create_pins_tab(pctl, pctl-&gt;pins);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = stm32_pctrl_build_state(pdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "build state failed: %d\n", ret);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_find_property(np, "interrupt-parent", NULL)) {</div><div class='add'>+	if (pctl-&gt;domain) {</div><div class='ctx'> 		ret = stm32_pctrl_dt_setup_irq(pdev, pctl);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pins = devm_kcalloc(&amp;pdev-&gt;dev, pctl-&gt;match_data-&gt;npins, sizeof(*pins),</div><div class='add'>+	pins = devm_kcalloc(&amp;pdev-&gt;dev, pctl-&gt;npins, sizeof(*pins),</div><div class='ctx'> 			    GFP_KERNEL);</div><div class='ctx'> 	if (!pins)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pctl-&gt;match_data-&gt;npins; i++)</div><div class='del'>-		pins[i] = pctl-&gt;match_data-&gt;pins[i].pin;</div><div class='add'>+	for (i = 0; i &lt; pctl-&gt;npins; i++)</div><div class='add'>+		pins[i] = pctl-&gt;pins[i].pin;</div><div class='ctx'> </div><div class='ctx'> 	pctl-&gt;pctl_desc.name = dev_name(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pctl-&gt;pctl_desc.owner = THIS_MODULE;</div><div class='ctx'> 	pctl-&gt;pctl_desc.pins = pins;</div><div class='del'>-	pctl-&gt;pctl_desc.npins = pctl-&gt;match_data-&gt;npins;</div><div class='add'>+	pctl-&gt;pctl_desc.npins = pctl-&gt;npins;</div><div class='ctx'> 	pctl-&gt;pctl_desc.confops = &amp;stm32_pconf_ops;</div><div class='ctx'> 	pctl-&gt;pctl_desc.pctlops = &amp;stm32_pctrl_ops;</div><div class='ctx'> 	pctl-&gt;pctl_desc.pmxops = &amp;stm32_pmx_ops;</div><div class='hunk'>@@ -1305,4 +1369,3 @@ int stm32_pctl_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.h b/drivers/pinctrl/stm32/pinctrl-stm32.h<br/>index 473a6238a27b..de5e7012ca03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/stm32/pinctrl-stm32.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/stm32/pinctrl-stm32.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/stm32/pinctrl-stm32.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/stm32/pinctrl-stm32.h</a></div><div class='hunk'>@@ -18,6 +18,12 @@</div><div class='ctx'> #define STM32_PIN_AF(x)		((x) + 1)</div><div class='ctx'> #define STM32_PIN_ANALOG	(STM32_PIN_AF(15) + 1)</div><div class='ctx'> </div><div class='add'>+/*  package information */</div><div class='add'>+#define STM32MP_PKG_AA		BIT(0)</div><div class='add'>+#define STM32MP_PKG_AB		BIT(1)</div><div class='add'>+#define STM32MP_PKG_AC		BIT(2)</div><div class='add'>+#define STM32MP_PKG_AD		BIT(3)</div><div class='add'>+</div><div class='ctx'> struct stm32_desc_function {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	const unsigned char num;</div><div class='hunk'>@@ -26,6 +32,7 @@ struct stm32_desc_function {</div><div class='ctx'> struct stm32_desc_pin {</div><div class='ctx'> 	struct pinctrl_pin_desc pin;</div><div class='ctx'> 	const struct stm32_desc_function *functions;</div><div class='add'>+	const unsigned int pkg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define STM32_PIN(_pin, ...)					\</div><div class='hunk'>@@ -35,6 +42,13 @@ struct stm32_desc_pin {</div><div class='ctx'> 			__VA_ARGS__, { } },			\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define STM32_PIN_PKG(_pin, _pkg, ...)					\</div><div class='add'>+	{							\</div><div class='add'>+		.pin = _pin,					\</div><div class='add'>+		.pkg  = _pkg,				\</div><div class='add'>+		.functions = (struct stm32_desc_function[]){	\</div><div class='add'>+			__VA_ARGS__, { } },			\</div><div class='add'>+	}</div><div class='ctx'> #define STM32_FUNCTION(_num, _name)		\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.num = _num,					\</div><div class='head'>diff --git a/drivers/pinctrl/stm32/pinctrl-stm32mp157.c b/drivers/pinctrl/stm32/pinctrl-stm32mp157.c<br/>index 7c7d6284b23c..320544f69e57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/stm32/pinctrl-stm32mp157.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/stm32/pinctrl-stm32mp157.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/stm32/pinctrl-stm32mp157.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/stm32/pinctrl-stm32mp157.c</a></div><div class='hunk'>@@ -10,77 +10,82 @@</div><div class='ctx'> #include "pinctrl-stm32.h"</div><div class='ctx'> </div><div class='ctx'> static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(0, "PA0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA0"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_BKIN"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_CTS_NSS USART_BOOT2_CTS_NSS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_CTS USART2_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_TX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "SDMMC2_CMD"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SD_B"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_CRS ETH_MII_CRS"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_CRS ETH1_MII_CRS"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(1, "PA1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA1"),</div><div class='ctx'> 		STM32_FUNCTION(1, "ETH_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM3_OUT"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_CH1N"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_RTS USART_BOOT2_RTS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_RTS USART2_DE"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK1_IO3 QUADSPI_BOOTBK1_IO3"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK1_IO3"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RX_CLK ETH_MII_RX_CLK ETH_RGMII_RX_CLK ETH_RMII_REF_CLK"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RX_CLK ETH1_MII_RX_CLK ETH1_RGMII_RX_CLK ETH1_RMII_REF_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(2, "PA2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA2"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM4_OUT"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_CH1"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_TX USART_BOOT2_TX"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_TX"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SAI2_SCK_B"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_MDIO"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_MDIO"),</div><div class='ctx'> 		STM32_FUNCTION(13, "MDIOS_MDIO"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(3, "PA3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA3"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM5_OUT"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_CH2"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_RX USART_BOOT2_RX"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_RX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_B2"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_COL ETH_MII_COL"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_COL ETH1_MII_COL"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(4, "PA4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA4"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(5, "SAI4_D2"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI1_NSS I2S1_WS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_NSS I2S3_WS"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_CK USART_BOOT2_CK"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_CK"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SPI6_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_FS_A"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_HSYNC"),</div><div class='hunk'>@@ -88,8 +93,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(5, "PA5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA5"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH1N"),</div><div class='hunk'>@@ -101,8 +107,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(6, "PA6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA6"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_BKIN"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH1"),</div><div class='hunk'>@@ -118,8 +125,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(7, "PA7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA7"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH2"),</div><div class='hunk'>@@ -129,13 +137,14 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(9, "SPI6_MOSI"),</div><div class='ctx'> 		STM32_FUNCTION(10, "TIM14_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(11, "QUADSPI_CLK"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RX_DV ETH_MII_RX_DV ETH_RGMII_RX_CTL ETH_RMII_CRS_DV"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RX_DV ETH1_MII_RX_DV ETH1_RGMII_RX_CTL ETH1_RMII_CRS_DV"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_SD_A"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(8, "PA8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA8"),</div><div class='ctx'> 		STM32_FUNCTION(1, "MCO1"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1"),</div><div class='hunk'>@@ -143,37 +152,37 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C3_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI3_MOSI I2S3_SDO"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART1_CK"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC2_CKIN SDMMC_BOOT2_CKIN"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D4 SDMMC_BOOT2_D4"),</div><div class='del'>-		STM32_FUNCTION(11, "USBO_SOF"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC2_CKIN"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D4"),</div><div class='add'>+		STM32_FUNCTION(11, "OTG_FS_SOF OTG_HS_SOF"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_SD_B"),</div><div class='ctx'> 		STM32_FUNCTION(14, "UART7_RX"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R6"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(9, "PA9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA9"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C3_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART1_TX"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC2_CDIR SDMMC_BOOT2_CDIR"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RXFD"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D5 SDMMC_BOOT2_D5"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC2_CDIR"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D5"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D0"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(10, "PA10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA10"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI3_NSS I2S3_WS"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART1_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TXFD"),</div><div class='ctx'> 		STM32_FUNCTION(12, "MDIOS_MDIO"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_FS_B"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D1"),</div><div class='hunk'>@@ -181,37 +190,39 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(11, "PA11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA11"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(8, "USART1_CTS_NSS"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RX"),</div><div class='add'>+		STM32_FUNCTION(8, "USART1_CTS USART1_NSS"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_RX"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(12, "PA12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA12"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SDA"),</div><div class='del'>-		STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "UART4_TX"),</div><div class='del'>-		STM32_FUNCTION(8, "USART1_RTS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART1_RTS USART1_DE"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SAI2_FS_B"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_TX"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(13, "PA13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA13"),</div><div class='ctx'> 		STM32_FUNCTION(1, "DBTRGO"),</div><div class='ctx'> 		STM32_FUNCTION(2, "DBTRGI"),</div><div class='hunk'>@@ -220,8 +231,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(14, "PA14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA14"),</div><div class='ctx'> 		STM32_FUNCTION(1, "DBTRGO"),</div><div class='ctx'> 		STM32_FUNCTION(2, "DBTRGI"),</div><div class='hunk'>@@ -229,73 +241,79 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(15, "PA15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOA15"),</div><div class='ctx'> 		STM32_FUNCTION(1, "DBTRGI"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI4_D2"),</div><div class='ctx'> 		STM32_FUNCTION(4, "SDMMC1_CDIR"),</div><div class='del'>-		STM32_FUNCTION(5, "HDMI_CEC"),</div><div class='add'>+		STM32_FUNCTION(5, "CEC"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI1_NSS I2S1_WS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_NSS I2S3_WS"),</div><div class='ctx'> 		STM32_FUNCTION(8, "SPI6_NSS"),</div><div class='del'>-		STM32_FUNCTION(9, "UART4_RTS UART_BOOT4_RTS"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D5 SDMMC_BOOT2_D5"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_CDIR SDMMC_BOOT2_CDIR"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_D5 SDMMC_BOOT1_D5"),</div><div class='add'>+		STM32_FUNCTION(9, "UART4_RTS UART4_DE"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D5"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_CDIR"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_D5"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_FS_A"),</div><div class='ctx'> 		STM32_FUNCTION(14, "UART7_TX"),</div><div class='add'>+		STM32_FUNCTION(15, "LCD_R1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(16, "PB0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB0"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2N"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_CKOUT"),</div><div class='del'>-		STM32_FUNCTION(9, "UART4_CTS UART_BOOT4_CTS"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_CKOUT"),</div><div class='add'>+		STM32_FUNCTION(9, "UART4_CTS"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_R3"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD2 ETH_MII_RXD2 ETH_RGMII_RXD2"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD2 ETH1_MII_RXD2 ETH1_RGMII_RXD2"),</div><div class='ctx'> 		STM32_FUNCTION(13, "MDIOS_MDIO"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(17, "PB1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB1"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH3N"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA1"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN1"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_R6"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD3 ETH_MII_RXD3 ETH_RGMII_RXD3"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD3 ETH1_MII_RXD3 ETH1_RGMII_RXD3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "MDIOS_MDC"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(18, "PB2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB2"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED4"),</div><div class='ctx'> 		STM32_FUNCTION(2, "RTC_OUT2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D1"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK1"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "USART1_RX"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2S_CKIN"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SD_A"),</div><div class='ctx'> 		STM32_FUNCTION(8, "SPI3_MOSI I2S3_SDO"),</div><div class='del'>-		STM32_FUNCTION(9, "UART4_RX UART_BOOT4_RX"),</div><div class='add'>+		STM32_FUNCTION(9, "UART4_RX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(19, "PB3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB3"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED9"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH2"),</div><div class='hunk'>@@ -303,14 +321,15 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI1_SCK I2S1_CK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_SCK I2S3_CK"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SPI6_SCK"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D2 SDMMC_BOOT2_D2"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D2"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_MCLK_A"),</div><div class='ctx'> 		STM32_FUNCTION(14, "UART7_RX"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(20, "PB4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB4"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED8"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_BKIN"),</div><div class='hunk'>@@ -320,14 +339,15 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_MISO I2S3_SDI"),</div><div class='ctx'> 		STM32_FUNCTION(8, "SPI2_NSS I2S2_WS"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SPI6_MISO"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D3 SDMMC_BOOT2_D3"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_SCK_A"),</div><div class='ctx'> 		STM32_FUNCTION(14, "UART7_TX"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(21, "PB5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB5"),</div><div class='ctx'> 		STM32_FUNCTION(1, "ETH_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM17_BKIN"),</div><div class='hunk'>@@ -338,166 +358,175 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(8, "SPI3_MOSI I2S3_SDO"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SPI6_MOSI"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_RX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN2_RX"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_SD_A"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_PPS_OUT"),</div><div class='del'>-		STM32_FUNCTION(13, "UART5_RX UART_BOOT5_RX"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_PPS_OUT"),</div><div class='add'>+		STM32_FUNCTION(13, "UART5_RX"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D10"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(22, "PB6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB6"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C1_SCL"),</div><div class='del'>-		STM32_FUNCTION(6, "HDMI_CEC"),</div><div class='add'>+		STM32_FUNCTION(6, "CEC"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART1_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_TX"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK1_NCS QUADSPI_BOOTBK1_NCS"),</div><div class='del'>-		STM32_FUNCTION(12, "DFSDM_DATA5"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN2_TX"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK1_NCS"),</div><div class='add'>+		STM32_FUNCTION(12, "DFSDM1_DATIN5"),</div><div class='ctx'> 		STM32_FUNCTION(13, "UART5_TX"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(23, "PB7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB7"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM17_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C1_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART1_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_TXFD"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D1 SDMMC_BOOT2_D1"),</div><div class='del'>-		STM32_FUNCTION(12, "DFSDM_CK5"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D1"),</div><div class='add'>+		STM32_FUNCTION(12, "DFSDM1_CKIN5"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NL"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_VSYNC"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(24, "PB8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB8"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP6"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH3"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK7"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN7"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C1_SCL"),</div><div class='del'>-		STM32_FUNCTION(6, "SDMMC1_CKIN SDMMC_BOOT1_CKIN"),</div><div class='add'>+		STM32_FUNCTION(6, "SDMMC1_CKIN"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SCL"),</div><div class='del'>-		STM32_FUNCTION(8, "SDMMC2_CKIN SDMMC_BOOT2_CKIN"),</div><div class='add'>+		STM32_FUNCTION(8, "SDMMC2_CKIN"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RX"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D4 SDMMC_BOOT2_D4"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD3 ETH_MII_TXD3 ETH_RGMII_TXD3"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D4 SDMMC_BOOT1_D4"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_RX"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D4"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD3 ETH1_MII_TXD3 ETH1_RGMII_TXD3"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D4"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D6"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B6"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(25, "PB9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB9"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP7"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM17_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH4"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA7"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN7"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C1_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SDA"),</div><div class='del'>-		STM32_FUNCTION(8, "SDMMC2_CDIR SDMMC_BOOT2_CDIR"),</div><div class='add'>+		STM32_FUNCTION(8, "SDMMC2_CDIR"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TX"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D5 SDMMC_BOOT2_D5"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_CDIR SDMMC_BOOT1_CDIR"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D5 SDMMC_BOOT1_D5"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_TX"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D5"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_CDIR"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D5"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D7"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(26, "PB10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB10"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM2_IN1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA7"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_TX USART_BOOT3_TX"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN7"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_TX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_BK1_NCS"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RX_ER ETH_MII_RX_ER"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RX_ER ETH1_MII_RX_ER"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(27, "PB11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB11"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM2_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SDA"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_CK7"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_CKIN7"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART3_RX"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TX_EN ETH_MII_TX_EN ETH_RGMII_TX_CTL ETH_RMII_TX_EN"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TX_EN ETH1_MII_TX_EN ETH1_RGMII_TX_CTL ETH1_RMII_TX_EN"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DSI_TE"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(28, "PB12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB12"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_BKIN"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA1"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_CK USART_BOOT3_CK"),</div><div class='del'>-		STM32_FUNCTION(9, "USART3_RX USART_BOOT3_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_RX"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD0 ETH_MII_TXD0 ETH_RGMII_TXD0 ETH_RMII_TXD0"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN1"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_CK"),</div><div class='add'>+		STM32_FUNCTION(9, "USART3_RX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN2_RX"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD0 ETH1_MII_TXD0 ETH1_RGMII_TXD0 ETH1_RMII_TXD0"),</div><div class='ctx'> 		STM32_FUNCTION(15, "UART5_RX"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(29, "PB13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB13"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1N"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CKOUT"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKOUT"),</div><div class='ctx'> 		STM32_FUNCTION(5, "LPTIM2_OUT"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_CK1"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_CTS_NSS USART_BOOT3_CTS_NSS"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_TX"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD1 ETH_MII_TXD1 ETH_RGMII_TXD1 ETH_RMII_TXD1"),</div><div class='del'>-		STM32_FUNCTION(15, "UART5_TX UART_BOOT5_TX"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_CKIN1"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_CTS USART3_NSS"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN2_TX"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD1 ETH1_MII_TXD1 ETH1_RGMII_TXD1 ETH1_RMII_TXD1"),</div><div class='add'>+		STM32_FUNCTION(15, "UART5_TX"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(30, "PB14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB14"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM12_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2N"),</div><div class='ctx'> 		STM32_FUNCTION(5, "USART1_TX"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MISO I2S2_SDI"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA2"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_RTS USART_BOOT3_RTS"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D0 SDMMC_BOOT2_D0"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN2"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_RTS USART3_DE"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(31, "PB15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOB15"),</div><div class='ctx'> 		STM32_FUNCTION(1, "RTC_REFIN"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3N"),</div><div class='hunk'>@@ -505,523 +534,557 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH3N"),</div><div class='ctx'> 		STM32_FUNCTION(5, "USART1_RX"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_CK2"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D1 SDMMC_BOOT2_D1"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_CKIN2"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(32, "PC0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC0"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK0"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN0"),</div><div class='ctx'> 		STM32_FUNCTION(5, "LPTIM2_IN2"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA4"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN4"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SAI2_FS_B"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK2_NCS QUADSPI_BOOTBK2_NCS"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK2_NCS"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(33, "PC1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC1"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D1"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA0"),</div><div class='del'>-		STM32_FUNCTION(5, "DFSDM_CK4"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN0"),</div><div class='add'>+		STM32_FUNCTION(5, "DFSDM1_CKIN4"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SD_A"),</div><div class='ctx'> 		STM32_FUNCTION(10, "SDMMC2_CK"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_MDC"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_MDC"),</div><div class='ctx'> 		STM32_FUNCTION(13, "MDIOS_MDC"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(34, "PC2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC2"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK1"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MISO I2S2_SDI"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_CKOUT"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD2 ETH_MII_TXD2 ETH_RGMII_TXD2"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_CKOUT"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD2 ETH1_MII_TXD2 ETH1_RGMII_TXD2"),</div><div class='add'>+		STM32_FUNCTION(14, "DCMI_PIXCLK"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(35, "PC3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC3"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACECLK"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA1"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TX_CLK ETH_MII_TX_CLK"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TX_CLK ETH1_MII_TX_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(36, "PC4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC4"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK2"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN2"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2S1_MCK"),</div><div class='del'>-		STM32_FUNCTION(10, "SPDIF_IN2"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD0 ETH_MII_RXD0 ETH_RGMII_RXD0 ETH_RMII_RXD0"),</div><div class='add'>+		STM32_FUNCTION(10, "SPDIFRX_IN2"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD0 ETH1_MII_RXD0 ETH1_RGMII_RXD0 ETH1_RMII_RXD0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(37, "PC5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC5"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D3"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA2"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "SAI4_D4"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_D4"),</div><div class='del'>-		STM32_FUNCTION(10, "SPDIF_IN3"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD1 ETH_MII_RXD1 ETH_RGMII_RXD1 ETH_RMII_RXD1"),</div><div class='add'>+		STM32_FUNCTION(10, "SPDIFRX_IN3"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD1 ETH1_MII_RXD1 ETH1_RGMII_RXD1 ETH1_RMII_RXD1"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_D3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(38, "PC6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC6"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH1"),</div><div class='del'>-		STM32_FUNCTION(5, "DFSDM_CK3"),</div><div class='add'>+		STM32_FUNCTION(5, "DFSDM1_CKIN3"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2S2_MCK"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_TX USART_BOOT6_TX"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D6 SDMMC_BOOT2_D6"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_TX"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D6"),</div><div class='ctx'> 		STM32_FUNCTION(12, "DSI_TE"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D6 SDMMC_BOOT1_D6"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D6"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D0"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_HSYNC"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(39, "PC7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC7"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP4"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2"),</div><div class='del'>-		STM32_FUNCTION(5, "DFSDM_DATA3"),</div><div class='add'>+		STM32_FUNCTION(5, "DFSDM1_DATIN3"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2S3_MCK"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_RX USART_BOOT6_RX"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_D123DIR SDMMC_BOOT1_D123DIR"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D123DIR SDMMC_BOOT2_D123DIR"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D7 SDMMC_BOOT2_D7"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D7 SDMMC_BOOT1_D7"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_RX"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_D123DIR"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D123DIR"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D7"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D7"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D1"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G6"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(40, "PC8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC8"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(7, "UART4_TX"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_CK USART_BOOT6_CK"),</div><div class='del'>-		STM32_FUNCTION(9, "UART5_RTS UART_BOOT5_RTS"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D0 SDMMC_BOOT1_D0"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_CK"),</div><div class='add'>+		STM32_FUNCTION(9, "UART5_RTS UART5_DE"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D0"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(41, "PC9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC9"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C3_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2S_CKIN"),</div><div class='del'>-		STM32_FUNCTION(9, "UART5_CTS UART_BOOT5_CTS"),</div><div class='add'>+		STM32_FUNCTION(9, "UART5_CTS"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_BK1_IO0"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D1 SDMMC_BOOT1_D1"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D1"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D3"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(42, "PC10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC10"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED2"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK5"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN5"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_SCK I2S3_CK"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART3_TX"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_TX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_BK1_IO1"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D2 SDMMC_BOOT1_D2"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D2"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D8"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(43, "PC11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC11"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED3"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA5"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN5"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_MISO I2S3_SDI"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART3_RX"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK2_NCS QUADSPI_BOOTBK2_NCS"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK2_NCS"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_SCK_B"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_D3 SDMMC_BOOT1_D3"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_D3"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(44, "PC12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC12"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACECLK"),</div><div class='ctx'> 		STM32_FUNCTION(2, "MCO2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI4_D3"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SPI3_MOSI I2S3_SDO"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_CK USART_BOOT3_CK"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_CK"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART5_TX"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_SD_B"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_CK SDMMC_BOOT1_CK"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_CK"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D9"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(45, "PC13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC13"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(46, "PC14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC14"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(47, "PC15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOC15"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(48, "PD0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SDA"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK6"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN6"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_SCK_A"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_RX"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_CMD"),</div><div class='del'>-		STM32_FUNCTION(12, "DFSDM_DATA7"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D2"),</div><div class='add'>+		STM32_FUNCTION(12, "DFSDM1_DATIN7"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D2 FMC_DA2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(49, "PD1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SCL"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA6"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN6"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_SD_A"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_TX"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_D0"),</div><div class='del'>-		STM32_FUNCTION(12, "DFSDM_CK7"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D3"),</div><div class='add'>+		STM32_FUNCTION(12, "DFSDM1_CKIN7"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D3 FMC_DA3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(50, "PD2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(7, "UART4_RX"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART5_RX"),</div><div class='del'>-		STM32_FUNCTION(13, "SDMMC1_CMD SDMMC_BOOT1_CMD"),</div><div class='add'>+		STM32_FUNCTION(13, "SDMMC1_CMD"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D11"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(51, "PD3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD3"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP5"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CKOUT"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKOUT"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA0"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_CTS_NSS USART_BOOT2_CTS_NSS"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_D123DIR SDMMC_BOOT1_D123DIR"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D7 SDMMC_BOOT2_D7"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_D123DIR SDMMC_BOOT2_D123DIR"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_D7 SDMMC_BOOT1_D7"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN0"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_CTS USART2_NSS"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_D123DIR"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D7"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_D123DIR"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_D7"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D5"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(52, "PD4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD4"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_FS_A"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_RTS USART_BOOT2_RTS"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RXFD"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_RTS USART2_DE"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_D1"),</div><div class='del'>-		STM32_FUNCTION(12, "DFSDM_CK0"),</div><div class='add'>+		STM32_FUNCTION(12, "DFSDM1_CKIN0"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NOE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(53, "PD5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD5"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART2_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TXFD"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_D2"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NWE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(54, "PD6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD6"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D1"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK4"),</div><div class='del'>-		STM32_FUNCTION(5, "DFSDM_DATA1"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN4"),</div><div class='add'>+		STM32_FUNCTION(5, "DFSDM1_DATIN1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI3_MOSI I2S3_SDO"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SD_A"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART2_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_RXFD"),</div><div class='del'>-		STM32_FUNCTION(11, "FMC_INT"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NWAIT"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D10"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(55, "PD7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD7"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED6"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA4"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN4"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SCL"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_CK1"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_CK USART_BOOT2_CK"),</div><div class='del'>-		STM32_FUNCTION(10, "SPDIF_IN0"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_CKIN1"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_CK"),</div><div class='add'>+		STM32_FUNCTION(10, "SPDIFRX_IN0"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_D3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NE1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(56, "PD8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD8"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK3"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN3"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_SCK_B"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART3_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "SPDIF_IN1"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D13"),</div><div class='add'>+		STM32_FUNCTION(10, "SPDIFRX_IN1"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D13 FMC_DA13"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(57, "PD9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD9"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA3"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN3"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_SD_B"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART3_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_RXFD"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D14"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D14 FMC_DA14"),</div><div class='add'>+		STM32_FUNCTION(14, "DCMI_HSYNC"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(58, "PD10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD10"),</div><div class='ctx'> 		STM32_FUNCTION(1, "RTC_REFIN"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_BKIN"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CKOUT"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKOUT"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI3_MISO I2S3_SDI"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_FS_B"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_CK USART_BOOT3_CK"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN2_TXFD"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D15"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_CK"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D15 FMC_DA15"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(59, "PD11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD11"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM2_IN2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2C1_SMBA"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_CTS_NSS USART_BOOT3_CTS_NSS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_CTS USART3_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_BK1_IO0"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SD_A"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_A16 FMC_CLE"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_CLE FMC_A16"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(60, "PD12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD12"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_IN1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(4, "LPTIM2_IN1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2C1_SCL"),</div><div class='del'>-		STM32_FUNCTION(8, "USART3_RTS USART_BOOT3_RTS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART3_RTS USART3_DE"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_BK1_IO1"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_FS_A"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_A17 FMC_ALE"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_ALE FMC_A17"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(61, "PD13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD13"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_OUT"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2C1_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2S3_MCK"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK1_IO3 QUADSPI_BOOTBK1_IO3"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK1_IO3"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SCK_A"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A18"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DSI_TE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(62, "PD14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD14"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D0"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_CTS"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D0 FMC_DA0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(63, "PD15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOD15"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_MCLK_A"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D1"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_CTS"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D1 FMC_DA1"),</div><div class='add'>+		STM32_FUNCTION(15, "LCD_R1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(64, "PE0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE0"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM4_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(5, "LPTIM2_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI3_SCK I2S3_CK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI4_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_RX UART_BOOT8_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RXFD"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_RX"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_MCLK_A"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NBL0"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(65, "PE1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE1"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_IN2"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2S2_MCK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI3_SD_B"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_TX UART_BOOT8_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TXFD"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_TX"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NBL1"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(66, "PE2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE2"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACECLK"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_CK1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_SCK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_MCLK_A"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK1_IO2 QUADSPI_BOOTBK1_IO2"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD3 ETH_MII_TXD3 ETH_RGMII_TXD3"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK1_IO2"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD3 ETH1_MII_TXD3 ETH1_RGMII_TXD3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A23"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(67, "PE3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE3"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED0"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_BKIN"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SD_B"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_CK SDMMC_BOOT2_CK"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_CK"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A19"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(68, "PE4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE4"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D2"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA3"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN3"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_FS_A"),</div><div class='del'>-		STM32_FUNCTION(8, "SDMMC2_CKIN SDMMC_BOOT2_CKIN"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_CKIN SDMMC_BOOT1_CKIN"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D4 SDMMC_BOOT2_D4"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_D4 SDMMC_BOOT1_D4"),</div><div class='add'>+		STM32_FUNCTION(8, "SDMMC2_CKIN"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_CKIN"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D4"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_D4"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A20"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D4"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(69, "PE5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE5"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED3"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_CK2"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK3"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN3"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_MISO"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SCK_A"),</div><div class='del'>-		STM32_FUNCTION(8, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D6 SDMMC_BOOT2_D6"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_D6 SDMMC_BOOT1_D6"),</div><div class='add'>+		STM32_FUNCTION(8, "SDMMC2_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D6"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_D6"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A21"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D6"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(70, "PE6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE6"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED2"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_BKIN2"),</div><div class='hunk'>@@ -1030,7 +1093,7 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_MOSI"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SD_A"),</div><div class='ctx'> 		STM32_FUNCTION(8, "SDMMC2_D0"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_D2 SDMMC_BOOT1_D2"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_D2"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_MCLK_B"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A22"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D7"),</div><div class='hunk'>@@ -1038,119 +1101,132 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(71, "PE7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE7"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM3_ETR"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA2"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN2"),</div><div class='ctx'> 		STM32_FUNCTION(8, "UART7_RX"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK2_IO0 QUADSPI_BOOTBK2_IO0"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D4"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK2_IO0"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D4 FMC_DA4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(72, "PE8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE8"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1N"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK2"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN2"),</div><div class='ctx'> 		STM32_FUNCTION(8, "UART7_TX"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK2_IO1 QUADSPI_BOOTBK2_IO1"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D5"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK2_IO1"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D5 FMC_DA5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(73, "PE9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE9"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CKOUT"),</div><div class='del'>-		STM32_FUNCTION(8, "UART7_RTS UART_BOOT7_RTS"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK2_IO2 QUADSPI_BOOTBK2_IO2"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D6"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKOUT"),</div><div class='add'>+		STM32_FUNCTION(8, "UART7_RTS UART7_DE"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK2_IO2"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D6 FMC_DA6"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(74, "PE10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE10"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2N"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA4"),</div><div class='del'>-		STM32_FUNCTION(8, "UART7_CTS UART_BOOT7_CTS"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK2_IO3 QUADSPI_BOOTBK2_IO3"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D7"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN4"),</div><div class='add'>+		STM32_FUNCTION(8, "UART7_CTS"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK2_IO3"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D7 FMC_DA7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(75, "PE11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE11"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK4"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN4"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_NSS"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_CK USART_BOOT6_CK"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_CK"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SD_B"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D8"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D8 FMC_DA8"),</div><div class='add'>+		STM32_FUNCTION(14, "DCMI_D4"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(76, "PE12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE12"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3N"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA5"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN5"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_SCK"),</div><div class='del'>-		STM32_FUNCTION(9, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(9, "SDMMC1_D0DIR"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SCK_B"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D9"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D9 FMC_DA9"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(77, "PE13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE13"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP2"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK5"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN5"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_MISO"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_FS_B"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D10"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D10 FMC_DA10"),</div><div class='add'>+		STM32_FUNCTION(14, "DCMI_D6"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_DE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(78, "PE14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE14"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI4_MOSI"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_RTS UART_BOOT8_RTS"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_RTS UART8_DE"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_D123DIR SDMMC_BOOT1_D123DIR"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D11"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_D123DIR"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D11 FMC_DA11"),</div><div class='ctx'> 		STM32_FUNCTION(14, "LCD_G0"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(79, "PE15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOE15"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP3"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_BKIN"),</div><div class='ctx'> 		STM32_FUNCTION(5, "TIM15_BKIN"),</div><div class='del'>-		STM32_FUNCTION(8, "USART2_CTS_NSS USART_BOOT2_CTS_NSS"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_D12"),</div><div class='add'>+		STM32_FUNCTION(8, "USART2_CTS USART2_NSS"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_CTS"),</div><div class='add'>+		STM32_FUNCTION(11, "FMC_NCE2"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_D12 FMC_DA12"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(80, "PF0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF0"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(10, "SDMMC3_D0"),</div><div class='hunk'>@@ -1159,8 +1235,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(81, "PF1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(10, "SDMMC3_CMD"),</div><div class='hunk'>@@ -1169,27 +1246,30 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(82, "PF2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SMBA"),</div><div class='del'>-		STM32_FUNCTION(10, "SDMMC2_D0DIR SDMMC_BOOT2_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(10, "SDMMC2_D0DIR"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_D0DIR"),</div><div class='del'>-		STM32_FUNCTION(12, "SDMMC1_D0DIR SDMMC_BOOT1_D0DIR"),</div><div class='add'>+		STM32_FUNCTION(12, "SDMMC1_D0DIR"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(83, "PF3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF3"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TX_ER ETH_MII_TX_ER"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TX_ER ETH1_MII_TX_ER"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(84, "PF4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF4"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART2_RX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "SDMMC3_D1"),</div><div class='hunk'>@@ -1198,8 +1278,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(85, "PF5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF5"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART2_TX"),</div><div class='ctx'> 		STM32_FUNCTION(10, "SDMMC3_D2"),</div><div class='hunk'>@@ -1207,71 +1288,77 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(86, "PF6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF6"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SD_B"),</div><div class='del'>-		STM32_FUNCTION(8, "UART7_RX UART_BOOT7_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK1_IO3 QUADSPI_BOOTBK1_IO3"),</div><div class='add'>+		STM32_FUNCTION(8, "UART7_RX"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK1_IO3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_SCK_B"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(87, "PF7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF7"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM17_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_SCK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(8, "UART7_TX UART_BOOT7_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK1_IO2 QUADSPI_BOOTBK1_IO2"),</div><div class='add'>+		STM32_FUNCTION(8, "UART7_TX"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK1_IO2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(88, "PF8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF8"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED12"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_MISO"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SCK_B"),</div><div class='del'>-		STM32_FUNCTION(8, "UART7_RTS UART_BOOT7_RTS"),</div><div class='add'>+		STM32_FUNCTION(8, "UART7_RTS UART7_DE"),</div><div class='ctx'> 		STM32_FUNCTION(10, "TIM13_CH1"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK1_IO0 QUADSPI_BOOTBK1_IO0"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK1_IO0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(89, "PF9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF9"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED13"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM17_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_MOSI"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_FS_B"),</div><div class='del'>-		STM32_FUNCTION(8, "UART7_CTS UART_BOOT7_CTS"),</div><div class='add'>+		STM32_FUNCTION(8, "UART7_CTS"),</div><div class='ctx'> 		STM32_FUNCTION(10, "TIM14_CH1"),</div><div class='del'>-		STM32_FUNCTION(11, "QUADSPI_BK1_IO1 QUADSPI_BOOTBK1_IO1"),</div><div class='add'>+		STM32_FUNCTION(11, "QUADSPI_BK1_IO1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(90, "PF10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF10"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM16_BKIN"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "SAI4_D4"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_D4"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_CLK QUADSPI_BOOTCLK"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(13, "SAI4_D3"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D11"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_DE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(91, "PF11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF11"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_MOSI"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SD_B"),</div><div class='hunk'>@@ -1280,138 +1367,151 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(92, "PF12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF12"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED4"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD4"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD4"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A6"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(93, "PF13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF13"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED5"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA6"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN6"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2C1_SMBA"),</div><div class='del'>-		STM32_FUNCTION(7, "DFSDM_DATA3"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD5"),</div><div class='add'>+		STM32_FUNCTION(7, "DFSDM1_DATIN3"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD5"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(94, "PF14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF14"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED6"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK6"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN6"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2C1_SCL"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD6"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD6"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A8"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(95, "PF15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOF15"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED7"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2C1_SDA"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD7"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD7"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A9"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(96, "PG0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG0"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED0"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_DATA0"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD4"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_DATIN0"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD4"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A10"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(97, "PG1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG1"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED1"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD5"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD5"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A11"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(98, "PG2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG2"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED2"),</div><div class='ctx'> 		STM32_FUNCTION(2, "MCO2"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_BKIN"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD6"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD6"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A12"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(99, "PG3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG3"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_BKIN2"),</div><div class='del'>-		STM32_FUNCTION(5, "DFSDM_CK1"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD7"),</div><div class='add'>+		STM32_FUNCTION(5, "DFSDM1_CKIN1"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD7"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A13"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(100, "PG4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG4"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_BKIN2"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_GTX_CLK ETH_RGMII_GTX_CLK"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_GTX_CLK ETH1_RGMII_GTX_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A14"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(101, "PG5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG5"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_ETR"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_CLK125 ETH_RGMII_CLK125"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_CLK125 ETH1_RGMII_CLK125"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A15"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(102, "PG6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG6"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED14"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM17_BKIN"),</div><div class='del'>-		STM32_FUNCTION(11, "SDMMC2_CMD SDMMC_BOOT2_CMD"),</div><div class='add'>+		STM32_FUNCTION(11, "SDMMC2_CMD"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D12"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(103, "PG7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG7"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED5"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_MCLK_A"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_CK USART_BOOT6_CK"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_RTS UART_BOOT8_RTS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_CK"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_RTS UART8_DE"),</div><div class='ctx'> 		STM32_FUNCTION(10, "QUADSPI_CLK"),</div><div class='del'>-		STM32_FUNCTION(12, "QUADSPI_BK2_IO3 QUADSPI_BOOTBK2_IO3"),</div><div class='add'>+		STM32_FUNCTION(12, "QUADSPI_BK2_IO3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_INT"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D13"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(104, "PG8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG8"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED15"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM2_CH1 TIM2_ETR"),</div><div class='hunk'>@@ -1419,73 +1519,79 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI6_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI4_D2"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_RTS USART_BOOT6_RTS"),</div><div class='del'>-		STM32_FUNCTION(9, "USART3_RTS"),</div><div class='del'>-		STM32_FUNCTION(10, "SPDIF_IN2"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_RTS USART6_DE"),</div><div class='add'>+		STM32_FUNCTION(9, "USART3_RTS USART3_DE"),</div><div class='add'>+		STM32_FUNCTION(10, "SPDIFRX_IN2"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_FS_A"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_PPS_OUT"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_PPS_OUT"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G7"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(105, "PG9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG9"),</div><div class='ctx'> 		STM32_FUNCTION(1, "DBTRGO"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART6_RX"),</div><div class='del'>-		STM32_FUNCTION(9, "SPDIF_IN3"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK2_IO2 QUADSPI_BOOTBK2_IO2"),</div><div class='add'>+		STM32_FUNCTION(9, "SPDIFRX_IN3"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK2_IO2"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_FS_B"),</div><div class='del'>-		STM32_FUNCTION(13, "FMC_NE2 FMC_NCE"),</div><div class='add'>+		STM32_FUNCTION(13, "FMC_NCE FMC_NE2"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_VSYNC"),</div><div class='add'>+		STM32_FUNCTION(15, "LCD_R1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(106, "PG10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG10"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED10"),</div><div class='del'>-		STM32_FUNCTION(9, "UART8_CTS UART_BOOT8_CTS"),</div><div class='add'>+		STM32_FUNCTION(9, "UART8_CTS"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_G3"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SD_B"),</div><div class='del'>-		STM32_FUNCTION(12, "QUADSPI_BK2_IO2 QUADSPI_BOOTBK2_IO2"),</div><div class='add'>+		STM32_FUNCTION(12, "QUADSPI_BK2_IO2"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NE3"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D2"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(107, "PG11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG11"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED11"),</div><div class='ctx'> 		STM32_FUNCTION(5, "USART1_TX"),</div><div class='del'>-		STM32_FUNCTION(7, "UART4_TX UART_BOOT4_TX"),</div><div class='del'>-		STM32_FUNCTION(9, "SPDIF_IN0"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TX_EN ETH_MII_TX_EN ETH_RGMII_TX_CTL ETH_RMII_TX_EN"),</div><div class='add'>+		STM32_FUNCTION(7, "UART4_TX"),</div><div class='add'>+		STM32_FUNCTION(9, "SPDIFRX_IN0"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TX_EN ETH1_MII_TX_EN ETH1_RGMII_TX_CTL ETH1_RMII_TX_EN"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D3"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(108, "PG12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG12"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_IN1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI6_MISO"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI4_CK2"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_RTS USART_BOOT6_RTS"),</div><div class='del'>-		STM32_FUNCTION(9, "SPDIF_IN1"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_RTS USART6_DE"),</div><div class='add'>+		STM32_FUNCTION(9, "SPDIFRX_IN1"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_B4"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_SCK_A"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_PHY_INTN"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_PHY_INTN"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_NE4"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(109, "PG13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG13"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED0"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_OUT"),</div><div class='hunk'>@@ -1493,79 +1599,86 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(5, "SAI4_CK1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI6_SCK"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_SCK_A"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_CTS_NSS USART_BOOT6_CTS_NSS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_CTS USART6_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_MCLK_A"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD0 ETH_MII_TXD0 ETH_RGMII_TXD0 ETH_RMII_TXD0"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD0 ETH1_MII_TXD0 ETH1_RGMII_TXD0 ETH1_RMII_TXD0"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A24"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(110, "PG14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG14"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED1"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI6_MOSI"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI4_D1"),</div><div class='ctx'> 		STM32_FUNCTION(8, "USART6_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK2_IO3 QUADSPI_BOOTBK2_IO3"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK2_IO3"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI4_SD_A"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_TXD1 ETH_MII_TXD1 ETH_RGMII_TXD1 ETH_RMII_TXD1"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_TXD1 ETH1_MII_TXD1 ETH1_RGMII_TXD1 ETH1_RMII_TXD1"),</div><div class='ctx'> 		STM32_FUNCTION(13, "FMC_A25"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(111, "PG15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOG15"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED7"),</div><div class='ctx'> 		STM32_FUNCTION(3, "SAI1_D2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(7, "SAI1_FS_A"),</div><div class='del'>-		STM32_FUNCTION(8, "USART6_CTS_NSS USART_BOOT6_CTS_NSS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART6_CTS USART6_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SDMMC3_CK"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D13"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(112, "PH0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(113, "PH1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC | STM32MP_PKG_AB | STM32MP_PKG_AD,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(114, "PH2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH2"),</div><div class='ctx'> 		STM32_FUNCTION(2, "LPTIM1_IN2"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK2_IO0 QUADSPI_BOOTBK2_IO0"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK2_IO0"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SCK_B"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_CRS ETH_MII_CRS"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_CRS ETH1_MII_CRS"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(115, "PH3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH3"),</div><div class='del'>-		STM32_FUNCTION(4, "DFSDM_CK4"),</div><div class='del'>-		STM32_FUNCTION(10, "QUADSPI_BK2_IO1 QUADSPI_BOOTBK2_IO1"),</div><div class='add'>+		STM32_FUNCTION(4, "DFSDM1_CKIN4"),</div><div class='add'>+		STM32_FUNCTION(10, "QUADSPI_BK2_IO1"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_MCLK_B"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_COL ETH_MII_COL"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_COL ETH1_MII_COL"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(116, "PH4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH4"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_G5"),</div><div class='hunk'>@@ -1573,8 +1686,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(117, "PH5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH5"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_NSS"),</div><div class='hunk'>@@ -1582,31 +1696,34 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(118, "PH6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH6"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM12_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C2_SMBA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_SCK"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD2 ETH_MII_RXD2 ETH_RGMII_RXD2"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD2 ETH1_MII_RXD2 ETH1_RGMII_RXD2"),</div><div class='ctx'> 		STM32_FUNCTION(13, "MDIOS_MDIO"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D8"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(119, "PH7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH7"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C3_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI5_MISO"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RXD3 ETH_MII_RXD3 ETH_RGMII_RXD3"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RXD3 ETH1_MII_RXD3 ETH1_RGMII_RXD3"),</div><div class='ctx'> 		STM32_FUNCTION(13, "MDIOS_MDC"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D9"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(120, "PH8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH8"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C3_SDA"),</div><div class='hunk'>@@ -1615,8 +1732,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(121, "PH9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH9"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM12_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C3_SMBA"),</div><div class='hunk'>@@ -1625,8 +1743,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(122, "PH10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH10"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SMBA"),</div><div class='hunk'>@@ -1636,8 +1755,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(123, "PH11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH11"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C4_SCL"),</div><div class='hunk'>@@ -1647,8 +1767,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(124, "PH12"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH12"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH3"),</div><div class='hunk'>@@ -1659,50 +1780,53 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(125, "PH13"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH13"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_TX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_TX"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(126, "PH14"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH14"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2N"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_RX"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D4"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(127, "PH15"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOH15"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH3N"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_TXFD"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D11"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(128, "PI0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "TIM5_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_NSS I2S2_WS"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RXFD"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DCMI_D13"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_G5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(129, "PI1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI1"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_BKIN2"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_SCK I2S2_CK"),</div><div class='hunk'>@@ -1711,8 +1835,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(130, "PI2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI2"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH4"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MISO I2S2_SDI"),</div><div class='hunk'>@@ -1721,8 +1846,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(131, "PI3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI3"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_ETR"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI2_MOSI I2S2_SDO"),</div><div class='hunk'>@@ -1730,8 +1856,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(132, "PI4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI4"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_BKIN"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_MCLK_A"),</div><div class='hunk'>@@ -1740,8 +1867,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(133, "PI5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI5"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH1"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SCK_A"),</div><div class='hunk'>@@ -1750,8 +1878,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(134, "PI6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI6"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_SD_A"),</div><div class='hunk'>@@ -1760,8 +1889,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(135, "PI7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI7"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH3"),</div><div class='ctx'> 		STM32_FUNCTION(11, "SAI2_FS_A"),</div><div class='hunk'>@@ -1770,35 +1900,38 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(136, "PI8"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI8"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(137, "PI9"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI9"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP1"),</div><div class='ctx'> 		STM32_FUNCTION(9, "UART4_RX"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RX"),</div><div class='add'>+		STM32_FUNCTION(10, "FDCAN1_RX"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_VSYNC"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(138, "PI10"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI10"),</div><div class='ctx'> 		STM32_FUNCTION(1, "HDP0"),</div><div class='del'>-		STM32_FUNCTION(9, "USART3_CTS_NSS USART_BOOT3_CTS_NSS"),</div><div class='del'>-		STM32_FUNCTION(10, "CAN1_RXFD"),</div><div class='del'>-		STM32_FUNCTION(12, "ETH_GMII_RX_ER ETH_MII_RX_ER"),</div><div class='add'>+		STM32_FUNCTION(9, "USART3_CTS USART3_NSS"),</div><div class='add'>+		STM32_FUNCTION(12, "ETH1_GMII_RX_ER ETH1_MII_RX_ER"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_HSYNC"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(139, "PI11"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI11"),</div><div class='ctx'> 		STM32_FUNCTION(1, "MCO1"),</div><div class='ctx'> 		STM32_FUNCTION(6, "I2S_CKIN"),</div><div class='hunk'>@@ -1806,8 +1939,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(140, "PI12"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI12"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "HDP0"),</div><div class='hunk'>@@ -1815,8 +1949,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(141, "PI13"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI13"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "HDP1"),</div><div class='hunk'>@@ -1824,24 +1959,27 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(142, "PI14"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI14"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACECLK"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_CLK"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(143, "PI15"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOI15"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_G2"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(144, "PJ0"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ0"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED8"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_R7"),</div><div class='hunk'>@@ -1849,16 +1987,18 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(145, "PJ1"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ1"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED9"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(146, "PJ2"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ2"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED10"),</div><div class='ctx'> 		STM32_FUNCTION(14, "DSI_TE"),</div><div class='hunk'>@@ -1866,24 +2006,27 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(147, "PJ3"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ3"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED11"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(148, "PJ4"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ4"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED12"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_R5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(149, "PJ5"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ5"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "HDP2"),</div><div class='hunk'>@@ -1891,8 +2034,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(150, "PJ6"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ6"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED3"),</div><div class='ctx'> 		STM32_FUNCTION(3, "HDP3"),</div><div class='hunk'>@@ -1901,8 +2045,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(151, "PJ7"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ7"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED13"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2N"),</div><div class='hunk'>@@ -1910,8 +2055,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(152, "PJ8"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ8"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED14"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3N"),</div><div class='hunk'>@@ -1921,8 +2067,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(153, "PJ9"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ9"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED15"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH3"),</div><div class='hunk'>@@ -1932,8 +2079,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(154, "PJ10"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ10"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2N"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2"),</div><div class='hunk'>@@ -1942,8 +2090,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(155, "PJ11"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ11"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH2"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH2N"),</div><div class='hunk'>@@ -1952,38 +2101,43 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(156, "PJ12"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ12"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_G3"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B0"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(157, "PJ13"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ13"),</div><div class='ctx'> 		STM32_FUNCTION(10, "LCD_G4"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B1"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(158, "PJ14"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ14"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B2"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(159, "PJ15"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOJ15"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B3"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(160, "PK0"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK0"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1N"),</div><div class='ctx'> 		STM32_FUNCTION(4, "TIM8_CH3"),</div><div class='hunk'>@@ -1992,8 +2146,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(161, "PK1"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK1"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED4"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_CH1"),</div><div class='hunk'>@@ -2004,8 +2159,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(162, "PK2"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK2"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED5"),</div><div class='ctx'> 		STM32_FUNCTION(2, "TIM1_BKIN"),</div><div class='hunk'>@@ -2015,22 +2171,25 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(163, "PK3"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK3"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B4"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(164, "PK4"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK4"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_B5"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(165, "PK5"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK5"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED6"),</div><div class='ctx'> 		STM32_FUNCTION(3, "HDP6"),</div><div class='hunk'>@@ -2038,8 +2197,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(166, "PK6"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK6"),</div><div class='ctx'> 		STM32_FUNCTION(1, "TRACED7"),</div><div class='ctx'> 		STM32_FUNCTION(3, "HDP7"),</div><div class='hunk'>@@ -2047,8 +2207,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(167, "PK7"),</div><div class='add'>+		STM32MP_PKG_AA,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOK7"),</div><div class='ctx'> 		STM32_FUNCTION(15, "LCD_DE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='hunk'>@@ -2057,8 +2218,9 @@ static const struct stm32_desc_pin stm32mp157_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct stm32_desc_pin stm32mp157_z_pins[] = {</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(400, "PZ0"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ0"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SCL"),</div><div class='hunk'>@@ -2068,8 +2230,9 @@ static const struct stm32_desc_pin stm32mp157_z_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(401, "PZ1"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ1"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SDA"),</div><div class='hunk'>@@ -2081,8 +2244,9 @@ static const struct stm32_desc_pin stm32mp157_z_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(402, "PZ2"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ2"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SCL"),</div><div class='hunk'>@@ -2094,21 +2258,23 @@ static const struct stm32_desc_pin stm32mp157_z_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(403, "PZ3"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ3"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(6, "SPI1_NSS I2S1_WS"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SDA"),</div><div class='del'>-		STM32_FUNCTION(8, "USART1_CTS_NSS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART1_CTS USART1_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(9, "SPI6_NSS"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(404, "PZ4"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ4"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SCL"),</div><div class='hunk'>@@ -2117,19 +2283,21 @@ static const struct stm32_desc_pin stm32mp157_z_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(405, "PZ5"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ5"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(5, "I2C5_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(7, "I2C4_SDA"),</div><div class='del'>-		STM32_FUNCTION(8, "USART1_RTS"),</div><div class='add'>+		STM32_FUNCTION(8, "USART1_RTS USART1_DE"),</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(406, "PZ6"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ6"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SCL"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SCL"),</div><div class='hunk'>@@ -2140,8 +2308,9 @@ static const struct stm32_desc_pin stm32mp157_z_pins[] = {</div><div class='ctx'> 		STM32_FUNCTION(16, "EVENTOUT"),</div><div class='ctx'> 		STM32_FUNCTION(17, "ANALOG")</div><div class='ctx'> 	),</div><div class='del'>-	STM32_PIN(</div><div class='add'>+	STM32_PIN_PKG(</div><div class='ctx'> 		PINCTRL_PIN(407, "PZ7"),</div><div class='add'>+		STM32MP_PKG_AA | STM32MP_PKG_AC,</div><div class='ctx'> 		STM32_FUNCTION(0, "GPIOZ7"),</div><div class='ctx'> 		STM32_FUNCTION(3, "I2C6_SDA"),</div><div class='ctx'> 		STM32_FUNCTION(4, "I2C2_SDA"),</div><div class='head'>diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig<br/>index a731fc966b63..9093a420d310 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sunxi/Kconfig</a></div><div class='hunk'>@@ -11,82 +11,101 @@ config PINCTRL_SUNIV_F1C100S</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN4I_A10</div><div class='del'>-	def_bool MACH_SUN4I || MACH_SUN7I || MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner A10, A20 and R40 PIO"</div><div class='add'>+	default MACH_SUN4I || MACH_SUN7I || MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN5I</div><div class='del'>-	def_bool MACH_SUN5I</div><div class='add'>+	bool "Support for the Allwinner A10s, A13, R8 and NextThing GR8 PIO"</div><div class='add'>+	default MACH_SUN5I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN6I_A31</div><div class='del'>-	def_bool MACH_SUN6I</div><div class='add'>+	bool "Support for the Allwinner A31 PIO"</div><div class='add'>+	default MACH_SUN6I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN6I_A31_R</div><div class='del'>-	def_bool MACH_SUN6I</div><div class='add'>+	bool "Support for the Allwinner A31 R-PIO"</div><div class='add'>+	default MACH_SUN6I</div><div class='ctx'> 	depends on RESET_CONTROLLER</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_A23</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner A23 PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_A33</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner A33 PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_A83T</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner A83T PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_A83T_R</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner A83T R-PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_A23_R</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner A23 and A33 R-PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	depends on RESET_CONTROLLER</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_H3</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner H3 PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_H3_R</div><div class='del'>-	def_bool MACH_SUN8I || (ARM64 &amp;&amp; ARCH_SUNXI)</div><div class='add'>+	bool "Support for the Allwinner H3 and H5 R-PIO"</div><div class='add'>+	default MACH_SUN8I || (ARM64 &amp;&amp; ARCH_SUNXI)</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN8I_V3S</div><div class='del'>-	def_bool MACH_SUN8I</div><div class='add'>+	bool "Support for the Allwinner V3s PIO"</div><div class='add'>+	default MACH_SUN8I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN9I_A80</div><div class='del'>-	def_bool MACH_SUN9I</div><div class='add'>+	bool "Support for the Allwinner A80 PIO"</div><div class='add'>+	default MACH_SUN9I</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN9I_A80_R</div><div class='del'>-	def_bool MACH_SUN9I</div><div class='add'>+	bool "Support for the Allwinner A80 R-PIO"</div><div class='add'>+	default MACH_SUN9I</div><div class='ctx'> 	depends on RESET_CONTROLLER</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN50I_A64</div><div class='del'>-	def_bool ARM64 &amp;&amp; ARCH_SUNXI</div><div class='add'>+	bool "Support for the Allwinner A64 PIO"</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_SUNXI</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN50I_A64_R</div><div class='del'>-	def_bool ARM64 &amp;&amp; ARCH_SUNXI</div><div class='add'>+	bool "Support for the Allwinner A64 R-PIO"</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_SUNXI</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN50I_H5</div><div class='del'>-	def_bool ARM64 &amp;&amp; ARCH_SUNXI</div><div class='add'>+	bool "Support for the Allwinner H5 PIO"</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_SUNXI</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN50I_H6</div><div class='del'>-	def_bool ARM64 &amp;&amp; ARCH_SUNXI</div><div class='add'>+	bool "Support for the Allwinner H6 PIO"</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_SUNXI</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> config PINCTRL_SUN50I_H6_R</div><div class='del'>-	def_bool ARM64 &amp;&amp; ARCH_SUNXI</div><div class='add'>+	bool "Support for the Allwinner H6 R-PIO"</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_SUNXI</div><div class='ctx'> 	select PINCTRL_SUNXI</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c<br/>index ef4268cc6227..3cc1121589c9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c</a></div><div class='hunk'>@@ -591,6 +591,7 @@ static const struct sunxi_pinctrl_desc h6_pinctrl_data = {</div><div class='ctx'> 	.irq_banks = 4,</div><div class='ctx'> 	.irq_bank_map = h6_irq_bank_map,</div><div class='ctx'> 	.irq_read_needs_mux = true,</div><div class='add'>+	.io_bias_cfg_variant = BIAS_VOLTAGE_PIO_POW_MODE_SEL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int h6_pinctrl_probe(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c<br/>index e05dd9a5551d..a191a65217ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ static const struct sunxi_pinctrl_desc sun9i_a80_r_pinctrl_data = {</div><div class='ctx'> 	.pin_base = PL_BASE,</div><div class='ctx'> 	.irq_banks = 2,</div><div class='ctx'> 	.disable_strict_mode = true,</div><div class='del'>-	.has_io_bias_cfg = true,</div><div class='add'>+	.io_bias_cfg_variant = BIAS_VOLTAGE_GRP_CONFIG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int sun9i_a80_r_pinctrl_probe(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c<br/>index da37d594a13d..0633a03d5e13 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c</a></div><div class='hunk'>@@ -722,7 +722,7 @@ static const struct sunxi_pinctrl_desc sun9i_a80_pinctrl_data = {</div><div class='ctx'> 	.npins = ARRAY_SIZE(sun9i_a80_pins),</div><div class='ctx'> 	.irq_banks = 5,</div><div class='ctx'> 	.disable_strict_mode = true,</div><div class='del'>-	.has_io_bias_cfg = true,</div><div class='add'>+	.io_bias_cfg_variant = BIAS_VOLTAGE_GRP_CONFIG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int sun9i_a80_pinctrl_probe(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c<br/>index 8dd25caea2cf..0cbca30b75dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sunxi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sunxi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sunxi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sunxi/pinctrl-sunxi.c</a></div><div class='hunk'>@@ -530,14 +530,10 @@ static int sunxi_pconf_group_get(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	return sunxi_pconf_get(pctldev, g-&gt;pin, config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,</div><div class='del'>-				 unsigned group,</div><div class='del'>-				 unsigned long *configs,</div><div class='del'>-				 unsigned num_configs)</div><div class='add'>+static int sunxi_pconf_set(struct pinctrl_dev *pctldev, unsigned pin,</div><div class='add'>+			   unsigned long *configs, unsigned num_configs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);</div><div class='del'>-	struct sunxi_pinctrl_group *g = &amp;pctl-&gt;groups[group];</div><div class='del'>-	unsigned pin = g-&gt;pin - pctl-&gt;desc-&gt;pin_base;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_configs; i++) {</div><div class='hunk'>@@ -596,9 +592,20 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group,</div><div class='add'>+				 unsigned long *configs, unsigned num_configs)</div><div class='add'>+{</div><div class='add'>+	struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);</div><div class='add'>+	struct sunxi_pinctrl_group *g = &amp;pctl-&gt;groups[group];</div><div class='add'>+</div><div class='add'>+	/* We only support 1 pin per group. Chain it to the pin callback */</div><div class='add'>+	return sunxi_pconf_set(pctldev, g-&gt;pin, configs, num_configs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct pinconf_ops sunxi_pconf_ops = {</div><div class='ctx'> 	.is_generic		= true,</div><div class='ctx'> 	.pin_config_get		= sunxi_pconf_get,</div><div class='add'>+	.pin_config_set		= sunxi_pconf_set,</div><div class='ctx'> 	.pin_config_group_get	= sunxi_pconf_group_get,</div><div class='ctx'> 	.pin_config_group_set	= sunxi_pconf_group_set,</div><div class='ctx'> };</div><div class='hunk'>@@ -607,10 +614,12 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl,</div><div class='ctx'> 					 unsigned pin,</div><div class='ctx'> 					 struct regulator *supply)</div><div class='ctx'> {</div><div class='add'>+	unsigned short bank = pin / PINS_PER_BANK;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	u32 val, reg;</div><div class='ctx'> 	int uV;</div><div class='ctx'> </div><div class='del'>-	if (!pctl-&gt;desc-&gt;has_io_bias_cfg)</div><div class='add'>+	if (!pctl-&gt;desc-&gt;io_bias_cfg_variant)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	uV = regulator_get_voltage(supply);</div><div class='hunk'>@@ -621,25 +630,41 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl,</div><div class='ctx'> 	if (uV == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* Configured value must be equal or greater to actual voltage */</div><div class='del'>-	if (uV &lt;= 1800000)</div><div class='del'>-		val = 0x0; /* 1.8V */</div><div class='del'>-	else if (uV &lt;= 2500000)</div><div class='del'>-		val = 0x6; /* 2.5V */</div><div class='del'>-	else if (uV &lt;= 2800000)</div><div class='del'>-		val = 0x9; /* 2.8V */</div><div class='del'>-	else if (uV &lt;= 3000000)</div><div class='del'>-		val = 0xA; /* 3.0V */</div><div class='del'>-	else</div><div class='del'>-		val = 0xD; /* 3.3V */</div><div class='del'>-</div><div class='del'>-	pin -= pctl-&gt;desc-&gt;pin_base;</div><div class='del'>-</div><div class='del'>-	reg = readl(pctl-&gt;membase + sunxi_grp_config_reg(pin));</div><div class='del'>-	reg &amp;= ~IO_BIAS_MASK;</div><div class='del'>-	writel(reg | val, pctl-&gt;membase + sunxi_grp_config_reg(pin));</div><div class='add'>+	switch (pctl-&gt;desc-&gt;io_bias_cfg_variant) {</div><div class='add'>+	case BIAS_VOLTAGE_GRP_CONFIG:</div><div class='add'>+		/*</div><div class='add'>+		 * Configured value must be equal or greater to actual</div><div class='add'>+		 * voltage.</div><div class='add'>+		 */</div><div class='add'>+		if (uV &lt;= 1800000)</div><div class='add'>+			val = 0x0; /* 1.8V */</div><div class='add'>+		else if (uV &lt;= 2500000)</div><div class='add'>+			val = 0x6; /* 2.5V */</div><div class='add'>+		else if (uV &lt;= 2800000)</div><div class='add'>+			val = 0x9; /* 2.8V */</div><div class='add'>+		else if (uV &lt;= 3000000)</div><div class='add'>+			val = 0xA; /* 3.0V */</div><div class='add'>+		else</div><div class='add'>+			val = 0xD; /* 3.3V */</div><div class='add'>+</div><div class='add'>+		pin -= pctl-&gt;desc-&gt;pin_base;</div><div class='add'>+</div><div class='add'>+		reg = readl(pctl-&gt;membase + sunxi_grp_config_reg(pin));</div><div class='add'>+		reg &amp;= ~IO_BIAS_MASK;</div><div class='add'>+		writel(reg | val, pctl-&gt;membase + sunxi_grp_config_reg(pin));</div><div class='add'>+		return 0;</div><div class='add'>+	case BIAS_VOLTAGE_PIO_POW_MODE_SEL:</div><div class='add'>+		val = uV &lt;= 1800000 ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+		raw_spin_lock_irqsave(&amp;pctl-&gt;lock, flags);</div><div class='add'>+		reg = readl(pctl-&gt;membase + PIO_POW_MOD_SEL_REG);</div><div class='add'>+		reg &amp;= ~(1 &lt;&lt; bank);</div><div class='add'>+		writel(reg | val &lt;&lt; bank, pctl-&gt;membase + PIO_POW_MOD_SEL_REG);</div><div class='add'>+		raw_spin_unlock_irqrestore(&amp;pctl-&gt;lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sunxi_pmx_get_funcs_cnt(struct pinctrl_dev *pctldev)</div><div class='hunk'>@@ -1443,16 +1468,17 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev,</div><div class='ctx'> </div><div class='ctx'> 	last_pin = pctl-&gt;desc-&gt;pins[pctl-&gt;desc-&gt;npins - 1].pin.number;</div><div class='ctx'> 	pctl-&gt;chip-&gt;owner = THIS_MODULE;</div><div class='del'>-	pctl-&gt;chip-&gt;request = gpiochip_generic_request,</div><div class='del'>-	pctl-&gt;chip-&gt;free = gpiochip_generic_free,</div><div class='del'>-	pctl-&gt;chip-&gt;direction_input = sunxi_pinctrl_gpio_direction_input,</div><div class='del'>-	pctl-&gt;chip-&gt;direction_output = sunxi_pinctrl_gpio_direction_output,</div><div class='del'>-	pctl-&gt;chip-&gt;get = sunxi_pinctrl_gpio_get,</div><div class='del'>-	pctl-&gt;chip-&gt;set = sunxi_pinctrl_gpio_set,</div><div class='del'>-	pctl-&gt;chip-&gt;of_xlate = sunxi_pinctrl_gpio_of_xlate,</div><div class='del'>-	pctl-&gt;chip-&gt;to_irq = sunxi_pinctrl_gpio_to_irq,</div><div class='del'>-	pctl-&gt;chip-&gt;of_gpio_n_cells = 3,</div><div class='del'>-	pctl-&gt;chip-&gt;can_sleep = false,</div><div class='add'>+	pctl-&gt;chip-&gt;request = gpiochip_generic_request;</div><div class='add'>+	pctl-&gt;chip-&gt;free = gpiochip_generic_free;</div><div class='add'>+	pctl-&gt;chip-&gt;set_config = gpiochip_generic_config;</div><div class='add'>+	pctl-&gt;chip-&gt;direction_input = sunxi_pinctrl_gpio_direction_input;</div><div class='add'>+	pctl-&gt;chip-&gt;direction_output = sunxi_pinctrl_gpio_direction_output;</div><div class='add'>+	pctl-&gt;chip-&gt;get = sunxi_pinctrl_gpio_get;</div><div class='add'>+	pctl-&gt;chip-&gt;set = sunxi_pinctrl_gpio_set;</div><div class='add'>+	pctl-&gt;chip-&gt;of_xlate = sunxi_pinctrl_gpio_of_xlate;</div><div class='add'>+	pctl-&gt;chip-&gt;to_irq = sunxi_pinctrl_gpio_to_irq;</div><div class='add'>+	pctl-&gt;chip-&gt;of_gpio_n_cells = 3;</div><div class='add'>+	pctl-&gt;chip-&gt;can_sleep = false;</div><div class='ctx'> 	pctl-&gt;chip-&gt;ngpio = round_up(last_pin, PINS_PER_BANK) -</div><div class='ctx'> 			    pctl-&gt;desc-&gt;pin_base;</div><div class='ctx'> 	pctl-&gt;chip-&gt;label = dev_name(&amp;pdev-&gt;dev);</div><div class='head'>diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.h b/drivers/pinctrl/sunxi/pinctrl-sunxi.h<br/>index ee15ab067b5f..44e30deeee38 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sunxi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/sunxi/pinctrl-sunxi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/sunxi/pinctrl-sunxi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/sunxi/pinctrl-sunxi.h</a></div><div class='hunk'>@@ -95,6 +95,22 @@</div><div class='ctx'> #define PINCTRL_SUN7I_A20	BIT(7)</div><div class='ctx'> #define PINCTRL_SUN8I_R40	BIT(8)</div><div class='ctx'> </div><div class='add'>+#define PIO_POW_MOD_SEL_REG	0x340</div><div class='add'>+</div><div class='add'>+enum sunxi_desc_bias_voltage {</div><div class='add'>+	BIAS_VOLTAGE_NONE,</div><div class='add'>+	/*</div><div class='add'>+	 * Bias voltage configuration is done through</div><div class='add'>+	 * Pn_GRP_CONFIG registers, as seen on A80 SoC.</div><div class='add'>+	 */</div><div class='add'>+	BIAS_VOLTAGE_GRP_CONFIG,</div><div class='add'>+	/*</div><div class='add'>+	 * Bias voltage is set through PIO_POW_MOD_SEL_REG</div><div class='add'>+	 * register, as seen on H6 SoC, for example.</div><div class='add'>+	 */</div><div class='add'>+	BIAS_VOLTAGE_PIO_POW_MODE_SEL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sunxi_desc_function {</div><div class='ctx'> 	unsigned long	variant;</div><div class='ctx'> 	const char	*name;</div><div class='hunk'>@@ -117,7 +133,7 @@ struct sunxi_pinctrl_desc {</div><div class='ctx'> 	const unsigned int		*irq_bank_map;</div><div class='ctx'> 	bool				irq_read_needs_mux;</div><div class='ctx'> 	bool				disable_strict_mode;</div><div class='del'>-	bool				has_io_bias_cfg;</div><div class='add'>+	enum sunxi_desc_bias_voltage	io_bias_cfg_variant;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sunxi_pinctrl_function {</div><div class='head'>diff --git a/drivers/pinctrl/zte/pinctrl-zx.c b/drivers/pinctrl/zte/pinctrl-zx.c<br/>index caa44dd2880a..3cb69309912b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/zte/pinctrl-zx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pinctrl/zte/pinctrl-zx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pinctrl/zte/pinctrl-zx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pinctrl/zte/pinctrl-zx.c</a></div><div class='hunk'>@@ -411,6 +411,7 @@ int zx_pinctrl_init(struct platform_device *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	zpctl-&gt;aux_base = of_iomap(np, 0);</div><div class='add'>+	of_node_put(np);</div><div class='ctx'> 	if (!zpctl-&gt;aux_base)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c<br/>index 900c7073c46f..2b8e8a01a739 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/platform/chrome/cros_ec_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/platform/chrome/cros_ec_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/platform/chrome/cros_ec_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/platform/chrome/cros_ec_debugfs.c</a></div><div class='hunk'>@@ -132,7 +132,7 @@ static int cros_ec_console_log_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	file-&gt;private_data = inode-&gt;i_private;</div><div class='ctx'> </div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='add'>+	return stream_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t cros_ec_console_log_read(struct file *file, char __user *buf,</div><div class='hunk'>@@ -440,7 +440,7 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)</div><div class='ctx'> </div><div class='ctx'> 	ret = cros_ec_create_pdinfo(debug_info);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto remove_debugfs;</div><div class='add'>+		goto remove_log;</div><div class='ctx'> </div><div class='ctx'> 	ec-&gt;debug_info = debug_info;</div><div class='ctx'> </div><div class='hunk'>@@ -448,6 +448,8 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+remove_log:</div><div class='add'>+	cros_ec_cleanup_console_log(debug_info);</div><div class='ctx'> remove_debugfs:</div><div class='ctx'> 	debugfs_remove_recursive(debug_info-&gt;dir);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -467,7 +469,8 @@ static int __maybe_unused cros_ec_debugfs_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cros_ec_dev *ec = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;ec-&gt;debug_info-&gt;log_poll_work);</div><div class='add'>+	if (ec-&gt;debug_info-&gt;log_buffer.buf)</div><div class='add'>+		cancel_delayed_work_sync(&amp;ec-&gt;debug_info-&gt;log_poll_work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -476,7 +479,8 @@ static int __maybe_unused cros_ec_debugfs_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cros_ec_dev *ec = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	schedule_delayed_work(&amp;ec-&gt;debug_info-&gt;log_poll_work, 0);</div><div class='add'>+	if (ec-&gt;debug_info-&gt;log_buffer.buf)</div><div class='add'>+		schedule_delayed_work(&amp;ec-&gt;debug_info-&gt;log_poll_work, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/platform/chrome/wilco_ec/mailbox.c b/drivers/platform/chrome/wilco_ec/mailbox.c<br/>index f6ff29a11f1a..14355668ddfa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/platform/chrome/wilco_ec/mailbox.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/platform/chrome/wilco_ec/mailbox.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/platform/chrome/wilco_ec/mailbox.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/platform/chrome/wilco_ec/mailbox.c</a></div><div class='hunk'>@@ -223,11 +223,11 @@ int wilco_ec_mailbox(struct wilco_ec_device *ec, struct wilco_ec_message *msg)</div><div class='ctx'> 		msg-&gt;command, msg-&gt;type, msg-&gt;flags, msg-&gt;response_size,</div><div class='ctx'> 		msg-&gt;request_size);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ec-&gt;mailbox_lock);</div><div class='ctx'> 	/* Prepare request packet */</div><div class='ctx'> 	rq = ec-&gt;data_buffer;</div><div class='ctx'> 	wilco_ec_prepare(msg, rq);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ec-&gt;mailbox_lock);</div><div class='ctx'> 	ret = wilco_ec_transfer(ec, msg, rq);</div><div class='ctx'> 	mutex_unlock(&amp;ec-&gt;mailbox_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c<br/>index 8f018b3f3cd4..c7039f52ad51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/platform/x86/pmc_atom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/platform/x86/pmc_atom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/platform/x86/pmc_atom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/platform/x86/pmc_atom.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dmi.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/platform_data/x86/clk-pmc-atom.h&gt;</div><div class='hunk'>@@ -391,11 +392,27 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_DEBUG_FS */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Some systems need one or more of their pmc_plt_clks to be</div><div class='add'>+ * marked as critical.</div><div class='add'>+ */</div><div class='add'>+static const struct dmi_system_id critclk_systems[] = {</div><div class='add'>+	{</div><div class='add'>+		.ident = "MPL CEC1x",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 Family"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ /*sentinel*/ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap,</div><div class='ctx'> 			  const struct pmc_data *pmc_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *clkdev;</div><div class='ctx'> 	struct pmc_clk_data *clk_data;</div><div class='add'>+	const struct dmi_system_id *d = dmi_first_match(critclk_systems);</div><div class='ctx'> </div><div class='ctx'> 	clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);</div><div class='ctx'> 	if (!clk_data)</div><div class='hunk'>@@ -403,6 +420,10 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap,</div><div class='ctx'> </div><div class='ctx'> 	clk_data-&gt;base = pmc_regmap; /* offset is added by client */</div><div class='ctx'> 	clk_data-&gt;clks = pmc_data-&gt;clks;</div><div class='add'>+	if (d) {</div><div class='add'>+		clk_data-&gt;critical = true;</div><div class='add'>+		pr_info("%s critclks quirk enabled\n", d-&gt;ident);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	clkdev = platform_device_register_data(&amp;pdev-&gt;dev, "clk-pmc-atom",</div><div class='ctx'> 					       PLATFORM_DEVID_NONE,</div><div class='head'>diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c<br/>index 803666ae3635..de99f371d362 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pnp/quirks.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pnp/quirks.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pnp/quirks.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pnp/quirks.c</a></div><div class='hunk'>@@ -458,7 +458,7 @@ void pnp_fixup_device(struct pnp_dev *dev)</div><div class='ctx'> 	for (f = pnp_fixups; *f-&gt;id; f++) {</div><div class='ctx'> 		if (!compare_pnp_id(dev-&gt;id, f-&gt;id))</div><div class='ctx'> 			continue;</div><div class='del'>-		pnp_dbg(&amp;dev-&gt;dev, "%s: calling %pF\n", f-&gt;id,</div><div class='add'>+		pnp_dbg(&amp;dev-&gt;dev, "%s: calling %pS\n", f-&gt;id,</div><div class='ctx'> 			f-&gt;quirk_function);</div><div class='ctx'> 		f-&gt;quirk_function(dev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c<br/>index 08d5037fd052..6887870ba32c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/power/supply/cpcap-battery.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/power/supply/cpcap-battery.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/power/supply/cpcap-battery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/power/supply/cpcap-battery.c</a></div><div class='hunk'>@@ -221,6 +221,9 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata,</div><div class='ctx'> 	int avg_current;</div><div class='ctx'> 	u32 cc_lsb;</div><div class='ctx'> </div><div class='add'>+	if (!divider)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	sample &amp;= 0xffffff;		/* 24-bits, unsigned */</div><div class='ctx'> 	offset &amp;= 0x7ff;		/* 10-bits, signed */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/power/supply/goldfish_battery.c b/drivers/power/supply/goldfish_battery.c<br/>index ad969d9fc981..c2644a9fe80f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/power/supply/goldfish_battery.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/power/supply/goldfish_battery.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/power/supply/goldfish_battery.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/power/supply/goldfish_battery.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Power supply driver for the goldfish emulator</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c<br/>index dce24f596160..5358a80d854f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/power/supply/power_supply_sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/power/supply/power_supply_sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/power/supply/power_supply_sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/power/supply/power_supply_sysfs.c</a></div><div class='hunk'>@@ -383,15 +383,11 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> 	char *prop_buf;</div><div class='ctx'> 	char *attrname;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "uevent\n");</div><div class='del'>-</div><div class='ctx'> 	if (!psy || !psy-&gt;desc) {</div><div class='ctx'> 		dev_dbg(dev, "No power supply yet\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy-&gt;desc-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy-&gt;desc-&gt;name);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -427,8 +423,6 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf);</div><div class='del'>-</div><div class='ctx'> 		ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf);</div><div class='ctx'> 		kfree(attrname);</div><div class='ctx'> 		if (ret)</div><div class='head'>diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c<br/>index 883378d055c6..f21ea1b97116 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pwm/pwm-fsl-ftm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/pwm/pwm-fsl-ftm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/pwm/pwm-fsl-ftm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/pwm/pwm-fsl-ftm.c</a></div><div class='hunk'>@@ -22,51 +22,9 @@</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fsl/ftm.h&gt;</div><div class='ctx'> </div><div class='del'>-#define FTM_SC		0x00</div><div class='del'>-#define FTM_SC_CLK_MASK_SHIFT	3</div><div class='del'>-#define FTM_SC_CLK_MASK	(3 &lt;&lt; FTM_SC_CLK_MASK_SHIFT)</div><div class='ctx'> #define FTM_SC_CLK(c)	(((c) + 1) &lt;&lt; FTM_SC_CLK_MASK_SHIFT)</div><div class='del'>-#define FTM_SC_PS_MASK	0x7</div><div class='del'>-</div><div class='del'>-#define FTM_CNT		0x04</div><div class='del'>-#define FTM_MOD		0x08</div><div class='del'>-</div><div class='del'>-#define FTM_CSC_BASE	0x0C</div><div class='del'>-#define FTM_CSC_MSB	BIT(5)</div><div class='del'>-#define FTM_CSC_MSA	BIT(4)</div><div class='del'>-#define FTM_CSC_ELSB	BIT(3)</div><div class='del'>-#define FTM_CSC_ELSA	BIT(2)</div><div class='del'>-#define FTM_CSC(_channel)	(FTM_CSC_BASE + ((_channel) * 8))</div><div class='del'>-</div><div class='del'>-#define FTM_CV_BASE	0x10</div><div class='del'>-#define FTM_CV(_channel)	(FTM_CV_BASE + ((_channel) * 8))</div><div class='del'>-</div><div class='del'>-#define FTM_CNTIN	0x4C</div><div class='del'>-#define FTM_STATUS	0x50</div><div class='del'>-</div><div class='del'>-#define FTM_MODE	0x54</div><div class='del'>-#define FTM_MODE_FTMEN	BIT(0)</div><div class='del'>-#define FTM_MODE_INIT	BIT(2)</div><div class='del'>-#define FTM_MODE_PWMSYNC	BIT(3)</div><div class='del'>-</div><div class='del'>-#define FTM_SYNC	0x58</div><div class='del'>-#define FTM_OUTINIT	0x5C</div><div class='del'>-#define FTM_OUTMASK	0x60</div><div class='del'>-#define FTM_COMBINE	0x64</div><div class='del'>-#define FTM_DEADTIME	0x68</div><div class='del'>-#define FTM_EXTTRIG	0x6C</div><div class='del'>-#define FTM_POL		0x70</div><div class='del'>-#define FTM_FMS		0x74</div><div class='del'>-#define FTM_FILTER	0x78</div><div class='del'>-#define FTM_FLTCTRL	0x7C</div><div class='del'>-#define FTM_QDCTRL	0x80</div><div class='del'>-#define FTM_CONF	0x84</div><div class='del'>-#define FTM_FLTPOL	0x88</div><div class='del'>-#define FTM_SYNCONF	0x8C</div><div class='del'>-#define FTM_INVCTRL	0x90</div><div class='del'>-#define FTM_SWOCTRL	0x94</div><div class='del'>-#define FTM_PWMLOAD	0x98</div><div class='ctx'> </div><div class='ctx'> enum fsl_pwm_clk {</div><div class='ctx'> 	FSL_PWM_CLK_SYS,</div><div class='head'>diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c<br/>index 2d9ec378a8bc..88e4f3ff0cb8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ras/cec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ras/cec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ras/cec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ras/cec.c</a></div><div class='hunk'>@@ -286,10 +286,10 @@ int cec_add_elem(u64 pfn)</div><div class='ctx'> 	if (!ce_arr.array || ce_arr.disabled)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ca-&gt;ces_entered++;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;ce_mutex);</div><div class='ctx'> </div><div class='add'>+	ca-&gt;ces_entered++;</div><div class='add'>+</div><div class='ctx'> 	if (ca-&gt;n == MAX_ELEMS)</div><div class='ctx'> 		WARN_ON(!del_lru_elem_unlocked(ca));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c<br/>index 89bbd6e8bad1..9fd379732d18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/88pm800.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/88pm800.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/88pm800.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/88pm800.c</a></div><div class='hunk'>@@ -77,11 +77,6 @@ struct pm800_regulator_info {</div><div class='ctx'> 	int max_ua;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct pm800_regulators {</div><div class='del'>-	struct pm80x_chip *chip;</div><div class='del'>-	struct regmap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * vreg - the buck regs string.</div><div class='ctx'>  * ereg - the string for the enable register.</div><div class='hunk'>@@ -235,7 +230,6 @@ static int pm800_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm80x_chip *chip = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct pm80x_platform_data *pdata = dev_get_platdata(pdev-&gt;dev.parent);</div><div class='del'>-	struct pm800_regulators *pm800_data;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='ctx'> 	struct regulator_init_data *init_data;</div><div class='ctx'> 	int i, ret;</div><div class='hunk'>@@ -252,18 +246,8 @@ static int pm800_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pm800_data = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pm800_data),</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-	if (!pm800_data)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	pm800_data-&gt;map = chip-&gt;subchip-&gt;regmap_power;</div><div class='del'>-	pm800_data-&gt;chip = chip;</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, pm800_data);</div><div class='del'>-</div><div class='ctx'> 	config.dev = chip-&gt;dev;</div><div class='del'>-	config.regmap = pm800_data-&gt;map;</div><div class='add'>+	config.regmap = chip-&gt;subchip-&gt;regmap_power;</div><div class='ctx'> 	for (i = 0; i &lt; PM800_ID_RG_MAX; i++) {</div><div class='ctx'> 		struct regulator_dev *regulator;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c<br/>index 753a6a1b30c3..35d767aeeb57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/88pm8607.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/88pm8607.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/88pm8607.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/88pm8607.c</a></div><div class='hunk'>@@ -235,6 +235,8 @@ static const struct regulator_ops pm8606_preg_ops = {</div><div class='ctx'> {									\</div><div class='ctx'> 	.desc	= {							\</div><div class='ctx'> 		.name	= "PREG",					\</div><div class='add'>+		.of_match = of_match_ptr("PREG"),			\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),		\</div><div class='ctx'> 		.ops	= &amp;pm8606_preg_ops,				\</div><div class='ctx'> 		.type	= REGULATOR_CURRENT,				\</div><div class='ctx'> 		.id	= PM8606_ID_PREG,				\</div><div class='hunk'>@@ -249,6 +251,8 @@ static const struct regulator_ops pm8606_preg_ops = {</div><div class='ctx'> {									\</div><div class='ctx'> 	.desc	= {							\</div><div class='ctx'> 		.name	= #vreg,					\</div><div class='add'>+		.of_match = of_match_ptr(#vreg),			\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),		\</div><div class='ctx'> 		.ops	= &amp;pm8607_regulator_ops,			\</div><div class='ctx'> 		.type	= REGULATOR_VOLTAGE,				\</div><div class='ctx'> 		.id	= PM8607_ID_##vreg,				\</div><div class='hunk'>@@ -270,6 +274,8 @@ static const struct regulator_ops pm8606_preg_ops = {</div><div class='ctx'> {									\</div><div class='ctx'> 	.desc	= {							\</div><div class='ctx'> 		.name	= "LDO" #_id,					\</div><div class='add'>+		.of_match = of_match_ptr("LDO" #_id),			\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),		\</div><div class='ctx'> 		.ops	= &amp;pm8607_regulator_ops,			\</div><div class='ctx'> 		.type	= REGULATOR_VOLTAGE,				\</div><div class='ctx'> 		.id	= PM8607_ID_LDO##_id,				\</div><div class='hunk'>@@ -309,36 +315,6 @@ static struct pm8607_regulator_info pm8606_regulator_info[] = {</div><div class='ctx'> 	PM8606_PREG(PREREGULATORB, 5),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static int pm8607_regulator_dt_init(struct platform_device *pdev,</div><div class='del'>-				    struct pm8607_regulator_info *info,</div><div class='del'>-				    struct regulator_config *config)</div><div class='del'>-{</div><div class='del'>-	struct device_node *nproot, *np;</div><div class='del'>-	nproot = pdev-&gt;dev.parent-&gt;of_node;</div><div class='del'>-	if (!nproot)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	nproot = of_get_child_by_name(nproot, "regulators");</div><div class='del'>-	if (!nproot) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to find regulators node\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	for_each_child_of_node(nproot, np) {</div><div class='del'>-		if (of_node_name_eq(np, info-&gt;desc.name)) {</div><div class='del'>-			config-&gt;init_data =</div><div class='del'>-				of_get_regulator_init_data(&amp;pdev-&gt;dev, np,</div><div class='del'>-							   &amp;info-&gt;desc);</div><div class='del'>-			config-&gt;of_node = np;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	of_node_put(nproot);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define pm8607_regulator_dt_init(x, y, z)	(-1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int pm8607_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_chip *chip = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='hunk'>@@ -373,12 +349,11 @@ static int pm8607_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	if ((i == PM8607_ID_BUCK3) &amp;&amp; chip-&gt;buck3_double)</div><div class='ctx'> 		info-&gt;slope_double = 1;</div><div class='ctx'> </div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	config.dev = chip-&gt;dev;</div><div class='ctx'> 	config.driver_data = info;</div><div class='ctx'> </div><div class='del'>-	if (pm8607_regulator_dt_init(pdev, info, &amp;config))</div><div class='del'>-		if (pdata)</div><div class='del'>-			config.init_data = pdata;</div><div class='add'>+	if (pdata)</div><div class='add'>+		config.init_data = pdata;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;id == CHIP_PM8607)</div><div class='ctx'> 		config.regmap = chip-&gt;regmap;</div><div class='head'>diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig<br/>index b7f249ee5e68..6c37f0df9323 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/Kconfig</a></div><div class='hunk'>@@ -223,6 +223,7 @@ config REGULATOR_CPCAP</div><div class='ctx'> config REGULATOR_DA903X</div><div class='ctx'> 	tristate "Dialog Semiconductor DA9030/DA9034 regulators"</div><div class='ctx'> 	depends on PMIC_DA903X</div><div class='add'>+	depends on !CC_IS_CLANG # https://bugs.llvm.org/show_bug.cgi?id=38789</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say y here to support the BUCKs and LDOs regulators found on</div><div class='ctx'> 	  Dialog Semiconductor DA9030/DA9034 PMIC.</div><div class='hunk'>@@ -839,6 +840,13 @@ config REGULATOR_STM32_VREFBUF</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called stm32-vrefbuf.</div><div class='ctx'> </div><div class='add'>+config REGULATOR_STM32_PWR</div><div class='add'>+	bool "STMicroelectronics STM32 PWR"</div><div class='add'>+	depends on ARCH_STM32 || COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  This driver supports internal regulators (1V1, 1V8, 3V3) in the</div><div class='add'>+	  STMicroelectronics STM32 chips.</div><div class='add'>+</div><div class='ctx'> config REGULATOR_STPMIC1</div><div class='ctx'> 	tristate "STMicroelectronics STPMIC1 PMIC Regulators"</div><div class='ctx'> 	depends on MFD_STPMIC1</div><div class='hunk'>@@ -1010,7 +1018,8 @@ config REGULATOR_TWL4030</div><div class='ctx'> config REGULATOR_UNIPHIER</div><div class='ctx'> 	tristate "UniPhier regulator driver"</div><div class='ctx'> 	depends on ARCH_UNIPHIER || COMPILE_TEST</div><div class='del'>-	depends on OF &amp;&amp; MFD_SYSCON</div><div class='add'>+	depends on OF</div><div class='add'>+	select REGMAP_MMIO</div><div class='ctx'> 	default ARCH_UNIPHIER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for regulators implemented on Socionext UniPhier SoCs.</div><div class='head'>diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile<br/>index 1169f8a27d91..93f53840e8f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/Makefile</a></div><div class='hunk'>@@ -105,6 +105,7 @@ obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_SC2731) += sc2731-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o</div><div class='add'>+obj-$(CONFIG_REGULATOR_STM32_PWR) += stm32-pwr.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_STPMIC1) += stpmic1_regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_SY8106A) += sy8106a-regulator.o</div><div class='head'>diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c<br/>index de2644490f0d..438509f55f05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ab3100.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ab3100.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ab3100.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/ab3100.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'>  * @regreg: regulator register number in the AB3100</div><div class='ctx'>  */</div><div class='ctx'> struct ab3100_regulator {</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct ab3100_platform_data *plfdata;</div><div class='ctx'> 	u8 regreg;</div><div class='hunk'>@@ -354,14 +353,13 @@ static int ab3100_get_voltage_regulator_external(struct regulator_dev *reg)</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops regulator_ops_fixed = {</div><div class='del'>-	.list_voltage = regulator_list_voltage_linear,</div><div class='add'>+static const struct regulator_ops regulator_ops_fixed = {</div><div class='ctx'> 	.enable      = ab3100_enable_regulator,</div><div class='ctx'> 	.disable     = ab3100_disable_regulator,</div><div class='ctx'> 	.is_enabled  = ab3100_is_enabled_regulator,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops regulator_ops_variable = {</div><div class='add'>+static const struct regulator_ops regulator_ops_variable = {</div><div class='ctx'> 	.enable      = ab3100_enable_regulator,</div><div class='ctx'> 	.disable     = ab3100_disable_regulator,</div><div class='ctx'> 	.is_enabled  = ab3100_is_enabled_regulator,</div><div class='hunk'>@@ -370,7 +368,7 @@ static struct regulator_ops regulator_ops_variable = {</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops regulator_ops_variable_sleepable = {</div><div class='add'>+static const struct regulator_ops regulator_ops_variable_sleepable = {</div><div class='ctx'> 	.enable      = ab3100_enable_regulator,</div><div class='ctx'> 	.disable     = ab3100_disable_regulator,</div><div class='ctx'> 	.is_enabled  = ab3100_is_enabled_regulator,</div><div class='hunk'>@@ -386,14 +384,14 @@ static struct regulator_ops regulator_ops_variable_sleepable = {</div><div class='ctx'>  * is an on/off switch plain an simple. The external</div><div class='ctx'>  * voltage is defined in the board set-up if any.</div><div class='ctx'>  */</div><div class='del'>-static struct regulator_ops regulator_ops_external = {</div><div class='add'>+static const struct regulator_ops regulator_ops_external = {</div><div class='ctx'> 	.enable      = ab3100_enable_regulator,</div><div class='ctx'> 	.disable     = ab3100_disable_regulator,</div><div class='ctx'> 	.is_enabled  = ab3100_is_enabled_regulator,</div><div class='ctx'> 	.get_voltage = ab3100_get_voltage_regulator_external,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc</div><div class='add'>+static const struct regulator_desc</div><div class='ctx'> ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "LDO_A",</div><div class='hunk'>@@ -402,7 +400,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {</div><div class='ctx'> 		.n_voltages = 1,</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='del'>-		.min_uV = LDO_A_VOLTAGE,</div><div class='add'>+		.fixed_uV = LDO_A_VOLTAGE,</div><div class='ctx'> 		.enable_time = 200,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -412,7 +410,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {</div><div class='ctx'> 		.n_voltages = 1,</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='del'>-		.min_uV = LDO_C_VOLTAGE,</div><div class='add'>+		.fixed_uV = LDO_C_VOLTAGE,</div><div class='ctx'> 		.enable_time = 200,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -422,7 +420,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {</div><div class='ctx'> 		.n_voltages = 1,</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='del'>-		.min_uV = LDO_D_VOLTAGE,</div><div class='add'>+		.fixed_uV = LDO_D_VOLTAGE,</div><div class='ctx'> 		.enable_time = 200,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -500,7 +498,7 @@ static int ab3100_regulator_register(struct platform_device *pdev,</div><div class='ctx'> 				     struct device_node *np,</div><div class='ctx'> 				     unsigned long id)</div><div class='ctx'> {</div><div class='del'>-	struct regulator_desc *desc;</div><div class='add'>+	const struct regulator_desc *desc;</div><div class='ctx'> 	struct ab3100_regulator *reg;</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='hunk'>@@ -545,8 +543,6 @@ static int ab3100_regulator_register(struct platform_device *pdev,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Then set a pointer back to the registered regulator */</div><div class='del'>-	reg-&gt;rdev = rdev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -609,18 +605,6 @@ static const u8 ab3100_reg_initvals[] = {</div><div class='ctx'> 	LDO_D_SETTING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ab3100_regulators_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; AB3100_NUM_REGULATORS; i++) {</div><div class='del'>-		struct ab3100_regulator *reg = &amp;ab3100_regulators[i];</div><div class='del'>-</div><div class='del'>-		reg-&gt;rdev = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)</div><div class='ctx'> {</div><div class='hunk'>@@ -647,10 +631,8 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)</div><div class='ctx'> 			pdev, NULL, ab3100_regulator_matches[i].init_data,</div><div class='ctx'> 			ab3100_regulator_matches[i].of_node,</div><div class='ctx'> 			(unsigned long)ab3100_regulator_matches[i].driver_data);</div><div class='del'>-		if (err) {</div><div class='del'>-			ab3100_regulators_remove(pdev);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -705,14 +687,12 @@ static int ab3100_regulators_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Register the regulators */</div><div class='ctx'> 	for (i = 0; i &lt; AB3100_NUM_REGULATORS; i++) {</div><div class='del'>-		struct regulator_desc *desc = &amp;ab3100_regulator_desc[i];</div><div class='add'>+		const struct regulator_desc *desc = &amp;ab3100_regulator_desc[i];</div><div class='ctx'> </div><div class='ctx'> 		err = ab3100_regulator_register(pdev, plfdata, NULL, NULL,</div><div class='ctx'> 						desc-&gt;id);</div><div class='del'>-		if (err) {</div><div class='del'>-			ab3100_regulators_remove(pdev);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -723,7 +703,6 @@ static struct platform_driver ab3100_regulators_driver = {</div><div class='ctx'> 		.name  = "ab3100-regulators",</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = ab3100_regulators_probe,</div><div class='del'>-	.remove = ab3100_regulators_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int ab3100_regulators_init(void)</div><div class='head'>diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c<br/>index 2ca00045eb99..95704446d89e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ab8500-ext.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ab8500-ext.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ab8500-ext.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/ab8500-ext.c</a></div><div class='hunk'>@@ -479,7 +479,6 @@ static struct ab8500_regulator_platform_data ab8500_regulator_plat_data = {</div><div class='ctx'>  * struct ab8500_ext_regulator_info - ab8500 regulator information</div><div class='ctx'>  * @dev: device pointer</div><div class='ctx'>  * @desc: regulator description</div><div class='del'>- * @rdev: regulator device</div><div class='ctx'>  * @cfg: regulator configuration (extension of regulator FW configuration)</div><div class='ctx'>  * @update_bank: bank to control on/off</div><div class='ctx'>  * @update_reg: register to control on/off</div><div class='hunk'>@@ -495,7 +494,6 @@ static struct ab8500_regulator_platform_data ab8500_regulator_plat_data = {</div><div class='ctx'> struct ab8500_ext_regulator_info {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='ctx'> 	struct ab8500_ext_regulator_cfg *cfg;</div><div class='ctx'> 	u8 update_bank;</div><div class='ctx'> 	u8 update_reg;</div><div class='hunk'>@@ -530,7 +528,7 @@ static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)</div><div class='ctx'> 		info-&gt;update_bank, info-&gt;update_reg,</div><div class='ctx'> 		info-&gt;update_mask, regval);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(rdev_get_dev(info-&gt;rdev),</div><div class='add'>+		dev_err(rdev_get_dev(rdev),</div><div class='ctx'> 			"couldn't set enable bits for regulator\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -566,7 +564,7 @@ static int ab8500_ext_regulator_disable(struct regulator_dev *rdev)</div><div class='ctx'> 		info-&gt;update_bank, info-&gt;update_reg,</div><div class='ctx'> 		info-&gt;update_mask, regval);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(rdev_get_dev(info-&gt;rdev),</div><div class='add'>+		dev_err(rdev_get_dev(rdev),</div><div class='ctx'> 			"couldn't set disable bits for regulator\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -720,7 +718,7 @@ static int ab8500_ext_list_voltage(struct regulator_dev *rdev,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops ab8500_ext_regulator_ops = {</div><div class='add'>+static const struct regulator_ops ab8500_ext_regulator_ops = {</div><div class='ctx'> 	.enable			= ab8500_ext_regulator_enable,</div><div class='ctx'> 	.disable		= ab8500_ext_regulator_disable,</div><div class='ctx'> 	.is_enabled		= ab8500_ext_regulator_is_enabled,</div><div class='hunk'>@@ -735,6 +733,7 @@ static struct ab8500_ext_regulator_info</div><div class='ctx'> 	[AB8500_EXT_SUPPLY1] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name		= "VEXTSUPPLY1",</div><div class='add'>+			.of_match	= of_match_ptr("ab8500_ext1"),</div><div class='ctx'> 			.ops		= &amp;ab8500_ext_regulator_ops,</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,</div><div class='ctx'> 			.id		= AB8500_EXT_SUPPLY1,</div><div class='hunk'>@@ -752,6 +751,7 @@ static struct ab8500_ext_regulator_info</div><div class='ctx'> 	[AB8500_EXT_SUPPLY2] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name		= "VEXTSUPPLY2",</div><div class='add'>+			.of_match	= of_match_ptr("ab8500_ext2"),</div><div class='ctx'> 			.ops		= &amp;ab8500_ext_regulator_ops,</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,</div><div class='ctx'> 			.id		= AB8500_EXT_SUPPLY2,</div><div class='hunk'>@@ -769,6 +769,7 @@ static struct ab8500_ext_regulator_info</div><div class='ctx'> 	[AB8500_EXT_SUPPLY3] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name		= "VEXTSUPPLY3",</div><div class='add'>+			.of_match	= of_match_ptr("ab8500_ext3"),</div><div class='ctx'> 			.ops		= &amp;ab8500_ext_regulator_ops,</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,</div><div class='ctx'> 			.id		= AB8500_EXT_SUPPLY3,</div><div class='hunk'>@@ -785,30 +786,13 @@ static struct ab8500_ext_regulator_info</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct of_regulator_match ab8500_ext_regulator_match[] = {</div><div class='del'>-	{ .name = "ab8500_ext1", .driver_data = (void *) AB8500_EXT_SUPPLY1, },</div><div class='del'>-	{ .name = "ab8500_ext2", .driver_data = (void *) AB8500_EXT_SUPPLY2, },</div><div class='del'>-	{ .name = "ab8500_ext3", .driver_data = (void *) AB8500_EXT_SUPPLY3, },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int ab8500_ext_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ab8500 *ab8500 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct ab8500_regulator_platform_data *pdata = &amp;ab8500_regulator_plat_data;</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if (np) {</div><div class='del'>-		err = of_regulator_match(&amp;pdev-&gt;dev, np,</div><div class='del'>-					 ab8500_ext_regulator_match,</div><div class='del'>-					 ARRAY_SIZE(ab8500_ext_regulator_match));</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"Error parsing regulator init data: %d\n", err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!ab8500) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "null mfd parent\n");</div><div class='hunk'>@@ -844,23 +828,18 @@ static int ab8500_ext_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		config.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 		config.driver_data = info;</div><div class='del'>-		config.of_node = ab8500_ext_regulator_match[i].of_node;</div><div class='del'>-		config.init_data = (np) ?</div><div class='del'>-			ab8500_ext_regulator_match[i].init_data :</div><div class='del'>-			&amp;pdata-&gt;ext_regulator[i];</div><div class='add'>+		config.init_data = &amp;pdata-&gt;ext_regulator[i];</div><div class='ctx'> </div><div class='ctx'> 		/* register regulator with framework */</div><div class='del'>-		info-&gt;rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc,</div><div class='del'>-						     &amp;config);</div><div class='del'>-		if (IS_ERR(info-&gt;rdev)) {</div><div class='del'>-			err = PTR_ERR(info-&gt;rdev);</div><div class='add'>+		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc,</div><div class='add'>+					       &amp;config);</div><div class='add'>+		if (IS_ERR(rdev)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='ctx'> 					info-&gt;desc.name);</div><div class='del'>-			return err;</div><div class='add'>+			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev_dbg(rdev_get_dev(info-&gt;rdev),</div><div class='del'>-			"%s-probed\n", info-&gt;desc.name);</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "%s-probed\n", info-&gt;desc.name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c<br/>index 83dba3fbfe0c..3fcb4cbaab02 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ab8500.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ab8500.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ab8500.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/ab8500.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@ struct ab8500_shared_mode {</div><div class='ctx'>  * struct ab8500_regulator_info - ab8500 regulator information</div><div class='ctx'>  * @dev: device pointer</div><div class='ctx'>  * @desc: regulator description</div><div class='del'>- * @regulator_dev: regulator device</div><div class='ctx'>  * @shared_mode: used when mode is shared between two regulators</div><div class='ctx'>  * @load_lp_uA: maximum load in idle (low power) mode</div><div class='ctx'>  * @update_bank: bank to control on/off</div><div class='hunk'>@@ -65,7 +64,6 @@ struct ab8500_shared_mode {</div><div class='ctx'> struct ab8500_regulator_info {</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	struct regulator_desc	desc;</div><div class='del'>-	struct regulator_dev	*regulator;</div><div class='ctx'> 	struct ab8500_shared_mode *shared_mode;</div><div class='ctx'> 	int load_lp_uA;</div><div class='ctx'> 	u8 update_bank;</div><div class='hunk'>@@ -510,7 +508,7 @@ static int ab8500_regulator_set_voltage_sel(struct regulator_dev *rdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops ab8500_regulator_volt_mode_ops = {</div><div class='add'>+static const struct regulator_ops ab8500_regulator_volt_mode_ops = {</div><div class='ctx'> 	.enable			= ab8500_regulator_enable,</div><div class='ctx'> 	.disable		= ab8500_regulator_disable,</div><div class='ctx'> 	.is_enabled		= ab8500_regulator_is_enabled,</div><div class='hunk'>@@ -522,7 +520,7 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = {</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops ab8500_regulator_volt_ops = {</div><div class='add'>+static const struct regulator_ops ab8500_regulator_volt_ops = {</div><div class='ctx'> 	.enable		= ab8500_regulator_enable,</div><div class='ctx'> 	.disable	= ab8500_regulator_disable,</div><div class='ctx'> 	.is_enabled	= ab8500_regulator_is_enabled,</div><div class='hunk'>@@ -531,7 +529,7 @@ static struct regulator_ops ab8500_regulator_volt_ops = {</div><div class='ctx'> 	.list_voltage	= regulator_list_voltage_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops ab8500_regulator_mode_ops = {</div><div class='add'>+static const struct regulator_ops ab8500_regulator_mode_ops = {</div><div class='ctx'> 	.enable			= ab8500_regulator_enable,</div><div class='ctx'> 	.disable		= ab8500_regulator_disable,</div><div class='ctx'> 	.is_enabled		= ab8500_regulator_is_enabled,</div><div class='hunk'>@@ -541,14 +539,14 @@ static struct regulator_ops ab8500_regulator_mode_ops = {</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops ab8500_regulator_ops = {</div><div class='add'>+static const struct regulator_ops ab8500_regulator_ops = {</div><div class='ctx'> 	.enable			= ab8500_regulator_enable,</div><div class='ctx'> 	.disable		= ab8500_regulator_disable,</div><div class='ctx'> 	.is_enabled		= ab8500_regulator_is_enabled,</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops ab8500_regulator_anamic_mode_ops = {</div><div class='add'>+static const struct regulator_ops ab8500_regulator_anamic_mode_ops = {</div><div class='ctx'> 	.enable		= ab8500_regulator_enable,</div><div class='ctx'> 	.disable	= ab8500_regulator_disable,</div><div class='ctx'> 	.is_enabled	= ab8500_regulator_is_enabled,</div><div class='hunk'>@@ -1600,6 +1598,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,</div><div class='ctx'> 	struct ab8500 *ab8500 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct ab8500_regulator_info *info = NULL;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='ctx'> </div><div class='ctx'> 	/* assign per-regulator data */</div><div class='ctx'> 	info = &amp;abx500_regulator.info[id];</div><div class='hunk'>@@ -1621,12 +1620,11 @@ static int ab8500_regulator_register(struct platform_device *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register regulator with framework */</div><div class='del'>-	info-&gt;regulator = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc,</div><div class='del'>-						&amp;config);</div><div class='del'>-	if (IS_ERR(info-&gt;regulator)) {</div><div class='add'>+	rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc, &amp;config);</div><div class='add'>+	if (IS_ERR(rdev)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='ctx'> 			info-&gt;desc.name);</div><div class='del'>-		return PTR_ERR(info-&gt;regulator);</div><div class='add'>+		return PTR_ERR(rdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c<br/>index e0239cf3f56d..19d9ee2dac1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/act8865-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/act8865-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/act8865-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/act8865-regulator.c</a></div><div class='hunk'>@@ -226,7 +226,7 @@ static const struct regulator_linear_range act8600_sudcdc_voltage_ranges[] = {</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(41400000, 248, 255, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops act8865_ops = {</div><div class='add'>+static const struct regulator_ops act8865_ops = {</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_linear_range,</div><div class='ctx'> 	.map_voltage		= regulator_map_voltage_linear_range,</div><div class='ctx'> 	.get_voltage_sel	= regulator_get_voltage_sel_regmap,</div><div class='hunk'>@@ -236,7 +236,7 @@ static struct regulator_ops act8865_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops act8865_ldo_ops = {</div><div class='add'>+static const struct regulator_ops act8865_ldo_ops = {</div><div class='ctx'> 	.enable			= regulator_enable_regmap,</div><div class='ctx'> 	.disable		= regulator_disable_regmap,</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='hunk'>@@ -245,6 +245,8 @@ static struct regulator_ops act8865_ldo_ops = {</div><div class='ctx'> #define ACT88xx_REG(_name, _family, _id, _vsel_reg, _supply)		\</div><div class='ctx'> 	[_family##_ID_##_id] = {					\</div><div class='ctx'> 		.name			= _name,			\</div><div class='add'>+		.of_match		= of_match_ptr(_name),		\</div><div class='add'>+		.regulators_node	= of_match_ptr("regulators"),	\</div><div class='ctx'> 		.supply_name		= _supply,			\</div><div class='ctx'> 		.id			= _family##_ID_##_id,		\</div><div class='ctx'> 		.type			= REGULATOR_VOLTAGE,		\</div><div class='hunk'>@@ -265,6 +267,8 @@ static const struct regulator_desc act8600_regulators[] = {</div><div class='ctx'> 	ACT88xx_REG("DCDC3", ACT8600, DCDC3, VSET, "vp3"),</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "SUDCDC_REG4",</div><div class='add'>+		.of_match = of_match_ptr("SUDCDC_REG4"),</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),</div><div class='ctx'> 		.id = ACT8600_ID_SUDCDC4,</div><div class='ctx'> 		.ops = &amp;act8865_ops,</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -283,6 +287,8 @@ static const struct regulator_desc act8600_regulators[] = {</div><div class='ctx'> 	ACT88xx_REG("LDO8", ACT8600, LDO8, VSET, "inl"),</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "LDO_REG9",</div><div class='add'>+		.of_match = of_match_ptr("LDO_REG9"),</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),</div><div class='ctx'> 		.id = ACT8600_ID_LDO9,</div><div class='ctx'> 		.ops = &amp;act8865_ldo_ops,</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -294,6 +300,8 @@ static const struct regulator_desc act8600_regulators[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "LDO_REG10",</div><div class='add'>+		.of_match = of_match_ptr("LDO_REG10"),</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),</div><div class='ctx'> 		.id = ACT8600_ID_LDO10,</div><div class='ctx'> 		.ops = &amp;act8865_ldo_ops,</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -348,110 +356,6 @@ static const struct of_device_id act8865_dt_ids[] = {</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, act8865_dt_ids);</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match act8846_matches[] = {</div><div class='del'>-	[ACT8846_ID_REG1]	= { .name = "REG1" },</div><div class='del'>-	[ACT8846_ID_REG2]	= { .name = "REG2" },</div><div class='del'>-	[ACT8846_ID_REG3]	= { .name = "REG3" },</div><div class='del'>-	[ACT8846_ID_REG4]	= { .name = "REG4" },</div><div class='del'>-	[ACT8846_ID_REG5]	= { .name = "REG5" },</div><div class='del'>-	[ACT8846_ID_REG6]	= { .name = "REG6" },</div><div class='del'>-	[ACT8846_ID_REG7]	= { .name = "REG7" },</div><div class='del'>-	[ACT8846_ID_REG8]	= { .name = "REG8" },</div><div class='del'>-	[ACT8846_ID_REG9]	= { .name = "REG9" },</div><div class='del'>-	[ACT8846_ID_REG10]	= { .name = "REG10" },</div><div class='del'>-	[ACT8846_ID_REG11]	= { .name = "REG11" },</div><div class='del'>-	[ACT8846_ID_REG12]	= { .name = "REG12" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match act8865_matches[] = {</div><div class='del'>-	[ACT8865_ID_DCDC1]	= { .name = "DCDC_REG1"},</div><div class='del'>-	[ACT8865_ID_DCDC2]	= { .name = "DCDC_REG2"},</div><div class='del'>-	[ACT8865_ID_DCDC3]	= { .name = "DCDC_REG3"},</div><div class='del'>-	[ACT8865_ID_LDO1]	= { .name = "LDO_REG1"},</div><div class='del'>-	[ACT8865_ID_LDO2]	= { .name = "LDO_REG2"},</div><div class='del'>-	[ACT8865_ID_LDO3]	= { .name = "LDO_REG3"},</div><div class='del'>-	[ACT8865_ID_LDO4]	= { .name = "LDO_REG4"},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match act8600_matches[] = {</div><div class='del'>-	[ACT8600_ID_DCDC1]	= { .name = "DCDC_REG1"},</div><div class='del'>-	[ACT8600_ID_DCDC2]	= { .name = "DCDC_REG2"},</div><div class='del'>-	[ACT8600_ID_DCDC3]	= { .name = "DCDC_REG3"},</div><div class='del'>-	[ACT8600_ID_SUDCDC4]	= { .name = "SUDCDC_REG4"},</div><div class='del'>-	[ACT8600_ID_LDO5]	= { .name = "LDO_REG5"},</div><div class='del'>-	[ACT8600_ID_LDO6]	= { .name = "LDO_REG6"},</div><div class='del'>-	[ACT8600_ID_LDO7]	= { .name = "LDO_REG7"},</div><div class='del'>-	[ACT8600_ID_LDO8]	= { .name = "LDO_REG8"},</div><div class='del'>-	[ACT8600_ID_LDO9]	= { .name = "LDO_REG9"},</div><div class='del'>-	[ACT8600_ID_LDO10]	= { .name = "LDO_REG10"},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int act8865_pdata_from_dt(struct device *dev,</div><div class='del'>-				 struct act8865_platform_data *pdata,</div><div class='del'>-				 unsigned long type)</div><div class='del'>-{</div><div class='del'>-	int matched, i, num_matches;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	struct act8865_regulator_data *regulator;</div><div class='del'>-	struct of_regulator_match *matches;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ACT8600:</div><div class='del'>-		matches = act8600_matches;</div><div class='del'>-		num_matches = ARRAY_SIZE(act8600_matches);</div><div class='del'>-		break;</div><div class='del'>-	case ACT8846:</div><div class='del'>-		matches = act8846_matches;</div><div class='del'>-		num_matches = ARRAY_SIZE(act8846_matches);</div><div class='del'>-		break;</div><div class='del'>-	case ACT8865:</div><div class='del'>-		matches = act8865_matches;</div><div class='del'>-		num_matches = ARRAY_SIZE(act8865_matches);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(dev, "invalid device id %lu\n", type);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	np = of_get_child_by_name(dev-&gt;of_node, "regulators");</div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(dev, "missing 'regulators' subnode in DT\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matched = of_regulator_match(dev, np, matches, num_matches);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	if (matched &lt;= 0)</div><div class='del'>-		return matched;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;regulators = devm_kcalloc(dev,</div><div class='del'>-					 num_matches,</div><div class='del'>-					 sizeof(struct act8865_regulator_data),</div><div class='del'>-					 GFP_KERNEL);</div><div class='del'>-	if (!pdata-&gt;regulators)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;num_regulators = num_matches;</div><div class='del'>-	regulator = pdata-&gt;regulators;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_matches; i++) {</div><div class='del'>-		regulator-&gt;id = i;</div><div class='del'>-		regulator-&gt;name = matches[i].name;</div><div class='del'>-		regulator-&gt;init_data = matches[i].init_data;</div><div class='del'>-		regulator-&gt;of_node = matches[i].of_node;</div><div class='del'>-		regulator++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int act8865_pdata_from_dt(struct device *dev,</div><div class='del'>-					struct act8865_platform_data *pdata,</div><div class='del'>-					unsigned long type)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct act8865_regulator_data *act8865_get_regulator_data(</div><div class='hunk'>@@ -459,9 +363,6 @@ static struct act8865_regulator_data *act8865_get_regulator_data(</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!pdata)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;num_regulators; i++) {</div><div class='ctx'> 		if (pdata-&gt;regulators[i].id == id)</div><div class='ctx'> 			return &amp;pdata-&gt;regulators[i];</div><div class='hunk'>@@ -484,7 +385,7 @@ static int act8865_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 			      const struct i2c_device_id *i2c_id)</div><div class='ctx'> {</div><div class='ctx'> 	const struct regulator_desc *regulators;</div><div class='del'>-	struct act8865_platform_data pdata_of, *pdata;</div><div class='add'>+	struct act8865_platform_data *pdata = NULL;</div><div class='ctx'> 	struct device *dev = &amp;client-&gt;dev;</div><div class='ctx'> 	int i, ret, num_regulators;</div><div class='ctx'> 	struct act8865 *act8865;</div><div class='hunk'>@@ -493,9 +394,7 @@ static int act8865_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 	int off_reg, off_mask;</div><div class='ctx'> 	int voltage_select = 0;</div><div class='ctx'> </div><div class='del'>-	pdata = dev_get_platdata(dev);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;of_node &amp;&amp; !pdata) {</div><div class='add'>+	if (dev-&gt;of_node) {</div><div class='ctx'> 		const struct of_device_id *id;</div><div class='ctx'> </div><div class='ctx'> 		id = of_match_device(of_match_ptr(act8865_dt_ids), dev);</div><div class='hunk'>@@ -509,6 +408,7 @@ static int act8865_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 						   NULL);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		type = i2c_id-&gt;driver_data;</div><div class='add'>+		pdata = dev_get_platdata(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -543,14 +443,6 @@ static int act8865_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;of_node &amp;&amp; !pdata) {</div><div class='del'>-		ret = act8865_pdata_from_dt(dev, &amp;pdata_of, type);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		pdata = &amp;pdata_of;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	act8865 = devm_kzalloc(dev, sizeof(struct act8865), GFP_KERNEL);</div><div class='ctx'> 	if (!act8865)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -577,17 +469,20 @@ static int act8865_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 	for (i = 0; i &lt; num_regulators; i++) {</div><div class='ctx'> 		const struct regulator_desc *desc = &amp;regulators[i];</div><div class='ctx'> 		struct regulator_config config = { };</div><div class='del'>-		struct act8865_regulator_data *rdata;</div><div class='ctx'> 		struct regulator_dev *rdev;</div><div class='ctx'> </div><div class='ctx'> 		config.dev = dev;</div><div class='ctx'> 		config.driver_data = act8865;</div><div class='ctx'> 		config.regmap = act8865-&gt;regmap;</div><div class='ctx'> </div><div class='del'>-		rdata = act8865_get_regulator_data(desc-&gt;id, pdata);</div><div class='del'>-		if (rdata) {</div><div class='del'>-			config.init_data = rdata-&gt;init_data;</div><div class='del'>-			config.of_node = rdata-&gt;of_node;</div><div class='add'>+		if (pdata) {</div><div class='add'>+			struct act8865_regulator_data *rdata;</div><div class='add'>+</div><div class='add'>+			rdata = act8865_get_regulator_data(desc-&gt;id, pdata);</div><div class='add'>+			if (rdata) {</div><div class='add'>+				config.init_data = rdata-&gt;init_data;</div><div class='add'>+				config.of_node = rdata-&gt;of_node;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rdev = devm_regulator_register(dev, desc, &amp;config);</div><div class='head'>diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c<br/>index d9d8155ed8cb..754739d004e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/anatop-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/anatop-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/anatop-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/anatop-regulator.c</a></div><div class='hunk'>@@ -23,18 +23,10 @@</div><div class='ctx'> #define LDO_FET_FULL_ON			0x1f</div><div class='ctx'> </div><div class='ctx'> struct anatop_regulator {</div><div class='del'>-	u32 control_reg;</div><div class='del'>-	struct regmap *anatop;</div><div class='del'>-	int vol_bit_shift;</div><div class='del'>-	int vol_bit_width;</div><div class='ctx'> 	u32 delay_reg;</div><div class='ctx'> 	int delay_bit_shift;</div><div class='ctx'> 	int delay_bit_width;</div><div class='del'>-	int min_bit_val;</div><div class='del'>-	int min_voltage;</div><div class='del'>-	int max_voltage;</div><div class='ctx'> 	struct regulator_desc rdesc;</div><div class='del'>-	struct regulator_init_data *initdata;</div><div class='ctx'> 	bool bypass;</div><div class='ctx'> 	int sel;</div><div class='ctx'> };</div><div class='hunk'>@@ -55,7 +47,7 @@ static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg,</div><div class='ctx'> 		 * to calculate how many steps LDO need to</div><div class='ctx'> 		 * ramp up, and how much delay needed. (us)</div><div class='ctx'> 		 */</div><div class='del'>-		regmap_read(anatop_reg-&gt;anatop, anatop_reg-&gt;delay_reg, &amp;val);</div><div class='add'>+		regmap_read(reg-&gt;regmap, anatop_reg-&gt;delay_reg, &amp;val);</div><div class='ctx'> 		val = (val &gt;&gt; anatop_reg-&gt;delay_bit_shift) &amp;</div><div class='ctx'> 			((1 &lt;&lt; anatop_reg-&gt;delay_bit_width) - 1);</div><div class='ctx'> 		ret = (new_sel - old_sel) * (LDO_RAMP_UP_UNIT_IN_CYCLES &lt;&lt;</div><div class='hunk'>@@ -170,6 +162,13 @@ static int anatop_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct anatop_regulator *sreg;</div><div class='ctx'> 	struct regulator_init_data *initdata;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	u32 control_reg;</div><div class='add'>+	u32 vol_bit_shift;</div><div class='add'>+	u32 vol_bit_width;</div><div class='add'>+	u32 min_bit_val;</div><div class='add'>+	u32 min_voltage;</div><div class='add'>+	u32 max_voltage;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -192,48 +191,41 @@ static int anatop_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	initdata-&gt;supply_regulator = "vin";</div><div class='del'>-	sreg-&gt;initdata = initdata;</div><div class='ctx'> </div><div class='ctx'> 	anatop_np = of_get_parent(np);</div><div class='ctx'> 	if (!anatop_np)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	sreg-&gt;anatop = syscon_node_to_regmap(anatop_np);</div><div class='add'>+	regmap = syscon_node_to_regmap(anatop_np);</div><div class='ctx'> 	of_node_put(anatop_np);</div><div class='del'>-	if (IS_ERR(sreg-&gt;anatop))</div><div class='del'>-		return PTR_ERR(sreg-&gt;anatop);</div><div class='add'>+	if (IS_ERR(regmap))</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='ctx'> </div><div class='del'>-	ret = of_property_read_u32(np, "anatop-reg-offset",</div><div class='del'>-				   &amp;sreg-&gt;control_reg);</div><div class='add'>+	ret = of_property_read_u32(np, "anatop-reg-offset", &amp;control_reg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "no anatop-reg-offset property set\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = of_property_read_u32(np, "anatop-vol-bit-width",</div><div class='del'>-				   &amp;sreg-&gt;vol_bit_width);</div><div class='add'>+	ret = of_property_read_u32(np, "anatop-vol-bit-width", &amp;vol_bit_width);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "no anatop-vol-bit-width property set\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = of_property_read_u32(np, "anatop-vol-bit-shift",</div><div class='del'>-				   &amp;sreg-&gt;vol_bit_shift);</div><div class='add'>+	ret = of_property_read_u32(np, "anatop-vol-bit-shift", &amp;vol_bit_shift);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "no anatop-vol-bit-shift property set\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = of_property_read_u32(np, "anatop-min-bit-val",</div><div class='del'>-				   &amp;sreg-&gt;min_bit_val);</div><div class='add'>+	ret = of_property_read_u32(np, "anatop-min-bit-val", &amp;min_bit_val);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "no anatop-min-bit-val property set\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = of_property_read_u32(np, "anatop-min-voltage",</div><div class='del'>-				   &amp;sreg-&gt;min_voltage);</div><div class='add'>+	ret = of_property_read_u32(np, "anatop-min-voltage", &amp;min_voltage);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "no anatop-min-voltage property set\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = of_property_read_u32(np, "anatop-max-voltage",</div><div class='del'>-				   &amp;sreg-&gt;max_voltage);</div><div class='add'>+	ret = of_property_read_u32(np, "anatop-max-voltage", &amp;max_voltage);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "no anatop-max-voltage property set\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -247,24 +239,23 @@ static int anatop_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	of_property_read_u32(np, "anatop-delay-bit-shift",</div><div class='ctx'> 			     &amp;sreg-&gt;delay_bit_shift);</div><div class='ctx'> </div><div class='del'>-	rdesc-&gt;n_voltages = (sreg-&gt;max_voltage - sreg-&gt;min_voltage) / 25000 + 1</div><div class='del'>-			    + sreg-&gt;min_bit_val;</div><div class='del'>-	rdesc-&gt;min_uV = sreg-&gt;min_voltage;</div><div class='add'>+	rdesc-&gt;n_voltages = (max_voltage - min_voltage) / 25000 + 1</div><div class='add'>+			    + min_bit_val;</div><div class='add'>+	rdesc-&gt;min_uV = min_voltage;</div><div class='ctx'> 	rdesc-&gt;uV_step = 25000;</div><div class='del'>-	rdesc-&gt;linear_min_sel = sreg-&gt;min_bit_val;</div><div class='del'>-	rdesc-&gt;vsel_reg = sreg-&gt;control_reg;</div><div class='del'>-	rdesc-&gt;vsel_mask = ((1 &lt;&lt; sreg-&gt;vol_bit_width) - 1) &lt;&lt;</div><div class='del'>-			   sreg-&gt;vol_bit_shift;</div><div class='add'>+	rdesc-&gt;linear_min_sel = min_bit_val;</div><div class='add'>+	rdesc-&gt;vsel_reg = control_reg;</div><div class='add'>+	rdesc-&gt;vsel_mask = ((1 &lt;&lt; vol_bit_width) - 1) &lt;&lt; vol_bit_shift;</div><div class='ctx'> 	rdesc-&gt;min_dropout_uV = 125000;</div><div class='ctx'> </div><div class='ctx'> 	config.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	config.init_data = initdata;</div><div class='ctx'> 	config.driver_data = sreg;</div><div class='ctx'> 	config.of_node = pdev-&gt;dev.of_node;</div><div class='del'>-	config.regmap = sreg-&gt;anatop;</div><div class='add'>+	config.regmap = regmap;</div><div class='ctx'> </div><div class='ctx'> 	/* Only core regulators have the ramp up delay configuration. */</div><div class='del'>-	if (sreg-&gt;control_reg &amp;&amp; sreg-&gt;delay_bit_width) {</div><div class='add'>+	if (control_reg &amp;&amp; sreg-&gt;delay_bit_width) {</div><div class='ctx'> 		rdesc-&gt;ops = &amp;anatop_core_rops;</div><div class='ctx'> </div><div class='ctx'> 		ret = regmap_read(config.regmap, rdesc-&gt;vsel_reg, &amp;val);</div><div class='hunk'>@@ -273,7 +264,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sreg-&gt;sel = (val &amp; rdesc-&gt;vsel_mask) &gt;&gt; sreg-&gt;vol_bit_shift;</div><div class='add'>+		sreg-&gt;sel = (val &amp; rdesc-&gt;vsel_mask) &gt;&gt; vol_bit_shift;</div><div class='ctx'> 		if (sreg-&gt;sel == LDO_FET_FULL_ON) {</div><div class='ctx'> 			sreg-&gt;sel = 0;</div><div class='ctx'> 			sreg-&gt;bypass = true;</div><div class='hunk'>@@ -306,7 +297,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 			anatop_rops.disable = regulator_disable_regmap;</div><div class='ctx'> 			anatop_rops.is_enabled = regulator_is_enabled_regmap;</div><div class='ctx'> </div><div class='del'>-			rdesc-&gt;enable_reg = sreg-&gt;control_reg;</div><div class='add'>+			rdesc-&gt;enable_reg = control_reg;</div><div class='ctx'> 			rdesc-&gt;enable_mask = BIT(enable_bit);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c<br/>index bf3ab405eed1..e4bc7b1e5ccd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/arizona-ldo1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/arizona-ldo1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/arizona-ldo1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/arizona-ldo1.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * arizona-ldo1.c  --  LDO1 supply for Arizona devices</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// arizona-ldo1.c  --  LDO1 supply for Arizona devices</div><div class='add'>+//</div><div class='add'>+// Copyright 2012 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='head'>diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c<br/>index 120de94caf02..be0d46da51a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/arizona-micsupp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/arizona-micsupp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/arizona-micsupp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/arizona-micsupp.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * arizona-micsupp.c  --  Microphone supply for Arizona devices</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// arizona-micsupp.c  --  Microphone supply for Arizona devices</div><div class='add'>+//</div><div class='add'>+// Copyright 2012 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='head'>diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c<br/>index f7fe218bb3e4..ece88103f2fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/as3711-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/as3711-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/as3711-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/as3711-regulator.c</a></div><div class='hunk'>@@ -17,14 +17,6 @@</div><div class='ctx'> #include &lt;linux/regulator/of_regulator.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-struct as3711_regulator_info {</div><div class='del'>-	struct regulator_desc	desc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct as3711_regulator {</div><div class='del'>-	struct as3711_regulator_info *reg_info;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The regulator API supports 4 modes of operataion: FAST, NORMAL, IDLE and</div><div class='ctx'>  * STANDBY. We map them in the following way to AS3711 SD1-4 DCDC modes:</div><div class='hunk'>@@ -129,7 +121,6 @@ static const struct regulator_linear_range as3711_dldo_ranges[] = {</div><div class='ctx'> </div><div class='ctx'> #define AS3711_REG(_id, _en_reg, _en_bit, _vmask, _sfx)			   \</div><div class='ctx'> 	[AS3711_REGULATOR_ ## _id] = {					   \</div><div class='del'>-	.desc = {							   \</div><div class='ctx'> 		.name = "as3711-regulator-" # _id,			   \</div><div class='ctx'> 		.id = AS3711_REGULATOR_ ## _id,				   \</div><div class='ctx'> 		.n_voltages = (_vmask + 1),				   \</div><div class='hunk'>@@ -142,10 +133,9 @@ static const struct regulator_linear_range as3711_dldo_ranges[] = {</div><div class='ctx'> 		.enable_mask = BIT(_en_bit),				   \</div><div class='ctx'> 		.linear_ranges = as3711_ ## _sfx ## _ranges,		   \</div><div class='ctx'> 		.n_linear_ranges = ARRAY_SIZE(as3711_ ## _sfx ## _ranges), \</div><div class='del'>-	},								   \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct as3711_regulator_info as3711_reg_info[] = {</div><div class='add'>+static const struct regulator_desc as3711_reg_desc[] = {</div><div class='ctx'> 	AS3711_REG(SD_1, SD_CONTROL, 0, 0x7f, sd),</div><div class='ctx'> 	AS3711_REG(SD_2, SD_CONTROL, 1, 0x7f, sd),</div><div class='ctx'> 	AS3711_REG(SD_3, SD_CONTROL, 2, 0x7f, sd),</div><div class='hunk'>@@ -161,7 +151,7 @@ static struct as3711_regulator_info as3711_reg_info[] = {</div><div class='ctx'> 	/* StepUp output voltage depends on supplying regulator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define AS3711_REGULATOR_NUM ARRAY_SIZE(as3711_reg_info)</div><div class='add'>+#define AS3711_REGULATOR_NUM ARRAY_SIZE(as3711_reg_desc)</div><div class='ctx'> </div><div class='ctx'> static struct of_regulator_match</div><div class='ctx'> as3711_regulator_matches[AS3711_REGULATOR_NUM] = {</div><div class='hunk'>@@ -215,11 +205,8 @@ static int as3711_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct as3711_regulator_pdata *pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct as3711 *as3711 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct regulator_config config = {.dev = &amp;pdev-&gt;dev,};</div><div class='del'>-	struct as3711_regulator *reg = NULL;</div><div class='del'>-	struct as3711_regulator *regs;</div><div class='ctx'> 	struct device_node *of_node[AS3711_REGULATOR_NUM] = {};</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='del'>-	struct as3711_regulator_info *ri;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='hunk'>@@ -236,30 +223,20 @@ static int as3711_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	regs = devm_kcalloc(&amp;pdev-&gt;dev,</div><div class='del'>-			    AS3711_REGULATOR_NUM,</div><div class='del'>-			    sizeof(struct as3711_regulator),</div><div class='del'>-			    GFP_KERNEL);</div><div class='del'>-	if (!regs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (id = 0, ri = as3711_reg_info; id &lt; AS3711_REGULATOR_NUM; ++id, ri++) {</div><div class='del'>-		reg = &amp;regs[id];</div><div class='del'>-		reg-&gt;reg_info = ri;</div><div class='del'>-</div><div class='add'>+	for (id = 0; id &lt; AS3711_REGULATOR_NUM; id++) {</div><div class='ctx'> 		config.init_data = pdata-&gt;init_data[id];</div><div class='del'>-		config.driver_data = reg;</div><div class='ctx'> 		config.regmap = as3711-&gt;regmap;</div><div class='ctx'> 		config.of_node = of_node[id];</div><div class='ctx'> </div><div class='del'>-		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;ri-&gt;desc, &amp;config);</div><div class='add'>+		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;as3711_reg_desc[id],</div><div class='add'>+					       &amp;config);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "Failed to register regulator %s\n",</div><div class='del'>-				ri-&gt;desc.name);</div><div class='add'>+				as3711_reg_desc[id].name);</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	platform_set_drvdata(pdev, regs);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c<br/>index e5fed289b52d..dc75c33bd950 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/as3722-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/as3722-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/as3722-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/as3722-regulator.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@ struct as3722_regulator_config_data {</div><div class='ctx'> struct as3722_regulators {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct as3722 *as3722;</div><div class='del'>-	struct regulator_dev *rdevs[AS3722_REGULATOR_ID_MAX];</div><div class='ctx'> 	struct regulator_desc desc[AS3722_REGULATOR_ID_MAX];</div><div class='ctx'> 	struct as3722_regulator_config_data</div><div class='ctx'> 			reg_config_data[AS3722_REGULATOR_ID_MAX];</div><div class='hunk'>@@ -314,63 +313,10 @@ static const struct as3722_register_mapping as3722_reg_lookup[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static const int as3722_ldo_current[] = { 150000, 300000 };</div><div class='del'>-static const int as3722_sd016_current[] = { 2500000, 3000000, 3500000 };</div><div class='del'>-</div><div class='del'>-static int as3722_current_to_index(int min_uA, int max_uA,</div><div class='del'>-		const int *curr_table, int n_currents)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = n_currents - 1; i &gt;= 0; i--) {</div><div class='del'>-		if ((min_uA &lt;= curr_table[i]) &amp;&amp; (curr_table[i] &lt;= max_uA))</div><div class='del'>-			return i;</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int as3722_ldo_get_current_limit(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);</div><div class='del'>-	struct as3722 *as3722 = as3722_regs-&gt;as3722;</div><div class='del'>-	int id = rdev_get_id(rdev);</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = as3722_read(as3722, as3722_reg_lookup[id].vsel_reg, &amp;val);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(as3722_regs-&gt;dev, "Reg 0x%02x read failed: %d\n",</div><div class='del'>-			as3722_reg_lookup[id].vsel_reg, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	if (val &amp; AS3722_LDO_ILIMIT_MASK)</div><div class='del'>-		return 300000;</div><div class='del'>-	return 150000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int as3722_ldo_set_current_limit(struct regulator_dev *rdev,</div><div class='del'>-		int min_uA, int max_uA)</div><div class='del'>-{</div><div class='del'>-	struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);</div><div class='del'>-	struct as3722 *as3722 = as3722_regs-&gt;as3722;</div><div class='del'>-	int id = rdev_get_id(rdev);</div><div class='del'>-	int ret;</div><div class='del'>-	u32 reg = 0;</div><div class='del'>-</div><div class='del'>-	ret = as3722_current_to_index(min_uA, max_uA, as3722_ldo_current,</div><div class='del'>-				ARRAY_SIZE(as3722_ldo_current));</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(as3722_regs-&gt;dev,</div><div class='del'>-			"Current range min:max = %d:%d does not support\n",</div><div class='del'>-			min_uA, max_uA);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	if (ret)</div><div class='del'>-		reg = AS3722_LDO_ILIMIT_BIT;</div><div class='del'>-	return as3722_update_bits(as3722, as3722_reg_lookup[id].vsel_reg,</div><div class='del'>-			AS3722_LDO_ILIMIT_MASK, reg);</div><div class='del'>-}</div><div class='add'>+static const unsigned int as3722_ldo_current[] = { 150000, 300000 };</div><div class='add'>+static const unsigned int as3722_sd016_current[] = {</div><div class='add'>+	2500000, 3000000, 3500000</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_ops as3722_ldo0_ops = {</div><div class='ctx'> 	.is_enabled = regulator_is_enabled_regmap,</div><div class='hunk'>@@ -379,16 +325,16 @@ static const struct regulator_ops as3722_ldo0_ops = {</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='del'>-	.get_current_limit = as3722_ldo_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_ldo_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_ops as3722_ldo0_extcntrl_ops = {</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='del'>-	.get_current_limit = as3722_ldo_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_ldo_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int as3722_ldo3_set_tracking_mode(struct as3722_regulators *as3722_reg,</div><div class='hunk'>@@ -440,8 +386,8 @@ static const struct regulator_ops as3722_ldo6_ops = {</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear_range,</div><div class='del'>-	.get_current_limit = as3722_ldo_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_ldo_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> 	.get_bypass = regulator_get_bypass_regmap,</div><div class='ctx'> 	.set_bypass = regulator_set_bypass_regmap,</div><div class='ctx'> };</div><div class='hunk'>@@ -451,8 +397,8 @@ static const struct regulator_ops as3722_ldo6_extcntrl_ops = {</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear_range,</div><div class='del'>-	.get_current_limit = as3722_ldo_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_ldo_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> 	.get_bypass = regulator_get_bypass_regmap,</div><div class='ctx'> 	.set_bypass = regulator_set_bypass_regmap,</div><div class='ctx'> };</div><div class='hunk'>@@ -471,8 +417,8 @@ static const struct regulator_ops as3722_ldo_ops = {</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear_range,</div><div class='del'>-	.get_current_limit = as3722_ldo_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_ldo_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_ops as3722_ldo_extcntrl_ops = {</div><div class='hunk'>@@ -480,8 +426,8 @@ static const struct regulator_ops as3722_ldo_extcntrl_ops = {</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear_range,</div><div class='del'>-	.get_current_limit = as3722_ldo_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_ldo_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int as3722_sd_get_mode(struct regulator_dev *rdev)</div><div class='hunk'>@@ -539,85 +485,6 @@ static int as3722_sd_set_mode(struct regulator_dev *rdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int as3722_sd016_get_current_limit(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);</div><div class='del'>-	struct as3722 *as3722 = as3722_regs-&gt;as3722;</div><div class='del'>-	int id = rdev_get_id(rdev);</div><div class='del'>-	u32 val, reg;</div><div class='del'>-	int mask;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (id) {</div><div class='del'>-	case AS3722_REGULATOR_ID_SD0:</div><div class='del'>-		reg = AS3722_OVCURRENT_REG;</div><div class='del'>-		mask = AS3722_OVCURRENT_SD0_TRIP_MASK;</div><div class='del'>-		break;</div><div class='del'>-	case AS3722_REGULATOR_ID_SD1:</div><div class='del'>-		reg = AS3722_OVCURRENT_REG;</div><div class='del'>-		mask = AS3722_OVCURRENT_SD1_TRIP_MASK;</div><div class='del'>-		break;</div><div class='del'>-	case AS3722_REGULATOR_ID_SD6:</div><div class='del'>-		reg = AS3722_OVCURRENT_DEB_REG;</div><div class='del'>-		mask = AS3722_OVCURRENT_SD6_TRIP_MASK;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ret = as3722_read(as3722, reg, &amp;val);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(as3722_regs-&gt;dev, "Reg 0x%02x read failed: %d\n",</div><div class='del'>-			reg, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	val &amp;= mask;</div><div class='del'>-	val &gt;&gt;= ffs(mask) - 1;</div><div class='del'>-	if (val == 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return as3722_sd016_current[val];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int as3722_sd016_set_current_limit(struct regulator_dev *rdev,</div><div class='del'>-		int min_uA, int max_uA)</div><div class='del'>-{</div><div class='del'>-	struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);</div><div class='del'>-	struct as3722 *as3722 = as3722_regs-&gt;as3722;</div><div class='del'>-	int id = rdev_get_id(rdev);</div><div class='del'>-	int ret;</div><div class='del'>-	int val;</div><div class='del'>-	int mask;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	ret = as3722_current_to_index(min_uA, max_uA, as3722_sd016_current,</div><div class='del'>-				ARRAY_SIZE(as3722_sd016_current));</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(as3722_regs-&gt;dev,</div><div class='del'>-			"Current range min:max = %d:%d does not support\n",</div><div class='del'>-			min_uA, max_uA);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (id) {</div><div class='del'>-	case AS3722_REGULATOR_ID_SD0:</div><div class='del'>-		reg = AS3722_OVCURRENT_REG;</div><div class='del'>-		mask = AS3722_OVCURRENT_SD0_TRIP_MASK;</div><div class='del'>-		break;</div><div class='del'>-	case AS3722_REGULATOR_ID_SD1:</div><div class='del'>-		reg = AS3722_OVCURRENT_REG;</div><div class='del'>-		mask = AS3722_OVCURRENT_SD1_TRIP_MASK;</div><div class='del'>-		break;</div><div class='del'>-	case AS3722_REGULATOR_ID_SD6:</div><div class='del'>-		reg = AS3722_OVCURRENT_DEB_REG;</div><div class='del'>-		mask = AS3722_OVCURRENT_SD6_TRIP_MASK;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ret &lt;&lt;= ffs(mask) - 1;</div><div class='del'>-	val = ret &amp; mask;</div><div class='del'>-	return as3722_update_bits(as3722, reg, mask, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool as3722_sd0_is_low_voltage(struct as3722_regulators *as3722_regs)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -649,8 +516,8 @@ static const struct regulator_ops as3722_sd016_ops = {</div><div class='ctx'> 	.map_voltage = regulator_map_voltage_linear,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='del'>-	.get_current_limit = as3722_sd016_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_sd016_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> 	.get_mode = as3722_sd_get_mode,</div><div class='ctx'> 	.set_mode = as3722_sd_set_mode,</div><div class='ctx'> };</div><div class='hunk'>@@ -660,8 +527,8 @@ static const struct regulator_ops as3722_sd016_extcntrl_ops = {</div><div class='ctx'> 	.map_voltage = regulator_map_voltage_linear,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.set_voltage_sel = regulator_set_voltage_sel_regmap,</div><div class='del'>-	.get_current_limit = as3722_sd016_get_current_limit,</div><div class='del'>-	.set_current_limit = as3722_sd016_set_current_limit,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='ctx'> 	.get_mode = as3722_sd_get_mode,</div><div class='ctx'> 	.set_mode = as3722_sd_set_mode,</div><div class='ctx'> };</div><div class='hunk'>@@ -807,42 +674,45 @@ static int as3722_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	config.regmap = as3722-&gt;regmap;</div><div class='ctx'> </div><div class='ctx'> 	for (id = 0; id &lt; AS3722_REGULATOR_ID_MAX; id++) {</div><div class='add'>+		struct regulator_desc *desc;</div><div class='add'>+</div><div class='add'>+		desc = &amp;as3722_regs-&gt;desc[id];</div><div class='ctx'> 		reg_config = &amp;as3722_regs-&gt;reg_config_data[id];</div><div class='ctx'> </div><div class='del'>-		as3722_regs-&gt;desc[id].name = as3722_reg_lookup[id].name;</div><div class='del'>-		as3722_regs-&gt;desc[id].supply_name = as3722_reg_lookup[id].sname;</div><div class='del'>-		as3722_regs-&gt;desc[id].id = as3722_reg_lookup[id].regulator_id;</div><div class='del'>-		as3722_regs-&gt;desc[id].n_voltages =</div><div class='del'>-					as3722_reg_lookup[id].n_voltages;</div><div class='del'>-		as3722_regs-&gt;desc[id].type = REGULATOR_VOLTAGE;</div><div class='del'>-		as3722_regs-&gt;desc[id].owner = THIS_MODULE;</div><div class='del'>-		as3722_regs-&gt;desc[id].enable_reg =</div><div class='del'>-					as3722_reg_lookup[id].enable_reg;</div><div class='del'>-		as3722_regs-&gt;desc[id].enable_mask =</div><div class='del'>-					as3722_reg_lookup[id].enable_mask;</div><div class='del'>-		as3722_regs-&gt;desc[id].vsel_reg = as3722_reg_lookup[id].vsel_reg;</div><div class='del'>-		as3722_regs-&gt;desc[id].vsel_mask =</div><div class='del'>-					as3722_reg_lookup[id].vsel_mask;</div><div class='add'>+		desc-&gt;name = as3722_reg_lookup[id].name;</div><div class='add'>+		desc-&gt;supply_name = as3722_reg_lookup[id].sname;</div><div class='add'>+		desc-&gt;id = as3722_reg_lookup[id].regulator_id;</div><div class='add'>+		desc-&gt;n_voltages = as3722_reg_lookup[id].n_voltages;</div><div class='add'>+		desc-&gt;type = REGULATOR_VOLTAGE;</div><div class='add'>+		desc-&gt;owner = THIS_MODULE;</div><div class='add'>+		desc-&gt;enable_reg = as3722_reg_lookup[id].enable_reg;</div><div class='add'>+		desc-&gt;enable_mask = as3722_reg_lookup[id].enable_mask;</div><div class='add'>+		desc-&gt;vsel_reg = as3722_reg_lookup[id].vsel_reg;</div><div class='add'>+		desc-&gt;vsel_mask = as3722_reg_lookup[id].vsel_mask;</div><div class='ctx'> 		switch (id) {</div><div class='ctx'> 		case AS3722_REGULATOR_ID_LDO0:</div><div class='ctx'> 			if (reg_config-&gt;ext_control)</div><div class='ctx'> 				ops = &amp;as3722_ldo0_extcntrl_ops;</div><div class='ctx'> 			else</div><div class='ctx'> 				ops = &amp;as3722_ldo0_ops;</div><div class='del'>-			as3722_regs-&gt;desc[id].min_uV = 825000;</div><div class='del'>-			as3722_regs-&gt;desc[id].uV_step = 25000;</div><div class='del'>-			as3722_regs-&gt;desc[id].linear_min_sel = 1;</div><div class='del'>-			as3722_regs-&gt;desc[id].enable_time = 500;</div><div class='add'>+			desc-&gt;min_uV = 825000;</div><div class='add'>+			desc-&gt;uV_step = 25000;</div><div class='add'>+			desc-&gt;linear_min_sel = 1;</div><div class='add'>+			desc-&gt;enable_time = 500;</div><div class='add'>+			desc-&gt;curr_table = as3722_ldo_current;</div><div class='add'>+			desc-&gt;n_current_limits = ARRAY_SIZE(as3722_ldo_current);</div><div class='add'>+			desc-&gt;csel_reg = as3722_reg_lookup[id].vsel_reg;</div><div class='add'>+			desc-&gt;csel_mask = AS3722_LDO_ILIMIT_MASK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AS3722_REGULATOR_ID_LDO3:</div><div class='ctx'> 			if (reg_config-&gt;ext_control)</div><div class='ctx'> 				ops = &amp;as3722_ldo3_extcntrl_ops;</div><div class='ctx'> 			else</div><div class='ctx'> 				ops = &amp;as3722_ldo3_ops;</div><div class='del'>-			as3722_regs-&gt;desc[id].min_uV = 620000;</div><div class='del'>-			as3722_regs-&gt;desc[id].uV_step = 20000;</div><div class='del'>-			as3722_regs-&gt;desc[id].linear_min_sel = 1;</div><div class='del'>-			as3722_regs-&gt;desc[id].enable_time = 500;</div><div class='add'>+			desc-&gt;min_uV = 620000;</div><div class='add'>+			desc-&gt;uV_step = 20000;</div><div class='add'>+			desc-&gt;linear_min_sel = 1;</div><div class='add'>+			desc-&gt;enable_time = 500;</div><div class='ctx'> 			if (reg_config-&gt;enable_tracking) {</div><div class='ctx'> 				ret = as3722_ldo3_set_tracking_mode(as3722_regs,</div><div class='ctx'> 					id, AS3722_LDO3_MODE_PMOS_TRACKING);</div><div class='hunk'>@@ -859,18 +729,17 @@ static int as3722_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 				ops = &amp;as3722_ldo6_extcntrl_ops;</div><div class='ctx'> 			else</div><div class='ctx'> 				ops = &amp;as3722_ldo6_ops;</div><div class='del'>-			as3722_regs-&gt;desc[id].enable_time = 500;</div><div class='del'>-			as3722_regs-&gt;desc[id].bypass_reg =</div><div class='del'>-						AS3722_LDO6_VOLTAGE_REG;</div><div class='del'>-			as3722_regs-&gt;desc[id].bypass_mask =</div><div class='del'>-						AS3722_LDO_VSEL_MASK;</div><div class='del'>-			as3722_regs-&gt;desc[id].bypass_val_on =</div><div class='del'>-						AS3722_LDO6_VSEL_BYPASS;</div><div class='del'>-			as3722_regs-&gt;desc[id].bypass_val_off =</div><div class='del'>-						AS3722_LDO6_VSEL_BYPASS;</div><div class='del'>-			as3722_regs-&gt;desc[id].linear_ranges = as3722_ldo_ranges;</div><div class='del'>-			as3722_regs-&gt;desc[id].n_linear_ranges =</div><div class='del'>-						ARRAY_SIZE(as3722_ldo_ranges);</div><div class='add'>+			desc-&gt;enable_time = 500;</div><div class='add'>+			desc-&gt;bypass_reg = AS3722_LDO6_VOLTAGE_REG;</div><div class='add'>+			desc-&gt;bypass_mask = AS3722_LDO_VSEL_MASK;</div><div class='add'>+			desc-&gt;bypass_val_on = AS3722_LDO6_VSEL_BYPASS;</div><div class='add'>+			desc-&gt;bypass_val_off = AS3722_LDO6_VSEL_BYPASS;</div><div class='add'>+			desc-&gt;linear_ranges = as3722_ldo_ranges;</div><div class='add'>+			desc-&gt;n_linear_ranges = ARRAY_SIZE(as3722_ldo_ranges);</div><div class='add'>+			desc-&gt;curr_table = as3722_ldo_current;</div><div class='add'>+			desc-&gt;n_current_limits = ARRAY_SIZE(as3722_ldo_current);</div><div class='add'>+			desc-&gt;csel_reg = as3722_reg_lookup[id].vsel_reg;</div><div class='add'>+			desc-&gt;csel_mask = AS3722_LDO_ILIMIT_MASK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AS3722_REGULATOR_ID_SD0:</div><div class='ctx'> 		case AS3722_REGULATOR_ID_SD1:</div><div class='hunk'>@@ -889,9 +758,25 @@ static int as3722_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 					AS3722_SD0_VSEL_MAX + 1;</div><div class='ctx'> 				as3722_regs-&gt;desc[id].min_uV = 610000;</div><div class='ctx'> 			}</div><div class='del'>-			as3722_regs-&gt;desc[id].uV_step = 10000;</div><div class='del'>-			as3722_regs-&gt;desc[id].linear_min_sel = 1;</div><div class='del'>-			as3722_regs-&gt;desc[id].enable_time = 600;</div><div class='add'>+			desc-&gt;uV_step = 10000;</div><div class='add'>+			desc-&gt;linear_min_sel = 1;</div><div class='add'>+			desc-&gt;enable_time = 600;</div><div class='add'>+			desc-&gt;curr_table = as3722_sd016_current;</div><div class='add'>+			desc-&gt;n_current_limits =</div><div class='add'>+				ARRAY_SIZE(as3722_sd016_current);</div><div class='add'>+			if (id == AS3722_REGULATOR_ID_SD0) {</div><div class='add'>+				desc-&gt;csel_reg = AS3722_OVCURRENT_REG;</div><div class='add'>+				desc-&gt;csel_mask =</div><div class='add'>+					AS3722_OVCURRENT_SD0_TRIP_MASK;</div><div class='add'>+			} else if (id == AS3722_REGULATOR_ID_SD1) {</div><div class='add'>+				desc-&gt;csel_reg = AS3722_OVCURRENT_REG;</div><div class='add'>+				desc-&gt;csel_mask =</div><div class='add'>+					AS3722_OVCURRENT_SD1_TRIP_MASK;</div><div class='add'>+			} else if (id == AS3722_REGULATOR_ID_SD6) {</div><div class='add'>+				desc-&gt;csel_reg = AS3722_OVCURRENT_DEB_REG;</div><div class='add'>+				desc-&gt;csel_mask =</div><div class='add'>+					AS3722_OVCURRENT_SD6_TRIP_MASK;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AS3722_REGULATOR_ID_SD2:</div><div class='ctx'> 		case AS3722_REGULATOR_ID_SD3:</div><div class='hunk'>@@ -901,9 +786,8 @@ static int as3722_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 				ops = &amp;as3722_sd2345_extcntrl_ops;</div><div class='ctx'> 			else</div><div class='ctx'> 				ops = &amp;as3722_sd2345_ops;</div><div class='del'>-			as3722_regs-&gt;desc[id].linear_ranges =</div><div class='del'>-						as3722_sd2345_ranges;</div><div class='del'>-			as3722_regs-&gt;desc[id].n_linear_ranges =</div><div class='add'>+			desc-&gt;linear_ranges = as3722_sd2345_ranges;</div><div class='add'>+			desc-&gt;n_linear_ranges =</div><div class='ctx'> 					ARRAY_SIZE(as3722_sd2345_ranges);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -911,17 +795,19 @@ static int as3722_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 				ops = &amp;as3722_ldo_extcntrl_ops;</div><div class='ctx'> 			else</div><div class='ctx'> 				ops = &amp;as3722_ldo_ops;</div><div class='del'>-			as3722_regs-&gt;desc[id].enable_time = 500;</div><div class='del'>-			as3722_regs-&gt;desc[id].linear_ranges = as3722_ldo_ranges;</div><div class='del'>-			as3722_regs-&gt;desc[id].n_linear_ranges =</div><div class='del'>-						ARRAY_SIZE(as3722_ldo_ranges);</div><div class='add'>+			desc-&gt;enable_time = 500;</div><div class='add'>+			desc-&gt;linear_ranges = as3722_ldo_ranges;</div><div class='add'>+			desc-&gt;n_linear_ranges = ARRAY_SIZE(as3722_ldo_ranges);</div><div class='add'>+			desc-&gt;curr_table = as3722_ldo_current;</div><div class='add'>+			desc-&gt;n_current_limits = ARRAY_SIZE(as3722_ldo_current);</div><div class='add'>+			desc-&gt;csel_reg = as3722_reg_lookup[id].vsel_reg;</div><div class='add'>+			desc-&gt;csel_mask = AS3722_LDO_ILIMIT_MASK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		as3722_regs-&gt;desc[id].ops = ops;</div><div class='add'>+		desc-&gt;ops = ops;</div><div class='ctx'> 		config.init_data = reg_config-&gt;reg_init;</div><div class='ctx'> 		config.of_node = as3722_regulator_matches[id].of_node;</div><div class='del'>-		rdev = devm_regulator_register(&amp;pdev-&gt;dev,</div><div class='del'>-					&amp;as3722_regs-&gt;desc[id], &amp;config);</div><div class='add'>+		rdev = devm_regulator_register(&amp;pdev-&gt;dev, desc, &amp;config);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			ret = PTR_ERR(rdev);</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "regulator %d register failed %d\n",</div><div class='hunk'>@@ -929,7 +815,6 @@ static int as3722_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		as3722_regs-&gt;rdevs[id] = rdev;</div><div class='ctx'> 		if (reg_config-&gt;ext_control) {</div><div class='ctx'> 			ret = regulator_enable_regmap(rdev);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='head'>diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c<br/>index fba8f58ab769..152053361862 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/axp20x-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/axp20x-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/axp20x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/axp20x-regulator.c</a></div><div class='hunk'>@@ -367,16 +367,14 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {</div><div class='ctx'> static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)</div><div class='ctx'> {</div><div class='ctx'> 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);</div><div class='del'>-	const struct regulator_desc *desc;</div><div class='add'>+	int id = rdev_get_id(rdev);</div><div class='ctx'> 	u8 reg, mask, enable, cfg = 0xff;</div><div class='ctx'> 	const int *slew_rates;</div><div class='ctx'> 	int rate_count = 0;</div><div class='ctx'> </div><div class='del'>-	desc = rdev-&gt;desc;</div><div class='del'>-</div><div class='ctx'> 	switch (axp20x-&gt;variant) {</div><div class='ctx'> 	case AXP209_ID:</div><div class='del'>-		if (desc-&gt;id == AXP20X_DCDC2) {</div><div class='add'>+		if (id == AXP20X_DCDC2) {</div><div class='ctx'> 			slew_rates = axp209_dcdc2_ldo3_slew_rates;</div><div class='ctx'> 			rate_count = ARRAY_SIZE(axp209_dcdc2_ldo3_slew_rates);</div><div class='ctx'> 			reg = AXP20X_DCDC2_LDO3_V_RAMP;</div><div class='hunk'>@@ -388,7 +386,7 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (desc-&gt;id == AXP20X_LDO3) {</div><div class='add'>+		if (id == AXP20X_LDO3) {</div><div class='ctx'> 			slew_rates = axp209_dcdc2_ldo3_slew_rates;</div><div class='ctx'> 			rate_count = ARRAY_SIZE(axp209_dcdc2_ldo3_slew_rates);</div><div class='ctx'> 			reg = AXP20X_DCDC2_LDO3_V_RAMP;</div><div class='hunk'>@@ -435,16 +433,11 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)</div><div class='ctx'> static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);</div><div class='del'>-	const struct regulator_desc *desc;</div><div class='del'>-</div><div class='del'>-	if (!rdev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	desc = rdev-&gt;desc;</div><div class='add'>+	int id = rdev_get_id(rdev);</div><div class='ctx'> </div><div class='ctx'> 	switch (axp20x-&gt;variant) {</div><div class='ctx'> 	case AXP209_ID:</div><div class='del'>-		if ((desc-&gt;id == AXP20X_LDO3) &amp;&amp;</div><div class='add'>+		if ((id == AXP20X_LDO3) &amp;&amp;</div><div class='ctx'> 		    rdev-&gt;constraints &amp;&amp; rdev-&gt;constraints-&gt;soft_start) {</div><div class='ctx'> 			int v_out;</div><div class='ctx'> 			int ret;</div><div class='hunk'>@@ -1028,7 +1021,7 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)</div><div class='ctx'> 		 * (See include/linux/mfd/axp20x.h)</div><div class='ctx'> 		 */</div><div class='ctx'> 		reg = AXP803_DCDC_FREQ_CTRL;</div><div class='del'>-		/* Fall through to the check below.*/</div><div class='add'>+		/* Fall through - to the check below.*/</div><div class='ctx'> 	case AXP806_ID:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * AXP806 also have DCDC work frequency setting register at a</div><div class='hunk'>@@ -1119,12 +1112,12 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AXP806_ID:</div><div class='del'>-		reg = AXP806_DCDC_MODE_CTRL2;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * AXP806 DCDC regulator IDs have the same range as AXP22X.</div><div class='del'>-		 * Fall through to the check below.</div><div class='ctx'> 		 * (See include/linux/mfd/axp20x.h)</div><div class='ctx'> 		 */</div><div class='add'>+		reg = AXP806_DCDC_MODE_CTRL2;</div><div class='add'>+		 /* Fall through - to the check below. */</div><div class='ctx'> 	case AXP221_ID:</div><div class='ctx'> 	case AXP223_ID:</div><div class='ctx'> 	case AXP809_ID:</div><div class='head'>diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c<br/>index e49c0a7d5dd5..85ccc93b2bb6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/bcm590xx-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/bcm590xx-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/bcm590xx-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/bcm590xx-regulator.c</a></div><div class='hunk'>@@ -103,10 +103,6 @@</div><div class='ctx'> 	((n &gt; BCM590XX_REG_VSR) &amp;&amp; (n &lt; BCM590XX_REG_VBUS))</div><div class='ctx'> #define BCM590XX_REG_IS_VBUS(n)	(n == BCM590XX_REG_VBUS)</div><div class='ctx'> </div><div class='del'>-struct bcm590xx_board {</div><div class='del'>-	struct regulator_init_data *bcm590xx_pmu_init_data[BCM590XX_NUM_REGS];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* LDO group A: supported voltages in microvolts */</div><div class='ctx'> static const unsigned int ldo_a_table[] = {</div><div class='ctx'> 	1200000, 1800000, 2500000, 2700000, 2800000,</div><div class='hunk'>@@ -280,105 +276,15 @@ static const struct regulator_ops bcm590xx_ops_vbus = {</div><div class='ctx'> 	.disable		= regulator_disable_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BCM590XX_MATCH(_name, _id) \</div><div class='del'>-	{ \</div><div class='del'>-		.name = #_name, \</div><div class='del'>-		.driver_data = (void *)&amp;bcm590xx_regs[BCM590XX_REG_##_id], \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match bcm590xx_matches[] = {</div><div class='del'>-	BCM590XX_MATCH(rfldo, RFLDO),</div><div class='del'>-	BCM590XX_MATCH(camldo1, CAMLDO1),</div><div class='del'>-	BCM590XX_MATCH(camldo2, CAMLDO2),</div><div class='del'>-	BCM590XX_MATCH(simldo1, SIMLDO1),</div><div class='del'>-	BCM590XX_MATCH(simldo2, SIMLDO2),</div><div class='del'>-	BCM590XX_MATCH(sdldo, SDLDO),</div><div class='del'>-	BCM590XX_MATCH(sdxldo, SDXLDO),</div><div class='del'>-	BCM590XX_MATCH(mmcldo1, MMCLDO1),</div><div class='del'>-	BCM590XX_MATCH(mmcldo2, MMCLDO2),</div><div class='del'>-	BCM590XX_MATCH(audldo, AUDLDO),</div><div class='del'>-	BCM590XX_MATCH(micldo, MICLDO),</div><div class='del'>-	BCM590XX_MATCH(usbldo, USBLDO),</div><div class='del'>-	BCM590XX_MATCH(vibldo, VIBLDO),</div><div class='del'>-	BCM590XX_MATCH(csr, CSR),</div><div class='del'>-	BCM590XX_MATCH(iosr1, IOSR1),</div><div class='del'>-	BCM590XX_MATCH(iosr2, IOSR2),</div><div class='del'>-	BCM590XX_MATCH(msr, MSR),</div><div class='del'>-	BCM590XX_MATCH(sdsr1, SDSR1),</div><div class='del'>-	BCM590XX_MATCH(sdsr2, SDSR2),</div><div class='del'>-	BCM590XX_MATCH(vsr, VSR),</div><div class='del'>-	BCM590XX_MATCH(gpldo1, GPLDO1),</div><div class='del'>-	BCM590XX_MATCH(gpldo2, GPLDO2),</div><div class='del'>-	BCM590XX_MATCH(gpldo3, GPLDO3),</div><div class='del'>-	BCM590XX_MATCH(gpldo4, GPLDO4),</div><div class='del'>-	BCM590XX_MATCH(gpldo5, GPLDO5),</div><div class='del'>-	BCM590XX_MATCH(gpldo6, GPLDO6),</div><div class='del'>-	BCM590XX_MATCH(vbus, VBUS),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bcm590xx_board *bcm590xx_parse_dt_reg_data(</div><div class='del'>-		struct platform_device *pdev,</div><div class='del'>-		struct of_regulator_match **bcm590xx_reg_matches)</div><div class='del'>-{</div><div class='del'>-	struct bcm590xx_board *data;</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.parent-&gt;of_node;</div><div class='del'>-	struct device_node *regulators;</div><div class='del'>-	struct of_regulator_match *matches = bcm590xx_matches;</div><div class='del'>-	int count = ARRAY_SIZE(bcm590xx_matches);</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "of node not found\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*data), GFP_KERNEL);</div><div class='del'>-	if (!data)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	np = of_node_get(np);</div><div class='del'>-	regulators = of_get_child_by_name(np, "regulators");</div><div class='del'>-	if (!regulators) {</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "regulator node not found\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = of_regulator_match(&amp;pdev-&gt;dev, regulators, matches, count);</div><div class='del'>-	of_node_put(regulators);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Error parsing regulator init data: %d\n",</div><div class='del'>-			ret);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*bcm590xx_reg_matches = matches;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; count; idx++) {</div><div class='del'>-		if (!matches[idx].init_data || !matches[idx].of_node)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		data-&gt;bcm590xx_pmu_init_data[idx] = matches[idx].init_data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bcm590xx_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm590xx *bcm590xx = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='del'>-	struct bcm590xx_board *pmu_data = NULL;</div><div class='ctx'> 	struct bcm590xx_reg *pmu;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='ctx'> 	struct bcm590xx_info *info;</div><div class='del'>-	struct regulator_init_data *reg_data;</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='del'>-	struct of_regulator_match *bcm590xx_reg_matches = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pmu_data = bcm590xx_parse_dt_reg_data(pdev,</div><div class='del'>-					      &amp;bcm590xx_reg_matches);</div><div class='del'>-</div><div class='ctx'> 	pmu = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pmu), GFP_KERNEL);</div><div class='ctx'> 	if (!pmu)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -397,13 +303,10 @@ static int bcm590xx_probe(struct platform_device *pdev)</div><div class='ctx'> 	info = bcm590xx_regs;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BCM590XX_NUM_REGS; i++, info++) {</div><div class='del'>-		if (pmu_data)</div><div class='del'>-			reg_data = pmu_data-&gt;bcm590xx_pmu_init_data[i];</div><div class='del'>-		else</div><div class='del'>-			reg_data = NULL;</div><div class='del'>-</div><div class='ctx'> 		/* Register the regulators */</div><div class='ctx'> 		pmu-&gt;desc[i].name = info-&gt;name;</div><div class='add'>+		pmu-&gt;desc[i].of_match = of_match_ptr(info-&gt;name);</div><div class='add'>+		pmu-&gt;desc[i].regulators_node = of_match_ptr("regulators");</div><div class='ctx'> 		pmu-&gt;desc[i].supply_name = info-&gt;vin_name;</div><div class='ctx'> 		pmu-&gt;desc[i].id = i;</div><div class='ctx'> 		pmu-&gt;desc[i].volt_table = info-&gt;volt_table;</div><div class='hunk'>@@ -433,16 +336,12 @@ static int bcm590xx_probe(struct platform_device *pdev)</div><div class='ctx'> 		pmu-&gt;desc[i].owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 		config.dev = bcm590xx-&gt;dev;</div><div class='del'>-		config.init_data = reg_data;</div><div class='ctx'> 		config.driver_data = pmu;</div><div class='ctx'> 		if (BCM590XX_REG_IS_GPLDO(i) || BCM590XX_REG_IS_VBUS(i))</div><div class='ctx'> 			config.regmap = bcm590xx-&gt;regmap_sec;</div><div class='ctx'> 		else</div><div class='ctx'> 			config.regmap = bcm590xx-&gt;regmap_pri;</div><div class='ctx'> </div><div class='del'>-		if (bcm590xx_reg_matches)</div><div class='del'>-			config.of_node = bcm590xx_reg_matches[i].of_node;</div><div class='del'>-</div><div class='ctx'> 		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;pmu-&gt;desc[i],</div><div class='ctx'> 					       &amp;config);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='head'>diff --git a/drivers/regulator/bd718x7-regulator.c b/drivers/regulator/bd718x7-regulator.c<br/>index b2191be49670..fde4264da6ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/bd718x7-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/bd718x7-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/bd718x7-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/bd718x7-regulator.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> static int bd718xx_buck1234_set_ramp_delay(struct regulator_dev *rdev,</div><div class='ctx'> 					   int ramp_delay)</div><div class='ctx'> {</div><div class='del'>-	int id = rdev-&gt;desc-&gt;id;</div><div class='del'>-	unsigned int ramp_value = BUCK_RAMPRATE_10P00MV;</div><div class='add'>+	int id = rdev_get_id(rdev);</div><div class='add'>+	unsigned int ramp_value;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;rdev-&gt;dev, "Buck[%d] Set Ramp = %d\n", id + 1,</div><div class='ctx'> 		ramp_delay);</div><div class='head'>diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c<br/>index 68473d0cc57e..955a0a15b9cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/core.c</a></div><div class='hunk'>@@ -1339,9 +1339,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,</div><div class='ctx'> 		 * We'll only apply the initial system load if an</div><div class='ctx'> 		 * initial mode wasn't specified.</div><div class='ctx'> 		 */</div><div class='del'>-		regulator_lock(rdev);</div><div class='ctx'> 		drms_uA_update(rdev);</div><div class='del'>-		regulator_unlock(rdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((rdev-&gt;constraints-&gt;ramp_delay || rdev-&gt;constraints-&gt;ramp_disable)</div><div class='hunk'>@@ -2256,6 +2254,7 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev)</div><div class='ctx'> 		if (pin-&gt;gpiod == rdev-&gt;ena_pin-&gt;gpiod) {</div><div class='ctx'> 			if (pin-&gt;request_count &lt;= 1) {</div><div class='ctx'> 				pin-&gt;request_count = 0;</div><div class='add'>+				gpiod_put(pin-&gt;gpiod);</div><div class='ctx'> 				list_del(&amp;pin-&gt;list);</div><div class='ctx'> 				kfree(pin);</div><div class='ctx'> 				rdev-&gt;ena_pin = NULL;</div><div class='hunk'>@@ -3004,7 +3003,7 @@ EXPORT_SYMBOL_GPL(regulator_get_linear_step);</div><div class='ctx'>  * @min_uV: Minimum required voltage in uV.</div><div class='ctx'>  * @max_uV: Maximum required voltage in uV.</div><div class='ctx'>  *</div><div class='del'>- * Returns a boolean or a negative error code.</div><div class='add'>+ * Returns a boolean.</div><div class='ctx'>  */</div><div class='ctx'> int regulator_is_supported_voltage(struct regulator *regulator,</div><div class='ctx'> 				   int min_uV, int max_uV)</div><div class='hunk'>@@ -3028,7 +3027,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,</div><div class='ctx'> </div><div class='ctx'> 	ret = regulator_count_voltages(regulator);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+		return 0;</div><div class='ctx'> 	voltages = ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; voltages; i++) {</div><div class='hunk'>@@ -3322,15 +3321,12 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,</div><div class='ctx'> </div><div class='ctx'> 	/* for not coupled regulators this will just set the voltage */</div><div class='ctx'> 	ret = regulator_balance_voltage(rdev, state);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out2;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		voltage-&gt;min_uV = old_min_uV;</div><div class='add'>+		voltage-&gt;max_uV = old_max_uV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	return 0;</div><div class='del'>-out2:</div><div class='del'>-	voltage-&gt;min_uV = old_min_uV;</div><div class='del'>-	voltage-&gt;max_uV = old_max_uV;</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4347,8 +4343,6 @@ int regulator_bulk_get(struct device *dev, int num_consumers,</div><div class='ctx'> 						      consumers[i].supply);</div><div class='ctx'> 		if (IS_ERR(consumers[i].consumer)) {</div><div class='ctx'> 			ret = PTR_ERR(consumers[i].consumer);</div><div class='del'>-			dev_err(dev, "Failed to get supply '%s': %d\n",</div><div class='del'>-				consumers[i].supply, ret);</div><div class='ctx'> 			consumers[i].consumer = NULL;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4357,6 +4351,13 @@ int regulator_bulk_get(struct device *dev, int num_consumers,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='add'>+	if (ret != -EPROBE_DEFER)</div><div class='add'>+		dev_err(dev, "Failed to get supply '%s': %d\n",</div><div class='add'>+			consumers[i].supply, ret);</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(dev, "Failed to get supply '%s', deferring\n",</div><div class='add'>+			consumers[i].supply);</div><div class='add'>+</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='ctx'> 		regulator_put(consumers[i].consumer);</div><div class='ctx'> </div><div class='hunk'>@@ -5064,10 +5065,11 @@ void regulator_unregister(struct regulator_dev *rdev)</div><div class='ctx'> 		regulator_put(rdev-&gt;supply);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	flush_work(&amp;rdev-&gt;disable_work.work);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;regulator_list_mutex);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_remove_recursive(rdev-&gt;debugfs);</div><div class='del'>-	flush_work(&amp;rdev-&gt;disable_work.work);</div><div class='ctx'> 	WARN_ON(rdev-&gt;open_count);</div><div class='ctx'> 	regulator_remove_coupling(rdev);</div><div class='ctx'> 	unset_regulator_supplies(rdev);</div><div class='head'>diff --git a/drivers/regulator/cpcap-regulator.c b/drivers/regulator/cpcap-regulator.c<br/>index e7dab5c4d1d1..d3284361e594 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/cpcap-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/cpcap-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/cpcap-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/cpcap-regulator.c</a></div><div class='hunk'>@@ -505,17 +505,12 @@ MODULE_DEVICE_TABLE(of, cpcap_regulator_id_table);</div><div class='ctx'> static int cpcap_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpcap_ddata *ddata;</div><div class='del'>-	const struct of_device_id *match;</div><div class='add'>+	const struct cpcap_regulator *match_data;</div><div class='ctx'> 	struct regulator_config config;</div><div class='del'>-	struct regulator_init_data init_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	match = of_match_device(of_match_ptr(cpcap_regulator_id_table),</div><div class='del'>-				&amp;pdev-&gt;dev);</div><div class='del'>-	if (!match)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!match-&gt;data) {</div><div class='add'>+	match_data = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!match_data) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no configuration data found\n");</div><div class='ctx'> </div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -530,14 +525,12 @@ static int cpcap_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ddata-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	ddata-&gt;soc = match-&gt;data;</div><div class='add'>+	ddata-&gt;soc = match_data;</div><div class='ctx'> 	platform_set_drvdata(pdev, ddata);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;config, 0, sizeof(config));</div><div class='del'>-	memset(&amp;init_data, 0, sizeof(init_data));</div><div class='ctx'> 	config.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	config.regmap = ddata-&gt;reg;</div><div class='del'>-	config.init_data = &amp;init_data;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CPCAP_NR_REGULATORS; i++) {</div><div class='ctx'> 		const struct cpcap_regulator *regulator = &amp;ddata-&gt;soc[i];</div><div class='head'>diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c<br/>index 33e8f3b8d2bd..5493c3a86426 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da903x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da903x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da903x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da903x.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='del'>-/*</div><div class='del'>- * Regulators driver for Dialog Semiconductor DA903x</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006-2008 Marvell International Ltd.</div><div class='del'>- * Copyright (C) 2008 Compulab 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 version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Regulators driver for Dialog Semiconductor DA903x</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2006-2008 Marvell International Ltd.</div><div class='add'>+// Copyright (C) 2008 Compulab Ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c<br/>index cefa3558236d..e18d291c7f21 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9052-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9052-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9052-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9052-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,10 @@</div><div class='del'>-/*</div><div class='del'>-* da9052-regulator.c: Regulator driver for DA9052</div><div class='del'>-*</div><div class='del'>-* Copyright(c) 2011 Dialog Semiconductor Ltd.</div><div class='del'>-*</div><div class='del'>-* Author: David Dajun Chen &lt;dchen@diasemi.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 as published by</div><div class='del'>-* the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-* (at your option) any later version.</div><div class='del'>-*</div><div class='del'>-*/</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// da9052-regulator.c: Regulator driver for DA9052</div><div class='add'>+//</div><div class='add'>+// Copyright(c) 2011 Dialog Semiconductor Ltd.</div><div class='add'>+//</div><div class='add'>+// Author: David Dajun Chen &lt;dchen@diasemi.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -19,10 +13,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/driver.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='del'>-#ifdef CONFIG_OF</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/of_regulator.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mfd/da9052/da9052.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/da9052/reg.h&gt;</div><div class='hunk'>@@ -294,6 +286,8 @@ static const struct regulator_ops da9052_ldo_ops = {</div><div class='ctx'> {\</div><div class='ctx'> 	.reg_desc = {\</div><div class='ctx'> 		.name = #_name,\</div><div class='add'>+		.of_match = of_match_ptr(#_name),\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),\</div><div class='ctx'> 		.ops = &amp;da9052_ldo_ops,\</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,\</div><div class='ctx'> 		.id = DA9052_ID_##_id,\</div><div class='hunk'>@@ -314,6 +308,8 @@ static const struct regulator_ops da9052_ldo_ops = {</div><div class='ctx'> {\</div><div class='ctx'> 	.reg_desc = {\</div><div class='ctx'> 		.name = #_name,\</div><div class='add'>+		.of_match = of_match_ptr(#_name),\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),\</div><div class='ctx'> 		.ops = &amp;da9052_dcdc_ops,\</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,\</div><div class='ctx'> 		.id = DA9052_ID_##_id,\</div><div class='hunk'>@@ -417,36 +413,11 @@ static int da9052_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	config.dev = da9052-&gt;dev;</div><div class='ctx'> 	config.driver_data = regulator;</div><div class='ctx'> 	config.regmap = da9052-&gt;regmap;</div><div class='del'>-	if (pdata) {</div><div class='add'>+	if (pdata)</div><div class='ctx'> 		config.init_data = pdata-&gt;regulators[cell-&gt;id];</div><div class='del'>-	} else {</div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-		struct device_node *nproot = da9052-&gt;dev-&gt;of_node;</div><div class='del'>-		struct device_node *np;</div><div class='del'>-</div><div class='del'>-		if (!nproot)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		nproot = of_get_child_by_name(nproot, "regulators");</div><div class='del'>-		if (!nproot)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		for_each_child_of_node(nproot, np) {</div><div class='del'>-			if (of_node_name_eq(np,</div><div class='del'>-					 regulator-&gt;info-&gt;reg_desc.name)) {</div><div class='del'>-				config.init_data = of_get_regulator_init_data(</div><div class='del'>-					&amp;pdev-&gt;dev, np,</div><div class='del'>-					&amp;regulator-&gt;info-&gt;reg_desc);</div><div class='del'>-				config.of_node = np;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		of_node_put(nproot);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	regulator-&gt;rdev = devm_regulator_register(&amp;pdev-&gt;dev,</div><div class='ctx'> 						  &amp;regulator-&gt;info-&gt;reg_desc,</div><div class='head'>diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c<br/>index 3c6fac793658..c025ccb1a30a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9055-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9055-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9055-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9055-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,10 @@</div><div class='del'>-/*</div><div class='del'>-* Regulator driver for DA9055 PMIC</div><div class='del'>-*</div><div class='del'>-* Copyright(c) 2012 Dialog Semiconductor Ltd.</div><div class='del'>-*</div><div class='del'>-* Author: David Dajun Chen &lt;dchen@diasemi.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 as published by</div><div class='del'>-* the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-* (at your option) any later version.</div><div class='del'>-*</div><div class='del'>-*/</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// Regulator driver for DA9055 PMIC</div><div class='add'>+//</div><div class='add'>+// Copyright(c) 2012 Dialog Semiconductor Ltd.</div><div class='add'>+//</div><div class='add'>+// Author: David Dajun Chen &lt;dchen@diasemi.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -338,6 +332,8 @@ static const struct regulator_ops da9055_ldo_ops = {</div><div class='ctx'> {\</div><div class='ctx'> 	.reg_desc = {\</div><div class='ctx'> 		.name = #_id,\</div><div class='add'>+		.of_match = of_match_ptr(#_id),\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),\</div><div class='ctx'> 		.ops = &amp;da9055_ldo_ops,\</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,\</div><div class='ctx'> 		.id = DA9055_ID_##_id,\</div><div class='hunk'>@@ -366,6 +362,8 @@ static const struct regulator_ops da9055_ldo_ops = {</div><div class='ctx'> {\</div><div class='ctx'> 	.reg_desc = {\</div><div class='ctx'> 		.name = #_id,\</div><div class='add'>+		.of_match = of_match_ptr(#_id),\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),\</div><div class='ctx'> 		.ops = &amp;da9055_buck_ops,\</div><div class='ctx'> 		.type = REGULATOR_VOLTAGE,\</div><div class='ctx'> 		.id = DA9055_ID_##_id,\</div><div class='hunk'>@@ -487,8 +485,10 @@ static irqreturn_t da9055_ldo5_6_oc_irq(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct da9055_regulator *regulator = data;</div><div class='ctx'> </div><div class='add'>+	regulator_lock(regulator-&gt;rdev);</div><div class='ctx'> 	regulator_notifier_call_chain(regulator-&gt;rdev,</div><div class='ctx'> 				      REGULATOR_EVENT_OVER_CURRENT, NULL);</div><div class='add'>+	regulator_unlock(regulator-&gt;rdev);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -507,59 +507,6 @@ static inline struct da9055_regulator_info *find_regulator_info(int id)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static struct of_regulator_match da9055_reg_matches[] = {</div><div class='del'>-	{ .name = "BUCK1", },</div><div class='del'>-	{ .name = "BUCK2", },</div><div class='del'>-	{ .name = "LDO1", },</div><div class='del'>-	{ .name = "LDO2", },</div><div class='del'>-	{ .name = "LDO3", },</div><div class='del'>-	{ .name = "LDO4", },</div><div class='del'>-	{ .name = "LDO5", },</div><div class='del'>-	{ .name = "LDO6", },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int da9055_regulator_dt_init(struct platform_device *pdev,</div><div class='del'>-				    struct da9055_regulator *regulator,</div><div class='del'>-				    struct regulator_config *config,</div><div class='del'>-				    int regid)</div><div class='del'>-{</div><div class='del'>-	struct device_node *nproot, *np;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	nproot = of_node_get(pdev-&gt;dev.parent-&gt;of_node);</div><div class='del'>-	if (!nproot)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	np = of_get_child_by_name(nproot, "regulators");</div><div class='del'>-	if (!np)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	ret = of_regulator_match(&amp;pdev-&gt;dev, np, &amp;da9055_reg_matches[regid], 1);</div><div class='del'>-	of_node_put(nproot);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Error matching regulator: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	config-&gt;init_data = da9055_reg_matches[regid].init_data;</div><div class='del'>-	config-&gt;of_node = da9055_reg_matches[regid].of_node;</div><div class='del'>-</div><div class='del'>-	if (!config-&gt;of_node)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int da9055_regulator_dt_init(struct platform_device *pdev,</div><div class='del'>-				       struct da9055_regulator *regulator,</div><div class='del'>-				       struct regulator_config *config,</div><div class='del'>-				       int regid)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_OF */</div><div class='del'>-</div><div class='ctx'> static int da9055_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='hunk'>@@ -580,18 +527,12 @@ static int da9055_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	regulator-&gt;da9055 = da9055;</div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	config.dev = da9055-&gt;dev;</div><div class='ctx'> 	config.driver_data = regulator;</div><div class='ctx'> 	config.regmap = da9055-&gt;regmap;</div><div class='ctx'> </div><div class='del'>-	if (pdata) {</div><div class='add'>+	if (pdata)</div><div class='ctx'> 		config.init_data = pdata-&gt;regulators[pdev-&gt;id];</div><div class='del'>-	} else {</div><div class='del'>-		ret = da9055_regulator_dt_init(pdev, regulator, &amp;config,</div><div class='del'>-					       pdev-&gt;id);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ret = da9055_gpio_init(regulator, &amp;config, pdata, pdev-&gt;id);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/drivers/regulator/da9062-regulator.c b/drivers/regulator/da9062-regulator.c<br/>index b064d8a19d4c..a02e0488410f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9062-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9062-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9062-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9062-regulator.c</a></div><div class='hunk'>@@ -1,17 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * Regulator device driver for DA9061 and DA9062.</div><div class='del'>- * Copyright (C) 2015-2017  Dialog Semiconductor</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// Regulator device driver for DA9061 and DA9062.</div><div class='add'>+// Copyright (C) 2015-2017  Dialog Semiconductor</div><div class='add'>+</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/init.h&gt;</div><div class='hunk'>@@ -53,16 +44,12 @@ enum {</div><div class='ctx'> /* Regulator capabilities and registers description */</div><div class='ctx'> struct da9062_regulator_info {</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='del'>-	/* Current limiting */</div><div class='del'>-	unsigned int n_current_limits;</div><div class='del'>-	const int *current_limits;</div><div class='ctx'> 	/* Main register fields */</div><div class='ctx'> 	struct reg_field mode;</div><div class='ctx'> 	struct reg_field suspend;</div><div class='ctx'> 	struct reg_field sleep;</div><div class='ctx'> 	struct reg_field suspend_sleep;</div><div class='ctx'> 	unsigned int suspend_vsel_reg;</div><div class='del'>-	struct reg_field ilimit;</div><div class='ctx'> 	/* Event detection bit */</div><div class='ctx'> 	struct reg_field oc_event;</div><div class='ctx'> };</div><div class='hunk'>@@ -78,7 +65,6 @@ struct da9062_regulator {</div><div class='ctx'> 	struct regmap_field			*suspend;</div><div class='ctx'> 	struct regmap_field			*sleep;</div><div class='ctx'> 	struct regmap_field			*suspend_sleep;</div><div class='del'>-	struct regmap_field			*ilimit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Encapsulates all information for the regulators driver */</div><div class='hunk'>@@ -104,7 +90,7 @@ enum {</div><div class='ctx'>  * - DA9062_ID_[BUCK1|BUCK2|BUCK4]</div><div class='ctx'>  * Entry indexes corresponds to register values.</div><div class='ctx'>  */</div><div class='del'>-static const int da9062_buck_a_limits[] = {</div><div class='add'>+static const unsigned int da9062_buck_a_limits[] = {</div><div class='ctx'> 	 500000,  600000,  700000,  800000,  900000, 1000000, 1100000, 1200000,</div><div class='ctx'> 	1300000, 1400000, 1500000, 1600000, 1700000, 1800000, 1900000, 2000000</div><div class='ctx'> };</div><div class='hunk'>@@ -114,44 +100,11 @@ static const int da9062_buck_a_limits[] = {</div><div class='ctx'>  * - DA9062_ID_BUCK3</div><div class='ctx'>  * Entry indexes corresponds to register values.</div><div class='ctx'>  */</div><div class='del'>-static const int da9062_buck_b_limits[] = {</div><div class='add'>+static const unsigned int da9062_buck_b_limits[] = {</div><div class='ctx'> 	1500000, 1600000, 1700000, 1800000, 1900000, 2000000, 2100000, 2200000,</div><div class='ctx'> 	2300000, 2400000, 2500000, 2600000, 2700000, 2800000, 2900000, 3000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int da9062_set_current_limit(struct regulator_dev *rdev,</div><div class='del'>-				    int min_ua, int max_ua)</div><div class='del'>-{</div><div class='del'>-	struct da9062_regulator *regl = rdev_get_drvdata(rdev);</div><div class='del'>-	const struct da9062_regulator_info *rinfo = regl-&gt;info;</div><div class='del'>-	int n, tval;</div><div class='del'>-</div><div class='del'>-	for (n = rinfo-&gt;n_current_limits - 1; n &gt;= 0; n--) {</div><div class='del'>-		tval = rinfo-&gt;current_limits[n];</div><div class='del'>-		if (tval &gt;= min_ua &amp;&amp; tval &lt;= max_ua)</div><div class='del'>-			return regmap_field_write(regl-&gt;ilimit, n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int da9062_get_current_limit(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	struct da9062_regulator *regl = rdev_get_drvdata(rdev);</div><div class='del'>-	const struct da9062_regulator_info *rinfo = regl-&gt;info;</div><div class='del'>-	unsigned int sel;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_field_read(regl-&gt;ilimit, &amp;sel);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (sel &gt;= rinfo-&gt;n_current_limits)</div><div class='del'>-		sel = rinfo-&gt;n_current_limits - 1;</div><div class='del'>-</div><div class='del'>-	return rinfo-&gt;current_limits[sel];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int da9062_buck_set_mode(struct regulator_dev *rdev, unsigned mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct da9062_regulator *regl = rdev_get_drvdata(rdev);</div><div class='hunk'>@@ -395,8 +348,8 @@ static const struct regulator_ops da9062_buck_ops = {</div><div class='ctx'> 	.get_voltage_sel	= regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.set_voltage_sel	= regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_linear,</div><div class='del'>-	.set_current_limit	= da9062_set_current_limit,</div><div class='del'>-	.get_current_limit	= da9062_get_current_limit,</div><div class='add'>+	.set_current_limit	= regulator_set_current_limit_regmap,</div><div class='add'>+	.get_current_limit	= regulator_get_current_limit_regmap,</div><div class='ctx'> 	.set_mode		= da9062_buck_set_mode,</div><div class='ctx'> 	.get_mode		= da9062_buck_get_mode,</div><div class='ctx'> 	.get_status		= da9062_buck_get_status,</div><div class='hunk'>@@ -433,8 +386,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (300) * 1000,</div><div class='ctx'> 		.desc.uV_step = (10) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((1570) - (300))/(10) + 1,</div><div class='del'>-		.current_limits = da9062_buck_a_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_a_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_C,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK1_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK1_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK1_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK1_A,</div><div class='hunk'>@@ -457,10 +412,6 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK1_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK1_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_C,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK1_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK1_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9061_ID_BUCK2,</div><div class='hunk'>@@ -471,8 +422,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (800) * 1000,</div><div class='ctx'> 		.desc.uV_step = (20) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((3340) - (800))/(20) + 1,</div><div class='del'>-		.current_limits = da9062_buck_b_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_b_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_b_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_b_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_A,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK3_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK3_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK3_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK3_A,</div><div class='hunk'>@@ -495,10 +448,6 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK3_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK3_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_A,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK3_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK3_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9061_ID_BUCK3,</div><div class='hunk'>@@ -509,8 +458,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (530) * 1000,</div><div class='ctx'> 		.desc.uV_step = (10) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((1800) - (530))/(10) + 1,</div><div class='del'>-		.current_limits = da9062_buck_a_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_a_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_B,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK4_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK4_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK4_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK4_A,</div><div class='hunk'>@@ -533,10 +484,6 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK4_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK4_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_B,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK4_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK4_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9061_ID_LDO1,</div><div class='hunk'>@@ -679,8 +626,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (300) * 1000,</div><div class='ctx'> 		.desc.uV_step = (10) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((1570) - (300))/(10) + 1,</div><div class='del'>-		.current_limits = da9062_buck_a_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_a_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_C,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK1_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK1_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK1_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK1_A,</div><div class='hunk'>@@ -703,10 +652,6 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK1_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK1_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_C,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK1_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK1_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9062_ID_BUCK2,</div><div class='hunk'>@@ -717,8 +662,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (300) * 1000,</div><div class='ctx'> 		.desc.uV_step = (10) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((1570) - (300))/(10) + 1,</div><div class='del'>-		.current_limits = da9062_buck_a_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_a_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_C,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK2_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK2_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK2_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK2_A,</div><div class='hunk'>@@ -741,10 +688,6 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK2_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK2_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_C,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK2_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK2_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9062_ID_BUCK3,</div><div class='hunk'>@@ -755,8 +698,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (800) * 1000,</div><div class='ctx'> 		.desc.uV_step = (20) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((3340) - (800))/(20) + 1,</div><div class='del'>-		.current_limits = da9062_buck_b_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_b_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_b_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_b_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_A,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK3_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK3_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK3_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK3_A,</div><div class='hunk'>@@ -779,10 +724,6 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK3_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK3_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_A,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK3_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK3_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9062_ID_BUCK4,</div><div class='hunk'>@@ -793,8 +734,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 		.desc.min_uV = (530) * 1000,</div><div class='ctx'> 		.desc.uV_step = (10) * 1000,</div><div class='ctx'> 		.desc.n_voltages = ((1800) - (530))/(10) + 1,</div><div class='del'>-		.current_limits = da9062_buck_a_limits,</div><div class='del'>-		.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.curr_table = da9062_buck_a_limits,</div><div class='add'>+		.desc.n_current_limits = ARRAY_SIZE(da9062_buck_a_limits),</div><div class='add'>+		.desc.csel_reg = DA9062AA_BUCK_ILIM_B,</div><div class='add'>+		.desc.csel_mask = DA9062AA_BUCK4_ILIM_MASK,</div><div class='ctx'> 		.desc.enable_reg = DA9062AA_BUCK4_CONT,</div><div class='ctx'> 		.desc.enable_mask = DA9062AA_BUCK4_EN_MASK,</div><div class='ctx'> 		.desc.vsel_reg = DA9062AA_VBUCK4_A,</div><div class='hunk'>@@ -817,10 +760,6 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = {</div><div class='ctx'> 			__builtin_ffs((int)DA9062AA_VBUCK4_SEL_MASK) - 1,</div><div class='ctx'> 			sizeof(unsigned int) * 8 -</div><div class='ctx'> 			__builtin_clz((DA9062AA_VBUCK4_SEL_MASK)) - 1),</div><div class='del'>-		.ilimit = REG_FIELD(DA9062AA_BUCK_ILIM_B,</div><div class='del'>-			__builtin_ffs((int)DA9062AA_BUCK4_ILIM_MASK) - 1,</div><div class='del'>-			sizeof(unsigned int) * 8 -</div><div class='del'>-			__builtin_clz((DA9062AA_BUCK4_ILIM_MASK)) - 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc.id = DA9062_ID_LDO1,</div><div class='hunk'>@@ -974,8 +913,10 @@ static irqreturn_t da9062_ldo_lim_event(int irq, void *data)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (BIT(regl-&gt;info-&gt;oc_event.lsb) &amp; bits) {</div><div class='add'>+			regulator_lock(regl-&gt;rdev);</div><div class='ctx'> 			regulator_notifier_call_chain(regl-&gt;rdev,</div><div class='ctx'> 					REGULATOR_EVENT_OVER_CURRENT, NULL);</div><div class='add'>+			regulator_unlock(regl-&gt;rdev);</div><div class='ctx'> 			handled = IRQ_HANDLED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1063,15 +1004,6 @@ static int da9062_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 				return PTR_ERR(regl-&gt;suspend_sleep);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (regl-&gt;info-&gt;ilimit.reg) {</div><div class='del'>-			regl-&gt;ilimit = devm_regmap_field_alloc(</div><div class='del'>-					&amp;pdev-&gt;dev,</div><div class='del'>-					chip-&gt;regmap,</div><div class='del'>-					regl-&gt;info-&gt;ilimit);</div><div class='del'>-			if (IS_ERR(regl-&gt;ilimit))</div><div class='del'>-				return PTR_ERR(regl-&gt;ilimit);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Register regulator */</div><div class='ctx'> 		memset(&amp;config, 0, sizeof(config));</div><div class='ctx'> 		config.dev = chip-&gt;dev;</div><div class='head'>diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c<br/>index 2b0c7a85306a..6f9ce1a6e44d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9063-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9063-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9063-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9063-regulator.c</a></div><div class='hunk'>@@ -1,18 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// Regulator driver for DA9063 PMIC series</div><div class='add'>+//</div><div class='add'>+// Copyright 2012 Dialog Semiconductors Ltd.</div><div class='add'>+// Copyright 2013 Philipp Zabel, Pengutronix</div><div class='add'>+//</div><div class='add'>+// Author: Krystian Garbaciak &lt;krystian.garbaciak@diasemi.com&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Regulator driver for DA9063 PMIC series</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Dialog Semiconductors Ltd.</div><div class='del'>- * Copyright 2013 Philipp Zabel, Pengutronix</div><div class='del'>- *</div><div class='del'>- * Author: Krystian Garbaciak &lt;krystian.garbaciak@diasemi.com&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'>- */</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/init.h&gt;</div><div class='hunk'>@@ -38,17 +32,12 @@</div><div class='ctx'> struct da9063_regulator_info {</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='ctx'> </div><div class='del'>-	/* Current limiting */</div><div class='del'>-	unsigned	n_current_limits;</div><div class='del'>-	const int	*current_limits;</div><div class='del'>-</div><div class='ctx'> 	/* DA9063 main register fields */</div><div class='ctx'> 	struct reg_field mode;		/* buck mode of operation */</div><div class='ctx'> 	struct reg_field suspend;</div><div class='ctx'> 	struct reg_field sleep;</div><div class='ctx'> 	struct reg_field suspend_sleep;</div><div class='ctx'> 	unsigned int suspend_vsel_reg;</div><div class='del'>-	struct reg_field ilimit;</div><div class='ctx'> </div><div class='ctx'> 	/* DA9063 event detection bit */</div><div class='ctx'> 	struct reg_field oc_event;</div><div class='hunk'>@@ -73,15 +62,18 @@ struct da9063_regulator_info {</div><div class='ctx'> 	.suspend_vsel_reg = DA9063_REG_V##regl_name##_B</div><div class='ctx'> </div><div class='ctx'> /* Macros for voltage DC/DC converters (BUCKs) */</div><div class='del'>-#define DA9063_BUCK(chip, regl_name, min_mV, step_mV, max_mV, limits_array) \</div><div class='add'>+#define DA9063_BUCK(chip, regl_name, min_mV, step_mV, max_mV, limits_array, \</div><div class='add'>+		    creg, cmask) \</div><div class='ctx'> 	.desc.id = chip##_ID_##regl_name, \</div><div class='ctx'> 	.desc.name = __stringify(chip##_##regl_name), \</div><div class='ctx'> 	.desc.ops = &amp;da9063_buck_ops, \</div><div class='ctx'> 	.desc.min_uV = (min_mV) * 1000, \</div><div class='ctx'> 	.desc.uV_step = (step_mV) * 1000, \</div><div class='ctx'> 	.desc.n_voltages = ((max_mV) - (min_mV))/(step_mV) + 1, \</div><div class='del'>-	.current_limits = limits_array, \</div><div class='del'>-	.n_current_limits = ARRAY_SIZE(limits_array)</div><div class='add'>+	.desc.csel_reg = (creg), \</div><div class='add'>+	.desc.csel_mask = (cmask), \</div><div class='add'>+	.desc.curr_table = limits_array, \</div><div class='add'>+	.desc.n_current_limits = ARRAY_SIZE(limits_array)</div><div class='ctx'> </div><div class='ctx'> #define DA9063_BUCK_COMMON_FIELDS(regl_name) \</div><div class='ctx'> 	.desc.enable_reg = DA9063_REG_##regl_name##_CONT, \</div><div class='hunk'>@@ -112,7 +104,6 @@ struct da9063_regulator {</div><div class='ctx'> 	struct regmap_field			*suspend;</div><div class='ctx'> 	struct regmap_field			*sleep;</div><div class='ctx'> 	struct regmap_field			*suspend_sleep;</div><div class='del'>-	struct regmap_field			*ilimit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Encapsulates all information for the regulators driver */</div><div class='hunk'>@@ -134,65 +125,32 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /* Current limits array (in uA) for BCORE1, BCORE2, BPRO.</div><div class='ctx'>    Entry indexes corresponds to register values. */</div><div class='del'>-static const int da9063_buck_a_limits[] = {</div><div class='add'>+static const unsigned int da9063_buck_a_limits[] = {</div><div class='ctx'> 	 500000,  600000,  700000,  800000,  900000, 1000000, 1100000, 1200000,</div><div class='ctx'> 	1300000, 1400000, 1500000, 1600000, 1700000, 1800000, 1900000, 2000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Current limits array (in uA) for BMEM, BIO, BPERI.</div><div class='ctx'>    Entry indexes corresponds to register values. */</div><div class='del'>-static const int da9063_buck_b_limits[] = {</div><div class='add'>+static const unsigned int da9063_buck_b_limits[] = {</div><div class='ctx'> 	1500000, 1600000, 1700000, 1800000, 1900000, 2000000, 2100000, 2200000,</div><div class='ctx'> 	2300000, 2400000, 2500000, 2600000, 2700000, 2800000, 2900000, 3000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Current limits array (in uA) for merged BCORE1 and BCORE2.</div><div class='ctx'>    Entry indexes corresponds to register values. */</div><div class='del'>-static const int da9063_bcores_merged_limits[] = {</div><div class='add'>+static const unsigned int da9063_bcores_merged_limits[] = {</div><div class='ctx'> 	1000000, 1200000, 1400000, 1600000, 1800000, 2000000, 2200000, 2400000,</div><div class='ctx'> 	2600000, 2800000, 3000000, 3200000, 3400000, 3600000, 3800000, 4000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Current limits array (in uA) for merged BMEM and BIO.</div><div class='ctx'>    Entry indexes corresponds to register values. */</div><div class='del'>-static const int da9063_bmem_bio_merged_limits[] = {</div><div class='add'>+static const unsigned int da9063_bmem_bio_merged_limits[] = {</div><div class='ctx'> 	3000000, 3200000, 3400000, 3600000, 3800000, 4000000, 4200000, 4400000,</div><div class='ctx'> 	4600000, 4800000, 5000000, 5200000, 5400000, 5600000, 5800000, 6000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int da9063_set_current_limit(struct regulator_dev *rdev,</div><div class='del'>-							int min_uA, int max_uA)</div><div class='del'>-{</div><div class='del'>-	struct da9063_regulator *regl = rdev_get_drvdata(rdev);</div><div class='del'>-	const struct da9063_regulator_info *rinfo = regl-&gt;info;</div><div class='del'>-	int n, tval;</div><div class='del'>-</div><div class='del'>-	for (n = rinfo-&gt;n_current_limits - 1; n &gt;= 0; n--) {</div><div class='del'>-		tval = rinfo-&gt;current_limits[n];</div><div class='del'>-		if (tval &gt;= min_uA &amp;&amp; tval &lt;= max_uA)</div><div class='del'>-			return regmap_field_write(regl-&gt;ilimit, n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int da9063_get_current_limit(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	struct da9063_regulator *regl = rdev_get_drvdata(rdev);</div><div class='del'>-	const struct da9063_regulator_info *rinfo = regl-&gt;info;</div><div class='del'>-	unsigned int sel;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_field_read(regl-&gt;ilimit, &amp;sel);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (sel &gt;= rinfo-&gt;n_current_limits)</div><div class='del'>-		sel = rinfo-&gt;n_current_limits - 1;</div><div class='del'>-</div><div class='del'>-	return rinfo-&gt;current_limits[sel];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int da9063_buck_set_mode(struct regulator_dev *rdev, unsigned mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct da9063_regulator *regl = rdev_get_drvdata(rdev);</div><div class='hunk'>@@ -434,8 +392,8 @@ static const struct regulator_ops da9063_buck_ops = {</div><div class='ctx'> 	.get_voltage_sel	= regulator_get_voltage_sel_regmap,</div><div class='ctx'> 	.set_voltage_sel	= regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_linear,</div><div class='del'>-	.set_current_limit	= da9063_set_current_limit,</div><div class='del'>-	.get_current_limit	= da9063_get_current_limit,</div><div class='add'>+	.set_current_limit	= regulator_set_current_limit_regmap,</div><div class='add'>+	.get_current_limit	= regulator_get_current_limit_regmap,</div><div class='ctx'> 	.set_mode		= da9063_buck_set_mode,</div><div class='ctx'> 	.get_mode		= da9063_buck_get_mode,</div><div class='ctx'> 	.get_status		= da9063_buck_get_status,</div><div class='hunk'>@@ -465,69 +423,61 @@ static const struct regulator_ops da9063_ldo_ops = {</div><div class='ctx'> static const struct da9063_regulator_info da9063_regulator_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BCORE1, 300, 10, 1570,</div><div class='del'>-			    da9063_buck_a_limits),</div><div class='add'>+			    da9063_buck_a_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_C, DA9063_BCORE1_ILIM_MASK),</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BCORE1),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBCORE1_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_C,</div><div class='del'>-				 DA9063_BCORE1_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BCORE2, 300, 10, 1570,</div><div class='del'>-			    da9063_buck_a_limits),</div><div class='add'>+			    da9063_buck_a_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_C, DA9063_BCORE2_ILIM_MASK),</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BCORE2),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBCORE2_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_C,</div><div class='del'>-				 DA9063_BCORE2_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BPRO, 530, 10, 1800,</div><div class='del'>-			    da9063_buck_a_limits),</div><div class='add'>+			    da9063_buck_a_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_B, DA9063_BPRO_ILIM_MASK),</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BPRO),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBPRO_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_B,</div><div class='del'>-				 DA9063_BPRO_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BMEM, 800, 20, 3340,</div><div class='del'>-			    da9063_buck_b_limits),</div><div class='add'>+			    da9063_buck_b_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_A, DA9063_BMEM_ILIM_MASK),</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BMEM),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBMEM_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_A,</div><div class='del'>-				 DA9063_BMEM_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BIO, 800, 20, 3340,</div><div class='del'>-			    da9063_buck_b_limits),</div><div class='add'>+			    da9063_buck_b_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_A, DA9063_BIO_ILIM_MASK),</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BIO),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_2, DA9063_VBIO_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_A,</div><div class='del'>-				 DA9063_BIO_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BPERI, 800, 20, 3340,</div><div class='del'>-			    da9063_buck_b_limits),</div><div class='add'>+			    da9063_buck_b_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_B, DA9063_BPERI_ILIM_MASK),</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BPERI),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBPERI_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_B,</div><div class='del'>-				 DA9063_BPERI_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BCORES_MERGED, 300, 10, 1570,</div><div class='del'>-			    da9063_bcores_merged_limits),</div><div class='add'>+			    da9063_bcores_merged_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_C, DA9063_BCORE1_ILIM_MASK),</div><div class='ctx'> 		/* BCORES_MERGED uses the same register fields as BCORE1 */</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BCORE1),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBCORE1_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_C,</div><div class='del'>-				 DA9063_BCORE1_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_BUCK(DA9063, BMEM_BIO_MERGED, 800, 20, 3340,</div><div class='del'>-			    da9063_bmem_bio_merged_limits),</div><div class='add'>+			    da9063_bmem_bio_merged_limits,</div><div class='add'>+			    DA9063_REG_BUCK_ILIM_A, DA9063_BMEM_ILIM_MASK),</div><div class='ctx'> 		/* BMEM_BIO_MERGED uses the same register fields as BMEM */</div><div class='ctx'> 		DA9063_BUCK_COMMON_FIELDS(BMEM),</div><div class='ctx'> 		.suspend = BFIELD(DA9063_REG_DVC_1, DA9063_VBMEM_SEL),</div><div class='del'>-		.ilimit = BFIELD(DA9063_REG_BUCK_ILIM_A,</div><div class='del'>-				 DA9063_BMEM_ILIM_MASK),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		DA9063_LDO(DA9063, LDO3, 900, 20, 3440),</div><div class='hunk'>@@ -615,9 +565,12 @@ static irqreturn_t da9063_ldo_lim_event(int irq, void *data)</div><div class='ctx'> 		if (regl-&gt;info-&gt;oc_event.reg != DA9063_REG_STATUS_D)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (BIT(regl-&gt;info-&gt;oc_event.lsb) &amp; bits)</div><div class='add'>+		if (BIT(regl-&gt;info-&gt;oc_event.lsb) &amp; bits) {</div><div class='add'>+		        regulator_lock(regl-&gt;rdev);</div><div class='ctx'> 			regulator_notifier_call_chain(regl-&gt;rdev,</div><div class='ctx'> 					REGULATOR_EVENT_OVER_CURRENT, NULL);</div><div class='add'>+		        regulator_unlock(regl-&gt;rdev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -861,13 +814,6 @@ static int da9063_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 				return PTR_ERR(regl-&gt;suspend_sleep);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (regl-&gt;info-&gt;ilimit.reg) {</div><div class='del'>-			regl-&gt;ilimit = devm_regmap_field_alloc(&amp;pdev-&gt;dev,</div><div class='del'>-					da9063-&gt;regmap, regl-&gt;info-&gt;ilimit);</div><div class='del'>-			if (IS_ERR(regl-&gt;ilimit))</div><div class='del'>-				return PTR_ERR(regl-&gt;ilimit);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Register regulator */</div><div class='ctx'> 		memset(&amp;config, 0, sizeof(config));</div><div class='ctx'> 		config.dev = &amp;pdev-&gt;dev;</div><div class='head'>diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c<br/>index 528303771723..f9448ed50e05 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9210-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9210-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9210-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9210-regulator.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * da9210-regulator.c - Regulator device driver for DA9210</div><div class='del'>- * Copyright (C) 2013  Dialog Semiconductor Ltd.</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License as published by the Free Software Foundation; either</div><div class='del'>- * version 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This library 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 GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,</div><div class='del'>- * Boston, MA  02110-1301, USA.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// da9210-regulator.c - Regulator device driver for DA9210</div><div class='add'>+// Copyright (C) 2013  Dialog Semiconductor Ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/regulator/da9210-regulator.h b/drivers/regulator/da9210-regulator.h<br/>index 749c550808b6..b1f1a607c208 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9210-regulator.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9210-regulator.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9210-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9210-regulator.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='del'>-</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * da9210-regulator.h - Regulator definitions for DA9210</div><div class='ctx'>  * Copyright (C) 2013  Dialog Semiconductor Ltd.</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License as published by the Free Software Foundation; either</div><div class='del'>- * version 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This library 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 GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,</div><div class='del'>- * Boston, MA  02110-1301, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __DA9210_REGISTERS_H__</div><div class='head'>diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c<br/>index 109ee12d4362..da37b4ccd834 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9211-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9211-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9211-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9211-regulator.c</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * da9211-regulator.c - Regulator device driver for DA9211/DA9212</div><div class='del'>- * /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225</div><div class='del'>- * Copyright (C) 2015  Dialog Semiconductor Ltd.</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License as published by the Free Software Foundation; either</div><div class='del'>- * version 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This library 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 GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// da9211-regulator.c - Regulator device driver for DA9211/DA9212</div><div class='add'>+// /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225</div><div class='add'>+// Copyright (C) 2015  Dialog Semiconductor Ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -322,8 +312,10 @@ static irqreturn_t da9211_irq_handler(int irq, void *data)</div><div class='ctx'> 		goto error_i2c;</div><div class='ctx'> </div><div class='ctx'> 	if (reg_val &amp; DA9211_E_OV_CURR_A) {</div><div class='add'>+	        regulator_lock(chip-&gt;rdev[0]);</div><div class='ctx'> 		regulator_notifier_call_chain(chip-&gt;rdev[0],</div><div class='ctx'> 			REGULATOR_EVENT_OVER_CURRENT, NULL);</div><div class='add'>+	        regulator_unlock(chip-&gt;rdev[0]);</div><div class='ctx'> </div><div class='ctx'> 		err = regmap_write(chip-&gt;regmap, DA9211_REG_EVENT_B,</div><div class='ctx'> 			DA9211_E_OV_CURR_A);</div><div class='hunk'>@@ -334,8 +326,10 @@ static irqreturn_t da9211_irq_handler(int irq, void *data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (reg_val &amp; DA9211_E_OV_CURR_B) {</div><div class='add'>+	        regulator_lock(chip-&gt;rdev[1]);</div><div class='ctx'> 		regulator_notifier_call_chain(chip-&gt;rdev[1],</div><div class='ctx'> 			REGULATOR_EVENT_OVER_CURRENT, NULL);</div><div class='add'>+	        regulator_unlock(chip-&gt;rdev[1]);</div><div class='ctx'> </div><div class='ctx'> 		err = regmap_write(chip-&gt;regmap, DA9211_REG_EVENT_B,</div><div class='ctx'> 			DA9211_E_OV_CURR_B);</div><div class='head'>diff --git a/drivers/regulator/da9211-regulator.h b/drivers/regulator/da9211-regulator.h<br/>index 2cb32aab4f82..1201e7cc056c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9211-regulator.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/da9211-regulator.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/da9211-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/da9211-regulator.h</a></div><div class='hunk'>@@ -1,17 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * da9211-regulator.h - Regulator definitions for DA9211/DA9212</div><div class='ctx'>  * /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225</div><div class='ctx'>  * Copyright (C) 2015  Dialog Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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 __DA9211_REGISTERS_H__</div><div class='head'>diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c<br/>index 7cec535cf0bc..eb317663f875 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/db8500-prcmu.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/db8500-prcmu.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/db8500-prcmu.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/db8500-prcmu.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static int db8500_regulator_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* db8500 regulator operations */</div><div class='del'>-static struct regulator_ops db8500_regulator_ops = {</div><div class='add'>+static const struct regulator_ops db8500_regulator_ops = {</div><div class='ctx'> 	.enable			= db8500_regulator_enable,</div><div class='ctx'> 	.disable		= db8500_regulator_disable,</div><div class='ctx'> 	.is_enabled		= db8500_regulator_is_enabled,</div><div class='hunk'>@@ -200,7 +200,7 @@ static int db8500_regulator_switch_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> 	return info-&gt;is_enabled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops db8500_regulator_switch_ops = {</div><div class='add'>+static const struct regulator_ops db8500_regulator_switch_ops = {</div><div class='ctx'> 	.enable			= db8500_regulator_switch_enable,</div><div class='ctx'> 	.disable		= db8500_regulator_switch_disable,</div><div class='ctx'> 	.is_enabled		= db8500_regulator_switch_is_enabled,</div><div class='hunk'>@@ -214,6 +214,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VAPE] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vape",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vape"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VAPE,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -223,6 +224,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VARM] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-varm",</div><div class='add'>+			.of_match = of_match_ptr("db8500_varm"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VARM,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -232,6 +234,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VMODEM] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vmodem",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vmodem"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VMODEM,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -241,6 +244,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VPLL] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vpll",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vpll"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VPLL,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -250,6 +254,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VSMPS1] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vsmps1",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vsmps1"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VSMPS1,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -259,6 +264,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VSMPS2] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vsmps2",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vsmps2"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VSMPS2,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -271,6 +277,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VSMPS3] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vsmps3",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vsmps3"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VSMPS3,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -280,6 +287,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_VRF1] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-vrf1",</div><div class='add'>+			.of_match = of_match_ptr("db8500_vrf1"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_VRF1,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -289,6 +297,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SVAMMDSP] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sva-mmdsp",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sva_mmdsp"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SVAMMDSP,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -299,6 +308,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SVAMMDSPRET] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sva-mmdsp-ret",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sva_mmdsp_ret"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SVAMMDSPRET,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -310,6 +320,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SVAPIPE] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sva-pipe",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sva_pipe"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SVAPIPE,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -320,6 +331,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SIAMMDSP] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sia-mmdsp",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sia_mmdsp"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SIAMMDSP,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -330,6 +342,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SIAMMDSPRET] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sia-mmdsp-ret",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sia_mmdsp_ret"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SIAMMDSPRET,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -341,6 +354,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SIAPIPE] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sia-pipe",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sia_pipe"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SIAPIPE,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -351,6 +365,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_SGA] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-sga",</div><div class='add'>+			.of_match = of_match_ptr("db8500_sga"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_SGA,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -361,6 +376,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_B2R2_MCDE] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-b2r2-mcde",</div><div class='add'>+			.of_match = of_match_ptr("db8500_b2r2_mcde"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_B2R2_MCDE,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -371,6 +387,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_ESRAM12] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-esram12",</div><div class='add'>+			.of_match = of_match_ptr("db8500_esram12"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_ESRAM12,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -382,6 +399,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_ESRAM12RET] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-esram12-ret",</div><div class='add'>+			.of_match = of_match_ptr("db8500_esram12_ret"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_ESRAM12RET,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -393,6 +411,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_ESRAM34] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-esram34",</div><div class='add'>+			.of_match = of_match_ptr("db8500_esram34"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_ESRAM34,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -404,6 +423,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	[DB8500_REGULATOR_SWITCH_ESRAM34RET] = {</div><div class='ctx'> 		.desc = {</div><div class='ctx'> 			.name	= "db8500-esram34-ret",</div><div class='add'>+			.of_match = of_match_ptr("db8500_esram34_ret"),</div><div class='ctx'> 			.id	= DB8500_REGULATOR_SWITCH_ESRAM34RET,</div><div class='ctx'> 			.ops	= &amp;db8500_regulator_switch_ops,</div><div class='ctx'> 			.type	= REGULATOR_VOLTAGE,</div><div class='hunk'>@@ -414,113 +434,38 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int db8500_regulator_register(struct platform_device *pdev,</div><div class='del'>-					struct regulator_init_data *init_data,</div><div class='del'>-					int id,</div><div class='del'>-					struct device_node *np)</div><div class='add'>+static int db8500_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct regulator_init_data *db8500_init_data;</div><div class='ctx'> 	struct dbx500_regulator_info *info;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* assign per-regulator data */</div><div class='del'>-	info = &amp;dbx500_regulator_info[id];</div><div class='del'>-	info-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-</div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='del'>-	config.init_data = init_data;</div><div class='del'>-	config.driver_data = info;</div><div class='del'>-	config.of_node = np;</div><div class='del'>-</div><div class='del'>-	/* register with the regulator framework */</div><div class='del'>-	info-&gt;rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc, &amp;config);</div><div class='del'>-	if (IS_ERR(info-&gt;rdev)) {</div><div class='del'>-		err = PTR_ERR(info-&gt;rdev);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to register %s: err %i\n",</div><div class='del'>-			info-&gt;desc.name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(rdev_get_dev(info-&gt;rdev),</div><div class='del'>-		"regulator-%s-probed\n", info-&gt;desc.name);</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match db8500_regulator_matches[] = {</div><div class='del'>-	{ .name	= "db8500_vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },</div><div class='del'>-	{ .name	= "db8500_varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },</div><div class='del'>-	{ .name	= "db8500_vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },</div><div class='del'>-	{ .name	= "db8500_vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },</div><div class='del'>-	{ .name	= "db8500_vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },</div><div class='del'>-	{ .name	= "db8500_vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },</div><div class='del'>-	{ .name	= "db8500_vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },</div><div class='del'>-	{ .name	= "db8500_vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },</div><div class='del'>-	{ .name	= "db8500_sva_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },</div><div class='del'>-	{ .name	= "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },</div><div class='del'>-	{ .name	= "db8500_sva_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },</div><div class='del'>-	{ .name	= "db8500_sia_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },</div><div class='del'>-	{ .name	= "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },</div><div class='del'>-	{ .name	= "db8500_sia_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },</div><div class='del'>-	{ .name	= "db8500_sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },</div><div class='del'>-	{ .name	= "db8500_b2r2_mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },</div><div class='del'>-	{ .name	= "db8500_esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },</div><div class='del'>-	{ .name	= "db8500_esram12_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },</div><div class='del'>-	{ .name	= "db8500_esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },</div><div class='del'>-	{ .name	= "db8500_esram34_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-db8500_regulator_of_probe(struct platform_device *pdev,</div><div class='del'>-			struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='add'>+	db8500_init_data = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dbx500_regulator_info); i++) {</div><div class='del'>-		err = db8500_regulator_register(</div><div class='del'>-			pdev, db8500_regulator_matches[i].init_data,</div><div class='del'>-			i, db8500_regulator_matches[i].of_node);</div><div class='del'>-		if (err)</div><div class='add'>+		/* assign per-regulator data */</div><div class='add'>+		info = &amp;dbx500_regulator_info[i];</div><div class='add'>+</div><div class='add'>+		config.driver_data = info;</div><div class='add'>+		config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+		if (db8500_init_data)</div><div class='add'>+			config.init_data = &amp;db8500_init_data[i];</div><div class='add'>+</div><div class='add'>+		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc,</div><div class='add'>+					       &amp;config);</div><div class='add'>+		if (IS_ERR(rdev)) {</div><div class='add'>+			err = PTR_ERR(rdev);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "failed to register %s: err %i\n",</div><div class='add'>+				info-&gt;desc.name, err);</div><div class='ctx'> 			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 db8500_regulator_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct regulator_init_data *db8500_init_data =</div><div class='del'>-					dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	/* register all regulators */</div><div class='del'>-	if (np) {</div><div class='del'>-		err = of_regulator_match(&amp;pdev-&gt;dev, np,</div><div class='del'>-					db8500_regulator_matches,</div><div class='del'>-					ARRAY_SIZE(db8500_regulator_matches));</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"Error parsing regulator init data: %d\n", err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = db8500_regulator_of_probe(pdev, np);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(dbx500_regulator_info); i++) {</div><div class='del'>-			err = db8500_regulator_register(pdev,</div><div class='del'>-							&amp;db8500_init_data[i],</div><div class='del'>-							i, NULL);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='ctx'> 		}</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "regulator-%s-probed\n", info-&gt;desc.name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ux500_regulator_debug_init(pdev,</div><div class='del'>-					 dbx500_regulator_info,</div><div class='del'>-					 ARRAY_SIZE(dbx500_regulator_info));</div><div class='add'>+	ux500_regulator_debug_init(pdev, dbx500_regulator_info,</div><div class='add'>+				   ARRAY_SIZE(dbx500_regulator_info));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/dbx500-prcmu.h b/drivers/regulator/dbx500-prcmu.h<br/>index c8e51ace9f06..6e20dab611ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/dbx500-prcmu.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/dbx500-prcmu.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/dbx500-prcmu.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/dbx500-prcmu.h</a></div><div class='hunk'>@@ -15,18 +15,14 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct dbx500_regulator_info - dbx500 regulator information</div><div class='del'>- * @dev: device pointer</div><div class='ctx'>  * @desc: regulator description</div><div class='del'>- * @rdev: regulator device pointer</div><div class='ctx'>  * @is_enabled: status of the regulator</div><div class='ctx'>  * @epod_id: id for EPOD (power domain)</div><div class='ctx'>  * @is_ramret: RAM retention switch for EPOD (power domain)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> struct dbx500_regulator_info {</div><div class='del'>-	struct device *dev;</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='ctx'> 	bool is_enabled;</div><div class='ctx'> 	u16 epod_id;</div><div class='ctx'> 	bool is_ramret;</div><div class='head'>diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c<br/>index 771a06d1900d..dbe477da4e55 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/fan53555.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/fan53555.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/fan53555.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/fan53555.c</a></div><div class='hunk'>@@ -1,17 +1,13 @@</div><div class='del'>-/*</div><div class='del'>- * FAN53555 Fairchild Digitally Programmable TinyBuck Regulator Driver.</div><div class='del'>- *</div><div class='del'>- * Supported Part Numbers:</div><div class='del'>- * FAN53555UC00X/01X/03X/04X/05X</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012 Marvell Technology Ltd.</div><div class='del'>- * Yunfan Zhang &lt;yfzhang@marvell.com&gt;</div><div class='del'>- *</div><div class='del'>- * This package 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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// FAN53555 Fairchild Digitally Programmable TinyBuck Regulator Driver.</div><div class='add'>+//</div><div class='add'>+// Supported Part Numbers:</div><div class='add'>+// FAN53555UC00X/01X/03X/04X/05X</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2012 Marvell Technology Ltd.</div><div class='add'>+// Yunfan Zhang &lt;yfzhang@marvell.com&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -91,10 +87,8 @@ enum {</div><div class='ctx'> </div><div class='ctx'> struct fan53555_device_info {</div><div class='ctx'> 	enum fan53555_vendor vendor;</div><div class='del'>-	struct regmap *regmap;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='ctx'> 	struct regulator_init_data *regulator;</div><div class='ctx'> 	/* IC Type and Rev */</div><div class='ctx'> 	int chip_id;</div><div class='hunk'>@@ -106,8 +100,6 @@ struct fan53555_device_info {</div><div class='ctx'> 	unsigned int vsel_min;</div><div class='ctx'> 	unsigned int vsel_step;</div><div class='ctx'> 	unsigned int vsel_count;</div><div class='del'>-	/* Voltage slew rate limiting */</div><div class='del'>-	unsigned int slew_rate;</div><div class='ctx'> 	/* Mode */</div><div class='ctx'> 	unsigned int mode_reg;</div><div class='ctx'> 	unsigned int mode_mask;</div><div class='hunk'>@@ -125,7 +117,7 @@ static int fan53555_set_suspend_voltage(struct regulator_dev *rdev, int uV)</div><div class='ctx'> 	ret = regulator_map_voltage_linear(rdev, uV, uV);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = regmap_update_bits(di-&gt;regmap, di-&gt;sleep_reg,</div><div class='add'>+	ret = regmap_update_bits(rdev-&gt;regmap, di-&gt;sleep_reg,</div><div class='ctx'> 				 di-&gt;desc.vsel_mask, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -140,7 +132,7 @@ static int fan53555_set_suspend_enable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fan53555_device_info *di = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(di-&gt;regmap, di-&gt;sleep_reg,</div><div class='add'>+	return regmap_update_bits(rdev-&gt;regmap, di-&gt;sleep_reg,</div><div class='ctx'> 				  VSEL_BUCK_EN, VSEL_BUCK_EN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +140,7 @@ static int fan53555_set_suspend_disable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fan53555_device_info *di = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(di-&gt;regmap, di-&gt;sleep_reg,</div><div class='add'>+	return regmap_update_bits(rdev-&gt;regmap, di-&gt;sleep_reg,</div><div class='ctx'> 				  VSEL_BUCK_EN, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -158,11 +150,11 @@ static int fan53555_set_mode(struct regulator_dev *rdev, unsigned int mode)</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case REGULATOR_MODE_FAST:</div><div class='del'>-		regmap_update_bits(di-&gt;regmap, di-&gt;mode_reg,</div><div class='add'>+		regmap_update_bits(rdev-&gt;regmap, di-&gt;mode_reg,</div><div class='ctx'> 				   di-&gt;mode_mask, di-&gt;mode_mask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REGULATOR_MODE_NORMAL:</div><div class='del'>-		regmap_update_bits(di-&gt;regmap, di-&gt;vol_reg, di-&gt;mode_mask, 0);</div><div class='add'>+		regmap_update_bits(rdev-&gt;regmap, di-&gt;vol_reg, di-&gt;mode_mask, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -176,7 +168,7 @@ static unsigned int fan53555_get_mode(struct regulator_dev *rdev)</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ret = regmap_read(di-&gt;regmap, di-&gt;mode_reg, &amp;val);</div><div class='add'>+	ret = regmap_read(rdev-&gt;regmap, di-&gt;mode_reg, &amp;val);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (val &amp; di-&gt;mode_mask)</div><div class='hunk'>@@ -213,7 +205,7 @@ static int fan53555_set_ramp(struct regulator_dev *rdev, int ramp)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(di-&gt;regmap, FAN53555_CONTROL,</div><div class='add'>+	return regmap_update_bits(rdev-&gt;regmap, FAN53555_CONTROL,</div><div class='ctx'> 				  CTL_SLEW_MASK, regval &lt;&lt; CTL_SLEW_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -396,6 +388,7 @@ static int fan53555_regulator_register(struct fan53555_device_info *di,</div><div class='ctx'> 			struct regulator_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct regulator_desc *rdesc = &amp;di-&gt;desc;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='ctx'> </div><div class='ctx'> 	rdesc-&gt;name = "fan53555-reg";</div><div class='ctx'> 	rdesc-&gt;supply_name = "vin";</div><div class='hunk'>@@ -410,8 +403,8 @@ static int fan53555_regulator_register(struct fan53555_device_info *di,</div><div class='ctx'> 	rdesc-&gt;vsel_mask = di-&gt;vsel_count - 1;</div><div class='ctx'> 	rdesc-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-	di-&gt;rdev = devm_regulator_register(di-&gt;dev, &amp;di-&gt;desc, config);</div><div class='del'>-	return PTR_ERR_OR_ZERO(di-&gt;rdev);</div><div class='add'>+	rdev = devm_regulator_register(di-&gt;dev, &amp;di-&gt;desc, config);</div><div class='add'>+	return PTR_ERR_OR_ZERO(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct regmap_config fan53555_regmap_config = {</div><div class='hunk'>@@ -466,6 +459,7 @@ static int fan53555_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 	struct fan53555_device_info *di;</div><div class='ctx'> 	struct fan53555_platform_data *pdata;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regmap *regmap;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -502,22 +496,22 @@ static int fan53555_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 		di-&gt;vendor = id-&gt;driver_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	di-&gt;regmap = devm_regmap_init_i2c(client, &amp;fan53555_regmap_config);</div><div class='del'>-	if (IS_ERR(di-&gt;regmap)) {</div><div class='add'>+	regmap = devm_regmap_init_i2c(client, &amp;fan53555_regmap_config);</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "Failed to allocate regmap!\n");</div><div class='del'>-		return PTR_ERR(di-&gt;regmap);</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='ctx'> 	}</div><div class='ctx'> 	di-&gt;dev = &amp;client-&gt;dev;</div><div class='ctx'> 	i2c_set_clientdata(client, di);</div><div class='ctx'> 	/* Get chip ID */</div><div class='del'>-	ret = regmap_read(di-&gt;regmap, FAN53555_ID1, &amp;val);</div><div class='add'>+	ret = regmap_read(regmap, FAN53555_ID1, &amp;val);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "Failed to get chip ID!\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	di-&gt;chip_id = val &amp; DIE_ID;</div><div class='ctx'> 	/* Get chip revision */</div><div class='del'>-	ret = regmap_read(di-&gt;regmap, FAN53555_ID2, &amp;val);</div><div class='add'>+	ret = regmap_read(regmap, FAN53555_ID2, &amp;val);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "Failed to get chip Rev!\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -534,7 +528,7 @@ static int fan53555_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 	/* Register regulator */</div><div class='ctx'> 	config.dev = di-&gt;dev;</div><div class='ctx'> 	config.init_data = di-&gt;regulator;</div><div class='del'>-	config.regmap = di-&gt;regmap;</div><div class='add'>+	config.regmap = regmap;</div><div class='ctx'> 	config.driver_data = di;</div><div class='ctx'> 	config.of_node = np;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c<br/>index 6157001df0a4..f50d86a66138 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/gpio-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/gpio-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/gpio-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/gpio-regulator.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> struct gpio_regulator_data {</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='del'>-	struct regulator_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	struct gpio_desc **gpiods;</div><div class='ctx'> 	int nr_gpios;</div><div class='hunk'>@@ -125,7 +124,7 @@ static int gpio_regulator_set_current_limit(struct regulator_dev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops gpio_regulator_voltage_ops = {</div><div class='add'>+static const struct regulator_ops gpio_regulator_voltage_ops = {</div><div class='ctx'> 	.get_voltage = gpio_regulator_get_value,</div><div class='ctx'> 	.set_voltage = gpio_regulator_set_voltage,</div><div class='ctx'> 	.list_voltage = gpio_regulator_list_voltage,</div><div class='hunk'>@@ -221,7 +220,7 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,</div><div class='ctx'> 	return config;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops gpio_regulator_current_ops = {</div><div class='add'>+static const struct regulator_ops gpio_regulator_current_ops = {</div><div class='ctx'> 	.get_current_limit = gpio_regulator_get_value,</div><div class='ctx'> 	.set_current_limit = gpio_regulator_set_current_limit,</div><div class='ctx'> };</div><div class='hunk'>@@ -233,6 +232,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device_node *np = dev-&gt;of_node;</div><div class='ctx'> 	struct gpio_regulator_data *drvdata;</div><div class='ctx'> 	struct regulator_config cfg = { };</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='ctx'> 	enum gpiod_flags gflags;</div><div class='ctx'> 	int ptr, ret, state, i;</div><div class='ctx'> </div><div class='hunk'>@@ -326,9 +326,9 @@ static int gpio_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(cfg.ena_gpiod))</div><div class='ctx'> 		return PTR_ERR(cfg.ena_gpiod);</div><div class='ctx'> </div><div class='del'>-	drvdata-&gt;dev = regulator_register(&amp;drvdata-&gt;desc, &amp;cfg);</div><div class='del'>-	if (IS_ERR(drvdata-&gt;dev)) {</div><div class='del'>-		ret = PTR_ERR(drvdata-&gt;dev);</div><div class='add'>+	rdev = devm_regulator_register(dev, &amp;drvdata-&gt;desc, &amp;cfg);</div><div class='add'>+	if (IS_ERR(rdev)) {</div><div class='add'>+		ret = PTR_ERR(rdev);</div><div class='ctx'> 		dev_err(dev, "Failed to register regulator: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -338,15 +338,6 @@ static int gpio_regulator_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 gpio_regulator_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	regulator_unregister(drvdata-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_OF)</div><div class='ctx'> static const struct of_device_id regulator_gpio_of_match[] = {</div><div class='ctx'> 	{ .compatible = "regulator-gpio", },</div><div class='hunk'>@@ -357,7 +348,6 @@ MODULE_DEVICE_TABLE(of, regulator_gpio_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver gpio_regulator_driver = {</div><div class='ctx'> 	.probe		= gpio_regulator_probe,</div><div class='del'>-	.remove		= gpio_regulator_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "gpio-regulator",</div><div class='ctx'> 		.of_match_table = of_match_ptr(regulator_gpio_of_match),</div><div class='head'>diff --git a/drivers/regulator/hi6421-regulator.c b/drivers/regulator/hi6421-regulator.c<br/>index 259c3a865ac6..5ac3d7c29725 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/hi6421-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/hi6421-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/hi6421-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/hi6421-regulator.c</a></div><div class='hunk'>@@ -1,17 +1,13 @@</div><div class='del'>-/*</div><div class='del'>- * Device driver for regulators in Hi6421 IC</div><div class='del'>- *</div><div class='del'>- * Copyright (c) &lt;2011-2014&gt; HiSilicon Technologies Co., Ltd.</div><div class='del'>- *              http://www.hisilicon.com</div><div class='del'>- * Copyright (c) &lt;2013-2014&gt; Linaro Ltd.</div><div class='del'>- *              http://www.linaro.org</div><div class='del'>- *</div><div class='del'>- * Author: Guodong Xu &lt;guodong.xu@linaro.org&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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Device driver for regulators in Hi6421 IC</div><div class='add'>+//</div><div class='add'>+// Copyright (c) &lt;2011-2014&gt; HiSilicon Technologies Co., Ltd.</div><div class='add'>+//              http://www.hisilicon.com</div><div class='add'>+// Copyright (c) &lt;2013-2014&gt; Linaro Ltd.</div><div class='add'>+//              http://www.linaro.org</div><div class='add'>+//</div><div class='add'>+// Author: Guodong Xu &lt;guodong.xu@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -78,43 +74,6 @@ enum hi6421_regulator_id {</div><div class='ctx'> 	HI6421_NUM_REGULATORS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HI6421_REGULATOR_OF_MATCH(_name, id)				\</div><div class='del'>-{									\</div><div class='del'>-	.name = #_name,							\</div><div class='del'>-	.driver_data = (void *) HI6421_##id,				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match hi6421_regulator_match[] = {</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout0, LDO0),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout1, LDO1),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout2, LDO2),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout3, LDO3),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout4, LDO4),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout5, LDO5),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout6, LDO6),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout7, LDO7),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout8, LDO8),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout9, LDO9),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout10, LDO10),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout11, LDO11),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout12, LDO12),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout13, LDO13),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout14, LDO14),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout15, LDO15),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout16, LDO16),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout17, LDO17),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout18, LDO18),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout19, LDO19),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout20, LDO20),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_vout_audio, LDOAUDIO),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_buck0, BUCK0),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_buck1, BUCK1),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_buck2, BUCK2),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_buck3, BUCK3),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_buck4, BUCK4),</div><div class='del'>-	HI6421_REGULATOR_OF_MATCH(hi6421_buck5, BUCK5),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* LDO 0, 4~7, 9~14, 16~20 have same voltage table. */</div><div class='ctx'> static const unsigned int ldo_0_voltages[] = {</div><div class='ctx'> 	1500000, 1800000, 2400000, 2500000,</div><div class='hunk'>@@ -157,6 +116,7 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'> #define HI6421_LDO_ENABLE_TIME (350)</div><div class='ctx'> /*</div><div class='ctx'>  * _id - LDO id name string</div><div class='add'>+ * _match - of match name string</div><div class='ctx'>  * v_table - voltage table</div><div class='ctx'>  * vreg - voltage select register</div><div class='ctx'>  * vmask - voltage select mask</div><div class='hunk'>@@ -166,11 +126,13 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'>  * ecomask - eco mode mask</div><div class='ctx'>  * ecoamp - eco mode load uppler limit in uA</div><div class='ctx'>  */</div><div class='del'>-#define HI6421_LDO(_id, v_table, vreg, vmask, ereg, emask,		\</div><div class='add'>+#define HI6421_LDO(_id, _match, v_table, vreg, vmask, ereg, emask,	\</div><div class='ctx'> 		   odelay, ecomask, ecoamp)				\</div><div class='ctx'> 	[HI6421_##_id] = {						\</div><div class='ctx'> 		.desc = {						\</div><div class='ctx'> 			.name		= #_id,				\</div><div class='add'>+			.of_match        = of_match_ptr(#_match),	\</div><div class='add'>+			.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 			.ops		= &amp;hi6421_ldo_ops,		\</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,		\</div><div class='ctx'> 			.id		= HI6421_##_id,			\</div><div class='hunk'>@@ -191,6 +153,7 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'> /* HI6421 LDO1~3 are linear voltage regulators at fixed uV_step</div><div class='ctx'>  *</div><div class='ctx'>  * _id - LDO id name string</div><div class='add'>+ * _match - of match name string</div><div class='ctx'>  * _min_uV - minimum voltage supported in uV</div><div class='ctx'>  * n_volt - number of votages available</div><div class='ctx'>  * vstep - voltage increase in each linear step in uV</div><div class='hunk'>@@ -202,11 +165,13 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'>  * ecomask - eco mode mask</div><div class='ctx'>  * ecoamp - eco mode load uppler limit in uA</div><div class='ctx'>  */</div><div class='del'>-#define HI6421_LDO_LINEAR(_id, _min_uV, n_volt, vstep, vreg, vmask,	\</div><div class='add'>+#define HI6421_LDO_LINEAR(_id, _match, _min_uV, n_volt, vstep, vreg, vmask,\</div><div class='ctx'> 			  ereg, emask, odelay, ecomask, ecoamp)		\</div><div class='ctx'> 	[HI6421_##_id] = {						\</div><div class='ctx'> 		.desc = {						\</div><div class='ctx'> 			.name		= #_id,				\</div><div class='add'>+			.of_match        = of_match_ptr(#_match),	\</div><div class='add'>+			.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 			.ops		= &amp;hi6421_ldo_linear_ops,	\</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,		\</div><div class='ctx'> 			.id		= HI6421_##_id,			\</div><div class='hunk'>@@ -228,6 +193,7 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'> /* HI6421 LDOAUDIO is a linear voltage regulator with two 4-step ranges</div><div class='ctx'>  *</div><div class='ctx'>  * _id - LDO id name string</div><div class='add'>+ * _match - of match name string</div><div class='ctx'>  * n_volt - number of votages available</div><div class='ctx'>  * volt_ranges - array of regulator_linear_range</div><div class='ctx'>  * vstep - voltage increase in each linear step in uV</div><div class='hunk'>@@ -239,11 +205,13 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'>  * ecomask - eco mode mask</div><div class='ctx'>  * ecoamp - eco mode load uppler limit in uA</div><div class='ctx'>  */</div><div class='del'>-#define HI6421_LDO_LINEAR_RANGE(_id, n_volt, volt_ranges, vreg, vmask,	\</div><div class='add'>+#define HI6421_LDO_LINEAR_RANGE(_id, _match, n_volt, volt_ranges, vreg, vmask,\</div><div class='ctx'> 				ereg, emask, odelay, ecomask, ecoamp)	\</div><div class='ctx'> 	[HI6421_##_id] = {						\</div><div class='ctx'> 		.desc = {						\</div><div class='ctx'> 			.name		= #_id,				\</div><div class='add'>+			.of_match        = of_match_ptr(#_match),	\</div><div class='add'>+			.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 			.ops		= &amp;hi6421_ldo_linear_range_ops,	\</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,		\</div><div class='ctx'> 			.id		= HI6421_##_id,			\</div><div class='hunk'>@@ -265,6 +233,7 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'> /* HI6421 BUCK0/1/2 are linear voltage regulators at fixed uV_step</div><div class='ctx'>  *</div><div class='ctx'>  * _id - BUCK0/1/2 id name string</div><div class='add'>+ * _match - of match name string</div><div class='ctx'>  * vreg - voltage select register</div><div class='ctx'>  * vmask - voltage select mask</div><div class='ctx'>  * ereg - enable register</div><div class='hunk'>@@ -273,11 +242,13 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'>  * etime - enable time</div><div class='ctx'>  * odelay - off/on delay time in uS</div><div class='ctx'>  */</div><div class='del'>-#define HI6421_BUCK012(_id, vreg, vmask, ereg, emask, sleepmask,	\</div><div class='add'>+#define HI6421_BUCK012(_id, _match, vreg, vmask, ereg, emask, sleepmask,\</div><div class='ctx'> 			etime, odelay)					\</div><div class='ctx'> 	[HI6421_##_id] = {						\</div><div class='ctx'> 		.desc = {						\</div><div class='ctx'> 			.name		= #_id,				\</div><div class='add'>+			.of_match        = of_match_ptr(#_match),	\</div><div class='add'>+			.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 			.ops		= &amp;hi6421_buck012_ops,		\</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,		\</div><div class='ctx'> 			.id		= HI6421_##_id,			\</div><div class='hunk'>@@ -299,6 +270,7 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'>  *  that it supports SLEEP mode, so has different .ops.</div><div class='ctx'>  *</div><div class='ctx'>  * _id - LDO id name string</div><div class='add'>+ * _match - of match name string</div><div class='ctx'>  * v_table - voltage table</div><div class='ctx'>  * vreg - voltage select register</div><div class='ctx'>  * vmask - voltage select mask</div><div class='hunk'>@@ -307,11 +279,13 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'>  * odelay - off/on delay time in uS</div><div class='ctx'>  * sleepmask - mask of sleep mode</div><div class='ctx'>  */</div><div class='del'>-#define HI6421_BUCK345(_id, v_table, vreg, vmask, ereg, emask,		\</div><div class='add'>+#define HI6421_BUCK345(_id, _match, v_table, vreg, vmask, ereg, emask,	\</div><div class='ctx'> 			odelay, sleepmask)				\</div><div class='ctx'> 	[HI6421_##_id] = {						\</div><div class='ctx'> 		.desc = {						\</div><div class='ctx'> 			.name		= #_id,				\</div><div class='add'>+			.of_match        = of_match_ptr(#_match),	\</div><div class='add'>+			.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 			.ops		= &amp;hi6421_buck345_ops,		\</div><div class='ctx'> 			.type		= REGULATOR_VOLTAGE,		\</div><div class='ctx'> 			.id		= HI6421_##_id,			\</div><div class='hunk'>@@ -331,59 +305,63 @@ static const struct regulator_ops hi6421_buck345_ops;</div><div class='ctx'> /* HI6421 regulator information */</div><div class='ctx'> static struct hi6421_regulator_info</div><div class='ctx'> 		hi6421_regulator_info[HI6421_NUM_REGULATORS] = {</div><div class='del'>-	HI6421_LDO(LDO0, ldo_0_voltages, 0x20, 0x07, 0x20, 0x10,</div><div class='add'>+	HI6421_LDO(LDO0, hi6421_vout0, ldo_0_voltages, 0x20, 0x07, 0x20, 0x10,</div><div class='ctx'> 		   10000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO_LINEAR(LDO1, 1700000, 4, 100000, 0x21, 0x03, 0x21, 0x10,</div><div class='del'>-			  10000, 0x20, 5000),</div><div class='del'>-	HI6421_LDO_LINEAR(LDO2, 1050000, 8, 50000, 0x22, 0x07, 0x22, 0x10,</div><div class='del'>-			  20000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO_LINEAR(LDO3, 1050000, 8, 50000, 0x23, 0x07, 0x23, 0x10,</div><div class='del'>-			  20000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO4, ldo_0_voltages, 0x24, 0x07, 0x24, 0x10,</div><div class='add'>+	HI6421_LDO_LINEAR(LDO1, hi6421_vout1, 1700000, 4, 100000, 0x21, 0x03,</div><div class='add'>+			  0x21, 0x10, 10000, 0x20, 5000),</div><div class='add'>+	HI6421_LDO_LINEAR(LDO2, hi6421_vout2, 1050000, 8, 50000, 0x22, 0x07,</div><div class='add'>+			  0x22, 0x10, 20000, 0x20, 8000),</div><div class='add'>+	HI6421_LDO_LINEAR(LDO3, hi6421_vout3, 1050000, 8, 50000, 0x23, 0x07,</div><div class='add'>+			  0x23, 0x10, 20000, 0x20, 8000),</div><div class='add'>+	HI6421_LDO(LDO4, hi6421_vout4, ldo_0_voltages, 0x24, 0x07, 0x24, 0x10,</div><div class='ctx'> 		   20000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO5, ldo_0_voltages, 0x25, 0x07, 0x25, 0x10,</div><div class='add'>+	HI6421_LDO(LDO5, hi6421_vout5, ldo_0_voltages, 0x25, 0x07, 0x25, 0x10,</div><div class='ctx'> 		   20000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO6, ldo_0_voltages, 0x26, 0x07, 0x26, 0x10,</div><div class='add'>+	HI6421_LDO(LDO6, hi6421_vout6, ldo_0_voltages, 0x26, 0x07, 0x26, 0x10,</div><div class='ctx'> 		   20000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO7, ldo_0_voltages, 0x27, 0x07, 0x27, 0x10,</div><div class='add'>+	HI6421_LDO(LDO7, hi6421_vout7, ldo_0_voltages, 0x27, 0x07, 0x27, 0x10,</div><div class='ctx'> 		   20000, 0x20, 5000),</div><div class='del'>-	HI6421_LDO(LDO8, ldo_8_voltages, 0x28, 0x07, 0x28, 0x10,</div><div class='add'>+	HI6421_LDO(LDO8, hi6421_vout8, ldo_8_voltages, 0x28, 0x07, 0x28, 0x10,</div><div class='ctx'> 		   20000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO9, ldo_0_voltages, 0x29, 0x07, 0x29, 0x10,</div><div class='add'>+	HI6421_LDO(LDO9, hi6421_vout9, ldo_0_voltages, 0x29, 0x07, 0x29, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO10, ldo_0_voltages, 0x2a, 0x07, 0x2a, 0x10,</div><div class='add'>+	HI6421_LDO(LDO10, hi6421_vout10, ldo_0_voltages, 0x2a, 0x07, 0x2a, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO11, ldo_0_voltages, 0x2b, 0x07, 0x2b, 0x10,</div><div class='add'>+	HI6421_LDO(LDO11, hi6421_vout11, ldo_0_voltages, 0x2b, 0x07, 0x2b, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO12, ldo_0_voltages, 0x2c, 0x07, 0x2c, 0x10,</div><div class='add'>+	HI6421_LDO(LDO12, hi6421_vout12, ldo_0_voltages, 0x2c, 0x07, 0x2c, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO13, ldo_0_voltages, 0x2d, 0x07, 0x2d, 0x10,</div><div class='add'>+	HI6421_LDO(LDO13, hi6421_vout13, ldo_0_voltages, 0x2d, 0x07, 0x2d, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO14, ldo_0_voltages, 0x2e, 0x07, 0x2e, 0x10,</div><div class='add'>+	HI6421_LDO(LDO14, hi6421_vout14, ldo_0_voltages, 0x2e, 0x07, 0x2e, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO15, ldo_8_voltages, 0x2f, 0x07, 0x2f, 0x10,</div><div class='add'>+	HI6421_LDO(LDO15, hi6421_vout15, ldo_8_voltages, 0x2f, 0x07, 0x2f, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO16, ldo_0_voltages, 0x30, 0x07, 0x30, 0x10,</div><div class='add'>+	HI6421_LDO(LDO16, hi6421_vout16, ldo_0_voltages, 0x30, 0x07, 0x30, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO17, ldo_0_voltages, 0x31, 0x07, 0x31, 0x10,</div><div class='add'>+	HI6421_LDO(LDO17, hi6421_vout17, ldo_0_voltages, 0x31, 0x07, 0x31, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO18, ldo_0_voltages, 0x32, 0x07, 0x32, 0x10,</div><div class='add'>+	HI6421_LDO(LDO18, hi6421_vout18, ldo_0_voltages, 0x32, 0x07, 0x32, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO19, ldo_0_voltages, 0x33, 0x07, 0x33, 0x10,</div><div class='add'>+	HI6421_LDO(LDO19, hi6421_vout19, ldo_0_voltages, 0x33, 0x07, 0x33, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO(LDO20, ldo_0_voltages, 0x34, 0x07, 0x34, 0x10,</div><div class='add'>+	HI6421_LDO(LDO20, hi6421_vout20, ldo_0_voltages, 0x34, 0x07, 0x34, 0x10,</div><div class='ctx'> 		   40000, 0x20, 8000),</div><div class='del'>-	HI6421_LDO_LINEAR_RANGE(LDOAUDIO, 8, ldo_audio_volt_range, 0x36,</div><div class='del'>-				0x70, 0x36, 0x01, 40000, 0x02, 5000),</div><div class='del'>-	HI6421_BUCK012(BUCK0, 0x0d, 0x7f, 0x0c, 0x01, 0x10, 400, 20000),</div><div class='del'>-	HI6421_BUCK012(BUCK1, 0x0f, 0x7f, 0x0e, 0x01, 0x10, 400, 20000),</div><div class='del'>-	HI6421_BUCK012(BUCK2, 0x11, 0x7f, 0x10, 0x01, 0x10, 350, 100),</div><div class='del'>-	HI6421_BUCK345(BUCK3, buck_3_voltages, 0x13, 0x07, 0x12, 0x01,</div><div class='del'>-		       20000, 0x10),</div><div class='del'>-	HI6421_BUCK345(BUCK4, buck_4_voltages, 0x15, 0x07, 0x14, 0x01,</div><div class='del'>-		       20000, 0x10),</div><div class='del'>-	HI6421_BUCK345(BUCK5, buck_5_voltages, 0x17, 0x07, 0x16, 0x01,</div><div class='del'>-		       20000, 0x10),</div><div class='add'>+	HI6421_LDO_LINEAR_RANGE(LDOAUDIO, hi6421_vout_audio, 8,</div><div class='add'>+				ldo_audio_volt_range, 0x36, 0x70, 0x36, 0x01,</div><div class='add'>+				40000, 0x02, 5000),</div><div class='add'>+	HI6421_BUCK012(BUCK0, hi6421_buck0, 0x0d, 0x7f, 0x0c, 0x01, 0x10, 400,</div><div class='add'>+		       20000),</div><div class='add'>+	HI6421_BUCK012(BUCK1, hi6421_buck1, 0x0f, 0x7f, 0x0e, 0x01, 0x10, 400,</div><div class='add'>+		       20000),</div><div class='add'>+	HI6421_BUCK012(BUCK2, hi6421_buck2, 0x11, 0x7f, 0x10, 0x01, 0x10, 350,</div><div class='add'>+		       100),</div><div class='add'>+	HI6421_BUCK345(BUCK3, hi6421_buck3, buck_3_voltages, 0x13, 0x07, 0x12,</div><div class='add'>+		       0x01, 20000, 0x10),</div><div class='add'>+	HI6421_BUCK345(BUCK4, hi6421_buck4, buck_4_voltages, 0x15, 0x07, 0x14,</div><div class='add'>+		       0x01, 20000, 0x10),</div><div class='add'>+	HI6421_BUCK345(BUCK5, hi6421_buck5, buck_5_voltages, 0x17, 0x07, 0x16,</div><div class='add'>+		       0x01, 20000, 0x10),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int hi6421_regulator_enable(struct regulator_dev *rdev)</div><div class='hunk'>@@ -552,42 +530,14 @@ static const struct regulator_ops hi6421_buck345_ops = {</div><div class='ctx'> 	.set_mode = hi6421_regulator_buck_set_mode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hi6421_regulator_register(struct platform_device *pdev,</div><div class='del'>-				     struct regmap *rmap,</div><div class='del'>-				     struct regulator_init_data *init_data,</div><div class='del'>-				     int id, struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	struct hi6421_regulator_info *info = NULL;</div><div class='del'>-	struct regulator_config config = { };</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='del'>-</div><div class='del'>-	/* assign per-regulator data */</div><div class='del'>-	info = &amp;hi6421_regulator_info[id];</div><div class='del'>-</div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='del'>-	config.init_data = init_data;</div><div class='del'>-	config.driver_data = info;</div><div class='del'>-	config.regmap = rmap;</div><div class='del'>-	config.of_node = np;</div><div class='del'>-</div><div class='del'>-	/* register regulator with framework */</div><div class='del'>-	rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc, &amp;config);</div><div class='del'>-	if (IS_ERR(rdev)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='del'>-			info-&gt;desc.name);</div><div class='del'>-		return PTR_ERR(rdev);</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='ctx'> static int hi6421_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	struct hi6421_pmic *pmic;</div><div class='add'>+	struct hi6421_pmic *pmic = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct hi6421_regulator_pdata *pdata;</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+	struct hi6421_regulator_info *info;</div><div class='add'>+	struct regulator_config config = { };</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	pdata = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pdata), GFP_KERNEL);</div><div class='ctx'> 	if (!pdata)</div><div class='hunk'>@@ -595,27 +545,21 @@ static int hi6421_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	mutex_init(&amp;pdata-&gt;lock);</div><div class='ctx'> 	platform_set_drvdata(pdev, pdata);</div><div class='ctx'> </div><div class='del'>-	np = of_get_child_by_name(dev-&gt;parent-&gt;of_node, "regulators");</div><div class='del'>-	if (!np)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	ret = of_regulator_match(dev, np,</div><div class='del'>-				 hi6421_regulator_match,</div><div class='del'>-				 ARRAY_SIZE(hi6421_regulator_match));</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "Error parsing regulator init data: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pmic = dev_get_drvdata(dev-&gt;parent);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(hi6421_regulator_info); i++) {</div><div class='del'>-		ret = hi6421_regulator_register(pdev, pmic-&gt;regmap,</div><div class='del'>-			hi6421_regulator_match[i].init_data, i,</div><div class='del'>-			hi6421_regulator_match[i].of_node);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+		/* assign per-regulator data */</div><div class='add'>+		info = &amp;hi6421_regulator_info[i];</div><div class='add'>+</div><div class='add'>+		config.dev = pdev-&gt;dev.parent;</div><div class='add'>+		config.driver_data = info;</div><div class='add'>+		config.regmap = pmic-&gt;regmap;</div><div class='add'>+</div><div class='add'>+		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;info-&gt;desc,</div><div class='add'>+					       &amp;config);</div><div class='add'>+		if (IS_ERR(rdev)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='add'>+				info-&gt;desc.name);</div><div class='add'>+			return PTR_ERR(rdev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/regulator/hi6421v530-regulator.c b/drivers/regulator/hi6421v530-regulator.c<br/>index c09bc71538a5..06ae65199afd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/hi6421v530-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/hi6421v530-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/hi6421v530-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/hi6421v530-regulator.c</a></div><div class='hunk'>@@ -1,18 +1,14 @@</div><div class='del'>-/*</div><div class='del'>- * Device driver for regulators in Hi6421V530 IC</div><div class='del'>- *</div><div class='del'>- * Copyright (c) &lt;2017&gt; HiSilicon Technologies Co., Ltd.</div><div class='del'>- *              http://www.hisilicon.com</div><div class='del'>- * Copyright (c) &lt;2017&gt; Linaro Ltd.</div><div class='del'>- *              http://www.linaro.org</div><div class='del'>- *</div><div class='del'>- * Author: Wang Xiaoyin &lt;hw.wangxiaoyin@hisilicon.com&gt;</div><div class='del'>- *         Guodong Xu &lt;guodong.xu@linaro.org&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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Device driver for regulators in Hi6421V530 IC</div><div class='add'>+//</div><div class='add'>+// Copyright (c) &lt;2017&gt; HiSilicon Technologies Co., Ltd.</div><div class='add'>+//              http://www.hisilicon.com</div><div class='add'>+// Copyright (c) &lt;2017&gt; Linaro Ltd.</div><div class='add'>+//              http://www.linaro.org</div><div class='add'>+//</div><div class='add'>+// Author: Wang Xiaoyin &lt;hw.wangxiaoyin@hisilicon.com&gt;</div><div class='add'>+//         Guodong Xu &lt;guodong.xu@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mfd/hi6421-pmic.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/regulator/hi655x-regulator.c b/drivers/regulator/hi655x-regulator.c<br/>index bba24a6fdb1e..ac2ee2030211 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/hi655x-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/hi655x-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/hi655x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/hi655x-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,12 @@</div><div class='del'>-/*</div><div class='del'>- * Device driver for regulators in Hi655x IC</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Hisilicon.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * Chen Feng &lt;puck.chen@hisilicon.com&gt;</div><div class='del'>- * Fei  Wang &lt;w.f@huawei.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Device driver for regulators in Hi655x IC</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2016 Hisilicon.</div><div class='add'>+//</div><div class='add'>+// Authors:</div><div class='add'>+// Chen Feng &lt;puck.chen@hisilicon.com&gt;</div><div class='add'>+// Fei  Wang &lt;w.f@huawei.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -28,7 +24,6 @@</div><div class='ctx'> struct hi655x_regulator {</div><div class='ctx'> 	unsigned int disable_reg;</div><div class='ctx'> 	unsigned int status_reg;</div><div class='del'>-	unsigned int ctrl_mask;</div><div class='ctx'> 	struct regulator_desc rdesc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,22 +72,18 @@ enum hi655x_regulator_id {</div><div class='ctx'> static int hi655x_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int value = 0;</div><div class='del'>-</div><div class='ctx'> 	struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='ctx'> 	regmap_read(rdev-&gt;regmap, regulator-&gt;status_reg, &amp;value);</div><div class='del'>-	return (value &amp; BIT(regulator-&gt;ctrl_mask));</div><div class='add'>+	return (value &amp; rdev-&gt;desc-&gt;enable_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hi655x_disable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='ctx'> 	struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	ret = regmap_write(rdev-&gt;regmap, regulator-&gt;disable_reg,</div><div class='del'>-			   BIT(regulator-&gt;ctrl_mask));</div><div class='del'>-	return ret;</div><div class='add'>+	return regmap_write(rdev-&gt;regmap, regulator-&gt;disable_reg,</div><div class='add'>+			    rdev-&gt;desc-&gt;enable_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_ops hi655x_regulator_ops = {</div><div class='hunk'>@@ -132,7 +123,6 @@ static const struct regulator_ops hi655x_ldo_linear_ops = {</div><div class='ctx'> 	},                                                       \</div><div class='ctx'> 	.disable_reg = HI655X_BUS_ADDR(dreg),                    \</div><div class='ctx'> 	.status_reg = HI655X_BUS_ADDR(sreg),                     \</div><div class='del'>-	.ctrl_mask = cmask,                                      \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define HI655X_LDO_LINEAR(_ID, vreg, vmask, ereg, dreg,          \</div><div class='hunk'>@@ -155,10 +145,9 @@ static const struct regulator_ops hi655x_ldo_linear_ops = {</div><div class='ctx'> 	},                                                       \</div><div class='ctx'> 	.disable_reg = HI655X_BUS_ADDR(dreg),                    \</div><div class='ctx'> 	.status_reg = HI655X_BUS_ADDR(sreg),                     \</div><div class='del'>-	.ctrl_mask = cmask,                                      \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hi655x_regulator regulators[] = {</div><div class='add'>+static const struct hi655x_regulator regulators[] = {</div><div class='ctx'> 	HI655X_LDO_LINEAR(LDO2, 0x72, 0x07, 0x29, 0x2a, 0x2b, 0x01,</div><div class='ctx'> 			  2500000, 8, 100000),</div><div class='ctx'> 	HI655X_LDO(LDO7, 0x78, 0x07, 0x29, 0x2a, 0x2b, 0x06, ldo7_voltages),</div><div class='head'>diff --git a/drivers/regulator/lm363x-regulator.c b/drivers/regulator/lm363x-regulator.c<br/>index c876e161052a..e02fdd1dd092 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/lm363x-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/lm363x-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/lm363x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/lm363x-regulator.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static const int ldo_cont_enable_time[] = {</div><div class='ctx'> static int lm363x_regulator_enable_time(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	enum lm363x_regulator_id id = rdev_get_id(rdev);</div><div class='del'>-	u8 val, addr, mask;</div><div class='add'>+	unsigned int val, addr, mask;</div><div class='ctx'> </div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case LM3631_LDO_CONT:</div><div class='hunk'>@@ -71,7 +71,7 @@ static int lm363x_regulator_enable_time(struct regulator_dev *rdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (regmap_read(rdev-&gt;regmap, addr, (unsigned int *)&amp;val))</div><div class='add'>+	if (regmap_read(rdev-&gt;regmap, addr, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	val = (val &amp; mask) &gt;&gt; LM3631_ENTIME_SHIFT;</div><div class='hunk'>@@ -82,13 +82,13 @@ static int lm363x_regulator_enable_time(struct regulator_dev *rdev)</div><div class='ctx'> 		return ENABLE_TIME_USEC * val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops lm363x_boost_voltage_table_ops = {</div><div class='add'>+static const struct regulator_ops lm363x_boost_voltage_table_ops = {</div><div class='ctx'> 	.list_voltage     = regulator_list_voltage_linear,</div><div class='ctx'> 	.set_voltage_sel  = regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.get_voltage_sel  = regulator_get_voltage_sel_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops lm363x_regulator_voltage_table_ops = {</div><div class='add'>+static const struct regulator_ops lm363x_regulator_voltage_table_ops = {</div><div class='ctx'> 	.list_voltage     = regulator_list_voltage_linear,</div><div class='ctx'> 	.set_voltage_sel  = regulator_set_voltage_sel_regmap,</div><div class='ctx'> 	.get_voltage_sel  = regulator_get_voltage_sel_regmap,</div><div class='head'>diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c<br/>index 14fd38807134..2e16a6ab491d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/lp8755.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/lp8755.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/lp8755.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/lp8755.c</a></div><div class='hunk'>@@ -372,10 +372,13 @@ static irqreturn_t lp8755_irq_handler(int irq, void *data)</div><div class='ctx'> 	for (icnt = 0; icnt &lt; LP8755_BUCK_MAX; icnt++)</div><div class='ctx'> 		if ((flag0 &amp; (0x4 &lt;&lt; icnt))</div><div class='ctx'> 		    &amp;&amp; (pchip-&gt;irqmask &amp; (0x04 &lt;&lt; icnt))</div><div class='del'>-		    &amp;&amp; (pchip-&gt;rdev[icnt] != NULL))</div><div class='add'>+		    &amp;&amp; (pchip-&gt;rdev[icnt] != NULL)) {</div><div class='add'>+			regulator_lock(pchip-&gt;rdev[icnt]);</div><div class='ctx'> 			regulator_notifier_call_chain(pchip-&gt;rdev[icnt],</div><div class='ctx'> 						      LP8755_EVENT_PWR_FAULT,</div><div class='ctx'> 						      NULL);</div><div class='add'>+			regulator_unlock(pchip-&gt;rdev[icnt]);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	/* read flag1 register */</div><div class='ctx'> 	ret = lp8755_read(pchip, 0x0E, &amp;flag1);</div><div class='hunk'>@@ -389,18 +392,24 @@ static irqreturn_t lp8755_irq_handler(int irq, void *data)</div><div class='ctx'> 	/* send OCP event to all regulator devices */</div><div class='ctx'> 	if ((flag1 &amp; 0x01) &amp;&amp; (pchip-&gt;irqmask &amp; 0x01))</div><div class='ctx'> 		for (icnt = 0; icnt &lt; LP8755_BUCK_MAX; icnt++)</div><div class='del'>-			if (pchip-&gt;rdev[icnt] != NULL)</div><div class='add'>+			if (pchip-&gt;rdev[icnt] != NULL) {</div><div class='add'>+				regulator_lock(pchip-&gt;rdev[icnt]);</div><div class='ctx'> 				regulator_notifier_call_chain(pchip-&gt;rdev[icnt],</div><div class='ctx'> 							      LP8755_EVENT_OCP,</div><div class='ctx'> 							      NULL);</div><div class='add'>+				regulator_unlock(pchip-&gt;rdev[icnt]);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 	/* send OVP event to all regulator devices */</div><div class='ctx'> 	if ((flag1 &amp; 0x02) &amp;&amp; (pchip-&gt;irqmask &amp; 0x02))</div><div class='ctx'> 		for (icnt = 0; icnt &lt; LP8755_BUCK_MAX; icnt++)</div><div class='del'>-			if (pchip-&gt;rdev[icnt] != NULL)</div><div class='add'>+			if (pchip-&gt;rdev[icnt] != NULL) {</div><div class='add'>+				regulator_lock(pchip-&gt;rdev[icnt]);</div><div class='ctx'> 				regulator_notifier_call_chain(pchip-&gt;rdev[icnt],</div><div class='ctx'> 							      LP8755_EVENT_OVP,</div><div class='ctx'> 							      NULL);</div><div class='add'>+				regulator_unlock(pchip-&gt;rdev[icnt]);</div><div class='add'>+			}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> err_i2c:</div><div class='head'>diff --git a/drivers/regulator/lp87565-regulator.c b/drivers/regulator/lp87565-regulator.c<br/>index 4ed41731a5b1..81eb4b890c0c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/lp87565-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/lp87565-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/lp87565-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/lp87565-regulator.c</a></div><div class='hunk'>@@ -34,6 +34,10 @@</div><div class='ctx'> 			.ramp_delay		= _delay,		\</div><div class='ctx'> 			.linear_ranges		= _lr,			\</div><div class='ctx'> 			.n_linear_ranges	= ARRAY_SIZE(_lr),	\</div><div class='add'>+			.curr_table = lp87565_buck_uA,			\</div><div class='add'>+			.n_current_limits = ARRAY_SIZE(lp87565_buck_uA),\</div><div class='add'>+			.csel_reg = (_cr),				\</div><div class='add'>+			.csel_mask = LP87565_BUCK_CTRL_2_ILIM,		\</div><div class='ctx'> 		},							\</div><div class='ctx'> 		.ctrl2_reg = _cr,					\</div><div class='ctx'> 	}</div><div class='hunk'>@@ -102,44 +106,7 @@ static int lp87565_buck_set_ramp_delay(struct regulator_dev *rdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lp87565_buck_set_current_limit(struct regulator_dev *rdev,</div><div class='del'>-					  int min_uA, int max_uA)</div><div class='del'>-{</div><div class='del'>-	int id = rdev_get_id(rdev);</div><div class='del'>-	struct lp87565 *lp87565 = rdev_get_drvdata(rdev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = ARRAY_SIZE(lp87565_buck_uA) - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (lp87565_buck_uA[i] &gt;= min_uA &amp;&amp;</div><div class='del'>-		    lp87565_buck_uA[i] &lt;= max_uA)</div><div class='del'>-			return regmap_update_bits(lp87565-&gt;regmap,</div><div class='del'>-						  regulators[id].ctrl2_reg,</div><div class='del'>-						  LP87565_BUCK_CTRL_2_ILIM,</div><div class='del'>-						  i &lt;&lt; __ffs(LP87565_BUCK_CTRL_2_ILIM));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lp87565_buck_get_current_limit(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	int id = rdev_get_id(rdev);</div><div class='del'>-	struct lp87565 *lp87565 = rdev_get_drvdata(rdev);</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(lp87565-&gt;regmap, regulators[id].ctrl2_reg, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	val = (val &amp; LP87565_BUCK_CTRL_2_ILIM) &gt;&gt;</div><div class='del'>-	       __ffs(LP87565_BUCK_CTRL_2_ILIM);</div><div class='del'>-</div><div class='del'>-	return (val &lt; ARRAY_SIZE(lp87565_buck_uA)) ?</div><div class='del'>-			lp87565_buck_uA[val] : -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Operations permitted on BUCK0, BUCK1 */</div><div class='add'>+/* Operations permitted on BUCKs */</div><div class='ctx'> static const struct regulator_ops lp87565_buck_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= regulator_enable_regmap,</div><div class='hunk'>@@ -150,8 +117,8 @@ static const struct regulator_ops lp87565_buck_ops = {</div><div class='ctx'> 	.map_voltage		= regulator_map_voltage_linear_range,</div><div class='ctx'> 	.set_voltage_time_sel	= regulator_set_voltage_time_sel,</div><div class='ctx'> 	.set_ramp_delay		= lp87565_buck_set_ramp_delay,</div><div class='del'>-	.set_current_limit	= lp87565_buck_set_current_limit,</div><div class='del'>-	.get_current_limit	= lp87565_buck_get_current_limit,</div><div class='add'>+	.set_current_limit	= regulator_set_current_limit_regmap,</div><div class='add'>+	.get_current_limit	= regulator_get_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct lp87565_regulator regulators[] = {</div><div class='hunk'>@@ -193,7 +160,7 @@ static int lp87565_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct lp87565 *lp87565 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='del'>-	int i, min_idx = LP87565_BUCK_1, max_idx = LP87565_BUCK_3;</div><div class='add'>+	int i, min_idx = LP87565_BUCK_0, max_idx = LP87565_BUCK_3;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, lp87565);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/ltc3589.c b/drivers/regulator/ltc3589.c<br/>index 63f724f260ef..9a037fdc5fc5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ltc3589.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ltc3589.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ltc3589.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/ltc3589.c</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='del'>-/*</div><div class='del'>- * Linear Technology LTC3589,LTC3589-1 regulator support</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Philipp Zabel &lt;p.zabel@pengutronix.de&gt;, Pengutronix</div><div class='del'>- *</div><div class='del'>- * See file CREDITS for list of people who contributed to this</div><div class='del'>- * project.</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</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'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Linear Technology LTC3589,LTC3589-1 regulator support</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2014 Philipp Zabel &lt;p.zabel@pengutronix.de&gt;, Pengutronix</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/i2c.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='hunk'>@@ -84,19 +72,11 @@ enum ltc3589_reg {</div><div class='ctx'> 	LTC3589_NUM_REGULATORS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ltc3589_regulator {</div><div class='del'>-	struct regulator_desc desc;</div><div class='del'>-</div><div class='del'>-	/* External feedback voltage divider */</div><div class='del'>-	unsigned int r1;</div><div class='del'>-	unsigned int r2;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct ltc3589 {</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	enum ltc3589_variant variant;</div><div class='del'>-	struct ltc3589_regulator regulator_descs[LTC3589_NUM_REGULATORS];</div><div class='add'>+	struct regulator_desc regulator_descs[LTC3589_NUM_REGULATORS];</div><div class='ctx'> 	struct regulator_dev *regulators[LTC3589_NUM_REGULATORS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -196,131 +176,90 @@ static const struct regulator_ops ltc3589_table_regulator_ops = {</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline unsigned int ltc3589_scale(unsigned int uV, u32 r1, u32 r2)</div><div class='add'>+{</div><div class='add'>+	uint64_t tmp;</div><div class='ctx'> </div><div class='del'>-#define LTC3589_REG(_name, _ops, en_bit, dtv1_reg, dtv_mask, go_bit)	\</div><div class='del'>-	[LTC3589_ ## _name] = {						\</div><div class='del'>-		.desc = {						\</div><div class='del'>-			.name = #_name,					\</div><div class='del'>-			.n_voltages = (dtv_mask) + 1,			\</div><div class='del'>-			.min_uV = (go_bit) ? 362500 : 0,		\</div><div class='del'>-			.uV_step = (go_bit) ? 12500 : 0,		\</div><div class='del'>-			.ramp_delay = (go_bit) ? 1750 : 0,		\</div><div class='del'>-			.fixed_uV = (dtv_mask) ? 0 : 800000,		\</div><div class='del'>-			.ops = &amp;ltc3589_ ## _ops ## _regulator_ops,	\</div><div class='del'>-			.type = REGULATOR_VOLTAGE,			\</div><div class='del'>-			.id = LTC3589_ ## _name,			\</div><div class='del'>-			.owner = THIS_MODULE,				\</div><div class='del'>-			.vsel_reg = (dtv1_reg),			\</div><div class='del'>-			.vsel_mask = (dtv_mask),			\</div><div class='del'>-			.apply_reg = (go_bit) ? LTC3589_VCCR : 0,	\</div><div class='del'>-			.apply_bit = (go_bit),				\</div><div class='del'>-			.enable_reg = (en_bit) ? LTC3589_OVEN : 0,	\</div><div class='del'>-			.enable_mask = (en_bit),			\</div><div class='del'>-		},							\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define LTC3589_LINEAR_REG(_name, _dtv1)				\</div><div class='del'>-	LTC3589_REG(_name, linear, LTC3589_OVEN_ ## _name,		\</div><div class='del'>-		    LTC3589_ ## _dtv1, 0x1f,				\</div><div class='del'>-		    LTC3589_VCCR_ ## _name ## _GO)</div><div class='del'>-</div><div class='del'>-#define LTC3589_FIXED_REG(_name) \</div><div class='del'>-	LTC3589_REG(_name, fixed, LTC3589_OVEN_ ## _name, 0, 0, 0)</div><div class='del'>-</div><div class='del'>-static struct ltc3589_regulator ltc3589_regulators[LTC3589_NUM_REGULATORS] = {</div><div class='del'>-	LTC3589_LINEAR_REG(SW1, B1DTV1),</div><div class='del'>-	LTC3589_LINEAR_REG(SW2, B2DTV1),</div><div class='del'>-	LTC3589_LINEAR_REG(SW3, B3DTV1),</div><div class='del'>-	LTC3589_FIXED_REG(BB_OUT),</div><div class='del'>-	LTC3589_REG(LDO1, fixed_standby, 0, 0, 0, 0),</div><div class='del'>-	LTC3589_LINEAR_REG(LDO2, L2DTV1),</div><div class='del'>-	LTC3589_FIXED_REG(LDO3),</div><div class='del'>-	LTC3589_REG(LDO4, table, LTC3589_OVEN_LDO4, LTC3589_L2DTV2, 0x60, 0),</div><div class='del'>-};</div><div class='add'>+	if (uV == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static struct of_regulator_match ltc3589_matches[LTC3589_NUM_REGULATORS] = {</div><div class='del'>-	{ .name = "sw1",    },</div><div class='del'>-	{ .name = "sw2",    },</div><div class='del'>-	{ .name = "sw3",    },</div><div class='del'>-	{ .name = "bb-out", },</div><div class='del'>-	{ .name = "ldo1",   }, /* standby */</div><div class='del'>-	{ .name = "ldo2",   },</div><div class='del'>-	{ .name = "ldo3",   },</div><div class='del'>-	{ .name = "ldo4",   },</div><div class='del'>-};</div><div class='add'>+	tmp = (uint64_t)uV * r1;</div><div class='add'>+	do_div(tmp, r2);</div><div class='add'>+	return uV + (unsigned int)tmp;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int ltc3589_parse_regulators_dt(struct ltc3589 *ltc3589)</div><div class='add'>+static int ltc3589_of_parse_cb(struct device_node *np,</div><div class='add'>+			       const struct regulator_desc *desc,</div><div class='add'>+			       struct regulator_config *config)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = ltc3589-&gt;dev;</div><div class='del'>-	struct device_node *node;</div><div class='del'>-	int i, ret;</div><div class='add'>+	struct ltc3589 *ltc3589 = config-&gt;driver_data;</div><div class='add'>+	struct regulator_desc *rdesc = &amp;ltc3589-&gt;regulator_descs[desc-&gt;id];</div><div class='add'>+	u32 r[2];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	node = of_get_child_by_name(dev-&gt;of_node, "regulators");</div><div class='del'>-	if (!node) {</div><div class='del'>-		dev_err(dev, "regulators node not found\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	/* Parse feedback voltage dividers. LDO3 and LDO4 don't have them */</div><div class='add'>+	if (desc-&gt;id &gt;= LTC3589_LDO3)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = of_regulator_match(dev, node, ltc3589_matches,</div><div class='del'>-				 ARRAY_SIZE(ltc3589_matches));</div><div class='del'>-	of_node_put(node);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "Error parsing regulator init data: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	if (ret != LTC3589_NUM_REGULATORS) {</div><div class='del'>-		dev_err(dev, "Only %d regulators described in device tree\n",</div><div class='add'>+	ret = of_property_read_u32_array(np, "lltc,fb-voltage-divider", r, 2);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ltc3589-&gt;dev, "Failed to parse voltage divider: %d\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Parse feedback voltage dividers. LDO3 and LDO4 don't have them */</div><div class='del'>-	for (i = 0; i &lt; LTC3589_LDO3; i++) {</div><div class='del'>-		struct ltc3589_regulator *desc = &amp;ltc3589-&gt;regulator_descs[i];</div><div class='del'>-		struct device_node *np = ltc3589_matches[i].of_node;</div><div class='del'>-		u32 vdiv[2];</div><div class='del'>-</div><div class='del'>-		ret = of_property_read_u32_array(np, "lltc,fb-voltage-divider",</div><div class='del'>-						 vdiv, 2);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev, "Failed to parse voltage divider: %d\n",</div><div class='del'>-				ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+	if (!r[0] || !r[1])</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		desc-&gt;r1 = vdiv[0];</div><div class='del'>-		desc-&gt;r2 = vdiv[1];</div><div class='del'>-	}</div><div class='add'>+	rdesc-&gt;min_uV = ltc3589_scale(desc-&gt;min_uV, r[0], r[1]);</div><div class='add'>+	rdesc-&gt;uV_step = ltc3589_scale(desc-&gt;uV_step, r[0], r[1]);</div><div class='add'>+	rdesc-&gt;fixed_uV = ltc3589_scale(desc-&gt;fixed_uV, r[0], r[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct regulator_init_data *match_init_data(int index)</div><div class='del'>-{</div><div class='del'>-	return ltc3589_matches[index].init_data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct device_node *match_of_node(int index)</div><div class='del'>-{</div><div class='del'>-	return ltc3589_matches[index].of_node;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int ltc3589_parse_regulators_dt(struct ltc3589 *ltc3589)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#define LTC3589_REG(_name, _of_name, _ops, en_bit, dtv1_reg, dtv_mask, go_bit)\</div><div class='add'>+	[LTC3589_ ## _name] = {						\</div><div class='add'>+		.name = #_name,						\</div><div class='add'>+		.of_match = of_match_ptr(#_of_name),			\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),		\</div><div class='add'>+		.of_parse_cb = ltc3589_of_parse_cb,			\</div><div class='add'>+		.n_voltages = (dtv_mask) + 1,				\</div><div class='add'>+		.min_uV = (go_bit) ? 362500 : 0,			\</div><div class='add'>+		.uV_step = (go_bit) ? 12500 : 0,			\</div><div class='add'>+		.ramp_delay = (go_bit) ? 1750 : 0,			\</div><div class='add'>+		.fixed_uV = (dtv_mask) ? 0 : 800000,			\</div><div class='add'>+		.ops = &amp;ltc3589_ ## _ops ## _regulator_ops,		\</div><div class='add'>+		.type = REGULATOR_VOLTAGE,				\</div><div class='add'>+		.id = LTC3589_ ## _name,				\</div><div class='add'>+		.owner = THIS_MODULE,					\</div><div class='add'>+		.vsel_reg = (dtv1_reg),					\</div><div class='add'>+		.vsel_mask = (dtv_mask),				\</div><div class='add'>+		.apply_reg = (go_bit) ? LTC3589_VCCR : 0,		\</div><div class='add'>+		.apply_bit = (go_bit),					\</div><div class='add'>+		.enable_reg = (en_bit) ? LTC3589_OVEN : 0,		\</div><div class='add'>+		.enable_mask = (en_bit),				\</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static inline struct regulator_init_data *match_init_data(int index)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+#define LTC3589_LINEAR_REG(_name, _of_name, _dtv1)			\</div><div class='add'>+	LTC3589_REG(_name, _of_name, linear, LTC3589_OVEN_ ## _name,	\</div><div class='add'>+		    LTC3589_ ## _dtv1, 0x1f,				\</div><div class='add'>+		    LTC3589_VCCR_ ## _name ## _GO)</div><div class='ctx'> </div><div class='del'>-static inline struct device_node *match_of_node(int index)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+#define LTC3589_FIXED_REG(_name, _of_name)				\</div><div class='add'>+	LTC3589_REG(_name, _of_name, fixed, LTC3589_OVEN_ ## _name, 0, 0, 0)</div><div class='add'>+</div><div class='add'>+static const struct regulator_desc ltc3589_regulators[] = {</div><div class='add'>+	LTC3589_LINEAR_REG(SW1, sw1, B1DTV1),</div><div class='add'>+	LTC3589_LINEAR_REG(SW2, sw2, B2DTV1),</div><div class='add'>+	LTC3589_LINEAR_REG(SW3, sw3, B3DTV1),</div><div class='add'>+	LTC3589_FIXED_REG(BB_OUT, bb-out),</div><div class='add'>+	LTC3589_REG(LDO1, ldo1, fixed_standby, 0, 0, 0, 0),</div><div class='add'>+	LTC3589_LINEAR_REG(LDO2, ldo2, L2DTV1),</div><div class='add'>+	LTC3589_FIXED_REG(LDO3, ldo3),</div><div class='add'>+	LTC3589_REG(LDO4, ldo4, table, LTC3589_OVEN_LDO4, LTC3589_L2DTV2,</div><div class='add'>+		    0x60, 0),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static bool ltc3589_writeable_reg(struct device *dev, unsigned int reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -409,7 +348,6 @@ static const struct regmap_config ltc3589_regmap_config = {</div><div class='ctx'> 	.cache_type = REGCACHE_RBTREE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static irqreturn_t ltc3589_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ltc3589 *ltc3589 = dev_id;</div><div class='hunk'>@@ -419,16 +357,22 @@ static irqreturn_t ltc3589_isr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	if (irqstat &amp; LTC3589_IRQSTAT_THERMAL_WARN) {</div><div class='ctx'> 		event = REGULATOR_EVENT_OVER_TEMP;</div><div class='del'>-		for (i = 0; i &lt; LTC3589_NUM_REGULATORS; i++)</div><div class='add'>+		for (i = 0; i &lt; LTC3589_NUM_REGULATORS; i++) {</div><div class='add'>+		        regulator_lock(ltc3589-&gt;regulators[i]);</div><div class='ctx'> 			regulator_notifier_call_chain(ltc3589-&gt;regulators[i],</div><div class='ctx'> 						      event, NULL);</div><div class='add'>+		        regulator_unlock(ltc3589-&gt;regulators[i]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (irqstat &amp; LTC3589_IRQSTAT_UNDERVOLT_WARN) {</div><div class='ctx'> 		event = REGULATOR_EVENT_UNDER_VOLTAGE;</div><div class='del'>-		for (i = 0; i &lt; LTC3589_NUM_REGULATORS; i++)</div><div class='add'>+		for (i = 0; i &lt; LTC3589_NUM_REGULATORS; i++) {</div><div class='add'>+		        regulator_lock(ltc3589-&gt;regulators[i]);</div><div class='ctx'> 			regulator_notifier_call_chain(ltc3589-&gt;regulators[i],</div><div class='ctx'> 						      event, NULL);</div><div class='add'>+		        regulator_unlock(ltc3589-&gt;regulators[i]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear warning condition */</div><div class='hunk'>@@ -437,33 +381,11 @@ static irqreturn_t ltc3589_isr(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 inline unsigned int ltc3589_scale(unsigned int uV, u32 r1, u32 r2)</div><div class='del'>-{</div><div class='del'>-	uint64_t tmp;</div><div class='del'>-	if (uV == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	tmp = (uint64_t)uV * r1;</div><div class='del'>-	do_div(tmp, r2);</div><div class='del'>-	return uV + (unsigned int)tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ltc3589_apply_fb_voltage_divider(struct ltc3589_regulator *rdesc)</div><div class='del'>-{</div><div class='del'>-	struct regulator_desc *desc = &amp;rdesc-&gt;desc;</div><div class='del'>-</div><div class='del'>-	if (!rdesc-&gt;r1 || !rdesc-&gt;r2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	desc-&gt;min_uV = ltc3589_scale(desc-&gt;min_uV, rdesc-&gt;r1, rdesc-&gt;r2);</div><div class='del'>-	desc-&gt;uV_step = ltc3589_scale(desc-&gt;uV_step, rdesc-&gt;r1, rdesc-&gt;r2);</div><div class='del'>-	desc-&gt;fixed_uV = ltc3589_scale(desc-&gt;fixed_uV, rdesc-&gt;r1, rdesc-&gt;r2);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ltc3589_probe(struct i2c_client *client,</div><div class='ctx'> 			 const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;client-&gt;dev;</div><div class='del'>-	struct ltc3589_regulator *descs;</div><div class='add'>+	struct regulator_desc *descs;</div><div class='ctx'> 	struct ltc3589 *ltc3589;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -482,11 +404,11 @@ static int ltc3589_probe(struct i2c_client *client,</div><div class='ctx'> 	descs = ltc3589-&gt;regulator_descs;</div><div class='ctx'> 	memcpy(descs, ltc3589_regulators, sizeof(ltc3589_regulators));</div><div class='ctx'> 	if (ltc3589-&gt;variant == LTC3589) {</div><div class='del'>-		descs[LTC3589_LDO3].desc.fixed_uV = 1800000;</div><div class='del'>-		descs[LTC3589_LDO4].desc.volt_table = ltc3589_ldo4;</div><div class='add'>+		descs[LTC3589_LDO3].fixed_uV = 1800000;</div><div class='add'>+		descs[LTC3589_LDO4].volt_table = ltc3589_ldo4;</div><div class='ctx'> 	} else {</div><div class='del'>-		descs[LTC3589_LDO3].desc.fixed_uV = 2800000;</div><div class='del'>-		descs[LTC3589_LDO4].desc.volt_table = ltc3589_12_ldo4;</div><div class='add'>+		descs[LTC3589_LDO3].fixed_uV = 2800000;</div><div class='add'>+		descs[LTC3589_LDO4].volt_table = ltc3589_12_ldo4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ltc3589-&gt;regmap = devm_regmap_init_i2c(client, &amp;ltc3589_regmap_config);</div><div class='hunk'>@@ -496,25 +418,12 @@ static int ltc3589_probe(struct i2c_client *client,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ltc3589_parse_regulators_dt(ltc3589);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; LTC3589_NUM_REGULATORS; i++) {</div><div class='del'>-		struct ltc3589_regulator *rdesc = &amp;ltc3589-&gt;regulator_descs[i];</div><div class='del'>-		struct regulator_desc *desc = &amp;rdesc-&gt;desc;</div><div class='del'>-		struct regulator_init_data *init_data;</div><div class='add'>+		struct regulator_desc *desc = &amp;ltc3589-&gt;regulator_descs[i];</div><div class='ctx'> 		struct regulator_config config = { };</div><div class='ctx'> </div><div class='del'>-		init_data = match_init_data(i);</div><div class='del'>-</div><div class='del'>-		if (i &lt; LTC3589_LDO3)</div><div class='del'>-			ltc3589_apply_fb_voltage_divider(rdesc);</div><div class='del'>-</div><div class='ctx'> 		config.dev = dev;</div><div class='del'>-		config.init_data = init_data;</div><div class='ctx'> 		config.driver_data = ltc3589;</div><div class='del'>-		config.of_node = match_of_node(i);</div><div class='ctx'> </div><div class='ctx'> 		ltc3589-&gt;regulators[i] = devm_regulator_register(dev, desc,</div><div class='ctx'> 								 &amp;config);</div><div class='head'>diff --git a/drivers/regulator/ltc3676.c b/drivers/regulator/ltc3676.c<br/>index e6d66e492b85..4be90c78c720 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ltc3676.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/ltc3676.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/ltc3676.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/ltc3676.c</a></div><div class='hunk'>@@ -285,17 +285,23 @@ static irqreturn_t ltc3676_isr(int irq, void *dev_id)</div><div class='ctx'> 	if (irqstat &amp; LTC3676_IRQSTAT_THERMAL_WARN) {</div><div class='ctx'> 		dev_warn(dev, "Over-temperature Warning\n");</div><div class='ctx'> 		event = REGULATOR_EVENT_OVER_TEMP;</div><div class='del'>-		for (i = 0; i &lt; LTC3676_NUM_REGULATORS; i++)</div><div class='add'>+		for (i = 0; i &lt; LTC3676_NUM_REGULATORS; i++) {</div><div class='add'>+			regulator_lock(ltc3676-&gt;regulators[i]);</div><div class='ctx'> 			regulator_notifier_call_chain(ltc3676-&gt;regulators[i],</div><div class='ctx'> 						      event, NULL);</div><div class='add'>+			regulator_unlock(ltc3676-&gt;regulators[i]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (irqstat &amp; LTC3676_IRQSTAT_UNDERVOLT_WARN) {</div><div class='ctx'> 		dev_info(dev, "Undervoltage Warning\n");</div><div class='ctx'> 		event = REGULATOR_EVENT_UNDER_VOLTAGE;</div><div class='del'>-		for (i = 0; i &lt; LTC3676_NUM_REGULATORS; i++)</div><div class='add'>+		for (i = 0; i &lt; LTC3676_NUM_REGULATORS; i++) {</div><div class='add'>+			regulator_lock(ltc3676-&gt;regulators[i]);</div><div class='ctx'> 			regulator_notifier_call_chain(ltc3676-&gt;regulators[i],</div><div class='ctx'> 						      event, NULL);</div><div class='add'>+			regulator_unlock(ltc3676-&gt;regulators[i]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear warning condition */</div><div class='head'>diff --git a/drivers/regulator/max14577-regulator.c b/drivers/regulator/max14577-regulator.c<br/>index 85a88a9e4d42..07a150c9bbf2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max14577-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max14577-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max14577-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/max14577-regulator.c</a></div><div class='hunk'>@@ -155,58 +155,6 @@ static const struct regulator_desc max77836_supported_regulators[] = {</div><div class='ctx'> 	[MAX77836_LDO2] = MAX77836_LDO_REG(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static struct of_regulator_match max14577_regulator_matches[] = {</div><div class='del'>-	{ .name	= "SAFEOUT", },</div><div class='del'>-	{ .name = "CHARGER", },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct of_regulator_match max77836_regulator_matches[] = {</div><div class='del'>-	{ .name	= "SAFEOUT", },</div><div class='del'>-	{ .name = "CHARGER", },</div><div class='del'>-	{ .name = "LDO1", },</div><div class='del'>-	{ .name = "LDO2", },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct regulator_init_data *match_init_data(int index,</div><div class='del'>-		enum maxim_device_type dev_type)</div><div class='del'>-{</div><div class='del'>-	switch (dev_type) {</div><div class='del'>-	case MAXIM_DEVICE_TYPE_MAX77836:</div><div class='del'>-		return max77836_regulator_matches[index].init_data;</div><div class='del'>-</div><div class='del'>-	case MAXIM_DEVICE_TYPE_MAX14577:</div><div class='del'>-	default:</div><div class='del'>-		return max14577_regulator_matches[index].init_data;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct device_node *match_of_node(int index,</div><div class='del'>-		enum maxim_device_type dev_type)</div><div class='del'>-{</div><div class='del'>-	switch (dev_type) {</div><div class='del'>-	case MAXIM_DEVICE_TYPE_MAX77836:</div><div class='del'>-		return max77836_regulator_matches[index].of_node;</div><div class='del'>-</div><div class='del'>-	case MAXIM_DEVICE_TYPE_MAX14577:</div><div class='del'>-	default:</div><div class='del'>-		return max14577_regulator_matches[index].of_node;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else /* CONFIG_OF */</div><div class='del'>-static inline struct regulator_init_data *match_init_data(int index,</div><div class='del'>-		enum maxim_device_type dev_type)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct device_node *match_of_node(int index,</div><div class='del'>-		enum maxim_device_type dev_type)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_OF */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * Registers for regulators of max77836 use different I2C slave addresses so</div><div class='ctx'>  * different regmaps must be used for them.</div><div class='hunk'>@@ -265,9 +213,6 @@ static int max14577_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		if (pdata &amp;&amp; pdata-&gt;regulators) {</div><div class='ctx'> 			config.init_data = pdata-&gt;regulators[i].initdata;</div><div class='ctx'> 			config.of_node = pdata-&gt;regulators[i].of_node;</div><div class='del'>-		} else {</div><div class='del'>-			config.init_data = match_init_data(i, dev_type);</div><div class='del'>-			config.of_node = match_of_node(i, dev_type);</div><div class='ctx'> 		}</div><div class='ctx'> 		config.regmap = max14577_get_regmap(max14577,</div><div class='ctx'> 				supported_regulators[i].id);</div><div class='head'>diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c<br/>index 1607ac673e44..0ad91a7f9cb9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max77620-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max77620-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max77620-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/max77620-regulator.c</a></div><div class='hunk'>@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		rdesc = &amp;rinfo[id].desc;</div><div class='del'>-		pmic-&gt;rinfo[id] = &amp;max77620_regs_info[id];</div><div class='add'>+		pmic-&gt;rinfo[id] = &amp;rinfo[id];</div><div class='ctx'> 		pmic-&gt;enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;</div><div class='ctx'> 		pmic-&gt;reg_pdata[id].active_fps_src = -1;</div><div class='ctx'> 		pmic-&gt;reg_pdata[id].active_fps_pd_slot = -1;</div><div class='head'>diff --git a/drivers/regulator/max77650-regulator.c b/drivers/regulator/max77650-regulator.c<br/>index 31ebf34b01ec..5c4f86c98510 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max77650-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max77650-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max77650-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/max77650-regulator.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ struct max77650_regulator_desc {</div><div class='ctx'> 	unsigned int regB;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 max77651_sbb1_regulator_volt_table[] = {</div><div class='add'>+static const unsigned int max77651_sbb1_regulator_volt_table[] = {</div><div class='ctx'> 	2400000, 3200000, 4000000, 4800000,</div><div class='ctx'> 	2450000, 3250000, 4050000, 4850000,</div><div class='ctx'> 	2500000, 3300000, 4100000, 4900000,</div><div class='head'>diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c<br/>index 39b63ddefeb2..aed6727982cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max8925-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max8925-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max8925-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/max8925-regulator.c</a></div><div class='hunk'>@@ -159,6 +159,8 @@ static const struct regulator_ops max8925_regulator_ldo_ops = {</div><div class='ctx'> {								\</div><div class='ctx'> 	.desc	= {						\</div><div class='ctx'> 		.name	= "SDV" #_id,				\</div><div class='add'>+		.of_match = of_match_ptr("SDV" #_id),		\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 		.ops	= &amp;max8925_regulator_sdv_ops,		\</div><div class='ctx'> 		.type	= REGULATOR_VOLTAGE,			\</div><div class='ctx'> 		.id	= MAX8925_ID_SD##_id,			\</div><div class='hunk'>@@ -175,6 +177,8 @@ static const struct regulator_ops max8925_regulator_ldo_ops = {</div><div class='ctx'> {								\</div><div class='ctx'> 	.desc	= {						\</div><div class='ctx'> 		.name	= "LDO" #_id,				\</div><div class='add'>+		.of_match = of_match_ptr("LDO" #_id),		\</div><div class='add'>+		.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 		.ops	= &amp;max8925_regulator_ldo_ops,		\</div><div class='ctx'> 		.type	= REGULATOR_VOLTAGE,			\</div><div class='ctx'> 		.id	= MAX8925_ID_LDO##_id,			\</div><div class='hunk'>@@ -187,34 +191,6 @@ static const struct regulator_ops max8925_regulator_ldo_ops = {</div><div class='ctx'> 	.enable_reg	= MAX8925_LDOCTL##_id,			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static struct of_regulator_match max8925_regulator_matches[] = {</div><div class='del'>-	{ .name	= "SDV1",},</div><div class='del'>-	{ .name = "SDV2",},</div><div class='del'>-	{ .name = "SDV3",},</div><div class='del'>-	{ .name = "LDO1",},</div><div class='del'>-	{ .name = "LDO2",},</div><div class='del'>-	{ .name = "LDO3",},</div><div class='del'>-	{ .name = "LDO4",},</div><div class='del'>-	{ .name = "LDO5",},</div><div class='del'>-	{ .name = "LDO6",},</div><div class='del'>-	{ .name = "LDO7",},</div><div class='del'>-	{ .name = "LDO8",},</div><div class='del'>-	{ .name = "LDO9",},</div><div class='del'>-	{ .name = "LDO10",},</div><div class='del'>-	{ .name = "LDO11",},</div><div class='del'>-	{ .name = "LDO12",},</div><div class='del'>-	{ .name = "LDO13",},</div><div class='del'>-	{ .name = "LDO14",},</div><div class='del'>-	{ .name = "LDO15",},</div><div class='del'>-	{ .name = "LDO16",},</div><div class='del'>-	{ .name = "LDO17",},</div><div class='del'>-	{ .name = "LDO18",},</div><div class='del'>-	{ .name = "LDO19",},</div><div class='del'>-	{ .name = "LDO20",},</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct max8925_regulator_info max8925_regulator_info[] = {</div><div class='ctx'> 	MAX8925_SDV(1, 637.5, 1425, 12.5),</div><div class='ctx'> 	MAX8925_SDV(2,   650, 2225,   25),</div><div class='hunk'>@@ -242,37 +218,6 @@ static struct max8925_regulator_info max8925_regulator_info[] = {</div><div class='ctx'> 	MAX8925_LDO(20, 750, 3900, 50),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-static int max8925_regulator_dt_init(struct platform_device *pdev,</div><div class='del'>-				    struct regulator_config *config,</div><div class='del'>-				    int ridx)</div><div class='del'>-{</div><div class='del'>-	struct device_node *nproot, *np;</div><div class='del'>-	int rcount;</div><div class='del'>-</div><div class='del'>-	nproot = pdev-&gt;dev.parent-&gt;of_node;</div><div class='del'>-	if (!nproot)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	np = of_get_child_by_name(nproot, "regulators");</div><div class='del'>-	if (!np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to find regulators node\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcount = of_regulator_match(&amp;pdev-&gt;dev, np,</div><div class='del'>-				&amp;max8925_regulator_matches[ridx], 1);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	if (rcount &lt; 0)</div><div class='del'>-		return rcount;</div><div class='del'>-	config-&gt;init_data =	max8925_regulator_matches[ridx].init_data;</div><div class='del'>-	config-&gt;of_node = max8925_regulator_matches[ridx].of_node;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define max8925_regulator_dt_init(x, y, z)	(-1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int max8925_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8925_chip *chip = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='hunk'>@@ -281,7 +226,7 @@ static int max8925_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct max8925_regulator_info *ri;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='del'>-	int i, regulator_idx;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_REG, 0);</div><div class='ctx'> 	if (!res) {</div><div class='hunk'>@@ -290,10 +235,8 @@ static int max8925_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(max8925_regulator_info); i++) {</div><div class='ctx'> 		ri = &amp;max8925_regulator_info[i];</div><div class='del'>-		if (ri-&gt;vol_reg == res-&gt;start) {</div><div class='del'>-			regulator_idx = i;</div><div class='add'>+		if (ri-&gt;vol_reg == res-&gt;start)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == ARRAY_SIZE(max8925_regulator_info)) {</div><div class='hunk'>@@ -303,12 +246,11 @@ static int max8925_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	ri-&gt;i2c = chip-&gt;i2c;</div><div class='ctx'> </div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	config.dev = chip-&gt;dev;</div><div class='ctx'> 	config.driver_data = ri;</div><div class='ctx'> </div><div class='del'>-	if (max8925_regulator_dt_init(pdev, &amp;config, regulator_idx))</div><div class='del'>-		if (pdata)</div><div class='del'>-			config.init_data = pdata;</div><div class='add'>+	if (pdata)</div><div class='add'>+		config.init_data = pdata;</div><div class='ctx'> </div><div class='ctx'> 	rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;ri-&gt;desc, &amp;config);</div><div class='ctx'> 	if (IS_ERR(rdev)) {</div><div class='head'>diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c<br/>index 271bb736f3f5..60599c3bb845 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max8998.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/max8998.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/max8998.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/max8998.c</a></div><div class='hunk'>@@ -33,72 +33,6 @@ struct max8998_data {</div><div class='ctx'> 	unsigned int		buck2_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct voltage_map_desc {</div><div class='del'>-	int min;</div><div class='del'>-	int max;</div><div class='del'>-	int step;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Voltage maps in uV*/</div><div class='del'>-static const struct voltage_map_desc ldo23_voltage_map_desc = {</div><div class='del'>-	.min = 800000,	.step = 50000,	.max = 1300000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo456711_voltage_map_desc = {</div><div class='del'>-	.min = 1600000,	.step = 100000,	.max = 3600000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo8_voltage_map_desc = {</div><div class='del'>-	.min = 3000000,	.step = 100000,	.max = 3600000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo9_voltage_map_desc = {</div><div class='del'>-	.min = 2800000,	.step = 100000,	.max = 3100000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo10_voltage_map_desc = {</div><div class='del'>-	.min = 950000,	.step = 50000,	.max = 1300000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo1213_voltage_map_desc = {</div><div class='del'>-	.min = 800000,	.step = 100000,	.max = 3300000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo1415_voltage_map_desc = {</div><div class='del'>-	.min = 1200000,	.step = 100000,	.max = 3300000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc ldo1617_voltage_map_desc = {</div><div class='del'>-	.min = 1600000,	.step = 100000,	.max = 3600000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc buck12_voltage_map_desc = {</div><div class='del'>-	.min = 750000,	.step = 25000,	.max = 1525000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc buck3_voltage_map_desc = {</div><div class='del'>-	.min = 1600000,	.step = 100000,	.max = 3600000,</div><div class='del'>-};</div><div class='del'>-static const struct voltage_map_desc buck4_voltage_map_desc = {</div><div class='del'>-	.min = 800000,	.step = 100000,	.max = 2300000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct voltage_map_desc *ldo_voltage_map[] = {</div><div class='del'>-	NULL,</div><div class='del'>-	NULL,</div><div class='del'>-	&amp;ldo23_voltage_map_desc,	/* LDO2 */</div><div class='del'>-	&amp;ldo23_voltage_map_desc,	/* LDO3 */</div><div class='del'>-	&amp;ldo456711_voltage_map_desc,	/* LDO4 */</div><div class='del'>-	&amp;ldo456711_voltage_map_desc,	/* LDO5 */</div><div class='del'>-	&amp;ldo456711_voltage_map_desc,	/* LDO6 */</div><div class='del'>-	&amp;ldo456711_voltage_map_desc,	/* LDO7 */</div><div class='del'>-	&amp;ldo8_voltage_map_desc,		/* LDO8 */</div><div class='del'>-	&amp;ldo9_voltage_map_desc,		/* LDO9 */</div><div class='del'>-	&amp;ldo10_voltage_map_desc,	/* LDO10 */</div><div class='del'>-	&amp;ldo456711_voltage_map_desc,	/* LDO11 */</div><div class='del'>-	&amp;ldo1213_voltage_map_desc,	/* LDO12 */</div><div class='del'>-	&amp;ldo1213_voltage_map_desc,	/* LDO13 */</div><div class='del'>-	&amp;ldo1415_voltage_map_desc,	/* LDO14 */</div><div class='del'>-	&amp;ldo1415_voltage_map_desc,	/* LDO15 */</div><div class='del'>-	&amp;ldo1617_voltage_map_desc,	/* LDO16 */</div><div class='del'>-	&amp;ldo1617_voltage_map_desc,	/* LDO17 */</div><div class='del'>-	&amp;buck12_voltage_map_desc,	/* BUCK1 */</div><div class='del'>-	&amp;buck12_voltage_map_desc,	/* BUCK2 */</div><div class='del'>-	&amp;buck3_voltage_map_desc,	/* BUCK3 */</div><div class='del'>-	&amp;buck4_voltage_map_desc,	/* BUCK4 */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int max8998_get_enable_register(struct regulator_dev *rdev,</div><div class='ctx'> 					int *reg, int *shift)</div><div class='ctx'> {</div><div class='hunk'>@@ -400,7 +334,6 @@ static int max8998_set_voltage_buck_time_sel(struct regulator_dev *rdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct max8998_data *max8998 = rdev_get_drvdata(rdev);</div><div class='ctx'> 	struct i2c_client *i2c = max8998-&gt;iodev-&gt;i2c;</div><div class='del'>-	const struct voltage_map_desc *desc;</div><div class='ctx'> 	int buck = rdev_get_id(rdev);</div><div class='ctx'> 	u8 val = 0;</div><div class='ctx'> 	int difference, ret;</div><div class='hunk'>@@ -408,8 +341,6 @@ static int max8998_set_voltage_buck_time_sel(struct regulator_dev *rdev,</div><div class='ctx'> 	if (buck &lt; MAX8998_BUCK1 || buck &gt; MAX8998_BUCK4)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	desc = ldo_voltage_map[buck];</div><div class='del'>-</div><div class='ctx'> 	/* Voltage stabilization */</div><div class='ctx'> 	ret = max8998_read_reg(i2c, MAX8998_REG_ONOFF4, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -420,14 +351,14 @@ static int max8998_set_voltage_buck_time_sel(struct regulator_dev *rdev,</div><div class='ctx'> 	if (max8998-&gt;iodev-&gt;type == TYPE_MAX8998 &amp;&amp; !(val &amp; MAX8998_ENRAMP))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	difference = (new_selector - old_selector) * desc-&gt;step / 1000;</div><div class='add'>+	difference = (new_selector - old_selector) * rdev-&gt;desc-&gt;uV_step / 1000;</div><div class='ctx'> 	if (difference &gt; 0)</div><div class='ctx'> 		return DIV_ROUND_UP(difference, (val &amp; 0x0f) + 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops max8998_ldo_ops = {</div><div class='add'>+static const struct regulator_ops max8998_ldo_ops = {</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_linear,</div><div class='ctx'> 	.map_voltage		= regulator_map_voltage_linear,</div><div class='ctx'> 	.is_enabled		= max8998_ldo_is_enabled,</div><div class='hunk'>@@ -437,7 +368,7 @@ static struct regulator_ops max8998_ldo_ops = {</div><div class='ctx'> 	.set_voltage_sel	= max8998_set_voltage_ldo_sel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops max8998_buck_ops = {</div><div class='add'>+static const struct regulator_ops max8998_buck_ops = {</div><div class='ctx'> 	.list_voltage		= regulator_list_voltage_linear,</div><div class='ctx'> 	.map_voltage		= regulator_map_voltage_linear,</div><div class='ctx'> 	.is_enabled		= max8998_ldo_is_enabled,</div><div class='hunk'>@@ -448,164 +379,59 @@ static struct regulator_ops max8998_buck_ops = {</div><div class='ctx'> 	.set_voltage_time_sel	= max8998_set_voltage_buck_time_sel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops max8998_others_ops = {</div><div class='add'>+static const struct regulator_ops max8998_others_ops = {</div><div class='ctx'> 	.is_enabled		= max8998_ldo_is_enabled,</div><div class='ctx'> 	.enable			= max8998_ldo_enable,</div><div class='ctx'> 	.disable		= max8998_ldo_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc regulators[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "LDO2",</div><div class='del'>-		.id		= MAX8998_LDO2,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO3",</div><div class='del'>-		.id		= MAX8998_LDO3,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO4",</div><div class='del'>-		.id		= MAX8998_LDO4,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO5",</div><div class='del'>-		.id		= MAX8998_LDO5,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO6",</div><div class='del'>-		.id		= MAX8998_LDO6,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO7",</div><div class='del'>-		.id		= MAX8998_LDO7,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO8",</div><div class='del'>-		.id		= MAX8998_LDO8,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO9",</div><div class='del'>-		.id		= MAX8998_LDO9,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO10",</div><div class='del'>-		.id		= MAX8998_LDO10,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO11",</div><div class='del'>-		.id		= MAX8998_LDO11,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO12",</div><div class='del'>-		.id		= MAX8998_LDO12,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO13",</div><div class='del'>-		.id		= MAX8998_LDO13,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO14",</div><div class='del'>-		.id		= MAX8998_LDO14,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO15",</div><div class='del'>-		.id		= MAX8998_LDO15,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO16",</div><div class='del'>-		.id		= MAX8998_LDO16,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "LDO17",</div><div class='del'>-		.id		= MAX8998_LDO17,</div><div class='del'>-		.ops		= &amp;max8998_ldo_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "BUCK1",</div><div class='del'>-		.id		= MAX8998_BUCK1,</div><div class='del'>-		.ops		= &amp;max8998_buck_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "BUCK2",</div><div class='del'>-		.id		= MAX8998_BUCK2,</div><div class='del'>-		.ops		= &amp;max8998_buck_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "BUCK3",</div><div class='del'>-		.id		= MAX8998_BUCK3,</div><div class='del'>-		.ops		= &amp;max8998_buck_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "BUCK4",</div><div class='del'>-		.id		= MAX8998_BUCK4,</div><div class='del'>-		.ops		= &amp;max8998_buck_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "EN32KHz-AP",</div><div class='del'>-		.id		= MAX8998_EN32KHZ_AP,</div><div class='del'>-		.ops		= &amp;max8998_others_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "EN32KHz-CP",</div><div class='del'>-		.id		= MAX8998_EN32KHZ_CP,</div><div class='del'>-		.ops		= &amp;max8998_others_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "ENVICHG",</div><div class='del'>-		.id		= MAX8998_ENVICHG,</div><div class='del'>-		.ops		= &amp;max8998_others_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "ESAFEOUT1",</div><div class='del'>-		.id		= MAX8998_ESAFEOUT1,</div><div class='del'>-		.ops		= &amp;max8998_others_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "ESAFEOUT2",</div><div class='del'>-		.id		= MAX8998_ESAFEOUT2,</div><div class='del'>-		.ops		= &amp;max8998_others_ops,</div><div class='del'>-		.type		= REGULATOR_VOLTAGE,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='add'>+#define MAX8998_LINEAR_REG(_name, _ops, _min, _step, _max) \</div><div class='add'>+	{ \</div><div class='add'>+		.name = #_name, \</div><div class='add'>+		.id = MAX8998_##_name, \</div><div class='add'>+		.ops = _ops, \</div><div class='add'>+		.min_uV = (_min), \</div><div class='add'>+		.uV_step = (_step), \</div><div class='add'>+		.n_voltages = ((_max) - (_min)) / (_step) + 1, \</div><div class='add'>+		.type = REGULATOR_VOLTAGE, \</div><div class='add'>+		.owner = THIS_MODULE, \</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+#define MAX8998_OTHERS_REG(_name, _id) \</div><div class='add'>+	{ \</div><div class='add'>+		.name = #_name, \</div><div class='add'>+		.id = _id, \</div><div class='add'>+		.ops = &amp;max8998_others_ops, \</div><div class='add'>+		.type = REGULATOR_VOLTAGE, \</div><div class='add'>+		.owner = THIS_MODULE, \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct regulator_desc regulators[] = {</div><div class='add'>+	MAX8998_LINEAR_REG(LDO2, &amp;max8998_ldo_ops, 800000, 50000, 1300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO3, &amp;max8998_ldo_ops, 800000, 50000, 1300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO4, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO5, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO6, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO7, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO8, &amp;max8998_ldo_ops, 3000000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO9, &amp;max8998_ldo_ops, 2800000, 100000, 3100000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO10, &amp;max8998_ldo_ops, 950000, 50000, 1300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO11, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO12, &amp;max8998_ldo_ops, 800000, 100000, 3300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO13, &amp;max8998_ldo_ops, 800000, 100000, 3300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO14, &amp;max8998_ldo_ops, 1200000, 100000, 3300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO15, &amp;max8998_ldo_ops, 1200000, 100000, 3300000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO16, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(LDO17, &amp;max8998_ldo_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(BUCK1, &amp;max8998_buck_ops, 750000, 25000, 1525000),</div><div class='add'>+	MAX8998_LINEAR_REG(BUCK2, &amp;max8998_buck_ops, 750000, 25000, 1525000),</div><div class='add'>+	MAX8998_LINEAR_REG(BUCK3, &amp;max8998_buck_ops, 1600000, 100000, 3600000),</div><div class='add'>+	MAX8998_LINEAR_REG(BUCK4, &amp;max8998_buck_ops, 800000, 100000, 2300000),</div><div class='add'>+	MAX8998_OTHERS_REG(EN32KHz-AP, MAX8998_EN32KHZ_AP),</div><div class='add'>+	MAX8998_OTHERS_REG(EN32KHz-CP, MAX8998_EN32KHZ_CP),</div><div class='add'>+	MAX8998_OTHERS_REG(ENVICHG, MAX8998_ENVICHG),</div><div class='add'>+	MAX8998_OTHERS_REG(ESAFEOUT1, MAX8998_ESAFEOUT1),</div><div class='add'>+	MAX8998_OTHERS_REG(ESAFEOUT2, MAX8998_ESAFEOUT2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int max8998_pmic_dt_parse_dvs_gpio(struct max8998_dev *iodev,</div><div class='hunk'>@@ -796,9 +622,11 @@ static int max8998_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		/* Set predefined values for BUCK1 registers */</div><div class='ctx'> 		for (v = 0; v &lt; ARRAY_SIZE(pdata-&gt;buck1_voltage); ++v) {</div><div class='add'>+			int index = MAX8998_BUCK1 - MAX8998_LDO2;</div><div class='add'>+</div><div class='ctx'> 			i = 0;</div><div class='del'>-			while (buck12_voltage_map_desc.min +</div><div class='del'>-			       buck12_voltage_map_desc.step*i</div><div class='add'>+			while (regulators[index].min_uV +</div><div class='add'>+			       regulators[index].uV_step * i</div><div class='ctx'> 			       &lt; pdata-&gt;buck1_voltage[v])</div><div class='ctx'> 				i++;</div><div class='ctx'> </div><div class='hunk'>@@ -824,9 +652,11 @@ static int max8998_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		/* Set predefined values for BUCK2 registers */</div><div class='ctx'> 		for (v = 0; v &lt; ARRAY_SIZE(pdata-&gt;buck2_voltage); ++v) {</div><div class='add'>+			int index = MAX8998_BUCK2 - MAX8998_LDO2;</div><div class='add'>+</div><div class='ctx'> 			i = 0;</div><div class='del'>-			while (buck12_voltage_map_desc.min +</div><div class='del'>-			       buck12_voltage_map_desc.step*i</div><div class='add'>+			while (regulators[index].min_uV +</div><div class='add'>+			       regulators[index].uV_step * i</div><div class='ctx'> 			       &lt; pdata-&gt;buck2_voltage[v])</div><div class='ctx'> 				i++;</div><div class='ctx'> </div><div class='hunk'>@@ -839,18 +669,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;num_regulators; i++) {</div><div class='del'>-		const struct voltage_map_desc *desc;</div><div class='del'>-		int id = pdata-&gt;regulators[i].id;</div><div class='del'>-		int index = id - MAX8998_LDO2;</div><div class='del'>-</div><div class='del'>-		desc = ldo_voltage_map[id];</div><div class='del'>-		if (desc &amp;&amp; regulators[index].ops != &amp;max8998_others_ops) {</div><div class='del'>-			int count = (desc-&gt;max - desc-&gt;min) / desc-&gt;step + 1;</div><div class='del'>-</div><div class='del'>-			regulators[index].n_voltages = count;</div><div class='del'>-			regulators[index].min_uV = desc-&gt;min;</div><div class='del'>-			regulators[index].uV_step = desc-&gt;step;</div><div class='del'>-		}</div><div class='add'>+		int index = pdata-&gt;regulators[i].id - MAX8998_LDO2;</div><div class='ctx'> </div><div class='ctx'> 		config.dev = max8998-&gt;dev;</div><div class='ctx'> 		config.of_node = pdata-&gt;regulators[i].reg_node;</div><div class='hunk'>@@ -867,7 +686,6 @@ static int max8998_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </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/regulator/mcp16502.c b/drivers/regulator/mcp16502.c<br/>index 3a8004abe044..e5a02711cb46 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mcp16502.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mcp16502.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mcp16502.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/mcp16502.c</a></div><div class='hunk'>@@ -119,8 +119,6 @@ enum {</div><div class='ctx'>  * @lpm: LPM GPIO descriptor</div><div class='ctx'>  */</div><div class='ctx'> struct mcp16502 {</div><div class='del'>-	struct regulator_dev *rdev[NUM_REGULATORS];</div><div class='del'>-	struct regmap *rmap;</div><div class='ctx'> 	struct gpio_desc *lpm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -179,13 +177,12 @@ static unsigned int mcp16502_get_mode(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int ret, reg;</div><div class='del'>-	struct mcp16502 *mcp = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='ctx'> 	reg = mcp16502_get_reg(rdev, MCP16502_OPMODE_ACTIVE);</div><div class='ctx'> 	if (reg &lt; 0)</div><div class='ctx'> 		return reg;</div><div class='ctx'> </div><div class='del'>-	ret = regmap_read(mcp-&gt;rmap, reg, &amp;val);</div><div class='add'>+	ret = regmap_read(rdev-&gt;regmap, reg, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +208,6 @@ static int _mcp16502_set_mode(struct regulator_dev *rdev, unsigned int mode,</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='ctx'> 	int reg;</div><div class='del'>-	struct mcp16502 *mcp = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='ctx'> 	reg = mcp16502_get_reg(rdev, op_mode);</div><div class='ctx'> 	if (reg &lt; 0)</div><div class='hunk'>@@ -228,7 +224,7 @@ static int _mcp16502_set_mode(struct regulator_dev *rdev, unsigned int mode,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reg = regmap_update_bits(mcp-&gt;rmap, reg, MCP16502_MODE, val);</div><div class='add'>+	reg = regmap_update_bits(rdev-&gt;regmap, reg, MCP16502_MODE, val);</div><div class='ctx'> 	return reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -247,9 +243,8 @@ static int mcp16502_get_status(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned int val;</div><div class='del'>-	struct mcp16502 *mcp = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='del'>-	ret = regmap_read(mcp-&gt;rmap, MCP16502_STAT_BASE(rdev_get_id(rdev)),</div><div class='add'>+	ret = regmap_read(rdev-&gt;regmap, MCP16502_STAT_BASE(rdev_get_id(rdev)),</div><div class='ctx'> 			  &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -290,7 +285,6 @@ static int mcp16502_suspend_get_target_reg(struct regulator_dev *rdev)</div><div class='ctx'>  */</div><div class='ctx'> static int mcp16502_set_suspend_voltage(struct regulator_dev *rdev, int uV)</div><div class='ctx'> {</div><div class='del'>-	struct mcp16502 *mcp = rdev_get_drvdata(rdev);</div><div class='ctx'> 	int sel = regulator_map_voltage_linear_range(rdev, uV, uV);</div><div class='ctx'> 	int reg = mcp16502_suspend_get_target_reg(rdev);</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +294,7 @@ static int mcp16502_set_suspend_voltage(struct regulator_dev *rdev, int uV)</div><div class='ctx'> 	if (reg &lt; 0)</div><div class='ctx'> 		return reg;</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(mcp-&gt;rmap, reg, MCP16502_VSEL, sel);</div><div class='add'>+	return regmap_update_bits(rdev-&gt;regmap, reg, MCP16502_VSEL, sel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -328,13 +322,12 @@ static int mcp16502_set_suspend_mode(struct regulator_dev *rdev,</div><div class='ctx'>  */</div><div class='ctx'> static int mcp16502_set_suspend_enable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct mcp16502 *mcp = rdev_get_drvdata(rdev);</div><div class='ctx'> 	int reg = mcp16502_suspend_get_target_reg(rdev);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &lt; 0)</div><div class='ctx'> 		return reg;</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(mcp-&gt;rmap, reg, MCP16502_EN, MCP16502_EN);</div><div class='add'>+	return regmap_update_bits(rdev-&gt;regmap, reg, MCP16502_EN, MCP16502_EN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -342,13 +335,12 @@ static int mcp16502_set_suspend_enable(struct regulator_dev *rdev)</div><div class='ctx'>  */</div><div class='ctx'> static int mcp16502_set_suspend_disable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct mcp16502 *mcp = rdev_get_drvdata(rdev);</div><div class='ctx'> 	int reg = mcp16502_suspend_get_target_reg(rdev);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &lt; 0)</div><div class='ctx'> 		return reg;</div><div class='ctx'> </div><div class='del'>-	return regmap_update_bits(mcp-&gt;rmap, reg, MCP16502_EN, 0);</div><div class='add'>+	return regmap_update_bits(rdev-&gt;regmap, reg, MCP16502_EN, 0);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='hunk'>@@ -435,36 +427,15 @@ static const struct regmap_config mcp16502_regmap_config = {</div><div class='ctx'> 	.wr_table	= &amp;mcp16502_yes_reg_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * set_up_regulators() - initialize all regulators</div><div class='del'>- */</div><div class='del'>-static int setup_regulators(struct mcp16502 *mcp, struct device *dev,</div><div class='del'>-			    struct regulator_config config)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_REGULATORS; i++) {</div><div class='del'>-		mcp-&gt;rdev[i] = devm_regulator_register(dev,</div><div class='del'>-						       &amp;mcp16502_desc[i],</div><div class='del'>-						       &amp;config);</div><div class='del'>-		if (IS_ERR(mcp-&gt;rdev[i])) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"failed to register %s regulator %ld\n",</div><div class='del'>-				mcp16502_desc[i].name, PTR_ERR(mcp-&gt;rdev[i]));</div><div class='del'>-			return PTR_ERR(mcp-&gt;rdev[i]);</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='ctx'> static int mcp16502_probe(struct i2c_client *client,</div><div class='ctx'> 			  const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct mcp16502 *mcp;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct regmap *rmap;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	dev = &amp;client-&gt;dev;</div><div class='ctx'> 	config.dev = dev;</div><div class='hunk'>@@ -473,15 +444,15 @@ static int mcp16502_probe(struct i2c_client *client,</div><div class='ctx'> 	if (!mcp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mcp-&gt;rmap = devm_regmap_init_i2c(client, &amp;mcp16502_regmap_config);</div><div class='del'>-	if (IS_ERR(mcp-&gt;rmap)) {</div><div class='del'>-		ret = PTR_ERR(mcp-&gt;rmap);</div><div class='add'>+	rmap = devm_regmap_init_i2c(client, &amp;mcp16502_regmap_config);</div><div class='add'>+	if (IS_ERR(rmap)) {</div><div class='add'>+		ret = PTR_ERR(rmap);</div><div class='ctx'> 		dev_err(dev, "regmap init failed: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i2c_set_clientdata(client, mcp);</div><div class='del'>-	config.regmap = mcp-&gt;rmap;</div><div class='add'>+	config.regmap = rmap;</div><div class='ctx'> 	config.driver_data = mcp;</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;lpm = devm_gpiod_get(dev, "lpm", GPIOD_OUT_LOW);</div><div class='hunk'>@@ -490,9 +461,15 @@ static int mcp16502_probe(struct i2c_client *client,</div><div class='ctx'> 		return PTR_ERR(mcp-&gt;lpm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = setup_regulators(mcp, dev, config);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return ret;</div><div class='add'>+	for (i = 0; i &lt; NUM_REGULATORS; i++) {</div><div class='add'>+		rdev = devm_regulator_register(dev, &amp;mcp16502_desc[i], &amp;config);</div><div class='add'>+		if (IS_ERR(rdev)) {</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"failed to register %s regulator %ld\n",</div><div class='add'>+				mcp16502_desc[i].name, PTR_ERR(rdev));</div><div class='add'>+			return PTR_ERR(rdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mcp16502_gpio_set_mode(mcp, MCP16502_OPMODE_ACTIVE);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/mt6311-regulator.c b/drivers/regulator/mt6311-regulator.c<br/>index 01d69f43d2b0..af95449d3590 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6311-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6311-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6311-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/mt6311-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2015 MediaTek Inc.</div><div class='del'>- * Author: Henry Chen &lt;henryc.chen@mediatek.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='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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2015 MediaTek Inc.</div><div class='add'>+// Author: Henry Chen &lt;henryc.chen@mediatek.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='head'>diff --git a/drivers/regulator/mt6311-regulator.h b/drivers/regulator/mt6311-regulator.h<br/>index 5218db46a798..4904d6751714 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6311-regulator.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6311-regulator.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6311-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/mt6311-regulator.h</a></div><div class='hunk'>@@ -1,15 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015 MediaTek Inc.</div><div class='ctx'>  * Author: Henry Chen &lt;henryc.chen@mediatek.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='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 __MT6311_REGULATOR_H__</div><div class='head'>diff --git a/drivers/regulator/mt6323-regulator.c b/drivers/regulator/mt6323-regulator.c<br/>index b7b9670f0979..893ea190788a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6323-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6323-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6323-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/mt6323-regulator.c</a></div><div class='hunk'>@@ -1,11 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2016 MediaTek Inc.</div><div class='del'>- * Author: Chen Zhong &lt;chen.zhong@mediatek.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='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2016 MediaTek Inc.</div><div class='add'>+// Author: Chen Zhong &lt;chen.zhong@mediatek.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -118,43 +114,43 @@ static const struct regulator_linear_range buck_volt_range3[] = {</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(500000, 0, 0x3f, 50000),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table1[] = {</div><div class='add'>+static const unsigned int ldo_volt_table1[] = {</div><div class='ctx'> 	3300000, 3400000, 3500000, 3600000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table2[] = {</div><div class='add'>+static const unsigned int ldo_volt_table2[] = {</div><div class='ctx'> 	1500000, 1800000, 2500000, 2800000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table3[] = {</div><div class='add'>+static const unsigned int ldo_volt_table3[] = {</div><div class='ctx'> 	1800000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table4[] = {</div><div class='add'>+static const unsigned int ldo_volt_table4[] = {</div><div class='ctx'> 	3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table5[] = {</div><div class='add'>+static const unsigned int ldo_volt_table5[] = {</div><div class='ctx'> 	1200000, 1300000, 1500000, 1800000, 2000000, 2800000, 3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table6[] = {</div><div class='add'>+static const unsigned int ldo_volt_table6[] = {</div><div class='ctx'> 	1200000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 2000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table7[] = {</div><div class='add'>+static const unsigned int ldo_volt_table7[] = {</div><div class='ctx'> 	1200000, 1300000, 1500000, 1800000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table8[] = {</div><div class='add'>+static const unsigned int ldo_volt_table8[] = {</div><div class='ctx'> 	1800000, 3000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table9[] = {</div><div class='add'>+static const unsigned int ldo_volt_table9[] = {</div><div class='ctx'> 	1200000, 1350000, 1500000, 1800000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table10[] = {</div><div class='add'>+static const unsigned int ldo_volt_table10[] = {</div><div class='ctx'> 	1200000, 1300000, 1500000, 1800000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/mt6380-regulator.c b/drivers/regulator/mt6380-regulator.c<br/>index 127dd720cbcc..b6aed090b5e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6380-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6380-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6380-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/mt6380-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2017 MediaTek Inc.</div><div class='del'>- * Author: Chenglin Xu &lt;chenglin.xu@mediatek.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='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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2017 MediaTek Inc.</div><div class='add'>+// Author: Chenglin Xu &lt;chenglin.xu@mediatek.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -173,19 +164,19 @@ static const struct regulator_linear_range buck_volt_range3[] = {</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(1200000, 0, 0x3c, 25000),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table1[] = {</div><div class='add'>+static const unsigned int ldo_volt_table1[] = {</div><div class='ctx'> 	1400000, 1350000, 1300000, 1250000, 1200000, 1150000, 1100000, 1050000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table2[] = {</div><div class='add'>+static const unsigned int ldo_volt_table2[] = {</div><div class='ctx'> 	2200000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table3[] = {</div><div class='add'>+static const unsigned int ldo_volt_table3[] = {</div><div class='ctx'> 	1240000, 1390000, 1540000, 1840000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table4[] = {</div><div class='add'>+static const unsigned int ldo_volt_table4[] = {</div><div class='ctx'> 	2200000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/mt6397-regulator.c b/drivers/regulator/mt6397-regulator.c<br/>index c6c6aa85e4e8..fd9ed864a0c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6397-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/mt6397-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/mt6397-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/mt6397-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 MediaTek Inc.</div><div class='del'>- * Author: Flora Fu &lt;flora.fu@mediatek.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='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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+// Author: Flora Fu &lt;flora.fu@mediatek.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -123,35 +114,35 @@ static const struct regulator_linear_range buck_volt_range3[] = {</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(1500000, 0, 0x1f, 20000),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table1[] = {</div><div class='add'>+static const unsigned int ldo_volt_table1[] = {</div><div class='ctx'> 	1500000, 1800000, 2500000, 2800000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table2[] = {</div><div class='add'>+static const unsigned int ldo_volt_table2[] = {</div><div class='ctx'> 	1800000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table3[] = {</div><div class='add'>+static const unsigned int ldo_volt_table3[] = {</div><div class='ctx'> 	3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table4[] = {</div><div class='add'>+static const unsigned int ldo_volt_table4[] = {</div><div class='ctx'> 	1220000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table5[] = {</div><div class='add'>+static const unsigned int ldo_volt_table5[] = {</div><div class='ctx'> 	1200000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table5_v2[] = {</div><div class='add'>+static const unsigned int ldo_volt_table5_v2[] = {</div><div class='ctx'> 	1200000, 1000000, 1500000, 1800000, 2500000, 2800000, 3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table6[] = {</div><div class='add'>+static const unsigned int ldo_volt_table6[] = {</div><div class='ctx'> 	1200000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 2000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 ldo_volt_table7[] = {</div><div class='add'>+static const unsigned int ldo_volt_table7[] = {</div><div class='ctx'> 	1300000, 1500000, 1800000, 2000000, 2500000, 2800000, 3000000, 3300000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c<br/>index 7b6bf3536271..6dca0ba044d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/of_regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/of_regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/of_regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/of_regulator.c</a></div><div class='hunk'>@@ -371,8 +371,9 @@ int of_regulator_match(struct device *dev, struct device_node *node,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(of_regulator_match);</div><div class='ctx'> </div><div class='del'>-struct device_node *regulator_of_get_init_node(struct device *dev,</div><div class='del'>-					       const struct regulator_desc *desc)</div><div class='add'>+static struct</div><div class='add'>+device_node *regulator_of_get_init_node(struct device *dev,</div><div class='add'>+					const struct regulator_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *search, *child;</div><div class='ctx'> 	const char *name;</div><div class='head'>diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c<br/>index 7fb9e8dd834e..f13c7c8b1061 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/palmas-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/palmas-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/palmas-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/palmas-regulator.c</a></div><div class='hunk'>@@ -991,9 +991,6 @@ static int palmas_ldo_registration(struct palmas_pmic *pmic,</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Save regulator for cleanup */</div><div class='del'>-		pmic-&gt;rdev[id] = rdev;</div><div class='del'>-</div><div class='ctx'> 		/* Initialise sleep/init values from platform data */</div><div class='ctx'> 		if (pdata) {</div><div class='ctx'> 			reg_init = pdata-&gt;reg_init[id];</div><div class='hunk'>@@ -1101,9 +1098,6 @@ static int tps65917_ldo_registration(struct palmas_pmic *pmic,</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Save regulator for cleanup */</div><div class='del'>-		pmic-&gt;rdev[id] = rdev;</div><div class='del'>-</div><div class='ctx'> 		/* Initialise sleep/init values from platform data */</div><div class='ctx'> 		if (pdata) {</div><div class='ctx'> 			reg_init = pdata-&gt;reg_init[id];</div><div class='hunk'>@@ -1288,9 +1282,6 @@ static int palmas_smps_registration(struct palmas_pmic *pmic,</div><div class='ctx'> 				pdev_name);</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Save regulator for cleanup */</div><div class='del'>-		pmic-&gt;rdev[id] = rdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1395,9 +1386,6 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic,</div><div class='ctx'> 				pdev_name);</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Save regulator for cleanup */</div><div class='del'>-		pmic-&gt;rdev[id] = rdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/regulator/pv88060-regulator.c b/drivers/regulator/pv88060-regulator.c<br/>index 1600f9821891..3d3415839ba2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88060-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88060-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88060-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/pv88060-regulator.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * pv88060-regulator.c - Regulator device driver for PV88060</div><div class='del'>- * Copyright (C) 2015  Powerventure Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// pv88060-regulator.c - Regulator device driver for PV88060</div><div class='add'>+// Copyright (C) 2015  Powerventure Semiconductor Ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -244,9 +234,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data)</div><div class='ctx'> 	if (reg_val &amp; PV88060_E_VDD_FLT) {</div><div class='ctx'> 		for (i = 0; i &lt; PV88060_MAX_REGULATORS; i++) {</div><div class='ctx'> 			if (chip-&gt;rdev[i] != NULL) {</div><div class='add'>+				regulator_lock(chip-&gt;rdev[i]);</div><div class='ctx'> 				regulator_notifier_call_chain(chip-&gt;rdev[i],</div><div class='ctx'> 					REGULATOR_EVENT_UNDER_VOLTAGE,</div><div class='ctx'> 					NULL);</div><div class='add'>+				regulator_unlock(chip-&gt;rdev[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -261,9 +253,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data)</div><div class='ctx'> 	if (reg_val &amp; PV88060_E_OVER_TEMP) {</div><div class='ctx'> 		for (i = 0; i &lt; PV88060_MAX_REGULATORS; i++) {</div><div class='ctx'> 			if (chip-&gt;rdev[i] != NULL) {</div><div class='add'>+				regulator_lock(chip-&gt;rdev[i]);</div><div class='ctx'> 				regulator_notifier_call_chain(chip-&gt;rdev[i],</div><div class='ctx'> 					REGULATOR_EVENT_OVER_TEMP,</div><div class='ctx'> 					NULL);</div><div class='add'>+				regulator_unlock(chip-&gt;rdev[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/pv88060-regulator.h b/drivers/regulator/pv88060-regulator.h<br/>index 02ca9203a172..d333dbf3be94 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88060-regulator.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88060-regulator.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88060-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/pv88060-regulator.h</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * pv88060-regulator.h - Regulator definitions for PV88060</div><div class='ctx'>  * Copyright (C) 2015 Powerventure Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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 __PV88060_REGISTERS_H__</div><div class='head'>diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88080-regulator.c<br/>index bdddacdbeb99..a444f68af1a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88080-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88080-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88080-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/pv88080-regulator.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * pv88080-regulator.c - Regulator device driver for PV88080</div><div class='del'>- * Copyright (C) 2016  Powerventure Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// pv88080-regulator.c - Regulator device driver for PV88080</div><div class='add'>+// Copyright (C) 2016  Powerventure Semiconductor Ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -345,9 +335,11 @@ static irqreturn_t pv88080_irq_handler(int irq, void *data)</div><div class='ctx'> 	if (reg_val &amp; PV88080_E_VDD_FLT) {</div><div class='ctx'> 		for (i = 0; i &lt; PV88080_MAX_REGULATORS; i++) {</div><div class='ctx'> 			if (chip-&gt;rdev[i] != NULL) {</div><div class='add'>+			        regulator_lock(chip-&gt;rdev[i]);</div><div class='ctx'> 				regulator_notifier_call_chain(chip-&gt;rdev[i],</div><div class='ctx'> 					REGULATOR_EVENT_UNDER_VOLTAGE,</div><div class='ctx'> 					NULL);</div><div class='add'>+			        regulator_unlock(chip-&gt;rdev[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -362,9 +354,11 @@ static irqreturn_t pv88080_irq_handler(int irq, void *data)</div><div class='ctx'> 	if (reg_val &amp; PV88080_E_OVER_TEMP) {</div><div class='ctx'> 		for (i = 0; i &lt; PV88080_MAX_REGULATORS; i++) {</div><div class='ctx'> 			if (chip-&gt;rdev[i] != NULL) {</div><div class='add'>+			        regulator_lock(chip-&gt;rdev[i]);</div><div class='ctx'> 				regulator_notifier_call_chain(chip-&gt;rdev[i],</div><div class='ctx'> 					REGULATOR_EVENT_OVER_TEMP,</div><div class='ctx'> 					NULL);</div><div class='add'>+			        regulator_unlock(chip-&gt;rdev[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/pv88080-regulator.h b/drivers/regulator/pv88080-regulator.h<br/>index ae25ff360e3d..7d7f8f11a75a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88080-regulator.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88080-regulator.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88080-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/pv88080-regulator.h</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * pv88080-regulator.h - Regulator definitions for PV88080</div><div class='ctx'>  * Copyright (C) 2016 Powerventure Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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 __PV88080_REGISTERS_H__</div><div class='head'>diff --git a/drivers/regulator/pv88090-regulator.c b/drivers/regulator/pv88090-regulator.c<br/>index 6e97cc6df2ee..b1d0d97ae935 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88090-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88090-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88090-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/pv88090-regulator.c</a></div><div class='hunk'>@@ -1,17 +1,7 @@</div><div class='del'>-/*</div><div class='del'>- * pv88090-regulator.c - Regulator device driver for PV88090</div><div class='del'>- * Copyright (C) 2015  Powerventure Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// pv88090-regulator.c - Regulator device driver for PV88090</div><div class='add'>+// Copyright (C) 2015  Powerventure Semiconductor Ltd.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -237,9 +227,11 @@ static irqreturn_t pv88090_irq_handler(int irq, void *data)</div><div class='ctx'> 	if (reg_val &amp; PV88090_E_VDD_FLT) {</div><div class='ctx'> 		for (i = 0; i &lt; PV88090_MAX_REGULATORS; i++) {</div><div class='ctx'> 			if (chip-&gt;rdev[i] != NULL) {</div><div class='add'>+			        regulator_lock(chip-&gt;rdev[i]);</div><div class='ctx'> 				regulator_notifier_call_chain(chip-&gt;rdev[i],</div><div class='ctx'> 					REGULATOR_EVENT_UNDER_VOLTAGE,</div><div class='ctx'> 					NULL);</div><div class='add'>+			        regulator_unlock(chip-&gt;rdev[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -254,9 +246,11 @@ static irqreturn_t pv88090_irq_handler(int irq, void *data)</div><div class='ctx'> 	if (reg_val &amp; PV88090_E_OVER_TEMP) {</div><div class='ctx'> 		for (i = 0; i &lt; PV88090_MAX_REGULATORS; i++) {</div><div class='ctx'> 			if (chip-&gt;rdev[i] != NULL) {</div><div class='add'>+			        regulator_lock(chip-&gt;rdev[i]);</div><div class='ctx'> 				regulator_notifier_call_chain(chip-&gt;rdev[i],</div><div class='ctx'> 					REGULATOR_EVENT_OVER_TEMP,</div><div class='ctx'> 					NULL);</div><div class='add'>+			        regulator_unlock(chip-&gt;rdev[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/pv88090-regulator.h b/drivers/regulator/pv88090-regulator.h<br/>index 62d9029277f4..f814ee52cff3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88090-regulator.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/pv88090-regulator.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/pv88090-regulator.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/pv88090-regulator.h</a></div><div class='hunk'>@@ -1,16 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * pv88090-regulator.h - Regulator definitions for PV88090</div><div class='ctx'>  * Copyright (C) 2015 Powerventure Semiconductor Ltd.</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</div><div class='del'>- * as published by the Free Software Foundation; either version 2</div><div class='del'>- * of the License, or (at your option) any later version.</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 __PV88090_REGISTERS_H__</div><div class='head'>diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c<br/>index 2ec51af43673..9446653e7a89 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/rc5t583-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/rc5t583-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/rc5t583-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/rc5t583-regulator.c</a></div><div class='hunk'>@@ -47,18 +47,13 @@ struct rc5t583_regulator_info {</div><div class='ctx'> 	struct regulator_desc	desc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct rc5t583_regulator {</div><div class='del'>-	struct rc5t583_regulator_info *reg_info;</div><div class='del'>-	struct regulator_dev	*rdev;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int rc5t583_regulator_enable_time(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct rc5t583_regulator *reg = rdev_get_drvdata(rdev);</div><div class='add'>+	struct rc5t583_regulator_info *reg_info = rdev_get_drvdata(rdev);</div><div class='ctx'> 	int vsel = regulator_get_voltage_sel_regmap(rdev);</div><div class='ctx'> 	int curr_uV = regulator_list_voltage_linear(rdev, vsel);</div><div class='ctx'> </div><div class='del'>-	return DIV_ROUND_UP(curr_uV, reg-&gt;reg_info-&gt;enable_uv_per_us);</div><div class='add'>+	return DIV_ROUND_UP(curr_uV, reg_info-&gt;enable_uv_per_us);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_ops rc5t583_ops = {</div><div class='hunk'>@@ -120,8 +115,6 @@ static int rc5t583_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct rc5t583 *rc5t583 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583-&gt;dev);</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='del'>-	struct rc5t583_regulator *reg = NULL;</div><div class='del'>-	struct rc5t583_regulator *regs;</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='ctx'> 	struct rc5t583_regulator_info *ri;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -132,18 +125,8 @@ static int rc5t583_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	regs = devm_kcalloc(&amp;pdev-&gt;dev,</div><div class='del'>-			    RC5T583_REGULATOR_MAX,</div><div class='del'>-			    sizeof(struct rc5t583_regulator),</div><div class='del'>-			    GFP_KERNEL);</div><div class='del'>-	if (!regs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	for (id = 0; id &lt; RC5T583_REGULATOR_MAX; ++id) {</div><div class='del'>-		reg = &amp;regs[id];</div><div class='ctx'> 		ri = &amp;rc5t583_reg_info[id];</div><div class='del'>-		reg-&gt;reg_info = ri;</div><div class='ctx'> </div><div class='ctx'> 		if (ri-&gt;deepsleep_id == RC5T583_DS_NONE)</div><div class='ctx'> 			goto skip_ext_pwr_config;</div><div class='hunk'>@@ -163,7 +146,7 @@ static int rc5t583_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> skip_ext_pwr_config:</div><div class='ctx'> 		config.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 		config.init_data = pdata-&gt;reg_init_data[id];</div><div class='del'>-		config.driver_data = reg;</div><div class='add'>+		config.driver_data = ri;</div><div class='ctx'> 		config.regmap = rc5t583-&gt;regmap;</div><div class='ctx'> </div><div class='ctx'> 		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;ri-&gt;desc, &amp;config);</div><div class='hunk'>@@ -172,9 +155,7 @@ skip_ext_pwr_config:</div><div class='ctx'> 						ri-&gt;desc.name);</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='del'>-		reg-&gt;rdev = rdev;</div><div class='ctx'> 	}</div><div class='del'>-	platform_set_drvdata(pdev, regs);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/rn5t618-regulator.c b/drivers/regulator/rn5t618-regulator.c<br/>index 790a4a73ea2c..a79c0c43b9f8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/rn5t618-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/rn5t618-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/rn5t618-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/rn5t618-regulator.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ static const struct regulator_ops rn5t618_reg_ops = {</div><div class='ctx'> 		.vsel_mask	= (vmask),				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc rn5t567_regulators[] = {</div><div class='add'>+static const struct regulator_desc rn5t567_regulators[] = {</div><div class='ctx'> 	/* DCDC */</div><div class='ctx'> 	REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),</div><div class='ctx'> 	REG(DCDC2, DC2CTL, BIT(0), DC2DAC, 0xff, 600000, 3500000, 12500),</div><div class='hunk'>@@ -63,7 +63,7 @@ static struct regulator_desc rn5t567_regulators[] = {</div><div class='ctx'> 	REG(LDORTC2, LDOEN2, BIT(5), LDORTC2DAC, 0x7f, 900000, 3500000, 25000),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc rn5t618_regulators[] = {</div><div class='add'>+static const struct regulator_desc rn5t618_regulators[] = {</div><div class='ctx'> 	/* DCDC */</div><div class='ctx'> 	REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),</div><div class='ctx'> 	REG(DCDC2, DC2CTL, BIT(0), DC2DAC, 0xff, 600000, 3500000, 12500),</div><div class='hunk'>@@ -79,7 +79,7 @@ static struct regulator_desc rn5t618_regulators[] = {</div><div class='ctx'> 	REG(LDORTC2, LDOEN2, BIT(5), LDORTC2DAC, 0x7f, 900000, 3500000, 25000),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc rc5t619_regulators[] = {</div><div class='add'>+static const struct regulator_desc rc5t619_regulators[] = {</div><div class='ctx'> 	/* DCDC */</div><div class='ctx'> 	REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),</div><div class='ctx'> 	REG(DCDC2, DC2CTL, BIT(0), DC2DAC, 0xff, 600000, 3500000, 12500),</div><div class='hunk'>@@ -107,7 +107,7 @@ static int rn5t618_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct rn5t618 *rn5t618 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='del'>-	struct regulator_desc *regulators;</div><div class='add'>+	const struct regulator_desc *regulators;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int num_regulators = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c<br/>index 58a1fe583a6c..51f7e8b74d8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/s2mpa01.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/s2mpa01.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/s2mpa01.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/s2mpa01.c</a></div><div class='hunk'>@@ -17,10 +17,7 @@</div><div class='ctx'> #include &lt;linux/mfd/samsung/core.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/samsung/s2mpa01.h&gt;</div><div class='ctx'> </div><div class='del'>-#define S2MPA01_REGULATOR_CNT ARRAY_SIZE(regulators)</div><div class='del'>-</div><div class='ctx'> struct s2mpa01_info {</div><div class='del'>-	struct of_regulator_match rdata[S2MPA01_REGULATOR_MAX];</div><div class='ctx'> 	int ramp_delay24;</div><div class='ctx'> 	int ramp_delay3;</div><div class='ctx'> 	int ramp_delay5;</div><div class='hunk'>@@ -232,6 +229,8 @@ static const struct regulator_ops s2mpa01_buck_ops = {</div><div class='ctx'> </div><div class='ctx'> #define regulator_desc_ldo(num, step) {			\</div><div class='ctx'> 	.name		= "LDO"#num,			\</div><div class='add'>+	.of_match	= of_match_ptr("LDO"#num),	\</div><div class='add'>+	.regulators_node = of_match_ptr("regulators"),	\</div><div class='ctx'> 	.id		= S2MPA01_LDO##num,		\</div><div class='ctx'> 	.ops		= &amp;s2mpa01_ldo_ops,		\</div><div class='ctx'> 	.type		= REGULATOR_VOLTAGE,		\</div><div class='hunk'>@@ -247,6 +246,8 @@ static const struct regulator_ops s2mpa01_buck_ops = {</div><div class='ctx'> </div><div class='ctx'> #define regulator_desc_buck1_4(num)	{			\</div><div class='ctx'> 	.name		= "BUCK"#num,				\</div><div class='add'>+	.of_match	= of_match_ptr("BUCK"#num),		\</div><div class='add'>+	.regulators_node = of_match_ptr("regulators"),		\</div><div class='ctx'> 	.id		= S2MPA01_BUCK##num,			\</div><div class='ctx'> 	.ops		= &amp;s2mpa01_buck_ops,			\</div><div class='ctx'> 	.type		= REGULATOR_VOLTAGE,			\</div><div class='hunk'>@@ -263,6 +264,8 @@ static const struct regulator_ops s2mpa01_buck_ops = {</div><div class='ctx'> </div><div class='ctx'> #define regulator_desc_buck5	{				\</div><div class='ctx'> 	.name		= "BUCK5",				\</div><div class='add'>+	.of_match	= of_match_ptr("BUCK5"),		\</div><div class='add'>+	.regulators_node = of_match_ptr("regulators"),		\</div><div class='ctx'> 	.id		= S2MPA01_BUCK5,			\</div><div class='ctx'> 	.ops		= &amp;s2mpa01_buck_ops,			\</div><div class='ctx'> 	.type		= REGULATOR_VOLTAGE,			\</div><div class='hunk'>@@ -279,6 +282,8 @@ static const struct regulator_ops s2mpa01_buck_ops = {</div><div class='ctx'> </div><div class='ctx'> #define regulator_desc_buck6_10(num, min, step) {			\</div><div class='ctx'> 	.name		= "BUCK"#num,				\</div><div class='add'>+	.of_match	= of_match_ptr("BUCK"#num),		\</div><div class='add'>+	.regulators_node = of_match_ptr("regulators"),		\</div><div class='ctx'> 	.id		= S2MPA01_BUCK##num,			\</div><div class='ctx'> 	.ops		= &amp;s2mpa01_buck_ops,			\</div><div class='ctx'> 	.type		= REGULATOR_VOLTAGE,			\</div><div class='hunk'>@@ -336,9 +341,7 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct sec_platform_data *pdata = dev_get_platdata(iodev-&gt;dev);</div><div class='del'>-	struct device_node *reg_np = NULL;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='del'>-	struct of_regulator_match *rdata;</div><div class='ctx'> 	struct s2mpa01_info *s2mpa01;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -346,39 +349,15 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!s2mpa01)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rdata = s2mpa01-&gt;rdata;</div><div class='del'>-	for (i = 0; i &lt; S2MPA01_REGULATOR_CNT; i++)</div><div class='del'>-		rdata[i].name = regulators[i].name;</div><div class='del'>-</div><div class='del'>-	if (iodev-&gt;dev-&gt;of_node) {</div><div class='del'>-		reg_np = of_get_child_by_name(iodev-&gt;dev-&gt;of_node,</div><div class='del'>-							"regulators");</div><div class='del'>-		if (!reg_np) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"could not find regulators sub-node\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		of_regulator_match(&amp;pdev-&gt;dev, reg_np, rdata,</div><div class='del'>-						S2MPA01_REGULATOR_MAX);</div><div class='del'>-		of_node_put(reg_np);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, s2mpa01);</div><div class='del'>-</div><div class='del'>-	config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+	config.dev = iodev-&gt;dev;</div><div class='ctx'> 	config.regmap = iodev-&gt;regmap_pmic;</div><div class='ctx'> 	config.driver_data = s2mpa01;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; S2MPA01_REGULATOR_MAX; i++) {</div><div class='ctx'> 		struct regulator_dev *rdev;</div><div class='add'>+</div><div class='ctx'> 		if (pdata)</div><div class='ctx'> 			config.init_data = pdata-&gt;regulators[i].initdata;</div><div class='del'>-		else</div><div class='del'>-			config.init_data = rdata[i].init_data;</div><div class='del'>-</div><div class='del'>-		if (reg_np)</div><div class='del'>-			config.of_node = rdata[i].of_node;</div><div class='ctx'> </div><div class='ctx'> 		rdev = devm_regulator_register(&amp;pdev-&gt;dev,</div><div class='ctx'> 						&amp;regulators[i], &amp;config);</div><div class='head'>diff --git a/drivers/regulator/sc2731-regulator.c b/drivers/regulator/sc2731-regulator.c<br/>index eb2bdf060b7b..0f21f95c8981 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/sc2731-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/sc2731-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/sc2731-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/sc2731-regulator.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static const struct regulator_ops sc2731_regu_linear_ops = {</div><div class='ctx'> 	.vsel_mask		= vmask,			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc regulators[] = {</div><div class='add'>+static const struct regulator_desc regulators[] = {</div><div class='ctx'> 	SC2731_REGU_LINEAR(BUCK_CPU0, SC2731_POWER_PD_SW,</div><div class='ctx'> 			   SC2731_DCDC_CPU0_PD_MASK, SC2731_DCDC_CPU0_VOL,</div><div class='ctx'> 			   SC2731_DCDC_CPU0_VOL_MASK, 3125, 400000, 1996875),</div><div class='head'>diff --git a/drivers/regulator/sky81452-regulator.c b/drivers/regulator/sky81452-regulator.c<br/>index 647860611916..177dede82a61 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/sky81452-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/sky81452-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/sky81452-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/sky81452-regulator.c</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='del'>-/*</div><div class='del'>- * sky81452-regulator.c	SKY81452 regulator driver</div><div class='del'>- *</div><div class='del'>- * Copyright 2014 Skyworks Solutions Inc.</div><div class='del'>- * Author : Gyungoh Yoo &lt;jack.yoo@skyworksinc.com&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 version 2</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 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='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// sky81452-regulator.c	SKY81452 regulator driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2014 Skyworks Solutions Inc.</div><div class='add'>+// Author : Gyungoh Yoo &lt;jack.yoo@skyworksinc.com&gt;</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'>@@ -34,7 +22,7 @@</div><div class='ctx'> #define SKY81452_LEN	0x40</div><div class='ctx'> #define SKY81452_LOUT	0x1F</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops sky81452_reg_ops = {</div><div class='add'>+static const struct regulator_ops sky81452_reg_ops = {</div><div class='ctx'> 	.list_voltage = regulator_list_voltage_linear_range,</div><div class='ctx'> 	.map_voltage = regulator_map_voltage_linear_range,</div><div class='ctx'> 	.get_voltage_sel = regulator_get_voltage_sel_regmap,</div><div class='head'>diff --git a/drivers/regulator/stm32-pwr.c b/drivers/regulator/stm32-pwr.c<br/>new file mode 100644<br/>index 000000000000..e0e627b0106e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/stm32-pwr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/stm32-pwr.c</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (C) STMicroelectronics 2019</div><div class='add'>+// Authors: Gabriel Fernandez &lt;gabriel.fernandez@st.com&gt;</div><div class='add'>+//          Pascal Paillet &lt;p.paillet@st.com&gt;.</div><div class='add'>+</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/module.h&gt;</div><div class='add'>+#include &lt;linux/of_address.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/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/regulator/of_regulator.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Registers description</div><div class='add'>+ */</div><div class='add'>+#define REG_PWR_CR3 0x0C</div><div class='add'>+</div><div class='add'>+#define USB_3_3_EN BIT(24)</div><div class='add'>+#define USB_3_3_RDY BIT(26)</div><div class='add'>+#define REG_1_8_EN BIT(28)</div><div class='add'>+#define REG_1_8_RDY BIT(29)</div><div class='add'>+#define REG_1_1_EN BIT(30)</div><div class='add'>+#define REG_1_1_RDY BIT(31)</div><div class='add'>+</div><div class='add'>+/* list of supported regulators */</div><div class='add'>+enum {</div><div class='add'>+	PWR_REG11,</div><div class='add'>+	PWR_REG18,</div><div class='add'>+	PWR_USB33,</div><div class='add'>+	STM32PWR_REG_NUM_REGS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 ready_mask_table[STM32PWR_REG_NUM_REGS] = {</div><div class='add'>+	[PWR_REG11] = REG_1_1_RDY,</div><div class='add'>+	[PWR_REG18] = REG_1_8_RDY,</div><div class='add'>+	[PWR_USB33] = USB_3_3_RDY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32_pwr_reg {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	u32 ready_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_pwr_reg_is_ready(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_pwr_reg *priv = rdev_get_drvdata(rdev);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(priv-&gt;base + REG_PWR_CR3);</div><div class='add'>+</div><div class='add'>+	return (val &amp; priv-&gt;ready_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_pwr_reg_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_pwr_reg *priv = rdev_get_drvdata(rdev);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(priv-&gt;base + REG_PWR_CR3);</div><div class='add'>+</div><div class='add'>+	return (val &amp; rdev-&gt;desc-&gt;enable_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_pwr_reg_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_pwr_reg *priv = rdev_get_drvdata(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(priv-&gt;base + REG_PWR_CR3);</div><div class='add'>+	val |= rdev-&gt;desc-&gt;enable_mask;</div><div class='add'>+	writel_relaxed(val, priv-&gt;base + REG_PWR_CR3);</div><div class='add'>+</div><div class='add'>+	/* use an arbitrary timeout of 20ms */</div><div class='add'>+	ret = readx_poll_timeout(stm32_pwr_reg_is_ready, rdev, val, val,</div><div class='add'>+				 100, 20 * 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;rdev-&gt;dev, "regulator enable timed out!\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 stm32_pwr_reg_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_pwr_reg *priv = rdev_get_drvdata(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(priv-&gt;base + REG_PWR_CR3);</div><div class='add'>+	val &amp;= ~rdev-&gt;desc-&gt;enable_mask;</div><div class='add'>+	writel_relaxed(val, priv-&gt;base + REG_PWR_CR3);</div><div class='add'>+</div><div class='add'>+	/* use an arbitrary timeout of 20ms */</div><div class='add'>+	ret = readx_poll_timeout(stm32_pwr_reg_is_ready, rdev, val, !val,</div><div class='add'>+				 100, 20 * 1000);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;rdev-&gt;dev, "regulator disable timed out!\n");</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 regulator_ops stm32_pwr_reg_ops = {</div><div class='add'>+	.enable		= stm32_pwr_reg_enable,</div><div class='add'>+	.disable	= stm32_pwr_reg_disable,</div><div class='add'>+	.is_enabled	= stm32_pwr_reg_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PWR_REG(_id, _name, _volt, _en, _supply) \</div><div class='add'>+	[_id] = { \</div><div class='add'>+		.id = _id, \</div><div class='add'>+		.name = _name, \</div><div class='add'>+		.of_match = of_match_ptr(_name), \</div><div class='add'>+		.n_voltages = 1, \</div><div class='add'>+		.type = REGULATOR_VOLTAGE, \</div><div class='add'>+		.fixed_uV = _volt, \</div><div class='add'>+		.ops = &amp;stm32_pwr_reg_ops, \</div><div class='add'>+		.enable_mask = _en, \</div><div class='add'>+		.owner = THIS_MODULE, \</div><div class='add'>+		.supply_name = _supply, \</div><div class='add'>+	} \</div><div class='add'>+</div><div class='add'>+static const struct regulator_desc stm32_pwr_desc[] = {</div><div class='add'>+	PWR_REG(PWR_REG11, "reg11", 1100000, REG_1_1_EN, "vdd"),</div><div class='add'>+	PWR_REG(PWR_REG18, "reg18", 1800000, REG_1_8_EN, "vdd"),</div><div class='add'>+	PWR_REG(PWR_USB33, "usb33", 3300000, USB_3_3_EN, "vdd_3v3_usbfs"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32_pwr_regulator_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 stm32_pwr_reg *priv;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	struct regulator_config config = { };</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	base = of_iomap(np, 0);</div><div class='add'>+	if (!base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to map IO memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config.dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; STM32PWR_REG_NUM_REGS; i++) {</div><div class='add'>+		priv = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct stm32_pwr_reg),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+		if (!priv)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		priv-&gt;base = base;</div><div class='add'>+		priv-&gt;ready_mask = ready_mask_table[i];</div><div class='add'>+		config.driver_data = priv;</div><div class='add'>+</div><div class='add'>+		rdev = devm_regulator_register(&amp;pdev-&gt;dev,</div><div class='add'>+					       &amp;stm32_pwr_desc[i],</div><div class='add'>+					       &amp;config);</div><div class='add'>+		if (IS_ERR(rdev)) {</div><div class='add'>+			ret = PTR_ERR(rdev);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Failed to register regulator: %d\n", 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 const struct of_device_id stm32_pwr_of_match[] = {</div><div class='add'>+	{ .compatible = "st,stm32mp1,pwr-reg", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, stm32_pwr_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver stm32_pwr_driver = {</div><div class='add'>+	.probe = stm32_pwr_regulator_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name  = "stm32-pwr-regulator",</div><div class='add'>+		.of_match_table = of_match_ptr(stm32_pwr_of_match),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(stm32_pwr_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("STM32MP1 PWR voltage regulator driver");</div><div class='add'>+MODULE_AUTHOR("Pascal Paillet &lt;p.paillet@st.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/regulator/sy8106a-regulator.c b/drivers/regulator/sy8106a-regulator.c<br/>index 65fbd1f0b612..42e03b2c10a0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/sy8106a-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/sy8106a-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/sy8106a-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/sy8106a-regulator.c</a></div><div class='hunk'>@@ -22,12 +22,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define SY8106A_GO_BIT			BIT(7)</div><div class='ctx'> </div><div class='del'>-struct sy8106a {</div><div class='del'>-	struct regulator_dev *rdev;</div><div class='del'>-	struct regmap *regmap;</div><div class='del'>-	u32 fixed_voltage;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct regmap_config sy8106a_regmap_config = {</div><div class='ctx'> 	.reg_bits = 8,</div><div class='ctx'> 	.val_bits = 8,</div><div class='hunk'>@@ -70,36 +64,32 @@ static const struct regulator_desc sy8106a_reg = {</div><div class='ctx'> static int sy8106a_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 			    const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct sy8106a *chip;</div><div class='ctx'> 	struct device *dev = &amp;i2c-&gt;dev;</div><div class='del'>-	struct regulator_dev *rdev = NULL;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regmap *regmap;</div><div class='ctx'> 	unsigned int reg, vsel;</div><div class='add'>+	u32 fixed_voltage;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	chip = devm_kzalloc(&amp;i2c-&gt;dev, sizeof(struct sy8106a), GFP_KERNEL);</div><div class='del'>-	if (!chip)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	error = of_property_read_u32(dev-&gt;of_node, "silergy,fixed-microvolt",</div><div class='del'>-				     &amp;chip-&gt;fixed_voltage);</div><div class='add'>+				     &amp;fixed_voltage);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;fixed_voltage &lt; SY8106A_MIN_MV * 1000 ||</div><div class='del'>-	    chip-&gt;fixed_voltage &gt; SY8106A_MAX_MV * 1000)</div><div class='add'>+	if (fixed_voltage &lt; SY8106A_MIN_MV * 1000 ||</div><div class='add'>+	    fixed_voltage &gt; SY8106A_MAX_MV * 1000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;regmap = devm_regmap_init_i2c(i2c, &amp;sy8106a_regmap_config);</div><div class='del'>-	if (IS_ERR(chip-&gt;regmap)) {</div><div class='del'>-		error = PTR_ERR(chip-&gt;regmap);</div><div class='add'>+	regmap = devm_regmap_init_i2c(i2c, &amp;sy8106a_regmap_config);</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='add'>+		error = PTR_ERR(regmap);</div><div class='ctx'> 		dev_err(dev, "Failed to allocate register map: %d\n", error);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	config.dev = &amp;i2c-&gt;dev;</div><div class='del'>-	config.regmap = chip-&gt;regmap;</div><div class='del'>-	config.driver_data = chip;</div><div class='add'>+	config.regmap = regmap;</div><div class='ctx'> </div><div class='ctx'> 	config.of_node = dev-&gt;of_node;</div><div class='ctx'> 	config.init_data = of_get_regulator_init_data(dev, dev-&gt;of_node,</div><div class='hunk'>@@ -109,15 +99,15 @@ static int sy8106a_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure GO_BIT is enabled when probing */</div><div class='del'>-	error = regmap_read(chip-&gt;regmap, SY8106A_REG_VOUT1_SEL, &amp;reg);</div><div class='add'>+	error = regmap_read(regmap, SY8106A_REG_VOUT1_SEL, &amp;reg);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (!(reg &amp; SY8106A_GO_BIT)) {</div><div class='del'>-		vsel = (chip-&gt;fixed_voltage / 1000 - SY8106A_MIN_MV) /</div><div class='add'>+		vsel = (fixed_voltage / 1000 - SY8106A_MIN_MV) /</div><div class='ctx'> 		       SY8106A_STEP_MV;</div><div class='ctx'> </div><div class='del'>-		error = regmap_write(chip-&gt;regmap, SY8106A_REG_VOUT1_SEL,</div><div class='add'>+		error = regmap_write(regmap, SY8106A_REG_VOUT1_SEL,</div><div class='ctx'> 				     vsel | SY8106A_GO_BIT);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			return error;</div><div class='hunk'>@@ -131,10 +121,6 @@ static int sy8106a_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;rdev = rdev;</div><div class='del'>-</div><div class='del'>-	i2c_set_clientdata(i2c, chip);</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/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c<br/>index c179a3a221af..a1b7fab91dd4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps6507x-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps6507x-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps6507x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps6507x-regulator.c</a></div><div class='hunk'>@@ -115,7 +115,6 @@ static struct tps_info tps6507x_pmic_regs[] = {</div><div class='ctx'> struct tps6507x_pmic {</div><div class='ctx'> 	struct regulator_desc desc[TPS6507X_NUM_REGULATOR];</div><div class='ctx'> 	struct tps6507x_dev *mfd;</div><div class='del'>-	struct regulator_dev *rdev[TPS6507X_NUM_REGULATOR];</div><div class='ctx'> 	struct tps_info *info[TPS6507X_NUM_REGULATOR];</div><div class='ctx'> 	struct mutex io_lock;</div><div class='ctx'> };</div><div class='hunk'>@@ -349,7 +348,7 @@ static int tps6507x_pmic_set_voltage_sel(struct regulator_dev *dev,</div><div class='ctx'> 	return tps6507x_pmic_reg_write(tps, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps6507x_pmic_ops = {</div><div class='add'>+static const struct regulator_ops tps6507x_pmic_ops = {</div><div class='ctx'> 	.is_enabled = tps6507x_pmic_is_enabled,</div><div class='ctx'> 	.enable = tps6507x_pmic_enable,</div><div class='ctx'> 	.disable = tps6507x_pmic_disable,</div><div class='hunk'>@@ -359,66 +358,20 @@ static struct regulator_ops tps6507x_pmic_ops = {</div><div class='ctx'> 	.map_voltage = regulator_map_voltage_ascend,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct of_regulator_match tps6507x_matches[] = {</div><div class='del'>-	{ .name = "VDCDC1"},</div><div class='del'>-	{ .name = "VDCDC2"},</div><div class='del'>-	{ .name = "VDCDC3"},</div><div class='del'>-	{ .name = "LDO1"},</div><div class='del'>-	{ .name = "LDO2"},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct tps6507x_board *tps6507x_parse_dt_reg_data(</div><div class='del'>-		struct platform_device *pdev,</div><div class='del'>-		struct of_regulator_match **tps6507x_reg_matches)</div><div class='add'>+static int tps6507x_pmic_of_parse_cb(struct device_node *np,</div><div class='add'>+				     const struct regulator_desc *desc,</div><div class='add'>+				     struct regulator_config *config)</div><div class='ctx'> {</div><div class='del'>-	struct tps6507x_board *tps_board;</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.parent-&gt;of_node;</div><div class='del'>-	struct device_node *regulators;</div><div class='del'>-	struct of_regulator_match *matches;</div><div class='del'>-	struct regulator_init_data *reg_data;</div><div class='del'>-	int idx = 0, count, ret;</div><div class='del'>-</div><div class='del'>-	tps_board = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*tps_board),</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-	if (!tps_board)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	regulators = of_get_child_by_name(np, "regulators");</div><div class='del'>-	if (!regulators) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "regulator node not found\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = ARRAY_SIZE(tps6507x_matches);</div><div class='del'>-	matches = tps6507x_matches;</div><div class='del'>-</div><div class='del'>-	ret = of_regulator_match(&amp;pdev-&gt;dev, regulators, matches, count);</div><div class='del'>-	of_node_put(regulators);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Error parsing regulator init data: %d\n",</div><div class='del'>-			ret);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	struct tps6507x_pmic *tps = config-&gt;driver_data;</div><div class='add'>+	struct tps_info *info = tps-&gt;info[desc-&gt;id];</div><div class='add'>+	u32 prop;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	*tps6507x_reg_matches = matches;</div><div class='del'>-</div><div class='del'>-	reg_data = devm_kzalloc(&amp;pdev-&gt;dev, (sizeof(struct regulator_init_data)</div><div class='del'>-					* TPS6507X_NUM_REGULATOR), GFP_KERNEL);</div><div class='del'>-	if (!reg_data)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	tps_board-&gt;tps6507x_pmic_init_data = reg_data;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; count; idx++) {</div><div class='del'>-		if (!matches[idx].init_data || !matches[idx].of_node)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;reg_data[idx], matches[idx].init_data,</div><div class='del'>-				sizeof(struct regulator_init_data));</div><div class='del'>-</div><div class='del'>-	}</div><div class='add'>+	ret = of_property_read_u32(np, "ti,defdcdc_default", &amp;prop);</div><div class='add'>+	if (!ret)</div><div class='add'>+		info-&gt;defdcdc_default = prop;</div><div class='ctx'> </div><div class='del'>-	return tps_board;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -426,14 +379,11 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct tps_info *info = &amp;tps6507x_pmic_regs[0];</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='del'>-	struct regulator_init_data *init_data;</div><div class='add'>+	struct regulator_init_data *init_data = NULL;</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='ctx'> 	struct tps6507x_pmic *tps;</div><div class='ctx'> 	struct tps6507x_board *tps_board;</div><div class='del'>-	struct of_regulator_match *tps6507x_reg_matches = NULL;</div><div class='ctx'> 	int i;</div><div class='del'>-	int error;</div><div class='del'>-	unsigned int prop;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * tps_board points to pmic related constants</div><div class='hunk'>@@ -441,20 +391,8 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	tps_board = dev_get_platdata(tps6507x_dev-&gt;dev);</div><div class='del'>-	if (IS_ENABLED(CONFIG_OF) &amp;&amp; !tps_board &amp;&amp;</div><div class='del'>-		tps6507x_dev-&gt;dev-&gt;of_node)</div><div class='del'>-		tps_board = tps6507x_parse_dt_reg_data(pdev,</div><div class='del'>-				&amp;tps6507x_reg_matches);</div><div class='del'>-	if (!tps_board)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * init_data points to array of regulator_init structures</div><div class='del'>-	 * coming from the board-evm file.</div><div class='del'>-	 */</div><div class='del'>-	init_data = tps_board-&gt;tps6507x_pmic_init_data;</div><div class='del'>-	if (!init_data)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (tps_board)</div><div class='add'>+		init_data = tps_board-&gt;tps6507x_pmic_init_data;</div><div class='ctx'> </div><div class='ctx'> 	tps = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*tps), GFP_KERNEL);</div><div class='ctx'> 	if (!tps)</div><div class='hunk'>@@ -468,13 +406,16 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {</div><div class='ctx'> 		/* Register the regulators */</div><div class='ctx'> 		tps-&gt;info[i] = info;</div><div class='del'>-		if (init_data-&gt;driver_data) {</div><div class='add'>+		if (init_data &amp;&amp; init_data-&gt;driver_data) {</div><div class='ctx'> 			struct tps6507x_reg_platform_data *data =</div><div class='ctx'> 					init_data-&gt;driver_data;</div><div class='del'>-			tps-&gt;info[i]-&gt;defdcdc_default = data-&gt;defdcdc_default;</div><div class='add'>+			info-&gt;defdcdc_default = data-&gt;defdcdc_default;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tps-&gt;desc[i].name = info-&gt;name;</div><div class='add'>+		tps-&gt;desc[i].of_match = of_match_ptr(info-&gt;name);</div><div class='add'>+		tps-&gt;desc[i].regulators_node = of_match_ptr("regulators");</div><div class='add'>+		tps-&gt;desc[i].of_parse_cb = tps6507x_pmic_of_parse_cb;</div><div class='ctx'> 		tps-&gt;desc[i].id = i;</div><div class='ctx'> 		tps-&gt;desc[i].n_voltages = info-&gt;table_len;</div><div class='ctx'> 		tps-&gt;desc[i].volt_table = info-&gt;table;</div><div class='hunk'>@@ -486,17 +427,6 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 		config.init_data = init_data;</div><div class='ctx'> 		config.driver_data = tps;</div><div class='ctx'> </div><div class='del'>-		if (tps6507x_reg_matches) {</div><div class='del'>-			error = of_property_read_u32(</div><div class='del'>-				tps6507x_reg_matches[i].of_node,</div><div class='del'>-					"ti,defdcdc_default", &amp;prop);</div><div class='del'>-</div><div class='del'>-			if (!error)</div><div class='del'>-				tps-&gt;info[i]-&gt;defdcdc_default = prop;</div><div class='del'>-</div><div class='del'>-			config.of_node = tps6507x_reg_matches[i].of_node;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		rdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;tps-&gt;desc[i],</div><div class='ctx'> 					       &amp;config);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='hunk'>@@ -505,9 +435,6 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 				pdev-&gt;name);</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Save regulator for cleanup */</div><div class='del'>-		tps-&gt;rdev[i] = rdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tps6507x_dev-&gt;pmic = tps;</div><div class='head'>diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c<br/>index 45e96e154690..5a5e9b5bf4be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65086-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65086-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65086-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps65086-regulator.c</a></div><div class='hunk'>@@ -90,8 +90,8 @@ static const struct regulator_linear_range tps65086_buck345_25mv_ranges[] = {</div><div class='ctx'> static const struct regulator_linear_range tps65086_ldoa1_ranges[] = {</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(1350000, 0x0, 0x0, 0),</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(1500000, 0x1, 0x7, 100000),</div><div class='del'>-	REGULATOR_LINEAR_RANGE(2300000, 0x8, 0xA, 100000),</div><div class='del'>-	REGULATOR_LINEAR_RANGE(2700000, 0xB, 0xD, 150000),</div><div class='add'>+	REGULATOR_LINEAR_RANGE(2300000, 0x8, 0xB, 100000),</div><div class='add'>+	REGULATOR_LINEAR_RANGE(2850000, 0xC, 0xD, 150000),</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(3300000, 0xE, 0xE, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/tps65132-regulator.c b/drivers/regulator/tps65132-regulator.c<br/>index 73978dd440f7..6e22f5ebba2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65132-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65132-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65132-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps65132-regulator.c</a></div><div class='hunk'>@@ -55,10 +55,7 @@ struct tps65132_reg_pdata {</div><div class='ctx'> </div><div class='ctx'> struct tps65132_regulator {</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	struct regmap *rmap;</div><div class='del'>-	struct regulator_desc *rdesc[TPS65132_MAX_REGULATORS];</div><div class='ctx'> 	struct tps65132_reg_pdata reg_pdata[TPS65132_MAX_REGULATORS];</div><div class='del'>-	struct regulator_dev *rdev[TPS65132_MAX_REGULATORS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int tps65132_regulator_enable(struct regulator_dev *rdev)</div><div class='hunk'>@@ -120,7 +117,7 @@ static int tps65132_regulator_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps65132_regulator_ops = {</div><div class='add'>+static const struct regulator_ops tps65132_regulator_ops = {</div><div class='ctx'> 	.enable = tps65132_regulator_enable,</div><div class='ctx'> 	.disable = tps65132_regulator_disable,</div><div class='ctx'> 	.is_enabled = tps65132_regulator_is_enabled,</div><div class='hunk'>@@ -196,7 +193,7 @@ static int tps65132_of_parse_cb(struct device_node *np,</div><div class='ctx'> 		.owner = THIS_MODULE,			\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-static struct regulator_desc tps_regs_desc[TPS65132_MAX_REGULATORS] = {</div><div class='add'>+static const struct regulator_desc tps_regs_desc[TPS65132_MAX_REGULATORS] = {</div><div class='ctx'> 	TPS65132_REGULATOR_DESC(VPOS, outp),</div><div class='ctx'> 	TPS65132_REGULATOR_DESC(VNEG, outn),</div><div class='ctx'> };</div><div class='hunk'>@@ -225,6 +222,8 @@ static int tps65132_probe(struct i2c_client *client,</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;client-&gt;dev;</div><div class='ctx'> 	struct tps65132_regulator *tps;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	struct regmap *rmap;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='ctx'> 	int id;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -233,9 +232,9 @@ static int tps65132_probe(struct i2c_client *client,</div><div class='ctx'> 	if (!tps)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	tps-&gt;rmap = devm_regmap_init_i2c(client, &amp;tps65132_regmap_config);</div><div class='del'>-	if (IS_ERR(tps-&gt;rmap)) {</div><div class='del'>-		ret = PTR_ERR(tps-&gt;rmap);</div><div class='add'>+	rmap = devm_regmap_init_i2c(client, &amp;tps65132_regmap_config);</div><div class='add'>+	if (IS_ERR(rmap)) {</div><div class='add'>+		ret = PTR_ERR(rmap);</div><div class='ctx'> 		dev_err(dev, "regmap init failed: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -244,18 +243,16 @@ static int tps65132_probe(struct i2c_client *client,</div><div class='ctx'> 	tps-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	for (id = 0; id &lt; TPS65132_MAX_REGULATORS; ++id) {</div><div class='del'>-		tps-&gt;rdesc[id] = &amp;tps_regs_desc[id];</div><div class='del'>-</div><div class='del'>-		config.regmap = tps-&gt;rmap;</div><div class='add'>+		config.regmap = rmap;</div><div class='ctx'> 		config.dev = dev;</div><div class='ctx'> 		config.driver_data = tps;</div><div class='ctx'> </div><div class='del'>-		tps-&gt;rdev[id] = devm_regulator_register(dev,</div><div class='del'>-					tps-&gt;rdesc[id], &amp;config);</div><div class='del'>-		if (IS_ERR(tps-&gt;rdev[id])) {</div><div class='del'>-			ret = PTR_ERR(tps-&gt;rdev[id]);</div><div class='add'>+		rdev = devm_regulator_register(dev, &amp;tps_regs_desc[id],</div><div class='add'>+					       &amp;config);</div><div class='add'>+		if (IS_ERR(rdev)) {</div><div class='add'>+			ret = PTR_ERR(rdev);</div><div class='ctx'> 			dev_err(dev, "regulator %s register failed: %d\n",</div><div class='del'>-				tps-&gt;rdesc[id]-&gt;name, ret);</div><div class='add'>+				tps_regs_desc[id].name, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c<br/>index d84fab616abf..67ba78da77ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65217-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65217-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65217-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps65217-regulator.c</a></div><div class='hunk'>@@ -58,10 +58,9 @@ static const unsigned int LDO1_VSEL_table[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_linear_range tps65217_uv1_ranges[] = {</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000),</div><div class='del'>-	REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),</div><div class='del'>-	REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),</div><div class='add'>+	REGULATOR_LINEAR_RANGE(1550000, 25, 52, 50000),</div><div class='ctx'> 	REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),</div><div class='del'>-	REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0),</div><div class='add'>+	REGULATOR_LINEAR_RANGE(3300000, 56, 63, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_linear_range tps65217_uv2_ranges[] = {</div><div class='hunk'>@@ -150,7 +149,7 @@ static int tps65217_pmic_set_suspend_disable(struct regulator_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Operations permitted on DCDCx, LDO2, LDO3 and LDO4 */</div><div class='del'>-static struct regulator_ops tps65217_pmic_ops = {</div><div class='add'>+static const struct regulator_ops tps65217_pmic_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= tps65217_pmic_enable,</div><div class='ctx'> 	.disable		= tps65217_pmic_disable,</div><div class='hunk'>@@ -163,7 +162,7 @@ static struct regulator_ops tps65217_pmic_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Operations permitted on LDO1 */</div><div class='del'>-static struct regulator_ops tps65217_pmic_ldo1_ops = {</div><div class='add'>+static const struct regulator_ops tps65217_pmic_ldo1_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= tps65217_pmic_enable,</div><div class='ctx'> 	.disable		= tps65217_pmic_disable,</div><div class='head'>diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c<br/>index 95708d34876b..b72035610013 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65218-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps65218-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps65218-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps65218-regulator.c</a></div><div class='hunk'>@@ -29,7 +29,8 @@</div><div class='ctx'> #include &lt;linux/mfd/tps65218.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TPS65218_REGULATOR(_name, _of, _id, _type, _ops, _n, _vr, _vm, _er, \</div><div class='del'>-			   _em, _cr, _cm, _lr, _nlr, _delay, _fuv, _sr, _sm) \</div><div class='add'>+			   _em, _cr, _cm, _lr, _nlr, _delay, _fuv, _sr, _sm, \</div><div class='add'>+			   _ct, _ncl) \</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.name			= _name,		\</div><div class='ctx'> 		.of_match		= _of,			\</div><div class='hunk'>@@ -42,6 +43,8 @@</div><div class='ctx'> 		.vsel_mask		= _vm,			\</div><div class='ctx'> 		.csel_reg		= _cr,			\</div><div class='ctx'> 		.csel_mask		= _cm,			\</div><div class='add'>+		.curr_table		= _ct,			\</div><div class='add'>+		.n_current_limits	= _ncl,			\</div><div class='ctx'> 		.enable_reg		= _er,			\</div><div class='ctx'> 		.enable_mask		= _em,			\</div><div class='ctx'> 		.volt_table		= NULL,			\</div><div class='hunk'>@@ -162,7 +165,7 @@ static int tps65218_pmic_set_suspend_disable(struct regulator_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Operations permitted on DCDC1, DCDC2 */</div><div class='del'>-static struct regulator_ops tps65218_dcdc12_ops = {</div><div class='add'>+static const struct regulator_ops tps65218_dcdc12_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= tps65218_pmic_enable,</div><div class='ctx'> 	.disable		= tps65218_pmic_disable,</div><div class='hunk'>@@ -176,7 +179,7 @@ static struct regulator_ops tps65218_dcdc12_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Operations permitted on DCDC3, DCDC4 and LDO1 */</div><div class='del'>-static struct regulator_ops tps65218_ldo1_dcdc34_ops = {</div><div class='add'>+static const struct regulator_ops tps65218_ldo1_dcdc34_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= tps65218_pmic_enable,</div><div class='ctx'> 	.disable		= tps65218_pmic_disable,</div><div class='hunk'>@@ -188,8 +191,7 @@ static struct regulator_ops tps65218_ldo1_dcdc34_ops = {</div><div class='ctx'> 	.set_suspend_disable	= tps65218_pmic_set_suspend_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const int ls3_currents[] = { 100000, 200000, 500000, 1000000 };</div><div class='del'>-</div><div class='add'>+static const unsigned int ls3_currents[] = { 100000, 200000, 500000, 1000000 };</div><div class='ctx'> </div><div class='ctx'> static int tps65218_pmic_set_input_current_lim(struct regulator_dev *dev,</div><div class='ctx'> 					       int lim_uA)</div><div class='hunk'>@@ -229,33 +231,17 @@ static int tps65218_pmic_set_current_limit(struct regulator_dev *dev,</div><div class='ctx'> 				 TPS65218_PROTECT_L1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tps65218_pmic_get_current_limit(struct regulator_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	unsigned int index;</div><div class='del'>-	struct tps65218 *tps = rdev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	retval = regmap_read(tps-&gt;regmap, dev-&gt;desc-&gt;csel_reg, &amp;index);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	index = (index &amp; dev-&gt;desc-&gt;csel_mask) &gt;&gt;</div><div class='del'>-					 __builtin_ctz(dev-&gt;desc-&gt;csel_mask);</div><div class='del'>-</div><div class='del'>-	return ls3_currents[index];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct regulator_ops tps65218_ls23_ops = {</div><div class='add'>+static const struct regulator_ops tps65218_ls23_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= tps65218_pmic_enable,</div><div class='ctx'> 	.disable		= tps65218_pmic_disable,</div><div class='ctx'> 	.set_input_current_limit = tps65218_pmic_set_input_current_lim,</div><div class='ctx'> 	.set_current_limit	= tps65218_pmic_set_current_limit,</div><div class='del'>-	.get_current_limit	= tps65218_pmic_get_current_limit,</div><div class='add'>+	.get_current_limit	= regulator_get_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Operations permitted on DCDC5, DCDC6 */</div><div class='del'>-static struct regulator_ops tps65218_dcdc56_pmic_ops = {</div><div class='add'>+static const struct regulator_ops tps65218_dcdc56_pmic_ops = {</div><div class='ctx'> 	.is_enabled		= regulator_is_enabled_regmap,</div><div class='ctx'> 	.enable			= tps65218_pmic_enable,</div><div class='ctx'> 	.disable		= tps65218_pmic_disable,</div><div class='hunk'>@@ -270,53 +256,57 @@ static const struct regulator_desc regulators[] = {</div><div class='ctx'> 			   TPS65218_CONTROL_DCDC1_MASK, TPS65218_REG_ENABLE1,</div><div class='ctx'> 			   TPS65218_ENABLE1_DC1_EN, 0, 0, dcdc1_dcdc2_ranges,</div><div class='ctx'> 			   2, 4000, 0, TPS65218_REG_SEQ3,</div><div class='del'>-			   TPS65218_SEQ3_DC1_SEQ_MASK),</div><div class='add'>+			   TPS65218_SEQ3_DC1_SEQ_MASK, NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("DCDC2", "regulator-dcdc2", TPS65218_DCDC_2,</div><div class='ctx'> 			   REGULATOR_VOLTAGE, tps65218_dcdc12_ops, 64,</div><div class='ctx'> 			   TPS65218_REG_CONTROL_DCDC2,</div><div class='ctx'> 			   TPS65218_CONTROL_DCDC2_MASK, TPS65218_REG_ENABLE1,</div><div class='ctx'> 			   TPS65218_ENABLE1_DC2_EN, 0, 0, dcdc1_dcdc2_ranges,</div><div class='ctx'> 			   2, 4000, 0, TPS65218_REG_SEQ3,</div><div class='del'>-			   TPS65218_SEQ3_DC2_SEQ_MASK),</div><div class='add'>+			   TPS65218_SEQ3_DC2_SEQ_MASK, NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("DCDC3", "regulator-dcdc3", TPS65218_DCDC_3,</div><div class='ctx'> 			   REGULATOR_VOLTAGE, tps65218_ldo1_dcdc34_ops, 64,</div><div class='ctx'> 			   TPS65218_REG_CONTROL_DCDC3,</div><div class='ctx'> 			   TPS65218_CONTROL_DCDC3_MASK, TPS65218_REG_ENABLE1,</div><div class='ctx'> 			   TPS65218_ENABLE1_DC3_EN, 0, 0, ldo1_dcdc3_ranges, 2,</div><div class='del'>-			   0, 0, TPS65218_REG_SEQ4, TPS65218_SEQ4_DC3_SEQ_MASK),</div><div class='add'>+			   0, 0, TPS65218_REG_SEQ4, TPS65218_SEQ4_DC3_SEQ_MASK,</div><div class='add'>+			   NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("DCDC4", "regulator-dcdc4", TPS65218_DCDC_4,</div><div class='ctx'> 			   REGULATOR_VOLTAGE, tps65218_ldo1_dcdc34_ops, 53,</div><div class='ctx'> 			   TPS65218_REG_CONTROL_DCDC4,</div><div class='ctx'> 			   TPS65218_CONTROL_DCDC4_MASK, TPS65218_REG_ENABLE1,</div><div class='ctx'> 			   TPS65218_ENABLE1_DC4_EN, 0, 0, dcdc4_ranges, 2,</div><div class='del'>-			   0, 0, TPS65218_REG_SEQ4, TPS65218_SEQ4_DC4_SEQ_MASK),</div><div class='add'>+			   0, 0, TPS65218_REG_SEQ4, TPS65218_SEQ4_DC4_SEQ_MASK,</div><div class='add'>+			   NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("DCDC5", "regulator-dcdc5", TPS65218_DCDC_5,</div><div class='ctx'> 			   REGULATOR_VOLTAGE, tps65218_dcdc56_pmic_ops, 1, -1,</div><div class='ctx'> 			   -1, TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC5_EN, 0,</div><div class='ctx'> 			   0, NULL, 0, 0, 1000000, TPS65218_REG_SEQ5,</div><div class='del'>-			   TPS65218_SEQ5_DC5_SEQ_MASK),</div><div class='add'>+			   TPS65218_SEQ5_DC5_SEQ_MASK, NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("DCDC6", "regulator-dcdc6", TPS65218_DCDC_6,</div><div class='ctx'> 			   REGULATOR_VOLTAGE, tps65218_dcdc56_pmic_ops, 1, -1,</div><div class='ctx'> 			   -1, TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC6_EN, 0,</div><div class='ctx'> 			   0, NULL, 0, 0, 1800000, TPS65218_REG_SEQ5,</div><div class='del'>-			   TPS65218_SEQ5_DC6_SEQ_MASK),</div><div class='add'>+			   TPS65218_SEQ5_DC6_SEQ_MASK, NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("LDO1", "regulator-ldo1", TPS65218_LDO_1,</div><div class='ctx'> 			   REGULATOR_VOLTAGE, tps65218_ldo1_dcdc34_ops, 64,</div><div class='ctx'> 			   TPS65218_REG_CONTROL_LDO1,</div><div class='ctx'> 			   TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,</div><div class='ctx'> 			   TPS65218_ENABLE2_LDO1_EN, 0, 0, ldo1_dcdc3_ranges,</div><div class='ctx'> 			   2, 0, 0, TPS65218_REG_SEQ6,</div><div class='del'>-			   TPS65218_SEQ6_LDO1_SEQ_MASK),</div><div class='add'>+			   TPS65218_SEQ6_LDO1_SEQ_MASK, NULL, 0),</div><div class='ctx'> 	TPS65218_REGULATOR("LS2", "regulator-ls2", TPS65218_LS_2,</div><div class='ctx'> 			   REGULATOR_CURRENT, tps65218_ls23_ops, 0, 0, 0,</div><div class='ctx'> 			   TPS65218_REG_ENABLE2, TPS65218_ENABLE2_LS2_EN,</div><div class='ctx'> 			   TPS65218_REG_CONFIG2, TPS65218_CONFIG2_LS2ILIM_MASK,</div><div class='del'>-			   NULL, 0, 0, 0, 0, 0),</div><div class='add'>+			   NULL, 0, 0, 0, 0, 0, ls3_currents,</div><div class='add'>+			   ARRAY_SIZE(ls3_currents)),</div><div class='ctx'> 	TPS65218_REGULATOR("LS3", "regulator-ls3", TPS65218_LS_3,</div><div class='ctx'> 			   REGULATOR_CURRENT, tps65218_ls23_ops, 0, 0, 0,</div><div class='ctx'> 			   TPS65218_REG_ENABLE2, TPS65218_ENABLE2_LS3_EN,</div><div class='ctx'> 			   TPS65218_REG_CONFIG2, TPS65218_CONFIG2_LS3ILIM_MASK,</div><div class='del'>-			   NULL, 0, 0, 0, 0, 0),</div><div class='add'>+			   NULL, 0, 0, 0, 0, 0, ls3_currents,</div><div class='add'>+			   ARRAY_SIZE(ls3_currents)),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int tps65218_regulator_probe(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c<br/>index 67cac2682f50..740aeccdfb1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps6524x-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps6524x-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps6524x-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps6524x-regulator.c</a></div><div class='hunk'>@@ -137,7 +137,6 @@ struct tps6524x {</div><div class='ctx'> 	struct spi_device	*spi;</div><div class='ctx'> 	struct mutex		lock;</div><div class='ctx'> 	struct regulator_desc	desc[N_REGULATORS];</div><div class='del'>-	struct regulator_dev	*rdev[N_REGULATORS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __read_reg(struct tps6524x *hw, int reg)</div><div class='hunk'>@@ -565,7 +564,7 @@ static int is_supply_enabled(struct regulator_dev *rdev)</div><div class='ctx'> 	return read_field(hw, &amp;info-&gt;enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops regulator_ops = {</div><div class='add'>+static const struct regulator_ops regulator_ops = {</div><div class='ctx'> 	.is_enabled		= is_supply_enabled,</div><div class='ctx'> 	.enable			= enable_supply,</div><div class='ctx'> 	.disable		= disable_supply,</div><div class='hunk'>@@ -584,6 +583,7 @@ static int pmic_probe(struct spi_device *spi)</div><div class='ctx'> 	const struct supply_info *info = supply_info;</div><div class='ctx'> 	struct regulator_init_data *init_data;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	init_data = dev_get_platdata(dev);</div><div class='hunk'>@@ -616,10 +616,9 @@ static int pmic_probe(struct spi_device *spi)</div><div class='ctx'> 		config.init_data = init_data;</div><div class='ctx'> 		config.driver_data = hw;</div><div class='ctx'> </div><div class='del'>-		hw-&gt;rdev[i] = devm_regulator_register(dev, &amp;hw-&gt;desc[i],</div><div class='del'>-						      &amp;config);</div><div class='del'>-		if (IS_ERR(hw-&gt;rdev[i]))</div><div class='del'>-			return PTR_ERR(hw-&gt;rdev[i]);</div><div class='add'>+		rdev = devm_regulator_register(dev, &amp;hw-&gt;desc[i], &amp;config);</div><div class='add'>+		if (IS_ERR(rdev))</div><div class='add'>+			return PTR_ERR(rdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c<br/>index 1001147404c3..85a6a8ca8c1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps80031-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/tps80031-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/tps80031-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/tps80031-regulator.c</a></div><div class='hunk'>@@ -1,27 +1,13 @@</div><div class='del'>-/*</div><div class='del'>- * tps80031-regulator.c -- TI TPS80031 regulator driver.</div><div class='del'>- *</div><div class='del'>- * Regulator driver for TI TPS80031/TPS80032 Fully Integrated Power</div><div class='del'>- * Management with Power Path and Battery Charger.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012, NVIDIA Corporation.</div><div class='del'>- *</div><div class='del'>- * Author: Laxman Dewangan &lt;ldewangan@nvidia.com&gt;</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 kind,</div><div class='del'>- * whether express or implied; 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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// tps80031-regulator.c -- TI TPS80031 regulator driver.</div><div class='add'>+//</div><div class='add'>+// Regulator driver for TI TPS80031/TPS80032 Fully Integrated Power</div><div class='add'>+// Management with Power Path and Battery Charger.</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2012, NVIDIA Corporation.</div><div class='add'>+//</div><div class='add'>+// Author: Laxman Dewangan &lt;ldewangan@nvidia.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -85,7 +71,6 @@ struct tps80031_regulator_info {</div><div class='ctx'> </div><div class='ctx'> struct tps80031_regulator {</div><div class='ctx'> 	struct device			*dev;</div><div class='del'>-	struct regulator_dev		*rdev;</div><div class='ctx'> 	struct tps80031_regulator_info	*rinfo;</div><div class='ctx'> </div><div class='ctx'> 	u8				device_flags;</div><div class='hunk'>@@ -155,7 +140,7 @@ static int tps80031_reg_disable(struct regulator_dev *rdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* DCDC voltages for the selector of 58 to 63 */</div><div class='del'>-static int tps80031_dcdc_voltages[4][5] = {</div><div class='add'>+static const int tps80031_dcdc_voltages[4][5] = {</div><div class='ctx'> 	{ 1350, 1500, 1800, 1900, 2100},</div><div class='ctx'> 	{ 1350, 1500, 1800, 1900, 2100},</div><div class='ctx'> 	{ 2084, 2315, 2778, 2932, 3241},</div><div class='hunk'>@@ -378,7 +363,7 @@ static int tps80031_vbus_disable(struct regulator_dev *rdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps80031_dcdc_ops = {</div><div class='add'>+static const struct regulator_ops tps80031_dcdc_ops = {</div><div class='ctx'> 	.list_voltage		= tps80031_dcdc_list_voltage,</div><div class='ctx'> 	.set_voltage_sel	= tps80031_dcdc_set_voltage_sel,</div><div class='ctx'> 	.get_voltage_sel	= tps80031_dcdc_get_voltage_sel,</div><div class='hunk'>@@ -387,7 +372,7 @@ static struct regulator_ops tps80031_dcdc_ops = {</div><div class='ctx'> 	.is_enabled	= tps80031_reg_is_enabled,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps80031_ldo_ops = {</div><div class='add'>+static const struct regulator_ops tps80031_ldo_ops = {</div><div class='ctx'> 	.list_voltage		= tps80031_ldo_list_voltage,</div><div class='ctx'> 	.map_voltage		= tps80031_ldo_map_voltage,</div><div class='ctx'> 	.set_voltage_sel	= regulator_set_voltage_sel_regmap,</div><div class='hunk'>@@ -397,18 +382,18 @@ static struct regulator_ops tps80031_ldo_ops = {</div><div class='ctx'> 	.is_enabled		= tps80031_reg_is_enabled,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps80031_vbus_sw_ops = {</div><div class='add'>+static const struct regulator_ops tps80031_vbus_sw_ops = {</div><div class='ctx'> 	.list_voltage	= regulator_list_voltage_linear,</div><div class='ctx'> 	.enable		= tps80031_vbus_enable,</div><div class='ctx'> 	.disable	= tps80031_vbus_disable,</div><div class='ctx'> 	.is_enabled	= tps80031_vbus_is_enabled,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps80031_vbus_hw_ops = {</div><div class='add'>+static const struct regulator_ops tps80031_vbus_hw_ops = {</div><div class='ctx'> 	.list_voltage	= regulator_list_voltage_linear,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops tps80031_ext_reg_ops = {</div><div class='add'>+static const struct regulator_ops tps80031_ext_reg_ops = {</div><div class='ctx'> 	.list_voltage	= regulator_list_voltage_linear,</div><div class='ctx'> 	.enable		= tps80031_reg_enable,</div><div class='ctx'> 	.disable	= tps80031_reg_disable,</div><div class='hunk'>@@ -736,7 +721,6 @@ static int tps80031_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 					ri-&gt;rinfo-&gt;desc.name);</div><div class='ctx'> 			return PTR_ERR(rdev);</div><div class='ctx'> 		}</div><div class='del'>-		ri-&gt;rdev = rdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, pmic);</div><div class='head'>diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c<br/>index 402ea43c77d1..cdd81e1985ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/twl-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/twl-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/twl-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/twl-regulator.c</a></div><div class='hunk'>@@ -392,7 +392,7 @@ static int twl4030ldo_get_voltage_sel(struct regulator_dev *rdev)</div><div class='ctx'> 	return vsel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops twl4030ldo_ops = {</div><div class='add'>+static const struct regulator_ops twl4030ldo_ops = {</div><div class='ctx'> 	.list_voltage	= twl4030ldo_list_voltage,</div><div class='ctx'> </div><div class='ctx'> 	.set_voltage_sel = twl4030ldo_set_voltage_sel,</div><div class='hunk'>@@ -430,14 +430,14 @@ static int twl4030smps_get_voltage(struct regulator_dev *rdev)</div><div class='ctx'> 	return vsel * 12500 + 600000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops twl4030smps_ops = {</div><div class='add'>+static const struct regulator_ops twl4030smps_ops = {</div><div class='ctx'> 	.set_voltage	= twl4030smps_set_voltage,</div><div class='ctx'> 	.get_voltage	= twl4030smps_get_voltage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops twl4030fixed_ops = {</div><div class='add'>+static const struct regulator_ops twl4030fixed_ops = {</div><div class='ctx'> 	.list_voltage	= regulator_list_voltage_linear,</div><div class='ctx'> </div><div class='ctx'> 	.enable		= twl4030reg_enable,</div><div class='head'>diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c<br/>index 78de002037c7..259864520a06 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/vctrl-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/vctrl-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/vctrl-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/vctrl-regulator.c</a></div><div class='hunk'>@@ -334,10 +334,8 @@ static int vctrl_init_vtable(struct platform_device *pdev)</div><div class='ctx'> 		ctrl_uV = regulator_list_voltage(ctrl_reg, i);</div><div class='ctx'> </div><div class='ctx'> 		if (ctrl_uV &lt; vrange_ctrl-&gt;min_uV ||</div><div class='del'>-		    ctrl_uV &gt; vrange_ctrl-&gt;max_uV) {</div><div class='add'>+		    ctrl_uV &gt; vrange_ctrl-&gt;max_uV)</div><div class='ctx'> 			rdesc-&gt;n_voltages--;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rdesc-&gt;n_voltages == 0) {</div><div class='head'>diff --git a/drivers/regulator/vexpress-regulator.c b/drivers/regulator/vexpress-regulator.c<br/>index c810cbbd463f..1235f46e633e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/vexpress-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/vexpress-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/vexpress-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/vexpress-regulator.c</a></div><div class='hunk'>@@ -1,15 +1,6 @@</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'>- * 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'>- * Copyright (C) 2012 ARM Limited</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2012 ARM Limited</div><div class='ctx'> </div><div class='ctx'> #define DRVNAME "vexpress-regulator"</div><div class='ctx'> #define pr_fmt(fmt) DRVNAME ": " fmt</div><div class='hunk'>@@ -23,17 +14,10 @@</div><div class='ctx'> #include &lt;linux/regulator/of_regulator.h&gt;</div><div class='ctx'> #include &lt;linux/vexpress.h&gt;</div><div class='ctx'> </div><div class='del'>-struct vexpress_regulator {</div><div class='del'>-	struct regulator_desc desc;</div><div class='del'>-	struct regulator_dev *regdev;</div><div class='del'>-	struct regmap *regmap;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int vexpress_regulator_get_voltage(struct regulator_dev *regdev)</div><div class='ctx'> {</div><div class='del'>-	struct vexpress_regulator *reg = rdev_get_drvdata(regdev);</div><div class='del'>-	u32 uV;</div><div class='del'>-	int err = regmap_read(reg-&gt;regmap, 0, &amp;uV);</div><div class='add'>+	unsigned int uV;</div><div class='add'>+	int err = regmap_read(regdev-&gt;regmap, 0, &amp;uV);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : uV;</div><div class='ctx'> }</div><div class='hunk'>@@ -41,60 +25,58 @@ static int vexpress_regulator_get_voltage(struct regulator_dev *regdev)</div><div class='ctx'> static int vexpress_regulator_set_voltage(struct regulator_dev *regdev,</div><div class='ctx'> 		int min_uV, int max_uV, unsigned *selector)</div><div class='ctx'> {</div><div class='del'>-	struct vexpress_regulator *reg = rdev_get_drvdata(regdev);</div><div class='del'>-</div><div class='del'>-	return regmap_write(reg-&gt;regmap, 0, min_uV);</div><div class='add'>+	return regmap_write(regdev-&gt;regmap, 0, min_uV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops vexpress_regulator_ops_ro = {</div><div class='add'>+static const struct regulator_ops vexpress_regulator_ops_ro = {</div><div class='ctx'> 	.get_voltage = vexpress_regulator_get_voltage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_ops vexpress_regulator_ops = {</div><div class='add'>+static const struct regulator_ops vexpress_regulator_ops = {</div><div class='ctx'> 	.get_voltage = vexpress_regulator_get_voltage,</div><div class='ctx'> 	.set_voltage = vexpress_regulator_set_voltage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int vexpress_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct vexpress_regulator *reg;</div><div class='add'>+	struct regulator_desc *desc;</div><div class='ctx'> 	struct regulator_init_data *init_data;</div><div class='ctx'> 	struct regulator_config config = { };</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	struct regmap *regmap;</div><div class='ctx'> </div><div class='del'>-	reg = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*reg), GFP_KERNEL);</div><div class='del'>-	if (!reg)</div><div class='add'>+	desc = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*desc), GFP_KERNEL);</div><div class='add'>+	if (!desc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	reg-&gt;regmap = devm_regmap_init_vexpress_config(&amp;pdev-&gt;dev);</div><div class='del'>-	if (IS_ERR(reg-&gt;regmap))</div><div class='del'>-		return PTR_ERR(reg-&gt;regmap);</div><div class='add'>+	regmap = devm_regmap_init_vexpress_config(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(regmap))</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='ctx'> </div><div class='del'>-	reg-&gt;desc.name = dev_name(&amp;pdev-&gt;dev);</div><div class='del'>-	reg-&gt;desc.type = REGULATOR_VOLTAGE;</div><div class='del'>-	reg-&gt;desc.owner = THIS_MODULE;</div><div class='del'>-	reg-&gt;desc.continuous_voltage_range = true;</div><div class='add'>+	desc-&gt;name = dev_name(&amp;pdev-&gt;dev);</div><div class='add'>+	desc-&gt;type = REGULATOR_VOLTAGE;</div><div class='add'>+	desc-&gt;owner = THIS_MODULE;</div><div class='add'>+	desc-&gt;continuous_voltage_range = true;</div><div class='ctx'> </div><div class='ctx'> 	init_data = of_get_regulator_init_data(&amp;pdev-&gt;dev, pdev-&gt;dev.of_node,</div><div class='del'>-					       &amp;reg-&gt;desc);</div><div class='add'>+					       desc);</div><div class='ctx'> 	if (!init_data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	init_data-&gt;constraints.apply_uV = 0;</div><div class='ctx'> 	if (init_data-&gt;constraints.min_uV &amp;&amp; init_data-&gt;constraints.max_uV)</div><div class='del'>-		reg-&gt;desc.ops = &amp;vexpress_regulator_ops;</div><div class='add'>+		desc-&gt;ops = &amp;vexpress_regulator_ops;</div><div class='ctx'> 	else</div><div class='del'>-		reg-&gt;desc.ops = &amp;vexpress_regulator_ops_ro;</div><div class='add'>+		desc-&gt;ops = &amp;vexpress_regulator_ops_ro;</div><div class='ctx'> </div><div class='add'>+	config.regmap = regmap;</div><div class='ctx'> 	config.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	config.init_data = init_data;</div><div class='del'>-	config.driver_data = reg;</div><div class='ctx'> 	config.of_node = pdev-&gt;dev.of_node;</div><div class='ctx'> </div><div class='del'>-	reg-&gt;regdev = devm_regulator_register(&amp;pdev-&gt;dev, &amp;reg-&gt;desc, &amp;config);</div><div class='del'>-	if (IS_ERR(reg-&gt;regdev))</div><div class='del'>-		return PTR_ERR(reg-&gt;regdev);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, reg);</div><div class='add'>+	rdev = devm_regulator_register(&amp;pdev-&gt;dev, desc, &amp;config);</div><div class='add'>+	if (IS_ERR(rdev))</div><div class='add'>+		return PTR_ERR(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c<br/>index 12b422373580..b422eef97b77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm831x-dcdc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm831x-dcdc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm831x-dcdc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/wm831x-dcdc.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * wm831x-dcdc.c  --  DC-DC buck convertor driver for the WM831x series</div><div class='del'>- *</div><div class='del'>- * Copyright 2009 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// wm831x-dcdc.c  --  DC-DC buck converter driver for the WM831x series</div><div class='add'>+//</div><div class='add'>+// Copyright 2009 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -183,9 +178,11 @@ static irqreturn_t wm831x_dcdc_uv_irq(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm831x_dcdc *dcdc = data;</div><div class='ctx'> </div><div class='add'>+	regulator_lock(dcdc-&gt;regulator);</div><div class='ctx'> 	regulator_notifier_call_chain(dcdc-&gt;regulator,</div><div class='ctx'> 				      REGULATOR_EVENT_UNDER_VOLTAGE,</div><div class='ctx'> 				      NULL);</div><div class='add'>+	regulator_unlock(dcdc-&gt;regulator);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -194,9 +191,11 @@ static irqreturn_t wm831x_dcdc_oc_irq(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm831x_dcdc *dcdc = data;</div><div class='ctx'> </div><div class='add'>+	regulator_lock(dcdc-&gt;regulator);</div><div class='ctx'> 	regulator_notifier_call_chain(dcdc-&gt;regulator,</div><div class='ctx'> 				      REGULATOR_EVENT_OVER_CURRENT,</div><div class='ctx'> 				      NULL);</div><div class='add'>+	regulator_unlock(dcdc-&gt;regulator);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c<br/>index 6dd891d7eee3..ff3d2bf50410 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm831x-isink.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm831x-isink.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm831x-isink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/wm831x-isink.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * wm831x-isink.c  --  Current sink driver for the WM831x series</div><div class='del'>- *</div><div class='del'>- * Copyright 2009 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// wm831x-isink.c  --  Current sink driver for the WM831x series</div><div class='add'>+//</div><div class='add'>+// Copyright 2009 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -92,57 +87,23 @@ static int wm831x_isink_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wm831x_isink_set_current(struct regulator_dev *rdev,</div><div class='del'>-				    int min_uA, int max_uA)</div><div class='del'>-{</div><div class='del'>-	struct wm831x_isink *isink = rdev_get_drvdata(rdev);</div><div class='del'>-	struct wm831x *wm831x = isink-&gt;wm831x;</div><div class='del'>-	int ret, i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm831x_isinkv_values); i++) {</div><div class='del'>-		int val = wm831x_isinkv_values[i];</div><div class='del'>-		if (min_uA &lt;= val &amp;&amp; val &lt;= max_uA) {</div><div class='del'>-			ret = wm831x_set_bits(wm831x, isink-&gt;reg,</div><div class='del'>-					      WM831X_CS1_ISEL_MASK, i);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wm831x_isink_get_current(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	struct wm831x_isink *isink = rdev_get_drvdata(rdev);</div><div class='del'>-	struct wm831x *wm831x = isink-&gt;wm831x;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = wm831x_reg_read(wm831x, isink-&gt;reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret &amp;= WM831X_CS1_ISEL_MASK;</div><div class='del'>-	if (ret &gt; WM831X_ISINK_MAX_ISEL)</div><div class='del'>-		ret = WM831X_ISINK_MAX_ISEL;</div><div class='del'>-</div><div class='del'>-	return wm831x_isinkv_values[ret];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct regulator_ops wm831x_isink_ops = {</div><div class='ctx'> 	.is_enabled = wm831x_isink_is_enabled,</div><div class='ctx'> 	.enable = wm831x_isink_enable,</div><div class='ctx'> 	.disable = wm831x_isink_disable,</div><div class='del'>-	.set_current_limit = wm831x_isink_set_current,</div><div class='del'>-	.get_current_limit = wm831x_isink_get_current,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t wm831x_isink_irq(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm831x_isink *isink = data;</div><div class='ctx'> </div><div class='add'>+	regulator_lock(isink-&gt;regulator);</div><div class='ctx'> 	regulator_notifier_call_chain(isink-&gt;regulator,</div><div class='ctx'> 				      REGULATOR_EVENT_OVER_CURRENT,</div><div class='ctx'> 				      NULL);</div><div class='add'>+	regulator_unlock(isink-&gt;regulator);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -187,10 +148,15 @@ static int wm831x_isink_probe(struct platform_device *pdev)</div><div class='ctx'> 	isink-&gt;desc.ops = &amp;wm831x_isink_ops;</div><div class='ctx'> 	isink-&gt;desc.type = REGULATOR_CURRENT;</div><div class='ctx'> 	isink-&gt;desc.owner = THIS_MODULE;</div><div class='add'>+	isink-&gt;desc.curr_table = wm831x_isinkv_values,</div><div class='add'>+	isink-&gt;desc.n_current_limits = ARRAY_SIZE(wm831x_isinkv_values),</div><div class='add'>+	isink-&gt;desc.csel_reg = isink-&gt;reg,</div><div class='add'>+	isink-&gt;desc.csel_mask = WM831X_CS1_ISEL_MASK,</div><div class='ctx'> </div><div class='ctx'> 	config.dev = pdev-&gt;dev.parent;</div><div class='ctx'> 	config.init_data = pdata-&gt;isink[id];</div><div class='ctx'> 	config.driver_data = isink;</div><div class='add'>+	config.regmap = wm831x-&gt;regmap;</div><div class='ctx'> </div><div class='ctx'> 	isink-&gt;regulator = devm_regulator_register(&amp;pdev-&gt;dev, &amp;isink-&gt;desc,</div><div class='ctx'> 						   &amp;config);</div><div class='head'>diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c<br/>index e4a6f888484e..56754686c982 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm831x-ldo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm831x-ldo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm831x-ldo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/wm831x-ldo.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * wm831x-ldo.c  --  LDO driver for the WM831x series</div><div class='del'>- *</div><div class='del'>- * Copyright 2009 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// wm831x-ldo.c  --  LDO driver for the WM831x series</div><div class='add'>+//</div><div class='add'>+// Copyright 2009 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -51,9 +46,11 @@ static irqreturn_t wm831x_ldo_uv_irq(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm831x_ldo *ldo = data;</div><div class='ctx'> </div><div class='add'>+	regulator_lock(ldo-&gt;regulator);</div><div class='ctx'> 	regulator_notifier_call_chain(ldo-&gt;regulator,</div><div class='ctx'> 				      REGULATOR_EVENT_UNDER_VOLTAGE,</div><div class='ctx'> 				      NULL);</div><div class='add'>+	regulator_unlock(ldo-&gt;regulator);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c<br/>index a1c7dfee5c37..56d6168a888d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm8350-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm8350-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm8350-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/wm8350-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,11 @@</div><div class='del'>-/*</div><div class='del'>- * wm8350.c  --  Voltage and current regulation for the Wolfson WM8350 PMIC</div><div class='del'>- *</div><div class='del'>- * Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Liam Girdwood</div><div class='del'>- *         linux@wolfsonmicro.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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// wm8350.c  --  Voltage and current regulation for the Wolfson WM8350 PMIC</div><div class='add'>+//</div><div class='add'>+// Copyright 2007, 2008 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Liam Girdwood</div><div class='add'>+//         linux@wolfsonmicro.com</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -28,7 +23,7 @@</div><div class='ctx'> #define WM8350_DCDC_MAX_VSEL 0x66</div><div class='ctx'> </div><div class='ctx'> /* Microamps */</div><div class='del'>-static const int isink_cur[] = {</div><div class='add'>+static const unsigned int isink_cur[] = {</div><div class='ctx'> 	4,</div><div class='ctx'> 	5,</div><div class='ctx'> 	6,</div><div class='hunk'>@@ -95,73 +90,6 @@ static const int isink_cur[] = {</div><div class='ctx'> 	223191</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int get_isink_val(int min_uA, int max_uA, u16 *setting)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(isink_cur); i++) {</div><div class='del'>-		if (min_uA &lt;= isink_cur[i] &amp;&amp; max_uA &gt;= isink_cur[i]) {</div><div class='del'>-			*setting = i;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wm8350_isink_set_current(struct regulator_dev *rdev, int min_uA,</div><div class='del'>-	int max_uA)</div><div class='del'>-{</div><div class='del'>-	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='del'>-	int isink = rdev_get_id(rdev);</div><div class='del'>-	u16 val, setting;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = get_isink_val(min_uA, max_uA, &amp;setting);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	switch (isink) {</div><div class='del'>-	case WM8350_ISINK_A:</div><div class='del'>-		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &amp;</div><div class='del'>-		    ~WM8350_CS1_ISEL_MASK;</div><div class='del'>-		wm8350_reg_write(wm8350, WM8350_CURRENT_SINK_DRIVER_A,</div><div class='del'>-				 val | setting);</div><div class='del'>-		break;</div><div class='del'>-	case WM8350_ISINK_B:</div><div class='del'>-		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &amp;</div><div class='del'>-		    ~WM8350_CS1_ISEL_MASK;</div><div class='del'>-		wm8350_reg_write(wm8350, WM8350_CURRENT_SINK_DRIVER_B,</div><div class='del'>-				 val | setting);</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 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wm8350_isink_get_current(struct regulator_dev *rdev)</div><div class='del'>-{</div><div class='del'>-	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);</div><div class='del'>-	int isink = rdev_get_id(rdev);</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	switch (isink) {</div><div class='del'>-	case WM8350_ISINK_A:</div><div class='del'>-		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &amp;</div><div class='del'>-		    WM8350_CS1_ISEL_MASK;</div><div class='del'>-		break;</div><div class='del'>-	case WM8350_ISINK_B:</div><div class='del'>-		val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &amp;</div><div class='del'>-		    WM8350_CS1_ISEL_MASK;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return isink_cur[val];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* turn on ISINK followed by DCDC */</div><div class='ctx'> static int wm8350_isink_enable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -982,8 +910,8 @@ static const struct regulator_ops wm8350_ldo_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct regulator_ops wm8350_isink_ops = {</div><div class='del'>-	.set_current_limit = wm8350_isink_set_current,</div><div class='del'>-	.get_current_limit = wm8350_isink_get_current,</div><div class='add'>+	.set_current_limit = regulator_set_current_limit_regmap,</div><div class='add'>+	.get_current_limit = regulator_get_current_limit_regmap,</div><div class='ctx'> 	.enable = wm8350_isink_enable,</div><div class='ctx'> 	.disable = wm8350_isink_disable,</div><div class='ctx'> 	.is_enabled = wm8350_isink_is_enabled,</div><div class='hunk'>@@ -1138,6 +1066,10 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {</div><div class='ctx'> 		.irq = WM8350_IRQ_CS1,</div><div class='ctx'> 		.type = REGULATOR_CURRENT,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='add'>+		.curr_table = isink_cur,</div><div class='add'>+		.n_current_limits = ARRAY_SIZE(isink_cur),</div><div class='add'>+		.csel_reg = WM8350_CURRENT_SINK_DRIVER_A,</div><div class='add'>+		.csel_mask = WM8350_CS1_ISEL_MASK,</div><div class='ctx'> 	 },</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "ISINKB",</div><div class='hunk'>@@ -1146,6 +1078,10 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {</div><div class='ctx'> 		.irq = WM8350_IRQ_CS2,</div><div class='ctx'> 		.type = REGULATOR_CURRENT,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='add'>+		.curr_table = isink_cur,</div><div class='add'>+		.n_current_limits = ARRAY_SIZE(isink_cur),</div><div class='add'>+		.csel_reg = WM8350_CURRENT_SINK_DRIVER_B,</div><div class='add'>+		.csel_mask = WM8350_CS2_ISEL_MASK,</div><div class='ctx'> 	 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c<br/>index fb1837657b64..6f331b51e479 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm8400-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm8400-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm8400-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/wm8400-regulator.c</a></div><div class='hunk'>@@ -1,16 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Regulator support for WM8400</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</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; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// Regulator support for WM8400</div><div class='add'>+//</div><div class='add'>+// Copyright 2008 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -36,13 +30,12 @@ static const struct regulator_ops wm8400_ldo_ops = {</div><div class='ctx'> </div><div class='ctx'> static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	struct regmap *rmap = rdev_get_regmap(dev);</div><div class='ctx'> 	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='ctx'> 	u16 data[2];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = wm8400_block_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset, 2,</div><div class='del'>-				data);</div><div class='add'>+	ret = regmap_bulk_read(rmap, WM8400_DCDC1_CONTROL_1 + offset, data, 2);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -63,36 +56,36 @@ static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)</div><div class='ctx'> {</div><div class='del'>-	struct wm8400 *wm8400 = rdev_get_drvdata(dev);</div><div class='add'>+	struct regmap *rmap = rdev_get_regmap(dev);</div><div class='ctx'> 	int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case REGULATOR_MODE_FAST:</div><div class='ctx'> 		/* Datasheet: active with force PWM */</div><div class='del'>-		ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,</div><div class='add'>+		ret = regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_2 + offset,</div><div class='ctx'> 				      WM8400_DC1_FRC_PWM, WM8400_DC1_FRC_PWM);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+		return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='ctx'> 				       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,</div><div class='ctx'> 				       WM8400_DC1_ACTIVE);</div><div class='ctx'> </div><div class='ctx'> 	case REGULATOR_MODE_NORMAL:</div><div class='ctx'> 		/* Datasheet: active */</div><div class='del'>-		ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,</div><div class='add'>+		ret = regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_2 + offset,</div><div class='ctx'> 				      WM8400_DC1_FRC_PWM, 0);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+		return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='ctx'> 				       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,</div><div class='ctx'> 				       WM8400_DC1_ACTIVE);</div><div class='ctx'> </div><div class='ctx'> 	case REGULATOR_MODE_IDLE:</div><div class='ctx'> 		/* Datasheet: standby */</div><div class='del'>-		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='add'>+		return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset,</div><div class='ctx'> 				       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, 0);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -195,7 +188,7 @@ static struct regulator_desc regulators[] = {</div><div class='ctx'> 		.id = WM8400_DCDC2,</div><div class='ctx'> 		.ops = &amp;wm8400_dcdc_ops,</div><div class='ctx'> 		.enable_reg = WM8400_DCDC2_CONTROL_1,</div><div class='del'>-		.enable_mask = WM8400_DC1_ENA_MASK,</div><div class='add'>+		.enable_mask = WM8400_DC2_ENA_MASK,</div><div class='ctx'> 		.n_voltages = WM8400_DC2_VSEL_MASK + 1,</div><div class='ctx'> 		.vsel_reg = WM8400_DCDC2_CONTROL_1,</div><div class='ctx'> 		.vsel_mask = WM8400_DC2_VSEL_MASK,</div><div class='head'>diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c<br/>index 38928cdcb6e6..cadea0344486 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm8994-regulator.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/regulator/wm8994-regulator.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/regulator/wm8994-regulator.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/regulator/wm8994-regulator.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * wm8994-regulator.c  --  Regulator driver for the WM8994</div><div class='del'>- *</div><div class='del'>- * Copyright 2009 Wolfson Microelectronics PLC.</div><div class='del'>- *</div><div class='del'>- * Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&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='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+//</div><div class='add'>+// wm8994-regulator.c  --  Regulator driver for the WM8994</div><div class='add'>+//</div><div class='add'>+// Copyright 2009 Wolfson Microelectronics PLC.</div><div class='add'>+//</div><div class='add'>+// Author: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='head'>diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset-meson-audio-arb.c<br/>index 91751617b37a..c53a2185a039 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/reset/reset-meson-audio-arb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/reset/reset-meson-audio-arb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/reset/reset-meson-audio-arb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/reset/reset-meson-audio-arb.c</a></div><div class='hunk'>@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev)</div><div class='ctx'> 	arb-&gt;rstc.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits);</div><div class='ctx'> 	arb-&gt;rstc.ops = &amp;meson_audio_arb_rstc_ops;</div><div class='ctx'> 	arb-&gt;rstc.of_node = dev-&gt;of_node;</div><div class='add'>+	arb-&gt;rstc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable general :</div><div class='head'>diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig<br/>index a71734c41693..f933c06bff4f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/rtc/Kconfig</a></div><div class='hunk'>@@ -667,9 +667,9 @@ config RTC_DRV_S5M</div><div class='ctx'> 	  will be called rtc-s5m.</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_SD3078</div><div class='del'>-    tristate "ZXW Crystal SD3078"</div><div class='add'>+    tristate "ZXW Shenzhen whwave SD3078"</div><div class='ctx'>     help</div><div class='del'>-      If you say yes here you get support for the ZXW Crystal</div><div class='add'>+      If you say yes here you get support for the ZXW Shenzhen whwave</div><div class='ctx'>       SD3078 RTC chips.</div><div class='ctx'> </div><div class='ctx'>       This driver can also be built as a module. If so, the module</div><div class='head'>diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c<br/>index e5444296075e..4d6bf9304ceb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-cros-ec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-cros-ec.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-cros-ec.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/rtc/rtc-cros-ec.c</a></div><div class='hunk'>@@ -298,7 +298,7 @@ static int cros_ec_rtc_suspend(struct device *dev)</div><div class='ctx'> 	struct cros_ec_rtc *cros_ec_rtc = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (device_may_wakeup(dev))</div><div class='del'>-		enable_irq_wake(cros_ec_rtc-&gt;cros_ec-&gt;irq);</div><div class='add'>+		return enable_irq_wake(cros_ec_rtc-&gt;cros_ec-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -309,7 +309,7 @@ static int cros_ec_rtc_resume(struct device *dev)</div><div class='ctx'> 	struct cros_ec_rtc *cros_ec_rtc = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (device_may_wakeup(dev))</div><div class='del'>-		disable_irq_wake(cros_ec_rtc-&gt;cros_ec-&gt;irq);</div><div class='add'>+		return disable_irq_wake(cros_ec_rtc-&gt;cros_ec-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c<br/>index b4e054c64bad..69b54e5556c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-da9063.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-da9063.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-da9063.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/rtc/rtc-da9063.c</a></div><div class='hunk'>@@ -480,6 +480,13 @@ static int da9063_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	da9063_data_to_tm(data, &amp;rtc-&gt;alarm_time, rtc);</div><div class='ctx'> 	rtc-&gt;rtc_sync = false;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * TODO: some models have alarms on a minute boundary but still support</div><div class='add'>+	 * real hardware interrupts. Add this once the core supports it.</div><div class='add'>+	 */</div><div class='add'>+	if (config-&gt;rtc_data_start != RTC_SEC)</div><div class='add'>+		rtc-&gt;rtc_dev-&gt;uie_unsupported = 1;</div><div class='add'>+</div><div class='ctx'> 	irq_alarm = platform_get_irq_byname(pdev, "ALARM");</div><div class='ctx'> 	ret = devm_request_threaded_irq(&amp;pdev-&gt;dev, irq_alarm, NULL,</div><div class='ctx'> 					da9063_alarm_event,</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c<br/>index 38a2e9e684df..225a8df1d4e9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-ds1374.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-ds1374.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-ds1374.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/rtc/rtc-ds1374.c</a></div><div class='hunk'>@@ -467,7 +467,7 @@ static int ds1374_wdt_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		 */</div><div class='ctx'> 		wdt_is_open = 1;</div><div class='ctx'> 		mutex_unlock(&amp;ds1374-&gt;mutex);</div><div class='del'>-		return nonseekable_open(inode, file);</div><div class='add'>+		return stream_open(inode, file);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c<br/>index ebf50b1540f2..dd5a8991f75b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-m41t80.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-m41t80.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-m41t80.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/rtc/rtc-m41t80.c</a></div><div class='hunk'>@@ -802,7 +802,7 @@ static int wdt_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		 */</div><div class='ctx'> 		wdt_is_open = 1;</div><div class='ctx'> 		mutex_unlock(&amp;m41t80_rtc_mutex);</div><div class='del'>-		return nonseekable_open(inode, file);</div><div class='add'>+		return stream_open(inode, file);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c<br/>index d417b203cbc5..1d3de2a3d1a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-sh.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/rtc/rtc-sh.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/rtc/rtc-sh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/rtc/rtc-sh.c</a></div><div class='hunk'>@@ -374,7 +374,7 @@ static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> static inline int sh_rtc_read_alarm_value(struct sh_rtc *rtc, int reg_off)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int byte;</div><div class='del'>-	int value = 0xff;	/* return 0xff for ignored values */</div><div class='add'>+	int value = -1;			/* return -1 for ignored values */</div><div class='ctx'> </div><div class='ctx'> 	byte = readb(rtc-&gt;regbase + reg_off);</div><div class='ctx'> 	if (byte &amp; AR_ENB) {</div><div class='head'>diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c<br/>index 6e294b4d3635..f89f9d02e788 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/block/dasd_eckd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/block/dasd_eckd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/block/dasd_eckd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/block/dasd_eckd.c</a></div><div class='hunk'>@@ -2004,14 +2004,14 @@ static int dasd_eckd_end_analysis(struct dasd_block *block)</div><div class='ctx'> 	blk_per_trk = recs_per_track(&amp;private-&gt;rdc_data, 0, block-&gt;bp_block);</div><div class='ctx'> </div><div class='ctx'> raw:</div><div class='del'>-	block-&gt;blocks = (private-&gt;real_cyl *</div><div class='add'>+	block-&gt;blocks = ((unsigned long) private-&gt;real_cyl *</div><div class='ctx'> 			  private-&gt;rdc_data.trk_per_cyl *</div><div class='ctx'> 			  blk_per_trk);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;device-&gt;cdev-&gt;dev,</div><div class='del'>-		 "DASD with %d KB/block, %d KB total size, %d KB/track, "</div><div class='add'>+		 "DASD with %u KB/block, %lu KB total size, %u KB/track, "</div><div class='ctx'> 		 "%s\n", (block-&gt;bp_block &gt;&gt; 10),</div><div class='del'>-		 ((private-&gt;real_cyl *</div><div class='add'>+		 (((unsigned long) private-&gt;real_cyl *</div><div class='ctx'> 		   private-&gt;rdc_data.trk_per_cyl *</div><div class='ctx'> 		   blk_per_trk * (block-&gt;bp_block &gt;&gt; 9)) &gt;&gt; 1),</div><div class='ctx'> 		 ((blk_per_trk * block-&gt;bp_block) &gt;&gt; 10),</div><div class='head'>diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c<br/>index fd2146bcc0ad..e17364e13d2f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/con3270.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/con3270.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/con3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/con3270.c</a></div><div class='hunk'>@@ -629,7 +629,7 @@ con3270_init(void)</div><div class='ctx'> 		     (void (*)(unsigned long)) con3270_read_tasklet,</div><div class='ctx'> 		     (unsigned long) condev-&gt;read);</div><div class='ctx'> </div><div class='del'>-	raw3270_add_view(&amp;condev-&gt;view, &amp;con3270_fn, 1);</div><div class='add'>+	raw3270_add_view(&amp;condev-&gt;view, &amp;con3270_fn, 1, RAW3270_VIEW_LOCK_IRQ);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;condev-&gt;freemem);</div><div class='ctx'> 	for (i = 0; i &lt; CON3270_STRING_PAGES; i++) {</div><div class='head'>diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c<br/>index 8f3a2eeb28dc..4c4683d8784a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/fs3270.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/fs3270.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/fs3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/fs3270.c</a></div><div class='hunk'>@@ -463,7 +463,8 @@ fs3270_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;fp-&gt;wait);</div><div class='ctx'> 	fp-&gt;fs_pid = get_pid(task_pid(current));</div><div class='del'>-	rc = raw3270_add_view(&amp;fp-&gt;view, &amp;fs3270_fn, minor);</div><div class='add'>+	rc = raw3270_add_view(&amp;fp-&gt;view, &amp;fs3270_fn, minor,</div><div class='add'>+			      RAW3270_VIEW_LOCK_BH);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		fs3270_free_view(&amp;fp-&gt;view);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -485,7 +486,7 @@ fs3270_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 		raw3270_del_view(&amp;fp-&gt;view);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	nonseekable_open(inode, filp);</div><div class='add'>+	stream_open(inode, filp);</div><div class='ctx'> 	filp-&gt;private_data = fp;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;fs3270_mutex);</div><div class='head'>diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c<br/>index f8cd2935fbfd..63a41b168761 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/raw3270.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/raw3270.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/raw3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/raw3270.c</a></div><div class='hunk'>@@ -920,7 +920,7 @@ raw3270_deactivate_view(struct raw3270_view *view)</div><div class='ctx'>  * Add view to device with minor "minor".</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)</div><div class='add'>+raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor, int subclass)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct raw3270 *rp;</div><div class='hunk'>@@ -942,6 +942,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)</div><div class='ctx'> 		view-&gt;cols = rp-&gt;cols;</div><div class='ctx'> 		view-&gt;ascebc = rp-&gt;ascebc;</div><div class='ctx'> 		spin_lock_init(&amp;view-&gt;lock);</div><div class='add'>+		lockdep_set_subclass(&amp;view-&gt;lock, subclass);</div><div class='ctx'> 		list_add(&amp;view-&gt;list, &amp;rp-&gt;view_list);</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 		spin_unlock_irqrestore(get_ccwdev_lock(rp-&gt;cdev), flags);</div><div class='head'>diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h<br/>index 114ca7cbf889..3afaa35f7351 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/raw3270.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/raw3270.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/raw3270.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/raw3270.h</a></div><div class='hunk'>@@ -150,6 +150,8 @@ struct raw3270_fn {</div><div class='ctx'> struct raw3270_view {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+#define RAW3270_VIEW_LOCK_IRQ	0</div><div class='add'>+#define RAW3270_VIEW_LOCK_BH	1</div><div class='ctx'> 	atomic_t ref_count;</div><div class='ctx'> 	struct raw3270 *dev;</div><div class='ctx'> 	struct raw3270_fn *fn;</div><div class='hunk'>@@ -158,7 +160,7 @@ struct raw3270_view {</div><div class='ctx'> 	unsigned char *ascebc;		/* ascii -&gt; ebcdic table */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int raw3270_add_view(struct raw3270_view *, struct raw3270_fn *, int);</div><div class='add'>+int raw3270_add_view(struct raw3270_view *, struct raw3270_fn *, int, int);</div><div class='ctx'> int raw3270_activate_view(struct raw3270_view *);</div><div class='ctx'> void raw3270_del_view(struct raw3270_view *);</div><div class='ctx'> void raw3270_deactivate_view(struct raw3270_view *);</div><div class='head'>diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c<br/>index e9aa71cdfc44..d2ab3f07c008 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/sclp.c</a></div><div class='hunk'>@@ -45,8 +45,8 @@ static struct list_head sclp_req_queue;</div><div class='ctx'> /* Data for read and and init requests. */</div><div class='ctx'> static struct sclp_req sclp_read_req;</div><div class='ctx'> static struct sclp_req sclp_init_req;</div><div class='del'>-static char sclp_read_sccb[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));</div><div class='del'>-static char sclp_init_sccb[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));</div><div class='add'>+static void *sclp_read_sccb;</div><div class='add'>+static struct init_sccb *sclp_init_sccb;</div><div class='ctx'> </div><div class='ctx'> /* Suspend request */</div><div class='ctx'> static DECLARE_COMPLETION(sclp_request_queue_flushed);</div><div class='hunk'>@@ -753,9 +753,8 @@ EXPORT_SYMBOL(sclp_remove_processed);</div><div class='ctx'> static inline void</div><div class='ctx'> __sclp_make_init_req(sccb_mask_t receive_mask, sccb_mask_t send_mask)</div><div class='ctx'> {</div><div class='del'>-	struct init_sccb *sccb;</div><div class='add'>+	struct init_sccb *sccb = sclp_init_sccb;</div><div class='ctx'> </div><div class='del'>-	sccb = (struct init_sccb *) sclp_init_sccb;</div><div class='ctx'> 	clear_page(sccb);</div><div class='ctx'> 	memset(&amp;sclp_init_req, 0, sizeof(struct sclp_req));</div><div class='ctx'> 	sclp_init_req.command = SCLP_CMDW_WRITE_EVENT_MASK;</div><div class='hunk'>@@ -782,7 +781,7 @@ static int</div><div class='ctx'> sclp_init_mask(int calculate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct init_sccb *sccb = (struct init_sccb *) sclp_init_sccb;</div><div class='add'>+	struct init_sccb *sccb = sclp_init_sccb;</div><div class='ctx'> 	sccb_mask_t receive_mask;</div><div class='ctx'> 	sccb_mask_t send_mask;</div><div class='ctx'> 	int retry;</div><div class='hunk'>@@ -1175,6 +1174,9 @@ sclp_init(void)</div><div class='ctx'> 	if (sclp_init_state != sclp_init_state_uninitialized)</div><div class='ctx'> 		goto fail_unlock;</div><div class='ctx'> 	sclp_init_state = sclp_init_state_initializing;</div><div class='add'>+	sclp_read_sccb = (void *) __get_free_page(GFP_ATOMIC | GFP_DMA);</div><div class='add'>+	sclp_init_sccb = (void *) __get_free_page(GFP_ATOMIC | GFP_DMA);</div><div class='add'>+	BUG_ON(!sclp_read_sccb || !sclp_init_sccb);</div><div class='ctx'> 	/* Set up variables */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sclp_req_queue);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sclp_reg_list);</div><div class='hunk'>@@ -1207,6 +1209,8 @@ fail_unregister_reboot_notifier:</div><div class='ctx'> 	unregister_reboot_notifier(&amp;sclp_reboot_notifier);</div><div class='ctx'> fail_init_state_uninitialized:</div><div class='ctx'> 	sclp_init_state = sclp_init_state_uninitialized;</div><div class='add'>+	free_page((unsigned long) sclp_read_sccb);</div><div class='add'>+	free_page((unsigned long) sclp_init_sccb);</div><div class='ctx'> fail_unlock:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sclp_lock, flags);</div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h<br/>index 367e9d384d85..196333013e54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/sclp.h</a></div><div class='hunk'>@@ -197,7 +197,9 @@ struct read_info_sccb {</div><div class='ctx'> 	u32	hmfai;			/* 124-127 */</div><div class='ctx'> 	u8	_pad_128[134 - 128];	/* 128-133 */</div><div class='ctx'> 	u8	byte_134;			/* 134 */</div><div class='del'>-	u8	_pad_135[4096 - 135];	/* 135-4095 */</div><div class='add'>+	u8	cpudirq;		/* 135 */</div><div class='add'>+	u16	cbl;			/* 136-137 */</div><div class='add'>+	u8	_pad_138[4096 - 138];	/* 138-4095 */</div><div class='ctx'> } __packed __aligned(PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> struct read_storage_sccb {</div><div class='hunk'>@@ -319,7 +321,7 @@ extern int sclp_console_drop;</div><div class='ctx'> extern unsigned long sclp_console_full;</div><div class='ctx'> extern bool sclp_mask_compat_mode;</div><div class='ctx'> </div><div class='del'>-extern char sclp_early_sccb[PAGE_SIZE];</div><div class='add'>+extern char *sclp_early_sccb;</div><div class='ctx'> </div><div class='ctx'> void sclp_early_wait_irq(void);</div><div class='ctx'> int sclp_early_cmd(sclp_cmdw_t cmd, void *sccb);</div><div class='hunk'>@@ -365,14 +367,14 @@ sclp_ascebc(unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> /* translate string from EBCDIC to ASCII */</div><div class='ctx'> static inline void</div><div class='del'>-sclp_ebcasc_str(unsigned char *str, int nr)</div><div class='add'>+sclp_ebcasc_str(char *str, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	(MACHINE_IS_VM) ? EBCASC(str, nr) : EBCASC_500(str, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* translate string from ASCII to EBCDIC */</div><div class='ctx'> static inline void</div><div class='del'>-sclp_ascebc_str(unsigned char *str, int nr)</div><div class='add'>+sclp_ascebc_str(char *str, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	(MACHINE_IS_VM) ? ASCEBC(str, nr) : ASCEBC_500(str, nr);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c<br/>index 8332788681c4..6c90aa725f23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp_early.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp_early.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp_early.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/sclp_early.c</a></div><div class='hunk'>@@ -40,6 +40,8 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb)</div><div class='ctx'> 	sclp.has_gisaf = !!(sccb-&gt;fac118 &amp; 0x08);</div><div class='ctx'> 	sclp.has_hvs = !!(sccb-&gt;fac119 &amp; 0x80);</div><div class='ctx'> 	sclp.has_kss = !!(sccb-&gt;fac98 &amp; 0x01);</div><div class='add'>+	sclp.has_sipl = !!(sccb-&gt;cbl &amp; 0x02);</div><div class='add'>+	sclp.has_sipl_g2 = !!(sccb-&gt;cbl &amp; 0x04);</div><div class='ctx'> 	if (sccb-&gt;fac85 &amp; 0x02)</div><div class='ctx'> 		S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;</div><div class='ctx'> 	if (sccb-&gt;fac91 &amp; 0x40)</div><div class='hunk'>@@ -93,6 +95,7 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb)</div><div class='ctx'> 	sclp.mtid_prev = (sccb-&gt;fac42 &amp; 0x80) ? (sccb-&gt;fac66 &amp; 31) : 0;</div><div class='ctx'> </div><div class='ctx'> 	sclp.hmfai = sccb-&gt;hmfai;</div><div class='add'>+	sclp.has_dirq = !!(sccb-&gt;cpudirq &amp; 0x80);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -144,7 +147,7 @@ static void __init sclp_early_console_detect(struct init_sccb *sccb)</div><div class='ctx'> </div><div class='ctx'> void __init sclp_early_detect(void)</div><div class='ctx'> {</div><div class='del'>-	void *sccb = &amp;sclp_early_sccb;</div><div class='add'>+	void *sccb = sclp_early_sccb;</div><div class='ctx'> </div><div class='ctx'> 	sclp_early_facilities_detect(sccb);</div><div class='ctx'> 	sclp_early_init_core_info(sccb);</div><div class='head'>diff --git a/drivers/s390/char/sclp_early_core.c b/drivers/s390/char/sclp_early_core.c<br/>index 387c114ded3f..7737470f8498 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp_early_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp_early_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp_early_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/sclp_early_core.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct read_info_sccb __bootdata(sclp_info_sccb);</div><div class='ctx'> static int __bootdata(sclp_info_sccb_valid);</div><div class='del'>-char sclp_early_sccb[PAGE_SIZE] __aligned(PAGE_SIZE) __section(.data);</div><div class='add'>+char *sclp_early_sccb = (char *) EARLY_SCCB_OFFSET;</div><div class='ctx'> int sclp_init_state __section(.data) = sclp_init_state_uninitialized;</div><div class='ctx'> /*</div><div class='ctx'>  * Used to keep track of the size of the event masks. Qemu until version 2.11</div><div class='hunk'>@@ -91,8 +91,8 @@ static void sclp_early_print_lm(const char *str, unsigned int len)</div><div class='ctx'> 	struct mto *mto;</div><div class='ctx'> 	struct go *go;</div><div class='ctx'> </div><div class='del'>-	sccb = (struct write_sccb *) &amp;sclp_early_sccb;</div><div class='del'>-	end = (unsigned char *) sccb + sizeof(sclp_early_sccb) - 1;</div><div class='add'>+	sccb = (struct write_sccb *) sclp_early_sccb;</div><div class='add'>+	end = (unsigned char *) sccb + EARLY_SCCB_SIZE - 1;</div><div class='ctx'> 	memset(sccb, 0, sizeof(*sccb));</div><div class='ctx'> 	ptr = (unsigned char *) &amp;sccb-&gt;msg.mdb.mto;</div><div class='ctx'> 	offset = 0;</div><div class='hunk'>@@ -139,9 +139,9 @@ static void sclp_early_print_vt220(const char *str, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct vt220_sccb *sccb;</div><div class='ctx'> </div><div class='del'>-	sccb = (struct vt220_sccb *) &amp;sclp_early_sccb;</div><div class='del'>-	if (sizeof(*sccb) + len &gt;= sizeof(sclp_early_sccb))</div><div class='del'>-		len = sizeof(sclp_early_sccb) - sizeof(*sccb);</div><div class='add'>+	sccb = (struct vt220_sccb *) sclp_early_sccb;</div><div class='add'>+	if (sizeof(*sccb) + len &gt;= EARLY_SCCB_SIZE)</div><div class='add'>+		len = EARLY_SCCB_SIZE - sizeof(*sccb);</div><div class='ctx'> 	memset(sccb, 0, sizeof(*sccb));</div><div class='ctx'> 	memcpy(&amp;sccb-&gt;msg.data, str, len);</div><div class='ctx'> 	sccb-&gt;header.length = sizeof(*sccb) + len;</div><div class='hunk'>@@ -199,7 +199,7 @@ static int sclp_early_setup(int disable, int *have_linemode, int *have_vt220)</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct init_sccb) &gt; PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	*have_linemode = *have_vt220 = 0;</div><div class='del'>-	sccb = (struct init_sccb *) &amp;sclp_early_sccb;</div><div class='add'>+	sccb = (struct init_sccb *) sclp_early_sccb;</div><div class='ctx'> 	receive_mask = disable ? 0 : EVTYP_OPCMD_MASK;</div><div class='ctx'> 	send_mask = disable ? 0 : EVTYP_VT220MSG_MASK | EVTYP_MSG_MASK;</div><div class='ctx'> 	rc = sclp_early_set_event_mask(sccb, receive_mask, send_mask);</div><div class='hunk'>@@ -304,7 +304,7 @@ int __init sclp_early_get_hsa_size(unsigned long *hsa_size)</div><div class='ctx'> void __weak __init add_mem_detect_block(u64 start, u64 end) {}</div><div class='ctx'> int __init sclp_early_read_storage_info(void)</div><div class='ctx'> {</div><div class='del'>-	struct read_storage_sccb *sccb = (struct read_storage_sccb *)&amp;sclp_early_sccb;</div><div class='add'>+	struct read_storage_sccb *sccb = (struct read_storage_sccb *)sclp_early_sccb;</div><div class='ctx'> 	int rc, id, max_id = 0;</div><div class='ctx'> 	unsigned long rn, rzm;</div><div class='ctx'> 	sclp_cmdw_t command;</div><div class='hunk'>@@ -320,8 +320,8 @@ int __init sclp_early_read_storage_info(void)</div><div class='ctx'> 	rzm &lt;&lt;= 20;</div><div class='ctx'> </div><div class='ctx'> 	for (id = 0; id &lt;= max_id; id++) {</div><div class='del'>-		memset(sclp_early_sccb, 0, sizeof(sclp_early_sccb));</div><div class='del'>-		sccb-&gt;header.length = sizeof(sclp_early_sccb);</div><div class='add'>+		memset(sclp_early_sccb, 0, EARLY_SCCB_SIZE);</div><div class='add'>+		sccb-&gt;header.length = EARLY_SCCB_SIZE;</div><div class='ctx'> 		command = SCLP_CMDW_READ_STORAGE_INFO | (id &lt;&lt; 8);</div><div class='ctx'> 		rc = sclp_early_cmd(command, sccb);</div><div class='ctx'> 		if (rc)</div><div class='head'>diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c<br/>index 8e0b69a2f11a..13f97fd73aca 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp_sdias.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/sclp_sdias.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/sclp_sdias.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/sclp_sdias.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ static struct sclp_register sclp_sdias_register = {</div><div class='ctx'> 	.send_mask = EVTYP_SDIAS_MASK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sdias_sccb sccb __attribute__((aligned(4096)));</div><div class='add'>+static struct sdias_sccb *sclp_sdias_sccb;</div><div class='ctx'> static struct sdias_evbuf sdias_evbuf;</div><div class='ctx'> </div><div class='ctx'> static DECLARE_COMPLETION(evbuf_accepted);</div><div class='hunk'>@@ -58,6 +58,7 @@ static void sdias_callback(struct sclp_req *request, void *data)</div><div class='ctx'> </div><div class='ctx'> static int sdias_sclp_send(struct sclp_req *req)</div><div class='ctx'> {</div><div class='add'>+	struct sdias_sccb *sccb = sclp_sdias_sccb;</div><div class='ctx'> 	int retries;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -78,16 +79,16 @@ static int sdias_sclp_send(struct sclp_req *req)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* if not accepted, retry */</div><div class='del'>-		if (!(sccb.evbuf.hdr.flags &amp; 0x80)) {</div><div class='add'>+		if (!(sccb-&gt;evbuf.hdr.flags &amp; 0x80)) {</div><div class='ctx'> 			TRACE("sclp request failed: flags=%x\n",</div><div class='del'>-			      sccb.evbuf.hdr.flags);</div><div class='add'>+			      sccb-&gt;evbuf.hdr.flags);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * for the sync interface the response is in the initial sccb</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!sclp_sdias_register.receiver_fn) {</div><div class='del'>-			memcpy(&amp;sdias_evbuf, &amp;sccb.evbuf, sizeof(sdias_evbuf));</div><div class='add'>+			memcpy(&amp;sdias_evbuf, &amp;sccb-&gt;evbuf, sizeof(sdias_evbuf));</div><div class='ctx'> 			TRACE("sync request done\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -104,23 +105,24 @@ static int sdias_sclp_send(struct sclp_req *req)</div><div class='ctx'>  */</div><div class='ctx'> int sclp_sdias_blk_count(void)</div><div class='ctx'> {</div><div class='add'>+	struct sdias_sccb *sccb = sclp_sdias_sccb;</div><div class='ctx'> 	struct sclp_req request;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sdias_mutex);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;sccb, 0, sizeof(sccb));</div><div class='add'>+	memset(sccb, 0, sizeof(*sccb));</div><div class='ctx'> 	memset(&amp;request, 0, sizeof(request));</div><div class='ctx'> </div><div class='del'>-	sccb.hdr.length = sizeof(sccb);</div><div class='del'>-	sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);</div><div class='del'>-	sccb.evbuf.hdr.type = EVTYP_SDIAS;</div><div class='del'>-	sccb.evbuf.event_qual = SDIAS_EQ_SIZE;</div><div class='del'>-	sccb.evbuf.data_id = SDIAS_DI_FCP_DUMP;</div><div class='del'>-	sccb.evbuf.event_id = 4712;</div><div class='del'>-	sccb.evbuf.dbs = 1;</div><div class='add'>+	sccb-&gt;hdr.length = sizeof(*sccb);</div><div class='add'>+	sccb-&gt;evbuf.hdr.length = sizeof(struct sdias_evbuf);</div><div class='add'>+	sccb-&gt;evbuf.hdr.type = EVTYP_SDIAS;</div><div class='add'>+	sccb-&gt;evbuf.event_qual = SDIAS_EQ_SIZE;</div><div class='add'>+	sccb-&gt;evbuf.data_id = SDIAS_DI_FCP_DUMP;</div><div class='add'>+	sccb-&gt;evbuf.event_id = 4712;</div><div class='add'>+	sccb-&gt;evbuf.dbs = 1;</div><div class='ctx'> </div><div class='del'>-	request.sccb = &amp;sccb;</div><div class='add'>+	request.sccb = sccb;</div><div class='ctx'> 	request.command = SCLP_CMDW_WRITE_EVENT_DATA;</div><div class='ctx'> 	request.status = SCLP_REQ_FILLED;</div><div class='ctx'> 	request.callback = sdias_callback;</div><div class='hunk'>@@ -130,8 +132,8 @@ int sclp_sdias_blk_count(void)</div><div class='ctx'> 		pr_err("sclp_send failed for get_nr_blocks\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (sccb.hdr.response_code != 0x0020) {</div><div class='del'>-		TRACE("send failed: %x\n", sccb.hdr.response_code);</div><div class='add'>+	if (sccb-&gt;hdr.response_code != 0x0020) {</div><div class='add'>+		TRACE("send failed: %x\n", sccb-&gt;hdr.response_code);</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -163,30 +165,31 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)</div><div class='ctx'> {</div><div class='add'>+	struct sdias_sccb *sccb = sclp_sdias_sccb;</div><div class='ctx'> 	struct sclp_req request;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sdias_mutex);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;sccb, 0, sizeof(sccb));</div><div class='add'>+	memset(sccb, 0, sizeof(*sccb));</div><div class='ctx'> 	memset(&amp;request, 0, sizeof(request));</div><div class='ctx'> </div><div class='del'>-	sccb.hdr.length = sizeof(sccb);</div><div class='del'>-	sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);</div><div class='del'>-	sccb.evbuf.hdr.type = EVTYP_SDIAS;</div><div class='del'>-	sccb.evbuf.hdr.flags = 0;</div><div class='del'>-	sccb.evbuf.event_qual = SDIAS_EQ_STORE_DATA;</div><div class='del'>-	sccb.evbuf.data_id = SDIAS_DI_FCP_DUMP;</div><div class='del'>-	sccb.evbuf.event_id = 4712;</div><div class='del'>-	sccb.evbuf.asa_size = SDIAS_ASA_SIZE_64;</div><div class='del'>-	sccb.evbuf.event_status = 0;</div><div class='del'>-	sccb.evbuf.blk_cnt = nr_blks;</div><div class='del'>-	sccb.evbuf.asa = (unsigned long)dest;</div><div class='del'>-	sccb.evbuf.fbn = start_blk;</div><div class='del'>-	sccb.evbuf.lbn = 0;</div><div class='del'>-	sccb.evbuf.dbs = 1;</div><div class='del'>-</div><div class='del'>-	request.sccb	 = &amp;sccb;</div><div class='add'>+	sccb-&gt;hdr.length = sizeof(*sccb);</div><div class='add'>+	sccb-&gt;evbuf.hdr.length = sizeof(struct sdias_evbuf);</div><div class='add'>+	sccb-&gt;evbuf.hdr.type = EVTYP_SDIAS;</div><div class='add'>+	sccb-&gt;evbuf.hdr.flags = 0;</div><div class='add'>+	sccb-&gt;evbuf.event_qual = SDIAS_EQ_STORE_DATA;</div><div class='add'>+	sccb-&gt;evbuf.data_id = SDIAS_DI_FCP_DUMP;</div><div class='add'>+	sccb-&gt;evbuf.event_id = 4712;</div><div class='add'>+	sccb-&gt;evbuf.asa_size = SDIAS_ASA_SIZE_64;</div><div class='add'>+	sccb-&gt;evbuf.event_status = 0;</div><div class='add'>+	sccb-&gt;evbuf.blk_cnt = nr_blks;</div><div class='add'>+	sccb-&gt;evbuf.asa = (unsigned long)dest;</div><div class='add'>+	sccb-&gt;evbuf.fbn = start_blk;</div><div class='add'>+	sccb-&gt;evbuf.lbn = 0;</div><div class='add'>+	sccb-&gt;evbuf.dbs = 1;</div><div class='add'>+</div><div class='add'>+	request.sccb	 = sccb;</div><div class='ctx'> 	request.command  = SCLP_CMDW_WRITE_EVENT_DATA;</div><div class='ctx'> 	request.status	 = SCLP_REQ_FILLED;</div><div class='ctx'> 	request.callback = sdias_callback;</div><div class='hunk'>@@ -196,8 +199,8 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)</div><div class='ctx'> 		pr_err("sclp_send failed: %x\n", rc);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (sccb.hdr.response_code != 0x0020) {</div><div class='del'>-		TRACE("copy failed: %x\n", sccb.hdr.response_code);</div><div class='add'>+	if (sccb-&gt;hdr.response_code != 0x0020) {</div><div class='add'>+		TRACE("copy failed: %x\n", sccb-&gt;hdr.response_code);</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -256,6 +259,8 @@ int __init sclp_sdias_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (ipl_info.type != IPL_TYPE_FCP_DUMP)</div><div class='ctx'> 		return 0;</div><div class='add'>+	sclp_sdias_sccb = (void *) __get_free_page(GFP_KERNEL | GFP_DMA);</div><div class='add'>+	BUG_ON(!sclp_sdias_sccb);</div><div class='ctx'> 	sdias_dbf = debug_register("dump_sdias", 4, 1, 4 * sizeof(long));</div><div class='ctx'> 	debug_register_view(sdias_dbf, &amp;debug_sprintf_view);</div><div class='ctx'> 	debug_set_level(sdias_dbf, 6);</div><div class='hunk'>@@ -264,6 +269,7 @@ int __init sclp_sdias_init(void)</div><div class='ctx'> 	if (sclp_sdias_init_async() == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	TRACE("init failed\n");</div><div class='add'>+	free_page((unsigned long) sclp_sdias_sccb);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> out:</div><div class='ctx'> 	TRACE("init done\n");</div><div class='head'>diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c<br/>index fc206c9d1c56..ea4253939555 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/tape_char.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/tape_char.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/tape_char.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/tape_char.c</a></div><div class='hunk'>@@ -290,7 +290,7 @@ tapechar_open (struct inode *inode, struct file *filp)</div><div class='ctx'> 	rc = tape_open(device);</div><div class='ctx'> 	if (rc == 0) {</div><div class='ctx'> 		filp-&gt;private_data = device;</div><div class='del'>-		nonseekable_open(inode, filp);</div><div class='add'>+		stream_open(inode, filp);</div><div class='ctx'> 	} else</div><div class='ctx'> 		tape_put_device(device);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c<br/>index 2b0c36c2c568..98d7fc152e32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/tty3270.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/tty3270.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/tty3270.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/tty3270.c</a></div><div class='hunk'>@@ -980,7 +980,8 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)</div><div class='ctx'> 		return PTR_ERR(tp);</div><div class='ctx'> </div><div class='ctx'> 	rc = raw3270_add_view(&amp;tp-&gt;view, &amp;tty3270_fn,</div><div class='del'>-			      tty-&gt;index + RAW3270_FIRSTMINOR);</div><div class='add'>+			      tty-&gt;index + RAW3270_FIRSTMINOR,</div><div class='add'>+			      RAW3270_VIEW_LOCK_BH);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		tty3270_free_view(tp);</div><div class='ctx'> 		return rc;</div><div class='head'>diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c<br/>index 76d3c50bf078..405a60538630 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/zcore.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/char/zcore.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/char/zcore.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/char/zcore.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ static struct dentry *zcore_dir;</div><div class='ctx'> static struct dentry *zcore_memmap_file;</div><div class='ctx'> static struct dentry *zcore_reipl_file;</div><div class='ctx'> static struct dentry *zcore_hsa_file;</div><div class='del'>-static struct ipl_parameter_block *ipl_block;</div><div class='add'>+static struct ipl_parameter_block *zcore_ipl_block;</div><div class='ctx'> </div><div class='ctx'> static char hsa_buf[PAGE_SIZE] __aligned(PAGE_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -182,8 +182,8 @@ static const struct file_operations zcore_memmap_fops = {</div><div class='ctx'> static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf,</div><div class='ctx'> 				 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	if (ipl_block) {</div><div class='del'>-		diag308(DIAG308_SET, ipl_block);</div><div class='add'>+	if (zcore_ipl_block) {</div><div class='add'>+		diag308(DIAG308_SET, zcore_ipl_block);</div><div class='ctx'> 		diag308(DIAG308_LOAD_CLEAR, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -191,7 +191,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> static int zcore_reipl_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int zcore_reipl_release(struct inode *inode, struct file *filp)</div><div class='hunk'>@@ -265,18 +265,20 @@ static int __init zcore_reipl_init(void)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	if (ipib_info.ipib == 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	ipl_block = (void *) __get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!ipl_block)</div><div class='add'>+	zcore_ipl_block = (void *) __get_free_page(GFP_KERNEL);</div><div class='add'>+	if (!zcore_ipl_block)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (ipib_info.ipib &lt; sclp.hsa_size)</div><div class='del'>-		rc = memcpy_hsa_kernel(ipl_block, ipib_info.ipib, PAGE_SIZE);</div><div class='add'>+		rc = memcpy_hsa_kernel(zcore_ipl_block, ipib_info.ipib,</div><div class='add'>+				       PAGE_SIZE);</div><div class='ctx'> 	else</div><div class='del'>-		rc = memcpy_real(ipl_block, (void *) ipib_info.ipib, PAGE_SIZE);</div><div class='del'>-	if (rc || (__force u32)csum_partial(ipl_block, ipl_block-&gt;hdr.len, 0) !=</div><div class='add'>+		rc = memcpy_real(zcore_ipl_block, (void *) ipib_info.ipib,</div><div class='add'>+				 PAGE_SIZE);</div><div class='add'>+	if (rc || (__force u32)csum_partial(zcore_ipl_block, zcore_ipl_block-&gt;hdr.len, 0) !=</div><div class='ctx'> 	    ipib_info.checksum) {</div><div class='ctx'> 		TRACE("Checksum does not match\n");</div><div class='del'>-		free_page((unsigned long) ipl_block);</div><div class='del'>-		ipl_block = NULL;</div><div class='add'>+		free_page((unsigned long) zcore_ipl_block);</div><div class='add'>+		zcore_ipl_block = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile<br/>index f230516abb96..f6a8db04177c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/Makefile</a></div><div class='hunk'>@@ -20,5 +20,6 @@ obj-$(CONFIG_CCWGROUP) += ccwgroup.o</div><div class='ctx'> qdio-objs := qdio_main.o qdio_thinint.o qdio_debug.o qdio_setup.o</div><div class='ctx'> obj-$(CONFIG_QDIO) += qdio.o</div><div class='ctx'> </div><div class='del'>-vfio_ccw-objs += vfio_ccw_drv.o vfio_ccw_cp.o vfio_ccw_ops.o vfio_ccw_fsm.o</div><div class='add'>+vfio_ccw-objs += vfio_ccw_drv.o vfio_ccw_cp.o vfio_ccw_ops.o vfio_ccw_fsm.o \</div><div class='add'>+	vfio_ccw_async.o</div><div class='ctx'> obj-$(CONFIG_VFIO_CCW) += vfio_ccw.o</div><div class='head'>diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c<br/>index a45011e4529e..4534afc63591 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/airq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/airq.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/airq.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/airq.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> static DEFINE_SPINLOCK(airq_lists_lock);</div><div class='ctx'> static struct hlist_head airq_lists[MAX_ISC+1];</div><div class='ctx'> </div><div class='add'>+static struct kmem_cache *airq_iv_cache;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * register_adapter_interrupt() - register adapter interrupt handler</div><div class='ctx'>  * @airq: pointer to adapter interrupt descriptor</div><div class='hunk'>@@ -95,7 +97,7 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	hlist_for_each_entry_rcu(airq, head, list)</div><div class='ctx'> 		if ((*airq-&gt;lsi_ptr &amp; airq-&gt;lsi_mask) != 0)</div><div class='del'>-			airq-&gt;handler(airq);</div><div class='add'>+			airq-&gt;handler(airq, !tpi_info-&gt;directed_irq);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -129,10 +131,21 @@ struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags)</div><div class='ctx'> 	if (!iv)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	iv-&gt;bits = bits;</div><div class='add'>+	iv-&gt;flags = flags;</div><div class='ctx'> 	size = BITS_TO_LONGS(bits) * sizeof(unsigned long);</div><div class='del'>-	iv-&gt;vector = kzalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!iv-&gt;vector)</div><div class='del'>-		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; AIRQ_IV_CACHELINE) {</div><div class='add'>+		if ((cache_line_size() * BITS_PER_BYTE) &lt; bits)</div><div class='add'>+			goto out_free;</div><div class='add'>+</div><div class='add'>+		iv-&gt;vector = kmem_cache_zalloc(airq_iv_cache, GFP_KERNEL);</div><div class='add'>+		if (!iv-&gt;vector)</div><div class='add'>+			goto out_free;</div><div class='add'>+	} else {</div><div class='add'>+		iv-&gt;vector = kzalloc(size, GFP_KERNEL);</div><div class='add'>+		if (!iv-&gt;vector)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='ctx'> 	if (flags &amp; AIRQ_IV_ALLOC) {</div><div class='ctx'> 		iv-&gt;avail = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 		if (!iv-&gt;avail)</div><div class='hunk'>@@ -165,7 +178,10 @@ out_free:</div><div class='ctx'> 	kfree(iv-&gt;ptr);</div><div class='ctx'> 	kfree(iv-&gt;bitlock);</div><div class='ctx'> 	kfree(iv-&gt;avail);</div><div class='del'>-	kfree(iv-&gt;vector);</div><div class='add'>+	if (iv-&gt;flags &amp; AIRQ_IV_CACHELINE)</div><div class='add'>+		kmem_cache_free(airq_iv_cache, iv-&gt;vector);</div><div class='add'>+	else</div><div class='add'>+		kfree(iv-&gt;vector);</div><div class='ctx'> 	kfree(iv);</div><div class='ctx'> out:</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -181,7 +197,10 @@ void airq_iv_release(struct airq_iv *iv)</div><div class='ctx'> 	kfree(iv-&gt;data);</div><div class='ctx'> 	kfree(iv-&gt;ptr);</div><div class='ctx'> 	kfree(iv-&gt;bitlock);</div><div class='del'>-	kfree(iv-&gt;vector);</div><div class='add'>+	if (iv-&gt;flags &amp; AIRQ_IV_CACHELINE)</div><div class='add'>+		kmem_cache_free(airq_iv_cache, iv-&gt;vector);</div><div class='add'>+	else</div><div class='add'>+		kfree(iv-&gt;vector);</div><div class='ctx'> 	kfree(iv-&gt;avail);</div><div class='ctx'> 	kfree(iv);</div><div class='ctx'> }</div><div class='hunk'>@@ -275,3 +294,13 @@ unsigned long airq_iv_scan(struct airq_iv *iv, unsigned long start,</div><div class='ctx'> 	return bit;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(airq_iv_scan);</div><div class='add'>+</div><div class='add'>+static int __init airq_init(void)</div><div class='add'>+{</div><div class='add'>+	airq_iv_cache = kmem_cache_create("airq_iv_cache", cache_line_size(),</div><div class='add'>+					  cache_line_size(), 0, NULL);</div><div class='add'>+	if (!airq_iv_cache)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(airq_init);</div><div class='head'>diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c<br/>index 4159c63a5fd2..a835b31aad99 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/chsc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/chsc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/chsc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/chsc.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/crw.h&gt;</div><div class='ctx'> #include &lt;asm/isc.h&gt;</div><div class='ctx'> #include &lt;asm/ebcdic.h&gt;</div><div class='add'>+#include &lt;asm/ap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "css.h"</div><div class='ctx'> #include "cio.h"</div><div class='hunk'>@@ -586,6 +587,15 @@ static void chsc_process_sei_scm_avail(struct chsc_sei_nt0_area *sei_area)</div><div class='ctx'> 			      " failed (rc=%d).\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void chsc_process_sei_ap_cfg_chg(struct chsc_sei_nt0_area *sei_area)</div><div class='add'>+{</div><div class='add'>+	CIO_CRW_EVENT(3, "chsc: ap config changed\n");</div><div class='add'>+	if (sei_area-&gt;rs != 5)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ap_bus_cfg_chg();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void chsc_process_sei_nt2(struct chsc_sei_nt2_area *sei_area)</div><div class='ctx'> {</div><div class='ctx'> 	switch (sei_area-&gt;cc) {</div><div class='hunk'>@@ -612,6 +622,9 @@ static void chsc_process_sei_nt0(struct chsc_sei_nt0_area *sei_area)</div><div class='ctx'> 	case 2: /* i/o resource accessibility */</div><div class='ctx'> 		chsc_process_sei_res_acc(sei_area);</div><div class='ctx'> 		break;</div><div class='add'>+	case 3: /* ap config changed */</div><div class='add'>+		chsc_process_sei_ap_cfg_chg(sei_area);</div><div class='add'>+		break;</div><div class='ctx'> 	case 7: /* channel-path-availability information */</div><div class='ctx'> 		chsc_process_sei_chp_avail(sei_area);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c<br/>index de744ca158fd..18f5458f90e8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/cio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/cio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/cio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/cio.c</a></div><div class='hunk'>@@ -564,7 +564,7 @@ static irqreturn_t do_cio_interrupt(int irq, void *dummy)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irqaction io_interrupt = {</div><div class='del'>-	.name	 = "IO",</div><div class='add'>+	.name	 = "I/O",</div><div class='ctx'> 	.handler = do_cio_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h<br/>index 9811fd8a0c73..06a91743335a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/cio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/cio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/cio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/cio.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@ struct tpi_info {</div><div class='ctx'> 	struct subchannel_id schid;</div><div class='ctx'> 	u32 intparm;</div><div class='ctx'> 	u32 adapter_IO:1;</div><div class='del'>-	u32 :1;</div><div class='add'>+	u32 directed_irq:1;</div><div class='ctx'> 	u32 isc:3;</div><div class='ctx'> 	u32 :27;</div><div class='ctx'> 	u32 type:3;</div><div class='hunk'>@@ -115,7 +115,7 @@ struct subchannel {</div><div class='ctx'> 	struct schib_config config;</div><div class='ctx'> } __attribute__ ((aligned(8)));</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU(struct irb, cio_irb);</div><div class='add'>+DECLARE_PER_CPU_ALIGNED(struct irb, cio_irb);</div><div class='ctx'> </div><div class='ctx'> #define to_subchannel(n) container_of(n, struct subchannel, dev)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/ioasm.c b/drivers/s390/cio/ioasm.c<br/>index 14d328338ce2..08eb10283b18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/ioasm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/ioasm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/ioasm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/ioasm.c</a></div><div class='hunk'>@@ -233,6 +233,7 @@ int hsch(struct subchannel_id schid)</div><div class='ctx'> </div><div class='ctx'> 	return ccode;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(hsch);</div><div class='ctx'> </div><div class='ctx'> static inline int __xsch(struct subchannel_id schid)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h<br/>index a6f7c2986b94..a06944399865 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/qdio.h</a></div><div class='hunk'>@@ -228,9 +228,6 @@ struct qdio_q {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int first_to_check;</div><div class='ctx'> </div><div class='del'>-	/* first_to_check of the last time */</div><div class='del'>-	int last_move;</div><div class='del'>-</div><div class='ctx'> 	/* beginning position for calling the program */</div><div class='ctx'> 	int first_to_kick;</div><div class='ctx'> </div><div class='hunk'>@@ -341,8 +338,7 @@ static inline int multicast_outbound(struct qdio_q *q)</div><div class='ctx'> 	       (q-&gt;nr == q-&gt;irq_ptr-&gt;nr_output_qs - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define pci_out_supported(q) \</div><div class='del'>-	(q-&gt;irq_ptr-&gt;qib.ac &amp; QIB_AC_OUTBOUND_PCI_SUPPORTED)</div><div class='add'>+#define pci_out_supported(irq) ((irq)-&gt;qib.ac &amp; QIB_AC_OUTBOUND_PCI_SUPPORTED)</div><div class='ctx'> #define is_qebsm(q)			(q-&gt;irq_ptr-&gt;sch_token != 0)</div><div class='ctx'> </div><div class='ctx'> #define need_siga_in(q)			(q-&gt;irq_ptr-&gt;siga_flag.input)</div><div class='head'>diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c<br/>index d2f98e5829d4..35410e6eda2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_debug.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_debug.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/qdio_debug.c</a></div><div class='hunk'>@@ -121,15 +121,14 @@ static int qstat_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "Timestamp: %Lx  Last AI: %Lx\n",</div><div class='ctx'> 		   q-&gt;timestamp, last_ai_time);</div><div class='del'>-	seq_printf(m, "nr_used: %d  ftc: %d  last_move: %d\n",</div><div class='del'>-		   atomic_read(&amp;q-&gt;nr_buf_used),</div><div class='del'>-		   q-&gt;first_to_check, q-&gt;last_move);</div><div class='add'>+	seq_printf(m, "nr_used: %d  ftc: %d\n",</div><div class='add'>+		   atomic_read(&amp;q-&gt;nr_buf_used), q-&gt;first_to_check);</div><div class='ctx'> 	if (q-&gt;is_input_q) {</div><div class='ctx'> 		seq_printf(m, "polling: %d  ack start: %d  ack count: %d\n",</div><div class='ctx'> 			   q-&gt;u.in.polling, q-&gt;u.in.ack_start,</div><div class='ctx'> 			   q-&gt;u.in.ack_count);</div><div class='del'>-		seq_printf(m, "DSCI: %d   IRQs disabled: %u\n",</div><div class='del'>-			   *(u32 *)q-&gt;irq_ptr-&gt;dsci,</div><div class='add'>+		seq_printf(m, "DSCI: %x   IRQs disabled: %u\n",</div><div class='add'>+			   *(u8 *)q-&gt;irq_ptr-&gt;dsci,</div><div class='ctx'> 			   test_bit(QDIO_QUEUE_IRQS_DISABLED,</div><div class='ctx'> 			   &amp;q-&gt;u.in.queue_irq_state));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c<br/>index 9537e656e927..cfce255521ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/qdio_main.c</a></div><div class='hunk'>@@ -371,7 +371,7 @@ static inline int qdio_siga_input(struct qdio_q *q)</div><div class='ctx'> static inline void qdio_sync_queues(struct qdio_q *q)</div><div class='ctx'> {</div><div class='ctx'> 	/* PCI capable outbound queues will also be scanned so sync them too */</div><div class='del'>-	if (pci_out_supported(q))</div><div class='add'>+	if (pci_out_supported(q-&gt;irq_ptr))</div><div class='ctx'> 		qdio_siga_sync_all(q);</div><div class='ctx'> 	else</div><div class='ctx'> 		qdio_siga_sync_q(q);</div><div class='hunk'>@@ -415,7 +415,8 @@ static inline void account_sbals(struct qdio_q *q, unsigned int count)</div><div class='ctx'> 	q-&gt;q_stats.nr_sbals[pos]++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void process_buffer_error(struct qdio_q *q, int count)</div><div class='add'>+static void process_buffer_error(struct qdio_q *q, unsigned int start,</div><div class='add'>+				 int count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char state = (q-&gt;is_input_q) ? SLSB_P_INPUT_NOT_INIT :</div><div class='ctx'> 					SLSB_P_OUTPUT_NOT_INIT;</div><div class='hunk'>@@ -424,29 +425,29 @@ static void process_buffer_error(struct qdio_q *q, int count)</div><div class='ctx'> </div><div class='ctx'> 	/* special handling for no target buffer empty */</div><div class='ctx'> 	if (queue_type(q) == QDIO_IQDIO_QFMT &amp;&amp; !q-&gt;is_input_q &amp;&amp;</div><div class='del'>-	    q-&gt;sbal[q-&gt;first_to_check]-&gt;element[15].sflags == 0x10) {</div><div class='add'>+	    q-&gt;sbal[start]-&gt;element[15].sflags == 0x10) {</div><div class='ctx'> 		qperf_inc(q, target_full);</div><div class='del'>-		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "OUTFULL FTC:%02x",</div><div class='del'>-			      q-&gt;first_to_check);</div><div class='add'>+		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "OUTFULL FTC:%02x", start);</div><div class='ctx'> 		goto set;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DBF_ERROR("%4x BUF ERROR", SCH_NO(q));</div><div class='ctx'> 	DBF_ERROR((q-&gt;is_input_q) ? "IN:%2d" : "OUT:%2d", q-&gt;nr);</div><div class='del'>-	DBF_ERROR("FTC:%3d C:%3d", q-&gt;first_to_check, count);</div><div class='add'>+	DBF_ERROR("FTC:%3d C:%3d", start, count);</div><div class='ctx'> 	DBF_ERROR("F14:%2x F15:%2x",</div><div class='del'>-		  q-&gt;sbal[q-&gt;first_to_check]-&gt;element[14].sflags,</div><div class='del'>-		  q-&gt;sbal[q-&gt;first_to_check]-&gt;element[15].sflags);</div><div class='add'>+		  q-&gt;sbal[start]-&gt;element[14].sflags,</div><div class='add'>+		  q-&gt;sbal[start]-&gt;element[15].sflags);</div><div class='ctx'> </div><div class='ctx'> set:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Interrupts may be avoided as long as the error is present</div><div class='ctx'> 	 * so change the buffer state immediately to avoid starvation.</div><div class='ctx'> 	 */</div><div class='del'>-	set_buf_states(q, q-&gt;first_to_check, state, count);</div><div class='add'>+	set_buf_states(q, start, state, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void inbound_primed(struct qdio_q *q, int count)</div><div class='add'>+static inline void inbound_primed(struct qdio_q *q, unsigned int start,</div><div class='add'>+				  int count)</div><div class='ctx'> {</div><div class='ctx'> 	int new;</div><div class='ctx'> </div><div class='hunk'>@@ -457,7 +458,7 @@ static inline void inbound_primed(struct qdio_q *q, int count)</div><div class='ctx'> 		if (!q-&gt;u.in.polling) {</div><div class='ctx'> 			q-&gt;u.in.polling = 1;</div><div class='ctx'> 			q-&gt;u.in.ack_count = count;</div><div class='del'>-			q-&gt;u.in.ack_start = q-&gt;first_to_check;</div><div class='add'>+			q-&gt;u.in.ack_start = start;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -465,7 +466,7 @@ static inline void inbound_primed(struct qdio_q *q, int count)</div><div class='ctx'> 		set_buf_states(q, q-&gt;u.in.ack_start, SLSB_P_INPUT_NOT_INIT,</div><div class='ctx'> 			       q-&gt;u.in.ack_count);</div><div class='ctx'> 		q-&gt;u.in.ack_count = count;</div><div class='del'>-		q-&gt;u.in.ack_start = q-&gt;first_to_check;</div><div class='add'>+		q-&gt;u.in.ack_start = start;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -473,7 +474,7 @@ static inline void inbound_primed(struct qdio_q *q, int count)</div><div class='ctx'> 	 * ACK the newest buffer. The ACK will be removed in qdio_stop_polling</div><div class='ctx'> 	 * or by the next inbound run.</div><div class='ctx'> 	 */</div><div class='del'>-	new = add_buf(q-&gt;first_to_check, count - 1);</div><div class='add'>+	new = add_buf(start, count - 1);</div><div class='ctx'> 	if (q-&gt;u.in.polling) {</div><div class='ctx'> 		/* reset the previous ACK but first set the new one */</div><div class='ctx'> 		set_buf_state(q, new, SLSB_P_INPUT_ACK);</div><div class='hunk'>@@ -488,10 +489,10 @@ static inline void inbound_primed(struct qdio_q *q, int count)</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* need to change ALL buffers to get more interrupts */</div><div class='del'>-	set_buf_states(q, q-&gt;first_to_check, SLSB_P_INPUT_NOT_INIT, count);</div><div class='add'>+	set_buf_states(q, start, SLSB_P_INPUT_NOT_INIT, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_inbound_buffer_frontier(struct qdio_q *q)</div><div class='add'>+static int get_inbound_buffer_frontier(struct qdio_q *q, unsigned int start)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char state = 0;</div><div class='ctx'> 	int count;</div><div class='hunk'>@@ -504,64 +505,58 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)</div><div class='ctx'> 	 */</div><div class='ctx'> 	count = min(atomic_read(&amp;q-&gt;nr_buf_used), QDIO_MAX_BUFFERS_MASK);</div><div class='ctx'> 	if (!count)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No siga sync here, as a PCI or we after a thin interrupt</div><div class='ctx'> 	 * already sync'ed the queues.</div><div class='ctx'> 	 */</div><div class='del'>-	count = get_buf_states(q, q-&gt;first_to_check, &amp;state, count, 1, 0);</div><div class='add'>+	count = get_buf_states(q, start, &amp;state, count, 1, 0);</div><div class='ctx'> 	if (!count)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SLSB_P_INPUT_PRIMED:</div><div class='del'>-		inbound_primed(q, count);</div><div class='del'>-		q-&gt;first_to_check = add_buf(q-&gt;first_to_check, count);</div><div class='add'>+		inbound_primed(q, start, count);</div><div class='ctx'> 		if (atomic_sub_return(count, &amp;q-&gt;nr_buf_used) == 0)</div><div class='ctx'> 			qperf_inc(q, inbound_queue_full);</div><div class='ctx'> 		if (q-&gt;irq_ptr-&gt;perf_stat_enabled)</div><div class='ctx'> 			account_sbals(q, count);</div><div class='del'>-		break;</div><div class='add'>+		return count;</div><div class='ctx'> 	case SLSB_P_INPUT_ERROR:</div><div class='del'>-		process_buffer_error(q, count);</div><div class='del'>-		q-&gt;first_to_check = add_buf(q-&gt;first_to_check, count);</div><div class='add'>+		process_buffer_error(q, start, count);</div><div class='ctx'> 		if (atomic_sub_return(count, &amp;q-&gt;nr_buf_used) == 0)</div><div class='ctx'> 			qperf_inc(q, inbound_queue_full);</div><div class='ctx'> 		if (q-&gt;irq_ptr-&gt;perf_stat_enabled)</div><div class='ctx'> 			account_sbals_error(q, count);</div><div class='del'>-		break;</div><div class='add'>+		return count;</div><div class='ctx'> 	case SLSB_CU_INPUT_EMPTY:</div><div class='ctx'> 	case SLSB_P_INPUT_NOT_INIT:</div><div class='ctx'> 	case SLSB_P_INPUT_ACK:</div><div class='ctx'> 		if (q-&gt;irq_ptr-&gt;perf_stat_enabled)</div><div class='ctx'> 			q-&gt;q_stats.nr_sbal_nop++;</div><div class='ctx'> 		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "in nop:%1d %#02x",</div><div class='del'>-			q-&gt;nr, q-&gt;first_to_check);</div><div class='del'>-		break;</div><div class='add'>+			      q-&gt;nr, start);</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	return q-&gt;first_to_check;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qdio_inbound_q_moved(struct qdio_q *q)</div><div class='add'>+static int qdio_inbound_q_moved(struct qdio_q *q, unsigned int start)</div><div class='ctx'> {</div><div class='del'>-	int bufnr;</div><div class='add'>+	int count;</div><div class='ctx'> </div><div class='del'>-	bufnr = get_inbound_buffer_frontier(q);</div><div class='add'>+	count = get_inbound_buffer_frontier(q, start);</div><div class='ctx'> </div><div class='del'>-	if (bufnr != q-&gt;last_move) {</div><div class='del'>-		q-&gt;last_move = bufnr;</div><div class='del'>-		if (!is_thinint_irq(q-&gt;irq_ptr) &amp;&amp; MACHINE_IS_LPAR)</div><div class='del'>-			q-&gt;u.in.timestamp = get_tod_clock();</div><div class='del'>-		return 1;</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='add'>+	if (count &amp;&amp; !is_thinint_irq(q-&gt;irq_ptr) &amp;&amp; MACHINE_IS_LPAR)</div><div class='add'>+		q-&gt;u.in.timestamp = get_tod_clock();</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int qdio_inbound_q_done(struct qdio_q *q)</div><div class='add'>+static inline int qdio_inbound_q_done(struct qdio_q *q, unsigned int start)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char state = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -570,7 +565,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)</div><div class='ctx'> </div><div class='ctx'> 	if (need_siga_sync(q))</div><div class='ctx'> 		qdio_siga_sync_q(q);</div><div class='del'>-	get_buf_state(q, q-&gt;first_to_check, &amp;state, 0);</div><div class='add'>+	get_buf_state(q, start, &amp;state, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (state == SLSB_P_INPUT_PRIMED || state == SLSB_P_INPUT_ERROR)</div><div class='ctx'> 		/* more work coming */</div><div class='hunk'>@@ -588,8 +583,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)</div><div class='ctx'> 	 * has (probably) not moved (see qdio_inbound_processing).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (get_tod_clock_fast() &gt; q-&gt;u.in.timestamp + QDIO_INPUT_THRESHOLD) {</div><div class='del'>-		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "in done:%02x",</div><div class='del'>-			      q-&gt;first_to_check);</div><div class='add'>+		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "in done:%02x", start);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -637,17 +631,13 @@ static inline unsigned long qdio_aob_for_buffer(struct qdio_output_q *q,</div><div class='ctx'> 	return phys_aob;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qdio_kick_handler(struct qdio_q *q)</div><div class='add'>+static void qdio_kick_handler(struct qdio_q *q, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	int start = q-&gt;first_to_kick;</div><div class='del'>-	int end = q-&gt;first_to_check;</div><div class='del'>-	int count;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(q-&gt;irq_ptr-&gt;state != QDIO_IRQ_STATE_ACTIVE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	count = sub_buf(end, start);</div><div class='del'>-</div><div class='ctx'> 	if (q-&gt;is_input_q) {</div><div class='ctx'> 		qperf_inc(q, inbound_handler);</div><div class='ctx'> 		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "kih s:%02x c:%02x", start, count);</div><div class='hunk'>@@ -663,7 +653,7 @@ static void qdio_kick_handler(struct qdio_q *q)</div><div class='ctx'> 		   q-&gt;irq_ptr-&gt;int_parm);</div><div class='ctx'> </div><div class='ctx'> 	/* for the next time */</div><div class='del'>-	q-&gt;first_to_kick = end;</div><div class='add'>+	q-&gt;first_to_kick = add_buf(start, count);</div><div class='ctx'> 	q-&gt;qdio_error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -678,14 +668,20 @@ static inline int qdio_tasklet_schedule(struct qdio_q *q)</div><div class='ctx'> </div><div class='ctx'> static void __qdio_inbound_processing(struct qdio_q *q)</div><div class='ctx'> {</div><div class='add'>+	unsigned int start = q-&gt;first_to_check;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='ctx'> 	qperf_inc(q, tasklet_inbound);</div><div class='ctx'> </div><div class='del'>-	if (!qdio_inbound_q_moved(q))</div><div class='add'>+	count = qdio_inbound_q_moved(q, start);</div><div class='add'>+	if (count == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	qdio_kick_handler(q);</div><div class='add'>+	start = add_buf(start, count);</div><div class='add'>+	q-&gt;first_to_check = start;</div><div class='add'>+	qdio_kick_handler(q, count);</div><div class='ctx'> </div><div class='del'>-	if (!qdio_inbound_q_done(q)) {</div><div class='add'>+	if (!qdio_inbound_q_done(q, start)) {</div><div class='ctx'> 		/* means poll time is not yet over */</div><div class='ctx'> 		qperf_inc(q, tasklet_inbound_resched);</div><div class='ctx'> 		if (!qdio_tasklet_schedule(q))</div><div class='hunk'>@@ -697,7 +693,7 @@ static void __qdio_inbound_processing(struct qdio_q *q)</div><div class='ctx'> 	 * We need to check again to not lose initiative after</div><div class='ctx'> 	 * resetting the ACK state.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!qdio_inbound_q_done(q)) {</div><div class='add'>+	if (!qdio_inbound_q_done(q, start)) {</div><div class='ctx'> 		qperf_inc(q, tasklet_inbound_resched2);</div><div class='ctx'> 		qdio_tasklet_schedule(q);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -709,7 +705,7 @@ void qdio_inbound_processing(unsigned long data)</div><div class='ctx'> 	__qdio_inbound_processing(q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_outbound_buffer_frontier(struct qdio_q *q)</div><div class='add'>+static int get_outbound_buffer_frontier(struct qdio_q *q, unsigned int start)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char state = 0;</div><div class='ctx'> 	int count;</div><div class='hunk'>@@ -718,7 +714,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)</div><div class='ctx'> </div><div class='ctx'> 	if (need_siga_sync(q))</div><div class='ctx'> 		if (((queue_type(q) != QDIO_IQDIO_QFMT) &amp;&amp;</div><div class='del'>-		    !pci_out_supported(q)) ||</div><div class='add'>+		    !pci_out_supported(q-&gt;irq_ptr)) ||</div><div class='ctx'> 		    (queue_type(q) == QDIO_IQDIO_QFMT &amp;&amp;</div><div class='ctx'> 		    multicast_outbound(q)))</div><div class='ctx'> 			qdio_siga_sync_q(q);</div><div class='hunk'>@@ -729,12 +725,11 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)</div><div class='ctx'> 	 */</div><div class='ctx'> 	count = min(atomic_read(&amp;q-&gt;nr_buf_used), QDIO_MAX_BUFFERS_MASK);</div><div class='ctx'> 	if (!count)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	count = get_buf_states(q, q-&gt;first_to_check, &amp;state, count, 0,</div><div class='del'>-			       q-&gt;u.out.use_cq);</div><div class='add'>+	count = get_buf_states(q, start, &amp;state, count, 0, q-&gt;u.out.use_cq);</div><div class='ctx'> 	if (!count)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case SLSB_P_OUTPUT_EMPTY:</div><div class='hunk'>@@ -743,34 +738,29 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)</div><div class='ctx'> 			"out empty:%1d %02x", q-&gt;nr, count);</div><div class='ctx'> </div><div class='ctx'> 		atomic_sub(count, &amp;q-&gt;nr_buf_used);</div><div class='del'>-		q-&gt;first_to_check = add_buf(q-&gt;first_to_check, count);</div><div class='ctx'> 		if (q-&gt;irq_ptr-&gt;perf_stat_enabled)</div><div class='ctx'> 			account_sbals(q, count);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='add'>+		return count;</div><div class='ctx'> 	case SLSB_P_OUTPUT_ERROR:</div><div class='del'>-		process_buffer_error(q, count);</div><div class='del'>-		q-&gt;first_to_check = add_buf(q-&gt;first_to_check, count);</div><div class='add'>+		process_buffer_error(q, start, count);</div><div class='ctx'> 		atomic_sub(count, &amp;q-&gt;nr_buf_used);</div><div class='ctx'> 		if (q-&gt;irq_ptr-&gt;perf_stat_enabled)</div><div class='ctx'> 			account_sbals_error(q, count);</div><div class='del'>-		break;</div><div class='add'>+		return count;</div><div class='ctx'> 	case SLSB_CU_OUTPUT_PRIMED:</div><div class='ctx'> 		/* the adapter has not fetched the output yet */</div><div class='ctx'> 		if (q-&gt;irq_ptr-&gt;perf_stat_enabled)</div><div class='ctx'> 			q-&gt;q_stats.nr_sbal_nop++;</div><div class='ctx'> 		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "out primed:%1d",</div><div class='ctx'> 			      q-&gt;nr);</div><div class='del'>-		break;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case SLSB_P_OUTPUT_NOT_INIT:</div><div class='ctx'> 	case SLSB_P_OUTPUT_HALTED:</div><div class='del'>-		break;</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return q-&gt;first_to_check;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* all buffers processed? */</div><div class='hunk'>@@ -779,18 +769,16 @@ static inline int qdio_outbound_q_done(struct qdio_q *q)</div><div class='ctx'> 	return atomic_read(&amp;q-&gt;nr_buf_used) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int qdio_outbound_q_moved(struct qdio_q *q)</div><div class='add'>+static inline int qdio_outbound_q_moved(struct qdio_q *q, unsigned int start)</div><div class='ctx'> {</div><div class='del'>-	int bufnr;</div><div class='add'>+	int count;</div><div class='ctx'> </div><div class='del'>-	bufnr = get_outbound_buffer_frontier(q);</div><div class='add'>+	count = get_outbound_buffer_frontier(q, start);</div><div class='ctx'> </div><div class='del'>-	if (bufnr != q-&gt;last_move) {</div><div class='del'>-		q-&gt;last_move = bufnr;</div><div class='add'>+	if (count)</div><div class='ctx'> 		DBF_DEV_EVENT(DBF_INFO, q-&gt;irq_ptr, "out moved:%1d", q-&gt;nr);</div><div class='del'>-		return 1;</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qdio_kick_outbound_q(struct qdio_q *q, unsigned long aob)</div><div class='hunk'>@@ -837,15 +825,21 @@ retry:</div><div class='ctx'> </div><div class='ctx'> static void __qdio_outbound_processing(struct qdio_q *q)</div><div class='ctx'> {</div><div class='add'>+	unsigned int start = q-&gt;first_to_check;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='ctx'> 	qperf_inc(q, tasklet_outbound);</div><div class='ctx'> 	WARN_ON_ONCE(atomic_read(&amp;q-&gt;nr_buf_used) &lt; 0);</div><div class='ctx'> </div><div class='del'>-	if (qdio_outbound_q_moved(q))</div><div class='del'>-		qdio_kick_handler(q);</div><div class='add'>+	count = qdio_outbound_q_moved(q, start);</div><div class='add'>+	if (count) {</div><div class='add'>+		q-&gt;first_to_check = add_buf(start, count);</div><div class='add'>+		qdio_kick_handler(q, count);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (queue_type(q) == QDIO_ZFCP_QFMT)</div><div class='del'>-		if (!pci_out_supported(q) &amp;&amp; !qdio_outbound_q_done(q))</div><div class='del'>-			goto sched;</div><div class='add'>+	if (queue_type(q) == QDIO_ZFCP_QFMT &amp;&amp; !pci_out_supported(q-&gt;irq_ptr) &amp;&amp;</div><div class='add'>+	    !qdio_outbound_q_done(q))</div><div class='add'>+		goto sched;</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;u.out.pci_out_enabled)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -881,37 +875,40 @@ void qdio_outbound_timer(struct timer_list *t)</div><div class='ctx'> 	qdio_tasklet_schedule(q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void qdio_check_outbound_after_thinint(struct qdio_q *q)</div><div class='add'>+static inline void qdio_check_outbound_pci_queues(struct qdio_irq *irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct qdio_q *out;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!pci_out_supported(q))</div><div class='add'>+	if (!pci_out_supported(irq))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for_each_output_queue(q-&gt;irq_ptr, out, i)</div><div class='add'>+	for_each_output_queue(irq, out, i)</div><div class='ctx'> 		if (!qdio_outbound_q_done(out))</div><div class='ctx'> 			qdio_tasklet_schedule(out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __tiqdio_inbound_processing(struct qdio_q *q)</div><div class='ctx'> {</div><div class='add'>+	unsigned int start = q-&gt;first_to_check;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='ctx'> 	qperf_inc(q, tasklet_inbound);</div><div class='ctx'> 	if (need_siga_sync(q) &amp;&amp; need_siga_sync_after_ai(q))</div><div class='ctx'> 		qdio_sync_queues(q);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The interrupt could be caused by a PCI request. Check the</div><div class='del'>-	 * PCI capable outbound queues.</div><div class='del'>-	 */</div><div class='del'>-	qdio_check_outbound_after_thinint(q);</div><div class='add'>+	/* The interrupt could be caused by a PCI request: */</div><div class='add'>+	qdio_check_outbound_pci_queues(q-&gt;irq_ptr);</div><div class='ctx'> </div><div class='del'>-	if (!qdio_inbound_q_moved(q))</div><div class='add'>+	count = qdio_inbound_q_moved(q, start);</div><div class='add'>+	if (count == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	qdio_kick_handler(q);</div><div class='add'>+	start = add_buf(start, count);</div><div class='add'>+	q-&gt;first_to_check = start;</div><div class='add'>+	qdio_kick_handler(q, count);</div><div class='ctx'> </div><div class='del'>-	if (!qdio_inbound_q_done(q)) {</div><div class='add'>+	if (!qdio_inbound_q_done(q, start)) {</div><div class='ctx'> 		qperf_inc(q, tasklet_inbound_resched);</div><div class='ctx'> 		if (!qdio_tasklet_schedule(q))</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -922,7 +919,7 @@ static void __tiqdio_inbound_processing(struct qdio_q *q)</div><div class='ctx'> 	 * We need to check again to not lose initiative after</div><div class='ctx'> 	 * resetting the ACK state.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!qdio_inbound_q_done(q)) {</div><div class='add'>+	if (!qdio_inbound_q_done(q, start)) {</div><div class='ctx'> 		qperf_inc(q, tasklet_inbound_resched2);</div><div class='ctx'> 		qdio_tasklet_schedule(q);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -976,7 +973,7 @@ static void qdio_int_handler_pci(struct qdio_irq *irq_ptr)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(irq_ptr-&gt;qib.ac &amp; QIB_AC_OUTBOUND_PCI_SUPPORTED))</div><div class='add'>+	if (!pci_out_supported(irq_ptr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for_each_output_queue(irq_ptr, q, i) {</div><div class='hunk'>@@ -1642,7 +1639,7 @@ int qdio_start_irq(struct ccw_device *cdev, int nr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_nonshared_ind(irq_ptr))</div><div class='ctx'> 		goto rescan;</div><div class='del'>-	if (!qdio_inbound_q_done(q))</div><div class='add'>+	if (!qdio_inbound_q_done(q, q-&gt;first_to_check))</div><div class='ctx'> 		goto rescan;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1672,12 +1669,14 @@ int qdio_get_next_buffers(struct ccw_device *cdev, int nr, int *bufnr,</div><div class='ctx'> 			  int *error)</div><div class='ctx'> {</div><div class='ctx'> 	struct qdio_q *q;</div><div class='del'>-	int start, end;</div><div class='ctx'> 	struct qdio_irq *irq_ptr = cdev-&gt;private-&gt;qdio_data;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	int count;</div><div class='ctx'> </div><div class='ctx'> 	if (!irq_ptr)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	q = irq_ptr-&gt;input_qs[nr];</div><div class='add'>+	start = q-&gt;first_to_check;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Cannot rely on automatic sync after interrupt since queues may</div><div class='hunk'>@@ -1686,25 +1685,27 @@ int qdio_get_next_buffers(struct ccw_device *cdev, int nr, int *bufnr,</div><div class='ctx'> 	if (need_siga_sync(q))</div><div class='ctx'> 		qdio_sync_queues(q);</div><div class='ctx'> </div><div class='del'>-	/* check the PCI capable outbound queues. */</div><div class='del'>-	qdio_check_outbound_after_thinint(q);</div><div class='add'>+	qdio_check_outbound_pci_queues(irq_ptr);</div><div class='ctx'> </div><div class='del'>-	if (!qdio_inbound_q_moved(q))</div><div class='add'>+	count = qdio_inbound_q_moved(q, start);</div><div class='add'>+	if (count == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	start = add_buf(start, count);</div><div class='add'>+	q-&gt;first_to_check = start;</div><div class='add'>+</div><div class='ctx'> 	/* Note: upper-layer MUST stop processing immediately here ... */</div><div class='ctx'> 	if (unlikely(q-&gt;irq_ptr-&gt;state != QDIO_IRQ_STATE_ACTIVE))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	start = q-&gt;first_to_kick;</div><div class='del'>-	end = q-&gt;first_to_check;</div><div class='del'>-	*bufnr = start;</div><div class='add'>+	*bufnr = q-&gt;first_to_kick;</div><div class='ctx'> 	*error = q-&gt;qdio_error;</div><div class='ctx'> </div><div class='ctx'> 	/* for the next time */</div><div class='del'>-	q-&gt;first_to_kick = end;</div><div class='add'>+	q-&gt;first_to_kick = add_buf(q-&gt;first_to_kick, count);</div><div class='ctx'> 	q-&gt;qdio_error = 0;</div><div class='del'>-	return sub_buf(end, start);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(qdio_get_next_buffers);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c<br/>index a59887fad13e..99d7d2566a3a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_setup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_setup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_setup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/qdio_setup.c</a></div><div class='hunk'>@@ -523,7 +523,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,</div><div class='ctx'> 		 irq_ptr-&gt;schid.sch_no,</div><div class='ctx'> 		 is_thinint_irq(irq_ptr),</div><div class='ctx'> 		 (irq_ptr-&gt;sch_token) ? 1 : 0,</div><div class='del'>-		 (irq_ptr-&gt;qib.ac &amp; QIB_AC_OUTBOUND_PCI_SUPPORTED) ? 1 : 0,</div><div class='add'>+		 pci_out_supported(irq_ptr) ? 1 : 0,</div><div class='ctx'> 		 css_general_characteristics.aif_tdd,</div><div class='ctx'> 		 (irq_ptr-&gt;siga_flag.input) ? "R" : " ",</div><div class='ctx'> 		 (irq_ptr-&gt;siga_flag.output) ? "W" : " ",</div><div class='head'>diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c<br/>index 07dea602205b..28d59ac2204c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_thinint.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/qdio_thinint.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/qdio_thinint.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/qdio_thinint.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static LIST_HEAD(tiq_list);</div><div class='ctx'> static DEFINE_MUTEX(tiq_list_lock);</div><div class='ctx'> </div><div class='ctx'> /* Adapter interrupt definitions */</div><div class='del'>-static void tiqdio_thinint_handler(struct airq_struct *airq);</div><div class='add'>+static void tiqdio_thinint_handler(struct airq_struct *airq, bool floating);</div><div class='ctx'> </div><div class='ctx'> static struct airq_struct tiqdio_airq = {</div><div class='ctx'> 	.handler = tiqdio_thinint_handler,</div><div class='hunk'>@@ -179,7 +179,7 @@ static inline void tiqdio_call_inq_handlers(struct qdio_irq *irq)</div><div class='ctx'>  * tiqdio_thinint_handler - thin interrupt handler for qdio</div><div class='ctx'>  * @airq: pointer to adapter interrupt descriptor</div><div class='ctx'>  */</div><div class='del'>-static void tiqdio_thinint_handler(struct airq_struct *airq)</div><div class='add'>+static void tiqdio_thinint_handler(struct airq_struct *airq, bool floating)</div><div class='ctx'> {</div><div class='ctx'> 	u32 si_used = clear_shared_ind();</div><div class='ctx'> 	struct qdio_q *q;</div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_async.c b/drivers/s390/cio/vfio_ccw_async.c<br/>new file mode 100644<br/>index 000000000000..8c1d2357ef5b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_async.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_async.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Async I/O region for vfio_ccw</div><div class='add'>+ *</div><div class='add'>+ * Copyright Red Hat, Inc. 2019</div><div class='add'>+ *</div><div class='add'>+ * Author(s): Cornelia Huck &lt;cohuck@redhat.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/vfio.h&gt;</div><div class='add'>+#include &lt;linux/mdev.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vfio_ccw_private.h"</div><div class='add'>+</div><div class='add'>+static ssize_t vfio_ccw_async_region_read(struct vfio_ccw_private *private,</div><div class='add'>+					  char __user *buf, size_t count,</div><div class='add'>+					  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = VFIO_CCW_OFFSET_TO_INDEX(*ppos) - VFIO_CCW_NUM_REGIONS;</div><div class='add'>+	loff_t pos = *ppos &amp; VFIO_CCW_OFFSET_MASK;</div><div class='add'>+	struct ccw_cmd_region *region;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (pos + count &gt; sizeof(*region))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;private-&gt;io_mutex);</div><div class='add'>+	region = private-&gt;region[i].data;</div><div class='add'>+	if (copy_to_user(buf, (void *)region + pos, count))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	else</div><div class='add'>+		ret = count;</div><div class='add'>+	mutex_unlock(&amp;private-&gt;io_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vfio_ccw_async_region_write(struct vfio_ccw_private *private,</div><div class='add'>+					   const char __user *buf, size_t count,</div><div class='add'>+					   loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = VFIO_CCW_OFFSET_TO_INDEX(*ppos) - VFIO_CCW_NUM_REGIONS;</div><div class='add'>+	loff_t pos = *ppos &amp; VFIO_CCW_OFFSET_MASK;</div><div class='add'>+	struct ccw_cmd_region *region;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (pos + count &gt; sizeof(*region))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;private-&gt;io_mutex))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	region = private-&gt;region[i].data;</div><div class='add'>+	if (copy_from_user((void *)region + pos, buf, count)) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_ASYNC_REQ);</div><div class='add'>+</div><div class='add'>+	ret = region-&gt;ret_code ? region-&gt;ret_code : count;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;private-&gt;io_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vfio_ccw_async_region_release(struct vfio_ccw_private *private,</div><div class='add'>+					  struct vfio_ccw_region *region)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct vfio_ccw_regops vfio_ccw_async_region_ops = {</div><div class='add'>+	.read = vfio_ccw_async_region_read,</div><div class='add'>+	.write = vfio_ccw_async_region_write,</div><div class='add'>+	.release = vfio_ccw_async_region_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int vfio_ccw_register_async_dev_regions(struct vfio_ccw_private *private)</div><div class='add'>+{</div><div class='add'>+	return vfio_ccw_register_dev_region(private,</div><div class='add'>+					    VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD,</div><div class='add'>+					    &amp;vfio_ccw_async_region_ops,</div><div class='add'>+					    sizeof(struct ccw_cmd_region),</div><div class='add'>+					    VFIO_REGION_INFO_FLAG_READ |</div><div class='add'>+					    VFIO_REGION_INFO_FLAG_WRITE,</div><div class='add'>+					    private-&gt;cmd_region);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c<br/>index 384b3987eeb4..0e79799e9a71 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_cp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_cp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_cp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_cp.c</a></div><div class='hunk'>@@ -362,6 +362,7 @@ static void cp_unpin_free(struct channel_program *cp)</div><div class='ctx'> 	struct ccwchain *chain, *temp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	cp-&gt;initialized = false;</div><div class='ctx'> 	list_for_each_entry_safe(chain, temp, &amp;cp-&gt;ccwchain_list, next) {</div><div class='ctx'> 		for (i = 0; i &lt; chain-&gt;ch_len; i++) {</div><div class='ctx'> 			pfn_array_table_unpin_free(chain-&gt;ch_pat + i,</div><div class='hunk'>@@ -732,6 +733,9 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cp-&gt;orb.cmd.c64 = 1;</div><div class='ctx'> </div><div class='add'>+	if (!ret)</div><div class='add'>+		cp-&gt;initialized = true;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -746,7 +750,8 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)</div><div class='ctx'>  */</div><div class='ctx'> void cp_free(struct channel_program *cp)</div><div class='ctx'> {</div><div class='del'>-	cp_unpin_free(cp);</div><div class='add'>+	if (cp-&gt;initialized)</div><div class='add'>+		cp_unpin_free(cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -791,6 +796,10 @@ int cp_prefetch(struct channel_program *cp)</div><div class='ctx'> 	struct ccwchain *chain;</div><div class='ctx'> 	int len, idx, ret;</div><div class='ctx'> </div><div class='add'>+	/* this is an error in the caller */</div><div class='add'>+	if (!cp-&gt;initialized)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(chain, &amp;cp-&gt;ccwchain_list, next) {</div><div class='ctx'> 		len = chain-&gt;ch_len;</div><div class='ctx'> 		for (idx = 0; idx &lt; len; idx++) {</div><div class='hunk'>@@ -826,6 +835,10 @@ union orb *cp_get_orb(struct channel_program *cp, u32 intparm, u8 lpm)</div><div class='ctx'> 	struct ccwchain *chain;</div><div class='ctx'> 	struct ccw1 *cpa;</div><div class='ctx'> </div><div class='add'>+	/* this is an error in the caller */</div><div class='add'>+	if (!cp-&gt;initialized)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	orb = &amp;cp-&gt;orb;</div><div class='ctx'> </div><div class='ctx'> 	orb-&gt;cmd.intparm = intparm;</div><div class='hunk'>@@ -862,6 +875,9 @@ void cp_update_scsw(struct channel_program *cp, union scsw *scsw)</div><div class='ctx'> 	u32 cpa = scsw-&gt;cmd.cpa;</div><div class='ctx'> 	u32 ccw_head;</div><div class='ctx'> </div><div class='add'>+	if (!cp-&gt;initialized)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * LATER:</div><div class='ctx'> 	 * For now, only update the cmd.cpa part. We may need to deal with</div><div class='hunk'>@@ -898,6 +914,9 @@ bool cp_iova_pinned(struct channel_program *cp, u64 iova)</div><div class='ctx'> 	struct ccwchain *chain;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!cp-&gt;initialized)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(chain, &amp;cp-&gt;ccwchain_list, next) {</div><div class='ctx'> 		for (i = 0; i &lt; chain-&gt;ch_len; i++)</div><div class='ctx'> 			if (pfn_array_table_iova_pinned(chain-&gt;ch_pat + i,</div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_cp.h b/drivers/s390/cio/vfio_ccw_cp.h<br/>index a4b74fb1aa57..3c20cd208da5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_cp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_cp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_cp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_cp.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'>  * @ccwchain_list: list head of ccwchains</div><div class='ctx'>  * @orb: orb for the currently processed ssch request</div><div class='ctx'>  * @mdev: the mediated device to perform page pinning/unpinning</div><div class='add'>+ * @initialized: whether this instance is actually initialized</div><div class='ctx'>  *</div><div class='ctx'>  * @ccwchain_list is the head of a ccwchain list, that contents the</div><div class='ctx'>  * translated result of the guest channel program that pointed out by</div><div class='hunk'>@@ -30,6 +31,7 @@ struct channel_program {</div><div class='ctx'> 	struct list_head ccwchain_list;</div><div class='ctx'> 	union orb orb;</div><div class='ctx'> 	struct device *mdev;</div><div class='add'>+	bool initialized;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int cp_init(struct channel_program *cp, struct device *mdev,</div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c<br/>index a10cec0e86eb..ee8767f5845a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_drv.c</a></div><div class='hunk'>@@ -3,9 +3,11 @@</div><div class='ctx'>  * VFIO based Physical Subchannel device driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright IBM Corp. 2017</div><div class='add'>+ * Copyright Red Hat, Inc. 2019</div><div class='ctx'>  *</div><div class='ctx'>  * Author(s): Dong Jia Shi &lt;bjsdjshi@linux.vnet.ibm.com&gt;</div><div class='ctx'>  *            Xiao Feng Ren &lt;renxiaof@linux.vnet.ibm.com&gt;</div><div class='add'>+ *            Cornelia Huck &lt;cohuck@redhat.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -23,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> struct workqueue_struct *vfio_ccw_work_q;</div><div class='ctx'> static struct kmem_cache *vfio_ccw_io_region;</div><div class='add'>+static struct kmem_cache *vfio_ccw_cmd_region;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Helpers</div><div class='hunk'>@@ -40,26 +43,30 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)</div><div class='ctx'> 	if (ret != -EBUSY)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	iretry = 255;</div><div class='ctx'> 	do {</div><div class='del'>-		iretry = 255;</div><div class='ctx'> </div><div class='ctx'> 		ret = cio_cancel_halt_clear(sch, &amp;iretry);</div><div class='del'>-		while (ret == -EBUSY) {</div><div class='del'>-			/*</div><div class='del'>-			 * Flush all I/O and wait for</div><div class='del'>-			 * cancel/halt/clear completion.</div><div class='del'>-			 */</div><div class='del'>-			private-&gt;completion = &amp;completion;</div><div class='del'>-			spin_unlock_irq(sch-&gt;lock);</div><div class='ctx'> </div><div class='del'>-			wait_for_completion_timeout(&amp;completion, 3*HZ);</div><div class='add'>+		if (ret == -EIO) {</div><div class='add'>+			pr_err("vfio_ccw: could not quiesce subchannel 0.%x.%04x!\n",</div><div class='add'>+			       sch-&gt;schid.ssid, sch-&gt;schid.sch_no);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Flush all I/O and wait for</div><div class='add'>+		 * cancel/halt/clear completion.</div><div class='add'>+		 */</div><div class='add'>+		private-&gt;completion = &amp;completion;</div><div class='add'>+		spin_unlock_irq(sch-&gt;lock);</div><div class='ctx'> </div><div class='del'>-			spin_lock_irq(sch-&gt;lock);</div><div class='del'>-			private-&gt;completion = NULL;</div><div class='del'>-			flush_workqueue(vfio_ccw_work_q);</div><div class='del'>-			ret = cio_cancel_halt_clear(sch, &amp;iretry);</div><div class='del'>-		};</div><div class='add'>+		if (ret == -EBUSY)</div><div class='add'>+			wait_for_completion_timeout(&amp;completion, 3*HZ);</div><div class='ctx'> </div><div class='add'>+		private-&gt;completion = NULL;</div><div class='add'>+		flush_workqueue(vfio_ccw_work_q);</div><div class='add'>+		spin_lock_irq(sch-&gt;lock);</div><div class='ctx'> 		ret = cio_disable_subchannel(sch);</div><div class='ctx'> 	} while (ret == -EBUSY);</div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -72,20 +79,26 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct vfio_ccw_private *private;</div><div class='ctx'> 	struct irb *irb;</div><div class='add'>+	bool is_final;</div><div class='ctx'> </div><div class='ctx'> 	private = container_of(work, struct vfio_ccw_private, io_work);</div><div class='ctx'> 	irb = &amp;private-&gt;irb;</div><div class='ctx'> </div><div class='add'>+	is_final = !(scsw_actl(&amp;irb-&gt;scsw) &amp;</div><div class='add'>+		     (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT));</div><div class='ctx'> 	if (scsw_is_solicited(&amp;irb-&gt;scsw)) {</div><div class='ctx'> 		cp_update_scsw(&amp;private-&gt;cp, &amp;irb-&gt;scsw);</div><div class='del'>-		cp_free(&amp;private-&gt;cp);</div><div class='add'>+		if (is_final)</div><div class='add'>+			cp_free(&amp;private-&gt;cp);</div><div class='ctx'> 	}</div><div class='add'>+	mutex_lock(&amp;private-&gt;io_mutex);</div><div class='ctx'> 	memcpy(private-&gt;io_region-&gt;irb_area, irb, sizeof(*irb));</div><div class='add'>+	mutex_unlock(&amp;private-&gt;io_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (private-&gt;io_trigger)</div><div class='ctx'> 		eventfd_signal(private-&gt;io_trigger, 1);</div><div class='ctx'> </div><div class='del'>-	if (private-&gt;mdev)</div><div class='add'>+	if (private-&gt;mdev &amp;&amp; is_final)</div><div class='ctx'> 		private-&gt;state = VFIO_CCW_STATE_IDLE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -104,7 +117,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)</div><div class='ctx'> {</div><div class='ctx'> 	struct pmcw *pmcw = &amp;sch-&gt;schib.pmcw;</div><div class='ctx'> 	struct vfio_ccw_private *private;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (pmcw-&gt;qf) {</div><div class='ctx'> 		dev_warn(&amp;sch-&gt;dev, "vfio: ccw: does not support QDIO: %s\n",</div><div class='hunk'>@@ -118,13 +131,17 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)</div><div class='ctx'> </div><div class='ctx'> 	private-&gt;io_region = kmem_cache_zalloc(vfio_ccw_io_region,</div><div class='ctx'> 					       GFP_KERNEL | GFP_DMA);</div><div class='del'>-	if (!private-&gt;io_region) {</div><div class='del'>-		kfree(private);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!private-&gt;io_region)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	private-&gt;cmd_region = kmem_cache_zalloc(vfio_ccw_cmd_region,</div><div class='add'>+						GFP_KERNEL | GFP_DMA);</div><div class='add'>+	if (!private-&gt;cmd_region)</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	private-&gt;sch = sch;</div><div class='ctx'> 	dev_set_drvdata(&amp;sch-&gt;dev, private);</div><div class='add'>+	mutex_init(&amp;private-&gt;io_mutex);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(sch-&gt;lock);</div><div class='ctx'> 	private-&gt;state = VFIO_CCW_STATE_NOT_OPER;</div><div class='hunk'>@@ -148,7 +165,10 @@ out_disable:</div><div class='ctx'> 	cio_disable_subchannel(sch);</div><div class='ctx'> out_free:</div><div class='ctx'> 	dev_set_drvdata(&amp;sch-&gt;dev, NULL);</div><div class='del'>-	kmem_cache_free(vfio_ccw_io_region, private-&gt;io_region);</div><div class='add'>+	if (private-&gt;cmd_region)</div><div class='add'>+		kmem_cache_free(vfio_ccw_cmd_region, private-&gt;cmd_region);</div><div class='add'>+	if (private-&gt;io_region)</div><div class='add'>+		kmem_cache_free(vfio_ccw_io_region, private-&gt;io_region);</div><div class='ctx'> 	kfree(private);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -163,6 +183,7 @@ static int vfio_ccw_sch_remove(struct subchannel *sch)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;sch-&gt;dev, NULL);</div><div class='ctx'> </div><div class='add'>+	kmem_cache_free(vfio_ccw_cmd_region, private-&gt;cmd_region);</div><div class='ctx'> 	kmem_cache_free(vfio_ccw_io_region, private-&gt;io_region);</div><div class='ctx'> 	kfree(private);</div><div class='ctx'> </div><div class='hunk'>@@ -237,7 +258,7 @@ static struct css_driver vfio_ccw_sch_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init vfio_ccw_sch_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	vfio_ccw_work_q = create_singlethread_workqueue("vfio-ccw");</div><div class='ctx'> 	if (!vfio_ccw_work_q)</div><div class='hunk'>@@ -247,20 +268,30 @@ static int __init vfio_ccw_sch_init(void)</div><div class='ctx'> 					sizeof(struct ccw_io_region), 0,</div><div class='ctx'> 					SLAB_ACCOUNT, 0,</div><div class='ctx'> 					sizeof(struct ccw_io_region), NULL);</div><div class='del'>-	if (!vfio_ccw_io_region) {</div><div class='del'>-		destroy_workqueue(vfio_ccw_work_q);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!vfio_ccw_io_region)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	vfio_ccw_cmd_region = kmem_cache_create_usercopy("vfio_ccw_cmd_region",</div><div class='add'>+					sizeof(struct ccw_cmd_region), 0,</div><div class='add'>+					SLAB_ACCOUNT, 0,</div><div class='add'>+					sizeof(struct ccw_cmd_region), NULL);</div><div class='add'>+	if (!vfio_ccw_cmd_region)</div><div class='add'>+		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	isc_register(VFIO_CCW_ISC);</div><div class='ctx'> 	ret = css_driver_register(&amp;vfio_ccw_sch_driver);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		isc_unregister(VFIO_CCW_ISC);</div><div class='del'>-		kmem_cache_destroy(vfio_ccw_io_region);</div><div class='del'>-		destroy_workqueue(vfio_ccw_work_q);</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	kmem_cache_destroy(vfio_ccw_cmd_region);</div><div class='add'>+	kmem_cache_destroy(vfio_ccw_io_region);</div><div class='add'>+	destroy_workqueue(vfio_ccw_work_q);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit vfio_ccw_sch_exit(void)</div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c<br/>index cab17865aafe..49d9d3da0282 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_fsm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_fsm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_fsm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_fsm.c</a></div><div class='hunk'>@@ -3,8 +3,10 @@</div><div class='ctx'>  * Finite state machine for vfio-ccw device handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright IBM Corp. 2017</div><div class='add'>+ * Copyright Red Hat, Inc. 2019</div><div class='ctx'>  *</div><div class='ctx'>  * Author(s): Dong Jia Shi &lt;bjsdjshi@linux.vnet.ibm.com&gt;</div><div class='add'>+ *            Cornelia Huck &lt;cohuck@redhat.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/vfio.h&gt;</div><div class='hunk'>@@ -28,9 +30,12 @@ static int fsm_io_helper(struct vfio_ccw_private *private)</div><div class='ctx'> 	sch = private-&gt;sch;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(sch-&gt;lock, flags);</div><div class='del'>-	private-&gt;state = VFIO_CCW_STATE_BUSY;</div><div class='ctx'> </div><div class='ctx'> 	orb = cp_get_orb(&amp;private-&gt;cp, (u32)(addr_t)sch, sch-&gt;lpm);</div><div class='add'>+	if (!orb) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Issue "Start Subchannel" */</div><div class='ctx'> 	ccode = ssch(sch-&gt;schid, orb);</div><div class='hunk'>@@ -42,6 +47,7 @@ static int fsm_io_helper(struct vfio_ccw_private *private)</div><div class='ctx'> 		 */</div><div class='ctx'> 		sch-&gt;schib.scsw.cmd.actl |= SCSW_ACTL_START_PEND;</div><div class='ctx'> 		ret = 0;</div><div class='add'>+		private-&gt;state = VFIO_CCW_STATE_CP_PENDING;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:		/* Status pending */</div><div class='ctx'> 	case 2:		/* Busy */</div><div class='hunk'>@@ -64,6 +70,76 @@ static int fsm_io_helper(struct vfio_ccw_private *private)</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = ccode;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(sch-&gt;lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsm_do_halt(struct vfio_ccw_private *private)</div><div class='add'>+{</div><div class='add'>+	struct subchannel *sch;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ccode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sch = private-&gt;sch;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(sch-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Issue "Halt Subchannel" */</div><div class='add'>+	ccode = hsch(sch-&gt;schid);</div><div class='add'>+</div><div class='add'>+	switch (ccode) {</div><div class='add'>+	case 0:</div><div class='add'>+		/*</div><div class='add'>+		 * Initialize device status information</div><div class='add'>+		 */</div><div class='add'>+		sch-&gt;schib.scsw.cmd.actl |= SCSW_ACTL_HALT_PEND;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:		/* Status pending */</div><div class='add'>+	case 2:		/* Busy */</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		break;</div><div class='add'>+	case 3:		/* Device not operational */</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = ccode;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(sch-&gt;lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsm_do_clear(struct vfio_ccw_private *private)</div><div class='add'>+{</div><div class='add'>+	struct subchannel *sch;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ccode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sch = private-&gt;sch;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(sch-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Issue "Clear Subchannel" */</div><div class='add'>+	ccode = csch(sch-&gt;schid);</div><div class='add'>+</div><div class='add'>+	switch (ccode) {</div><div class='add'>+	case 0:</div><div class='add'>+		/*</div><div class='add'>+		 * Initialize device status information</div><div class='add'>+		 */</div><div class='add'>+		sch-&gt;schib.scsw.cmd.actl = SCSW_ACTL_CLEAR_PEND;</div><div class='add'>+		/* TODO: check what else we might need to clear */</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 3:		/* Device not operational */</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = ccode;</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_irqrestore(sch-&gt;lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -102,6 +178,30 @@ static void fsm_io_busy(struct vfio_ccw_private *private,</div><div class='ctx'> 	private-&gt;io_region-&gt;ret_code = -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fsm_io_retry(struct vfio_ccw_private *private,</div><div class='add'>+			 enum vfio_ccw_event event)</div><div class='add'>+{</div><div class='add'>+	private-&gt;io_region-&gt;ret_code = -EAGAIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsm_async_error(struct vfio_ccw_private *private,</div><div class='add'>+			    enum vfio_ccw_event event)</div><div class='add'>+{</div><div class='add'>+	struct ccw_cmd_region *cmd_region = private-&gt;cmd_region;</div><div class='add'>+</div><div class='add'>+	pr_err("vfio-ccw: FSM: %s request from state:%d\n",</div><div class='add'>+	       cmd_region-&gt;command == VFIO_CCW_ASYNC_CMD_HSCH ? "halt" :</div><div class='add'>+	       cmd_region-&gt;command == VFIO_CCW_ASYNC_CMD_CSCH ? "clear" :</div><div class='add'>+	       "&lt;unknown&gt;", private-&gt;state);</div><div class='add'>+	cmd_region-&gt;ret_code = -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsm_async_retry(struct vfio_ccw_private *private,</div><div class='add'>+			    enum vfio_ccw_event event)</div><div class='add'>+{</div><div class='add'>+	private-&gt;cmd_region-&gt;ret_code = -EAGAIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fsm_disabled_irq(struct vfio_ccw_private *private,</div><div class='ctx'> 			     enum vfio_ccw_event event)</div><div class='ctx'> {</div><div class='hunk'>@@ -130,8 +230,7 @@ static void fsm_io_request(struct vfio_ccw_private *private,</div><div class='ctx'> 	struct mdev_device *mdev = private-&gt;mdev;</div><div class='ctx'> 	char *errstr = "request";</div><div class='ctx'> </div><div class='del'>-	private-&gt;state = VFIO_CCW_STATE_BUSY;</div><div class='del'>-</div><div class='add'>+	private-&gt;state = VFIO_CCW_STATE_CP_PROCESSING;</div><div class='ctx'> 	memcpy(scsw, io_region-&gt;scsw_area, sizeof(*scsw));</div><div class='ctx'> </div><div class='ctx'> 	if (scsw-&gt;cmd.fctl &amp; SCSW_FCTL_START_FUNC) {</div><div class='hunk'>@@ -166,22 +265,42 @@ static void fsm_io_request(struct vfio_ccw_private *private,</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else if (scsw-&gt;cmd.fctl &amp; SCSW_FCTL_HALT_FUNC) {</div><div class='del'>-		/* XXX: Handle halt. */</div><div class='add'>+		/* halt is handled via the async cmd region */</div><div class='ctx'> 		io_region-&gt;ret_code = -EOPNOTSUPP;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	} else if (scsw-&gt;cmd.fctl &amp; SCSW_FCTL_CLEAR_FUNC) {</div><div class='del'>-		/* XXX: Handle clear. */</div><div class='add'>+		/* clear is handled via the async cmd region */</div><div class='ctx'> 		io_region-&gt;ret_code = -EOPNOTSUPP;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	private-&gt;state = VFIO_CCW_STATE_IDLE;</div><div class='ctx'> 	trace_vfio_ccw_io_fctl(scsw-&gt;cmd.fctl, get_schid(private),</div><div class='ctx'> 			       io_region-&gt;ret_code, errstr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Deal with an async request from userspace.</div><div class='add'>+ */</div><div class='add'>+static void fsm_async_request(struct vfio_ccw_private *private,</div><div class='add'>+			      enum vfio_ccw_event event)</div><div class='add'>+{</div><div class='add'>+	struct ccw_cmd_region *cmd_region = private-&gt;cmd_region;</div><div class='add'>+</div><div class='add'>+	switch (cmd_region-&gt;command) {</div><div class='add'>+	case VFIO_CCW_ASYNC_CMD_HSCH:</div><div class='add'>+		cmd_region-&gt;ret_code = fsm_do_halt(private);</div><div class='add'>+		break;</div><div class='add'>+	case VFIO_CCW_ASYNC_CMD_CSCH:</div><div class='add'>+		cmd_region-&gt;ret_code = fsm_do_clear(private);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* should not happen? */</div><div class='add'>+		cmd_region-&gt;ret_code = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Got an interrupt for a normal io (state busy).</div><div class='ctx'>  */</div><div class='ctx'> static void fsm_irq(struct vfio_ccw_private *private,</div><div class='hunk'>@@ -204,21 +323,31 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {</div><div class='ctx'> 	[VFIO_CCW_STATE_NOT_OPER] = {</div><div class='ctx'> 		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_nop,</div><div class='ctx'> 		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_error,</div><div class='add'>+		[VFIO_CCW_EVENT_ASYNC_REQ]	= fsm_async_error,</div><div class='ctx'> 		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_disabled_irq,</div><div class='ctx'> 	},</div><div class='ctx'> 	[VFIO_CCW_STATE_STANDBY] = {</div><div class='ctx'> 		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_notoper,</div><div class='ctx'> 		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_error,</div><div class='add'>+		[VFIO_CCW_EVENT_ASYNC_REQ]	= fsm_async_error,</div><div class='ctx'> 		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_irq,</div><div class='ctx'> 	},</div><div class='ctx'> 	[VFIO_CCW_STATE_IDLE] = {</div><div class='ctx'> 		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_notoper,</div><div class='ctx'> 		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_request,</div><div class='add'>+		[VFIO_CCW_EVENT_ASYNC_REQ]	= fsm_async_request,</div><div class='add'>+		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_irq,</div><div class='add'>+	},</div><div class='add'>+	[VFIO_CCW_STATE_CP_PROCESSING] = {</div><div class='add'>+		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_notoper,</div><div class='add'>+		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_retry,</div><div class='add'>+		[VFIO_CCW_EVENT_ASYNC_REQ]	= fsm_async_retry,</div><div class='ctx'> 		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_irq,</div><div class='ctx'> 	},</div><div class='del'>-	[VFIO_CCW_STATE_BUSY] = {</div><div class='add'>+	[VFIO_CCW_STATE_CP_PENDING] = {</div><div class='ctx'> 		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_notoper,</div><div class='ctx'> 		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_busy,</div><div class='add'>+		[VFIO_CCW_EVENT_ASYNC_REQ]	= fsm_async_request,</div><div class='ctx'> 		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_irq,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c<br/>index f673e106c041..5eb61116ca6f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_ops.c</a></div><div class='hunk'>@@ -3,13 +3,17 @@</div><div class='ctx'>  * Physical device callbacks for vfio_ccw</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright IBM Corp. 2017</div><div class='add'>+ * Copyright Red Hat, Inc. 2019</div><div class='ctx'>  *</div><div class='ctx'>  * Author(s): Dong Jia Shi &lt;bjsdjshi@linux.vnet.ibm.com&gt;</div><div class='ctx'>  *            Xiao Feng Ren &lt;renxiaof@linux.vnet.ibm.com&gt;</div><div class='add'>+ *            Cornelia Huck &lt;cohuck@redhat.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/vfio.h&gt;</div><div class='ctx'> #include &lt;linux/mdev.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vfio_ccw_private.h"</div><div class='ctx'> </div><div class='hunk'>@@ -130,11 +134,12 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev)</div><div class='ctx'> </div><div class='ctx'> 	if ((private-&gt;state != VFIO_CCW_STATE_NOT_OPER) &amp;&amp;</div><div class='ctx'> 	    (private-&gt;state != VFIO_CCW_STATE_STANDBY)) {</div><div class='del'>-		if (!vfio_ccw_mdev_reset(mdev))</div><div class='add'>+		if (!vfio_ccw_sch_quiesce(private-&gt;sch))</div><div class='ctx'> 			private-&gt;state = VFIO_CCW_STATE_STANDBY;</div><div class='ctx'> 		/* The state will be NOT_OPER on error. */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cp_free(&amp;private-&gt;cp);</div><div class='ctx'> 	private-&gt;mdev = NULL;</div><div class='ctx'> 	atomic_inc(&amp;private-&gt;avail);</div><div class='ctx'> </div><div class='hunk'>@@ -146,20 +151,66 @@ static int vfio_ccw_mdev_open(struct mdev_device *mdev)</div><div class='ctx'> 	struct vfio_ccw_private *private =</div><div class='ctx'> 		dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='ctx'> 	unsigned long events = VFIO_IOMMU_NOTIFY_DMA_UNMAP;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	private-&gt;nb.notifier_call = vfio_ccw_mdev_notifier;</div><div class='ctx'> </div><div class='del'>-	return vfio_register_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,</div><div class='del'>-				      &amp;events, &amp;private-&gt;nb);</div><div class='add'>+	ret = vfio_register_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,</div><div class='add'>+				     &amp;events, &amp;private-&gt;nb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vfio_ccw_register_async_dev_regions(private);</div><div class='add'>+	if (ret)</div><div class='add'>+		vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,</div><div class='add'>+					 &amp;private-&gt;nb);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vfio_ccw_mdev_release(struct mdev_device *mdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vfio_ccw_private *private =</div><div class='ctx'> 		dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	if ((private-&gt;state != VFIO_CCW_STATE_NOT_OPER) &amp;&amp;</div><div class='add'>+	    (private-&gt;state != VFIO_CCW_STATE_STANDBY)) {</div><div class='add'>+		if (!vfio_ccw_mdev_reset(mdev))</div><div class='add'>+			private-&gt;state = VFIO_CCW_STATE_STANDBY;</div><div class='add'>+		/* The state will be NOT_OPER on error. */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp_free(&amp;private-&gt;cp);</div><div class='ctx'> 	vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,</div><div class='ctx'> 				 &amp;private-&gt;nb);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; private-&gt;num_regions; i++)</div><div class='add'>+		private-&gt;region[i].ops-&gt;release(private, &amp;private-&gt;region[i]);</div><div class='add'>+</div><div class='add'>+	private-&gt;num_regions = 0;</div><div class='add'>+	kfree(private-&gt;region);</div><div class='add'>+	private-&gt;region = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vfio_ccw_mdev_read_io_region(struct vfio_ccw_private *private,</div><div class='add'>+					    char __user *buf, size_t count,</div><div class='add'>+					    loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	loff_t pos = *ppos &amp; VFIO_CCW_OFFSET_MASK;</div><div class='add'>+	struct ccw_io_region *region;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (pos + count &gt; sizeof(*region))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;private-&gt;io_mutex);</div><div class='add'>+	region = private-&gt;io_region;</div><div class='add'>+	if (copy_to_user(buf, (void *)region + pos, count))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	else</div><div class='add'>+		ret = count;</div><div class='add'>+	mutex_unlock(&amp;private-&gt;io_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t vfio_ccw_mdev_read(struct mdev_device *mdev,</div><div class='hunk'>@@ -167,18 +218,54 @@ static ssize_t vfio_ccw_mdev_read(struct mdev_device *mdev,</div><div class='ctx'> 				  size_t count,</div><div class='ctx'> 				  loff_t *ppos)</div><div class='ctx'> {</div><div class='add'>+	unsigned int index = VFIO_CCW_OFFSET_TO_INDEX(*ppos);</div><div class='ctx'> 	struct vfio_ccw_private *private;</div><div class='add'>+</div><div class='add'>+	private = dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='add'>+</div><div class='add'>+	if (index &gt;= VFIO_CCW_NUM_REGIONS + private-&gt;num_regions)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (index) {</div><div class='add'>+	case VFIO_CCW_CONFIG_REGION_INDEX:</div><div class='add'>+		return vfio_ccw_mdev_read_io_region(private, buf, count, ppos);</div><div class='add'>+	default:</div><div class='add'>+		index -= VFIO_CCW_NUM_REGIONS;</div><div class='add'>+		return private-&gt;region[index].ops-&gt;read(private, buf, count,</div><div class='add'>+							ppos);</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 ssize_t vfio_ccw_mdev_write_io_region(struct vfio_ccw_private *private,</div><div class='add'>+					     const char __user *buf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	loff_t pos = *ppos &amp; VFIO_CCW_OFFSET_MASK;</div><div class='ctx'> 	struct ccw_io_region *region;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (*ppos + count &gt; sizeof(*region))</div><div class='add'>+	if (pos + count &gt; sizeof(*region))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	private = dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='add'>+	if (!mutex_trylock(&amp;private-&gt;io_mutex))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	region = private-&gt;io_region;</div><div class='del'>-	if (copy_to_user(buf, (void *)region + *ppos, count))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (copy_from_user((void *)region + pos, buf, count)) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_IO_REQ);</div><div class='add'>+	if (region-&gt;ret_code != 0)</div><div class='add'>+		private-&gt;state = VFIO_CCW_STATE_IDLE;</div><div class='add'>+	ret = (region-&gt;ret_code != 0) ? region-&gt;ret_code : count;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;private-&gt;io_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t vfio_ccw_mdev_write(struct mdev_device *mdev,</div><div class='hunk'>@@ -186,42 +273,47 @@ static ssize_t vfio_ccw_mdev_write(struct mdev_device *mdev,</div><div class='ctx'> 				   size_t count,</div><div class='ctx'> 				   loff_t *ppos)</div><div class='ctx'> {</div><div class='add'>+	unsigned int index = VFIO_CCW_OFFSET_TO_INDEX(*ppos);</div><div class='ctx'> 	struct vfio_ccw_private *private;</div><div class='del'>-	struct ccw_io_region *region;</div><div class='del'>-</div><div class='del'>-	if (*ppos + count &gt; sizeof(*region))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	private = dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='del'>-	if (private-&gt;state != VFIO_CCW_STATE_IDLE)</div><div class='del'>-		return -EACCES;</div><div class='ctx'> </div><div class='del'>-	region = private-&gt;io_region;</div><div class='del'>-	if (copy_from_user((void *)region + *ppos, buf, count))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (index &gt;= VFIO_CCW_NUM_REGIONS + private-&gt;num_regions)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_IO_REQ);</div><div class='del'>-	if (region-&gt;ret_code != 0) {</div><div class='del'>-		private-&gt;state = VFIO_CCW_STATE_IDLE;</div><div class='del'>-		return region-&gt;ret_code;</div><div class='add'>+	switch (index) {</div><div class='add'>+	case VFIO_CCW_CONFIG_REGION_INDEX:</div><div class='add'>+		return vfio_ccw_mdev_write_io_region(private, buf, count, ppos);</div><div class='add'>+	default:</div><div class='add'>+		index -= VFIO_CCW_NUM_REGIONS;</div><div class='add'>+		return private-&gt;region[index].ops-&gt;write(private, buf, count,</div><div class='add'>+							 ppos);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vfio_ccw_mdev_get_device_info(struct vfio_device_info *info)</div><div class='add'>+static int vfio_ccw_mdev_get_device_info(struct vfio_device_info *info,</div><div class='add'>+					 struct mdev_device *mdev)</div><div class='ctx'> {</div><div class='add'>+	struct vfio_ccw_private *private;</div><div class='add'>+</div><div class='add'>+	private = dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='ctx'> 	info-&gt;flags = VFIO_DEVICE_FLAGS_CCW | VFIO_DEVICE_FLAGS_RESET;</div><div class='del'>-	info-&gt;num_regions = VFIO_CCW_NUM_REGIONS;</div><div class='add'>+	info-&gt;num_regions = VFIO_CCW_NUM_REGIONS + private-&gt;num_regions;</div><div class='ctx'> 	info-&gt;num_irqs = VFIO_CCW_NUM_IRQS;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vfio_ccw_mdev_get_region_info(struct vfio_region_info *info,</div><div class='del'>-					 u16 *cap_type_id,</div><div class='del'>-					 void **cap_type)</div><div class='add'>+					 struct mdev_device *mdev,</div><div class='add'>+					 unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	struct vfio_ccw_private *private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	private = dev_get_drvdata(mdev_parent_dev(mdev));</div><div class='ctx'> 	switch (info-&gt;index) {</div><div class='ctx'> 	case VFIO_CCW_CONFIG_REGION_INDEX:</div><div class='ctx'> 		info-&gt;offset = 0;</div><div class='hunk'>@@ -229,9 +321,55 @@ static int vfio_ccw_mdev_get_region_info(struct vfio_region_info *info,</div><div class='ctx'> 		info-&gt;flags = VFIO_REGION_INFO_FLAG_READ</div><div class='ctx'> 			      | VFIO_REGION_INFO_FLAG_WRITE;</div><div class='ctx'> 		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	default: /* all other regions are handled via capability chain */</div><div class='add'>+	{</div><div class='add'>+		struct vfio_info_cap caps = { .buf = NULL, .size = 0 };</div><div class='add'>+		struct vfio_region_info_cap_type cap_type = {</div><div class='add'>+			.header.id = VFIO_REGION_INFO_CAP_TYPE,</div><div class='add'>+			.header.version = 1 };</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;index &gt;=</div><div class='add'>+		    VFIO_CCW_NUM_REGIONS + private-&gt;num_regions)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		info-&gt;index = array_index_nospec(info-&gt;index,</div><div class='add'>+						 VFIO_CCW_NUM_REGIONS +</div><div class='add'>+						 private-&gt;num_regions);</div><div class='add'>+</div><div class='add'>+		i = info-&gt;index - VFIO_CCW_NUM_REGIONS;</div><div class='add'>+</div><div class='add'>+		info-&gt;offset = VFIO_CCW_INDEX_TO_OFFSET(info-&gt;index);</div><div class='add'>+		info-&gt;size = private-&gt;region[i].size;</div><div class='add'>+		info-&gt;flags = private-&gt;region[i].flags;</div><div class='add'>+</div><div class='add'>+		cap_type.type = private-&gt;region[i].type;</div><div class='add'>+		cap_type.subtype = private-&gt;region[i].subtype;</div><div class='add'>+</div><div class='add'>+		ret = vfio_info_add_capability(&amp;caps, &amp;cap_type.header,</div><div class='add'>+					       sizeof(cap_type));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		info-&gt;flags |= VFIO_REGION_INFO_FLAG_CAPS;</div><div class='add'>+		if (info-&gt;argsz &lt; sizeof(*info) + caps.size) {</div><div class='add'>+			info-&gt;argsz = sizeof(*info) + caps.size;</div><div class='add'>+			info-&gt;cap_offset = 0;</div><div class='add'>+		} else {</div><div class='add'>+			vfio_info_cap_shift(&amp;caps, sizeof(*info));</div><div class='add'>+			if (copy_to_user((void __user *)arg + sizeof(*info),</div><div class='add'>+					 caps.buf, caps.size)) {</div><div class='add'>+				kfree(caps.buf);</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+			info-&gt;cap_offset = sizeof(*info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(caps.buf);</div><div class='add'>+</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 vfio_ccw_mdev_get_irq_info(struct vfio_irq_info *info)</div><div class='hunk'>@@ -308,6 +446,32 @@ static int vfio_ccw_mdev_set_irqs(struct mdev_device *mdev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int vfio_ccw_register_dev_region(struct vfio_ccw_private *private,</div><div class='add'>+				 unsigned int subtype,</div><div class='add'>+				 const struct vfio_ccw_regops *ops,</div><div class='add'>+				 size_t size, u32 flags, void *data)</div><div class='add'>+{</div><div class='add'>+	struct vfio_ccw_region *region;</div><div class='add'>+</div><div class='add'>+	region = krealloc(private-&gt;region,</div><div class='add'>+			  (private-&gt;num_regions + 1) * sizeof(*region),</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	if (!region)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	private-&gt;region = region;</div><div class='add'>+	private-&gt;region[private-&gt;num_regions].type = VFIO_REGION_TYPE_CCW;</div><div class='add'>+	private-&gt;region[private-&gt;num_regions].subtype = subtype;</div><div class='add'>+	private-&gt;region[private-&gt;num_regions].ops = ops;</div><div class='add'>+	private-&gt;region[private-&gt;num_regions].size = size;</div><div class='add'>+	private-&gt;region[private-&gt;num_regions].flags = flags;</div><div class='add'>+	private-&gt;region[private-&gt;num_regions].data = data;</div><div class='add'>+</div><div class='add'>+	private-&gt;num_regions++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,</div><div class='ctx'> 				   unsigned int cmd,</div><div class='ctx'> 				   unsigned long arg)</div><div class='hunk'>@@ -328,7 +492,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,</div><div class='ctx'> 		if (info.argsz &lt; minsz)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		ret = vfio_ccw_mdev_get_device_info(&amp;info);</div><div class='add'>+		ret = vfio_ccw_mdev_get_device_info(&amp;info, mdev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -337,8 +501,6 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,</div><div class='ctx'> 	case VFIO_DEVICE_GET_REGION_INFO:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct vfio_region_info info;</div><div class='del'>-		u16 cap_type_id = 0;</div><div class='del'>-		void *cap_type = NULL;</div><div class='ctx'> </div><div class='ctx'> 		minsz = offsetofend(struct vfio_region_info, offset);</div><div class='ctx'> </div><div class='hunk'>@@ -348,8 +510,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,</div><div class='ctx'> 		if (info.argsz &lt; minsz)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		ret = vfio_ccw_mdev_get_region_info(&amp;info, &amp;cap_type_id,</div><div class='del'>-						    &amp;cap_type);</div><div class='add'>+		ret = vfio_ccw_mdev_get_region_info(&amp;info, mdev, arg);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h<br/>index 08e9a7dc9176..f1092c3dc1b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_private.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/cio/vfio_ccw_private.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/cio/vfio_ccw_private.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/cio/vfio_ccw_private.h</a></div><div class='hunk'>@@ -3,9 +3,11 @@</div><div class='ctx'>  * Private stuff for vfio_ccw driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright IBM Corp. 2017</div><div class='add'>+ * Copyright Red Hat, Inc. 2019</div><div class='ctx'>  *</div><div class='ctx'>  * Author(s): Dong Jia Shi &lt;bjsdjshi@linux.vnet.ibm.com&gt;</div><div class='ctx'>  *            Xiao Feng Ren &lt;renxiaof@linux.vnet.ibm.com&gt;</div><div class='add'>+ *            Cornelia Huck &lt;cohuck@redhat.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VFIO_CCW_PRIVATE_H_</div><div class='hunk'>@@ -19,6 +21,40 @@</div><div class='ctx'> #include "css.h"</div><div class='ctx'> #include "vfio_ccw_cp.h"</div><div class='ctx'> </div><div class='add'>+#define VFIO_CCW_OFFSET_SHIFT   10</div><div class='add'>+#define VFIO_CCW_OFFSET_TO_INDEX(off)	(off &gt;&gt; VFIO_CCW_OFFSET_SHIFT)</div><div class='add'>+#define VFIO_CCW_INDEX_TO_OFFSET(index)	((u64)(index) &lt;&lt; VFIO_CCW_OFFSET_SHIFT)</div><div class='add'>+#define VFIO_CCW_OFFSET_MASK	(((u64)(1) &lt;&lt; VFIO_CCW_OFFSET_SHIFT) - 1)</div><div class='add'>+</div><div class='add'>+/* capability chain handling similar to vfio-pci */</div><div class='add'>+struct vfio_ccw_private;</div><div class='add'>+struct vfio_ccw_region;</div><div class='add'>+</div><div class='add'>+struct vfio_ccw_regops {</div><div class='add'>+	ssize_t	(*read)(struct vfio_ccw_private *private, char __user *buf,</div><div class='add'>+			size_t count, loff_t *ppos);</div><div class='add'>+	ssize_t	(*write)(struct vfio_ccw_private *private,</div><div class='add'>+			 const char __user *buf, size_t count, loff_t *ppos);</div><div class='add'>+	void	(*release)(struct vfio_ccw_private *private,</div><div class='add'>+			   struct vfio_ccw_region *region);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vfio_ccw_region {</div><div class='add'>+	u32				type;</div><div class='add'>+	u32				subtype;</div><div class='add'>+	const struct vfio_ccw_regops	*ops;</div><div class='add'>+	void				*data;</div><div class='add'>+	size_t				size;</div><div class='add'>+	u32				flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int vfio_ccw_register_dev_region(struct vfio_ccw_private *private,</div><div class='add'>+				 unsigned int subtype,</div><div class='add'>+				 const struct vfio_ccw_regops *ops,</div><div class='add'>+				 size_t size, u32 flags, void *data);</div><div class='add'>+</div><div class='add'>+int vfio_ccw_register_async_dev_regions(struct vfio_ccw_private *private);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct vfio_ccw_private</div><div class='ctx'>  * @sch: pointer to the subchannel</div><div class='hunk'>@@ -28,6 +64,10 @@</div><div class='ctx'>  * @mdev: pointer to the mediated device</div><div class='ctx'>  * @nb: notifier for vfio events</div><div class='ctx'>  * @io_region: MMIO region to input/output I/O arguments/results</div><div class='add'>+ * @io_mutex: protect against concurrent update of I/O regions</div><div class='add'>+ * @region: additional regions for other subchannel operations</div><div class='add'>+ * @cmd_region: MMIO region for asynchronous I/O commands other than START</div><div class='add'>+ * @num_regions: number of additional regions</div><div class='ctx'>  * @cp: channel program for the current I/O operation</div><div class='ctx'>  * @irb: irb info received from interrupt</div><div class='ctx'>  * @scsw: scsw info</div><div class='hunk'>@@ -42,6 +82,10 @@ struct vfio_ccw_private {</div><div class='ctx'> 	struct mdev_device	*mdev;</div><div class='ctx'> 	struct notifier_block	nb;</div><div class='ctx'> 	struct ccw_io_region	*io_region;</div><div class='add'>+	struct mutex		io_mutex;</div><div class='add'>+	struct vfio_ccw_region *region;</div><div class='add'>+	struct ccw_cmd_region	*cmd_region;</div><div class='add'>+	int num_regions;</div><div class='ctx'> </div><div class='ctx'> 	struct channel_program	cp;</div><div class='ctx'> 	struct irb		irb;</div><div class='hunk'>@@ -63,7 +107,8 @@ enum vfio_ccw_state {</div><div class='ctx'> 	VFIO_CCW_STATE_NOT_OPER,</div><div class='ctx'> 	VFIO_CCW_STATE_STANDBY,</div><div class='ctx'> 	VFIO_CCW_STATE_IDLE,</div><div class='del'>-	VFIO_CCW_STATE_BUSY,</div><div class='add'>+	VFIO_CCW_STATE_CP_PROCESSING,</div><div class='add'>+	VFIO_CCW_STATE_CP_PENDING,</div><div class='ctx'> 	/* last element! */</div><div class='ctx'> 	NR_VFIO_CCW_STATES</div><div class='ctx'> };</div><div class='hunk'>@@ -75,6 +120,7 @@ enum vfio_ccw_event {</div><div class='ctx'> 	VFIO_CCW_EVENT_NOT_OPER,</div><div class='ctx'> 	VFIO_CCW_EVENT_IO_REQ,</div><div class='ctx'> 	VFIO_CCW_EVENT_INTERRUPT,</div><div class='add'>+	VFIO_CCW_EVENT_ASYNC_REQ,</div><div class='ctx'> 	/* last element! */</div><div class='ctx'> 	NR_VFIO_CCW_EVENTS</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c<br/>index e15816ff1265..cc30e4f07fff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/ap_bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/ap_bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/ap_bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/crypto/ap_bus.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@ static int user_set_domain;</div><div class='ctx'> static struct bus_type ap_bus_type;</div><div class='ctx'> </div><div class='ctx'> /* Adapter interrupt definitions */</div><div class='del'>-static void ap_interrupt_handler(struct airq_struct *airq);</div><div class='add'>+static void ap_interrupt_handler(struct airq_struct *airq, bool floating);</div><div class='ctx'> </div><div class='ctx'> static int ap_airq_flag;</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +393,7 @@ static enum hrtimer_restart ap_poll_timeout(struct hrtimer *unused)</div><div class='ctx'>  * ap_interrupt_handler() - Schedule ap_tasklet on interrupt</div><div class='ctx'>  * @airq: pointer to adapter interrupt descriptor</div><div class='ctx'>  */</div><div class='del'>-static void ap_interrupt_handler(struct airq_struct *airq)</div><div class='add'>+static void ap_interrupt_handler(struct airq_struct *airq, bool floating)</div><div class='ctx'> {</div><div class='ctx'> 	inc_irq_stat(IRQIO_APB);</div><div class='ctx'> 	if (!ap_suspend_flag)</div><div class='hunk'>@@ -810,11 +810,18 @@ static int ap_device_remove(struct device *dev)</div><div class='ctx'> 	struct ap_device *ap_dev = to_ap_dev(dev);</div><div class='ctx'> 	struct ap_driver *ap_drv = ap_dev-&gt;drv;</div><div class='ctx'> </div><div class='add'>+	/* prepare ap queue device removal */</div><div class='ctx'> 	if (is_queue_dev(dev))</div><div class='del'>-		ap_queue_remove(to_ap_queue(dev));</div><div class='add'>+		ap_queue_prepare_remove(to_ap_queue(dev));</div><div class='add'>+</div><div class='add'>+	/* driver's chance to clean up gracefully */</div><div class='ctx'> 	if (ap_drv-&gt;remove)</div><div class='ctx'> 		ap_drv-&gt;remove(ap_dev);</div><div class='ctx'> </div><div class='add'>+	/* now do the ap queue device remove */</div><div class='add'>+	if (is_queue_dev(dev))</div><div class='add'>+		ap_queue_remove(to_ap_queue(dev));</div><div class='add'>+</div><div class='ctx'> 	/* Remove queue/card from list of active queues/cards */</div><div class='ctx'> 	spin_lock_bh(&amp;ap_list_lock);</div><div class='ctx'> 	if (is_card_dev(dev))</div><div class='hunk'>@@ -861,6 +868,16 @@ void ap_bus_force_rescan(void)</div><div class='ctx'> EXPORT_SYMBOL(ap_bus_force_rescan);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+* A config change has happened, force an ap bus rescan.</div><div class='add'>+*/</div><div class='add'>+void ap_bus_cfg_chg(void)</div><div class='add'>+{</div><div class='add'>+	AP_DBF(DBF_INFO, "%s config change, forcing bus rescan\n", __func__);</div><div class='add'>+</div><div class='add'>+	ap_bus_force_rescan();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * hex2bitmap() - parse hex mask string and set bitmap.</div><div class='ctx'>  * Valid strings are "0x012345678" with at least one valid hex number.</div><div class='ctx'>  * Rest of the bitmap to the right is padded with 0. No spaces allowed</div><div class='head'>diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h<br/>index d0059eae5d94..15a98a673c5c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/ap_bus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/ap_bus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/ap_bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/crypto/ap_bus.h</a></div><div class='hunk'>@@ -91,6 +91,7 @@ enum ap_state {</div><div class='ctx'> 	AP_STATE_WORKING,</div><div class='ctx'> 	AP_STATE_QUEUE_FULL,</div><div class='ctx'> 	AP_STATE_SUSPEND_WAIT,</div><div class='add'>+	AP_STATE_REMOVE,	/* about to be removed from driver */</div><div class='ctx'> 	AP_STATE_UNBOUND,	/* momentary not bound to a driver */</div><div class='ctx'> 	AP_STATE_BORKED,	/* broken */</div><div class='ctx'> 	NR_AP_STATES</div><div class='hunk'>@@ -252,6 +253,7 @@ void ap_bus_force_rescan(void);</div><div class='ctx'> </div><div class='ctx'> void ap_queue_init_reply(struct ap_queue *aq, struct ap_message *ap_msg);</div><div class='ctx'> struct ap_queue *ap_queue_create(ap_qid_t qid, int device_type);</div><div class='add'>+void ap_queue_prepare_remove(struct ap_queue *aq);</div><div class='ctx'> void ap_queue_remove(struct ap_queue *aq);</div><div class='ctx'> void ap_queue_suspend(struct ap_device *ap_dev);</div><div class='ctx'> void ap_queue_resume(struct ap_device *ap_dev);</div><div class='head'>diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c<br/>index ba261210c6da..5ea83dc4f1d7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/ap_queue.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/ap_queue.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/ap_queue.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/crypto/ap_queue.c</a></div><div class='hunk'>@@ -420,6 +420,10 @@ static ap_func_t *ap_jumptable[NR_AP_STATES][NR_AP_EVENTS] = {</div><div class='ctx'> 		[AP_EVENT_POLL] = ap_sm_suspend_read,</div><div class='ctx'> 		[AP_EVENT_TIMEOUT] = ap_sm_nop,</div><div class='ctx'> 	},</div><div class='add'>+	[AP_STATE_REMOVE] = {</div><div class='add'>+		[AP_EVENT_POLL] = ap_sm_nop,</div><div class='add'>+		[AP_EVENT_TIMEOUT] = ap_sm_nop,</div><div class='add'>+	},</div><div class='ctx'> 	[AP_STATE_UNBOUND] = {</div><div class='ctx'> 		[AP_EVENT_POLL] = ap_sm_nop,</div><div class='ctx'> 		[AP_EVENT_TIMEOUT] = ap_sm_nop,</div><div class='hunk'>@@ -740,18 +744,31 @@ void ap_flush_queue(struct ap_queue *aq)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ap_flush_queue);</div><div class='ctx'> </div><div class='del'>-void ap_queue_remove(struct ap_queue *aq)</div><div class='add'>+void ap_queue_prepare_remove(struct ap_queue *aq)</div><div class='ctx'> {</div><div class='del'>-	ap_flush_queue(aq);</div><div class='add'>+	spin_lock_bh(&amp;aq-&gt;lock);</div><div class='add'>+	/* flush queue */</div><div class='add'>+	__ap_flush_queue(aq);</div><div class='add'>+	/* set REMOVE state to prevent new messages are queued in */</div><div class='add'>+	aq-&gt;state = AP_STATE_REMOVE;</div><div class='add'>+	spin_unlock_bh(&amp;aq-&gt;lock);</div><div class='ctx'> 	del_timer_sync(&amp;aq-&gt;timeout);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* reset with zero, also clears irq registration */</div><div class='add'>+void ap_queue_remove(struct ap_queue *aq)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * all messages have been flushed and the state is</div><div class='add'>+	 * AP_STATE_REMOVE. Now reset with zero which also</div><div class='add'>+	 * clears the irq registration and move the state</div><div class='add'>+	 * to AP_STATE_UNBOUND to signal that this queue</div><div class='add'>+	 * is not used by any driver currently.</div><div class='add'>+	 */</div><div class='ctx'> 	spin_lock_bh(&amp;aq-&gt;lock);</div><div class='ctx'> 	ap_zapq(aq-&gt;qid);</div><div class='ctx'> 	aq-&gt;state = AP_STATE_UNBOUND;</div><div class='ctx'> 	spin_unlock_bh(&amp;aq-&gt;lock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ap_queue_remove);</div><div class='ctx'> </div><div class='ctx'> void ap_queue_reinit_state(struct ap_queue *aq)</div><div class='ctx'> {</div><div class='hunk'>@@ -760,4 +777,3 @@ void ap_queue_reinit_state(struct ap_queue *aq)</div><div class='ctx'> 	ap_wait(ap_sm_event(aq, AP_EVENT_POLL));</div><div class='ctx'> 	spin_unlock_bh(&amp;aq-&gt;lock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ap_queue_reinit_state);</div><div class='head'>diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c<br/>index 3e85d665c572..45eb0c14b880 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/pkey_api.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/pkey_api.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/pkey_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/crypto/pkey_api.c</a></div><div class='hunk'>@@ -51,7 +51,8 @@ static debug_info_t *debug_info;</div><div class='ctx'> </div><div class='ctx'> static void __init pkey_debug_init(void)</div><div class='ctx'> {</div><div class='del'>-	debug_info = debug_register("pkey", 1, 1, 4 * sizeof(long));</div><div class='add'>+	/* 5 arguments per dbf entry (including the format string ptr) */</div><div class='add'>+	debug_info = debug_register("pkey", 1, 1, 5 * sizeof(long));</div><div class='ctx'> 	debug_register_view(debug_info, &amp;debug_sprintf_view);</div><div class='ctx'> 	debug_set_level(debug_info, 3);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c<br/>index eb93c2d27d0a..852b8c2299c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/zcrypt_api.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/crypto/zcrypt_api.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/crypto/zcrypt_api.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/crypto/zcrypt_api.c</a></div><div class='hunk'>@@ -525,7 +525,7 @@ static int zcrypt_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	filp-&gt;private_data = (void *) perms;</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;zcrypt_open_count);</div><div class='del'>-	return nonseekable_open(inode, filp);</div><div class='add'>+	return stream_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -586,6 +586,7 @@ static inline bool zcrypt_check_queue(struct ap_perms *perms, int queue)</div><div class='ctx'> </div><div class='ctx'> static inline struct zcrypt_queue *zcrypt_pick_queue(struct zcrypt_card *zc,</div><div class='ctx'> 						     struct zcrypt_queue *zq,</div><div class='add'>+						     struct module **pmod,</div><div class='ctx'> 						     unsigned int weight)</div><div class='ctx'> {</div><div class='ctx'> 	if (!zq || !try_module_get(zq-&gt;queue-&gt;ap_dev.drv-&gt;driver.owner))</div><div class='hunk'>@@ -595,15 +596,15 @@ static inline struct zcrypt_queue *zcrypt_pick_queue(struct zcrypt_card *zc,</div><div class='ctx'> 	atomic_add(weight, &amp;zc-&gt;load);</div><div class='ctx'> 	atomic_add(weight, &amp;zq-&gt;load);</div><div class='ctx'> 	zq-&gt;request_count++;</div><div class='add'>+	*pmod = zq-&gt;queue-&gt;ap_dev.drv-&gt;driver.owner;</div><div class='ctx'> 	return zq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void zcrypt_drop_queue(struct zcrypt_card *zc,</div><div class='ctx'> 				     struct zcrypt_queue *zq,</div><div class='add'>+				     struct module *mod,</div><div class='ctx'> 				     unsigned int weight)</div><div class='ctx'> {</div><div class='del'>-	struct module *mod = zq-&gt;queue-&gt;ap_dev.drv-&gt;driver.owner;</div><div class='del'>-</div><div class='ctx'> 	zq-&gt;request_count--;</div><div class='ctx'> 	atomic_sub(weight, &amp;zc-&gt;load);</div><div class='ctx'> 	atomic_sub(weight, &amp;zq-&gt;load);</div><div class='hunk'>@@ -653,10 +654,12 @@ static long zcrypt_rsa_modexpo(struct ap_perms *perms,</div><div class='ctx'> 	unsigned int weight, pref_weight;</div><div class='ctx'> 	unsigned int func_code;</div><div class='ctx'> 	int qid = 0, rc = -ENODEV;</div><div class='add'>+	struct module *mod;</div><div class='ctx'> </div><div class='ctx'> 	trace_s390_zcrypt_req(mex, TP_ICARSAMODEXPO);</div><div class='ctx'> </div><div class='ctx'> 	if (mex-&gt;outputdatalength &lt; mex-&gt;inputdatalength) {</div><div class='add'>+		func_code = 0;</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -706,7 +709,7 @@ static long zcrypt_rsa_modexpo(struct ap_perms *perms,</div><div class='ctx'> 			pref_weight = weight;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, &amp;mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!pref_zq) {</div><div class='hunk'>@@ -718,7 +721,7 @@ static long zcrypt_rsa_modexpo(struct ap_perms *perms,</div><div class='ctx'> 	rc = pref_zq-&gt;ops-&gt;rsa_modexpo(pref_zq, mex);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;zcrypt_list_lock);</div><div class='del'>-	zcrypt_drop_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	zcrypt_drop_queue(pref_zc, pref_zq, mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -735,10 +738,12 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,</div><div class='ctx'> 	unsigned int weight, pref_weight;</div><div class='ctx'> 	unsigned int func_code;</div><div class='ctx'> 	int qid = 0, rc = -ENODEV;</div><div class='add'>+	struct module *mod;</div><div class='ctx'> </div><div class='ctx'> 	trace_s390_zcrypt_req(crt, TP_ICARSACRT);</div><div class='ctx'> </div><div class='ctx'> 	if (crt-&gt;outputdatalength &lt; crt-&gt;inputdatalength) {</div><div class='add'>+		func_code = 0;</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -788,7 +793,7 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,</div><div class='ctx'> 			pref_weight = weight;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, &amp;mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!pref_zq) {</div><div class='hunk'>@@ -800,7 +805,7 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,</div><div class='ctx'> 	rc = pref_zq-&gt;ops-&gt;rsa_modexpo_crt(pref_zq, crt);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;zcrypt_list_lock);</div><div class='del'>-	zcrypt_drop_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	zcrypt_drop_queue(pref_zc, pref_zq, mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -819,6 +824,7 @@ static long _zcrypt_send_cprb(struct ap_perms *perms,</div><div class='ctx'> 	unsigned int func_code;</div><div class='ctx'> 	unsigned short *domain;</div><div class='ctx'> 	int qid = 0, rc = -ENODEV;</div><div class='add'>+	struct module *mod;</div><div class='ctx'> </div><div class='ctx'> 	trace_s390_zcrypt_req(xcRB, TB_ZSECSENDCPRB);</div><div class='ctx'> </div><div class='hunk'>@@ -865,7 +871,7 @@ static long _zcrypt_send_cprb(struct ap_perms *perms,</div><div class='ctx'> 			pref_weight = weight;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, &amp;mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!pref_zq) {</div><div class='hunk'>@@ -881,7 +887,7 @@ static long _zcrypt_send_cprb(struct ap_perms *perms,</div><div class='ctx'> 	rc = pref_zq-&gt;ops-&gt;send_cprb(pref_zq, xcRB, &amp;ap_msg);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;zcrypt_list_lock);</div><div class='del'>-	zcrypt_drop_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	zcrypt_drop_queue(pref_zc, pref_zq, mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -932,6 +938,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,</div><div class='ctx'> 	unsigned int func_code;</div><div class='ctx'> 	struct ap_message ap_msg;</div><div class='ctx'> 	int qid = 0, rc = -ENODEV;</div><div class='add'>+	struct module *mod;</div><div class='ctx'> </div><div class='ctx'> 	trace_s390_zcrypt_req(xcrb, TP_ZSENDEP11CPRB);</div><div class='ctx'> </div><div class='hunk'>@@ -946,6 +953,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,</div><div class='ctx'> </div><div class='ctx'> 		targets = kcalloc(target_num, sizeof(*targets), GFP_KERNEL);</div><div class='ctx'> 		if (!targets) {</div><div class='add'>+			func_code = 0;</div><div class='ctx'> 			rc = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -953,6 +961,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,</div><div class='ctx'> 		uptr = (struct ep11_target_dev __force __user *) xcrb-&gt;targets;</div><div class='ctx'> 		if (copy_from_user(targets, uptr,</div><div class='ctx'> 				   target_num * sizeof(*targets))) {</div><div class='add'>+			func_code = 0;</div><div class='ctx'> 			rc = -EFAULT;</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1000,7 +1009,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,</div><div class='ctx'> 			pref_weight = weight;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, &amp;mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!pref_zq) {</div><div class='hunk'>@@ -1012,7 +1021,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,</div><div class='ctx'> 	rc = pref_zq-&gt;ops-&gt;send_ep11_cprb(pref_zq, xcrb, &amp;ap_msg);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;zcrypt_list_lock);</div><div class='del'>-	zcrypt_drop_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	zcrypt_drop_queue(pref_zc, pref_zq, mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='hunk'>@@ -1033,6 +1042,7 @@ static long zcrypt_rng(char *buffer)</div><div class='ctx'> 	struct ap_message ap_msg;</div><div class='ctx'> 	unsigned int domain;</div><div class='ctx'> 	int qid = 0, rc = -ENODEV;</div><div class='add'>+	struct module *mod;</div><div class='ctx'> </div><div class='ctx'> 	trace_s390_zcrypt_req(buffer, TP_HWRNGCPRB);</div><div class='ctx'> </div><div class='hunk'>@@ -1064,7 +1074,7 @@ static long zcrypt_rng(char *buffer)</div><div class='ctx'> 			pref_weight = weight;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	pref_zq = zcrypt_pick_queue(pref_zc, pref_zq, &amp;mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!pref_zq) {</div><div class='hunk'>@@ -1076,7 +1086,7 @@ static long zcrypt_rng(char *buffer)</div><div class='ctx'> 	rc = pref_zq-&gt;ops-&gt;rng(pref_zq, buffer, &amp;ap_msg);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;zcrypt_list_lock);</div><div class='del'>-	zcrypt_drop_queue(pref_zc, pref_zq, weight);</div><div class='add'>+	zcrypt_drop_queue(pref_zc, pref_zq, mod, weight);</div><div class='ctx'> 	spin_unlock(&amp;zcrypt_list_lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c<br/>index 7617d21cb296..f63c5c871d3d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/ctcm_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/ctcm_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/ctcm_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/ctcm_main.c</a></div><div class='hunk'>@@ -1595,6 +1595,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 		if (priv-&gt;channel[direction] == NULL) {</div><div class='ctx'> 			if (direction == CTCM_WRITE)</div><div class='ctx'> 				channel_free(priv-&gt;channel[CTCM_READ]);</div><div class='add'>+			result = -ENODEV;</div><div class='ctx'> 			goto out_dev;</div><div class='ctx'> 		}</div><div class='ctx'> 		priv-&gt;channel[direction]-&gt;netdev = dev;</div><div class='head'>diff --git a/drivers/s390/net/ism.h b/drivers/s390/net/ism.h<br/>index 0aab90817326..66eac2b9704d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/ism.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/ism.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/ism.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/ism.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;net/smc.h&gt;</div><div class='add'>+#include &lt;asm/pci_insn.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define UTIL_STR_LEN	16</div><div class='ctx'> </div><div class='hunk'>@@ -194,8 +195,6 @@ struct ism_dev {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct smcd_dev *smcd;</div><div class='ctx'> </div><div class='del'>-	void __iomem *ctl;</div><div class='del'>-</div><div class='ctx'> 	struct ism_sba *sba;</div><div class='ctx'> 	dma_addr_t sba_dma_addr;</div><div class='ctx'> 	DECLARE_BITMAP(sba_bitmap, ISM_NR_DMBS);</div><div class='hunk'>@@ -209,13 +208,37 @@ struct ism_dev {</div><div class='ctx'> #define ISM_CREATE_REQ(dmb, idx, sf, offset)		\</div><div class='ctx'> 	((dmb) | (idx) &lt;&lt; 24 | (sf) &lt;&lt; 23 | (offset))</div><div class='ctx'> </div><div class='add'>+static inline void __ism_read_cmd(struct ism_dev *ism, void *data,</div><div class='add'>+				  unsigned long offset, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(ism-&gt;pdev);</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 2, 8);</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		__zpci_load(data, req, offset);</div><div class='add'>+		offset += 8;</div><div class='add'>+		data += 8;</div><div class='add'>+		len -= 8;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __ism_write_cmd(struct ism_dev *ism, void *data,</div><div class='add'>+				   unsigned long offset, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct zpci_dev *zdev = to_zpci(ism-&gt;pdev);</div><div class='add'>+	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 2, len);</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		__zpci_store_block(data, req, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __ism_move(struct ism_dev *ism, u64 dmb_req, void *data,</div><div class='ctx'> 			     unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct zpci_dev *zdev = to_zpci(ism-&gt;pdev);</div><div class='ctx'> 	u64 req = ZPCI_CREATE_REQ(zdev-&gt;fh, 0, size);</div><div class='ctx'> </div><div class='del'>-	return zpci_write_block(req, data, dmb_req);</div><div class='add'>+	return __zpci_store_block(data, req, dmb_req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* S390_ISM_H */</div><div class='head'>diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c<br/>index 3e132592c1fe..4fc2056bd227 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/ism_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/ism_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/ism_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/ism_drv.c</a></div><div class='hunk'>@@ -38,19 +38,18 @@ static int ism_cmd(struct ism_dev *ism, void *cmd)</div><div class='ctx'> 	struct ism_req_hdr *req = cmd;</div><div class='ctx'> 	struct ism_resp_hdr *resp = cmd;</div><div class='ctx'> </div><div class='del'>-	memcpy_toio(ism-&gt;ctl + sizeof(*req), req + 1, req-&gt;len - sizeof(*req));</div><div class='del'>-	memcpy_toio(ism-&gt;ctl, req, sizeof(*req));</div><div class='add'>+	__ism_write_cmd(ism, req + 1, sizeof(*req), req-&gt;len - sizeof(*req));</div><div class='add'>+	__ism_write_cmd(ism, req, 0, sizeof(*req));</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(resp-&gt;ret, ISM_ERROR);</div><div class='ctx'> </div><div class='del'>-	memcpy_fromio(resp, ism-&gt;ctl, sizeof(*resp));</div><div class='add'>+	__ism_read_cmd(ism, resp, 0, sizeof(*resp));</div><div class='ctx'> 	if (resp-&gt;ret) {</div><div class='ctx'> 		debug_text_event(ism_debug_info, 0, "cmd failure");</div><div class='ctx'> 		debug_event(ism_debug_info, 0, resp, sizeof(*resp));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy_fromio(resp + 1, ism-&gt;ctl + sizeof(*resp),</div><div class='del'>-		      resp-&gt;len - sizeof(*resp));</div><div class='add'>+	__ism_read_cmd(ism, resp + 1, sizeof(*resp), resp-&gt;len - sizeof(*resp));</div><div class='ctx'> out:</div><div class='ctx'> 	return resp-&gt;ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -512,13 +511,9 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> </div><div class='del'>-	ism-&gt;ctl = pci_iomap(pdev, 2, 0);</div><div class='del'>-	if (!ism-&gt;ctl)</div><div class='del'>-		goto err_resource;</div><div class='del'>-</div><div class='ctx'> 	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_unmap;</div><div class='add'>+		goto err_resource;</div><div class='ctx'> </div><div class='ctx'> 	dma_set_seg_boundary(&amp;pdev-&gt;dev, SZ_1M - 1);</div><div class='ctx'> 	dma_set_max_seg_size(&amp;pdev-&gt;dev, SZ_1M);</div><div class='hunk'>@@ -527,7 +522,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	ism-&gt;smcd = smcd_alloc_dev(&amp;pdev-&gt;dev, dev_name(&amp;pdev-&gt;dev), &amp;ism_ops,</div><div class='ctx'> 				   ISM_NR_DMBS);</div><div class='ctx'> 	if (!ism-&gt;smcd)</div><div class='del'>-		goto err_unmap;</div><div class='add'>+		goto err_resource;</div><div class='ctx'> </div><div class='ctx'> 	ism-&gt;smcd-&gt;priv = ism;</div><div class='ctx'> 	ret = ism_dev_init(ism);</div><div class='hunk'>@@ -538,8 +533,6 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> err_free:</div><div class='ctx'> 	smcd_free_dev(ism-&gt;smcd);</div><div class='del'>-err_unmap:</div><div class='del'>-	pci_iounmap(pdev, ism-&gt;ctl);</div><div class='ctx'> err_resource:</div><div class='ctx'> 	pci_release_mem_regions(pdev);</div><div class='ctx'> err_disable:</div><div class='hunk'>@@ -568,7 +561,6 @@ static void ism_remove(struct pci_dev *pdev)</div><div class='ctx'> 	ism_dev_exit(ism);</div><div class='ctx'> </div><div class='ctx'> 	smcd_free_dev(ism-&gt;smcd);</div><div class='del'>-	pci_iounmap(pdev, ism-&gt;ctl);</div><div class='ctx'> 	pci_release_mem_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='head'>diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h<br/>index c851cf6e01c4..784a2e76a1b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_core.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #ifndef __QETH_CORE_H__</div><div class='ctx'> #define __QETH_CORE_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -21,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/hashtable.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='hunk'>@@ -163,6 +165,12 @@ struct qeth_vnicc_info {</div><div class='ctx'> 	bool rx_bcast_enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline int qeth_is_adp_supported(struct qeth_ipa_info *ipa,</div><div class='add'>+		enum qeth_ipa_setadp_cmd func)</div><div class='add'>+{</div><div class='add'>+	return (ipa-&gt;supported_funcs &amp; func);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int qeth_is_ipa_supported(struct qeth_ipa_info *ipa,</div><div class='ctx'> 		enum qeth_ipa_funcs func)</div><div class='ctx'> {</div><div class='hunk'>@@ -176,9 +184,7 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define qeth_adp_supported(c, f) \</div><div class='del'>-	qeth_is_ipa_supported(&amp;c-&gt;options.adp, f)</div><div class='del'>-#define qeth_adp_enabled(c, f) \</div><div class='del'>-	qeth_is_ipa_enabled(&amp;c-&gt;options.adp, f)</div><div class='add'>+	qeth_is_adp_supported(&amp;c-&gt;options.adp, f)</div><div class='ctx'> #define qeth_is_supported(c, f) \</div><div class='ctx'> 	qeth_is_ipa_supported(&amp;c-&gt;options.ipa4, f)</div><div class='ctx'> #define qeth_is_enabled(c, f) \</div><div class='hunk'>@@ -217,6 +223,9 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,</div><div class='ctx'> /* QDIO queue and buffer handling                                            */</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> #define QETH_MAX_QUEUES 4</div><div class='add'>+#define QETH_IQD_MIN_TXQ	2	/* One for ucast, one for mcast. */</div><div class='add'>+#define QETH_IQD_MCAST_TXQ	0</div><div class='add'>+#define QETH_IQD_MIN_UCAST_TXQ	1</div><div class='ctx'> #define QETH_IN_BUF_SIZE_DEFAULT 65536</div><div class='ctx'> #define QETH_IN_BUF_COUNT_DEFAULT 64</div><div class='ctx'> #define QETH_IN_BUF_COUNT_HSDEFAULT 128</div><div class='hunk'>@@ -365,34 +374,6 @@ enum qeth_header_ids {</div><div class='ctx'> #define QETH_HDR_EXT_CSUM_TRANSP_REQ  0x20</div><div class='ctx'> #define QETH_HDR_EXT_UDP	      0x40 /*bit off for TCP*/</div><div class='ctx'> </div><div class='del'>-enum qeth_qdio_buffer_states {</div><div class='del'>-	/*</div><div class='del'>-	 * inbound: read out by driver; owned by hardware in order to be filled</div><div class='del'>-	 * outbound: owned by driver in order to be filled</div><div class='del'>-	 */</div><div class='del'>-	QETH_QDIO_BUF_EMPTY,</div><div class='del'>-	/*</div><div class='del'>-	 * inbound: filled by hardware; owned by driver in order to be read out</div><div class='del'>-	 * outbound: filled by driver; owned by hardware in order to be sent</div><div class='del'>-	 */</div><div class='del'>-	QETH_QDIO_BUF_PRIMED,</div><div class='del'>-	/*</div><div class='del'>-	 * inbound: not applicable</div><div class='del'>-	 * outbound: identified to be pending in TPQ</div><div class='del'>-	 */</div><div class='del'>-	QETH_QDIO_BUF_PENDING,</div><div class='del'>-	/*</div><div class='del'>-	 * inbound: not applicable</div><div class='del'>-	 * outbound: found in completion queue</div><div class='del'>-	 */</div><div class='del'>-	QETH_QDIO_BUF_IN_CQ,</div><div class='del'>-	/*</div><div class='del'>-	 * inbound: not applicable</div><div class='del'>-	 * outbound: handled via transfer pending / completion queue</div><div class='del'>-	 */</div><div class='del'>-	QETH_QDIO_BUF_HANDLED_DELAYED,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum qeth_qdio_info_states {</div><div class='ctx'> 	QETH_QDIO_UNINITIALIZED,</div><div class='ctx'> 	QETH_QDIO_ALLOCATED,</div><div class='hunk'>@@ -424,6 +405,19 @@ struct qeth_qdio_q {</div><div class='ctx'> 	int next_buf_to_init;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum qeth_qdio_out_buffer_state {</div><div class='add'>+	/* Owned by driver, in order to be filled. */</div><div class='add'>+	QETH_QDIO_BUF_EMPTY,</div><div class='add'>+	/* Filled by driver; owned by hardware in order to be sent. */</div><div class='add'>+	QETH_QDIO_BUF_PRIMED,</div><div class='add'>+	/* Identified to be pending in TPQ. */</div><div class='add'>+	QETH_QDIO_BUF_PENDING,</div><div class='add'>+	/* Found in completion queue. */</div><div class='add'>+	QETH_QDIO_BUF_IN_CQ,</div><div class='add'>+	/* Handled via transfer pending / completion queue. */</div><div class='add'>+	QETH_QDIO_BUF_HANDLED_DELAYED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct qeth_qdio_out_buffer {</div><div class='ctx'> 	struct qdio_buffer *buffer;</div><div class='ctx'> 	atomic_t state;</div><div class='hunk'>@@ -462,7 +456,6 @@ struct qeth_card_stats {</div><div class='ctx'> 	u64 rx_errors;</div><div class='ctx'> 	u64 rx_dropped;</div><div class='ctx'> 	u64 rx_multicast;</div><div class='del'>-	u64 tx_errors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qeth_out_q_stats {</div><div class='hunk'>@@ -477,6 +470,7 @@ struct qeth_out_q_stats {</div><div class='ctx'> 	u64 skbs_linearized_fail;</div><div class='ctx'> 	u64 tso_bytes;</div><div class='ctx'> 	u64 packing_mode_switch;</div><div class='add'>+	u64 stopped;</div><div class='ctx'> </div><div class='ctx'> 	/* rtnl_link_stats64 */</div><div class='ctx'> 	u64 tx_packets;</div><div class='hunk'>@@ -490,14 +484,12 @@ struct qeth_qdio_out_q {</div><div class='ctx'> 	struct qeth_qdio_out_buffer *bufs[QDIO_MAX_BUFFERS_PER_Q];</div><div class='ctx'> 	struct qdio_outbuf_state *bufstates; /* convenience pointer */</div><div class='ctx'> 	struct qeth_out_q_stats stats;</div><div class='del'>-	int queue_no;</div><div class='add'>+	u8 next_buf_to_fill;</div><div class='add'>+	u8 max_elements;</div><div class='add'>+	u8 queue_no;</div><div class='add'>+	u8 do_pack;</div><div class='ctx'> 	struct qeth_card *card;</div><div class='ctx'> 	atomic_t state;</div><div class='del'>-	int do_pack;</div><div class='del'>-	/*</div><div class='del'>-	 * index of buffer to be filled by driver; state EMPTY or PACKING</div><div class='del'>-	 */</div><div class='del'>-	int next_buf_to_fill;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * number of buffers that are currently filled (PRIMED)</div><div class='ctx'> 	 * -&gt; these buffers are hardware-owned</div><div class='hunk'>@@ -507,6 +499,11 @@ struct qeth_qdio_out_q {</div><div class='ctx'> 	atomic_t set_pci_flags_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool qeth_out_queue_is_full(struct qeth_qdio_out_q *queue)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;queue-&gt;used_buffers) &gt;= QDIO_MAX_BUFFERS_PER_Q;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct qeth_qdio_info {</div><div class='ctx'> 	atomic_t state;</div><div class='ctx'> 	/* input */</div><div class='hunk'>@@ -538,7 +535,6 @@ struct qeth_qdio_info {</div><div class='ctx'> enum qeth_channel_states {</div><div class='ctx'> 	CH_STATE_UP,</div><div class='ctx'> 	CH_STATE_DOWN,</div><div class='del'>-	CH_STATE_ACTIVATING,</div><div class='ctx'> 	CH_STATE_HALTED,</div><div class='ctx'> 	CH_STATE_STOPPED,</div><div class='ctx'> 	CH_STATE_RCD,</div><div class='hunk'>@@ -585,7 +581,10 @@ struct qeth_cmd_buffer {</div><div class='ctx'> 	enum qeth_cmd_buffer_state state;</div><div class='ctx'> 	struct qeth_channel *channel;</div><div class='ctx'> 	struct qeth_reply *reply;</div><div class='add'>+	long timeout;</div><div class='ctx'> 	unsigned char *data;</div><div class='add'>+	void (*finalize)(struct qeth_card *card, struct qeth_cmd_buffer *iob,</div><div class='add'>+			 unsigned int length);</div><div class='ctx'> 	void (*callback)(struct qeth_card *card, struct qeth_channel *channel,</div><div class='ctx'> 			 struct qeth_cmd_buffer *iob);</div><div class='ctx'> };</div><div class='hunk'>@@ -610,6 +609,11 @@ struct qeth_channel {</div><div class='ctx'> 	int io_buf_no;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool qeth_trylock_channel(struct qeth_channel *channel)</div><div class='add'>+{</div><div class='add'>+	return atomic_cmpxchg(&amp;channel-&gt;irq_pending, 0, 1) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *  OSA card related definitions</div><div class='ctx'>  */</div><div class='hunk'>@@ -631,17 +635,15 @@ struct qeth_seqno {</div><div class='ctx'> 	__u32 pdu_hdr;</div><div class='ctx'> 	__u32 pdu_hdr_ack;</div><div class='ctx'> 	__u16 ipa;</div><div class='del'>-	__u32 pkt_seqno;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qeth_reply {</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	wait_queue_head_t wait_q;</div><div class='add'>+	struct completion received;</div><div class='ctx'> 	int (*callback)(struct qeth_card *, struct qeth_reply *,</div><div class='ctx'> 		unsigned long);</div><div class='ctx'> 	u32 seqno;</div><div class='ctx'> 	unsigned long offset;</div><div class='del'>-	atomic_t received;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	void *param;</div><div class='ctx'> 	refcount_t refcnt;</div><div class='hunk'>@@ -663,7 +665,7 @@ struct qeth_card_info {</div><div class='ctx'> 	__u16 func_level;</div><div class='ctx'> 	char mcl_level[QETH_MCL_LENGTH + 1];</div><div class='ctx'> 	u8 open_when_online:1;</div><div class='del'>-	int guestlan;</div><div class='add'>+	u8 is_vm_nic:1;</div><div class='ctx'> 	int mac_bits;</div><div class='ctx'> 	enum qeth_card_types type;</div><div class='ctx'> 	enum qeth_link_types link_type;</div><div class='hunk'>@@ -774,18 +776,19 @@ struct qeth_card {</div><div class='ctx'> 	struct qeth_card_options options;</div><div class='ctx'> </div><div class='ctx'> 	struct workqueue_struct *event_wq;</div><div class='add'>+	struct workqueue_struct *cmd_wq;</div><div class='ctx'> 	wait_queue_head_t wait_q;</div><div class='del'>-	spinlock_t mclock;</div><div class='ctx'> 	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];</div><div class='ctx'> 	DECLARE_HASHTABLE(mac_htable, 4);</div><div class='ctx'> 	DECLARE_HASHTABLE(ip_htable, 4);</div><div class='add'>+	struct mutex ip_lock;</div><div class='ctx'> 	DECLARE_HASHTABLE(ip_mc_htable, 4);</div><div class='add'>+	struct work_struct rx_mode_work;</div><div class='ctx'> 	struct work_struct kernel_thread_starter;</div><div class='ctx'> 	spinlock_t thread_mask_lock;</div><div class='ctx'> 	unsigned long thread_start_mask;</div><div class='ctx'> 	unsigned long thread_allowed_mask;</div><div class='ctx'> 	unsigned long thread_running_mask;</div><div class='del'>-	spinlock_t ip_lock;</div><div class='ctx'> 	struct qeth_ipato ipato;</div><div class='ctx'> 	struct list_head cmd_waiter_list;</div><div class='ctx'> 	/* QDIO buffer handling */</div><div class='hunk'>@@ -827,6 +830,15 @@ static inline bool qeth_netdev_is_registered(struct net_device *dev)</div><div class='ctx'> 	return dev-&gt;netdev_ops != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16 qeth_iqd_translate_txq(struct net_device *dev, u16 txq)</div><div class='add'>+{</div><div class='add'>+	if (txq == QETH_IQD_MCAST_TXQ)</div><div class='add'>+		return dev-&gt;num_tx_queues - 1;</div><div class='add'>+	if (txq == dev-&gt;num_tx_queues - 1)</div><div class='add'>+		return QETH_IQD_MCAST_TXQ;</div><div class='add'>+	return txq;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void qeth_scrub_qdio_buffer(struct qdio_buffer *buf,</div><div class='ctx'> 					  unsigned int elements)</div><div class='ctx'> {</div><div class='hunk'>@@ -869,6 +881,16 @@ static inline int qeth_get_ip_version(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int qeth_get_ether_cast_type(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u8 *addr = eth_hdr(skb)-&gt;h_dest;</div><div class='add'>+</div><div class='add'>+	if (is_multicast_ether_addr(addr))</div><div class='add'>+		return is_broadcast_ether_addr(addr) ? RTN_BROADCAST :</div><div class='add'>+						       RTN_MULTICAST;</div><div class='add'>+	return RTN_UNICAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void qeth_rx_csum(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 				u8 flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -922,18 +944,7 @@ static inline int qeth_send_simple_setassparms_v6(struct qeth_card *card,</div><div class='ctx'> 						 data, QETH_PROT_IPV6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb,</div><div class='del'>-			    int ipv);</div><div class='del'>-static inline struct qeth_qdio_out_q *qeth_get_tx_queue(struct qeth_card *card,</div><div class='del'>-							struct sk_buff *skb,</div><div class='del'>-							int ipv, int cast_type)</div><div class='del'>-{</div><div class='del'>-	if (IS_IQD(card) &amp;&amp; cast_type != RTN_UNICAST)</div><div class='del'>-		return card-&gt;qdio.out_qs[card-&gt;qdio.no_out_queues - 1];</div><div class='del'>-	if (!card-&gt;qdio.do_prio_queueing)</div><div class='del'>-		return card-&gt;qdio.out_qs[card-&gt;qdio.default_out_queue];</div><div class='del'>-	return card-&gt;qdio.out_qs[qeth_get_priority_queue(card, skb, ipv)];</div><div class='del'>-}</div><div class='add'>+int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> extern struct qeth_discipline qeth_l2_discipline;</div><div class='ctx'> extern struct qeth_discipline qeth_l3_discipline;</div><div class='hunk'>@@ -979,12 +990,10 @@ void qeth_clear_ipacmd_list(struct qeth_card *);</div><div class='ctx'> int qeth_qdio_clear_card(struct qeth_card *, int);</div><div class='ctx'> void qeth_clear_working_pool_list(struct qeth_card *);</div><div class='ctx'> void qeth_clear_cmd_buffers(struct qeth_channel *);</div><div class='del'>-void qeth_clear_qdio_buffers(struct qeth_card *);</div><div class='add'>+void qeth_drain_output_queues(struct qeth_card *card);</div><div class='ctx'> void qeth_setadp_promisc_mode(struct qeth_card *);</div><div class='ctx'> int qeth_setadpparms_change_macaddr(struct qeth_card *);</div><div class='ctx'> void qeth_tx_timeout(struct net_device *);</div><div class='del'>-void qeth_prepare_control_data(struct qeth_card *, int,</div><div class='del'>-				struct qeth_cmd_buffer *);</div><div class='ctx'> void qeth_release_buffer(struct qeth_channel *, struct qeth_cmd_buffer *);</div><div class='ctx'> void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,</div><div class='ctx'> 			  u16 cmd_length);</div><div class='hunk'>@@ -1016,6 +1025,8 @@ netdev_features_t qeth_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='ctx'> void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats);</div><div class='add'>+u16 qeth_iqd_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+			  u8 cast_type, struct net_device *sb_dev);</div><div class='ctx'> int qeth_open(struct net_device *dev);</div><div class='ctx'> int qeth_stop(struct net_device *dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c<br/>index 197b0f5b63e7..009f2c0ec504 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_core_main.c</a></div><div class='hunk'>@@ -61,13 +61,13 @@ static struct kmem_cache *qeth_qdio_outbuf_cache;</div><div class='ctx'> static struct device *qeth_core_root_dev;</div><div class='ctx'> static struct lock_class_key qdio_out_skb_queue_key;</div><div class='ctx'> </div><div class='del'>-static void qeth_send_control_data_cb(struct qeth_card *card,</div><div class='del'>-				      struct qeth_channel *channel,</div><div class='del'>-				      struct qeth_cmd_buffer *iob);</div><div class='add'>+static void qeth_issue_next_read_cb(struct qeth_card *card,</div><div class='add'>+				    struct qeth_channel *channel,</div><div class='add'>+				    struct qeth_cmd_buffer *iob);</div><div class='ctx'> static struct qeth_cmd_buffer *qeth_get_buffer(struct qeth_channel *);</div><div class='ctx'> static void qeth_free_buffer_pool(struct qeth_card *);</div><div class='ctx'> static int qeth_qdio_establish(struct qeth_card *);</div><div class='del'>-static void qeth_free_qdio_buffers(struct qeth_card *);</div><div class='add'>+static void qeth_free_qdio_queues(struct qeth_card *card);</div><div class='ctx'> static void qeth_notify_skbs(struct qeth_qdio_out_q *queue,</div><div class='ctx'> 		struct qeth_qdio_out_buffer *buf,</div><div class='ctx'> 		enum iucv_tx_notify notification);</div><div class='hunk'>@@ -85,7 +85,7 @@ static void qeth_close_dev_handler(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static const char *qeth_get_cardname(struct qeth_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (card-&gt;info.guestlan) {</div><div class='add'>+	if (IS_VM_NIC(card)) {</div><div class='ctx'> 		switch (card-&gt;info.type) {</div><div class='ctx'> 		case QETH_CARD_TYPE_OSD:</div><div class='ctx'> 			return " Virtual NIC QDIO";</div><div class='hunk'>@@ -120,7 +120,7 @@ static const char *qeth_get_cardname(struct qeth_card *card)</div><div class='ctx'> /* max length to be returned: 14 */</div><div class='ctx'> const char *qeth_get_cardname_short(struct qeth_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (card-&gt;info.guestlan) {</div><div class='add'>+	if (IS_VM_NIC(card)) {</div><div class='ctx'> 		switch (card-&gt;info.type) {</div><div class='ctx'> 		case QETH_CARD_TYPE_OSD:</div><div class='ctx'> 			return "Virt.NIC QDIO";</div><div class='hunk'>@@ -511,7 +511,9 @@ static int __qeth_issue_next_read(struct qeth_card *card)</div><div class='ctx'> 				 CARD_DEVID(card));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	qeth_setup_ccw(channel-&gt;ccw, CCW_CMD_READ, QETH_BUFSIZE, iob-&gt;data);</div><div class='add'>+	iob-&gt;callback = qeth_issue_next_read_cb;</div><div class='ctx'> 	QETH_CARD_TEXT(card, 6, "noirqpnd");</div><div class='ctx'> 	rc = ccw_device_start(channel-&gt;ccwdev, channel-&gt;ccw,</div><div class='ctx'> 			      (addr_t) iob, 0, 0);</div><div class='hunk'>@@ -542,11 +544,10 @@ static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_reply *reply;</div><div class='ctx'> </div><div class='del'>-	reply = kzalloc(sizeof(struct qeth_reply), GFP_ATOMIC);</div><div class='add'>+	reply = kzalloc(sizeof(*reply), GFP_KERNEL);</div><div class='ctx'> 	if (reply) {</div><div class='ctx'> 		refcount_set(&amp;reply-&gt;refcnt, 1);</div><div class='del'>-		atomic_set(&amp;reply-&gt;received, 0);</div><div class='del'>-		init_waitqueue_head(&amp;reply-&gt;wait_q);</div><div class='add'>+		init_completion(&amp;reply-&gt;received);</div><div class='ctx'> 	}</div><div class='ctx'> 	return reply;</div><div class='ctx'> }</div><div class='hunk'>@@ -576,10 +577,10 @@ static void qeth_dequeue_reply(struct qeth_card *card, struct qeth_reply *reply)</div><div class='ctx'> 	spin_unlock_irq(&amp;card-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_notify_reply(struct qeth_reply *reply)</div><div class='add'>+static void qeth_notify_reply(struct qeth_reply *reply, int reason)</div><div class='ctx'> {</div><div class='del'>-	atomic_inc(&amp;reply-&gt;received);</div><div class='del'>-	wake_up(&amp;reply-&gt;wait_q);</div><div class='add'>+	reply-&gt;rc = reason;</div><div class='add'>+	complete(&amp;reply-&gt;received);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, int rc,</div><div class='hunk'>@@ -664,10 +665,8 @@ void qeth_clear_ipacmd_list(struct qeth_card *card)</div><div class='ctx'> 	QETH_CARD_TEXT(card, 4, "clipalst");</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='del'>-	list_for_each_entry(reply, &amp;card-&gt;cmd_waiter_list, list) {</div><div class='del'>-		reply-&gt;rc = -EIO;</div><div class='del'>-		qeth_notify_reply(reply);</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(reply, &amp;card-&gt;cmd_waiter_list, list)</div><div class='add'>+		qeth_notify_reply(reply, -EIO);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;card-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qeth_clear_ipacmd_list);</div><div class='hunk'>@@ -675,9 +674,6 @@ EXPORT_SYMBOL_GPL(qeth_clear_ipacmd_list);</div><div class='ctx'> static int qeth_check_idx_response(struct qeth_card *card,</div><div class='ctx'> 	unsigned char *buffer)</div><div class='ctx'> {</div><div class='del'>-	if (!buffer)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	QETH_DBF_HEX(CTRL, 2, buffer, QETH_DBF_CTRL_LEN);</div><div class='ctx'> 	if ((buffer[2] &amp; 0xc0) == 0xc0) {</div><div class='ctx'> 		QETH_DBF_MESSAGE(2, "received an IDX TERMINATE with cause code %#04x\n",</div><div class='hunk'>@@ -704,6 +700,7 @@ static struct qeth_cmd_buffer *__qeth_get_buffer(struct qeth_channel *channel)</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (channel-&gt;iob[index].state == BUF_STATE_FREE) {</div><div class='ctx'> 			channel-&gt;iob[index].state = BUF_STATE_LOCKED;</div><div class='add'>+			channel-&gt;iob[index].timeout = QETH_TIMEOUT;</div><div class='ctx'> 			channel-&gt;io_buf_no = (channel-&gt;io_buf_no + 1) %</div><div class='ctx'> 				QETH_CMD_BUFFER_NO;</div><div class='ctx'> 			memset(channel-&gt;iob[index].data, 0, QETH_BUFSIZE);</div><div class='hunk'>@@ -722,7 +719,7 @@ void qeth_release_buffer(struct qeth_channel *channel,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;channel-&gt;iob_lock, flags);</div><div class='ctx'> 	iob-&gt;state = BUF_STATE_FREE;</div><div class='del'>-	iob-&gt;callback = qeth_send_control_data_cb;</div><div class='add'>+	iob-&gt;callback = NULL;</div><div class='ctx'> 	if (iob-&gt;reply) {</div><div class='ctx'> 		qeth_put_reply(iob-&gt;reply);</div><div class='ctx'> 		iob-&gt;reply = NULL;</div><div class='hunk'>@@ -743,10 +740,8 @@ static void qeth_cancel_cmd(struct qeth_cmd_buffer *iob, int rc)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_reply *reply = iob-&gt;reply;</div><div class='ctx'> </div><div class='del'>-	if (reply) {</div><div class='del'>-		reply-&gt;rc = rc;</div><div class='del'>-		qeth_notify_reply(reply);</div><div class='del'>-	}</div><div class='add'>+	if (reply)</div><div class='add'>+		qeth_notify_reply(reply, rc);</div><div class='ctx'> 	qeth_release_buffer(iob-&gt;channel, iob);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -780,9 +775,9 @@ void qeth_clear_cmd_buffers(struct qeth_channel *channel)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qeth_clear_cmd_buffers);</div><div class='ctx'> </div><div class='del'>-static void qeth_send_control_data_cb(struct qeth_card *card,</div><div class='del'>-				      struct qeth_channel *channel,</div><div class='del'>-				      struct qeth_cmd_buffer *iob)</div><div class='add'>+static void qeth_issue_next_read_cb(struct qeth_card *card,</div><div class='add'>+				    struct qeth_channel *channel,</div><div class='add'>+				    struct qeth_cmd_buffer *iob)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_ipa_cmd *cmd = NULL;</div><div class='ctx'> 	struct qeth_reply *reply = NULL;</div><div class='hunk'>@@ -846,11 +841,8 @@ static void qeth_send_control_data_cb(struct qeth_card *card,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rc &lt;= 0) {</div><div class='del'>-		reply-&gt;rc = rc;</div><div class='del'>-		qeth_notify_reply(reply);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (rc &lt;= 0)</div><div class='add'>+		qeth_notify_reply(reply, rc);</div><div class='ctx'> 	qeth_put_reply(reply);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1150,13 +1142,16 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *q,</div><div class='ctx'> </div><div class='ctx'> static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='ctx'> 	/* release may never happen from within CQ tasklet scope */</div><div class='ctx'> 	WARN_ON_ONCE(atomic_read(&amp;buf-&gt;state) == QETH_QDIO_BUF_IN_CQ);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;buf-&gt;state) == QETH_QDIO_BUF_PENDING)</div><div class='ctx'> 		qeth_notify_skbs(buf-&gt;q, buf, TX_NOTIFY_GENERALERROR);</div><div class='ctx'> </div><div class='del'>-	__skb_queue_purge(&amp;buf-&gt;skb_list);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;buf-&gt;skb_list)) != NULL)</div><div class='add'>+		consume_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,</div><div class='hunk'>@@ -1170,20 +1165,19 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,</div><div class='ctx'> </div><div class='ctx'> 	qeth_release_skbs(buf);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; QETH_MAX_BUFFER_ELEMENTS(queue-&gt;card); ++i) {</div><div class='add'>+	for (i = 0; i &lt; queue-&gt;max_elements; ++i) {</div><div class='ctx'> 		if (buf-&gt;buffer-&gt;element[i].addr &amp;&amp; buf-&gt;is_header[i])</div><div class='ctx'> 			kmem_cache_free(qeth_core_header_cache,</div><div class='ctx'> 				buf-&gt;buffer-&gt;element[i].addr);</div><div class='ctx'> 		buf-&gt;is_header[i] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qeth_scrub_qdio_buffer(buf-&gt;buffer,</div><div class='del'>-			       QETH_MAX_BUFFER_ELEMENTS(queue-&gt;card));</div><div class='add'>+	qeth_scrub_qdio_buffer(buf-&gt;buffer, queue-&gt;max_elements);</div><div class='ctx'> 	buf-&gt;next_element_to_fill = 0;</div><div class='ctx'> 	atomic_set(&amp;buf-&gt;state, QETH_QDIO_BUF_EMPTY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_clear_outq_buffers(struct qeth_qdio_out_q *q, int free)</div><div class='add'>+static void qeth_drain_output_queue(struct qeth_qdio_out_q *q, bool free)</div><div class='ctx'> {</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='hunk'>@@ -1199,19 +1193,18 @@ static void qeth_clear_outq_buffers(struct qeth_qdio_out_q *q, int free)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void qeth_clear_qdio_buffers(struct qeth_card *card)</div><div class='add'>+void qeth_drain_output_queues(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 2, "clearqdbf");</div><div class='ctx'> 	/* clear outbound buffers to free skbs */</div><div class='ctx'> 	for (i = 0; i &lt; card-&gt;qdio.no_out_queues; ++i) {</div><div class='del'>-		if (card-&gt;qdio.out_qs[i]) {</div><div class='del'>-			qeth_clear_outq_buffers(card-&gt;qdio.out_qs[i], 0);</div><div class='del'>-		}</div><div class='add'>+		if (card-&gt;qdio.out_qs[i])</div><div class='add'>+			qeth_drain_output_queue(card-&gt;qdio.out_qs[i], false);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(qeth_clear_qdio_buffers);</div><div class='add'>+EXPORT_SYMBOL_GPL(qeth_drain_output_queues);</div><div class='ctx'> </div><div class='ctx'> static void qeth_free_buffer_pool(struct qeth_card *card)</div><div class='ctx'> {</div><div class='hunk'>@@ -1270,7 +1263,6 @@ static int qeth_setup_channel(struct qeth_channel *channel, bool alloc_buffers)</div><div class='ctx'> 			break;</div><div class='ctx'> 		channel-&gt;iob[cnt].state = BUF_STATE_FREE;</div><div class='ctx'> 		channel-&gt;iob[cnt].channel = channel;</div><div class='del'>-		channel-&gt;iob[cnt].callback = qeth_send_control_data_cb;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cnt &lt; QETH_CMD_BUFFER_NO) {</div><div class='ctx'> 		qeth_clean_channel(channel);</div><div class='hunk'>@@ -1282,30 +1274,28 @@ static int qeth_setup_channel(struct qeth_channel *channel, bool alloc_buffers)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_set_single_write_queues(struct qeth_card *card)</div><div class='add'>+static void qeth_osa_set_output_queues(struct qeth_card *card, bool single)</div><div class='ctx'> {</div><div class='del'>-	if ((atomic_read(&amp;card-&gt;qdio.state) != QETH_QDIO_UNINITIALIZED) &amp;&amp;</div><div class='del'>-	    (card-&gt;qdio.no_out_queues == 4))</div><div class='del'>-		qeth_free_qdio_buffers(card);</div><div class='add'>+	unsigned int count = single ? 1 : card-&gt;dev-&gt;num_tx_queues;</div><div class='ctx'> </div><div class='del'>-	card-&gt;qdio.no_out_queues = 1;</div><div class='del'>-	if (card-&gt;qdio.default_out_queue != 0)</div><div class='del'>-		dev_info(&amp;card-&gt;gdev-&gt;dev, "Priority Queueing not supported\n");</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	netif_set_real_num_tx_queues(card-&gt;dev, count);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	card-&gt;qdio.default_out_queue = 0;</div><div class='del'>-}</div><div class='add'>+	if (card-&gt;qdio.no_out_queues == count)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-static void qeth_set_multiple_write_queues(struct qeth_card *card)</div><div class='del'>-{</div><div class='del'>-	if ((atomic_read(&amp;card-&gt;qdio.state) != QETH_QDIO_UNINITIALIZED) &amp;&amp;</div><div class='del'>-	    (card-&gt;qdio.no_out_queues == 1)) {</div><div class='del'>-		qeth_free_qdio_buffers(card);</div><div class='del'>-		card-&gt;qdio.default_out_queue = 2;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;qdio.no_out_queues = 4;</div><div class='add'>+	if (atomic_read(&amp;card-&gt;qdio.state) != QETH_QDIO_UNINITIALIZED)</div><div class='add'>+		qeth_free_qdio_queues(card);</div><div class='add'>+</div><div class='add'>+	if (count == 1)</div><div class='add'>+		dev_info(&amp;card-&gt;gdev-&gt;dev, "Priority Queueing not supported\n");</div><div class='add'>+</div><div class='add'>+	card-&gt;qdio.default_out_queue = single ? 0 : QETH_DEFAULT_QUEUE;</div><div class='add'>+	card-&gt;qdio.no_out_queues = count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_update_from_chp_desc(struct qeth_card *card)</div><div class='add'>+static int qeth_update_from_chp_desc(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccw_device *ccwdev;</div><div class='ctx'> 	struct channel_path_desc_fmt0 *chp_dsc;</div><div class='hunk'>@@ -1315,21 +1305,18 @@ static void qeth_update_from_chp_desc(struct qeth_card *card)</div><div class='ctx'> 	ccwdev = card-&gt;data.ccwdev;</div><div class='ctx'> 	chp_dsc = ccw_device_get_chp_desc(ccwdev, 0);</div><div class='ctx'> 	if (!chp_dsc)</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;info.func_level = 0x4100 + chp_dsc-&gt;desc;</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	/* CHPP field bit 6 == 1 -&gt; single queue */</div><div class='del'>-	if ((chp_dsc-&gt;chpp &amp; 0x02) == 0x02)</div><div class='del'>-		qeth_set_single_write_queues(card);</div><div class='del'>-	else</div><div class='del'>-		qeth_set_multiple_write_queues(card);</div><div class='del'>-out:</div><div class='add'>+	if (IS_OSD(card) || IS_OSX(card))</div><div class='add'>+		/* CHPP field bit 6 == 1 -&gt; single queue */</div><div class='add'>+		qeth_osa_set_output_queues(card, chp_dsc-&gt;chpp &amp; 0x02);</div><div class='add'>+</div><div class='ctx'> 	kfree(chp_dsc);</div><div class='ctx'> 	QETH_DBF_TEXT_(SETUP, 2, "nr:%x", card-&gt;qdio.no_out_queues);</div><div class='ctx'> 	QETH_DBF_TEXT_(SETUP, 2, "lvl:%02x", card-&gt;info.func_level);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qeth_init_qdio_info(struct qeth_card *card)</div><div class='hunk'>@@ -1338,12 +1325,11 @@ static void qeth_init_qdio_info(struct qeth_card *card)</div><div class='ctx'> 	atomic_set(&amp;card-&gt;qdio.state, QETH_QDIO_UNINITIALIZED);</div><div class='ctx'> 	card-&gt;qdio.do_prio_queueing = QETH_PRIOQ_DEFAULT;</div><div class='ctx'> 	card-&gt;qdio.default_out_queue = QETH_DEFAULT_QUEUE;</div><div class='del'>-	card-&gt;qdio.no_out_queues = QETH_MAX_QUEUES;</div><div class='ctx'> </div><div class='ctx'> 	/* inbound */</div><div class='ctx'> 	card-&gt;qdio.no_in_queues = 1;</div><div class='ctx'> 	card-&gt;qdio.in_buf_size = QETH_IN_BUF_SIZE_DEFAULT;</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='add'>+	if (IS_IQD(card))</div><div class='ctx'> 		card-&gt;qdio.init_pool.buf_count = QETH_IN_BUF_COUNT_HSDEFAULT;</div><div class='ctx'> 	else</div><div class='ctx'> 		card-&gt;qdio.init_pool.buf_count = QETH_IN_BUF_COUNT_DEFAULT;</div><div class='hunk'>@@ -1406,9 +1392,7 @@ static void qeth_setup_card(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;info.type = CARD_RDEV(card)-&gt;id.driver_info;</div><div class='ctx'> 	card-&gt;state = CARD_STATE_DOWN;</div><div class='del'>-	spin_lock_init(&amp;card-&gt;mclock);</div><div class='ctx'> 	spin_lock_init(&amp;card-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	spin_lock_init(&amp;card-&gt;thread_mask_lock);</div><div class='ctx'> 	mutex_init(&amp;card-&gt;conf_mutex);</div><div class='ctx'> 	mutex_init(&amp;card-&gt;discipline_mutex);</div><div class='hunk'>@@ -1448,7 +1432,8 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev)</div><div class='ctx'> 	CARD_WDEV(card) = gdev-&gt;cdev[1];</div><div class='ctx'> 	CARD_DDEV(card) = gdev-&gt;cdev[2];</div><div class='ctx'> </div><div class='del'>-	card-&gt;event_wq = alloc_ordered_workqueue("%s", 0, dev_name(&amp;gdev-&gt;dev));</div><div class='add'>+	card-&gt;event_wq = alloc_ordered_workqueue("%s_event", 0,</div><div class='add'>+						 dev_name(&amp;gdev-&gt;dev));</div><div class='ctx'> 	if (!card-&gt;event_wq)</div><div class='ctx'> 		goto out_wq;</div><div class='ctx'> 	if (qeth_setup_channel(&amp;card-&gt;read, true))</div><div class='hunk'>@@ -1568,7 +1553,7 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt)</div><div class='ctx'> 	switch (atomic_cmpxchg(&amp;card-&gt;qdio.state, QETH_QDIO_ESTABLISHED,</div><div class='ctx'> 		QETH_QDIO_CLEANING)) {</div><div class='ctx'> 	case QETH_QDIO_ESTABLISHED:</div><div class='del'>-		if (card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='add'>+		if (IS_IQD(card))</div><div class='ctx'> 			rc = qdio_shutdown(CARD_DDEV(card),</div><div class='ctx'> 				QDIO_FLAG_CLEANUP_USING_HALT);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1641,8 +1626,8 @@ static void qeth_configure_unitaddr(struct qeth_card *card, char *prcd)</div><div class='ctx'> 	card-&gt;info.chpid = prcd[30];</div><div class='ctx'> 	card-&gt;info.unit_addr2 = prcd[31];</div><div class='ctx'> 	card-&gt;info.cula = prcd[63];</div><div class='del'>-	card-&gt;info.guestlan = ((prcd[0x10] == _ascebc['V']) &amp;&amp;</div><div class='del'>-			       (prcd[0x11] == _ascebc['M']));</div><div class='add'>+	card-&gt;info.is_vm_nic = ((prcd[0x10] == _ascebc['V']) &amp;&amp;</div><div class='add'>+				(prcd[0x11] == _ascebc['M']));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum qeth_discipline_id qeth_vm_detect_layer(struct qeth_card *card)</div><div class='hunk'>@@ -1706,13 +1691,11 @@ static enum qeth_discipline_id qeth_enforce_discipline(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	enum qeth_discipline_id disc = QETH_DISCIPLINE_UNDETERMINED;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_OSM ||</div><div class='del'>-	    card-&gt;info.type == QETH_CARD_TYPE_OSN)</div><div class='add'>+	if (IS_OSM(card) || IS_OSN(card))</div><div class='ctx'> 		disc = QETH_DISCIPLINE_LAYER2;</div><div class='del'>-	else if (card-&gt;info.guestlan)</div><div class='del'>-		disc = (card-&gt;info.type == QETH_CARD_TYPE_IQD) ?</div><div class='del'>-				QETH_DISCIPLINE_LAYER3 :</div><div class='del'>-				qeth_vm_detect_layer(card);</div><div class='add'>+	else if (IS_VM_NIC(card))</div><div class='add'>+		disc = IS_IQD(card) ? QETH_DISCIPLINE_LAYER3 :</div><div class='add'>+				      qeth_vm_detect_layer(card);</div><div class='ctx'> </div><div class='ctx'> 	switch (disc) {</div><div class='ctx'> 	case QETH_DISCIPLINE_LAYER2:</div><div class='hunk'>@@ -1768,121 +1751,16 @@ static void qeth_init_func_level(struct qeth_card *card)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qeth_idx_activate_get_answer(struct qeth_card *card,</div><div class='del'>-					struct qeth_channel *channel,</div><div class='del'>-					void (*reply_cb)(struct qeth_card *,</div><div class='del'>-							 struct qeth_channel *,</div><div class='del'>-							 struct qeth_cmd_buffer *))</div><div class='del'>-{</div><div class='del'>-	struct qeth_cmd_buffer *iob;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	QETH_DBF_TEXT(SETUP, 2, "idxanswr");</div><div class='del'>-	iob = qeth_get_buffer(channel);</div><div class='del'>-	if (!iob)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	iob-&gt;callback = reply_cb;</div><div class='del'>-	qeth_setup_ccw(channel-&gt;ccw, CCW_CMD_READ, QETH_BUFSIZE, iob-&gt;data);</div><div class='del'>-</div><div class='del'>-	wait_event(card-&gt;wait_q,</div><div class='del'>-		   atomic_cmpxchg(&amp;channel-&gt;irq_pending, 0, 1) == 0);</div><div class='del'>-	QETH_DBF_TEXT(SETUP, 6, "noirqpnd");</div><div class='del'>-	spin_lock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='del'>-	rc = ccw_device_start_timeout(channel-&gt;ccwdev, channel-&gt;ccw,</div><div class='del'>-				      (addr_t) iob, 0, 0, QETH_TIMEOUT);</div><div class='del'>-	spin_unlock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		QETH_DBF_MESSAGE(2, "Error2 in activating channel rc=%d\n", rc);</div><div class='del'>-		QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);</div><div class='del'>-		atomic_set(&amp;channel-&gt;irq_pending, 0);</div><div class='del'>-		qeth_release_buffer(channel, iob);</div><div class='del'>-		wake_up(&amp;card-&gt;wait_q);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-	rc = wait_event_interruptible_timeout(card-&gt;wait_q,</div><div class='del'>-			 channel-&gt;state == CH_STATE_UP, QETH_TIMEOUT);</div><div class='del'>-	if (rc == -ERESTARTSYS)</div><div class='del'>-		return rc;</div><div class='del'>-	if (channel-&gt;state != CH_STATE_UP) {</div><div class='del'>-		rc = -ETIME;</div><div class='del'>-		QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);</div><div class='del'>-	} else</div><div class='del'>-		rc = 0;</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qeth_idx_activate_channel(struct qeth_card *card,</div><div class='del'>-				     struct qeth_channel *channel,</div><div class='del'>-				     void (*reply_cb)(struct qeth_card *,</div><div class='del'>-						      struct qeth_channel *,</div><div class='del'>-						      struct qeth_cmd_buffer *))</div><div class='add'>+static void qeth_idx_finalize_cmd(struct qeth_card *card,</div><div class='add'>+				  struct qeth_cmd_buffer *iob,</div><div class='add'>+				  unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	struct qeth_cmd_buffer *iob;</div><div class='del'>-	__u16 temp;</div><div class='del'>-	__u8 tmp;</div><div class='del'>-	int rc;</div><div class='del'>-	struct ccw_dev_id temp_devid;</div><div class='add'>+	qeth_setup_ccw(iob-&gt;channel-&gt;ccw, CCW_CMD_WRITE, length, iob-&gt;data);</div><div class='ctx'> </div><div class='del'>-	QETH_DBF_TEXT(SETUP, 2, "idxactch");</div><div class='del'>-</div><div class='del'>-	iob = qeth_get_buffer(channel);</div><div class='del'>-	if (!iob)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	iob-&gt;callback = reply_cb;</div><div class='del'>-	qeth_setup_ccw(channel-&gt;ccw, CCW_CMD_WRITE, IDX_ACTIVATE_SIZE,</div><div class='del'>-		       iob-&gt;data);</div><div class='del'>-	if (channel == &amp;card-&gt;write) {</div><div class='del'>-		memcpy(iob-&gt;data, IDX_ACTIVATE_WRITE, IDX_ACTIVATE_SIZE);</div><div class='del'>-		memcpy(QETH_TRANSPORT_HEADER_SEQ_NO(iob-&gt;data),</div><div class='del'>-		       &amp;card-&gt;seqno.trans_hdr, QETH_SEQ_NO_LENGTH);</div><div class='add'>+	memcpy(QETH_TRANSPORT_HEADER_SEQ_NO(iob-&gt;data), &amp;card-&gt;seqno.trans_hdr,</div><div class='add'>+	       QETH_SEQ_NO_LENGTH);</div><div class='add'>+	if (iob-&gt;channel == &amp;card-&gt;write)</div><div class='ctx'> 		card-&gt;seqno.trans_hdr++;</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(iob-&gt;data, IDX_ACTIVATE_READ, IDX_ACTIVATE_SIZE);</div><div class='del'>-		memcpy(QETH_TRANSPORT_HEADER_SEQ_NO(iob-&gt;data),</div><div class='del'>-		       &amp;card-&gt;seqno.trans_hdr, QETH_SEQ_NO_LENGTH);</div><div class='del'>-	}</div><div class='del'>-	tmp = ((u8)card-&gt;dev-&gt;dev_port) | 0x80;</div><div class='del'>-	memcpy(QETH_IDX_ACT_PNO(iob-&gt;data), &amp;tmp, 1);</div><div class='del'>-	memcpy(QETH_IDX_ACT_ISSUER_RM_TOKEN(iob-&gt;data),</div><div class='del'>-	       &amp;card-&gt;token.issuer_rm_w, QETH_MPC_TOKEN_LENGTH);</div><div class='del'>-	memcpy(QETH_IDX_ACT_FUNC_LEVEL(iob-&gt;data),</div><div class='del'>-	       &amp;card-&gt;info.func_level, sizeof(__u16));</div><div class='del'>-	ccw_device_get_id(CARD_DDEV(card), &amp;temp_devid);</div><div class='del'>-	memcpy(QETH_IDX_ACT_QDIO_DEV_CUA(iob-&gt;data), &amp;temp_devid.devno, 2);</div><div class='del'>-	temp = (card-&gt;info.cula &lt;&lt; 8) + card-&gt;info.unit_addr2;</div><div class='del'>-	memcpy(QETH_IDX_ACT_QDIO_DEV_REALADDR(iob-&gt;data), &amp;temp, 2);</div><div class='del'>-</div><div class='del'>-	wait_event(card-&gt;wait_q,</div><div class='del'>-		   atomic_cmpxchg(&amp;channel-&gt;irq_pending, 0, 1) == 0);</div><div class='del'>-	QETH_DBF_TEXT(SETUP, 6, "noirqpnd");</div><div class='del'>-	spin_lock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='del'>-	rc = ccw_device_start_timeout(channel-&gt;ccwdev, channel-&gt;ccw,</div><div class='del'>-				      (addr_t) iob, 0, 0, QETH_TIMEOUT);</div><div class='del'>-	spin_unlock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		QETH_DBF_MESSAGE(2, "Error1 in activating channel. rc=%d\n",</div><div class='del'>-			rc);</div><div class='del'>-		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);</div><div class='del'>-		atomic_set(&amp;channel-&gt;irq_pending, 0);</div><div class='del'>-		qeth_release_buffer(channel, iob);</div><div class='del'>-		wake_up(&amp;card-&gt;wait_q);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-	rc = wait_event_interruptible_timeout(card-&gt;wait_q,</div><div class='del'>-			channel-&gt;state == CH_STATE_ACTIVATING, QETH_TIMEOUT);</div><div class='del'>-	if (rc == -ERESTARTSYS)</div><div class='del'>-		return rc;</div><div class='del'>-	if (channel-&gt;state != CH_STATE_ACTIVATING) {</div><div class='del'>-		dev_warn(&amp;channel-&gt;ccwdev-&gt;dev, "The qeth device driver"</div><div class='del'>-			" failed to recover an error on the device\n");</div><div class='del'>-		QETH_DBF_MESSAGE(2, "IDX activate timed out on channel %x\n",</div><div class='del'>-				 CCW_DEVID(channel-&gt;ccwdev));</div><div class='del'>-		QETH_DBF_TEXT_(SETUP, 2, "2err%d", -ETIME);</div><div class='del'>-		return -ETIME;</div><div class='del'>-	}</div><div class='del'>-	return qeth_idx_activate_get_answer(card, channel, reply_cb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qeth_peer_func_level(int level)</div><div class='hunk'>@@ -1894,112 +1772,21 @@ static int qeth_peer_func_level(int level)</div><div class='ctx'> 	return level;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_idx_write_cb(struct qeth_card *card,</div><div class='del'>-			      struct qeth_channel *channel,</div><div class='del'>-			      struct qeth_cmd_buffer *iob)</div><div class='del'>-{</div><div class='del'>-	__u16 temp;</div><div class='del'>-</div><div class='del'>-	QETH_DBF_TEXT(SETUP , 2, "idxwrcb");</div><div class='del'>-</div><div class='del'>-	if (channel-&gt;state == CH_STATE_DOWN) {</div><div class='del'>-		channel-&gt;state = CH_STATE_ACTIVATING;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(QETH_IS_IDX_ACT_POS_REPLY(iob-&gt;data))) {</div><div class='del'>-		if (QETH_IDX_ACT_CAUSE_CODE(iob-&gt;data) == QETH_IDX_ACT_ERR_EXCL)</div><div class='del'>-			dev_err(&amp;channel-&gt;ccwdev-&gt;dev,</div><div class='del'>-				"The adapter is used exclusively by another "</div><div class='del'>-				"host\n");</div><div class='del'>-		else</div><div class='del'>-			QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: negative reply\n",</div><div class='del'>-					 CCW_DEVID(channel-&gt;ccwdev));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	memcpy(&amp;temp, QETH_IDX_ACT_FUNC_LEVEL(iob-&gt;data), 2);</div><div class='del'>-	if ((temp &amp; ~0x0100) != qeth_peer_func_level(card-&gt;info.func_level)) {</div><div class='del'>-		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: function level mismatch (sent: %#x, received: %#x)\n",</div><div class='del'>-				 CCW_DEVID(channel-&gt;ccwdev),</div><div class='del'>-				 card-&gt;info.func_level, temp);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	channel-&gt;state = CH_STATE_UP;</div><div class='del'>-out:</div><div class='del'>-	qeth_release_buffer(channel, iob);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void qeth_idx_read_cb(struct qeth_card *card,</div><div class='del'>-			     struct qeth_channel *channel,</div><div class='del'>-			     struct qeth_cmd_buffer *iob)</div><div class='del'>-{</div><div class='del'>-	__u16 temp;</div><div class='del'>-</div><div class='del'>-	QETH_DBF_TEXT(SETUP , 2, "idxrdcb");</div><div class='del'>-	if (channel-&gt;state == CH_STATE_DOWN) {</div><div class='del'>-		channel-&gt;state = CH_STATE_ACTIVATING;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (qeth_check_idx_response(card, iob-&gt;data))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-	if (!(QETH_IS_IDX_ACT_POS_REPLY(iob-&gt;data))) {</div><div class='del'>-		switch (QETH_IDX_ACT_CAUSE_CODE(iob-&gt;data)) {</div><div class='del'>-		case QETH_IDX_ACT_ERR_EXCL:</div><div class='del'>-			dev_err(&amp;channel-&gt;ccwdev-&gt;dev,</div><div class='del'>-				"The adapter is used exclusively by another "</div><div class='del'>-				"host\n");</div><div class='del'>-			break;</div><div class='del'>-		case QETH_IDX_ACT_ERR_AUTH:</div><div class='del'>-		case QETH_IDX_ACT_ERR_AUTH_USER:</div><div class='del'>-			dev_err(&amp;channel-&gt;ccwdev-&gt;dev,</div><div class='del'>-				"Setting the device online failed because of "</div><div class='del'>-				"insufficient authorization\n");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: negative reply\n",</div><div class='del'>-					 CCW_DEVID(channel-&gt;ccwdev));</div><div class='del'>-		}</div><div class='del'>-		QETH_CARD_TEXT_(card, 2, "idxread%c",</div><div class='del'>-			QETH_IDX_ACT_CAUSE_CODE(iob-&gt;data));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;temp, QETH_IDX_ACT_FUNC_LEVEL(iob-&gt;data), 2);</div><div class='del'>-	if (temp != qeth_peer_func_level(card-&gt;info.func_level)) {</div><div class='del'>-		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: function level mismatch (sent: %#x, received: %#x)\n",</div><div class='del'>-				 CCW_DEVID(channel-&gt;ccwdev),</div><div class='del'>-				 card-&gt;info.func_level, temp);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	memcpy(&amp;card-&gt;token.issuer_rm_r,</div><div class='del'>-	       QETH_IDX_ACT_ISSUER_RM_TOKEN(iob-&gt;data),</div><div class='del'>-	       QETH_MPC_TOKEN_LENGTH);</div><div class='del'>-	memcpy(&amp;card-&gt;info.mcl_level[0],</div><div class='del'>-	       QETH_IDX_REPLY_LEVEL(iob-&gt;data), QETH_MCL_LENGTH);</div><div class='del'>-	channel-&gt;state = CH_STATE_UP;</div><div class='del'>-out:</div><div class='del'>-	qeth_release_buffer(channel, iob);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void qeth_prepare_control_data(struct qeth_card *card, int len,</div><div class='del'>-		struct qeth_cmd_buffer *iob)</div><div class='add'>+static void qeth_mpc_finalize_cmd(struct qeth_card *card,</div><div class='add'>+				  struct qeth_cmd_buffer *iob,</div><div class='add'>+				  unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	qeth_setup_ccw(iob-&gt;channel-&gt;ccw, CCW_CMD_WRITE, len, iob-&gt;data);</div><div class='del'>-	iob-&gt;callback = qeth_release_buffer_cb;</div><div class='add'>+	qeth_idx_finalize_cmd(card, iob, length);</div><div class='ctx'> </div><div class='del'>-	memcpy(QETH_TRANSPORT_HEADER_SEQ_NO(iob-&gt;data),</div><div class='del'>-	       &amp;card-&gt;seqno.trans_hdr, QETH_SEQ_NO_LENGTH);</div><div class='del'>-	card-&gt;seqno.trans_hdr++;</div><div class='ctx'> 	memcpy(QETH_PDU_HEADER_SEQ_NO(iob-&gt;data),</div><div class='ctx'> 	       &amp;card-&gt;seqno.pdu_hdr, QETH_SEQ_NO_LENGTH);</div><div class='ctx'> 	card-&gt;seqno.pdu_hdr++;</div><div class='ctx'> 	memcpy(QETH_PDU_HEADER_ACK_SEQ_NO(iob-&gt;data),</div><div class='ctx'> 	       &amp;card-&gt;seqno.pdu_hdr_ack, QETH_SEQ_NO_LENGTH);</div><div class='del'>-	QETH_DBF_HEX(CTRL, 2, iob-&gt;data, min(len, QETH_DBF_CTRL_LEN));</div><div class='add'>+</div><div class='add'>+	iob-&gt;reply-&gt;seqno = QETH_IDX_COMMAND_SEQNO;</div><div class='add'>+	iob-&gt;callback = qeth_release_buffer_cb;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(qeth_prepare_control_data);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * qeth_send_control_data() -	send control command to the card</div><div class='hunk'>@@ -2032,17 +1819,12 @@ static int qeth_send_control_data(struct qeth_card *card, int len,</div><div class='ctx'> 				  void *reply_param)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_channel *channel = iob-&gt;channel;</div><div class='add'>+	long timeout = iob-&gt;timeout;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct qeth_reply *reply = NULL;</div><div class='del'>-	unsigned long timeout, event_timeout;</div><div class='del'>-	struct qeth_ipa_cmd *cmd = NULL;</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 2, "sendctl");</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;read_or_write_problem) {</div><div class='del'>-		qeth_release_buffer(channel, iob);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> 	reply = qeth_alloc_reply(card);</div><div class='ctx'> 	if (!reply) {</div><div class='ctx'> 		qeth_release_buffer(channel, iob);</div><div class='hunk'>@@ -2055,27 +1837,24 @@ static int qeth_send_control_data(struct qeth_card *card, int len,</div><div class='ctx'> 	qeth_get_reply(reply);</div><div class='ctx'> 	iob-&gt;reply = reply;</div><div class='ctx'> </div><div class='del'>-	while (atomic_cmpxchg(&amp;channel-&gt;irq_pending, 0, 1)) ;</div><div class='del'>-</div><div class='del'>-	if (IS_IPA(iob-&gt;data)) {</div><div class='del'>-		cmd = __ipa_cmd(iob);</div><div class='del'>-		cmd-&gt;hdr.seqno = card-&gt;seqno.ipa++;</div><div class='del'>-		reply-&gt;seqno = cmd-&gt;hdr.seqno;</div><div class='del'>-		event_timeout = QETH_IPA_TIMEOUT;</div><div class='del'>-	} else {</div><div class='del'>-		reply-&gt;seqno = QETH_IDX_COMMAND_SEQNO;</div><div class='del'>-		event_timeout = QETH_TIMEOUT;</div><div class='add'>+	timeout = wait_event_interruptible_timeout(card-&gt;wait_q,</div><div class='add'>+						   qeth_trylock_channel(channel),</div><div class='add'>+						   timeout);</div><div class='add'>+	if (timeout &lt;= 0) {</div><div class='add'>+		qeth_put_reply(reply);</div><div class='add'>+		qeth_release_buffer(channel, iob);</div><div class='add'>+		return (timeout == -ERESTARTSYS) ? -EINTR : -ETIME;</div><div class='ctx'> 	}</div><div class='del'>-	qeth_prepare_control_data(card, len, iob);</div><div class='ctx'> </div><div class='del'>-	qeth_enqueue_reply(card, reply);</div><div class='add'>+	iob-&gt;finalize(card, iob, len);</div><div class='add'>+	QETH_DBF_HEX(CTRL, 2, iob-&gt;data, min(len, QETH_DBF_CTRL_LEN));</div><div class='ctx'> </div><div class='del'>-	timeout = jiffies + event_timeout;</div><div class='add'>+	qeth_enqueue_reply(card, reply);</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 6, "noirqpnd");</div><div class='ctx'> 	spin_lock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='ctx'> 	rc = ccw_device_start_timeout(channel-&gt;ccwdev, channel-&gt;ccw,</div><div class='del'>-				      (addr_t) iob, 0, 0, event_timeout);</div><div class='add'>+				      (addr_t) iob, 0, 0, timeout);</div><div class='ctx'> 	spin_unlock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		QETH_DBF_MESSAGE(2, "qeth_send_control_data on device %x: ccw_device_start rc = %i\n",</div><div class='hunk'>@@ -2089,30 +1868,211 @@ static int qeth_send_control_data(struct qeth_card *card, int len,</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* we have only one long running ipassist, since we can ensure</div><div class='del'>-	   process context of this command we can sleep */</div><div class='del'>-	if (cmd &amp;&amp; cmd-&gt;hdr.command == IPA_CMD_SETIP &amp;&amp;</div><div class='del'>-	    cmd-&gt;hdr.prot_version == QETH_PROT_IPV4) {</div><div class='del'>-		if (!wait_event_timeout(reply-&gt;wait_q,</div><div class='del'>-		    atomic_read(&amp;reply-&gt;received), event_timeout))</div><div class='del'>-			goto time_err;</div><div class='del'>-	} else {</div><div class='del'>-		while (!atomic_read(&amp;reply-&gt;received)) {</div><div class='del'>-			if (time_after(jiffies, timeout))</div><div class='del'>-				goto time_err;</div><div class='del'>-			cpu_relax();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	timeout = wait_for_completion_interruptible_timeout(&amp;reply-&gt;received,</div><div class='add'>+							    timeout);</div><div class='add'>+	if (timeout &lt;= 0)</div><div class='add'>+		rc = (timeout == -ERESTARTSYS) ? -EINTR : -ETIME;</div><div class='ctx'> </div><div class='ctx'> 	qeth_dequeue_reply(card, reply);</div><div class='del'>-	rc = reply-&gt;rc;</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = reply-&gt;rc;</div><div class='ctx'> 	qeth_put_reply(reply);</div><div class='ctx'> 	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-time_err:</div><div class='del'>-	qeth_dequeue_reply(card, reply);</div><div class='del'>-	qeth_put_reply(reply);</div><div class='del'>-	return -ETIME;</div><div class='add'>+static int qeth_idx_check_activate_response(struct qeth_card *card,</div><div class='add'>+					    struct qeth_channel *channel,</div><div class='add'>+					    struct qeth_cmd_buffer *iob)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = qeth_check_idx_response(card, iob-&gt;data);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (QETH_IS_IDX_ACT_POS_REPLY(iob-&gt;data))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* negative reply: */</div><div class='add'>+	QETH_DBF_TEXT_(SETUP, 2, "idxneg%c",</div><div class='add'>+		       QETH_IDX_ACT_CAUSE_CODE(iob-&gt;data));</div><div class='add'>+</div><div class='add'>+	switch (QETH_IDX_ACT_CAUSE_CODE(iob-&gt;data)) {</div><div class='add'>+	case QETH_IDX_ACT_ERR_EXCL:</div><div class='add'>+		dev_err(&amp;channel-&gt;ccwdev-&gt;dev,</div><div class='add'>+			"The adapter is used exclusively by another host\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	case QETH_IDX_ACT_ERR_AUTH:</div><div class='add'>+	case QETH_IDX_ACT_ERR_AUTH_USER:</div><div class='add'>+		dev_err(&amp;channel-&gt;ccwdev-&gt;dev,</div><div class='add'>+			"Setting the device online failed because of insufficient authorization\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	default:</div><div class='add'>+		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: negative reply\n",</div><div class='add'>+				 CCW_DEVID(channel-&gt;ccwdev));</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qeth_idx_query_read_cb(struct qeth_card *card,</div><div class='add'>+				   struct qeth_channel *channel,</div><div class='add'>+				   struct qeth_cmd_buffer *iob)</div><div class='add'>+{</div><div class='add'>+	u16 peer_level;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	QETH_DBF_TEXT(SETUP, 2, "idxrdcb");</div><div class='add'>+</div><div class='add'>+	rc = qeth_idx_check_activate_response(card, channel, iob);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;peer_level, QETH_IDX_ACT_FUNC_LEVEL(iob-&gt;data), 2);</div><div class='add'>+	if (peer_level != qeth_peer_func_level(card-&gt;info.func_level)) {</div><div class='add'>+		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: function level mismatch (sent: %#x, received: %#x)\n",</div><div class='add'>+				 CCW_DEVID(channel-&gt;ccwdev),</div><div class='add'>+				 card-&gt;info.func_level, peer_level);</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;card-&gt;token.issuer_rm_r,</div><div class='add'>+	       QETH_IDX_ACT_ISSUER_RM_TOKEN(iob-&gt;data),</div><div class='add'>+	       QETH_MPC_TOKEN_LENGTH);</div><div class='add'>+	memcpy(&amp;card-&gt;info.mcl_level[0],</div><div class='add'>+	       QETH_IDX_REPLY_LEVEL(iob-&gt;data), QETH_MCL_LENGTH);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	qeth_notify_reply(iob-&gt;reply, rc);</div><div class='add'>+	qeth_release_buffer(channel, iob);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qeth_idx_query_write_cb(struct qeth_card *card,</div><div class='add'>+				    struct qeth_channel *channel,</div><div class='add'>+				    struct qeth_cmd_buffer *iob)</div><div class='add'>+{</div><div class='add'>+	u16 peer_level;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	QETH_DBF_TEXT(SETUP, 2, "idxwrcb");</div><div class='add'>+</div><div class='add'>+	rc = qeth_idx_check_activate_response(card, channel, iob);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;peer_level, QETH_IDX_ACT_FUNC_LEVEL(iob-&gt;data), 2);</div><div class='add'>+	if ((peer_level &amp; ~0x0100) !=</div><div class='add'>+	    qeth_peer_func_level(card-&gt;info.func_level)) {</div><div class='add'>+		QETH_DBF_MESSAGE(2, "IDX_ACTIVATE on channel %x: function level mismatch (sent: %#x, received: %#x)\n",</div><div class='add'>+				 CCW_DEVID(channel-&gt;ccwdev),</div><div class='add'>+				 card-&gt;info.func_level, peer_level);</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	qeth_notify_reply(iob-&gt;reply, rc);</div><div class='add'>+	qeth_release_buffer(channel, iob);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qeth_idx_finalize_query_cmd(struct qeth_card *card,</div><div class='add'>+					struct qeth_cmd_buffer *iob,</div><div class='add'>+					unsigned int length)</div><div class='add'>+{</div><div class='add'>+	qeth_setup_ccw(iob-&gt;channel-&gt;ccw, CCW_CMD_READ, length, iob-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qeth_idx_activate_cb(struct qeth_card *card,</div><div class='add'>+				 struct qeth_channel *channel,</div><div class='add'>+				 struct qeth_cmd_buffer *iob)</div><div class='add'>+{</div><div class='add'>+	qeth_notify_reply(iob-&gt;reply, 0);</div><div class='add'>+	qeth_release_buffer(channel, iob);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qeth_idx_setup_activate_cmd(struct qeth_card *card,</div><div class='add'>+					struct qeth_cmd_buffer *iob)</div><div class='add'>+{</div><div class='add'>+	u16 addr = (card-&gt;info.cula &lt;&lt; 8) + card-&gt;info.unit_addr2;</div><div class='add'>+	u8 port = ((u8)card-&gt;dev-&gt;dev_port) | 0x80;</div><div class='add'>+	struct ccw_dev_id dev_id;</div><div class='add'>+</div><div class='add'>+	ccw_device_get_id(CARD_DDEV(card), &amp;dev_id);</div><div class='add'>+	iob-&gt;finalize = qeth_idx_finalize_cmd;</div><div class='add'>+	iob-&gt;callback = qeth_idx_activate_cb;</div><div class='add'>+</div><div class='add'>+	memcpy(QETH_IDX_ACT_PNO(iob-&gt;data), &amp;port, 1);</div><div class='add'>+	memcpy(QETH_IDX_ACT_ISSUER_RM_TOKEN(iob-&gt;data),</div><div class='add'>+	       &amp;card-&gt;token.issuer_rm_w, QETH_MPC_TOKEN_LENGTH);</div><div class='add'>+	memcpy(QETH_IDX_ACT_FUNC_LEVEL(iob-&gt;data),</div><div class='add'>+	       &amp;card-&gt;info.func_level, 2);</div><div class='add'>+	memcpy(QETH_IDX_ACT_QDIO_DEV_CUA(iob-&gt;data), &amp;dev_id.devno, 2);</div><div class='add'>+	memcpy(QETH_IDX_ACT_QDIO_DEV_REALADDR(iob-&gt;data), &amp;addr, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qeth_idx_activate_read_channel(struct qeth_card *card)</div><div class='add'>+{</div><div class='add'>+	struct qeth_channel *channel = &amp;card-&gt;read;</div><div class='add'>+	struct qeth_cmd_buffer *iob;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	QETH_DBF_TEXT(SETUP, 2, "idxread");</div><div class='add'>+</div><div class='add'>+	iob = qeth_get_buffer(channel);</div><div class='add'>+	if (!iob)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(iob-&gt;data, IDX_ACTIVATE_READ, IDX_ACTIVATE_SIZE);</div><div class='add'>+	qeth_idx_setup_activate_cmd(card, iob);</div><div class='add'>+</div><div class='add'>+	rc = qeth_send_control_data(card, IDX_ACTIVATE_SIZE, iob, NULL, NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	iob = qeth_get_buffer(channel);</div><div class='add'>+	if (!iob)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iob-&gt;finalize = qeth_idx_finalize_query_cmd;</div><div class='add'>+	iob-&gt;callback = qeth_idx_query_read_cb;</div><div class='add'>+	rc = qeth_send_control_data(card, QETH_BUFSIZE, iob, NULL, NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	channel-&gt;state = CH_STATE_UP;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qeth_idx_activate_write_channel(struct qeth_card *card)</div><div class='add'>+{</div><div class='add'>+	struct qeth_channel *channel = &amp;card-&gt;write;</div><div class='add'>+	struct qeth_cmd_buffer *iob;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	QETH_DBF_TEXT(SETUP, 2, "idxwrite");</div><div class='add'>+</div><div class='add'>+	iob = qeth_get_buffer(channel);</div><div class='add'>+	if (!iob)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(iob-&gt;data, IDX_ACTIVATE_WRITE, IDX_ACTIVATE_SIZE);</div><div class='add'>+	qeth_idx_setup_activate_cmd(card, iob);</div><div class='add'>+</div><div class='add'>+	rc = qeth_send_control_data(card, IDX_ACTIVATE_SIZE, iob, NULL, NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	iob = qeth_get_buffer(channel);</div><div class='add'>+	if (!iob)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iob-&gt;finalize = qeth_idx_finalize_query_cmd;</div><div class='add'>+	iob-&gt;callback = qeth_idx_query_write_cb;</div><div class='add'>+	rc = qeth_send_control_data(card, QETH_BUFSIZE, iob, NULL, NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	channel-&gt;state = CH_STATE_UP;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qeth_cm_enable_cb(struct qeth_card *card, struct qeth_reply *reply,</div><div class='hunk'>@@ -2137,7 +2097,9 @@ static int qeth_cm_enable(struct qeth_card *card)</div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "cmenable");</div><div class='ctx'> </div><div class='ctx'> 	iob = qeth_wait_for_buffer(&amp;card-&gt;write);</div><div class='add'>+	iob-&gt;finalize = qeth_mpc_finalize_cmd;</div><div class='ctx'> 	memcpy(iob-&gt;data, CM_ENABLE, CM_ENABLE_SIZE);</div><div class='add'>+</div><div class='ctx'> 	memcpy(QETH_CM_ENABLE_ISSUER_RM_TOKEN(iob-&gt;data),</div><div class='ctx'> 	       &amp;card-&gt;token.issuer_rm_r, QETH_MPC_TOKEN_LENGTH);</div><div class='ctx'> 	memcpy(QETH_CM_ENABLE_FILTER_TOKEN(iob-&gt;data),</div><div class='hunk'>@@ -2170,7 +2132,9 @@ static int qeth_cm_setup(struct qeth_card *card)</div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "cmsetup");</div><div class='ctx'> </div><div class='ctx'> 	iob = qeth_wait_for_buffer(&amp;card-&gt;write);</div><div class='add'>+	iob-&gt;finalize = qeth_mpc_finalize_cmd;</div><div class='ctx'> 	memcpy(iob-&gt;data, CM_SETUP, CM_SETUP_SIZE);</div><div class='add'>+</div><div class='ctx'> 	memcpy(QETH_CM_SETUP_DEST_ADDR(iob-&gt;data),</div><div class='ctx'> 	       &amp;card-&gt;token.issuer_rm_r, QETH_MPC_TOKEN_LENGTH);</div><div class='ctx'> 	memcpy(QETH_CM_SETUP_CONNECTION_TOKEN(iob-&gt;data),</div><div class='hunk'>@@ -2203,7 +2167,7 @@ static int qeth_update_max_mtu(struct qeth_card *card, unsigned int max_mtu)</div><div class='ctx'> 		/* adjust RX buffer size to new max MTU: */</div><div class='ctx'> 		card-&gt;qdio.in_buf_size = max_mtu + 2 * PAGE_SIZE;</div><div class='ctx'> 		if (dev-&gt;max_mtu &amp;&amp; dev-&gt;max_mtu != max_mtu)</div><div class='del'>-			qeth_free_qdio_buffers(card);</div><div class='add'>+			qeth_free_qdio_queues(card);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dev-&gt;mtu)</div><div class='ctx'> 			new_mtu = dev-&gt;mtu;</div><div class='hunk'>@@ -2250,7 +2214,7 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply,</div><div class='ctx'> 	memcpy(&amp;card-&gt;token.ulp_filter_r,</div><div class='ctx'> 	       QETH_ULP_ENABLE_RESP_FILTER_TOKEN(iob-&gt;data),</div><div class='ctx'> 	       QETH_MPC_TOKEN_LENGTH);</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD) {</div><div class='add'>+	if (IS_IQD(card)) {</div><div class='ctx'> 		memcpy(&amp;framesize, QETH_ULP_ENABLE_RESP_MAX_MTU(iob-&gt;data), 2);</div><div class='ctx'> 		mtu = qeth_get_mtu_outof_framesize(framesize);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2287,6 +2251,7 @@ static int qeth_ulp_enable(struct qeth_card *card)</div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "ulpenabl");</div><div class='ctx'> </div><div class='ctx'> 	iob = qeth_wait_for_buffer(&amp;card-&gt;write);</div><div class='add'>+	iob-&gt;finalize = qeth_mpc_finalize_cmd;</div><div class='ctx'> 	memcpy(iob-&gt;data, ULP_ENABLE, ULP_ENABLE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	*(QETH_ULP_ENABLE_LINKNUM(iob-&gt;data)) = (u8) card-&gt;dev-&gt;dev_port;</div><div class='hunk'>@@ -2333,6 +2298,7 @@ static int qeth_ulp_setup(struct qeth_card *card)</div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "ulpsetup");</div><div class='ctx'> </div><div class='ctx'> 	iob = qeth_wait_for_buffer(&amp;card-&gt;write);</div><div class='add'>+	iob-&gt;finalize = qeth_mpc_finalize_cmd;</div><div class='ctx'> 	memcpy(iob-&gt;data, ULP_SETUP, ULP_SETUP_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(QETH_ULP_SETUP_DEST_ADDR(iob-&gt;data),</div><div class='hunk'>@@ -2374,12 +2340,12 @@ static void qeth_free_output_queue(struct qeth_qdio_out_q *q)</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	qeth_clear_outq_buffers(q, 1);</div><div class='add'>+	qeth_drain_output_queue(q, true);</div><div class='ctx'> 	qdio_free_buffers(q-&gt;qdio_bufs, QDIO_MAX_BUFFERS_PER_Q);</div><div class='ctx'> 	kfree(q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct qeth_qdio_out_q *qeth_alloc_qdio_out_buf(void)</div><div class='add'>+static struct qeth_qdio_out_q *qeth_alloc_output_queue(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_qdio_out_q *q = kzalloc(sizeof(*q), GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -2393,7 +2359,7 @@ static struct qeth_qdio_out_q *qeth_alloc_qdio_out_buf(void)</div><div class='ctx'> 	return q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qeth_alloc_qdio_buffers(struct qeth_card *card)</div><div class='add'>+static int qeth_alloc_qdio_queues(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='hunk'>@@ -2414,11 +2380,12 @@ static int qeth_alloc_qdio_buffers(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	/* outbound */</div><div class='ctx'> 	for (i = 0; i &lt; card-&gt;qdio.no_out_queues; ++i) {</div><div class='del'>-		card-&gt;qdio.out_qs[i] = qeth_alloc_qdio_out_buf();</div><div class='add'>+		card-&gt;qdio.out_qs[i] = qeth_alloc_output_queue();</div><div class='ctx'> 		if (!card-&gt;qdio.out_qs[i])</div><div class='ctx'> 			goto out_freeoutq;</div><div class='ctx'> 		QETH_DBF_TEXT_(SETUP, 2, "outq %i", i);</div><div class='ctx'> 		QETH_DBF_HEX(SETUP, 2, &amp;card-&gt;qdio.out_qs[i], sizeof(void *));</div><div class='add'>+		card-&gt;qdio.out_qs[i]-&gt;card = card;</div><div class='ctx'> 		card-&gt;qdio.out_qs[i]-&gt;queue_no = i;</div><div class='ctx'> 		/* give outbound qeth_qdio_buffers their qdio_buffers */</div><div class='ctx'> 		for (j = 0; j &lt; QDIO_MAX_BUFFERS_PER_Q; ++j) {</div><div class='hunk'>@@ -2455,7 +2422,7 @@ out_nomem:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_free_qdio_buffers(struct qeth_card *card)</div><div class='add'>+static void qeth_free_qdio_queues(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='hunk'>@@ -2520,6 +2487,7 @@ static int qeth_dm_act(struct qeth_card *card)</div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "dmact");</div><div class='ctx'> </div><div class='ctx'> 	iob = qeth_wait_for_buffer(&amp;card-&gt;write);</div><div class='add'>+	iob-&gt;finalize = qeth_mpc_finalize_cmd;</div><div class='ctx'> 	memcpy(iob-&gt;data, DM_ACT, DM_ACT_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(QETH_DM_ACT_DEST_ADDR(iob-&gt;data),</div><div class='hunk'>@@ -2561,7 +2529,7 @@ static int qeth_mpc_initialize(struct qeth_card *card)</div><div class='ctx'> 		QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);</div><div class='ctx'> 		goto out_qdio;</div><div class='ctx'> 	}</div><div class='del'>-	rc = qeth_alloc_qdio_buffers(card);</div><div class='add'>+	rc = qeth_alloc_qdio_queues(card);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);</div><div class='ctx'> 		goto out_qdio;</div><div class='hunk'>@@ -2569,7 +2537,7 @@ static int qeth_mpc_initialize(struct qeth_card *card)</div><div class='ctx'> 	rc = qeth_qdio_establish(card);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);</div><div class='del'>-		qeth_free_qdio_buffers(card);</div><div class='add'>+		qeth_free_qdio_queues(card);</div><div class='ctx'> 		goto out_qdio;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = qeth_qdio_activate(card);</div><div class='hunk'>@@ -2585,7 +2553,7 @@ static int qeth_mpc_initialize(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_qdio:</div><div class='del'>-	qeth_qdio_clear_card(card, card-&gt;info.type != QETH_CARD_TYPE_IQD);</div><div class='add'>+	qeth_qdio_clear_card(card, !IS_IQD(card));</div><div class='ctx'> 	qdio_free(CARD_DDEV(card));</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2608,8 +2576,7 @@ void qeth_print_status_message(struct qeth_card *card)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* fallthrough */</div><div class='ctx'> 	case QETH_CARD_TYPE_IQD:</div><div class='del'>-		if ((card-&gt;info.guestlan) ||</div><div class='del'>-		    (card-&gt;info.mcl_level[0] &amp; 0x80)) {</div><div class='add'>+		if (IS_VM_NIC(card) || (card-&gt;info.mcl_level[0] &amp; 0x80)) {</div><div class='ctx'> 			card-&gt;info.mcl_level[0] = (char) _ebcasc[(__u8)</div><div class='ctx'> 				card-&gt;info.mcl_level[0]];</div><div class='ctx'> 			card-&gt;info.mcl_level[1] = (char) _ebcasc[(__u8)</div><div class='hunk'>@@ -2730,7 +2697,7 @@ static int qeth_init_input_buffer(struct qeth_card *card,</div><div class='ctx'> </div><div class='ctx'> int qeth_init_qdio_queues(struct qeth_card *card)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "initqdqs");</div><div class='hunk'>@@ -2759,19 +2726,15 @@ int qeth_init_qdio_queues(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	/* outbound queue */</div><div class='ctx'> 	for (i = 0; i &lt; card-&gt;qdio.no_out_queues; ++i) {</div><div class='del'>-		qdio_reset_buffers(card-&gt;qdio.out_qs[i]-&gt;qdio_bufs,</div><div class='del'>-				   QDIO_MAX_BUFFERS_PER_Q);</div><div class='del'>-		for (j = 0; j &lt; QDIO_MAX_BUFFERS_PER_Q; ++j) {</div><div class='del'>-			qeth_clear_output_buffer(card-&gt;qdio.out_qs[i],</div><div class='del'>-						 card-&gt;qdio.out_qs[i]-&gt;bufs[j]);</div><div class='del'>-		}</div><div class='del'>-		card-&gt;qdio.out_qs[i]-&gt;card = card;</div><div class='del'>-		card-&gt;qdio.out_qs[i]-&gt;next_buf_to_fill = 0;</div><div class='del'>-		card-&gt;qdio.out_qs[i]-&gt;do_pack = 0;</div><div class='del'>-		atomic_set(&amp;card-&gt;qdio.out_qs[i]-&gt;used_buffers, 0);</div><div class='del'>-		atomic_set(&amp;card-&gt;qdio.out_qs[i]-&gt;set_pci_flags_count, 0);</div><div class='del'>-		atomic_set(&amp;card-&gt;qdio.out_qs[i]-&gt;state,</div><div class='del'>-			   QETH_OUT_Q_UNLOCKED);</div><div class='add'>+		struct qeth_qdio_out_q *queue = card-&gt;qdio.out_qs[i];</div><div class='add'>+</div><div class='add'>+		qdio_reset_buffers(queue-&gt;qdio_bufs, QDIO_MAX_BUFFERS_PER_Q);</div><div class='add'>+		queue-&gt;max_elements = QETH_MAX_BUFFER_ELEMENTS(card);</div><div class='add'>+		queue-&gt;next_buf_to_fill = 0;</div><div class='add'>+		queue-&gt;do_pack = 0;</div><div class='add'>+		atomic_set(&amp;queue-&gt;used_buffers, 0);</div><div class='add'>+		atomic_set(&amp;queue-&gt;set_pci_flags_count, 0);</div><div class='add'>+		atomic_set(&amp;queue-&gt;state, QETH_OUT_Q_UNLOCKED);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2802,12 +2765,26 @@ static void qeth_fill_ipacmd_header(struct qeth_card *card,</div><div class='ctx'> 	cmd-&gt;hdr.prot_version = prot;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qeth_ipa_finalize_cmd(struct qeth_card *card,</div><div class='add'>+				  struct qeth_cmd_buffer *iob,</div><div class='add'>+				  unsigned int length)</div><div class='add'>+{</div><div class='add'>+	qeth_mpc_finalize_cmd(card, iob, length);</div><div class='add'>+</div><div class='add'>+	/* override with IPA-specific values: */</div><div class='add'>+	__ipa_cmd(iob)-&gt;hdr.seqno = card-&gt;seqno.ipa;</div><div class='add'>+	iob-&gt;reply-&gt;seqno = card-&gt;seqno.ipa++;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,</div><div class='ctx'> 			  u16 cmd_length)</div><div class='ctx'> {</div><div class='ctx'> 	u16 total_length = IPA_PDU_HEADER_SIZE + cmd_length;</div><div class='ctx'> 	u8 prot_type = qeth_mpc_select_prot_type(card);</div><div class='ctx'> </div><div class='add'>+	iob-&gt;finalize = qeth_ipa_finalize_cmd;</div><div class='add'>+	iob-&gt;timeout = QETH_IPA_TIMEOUT;</div><div class='add'>+</div><div class='ctx'> 	memcpy(iob-&gt;data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE);</div><div class='ctx'> 	memcpy(QETH_IPA_PDU_LEN_TOTAL(iob-&gt;data), &amp;total_length, 2);</div><div class='ctx'> 	memcpy(QETH_IPA_CMD_PROT_TYPE(iob-&gt;data), &amp;prot_type, 1);</div><div class='hunk'>@@ -2863,6 +2840,11 @@ int qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 4, "sendipa");</div><div class='ctx'> </div><div class='add'>+	if (card-&gt;read_or_write_problem) {</div><div class='add'>+		qeth_release_buffer(iob-&gt;channel, iob);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (reply_cb == NULL)</div><div class='ctx'> 		reply_cb = qeth_send_ipa_cmd_cb;</div><div class='ctx'> 	memcpy(&amp;length, QETH_IPA_PDU_LEN_TOTAL(iob-&gt;data), 2);</div><div class='hunk'>@@ -3248,7 +3230,7 @@ static void qeth_handle_send_error(struct qeth_card *card,</div><div class='ctx'> 	int sbalf15 = buffer-&gt;buffer-&gt;element[15].sflags;</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 6, "hdsnderr");</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD) {</div><div class='add'>+	if (IS_IQD(card)) {</div><div class='ctx'> 		if (sbalf15 == 0) {</div><div class='ctx'> 			qdio_err = 0;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -3345,7 +3327,7 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,</div><div class='ctx'> 		if (queue-&gt;bufstates)</div><div class='ctx'> 			queue-&gt;bufstates[bidx].user = buf;</div><div class='ctx'> </div><div class='del'>-		if (queue-&gt;card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='add'>+		if (IS_IQD(queue-&gt;card))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!queue-&gt;do_pack) {</div><div class='hunk'>@@ -3375,11 +3357,9 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	QETH_TXQ_STAT_ADD(queue, bufs, count);</div><div class='del'>-	netif_trans_update(queue-&gt;card-&gt;dev);</div><div class='ctx'> 	qdio_flags = QDIO_FLAG_SYNC_OUTPUT;</div><div class='ctx'> 	if (atomic_read(&amp;queue-&gt;set_pci_flags_count))</div><div class='ctx'> 		qdio_flags |= QDIO_FLAG_PCI_OUT;</div><div class='del'>-	atomic_add(count, &amp;queue-&gt;used_buffers);</div><div class='ctx'> 	rc = do_QDIO(CARD_DDEV(queue-&gt;card), qdio_flags,</div><div class='ctx'> 		     queue-&gt;queue_no, index, count);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -3419,7 +3399,6 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue)</div><div class='ctx'> 			 * do_send_packet. So, we check if there is a</div><div class='ctx'> 			 * packing buffer to be flushed here.</div><div class='ctx'> 			 */</div><div class='del'>-			netif_stop_queue(queue-&gt;card-&gt;dev);</div><div class='ctx'> 			index = queue-&gt;next_buf_to_fill;</div><div class='ctx'> 			q_was_packing = queue-&gt;do_pack;</div><div class='ctx'> 			/* queue-&gt;do_pack may change */</div><div class='hunk'>@@ -3464,7 +3443,7 @@ int qeth_configure_cq(struct qeth_card *card, enum qeth_cq cq)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		qeth_free_qdio_buffers(card);</div><div class='add'>+		qeth_free_qdio_queues(card);</div><div class='ctx'> 		card-&gt;options.cq = cq;</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3490,7 +3469,7 @@ static void qeth_qdio_cq_handler(struct qeth_card *card, unsigned int qdio_err,</div><div class='ctx'> 	QETH_CARD_TEXT_(card, 5, "qcqherr%d", qdio_err);</div><div class='ctx'> </div><div class='ctx'> 	if (qdio_err) {</div><div class='del'>-		netif_stop_queue(card-&gt;dev);</div><div class='add'>+		netif_tx_stop_all_queues(card-&gt;dev);</div><div class='ctx'> 		qeth_schedule_recovery(card);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3546,12 +3525,14 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev,</div><div class='ctx'> 	struct qeth_card *card        = (struct qeth_card *) card_ptr;</div><div class='ctx'> 	struct qeth_qdio_out_q *queue = card-&gt;qdio.out_qs[__queue];</div><div class='ctx'> 	struct qeth_qdio_out_buffer *buffer;</div><div class='add'>+	struct net_device *dev = card-&gt;dev;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 6, "qdouhdl");</div><div class='ctx'> 	if (qdio_error &amp; QDIO_ERROR_FATAL) {</div><div class='ctx'> 		QETH_CARD_TEXT(card, 2, "achkcond");</div><div class='del'>-		netif_stop_queue(card-&gt;dev);</div><div class='add'>+		netif_tx_stop_all_queues(dev);</div><div class='ctx'> 		qeth_schedule_recovery(card);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3577,7 +3558,7 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev,</div><div class='ctx'> </div><div class='ctx'> 			/* prepare the queue slot for re-use: */</div><div class='ctx'> 			qeth_scrub_qdio_buffer(buffer-&gt;buffer,</div><div class='del'>-					       QETH_MAX_BUFFER_ELEMENTS(card));</div><div class='add'>+					       queue-&gt;max_elements);</div><div class='ctx'> 			if (qeth_init_qdio_out_buf(queue, bidx)) {</div><div class='ctx'> 				QETH_CARD_TEXT(card, 2, "outofbuf");</div><div class='ctx'> 				qeth_schedule_recovery(card);</div><div class='hunk'>@@ -3597,33 +3578,32 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_sub(count, &amp;queue-&gt;used_buffers);</div><div class='ctx'> 	/* check if we need to do something on this outbound queue */</div><div class='del'>-	if (card-&gt;info.type != QETH_CARD_TYPE_IQD)</div><div class='add'>+	if (!IS_IQD(card))</div><div class='ctx'> 		qeth_check_outbound_queue(queue);</div><div class='ctx'> </div><div class='del'>-	netif_wake_queue(queue-&gt;card-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We cannot use outbound queue 3 for unicast packets on HiperSockets */</div><div class='del'>-static inline int qeth_cut_iqd_prio(struct qeth_card *card, int queue_num)</div><div class='del'>-{</div><div class='del'>-	if ((card-&gt;info.type == QETH_CARD_TYPE_IQD) &amp;&amp; (queue_num == 3))</div><div class='del'>-		return 2;</div><div class='del'>-	return queue_num;</div><div class='add'>+	if (IS_IQD(card))</div><div class='add'>+		__queue = qeth_iqd_translate_txq(dev, __queue);</div><div class='add'>+	txq = netdev_get_tx_queue(dev, __queue);</div><div class='add'>+	/* xmit may have observed the full-condition, but not yet stopped the</div><div class='add'>+	 * txq. In which case the code below won't trigger. So before returning,</div><div class='add'>+	 * xmit will re-check the txq's fill level and wake it up if needed.</div><div class='add'>+	 */</div><div class='add'>+	if (netif_tx_queue_stopped(txq) &amp;&amp; !qeth_out_queue_is_full(queue))</div><div class='add'>+		netif_tx_wake_queue(txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Note: Function assumes that we have 4 outbound queues.</div><div class='ctx'>  */</div><div class='del'>-int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb,</div><div class='del'>-			    int ipv)</div><div class='add'>+int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	__be16 *tci;</div><div class='add'>+	struct vlan_ethhdr *veth = vlan_eth_hdr(skb);</div><div class='ctx'> 	u8 tos;</div><div class='ctx'> </div><div class='ctx'> 	switch (card-&gt;qdio.do_prio_queueing) {</div><div class='ctx'> 	case QETH_PRIO_Q_ING_TOS:</div><div class='ctx'> 	case QETH_PRIO_Q_ING_PREC:</div><div class='del'>-		switch (ipv) {</div><div class='add'>+		switch (qeth_get_ip_version(skb)) {</div><div class='ctx'> 		case 4:</div><div class='ctx'> 			tos = ipv4_get_dsfield(ip_hdr(skb));</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3634,9 +3614,9 @@ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 			return card-&gt;qdio.default_out_queue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (card-&gt;qdio.do_prio_queueing == QETH_PRIO_Q_ING_PREC)</div><div class='del'>-			return qeth_cut_iqd_prio(card, ~tos &gt;&gt; 6 &amp; 3);</div><div class='add'>+			return ~tos &gt;&gt; 6 &amp; 3;</div><div class='ctx'> 		if (tos &amp; IPTOS_MINCOST)</div><div class='del'>-			return qeth_cut_iqd_prio(card, 3);</div><div class='add'>+			return 3;</div><div class='ctx'> 		if (tos &amp; IPTOS_RELIABILITY)</div><div class='ctx'> 			return 2;</div><div class='ctx'> 		if (tos &amp; IPTOS_THROUGHPUT)</div><div class='hunk'>@@ -3647,12 +3627,11 @@ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 	case QETH_PRIO_Q_ING_SKB:</div><div class='ctx'> 		if (skb-&gt;priority &gt; 5)</div><div class='ctx'> 			return 0;</div><div class='del'>-		return qeth_cut_iqd_prio(card, ~skb-&gt;priority &gt;&gt; 1 &amp; 3);</div><div class='add'>+		return ~skb-&gt;priority &gt;&gt; 1 &amp; 3;</div><div class='ctx'> 	case QETH_PRIO_Q_ING_VLAN:</div><div class='del'>-		tci = &amp;((struct ethhdr *)skb-&gt;data)-&gt;h_proto;</div><div class='del'>-		if (be16_to_cpu(*tci) == ETH_P_8021Q)</div><div class='del'>-			return qeth_cut_iqd_prio(card,</div><div class='del'>-			~be16_to_cpu(*(tci + 1)) &gt;&gt; (VLAN_PRIO_SHIFT + 1) &amp; 3);</div><div class='add'>+		if (veth-&gt;h_vlan_proto == htons(ETH_P_8021Q))</div><div class='add'>+			return ~ntohs(veth-&gt;h_vlan_TCI) &gt;&gt;</div><div class='add'>+			       (VLAN_PRIO_SHIFT + 1) &amp; 3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3726,8 +3705,8 @@ static int qeth_add_hw_header(struct qeth_qdio_out_q *queue,</div><div class='ctx'> 			      unsigned int hdr_len, unsigned int proto_len,</div><div class='ctx'> 			      unsigned int *elements)</div><div class='ctx'> {</div><div class='del'>-	const unsigned int max_elements = QETH_MAX_BUFFER_ELEMENTS(queue-&gt;card);</div><div class='ctx'> 	const unsigned int contiguous = proto_len ? proto_len : 1;</div><div class='add'>+	const unsigned int max_elements = queue-&gt;max_elements;</div><div class='ctx'> 	unsigned int __elements;</div><div class='ctx'> 	addr_t start, end;</div><div class='ctx'> 	bool push_ok;</div><div class='hunk'>@@ -3864,11 +3843,13 @@ static void __qeth_fill_buffer(struct sk_buff *skb,</div><div class='ctx'>  *		from qeth_core_header_cache.</div><div class='ctx'>  * @offset:	when mapping the skb, start at skb-&gt;data + offset</div><div class='ctx'>  * @hd_len:	if &gt; 0, build a dedicated header element of this size</div><div class='add'>+ * flush:	Prepare the buffer to be flushed, regardless of its fill level.</div><div class='ctx'>  */</div><div class='ctx'> static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,</div><div class='ctx'> 			    struct qeth_qdio_out_buffer *buf,</div><div class='ctx'> 			    struct sk_buff *skb, struct qeth_hdr *hdr,</div><div class='del'>-			    unsigned int offset, unsigned int hd_len)</div><div class='add'>+			    unsigned int offset, unsigned int hd_len,</div><div class='add'>+			    bool flush)</div><div class='ctx'> {</div><div class='ctx'> 	struct qdio_buffer *buffer = buf-&gt;buffer;</div><div class='ctx'> 	bool is_first_elem = true;</div><div class='hunk'>@@ -3897,8 +3878,8 @@ static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,</div><div class='ctx'> </div><div class='ctx'> 		QETH_TXQ_STAT_INC(queue, skbs_pack);</div><div class='ctx'> 		/* If the buffer still has free elements, keep using it. */</div><div class='del'>-		if (buf-&gt;next_element_to_fill &lt;</div><div class='del'>-		    QETH_MAX_BUFFER_ELEMENTS(queue-&gt;card))</div><div class='add'>+		if (!flush &amp;&amp;</div><div class='add'>+		    buf-&gt;next_element_to_fill &lt; queue-&gt;max_elements)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3915,15 +3896,31 @@ static int qeth_do_send_packet_fast(struct qeth_qdio_out_q *queue,</div><div class='ctx'> {</div><div class='ctx'> 	int index = queue-&gt;next_buf_to_fill;</div><div class='ctx'> 	struct qeth_qdio_out_buffer *buffer = queue-&gt;bufs[index];</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	bool stopped = false;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * check if buffer is empty to make sure that we do not 'overtake'</div><div class='del'>-	 * ourselves and try to fill a buffer that is already primed</div><div class='add'>+	/* Just a sanity check, the wake/stop logic should ensure that we always</div><div class='add'>+	 * get a free buffer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (atomic_read(&amp;buffer-&gt;state) != QETH_QDIO_BUF_EMPTY)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	qeth_fill_buffer(queue, buffer, skb, hdr, offset, hd_len);</div><div class='add'>+</div><div class='add'>+	txq = netdev_get_tx_queue(queue-&gt;card-&gt;dev, skb_get_queue_mapping(skb));</div><div class='add'>+</div><div class='add'>+	if (atomic_inc_return(&amp;queue-&gt;used_buffers) &gt;= QDIO_MAX_BUFFERS_PER_Q) {</div><div class='add'>+		/* If a TX completion happens right _here_ and misses to wake</div><div class='add'>+		 * the txq, then our re-check below will catch the race.</div><div class='add'>+		 */</div><div class='add'>+		QETH_TXQ_STAT_INC(queue, stopped);</div><div class='add'>+		netif_tx_stop_queue(txq);</div><div class='add'>+		stopped = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qeth_fill_buffer(queue, buffer, skb, hdr, offset, hd_len, stopped);</div><div class='ctx'> 	qeth_flush_buffers(queue, index, 1);</div><div class='add'>+</div><div class='add'>+	if (stopped &amp;&amp; !qeth_out_queue_is_full(queue))</div><div class='add'>+		netif_tx_start_queue(txq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3933,6 +3930,8 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,</div><div class='ctx'> 			int elements_needed)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_qdio_out_buffer *buffer;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	bool stopped = false;</div><div class='ctx'> 	int start_index;</div><div class='ctx'> 	int flush_count = 0;</div><div class='ctx'> 	int do_pack = 0;</div><div class='hunk'>@@ -3944,21 +3943,24 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,</div><div class='ctx'> 			      QETH_OUT_Q_LOCKED) != QETH_OUT_Q_UNLOCKED);</div><div class='ctx'> 	start_index = queue-&gt;next_buf_to_fill;</div><div class='ctx'> 	buffer = queue-&gt;bufs[queue-&gt;next_buf_to_fill];</div><div class='del'>-	/*</div><div class='del'>-	 * check if buffer is empty to make sure that we do not 'overtake'</div><div class='del'>-	 * ourselves and try to fill a buffer that is already primed</div><div class='add'>+</div><div class='add'>+	/* Just a sanity check, the wake/stop logic should ensure that we always</div><div class='add'>+	 * get a free buffer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (atomic_read(&amp;buffer-&gt;state) != QETH_QDIO_BUF_EMPTY) {</div><div class='ctx'> 		atomic_set(&amp;queue-&gt;state, QETH_OUT_Q_UNLOCKED);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	txq = netdev_get_tx_queue(card-&gt;dev, skb_get_queue_mapping(skb));</div><div class='add'>+</div><div class='ctx'> 	/* check if we need to switch packing state of this queue */</div><div class='ctx'> 	qeth_switch_to_packing_if_needed(queue);</div><div class='ctx'> 	if (queue-&gt;do_pack) {</div><div class='ctx'> 		do_pack = 1;</div><div class='ctx'> 		/* does packet fit in current buffer? */</div><div class='del'>-		if ((QETH_MAX_BUFFER_ELEMENTS(card) -</div><div class='del'>-		    buffer-&gt;next_element_to_fill) &lt; elements_needed) {</div><div class='add'>+		if (buffer-&gt;next_element_to_fill + elements_needed &gt;</div><div class='add'>+		    queue-&gt;max_elements) {</div><div class='ctx'> 			/* ... no -&gt; set state PRIMED */</div><div class='ctx'> 			atomic_set(&amp;buffer-&gt;state, QETH_QDIO_BUF_PRIMED);</div><div class='ctx'> 			flush_count++;</div><div class='hunk'>@@ -3966,8 +3968,8 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,</div><div class='ctx'> 				(queue-&gt;next_buf_to_fill + 1) %</div><div class='ctx'> 				QDIO_MAX_BUFFERS_PER_Q;</div><div class='ctx'> 			buffer = queue-&gt;bufs[queue-&gt;next_buf_to_fill];</div><div class='del'>-			/* we did a step forward, so check buffer state</div><div class='del'>-			 * again */</div><div class='add'>+</div><div class='add'>+			/* We stepped forward, so sanity-check again: */</div><div class='ctx'> 			if (atomic_read(&amp;buffer-&gt;state) !=</div><div class='ctx'> 			    QETH_QDIO_BUF_EMPTY) {</div><div class='ctx'> 				qeth_flush_buffers(queue, start_index,</div><div class='hunk'>@@ -3980,8 +3982,18 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	flush_count += qeth_fill_buffer(queue, buffer, skb, hdr, offset,</div><div class='del'>-					hd_len);</div><div class='add'>+	if (buffer-&gt;next_element_to_fill == 0 &amp;&amp;</div><div class='add'>+	    atomic_inc_return(&amp;queue-&gt;used_buffers) &gt;= QDIO_MAX_BUFFERS_PER_Q) {</div><div class='add'>+		/* If a TX completion happens right _here_ and misses to wake</div><div class='add'>+		 * the txq, then our re-check below will catch the race.</div><div class='add'>+		 */</div><div class='add'>+		QETH_TXQ_STAT_INC(queue, stopped);</div><div class='add'>+		netif_tx_stop_queue(txq);</div><div class='add'>+		stopped = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flush_count += qeth_fill_buffer(queue, buffer, skb, hdr, offset, hd_len,</div><div class='add'>+					stopped);</div><div class='ctx'> 	if (flush_count)</div><div class='ctx'> 		qeth_flush_buffers(queue, start_index, flush_count);</div><div class='ctx'> 	else if (!atomic_read(&amp;queue-&gt;set_pci_flags_count))</div><div class='hunk'>@@ -4012,6 +4024,8 @@ out:</div><div class='ctx'> 	if (do_pack)</div><div class='ctx'> 		QETH_TXQ_STAT_ADD(queue, bufs_pack, flush_count);</div><div class='ctx'> </div><div class='add'>+	if (stopped &amp;&amp; !qeth_out_queue_is_full(queue))</div><div class='add'>+		netif_tx_start_queue(txq);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qeth_do_send_packet);</div><div class='hunk'>@@ -4098,9 +4112,6 @@ int qeth_xmit(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!push_len)</div><div class='ctx'> 			kmem_cache_free(qeth_core_header_cache, hdr);</div><div class='del'>-		if (rc == -EBUSY)</div><div class='del'>-			/* roll back to ETH header */</div><div class='del'>-			skb_pull(skb, push_len);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -4318,9 +4329,8 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback)</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 4, "setactlo");</div><div class='ctx'> </div><div class='del'>-	if ((card-&gt;info.type == QETH_CARD_TYPE_OSD ||</div><div class='del'>-	     card-&gt;info.type == QETH_CARD_TYPE_OSX) &amp;&amp;</div><div class='del'>-	     qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {</div><div class='add'>+	if ((IS_OSD(card) || IS_OSX(card)) &amp;&amp;</div><div class='add'>+	    qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {</div><div class='ctx'> 		rc = qeth_setadpparms_set_access_ctrl(card,</div><div class='ctx'> 			card-&gt;options.isolation, fallback);</div><div class='ctx'> 		if (rc) {</div><div class='hunk'>@@ -4345,7 +4355,6 @@ void qeth_tx_timeout(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	card = dev-&gt;ml_priv;</div><div class='ctx'> 	QETH_CARD_TEXT(card, 4, "txtimeo");</div><div class='del'>-	QETH_CARD_STAT_INC(card, tx_errors);</div><div class='ctx'> 	qeth_schedule_recovery(card);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qeth_tx_timeout);</div><div class='hunk'>@@ -4486,7 +4495,7 @@ static int qeth_snmp_command(struct qeth_card *card, char __user *udata)</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 3, "snmpcmd");</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.guestlan)</div><div class='add'>+	if (IS_VM_NIC(card))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if ((!qeth_adp_supported(card, IPA_SETADP_SET_SNMP_CONTROL)) &amp;&amp;</div><div class='hunk'>@@ -4729,14 +4738,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qeth_vm_request_mac);</div><div class='ctx'> </div><div class='del'>-static int qeth_get_qdio_q_format(struct qeth_card *card)</div><div class='del'>-{</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='del'>-		return QDIO_IQDIO_QFMT;</div><div class='del'>-	else</div><div class='del'>-		return QDIO_QETH_QFMT;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void qeth_determine_capabilities(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -4875,7 +4876,8 @@ static int qeth_qdio_establish(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;init_data, 0, sizeof(struct qdio_initialize));</div><div class='ctx'> 	init_data.cdev                   = CARD_DDEV(card);</div><div class='del'>-	init_data.q_format               = qeth_get_qdio_q_format(card);</div><div class='add'>+	init_data.q_format		 = IS_IQD(card) ? QDIO_IQDIO_QFMT :</div><div class='add'>+							  QDIO_QETH_QFMT;</div><div class='ctx'> 	init_data.qib_param_field_format = 0;</div><div class='ctx'> 	init_data.qib_param_field        = qib_param_field;</div><div class='ctx'> 	init_data.no_input_qs            = card-&gt;qdio.no_in_queues;</div><div class='hunk'>@@ -4887,8 +4889,7 @@ static int qeth_qdio_establish(struct qeth_card *card)</div><div class='ctx'> 	init_data.input_sbal_addr_array  = in_sbal_ptrs;</div><div class='ctx'> 	init_data.output_sbal_addr_array = out_sbal_ptrs;</div><div class='ctx'> 	init_data.output_sbal_state_array = card-&gt;qdio.out_bufstates;</div><div class='del'>-	init_data.scan_threshold =</div><div class='del'>-		(card-&gt;info.type == QETH_CARD_TYPE_IQD) ? 1 : 32;</div><div class='add'>+	init_data.scan_threshold	 = IS_IQD(card) ? 1 : 32;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_cmpxchg(&amp;card-&gt;qdio.state, QETH_QDIO_ALLOCATED,</div><div class='ctx'> 		QETH_QDIO_ESTABLISHED) == QETH_QDIO_ALLOCATED) {</div><div class='hunk'>@@ -4934,7 +4935,7 @@ static void qeth_core_free_card(struct qeth_card *card)</div><div class='ctx'> 	qeth_clean_channel(&amp;card-&gt;write);</div><div class='ctx'> 	qeth_clean_channel(&amp;card-&gt;data);</div><div class='ctx'> 	destroy_workqueue(card-&gt;event_wq);</div><div class='del'>-	qeth_free_qdio_buffers(card);</div><div class='add'>+	qeth_free_qdio_queues(card);</div><div class='ctx'> 	unregister_service_level(&amp;card-&gt;qeth_service_level);</div><div class='ctx'> 	dev_set_drvdata(&amp;card-&gt;gdev-&gt;dev, NULL);</div><div class='ctx'> 	kfree(card);</div><div class='hunk'>@@ -4983,12 +4984,14 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)</div><div class='ctx'> </div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "hrdsetup");</div><div class='ctx'> 	atomic_set(&amp;card-&gt;force_alloc_skb, 0);</div><div class='del'>-	qeth_update_from_chp_desc(card);</div><div class='add'>+	rc = qeth_update_from_chp_desc(card);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> retry:</div><div class='ctx'> 	if (retries &lt; 3)</div><div class='ctx'> 		QETH_DBF_MESSAGE(2, "Retrying to do IDX activates on device %x.\n",</div><div class='ctx'> 				 CARD_DEVID(card));</div><div class='del'>-	rc = qeth_qdio_clear_card(card, card-&gt;info.type != QETH_CARD_TYPE_IQD);</div><div class='add'>+	rc = qeth_qdio_clear_card(card, !IS_IQD(card));</div><div class='ctx'> 	ccw_device_set_offline(CARD_DDEV(card));</div><div class='ctx'> 	ccw_device_set_offline(CARD_WDEV(card));</div><div class='ctx'> 	ccw_device_set_offline(CARD_RDEV(card));</div><div class='hunk'>@@ -5016,8 +5019,9 @@ retriable:</div><div class='ctx'> 	qeth_determine_capabilities(card);</div><div class='ctx'> 	qeth_init_tokens(card);</div><div class='ctx'> 	qeth_init_func_level(card);</div><div class='del'>-	rc = qeth_idx_activate_channel(card, &amp;card-&gt;read, qeth_idx_read_cb);</div><div class='del'>-	if (rc == -ERESTARTSYS) {</div><div class='add'>+</div><div class='add'>+	rc = qeth_idx_activate_read_channel(card);</div><div class='add'>+	if (rc == -EINTR) {</div><div class='ctx'> 		QETH_DBF_TEXT(SETUP, 2, "break2");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	} else if (rc) {</div><div class='hunk'>@@ -5027,8 +5031,9 @@ retriable:</div><div class='ctx'> 		else</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 	}</div><div class='del'>-	rc = qeth_idx_activate_channel(card, &amp;card-&gt;write, qeth_idx_write_cb);</div><div class='del'>-	if (rc == -ERESTARTSYS) {</div><div class='add'>+</div><div class='add'>+	rc = qeth_idx_activate_write_channel(card);</div><div class='add'>+	if (rc == -EINTR) {</div><div class='ctx'> 		QETH_DBF_TEXT(SETUP, 2, "break3");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	} else if (rc) {</div><div class='hunk'>@@ -5168,7 +5173,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (((skb_len &gt;= card-&gt;options.rx_sg_cb) &amp;&amp;</div><div class='del'>-	     (!(card-&gt;info.type == QETH_CARD_TYPE_OSN)) &amp;&amp;</div><div class='add'>+	     !IS_OSN(card) &amp;&amp;</div><div class='ctx'> 	     (!atomic_read(&amp;card-&gt;force_alloc_skb))) ||</div><div class='ctx'> 	    (card-&gt;options.cq == QETH_CQ_ENABLED))</div><div class='ctx'> 		use_rx_sg = 1;</div><div class='hunk'>@@ -5559,13 +5564,17 @@ static struct net_device *qeth_alloc_netdev(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	switch (card-&gt;info.type) {</div><div class='ctx'> 	case QETH_CARD_TYPE_IQD:</div><div class='del'>-		dev = alloc_netdev(0, "hsi%d", NET_NAME_UNKNOWN, ether_setup);</div><div class='add'>+		dev = alloc_netdev_mqs(0, "hsi%d", NET_NAME_UNKNOWN,</div><div class='add'>+				       ether_setup, QETH_MAX_QUEUES, 1);</div><div class='add'>+		break;</div><div class='add'>+	case QETH_CARD_TYPE_OSM:</div><div class='add'>+		dev = alloc_etherdev(0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QETH_CARD_TYPE_OSN:</div><div class='ctx'> 		dev = alloc_netdev(0, "osn%d", NET_NAME_UNKNOWN, ether_setup);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev = alloc_etherdev(0);</div><div class='add'>+		dev = alloc_etherdev_mqs(0, QETH_MAX_QUEUES, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -5587,8 +5596,10 @@ static struct net_device *qeth_alloc_netdev(struct qeth_card *card)</div><div class='ctx'> 		dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='ctx'> 		dev-&gt;hw_features |= NETIF_F_SG;</div><div class='ctx'> 		dev-&gt;vlan_features |= NETIF_F_SG;</div><div class='del'>-		if (IS_IQD(card))</div><div class='add'>+		if (IS_IQD(card)) {</div><div class='add'>+			netif_set_real_num_tx_queues(dev, QETH_IQD_MIN_TXQ);</div><div class='ctx'> 			dev-&gt;features |= NETIF_F_SG;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='hunk'>@@ -5638,14 +5649,16 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qeth_setup_card(card);</div><div class='del'>-	qeth_update_from_chp_desc(card);</div><div class='del'>-</div><div class='ctx'> 	card-&gt;dev = qeth_alloc_netdev(card);</div><div class='ctx'> 	if (!card-&gt;dev) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_card;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	card-&gt;qdio.no_out_queues = card-&gt;dev-&gt;num_tx_queues;</div><div class='add'>+	rc = qeth_update_from_chp_desc(card);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_chp_desc;</div><div class='ctx'> 	qeth_determine_capabilities(card);</div><div class='ctx'> 	enforced_disc = qeth_enforce_discipline(card);</div><div class='ctx'> 	switch (enforced_disc) {</div><div class='hunk'>@@ -5658,9 +5671,8 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_load;</div><div class='ctx'> </div><div class='del'>-		gdev-&gt;dev.type = (card-&gt;info.type != QETH_CARD_TYPE_OSN)</div><div class='del'>-					? card-&gt;discipline-&gt;devtype</div><div class='del'>-					: &amp;qeth_osn_devtype;</div><div class='add'>+		gdev-&gt;dev.type = IS_OSN(card) ? &amp;qeth_osn_devtype :</div><div class='add'>+						card-&gt;discipline-&gt;devtype;</div><div class='ctx'> 		rc = card-&gt;discipline-&gt;setup(card-&gt;gdev);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_disc;</div><div class='hunk'>@@ -5672,6 +5684,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> err_disc:</div><div class='ctx'> 	qeth_core_free_discipline(card);</div><div class='ctx'> err_load:</div><div class='add'>+err_chp_desc:</div><div class='ctx'> 	free_netdev(card-&gt;dev);</div><div class='ctx'> err_card:</div><div class='ctx'> 	qeth_core_free_card(card);</div><div class='hunk'>@@ -5703,10 +5716,8 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev)</div><div class='ctx'> 	enum qeth_discipline_id def_discipline;</div><div class='ctx'> </div><div class='ctx'> 	if (!card-&gt;discipline) {</div><div class='del'>-		if (card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='del'>-			def_discipline = QETH_DISCIPLINE_LAYER3;</div><div class='del'>-		else</div><div class='del'>-			def_discipline = QETH_DISCIPLINE_LAYER2;</div><div class='add'>+		def_discipline = IS_IQD(card) ? QETH_DISCIPLINE_LAYER3 :</div><div class='add'>+						QETH_DISCIPLINE_LAYER2;</div><div class='ctx'> 		rc = qeth_core_load_discipline(card, def_discipline);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -5734,7 +5745,7 @@ static void qeth_core_shutdown(struct ccwgroup_device *gdev)</div><div class='ctx'> 	if ((gdev-&gt;state == CCWGROUP_ONLINE) &amp;&amp; card-&gt;info.hwtrap)</div><div class='ctx'> 		qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);</div><div class='ctx'> 	qeth_qdio_clear_card(card, 0);</div><div class='del'>-	qeth_clear_qdio_buffers(card);</div><div class='add'>+	qeth_drain_output_queues(card);</div><div class='ctx'> 	qdio_free(CARD_DDEV(card));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5834,13 +5845,10 @@ int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		rc = qeth_snmp_command(card, rq-&gt;ifr_ifru.ifru_data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIOC_QETH_GET_CARD_TYPE:</div><div class='del'>-		if ((card-&gt;info.type == QETH_CARD_TYPE_OSD ||</div><div class='del'>-		     card-&gt;info.type == QETH_CARD_TYPE_OSM ||</div><div class='del'>-		     card-&gt;info.type == QETH_CARD_TYPE_OSX) &amp;&amp;</div><div class='del'>-		    !card-&gt;info.guestlan)</div><div class='add'>+		if ((IS_OSD(card) || IS_OSM(card) || IS_OSX(card)) &amp;&amp;</div><div class='add'>+		    !IS_VM_NIC(card))</div><div class='ctx'> 			return 1;</div><div class='del'>-		else</div><div class='del'>-			return 0;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		mii_data = if_mii(rq);</div><div class='ctx'> 		mii_data-&gt;phy_id = 0;</div><div class='hunk'>@@ -6190,7 +6198,6 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)</div><div class='ctx'> 	stats-&gt;rx_errors = card-&gt;stats.rx_errors;</div><div class='ctx'> 	stats-&gt;rx_dropped = card-&gt;stats.rx_dropped;</div><div class='ctx'> 	stats-&gt;multicast = card-&gt;stats.rx_multicast;</div><div class='del'>-	stats-&gt;tx_errors = card-&gt;stats.tx_errors;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; card-&gt;qdio.no_out_queues; i++) {</div><div class='ctx'> 		queue = card-&gt;qdio.out_qs[i];</div><div class='hunk'>@@ -6203,6 +6210,15 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qeth_get_stats64);</div><div class='ctx'> </div><div class='add'>+u16 qeth_iqd_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+			  u8 cast_type, struct net_device *sb_dev)</div><div class='add'>+{</div><div class='add'>+	if (cast_type != RTN_UNICAST)</div><div class='add'>+		return QETH_IQD_MCAST_TXQ;</div><div class='add'>+	return QETH_IQD_MIN_UCAST_TXQ;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(qeth_iqd_select_queue);</div><div class='add'>+</div><div class='ctx'> int qeth_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='hunk'>@@ -6213,7 +6229,7 @@ int qeth_open(struct net_device *dev)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;data.state = CH_STATE_UP;</div><div class='del'>-	netif_start_queue(dev);</div><div class='add'>+	netif_tx_start_all_queues(dev);</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;card-&gt;napi);</div><div class='ctx'> 	local_bh_disable();</div><div class='head'>diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h<br/>index f8c5d4a9be13..f5237b7c14c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core_mpc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core_mpc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core_mpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_core_mpc.h</a></div><div class='hunk'>@@ -82,7 +82,7 @@ enum qeth_card_types {</div><div class='ctx'> #define IS_OSM(card)	((card)-&gt;info.type == QETH_CARD_TYPE_OSM)</div><div class='ctx'> #define IS_OSN(card)	((card)-&gt;info.type == QETH_CARD_TYPE_OSN)</div><div class='ctx'> #define IS_OSX(card)	((card)-&gt;info.type == QETH_CARD_TYPE_OSX)</div><div class='del'>-#define IS_VM_NIC(card)	((card)-&gt;info.guestlan)</div><div class='add'>+#define IS_VM_NIC(card)	((card)-&gt;info.is_vm_nic)</div><div class='ctx'> </div><div class='ctx'> #define QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE 0x18</div><div class='ctx'> /* only the first two bytes are looked at in qeth_get_cardname_short */</div><div class='head'>diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c<br/>index 56deeb6f7bc0..9f392497d570 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core_sys.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_core_sys.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_core_sys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_core_sys.c</a></div><div class='hunk'>@@ -198,6 +198,9 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev,</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (IS_IQD(card))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;card-&gt;conf_mutex);</div><div class='ctx'> 	if (card-&gt;state != CARD_STATE_DOWN) {</div><div class='ctx'> 		rc = -EPERM;</div><div class='hunk'>@@ -239,10 +242,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev,</div><div class='ctx'> 		card-&gt;qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;</div><div class='ctx'> 		card-&gt;qdio.default_out_queue = 2;</div><div class='ctx'> 	} else if (sysfs_streq(buf, "no_prio_queueing:3")) {</div><div class='del'>-		if (card-&gt;info.type == QETH_CARD_TYPE_IQD) {</div><div class='del'>-			rc = -EPERM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='ctx'> 		card-&gt;qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;</div><div class='ctx'> 		card-&gt;qdio.default_out_queue = 3;</div><div class='ctx'> 	} else if (sysfs_streq(buf, "no_prio_queueing")) {</div><div class='hunk'>@@ -480,8 +479,7 @@ static ssize_t qeth_dev_isolation_store(struct device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;card-&gt;conf_mutex);</div><div class='del'>-	if (card-&gt;info.type != QETH_CARD_TYPE_OSD &amp;&amp;</div><div class='del'>-	    card-&gt;info.type != QETH_CARD_TYPE_OSX) {</div><div class='add'>+	if (!IS_OSD(card) &amp;&amp; !IS_OSX(card)) {</div><div class='ctx'> 		rc = -EOPNOTSUPP;</div><div class='ctx'> 		dev_err(&amp;card-&gt;gdev-&gt;dev, "Adapter does not "</div><div class='ctx'> 			"support QDIO data connection isolation\n");</div><div class='head'>diff --git a/drivers/s390/net/qeth_ethtool.c b/drivers/s390/net/qeth_ethtool.c<br/>index 93a53fed4cf8..4166eb29f0bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_ethtool.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@ static const struct qeth_stats txq_stats[] = {</div><div class='ctx'> 	QETH_TXQ_STAT("linearized+error skbs", skbs_linearized_fail),</div><div class='ctx'> 	QETH_TXQ_STAT("TSO bytes", tso_bytes),</div><div class='ctx'> 	QETH_TXQ_STAT("Packing mode switches", packing_mode_switch),</div><div class='add'>+	QETH_TXQ_STAT("Queue stopped", stopped),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct qeth_stats card_stats[] = {</div><div class='hunk'>@@ -154,6 +155,21 @@ static void qeth_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 		 CARD_RDEV_ID(card), CARD_WDEV_ID(card), CARD_DDEV_ID(card));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qeth_get_channels(struct net_device *dev,</div><div class='add'>+			      struct ethtool_channels *channels)</div><div class='add'>+{</div><div class='add'>+	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+</div><div class='add'>+	channels-&gt;max_rx = dev-&gt;num_rx_queues;</div><div class='add'>+	channels-&gt;max_tx = card-&gt;qdio.no_out_queues;</div><div class='add'>+	channels-&gt;max_other = 0;</div><div class='add'>+	channels-&gt;max_combined = 0;</div><div class='add'>+	channels-&gt;rx_count = dev-&gt;real_num_rx_queues;</div><div class='add'>+	channels-&gt;tx_count = dev-&gt;real_num_tx_queues;</div><div class='add'>+	channels-&gt;other_count = 0;</div><div class='add'>+	channels-&gt;combined_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Helper function to fill 'advertising' and 'supported' which are the same. */</div><div class='ctx'> /* Autoneg and full-duplex are supported and advertised unconditionally.     */</div><div class='ctx'> /* Always advertise and support all speeds up to specified, and only one     */</div><div class='hunk'>@@ -359,6 +375,7 @@ const struct ethtool_ops qeth_ethtool_ops = {</div><div class='ctx'> 	.get_ethtool_stats = qeth_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count = qeth_get_sset_count,</div><div class='ctx'> 	.get_drvinfo = qeth_get_drvinfo,</div><div class='add'>+	.get_channels = qeth_get_channels,</div><div class='ctx'> 	.get_link_ksettings = qeth_get_link_ksettings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c<br/>index 8efb2e8ff8f4..218801232ca2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_l2_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_l2_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_l2_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_l2_main.c</a></div><div class='hunk'>@@ -149,29 +149,16 @@ static int qeth_l2_remove_mac(struct qeth_card *card, u8 *mac)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l2_del_all_macs(struct qeth_card *card)</div><div class='add'>+static void qeth_l2_drain_rx_mode_cache(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_mac *mac;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;mclock);</div><div class='ctx'> 	hash_for_each_safe(card-&gt;mac_htable, i, tmp, mac, hnode) {</div><div class='ctx'> 		hash_del(&amp;mac-&gt;hnode);</div><div class='ctx'> 		kfree(mac);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;mclock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qeth_l2_get_cast_type(struct qeth_card *card, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_OSN)</div><div class='del'>-		return RTN_UNICAST;</div><div class='del'>-	if (is_broadcast_ether_addr(skb-&gt;data))</div><div class='del'>-		return RTN_BROADCAST;</div><div class='del'>-	if (is_multicast_ether_addr(skb-&gt;data))</div><div class='del'>-		return RTN_MULTICAST;</div><div class='del'>-	return RTN_UNICAST;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qeth_l2_fill_header(struct qeth_qdio_out_q *queue,</div><div class='hunk'>@@ -292,14 +279,16 @@ static void qeth_l2_stop_card(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	qeth_set_allowed_threads(card, 0, 1);</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;card-&gt;rx_mode_work);</div><div class='add'>+	qeth_l2_drain_rx_mode_cache(card);</div><div class='add'>+</div><div class='ctx'> 	if (card-&gt;state == CARD_STATE_SOFTSETUP) {</div><div class='del'>-		qeth_l2_del_all_macs(card);</div><div class='ctx'> 		qeth_clear_ipacmd_list(card);</div><div class='ctx'> 		card-&gt;state = CARD_STATE_HARDSETUP;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (card-&gt;state == CARD_STATE_HARDSETUP) {</div><div class='ctx'> 		qeth_qdio_clear_card(card, 0);</div><div class='del'>-		qeth_clear_qdio_buffers(card);</div><div class='add'>+		qeth_drain_output_queues(card);</div><div class='ctx'> 		qeth_clear_working_pool_list(card);</div><div class='ctx'> 		card-&gt;state = CARD_STATE_DOWN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -334,13 +323,11 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card,</div><div class='ctx'> 		case QETH_HEADER_TYPE_LAYER2:</div><div class='ctx'> 			skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='ctx'> 			qeth_rx_csum(card, skb, hdr-&gt;hdr.l2.flags[1]);</div><div class='del'>-			if (skb-&gt;protocol == htons(ETH_P_802_2))</div><div class='del'>-				*((__u32 *)skb-&gt;cb) = ++card-&gt;seqno.pkt_seqno;</div><div class='ctx'> 			len = skb-&gt;len;</div><div class='ctx'> 			napi_gro_receive(&amp;card-&gt;napi, skb);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QETH_HEADER_TYPE_OSN:</div><div class='del'>-			if (card-&gt;info.type == QETH_CARD_TYPE_OSN) {</div><div class='add'>+			if (IS_OSN(card)) {</div><div class='ctx'> 				skb_push(skb, sizeof(struct qeth_hdr));</div><div class='ctx'> 				skb_copy_to_linear_data(skb, hdr,</div><div class='ctx'> 						sizeof(struct qeth_hdr));</div><div class='hunk'>@@ -391,8 +378,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* some devices don't support a custom MAC address: */</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_OSM ||</div><div class='del'>-	    card-&gt;info.type == QETH_CARD_TYPE_OSX)</div><div class='add'>+	if (IS_OSM(card) || IS_OSX(card))</div><div class='ctx'> 		return (rc) ? rc : -EADDRNOTAVAIL;</div><div class='ctx'> 	eth_hw_addr_random(card-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -515,9 +501,11 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha)</div><div class='ctx'> 	hash_add(card-&gt;mac_htable, &amp;mac-&gt;hnode, mac_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l2_set_rx_mode(struct net_device *dev)</div><div class='add'>+static void qeth_l2_rx_mode_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+	struct qeth_card *card = container_of(work, struct qeth_card,</div><div class='add'>+					      rx_mode_work);</div><div class='add'>+	struct net_device *dev = card-&gt;dev;</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	struct qeth_mac *mac;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='hunk'>@@ -526,12 +514,12 @@ static void qeth_l2_set_rx_mode(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 3, "setmulti");</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;mclock);</div><div class='del'>-</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='ctx'> 	netdev_for_each_mc_addr(ha, dev)</div><div class='ctx'> 		qeth_l2_add_mac(card, ha);</div><div class='ctx'> 	netdev_for_each_uc_addr(ha, dev)</div><div class='ctx'> 		qeth_l2_add_mac(card, ha);</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 	hash_for_each_safe(card-&gt;mac_htable, i, tmp, mac, hnode) {</div><div class='ctx'> 		switch (mac-&gt;disp_flag) {</div><div class='hunk'>@@ -554,8 +542,6 @@ static void qeth_l2_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;mclock);</div><div class='del'>-</div><div class='ctx'> 	if (qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))</div><div class='ctx'> 		qeth_setadp_promisc_mode(card);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -586,7 +572,7 @@ static int qeth_l2_xmit_osn(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	elements += qeth_count_elements(skb, hd_len);</div><div class='del'>-	if (elements &gt; QETH_MAX_BUFFER_ELEMENTS(card)) {</div><div class='add'>+	if (elements &gt; queue-&gt;max_elements) {</div><div class='ctx'> 		rc = -E2BIG;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -603,38 +589,45 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					   struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='del'>-	int cast_type = qeth_l2_get_cast_type(card, skb);</div><div class='del'>-	int ipv = qeth_get_ip_version(skb);</div><div class='add'>+	u16 txq = skb_get_queue_mapping(skb);</div><div class='ctx'> 	struct qeth_qdio_out_q *queue;</div><div class='ctx'> 	int tx_bytes = skb-&gt;len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	queue = qeth_get_tx_queue(card, skb, ipv, cast_type);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='add'>+	if (IS_IQD(card))</div><div class='add'>+		txq = qeth_iqd_translate_txq(dev, txq);</div><div class='add'>+	queue = card-&gt;qdio.out_qs[txq];</div><div class='ctx'> </div><div class='ctx'> 	if (IS_OSN(card))</div><div class='ctx'> 		rc = qeth_l2_xmit_osn(card, skb, queue);</div><div class='ctx'> 	else</div><div class='del'>-		rc = qeth_xmit(card, skb, queue, ipv, cast_type,</div><div class='add'>+		rc = qeth_xmit(card, skb, queue, qeth_get_ip_version(skb),</div><div class='add'>+			       qeth_get_ether_cast_type(skb),</div><div class='ctx'> 			       qeth_l2_fill_header);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		QETH_TXQ_STAT_INC(queue, tx_packets);</div><div class='ctx'> 		QETH_TXQ_STAT_ADD(queue, tx_bytes, tx_bytes);</div><div class='del'>-		netif_wake_queue(dev);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='del'>-	} else if (rc == -EBUSY) {</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	} /* else fall through */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	QETH_TXQ_STAT_INC(queue, tx_dropped);</div><div class='del'>-	QETH_TXQ_STAT_INC(queue, tx_errors);</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='del'>-	netif_wake_queue(dev);</div><div class='add'>+	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u16 qeth_l2_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 qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+</div><div class='add'>+	if (IS_IQD(card))</div><div class='add'>+		return qeth_iqd_select_queue(dev, skb,</div><div class='add'>+					     qeth_get_ether_cast_type(skb),</div><div class='add'>+					     sb_dev);</div><div class='add'>+	return qeth_get_priority_queue(card, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct device_type qeth_l2_devtype = {</div><div class='ctx'> 	.name = "qeth_layer2",</div><div class='ctx'> 	.groups = qeth_l2_attr_groups,</div><div class='hunk'>@@ -645,6 +638,8 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 	struct qeth_card *card = dev_get_drvdata(&amp;gdev-&gt;dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	qeth_l2_vnicc_set_defaults(card);</div><div class='add'>+</div><div class='ctx'> 	if (gdev-&gt;dev.type == &amp;qeth_generic_devtype) {</div><div class='ctx'> 		rc = qeth_l2_create_device_attributes(&amp;gdev-&gt;dev);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -652,8 +647,7 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hash_init(card-&gt;mac_htable);</div><div class='del'>-	card-&gt;info.hwtrap = 0;</div><div class='del'>-	qeth_l2_vnicc_set_defaults(card);</div><div class='add'>+	INIT_WORK(&amp;card-&gt;rx_mode_work, qeth_l2_rx_mode_work);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -674,12 +668,20 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 		unregister_netdev(card-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qeth_l2_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;card-&gt;rx_mode_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops qeth_l2_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= qeth_open,</div><div class='ctx'> 	.ndo_stop		= qeth_stop,</div><div class='ctx'> 	.ndo_get_stats64	= qeth_get_stats64,</div><div class='ctx'> 	.ndo_start_xmit		= qeth_l2_hard_start_xmit,</div><div class='ctx'> 	.ndo_features_check	= qeth_features_check,</div><div class='add'>+	.ndo_select_queue	= qeth_l2_select_queue,</div><div class='ctx'> 	.ndo_validate_addr	= qeth_l2_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= qeth_l2_set_rx_mode,</div><div class='ctx'> 	.ndo_do_ioctl		= qeth_do_ioctl,</div><div class='hunk'>@@ -722,7 +724,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok)</div><div class='ctx'> 		card-&gt;dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_OSD &amp;&amp; !card-&gt;info.guestlan) {</div><div class='add'>+	if (IS_OSD(card) &amp;&amp; !IS_VM_NIC(card)) {</div><div class='ctx'> 		card-&gt;dev-&gt;features |= NETIF_F_SG;</div><div class='ctx'> 		/* OSA 3S and earlier has no RX/TX support */</div><div class='ctx'> 		if (qeth_is_supported(card, IPA_OUTBOUND_CHECKSUM)) {</div><div class='hunk'>@@ -832,8 +834,7 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)</div><div class='ctx'> 	/* softsetup */</div><div class='ctx'> 	QETH_DBF_TEXT(SETUP, 2, "softsetp");</div><div class='ctx'> </div><div class='del'>-	if ((card-&gt;info.type == QETH_CARD_TYPE_OSD) ||</div><div class='del'>-	    (card-&gt;info.type == QETH_CARD_TYPE_OSX)) {</div><div class='add'>+	if (IS_OSD(card) || IS_OSX(card)) {</div><div class='ctx'> 		rc = qeth_l2_start_ipassists(card);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out_remove;</div><div class='hunk'>@@ -1043,13 +1044,13 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len,</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 5, "osndctrd");</div><div class='ctx'> </div><div class='del'>-	wait_event(card-&gt;wait_q,</div><div class='del'>-		   atomic_cmpxchg(&amp;channel-&gt;irq_pending, 0, 1) == 0);</div><div class='del'>-	qeth_prepare_control_data(card, len, iob);</div><div class='add'>+	wait_event(card-&gt;wait_q, qeth_trylock_channel(channel));</div><div class='add'>+	iob-&gt;finalize(card, iob, len);</div><div class='add'>+	QETH_DBF_HEX(CTRL, 2, iob-&gt;data, min(len, QETH_DBF_CTRL_LEN));</div><div class='ctx'> 	QETH_CARD_TEXT(card, 6, "osnoirqp");</div><div class='ctx'> 	spin_lock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='ctx'> 	rc = ccw_device_start_timeout(channel-&gt;ccwdev, channel-&gt;ccw,</div><div class='del'>-				      (addr_t) iob, 0, 0, QETH_IPA_TIMEOUT);</div><div class='add'>+				      (addr_t) iob, 0, 0, iob-&gt;timeout);</div><div class='ctx'> 	spin_unlock_irq(get_ccwdev_lock(channel-&gt;ccwdev));</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: "</div><div class='hunk'>@@ -1457,9 +1458,8 @@ static struct qeth_cmd_buffer *qeth_sbp_build_cmd(struct qeth_card *card,</div><div class='ctx'> 						  enum qeth_ipa_sbp_cmd sbp_cmd,</div><div class='ctx'> 						  unsigned int cmd_length)</div><div class='ctx'> {</div><div class='del'>-	enum qeth_ipa_cmds ipa_cmd = (card-&gt;info.type == QETH_CARD_TYPE_IQD) ?</div><div class='del'>-					IPA_CMD_SETBRIDGEPORT_IQD :</div><div class='del'>-					IPA_CMD_SETBRIDGEPORT_OSA;</div><div class='add'>+	enum qeth_ipa_cmds ipa_cmd = IS_IQD(card) ? IPA_CMD_SETBRIDGEPORT_IQD :</div><div class='add'>+						    IPA_CMD_SETBRIDGEPORT_OSA;</div><div class='ctx'> 	struct qeth_cmd_buffer *iob;</div><div class='ctx'> 	struct qeth_ipa_cmd *cmd;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c<br/>index 7e68d9d16859..0271833da6a2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_l3_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_l3_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_l3_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_l3_main.c</a></div><div class='hunk'>@@ -246,9 +246,9 @@ static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *tmp_addr)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (addr-&gt;proto == QETH_PROT_IPV4) {</div><div class='ctx'> 			addr-&gt;in_progress = 1;</div><div class='del'>-			spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+			mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 			rc = qeth_l3_register_addr_entry(card, addr);</div><div class='del'>-			spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+			mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 			addr-&gt;in_progress = 0;</div><div class='ctx'> 		} else</div><div class='ctx'> 			rc = qeth_l3_register_addr_entry(card, addr);</div><div class='hunk'>@@ -268,6 +268,30 @@ static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *tmp_addr)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qeth_l3_modify_ip(struct qeth_card *card, struct qeth_ipaddr *addr,</div><div class='add'>+			     bool add)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='add'>+	rc = add ? qeth_l3_add_ip(card, addr) : qeth_l3_delete_ip(card, addr);</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_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 qeth_l3_drain_rx_mode_cache(struct qeth_card *card)</div><div class='add'>+{</div><div class='add'>+	struct qeth_ipaddr *addr;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hash_for_each_safe(card-&gt;ip_mc_htable, i, tmp, addr, hnode) {</div><div class='add'>+		hash_del(&amp;addr-&gt;hnode);</div><div class='add'>+		kfree(addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_ipaddr *addr;</div><div class='hunk'>@@ -276,7 +300,7 @@ static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover)</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 4, "clearip");</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	hash_for_each_safe(card-&gt;ip_htable, i, tmp, addr, hnode) {</div><div class='ctx'> 		if (!recover) {</div><div class='hunk'>@@ -287,19 +311,9 @@ static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover)</div><div class='ctx'> 		addr-&gt;disp_flag = QETH_DISP_ADDR_ADD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;card-&gt;mclock);</div><div class='del'>-</div><div class='del'>-	hash_for_each_safe(card-&gt;ip_mc_htable, i, tmp, addr, hnode) {</div><div class='del'>-		hash_del(&amp;addr-&gt;hnode);</div><div class='del'>-		kfree(addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;mclock);</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static void qeth_l3_recover_ip(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_ipaddr *addr;</div><div class='hunk'>@@ -309,15 +323,15 @@ static void qeth_l3_recover_ip(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 4, "recovrip");</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	hash_for_each_safe(card-&gt;ip_htable, i, tmp, addr, hnode) {</div><div class='ctx'> 		if (addr-&gt;disp_flag == QETH_DISP_ADDR_ADD) {</div><div class='ctx'> 			if (addr-&gt;proto == QETH_PROT_IPV4) {</div><div class='ctx'> 				addr-&gt;in_progress = 1;</div><div class='del'>-				spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+				mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 				rc = qeth_l3_register_addr_entry(card, addr);</div><div class='del'>-				spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+				mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 				addr-&gt;in_progress = 0;</div><div class='ctx'> 			} else</div><div class='ctx'> 				rc = qeth_l3_register_addr_entry(card, addr);</div><div class='hunk'>@@ -333,8 +347,7 @@ static void qeth_l3_recover_ip(struct qeth_card *card)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qeth_l3_setdelip_cb(struct qeth_card *card, struct qeth_reply *reply,</div><div class='hunk'>@@ -461,7 +474,7 @@ static int qeth_l3_send_setrouting(struct qeth_card *card,</div><div class='ctx'> static int qeth_l3_correct_routing_type(struct qeth_card *card,</div><div class='ctx'> 		enum qeth_routing_types *type, enum qeth_prot_versions prot)</div><div class='ctx'> {</div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD) {</div><div class='add'>+	if (IS_IQD(card)) {</div><div class='ctx'> 		switch (*type) {</div><div class='ctx'> 		case NO_ROUTER:</div><div class='ctx'> 		case PRIMARY_CONNECTOR:</div><div class='hunk'>@@ -559,7 +572,7 @@ static void qeth_l3_clear_ipato_list(struct qeth_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_ipato_entry *ipatoe, *tmp;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(ipatoe, tmp, &amp;card-&gt;ipato.entries, entry) {</div><div class='ctx'> 		list_del(&amp;ipatoe-&gt;entry);</div><div class='hunk'>@@ -567,7 +580,7 @@ static void qeth_l3_clear_ipato_list(struct qeth_card *card)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qeth_l3_update_ipato(card);</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qeth_l3_add_ipato_entry(struct qeth_card *card,</div><div class='hunk'>@@ -578,7 +591,7 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 2, "addipato");</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ipatoe, &amp;card-&gt;ipato.entries, entry) {</div><div class='ctx'> 		if (ipatoe-&gt;proto != new-&gt;proto)</div><div class='hunk'>@@ -596,7 +609,7 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,</div><div class='ctx'> 		qeth_l3_update_ipato(card);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -610,7 +623,7 @@ int qeth_l3_del_ipato_entry(struct qeth_card *card,</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 2, "delipato");</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(ipatoe, tmp, &amp;card-&gt;ipato.entries, entry) {</div><div class='ctx'> 		if (ipatoe-&gt;proto != proto)</div><div class='hunk'>@@ -625,7 +638,7 @@ int qeth_l3_del_ipato_entry(struct qeth_card *card,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -634,7 +647,6 @@ int qeth_l3_modify_rxip_vipa(struct qeth_card *card, bool add, const u8 *ip,</div><div class='ctx'> 			     enum qeth_prot_versions proto)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_ipaddr addr;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	qeth_l3_init_ipaddr(&amp;addr, type, proto);</div><div class='ctx'> 	if (proto == QETH_PROT_IPV4)</div><div class='hunk'>@@ -642,16 +654,13 @@ int qeth_l3_modify_rxip_vipa(struct qeth_card *card, bool add, const u8 *ip,</div><div class='ctx'> 	else</div><div class='ctx'> 		memcpy(&amp;addr.u.a6.addr, ip, 16);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-	rc = add ? qeth_l3_add_ip(card, &amp;addr) : qeth_l3_delete_ip(card, &amp;addr);</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	return qeth_l3_modify_ip(card, &amp;addr, add);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qeth_l3_modify_hsuid(struct qeth_card *card, bool add)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_ipaddr addr;</div><div class='del'>-	int rc, i;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	qeth_l3_init_ipaddr(&amp;addr, QETH_IP_TYPE_NORMAL, QETH_PROT_IPV6);</div><div class='ctx'> 	addr.u.a6.addr.s6_addr[0] = 0xfe;</div><div class='hunk'>@@ -659,10 +668,7 @@ int qeth_l3_modify_hsuid(struct qeth_card *card, bool add)</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 		addr.u.a6.addr.s6_addr[8+i] = card-&gt;options.hsuid[i];</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-	rc = add ? qeth_l3_add_ip(card, &amp;addr) : qeth_l3_delete_ip(card, &amp;addr);</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	return qeth_l3_modify_ip(card, &amp;addr, add);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qeth_l3_register_addr_entry(struct qeth_card *card,</div><div class='hunk'>@@ -848,7 +854,7 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT(card, 3, "softipv6");</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_IQD)</div><div class='add'>+	if (IS_IQD(card))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	rc = qeth_send_simple_setassparms(card, IPA_IPV6,</div><div class='hunk'>@@ -1374,8 +1380,7 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,</div><div class='ctx'> 		switch (hdr-&gt;hdr.l3.id) {</div><div class='ctx'> 		case QETH_HEADER_TYPE_LAYER3:</div><div class='ctx'> 			magic = *(__u16 *)skb-&gt;data;</div><div class='del'>-			if ((card-&gt;info.type == QETH_CARD_TYPE_IQD) &amp;&amp;</div><div class='del'>-			    (magic == ETH_P_AF_IUCV)) {</div><div class='add'>+			if (IS_IQD(card) &amp;&amp; magic == ETH_P_AF_IUCV) {</div><div class='ctx'> 				len = skb-&gt;len;</div><div class='ctx'> 				dev_hard_header(skb, dev, ETH_P_AF_IUCV,</div><div class='ctx'> 						dev-&gt;dev_addr, "FAKELL", len);</div><div class='hunk'>@@ -1413,6 +1418,9 @@ static void qeth_l3_stop_card(struct qeth_card *card)</div><div class='ctx'> </div><div class='ctx'> 	qeth_set_allowed_threads(card, 0, 1);</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;card-&gt;rx_mode_work);</div><div class='add'>+	qeth_l3_drain_rx_mode_cache(card);</div><div class='add'>+</div><div class='ctx'> 	if (card-&gt;options.sniffer &amp;&amp;</div><div class='ctx'> 	    (card-&gt;info.promisc_mode == SET_PROMISC_MODE_ON))</div><div class='ctx'> 		qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_DISABLE);</div><div class='hunk'>@@ -1424,7 +1432,7 @@ static void qeth_l3_stop_card(struct qeth_card *card)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (card-&gt;state == CARD_STATE_HARDSETUP) {</div><div class='ctx'> 		qeth_qdio_clear_card(card, 0);</div><div class='del'>-		qeth_clear_qdio_buffers(card);</div><div class='add'>+		qeth_drain_output_queues(card);</div><div class='ctx'> 		qeth_clear_working_pool_list(card);</div><div class='ctx'> 		card-&gt;state = CARD_STATE_DOWN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1451,7 +1459,7 @@ qeth_l3_handle_promisc_mode(struct qeth_card *card)</div><div class='ctx'> 	     (card-&gt;info.promisc_mode == SET_PROMISC_MODE_OFF)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.guestlan) {		/* Guestlan trace */</div><div class='add'>+	if (IS_VM_NIC(card)) {		/* Guestlan trace */</div><div class='ctx'> 		if (qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))</div><div class='ctx'> 			qeth_setadp_promisc_mode(card);</div><div class='ctx'> 	} else if (card-&gt;options.sniffer &amp;&amp;	/* HiperSockets trace */</div><div class='hunk'>@@ -1466,9 +1474,10 @@ qeth_l3_handle_promisc_mode(struct qeth_card *card)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l3_set_rx_mode(struct net_device *dev)</div><div class='add'>+static void qeth_l3_rx_mode_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+	struct qeth_card *card = container_of(work, struct qeth_card,</div><div class='add'>+					      rx_mode_work);</div><div class='ctx'> 	struct qeth_ipaddr *addr;</div><div class='ctx'> 	struct hlist_node *tmp;</div><div class='ctx'> 	int i, rc;</div><div class='hunk'>@@ -1476,8 +1485,6 @@ static void qeth_l3_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	QETH_CARD_TEXT(card, 3, "setmulti");</div><div class='ctx'> </div><div class='ctx'> 	if (!card-&gt;options.sniffer) {</div><div class='del'>-		spin_lock_bh(&amp;card-&gt;mclock);</div><div class='del'>-</div><div class='ctx'> 		qeth_l3_add_multicast_ipv4(card);</div><div class='ctx'> 		qeth_l3_add_multicast_ipv6(card);</div><div class='ctx'> </div><div class='hunk'>@@ -1505,8 +1512,6 @@ static void qeth_l3_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;card-&gt;mclock);</div><div class='del'>-</div><div class='ctx'> 		if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1551,7 +1556,7 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries)</div><div class='ctx'> 	 * IPA_CMD_ASS_ARP_QUERY_INFO, but not IPA_CMD_ASS_ARP_SET_NO_ENTRIES;</div><div class='ctx'> 	 * thus we say EOPNOTSUPP for this ARP function</div><div class='ctx'> 	 */</div><div class='del'>-	if (card-&gt;info.guestlan)</div><div class='add'>+	if (IS_VM_NIC(card))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1783,7 +1788,7 @@ static int qeth_l3_arp_modify_entry(struct qeth_card *card,</div><div class='ctx'> 	 * IPA_CMD_ASS_ARP_QUERY_INFO, but not IPA_CMD_ASS_ARP_ADD_ENTRY;</div><div class='ctx'> 	 * thus we say EOPNOTSUPP for this ARP function</div><div class='ctx'> 	 */</div><div class='del'>-	if (card-&gt;info.guestlan)</div><div class='add'>+	if (IS_VM_NIC(card))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1816,7 +1821,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)</div><div class='ctx'> 	 * IPA_CMD_ASS_ARP_QUERY_INFO, but not IPA_CMD_ASS_ARP_FLUSH_CACHE;</div><div class='ctx'> 	 * thus we say EOPNOTSUPP for this ARP function</div><div class='ctx'> 	*/</div><div class='del'>-	if (card-&gt;info.guestlan || (card-&gt;info.type == QETH_CARD_TYPE_IQD))</div><div class='add'>+	if (IS_VM_NIC(card) || IS_IQD(card))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1913,13 +1918,7 @@ static int qeth_l3_get_cast_type(struct sk_buff *skb)</div><div class='ctx'> 				RTN_MULTICAST : RTN_UNICAST;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* ... and MAC address */</div><div class='del'>-		if (ether_addr_equal_64bits(eth_hdr(skb)-&gt;h_dest,</div><div class='del'>-					    skb-&gt;dev-&gt;broadcast))</div><div class='del'>-			return RTN_BROADCAST;</div><div class='del'>-		if (is_multicast_ether_addr(eth_hdr(skb)-&gt;h_dest))</div><div class='del'>-			return RTN_MULTICAST;</div><div class='del'>-		/* default to unicast */</div><div class='del'>-		return RTN_UNICAST;</div><div class='add'>+		return qeth_get_ether_cast_type(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1977,19 +1976,14 @@ static void qeth_l3_fill_header(struct qeth_qdio_out_q *queue,</div><div class='ctx'> 		hdr-&gt;hdr.l3.vlan_id = ntohs(veth-&gt;h_vlan_TCI);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	l3_hdr-&gt;flags = qeth_l3_cast_type_to_flag(cast_type);</div><div class='add'>+</div><div class='ctx'> 	/* OSA only: */</div><div class='ctx'> 	if (!ipv) {</div><div class='del'>-		hdr-&gt;hdr.l3.flags = QETH_HDR_PASSTHRU;</div><div class='del'>-		if (ether_addr_equal_64bits(eth_hdr(skb)-&gt;h_dest,</div><div class='del'>-					    skb-&gt;dev-&gt;broadcast))</div><div class='del'>-			hdr-&gt;hdr.l3.flags |= QETH_CAST_BROADCAST;</div><div class='del'>-		else</div><div class='del'>-			hdr-&gt;hdr.l3.flags |= (cast_type == RTN_MULTICAST) ?</div><div class='del'>-				QETH_CAST_MULTICAST : QETH_CAST_UNICAST;</div><div class='add'>+		l3_hdr-&gt;flags |= QETH_HDR_PASSTHRU;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr-&gt;hdr.l3.flags = qeth_l3_cast_type_to_flag(cast_type);</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	if (ipv == 4) {</div><div class='ctx'> 		struct rtable *rt = skb_rtable(skb);</div><div class='hunk'>@@ -2007,7 +2001,7 @@ static void qeth_l3_fill_header(struct qeth_qdio_out_q *queue,</div><div class='ctx'> 			l3_hdr-&gt;next_hop.ipv6_addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='ctx'> </div><div class='ctx'> 		hdr-&gt;hdr.l3.flags |= QETH_HDR_IPV6;</div><div class='del'>-		if (card-&gt;info.type != QETH_CARD_TYPE_IQD)</div><div class='add'>+		if (!IS_IQD(card))</div><div class='ctx'> 			hdr-&gt;hdr.l3.flags |= QETH_HDR_PASSTHRU;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -2030,7 +2024,6 @@ static void qeth_l3_fixup_headers(struct sk_buff *skb)</div><div class='ctx'> static int qeth_l3_xmit(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 			struct qeth_qdio_out_q *queue, int ipv, int cast_type)</div><div class='ctx'> {</div><div class='del'>-	unsigned char eth_hdr[ETH_HLEN];</div><div class='ctx'> 	unsigned int hw_hdr_len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -2040,45 +2033,44 @@ static int qeth_l3_xmit(struct qeth_card *card, struct sk_buff *skb,</div><div class='ctx'> 	rc = skb_cow_head(skb, hw_hdr_len - ETH_HLEN);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	skb_copy_from_linear_data(skb, eth_hdr, ETH_HLEN);</div><div class='ctx'> 	skb_pull(skb, ETH_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	qeth_l3_fixup_headers(skb);</div><div class='del'>-	rc = qeth_xmit(card, skb, queue, ipv, cast_type, qeth_l3_fill_header);</div><div class='del'>-	if (rc == -EBUSY) {</div><div class='del'>-		/* roll back to ETH header */</div><div class='del'>-		skb_push(skb, ETH_HLEN);</div><div class='del'>-		skb_copy_to_linear_data(skb, eth_hdr, ETH_HLEN);</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='add'>+	return qeth_xmit(card, skb, queue, ipv, cast_type, qeth_l3_fill_header);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					   struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int cast_type = qeth_l3_get_cast_type(skb);</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+	u16 txq = skb_get_queue_mapping(skb);</div><div class='ctx'> 	int ipv = qeth_get_ip_version(skb);</div><div class='ctx'> 	struct qeth_qdio_out_q *queue;</div><div class='ctx'> 	int tx_bytes = skb-&gt;len;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	queue = qeth_get_tx_queue(card, skb, ipv, cast_type);</div><div class='add'>+	int cast_type, rc;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_IQD(card)) {</div><div class='add'>+		queue = card-&gt;qdio.out_qs[qeth_iqd_translate_txq(dev, txq)];</div><div class='add'>+</div><div class='ctx'> 		if (card-&gt;options.sniffer)</div><div class='ctx'> 			goto tx_drop;</div><div class='ctx'> 		if ((card-&gt;options.cq != QETH_CQ_ENABLED &amp;&amp; !ipv) ||</div><div class='ctx'> 		    (card-&gt;options.cq == QETH_CQ_ENABLED &amp;&amp;</div><div class='ctx'> 		     skb-&gt;protocol != htons(ETH_P_AF_IUCV)))</div><div class='ctx'> 			goto tx_drop;</div><div class='add'>+</div><div class='add'>+		if (txq == QETH_IQD_MCAST_TXQ)</div><div class='add'>+			cast_type = qeth_l3_get_cast_type(skb);</div><div class='add'>+		else</div><div class='add'>+			cast_type = RTN_UNICAST;</div><div class='add'>+	} else {</div><div class='add'>+		queue = card-&gt;qdio.out_qs[txq];</div><div class='add'>+		cast_type = qeth_l3_get_cast_type(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cast_type == RTN_BROADCAST &amp;&amp; !card-&gt;info.broadcast_capable)</div><div class='ctx'> 		goto tx_drop;</div><div class='ctx'> </div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='ctx'> 	if (ipv == 4 || IS_IQD(card))</div><div class='ctx'> 		rc = qeth_l3_xmit(card, skb, queue, ipv, cast_type);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2088,20 +2080,22 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		QETH_TXQ_STAT_INC(queue, tx_packets);</div><div class='ctx'> 		QETH_TXQ_STAT_ADD(queue, tx_bytes, tx_bytes);</div><div class='del'>-		netif_wake_queue(dev);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='del'>-	} else if (rc == -EBUSY) {</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	} /* else fall through */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> tx_drop:</div><div class='ctx'> 	QETH_TXQ_STAT_INC(queue, tx_dropped);</div><div class='del'>-	QETH_TXQ_STAT_INC(queue, tx_errors);</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='del'>-	netif_wake_queue(dev);</div><div class='add'>+	kfree_skb(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qeth_l3_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;card-&gt;rx_mode_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * we need NOARP for IPv4 but we want neighbor solicitation for IPv6. Setting</div><div class='ctx'>  * NOARP on the netdevice is no option because it also turns off neighbor</div><div class='hunk'>@@ -2135,11 +2129,27 @@ static netdev_features_t qeth_l3_osa_features_check(struct sk_buff *skb,</div><div class='ctx'> 	return qeth_features_check(skb, dev, features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u16 qeth_l3_iqd_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'>+	return qeth_iqd_select_queue(dev, skb, qeth_l3_get_cast_type(skb),</div><div class='add'>+				     sb_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 qeth_l3_osa_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 qeth_card *card = dev-&gt;ml_priv;</div><div class='add'>+</div><div class='add'>+	return qeth_get_priority_queue(card, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops qeth_l3_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= qeth_open,</div><div class='ctx'> 	.ndo_stop		= qeth_stop,</div><div class='ctx'> 	.ndo_get_stats64	= qeth_get_stats64,</div><div class='ctx'> 	.ndo_start_xmit		= qeth_l3_hard_start_xmit,</div><div class='add'>+	.ndo_select_queue	= qeth_l3_iqd_select_queue,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= qeth_l3_set_rx_mode,</div><div class='ctx'> 	.ndo_do_ioctl		= qeth_do_ioctl,</div><div class='hunk'>@@ -2156,6 +2166,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = {</div><div class='ctx'> 	.ndo_get_stats64	= qeth_get_stats64,</div><div class='ctx'> 	.ndo_start_xmit		= qeth_l3_hard_start_xmit,</div><div class='ctx'> 	.ndo_features_check	= qeth_l3_osa_features_check,</div><div class='add'>+	.ndo_select_queue	= qeth_l3_osa_select_queue,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= qeth_l3_set_rx_mode,</div><div class='ctx'> 	.ndo_do_ioctl		= qeth_do_ioctl,</div><div class='hunk'>@@ -2172,8 +2183,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok)</div><div class='ctx'> 	unsigned int headroom;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type == QETH_CARD_TYPE_OSD ||</div><div class='del'>-	    card-&gt;info.type == QETH_CARD_TYPE_OSX) {</div><div class='add'>+	if (IS_OSD(card) || IS_OSX(card)) {</div><div class='ctx'> 		if ((card-&gt;info.link_type == QETH_LINK_TYPE_LANE_TR) ||</div><div class='ctx'> 		    (card-&gt;info.link_type == QETH_LINK_TYPE_HSTR)) {</div><div class='ctx'> 			pr_info("qeth_l3: ignoring TR device\n");</div><div class='hunk'>@@ -2187,7 +2197,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok)</div><div class='ctx'> 		if (!(card-&gt;info.unique_id &amp; UNIQUE_ID_NOT_BY_CARD))</div><div class='ctx'> 			card-&gt;dev-&gt;dev_id = card-&gt;info.unique_id &amp; 0xffff;</div><div class='ctx'> </div><div class='del'>-		if (!card-&gt;info.guestlan) {</div><div class='add'>+		if (!IS_VM_NIC(card)) {</div><div class='ctx'> 			card-&gt;dev-&gt;features |= NETIF_F_SG;</div><div class='ctx'> 			card-&gt;dev-&gt;hw_features |= NETIF_F_TSO |</div><div class='ctx'> 				NETIF_F_RXCSUM | NETIF_F_IP_CSUM;</div><div class='hunk'>@@ -2211,7 +2221,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok)</div><div class='ctx'> 			headroom = sizeof(struct qeth_hdr_tso);</div><div class='ctx'> 		else</div><div class='ctx'> 			headroom = sizeof(struct qeth_hdr) + VLAN_HLEN;</div><div class='del'>-	} else if (card-&gt;info.type == QETH_CARD_TYPE_IQD) {</div><div class='add'>+	} else if (IS_IQD(card)) {</div><div class='ctx'> 		card-&gt;dev-&gt;flags |= IFF_NOARP;</div><div class='ctx'> 		card-&gt;dev-&gt;netdev_ops = &amp;qeth_l3_netdev_ops;</div><div class='ctx'> 		headroom = sizeof(struct qeth_hdr) - ETH_HLEN;</div><div class='hunk'>@@ -2253,14 +2263,23 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)</div><div class='ctx'> 	struct qeth_card *card = dev_get_drvdata(&amp;gdev-&gt;dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	hash_init(card-&gt;ip_htable);</div><div class='add'>+	mutex_init(&amp;card-&gt;ip_lock);</div><div class='add'>+	card-&gt;cmd_wq = alloc_ordered_workqueue("%s_cmd", 0,</div><div class='add'>+					       dev_name(&amp;gdev-&gt;dev));</div><div class='add'>+	if (!card-&gt;cmd_wq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	if (gdev-&gt;dev.type == &amp;qeth_generic_devtype) {</div><div class='ctx'> 		rc = qeth_l3_create_device_attributes(&amp;gdev-&gt;dev);</div><div class='del'>-		if (rc)</div><div class='add'>+		if (rc) {</div><div class='add'>+			destroy_workqueue(card-&gt;cmd_wq);</div><div class='ctx'> 			return rc;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	hash_init(card-&gt;ip_htable);</div><div class='add'>+</div><div class='ctx'> 	hash_init(card-&gt;ip_mc_htable);</div><div class='del'>-	card-&gt;info.hwtrap = 0;</div><div class='add'>+	INIT_WORK(&amp;card-&gt;rx_mode_work, qeth_l3_rx_mode_work);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2280,6 +2299,9 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 	cancel_work_sync(&amp;card-&gt;close_dev_work);</div><div class='ctx'> 	if (qeth_netdev_is_registered(card-&gt;dev))</div><div class='ctx'> 		unregister_netdev(card-&gt;dev);</div><div class='add'>+</div><div class='add'>+	flush_workqueue(card-&gt;cmd_wq);</div><div class='add'>+	destroy_workqueue(card-&gt;cmd_wq);</div><div class='ctx'> 	qeth_l3_clear_ip_htable(card, 0);</div><div class='ctx'> 	qeth_l3_clear_ipato_list(card);</div><div class='ctx'> }</div><div class='hunk'>@@ -2517,20 +2539,40 @@ static int qeth_l3_handle_ip_event(struct qeth_card *card,</div><div class='ctx'> {</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_UP:</div><div class='del'>-		spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-		qeth_l3_add_ip(card, addr);</div><div class='del'>-		spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		qeth_l3_modify_ip(card, addr, true);</div><div class='ctx'> 		return NOTIFY_OK;</div><div class='ctx'> 	case NETDEV_DOWN:</div><div class='del'>-		spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='del'>-		qeth_l3_delete_ip(card, addr);</div><div class='del'>-		spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		qeth_l3_modify_ip(card, addr, false);</div><div class='ctx'> 		return NOTIFY_OK;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct qeth_l3_ip_event_work {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct qeth_card *card;</div><div class='add'>+	struct qeth_ipaddr addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_ip_work(w) container_of((w), struct qeth_l3_ip_event_work, work)</div><div class='add'>+</div><div class='add'>+static void qeth_l3_add_ip_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct qeth_l3_ip_event_work *ip_work = to_ip_work(work);</div><div class='add'>+</div><div class='add'>+	qeth_l3_modify_ip(ip_work-&gt;card, &amp;ip_work-&gt;addr, true);</div><div class='add'>+	kfree(work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qeth_l3_delete_ip_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct qeth_l3_ip_event_work *ip_work = to_ip_work(work);</div><div class='add'>+</div><div class='add'>+	qeth_l3_modify_ip(ip_work-&gt;card, &amp;ip_work-&gt;addr, false);</div><div class='add'>+	kfree(work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_vlan_dev(dev))</div><div class='hunk'>@@ -2575,9 +2617,12 @@ static int qeth_l3_ip6_event(struct notifier_block *this,</div><div class='ctx'> {</div><div class='ctx'> 	struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;</div><div class='ctx'> 	struct net_device *dev = ifa-&gt;idev-&gt;dev;</div><div class='del'>-	struct qeth_ipaddr addr;</div><div class='add'>+	struct qeth_l3_ip_event_work *ip_work;</div><div class='ctx'> 	struct qeth_card *card;</div><div class='ctx'> </div><div class='add'>+	if (event != NETDEV_UP &amp;&amp; event != NETDEV_DOWN)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='ctx'> 	card = qeth_l3_get_card_from_dev(dev);</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='hunk'>@@ -2585,11 +2630,23 @@ static int qeth_l3_ip6_event(struct notifier_block *this,</div><div class='ctx'> 	if (!qeth_is_supported(card, IPA_IPV6))</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='del'>-	qeth_l3_init_ipaddr(&amp;addr, QETH_IP_TYPE_NORMAL, QETH_PROT_IPV6);</div><div class='del'>-	addr.u.a6.addr = ifa-&gt;addr;</div><div class='del'>-	addr.u.a6.pfxlen = ifa-&gt;prefix_len;</div><div class='add'>+	ip_work = kmalloc(sizeof(*ip_work), GFP_ATOMIC);</div><div class='add'>+	if (!ip_work)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='del'>-	return qeth_l3_handle_ip_event(card, &amp;addr, event);</div><div class='add'>+	if (event == NETDEV_UP)</div><div class='add'>+		INIT_WORK(&amp;ip_work-&gt;work, qeth_l3_add_ip_worker);</div><div class='add'>+	else</div><div class='add'>+		INIT_WORK(&amp;ip_work-&gt;work, qeth_l3_delete_ip_worker);</div><div class='add'>+</div><div class='add'>+	ip_work-&gt;card = card;</div><div class='add'>+	qeth_l3_init_ipaddr(&amp;ip_work-&gt;addr, QETH_IP_TYPE_NORMAL,</div><div class='add'>+			    QETH_PROT_IPV6);</div><div class='add'>+	ip_work-&gt;addr.u.a6.addr = ifa-&gt;addr;</div><div class='add'>+	ip_work-&gt;addr.u.a6.pfxlen = ifa-&gt;prefix_len;</div><div class='add'>+</div><div class='add'>+	queue_work(card-&gt;cmd_wq, &amp;ip_work-&gt;work);</div><div class='add'>+	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block qeth_l3_ip6_notifier = {</div><div class='head'>diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c<br/>index cff518b0f904..2f73b33c9347 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_l3_sys.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/net/qeth_l3_sys.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/net/qeth_l3_sys.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/net/qeth_l3_sys.c</a></div><div class='hunk'>@@ -206,7 +206,7 @@ static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type != QETH_CARD_TYPE_IQD)</div><div class='add'>+	if (!IS_IQD(card))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	if (card-&gt;options.cq == QETH_CQ_ENABLED)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -258,7 +258,7 @@ static ssize_t qeth_l3_dev_hsuid_show(struct device *dev,</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type != QETH_CARD_TYPE_IQD)</div><div class='add'>+	if (!IS_IQD(card))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(tmp_hsuid, card-&gt;options.hsuid, sizeof(tmp_hsuid));</div><div class='hunk'>@@ -276,7 +276,7 @@ static ssize_t qeth_l3_dev_hsuid_store(struct device *dev,</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;info.type != QETH_CARD_TYPE_IQD)</div><div class='add'>+	if (!IS_IQD(card))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	if (card-&gt;state != CARD_STATE_DOWN)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -367,9 +367,9 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;ipato.enabled != enable) {</div><div class='ctx'> 		card-&gt;ipato.enabled = enable;</div><div class='del'>-		spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 		qeth_l3_update_ipato(card);</div><div class='del'>-		spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;card-&gt;conf_mutex);</div><div class='hunk'>@@ -412,9 +412,9 @@ static ssize_t qeth_l3_dev_ipato_invert4_store(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;ipato.invert4 != invert) {</div><div class='ctx'> 		card-&gt;ipato.invert4 = invert;</div><div class='del'>-		spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 		qeth_l3_update_ipato(card);</div><div class='del'>-		spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;card-&gt;conf_mutex);</div><div class='hunk'>@@ -436,7 +436,7 @@ static ssize_t qeth_l3_dev_ipato_add_show(char *buf, struct qeth_card *card,</div><div class='ctx'> 	entry_len = (proto == QETH_PROT_IPV4)? 12 : 40;</div><div class='ctx'> 	/* add strlen for "/&lt;mask&gt;\n" */</div><div class='ctx'> 	entry_len += (proto == QETH_PROT_IPV4)? 5 : 6;</div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	list_for_each_entry(ipatoe, &amp;card-&gt;ipato.entries, entry) {</div><div class='ctx'> 		if (ipatoe-&gt;proto != proto)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -449,7 +449,7 @@ static ssize_t qeth_l3_dev_ipato_add_show(char *buf, struct qeth_card *card,</div><div class='ctx'> 		i += snprintf(buf + i, PAGE_SIZE - i,</div><div class='ctx'> 			      "%s/%i\n", addr_str, ipatoe-&gt;mask_bits);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	i += snprintf(buf + i, PAGE_SIZE - i, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return i;</div><div class='hunk'>@@ -598,9 +598,9 @@ static ssize_t qeth_l3_dev_ipato_invert6_store(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;ipato.invert6 != invert) {</div><div class='ctx'> 		card-&gt;ipato.invert6 = invert;</div><div class='del'>-		spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 		qeth_l3_update_ipato(card);</div><div class='del'>-		spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+		mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;card-&gt;conf_mutex);</div><div class='hunk'>@@ -684,7 +684,7 @@ static ssize_t qeth_l3_dev_ip_add_show(struct device *dev, char *buf,</div><div class='ctx'> </div><div class='ctx'> 	entry_len = (proto == QETH_PROT_IPV4)? 12 : 40;</div><div class='ctx'> 	entry_len += 2; /* \n + terminator */</div><div class='del'>-	spin_lock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_lock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	hash_for_each(card-&gt;ip_htable, i, ipaddr, hnode) {</div><div class='ctx'> 		if (ipaddr-&gt;proto != proto || ipaddr-&gt;type != type)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -698,7 +698,7 @@ static ssize_t qeth_l3_dev_ip_add_show(struct device *dev, char *buf,</div><div class='ctx'> 		str_len += snprintf(buf + str_len, PAGE_SIZE - str_len, "%s\n",</div><div class='ctx'> 				    addr_str);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;card-&gt;ip_lock);</div><div class='add'>+	mutex_unlock(&amp;card-&gt;ip_lock);</div><div class='ctx'> 	str_len += snprintf(buf + str_len, PAGE_SIZE - str_len, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return str_len;</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c<br/>index 744a64680d5b..e8fc28dba8df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_erp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_erp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_erp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/scsi/zfcp_erp.c</a></div><div class='hunk'>@@ -624,6 +624,20 @@ static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	add_timer(&amp;erp_action-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void zfcp_erp_port_forced_reopen_all(struct zfcp_adapter *adapter,</div><div class='add'>+				     int clear, char *dbftag)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct zfcp_port *port;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;adapter-&gt;erp_lock, flags);</div><div class='add'>+	read_lock(&amp;adapter-&gt;port_list_lock);</div><div class='add'>+	list_for_each_entry(port, &amp;adapter-&gt;port_list, list)</div><div class='add'>+		_zfcp_erp_port_forced_reopen(port, clear, dbftag);</div><div class='add'>+	read_unlock(&amp;adapter-&gt;port_list_lock);</div><div class='add'>+	write_unlock_irqrestore(&amp;adapter-&gt;erp_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _zfcp_erp_port_reopen_all(struct zfcp_adapter *adapter,</div><div class='ctx'> 				      int clear, char *dbftag)</div><div class='ctx'> {</div><div class='hunk'>@@ -1341,6 +1355,9 @@ static void zfcp_erp_try_rport_unblock(struct zfcp_port *port)</div><div class='ctx'> 		struct zfcp_scsi_dev *zsdev = sdev_to_zfcp(sdev);</div><div class='ctx'> 		int lun_status;</div><div class='ctx'> </div><div class='add'>+		if (sdev-&gt;sdev_state == SDEV_DEL ||</div><div class='add'>+		    sdev-&gt;sdev_state == SDEV_CANCEL)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (zsdev-&gt;port != port)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/* LUN under port of interest */</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h<br/>index 3fce47b0b21b..c6acca521ffe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_ext.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_ext.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_ext.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/scsi/zfcp_ext.h</a></div><div class='hunk'>@@ -70,6 +70,8 @@ extern void zfcp_erp_port_reopen(struct zfcp_port *port, int clear,</div><div class='ctx'> 				 char *dbftag);</div><div class='ctx'> extern void zfcp_erp_port_shutdown(struct zfcp_port *, int, char *);</div><div class='ctx'> extern void zfcp_erp_port_forced_reopen(struct zfcp_port *, int, char *);</div><div class='add'>+extern void zfcp_erp_port_forced_reopen_all(struct zfcp_adapter *adapter,</div><div class='add'>+					    int clear, char *dbftag);</div><div class='ctx'> extern void zfcp_erp_set_lun_status(struct scsi_device *, u32);</div><div class='ctx'> extern void zfcp_erp_clear_lun_status(struct scsi_device *, u32);</div><div class='ctx'> extern void zfcp_erp_lun_reopen(struct scsi_device *, int, char *);</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c<br/>index db00b5e3abbe..33eddb02ee30 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_fc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_fc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/scsi/zfcp_fc.c</a></div><div class='hunk'>@@ -239,10 +239,6 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,</div><div class='ctx'> 	list_for_each_entry(port, &amp;adapter-&gt;port_list, list) {</div><div class='ctx'> 		if ((port-&gt;d_id &amp; range) == (ntoh24(page-&gt;rscn_fid) &amp; range))</div><div class='ctx'> 			zfcp_fc_test_link(port);</div><div class='del'>-		if (!port-&gt;d_id)</div><div class='del'>-			zfcp_erp_port_reopen(port,</div><div class='del'>-					     ZFCP_STATUS_COMMON_ERP_FAILED,</div><div class='del'>-					     "fcrscn1");</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock_irqrestore(&amp;adapter-&gt;port_list_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -250,6 +246,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,</div><div class='ctx'> static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsf_status_read_buffer *status_buffer = (void *)fsf_req-&gt;data;</div><div class='add'>+	struct zfcp_adapter *adapter = fsf_req-&gt;adapter;</div><div class='ctx'> 	struct fc_els_rscn *head;</div><div class='ctx'> 	struct fc_els_rscn_page *page;</div><div class='ctx'> 	u16 i;</div><div class='hunk'>@@ -263,6 +260,22 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	no_entries = be16_to_cpu(head-&gt;rscn_plen) /</div><div class='ctx'> 		sizeof(struct fc_els_rscn_page);</div><div class='ctx'> </div><div class='add'>+	if (no_entries &gt; 1) {</div><div class='add'>+		/* handle failed ports */</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		struct zfcp_port *port;</div><div class='add'>+</div><div class='add'>+		read_lock_irqsave(&amp;adapter-&gt;port_list_lock, flags);</div><div class='add'>+		list_for_each_entry(port, &amp;adapter-&gt;port_list, list) {</div><div class='add'>+			if (port-&gt;d_id)</div><div class='add'>+				continue;</div><div class='add'>+			zfcp_erp_port_reopen(port,</div><div class='add'>+					     ZFCP_STATUS_COMMON_ERP_FAILED,</div><div class='add'>+					     "fcrscn1");</div><div class='add'>+		}</div><div class='add'>+		read_unlock_irqrestore(&amp;adapter-&gt;port_list_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 1; i &lt; no_entries; i++) {</div><div class='ctx'> 		/* skip head and start with 1st element */</div><div class='ctx'> 		page++;</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c<br/>index f4f6a07c5222..221d0dfb8493 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_scsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/scsi/zfcp_scsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/scsi/zfcp_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/scsi/zfcp_scsi.c</a></div><div class='hunk'>@@ -368,6 +368,10 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)</div><div class='ctx'> 	struct zfcp_adapter *adapter = zfcp_sdev-&gt;port-&gt;adapter;</div><div class='ctx'> 	int ret = SUCCESS, fc_ret;</div><div class='ctx'> </div><div class='add'>+	if (!(adapter-&gt;connection_features &amp; FSF_FEATURE_NPIV_MODE)) {</div><div class='add'>+		zfcp_erp_port_forced_reopen_all(adapter, 0, "schrh_p");</div><div class='add'>+		zfcp_erp_wait(adapter);</div><div class='add'>+	}</div><div class='ctx'> 	zfcp_erp_adapter_reopen(adapter, 0, "schrh_1");</div><div class='ctx'> 	zfcp_erp_wait(adapter);</div><div class='ctx'> 	fc_ret = fc_block_scsi_eh(scpnt);</div><div class='head'>diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c<br/>index 74c328321889..991420caa4f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/virtio/virtio_ccw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/s390/virtio/virtio_ccw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/s390/virtio/virtio_ccw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/s390/virtio/virtio_ccw.c</a></div><div class='hunk'>@@ -182,7 +182,7 @@ static void drop_airq_indicator(struct virtqueue *vq, struct airq_info *info)</div><div class='ctx'> 	write_unlock_irqrestore(&amp;info-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void virtio_airq_handler(struct airq_struct *airq)</div><div class='add'>+static void virtio_airq_handler(struct airq_struct *airq, bool floating)</div><div class='ctx'> {</div><div class='ctx'> 	struct airq_info *info = container_of(airq, struct airq_info, airq);</div><div class='ctx'> 	unsigned long ai;</div><div class='head'>diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c<br/>index 01c23d27f290..fe0535affc14 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/NCR5380.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/NCR5380.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/NCR5380.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/NCR5380.c</a></div><div class='hunk'>@@ -272,9 +272,8 @@ mrs[] = {</div><div class='ctx'> static void NCR5380_print(struct Scsi_Host *instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct NCR5380_hostdata *hostdata = shost_priv(instance);</div><div class='del'>-	unsigned char status, data, basr, mr, icr, i;</div><div class='add'>+	unsigned char status, basr, mr, icr, i;</div><div class='ctx'> </div><div class='del'>-	data = NCR5380_read(CURRENT_SCSI_DATA_REG);</div><div class='ctx'> 	status = NCR5380_read(STATUS_REG);</div><div class='ctx'> 	mr = NCR5380_read(MODE_REG);</div><div class='ctx'> 	icr = NCR5380_read(INITIATOR_COMMAND_REG);</div><div class='hunk'>@@ -1933,13 +1932,13 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)</div><div class='ctx'> 					if (!hostdata-&gt;connected)</div><div class='ctx'> 						return;</div><div class='ctx'> </div><div class='del'>-					/* Fall through to reject message */</div><div class='del'>-</div><div class='add'>+					/* Reject message */</div><div class='add'>+					/* Fall through */</div><div class='add'>+				default:</div><div class='ctx'> 					/*</div><div class='ctx'> 					 * If we get something weird that we aren't expecting,</div><div class='del'>-					 * reject it.</div><div class='add'>+					 * log it.</div><div class='ctx'> 					 */</div><div class='del'>-				default:</div><div class='ctx'> 					if (tmp == EXTENDED_MESSAGE)</div><div class='ctx'> 						scmd_printk(KERN_INFO, cmd,</div><div class='ctx'> 						            "rejecting unknown extended message code %02x, length %d\n",</div><div class='head'>diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h<br/>index 1df5171594b8..11fb68d7e60d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aacraid/aacraid.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aacraid/aacraid.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aacraid/aacraid.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aacraid/aacraid.h</a></div><div class='hunk'>@@ -2640,9 +2640,14 @@ static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor)</div><div class='ctx'> 	return capacity;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int aac_pci_offline(struct aac_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return pci_channel_offline(dev-&gt;pdev) || dev-&gt;handle_pci_error;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int aac_adapter_check_health(struct aac_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(pci_channel_offline(dev-&gt;pdev)))</div><div class='add'>+	if (unlikely(aac_pci_offline(dev)))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	return (dev)-&gt;a_ops.adapter_check_health(dev);</div><div class='head'>diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c<br/>index e67e032936ef..78430a7b294c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aacraid/commsup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aacraid/commsup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aacraid/commsup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aacraid/commsup.c</a></div><div class='hunk'>@@ -672,7 +672,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,</div><div class='ctx'> 					return -ETIMEDOUT;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				if (unlikely(pci_channel_offline(dev-&gt;pdev)))</div><div class='add'>+				if (unlikely(aac_pci_offline(dev)))</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 				if ((blink = aac_adapter_check_health(dev)) &gt; 0) {</div><div class='hunk'>@@ -772,7 +772,7 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(&amp;fibptr-&gt;event_lock, flags);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(pci_channel_offline(dev-&gt;pdev)))</div><div class='add'>+		if (unlikely(aac_pci_offline(dev)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		fibptr-&gt;flags |= FIB_CONTEXT_FLAG_WAIT;</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx<br/>index 55ac55ee6068..40fe08a64535 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/Kconfig.aic7xxx?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/Kconfig.aic7xxx</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/Kconfig.aic7xxx?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aic7xxx/Kconfig.aic7xxx</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> # $Id: //depot/linux-aic79xx-2.5.0/drivers/scsi/aic7xxx/Kconfig.aic7xxx#7 $</div><div class='ctx'> #</div><div class='ctx'> config SCSI_AIC7XXX</div><div class='del'>-	tristate "Adaptec AIC7xxx Fast -&gt; U160 support (New Driver)"</div><div class='add'>+	tristate "Adaptec AIC7xxx Fast -&gt; U160 support"</div><div class='ctx'> 	depends on (PCI || EISA) &amp;&amp; SCSI</div><div class='ctx'> 	select SCSI_SPI_ATTRS</div><div class='ctx'> 	---help---</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7770_osm.c b/drivers/scsi/aic7xxx/aic7770_osm.c<br/>index 3d401d02c019..bdd177e3d762 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7770_osm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7770_osm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7770_osm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aic7xxx/aic7770_osm.c</a></div><div class='hunk'>@@ -91,6 +91,7 @@ aic7770_probe(struct device *dev)</div><div class='ctx'> 	ahc = ahc_alloc(&amp;aic7xxx_driver_template, name);</div><div class='ctx'> 	if (ahc == NULL)</div><div class='ctx'> 		return (ENOMEM);</div><div class='add'>+	ahc-&gt;dev = dev;</div><div class='ctx'> 	error = aic7770_config(ahc, aic7770_ident_table + edev-&gt;id.driver_data,</div><div class='ctx'> 			       eisaBase);</div><div class='ctx'> 	if (error != 0) {</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h<br/>index 5614921b4041..88b90f9806c9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aic7xxx/aic7xxx.h</a></div><div class='hunk'>@@ -943,6 +943,7 @@ struct ahc_softc {</div><div class='ctx'> 	 * Platform specific device information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ahc_dev_softc_t		  dev_softc;</div><div class='add'>+	struct device		  *dev;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bus specific device information.</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c<br/>index f3362f4ab16e..a9d40d3b90ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aic7xxx/aic7xxx_core.c</a></div><div class='hunk'>@@ -1666,7 +1666,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)</div><div class='ctx'> 					printk("\tCRC Value Mismatch\n");</div><div class='ctx'> 				if ((sstat2 &amp; CRCENDERR) != 0)</div><div class='ctx'> 					printk("\tNo terminal CRC packet "</div><div class='del'>-					       "recevied\n");</div><div class='add'>+					       "received\n");</div><div class='ctx'> 				if ((sstat2 &amp; CRCREQERR) != 0)</div><div class='ctx'> 					printk("\tIllegal CRC packet "</div><div class='ctx'> 					       "request\n");</div><div class='hunk'>@@ -4920,24 +4920,30 @@ ahc_fini_scbdata(struct ahc_softc *ahc)</div><div class='ctx'> 		}</div><div class='ctx'> 		ahc_dma_tag_destroy(ahc, scb_data-&gt;sg_dmat);</div><div class='ctx'> 	}</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		ahc_dmamap_unload(ahc, scb_data-&gt;sense_dmat,</div><div class='ctx'> 				  scb_data-&gt;sense_dmamap);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 5:</div><div class='ctx'> 		ahc_dmamem_free(ahc, scb_data-&gt;sense_dmat, scb_data-&gt;sense,</div><div class='ctx'> 				scb_data-&gt;sense_dmamap);</div><div class='ctx'> 		ahc_dmamap_destroy(ahc, scb_data-&gt;sense_dmat,</div><div class='ctx'> 				   scb_data-&gt;sense_dmamap);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		ahc_dma_tag_destroy(ahc, scb_data-&gt;sense_dmat);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		ahc_dmamap_unload(ahc, scb_data-&gt;hscb_dmat,</div><div class='ctx'> 				  scb_data-&gt;hscb_dmamap);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		ahc_dmamem_free(ahc, scb_data-&gt;hscb_dmat, scb_data-&gt;hscbs,</div><div class='ctx'> 				scb_data-&gt;hscb_dmamap);</div><div class='ctx'> 		ahc_dmamap_destroy(ahc, scb_data-&gt;hscb_dmat,</div><div class='ctx'> 				   scb_data-&gt;hscb_dmamap);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		ahc_dma_tag_destroy(ahc, scb_data-&gt;hscb_dmat);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -6002,8 +6008,8 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel,</div><div class='ctx'> 				if ((scb-&gt;flags &amp; SCB_ACTIVE) == 0)</div><div class='ctx'> 					printk("Inactive SCB in Waiting List\n");</div><div class='ctx'> 				ahc_done(ahc, scb);</div><div class='del'>-				/* FALLTHROUGH */</div><div class='ctx'> 			}</div><div class='add'>+				/* fall through */</div><div class='ctx'> 			case SEARCH_REMOVE:</div><div class='ctx'> 				next = ahc_rem_wscb(ahc, next, prev);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -7008,8 +7014,8 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts)</div><div class='ctx'> 		}</div><div class='ctx'> 		address -= address_offset;</div><div class='ctx'> 		fmt3_ins-&gt;address = address;</div><div class='del'>-		/* FALLTHROUGH */</div><div class='ctx'> 	}</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case AIC_OP_OR:</div><div class='ctx'> 	case AIC_OP_AND:</div><div class='ctx'> 	case AIC_OP_XOR:</div><div class='hunk'>@@ -7035,7 +7041,7 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts)</div><div class='ctx'> 			fmt1_ins-&gt;opcode = AIC_OP_AND;</div><div class='ctx'> 			fmt1_ins-&gt;immediate = 0xff;</div><div class='ctx'> 		}</div><div class='del'>-		/* FALLTHROUGH */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case AIC_OP_ROL:</div><div class='ctx'> 		if ((ahc-&gt;features &amp; AHC_ULTRA2) != 0) {</div><div class='ctx'> 			int i, count;</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c<br/>index 3c9c17450bb3..d5c4a0d23706 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx_osm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aic7xxx/aic7xxx_osm.c</a></div><div class='hunk'>@@ -860,8 +860,8 @@ int</div><div class='ctx'> ahc_dmamem_alloc(struct ahc_softc *ahc, bus_dma_tag_t dmat, void** vaddr,</div><div class='ctx'> 		 int flags, bus_dmamap_t *mapp)</div><div class='ctx'> {</div><div class='del'>-	*vaddr = pci_alloc_consistent(ahc-&gt;dev_softc,</div><div class='del'>-				      dmat-&gt;maxsize, mapp);</div><div class='add'>+	/* XXX: check if we really need the GFP_ATOMIC and unwind this mess! */</div><div class='add'>+	*vaddr = dma_alloc_coherent(ahc-&gt;dev, dmat-&gt;maxsize, mapp, GFP_ATOMIC);</div><div class='ctx'> 	if (*vaddr == NULL)</div><div class='ctx'> 		return ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -871,8 +871,7 @@ void</div><div class='ctx'> ahc_dmamem_free(struct ahc_softc *ahc, bus_dma_tag_t dmat,</div><div class='ctx'> 		void* vaddr, bus_dmamap_t map)</div><div class='ctx'> {</div><div class='del'>-	pci_free_consistent(ahc-&gt;dev_softc, dmat-&gt;maxsize,</div><div class='del'>-			    vaddr, map);</div><div class='add'>+	dma_free_coherent(ahc-&gt;dev, dmat-&gt;maxsize, vaddr, map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -1123,8 +1122,7 @@ ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *templa</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;transportt = ahc_linux_transport_template;</div><div class='ctx'> </div><div class='del'>-	retval = scsi_add_host(host,</div><div class='del'>-			(ahc-&gt;dev_softc ? &amp;ahc-&gt;dev_softc-&gt;dev : NULL));</div><div class='add'>+	retval = scsi_add_host(host, ahc-&gt;dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_WARNING "aic7xxx: scsi_add_host failed\n");</div><div class='ctx'> 		scsi_host_put(host);</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c<br/>index 0fc14dac7070..717d8d1082ce 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/aic7xxx/aic7xxx_osm_pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/aic7xxx/aic7xxx_osm_pci.c</a></div><div class='hunk'>@@ -250,6 +250,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ahc-&gt;dev_softc = pci;</div><div class='add'>+	ahc-&gt;dev = &amp;pci-&gt;dev;</div><div class='ctx'> 	error = ahc_pci_config(ahc, entry);</div><div class='ctx'> 	if (error != 0) {</div><div class='ctx'> 		ahc_free(ahc);</div><div class='head'>diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c<br/>index 1267200380f8..446a789cdaf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/atp870u.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/atp870u.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/atp870u.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/atp870u.c</a></div><div class='hunk'>@@ -194,12 +194,11 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)</div><div class='ctx'> 				((unsigned char *) &amp;adrcnt)[2] = atp_readb_io(dev, c, 0x12);</div><div class='ctx'> 				((unsigned char *) &amp;adrcnt)[1] = atp_readb_io(dev, c, 0x13);</div><div class='ctx'> 				((unsigned char *) &amp;adrcnt)[0] = atp_readb_io(dev, c, 0x14);</div><div class='del'>-				if (dev-&gt;id[c][target_id].last_len != adrcnt)</div><div class='del'>-				{</div><div class='del'>-			   		k = dev-&gt;id[c][target_id].last_len;</div><div class='add'>+				if (dev-&gt;id[c][target_id].last_len != adrcnt) {</div><div class='add'>+					k = dev-&gt;id[c][target_id].last_len;</div><div class='ctx'> 			   		k -= adrcnt;</div><div class='ctx'> 			   		dev-&gt;id[c][target_id].tran_len = k;			   </div><div class='del'>-			   	dev-&gt;id[c][target_id].last_len = adrcnt;			   </div><div class='add'>+					dev-&gt;id[c][target_id].last_len = adrcnt;</div><div class='ctx'> 				}</div><div class='ctx'> #ifdef ED_DBGP</div><div class='ctx'> 				printk("dev-&gt;id[c][target_id].last_len = %d dev-&gt;id[c][target_id].tran_len = %d\n",dev-&gt;id[c][target_id].last_len,dev-&gt;id[c][target_id].tran_len);</div><div class='head'>diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c<br/>index 0a6972ee94d7..ea042c1fc70d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/be2iscsi/be_cmds.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/be2iscsi/be_cmds.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/be2iscsi/be_cmds.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/be2iscsi/be_cmds.c</a></div><div class='hunk'>@@ -963,7 +963,7 @@ int beiscsi_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,</div><div class='ctx'>  * @ctrl: ptr to ctrl_info</div><div class='ctx'>  * @cq: Completion Queue</div><div class='ctx'>  * @dq: Default Queue</div><div class='del'>- * @lenght: ring size</div><div class='add'>+ * @length: ring size</div><div class='ctx'>  * @entry_size: size of each entry in DEFQ</div><div class='ctx'>  * @is_header: Header or Data DEFQ</div><div class='ctx'>  * @ulp_num: Bind to which ULP</div><div class='head'>diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c<br/>index 96b96e2ab91a..ed1bd369baa0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/be2iscsi/be_iscsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/be2iscsi/be_iscsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/be2iscsi/be_iscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/be2iscsi/be_iscsi.c</a></div><div class='hunk'>@@ -679,6 +679,7 @@ int beiscsi_set_param(struct iscsi_cls_conn *cls_conn,</div><div class='ctx'> 	case ISCSI_PARAM_MAX_XMIT_DLENGTH:</div><div class='ctx'> 		if (conn-&gt;max_xmit_dlength &gt; 65536)</div><div class='ctx'> 			conn-&gt;max_xmit_dlength = 65536;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c<br/>index 76e49d902609..0760d0bd8a10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/be2iscsi/be_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/be2iscsi/be_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/be2iscsi/be_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/be2iscsi/be_main.c</a></div><div class='hunk'>@@ -1532,6 +1532,7 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UNSOL_DATA_DIGEST_ERROR_NOTIFY:</div><div class='ctx'> 		error = 1;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case UNSOL_DATA_NOTIFY:</div><div class='ctx'> 		pasync_handle = pasync_ctx-&gt;async_entry[ci].data;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h<br/>index 0e119d838e1b..762cb77253b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bfa/bfa.h</a></div><div class='hunk'>@@ -62,8 +62,7 @@ void bfa_isr_unhandled(struct bfa_s *bfa, struct bfi_msg_s *m);</div><div class='ctx'> 			((__bfa)-&gt;iocfc.cfg.drvcfg.num_reqq_elems - 1); \</div><div class='ctx'> 		writel((__bfa)-&gt;iocfc.req_cq_pi[__reqq],		\</div><div class='ctx'> 			(__bfa)-&gt;iocfc.bfa_regs.cpe_q_pi[__reqq]);	\</div><div class='del'>-		mmiowb();      \</div><div class='del'>-	} while (0)</div><div class='add'>+		} while (0)</div><div class='ctx'> </div><div class='ctx'> #define bfa_rspq_pi(__bfa, __rspq)					\</div><div class='ctx'> 	(*(u32 *)((__bfa)-&gt;iocfc.rsp_cq_shadow_pi[__rspq].kva))</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c<br/>index 2c85f5b1f9c1..7e996bcf026c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa_fcpim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa_fcpim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa_fcpim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bfa/bfa_fcpim.c</a></div><div class='hunk'>@@ -2586,6 +2586,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim)</div><div class='ctx'> 	case FCP_IODIR_RW:</div><div class='ctx'> 		bfa_stats(itnim, input_reqs);</div><div class='ctx'> 		bfa_stats(itnim, output_reqs);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		bfi_h2i_set(m-&gt;mh, BFI_MC_IOIM_IO, 0, bfa_fn_lpu(ioim-&gt;bfa));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2820,6 +2821,7 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)</div><div class='ctx'> </div><div class='ctx'> 	case BFI_IOIM_STS_TIMEDOUT:</div><div class='ctx'> 		bfa_stats(ioim-&gt;itnim, iocomp_timedout);</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case BFI_IOIM_STS_ABORTED:</div><div class='ctx'> 		rsp-&gt;io_status = BFI_IOIM_STS_ABORTED;</div><div class='ctx'> 		bfa_stats(ioim-&gt;itnim, iocomp_aborted);</div><div class='hunk'>@@ -3215,9 +3217,7 @@ bfa_tskim_sm_cleanup_qfull(struct bfa_tskim_s *tskim,</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case BFA_TSKIM_SM_DONE:</div><div class='ctx'> 		bfa_reqq_wcancel(&amp;tskim-&gt;reqq_wait);</div><div class='del'>-		/*</div><div class='del'>-		 * Fall through !!!</div><div class='del'>-		 */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case BFA_TSKIM_SM_QRESUME:</div><div class='ctx'> 		bfa_sm_set_state(tskim, bfa_tskim_sm_cleanup);</div><div class='ctx'> 		bfa_tskim_send_abort(tskim);</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_hw_cb.c b/drivers/scsi/bfa/bfa_hw_cb.c<br/>index c4a0c0eb88a5..4a0d881b2602 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa_hw_cb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa_hw_cb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa_hw_cb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bfa/bfa_hw_cb.c</a></div><div class='hunk'>@@ -61,7 +61,6 @@ bfa_hwcb_rspq_ack_msix(struct bfa_s *bfa, int rspq, u32 ci)</div><div class='ctx'> </div><div class='ctx'> 	bfa_rspq_ci(bfa, rspq) = ci;</div><div class='ctx'> 	writel(ci, bfa-&gt;iocfc.bfa_regs.rme_q_ci[rspq]);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -72,7 +71,6 @@ bfa_hwcb_rspq_ack(struct bfa_s *bfa, int rspq, u32 ci)</div><div class='ctx'> </div><div class='ctx'> 	bfa_rspq_ci(bfa, rspq) = ci;</div><div class='ctx'> 	writel(ci, bfa-&gt;iocfc.bfa_regs.rme_q_ci[rspq]);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_hw_ct.c b/drivers/scsi/bfa/bfa_hw_ct.c<br/>index b0ff378dece2..b7be5f4f02a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa_hw_ct.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bfa/bfa_hw_ct.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bfa/bfa_hw_ct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bfa/bfa_hw_ct.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@ bfa_hwct_rspq_ack(struct bfa_s *bfa, int rspq, u32 ci)</div><div class='ctx'> </div><div class='ctx'> 	bfa_rspq_ci(bfa, rspq) = ci;</div><div class='ctx'> 	writel(ci, bfa-&gt;iocfc.bfa_regs.rme_q_ci[rspq]);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -94,7 +93,6 @@ bfa_hwct2_rspq_ack(struct bfa_s *bfa, int rspq, u32 ci)</div><div class='ctx'> {</div><div class='ctx'> 	bfa_rspq_ci(bfa, rspq) = ci;</div><div class='ctx'> 	writel(ci, bfa-&gt;iocfc.bfa_regs.rme_q_ci[rspq]);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c<br/>index 039328d9ef13..19734ec7f42e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bnx2fc/bnx2fc_hwi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bnx2fc/bnx2fc_hwi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bnx2fc/bnx2fc_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bnx2fc/bnx2fc_hwi.c</a></div><div class='hunk'>@@ -991,7 +991,6 @@ void bnx2fc_arm_cq(struct bnx2fc_rport *tgt)</div><div class='ctx'> 			FCOE_CQE_TOGGLE_BIT_SHIFT);</div><div class='ctx'> 	msg = *((u32 *)rx_db);</div><div class='ctx'> 	writel(cpu_to_le32(msg), tgt-&gt;ctx_base);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1409,7 +1408,6 @@ void bnx2fc_ring_doorbell(struct bnx2fc_rport *tgt)</div><div class='ctx'> 				(tgt-&gt;sq_curr_toggle_bit &lt;&lt; 15);</div><div class='ctx'> 	msg = *((u32 *)sq_db);</div><div class='ctx'> 	writel(cpu_to_le32(msg), tgt-&gt;ctx_base);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c<br/>index bc9f2a2365f4..8def63c0755f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bnx2fc/bnx2fc_io.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bnx2fc/bnx2fc_io.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bnx2fc/bnx2fc_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bnx2fc/bnx2fc_io.c</a></div><div class='hunk'>@@ -1083,7 +1083,6 @@ int bnx2fc_eh_device_reset(struct scsi_cmnd *sc_cmd)</div><div class='ctx'> static int bnx2fc_abts_cleanup(struct bnx2fc_cmd *io_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2fc_rport *tgt = io_req-&gt;tgt;</div><div class='del'>-	int rc = SUCCESS;</div><div class='ctx'> 	unsigned int time_left;</div><div class='ctx'> </div><div class='ctx'> 	io_req-&gt;wait_for_comp = 1;</div><div class='hunk'>@@ -1110,7 +1109,7 @@ static int bnx2fc_abts_cleanup(struct bnx2fc_cmd *io_req)</div><div class='ctx'> 	kref_put(&amp;io_req-&gt;refcount, bnx2fc_cmd_release);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;tgt-&gt;tgt_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	return SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c<br/>index fae6f71e677d..12666313b937 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bnx2i/bnx2i_hwi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/bnx2i/bnx2i_hwi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/bnx2i/bnx2i_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/bnx2i/bnx2i_hwi.c</a></div><div class='hunk'>@@ -253,7 +253,6 @@ void bnx2i_put_rq_buf(struct bnx2i_conn *bnx2i_conn, int count)</div><div class='ctx'> 		writew(ep-&gt;qp.rq_prod_idx,</div><div class='ctx'> 		       ep-&gt;qp.ctx_base + CNIC_RECV_DOORBELL);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -279,8 +278,6 @@ static void bnx2i_ring_sq_dbell(struct bnx2i_conn *bnx2i_conn, int count)</div><div class='ctx'> 		bnx2i_ring_577xx_doorbell(bnx2i_conn);</div><div class='ctx'> 	} else</div><div class='ctx'> 		writew(count, ep-&gt;qp.ctx_base + CNIC_SEND_DOORBELL);</div><div class='del'>-</div><div class='del'>-	mmiowb(); /* flush posted PCI writes */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/csiostor/csio_isr.c b/drivers/scsi/csiostor/csio_isr.c<br/>index 7c8814715711..b2540402fafc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/csiostor/csio_isr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/csiostor/csio_isr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/csiostor/csio_isr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/csiostor/csio_isr.c</a></div><div class='hunk'>@@ -474,13 +474,39 @@ csio_reduce_sqsets(struct csio_hw *hw, int cnt)</div><div class='ctx'> 	csio_dbg(hw, "Reduced sqsets to %d\n", hw-&gt;num_sqsets);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void csio_calc_sets(struct irq_affinity *affd, unsigned int nvecs)</div><div class='add'>+{</div><div class='add'>+	struct csio_hw *hw = affd-&gt;priv;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (!nvecs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (nvecs &lt; hw-&gt;num_pports) {</div><div class='add'>+		affd-&gt;nr_sets = 1;</div><div class='add'>+		affd-&gt;set_size[0] = nvecs;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	affd-&gt;nr_sets = hw-&gt;num_pports;</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;num_pports; i++)</div><div class='add'>+		affd-&gt;set_size[i] = nvecs / hw-&gt;num_pports;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> csio_enable_msix(struct csio_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, k, n, min, cnt;</div><div class='ctx'> 	int extra = CSIO_EXTRA_VECS;</div><div class='ctx'> 	struct csio_scsi_cpu_info *info;</div><div class='del'>-	struct irq_affinity desc = { .pre_vectors = 2 };</div><div class='add'>+	struct irq_affinity desc = {</div><div class='add'>+		.pre_vectors = CSIO_EXTRA_VECS,</div><div class='add'>+		.calc_sets = csio_calc_sets,</div><div class='add'>+		.priv = hw,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;num_pports &gt; IRQ_AFFINITY_MAX_SETS)</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	min = hw-&gt;num_pports + extra;</div><div class='ctx'> 	cnt = hw-&gt;num_sqsets + extra;</div><div class='head'>diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c<br/>index 462560b2855e..469d0bc9f5fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/csiostor/csio_scsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/csiostor/csio_scsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/csiostor/csio_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/csiostor/csio_scsi.c</a></div><div class='hunk'>@@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (req-&gt;nsge &gt; 0)</div><div class='add'>+	if (req-&gt;nsge &gt; 0) {</div><div class='ctx'> 		scsi_dma_unmap(cmnd);</div><div class='add'>+		if (req-&gt;dcopy &amp;&amp; (host_status == DID_OK))</div><div class='add'>+			host_status = csio_scsi_copy_to_sgl(hw, req);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cmnd-&gt;result = (((host_status) &lt;&lt; 16) | scsi_status);</div><div class='ctx'> 	cmnd-&gt;scsi_done(cmnd);</div><div class='head'>diff --git a/drivers/scsi/csiostor/csio_wr.c b/drivers/scsi/csiostor/csio_wr.c<br/>index 66bbd21819ae..03bd896cdbb9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/csiostor/csio_wr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/csiostor/csio_wr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/csiostor/csio_wr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/csiostor/csio_wr.c</a></div><div class='hunk'>@@ -808,6 +808,7 @@ csio_wr_destroy_queues(struct csio_hw *hw, bool cmd)</div><div class='ctx'> </div><div class='ctx'> 				csio_q_eqid(hw, i) = CSIO_MAX_QID;</div><div class='ctx'> 			}</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		case CSIO_INGRESS:</div><div class='ctx'> 			if (csio_q_iqid(hw, i) != CSIO_MAX_QID) {</div><div class='ctx'> 				csio_wr_cleanup_iq_ftr(hw, i);</div><div class='head'>diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c<br/>index 75e1273a44b3..b8dd9e648dd0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.c</a></div><div class='hunk'>@@ -979,14 +979,17 @@ static int init_act_open(struct cxgbi_sock *csk)</div><div class='ctx'> 	csk-&gt;atid = cxgb3_alloc_atid(t3dev, &amp;t3_client, csk);</div><div class='ctx'> 	if (csk-&gt;atid &lt; 0) {</div><div class='ctx'> 		pr_err("NO atid available.\n");</div><div class='del'>-		goto rel_resource;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);</div><div class='ctx'> 	cxgbi_sock_get(csk);</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL);</div><div class='del'>-	if (!skb)</div><div class='del'>-		goto rel_resource;</div><div class='add'>+	if (!skb) {</div><div class='add'>+		cxgb3_free_atid(t3dev, csk-&gt;atid);</div><div class='add'>+		cxgbi_sock_put(csk);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	skb-&gt;sk = (struct sock *)csk;</div><div class='ctx'> 	set_arp_failure_handler(skb, act_open_arp_failure);</div><div class='ctx'> 	csk-&gt;snd_win = cxgb3i_snd_win;</div><div class='hunk'>@@ -1007,11 +1010,6 @@ static int init_act_open(struct cxgbi_sock *csk)</div><div class='ctx'> 	cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN);</div><div class='ctx'> 	send_act_open_req(csk, skb, csk-&gt;l2t);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-rel_resource:</div><div class='del'>-	if (skb)</div><div class='del'>-		__kfree_skb(skb);</div><div class='del'>-	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS] = {</div><div class='head'>diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c<br/>index d44914e5e415..124f3345420f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ MODULE_PARM_DESC(dbg_level, "Debug flag (default=0)");</div><div class='ctx'> #define CXGB4I_DEFAULT_10G_RCV_WIN (256 * 1024)</div><div class='ctx'> static int cxgb4i_rcv_win = -1;</div><div class='ctx'> module_param(cxgb4i_rcv_win, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(cxgb4i_rcv_win, "TCP reveive window in bytes");</div><div class='add'>+MODULE_PARM_DESC(cxgb4i_rcv_win, "TCP receive window in bytes");</div><div class='ctx'> </div><div class='ctx'> #define CXGB4I_DEFAULT_10G_SND_WIN (128 * 1024)</div><div class='ctx'> static int cxgb4i_snd_win = -1;</div><div class='head'>diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c<br/>index 006372b3fba2..8b915d4ed98d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/cxgbi/libcxgbi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/cxgbi/libcxgbi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/cxgbi/libcxgbi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/cxgbi/libcxgbi.c</a></div><div class='hunk'>@@ -282,7 +282,6 @@ struct cxgbi_device *cxgbi_device_find_by_netdev_rcu(struct net_device *ndev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cxgbi_device_find_by_netdev_rcu);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev,</div><div class='ctx'> 						     int *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -315,7 +314,6 @@ static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev,</div><div class='ctx'> 		  ndev, ndev-&gt;name);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> void cxgbi_hbas_remove(struct cxgbi_device *cdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -653,6 +651,8 @@ cxgbi_check_route(struct sockaddr *dst_addr, int ifindex)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cdev = cxgbi_device_find_by_netdev(ndev, &amp;port);</div><div class='add'>+	if (!cdev)</div><div class='add'>+		cdev = cxgbi_device_find_by_mac(ndev, &amp;port);</div><div class='ctx'> 	if (!cdev) {</div><div class='ctx'> 		pr_info("dst %pI4, %s, NOT cxgbi device.\n",</div><div class='ctx'> 			&amp;daddr-&gt;sin_addr.s_addr, ndev-&gt;name);</div><div class='hunk'>@@ -2310,7 +2310,6 @@ int cxgbi_get_ep_param(struct iscsi_endpoint *ep, enum iscsi_param param,</div><div class='ctx'> {</div><div class='ctx'> 	struct cxgbi_endpoint *cep = ep-&gt;dd_data;</div><div class='ctx'> 	struct cxgbi_sock *csk;</div><div class='del'>-	int len;</div><div class='ctx'> </div><div class='ctx'> 	log_debug(1 &lt;&lt; CXGBI_DBG_ISCSI,</div><div class='ctx'> 		"cls_conn 0x%p, param %d.\n", ep, param);</div><div class='hunk'>@@ -2328,9 +2327,9 @@ int cxgbi_get_ep_param(struct iscsi_endpoint *ep, enum iscsi_param param,</div><div class='ctx'> 		return iscsi_conn_get_addr_param((struct sockaddr_storage *)</div><div class='ctx'> 						 &amp;csk-&gt;daddr, param, buf);</div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOSYS;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	return len;</div><div class='add'>+	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cxgbi_get_ep_param);</div><div class='ctx'> </div><div class='hunk'>@@ -2563,13 +2562,9 @@ struct iscsi_endpoint *cxgbi_ep_connect(struct Scsi_Host *shost,</div><div class='ctx'> 			pr_info("shost 0x%p, priv NULL.\n", shost);</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		rtnl_lock();</div><div class='del'>-		if (!vlan_uses_dev(hba-&gt;ndev))</div><div class='del'>-			ifindex = hba-&gt;ndev-&gt;ifindex;</div><div class='del'>-		rtnl_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+check_route:</div><div class='ctx'> 	if (dst_addr-&gt;sa_family == AF_INET) {</div><div class='ctx'> 		csk = cxgbi_check_route(dst_addr, ifindex);</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='hunk'>@@ -2590,6 +2585,13 @@ struct iscsi_endpoint *cxgbi_ep_connect(struct Scsi_Host *shost,</div><div class='ctx'> 	if (!hba)</div><div class='ctx'> 		hba = csk-&gt;cdev-&gt;hbas[csk-&gt;port_id];</div><div class='ctx'> 	else if (hba != csk-&gt;cdev-&gt;hbas[csk-&gt;port_id]) {</div><div class='add'>+		if (ifindex != hba-&gt;ndev-&gt;ifindex) {</div><div class='add'>+			cxgbi_sock_put(csk);</div><div class='add'>+			cxgbi_sock_closed(csk);</div><div class='add'>+			ifindex = hba-&gt;ndev-&gt;ifindex;</div><div class='add'>+			goto check_route;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		pr_info("Could not connect through requested host %u"</div><div class='ctx'> 			"hba 0x%p != 0x%p (%u).\n",</div><div class='ctx'> 			shost-&gt;host_no, hba,</div><div class='head'>diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c<br/>index abdc34affdf6..a3afd1478ab6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/dpt_i2o.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/dpt_i2o.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/dpt_i2o.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/dpt_i2o.c</a></div><div class='hunk'>@@ -835,8 +835,8 @@ static void adpt_i2o_sys_shutdown(void)</div><div class='ctx'> 	adpt_hba *pHba, *pNext;</div><div class='ctx'> 	struct adpt_i2o_post_wait_data *p1, *old;</div><div class='ctx'> </div><div class='del'>-	 printk(KERN_INFO"Shutting down Adaptec I2O controllers.\n");</div><div class='del'>-	 printk(KERN_INFO"   This could take a few minutes if there are many devices attached\n");</div><div class='add'>+	printk(KERN_INFO "Shutting down Adaptec I2O controllers.\n");</div><div class='add'>+	printk(KERN_INFO "   This could take a few minutes if there are many devices attached\n");</div><div class='ctx'> 	/* Delete all IOPs from the controller chain */</div><div class='ctx'> 	/* They should have already been released by the</div><div class='ctx'> 	 * scsi-core</div><div class='hunk'>@@ -859,7 +859,7 @@ static void adpt_i2o_sys_shutdown(void)</div><div class='ctx'> //	spin_unlock_irqrestore(&amp;adpt_post_wait_lock, flags);</div><div class='ctx'> 	adpt_post_wait_queue = NULL;</div><div class='ctx'> </div><div class='del'>-	 printk(KERN_INFO "Adaptec I2O controllers down.\n");</div><div class='add'>+	printk(KERN_INFO "Adaptec I2O controllers down.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev)</div><div class='hunk'>@@ -3390,7 +3390,7 @@ static int adpt_i2o_issue_params(int cmd, adpt_hba* pHba, int tid,</div><div class='ctx'> 		return -((res[1] &gt;&gt; 16) &amp; 0xFF); /* -BlockStatus */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	 return 4 + ((res[1] &amp; 0x0000FFFF) &lt;&lt; 2); /* bytes used in resblk */ </div><div class='add'>+	return 4 + ((res[1] &amp; 0x0000FFFF) &lt;&lt; 2); /* bytes used in resblk */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3463,8 +3463,8 @@ static int adpt_i2o_enable_hba(adpt_hba* pHba)</div><div class='ctx'> </div><div class='ctx'> static int adpt_i2o_systab_send(adpt_hba* pHba)</div><div class='ctx'> {</div><div class='del'>-	 u32 msg[12];</div><div class='del'>-	 int ret;</div><div class='add'>+	u32 msg[12];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	msg[0] = I2O_MESSAGE_SIZE(12) | SGL_OFFSET_6;</div><div class='ctx'> 	msg[1] = I2O_CMD_SYS_TAB_SET&lt;&lt;24 | HOST_TID&lt;&lt;12 | ADAPTER_TID;</div><div class='head'>diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c<br/>index 465df475f753..76fd02ccbf49 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/esp_scsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/esp_scsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/esp_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/esp_scsi.c</a></div><div class='hunk'>@@ -1031,7 +1031,7 @@ static int esp_check_spur_intr(struct esp *esp)</div><div class='ctx'> </div><div class='ctx'> static void esp_schedule_reset(struct esp *esp)</div><div class='ctx'> {</div><div class='del'>-	esp_log_reset("esp_schedule_reset() from %pf\n",</div><div class='add'>+	esp_log_reset("esp_schedule_reset() from %ps\n",</div><div class='ctx'> 		      __builtin_return_address(0));</div><div class='ctx'> 	esp-&gt;flags |= ESP_FLAG_RESETTING;</div><div class='ctx'> 	esp_event(esp, ESP_EVENT_RESET);</div><div class='head'>diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c<br/>index e7f1dd4f3b66..0ca9b4393770 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/gdth.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/gdth.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/gdth.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/gdth.c</a></div><div class='hunk'>@@ -3697,8 +3697,9 @@ static int ioc_general(void __user *arg, char *cmnd)</div><div class='ctx'> </div><div class='ctx'> 	rval = 0;</div><div class='ctx'> out_free_buf:</div><div class='del'>-	dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, gen.data_len + gen.sense_len, buf,</div><div class='del'>-			paddr);</div><div class='add'>+	if (buf)</div><div class='add'>+		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, gen.data_len + gen.sense_len,</div><div class='add'>+				  buf, paddr);</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='head'>diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h<br/>index 9bfa9f12d81e..fc87994b5d73 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/hisi_sas/hisi_sas.h</a></div><div class='hunk'>@@ -170,6 +170,7 @@ struct hisi_sas_phy {</div><div class='ctx'> 	u32		code_violation_err_count;</div><div class='ctx'> 	enum sas_linkrate	minimum_linkrate;</div><div class='ctx'> 	enum sas_linkrate	maximum_linkrate;</div><div class='add'>+	int enable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hisi_sas_port {</div><div class='hunk'>@@ -551,6 +552,8 @@ extern int hisi_sas_slave_configure(struct scsi_device *sdev);</div><div class='ctx'> extern int hisi_sas_scan_finished(struct Scsi_Host *shost, unsigned long time);</div><div class='ctx'> extern void hisi_sas_scan_start(struct Scsi_Host *shost);</div><div class='ctx'> extern int hisi_sas_host_reset(struct Scsi_Host *shost, int reset_type);</div><div class='add'>+extern void hisi_sas_phy_enable(struct hisi_hba *hisi_hba, int phy_no,</div><div class='add'>+				int enable);</div><div class='ctx'> extern void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy);</div><div class='ctx'> extern void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba,</div><div class='ctx'> 				    struct sas_task *task,</div><div class='head'>diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c<br/>index 3c3cf89f713f..8a7feb8ed8d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/hisi_sas/hisi_sas_main.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hisi_sas.h"</div><div class='del'>-#include "../libsas/sas_internal.h"</div><div class='ctx'> #define DRV_NAME "hisi_sas"</div><div class='ctx'> </div><div class='ctx'> #define DEV_IS_GONE(dev) \</div><div class='hunk'>@@ -171,7 +170,7 @@ void hisi_sas_stop_phys(struct hisi_hba *hisi_hba)</div><div class='ctx'> 	int phy_no;</div><div class='ctx'> </div><div class='ctx'> 	for (phy_no = 0; phy_no &lt; hisi_hba-&gt;n_phy; phy_no++)</div><div class='del'>-		hisi_hba-&gt;hw-&gt;phy_disable(hisi_hba, phy_no);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hisi_sas_stop_phys);</div><div class='ctx'> </div><div class='hunk'>@@ -684,7 +683,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no)</div><div class='ctx'> 		id-&gt;initiator_bits = SAS_PROTOCOL_ALL;</div><div class='ctx'> 		id-&gt;target_bits = phy-&gt;identify.target_port_protocols;</div><div class='ctx'> 	} else if (phy-&gt;phy_type &amp; PORT_TYPE_SATA) {</div><div class='del'>-		/*Nothing*/</div><div class='add'>+		/* Nothing */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sas_phy-&gt;frame_rcvd_size = phy-&gt;frame_rcvd_size;</div><div class='hunk'>@@ -755,7 +754,8 @@ static int hisi_sas_init_device(struct domain_device *device)</div><div class='ctx'> 		 * STP target port</div><div class='ctx'> 		 */</div><div class='ctx'> 		local_phy = sas_get_local_phy(device);</div><div class='del'>-		if (!scsi_is_sas_phy_local(local_phy)) {</div><div class='add'>+		if (!scsi_is_sas_phy_local(local_phy) &amp;&amp;</div><div class='add'>+		    !test_bit(HISI_SAS_RESET_BIT, &amp;hisi_hba-&gt;flags)) {</div><div class='ctx'> 			unsigned long deadline = ata_deadline(jiffies, 20000);</div><div class='ctx'> 			struct sata_device *sata_dev = &amp;device-&gt;sata_dev;</div><div class='ctx'> 			struct ata_host *ata_host = sata_dev-&gt;ata_host;</div><div class='hunk'>@@ -770,8 +770,7 @@ static int hisi_sas_init_device(struct domain_device *device)</div><div class='ctx'> 		}</div><div class='ctx'> 		sas_put_local_phy(local_phy);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_warn(dev, "SATA disk hardreset fail: 0x%x\n",</div><div class='del'>-				 rc);</div><div class='add'>+			dev_warn(dev, "SATA disk hardreset fail: %d\n", rc);</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -976,6 +975,30 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)</div><div class='ctx'> 	timer_setup(&amp;phy-&gt;timer, hisi_sas_wait_phyup_timedout, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Wrapper to ensure we track hisi_sas_phy.enable properly */</div><div class='add'>+void hisi_sas_phy_enable(struct hisi_hba *hisi_hba, int phy_no, int enable)</div><div class='add'>+{</div><div class='add'>+	struct hisi_sas_phy *phy = &amp;hisi_hba-&gt;phy[phy_no];</div><div class='add'>+	struct asd_sas_phy *aphy = &amp;phy-&gt;sas_phy;</div><div class='add'>+	struct sas_phy *sphy = aphy-&gt;phy;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;phy-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		/* We may have been enabled already; if so, don't touch */</div><div class='add'>+		if (!phy-&gt;enable)</div><div class='add'>+			sphy-&gt;negotiated_linkrate = SAS_LINK_RATE_UNKNOWN;</div><div class='add'>+		hisi_hba-&gt;hw-&gt;phy_start(hisi_hba, phy_no);</div><div class='add'>+	} else {</div><div class='add'>+		sphy-&gt;negotiated_linkrate = SAS_PHY_DISABLED;</div><div class='add'>+		hisi_hba-&gt;hw-&gt;phy_disable(hisi_hba, phy_no);</div><div class='add'>+	}</div><div class='add'>+	phy-&gt;enable = enable;</div><div class='add'>+	spin_unlock_irqrestore(&amp;phy-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hisi_sas_phy_enable);</div><div class='add'>+</div><div class='ctx'> static void hisi_sas_port_notify_formed(struct asd_sas_phy *sas_phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct sas_ha_struct *sas_ha = sas_phy-&gt;ha;</div><div class='hunk'>@@ -1112,10 +1135,10 @@ static int hisi_sas_phy_set_linkrate(struct hisi_hba *hisi_hba, int phy_no,</div><div class='ctx'> 	sas_phy-&gt;phy-&gt;maximum_linkrate = max;</div><div class='ctx'> 	sas_phy-&gt;phy-&gt;minimum_linkrate = min;</div><div class='ctx'> </div><div class='del'>-	hisi_hba-&gt;hw-&gt;phy_disable(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> 	hisi_hba-&gt;hw-&gt;phy_set_linkrate(hisi_hba, phy_no, &amp;_r);</div><div class='del'>-	hisi_hba-&gt;hw-&gt;phy_start(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1133,13 +1156,13 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PHY_FUNC_LINK_RESET:</div><div class='del'>-		hisi_hba-&gt;hw-&gt;phy_disable(hisi_hba, phy_no);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> 		msleep(100);</div><div class='del'>-		hisi_hba-&gt;hw-&gt;phy_start(hisi_hba, phy_no);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, phy_no, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PHY_FUNC_DISABLE:</div><div class='del'>-		hisi_hba-&gt;hw-&gt;phy_disable(hisi_hba, phy_no);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PHY_FUNC_SET_LINK_RATE:</div><div class='hunk'>@@ -1264,8 +1287,7 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,</div><div class='ctx'> 			/* no error, but return the number of bytes of</div><div class='ctx'> 			 * underrun</div><div class='ctx'> 			 */</div><div class='del'>-			dev_warn(dev, "abort tmf: task to dev %016llx "</div><div class='del'>-				 "resp: 0x%x sts 0x%x underrun\n",</div><div class='add'>+			dev_warn(dev, "abort tmf: task to dev %016llx resp: 0x%x sts 0x%x underrun\n",</div><div class='ctx'> 				 SAS_ADDR(device-&gt;sas_addr),</div><div class='ctx'> 				 task-&gt;task_status.resp,</div><div class='ctx'> 				 task-&gt;task_status.stat);</div><div class='hunk'>@@ -1280,10 +1302,16 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev_warn(dev, "abort tmf: task to dev "</div><div class='del'>-			 "%016llx resp: 0x%x status 0x%x\n",</div><div class='del'>-			 SAS_ADDR(device-&gt;sas_addr), task-&gt;task_status.resp,</div><div class='del'>-			 task-&gt;task_status.stat);</div><div class='add'>+		if (task-&gt;task_status.resp == SAS_TASK_COMPLETE &amp;&amp;</div><div class='add'>+		    task-&gt;task_status.stat == SAS_OPEN_REJECT) {</div><div class='add'>+			dev_warn(dev, "abort tmf: open reject failed\n");</div><div class='add'>+			res = -EIO;</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(dev, "abort tmf: task to dev %016llx resp: 0x%x status 0x%x\n",</div><div class='add'>+				 SAS_ADDR(device-&gt;sas_addr),</div><div class='add'>+				 task-&gt;task_status.resp,</div><div class='add'>+				 task-&gt;task_status.stat);</div><div class='add'>+		}</div><div class='ctx'> 		sas_free_task(task);</div><div class='ctx'> 		task = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1427,9 +1455,9 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 old_state,</div><div class='ctx'> 					sas_ha-&gt;notify_port_event(sas_phy,</div><div class='ctx'> 							PORTE_BROADCAST_RCVD);</div><div class='ctx'> 			}</div><div class='del'>-		} else if (old_state &amp; (1 &lt;&lt; phy_no))</div><div class='del'>-			/* PHY down but was up before */</div><div class='add'>+		} else {</div><div class='ctx'> 			hisi_sas_phy_down(hisi_hba, phy_no, 0);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1711,7 +1739,7 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun)</div><div class='ctx'> 	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);</div><div class='ctx'> 	struct device *dev = hisi_hba-&gt;dev;</div><div class='ctx'> 	struct hisi_sas_tmf_task tmf_task;</div><div class='del'>-	int rc = TMF_RESP_FUNC_FAILED;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = hisi_sas_internal_task_abort(hisi_hba, device,</div><div class='ctx'> 					  HISI_SAS_INT_ABT_DEV, 0);</div><div class='hunk'>@@ -1801,6 +1829,12 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device *device)</div><div class='ctx'> 	}</div><div class='ctx'> 	hisi_sas_dereg_device(hisi_hba, device);</div><div class='ctx'> </div><div class='add'>+	if (dev_is_sata(device)) {</div><div class='add'>+		rc = hisi_sas_softreset_ata_disk(device);</div><div class='add'>+		if (rc == TMF_RESP_FUNC_FAILED)</div><div class='add'>+			return TMF_RESP_FUNC_FAILED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = hisi_sas_debug_I_T_nexus_reset(device);</div><div class='ctx'> </div><div class='ctx'> 	if ((rc == TMF_RESP_FUNC_COMPLETE) || (rc == -ENODEV))</div><div class='hunk'>@@ -2094,10 +2128,8 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	dev_dbg(dev, "internal task abort: task to dev %016llx task=%p "</div><div class='del'>-		"resp: 0x%x sts 0x%x\n",</div><div class='del'>-		SAS_ADDR(device-&gt;sas_addr),</div><div class='del'>-		task,</div><div class='add'>+	dev_dbg(dev, "internal task abort: task to dev %016llx task=%p resp: 0x%x sts 0x%x\n",</div><div class='add'>+		SAS_ADDR(device-&gt;sas_addr), task,</div><div class='ctx'> 		task-&gt;task_status.resp, /* 0 is complete, -1 is undelivered */</div><div class='ctx'> 		task-&gt;task_status.stat);</div><div class='ctx'> 	sas_free_task(task);</div><div class='hunk'>@@ -2166,16 +2198,18 @@ static void hisi_sas_phy_disconnected(struct hisi_sas_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct asd_sas_phy *sas_phy = &amp;phy-&gt;sas_phy;</div><div class='ctx'> 	struct sas_phy *sphy = sas_phy-&gt;phy;</div><div class='del'>-	struct sas_phy_data *d = sphy-&gt;hostdata;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;phy_attached = 0;</div><div class='ctx'> 	phy-&gt;phy_type = 0;</div><div class='ctx'> 	phy-&gt;port = NULL;</div><div class='ctx'> </div><div class='del'>-	if (d-&gt;enable)</div><div class='add'>+	spin_lock_irqsave(&amp;phy-&gt;lock, flags);</div><div class='add'>+	if (phy-&gt;enable)</div><div class='ctx'> 		sphy-&gt;negotiated_linkrate = SAS_LINK_RATE_UNKNOWN;</div><div class='ctx'> 	else</div><div class='ctx'> 		sphy-&gt;negotiated_linkrate = SAS_PHY_DISABLED;</div><div class='add'>+	spin_unlock_irqrestore(&amp;phy-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy)</div><div class='hunk'>@@ -2228,6 +2262,19 @@ void hisi_sas_kill_tasklets(struct hisi_hba *hisi_hba)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hisi_sas_kill_tasklets);</div><div class='ctx'> </div><div class='add'>+int hisi_sas_host_reset(struct Scsi_Host *shost, int reset_type)</div><div class='add'>+{</div><div class='add'>+	struct hisi_hba *hisi_hba = shost_priv(shost);</div><div class='add'>+</div><div class='add'>+	if (reset_type != SCSI_ADAPTER_RESET)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	queue_work(hisi_hba-&gt;wq, &amp;hisi_hba-&gt;rst_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hisi_sas_host_reset);</div><div class='add'>+</div><div class='ctx'> struct scsi_transport_template *hisi_sas_stt;</div><div class='ctx'> EXPORT_SYMBOL_GPL(hisi_sas_stt);</div><div class='ctx'> </div><div class='hunk'>@@ -2485,22 +2532,19 @@ int hisi_sas_get_fw_info(struct hisi_hba *hisi_hba)</div><div class='ctx'> </div><div class='ctx'> 		if (device_property_read_u32(dev, "ctrl-reset-reg",</div><div class='ctx'> 					     &amp;hisi_hba-&gt;ctrl_reset_reg)) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"could not get property ctrl-reset-reg\n");</div><div class='add'>+			dev_err(dev, "could not get property ctrl-reset-reg\n");</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (device_property_read_u32(dev, "ctrl-reset-sts-reg",</div><div class='ctx'> 					     &amp;hisi_hba-&gt;ctrl_reset_sts_reg)) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"could not get property ctrl-reset-sts-reg\n");</div><div class='add'>+			dev_err(dev, "could not get property ctrl-reset-sts-reg\n");</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (device_property_read_u32(dev, "ctrl-clock-ena-reg",</div><div class='ctx'> 					     &amp;hisi_hba-&gt;ctrl_clock_ena_reg)) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"could not get property ctrl-clock-ena-reg\n");</div><div class='add'>+			dev_err(dev, "could not get property ctrl-clock-ena-reg\n");</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c<br/>index 293807443480..78fe7d344848 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_v1_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/hisi_sas/hisi_sas_v1_hw.c</a></div><div class='hunk'>@@ -798,16 +798,11 @@ static void start_phy_v1_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='ctx'> 	enable_phy_v1_hw(hisi_hba, phy_no);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stop_phy_v1_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='del'>-{</div><div class='del'>-	disable_phy_v1_hw(hisi_hba, phy_no);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void phy_hard_reset_v1_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='ctx'> {</div><div class='del'>-	stop_phy_v1_hw(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> 	msleep(100);</div><div class='del'>-	start_phy_v1_hw(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void start_phys_v1_hw(struct timer_list *t)</div><div class='hunk'>@@ -817,7 +812,7 @@ static void start_phys_v1_hw(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hisi_hba-&gt;n_phy; i++) {</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, CHL_INT2_MSK, 0x12a);</div><div class='del'>-		start_phy_v1_hw(hisi_hba, i);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, i, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1695,8 +1690,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		for (j = 0; j &lt; HISI_SAS_PHY_INT_NR; j++, idx++) {</div><div class='ctx'> 			irq = platform_get_irq(pdev, idx);</div><div class='ctx'> 			if (!irq) {</div><div class='del'>-				dev_err(dev,</div><div class='del'>-					"irq init: fail map phy interrupt %d\n",</div><div class='add'>+				dev_err(dev, "irq init: fail map phy interrupt %d\n",</div><div class='ctx'> 					idx);</div><div class='ctx'> 				return -ENOENT;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1704,8 +1698,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 			rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,</div><div class='ctx'> 					      DRV_NAME " phy", phy);</div><div class='ctx'> 			if (rc) {</div><div class='del'>-				dev_err(dev, "irq init: could not request "</div><div class='del'>-					"phy interrupt %d, rc=%d\n",</div><div class='add'>+				dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",</div><div class='ctx'> 					irq, rc);</div><div class='ctx'> 				return -ENOENT;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1742,8 +1735,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,</div><div class='ctx'> 				      DRV_NAME " fatal", hisi_hba);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"irq init: could not request fatal interrupt %d, rc=%d\n",</div><div class='add'>+			dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",</div><div class='ctx'> 				irq, rc);</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1823,6 +1815,7 @@ static struct scsi_host_template sht_v1_hw = {</div><div class='ctx'> 	.target_destroy		= sas_target_destroy,</div><div class='ctx'> 	.ioctl			= sas_ioctl,</div><div class='ctx'> 	.shost_attrs		= host_attrs_v1_hw,</div><div class='add'>+	.host_reset             = hisi_sas_host_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw hisi_sas_v1_hw = {</div><div class='head'>diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c<br/>index 89160ab3efb0..d4650bed8274 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_v2_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/hisi_sas/hisi_sas_v2_hw.c</a></div><div class='hunk'>@@ -1546,14 +1546,14 @@ static void phy_hard_reset_v2_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='ctx'> 	struct hisi_sas_phy *phy = &amp;hisi_hba-&gt;phy[phy_no];</div><div class='ctx'> 	u32 txid_auto;</div><div class='ctx'> </div><div class='del'>-	disable_phy_v2_hw(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> 	if (phy-&gt;identify.device_type == SAS_END_DEVICE) {</div><div class='ctx'> 		txid_auto = hisi_sas_phy_read32(hisi_hba, phy_no, TXID_AUTO);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, phy_no, TXID_AUTO,</div><div class='ctx'> 					txid_auto | TX_HARDRST_MSK);</div><div class='ctx'> 	}</div><div class='ctx'> 	msleep(100);</div><div class='del'>-	start_phy_v2_hw(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void phy_get_events_v2_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='hunk'>@@ -1586,7 +1586,7 @@ static void phys_init_v2_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		if (!sas_phy-&gt;phy-&gt;enabled)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		start_phy_v2_hw(hisi_hba, i);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, i, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2423,14 +2423,12 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)</div><div class='ctx'> 			slot_err_v2_hw(hisi_hba, task, slot, 2);</div><div class='ctx'> </div><div class='ctx'> 		if (ts-&gt;stat != SAS_DATA_UNDERRUN)</div><div class='del'>-			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "</div><div class='del'>-				"CQ hdr: 0x%x 0x%x 0x%x 0x%x "</div><div class='del'>-				"Error info: 0x%x 0x%x 0x%x 0x%x\n",</div><div class='del'>-				slot-&gt;idx, task, sas_dev-&gt;device_id,</div><div class='del'>-				complete_hdr-&gt;dw0, complete_hdr-&gt;dw1,</div><div class='del'>-				complete_hdr-&gt;act, complete_hdr-&gt;dw3,</div><div class='del'>-				error_info[0], error_info[1],</div><div class='del'>-				error_info[2], error_info[3]);</div><div class='add'>+			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n",</div><div class='add'>+				 slot-&gt;idx, task, sas_dev-&gt;device_id,</div><div class='add'>+				 complete_hdr-&gt;dw0, complete_hdr-&gt;dw1,</div><div class='add'>+				 complete_hdr-&gt;act, complete_hdr-&gt;dw3,</div><div class='add'>+				 error_info[0], error_info[1],</div><div class='add'>+				 error_info[2], error_info[3]);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(slot-&gt;abort))</div><div class='ctx'> 			return ts-&gt;stat;</div><div class='hunk'>@@ -2502,7 +2500,7 @@ out:</div><div class='ctx'> 		spin_lock_irqsave(&amp;device-&gt;done_lock, flags);</div><div class='ctx'> 		if (test_bit(SAS_HA_FROZEN, &amp;ha-&gt;state)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;device-&gt;done_lock, flags);</div><div class='del'>-			dev_info(dev, "slot complete: task(%p) ignored\n ",</div><div class='add'>+			dev_info(dev, "slot complete: task(%p) ignored\n",</div><div class='ctx'> 				 task);</div><div class='ctx'> 			return sts;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2935,7 +2933,7 @@ static irqreturn_t int_chnl_int_v2_hw(int irq_no, void *p)</div><div class='ctx'> </div><div class='ctx'> 			if (irq_value2 &amp; BIT(CHL_INT2_SL_IDAF_TOUT_CONF_OFF)) {</div><div class='ctx'> 				dev_warn(dev, "phy%d identify timeout\n",</div><div class='del'>-						phy_no);</div><div class='add'>+					 phy_no);</div><div class='ctx'> 				hisi_sas_notify_phy_event(phy,</div><div class='ctx'> 						HISI_PHYE_LINK_RESET);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3036,7 +3034,7 @@ static const struct hisi_sas_hw_error axi_error[] = {</div><div class='ctx'> 	{ .msk = BIT(5), .msg = "SATA_AXI_R_ERR" },</div><div class='ctx'> 	{ .msk = BIT(6), .msg = "DQE_AXI_R_ERR" },</div><div class='ctx'> 	{ .msk = BIT(7), .msg = "CQE_AXI_W_ERR" },</div><div class='del'>-	{},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw_error fifo_error[] = {</div><div class='hunk'>@@ -3045,7 +3043,7 @@ static const struct hisi_sas_hw_error fifo_error[] = {</div><div class='ctx'> 	{ .msk = BIT(10), .msg = "GETDQE_FIFO" },</div><div class='ctx'> 	{ .msk = BIT(11), .msg = "CMDP_FIFO" },</div><div class='ctx'> 	{ .msk = BIT(12), .msg = "AWTCTRL_FIFO" },</div><div class='del'>-	{},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw_error fatal_axi_errors[] = {</div><div class='hunk'>@@ -3109,12 +3107,12 @@ static irqreturn_t fatal_axi_int_v2_hw(int irq_no, void *p)</div><div class='ctx'> 				if (!(err_value &amp; sub-&gt;msk))</div><div class='ctx'> 					continue;</div><div class='ctx'> 				dev_err(dev, "%s (0x%x) found!\n",</div><div class='del'>-					 sub-&gt;msg, irq_value);</div><div class='add'>+					sub-&gt;msg, irq_value);</div><div class='ctx'> 				queue_work(hisi_hba-&gt;wq, &amp;hisi_hba-&gt;rst_work);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_err(dev, "%s (0x%x) found!\n",</div><div class='del'>-				 axi_error-&gt;msg, irq_value);</div><div class='add'>+				axi_error-&gt;msg, irq_value);</div><div class='ctx'> 			queue_work(hisi_hba-&gt;wq, &amp;hisi_hba-&gt;rst_work);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3258,7 +3256,7 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p)</div><div class='ctx'> 	/* check ERR bit of Status Register */</div><div class='ctx'> 	if (fis-&gt;status &amp; ATA_ERR) {</div><div class='ctx'> 		dev_warn(dev, "sata int: phy%d FIS status: 0x%x\n", phy_no,</div><div class='del'>-				fis-&gt;status);</div><div class='add'>+			 fis-&gt;status);</div><div class='ctx'> 		hisi_sas_notify_phy_event(phy, HISI_PHYE_LINK_RESET);</div><div class='ctx'> 		res = IRQ_NONE;</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -3349,8 +3347,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		rc = devm_request_irq(dev, irq, phy_interrupts[i], 0,</div><div class='ctx'> 				      DRV_NAME " phy", hisi_hba);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_err(dev, "irq init: could not request "</div><div class='del'>-				"phy interrupt %d, rc=%d\n",</div><div class='add'>+			dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",</div><div class='ctx'> 				irq, rc);</div><div class='ctx'> 			rc = -ENOENT;</div><div class='ctx'> 			goto free_phy_int_irqs;</div><div class='hunk'>@@ -3364,8 +3361,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		rc = devm_request_irq(dev, irq, sata_int_v2_hw, 0,</div><div class='ctx'> 				      DRV_NAME " sata", phy);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_err(dev, "irq init: could not request "</div><div class='del'>-				"sata interrupt %d, rc=%d\n",</div><div class='add'>+			dev_err(dev, "irq init: could not request sata interrupt %d, rc=%d\n",</div><div class='ctx'> 				irq, rc);</div><div class='ctx'> 			rc = -ENOENT;</div><div class='ctx'> 			goto free_sata_int_irqs;</div><div class='hunk'>@@ -3377,8 +3373,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		rc = devm_request_irq(dev, irq, fatal_interrupts[fatal_no], 0,</div><div class='ctx'> 				      DRV_NAME " fatal", hisi_hba);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"irq init: could not request fatal interrupt %d, rc=%d\n",</div><div class='add'>+			dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",</div><div class='ctx'> 				irq, rc);</div><div class='ctx'> 			rc = -ENOENT;</div><div class='ctx'> 			goto free_fatal_int_irqs;</div><div class='hunk'>@@ -3393,8 +3388,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		rc = devm_request_irq(dev, irq, cq_interrupt_v2_hw, 0,</div><div class='ctx'> 				      DRV_NAME " cq", cq);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"irq init: could not request cq interrupt %d, rc=%d\n",</div><div class='add'>+			dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",</div><div class='ctx'> 				irq, rc);</div><div class='ctx'> 			rc = -ENOENT;</div><div class='ctx'> 			goto free_cq_int_irqs;</div><div class='hunk'>@@ -3546,7 +3540,7 @@ static int write_gpio_v2_hw(struct hisi_hba *hisi_hba, u8 reg_type,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(dev, "write gpio: unsupported or bad reg type %d\n",</div><div class='del'>-				reg_type);</div><div class='add'>+			reg_type);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3599,6 +3593,7 @@ static struct scsi_host_template sht_v2_hw = {</div><div class='ctx'> 	.target_destroy		= sas_target_destroy,</div><div class='ctx'> 	.ioctl			= sas_ioctl,</div><div class='ctx'> 	.shost_attrs		= host_attrs_v2_hw,</div><div class='add'>+	.host_reset		= hisi_sas_host_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw hisi_sas_v2_hw = {</div><div class='head'>diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c<br/>index 086695a4099f..49620c2411df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hisi_sas/hisi_sas_v3_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/hisi_sas/hisi_sas_v3_hw.c</a></div><div class='hunk'>@@ -52,7 +52,36 @@</div><div class='ctx'> #define CFG_ABT_SET_IPTT_DONE	0xd8</div><div class='ctx'> #define CFG_ABT_SET_IPTT_DONE_OFF	0</div><div class='ctx'> #define HGC_IOMB_PROC1_STATUS	0x104</div><div class='add'>+#define HGC_LM_DFX_STATUS2		0x128</div><div class='add'>+#define HGC_LM_DFX_STATUS2_IOSTLIST_OFF		0</div><div class='add'>+#define HGC_LM_DFX_STATUS2_IOSTLIST_MSK	(0xfff &lt;&lt; \</div><div class='add'>+					 HGC_LM_DFX_STATUS2_IOSTLIST_OFF)</div><div class='add'>+#define HGC_LM_DFX_STATUS2_ITCTLIST_OFF		12</div><div class='add'>+#define HGC_LM_DFX_STATUS2_ITCTLIST_MSK	(0x7ff &lt;&lt; \</div><div class='add'>+					 HGC_LM_DFX_STATUS2_ITCTLIST_OFF)</div><div class='add'>+#define HGC_CQE_ECC_ADDR		0x13c</div><div class='add'>+#define HGC_CQE_ECC_1B_ADDR_OFF	0</div><div class='add'>+#define HGC_CQE_ECC_1B_ADDR_MSK	(0x3f &lt;&lt; HGC_CQE_ECC_1B_ADDR_OFF)</div><div class='add'>+#define HGC_CQE_ECC_MB_ADDR_OFF	8</div><div class='add'>+#define HGC_CQE_ECC_MB_ADDR_MSK (0x3f &lt;&lt; HGC_CQE_ECC_MB_ADDR_OFF)</div><div class='add'>+#define HGC_IOST_ECC_ADDR		0x140</div><div class='add'>+#define HGC_IOST_ECC_1B_ADDR_OFF	0</div><div class='add'>+#define HGC_IOST_ECC_1B_ADDR_MSK	(0x3ff &lt;&lt; HGC_IOST_ECC_1B_ADDR_OFF)</div><div class='add'>+#define HGC_IOST_ECC_MB_ADDR_OFF	16</div><div class='add'>+#define HGC_IOST_ECC_MB_ADDR_MSK	(0x3ff &lt;&lt; HGC_IOST_ECC_MB_ADDR_OFF)</div><div class='add'>+#define HGC_DQE_ECC_ADDR		0x144</div><div class='add'>+#define HGC_DQE_ECC_1B_ADDR_OFF	0</div><div class='add'>+#define HGC_DQE_ECC_1B_ADDR_MSK	(0xfff &lt;&lt; HGC_DQE_ECC_1B_ADDR_OFF)</div><div class='add'>+#define HGC_DQE_ECC_MB_ADDR_OFF	16</div><div class='add'>+#define HGC_DQE_ECC_MB_ADDR_MSK (0xfff &lt;&lt; HGC_DQE_ECC_MB_ADDR_OFF)</div><div class='ctx'> #define CHNL_INT_STATUS			0x148</div><div class='add'>+#define HGC_ITCT_ECC_ADDR		0x150</div><div class='add'>+#define HGC_ITCT_ECC_1B_ADDR_OFF		0</div><div class='add'>+#define HGC_ITCT_ECC_1B_ADDR_MSK		(0x3ff &lt;&lt; \</div><div class='add'>+						 HGC_ITCT_ECC_1B_ADDR_OFF)</div><div class='add'>+#define HGC_ITCT_ECC_MB_ADDR_OFF		16</div><div class='add'>+#define HGC_ITCT_ECC_MB_ADDR_MSK		(0x3ff &lt;&lt; \</div><div class='add'>+						 HGC_ITCT_ECC_MB_ADDR_OFF)</div><div class='ctx'> #define HGC_AXI_FIFO_ERR_INFO  0x154</div><div class='ctx'> #define AXI_ERR_INFO_OFF               0</div><div class='ctx'> #define AXI_ERR_INFO_MSK               (0xff &lt;&lt; AXI_ERR_INFO_OFF)</div><div class='hunk'>@@ -81,6 +110,10 @@</div><div class='ctx'> #define ENT_INT_SRC3_ITC_INT_OFF	15</div><div class='ctx'> #define ENT_INT_SRC3_ITC_INT_MSK	(0x1 &lt;&lt; ENT_INT_SRC3_ITC_INT_OFF)</div><div class='ctx'> #define ENT_INT_SRC3_ABT_OFF		16</div><div class='add'>+#define ENT_INT_SRC3_DQE_POISON_OFF	18</div><div class='add'>+#define ENT_INT_SRC3_IOST_POISON_OFF	19</div><div class='add'>+#define ENT_INT_SRC3_ITCT_POISON_OFF	20</div><div class='add'>+#define ENT_INT_SRC3_ITCT_NCQ_POISON_OFF	21</div><div class='ctx'> #define ENT_INT_SRC_MSK1		0x1c4</div><div class='ctx'> #define ENT_INT_SRC_MSK2		0x1c8</div><div class='ctx'> #define ENT_INT_SRC_MSK3		0x1cc</div><div class='hunk'>@@ -90,6 +123,28 @@</div><div class='ctx'> #define HGC_COM_INT_MSK				0x1d8</div><div class='ctx'> #define ENT_INT_SRC_MSK3_ENT95_MSK_MSK	(0x1 &lt;&lt; ENT_INT_SRC_MSK3_ENT95_MSK_OFF)</div><div class='ctx'> #define SAS_ECC_INTR			0x1e8</div><div class='add'>+#define SAS_ECC_INTR_DQE_ECC_1B_OFF		0</div><div class='add'>+#define SAS_ECC_INTR_DQE_ECC_MB_OFF		1</div><div class='add'>+#define SAS_ECC_INTR_IOST_ECC_1B_OFF	2</div><div class='add'>+#define SAS_ECC_INTR_IOST_ECC_MB_OFF	3</div><div class='add'>+#define SAS_ECC_INTR_ITCT_ECC_1B_OFF	4</div><div class='add'>+#define SAS_ECC_INTR_ITCT_ECC_MB_OFF	5</div><div class='add'>+#define SAS_ECC_INTR_ITCTLIST_ECC_1B_OFF	6</div><div class='add'>+#define SAS_ECC_INTR_ITCTLIST_ECC_MB_OFF	7</div><div class='add'>+#define SAS_ECC_INTR_IOSTLIST_ECC_1B_OFF	8</div><div class='add'>+#define SAS_ECC_INTR_IOSTLIST_ECC_MB_OFF	9</div><div class='add'>+#define SAS_ECC_INTR_CQE_ECC_1B_OFF		10</div><div class='add'>+#define SAS_ECC_INTR_CQE_ECC_MB_OFF		11</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM0_ECC_1B_OFF	12</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM0_ECC_MB_OFF	13</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM1_ECC_1B_OFF	14</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM1_ECC_MB_OFF	15</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM2_ECC_1B_OFF	16</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM2_ECC_MB_OFF	17</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM3_ECC_1B_OFF	18</div><div class='add'>+#define SAS_ECC_INTR_NCQ_MEM3_ECC_MB_OFF	19</div><div class='add'>+#define SAS_ECC_INTR_OOO_RAM_ECC_1B_OFF		20</div><div class='add'>+#define SAS_ECC_INTR_OOO_RAM_ECC_MB_OFF		21</div><div class='ctx'> #define SAS_ECC_INTR_MSK		0x1ec</div><div class='ctx'> #define HGC_ERR_STAT_EN			0x238</div><div class='ctx'> #define CQE_SEND_CNT			0x248</div><div class='hunk'>@@ -105,6 +160,20 @@</div><div class='ctx'> #define COMPL_Q_0_DEPTH			0x4e8</div><div class='ctx'> #define COMPL_Q_0_WR_PTR		0x4ec</div><div class='ctx'> #define COMPL_Q_0_RD_PTR		0x4f0</div><div class='add'>+#define HGC_RXM_DFX_STATUS14		0xae8</div><div class='add'>+#define HGC_RXM_DFX_STATUS14_MEM0_OFF	0</div><div class='add'>+#define HGC_RXM_DFX_STATUS14_MEM0_MSK	(0x1ff &lt;&lt; \</div><div class='add'>+					 HGC_RXM_DFX_STATUS14_MEM0_OFF)</div><div class='add'>+#define HGC_RXM_DFX_STATUS14_MEM1_OFF	9</div><div class='add'>+#define HGC_RXM_DFX_STATUS14_MEM1_MSK	(0x1ff &lt;&lt; \</div><div class='add'>+					 HGC_RXM_DFX_STATUS14_MEM1_OFF)</div><div class='add'>+#define HGC_RXM_DFX_STATUS14_MEM2_OFF	18</div><div class='add'>+#define HGC_RXM_DFX_STATUS14_MEM2_MSK	(0x1ff &lt;&lt; \</div><div class='add'>+					 HGC_RXM_DFX_STATUS14_MEM2_OFF)</div><div class='add'>+#define HGC_RXM_DFX_STATUS15		0xaec</div><div class='add'>+#define HGC_RXM_DFX_STATUS15_MEM3_OFF	0</div><div class='add'>+#define HGC_RXM_DFX_STATUS15_MEM3_MSK	(0x1ff &lt;&lt; \</div><div class='add'>+					 HGC_RXM_DFX_STATUS15_MEM3_OFF)</div><div class='ctx'> #define AWQOS_AWCACHE_CFG	0xc84</div><div class='ctx'> #define ARQOS_ARCACHE_CFG	0xc88</div><div class='ctx'> #define HILINK_ERR_DFX		0xe04</div><div class='hunk'>@@ -172,14 +241,18 @@</div><div class='ctx'> #define CHL_INT0_PHY_RDY_OFF		5</div><div class='ctx'> #define CHL_INT0_PHY_RDY_MSK		(0x1 &lt;&lt; CHL_INT0_PHY_RDY_OFF)</div><div class='ctx'> #define CHL_INT1			(PORT_BASE + 0x1b8)</div><div class='del'>-#define CHL_INT1_DMAC_TX_ECC_ERR_OFF	15</div><div class='del'>-#define CHL_INT1_DMAC_TX_ECC_ERR_MSK	(0x1 &lt;&lt; CHL_INT1_DMAC_TX_ECC_ERR_OFF)</div><div class='del'>-#define CHL_INT1_DMAC_RX_ECC_ERR_OFF	17</div><div class='del'>-#define CHL_INT1_DMAC_RX_ECC_ERR_MSK	(0x1 &lt;&lt; CHL_INT1_DMAC_RX_ECC_ERR_OFF)</div><div class='add'>+#define CHL_INT1_DMAC_TX_ECC_MB_ERR_OFF	15</div><div class='add'>+#define CHL_INT1_DMAC_TX_ECC_1B_ERR_OFF	16</div><div class='add'>+#define CHL_INT1_DMAC_RX_ECC_MB_ERR_OFF	17</div><div class='add'>+#define CHL_INT1_DMAC_RX_ECC_1B_ERR_OFF	18</div><div class='ctx'> #define CHL_INT1_DMAC_TX_AXI_WR_ERR_OFF	19</div><div class='ctx'> #define CHL_INT1_DMAC_TX_AXI_RD_ERR_OFF	20</div><div class='ctx'> #define CHL_INT1_DMAC_RX_AXI_WR_ERR_OFF	21</div><div class='ctx'> #define CHL_INT1_DMAC_RX_AXI_RD_ERR_OFF	22</div><div class='add'>+#define CHL_INT1_DMAC_TX_FIFO_ERR_OFF	23</div><div class='add'>+#define CHL_INT1_DMAC_RX_FIFO_ERR_OFF	24</div><div class='add'>+#define CHL_INT1_DMAC_TX_AXI_RUSER_ERR_OFF	26</div><div class='add'>+#define CHL_INT1_DMAC_RX_AXI_RUSER_ERR_OFF	27</div><div class='ctx'> #define CHL_INT2			(PORT_BASE + 0x1bc)</div><div class='ctx'> #define CHL_INT2_SL_IDAF_TOUT_CONF_OFF	0</div><div class='ctx'> #define CHL_INT2_RX_DISP_ERR_OFF	28</div><div class='hunk'>@@ -227,10 +300,8 @@</div><div class='ctx'> #define AM_CFG_SINGLE_PORT_MAX_TRANS	(0x5014)</div><div class='ctx'> #define AXI_CFG					(0x5100)</div><div class='ctx'> #define AM_ROB_ECC_ERR_ADDR		(0x510c)</div><div class='del'>-#define AM_ROB_ECC_ONEBIT_ERR_ADDR_OFF	0</div><div class='del'>-#define AM_ROB_ECC_ONEBIT_ERR_ADDR_MSK	(0xff &lt;&lt; AM_ROB_ECC_ONEBIT_ERR_ADDR_OFF)</div><div class='del'>-#define AM_ROB_ECC_MULBIT_ERR_ADDR_OFF	8</div><div class='del'>-#define AM_ROB_ECC_MULBIT_ERR_ADDR_MSK	(0xff &lt;&lt; AM_ROB_ECC_MULBIT_ERR_ADDR_OFF)</div><div class='add'>+#define AM_ROB_ECC_ERR_ADDR_OFF	0</div><div class='add'>+#define AM_ROB_ECC_ERR_ADDR_MSK	0xffffffff</div><div class='ctx'> </div><div class='ctx'> /* RAS registers need init */</div><div class='ctx'> #define RAS_BASE		(0x6000)</div><div class='hunk'>@@ -408,6 +479,10 @@ struct hisi_sas_err_record_v3 {</div><div class='ctx'> #define BASE_VECTORS_V3_HW  16</div><div class='ctx'> #define MIN_AFFINE_VECTORS_V3_HW  (BASE_VECTORS_V3_HW + 1)</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	DSM_FUNC_ERR_HANDLE_MSI = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static bool hisi_sas_intr_conv;</div><div class='ctx'> MODULE_PARM_DESC(intr_conv, "interrupt converge enable (0-1)");</div><div class='ctx'> </div><div class='hunk'>@@ -474,7 +549,6 @@ static u32 hisi_sas_phy_read32(struct hisi_hba *hisi_hba,</div><div class='ctx'> </div><div class='ctx'> static void init_reg_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = hisi_hba-&gt;pci_dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Global registers init */</div><div class='hunk'>@@ -494,14 +568,11 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, ENT_INT_SRC3, 0xffffffff);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK1, 0xfefefefe);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK2, 0xfefefefe);</div><div class='del'>-	if (pdev-&gt;revision &gt;= 0x21)</div><div class='del'>-		hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK3, 0xffff7aff);</div><div class='del'>-	else</div><div class='del'>-		hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK3, 0xfffe20ff);</div><div class='add'>+	hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK3, 0xffc220ff);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, CHNL_PHYUPDOWN_INT_MSK, 0x0);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, CHNL_ENT_INT_MSK, 0x0);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, HGC_COM_INT_MSK, 0x0);</div><div class='del'>-	hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, 0x0);</div><div class='add'>+	hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, 0x155555);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, AWQOS_AWCACHE_CFG, 0xf0f0);</div><div class='ctx'> 	hisi_sas_write32(hisi_hba, ARQOS_ARCACHE_CFG, 0xf0f0);</div><div class='ctx'> 	for (i = 0; i &lt; hisi_hba-&gt;queue_count; i++)</div><div class='hunk'>@@ -532,12 +603,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, CHL_INT1, 0xffffffff);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, CHL_INT2, 0xffffffff);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, RXOP_CHECK_CFG_H, 0x1000);</div><div class='del'>-		if (pdev-&gt;revision &gt;= 0x21)</div><div class='del'>-			hisi_sas_phy_write32(hisi_hba, i, CHL_INT1_MSK,</div><div class='del'>-					0xffffffff);</div><div class='del'>-		else</div><div class='del'>-			hisi_sas_phy_write32(hisi_hba, i, CHL_INT1_MSK,</div><div class='del'>-					0xff87ffff);</div><div class='add'>+		hisi_sas_phy_write32(hisi_hba, i, CHL_INT1_MSK, 0xf2057fff);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, CHL_INT2_MSK, 0xffffbfe);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, PHY_CTRL_RDY_MSK, 0x0);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, i, PHYCTRL_NOT_RDY_MSK, 0x0);</div><div class='hunk'>@@ -804,6 +870,8 @@ static int reset_hw_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> static int hw_init_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = hisi_hba-&gt;dev;</div><div class='add'>+	union acpi_object *obj;</div><div class='add'>+	guid_t guid;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = reset_hw_v3_hw(hisi_hba);</div><div class='hunk'>@@ -815,6 +883,19 @@ static int hw_init_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> 	init_reg_v3_hw(hisi_hba);</div><div class='ctx'> </div><div class='add'>+	if (guid_parse("D5918B4B-37AE-4E10-A99F-E5E8A6EF4C1F", &amp;guid)) {</div><div class='add'>+		dev_err(dev, "Parse GUID failed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Switch over to MSI handling , from PCI AER default */</div><div class='add'>+	obj = acpi_evaluate_dsm(ACPI_HANDLE(dev), &amp;guid, 0,</div><div class='add'>+				DSM_FUNC_ERR_HANDLE_MSI, NULL);</div><div class='add'>+	if (!obj)</div><div class='add'>+		dev_warn(dev, "Switch over to MSI handling failed\n");</div><div class='add'>+	else</div><div class='add'>+		ACPI_FREE(obj);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -856,14 +937,14 @@ static void phy_hard_reset_v3_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='ctx'> 	struct hisi_sas_phy *phy = &amp;hisi_hba-&gt;phy[phy_no];</div><div class='ctx'> 	u32 txid_auto;</div><div class='ctx'> </div><div class='del'>-	disable_phy_v3_hw(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 0);</div><div class='ctx'> 	if (phy-&gt;identify.device_type == SAS_END_DEVICE) {</div><div class='ctx'> 		txid_auto = hisi_sas_phy_read32(hisi_hba, phy_no, TXID_AUTO);</div><div class='ctx'> 		hisi_sas_phy_write32(hisi_hba, phy_no, TXID_AUTO,</div><div class='ctx'> 					txid_auto | TX_HARDRST_MSK);</div><div class='ctx'> 	}</div><div class='ctx'> 	msleep(100);</div><div class='del'>-	start_phy_v3_hw(hisi_hba, phy_no);</div><div class='add'>+	hisi_sas_phy_enable(hisi_hba, phy_no, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum sas_linkrate phy_get_max_linkrate_v3_hw(void)</div><div class='hunk'>@@ -882,7 +963,7 @@ static void phys_init_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 		if (!sas_phy-&gt;phy-&gt;enabled)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		start_phy_v3_hw(hisi_hba, i);</div><div class='add'>+		hisi_sas_phy_enable(hisi_hba, i, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -929,7 +1010,7 @@ get_free_slot_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_dq *dq)</div><div class='ctx'> 				DLVRY_Q_0_RD_PTR + (queue * 0x14));</div><div class='ctx'> 	if (r == (w+1) % HISI_SAS_QUEUE_SLOTS) {</div><div class='ctx'> 		dev_warn(dev, "full queue=%d r=%d w=%d\n",</div><div class='del'>-				queue, r, w);</div><div class='add'>+			 queue, r, w);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1380,6 +1461,7 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)</div><div class='ctx'> 		struct hisi_sas_initial_fis *initial_fis;</div><div class='ctx'> 		struct dev_to_host_fis *fis;</div><div class='ctx'> 		u8 attached_sas_addr[SAS_ADDR_SIZE] = {0};</div><div class='add'>+		struct Scsi_Host *shost = hisi_hba-&gt;shost;</div><div class='ctx'> </div><div class='ctx'> 		dev_info(dev, "phyup: phy%d link_rate=%d(sata)\n", phy_no, link_rate);</div><div class='ctx'> 		initial_fis = &amp;hisi_hba-&gt;initial_fis[phy_no];</div><div class='hunk'>@@ -1396,6 +1478,7 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)</div><div class='ctx'> </div><div class='ctx'> 		sas_phy-&gt;oob_mode = SATA_OOB_MODE;</div><div class='ctx'> 		attached_sas_addr[0] = 0x50;</div><div class='add'>+		attached_sas_addr[6] = shost-&gt;host_no;</div><div class='ctx'> 		attached_sas_addr[7] = phy_no;</div><div class='ctx'> 		memcpy(sas_phy-&gt;attached_sas_addr,</div><div class='ctx'> 		       attached_sas_addr,</div><div class='hunk'>@@ -1540,6 +1623,14 @@ static irqreturn_t int_phy_up_down_bcast_v3_hw(int irq_no, void *p)</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw_error port_axi_error[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.irq_msk = BIT(CHL_INT1_DMAC_TX_ECC_MB_ERR_OFF),</div><div class='add'>+		.msg = "dmac_tx_ecc_bad_err",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(CHL_INT1_DMAC_RX_ECC_MB_ERR_OFF),</div><div class='add'>+		.msg = "dmac_rx_ecc_bad_err",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.irq_msk = BIT(CHL_INT1_DMAC_TX_AXI_WR_ERR_OFF),</div><div class='ctx'> 		.msg = "dma_tx_axi_wr_err",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1555,6 +1646,22 @@ static const struct hisi_sas_hw_error port_axi_error[] = {</div><div class='ctx'> 		.irq_msk = BIT(CHL_INT1_DMAC_RX_AXI_RD_ERR_OFF),</div><div class='ctx'> 		.msg = "dma_rx_axi_rd_err",</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(CHL_INT1_DMAC_TX_FIFO_ERR_OFF),</div><div class='add'>+		.msg = "dma_tx_fifo_err",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(CHL_INT1_DMAC_RX_FIFO_ERR_OFF),</div><div class='add'>+		.msg = "dma_rx_fifo_err",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(CHL_INT1_DMAC_TX_AXI_RUSER_ERR_OFF),</div><div class='add'>+		.msg = "dma_tx_axi_ruser_err",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(CHL_INT1_DMAC_RX_AXI_RUSER_ERR_OFF),</div><div class='add'>+		.msg = "dma_rx_axi_ruser_err",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void handle_chl_int1_v3_hw(struct hisi_hba *hisi_hba, int phy_no)</div><div class='hunk'>@@ -1719,6 +1826,121 @@ static irqreturn_t int_chnl_int_v3_hw(int irq_no, void *p)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct hisi_sas_hw_error multi_bit_ecc_errors[] = {</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_DQE_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_DQE_ECC_MB_ADDR_MSK,</div><div class='add'>+		.shift = HGC_DQE_ECC_MB_ADDR_OFF,</div><div class='add'>+		.msg = "hgc_dqe_eccbad_intr found: ram addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_DQE_ECC_ADDR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_IOST_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_IOST_ECC_MB_ADDR_MSK,</div><div class='add'>+		.shift = HGC_IOST_ECC_MB_ADDR_OFF,</div><div class='add'>+		.msg = "hgc_iost_eccbad_intr found: ram addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_IOST_ECC_ADDR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_ITCT_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_ITCT_ECC_MB_ADDR_MSK,</div><div class='add'>+		.shift = HGC_ITCT_ECC_MB_ADDR_OFF,</div><div class='add'>+		.msg = "hgc_itct_eccbad_intr found: ram addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_ITCT_ECC_ADDR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_IOSTLIST_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_LM_DFX_STATUS2_IOSTLIST_MSK,</div><div class='add'>+		.shift = HGC_LM_DFX_STATUS2_IOSTLIST_OFF,</div><div class='add'>+		.msg = "hgc_iostl_eccbad_intr found: mem addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_LM_DFX_STATUS2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_ITCTLIST_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_LM_DFX_STATUS2_ITCTLIST_MSK,</div><div class='add'>+		.shift = HGC_LM_DFX_STATUS2_ITCTLIST_OFF,</div><div class='add'>+		.msg = "hgc_itctl_eccbad_intr found: mem addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_LM_DFX_STATUS2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_CQE_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_CQE_ECC_MB_ADDR_MSK,</div><div class='add'>+		.shift = HGC_CQE_ECC_MB_ADDR_OFF,</div><div class='add'>+		.msg = "hgc_cqe_eccbad_intr found: ram address is 0x%08X\n",</div><div class='add'>+		.reg = HGC_CQE_ECC_ADDR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_NCQ_MEM0_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_RXM_DFX_STATUS14_MEM0_MSK,</div><div class='add'>+		.shift = HGC_RXM_DFX_STATUS14_MEM0_OFF,</div><div class='add'>+		.msg = "rxm_mem0_eccbad_intr found: mem addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_RXM_DFX_STATUS14,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_NCQ_MEM1_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_RXM_DFX_STATUS14_MEM1_MSK,</div><div class='add'>+		.shift = HGC_RXM_DFX_STATUS14_MEM1_OFF,</div><div class='add'>+		.msg = "rxm_mem1_eccbad_intr found: mem addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_RXM_DFX_STATUS14,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_NCQ_MEM2_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_RXM_DFX_STATUS14_MEM2_MSK,</div><div class='add'>+		.shift = HGC_RXM_DFX_STATUS14_MEM2_OFF,</div><div class='add'>+		.msg = "rxm_mem2_eccbad_intr found: mem addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_RXM_DFX_STATUS14,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_NCQ_MEM3_ECC_MB_OFF),</div><div class='add'>+		.msk = HGC_RXM_DFX_STATUS15_MEM3_MSK,</div><div class='add'>+		.shift = HGC_RXM_DFX_STATUS15_MEM3_OFF,</div><div class='add'>+		.msg = "rxm_mem3_eccbad_intr found: mem addr is 0x%08X\n",</div><div class='add'>+		.reg = HGC_RXM_DFX_STATUS15,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(SAS_ECC_INTR_OOO_RAM_ECC_MB_OFF),</div><div class='add'>+		.msk = AM_ROB_ECC_ERR_ADDR_MSK,</div><div class='add'>+		.shift = AM_ROB_ECC_ERR_ADDR_OFF,</div><div class='add'>+		.msg = "ooo_ram_eccbad_intr found: ROB_ECC_ERR_ADDR=0x%08X\n",</div><div class='add'>+		.reg = AM_ROB_ECC_ERR_ADDR,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void multi_bit_ecc_error_process_v3_hw(struct hisi_hba *hisi_hba,</div><div class='add'>+					      u32 irq_value)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = hisi_hba-&gt;dev;</div><div class='add'>+	const struct hisi_sas_hw_error *ecc_error;</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; ARRAY_SIZE(multi_bit_ecc_errors); i++) {</div><div class='add'>+		ecc_error = &amp;multi_bit_ecc_errors[i];</div><div class='add'>+		if (irq_value &amp; ecc_error-&gt;irq_msk) {</div><div class='add'>+			val = hisi_sas_read32(hisi_hba, ecc_error-&gt;reg);</div><div class='add'>+			val &amp;= ecc_error-&gt;msk;</div><div class='add'>+			val &gt;&gt;= ecc_error-&gt;shift;</div><div class='add'>+			dev_err(dev, ecc_error-&gt;msg, irq_value, val);</div><div class='add'>+			queue_work(hisi_hba-&gt;wq, &amp;hisi_hba-&gt;rst_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fatal_ecc_int_v3_hw(struct hisi_hba *hisi_hba)</div><div class='add'>+{</div><div class='add'>+	u32 irq_value, irq_msk;</div><div class='add'>+</div><div class='add'>+	irq_msk = hisi_sas_read32(hisi_hba, SAS_ECC_INTR_MSK);</div><div class='add'>+	hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, irq_msk | 0xffffffff);</div><div class='add'>+</div><div class='add'>+	irq_value = hisi_sas_read32(hisi_hba, SAS_ECC_INTR);</div><div class='add'>+	if (irq_value)</div><div class='add'>+		multi_bit_ecc_error_process_v3_hw(hisi_hba, irq_value);</div><div class='add'>+</div><div class='add'>+	hisi_sas_write32(hisi_hba, SAS_ECC_INTR, irq_value);</div><div class='add'>+	hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, irq_msk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct hisi_sas_hw_error axi_error[] = {</div><div class='ctx'> 	{ .msk = BIT(0), .msg = "IOST_AXI_W_ERR" },</div><div class='ctx'> 	{ .msk = BIT(1), .msg = "IOST_AXI_R_ERR" },</div><div class='hunk'>@@ -1728,7 +1950,7 @@ static const struct hisi_sas_hw_error axi_error[] = {</div><div class='ctx'> 	{ .msk = BIT(5), .msg = "SATA_AXI_R_ERR" },</div><div class='ctx'> 	{ .msk = BIT(6), .msg = "DQE_AXI_R_ERR" },</div><div class='ctx'> 	{ .msk = BIT(7), .msg = "CQE_AXI_W_ERR" },</div><div class='del'>-	{},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw_error fifo_error[] = {</div><div class='hunk'>@@ -1737,7 +1959,7 @@ static const struct hisi_sas_hw_error fifo_error[] = {</div><div class='ctx'> 	{ .msk = BIT(10), .msg = "GETDQE_FIFO" },</div><div class='ctx'> 	{ .msk = BIT(11), .msg = "CMDP_FIFO" },</div><div class='ctx'> 	{ .msk = BIT(12), .msg = "AWTCTRL_FIFO" },</div><div class='del'>-	{},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw_error fatal_axi_error[] = {</div><div class='hunk'>@@ -1771,6 +1993,23 @@ static const struct hisi_sas_hw_error fatal_axi_error[] = {</div><div class='ctx'> 		.irq_msk = BIT(ENT_INT_SRC3_ABT_OFF),</div><div class='ctx'> 		.msg = "SAS_HGC_ABT fetch LM list",</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(ENT_INT_SRC3_DQE_POISON_OFF),</div><div class='add'>+		.msg = "read dqe poison",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(ENT_INT_SRC3_IOST_POISON_OFF),</div><div class='add'>+		.msg = "read iost poison",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(ENT_INT_SRC3_ITCT_POISON_OFF),</div><div class='add'>+		.msg = "read itct poison",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.irq_msk = BIT(ENT_INT_SRC3_ITCT_NCQ_POISON_OFF),</div><div class='add'>+		.msg = "read itct ncq poison",</div><div class='add'>+	},</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t fatal_axi_int_v3_hw(int irq_no, void *p)</div><div class='hunk'>@@ -1823,6 +2062,8 @@ static irqreturn_t fatal_axi_int_v3_hw(int irq_no, void *p)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fatal_ecc_int_v3_hw(hisi_hba);</div><div class='add'>+</div><div class='ctx'> 	if (irq_value &amp; BIT(ENT_INT_SRC3_ITC_INT_OFF)) {</div><div class='ctx'> 		u32 reg_val = hisi_sas_read32(hisi_hba, ITCT_CLR);</div><div class='ctx'> 		u32 dev_id = reg_val &amp; ITCT_DEV_MSK;</div><div class='hunk'>@@ -1966,13 +2207,11 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)</div><div class='ctx'> </div><div class='ctx'> 		slot_err_v3_hw(hisi_hba, task, slot);</div><div class='ctx'> 		if (ts-&gt;stat != SAS_DATA_UNDERRUN)</div><div class='del'>-			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "</div><div class='del'>-				"CQ hdr: 0x%x 0x%x 0x%x 0x%x "</div><div class='del'>-				"Error info: 0x%x 0x%x 0x%x 0x%x\n",</div><div class='del'>-				slot-&gt;idx, task, sas_dev-&gt;device_id,</div><div class='del'>-				dw0, dw1, complete_hdr-&gt;act, dw3,</div><div class='del'>-				error_info[0], error_info[1],</div><div class='del'>-				error_info[2], error_info[3]);</div><div class='add'>+			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n",</div><div class='add'>+				 slot-&gt;idx, task, sas_dev-&gt;device_id,</div><div class='add'>+				 dw0, dw1, complete_hdr-&gt;act, dw3,</div><div class='add'>+				 error_info[0], error_info[1],</div><div class='add'>+				 error_info[2], error_info[3]);</div><div class='ctx'> 		if (unlikely(slot-&gt;abort))</div><div class='ctx'> 			return ts-&gt;stat;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2205,8 +2444,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)</div><div class='ctx'> 				      cq_interrupt_v3_hw, irqflags,</div><div class='ctx'> 				      DRV_NAME " cq", cq);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			dev_err(dev,</div><div class='del'>-				"could not request cq%d interrupt, rc=%d\n",</div><div class='add'>+			dev_err(dev, "could not request cq%d interrupt, rc=%d\n",</div><div class='ctx'> 				i, rc);</div><div class='ctx'> 			rc = -ENOENT;</div><div class='ctx'> 			goto free_cq_irqs;</div><div class='hunk'>@@ -2362,7 +2600,7 @@ static int write_gpio_v3_hw(struct hisi_hba *hisi_hba, u8 reg_type,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(dev, "write gpio: unsupported or bad reg type %d\n",</div><div class='del'>-				reg_type);</div><div class='add'>+			reg_type);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2678,6 +2916,7 @@ static struct scsi_host_template sht_v3_hw = {</div><div class='ctx'> 	.ioctl			= sas_ioctl,</div><div class='ctx'> 	.shost_attrs		= host_attrs_v3_hw,</div><div class='ctx'> 	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,</div><div class='add'>+	.host_reset             = hisi_sas_host_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct hisi_sas_hw hisi_sas_v3_hw = {</div><div class='hunk'>@@ -2800,7 +3039,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	hisi_hba-&gt;regs = pcim_iomap(pdev, 5, 0);</div><div class='ctx'> 	if (!hisi_hba-&gt;regs) {</div><div class='del'>-		dev_err(dev, "cannot map register.\n");</div><div class='add'>+		dev_err(dev, "cannot map register\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_out_ha;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2921,161 +3160,6 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev)</div><div class='ctx'> 	scsi_host_put(shost);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct hisi_sas_hw_error sas_ras_intr0_nfe[] = {</div><div class='del'>-	{ .irq_msk = BIT(19), .msg = "HILINK_INT" },</div><div class='del'>-	{ .irq_msk = BIT(20), .msg = "HILINK_PLL0_OUT_OF_LOCK" },</div><div class='del'>-	{ .irq_msk = BIT(21), .msg = "HILINK_PLL1_OUT_OF_LOCK" },</div><div class='del'>-	{ .irq_msk = BIT(22), .msg = "HILINK_LOSS_OF_REFCLK0" },</div><div class='del'>-	{ .irq_msk = BIT(23), .msg = "HILINK_LOSS_OF_REFCLK1" },</div><div class='del'>-	{ .irq_msk = BIT(24), .msg = "DMAC0_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(25), .msg = "DMAC1_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(26), .msg = "DMAC2_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(27), .msg = "DMAC3_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(28), .msg = "DMAC4_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(29), .msg = "DMAC5_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(30), .msg = "DMAC6_TX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(31), .msg = "DMAC7_TX_POISON" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hisi_sas_hw_error sas_ras_intr1_nfe[] = {</div><div class='del'>-	{ .irq_msk = BIT(0), .msg = "RXM_CFG_MEM3_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(1), .msg = "RXM_CFG_MEM2_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(2), .msg = "RXM_CFG_MEM1_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(3), .msg = "RXM_CFG_MEM0_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(4), .msg = "HGC_CQE_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(5), .msg = "LM_CFG_IOSTL_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(6), .msg = "LM_CFG_ITCTL_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(7), .msg = "HGC_ITCT_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(8), .msg = "HGC_IOST_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(9), .msg = "HGC_DQE_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(10), .msg = "DMAC0_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(11), .msg = "DMAC1_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(12), .msg = "DMAC2_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(13), .msg = "DMAC3_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(14), .msg = "DMAC4_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(15), .msg = "DMAC5_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(16), .msg = "DMAC6_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(17), .msg = "DMAC7_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(18), .msg = "OOO_RAM_ECC2B_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(20), .msg = "HGC_DQE_POISON_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(21), .msg = "HGC_IOST_POISON_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(22), .msg = "HGC_ITCT_POISON_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(23), .msg = "HGC_ITCT_NCQ_POISON_INTR" },</div><div class='del'>-	{ .irq_msk = BIT(24), .msg = "DMAC0_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(25), .msg = "DMAC1_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(26), .msg = "DMAC2_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(27), .msg = "DMAC3_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(28), .msg = "DMAC4_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(29), .msg = "DMAC5_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(30), .msg = "DMAC6_RX_POISON" },</div><div class='del'>-	{ .irq_msk = BIT(31), .msg = "DMAC7_RX_POISON" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hisi_sas_hw_error sas_ras_intr2_nfe[] = {</div><div class='del'>-	{ .irq_msk = BIT(0), .msg = "DMAC0_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(1), .msg = "DMAC1_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(2), .msg = "DMAC2_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(3), .msg = "DMAC3_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(4), .msg = "DMAC4_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(5), .msg = "DMAC5_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(6), .msg = "DMAC6_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(7), .msg = "DMAC7_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(8), .msg = "DMAC0_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(9), .msg = "DMAC1_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(10), .msg = "DMAC2_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(11), .msg = "DMAC3_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(12), .msg = "DMAC4_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(13), .msg = "DMAC5_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(14), .msg = "DMAC6_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(15), .msg = "DMAC7_FIFO_OMIT_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(16), .msg = "HGC_RLSE_SLOT_UNMATCH" },</div><div class='del'>-	{ .irq_msk = BIT(17), .msg = "HGC_LM_ADD_FCH_LIST_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(18), .msg = "HGC_AXI_BUS_ERR" },</div><div class='del'>-	{ .irq_msk = BIT(19), .msg = "HGC_FIFO_OMIT_ERR" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool process_non_fatal_error_v3_hw(struct hisi_hba *hisi_hba)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = hisi_hba-&gt;dev;</div><div class='del'>-	const struct hisi_sas_hw_error *ras_error;</div><div class='del'>-	bool need_reset = false;</div><div class='del'>-	u32 irq_value;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	irq_value = hisi_sas_read32(hisi_hba, SAS_RAS_INTR0);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(sas_ras_intr0_nfe); i++) {</div><div class='del'>-		ras_error = &amp;sas_ras_intr0_nfe[i];</div><div class='del'>-		if (ras_error-&gt;irq_msk &amp; irq_value) {</div><div class='del'>-			dev_warn(dev, "SAS_RAS_INTR0: %s(irq_value=0x%x) found.\n",</div><div class='del'>-					ras_error-&gt;msg, irq_value);</div><div class='del'>-			need_reset = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	hisi_sas_write32(hisi_hba, SAS_RAS_INTR0, irq_value);</div><div class='del'>-</div><div class='del'>-	irq_value = hisi_sas_read32(hisi_hba, SAS_RAS_INTR1);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(sas_ras_intr1_nfe); i++) {</div><div class='del'>-		ras_error = &amp;sas_ras_intr1_nfe[i];</div><div class='del'>-		if (ras_error-&gt;irq_msk &amp; irq_value) {</div><div class='del'>-			dev_warn(dev, "SAS_RAS_INTR1: %s(irq_value=0x%x) found.\n",</div><div class='del'>-					ras_error-&gt;msg, irq_value);</div><div class='del'>-			need_reset = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	hisi_sas_write32(hisi_hba, SAS_RAS_INTR1, irq_value);</div><div class='del'>-</div><div class='del'>-	irq_value = hisi_sas_read32(hisi_hba, SAS_RAS_INTR2);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(sas_ras_intr2_nfe); i++) {</div><div class='del'>-		ras_error = &amp;sas_ras_intr2_nfe[i];</div><div class='del'>-		if (ras_error-&gt;irq_msk &amp; irq_value) {</div><div class='del'>-			dev_warn(dev, "SAS_RAS_INTR2: %s(irq_value=0x%x) found.\n",</div><div class='del'>-					ras_error-&gt;msg, irq_value);</div><div class='del'>-			need_reset = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	hisi_sas_write32(hisi_hba, SAS_RAS_INTR2, irq_value);</div><div class='del'>-</div><div class='del'>-	return need_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static pci_ers_result_t hisi_sas_error_detected_v3_hw(struct pci_dev *pdev,</div><div class='del'>-		pci_channel_state_t state)</div><div class='del'>-{</div><div class='del'>-	struct sas_ha_struct *sha = pci_get_drvdata(pdev);</div><div class='del'>-	struct hisi_hba *hisi_hba = sha-&gt;lldd_ha;</div><div class='del'>-	struct device *dev = hisi_hba-&gt;dev;</div><div class='del'>-</div><div class='del'>-	dev_info(dev, "PCI error: detected callback, state(%d)!!\n", state);</div><div class='del'>-	if (state == pci_channel_io_perm_failure)</div><div class='del'>-		return PCI_ERS_RESULT_DISCONNECT;</div><div class='del'>-</div><div class='del'>-	if (process_non_fatal_error_v3_hw(hisi_hba))</div><div class='del'>-		return PCI_ERS_RESULT_NEED_RESET;</div><div class='del'>-</div><div class='del'>-	return PCI_ERS_RESULT_CAN_RECOVER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static pci_ers_result_t hisi_sas_mmio_enabled_v3_hw(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	return PCI_ERS_RESULT_RECOVERED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static pci_ers_result_t hisi_sas_slot_reset_v3_hw(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct sas_ha_struct *sha = pci_get_drvdata(pdev);</div><div class='del'>-	struct hisi_hba *hisi_hba = sha-&gt;lldd_ha;</div><div class='del'>-	struct device *dev = hisi_hba-&gt;dev;</div><div class='del'>-	HISI_SAS_DECLARE_RST_WORK_ON_STACK(r);</div><div class='del'>-</div><div class='del'>-	dev_info(dev, "PCI error: slot reset callback!!\n");</div><div class='del'>-	queue_work(hisi_hba-&gt;wq, &amp;r.work);</div><div class='del'>-	wait_for_completion(r.completion);</div><div class='del'>-	if (r.done)</div><div class='del'>-		return PCI_ERS_RESULT_RECOVERED;</div><div class='del'>-</div><div class='del'>-	return PCI_ERS_RESULT_DISCONNECT;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void hisi_sas_reset_prepare_v3_hw(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sas_ha_struct *sha = pci_get_drvdata(pdev);</div><div class='hunk'>@@ -3171,7 +3255,7 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_power_t device_state = pdev-&gt;current_state;</div><div class='ctx'> </div><div class='ctx'> 	dev_warn(dev, "resuming from operating state [D%d]\n",</div><div class='del'>-			device_state);</div><div class='add'>+		 device_state);</div><div class='ctx'> 	pci_set_power_state(pdev, PCI_D0);</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D0, 0);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='hunk'>@@ -3199,9 +3283,6 @@ static const struct pci_device_id sas_v3_pci_table[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sas_v3_pci_table);</div><div class='ctx'> </div><div class='ctx'> static const struct pci_error_handlers hisi_sas_err_handler = {</div><div class='del'>-	.error_detected	= hisi_sas_error_detected_v3_hw,</div><div class='del'>-	.mmio_enabled	= hisi_sas_mmio_enabled_v3_hw,</div><div class='del'>-	.slot_reset	= hisi_sas_slot_reset_v3_hw,</div><div class='ctx'> 	.reset_prepare	= hisi_sas_reset_prepare_v3_hw,</div><div class='ctx'> 	.reset_done	= hisi_sas_reset_done_v3_hw,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c<br/>index f044e7d10d63..1bef1da273c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hpsa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/hpsa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/hpsa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/hpsa.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@</div><div class='ctx'>  * HPSA_DRIVER_VERSION must be 3 byte values (0-255) separated by '.'</div><div class='ctx'>  * with an optional trailing '-' followed by a byte value (0-255).</div><div class='ctx'>  */</div><div class='del'>-#define HPSA_DRIVER_VERSION "3.4.20-125"</div><div class='add'>+#define HPSA_DRIVER_VERSION "3.4.20-160"</div><div class='ctx'> #define DRIVER_NAME "HP HPSA Driver (v " HPSA_DRIVER_VERSION ")"</div><div class='ctx'> #define HPSA "hpsa"</div><div class='ctx'> </div><div class='hunk'>@@ -2647,9 +2647,20 @@ static void complete_scsi_command(struct CommandList *cp)</div><div class='ctx'> 			decode_sense_data(ei-&gt;SenseInfo, sense_data_size,</div><div class='ctx'> 				&amp;sense_key, &amp;asc, &amp;ascq);</div><div class='ctx'> 		if (ei-&gt;ScsiStatus == SAM_STAT_CHECK_CONDITION) {</div><div class='del'>-			if (sense_key == ABORTED_COMMAND) {</div><div class='add'>+			switch (sense_key) {</div><div class='add'>+			case ABORTED_COMMAND:</div><div class='ctx'> 				cmd-&gt;result |= DID_SOFT_ERROR &lt;&lt; 16;</div><div class='ctx'> 				break;</div><div class='add'>+			case UNIT_ATTENTION:</div><div class='add'>+				if (asc == 0x3F &amp;&amp; ascq == 0x0E)</div><div class='add'>+					h-&gt;drv_req_rescan = 1;</div><div class='add'>+				break;</div><div class='add'>+			case ILLEGAL_REQUEST:</div><div class='add'>+				if (asc == 0x25 &amp;&amp; ascq == 0x00) {</div><div class='add'>+					dev-&gt;removed = 1;</div><div class='add'>+					cmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3956,14 +3967,18 @@ static int hpsa_update_device_info(struct ctlr_info *h,</div><div class='ctx'> 	memset(this_device-&gt;device_id, 0,</div><div class='ctx'> 		sizeof(this_device-&gt;device_id));</div><div class='ctx'> 	if (hpsa_get_device_id(h, scsi3addr, this_device-&gt;device_id, 8,</div><div class='del'>-		sizeof(this_device-&gt;device_id)) &lt; 0)</div><div class='add'>+		sizeof(this_device-&gt;device_id)) &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;h-&gt;pdev-&gt;dev,</div><div class='del'>-			"hpsa%d: %s: can't get device id for host %d:C0:T%d:L%d\t%s\t%.16s\n",</div><div class='add'>+			"hpsa%d: %s: can't get device id for [%d:%d:%d:%d]\t%s\t%.16s\n",</div><div class='ctx'> 			h-&gt;ctlr, __func__,</div><div class='ctx'> 			h-&gt;scsi_host-&gt;host_no,</div><div class='del'>-			this_device-&gt;target, this_device-&gt;lun,</div><div class='add'>+			this_device-&gt;bus, this_device-&gt;target,</div><div class='add'>+			this_device-&gt;lun,</div><div class='ctx'> 			scsi_device_type(this_device-&gt;devtype),</div><div class='ctx'> 			this_device-&gt;model);</div><div class='add'>+		rc = HPSA_LV_FAILED;</div><div class='add'>+		goto bail_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((this_device-&gt;devtype == TYPE_DISK ||</div><div class='ctx'> 		this_device-&gt;devtype == TYPE_ZBC) &amp;&amp;</div><div class='hunk'>@@ -5809,7 +5824,7 @@ static int hpsa_send_test_unit_ready(struct ctlr_info *h,</div><div class='ctx'> 	/* Send the Test Unit Ready, fill_cmd can't fail, no mapping */</div><div class='ctx'> 	(void) fill_cmd(c, TEST_UNIT_READY, h,</div><div class='ctx'> 			NULL, 0, 0, lunaddr, TYPE_CMD);</div><div class='del'>-	rc = hpsa_scsi_do_simple_cmd(h, c, reply_queue, DEFAULT_TIMEOUT);</div><div class='add'>+	rc = hpsa_scsi_do_simple_cmd(h, c, reply_queue, NO_TIMEOUT);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	/* no unmap needed here because no data xfer. */</div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c<br/>index dbaa4f131433..3ad997ac3510 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ibmvscsi/ibmvfc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ibmvscsi/ibmvfc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ibmvscsi/ibmvfc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ibmvscsi/ibmvfc.c</a></div><div class='hunk'>@@ -139,6 +139,7 @@ static const struct {</div><div class='ctx'> 	{ IBMVFC_FC_FAILURE, IBMVFC_VENDOR_SPECIFIC, DID_ERROR, 1, 1, "vendor specific" },</div><div class='ctx'> </div><div class='ctx'> 	{ IBMVFC_FC_SCSI_ERROR, 0, DID_OK, 1, 0, "SCSI error" },</div><div class='add'>+	{ IBMVFC_FC_SCSI_ERROR, IBMVFC_COMMAND_FAILED, DID_ERROR, 0, 1, "PRLI to device failed." },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ibmvfc_npiv_login(struct ibmvfc_host *);</div><div class='hunk'>@@ -1494,9 +1495,9 @@ static void ibmvfc_log_error(struct ibmvfc_event *evt)</div><div class='ctx'> 	if (rsp-&gt;flags &amp; FCP_RSP_LEN_VALID)</div><div class='ctx'> 		rsp_code = rsp-&gt;data.info.rsp_code;</div><div class='ctx'> </div><div class='del'>-	scmd_printk(KERN_ERR, cmnd, "Command (%02X) failed: %s (%x:%x) "</div><div class='add'>+	scmd_printk(KERN_ERR, cmnd, "Command (%02X) : %s (%x:%x) "</div><div class='ctx'> 		    "flags: %x fcp_rsp: %x, resid=%d, scsi_status: %x\n",</div><div class='del'>-		    cmnd-&gt;cmnd[0], err, vfc_cmd-&gt;status, vfc_cmd-&gt;error,</div><div class='add'>+		    cmnd-&gt;cmnd[0], err, be16_to_cpu(vfc_cmd-&gt;status), be16_to_cpu(vfc_cmd-&gt;error),</div><div class='ctx'> 		    rsp-&gt;flags, rsp_code, scsi_get_resid(cmnd), rsp-&gt;scsi_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2022,7 +2023,7 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)</div><div class='ctx'> 		sdev_printk(KERN_ERR, sdev, "%s reset failed: %s (%x:%x) "</div><div class='ctx'> 			    "flags: %x fcp_rsp: %x, scsi_status: %x\n", desc,</div><div class='ctx'> 			    ibmvfc_get_cmd_error(be16_to_cpu(rsp_iu.cmd.status), be16_to_cpu(rsp_iu.cmd.error)),</div><div class='del'>-			    rsp_iu.cmd.status, rsp_iu.cmd.error, fc_rsp-&gt;flags, rsp_code,</div><div class='add'>+			    be16_to_cpu(rsp_iu.cmd.status), be16_to_cpu(rsp_iu.cmd.error), fc_rsp-&gt;flags, rsp_code,</div><div class='ctx'> 			    fc_rsp-&gt;scsi_status);</div><div class='ctx'> 		rsp_rc = -EIO;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -2381,7 +2382,7 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev)</div><div class='ctx'> 		sdev_printk(KERN_ERR, sdev, "Abort failed: %s (%x:%x) "</div><div class='ctx'> 			    "flags: %x fcp_rsp: %x, scsi_status: %x\n",</div><div class='ctx'> 			    ibmvfc_get_cmd_error(be16_to_cpu(rsp_iu.cmd.status), be16_to_cpu(rsp_iu.cmd.error)),</div><div class='del'>-			    rsp_iu.cmd.status, rsp_iu.cmd.error, fc_rsp-&gt;flags, rsp_code,</div><div class='add'>+			    be16_to_cpu(rsp_iu.cmd.status), be16_to_cpu(rsp_iu.cmd.error), fc_rsp-&gt;flags, rsp_code,</div><div class='ctx'> 			    fc_rsp-&gt;scsi_status);</div><div class='ctx'> 		rsp_rc = -EIO;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -2755,16 +2756,18 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)</div><div class='ctx'> 		ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE);</div><div class='ctx'> 		if (crq-&gt;format == IBMVFC_PARTITION_MIGRATED) {</div><div class='ctx'> 			/* We need to re-setup the interpartition connection */</div><div class='del'>-			dev_info(vhost-&gt;dev, "Re-enabling adapter\n");</div><div class='add'>+			dev_info(vhost-&gt;dev, "Partition migrated, Re-enabling adapter\n");</div><div class='ctx'> 			vhost-&gt;client_migrated = 1;</div><div class='ctx'> 			ibmvfc_purge_requests(vhost, DID_REQUEUE);</div><div class='ctx'> 			ibmvfc_link_down(vhost, IBMVFC_LINK_DOWN);</div><div class='ctx'> 			ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_REENABLE);</div><div class='del'>-		} else {</div><div class='del'>-			dev_err(vhost-&gt;dev, "Virtual adapter failed (rc=%d)\n", crq-&gt;format);</div><div class='add'>+		} else if (crq-&gt;format == IBMVFC_PARTNER_FAILED || crq-&gt;format == IBMVFC_PARTNER_DEREGISTER) {</div><div class='add'>+			dev_err(vhost-&gt;dev, "Host partner adapter deregistered or failed (rc=%d)\n", crq-&gt;format);</div><div class='ctx'> 			ibmvfc_purge_requests(vhost, DID_ERROR);</div><div class='ctx'> 			ibmvfc_link_down(vhost, IBMVFC_LINK_DOWN);</div><div class='ctx'> 			ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_RESET);</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(vhost-&gt;dev, "Received unknown transport event from partner (rc=%d)\n", crq-&gt;format);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	case IBMVFC_CRQ_CMD_RSP:</div><div class='hunk'>@@ -3348,7 +3351,7 @@ static void ibmvfc_tgt_prli_done(struct ibmvfc_event *evt)</div><div class='ctx'> </div><div class='ctx'> 		tgt_log(tgt, level, "Process Login failed: %s (%x:%x) rc=0x%02X\n",</div><div class='ctx'> 			ibmvfc_get_cmd_error(be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error)),</div><div class='del'>-			rsp-&gt;status, rsp-&gt;error, status);</div><div class='add'>+			be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error), status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3446,9 +3449,10 @@ static void ibmvfc_tgt_plogi_done(struct ibmvfc_event *evt)</div><div class='ctx'> 			ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);</div><div class='ctx'> </div><div class='ctx'> 		tgt_log(tgt, level, "Port Login failed: %s (%x:%x) %s (%x) %s (%x) rc=0x%02X\n",</div><div class='del'>-			ibmvfc_get_cmd_error(be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error)), rsp-&gt;status, rsp-&gt;error,</div><div class='del'>-			ibmvfc_get_fc_type(be16_to_cpu(rsp-&gt;fc_type)), rsp-&gt;fc_type,</div><div class='del'>-			ibmvfc_get_ls_explain(be16_to_cpu(rsp-&gt;fc_explain)), rsp-&gt;fc_explain, status);</div><div class='add'>+			ibmvfc_get_cmd_error(be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error)),</div><div class='add'>+					     be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error),</div><div class='add'>+			ibmvfc_get_fc_type(be16_to_cpu(rsp-&gt;fc_type)), be16_to_cpu(rsp-&gt;fc_type),</div><div class='add'>+			ibmvfc_get_ls_explain(be16_to_cpu(rsp-&gt;fc_explain)), be16_to_cpu(rsp-&gt;fc_explain), status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3619,7 +3623,7 @@ static void ibmvfc_tgt_adisc_done(struct ibmvfc_event *evt)</div><div class='ctx'> 		fc_explain = (be32_to_cpu(mad-&gt;fc_iu.response[1]) &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='ctx'> 		tgt_info(tgt, "ADISC failed: %s (%x:%x) %s (%x) %s (%x) rc=0x%02X\n",</div><div class='ctx'> 			 ibmvfc_get_cmd_error(be16_to_cpu(mad-&gt;iu.status), be16_to_cpu(mad-&gt;iu.error)),</div><div class='del'>-			 mad-&gt;iu.status, mad-&gt;iu.error,</div><div class='add'>+			 be16_to_cpu(mad-&gt;iu.status), be16_to_cpu(mad-&gt;iu.error),</div><div class='ctx'> 			 ibmvfc_get_fc_type(fc_reason), fc_reason,</div><div class='ctx'> 			 ibmvfc_get_ls_explain(fc_explain), fc_explain, status);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3831,9 +3835,10 @@ static void ibmvfc_tgt_query_target_done(struct ibmvfc_event *evt)</div><div class='ctx'> </div><div class='ctx'> 		tgt_log(tgt, level, "Query Target failed: %s (%x:%x) %s (%x) %s (%x) rc=0x%02X\n",</div><div class='ctx'> 			ibmvfc_get_cmd_error(be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error)),</div><div class='del'>-			rsp-&gt;status, rsp-&gt;error, ibmvfc_get_fc_type(be16_to_cpu(rsp-&gt;fc_type)),</div><div class='del'>-			rsp-&gt;fc_type, ibmvfc_get_gs_explain(be16_to_cpu(rsp-&gt;fc_explain)),</div><div class='del'>-			rsp-&gt;fc_explain, status);</div><div class='add'>+			be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error),</div><div class='add'>+			ibmvfc_get_fc_type(be16_to_cpu(rsp-&gt;fc_type)), be16_to_cpu(rsp-&gt;fc_type),</div><div class='add'>+			ibmvfc_get_gs_explain(be16_to_cpu(rsp-&gt;fc_explain)), be16_to_cpu(rsp-&gt;fc_explain),</div><div class='add'>+			status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3959,7 +3964,7 @@ static void ibmvfc_discover_targets_done(struct ibmvfc_event *evt)</div><div class='ctx'> 		level += ibmvfc_retry_host_init(vhost);</div><div class='ctx'> 		ibmvfc_log(vhost, level, "Discover Targets failed: %s (%x:%x)\n",</div><div class='ctx'> 			   ibmvfc_get_cmd_error(be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error)),</div><div class='del'>-			   rsp-&gt;status, rsp-&gt;error);</div><div class='add'>+			   be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IBMVFC_MAD_DRIVER_FAILED:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4024,7 +4029,7 @@ static void ibmvfc_npiv_login_done(struct ibmvfc_event *evt)</div><div class='ctx'> 			ibmvfc_link_down(vhost, IBMVFC_LINK_DEAD);</div><div class='ctx'> 		ibmvfc_log(vhost, level, "NPIV Login failed: %s (%x:%x)\n",</div><div class='ctx'> 			   ibmvfc_get_cmd_error(be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error)),</div><div class='del'>-						rsp-&gt;status, rsp-&gt;error);</div><div class='add'>+						be16_to_cpu(rsp-&gt;status), be16_to_cpu(rsp-&gt;error));</div><div class='ctx'> 		ibmvfc_free_event(evt);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case IBMVFC_MAD_CRQ_ERROR:</div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h<br/>index b81a53c4a9a8..459cc288ba1d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ibmvscsi/ibmvfc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ibmvscsi/ibmvfc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ibmvscsi/ibmvfc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ibmvscsi/ibmvfc.h</a></div><div class='hunk'>@@ -78,9 +78,14 @@ enum ibmvfc_crq_valid {</div><div class='ctx'> 	IBMVFC_CRQ_XPORT_EVENT		= 0xFF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum ibmvfc_crq_format {</div><div class='add'>+enum ibmvfc_crq_init_msg {</div><div class='ctx'> 	IBMVFC_CRQ_INIT			= 0x01,</div><div class='ctx'> 	IBMVFC_CRQ_INIT_COMPLETE	= 0x02,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ibmvfc_crq_xport_evts {</div><div class='add'>+	IBMVFC_PARTNER_FAILED		= 0x01,</div><div class='add'>+	IBMVFC_PARTNER_DEREGISTER	= 0x02,</div><div class='ctx'> 	IBMVFC_PARTITION_MIGRATED	= 0x06,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c<br/>index 1135e74646e2..8cec5230fe31 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ibmvscsi/ibmvscsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ibmvscsi/ibmvscsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ibmvscsi/ibmvscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></div><div class='hunk'>@@ -96,6 +96,7 @@ static int client_reserve = 1;</div><div class='ctx'> static char partition_name[96] = "UNKNOWN";</div><div class='ctx'> static unsigned int partition_number = -1;</div><div class='ctx'> static LIST_HEAD(ibmvscsi_head);</div><div class='add'>+static DEFINE_SPINLOCK(ibmvscsi_driver_lock);</div><div class='ctx'> </div><div class='ctx'> static struct scsi_transport_template *ibmvscsi_transport_template;</div><div class='ctx'> </div><div class='hunk'>@@ -2270,7 +2271,9 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;vdev-&gt;dev, hostdata);</div><div class='add'>+	spin_lock(&amp;ibmvscsi_driver_lock);</div><div class='ctx'> 	list_add_tail(&amp;hostdata-&gt;host_list, &amp;ibmvscsi_head);</div><div class='add'>+	spin_unlock(&amp;ibmvscsi_driver_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>       add_srp_port_failed:</div><div class='hunk'>@@ -2292,15 +2295,27 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> static int ibmvscsi_remove(struct vio_dev *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&amp;vdev-&gt;dev);</div><div class='del'>-	list_del(&amp;hostdata-&gt;host_list);</div><div class='del'>-	unmap_persist_bufs(hostdata);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	srp_remove_host(hostdata-&gt;host);</div><div class='add'>+	scsi_remove_host(hostdata-&gt;host);</div><div class='add'>+</div><div class='add'>+	purge_requests(hostdata, DID_ERROR);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(hostdata-&gt;host-&gt;host_lock, flags);</div><div class='ctx'> 	release_event_pool(&amp;hostdata-&gt;pool, hostdata);</div><div class='add'>+	spin_unlock_irqrestore(hostdata-&gt;host-&gt;host_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	ibmvscsi_release_crq_queue(&amp;hostdata-&gt;queue, hostdata,</div><div class='ctx'> 					max_events);</div><div class='ctx'> </div><div class='ctx'> 	kthread_stop(hostdata-&gt;work_thread);</div><div class='del'>-	srp_remove_host(hostdata-&gt;host);</div><div class='del'>-	scsi_remove_host(hostdata-&gt;host);</div><div class='add'>+	unmap_persist_bufs(hostdata);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ibmvscsi_driver_lock);</div><div class='add'>+	list_del(&amp;hostdata-&gt;host_list);</div><div class='add'>+	spin_unlock(&amp;ibmvscsi_driver_lock);</div><div class='add'>+</div><div class='ctx'> 	scsi_host_put(hostdata-&gt;host);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c<br/>index cea7f502e8ca..64ae418d29f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/imm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/imm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/imm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/imm.c</a></div><div class='hunk'>@@ -796,21 +796,21 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 1;	/* wait until imm_wakeup claims parport */</div><div class='del'>-		/* Phase 1 - Connected */</div><div class='del'>-	case 1:</div><div class='add'>+</div><div class='add'>+	case 1:		/* Phase 1 - Connected */</div><div class='ctx'> 		imm_connect(dev, CONNECT_EPP_MAYBE);</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-		/* Phase 2 - We are now talking to the scsi bus */</div><div class='del'>-	case 2:</div><div class='add'>+	case 2:		/* Phase 2 - We are now talking to the scsi bus */</div><div class='ctx'> 		if (!imm_select(dev, scmd_id(cmd))) {</div><div class='ctx'> 			imm_fail(dev, DID_NO_CONNECT);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-		/* Phase 3 - Ready to accept a command */</div><div class='del'>-	case 3:</div><div class='add'>+	case 3:		/* Phase 3 - Ready to accept a command */</div><div class='ctx'> 		w_ctr(ppb, 0x0c);</div><div class='ctx'> 		if (!(r_str(ppb) &amp; 0x80))</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -818,9 +818,9 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 		if (!imm_send_command(cmd))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-		/* Phase 4 - Setup scatter/gather buffers */</div><div class='del'>-	case 4:</div><div class='add'>+	case 4:		/* Phase 4 - Setup scatter/gather buffers */</div><div class='ctx'> 		if (scsi_bufflen(cmd)) {</div><div class='ctx'> 			cmd-&gt;SCp.buffer = scsi_sglist(cmd);</div><div class='ctx'> 			cmd-&gt;SCp.this_residual = cmd-&gt;SCp.buffer-&gt;length;</div><div class='hunk'>@@ -834,8 +834,9 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='ctx'> 		if (cmd-&gt;SCp.this_residual &amp; 0x01)</div><div class='ctx'> 			cmd-&gt;SCp.this_residual++;</div><div class='del'>-		/* Phase 5 - Pre-Data transfer stage */</div><div class='del'>-	case 5:</div><div class='add'>+		/* fall through */</div><div class='add'>+</div><div class='add'>+	case 5:		/* Phase 5 - Pre-Data transfer stage */</div><div class='ctx'> 		/* Spin lock for BUSY */</div><div class='ctx'> 		w_ctr(ppb, 0x0c);</div><div class='ctx'> 		if (!(r_str(ppb) &amp; 0x80))</div><div class='hunk'>@@ -850,9 +851,9 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 			if (imm_negotiate(dev))</div><div class='ctx'> 				return 0;</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-		/* Phase 6 - Data transfer stage */</div><div class='del'>-	case 6:</div><div class='add'>+	case 6:		/* Phase 6 - Data transfer stage */</div><div class='ctx'> 		/* Spin lock for BUSY */</div><div class='ctx'> 		w_ctr(ppb, 0x0c);</div><div class='ctx'> 		if (!(r_str(ppb) &amp; 0x80))</div><div class='hunk'>@@ -866,9 +867,9 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 				return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-		/* Phase 7 - Post data transfer stage */</div><div class='del'>-	case 7:</div><div class='add'>+	case 7:		/* Phase 7 - Post data transfer stage */</div><div class='ctx'> 		if ((dev-&gt;dp) &amp;&amp; (dev-&gt;rd)) {</div><div class='ctx'> 			if ((dev-&gt;mode == IMM_NIBBLE) || (dev-&gt;mode == IMM_PS2)) {</div><div class='ctx'> 				w_ctr(ppb, 0x4);</div><div class='hunk'>@@ -878,9 +879,9 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		cmd-&gt;SCp.phase++;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-		/* Phase 8 - Read status/message */</div><div class='del'>-	case 8:</div><div class='add'>+	case 8:		/* Phase 8 - Read status/message */</div><div class='ctx'> 		/* Check for data overrun */</div><div class='ctx'> 		if (imm_wait(dev) != (unsigned char) 0xb8) {</div><div class='ctx'> 			imm_fail(dev, DID_ERROR);</div><div class='head'>diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c<br/>index dfba4921b265..5bf61431434b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libfc/fc_rport.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libfc/fc_rport.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libfc/fc_rport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/libfc/fc_rport.c</a></div><div class='hunk'>@@ -2162,7 +2162,6 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport, struct fc_frame *fp)</div><div class='ctx'> 		FC_RPORT_DBG(rdata, "Received LOGO request while in state %s\n",</div><div class='ctx'> 			     fc_rport_state(rdata));</div><div class='ctx'> </div><div class='del'>-		rdata-&gt;flags &amp;= ~FC_RP_STARTED;</div><div class='ctx'> 		fc_rport_enter_delete(rdata, RPORT_EV_STOP);</div><div class='ctx'> 		mutex_unlock(&amp;rdata-&gt;rp_mutex);</div><div class='ctx'> 		kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c<br/>index 6f93fee2b21b..1ecca71df8b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_ata.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_ata.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_ata.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/libsas/sas_ata.c</a></div><div class='hunk'>@@ -281,7 +281,7 @@ int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy)</div><div class='ctx'> 		res = sas_get_report_phy_sata(dev-&gt;parent, phy-&gt;phy_id,</div><div class='ctx'> 					      &amp;dev-&gt;sata_dev.rps_resp);</div><div class='ctx'> 		if (res) {</div><div class='del'>-			pr_debug("report phy sata to %016llx:0x%x returned 0x%x\n",</div><div class='add'>+			pr_debug("report phy sata to %016llx:%02d returned 0x%x\n",</div><div class='ctx'> 				 SAS_ADDR(dev-&gt;parent-&gt;sas_addr),</div><div class='ctx'> 				 phy-&gt;phy_id, res);</div><div class='ctx'> 			return res;</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c<br/>index 17b45a0c7bc3..83f2fd70ce76 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_expander.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_expander.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_expander.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/libsas/sas_expander.c</a></div><div class='hunk'>@@ -826,9 +826,14 @@ static struct domain_device *sas_ex_discover_end_dev(</div><div class='ctx'> #ifdef CONFIG_SCSI_SAS_ATA</div><div class='ctx'> 	if ((phy-&gt;attached_tproto &amp; SAS_PROTOCOL_STP) || phy-&gt;attached_sata_dev) {</div><div class='ctx'> 		if (child-&gt;linkrate &gt; parent-&gt;min_linkrate) {</div><div class='add'>+			struct sas_phy *cphy = child-&gt;phy;</div><div class='add'>+			enum sas_linkrate min_prate = cphy-&gt;minimum_linkrate,</div><div class='add'>+				parent_min_lrate = parent-&gt;min_linkrate,</div><div class='add'>+				min_linkrate = (min_prate &gt; parent_min_lrate) ?</div><div class='add'>+					       parent_min_lrate : 0;</div><div class='ctx'> 			struct sas_phy_linkrates rates = {</div><div class='ctx'> 				.maximum_linkrate = parent-&gt;min_linkrate,</div><div class='del'>-				.minimum_linkrate = parent-&gt;min_linkrate,</div><div class='add'>+				.minimum_linkrate = min_linkrate,</div><div class='ctx'> 			};</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -865,7 +870,7 @@ static struct domain_device *sas_ex_discover_end_dev(</div><div class='ctx'> </div><div class='ctx'> 		res = sas_discover_sata(child);</div><div class='ctx'> 		if (res) {</div><div class='del'>-			pr_notice("sas_discover_sata() for device %16llx at %016llx:0x%x returned 0x%x\n",</div><div class='add'>+			pr_notice("sas_discover_sata() for device %16llx at %016llx:%02d returned 0x%x\n",</div><div class='ctx'> 				  SAS_ADDR(child-&gt;sas_addr),</div><div class='ctx'> 				  SAS_ADDR(parent-&gt;sas_addr), phy_id, res);</div><div class='ctx'> 			goto out_list_del;</div><div class='hunk'>@@ -890,7 +895,7 @@ static struct domain_device *sas_ex_discover_end_dev(</div><div class='ctx'> </div><div class='ctx'> 		res = sas_discover_end_dev(child);</div><div class='ctx'> 		if (res) {</div><div class='del'>-			pr_notice("sas_discover_end_dev() for device %16llx at %016llx:0x%x returned 0x%x\n",</div><div class='add'>+			pr_notice("sas_discover_end_dev() for device %16llx at %016llx:%02d returned 0x%x\n",</div><div class='ctx'> 				  SAS_ADDR(child-&gt;sas_addr),</div><div class='ctx'> 				  SAS_ADDR(parent-&gt;sas_addr), phy_id, res);</div><div class='ctx'> 			goto out_list_del;</div><div class='hunk'>@@ -955,7 +960,7 @@ static struct domain_device *sas_ex_discover_expander(</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;routing_attr == DIRECT_ROUTING) {</div><div class='del'>-		pr_warn("ex %016llx:0x%x:D &lt;--&gt; ex %016llx:0x%x is not allowed\n",</div><div class='add'>+		pr_warn("ex %016llx:%02d:D &lt;--&gt; ex %016llx:0x%x is not allowed\n",</div><div class='ctx'> 			SAS_ADDR(parent-&gt;sas_addr), phy_id,</div><div class='ctx'> 			SAS_ADDR(phy-&gt;attached_sas_addr),</div><div class='ctx'> 			phy-&gt;attached_phy_id);</div><div class='hunk'>@@ -1065,7 +1070,7 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)</div><div class='ctx'> 	    ex_phy-&gt;attached_dev_type != SAS_FANOUT_EXPANDER_DEVICE &amp;&amp;</div><div class='ctx'> 	    ex_phy-&gt;attached_dev_type != SAS_EDGE_EXPANDER_DEVICE &amp;&amp;</div><div class='ctx'> 	    ex_phy-&gt;attached_dev_type != SAS_SATA_PENDING) {</div><div class='del'>-		pr_warn("unknown device type(0x%x) attached to ex %016llx phy 0x%x\n",</div><div class='add'>+		pr_warn("unknown device type(0x%x) attached to ex %016llx phy%02d\n",</div><div class='ctx'> 			ex_phy-&gt;attached_dev_type,</div><div class='ctx'> 			SAS_ADDR(dev-&gt;sas_addr),</div><div class='ctx'> 			phy_id);</div><div class='hunk'>@@ -1081,7 +1086,7 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sas_ex_join_wide_port(dev, phy_id)) {</div><div class='del'>-		pr_debug("Attaching ex phy%d to wide port %016llx\n",</div><div class='add'>+		pr_debug("Attaching ex phy%02d to wide port %016llx\n",</div><div class='ctx'> 			 phy_id, SAS_ADDR(ex_phy-&gt;attached_sas_addr));</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1093,7 +1098,7 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAS_FANOUT_EXPANDER_DEVICE:</div><div class='ctx'> 		if (SAS_ADDR(dev-&gt;port-&gt;disc.fanout_sas_addr)) {</div><div class='del'>-			pr_debug("second fanout expander %016llx phy 0x%x attached to ex %016llx phy 0x%x\n",</div><div class='add'>+			pr_debug("second fanout expander %016llx phy%02d attached to ex %016llx phy%02d\n",</div><div class='ctx'> 				 SAS_ADDR(ex_phy-&gt;attached_sas_addr),</div><div class='ctx'> 				 ex_phy-&gt;attached_phy_id,</div><div class='ctx'> 				 SAS_ADDR(dev-&gt;sas_addr),</div><div class='hunk'>@@ -1126,7 +1131,7 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)</div><div class='ctx'> 			    SAS_ADDR(child-&gt;sas_addr)) {</div><div class='ctx'> 				ex-&gt;ex_phy[i].phy_state= PHY_DEVICE_DISCOVERED;</div><div class='ctx'> 				if (sas_ex_join_wide_port(dev, i))</div><div class='del'>-					pr_debug("Attaching ex phy%d to wide port %016llx\n",</div><div class='add'>+					pr_debug("Attaching ex phy%02d to wide port %016llx\n",</div><div class='ctx'> 						 i, SAS_ADDR(ex-&gt;ex_phy[i].attached_sas_addr));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1151,7 +1156,7 @@ static int sas_find_sub_addr(struct domain_device *dev, u8 *sub_addr)</div><div class='ctx'> 		     phy-&gt;attached_dev_type == SAS_FANOUT_EXPANDER_DEVICE) &amp;&amp;</div><div class='ctx'> 		    phy-&gt;routing_attr == SUBTRACTIVE_ROUTING) {</div><div class='ctx'> </div><div class='del'>-			memcpy(sub_addr, phy-&gt;attached_sas_addr,SAS_ADDR_SIZE);</div><div class='add'>+			memcpy(sub_addr, phy-&gt;attached_sas_addr, SAS_ADDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1163,7 +1168,7 @@ static int sas_check_level_subtractive_boundary(struct domain_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct expander_device *ex = &amp;dev-&gt;ex_dev;</div><div class='ctx'> 	struct domain_device *child;</div><div class='del'>-	u8 sub_addr[8] = {0, };</div><div class='add'>+	u8 sub_addr[SAS_ADDR_SIZE] = {0, };</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(child, &amp;ex-&gt;children, siblings) {</div><div class='ctx'> 		if (child-&gt;dev_type != SAS_EDGE_EXPANDER_DEVICE &amp;&amp;</div><div class='hunk'>@@ -1173,7 +1178,7 @@ static int sas_check_level_subtractive_boundary(struct domain_device *dev)</div><div class='ctx'> 			sas_find_sub_addr(child, sub_addr);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		} else {</div><div class='del'>-			u8 s2[8];</div><div class='add'>+			u8 s2[SAS_ADDR_SIZE];</div><div class='ctx'> </div><div class='ctx'> 			if (sas_find_sub_addr(child, s2) &amp;&amp;</div><div class='ctx'> 			    (SAS_ADDR(sub_addr) != SAS_ADDR(s2))) {</div><div class='hunk'>@@ -1261,7 +1266,7 @@ static int sas_check_ex_subtractive_boundary(struct domain_device *dev)</div><div class='ctx'> 			else if (SAS_ADDR(sub_sas_addr) !=</div><div class='ctx'> 				 SAS_ADDR(phy-&gt;attached_sas_addr)) {</div><div class='ctx'> </div><div class='del'>-				pr_notice("ex %016llx phy 0x%x diverges(%016llx) on subtractive boundary(%016llx). Disabled\n",</div><div class='add'>+				pr_notice("ex %016llx phy%02d diverges(%016llx) on subtractive boundary(%016llx). Disabled\n",</div><div class='ctx'> 					  SAS_ADDR(dev-&gt;sas_addr), i,</div><div class='ctx'> 					  SAS_ADDR(phy-&gt;attached_sas_addr),</div><div class='ctx'> 					  SAS_ADDR(sub_sas_addr));</div><div class='hunk'>@@ -1282,7 +1287,7 @@ static void sas_print_parent_topology_bug(struct domain_device *child,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct domain_device *parent = child-&gt;parent;</div><div class='ctx'> </div><div class='del'>-	pr_notice("%s ex %016llx phy 0x%x &lt;--&gt; %s ex %016llx phy 0x%x has %c:%c routing link!\n",</div><div class='add'>+	pr_notice("%s ex %016llx phy%02d &lt;--&gt; %s ex %016llx phy%02d has %c:%c routing link!\n",</div><div class='ctx'> 		  ex_type[parent-&gt;dev_type],</div><div class='ctx'> 		  SAS_ADDR(parent-&gt;sas_addr),</div><div class='ctx'> 		  parent_phy-&gt;phy_id,</div><div class='hunk'>@@ -1304,7 +1309,7 @@ static int sas_check_eeds(struct domain_device *child,</div><div class='ctx'> </div><div class='ctx'> 	if (SAS_ADDR(parent-&gt;port-&gt;disc.fanout_sas_addr) != 0) {</div><div class='ctx'> 		res = -ENODEV;</div><div class='del'>-		pr_warn("edge ex %016llx phy S:0x%x &lt;--&gt; edge ex %016llx phy S:0x%x, while there is a fanout ex %016llx\n",</div><div class='add'>+		pr_warn("edge ex %016llx phy S:%02d &lt;--&gt; edge ex %016llx phy S:%02d, while there is a fanout ex %016llx\n",</div><div class='ctx'> 			SAS_ADDR(parent-&gt;sas_addr),</div><div class='ctx'> 			parent_phy-&gt;phy_id,</div><div class='ctx'> 			SAS_ADDR(child-&gt;sas_addr),</div><div class='hunk'>@@ -1327,7 +1332,7 @@ static int sas_check_eeds(struct domain_device *child,</div><div class='ctx'> 		;</div><div class='ctx'> 	else {</div><div class='ctx'> 		res = -ENODEV;</div><div class='del'>-		pr_warn("edge ex %016llx phy 0x%x &lt;--&gt; edge ex %016llx phy 0x%x link forms a third EEDS!\n",</div><div class='add'>+		pr_warn("edge ex %016llx phy%02d &lt;--&gt; edge ex %016llx phy%02d link forms a third EEDS!\n",</div><div class='ctx'> 			SAS_ADDR(parent-&gt;sas_addr),</div><div class='ctx'> 			parent_phy-&gt;phy_id,</div><div class='ctx'> 			SAS_ADDR(child-&gt;sas_addr),</div><div class='hunk'>@@ -1445,11 +1450,11 @@ static int sas_configure_present(struct domain_device *dev, int phy_id,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		res = rri_resp[2];</div><div class='ctx'> 		if (res == SMP_RESP_NO_INDEX) {</div><div class='del'>-			pr_warn("overflow of indexes: dev %016llx phy 0x%x index 0x%x\n",</div><div class='add'>+			pr_warn("overflow of indexes: dev %016llx phy%02d index 0x%x\n",</div><div class='ctx'> 				SAS_ADDR(dev-&gt;sas_addr), phy_id, i);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (res != SMP_RESP_FUNC_ACC) {</div><div class='del'>-			pr_notice("%s: dev %016llx phy 0x%x index 0x%x result 0x%x\n",</div><div class='add'>+			pr_notice("%s: dev %016llx phy%02d index 0x%x result 0x%x\n",</div><div class='ctx'> 				  __func__, SAS_ADDR(dev-&gt;sas_addr), phy_id,</div><div class='ctx'> 				  i, res);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1515,7 +1520,7 @@ static int sas_configure_set(struct domain_device *dev, int phy_id,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	res = cri_resp[2];</div><div class='ctx'> 	if (res == SMP_RESP_NO_INDEX) {</div><div class='del'>-		pr_warn("overflow of indexes: dev %016llx phy 0x%x index 0x%x\n",</div><div class='add'>+		pr_warn("overflow of indexes: dev %016llx phy%02d index 0x%x\n",</div><div class='ctx'> 			SAS_ADDR(dev-&gt;sas_addr), phy_id, index);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -1760,10 +1765,11 @@ static int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id,</div><div class='ctx'> </div><div class='ctx'> 	res = sas_get_phy_discover(dev, phy_id, disc_resp);</div><div class='ctx'> 	if (res == 0) {</div><div class='del'>-		memcpy(sas_addr, disc_resp-&gt;disc.attached_sas_addr, 8);</div><div class='add'>+		memcpy(sas_addr, disc_resp-&gt;disc.attached_sas_addr,</div><div class='add'>+		       SAS_ADDR_SIZE);</div><div class='ctx'> 		*type = to_dev_type(dr);</div><div class='ctx'> 		if (*type == 0)</div><div class='del'>-			memset(sas_addr, 0, 8);</div><div class='add'>+			memset(sas_addr, 0, SAS_ADDR_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(disc_resp);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -1870,10 +1876,12 @@ static int sas_find_bcast_dev(struct domain_device *dev,</div><div class='ctx'> 		if (phy_id != -1) {</div><div class='ctx'> 			*src_dev = dev;</div><div class='ctx'> 			ex-&gt;ex_change_count = ex_change_count;</div><div class='del'>-			pr_info("Expander phy change count has changed\n");</div><div class='add'>+			pr_info("ex %016llx phy%02d change count has changed\n",</div><div class='add'>+				SAS_ADDR(dev-&gt;sas_addr), phy_id);</div><div class='ctx'> 			return res;</div><div class='ctx'> 		} else</div><div class='del'>-			pr_info("Expander phys DID NOT change\n");</div><div class='add'>+			pr_info("ex %016llx phys DID NOT change\n",</div><div class='add'>+				SAS_ADDR(dev-&gt;sas_addr));</div><div class='ctx'> 	}</div><div class='ctx'> 	list_for_each_entry(ch, &amp;ex-&gt;children, siblings) {</div><div class='ctx'> 		if (ch-&gt;dev_type == SAS_EDGE_EXPANDER_DEVICE || ch-&gt;dev_type == SAS_FANOUT_EXPANDER_DEVICE) {</div><div class='hunk'>@@ -1983,7 +1991,7 @@ static int sas_discover_new(struct domain_device *dev, int phy_id)</div><div class='ctx'> 	struct domain_device *child;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	pr_debug("ex %016llx phy%d new device attached\n",</div><div class='add'>+	pr_debug("ex %016llx phy%02d new device attached\n",</div><div class='ctx'> 		 SAS_ADDR(dev-&gt;sas_addr), phy_id);</div><div class='ctx'> 	res = sas_ex_phy_discover(dev, phy_id);</div><div class='ctx'> 	if (res)</div><div class='hunk'>@@ -2022,15 +2030,23 @@ static bool dev_type_flutter(enum sas_device_type new, enum sas_device_type old)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)</div><div class='add'>+static int sas_rediscover_dev(struct domain_device *dev, int phy_id,</div><div class='add'>+			      bool last, int sibling)</div><div class='ctx'> {</div><div class='ctx'> 	struct expander_device *ex = &amp;dev-&gt;ex_dev;</div><div class='ctx'> 	struct ex_phy *phy = &amp;ex-&gt;ex_phy[phy_id];</div><div class='ctx'> 	enum sas_device_type type = SAS_PHY_UNUSED;</div><div class='del'>-	u8 sas_addr[8];</div><div class='add'>+	u8 sas_addr[SAS_ADDR_SIZE];</div><div class='add'>+	char msg[80] = "";</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	memset(sas_addr, 0, 8);</div><div class='add'>+	if (!last)</div><div class='add'>+		sprintf(msg, ", part of a wide port with phy%02d", sibling);</div><div class='add'>+</div><div class='add'>+	pr_debug("ex %016llx rediscovering phy%02d%s\n",</div><div class='add'>+		 SAS_ADDR(dev-&gt;sas_addr), phy_id, msg);</div><div class='add'>+</div><div class='add'>+	memset(sas_addr, 0, SAS_ADDR_SIZE);</div><div class='ctx'> 	res = sas_get_phy_attached_dev(dev, phy_id, sas_addr, &amp;type);</div><div class='ctx'> 	switch (res) {</div><div class='ctx'> 	case SMP_RESP_NO_PHY:</div><div class='hunk'>@@ -2052,6 +2068,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)</div><div class='ctx'> 	if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) {</div><div class='ctx'> 		phy-&gt;phy_state = PHY_EMPTY;</div><div class='ctx'> 		sas_unregister_devs_sas_addr(dev, phy_id, last);</div><div class='add'>+		/*</div><div class='add'>+		 * Even though the PHY is empty, for convenience we discover</div><div class='add'>+		 * the PHY to update the PHY info, like negotiated linkrate.</div><div class='add'>+		 */</div><div class='add'>+		sas_ex_phy_discover(dev, phy_id);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	} else if (SAS_ADDR(sas_addr) == SAS_ADDR(phy-&gt;attached_sas_addr) &amp;&amp;</div><div class='ctx'> 		   dev_type_flutter(type, phy-&gt;attached_dev_type)) {</div><div class='hunk'>@@ -2062,13 +2083,13 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)</div><div class='ctx'> </div><div class='ctx'> 		if (ata_dev &amp;&amp; phy-&gt;attached_dev_type == SAS_SATA_PENDING)</div><div class='ctx'> 			action = ", needs recovery";</div><div class='del'>-		pr_debug("ex %016llx phy 0x%x broadcast flutter%s\n",</div><div class='add'>+		pr_debug("ex %016llx phy%02d broadcast flutter%s\n",</div><div class='ctx'> 			 SAS_ADDR(dev-&gt;sas_addr), phy_id, action);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* we always have to delete the old device when we went here */</div><div class='del'>-	pr_info("ex %016llx phy 0x%x replace %016llx\n",</div><div class='add'>+	pr_info("ex %016llx phy%02d replace %016llx\n",</div><div class='ctx'> 		SAS_ADDR(dev-&gt;sas_addr), phy_id,</div><div class='ctx'> 		SAS_ADDR(phy-&gt;attached_sas_addr));</div><div class='ctx'> 	sas_unregister_devs_sas_addr(dev, phy_id, last);</div><div class='hunk'>@@ -2098,7 +2119,7 @@ static int sas_rediscover(struct domain_device *dev, const int phy_id)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	bool last = true;	/* is this the last phy of the port */</div><div class='ctx'> </div><div class='del'>-	pr_debug("ex %016llx phy%d originated BROADCAST(CHANGE)\n",</div><div class='add'>+	pr_debug("ex %016llx phy%02d originated BROADCAST(CHANGE)\n",</div><div class='ctx'> 		 SAS_ADDR(dev-&gt;sas_addr), phy_id);</div><div class='ctx'> </div><div class='ctx'> 	if (SAS_ADDR(changed_phy-&gt;attached_sas_addr) != 0) {</div><div class='hunk'>@@ -2109,13 +2130,11 @@ static int sas_rediscover(struct domain_device *dev, const int phy_id)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (SAS_ADDR(phy-&gt;attached_sas_addr) ==</div><div class='ctx'> 			    SAS_ADDR(changed_phy-&gt;attached_sas_addr)) {</div><div class='del'>-				pr_debug("phy%d part of wide port with phy%d\n",</div><div class='del'>-					 phy_id, i);</div><div class='ctx'> 				last = false;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		res = sas_rediscover_dev(dev, phy_id, last);</div><div class='add'>+		res = sas_rediscover_dev(dev, phy_id, last, i);</div><div class='ctx'> 	} else</div><div class='ctx'> 		res = sas_discover_new(dev, phy_id);</div><div class='ctx'> 	return res;</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c<br/>index 221340ee8651..28a460c36c0b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/libsas/sas_init.c</a></div><div class='hunk'>@@ -87,25 +87,27 @@ EXPORT_SYMBOL_GPL(sas_free_task);</div><div class='ctx'> /*------------ SAS addr hash -----------*/</div><div class='ctx'> void sas_hash_addr(u8 *hashed, const u8 *sas_addr)</div><div class='ctx'> {</div><div class='del'>-        const u32 poly = 0x00DB2777;</div><div class='del'>-        u32     r = 0;</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'>-                int b;</div><div class='del'>-                for (b = 7; b &gt;= 0; b--) {</div><div class='del'>-                        r &lt;&lt;= 1;</div><div class='del'>-                        if ((1 &lt;&lt; b) &amp; sas_addr[i]) {</div><div class='del'>-                                if (!(r &amp; 0x01000000))</div><div class='del'>-                                        r ^= poly;</div><div class='del'>-                        } else if (r &amp; 0x01000000)</div><div class='del'>-                                r ^= poly;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        hashed[0] = (r &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-        hashed[1] = (r &gt;&gt; 8) &amp; 0xFF ;</div><div class='del'>-        hashed[2] = r &amp; 0xFF;</div><div class='add'>+	const u32 poly = 0x00DB2777;</div><div class='add'>+	u32 r = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SAS_ADDR_SIZE; i++) {</div><div class='add'>+		int b;</div><div class='add'>+</div><div class='add'>+		for (b = (SAS_ADDR_SIZE - 1); b &gt;= 0; b--) {</div><div class='add'>+			r &lt;&lt;= 1;</div><div class='add'>+			if ((1 &lt;&lt; b) &amp; sas_addr[i]) {</div><div class='add'>+				if (!(r &amp; 0x01000000))</div><div class='add'>+					r ^= poly;</div><div class='add'>+			} else if (r &amp; 0x01000000) {</div><div class='add'>+				r ^= poly;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hashed[0] = (r &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+	hashed[1] = (r &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	hashed[2] = r &amp; 0xFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sas_register_ha(struct sas_ha_struct *sas_ha)</div><div class='hunk'>@@ -623,7 +625,7 @@ struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy)</div><div class='ctx'> 	if (atomic_read(&amp;phy-&gt;event_nr) &gt; phy-&gt;ha-&gt;event_thres) {</div><div class='ctx'> 		if (i-&gt;dft-&gt;lldd_control_phy) {</div><div class='ctx'> 			if (cmpxchg(&amp;phy-&gt;in_shutdown, 0, 1) == 0) {</div><div class='del'>-				pr_notice("The phy%02d bursting events, shut it down.\n",</div><div class='add'>+				pr_notice("The phy%d bursting events, shut it down.\n",</div><div class='ctx'> 					  phy-&gt;id);</div><div class='ctx'> 				sas_notify_phy_event(phy, PHYE_SHUTDOWN);</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c<br/>index 0374243c85d0..e030e1452136 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/libsas/sas_phy.c</a></div><div class='hunk'>@@ -122,11 +122,10 @@ static void sas_phye_shutdown(struct work_struct *work)</div><div class='ctx'> 		phy-&gt;enabled = 0;</div><div class='ctx'> 		ret = i-&gt;dft-&gt;lldd_control_phy(phy, PHY_FUNC_DISABLE, NULL);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			pr_notice("lldd disable phy%02d returned %d\n",</div><div class='del'>-				  phy-&gt;id, ret);</div><div class='add'>+			pr_notice("lldd disable phy%d returned %d\n", phy-&gt;id,</div><div class='add'>+				  ret);</div><div class='ctx'> 	} else</div><div class='del'>-		pr_notice("phy%02d is not enabled, cannot shutdown\n",</div><div class='del'>-			  phy-&gt;id);</div><div class='add'>+		pr_notice("phy%d is not enabled, cannot shutdown\n", phy-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---------- Phy class registration ---------- */</div><div class='head'>diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c<br/>index 03fe479359b6..38a10478605c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_port.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/libsas/sas_port.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/libsas/sas_port.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/libsas/sas_port.c</a></div><div class='hunk'>@@ -95,6 +95,7 @@ static void sas_form_port(struct asd_sas_phy *phy)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct sas_ha_struct *sas_ha = phy-&gt;ha;</div><div class='ctx'> 	struct asd_sas_port *port = phy-&gt;port;</div><div class='add'>+	struct domain_device *port_dev;</div><div class='ctx'> 	struct sas_internal *si =</div><div class='ctx'> 		to_sas_internal(sas_ha-&gt;core.shost-&gt;transportt);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -153,8 +154,9 @@ static void sas_form_port(struct asd_sas_phy *phy)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add the phy to the port */</div><div class='add'>+	port_dev = port-&gt;port_dev;</div><div class='ctx'> 	list_add_tail(&amp;phy-&gt;port_phy_el, &amp;port-&gt;phy_list);</div><div class='del'>-	sas_phy_set_target(phy, port-&gt;port_dev);</div><div class='add'>+	sas_phy_set_target(phy, port_dev);</div><div class='ctx'> 	phy-&gt;port = port;</div><div class='ctx'> 	port-&gt;num_phys++;</div><div class='ctx'> 	port-&gt;phy_mask |= (1U &lt;&lt; phy-&gt;id);</div><div class='hunk'>@@ -184,14 +186,21 @@ static void sas_form_port(struct asd_sas_phy *phy)</div><div class='ctx'> 		 port-&gt;phy_mask,</div><div class='ctx'> 		 SAS_ADDR(port-&gt;attached_sas_addr));</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;port_dev)</div><div class='del'>-		port-&gt;port_dev-&gt;pathways = port-&gt;num_phys;</div><div class='add'>+	if (port_dev)</div><div class='add'>+		port_dev-&gt;pathways = port-&gt;num_phys;</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the LLDD about this port formation. */</div><div class='ctx'> 	if (si-&gt;dft-&gt;lldd_port_formed)</div><div class='ctx'> 		si-&gt;dft-&gt;lldd_port_formed(phy);</div><div class='ctx'> </div><div class='ctx'> 	sas_discover_event(phy-&gt;port, DISCE_DISCOVER_DOMAIN);</div><div class='add'>+	/* Only insert a revalidate event after initial discovery */</div><div class='add'>+	if (port_dev &amp;&amp; sas_dev_type_is_expander(port_dev-&gt;dev_type)) {</div><div class='add'>+		struct expander_device *ex_dev = &amp;port_dev-&gt;ex_dev;</div><div class='add'>+</div><div class='add'>+		ex_dev-&gt;ex_change_count = -1;</div><div class='add'>+		sas_discover_event(port, DISCE_REVALIDATE_DOMAIN);</div><div class='add'>+	}</div><div class='ctx'> 	flush_workqueue(sas_ha-&gt;disco_q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -254,6 +263,15 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)</div><div class='ctx'> 	spin_unlock(&amp;port-&gt;phy_list_lock);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sas_ha-&gt;phy_port_lock, flags);</div><div class='ctx'> </div><div class='add'>+	/* Only insert revalidate event if the port still has members */</div><div class='add'>+	if (port-&gt;port &amp;&amp; dev &amp;&amp; sas_dev_type_is_expander(dev-&gt;dev_type)) {</div><div class='add'>+		struct expander_device *ex_dev = &amp;dev-&gt;ex_dev;</div><div class='add'>+</div><div class='add'>+		ex_dev-&gt;ex_change_count = -1;</div><div class='add'>+		sas_discover_event(port, DISCE_REVALIDATE_DOMAIN);</div><div class='add'>+	}</div><div class='add'>+	flush_workqueue(sas_ha-&gt;disco_q);</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h<br/>index 41d849f283f6..aafcffaa25f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc.h</a></div><div class='hunk'>@@ -942,6 +942,7 @@ struct lpfc_hba {</div><div class='ctx'> 	int brd_no;			/* FC board number */</div><div class='ctx'> 	char SerialNumber[32];		/* adapter Serial Number */</div><div class='ctx'> 	char OptionROMVersion[32];	/* adapter BIOS / Fcode version */</div><div class='add'>+	char BIOSVersion[16];		/* Boot BIOS version */</div><div class='ctx'> 	char ModelDesc[256];		/* Model Description */</div><div class='ctx'> 	char ModelName[80];		/* Model Name */</div><div class='ctx'> 	char ProgramType[256];		/* Program Type */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c<br/>index ce3e541434dc..e9adb3f1961d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_attr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_attr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_attr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_attr.c</a></div><div class='hunk'>@@ -71,6 +71,23 @@</div><div class='ctx'> #define LPFC_REG_WRITE_KEY_SIZE	4</div><div class='ctx'> #define LPFC_REG_WRITE_KEY	"EMLX"</div><div class='ctx'> </div><div class='add'>+const char *const trunk_errmsg[] = {	/* map errcode */</div><div class='add'>+	"",	/* There is no such error code at index 0*/</div><div class='add'>+	"link negotiated speed does not match existing"</div><div class='add'>+		" trunk - link was \"low\" speed",</div><div class='add'>+	"link negotiated speed does not match"</div><div class='add'>+		" existing trunk - link was \"middle\" speed",</div><div class='add'>+	"link negotiated speed does not match existing"</div><div class='add'>+		" trunk - link was \"high\" speed",</div><div class='add'>+	"Attached to non-trunking port - F_Port",</div><div class='add'>+	"Attached to non-trunking port - N_Port",</div><div class='add'>+	"FLOGI response timeout",</div><div class='add'>+	"non-FLOGI frame received",</div><div class='add'>+	"Invalid FLOGI response",</div><div class='add'>+	"Trunking initialization protocol",</div><div class='add'>+	"Trunk peer device mismatch",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * lpfc_jedec_to_ascii - Hex to ascii convertor according to JEDEC rules</div><div class='ctx'>  * @incr: integer to convert.</div><div class='hunk'>@@ -114,7 +131,7 @@ static ssize_t</div><div class='ctx'> lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n");</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -134,9 +151,9 @@ lpfc_enable_fip_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;hba_flag &amp; HBA_FIP_SUPPORT)</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "1\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "1\n");</div><div class='ctx'> 	else</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "0\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "0\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -564,14 +581,15 @@ lpfc_bg_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	if (phba-&gt;cfg_enable_bg)</div><div class='add'>+	if (phba-&gt;cfg_enable_bg) {</div><div class='ctx'> 		if (phba-&gt;sli3_options &amp; LPFC_SLI3_BG_ENABLED)</div><div class='del'>-			return snprintf(buf, PAGE_SIZE, "BlockGuard Enabled\n");</div><div class='add'>+			return scnprintf(buf, PAGE_SIZE,</div><div class='add'>+					"BlockGuard Enabled\n");</div><div class='ctx'> 		else</div><div class='del'>-			return snprintf(buf, PAGE_SIZE,</div><div class='add'>+			return scnprintf(buf, PAGE_SIZE,</div><div class='ctx'> 					"BlockGuard Not Supported\n");</div><div class='del'>-	else</div><div class='del'>-			return snprintf(buf, PAGE_SIZE,</div><div class='add'>+	} else</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE,</div><div class='ctx'> 					"BlockGuard Disabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -583,7 +601,7 @@ lpfc_bg_guard_err_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='ctx'> 			(unsigned long long)phba-&gt;bg_guard_err_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -595,7 +613,7 @@ lpfc_bg_apptag_err_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='ctx'> 			(unsigned long long)phba-&gt;bg_apptag_err_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -607,7 +625,7 @@ lpfc_bg_reftag_err_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='ctx'> 			(unsigned long long)phba-&gt;bg_reftag_err_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -625,7 +643,7 @@ lpfc_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *host = class_to_shost(dev);</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n",lpfc_info(host));</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", lpfc_info(host));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -644,7 +662,7 @@ lpfc_serialnum_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;SerialNumber);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;SerialNumber);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -666,7 +684,7 @@ lpfc_temp_sensor_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",phba-&gt;temp_sensor_support);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;temp_sensor_support);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -685,7 +703,7 @@ lpfc_modeldesc_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;ModelDesc);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;ModelDesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -704,7 +722,7 @@ lpfc_modelname_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;ModelName);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;ModelName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -723,7 +741,7 @@ lpfc_programtype_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;ProgramType);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;ProgramType);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -741,7 +759,7 @@ lpfc_mlomgmt_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *)shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='ctx'> 		(phba-&gt;sli.sli_flag &amp; LPFC_MENLO_MAINT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -761,7 +779,7 @@ lpfc_vportnum_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n",phba-&gt;Port);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;Port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -789,10 +807,10 @@ lpfc_fwrev_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	sli_family = phba-&gt;sli4_hba.pc_sli4_params.sli_family;</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='del'>-		len = snprintf(buf, PAGE_SIZE, "%s, sli-%d\n",</div><div class='add'>+		len = scnprintf(buf, PAGE_SIZE, "%s, sli-%d\n",</div><div class='ctx'> 			       fwrev, phba-&gt;sli_rev);</div><div class='ctx'> 	else</div><div class='del'>-		len = snprintf(buf, PAGE_SIZE, "%s, sli-%d:%d:%x\n",</div><div class='add'>+		len = scnprintf(buf, PAGE_SIZE, "%s, sli-%d:%d:%x\n",</div><div class='ctx'> 			       fwrev, phba-&gt;sli_rev, if_type, sli_family);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -816,7 +834,7 @@ lpfc_hdw_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	lpfc_vpd_t *vp = &amp;phba-&gt;vpd;</div><div class='ctx'> </div><div class='ctx'> 	lpfc_jedec_to_ascii(vp-&gt;rev.biuRev, hdw);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n", hdw);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", hdw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -837,10 +855,11 @@ lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	char fwrev[FW_REV_STR_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%s\n", phba-&gt;OptionROMVersion);</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%s\n",</div><div class='add'>+				phba-&gt;OptionROMVersion);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_decode_firmware_rev(phba, fwrev, 1);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n", fwrev);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", fwrev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -871,20 +890,20 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	case LPFC_LINK_DOWN:</div><div class='ctx'> 	case LPFC_HBA_ERROR:</div><div class='ctx'> 		if (phba-&gt;hba_flag &amp; LINK_DISABLED)</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 				"Link Down - User disabled\n");</div><div class='ctx'> 		else</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 				"Link Down\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_LINK_UP:</div><div class='ctx'> 	case LPFC_CLEAR_LA:</div><div class='ctx'> 	case LPFC_HBA_READY:</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE-len, "Link Up - ");</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE-len, "Link Up - ");</div><div class='ctx'> </div><div class='ctx'> 		switch (vport-&gt;port_state) {</div><div class='ctx'> 		case LPFC_LOCAL_CFG_LINK:</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 					"Configuring Link\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case LPFC_FDISC:</div><div class='hunk'>@@ -894,38 +913,40 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		case LPFC_NS_QRY:</div><div class='ctx'> 		case LPFC_BUILD_DISC_LIST:</div><div class='ctx'> 		case LPFC_DISC_AUTH:</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"Discovery\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case LPFC_VPORT_READY:</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len, "Ready\n");</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+					"Ready\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case LPFC_VPORT_FAILED:</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len, "Failed\n");</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+					"Failed\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case LPFC_VPORT_UNKNOWN:</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"Unknown\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (phba-&gt;sli.sli_flag &amp; LPFC_MENLO_MAINT)</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 					"   Menlo Maint Mode\n");</div><div class='ctx'> 		else if (phba-&gt;fc_topology == LPFC_TOPOLOGY_LOOP) {</div><div class='ctx'> 			if (vport-&gt;fc_flag &amp; FC_PUBLIC_LOOP)</div><div class='del'>-				len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+				len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 						"   Public Loop\n");</div><div class='ctx'> 			else</div><div class='del'>-				len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+				len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 						"   Private Loop\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (vport-&gt;fc_flag &amp; FC_FABRIC)</div><div class='del'>-				len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+				len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 						"   Fabric\n");</div><div class='ctx'> 			else</div><div class='del'>-				len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+				len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 						"   Point-2-Point\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -937,28 +958,28 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		struct lpfc_trunk_link link = phba-&gt;trunk_link;</div><div class='ctx'> </div><div class='ctx'> 		if (bf_get(lpfc_conf_trunk_port0, &amp;phba-&gt;sli4_hba))</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"Trunk port 0: Link %s %s\n",</div><div class='ctx'> 				(link.link0.state == LPFC_LINK_UP) ?</div><div class='ctx'> 				 "Up" : "Down. ",</div><div class='ctx'> 				trunk_errmsg[link.link0.fault]);</div><div class='ctx'> </div><div class='ctx'> 		if (bf_get(lpfc_conf_trunk_port1, &amp;phba-&gt;sli4_hba))</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"Trunk port 1: Link %s %s\n",</div><div class='ctx'> 				(link.link1.state == LPFC_LINK_UP) ?</div><div class='ctx'> 				 "Up" : "Down. ",</div><div class='ctx'> 				trunk_errmsg[link.link1.fault]);</div><div class='ctx'> </div><div class='ctx'> 		if (bf_get(lpfc_conf_trunk_port2, &amp;phba-&gt;sli4_hba))</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"Trunk port 2: Link %s %s\n",</div><div class='ctx'> 				(link.link2.state == LPFC_LINK_UP) ?</div><div class='ctx'> 				 "Up" : "Down. ",</div><div class='ctx'> 				trunk_errmsg[link.link2.fault]);</div><div class='ctx'> </div><div class='ctx'> 		if (bf_get(lpfc_conf_trunk_port3, &amp;phba-&gt;sli4_hba))</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"Trunk port 3: Link %s %s\n",</div><div class='ctx'> 				(link.link3.state == LPFC_LINK_UP) ?</div><div class='ctx'> 				 "Up" : "Down. ",</div><div class='hunk'>@@ -986,15 +1007,15 @@ lpfc_sli4_protocol_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_hba *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "fc\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "fc\n");</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;sli4_hba.lnk_info.lnk_dv == LPFC_LNK_DAT_VAL) {</div><div class='ctx'> 		if (phba-&gt;sli4_hba.lnk_info.lnk_tp == LPFC_LNK_TYPE_GE)</div><div class='del'>-			return snprintf(buf, PAGE_SIZE, "fcoe\n");</div><div class='add'>+			return scnprintf(buf, PAGE_SIZE, "fcoe\n");</div><div class='ctx'> 		if (phba-&gt;sli4_hba.lnk_info.lnk_tp == LPFC_LNK_TYPE_FC)</div><div class='del'>-			return snprintf(buf, PAGE_SIZE, "fc\n");</div><div class='add'>+			return scnprintf(buf, PAGE_SIZE, "fc\n");</div><div class='ctx'> 	}</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "unknown\n");</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1014,7 +1035,7 @@ lpfc_oas_supported_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *)shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.pc_sli4_params.oas_supported);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1072,7 +1093,7 @@ lpfc_num_discovered_ports_show(struct device *dev,</div><div class='ctx'> 	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='ctx'> 			vport-&gt;fc_map_cnt + vport-&gt;fc_unmap_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1204,6 +1225,20 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)</div><div class='ctx'> </div><div class='ctx'> 	psli = &amp;phba-&gt;sli;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If freeing the queues have already started, don't access them.</div><div class='add'>+	 * Otherwise set FREE_WAIT to indicate that queues are being used</div><div class='add'>+	 * to hold the freeing process until we finish.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	if (!(psli-&gt;sli_flag &amp; LPFC_QUEUE_FREE_INIT)) {</div><div class='add'>+		psli-&gt;sli_flag |= LPFC_QUEUE_FREE_WAIT;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+		goto skip_wait;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='ctx'> 	/* Wait a little for things to settle down, but not</div><div class='ctx'> 	 * long enough for dev loss timeout to expire.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1225,6 +1260,11 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	psli-&gt;sli_flag &amp;= ~LPFC_QUEUE_FREE_WAIT;</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='add'>+skip_wait:</div><div class='ctx'> 	init_completion(&amp;online_compl);</div><div class='ctx'> 	rc = lpfc_workq_post_event(phba, &amp;status, &amp;online_compl, type);</div><div class='ctx'> 	if (rc == 0)</div><div class='hunk'>@@ -1258,7 +1298,7 @@ out:</div><div class='ctx'>  * -EBUSY,    port is not in offline state</div><div class='ctx'>  *      0,    successful</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> lpfc_reset_pci_bus(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = phba-&gt;pcidev;</div><div class='hunk'>@@ -1586,10 +1626,10 @@ lpfc_nport_evt_cnt_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;nport_event_cnt);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;nport_event_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> lpfc_set_trunking(struct lpfc_hba *phba, char *buff_out)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *mbox = NULL;</div><div class='hunk'>@@ -1675,7 +1715,7 @@ lpfc_board_mode_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	else</div><div class='ctx'> 		state = "online";</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n", state);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1901,8 +1941,8 @@ lpfc_max_rpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	uint32_t cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_get_hba_info(phba, NULL, NULL, &amp;cnt, NULL, NULL, NULL))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%d\n", cnt);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%d\n", cnt);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1929,8 +1969,8 @@ lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	uint32_t cnt, acnt;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_get_hba_info(phba, NULL, NULL, &amp;cnt, &amp;acnt, NULL, NULL))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1957,8 +1997,8 @@ lpfc_max_xri_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	uint32_t cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_get_hba_info(phba, &amp;cnt, NULL, NULL, NULL, NULL, NULL))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%d\n", cnt);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%d\n", cnt);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1985,8 +2025,8 @@ lpfc_used_xri_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	uint32_t cnt, acnt;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_get_hba_info(phba, &amp;cnt, &amp;acnt, NULL, NULL, NULL, NULL))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2013,8 +2053,8 @@ lpfc_max_vpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	uint32_t cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_get_hba_info(phba, NULL, NULL, NULL, NULL, &amp;cnt, NULL))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%d\n", cnt);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%d\n", cnt);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2041,8 +2081,8 @@ lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	uint32_t cnt, acnt;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_get_hba_info(phba, NULL, NULL, NULL, NULL, &amp;cnt, &amp;acnt))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "Unknown\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2067,10 +2107,10 @@ lpfc_npiv_info_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='ctx'> 	if (!(phba-&gt;max_vpi))</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "NPIV Not Supported\n");</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "NPIV Not Supported\n");</div><div class='ctx'> 	if (vport-&gt;port_type == LPFC_PHYSICAL_PORT)</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "NPIV Physical\n");</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "NPIV Virtual (VPI %d)\n", vport-&gt;vpi);</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "NPIV Physical\n");</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "NPIV Virtual (VPI %d)\n", vport-&gt;vpi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2092,7 +2132,7 @@ lpfc_poll_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%#x\n", phba-&gt;cfg_poll);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%#x\n", phba-&gt;cfg_poll);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2196,7 +2236,7 @@ lpfc_fips_level_show(struct device *dev,  struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;fips_level);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;fips_level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2215,7 +2255,7 @@ lpfc_fips_rev_show(struct device *dev,  struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;fips_spec_rev);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;fips_spec_rev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2234,7 +2274,7 @@ lpfc_dss_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s - %sOperational\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s - %sOperational\n",</div><div class='ctx'> 			(phba-&gt;cfg_enable_dss) ? "Enabled" : "Disabled",</div><div class='ctx'> 			(phba-&gt;sli3_options &amp; LPFC_SLI3_DSS_ENABLED) ?</div><div class='ctx'> 				"" : "Not ");</div><div class='hunk'>@@ -2263,7 +2303,7 @@ lpfc_sriov_hw_max_virtfn_show(struct device *dev,</div><div class='ctx'> 	uint16_t max_nr_virtfn;</div><div class='ctx'> </div><div class='ctx'> 	max_nr_virtfn = lpfc_sli_sriov_nr_virtfn_get(phba);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", max_nr_virtfn);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", max_nr_virtfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool lpfc_rangecheck(uint val, uint min, uint max)</div><div class='hunk'>@@ -2323,7 +2363,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	struct Scsi_Host  *shost = class_to_shost(dev);\</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;\</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;\</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",\</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",\</div><div class='ctx'> 			phba-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2351,7 +2391,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;\</div><div class='ctx'> 	uint val = 0;\</div><div class='ctx'> 	val = phba-&gt;cfg_##attr;\</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%#x\n",\</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%#x\n",\</div><div class='ctx'> 			phba-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2487,7 +2527,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> { \</div><div class='ctx'> 	struct Scsi_Host  *shost = class_to_shost(dev);\</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;\</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", vport-&gt;cfg_##attr);\</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", vport-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2512,7 +2552,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> { \</div><div class='ctx'> 	struct Scsi_Host  *shost = class_to_shost(dev);\</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;\</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%#x\n", vport-&gt;cfg_##attr);\</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%#x\n", vport-&gt;cfg_##attr);\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2784,7 +2824,7 @@ lpfc_soft_wwpn_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='ctx'> 			(unsigned long long)phba-&gt;cfg_soft_wwpn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2881,7 +2921,7 @@ lpfc_soft_wwnn_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_hba *phba = ((struct lpfc_vport *)shost-&gt;hostdata)-&gt;phba;</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='ctx'> 			(unsigned long long)phba-&gt;cfg_soft_wwnn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2947,7 +2987,7 @@ lpfc_oas_tgt_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_hba *phba = ((struct lpfc_vport *)shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='ctx'> 			wwn_to_u64(phba-&gt;cfg_oas_tgt_wwpn));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3015,7 +3055,7 @@ lpfc_oas_priority_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_hba *phba = ((struct lpfc_vport *)shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;cfg_oas_priority);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;cfg_oas_priority);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3078,7 +3118,7 @@ lpfc_oas_vpt_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_hba *phba = ((struct lpfc_vport *)shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "0x%llx\n",</div><div class='ctx'> 			wwn_to_u64(phba-&gt;cfg_oas_vpt_wwpn));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3149,7 +3189,7 @@ lpfc_oas_lun_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_hba *phba = ((struct lpfc_vport *)shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;cfg_oas_lun_state);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;cfg_oas_lun_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3213,7 +3253,7 @@ lpfc_oas_lun_status_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	if (!(phba-&gt;cfg_oas_flags &amp; OAS_LUN_VALID))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;cfg_oas_lun_status);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;cfg_oas_lun_status);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(lpfc_xlane_lun_status, S_IRUGO,</div><div class='ctx'> 		   lpfc_oas_lun_status_show, NULL);</div><div class='hunk'>@@ -3365,7 +3405,7 @@ lpfc_oas_lun_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	if (oas_lun != NOT_OAS_ENABLED_LUN)</div><div class='ctx'> 		phba-&gt;cfg_oas_flags |= OAS_LUN_VALID;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len, "0x%llx", oas_lun);</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len, "0x%llx", oas_lun);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -3499,7 +3539,7 @@ lpfc_iocb_hw_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_hba   *phba = ((struct lpfc_vport *) shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;iocb_max);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n", phba-&gt;iocb_max);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(iocb_hw, S_IRUGO,</div><div class='hunk'>@@ -3511,7 +3551,7 @@ lpfc_txq_hw_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	struct lpfc_hba   *phba = ((struct lpfc_vport *) shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> 	struct lpfc_sli_ring *pring = lpfc_phba_elsring(phba);</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='ctx'> 			pring ? pring-&gt;txq_max : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3525,7 +3565,7 @@ lpfc_txcmplq_hw_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_hba   *phba = ((struct lpfc_vport *) shost-&gt;hostdata)-&gt;phba;</div><div class='ctx'> 	struct lpfc_sli_ring *pring = lpfc_phba_elsring(phba);</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='ctx'> 			pring ? pring-&gt;txcmplq_max : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3561,7 +3601,7 @@ lpfc_nodev_tmo_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n",	vport-&gt;cfg_devloss_tmo);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d\n",	vport-&gt;cfg_devloss_tmo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4050,9 +4090,9 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((phba-&gt;pcidev-&gt;device == PCI_DEVICE_ID_LANCER_G6_FC ||</div><div class='ctx'> 		     phba-&gt;pcidev-&gt;device == PCI_DEVICE_ID_LANCER_G7_FC) &amp;&amp;</div><div class='del'>-		    val == 4) {</div><div class='add'>+		    val != FLAGS_TOPOLOGY_MODE_PT_PT) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				"3114 Loop mode not supported\n");</div><div class='add'>+				"3114 Only non-FC-AL mode is supported\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		phba-&gt;cfg_topology = val;</div><div class='hunk'>@@ -5169,12 +5209,12 @@ lpfc_fcp_cpu_map_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	switch (phba-&gt;cfg_fcp_cpu_map) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 				"fcp_cpu_map: No mapping (%d)\n",</div><div class='ctx'> 				phba-&gt;cfg_fcp_cpu_map);</div><div class='ctx'> 		return len;</div><div class='ctx'> 	case 1:</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 				"fcp_cpu_map: HBA centric mapping (%d): "</div><div class='ctx'> 				"%d of %d CPUs online from %d possible CPUs\n",</div><div class='ctx'> 				phba-&gt;cfg_fcp_cpu_map, num_online_cpus(),</div><div class='hunk'>@@ -5188,12 +5228,12 @@ lpfc_fcp_cpu_map_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		cpup = &amp;phba-&gt;sli4_hba.cpu_map[phba-&gt;sli4_hba.curr_disp_cpu];</div><div class='ctx'> </div><div class='ctx'> 		if (!cpu_present(phba-&gt;sli4_hba.curr_disp_cpu))</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"CPU %02d not present\n",</div><div class='ctx'> 					phba-&gt;sli4_hba.curr_disp_cpu);</div><div class='ctx'> 		else if (cpup-&gt;irq == LPFC_VECTOR_MAP_EMPTY) {</div><div class='ctx'> 			if (cpup-&gt;hdwq == LPFC_VECTOR_MAP_EMPTY)</div><div class='del'>-				len += snprintf(</div><div class='add'>+				len += scnprintf(</div><div class='ctx'> 					buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"CPU %02d hdwq None "</div><div class='ctx'> 					"physid %d coreid %d ht %d\n",</div><div class='hunk'>@@ -5201,7 +5241,7 @@ lpfc_fcp_cpu_map_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 					cpup-&gt;phys_id,</div><div class='ctx'> 					cpup-&gt;core_id, cpup-&gt;hyper);</div><div class='ctx'> 			else</div><div class='del'>-				len += snprintf(</div><div class='add'>+				len += scnprintf(</div><div class='ctx'> 					buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"CPU %02d EQ %04d hdwq %04d "</div><div class='ctx'> 					"physid %d coreid %d ht %d\n",</div><div class='hunk'>@@ -5210,7 +5250,7 @@ lpfc_fcp_cpu_map_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 					cpup-&gt;core_id, cpup-&gt;hyper);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (cpup-&gt;hdwq == LPFC_VECTOR_MAP_EMPTY)</div><div class='del'>-				len += snprintf(</div><div class='add'>+				len += scnprintf(</div><div class='ctx'> 					buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"CPU %02d hdwq None "</div><div class='ctx'> 					"physid %d coreid %d ht %d IRQ %d\n",</div><div class='hunk'>@@ -5218,7 +5258,7 @@ lpfc_fcp_cpu_map_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 					cpup-&gt;phys_id,</div><div class='ctx'> 					cpup-&gt;core_id, cpup-&gt;hyper, cpup-&gt;irq);</div><div class='ctx'> 			else</div><div class='del'>-				len += snprintf(</div><div class='add'>+				len += scnprintf(</div><div class='ctx'> 					buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"CPU %02d EQ %04d hdwq %04d "</div><div class='ctx'> 					"physid %d coreid %d ht %d IRQ %d\n",</div><div class='hunk'>@@ -5233,7 +5273,7 @@ lpfc_fcp_cpu_map_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		if (phba-&gt;sli4_hba.curr_disp_cpu &lt;</div><div class='ctx'> 				phba-&gt;sli4_hba.num_possible_cpu &amp;&amp;</div><div class='ctx'> 				(len &gt;= (PAGE_SIZE - 64))) {</div><div class='del'>-			len += snprintf(buf + len,</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='ctx'> 					PAGE_SIZE - len, "more...\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5753,10 +5793,10 @@ lpfc_sg_seg_cnt_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	len = snprintf(buf, PAGE_SIZE, "SGL sz: %d  total SGEs: %d\n",</div><div class='add'>+	len = scnprintf(buf, PAGE_SIZE, "SGL sz: %d  total SGEs: %d\n",</div><div class='ctx'> 		       phba-&gt;cfg_sg_dma_buf_size, phba-&gt;cfg_total_seg_cnt);</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE, "Cfg: %d  SCSI: %d  NVME: %d\n",</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE, "Cfg: %d  SCSI: %d  NVME: %d\n",</div><div class='ctx'> 			phba-&gt;cfg_sg_seg_cnt, phba-&gt;cfg_scsi_seg_cnt,</div><div class='ctx'> 			phba-&gt;cfg_nvme_seg_cnt);</div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -6755,7 +6795,7 @@ lpfc_show_rport_##field (struct device *dev,				\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct fc_rport *rport = transport_class_to_rport(dev);		\</div><div class='ctx'> 	struct lpfc_rport_data *rdata = rport-&gt;hostdata;		\</div><div class='del'>-	return snprintf(buf, sz, format_string,				\</div><div class='add'>+	return scnprintf(buf, sz, format_string,			\</div><div class='ctx'> 		(rdata-&gt;target) ? cast rdata-&gt;target-&gt;field : 0);	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7003,6 +7043,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)</div><div class='ctx'> 	if (phba-&gt;sli_rev != LPFC_SLI_REV4) {</div><div class='ctx'> 		/* NVME only supported on SLI4 */</div><div class='ctx'> 		phba-&gt;nvmet_support = 0;</div><div class='add'>+		phba-&gt;cfg_nvmet_mrq = 0;</div><div class='ctx'> 		phba-&gt;cfg_enable_fc4_type = LPFC_ENABLE_FCP;</div><div class='ctx'> 		phba-&gt;cfg_enable_bbcr = 0;</div><div class='ctx'> 		phba-&gt;cfg_xri_rebalancing = 0;</div><div class='hunk'>@@ -7104,7 +7145,7 @@ lpfc_nvme_mod_param_dep(struct lpfc_hba *phba)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Not NVME Target mode.  Turn off Target parameters. */</div><div class='ctx'> 		phba-&gt;nvmet_support = 0;</div><div class='del'>-		phba-&gt;cfg_nvmet_mrq = LPFC_NVMET_MRQ_OFF;</div><div class='add'>+		phba-&gt;cfg_nvmet_mrq = 0;</div><div class='ctx'> 		phba-&gt;cfg_nvmet_fb_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c<br/>index f2494d3b365c..b0202bc0aa62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_bsg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_bsg.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************</div><div class='ctx'>  * This file is part of the Emulex Linux Device Driver for         *</div><div class='ctx'>  * Fibre Channel Host Bus Adapters.                                *</div><div class='del'>- * Copyright (C) 2017-2018 Broadcom. All Rights Reserved. The term *</div><div class='add'>+ * Copyright (C) 2017-2019 Broadcom. All Rights Reserved. The term *</div><div class='ctx'>  * “Broadcom� refers to Broadcom Inc. and/or its subsidiaries.     *</div><div class='ctx'>  * Copyright (C) 2009-2015 Emulex.  All rights reserved.           *</div><div class='ctx'>  * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='hunk'>@@ -1968,14 +1968,17 @@ link_diag_state_set_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_sli4_bsg_set_internal_loopback - set sli4 internal loopback diagnostic</div><div class='add'>+ * lpfc_sli4_bsg_set_loopback_mode - set sli4 internal loopback diagnostic</div><div class='ctx'>  * @phba: Pointer to HBA context object.</div><div class='add'>+ * @mode: loopback mode to set</div><div class='add'>+ * @link_no: link number for loopback mode to set</div><div class='ctx'>  *</div><div class='ctx'>  * This function is responsible for issuing a sli4 mailbox command for setting</div><div class='del'>- * up internal loopback diagnostic.</div><div class='add'>+ * up loopback diagnostic for a link.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-lpfc_sli4_bsg_set_internal_loopback(struct lpfc_hba *phba)</div><div class='add'>+lpfc_sli4_bsg_set_loopback_mode(struct lpfc_hba *phba, int mode,</div><div class='add'>+				uint32_t link_no)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *pmboxq;</div><div class='ctx'> 	uint32_t req_len, alloc_len;</div><div class='hunk'>@@ -1996,11 +1999,19 @@ lpfc_sli4_bsg_set_internal_loopback(struct lpfc_hba *phba)</div><div class='ctx'> 	}</div><div class='ctx'> 	link_diag_loopback = &amp;pmboxq-&gt;u.mqe.un.link_diag_loopback;</div><div class='ctx'> 	bf_set(lpfc_mbx_set_diag_state_link_num,</div><div class='del'>-	       &amp;link_diag_loopback-&gt;u.req, phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='del'>-	bf_set(lpfc_mbx_set_diag_state_link_type,</div><div class='del'>-	       &amp;link_diag_loopback-&gt;u.req, phba-&gt;sli4_hba.lnk_info.lnk_tp);</div><div class='add'>+	       &amp;link_diag_loopback-&gt;u.req, link_no);</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;sli4_hba.conf_trunk &amp; (1 &lt;&lt; link_no)) {</div><div class='add'>+		bf_set(lpfc_mbx_set_diag_state_link_type,</div><div class='add'>+		       &amp;link_diag_loopback-&gt;u.req, LPFC_LNK_FC_TRUNKED);</div><div class='add'>+	} else {</div><div class='add'>+		bf_set(lpfc_mbx_set_diag_state_link_type,</div><div class='add'>+		       &amp;link_diag_loopback-&gt;u.req,</div><div class='add'>+		       phba-&gt;sli4_hba.lnk_info.lnk_tp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bf_set(lpfc_mbx_set_diag_lpbk_type, &amp;link_diag_loopback-&gt;u.req,</div><div class='del'>-	       LPFC_DIAG_LOOPBACK_TYPE_INTERNAL);</div><div class='add'>+	       mode);</div><div class='ctx'> </div><div class='ctx'> 	mbxstatus = lpfc_sli_issue_mbox_wait(phba, pmboxq, LPFC_MBOX_TMO);</div><div class='ctx'> 	if ((mbxstatus != MBX_SUCCESS) || (pmboxq-&gt;u.mb.mbxStatus)) {</div><div class='hunk'>@@ -2054,7 +2065,7 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct bsg_job *job)</div><div class='ctx'> 	struct fc_bsg_request *bsg_request = job-&gt;request;</div><div class='ctx'> 	struct fc_bsg_reply *bsg_reply = job-&gt;reply;</div><div class='ctx'> 	struct diag_mode_set *loopback_mode;</div><div class='del'>-	uint32_t link_flags, timeout;</div><div class='add'>+	uint32_t link_flags, timeout, link_no;</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* no data to return just the return code */</div><div class='hunk'>@@ -2069,12 +2080,39 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct bsg_job *job)</div><div class='ctx'> 				(int)(sizeof(struct fc_bsg_request) +</div><div class='ctx'> 				sizeof(struct diag_mode_set)));</div><div class='ctx'> 		rc = -EINVAL;</div><div class='del'>-		goto job_error;</div><div class='add'>+		goto job_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loopback_mode = (struct diag_mode_set *)</div><div class='add'>+		bsg_request-&gt;rqst_data.h_vendor.vendor_cmd;</div><div class='add'>+	link_flags = loopback_mode-&gt;type;</div><div class='add'>+	timeout = loopback_mode-&gt;timeout * 100;</div><div class='add'>+</div><div class='add'>+	if (loopback_mode-&gt;physical_link == -1)</div><div class='add'>+		link_no = phba-&gt;sli4_hba.lnk_info.lnk_no;</div><div class='add'>+	else</div><div class='add'>+		link_no = loopback_mode-&gt;physical_link;</div><div class='add'>+</div><div class='add'>+	if (link_flags == DISABLE_LOOP_BACK) {</div><div class='add'>+		rc = lpfc_sli4_bsg_set_loopback_mode(phba,</div><div class='add'>+					LPFC_DIAG_LOOPBACK_TYPE_DISABLE,</div><div class='add'>+					link_no);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			/* Unset the need disable bit */</div><div class='add'>+			phba-&gt;sli4_hba.conf_trunk &amp;= ~((1 &lt;&lt; link_no) &lt;&lt; 4);</div><div class='add'>+		}</div><div class='add'>+		goto job_done;</div><div class='add'>+	} else {</div><div class='add'>+		/* Check if we need to disable the loopback state */</div><div class='add'>+		if (phba-&gt;sli4_hba.conf_trunk &amp; ((1 &lt;&lt; link_no) &lt;&lt; 4)) {</div><div class='add'>+			rc = -EPERM;</div><div class='add'>+			goto job_done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = lpfc_bsg_diag_mode_enter(phba);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto job_error;</div><div class='add'>+		goto job_done;</div><div class='ctx'> </div><div class='ctx'> 	/* indicate we are in loobpack diagnostic mode */</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='hunk'>@@ -2084,15 +2122,11 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct bsg_job *job)</div><div class='ctx'> 	/* reset port to start frome scratch */</div><div class='ctx'> 	rc = lpfc_selective_reset(phba);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto job_error;</div><div class='add'>+		goto job_done;</div><div class='ctx'> </div><div class='ctx'> 	/* bring the link to diagnostic mode */</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='ctx'> 			"3129 Bring link to diagnostic state.\n");</div><div class='del'>-	loopback_mode = (struct diag_mode_set *)</div><div class='del'>-		bsg_request-&gt;rqst_data.h_vendor.vendor_cmd;</div><div class='del'>-	link_flags = loopback_mode-&gt;type;</div><div class='del'>-	timeout = loopback_mode-&gt;timeout * 100;</div><div class='ctx'> </div><div class='ctx'> 	rc = lpfc_sli4_bsg_set_link_diag_state(phba, 1);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -2120,13 +2154,54 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct bsg_job *job)</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='ctx'> 			"3132 Set up loopback mode:x%x\n", link_flags);</div><div class='ctx'> </div><div class='del'>-	if (link_flags == INTERNAL_LOOP_BACK)</div><div class='del'>-		rc = lpfc_sli4_bsg_set_internal_loopback(phba);</div><div class='del'>-	else if (link_flags == EXTERNAL_LOOP_BACK)</div><div class='del'>-		rc = lpfc_hba_init_link_fc_topology(phba,</div><div class='del'>-						    FLAGS_TOPOLOGY_MODE_PT_PT,</div><div class='del'>-						    MBX_NOWAIT);</div><div class='del'>-	else {</div><div class='add'>+	switch (link_flags) {</div><div class='add'>+	case INTERNAL_LOOP_BACK:</div><div class='add'>+		if (phba-&gt;sli4_hba.conf_trunk &amp; (1 &lt;&lt; link_no)) {</div><div class='add'>+			rc = lpfc_sli4_bsg_set_loopback_mode(phba,</div><div class='add'>+					LPFC_DIAG_LOOPBACK_TYPE_INTERNAL,</div><div class='add'>+					link_no);</div><div class='add'>+		} else {</div><div class='add'>+			/* Trunk is configured, but link is not in this trunk */</div><div class='add'>+			if (phba-&gt;sli4_hba.conf_trunk) {</div><div class='add'>+				rc = -ELNRNG;</div><div class='add'>+				goto loopback_mode_exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rc = lpfc_sli4_bsg_set_loopback_mode(phba,</div><div class='add'>+					LPFC_DIAG_LOOPBACK_TYPE_INTERNAL,</div><div class='add'>+					link_no);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!rc) {</div><div class='add'>+			/* Set the need disable bit */</div><div class='add'>+			phba-&gt;sli4_hba.conf_trunk |= (1 &lt;&lt; link_no) &lt;&lt; 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case EXTERNAL_LOOP_BACK:</div><div class='add'>+		if (phba-&gt;sli4_hba.conf_trunk &amp; (1 &lt;&lt; link_no)) {</div><div class='add'>+			rc = lpfc_sli4_bsg_set_loopback_mode(phba,</div><div class='add'>+				LPFC_DIAG_LOOPBACK_TYPE_EXTERNAL_TRUNKED,</div><div class='add'>+				link_no);</div><div class='add'>+		} else {</div><div class='add'>+			/* Trunk is configured, but link is not in this trunk */</div><div class='add'>+			if (phba-&gt;sli4_hba.conf_trunk) {</div><div class='add'>+				rc = -ELNRNG;</div><div class='add'>+				goto loopback_mode_exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rc = lpfc_sli4_bsg_set_loopback_mode(phba,</div><div class='add'>+						LPFC_DIAG_LOOPBACK_TYPE_SERDES,</div><div class='add'>+						link_no);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!rc) {</div><div class='add'>+			/* Set the need disable bit */</div><div class='add'>+			phba-&gt;sli4_hba.conf_trunk |= (1 &lt;&lt; link_no) &lt;&lt; 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,</div><div class='ctx'> 				"3141 Loopback mode:x%x not supported\n",</div><div class='hunk'>@@ -2185,7 +2260,7 @@ loopback_mode_exit:</div><div class='ctx'> 	}</div><div class='ctx'> 	lpfc_bsg_diag_mode_exit(phba);</div><div class='ctx'> </div><div class='del'>-job_error:</div><div class='add'>+job_done:</div><div class='ctx'> 	/* make error code available to userspace */</div><div class='ctx'> 	bsg_reply-&gt;result = rc;</div><div class='ctx'> 	/* complete the job back to userspace if no error */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_bsg.h b/drivers/scsi/lpfc/lpfc_bsg.h<br/>index 9151824beea4..d1708133fd54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_bsg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_bsg.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************</div><div class='ctx'>  * This file is part of the Emulex Linux Device Driver for         *</div><div class='ctx'>  * Fibre Channel Host Bus Adapters.                                *</div><div class='del'>- * Copyright (C) 2017-2018 Broadcom. All Rights Reserved. The term *</div><div class='add'>+ * Copyright (C) 2017-2019 Broadcom. All Rights Reserved. The term *</div><div class='ctx'>  * “Broadcom� refers to Broadcom Inc. and/or its subsidiaries.     *</div><div class='ctx'>  * Copyright (C) 2010-2015 Emulex.  All rights reserved.           *</div><div class='ctx'>  * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='hunk'>@@ -68,6 +68,7 @@ struct send_mgmt_resp {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define DISABLE_LOOP_BACK  0x0 /* disables loop back */</div><div class='ctx'> #define INTERNAL_LOOP_BACK 0x1 /* adapter short cuts the loop internally */</div><div class='ctx'> #define EXTERNAL_LOOP_BACK 0x2 /* requires an external loopback plug */</div><div class='ctx'> </div><div class='hunk'>@@ -75,6 +76,7 @@ struct diag_mode_set {</div><div class='ctx'> 	uint32_t command;</div><div class='ctx'> 	uint32_t type;</div><div class='ctx'> 	uint32_t timeout;</div><div class='add'>+	uint32_t physical_link;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sli4_link_diag {</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c<br/>index 7290573110fe..4812bbbf43cc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_ct.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_ct.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_ct.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_ct.c</a></div><div class='hunk'>@@ -886,7 +886,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (lpfc_error_lost_link(irsp)) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,</div><div class='del'>-				 "4101 NS query failed due to link event\n");</div><div class='add'>+				 "4166 NS query failed due to link event\n");</div><div class='ctx'> 		if (vport-&gt;fc_flag &amp; FC_RSCN_MODE)</div><div class='ctx'> 			lpfc_els_flush_rscn(vport);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -907,7 +907,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		 * Re-issue the NS cmd</div><div class='ctx'> 		 */</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,</div><div class='del'>-				 "4102 Process Deferred RSCN Data: x%x x%x\n",</div><div class='add'>+				 "4167 Process Deferred RSCN Data: x%x x%x\n",</div><div class='ctx'> 				 vport-&gt;fc_flag, vport-&gt;fc_rscn_id_cnt);</div><div class='ctx'> 		lpfc_els_handle_rscn(vport);</div><div class='ctx'> </div><div class='hunk'>@@ -1430,7 +1430,7 @@ lpfc_vport_symbolic_port_name(struct lpfc_vport *vport, char *symbol,</div><div class='ctx'> 	 * Name object.  NPIV is not in play so this integer</div><div class='ctx'> 	 * value is sufficient and unique per FC-ID.</div><div class='ctx'> 	 */</div><div class='del'>-	n = snprintf(symbol, size, "%d", vport-&gt;phba-&gt;brd_no);</div><div class='add'>+	n = scnprintf(symbol, size, "%d", vport-&gt;phba-&gt;brd_no);</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1444,26 +1444,26 @@ lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, char *symbol,</div><div class='ctx'> </div><div class='ctx'> 	lpfc_decode_firmware_rev(vport-&gt;phba, fwrev, 0);</div><div class='ctx'> </div><div class='del'>-	n = snprintf(symbol, size, "Emulex %s", vport-&gt;phba-&gt;ModelName);</div><div class='add'>+	n = scnprintf(symbol, size, "Emulex %s", vport-&gt;phba-&gt;ModelName);</div><div class='ctx'> 	if (size &lt; n)</div><div class='ctx'> 		return n;</div><div class='ctx'> </div><div class='del'>-	n += snprintf(symbol + n, size - n, " FV%s", fwrev);</div><div class='add'>+	n += scnprintf(symbol + n, size - n, " FV%s", fwrev);</div><div class='ctx'> 	if (size &lt; n)</div><div class='ctx'> 		return n;</div><div class='ctx'> </div><div class='del'>-	n += snprintf(symbol + n, size - n, " DV%s.",</div><div class='add'>+	n += scnprintf(symbol + n, size - n, " DV%s.",</div><div class='ctx'> 		      lpfc_release_version);</div><div class='ctx'> 	if (size &lt; n)</div><div class='ctx'> 		return n;</div><div class='ctx'> </div><div class='del'>-	n += snprintf(symbol + n, size - n, " HN:%s.",</div><div class='add'>+	n += scnprintf(symbol + n, size - n, " HN:%s.",</div><div class='ctx'> 		      init_utsname()-&gt;nodename);</div><div class='ctx'> 	if (size &lt; n)</div><div class='ctx'> 		return n;</div><div class='ctx'> </div><div class='ctx'> 	/* Note :- OS name is "Linux" */</div><div class='del'>-	n += snprintf(symbol + n, size - n, " OS:%s\n",</div><div class='add'>+	n += scnprintf(symbol + n, size - n, " OS:%s",</div><div class='ctx'> 		      init_utsname()-&gt;sysname);</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='hunk'>@@ -2005,8 +2005,11 @@ lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport,</div><div class='ctx'> 	ae = (struct lpfc_fdmi_attr_entry *)&amp;ad-&gt;AttrValue;</div><div class='ctx'> 	memset(ae, 0, 256);</div><div class='ctx'> </div><div class='add'>+	/* This string MUST be consistent with other FC platforms</div><div class='add'>+	 * supported by Broadcom.</div><div class='add'>+	 */</div><div class='ctx'> 	strncpy(ae-&gt;un.AttrString,</div><div class='del'>-		"Broadcom Inc.",</div><div class='add'>+		"Emulex Corporation",</div><div class='ctx'> 		       sizeof(ae-&gt;un.AttrString));</div><div class='ctx'> 	len = strnlen(ae-&gt;un.AttrString,</div><div class='ctx'> 			  sizeof(ae-&gt;un.AttrString));</div><div class='hunk'>@@ -2301,7 +2304,8 @@ lpfc_fdmi_hba_attr_bios_ver(struct lpfc_vport *vport,</div><div class='ctx'> 	ae = (struct lpfc_fdmi_attr_entry *)&amp;ad-&gt;AttrValue;</div><div class='ctx'> 	memset(ae, 0, 256);</div><div class='ctx'> </div><div class='del'>-	lpfc_decode_firmware_rev(phba, ae-&gt;un.AttrString, 1);</div><div class='add'>+	strlcat(ae-&gt;un.AttrString, phba-&gt;BIOSVersion,</div><div class='add'>+		sizeof(ae-&gt;un.AttrString));</div><div class='ctx'> 	len = strnlen(ae-&gt;un.AttrString,</div><div class='ctx'> 			  sizeof(ae-&gt;un.AttrString));</div><div class='ctx'> 	len += (len &amp; 3) ? (4 - (len &amp; 3)) : 4;</div><div class='hunk'>@@ -2360,10 +2364,11 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport,</div><div class='ctx'> 	ae = (struct lpfc_fdmi_attr_entry *)&amp;ad-&gt;AttrValue;</div><div class='ctx'> 	memset(ae, 0, 32);</div><div class='ctx'> </div><div class='del'>-	ae-&gt;un.AttrTypes[3] = 0x02; /* Type 1 - ELS */</div><div class='del'>-	ae-&gt;un.AttrTypes[2] = 0x01; /* Type 8 - FCP */</div><div class='del'>-	ae-&gt;un.AttrTypes[6] = 0x01; /* Type 40 - NVME */</div><div class='del'>-	ae-&gt;un.AttrTypes[7] = 0x01; /* Type 32 - CT */</div><div class='add'>+	ae-&gt;un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */</div><div class='add'>+	ae-&gt;un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */</div><div class='add'>+	if (vport-&gt;nvmei_support || vport-&gt;phba-&gt;nvmet_support)</div><div class='add'>+		ae-&gt;un.AttrTypes[6] = 0x01; /* Type 0x28 - NVME */</div><div class='add'>+	ae-&gt;un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */</div><div class='ctx'> 	size = FOURBYTES + 32;</div><div class='ctx'> 	ad-&gt;AttrLen = cpu_to_be16(size);</div><div class='ctx'> 	ad-&gt;AttrType = cpu_to_be16(RPRT_SUPPORTED_FC4_TYPES);</div><div class='hunk'>@@ -2673,9 +2678,11 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport,</div><div class='ctx'> 	ae = (struct lpfc_fdmi_attr_entry *)&amp;ad-&gt;AttrValue;</div><div class='ctx'> 	memset(ae, 0, 32);</div><div class='ctx'> </div><div class='del'>-	ae-&gt;un.AttrTypes[3] = 0x02; /* Type 1 - ELS */</div><div class='del'>-	ae-&gt;un.AttrTypes[2] = 0x01; /* Type 8 - FCP */</div><div class='del'>-	ae-&gt;un.AttrTypes[7] = 0x01; /* Type 32 - CT */</div><div class='add'>+	ae-&gt;un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */</div><div class='add'>+	ae-&gt;un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */</div><div class='add'>+	if (vport-&gt;phba-&gt;cfg_enable_fc4_type &amp; LPFC_ENABLE_NVME)</div><div class='add'>+		ae-&gt;un.AttrTypes[6] = 0x1; /* Type 0x28 - NVME */</div><div class='add'>+	ae-&gt;un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */</div><div class='ctx'> 	size = FOURBYTES + 32;</div><div class='ctx'> 	ad-&gt;AttrLen = cpu_to_be16(size);</div><div class='ctx'> 	ad-&gt;AttrType = cpu_to_be16(RPRT_ACTIVE_FC4_TYPES);</div><div class='hunk'>@@ -3092,6 +3099,7 @@ port_out:</div><div class='ctx'> 	case SLI_MGMT_GHAT:</div><div class='ctx'> 	case SLI_MGMT_GRPL:</div><div class='ctx'> 		rsp_size = FC_MAX_NS_RSP;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case SLI_MGMT_DHBA:</div><div class='ctx'> 	case SLI_MGMT_DHAT:</div><div class='ctx'> 		pe = (struct lpfc_fdmi_port_entry *)&amp;CtReq-&gt;un.PortID;</div><div class='hunk'>@@ -3104,6 +3112,7 @@ port_out:</div><div class='ctx'> 	case SLI_MGMT_GPAT:</div><div class='ctx'> 	case SLI_MGMT_GPAS:</div><div class='ctx'> 		rsp_size = FC_MAX_NS_RSP;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case SLI_MGMT_DPRT:</div><div class='ctx'> 	case SLI_MGMT_DPA:</div><div class='ctx'> 		pe = (struct lpfc_fdmi_port_entry *)&amp;CtReq-&gt;un.PortID;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c<br/>index 1215eaa530db..1ee857d9d165 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_debugfs.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		snprintf(buffer,</div><div class='ctx'> 			LPFC_DEBUG_TRC_ENTRY_SIZE, "%010d:%010d ms:%s\n",</div><div class='ctx'> 			dtp-&gt;seq_cnt, ms, dtp-&gt;fmt);</div><div class='del'>-		len +=  snprintf(buf+len, size-len, buffer,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, buffer,</div><div class='ctx'> 			dtp-&gt;data1, dtp-&gt;data2, dtp-&gt;data3);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; index; i++) {</div><div class='hunk'>@@ -181,7 +181,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		snprintf(buffer,</div><div class='ctx'> 			LPFC_DEBUG_TRC_ENTRY_SIZE, "%010d:%010d ms:%s\n",</div><div class='ctx'> 			dtp-&gt;seq_cnt, ms, dtp-&gt;fmt);</div><div class='del'>-		len +=  snprintf(buf+len, size-len, buffer,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, buffer,</div><div class='ctx'> 			dtp-&gt;data1, dtp-&gt;data2, dtp-&gt;data3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +236,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		snprintf(buffer,</div><div class='ctx'> 			LPFC_DEBUG_TRC_ENTRY_SIZE, "%010d:%010d ms:%s\n",</div><div class='ctx'> 			dtp-&gt;seq_cnt, ms, dtp-&gt;fmt);</div><div class='del'>-		len +=  snprintf(buf+len, size-len, buffer,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, buffer,</div><div class='ctx'> 			dtp-&gt;data1, dtp-&gt;data2, dtp-&gt;data3);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; index; i++) {</div><div class='hunk'>@@ -247,7 +247,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		snprintf(buffer,</div><div class='ctx'> 			LPFC_DEBUG_TRC_ENTRY_SIZE, "%010d:%010d ms:%s\n",</div><div class='ctx'> 			dtp-&gt;seq_cnt, ms, dtp-&gt;fmt);</div><div class='del'>-		len +=  snprintf(buf+len, size-len, buffer,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, buffer,</div><div class='ctx'> 			dtp-&gt;data1, dtp-&gt;data2, dtp-&gt;data3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -307,7 +307,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> </div><div class='ctx'> 	i = lpfc_debugfs_last_hbq;</div><div class='ctx'> </div><div class='del'>-	len +=  snprintf(buf+len, size-len, "HBQ %d Info\n", i);</div><div class='add'>+	len +=  scnprintf(buf+len, size-len, "HBQ %d Info\n", i);</div><div class='ctx'> </div><div class='ctx'> 	hbqs =  &amp;phba-&gt;hbqs[i];</div><div class='ctx'> 	posted = 0;</div><div class='hunk'>@@ -315,21 +315,21 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		posted++;</div><div class='ctx'> </div><div class='ctx'> 	hip =  lpfc_hbq_defs[i];</div><div class='del'>-	len +=  snprintf(buf+len, size-len,</div><div class='add'>+	len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 		"idx:%d prof:%d rn:%d bufcnt:%d icnt:%d acnt:%d posted %d\n",</div><div class='ctx'> 		hip-&gt;hbq_index, hip-&gt;profile, hip-&gt;rn,</div><div class='ctx'> 		hip-&gt;buffer_count, hip-&gt;init_count, hip-&gt;add_count, posted);</div><div class='ctx'> </div><div class='ctx'> 	raw_index = phba-&gt;hbq_get[i];</div><div class='ctx'> 	getidx = le32_to_cpu(raw_index);</div><div class='del'>-	len +=  snprintf(buf+len, size-len,</div><div class='add'>+	len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 		"entries:%d bufcnt:%d Put:%d nPut:%d localGet:%d hbaGet:%d\n",</div><div class='ctx'> 		hbqs-&gt;entry_count, hbqs-&gt;buffer_count, hbqs-&gt;hbqPutIdx,</div><div class='ctx'> 		hbqs-&gt;next_hbqPutIdx, hbqs-&gt;local_hbqGetIdx, getidx);</div><div class='ctx'> </div><div class='ctx'> 	hbqe = (struct lpfc_hbq_entry *) phba-&gt;hbqs[i].hbq_virt;</div><div class='ctx'> 	for (j=0; j&lt;hbqs-&gt;entry_count; j++) {</div><div class='del'>-		len +=  snprintf(buf+len, size-len,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 			"%03d: %08x %04x %05x ", j,</div><div class='ctx'> 			le32_to_cpu(hbqe-&gt;bde.addrLow),</div><div class='ctx'> 			le32_to_cpu(hbqe-&gt;bde.tus.w),</div><div class='hunk'>@@ -341,14 +341,16 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		low = hbqs-&gt;hbqPutIdx - posted;</div><div class='ctx'> 		if (low &gt;= 0) {</div><div class='ctx'> 			if ((j &gt;= hbqs-&gt;hbqPutIdx) || (j &lt; low)) {</div><div class='del'>-				len +=  snprintf(buf+len, size-len, "Unused\n");</div><div class='add'>+				len +=  scnprintf(buf + len, size - len,</div><div class='add'>+						"Unused\n");</div><div class='ctx'> 				goto skipit;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='ctx'> 			if ((j &gt;= hbqs-&gt;hbqPutIdx) &amp;&amp;</div><div class='ctx'> 				(j &lt; (hbqs-&gt;entry_count+low))) {</div><div class='del'>-				len +=  snprintf(buf+len, size-len, "Unused\n");</div><div class='add'>+				len +=  scnprintf(buf + len, size - len,</div><div class='add'>+						"Unused\n");</div><div class='ctx'> 				goto skipit;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -358,7 +360,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 			hbq_buf = container_of(d_buf, struct hbq_dmabuf, dbuf);</div><div class='ctx'> 			phys = ((uint64_t)hbq_buf-&gt;dbuf.phys &amp; 0xffffffff);</div><div class='ctx'> 			if (phys == le32_to_cpu(hbqe-&gt;bde.addrLow)) {</div><div class='del'>-				len +=  snprintf(buf+len, size-len,</div><div class='add'>+				len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 					"Buf%d: %p %06x\n", i,</div><div class='ctx'> 					hbq_buf-&gt;dbuf.virt, hbq_buf-&gt;tag);</div><div class='ctx'> 				found = 1;</div><div class='hunk'>@@ -367,7 +369,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 			i++;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!found) {</div><div class='del'>-			len +=  snprintf(buf+len, size-len, "No DMAinfo?\n");</div><div class='add'>+			len +=  scnprintf(buf+len, size-len, "No DMAinfo?\n");</div><div class='ctx'> 		}</div><div class='ctx'> skipit:</div><div class='ctx'> 		hbqe++;</div><div class='hunk'>@@ -413,14 +415,14 @@ lpfc_debugfs_commonxripools_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 			break;</div><div class='ctx'> 		qp = &amp;phba-&gt;sli4_hba.hdwq[lpfc_debugfs_last_xripool];</div><div class='ctx'> </div><div class='del'>-		len +=  snprintf(buf + len, size - len, "HdwQ %d Info ", i);</div><div class='add'>+		len += scnprintf(buf + len, size - len, "HdwQ %d Info ", i);</div><div class='ctx'> 		spin_lock_irqsave(&amp;qp-&gt;abts_scsi_buf_list_lock, iflag);</div><div class='ctx'> 		spin_lock(&amp;qp-&gt;abts_nvme_buf_list_lock);</div><div class='ctx'> 		spin_lock(&amp;qp-&gt;io_buf_list_get_lock);</div><div class='ctx'> 		spin_lock(&amp;qp-&gt;io_buf_list_put_lock);</div><div class='ctx'> 		out = qp-&gt;total_io_bufs - (qp-&gt;get_io_bufs + qp-&gt;put_io_bufs +</div><div class='ctx'> 			qp-&gt;abts_scsi_io_bufs + qp-&gt;abts_nvme_io_bufs);</div><div class='del'>-		len +=  snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				 "tot:%d get:%d put:%d mt:%d "</div><div class='ctx'> 				 "ABTS scsi:%d nvme:%d Out:%d\n",</div><div class='ctx'> 			qp-&gt;total_io_bufs, qp-&gt;get_io_bufs, qp-&gt;put_io_bufs,</div><div class='hunk'>@@ -612,9 +614,9 @@ lpfc_debugfs_lockstat_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 			break;</div><div class='ctx'> 		qp = &amp;phba-&gt;sli4_hba.hdwq[lpfc_debugfs_last_lock];</div><div class='ctx'> </div><div class='del'>-		len +=  snprintf(buf + len, size - len, "HdwQ %03d Lock ", i);</div><div class='add'>+		len += scnprintf(buf + len, size - len, "HdwQ %03d Lock ", i);</div><div class='ctx'> 		if (phba-&gt;cfg_xri_rebalancing) {</div><div class='del'>-			len +=  snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					 "get_pvt:%d mv_pvt:%d "</div><div class='ctx'> 					 "mv2pub:%d mv2pvt:%d "</div><div class='ctx'> 					 "put_pvt:%d put_pub:%d wq:%d\n",</div><div class='hunk'>@@ -626,7 +628,7 @@ lpfc_debugfs_lockstat_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 					 qp-&gt;lock_conflict.free_pub_pool,</div><div class='ctx'> 					 qp-&gt;lock_conflict.wq_access);</div><div class='ctx'> 		} else {</div><div class='del'>-			len +=  snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					 "get:%d put:%d free:%d wq:%d\n",</div><div class='ctx'> 					 qp-&gt;lock_conflict.alloc_xri_get,</div><div class='ctx'> 					 qp-&gt;lock_conflict.alloc_xri_put,</div><div class='hunk'>@@ -678,7 +680,7 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 	off = 0;</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='del'>-	len +=  snprintf(buf+len, size-len, "HBA SLIM\n");</div><div class='add'>+	len +=  scnprintf(buf+len, size-len, "HBA SLIM\n");</div><div class='ctx'> 	lpfc_memcpy_from_slim(buffer,</div><div class='ctx'> 		phba-&gt;MBslimaddr + lpfc_debugfs_last_hba_slim_off, 1024);</div><div class='ctx'> </div><div class='hunk'>@@ -692,7 +694,7 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> </div><div class='ctx'> 	i = 1024;</div><div class='ctx'> 	while (i &gt; 0) {</div><div class='del'>-		len +=  snprintf(buf+len, size-len,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 		"%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",</div><div class='ctx'> 		off, *ptr, *(ptr+1), *(ptr+2), *(ptr+3), *(ptr+4),</div><div class='ctx'> 		*(ptr+5), *(ptr+6), *(ptr+7));</div><div class='hunk'>@@ -736,11 +738,11 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 	off = 0;</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='del'>-	len +=  snprintf(buf+len, size-len, "SLIM Mailbox\n");</div><div class='add'>+	len +=  scnprintf(buf+len, size-len, "SLIM Mailbox\n");</div><div class='ctx'> 	ptr = (uint32_t *)phba-&gt;slim2p.virt;</div><div class='ctx'> 	i = sizeof(MAILBOX_t);</div><div class='ctx'> 	while (i &gt; 0) {</div><div class='del'>-		len +=  snprintf(buf+len, size-len,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 		"%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",</div><div class='ctx'> 		off, *ptr, *(ptr+1), *(ptr+2), *(ptr+3), *(ptr+4),</div><div class='ctx'> 		*(ptr+5), *(ptr+6), *(ptr+7));</div><div class='hunk'>@@ -749,11 +751,11 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		off += (8 * sizeof(uint32_t));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len +=  snprintf(buf+len, size-len, "SLIM PCB\n");</div><div class='add'>+	len +=  scnprintf(buf+len, size-len, "SLIM PCB\n");</div><div class='ctx'> 	ptr = (uint32_t *)phba-&gt;pcb;</div><div class='ctx'> 	i = sizeof(PCB_t);</div><div class='ctx'> 	while (i &gt; 0) {</div><div class='del'>-		len +=  snprintf(buf+len, size-len,</div><div class='add'>+		len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 		"%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",</div><div class='ctx'> 		off, *ptr, *(ptr+1), *(ptr+2), *(ptr+3), *(ptr+4),</div><div class='ctx'> 		*(ptr+5), *(ptr+6), *(ptr+7));</div><div class='hunk'>@@ -766,7 +768,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 			pgpp = &amp;phba-&gt;port_gp[i];</div><div class='ctx'> 			pring = &amp;psli-&gt;sli3_ring[i];</div><div class='del'>-			len +=  snprintf(buf+len, size-len,</div><div class='add'>+			len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 					 "Ring %d: CMD GetInx:%d "</div><div class='ctx'> 					 "(Max:%d Next:%d "</div><div class='ctx'> 					 "Local:%d flg:x%x)  "</div><div class='hunk'>@@ -783,7 +785,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		word1 = readl(phba-&gt;CAregaddr);</div><div class='ctx'> 		word2 = readl(phba-&gt;HSregaddr);</div><div class='ctx'> 		word3 = readl(phba-&gt;HCregaddr);</div><div class='del'>-		len +=  snprintf(buf+len, size-len, "HA:%08x CA:%08x HS:%08x "</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, "HA:%08x CA:%08x HS:%08x "</div><div class='ctx'> 				 "HC:%08x\n", word0, word1, word2, word3);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='hunk'>@@ -821,12 +823,12 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	cnt = (LPFC_NODELIST_SIZE / LPFC_NODELIST_ENTRY_SIZE);</div><div class='ctx'> 	outio = 0;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf+len, size-len, "\nFCP Nodelist Entries ...\n");</div><div class='add'>+	len += scnprintf(buf+len, size-len, "\nFCP Nodelist Entries ...\n");</div><div class='ctx'> 	spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 	list_for_each_entry(ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='ctx'> 		iocnt = 0;</div><div class='ctx'> 		if (!cnt) {</div><div class='del'>-			len +=  snprintf(buf+len, size-len,</div><div class='add'>+			len +=  scnprintf(buf+len, size-len,</div><div class='ctx'> 				"Missing Nodelist Entries\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -864,63 +866,63 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		default:</div><div class='ctx'> 			statep = "UNKNOWN";</div><div class='ctx'> 		}</div><div class='del'>-		len += snprintf(buf+len, size-len, "%s DID:x%06x ",</div><div class='add'>+		len += scnprintf(buf+len, size-len, "%s DID:x%06x ",</div><div class='ctx'> 				statep, ndlp-&gt;nlp_DID);</div><div class='del'>-		len += snprintf(buf+len, size-len,</div><div class='add'>+		len += scnprintf(buf+len, size-len,</div><div class='ctx'> 				"WWPN x%llx ",</div><div class='ctx'> 				wwn_to_u64(ndlp-&gt;nlp_portname.u.wwn));</div><div class='del'>-		len += snprintf(buf+len, size-len,</div><div class='add'>+		len += scnprintf(buf+len, size-len,</div><div class='ctx'> 				"WWNN x%llx ",</div><div class='ctx'> 				wwn_to_u64(ndlp-&gt;nlp_nodename.u.wwn));</div><div class='ctx'> 		if (ndlp-&gt;nlp_flag &amp; NLP_RPI_REGISTERED)</div><div class='del'>-			len += snprintf(buf+len, size-len, "RPI:%03d ",</div><div class='add'>+			len += scnprintf(buf+len, size-len, "RPI:%03d ",</div><div class='ctx'> 					ndlp-&gt;nlp_rpi);</div><div class='ctx'> 		else</div><div class='del'>-			len += snprintf(buf+len, size-len, "RPI:none ");</div><div class='del'>-		len +=  snprintf(buf+len, size-len, "flag:x%08x ",</div><div class='add'>+			len += scnprintf(buf+len, size-len, "RPI:none ");</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, "flag:x%08x ",</div><div class='ctx'> 			ndlp-&gt;nlp_flag);</div><div class='ctx'> 		if (!ndlp-&gt;nlp_type)</div><div class='del'>-			len += snprintf(buf+len, size-len, "UNKNOWN_TYPE ");</div><div class='add'>+			len += scnprintf(buf+len, size-len, "UNKNOWN_TYPE ");</div><div class='ctx'> 		if (ndlp-&gt;nlp_type &amp; NLP_FC_NODE)</div><div class='del'>-			len += snprintf(buf+len, size-len, "FC_NODE ");</div><div class='add'>+			len += scnprintf(buf+len, size-len, "FC_NODE ");</div><div class='ctx'> 		if (ndlp-&gt;nlp_type &amp; NLP_FABRIC) {</div><div class='del'>-			len += snprintf(buf+len, size-len, "FABRIC ");</div><div class='add'>+			len += scnprintf(buf+len, size-len, "FABRIC ");</div><div class='ctx'> 			iocnt = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ndlp-&gt;nlp_type &amp; NLP_FCP_TARGET)</div><div class='del'>-			len += snprintf(buf+len, size-len, "FCP_TGT sid:%d ",</div><div class='add'>+			len += scnprintf(buf+len, size-len, "FCP_TGT sid:%d ",</div><div class='ctx'> 				ndlp-&gt;nlp_sid);</div><div class='ctx'> 		if (ndlp-&gt;nlp_type &amp; NLP_FCP_INITIATOR)</div><div class='del'>-			len += snprintf(buf+len, size-len, "FCP_INITIATOR ");</div><div class='add'>+			len += scnprintf(buf+len, size-len, "FCP_INITIATOR ");</div><div class='ctx'> 		if (ndlp-&gt;nlp_type &amp; NLP_NVME_TARGET)</div><div class='del'>-			len += snprintf(buf + len,</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='ctx'> 					size - len, "NVME_TGT sid:%d ",</div><div class='ctx'> 					NLP_NO_SID);</div><div class='ctx'> 		if (ndlp-&gt;nlp_type &amp; NLP_NVME_INITIATOR)</div><div class='del'>-			len += snprintf(buf + len,</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='ctx'> 					size - len, "NVME_INITIATOR ");</div><div class='del'>-		len += snprintf(buf+len, size-len, "usgmap:%x ",</div><div class='add'>+		len += scnprintf(buf+len, size-len, "usgmap:%x ",</div><div class='ctx'> 			ndlp-&gt;nlp_usg_map);</div><div class='del'>-		len += snprintf(buf+len, size-len, "refcnt:%x",</div><div class='add'>+		len += scnprintf(buf+len, size-len, "refcnt:%x",</div><div class='ctx'> 			kref_read(&amp;ndlp-&gt;kref));</div><div class='ctx'> 		if (iocnt) {</div><div class='ctx'> 			i = atomic_read(&amp;ndlp-&gt;cmd_pending);</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					" OutIO:x%x Qdepth x%x",</div><div class='ctx'> 					i, ndlp-&gt;cmd_qdepth);</div><div class='ctx'> 			outio += i;</div><div class='ctx'> 		}</div><div class='del'>-		len += snprintf(buf + len, size - len, "defer:%x ",</div><div class='add'>+		len += scnprintf(buf + len, size - len, "defer:%x ",</div><div class='ctx'> 			ndlp-&gt;nlp_defer_did);</div><div class='del'>-		len +=  snprintf(buf+len, size-len, "\n");</div><div class='add'>+		len +=  scnprintf(buf+len, size-len, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, size - len,</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='ctx'> 			"\nOutstanding IO x%x\n",  outio);</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;nvmet_support &amp;&amp; phba-&gt;targetport &amp;&amp; (vport == phba-&gt;pport)) {</div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"\nNVME Targetport Entry ...\n");</div><div class='ctx'> </div><div class='ctx'> 		/* Port state is only one of two values for now. */</div><div class='hunk'>@@ -928,18 +930,18 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 			statep = "REGISTERED";</div><div class='ctx'> 		else</div><div class='ctx'> 			statep = "INIT";</div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"TGT WWNN x%llx WWPN x%llx State %s\n",</div><div class='ctx'> 				wwn_to_u64(vport-&gt;fc_nodename.u.wwn),</div><div class='ctx'> 				wwn_to_u64(vport-&gt;fc_portname.u.wwn),</div><div class='ctx'> 				statep);</div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"    Targetport DID x%06x\n",</div><div class='ctx'> 				phba-&gt;targetport-&gt;port_id);</div><div class='ctx'> 		goto out_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, size - len,</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"\nNVME Lport/Rport Entries ...\n");</div><div class='ctx'> </div><div class='ctx'> 	localport = vport-&gt;localport;</div><div class='hunk'>@@ -954,11 +956,11 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	else</div><div class='ctx'> 		statep = "UNKNOWN ";</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, size - len,</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='ctx'> 			"Lport DID x%06x PortState %s\n",</div><div class='ctx'> 			localport-&gt;port_id, statep);</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, size - len, "\tRport List:\n");</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\tRport List:\n");</div><div class='ctx'> 	list_for_each_entry(ndlp, &amp;vport-&gt;fc_nodes, nlp_listp) {</div><div class='ctx'> 		/* local short-hand pointer. */</div><div class='ctx'> 		spin_lock(&amp;phba-&gt;hbalock);</div><div class='hunk'>@@ -985,32 +987,32 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Tab in to show lport ownership. */</div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"\t%s Port ID:x%06x ",</div><div class='ctx'> 				statep, nrport-&gt;port_id);</div><div class='del'>-		len += snprintf(buf + len, size - len, "WWPN x%llx ",</div><div class='add'>+		len += scnprintf(buf + len, size - len, "WWPN x%llx ",</div><div class='ctx'> 				nrport-&gt;port_name);</div><div class='del'>-		len += snprintf(buf + len, size - len, "WWNN x%llx ",</div><div class='add'>+		len += scnprintf(buf + len, size - len, "WWNN x%llx ",</div><div class='ctx'> 				nrport-&gt;node_name);</div><div class='ctx'> </div><div class='ctx'> 		/* An NVME rport can have multiple roles. */</div><div class='ctx'> 		if (nrport-&gt;port_role &amp; FC_PORT_ROLE_NVME_INITIATOR)</div><div class='del'>-			len +=  snprintf(buf + len, size - len,</div><div class='add'>+			len +=  scnprintf(buf + len, size - len,</div><div class='ctx'> 					 "INITIATOR ");</div><div class='ctx'> 		if (nrport-&gt;port_role &amp; FC_PORT_ROLE_NVME_TARGET)</div><div class='del'>-			len +=  snprintf(buf + len, size - len,</div><div class='add'>+			len +=  scnprintf(buf + len, size - len,</div><div class='ctx'> 					 "TARGET ");</div><div class='ctx'> 		if (nrport-&gt;port_role &amp; FC_PORT_ROLE_NVME_DISCOVERY)</div><div class='del'>-			len +=  snprintf(buf + len, size - len,</div><div class='add'>+			len +=  scnprintf(buf + len, size - len,</div><div class='ctx'> 					 "DISCSRVC ");</div><div class='ctx'> 		if (nrport-&gt;port_role &amp; ~(FC_PORT_ROLE_NVME_INITIATOR |</div><div class='ctx'> 					  FC_PORT_ROLE_NVME_TARGET |</div><div class='ctx'> 					  FC_PORT_ROLE_NVME_DISCOVERY))</div><div class='del'>-			len +=  snprintf(buf + len, size - len,</div><div class='add'>+			len +=  scnprintf(buf + len, size - len,</div><div class='ctx'> 					 "UNKNOWN ROLE x%x",</div><div class='ctx'> 					 nrport-&gt;port_role);</div><div class='ctx'> 		/* Terminate the string. */</div><div class='del'>-		len +=  snprintf(buf + len, size - len, "\n");</div><div class='add'>+		len +=  scnprintf(buf + len, size - len, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='hunk'>@@ -1049,35 +1051,35 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		if (!phba-&gt;targetport)</div><div class='ctx'> 			return len;</div><div class='ctx'> 		tgtp = (struct lpfc_nvmet_tgtport *)phba-&gt;targetport-&gt;private;</div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"\nNVME Targetport Statistics\n");</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"LS: Rcv %08x Drop %08x Abort %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;rcv_ls_req_in),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;rcv_ls_req_drop),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_abort));</div><div class='ctx'> 		if (atomic_read(&amp;tgtp-&gt;rcv_ls_req_in) !=</div><div class='ctx'> 		    atomic_read(&amp;tgtp-&gt;rcv_ls_req_out)) {</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"Rcv LS: in %08x != out %08x\n",</div><div class='ctx'> 					atomic_read(&amp;tgtp-&gt;rcv_ls_req_in),</div><div class='ctx'> 					atomic_read(&amp;tgtp-&gt;rcv_ls_req_out));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"LS: Xmt %08x Drop %08x Cmpl %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_rsp),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_drop),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_rsp_cmpl));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"LS: RSP Abort %08x xb %08x Err %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_rsp_aborted),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_rsp_xb_set),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_ls_rsp_error));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"FCP: Rcv %08x Defer %08x Release %08x "</div><div class='ctx'> 				"Drop %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;rcv_fcp_cmd_in),</div><div class='hunk'>@@ -1087,13 +1089,13 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;tgtp-&gt;rcv_fcp_cmd_in) !=</div><div class='ctx'> 		    atomic_read(&amp;tgtp-&gt;rcv_fcp_cmd_out)) {</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"Rcv FCP: in %08x != out %08x\n",</div><div class='ctx'> 					atomic_read(&amp;tgtp-&gt;rcv_fcp_cmd_in),</div><div class='ctx'> 					atomic_read(&amp;tgtp-&gt;rcv_fcp_cmd_out));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"FCP Rsp: read %08x readrsp %08x "</div><div class='ctx'> 				"write %08x rsp %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_read),</div><div class='hunk'>@@ -1101,31 +1103,31 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_write),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_rsp));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"FCP Rsp Cmpl: %08x err %08x drop %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_rsp_cmpl),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_rsp_error),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_rsp_drop));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"FCP Rsp Abort: %08x xb %08x xricqe  %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_rsp_aborted),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_rsp_xb_set),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_xri_abort_cqe));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"ABORT: Xmt %08x Cmpl %08x\n",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_abort),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_fcp_abort_cmpl));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"ABORT: Sol %08x  Usol %08x Err %08x Cmpl %08x",</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_abort_sol),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_abort_unsol),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_abort_rsp),</div><div class='ctx'> 				atomic_read(&amp;tgtp-&gt;xmt_abort_rsp_error));</div><div class='ctx'> </div><div class='del'>-		len +=  snprintf(buf + len, size - len, "\n");</div><div class='add'>+		len +=  scnprintf(buf + len, size - len, "\n");</div><div class='ctx'> </div><div class='ctx'> 		cnt = 0;</div><div class='ctx'> 		spin_lock(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='hunk'>@@ -1136,7 +1138,7 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='ctx'> 		if (cnt) {</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"ABORT: %d ctx entries\n", cnt);</div><div class='ctx'> 			spin_lock(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='ctx'> 			list_for_each_entry_safe(ctxp, next_ctxp,</div><div class='hunk'>@@ -1144,7 +1146,7 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 				    list) {</div><div class='ctx'> 				if (len &gt;= (size - LPFC_DEBUG_OUT_LINE_SZ))</div><div class='ctx'> 					break;</div><div class='del'>-				len += snprintf(buf + len, size - len,</div><div class='add'>+				len += scnprintf(buf + len, size - len,</div><div class='ctx'> 						"Entry: oxid %x state %x "</div><div class='ctx'> 						"flag %x\n",</div><div class='ctx'> 						ctxp-&gt;oxid, ctxp-&gt;state,</div><div class='hunk'>@@ -1158,7 +1160,7 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		tot += atomic_read(&amp;tgtp-&gt;xmt_fcp_release);</div><div class='ctx'> 		tot = atomic_read(&amp;tgtp-&gt;rcv_fcp_cmd_in) - tot;</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"IO_CTX: %08x  WAIT: cur %08x tot %08x\n"</div><div class='ctx'> 				"CTX Outstanding %08llx\n",</div><div class='ctx'> 				phba-&gt;sli4_hba.nvmet_xri_cnt,</div><div class='hunk'>@@ -1176,10 +1178,10 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		if (!lport)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"\nNVME HDWQ Statistics\n");</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"LS: Xmt %016x Cmpl %016x\n",</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;fc4NvmeLsRequests),</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;fc4NvmeLsCmpls));</div><div class='hunk'>@@ -1199,20 +1201,20 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 			if (i &gt;= 32)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"HDWQ (%d): Rd %016llx Wr %016llx "</div><div class='ctx'> 					"IO %016llx ",</div><div class='ctx'> 					i, data1, data2, data3);</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"Cmpl %016llx OutIO %016llx\n",</div><div class='ctx'> 					tot, ((data1 + data2 + data3) - tot));</div><div class='ctx'> 		}</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"Total FCP Cmpl %016llx Issue %016llx "</div><div class='ctx'> 				"OutIO %016llx\n",</div><div class='ctx'> 				totin, totout, totout - totin);</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"LS Xmt Err: Abrt %08x Err %08x  "</div><div class='ctx'> 				"Cmpl Err: xb %08x Err %08x\n",</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;xmt_ls_abort),</div><div class='hunk'>@@ -1220,7 +1222,7 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;cmpl_ls_xb),</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;cmpl_ls_err));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"FCP Xmt Err: noxri %06x nondlp %06x "</div><div class='ctx'> 				"qdepth %06x wqerr %06x err %06x Abrt %06x\n",</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;xmt_fcp_noxri),</div><div class='hunk'>@@ -1230,7 +1232,7 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;xmt_fcp_err),</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;xmt_fcp_abort));</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, size - len,</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='ctx'> 				"FCP Cmpl Err: xb %08x Err %08x\n",</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;cmpl_fcp_xb),</div><div class='ctx'> 				atomic_read(&amp;lport-&gt;cmpl_fcp_err));</div><div class='hunk'>@@ -1322,58 +1324,58 @@ lpfc_debugfs_nvmektime_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;nvmet_support == 0) {</div><div class='ctx'> 		/* NVME Initiator */</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"ktime %s: Total Samples: %lld\n",</div><div class='ctx'> 				(phba-&gt;ktime_on ?  "Enabled" : "Disabled"),</div><div class='ctx'> 				phba-&gt;ktime_data_samples);</div><div class='ctx'> 		if (phba-&gt;ktime_data_samples == 0)</div><div class='ctx'> 			return len;</div><div class='ctx'> </div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"Segment 1: Last NVME Cmd cmpl "</div><div class='ctx'> 			"done -to- Start of next NVME cnd (in driver)\n");</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg1_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg1_min,</div><div class='ctx'> 			phba-&gt;ktime_seg1_max);</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"Segment 2: Driver start of NVME cmd "</div><div class='ctx'> 			"-to- Firmware WQ doorbell\n");</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg2_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg2_min,</div><div class='ctx'> 			phba-&gt;ktime_seg2_max);</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"Segment 3: Firmware WQ doorbell -to- "</div><div class='ctx'> 			"MSI-X ISR cmpl\n");</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg3_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg3_min,</div><div class='ctx'> 			phba-&gt;ktime_seg3_max);</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"Segment 4: MSI-X ISR cmpl -to- "</div><div class='ctx'> 			"NVME cmpl done\n");</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg4_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg4_min,</div><div class='ctx'> 			phba-&gt;ktime_seg4_max);</div><div class='del'>-		len += snprintf(</div><div class='add'>+		len += scnprintf(</div><div class='ctx'> 			buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"Total IO avg time: %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg1_total +</div><div class='hunk'>@@ -1385,7 +1387,7 @@ lpfc_debugfs_nvmektime_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* NVME Target */</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"ktime %s: Total Samples: %lld %lld\n",</div><div class='ctx'> 			(phba-&gt;ktime_on ? "Enabled" : "Disabled"),</div><div class='ctx'> 			phba-&gt;ktime_data_samples,</div><div class='hunk'>@@ -1393,46 +1395,46 @@ lpfc_debugfs_nvmektime_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	if (phba-&gt;ktime_data_samples == 0)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 1: MSI-X ISR Rcv cmd -to- "</div><div class='ctx'> 			"cmd pass to NVME Layer\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg1_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg1_min,</div><div class='ctx'> 			phba-&gt;ktime_seg1_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 2: cmd pass to NVME Layer- "</div><div class='ctx'> 			"-to- Driver rcv cmd OP (action)\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg2_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg2_min,</div><div class='ctx'> 			phba-&gt;ktime_seg2_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 3: Driver rcv cmd OP -to- "</div><div class='ctx'> 			"Firmware WQ doorbell: cmd\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg3_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg3_min,</div><div class='ctx'> 			phba-&gt;ktime_seg3_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 4: Firmware WQ doorbell: cmd "</div><div class='ctx'> 			"-to- MSI-X ISR for cmd cmpl\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg4_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg4_min,</div><div class='ctx'> 			phba-&gt;ktime_seg4_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 5: MSI-X ISR for cmd cmpl "</div><div class='ctx'> 			"-to- NVME layer passed cmd done\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg5_total,</div><div class='ctx'> 				phba-&gt;ktime_data_samples),</div><div class='hunk'>@@ -1440,10 +1442,10 @@ lpfc_debugfs_nvmektime_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 			phba-&gt;ktime_seg5_max);</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;ktime_status_samples == 0) {</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 				"Total: cmd received by MSI-X ISR "</div><div class='ctx'> 				"-to- cmd completed on wire\n");</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 				"avg:%08lld min:%08lld "</div><div class='ctx'> 				"max %08lld\n",</div><div class='ctx'> 				div_u64(phba-&gt;ktime_seg10_total,</div><div class='hunk'>@@ -1453,46 +1455,46 @@ lpfc_debugfs_nvmektime_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		return len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 6: NVME layer passed cmd done "</div><div class='ctx'> 			"-to- Driver rcv rsp status OP\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg6_total,</div><div class='ctx'> 				phba-&gt;ktime_status_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg6_min,</div><div class='ctx'> 			phba-&gt;ktime_seg6_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 7: Driver rcv rsp status OP "</div><div class='ctx'> 			"-to- Firmware WQ doorbell: status\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg7_total,</div><div class='ctx'> 				phba-&gt;ktime_status_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg7_min,</div><div class='ctx'> 			phba-&gt;ktime_seg7_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 8: Firmware WQ doorbell: status"</div><div class='ctx'> 			" -to- MSI-X ISR for status cmpl\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg8_total,</div><div class='ctx'> 				phba-&gt;ktime_status_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg8_min,</div><div class='ctx'> 			phba-&gt;ktime_seg8_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Segment 9: MSI-X ISR for status cmpl  "</div><div class='ctx'> 			"-to- NVME layer passed status done\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg9_total,</div><div class='ctx'> 				phba-&gt;ktime_status_samples),</div><div class='ctx'> 			phba-&gt;ktime_seg9_min,</div><div class='ctx'> 			phba-&gt;ktime_seg9_max);</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"Total: cmd received by MSI-X ISR -to- "</div><div class='ctx'> 			"cmd completed on wire\n");</div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE-len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE-len,</div><div class='ctx'> 			"avg:%08lld min:%08lld max %08lld\n",</div><div class='ctx'> 			div_u64(phba-&gt;ktime_seg10_total,</div><div class='ctx'> 				phba-&gt;ktime_status_samples),</div><div class='hunk'>@@ -1527,7 +1529,7 @@ lpfc_debugfs_nvmeio_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		(phba-&gt;nvmeio_trc_size - 1);</div><div class='ctx'> 	skip = phba-&gt;nvmeio_trc_output_idx;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, size - len,</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='ctx'> 			"%s IO Trace %s: next_idx %d skip %d size %d\n",</div><div class='ctx'> 			(phba-&gt;nvmet_support ? "NVME" : "NVMET"),</div><div class='ctx'> 			(state ? "Enabled" : "Disabled"),</div><div class='hunk'>@@ -1549,18 +1551,18 @@ lpfc_debugfs_nvmeio_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		if (!dtp-&gt;fmt)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		len +=  snprintf(buf + len, size - len, dtp-&gt;fmt,</div><div class='add'>+		len +=  scnprintf(buf + len, size - len, dtp-&gt;fmt,</div><div class='ctx'> 			dtp-&gt;data1, dtp-&gt;data2, dtp-&gt;data3);</div><div class='ctx'> </div><div class='ctx'> 		if (phba-&gt;nvmeio_trc_output_idx &gt;= phba-&gt;nvmeio_trc_size) {</div><div class='ctx'> 			phba-&gt;nvmeio_trc_output_idx = 0;</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"Trace Complete\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (len &gt;= (size - LPFC_DEBUG_OUT_LINE_SZ)) {</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"Trace Continue (%d of %d)\n",</div><div class='ctx'> 					phba-&gt;nvmeio_trc_output_idx,</div><div class='ctx'> 					phba-&gt;nvmeio_trc_size);</div><div class='hunk'>@@ -1578,18 +1580,18 @@ lpfc_debugfs_nvmeio_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		if (!dtp-&gt;fmt)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		len +=  snprintf(buf + len, size - len, dtp-&gt;fmt,</div><div class='add'>+		len +=  scnprintf(buf + len, size - len, dtp-&gt;fmt,</div><div class='ctx'> 			dtp-&gt;data1, dtp-&gt;data2, dtp-&gt;data3);</div><div class='ctx'> </div><div class='ctx'> 		if (phba-&gt;nvmeio_trc_output_idx &gt;= phba-&gt;nvmeio_trc_size) {</div><div class='ctx'> 			phba-&gt;nvmeio_trc_output_idx = 0;</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"Trace Complete\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (len &gt;= (size - LPFC_DEBUG_OUT_LINE_SZ)) {</div><div class='del'>-			len += snprintf(buf + len, size - len,</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='ctx'> 					"Trace Continue (%d of %d)\n",</div><div class='ctx'> 					phba-&gt;nvmeio_trc_output_idx,</div><div class='ctx'> 					phba-&gt;nvmeio_trc_size);</div><div class='hunk'>@@ -1597,7 +1599,7 @@ lpfc_debugfs_nvmeio_trc_data(struct lpfc_hba *phba, char *buf, int size)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, size - len,</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='ctx'> 			"Trace Done\n");</div><div class='ctx'> out:</div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -1627,17 +1629,17 @@ lpfc_debugfs_cpucheck_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 	uint32_t tot_rcv;</div><div class='ctx'> 	uint32_t tot_cmpl;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+	len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 			"CPUcheck %s ",</div><div class='ctx'> 			(phba-&gt;cpucheck_on &amp; LPFC_CHECK_NVME_IO ?</div><div class='ctx'> 				"Enabled" : "Disabled"));</div><div class='ctx'> 	if (phba-&gt;nvmet_support) {</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"%s\n",</div><div class='ctx'> 				(phba-&gt;cpucheck_on &amp; LPFC_CHECK_NVMET_RCV ?</div><div class='ctx'> 					"Rcv Enabled\n" : "Rcv Disabled\n"));</div><div class='ctx'> 	} else {</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len, "\n");</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	max_cnt = size - LPFC_DEBUG_OUT_LINE_SZ;</div><div class='ctx'> </div><div class='hunk'>@@ -1658,7 +1660,7 @@ lpfc_debugfs_cpucheck_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 		if (!tot_xmt &amp;&amp; !tot_cmpl &amp;&amp; !tot_rcv)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"HDWQ %03d: ", i);</div><div class='ctx'> 		for (j = 0; j &lt; LPFC_CHECK_CPU_CNT; j++) {</div><div class='ctx'> 			/* Only display non-zero counters */</div><div class='hunk'>@@ -1667,22 +1669,22 @@ lpfc_debugfs_cpucheck_data(struct lpfc_vport *vport, char *buf, int size)</div><div class='ctx'> 			    !qp-&gt;cpucheck_rcv_io[j])</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (phba-&gt;nvmet_support) {</div><div class='del'>-				len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+				len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 						"CPU %03d: %x/%x/%x ", j,</div><div class='ctx'> 						qp-&gt;cpucheck_rcv_io[j],</div><div class='ctx'> 						qp-&gt;cpucheck_xmt_io[j],</div><div class='ctx'> 						qp-&gt;cpucheck_cmpl_io[j]);</div><div class='ctx'> 			} else {</div><div class='del'>-				len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+				len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 						"CPU %03d: %x/%x ", j,</div><div class='ctx'> 						qp-&gt;cpucheck_xmt_io[j],</div><div class='ctx'> 						qp-&gt;cpucheck_cmpl_io[j]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 				"Total: %x\n", tot_xmt);</div><div class='ctx'> 		if (len &gt;= max_cnt) {</div><div class='del'>-			len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='add'>+			len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='ctx'> 					"Truncated ...\n");</div><div class='ctx'> 			return len;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2258,28 +2260,29 @@ lpfc_debugfs_dif_err_read(struct file *file, char __user *buf,</div><div class='ctx'> 	int cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dent == phba-&gt;debug_writeGuard)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_wgrd_cnt);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_wgrd_cnt);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_writeApp)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_wapp_cnt);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_wapp_cnt);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_writeRef)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_wref_cnt);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_wref_cnt);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_readGuard)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_rgrd_cnt);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_rgrd_cnt);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_readApp)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_rapp_cnt);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_rapp_cnt);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_readRef)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_rref_cnt);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "%u\n", phba-&gt;lpfc_injerr_rref_cnt);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_InjErrNPortID)</div><div class='del'>-		cnt = snprintf(cbuf, 32, "0x%06x\n", phba-&gt;lpfc_injerr_nportid);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "0x%06x\n",</div><div class='add'>+				phba-&gt;lpfc_injerr_nportid);</div><div class='ctx'> 	else if (dent == phba-&gt;debug_InjErrWWPN) {</div><div class='ctx'> 		memcpy(&amp;tmp, &amp;phba-&gt;lpfc_injerr_wwpn, sizeof(struct lpfc_name));</div><div class='ctx'> 		tmp = cpu_to_be64(tmp);</div><div class='del'>-		cnt = snprintf(cbuf, 32, "0x%016llx\n", tmp);</div><div class='add'>+		cnt = scnprintf(cbuf, 32, "0x%016llx\n", tmp);</div><div class='ctx'> 	} else if (dent == phba-&gt;debug_InjErrLBA) {</div><div class='ctx'> 		if (phba-&gt;lpfc_injerr_lba == (sector_t)(-1))</div><div class='del'>-			cnt = snprintf(cbuf, 32, "off\n");</div><div class='add'>+			cnt = scnprintf(cbuf, 32, "off\n");</div><div class='ctx'> 		else</div><div class='del'>-			cnt = snprintf(cbuf, 32, "0x%llx\n",</div><div class='add'>+			cnt = scnprintf(cbuf, 32, "0x%llx\n",</div><div class='ctx'> 				 (uint64_t) phba-&gt;lpfc_injerr_lba);</div><div class='ctx'> 	} else</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='hunk'>@@ -3224,17 +3227,17 @@ lpfc_idiag_pcicfg_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 	switch (count) {</div><div class='ctx'> 	case SIZE_U8: /* byte (8 bits) */</div><div class='ctx'> 		pci_read_config_byte(pdev, where, &amp;u8val);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 				"%03x: %02x\n", where, u8val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIZE_U16: /* word (16 bits) */</div><div class='ctx'> 		pci_read_config_word(pdev, where, &amp;u16val);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 				"%03x: %04x\n", where, u16val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SIZE_U32: /* double word (32 bits) */</div><div class='ctx'> 		pci_read_config_dword(pdev, where, &amp;u32val);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 				"%03x: %08x\n", where, u32val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_PCI_CFG_BROWSE: /* browse all */</div><div class='hunk'>@@ -3254,25 +3257,25 @@ pcicfg_browse:</div><div class='ctx'> 	offset = offset_label;</div><div class='ctx'> </div><div class='ctx'> 	/* Read PCI config space */</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 			"%03x: ", offset_label);</div><div class='ctx'> 	while (index &gt; 0) {</div><div class='ctx'> 		pci_read_config_dword(pdev, offset, &amp;u32val);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 				"%08x ", u32val);</div><div class='ctx'> 		offset += sizeof(uint32_t);</div><div class='ctx'> 		if (offset &gt;= LPFC_PCI_CFG_SIZE) {</div><div class='del'>-			len += snprintf(pbuffer+len,</div><div class='add'>+			len += scnprintf(pbuffer+len,</div><div class='ctx'> 					LPFC_PCI_CFG_SIZE-len, "\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		index -= sizeof(uint32_t);</div><div class='ctx'> 		if (!index)</div><div class='del'>-			len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+			len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 					"\n");</div><div class='ctx'> 		else if (!(index % (8 * sizeof(uint32_t)))) {</div><div class='ctx'> 			offset_label += (8 * sizeof(uint32_t));</div><div class='del'>-			len += snprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='add'>+			len += scnprintf(pbuffer+len, LPFC_PCI_CFG_SIZE-len,</div><div class='ctx'> 					"\n%03x: ", offset_label);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3543,7 +3546,7 @@ lpfc_idiag_baracc_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 	if (acc_range == SINGLE_WORD) {</div><div class='ctx'> 		offset_run = offset;</div><div class='ctx'> 		u32val = readl(mem_mapped_bar + offset_run);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='ctx'> 				"%05x: %08x\n", offset_run, u32val);</div><div class='ctx'> 	} else</div><div class='ctx'> 		goto baracc_browse;</div><div class='hunk'>@@ -3557,35 +3560,35 @@ baracc_browse:</div><div class='ctx'> 	offset_run = offset_label;</div><div class='ctx'> </div><div class='ctx'> 	/* Read PCI bar memory mapped space */</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='ctx'> 			"%05x: ", offset_label);</div><div class='ctx'> 	index = LPFC_PCI_BAR_RD_SIZE;</div><div class='ctx'> 	while (index &gt; 0) {</div><div class='ctx'> 		u32val = readl(mem_mapped_bar + offset_run);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='ctx'> 				"%08x ", u32val);</div><div class='ctx'> 		offset_run += sizeof(uint32_t);</div><div class='ctx'> 		if (acc_range == LPFC_PCI_BAR_BROWSE) {</div><div class='ctx'> 			if (offset_run &gt;= bar_size) {</div><div class='del'>-				len += snprintf(pbuffer+len,</div><div class='add'>+				len += scnprintf(pbuffer+len,</div><div class='ctx'> 					LPFC_PCI_BAR_RD_BUF_SIZE-len, "\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (offset_run &gt;= offset +</div><div class='ctx'> 			    (acc_range * sizeof(uint32_t))) {</div><div class='del'>-				len += snprintf(pbuffer+len,</div><div class='add'>+				len += scnprintf(pbuffer+len,</div><div class='ctx'> 					LPFC_PCI_BAR_RD_BUF_SIZE-len, "\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		index -= sizeof(uint32_t);</div><div class='ctx'> 		if (!index)</div><div class='del'>-			len += snprintf(pbuffer+len,</div><div class='add'>+			len += scnprintf(pbuffer+len,</div><div class='ctx'> 					LPFC_PCI_BAR_RD_BUF_SIZE-len, "\n");</div><div class='ctx'> 		else if (!(index % (8 * sizeof(uint32_t)))) {</div><div class='ctx'> 			offset_label += (8 * sizeof(uint32_t));</div><div class='del'>-			len += snprintf(pbuffer+len,</div><div class='add'>+			len += scnprintf(pbuffer+len,</div><div class='ctx'> 					LPFC_PCI_BAR_RD_BUF_SIZE-len,</div><div class='ctx'> 					"\n%05x: ", offset_label);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3758,19 +3761,19 @@ __lpfc_idiag_print_wq(struct lpfc_queue *qp, char *wqtype,</div><div class='ctx'> 	if (!qp)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\t\t%s WQ info: ", wqtype);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"AssocCQID[%04d]: WQ-STAT[oflow:x%x posted:x%llx]\n",</div><div class='ctx'> 			qp-&gt;assoc_qid, qp-&gt;q_cnt_1,</div><div class='ctx'> 			(unsigned long long)qp-&gt;q_cnt_4);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\t\tWQID[%02d], QE-CNT[%04d], QE-SZ[%04d], "</div><div class='ctx'> 			"HST-IDX[%04d], PRT-IDX[%04d], NTFI[%03d]",</div><div class='ctx'> 			qp-&gt;queue_id, qp-&gt;entry_count,</div><div class='ctx'> 			qp-&gt;entry_size, qp-&gt;host_index,</div><div class='ctx'> 			qp-&gt;hba_index, qp-&gt;notify_interval);</div><div class='del'>-	len +=  snprintf(pbuffer + len,</div><div class='add'>+	len +=  scnprintf(pbuffer + len,</div><div class='ctx'> 			LPFC_QUE_INFO_GET_BUF_SIZE - len, "\n");</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -3810,21 +3813,22 @@ __lpfc_idiag_print_cq(struct lpfc_queue *qp, char *cqtype,</div><div class='ctx'> 	if (!qp)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\t%s CQ info: ", cqtype);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"AssocEQID[%02d]: CQ STAT[max:x%x relw:x%x "</div><div class='ctx'> 			"xabt:x%x wq:x%llx]\n",</div><div class='ctx'> 			qp-&gt;assoc_qid, qp-&gt;q_cnt_1, qp-&gt;q_cnt_2,</div><div class='ctx'> 			qp-&gt;q_cnt_3, (unsigned long long)qp-&gt;q_cnt_4);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\tCQID[%02d], QE-CNT[%04d], QE-SZ[%04d], "</div><div class='ctx'> 			"HST-IDX[%04d], NTFI[%03d], PLMT[%03d]",</div><div class='ctx'> 			qp-&gt;queue_id, qp-&gt;entry_count,</div><div class='ctx'> 			qp-&gt;entry_size, qp-&gt;host_index,</div><div class='ctx'> 			qp-&gt;notify_interval, qp-&gt;max_proc_limit);</div><div class='ctx'> </div><div class='del'>-	len +=  snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len, "\n");</div><div class='add'>+	len +=  scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+			"\n");</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -3836,19 +3840,19 @@ __lpfc_idiag_print_rqpair(struct lpfc_queue *qp, struct lpfc_queue *datqp,</div><div class='ctx'> 	if (!qp || !datqp)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\t\t%s RQ info: ", rqtype);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"AssocCQID[%02d]: RQ-STAT[nopost:x%x nobuf:x%x "</div><div class='ctx'> 			"posted:x%x rcv:x%llx]\n",</div><div class='ctx'> 			qp-&gt;assoc_qid, qp-&gt;q_cnt_1, qp-&gt;q_cnt_2,</div><div class='ctx'> 			qp-&gt;q_cnt_3, (unsigned long long)qp-&gt;q_cnt_4);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\t\tHQID[%02d], QE-CNT[%04d], QE-SZ[%04d], "</div><div class='ctx'> 			"HST-IDX[%04d], PRT-IDX[%04d], NTFI[%03d]\n",</div><div class='ctx'> 			qp-&gt;queue_id, qp-&gt;entry_count, qp-&gt;entry_size,</div><div class='ctx'> 			qp-&gt;host_index, qp-&gt;hba_index, qp-&gt;notify_interval);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\t\tDQID[%02d], QE-CNT[%04d], QE-SZ[%04d], "</div><div class='ctx'> 			"HST-IDX[%04d], PRT-IDX[%04d], NTFI[%03d]\n",</div><div class='ctx'> 			datqp-&gt;queue_id, datqp-&gt;entry_count,</div><div class='hunk'>@@ -3927,18 +3931,19 @@ __lpfc_idiag_print_eq(struct lpfc_queue *qp, char *eqtype,</div><div class='ctx'> 	if (!qp)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"\n%s EQ info: EQ-STAT[max:x%x noE:x%x "</div><div class='ctx'> 			"cqe_proc:x%x eqe_proc:x%llx eqd %d]\n",</div><div class='ctx'> 			eqtype, qp-&gt;q_cnt_1, qp-&gt;q_cnt_2, qp-&gt;q_cnt_3,</div><div class='ctx'> 			(unsigned long long)qp-&gt;q_cnt_4, qp-&gt;q_mode);</div><div class='del'>-	len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+	len += scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='ctx'> 			"EQID[%02d], QE-CNT[%04d], QE-SZ[%04d], "</div><div class='ctx'> 			"HST-IDX[%04d], NTFI[%03d], PLMT[%03d], AFFIN[%03d]",</div><div class='ctx'> 			qp-&gt;queue_id, qp-&gt;entry_count, qp-&gt;entry_size,</div><div class='ctx'> 			qp-&gt;host_index, qp-&gt;notify_interval,</div><div class='ctx'> 			qp-&gt;max_proc_limit, qp-&gt;chann);</div><div class='del'>-	len +=  snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len, "\n");</div><div class='add'>+	len +=  scnprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+			"\n");</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -3991,9 +3996,10 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 		if (phba-&gt;lpfc_idiag_last_eq &gt;= phba-&gt;cfg_hdw_queue)</div><div class='ctx'> 			phba-&gt;lpfc_idiag_last_eq = 0;</div><div class='ctx'> </div><div class='del'>-		len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='del'>-					"HDWQ %d out of %d HBA HDWQs\n",</div><div class='del'>-					x, phba-&gt;cfg_hdw_queue);</div><div class='add'>+		len += scnprintf(pbuffer + len,</div><div class='add'>+				 LPFC_QUE_INFO_GET_BUF_SIZE - len,</div><div class='add'>+				 "HDWQ %d out of %d HBA HDWQs\n",</div><div class='add'>+				 x, phba-&gt;cfg_hdw_queue);</div><div class='ctx'> </div><div class='ctx'> 		/* Fast-path EQ */</div><div class='ctx'> 		qp = phba-&gt;sli4_hba.hdwq[x].hba_eq;</div><div class='hunk'>@@ -4075,7 +4081,7 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 	return simple_read_from_buffer(buf, nbytes, ppos, pbuffer, len);</div><div class='ctx'> </div><div class='ctx'> too_big:</div><div class='del'>-	len +=  snprintf(pbuffer + len,</div><div class='add'>+	len +=  scnprintf(pbuffer + len,</div><div class='ctx'> 		LPFC_QUE_INFO_GET_BUF_SIZE - len, "Truncated ...\n");</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='hunk'>@@ -4131,22 +4137,22 @@ lpfc_idiag_queacc_read_qe(char *pbuffer, int len, struct lpfc_queue *pque,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	esize = pque-&gt;entry_size;</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_QUE_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"QE-INDEX[%04d]:\n", index);</div><div class='ctx'> </div><div class='ctx'> 	offset = 0;</div><div class='del'>-	pentry = pque-&gt;qe[index].address;</div><div class='add'>+	pentry = lpfc_sli4_qe(pque, index);</div><div class='ctx'> 	while (esize &gt; 0) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_QUE_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_QUE_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"%08x ", *pentry);</div><div class='ctx'> 		pentry++;</div><div class='ctx'> 		offset += sizeof(uint32_t);</div><div class='ctx'> 		esize -= sizeof(uint32_t);</div><div class='ctx'> 		if (esize &gt; 0 &amp;&amp; !(offset % (4 * sizeof(uint32_t))))</div><div class='del'>-			len += snprintf(pbuffer+len,</div><div class='add'>+			len += scnprintf(pbuffer+len,</div><div class='ctx'> 					LPFC_QUE_ACC_BUF_SIZE-len, "\n");</div><div class='ctx'> 	}</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_ACC_BUF_SIZE-len, "\n");</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_QUE_ACC_BUF_SIZE-len, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -4485,7 +4491,7 @@ pass_check:</div><div class='ctx'> 		pque = (struct lpfc_queue *)idiag.ptr_private;</div><div class='ctx'> 		if (offset &gt; pque-&gt;entry_size/sizeof(uint32_t) - 1)</div><div class='ctx'> 			goto error_out;</div><div class='del'>-		pentry = pque-&gt;qe[index].address;</div><div class='add'>+		pentry = lpfc_sli4_qe(pque, index);</div><div class='ctx'> 		pentry += offset;</div><div class='ctx'> 		if (idiag.cmd.opcode == LPFC_IDIAG_CMD_QUEACC_WR)</div><div class='ctx'> 			*pentry = value;</div><div class='hunk'>@@ -4506,7 +4512,7 @@ error_out:</div><div class='ctx'>  * lpfc_idiag_drbacc_read_reg - idiag debugfs read a doorbell register</div><div class='ctx'>  * @phba: The pointer to hba structure.</div><div class='ctx'>  * @pbuffer: The pointer to the buffer to copy the data to.</div><div class='del'>- * @len: The lenght of bytes to copied.</div><div class='add'>+ * @len: The length of bytes to copied.</div><div class='ctx'>  * @drbregid: The id to doorbell registers.</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -4526,27 +4532,27 @@ lpfc_idiag_drbacc_read_reg(struct lpfc_hba *phba, char *pbuffer,</div><div class='ctx'> </div><div class='ctx'> 	switch (drbregid) {</div><div class='ctx'> 	case LPFC_DRB_EQ:</div><div class='del'>-		len += snprintf(pbuffer + len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer + len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"EQ-DRB-REG: 0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.EQDBregaddr));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_DRB_CQ:</div><div class='del'>-		len += snprintf(pbuffer + len, LPFC_DRB_ACC_BUF_SIZE - len,</div><div class='add'>+		len += scnprintf(pbuffer + len, LPFC_DRB_ACC_BUF_SIZE - len,</div><div class='ctx'> 				"CQ-DRB-REG: 0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.CQDBregaddr));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_DRB_MQ:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"MQ-DRB-REG:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.MQDBregaddr));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_DRB_WQ:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"WQ-DRB-REG:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.WQDBregaddr));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_DRB_RQ:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_DRB_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"RQ-DRB-REG:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.RQDBregaddr));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4716,7 +4722,7 @@ error_out:</div><div class='ctx'>  * lpfc_idiag_ctlacc_read_reg - idiag debugfs read a control registers</div><div class='ctx'>  * @phba: The pointer to hba structure.</div><div class='ctx'>  * @pbuffer: The pointer to the buffer to copy the data to.</div><div class='del'>- * @len: The lenght of bytes to copied.</div><div class='add'>+ * @len: The length of bytes to copied.</div><div class='ctx'>  * @drbregid: The id to doorbell registers.</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -4736,37 +4742,37 @@ lpfc_idiag_ctlacc_read_reg(struct lpfc_hba *phba, char *pbuffer,</div><div class='ctx'> </div><div class='ctx'> 	switch (ctlregid) {</div><div class='ctx'> 	case LPFC_CTL_PORT_SEM:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port SemReg:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.conf_regs_memmap_p +</div><div class='ctx'> 				      LPFC_CTL_PORT_SEM_OFFSET));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_CTL_PORT_STA:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port StaReg:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.conf_regs_memmap_p +</div><div class='ctx'> 				      LPFC_CTL_PORT_STA_OFFSET));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_CTL_PORT_CTL:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port CtlReg:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.conf_regs_memmap_p +</div><div class='ctx'> 				      LPFC_CTL_PORT_CTL_OFFSET));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_CTL_PORT_ER1:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port Er1Reg:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.conf_regs_memmap_p +</div><div class='ctx'> 				      LPFC_CTL_PORT_ER1_OFFSET));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_CTL_PORT_ER2:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port Er2Reg:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.conf_regs_memmap_p +</div><div class='ctx'> 				      LPFC_CTL_PORT_ER2_OFFSET));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_CTL_PDEV_CTL:</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_CTL_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"PDev CtlReg:   0x%08x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.conf_regs_memmap_p +</div><div class='ctx'> 				      LPFC_CTL_PDEV_CTL_OFFSET));</div><div class='hunk'>@@ -4959,13 +4965,13 @@ lpfc_idiag_mbxacc_get_setup(struct lpfc_hba *phba, char *pbuffer)</div><div class='ctx'> 	mbx_dump_cnt = idiag.cmd.data[IDIAG_MBXACC_DPCNT_INDX];</div><div class='ctx'> 	mbx_word_cnt = idiag.cmd.data[IDIAG_MBXACC_WDCNT_INDX];</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"mbx_dump_map: 0x%08x\n", mbx_dump_map);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"mbx_dump_cnt: %04d\n", mbx_dump_cnt);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"mbx_word_cnt: %04d\n", mbx_word_cnt);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_MBX_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"mbx_mbox_cmd: 0x%02x\n", mbx_mbox_cmd);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -5114,35 +5120,35 @@ lpfc_idiag_extacc_avail_get(struct lpfc_hba *phba, char *pbuffer, int len)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t ext_cnt, ext_size;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\nAvailable Extents Information:\n");</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tPort Available VPI extents: ");</div><div class='ctx'> 	lpfc_sli4_get_avail_extnt_rsrc(phba, LPFC_RSC_TYPE_FCOE_VPI,</div><div class='ctx'> 				       &amp;ext_cnt, &amp;ext_size);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"Count %3d, Size %3d\n", ext_cnt, ext_size);</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tPort Available VFI extents: ");</div><div class='ctx'> 	lpfc_sli4_get_avail_extnt_rsrc(phba, LPFC_RSC_TYPE_FCOE_VFI,</div><div class='ctx'> 				       &amp;ext_cnt, &amp;ext_size);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"Count %3d, Size %3d\n", ext_cnt, ext_size);</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tPort Available RPI extents: ");</div><div class='ctx'> 	lpfc_sli4_get_avail_extnt_rsrc(phba, LPFC_RSC_TYPE_FCOE_RPI,</div><div class='ctx'> 				       &amp;ext_cnt, &amp;ext_size);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"Count %3d, Size %3d\n", ext_cnt, ext_size);</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tPort Available XRI extents: ");</div><div class='ctx'> 	lpfc_sli4_get_avail_extnt_rsrc(phba, LPFC_RSC_TYPE_FCOE_XRI,</div><div class='ctx'> 				       &amp;ext_cnt, &amp;ext_size);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"Count %3d, Size %3d\n", ext_cnt, ext_size);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -5166,55 +5172,55 @@ lpfc_idiag_extacc_alloc_get(struct lpfc_hba *phba, char *pbuffer, int len)</div><div class='ctx'> 	uint16_t ext_cnt, ext_size;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\nAllocated Extents Information:\n");</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tHost Allocated VPI extents: ");</div><div class='ctx'> 	rc = lpfc_sli4_get_allocated_extnts(phba, LPFC_RSC_TYPE_FCOE_VPI,</div><div class='ctx'> 					    &amp;ext_cnt, &amp;ext_size);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port %d Extent %3d, Size %3d\n",</div><div class='ctx'> 				phba-&gt;brd_no, ext_cnt, ext_size);</div><div class='ctx'> 	else</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"N/A\n");</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tHost Allocated VFI extents: ");</div><div class='ctx'> 	rc = lpfc_sli4_get_allocated_extnts(phba, LPFC_RSC_TYPE_FCOE_VFI,</div><div class='ctx'> 					    &amp;ext_cnt, &amp;ext_size);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port %d Extent %3d, Size %3d\n",</div><div class='ctx'> 				phba-&gt;brd_no, ext_cnt, ext_size);</div><div class='ctx'> 	else</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"N/A\n");</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tHost Allocated RPI extents: ");</div><div class='ctx'> 	rc = lpfc_sli4_get_allocated_extnts(phba, LPFC_RSC_TYPE_FCOE_RPI,</div><div class='ctx'> 					    &amp;ext_cnt, &amp;ext_size);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port %d Extent %3d, Size %3d\n",</div><div class='ctx'> 				phba-&gt;brd_no, ext_cnt, ext_size);</div><div class='ctx'> 	else</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"N/A\n");</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tHost Allocated XRI extents: ");</div><div class='ctx'> 	rc = lpfc_sli4_get_allocated_extnts(phba, LPFC_RSC_TYPE_FCOE_XRI,</div><div class='ctx'> 					    &amp;ext_cnt, &amp;ext_size);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"Port %d Extent %3d, Size %3d\n",</div><div class='ctx'> 				phba-&gt;brd_no, ext_cnt, ext_size);</div><div class='ctx'> 	else</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"N/A\n");</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -5238,49 +5244,49 @@ lpfc_idiag_extacc_drivr_get(struct lpfc_hba *phba, char *pbuffer, int len)</div><div class='ctx'> 	struct lpfc_rsrc_blks *rsrc_blks;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\nDriver Extents Information:\n");</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tVPI extents:\n");</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	list_for_each_entry(rsrc_blks, &amp;phba-&gt;lpfc_vpi_blk_list, list) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"\t\tBlock %3d: Start %4d, Count %4d\n",</div><div class='ctx'> 				index, rsrc_blks-&gt;rsrc_start,</div><div class='ctx'> 				rsrc_blks-&gt;rsrc_size);</div><div class='ctx'> 		index++;</div><div class='ctx'> 	}</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tVFI extents:\n");</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	list_for_each_entry(rsrc_blks, &amp;phba-&gt;sli4_hba.lpfc_vfi_blk_list,</div><div class='ctx'> 			    list) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"\t\tBlock %3d: Start %4d, Count %4d\n",</div><div class='ctx'> 				index, rsrc_blks-&gt;rsrc_start,</div><div class='ctx'> 				rsrc_blks-&gt;rsrc_size);</div><div class='ctx'> 		index++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tRPI extents:\n");</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	list_for_each_entry(rsrc_blks, &amp;phba-&gt;sli4_hba.lpfc_rpi_blk_list,</div><div class='ctx'> 			    list) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"\t\tBlock %3d: Start %4d, Count %4d\n",</div><div class='ctx'> 				index, rsrc_blks-&gt;rsrc_start,</div><div class='ctx'> 				rsrc_blks-&gt;rsrc_size);</div><div class='ctx'> 		index++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+	len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 			"\tXRI extents:\n");</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	list_for_each_entry(rsrc_blks, &amp;phba-&gt;sli4_hba.lpfc_xri_blk_list,</div><div class='ctx'> 			    list) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='add'>+		len += scnprintf(pbuffer+len, LPFC_EXT_ACC_BUF_SIZE-len,</div><div class='ctx'> 				"\t\tBlock %3d: Start %4d, Count %4d\n",</div><div class='ctx'> 				index, rsrc_blks-&gt;rsrc_start,</div><div class='ctx'> 				rsrc_blks-&gt;rsrc_size);</div><div class='hunk'>@@ -5706,11 +5712,11 @@ lpfc_idiag_mbxacc_dump_bsg_mbox(struct lpfc_hba *phba, enum nemb_type nemb_tp,</div><div class='ctx'> 				if (i != 0)</div><div class='ctx'> 					pr_err("%s\n", line_buf);</div><div class='ctx'> 				len = 0;</div><div class='del'>-				len += snprintf(line_buf+len,</div><div class='add'>+				len += scnprintf(line_buf+len,</div><div class='ctx'> 						LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='ctx'> 						"%03d: ", i);</div><div class='ctx'> 			}</div><div class='del'>-			len += snprintf(line_buf+len, LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='add'>+			len += scnprintf(line_buf+len, LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='ctx'> 					"%08x ", (uint32_t)*pword);</div><div class='ctx'> 			pword++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5773,11 +5779,11 @@ lpfc_idiag_mbxacc_dump_issue_mbox(struct lpfc_hba *phba, MAILBOX_t *pmbox)</div><div class='ctx'> 					pr_err("%s\n", line_buf);</div><div class='ctx'> 				len = 0;</div><div class='ctx'> 				memset(line_buf, 0, LPFC_MBX_ACC_LBUF_SZ);</div><div class='del'>-				len += snprintf(line_buf+len,</div><div class='add'>+				len += scnprintf(line_buf+len,</div><div class='ctx'> 						LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='ctx'> 						"%03d: ", i);</div><div class='ctx'> 			}</div><div class='del'>-			len += snprintf(line_buf+len, LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='add'>+			len += scnprintf(line_buf+len, LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='ctx'> 					"%08x ",</div><div class='ctx'> 					((uint32_t)*pword) &amp; 0xffffffff);</div><div class='ctx'> 			pword++;</div><div class='hunk'>@@ -5796,18 +5802,18 @@ lpfc_idiag_mbxacc_dump_issue_mbox(struct lpfc_hba *phba, MAILBOX_t *pmbox)</div><div class='ctx'> 					pr_err("%s\n", line_buf);</div><div class='ctx'> 				len = 0;</div><div class='ctx'> 				memset(line_buf, 0, LPFC_MBX_ACC_LBUF_SZ);</div><div class='del'>-				len += snprintf(line_buf+len,</div><div class='add'>+				len += scnprintf(line_buf+len,</div><div class='ctx'> 						LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='ctx'> 						"%03d: ", i);</div><div class='ctx'> 			}</div><div class='ctx'> 			for (j = 0; j &lt; 4; j++) {</div><div class='del'>-				len += snprintf(line_buf+len,</div><div class='add'>+				len += scnprintf(line_buf+len,</div><div class='ctx'> 						LPFC_MBX_ACC_LBUF_SZ-len,</div><div class='ctx'> 						"%02x",</div><div class='ctx'> 						((uint8_t)*pbyte) &amp; 0xff);</div><div class='ctx'> 				pbyte++;</div><div class='ctx'> 			}</div><div class='del'>-			len += snprintf(line_buf+len,</div><div class='add'>+			len += scnprintf(line_buf+len,</div><div class='ctx'> 					LPFC_MBX_ACC_LBUF_SZ-len, " ");</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((i - 1) % 8)</div><div class='hunk'>@@ -5891,7 +5897,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)</div><div class='ctx'> 					    phba, &amp;lpfc_debugfs_op_lockstat);</div><div class='ctx'> 		if (!phba-&gt;debug_lockstat) {</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-					 "0913 Cant create debugfs lockstat\n");</div><div class='add'>+					 "4610 Cant create debugfs lockstat\n");</div><div class='ctx'> 			goto debug_failed;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -6134,7 +6140,7 @@ nvmeio_off:</div><div class='ctx'> 				    vport, &amp;lpfc_debugfs_op_scsistat);</div><div class='ctx'> 	if (!vport-&gt;debug_scsistat) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-				 "0914 Cannot create debugfs scsistat\n");</div><div class='add'>+				 "4611 Cannot create debugfs scsistat\n");</div><div class='ctx'> 		goto debug_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_debugfs.h b/drivers/scsi/lpfc/lpfc_debugfs.h<br/>index 93ab7dfb8ee0..2322ddb085c0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_debugfs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_debugfs.h</a></div><div class='hunk'>@@ -345,10 +345,10 @@ lpfc_debug_dump_qe(struct lpfc_queue *q, uint32_t idx)</div><div class='ctx'> </div><div class='ctx'> 	esize = q-&gt;entry_size;</div><div class='ctx'> 	qe_word_cnt = esize / sizeof(uint32_t);</div><div class='del'>-	pword = q-&gt;qe[idx].address;</div><div class='add'>+	pword = lpfc_sli4_qe(q, idx);</div><div class='ctx'> </div><div class='ctx'> 	len = 0;</div><div class='del'>-	len += snprintf(line_buf+len, LPFC_LBUF_SZ-len, "QE[%04d]: ", idx);</div><div class='add'>+	len += scnprintf(line_buf+len, LPFC_LBUF_SZ-len, "QE[%04d]: ", idx);</div><div class='ctx'> 	if (qe_word_cnt &gt; 8)</div><div class='ctx'> 		printk(KERN_ERR "%s\n", line_buf);</div><div class='ctx'> </div><div class='hunk'>@@ -359,11 +359,11 @@ lpfc_debug_dump_qe(struct lpfc_queue *q, uint32_t idx)</div><div class='ctx'> 			if (qe_word_cnt &gt; 8) {</div><div class='ctx'> 				len = 0;</div><div class='ctx'> 				memset(line_buf, 0, LPFC_LBUF_SZ);</div><div class='del'>-				len += snprintf(line_buf+len, LPFC_LBUF_SZ-len,</div><div class='add'>+				len += scnprintf(line_buf+len, LPFC_LBUF_SZ-len,</div><div class='ctx'> 						"%03d: ", i);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		len += snprintf(line_buf+len, LPFC_LBUF_SZ-len, "%08x ",</div><div class='add'>+		len += scnprintf(line_buf+len, LPFC_LBUF_SZ-len, "%08x ",</div><div class='ctx'> 				((uint32_t)*pword) &amp; 0xffffffff);</div><div class='ctx'> 		pword++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c<br/>index fc077cb87900..c8fb0b455f2a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_els.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_els.c</a></div><div class='hunk'>@@ -1961,7 +1961,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	IOCB_t *irsp;</div><div class='ctx'> 	struct lpfc_nodelist *ndlp;</div><div class='ctx'> 	struct lpfc_dmabuf *prsp;</div><div class='del'>-	int disc, rc;</div><div class='add'>+	int disc;</div><div class='ctx'> </div><div class='ctx'> 	/* we pass cmdiocb to state machine which needs rspiocb as well */</div><div class='ctx'> 	cmdiocb-&gt;context_un.rsp_iocb = rspiocb;</div><div class='hunk'>@@ -1990,7 +1990,6 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	disc = (ndlp-&gt;nlp_flag &amp; NLP_NPR_2B_DISC);</div><div class='ctx'> 	ndlp-&gt;nlp_flag &amp;= ~NLP_NPR_2B_DISC;</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-	rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* PLOGI completes to NPort &lt;nlp_DID&gt; */</div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,</div><div class='hunk'>@@ -2029,18 +2028,16 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 				 ndlp-&gt;nlp_DID, irsp-&gt;ulpStatus,</div><div class='ctx'> 				 irsp-&gt;un.ulpWord[4]);</div><div class='ctx'> 		/* Do not call DSM for lpfc_els_abort'ed ELS cmds */</div><div class='del'>-		if (lpfc_error_lost_link(irsp))</div><div class='del'>-			rc = NLP_STE_FREED_NODE;</div><div class='del'>-		else</div><div class='del'>-			rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,</div><div class='del'>-						     NLP_EVT_CMPL_PLOGI);</div><div class='add'>+		if (!lpfc_error_lost_link(irsp))</div><div class='add'>+			lpfc_disc_state_machine(vport, ndlp, cmdiocb,</div><div class='add'>+						NLP_EVT_CMPL_PLOGI);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Good status, call state machine */</div><div class='ctx'> 		prsp = list_entry(((struct lpfc_dmabuf *)</div><div class='ctx'> 				   cmdiocb-&gt;context2)-&gt;list.next,</div><div class='ctx'> 				  struct lpfc_dmabuf, list);</div><div class='ctx'> 		ndlp = lpfc_plogi_confirm_nport(phba, prsp-&gt;virt, ndlp);</div><div class='del'>-		rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,</div><div class='add'>+		lpfc_disc_state_machine(vport, ndlp, cmdiocb,</div><div class='ctx'> 					     NLP_EVT_CMPL_PLOGI);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6744,12 +6741,11 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	uint32_t *lp;</div><div class='ctx'> 	RNID *rn;</div><div class='ctx'> 	struct ls_rjt stat;</div><div class='del'>-	uint32_t cmd;</div><div class='ctx'> </div><div class='ctx'> 	pcmd = (struct lpfc_dmabuf *) cmdiocb-&gt;context2;</div><div class='ctx'> 	lp = (uint32_t *) pcmd-&gt;virt;</div><div class='ctx'> </div><div class='del'>-	cmd = *lp++;</div><div class='add'>+	lp++;</div><div class='ctx'> 	rn = (RNID *) lp;</div><div class='ctx'> </div><div class='ctx'> 	/* RNID received */</div><div class='hunk'>@@ -7508,14 +7504,14 @@ lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	uint32_t *lp;</div><div class='ctx'> 	IOCB_t *icmd;</div><div class='ctx'> 	FARP *fp;</div><div class='del'>-	uint32_t cmd, cnt, did;</div><div class='add'>+	uint32_t cnt, did;</div><div class='ctx'> </div><div class='ctx'> 	icmd = &amp;cmdiocb-&gt;iocb;</div><div class='ctx'> 	did = icmd-&gt;un.elsreq64.remoteID;</div><div class='ctx'> 	pcmd = (struct lpfc_dmabuf *) cmdiocb-&gt;context2;</div><div class='ctx'> 	lp = (uint32_t *) pcmd-&gt;virt;</div><div class='ctx'> </div><div class='del'>-	cmd = *lp++;</div><div class='add'>+	lp++;</div><div class='ctx'> 	fp = (FARP *) lp;</div><div class='ctx'> 	/* FARP-REQ received from DID &lt;did&gt; */</div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,</div><div class='hunk'>@@ -7580,14 +7576,14 @@ lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	struct lpfc_dmabuf *pcmd;</div><div class='ctx'> 	uint32_t *lp;</div><div class='ctx'> 	IOCB_t *icmd;</div><div class='del'>-	uint32_t cmd, did;</div><div class='add'>+	uint32_t did;</div><div class='ctx'> </div><div class='ctx'> 	icmd = &amp;cmdiocb-&gt;iocb;</div><div class='ctx'> 	did = icmd-&gt;un.elsreq64.remoteID;</div><div class='ctx'> 	pcmd = (struct lpfc_dmabuf *) cmdiocb-&gt;context2;</div><div class='ctx'> 	lp = (uint32_t *) pcmd-&gt;virt;</div><div class='ctx'> </div><div class='del'>-	cmd = *lp++;</div><div class='add'>+	lp++;</div><div class='ctx'> 	/* FARP-RSP received from DID &lt;did&gt; */</div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,</div><div class='ctx'> 			 "0600 FARP-RSP received from DID x%x\n", did);</div><div class='hunk'>@@ -8454,6 +8450,14 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 		rjt_err = LSRJT_UNABLE_TPC;</div><div class='ctx'> 		rjt_exp = LSEXP_INVALID_OX_RX;</div><div class='ctx'> 		break;</div><div class='add'>+	case ELS_CMD_FPIN:</div><div class='add'>+		/*</div><div class='add'>+		 * Received FPIN from fabric - pass it to the</div><div class='add'>+		 * transport FPIN handler.</div><div class='add'>+		 */</div><div class='add'>+		fc_host_fpin_rcv(shost, elsiocb-&gt;iocb.unsli3.rcvsli3.acc_len,</div><div class='add'>+				(char *)payload);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_UNSOL,</div><div class='ctx'> 			"RCV ELS cmd:     cmd:x%x did:x%x/ste:x%x",</div><div class='hunk'>@@ -8775,7 +8779,7 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 				lpfc_nlp_put(ndlp);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* Try to recover from this error */</div><div class='ctx'> 			if (phba-&gt;sli_rev == LPFC_SLI_REV4)</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c<br/>index aa4961a2caf8..c43852f97f25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_hbadisc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_hbadisc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_hbadisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_hbadisc.c</a></div><div class='hunk'>@@ -885,15 +885,9 @@ lpfc_linkdown(struct lpfc_hba *phba)</div><div class='ctx'> 	LPFC_MBOXQ_t          *mb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (phba-&gt;link_state == LPFC_LINK_DOWN) {</div><div class='del'>-		if (phba-&gt;sli4_hba.conf_trunk) {</div><div class='del'>-			phba-&gt;trunk_link.link0.state = 0;</div><div class='del'>-			phba-&gt;trunk_link.link1.state = 0;</div><div class='del'>-			phba-&gt;trunk_link.link2.state = 0;</div><div class='del'>-			phba-&gt;trunk_link.link3.state = 0;</div><div class='del'>-		}</div><div class='add'>+	if (phba-&gt;link_state == LPFC_LINK_DOWN)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* Block all SCSI stack I/Os */</div><div class='ctx'> 	lpfc_scsi_dev_block(phba);</div><div class='ctx'> </div><div class='hunk'>@@ -932,7 +926,11 @@ lpfc_linkdown(struct lpfc_hba *phba)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	lpfc_destroy_vport_work_array(phba, vports);</div><div class='del'>-	/* Clean up any firmware default rpi's */</div><div class='add'>+</div><div class='add'>+	/* Clean up any SLI3 firmware default rpi's */</div><div class='add'>+	if (phba-&gt;sli_rev &gt; LPFC_SLI_REV3)</div><div class='add'>+		goto skip_unreg_did;</div><div class='add'>+</div><div class='ctx'> 	mb = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='ctx'> 	if (mb) {</div><div class='ctx'> 		lpfc_unreg_did(phba, 0xffff, LPFC_UNREG_ALL_DFLT_RPIS, mb);</div><div class='hunk'>@@ -944,6 +942,7 @@ lpfc_linkdown(struct lpfc_hba *phba)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+ skip_unreg_did:</div><div class='ctx'> 	/* Setup myDID for link up if we are in pt2pt mode */</div><div class='ctx'> 	if (phba-&gt;pport-&gt;fc_flag &amp; FC_PT2PT) {</div><div class='ctx'> 		mb = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -4147,9 +4146,15 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)</div><div class='ctx'> 	rdata-&gt;pnode = lpfc_nlp_get(ndlp);</div><div class='ctx'> </div><div class='ctx'> 	if (ndlp-&gt;nlp_type &amp; NLP_FCP_TARGET)</div><div class='del'>-		rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_FCP_TARGET;</div><div class='ctx'> 	if (ndlp-&gt;nlp_type &amp; NLP_FCP_INITIATOR)</div><div class='del'>-		rport_ids.roles |= FC_RPORT_ROLE_FCP_INITIATOR;</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_FCP_INITIATOR;</div><div class='add'>+	if (ndlp-&gt;nlp_type &amp; NLP_NVME_INITIATOR)</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_NVME_INITIATOR;</div><div class='add'>+	if (ndlp-&gt;nlp_type &amp; NLP_NVME_TARGET)</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_NVME_TARGET;</div><div class='add'>+	if (ndlp-&gt;nlp_type &amp; NLP_NVME_DISCOVERY)</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_NVME_DISCOVERY;</div><div class='ctx'> </div><div class='ctx'> 	if (rport_ids.roles !=  FC_RPORT_ROLE_UNKNOWN)</div><div class='ctx'> 		fc_remote_port_rolechg(rport, rport_ids.roles);</div><div class='hunk'>@@ -4667,12 +4672,15 @@ lpfc_check_sli_ndlp(struct lpfc_hba *phba,</div><div class='ctx'> 		case CMD_GEN_REQUEST64_CR:</div><div class='ctx'> 			if (iocb-&gt;context_un.ndlp == ndlp)</div><div class='ctx'> 				return 1;</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		case CMD_ELS_REQUEST64_CR:</div><div class='ctx'> 			if (icmd-&gt;un.elsreq64.remoteID == ndlp-&gt;nlp_DID)</div><div class='ctx'> 				return 1;</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		case CMD_XMIT_ELS_RSP64_CX:</div><div class='ctx'> 			if (iocb-&gt;context1 == (uint8_t *) ndlp)</div><div class='ctx'> 				return 1;</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (pring-&gt;ringno == LPFC_FCP_RING) {</div><div class='ctx'> 		/* Skip match check if waiting to relogin to FCP target */</div><div class='hunk'>@@ -4868,6 +4876,10 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)</div><div class='ctx'> 					 * accept PLOGIs after unreg_rpi_cmpl</div><div class='ctx'> 					 */</div><div class='ctx'> 					acc_plogi = 0;</div><div class='add'>+				} else if (vport-&gt;load_flag &amp; FC_UNLOADING) {</div><div class='add'>+					mbox-&gt;ctx_ndlp = NULL;</div><div class='add'>+					mbox-&gt;mbox_cmpl =</div><div class='add'>+						lpfc_sli_def_mbox_cmpl;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					mbox-&gt;ctx_ndlp = ndlp;</div><div class='ctx'> 					mbox-&gt;mbox_cmpl =</div><div class='hunk'>@@ -4979,6 +4991,10 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport)</div><div class='ctx'> 	LPFC_MBOXQ_t     *mbox;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	/* Unreg DID is an SLI3 operation. */</div><div class='add'>+	if (phba-&gt;sli_rev &gt; LPFC_SLI_REV3)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mbox = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='ctx'> 	if (mbox) {</div><div class='ctx'> 		lpfc_unreg_did(phba, vport-&gt;vpi, LPFC_UNREG_ALL_DFLT_RPIS,</div><div class='hunk'>@@ -5856,7 +5872,7 @@ restart_disc:</div><div class='ctx'> </div><div class='ctx'> 	case LPFC_LINK_UP:</div><div class='ctx'> 		lpfc_issue_clear_la(phba, vport);</div><div class='del'>-		/* Drop thru */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case LPFC_LINK_UNKNOWN:</div><div class='ctx'> 	case LPFC_WARM_START:</div><div class='ctx'> 	case LPFC_INIT_START:</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h<br/>index ec1227018913..edd8f3982023 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_hw.h</a></div><div class='hunk'>@@ -560,6 +560,8 @@ struct fc_vft_header {</div><div class='ctx'> #define fc_vft_hdr_hopct_WORD		word1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/scsi/fc/fc_els.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  Extended Link Service LS_COMMAND codes (Payload Word 0)</div><div class='ctx'>  */</div><div class='hunk'>@@ -603,6 +605,7 @@ struct fc_vft_header {</div><div class='ctx'> #define ELS_CMD_RNID      0x78000000</div><div class='ctx'> #define ELS_CMD_LIRR      0x7A000000</div><div class='ctx'> #define ELS_CMD_LCB	  0x81000000</div><div class='add'>+#define ELS_CMD_FPIN	  0x16000000</div><div class='ctx'> #else	/*  __LITTLE_ENDIAN_BITFIELD */</div><div class='ctx'> #define ELS_CMD_MASK      0xffff</div><div class='ctx'> #define ELS_RSP_MASK      0xff</div><div class='hunk'>@@ -643,6 +646,7 @@ struct fc_vft_header {</div><div class='ctx'> #define ELS_CMD_RNID      0x78</div><div class='ctx'> #define ELS_CMD_LIRR      0x7A</div><div class='ctx'> #define ELS_CMD_LCB	  0x81</div><div class='add'>+#define ELS_CMD_FPIN	  ELS_FPIN</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h<br/>index ff875b833192..77f9a55a3f54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_hw4.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_hw4.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_hw4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_hw4.h</a></div><div class='hunk'>@@ -1894,18 +1894,19 @@ struct lpfc_mbx_set_link_diag_loopback {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			uint32_t word0;</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_type_SHIFT	0</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_type_MASK	0x00000003</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_type_WORD	word0</div><div class='del'>-#define LPFC_DIAG_LOOPBACK_TYPE_DISABLE		0x0</div><div class='del'>-#define LPFC_DIAG_LOOPBACK_TYPE_INTERNAL	0x1</div><div class='del'>-#define LPFC_DIAG_LOOPBACK_TYPE_SERDES		0x2</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_link_num_SHIFT	16</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_link_num_MASK	0x0000003F</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_link_num_WORD	word0</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_link_type_SHIFT	22</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_link_type_MASK	0x00000003</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_link_type_WORD	word0</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_type_SHIFT		0</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_type_MASK		0x00000003</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_type_WORD		word0</div><div class='add'>+#define LPFC_DIAG_LOOPBACK_TYPE_DISABLE			0x0</div><div class='add'>+#define LPFC_DIAG_LOOPBACK_TYPE_INTERNAL		0x1</div><div class='add'>+#define LPFC_DIAG_LOOPBACK_TYPE_SERDES			0x2</div><div class='add'>+#define LPFC_DIAG_LOOPBACK_TYPE_EXTERNAL_TRUNKED	0x3</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_link_num_SHIFT		16</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_link_num_MASK		0x0000003F</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_link_num_WORD		word0</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_link_type_SHIFT		22</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_link_type_MASK		0x00000003</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_link_type_WORD		word0</div><div class='ctx'> 		} req;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			uint32_t word0;</div><div class='hunk'>@@ -4083,22 +4084,7 @@ struct lpfc_acqe_grp5 {</div><div class='ctx'> 	uint32_t trailer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *const trunk_errmsg[] = {	/* map errcode */</div><div class='del'>-	"",	/* There is no such error code at index 0*/</div><div class='del'>-	"link negotiated speed does not match existing"</div><div class='del'>-		" trunk - link was \"low\" speed",</div><div class='del'>-	"link negotiated speed does not match"</div><div class='del'>-		" existing trunk - link was \"middle\" speed",</div><div class='del'>-	"link negotiated speed does not match existing"</div><div class='del'>-		" trunk - link was \"high\" speed",</div><div class='del'>-	"Attached to non-trunking port - F_Port",</div><div class='del'>-	"Attached to non-trunking port - N_Port",</div><div class='del'>-	"FLOGI response timeout",</div><div class='del'>-	"non-FLOGI frame received",</div><div class='del'>-	"Invalid FLOGI response",</div><div class='del'>-	"Trunking initialization protocol",</div><div class='del'>-	"Trunk peer device mismatch",</div><div class='del'>-};</div><div class='add'>+extern const char *const trunk_errmsg[];</div><div class='ctx'> </div><div class='ctx'> struct lpfc_acqe_fc_la {</div><div class='ctx'> 	uint32_t word0;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c<br/>index 7fcdaed3fa94..eaaef682de25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_init.c</a></div><div class='hunk'>@@ -1117,19 +1117,19 @@ lpfc_hba_down_post_s4(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;cfg_enable_fc4_type &amp; LPFC_ENABLE_NVME) {</div><div class='del'>-		spin_lock(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='add'>+		spin_lock_irq(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='ctx'> 		list_splice_init(&amp;phba-&gt;sli4_hba.lpfc_abts_nvmet_ctx_list,</div><div class='ctx'> 				 &amp;nvmet_aborts);</div><div class='del'>-		spin_unlock(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;sli4_hba.abts_nvmet_buf_list_lock);</div><div class='ctx'> 		list_for_each_entry_safe(ctxp, ctxp_next, &amp;nvmet_aborts, list) {</div><div class='ctx'> 			ctxp-&gt;flag &amp;= ~(LPFC_NVMET_XBUSY | LPFC_NVMET_ABORT_OP);</div><div class='ctx'> 			lpfc_nvmet_ctxbuf_post(phba, ctxp-&gt;ctxbuf);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	lpfc_sli4_free_sp_events(phba);</div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='hunk'>@@ -1844,8 +1844,12 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)</div><div class='ctx'> 	/* If the pci channel is offline, ignore possible errors, since</div><div class='ctx'> 	 * we cannot communicate with the pci card anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pci_channel_offline(phba-&gt;pcidev))</div><div class='add'>+	if (pci_channel_offline(phba-&gt;pcidev)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3166 pci channel is offline\n");</div><div class='add'>+		lpfc_sli4_offline_eratt(phba);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;portsmphr_reg, 0, sizeof(portsmphr_reg));</div><div class='ctx'> 	if_type = bf_get(lpfc_sli_intf_if_type, &amp;phba-&gt;sli4_hba.sli_intf);</div><div class='hunk'>@@ -1922,6 +1926,7 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"3151 PCI bus read access failure: x%x\n",</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.u.if_type2.STATUSregaddr));</div><div class='add'>+			lpfc_sli4_offline_eratt(phba);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		reg_err1 = readl(phba-&gt;sli4_hba.u.if_type2.ERR1regaddr);</div><div class='hunk'>@@ -3075,7 +3080,7 @@ lpfc_sli4_node_prep(struct lpfc_hba *phba)</div><div class='ctx'>  * This routine moves a batch of XRIs from lpfc_io_buf_list_put of HWQ 0</div><div class='ctx'>  * to expedite pool. Mark them as expedite.</div><div class='ctx'>  **/</div><div class='del'>-void lpfc_create_expedite_pool(struct lpfc_hba *phba)</div><div class='add'>+static void lpfc_create_expedite_pool(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_sli4_hdw_queue *qp;</div><div class='ctx'> 	struct lpfc_io_buf *lpfc_ncmd;</div><div class='hunk'>@@ -3110,7 +3115,7 @@ void lpfc_create_expedite_pool(struct lpfc_hba *phba)</div><div class='ctx'>  * This routine returns XRIs from expedite pool to lpfc_io_buf_list_put</div><div class='ctx'>  * of HWQ 0. Clear the mark.</div><div class='ctx'>  **/</div><div class='del'>-void lpfc_destroy_expedite_pool(struct lpfc_hba *phba)</div><div class='add'>+static void lpfc_destroy_expedite_pool(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_sli4_hdw_queue *qp;</div><div class='ctx'> 	struct lpfc_io_buf *lpfc_ncmd;</div><div class='hunk'>@@ -3230,7 +3235,7 @@ void lpfc_create_multixri_pools(struct lpfc_hba *phba)</div><div class='ctx'>  *</div><div class='ctx'>  * This routine returns XRIs from public/private to lpfc_io_buf_list_put.</div><div class='ctx'>  **/</div><div class='del'>-void lpfc_destroy_multixri_pools(struct lpfc_hba *phba)</div><div class='add'>+static void lpfc_destroy_multixri_pools(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	u32 hwq_count;</div><div class='hunk'>@@ -3245,6 +3250,13 @@ void lpfc_destroy_multixri_pools(struct lpfc_hba *phba)</div><div class='ctx'> 	if (phba-&gt;cfg_enable_fc4_type &amp; LPFC_ENABLE_NVME)</div><div class='ctx'> 		lpfc_destroy_expedite_pool(phba);</div><div class='ctx'> </div><div class='add'>+	if (!(phba-&gt;pport-&gt;load_flag &amp; FC_UNLOADING)) {</div><div class='add'>+		lpfc_sli_flush_fcp_rings(phba);</div><div class='add'>+</div><div class='add'>+		if (phba-&gt;cfg_enable_fc4_type &amp; LPFC_ENABLE_NVME)</div><div class='add'>+			lpfc_sli_flush_nvme_rings(phba);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hwq_count = phba-&gt;cfg_hdw_queue;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hwq_count; i++) {</div><div class='hunk'>@@ -3611,8 +3623,6 @@ lpfc_io_free(struct lpfc_hba *phba)</div><div class='ctx'> 	struct lpfc_sli4_hdw_queue *qp;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='ctx'> 	for (idx = 0; idx &lt; phba-&gt;cfg_hdw_queue; idx++) {</div><div class='ctx'> 		qp = &amp;phba-&gt;sli4_hba.hdwq[idx];</div><div class='ctx'> 		/* Release all the lpfc_nvme_bufs maintained by this host. */</div><div class='hunk'>@@ -3642,8 +3652,6 @@ lpfc_io_free(struct lpfc_hba *phba)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;qp-&gt;io_buf_list_get_lock);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4457,7 +4465,7 @@ finished:</div><div class='ctx'> 	return stat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void lpfc_host_supported_speeds_set(struct Scsi_Host *shost)</div><div class='add'>+static void lpfc_host_supported_speeds_set(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_vport *vport = (struct lpfc_vport *)shost-&gt;hostdata;</div><div class='ctx'> 	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='hunk'>@@ -8603,9 +8611,9 @@ lpfc_sli4_queue_verify(struct lpfc_hba *phba)</div><div class='ctx'> 	if (phba-&gt;nvmet_support) {</div><div class='ctx'> 		if (phba-&gt;cfg_irq_chann &lt; phba-&gt;cfg_nvmet_mrq)</div><div class='ctx'> 			phba-&gt;cfg_nvmet_mrq = phba-&gt;cfg_irq_chann;</div><div class='add'>+		if (phba-&gt;cfg_nvmet_mrq &gt; LPFC_NVMET_MRQ_MAX)</div><div class='add'>+			phba-&gt;cfg_nvmet_mrq = LPFC_NVMET_MRQ_MAX;</div><div class='ctx'> 	}</div><div class='del'>-	if (phba-&gt;cfg_nvmet_mrq &gt; LPFC_NVMET_MRQ_MAX)</div><div class='del'>-		phba-&gt;cfg_nvmet_mrq = LPFC_NVMET_MRQ_MAX;</div><div class='ctx'> </div><div class='ctx'> 	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 			"2574 IO channels: hdwQ %d IRQ %d MRQ: %d\n",</div><div class='hunk'>@@ -8626,10 +8634,12 @@ static int</div><div class='ctx'> lpfc_alloc_nvme_wq_cq(struct lpfc_hba *phba, int wqidx)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_queue *qdesc;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='add'>+	cpu = lpfc_find_cpu_handle(phba, wqidx, LPFC_FIND_BY_HDWQ);</div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-				      LPFC_CQE_EXP_COUNT);</div><div class='add'>+				      LPFC_CQE_EXP_COUNT, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0508 Failed allocate fast-path NVME CQ (%d)\n",</div><div class='hunk'>@@ -8638,11 +8648,12 @@ lpfc_alloc_nvme_wq_cq(struct lpfc_hba *phba, int wqidx)</div><div class='ctx'> 	}</div><div class='ctx'> 	qdesc-&gt;qe_valid = 1;</div><div class='ctx'> 	qdesc-&gt;hdwq = wqidx;</div><div class='del'>-	qdesc-&gt;chann = lpfc_find_cpu_handle(phba, wqidx, LPFC_FIND_BY_HDWQ);</div><div class='add'>+	qdesc-&gt;chann = cpu;</div><div class='ctx'> 	phba-&gt;sli4_hba.hdwq[wqidx].nvme_cq = qdesc;</div><div class='ctx'> </div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,</div><div class='del'>-				      LPFC_WQE128_SIZE, LPFC_WQE_EXP_COUNT);</div><div class='add'>+				      LPFC_WQE128_SIZE, LPFC_WQE_EXP_COUNT,</div><div class='add'>+				      cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0509 Failed allocate fast-path NVME WQ (%d)\n",</div><div class='hunk'>@@ -8661,18 +8672,20 @@ lpfc_alloc_fcp_wq_cq(struct lpfc_hba *phba, int wqidx)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_queue *qdesc;</div><div class='ctx'> 	uint32_t wqesize;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='add'>+	cpu = lpfc_find_cpu_handle(phba, wqidx, LPFC_FIND_BY_HDWQ);</div><div class='ctx'> 	/* Create Fast Path FCP CQs */</div><div class='ctx'> 	if (phba-&gt;enab_exp_wqcq_pages)</div><div class='ctx'> 		/* Increase the CQ size when WQEs contain an embedded cdb */</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,</div><div class='ctx'> 					      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-					      LPFC_CQE_EXP_COUNT);</div><div class='add'>+					      LPFC_CQE_EXP_COUNT, cpu);</div><div class='ctx'> </div><div class='ctx'> 	else</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 					      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-					      phba-&gt;sli4_hba.cq_ecount);</div><div class='add'>+					      phba-&gt;sli4_hba.cq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 			"0499 Failed allocate fast-path FCP CQ (%d)\n", wqidx);</div><div class='hunk'>@@ -8680,7 +8693,7 @@ lpfc_alloc_fcp_wq_cq(struct lpfc_hba *phba, int wqidx)</div><div class='ctx'> 	}</div><div class='ctx'> 	qdesc-&gt;qe_valid = 1;</div><div class='ctx'> 	qdesc-&gt;hdwq = wqidx;</div><div class='del'>-	qdesc-&gt;chann = lpfc_find_cpu_handle(phba, wqidx, LPFC_FIND_BY_HDWQ);</div><div class='add'>+	qdesc-&gt;chann = cpu;</div><div class='ctx'> 	phba-&gt;sli4_hba.hdwq[wqidx].fcp_cq = qdesc;</div><div class='ctx'> </div><div class='ctx'> 	/* Create Fast Path FCP WQs */</div><div class='hunk'>@@ -8690,11 +8703,11 @@ lpfc_alloc_fcp_wq_cq(struct lpfc_hba *phba, int wqidx)</div><div class='ctx'> 			LPFC_WQE128_SIZE : phba-&gt;sli4_hba.wq_esize;</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,</div><div class='ctx'> 					      wqesize,</div><div class='del'>-					      LPFC_WQE_EXP_COUNT);</div><div class='add'>+					      LPFC_WQE_EXP_COUNT, cpu);</div><div class='ctx'> 	} else</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 					      phba-&gt;sli4_hba.wq_esize,</div><div class='del'>-					      phba-&gt;sli4_hba.wq_ecount);</div><div class='add'>+					      phba-&gt;sli4_hba.wq_ecount, cpu);</div><div class='ctx'> </div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='hunk'>@@ -8727,7 +8740,7 @@ int</div><div class='ctx'> lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_queue *qdesc;</div><div class='del'>-	int idx, eqidx;</div><div class='add'>+	int idx, eqidx, cpu;</div><div class='ctx'> 	struct lpfc_sli4_hdw_queue *qp;</div><div class='ctx'> 	struct lpfc_eq_intr_info *eqi;</div><div class='ctx'> </div><div class='hunk'>@@ -8814,13 +8827,15 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	/* Create HBA Event Queues (EQs) */</div><div class='ctx'> 	for (idx = 0; idx &lt; phba-&gt;cfg_hdw_queue; idx++) {</div><div class='add'>+		/* determine EQ affinity */</div><div class='add'>+		eqidx = lpfc_find_eq_handle(phba, idx);</div><div class='add'>+		cpu = lpfc_find_cpu_handle(phba, eqidx, LPFC_FIND_BY_EQ);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If there are more Hardware Queues than available</div><div class='del'>-		 * CQs, multiple Hardware Queues may share a common EQ.</div><div class='add'>+		 * EQs, multiple Hardware Queues may share a common EQ.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (idx &gt;= phba-&gt;cfg_irq_chann) {</div><div class='ctx'> 			/* Share an existing EQ */</div><div class='del'>-			eqidx = lpfc_find_eq_handle(phba, idx);</div><div class='ctx'> 			phba-&gt;sli4_hba.hdwq[idx].hba_eq =</div><div class='ctx'> 				phba-&gt;sli4_hba.hdwq[eqidx].hba_eq;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -8828,7 +8843,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 		/* Create an EQ */</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 					      phba-&gt;sli4_hba.eq_esize,</div><div class='del'>-					      phba-&gt;sli4_hba.eq_ecount);</div><div class='add'>+					      phba-&gt;sli4_hba.eq_ecount, cpu);</div><div class='ctx'> 		if (!qdesc) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 					"0497 Failed allocate EQ (%d)\n", idx);</div><div class='hunk'>@@ -8838,9 +8853,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 		qdesc-&gt;hdwq = idx;</div><div class='ctx'> </div><div class='ctx'> 		/* Save the CPU this EQ is affinitised to */</div><div class='del'>-		eqidx = lpfc_find_eq_handle(phba, idx);</div><div class='del'>-		qdesc-&gt;chann = lpfc_find_cpu_handle(phba, eqidx,</div><div class='del'>-						    LPFC_FIND_BY_EQ);</div><div class='add'>+		qdesc-&gt;chann = cpu;</div><div class='ctx'> 		phba-&gt;sli4_hba.hdwq[idx].hba_eq = qdesc;</div><div class='ctx'> 		qdesc-&gt;last_cpu = qdesc-&gt;chann;</div><div class='ctx'> 		eqi = per_cpu_ptr(phba-&gt;sli4_hba.eq_info, qdesc-&gt;last_cpu);</div><div class='hunk'>@@ -8863,11 +8876,14 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 		if (phba-&gt;nvmet_support) {</div><div class='ctx'> 			for (idx = 0; idx &lt; phba-&gt;cfg_nvmet_mrq; idx++) {</div><div class='add'>+				cpu = lpfc_find_cpu_handle(phba, idx,</div><div class='add'>+							   LPFC_FIND_BY_HDWQ);</div><div class='ctx'> 				qdesc = lpfc_sli4_queue_alloc(</div><div class='ctx'> 						      phba,</div><div class='ctx'> 						      LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 						      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-						      phba-&gt;sli4_hba.cq_ecount);</div><div class='add'>+						      phba-&gt;sli4_hba.cq_ecount,</div><div class='add'>+						      cpu);</div><div class='ctx'> 				if (!qdesc) {</div><div class='ctx'> 					lpfc_printf_log(</div><div class='ctx'> 						phba, KERN_ERR, LOG_INIT,</div><div class='hunk'>@@ -8877,7 +8893,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 				}</div><div class='ctx'> 				qdesc-&gt;qe_valid = 1;</div><div class='ctx'> 				qdesc-&gt;hdwq = idx;</div><div class='del'>-				qdesc-&gt;chann = idx;</div><div class='add'>+				qdesc-&gt;chann = cpu;</div><div class='ctx'> 				phba-&gt;sli4_hba.nvmet_cqset[idx] = qdesc;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -8887,10 +8903,11 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 	 * Create Slow Path Completion Queues (CQs)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	cpu = lpfc_find_cpu_handle(phba, 0, LPFC_FIND_BY_EQ);</div><div class='ctx'> 	/* Create slow-path Mailbox Command Complete Queue */</div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-				      phba-&gt;sli4_hba.cq_ecount);</div><div class='add'>+				      phba-&gt;sli4_hba.cq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0500 Failed allocate slow-path mailbox CQ\n");</div><div class='hunk'>@@ -8902,7 +8919,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Create slow-path ELS Complete Queue */</div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-				      phba-&gt;sli4_hba.cq_ecount);</div><div class='add'>+				      phba-&gt;sli4_hba.cq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0501 Failed allocate slow-path ELS CQ\n");</div><div class='hunk'>@@ -8921,7 +8938,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.mq_esize,</div><div class='del'>-				      phba-&gt;sli4_hba.mq_ecount);</div><div class='add'>+				      phba-&gt;sli4_hba.mq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0505 Failed allocate slow-path MQ\n");</div><div class='hunk'>@@ -8937,7 +8954,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Create slow-path ELS Work Queue */</div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.wq_esize,</div><div class='del'>-				      phba-&gt;sli4_hba.wq_ecount);</div><div class='add'>+				      phba-&gt;sli4_hba.wq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0504 Failed allocate slow-path ELS WQ\n");</div><div class='hunk'>@@ -8951,7 +8968,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 		/* Create NVME LS Complete Queue */</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 					      phba-&gt;sli4_hba.cq_esize,</div><div class='del'>-					      phba-&gt;sli4_hba.cq_ecount);</div><div class='add'>+					      phba-&gt;sli4_hba.cq_ecount, cpu);</div><div class='ctx'> 		if (!qdesc) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 					"6079 Failed allocate NVME LS CQ\n");</div><div class='hunk'>@@ -8964,7 +8981,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 		/* Create NVME LS Work Queue */</div><div class='ctx'> 		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 					      phba-&gt;sli4_hba.wq_esize,</div><div class='del'>-					      phba-&gt;sli4_hba.wq_ecount);</div><div class='add'>+					      phba-&gt;sli4_hba.wq_ecount, cpu);</div><div class='ctx'> 		if (!qdesc) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 					"6080 Failed allocate NVME LS WQ\n");</div><div class='hunk'>@@ -8982,7 +8999,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Create Receive Queue for header */</div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.rq_esize,</div><div class='del'>-				      phba-&gt;sli4_hba.rq_ecount);</div><div class='add'>+				      phba-&gt;sli4_hba.rq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0506 Failed allocate receive HRQ\n");</div><div class='hunk'>@@ -8993,7 +9010,7 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Create Receive Queue for data */</div><div class='ctx'> 	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 				      phba-&gt;sli4_hba.rq_esize,</div><div class='del'>-				      phba-&gt;sli4_hba.rq_ecount);</div><div class='add'>+				      phba-&gt;sli4_hba.rq_ecount, cpu);</div><div class='ctx'> 	if (!qdesc) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0507 Failed allocate receive DRQ\n");</div><div class='hunk'>@@ -9004,11 +9021,14 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 	if ((phba-&gt;cfg_enable_fc4_type &amp; LPFC_ENABLE_NVME) &amp;&amp;</div><div class='ctx'> 	    phba-&gt;nvmet_support) {</div><div class='ctx'> 		for (idx = 0; idx &lt; phba-&gt;cfg_nvmet_mrq; idx++) {</div><div class='add'>+			cpu = lpfc_find_cpu_handle(phba, idx,</div><div class='add'>+						   LPFC_FIND_BY_HDWQ);</div><div class='ctx'> 			/* Create NVMET Receive Queue for header */</div><div class='ctx'> 			qdesc = lpfc_sli4_queue_alloc(phba,</div><div class='ctx'> 						      LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 						      phba-&gt;sli4_hba.rq_esize,</div><div class='del'>-						      LPFC_NVMET_RQE_DEF_COUNT);</div><div class='add'>+						      LPFC_NVMET_RQE_DEF_COUNT,</div><div class='add'>+						      cpu);</div><div class='ctx'> 			if (!qdesc) {</div><div class='ctx'> 				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 						"3146 Failed allocate "</div><div class='hunk'>@@ -9019,8 +9039,9 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 			phba-&gt;sli4_hba.nvmet_mrq_hdr[idx] = qdesc;</div><div class='ctx'> </div><div class='ctx'> 			/* Only needed for header of RQ pair */</div><div class='del'>-			qdesc-&gt;rqbp = kzalloc(sizeof(struct lpfc_rqb),</div><div class='del'>-					      GFP_KERNEL);</div><div class='add'>+			qdesc-&gt;rqbp = kzalloc_node(sizeof(*qdesc-&gt;rqbp),</div><div class='add'>+						   GFP_KERNEL,</div><div class='add'>+						   cpu_to_node(cpu));</div><div class='ctx'> 			if (qdesc-&gt;rqbp == NULL) {</div><div class='ctx'> 				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 						"6131 Failed allocate "</div><div class='hunk'>@@ -9035,7 +9056,8 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)</div><div class='ctx'> 			qdesc = lpfc_sli4_queue_alloc(phba,</div><div class='ctx'> 						      LPFC_DEFAULT_PAGE_SIZE,</div><div class='ctx'> 						      phba-&gt;sli4_hba.rq_esize,</div><div class='del'>-						      LPFC_NVMET_RQE_DEF_COUNT);</div><div class='add'>+						      LPFC_NVMET_RQE_DEF_COUNT,</div><div class='add'>+						      cpu);</div><div class='ctx'> 			if (!qdesc) {</div><div class='ctx'> 				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 						"3156 Failed allocate "</div><div class='hunk'>@@ -9134,6 +9156,20 @@ lpfc_sli4_release_hdwq(struct lpfc_hba *phba)</div><div class='ctx'> void</div><div class='ctx'> lpfc_sli4_queue_destroy(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * Set FREE_INIT before beginning to free the queues.</div><div class='add'>+	 * Wait until the users of queues to acknowledge to</div><div class='add'>+	 * release queues by clearing FREE_WAIT.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	phba-&gt;sli.sli_flag |= LPFC_QUEUE_FREE_INIT;</div><div class='add'>+	while (phba-&gt;sli.sli_flag &amp; LPFC_QUEUE_FREE_WAIT) {</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+		msleep(20);</div><div class='add'>+		spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='ctx'> 	/* Release HBA eqs */</div><div class='ctx'> 	if (phba-&gt;sli4_hba.hdwq)</div><div class='ctx'> 		lpfc_sli4_release_hdwq(phba);</div><div class='hunk'>@@ -9172,6 +9208,11 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	/* Everything on this list has been freed */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;sli4_hba.lpfc_wq_list);</div><div class='add'>+</div><div class='add'>+	/* Done with freeing the queues */</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	phba-&gt;sli.sli_flag &amp;= ~LPFC_QUEUE_FREE_INIT;</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -9231,7 +9272,7 @@ lpfc_create_wq_cq(struct lpfc_hba *phba, struct lpfc_queue *eq,</div><div class='ctx'> 		rc = lpfc_wq_create(phba, wq, cq, qtype);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-				"6123 Fail setup fastpath WQ (%d), rc = 0x%x\n",</div><div class='add'>+				"4618 Fail setup fastpath WQ (%d), rc = 0x%x\n",</div><div class='ctx'> 				qidx, (uint32_t)rc);</div><div class='ctx'> 			/* no need to tear down cq - caller will do so */</div><div class='ctx'> 			return rc;</div><div class='hunk'>@@ -9271,7 +9312,7 @@ lpfc_create_wq_cq(struct lpfc_hba *phba, struct lpfc_queue *eq,</div><div class='ctx'>  * This routine will populate the cq_lookup table by all</div><div class='ctx'>  * available CQ queue_id's.</div><div class='ctx'>  **/</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_setup_cq_lookup(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_queue *eq, *childq;</div><div class='hunk'>@@ -10740,7 +10781,7 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba)</div><div class='ctx'> 				phba-&gt;cfg_irq_chann, vectors);</div><div class='ctx'> 		if (phba-&gt;cfg_irq_chann &gt; vectors)</div><div class='ctx'> 			phba-&gt;cfg_irq_chann = vectors;</div><div class='del'>-		if (phba-&gt;cfg_nvmet_mrq &gt; vectors)</div><div class='add'>+		if (phba-&gt;nvmet_support &amp;&amp; (phba-&gt;cfg_nvmet_mrq &gt; vectors))</div><div class='ctx'> 			phba-&gt;cfg_nvmet_mrq = vectors;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -11297,7 +11338,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> 	    !phba-&gt;nvme_support) {</div><div class='ctx'> 		phba-&gt;nvme_support = 0;</div><div class='ctx'> 		phba-&gt;nvmet_support = 0;</div><div class='del'>-		phba-&gt;cfg_nvmet_mrq = LPFC_NVMET_MRQ_OFF;</div><div class='add'>+		phba-&gt;cfg_nvmet_mrq = 0;</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_NVME,</div><div class='ctx'> 				"6101 Disabling NVME support: "</div><div class='ctx'> 				"Not supported by firmware: %d %d\n",</div><div class='hunk'>@@ -13046,7 +13087,7 @@ lpfc_io_resume(struct pci_dev *pdev)</div><div class='ctx'>  * is destroyed.</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_sli4_oas_verify(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c<br/>index 6172682a24ba..59252bfca14e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nportdisc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nportdisc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nportdisc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_nportdisc.c</a></div><div class='hunk'>@@ -360,6 +360,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	case  NLP_STE_NPR_NODE:</div><div class='ctx'> 		if (!(ndlp-&gt;nlp_flag &amp; NLP_NPR_ADISC))</div><div class='ctx'> 			break;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	case  NLP_STE_REG_LOGIN_ISSUE:</div><div class='ctx'> 	case  NLP_STE_PRLI_ISSUE:</div><div class='ctx'> 	case  NLP_STE_UNMAPPED_NODE:</div><div class='hunk'>@@ -870,7 +871,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)</div><div class='ctx'>  * This function will send a unreg_login mailbox command to the firmware</div><div class='ctx'>  * to release a rpi.</div><div class='ctx'>  **/</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_release_rpi(struct lpfc_hba *phba, struct lpfc_vport *vport,</div><div class='ctx'> 		 struct lpfc_nodelist *ndlp, uint16_t rpi)</div><div class='ctx'> {</div><div class='hunk'>@@ -1732,7 +1733,6 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,</div><div class='ctx'> 	LPFC_MBOXQ_t *pmb = (LPFC_MBOXQ_t *) arg;</div><div class='ctx'> 	MAILBOX_t *mb = &amp;pmb-&gt;u.mb;</div><div class='ctx'> 	uint32_t did  = mb-&gt;un.varWords[1];</div><div class='del'>-	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mb-&gt;mbxStatus) {</div><div class='ctx'> 		/* RegLogin failed */</div><div class='hunk'>@@ -1805,8 +1805,8 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,</div><div class='ctx'> 			 * GFT_ID to determine if remote port supports NVME.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (vport-&gt;cfg_enable_fc4_type != LPFC_ENABLE_FCP) {</div><div class='del'>-				rc = lpfc_ns_cmd(vport, SLI_CTNS_GFT_ID,</div><div class='del'>-						 0, ndlp-&gt;nlp_DID);</div><div class='add'>+				lpfc_ns_cmd(vport, SLI_CTNS_GFT_ID, 0,</div><div class='add'>+					    ndlp-&gt;nlp_DID);</div><div class='ctx'> 				return ndlp-&gt;nlp_state;</div><div class='ctx'> 			}</div><div class='ctx'> 			ndlp-&gt;nlp_fc4_type = NLP_FC4_FCP;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c<br/>index 1aa00d2c3f74..9d99cb915390 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nvme.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nvme.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nvme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_nvme.c</a></div><div class='hunk'>@@ -229,7 +229,7 @@ lpfc_nvme_create_queue(struct nvme_fc_local_port *pnvme_lport,</div><div class='ctx'> 	if (qhandle == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	qhandle-&gt;cpu_id = smp_processor_id();</div><div class='add'>+	qhandle-&gt;cpu_id = raw_smp_processor_id();</div><div class='ctx'> 	qhandle-&gt;qidx = qidx;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * NVME qidx == 0 is the admin queue, so both admin queue</div><div class='hunk'>@@ -312,7 +312,7 @@ lpfc_nvme_localport_delete(struct nvme_fc_local_port *localport)</div><div class='ctx'>  * Return value :</div><div class='ctx'>  * None</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_nvme_remoteport_delete(struct nvme_fc_remote_port *remoteport)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_nvme_rport *rport = remoteport-&gt;private;</div><div class='hunk'>@@ -1106,13 +1106,16 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn,</div><div class='ctx'> 					 lpfc_ncmd, nCmd,</div><div class='ctx'> 					 lpfc_ncmd-&gt;cur_iocbq.sli4_xritag,</div><div class='ctx'> 					 bf_get(lpfc_wcqe_c_xb, wcqe));</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		default:</div><div class='ctx'> out_err:</div><div class='ctx'> 			lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR,</div><div class='ctx'> 					 "6072 NVME Completion Error: xri %x "</div><div class='del'>-					 "status x%x result x%x placed x%x\n",</div><div class='add'>+					 "status x%x result x%x [x%x] "</div><div class='add'>+					 "placed x%x\n",</div><div class='ctx'> 					 lpfc_ncmd-&gt;cur_iocbq.sli4_xritag,</div><div class='ctx'> 					 lpfc_ncmd-&gt;status, lpfc_ncmd-&gt;result,</div><div class='add'>+					 wcqe-&gt;parameter,</div><div class='ctx'> 					 wcqe-&gt;total_data_placed);</div><div class='ctx'> 			nCmd-&gt;transferred_length = 0;</div><div class='ctx'> 			nCmd-&gt;rcv_rsplen = 0;</div><div class='hunk'>@@ -1140,7 +1143,7 @@ out_err:</div><div class='ctx'> 	if (phba-&gt;cpucheck_on &amp; LPFC_CHECK_NVME_IO) {</div><div class='ctx'> 		uint32_t cpu;</div><div class='ctx'> 		idx = lpfc_ncmd-&gt;cur_iocbq.hba_wqidx;</div><div class='del'>-		cpu = smp_processor_id();</div><div class='add'>+		cpu = raw_smp_processor_id();</div><div class='ctx'> 		if (cpu &lt; LPFC_CHECK_CPU_CNT) {</div><div class='ctx'> 			if (lpfc_ncmd-&gt;cpu != cpu)</div><div class='ctx'> 				lpfc_printf_vlog(vport,</div><div class='hunk'>@@ -1558,7 +1561,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,</div><div class='ctx'> 	if (phba-&gt;cfg_fcp_io_sched == LPFC_FCP_SCHED_BY_HDWQ) {</div><div class='ctx'> 		idx = lpfc_queue_info-&gt;index;</div><div class='ctx'> 	} else {</div><div class='del'>-		cpu = smp_processor_id();</div><div class='add'>+		cpu = raw_smp_processor_id();</div><div class='ctx'> 		idx = phba-&gt;sli4_hba.cpu_map[cpu].hdwq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1638,7 +1641,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,</div><div class='ctx'> 		lpfc_ncmd-&gt;ts_cmd_wqput = ktime_get_ns();</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;cpucheck_on &amp; LPFC_CHECK_NVME_IO) {</div><div class='del'>-		cpu = smp_processor_id();</div><div class='add'>+		cpu = raw_smp_processor_id();</div><div class='ctx'> 		if (cpu &lt; LPFC_CHECK_CPU_CNT) {</div><div class='ctx'> 			lpfc_ncmd-&gt;cpu = cpu;</div><div class='ctx'> 			if (idx != cpu)</div><div class='hunk'>@@ -2080,15 +2083,15 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)</div><div class='ctx'> 		lpfc_nvme_template.max_hw_queues =</div><div class='ctx'> 			phba-&gt;sli4_hba.num_present_cpu;</div><div class='ctx'> </div><div class='add'>+	if (!IS_ENABLED(CONFIG_NVME_FC))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* localport is allocated from the stack, but the registration</div><div class='ctx'> 	 * call allocates heap memory as well as the private area.</div><div class='ctx'> 	 */</div><div class='del'>-#if (IS_ENABLED(CONFIG_NVME_FC))</div><div class='add'>+</div><div class='ctx'> 	ret = nvme_fc_register_localport(&amp;nfcp_info, &amp;lpfc_nvme_template,</div><div class='ctx'> 					 &amp;vport-&gt;phba-&gt;pcidev-&gt;dev, &amp;localport);</div><div class='del'>-#else</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-#endif</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME | LOG_NVME_DISC,</div><div class='ctx'> 				 "6005 Successfully registered local "</div><div class='hunk'>@@ -2123,6 +2126,7 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if (IS_ENABLED(CONFIG_NVME_FC))</div><div class='ctx'> /* lpfc_nvme_lport_unreg_wait - Wait for the host to complete an lport unreg.</div><div class='ctx'>  *</div><div class='ctx'>  * The driver has to wait for the host nvme transport to callback</div><div class='hunk'>@@ -2133,12 +2137,11 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)</div><div class='ctx'>  * An uninterruptible wait is used because of the risk of transport-to-</div><div class='ctx'>  * driver state mismatch.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_nvme_lport_unreg_wait(struct lpfc_vport *vport,</div><div class='ctx'> 			   struct lpfc_nvme_lport *lport,</div><div class='ctx'> 			   struct completion *lport_unreg_cmp)</div><div class='ctx'> {</div><div class='del'>-#if (IS_ENABLED(CONFIG_NVME_FC))</div><div class='ctx'> 	u32 wait_tmo;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2161,8 +2164,8 @@ lpfc_nvme_lport_unreg_wait(struct lpfc_vport *vport,</div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR,</div><div class='ctx'> 			 "6177 Lport %p Localport %p Complete Success\n",</div><div class='ctx'> 			 lport, vport-&gt;localport);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * lpfc_nvme_destroy_localport - Destroy lpfc_nvme bound to nvme transport.</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c<br/>index 361e2b103648..d74bfd264495 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nvmet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nvmet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nvmet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_nvmet.c</a></div><div class='hunk'>@@ -220,7 +220,7 @@ lpfc_nvmet_cmd_template(void)</div><div class='ctx'> 	/* Word 12, 13, 14, 15 - is zero */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_nvmet_defer_release(struct lpfc_hba *phba, struct lpfc_nvmet_rcv_ctx *ctxp)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;ctxp-&gt;ctxlock);</div><div class='hunk'>@@ -325,7 +325,6 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf)</div><div class='ctx'> 	struct fc_frame_header *fc_hdr;</div><div class='ctx'> 	struct rqb_dmabuf *nvmebuf;</div><div class='ctx'> 	struct lpfc_nvmet_ctx_info *infop;</div><div class='del'>-	uint32_t *payload;</div><div class='ctx'> 	uint32_t size, oxid, sid;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	unsigned long iflag;</div><div class='hunk'>@@ -370,7 +369,6 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf)</div><div class='ctx'> 		fc_hdr = (struct fc_frame_header *)(nvmebuf-&gt;hbuf.virt);</div><div class='ctx'> 		oxid = be16_to_cpu(fc_hdr-&gt;fh_ox_id);</div><div class='ctx'> 		tgtp = (struct lpfc_nvmet_tgtport *)phba-&gt;targetport-&gt;private;</div><div class='del'>-		payload = (uint32_t *)(nvmebuf-&gt;dbuf.virt);</div><div class='ctx'> 		size = nvmebuf-&gt;bytes_recv;</div><div class='ctx'> 		sid = sli4_sid_from_fc_hdr(fc_hdr);</div><div class='ctx'> </div><div class='hunk'>@@ -435,7 +433,7 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf)</div><div class='ctx'> 	 * Use the CPU context list, from the MRQ the IO was received on</div><div class='ctx'> 	 * (ctxp-&gt;idx), to save context structure.</div><div class='ctx'> 	 */</div><div class='del'>-	cpu = smp_processor_id();</div><div class='add'>+	cpu = raw_smp_processor_id();</div><div class='ctx'> 	infop = lpfc_get_ctx_list(phba, cpu, ctxp-&gt;idx);</div><div class='ctx'> 	spin_lock_irqsave(&amp;infop-&gt;nvmet_ctx_list_lock, iflag);</div><div class='ctx'> 	list_add_tail(&amp;ctx_buf-&gt;list, &amp;infop-&gt;nvmet_ctx_list);</div><div class='hunk'>@@ -765,7 +763,7 @@ lpfc_nvmet_xmt_fcp_op_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_SCSI_LPFC_DEBUG_FS</div><div class='ctx'> 	if (phba-&gt;cpucheck_on &amp; LPFC_CHECK_NVMET_IO) {</div><div class='del'>-		id = smp_processor_id();</div><div class='add'>+		id = raw_smp_processor_id();</div><div class='ctx'> 		if (id &lt; LPFC_CHECK_CPU_CNT) {</div><div class='ctx'> 			if (ctxp-&gt;cpu != id)</div><div class='ctx'> 				lpfc_printf_log(phba, KERN_INFO, LOG_NVME_IOERR,</div><div class='hunk'>@@ -906,7 +904,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,</div><div class='ctx'> 		ctxp-&gt;hdwq = &amp;phba-&gt;sli4_hba.hdwq[rsp-&gt;hwqid];</div><div class='ctx'> </div><div class='ctx'> 	if (phba-&gt;cpucheck_on &amp; LPFC_CHECK_NVMET_IO) {</div><div class='del'>-		int id = smp_processor_id();</div><div class='add'>+		int id = raw_smp_processor_id();</div><div class='ctx'> 		if (id &lt; LPFC_CHECK_CPU_CNT) {</div><div class='ctx'> 			if (rsp-&gt;hwqid != id)</div><div class='ctx'> 				lpfc_printf_log(phba, KERN_INFO, LOG_NVME_IOERR,</div><div class='hunk'>@@ -1120,7 +1118,7 @@ lpfc_nvmet_defer_rcv(struct nvmet_fc_target_port *tgtport,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	lpfc_nvmeio_data(phba, "NVMET DEFERRCV: xri x%x sz %d CPU %02x\n",</div><div class='del'>-			 ctxp-&gt;oxid, ctxp-&gt;size, smp_processor_id());</div><div class='add'>+			 ctxp-&gt;oxid, ctxp-&gt;size, raw_smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	if (!nvmebuf) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_INFO, LOG_NVME_IOERR,</div><div class='hunk'>@@ -1596,7 +1594,7 @@ lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport,</div><div class='ctx'> </div><div class='ctx'> 		lpfc_nvmeio_data(phba,</div><div class='ctx'> 			"NVMET ABTS RCV: xri x%x CPU %02x rjt %d\n",</div><div class='del'>-			xri, smp_processor_id(), 0);</div><div class='add'>+			xri, raw_smp_processor_id(), 0);</div><div class='ctx'> </div><div class='ctx'> 		lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS,</div><div class='ctx'> 				"6319 NVMET Rcv ABTS:acc xri x%x\n", xri);</div><div class='hunk'>@@ -1612,7 +1610,7 @@ lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, iflag);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_nvmeio_data(phba, "NVMET ABTS RCV: xri x%x CPU %02x rjt %d\n",</div><div class='del'>-			 xri, smp_processor_id(), 1);</div><div class='add'>+			 xri, raw_smp_processor_id(), 1);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS,</div><div class='ctx'> 			"6320 NVMET Rcv ABTS:rjt xri x%x\n", xri);</div><div class='hunk'>@@ -1725,7 +1723,11 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba)</div><div class='ctx'> 		}</div><div class='ctx'> 		tgtp-&gt;tport_unreg_cmp = &amp;tport_unreg_cmp;</div><div class='ctx'> 		nvmet_fc_unregister_targetport(phba-&gt;targetport);</div><div class='del'>-		wait_for_completion_timeout(&amp;tport_unreg_cmp, 5);</div><div class='add'>+		if (!wait_for_completion_timeout(tgtp-&gt;tport_unreg_cmp,</div><div class='add'>+					msecs_to_jiffies(LPFC_NVMET_WAIT_TMO)))</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_NVME,</div><div class='add'>+					"6179 Unreg targetport %p timeout "</div><div class='add'>+					"reached.\n", phba-&gt;targetport);</div><div class='ctx'> 		lpfc_nvmet_cleanup_io_context(phba);</div><div class='ctx'> 	}</div><div class='ctx'> 	phba-&gt;targetport = NULL;</div><div class='hunk'>@@ -1843,7 +1845,7 @@ lpfc_nvmet_process_rcv_fcp_req(struct lpfc_nvmet_ctxbuf *ctx_buf)</div><div class='ctx'> 	struct lpfc_hba *phba = ctxp-&gt;phba;</div><div class='ctx'> 	struct rqb_dmabuf *nvmebuf = ctxp-&gt;rqb_buffer;</div><div class='ctx'> 	struct lpfc_nvmet_tgtport *tgtp;</div><div class='del'>-	uint32_t *payload;</div><div class='add'>+	uint32_t *payload, qno;</div><div class='ctx'> 	uint32_t rc;</div><div class='ctx'> 	unsigned long iflags;</div><div class='ctx'> </div><div class='hunk'>@@ -1876,6 +1878,15 @@ lpfc_nvmet_process_rcv_fcp_req(struct lpfc_nvmet_ctxbuf *ctx_buf)</div><div class='ctx'> 	/* Process FCP command */</div><div class='ctx'> 	if (rc == 0) {</div><div class='ctx'> 		atomic_inc(&amp;tgtp-&gt;rcv_fcp_cmd_out);</div><div class='add'>+		spin_lock_irqsave(&amp;ctxp-&gt;ctxlock, iflags);</div><div class='add'>+		if ((ctxp-&gt;flag &amp; LPFC_NVMET_CTX_REUSE_WQ) ||</div><div class='add'>+		    (nvmebuf != ctxp-&gt;rqb_buffer)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;ctxp-&gt;ctxlock, iflags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		ctxp-&gt;rqb_buffer = NULL;</div><div class='add'>+		spin_unlock_irqrestore(&amp;ctxp-&gt;ctxlock, iflags);</div><div class='add'>+		lpfc_rq_buf_free(phba, &amp;nvmebuf-&gt;hbuf); /* repost */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1886,6 +1897,20 @@ lpfc_nvmet_process_rcv_fcp_req(struct lpfc_nvmet_ctxbuf *ctx_buf)</div><div class='ctx'> 				 ctxp-&gt;oxid, ctxp-&gt;size, ctxp-&gt;sid);</div><div class='ctx'> 		atomic_inc(&amp;tgtp-&gt;rcv_fcp_cmd_out);</div><div class='ctx'> 		atomic_inc(&amp;tgtp-&gt;defer_fod);</div><div class='add'>+		spin_lock_irqsave(&amp;ctxp-&gt;ctxlock, iflags);</div><div class='add'>+		if (ctxp-&gt;flag &amp; LPFC_NVMET_CTX_REUSE_WQ) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;ctxp-&gt;ctxlock, iflags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ctxp-&gt;ctxlock, iflags);</div><div class='add'>+		/*</div><div class='add'>+		 * Post a replacement DMA buffer to RQ and defer</div><div class='add'>+		 * freeing rcv buffer till .defer_rcv callback</div><div class='add'>+		 */</div><div class='add'>+		qno = nvmebuf-&gt;idx;</div><div class='add'>+		lpfc_post_rq_buffer(</div><div class='add'>+			phba, phba-&gt;sli4_hba.nvmet_mrq_hdr[qno],</div><div class='add'>+			phba-&gt;sli4_hba.nvmet_mrq_data[qno], 1, qno);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_inc(&amp;tgtp-&gt;rcv_fcp_cmd_drop);</div><div class='hunk'>@@ -1996,7 +2021,6 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba,</div><div class='ctx'> 	struct fc_frame_header *fc_hdr;</div><div class='ctx'> 	struct lpfc_nvmet_ctxbuf *ctx_buf;</div><div class='ctx'> 	struct lpfc_nvmet_ctx_info *current_infop;</div><div class='del'>-	uint32_t *payload;</div><div class='ctx'> 	uint32_t size, oxid, sid, qno;</div><div class='ctx'> 	unsigned long iflag;</div><div class='ctx'> 	int current_cpu;</div><div class='hunk'>@@ -2020,7 +2044,7 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba,</div><div class='ctx'> 	 * be empty, thus it would need to be replenished with the</div><div class='ctx'> 	 * context list from another CPU for this MRQ.</div><div class='ctx'> 	 */</div><div class='del'>-	current_cpu = smp_processor_id();</div><div class='add'>+	current_cpu = raw_smp_processor_id();</div><div class='ctx'> 	current_infop = lpfc_get_ctx_list(phba, current_cpu, idx);</div><div class='ctx'> 	spin_lock_irqsave(&amp;current_infop-&gt;nvmet_ctx_list_lock, iflag);</div><div class='ctx'> 	if (current_infop-&gt;nvmet_ctx_list_cnt) {</div><div class='hunk'>@@ -2050,7 +2074,7 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	lpfc_nvmeio_data(phba, "NVMET FCP  RCV: xri x%x sz %d CPU %02x\n",</div><div class='del'>-			 oxid, size, smp_processor_id());</div><div class='add'>+			 oxid, size, raw_smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	tgtp = (struct lpfc_nvmet_tgtport *)phba-&gt;targetport-&gt;private;</div><div class='ctx'> </div><div class='hunk'>@@ -2074,7 +2098,6 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	payload = (uint32_t *)(nvmebuf-&gt;dbuf.virt);</div><div class='ctx'> 	sid = sli4_sid_from_fc_hdr(fc_hdr);</div><div class='ctx'> </div><div class='ctx'> 	ctxp = (struct lpfc_nvmet_rcv_ctx *)ctx_buf-&gt;context;</div><div class='hunk'>@@ -2690,12 +2713,11 @@ lpfc_nvmet_sol_fcp_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_nvmet_rcv_ctx *ctxp;</div><div class='ctx'> 	struct lpfc_nvmet_tgtport *tgtp;</div><div class='del'>-	uint32_t status, result;</div><div class='add'>+	uint32_t result;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool released = false;</div><div class='ctx'> </div><div class='ctx'> 	ctxp = cmdwqe-&gt;context2;</div><div class='del'>-	status = bf_get(lpfc_wcqe_c_status, wcqe);</div><div class='ctx'> 	result = wcqe-&gt;parameter;</div><div class='ctx'> </div><div class='ctx'> 	tgtp = (struct lpfc_nvmet_tgtport *)phba-&gt;targetport-&gt;private;</div><div class='hunk'>@@ -2761,11 +2783,10 @@ lpfc_nvmet_unsol_fcp_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,</div><div class='ctx'> 	struct lpfc_nvmet_rcv_ctx *ctxp;</div><div class='ctx'> 	struct lpfc_nvmet_tgtport *tgtp;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	uint32_t status, result;</div><div class='add'>+	uint32_t result;</div><div class='ctx'> 	bool released = false;</div><div class='ctx'> </div><div class='ctx'> 	ctxp = cmdwqe-&gt;context2;</div><div class='del'>-	status = bf_get(lpfc_wcqe_c_status, wcqe);</div><div class='ctx'> 	result = wcqe-&gt;parameter;</div><div class='ctx'> </div><div class='ctx'> 	if (!ctxp) {</div><div class='hunk'>@@ -2842,10 +2863,9 @@ lpfc_nvmet_xmt_ls_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_nvmet_rcv_ctx *ctxp;</div><div class='ctx'> 	struct lpfc_nvmet_tgtport *tgtp;</div><div class='del'>-	uint32_t status, result;</div><div class='add'>+	uint32_t result;</div><div class='ctx'> </div><div class='ctx'> 	ctxp = cmdwqe-&gt;context2;</div><div class='del'>-	status = bf_get(lpfc_wcqe_c_status, wcqe);</div><div class='ctx'> 	result = wcqe-&gt;parameter;</div><div class='ctx'> </div><div class='ctx'> 	tgtp = (struct lpfc_nvmet_tgtport *)phba-&gt;targetport-&gt;private;</div><div class='hunk'>@@ -3200,7 +3220,6 @@ lpfc_nvmet_unsol_ls_issue_abort(struct lpfc_hba *phba,</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_nvmet_tgtport *tgtp;</div><div class='ctx'> 	struct lpfc_iocbq *abts_wqeq;</div><div class='del'>-	union lpfc_wqe128 *wqe_abts;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -3230,7 +3249,6 @@ lpfc_nvmet_unsol_ls_issue_abort(struct lpfc_hba *phba,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	abts_wqeq = ctxp-&gt;wqeq;</div><div class='del'>-	wqe_abts = &amp;abts_wqeq-&gt;wqe;</div><div class='ctx'> </div><div class='ctx'> 	if (lpfc_nvmet_unsol_issue_abort(phba, ctxp, sid, xri) == 0) {</div><div class='ctx'> 		rc = WQE_BUSY;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_nvmet.h b/drivers/scsi/lpfc/lpfc_nvmet.h<br/>index 368deea2bcf8..2f3f603d94c4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nvmet.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_nvmet.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_nvmet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_nvmet.h</a></div><div class='hunk'>@@ -27,10 +27,11 @@</div><div class='ctx'> #define LPFC_NVMET_RQE_DEF_COUNT	2048</div><div class='ctx'> #define LPFC_NVMET_SUCCESS_LEN		12</div><div class='ctx'> </div><div class='del'>-#define LPFC_NVMET_MRQ_OFF		0xffff</div><div class='ctx'> #define LPFC_NVMET_MRQ_AUTO		0</div><div class='ctx'> #define LPFC_NVMET_MRQ_MAX		16</div><div class='ctx'> </div><div class='add'>+#define LPFC_NVMET_WAIT_TMO		(5 * MSEC_PER_SEC)</div><div class='add'>+</div><div class='ctx'> /* Used for NVME Target */</div><div class='ctx'> struct lpfc_nvmet_tgtport {</div><div class='ctx'> 	struct lpfc_hba *phba;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c<br/>index c98f264f1d83..ba996fbde89b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_scsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_scsi.c</a></div><div class='hunk'>@@ -688,7 +688,7 @@ lpfc_get_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	uint32_t sgl_size, cpu, idx;</div><div class='ctx'> 	int tag;</div><div class='ctx'> </div><div class='del'>-	cpu = smp_processor_id();</div><div class='add'>+	cpu = raw_smp_processor_id();</div><div class='ctx'> 	if (cmnd &amp;&amp; phba-&gt;cfg_fcp_io_sched == LPFC_FCP_SCHED_BY_HDWQ) {</div><div class='ctx'> 		tag = blk_mq_unique_tag(cmnd-&gt;request);</div><div class='ctx'> 		idx = blk_mq_unique_tag_to_hwq(tag);</div><div class='hunk'>@@ -1137,7 +1137,7 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,</div><div class='ctx'> </div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				/* Drop thru */</div><div class='add'>+				/* fall through */</div><div class='ctx'> 			case SCSI_PROT_WRITE_INSERT:</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * For WRITE_INSERT, force the error</div><div class='hunk'>@@ -1256,7 +1256,7 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,</div><div class='ctx'> 					rc = BG_ERR_TGT | BG_ERR_CHECK;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				/* Drop thru */</div><div class='add'>+				/* fall through */</div><div class='ctx'> 			case SCSI_PROT_WRITE_INSERT:</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * For WRITE_INSERT, force the</div><div class='hunk'>@@ -1338,7 +1338,7 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,</div><div class='ctx'> 			switch (op) {</div><div class='ctx'> 			case SCSI_PROT_WRITE_PASS:</div><div class='ctx'> 				rc = BG_ERR_CHECK;</div><div class='del'>-				/* Drop thru */</div><div class='add'>+				/* fall through */</div><div class='ctx'> </div><div class='ctx'> 			case SCSI_PROT_WRITE_INSERT:</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -3669,8 +3669,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCSI_LPFC_DEBUG_FS</div><div class='ctx'> 	if (phba-&gt;cpucheck_on &amp; LPFC_CHECK_SCSI_IO) {</div><div class='del'>-		cpu = smp_processor_id();</div><div class='del'>-		if (cpu &lt; LPFC_CHECK_CPU_CNT)</div><div class='add'>+		cpu = raw_smp_processor_id();</div><div class='add'>+		if (cpu &lt; LPFC_CHECK_CPU_CNT &amp;&amp; phba-&gt;sli4_hba.hdwq)</div><div class='ctx'> 			phba-&gt;sli4_hba.hdwq[idx].cpucheck_cmpl_io[cpu]++;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3822,7 +3822,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 					lpfc_cmd-&gt;cur_iocbq.sli4_lxritag,</div><div class='ctx'> 					0, 0);</div><div class='ctx'> 			}</div><div class='del'>-		/* else: fall through */</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		default:</div><div class='ctx'> 			cmd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3878,10 +3878,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,</div><div class='ctx'> 	 * wake up the thread.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;lpfc_cmd-&gt;buf_lock);</div><div class='del'>-	if (unlikely(lpfc_cmd-&gt;cur_iocbq.iocb_flag &amp; LPFC_DRIVER_ABORTED)) {</div><div class='del'>-		lpfc_cmd-&gt;cur_iocbq.iocb_flag &amp;= ~LPFC_DRIVER_ABORTED;</div><div class='del'>-		if (lpfc_cmd-&gt;waitq)</div><div class='del'>-			wake_up(lpfc_cmd-&gt;waitq);</div><div class='add'>+	lpfc_cmd-&gt;cur_iocbq.iocb_flag &amp;= ~LPFC_DRIVER_ABORTED;</div><div class='add'>+	if (lpfc_cmd-&gt;waitq) {</div><div class='add'>+		wake_up(lpfc_cmd-&gt;waitq);</div><div class='ctx'> 		lpfc_cmd-&gt;waitq = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;lpfc_cmd-&gt;buf_lock);</div><div class='hunk'>@@ -4464,7 +4463,7 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCSI_LPFC_DEBUG_FS</div><div class='ctx'> 	if (phba-&gt;cpucheck_on &amp; LPFC_CHECK_SCSI_IO) {</div><div class='del'>-		cpu = smp_processor_id();</div><div class='add'>+		cpu = raw_smp_processor_id();</div><div class='ctx'> 		if (cpu &lt; LPFC_CHECK_CPU_CNT) {</div><div class='ctx'> 			struct lpfc_sli4_hdw_queue *hdwq =</div><div class='ctx'> 					&amp;phba-&gt;sli4_hba.hdwq[lpfc_cmd-&gt;hdwq_no];</div><div class='hunk'>@@ -5049,7 +5048,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	rdata = lpfc_rport_data_from_scsi_device(cmnd-&gt;device);</div><div class='ctx'> 	if (!rdata || !rdata-&gt;pnode) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,</div><div class='del'>-				 "0798 Device Reset rport failure: rdata x%p\n",</div><div class='add'>+				 "0798 Device Reset rdata failure: rdata x%p\n",</div><div class='ctx'> 				 rdata);</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5118,9 +5117,10 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	rdata = lpfc_rport_data_from_scsi_device(cmnd-&gt;device);</div><div class='del'>-	if (!rdata) {</div><div class='add'>+	if (!rdata || !rdata-&gt;pnode) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,</div><div class='del'>-			"0799 Target Reset rport failure: rdata x%p\n", rdata);</div><div class='add'>+				 "0799 Target Reset rdata failure: rdata x%p\n",</div><div class='add'>+				 rdata);</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> 	pnode = rdata-&gt;pnode;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c<br/>index 57b4a463b589..2acda188b0dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_sli.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_sli.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_sli.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_sli.c</a></div><div class='hunk'>@@ -87,9 +87,6 @@ static void lpfc_sli4_hba_handle_eqe(struct lpfc_hba *phba,</div><div class='ctx'> 				     struct lpfc_eqe *eqe);</div><div class='ctx'> static bool lpfc_sli4_mbox_completions_pending(struct lpfc_hba *phba);</div><div class='ctx'> static bool lpfc_sli4_process_missed_mbox_completions(struct lpfc_hba *phba);</div><div class='del'>-static int lpfc_sli4_abort_nvme_io(struct lpfc_hba *phba,</div><div class='del'>-				   struct lpfc_sli_ring *pring,</div><div class='del'>-				   struct lpfc_iocbq *cmdiocb);</div><div class='ctx'> </div><div class='ctx'> static IOCB_t *</div><div class='ctx'> lpfc_get_iocb_from_iocbq(struct lpfc_iocbq *iocbq)</div><div class='hunk'>@@ -151,7 +148,7 @@ lpfc_sli4_wq_put(struct lpfc_queue *q, union lpfc_wqe128 *wqe)</div><div class='ctx'> 	/* sanity check on queue memory */</div><div class='ctx'> 	if (unlikely(!q))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	temp_wqe = q-&gt;qe[q-&gt;host_index].wqe;</div><div class='add'>+	temp_wqe = lpfc_sli4_qe(q, q-&gt;host_index);</div><div class='ctx'> </div><div class='ctx'> 	/* If the host has not yet processed the next entry then we are done */</div><div class='ctx'> 	idx = ((q-&gt;host_index + 1) % q-&gt;entry_count);</div><div class='hunk'>@@ -271,7 +268,7 @@ lpfc_sli4_mq_put(struct lpfc_queue *q, struct lpfc_mqe *mqe)</div><div class='ctx'> 	/* sanity check on queue memory */</div><div class='ctx'> 	if (unlikely(!q))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	temp_mqe = q-&gt;qe[q-&gt;host_index].mqe;</div><div class='add'>+	temp_mqe = lpfc_sli4_qe(q, q-&gt;host_index);</div><div class='ctx'> </div><div class='ctx'> 	/* If the host has not yet processed the next entry then we are done */</div><div class='ctx'> 	if (((q-&gt;host_index + 1) % q-&gt;entry_count) == q-&gt;hba_index)</div><div class='hunk'>@@ -331,7 +328,7 @@ lpfc_sli4_eq_get(struct lpfc_queue *q)</div><div class='ctx'> 	/* sanity check on queue memory */</div><div class='ctx'> 	if (unlikely(!q))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	eqe = q-&gt;qe[q-&gt;host_index].eqe;</div><div class='add'>+	eqe = lpfc_sli4_qe(q, q-&gt;host_index);</div><div class='ctx'> </div><div class='ctx'> 	/* If the next EQE is not valid then we are done */</div><div class='ctx'> 	if (bf_get_le32(lpfc_eqe_valid, eqe) != q-&gt;qe_valid)</div><div class='hunk'>@@ -355,7 +352,7 @@ lpfc_sli4_eq_get(struct lpfc_queue *q)</div><div class='ctx'>  * @q: The Event Queue to disable interrupts</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='del'>-inline void</div><div class='add'>+void</div><div class='ctx'> lpfc_sli4_eq_clr_intr(struct lpfc_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='hunk'>@@ -374,7 +371,7 @@ lpfc_sli4_eq_clr_intr(struct lpfc_queue *q)</div><div class='ctx'>  * @q: The Event Queue to disable interrupts</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='del'>-inline void</div><div class='add'>+void</div><div class='ctx'> lpfc_sli4_if6_eq_clr_intr(struct lpfc_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='hunk'>@@ -545,7 +542,7 @@ lpfc_sli4_cq_get(struct lpfc_queue *q)</div><div class='ctx'> 	/* sanity check on queue memory */</div><div class='ctx'> 	if (unlikely(!q))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	cqe = q-&gt;qe[q-&gt;host_index].cqe;</div><div class='add'>+	cqe = lpfc_sli4_qe(q, q-&gt;host_index);</div><div class='ctx'> </div><div class='ctx'> 	/* If the next CQE is not valid then we are done */</div><div class='ctx'> 	if (bf_get_le32(lpfc_cqe_valid, cqe) != q-&gt;qe_valid)</div><div class='hunk'>@@ -667,8 +664,8 @@ lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	hq_put_index = hq-&gt;host_index;</div><div class='ctx'> 	dq_put_index = dq-&gt;host_index;</div><div class='del'>-	temp_hrqe = hq-&gt;qe[hq_put_index].rqe;</div><div class='del'>-	temp_drqe = dq-&gt;qe[dq_put_index].rqe;</div><div class='add'>+	temp_hrqe = lpfc_sli4_qe(hq, hq_put_index);</div><div class='add'>+	temp_drqe = lpfc_sli4_qe(dq, dq_put_index);</div><div class='ctx'> </div><div class='ctx'> 	if (hq-&gt;type != LPFC_HRQ || dq-&gt;type != LPFC_DRQ)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -907,10 +904,10 @@ lpfc_handle_rrq_active(struct lpfc_hba *phba)</div><div class='ctx'> 		mod_timer(&amp;phba-&gt;rrq_tmr, next_time);</div><div class='ctx'> 	list_for_each_entry_safe(rrq, nextrrq, &amp;send_rrq, list) {</div><div class='ctx'> 		list_del(&amp;rrq-&gt;list);</div><div class='del'>-		if (!rrq-&gt;send_rrq)</div><div class='add'>+		if (!rrq-&gt;send_rrq) {</div><div class='ctx'> 			/* this call will free the rrq */</div><div class='del'>-		lpfc_clr_rrq_active(phba, rrq-&gt;xritag, rrq);</div><div class='del'>-		else if (lpfc_send_rrq(phba, rrq)) {</div><div class='add'>+			lpfc_clr_rrq_active(phba, rrq-&gt;xritag, rrq);</div><div class='add'>+		} else if (lpfc_send_rrq(phba, rrq)) {</div><div class='ctx'> 			/* if we send the rrq then the completion handler</div><div class='ctx'> 			*  will clear the bit in the xribitmap.</div><div class='ctx'> 			*/</div><div class='hunk'>@@ -2502,8 +2499,8 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ndlp-&gt;nlp_flag &amp;= ~NLP_UNREG_INP;</div><div class='ctx'> 			}</div><div class='add'>+			pmb-&gt;ctx_ndlp = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		pmb-&gt;ctx_ndlp = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check security permission status on INIT_LINK mailbox command */</div><div class='hunk'>@@ -3922,33 +3919,6 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_sli_abort_wqe_ring - Abort all iocbs in the ring</div><div class='del'>- * @phba: Pointer to HBA context object.</div><div class='del'>- * @pring: Pointer to driver SLI ring object.</div><div class='del'>- *</div><div class='del'>- * This function aborts all iocbs in the given ring and frees all the iocb</div><div class='del'>- * objects in txq. This function issues an abort iocb for all the iocb commands</div><div class='del'>- * in txcmplq. The iocbs in the txcmplq is not guaranteed to complete before</div><div class='del'>- * the return of this function. The caller is not required to hold any locks.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-lpfc_sli_abort_wqe_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)</div><div class='del'>-{</div><div class='del'>-	LIST_HEAD(completions);</div><div class='del'>-	struct lpfc_iocbq *iocb, *next_iocb;</div><div class='del'>-</div><div class='del'>-	if (pring-&gt;ringno == LPFC_ELS_RING)</div><div class='del'>-		lpfc_fabric_abort_hba(phba);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-	/* Next issue ABTS for everything on the txcmplq */</div><div class='del'>-	list_for_each_entry_safe(iocb, next_iocb, &amp;pring-&gt;txcmplq, list)</div><div class='del'>-		lpfc_sli4_abort_nvme_io(phba, pring, iocb);</div><div class='del'>-	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * lpfc_sli_abort_fcp_rings - Abort all iocbs in all FCP rings</div><div class='ctx'>  * @phba: Pointer to HBA context object.</div><div class='ctx'>  * @pring: Pointer to driver SLI ring object.</div><div class='hunk'>@@ -3978,33 +3948,6 @@ lpfc_sli_abort_fcp_rings(struct lpfc_hba *phba)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_sli_abort_nvme_rings - Abort all wqes in all NVME rings</div><div class='del'>- * @phba: Pointer to HBA context object.</div><div class='del'>- *</div><div class='del'>- * This function aborts all wqes in NVME rings. This function issues an</div><div class='del'>- * abort wqe for all the outstanding IO commands in txcmplq. The iocbs in</div><div class='del'>- * the txcmplq is not guaranteed to complete before the return of this</div><div class='del'>- * function. The caller is not required to hold any locks.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-lpfc_sli_abort_nvme_rings(struct lpfc_hba *phba)</div><div class='del'>-{</div><div class='del'>-	struct lpfc_sli_ring  *pring;</div><div class='del'>-	uint32_t i;</div><div class='del'>-</div><div class='del'>-	if ((phba-&gt;sli_rev &lt; LPFC_SLI_REV4) ||</div><div class='del'>-	    !(phba-&gt;cfg_enable_fc4_type &amp; LPFC_ENABLE_NVME))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Abort all IO on each NVME ring. */</div><div class='del'>-	for (i = 0; i &lt; phba-&gt;cfg_hdw_queue; i++) {</div><div class='del'>-		pring = phba-&gt;sli4_hba.hdwq[i].nvme_wq-&gt;pring;</div><div class='del'>-		lpfc_sli_abort_wqe_ring(phba, pring);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * lpfc_sli_flush_fcp_rings - flush all iocbs in the fcp ring</div><div class='ctx'>  * @phba: Pointer to HBA context object.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4487,7 +4430,9 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off parity checking and serr during the physical reset */</div><div class='del'>-	pci_read_config_word(phba-&gt;pcidev, PCI_COMMAND, &amp;cfg_value);</div><div class='add'>+	if (pci_read_config_word(phba-&gt;pcidev, PCI_COMMAND, &amp;cfg_value))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	pci_write_config_word(phba-&gt;pcidev, PCI_COMMAND,</div><div class='ctx'> 			      (cfg_value &amp;</div><div class='ctx'> 			       ~(PCI_COMMAND_PARITY | PCI_COMMAND_SERR)));</div><div class='hunk'>@@ -4564,7 +4509,12 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> 			"0389 Performing PCI function reset!\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off parity checking and serr during the physical reset */</div><div class='del'>-	pci_read_config_word(phba-&gt;pcidev, PCI_COMMAND, &amp;cfg_value);</div><div class='add'>+	if (pci_read_config_word(phba-&gt;pcidev, PCI_COMMAND, &amp;cfg_value)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='add'>+				"3205 PCI read Config failed\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pci_write_config_word(phba-&gt;pcidev, PCI_COMMAND, (cfg_value &amp;</div><div class='ctx'> 			      ~(PCI_COMMAND_PARITY | PCI_COMMAND_SERR)));</div><div class='ctx'> </div><div class='hunk'>@@ -5395,7 +5345,7 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_sli4_retrieve_pport_name - Retrieve SLI4 device physical port name</div><div class='add'>+ * lpfc_sli4_get_ctl_attr - Retrieve SLI4 device controller attributes</div><div class='ctx'>  * @phba: pointer to lpfc hba data structure.</div><div class='ctx'>  *</div><div class='ctx'>  * This routine retrieves SLI4 device physical port name this PCI function</div><div class='hunk'>@@ -5403,40 +5353,30 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,</div><div class='ctx'>  *</div><div class='ctx'>  * Return codes</div><div class='ctx'>  *      0 - successful</div><div class='del'>- *      otherwise - failed to retrieve physical port name</div><div class='add'>+ *      otherwise - failed to retrieve controller attributes</div><div class='ctx'>  **/</div><div class='ctx'> static int</div><div class='del'>-lpfc_sli4_retrieve_pport_name(struct lpfc_hba *phba)</div><div class='add'>+lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *mboxq;</div><div class='ctx'> 	struct lpfc_mbx_get_cntl_attributes *mbx_cntl_attr;</div><div class='ctx'> 	struct lpfc_controller_attribute *cntl_attr;</div><div class='del'>-	struct lpfc_mbx_get_port_name *get_port_name;</div><div class='ctx'> 	void *virtaddr = NULL;</div><div class='ctx'> 	uint32_t alloclen, reqlen;</div><div class='ctx'> 	uint32_t shdr_status, shdr_add_status;</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='del'>-	char cport_name = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	/* We assume nothing at this point */</div><div class='del'>-	phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_INVAL;</div><div class='del'>-	phba-&gt;sli4_hba.pport_name_sta = LPFC_SLI4_PPNAME_NON;</div><div class='del'>-</div><div class='ctx'> 	mboxq = (LPFC_MBOXQ_t *)mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='ctx'> 	if (!mboxq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	/* obtain link type and link number via READ_CONFIG */</div><div class='del'>-	phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_INVAL;</div><div class='del'>-	lpfc_sli4_read_config(phba);</div><div class='del'>-	if (phba-&gt;sli4_hba.lnk_info.lnk_dv == LPFC_LNK_DAT_VAL)</div><div class='del'>-		goto retrieve_ppname;</div><div class='ctx'> </div><div class='del'>-	/* obtain link type and link number via COMMON_GET_CNTL_ATTRIBUTES */</div><div class='add'>+	/* Send COMMON_GET_CNTL_ATTRIBUTES mbox cmd */</div><div class='ctx'> 	reqlen = sizeof(struct lpfc_mbx_get_cntl_attributes);</div><div class='ctx'> 	alloclen = lpfc_sli4_config(phba, mboxq, LPFC_MBOX_SUBSYSTEM_COMMON,</div><div class='ctx'> 			LPFC_MBOX_OPCODE_GET_CNTL_ATTRIBUTES, reqlen,</div><div class='ctx'> 			LPFC_SLI4_MBX_NEMBED);</div><div class='add'>+</div><div class='ctx'> 	if (alloclen &lt; reqlen) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,</div><div class='ctx'> 				"3084 Allocated DMA memory size (%d) is "</div><div class='hunk'>@@ -5462,16 +5402,71 @@ lpfc_sli4_retrieve_pport_name(struct lpfc_hba *phba)</div><div class='ctx'> 		rc = -ENXIO;</div><div class='ctx'> 		goto out_free_mboxq;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	cntl_attr = &amp;mbx_cntl_attr-&gt;cntl_attr;</div><div class='ctx'> 	phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_VAL;</div><div class='ctx'> 	phba-&gt;sli4_hba.lnk_info.lnk_tp =</div><div class='ctx'> 		bf_get(lpfc_cntl_attr_lnk_type, cntl_attr);</div><div class='ctx'> 	phba-&gt;sli4_hba.lnk_info.lnk_no =</div><div class='ctx'> 		bf_get(lpfc_cntl_attr_lnk_numb, cntl_attr);</div><div class='add'>+</div><div class='add'>+	memset(phba-&gt;BIOSVersion, 0, sizeof(phba-&gt;BIOSVersion));</div><div class='add'>+	strlcat(phba-&gt;BIOSVersion, (char *)cntl_attr-&gt;bios_ver_str,</div><div class='add'>+		sizeof(phba-&gt;BIOSVersion));</div><div class='add'>+</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='del'>-			"3086 lnk_type:%d, lnk_numb:%d\n",</div><div class='add'>+			"3086 lnk_type:%d, lnk_numb:%d, bios_ver:%s\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.lnk_info.lnk_tp,</div><div class='del'>-			phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='add'>+			phba-&gt;sli4_hba.lnk_info.lnk_no,</div><div class='add'>+			phba-&gt;BIOSVersion);</div><div class='add'>+out_free_mboxq:</div><div class='add'>+	if (rc != MBX_TIMEOUT) {</div><div class='add'>+		if (bf_get(lpfc_mqe_command, &amp;mboxq-&gt;u.mqe) == MBX_SLI4_CONFIG)</div><div class='add'>+			lpfc_sli4_mbox_cmd_free(phba, mboxq);</div><div class='add'>+		else</div><div class='add'>+			mempool_free(mboxq, phba-&gt;mbox_mem_pool);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli4_retrieve_pport_name - Retrieve SLI4 device physical port name</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine retrieves SLI4 device physical port name this PCI function</div><div class='add'>+ * is attached to.</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *      0 - successful</div><div class='add'>+ *      otherwise - failed to retrieve physical port name</div><div class='add'>+ **/</div><div class='add'>+static int</div><div class='add'>+lpfc_sli4_retrieve_pport_name(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	LPFC_MBOXQ_t *mboxq;</div><div class='add'>+	struct lpfc_mbx_get_port_name *get_port_name;</div><div class='add'>+	uint32_t shdr_status, shdr_add_status;</div><div class='add'>+	union lpfc_sli4_cfg_shdr *shdr;</div><div class='add'>+	char cport_name = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* We assume nothing at this point */</div><div class='add'>+	phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_INVAL;</div><div class='add'>+	phba-&gt;sli4_hba.pport_name_sta = LPFC_SLI4_PPNAME_NON;</div><div class='add'>+</div><div class='add'>+	mboxq = (LPFC_MBOXQ_t *)mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='add'>+	if (!mboxq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* obtain link type and link number via READ_CONFIG */</div><div class='add'>+	phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_INVAL;</div><div class='add'>+	lpfc_sli4_read_config(phba);</div><div class='add'>+	if (phba-&gt;sli4_hba.lnk_info.lnk_dv == LPFC_LNK_DAT_VAL)</div><div class='add'>+		goto retrieve_ppname;</div><div class='add'>+</div><div class='add'>+	/* obtain link type and link number via COMMON_GET_CNTL_ATTRIBUTES */</div><div class='add'>+	rc = lpfc_sli4_get_ctl_attr(phba);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_free_mboxq;</div><div class='ctx'> </div><div class='ctx'> retrieve_ppname:</div><div class='ctx'> 	lpfc_sli4_config(phba, mboxq, LPFC_MBOX_SUBSYSTEM_COMMON,</div><div class='hunk'>@@ -7047,7 +7042,7 @@ lpfc_sli4_repost_sgl_list(struct lpfc_hba *phba,</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 0 = success, non-zero failure.</div><div class='ctx'>  **/</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> lpfc_sli4_repost_io_sgl_list(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(post_nblist);</div><div class='hunk'>@@ -7067,7 +7062,7 @@ lpfc_sli4_repost_io_sgl_list(struct lpfc_hba *phba)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> lpfc_set_host_data(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t len;</div><div class='hunk'>@@ -7250,6 +7245,12 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 				"3080 Successful retrieving SLI4 device "</div><div class='ctx'> 				"physical port name: %s.\n", phba-&gt;Port);</div><div class='ctx'> </div><div class='add'>+	rc = lpfc_sli4_get_ctl_attr(phba);</div><div class='add'>+	if (!rc)</div><div class='add'>+		lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,</div><div class='add'>+				"8351 Successful retrieving SLI4 device "</div><div class='add'>+				"CTL ATTR\n");</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Evaluate the read rev and vpd data. Populate the driver</div><div class='ctx'> 	 * state with the results. If this routine fails, the failure</div><div class='hunk'>@@ -7652,12 +7653,6 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 		phba-&gt;cfg_xri_rebalancing = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Arm the CQs and then EQs on device */</div><div class='del'>-	lpfc_sli4_arm_cqeq_intr(phba);</div><div class='del'>-</div><div class='del'>-	/* Indicate device interrupt mode */</div><div class='del'>-	phba-&gt;sli4_hba.intr_enable = 1;</div><div class='del'>-</div><div class='ctx'> 	/* Allow asynchronous mailbox command to go through */</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	phba-&gt;sli.sli_flag &amp;= ~LPFC_SLI_ASYNC_MBX_BLK;</div><div class='hunk'>@@ -7726,6 +7721,12 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 		phba-&gt;trunk_link.link3.state = LPFC_LINK_DOWN;</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='add'>+	/* Arm the CQs and then EQs on device */</div><div class='add'>+	lpfc_sli4_arm_cqeq_intr(phba);</div><div class='add'>+</div><div class='add'>+	/* Indicate device interrupt mode */</div><div class='add'>+	phba-&gt;sli4_hba.intr_enable = 1;</div><div class='add'>+</div><div class='ctx'> 	if (!(phba-&gt;hba_flag &amp; HBA_FCOE_MODE) &amp;&amp;</div><div class='ctx'> 	    (phba-&gt;hba_flag &amp; LINK_DISABLED)) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_SLI,</div><div class='hunk'>@@ -7820,8 +7821,9 @@ lpfc_sli4_mbox_completions_pending(struct lpfc_hba *phba)</div><div class='ctx'> 	mcq = phba-&gt;sli4_hba.mbx_cq;</div><div class='ctx'> 	idx = mcq-&gt;hba_index;</div><div class='ctx'> 	qe_valid = mcq-&gt;qe_valid;</div><div class='del'>-	while (bf_get_le32(lpfc_cqe_valid, mcq-&gt;qe[idx].cqe) == qe_valid) {</div><div class='del'>-		mcqe = (struct lpfc_mcqe *)mcq-&gt;qe[idx].cqe;</div><div class='add'>+	while (bf_get_le32(lpfc_cqe_valid,</div><div class='add'>+	       (struct lpfc_cqe *)lpfc_sli4_qe(mcq, idx)) == qe_valid) {</div><div class='add'>+		mcqe = (struct lpfc_mcqe *)(lpfc_sli4_qe(mcq, idx));</div><div class='ctx'> 		if (bf_get_le32(lpfc_trailer_completed, mcqe) &amp;&amp;</div><div class='ctx'> 		    (!bf_get_le32(lpfc_trailer_async, mcqe))) {</div><div class='ctx'> 			pending_completions = true;</div><div class='hunk'>@@ -8500,7 +8502,7 @@ lpfc_sli4_wait_bmbx_ready(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> 		bmbx_reg.word0 = readl(phba-&gt;sli4_hba.BMBXregaddr);</div><div class='ctx'> 		db_ready = bf_get(lpfc_bmbx_rdy, &amp;bmbx_reg);</div><div class='ctx'> 		if (!db_ready)</div><div class='del'>-			msleep(2);</div><div class='add'>+			mdelay(2);</div><div class='ctx'> </div><div class='ctx'> 		if (time_after(jiffies, timeout))</div><div class='ctx'> 			return MBXERR_ERROR;</div><div class='hunk'>@@ -11264,102 +11266,6 @@ abort_iotag_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_sli4_abort_nvme_io - Issue abort for a command iocb</div><div class='del'>- * @phba: Pointer to HBA context object.</div><div class='del'>- * @pring: Pointer to driver SLI ring object.</div><div class='del'>- * @cmdiocb: Pointer to driver command iocb object.</div><div class='del'>- *</div><div class='del'>- * This function issues an abort iocb for the provided command iocb down to</div><div class='del'>- * the port. Other than the case the outstanding command iocb is an abort</div><div class='del'>- * request, this function issues abort out unconditionally. This function is</div><div class='del'>- * called with hbalock held. The function returns 0 when it fails due to</div><div class='del'>- * memory allocation failure or when the command iocb is an abort request.</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-lpfc_sli4_abort_nvme_io(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='del'>-			struct lpfc_iocbq *cmdiocb)</div><div class='del'>-{</div><div class='del'>-	struct lpfc_vport *vport = cmdiocb-&gt;vport;</div><div class='del'>-	struct lpfc_iocbq *abtsiocbp;</div><div class='del'>-	union lpfc_wqe128 *abts_wqe;</div><div class='del'>-	int retval;</div><div class='del'>-	int idx = cmdiocb-&gt;hba_wqidx;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * There are certain command types we don't want to abort.  And we</div><div class='del'>-	 * don't want to abort commands that are already in the process of</div><div class='del'>-	 * being aborted.</div><div class='del'>-	 */</div><div class='del'>-	if (cmdiocb-&gt;iocb.ulpCommand == CMD_ABORT_XRI_CN ||</div><div class='del'>-	    cmdiocb-&gt;iocb.ulpCommand == CMD_CLOSE_XRI_CN ||</div><div class='del'>-	    (cmdiocb-&gt;iocb_flag &amp; LPFC_DRIVER_ABORTED) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* issue ABTS for this io based on iotag */</div><div class='del'>-	abtsiocbp = __lpfc_sli_get_iocbq(phba);</div><div class='del'>-	if (abtsiocbp == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* This signals the response to set the correct status</div><div class='del'>-	 * before calling the completion handler</div><div class='del'>-	 */</div><div class='del'>-	cmdiocb-&gt;iocb_flag |= LPFC_DRIVER_ABORTED;</div><div class='del'>-</div><div class='del'>-	/* Complete prepping the abort wqe and issue to the FW. */</div><div class='del'>-	abts_wqe = &amp;abtsiocbp-&gt;wqe;</div><div class='del'>-</div><div class='del'>-	/* Clear any stale WQE contents */</div><div class='del'>-	memset(abts_wqe, 0, sizeof(union lpfc_wqe));</div><div class='del'>-	bf_set(abort_cmd_criteria, &amp;abts_wqe-&gt;abort_cmd, T_XRI_TAG);</div><div class='del'>-</div><div class='del'>-	/* word 7 */</div><div class='del'>-	bf_set(wqe_cmnd, &amp;abts_wqe-&gt;abort_cmd.wqe_com, CMD_ABORT_XRI_CX);</div><div class='del'>-	bf_set(wqe_class, &amp;abts_wqe-&gt;abort_cmd.wqe_com,</div><div class='del'>-	       cmdiocb-&gt;iocb.ulpClass);</div><div class='del'>-</div><div class='del'>-	/* word 8 - tell the FW to abort the IO associated with this</div><div class='del'>-	 * outstanding exchange ID.</div><div class='del'>-	 */</div><div class='del'>-	abts_wqe-&gt;abort_cmd.wqe_com.abort_tag = cmdiocb-&gt;sli4_xritag;</div><div class='del'>-</div><div class='del'>-	/* word 9 - this is the iotag for the abts_wqe completion. */</div><div class='del'>-	bf_set(wqe_reqtag, &amp;abts_wqe-&gt;abort_cmd.wqe_com,</div><div class='del'>-	       abtsiocbp-&gt;iotag);</div><div class='del'>-</div><div class='del'>-	/* word 10 */</div><div class='del'>-	bf_set(wqe_qosd, &amp;abts_wqe-&gt;abort_cmd.wqe_com, 1);</div><div class='del'>-	bf_set(wqe_lenloc, &amp;abts_wqe-&gt;abort_cmd.wqe_com, LPFC_WQE_LENLOC_NONE);</div><div class='del'>-</div><div class='del'>-	/* word 11 */</div><div class='del'>-	bf_set(wqe_cmd_type, &amp;abts_wqe-&gt;abort_cmd.wqe_com, OTHER_COMMAND);</div><div class='del'>-	bf_set(wqe_wqec, &amp;abts_wqe-&gt;abort_cmd.wqe_com, 1);</div><div class='del'>-	bf_set(wqe_cqid, &amp;abts_wqe-&gt;abort_cmd.wqe_com, LPFC_WQE_CQ_ID_DEFAULT);</div><div class='del'>-</div><div class='del'>-	/* ABTS WQE must go to the same WQ as the WQE to be aborted */</div><div class='del'>-	abtsiocbp-&gt;iocb_flag |= LPFC_IO_NVME;</div><div class='del'>-	abtsiocbp-&gt;vport = vport;</div><div class='del'>-	abtsiocbp-&gt;wqe_cmpl = lpfc_nvme_abort_fcreq_cmpl;</div><div class='del'>-	retval = lpfc_sli4_issue_wqe(phba, &amp;phba-&gt;sli4_hba.hdwq[idx],</div><div class='del'>-				     abtsiocbp);</div><div class='del'>-	if (retval) {</div><div class='del'>-		lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME,</div><div class='del'>-				 "6147 Failed abts issue_wqe with status x%x "</div><div class='del'>-				 "for oxid x%x\n",</div><div class='del'>-				 retval, cmdiocb-&gt;sli4_xritag);</div><div class='del'>-		lpfc_sli_release_iocbq(phba, abtsiocbp);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME,</div><div class='del'>-			 "6148 Drv Abort NVME Request Issued for "</div><div class='del'>-			 "ox_id x%x on reqtag x%x\n",</div><div class='del'>-			 cmdiocb-&gt;sli4_xritag,</div><div class='del'>-			 abtsiocbp-&gt;iotag);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * lpfc_sli_hba_iocb_abort - Abort all iocbs to an hba.</div><div class='ctx'>  * @phba: pointer to lpfc HBA data structure.</div><div class='ctx'>  *</div><div class='hunk'>@@ -13636,7 +13542,7 @@ lpfc_sli4_sp_handle_eqe(struct lpfc_hba *phba, struct lpfc_eqe *eqe,</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,</div><div class='ctx'> 				"0390 Cannot schedule soft IRQ "</div><div class='ctx'> 				"for CQ eqcqid=%d, cqid=%d on CPU %d\n",</div><div class='del'>-				cqid, cq-&gt;queue_id, smp_processor_id());</div><div class='add'>+				cqid, cq-&gt;queue_id, raw_smp_processor_id());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -14019,7 +13925,7 @@ lpfc_sli4_nvmet_handle_rcqe(struct lpfc_hba *phba, struct lpfc_queue *cq,</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> drop:</div><div class='del'>-		lpfc_in_buf_free(phba, &amp;dma_buf-&gt;dbuf);</div><div class='add'>+		lpfc_rq_buf_free(phba, &amp;dma_buf-&gt;hbuf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FC_STATUS_INSUFF_BUF_FRM_DISC:</div><div class='ctx'> 		if (phba-&gt;nvmet_support) {</div><div class='hunk'>@@ -14185,7 +14091,7 @@ work_cq:</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,</div><div class='ctx'> 				"0363 Cannot schedule soft IRQ "</div><div class='ctx'> 				"for CQ eqcqid=%d, cqid=%d on CPU %d\n",</div><div class='del'>-				cqid, cq-&gt;queue_id, smp_processor_id());</div><div class='add'>+				cqid, cq-&gt;queue_id, raw_smp_processor_id());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -14324,7 +14230,7 @@ lpfc_sli4_hba_intr_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	eqi = phba-&gt;sli4_hba.eq_info;</div><div class='ctx'> 	icnt = this_cpu_inc_return(eqi-&gt;icnt);</div><div class='del'>-	fpeq-&gt;last_cpu = smp_processor_id();</div><div class='add'>+	fpeq-&gt;last_cpu = raw_smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	if (icnt &gt; LPFC_EQD_ISR_TRIGGER &amp;&amp;</div><div class='ctx'> 	    phba-&gt;cfg_irq_chann == 1 &amp;&amp;</div><div class='hunk'>@@ -14410,6 +14316,9 @@ lpfc_sli4_queue_free(struct lpfc_queue *queue)</div><div class='ctx'> 	if (!queue)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!list_empty(&amp;queue-&gt;wq_list))</div><div class='add'>+		list_del(&amp;queue-&gt;wq_list);</div><div class='add'>+</div><div class='ctx'> 	while (!list_empty(&amp;queue-&gt;page_list)) {</div><div class='ctx'> 		list_remove_head(&amp;queue-&gt;page_list, dmabuf, struct lpfc_dmabuf,</div><div class='ctx'> 				 list);</div><div class='hunk'>@@ -14425,9 +14334,6 @@ lpfc_sli4_queue_free(struct lpfc_queue *queue)</div><div class='ctx'> 	if (!list_empty(&amp;queue-&gt;cpu_list))</div><div class='ctx'> 		list_del(&amp;queue-&gt;cpu_list);</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;queue-&gt;wq_list))</div><div class='del'>-		list_del(&amp;queue-&gt;wq_list);</div><div class='del'>-</div><div class='ctx'> 	kfree(queue);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -14438,6 +14344,7 @@ lpfc_sli4_queue_free(struct lpfc_queue *queue)</div><div class='ctx'>  * @page_size: The size of a queue page</div><div class='ctx'>  * @entry_size: The size of each queue entry for this queue.</div><div class='ctx'>  * @entry count: The number of entries that this queue will handle.</div><div class='add'>+ * @cpu: The cpu that will primarily utilize this queue.</div><div class='ctx'>  *</div><div class='ctx'>  * This function allocates a queue structure and the DMAable memory used for</div><div class='ctx'>  * the host resident queue. This function must be called before creating the</div><div class='hunk'>@@ -14445,28 +14352,26 @@ lpfc_sli4_queue_free(struct lpfc_queue *queue)</div><div class='ctx'>  **/</div><div class='ctx'> struct lpfc_queue *</div><div class='ctx'> lpfc_sli4_queue_alloc(struct lpfc_hba *phba, uint32_t page_size,</div><div class='del'>-		      uint32_t entry_size, uint32_t entry_count)</div><div class='add'>+		      uint32_t entry_size, uint32_t entry_count, int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_queue *queue;</div><div class='ctx'> 	struct lpfc_dmabuf *dmabuf;</div><div class='del'>-	int x, total_qe_count;</div><div class='del'>-	void *dma_pointer;</div><div class='ctx'> 	uint32_t hw_page_size = phba-&gt;sli4_hba.pc_sli4_params.if_page_sz;</div><div class='add'>+	uint16_t x, pgcnt;</div><div class='ctx'> </div><div class='ctx'> 	if (!phba-&gt;sli4_hba.pc_sli4_params.supported)</div><div class='ctx'> 		hw_page_size = page_size;</div><div class='ctx'> </div><div class='del'>-	queue = kzalloc(sizeof(struct lpfc_queue) +</div><div class='del'>-			(sizeof(union sli4_qe) * entry_count), GFP_KERNEL);</div><div class='del'>-	if (!queue)</div><div class='del'>-		return NULL;</div><div class='del'>-	queue-&gt;page_count = (ALIGN(entry_size * entry_count,</div><div class='del'>-			hw_page_size))/hw_page_size;</div><div class='add'>+	pgcnt = ALIGN(entry_size * entry_count, hw_page_size) / hw_page_size;</div><div class='ctx'> </div><div class='ctx'> 	/* If needed, Adjust page count to match the max the adapter supports */</div><div class='del'>-	if (phba-&gt;sli4_hba.pc_sli4_params.wqpcnt &amp;&amp;</div><div class='del'>-	    (queue-&gt;page_count &gt; phba-&gt;sli4_hba.pc_sli4_params.wqpcnt))</div><div class='del'>-		queue-&gt;page_count = phba-&gt;sli4_hba.pc_sli4_params.wqpcnt;</div><div class='add'>+	if (pgcnt &gt; phba-&gt;sli4_hba.pc_sli4_params.wqpcnt)</div><div class='add'>+		pgcnt = phba-&gt;sli4_hba.pc_sli4_params.wqpcnt;</div><div class='add'>+</div><div class='add'>+	queue = kzalloc_node(sizeof(*queue) + (sizeof(void *) * pgcnt),</div><div class='add'>+			     GFP_KERNEL, cpu_to_node(cpu));</div><div class='add'>+	if (!queue)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;queue-&gt;list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;queue-&gt;wq_list);</div><div class='hunk'>@@ -14478,13 +14383,17 @@ lpfc_sli4_queue_alloc(struct lpfc_hba *phba, uint32_t page_size,</div><div class='ctx'> 	/* Set queue parameters now.  If the system cannot provide memory</div><div class='ctx'> 	 * resources, the free routine needs to know what was allocated.</div><div class='ctx'> 	 */</div><div class='add'>+	queue-&gt;page_count = pgcnt;</div><div class='add'>+	queue-&gt;q_pgs = (void **)&amp;queue[1];</div><div class='add'>+	queue-&gt;entry_cnt_per_pg = hw_page_size / entry_size;</div><div class='ctx'> 	queue-&gt;entry_size = entry_size;</div><div class='ctx'> 	queue-&gt;entry_count = entry_count;</div><div class='ctx'> 	queue-&gt;page_size = hw_page_size;</div><div class='ctx'> 	queue-&gt;phba = phba;</div><div class='ctx'> </div><div class='del'>-	for (x = 0, total_qe_count = 0; x &lt; queue-&gt;page_count; x++) {</div><div class='del'>-		dmabuf = kzalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);</div><div class='add'>+	for (x = 0; x &lt; queue-&gt;page_count; x++) {</div><div class='add'>+		dmabuf = kzalloc_node(sizeof(*dmabuf), GFP_KERNEL,</div><div class='add'>+				      dev_to_node(&amp;phba-&gt;pcidev-&gt;dev));</div><div class='ctx'> 		if (!dmabuf)</div><div class='ctx'> 			goto out_fail;</div><div class='ctx'> 		dmabuf-&gt;virt = dma_alloc_coherent(&amp;phba-&gt;pcidev-&gt;dev,</div><div class='hunk'>@@ -14496,13 +14405,8 @@ lpfc_sli4_queue_alloc(struct lpfc_hba *phba, uint32_t page_size,</div><div class='ctx'> 		}</div><div class='ctx'> 		dmabuf-&gt;buffer_tag = x;</div><div class='ctx'> 		list_add_tail(&amp;dmabuf-&gt;list, &amp;queue-&gt;page_list);</div><div class='del'>-		/* initialize queue's entry array */</div><div class='del'>-		dma_pointer = dmabuf-&gt;virt;</div><div class='del'>-		for (; total_qe_count &lt; entry_count &amp;&amp;</div><div class='del'>-		     dma_pointer &lt; (hw_page_size + dmabuf-&gt;virt);</div><div class='del'>-		     total_qe_count++, dma_pointer += entry_size) {</div><div class='del'>-			queue-&gt;qe[total_qe_count].address = dma_pointer;</div><div class='del'>-		}</div><div class='add'>+		/* use lpfc_sli4_qe to index a paritcular entry in this page */</div><div class='add'>+		queue-&gt;q_pgs[x] = dmabuf-&gt;virt;</div><div class='ctx'> 	}</div><div class='ctx'> 	INIT_WORK(&amp;queue-&gt;irqwork, lpfc_sli4_hba_process_cq);</div><div class='ctx'> 	INIT_WORK(&amp;queue-&gt;spwork, lpfc_sli4_sp_process_cq);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h<br/>index 7a1a761efdd6..467b8270f7fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_sli.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_sli.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_sli.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_sli.h</a></div><div class='hunk'>@@ -327,6 +327,10 @@ struct lpfc_sli {</div><div class='ctx'> #define LPFC_SLI_ASYNC_MBX_BLK    0x2000 /* Async mailbox is blocked */</div><div class='ctx'> #define LPFC_SLI_SUPPRESS_RSP     0x4000 /* Suppress RSP feature is supported */</div><div class='ctx'> #define LPFC_SLI_USE_EQDR         0x8000 /* EQ Delay Register is supported */</div><div class='add'>+#define LPFC_QUEUE_FREE_INIT	  0x10000 /* Queue freeing is in progress */</div><div class='add'>+#define LPFC_QUEUE_FREE_WAIT	  0x20000 /* Hold Queue free as it is being</div><div class='add'>+					   * used outside worker thread</div><div class='add'>+					   */</div><div class='ctx'> </div><div class='ctx'> 	struct lpfc_sli_ring *sli3_ring;</div><div class='ctx'> </div><div class='hunk'>@@ -427,14 +431,13 @@ struct lpfc_io_buf {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct nvmefc_fcp_req *nvmeCmd;</div><div class='ctx'> 			uint16_t qidx;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SCSI_LPFC_DEBUG_FS</div><div class='del'>-			uint64_t ts_cmd_start;</div><div class='del'>-			uint64_t ts_last_cmd;</div><div class='del'>-			uint64_t ts_cmd_wqput;</div><div class='del'>-			uint64_t ts_isr_cmpl;</div><div class='del'>-			uint64_t ts_data_nvme;</div><div class='del'>-#endif</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+#ifdef CONFIG_SCSI_LPFC_DEBUG_FS</div><div class='add'>+	uint64_t ts_cmd_start;</div><div class='add'>+	uint64_t ts_last_cmd;</div><div class='add'>+	uint64_t ts_cmd_wqput;</div><div class='add'>+	uint64_t ts_isr_cmpl;</div><div class='add'>+	uint64_t ts_data_nvme;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h<br/>index 40c85091c805..8e4fd1a98023 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_sli4.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_sli4.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_sli4.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_sli4.h</a></div><div class='hunk'>@@ -117,21 +117,6 @@ enum lpfc_sli4_queue_subtype {</div><div class='ctx'> 	LPFC_USOL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-union sli4_qe {</div><div class='del'>-	void *address;</div><div class='del'>-	struct lpfc_eqe *eqe;</div><div class='del'>-	struct lpfc_cqe *cqe;</div><div class='del'>-	struct lpfc_mcqe *mcqe;</div><div class='del'>-	struct lpfc_wcqe_complete *wcqe_complete;</div><div class='del'>-	struct lpfc_wcqe_release *wcqe_release;</div><div class='del'>-	struct sli4_wcqe_xri_aborted *wcqe_xri_aborted;</div><div class='del'>-	struct lpfc_rcqe_complete *rcqe_complete;</div><div class='del'>-	struct lpfc_mqe *mqe;</div><div class='del'>-	union  lpfc_wqe *wqe;</div><div class='del'>-	union  lpfc_wqe128 *wqe128;</div><div class='del'>-	struct lpfc_rqe *rqe;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* RQ buffer list */</div><div class='ctx'> struct lpfc_rqb {</div><div class='ctx'> 	uint16_t entry_count;	  /* Current number of RQ slots */</div><div class='hunk'>@@ -157,6 +142,7 @@ struct lpfc_queue {</div><div class='ctx'> 	struct list_head cpu_list;</div><div class='ctx'> 	uint32_t entry_count;	/* Number of entries to support on the queue */</div><div class='ctx'> 	uint32_t entry_size;	/* Size of each queue entry. */</div><div class='add'>+	uint32_t entry_cnt_per_pg;</div><div class='ctx'> 	uint32_t notify_interval; /* Queue Notification Interval</div><div class='ctx'> 				   * For chip-&gt;host queues (EQ, CQ, RQ):</div><div class='ctx'> 				   *  specifies the interval (number of</div><div class='hunk'>@@ -254,17 +240,17 @@ struct lpfc_queue {</div><div class='ctx'> 	uint16_t last_cpu;	/* most recent cpu */</div><div class='ctx'> 	uint8_t	qe_valid;</div><div class='ctx'> 	struct lpfc_queue *assoc_qp;</div><div class='del'>-	union sli4_qe qe[1];	/* array to index entries (must be last) */</div><div class='add'>+	void **q_pgs;	/* array to index entries per page */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct lpfc_sli4_link {</div><div class='del'>-	uint16_t speed;</div><div class='add'>+	uint32_t speed;</div><div class='ctx'> 	uint8_t duplex;</div><div class='ctx'> 	uint8_t status;</div><div class='ctx'> 	uint8_t type;</div><div class='ctx'> 	uint8_t number;</div><div class='ctx'> 	uint8_t fault;</div><div class='del'>-	uint16_t logical_speed;</div><div class='add'>+	uint32_t logical_speed;</div><div class='ctx'> 	uint16_t topology;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -543,8 +529,9 @@ struct lpfc_sli4_lnk_info {</div><div class='ctx'> #define LPFC_LNK_DAT_INVAL	0</div><div class='ctx'> #define LPFC_LNK_DAT_VAL	1</div><div class='ctx'> 	uint8_t lnk_tp;</div><div class='del'>-#define LPFC_LNK_GE	0x0 /* FCoE */</div><div class='del'>-#define LPFC_LNK_FC	0x1 /* FC   */</div><div class='add'>+#define LPFC_LNK_GE		0x0 /* FCoE */</div><div class='add'>+#define LPFC_LNK_FC		0x1 /* FC */</div><div class='add'>+#define LPFC_LNK_FC_TRUNKED	0x2 /* FC_Trunked */</div><div class='ctx'> 	uint8_t lnk_no;</div><div class='ctx'> 	uint8_t optic_state;</div><div class='ctx'> };</div><div class='hunk'>@@ -907,6 +894,18 @@ struct lpfc_sli4_hba {</div><div class='ctx'> #define lpfc_conf_trunk_port3_WORD	conf_trunk</div><div class='ctx'> #define lpfc_conf_trunk_port3_SHIFT	3</div><div class='ctx'> #define lpfc_conf_trunk_port3_MASK	0x1</div><div class='add'>+#define lpfc_conf_trunk_port0_nd_WORD	conf_trunk</div><div class='add'>+#define lpfc_conf_trunk_port0_nd_SHIFT	4</div><div class='add'>+#define lpfc_conf_trunk_port0_nd_MASK	0x1</div><div class='add'>+#define lpfc_conf_trunk_port1_nd_WORD	conf_trunk</div><div class='add'>+#define lpfc_conf_trunk_port1_nd_SHIFT	5</div><div class='add'>+#define lpfc_conf_trunk_port1_nd_MASK	0x1</div><div class='add'>+#define lpfc_conf_trunk_port2_nd_WORD	conf_trunk</div><div class='add'>+#define lpfc_conf_trunk_port2_nd_SHIFT	6</div><div class='add'>+#define lpfc_conf_trunk_port2_nd_MASK	0x1</div><div class='add'>+#define lpfc_conf_trunk_port3_nd_WORD	conf_trunk</div><div class='add'>+#define lpfc_conf_trunk_port3_nd_SHIFT	7</div><div class='add'>+#define lpfc_conf_trunk_port3_nd_MASK	0x1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum lpfc_sge_type {</div><div class='hunk'>@@ -990,8 +989,10 @@ int lpfc_sli4_mbx_read_fcf_rec(struct lpfc_hba *, struct lpfcMboxq *,</div><div class='ctx'> 			       uint16_t);</div><div class='ctx'> </div><div class='ctx'> void lpfc_sli4_hba_reset(struct lpfc_hba *);</div><div class='del'>-struct lpfc_queue *lpfc_sli4_queue_alloc(struct lpfc_hba *, uint32_t,</div><div class='del'>-					 uint32_t, uint32_t);</div><div class='add'>+struct lpfc_queue *lpfc_sli4_queue_alloc(struct lpfc_hba *phba,</div><div class='add'>+					 uint32_t page_size,</div><div class='add'>+					 uint32_t entry_size,</div><div class='add'>+					 uint32_t entry_count, int cpu);</div><div class='ctx'> void lpfc_sli4_queue_free(struct lpfc_queue *);</div><div class='ctx'> int lpfc_eq_create(struct lpfc_hba *, struct lpfc_queue *, uint32_t);</div><div class='ctx'> void lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq,</div><div class='hunk'>@@ -1057,12 +1058,12 @@ void lpfc_sli_remove_dflt_fcf(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli4_get_els_iocb_cnt(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli4_get_iocb_cnt(struct lpfc_hba *phba);</div><div class='ctx'> int lpfc_sli4_init_vpi(struct lpfc_vport *);</div><div class='del'>-inline void lpfc_sli4_eq_clr_intr(struct lpfc_queue *);</div><div class='add'>+void lpfc_sli4_eq_clr_intr(struct lpfc_queue *);</div><div class='ctx'> void lpfc_sli4_write_cq_db(struct lpfc_hba *phba, struct lpfc_queue *q,</div><div class='ctx'> 			   uint32_t count, bool arm);</div><div class='ctx'> void lpfc_sli4_write_eq_db(struct lpfc_hba *phba, struct lpfc_queue *q,</div><div class='ctx'> 			   uint32_t count, bool arm);</div><div class='del'>-inline void lpfc_sli4_if6_eq_clr_intr(struct lpfc_queue *q);</div><div class='add'>+void lpfc_sli4_if6_eq_clr_intr(struct lpfc_queue *q);</div><div class='ctx'> void lpfc_sli4_if6_write_cq_db(struct lpfc_hba *phba, struct lpfc_queue *q,</div><div class='ctx'> 			       uint32_t count, bool arm);</div><div class='ctx'> void lpfc_sli4_if6_write_eq_db(struct lpfc_hba *phba, struct lpfc_queue *q,</div><div class='hunk'>@@ -1079,3 +1080,8 @@ int lpfc_sli4_post_status_check(struct lpfc_hba *);</div><div class='ctx'> uint8_t lpfc_sli_config_mbox_subsys_get(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> uint8_t lpfc_sli_config_mbox_opcode_get(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_sli4_ras_dma_free(struct lpfc_hba *phba);</div><div class='add'>+static inline void *lpfc_sli4_qe(struct lpfc_queue *q, uint16_t idx)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;q_pgs[idx / q-&gt;entry_cnt_per_pg] +</div><div class='add'>+		(q-&gt;entry_size * (idx % q-&gt;entry_cnt_per_pg));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h<br/>index 43fd693cf042..f7d9ef428417 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_version.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/lpfc/lpfc_version.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/lpfc/lpfc_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/lpfc/lpfc_version.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  * included with this package.                                     *</div><div class='ctx'>  *******************************************************************/</div><div class='ctx'> </div><div class='del'>-#define LPFC_DRIVER_VERSION "12.2.0.0"</div><div class='add'>+#define LPFC_DRIVER_VERSION "12.2.0.1"</div><div class='ctx'> #define LPFC_DRIVER_NAME		"lpfc"</div><div class='ctx'> </div><div class='ctx'> /* Used for SLI 2/3 */</div><div class='hunk'>@@ -32,6 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \</div><div class='ctx'> 		LPFC_DRIVER_VERSION</div><div class='del'>-#define LPFC_COPYRIGHT "Copyright (C) 2017-2018 Broadcom. All Rights " \</div><div class='add'>+#define LPFC_COPYRIGHT "Copyright (C) 2017-2019 Broadcom. All Rights " \</div><div class='ctx'> 		"Reserved. The term \"Broadcom\" refers to Broadcom Inc. " \</div><div class='ctx'> 		"and/or its subsidiaries."</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c<br/>index 293f5cf524d7..473a120eb75d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/megaraid/megaraid_sas_base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/megaraid/megaraid_sas_base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/megaraid/megaraid_sas_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/megaraid/megaraid_sas_base.c</a></div><div class='hunk'>@@ -815,7 +815,6 @@ megasas_fire_cmd_skinny(struct megasas_instance *instance,</div><div class='ctx'> 	       &amp;(regs)-&gt;inbound_high_queue_port);</div><div class='ctx'> 	writel((lower_32_bits(frame_phys_addr) | (frame_count&lt;&lt;1))|1,</div><div class='ctx'> 	       &amp;(regs)-&gt;inbound_low_queue_port);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;instance-&gt;hba_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2725,7 +2724,7 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)</div><div class='ctx'> 	do {</div><div class='ctx'> 		if ((fw_state == MFI_STATE_FAULT) || atomic_read(&amp;instance-&gt;fw_outstanding)) {</div><div class='ctx'> 			dev_info(&amp;instance-&gt;pdev-&gt;dev,</div><div class='del'>-				"%s:%d waiting_for_outstanding: before issue OCR. FW state = 0x%x, oustanding 0x%x\n",</div><div class='add'>+				"%s:%d waiting_for_outstanding: before issue OCR. FW state = 0x%x, outstanding 0x%x\n",</div><div class='ctx'> 				__func__, __LINE__, fw_state, atomic_read(&amp;instance-&gt;fw_outstanding));</div><div class='ctx'> 			if (i == 3)</div><div class='ctx'> 				goto kill_hba_and_failed;</div><div class='hunk'>@@ -4648,7 +4647,7 @@ megasas_ld_list_query(struct megasas_instance *instance, u8 query_type)</div><div class='ctx'>  * Return:			0 if DCMD succeeded</div><div class='ctx'>  *				 non-zero if failed</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> megasas_host_device_list_query(struct megasas_instance *instance,</div><div class='ctx'> 			       bool is_probe)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c<br/>index 1d17128030cd..6129399c1942 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/megaraid/megaraid_sas_fusion.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/megaraid/megaraid_sas_fusion.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/megaraid/megaraid_sas_fusion.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/megaraid/megaraid_sas_fusion.c</a></div><div class='hunk'>@@ -242,7 +242,6 @@ megasas_fire_cmd_fusion(struct megasas_instance *instance,</div><div class='ctx'> 		&amp;instance-&gt;reg_set-&gt;inbound_low_queue_port);</div><div class='ctx'> 	writel(le32_to_cpu(req_desc-&gt;u.high),</div><div class='ctx'> 		&amp;instance-&gt;reg_set-&gt;inbound_high_queue_port);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;instance-&gt;hba_lock, flags);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -4419,7 +4418,7 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd)</div><div class='ctx'> 	if (!smid) {</div><div class='ctx'> 		ret = SUCCESS;</div><div class='ctx'> 		scmd_printk(KERN_NOTICE, scmd, "Command for which abort is"</div><div class='del'>-			" issued is not found in oustanding commands\n");</div><div class='add'>+			" issued is not found in outstanding commands\n");</div><div class='ctx'> 		mutex_unlock(&amp;instance-&gt;reset_mutex);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/mpt3sas/Kconfig b/drivers/scsi/mpt3sas/Kconfig<br/>index b736dbc80485..a072187875df 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mpt3sas/Kconfig</a></div><div class='hunk'>@@ -45,6 +45,7 @@ config SCSI_MPT3SAS</div><div class='ctx'> 	depends on PCI &amp;&amp; SCSI</div><div class='ctx'> 	select SCSI_SAS_ATTRS</div><div class='ctx'> 	select RAID_ATTRS</div><div class='add'>+	select IRQ_POLL</div><div class='ctx'> 	---help---</div><div class='ctx'> 	This driver supports PCI-Express SAS 12Gb/s Host Adapters.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c<br/>index e57774472e75..8aacbd1e7db2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/mpt3sas_base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/mpt3sas_base.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/mpt3sas_base.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mpt3sas/mpt3sas_base.c</a></div><div class='hunk'>@@ -94,6 +94,11 @@ module_param(max_msix_vectors, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(max_msix_vectors,</div><div class='ctx'> 	" max msix vectors");</div><div class='ctx'> </div><div class='add'>+static int irqpoll_weight = -1;</div><div class='add'>+module_param(irqpoll_weight, int, 0);</div><div class='add'>+MODULE_PARM_DESC(irqpoll_weight,</div><div class='add'>+	"irq poll weight (default= one fourth of HBA queue depth)");</div><div class='add'>+</div><div class='ctx'> static int mpt3sas_fwfault_debug;</div><div class='ctx'> MODULE_PARM_DESC(mpt3sas_fwfault_debug,</div><div class='ctx'> 	" enable detection of firmware fault and halt firmware - (default=0)");</div><div class='hunk'>@@ -1382,20 +1387,30 @@ union reply_descriptor {</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u32 base_mod64(u64 dividend, u32 divisor)</div><div class='add'>+{</div><div class='add'>+	u32 remainder;</div><div class='add'>+</div><div class='add'>+	if (!divisor)</div><div class='add'>+		pr_err("mpt3sas: DIVISOR is zero, in div fn\n");</div><div class='add'>+	remainder = do_div(dividend, divisor);</div><div class='add'>+	return remainder;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * _base_interrupt - MPT adapter (IOC) specific interrupt handler.</div><div class='del'>- * @irq: irq number (not used)</div><div class='del'>- * @bus_id: bus identifier cookie == pointer to MPT_ADAPTER structure</div><div class='add'>+ * _base_process_reply_queue - Process reply descriptors from reply</div><div class='add'>+ *		descriptor post queue.</div><div class='add'>+ * @reply_q: per IRQ's reply queue object.</div><div class='ctx'>  *</div><div class='del'>- * Return: IRQ_HANDLED if processed, else IRQ_NONE.</div><div class='add'>+ * Return: number of reply descriptors processed from reply</div><div class='add'>+ *		descriptor queue.</div><div class='ctx'>  */</div><div class='del'>-static irqreturn_t</div><div class='del'>-_base_interrupt(int irq, void *bus_id)</div><div class='add'>+static int</div><div class='add'>+_base_process_reply_queue(struct adapter_reply_queue *reply_q)</div><div class='ctx'> {</div><div class='del'>-	struct adapter_reply_queue *reply_q = bus_id;</div><div class='ctx'> 	union reply_descriptor rd;</div><div class='del'>-	u32 completed_cmds;</div><div class='del'>-	u8 request_desript_type;</div><div class='add'>+	u64 completed_cmds;</div><div class='add'>+	u8 request_descript_type;</div><div class='ctx'> 	u16 smid;</div><div class='ctx'> 	u8 cb_idx;</div><div class='ctx'> 	u32 reply;</div><div class='hunk'>@@ -1404,21 +1419,18 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 	Mpi2ReplyDescriptorsUnion_t *rpf;</div><div class='ctx'> 	u8 rc;</div><div class='ctx'> </div><div class='del'>-	if (ioc-&gt;mask_interrupts)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='add'>+	completed_cmds = 0;</div><div class='ctx'> 	if (!atomic_add_unless(&amp;reply_q-&gt;busy, 1, 1))</div><div class='del'>-		return IRQ_NONE;</div><div class='add'>+		return completed_cmds;</div><div class='ctx'> </div><div class='ctx'> 	rpf = &amp;reply_q-&gt;reply_post_free[reply_q-&gt;reply_post_host_index];</div><div class='del'>-	request_desript_type = rpf-&gt;Default.ReplyFlags</div><div class='add'>+	request_descript_type = rpf-&gt;Default.ReplyFlags</div><div class='ctx'> 	     &amp; MPI2_RPY_DESCRIPT_FLAGS_TYPE_MASK;</div><div class='del'>-	if (request_desript_type == MPI2_RPY_DESCRIPT_FLAGS_UNUSED) {</div><div class='add'>+	if (request_descript_type == MPI2_RPY_DESCRIPT_FLAGS_UNUSED) {</div><div class='ctx'> 		atomic_dec(&amp;reply_q-&gt;busy);</div><div class='del'>-		return IRQ_NONE;</div><div class='add'>+		return completed_cmds;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	completed_cmds = 0;</div><div class='ctx'> 	cb_idx = 0xFF;</div><div class='ctx'> 	do {</div><div class='ctx'> 		rd.word = le64_to_cpu(rpf-&gt;Words);</div><div class='hunk'>@@ -1426,11 +1438,11 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		reply = 0;</div><div class='ctx'> 		smid = le16_to_cpu(rpf-&gt;Default.DescriptorTypeDependent1);</div><div class='del'>-		if (request_desript_type ==</div><div class='add'>+		if (request_descript_type ==</div><div class='ctx'> 		    MPI25_RPY_DESCRIPT_FLAGS_FAST_PATH_SCSI_IO_SUCCESS ||</div><div class='del'>-		    request_desript_type ==</div><div class='add'>+		    request_descript_type ==</div><div class='ctx'> 		    MPI2_RPY_DESCRIPT_FLAGS_SCSI_IO_SUCCESS ||</div><div class='del'>-		    request_desript_type ==</div><div class='add'>+		    request_descript_type ==</div><div class='ctx'> 		    MPI26_RPY_DESCRIPT_FLAGS_PCIE_ENCAPSULATED_SUCCESS) {</div><div class='ctx'> 			cb_idx = _base_get_cb_idx(ioc, smid);</div><div class='ctx'> 			if ((likely(cb_idx &lt; MPT_MAX_CALLBACKS)) &amp;&amp;</div><div class='hunk'>@@ -1440,7 +1452,7 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 				if (rc)</div><div class='ctx'> 					mpt3sas_base_free_smid(ioc, smid);</div><div class='ctx'> 			}</div><div class='del'>-		} else if (request_desript_type ==</div><div class='add'>+		} else if (request_descript_type ==</div><div class='ctx'> 		    MPI2_RPY_DESCRIPT_FLAGS_ADDRESS_REPLY) {</div><div class='ctx'> 			reply = le32_to_cpu(</div><div class='ctx'> 			    rpf-&gt;AddressReply.ReplyFrameAddress);</div><div class='hunk'>@@ -1486,7 +1498,7 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 		    (reply_q-&gt;reply_post_host_index ==</div><div class='ctx'> 		    (ioc-&gt;reply_post_queue_depth - 1)) ? 0 :</div><div class='ctx'> 		    reply_q-&gt;reply_post_host_index + 1;</div><div class='del'>-		request_desript_type =</div><div class='add'>+		request_descript_type =</div><div class='ctx'> 		    reply_q-&gt;reply_post_free[reply_q-&gt;reply_post_host_index].</div><div class='ctx'> 		    Default.ReplyFlags &amp; MPI2_RPY_DESCRIPT_FLAGS_TYPE_MASK;</div><div class='ctx'> 		completed_cmds++;</div><div class='hunk'>@@ -1495,7 +1507,7 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 		 * So that FW can find enough entries to post the Reply</div><div class='ctx'> 		 * Descriptors in the reply descriptor post queue.</div><div class='ctx'> 		 */</div><div class='del'>-		if (completed_cmds &gt; ioc-&gt;hba_queue_depth/3) {</div><div class='add'>+		if (!base_mod64(completed_cmds, ioc-&gt;thresh_hold)) {</div><div class='ctx'> 			if (ioc-&gt;combined_reply_queue) {</div><div class='ctx'> 				writel(reply_q-&gt;reply_post_host_index |</div><div class='ctx'> 						((msix_index  &amp; 7) &lt;&lt;</div><div class='hunk'>@@ -1507,9 +1519,14 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 						 MPI2_RPHI_MSIX_INDEX_SHIFT),</div><div class='ctx'> 						&amp;ioc-&gt;chip-&gt;ReplyPostHostIndex);</div><div class='ctx'> 			}</div><div class='del'>-			completed_cmds = 1;</div><div class='add'>+			if (!reply_q-&gt;irq_poll_scheduled) {</div><div class='add'>+				reply_q-&gt;irq_poll_scheduled = true;</div><div class='add'>+				irq_poll_sched(&amp;reply_q-&gt;irqpoll);</div><div class='add'>+			}</div><div class='add'>+			atomic_dec(&amp;reply_q-&gt;busy);</div><div class='add'>+			return completed_cmds;</div><div class='ctx'> 		}</div><div class='del'>-		if (request_desript_type == MPI2_RPY_DESCRIPT_FLAGS_UNUSED)</div><div class='add'>+		if (request_descript_type == MPI2_RPY_DESCRIPT_FLAGS_UNUSED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (!reply_q-&gt;reply_post_host_index)</div><div class='ctx'> 			rpf = reply_q-&gt;reply_post_free;</div><div class='hunk'>@@ -1521,14 +1538,14 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> </div><div class='ctx'> 	if (!completed_cmds) {</div><div class='ctx'> 		atomic_dec(&amp;reply_q-&gt;busy);</div><div class='del'>-		return IRQ_NONE;</div><div class='add'>+		return completed_cmds;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ioc-&gt;is_warpdrive) {</div><div class='ctx'> 		writel(reply_q-&gt;reply_post_host_index,</div><div class='ctx'> 		ioc-&gt;reply_post_host_index[msix_index]);</div><div class='ctx'> 		atomic_dec(&amp;reply_q-&gt;busy);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='add'>+		return completed_cmds;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update Reply Post Host Index.</div><div class='hunk'>@@ -1555,7 +1572,82 @@ _base_interrupt(int irq, void *bus_id)</div><div class='ctx'> 			MPI2_RPHI_MSIX_INDEX_SHIFT),</div><div class='ctx'> 			&amp;ioc-&gt;chip-&gt;ReplyPostHostIndex);</div><div class='ctx'> 	atomic_dec(&amp;reply_q-&gt;busy);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+	return completed_cmds;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _base_interrupt - MPT adapter (IOC) specific interrupt handler.</div><div class='add'>+ * @irq: irq number (not used)</div><div class='add'>+ * @bus_id: bus identifier cookie == pointer to MPT_ADAPTER structure</div><div class='add'>+ *</div><div class='add'>+ * Return: IRQ_HANDLED if processed, else IRQ_NONE.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+_base_interrupt(int irq, void *bus_id)</div><div class='add'>+{</div><div class='add'>+	struct adapter_reply_queue *reply_q = bus_id;</div><div class='add'>+	struct MPT3SAS_ADAPTER *ioc = reply_q-&gt;ioc;</div><div class='add'>+</div><div class='add'>+	if (ioc-&gt;mask_interrupts)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	if (reply_q-&gt;irq_poll_scheduled)</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	return ((_base_process_reply_queue(reply_q) &gt; 0) ?</div><div class='add'>+			IRQ_HANDLED : IRQ_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _base_irqpoll - IRQ poll callback handler</div><div class='add'>+ * @irqpoll - irq_poll object</div><div class='add'>+ * @budget - irq poll weight</div><div class='add'>+ *</div><div class='add'>+ * returns number of reply descriptors processed</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+_base_irqpoll(struct irq_poll *irqpoll, int budget)</div><div class='add'>+{</div><div class='add'>+	struct adapter_reply_queue *reply_q;</div><div class='add'>+	int num_entries = 0;</div><div class='add'>+</div><div class='add'>+	reply_q = container_of(irqpoll, struct adapter_reply_queue,</div><div class='add'>+			irqpoll);</div><div class='add'>+	if (reply_q-&gt;irq_line_enable) {</div><div class='add'>+		disable_irq(reply_q-&gt;os_irq);</div><div class='add'>+		reply_q-&gt;irq_line_enable = false;</div><div class='add'>+	}</div><div class='add'>+	num_entries = _base_process_reply_queue(reply_q);</div><div class='add'>+	if (num_entries &lt; budget) {</div><div class='add'>+		irq_poll_complete(irqpoll);</div><div class='add'>+		reply_q-&gt;irq_poll_scheduled = false;</div><div class='add'>+		reply_q-&gt;irq_line_enable = true;</div><div class='add'>+		enable_irq(reply_q-&gt;os_irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_entries;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _base_init_irqpolls - initliaze IRQ polls</div><div class='add'>+ * @ioc: per adapter object</div><div class='add'>+ *</div><div class='add'>+ * returns nothing</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+_base_init_irqpolls(struct MPT3SAS_ADAPTER *ioc)</div><div class='add'>+{</div><div class='add'>+	struct adapter_reply_queue *reply_q, *next;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;ioc-&gt;reply_queue_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(reply_q, next, &amp;ioc-&gt;reply_queue_list, list) {</div><div class='add'>+		irq_poll_init(&amp;reply_q-&gt;irqpoll,</div><div class='add'>+			ioc-&gt;hba_queue_depth/4, _base_irqpoll);</div><div class='add'>+		reply_q-&gt;irq_poll_scheduled = false;</div><div class='add'>+		reply_q-&gt;irq_line_enable = true;</div><div class='add'>+		reply_q-&gt;os_irq = pci_irq_vector(ioc-&gt;pdev,</div><div class='add'>+		    reply_q-&gt;msix_index);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1596,6 +1688,17 @@ mpt3sas_base_sync_reply_irqs(struct MPT3SAS_ADAPTER *ioc)</div><div class='ctx'> 		/* TMs are on msix_index == 0 */</div><div class='ctx'> 		if (reply_q-&gt;msix_index == 0)</div><div class='ctx'> 			continue;</div><div class='add'>+		if (reply_q-&gt;irq_poll_scheduled) {</div><div class='add'>+			/* Calling irq_poll_disable will wait for any pending</div><div class='add'>+			 * callbacks to have completed.</div><div class='add'>+			 */</div><div class='add'>+			irq_poll_disable(&amp;reply_q-&gt;irqpoll);</div><div class='add'>+			irq_poll_enable(&amp;reply_q-&gt;irqpoll);</div><div class='add'>+			reply_q-&gt;irq_poll_scheduled = false;</div><div class='add'>+			reply_q-&gt;irq_line_enable = true;</div><div class='add'>+			enable_irq(reply_q-&gt;os_irq);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		synchronize_irq(pci_irq_vector(ioc-&gt;pdev, reply_q-&gt;msix_index));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2757,6 +2860,11 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc)</div><div class='ctx'> </div><div class='ctx'> 	if (!_base_is_controller_msix_enabled(ioc))</div><div class='ctx'> 		return;</div><div class='add'>+	ioc-&gt;msix_load_balance = false;</div><div class='add'>+	if (ioc-&gt;reply_queue_count &lt; num_online_cpus()) {</div><div class='add'>+		ioc-&gt;msix_load_balance = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(ioc-&gt;cpu_msix_table, 0, ioc-&gt;cpu_msix_table_sz);</div><div class='ctx'> </div><div class='hunk'>@@ -3015,6 +3123,8 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out_fail;</div><div class='ctx'> </div><div class='add'>+	if (!ioc-&gt;is_driver_loading)</div><div class='add'>+		_base_init_irqpolls(ioc);</div><div class='ctx'> 	/* Use the Combined reply queue feature only for SAS3 C0 &amp; higher</div><div class='ctx'> 	 * revision HBAs and also only when reply queue count is greater than 8</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3158,6 +3268,12 @@ mpt3sas_base_get_reply_virt_addr(struct MPT3SAS_ADAPTER *ioc, u32 phys_addr)</div><div class='ctx'> static inline u8</div><div class='ctx'> _base_get_msix_index(struct MPT3SAS_ADAPTER *ioc)</div><div class='ctx'> {</div><div class='add'>+	/* Enables reply_queue load balancing */</div><div class='add'>+	if (ioc-&gt;msix_load_balance)</div><div class='add'>+		return ioc-&gt;reply_queue_count ?</div><div class='add'>+		    base_mod64(atomic64_add_return(1,</div><div class='add'>+		    &amp;ioc-&gt;total_io_cnt), ioc-&gt;reply_queue_count) : 0;</div><div class='add'>+</div><div class='ctx'> 	return ioc-&gt;cpu_msix_table[raw_smp_processor_id()];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3281,12 +3397,18 @@ mpt3sas_base_free_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid)</div><div class='ctx'> </div><div class='ctx'> 	if (smid &lt; ioc-&gt;hi_priority_smid) {</div><div class='ctx'> 		struct scsiio_tracker *st;</div><div class='add'>+		void *request;</div><div class='ctx'> </div><div class='ctx'> 		st = _get_st_from_smid(ioc, smid);</div><div class='ctx'> 		if (!st) {</div><div class='ctx'> 			_base_recovery_check(ioc);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Clear MPI request frame */</div><div class='add'>+		request = mpt3sas_base_get_msg_frame(ioc, smid);</div><div class='add'>+		memset(request, 0, ioc-&gt;request_sz);</div><div class='add'>+</div><div class='ctx'> 		mpt3sas_base_clear_st(ioc, st);</div><div class='ctx'> 		_base_recovery_check(ioc);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3327,7 +3449,6 @@ _base_mpi_ep_writeq(__u64 b, volatile void __iomem *addr,</div><div class='ctx'> 	spin_lock_irqsave(writeq_lock, flags);</div><div class='ctx'> 	__raw_writel((u32)(b), addr);</div><div class='ctx'> 	__raw_writel((u32)(b &gt;&gt; 32), (addr + 4));</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(writeq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6501,6 +6622,12 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out_free_resources;</div><div class='ctx'> </div><div class='add'>+	if (irqpoll_weight &gt; 0)</div><div class='add'>+		ioc-&gt;thresh_hold = irqpoll_weight;</div><div class='add'>+	else</div><div class='add'>+		ioc-&gt;thresh_hold = ioc-&gt;hba_queue_depth/4;</div><div class='add'>+</div><div class='add'>+	_base_init_irqpolls(ioc);</div><div class='ctx'> 	init_waitqueue_head(&amp;ioc-&gt;reset_wq);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory pd handle bitmask list */</div><div class='head'>diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h<br/>index 19158cb59101..480219f0efc5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/mpt3sas_base.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/mpt3sas_base.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/mpt3sas_base.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mpt3sas/mpt3sas_base.h</a></div><div class='hunk'>@@ -67,6 +67,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/irq_poll.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mpt3sas_debug.h"</div><div class='ctx'> #include "mpt3sas_trigger_diag.h"</div><div class='hunk'>@@ -75,9 +76,9 @@</div><div class='ctx'> #define MPT3SAS_DRIVER_NAME		"mpt3sas"</div><div class='ctx'> #define MPT3SAS_AUTHOR "Avago Technologies &lt;MPT-FusionLinux.pdl@avagotech.com&gt;"</div><div class='ctx'> #define MPT3SAS_DESCRIPTION	"LSI MPT Fusion SAS 3.0 Device Driver"</div><div class='del'>-#define MPT3SAS_DRIVER_VERSION		"27.102.00.00"</div><div class='del'>-#define MPT3SAS_MAJOR_VERSION		27</div><div class='del'>-#define MPT3SAS_MINOR_VERSION		102</div><div class='add'>+#define MPT3SAS_DRIVER_VERSION		"28.100.00.00"</div><div class='add'>+#define MPT3SAS_MAJOR_VERSION		28</div><div class='add'>+#define MPT3SAS_MINOR_VERSION		100</div><div class='ctx'> #define MPT3SAS_BUILD_VERSION		0</div><div class='ctx'> #define MPT3SAS_RELEASE_VERSION	00</div><div class='ctx'> </div><div class='hunk'>@@ -882,6 +883,9 @@ struct _event_ack_list {</div><div class='ctx'>  * @reply_post_free: reply post base virt address</div><div class='ctx'>  * @name: the name registered to request_irq()</div><div class='ctx'>  * @busy: isr is actively processing replies on another cpu</div><div class='add'>+ * @os_irq: irq number</div><div class='add'>+ * @irqpoll: irq_poll object</div><div class='add'>+ * @irq_poll_scheduled: Tells whether irq poll is scheduled or not</div><div class='ctx'>  * @list: this list</div><div class='ctx'> */</div><div class='ctx'> struct adapter_reply_queue {</div><div class='hunk'>@@ -891,6 +895,10 @@ struct adapter_reply_queue {</div><div class='ctx'> 	Mpi2ReplyDescriptorsUnion_t *reply_post_free;</div><div class='ctx'> 	char			name[MPT_NAME_LENGTH];</div><div class='ctx'> 	atomic_t		busy;</div><div class='add'>+	u32			os_irq;</div><div class='add'>+	struct irq_poll         irqpoll;</div><div class='add'>+	bool			irq_poll_scheduled;</div><div class='add'>+	bool			irq_line_enable;</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1016,7 +1024,12 @@ typedef void (*MPT3SAS_FLUSH_RUNNING_CMDS)(struct MPT3SAS_ADAPTER *ioc);</div><div class='ctx'>  * @msix_vector_count: number msix vectors</div><div class='ctx'>  * @cpu_msix_table: table for mapping cpus to msix index</div><div class='ctx'>  * @cpu_msix_table_sz: table size</div><div class='add'>+ * @total_io_cnt: Gives total IO count, used to load balance the interrupts</div><div class='add'>+ * @msix_load_balance: Enables load balancing of interrupts across</div><div class='add'>+ * the multiple MSIXs</div><div class='ctx'>  * @schedule_dead_ioc_flush_running_cmds: callback to flush pending commands</div><div class='add'>+ * @thresh_hold: Max number of reply descriptors processed</div><div class='add'>+ *				before updating Host Index</div><div class='ctx'>  * @scsi_io_cb_idx: shost generated commands</div><div class='ctx'>  * @tm_cb_idx: task management commands</div><div class='ctx'>  * @scsih_cb_idx: scsih internal commands</div><div class='hunk'>@@ -1192,6 +1205,9 @@ struct MPT3SAS_ADAPTER {</div><div class='ctx'> 	u32		ioc_reset_count;</div><div class='ctx'> 	MPT3SAS_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;</div><div class='ctx'> 	u32             non_operational_loop;</div><div class='add'>+	atomic64_t      total_io_cnt;</div><div class='add'>+	bool            msix_load_balance;</div><div class='add'>+	u16		thresh_hold;</div><div class='ctx'> </div><div class='ctx'> 	/* internal commands, callback index */</div><div class='ctx'> 	u8		scsi_io_cb_idx;</div><div class='head'>diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c<br/>index 8bb5b8f9f4d2..1ccfbc7eebe0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/mpt3sas_scsih.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mpt3sas/mpt3sas_scsih.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mpt3sas/mpt3sas_scsih.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mpt3sas/mpt3sas_scsih.c</a></div><div class='hunk'>@@ -1462,11 +1462,23 @@ mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc, u16 smid)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *scmd = NULL;</div><div class='ctx'> 	struct scsiio_tracker *st;</div><div class='add'>+	Mpi25SCSIIORequest_t *mpi_request;</div><div class='ctx'> </div><div class='ctx'> 	if (smid &gt; 0  &amp;&amp;</div><div class='ctx'> 	    smid &lt;= ioc-&gt;scsiio_depth - INTERNAL_SCSIIO_CMDS_COUNT) {</div><div class='ctx'> 		u32 unique_tag = smid - 1;</div><div class='ctx'> </div><div class='add'>+		mpi_request = mpt3sas_base_get_msg_frame(ioc, smid);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If SCSI IO request is outstanding at driver level then</div><div class='add'>+		 * DevHandle filed must be non-zero. If DevHandle is zero</div><div class='add'>+		 * then it means that this smid is free at driver level,</div><div class='add'>+		 * so return NULL.</div><div class='add'>+		 */</div><div class='add'>+		if (!mpi_request-&gt;DevHandle)</div><div class='add'>+			return scmd;</div><div class='add'>+</div><div class='ctx'> 		scmd = scsi_host_find_tag(ioc-&gt;shost, unique_tag);</div><div class='ctx'> 		if (scmd) {</div><div class='ctx'> 			st = scsi_cmd_priv(scmd);</div><div class='head'>diff --git a/drivers/scsi/mvsas/mv_64xx.c b/drivers/scsi/mvsas/mv_64xx.c<br/>index b757d389e32f..2c699bc785a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvsas/mv_64xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvsas/mv_64xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvsas/mv_64xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mvsas/mv_64xx.c</a></div><div class='hunk'>@@ -678,7 +678,8 @@ static u32 mvs_64xx_spi_read_data(struct mvs_info *mvi)</div><div class='ctx'> static void mvs_64xx_spi_write_data(struct mvs_info *mvi, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *regs = mvi-&gt;regs_ex;</div><div class='del'>-	 iow32(SPI_DATA_REG_64XX, data);</div><div class='add'>+</div><div class='add'>+	iow32(SPI_DATA_REG_64XX, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c<br/>index eb5471bc7263..68b5b5f39a03 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvsas/mv_94xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvsas/mv_94xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvsas/mv_94xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mvsas/mv_94xx.c</a></div><div class='hunk'>@@ -946,7 +946,8 @@ static u32 mvs_94xx_spi_read_data(struct mvs_info *mvi)</div><div class='ctx'> static void mvs_94xx_spi_write_data(struct mvs_info *mvi, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *regs = mvi-&gt;regs_ex - 0x10200;</div><div class='del'>-	 mw32(SPI_RD_DATA_REG_94XX, data);</div><div class='add'>+</div><div class='add'>+	mw32(SPI_RD_DATA_REG_94XX, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c<br/>index 311d23c727ce..e933c65d8e0b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvsas/mv_sas.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvsas/mv_sas.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvsas/mv_sas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mvsas/mv_sas.c</a></div><div class='hunk'>@@ -1422,7 +1422,7 @@ int mvs_I_T_nexus_reset(struct domain_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc = TMF_RESP_FUNC_FAILED;</div><div class='del'>-    struct mvs_device * mvi_dev = (struct mvs_device *)dev-&gt;lldd_dev;</div><div class='add'>+	struct mvs_device *mvi_dev = (struct mvs_device *)dev-&gt;lldd_dev;</div><div class='ctx'> 	struct mvs_info *mvi = mvi_dev-&gt;mvi_info;</div><div class='ctx'> </div><div class='ctx'> 	if (mvi_dev-&gt;dev_status != MVS_DEV_EH)</div><div class='head'>diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c<br/>index 3df02691a092..a5410615edac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvumi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/mvumi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/mvumi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/mvumi.c</a></div><div class='hunk'>@@ -752,7 +752,7 @@ static int mvumi_issue_blocked_cmd(struct mvumi_hba *mhba,</div><div class='ctx'> 		spin_lock_irqsave(mhba-&gt;shost-&gt;host_lock, flags);</div><div class='ctx'> 		atomic_dec(&amp;cmd-&gt;sync_cmd);</div><div class='ctx'> 		if (mhba-&gt;tag_cmd[cmd-&gt;frame-&gt;tag]) {</div><div class='del'>-			mhba-&gt;tag_cmd[cmd-&gt;frame-&gt;tag] = 0;</div><div class='add'>+			mhba-&gt;tag_cmd[cmd-&gt;frame-&gt;tag] = NULL;</div><div class='ctx'> 			dev_warn(&amp;mhba-&gt;pdev-&gt;dev, "TIMEOUT:release tag [%d]\n",</div><div class='ctx'> 							cmd-&gt;frame-&gt;tag);</div><div class='ctx'> 			tag_release_one(mhba, &amp;mhba-&gt;tag_pool, cmd-&gt;frame-&gt;tag);</div><div class='hunk'>@@ -1794,7 +1794,7 @@ static void mvumi_handle_clob(struct mvumi_hba *mhba)</div><div class='ctx'> 		cmd = mhba-&gt;tag_cmd[ob_frame-&gt;tag];</div><div class='ctx'> </div><div class='ctx'> 		atomic_dec(&amp;mhba-&gt;fw_outstanding);</div><div class='del'>-		mhba-&gt;tag_cmd[ob_frame-&gt;tag] = 0;</div><div class='add'>+		mhba-&gt;tag_cmd[ob_frame-&gt;tag] = NULL;</div><div class='ctx'> 		tag_release_one(mhba, &amp;mhba-&gt;tag_pool, ob_frame-&gt;tag);</div><div class='ctx'> 		if (cmd-&gt;scmd)</div><div class='ctx'> 			mvumi_complete_cmd(mhba, cmd, ob_frame);</div><div class='hunk'>@@ -2139,7 +2139,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)</div><div class='ctx'> 	spin_lock_irqsave(mhba-&gt;shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (mhba-&gt;tag_cmd[cmd-&gt;frame-&gt;tag]) {</div><div class='del'>-		mhba-&gt;tag_cmd[cmd-&gt;frame-&gt;tag] = 0;</div><div class='add'>+		mhba-&gt;tag_cmd[cmd-&gt;frame-&gt;tag] = NULL;</div><div class='ctx'> 		tag_release_one(mhba, &amp;mhba-&gt;tag_pool, cmd-&gt;frame-&gt;tag);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!list_empty(&amp;cmd-&gt;queue_pointer))</div><div class='head'>diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c<br/>index be3c73ebbfde..4bad54463eb2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/osst.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/osst.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/osst.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/osst.c</a></div><div class='hunk'>@@ -216,12 +216,14 @@ static void osst_analyze_sense(struct osst_request *SRpnt, struct st_cmdstatus *</div><div class='ctx'> 		switch (sense[0] &amp; 0x7f) {</div><div class='ctx'> 		case 0x71:</div><div class='ctx'> 			s-&gt;deferred = 1;</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		case 0x70:</div><div class='ctx'> 			s-&gt;fixed_format = 1;</div><div class='ctx'> 			s-&gt;flags = sense[2] &amp; 0xe0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x73:</div><div class='ctx'> 			s-&gt;deferred = 1;</div><div class='add'>+			/* fall through */</div><div class='ctx'> 		case 0x72:</div><div class='ctx'> 			s-&gt;fixed_format = 0;</div><div class='ctx'> 			ucp = scsi_sense_desc_find(sense, SCSI_SENSE_BUFFERSIZE, 4);</div><div class='hunk'>@@ -591,6 +593,7 @@ static void osst_init_aux(struct osst_tape * STp, int frame_type, int frame_seq_</div><div class='ctx'> 		dat-&gt;dat_list[0].flags    = frame_type==OS_FRAME_TYPE_MARKER?</div><div class='ctx'> 							OS_DAT_FLAGS_MARK:OS_DAT_FLAGS_DATA;</div><div class='ctx'> 		dat-&gt;dat_list[0].reserved = 0;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	  case	OS_FRAME_TYPE_EOD:</div><div class='ctx'> 		aux-&gt;update_frame_cntr    = htonl(0);</div><div class='ctx'> 		par-&gt;partition_num        = OS_DATA_PARTITION;</div><div class='hunk'>@@ -4086,6 +4089,7 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt,</div><div class='ctx'> 	switch (cmd_in) {</div><div class='ctx'> 	 case MTFSFM:</div><div class='ctx'> 		chg_eof = 0; /* Changed from the FSF after this */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	 case MTFSF:</div><div class='ctx'> 		if (STp-&gt;raw)</div><div class='ctx'> 		   return (-EIO);</div><div class='hunk'>@@ -4101,6 +4105,7 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt,</div><div class='ctx'> </div><div class='ctx'> 	 case MTBSF:</div><div class='ctx'> 		chg_eof = 0; /* Changed from the FSF after this */</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	 case MTBSFM:</div><div class='ctx'> 		if (STp-&gt;raw)</div><div class='ctx'> 		   return (-EIO);</div><div class='hunk'>@@ -4312,6 +4317,7 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt,</div><div class='ctx'> 					   name, STp-&gt;block_size);</div><div class='ctx'> 			 return 0;</div><div class='ctx'> 		 }</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	 case MTSETDENSITY:       /* Set tape density */</div><div class='ctx'> 	 case MTSETDRVBUFFER:     /* Set drive buffering */</div><div class='ctx'> 	 case SET_DENS_AND_BLK:   /* Set density and block size */</div><div class='head'>diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c<br/>index d0bb357034d8..109effd3557d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_hwi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_hwi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/pm8001/pm8001_hwi.c</a></div><div class='hunk'>@@ -960,9 +960,9 @@ pm8001_chip_soft_rst(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	regVal = pm8001_cr32(pm8001_ha, 2, GPIO_GPIO_0_0UTPUT_CTL_OFFSET);</div><div class='del'>-		PM8001_INIT_DBG(pm8001_ha,</div><div class='del'>-				pm8001_printk("GPIO Output Control Register:"</div><div class='del'>-				" = 0x%x\n", regVal));</div><div class='add'>+	PM8001_INIT_DBG(pm8001_ha,</div><div class='add'>+			pm8001_printk("GPIO Output Control Register:"</div><div class='add'>+			" = 0x%x\n", regVal));</div><div class='ctx'> 	/* set GPIO-0 output control to tri-state */</div><div class='ctx'> 	regVal &amp;= 0xFFFFFFFC;</div><div class='ctx'> 	pm8001_cw32(pm8001_ha, 2, GPIO_GPIO_0_0UTPUT_CTL_OFFSET, regVal);</div><div class='hunk'>@@ -1204,6 +1204,7 @@ void pm8001_chip_iounmap(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef PM8001_USE_MSIX</div><div class='ctx'> /**</div><div class='ctx'>  * pm8001_chip_interrupt_enable - enable PM8001 chip interrupt</div><div class='ctx'>  * @pm8001_ha: our hba card information</div><div class='hunk'>@@ -1225,6 +1226,8 @@ pm8001_chip_intx_interrupt_disable(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> 	pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, ODMR_MASK_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm8001_chip_msix_interrupt_enable - enable PM8001 chip interrupt</div><div class='ctx'>  * @pm8001_ha: our hba card information</div><div class='hunk'>@@ -1256,6 +1259,7 @@ pm8001_chip_msix_interrupt_disable(struct pm8001_hba_info *pm8001_ha,</div><div class='ctx'> 	msi_index += MSIX_TABLE_BASE;</div><div class='ctx'> 	pm8001_cw32(pm8001_ha, 0,  msi_index, MSIX_INTERRUPT_DISABLE);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pm8001_chip_interrupt_enable - enable PM8001 chip interrupt</div><div class='hunk'>@@ -1266,10 +1270,9 @@ pm8001_chip_interrupt_enable(struct pm8001_hba_info *pm8001_ha, u8 vec)</div><div class='ctx'> {</div><div class='ctx'> #ifdef PM8001_USE_MSIX</div><div class='ctx'> 	pm8001_chip_msix_interrupt_enable(pm8001_ha, 0);</div><div class='del'>-	return;</div><div class='del'>-#endif</div><div class='add'>+#else</div><div class='ctx'> 	pm8001_chip_intx_interrupt_enable(pm8001_ha);</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1281,10 +1284,9 @@ pm8001_chip_interrupt_disable(struct pm8001_hba_info *pm8001_ha, u8 vec)</div><div class='ctx'> {</div><div class='ctx'> #ifdef PM8001_USE_MSIX</div><div class='ctx'> 	pm8001_chip_msix_interrupt_disable(pm8001_ha, 0);</div><div class='del'>-	return;</div><div class='del'>-#endif</div><div class='add'>+#else</div><div class='ctx'> 	pm8001_chip_intx_interrupt_disable(pm8001_ha);</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2898,7 +2900,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)</div><div class='ctx'> static void</div><div class='ctx'> mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)</div><div class='ctx'> {</div><div class='del'>-	u32 param;</div><div class='ctx'> 	struct sas_task *t;</div><div class='ctx'> 	struct pm8001_ccb_info *ccb;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -2913,7 +2914,6 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)</div><div class='ctx'> 	tag = le32_to_cpu(psmpPayload-&gt;tag);</div><div class='ctx'> </div><div class='ctx'> 	ccb = &amp;pm8001_ha-&gt;ccb_info[tag];</div><div class='del'>-	param = le32_to_cpu(psmpPayload-&gt;param);</div><div class='ctx'> 	t = ccb-&gt;task;</div><div class='ctx'> 	ts = &amp;t-&gt;task_status;</div><div class='ctx'> 	pm8001_dev = ccb-&gt;device;</div><div class='hunk'>@@ -2928,7 +2928,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)</div><div class='ctx'> 		PM8001_IO_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));</div><div class='ctx'> 		ts-&gt;resp = SAS_TASK_COMPLETE;</div><div class='ctx'> 		ts-&gt;stat = SAM_STAT_GOOD;</div><div class='del'>-	if (pm8001_dev)</div><div class='add'>+		if (pm8001_dev)</div><div class='ctx'> 			pm8001_dev-&gt;running_req--;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IO_ABORTED:</div><div class='hunk'>@@ -3244,11 +3244,9 @@ void pm8001_bytes_dmaed(struct pm8001_hba_info *pm8001_ha, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm8001_phy *phy = &amp;pm8001_ha-&gt;phy[i];</div><div class='ctx'> 	struct asd_sas_phy *sas_phy = &amp;phy-&gt;sas_phy;</div><div class='del'>-	struct sas_ha_struct *sas_ha;</div><div class='ctx'> 	if (!phy-&gt;phy_attached)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	sas_ha = pm8001_ha-&gt;sas;</div><div class='ctx'> 	if (sas_phy-&gt;phy) {</div><div class='ctx'> 		struct sas_phy *sphy = sas_phy-&gt;phy;</div><div class='ctx'> 		sphy-&gt;negotiated_linkrate = sas_phy-&gt;linkrate;</div><div class='hunk'>@@ -4627,17 +4625,18 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha)</div><div class='add'>+static u32 pm8001_chip_is_our_interrupt(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> {</div><div class='del'>-	u32 value;</div><div class='ctx'> #ifdef PM8001_USE_MSIX</div><div class='ctx'> 	return 1;</div><div class='del'>-#endif</div><div class='add'>+#else</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='ctx'> 	value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR);</div><div class='ctx'> 	if (value)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -5123,7 +5122,7 @@ const struct pm8001_dispatch pm8001_8001_dispatch = {</div><div class='ctx'> 	.chip_rst		= pm8001_hw_chip_rst,</div><div class='ctx'> 	.chip_iounmap		= pm8001_chip_iounmap,</div><div class='ctx'> 	.isr			= pm8001_chip_isr,</div><div class='del'>-	.is_our_interupt	= pm8001_chip_is_our_interupt,</div><div class='add'>+	.is_our_interrupt	= pm8001_chip_is_our_interrupt,</div><div class='ctx'> 	.isr_process_oq		= process_oq,</div><div class='ctx'> 	.interrupt_enable 	= pm8001_chip_interrupt_enable,</div><div class='ctx'> 	.interrupt_disable	= pm8001_chip_interrupt_disable,</div><div class='head'>diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c<br/>index a36060c23b37..3374f553c617 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/pm8001/pm8001_init.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ static irqreturn_t pm8001_interrupt_handler_msix(int irq, void *opaque)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pm8001_ha))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	if (!PM8001_CHIP_DISP-&gt;is_our_interupt(pm8001_ha))</div><div class='add'>+	if (!PM8001_CHIP_DISP-&gt;is_our_interrupt(pm8001_ha))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> #ifdef PM8001_USE_TASKLET</div><div class='ctx'> 	tasklet_schedule(&amp;pm8001_ha-&gt;tasklet[irq_vector-&gt;irq_id]);</div><div class='hunk'>@@ -224,7 +224,7 @@ static irqreturn_t pm8001_interrupt_handler_intx(int irq, void *dev_id)</div><div class='ctx'> 	pm8001_ha = sha-&gt;lldd_ha;</div><div class='ctx'> 	if (unlikely(!pm8001_ha))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	if (!PM8001_CHIP_DISP-&gt;is_our_interupt(pm8001_ha))</div><div class='add'>+	if (!PM8001_CHIP_DISP-&gt;is_our_interrupt(pm8001_ha))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> #ifdef PM8001_USE_TASKLET</div><div class='head'>diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c<br/>index 084f2fcced0a..88eef3b18e41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_sas.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_sas.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_sas.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/pm8001/pm8001_sas.c</a></div><div class='hunk'>@@ -740,8 +740,8 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,</div><div class='ctx'> 		wait_for_completion(&amp;task-&gt;slow_task-&gt;completion);</div><div class='ctx'> 		if (pm8001_ha-&gt;chip_id != chip_8001) {</div><div class='ctx'> 			pm8001_dev-&gt;setds_completion = &amp;completion_setstate;</div><div class='del'>-				PM8001_CHIP_DISP-&gt;set_dev_state_req(pm8001_ha,</div><div class='del'>-					pm8001_dev, 0x01);</div><div class='add'>+			PM8001_CHIP_DISP-&gt;set_dev_state_req(pm8001_ha,</div><div class='add'>+				pm8001_dev, 0x01);</div><div class='ctx'> 			wait_for_completion(&amp;completion_setstate);</div><div class='ctx'> 		}</div><div class='ctx'> 		res = -TMF_RESP_FUNC_FAILED;</div><div class='head'>diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h<br/>index f88b0d33c385..ac6d8e3f22de 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_sas.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm8001_sas.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm8001_sas.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/pm8001/pm8001_sas.h</a></div><div class='hunk'>@@ -197,7 +197,7 @@ struct pm8001_dispatch {</div><div class='ctx'> 	int (*chip_ioremap)(struct pm8001_hba_info *pm8001_ha);</div><div class='ctx'> 	void (*chip_iounmap)(struct pm8001_hba_info *pm8001_ha);</div><div class='ctx'> 	irqreturn_t (*isr)(struct pm8001_hba_info *pm8001_ha, u8 vec);</div><div class='del'>-	u32 (*is_our_interupt)(struct pm8001_hba_info *pm8001_ha);</div><div class='add'>+	u32 (*is_our_interrupt)(struct pm8001_hba_info *pm8001_ha);</div><div class='ctx'> 	int (*isr_process_oq)(struct pm8001_hba_info *pm8001_ha, u8 vec);</div><div class='ctx'> 	void (*interrupt_enable)(struct pm8001_hba_info *pm8001_ha, u8 vec);</div><div class='ctx'> 	void (*interrupt_disable)(struct pm8001_hba_info *pm8001_ha, u8 vec);</div><div class='head'>diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c<br/>index 63e4f7d34d6c..301de40eb708 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm80xx_hwi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/pm8001/pm80xx_hwi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/pm8001/pm80xx_hwi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/pm8001/pm80xx_hwi.c</a></div><div class='hunk'>@@ -1316,7 +1316,7 @@ pm80xx_chip_soft_rst(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> </div><div class='ctx'> static void pm80xx_hw_chip_rst(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> {</div><div class='del'>-	 u32 i;</div><div class='add'>+	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	PM8001_INIT_DBG(pm8001_ha,</div><div class='ctx'> 		pm8001_printk("chip reset start\n"));</div><div class='hunk'>@@ -4381,27 +4381,27 @@ static int pm80xx_chip_sata_req(struct pm8001_hba_info *pm8001_ha,</div><div class='ctx'> 			sata_cmd.len = cpu_to_le32(task-&gt;total_xfer_len);</div><div class='ctx'> 			sata_cmd.esgl = 0;</div><div class='ctx'> 		}</div><div class='del'>-			/* scsi cdb */</div><div class='del'>-			sata_cmd.atapi_scsi_cdb[0] =</div><div class='del'>-				cpu_to_le32(((task-&gt;ata_task.atapi_packet[0]) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[1] &lt;&lt; 8) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[2] &lt;&lt; 16) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[3] &lt;&lt; 24)));</div><div class='del'>-			sata_cmd.atapi_scsi_cdb[1] =</div><div class='del'>-				cpu_to_le32(((task-&gt;ata_task.atapi_packet[4]) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[5] &lt;&lt; 8) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[6] &lt;&lt; 16) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[7] &lt;&lt; 24)));</div><div class='del'>-			sata_cmd.atapi_scsi_cdb[2] =</div><div class='del'>-				cpu_to_le32(((task-&gt;ata_task.atapi_packet[8]) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[9] &lt;&lt; 8) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[10] &lt;&lt; 16) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[11] &lt;&lt; 24)));</div><div class='del'>-			sata_cmd.atapi_scsi_cdb[3] =</div><div class='del'>-				cpu_to_le32(((task-&gt;ata_task.atapi_packet[12]) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[13] &lt;&lt; 8) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[14] &lt;&lt; 16) |</div><div class='del'>-				(task-&gt;ata_task.atapi_packet[15] &lt;&lt; 24)));</div><div class='add'>+		/* scsi cdb */</div><div class='add'>+		sata_cmd.atapi_scsi_cdb[0] =</div><div class='add'>+			cpu_to_le32(((task-&gt;ata_task.atapi_packet[0]) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[1] &lt;&lt; 8) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[2] &lt;&lt; 16) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[3] &lt;&lt; 24)));</div><div class='add'>+		sata_cmd.atapi_scsi_cdb[1] =</div><div class='add'>+			cpu_to_le32(((task-&gt;ata_task.atapi_packet[4]) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[5] &lt;&lt; 8) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[6] &lt;&lt; 16) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[7] &lt;&lt; 24)));</div><div class='add'>+		sata_cmd.atapi_scsi_cdb[2] =</div><div class='add'>+			cpu_to_le32(((task-&gt;ata_task.atapi_packet[8]) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[9] &lt;&lt; 8) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[10] &lt;&lt; 16) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[11] &lt;&lt; 24)));</div><div class='add'>+		sata_cmd.atapi_scsi_cdb[3] =</div><div class='add'>+			cpu_to_le32(((task-&gt;ata_task.atapi_packet[12]) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[13] &lt;&lt; 8) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[14] &lt;&lt; 16) |</div><div class='add'>+			(task-&gt;ata_task.atapi_packet[15] &lt;&lt; 24)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for read log for failed drive and return */</div><div class='hunk'>@@ -4617,17 +4617,18 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,</div><div class='ctx'> 	return pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &amp;payload, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha)</div><div class='add'>+static u32 pm80xx_chip_is_our_interrupt(struct pm8001_hba_info *pm8001_ha)</div><div class='ctx'> {</div><div class='del'>-	u32 value;</div><div class='ctx'> #ifdef PM8001_USE_MSIX</div><div class='ctx'> 	return 1;</div><div class='del'>-#endif</div><div class='add'>+#else</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='ctx'> 	value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR);</div><div class='ctx'> 	if (value)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4724,7 +4725,7 @@ const struct pm8001_dispatch pm8001_80xx_dispatch = {</div><div class='ctx'> 	.chip_rst		= pm80xx_hw_chip_rst,</div><div class='ctx'> 	.chip_iounmap		= pm8001_chip_iounmap,</div><div class='ctx'> 	.isr			= pm80xx_chip_isr,</div><div class='del'>-	.is_our_interupt	= pm80xx_chip_is_our_interupt,</div><div class='add'>+	.is_our_interrupt	= pm80xx_chip_is_our_interrupt,</div><div class='ctx'> 	.isr_process_oq		= process_oq,</div><div class='ctx'> 	.interrupt_enable	= pm80xx_chip_interrupt_enable,</div><div class='ctx'> 	.interrupt_disable	= pm80xx_chip_interrupt_disable,</div><div class='head'>diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c<br/>index c182b5458f98..35213082e933 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ppa.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ppa.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ppa.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ppa.c</a></div><div class='hunk'>@@ -717,6 +717,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 			}</div><div class='ctx'> 			cmd-&gt;SCp.phase++;</div><div class='ctx'> 		}</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='ctx'> 	case 2:		/* Phase 2 - We are now talking to the scsi bus */</div><div class='ctx'> 		if (!ppa_select(dev, scmd_id(cmd))) {</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf.h b/drivers/scsi/qedf/qedf.h<br/>index 2c78d8fb9122..2c08f6f4db42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf.h</a></div><div class='hunk'>@@ -35,9 +35,6 @@</div><div class='ctx'> #define QEDF_DESCR "QLogic FCoE Offload Driver"</div><div class='ctx'> #define QEDF_MODULE_NAME "qedf"</div><div class='ctx'> </div><div class='del'>-#define QEDF_MIN_XID		0</div><div class='del'>-#define QEDF_MAX_SCSI_XID	(NUM_TASKS_PER_CONNECTION - 1)</div><div class='del'>-#define QEDF_MAX_ELS_XID	4095</div><div class='ctx'> #define QEDF_FLOGI_RETRY_CNT	3</div><div class='ctx'> #define QEDF_RPORT_RETRY_CNT	255</div><div class='ctx'> #define QEDF_MAX_SESSIONS	1024</div><div class='hunk'>@@ -52,8 +49,8 @@</div><div class='ctx'> 	sizeof(struct fc_frame_header))</div><div class='ctx'> #define QEDF_MAX_NPIV		64</div><div class='ctx'> #define QEDF_TM_TIMEOUT		10</div><div class='del'>-#define QEDF_ABORT_TIMEOUT	10</div><div class='del'>-#define QEDF_CLEANUP_TIMEOUT	10</div><div class='add'>+#define QEDF_ABORT_TIMEOUT	(10 * 1000)</div><div class='add'>+#define QEDF_CLEANUP_TIMEOUT	1</div><div class='ctx'> #define QEDF_MAX_CDB_LEN	16</div><div class='ctx'> </div><div class='ctx'> #define UPSTREAM_REMOVE		1</div><div class='hunk'>@@ -85,6 +82,7 @@ struct qedf_els_cb_arg {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum qedf_ioreq_event {</div><div class='add'>+	QEDF_IOREQ_EV_NONE,</div><div class='ctx'> 	QEDF_IOREQ_EV_ABORT_SUCCESS,</div><div class='ctx'> 	QEDF_IOREQ_EV_ABORT_FAILED,</div><div class='ctx'> 	QEDF_IOREQ_EV_SEND_RRQ,</div><div class='hunk'>@@ -105,7 +103,6 @@ struct qedf_ioreq {</div><div class='ctx'> 	struct list_head link;</div><div class='ctx'> 	uint16_t xid;</div><div class='ctx'> 	struct scsi_cmnd *sc_cmd;</div><div class='del'>-	bool use_slowpath; /* Use slow SGL for this I/O */</div><div class='ctx'> #define QEDF_SCSI_CMD		1</div><div class='ctx'> #define QEDF_TASK_MGMT_CMD	2</div><div class='ctx'> #define QEDF_ABTS		3</div><div class='hunk'>@@ -117,22 +114,43 @@ struct qedf_ioreq {</div><div class='ctx'> #define QEDF_CMD_IN_ABORT		0x1</div><div class='ctx'> #define QEDF_CMD_IN_CLEANUP		0x2</div><div class='ctx'> #define QEDF_CMD_SRR_SENT		0x3</div><div class='add'>+#define QEDF_CMD_DIRTY			0x4</div><div class='add'>+#define QEDF_CMD_ERR_SCSI_DONE		0x5</div><div class='ctx'> 	u8 io_req_flags;</div><div class='ctx'> 	uint8_t tm_flags;</div><div class='ctx'> 	struct qedf_rport *fcport;</div><div class='add'>+#define	QEDF_CMD_ST_INACTIVE		0</div><div class='add'>+#define	QEDFC_CMD_ST_IO_ACTIVE		1</div><div class='add'>+#define	QEDFC_CMD_ST_ABORT_ACTIVE	2</div><div class='add'>+#define	QEDFC_CMD_ST_ABORT_ACTIVE_EH	3</div><div class='add'>+#define	QEDFC_CMD_ST_CLEANUP_ACTIVE	4</div><div class='add'>+#define	QEDFC_CMD_ST_CLEANUP_ACTIVE_EH	5</div><div class='add'>+#define	QEDFC_CMD_ST_RRQ_ACTIVE		6</div><div class='add'>+#define	QEDFC_CMD_ST_RRQ_WAIT		7</div><div class='add'>+#define	QEDFC_CMD_ST_OXID_RETIRE_WAIT	8</div><div class='add'>+#define	QEDFC_CMD_ST_TMF_ACTIVE		9</div><div class='add'>+#define	QEDFC_CMD_ST_DRAIN_ACTIVE	10</div><div class='add'>+#define	QEDFC_CMD_ST_CLEANED		11</div><div class='add'>+#define	QEDFC_CMD_ST_ELS_ACTIVE		12</div><div class='add'>+	atomic_t state;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	enum qedf_ioreq_event event;</div><div class='ctx'> 	size_t data_xfer_len;</div><div class='add'>+	/* ID: 001: Alloc cmd (qedf_alloc_cmd) */</div><div class='add'>+	/* ID: 002: Initiate ABTS (qedf_initiate_abts) */</div><div class='add'>+	/* ID: 003: For RRQ (qedf_process_abts_compl) */</div><div class='ctx'> 	struct kref refcount;</div><div class='ctx'> 	struct qedf_cmd_mgr *cmd_mgr;</div><div class='ctx'> 	struct io_bdt *bd_tbl;</div><div class='ctx'> 	struct delayed_work timeout_work;</div><div class='ctx'> 	struct completion tm_done;</div><div class='ctx'> 	struct completion abts_done;</div><div class='add'>+	struct completion cleanup_done;</div><div class='ctx'> 	struct e4_fcoe_task_context *task;</div><div class='ctx'> 	struct fcoe_task_params *task_params;</div><div class='ctx'> 	struct scsi_sgl_task_params *sgl_task_params;</div><div class='ctx'> 	int idx;</div><div class='add'>+	int lun;</div><div class='ctx'> /*</div><div class='ctx'>  * Need to allocate enough room for both sense data and FCP response data</div><div class='ctx'>  * which has a max length of 8 bytes according to spec.</div><div class='hunk'>@@ -155,9 +173,9 @@ struct qedf_ioreq {</div><div class='ctx'> 	int fp_idx;</div><div class='ctx'> 	unsigned int cpu;</div><div class='ctx'> 	unsigned int int_cpu;</div><div class='del'>-#define QEDF_IOREQ_SLOW_SGE		0</div><div class='del'>-#define QEDF_IOREQ_SINGLE_SGE		1</div><div class='del'>-#define QEDF_IOREQ_FAST_SGE		2</div><div class='add'>+#define QEDF_IOREQ_UNKNOWN_SGE		1</div><div class='add'>+#define QEDF_IOREQ_SLOW_SGE		2</div><div class='add'>+#define QEDF_IOREQ_FAST_SGE		3</div><div class='ctx'> 	u8 sge_type;</div><div class='ctx'> 	struct delayed_work rrq_work;</div><div class='ctx'> </div><div class='hunk'>@@ -172,6 +190,8 @@ struct qedf_ioreq {</div><div class='ctx'> 	 * during some form of error processing.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool return_scsi_cmd_on_abts;</div><div class='add'>+</div><div class='add'>+	unsigned int alloc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct workqueue_struct *qedf_io_wq;</div><div class='hunk'>@@ -181,7 +201,10 @@ struct qedf_rport {</div><div class='ctx'> #define QEDF_RPORT_SESSION_READY 1</div><div class='ctx'> #define QEDF_RPORT_UPLOADING_CONNECTION	2</div><div class='ctx'> #define QEDF_RPORT_IN_RESET 3</div><div class='add'>+#define QEDF_RPORT_IN_LUN_RESET 4</div><div class='add'>+#define QEDF_RPORT_IN_TARGET_RESET 5</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int lun_reset_lun;</div><div class='ctx'> 	unsigned long retry_delay_timestamp;</div><div class='ctx'> 	struct fc_rport *rport;</div><div class='ctx'> 	struct fc_rport_priv *rdata;</div><div class='hunk'>@@ -191,6 +214,7 @@ struct qedf_rport {</div><div class='ctx'> 	void __iomem *p_doorbell;</div><div class='ctx'> 	/* Send queue management */</div><div class='ctx'> 	atomic_t free_sqes;</div><div class='add'>+	atomic_t ios_to_queue;</div><div class='ctx'> 	atomic_t num_active_ios;</div><div class='ctx'> 	struct fcoe_wqe *sq;</div><div class='ctx'> 	dma_addr_t sq_dma;</div><div class='hunk'>@@ -295,8 +319,6 @@ struct qedf_ctx {</div><div class='ctx'> #define QEDF_DCBX_PENDING	0</div><div class='ctx'> #define QEDF_DCBX_DONE		1</div><div class='ctx'> 	atomic_t dcbx;</div><div class='del'>-	uint16_t max_scsi_xid;</div><div class='del'>-	uint16_t max_els_xid;</div><div class='ctx'> #define QEDF_NULL_VLAN_ID	-1</div><div class='ctx'> #define QEDF_FALLBACK_VLAN	1002</div><div class='ctx'> #define QEDF_DEFAULT_PRIO	3</div><div class='hunk'>@@ -371,7 +393,6 @@ struct qedf_ctx {</div><div class='ctx'> </div><div class='ctx'> 	u32 slow_sge_ios;</div><div class='ctx'> 	u32 fast_sge_ios;</div><div class='del'>-	u32 single_sge_ios;</div><div class='ctx'> </div><div class='ctx'> 	uint8_t	*grcdump;</div><div class='ctx'> 	uint32_t grcdump_size;</div><div class='hunk'>@@ -396,6 +417,8 @@ struct qedf_ctx {</div><div class='ctx'> 	u8 target_resets;</div><div class='ctx'> 	u8 task_set_fulls;</div><div class='ctx'> 	u8 busy;</div><div class='add'>+	/* Used for flush routine */</div><div class='add'>+	struct mutex flush_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct io_bdt {</div><div class='hunk'>@@ -435,6 +458,12 @@ static inline void qedf_stop_all_io(struct qedf_ctx *qedf)</div><div class='ctx'> /*</div><div class='ctx'>  * Externs</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * (QEDF_LOG_NPIV | QEDF_LOG_SESS | QEDF_LOG_LPORT | QEDF_LOG_ELS | QEDF_LOG_MQ</div><div class='add'>+ * | QEDF_LOG_IO | QEDF_LOG_UNSOL | QEDF_LOG_SCSI_TM | QEDF_LOG_MP_REQ |</div><div class='add'>+ * QEDF_LOG_EVT | QEDF_LOG_CONN | QEDF_LOG_DISC | QEDF_LOG_INFO)</div><div class='add'>+ */</div><div class='ctx'> #define QEDF_DEFAULT_LOG_MASK		0x3CFB6</div><div class='ctx'> extern const struct qed_fcoe_ops *qed_ops;</div><div class='ctx'> extern uint qedf_dump_frames;</div><div class='hunk'>@@ -494,7 +523,7 @@ extern void qedf_set_vlan_id(struct qedf_ctx *qedf, int vlan_id);</div><div class='ctx'> extern void qedf_create_sysfs_ctx_attr(struct qedf_ctx *qedf);</div><div class='ctx'> extern void qedf_remove_sysfs_ctx_attr(struct qedf_ctx *qedf);</div><div class='ctx'> extern void qedf_capture_grc_dump(struct qedf_ctx *qedf);</div><div class='del'>-extern void qedf_wait_for_upload(struct qedf_ctx *qedf);</div><div class='add'>+bool qedf_wait_for_upload(struct qedf_ctx *qedf);</div><div class='ctx'> extern void qedf_process_unsol_compl(struct qedf_ctx *qedf, uint16_t que_idx,</div><div class='ctx'> 	struct fcoe_cqe *cqe);</div><div class='ctx'> extern void qedf_restart_rport(struct qedf_rport *fcport);</div><div class='hunk'>@@ -508,6 +537,8 @@ extern void qedf_get_protocol_tlv_data(void *dev, void *data);</div><div class='ctx'> extern void qedf_fp_io_handler(struct work_struct *work);</div><div class='ctx'> extern void qedf_get_generic_tlv_data(void *dev, struct qed_generic_tlvs *data);</div><div class='ctx'> extern void qedf_wq_grcdump(struct work_struct *work);</div><div class='add'>+void qedf_stag_change_work(struct work_struct *work);</div><div class='add'>+void qedf_ctx_soft_reset(struct fc_lport *lport);</div><div class='ctx'> </div><div class='ctx'> #define FCOE_WORD_TO_BYTE  4</div><div class='ctx'> #define QEDF_MAX_TASK_NUM	0xFFFF</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_dbg.c b/drivers/scsi/qedf/qedf_dbg.c<br/>index f2397ee9ba69..f7d170bffc82 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_dbg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_dbg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_dbg.c</a></div><div class='hunk'>@@ -15,10 +15,6 @@ qedf_dbg_err(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='del'>-	char nfunc[32];</div><div class='del'>-</div><div class='del'>-	memset(nfunc, 0, sizeof(nfunc));</div><div class='del'>-	memcpy(nfunc, func, sizeof(nfunc) - 1);</div><div class='ctx'> </div><div class='ctx'> 	va_start(va, fmt);</div><div class='ctx'> </div><div class='hunk'>@@ -27,9 +23,9 @@ qedf_dbg_err(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> </div><div class='ctx'> 	if (likely(qedf) &amp;&amp; likely(qedf-&gt;pdev))</div><div class='ctx'> 		pr_err("[%s]:[%s:%d]:%d: %pV", dev_name(&amp;(qedf-&gt;pdev-&gt;dev)),</div><div class='del'>-			nfunc, line, qedf-&gt;host_no, &amp;vaf);</div><div class='add'>+			func, line, qedf-&gt;host_no, &amp;vaf);</div><div class='ctx'> 	else</div><div class='del'>-		pr_err("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &amp;vaf);</div><div class='add'>+		pr_err("[0000:00:00.0]:[%s:%d]: %pV", func, line, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> 	va_end(va);</div><div class='ctx'> }</div><div class='hunk'>@@ -40,10 +36,6 @@ qedf_dbg_warn(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='del'>-	char nfunc[32];</div><div class='del'>-</div><div class='del'>-	memset(nfunc, 0, sizeof(nfunc));</div><div class='del'>-	memcpy(nfunc, func, sizeof(nfunc) - 1);</div><div class='ctx'> </div><div class='ctx'> 	va_start(va, fmt);</div><div class='ctx'> </div><div class='hunk'>@@ -55,9 +47,9 @@ qedf_dbg_warn(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> </div><div class='ctx'> 	if (likely(qedf) &amp;&amp; likely(qedf-&gt;pdev))</div><div class='ctx'> 		pr_warn("[%s]:[%s:%d]:%d: %pV", dev_name(&amp;(qedf-&gt;pdev-&gt;dev)),</div><div class='del'>-			nfunc, line, qedf-&gt;host_no, &amp;vaf);</div><div class='add'>+			func, line, qedf-&gt;host_no, &amp;vaf);</div><div class='ctx'> 	else</div><div class='del'>-		pr_warn("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &amp;vaf);</div><div class='add'>+		pr_warn("[0000:00:00.0]:[%s:%d]: %pV", func, line, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> ret:</div><div class='ctx'> 	va_end(va);</div><div class='hunk'>@@ -69,10 +61,6 @@ qedf_dbg_notice(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='del'>-	char nfunc[32];</div><div class='del'>-</div><div class='del'>-	memset(nfunc, 0, sizeof(nfunc));</div><div class='del'>-	memcpy(nfunc, func, sizeof(nfunc) - 1);</div><div class='ctx'> </div><div class='ctx'> 	va_start(va, fmt);</div><div class='ctx'> </div><div class='hunk'>@@ -84,10 +72,10 @@ qedf_dbg_notice(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> </div><div class='ctx'> 	if (likely(qedf) &amp;&amp; likely(qedf-&gt;pdev))</div><div class='ctx'> 		pr_notice("[%s]:[%s:%d]:%d: %pV",</div><div class='del'>-			  dev_name(&amp;(qedf-&gt;pdev-&gt;dev)), nfunc, line,</div><div class='add'>+			  dev_name(&amp;(qedf-&gt;pdev-&gt;dev)), func, line,</div><div class='ctx'> 			  qedf-&gt;host_no, &amp;vaf);</div><div class='ctx'> 	else</div><div class='del'>-		pr_notice("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &amp;vaf);</div><div class='add'>+		pr_notice("[0000:00:00.0]:[%s:%d]: %pV", func, line, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> ret:</div><div class='ctx'> 	va_end(va);</div><div class='hunk'>@@ -99,10 +87,6 @@ qedf_dbg_info(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='del'>-	char nfunc[32];</div><div class='del'>-</div><div class='del'>-	memset(nfunc, 0, sizeof(nfunc));</div><div class='del'>-	memcpy(nfunc, func, sizeof(nfunc) - 1);</div><div class='ctx'> </div><div class='ctx'> 	va_start(va, fmt);</div><div class='ctx'> </div><div class='hunk'>@@ -114,9 +98,9 @@ qedf_dbg_info(struct qedf_dbg_ctx *qedf, const char *func, u32 line,</div><div class='ctx'> </div><div class='ctx'> 	if (likely(qedf) &amp;&amp; likely(qedf-&gt;pdev))</div><div class='ctx'> 		pr_info("[%s]:[%s:%d]:%d: %pV", dev_name(&amp;(qedf-&gt;pdev-&gt;dev)),</div><div class='del'>-			nfunc, line, qedf-&gt;host_no, &amp;vaf);</div><div class='add'>+			func, line, qedf-&gt;host_no, &amp;vaf);</div><div class='ctx'> 	else</div><div class='del'>-		pr_info("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &amp;vaf);</div><div class='add'>+		pr_info("[0000:00:00.0]:[%s:%d]: %pV", func, line, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> ret:</div><div class='ctx'> 	va_end(va);</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_debugfs.c b/drivers/scsi/qedf/qedf_debugfs.c<br/>index a32d8ee4666e..235389209689 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_debugfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_debugfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_debugfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_debugfs.c</a></div><div class='hunk'>@@ -293,6 +293,33 @@ qedf_dbg_io_trace_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return single_open(file, qedf_io_trace_show, qedf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Based on fip_state enum from libfcoe.h */</div><div class='add'>+static char *fip_state_names[] = {</div><div class='add'>+	"FIP_ST_DISABLED",</div><div class='add'>+	"FIP_ST_LINK_WAIT",</div><div class='add'>+	"FIP_ST_AUTO",</div><div class='add'>+	"FIP_ST_NON_FIP",</div><div class='add'>+	"FIP_ST_ENABLED",</div><div class='add'>+	"FIP_ST_VNMP_START",</div><div class='add'>+	"FIP_ST_VNMP_PROBE1",</div><div class='add'>+	"FIP_ST_VNMP_PROBE2",</div><div class='add'>+	"FIP_ST_VNMP_CLAIM",</div><div class='add'>+	"FIP_ST_VNMP_UP",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Based on fc_rport_state enum from libfc.h */</div><div class='add'>+static char *fc_rport_state_names[] = {</div><div class='add'>+	"RPORT_ST_INIT",</div><div class='add'>+	"RPORT_ST_FLOGI",</div><div class='add'>+	"RPORT_ST_PLOGI_WAIT",</div><div class='add'>+	"RPORT_ST_PLOGI",</div><div class='add'>+	"RPORT_ST_PRLI",</div><div class='add'>+	"RPORT_ST_RTV",</div><div class='add'>+	"RPORT_ST_READY",</div><div class='add'>+	"RPORT_ST_ADISC",</div><div class='add'>+	"RPORT_ST_DELETE",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> qedf_driver_stats_show(struct seq_file *s, void *unused)</div><div class='ctx'> {</div><div class='hunk'>@@ -300,10 +327,28 @@ qedf_driver_stats_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	struct qedf_rport *fcport;</div><div class='ctx'> 	struct fc_rport_priv *rdata;</div><div class='ctx'> </div><div class='add'>+	seq_printf(s, "Host WWNN/WWPN: %016llx/%016llx\n",</div><div class='add'>+		   qedf-&gt;wwnn, qedf-&gt;wwpn);</div><div class='add'>+	seq_printf(s, "Host NPortID: %06x\n", qedf-&gt;lport-&gt;port_id);</div><div class='add'>+	seq_printf(s, "Link State: %s\n", atomic_read(&amp;qedf-&gt;link_state) ?</div><div class='add'>+	    "Up" : "Down");</div><div class='add'>+	seq_printf(s, "Logical Link State: %s\n", qedf-&gt;lport-&gt;link_up ?</div><div class='add'>+	    "Up" : "Down");</div><div class='add'>+	seq_printf(s, "FIP state: %s\n", fip_state_names[qedf-&gt;ctlr.state]);</div><div class='add'>+	seq_printf(s, "FIP VLAN ID: %d\n", qedf-&gt;vlan_id &amp; 0xfff);</div><div class='add'>+	seq_printf(s, "FIP 802.1Q Priority: %d\n", qedf-&gt;prio);</div><div class='add'>+	if (qedf-&gt;ctlr.sel_fcf) {</div><div class='add'>+		seq_printf(s, "FCF WWPN: %016llx\n",</div><div class='add'>+			   qedf-&gt;ctlr.sel_fcf-&gt;switch_name);</div><div class='add'>+		seq_printf(s, "FCF MAC: %pM\n", qedf-&gt;ctlr.sel_fcf-&gt;fcf_mac);</div><div class='add'>+	} else {</div><div class='add'>+		seq_puts(s, "FCF not selected\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_puts(s, "\nSGE stats:\n\n");</div><div class='ctx'> 	seq_printf(s, "cmg_mgr free io_reqs: %d\n",</div><div class='ctx'> 	    atomic_read(&amp;qedf-&gt;cmd_mgr-&gt;free_list_cnt));</div><div class='ctx'> 	seq_printf(s, "slow SGEs: %d\n", qedf-&gt;slow_sge_ios);</div><div class='del'>-	seq_printf(s, "single SGEs: %d\n", qedf-&gt;single_sge_ios);</div><div class='ctx'> 	seq_printf(s, "fast SGEs: %d\n\n", qedf-&gt;fast_sge_ios);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(s, "Offloaded ports:\n\n");</div><div class='hunk'>@@ -313,9 +358,12 @@ qedf_driver_stats_show(struct seq_file *s, void *unused)</div><div class='ctx'> 		rdata = fcport-&gt;rdata;</div><div class='ctx'> 		if (rdata == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		seq_printf(s, "%06x: free_sqes: %d, num_active_ios: %d\n",</div><div class='del'>-		    rdata-&gt;ids.port_id, atomic_read(&amp;fcport-&gt;free_sqes),</div><div class='del'>-		    atomic_read(&amp;fcport-&gt;num_active_ios));</div><div class='add'>+		seq_printf(s, "%016llx/%016llx/%06x: state=%s, free_sqes=%d, num_active_ios=%d\n",</div><div class='add'>+			   rdata-&gt;rport-&gt;node_name, rdata-&gt;rport-&gt;port_name,</div><div class='add'>+			   rdata-&gt;ids.port_id,</div><div class='add'>+			   fc_rport_state_names[rdata-&gt;rp_state],</div><div class='add'>+			   atomic_read(&amp;fcport-&gt;free_sqes),</div><div class='add'>+			   atomic_read(&amp;fcport-&gt;num_active_ios));</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -361,7 +409,6 @@ qedf_dbg_clear_stats_cmd_write(struct file *filp,</div><div class='ctx'> </div><div class='ctx'> 	/* Clear stat counters exposed by 'stats' node */</div><div class='ctx'> 	qedf-&gt;slow_sge_ios = 0;</div><div class='del'>-	qedf-&gt;single_sge_ios = 0;</div><div class='ctx'> 	qedf-&gt;fast_sge_ios = 0;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_els.c b/drivers/scsi/qedf/qedf_els.c<br/>index 04f0c4d2e256..d900c89e8049 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_els.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_els.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_els.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_els.c</a></div><div class='hunk'>@@ -23,8 +23,6 @@ static int qedf_initiate_els(struct qedf_rport *fcport, unsigned int op,</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	uint32_t did, sid;</div><div class='ctx'> 	uint16_t xid;</div><div class='del'>-	uint32_t start_time = jiffies / HZ;</div><div class='del'>-	uint32_t current_time;</div><div class='ctx'> 	struct fcoe_wqe *sqe;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u16 sqe_idx;</div><div class='hunk'>@@ -59,18 +57,12 @@ static int qedf_initiate_els(struct qedf_rport *fcport, unsigned int op,</div><div class='ctx'> 		goto els_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-retry_els:</div><div class='ctx'> 	els_req = qedf_alloc_cmd(fcport, QEDF_ELS);</div><div class='ctx'> 	if (!els_req) {</div><div class='del'>-		current_time = jiffies / HZ;</div><div class='del'>-		if ((current_time - start_time) &gt; 10) {</div><div class='del'>-			QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_ELS,</div><div class='del'>-				   "els: Failed els 0x%x\n", op);</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto els_err;</div><div class='del'>-		}</div><div class='del'>-		mdelay(20 * USEC_PER_MSEC);</div><div class='del'>-		goto retry_els;</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_ELS,</div><div class='add'>+			  "Failed to alloc ELS request 0x%x\n", op);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto els_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_ELS, "initiate_els els_req = "</div><div class='hunk'>@@ -143,6 +135,8 @@ retry_els:</div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_ELS, "Ringing doorbell for ELS "</div><div class='ctx'> 		   "req\n");</div><div class='ctx'> 	qedf_ring_doorbell(fcport);</div><div class='add'>+	set_bit(QEDF_CMD_OUTSTANDING, &amp;els_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> els_err:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -151,21 +145,16 @@ els_err:</div><div class='ctx'> void qedf_process_els_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> 	struct qedf_ioreq *els_req)</div><div class='ctx'> {</div><div class='del'>-	struct fcoe_task_context *task_ctx;</div><div class='del'>-	struct scsi_cmnd *sc_cmd;</div><div class='del'>-	uint16_t xid;</div><div class='ctx'> 	struct fcoe_cqe_midpath_info *mp_info;</div><div class='ctx'> </div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_ELS, "Entered with xid = 0x%x"</div><div class='ctx'> 		   " cmd_type = %d.\n", els_req-&gt;xid, els_req-&gt;cmd_type);</div><div class='ctx'> </div><div class='add'>+	clear_bit(QEDF_CMD_OUTSTANDING, &amp;els_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	/* Kill the ELS timer */</div><div class='ctx'> 	cancel_delayed_work(&amp;els_req-&gt;timeout_work);</div><div class='ctx'> </div><div class='del'>-	xid = els_req-&gt;xid;</div><div class='del'>-	task_ctx = qedf_get_task_mem(&amp;qedf-&gt;tasks, xid);</div><div class='del'>-	sc_cmd = els_req-&gt;sc_cmd;</div><div class='del'>-</div><div class='ctx'> 	/* Get ELS response length from CQE */</div><div class='ctx'> 	mp_info = &amp;cqe-&gt;cqe_info.midpath_info;</div><div class='ctx'> 	els_req-&gt;mp_req.resp_len = mp_info-&gt;data_placement_size;</div><div class='hunk'>@@ -205,8 +194,12 @@ static void qedf_rrq_compl(struct qedf_els_cb_arg *cb_arg)</div><div class='ctx'> 		   " orig xid = 0x%x, rrq_xid = 0x%x, refcount=%d\n",</div><div class='ctx'> 		   orig_io_req, orig_io_req-&gt;xid, rrq_req-&gt;xid, refcount);</div><div class='ctx'> </div><div class='del'>-	/* This should return the aborted io_req to the command pool */</div><div class='del'>-	if (orig_io_req)</div><div class='add'>+	/*</div><div class='add'>+	 * This should return the aborted io_req to the command pool. Note that</div><div class='add'>+	 * we need to check the refcound in case the original request was</div><div class='add'>+	 * flushed but we get a completion on this xid.</div><div class='add'>+	 */</div><div class='add'>+	if (orig_io_req &amp;&amp; refcount &gt; 0)</div><div class='ctx'> 		kref_put(&amp;orig_io_req-&gt;refcount, qedf_release_cmd);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='hunk'>@@ -233,6 +226,7 @@ int qedf_send_rrq(struct qedf_ioreq *aborted_io_req)</div><div class='ctx'> 	uint32_t sid;</div><div class='ctx'> 	uint32_t r_a_tov;</div><div class='ctx'> 	int rc;</div><div class='add'>+	int refcount;</div><div class='ctx'> </div><div class='ctx'> 	if (!aborted_io_req) {</div><div class='ctx'> 		QEDF_ERR(NULL, "abort_io_req is NULL.\n");</div><div class='hunk'>@@ -241,6 +235,15 @@ int qedf_send_rrq(struct qedf_ioreq *aborted_io_req)</div><div class='ctx'> </div><div class='ctx'> 	fcport = aborted_io_req-&gt;fcport;</div><div class='ctx'> </div><div class='add'>+	if (!fcport) {</div><div class='add'>+		refcount = kref_read(&amp;aborted_io_req-&gt;refcount);</div><div class='add'>+		QEDF_ERR(NULL,</div><div class='add'>+			 "RRQ work was queued prior to a flush xid=0x%x, refcount=%d.\n",</div><div class='add'>+			 aborted_io_req-&gt;xid, refcount);</div><div class='add'>+		kref_put(&amp;aborted_io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check that fcport is still offloaded */</div><div class='ctx'> 	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(NULL, "fcport is no longer offloaded.\n");</div><div class='hunk'>@@ -253,6 +256,19 @@ int qedf_send_rrq(struct qedf_ioreq *aborted_io_req)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qedf = fcport-&gt;qedf;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Sanity check that we can send a RRQ to make sure that refcount isn't</div><div class='add'>+	 * 0</div><div class='add'>+	 */</div><div class='add'>+	refcount = kref_read(&amp;aborted_io_req-&gt;refcount);</div><div class='add'>+	if (refcount != 1) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_ELS,</div><div class='add'>+			  "refcount for xid=%x io_req=%p refcount=%d is not 1.\n",</div><div class='add'>+			  aborted_io_req-&gt;xid, aborted_io_req, refcount);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lport = qedf-&gt;lport;</div><div class='ctx'> 	sid = fcport-&gt;sid;</div><div class='ctx'> 	r_a_tov = lport-&gt;r_a_tov;</div><div class='hunk'>@@ -335,32 +351,49 @@ void qedf_restart_rport(struct qedf_rport *fcport)</div><div class='ctx'> 	struct fc_lport *lport;</div><div class='ctx'> 	struct fc_rport_priv *rdata;</div><div class='ctx'> 	u32 port_id;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!fcport)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> 	if (test_bit(QEDF_RPORT_IN_RESET, &amp;fcport-&gt;flags) ||</div><div class='ctx'> 	    !test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags) ||</div><div class='ctx'> 	    test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(fcport-&gt;qedf-&gt;dbg_ctx), "fcport %p already in reset or not offloaded.\n",</div><div class='ctx'> 		    fcport);</div><div class='add'>+		spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set that we are now in reset */</div><div class='ctx'> 	set_bit(QEDF_RPORT_IN_RESET, &amp;fcport-&gt;flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	rdata = fcport-&gt;rdata;</div><div class='del'>-	if (rdata) {</div><div class='add'>+	if (rdata &amp;&amp; !kref_get_unless_zero(&amp;rdata-&gt;kref)) {</div><div class='add'>+		fcport-&gt;rdata = NULL;</div><div class='add'>+		rdata = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdata &amp;&amp; rdata-&gt;rp_state == RPORT_ST_READY) {</div><div class='ctx'> 		lport = fcport-&gt;qedf-&gt;lport;</div><div class='ctx'> 		port_id = rdata-&gt;ids.port_id;</div><div class='ctx'> 		QEDF_ERR(&amp;(fcport-&gt;qedf-&gt;dbg_ctx),</div><div class='ctx'> 		    "LOGO port_id=%x.\n", port_id);</div><div class='ctx'> 		fc_rport_logoff(rdata);</div><div class='add'>+		kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='add'>+		mutex_lock(&amp;lport-&gt;disc.disc_mutex);</div><div class='ctx'> 		/* Recreate the rport and log back in */</div><div class='ctx'> 		rdata = fc_rport_create(lport, port_id);</div><div class='del'>-		if (rdata)</div><div class='add'>+		if (rdata) {</div><div class='add'>+			mutex_unlock(&amp;lport-&gt;disc.disc_mutex);</div><div class='ctx'> 			fc_rport_login(rdata);</div><div class='add'>+			fcport-&gt;rdata = rdata;</div><div class='add'>+		} else {</div><div class='add'>+			mutex_unlock(&amp;lport-&gt;disc.disc_mutex);</div><div class='add'>+			fcport-&gt;rdata = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_bit(QEDF_RPORT_IN_RESET, &amp;fcport-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -569,7 +602,7 @@ static int qedf_send_srr(struct qedf_ioreq *orig_io_req, u32 offset, u8 r_ctl)</div><div class='ctx'> 	struct qedf_rport *fcport;</div><div class='ctx'> 	struct fc_lport *lport;</div><div class='ctx'> 	struct qedf_els_cb_arg *cb_arg = NULL;</div><div class='del'>-	u32 sid, r_a_tov;</div><div class='add'>+	u32 r_a_tov;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!orig_io_req) {</div><div class='hunk'>@@ -595,7 +628,6 @@ static int qedf_send_srr(struct qedf_ioreq *orig_io_req, u32 offset, u8 r_ctl)</div><div class='ctx'> </div><div class='ctx'> 	qedf = fcport-&gt;qedf;</div><div class='ctx'> 	lport = qedf-&gt;lport;</div><div class='del'>-	sid = fcport-&gt;sid;</div><div class='ctx'> 	r_a_tov = lport-&gt;r_a_tov;</div><div class='ctx'> </div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_ELS, "Sending SRR orig_io=%p, "</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_fip.c b/drivers/scsi/qedf/qedf_fip.c<br/>index 3fd3af799b3d..d4741f8dcb41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_fip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_fip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_fip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_fip.c</a></div><div class='hunk'>@@ -19,17 +19,16 @@ void qedf_fcoe_send_vlan_req(struct qedf_ctx *qedf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	char *eth_fr;</div><div class='del'>-	int fr_len;</div><div class='ctx'> 	struct fip_vlan *vlan;</div><div class='ctx'> #define MY_FIP_ALL_FCF_MACS        ((__u8[6]) { 1, 0x10, 0x18, 1, 0, 2 })</div><div class='ctx'> 	static u8 my_fcoe_all_fcfs[ETH_ALEN] = MY_FIP_ALL_FCF_MACS;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='add'>+	int rc = -1;</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(sizeof(struct fip_vlan));</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fr_len = sizeof(*vlan);</div><div class='ctx'> 	eth_fr = (char *)skb-&gt;data;</div><div class='ctx'> 	vlan = (struct fip_vlan *)eth_fr;</div><div class='ctx'> </div><div class='hunk'>@@ -68,7 +67,13 @@ void qedf_fcoe_send_vlan_req(struct qedf_ctx *qedf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(QED_LL2_XMIT_FLAGS_FIP_DISCOVERY, &amp;flags);</div><div class='del'>-	qed_ops-&gt;ll2-&gt;start_xmit(qedf-&gt;cdev, skb, flags);</div><div class='add'>+	rc = qed_ops-&gt;ll2-&gt;start_xmit(qedf-&gt;cdev, skb, flags);</div><div class='add'>+	if (rc) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "start_xmit failed rc = %d.\n", rc);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qedf_fcoe_process_vlan_resp(struct qedf_ctx *qedf,</div><div class='hunk'>@@ -95,6 +100,12 @@ static void qedf_fcoe_process_vlan_resp(struct qedf_ctx *qedf,</div><div class='ctx'> 		rlen -= dlen;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (atomic_read(&amp;qedf-&gt;link_state) == QEDF_LINK_DOWN) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+			  "Dropping VLAN response as link is down.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_DISC, "VLAN response, "</div><div class='ctx'> 		   "vid=0x%x.\n", vid);</div><div class='ctx'> </div><div class='hunk'>@@ -114,6 +125,7 @@ void qedf_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)</div><div class='ctx'> 	struct fip_header *fiph;</div><div class='ctx'> 	u16 op, vlan_tci = 0;</div><div class='ctx'> 	u8 sub;</div><div class='add'>+	int rc = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(QEDF_LL2_STARTED, &amp;qedf-&gt;flags)) {</div><div class='ctx'> 		QEDF_WARN(&amp;(qedf-&gt;dbg_ctx), "LL2 not started\n");</div><div class='hunk'>@@ -142,9 +154,16 @@ void qedf_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)</div><div class='ctx'> 		print_hex_dump(KERN_WARNING, "fip ", DUMP_PREFIX_OFFSET, 16, 1,</div><div class='ctx'> 		    skb-&gt;data, skb-&gt;len, false);</div><div class='ctx'> </div><div class='del'>-	qed_ops-&gt;ll2-&gt;start_xmit(qedf-&gt;cdev, skb, 0);</div><div class='add'>+	rc = qed_ops-&gt;ll2-&gt;start_xmit(qedf-&gt;cdev, skb, 0);</div><div class='add'>+	if (rc) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "start_xmit failed rc = %d.\n", rc);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 fcoe_all_enode[ETH_ALEN] = FIP_ALL_ENODE_MACS;</div><div class='add'>+</div><div class='ctx'> /* Process incoming FIP frames. */</div><div class='ctx'> void qedf_fip_recv(struct qedf_ctx *qedf, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -157,20 +176,37 @@ void qedf_fip_recv(struct qedf_ctx *qedf, struct sk_buff *skb)</div><div class='ctx'> 	size_t rlen, dlen;</div><div class='ctx'> 	u16 op;</div><div class='ctx'> 	u8 sub;</div><div class='del'>-	bool do_reset = false;</div><div class='add'>+	bool fcf_valid = false;</div><div class='add'>+	/* Default is to handle CVL regardless of fabric id descriptor */</div><div class='add'>+	bool fabric_id_valid = true;</div><div class='add'>+	bool fc_wwpn_valid = false;</div><div class='add'>+	u64 switch_name;</div><div class='add'>+	u16 vlan = 0;</div><div class='ctx'> </div><div class='ctx'> 	eth_hdr = (struct ethhdr *)skb_mac_header(skb);</div><div class='ctx'> 	fiph = (struct fip_header *) ((void *)skb-&gt;data + 2 * ETH_ALEN + 2);</div><div class='ctx'> 	op = ntohs(fiph-&gt;fip_op);</div><div class='ctx'> 	sub = fiph-&gt;fip_subcode;</div><div class='ctx'> </div><div class='del'>-	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_LL2, "FIP frame received: "</div><div class='del'>-	    "skb=%p fiph=%p source=%pM op=%x sub=%x", skb, fiph,</div><div class='del'>-	    eth_hdr-&gt;h_source, op, sub);</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_LL2,</div><div class='add'>+		  "FIP frame received: skb=%p fiph=%p source=%pM destn=%pM op=%x sub=%x vlan=%04x",</div><div class='add'>+		  skb, fiph, eth_hdr-&gt;h_source, eth_hdr-&gt;h_dest, op,</div><div class='add'>+		  sub, vlan);</div><div class='ctx'> 	if (qedf_dump_frames)</div><div class='ctx'> 		print_hex_dump(KERN_WARNING, "fip ", DUMP_PREFIX_OFFSET, 16, 1,</div><div class='ctx'> 		    skb-&gt;data, skb-&gt;len, false);</div><div class='ctx'> </div><div class='add'>+	if (!ether_addr_equal(eth_hdr-&gt;h_dest, qedf-&gt;mac) &amp;&amp;</div><div class='add'>+	    !ether_addr_equal(eth_hdr-&gt;h_dest, fcoe_all_enode) &amp;&amp;</div><div class='add'>+		!ether_addr_equal(eth_hdr-&gt;h_dest, qedf-&gt;data_src_addr)) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_LL2,</div><div class='add'>+			  "Dropping FIP type 0x%x pkt due to destination MAC mismatch dest_mac=%pM ctlr.dest_addr=%pM data_src_addr=%pM.\n",</div><div class='add'>+			  op, eth_hdr-&gt;h_dest, qedf-&gt;mac,</div><div class='add'>+			  qedf-&gt;data_src_addr);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Handle FIP VLAN resp in the driver */</div><div class='ctx'> 	if (op == FIP_OP_VLAN &amp;&amp; sub == FIP_SC_VL_NOTE) {</div><div class='ctx'> 		qedf_fcoe_process_vlan_resp(qedf, skb);</div><div class='hunk'>@@ -199,25 +235,36 @@ void qedf_fip_recv(struct qedf_ctx *qedf, struct sk_buff *skb)</div><div class='ctx'> 			switch (desc-&gt;fip_dtype) {</div><div class='ctx'> 			case FIP_DT_MAC:</div><div class='ctx'> 				mp = (struct fip_mac_desc *)desc;</div><div class='del'>-				QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_LL2,</div><div class='del'>-				    "fd_mac=%pM\n", mp-&gt;fd_mac);</div><div class='add'>+				QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+					  "Switch fd_mac=%pM.\n", mp-&gt;fd_mac);</div><div class='ctx'> 				if (ether_addr_equal(mp-&gt;fd_mac,</div><div class='ctx'> 				    qedf-&gt;ctlr.sel_fcf-&gt;fcf_mac))</div><div class='del'>-					do_reset = true;</div><div class='add'>+					fcf_valid = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case FIP_DT_NAME:</div><div class='ctx'> 				wp = (struct fip_wwn_desc *)desc;</div><div class='del'>-				QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_LL2,</div><div class='del'>-				    "fc_wwpn=%016llx.\n",</div><div class='del'>-				    get_unaligned_be64(&amp;wp-&gt;fd_wwn));</div><div class='add'>+				switch_name = get_unaligned_be64(&amp;wp-&gt;fd_wwn);</div><div class='add'>+				QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+					  "Switch fd_wwn=%016llx fcf_switch_name=%016llx.\n",</div><div class='add'>+					  switch_name,</div><div class='add'>+					  qedf-&gt;ctlr.sel_fcf-&gt;switch_name);</div><div class='add'>+				if (switch_name ==</div><div class='add'>+				    qedf-&gt;ctlr.sel_fcf-&gt;switch_name)</div><div class='add'>+					fc_wwpn_valid = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case FIP_DT_VN_ID:</div><div class='ctx'> 				vp = (struct fip_vn_desc *)desc;</div><div class='del'>-				QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_LL2,</div><div class='del'>-				    "fd_fc_id=%x.\n", ntoh24(vp-&gt;fd_fc_id));</div><div class='del'>-				if (ntoh24(vp-&gt;fd_fc_id) ==</div><div class='add'>+				QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+					  "vx_port fd_fc_id=%x fd_mac=%pM.\n",</div><div class='add'>+					  ntoh24(vp-&gt;fd_fc_id), vp-&gt;fd_mac);</div><div class='add'>+				/* Check vx_port fabric ID */</div><div class='add'>+				if (ntoh24(vp-&gt;fd_fc_id) !=</div><div class='ctx'> 				    qedf-&gt;lport-&gt;port_id)</div><div class='del'>-					do_reset = true;</div><div class='add'>+					fabric_id_valid = false;</div><div class='add'>+				/* Check vx_port MAC */</div><div class='add'>+				if (!ether_addr_equal(vp-&gt;fd_mac,</div><div class='add'>+						      qedf-&gt;data_src_addr))</div><div class='add'>+					fabric_id_valid = false;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				/* Ignore anything else */</div><div class='hunk'>@@ -227,13 +274,11 @@ void qedf_fip_recv(struct qedf_ctx *qedf, struct sk_buff *skb)</div><div class='ctx'> 			rlen -= dlen;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_LL2,</div><div class='del'>-		    "do_reset=%d.\n", do_reset);</div><div class='del'>-		if (do_reset) {</div><div class='del'>-			fcoe_ctlr_link_down(&amp;qedf-&gt;ctlr);</div><div class='del'>-			qedf_wait_for_upload(qedf);</div><div class='del'>-			fcoe_ctlr_link_up(&amp;qedf-&gt;ctlr);</div><div class='del'>-		}</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+			  "fcf_valid=%d fabric_id_valid=%d fc_wwpn_valid=%d.\n",</div><div class='add'>+			  fcf_valid, fabric_id_valid, fc_wwpn_valid);</div><div class='add'>+		if (fcf_valid &amp;&amp; fabric_id_valid &amp;&amp; fc_wwpn_valid)</div><div class='add'>+			qedf_ctx_soft_reset(qedf-&gt;lport);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Everything else is handled by libfcoe */</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c<br/>index 6ca583bdde23..42f9f2a9d8ea 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_io.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_io.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_io.c</a></div><div class='hunk'>@@ -43,8 +43,9 @@ static void qedf_cmd_timeout(struct work_struct *work)</div><div class='ctx'> 	switch (io_req-&gt;cmd_type) {</div><div class='ctx'> 	case QEDF_ABTS:</div><div class='ctx'> 		if (qedf == NULL) {</div><div class='del'>-			QEDF_INFO(NULL, QEDF_LOG_IO, "qedf is NULL for xid=0x%x.\n",</div><div class='del'>-			    io_req-&gt;xid);</div><div class='add'>+			QEDF_INFO(NULL, QEDF_LOG_IO,</div><div class='add'>+				  "qedf is NULL for ABTS xid=0x%x.\n",</div><div class='add'>+				  io_req-&gt;xid);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -61,6 +62,9 @@ static void qedf_cmd_timeout(struct work_struct *work)</div><div class='ctx'> 		 */</div><div class='ctx'> 		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='ctx'> </div><div class='add'>+		/* Clear in abort bit now that we're done with the command */</div><div class='add'>+		clear_bit(QEDF_CMD_IN_ABORT, &amp;io_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Now that the original I/O and the ABTS are complete see</div><div class='ctx'> 		 * if we need to reconnect to the target.</div><div class='hunk'>@@ -68,6 +72,15 @@ static void qedf_cmd_timeout(struct work_struct *work)</div><div class='ctx'> 		qedf_restart_rport(fcport);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QEDF_ELS:</div><div class='add'>+		if (!qedf) {</div><div class='add'>+			QEDF_INFO(NULL, QEDF_LOG_IO,</div><div class='add'>+				  "qedf is NULL for ELS xid=0x%x.\n",</div><div class='add'>+				  io_req-&gt;xid);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/* ELS request no longer outstanding since it timed out */</div><div class='add'>+		clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 		kref_get(&amp;io_req-&gt;refcount);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Don't attempt to clean an ELS timeout as any subseqeunt</div><div class='hunk'>@@ -103,7 +116,7 @@ void qedf_cmd_mgr_free(struct qedf_cmd_mgr *cmgr)</div><div class='ctx'> 	struct io_bdt *bdt_info;</div><div class='ctx'> 	struct qedf_ctx *qedf = cmgr-&gt;qedf;</div><div class='ctx'> 	size_t bd_tbl_sz;</div><div class='del'>-	u16 min_xid = QEDF_MIN_XID;</div><div class='add'>+	u16 min_xid = 0;</div><div class='ctx'> 	u16 max_xid = (FCOE_PARAMS_NUM_TASKS - 1);</div><div class='ctx'> 	int num_ios;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -157,6 +170,7 @@ static void qedf_handle_rrq(struct work_struct *work)</div><div class='ctx'> 	struct qedf_ioreq *io_req =</div><div class='ctx'> 	    container_of(work, struct qedf_ioreq, rrq_work.work);</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;io_req-&gt;state, QEDFC_CMD_ST_RRQ_ACTIVE);</div><div class='ctx'> 	qedf_send_rrq(io_req);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -169,7 +183,7 @@ struct qedf_cmd_mgr *qedf_cmd_mgr_alloc(struct qedf_ctx *qedf)</div><div class='ctx'> 	u16 xid;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int num_ios;</div><div class='del'>-	u16 min_xid = QEDF_MIN_XID;</div><div class='add'>+	u16 min_xid = 0;</div><div class='ctx'> 	u16 max_xid = (FCOE_PARAMS_NUM_TASKS - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure num_queues is already set before calling this function */</div><div class='hunk'>@@ -201,7 +215,7 @@ struct qedf_cmd_mgr *qedf_cmd_mgr_alloc(struct qedf_ctx *qedf)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize I/O request fields.</div><div class='ctx'> 	 */</div><div class='del'>-	xid = QEDF_MIN_XID;</div><div class='add'>+	xid = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_ios; i++) {</div><div class='ctx'> 		io_req = &amp;cmgr-&gt;cmds[i];</div><div class='hunk'>@@ -329,7 +343,7 @@ struct qedf_ioreq *qedf_alloc_cmd(struct qedf_rport *fcport, u8 cmd_type)</div><div class='ctx'> 			cmd_mgr-&gt;idx = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Check to make sure command was previously freed */</div><div class='del'>-		if (!test_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags))</div><div class='add'>+		if (!io_req-&gt;alloc)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -338,7 +352,14 @@ struct qedf_ioreq *qedf_alloc_cmd(struct qedf_rport *fcport, u8 cmd_type)</div><div class='ctx'> 		goto out_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+	if (test_bit(QEDF_CMD_DIRTY, &amp;io_req-&gt;flags))</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "io_req found to be dirty ox_id = 0x%x.\n",</div><div class='add'>+			 io_req-&gt;xid);</div><div class='add'>+</div><div class='add'>+	/* Clear any flags now that we've reallocated the xid */</div><div class='add'>+	io_req-&gt;flags = 0;</div><div class='add'>+	io_req-&gt;alloc = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cmd_mgr-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;fcport-&gt;num_active_ios);</div><div class='hunk'>@@ -349,8 +370,13 @@ struct qedf_ioreq *qedf_alloc_cmd(struct qedf_rport *fcport, u8 cmd_type)</div><div class='ctx'> 	io_req-&gt;cmd_mgr = cmd_mgr;</div><div class='ctx'> 	io_req-&gt;fcport = fcport;</div><div class='ctx'> </div><div class='add'>+	/* Clear any stale sc_cmd back pointer */</div><div class='add'>+	io_req-&gt;sc_cmd = NULL;</div><div class='add'>+	io_req-&gt;lun = -1;</div><div class='add'>+</div><div class='ctx'> 	/* Hold the io_req against deletion */</div><div class='del'>-	kref_init(&amp;io_req-&gt;refcount);</div><div class='add'>+	kref_init(&amp;io_req-&gt;refcount);	/* ID: 001 */</div><div class='add'>+	atomic_set(&amp;io_req-&gt;state, QEDFC_CMD_ST_IO_ACTIVE);</div><div class='ctx'> </div><div class='ctx'> 	/* Bind io_bdt for this io_req */</div><div class='ctx'> 	/* Have a static link between io_req and io_bdt_pool */</div><div class='hunk'>@@ -412,6 +438,10 @@ void qedf_release_cmd(struct kref *ref)</div><div class='ctx'> 	    container_of(ref, struct qedf_ioreq, refcount);</div><div class='ctx'> 	struct qedf_cmd_mgr *cmd_mgr = io_req-&gt;cmd_mgr;</div><div class='ctx'> 	struct qedf_rport *fcport = io_req-&gt;fcport;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (io_req-&gt;cmd_type == QEDF_SCSI_CMD)</div><div class='add'>+		WARN_ON(io_req-&gt;sc_cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (io_req-&gt;cmd_type == QEDF_ELS ||</div><div class='ctx'> 	    io_req-&gt;cmd_type == QEDF_TASK_MGMT_CMD)</div><div class='hunk'>@@ -419,36 +449,20 @@ void qedf_release_cmd(struct kref *ref)</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;cmd_mgr-&gt;free_list_cnt);</div><div class='ctx'> 	atomic_dec(&amp;fcport-&gt;num_active_ios);</div><div class='add'>+	atomic_set(&amp;io_req-&gt;state, QEDF_CMD_ST_INACTIVE);</div><div class='ctx'> 	if (atomic_read(&amp;fcport-&gt;num_active_ios) &lt; 0)</div><div class='ctx'> 		QEDF_WARN(&amp;(fcport-&gt;qedf-&gt;dbg_ctx), "active_ios &lt; 0.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Increment task retry identifier now that the request is released */</div><div class='ctx'> 	io_req-&gt;task_retry_identifier++;</div><div class='add'>+	io_req-&gt;fcport = NULL;</div><div class='ctx'> </div><div class='del'>-	clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qedf_split_bd(struct qedf_ioreq *io_req, u64 addr, int sg_len,</div><div class='del'>-	int bd_index)</div><div class='del'>-{</div><div class='del'>-	struct scsi_sge *bd = io_req-&gt;bd_tbl-&gt;bd_tbl;</div><div class='del'>-	int frag_size, sg_frags;</div><div class='del'>-</div><div class='del'>-	sg_frags = 0;</div><div class='del'>-	while (sg_len) {</div><div class='del'>-		if (sg_len &gt; QEDF_BD_SPLIT_SZ)</div><div class='del'>-			frag_size = QEDF_BD_SPLIT_SZ;</div><div class='del'>-		else</div><div class='del'>-			frag_size = sg_len;</div><div class='del'>-		bd[bd_index + sg_frags].sge_addr.lo = U64_LO(addr);</div><div class='del'>-		bd[bd_index + sg_frags].sge_addr.hi = U64_HI(addr);</div><div class='del'>-		bd[bd_index + sg_frags].sge_len = (uint16_t)frag_size;</div><div class='del'>-</div><div class='del'>-		addr += (u64)frag_size;</div><div class='del'>-		sg_frags++;</div><div class='del'>-		sg_len -= frag_size;</div><div class='del'>-	}</div><div class='del'>-	return sg_frags;</div><div class='add'>+	clear_bit(QEDF_CMD_DIRTY, &amp;io_req-&gt;flags);</div><div class='add'>+	io_req-&gt;cpu = 0;</div><div class='add'>+	spin_lock_irqsave(&amp;cmd_mgr-&gt;lock, flags);</div><div class='add'>+	io_req-&gt;fcport = NULL;</div><div class='add'>+	io_req-&gt;alloc = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;cmd_mgr-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qedf_map_sg(struct qedf_ioreq *io_req)</div><div class='hunk'>@@ -462,75 +476,45 @@ static int qedf_map_sg(struct qedf_ioreq *io_req)</div><div class='ctx'> 	int byte_count = 0;</div><div class='ctx'> 	int sg_count = 0;</div><div class='ctx'> 	int bd_count = 0;</div><div class='del'>-	int sg_frags;</div><div class='del'>-	unsigned int sg_len;</div><div class='add'>+	u32 sg_len;</div><div class='ctx'> 	u64 addr, end_addr;</div><div class='del'>-	int i;</div><div class='add'>+	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	sg_count = dma_map_sg(&amp;qedf-&gt;pdev-&gt;dev, scsi_sglist(sc),</div><div class='ctx'> 	    scsi_sg_count(sc), sc-&gt;sc_data_direction);</div><div class='del'>-</div><div class='ctx'> 	sg = scsi_sglist(sc);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * New condition to send single SGE as cached-SGL with length less</div><div class='del'>-	 * than 64k.</div><div class='del'>-	 */</div><div class='del'>-	if ((sg_count == 1) &amp;&amp; (sg_dma_len(sg) &lt;=</div><div class='del'>-	    QEDF_MAX_SGLEN_FOR_CACHESGL)) {</div><div class='del'>-		sg_len = sg_dma_len(sg);</div><div class='del'>-		addr = (u64)sg_dma_address(sg);</div><div class='del'>-</div><div class='del'>-		bd[bd_count].sge_addr.lo = (addr &amp; 0xffffffff);</div><div class='del'>-		bd[bd_count].sge_addr.hi = (addr &gt;&gt; 32);</div><div class='del'>-		bd[bd_count].sge_len = (u16)sg_len;</div><div class='add'>+	io_req-&gt;sge_type = QEDF_IOREQ_UNKNOWN_SGE;</div><div class='ctx'> </div><div class='del'>-		return ++bd_count;</div><div class='del'>-	}</div><div class='add'>+	if (sg_count &lt;= 8 || io_req-&gt;io_req_flags == QEDF_READ)</div><div class='add'>+		io_req-&gt;sge_type = QEDF_IOREQ_FAST_SGE;</div><div class='ctx'> </div><div class='ctx'> 	scsi_for_each_sg(sc, sg, sg_count, i) {</div><div class='del'>-		sg_len = sg_dma_len(sg);</div><div class='add'>+		sg_len = (u32)sg_dma_len(sg);</div><div class='ctx'> 		addr = (u64)sg_dma_address(sg);</div><div class='ctx'> 		end_addr = (u64)(addr + sg_len);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * First s/g element in the list so check if the end_addr</div><div class='del'>-		 * is paged aligned. Also check to make sure the length is</div><div class='del'>-		 * at least page size.</div><div class='del'>-		 */</div><div class='del'>-		if ((i == 0) &amp;&amp; (sg_count &gt; 1) &amp;&amp;</div><div class='del'>-		    ((end_addr % QEDF_PAGE_SIZE) ||</div><div class='del'>-		    sg_len &lt; QEDF_PAGE_SIZE))</div><div class='del'>-			io_req-&gt;use_slowpath = true;</div><div class='del'>-		/*</div><div class='del'>-		 * Last s/g element so check if the start address is paged</div><div class='del'>-		 * aligned.</div><div class='del'>-		 */</div><div class='del'>-		else if ((i == (sg_count - 1)) &amp;&amp; (sg_count &gt; 1) &amp;&amp;</div><div class='del'>-		    (addr % QEDF_PAGE_SIZE))</div><div class='del'>-			io_req-&gt;use_slowpath = true;</div><div class='del'>-		/*</div><div class='ctx'> 		 * Intermediate s/g element so check if start and end address</div><div class='del'>-		 * is page aligned.</div><div class='add'>+		 * is page aligned.  Only required for writes and only if the</div><div class='add'>+		 * number of scatter/gather elements is 8 or more.</div><div class='ctx'> 		 */</div><div class='del'>-		else if ((i != 0) &amp;&amp; (i != (sg_count - 1)) &amp;&amp;</div><div class='del'>-		    ((addr % QEDF_PAGE_SIZE) || (end_addr % QEDF_PAGE_SIZE)))</div><div class='del'>-			io_req-&gt;use_slowpath = true;</div><div class='add'>+		if (io_req-&gt;sge_type == QEDF_IOREQ_UNKNOWN_SGE &amp;&amp; (i) &amp;&amp;</div><div class='add'>+		    (i != (sg_count - 1)) &amp;&amp; sg_len &lt; QEDF_PAGE_SIZE)</div><div class='add'>+			io_req-&gt;sge_type = QEDF_IOREQ_SLOW_SGE;</div><div class='ctx'> </div><div class='del'>-		if (sg_len &gt; QEDF_MAX_BD_LEN) {</div><div class='del'>-			sg_frags = qedf_split_bd(io_req, addr, sg_len,</div><div class='del'>-			    bd_count);</div><div class='del'>-		} else {</div><div class='del'>-			sg_frags = 1;</div><div class='del'>-			bd[bd_count].sge_addr.lo = U64_LO(addr);</div><div class='del'>-			bd[bd_count].sge_addr.hi  = U64_HI(addr);</div><div class='del'>-			bd[bd_count].sge_len = (uint16_t)sg_len;</div><div class='del'>-		}</div><div class='add'>+		bd[bd_count].sge_addr.lo = cpu_to_le32(U64_LO(addr));</div><div class='add'>+		bd[bd_count].sge_addr.hi  = cpu_to_le32(U64_HI(addr));</div><div class='add'>+		bd[bd_count].sge_len = cpu_to_le32(sg_len);</div><div class='ctx'> </div><div class='del'>-		bd_count += sg_frags;</div><div class='add'>+		bd_count++;</div><div class='ctx'> 		byte_count += sg_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* To catch a case where FAST and SLOW nothing is set, set FAST */</div><div class='add'>+	if (io_req-&gt;sge_type == QEDF_IOREQ_UNKNOWN_SGE)</div><div class='add'>+		io_req-&gt;sge_type = QEDF_IOREQ_FAST_SGE;</div><div class='add'>+</div><div class='ctx'> 	if (byte_count != scsi_bufflen(sc))</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "byte_count = %d != "</div><div class='ctx'> 			  "scsi_bufflen = %d, task_id = 0x%x.\n", byte_count,</div><div class='hunk'>@@ -655,8 +639,10 @@ static void  qedf_init_task(struct qedf_rport *fcport, struct fc_lport *lport,</div><div class='ctx'> 		io_req-&gt;sgl_task_params-&gt;num_sges = bd_count;</div><div class='ctx'> 		io_req-&gt;sgl_task_params-&gt;total_buffer_size =</div><div class='ctx'> 		    scsi_bufflen(io_req-&gt;sc_cmd);</div><div class='del'>-		io_req-&gt;sgl_task_params-&gt;small_mid_sge =</div><div class='del'>-			io_req-&gt;use_slowpath;</div><div class='add'>+		if (io_req-&gt;sge_type == QEDF_IOREQ_SLOW_SGE)</div><div class='add'>+			io_req-&gt;sgl_task_params-&gt;small_mid_sge = 1;</div><div class='add'>+		else</div><div class='add'>+			io_req-&gt;sgl_task_params-&gt;small_mid_sge = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in physical address of sense buffer */</div><div class='hunk'>@@ -679,16 +665,10 @@ static void  qedf_init_task(struct qedf_rport *fcport, struct fc_lport *lport,</div><div class='ctx'> 				    io_req-&gt;task_retry_identifier, fcp_cmnd);</div><div class='ctx'> </div><div class='ctx'> 	/* Increment SGL type counters */</div><div class='del'>-	if (bd_count == 1) {</div><div class='del'>-		qedf-&gt;single_sge_ios++;</div><div class='del'>-		io_req-&gt;sge_type = QEDF_IOREQ_SINGLE_SGE;</div><div class='del'>-	} else if (io_req-&gt;use_slowpath) {</div><div class='add'>+	if (io_req-&gt;sge_type == QEDF_IOREQ_SLOW_SGE)</div><div class='ctx'> 		qedf-&gt;slow_sge_ios++;</div><div class='del'>-		io_req-&gt;sge_type = QEDF_IOREQ_SLOW_SGE;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		qedf-&gt;fast_sge_ios++;</div><div class='del'>-		io_req-&gt;sge_type = QEDF_IOREQ_FAST_SGE;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void qedf_init_mp_task(struct qedf_ioreq *io_req,</div><div class='hunk'>@@ -770,9 +750,6 @@ void qedf_init_mp_task(struct qedf_ioreq *io_req,</div><div class='ctx'> 						     &amp;task_fc_hdr,</div><div class='ctx'> 						     &amp;tx_sgl_task_params,</div><div class='ctx'> 						     &amp;rx_sgl_task_params, 0);</div><div class='del'>-</div><div class='del'>-	/* Midpath requests always consume 1 SGE */</div><div class='del'>-	qedf-&gt;single_sge_ios++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Presumed that fcport-&gt;rport_lock is held */</div><div class='hunk'>@@ -804,10 +781,18 @@ void qedf_ring_doorbell(struct qedf_rport *fcport)</div><div class='ctx'> 	    FCOE_DB_DATA_AGG_VAL_SEL_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	dbell.sq_prod = fcport-&gt;fw_sq_prod_idx;</div><div class='add'>+	/* wmb makes sure that the BDs data is updated before updating the</div><div class='add'>+	 * producer, otherwise FW may read old data from the BDs.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	barrier();</div><div class='ctx'> 	writel(*(u32 *)&amp;dbell, fcport-&gt;p_doorbell);</div><div class='del'>-	/* Make sure SQ index is updated so f/w prcesses requests in order */</div><div class='add'>+	/*</div><div class='add'>+	 * Fence required to flush the write combined buffer, since another</div><div class='add'>+	 * CPU may write to the same doorbell address and data may be lost</div><div class='add'>+	 * due to relaxed order nature of write combined bar.</div><div class='add'>+	 */</div><div class='ctx'> 	wmb();</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qedf_trace_io(struct qedf_rport *fcport, struct qedf_ioreq *io_req,</div><div class='hunk'>@@ -872,7 +857,7 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)</div><div class='ctx'> 	/* Initialize rest of io_req fileds */</div><div class='ctx'> 	io_req-&gt;data_xfer_len = scsi_bufflen(sc_cmd);</div><div class='ctx'> 	sc_cmd-&gt;SCp.ptr = (char *)io_req;</div><div class='del'>-	io_req-&gt;use_slowpath = false; /* Assume fast SGL by default */</div><div class='add'>+	io_req-&gt;sge_type = QEDF_IOREQ_FAST_SGE; /* Assume fast SGL by default */</div><div class='ctx'> </div><div class='ctx'> 	/* Record which cpu this request is associated with */</div><div class='ctx'> 	io_req-&gt;cpu = smp_processor_id();</div><div class='hunk'>@@ -895,15 +880,24 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)</div><div class='ctx'> 	/* Build buffer descriptor list for firmware from sg list */</div><div class='ctx'> 	if (qedf_build_bd_list_from_sg(io_req)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "BD list creation failed.\n");</div><div class='add'>+		/* Release cmd will release io_req, but sc_cmd is assigned */</div><div class='add'>+		io_req-&gt;sc_cmd = NULL;</div><div class='ctx'> 		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags)) {</div><div class='add'>+	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags) ||</div><div class='add'>+	    test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "Session not offloaded yet.\n");</div><div class='add'>+		/* Release cmd will release io_req, but sc_cmd is assigned */</div><div class='add'>+		io_req-&gt;sc_cmd = NULL;</div><div class='ctx'> 		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Record LUN number for later use if we neeed them */</div><div class='add'>+	io_req-&gt;lun = (int)sc_cmd-&gt;device-&gt;lun;</div><div class='add'>+</div><div class='ctx'> 	/* Obtain free SQE */</div><div class='ctx'> 	sqe_idx = qedf_get_sqe_idx(fcport);</div><div class='ctx'> 	sqe = &amp;fcport-&gt;sq[sqe_idx];</div><div class='hunk'>@@ -914,6 +908,8 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)</div><div class='ctx'> 	if (!task_ctx) {</div><div class='ctx'> 		QEDF_WARN(&amp;(qedf-&gt;dbg_ctx), "task_ctx is NULL, xid=%d.\n",</div><div class='ctx'> 			   xid);</div><div class='add'>+		/* Release cmd will release io_req, but sc_cmd is assigned */</div><div class='add'>+		io_req-&gt;sc_cmd = NULL;</div><div class='ctx'> 		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -923,6 +919,9 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)</div><div class='ctx'> 	/* Ring doorbell */</div><div class='ctx'> 	qedf_ring_doorbell(fcport);</div><div class='ctx'> </div><div class='add'>+	/* Set that command is with the firmware now */</div><div class='add'>+	set_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	if (qedf_io_tracing &amp;&amp; io_req-&gt;sc_cmd)</div><div class='ctx'> 		qedf_trace_io(fcport, io_req, QEDF_IO_TRACE_REQ);</div><div class='ctx'> </div><div class='hunk'>@@ -941,7 +940,17 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int rval;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='del'>-</div><div class='add'>+	int num_sgs = 0;</div><div class='add'>+</div><div class='add'>+	num_sgs = scsi_sg_count(sc_cmd);</div><div class='add'>+	if (scsi_sg_count(sc_cmd) &gt; QEDF_MAX_BDS_PER_CMD) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Number of SG elements %d exceeds what hardware limitation of %d.\n",</div><div class='add'>+			 num_sgs, QEDF_MAX_BDS_PER_CMD);</div><div class='add'>+		sc_cmd-&gt;result = DID_ERROR;</div><div class='add'>+		sc_cmd-&gt;scsi_done(sc_cmd);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(QEDF_UNLOADING, &amp;qedf-&gt;flags) ||</div><div class='ctx'> 	    test_bit(QEDF_DBG_STOP_IO, &amp;qedf-&gt;flags)) {</div><div class='hunk'>@@ -981,7 +990,8 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 	/* rport and tgt are allocated together, so tgt should be non-NULL */</div><div class='ctx'> 	fcport = (struct qedf_rport *)&amp;rp[1];</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags)) {</div><div class='add'>+	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags) ||</div><div class='add'>+	    test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Session is not offloaded yet. Let SCSI-ml retry</div><div class='ctx'> 		 * the command.</div><div class='hunk'>@@ -989,12 +999,16 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 		rc = SCSI_MLQUEUE_TARGET_BUSY;</div><div class='ctx'> 		goto exit_qcmd;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;fcport-&gt;ios_to_queue);</div><div class='add'>+</div><div class='ctx'> 	if (fcport-&gt;retry_delay_timestamp) {</div><div class='ctx'> 		if (time_after(jiffies, fcport-&gt;retry_delay_timestamp)) {</div><div class='ctx'> 			fcport-&gt;retry_delay_timestamp = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* If retry_delay timer is active, flow off the ML */</div><div class='ctx'> 			rc = SCSI_MLQUEUE_TARGET_BUSY;</div><div class='add'>+			atomic_dec(&amp;fcport-&gt;ios_to_queue);</div><div class='ctx'> 			goto exit_qcmd;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1002,6 +1016,7 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 	io_req = qedf_alloc_cmd(fcport, QEDF_SCSI_CMD);</div><div class='ctx'> 	if (!io_req) {</div><div class='ctx'> 		rc = SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+		atomic_dec(&amp;fcport-&gt;ios_to_queue);</div><div class='ctx'> 		goto exit_qcmd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1016,6 +1031,7 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 		rc = SCSI_MLQUEUE_HOST_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='add'>+	atomic_dec(&amp;fcport-&gt;ios_to_queue);</div><div class='ctx'> </div><div class='ctx'> exit_qcmd:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1092,7 +1108,7 @@ static void qedf_unmap_sg_list(struct qedf_ctx *qedf, struct qedf_ioreq *io_req)</div><div class='ctx'> void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> 	struct qedf_ioreq *io_req)</div><div class='ctx'> {</div><div class='del'>-	u16 xid, rval;</div><div class='add'>+	u16 xid;</div><div class='ctx'> 	struct e4_fcoe_task_context *task_ctx;</div><div class='ctx'> 	struct scsi_cmnd *sc_cmd;</div><div class='ctx'> 	struct fcoe_cqe_rsp_info *fcp_rsp;</div><div class='hunk'>@@ -1106,6 +1122,15 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> 	if (!cqe)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!test_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags) ||</div><div class='add'>+	    test_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags) ||</div><div class='add'>+	    test_bit(QEDF_CMD_IN_ABORT, &amp;io_req-&gt;flags)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "io_req xid=0x%x already in cleanup or abort processing or already completed.\n",</div><div class='add'>+			 io_req-&gt;xid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	xid = io_req-&gt;xid;</div><div class='ctx'> 	task_ctx = qedf_get_task_mem(&amp;qedf-&gt;tasks, xid);</div><div class='ctx'> 	sc_cmd = io_req-&gt;sc_cmd;</div><div class='hunk'>@@ -1122,6 +1147,12 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!sc_cmd-&gt;device) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Device for sc_cmd %p is NULL.\n", sc_cmd);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!sc_cmd-&gt;request) {</div><div class='ctx'> 		QEDF_WARN(&amp;(qedf-&gt;dbg_ctx), "sc_cmd-&gt;request is NULL, "</div><div class='ctx'> 		    "sc_cmd=%p.\n", sc_cmd);</div><div class='hunk'>@@ -1136,6 +1167,19 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> </div><div class='ctx'> 	fcport = io_req-&gt;fcport;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * When flush is active, let the cmds be completed from the cleanup</div><div class='add'>+	 * context</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(QEDF_RPORT_IN_TARGET_RESET, &amp;fcport-&gt;flags) ||</div><div class='add'>+	    (test_bit(QEDF_RPORT_IN_LUN_RESET, &amp;fcport-&gt;flags) &amp;&amp;</div><div class='add'>+	     sc_cmd-&gt;device-&gt;lun == (u64)fcport-&gt;lun_reset_lun)) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+			  "Dropping good completion xid=0x%x as fcport is flushing",</div><div class='add'>+			  io_req-&gt;xid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	qedf_parse_fcp_rsp(io_req, fcp_rsp);</div><div class='ctx'> </div><div class='ctx'> 	qedf_unmap_sg_list(qedf, io_req);</div><div class='hunk'>@@ -1153,25 +1197,18 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> 	fw_residual_flag = GET_FIELD(cqe-&gt;cqe_info.rsp_info.fw_error_flags,</div><div class='ctx'> 	    FCOE_CQE_RSP_INFO_FW_UNDERRUN);</div><div class='ctx'> 	if (fw_residual_flag) {</div><div class='del'>-		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx),</div><div class='del'>-		    "Firmware detected underrun: xid=0x%x fcp_rsp.flags=0x%02x "</div><div class='del'>-		    "fcp_resid=%d fw_residual=0x%x.\n", io_req-&gt;xid,</div><div class='del'>-		    fcp_rsp-&gt;rsp_flags.flags, io_req-&gt;fcp_resid,</div><div class='del'>-		    cqe-&gt;cqe_info.rsp_info.fw_residual);</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Firmware detected underrun: xid=0x%x fcp_rsp.flags=0x%02x fcp_resid=%d fw_residual=0x%x lba=%02x%02x%02x%02x.\n",</div><div class='add'>+			 io_req-&gt;xid, fcp_rsp-&gt;rsp_flags.flags,</div><div class='add'>+			 io_req-&gt;fcp_resid,</div><div class='add'>+			 cqe-&gt;cqe_info.rsp_info.fw_residual, sc_cmd-&gt;cmnd[2],</div><div class='add'>+			 sc_cmd-&gt;cmnd[3], sc_cmd-&gt;cmnd[4], sc_cmd-&gt;cmnd[5]);</div><div class='ctx'> </div><div class='ctx'> 		if (io_req-&gt;cdb_status == 0)</div><div class='ctx'> 			sc_cmd-&gt;result = (DID_ERROR &lt;&lt; 16) | io_req-&gt;cdb_status;</div><div class='ctx'> 		else</div><div class='ctx'> 			sc_cmd-&gt;result = (DID_OK &lt;&lt; 16) | io_req-&gt;cdb_status;</div><div class='ctx'> </div><div class='del'>-		/* Abort the command since we did not get all the data */</div><div class='del'>-		init_completion(&amp;io_req-&gt;abts_done);</div><div class='del'>-		rval = qedf_initiate_abts(io_req, true);</div><div class='del'>-		if (rval) {</div><div class='del'>-			QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "Failed to queue ABTS.\n");</div><div class='del'>-			sc_cmd-&gt;result = (DID_ERROR &lt;&lt; 16) | io_req-&gt;cdb_status;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set resid to the whole buffer length so we won't try to resue</div><div class='ctx'> 		 * any previously data.</div><div class='hunk'>@@ -1243,6 +1280,12 @@ out:</div><div class='ctx'> 	if (qedf_io_tracing)</div><div class='ctx'> 		qedf_trace_io(fcport, io_req, QEDF_IO_TRACE_RSP);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We wait till the end of the function to clear the</div><div class='add'>+	 * outstanding bit in case we need to send an abort</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	io_req-&gt;sc_cmd = NULL;</div><div class='ctx'> 	sc_cmd-&gt;SCp.ptr =  NULL;</div><div class='ctx'> 	sc_cmd-&gt;scsi_done(sc_cmd);</div><div class='hunk'>@@ -1260,6 +1303,19 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,</div><div class='ctx'> 	if (!io_req)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (test_and_set_bit(QEDF_CMD_ERR_SCSI_DONE, &amp;io_req-&gt;flags)) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+			  "io_req:%p scsi_done handling already done\n",</div><div class='add'>+			  io_req);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We will be done with this command after this call so clear the</div><div class='add'>+	 * outstanding bit.</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	xid = io_req-&gt;xid;</div><div class='ctx'> 	sc_cmd = io_req-&gt;sc_cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -1268,12 +1324,50 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!virt_addr_valid(sc_cmd)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "sc_cmd=%p is not valid.", sc_cmd);</div><div class='add'>+		goto bad_scsi_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!sc_cmd-&gt;SCp.ptr) {</div><div class='ctx'> 		QEDF_WARN(&amp;(qedf-&gt;dbg_ctx), "SCp.ptr is NULL, returned in "</div><div class='ctx'> 		    "another context.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!sc_cmd-&gt;device) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "Device for sc_cmd %p is NULL.\n",</div><div class='add'>+			 sc_cmd);</div><div class='add'>+		goto bad_scsi_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!virt_addr_valid(sc_cmd-&gt;device)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Device pointer for sc_cmd %p is bad.\n", sc_cmd);</div><div class='add'>+		goto bad_scsi_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sc_cmd-&gt;sense_buffer) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "sc_cmd-&gt;sense_buffer for sc_cmd %p is NULL.\n",</div><div class='add'>+			 sc_cmd);</div><div class='add'>+		goto bad_scsi_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!virt_addr_valid(sc_cmd-&gt;sense_buffer)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "sc_cmd-&gt;sense_buffer for sc_cmd %p is bad.\n",</div><div class='add'>+			 sc_cmd);</div><div class='add'>+		goto bad_scsi_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sc_cmd-&gt;scsi_done) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "sc_cmd-&gt;scsi_done for sc_cmd %p is NULL.\n",</div><div class='add'>+			 sc_cmd);</div><div class='add'>+		goto bad_scsi_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	qedf_unmap_sg_list(qedf, io_req);</div><div class='ctx'> </div><div class='ctx'> 	sc_cmd-&gt;result = result &lt;&lt; 16;</div><div class='hunk'>@@ -1300,6 +1394,15 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,</div><div class='ctx'> 	sc_cmd-&gt;SCp.ptr = NULL;</div><div class='ctx'> 	sc_cmd-&gt;scsi_done(sc_cmd);</div><div class='ctx'> 	kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+bad_scsi_ptr:</div><div class='add'>+	/*</div><div class='add'>+	 * Clear the io_req-&gt;sc_cmd backpointer so we don't try to process</div><div class='add'>+	 * this again</div><div class='add'>+	 */</div><div class='add'>+	io_req-&gt;sc_cmd = NULL;</div><div class='add'>+	kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);  /* ID: 001 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1438,6 +1541,10 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)</div><div class='ctx'> 	struct qedf_ctx *qedf;</div><div class='ctx'> 	struct qedf_cmd_mgr *cmd_mgr;</div><div class='ctx'> 	int i, rc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int flush_cnt = 0;</div><div class='add'>+	int wait_cnt = 100;</div><div class='add'>+	int refcount = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!fcport)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1449,18 +1556,102 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qedf = fcport-&gt;qedf;</div><div class='add'>+</div><div class='add'>+	if (!qedf) {</div><div class='add'>+		QEDF_ERR(NULL, "qedf is NULL.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only wait for all commands to be queued in the Upload context */</div><div class='add'>+	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags) &amp;&amp;</div><div class='add'>+	    (lun == -1)) {</div><div class='add'>+		while (atomic_read(&amp;fcport-&gt;ios_to_queue)) {</div><div class='add'>+			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+				  "Waiting for %d I/Os to be queued\n",</div><div class='add'>+				  atomic_read(&amp;fcport-&gt;ios_to_queue));</div><div class='add'>+			if (wait_cnt == 0) {</div><div class='add'>+				QEDF_ERR(NULL,</div><div class='add'>+					 "%d IOs request could not be queued\n",</div><div class='add'>+					 atomic_read(&amp;fcport-&gt;ios_to_queue));</div><div class='add'>+			}</div><div class='add'>+			msleep(20);</div><div class='add'>+			wait_cnt--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cmd_mgr = qedf-&gt;cmd_mgr;</div><div class='ctx'> </div><div class='del'>-	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_IO, "Flush active i/o's.\n");</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+		  "Flush active i/o's num=0x%x fcport=0x%p port_id=0x%06x scsi_id=%d.\n",</div><div class='add'>+		  atomic_read(&amp;fcport-&gt;num_active_ios), fcport,</div><div class='add'>+		  fcport-&gt;rdata-&gt;ids.port_id, fcport-&gt;rport-&gt;scsi_target_id);</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO, "Locking flush mutex.\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;qedf-&gt;flush_mutex);</div><div class='add'>+	if (lun == -1) {</div><div class='add'>+		set_bit(QEDF_RPORT_IN_TARGET_RESET, &amp;fcport-&gt;flags);</div><div class='add'>+	} else {</div><div class='add'>+		set_bit(QEDF_RPORT_IN_LUN_RESET, &amp;fcport-&gt;flags);</div><div class='add'>+		fcport-&gt;lun_reset_lun = lun;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; FCOE_PARAMS_NUM_TASKS; i++) {</div><div class='ctx'> 		io_req = &amp;cmd_mgr-&gt;cmds[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!io_req)</div><div class='ctx'> 			continue;</div><div class='add'>+		if (!io_req-&gt;fcport)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;cmd_mgr-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (io_req-&gt;alloc) {</div><div class='add'>+			if (!test_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags)) {</div><div class='add'>+				if (io_req-&gt;cmd_type == QEDF_SCSI_CMD)</div><div class='add'>+					QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+						 "Allocated but not queued, xid=0x%x\n",</div><div class='add'>+						 io_req-&gt;xid);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(&amp;cmd_mgr-&gt;lock, flags);</div><div class='add'>+		} else {</div><div class='add'>+			spin_unlock_irqrestore(&amp;cmd_mgr-&gt;lock, flags);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (io_req-&gt;fcport != fcport)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (io_req-&gt;cmd_type == QEDF_ELS) {</div><div class='add'>+</div><div class='add'>+		/* In case of ABTS, CMD_OUTSTANDING is cleared on ABTS response,</div><div class='add'>+		 * but RRQ is still pending.</div><div class='add'>+		 * Workaround: Within qedf_send_rrq, we check if the fcport is</div><div class='add'>+		 * NULL, and we drop the ref on the io_req to clean it up.</div><div class='add'>+		 */</div><div class='add'>+		if (!test_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags)) {</div><div class='add'>+			refcount = kref_read(&amp;io_req-&gt;refcount);</div><div class='add'>+			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+				  "Not outstanding, xid=0x%x, cmd_type=%d refcount=%d.\n",</div><div class='add'>+				  io_req-&gt;xid, io_req-&gt;cmd_type, refcount);</div><div class='add'>+			/* If RRQ work has been queue, try to cancel it and</div><div class='add'>+			 * free the io_req</div><div class='add'>+			 */</div><div class='add'>+			if (atomic_read(&amp;io_req-&gt;state) ==</div><div class='add'>+			    QEDFC_CMD_ST_RRQ_WAIT) {</div><div class='add'>+				if (cancel_delayed_work_sync</div><div class='add'>+				    (&amp;io_req-&gt;rrq_work)) {</div><div class='add'>+					QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+						  "Putting reference for pending RRQ work xid=0x%x.\n",</div><div class='add'>+						  io_req-&gt;xid);</div><div class='add'>+					/* ID: 003 */</div><div class='add'>+					kref_put(&amp;io_req-&gt;refcount,</div><div class='add'>+						 qedf_release_cmd);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Only consider flushing ELS during target reset */</div><div class='add'>+		if (io_req-&gt;cmd_type == QEDF_ELS &amp;&amp;</div><div class='add'>+		    lun == -1) {</div><div class='ctx'> 			rc = kref_get_unless_zero(&amp;io_req-&gt;refcount);</div><div class='ctx'> 			if (!rc) {</div><div class='ctx'> 				QEDF_ERR(&amp;(qedf-&gt;dbg_ctx),</div><div class='hunk'>@@ -1468,6 +1659,7 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)</div><div class='ctx'> 				    io_req, io_req-&gt;xid);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='add'>+			flush_cnt++;</div><div class='ctx'> 			qedf_flush_els_req(qedf, io_req);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Release the kref and go back to the top of the</div><div class='hunk'>@@ -1477,6 +1669,7 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (io_req-&gt;cmd_type == QEDF_ABTS) {</div><div class='add'>+			/* ID: 004 */</div><div class='ctx'> 			rc = kref_get_unless_zero(&amp;io_req-&gt;refcount);</div><div class='ctx'> 			if (!rc) {</div><div class='ctx'> 				QEDF_ERR(&amp;(qedf-&gt;dbg_ctx),</div><div class='hunk'>@@ -1484,28 +1677,50 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)</div><div class='ctx'> 				    io_req, io_req-&gt;xid);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='add'>+			if (lun != -1 &amp;&amp; io_req-&gt;lun != lun)</div><div class='add'>+				goto free_cmd;</div><div class='add'>+</div><div class='ctx'> 			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='ctx'> 			    "Flushing abort xid=0x%x.\n", io_req-&gt;xid);</div><div class='ctx'> </div><div class='del'>-			clear_bit(QEDF_CMD_IN_ABORT, &amp;io_req-&gt;flags);</div><div class='del'>-</div><div class='del'>-			if (io_req-&gt;sc_cmd) {</div><div class='del'>-				if (io_req-&gt;return_scsi_cmd_on_abts)</div><div class='del'>-					qedf_scsi_done(qedf, io_req, DID_ERROR);</div><div class='add'>+			if (cancel_delayed_work_sync(&amp;io_req-&gt;rrq_work)) {</div><div class='add'>+				QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+					  "Putting ref for cancelled RRQ work xid=0x%x.\n",</div><div class='add'>+					  io_req-&gt;xid);</div><div class='add'>+				kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* Notify eh_abort handler that ABTS is complete */</div><div class='del'>-			complete(&amp;io_req-&gt;abts_done);</div><div class='del'>-			kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='del'>-</div><div class='add'>+			if (cancel_delayed_work_sync(&amp;io_req-&gt;timeout_work)) {</div><div class='add'>+				QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+					  "Putting ref for cancelled tmo work xid=0x%x.\n",</div><div class='add'>+					  io_req-&gt;xid);</div><div class='add'>+				qedf_initiate_cleanup(io_req, true);</div><div class='add'>+				/* Notify eh_abort handler that ABTS is</div><div class='add'>+				 * complete</div><div class='add'>+				 */</div><div class='add'>+				complete(&amp;io_req-&gt;abts_done);</div><div class='add'>+				clear_bit(QEDF_CMD_IN_ABORT, &amp;io_req-&gt;flags);</div><div class='add'>+				/* ID: 002 */</div><div class='add'>+				kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+			}</div><div class='add'>+			flush_cnt++;</div><div class='ctx'> 			goto free_cmd;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!io_req-&gt;sc_cmd)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (lun &gt; 0) {</div><div class='del'>-			if (io_req-&gt;sc_cmd-&gt;device-&gt;lun !=</div><div class='del'>-			    (u64)lun)</div><div class='add'>+		if (!io_req-&gt;sc_cmd-&gt;device) {</div><div class='add'>+			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+				  "Device backpointer NULL for sc_cmd=%p.\n",</div><div class='add'>+				  io_req-&gt;sc_cmd);</div><div class='add'>+			/* Put reference for non-existent scsi_cmnd */</div><div class='add'>+			io_req-&gt;sc_cmd = NULL;</div><div class='add'>+			qedf_initiate_cleanup(io_req, false);</div><div class='add'>+			kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (lun &gt; -1) {</div><div class='add'>+			if (io_req-&gt;lun != lun)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1519,15 +1734,65 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun)</div><div class='ctx'> 			    "io_req=0x%p xid=0x%x\n", io_req, io_req-&gt;xid);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_IO,</div><div class='ctx'> 		    "Cleanup xid=0x%x.\n", io_req-&gt;xid);</div><div class='add'>+		flush_cnt++;</div><div class='ctx'> </div><div class='ctx'> 		/* Cleanup task and return I/O mid-layer */</div><div class='ctx'> 		qedf_initiate_cleanup(io_req, true);</div><div class='ctx'> </div><div class='ctx'> free_cmd:</div><div class='del'>-		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);	/* ID: 004 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_cnt = 60;</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+		  "Flushed 0x%x I/Os, active=0x%x.\n",</div><div class='add'>+		  flush_cnt, atomic_read(&amp;fcport-&gt;num_active_ios));</div><div class='add'>+	/* Only wait for all commands to complete in the Upload context */</div><div class='add'>+	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags) &amp;&amp;</div><div class='add'>+	    (lun == -1)) {</div><div class='add'>+		while (atomic_read(&amp;fcport-&gt;num_active_ios)) {</div><div class='add'>+			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+				  "Flushed 0x%x I/Os, active=0x%x cnt=%d.\n",</div><div class='add'>+				  flush_cnt,</div><div class='add'>+				  atomic_read(&amp;fcport-&gt;num_active_ios),</div><div class='add'>+				  wait_cnt);</div><div class='add'>+			if (wait_cnt == 0) {</div><div class='add'>+				QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+					 "Flushed %d I/Os, active=%d.\n",</div><div class='add'>+					 flush_cnt,</div><div class='add'>+					 atomic_read(&amp;fcport-&gt;num_active_ios));</div><div class='add'>+				for (i = 0; i &lt; FCOE_PARAMS_NUM_TASKS; i++) {</div><div class='add'>+					io_req = &amp;cmd_mgr-&gt;cmds[i];</div><div class='add'>+					if (io_req-&gt;fcport &amp;&amp;</div><div class='add'>+					    io_req-&gt;fcport == fcport) {</div><div class='add'>+						refcount =</div><div class='add'>+						kref_read(&amp;io_req-&gt;refcount);</div><div class='add'>+						set_bit(QEDF_CMD_DIRTY,</div><div class='add'>+							&amp;io_req-&gt;flags);</div><div class='add'>+						QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+							 "Outstanding io_req =%p xid=0x%x flags=0x%lx, sc_cmd=%p refcount=%d cmd_type=%d.\n",</div><div class='add'>+							 io_req, io_req-&gt;xid,</div><div class='add'>+							 io_req-&gt;flags,</div><div class='add'>+							 io_req-&gt;sc_cmd,</div><div class='add'>+							 refcount,</div><div class='add'>+							 io_req-&gt;cmd_type);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				WARN_ON(1);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			msleep(500);</div><div class='add'>+			wait_cnt--;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	clear_bit(QEDF_RPORT_IN_LUN_RESET, &amp;fcport-&gt;flags);</div><div class='add'>+	clear_bit(QEDF_RPORT_IN_TARGET_RESET, &amp;fcport-&gt;flags);</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO, "Unlocking flush mutex.\n");</div><div class='add'>+	mutex_unlock(&amp;qedf-&gt;flush_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1546,52 +1811,60 @@ int qedf_initiate_abts(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct fcoe_wqe *sqe;</div><div class='ctx'> 	u16 sqe_idx;</div><div class='add'>+	int refcount = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check qedf_rport before dereferencing any pointers */</div><div class='ctx'> 	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(NULL, "tgt not offloaded\n");</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto abts_err;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	qedf = fcport-&gt;qedf;</div><div class='ctx'> 	rdata = fcport-&gt;rdata;</div><div class='add'>+</div><div class='add'>+	if (!rdata || !kref_get_unless_zero(&amp;rdata-&gt;kref)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "stale rport\n");</div><div class='add'>+		rc = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r_a_tov = rdata-&gt;r_a_tov;</div><div class='del'>-	qedf = fcport-&gt;qedf;</div><div class='ctx'> 	lport = qedf-&gt;lport;</div><div class='ctx'> </div><div class='ctx'> 	if (lport-&gt;state != LPORT_ST_READY || !(lport-&gt;link_up)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "link is not ready\n");</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto abts_err;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;qedf-&gt;link_down_tmo_valid) &gt; 0) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "link_down_tmo active.\n");</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto abts_err;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure room on SQ */</div><div class='ctx'> 	if (!atomic_read(&amp;fcport-&gt;free_sqes)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "No SQ entries available\n");</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto abts_err;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "fcport is uploading.\n");</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto out;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags) ||</div><div class='ctx'> 	    test_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags) ||</div><div class='ctx'> 	    test_bit(QEDF_CMD_IN_ABORT, &amp;io_req-&gt;flags)) {</div><div class='del'>-		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "io_req xid=0x%x already in "</div><div class='del'>-			  "cleanup or abort processing or already "</div><div class='del'>-			  "completed.\n", io_req-&gt;xid);</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "io_req xid=0x%x sc_cmd=%p already in cleanup or abort processing or already completed.\n",</div><div class='add'>+			 io_req-&gt;xid, io_req-&gt;sc_cmd);</div><div class='ctx'> 		rc = 1;</div><div class='del'>-		goto out;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;io_req-&gt;refcount);</div><div class='hunk'>@@ -1600,18 +1873,17 @@ int qedf_initiate_abts(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts)</div><div class='ctx'> 	qedf-&gt;control_requests++;</div><div class='ctx'> 	qedf-&gt;packet_aborts++;</div><div class='ctx'> </div><div class='del'>-	/* Set the return CPU to be the same as the request one */</div><div class='del'>-	io_req-&gt;cpu = smp_processor_id();</div><div class='del'>-</div><div class='ctx'> 	/* Set the command type to abort */</div><div class='ctx'> 	io_req-&gt;cmd_type = QEDF_ABTS;</div><div class='ctx'> 	io_req-&gt;return_scsi_cmd_on_abts = return_scsi_cmd_on_abts;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(QEDF_CMD_IN_ABORT, &amp;io_req-&gt;flags);</div><div class='del'>-	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_SCSI_TM, "ABTS io_req xid = "</div><div class='del'>-		   "0x%x\n", xid);</div><div class='add'>+	refcount = kref_read(&amp;io_req-&gt;refcount);</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_SCSI_TM,</div><div class='add'>+		  "ABTS io_req xid = 0x%x refcount=%d\n",</div><div class='add'>+		  xid, refcount);</div><div class='ctx'> </div><div class='del'>-	qedf_cmd_timer_set(qedf, io_req, QEDF_ABORT_TIMEOUT * HZ);</div><div class='add'>+	qedf_cmd_timer_set(qedf, io_req, QEDF_ABORT_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1625,13 +1897,8 @@ int qedf_initiate_abts(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='del'>-abts_err:</div><div class='del'>-	/*</div><div class='del'>-	 * If the ABTS task fails to queue then we need to cleanup the</div><div class='del'>-	 * task at the firmware.</div><div class='del'>-	 */</div><div class='del'>-	qedf_initiate_cleanup(io_req, return_scsi_cmd_on_abts);</div><div class='add'>+drop_rdata_kref:</div><div class='add'>+	kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1641,27 +1908,62 @@ void qedf_process_abts_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t r_ctl;</div><div class='ctx'> 	uint16_t xid;</div><div class='add'>+	int rc;</div><div class='add'>+	struct qedf_rport *fcport = io_req-&gt;fcport;</div><div class='ctx'> </div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_SCSI_TM, "Entered with xid = "</div><div class='ctx'> 		   "0x%x cmd_type = %d\n", io_req-&gt;xid, io_req-&gt;cmd_type);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work(&amp;io_req-&gt;timeout_work);</div><div class='del'>-</div><div class='ctx'> 	xid = io_req-&gt;xid;</div><div class='ctx'> 	r_ctl = cqe-&gt;cqe_info.abts_info.r_ctl;</div><div class='ctx'> </div><div class='add'>+	/* This was added at a point when we were scheduling abts_compl &amp;</div><div class='add'>+	 * cleanup_compl on different CPUs and there was a possibility of</div><div class='add'>+	 * the io_req to be freed from the other context before we got here.</div><div class='add'>+	 */</div><div class='add'>+	if (!fcport) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+			  "Dropping ABTS completion xid=0x%x as fcport is NULL",</div><div class='add'>+			  io_req-&gt;xid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When flush is active, let the cmds be completed from the cleanup</div><div class='add'>+	 * context</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(QEDF_RPORT_IN_TARGET_RESET, &amp;fcport-&gt;flags) ||</div><div class='add'>+	    test_bit(QEDF_RPORT_IN_LUN_RESET, &amp;fcport-&gt;flags)) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+			  "Dropping ABTS completion xid=0x%x as fcport is flushing",</div><div class='add'>+			  io_req-&gt;xid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cancel_delayed_work(&amp;io_req-&gt;timeout_work)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Wasn't able to cancel abts timeout work.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (r_ctl) {</div><div class='ctx'> 	case FC_RCTL_BA_ACC:</div><div class='ctx'> 		QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_SCSI_TM,</div><div class='ctx'> 		    "ABTS response - ACC Send RRQ after R_A_TOV\n");</div><div class='ctx'> 		io_req-&gt;event = QEDF_IOREQ_EV_ABORT_SUCCESS;</div><div class='add'>+		rc = kref_get_unless_zero(&amp;io_req-&gt;refcount);	/* ID: 003 */</div><div class='add'>+		if (!rc) {</div><div class='add'>+			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_SCSI_TM,</div><div class='add'>+				  "kref is already zero so ABTS was already completed or flushed xid=0x%x.\n",</div><div class='add'>+				  io_req-&gt;xid);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Dont release this cmd yet. It will be relesed</div><div class='ctx'> 		 * after we get RRQ response</div><div class='ctx'> 		 */</div><div class='del'>-		kref_get(&amp;io_req-&gt;refcount);</div><div class='ctx'> 		queue_delayed_work(qedf-&gt;dpc_wq, &amp;io_req-&gt;rrq_work,</div><div class='ctx'> 		    msecs_to_jiffies(qedf-&gt;lport-&gt;r_a_tov));</div><div class='add'>+		atomic_set(&amp;io_req-&gt;state, QEDFC_CMD_ST_RRQ_WAIT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* For error cases let the cleanup return the command */</div><div class='ctx'> 	case FC_RCTL_BA_RJT:</div><div class='hunk'>@@ -1803,6 +2105,7 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct fcoe_wqe *sqe;</div><div class='ctx'> 	u16 sqe_idx;</div><div class='add'>+	int refcount = 0;</div><div class='ctx'> </div><div class='ctx'> 	fcport = io_req-&gt;fcport;</div><div class='ctx'> 	if (!fcport) {</div><div class='hunk'>@@ -1824,36 +2127,45 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags) ||</div><div class='del'>-	    test_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags)) {</div><div class='add'>+	    test_and_set_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "io_req xid=0x%x already in "</div><div class='ctx'> 			  "cleanup processing or already completed.\n",</div><div class='ctx'> 			  io_req-&gt;xid);</div><div class='ctx'> 		return SUCCESS;</div><div class='ctx'> 	}</div><div class='add'>+	set_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure room on SQ */</div><div class='ctx'> 	if (!atomic_read(&amp;fcport-&gt;free_sqes)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "No SQ entries available\n");</div><div class='add'>+		/* Need to make sure we clear the flag since it was set */</div><div class='add'>+		clear_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags);</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (io_req-&gt;cmd_type == QEDF_CLEANUP) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "io_req=0x%x is already a cleanup command cmd_type=%d.\n",</div><div class='add'>+			 io_req-&gt;xid, io_req-&gt;cmd_type);</div><div class='add'>+		clear_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags);</div><div class='add'>+		return SUCCESS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_IO, "Entered xid=0x%x\n",</div><div class='del'>-	    io_req-&gt;xid);</div><div class='add'>+	refcount = kref_read(&amp;io_req-&gt;refcount);</div><div class='add'>+</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_IO,</div><div class='add'>+		  "Entered xid=0x%x sc_cmd=%p cmd_type=%d flags=0x%lx refcount=%d fcport=%p port_id=0x%06x\n",</div><div class='add'>+		  io_req-&gt;xid, io_req-&gt;sc_cmd, io_req-&gt;cmd_type, io_req-&gt;flags,</div><div class='add'>+		  refcount, fcport, fcport-&gt;rdata-&gt;ids.port_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Cleanup cmds re-use the same TID as the original I/O */</div><div class='ctx'> 	xid = io_req-&gt;xid;</div><div class='ctx'> 	io_req-&gt;cmd_type = QEDF_CLEANUP;</div><div class='ctx'> 	io_req-&gt;return_scsi_cmd_on_abts = return_scsi_cmd_on_abts;</div><div class='ctx'> </div><div class='del'>-	/* Set the return CPU to be the same as the request one */</div><div class='del'>-	io_req-&gt;cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	set_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags);</div><div class='del'>-</div><div class='ctx'> 	task = qedf_get_task_mem(&amp;qedf-&gt;tasks, xid);</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;io_req-&gt;tm_done);</div><div class='add'>+	init_completion(&amp;io_req-&gt;cleanup_done);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1867,8 +2179,8 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> </div><div class='del'>-	tmo = wait_for_completion_timeout(&amp;io_req-&gt;tm_done,</div><div class='del'>-	    QEDF_CLEANUP_TIMEOUT * HZ);</div><div class='add'>+	tmo = wait_for_completion_timeout(&amp;io_req-&gt;cleanup_done,</div><div class='add'>+					  QEDF_CLEANUP_TIMEOUT * HZ);</div><div class='ctx'> </div><div class='ctx'> 	if (!tmo) {</div><div class='ctx'> 		rc = FAILED;</div><div class='hunk'>@@ -1881,6 +2193,16 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req,</div><div class='ctx'> 		qedf_drain_request(qedf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If it TASK MGMT handle it, reference will be decreased</div><div class='add'>+	 * in qedf_execute_tmf</div><div class='add'>+	 */</div><div class='add'>+	if (io_req-&gt;tm_flags  == FCP_TMF_LUN_RESET ||</div><div class='add'>+	    io_req-&gt;tm_flags == FCP_TMF_TGT_RESET) {</div><div class='add'>+		clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+		io_req-&gt;sc_cmd = NULL;</div><div class='add'>+		complete(&amp;io_req-&gt;tm_done);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (io_req-&gt;sc_cmd) {</div><div class='ctx'> 		if (io_req-&gt;return_scsi_cmd_on_abts)</div><div class='ctx'> 			qedf_scsi_done(qedf, io_req, DID_ERROR);</div><div class='hunk'>@@ -1903,7 +2225,7 @@ void qedf_process_cleanup_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> 	clear_bit(QEDF_CMD_IN_CLEANUP, &amp;io_req-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Complete so we can finish cleaning up the I/O */</div><div class='del'>-	complete(&amp;io_req-&gt;tm_done);</div><div class='add'>+	complete(&amp;io_req-&gt;cleanup_done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='hunk'>@@ -1916,6 +2238,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	uint16_t xid;</div><div class='ctx'> 	int tmo = 0;</div><div class='add'>+	int lun = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct fcoe_wqe *sqe;</div><div class='ctx'> 	u16 sqe_idx;</div><div class='hunk'>@@ -1925,20 +2248,18 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lun = (int)sc_cmd-&gt;device-&gt;lun;</div><div class='ctx'> 	if (!test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags)) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "fcport not offloaded\n");</div><div class='ctx'> 		rc = FAILED;</div><div class='del'>-		return FAILED;</div><div class='add'>+		goto no_flush;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_SCSI_TM, "portid = 0x%x "</div><div class='del'>-		   "tm_flags = %d\n", fcport-&gt;rdata-&gt;ids.port_id, tm_flags);</div><div class='del'>-</div><div class='ctx'> 	io_req = qedf_alloc_cmd(fcport, QEDF_TASK_MGMT_CMD);</div><div class='ctx'> 	if (!io_req) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "Failed TMF");</div><div class='ctx'> 		rc = -EAGAIN;</div><div class='del'>-		goto reset_tmf_err;</div><div class='add'>+		goto no_flush;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tm_flags == FCP_TMF_LUN_RESET)</div><div class='hunk'>@@ -1951,7 +2272,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> 	io_req-&gt;fcport = fcport;</div><div class='ctx'> 	io_req-&gt;cmd_type = QEDF_TASK_MGMT_CMD;</div><div class='ctx'> </div><div class='del'>-	/* Set the return CPU to be the same as the request one */</div><div class='add'>+	/* Record which cpu this request is associated with */</div><div class='ctx'> 	io_req-&gt;cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	/* Set TM flags */</div><div class='hunk'>@@ -1960,7 +2281,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> 	io_req-&gt;tm_flags = tm_flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Default is to return a SCSI command when an error occurs */</div><div class='del'>-	io_req-&gt;return_scsi_cmd_on_abts = true;</div><div class='add'>+	io_req-&gt;return_scsi_cmd_on_abts = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Obtain exchange id */</div><div class='ctx'> 	xid = io_req-&gt;xid;</div><div class='hunk'>@@ -1984,12 +2305,16 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> </div><div class='add'>+	set_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='ctx'> 	tmo = wait_for_completion_timeout(&amp;io_req-&gt;tm_done,</div><div class='ctx'> 	    QEDF_TM_TIMEOUT * HZ);</div><div class='ctx'> </div><div class='ctx'> 	if (!tmo) {</div><div class='ctx'> 		rc = FAILED;</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "wait for tm_cmpl timeout!\n");</div><div class='add'>+		/* Clear outstanding bit since command timed out */</div><div class='add'>+		clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+		io_req-&gt;sc_cmd = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Check TMF response code */</div><div class='ctx'> 		if (io_req-&gt;fcp_rsp_code == 0)</div><div class='hunk'>@@ -1997,14 +2322,25 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> 		else</div><div class='ctx'> 			rc = FAILED;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * Double check that fcport has not gone into an uploading state before</div><div class='add'>+	 * executing the command flush for the LUN/target.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "fcport is uploading, not executing flush.\n");</div><div class='add'>+		goto no_flush;</div><div class='add'>+	}</div><div class='add'>+	/* We do not need this io_req any more */</div><div class='add'>+	kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	if (tm_flags == FCP_TMF_LUN_RESET)</div><div class='del'>-		qedf_flush_active_ios(fcport, (int)sc_cmd-&gt;device-&gt;lun);</div><div class='add'>+		qedf_flush_active_ios(fcport, lun);</div><div class='ctx'> 	else</div><div class='ctx'> 		qedf_flush_active_ios(fcport, -1);</div><div class='ctx'> </div><div class='del'>-	kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='del'>-</div><div class='add'>+no_flush:</div><div class='ctx'> 	if (rc != SUCCESS) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "task mgmt command failed...\n");</div><div class='ctx'> 		rc = FAILED;</div><div class='hunk'>@@ -2012,7 +2348,6 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "task mgmt command success...\n");</div><div class='ctx'> 		rc = SUCCESS;</div><div class='ctx'> 	}</div><div class='del'>-reset_tmf_err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2022,26 +2357,65 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags)</div><div class='ctx'> 	struct fc_rport_libfc_priv *rp = rport-&gt;dd_data;</div><div class='ctx'> 	struct qedf_rport *fcport = (struct qedf_rport *)&amp;rp[1];</div><div class='ctx'> 	struct qedf_ctx *qedf;</div><div class='del'>-	struct fc_lport *lport;</div><div class='add'>+	struct fc_lport *lport = shost_priv(sc_cmd-&gt;device-&gt;host);</div><div class='ctx'> 	int rc = SUCCESS;</div><div class='ctx'> 	int rval;</div><div class='add'>+	struct qedf_ioreq *io_req = NULL;</div><div class='add'>+	int ref_cnt = 0;</div><div class='add'>+	struct fc_rport_priv *rdata = fcport-&gt;rdata;</div><div class='ctx'> </div><div class='del'>-	rval = fc_remote_port_chkready(rport);</div><div class='add'>+	QEDF_ERR(NULL,</div><div class='add'>+		 "tm_flags 0x%x sc_cmd %p op = 0x%02x target_id = 0x%x lun=%d\n",</div><div class='add'>+		 tm_flags, sc_cmd, sc_cmd-&gt;cmnd[0], rport-&gt;scsi_target_id,</div><div class='add'>+		 (int)sc_cmd-&gt;device-&gt;lun);</div><div class='add'>+</div><div class='add'>+	if (!rdata || !kref_get_unless_zero(&amp;rdata-&gt;kref)) {</div><div class='add'>+		QEDF_ERR(NULL, "stale rport\n");</div><div class='add'>+		return FAILED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	QEDF_ERR(NULL, "portid=%06x tm_flags =%s\n", rdata-&gt;ids.port_id,</div><div class='add'>+		 (tm_flags == FCP_TMF_TGT_RESET) ? "TARGET RESET" :</div><div class='add'>+		 "LUN RESET");</div><div class='add'>+</div><div class='add'>+	if (sc_cmd-&gt;SCp.ptr) {</div><div class='add'>+		io_req = (struct qedf_ioreq *)sc_cmd-&gt;SCp.ptr;</div><div class='add'>+		ref_cnt = kref_read(&amp;io_req-&gt;refcount);</div><div class='add'>+		QEDF_ERR(NULL,</div><div class='add'>+			 "orig io_req = %p xid = 0x%x ref_cnt = %d.\n",</div><div class='add'>+			 io_req, io_req-&gt;xid, ref_cnt);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	rval = fc_remote_port_chkready(rport);</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		QEDF_ERR(NULL, "device_reset rport not ready\n");</div><div class='ctx'> 		rc = FAILED;</div><div class='ctx'> 		goto tmf_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fcport == NULL) {</div><div class='add'>+	rc = fc_block_scsi_eh(sc_cmd);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto tmf_err;</div><div class='add'>+</div><div class='add'>+	if (!fcport) {</div><div class='ctx'> 		QEDF_ERR(NULL, "device_reset: rport is NULL\n");</div><div class='ctx'> 		rc = FAILED;</div><div class='ctx'> 		goto tmf_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qedf = fcport-&gt;qedf;</div><div class='del'>-	lport = qedf-&gt;lport;</div><div class='add'>+</div><div class='add'>+	if (!qedf) {</div><div class='add'>+		QEDF_ERR(NULL, "qedf is NULL.\n");</div><div class='add'>+		rc = FAILED;</div><div class='add'>+		goto tmf_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "Connection is getting uploaded.\n");</div><div class='add'>+		rc = SUCCESS;</div><div class='add'>+		goto tmf_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(QEDF_UNLOADING, &amp;qedf-&gt;flags) ||</div><div class='ctx'> 	    test_bit(QEDF_DBG_STOP_IO, &amp;qedf-&gt;flags)) {</div><div class='hunk'>@@ -2055,9 +2429,22 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags)</div><div class='ctx'> 		goto tmf_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='add'>+		if (!fcport-&gt;rdata)</div><div class='add'>+			QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "fcport %p is uploading.\n",</div><div class='add'>+				 fcport);</div><div class='add'>+		else</div><div class='add'>+			QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+				 "fcport %p port_id=%06x is uploading.\n",</div><div class='add'>+				 fcport, fcport-&gt;rdata-&gt;ids.port_id);</div><div class='add'>+		rc = FAILED;</div><div class='add'>+		goto tmf_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = qedf_execute_tmf(fcport, sc_cmd, tm_flags);</div><div class='ctx'> </div><div class='ctx'> tmf_err:</div><div class='add'>+	kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2066,6 +2453,8 @@ void qedf_process_tmf_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,</div><div class='ctx'> {</div><div class='ctx'> 	struct fcoe_cqe_rsp_info *fcp_rsp;</div><div class='ctx'> </div><div class='add'>+	clear_bit(QEDF_CMD_OUTSTANDING, &amp;io_req-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	fcp_rsp = &amp;cqe-&gt;cqe_info.rsp_info;</div><div class='ctx'> 	qedf_parse_fcp_rsp(io_req, fcp_rsp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c<br/>index 9f9431a4cc0e..5b07235497c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_main.c</a></div><div class='hunk'>@@ -124,21 +124,24 @@ static bool qedf_initiate_fipvlan_req(struct qedf_ctx *qedf)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;qedf-&gt;link_state) != QEDF_LINK_UP) {</div><div class='del'>-		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "Link not up.\n");</div><div class='del'>-		return  false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	while (qedf-&gt;fipvlan_retries--) {</div><div class='add'>+		/* This is to catch if link goes down during fipvlan retries */</div><div class='add'>+		if (atomic_read(&amp;qedf-&gt;link_state) == QEDF_LINK_DOWN) {</div><div class='add'>+			QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "Link not up.\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (qedf-&gt;vlan_id &gt; 0)</div><div class='ctx'> 			return true;</div><div class='add'>+</div><div class='ctx'> 		QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_DISC,</div><div class='ctx'> 			   "Retry %d.\n", qedf-&gt;fipvlan_retries);</div><div class='ctx'> 		init_completion(&amp;qedf-&gt;fipvlan_compl);</div><div class='ctx'> 		qedf_fcoe_send_vlan_req(qedf);</div><div class='ctx'> 		rc = wait_for_completion_timeout(&amp;qedf-&gt;fipvlan_compl,</div><div class='ctx'> 		    1 * HZ);</div><div class='del'>-		if (rc &gt; 0) {</div><div class='add'>+		if (rc &gt; 0 &amp;&amp;</div><div class='add'>+		    (atomic_read(&amp;qedf-&gt;link_state) == QEDF_LINK_UP)) {</div><div class='ctx'> 			fcoe_ctlr_link_up(&amp;qedf-&gt;ctlr);</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -153,12 +156,19 @@ static void qedf_handle_link_update(struct work_struct *work)</div><div class='ctx'> 	    container_of(work, struct qedf_ctx, link_update.work);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_DISC, "Entered.\n");</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC, "Entered. link_state=%d.\n",</div><div class='add'>+		  atomic_read(&amp;qedf-&gt;link_state));</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;qedf-&gt;link_state) == QEDF_LINK_UP) {</div><div class='ctx'> 		rc = qedf_initiate_fipvlan_req(qedf);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return;</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;qedf-&gt;link_state) != QEDF_LINK_UP) {</div><div class='add'>+			qedf-&gt;vlan_id = 0;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we get here then we never received a repsonse to our</div><div class='ctx'> 		 * fip vlan request so set the vlan_id to the default and</div><div class='hunk'>@@ -185,7 +195,9 @@ static void qedf_handle_link_update(struct work_struct *work)</div><div class='ctx'> 		QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_DISC,</div><div class='ctx'> 		    "Calling fcoe_ctlr_link_down().\n");</div><div class='ctx'> 		fcoe_ctlr_link_down(&amp;qedf-&gt;ctlr);</div><div class='del'>-		qedf_wait_for_upload(qedf);</div><div class='add'>+		if (qedf_wait_for_upload(qedf) == false)</div><div class='add'>+			QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+				 "Could not upload all sessions.\n");</div><div class='ctx'> 		/* Reset the number of FIP VLAN retries */</div><div class='ctx'> 		qedf-&gt;fipvlan_retries = qedf_fipvlan_retries;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -615,50 +627,113 @@ static struct scsi_transport_template *qedf_fc_vport_transport_template;</div><div class='ctx'> static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd-&gt;device));</div><div class='del'>-	struct fc_rport_libfc_priv *rp = rport-&gt;dd_data;</div><div class='del'>-	struct qedf_rport *fcport;</div><div class='ctx'> 	struct fc_lport *lport;</div><div class='ctx'> 	struct qedf_ctx *qedf;</div><div class='ctx'> 	struct qedf_ioreq *io_req;</div><div class='add'>+	struct fc_rport_libfc_priv *rp = rport-&gt;dd_data;</div><div class='add'>+	struct fc_rport_priv *rdata;</div><div class='add'>+	struct qedf_rport *fcport = NULL;</div><div class='ctx'> 	int rc = FAILED;</div><div class='add'>+	int wait_count = 100;</div><div class='add'>+	int refcount = 0;</div><div class='ctx'> 	int rval;</div><div class='del'>-</div><div class='del'>-	if (fc_remote_port_chkready(rport)) {</div><div class='del'>-		QEDF_ERR(NULL, "rport not ready\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	int got_ref = 0;</div><div class='ctx'> </div><div class='ctx'> 	lport = shost_priv(sc_cmd-&gt;device-&gt;host);</div><div class='ctx'> 	qedf = (struct qedf_ctx *)lport_priv(lport);</div><div class='ctx'> </div><div class='del'>-	if ((lport-&gt;state != LPORT_ST_READY) || !(lport-&gt;link_up)) {</div><div class='del'>-		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "link not ready.\n");</div><div class='add'>+	/* rport and tgt are allocated together, so tgt should be non-NULL */</div><div class='add'>+	fcport = (struct qedf_rport *)&amp;rp[1];</div><div class='add'>+	rdata = fcport-&gt;rdata;</div><div class='add'>+	if (!rdata || !kref_get_unless_zero(&amp;rdata-&gt;kref)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "stale rport, sc_cmd=%p\n", sc_cmd);</div><div class='add'>+		rc = 1;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fcport = (struct qedf_rport *)&amp;rp[1];</div><div class='ctx'> </div><div class='ctx'> 	io_req = (struct qedf_ioreq *)sc_cmd-&gt;SCp.ptr;</div><div class='ctx'> 	if (!io_req) {</div><div class='del'>-		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "io_req is NULL.\n");</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "sc_cmd not queued with lld, sc_cmd=%p op=0x%02x, port_id=%06x\n",</div><div class='add'>+			 sc_cmd, sc_cmd-&gt;cmnd[0],</div><div class='add'>+			 rdata-&gt;ids.port_id);</div><div class='ctx'> 		rc = SUCCESS;</div><div class='del'>-		goto out;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rval = kref_get_unless_zero(&amp;io_req-&gt;refcount);	/* ID: 005 */</div><div class='add'>+	if (rval)</div><div class='add'>+		got_ref = 1;</div><div class='add'>+</div><div class='add'>+	/* If we got a valid io_req, confirm it belongs to this sc_cmd. */</div><div class='add'>+	if (!rval || io_req-&gt;sc_cmd != sc_cmd) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Freed/Incorrect io_req, io_req-&gt;sc_cmd=%p, sc_cmd=%p, port_id=%06x, bailing out.\n",</div><div class='add'>+			 io_req-&gt;sc_cmd, sc_cmd, rdata-&gt;ids.port_id);</div><div class='add'>+</div><div class='add'>+		goto drop_rdata_kref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fc_remote_port_chkready(rport)) {</div><div class='add'>+		refcount = kref_read(&amp;io_req-&gt;refcount);</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "rport not ready, io_req=%p, xid=0x%x sc_cmd=%p op=0x%02x, refcount=%d, port_id=%06x\n",</div><div class='add'>+			 io_req, io_req-&gt;xid, sc_cmd, sc_cmd-&gt;cmnd[0],</div><div class='add'>+			 refcount, rdata-&gt;ids.port_id);</div><div class='add'>+</div><div class='add'>+		goto drop_rdata_kref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = fc_block_scsi_eh(sc_cmd);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto drop_rdata_kref;</div><div class='add'>+</div><div class='add'>+	if (test_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "Connection uploading, xid=0x%x., port_id=%06x\n",</div><div class='add'>+			 io_req-&gt;xid, rdata-&gt;ids.port_id);</div><div class='add'>+		while (io_req-&gt;sc_cmd &amp;&amp; (wait_count != 0)) {</div><div class='add'>+			msleep(100);</div><div class='add'>+			wait_count--;</div><div class='add'>+		}</div><div class='add'>+		if (wait_count) {</div><div class='add'>+			QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "ABTS succeeded\n");</div><div class='add'>+			rc = SUCCESS;</div><div class='add'>+		} else {</div><div class='add'>+			QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "ABTS failed\n");</div><div class='add'>+			rc = FAILED;</div><div class='add'>+		}</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "Aborting io_req sc_cmd=%p xid=0x%x "</div><div class='del'>-		  "fp_idx=%d.\n", sc_cmd, io_req-&gt;xid, io_req-&gt;fp_idx);</div><div class='add'>+	if (lport-&gt;state != LPORT_ST_READY || !(lport-&gt;link_up)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "link not ready.\n");</div><div class='add'>+		goto drop_rdata_kref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+		 "Aborting io_req=%p sc_cmd=%p xid=0x%x fp_idx=%d, port_id=%06x.\n",</div><div class='add'>+		 io_req, sc_cmd, io_req-&gt;xid, io_req-&gt;fp_idx,</div><div class='add'>+		 rdata-&gt;ids.port_id);</div><div class='ctx'> </div><div class='ctx'> 	if (qedf-&gt;stop_io_on_error) {</div><div class='ctx'> 		qedf_stop_all_io(qedf);</div><div class='ctx'> 		rc = SUCCESS;</div><div class='del'>-		goto out;</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;io_req-&gt;abts_done);</div><div class='ctx'> 	rval = qedf_initiate_abts(io_req, true);</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "Failed to queue ABTS.\n");</div><div class='del'>-		goto out;</div><div class='add'>+		/*</div><div class='add'>+		 * If we fail to queue the ABTS then return this command to</div><div class='add'>+		 * the SCSI layer as it will own and free the xid</div><div class='add'>+		 */</div><div class='add'>+		rc = SUCCESS;</div><div class='add'>+		qedf_scsi_done(qedf, io_req, DID_ERROR);</div><div class='add'>+		goto drop_rdata_kref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;io_req-&gt;abts_done);</div><div class='hunk'>@@ -684,38 +759,68 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 		QEDF_ERR(&amp;(qedf-&gt;dbg_ctx), "ABTS failed, xid=0x%x.\n",</div><div class='ctx'> 			  io_req-&gt;xid);</div><div class='ctx'> </div><div class='add'>+drop_rdata_kref:</div><div class='add'>+	kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='ctx'> out:</div><div class='add'>+	if (got_ref)</div><div class='add'>+		kref_put(&amp;io_req-&gt;refcount, qedf_release_cmd);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qedf_eh_target_reset(struct scsi_cmnd *sc_cmd)</div><div class='ctx'> {</div><div class='del'>-	QEDF_ERR(NULL, "TARGET RESET Issued...");</div><div class='add'>+	QEDF_ERR(NULL, "%d:0:%d:%lld: TARGET RESET Issued...",</div><div class='add'>+		 sc_cmd-&gt;device-&gt;host-&gt;host_no, sc_cmd-&gt;device-&gt;id,</div><div class='add'>+		 sc_cmd-&gt;device-&gt;lun);</div><div class='ctx'> 	return qedf_initiate_tmf(sc_cmd, FCP_TMF_TGT_RESET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qedf_eh_device_reset(struct scsi_cmnd *sc_cmd)</div><div class='ctx'> {</div><div class='del'>-	QEDF_ERR(NULL, "LUN RESET Issued...\n");</div><div class='add'>+	QEDF_ERR(NULL, "%d:0:%d:%lld: LUN RESET Issued... ",</div><div class='add'>+		 sc_cmd-&gt;device-&gt;host-&gt;host_no, sc_cmd-&gt;device-&gt;id,</div><div class='add'>+		 sc_cmd-&gt;device-&gt;lun);</div><div class='ctx'> 	return qedf_initiate_tmf(sc_cmd, FCP_TMF_LUN_RESET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void qedf_wait_for_upload(struct qedf_ctx *qedf)</div><div class='add'>+bool qedf_wait_for_upload(struct qedf_ctx *qedf)</div><div class='ctx'> {</div><div class='del'>-	while (1) {</div><div class='add'>+	struct qedf_rport *fcport = NULL;</div><div class='add'>+	int wait_cnt = 120;</div><div class='add'>+</div><div class='add'>+	while (wait_cnt--) {</div><div class='ctx'> 		if (atomic_read(&amp;qedf-&gt;num_offloads))</div><div class='del'>-			QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_DISC,</div><div class='del'>-			    "Waiting for all uploads to complete.\n");</div><div class='add'>+			QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+				  "Waiting for all uploads to complete num_offloads = 0x%x.\n",</div><div class='add'>+				  atomic_read(&amp;qedf-&gt;num_offloads));</div><div class='ctx'> 		else</div><div class='del'>-			break;</div><div class='add'>+			return true;</div><div class='ctx'> 		msleep(500);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(fcport, &amp;qedf-&gt;fcports, peers) {</div><div class='add'>+		if (fcport &amp;&amp; test_bit(QEDF_RPORT_SESSION_READY,</div><div class='add'>+				       &amp;fcport-&gt;flags)) {</div><div class='add'>+			if (fcport-&gt;rdata)</div><div class='add'>+				QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+					 "Waiting for fcport %p portid=%06x.\n",</div><div class='add'>+					 fcport, fcport-&gt;rdata-&gt;ids.port_id);</div><div class='add'>+			} else {</div><div class='add'>+				QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+					 "Waiting for fcport %p.\n", fcport);</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Performs soft reset of qedf_ctx by simulating a link down/up */</div><div class='del'>-static void qedf_ctx_soft_reset(struct fc_lport *lport)</div><div class='add'>+void qedf_ctx_soft_reset(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	struct qedf_ctx *qedf;</div><div class='add'>+	struct qed_link_output if_link;</div><div class='ctx'> </div><div class='ctx'> 	if (lport-&gt;vport) {</div><div class='ctx'> 		QEDF_ERR(NULL, "Cannot issue host reset on NPIV port.\n");</div><div class='hunk'>@@ -726,11 +831,32 @@ static void qedf_ctx_soft_reset(struct fc_lport *lport)</div><div class='ctx'> </div><div class='ctx'> 	/* For host reset, essentially do a soft link up/down */</div><div class='ctx'> 	atomic_set(&amp;qedf-&gt;link_state, QEDF_LINK_DOWN);</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+		  "Queuing link down work.\n");</div><div class='ctx'> 	queue_delayed_work(qedf-&gt;link_update_wq, &amp;qedf-&gt;link_update,</div><div class='ctx'> 	    0);</div><div class='del'>-	qedf_wait_for_upload(qedf);</div><div class='add'>+</div><div class='add'>+	if (qedf_wait_for_upload(qedf) == false) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "Could not upload all sessions.\n");</div><div class='add'>+		WARN_ON(atomic_read(&amp;qedf-&gt;num_offloads));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Before setting link up query physical link state */</div><div class='add'>+	qed_ops-&gt;common-&gt;get_link(qedf-&gt;cdev, &amp;if_link);</div><div class='add'>+	/* Bail if the physical link is not up */</div><div class='add'>+	if (!if_link.link_up) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+			  "Physical link is not up.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* Flush and wait to make sure link down is processed */</div><div class='add'>+	flush_delayed_work(&amp;qedf-&gt;link_update);</div><div class='add'>+	msleep(500);</div><div class='add'>+</div><div class='ctx'> 	atomic_set(&amp;qedf-&gt;link_state, QEDF_LINK_UP);</div><div class='ctx'> 	qedf-&gt;vlan_id  = 0;</div><div class='add'>+	QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_DISC,</div><div class='add'>+		  "Queue link up work.\n");</div><div class='ctx'> 	queue_delayed_work(qedf-&gt;link_update_wq, &amp;qedf-&gt;link_update,</div><div class='ctx'> 	    0);</div><div class='ctx'> }</div><div class='hunk'>@@ -740,22 +866,6 @@ static int qedf_eh_host_reset(struct scsi_cmnd *sc_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_lport *lport;</div><div class='ctx'> 	struct qedf_ctx *qedf;</div><div class='del'>-	struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd-&gt;device));</div><div class='del'>-	struct fc_rport_libfc_priv *rp = rport-&gt;dd_data;</div><div class='del'>-	struct qedf_rport *fcport = (struct qedf_rport *)&amp;rp[1];</div><div class='del'>-	int rval;</div><div class='del'>-</div><div class='del'>-	rval = fc_remote_port_chkready(rport);</div><div class='del'>-</div><div class='del'>-	if (rval) {</div><div class='del'>-		QEDF_ERR(NULL, "device_reset rport not ready\n");</div><div class='del'>-		return FAILED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fcport == NULL) {</div><div class='del'>-		QEDF_ERR(NULL, "device_reset: rport is NULL\n");</div><div class='del'>-		return FAILED;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	lport = shost_priv(sc_cmd-&gt;device-&gt;host);</div><div class='ctx'> 	qedf = lport_priv(lport);</div><div class='hunk'>@@ -907,8 +1017,10 @@ static int qedf_xmit(struct fc_lport *lport, struct fc_frame *fp)</div><div class='ctx'> 		    "Dropping FCoE frame to %06x.\n", ntoh24(fh-&gt;fh_d_id));</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		rdata = fc_rport_lookup(lport, ntoh24(fh-&gt;fh_d_id));</div><div class='del'>-		if (rdata)</div><div class='add'>+		if (rdata) {</div><div class='ctx'> 			rdata-&gt;retries = lport-&gt;max_rport_retry_count;</div><div class='add'>+			kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='add'>+		}</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* End NPIV filtering */</div><div class='hunk'>@@ -1031,7 +1143,12 @@ static int qedf_xmit(struct fc_lport *lport, struct fc_frame *fp)</div><div class='ctx'> 	if (qedf_dump_frames)</div><div class='ctx'> 		print_hex_dump(KERN_WARNING, "fcoe: ", DUMP_PREFIX_OFFSET, 16,</div><div class='ctx'> 		    1, skb-&gt;data, skb-&gt;len, false);</div><div class='del'>-	qed_ops-&gt;ll2-&gt;start_xmit(qedf-&gt;cdev, skb, 0);</div><div class='add'>+	rc = qed_ops-&gt;ll2-&gt;start_xmit(qedf-&gt;cdev, skb, 0);</div><div class='add'>+	if (rc) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "start_xmit failed rc = %d.\n", rc);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1224,6 +1341,8 @@ static void qedf_upload_connection(struct qedf_ctx *qedf,</div><div class='ctx'> static void qedf_cleanup_fcport(struct qedf_ctx *qedf,</div><div class='ctx'> 	struct qedf_rport *fcport)</div><div class='ctx'> {</div><div class='add'>+	struct fc_rport_priv *rdata = fcport-&gt;rdata;</div><div class='add'>+</div><div class='ctx'> 	QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_CONN, "Cleaning up portid=%06x.\n",</div><div class='ctx'> 	    fcport-&gt;rdata-&gt;ids.port_id);</div><div class='ctx'> </div><div class='hunk'>@@ -1235,6 +1354,7 @@ static void qedf_cleanup_fcport(struct qedf_ctx *qedf,</div><div class='ctx'> 	qedf_free_sq(qedf, fcport);</div><div class='ctx'> 	fcport-&gt;rdata = NULL;</div><div class='ctx'> 	fcport-&gt;qedf = NULL;</div><div class='add'>+	kref_put(&amp;rdata-&gt;kref, fc_rport_destroy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1310,6 +1430,8 @@ static void qedf_rport_event_handler(struct fc_lport *lport,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Initial reference held on entry, so this can't fail */</div><div class='add'>+		kref_get(&amp;rdata-&gt;kref);</div><div class='ctx'> 		fcport-&gt;rdata = rdata;</div><div class='ctx'> 		fcport-&gt;rport = rport;</div><div class='ctx'> </div><div class='hunk'>@@ -1369,11 +1491,15 @@ static void qedf_rport_event_handler(struct fc_lport *lport,</div><div class='ctx'> 		 */</div><div class='ctx'> 		fcport = (struct qedf_rport *)&amp;rp[1];</div><div class='ctx'> </div><div class='add'>+		spin_lock_irqsave(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> 		/* Only free this fcport if it is offloaded already */</div><div class='del'>-		if (test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags)) {</div><div class='del'>-			set_bit(QEDF_RPORT_UPLOADING_CONNECTION, &amp;fcport-&gt;flags);</div><div class='add'>+		if (test_bit(QEDF_RPORT_SESSION_READY, &amp;fcport-&gt;flags) &amp;&amp;</div><div class='add'>+		    !test_bit(QEDF_RPORT_UPLOADING_CONNECTION,</div><div class='add'>+		    &amp;fcport-&gt;flags)) {</div><div class='add'>+			set_bit(QEDF_RPORT_UPLOADING_CONNECTION,</div><div class='add'>+				&amp;fcport-&gt;flags);</div><div class='add'>+			spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> 			qedf_cleanup_fcport(qedf, fcport);</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Remove fcport to list of qedf_ctx list of offloaded</div><div class='ctx'> 			 * ports</div><div class='hunk'>@@ -1385,8 +1511,9 @@ static void qedf_rport_event_handler(struct fc_lport *lport,</div><div class='ctx'> 			clear_bit(QEDF_RPORT_UPLOADING_CONNECTION,</div><div class='ctx'> 			    &amp;fcport-&gt;flags);</div><div class='ctx'> 			atomic_dec(&amp;qedf-&gt;num_offloads);</div><div class='add'>+		} else {</div><div class='add'>+			spin_unlock_irqrestore(&amp;fcport-&gt;rport_lock, flags);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case RPORT_EV_NONE:</div><div class='hunk'>@@ -1498,11 +1625,15 @@ static int qedf_lport_setup(struct qedf_ctx *qedf)</div><div class='ctx'> 	fc_set_wwnn(lport, qedf-&gt;wwnn);</div><div class='ctx'> 	fc_set_wwpn(lport, qedf-&gt;wwpn);</div><div class='ctx'> </div><div class='del'>-	fcoe_libfc_config(lport, &amp;qedf-&gt;ctlr, &amp;qedf_lport_template, 0);</div><div class='add'>+	if (fcoe_libfc_config(lport, &amp;qedf-&gt;ctlr, &amp;qedf_lport_template, 0)) {</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+			 "fcoe_libfc_config failed.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the exchange manager */</div><div class='del'>-	fc_exch_mgr_alloc(lport, FC_CLASS_3, qedf-&gt;max_scsi_xid + 1,</div><div class='del'>-	    qedf-&gt;max_els_xid, NULL);</div><div class='add'>+	fc_exch_mgr_alloc(lport, FC_CLASS_3, FCOE_PARAMS_NUM_TASKS,</div><div class='add'>+			  0xfffe, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (fc_lport_init_stats(lport))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1625,14 +1756,15 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled)</div><div class='ctx'> 	vport_qedf-&gt;wwpn = vn_port-&gt;wwpn;</div><div class='ctx'> </div><div class='ctx'> 	vn_port-&gt;host-&gt;transportt = qedf_fc_vport_transport_template;</div><div class='del'>-	vn_port-&gt;host-&gt;can_queue = QEDF_MAX_ELS_XID;</div><div class='add'>+	vn_port-&gt;host-&gt;can_queue = FCOE_PARAMS_NUM_TASKS;</div><div class='ctx'> 	vn_port-&gt;host-&gt;max_lun = qedf_max_lun;</div><div class='ctx'> 	vn_port-&gt;host-&gt;sg_tablesize = QEDF_MAX_BDS_PER_CMD;</div><div class='ctx'> 	vn_port-&gt;host-&gt;max_cmd_len = QEDF_MAX_CDB_LEN;</div><div class='ctx'> </div><div class='ctx'> 	rc = scsi_add_host(vn_port-&gt;host, &amp;vport-&gt;dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		QEDF_WARN(&amp;(base_qedf-&gt;dbg_ctx), "Error adding Scsi_Host.\n");</div><div class='add'>+		QEDF_WARN(&amp;base_qedf-&gt;dbg_ctx,</div><div class='add'>+			  "Error adding Scsi_Host rc=0x%x.\n", rc);</div><div class='ctx'> 		goto err2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2155,7 +2287,8 @@ static int qedf_setup_int(struct qedf_ctx *qedf)</div><div class='ctx'> 	    QEDF_SIMD_HANDLER_NUM, qedf_simd_int_handler);</div><div class='ctx'> 	qedf-&gt;int_info.used_cnt = 1;</div><div class='ctx'> </div><div class='del'>-	QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "Only MSI-X supported. Failing probe.\n");</div><div class='add'>+	QEDF_ERR(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+		 "Cannot load driver due to a lack of MSI-X vectors.\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2356,6 +2489,13 @@ static int qedf_ll2_rx(void *cookie, struct sk_buff *skb,</div><div class='ctx'> 	struct qedf_ctx *qedf = (struct qedf_ctx *)cookie;</div><div class='ctx'> 	struct qedf_skb_work *skb_work;</div><div class='ctx'> </div><div class='add'>+	if (atomic_read(&amp;qedf-&gt;link_state) == QEDF_LINK_DOWN) {</div><div class='add'>+		QEDF_INFO(&amp;qedf-&gt;dbg_ctx, QEDF_LOG_LL2,</div><div class='add'>+			  "Dropping frame as link state is down.\n");</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb_work = kzalloc(sizeof(struct qedf_skb_work), GFP_ATOMIC);</div><div class='ctx'> 	if (!skb_work) {</div><div class='ctx'> 		QEDF_WARN(&amp;(qedf-&gt;dbg_ctx), "Could not allocate skb_work so "</div><div class='hunk'>@@ -2990,6 +3130,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)</div><div class='ctx'> 			goto err0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		fc_disc_init(lport);</div><div class='add'>+</div><div class='ctx'> 		/* Initialize qedf_ctx */</div><div class='ctx'> 		qedf = lport_priv(lport);</div><div class='ctx'> 		qedf-&gt;lport = lport;</div><div class='hunk'>@@ -3005,6 +3147,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)</div><div class='ctx'> 		pci_set_drvdata(pdev, qedf);</div><div class='ctx'> 		init_completion(&amp;qedf-&gt;fipvlan_compl);</div><div class='ctx'> 		mutex_init(&amp;qedf-&gt;stats_mutex);</div><div class='add'>+		mutex_init(&amp;qedf-&gt;flush_mutex);</div><div class='ctx'> </div><div class='ctx'> 		QEDF_INFO(&amp;(qedf-&gt;dbg_ctx), QEDF_LOG_INFO,</div><div class='ctx'> 		   "QLogic FastLinQ FCoE Module qedf %s, "</div><div class='hunk'>@@ -3181,11 +3324,6 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)</div><div class='ctx'> 	sprintf(host_buf, "host_%d", host-&gt;host_no);</div><div class='ctx'> 	qed_ops-&gt;common-&gt;set_name(qedf-&gt;cdev, host_buf);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	/* Set xid max values */</div><div class='del'>-	qedf-&gt;max_scsi_xid = QEDF_MAX_SCSI_XID;</div><div class='del'>-	qedf-&gt;max_els_xid = QEDF_MAX_ELS_XID;</div><div class='del'>-</div><div class='ctx'> 	/* Allocate cmd mgr */</div><div class='ctx'> 	qedf-&gt;cmd_mgr = qedf_cmd_mgr_alloc(qedf);</div><div class='ctx'> 	if (!qedf-&gt;cmd_mgr) {</div><div class='hunk'>@@ -3196,12 +3334,15 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)</div><div class='ctx'> </div><div class='ctx'> 	if (mode != QEDF_MODE_RECOVERY) {</div><div class='ctx'> 		host-&gt;transportt = qedf_fc_transport_template;</div><div class='del'>-		host-&gt;can_queue = QEDF_MAX_ELS_XID;</div><div class='ctx'> 		host-&gt;max_lun = qedf_max_lun;</div><div class='ctx'> 		host-&gt;max_cmd_len = QEDF_MAX_CDB_LEN;</div><div class='add'>+		host-&gt;can_queue = FCOE_PARAMS_NUM_TASKS;</div><div class='ctx'> 		rc = scsi_add_host(host, &amp;pdev-&gt;dev);</div><div class='del'>-		if (rc)</div><div class='add'>+		if (rc) {</div><div class='add'>+			QEDF_WARN(&amp;qedf-&gt;dbg_ctx,</div><div class='add'>+				  "Error adding Scsi_Host rc=0x%x.\n", rc);</div><div class='ctx'> 			goto err6;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;params, 0, sizeof(params));</div><div class='hunk'>@@ -3377,7 +3518,9 @@ static void __qedf_remove(struct pci_dev *pdev, int mode)</div><div class='ctx'> 		fcoe_ctlr_link_down(&amp;qedf-&gt;ctlr);</div><div class='ctx'> 	else</div><div class='ctx'> 		fc_fabric_logoff(qedf-&gt;lport);</div><div class='del'>-	qedf_wait_for_upload(qedf);</div><div class='add'>+</div><div class='add'>+	if (qedf_wait_for_upload(qedf) == false)</div><div class='add'>+		QEDF_ERR(&amp;qedf-&gt;dbg_ctx, "Could not upload all sessions.\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	qedf_dbg_host_exit(&amp;(qedf-&gt;dbg_ctx));</div><div class='head'>diff --git a/drivers/scsi/qedf/qedf_version.h b/drivers/scsi/qedf/qedf_version.h<br/>index 9455faacd5de..334a9cdf346a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_version.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedf/qedf_version.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedf/qedf_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedf/qedf_version.h</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'>  *  this source tree.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define QEDF_VERSION		"8.33.16.20"</div><div class='add'>+#define QEDF_VERSION		"8.37.25.20"</div><div class='ctx'> #define QEDF_DRIVER_MAJOR_VER		8</div><div class='del'>-#define QEDF_DRIVER_MINOR_VER		33</div><div class='del'>-#define QEDF_DRIVER_REV_VER		16</div><div class='add'>+#define QEDF_DRIVER_MINOR_VER		37</div><div class='add'>+#define QEDF_DRIVER_REV_VER		25</div><div class='ctx'> #define QEDF_DRIVER_ENG_VER		20</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c<br/>index e2a995a6e8e7..bd81bbee61e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedi/qedi_fw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedi/qedi_fw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedi/qedi_fw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedi/qedi_fw.c</a></div><div class='hunk'>@@ -155,12 +155,10 @@ static void qedi_tmf_resp_work(struct work_struct *work)</div><div class='ctx'> 	struct iscsi_conn *conn = qedi_conn-&gt;cls_conn-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='ctx'> 	struct iscsi_tm_rsp *resp_hdr_ptr;</div><div class='del'>-	struct iscsi_cls_session *cls_sess;</div><div class='ctx'> 	int rval = 0;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(QEDI_CONN_FW_CLEANUP, &amp;qedi_conn-&gt;flags);</div><div class='ctx'> 	resp_hdr_ptr =  (struct iscsi_tm_rsp *)qedi_cmd-&gt;tmf_resp_buf;</div><div class='del'>-	cls_sess = iscsi_conn_to_session(qedi_conn-&gt;cls_conn);</div><div class='ctx'> </div><div class='ctx'> 	iscsi_block_session(session-&gt;cls_session);</div><div class='ctx'> 	rval = qedi_cleanup_all_io(qedi, qedi_conn, qedi_cmd-&gt;task, true);</div><div class='hunk'>@@ -985,7 +983,6 @@ static void qedi_ring_doorbell(struct qedi_conn *qedi_conn)</div><div class='ctx'> 	 * others they are two different assembly operations.</div><div class='ctx'> 	 */</div><div class='ctx'> 	wmb();</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	QEDI_INFO(&amp;qedi_conn-&gt;qedi-&gt;dbg_ctx, QEDI_LOG_MP_REQ,</div><div class='ctx'> 		  "prod_idx=0x%x, fw_prod_idx=0x%x, cid=0x%x\n",</div><div class='ctx'> 		  qedi_conn-&gt;ep-&gt;sq_prod_idx, qedi_conn-&gt;ep-&gt;fw_sq_prod_idx,</div><div class='hunk'>@@ -1367,7 +1364,6 @@ static void qedi_tmf_work(struct work_struct *work)</div><div class='ctx'> 	struct qedi_conn *qedi_conn = qedi_cmd-&gt;conn;</div><div class='ctx'> 	struct qedi_ctx *qedi = qedi_conn-&gt;qedi;</div><div class='ctx'> 	struct iscsi_conn *conn = qedi_conn-&gt;cls_conn-&gt;dd_data;</div><div class='del'>-	struct iscsi_cls_session *cls_sess;</div><div class='ctx'> 	struct qedi_work_map *list_work = NULL;</div><div class='ctx'> 	struct iscsi_task *mtask;</div><div class='ctx'> 	struct qedi_cmd *cmd;</div><div class='hunk'>@@ -1378,7 +1374,6 @@ static void qedi_tmf_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mtask = qedi_cmd-&gt;task;</div><div class='ctx'> 	tmf_hdr = (struct iscsi_tm *)mtask-&gt;hdr;</div><div class='del'>-	cls_sess = iscsi_conn_to_session(qedi_conn-&gt;cls_conn);</div><div class='ctx'> 	set_bit(QEDI_CONN_FW_CLEANUP, &amp;qedi_conn-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	ctask = iscsi_itt_to_task(conn, tmf_hdr-&gt;rtt);</div><div class='head'>diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c<br/>index 6d6d6013e35b..615cea4fad56 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedi/qedi_iscsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedi/qedi_iscsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedi/qedi_iscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedi/qedi_iscsi.c</a></div><div class='hunk'>@@ -579,7 +579,7 @@ static int qedi_conn_start(struct iscsi_cls_conn *cls_conn)</div><div class='ctx'> 	rval = qedi_iscsi_update_conn(qedi, qedi_conn);</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		iscsi_conn_printk(KERN_ALERT, conn,</div><div class='del'>-				  "conn_start: FW oflload conn failed.\n");</div><div class='add'>+				  "conn_start: FW offload conn failed.\n");</div><div class='ctx'> 		rval = -EINVAL;</div><div class='ctx'> 		goto start_err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -590,7 +590,7 @@ static int qedi_conn_start(struct iscsi_cls_conn *cls_conn)</div><div class='ctx'> 	rval = iscsi_conn_start(cls_conn);</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		iscsi_conn_printk(KERN_ALERT, conn,</div><div class='del'>-				  "iscsi_conn_start: FW oflload conn failed!!\n");</div><div class='add'>+				  "iscsi_conn_start: FW offload conn failed!!\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> start_err:</div><div class='hunk'>@@ -993,13 +993,17 @@ static void qedi_ep_disconnect(struct iscsi_endpoint *ep)</div><div class='ctx'> 	struct iscsi_conn *conn = NULL;</div><div class='ctx'> 	struct qedi_ctx *qedi;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int wait_delay = 20 * HZ;</div><div class='add'>+	int wait_delay;</div><div class='ctx'> 	int abrt_conn = 0;</div><div class='ctx'> 	int count = 10;</div><div class='ctx'> </div><div class='add'>+	wait_delay = 60 * HZ + DEF_MAX_RT_TIME;</div><div class='ctx'> 	qedi_ep = ep-&gt;dd_data;</div><div class='ctx'> 	qedi = qedi_ep-&gt;qedi;</div><div class='ctx'> </div><div class='add'>+	if (qedi_ep-&gt;state == EP_STATE_OFLDCONN_START)</div><div class='add'>+		goto ep_exit_recover;</div><div class='add'>+</div><div class='ctx'> 	flush_work(&amp;qedi_ep-&gt;offload_work);</div><div class='ctx'> </div><div class='ctx'> 	if (qedi_ep-&gt;conn) {</div><div class='hunk'>@@ -1163,7 +1167,7 @@ static void qedi_offload_work(struct work_struct *work)</div><div class='ctx'> 	struct qedi_endpoint *qedi_ep =</div><div class='ctx'> 		container_of(work, struct qedi_endpoint, offload_work);</div><div class='ctx'> 	struct qedi_ctx *qedi;</div><div class='del'>-	int wait_delay = 20 * HZ;</div><div class='add'>+	int wait_delay = 5 * HZ;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	qedi = qedi_ep-&gt;qedi;</div><div class='head'>diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c<br/>index e74a62448ba4..e5db9a9954dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedi/qedi_main.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qedi/qedi_main.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qedi/qedi_main.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qedi/qedi_main.c</a></div><div class='hunk'>@@ -1392,10 +1392,8 @@ static void qedi_free_nvm_iscsi_cfg(struct qedi_ctx *qedi)</div><div class='ctx'> </div><div class='ctx'> static int qedi_alloc_nvm_iscsi_cfg(struct qedi_ctx *qedi)</div><div class='ctx'> {</div><div class='del'>-	struct qedi_nvm_iscsi_image nvm_image;</div><div class='del'>-</div><div class='ctx'> 	qedi-&gt;iscsi_image = dma_alloc_coherent(&amp;qedi-&gt;pdev-&gt;dev,</div><div class='del'>-					       sizeof(nvm_image),</div><div class='add'>+					       sizeof(struct qedi_nvm_iscsi_image),</div><div class='ctx'> 					       &amp;qedi-&gt;nvm_buf_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!qedi-&gt;iscsi_image) {</div><div class='ctx'> 		QEDI_ERR(&amp;qedi-&gt;dbg_ctx, "Could not allocate NVM BUF.\n");</div><div class='hunk'>@@ -2236,14 +2234,13 @@ static void qedi_boot_release(void *data)</div><div class='ctx'> static int qedi_get_boot_info(struct qedi_ctx *qedi)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	struct qedi_nvm_iscsi_image nvm_image;</div><div class='ctx'> </div><div class='ctx'> 	QEDI_INFO(&amp;qedi-&gt;dbg_ctx, QEDI_LOG_INFO,</div><div class='ctx'> 		  "Get NVM iSCSI CFG image\n");</div><div class='ctx'> 	ret = qedi_ops-&gt;common-&gt;nvm_get_image(qedi-&gt;cdev,</div><div class='ctx'> 					      QED_NVM_IMAGE_ISCSI_CFG,</div><div class='ctx'> 					      (char *)qedi-&gt;iscsi_image,</div><div class='del'>-					      sizeof(nvm_image));</div><div class='add'>+					      sizeof(struct qedi_nvm_iscsi_image));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		QEDI_ERR(&amp;qedi-&gt;dbg_ctx,</div><div class='ctx'> 			 "Could not get NVM image. ret = %d\n", ret);</div><div class='head'>diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c<br/>index 6856dfdfa473..327eff67a1ee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla1280.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla1280.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla1280.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla1280.c</a></div><div class='hunk'>@@ -3004,8 +3004,6 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)</div><div class='ctx'> 	sp-&gt;flags |= SRB_SENT;</div><div class='ctx'> 	ha-&gt;actthreads++;</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;mailbox4, ha-&gt;req_ring_index);</div><div class='del'>-	/* Enforce mmio write ordering; see comment in qla1280_isp_cmd(). */</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -3254,8 +3252,6 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)</div><div class='ctx'> 	sp-&gt;flags |= SRB_SENT;</div><div class='ctx'> 	ha-&gt;actthreads++;</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;mailbox4, ha-&gt;req_ring_index);</div><div class='del'>-	/* Enforce mmio write ordering; see comment in qla1280_isp_cmd(). */</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -3367,19 +3363,8 @@ qla1280_isp_cmd(struct scsi_qla_host *ha)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update request index to mailbox4 (Request Queue In).</div><div class='del'>-	 * The mmiowb() ensures that this write is ordered with writes by other</div><div class='del'>-	 * CPUs.  Without the mmiowb(), it is possible for the following:</div><div class='del'>-	 *    CPUA posts write of index 5 to mailbox4</div><div class='del'>-	 *    CPUA releases host lock</div><div class='del'>-	 *    CPUB acquires host lock</div><div class='del'>-	 *    CPUB posts write of index 6 to mailbox4</div><div class='del'>-	 *    On PCI bus, order reverses and write of 6 posts, then index 5,</div><div class='del'>-	 *       causing chip to issue full queue of stale commands</div><div class='del'>-	 * The mmiowb() prevents future writes from crossing the barrier.</div><div class='del'>-	 * See Documentation/driver-api/device-io.rst for more information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;mailbox4, ha-&gt;req_ring_index);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	LEAVE("qla1280_isp_cmd");</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c<br/>index f928c4d3a1ef..8d560c562e9c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_attr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_attr.c</a></div><div class='hunk'>@@ -29,24 +29,27 @@ qla2x00_sysfs_read_fw_dump(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	if (!(ha-&gt;fw_dump_reading || ha-&gt;mctp_dump_reading))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ha-&gt;optrom_mutex);</div><div class='ctx'> 	if (IS_P3P_TYPE(ha)) {</div><div class='ctx'> 		if (off &lt; ha-&gt;md_template_size) {</div><div class='ctx'> 			rval = memory_read_from_buffer(buf, count,</div><div class='ctx'> 			    &amp;off, ha-&gt;md_tmplt_hdr, ha-&gt;md_template_size);</div><div class='del'>-			return rval;</div><div class='add'>+		} else {</div><div class='add'>+			off -= ha-&gt;md_template_size;</div><div class='add'>+			rval = memory_read_from_buffer(buf, count,</div><div class='add'>+			    &amp;off, ha-&gt;md_dump, ha-&gt;md_dump_size);</div><div class='ctx'> 		}</div><div class='del'>-		off -= ha-&gt;md_template_size;</div><div class='del'>-		rval = memory_read_from_buffer(buf, count,</div><div class='del'>-		    &amp;off, ha-&gt;md_dump, ha-&gt;md_dump_size);</div><div class='del'>-		return rval;</div><div class='del'>-	} else if (ha-&gt;mctp_dumped &amp;&amp; ha-&gt;mctp_dump_reading)</div><div class='del'>-		return memory_read_from_buffer(buf, count, &amp;off, ha-&gt;mctp_dump,</div><div class='add'>+	} else if (ha-&gt;mctp_dumped &amp;&amp; ha-&gt;mctp_dump_reading) {</div><div class='add'>+		rval = memory_read_from_buffer(buf, count, &amp;off, ha-&gt;mctp_dump,</div><div class='ctx'> 		    MCTP_DUMP_SIZE);</div><div class='del'>-	else if (ha-&gt;fw_dump_reading)</div><div class='del'>-		return memory_read_from_buffer(buf, count, &amp;off, ha-&gt;fw_dump,</div><div class='add'>+	} else if (ha-&gt;fw_dump_reading) {</div><div class='add'>+		rval = memory_read_from_buffer(buf, count, &amp;off, ha-&gt;fw_dump,</div><div class='ctx'> 					ha-&gt;fw_dump_len);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		rval = 0;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -154,6 +157,8 @@ qla2x00_sysfs_read_nvram(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,</div><div class='ctx'> 	    struct device, kobj)));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	uint32_t faddr;</div><div class='add'>+	struct active_regions active_regions = { };</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -164,11 +169,21 @@ qla2x00_sysfs_read_nvram(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_NOCACHE_VPD_TYPE(ha))</div><div class='del'>-		ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;nvram, ha-&gt;flt_region_nvram &lt;&lt; 2,</div><div class='del'>-		    ha-&gt;nvram_size);</div><div class='add'>+	if (!IS_NOCACHE_VPD_TYPE(ha)) {</div><div class='add'>+		mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+		goto skip;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	faddr = ha-&gt;flt_region_nvram;</div><div class='add'>+	if (IS_QLA28XX(ha)) {</div><div class='add'>+		if (active_regions.aux.vpd_nvram == QLA27XX_SECONDARY_IMAGE)</div><div class='add'>+			faddr = ha-&gt;flt_region_nvram_sec;</div><div class='add'>+	}</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;nvram, faddr &lt;&lt; 2, ha-&gt;nvram_size);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='ctx'> </div><div class='add'>+skip:</div><div class='ctx'> 	return memory_read_from_buffer(buf, count, &amp;off, ha-&gt;nvram,</div><div class='ctx'> 					ha-&gt;nvram_size);</div><div class='ctx'> }</div><div class='hunk'>@@ -223,9 +238,9 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write NVRAM. */</div><div class='del'>-	ha-&gt;isp_ops-&gt;write_nvram(vha, (uint8_t *)buf, ha-&gt;nvram_base, count);</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_nvram(vha, (uint8_t *)ha-&gt;nvram, ha-&gt;nvram_base,</div><div class='del'>-	     count);</div><div class='add'>+	ha-&gt;isp_ops-&gt;write_nvram(vha, buf, ha-&gt;nvram_base, count);</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_nvram(vha, ha-&gt;nvram, ha-&gt;nvram_base,</div><div class='add'>+	    count);</div><div class='ctx'> 	mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_user, vha, 0x7060,</div><div class='hunk'>@@ -364,7 +379,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;optrom_region_start = start;</div><div class='del'>-		ha-&gt;optrom_region_size = start + size;</div><div class='add'>+		ha-&gt;optrom_region_size = size;</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;optrom_state = QLA_SREADING;</div><div class='ctx'> 		ha-&gt;optrom_buffer = vmalloc(ha-&gt;optrom_region_size);</div><div class='hunk'>@@ -418,6 +433,10 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		 * 	0x000000 -&gt; 0x07ffff -- Boot code.</div><div class='ctx'> 		 * 	0x080000 -&gt; 0x0fffff -- Firmware.</div><div class='ctx'> 		 * 	0x120000 -&gt; 0x12ffff -- VPD and HBA parameters.</div><div class='add'>+		 *</div><div class='add'>+		 * &gt; ISP25xx type boards:</div><div class='add'>+		 *</div><div class='add'>+		 *      None -- should go through BSG.</div><div class='ctx'> 		 */</div><div class='ctx'> 		valid = 0;</div><div class='ctx'> 		if (ha-&gt;optrom_size == OPTROM_SIZE_2300 &amp;&amp; start == 0)</div><div class='hunk'>@@ -425,9 +444,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		else if (start == (ha-&gt;flt_region_boot * 4) ||</div><div class='ctx'> 		    start == (ha-&gt;flt_region_fw * 4))</div><div class='ctx'> 			valid = 1;</div><div class='del'>-		else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha)</div><div class='del'>-			|| IS_CNA_CAPABLE(ha) || IS_QLA2031(ha)</div><div class='del'>-			|| IS_QLA27XX(ha))</div><div class='add'>+		else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))</div><div class='ctx'> 			valid = 1;</div><div class='ctx'> 		if (!valid) {</div><div class='ctx'> 			ql_log(ql_log_warn, vha, 0x7065,</div><div class='hunk'>@@ -437,7 +454,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;optrom_region_start = start;</div><div class='del'>-		ha-&gt;optrom_region_size = start + size;</div><div class='add'>+		ha-&gt;optrom_region_size = size;</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;optrom_state = QLA_SWRITING;</div><div class='ctx'> 		ha-&gt;optrom_buffer = vmalloc(ha-&gt;optrom_region_size);</div><div class='hunk'>@@ -504,6 +521,7 @@ qla2x00_sysfs_read_vpd(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	    struct device, kobj)));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	uint32_t faddr;</div><div class='add'>+	struct active_regions active_regions = { };</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(pci_channel_offline(ha-&gt;pdev)))</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -511,22 +529,33 @@ qla2x00_sysfs_read_vpd(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (IS_NOCACHE_VPD_TYPE(ha)) {</div><div class='del'>-		faddr = ha-&gt;flt_region_vpd &lt;&lt; 2;</div><div class='add'>+	if (IS_NOCACHE_VPD_TYPE(ha))</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	faddr = ha-&gt;flt_region_vpd &lt;&lt; 2;</div><div class='ctx'> </div><div class='del'>-		if (IS_QLA27XX(ha) &amp;&amp;</div><div class='del'>-		    qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)</div><div class='add'>+	if (IS_QLA28XX(ha)) {</div><div class='add'>+		qla28xx_get_aux_images(vha, &amp;active_regions);</div><div class='add'>+		if (active_regions.aux.vpd_nvram == QLA27XX_SECONDARY_IMAGE)</div><div class='ctx'> 			faddr = ha-&gt;flt_region_vpd_sec &lt;&lt; 2;</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;ha-&gt;optrom_mutex);</div><div class='del'>-		if (qla2x00_chip_is_down(vha)) {</div><div class='del'>-			mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-		ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;vpd, faddr,</div><div class='del'>-		    ha-&gt;vpd_size);</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x7070,</div><div class='add'>+		    "Loading %s nvram image.\n",</div><div class='add'>+		    active_regions.aux.vpd_nvram == QLA27XX_PRIMARY_IMAGE ?</div><div class='add'>+		    "primary" : "secondary");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+	if (qla2x00_chip_is_down(vha)) {</div><div class='ctx'> 		mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;vpd, faddr, ha-&gt;vpd_size);</div><div class='add'>+	mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;vpd, faddr, ha-&gt;vpd_size);</div><div class='add'>+skip:</div><div class='ctx'> 	return memory_read_from_buffer(buf, count, &amp;off, ha-&gt;vpd, ha-&gt;vpd_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -563,8 +592,8 @@ qla2x00_sysfs_write_vpd(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write NVRAM. */</div><div class='del'>-	ha-&gt;isp_ops-&gt;write_nvram(vha, (uint8_t *)buf, ha-&gt;vpd_base, count);</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_nvram(vha, (uint8_t *)ha-&gt;vpd, ha-&gt;vpd_base, count);</div><div class='add'>+	ha-&gt;isp_ops-&gt;write_nvram(vha, buf, ha-&gt;vpd_base, count);</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_nvram(vha, ha-&gt;vpd, ha-&gt;vpd_base, count);</div><div class='ctx'> </div><div class='ctx'> 	/* Update flash version information for 4Gb &amp; above. */</div><div class='ctx'> 	if (!IS_FWI2_CAPABLE(ha)) {</div><div class='hunk'>@@ -645,6 +674,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	int type;</div><div class='ctx'> 	uint32_t idc_control;</div><div class='ctx'> 	uint8_t *tmp_data = NULL;</div><div class='add'>+</div><div class='ctx'> 	if (off != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -682,7 +712,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0x706f,</div><div class='ctx'> 		    "Issuing MPI reset.\n");</div><div class='ctx'> </div><div class='del'>-		if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+		if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			uint32_t idc_control;</div><div class='ctx'> </div><div class='ctx'> 			qla83xx_idc_lock(vha, 0);</div><div class='hunk'>@@ -858,7 +888,7 @@ do_read:</div><div class='ctx'> 		count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = actual_size &gt; count ? count: actual_size;</div><div class='add'>+	count = actual_size &gt; count ? count : actual_size;</div><div class='ctx'> 	memcpy(buf, ha-&gt;xgmac_data, count);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -934,7 +964,7 @@ static struct bin_attribute sysfs_dcbx_tlv_attr = {</div><div class='ctx'> static struct sysfs_entry {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	struct bin_attribute *attr;</div><div class='del'>-	int is4GBp_only;</div><div class='add'>+	int type;</div><div class='ctx'> } bin_file_entries[] = {</div><div class='ctx'> 	{ "fw_dump", &amp;sysfs_fw_dump_attr, },</div><div class='ctx'> 	{ "nvram", &amp;sysfs_nvram_attr, },</div><div class='hunk'>@@ -957,11 +987,11 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *vha)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for (iter = bin_file_entries; iter-&gt;name; iter++) {</div><div class='del'>-		if (iter-&gt;is4GBp_only &amp;&amp; !IS_FWI2_CAPABLE(vha-&gt;hw))</div><div class='add'>+		if (iter-&gt;type &amp;&amp; !IS_FWI2_CAPABLE(vha-&gt;hw))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (iter-&gt;is4GBp_only == 2 &amp;&amp; !IS_QLA25XX(vha-&gt;hw))</div><div class='add'>+		if (iter-&gt;type == 2 &amp;&amp; !IS_QLA25XX(vha-&gt;hw))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (iter-&gt;is4GBp_only == 3 &amp;&amp; !(IS_CNA_CAPABLE(vha-&gt;hw)))</div><div class='add'>+		if (iter-&gt;type == 3 &amp;&amp; !(IS_CNA_CAPABLE(vha-&gt;hw)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		ret = sysfs_create_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='hunk'>@@ -985,13 +1015,14 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha, bool stop_beacon)</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	for (iter = bin_file_entries; iter-&gt;name; iter++) {</div><div class='del'>-		if (iter-&gt;is4GBp_only &amp;&amp; !IS_FWI2_CAPABLE(ha))</div><div class='add'>+		if (iter-&gt;type &amp;&amp; !IS_FWI2_CAPABLE(ha))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (iter-&gt;is4GBp_only == 2 &amp;&amp; !IS_QLA25XX(ha))</div><div class='add'>+		if (iter-&gt;type == 2 &amp;&amp; !IS_QLA25XX(ha))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (iter-&gt;is4GBp_only == 3 &amp;&amp; !(IS_CNA_CAPABLE(vha-&gt;hw)))</div><div class='add'>+		if (iter-&gt;type == 3 &amp;&amp; !(IS_CNA_CAPABLE(ha)))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (iter-&gt;is4GBp_only == 0x27 &amp;&amp; !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+		if (iter-&gt;type == 0x27 &amp;&amp;</div><div class='add'>+		    (!IS_QLA27XX(ha) || !IS_QLA28XX(ha)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		sysfs_remove_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='hunk'>@@ -1049,6 +1080,7 @@ qla2x00_isp_name_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "ISP%04X\n", vha-&gt;hw-&gt;pdev-&gt;device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1082,6 +1114,7 @@ qla2x00_model_desc_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%s\n", vha-&gt;hw-&gt;model_desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1294,6 +1327,7 @@ qla2x00_optrom_bios_version_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha-&gt;bios_revision[1],</div><div class='ctx'> 	    ha-&gt;bios_revision[0]);</div><div class='ctx'> }</div><div class='hunk'>@@ -1304,6 +1338,7 @@ qla2x00_optrom_efi_version_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha-&gt;efi_revision[1],</div><div class='ctx'> 	    ha-&gt;efi_revision[0]);</div><div class='ctx'> }</div><div class='hunk'>@@ -1314,6 +1349,7 @@ qla2x00_optrom_fcode_version_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha-&gt;fcode_revision[1],</div><div class='ctx'> 	    ha-&gt;fcode_revision[0]);</div><div class='ctx'> }</div><div class='hunk'>@@ -1324,6 +1360,7 @@ qla2x00_optrom_fw_version_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",</div><div class='ctx'> 	    ha-&gt;fw_revision[0], ha-&gt;fw_revision[1], ha-&gt;fw_revision[2],</div><div class='ctx'> 	    ha-&gt;fw_revision[3]);</div><div class='hunk'>@@ -1336,7 +1373,8 @@ qla2x00_optrom_gold_fw_version_show(struct device *dev,</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",</div><div class='hunk'>@@ -1349,6 +1387,7 @@ qla2x00_total_isp_aborts_show(struct device *dev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='add'>+</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='ctx'> 	    vha-&gt;qla_stats.total_isp_aborts);</div><div class='ctx'> }</div><div class='hunk'>@@ -1358,24 +1397,40 @@ qla24xx_84xx_fw_version_show(struct device *dev,</div><div class='ctx'> 	struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int rval = QLA_SUCCESS;</div><div class='del'>-	uint16_t status[2] = {0, 0};</div><div class='add'>+	uint16_t status[2] = { 0 };</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA84XX(ha))</div><div class='ctx'> 		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;cs84xx-&gt;op_fw_version == 0)</div><div class='add'>+	if (!ha-&gt;cs84xx-&gt;op_fw_version) {</div><div class='ctx'> 		rval = qla84xx_verify_chip(vha, status);</div><div class='ctx'> </div><div class='del'>-	if ((rval == QLA_SUCCESS) &amp;&amp; (status[0] == 0))</div><div class='del'>-		return scnprintf(buf, PAGE_SIZE, "%u\n",</div><div class='del'>-			(uint32_t)ha-&gt;cs84xx-&gt;op_fw_version);</div><div class='add'>+		if (!rval &amp;&amp; !status[0])</div><div class='add'>+			return scnprintf(buf, PAGE_SIZE, "%u\n",</div><div class='add'>+			    (uint32_t)ha-&gt;cs84xx-&gt;op_fw_version);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='add'>+qla2x00_serdes_version_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+    char *buf)</div><div class='add'>+{</div><div class='add'>+	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",</div><div class='add'>+	    ha-&gt;serdes_version[0], ha-&gt;serdes_version[1],</div><div class='add'>+	    ha-&gt;serdes_version[2]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='ctx'> qla2x00_mpi_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'>     char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1383,7 +1438,7 @@ qla2x00_mpi_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA81XX(ha) &amp;&amp; !IS_QLA8031(ha) &amp;&amp; !IS_QLA8044(ha) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(ha))</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",</div><div class='hunk'>@@ -1596,7 +1651,7 @@ qla2x00_pep_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",</div><div class='hunk'>@@ -1604,35 +1659,38 @@ qla2x00_pep_version_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-qla2x00_min_link_speed_show(struct device *dev, struct device_attribute *attr,</div><div class='del'>-    char *buf)</div><div class='add'>+qla2x00_min_supported_speed_show(struct device *dev,</div><div class='add'>+    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%s\n",</div><div class='del'>-	    ha-&gt;min_link_speed == 5 ? "32Gps" :</div><div class='del'>-	    ha-&gt;min_link_speed == 4 ? "16Gps" :</div><div class='del'>-	    ha-&gt;min_link_speed == 3 ? "8Gps" :</div><div class='del'>-	    ha-&gt;min_link_speed == 2 ? "4Gps" :</div><div class='del'>-	    ha-&gt;min_link_speed != 0 ? "unknown" : "");</div><div class='add'>+	    ha-&gt;min_supported_speed == 6 ? "64Gps" :</div><div class='add'>+	    ha-&gt;min_supported_speed == 5 ? "32Gps" :</div><div class='add'>+	    ha-&gt;min_supported_speed == 4 ? "16Gps" :</div><div class='add'>+	    ha-&gt;min_supported_speed == 3 ? "8Gps" :</div><div class='add'>+	    ha-&gt;min_supported_speed == 2 ? "4Gps" :</div><div class='add'>+	    ha-&gt;min_supported_speed != 0 ? "unknown" : "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-qla2x00_max_speed_sup_show(struct device *dev, struct device_attribute *attr,</div><div class='del'>-    char *buf)</div><div class='add'>+qla2x00_max_supported_speed_show(struct device *dev,</div><div class='add'>+    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%s\n",</div><div class='del'>-	    ha-&gt;max_speed_sup ? "32Gps" : "16Gps");</div><div class='add'>+	    ha-&gt;max_supported_speed  == 2 ? "64Gps" :</div><div class='add'>+	    ha-&gt;max_supported_speed  == 1 ? "32Gps" :</div><div class='add'>+	    ha-&gt;max_supported_speed  == 0 ? "16Gps" : "unknown");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -1645,7 +1703,7 @@ qla2x00_port_speed_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int mode = QLA_SET_DATA_RATE_LR;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA27XX(vha-&gt;hw)) {</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x70d8,</div><div class='ctx'> 		    "Speed setting not supported \n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2164,6 +2222,32 @@ qla2x00_dif_bundle_statistics_show(struct device *dev,</div><div class='ctx'> 	    ha-&gt;dif_bundle_dma_allocs, ha-&gt;pool.unusable.count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t</div><div class='add'>+qla2x00_fw_attr_show(struct device *dev,</div><div class='add'>+    struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		return scnprintf(buf, PAGE_SIZE, "\n");</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%llx\n",</div><div class='add'>+	    (uint64_t)ha-&gt;fw_attributes_ext[1] &lt;&lt; 48 |</div><div class='add'>+	    (uint64_t)ha-&gt;fw_attributes_ext[0] &lt;&lt; 32 |</div><div class='add'>+	    (uint64_t)ha-&gt;fw_attributes_h &lt;&lt; 16 |</div><div class='add'>+	    (uint64_t)ha-&gt;fw_attributes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+qla2x00_port_no_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+    char *buf)</div><div class='add'>+{</div><div class='add'>+	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%u\n", vha-&gt;hw-&gt;port_no);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_driver_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);</div><div class='hunk'>@@ -2192,6 +2276,7 @@ static DEVICE_ATTR(84xx_fw_version, S_IRUGO, qla24xx_84xx_fw_version_show,</div><div class='ctx'> 		   NULL);</div><div class='ctx'> static DEVICE_ATTR(total_isp_aborts, S_IRUGO, qla2x00_total_isp_aborts_show,</div><div class='ctx'> 		   NULL);</div><div class='add'>+static DEVICE_ATTR(serdes_version, 0444, qla2x00_serdes_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(mpi_version, S_IRUGO, qla2x00_mpi_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(phy_version, S_IRUGO, qla2x00_phy_version_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(flash_block_size, S_IRUGO, qla2x00_flash_block_size_show,</div><div class='hunk'>@@ -2209,8 +2294,10 @@ static DEVICE_ATTR(allow_cna_fw_dump, S_IRUGO | S_IWUSR,</div><div class='ctx'> 		   qla2x00_allow_cna_fw_dump_show,</div><div class='ctx'> 		   qla2x00_allow_cna_fw_dump_store);</div><div class='ctx'> static DEVICE_ATTR(pep_version, S_IRUGO, qla2x00_pep_version_show, NULL);</div><div class='del'>-static DEVICE_ATTR(min_link_speed, S_IRUGO, qla2x00_min_link_speed_show, NULL);</div><div class='del'>-static DEVICE_ATTR(max_speed_sup, S_IRUGO, qla2x00_max_speed_sup_show, NULL);</div><div class='add'>+static DEVICE_ATTR(min_supported_speed, 0444,</div><div class='add'>+		   qla2x00_min_supported_speed_show, NULL);</div><div class='add'>+static DEVICE_ATTR(max_supported_speed, 0444,</div><div class='add'>+		   qla2x00_max_supported_speed_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(zio_threshold, 0644,</div><div class='ctx'>     qla_zio_threshold_show,</div><div class='ctx'>     qla_zio_threshold_store);</div><div class='hunk'>@@ -2221,6 +2308,8 @@ static DEVICE_ATTR(dif_bundle_statistics, 0444,</div><div class='ctx'>     qla2x00_dif_bundle_statistics_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(port_speed, 0644, qla2x00_port_speed_show,</div><div class='ctx'>     qla2x00_port_speed_store);</div><div class='add'>+static DEVICE_ATTR(port_no, 0444, qla2x00_port_no_show, NULL);</div><div class='add'>+static DEVICE_ATTR(fw_attr, 0444, qla2x00_fw_attr_show, NULL);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct device_attribute *qla2x00_host_attrs[] = {</div><div class='hunk'>@@ -2242,6 +2331,7 @@ struct device_attribute *qla2x00_host_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_optrom_fw_version,</div><div class='ctx'> 	&amp;dev_attr_84xx_fw_version,</div><div class='ctx'> 	&amp;dev_attr_total_isp_aborts,</div><div class='add'>+	&amp;dev_attr_serdes_version,</div><div class='ctx'> 	&amp;dev_attr_mpi_version,</div><div class='ctx'> 	&amp;dev_attr_phy_version,</div><div class='ctx'> 	&amp;dev_attr_flash_block_size,</div><div class='hunk'>@@ -2256,11 +2346,13 @@ struct device_attribute *qla2x00_host_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_fw_dump_size,</div><div class='ctx'> 	&amp;dev_attr_allow_cna_fw_dump,</div><div class='ctx'> 	&amp;dev_attr_pep_version,</div><div class='del'>-	&amp;dev_attr_min_link_speed,</div><div class='del'>-	&amp;dev_attr_max_speed_sup,</div><div class='add'>+	&amp;dev_attr_min_supported_speed,</div><div class='add'>+	&amp;dev_attr_max_supported_speed,</div><div class='ctx'> 	&amp;dev_attr_zio_threshold,</div><div class='ctx'> 	&amp;dev_attr_dif_bundle_statistics,</div><div class='ctx'> 	&amp;dev_attr_port_speed,</div><div class='add'>+	&amp;dev_attr_port_no,</div><div class='add'>+	&amp;dev_attr_fw_attr,</div><div class='ctx'> 	NULL, /* reserve for qlini_mode */</div><div class='ctx'> 	NULL, /* reserve for ql2xiniexchg */</div><div class='ctx'> 	NULL, /* reserve for ql2xexchoffld */</div><div class='hunk'>@@ -2296,16 +2388,15 @@ qla2x00_get_host_port_id(struct Scsi_Host *shost)</div><div class='ctx'> static void</div><div class='ctx'> qla2x00_get_host_speed(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='del'>-	struct qla_hw_data *ha = ((struct scsi_qla_host *)</div><div class='del'>-					(shost_priv(shost)))-&gt;hw;</div><div class='del'>-	u32 speed = FC_PORTSPEED_UNKNOWN;</div><div class='add'>+	scsi_qla_host_t *vha = shost_priv(shost);</div><div class='add'>+	u32 speed;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLAFX00(ha)) {</div><div class='add'>+	if (IS_QLAFX00(vha-&gt;hw)) {</div><div class='ctx'> 		qlafx00_get_host_speed(shost);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ha-&gt;link_data_rate) {</div><div class='add'>+	switch (vha-&gt;hw-&gt;link_data_rate) {</div><div class='ctx'> 	case PORT_SPEED_1GB:</div><div class='ctx'> 		speed = FC_PORTSPEED_1GBIT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2327,7 +2418,14 @@ qla2x00_get_host_speed(struct Scsi_Host *shost)</div><div class='ctx'> 	case PORT_SPEED_32GB:</div><div class='ctx'> 		speed = FC_PORTSPEED_32GBIT;</div><div class='ctx'> 		break;</div><div class='add'>+	case PORT_SPEED_64GB:</div><div class='add'>+		speed = FC_PORTSPEED_64GBIT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		speed = FC_PORTSPEED_UNKNOWN;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	fc_host_speed(shost) = speed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2335,7 +2433,7 @@ static void</div><div class='ctx'> qla2x00_get_host_port_type(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(shost);</div><div class='del'>-	uint32_t port_type = FC_PORTTYPE_UNKNOWN;</div><div class='add'>+	uint32_t port_type;</div><div class='ctx'> </div><div class='ctx'> 	if (vha-&gt;vp_idx) {</div><div class='ctx'> 		fc_host_port_type(shost) = FC_PORTTYPE_NPIV;</div><div class='hunk'>@@ -2354,7 +2452,11 @@ qla2x00_get_host_port_type(struct Scsi_Host *shost)</div><div class='ctx'> 	case ISP_CFG_F:</div><div class='ctx'> 		port_type = FC_PORTTYPE_NPORT;</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		port_type = FC_PORTTYPE_UNKNOWN;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	fc_host_port_type(shost) = port_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2416,13 +2518,10 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)</div><div class='ctx'> 	fc_starget_port_id(starget) = port_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static inline void</div><div class='ctx'> qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)</div><div class='ctx'> {</div><div class='del'>-	if (timeout)</div><div class='del'>-		rport-&gt;dev_loss_tmo = timeout;</div><div class='del'>-	else</div><div class='del'>-		rport-&gt;dev_loss_tmo = 1;</div><div class='add'>+	rport-&gt;dev_loss_tmo = timeout ? timeout : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2632,8 +2731,9 @@ static void</div><div class='ctx'> qla2x00_get_host_fabric_name(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = shost_priv(shost);</div><div class='del'>-	uint8_t node_name[WWN_SIZE] = { 0xFF, 0xFF, 0xFF, 0xFF, \</div><div class='del'>-		0xFF, 0xFF, 0xFF, 0xFF};</div><div class='add'>+	static const uint8_t node_name[WWN_SIZE] = {</div><div class='add'>+		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF</div><div class='add'>+	};</div><div class='ctx'> 	u64 fabric_name = wwn_to_u64(node_name);</div><div class='ctx'> </div><div class='ctx'> 	if (vha-&gt;device_flags &amp; SWITCH_FOUND)</div><div class='hunk'>@@ -2711,8 +2811,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)</div><div class='ctx'> </div><div class='ctx'> 	/* initialized vport states */</div><div class='ctx'> 	atomic_set(&amp;vha-&gt;loop_state, LOOP_DOWN);</div><div class='del'>-	vha-&gt;vp_err_state=  VP_ERR_PORTDWN;</div><div class='del'>-	vha-&gt;vp_prev_err_state=  VP_ERR_UNKWN;</div><div class='add'>+	vha-&gt;vp_err_state = VP_ERR_PORTDWN;</div><div class='add'>+	vha-&gt;vp_prev_err_state = VP_ERR_UNKWN;</div><div class='ctx'> 	/* Check if physical ha port is Up */</div><div class='ctx'> 	if (atomic_read(&amp;base_vha-&gt;loop_state) == LOOP_DOWN ||</div><div class='ctx'> 	    atomic_read(&amp;base_vha-&gt;loop_state) == LOOP_DEAD) {</div><div class='hunk'>@@ -2727,6 +2827,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)</div><div class='ctx'> 	if (IS_T10_PI_CAPABLE(ha) &amp;&amp; ql2xenabledif) {</div><div class='ctx'> 		if (ha-&gt;fw_attributes &amp; BIT_4) {</div><div class='ctx'> 			int prot = 0, guard;</div><div class='add'>+</div><div class='ctx'> 			vha-&gt;flags.difdix_supported = 1;</div><div class='ctx'> 			ql_dbg(ql_dbg_user, vha, 0x7082,</div><div class='ctx'> 			    "Registered for DIF/DIX type 1 and 3 protection.\n");</div><div class='hunk'>@@ -2977,7 +3078,7 @@ void</div><div class='ctx'> qla2x00_init_host_attr(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	u32 speed = FC_PORTSPEED_UNKNOWN;</div><div class='add'>+	u32 speeds = FC_PORTSPEED_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	fc_host_dev_loss_tmo(vha-&gt;host) = ha-&gt;port_down_retry_count;</div><div class='ctx'> 	fc_host_node_name(vha-&gt;host) = wwn_to_u64(vha-&gt;node_name);</div><div class='hunk'>@@ -2988,25 +3089,45 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)</div><div class='ctx'> 	fc_host_npiv_vports_inuse(vha-&gt;host) = ha-&gt;cur_vport_count;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_CNA_CAPABLE(ha))</div><div class='del'>-		speed = FC_PORTSPEED_10GBIT;</div><div class='del'>-	else if (IS_QLA2031(ha))</div><div class='del'>-		speed = FC_PORTSPEED_16GBIT | FC_PORTSPEED_8GBIT |</div><div class='del'>-		    FC_PORTSPEED_4GBIT;</div><div class='del'>-	else if (IS_QLA25XX(ha))</div><div class='del'>-		speed = FC_PORTSPEED_8GBIT | FC_PORTSPEED_4GBIT |</div><div class='del'>-		    FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;</div><div class='add'>+		speeds = FC_PORTSPEED_10GBIT;</div><div class='add'>+	else if (IS_QLA28XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+		if (ha-&gt;max_supported_speed == 2) {</div><div class='add'>+			if (ha-&gt;min_supported_speed &lt;= 6)</div><div class='add'>+				speeds |= FC_PORTSPEED_64GBIT;</div><div class='add'>+		}</div><div class='add'>+		if (ha-&gt;max_supported_speed == 2 ||</div><div class='add'>+		    ha-&gt;max_supported_speed == 1) {</div><div class='add'>+			if (ha-&gt;min_supported_speed &lt;= 5)</div><div class='add'>+				speeds |= FC_PORTSPEED_32GBIT;</div><div class='add'>+		}</div><div class='add'>+		if (ha-&gt;max_supported_speed == 2 ||</div><div class='add'>+		    ha-&gt;max_supported_speed == 1 ||</div><div class='add'>+		    ha-&gt;max_supported_speed == 0) {</div><div class='add'>+			if (ha-&gt;min_supported_speed &lt;= 4)</div><div class='add'>+				speeds |= FC_PORTSPEED_16GBIT;</div><div class='add'>+		}</div><div class='add'>+		if (ha-&gt;max_supported_speed == 1 ||</div><div class='add'>+		    ha-&gt;max_supported_speed == 0) {</div><div class='add'>+			if (ha-&gt;min_supported_speed &lt;= 3)</div><div class='add'>+				speeds |= FC_PORTSPEED_8GBIT;</div><div class='add'>+		}</div><div class='add'>+		if (ha-&gt;max_supported_speed == 0) {</div><div class='add'>+			if (ha-&gt;min_supported_speed &lt;= 2)</div><div class='add'>+				speeds |= FC_PORTSPEED_4GBIT;</div><div class='add'>+		}</div><div class='add'>+	} else if (IS_QLA2031(ha))</div><div class='add'>+		speeds = FC_PORTSPEED_16GBIT|FC_PORTSPEED_8GBIT|</div><div class='add'>+			FC_PORTSPEED_4GBIT;</div><div class='add'>+	else if (IS_QLA25XX(ha) || IS_QLAFX00(ha))</div><div class='add'>+		speeds = FC_PORTSPEED_8GBIT|FC_PORTSPEED_4GBIT|</div><div class='add'>+			FC_PORTSPEED_2GBIT|FC_PORTSPEED_1GBIT;</div><div class='ctx'> 	else if (IS_QLA24XX_TYPE(ha))</div><div class='del'>-		speed = FC_PORTSPEED_4GBIT | FC_PORTSPEED_2GBIT |</div><div class='del'>-		    FC_PORTSPEED_1GBIT;</div><div class='add'>+		speeds = FC_PORTSPEED_4GBIT|FC_PORTSPEED_2GBIT|</div><div class='add'>+			FC_PORTSPEED_1GBIT;</div><div class='ctx'> 	else if (IS_QLA23XX(ha))</div><div class='del'>-		speed = FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;</div><div class='del'>-	else if (IS_QLAFX00(ha))</div><div class='del'>-		speed = FC_PORTSPEED_8GBIT | FC_PORTSPEED_4GBIT |</div><div class='del'>-		    FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;</div><div class='del'>-	else if (IS_QLA27XX(ha))</div><div class='del'>-		speed = FC_PORTSPEED_32GBIT | FC_PORTSPEED_16GBIT |</div><div class='del'>-		    FC_PORTSPEED_8GBIT;</div><div class='add'>+		speeds = FC_PORTSPEED_2GBIT|FC_PORTSPEED_1GBIT;</div><div class='ctx'> 	else</div><div class='del'>-		speed = FC_PORTSPEED_1GBIT;</div><div class='del'>-	fc_host_supported_speeds(vha-&gt;host) = speed;</div><div class='add'>+		speeds = FC_PORTSPEED_1GBIT;</div><div class='add'>+</div><div class='add'>+	fc_host_supported_speeds(vha-&gt;host) = speeds;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c<br/>index 17d42658ad9a..5441557b424b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_bsg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_bsg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_bsg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_bsg.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-	/*</div><div class='add'>+/*</div><div class='ctx'>  * QLogic Fibre Channel HBA Driver</div><div class='ctx'>  * Copyright (c)  2003-2014 QLogic Corporation</div><div class='ctx'>  *</div><div class='hunk'>@@ -84,8 +84,7 @@ qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *vha,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bcode[0] != 'H' || bcode[1] != 'Q' || bcode[2] != 'O' ||</div><div class='del'>-			bcode[3] != 'S') {</div><div class='add'>+	if (memcmp(bcode, "HQOS", 4)) {</div><div class='ctx'> 		/* Invalid FCP priority data header*/</div><div class='ctx'> 		ql_dbg(ql_dbg_user, vha, 0x7052,</div><div class='ctx'> 		    "Invalid FCP Priority data header. bcode=0x%x.\n",</div><div class='hunk'>@@ -1044,7 +1043,7 @@ qla84xx_updatefw(struct bsg_job *bsg_job)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flag = bsg_request-&gt;rqst_data.h_vendor.vendor_cmd[1];</div><div class='del'>-	fw_ver = le32_to_cpu(*((uint32_t *)((uint32_t *)fw_buf + 2)));</div><div class='add'>+	fw_ver = get_unaligned_le32((uint32_t *)fw_buf + 2);</div><div class='ctx'> </div><div class='ctx'> 	mn-&gt;entry_type = VERIFY_CHIP_IOCB_TYPE;</div><div class='ctx'> 	mn-&gt;entry_count = 1;</div><div class='hunk'>@@ -1057,9 +1056,8 @@ qla84xx_updatefw(struct bsg_job *bsg_job)</div><div class='ctx'> 	mn-&gt;fw_ver =  cpu_to_le32(fw_ver);</div><div class='ctx'> 	mn-&gt;fw_size =  cpu_to_le32(data_len);</div><div class='ctx'> 	mn-&gt;fw_seq_size =  cpu_to_le32(data_len);</div><div class='del'>-	mn-&gt;dseg_address[0] = cpu_to_le32(LSD(fw_dma));</div><div class='del'>-	mn-&gt;dseg_address[1] = cpu_to_le32(MSD(fw_dma));</div><div class='del'>-	mn-&gt;dseg_length = cpu_to_le32(data_len);</div><div class='add'>+	put_unaligned_le64(fw_dma, &amp;mn-&gt;dsd.address);</div><div class='add'>+	mn-&gt;dsd.length = cpu_to_le32(data_len);</div><div class='ctx'> 	mn-&gt;data_seg_cnt = cpu_to_le16(1);</div><div class='ctx'> </div><div class='ctx'> 	rval = qla2x00_issue_iocb_timeout(vha, mn, mn_dma, 0, 120);</div><div class='hunk'>@@ -1238,9 +1236,8 @@ qla84xx_mgmt_cmd(struct bsg_job *bsg_job)</div><div class='ctx'> 	if (ql84_mgmt-&gt;mgmt.cmd != QLA84_MGMT_CHNG_CONFIG) {</div><div class='ctx'> 		mn-&gt;total_byte_cnt = cpu_to_le32(ql84_mgmt-&gt;mgmt.len);</div><div class='ctx'> 		mn-&gt;dseg_count = cpu_to_le16(1);</div><div class='del'>-		mn-&gt;dseg_address[0] = cpu_to_le32(LSD(mgmt_dma));</div><div class='del'>-		mn-&gt;dseg_address[1] = cpu_to_le32(MSD(mgmt_dma));</div><div class='del'>-		mn-&gt;dseg_length = cpu_to_le32(ql84_mgmt-&gt;mgmt.len);</div><div class='add'>+		put_unaligned_le64(mgmt_dma, &amp;mn-&gt;dsd.address);</div><div class='add'>+		mn-&gt;dsd.length = cpu_to_le32(ql84_mgmt-&gt;mgmt.len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rval = qla2x00_issue_iocb(vha, mn, mn_dma, 0);</div><div class='hunk'>@@ -1354,7 +1351,7 @@ qla24xx_iidma(struct bsg_job *bsg_job)</div><div class='ctx'> </div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x704c,</div><div class='del'>-		    "iIDMA cmd failed for %8phN -- "</div><div class='add'>+		    "iiDMA cmd failed for %8phN -- "</div><div class='ctx'> 		    "%04x %x %04x %04x.\n", fcport-&gt;port_name,</div><div class='ctx'> 		    rval, fcport-&gt;fp_speed, mb[0], mb[1]);</div><div class='ctx'> 		rval = (DID_ERROR &lt;&lt; 16);</div><div class='hunk'>@@ -1412,7 +1409,8 @@ qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,</div><div class='ctx'> 		    start == (ha-&gt;flt_region_fw * 4))</div><div class='ctx'> 			valid = 1;</div><div class='ctx'> 		else if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha) ||</div><div class='del'>-		    IS_CNA_CAPABLE(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha))</div><div class='add'>+		    IS_CNA_CAPABLE(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+		    IS_QLA28XX(ha))</div><div class='ctx'> 			valid = 1;</div><div class='ctx'> 		if (!valid) {</div><div class='ctx'> 			ql_log(ql_log_warn, vha, 0x7058,</div><div class='hunk'>@@ -1534,6 +1532,7 @@ qla2x00_update_fru_versions(struct bsg_job *bsg_job)</div><div class='ctx'> 	uint32_t count;</div><div class='ctx'> 	dma_addr_t sfp_dma;</div><div class='ctx'> 	void *sfp = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;sfp_dma);</div><div class='add'>+</div><div class='ctx'> 	if (!sfp) {</div><div class='ctx'> 		bsg_reply-&gt;reply_data.vendor_reply.vendor_rsp[0] =</div><div class='ctx'> 		    EXT_STATUS_NO_MEMORY;</div><div class='hunk'>@@ -1584,6 +1583,7 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job)</div><div class='ctx'> 	struct qla_status_reg *sr = (void *)bsg;</div><div class='ctx'> 	dma_addr_t sfp_dma;</div><div class='ctx'> 	uint8_t *sfp = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;sfp_dma);</div><div class='add'>+</div><div class='ctx'> 	if (!sfp) {</div><div class='ctx'> 		bsg_reply-&gt;reply_data.vendor_reply.vendor_rsp[0] =</div><div class='ctx'> 		    EXT_STATUS_NO_MEMORY;</div><div class='hunk'>@@ -1634,6 +1634,7 @@ qla2x00_write_fru_status(struct bsg_job *bsg_job)</div><div class='ctx'> 	struct qla_status_reg *sr = (void *)bsg;</div><div class='ctx'> 	dma_addr_t sfp_dma;</div><div class='ctx'> 	uint8_t *sfp = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;sfp_dma);</div><div class='add'>+</div><div class='ctx'> 	if (!sfp) {</div><div class='ctx'> 		bsg_reply-&gt;reply_data.vendor_reply.vendor_rsp[0] =</div><div class='ctx'> 		    EXT_STATUS_NO_MEMORY;</div><div class='hunk'>@@ -1680,6 +1681,7 @@ qla2x00_write_i2c(struct bsg_job *bsg_job)</div><div class='ctx'> 	struct qla_i2c_access *i2c = (void *)bsg;</div><div class='ctx'> 	dma_addr_t sfp_dma;</div><div class='ctx'> 	uint8_t *sfp = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;sfp_dma);</div><div class='add'>+</div><div class='ctx'> 	if (!sfp) {</div><div class='ctx'> 		bsg_reply-&gt;reply_data.vendor_reply.vendor_rsp[0] =</div><div class='ctx'> 		    EXT_STATUS_NO_MEMORY;</div><div class='hunk'>@@ -1725,6 +1727,7 @@ qla2x00_read_i2c(struct bsg_job *bsg_job)</div><div class='ctx'> 	struct qla_i2c_access *i2c = (void *)bsg;</div><div class='ctx'> 	dma_addr_t sfp_dma;</div><div class='ctx'> 	uint8_t *sfp = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;sfp_dma);</div><div class='add'>+</div><div class='ctx'> 	if (!sfp) {</div><div class='ctx'> 		bsg_reply-&gt;reply_data.vendor_reply.vendor_rsp[0] =</div><div class='ctx'> 		    EXT_STATUS_NO_MEMORY;</div><div class='hunk'>@@ -1961,7 +1964,7 @@ qlafx00_mgmt_cmd(struct bsg_job *bsg_job)</div><div class='ctx'> </div><div class='ctx'> 	/* Dump the vendor information */</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_user + ql_dbg_verbose , vha, 0x70cf,</div><div class='del'>-	    (uint8_t *)piocb_rqst, sizeof(struct qla_mt_iocb_rqst_fx00));</div><div class='add'>+	    piocb_rqst, sizeof(*piocb_rqst));</div><div class='ctx'> </div><div class='ctx'> 	if (!vha-&gt;flags.online) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x70d0,</div><div class='hunk'>@@ -2157,7 +2160,7 @@ qla27xx_get_flash_upd_cap(struct bsg_job *bsg_job)</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct qla_flash_update_caps cap;</div><div class='ctx'> </div><div class='del'>-	if (!(IS_QLA27XX(ha)))</div><div class='add'>+	if (!(IS_QLA27XX(ha)) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cap, 0, sizeof(cap));</div><div class='hunk'>@@ -2190,7 +2193,7 @@ qla27xx_set_flash_upd_cap(struct bsg_job *bsg_job)</div><div class='ctx'> 	uint64_t online_fw_attr = 0;</div><div class='ctx'> 	struct qla_flash_update_caps cap;</div><div class='ctx'> </div><div class='del'>-	if (!(IS_QLA27XX(ha)))</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cap, 0, sizeof(cap));</div><div class='hunk'>@@ -2238,7 +2241,7 @@ qla27xx_get_bbcr_data(struct bsg_job *bsg_job)</div><div class='ctx'> 	uint8_t domain, area, al_pa, state;</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='del'>-	if (!(IS_QLA27XX(ha)))</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;bbcr, 0, sizeof(bbcr));</div><div class='hunk'>@@ -2323,8 +2326,8 @@ qla2x00_get_priv_stats(struct bsg_job *bsg_job)</div><div class='ctx'> 	rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma, options);</div><div class='ctx'> </div><div class='ctx'> 	if (rval == QLA_SUCCESS) {</div><div class='del'>-		ql_dump_buffer(ql_dbg_user + ql_dbg_verbose, vha, 0x70e3,</div><div class='del'>-		    (uint8_t *)stats, sizeof(*stats));</div><div class='add'>+		ql_dump_buffer(ql_dbg_user + ql_dbg_verbose, vha, 0x70e5,</div><div class='add'>+			stats, sizeof(*stats));</div><div class='ctx'> 		sg_copy_from_buffer(bsg_job-&gt;reply_payload.sg_list,</div><div class='ctx'> 			bsg_job-&gt;reply_payload.sg_cnt, stats, sizeof(*stats));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2353,7 +2356,8 @@ qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)</div><div class='ctx'> 	int rval;</div><div class='ctx'> 	struct qla_dport_diag *dd;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(vha-&gt;hw) &amp;&amp; !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	if (!IS_QLA83XX(vha-&gt;hw) &amp;&amp; !IS_QLA27XX(vha-&gt;hw) &amp;&amp;</div><div class='add'>+	    !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	dd = kmalloc(sizeof(*dd), GFP_KERNEL);</div><div class='hunk'>@@ -2388,6 +2392,45 @@ qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+qla2x00_get_flash_image_status(struct bsg_job *bsg_job)</div><div class='add'>+{</div><div class='add'>+	scsi_qla_host_t *vha = shost_priv(fc_bsg_to_shost(bsg_job));</div><div class='add'>+	struct fc_bsg_reply *bsg_reply = bsg_job-&gt;reply;</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct qla_active_regions regions = { };</div><div class='add'>+	struct active_regions active_regions = { };</div><div class='add'>+</div><div class='add'>+	qla28xx_get_aux_images(vha, &amp;active_regions);</div><div class='add'>+	regions.global_image = active_regions.global;</div><div class='add'>+</div><div class='add'>+	if (IS_QLA28XX(ha)) {</div><div class='add'>+		qla27xx_get_active_image(vha, &amp;active_regions);</div><div class='add'>+		regions.board_config = active_regions.aux.board_config;</div><div class='add'>+		regions.vpd_nvram = active_regions.aux.vpd_nvram;</div><div class='add'>+		regions.npiv_config_0_1 = active_regions.aux.npiv_config_0_1;</div><div class='add'>+		regions.npiv_config_2_3 = active_regions.aux.npiv_config_2_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_user, vha, 0x70e1,</div><div class='add'>+	    "%s(%lu): FW=%u BCFG=%u VPDNVR=%u NPIV01=%u NPIV02=%u\n",</div><div class='add'>+	    __func__, vha-&gt;host_no, regions.global_image,</div><div class='add'>+	    regions.board_config, regions.vpd_nvram,</div><div class='add'>+	    regions.npiv_config_0_1, regions.npiv_config_2_3);</div><div class='add'>+</div><div class='add'>+	sg_copy_from_buffer(bsg_job-&gt;reply_payload.sg_list,</div><div class='add'>+	    bsg_job-&gt;reply_payload.sg_cnt, &amp;regions, sizeof(regions));</div><div class='add'>+</div><div class='add'>+	bsg_reply-&gt;reply_data.vendor_reply.vendor_rsp[0] = EXT_STATUS_OK;</div><div class='add'>+	bsg_reply-&gt;reply_payload_rcv_len = sizeof(regions);</div><div class='add'>+	bsg_reply-&gt;result = DID_OK &lt;&lt; 16;</div><div class='add'>+	bsg_job-&gt;reply_len = sizeof(struct fc_bsg_reply);</div><div class='add'>+	bsg_job_done(bsg_job, bsg_reply-&gt;result,</div><div class='add'>+	    bsg_reply-&gt;reply_payload_rcv_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='ctx'> qla2x00_process_vendor_specific(struct bsg_job *bsg_job)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_bsg_request *bsg_request = bsg_job-&gt;request;</div><div class='hunk'>@@ -2460,6 +2503,9 @@ qla2x00_process_vendor_specific(struct bsg_job *bsg_job)</div><div class='ctx'> 	case QL_VND_DPORT_DIAGNOSTICS:</div><div class='ctx'> 		return qla2x00_do_dport_diagnostics(bsg_job);</div><div class='ctx'> </div><div class='add'>+	case QL_VND_SS_GET_FLASH_IMAGE_STATUS:</div><div class='add'>+		return qla2x00_get_flash_image_status(bsg_job);</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_bsg.h b/drivers/scsi/qla2xxx/qla_bsg.h<br/>index d97dfd521356..7594fad7b5b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_bsg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_bsg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_bsg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_bsg.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #define QL_VND_GET_PRIV_STATS	0x18</div><div class='ctx'> #define QL_VND_DPORT_DIAGNOSTICS	0x19</div><div class='ctx'> #define QL_VND_GET_PRIV_STATS_EX	0x1A</div><div class='add'>+#define QL_VND_SS_GET_FLASH_IMAGE_STATUS	0x1E</div><div class='ctx'> </div><div class='ctx'> /* BSG Vendor specific subcode returns */</div><div class='ctx'> #define EXT_STATUS_OK			0</div><div class='hunk'>@@ -279,4 +280,14 @@ struct qla_dport_diag {</div><div class='ctx'> #define QLA_DPORT_RESULT	0x0</div><div class='ctx'> #define QLA_DPORT_START		0x2</div><div class='ctx'> </div><div class='add'>+/* active images in flash */</div><div class='add'>+struct qla_active_regions {</div><div class='add'>+	uint8_t global_image;</div><div class='add'>+	uint8_t board_config;</div><div class='add'>+	uint8_t vpd_nvram;</div><div class='add'>+	uint8_t npiv_config_0_1;</div><div class='add'>+	uint8_t npiv_config_2_3;</div><div class='add'>+	uint8_t reserved[32];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c<br/>index c7533fa7f46e..9e80646722e2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dbg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_dbg.c</a></div><div class='hunk'>@@ -111,30 +111,25 @@ int</div><div class='ctx'> qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,</div><div class='ctx'> 	uint32_t ram_dwords, void **nxt)</div><div class='ctx'> {</div><div class='del'>-	int rval;</div><div class='del'>-	uint32_t cnt, stat, timer, dwords, idx;</div><div class='del'>-	uint16_t mb0;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='ctx'> 	dma_addr_t dump_dma = ha-&gt;gid_list_dma;</div><div class='del'>-	uint32_t *dump = (uint32_t *)ha-&gt;gid_list;</div><div class='del'>-</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-	mb0 = 0;</div><div class='add'>+	uint32_t *chunk = (void *)ha-&gt;gid_list;</div><div class='add'>+	uint32_t dwords = qla2x00_gid_list_size(ha) / 4;</div><div class='add'>+	uint32_t stat;</div><div class='add'>+	ulong i, j, timer = 6000000;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='del'>-	WRT_REG_WORD(&amp;reg-&gt;mailbox0, MBC_LOAD_DUMP_MPI_RAM);</div><div class='ctx'> 	clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags);</div><div class='add'>+	for (i = 0; i &lt; ram_dwords; i += dwords, addr += dwords) {</div><div class='add'>+		if (i + dwords &gt; ram_dwords)</div><div class='add'>+			dwords = ram_dwords - i;</div><div class='ctx'> </div><div class='del'>-	dwords = qla2x00_gid_list_size(ha) / 4;</div><div class='del'>-	for (cnt = 0; cnt &lt; ram_dwords &amp;&amp; rval == QLA_SUCCESS;</div><div class='del'>-	    cnt += dwords, addr += dwords) {</div><div class='del'>-		if (cnt + dwords &gt; ram_dwords)</div><div class='del'>-			dwords = ram_dwords - cnt;</div><div class='del'>-</div><div class='add'>+		WRT_REG_WORD(&amp;reg-&gt;mailbox0, MBC_LOAD_DUMP_MPI_RAM);</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox1, LSW(addr));</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox8, MSW(addr));</div><div class='ctx'> </div><div class='del'>-		WRT_REG_WORD(&amp;reg-&gt;mailbox2, MSW(dump_dma));</div><div class='del'>-		WRT_REG_WORD(&amp;reg-&gt;mailbox3, LSW(dump_dma));</div><div class='add'>+		WRT_REG_WORD(&amp;reg-&gt;mailbox2, MSW(LSD(dump_dma)));</div><div class='add'>+		WRT_REG_WORD(&amp;reg-&gt;mailbox3, LSW(LSD(dump_dma)));</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox6, MSW(MSD(dump_dma)));</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox7, LSW(MSD(dump_dma)));</div><div class='ctx'> </div><div class='hunk'>@@ -145,76 +140,76 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;hccr, HCCRX_SET_HOST_INT);</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;flags.mbox_int = 0;</div><div class='del'>-		for (timer = 6000000; timer; timer--) {</div><div class='del'>-			/* Check for pending interrupts. */</div><div class='del'>-			stat = RD_REG_DWORD(&amp;reg-&gt;host_status);</div><div class='del'>-			if (stat &amp; HSRX_RISC_INT) {</div><div class='del'>-				stat &amp;= 0xff;</div><div class='del'>-</div><div class='del'>-				if (stat == 0x1 || stat == 0x2 ||</div><div class='del'>-				    stat == 0x10 || stat == 0x11) {</div><div class='del'>-					set_bit(MBX_INTERRUPT,</div><div class='del'>-					    &amp;ha-&gt;mbx_cmd_flags);</div><div class='add'>+		while (timer--) {</div><div class='add'>+			udelay(5);</div><div class='ctx'> </div><div class='del'>-					mb0 = RD_REG_WORD(&amp;reg-&gt;mailbox0);</div><div class='del'>-					RD_REG_WORD(&amp;reg-&gt;mailbox1);</div><div class='add'>+			stat = RD_REG_DWORD(&amp;reg-&gt;host_status);</div><div class='add'>+			/* Check for pending interrupts. */</div><div class='add'>+			if (!(stat &amp; HSRX_RISC_INT))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-					WRT_REG_DWORD(&amp;reg-&gt;hccr,</div><div class='del'>-					    HCCRX_CLR_RISC_INT);</div><div class='del'>-					RD_REG_DWORD(&amp;reg-&gt;hccr);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+			stat &amp;= 0xff;</div><div class='add'>+			if (stat != 0x1 &amp;&amp; stat != 0x2 &amp;&amp;</div><div class='add'>+			    stat != 0x10 &amp;&amp; stat != 0x11) {</div><div class='ctx'> </div><div class='ctx'> 				/* Clear this intr; it wasn't a mailbox intr */</div><div class='ctx'> 				WRT_REG_DWORD(&amp;reg-&gt;hccr, HCCRX_CLR_RISC_INT);</div><div class='ctx'> 				RD_REG_DWORD(&amp;reg-&gt;hccr);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			udelay(5);</div><div class='add'>+</div><div class='add'>+			set_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags);</div><div class='add'>+			rval = RD_REG_WORD(&amp;reg-&gt;mailbox0) &amp; MBS_MASK;</div><div class='add'>+			WRT_REG_DWORD(&amp;reg-&gt;hccr, HCCRX_CLR_RISC_INT);</div><div class='add'>+			RD_REG_DWORD(&amp;reg-&gt;hccr);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		ha-&gt;flags.mbox_int = 1;</div><div class='add'>+		*nxt = ram + i;</div><div class='ctx'> </div><div class='del'>-		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='del'>-			rval = mb0 &amp; MBS_MASK;</div><div class='del'>-			for (idx = 0; idx &lt; dwords; idx++)</div><div class='del'>-				ram[cnt + idx] = IS_QLA27XX(ha) ?</div><div class='del'>-				    le32_to_cpu(dump[idx]) : swab32(dump[idx]);</div><div class='del'>-		} else {</div><div class='del'>-			rval = QLA_FUNCTION_FAILED;</div><div class='add'>+		if (!test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='add'>+			/* no interrupt, timed out*/</div><div class='add'>+			return rval;</div><div class='add'>+		}</div><div class='add'>+		if (rval) {</div><div class='add'>+			/* error completion status */</div><div class='add'>+			return rval;</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; dwords; j++) {</div><div class='add'>+			ram[i + j] =</div><div class='add'>+			    (IS_QLA27XX(ha) || IS_QLA28XX(ha)) ?</div><div class='add'>+			    chunk[j] : swab32(chunk[j]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*nxt = rval == QLA_SUCCESS ? &amp;ram[cnt] : NULL;</div><div class='del'>-	return rval;</div><div class='add'>+	*nxt = ram + i;</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,</div><div class='ctx'>     uint32_t ram_dwords, void **nxt)</div><div class='ctx'> {</div><div class='del'>-	int rval;</div><div class='del'>-	uint32_t cnt, stat, timer, dwords, idx;</div><div class='del'>-	uint16_t mb0;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='ctx'> 	dma_addr_t dump_dma = ha-&gt;gid_list_dma;</div><div class='del'>-	uint32_t *dump = (uint32_t *)ha-&gt;gid_list;</div><div class='add'>+	uint32_t *chunk = (void *)ha-&gt;gid_list;</div><div class='add'>+	uint32_t dwords = qla2x00_gid_list_size(ha) / 4;</div><div class='add'>+	uint32_t stat;</div><div class='add'>+	ulong i, j, timer = 6000000;</div><div class='ctx'> </div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-	mb0 = 0;</div><div class='del'>-</div><div class='del'>-	WRT_REG_WORD(&amp;reg-&gt;mailbox0, MBC_DUMP_RISC_RAM_EXTENDED);</div><div class='ctx'> 	clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags);</div><div class='ctx'> </div><div class='del'>-	dwords = qla2x00_gid_list_size(ha) / 4;</div><div class='del'>-	for (cnt = 0; cnt &lt; ram_dwords &amp;&amp; rval == QLA_SUCCESS;</div><div class='del'>-	    cnt += dwords, addr += dwords) {</div><div class='del'>-		if (cnt + dwords &gt; ram_dwords)</div><div class='del'>-			dwords = ram_dwords - cnt;</div><div class='add'>+	for (i = 0; i &lt; ram_dwords; i += dwords, addr += dwords) {</div><div class='add'>+		if (i + dwords &gt; ram_dwords)</div><div class='add'>+			dwords = ram_dwords - i;</div><div class='ctx'> </div><div class='add'>+		WRT_REG_WORD(&amp;reg-&gt;mailbox0, MBC_DUMP_RISC_RAM_EXTENDED);</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox1, LSW(addr));</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox8, MSW(addr));</div><div class='ctx'> </div><div class='del'>-		WRT_REG_WORD(&amp;reg-&gt;mailbox2, MSW(dump_dma));</div><div class='del'>-		WRT_REG_WORD(&amp;reg-&gt;mailbox3, LSW(dump_dma));</div><div class='add'>+		WRT_REG_WORD(&amp;reg-&gt;mailbox2, MSW(LSD(dump_dma)));</div><div class='add'>+		WRT_REG_WORD(&amp;reg-&gt;mailbox3, LSW(LSD(dump_dma)));</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox6, MSW(MSD(dump_dma)));</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;mailbox7, LSW(MSD(dump_dma)));</div><div class='ctx'> </div><div class='hunk'>@@ -223,45 +218,48 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;hccr, HCCRX_SET_HOST_INT);</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;flags.mbox_int = 0;</div><div class='del'>-		for (timer = 6000000; timer; timer--) {</div><div class='del'>-			/* Check for pending interrupts. */</div><div class='add'>+		while (timer--) {</div><div class='add'>+			udelay(5);</div><div class='ctx'> 			stat = RD_REG_DWORD(&amp;reg-&gt;host_status);</div><div class='del'>-			if (stat &amp; HSRX_RISC_INT) {</div><div class='del'>-				stat &amp;= 0xff;</div><div class='ctx'> </div><div class='del'>-				if (stat == 0x1 || stat == 0x2 ||</div><div class='del'>-				    stat == 0x10 || stat == 0x11) {</div><div class='del'>-					set_bit(MBX_INTERRUPT,</div><div class='del'>-					    &amp;ha-&gt;mbx_cmd_flags);</div><div class='del'>-</div><div class='del'>-					mb0 = RD_REG_WORD(&amp;reg-&gt;mailbox0);</div><div class='del'>-</div><div class='del'>-					WRT_REG_DWORD(&amp;reg-&gt;hccr,</div><div class='del'>-					    HCCRX_CLR_RISC_INT);</div><div class='del'>-					RD_REG_DWORD(&amp;reg-&gt;hccr);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+			/* Check for pending interrupts. */</div><div class='add'>+			if (!(stat &amp; HSRX_RISC_INT))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-				/* Clear this intr; it wasn't a mailbox intr */</div><div class='add'>+			stat &amp;= 0xff;</div><div class='add'>+			if (stat != 0x1 &amp;&amp; stat != 0x2 &amp;&amp;</div><div class='add'>+			    stat != 0x10 &amp;&amp; stat != 0x11) {</div><div class='ctx'> 				WRT_REG_DWORD(&amp;reg-&gt;hccr, HCCRX_CLR_RISC_INT);</div><div class='ctx'> 				RD_REG_DWORD(&amp;reg-&gt;hccr);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			udelay(5);</div><div class='add'>+</div><div class='add'>+			set_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags);</div><div class='add'>+			rval = RD_REG_WORD(&amp;reg-&gt;mailbox0) &amp; MBS_MASK;</div><div class='add'>+			WRT_REG_DWORD(&amp;reg-&gt;hccr, HCCRX_CLR_RISC_INT);</div><div class='add'>+			RD_REG_DWORD(&amp;reg-&gt;hccr);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		ha-&gt;flags.mbox_int = 1;</div><div class='add'>+		*nxt = ram + i;</div><div class='ctx'> </div><div class='del'>-		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='del'>-			rval = mb0 &amp; MBS_MASK;</div><div class='del'>-			for (idx = 0; idx &lt; dwords; idx++)</div><div class='del'>-				ram[cnt + idx] = IS_QLA27XX(ha) ?</div><div class='del'>-				    le32_to_cpu(dump[idx]) : swab32(dump[idx]);</div><div class='del'>-		} else {</div><div class='del'>-			rval = QLA_FUNCTION_FAILED;</div><div class='add'>+		if (!test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='add'>+			/* no interrupt, timed out*/</div><div class='add'>+			return rval;</div><div class='add'>+		}</div><div class='add'>+		if (rval) {</div><div class='add'>+			/* error completion status */</div><div class='add'>+			return rval;</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; dwords; j++) {</div><div class='add'>+			ram[i + j] =</div><div class='add'>+			    (IS_QLA27XX(ha) || IS_QLA28XX(ha)) ?</div><div class='add'>+			    chunk[j] : swab32(chunk[j]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*nxt = rval == QLA_SUCCESS ? &amp;ram[cnt]: NULL;</div><div class='del'>-	return rval;</div><div class='add'>+	*nxt = ram + i;</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -447,7 +445,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*nxt = rval == QLA_SUCCESS ? &amp;ram[cnt]: NULL;</div><div class='add'>+	*nxt = rval == QLA_SUCCESS ? &amp;ram[cnt] : NULL;</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -669,7 +667,8 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)</div><div class='ctx'> 	struct qla2xxx_mq_chain *mq = ptr;</div><div class='ctx'> 	device_reg_t *reg;</div><div class='ctx'> </div><div class='del'>-	if (!ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (!ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha))</div><div class='ctx'> 		return ptr;</div><div class='ctx'> </div><div class='ctx'> 	mq = ptr;</div><div class='hunk'>@@ -2521,7 +2520,7 @@ qla83xx_fw_dump_failed:</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-ql_mask_match(uint32_t level)</div><div class='add'>+ql_mask_match(uint level)</div><div class='ctx'> {</div><div class='ctx'> 	return (level &amp; ql2xextended_error_logging) == level;</div><div class='ctx'> }</div><div class='hunk'>@@ -2540,7 +2539,7 @@ ql_mask_match(uint32_t level)</div><div class='ctx'>  * msg:   The message to be displayed.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)</div><div class='add'>+ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -2583,8 +2582,7 @@ ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)</div><div class='ctx'>  * msg:   The message to be displayed.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id,</div><div class='del'>-	   const char *fmt, ...)</div><div class='add'>+ql_dbg_pci(uint level, struct pci_dev *pdev, uint id, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -2620,7 +2618,7 @@ ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id,</div><div class='ctx'>  * msg:   The message to be displayed.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)</div><div class='add'>+ql_log(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -2678,8 +2676,7 @@ ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)</div><div class='ctx'>  * msg:   The message to be displayed.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-ql_log_pci(uint32_t level, struct pci_dev *pdev, int32_t id,</div><div class='del'>-	   const char *fmt, ...)</div><div class='add'>+ql_log_pci(uint level, struct pci_dev *pdev, uint id, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	va_list va;</div><div class='ctx'> 	struct va_format vaf;</div><div class='hunk'>@@ -2719,7 +2716,7 @@ ql_log_pci(uint32_t level, struct pci_dev *pdev, int32_t id,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-ql_dump_regs(uint32_t level, scsi_qla_host_t *vha, int32_t id)</div><div class='add'>+ql_dump_regs(uint level, scsi_qla_host_t *vha, uint id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='hunk'>@@ -2741,13 +2738,12 @@ ql_dump_regs(uint32_t level, scsi_qla_host_t *vha, int32_t id)</div><div class='ctx'> 	ql_dbg(level, vha, id, "Mailbox registers:\n");</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++, mbx_reg++)</div><div class='ctx'> 		ql_dbg(level, vha, id,</div><div class='del'>-		    "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg));</div><div class='add'>+		    "mbox[%d] %#04x\n", i, RD_REG_WORD(mbx_reg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-ql_dump_buffer(uint32_t level, scsi_qla_host_t *vha, int32_t id,</div><div class='del'>-	uint8_t *buf, uint size)</div><div class='add'>+ql_dump_buffer(uint level, scsi_qla_host_t *vha, uint id, void *buf, uint size)</div><div class='ctx'> {</div><div class='ctx'> 	uint cnt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h<br/>index 8877aa97d829..bb01b680ce9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dbg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_dbg.h</a></div><div class='hunk'>@@ -318,20 +318,20 @@ struct qla2xxx_fw_dump {</div><div class='ctx'> 				   * as compared to other log levels.</div><div class='ctx'> 				   */</div><div class='ctx'> </div><div class='del'>-extern int ql_errlev;</div><div class='add'>+extern uint ql_errlev;</div><div class='ctx'> </div><div class='ctx'> void __attribute__((format (printf, 4, 5)))</div><div class='del'>-ql_dbg(uint32_t, scsi_qla_host_t *vha, int32_t, const char *fmt, ...);</div><div class='add'>+ql_dbg(uint, scsi_qla_host_t *vha, uint, const char *fmt, ...);</div><div class='ctx'> void __attribute__((format (printf, 4, 5)))</div><div class='del'>-ql_dbg_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);</div><div class='add'>+ql_dbg_pci(uint, struct pci_dev *pdev, uint, const char *fmt, ...);</div><div class='ctx'> void __attribute__((format (printf, 4, 5)))</div><div class='ctx'> ql_dbg_qp(uint32_t, struct qla_qpair *, int32_t, const char *fmt, ...);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void __attribute__((format (printf, 4, 5)))</div><div class='del'>-ql_log(uint32_t, scsi_qla_host_t *vha, int32_t, const char *fmt, ...);</div><div class='add'>+ql_log(uint, scsi_qla_host_t *vha, uint, const char *fmt, ...);</div><div class='ctx'> void __attribute__((format (printf, 4, 5)))</div><div class='del'>-ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);</div><div class='add'>+ql_log_pci(uint, struct pci_dev *pdev, uint, const char *fmt, ...);</div><div class='ctx'> </div><div class='ctx'> void __attribute__((format (printf, 4, 5)))</div><div class='ctx'> ql_log_qp(uint32_t, struct qla_qpair *, int32_t, const char *fmt, ...);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h<br/>index 3d46975a5e5c..1a4095c56eee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_def.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_def.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_bsg_fc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "qla_bsg.h"</div><div class='add'>+#include "qla_dsd.h"</div><div class='ctx'> #include "qla_nx.h"</div><div class='ctx'> #include "qla_nx2.h"</div><div class='ctx'> #include "qla_nvme.h"</div><div class='hunk'>@@ -545,7 +546,7 @@ typedef struct srb {</div><div class='ctx'> 	u32 gen2;	/* scratch */</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int retry_count;</div><div class='del'>-	struct completion comp;</div><div class='add'>+	struct completion *comp;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct srb_iocb iocb_cmd;</div><div class='ctx'> 		struct bsg_job *bsg_job;</div><div class='hunk'>@@ -1033,6 +1034,7 @@ struct mbx_cmd_32 {</div><div class='ctx'> #define MBC_GET_FIRMWARE_VERSION	8	/* Get firmware revision. */</div><div class='ctx'> #define MBC_LOAD_RISC_RAM		9	/* Load RAM command. */</div><div class='ctx'> #define MBC_DUMP_RISC_RAM		0xa	/* Dump RAM command. */</div><div class='add'>+#define MBC_SECURE_FLASH_UPDATE		0xa	/* Secure Flash Update(28xx) */</div><div class='ctx'> #define MBC_LOAD_RISC_RAM_EXTENDED	0xb	/* Load RAM extended. */</div><div class='ctx'> #define MBC_DUMP_RISC_RAM_EXTENDED	0xc	/* Dump RAM extended. */</div><div class='ctx'> #define MBC_WRITE_RAM_WORD_EXTENDED	0xd	/* Write RAM word extended */</div><div class='hunk'>@@ -1203,6 +1205,10 @@ struct mbx_cmd_32 {</div><div class='ctx'> #define QLA27XX_IMG_STATUS_VER_MAJOR   0x01</div><div class='ctx'> #define QLA27XX_IMG_STATUS_VER_MINOR    0x00</div><div class='ctx'> #define QLA27XX_IMG_STATUS_SIGN   0xFACEFADE</div><div class='add'>+#define QLA28XX_IMG_STATUS_SIGN    0xFACEFADF</div><div class='add'>+#define QLA28XX_IMG_STATUS_SIGN		0xFACEFADF</div><div class='add'>+#define QLA28XX_AUX_IMG_STATUS_SIGN	0xFACEFAED</div><div class='add'>+#define QLA27XX_DEFAULT_IMAGE		0</div><div class='ctx'> #define QLA27XX_PRIMARY_IMAGE  1</div><div class='ctx'> #define QLA27XX_SECONDARY_IMAGE    2</div><div class='ctx'> </div><div class='hunk'>@@ -1323,8 +1329,8 @@ typedef struct {</div><div class='ctx'> 	uint16_t response_q_inpointer;</div><div class='ctx'> 	uint16_t request_q_length;</div><div class='ctx'> 	uint16_t response_q_length;</div><div class='del'>-	uint32_t request_q_address[2];</div><div class='del'>-	uint32_t response_q_address[2];</div><div class='add'>+	__le64   request_q_address __packed;</div><div class='add'>+	__le64   response_q_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t lun_enables;</div><div class='ctx'> 	uint8_t  command_resource_count;</div><div class='hunk'>@@ -1749,12 +1755,10 @@ typedef struct {</div><div class='ctx'> 	uint16_t dseg_count;		/* Data segment count. */</div><div class='ctx'> 	uint8_t scsi_cdb[MAX_CMDSZ]; 	/* SCSI command words. */</div><div class='ctx'> 	uint32_t byte_count;		/* Total byte count. */</div><div class='del'>-	uint32_t dseg_0_address;	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_length;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_1_address;	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_1_length;		/* Data segment 1 length. */</div><div class='del'>-	uint32_t dseg_2_address;	/* Data segment 2 address. */</div><div class='del'>-	uint32_t dseg_2_length;		/* Data segment 2 length. */</div><div class='add'>+	union {</div><div class='add'>+		struct dsd32 dsd32[3];</div><div class='add'>+		struct dsd64 dsd64[2];</div><div class='add'>+	};</div><div class='ctx'> } cmd_entry_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1775,10 +1779,7 @@ typedef struct {</div><div class='ctx'> 	uint16_t dseg_count;		/* Data segment count. */</div><div class='ctx'> 	uint8_t scsi_cdb[MAX_CMDSZ];	/* SCSI command words. */</div><div class='ctx'> 	uint32_t byte_count;		/* Total byte count. */</div><div class='del'>-	uint32_t dseg_0_address[2];	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_length;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_1_address[2];	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_1_length;		/* Data segment 1 length. */</div><div class='add'>+	struct dsd64 dsd[2];</div><div class='ctx'> } cmd_a64_entry_t, request_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1791,20 +1792,7 @@ typedef struct {</div><div class='ctx'> 	uint8_t sys_define;		/* System defined. */</div><div class='ctx'> 	uint8_t entry_status;		/* Entry Status. */</div><div class='ctx'> 	uint32_t reserved;</div><div class='del'>-	uint32_t dseg_0_address;	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_length;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_1_address;	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_1_length;		/* Data segment 1 length. */</div><div class='del'>-	uint32_t dseg_2_address;	/* Data segment 2 address. */</div><div class='del'>-	uint32_t dseg_2_length;		/* Data segment 2 length. */</div><div class='del'>-	uint32_t dseg_3_address;	/* Data segment 3 address. */</div><div class='del'>-	uint32_t dseg_3_length;		/* Data segment 3 length. */</div><div class='del'>-	uint32_t dseg_4_address;	/* Data segment 4 address. */</div><div class='del'>-	uint32_t dseg_4_length;		/* Data segment 4 length. */</div><div class='del'>-	uint32_t dseg_5_address;	/* Data segment 5 address. */</div><div class='del'>-	uint32_t dseg_5_length;		/* Data segment 5 length. */</div><div class='del'>-	uint32_t dseg_6_address;	/* Data segment 6 address. */</div><div class='del'>-	uint32_t dseg_6_length;		/* Data segment 6 length. */</div><div class='add'>+	struct dsd32 dsd[7];</div><div class='ctx'> } cont_entry_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1816,16 +1804,7 @@ typedef struct {</div><div class='ctx'> 	uint8_t entry_count;		/* Entry count. */</div><div class='ctx'> 	uint8_t sys_define;		/* System defined. */</div><div class='ctx'> 	uint8_t entry_status;		/* Entry Status. */</div><div class='del'>-	uint32_t dseg_0_address[2];	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_length;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_1_address[2];	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_1_length;		/* Data segment 1 length. */</div><div class='del'>-	uint32_t dseg_2_address	[2];	/* Data segment 2 address. */</div><div class='del'>-	uint32_t dseg_2_length;		/* Data segment 2 length. */</div><div class='del'>-	uint32_t dseg_3_address[2];	/* Data segment 3 address. */</div><div class='del'>-	uint32_t dseg_3_length;		/* Data segment 3 length. */</div><div class='del'>-	uint32_t dseg_4_address[2];	/* Data segment 4 address. */</div><div class='del'>-	uint32_t dseg_4_length;		/* Data segment 4 length. */</div><div class='add'>+	struct dsd64 dsd[5];</div><div class='ctx'> } cont_a64_entry_t;</div><div class='ctx'> </div><div class='ctx'> #define PO_MODE_DIF_INSERT	0</div><div class='hunk'>@@ -1869,8 +1848,7 @@ struct crc_context {</div><div class='ctx'> 			uint16_t	reserved_2;</div><div class='ctx'> 			uint16_t	reserved_3;</div><div class='ctx'> 			uint32_t	reserved_4;</div><div class='del'>-			uint32_t	data_address[2];</div><div class='del'>-			uint32_t	data_length;</div><div class='add'>+			struct dsd64	data_dsd;</div><div class='ctx'> 			uint32_t	reserved_5[2];</div><div class='ctx'> 			uint32_t	reserved_6;</div><div class='ctx'> 		} nobundling;</div><div class='hunk'>@@ -1880,11 +1858,8 @@ struct crc_context {</div><div class='ctx'> 			uint16_t	reserved_1;</div><div class='ctx'> 			__le16	dseg_count;	/* Data segment count */</div><div class='ctx'> 			uint32_t	reserved_2;</div><div class='del'>-			uint32_t	data_address[2];</div><div class='del'>-			uint32_t	data_length;</div><div class='del'>-			uint32_t	dif_address[2];</div><div class='del'>-			uint32_t	dif_length;	/* Data segment 0</div><div class='del'>-							 * length */</div><div class='add'>+			struct dsd64	data_dsd;</div><div class='add'>+			struct dsd64	dif_dsd;</div><div class='ctx'> 		} bundling;</div><div class='ctx'> 	} u;</div><div class='ctx'> </div><div class='hunk'>@@ -2083,10 +2058,8 @@ typedef struct {</div><div class='ctx'> 	uint32_t handle2;</div><div class='ctx'> 	uint32_t rsp_bytecount;</div><div class='ctx'> 	uint32_t req_bytecount;</div><div class='del'>-	uint32_t dseg_req_address[2];	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_req_length;	/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_rsp_address[2];	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_rsp_length;	/* Data segment 1 length. */</div><div class='add'>+	struct dsd64 req_dsd;</div><div class='add'>+	struct dsd64 rsp_dsd;</div><div class='ctx'> } ms_iocb_entry_t;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2258,7 +2231,10 @@ typedef enum {</div><div class='ctx'> 	FCT_BROADCAST,</div><div class='ctx'> 	FCT_INITIATOR,</div><div class='ctx'> 	FCT_TARGET,</div><div class='del'>-	FCT_NVME</div><div class='add'>+	FCT_NVME_INITIATOR = 0x10,</div><div class='add'>+	FCT_NVME_TARGET = 0x20,</div><div class='add'>+	FCT_NVME_DISCOVERY = 0x40,</div><div class='add'>+	FCT_NVME = 0xf0,</div><div class='ctx'> } fc_port_type_t;</div><div class='ctx'> </div><div class='ctx'> enum qla_sess_deletion {</div><div class='hunk'>@@ -2463,13 +2439,7 @@ struct event_arg {</div><div class='ctx'> #define FCS_DEVICE_LOST		3</div><div class='ctx'> #define FCS_ONLINE		4</div><div class='ctx'> </div><div class='del'>-static const char * const port_state_str[] = {</div><div class='del'>-	"Unknown",</div><div class='del'>-	"UNCONFIGURED",</div><div class='del'>-	"DEAD",</div><div class='del'>-	"LOST",</div><div class='del'>-	"ONLINE"</div><div class='del'>-};</div><div class='add'>+extern const char *const port_state_str[5];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * FC port flags.</div><div class='hunk'>@@ -2672,6 +2642,7 @@ struct ct_fdmiv2_hba_attributes {</div><div class='ctx'> #define FDMI_PORT_SPEED_8GB		0x10</div><div class='ctx'> #define FDMI_PORT_SPEED_16GB		0x20</div><div class='ctx'> #define FDMI_PORT_SPEED_32GB		0x40</div><div class='add'>+#define FDMI_PORT_SPEED_64GB		0x80</div><div class='ctx'> #define FDMI_PORT_SPEED_UNKNOWN		0x8000</div><div class='ctx'> </div><div class='ctx'> #define FC_CLASS_2	0x04</div><div class='hunk'>@@ -3060,7 +3031,7 @@ struct sns_cmd_pkt {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			uint16_t buffer_length;</div><div class='ctx'> 			uint16_t reserved_1;</div><div class='del'>-			uint32_t buffer_address[2];</div><div class='add'>+			__le64	 buffer_address __packed;</div><div class='ctx'> 			uint16_t subcommand_length;</div><div class='ctx'> 			uint16_t reserved_2;</div><div class='ctx'> 			uint16_t subcommand;</div><div class='hunk'>@@ -3130,10 +3101,10 @@ struct rsp_que;</div><div class='ctx'> struct isp_operations {</div><div class='ctx'> </div><div class='ctx'> 	int (*pci_config) (struct scsi_qla_host *);</div><div class='del'>-	void (*reset_chip) (struct scsi_qla_host *);</div><div class='add'>+	int (*reset_chip)(struct scsi_qla_host *);</div><div class='ctx'> 	int (*chip_diag) (struct scsi_qla_host *);</div><div class='ctx'> 	void (*config_rings) (struct scsi_qla_host *);</div><div class='del'>-	void (*reset_adapter) (struct scsi_qla_host *);</div><div class='add'>+	int (*reset_adapter)(struct scsi_qla_host *);</div><div class='ctx'> 	int (*nvram_config) (struct scsi_qla_host *);</div><div class='ctx'> 	void (*update_fw_options) (struct scsi_qla_host *);</div><div class='ctx'> 	int (*load_risc) (struct scsi_qla_host *, uint32_t *);</div><div class='hunk'>@@ -3159,9 +3130,9 @@ struct isp_operations {</div><div class='ctx'> 	void *(*prep_ms_fdmi_iocb) (struct scsi_qla_host *, uint32_t,</div><div class='ctx'> 	    uint32_t);</div><div class='ctx'> </div><div class='del'>-	uint8_t *(*read_nvram) (struct scsi_qla_host *, uint8_t *,</div><div class='add'>+	uint8_t *(*read_nvram)(struct scsi_qla_host *, void *,</div><div class='ctx'> 		uint32_t, uint32_t);</div><div class='del'>-	int (*write_nvram) (struct scsi_qla_host *, uint8_t *, uint32_t,</div><div class='add'>+	int (*write_nvram)(struct scsi_qla_host *, void *, uint32_t,</div><div class='ctx'> 		uint32_t);</div><div class='ctx'> </div><div class='ctx'> 	void (*fw_dump) (struct scsi_qla_host *, int);</div><div class='hunk'>@@ -3170,16 +3141,16 @@ struct isp_operations {</div><div class='ctx'> 	int (*beacon_off) (struct scsi_qla_host *);</div><div class='ctx'> 	void (*beacon_blink) (struct scsi_qla_host *);</div><div class='ctx'> </div><div class='del'>-	uint8_t * (*read_optrom) (struct scsi_qla_host *, uint8_t *,</div><div class='add'>+	void *(*read_optrom)(struct scsi_qla_host *, void *,</div><div class='ctx'> 		uint32_t, uint32_t);</div><div class='del'>-	int (*write_optrom) (struct scsi_qla_host *, uint8_t *, uint32_t,</div><div class='add'>+	int (*write_optrom)(struct scsi_qla_host *, void *, uint32_t,</div><div class='ctx'> 		uint32_t);</div><div class='ctx'> </div><div class='ctx'> 	int (*get_flash_version) (struct scsi_qla_host *, void *);</div><div class='ctx'> 	int (*start_scsi) (srb_t *);</div><div class='ctx'> 	int (*start_scsi_mq) (srb_t *);</div><div class='ctx'> 	int (*abort_isp) (struct scsi_qla_host *);</div><div class='del'>-	int (*iospace_config)(struct qla_hw_data*);</div><div class='add'>+	int (*iospace_config)(struct qla_hw_data *);</div><div class='ctx'> 	int (*initialize_adapter)(struct scsi_qla_host *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3368,7 +3339,8 @@ struct qla_tc_param {</div><div class='ctx'> #define QLA_MQ_SIZE 32</div><div class='ctx'> #define QLA_MAX_QUEUES 256</div><div class='ctx'> #define ISP_QUE_REG(ha, id) \</div><div class='del'>-	((ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha)) ? \</div><div class='add'>+	((ha-&gt;mqenable || IS_QLA83XX(ha) || \</div><div class='add'>+	  IS_QLA27XX(ha) || IS_QLA28XX(ha)) ? \</div><div class='ctx'> 	 ((void __iomem *)ha-&gt;mqiobase + (QLA_QUE_PAGE * id)) :\</div><div class='ctx'> 	 ((void __iomem *)ha-&gt;iobase))</div><div class='ctx'> #define QLA_REQ_QUE_ID(tag) \</div><div class='hunk'>@@ -3621,6 +3593,8 @@ struct qla_hw_data {</div><div class='ctx'> 		uint32_t	rida_fmt2:1;</div><div class='ctx'> 		uint32_t	purge_mbox:1;</div><div class='ctx'> 		uint32_t        n2n_bigger:1;</div><div class='add'>+		uint32_t	secure_adapter:1;</div><div class='add'>+		uint32_t	secure_fw:1;</div><div class='ctx'> 	} flags;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t max_exchg;</div><div class='hunk'>@@ -3703,6 +3677,7 @@ struct qla_hw_data {</div><div class='ctx'> #define PORT_SPEED_8GB  0x04</div><div class='ctx'> #define PORT_SPEED_16GB 0x05</div><div class='ctx'> #define PORT_SPEED_32GB 0x06</div><div class='add'>+#define PORT_SPEED_64GB 0x07</div><div class='ctx'> #define PORT_SPEED_10GB	0x13</div><div class='ctx'> 	uint16_t	link_data_rate;         /* F/W operating speed */</div><div class='ctx'> 	uint16_t	set_data_rate;		/* Set by user */</div><div class='hunk'>@@ -3729,6 +3704,11 @@ struct qla_hw_data {</div><div class='ctx'> #define PCI_DEVICE_ID_QLOGIC_ISP2071	0x2071</div><div class='ctx'> #define PCI_DEVICE_ID_QLOGIC_ISP2271	0x2271</div><div class='ctx'> #define PCI_DEVICE_ID_QLOGIC_ISP2261	0x2261</div><div class='add'>+#define PCI_DEVICE_ID_QLOGIC_ISP2061	0x2061</div><div class='add'>+#define PCI_DEVICE_ID_QLOGIC_ISP2081	0x2081</div><div class='add'>+#define PCI_DEVICE_ID_QLOGIC_ISP2089	0x2089</div><div class='add'>+#define PCI_DEVICE_ID_QLOGIC_ISP2281	0x2281</div><div class='add'>+#define PCI_DEVICE_ID_QLOGIC_ISP2289	0x2289</div><div class='ctx'> </div><div class='ctx'> 	uint32_t	isp_type;</div><div class='ctx'> #define DT_ISP2100                      BIT_0</div><div class='hunk'>@@ -3753,7 +3733,12 @@ struct qla_hw_data {</div><div class='ctx'> #define DT_ISP2071			BIT_19</div><div class='ctx'> #define DT_ISP2271			BIT_20</div><div class='ctx'> #define DT_ISP2261			BIT_21</div><div class='del'>-#define DT_ISP_LAST			(DT_ISP2261 &lt;&lt; 1)</div><div class='add'>+#define DT_ISP2061			BIT_22</div><div class='add'>+#define DT_ISP2081			BIT_23</div><div class='add'>+#define DT_ISP2089			BIT_24</div><div class='add'>+#define DT_ISP2281			BIT_25</div><div class='add'>+#define DT_ISP2289			BIT_26</div><div class='add'>+#define DT_ISP_LAST			(DT_ISP2289 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> 	uint32_t	device_type;</div><div class='ctx'> #define DT_T10_PI                       BIT_25</div><div class='hunk'>@@ -3788,6 +3773,8 @@ struct qla_hw_data {</div><div class='ctx'> #define IS_QLA2071(ha)	(DT_MASK(ha) &amp; DT_ISP2071)</div><div class='ctx'> #define IS_QLA2271(ha)	(DT_MASK(ha) &amp; DT_ISP2271)</div><div class='ctx'> #define IS_QLA2261(ha)	(DT_MASK(ha) &amp; DT_ISP2261)</div><div class='add'>+#define IS_QLA2081(ha)	(DT_MASK(ha) &amp; DT_ISP2081)</div><div class='add'>+#define IS_QLA2281(ha)	(DT_MASK(ha) &amp; DT_ISP2281)</div><div class='ctx'> </div><div class='ctx'> #define IS_QLA23XX(ha)  (IS_QLA2300(ha) || IS_QLA2312(ha) || IS_QLA2322(ha) || \</div><div class='ctx'> 			IS_QLA6312(ha) || IS_QLA6322(ha))</div><div class='hunk'>@@ -3797,6 +3784,7 @@ struct qla_hw_data {</div><div class='ctx'> #define IS_QLA83XX(ha)	(IS_QLA2031(ha) || IS_QLA8031(ha))</div><div class='ctx'> #define IS_QLA84XX(ha)  (IS_QLA8432(ha))</div><div class='ctx'> #define IS_QLA27XX(ha)  (IS_QLA2071(ha) || IS_QLA2271(ha) || IS_QLA2261(ha))</div><div class='add'>+#define IS_QLA28XX(ha)	(IS_QLA2081(ha) || IS_QLA2281(ha))</div><div class='ctx'> #define IS_QLA24XX_TYPE(ha)     (IS_QLA24XX(ha) || IS_QLA54XX(ha) || \</div><div class='ctx'> 				IS_QLA84XX(ha))</div><div class='ctx'> #define IS_CNA_CAPABLE(ha)	(IS_QLA81XX(ha) || IS_QLA82XX(ha) || \</div><div class='hunk'>@@ -3805,14 +3793,15 @@ struct qla_hw_data {</div><div class='ctx'> #define IS_QLA2XXX_MIDTYPE(ha)	(IS_QLA24XX(ha) || IS_QLA84XX(ha) || \</div><div class='ctx'> 				IS_QLA25XX(ha) || IS_QLA81XX(ha) || \</div><div class='ctx'> 				IS_QLA82XX(ha) || IS_QLA83XX(ha) || \</div><div class='del'>-				IS_QLA8044(ha) || IS_QLA27XX(ha))</div><div class='add'>+				IS_QLA8044(ha) || IS_QLA27XX(ha) || \</div><div class='add'>+				IS_QLA28XX(ha))</div><div class='ctx'> #define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha) || \</div><div class='del'>-				IS_QLA27XX(ha))</div><div class='add'>+				IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> #define IS_NOPOLLING_TYPE(ha)	(IS_QLA81XX(ha) &amp;&amp; (ha)-&gt;flags.msix_enabled)</div><div class='ctx'> #define IS_FAC_REQUIRED(ha)	(IS_QLA81XX(ha) || IS_QLA83XX(ha) || \</div><div class='del'>-				IS_QLA27XX(ha))</div><div class='add'>+				IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> #define IS_NOCACHE_VPD_TYPE(ha)	(IS_QLA81XX(ha) || IS_QLA83XX(ha) || \</div><div class='del'>-				IS_QLA27XX(ha))</div><div class='add'>+				IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> #define IS_ALOGIO_CAPABLE(ha)	(IS_QLA23XX(ha) || IS_FWI2_CAPABLE(ha))</div><div class='ctx'> </div><div class='ctx'> #define IS_T10_PI_CAPABLE(ha)   ((ha)-&gt;device_type &amp; DT_T10_PI)</div><div class='hunk'>@@ -3823,28 +3812,34 @@ struct qla_hw_data {</div><div class='ctx'> #define HAS_EXTENDED_IDS(ha)    ((ha)-&gt;device_type &amp; DT_EXTENDED_IDS)</div><div class='ctx'> #define IS_CT6_SUPPORTED(ha)	((ha)-&gt;device_type &amp; DT_CT6_SUPPORTED)</div><div class='ctx'> #define IS_MQUE_CAPABLE(ha)	((ha)-&gt;mqenable || IS_QLA83XX(ha) || \</div><div class='del'>-				IS_QLA27XX(ha))</div><div class='del'>-#define IS_BIDI_CAPABLE(ha)	((IS_QLA25XX(ha) || IS_QLA2031(ha)))</div><div class='add'>+				IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+#define IS_BIDI_CAPABLE(ha) \</div><div class='add'>+    (IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> /* Bit 21 of fw_attributes decides the MCTP capabilities */</div><div class='ctx'> #define IS_MCTP_CAPABLE(ha)	(IS_QLA2031(ha) &amp;&amp; \</div><div class='ctx'> 				((ha)-&gt;fw_attributes_ext[0] &amp; BIT_0))</div><div class='ctx'> #define IS_PI_UNINIT_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='ctx'> #define IS_PI_IPGUARD_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='ctx'> #define IS_PI_DIFB_DIX0_CAPABLE(ha)	(0)</div><div class='del'>-#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha) || \</div><div class='add'>+					IS_QLA28XX(ha))</div><div class='ctx'> #define IS_PI_SPLIT_DET_CAPABLE(ha)	(IS_PI_SPLIT_DET_CAPABLE_HBA(ha) &amp;&amp; \</div><div class='ctx'>     (((ha)-&gt;fw_attributes_h &lt;&lt; 16 | (ha)-&gt;fw_attributes) &amp; BIT_22))</div><div class='del'>-#define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+#define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \</div><div class='add'>+				IS_QLA28XX(ha))</div><div class='ctx'> #define IS_TGT_MODE_CAPABLE(ha)	(ha-&gt;tgt.atio_q_length)</div><div class='del'>-#define IS_SHADOW_REG_CAPABLE(ha)  (IS_QLA27XX(ha))</div><div class='del'>-#define IS_DPORT_CAPABLE(ha)  (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='del'>-#define IS_FAWWN_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+#define IS_SHADOW_REG_CAPABLE(ha)  (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+#define IS_DPORT_CAPABLE(ha)  (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \</div><div class='add'>+				IS_QLA28XX(ha))</div><div class='add'>+#define IS_FAWWN_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha) || \</div><div class='add'>+				IS_QLA28XX(ha))</div><div class='ctx'> #define IS_EXCHG_OFFLD_CAPABLE(ha) \</div><div class='del'>-	(IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	(IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> #define IS_EXLOGIN_OFFLD_CAPABLE(ha) \</div><div class='del'>-	(IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	(IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) || \</div><div class='add'>+	 IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> #define USE_ASYNC_SCAN(ha) (IS_QLA25XX(ha) || IS_QLA81XX(ha) ||\</div><div class='del'>-	IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> </div><div class='ctx'> 	/* HBA serial number */</div><div class='ctx'> 	uint8_t		serial0;</div><div class='hunk'>@@ -3888,6 +3883,9 @@ struct qla_hw_data {</div><div class='ctx'> 	void		*sfp_data;</div><div class='ctx'> 	dma_addr_t	sfp_data_dma;</div><div class='ctx'> </div><div class='add'>+	void		*flt;</div><div class='add'>+	dma_addr_t	flt_dma;</div><div class='add'>+</div><div class='ctx'> #define XGMAC_DATA_SIZE	4096</div><div class='ctx'> 	void		*xgmac_data;</div><div class='ctx'> 	dma_addr_t	xgmac_data_dma;</div><div class='hunk'>@@ -3999,18 +3997,23 @@ struct qla_hw_data {</div><div class='ctx'> 	uint8_t		fw_seriallink_options[4];</div><div class='ctx'> 	uint16_t	fw_seriallink_options24[4];</div><div class='ctx'> </div><div class='add'>+	uint8_t		serdes_version[3];</div><div class='ctx'> 	uint8_t		mpi_version[3];</div><div class='ctx'> 	uint32_t	mpi_capabilities;</div><div class='ctx'> 	uint8_t		phy_version[3];</div><div class='ctx'> 	uint8_t		pep_version[3];</div><div class='ctx'> </div><div class='ctx'> 	/* Firmware dump template */</div><div class='del'>-	void		*fw_dump_template;</div><div class='del'>-	uint32_t	fw_dump_template_len;</div><div class='del'>-	/* Firmware dump information. */</div><div class='add'>+	struct fwdt {</div><div class='add'>+		void *template;</div><div class='add'>+		ulong length;</div><div class='add'>+		ulong dump_size;</div><div class='add'>+	} fwdt[2];</div><div class='ctx'> 	struct qla2xxx_fw_dump *fw_dump;</div><div class='ctx'> 	uint32_t	fw_dump_len;</div><div class='del'>-	int		fw_dumped;</div><div class='add'>+	u32		fw_dump_alloc_len;</div><div class='add'>+	bool		fw_dumped;</div><div class='add'>+	bool		fw_dump_mpi;</div><div class='ctx'> 	unsigned long	fw_dump_cap_flags;</div><div class='ctx'> #define RISC_PAUSE_CMPL		0</div><div class='ctx'> #define DMA_SHUTDOWN_CMPL	1</div><div class='hunk'>@@ -4049,7 +4052,6 @@ struct qla_hw_data {</div><div class='ctx'> 	uint16_t	product_id[4];</div><div class='ctx'> </div><div class='ctx'> 	uint8_t		model_number[16+1];</div><div class='del'>-#define BINZERO		"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"</div><div class='ctx'> 	char		model_desc[80];</div><div class='ctx'> 	uint8_t		adapter_id[16+1];</div><div class='ctx'> </div><div class='hunk'>@@ -4089,22 +4091,28 @@ struct qla_hw_data {</div><div class='ctx'> 	uint32_t	fdt_protect_sec_cmd;</div><div class='ctx'> 	uint32_t	fdt_wrt_sts_reg_cmd;</div><div class='ctx'> </div><div class='del'>-	uint32_t        flt_region_flt;</div><div class='del'>-	uint32_t        flt_region_fdt;</div><div class='del'>-	uint32_t        flt_region_boot;</div><div class='del'>-	uint32_t        flt_region_boot_sec;</div><div class='del'>-	uint32_t        flt_region_fw;</div><div class='del'>-	uint32_t        flt_region_fw_sec;</div><div class='del'>-	uint32_t        flt_region_vpd_nvram;</div><div class='del'>-	uint32_t        flt_region_vpd;</div><div class='del'>-	uint32_t        flt_region_vpd_sec;</div><div class='del'>-	uint32_t        flt_region_nvram;</div><div class='del'>-	uint32_t        flt_region_npiv_conf;</div><div class='del'>-	uint32_t	flt_region_gold_fw;</div><div class='del'>-	uint32_t	flt_region_fcp_prio;</div><div class='del'>-	uint32_t	flt_region_bootload;</div><div class='del'>-	uint32_t	flt_region_img_status_pri;</div><div class='del'>-	uint32_t	flt_region_img_status_sec;</div><div class='add'>+	struct {</div><div class='add'>+		uint32_t	flt_region_flt;</div><div class='add'>+		uint32_t	flt_region_fdt;</div><div class='add'>+		uint32_t	flt_region_boot;</div><div class='add'>+		uint32_t	flt_region_boot_sec;</div><div class='add'>+		uint32_t	flt_region_fw;</div><div class='add'>+		uint32_t	flt_region_fw_sec;</div><div class='add'>+		uint32_t	flt_region_vpd_nvram;</div><div class='add'>+		uint32_t	flt_region_vpd_nvram_sec;</div><div class='add'>+		uint32_t	flt_region_vpd;</div><div class='add'>+		uint32_t	flt_region_vpd_sec;</div><div class='add'>+		uint32_t	flt_region_nvram;</div><div class='add'>+		uint32_t	flt_region_nvram_sec;</div><div class='add'>+		uint32_t	flt_region_npiv_conf;</div><div class='add'>+		uint32_t	flt_region_gold_fw;</div><div class='add'>+		uint32_t	flt_region_fcp_prio;</div><div class='add'>+		uint32_t	flt_region_bootload;</div><div class='add'>+		uint32_t	flt_region_img_status_pri;</div><div class='add'>+		uint32_t	flt_region_img_status_sec;</div><div class='add'>+		uint32_t	flt_region_aux_img_status_pri;</div><div class='add'>+		uint32_t	flt_region_aux_img_status_sec;</div><div class='add'>+	};</div><div class='ctx'> 	uint8_t         active_image;</div><div class='ctx'> </div><div class='ctx'> 	/* Needed for BEACON */</div><div class='hunk'>@@ -4197,8 +4205,8 @@ struct qla_hw_data {</div><div class='ctx'> 	struct qlt_hw_data tgt;</div><div class='ctx'> 	int	allow_cna_fw_dump;</div><div class='ctx'> 	uint32_t fw_ability_mask;</div><div class='del'>-	uint16_t min_link_speed;</div><div class='del'>-	uint16_t max_speed_sup;</div><div class='add'>+	uint16_t min_supported_speed;</div><div class='add'>+	uint16_t max_supported_speed;</div><div class='ctx'> </div><div class='ctx'> 	/* DMA pool for the DIF bundling buffers */</div><div class='ctx'> 	struct dma_pool *dif_bundl_pool;</div><div class='hunk'>@@ -4225,9 +4233,20 @@ struct qla_hw_data {</div><div class='ctx'> </div><div class='ctx'> 	atomic_t zio_threshold;</div><div class='ctx'> 	uint16_t last_zio_threshold;</div><div class='add'>+</div><div class='ctx'> #define DEFAULT_ZIO_THRESHOLD 5</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct active_regions {</div><div class='add'>+	uint8_t global;</div><div class='add'>+	struct {</div><div class='add'>+		uint8_t board_config;</div><div class='add'>+		uint8_t vpd_nvram;</div><div class='add'>+		uint8_t npiv_config_0_1;</div><div class='add'>+		uint8_t npiv_config_2_3;</div><div class='add'>+	} aux;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define FW_ABILITY_MAX_SPEED_MASK	0xFUL</div><div class='ctx'> #define FW_ABILITY_MAX_SPEED_16G	0x0</div><div class='ctx'> #define FW_ABILITY_MAX_SPEED_32G	0x1</div><div class='hunk'>@@ -4315,6 +4334,7 @@ typedef struct scsi_qla_host {</div><div class='ctx'> #define N2N_LOGIN_NEEDED	30</div><div class='ctx'> #define IOCB_WORK_ACTIVE	31</div><div class='ctx'> #define SET_ZIO_THRESHOLD_NEEDED 32</div><div class='add'>+#define ISP_ABORT_TO_ROM	33</div><div class='ctx'> </div><div class='ctx'> 	unsigned long	pci_flags;</div><div class='ctx'> #define PFLG_DISCONNECTED	0	/* PCI device removed */</div><div class='hunk'>@@ -4429,7 +4449,7 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	int fcport_count;</div><div class='ctx'> 	wait_queue_head_t fcport_waitQ;</div><div class='ctx'> 	wait_queue_head_t vref_waitq;</div><div class='del'>-	uint8_t min_link_speed_feat;</div><div class='add'>+	uint8_t min_supported_speed;</div><div class='ctx'> 	uint8_t n2n_node_name[WWN_SIZE];</div><div class='ctx'> 	uint8_t n2n_port_name[WWN_SIZE];</div><div class='ctx'> 	uint16_t	n2n_id;</div><div class='hunk'>@@ -4441,14 +4461,21 @@ typedef struct scsi_qla_host {</div><div class='ctx'> </div><div class='ctx'> struct qla27xx_image_status {</div><div class='ctx'> 	uint8_t image_status_mask;</div><div class='del'>-	uint16_t generation_number;</div><div class='del'>-	uint8_t reserved[3];</div><div class='del'>-	uint8_t ver_minor;</div><div class='add'>+	uint16_t generation;</div><div class='ctx'> 	uint8_t ver_major;</div><div class='add'>+	uint8_t ver_minor;</div><div class='add'>+	uint8_t bitmap;		/* 28xx only */</div><div class='add'>+	uint8_t reserved[2];</div><div class='ctx'> 	uint32_t checksum;</div><div class='ctx'> 	uint32_t signature;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* 28xx aux image status bimap values */</div><div class='add'>+#define QLA28XX_AUX_IMG_BOARD_CONFIG		BIT_0</div><div class='add'>+#define QLA28XX_AUX_IMG_VPD_NVRAM		BIT_1</div><div class='add'>+#define QLA28XX_AUX_IMG_NPIV_CONFIG_0_1		BIT_2</div><div class='add'>+#define QLA28XX_AUX_IMG_NPIV_CONFIG_2_3		BIT_3</div><div class='add'>+</div><div class='ctx'> #define SET_VP_IDX	1</div><div class='ctx'> #define SET_AL_PA	2</div><div class='ctx'> #define RESET_VP_IDX	3</div><div class='hunk'>@@ -4495,6 +4522,24 @@ struct qla2_sgx {</div><div class='ctx'> 	}					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#define SFUB_CHECKSUM_SIZE	4</div><div class='add'>+</div><div class='add'>+struct secure_flash_update_block {</div><div class='add'>+	uint32_t	block_info;</div><div class='add'>+	uint32_t	signature_lo;</div><div class='add'>+	uint32_t	signature_hi;</div><div class='add'>+	uint32_t	signature_upper[0x3e];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct secure_flash_update_block_pk {</div><div class='add'>+	uint32_t	block_info;</div><div class='add'>+	uint32_t	signature_lo;</div><div class='add'>+	uint32_t	signature_hi;</div><div class='add'>+	uint32_t	signature_upper[0x3e];</div><div class='add'>+	uint32_t	public_key[0x41];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Macros to help code, maintain, etc.</div><div class='ctx'>  */</div><div class='hunk'>@@ -4595,6 +4640,7 @@ struct qla2_sgx {</div><div class='ctx'> #define OPTROM_SIZE_81XX	0x400000</div><div class='ctx'> #define OPTROM_SIZE_82XX	0x800000</div><div class='ctx'> #define OPTROM_SIZE_83XX	0x1000000</div><div class='add'>+#define OPTROM_SIZE_28XX	0x2000000</div><div class='ctx'> </div><div class='ctx'> #define OPTROM_BURST_SIZE	0x1000</div><div class='ctx'> #define OPTROM_BURST_DWORDS	(OPTROM_BURST_SIZE / 4)</div><div class='hunk'>@@ -4691,10 +4737,13 @@ struct sff_8247_a0 {</div><div class='ctx'> #define AUTO_DETECT_SFP_SUPPORT(_vha)\</div><div class='ctx'> 	(ql2xautodetectsfp &amp;&amp; !_vha-&gt;vp_idx &amp;&amp;		\</div><div class='ctx'> 	(IS_QLA25XX(_vha-&gt;hw) || IS_QLA81XX(_vha-&gt;hw) ||\</div><div class='del'>-	IS_QLA83XX(_vha-&gt;hw) || IS_QLA27XX(_vha-&gt;hw)))</div><div class='add'>+	IS_QLA83XX(_vha-&gt;hw) || IS_QLA27XX(_vha-&gt;hw) || \</div><div class='add'>+	 IS_QLA28XX(_vha-&gt;hw)))</div><div class='add'>+</div><div class='add'>+#define FLASH_SEMAPHORE_REGISTER_ADDR   0x00101016</div><div class='ctx'> </div><div class='ctx'> #define USER_CTRL_IRQ(_ha) (ql2xuctrlirq &amp;&amp; QLA_TGT_MODE_ENABLED() &amp;&amp; \</div><div class='del'>-	(IS_QLA27XX(_ha) || IS_QLA83XX(_ha)))</div><div class='add'>+	(IS_QLA27XX(_ha) || IS_QLA28XX(_ha) || IS_QLA83XX(_ha)))</div><div class='ctx'> </div><div class='ctx'> #define SAVE_TOPO(_ha) { \</div><div class='ctx'> 	if (_ha-&gt;current_topology)				\</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c<br/>index 5819a45ac5ef..a432caebefec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_dfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_dfs.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@ static int</div><div class='ctx'> qla2x00_dfs_tgt_sess_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = inode-&gt;i_private;</div><div class='add'>+</div><div class='ctx'> 	return single_open(file, qla2x00_dfs_tgt_sess_show, vha);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -161,6 +162,7 @@ static int</div><div class='ctx'> qla_dfs_fw_resource_cnt_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_qla_host *vha = inode-&gt;i_private;</div><div class='add'>+</div><div class='ctx'> 	return single_open(file, qla_dfs_fw_resource_cnt_show, vha);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -250,6 +252,7 @@ static int</div><div class='ctx'> qla_dfs_tgt_counters_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_qla_host *vha = inode-&gt;i_private;</div><div class='add'>+</div><div class='ctx'> 	return single_open(file, qla_dfs_tgt_counters_show, vha);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -386,7 +389,7 @@ qla_dfs_naqp_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	unsigned long num_act_qp;</div><div class='ctx'> </div><div class='del'>-	if (!(IS_QLA27XX(ha) || IS_QLA83XX(ha))) {</div><div class='add'>+	if (!(IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha))) {</div><div class='ctx'> 		pr_err("host%ld: this adapter does not support Multi Q.",</div><div class='ctx'> 		    vha-&gt;host_no);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -438,7 +441,7 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha)</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(ha))</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (!ha-&gt;fce)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -474,7 +477,7 @@ create_nodes:</div><div class='ctx'> 	ha-&gt;tgt.dfs_tgt_sess = debugfs_create_file("tgt_sess",</div><div class='ctx'> 		S_IRUSR, ha-&gt;dfs_dir, vha, &amp;dfs_tgt_sess_ops);</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha) || IS_QLA83XX(ha))</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		ha-&gt;tgt.dfs_naqp = debugfs_create_file("naqp",</div><div class='ctx'> 		    0400, ha-&gt;dfs_dir, vha, &amp;dfs_naqp_ops);</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dsd.h b/drivers/scsi/qla2xxx/qla_dsd.h<br/>new file mode 100644<br/>index 000000000000..7479924ba422<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_dsd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_dsd.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#ifndef _QLA_DSD_H_</div><div class='add'>+#define _QLA_DSD_H_</div><div class='add'>+</div><div class='add'>+/* 32-bit data segment descriptor (8 bytes) */</div><div class='add'>+struct dsd32 {</div><div class='add'>+	__le32 address;</div><div class='add'>+	__le32 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void append_dsd32(struct dsd32 **dsd, struct scatterlist *sg)</div><div class='add'>+{</div><div class='add'>+	put_unaligned_le32(sg_dma_address(sg), &amp;(*dsd)-&gt;address);</div><div class='add'>+	put_unaligned_le32(sg_dma_len(sg),     &amp;(*dsd)-&gt;length);</div><div class='add'>+	(*dsd)++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* 64-bit data segment descriptor (12 bytes) */</div><div class='add'>+struct dsd64 {</div><div class='add'>+	__le64 address;</div><div class='add'>+	__le32 length;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static inline void append_dsd64(struct dsd64 **dsd, struct scatterlist *sg)</div><div class='add'>+{</div><div class='add'>+	put_unaligned_le64(sg_dma_address(sg), &amp;(*dsd)-&gt;address);</div><div class='add'>+	put_unaligned_le32(sg_dma_len(sg),     &amp;(*dsd)-&gt;length);</div><div class='add'>+	(*dsd)++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h<br/>index 50c1e6c62e31..df079a8c2b33 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_fw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_fw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_fw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_fw.h</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include &lt;linux/nvme.h&gt;</div><div class='ctx'> #include &lt;linux/nvme-fc.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "qla_dsd.h"</div><div class='add'>+</div><div class='ctx'> #define MBS_CHECKSUM_ERROR	0x4010</div><div class='ctx'> #define MBS_INVALID_PRODUCT_KEY	0x4020</div><div class='ctx'> </div><div class='hunk'>@@ -339,9 +341,9 @@ struct init_cb_24xx {</div><div class='ctx'> </div><div class='ctx'> 	uint16_t prio_request_q_length;</div><div class='ctx'> </div><div class='del'>-	uint32_t request_q_address[2];</div><div class='del'>-	uint32_t response_q_address[2];</div><div class='del'>-	uint32_t prio_request_q_address[2];</div><div class='add'>+	__le64	 request_q_address __packed;</div><div class='add'>+	__le64	 response_q_address __packed;</div><div class='add'>+	__le64	 prio_request_q_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t msix;</div><div class='ctx'> 	uint16_t msix_atio;</div><div class='hunk'>@@ -349,7 +351,7 @@ struct init_cb_24xx {</div><div class='ctx'> </div><div class='ctx'> 	uint16_t atio_q_inpointer;</div><div class='ctx'> 	uint16_t atio_q_length;</div><div class='del'>-	uint32_t atio_q_address[2];</div><div class='add'>+	__le64	 atio_q_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t interrupt_delay_timer;		/* 100us increments. */</div><div class='ctx'> 	uint16_t login_timeout;</div><div class='hunk'>@@ -453,7 +455,7 @@ struct cmd_bidir {</div><div class='ctx'> #define BD_WRITE_DATA			BIT_0</div><div class='ctx'> </div><div class='ctx'> 	uint16_t fcp_cmnd_dseg_len;		/* Data segment length. */</div><div class='del'>-	uint32_t fcp_cmnd_dseg_address[2];	/* Data segment address. */</div><div class='add'>+	__le64	 fcp_cmnd_dseg_address __packed;/* Data segment address. */</div><div class='ctx'> </div><div class='ctx'> 	uint16_t reserved[2];			/* Reserved */</div><div class='ctx'> </div><div class='hunk'>@@ -463,8 +465,7 @@ struct cmd_bidir {</div><div class='ctx'> 	uint8_t port_id[3];			/* PortID of destination port.*/</div><div class='ctx'> 	uint8_t vp_index;</div><div class='ctx'> </div><div class='del'>-	uint32_t fcp_data_dseg_address[2];	/* Data segment address. */</div><div class='del'>-	uint16_t fcp_data_dseg_len;		/* Data segment length. */</div><div class='add'>+	struct dsd64 fcp_dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define COMMAND_TYPE_6	0x48		/* Command Type 6 entry */</div><div class='hunk'>@@ -491,18 +492,18 @@ struct cmd_type_6 {</div><div class='ctx'> #define CF_READ_DATA			BIT_1</div><div class='ctx'> #define CF_WRITE_DATA			BIT_0</div><div class='ctx'> </div><div class='del'>-	uint16_t fcp_cmnd_dseg_len;		/* Data segment length. */</div><div class='del'>-	uint32_t fcp_cmnd_dseg_address[2];	/* Data segment address. */</div><div class='del'>-</div><div class='del'>-	uint32_t fcp_rsp_dseg_address[2];	/* Data segment address. */</div><div class='add'>+	uint16_t fcp_cmnd_dseg_len;	/* Data segment length. */</div><div class='add'>+					/* Data segment address. */</div><div class='add'>+	__le64	 fcp_cmnd_dseg_address __packed;</div><div class='add'>+					/* Data segment address. */</div><div class='add'>+	__le64	 fcp_rsp_dseg_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint32_t byte_count;		/* Total byte count. */</div><div class='ctx'> </div><div class='ctx'> 	uint8_t port_id[3];		/* PortID of destination port. */</div><div class='ctx'> 	uint8_t vp_index;</div><div class='ctx'> </div><div class='del'>-	uint32_t fcp_data_dseg_address[2];	/* Data segment address. */</div><div class='del'>-	uint32_t fcp_data_dseg_len;		/* Data segment length. */</div><div class='add'>+	struct dsd64 fcp_dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define COMMAND_TYPE_7	0x18		/* Command Type 7 entry */</div><div class='hunk'>@@ -548,8 +549,7 @@ struct cmd_type_7 {</div><div class='ctx'> 	uint8_t port_id[3];		/* PortID of destination port. */</div><div class='ctx'> 	uint8_t vp_index;</div><div class='ctx'> </div><div class='del'>-	uint32_t dseg_0_address[2];	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_len;		/* Data segment 0 length. */</div><div class='add'>+	struct dsd64 dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define COMMAND_TYPE_CRC_2	0x6A	/* Command Type CRC_2 (Type 6)</div><div class='hunk'>@@ -573,17 +573,17 @@ struct cmd_type_crc_2 {</div><div class='ctx'> </div><div class='ctx'> 	uint16_t control_flags;		/* Control flags. */</div><div class='ctx'> </div><div class='del'>-	uint16_t fcp_cmnd_dseg_len;		/* Data segment length. */</div><div class='del'>-	uint32_t fcp_cmnd_dseg_address[2];	/* Data segment address. */</div><div class='del'>-</div><div class='del'>-	uint32_t fcp_rsp_dseg_address[2];	/* Data segment address. */</div><div class='add'>+	uint16_t fcp_cmnd_dseg_len;	/* Data segment length. */</div><div class='add'>+	__le64	 fcp_cmnd_dseg_address __packed;</div><div class='add'>+					/* Data segment address. */</div><div class='add'>+	__le64	 fcp_rsp_dseg_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint32_t byte_count;		/* Total byte count. */</div><div class='ctx'> </div><div class='ctx'> 	uint8_t port_id[3];		/* PortID of destination port. */</div><div class='ctx'> 	uint8_t vp_index;</div><div class='ctx'> </div><div class='del'>-	uint32_t crc_context_address[2];	/* Data segment address. */</div><div class='add'>+	__le64	 crc_context_address __packed;	/* Data segment address. */</div><div class='ctx'> 	uint16_t crc_context_len;		/* Data segment length. */</div><div class='ctx'> 	uint16_t reserved_1;			/* MUST be set to 0. */</div><div class='ctx'> };</div><div class='hunk'>@@ -717,10 +717,7 @@ struct ct_entry_24xx {</div><div class='ctx'> 	uint32_t rsp_byte_count;</div><div class='ctx'> 	uint32_t cmd_byte_count;</div><div class='ctx'> </div><div class='del'>-	uint32_t dseg_0_address[2];	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_len;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_1_address[2];	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_1_len;		/* Data segment 1 length. */</div><div class='add'>+	struct dsd64 dsd[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -767,9 +764,9 @@ struct els_entry_24xx {</div><div class='ctx'> 	uint32_t rx_byte_count;</div><div class='ctx'> 	uint32_t tx_byte_count;</div><div class='ctx'> </div><div class='del'>-	uint32_t tx_address[2];		/* Data segment 0 address. */</div><div class='add'>+	__le64	 tx_address __packed;	/* Data segment 0 address. */</div><div class='ctx'> 	uint32_t tx_len;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t rx_address[2];		/* Data segment 1 address. */</div><div class='add'>+	__le64	 rx_address __packed;	/* Data segment 1 address. */</div><div class='ctx'> 	uint32_t rx_len;		/* Data segment 1 length. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1422,9 +1419,9 @@ struct vf_evfp_entry_24xx {</div><div class='ctx'>         uint16_t control_flags;</div><div class='ctx'>         uint32_t io_parameter_0;</div><div class='ctx'>         uint32_t io_parameter_1;</div><div class='del'>-        uint32_t tx_address[2];         /* Data segment 0 address. */</div><div class='add'>+	__le64	 tx_address __packed;	/* Data segment 0 address. */</div><div class='ctx'>         uint32_t tx_len;                /* Data segment 0 length. */</div><div class='del'>-        uint32_t rx_address[2];         /* Data segment 1 address. */</div><div class='add'>+	__le64	 rx_address __packed;	/* Data segment 1 address. */</div><div class='ctx'>         uint32_t rx_len;                /* Data segment 1 length. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1515,13 +1512,31 @@ struct qla_flt_header {</div><div class='ctx'> #define FLT_REG_VPD_SEC_27XX_2	0xD8</div><div class='ctx'> #define FLT_REG_VPD_SEC_27XX_3	0xDA</div><div class='ctx'> </div><div class='add'>+/* 28xx */</div><div class='add'>+#define FLT_REG_AUX_IMG_PRI_28XX	0x125</div><div class='add'>+#define FLT_REG_AUX_IMG_SEC_28XX	0x126</div><div class='add'>+#define FLT_REG_VPD_SEC_28XX_0		0x10C</div><div class='add'>+#define FLT_REG_VPD_SEC_28XX_1		0x10E</div><div class='add'>+#define FLT_REG_VPD_SEC_28XX_2		0x110</div><div class='add'>+#define FLT_REG_VPD_SEC_28XX_3		0x112</div><div class='add'>+#define FLT_REG_NVRAM_SEC_28XX_0	0x10D</div><div class='add'>+#define FLT_REG_NVRAM_SEC_28XX_1	0x10F</div><div class='add'>+#define FLT_REG_NVRAM_SEC_28XX_2	0x111</div><div class='add'>+#define FLT_REG_NVRAM_SEC_28XX_3	0x113</div><div class='add'>+</div><div class='ctx'> struct qla_flt_region {</div><div class='del'>-	uint32_t code;</div><div class='add'>+	uint16_t code;</div><div class='add'>+	uint8_t attribute;</div><div class='add'>+	uint8_t reserved;</div><div class='ctx'> 	uint32_t size;</div><div class='ctx'> 	uint32_t start;</div><div class='ctx'> 	uint32_t end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define FLT_REGION_SIZE		16</div><div class='add'>+#define FLT_MAX_REGIONS		0xFF</div><div class='add'>+#define FLT_REGIONS_SIZE	(FLT_REGION_SIZE * FLT_MAX_REGIONS)</div><div class='add'>+</div><div class='ctx'> /* Flash NPIV Configuration Table ********************************************/</div><div class='ctx'> </div><div class='ctx'> struct qla_npiv_header {</div><div class='hunk'>@@ -1588,8 +1603,7 @@ struct verify_chip_entry_84xx {</div><div class='ctx'> 	uint32_t fw_seq_size;</div><div class='ctx'> 	uint32_t relative_offset;</div><div class='ctx'> </div><div class='del'>-	uint32_t dseg_address[2];</div><div class='del'>-	uint32_t dseg_length;</div><div class='add'>+	struct dsd64 dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct verify_chip_rsp_84xx {</div><div class='hunk'>@@ -1646,8 +1660,7 @@ struct access_chip_84xx {</div><div class='ctx'> 	uint32_t total_byte_cnt;</div><div class='ctx'> 	uint32_t reserved4;</div><div class='ctx'> </div><div class='del'>-	uint32_t dseg_address[2];</div><div class='del'>-	uint32_t dseg_length;</div><div class='add'>+	struct dsd64 dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct access_chip_rsp_84xx {</div><div class='hunk'>@@ -1711,6 +1724,10 @@ struct access_chip_rsp_84xx {</div><div class='ctx'> #define LR_DIST_FW_SHIFT	(LR_DIST_FW_POS - LR_DIST_NV_POS)</div><div class='ctx'> #define LR_DIST_FW_FIELD(x)	((x) &lt;&lt; LR_DIST_FW_SHIFT &amp; 0xf000)</div><div class='ctx'> </div><div class='add'>+/* FAC semaphore defines */</div><div class='add'>+#define FAC_SEMAPHORE_UNLOCK    0</div><div class='add'>+#define FAC_SEMAPHORE_LOCK      1</div><div class='add'>+</div><div class='ctx'> struct nvram_81xx {</div><div class='ctx'> 	/* NVRAM header. */</div><div class='ctx'> 	uint8_t id[4];</div><div class='hunk'>@@ -1757,7 +1774,7 @@ struct nvram_81xx {</div><div class='ctx'> 	uint16_t reserved_6_3[14];</div><div class='ctx'> </div><div class='ctx'> 	/* Offset 192. */</div><div class='del'>-	uint8_t min_link_speed;</div><div class='add'>+	uint8_t min_supported_speed;</div><div class='ctx'> 	uint8_t reserved_7_0;</div><div class='ctx'> 	uint16_t reserved_7[31];</div><div class='ctx'> </div><div class='hunk'>@@ -1911,15 +1928,15 @@ struct init_cb_81xx {</div><div class='ctx'> </div><div class='ctx'> 	uint16_t prio_request_q_length;</div><div class='ctx'> </div><div class='del'>-	uint32_t request_q_address[2];</div><div class='del'>-	uint32_t response_q_address[2];</div><div class='del'>-	uint32_t prio_request_q_address[2];</div><div class='add'>+	__le64	 request_q_address __packed;</div><div class='add'>+	__le64	 response_q_address __packed;</div><div class='add'>+	__le64	 prio_request_q_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint8_t reserved_4[8];</div><div class='ctx'> </div><div class='ctx'> 	uint16_t atio_q_inpointer;</div><div class='ctx'> 	uint16_t atio_q_length;</div><div class='del'>-	uint32_t atio_q_address[2];</div><div class='add'>+	__le64	 atio_q_address __packed;</div><div class='ctx'> </div><div class='ctx'> 	uint16_t interrupt_delay_timer;		/* 100us increments. */</div><div class='ctx'> 	uint16_t login_timeout;</div><div class='hunk'>@@ -2005,6 +2022,8 @@ struct ex_init_cb_81xx {</div><div class='ctx'> </div><div class='ctx'> #define FARX_ACCESS_FLASH_CONF_81XX	0x7FFD0000</div><div class='ctx'> #define FARX_ACCESS_FLASH_DATA_81XX	0x7F800000</div><div class='add'>+#define FARX_ACCESS_FLASH_CONF_28XX	0x7FFD0000</div><div class='add'>+#define FARX_ACCESS_FLASH_DATA_28XX	0x7F7D0000</div><div class='ctx'> </div><div class='ctx'> /* FCP priority config defines *************************************/</div><div class='ctx'> /* operations */</div><div class='hunk'>@@ -2079,6 +2098,7 @@ struct qla_fcp_prio_cfg {</div><div class='ctx'> #define FA_NPIV_CONF1_ADDR_81	0xD2000</div><div class='ctx'> </div><div class='ctx'> /* 83XX Flash locations -- occupies second 8MB region. */</div><div class='del'>-#define FA_FLASH_LAYOUT_ADDR_83	0xFC400</div><div class='add'>+#define FA_FLASH_LAYOUT_ADDR_83	(0x3F1000/4)</div><div class='add'>+#define FA_FLASH_LAYOUT_ADDR_28	(0x11000/4)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h<br/>index 4eefe69ca807..bbe69ab5cf3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_gbl.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_gbl.h</a></div><div class='hunk'>@@ -18,14 +18,14 @@ extern int qla2100_pci_config(struct scsi_qla_host *);</div><div class='ctx'> extern int qla2300_pci_config(struct scsi_qla_host *);</div><div class='ctx'> extern int qla24xx_pci_config(scsi_qla_host_t *);</div><div class='ctx'> extern int qla25xx_pci_config(scsi_qla_host_t *);</div><div class='del'>-extern void qla2x00_reset_chip(struct scsi_qla_host *);</div><div class='del'>-extern void qla24xx_reset_chip(struct scsi_qla_host *);</div><div class='add'>+extern int qla2x00_reset_chip(struct scsi_qla_host *);</div><div class='add'>+extern int qla24xx_reset_chip(struct scsi_qla_host *);</div><div class='ctx'> extern int qla2x00_chip_diag(struct scsi_qla_host *);</div><div class='ctx'> extern int qla24xx_chip_diag(struct scsi_qla_host *);</div><div class='ctx'> extern void qla2x00_config_rings(struct scsi_qla_host *);</div><div class='ctx'> extern void qla24xx_config_rings(struct scsi_qla_host *);</div><div class='del'>-extern void qla2x00_reset_adapter(struct scsi_qla_host *);</div><div class='del'>-extern void qla24xx_reset_adapter(struct scsi_qla_host *);</div><div class='add'>+extern int qla2x00_reset_adapter(struct scsi_qla_host *);</div><div class='add'>+extern int qla24xx_reset_adapter(struct scsi_qla_host *);</div><div class='ctx'> extern int qla2x00_nvram_config(struct scsi_qla_host *);</div><div class='ctx'> extern int qla24xx_nvram_config(struct scsi_qla_host *);</div><div class='ctx'> extern int qla81xx_nvram_config(struct scsi_qla_host *);</div><div class='hunk'>@@ -38,8 +38,7 @@ extern int qla81xx_load_risc(scsi_qla_host_t *, uint32_t *);</div><div class='ctx'> </div><div class='ctx'> extern int qla2x00_perform_loop_resync(scsi_qla_host_t *);</div><div class='ctx'> extern int qla2x00_loop_resync(scsi_qla_host_t *);</div><div class='del'>-</div><div class='del'>-extern int qla2x00_find_new_loop_id(scsi_qla_host_t *, fc_port_t *);</div><div class='add'>+extern void qla2x00_clear_loop_id(fc_port_t *fcport);</div><div class='ctx'> </div><div class='ctx'> extern int qla2x00_fabric_login(scsi_qla_host_t *, fc_port_t *, uint16_t *);</div><div class='ctx'> extern int qla2x00_local_device_login(scsi_qla_host_t *, fc_port_t *);</div><div class='hunk'>@@ -80,6 +79,7 @@ int qla2x00_post_work(struct scsi_qla_host *vha, struct qla_work_evt *e);</div><div class='ctx'> extern void *qla2x00_alloc_iocbs_ready(struct qla_qpair *, srb_t *);</div><div class='ctx'> extern int qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *, fc_port_t *);</div><div class='ctx'> </div><div class='add'>+extern void qla2x00_set_fcport_state(fc_port_t *fcport, int state);</div><div class='ctx'> extern fc_port_t *</div><div class='ctx'> qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t );</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +93,6 @@ extern int qla2xxx_mctp_dump(scsi_qla_host_t *);</div><div class='ctx'> extern int</div><div class='ctx'> qla2x00_alloc_outstanding_cmds(struct qla_hw_data *, struct req_que *);</div><div class='ctx'> extern int qla2x00_init_rings(scsi_qla_host_t *);</div><div class='del'>-extern uint8_t qla27xx_find_valid_image(struct scsi_qla_host *);</div><div class='ctx'> extern struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *,</div><div class='ctx'> 	int, int, bool);</div><div class='ctx'> extern int qla2xxx_delete_qpair(struct scsi_qla_host *, struct qla_qpair *);</div><div class='hunk'>@@ -108,6 +107,11 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *, fc_port_t *);</div><div class='ctx'> int qla24xx_detect_sfp(scsi_qla_host_t *vha);</div><div class='ctx'> int qla24xx_post_gpdb_work(struct scsi_qla_host *, fc_port_t *, u8);</div><div class='ctx'> </div><div class='add'>+extern void qla28xx_get_aux_images(struct scsi_qla_host *,</div><div class='add'>+    struct active_regions *);</div><div class='add'>+extern void qla27xx_get_active_image(struct scsi_qla_host *,</div><div class='add'>+    struct active_regions *);</div><div class='add'>+</div><div class='ctx'> void qla2x00_async_prlo_done(struct scsi_qla_host *, fc_port_t *,</div><div class='ctx'>     uint16_t *);</div><div class='ctx'> extern int qla2x00_post_async_prlo_work(struct scsi_qla_host *, fc_port_t *,</div><div class='hunk'>@@ -118,6 +122,7 @@ int qla_post_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport);</div><div class='ctx'> void qla_do_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport);</div><div class='ctx'> int qla2x00_reserve_mgmt_server_loop_id(scsi_qla_host_t *);</div><div class='ctx'> void qla_rscn_replay(fc_port_t *fcport);</div><div class='add'>+extern bool qla24xx_risc_firmware_invalid(uint32_t *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Global Data in qla_os.c source file.</div><div class='hunk'>@@ -215,7 +220,6 @@ extern void qla24xx_sched_upd_fcport(fc_port_t *);</div><div class='ctx'> void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *,</div><div class='ctx'> 	uint16_t *);</div><div class='ctx'> int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *);</div><div class='del'>-int qla24xx_async_abort_cmd(srb_t *, bool);</div><div class='ctx'> int qla24xx_post_relogin_work(struct scsi_qla_host *vha);</div><div class='ctx'> void qla2x00_wait_for_sess_deletion(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +242,7 @@ extern void qla24xx_report_id_acquisition(scsi_qla_host_t *,</div><div class='ctx'>     struct vp_rpt_id_entry_24xx *);</div><div class='ctx'> extern void qla2x00_do_dpc_all_vps(scsi_qla_host_t *);</div><div class='ctx'> extern int qla24xx_vport_create_req_sanity_check(struct fc_vport *);</div><div class='del'>-extern scsi_qla_host_t * qla24xx_create_vhost(struct fc_vport *);</div><div class='add'>+extern scsi_qla_host_t *qla24xx_create_vhost(struct fc_vport *);</div><div class='ctx'> </div><div class='ctx'> extern void qla2x00_sp_free_dma(void *);</div><div class='ctx'> extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);</div><div class='hunk'>@@ -276,21 +280,20 @@ extern int qla2x00_start_sp(srb_t *);</div><div class='ctx'> extern int qla24xx_dif_start_scsi(srb_t *);</div><div class='ctx'> extern int qla2x00_start_bidir(srb_t *, struct scsi_qla_host *, uint32_t);</div><div class='ctx'> extern int qla2xxx_dif_start_scsi_mq(srb_t *);</div><div class='add'>+extern void qla2x00_init_timer(srb_t *sp, unsigned long tmo);</div><div class='ctx'> extern unsigned long qla2x00_get_async_timeout(struct scsi_qla_host *);</div><div class='ctx'> </div><div class='ctx'> extern void *qla2x00_alloc_iocbs(struct scsi_qla_host *, srb_t *);</div><div class='ctx'> extern void *__qla2x00_alloc_iocbs(struct qla_qpair *, srb_t *);</div><div class='ctx'> extern int qla2x00_issue_marker(scsi_qla_host_t *, int);</div><div class='ctx'> extern int qla24xx_walk_and_build_sglist_no_difb(struct qla_hw_data *, srb_t *,</div><div class='del'>-	uint32_t *, uint16_t, struct qla_tc_param *);</div><div class='add'>+	struct dsd64 *, uint16_t, struct qla_tc_param *);</div><div class='ctx'> extern int qla24xx_walk_and_build_sglist(struct qla_hw_data *, srb_t *,</div><div class='del'>-	uint32_t *, uint16_t, struct qla_tc_param *);</div><div class='add'>+	struct dsd64 *, uint16_t, struct qla_tc_param *);</div><div class='ctx'> extern int qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *, srb_t *,</div><div class='del'>-	uint32_t *, uint16_t, struct qla_tgt_cmd *);</div><div class='add'>+	struct dsd64 *, uint16_t, struct qla_tgt_cmd *);</div><div class='ctx'> extern int qla24xx_get_one_block_sg(uint32_t, struct qla2_sgx *, uint32_t *);</div><div class='ctx'> extern int qla24xx_configure_prot_mode(srb_t *, uint16_t *);</div><div class='del'>-extern int qla24xx_build_scsi_crc_2_iocbs(srb_t *,</div><div class='del'>-	struct cmd_type_crc_2 *, uint16_t, uint16_t, uint16_t);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_mbx.c source file.</div><div class='hunk'>@@ -466,6 +469,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *, int);</div><div class='ctx'> extern int</div><div class='ctx'> qla81xx_fac_erase_sector(scsi_qla_host_t *, uint32_t, uint32_t);</div><div class='ctx'> </div><div class='add'>+extern int qla81xx_fac_semaphore_access(scsi_qla_host_t *, int);</div><div class='add'>+</div><div class='ctx'> extern int</div><div class='ctx'> qla2x00_get_xgmac_stats(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t *);</div><div class='ctx'> </div><div class='hunk'>@@ -511,6 +516,14 @@ extern int qla27xx_get_zio_threshold(scsi_qla_host_t *, uint16_t *);</div><div class='ctx'> extern int qla27xx_set_zio_threshold(scsi_qla_host_t *, uint16_t);</div><div class='ctx'> int qla24xx_res_count_wait(struct scsi_qla_host *, uint16_t *, int);</div><div class='ctx'> </div><div class='add'>+extern int qla28xx_secure_flash_update(scsi_qla_host_t *, uint16_t, uint16_t,</div><div class='add'>+    uint32_t, dma_addr_t, uint32_t);</div><div class='add'>+</div><div class='add'>+extern int qla2xxx_read_remote_register(scsi_qla_host_t *, uint32_t,</div><div class='add'>+    uint32_t *);</div><div class='add'>+extern int qla2xxx_write_remote_register(scsi_qla_host_t *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_isr.c source file.</div><div class='ctx'>  */</div><div class='hunk'>@@ -542,19 +555,20 @@ fc_port_t *qla2x00_find_fcport_by_nportid(scsi_qla_host_t *, port_id_t *, u8);</div><div class='ctx'>  */</div><div class='ctx'> extern void qla2x00_release_nvram_protection(scsi_qla_host_t *);</div><div class='ctx'> extern uint32_t *qla24xx_read_flash_data(scsi_qla_host_t *, uint32_t *,</div><div class='del'>-					 uint32_t, uint32_t);</div><div class='del'>-extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,</div><div class='del'>-					uint32_t);</div><div class='del'>-extern uint8_t *qla24xx_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,</div><div class='del'>-					uint32_t);</div><div class='del'>-extern int qla2x00_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,</div><div class='del'>-				    uint32_t);</div><div class='del'>-extern int qla24xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,</div><div class='del'>-				    uint32_t);</div><div class='del'>-extern uint8_t *qla25xx_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,</div><div class='del'>-					uint32_t);</div><div class='del'>-extern int qla25xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,</div><div class='del'>-				    uint32_t);</div><div class='add'>+    uint32_t, uint32_t);</div><div class='add'>+extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+extern uint8_t *qla24xx_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+extern int qla2x00_write_nvram_data(scsi_qla_host_t *, void *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+extern int qla24xx_write_nvram_data(scsi_qla_host_t *, void *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+extern uint8_t *qla25xx_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+extern int qla25xx_write_nvram_data(scsi_qla_host_t *, void *, uint32_t,</div><div class='add'>+    uint32_t);</div><div class='add'>+</div><div class='ctx'> extern int qla2x00_is_a_vp_did(scsi_qla_host_t *, uint32_t);</div><div class='ctx'> bool qla2x00_check_reg32_for_disconnect(scsi_qla_host_t *, uint32_t);</div><div class='ctx'> bool qla2x00_check_reg16_for_disconnect(scsi_qla_host_t *, uint16_t);</div><div class='hunk'>@@ -574,18 +588,18 @@ extern int qla83xx_restart_nic_firmware(scsi_qla_host_t *);</div><div class='ctx'> extern int qla83xx_access_control(scsi_qla_host_t *, uint16_t, uint32_t,</div><div class='ctx'> 				  uint32_t, uint16_t *);</div><div class='ctx'> </div><div class='del'>-extern uint8_t *qla2x00_read_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern void *qla2x00_read_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 					 uint32_t, uint32_t);</div><div class='del'>-extern int qla2x00_write_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern int qla2x00_write_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 				     uint32_t, uint32_t);</div><div class='del'>-extern uint8_t *qla24xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern void *qla24xx_read_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 					 uint32_t, uint32_t);</div><div class='del'>-extern int qla24xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern int qla24xx_write_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 				     uint32_t, uint32_t);</div><div class='del'>-extern uint8_t *qla25xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern void *qla25xx_read_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 					 uint32_t, uint32_t);</div><div class='del'>-extern uint8_t *qla8044_read_optrom_data(struct scsi_qla_host *,</div><div class='del'>-					 uint8_t *, uint32_t, uint32_t);</div><div class='add'>+extern void *qla8044_read_optrom_data(struct scsi_qla_host *,</div><div class='add'>+					 void *, uint32_t, uint32_t);</div><div class='ctx'> extern void qla8044_watchdog(struct scsi_qla_host *vha);</div><div class='ctx'> </div><div class='ctx'> extern int qla2x00_get_flash_version(scsi_qla_host_t *, void *);</div><div class='hunk'>@@ -610,20 +624,13 @@ extern void qla82xx_fw_dump(scsi_qla_host_t *, int);</div><div class='ctx'> extern void qla8044_fw_dump(scsi_qla_host_t *, int);</div><div class='ctx'> </div><div class='ctx'> extern void qla27xx_fwdump(scsi_qla_host_t *, int);</div><div class='del'>-extern ulong qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *);</div><div class='add'>+extern ulong qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *, void *);</div><div class='ctx'> extern int qla27xx_fwdt_template_valid(void *);</div><div class='ctx'> extern ulong qla27xx_fwdt_template_size(void *);</div><div class='del'>-extern const void *qla27xx_fwdt_template_default(void);</div><div class='del'>-extern ulong qla27xx_fwdt_template_default_size(void);</div><div class='del'>-</div><div class='del'>-extern void qla2x00_dump_regs(scsi_qla_host_t *);</div><div class='del'>-extern void qla2x00_dump_buffer(uint8_t *, uint32_t);</div><div class='del'>-extern void qla2x00_dump_buffer_zipped(uint8_t *, uint32_t);</div><div class='del'>-extern void ql_dump_regs(uint32_t, scsi_qla_host_t *, int32_t);</div><div class='del'>-extern void ql_dump_buffer(uint32_t, scsi_qla_host_t *, int32_t,</div><div class='del'>-			   uint8_t *, uint32_t);</div><div class='del'>-extern void qla2xxx_dump_post_process(scsi_qla_host_t *, int);</div><div class='ctx'> </div><div class='add'>+extern void qla2xxx_dump_post_process(scsi_qla_host_t *, int);</div><div class='add'>+extern void ql_dump_regs(uint, scsi_qla_host_t *, uint);</div><div class='add'>+extern void ql_dump_buffer(uint, scsi_qla_host_t *, uint, void *, uint);</div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_gs.c source file.</div><div class='ctx'>  */</div><div class='hunk'>@@ -722,7 +729,7 @@ extern void qla24xx_wrt_rsp_reg(struct qla_hw_data *, uint16_t, uint16_t);</div><div class='ctx'> /* qlafx00 related functions */</div><div class='ctx'> extern int qlafx00_pci_config(struct scsi_qla_host *);</div><div class='ctx'> extern int qlafx00_initialize_adapter(struct scsi_qla_host *);</div><div class='del'>-extern void qlafx00_soft_reset(scsi_qla_host_t *);</div><div class='add'>+extern int qlafx00_soft_reset(scsi_qla_host_t *);</div><div class='ctx'> extern int qlafx00_chip_diag(scsi_qla_host_t *);</div><div class='ctx'> extern void qlafx00_config_rings(struct scsi_qla_host *);</div><div class='ctx'> extern char *qlafx00_pci_info_str(struct scsi_qla_host *, char *);</div><div class='hunk'>@@ -765,16 +772,16 @@ extern int qla82xx_pci_region_offset(struct pci_dev *, int);</div><div class='ctx'> extern int qla82xx_iospace_config(struct qla_hw_data *);</div><div class='ctx'> </div><div class='ctx'> /* Initialization related functions */</div><div class='del'>-extern void qla82xx_reset_chip(struct scsi_qla_host *);</div><div class='add'>+extern int qla82xx_reset_chip(struct scsi_qla_host *);</div><div class='ctx'> extern void qla82xx_config_rings(struct scsi_qla_host *);</div><div class='ctx'> extern void qla82xx_watchdog(scsi_qla_host_t *);</div><div class='ctx'> extern int qla82xx_start_firmware(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='ctx'> /* Firmware and flash related functions */</div><div class='ctx'> extern int qla82xx_load_risc(scsi_qla_host_t *, uint32_t *);</div><div class='del'>-extern uint8_t *qla82xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern void *qla82xx_read_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 					 uint32_t, uint32_t);</div><div class='del'>-extern int qla82xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern int qla82xx_write_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 				     uint32_t, uint32_t);</div><div class='ctx'> </div><div class='ctx'> /* Mailbox related functions */</div><div class='hunk'>@@ -870,7 +877,7 @@ extern void qla8044_clear_drv_active(struct qla_hw_data *);</div><div class='ctx'> void qla8044_get_minidump(struct scsi_qla_host *vha);</div><div class='ctx'> int qla8044_collect_md_data(struct scsi_qla_host *vha);</div><div class='ctx'> extern int qla8044_md_get_template(scsi_qla_host_t *);</div><div class='del'>-extern int qla8044_write_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='add'>+extern int qla8044_write_optrom_data(struct scsi_qla_host *, void *,</div><div class='ctx'> 				     uint32_t, uint32_t);</div><div class='ctx'> extern irqreturn_t qla8044_intr_handler(int, void *);</div><div class='ctx'> extern void qla82xx_mbx_completion(scsi_qla_host_t *, uint16_t);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c<br/>index c6fdad12428e..9f58e591666d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_gs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_gs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_gs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_gs.c</a></div><div class='hunk'>@@ -45,13 +45,11 @@ qla2x00_prep_ms_iocb(scsi_qla_host_t *vha, struct ct_arg *arg)</div><div class='ctx'> 	ms_pkt-&gt;rsp_bytecount = cpu_to_le32(arg-&gt;rsp_size);</div><div class='ctx'> 	ms_pkt-&gt;req_bytecount = cpu_to_le32(arg-&gt;req_size);</div><div class='ctx'> </div><div class='del'>-	ms_pkt-&gt;dseg_req_address[0] = cpu_to_le32(LSD(arg-&gt;req_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_req_address[1] = cpu_to_le32(MSD(arg-&gt;req_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_req_length = ms_pkt-&gt;req_bytecount;</div><div class='add'>+	put_unaligned_le64(arg-&gt;req_dma, &amp;ms_pkt-&gt;req_dsd.address);</div><div class='add'>+	ms_pkt-&gt;req_dsd.length = ms_pkt-&gt;req_bytecount;</div><div class='ctx'> </div><div class='del'>-	ms_pkt-&gt;dseg_rsp_address[0] = cpu_to_le32(LSD(arg-&gt;rsp_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_rsp_address[1] = cpu_to_le32(MSD(arg-&gt;rsp_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_rsp_length = ms_pkt-&gt;rsp_bytecount;</div><div class='add'>+	put_unaligned_le64(arg-&gt;rsp_dma, &amp;ms_pkt-&gt;rsp_dsd.address);</div><div class='add'>+	ms_pkt-&gt;rsp_dsd.length = ms_pkt-&gt;rsp_bytecount;</div><div class='ctx'> </div><div class='ctx'> 	vha-&gt;qla_stats.control_requests++;</div><div class='ctx'> </div><div class='hunk'>@@ -83,13 +81,11 @@ qla24xx_prep_ms_iocb(scsi_qla_host_t *vha, struct ct_arg *arg)</div><div class='ctx'> 	ct_pkt-&gt;rsp_byte_count = cpu_to_le32(arg-&gt;rsp_size);</div><div class='ctx'> 	ct_pkt-&gt;cmd_byte_count = cpu_to_le32(arg-&gt;req_size);</div><div class='ctx'> </div><div class='del'>-	ct_pkt-&gt;dseg_0_address[0] = cpu_to_le32(LSD(arg-&gt;req_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_0_address[1] = cpu_to_le32(MSD(arg-&gt;req_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_0_len = ct_pkt-&gt;cmd_byte_count;</div><div class='add'>+	put_unaligned_le64(arg-&gt;req_dma, &amp;ct_pkt-&gt;dsd[0].address);</div><div class='add'>+	ct_pkt-&gt;dsd[0].length = ct_pkt-&gt;cmd_byte_count;</div><div class='ctx'> </div><div class='del'>-	ct_pkt-&gt;dseg_1_address[0] = cpu_to_le32(LSD(arg-&gt;rsp_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_1_address[1] = cpu_to_le32(MSD(arg-&gt;rsp_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_1_len = ct_pkt-&gt;rsp_byte_count;</div><div class='add'>+	put_unaligned_le64(arg-&gt;rsp_dma, &amp;ct_pkt-&gt;dsd[1].address);</div><div class='add'>+	ct_pkt-&gt;dsd[1].length = ct_pkt-&gt;rsp_byte_count;</div><div class='ctx'> 	ct_pkt-&gt;vp_index = vha-&gt;vp_idx;</div><div class='ctx'> </div><div class='ctx'> 	vha-&gt;qla_stats.control_requests++;</div><div class='hunk'>@@ -152,8 +148,8 @@ qla2x00_chk_ms_status(scsi_qla_host_t *vha, ms_iocb_entry_t *ms_pkt,</div><div class='ctx'> 				    vha-&gt;d_id.b.area, vha-&gt;d_id.b.al_pa,</div><div class='ctx'> 				    comp_status, ct_rsp-&gt;header.response);</div><div class='ctx'> 				ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha,</div><div class='del'>-				    0x2078, (uint8_t *)&amp;ct_rsp-&gt;header,</div><div class='del'>-				    sizeof(struct ct_rsp_hdr));</div><div class='add'>+				    0x2078, ct_rsp,</div><div class='add'>+				    offsetof(typeof(*ct_rsp), rsp));</div><div class='ctx'> 				rval = QLA_INVALID_COMMAND;</div><div class='ctx'> 			} else</div><div class='ctx'> 				rval = QLA_SUCCESS;</div><div class='hunk'>@@ -1000,8 +996,7 @@ qla2x00_prep_sns_cmd(scsi_qla_host_t *vha, uint16_t cmd, uint16_t scmd_len,</div><div class='ctx'> 	memset(sns_cmd, 0, sizeof(struct sns_cmd_pkt));</div><div class='ctx'> 	wc = data_size / 2;			/* Size in 16bit words. */</div><div class='ctx'> 	sns_cmd-&gt;p.cmd.buffer_length = cpu_to_le16(wc);</div><div class='del'>-	sns_cmd-&gt;p.cmd.buffer_address[0] = cpu_to_le32(LSD(ha-&gt;sns_cmd_dma));</div><div class='del'>-	sns_cmd-&gt;p.cmd.buffer_address[1] = cpu_to_le32(MSD(ha-&gt;sns_cmd_dma));</div><div class='add'>+	put_unaligned_le64(ha-&gt;sns_cmd_dma, &amp;sns_cmd-&gt;p.cmd.buffer_address);</div><div class='ctx'> 	sns_cmd-&gt;p.cmd.subcommand_length = cpu_to_le16(scmd_len);</div><div class='ctx'> 	sns_cmd-&gt;p.cmd.subcommand = cpu_to_le16(cmd);</div><div class='ctx'> 	wc = (data_size - 16) / 4;		/* Size in 32bit words. */</div><div class='hunk'>@@ -1385,6 +1380,7 @@ qla2x00_mgmt_svr_login(scsi_qla_host_t *vha)</div><div class='ctx'> 	int ret, rval;</div><div class='ctx'> 	uint16_t mb[MAILBOX_REGISTER_COUNT];</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	ret = QLA_SUCCESS;</div><div class='ctx'> 	if (vha-&gt;flags.management_server_logged_in)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1423,6 +1419,7 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size,</div><div class='ctx'> {</div><div class='ctx'> 	ms_iocb_entry_t *ms_pkt;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	ms_pkt = ha-&gt;ms_iocb;</div><div class='ctx'> 	memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));</div><div class='ctx'> </div><div class='hunk'>@@ -1436,13 +1433,11 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size,</div><div class='ctx'> 	ms_pkt-&gt;rsp_bytecount = cpu_to_le32(rsp_size);</div><div class='ctx'> 	ms_pkt-&gt;req_bytecount = cpu_to_le32(req_size);</div><div class='ctx'> </div><div class='del'>-	ms_pkt-&gt;dseg_req_address[0] = cpu_to_le32(LSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_req_address[1] = cpu_to_le32(MSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_req_length = ms_pkt-&gt;req_bytecount;</div><div class='add'>+	put_unaligned_le64(ha-&gt;ct_sns_dma, &amp;ms_pkt-&gt;req_dsd.address);</div><div class='add'>+	ms_pkt-&gt;req_dsd.length = ms_pkt-&gt;req_bytecount;</div><div class='ctx'> </div><div class='del'>-	ms_pkt-&gt;dseg_rsp_address[0] = cpu_to_le32(LSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_rsp_address[1] = cpu_to_le32(MSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ms_pkt-&gt;dseg_rsp_length = ms_pkt-&gt;rsp_bytecount;</div><div class='add'>+	put_unaligned_le64(ha-&gt;ct_sns_dma, &amp;ms_pkt-&gt;rsp_dsd.address);</div><div class='add'>+	ms_pkt-&gt;rsp_dsd.length = ms_pkt-&gt;rsp_bytecount;</div><div class='ctx'> </div><div class='ctx'> 	return ms_pkt;</div><div class='ctx'> }</div><div class='hunk'>@@ -1474,13 +1469,11 @@ qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size,</div><div class='ctx'> 	ct_pkt-&gt;rsp_byte_count = cpu_to_le32(rsp_size);</div><div class='ctx'> 	ct_pkt-&gt;cmd_byte_count = cpu_to_le32(req_size);</div><div class='ctx'> </div><div class='del'>-	ct_pkt-&gt;dseg_0_address[0] = cpu_to_le32(LSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_0_address[1] = cpu_to_le32(MSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_0_len = ct_pkt-&gt;cmd_byte_count;</div><div class='add'>+	put_unaligned_le64(ha-&gt;ct_sns_dma, &amp;ct_pkt-&gt;dsd[0].address);</div><div class='add'>+	ct_pkt-&gt;dsd[0].length = ct_pkt-&gt;cmd_byte_count;</div><div class='ctx'> </div><div class='del'>-	ct_pkt-&gt;dseg_1_address[0] = cpu_to_le32(LSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_1_address[1] = cpu_to_le32(MSD(ha-&gt;ct_sns_dma));</div><div class='del'>-	ct_pkt-&gt;dseg_1_len = ct_pkt-&gt;rsp_byte_count;</div><div class='add'>+	put_unaligned_le64(ha-&gt;ct_sns_dma, &amp;ct_pkt-&gt;dsd[1].address);</div><div class='add'>+	ct_pkt-&gt;dsd[1].length = ct_pkt-&gt;rsp_byte_count;</div><div class='ctx'> 	ct_pkt-&gt;vp_index = vha-&gt;vp_idx;</div><div class='ctx'> </div><div class='ctx'> 	return ct_pkt;</div><div class='hunk'>@@ -1495,10 +1488,10 @@ qla2x00_update_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_FWI2_CAPABLE(ha)) {</div><div class='ctx'> 		ct_pkt-&gt;cmd_byte_count = cpu_to_le32(req_size);</div><div class='del'>-		ct_pkt-&gt;dseg_0_len = ct_pkt-&gt;cmd_byte_count;</div><div class='add'>+		ct_pkt-&gt;dsd[0].length = ct_pkt-&gt;cmd_byte_count;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ms_pkt-&gt;req_bytecount = cpu_to_le32(req_size);</div><div class='del'>-		ms_pkt-&gt;dseg_req_length = ms_pkt-&gt;req_bytecount;</div><div class='add'>+		ms_pkt-&gt;req_dsd.length = ms_pkt-&gt;req_bytecount;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ms_pkt;</div><div class='hunk'>@@ -1794,7 +1787,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)</div><div class='ctx'> 	if (IS_CNA_CAPABLE(ha))</div><div class='ctx'> 		eiter-&gt;a.sup_speed = cpu_to_be32(</div><div class='ctx'> 		    FDMI_PORT_SPEED_10GB);</div><div class='del'>-	else if (IS_QLA27XX(ha))</div><div class='add'>+	else if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		eiter-&gt;a.sup_speed = cpu_to_be32(</div><div class='ctx'> 		    FDMI_PORT_SPEED_32GB|</div><div class='ctx'> 		    FDMI_PORT_SPEED_16GB|</div><div class='hunk'>@@ -2373,7 +2366,7 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha)</div><div class='ctx'> 	if (IS_CNA_CAPABLE(ha))</div><div class='ctx'> 		eiter-&gt;a.sup_speed = cpu_to_be32(</div><div class='ctx'> 		    FDMI_PORT_SPEED_10GB);</div><div class='del'>-	else if (IS_QLA27XX(ha))</div><div class='add'>+	else if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		eiter-&gt;a.sup_speed = cpu_to_be32(</div><div class='ctx'> 		    FDMI_PORT_SPEED_32GB|</div><div class='ctx'> 		    FDMI_PORT_SPEED_16GB|</div><div class='hunk'>@@ -2446,7 +2439,7 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha)</div><div class='ctx'> 	eiter-&gt;type = cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);</div><div class='ctx'> 	eiter-&gt;len = cpu_to_be16(4 + 4);</div><div class='ctx'> 	eiter-&gt;a.max_frame_size = IS_FWI2_CAPABLE(ha) ?</div><div class='del'>-	    le16_to_cpu(icb24-&gt;frame_payload_size):</div><div class='add'>+	    le16_to_cpu(icb24-&gt;frame_payload_size) :</div><div class='ctx'> 	    le16_to_cpu(ha-&gt;init_cb-&gt;frame_payload_size);</div><div class='ctx'> 	eiter-&gt;a.max_frame_size = cpu_to_be32(eiter-&gt;a.max_frame_size);</div><div class='ctx'> 	size += 4 + 4;</div><div class='hunk'>@@ -2783,6 +2776,31 @@ qla24xx_prep_ct_fm_req(struct ct_sns_pkt *p, uint16_t cmd,</div><div class='ctx'> 	return &amp;p-&gt;p.req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static uint16_t</div><div class='add'>+qla2x00_port_speed_capability(uint16_t speed)</div><div class='add'>+{</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case BIT_15:</div><div class='add'>+		return PORT_SPEED_1GB;</div><div class='add'>+	case BIT_14:</div><div class='add'>+		return PORT_SPEED_2GB;</div><div class='add'>+	case BIT_13:</div><div class='add'>+		return PORT_SPEED_4GB;</div><div class='add'>+	case BIT_12:</div><div class='add'>+		return PORT_SPEED_10GB;</div><div class='add'>+	case BIT_11:</div><div class='add'>+		return PORT_SPEED_8GB;</div><div class='add'>+	case BIT_10:</div><div class='add'>+		return PORT_SPEED_16GB;</div><div class='add'>+	case BIT_8:</div><div class='add'>+		return PORT_SPEED_32GB;</div><div class='add'>+	case BIT_7:</div><div class='add'>+		return PORT_SPEED_64GB;</div><div class='add'>+	default:</div><div class='add'>+		return PORT_SPEED_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_gpsc() - FCS Get Port Speed Capabilities (GPSC) query.</div><div class='ctx'>  * @vha: HA context</div><div class='hunk'>@@ -2855,31 +2873,8 @@ qla2x00_gpsc(scsi_qla_host_t *vha, sw_info_t *list)</div><div class='ctx'> 			}</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		} else {</div><div class='del'>-			/* Save port-speed */</div><div class='del'>-			switch (be16_to_cpu(ct_rsp-&gt;rsp.gpsc.speed)) {</div><div class='del'>-			case BIT_15:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_1GB;</div><div class='del'>-				break;</div><div class='del'>-			case BIT_14:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_2GB;</div><div class='del'>-				break;</div><div class='del'>-			case BIT_13:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_4GB;</div><div class='del'>-				break;</div><div class='del'>-			case BIT_12:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_10GB;</div><div class='del'>-				break;</div><div class='del'>-			case BIT_11:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_8GB;</div><div class='del'>-				break;</div><div class='del'>-			case BIT_10:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_16GB;</div><div class='del'>-				break;</div><div class='del'>-			case BIT_8:</div><div class='del'>-				list[i].fp_speed = PORT_SPEED_32GB;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='add'>+			list-&gt;fp_speed = qla2x00_port_speed_capability(</div><div class='add'>+			    be16_to_cpu(ct_rsp-&gt;rsp.gpsc.speed));</div><div class='ctx'> 			ql_dbg(ql_dbg_disc, vha, 0x205b,</div><div class='ctx'> 			    "GPSC ext entry - fpn "</div><div class='ctx'> 			    "%8phN speeds=%04x speed=%04x.\n",</div><div class='hunk'>@@ -3031,6 +3026,8 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)</div><div class='ctx'> 	    "Async done-%s res %x, WWPN %8phC \n",</div><div class='ctx'> 	    sp-&gt;name, res, fcport-&gt;port_name);</div><div class='ctx'> </div><div class='add'>+	fcport-&gt;flags &amp;= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);</div><div class='add'>+</div><div class='ctx'> 	if (res == QLA_FUNCTION_TIMEOUT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -3048,29 +3045,8 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		switch (be16_to_cpu(ct_rsp-&gt;rsp.gpsc.speed)) {</div><div class='del'>-		case BIT_15:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_1GB;</div><div class='del'>-			break;</div><div class='del'>-		case BIT_14:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_2GB;</div><div class='del'>-			break;</div><div class='del'>-		case BIT_13:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_4GB;</div><div class='del'>-			break;</div><div class='del'>-		case BIT_12:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_10GB;</div><div class='del'>-			break;</div><div class='del'>-		case BIT_11:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_8GB;</div><div class='del'>-			break;</div><div class='del'>-		case BIT_10:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_16GB;</div><div class='del'>-			break;</div><div class='del'>-		case BIT_8:</div><div class='del'>-			fcport-&gt;fp_speed = PORT_SPEED_32GB;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		fcport-&gt;fp_speed = qla2x00_port_speed_capability(</div><div class='add'>+		    be16_to_cpu(ct_rsp-&gt;rsp.gpsc.speed));</div><div class='ctx'> </div><div class='ctx'> 		ql_dbg(ql_dbg_disc, vha, 0x2054,</div><div class='ctx'> 		    "Async-%s OUT WWPN %8phC speeds=%04x speed=%04x.\n",</div><div class='hunk'>@@ -4370,6 +4346,7 @@ int qla24xx_async_gnnid(scsi_qla_host_t *vha, fc_port_t *fcport)</div><div class='ctx'> </div><div class='ctx'> done_free_sp:</div><div class='ctx'> 	sp-&gt;free(sp);</div><div class='add'>+	fcport-&gt;flags &amp;= ~FCF_ASYNC_SENT;</div><div class='ctx'> done:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c<br/>index 420045155ba0..54772d4c377f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_init.c</a></div><div class='hunk'>@@ -95,6 +95,79 @@ qla2x00_get_async_timeout(struct scsi_qla_host *vha)</div><div class='ctx'> 	return tmo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qla24xx_abort_iocb_timeout(void *data)</div><div class='add'>+{</div><div class='add'>+	srb_t *sp = data;</div><div class='add'>+	struct srb_iocb *abt = &amp;sp-&gt;u.iocb_cmd;</div><div class='add'>+</div><div class='add'>+	abt-&gt;u.abt.comp_status = CS_TIMEOUT;</div><div class='add'>+	sp-&gt;done(sp, QLA_FUNCTION_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qla24xx_abort_sp_done(void *ptr, int res)</div><div class='add'>+{</div><div class='add'>+	srb_t *sp = ptr;</div><div class='add'>+	struct srb_iocb *abt = &amp;sp-&gt;u.iocb_cmd;</div><div class='add'>+</div><div class='add'>+	if (del_timer(&amp;sp-&gt;u.iocb_cmd.timer)) {</div><div class='add'>+		if (sp-&gt;flags &amp; SRB_WAKEUP_ON_COMP)</div><div class='add'>+			complete(&amp;abt-&gt;u.abt.comp);</div><div class='add'>+		else</div><div class='add'>+			sp-&gt;free(sp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)</div><div class='add'>+{</div><div class='add'>+	scsi_qla_host_t *vha = cmd_sp-&gt;vha;</div><div class='add'>+	struct srb_iocb *abt_iocb;</div><div class='add'>+	srb_t *sp;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='add'>+</div><div class='add'>+	sp = qla2xxx_get_qpair_sp(cmd_sp-&gt;vha, cmd_sp-&gt;qpair, cmd_sp-&gt;fcport,</div><div class='add'>+				  GFP_ATOMIC);</div><div class='add'>+	if (!sp)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	abt_iocb = &amp;sp-&gt;u.iocb_cmd;</div><div class='add'>+	sp-&gt;type = SRB_ABT_CMD;</div><div class='add'>+	sp-&gt;name = "abort";</div><div class='add'>+	sp-&gt;qpair = cmd_sp-&gt;qpair;</div><div class='add'>+	if (wait)</div><div class='add'>+		sp-&gt;flags = SRB_WAKEUP_ON_COMP;</div><div class='add'>+</div><div class='add'>+	abt_iocb-&gt;timeout = qla24xx_abort_iocb_timeout;</div><div class='add'>+	init_completion(&amp;abt_iocb-&gt;u.abt.comp);</div><div class='add'>+	/* FW can send 2 x ABTS's timeout/20s */</div><div class='add'>+	qla2x00_init_timer(sp, 42);</div><div class='add'>+</div><div class='add'>+	abt_iocb-&gt;u.abt.cmd_hndl = cmd_sp-&gt;handle;</div><div class='add'>+	abt_iocb-&gt;u.abt.req_que_no = cpu_to_le16(cmd_sp-&gt;qpair-&gt;req-&gt;id);</div><div class='add'>+</div><div class='add'>+	sp-&gt;done = qla24xx_abort_sp_done;</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_async, vha, 0x507c,</div><div class='add'>+	       "Abort command issued - hdl=%x, type=%x\n", cmd_sp-&gt;handle,</div><div class='add'>+	       cmd_sp-&gt;type);</div><div class='add'>+</div><div class='add'>+	rval = qla2x00_start_sp(sp);</div><div class='add'>+	if (rval != QLA_SUCCESS)</div><div class='add'>+		goto done_free_sp;</div><div class='add'>+</div><div class='add'>+	if (wait) {</div><div class='add'>+		wait_for_completion(&amp;abt_iocb-&gt;u.abt.comp);</div><div class='add'>+		rval = abt_iocb-&gt;u.abt.comp_status == CS_COMPLETE ?</div><div class='add'>+			QLA_SUCCESS : QLA_FUNCTION_FAILED;</div><div class='add'>+	} else {</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done_free_sp:</div><div class='add'>+	sp-&gt;free(sp);</div><div class='add'>+done:</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> qla2x00_async_iocb_timeout(void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -514,6 +587,72 @@ done:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='add'>+	if (IS_FWI2_CAPABLE(ha))</div><div class='add'>+		return loop_id &gt; NPH_LAST_HANDLE;</div><div class='add'>+</div><div class='add'>+	return (loop_id &gt; ha-&gt;max_loop_id &amp;&amp; loop_id &lt; SNS_FIRST_LOOP_ID) ||</div><div class='add'>+		loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * qla2x00_find_new_loop_id - scan through our port list and find a new usable loop ID</div><div class='add'>+ * @vha: adapter state pointer.</div><div class='add'>+ * @dev: port structure pointer.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *	qla2x00 local function return status code.</div><div class='add'>+ *</div><div class='add'>+ * Context:</div><div class='add'>+ *	Kernel context.</div><div class='add'>+ */</div><div class='add'>+static int qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev)</div><div class='add'>+{</div><div class='add'>+	int	rval;</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	rval = QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ha-&gt;vport_slock, flags);</div><div class='add'>+</div><div class='add'>+	dev-&gt;loop_id = find_first_zero_bit(ha-&gt;loop_id_map, LOOPID_MAP_SIZE);</div><div class='add'>+	if (dev-&gt;loop_id &gt;= LOOPID_MAP_SIZE ||</div><div class='add'>+	    qla2x00_is_reserved_id(vha, dev-&gt;loop_id)) {</div><div class='add'>+		dev-&gt;loop_id = FC_NO_LOOP_ID;</div><div class='add'>+		rval = QLA_FUNCTION_FAILED;</div><div class='add'>+	} else {</div><div class='add'>+		set_bit(dev-&gt;loop_id, ha-&gt;loop_id_map);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ha-&gt;vport_slock, flags);</div><div class='add'>+</div><div class='add'>+	if (rval == QLA_SUCCESS)</div><div class='add'>+		ql_dbg(ql_dbg_disc, dev-&gt;vha, 0x2086,</div><div class='add'>+		       "Assigning new loopid=%x, portid=%x.\n",</div><div class='add'>+		       dev-&gt;loop_id, dev-&gt;d_id.b24);</div><div class='add'>+	else</div><div class='add'>+		ql_log(ql_log_warn, dev-&gt;vha, 0x2087,</div><div class='add'>+		       "No loop_id's available, portid=%x.\n",</div><div class='add'>+		       dev-&gt;d_id.b24);</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qla2x00_clear_loop_id(fc_port_t *fcport)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = fcport-&gt;vha-&gt;hw;</div><div class='add'>+</div><div class='add'>+	if (fcport-&gt;loop_id == FC_NO_LOOP_ID ||</div><div class='add'>+	    qla2x00_is_reserved_id(fcport-&gt;vha, fcport-&gt;loop_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clear_bit(fcport-&gt;loop_id, ha-&gt;loop_id_map);</div><div class='add'>+	fcport-&gt;loop_id = FC_NO_LOOP_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,</div><div class='ctx'> 	struct event_arg *ea)</div><div class='ctx'> {</div><div class='hunk'>@@ -1482,6 +1621,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *vha, port_id_t *id,</div><div class='ctx'>     u8 *port_name, u8 *node_name, void *pla, u8 fc4_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_work_evt *e;</div><div class='add'>+</div><div class='ctx'> 	e = qla2x00_alloc_work(vha, QLA_EVT_NEW_SESS);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='hunk'>@@ -1558,6 +1698,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)</div><div class='ctx'> 			return;</div><div class='ctx'> 		{</div><div class='ctx'> 			unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 			fcport = qla2x00_find_fcport_by_nportid</div><div class='ctx'> 				(vha, &amp;ea-&gt;id, 1);</div><div class='ctx'> 			if (fcport) {</div><div class='hunk'>@@ -1620,21 +1761,21 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)</div><div class='ctx'>  */</div><div class='ctx'> void qla_rscn_replay(fc_port_t *fcport)</div><div class='ctx'> {</div><div class='del'>-       struct event_arg ea;</div><div class='add'>+	struct event_arg ea;</div><div class='ctx'> </div><div class='del'>-       switch (fcport-&gt;disc_state) {</div><div class='del'>-       case DSC_DELETE_PEND:</div><div class='del'>-               return;</div><div class='del'>-       default:</div><div class='del'>-               break;</div><div class='del'>-       }</div><div class='add'>+	switch (fcport-&gt;disc_state) {</div><div class='add'>+	case DSC_DELETE_PEND:</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-       if (fcport-&gt;scan_needed) {</div><div class='del'>-               memset(&amp;ea, 0, sizeof(ea));</div><div class='del'>-               ea.event = FCME_RSCN;</div><div class='del'>-               ea.id = fcport-&gt;d_id;</div><div class='del'>-               ea.id.b.rsvd_1 = RSCN_PORT_ADDR;</div><div class='del'>-               qla2x00_fcport_event_handler(fcport-&gt;vha, &amp;ea);</div><div class='add'>+	if (fcport-&gt;scan_needed) {</div><div class='add'>+		memset(&amp;ea, 0, sizeof(ea));</div><div class='add'>+		ea.event = FCME_RSCN;</div><div class='add'>+		ea.id = fcport-&gt;d_id;</div><div class='add'>+		ea.id.b.rsvd_1 = RSCN_PORT_ADDR;</div><div class='add'>+		qla2x00_fcport_event_handler(fcport-&gt;vha, &amp;ea);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1717,82 +1858,6 @@ done:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-qla24xx_abort_iocb_timeout(void *data)</div><div class='del'>-{</div><div class='del'>-	srb_t *sp = data;</div><div class='del'>-	struct srb_iocb *abt = &amp;sp-&gt;u.iocb_cmd;</div><div class='del'>-</div><div class='del'>-	abt-&gt;u.abt.comp_status = CS_TIMEOUT;</div><div class='del'>-	sp-&gt;done(sp, QLA_FUNCTION_TIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qla24xx_abort_sp_done(void *ptr, int res)</div><div class='del'>-{</div><div class='del'>-	srb_t *sp = ptr;</div><div class='del'>-	struct srb_iocb *abt = &amp;sp-&gt;u.iocb_cmd;</div><div class='del'>-</div><div class='del'>-	if (del_timer(&amp;sp-&gt;u.iocb_cmd.timer)) {</div><div class='del'>-		if (sp-&gt;flags &amp; SRB_WAKEUP_ON_COMP)</div><div class='del'>-			complete(&amp;abt-&gt;u.abt.comp);</div><div class='del'>-		else</div><div class='del'>-			sp-&gt;free(sp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)</div><div class='del'>-{</div><div class='del'>-	scsi_qla_host_t *vha = cmd_sp-&gt;vha;</div><div class='del'>-	struct srb_iocb *abt_iocb;</div><div class='del'>-	srb_t *sp;</div><div class='del'>-	int rval = QLA_FUNCTION_FAILED;</div><div class='del'>-</div><div class='del'>-	sp = qla2xxx_get_qpair_sp(cmd_sp-&gt;vha, cmd_sp-&gt;qpair, cmd_sp-&gt;fcport,</div><div class='del'>-	    GFP_ATOMIC);</div><div class='del'>-	if (!sp)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	abt_iocb = &amp;sp-&gt;u.iocb_cmd;</div><div class='del'>-	sp-&gt;type = SRB_ABT_CMD;</div><div class='del'>-	sp-&gt;name = "abort";</div><div class='del'>-	sp-&gt;qpair = cmd_sp-&gt;qpair;</div><div class='del'>-	if (wait)</div><div class='del'>-		sp-&gt;flags = SRB_WAKEUP_ON_COMP;</div><div class='del'>-</div><div class='del'>-	abt_iocb-&gt;timeout = qla24xx_abort_iocb_timeout;</div><div class='del'>-	init_completion(&amp;abt_iocb-&gt;u.abt.comp);</div><div class='del'>-	/* FW can send 2 x ABTS's timeout/20s */</div><div class='del'>-	qla2x00_init_timer(sp, 42);</div><div class='del'>-</div><div class='del'>-	abt_iocb-&gt;u.abt.cmd_hndl = cmd_sp-&gt;handle;</div><div class='del'>-	abt_iocb-&gt;u.abt.req_que_no = cpu_to_le16(cmd_sp-&gt;qpair-&gt;req-&gt;id);</div><div class='del'>-</div><div class='del'>-	sp-&gt;done = qla24xx_abort_sp_done;</div><div class='del'>-</div><div class='del'>-	ql_dbg(ql_dbg_async, vha, 0x507c,</div><div class='del'>-	    "Abort command issued - hdl=%x, type=%x\n",</div><div class='del'>-	    cmd_sp-&gt;handle, cmd_sp-&gt;type);</div><div class='del'>-</div><div class='del'>-	rval = qla2x00_start_sp(sp);</div><div class='del'>-	if (rval != QLA_SUCCESS)</div><div class='del'>-		goto done_free_sp;</div><div class='del'>-</div><div class='del'>-	if (wait) {</div><div class='del'>-		wait_for_completion(&amp;abt_iocb-&gt;u.abt.comp);</div><div class='del'>-		rval = abt_iocb-&gt;u.abt.comp_status == CS_COMPLETE ?</div><div class='del'>-			QLA_SUCCESS : QLA_FUNCTION_FAILED;</div><div class='del'>-	} else {</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done_free_sp:</div><div class='del'>-	sp-&gt;free(sp);</div><div class='del'>-done:</div><div class='del'>-	return rval;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int</div><div class='ctx'> qla24xx_async_abort_command(srb_t *sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -2102,6 +2167,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> 	int	rval;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='add'>+	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;vha-&gt;qla_stats, 0, sizeof(vha-&gt;qla_stats));</div><div class='ctx'> 	memset(&amp;vha-&gt;fc_host_stat, 0, sizeof(vha-&gt;fc_host_stat));</div><div class='hunk'>@@ -2136,6 +2202,15 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;reset_chip(vha);</div><div class='ctx'> </div><div class='add'>+	/* Check for secure flash support */</div><div class='add'>+	if (IS_QLA28XX(ha)) {</div><div class='add'>+		if (RD_REG_DWORD(&amp;reg-&gt;mailbox12) &amp; BIT_0) {</div><div class='add'>+			ql_log(ql_log_info, vha, 0xffff, "Adapter is Secure\n");</div><div class='add'>+			ha-&gt;flags.secure_adapter = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	rval = qla2xxx_get_flash_info(vha);</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x004f,</div><div class='hunk'>@@ -2452,7 +2527,7 @@ qla2x00_isp_firmware(scsi_qla_host_t *vha)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> qla2x00_reset_chip(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long   flags = 0;</div><div class='hunk'>@@ -2460,9 +2535,10 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)</div><div class='ctx'> 	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='ctx'> 	uint32_t	cnt;</div><div class='ctx'> 	uint16_t	cmd;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(pci_channel_offline(ha-&gt;pdev)))</div><div class='del'>-		return;</div><div class='add'>+		return rval;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;disable_intrs(ha);</div><div class='ctx'> </div><div class='hunk'>@@ -2588,6 +2664,8 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2828,14 +2906,15 @@ acquired:</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> qla24xx_reset_chip(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	if (pci_channel_offline(ha-&gt;pdev) &amp;&amp;</div><div class='ctx'> 	    ha-&gt;flags.pci_channel_io_perm_failure) {</div><div class='del'>-		return;</div><div class='add'>+		return rval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;disable_intrs(ha);</div><div class='hunk'>@@ -2843,7 +2922,9 @@ qla24xx_reset_chip(scsi_qla_host_t *vha)</div><div class='ctx'> 	qla25xx_manipulate_risc_semaphore(vha);</div><div class='ctx'> </div><div class='ctx'> 	/* Perform RISC reset. */</div><div class='del'>-	qla24xx_reset_risc(vha);</div><div class='add'>+	rval = qla24xx_reset_risc(vha);</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3018,7 +3099,7 @@ qla2x00_alloc_offload_mem(scsi_qla_host_t *vha)</div><div class='ctx'> 	if (IS_FWI2_CAPABLE(ha)) {</div><div class='ctx'> 		/* Allocate memory for Fibre Channel Event Buffer. */</div><div class='ctx'> 		if (!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='del'>-		    !IS_QLA27XX(ha))</div><div class='add'>+		    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 			goto try_eft;</div><div class='ctx'> </div><div class='ctx'> 		if (ha-&gt;fce)</div><div class='hunk'>@@ -3089,12 +3170,15 @@ eft_err:</div><div class='ctx'> void</div><div class='ctx'> qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='add'>+	int rval;</div><div class='ctx'> 	uint32_t dump_size, fixed_size, mem_size, req_q_size, rsp_q_size,</div><div class='ctx'> 	    eft_size, fce_size, mq_size;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='ctx'> 	struct rsp_que *rsp = ha-&gt;rsp_q_map[0];</div><div class='ctx'> 	struct qla2xxx_fw_dump *fw_dump;</div><div class='add'>+	dma_addr_t tc_dma;</div><div class='add'>+	void *tc;</div><div class='ctx'> </div><div class='ctx'> 	dump_size = fixed_size = mem_size = eft_size = fce_size = mq_size = 0;</div><div class='ctx'> 	req_q_size = rsp_q_size = 0;</div><div class='hunk'>@@ -3106,7 +3190,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)</div><div class='ctx'> 		mem_size = (ha-&gt;fw_memory_size - 0x11000 + 1) *</div><div class='ctx'> 		    sizeof(uint16_t);</div><div class='ctx'> 	} else if (IS_FWI2_CAPABLE(ha)) {</div><div class='del'>-		if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+		if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 			fixed_size = offsetof(struct qla83xx_fw_dump, ext_mem);</div><div class='ctx'> 		else if (IS_QLA81XX(ha))</div><div class='ctx'> 			fixed_size = offsetof(struct qla81xx_fw_dump, ext_mem);</div><div class='hunk'>@@ -3118,40 +3202,72 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)</div><div class='ctx'> 		mem_size = (ha-&gt;fw_memory_size - 0x100000 + 1) *</div><div class='ctx'> 		    sizeof(uint32_t);</div><div class='ctx'> 		if (ha-&gt;mqenable) {</div><div class='del'>-			if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+			if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp;</div><div class='add'>+			    !IS_QLA28XX(ha))</div><div class='ctx'> 				mq_size = sizeof(struct qla2xxx_mq_chain);</div><div class='ctx'> 			/*</div><div class='del'>-			 * Allocate maximum buffer size for all queues.</div><div class='add'>+			 * Allocate maximum buffer size for all queues - Q0.</div><div class='ctx'> 			 * Resizing must be done at end-of-dump processing.</div><div class='ctx'> 			 */</div><div class='del'>-			mq_size += ha-&gt;max_req_queues *</div><div class='add'>+			mq_size += (ha-&gt;max_req_queues - 1) *</div><div class='ctx'> 			    (req-&gt;length * sizeof(request_t));</div><div class='del'>-			mq_size += ha-&gt;max_rsp_queues *</div><div class='add'>+			mq_size += (ha-&gt;max_rsp_queues - 1) *</div><div class='ctx'> 			    (rsp-&gt;length * sizeof(response_t));</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ha-&gt;tgt.atio_ring)</div><div class='ctx'> 			mq_size += ha-&gt;tgt.atio_q_length * sizeof(request_t);</div><div class='ctx'> 		/* Allocate memory for Fibre Channel Event Buffer. */</div><div class='ctx'> 		if (!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='del'>-		    !IS_QLA27XX(ha))</div><div class='add'>+		    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 			goto try_eft;</div><div class='ctx'> </div><div class='ctx'> 		fce_size = sizeof(struct qla2xxx_fce_chain) + FCE_SIZE;</div><div class='ctx'> try_eft:</div><div class='add'>+		if (ha-&gt;eft)</div><div class='add'>+			dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='add'>+			    EFT_SIZE, ha-&gt;eft, ha-&gt;eft_dma);</div><div class='add'>+</div><div class='add'>+		/* Allocate memory for Extended Trace Buffer. */</div><div class='add'>+		tc = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, EFT_SIZE, &amp;tc_dma,</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+		if (!tc) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x00c1,</div><div class='add'>+			    "Unable to allocate (%d KB) for EFT.\n",</div><div class='add'>+			    EFT_SIZE / 1024);</div><div class='add'>+			goto allocate;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rval = qla2x00_enable_eft_trace(vha, tc_dma, EFT_NUM_BUFFERS);</div><div class='add'>+		if (rval) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x00c2,</div><div class='add'>+			    "Unable to initialize EFT (%d).\n", rval);</div><div class='add'>+			dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, EFT_SIZE, tc,</div><div class='add'>+			    tc_dma);</div><div class='add'>+		}</div><div class='ctx'> 		ql_dbg(ql_dbg_init, vha, 0x00c3,</div><div class='ctx'> 		    "Allocated (%d KB) EFT ...\n", EFT_SIZE / 1024);</div><div class='ctx'> 		eft_size = EFT_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha)) {</div><div class='del'>-		if (!ha-&gt;fw_dump_template) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x00ba,</div><div class='del'>-			    "Failed missing fwdump template\n");</div><div class='del'>-			return;</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+		struct fwdt *fwdt = ha-&gt;fwdt;</div><div class='add'>+		uint j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 2; j++, fwdt++) {</div><div class='add'>+			if (!fwdt-&gt;template) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0x00ba,</div><div class='add'>+				    "-&gt; fwdt%u no template\n", j);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			ql_dbg(ql_dbg_init, vha, 0x00fa,</div><div class='add'>+			    "-&gt; fwdt%u calculating fwdump size...\n", j);</div><div class='add'>+			fwdt-&gt;dump_size = qla27xx_fwdt_calculate_dump_size(</div><div class='add'>+			    vha, fwdt-&gt;template);</div><div class='add'>+			ql_dbg(ql_dbg_init, vha, 0x00fa,</div><div class='add'>+			    "-&gt; fwdt%u calculated fwdump size = %#lx bytes\n",</div><div class='add'>+			    j, fwdt-&gt;dump_size);</div><div class='add'>+			dump_size += fwdt-&gt;dump_size;</div><div class='ctx'> 		}</div><div class='del'>-		dump_size = qla27xx_fwdt_calculate_dump_size(vha);</div><div class='del'>-		ql_dbg(ql_dbg_init, vha, 0x00fa,</div><div class='del'>-		    "-&gt; allocating fwdump (%x bytes)...\n", dump_size);</div><div class='ctx'> 		goto allocate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3170,42 +3286,66 @@ try_eft:</div><div class='ctx'> 			ha-&gt;exlogin_size;</div><div class='ctx'> </div><div class='ctx'> allocate:</div><div class='del'>-	if (!ha-&gt;fw_dump_len || dump_size != ha-&gt;fw_dump_len) {</div><div class='add'>+	if (!ha-&gt;fw_dump_len || dump_size &gt; ha-&gt;fw_dump_alloc_len) {</div><div class='add'>+</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x00c5,</div><div class='add'>+		    "%s dump_size %d fw_dump_len %d fw_dump_alloc_len %d\n",</div><div class='add'>+		    __func__, dump_size, ha-&gt;fw_dump_len,</div><div class='add'>+		    ha-&gt;fw_dump_alloc_len);</div><div class='add'>+</div><div class='ctx'> 		fw_dump = vmalloc(dump_size);</div><div class='ctx'> 		if (!fw_dump) {</div><div class='ctx'> 			ql_log(ql_log_warn, vha, 0x00c4,</div><div class='ctx'> 			    "Unable to allocate (%d KB) for firmware dump.\n",</div><div class='ctx'> 			    dump_size / 1024);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (ha-&gt;fw_dump)</div><div class='add'>+			mutex_lock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+			if (ha-&gt;fw_dumped) {</div><div class='add'>+				memcpy(fw_dump, ha-&gt;fw_dump, ha-&gt;fw_dump_len);</div><div class='ctx'> 				vfree(ha-&gt;fw_dump);</div><div class='del'>-			ha-&gt;fw_dump = fw_dump;</div><div class='del'>-</div><div class='del'>-			ha-&gt;fw_dump_len = dump_size;</div><div class='del'>-			ql_dbg(ql_dbg_init, vha, 0x00c5,</div><div class='del'>-			    "Allocated (%d KB) for firmware dump.\n",</div><div class='del'>-			    dump_size / 1024);</div><div class='del'>-</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='del'>-				return;</div><div class='del'>-</div><div class='del'>-			ha-&gt;fw_dump-&gt;signature[0] = 'Q';</div><div class='del'>-			ha-&gt;fw_dump-&gt;signature[1] = 'L';</div><div class='del'>-			ha-&gt;fw_dump-&gt;signature[2] = 'G';</div><div class='del'>-			ha-&gt;fw_dump-&gt;signature[3] = 'C';</div><div class='del'>-			ha-&gt;fw_dump-&gt;version = htonl(1);</div><div class='del'>-</div><div class='del'>-			ha-&gt;fw_dump-&gt;fixed_size = htonl(fixed_size);</div><div class='del'>-			ha-&gt;fw_dump-&gt;mem_size = htonl(mem_size);</div><div class='del'>-			ha-&gt;fw_dump-&gt;req_q_size = htonl(req_q_size);</div><div class='del'>-			ha-&gt;fw_dump-&gt;rsp_q_size = htonl(rsp_q_size);</div><div class='del'>-</div><div class='del'>-			ha-&gt;fw_dump-&gt;eft_size = htonl(eft_size);</div><div class='del'>-			ha-&gt;fw_dump-&gt;eft_addr_l = htonl(LSD(ha-&gt;eft_dma));</div><div class='del'>-			ha-&gt;fw_dump-&gt;eft_addr_h = htonl(MSD(ha-&gt;eft_dma));</div><div class='add'>+				ha-&gt;fw_dump = fw_dump;</div><div class='add'>+				ha-&gt;fw_dump_alloc_len =  dump_size;</div><div class='add'>+				ql_dbg(ql_dbg_init, vha, 0x00c5,</div><div class='add'>+				    "Re-Allocated (%d KB) and save firmware dump.\n",</div><div class='add'>+				    dump_size / 1024);</div><div class='add'>+			} else {</div><div class='add'>+				if (ha-&gt;fw_dump)</div><div class='add'>+					vfree(ha-&gt;fw_dump);</div><div class='add'>+				ha-&gt;fw_dump = fw_dump;</div><div class='add'>+</div><div class='add'>+				ha-&gt;fw_dump_len = ha-&gt;fw_dump_alloc_len =</div><div class='add'>+				    dump_size;</div><div class='add'>+				ql_dbg(ql_dbg_init, vha, 0x00c5,</div><div class='add'>+				    "Allocated (%d KB) for firmware dump.\n",</div><div class='add'>+				    dump_size / 1024);</div><div class='add'>+</div><div class='add'>+				if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+					mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-			ha-&gt;fw_dump-&gt;header_size =</div><div class='del'>-				htonl(offsetof(struct qla2xxx_fw_dump, isp));</div><div class='add'>+				ha-&gt;fw_dump-&gt;signature[0] = 'Q';</div><div class='add'>+				ha-&gt;fw_dump-&gt;signature[1] = 'L';</div><div class='add'>+				ha-&gt;fw_dump-&gt;signature[2] = 'G';</div><div class='add'>+				ha-&gt;fw_dump-&gt;signature[3] = 'C';</div><div class='add'>+				ha-&gt;fw_dump-&gt;version = htonl(1);</div><div class='add'>+</div><div class='add'>+				ha-&gt;fw_dump-&gt;fixed_size = htonl(fixed_size);</div><div class='add'>+				ha-&gt;fw_dump-&gt;mem_size = htonl(mem_size);</div><div class='add'>+				ha-&gt;fw_dump-&gt;req_q_size = htonl(req_q_size);</div><div class='add'>+				ha-&gt;fw_dump-&gt;rsp_q_size = htonl(rsp_q_size);</div><div class='add'>+</div><div class='add'>+				ha-&gt;fw_dump-&gt;eft_size = htonl(eft_size);</div><div class='add'>+				ha-&gt;fw_dump-&gt;eft_addr_l =</div><div class='add'>+				    htonl(LSD(ha-&gt;eft_dma));</div><div class='add'>+				ha-&gt;fw_dump-&gt;eft_addr_h =</div><div class='add'>+				    htonl(MSD(ha-&gt;eft_dma));</div><div class='add'>+</div><div class='add'>+				ha-&gt;fw_dump-&gt;header_size =</div><div class='add'>+					htonl(offsetof</div><div class='add'>+					    (struct qla2xxx_fw_dump, isp));</div><div class='add'>+			}</div><div class='add'>+			mutex_unlock(&amp;ha-&gt;optrom_mutex);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3498,7 +3638,8 @@ qla2x00_setup_chip(scsi_qla_host_t *vha)</div><div class='ctx'> 			if (rval == QLA_SUCCESS) {</div><div class='ctx'> 				qla24xx_detect_sfp(vha);</div><div class='ctx'> </div><div class='del'>-				if ((IS_QLA83XX(ha) || IS_QLA27XX(ha)) &amp;&amp;</div><div class='add'>+				if ((IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+				    IS_QLA28XX(ha)) &amp;&amp;</div><div class='ctx'> 				    (ha-&gt;zio_mode == QLA_ZIO_MODE_6))</div><div class='ctx'> 					qla27xx_set_zio_threshold(vha,</div><div class='ctx'> 					    ha-&gt;last_zio_threshold);</div><div class='hunk'>@@ -3570,7 +3711,7 @@ enable_82xx_npiv:</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		ha-&gt;flags.fac_supported = 1;</div><div class='ctx'> 	else if (rval == QLA_SUCCESS &amp;&amp; IS_FAC_REQUIRED(ha)) {</div><div class='ctx'> 		uint32_t size;</div><div class='hunk'>@@ -3585,7 +3726,8 @@ enable_82xx_npiv:</div><div class='ctx'> 			    ha-&gt;fw_major_version, ha-&gt;fw_minor_version,</div><div class='ctx'> 			    ha-&gt;fw_subminor_version);</div><div class='ctx'> </div><div class='del'>-			if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+			if (IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+			    IS_QLA28XX(ha)) {</div><div class='ctx'> 				ha-&gt;flags.fac_supported = 0;</div><div class='ctx'> 				rval = QLA_SUCCESS;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3647,8 +3789,7 @@ qla2x00_update_fw_options(scsi_qla_host_t *vha)</div><div class='ctx'> 	ql_dbg(ql_dbg_init + ql_dbg_buffer, vha, 0x0115,</div><div class='ctx'> 	    "Serial link options.\n");</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0109,</div><div class='del'>-	    (uint8_t *)&amp;ha-&gt;fw_seriallink_options,</div><div class='del'>-	    sizeof(ha-&gt;fw_seriallink_options));</div><div class='add'>+	    ha-&gt;fw_seriallink_options, sizeof(ha-&gt;fw_seriallink_options));</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;fw_options[1] &amp;= ~FO1_SET_EMPHASIS_SWING;</div><div class='ctx'> 	if (ha-&gt;fw_seriallink_options[3] &amp; BIT_2) {</div><div class='hunk'>@@ -3738,7 +3879,7 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)</div><div class='ctx'> </div><div class='ctx'> 	/* Move PUREX, ABTS RX &amp; RIDA to ATIOQ */</div><div class='ctx'> 	if (ql2xmvasynctoatio &amp;&amp;</div><div class='del'>-	    (IS_QLA83XX(ha) || IS_QLA27XX(ha))) {</div><div class='add'>+	    (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))) {</div><div class='ctx'> 		if (qla_tgt_mode_enabled(vha) ||</div><div class='ctx'> 		    qla_dual_mode_enabled(vha))</div><div class='ctx'> 			ha-&gt;fw_options[2] |= BIT_11;</div><div class='hunk'>@@ -3746,7 +3887,8 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)</div><div class='ctx'> 			ha-&gt;fw_options[2] &amp;= ~BIT_11;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA25XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA25XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Tell FW to track each exchange to prevent</div><div class='ctx'> 		 * driver from using stale exchange.</div><div class='hunk'>@@ -3799,10 +3941,8 @@ qla2x00_config_rings(struct scsi_qla_host *vha)</div><div class='ctx'> 	ha-&gt;init_cb-&gt;response_q_inpointer = cpu_to_le16(0);</div><div class='ctx'> 	ha-&gt;init_cb-&gt;request_q_length = cpu_to_le16(req-&gt;length);</div><div class='ctx'> 	ha-&gt;init_cb-&gt;response_q_length = cpu_to_le16(rsp-&gt;length);</div><div class='del'>-	ha-&gt;init_cb-&gt;request_q_address[0] = cpu_to_le32(LSD(req-&gt;dma));</div><div class='del'>-	ha-&gt;init_cb-&gt;request_q_address[1] = cpu_to_le32(MSD(req-&gt;dma));</div><div class='del'>-	ha-&gt;init_cb-&gt;response_q_address[0] = cpu_to_le32(LSD(rsp-&gt;dma));</div><div class='del'>-	ha-&gt;init_cb-&gt;response_q_address[1] = cpu_to_le32(MSD(rsp-&gt;dma));</div><div class='add'>+	put_unaligned_le64(req-&gt;dma, &amp;ha-&gt;init_cb-&gt;request_q_address);</div><div class='add'>+	put_unaligned_le64(rsp-&gt;dma, &amp;ha-&gt;init_cb-&gt;response_q_address);</div><div class='ctx'> </div><div class='ctx'> 	WRT_REG_WORD(ISP_REQ_Q_IN(ha, reg), 0);</div><div class='ctx'> 	WRT_REG_WORD(ISP_REQ_Q_OUT(ha, reg), 0);</div><div class='hunk'>@@ -3829,21 +3969,19 @@ qla24xx_config_rings(struct scsi_qla_host *vha)</div><div class='ctx'> 	icb-&gt;response_q_inpointer = cpu_to_le16(0);</div><div class='ctx'> 	icb-&gt;request_q_length = cpu_to_le16(req-&gt;length);</div><div class='ctx'> 	icb-&gt;response_q_length = cpu_to_le16(rsp-&gt;length);</div><div class='del'>-	icb-&gt;request_q_address[0] = cpu_to_le32(LSD(req-&gt;dma));</div><div class='del'>-	icb-&gt;request_q_address[1] = cpu_to_le32(MSD(req-&gt;dma));</div><div class='del'>-	icb-&gt;response_q_address[0] = cpu_to_le32(LSD(rsp-&gt;dma));</div><div class='del'>-	icb-&gt;response_q_address[1] = cpu_to_le32(MSD(rsp-&gt;dma));</div><div class='add'>+	put_unaligned_le64(req-&gt;dma, &amp;icb-&gt;request_q_address);</div><div class='add'>+	put_unaligned_le64(rsp-&gt;dma, &amp;icb-&gt;response_q_address);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup ATIO queue dma pointers for target mode */</div><div class='ctx'> 	icb-&gt;atio_q_inpointer = cpu_to_le16(0);</div><div class='ctx'> 	icb-&gt;atio_q_length = cpu_to_le16(ha-&gt;tgt.atio_q_length);</div><div class='del'>-	icb-&gt;atio_q_address[0] = cpu_to_le32(LSD(ha-&gt;tgt.atio_dma));</div><div class='del'>-	icb-&gt;atio_q_address[1] = cpu_to_le32(MSD(ha-&gt;tgt.atio_dma));</div><div class='add'>+	put_unaligned_le64(ha-&gt;tgt.atio_dma, &amp;icb-&gt;atio_q_address);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_SHADOW_REG_CAPABLE(ha))</div><div class='ctx'> 		icb-&gt;firmware_options_2 |= cpu_to_le32(BIT_30|BIT_29);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		icb-&gt;qos = cpu_to_le16(QLA_DEFAULT_QUE_QOS);</div><div class='ctx'> 		icb-&gt;rid = cpu_to_le16(rid);</div><div class='ctx'> 		if (ha-&gt;flags.msix_enabled) {</div><div class='hunk'>@@ -4266,11 +4404,14 @@ qla2x00_set_model_info(scsi_qla_host_t *vha, uint8_t *model, size_t len,</div><div class='ctx'> {</div><div class='ctx'> 	char *st, *en;</div><div class='ctx'> 	uint16_t index;</div><div class='add'>+	uint64_t zero[2] = { 0 };</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	int use_tbl = !IS_QLA24XX_TYPE(ha) &amp;&amp; !IS_QLA25XX(ha) &amp;&amp;</div><div class='ctx'> 	    !IS_CNA_CAPABLE(ha) &amp;&amp; !IS_QLA2031(ha);</div><div class='ctx'> </div><div class='del'>-	if (memcmp(model, BINZERO, len) != 0) {</div><div class='add'>+	if (len &gt; sizeof(zero))</div><div class='add'>+		len = sizeof(zero);</div><div class='add'>+	if (memcmp(model, &amp;zero, len) != 0) {</div><div class='ctx'> 		strncpy(ha-&gt;model_number, model, len);</div><div class='ctx'> 		st = en = ha-&gt;model_number;</div><div class='ctx'> 		en += len - 1;</div><div class='hunk'>@@ -4357,7 +4498,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine NVRAM starting address. */</div><div class='del'>-	ha-&gt;nvram_size = sizeof(nvram_t);</div><div class='add'>+	ha-&gt;nvram_size = sizeof(*nv);</div><div class='ctx'> 	ha-&gt;nvram_base = 0;</div><div class='ctx'> 	if (!IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha) &amp;&amp; !IS_QLA2300(ha))</div><div class='ctx'> 		if ((RD_REG_WORD(&amp;reg-&gt;ctrl_status) &gt;&gt; 14) == 1)</div><div class='hunk'>@@ -4371,16 +4512,15 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	ql_dbg(ql_dbg_init + ql_dbg_buffer, vha, 0x010f,</div><div class='ctx'> 	    "Contents of NVRAM.\n");</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0110,</div><div class='del'>-	    (uint8_t *)nv, ha-&gt;nvram_size);</div><div class='add'>+	    nv, ha-&gt;nvram_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Bad NVRAM data, set defaults parameters. */</div><div class='del'>-	if (chksum || nv-&gt;id[0] != 'I' || nv-&gt;id[1] != 'S' ||</div><div class='del'>-	    nv-&gt;id[2] != 'P' || nv-&gt;id[3] != ' ' || nv-&gt;nvram_version &lt; 1) {</div><div class='add'>+	if (chksum || memcmp("ISP ", nv-&gt;id, sizeof(nv-&gt;id)) ||</div><div class='add'>+	    nv-&gt;nvram_version &lt; 1) {</div><div class='ctx'> 		/* Reset NVRAM data. */</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x0064,</div><div class='del'>-		    "Inconsistent NVRAM "</div><div class='del'>-		    "detected: checksum=0x%x id=%c version=0x%x.\n",</div><div class='del'>-		    chksum, nv-&gt;id[0], nv-&gt;nvram_version);</div><div class='add'>+		    "Inconsistent NVRAM detected: checksum=%#x id=%.4s version=%#x.\n",</div><div class='add'>+		    chksum, nv-&gt;id, nv-&gt;nvram_version);</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x0065,</div><div class='ctx'> 		    "Falling back to "</div><div class='ctx'> 		    "functioning (yet invalid -- WWPN) defaults.\n");</div><div class='hunk'>@@ -4629,7 +4769,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 			ha-&gt;zio_mode = icb-&gt;add_firmware_options[0] &amp;</div><div class='ctx'> 			    (BIT_3 | BIT_2 | BIT_1 | BIT_0);</div><div class='ctx'> 			ha-&gt;zio_timer = icb-&gt;interrupt_delay_timer ?</div><div class='del'>-			    icb-&gt;interrupt_delay_timer: 2;</div><div class='add'>+			    icb-&gt;interrupt_delay_timer : 2;</div><div class='ctx'> 		}</div><div class='ctx'> 		icb-&gt;add_firmware_options[0] &amp;=</div><div class='ctx'> 		    ~(BIT_3 | BIT_2 | BIT_1 | BIT_0);</div><div class='hunk'>@@ -4662,7 +4802,7 @@ qla2x00_rport_del(void *data)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(fcport-&gt;vha-&gt;host-&gt;host_lock, flags);</div><div class='del'>-	rport = fcport-&gt;drport ? fcport-&gt;drport: fcport-&gt;rport;</div><div class='add'>+	rport = fcport-&gt;drport ? fcport-&gt;drport : fcport-&gt;rport;</div><div class='ctx'> 	fcport-&gt;drport = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(fcport-&gt;vha-&gt;host-&gt;host_lock, flags);</div><div class='ctx'> 	if (rport) {</div><div class='hunk'>@@ -4675,6 +4815,23 @@ qla2x00_rport_del(void *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void qla2x00_set_fcport_state(fc_port_t *fcport, int state)</div><div class='add'>+{</div><div class='add'>+	int old_state;</div><div class='add'>+</div><div class='add'>+	old_state = atomic_read(&amp;fcport-&gt;state);</div><div class='add'>+	atomic_set(&amp;fcport-&gt;state, state);</div><div class='add'>+</div><div class='add'>+	/* Don't print state transitions during initial allocation of fcport */</div><div class='add'>+	if (old_state &amp;&amp; old_state != state) {</div><div class='add'>+		ql_dbg(ql_dbg_disc, fcport-&gt;vha, 0x207d,</div><div class='add'>+		       "FCPort %8phC state transitioned from %s to %s - portid=%02x%02x%02x.\n",</div><div class='add'>+		       fcport-&gt;port_name, port_state_str[old_state],</div><div class='add'>+		       port_state_str[state], fcport-&gt;d_id.b.domain,</div><div class='add'>+		       fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_alloc_fcport() - Allocate a generic fcport.</div><div class='ctx'>  * @vha: HA context</div><div class='hunk'>@@ -4741,6 +4898,8 @@ qla2x00_free_fcport(fc_port_t *fcport)</div><div class='ctx'> </div><div class='ctx'> 		fcport-&gt;ct_desc.ct_sns = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	list_del(&amp;fcport-&gt;list);</div><div class='add'>+	qla2x00_clear_loop_id(fcport);</div><div class='ctx'> 	kfree(fcport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4762,6 +4921,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)</div><div class='ctx'> 	int  rval;</div><div class='ctx'> 	unsigned long flags, save_flags;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	/* Get Initiator ID */</div><div class='hunk'>@@ -4943,8 +5103,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)</div><div class='ctx'> 	ql_dbg(ql_dbg_disc, vha, 0x2011,</div><div class='ctx'> 	    "Entries in ID list (%d).\n", entries);</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2075,</div><div class='del'>-	    (uint8_t *)ha-&gt;gid_list,</div><div class='del'>-	    entries * sizeof(struct gid_list_info));</div><div class='add'>+	    ha-&gt;gid_list, entries * sizeof(*ha-&gt;gid_list));</div><div class='ctx'> </div><div class='ctx'> 	if (entries == 0) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;vha-&gt;work_lock, flags);</div><div class='hunk'>@@ -4991,6 +5150,13 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)</div><div class='ctx'> 		if ((domain &amp; 0xf0) == 0xf0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		/* Bypass if not same domain and area of adapter. */</div><div class='add'>+		if (area &amp;&amp; domain &amp;&amp; ((area != vha-&gt;d_id.b.area) ||</div><div class='add'>+		    (domain != vha-&gt;d_id.b.domain)) &amp;&amp;</div><div class='add'>+		    (ha-&gt;current_topology == ISP_CFG_NL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 		/* Bypass invalid local loop ID. */</div><div class='ctx'> 		if (loop_id &gt; LAST_LOCAL_LOOP_ID)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -5187,16 +5353,23 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)</div><div class='ctx'> </div><div class='ctx'> 	rport-&gt;supported_classes = fcport-&gt;supported_classes;</div><div class='ctx'> </div><div class='del'>-	rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;</div><div class='add'>+	rport_ids.roles = FC_PORT_ROLE_UNKNOWN;</div><div class='ctx'> 	if (fcport-&gt;port_type == FCT_INITIATOR)</div><div class='del'>-		rport_ids.roles |= FC_RPORT_ROLE_FCP_INITIATOR;</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_FCP_INITIATOR;</div><div class='ctx'> 	if (fcport-&gt;port_type == FCT_TARGET)</div><div class='del'>-		rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_FCP_TARGET;</div><div class='add'>+	if (fcport-&gt;port_type &amp; FCT_NVME_INITIATOR)</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_NVME_INITIATOR;</div><div class='add'>+	if (fcport-&gt;port_type &amp; FCT_NVME_TARGET)</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_NVME_TARGET;</div><div class='add'>+	if (fcport-&gt;port_type &amp; FCT_NVME_DISCOVERY)</div><div class='add'>+		rport_ids.roles |= FC_PORT_ROLE_NVME_DISCOVERY;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_disc, vha, 0x20ee,</div><div class='ctx'> 	    "%s %8phN. rport %p is %s mode\n",</div><div class='ctx'> 	    __func__, fcport-&gt;port_name, rport,</div><div class='del'>-	    (fcport-&gt;port_type == FCT_TARGET) ? "tgt" : "ini");</div><div class='add'>+	    (fcport-&gt;port_type == FCT_TARGET) ? "tgt" :</div><div class='add'>+	    ((fcport-&gt;port_type &amp; FCT_NVME) ? "nvme" :"ini"));</div><div class='ctx'> </div><div class='ctx'> 	fc_remote_port_rolechg(rport, rport_ids.roles);</div><div class='ctx'> }</div><div class='hunk'>@@ -5771,55 +5944,6 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)</div><div class='ctx'> 	return (rval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * qla2x00_find_new_loop_id</div><div class='del'>- *	Scan through our port list and find a new usable loop ID.</div><div class='del'>- *</div><div class='del'>- * Input:</div><div class='del'>- *	ha:	adapter state pointer.</div><div class='del'>- *	dev:	port structure pointer.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *	qla2x00 local function return status code.</div><div class='del'>- *</div><div class='del'>- * Context:</div><div class='del'>- *	Kernel context.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev)</div><div class='del'>-{</div><div class='del'>-	int	rval;</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	unsigned long flags = 0;</div><div class='del'>-</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ha-&gt;vport_slock, flags);</div><div class='del'>-</div><div class='del'>-	dev-&gt;loop_id = find_first_zero_bit(ha-&gt;loop_id_map,</div><div class='del'>-	    LOOPID_MAP_SIZE);</div><div class='del'>-	if (dev-&gt;loop_id &gt;= LOOPID_MAP_SIZE ||</div><div class='del'>-	    qla2x00_is_reserved_id(vha, dev-&gt;loop_id)) {</div><div class='del'>-		dev-&gt;loop_id = FC_NO_LOOP_ID;</div><div class='del'>-		rval = QLA_FUNCTION_FAILED;</div><div class='del'>-	} else</div><div class='del'>-		set_bit(dev-&gt;loop_id, ha-&gt;loop_id_map);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;vport_slock, flags);</div><div class='del'>-</div><div class='del'>-	if (rval == QLA_SUCCESS)</div><div class='del'>-		ql_dbg(ql_dbg_disc, dev-&gt;vha, 0x2086,</div><div class='del'>-		    "Assigning new loopid=%x, portid=%x.\n",</div><div class='del'>-		    dev-&gt;loop_id, dev-&gt;d_id.b24);</div><div class='del'>-	else</div><div class='del'>-		ql_log(ql_log_warn, dev-&gt;vha, 0x2087,</div><div class='del'>-		    "No loop_id's available, portid=%x.\n",</div><div class='del'>-		    dev-&gt;d_id.b24);</div><div class='del'>-</div><div class='del'>-	return (rval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* FW does not set aside Loop id for MGMT Server/FFFFFAh */</div><div class='ctx'> int</div><div class='ctx'> qla2x00_reserve_mgmt_server_loop_id(scsi_qla_host_t *vha)</div><div class='hunk'>@@ -6311,6 +6435,7 @@ qla83xx_initiating_reset(scsi_qla_host_t *vha)</div><div class='ctx'> 		qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		const char *state = qla83xx_dev_state_to_string(dev_state);</div><div class='add'>+</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0xb057, "HW State: %s.\n", state);</div><div class='ctx'> </div><div class='ctx'> 		/* SV: XXX: Is timeout required here? */</div><div class='hunk'>@@ -6632,6 +6757,14 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 	if (vha-&gt;flags.online) {</div><div class='ctx'> 		qla2x00_abort_isp_cleanup(vha);</div><div class='ctx'> </div><div class='add'>+		if (test_and_clear_bit(ISP_ABORT_TO_ROM, &amp;vha-&gt;dpc_flags)) {</div><div class='add'>+			ha-&gt;flags.chip_reset_done = 1;</div><div class='add'>+			vha-&gt;flags.online = 1;</div><div class='add'>+			status = 0;</div><div class='add'>+			clear_bit(ISP_ABORT_RETRY, &amp;vha-&gt;dpc_flags);</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (IS_QLA8031(ha)) {</div><div class='ctx'> 			ql_dbg(ql_dbg_p3p, vha, 0xb05c,</div><div class='ctx'> 			    "Clearing fcoe driver presence.\n");</div><div class='hunk'>@@ -6872,7 +7005,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)</div><div class='ctx'> * Input:</div><div class='ctx'> *      ha = adapter block pointer.</div><div class='ctx'> */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> qla2x00_reset_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='hunk'>@@ -6888,17 +7021,20 @@ qla2x00_reset_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;hccr, HCCR_RELEASE_RISC);</div><div class='ctx'> 	RD_REG_WORD(&amp;reg-&gt;hccr);			/* PCI Posting. */</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> qla24xx_reset_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='add'>+	int rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_P3P_TYPE(ha))</div><div class='del'>-		return;</div><div class='add'>+		return rval;</div><div class='ctx'> </div><div class='ctx'> 	vha-&gt;flags.online = 0;</div><div class='ctx'> 	ha-&gt;isp_ops-&gt;disable_intrs(ha);</div><div class='hunk'>@@ -6912,6 +7048,8 @@ qla24xx_reset_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_NOPOLLING_TYPE(ha))</div><div class='ctx'> 		ha-&gt;isp_ops-&gt;enable_intrs(ha);</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* On sparc systems, obtain port and node WWN from firmware</div><div class='hunk'>@@ -6962,34 +7100,33 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;vpd_base = FA_NVRAM_VPD1_ADDR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ha-&gt;nvram_size = sizeof(struct nvram_24xx);</div><div class='add'>+	ha-&gt;nvram_size = sizeof(*nv);</div><div class='ctx'> 	ha-&gt;vpd_size = FA_NVRAM_VPD_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* Get VPD data into cache */</div><div class='ctx'> 	ha-&gt;vpd = ha-&gt;nvram + VPD_OFFSET;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_nvram(vha, (uint8_t *)ha-&gt;vpd,</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_nvram(vha, ha-&gt;vpd,</div><div class='ctx'> 	    ha-&gt;nvram_base - FA_NVRAM_FUNC0_ADDR, FA_NVRAM_VPD_SIZE * 4);</div><div class='ctx'> </div><div class='ctx'> 	/* Get NVRAM data into cache and calculate checksum. */</div><div class='ctx'> 	dptr = (uint32_t *)nv;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_nvram(vha, (uint8_t *)dptr, ha-&gt;nvram_base,</div><div class='del'>-	    ha-&gt;nvram_size);</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_nvram(vha, dptr, ha-&gt;nvram_base, ha-&gt;nvram_size);</div><div class='ctx'> 	for (cnt = 0, chksum = 0; cnt &lt; ha-&gt;nvram_size &gt;&gt; 2; cnt++, dptr++)</div><div class='ctx'> 		chksum += le32_to_cpu(*dptr);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_init + ql_dbg_buffer, vha, 0x006a,</div><div class='ctx'> 	    "Contents of NVRAM\n");</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x010d,</div><div class='del'>-	    (uint8_t *)nv, ha-&gt;nvram_size);</div><div class='add'>+	    nv, ha-&gt;nvram_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Bad NVRAM data, set defaults parameters. */</div><div class='del'>-	if (chksum || nv-&gt;id[0] != 'I' || nv-&gt;id[1] != 'S' || nv-&gt;id[2] != 'P'</div><div class='del'>-	    || nv-&gt;id[3] != ' ' ||</div><div class='del'>-	    nv-&gt;nvram_version &lt; cpu_to_le16(ICB_VERSION)) {</div><div class='add'>+	if (chksum || memcmp("ISP ", nv-&gt;id, sizeof(nv-&gt;id)) ||</div><div class='add'>+	    le16_to_cpu(nv-&gt;nvram_version) &lt; ICB_VERSION) {</div><div class='ctx'> 		/* Reset NVRAM data. */</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x006b,</div><div class='del'>-		    "Inconsistent NVRAM detected: checksum=0x%x id=%c "</div><div class='del'>-		    "version=0x%x.\n", chksum, nv-&gt;id[0], nv-&gt;nvram_version);</div><div class='add'>+		    "Inconsistent NVRAM checksum=%#x id=%.4s version=%#x.\n",</div><div class='add'>+		    chksum, nv-&gt;id, nv-&gt;nvram_version);</div><div class='add'>+		ql_dump_buffer(ql_dbg_init, vha, 0x006b, nv, sizeof(*nv));</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x006c,</div><div class='ctx'> 		    "Falling back to functioning (yet invalid -- WWPN) "</div><div class='ctx'> 		    "defaults.\n");</div><div class='hunk'>@@ -7097,11 +7234,11 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	ha-&gt;flags.disable_risc_code_load = 0;</div><div class='ctx'> 	ha-&gt;flags.enable_lip_reset = 0;</div><div class='ctx'> 	ha-&gt;flags.enable_lip_full_login =</div><div class='del'>-	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_10 ? 1: 0;</div><div class='add'>+	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_10 ? 1 : 0;</div><div class='ctx'> 	ha-&gt;flags.enable_target_reset =</div><div class='del'>-	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_11 ? 1: 0;</div><div class='add'>+	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_11 ? 1 : 0;</div><div class='ctx'> 	ha-&gt;flags.enable_led_scheme = 0;</div><div class='del'>-	ha-&gt;flags.disable_serdes = le32_to_cpu(nv-&gt;host_p) &amp; BIT_5 ? 1: 0;</div><div class='add'>+	ha-&gt;flags.disable_serdes = le32_to_cpu(nv-&gt;host_p) &amp; BIT_5 ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;operating_mode = (le32_to_cpu(icb-&gt;firmware_options_2) &amp;</div><div class='ctx'> 	    (BIT_6 | BIT_5 | BIT_4)) &gt;&gt; 4;</div><div class='hunk'>@@ -7175,7 +7312,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;zio_mode = le32_to_cpu(icb-&gt;firmware_options_2) &amp;</div><div class='ctx'> 		    (BIT_3 | BIT_2 | BIT_1 | BIT_0);</div><div class='ctx'> 		ha-&gt;zio_timer = le16_to_cpu(icb-&gt;interrupt_delay_timer) ?</div><div class='del'>-		    le16_to_cpu(icb-&gt;interrupt_delay_timer): 2;</div><div class='add'>+		    le16_to_cpu(icb-&gt;interrupt_delay_timer) : 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	icb-&gt;firmware_options_2 &amp;= cpu_to_le32(</div><div class='ctx'> 	    ~(BIT_3 | BIT_2 | BIT_1 | BIT_0));</div><div class='hunk'>@@ -7198,128 +7335,311 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	return (rval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-uint8_t qla27xx_find_valid_image(struct scsi_qla_host *vha)</div><div class='add'>+static void</div><div class='add'>+qla27xx_print_image(struct scsi_qla_host *vha, char *name,</div><div class='add'>+    struct qla27xx_image_status *image_status)</div><div class='add'>+{</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x018b,</div><div class='add'>+	    "%s %s: mask=%#02x gen=%#04x ver=%u.%u map=%#01x sum=%#08x sig=%#08x\n",</div><div class='add'>+	    name, "status",</div><div class='add'>+	    image_status-&gt;image_status_mask,</div><div class='add'>+	    le16_to_cpu(image_status-&gt;generation),</div><div class='add'>+	    image_status-&gt;ver_major,</div><div class='add'>+	    image_status-&gt;ver_minor,</div><div class='add'>+	    image_status-&gt;bitmap,</div><div class='add'>+	    le32_to_cpu(image_status-&gt;checksum),</div><div class='add'>+	    le32_to_cpu(image_status-&gt;signature));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+qla28xx_check_aux_image_status_signature(</div><div class='add'>+    struct qla27xx_image_status *image_status)</div><div class='add'>+{</div><div class='add'>+	ulong signature = le32_to_cpu(image_status-&gt;signature);</div><div class='add'>+</div><div class='add'>+	return signature != QLA28XX_AUX_IMG_STATUS_SIGN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+qla27xx_check_image_status_signature(struct qla27xx_image_status *image_status)</div><div class='add'>+{</div><div class='add'>+	ulong signature = le32_to_cpu(image_status-&gt;signature);</div><div class='add'>+</div><div class='add'>+	return</div><div class='add'>+	    signature != QLA27XX_IMG_STATUS_SIGN &amp;&amp;</div><div class='add'>+	    signature != QLA28XX_IMG_STATUS_SIGN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ulong</div><div class='add'>+qla27xx_image_status_checksum(struct qla27xx_image_status *image_status)</div><div class='add'>+{</div><div class='add'>+	uint32_t *p = (void *)image_status;</div><div class='add'>+	uint n = sizeof(*image_status) / sizeof(*p);</div><div class='add'>+	uint32_t sum = 0;</div><div class='add'>+</div><div class='add'>+	for ( ; n--; p++)</div><div class='add'>+		sum += le32_to_cpup(p);</div><div class='add'>+</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint</div><div class='add'>+qla28xx_component_bitmask(struct qla27xx_image_status *aux, uint bitmask)</div><div class='add'>+{</div><div class='add'>+	return aux-&gt;bitmap &amp; bitmask ?</div><div class='add'>+	    QLA27XX_SECONDARY_IMAGE : QLA27XX_PRIMARY_IMAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qla28xx_component_status(</div><div class='add'>+    struct active_regions *active_regions, struct qla27xx_image_status *aux)</div><div class='add'>+{</div><div class='add'>+	active_regions-&gt;aux.board_config =</div><div class='add'>+	    qla28xx_component_bitmask(aux, QLA28XX_AUX_IMG_BOARD_CONFIG);</div><div class='add'>+</div><div class='add'>+	active_regions-&gt;aux.vpd_nvram =</div><div class='add'>+	    qla28xx_component_bitmask(aux, QLA28XX_AUX_IMG_VPD_NVRAM);</div><div class='add'>+</div><div class='add'>+	active_regions-&gt;aux.npiv_config_0_1 =</div><div class='add'>+	    qla28xx_component_bitmask(aux, QLA28XX_AUX_IMG_NPIV_CONFIG_0_1);</div><div class='add'>+</div><div class='add'>+	active_regions-&gt;aux.npiv_config_2_3 =</div><div class='add'>+	    qla28xx_component_bitmask(aux, QLA28XX_AUX_IMG_NPIV_CONFIG_2_3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qla27xx_compare_image_generation(</div><div class='add'>+    struct qla27xx_image_status *pri_image_status,</div><div class='add'>+    struct qla27xx_image_status *sec_image_status)</div><div class='add'>+{</div><div class='add'>+	/* calculate generation delta as uint16 (this accounts for wrap) */</div><div class='add'>+	int16_t delta =</div><div class='add'>+	    le16_to_cpu(pri_image_status-&gt;generation) -</div><div class='add'>+	    le16_to_cpu(sec_image_status-&gt;generation);</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_init, NULL, 0x0180, "generation delta = %d\n", delta);</div><div class='add'>+</div><div class='add'>+	return delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+qla28xx_get_aux_images(</div><div class='add'>+	struct scsi_qla_host *vha, struct active_regions *active_regions)</div><div class='ctx'> {</div><div class='del'>-	struct qla27xx_image_status pri_image_status, sec_image_status;</div><div class='del'>-	uint8_t valid_pri_image, valid_sec_image;</div><div class='del'>-	uint32_t *wptr;</div><div class='del'>-	uint32_t cnt, chksum, size;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct qla27xx_image_status pri_aux_image_status, sec_aux_image_status;</div><div class='add'>+	bool valid_pri_image = false, valid_sec_image = false;</div><div class='add'>+	bool active_pri_image = false, active_sec_image = false;</div><div class='ctx'> </div><div class='del'>-	valid_pri_image = valid_sec_image = 1;</div><div class='del'>-	ha-&gt;active_image = 0;</div><div class='del'>-	size = sizeof(struct qla27xx_image_status) / sizeof(uint32_t);</div><div class='add'>+	if (!ha-&gt;flt_region_aux_img_status_pri) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018a, "Primary aux image not addressed\n");</div><div class='add'>+		goto check_sec_image;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!ha-&gt;flt_region_img_status_pri) {</div><div class='del'>-		valid_pri_image = 0;</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)&amp;pri_aux_image_status,</div><div class='add'>+	    ha-&gt;flt_region_aux_img_status_pri,</div><div class='add'>+	    sizeof(pri_aux_image_status) &gt;&gt; 2);</div><div class='add'>+	qla27xx_print_image(vha, "Primary aux image", &amp;pri_aux_image_status);</div><div class='add'>+</div><div class='add'>+	if (qla28xx_check_aux_image_status_signature(&amp;pri_aux_image_status)) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018b,</div><div class='add'>+		    "Primary aux image signature (%#x) not valid\n",</div><div class='add'>+		    le32_to_cpu(pri_aux_image_status.signature));</div><div class='add'>+		goto check_sec_image;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qla27xx_image_status_checksum(&amp;pri_aux_image_status)) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018c,</div><div class='add'>+		    "Primary aux image checksum failed\n");</div><div class='ctx'> 		goto check_sec_image;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qla24xx_read_flash_data(vha, (uint32_t *)(&amp;pri_image_status),</div><div class='del'>-	    ha-&gt;flt_region_img_status_pri, size);</div><div class='add'>+	valid_pri_image = true;</div><div class='add'>+</div><div class='add'>+	if (pri_aux_image_status.image_status_mask &amp; 1) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018d,</div><div class='add'>+		    "Primary aux image is active\n");</div><div class='add'>+		active_pri_image = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+check_sec_image:</div><div class='add'>+	if (!ha-&gt;flt_region_aux_img_status_sec) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018a,</div><div class='add'>+		    "Secondary aux image not addressed\n");</div><div class='add'>+		goto check_valid_image;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (pri_image_status.signature != QLA27XX_IMG_STATUS_SIGN) {</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)&amp;sec_aux_image_status,</div><div class='add'>+	    ha-&gt;flt_region_aux_img_status_sec,</div><div class='add'>+	    sizeof(sec_aux_image_status) &gt;&gt; 2);</div><div class='add'>+	qla27xx_print_image(vha, "Secondary aux image", &amp;sec_aux_image_status);</div><div class='add'>+</div><div class='add'>+	if (qla28xx_check_aux_image_status_signature(&amp;sec_aux_image_status)) {</div><div class='ctx'> 		ql_dbg(ql_dbg_init, vha, 0x018b,</div><div class='del'>-		    "Primary image signature (0x%x) not valid\n",</div><div class='del'>-		    pri_image_status.signature);</div><div class='del'>-		valid_pri_image = 0;</div><div class='add'>+		    "Secondary aux image signature (%#x) not valid\n",</div><div class='add'>+		    le32_to_cpu(sec_aux_image_status.signature));</div><div class='add'>+		goto check_valid_image;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qla27xx_image_status_checksum(&amp;sec_aux_image_status)) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018c,</div><div class='add'>+		    "Secondary aux image checksum failed\n");</div><div class='add'>+		goto check_valid_image;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	valid_sec_image = true;</div><div class='add'>+</div><div class='add'>+	if (sec_aux_image_status.image_status_mask &amp; 1) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018d,</div><div class='add'>+		    "Secondary aux image is active\n");</div><div class='add'>+		active_sec_image = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+check_valid_image:</div><div class='add'>+	if (valid_pri_image &amp;&amp; active_pri_image &amp;&amp;</div><div class='add'>+	    valid_sec_image &amp;&amp; active_sec_image) {</div><div class='add'>+		if (qla27xx_compare_image_generation(&amp;pri_aux_image_status,</div><div class='add'>+		    &amp;sec_aux_image_status) &gt;= 0) {</div><div class='add'>+			qla28xx_component_status(active_regions,</div><div class='add'>+			    &amp;pri_aux_image_status);</div><div class='add'>+		} else {</div><div class='add'>+			qla28xx_component_status(active_regions,</div><div class='add'>+			    &amp;sec_aux_image_status);</div><div class='add'>+		}</div><div class='add'>+	} else if (valid_pri_image &amp;&amp; active_pri_image) {</div><div class='add'>+		qla28xx_component_status(active_regions, &amp;pri_aux_image_status);</div><div class='add'>+	} else if (valid_sec_image &amp;&amp; active_sec_image) {</div><div class='add'>+		qla28xx_component_status(active_regions, &amp;sec_aux_image_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x018f,</div><div class='add'>+	    "aux images active: BCFG=%u VPD/NVR=%u NPIV0/1=%u NPIV2/3=%u\n",</div><div class='add'>+	    active_regions-&gt;aux.board_config,</div><div class='add'>+	    active_regions-&gt;aux.vpd_nvram,</div><div class='add'>+	    active_regions-&gt;aux.npiv_config_0_1,</div><div class='add'>+	    active_regions-&gt;aux.npiv_config_2_3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+qla27xx_get_active_image(struct scsi_qla_host *vha,</div><div class='add'>+    struct active_regions *active_regions)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct qla27xx_image_status pri_image_status, sec_image_status;</div><div class='add'>+	bool valid_pri_image = false, valid_sec_image = false;</div><div class='add'>+	bool active_pri_image = false, active_sec_image = false;</div><div class='add'>+</div><div class='add'>+	if (!ha-&gt;flt_region_img_status_pri) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018a, "Primary image not addressed\n");</div><div class='ctx'> 		goto check_sec_image;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wptr = (uint32_t *)(&amp;pri_image_status);</div><div class='del'>-	cnt = size;</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)(&amp;pri_image_status),</div><div class='add'>+	    ha-&gt;flt_region_img_status_pri, sizeof(pri_image_status) &gt;&gt; 2);</div><div class='add'>+	qla27xx_print_image(vha, "Primary image", &amp;pri_image_status);</div><div class='ctx'> </div><div class='del'>-	for (chksum = 0; cnt--; wptr++)</div><div class='del'>-		chksum += le32_to_cpu(*wptr);</div><div class='add'>+	if (qla27xx_check_image_status_signature(&amp;pri_image_status)) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018b,</div><div class='add'>+		    "Primary image signature (%#x) not valid\n",</div><div class='add'>+		    le32_to_cpu(pri_image_status.signature));</div><div class='add'>+		goto check_sec_image;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (chksum) {</div><div class='add'>+	if (qla27xx_image_status_checksum(&amp;pri_image_status)) {</div><div class='ctx'> 		ql_dbg(ql_dbg_init, vha, 0x018c,</div><div class='del'>-		    "Checksum validation failed for primary image (0x%x)\n",</div><div class='del'>-		    chksum);</div><div class='del'>-		valid_pri_image = 0;</div><div class='add'>+		    "Primary image checksum failed\n");</div><div class='add'>+		goto check_sec_image;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	valid_pri_image = true;</div><div class='add'>+</div><div class='add'>+	if (pri_image_status.image_status_mask &amp; 1) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018d,</div><div class='add'>+		    "Primary image is active\n");</div><div class='add'>+		active_pri_image = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> check_sec_image:</div><div class='ctx'> 	if (!ha-&gt;flt_region_img_status_sec) {</div><div class='del'>-		valid_sec_image = 0;</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018a, "Secondary image not addressed\n");</div><div class='ctx'> 		goto check_valid_image;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qla24xx_read_flash_data(vha, (uint32_t *)(&amp;sec_image_status),</div><div class='del'>-	    ha-&gt;flt_region_img_status_sec, size);</div><div class='add'>+	    ha-&gt;flt_region_img_status_sec, sizeof(sec_image_status) &gt;&gt; 2);</div><div class='add'>+	qla27xx_print_image(vha, "Secondary image", &amp;sec_image_status);</div><div class='ctx'> </div><div class='del'>-	if (sec_image_status.signature != QLA27XX_IMG_STATUS_SIGN) {</div><div class='del'>-		ql_dbg(ql_dbg_init, vha, 0x018d,</div><div class='del'>-		    "Secondary image signature(0x%x) not valid\n",</div><div class='del'>-		    sec_image_status.signature);</div><div class='del'>-		valid_sec_image = 0;</div><div class='add'>+	if (qla27xx_check_image_status_signature(&amp;sec_image_status)) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018b,</div><div class='add'>+		    "Secondary image signature (%#x) not valid\n",</div><div class='add'>+		    le32_to_cpu(sec_image_status.signature));</div><div class='ctx'> 		goto check_valid_image;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wptr = (uint32_t *)(&amp;sec_image_status);</div><div class='del'>-	cnt = size;</div><div class='del'>-	for (chksum = 0; cnt--; wptr++)</div><div class='del'>-		chksum += le32_to_cpu(*wptr);</div><div class='del'>-	if (chksum) {</div><div class='del'>-		ql_dbg(ql_dbg_init, vha, 0x018e,</div><div class='del'>-		    "Checksum validation failed for secondary image (0x%x)\n",</div><div class='del'>-		    chksum);</div><div class='del'>-		valid_sec_image = 0;</div><div class='add'>+	if (qla27xx_image_status_checksum(&amp;sec_image_status)) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018c,</div><div class='add'>+		    "Secondary image checksum failed\n");</div><div class='add'>+		goto check_valid_image;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	valid_sec_image = true;</div><div class='add'>+</div><div class='add'>+	if (sec_image_status.image_status_mask &amp; 1) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x018d,</div><div class='add'>+		    "Secondary image is active\n");</div><div class='add'>+		active_sec_image = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> check_valid_image:</div><div class='del'>-	if (valid_pri_image &amp;&amp; (pri_image_status.image_status_mask &amp; 0x1))</div><div class='del'>-		ha-&gt;active_image = QLA27XX_PRIMARY_IMAGE;</div><div class='del'>-	if (valid_sec_image &amp;&amp; (sec_image_status.image_status_mask &amp; 0x1)) {</div><div class='del'>-		if (!ha-&gt;active_image ||</div><div class='del'>-		    pri_image_status.generation_number &lt;</div><div class='del'>-		    sec_image_status.generation_number)</div><div class='del'>-			ha-&gt;active_image = QLA27XX_SECONDARY_IMAGE;</div><div class='add'>+	if (valid_pri_image &amp;&amp; active_pri_image)</div><div class='add'>+		active_regions-&gt;global = QLA27XX_PRIMARY_IMAGE;</div><div class='add'>+</div><div class='add'>+	if (valid_sec_image &amp;&amp; active_sec_image) {</div><div class='add'>+		if (!active_regions-&gt;global ||</div><div class='add'>+		    qla27xx_compare_image_generation(</div><div class='add'>+			&amp;pri_image_status, &amp;sec_image_status) &lt; 0) {</div><div class='add'>+			active_regions-&gt;global = QLA27XX_SECONDARY_IMAGE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x018f, "%s image\n",</div><div class='del'>-	    ha-&gt;active_image == 0 ? "default bootld and fw" :</div><div class='del'>-	    ha-&gt;active_image == 1 ? "primary" :</div><div class='del'>-	    ha-&gt;active_image == 2 ? "secondary" :</div><div class='del'>-	    "Invalid");</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x018f, "active image %s (%u)\n",</div><div class='add'>+	    active_regions-&gt;global == QLA27XX_DEFAULT_IMAGE ?</div><div class='add'>+		"default (boot/fw)" :</div><div class='add'>+	    active_regions-&gt;global == QLA27XX_PRIMARY_IMAGE ?</div><div class='add'>+		"primary" :</div><div class='add'>+	    active_regions-&gt;global == QLA27XX_SECONDARY_IMAGE ?</div><div class='add'>+		"secondary" : "invalid",</div><div class='add'>+	    active_regions-&gt;global);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ha-&gt;active_image;</div><div class='add'>+bool qla24xx_risc_firmware_invalid(uint32_t *dword)</div><div class='add'>+{</div><div class='add'>+	return</div><div class='add'>+	    !(dword[4] | dword[5] | dword[6] | dword[7]) ||</div><div class='add'>+	    !(~dword[4] | ~dword[5] | ~dword[6] | ~dword[7]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,</div><div class='ctx'>     uint32_t faddr)</div><div class='ctx'> {</div><div class='del'>-	int	rval = QLA_SUCCESS;</div><div class='del'>-	int	segments, fragment;</div><div class='del'>-	uint32_t *dcode, dlen;</div><div class='del'>-	uint32_t risc_addr;</div><div class='del'>-	uint32_t risc_size;</div><div class='del'>-	uint32_t i;</div><div class='add'>+	int rval;</div><div class='add'>+	uint templates, segments, fragment;</div><div class='add'>+	ulong i;</div><div class='add'>+	uint j;</div><div class='add'>+	ulong dlen;</div><div class='add'>+	uint32_t *dcode;</div><div class='add'>+	uint32_t risc_addr, risc_size, risc_attr = 0;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='add'>+	struct fwdt *fwdt = ha-&gt;fwdt;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_init, vha, 0x008b,</div><div class='ctx'> 	    "FW: Loading firmware from flash (%x).\n", faddr);</div><div class='ctx'> </div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-	segments = FA_RISC_CODE_SEGMENTS;</div><div class='del'>-	dcode = (uint32_t *)req-&gt;ring;</div><div class='del'>-	*srisc_addr = 0;</div><div class='del'>-</div><div class='del'>-	if (IS_QLA27XX(ha) &amp;&amp;</div><div class='del'>-	    qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)</div><div class='del'>-		faddr = ha-&gt;flt_region_fw_sec;</div><div class='del'>-</div><div class='del'>-	/* Validate firmware image by checking version. */</div><div class='del'>-	qla24xx_read_flash_data(vha, dcode, faddr + 4, 4);</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		dcode[i] = be32_to_cpu(dcode[i]);</div><div class='del'>-	if ((dcode[0] == 0xffffffff &amp;&amp; dcode[1] == 0xffffffff &amp;&amp;</div><div class='del'>-	    dcode[2] == 0xffffffff &amp;&amp; dcode[3] == 0xffffffff) ||</div><div class='del'>-	    (dcode[0] == 0 &amp;&amp; dcode[1] == 0 &amp;&amp; dcode[2] == 0 &amp;&amp;</div><div class='del'>-		dcode[3] == 0)) {</div><div class='add'>+	dcode = (void *)req-&gt;ring;</div><div class='add'>+	qla24xx_read_flash_data(vha, dcode, faddr, 8);</div><div class='add'>+	if (qla24xx_risc_firmware_invalid(dcode)) {</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x008c,</div><div class='ctx'> 		    "Unable to verify the integrity of flash firmware "</div><div class='ctx'> 		    "image.\n");</div><div class='hunk'>@@ -7330,34 +7650,36 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (segments &amp;&amp; rval == QLA_SUCCESS) {</div><div class='del'>-		/* Read segment's load information. */</div><div class='del'>-		qla24xx_read_flash_data(vha, dcode, faddr, 4);</div><div class='del'>-</div><div class='add'>+	dcode = (void *)req-&gt;ring;</div><div class='add'>+	*srisc_addr = 0;</div><div class='add'>+	segments = FA_RISC_CODE_SEGMENTS;</div><div class='add'>+	for (j = 0; j &lt; segments; j++) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x008d,</div><div class='add'>+		    "-&gt; Loading segment %u...\n", j);</div><div class='add'>+		qla24xx_read_flash_data(vha, dcode, faddr, 10);</div><div class='ctx'> 		risc_addr = be32_to_cpu(dcode[2]);</div><div class='del'>-		*srisc_addr = *srisc_addr == 0 ? risc_addr : *srisc_addr;</div><div class='ctx'> 		risc_size = be32_to_cpu(dcode[3]);</div><div class='add'>+		if (!*srisc_addr) {</div><div class='add'>+			*srisc_addr = risc_addr;</div><div class='add'>+			risc_attr = be32_to_cpu(dcode[9]);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		fragment = 0;</div><div class='del'>-		while (risc_size &gt; 0 &amp;&amp; rval == QLA_SUCCESS) {</div><div class='del'>-			dlen = (uint32_t)(ha-&gt;fw_transfer_size &gt;&gt; 2);</div><div class='add'>+		dlen = ha-&gt;fw_transfer_size &gt;&gt; 2;</div><div class='add'>+		for (fragment = 0; risc_size; fragment++) {</div><div class='ctx'> 			if (dlen &gt; risc_size)</div><div class='ctx'> 				dlen = risc_size;</div><div class='ctx'> </div><div class='ctx'> 			ql_dbg(ql_dbg_init, vha, 0x008e,</div><div class='del'>-			    "Loading risc segment@ risc addr %x "</div><div class='del'>-			    "number of dwords 0x%x offset 0x%x.\n",</div><div class='del'>-			    risc_addr, dlen, faddr);</div><div class='del'>-</div><div class='add'>+			    "-&gt; Loading fragment %u: %#x &lt;- %#x (%#lx dwords)...\n",</div><div class='add'>+			    fragment, risc_addr, faddr, dlen);</div><div class='ctx'> 			qla24xx_read_flash_data(vha, dcode, faddr, dlen);</div><div class='ctx'> 			for (i = 0; i &lt; dlen; i++)</div><div class='ctx'> 				dcode[i] = swab32(dcode[i]);</div><div class='ctx'> </div><div class='del'>-			rval = qla2x00_load_ram(vha, req-&gt;dma, risc_addr,</div><div class='del'>-			    dlen);</div><div class='add'>+			rval = qla2x00_load_ram(vha, req-&gt;dma, risc_addr, dlen);</div><div class='ctx'> 			if (rval) {</div><div class='ctx'> 				ql_log(ql_log_fatal, vha, 0x008f,</div><div class='del'>-				    "Failed to load segment %d of firmware.\n",</div><div class='add'>+				    "-&gt; Failed load firmware fragment %u.\n",</div><div class='ctx'> 				    fragment);</div><div class='ctx'> 				return QLA_FUNCTION_FAILED;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -7365,107 +7687,82 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,</div><div class='ctx'> 			faddr += dlen;</div><div class='ctx'> 			risc_addr += dlen;</div><div class='ctx'> 			risc_size -= dlen;</div><div class='del'>-			fragment++;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Next segment. */</div><div class='del'>-		segments--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA27XX(ha))</div><div class='del'>-		return rval;</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		return QLA_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='del'>-</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0161,</div><div class='del'>-	    "Loading fwdump template from %x\n", faddr);</div><div class='del'>-	qla24xx_read_flash_data(vha, dcode, faddr, 7);</div><div class='del'>-	risc_size = be32_to_cpu(dcode[2]);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0162,</div><div class='del'>-	    "-&gt; array size %x dwords\n", risc_size);</div><div class='del'>-	if (risc_size == 0 || risc_size == ~0)</div><div class='del'>-		goto default_template;</div><div class='del'>-</div><div class='del'>-	dlen = (risc_size - 8) * sizeof(*dcode);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0163,</div><div class='del'>-	    "-&gt; template allocating %x bytes...\n", dlen);</div><div class='del'>-	ha-&gt;fw_dump_template = vmalloc(dlen);</div><div class='del'>-	if (!ha-&gt;fw_dump_template) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0164,</div><div class='del'>-		    "Failed fwdump template allocate %x bytes.\n", risc_size);</div><div class='del'>-		goto default_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	faddr += 7;</div><div class='del'>-	risc_size -= 8;</div><div class='del'>-	dcode = ha-&gt;fw_dump_template;</div><div class='del'>-	qla24xx_read_flash_data(vha, dcode, faddr, risc_size);</div><div class='del'>-	for (i = 0; i &lt; risc_size; i++)</div><div class='del'>-		dcode[i] = le32_to_cpu(dcode[i]);</div><div class='del'>-</div><div class='del'>-	if (!qla27xx_fwdt_template_valid(dcode)) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0165,</div><div class='del'>-		    "Failed fwdump template validate\n");</div><div class='del'>-		goto default_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dlen = qla27xx_fwdt_template_size(dcode);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0166,</div><div class='del'>-	    "-&gt; template size %x bytes\n", dlen);</div><div class='del'>-	if (dlen &gt; risc_size * sizeof(*dcode)) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0167,</div><div class='del'>-		    "Failed fwdump template exceeds array by %zx bytes\n",</div><div class='del'>-		    (size_t)(dlen - risc_size * sizeof(*dcode)));</div><div class='del'>-		goto default_template;</div><div class='del'>-	}</div><div class='del'>-	ha-&gt;fw_dump_template_len = dlen;</div><div class='del'>-	return rval;</div><div class='add'>+	templates = (risc_attr &amp; BIT_9) ? 2 : 1;</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0160, "-&gt; templates = %u\n", templates);</div><div class='add'>+	for (j = 0; j &lt; templates; j++, fwdt++) {</div><div class='add'>+		if (fwdt-&gt;template)</div><div class='add'>+			vfree(fwdt-&gt;template);</div><div class='add'>+		fwdt-&gt;template = NULL;</div><div class='add'>+		fwdt-&gt;length = 0;</div><div class='add'>+</div><div class='add'>+		dcode = (void *)req-&gt;ring;</div><div class='add'>+		qla24xx_read_flash_data(vha, dcode, faddr, 7);</div><div class='add'>+		risc_size = be32_to_cpu(dcode[2]);</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0161,</div><div class='add'>+		    "-&gt; fwdt%u template array at %#x (%#x dwords)\n",</div><div class='add'>+		    j, faddr, risc_size);</div><div class='add'>+		if (!risc_size || !~risc_size) {</div><div class='add'>+			ql_dbg(ql_dbg_init, vha, 0x0162,</div><div class='add'>+			    "-&gt; fwdt%u failed to read array\n", j);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-default_template:</div><div class='del'>-	ql_log(ql_log_warn, vha, 0x0168, "Using default fwdump template\n");</div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='del'>-</div><div class='del'>-	dlen = qla27xx_fwdt_template_default_size();</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0169,</div><div class='del'>-	    "-&gt; template allocating %x bytes...\n", dlen);</div><div class='del'>-	ha-&gt;fw_dump_template = vmalloc(dlen);</div><div class='del'>-	if (!ha-&gt;fw_dump_template) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x016a,</div><div class='del'>-		    "Failed fwdump template allocate %x bytes.\n", risc_size);</div><div class='del'>-		goto failed_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dcode = ha-&gt;fw_dump_template;</div><div class='del'>-	risc_size = dlen / sizeof(*dcode);</div><div class='del'>-	memcpy(dcode, qla27xx_fwdt_template_default(), dlen);</div><div class='del'>-	for (i = 0; i &lt; risc_size; i++)</div><div class='del'>-		dcode[i] = be32_to_cpu(dcode[i]);</div><div class='del'>-</div><div class='del'>-	if (!qla27xx_fwdt_template_valid(ha-&gt;fw_dump_template)) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x016b,</div><div class='del'>-		    "Failed fwdump template validate\n");</div><div class='del'>-		goto failed_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dlen = qla27xx_fwdt_template_size(ha-&gt;fw_dump_template);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x016c,</div><div class='del'>-	    "-&gt; template size %x bytes\n", dlen);</div><div class='del'>-	ha-&gt;fw_dump_template_len = dlen;</div><div class='del'>-	return rval;</div><div class='add'>+		/* skip header and ignore checksum */</div><div class='add'>+		faddr += 7;</div><div class='add'>+		risc_size -= 8;</div><div class='add'>+</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0163,</div><div class='add'>+		    "-&gt; fwdt%u template allocate template %#x words...\n",</div><div class='add'>+		    j, risc_size);</div><div class='add'>+		fwdt-&gt;template = vmalloc(risc_size * sizeof(*dcode));</div><div class='add'>+		if (!fwdt-&gt;template) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x0164,</div><div class='add'>+			    "-&gt; fwdt%u failed allocate template.\n", j);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-failed_template:</div><div class='del'>-	ql_log(ql_log_warn, vha, 0x016d, "Failed default fwdump template\n");</div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='del'>-	return rval;</div><div class='add'>+		dcode = fwdt-&gt;template;</div><div class='add'>+		qla24xx_read_flash_data(vha, dcode, faddr, risc_size);</div><div class='add'>+</div><div class='add'>+		if (!qla27xx_fwdt_template_valid(dcode)) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x0165,</div><div class='add'>+			    "-&gt; fwdt%u failed template validate\n", j);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dlen = qla27xx_fwdt_template_size(dcode);</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0166,</div><div class='add'>+		    "-&gt; fwdt%u template size %#lx bytes (%#lx words)\n",</div><div class='add'>+		    j, dlen, dlen / sizeof(*dcode));</div><div class='add'>+		if (dlen &gt; risc_size * sizeof(*dcode)) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x0167,</div><div class='add'>+			    "-&gt; fwdt%u template exceeds array (%-lu bytes)\n",</div><div class='add'>+			    j, dlen - risc_size * sizeof(*dcode));</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fwdt-&gt;length = dlen;</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0168,</div><div class='add'>+		    "-&gt; fwdt%u loaded template ok\n", j);</div><div class='add'>+</div><div class='add'>+		faddr += risc_size + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	if (fwdt-&gt;template)</div><div class='add'>+		vfree(fwdt-&gt;template);</div><div class='add'>+	fwdt-&gt;template = NULL;</div><div class='add'>+	fwdt-&gt;length = 0;</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define QLA_FW_URL "http://ldriver.qlogic.com/firmware/"</div><div class='hunk'>@@ -7573,94 +7870,73 @@ static int</div><div class='ctx'> qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int	rval;</div><div class='del'>-	int	segments, fragment;</div><div class='del'>-	uint32_t *dcode, dlen;</div><div class='del'>-	uint32_t risc_addr;</div><div class='del'>-	uint32_t risc_size;</div><div class='del'>-	uint32_t i;</div><div class='add'>+	uint templates, segments, fragment;</div><div class='add'>+	uint32_t *dcode;</div><div class='add'>+	ulong dlen;</div><div class='add'>+	uint32_t risc_addr, risc_size, risc_attr = 0;</div><div class='add'>+	ulong i;</div><div class='add'>+	uint j;</div><div class='ctx'> 	struct fw_blob *blob;</div><div class='del'>-	const uint32_t *fwcode;</div><div class='del'>-	uint32_t fwclen;</div><div class='add'>+	uint32_t *fwcode;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='add'>+	struct fwdt *fwdt = ha-&gt;fwdt;</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0090,</div><div class='add'>+	    "-&gt; FW: Loading via request-firmware.\n");</div><div class='ctx'> </div><div class='del'>-	/* Load firmware blob. */</div><div class='ctx'> 	blob = qla2x00_request_firmware(vha);</div><div class='ctx'> 	if (!blob) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0090,</div><div class='del'>-		    "Firmware image unavailable.\n");</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0091,</div><div class='del'>-		    "Firmware images can be retrieved from: "</div><div class='del'>-		    QLA_FW_URL ".\n");</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x0092,</div><div class='add'>+		    "-&gt; Firmware file not found.\n");</div><div class='ctx'> </div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0092,</div><div class='del'>-	    "FW: Loading via request-firmware.\n");</div><div class='del'>-</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-	segments = FA_RISC_CODE_SEGMENTS;</div><div class='del'>-	dcode = (uint32_t *)req-&gt;ring;</div><div class='del'>-	*srisc_addr = 0;</div><div class='del'>-	fwcode = (uint32_t *)blob-&gt;fw-&gt;data;</div><div class='del'>-	fwclen = 0;</div><div class='del'>-</div><div class='del'>-	/* Validate firmware image by checking version. */</div><div class='del'>-	if (blob-&gt;fw-&gt;size &lt; 8 * sizeof(uint32_t)) {</div><div class='add'>+	fwcode = (void *)blob-&gt;fw-&gt;data;</div><div class='add'>+	dcode = fwcode;</div><div class='add'>+	if (qla24xx_risc_firmware_invalid(dcode)) {</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x0093,</div><div class='ctx'> 		    "Unable to verify integrity of firmware image (%zd).\n",</div><div class='ctx'> 		    blob-&gt;fw-&gt;size);</div><div class='del'>-		return QLA_FUNCTION_FAILED;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		dcode[i] = be32_to_cpu(fwcode[i + 4]);</div><div class='del'>-	if ((dcode[0] == 0xffffffff &amp;&amp; dcode[1] == 0xffffffff &amp;&amp;</div><div class='del'>-	    dcode[2] == 0xffffffff &amp;&amp; dcode[3] == 0xffffffff) ||</div><div class='del'>-	    (dcode[0] == 0 &amp;&amp; dcode[1] == 0 &amp;&amp; dcode[2] == 0 &amp;&amp;</div><div class='del'>-		dcode[3] == 0)) {</div><div class='del'>-		ql_log(ql_log_fatal, vha, 0x0094,</div><div class='del'>-		    "Unable to verify integrity of firmware image (%zd).\n",</div><div class='del'>-		    blob-&gt;fw-&gt;size);</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x0095,</div><div class='ctx'> 		    "Firmware data: %08x %08x %08x %08x.\n",</div><div class='ctx'> 		    dcode[0], dcode[1], dcode[2], dcode[3]);</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (segments &amp;&amp; rval == QLA_SUCCESS) {</div><div class='add'>+	dcode = (void *)req-&gt;ring;</div><div class='add'>+	*srisc_addr = 0;</div><div class='add'>+	segments = FA_RISC_CODE_SEGMENTS;</div><div class='add'>+	for (j = 0; j &lt; segments; j++) {</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0096,</div><div class='add'>+		    "-&gt; Loading segment %u...\n", j);</div><div class='ctx'> 		risc_addr = be32_to_cpu(fwcode[2]);</div><div class='del'>-		*srisc_addr = *srisc_addr == 0 ? risc_addr : *srisc_addr;</div><div class='ctx'> 		risc_size = be32_to_cpu(fwcode[3]);</div><div class='ctx'> </div><div class='del'>-		/* Validate firmware image size. */</div><div class='del'>-		fwclen += risc_size * sizeof(uint32_t);</div><div class='del'>-		if (blob-&gt;fw-&gt;size &lt; fwclen) {</div><div class='del'>-			ql_log(ql_log_fatal, vha, 0x0096,</div><div class='del'>-			    "Unable to verify integrity of firmware image "</div><div class='del'>-			    "(%zd).\n", blob-&gt;fw-&gt;size);</div><div class='del'>-			return QLA_FUNCTION_FAILED;</div><div class='add'>+		if (!*srisc_addr) {</div><div class='add'>+			*srisc_addr = risc_addr;</div><div class='add'>+			risc_attr = be32_to_cpu(fwcode[9]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		fragment = 0;</div><div class='del'>-		while (risc_size &gt; 0 &amp;&amp; rval == QLA_SUCCESS) {</div><div class='del'>-			dlen = (uint32_t)(ha-&gt;fw_transfer_size &gt;&gt; 2);</div><div class='add'>+		dlen = ha-&gt;fw_transfer_size &gt;&gt; 2;</div><div class='add'>+		for (fragment = 0; risc_size; fragment++) {</div><div class='ctx'> 			if (dlen &gt; risc_size)</div><div class='ctx'> 				dlen = risc_size;</div><div class='ctx'> </div><div class='ctx'> 			ql_dbg(ql_dbg_init, vha, 0x0097,</div><div class='del'>-			    "Loading risc segment@ risc addr %x "</div><div class='del'>-			    "number of dwords 0x%x.\n", risc_addr, dlen);</div><div class='add'>+			    "-&gt; Loading fragment %u: %#x &lt;- %#x (%#lx words)...\n",</div><div class='add'>+			    fragment, risc_addr,</div><div class='add'>+			    (uint32_t)(fwcode - (typeof(fwcode))blob-&gt;fw-&gt;data),</div><div class='add'>+			    dlen);</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; dlen; i++)</div><div class='ctx'> 				dcode[i] = swab32(fwcode[i]);</div><div class='ctx'> </div><div class='del'>-			rval = qla2x00_load_ram(vha, req-&gt;dma, risc_addr,</div><div class='del'>-			    dlen);</div><div class='add'>+			rval = qla2x00_load_ram(vha, req-&gt;dma, risc_addr, dlen);</div><div class='ctx'> 			if (rval) {</div><div class='ctx'> 				ql_log(ql_log_fatal, vha, 0x0098,</div><div class='del'>-				    "Failed to load segment %d of firmware.\n",</div><div class='add'>+				    "-&gt; Failed load firmware fragment %u.\n",</div><div class='ctx'> 				    fragment);</div><div class='ctx'> 				return QLA_FUNCTION_FAILED;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -7668,106 +7944,82 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)</div><div class='ctx'> 			fwcode += dlen;</div><div class='ctx'> 			risc_addr += dlen;</div><div class='ctx'> 			risc_size -= dlen;</div><div class='del'>-			fragment++;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Next segment. */</div><div class='del'>-		segments--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA27XX(ha))</div><div class='del'>-		return rval;</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		return QLA_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='del'>-</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x171,</div><div class='del'>-	    "Loading fwdump template from %x\n",</div><div class='del'>-	    (uint32_t)((void *)fwcode - (void *)blob-&gt;fw-&gt;data));</div><div class='del'>-	risc_size = be32_to_cpu(fwcode[2]);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x172,</div><div class='del'>-	    "-&gt; array size %x dwords\n", risc_size);</div><div class='del'>-	if (risc_size == 0 || risc_size == ~0)</div><div class='del'>-		goto default_template;</div><div class='del'>-</div><div class='del'>-	dlen = (risc_size - 8) * sizeof(*fwcode);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0173,</div><div class='del'>-	    "-&gt; template allocating %x bytes...\n", dlen);</div><div class='del'>-	ha-&gt;fw_dump_template = vmalloc(dlen);</div><div class='del'>-	if (!ha-&gt;fw_dump_template) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0174,</div><div class='del'>-		    "Failed fwdump template allocate %x bytes.\n", risc_size);</div><div class='del'>-		goto default_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fwcode += 7;</div><div class='del'>-	risc_size -= 8;</div><div class='del'>-	dcode = ha-&gt;fw_dump_template;</div><div class='del'>-	for (i = 0; i &lt; risc_size; i++)</div><div class='del'>-		dcode[i] = le32_to_cpu(fwcode[i]);</div><div class='del'>-</div><div class='del'>-	if (!qla27xx_fwdt_template_valid(dcode)) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0175,</div><div class='del'>-		    "Failed fwdump template validate\n");</div><div class='del'>-		goto default_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dlen = qla27xx_fwdt_template_size(dcode);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0176,</div><div class='del'>-	    "-&gt; template size %x bytes\n", dlen);</div><div class='del'>-	if (dlen &gt; risc_size * sizeof(*fwcode)) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x0177,</div><div class='del'>-		    "Failed fwdump template exceeds array by %zx bytes\n",</div><div class='del'>-		    (size_t)(dlen - risc_size * sizeof(*fwcode)));</div><div class='del'>-		goto default_template;</div><div class='del'>-	}</div><div class='del'>-	ha-&gt;fw_dump_template_len = dlen;</div><div class='del'>-	return rval;</div><div class='add'>+	templates = (risc_attr &amp; BIT_9) ? 2 : 1;</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0170, "-&gt; templates = %u\n", templates);</div><div class='add'>+	for (j = 0; j &lt; templates; j++, fwdt++) {</div><div class='add'>+		if (fwdt-&gt;template)</div><div class='add'>+			vfree(fwdt-&gt;template);</div><div class='add'>+		fwdt-&gt;template = NULL;</div><div class='add'>+		fwdt-&gt;length = 0;</div><div class='add'>+</div><div class='add'>+		risc_size = be32_to_cpu(fwcode[2]);</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0171,</div><div class='add'>+		    "-&gt; fwdt%u template array at %#x (%#x dwords)\n",</div><div class='add'>+		    j, (uint32_t)((void *)fwcode - (void *)blob-&gt;fw-&gt;data),</div><div class='add'>+		    risc_size);</div><div class='add'>+		if (!risc_size || !~risc_size) {</div><div class='add'>+			ql_dbg(ql_dbg_init, vha, 0x0172,</div><div class='add'>+			    "-&gt; fwdt%u failed to read array\n", j);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-default_template:</div><div class='del'>-	ql_log(ql_log_warn, vha, 0x0178, "Using default fwdump template\n");</div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='del'>-</div><div class='del'>-	dlen = qla27xx_fwdt_template_default_size();</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x0179,</div><div class='del'>-	    "-&gt; template allocating %x bytes...\n", dlen);</div><div class='del'>-	ha-&gt;fw_dump_template = vmalloc(dlen);</div><div class='del'>-	if (!ha-&gt;fw_dump_template) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x017a,</div><div class='del'>-		    "Failed fwdump template allocate %x bytes.\n", risc_size);</div><div class='del'>-		goto failed_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dcode = ha-&gt;fw_dump_template;</div><div class='del'>-	risc_size = dlen / sizeof(*fwcode);</div><div class='del'>-	fwcode = qla27xx_fwdt_template_default();</div><div class='del'>-	for (i = 0; i &lt; risc_size; i++)</div><div class='del'>-		dcode[i] = be32_to_cpu(fwcode[i]);</div><div class='del'>-</div><div class='del'>-	if (!qla27xx_fwdt_template_valid(ha-&gt;fw_dump_template)) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x017b,</div><div class='del'>-		    "Failed fwdump template validate\n");</div><div class='del'>-		goto failed_template;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dlen = qla27xx_fwdt_template_size(ha-&gt;fw_dump_template);</div><div class='del'>-	ql_dbg(ql_dbg_init, vha, 0x017c,</div><div class='del'>-	    "-&gt; template size %x bytes\n", dlen);</div><div class='del'>-	ha-&gt;fw_dump_template_len = dlen;</div><div class='del'>-	return rval;</div><div class='add'>+		/* skip header and ignore checksum */</div><div class='add'>+		fwcode += 7;</div><div class='add'>+		risc_size -= 8;</div><div class='add'>+</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0173,</div><div class='add'>+		    "-&gt; fwdt%u template allocate template %#x words...\n",</div><div class='add'>+		    j, risc_size);</div><div class='add'>+		fwdt-&gt;template = vmalloc(risc_size * sizeof(*dcode));</div><div class='add'>+		if (!fwdt-&gt;template) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x0174,</div><div class='add'>+			    "-&gt; fwdt%u failed allocate template.\n", j);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-failed_template:</div><div class='del'>-	ql_log(ql_log_warn, vha, 0x017d, "Failed default fwdump template\n");</div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='del'>-	return rval;</div><div class='add'>+		dcode = fwdt-&gt;template;</div><div class='add'>+		for (i = 0; i &lt; risc_size; i++)</div><div class='add'>+			dcode[i] = fwcode[i];</div><div class='add'>+</div><div class='add'>+		if (!qla27xx_fwdt_template_valid(dcode)) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x0175,</div><div class='add'>+			    "-&gt; fwdt%u failed template validate\n", j);</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dlen = qla27xx_fwdt_template_size(dcode);</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0176,</div><div class='add'>+		    "-&gt; fwdt%u template size %#lx bytes (%#lx words)\n",</div><div class='add'>+		    j, dlen, dlen / sizeof(*dcode));</div><div class='add'>+		if (dlen &gt; risc_size * sizeof(*dcode)) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x0177,</div><div class='add'>+			    "-&gt; fwdt%u template exceeds array (%-lu bytes)\n",</div><div class='add'>+			    j, dlen - risc_size * sizeof(*dcode));</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fwdt-&gt;length = dlen;</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0178,</div><div class='add'>+		    "-&gt; fwdt%u loaded template ok\n", j);</div><div class='add'>+</div><div class='add'>+		fwcode += risc_size + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	if (fwdt-&gt;template)</div><div class='add'>+		vfree(fwdt-&gt;template);</div><div class='add'>+	fwdt-&gt;template = NULL;</div><div class='add'>+	fwdt-&gt;length = 0;</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -7796,32 +8048,50 @@ qla81xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int rval;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct active_regions active_regions = { };</div><div class='ctx'> </div><div class='ctx'> 	if (ql2xfwloadbin == 2)</div><div class='ctx'> 		goto try_blob_fw;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * FW Load priority:</div><div class='add'>+	/* FW Load priority:</div><div class='ctx'> 	 * 1) Firmware residing in flash.</div><div class='ctx'> 	 * 2) Firmware via request-firmware interface (.bin file).</div><div class='del'>-	 * 3) Golden-Firmware residing in flash -- limited operation.</div><div class='add'>+	 * 3) Golden-Firmware residing in flash -- (limited operation).</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		goto try_primary_fw;</div><div class='add'>+</div><div class='add'>+	qla27xx_get_active_image(vha, &amp;active_regions);</div><div class='add'>+</div><div class='add'>+	if (active_regions.global != QLA27XX_SECONDARY_IMAGE)</div><div class='add'>+		goto try_primary_fw;</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x008b,</div><div class='add'>+	    "Loading secondary firmware image.\n");</div><div class='add'>+	rval = qla24xx_load_risc_flash(vha, srisc_addr, ha-&gt;flt_region_fw_sec);</div><div class='add'>+	if (!rval)</div><div class='add'>+		return rval;</div><div class='add'>+</div><div class='add'>+try_primary_fw:</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x008b,</div><div class='add'>+	    "Loading primary firmware image.\n");</div><div class='ctx'> 	rval = qla24xx_load_risc_flash(vha, srisc_addr, ha-&gt;flt_region_fw);</div><div class='del'>-	if (rval == QLA_SUCCESS)</div><div class='add'>+	if (!rval)</div><div class='ctx'> 		return rval;</div><div class='ctx'> </div><div class='ctx'> try_blob_fw:</div><div class='ctx'> 	rval = qla24xx_load_risc_blob(vha, srisc_addr);</div><div class='del'>-	if (rval == QLA_SUCCESS || !ha-&gt;flt_region_gold_fw)</div><div class='add'>+	if (!rval || !ha-&gt;flt_region_gold_fw)</div><div class='ctx'> 		return rval;</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x0099,</div><div class='ctx'> 	    "Attempting to fallback to golden firmware.\n");</div><div class='ctx'> 	rval = qla24xx_load_risc_flash(vha, srisc_addr, ha-&gt;flt_region_gold_fw);</div><div class='del'>-	if (rval != QLA_SUCCESS)</div><div class='add'>+	if (rval)</div><div class='ctx'> 		return rval;</div><div class='ctx'> </div><div class='del'>-	ql_log(ql_log_info, vha, 0x009a, "Update operational firmware.\n");</div><div class='add'>+	ql_log(ql_log_info, vha, 0x009a, "Need firmware flash update.\n");</div><div class='ctx'> 	ha-&gt;flags.running_gold_fw = 1;</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='hunk'>@@ -7956,6 +8226,7 @@ void</div><div class='ctx'> qla84xx_put_chip(struct scsi_qla_host *vha)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	if (ha-&gt;cs84xx)</div><div class='ctx'> 		kref_put(&amp;ha-&gt;cs84xx-&gt;kref, __qla84xx_chip_release);</div><div class='ctx'> }</div><div class='hunk'>@@ -7973,7 +8244,7 @@ qla84xx_init_chip(scsi_qla_host_t *vha)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ha-&gt;cs84xx-&gt;fw_update_mutex);</div><div class='ctx'> </div><div class='del'>-	return rval != QLA_SUCCESS || status[0] ? QLA_FUNCTION_FAILED:</div><div class='add'>+	return rval != QLA_SUCCESS || status[0] ? QLA_FUNCTION_FAILED :</div><div class='ctx'> 	    QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7990,25 +8261,48 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	uint32_t chksum;</div><div class='ctx'> 	uint16_t cnt;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	uint32_t faddr;</div><div class='add'>+	struct active_regions active_regions = { };</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> 	icb = (struct init_cb_81xx *)ha-&gt;init_cb;</div><div class='ctx'> 	nv = ha-&gt;nvram;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine NVRAM starting address. */</div><div class='del'>-	ha-&gt;nvram_size = sizeof(struct nvram_81xx);</div><div class='add'>+	ha-&gt;nvram_size = sizeof(*nv);</div><div class='ctx'> 	ha-&gt;vpd_size = FA_NVRAM_VPD_SIZE;</div><div class='ctx'> 	if (IS_P3P_TYPE(ha) || IS_QLA8031(ha))</div><div class='ctx'> 		ha-&gt;vpd_size = FA_VPD_SIZE_82XX;</div><div class='ctx'> </div><div class='add'>+	if (IS_QLA28XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+		qla28xx_get_aux_images(vha, &amp;active_regions);</div><div class='add'>+</div><div class='ctx'> 	/* Get VPD data into cache */</div><div class='ctx'> 	ha-&gt;vpd = ha-&gt;nvram + VPD_OFFSET;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;vpd, ha-&gt;flt_region_vpd &lt;&lt; 2,</div><div class='del'>-	    ha-&gt;vpd_size);</div><div class='add'>+</div><div class='add'>+	faddr = ha-&gt;flt_region_vpd;</div><div class='add'>+	if (IS_QLA28XX(ha)) {</div><div class='add'>+		if (active_regions.aux.vpd_nvram == QLA27XX_SECONDARY_IMAGE)</div><div class='add'>+			faddr = ha-&gt;flt_region_vpd_sec;</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x0110,</div><div class='add'>+		    "Loading %s nvram image.\n",</div><div class='add'>+		    active_regions.aux.vpd_nvram == QLA27XX_PRIMARY_IMAGE ?</div><div class='add'>+		    "primary" : "secondary");</div><div class='add'>+	}</div><div class='add'>+	qla24xx_read_flash_data(vha, ha-&gt;vpd, faddr, ha-&gt;vpd_size &gt;&gt; 2);</div><div class='ctx'> </div><div class='ctx'> 	/* Get NVRAM data into cache and calculate checksum. */</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;nvram, ha-&gt;flt_region_nvram &lt;&lt; 2,</div><div class='del'>-	    ha-&gt;nvram_size);</div><div class='add'>+	faddr = ha-&gt;flt_region_nvram;</div><div class='add'>+	if (IS_QLA28XX(ha)) {</div><div class='add'>+		if (active_regions.aux.vpd_nvram == QLA27XX_SECONDARY_IMAGE)</div><div class='add'>+			faddr = ha-&gt;flt_region_nvram_sec;</div><div class='add'>+	}</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0110,</div><div class='add'>+	    "Loading %s nvram image.\n",</div><div class='add'>+	    active_regions.aux.vpd_nvram == QLA27XX_PRIMARY_IMAGE ?</div><div class='add'>+	    "primary" : "secondary");</div><div class='add'>+	qla24xx_read_flash_data(vha, ha-&gt;nvram, faddr, ha-&gt;nvram_size &gt;&gt; 2);</div><div class='add'>+</div><div class='ctx'> 	dptr = (uint32_t *)nv;</div><div class='ctx'> 	for (cnt = 0, chksum = 0; cnt &lt; ha-&gt;nvram_size &gt;&gt; 2; cnt++, dptr++)</div><div class='ctx'> 		chksum += le32_to_cpu(*dptr);</div><div class='hunk'>@@ -8016,17 +8310,16 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	ql_dbg(ql_dbg_init + ql_dbg_buffer, vha, 0x0111,</div><div class='ctx'> 	    "Contents of NVRAM:\n");</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0112,</div><div class='del'>-	    (uint8_t *)nv, ha-&gt;nvram_size);</div><div class='add'>+	    nv, ha-&gt;nvram_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Bad NVRAM data, set defaults parameters. */</div><div class='del'>-	if (chksum || nv-&gt;id[0] != 'I' || nv-&gt;id[1] != 'S' || nv-&gt;id[2] != 'P'</div><div class='del'>-	    || nv-&gt;id[3] != ' ' ||</div><div class='del'>-	    nv-&gt;nvram_version &lt; cpu_to_le16(ICB_VERSION)) {</div><div class='add'>+	if (chksum || memcmp("ISP ", nv-&gt;id, sizeof(nv-&gt;id)) ||</div><div class='add'>+	    le16_to_cpu(nv-&gt;nvram_version) &lt; ICB_VERSION) {</div><div class='ctx'> 		/* Reset NVRAM data. */</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0x0073,</div><div class='del'>-		    "Inconsistent NVRAM detected: checksum=0x%x id=%c "</div><div class='del'>-		    "version=0x%x.\n", chksum, nv-&gt;id[0],</div><div class='del'>-		    le16_to_cpu(nv-&gt;nvram_version));</div><div class='add'>+		    "Inconsistent NVRAM checksum=%#x id=%.4s version=%#x.\n",</div><div class='add'>+		    chksum, nv-&gt;id, le16_to_cpu(nv-&gt;nvram_version));</div><div class='add'>+		ql_dump_buffer(ql_dbg_init, vha, 0x0073, nv, sizeof(*nv));</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0x0074,</div><div class='ctx'> 		    "Falling back to functioning (yet invalid -- WWPN) "</div><div class='ctx'> 		    "defaults.\n");</div><div class='hunk'>@@ -8147,11 +8440,11 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	ha-&gt;flags.disable_risc_code_load = 0;</div><div class='ctx'> 	ha-&gt;flags.enable_lip_reset = 0;</div><div class='ctx'> 	ha-&gt;flags.enable_lip_full_login =</div><div class='del'>-	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_10 ? 1: 0;</div><div class='add'>+	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_10 ? 1 : 0;</div><div class='ctx'> 	ha-&gt;flags.enable_target_reset =</div><div class='del'>-	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_11 ? 1: 0;</div><div class='add'>+	    le32_to_cpu(nv-&gt;host_p) &amp; BIT_11 ? 1 : 0;</div><div class='ctx'> 	ha-&gt;flags.enable_led_scheme = 0;</div><div class='del'>-	ha-&gt;flags.disable_serdes = le32_to_cpu(nv-&gt;host_p) &amp; BIT_5 ? 1: 0;</div><div class='add'>+	ha-&gt;flags.disable_serdes = le32_to_cpu(nv-&gt;host_p) &amp; BIT_5 ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;operating_mode = (le32_to_cpu(icb-&gt;firmware_options_2) &amp;</div><div class='ctx'> 	    (BIT_6 | BIT_5 | BIT_4)) &gt;&gt; 4;</div><div class='hunk'>@@ -8215,7 +8508,8 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;login_retry_count = ql2xloginretrycount;</div><div class='ctx'> </div><div class='ctx'> 	/* if not running MSI-X we need handshaking on interrupts */</div><div class='del'>-	if (!vha-&gt;hw-&gt;flags.msix_enabled &amp;&amp; (IS_QLA83XX(ha) || IS_QLA27XX(ha)))</div><div class='add'>+	if (!vha-&gt;hw-&gt;flags.msix_enabled &amp;&amp;</div><div class='add'>+	    (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)))</div><div class='ctx'> 		icb-&gt;firmware_options_2 |= cpu_to_le32(BIT_22);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable ZIO. */</div><div class='hunk'>@@ -8223,7 +8517,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;zio_mode = le32_to_cpu(icb-&gt;firmware_options_2) &amp;</div><div class='ctx'> 		    (BIT_3 | BIT_2 | BIT_1 | BIT_0);</div><div class='ctx'> 		ha-&gt;zio_timer = le16_to_cpu(icb-&gt;interrupt_delay_timer) ?</div><div class='del'>-		    le16_to_cpu(icb-&gt;interrupt_delay_timer): 2;</div><div class='add'>+		    le16_to_cpu(icb-&gt;interrupt_delay_timer) : 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	icb-&gt;firmware_options_2 &amp;= cpu_to_le32(</div><div class='ctx'> 	    ~(BIT_3 | BIT_2 | BIT_1 | BIT_0));</div><div class='hunk'>@@ -8248,12 +8542,6 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	/* N2N: driver will initiate Login instead of FW */</div><div class='ctx'> 	icb-&gt;firmware_options_3 |= BIT_8;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha)) {</div><div class='del'>-		icb-&gt;firmware_options_3 |= BIT_8;</div><div class='del'>-		ql_dbg(ql_log_info, vha, 0x0075,</div><div class='del'>-		    "Enabling direct connection.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x0076,</div><div class='ctx'> 		    "NVRAM configuration failed.\n");</div><div class='hunk'>@@ -8614,7 +8902,6 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,</div><div class='ctx'> 			    "Failed to allocate memory for queue pair.\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		memset(qpair, 0, sizeof(struct qla_qpair));</div><div class='ctx'> </div><div class='ctx'> 		qpair-&gt;hw = vha-&gt;hw;</div><div class='ctx'> 		qpair-&gt;vha = vha;</div><div class='hunk'>@@ -8661,7 +8948,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,</div><div class='ctx'> 		qpair-&gt;msix-&gt;in_use = 1;</div><div class='ctx'> 		list_add_tail(&amp;qpair-&gt;qp_list_elem, &amp;vha-&gt;qp_list);</div><div class='ctx'> 		qpair-&gt;pdev = ha-&gt;pdev;</div><div class='del'>-		if (IS_QLA27XX(ha) || IS_QLA83XX(ha))</div><div class='add'>+		if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 			qpair-&gt;reqq_start_iocbs = qla_83xx_start_iocbs;</div><div class='ctx'> </div><div class='ctx'> 		mutex_unlock(&amp;ha-&gt;mq_lock);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h<br/>index 512c3c37b447..bf063c664352 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_inline.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_inline.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_inline.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_inline.h</a></div><div class='hunk'>@@ -91,43 +91,6 @@ host_to_adap(uint8_t *src, uint8_t *dst, uint32_t bsize)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (IS_FWI2_CAPABLE(ha))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SNS_FIRST_LOOP_ID; i++)</div><div class='del'>-		set_bit(i, ha-&gt;loop_id_map);</div><div class='del'>-	set_bit(MANAGEMENT_SERVER, ha-&gt;loop_id_map);</div><div class='del'>-	set_bit(BROADCAST, ha-&gt;loop_id_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)</div><div class='del'>-{</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	if (IS_FWI2_CAPABLE(ha))</div><div class='del'>-		return (loop_id &gt; NPH_LAST_HANDLE);</div><div class='del'>-</div><div class='del'>-	return ((loop_id &gt; ha-&gt;max_loop_id &amp;&amp; loop_id &lt; SNS_FIRST_LOOP_ID) ||</div><div class='del'>-	    loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_clear_loop_id(fc_port_t *fcport) {</div><div class='del'>-	struct qla_hw_data *ha = fcport-&gt;vha-&gt;hw;</div><div class='del'>-</div><div class='del'>-	if (fcport-&gt;loop_id == FC_NO_LOOP_ID ||</div><div class='del'>-	    qla2x00_is_reserved_id(fcport-&gt;vha, fcport-&gt;loop_id))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clear_bit(fcport-&gt;loop_id, ha-&gt;loop_id_map);</div><div class='del'>-	fcport-&gt;loop_id = FC_NO_LOOP_ID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='ctx'> qla2x00_clean_dsd_pool(struct qla_hw_data *ha, struct crc_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsd_dma *dsd, *tdsd;</div><div class='hunk'>@@ -142,25 +105,6 @@ qla2x00_clean_dsd_pool(struct qla_hw_data *ha, struct crc_context *ctx)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ctx-&gt;dsd_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-qla2x00_set_fcport_state(fc_port_t *fcport, int state)</div><div class='del'>-{</div><div class='del'>-	int old_state;</div><div class='del'>-</div><div class='del'>-	old_state = atomic_read(&amp;fcport-&gt;state);</div><div class='del'>-	atomic_set(&amp;fcport-&gt;state, state);</div><div class='del'>-</div><div class='del'>-	/* Don't print state transitions during initial allocation of fcport */</div><div class='del'>-	if (old_state &amp;&amp; old_state != state) {</div><div class='del'>-		ql_dbg(ql_dbg_disc, fcport-&gt;vha, 0x207d,</div><div class='del'>-		    "FCPort %8phC state transitioned from %s to %s - "</div><div class='del'>-			"portid=%02x%02x%02x.\n", fcport-&gt;port_name,</div><div class='del'>-		    port_state_str[old_state], port_state_str[state],</div><div class='del'>-		    fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='del'>-		    fcport-&gt;d_id.b.al_pa);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int</div><div class='ctx'> qla2x00_hba_err_chk_enabled(srb_t *sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -240,6 +184,7 @@ done:</div><div class='ctx'> static inline void</div><div class='ctx'> qla2xxx_rel_qpair_sp(struct qla_qpair *qpair, srb_t *sp)</div><div class='ctx'> {</div><div class='add'>+	sp-&gt;qpair = NULL;</div><div class='ctx'> 	mempool_free(sp, qpair-&gt;srb_mempool);</div><div class='ctx'> 	QLA_QPAIR_MARK_NOT_BUSY(qpair);</div><div class='ctx'> }</div><div class='hunk'>@@ -274,18 +219,6 @@ qla2x00_rel_sp(srb_t *sp)</div><div class='ctx'> 	qla2xxx_rel_qpair_sp(sp-&gt;qpair, sp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-qla2x00_init_timer(srb_t *sp, unsigned long tmo)</div><div class='del'>-{</div><div class='del'>-	timer_setup(&amp;sp-&gt;u.iocb_cmd.timer, qla2x00_sp_timeout, 0);</div><div class='del'>-	sp-&gt;u.iocb_cmd.timer.expires = jiffies + tmo * HZ;</div><div class='del'>-	sp-&gt;free = qla2x00_sp_free;</div><div class='del'>-	init_completion(&amp;sp-&gt;comp);</div><div class='del'>-	if (IS_QLAFX00(sp-&gt;vha-&gt;hw) &amp;&amp; (sp-&gt;type == SRB_FXIOCB_DCMD))</div><div class='del'>-		init_completion(&amp;sp-&gt;u.iocb_cmd.u.fxiocb.fxiocb_comp);</div><div class='del'>-	add_timer(&amp;sp-&gt;u.iocb_cmd.timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int</div><div class='ctx'> qla2x00_gid_list_size(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c<br/>index 456a41d2e2c6..9312b19ed708 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_iocb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_iocb.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ qla2x00_prep_cont_type0_iocb(struct scsi_qla_host *vha)</div><div class='ctx'> 	cont_pkt = (cont_entry_t *)req-&gt;ring_ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* Load packet defaults. */</div><div class='del'>-	*((uint32_t *)(&amp;cont_pkt-&gt;entry_type)) = cpu_to_le32(CONTINUE_TYPE);</div><div class='add'>+	put_unaligned_le32(CONTINUE_TYPE, &amp;cont_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	return (cont_pkt);</div><div class='ctx'> }</div><div class='hunk'>@@ -136,9 +136,8 @@ qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *vha, struct req_que *req)</div><div class='ctx'> 	cont_pkt = (cont_a64_entry_t *)req-&gt;ring_ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* Load packet defaults. */</div><div class='del'>-	*((uint32_t *)(&amp;cont_pkt-&gt;entry_type)) = IS_QLAFX00(vha-&gt;hw) ?</div><div class='del'>-	    cpu_to_le32(CONTINUE_A64_TYPE_FX00) :</div><div class='del'>-	    cpu_to_le32(CONTINUE_A64_TYPE);</div><div class='add'>+	put_unaligned_le32(IS_QLAFX00(vha-&gt;hw) ? CONTINUE_A64_TYPE_FX00 :</div><div class='add'>+			   CONTINUE_A64_TYPE, &amp;cont_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	return (cont_pkt);</div><div class='ctx'> }</div><div class='hunk'>@@ -193,7 +192,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'>     uint16_t tot_dsds)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t	avail_dsds;</div><div class='del'>-	uint32_t	*cur_dsd;</div><div class='add'>+	struct dsd32	*cur_dsd;</div><div class='ctx'> 	scsi_qla_host_t	*vha;</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -202,8 +201,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> 	cmd = GET_CMD_SP(sp);</div><div class='ctx'> </div><div class='ctx'> 	/* Update entry type to indicate Command Type 2 IOCB */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) =</div><div class='del'>-	    cpu_to_le32(COMMAND_TYPE);</div><div class='add'>+	put_unaligned_le32(COMMAND_TYPE, &amp;cmd_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	/* No data transfer */</div><div class='ctx'> 	if (!scsi_bufflen(cmd) || cmd-&gt;sc_data_direction == DMA_NONE) {</div><div class='hunk'>@@ -215,8 +213,8 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> 	cmd_pkt-&gt;control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));</div><div class='ctx'> </div><div class='ctx'> 	/* Three DSDs are available in the Command Type 2 IOCB */</div><div class='del'>-	avail_dsds = 3;</div><div class='del'>-	cur_dsd = (uint32_t *)&amp;cmd_pkt-&gt;dseg_0_address;</div><div class='add'>+	avail_dsds = ARRAY_SIZE(cmd_pkt-&gt;dsd32);</div><div class='add'>+	cur_dsd = cmd_pkt-&gt;dsd32;</div><div class='ctx'> </div><div class='ctx'> 	/* Load data segments */</div><div class='ctx'> 	scsi_for_each_sg(cmd, sg, tot_dsds, i) {</div><div class='hunk'>@@ -229,12 +227,11 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> 			 * Type 0 IOCB.</div><div class='ctx'> 			 */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type0_iocb(vha);</div><div class='del'>-			cur_dsd = (uint32_t *)&amp;cont_pkt-&gt;dseg_0_address;</div><div class='del'>-			avail_dsds = 7;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='add'>+			avail_dsds = ARRAY_SIZE(cont_pkt-&gt;dsd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_address(sg));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd32(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -251,7 +248,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'>     uint16_t tot_dsds)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t	avail_dsds;</div><div class='del'>-	uint32_t	*cur_dsd;</div><div class='add'>+	struct dsd64	*cur_dsd;</div><div class='ctx'> 	scsi_qla_host_t	*vha;</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -260,7 +257,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> 	cmd = GET_CMD_SP(sp);</div><div class='ctx'> </div><div class='ctx'> 	/* Update entry type to indicate Command Type 3 IOCB */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) = cpu_to_le32(COMMAND_A64_TYPE);</div><div class='add'>+	put_unaligned_le32(COMMAND_A64_TYPE, &amp;cmd_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	/* No data transfer */</div><div class='ctx'> 	if (!scsi_bufflen(cmd) || cmd-&gt;sc_data_direction == DMA_NONE) {</div><div class='hunk'>@@ -272,12 +269,11 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> 	cmd_pkt-&gt;control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));</div><div class='ctx'> </div><div class='ctx'> 	/* Two DSDs are available in the Command Type 3 IOCB */</div><div class='del'>-	avail_dsds = 2;</div><div class='del'>-	cur_dsd = (uint32_t *)&amp;cmd_pkt-&gt;dseg_0_address;</div><div class='add'>+	avail_dsds = ARRAY_SIZE(cmd_pkt-&gt;dsd64);</div><div class='add'>+	cur_dsd = cmd_pkt-&gt;dsd64;</div><div class='ctx'> </div><div class='ctx'> 	/* Load data segments */</div><div class='ctx'> 	scsi_for_each_sg(cmd, sg, tot_dsds, i) {</div><div class='del'>-		dma_addr_t	sle_dma;</div><div class='ctx'> 		cont_a64_entry_t *cont_pkt;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='hunk'>@@ -287,14 +283,11 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,</div><div class='ctx'> 			 * Type 1 IOCB.</div><div class='ctx'> 			 */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha-&gt;req);</div><div class='del'>-			cur_dsd = (uint32_t *)cont_pkt-&gt;dseg_0_address;</div><div class='del'>-			avail_dsds = 5;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='add'>+			avail_dsds = ARRAY_SIZE(cont_pkt-&gt;dsd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -467,7 +460,7 @@ qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)</div><div class='ctx'> 			req-&gt;ring_ptr++;</div><div class='ctx'> </div><div class='ctx'> 		/* Set chip new ring index. */</div><div class='del'>-		if (ha-&gt;mqenable || IS_QLA27XX(ha)) {</div><div class='add'>+		if (ha-&gt;mqenable || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			WRT_REG_DWORD(req-&gt;req_q_in, req-&gt;ring_index);</div><div class='ctx'> 		} else if (IS_QLA83XX(ha)) {</div><div class='ctx'> 			WRT_REG_DWORD(req-&gt;req_q_in, req-&gt;ring_index);</div><div class='hunk'>@@ -580,13 +573,11 @@ static inline int</div><div class='ctx'> qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,</div><div class='ctx'> 	uint16_t tot_dsds)</div><div class='ctx'> {</div><div class='del'>-	uint32_t *cur_dsd = NULL;</div><div class='add'>+	struct dsd64 *cur_dsd = NULL, *next_dsd;</div><div class='ctx'> 	scsi_qla_host_t	*vha;</div><div class='ctx'> 	struct qla_hw_data *ha;</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='ctx'> 	struct	scatterlist *cur_seg;</div><div class='del'>-	uint32_t *dsd_seg;</div><div class='del'>-	void *next_dsd;</div><div class='ctx'> 	uint8_t avail_dsds;</div><div class='ctx'> 	uint8_t first_iocb = 1;</div><div class='ctx'> 	uint32_t dsd_list_len;</div><div class='hunk'>@@ -596,7 +587,7 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,</div><div class='ctx'> 	cmd = GET_CMD_SP(sp);</div><div class='ctx'> </div><div class='ctx'> 	/* Update entry type to indicate Command Type 3 IOCB */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) = cpu_to_le32(COMMAND_TYPE_6);</div><div class='add'>+	put_unaligned_le32(COMMAND_TYPE_6, &amp;cmd_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	/* No data transfer */</div><div class='ctx'> 	if (!scsi_bufflen(cmd) || cmd-&gt;sc_data_direction == DMA_NONE) {</div><div class='hunk'>@@ -638,32 +629,27 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,</div><div class='ctx'> </div><div class='ctx'> 		if (first_iocb) {</div><div class='ctx'> 			first_iocb = 0;</div><div class='del'>-			dsd_seg = (uint32_t *)&amp;cmd_pkt-&gt;fcp_data_dseg_address;</div><div class='del'>-			*dsd_seg++ = cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*dsd_seg++ = cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			cmd_pkt-&gt;fcp_data_dseg_len = cpu_to_le32(dsd_list_len);</div><div class='add'>+			put_unaligned_le64(dsd_ptr-&gt;dsd_list_dma,</div><div class='add'>+					   &amp;cmd_pkt-&gt;fcp_dsd.address);</div><div class='add'>+			cmd_pkt-&gt;fcp_dsd.length = cpu_to_le32(dsd_list_len);</div><div class='ctx'> 		} else {</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(dsd_list_len);</div><div class='add'>+			put_unaligned_le64(dsd_ptr-&gt;dsd_list_dma,</div><div class='add'>+					   &amp;cur_dsd-&gt;address);</div><div class='add'>+			cur_dsd-&gt;length = cpu_to_le32(dsd_list_len);</div><div class='add'>+			cur_dsd++;</div><div class='ctx'> 		}</div><div class='del'>-		cur_dsd = (uint32_t *)next_dsd;</div><div class='add'>+		cur_dsd = next_dsd;</div><div class='ctx'> 		while (avail_dsds) {</div><div class='del'>-			dma_addr_t	sle_dma;</div><div class='del'>-</div><div class='del'>-			sle_dma = sg_dma_address(cur_seg);</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(sg_dma_len(cur_seg));</div><div class='add'>+			append_dsd64(&amp;cur_dsd, cur_seg);</div><div class='ctx'> 			cur_seg = sg_next(cur_seg);</div><div class='ctx'> 			avail_dsds--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Null termination */</div><div class='del'>-	*cur_dsd++ =  0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='add'>+	cur_dsd-&gt;address = 0;</div><div class='add'>+	cur_dsd-&gt;length = 0;</div><div class='add'>+	cur_dsd++;</div><div class='ctx'> 	cmd_pkt-&gt;control_flags |= CF_DATA_SEG_DESCR_ENABLE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -702,7 +688,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,</div><div class='ctx'> 	uint16_t tot_dsds, struct req_que *req)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t	avail_dsds;</div><div class='del'>-	uint32_t	*cur_dsd;</div><div class='add'>+	struct dsd64	*cur_dsd;</div><div class='ctx'> 	scsi_qla_host_t	*vha;</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -711,7 +697,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,</div><div class='ctx'> 	cmd = GET_CMD_SP(sp);</div><div class='ctx'> </div><div class='ctx'> 	/* Update entry type to indicate Command Type 3 IOCB */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) = cpu_to_le32(COMMAND_TYPE_7);</div><div class='add'>+	put_unaligned_le32(COMMAND_TYPE_7, &amp;cmd_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	/* No data transfer */</div><div class='ctx'> 	if (!scsi_bufflen(cmd) || cmd-&gt;sc_data_direction == DMA_NONE) {</div><div class='hunk'>@@ -734,12 +720,11 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,</div><div class='ctx'> </div><div class='ctx'> 	/* One DSD is available in the Command Type 3 IOCB */</div><div class='ctx'> 	avail_dsds = 1;</div><div class='del'>-	cur_dsd = (uint32_t *)&amp;cmd_pkt-&gt;dseg_0_address;</div><div class='add'>+	cur_dsd = &amp;cmd_pkt-&gt;dsd;</div><div class='ctx'> </div><div class='ctx'> 	/* Load data segments */</div><div class='ctx'> </div><div class='ctx'> 	scsi_for_each_sg(cmd, sg, tot_dsds, i) {</div><div class='del'>-		dma_addr_t	sle_dma;</div><div class='ctx'> 		cont_a64_entry_t *cont_pkt;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='hunk'>@@ -749,14 +734,11 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,</div><div class='ctx'> 			 * Type 1 IOCB.</div><div class='ctx'> 			 */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(vha, req);</div><div class='del'>-			cur_dsd = (uint32_t *)cont_pkt-&gt;dseg_0_address;</div><div class='del'>-			avail_dsds = 5;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='add'>+			avail_dsds = ARRAY_SIZE(cont_pkt-&gt;dsd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -892,14 +874,14 @@ qla24xx_get_one_block_sg(uint32_t blk_sz, struct qla2_sgx *sgx,</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> qla24xx_walk_and_build_sglist_no_difb(struct qla_hw_data *ha, srb_t *sp,</div><div class='del'>-	uint32_t *dsd, uint16_t tot_dsds, struct qla_tc_param *tc)</div><div class='add'>+	struct dsd64 *dsd, uint16_t tot_dsds, struct qla_tc_param *tc)</div><div class='ctx'> {</div><div class='ctx'> 	void *next_dsd;</div><div class='ctx'> 	uint8_t avail_dsds = 0;</div><div class='ctx'> 	uint32_t dsd_list_len;</div><div class='ctx'> 	struct dsd_dma *dsd_ptr;</div><div class='ctx'> 	struct scatterlist *sg_prot;</div><div class='del'>-	uint32_t *cur_dsd = dsd;</div><div class='add'>+	struct dsd64 *cur_dsd = dsd;</div><div class='ctx'> 	uint16_t	used_dsds = tot_dsds;</div><div class='ctx'> 	uint32_t	prot_int; /* protection interval */</div><div class='ctx'> 	uint32_t	partial;</div><div class='hunk'>@@ -973,14 +955,14 @@ alloc_and_fill:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 			/* add new list to cmd iocb or last list */</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = dsd_list_len;</div><div class='del'>-			cur_dsd = (uint32_t *)next_dsd;</div><div class='add'>+			put_unaligned_le64(dsd_ptr-&gt;dsd_list_dma,</div><div class='add'>+					   &amp;cur_dsd-&gt;address);</div><div class='add'>+			cur_dsd-&gt;length = cpu_to_le32(dsd_list_len);</div><div class='add'>+			cur_dsd = next_dsd;</div><div class='ctx'> 		}</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sle_dma_len);</div><div class='add'>+		put_unaligned_le64(sle_dma, &amp;cur_dsd-&gt;address);</div><div class='add'>+		cur_dsd-&gt;length = cpu_to_le32(sle_dma_len);</div><div class='add'>+		cur_dsd++;</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> </div><div class='ctx'> 		if (partial == 0) {</div><div class='hunk'>@@ -999,22 +981,22 @@ alloc_and_fill:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Null termination */</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='add'>+	cur_dsd-&gt;address = 0;</div><div class='add'>+	cur_dsd-&gt;length = 0;</div><div class='add'>+	cur_dsd++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,</div><div class='del'>-	uint16_t tot_dsds, struct qla_tc_param *tc)</div><div class='add'>+qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='add'>+	struct dsd64 *dsd, uint16_t tot_dsds, struct qla_tc_param *tc)</div><div class='ctx'> {</div><div class='ctx'> 	void *next_dsd;</div><div class='ctx'> 	uint8_t avail_dsds = 0;</div><div class='ctx'> 	uint32_t dsd_list_len;</div><div class='ctx'> 	struct dsd_dma *dsd_ptr;</div><div class='ctx'> 	struct scatterlist *sg, *sgl;</div><div class='del'>-	uint32_t *cur_dsd = dsd;</div><div class='add'>+	struct dsd64 *cur_dsd = dsd;</div><div class='ctx'> 	int	i;</div><div class='ctx'> 	uint16_t	used_dsds = tot_dsds;</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='hunk'>@@ -1031,8 +1013,6 @@ qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sgl, sg, tot_dsds, i) {</div><div class='del'>-		dma_addr_t	sle_dma;</div><div class='del'>-</div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='ctx'> 		if (avail_dsds == 0) {</div><div class='ctx'> 			avail_dsds = (used_dsds &gt; QLA_DSDS_PER_IOCB) ?</div><div class='hunk'>@@ -1072,29 +1052,25 @@ qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* add new list to cmd iocb or last list */</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = dsd_list_len;</div><div class='del'>-			cur_dsd = (uint32_t *)next_dsd;</div><div class='add'>+			put_unaligned_le64(dsd_ptr-&gt;dsd_list_dma,</div><div class='add'>+					   &amp;cur_dsd-&gt;address);</div><div class='add'>+			cur_dsd-&gt;length = cpu_to_le32(dsd_list_len);</div><div class='add'>+			cur_dsd = next_dsd;</div><div class='ctx'> 		}</div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> 	/* Null termination */</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='add'>+	cur_dsd-&gt;address = 0;</div><div class='add'>+	cur_dsd-&gt;length = 0;</div><div class='add'>+	cur_dsd++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='del'>-    uint32_t *cur_dsd, uint16_t tot_dsds, struct qla_tgt_cmd *tc)</div><div class='add'>+	struct dsd64 *cur_dsd, uint16_t tot_dsds, struct qla_tgt_cmd *tc)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsd_dma *dsd_ptr = NULL, *dif_dsd, *nxt_dsd;</div><div class='ctx'> 	struct scatterlist *sg, *sgl;</div><div class='hunk'>@@ -1109,6 +1085,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='ctx'> </div><div class='ctx'> 	if (sp) {</div><div class='ctx'> 		struct scsi_cmnd *cmd = GET_CMD_SP(sp);</div><div class='add'>+</div><div class='ctx'> 		sgl = scsi_prot_sglist(cmd);</div><div class='ctx'> 		vha = sp-&gt;vha;</div><div class='ctx'> 		difctx = sp-&gt;u.scmd.ctx;</div><div class='hunk'>@@ -1314,16 +1291,15 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				/* add new list to cmd iocb or last list */</div><div class='del'>-				*cur_dsd++ =</div><div class='del'>-				    cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-				*cur_dsd++ =</div><div class='del'>-				    cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-				*cur_dsd++ = dsd_list_len;</div><div class='add'>+				put_unaligned_le64(dsd_ptr-&gt;dsd_list_dma,</div><div class='add'>+						   &amp;cur_dsd-&gt;address);</div><div class='add'>+				cur_dsd-&gt;length = cpu_to_le32(dsd_list_len);</div><div class='ctx'> 				cur_dsd = dsd_ptr-&gt;dsd_addr;</div><div class='ctx'> 			}</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(LSD(dif_dsd-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(MSD(dif_dsd-&gt;dsd_list_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(sglen);</div><div class='add'>+			put_unaligned_le64(dif_dsd-&gt;dsd_list_dma,</div><div class='add'>+					   &amp;cur_dsd-&gt;address);</div><div class='add'>+			cur_dsd-&gt;length = cpu_to_le32(sglen);</div><div class='add'>+			cur_dsd++;</div><div class='ctx'> 			avail_dsds--;</div><div class='ctx'> 			difctx-&gt;dif_bundl_len -= sglen;</div><div class='ctx'> 			track_difbundl_buf--;</div><div class='hunk'>@@ -1334,8 +1310,6 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='ctx'> 			difctx-&gt;no_ldif_dsd, difctx-&gt;no_dif_bundl);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for_each_sg(sgl, sg, tot_dsds, i) {</div><div class='del'>-			dma_addr_t sle_dma;</div><div class='del'>-</div><div class='ctx'> 			/* Allocate additional continuation packets? */</div><div class='ctx'> 			if (avail_dsds == 0) {</div><div class='ctx'> 				avail_dsds = (used_dsds &gt; QLA_DSDS_PER_IOCB) ?</div><div class='hunk'>@@ -1375,24 +1349,19 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				/* add new list to cmd iocb or last list */</div><div class='del'>-				*cur_dsd++ =</div><div class='del'>-				    cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-				*cur_dsd++ =</div><div class='del'>-				    cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='del'>-				*cur_dsd++ = dsd_list_len;</div><div class='add'>+				put_unaligned_le64(dsd_ptr-&gt;dsd_list_dma,</div><div class='add'>+						   &amp;cur_dsd-&gt;address);</div><div class='add'>+				cur_dsd-&gt;length = cpu_to_le32(dsd_list_len);</div><div class='ctx'> 				cur_dsd = dsd_ptr-&gt;dsd_addr;</div><div class='ctx'> 			}</div><div class='del'>-			sle_dma = sg_dma_address(sg);</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-			*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+			append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 			avail_dsds--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Null termination */</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='del'>-	*cur_dsd++ = 0;</div><div class='add'>+	cur_dsd-&gt;address = 0;</div><div class='add'>+	cur_dsd-&gt;length = 0;</div><div class='add'>+	cur_dsd++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> /**</div><div class='hunk'>@@ -1405,11 +1374,12 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,</div><div class='ctx'>  * @tot_prot_dsds: Total number of segments with protection information</div><div class='ctx'>  * @fw_prot_opts: Protection options to be passed to firmware</div><div class='ctx'>  */</div><div class='del'>-inline int</div><div class='add'>+static inline int</div><div class='ctx'> qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'>     uint16_t tot_dsds, uint16_t tot_prot_dsds, uint16_t fw_prot_opts)</div><div class='ctx'> {</div><div class='del'>-	uint32_t		*cur_dsd, *fcp_dl;</div><div class='add'>+	struct dsd64		*cur_dsd;</div><div class='add'>+	uint32_t		*fcp_dl;</div><div class='ctx'> 	scsi_qla_host_t		*vha;</div><div class='ctx'> 	struct scsi_cmnd	*cmd;</div><div class='ctx'> 	uint32_t		total_bytes = 0;</div><div class='hunk'>@@ -1427,7 +1397,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 	cmd = GET_CMD_SP(sp);</div><div class='ctx'> </div><div class='ctx'> 	/* Update entry type to indicate Command Type CRC_2 IOCB */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) = cpu_to_le32(COMMAND_TYPE_CRC_2);</div><div class='add'>+	put_unaligned_le32(COMMAND_TYPE_CRC_2, &amp;cmd_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	vha = sp-&gt;vha;</div><div class='ctx'> 	ha = vha-&gt;hw;</div><div class='hunk'>@@ -1475,8 +1445,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 	qla24xx_set_t10dif_tags(sp, (struct fw_dif_context *)</div><div class='ctx'> 	    &amp;crc_ctx_pkt-&gt;ref_tag, tot_prot_dsds);</div><div class='ctx'> </div><div class='del'>-	cmd_pkt-&gt;crc_context_address[0] = cpu_to_le32(LSD(crc_ctx_dma));</div><div class='del'>-	cmd_pkt-&gt;crc_context_address[1] = cpu_to_le32(MSD(crc_ctx_dma));</div><div class='add'>+	put_unaligned_le64(crc_ctx_dma, &amp;cmd_pkt-&gt;crc_context_address);</div><div class='ctx'> 	cmd_pkt-&gt;crc_context_len = CRC_CONTEXT_LEN_FW;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine SCSI command length -- align to 4 byte boundary */</div><div class='hunk'>@@ -1503,10 +1472,8 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 	int_to_scsilun(cmd-&gt;device-&gt;lun, &amp;fcp_cmnd-&gt;lun);</div><div class='ctx'> 	memcpy(fcp_cmnd-&gt;cdb, cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='ctx'> 	cmd_pkt-&gt;fcp_cmnd_dseg_len = cpu_to_le16(fcp_cmnd_len);</div><div class='del'>-	cmd_pkt-&gt;fcp_cmnd_dseg_address[0] = cpu_to_le32(</div><div class='del'>-	    LSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));</div><div class='del'>-	cmd_pkt-&gt;fcp_cmnd_dseg_address[1] = cpu_to_le32(</div><div class='del'>-	    MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));</div><div class='add'>+	put_unaligned_le64(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF,</div><div class='add'>+			   &amp;cmd_pkt-&gt;fcp_cmnd_dseg_address);</div><div class='ctx'> 	fcp_cmnd-&gt;task_management = 0;</div><div class='ctx'> 	fcp_cmnd-&gt;task_attribute = TSK_SIMPLE;</div><div class='ctx'> </div><div class='hunk'>@@ -1520,18 +1487,18 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 	switch (scsi_get_prot_op(GET_CMD_SP(sp))) {</div><div class='ctx'> 	case SCSI_PROT_READ_INSERT:</div><div class='ctx'> 	case SCSI_PROT_WRITE_STRIP:</div><div class='del'>-	    total_bytes = data_bytes;</div><div class='del'>-	    data_bytes += dif_bytes;</div><div class='del'>-	    break;</div><div class='add'>+		total_bytes = data_bytes;</div><div class='add'>+		data_bytes += dif_bytes;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case SCSI_PROT_READ_STRIP:</div><div class='ctx'> 	case SCSI_PROT_WRITE_INSERT:</div><div class='ctx'> 	case SCSI_PROT_READ_PASS:</div><div class='ctx'> 	case SCSI_PROT_WRITE_PASS:</div><div class='del'>-	    total_bytes = data_bytes + dif_bytes;</div><div class='del'>-	    break;</div><div class='add'>+		total_bytes = data_bytes + dif_bytes;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-	    BUG();</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!qla2x00_hba_err_chk_enabled(sp))</div><div class='hunk'>@@ -1548,7 +1515,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!bundling) {</div><div class='del'>-		cur_dsd = (uint32_t *) &amp;crc_ctx_pkt-&gt;u.nobundling.data_address;</div><div class='add'>+		cur_dsd = &amp;crc_ctx_pkt-&gt;u.nobundling.data_dsd;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Configure Bundling if we need to fetch interlaving</div><div class='hunk'>@@ -1558,7 +1525,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 		crc_ctx_pkt-&gt;u.bundling.dif_byte_count = cpu_to_le32(dif_bytes);</div><div class='ctx'> 		crc_ctx_pkt-&gt;u.bundling.dseg_count = cpu_to_le16(tot_dsds -</div><div class='ctx'> 							tot_prot_dsds);</div><div class='del'>-		cur_dsd = (uint32_t *) &amp;crc_ctx_pkt-&gt;u.bundling.data_address;</div><div class='add'>+		cur_dsd = &amp;crc_ctx_pkt-&gt;u.bundling.data_dsd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Finish the common fields of CRC pkt */</div><div class='hunk'>@@ -1591,7 +1558,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,</div><div class='ctx'> 	if (bundling &amp;&amp; tot_prot_dsds) {</div><div class='ctx'> 		/* Walks dif segments */</div><div class='ctx'> 		cmd_pkt-&gt;control_flags |= cpu_to_le16(CF_DIF_SEG_DESCR_ENABLE);</div><div class='del'>-		cur_dsd = (uint32_t *) &amp;crc_ctx_pkt-&gt;u.bundling.dif_address;</div><div class='add'>+		cur_dsd = &amp;crc_ctx_pkt-&gt;u.bundling.dif_dsd;</div><div class='ctx'> 		if (qla24xx_walk_and_build_prot_sglist(ha, sp, cur_dsd,</div><div class='ctx'> 				tot_prot_dsds, NULL))</div><div class='ctx'> 			goto crc_queuing_error;</div><div class='hunk'>@@ -2325,7 +2292,8 @@ __qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp)</div><div class='ctx'> 	if (req-&gt;cnt &lt; req_cnt + 2) {</div><div class='ctx'> 		if (qpair-&gt;use_shadow_reg)</div><div class='ctx'> 			cnt = *req-&gt;out_ptr;</div><div class='del'>-		else if (ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+		else if (ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+		    IS_QLA28XX(ha))</div><div class='ctx'> 			cnt = RD_REG_DWORD(&amp;reg-&gt;isp25mq.req_q_out);</div><div class='ctx'> 		else if (IS_P3P_TYPE(ha))</div><div class='ctx'> 			cnt = RD_REG_DWORD(&amp;reg-&gt;isp82.req_q_out);</div><div class='hunk'>@@ -2494,7 +2462,7 @@ qla2x00_logout_iocb(srb_t *sp, struct mbx_entry *mbx)</div><div class='ctx'> 	SET_TARGET_ID(ha, mbx-&gt;loop_id, sp-&gt;fcport-&gt;loop_id);</div><div class='ctx'> 	mbx-&gt;mb0 = cpu_to_le16(MBC_LOGOUT_FABRIC_PORT);</div><div class='ctx'> 	mbx-&gt;mb1 = HAS_EXTENDED_IDS(ha) ?</div><div class='del'>-	    cpu_to_le16(sp-&gt;fcport-&gt;loop_id):</div><div class='add'>+	    cpu_to_le16(sp-&gt;fcport-&gt;loop_id) :</div><div class='ctx'> 	    cpu_to_le16(sp-&gt;fcport-&gt;loop_id &lt;&lt; 8);</div><div class='ctx'> 	mbx-&gt;mb2 = cpu_to_le16(sp-&gt;fcport-&gt;d_id.b.domain);</div><div class='ctx'> 	mbx-&gt;mb3 = cpu_to_le16(sp-&gt;fcport-&gt;d_id.b.area &lt;&lt; 8 |</div><div class='hunk'>@@ -2565,6 +2533,16 @@ qla24xx_tm_iocb(srb_t *sp, struct tsk_mgmt_entry *tsk)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void qla2x00_init_timer(srb_t *sp, unsigned long tmo)</div><div class='add'>+{</div><div class='add'>+	timer_setup(&amp;sp-&gt;u.iocb_cmd.timer, qla2x00_sp_timeout, 0);</div><div class='add'>+	sp-&gt;u.iocb_cmd.timer.expires = jiffies + tmo * HZ;</div><div class='add'>+	sp-&gt;free = qla2x00_sp_free;</div><div class='add'>+	if (IS_QLAFX00(sp-&gt;vha-&gt;hw) &amp;&amp; sp-&gt;type == SRB_FXIOCB_DCMD)</div><div class='add'>+		init_completion(&amp;sp-&gt;u.iocb_cmd.u.fxiocb.fxiocb_comp);</div><div class='add'>+	add_timer(&amp;sp-&gt;u.iocb_cmd.timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> qla2x00_els_dcmd_sp_free(void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -2726,18 +2704,13 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)</div><div class='ctx'> 	if (elsio-&gt;u.els_logo.els_cmd == ELS_DCMD_PLOGI) {</div><div class='ctx'> 		els_iocb-&gt;tx_byte_count = els_iocb-&gt;tx_len =</div><div class='ctx'> 			sizeof(struct els_plogi_payload);</div><div class='del'>-		els_iocb-&gt;tx_address[0] =</div><div class='del'>-			cpu_to_le32(LSD(elsio-&gt;u.els_plogi.els_plogi_pyld_dma));</div><div class='del'>-		els_iocb-&gt;tx_address[1] =</div><div class='del'>-			cpu_to_le32(MSD(elsio-&gt;u.els_plogi.els_plogi_pyld_dma));</div><div class='del'>-</div><div class='add'>+		put_unaligned_le64(elsio-&gt;u.els_plogi.els_plogi_pyld_dma,</div><div class='add'>+				   &amp;els_iocb-&gt;tx_address);</div><div class='ctx'> 		els_iocb-&gt;rx_dsd_count = 1;</div><div class='ctx'> 		els_iocb-&gt;rx_byte_count = els_iocb-&gt;rx_len =</div><div class='ctx'> 			sizeof(struct els_plogi_payload);</div><div class='del'>-		els_iocb-&gt;rx_address[0] =</div><div class='del'>-			cpu_to_le32(LSD(elsio-&gt;u.els_plogi.els_resp_pyld_dma));</div><div class='del'>-		els_iocb-&gt;rx_address[1] =</div><div class='del'>-			cpu_to_le32(MSD(elsio-&gt;u.els_plogi.els_resp_pyld_dma));</div><div class='add'>+		put_unaligned_le64(elsio-&gt;u.els_plogi.els_resp_pyld_dma,</div><div class='add'>+				   &amp;els_iocb-&gt;rx_address);</div><div class='ctx'> </div><div class='ctx'> 		ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x3073,</div><div class='ctx'> 		    "PLOGI ELS IOCB:\n");</div><div class='hunk'>@@ -2745,15 +2718,12 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)</div><div class='ctx'> 		    (uint8_t *)els_iocb, 0x70);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		els_iocb-&gt;tx_byte_count = sizeof(struct els_logo_payload);</div><div class='del'>-		els_iocb-&gt;tx_address[0] =</div><div class='del'>-		    cpu_to_le32(LSD(elsio-&gt;u.els_logo.els_logo_pyld_dma));</div><div class='del'>-		els_iocb-&gt;tx_address[1] =</div><div class='del'>-		    cpu_to_le32(MSD(elsio-&gt;u.els_logo.els_logo_pyld_dma));</div><div class='add'>+		put_unaligned_le64(elsio-&gt;u.els_logo.els_logo_pyld_dma,</div><div class='add'>+				   &amp;els_iocb-&gt;tx_address);</div><div class='ctx'> 		els_iocb-&gt;tx_len = cpu_to_le32(sizeof(struct els_logo_payload));</div><div class='ctx'> </div><div class='ctx'> 		els_iocb-&gt;rx_byte_count = 0;</div><div class='del'>-		els_iocb-&gt;rx_address[0] = 0;</div><div class='del'>-		els_iocb-&gt;rx_address[1] = 0;</div><div class='add'>+		els_iocb-&gt;rx_address = 0;</div><div class='ctx'> 		els_iocb-&gt;rx_len = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2976,17 +2946,13 @@ qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)</div><div class='ctx'>         els_iocb-&gt;tx_byte_count =</div><div class='ctx'>             cpu_to_le32(bsg_job-&gt;request_payload.payload_len);</div><div class='ctx'> </div><div class='del'>-        els_iocb-&gt;tx_address[0] = cpu_to_le32(LSD(sg_dma_address</div><div class='del'>-            (bsg_job-&gt;request_payload.sg_list)));</div><div class='del'>-        els_iocb-&gt;tx_address[1] = cpu_to_le32(MSD(sg_dma_address</div><div class='del'>-            (bsg_job-&gt;request_payload.sg_list)));</div><div class='add'>+	put_unaligned_le64(sg_dma_address(bsg_job-&gt;request_payload.sg_list),</div><div class='add'>+			   &amp;els_iocb-&gt;tx_address);</div><div class='ctx'>         els_iocb-&gt;tx_len = cpu_to_le32(sg_dma_len</div><div class='ctx'>             (bsg_job-&gt;request_payload.sg_list));</div><div class='ctx'> </div><div class='del'>-        els_iocb-&gt;rx_address[0] = cpu_to_le32(LSD(sg_dma_address</div><div class='del'>-            (bsg_job-&gt;reply_payload.sg_list)));</div><div class='del'>-        els_iocb-&gt;rx_address[1] = cpu_to_le32(MSD(sg_dma_address</div><div class='del'>-            (bsg_job-&gt;reply_payload.sg_list)));</div><div class='add'>+	put_unaligned_le64(sg_dma_address(bsg_job-&gt;reply_payload.sg_list),</div><div class='add'>+			   &amp;els_iocb-&gt;rx_address);</div><div class='ctx'>         els_iocb-&gt;rx_len = cpu_to_le32(sg_dma_len</div><div class='ctx'>             (bsg_job-&gt;reply_payload.sg_list));</div><div class='ctx'> </div><div class='hunk'>@@ -2997,14 +2963,13 @@ static void</div><div class='ctx'> qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t        avail_dsds;</div><div class='del'>-	uint32_t        *cur_dsd;</div><div class='add'>+	struct dsd64	*cur_dsd;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	uint16_t tot_dsds;</div><div class='ctx'> 	scsi_qla_host_t *vha = sp-&gt;vha;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct bsg_job *bsg_job = sp-&gt;u.bsg_job;</div><div class='del'>-	int loop_iterartion = 0;</div><div class='ctx'> 	int entry_count = 1;</div><div class='ctx'> </div><div class='ctx'> 	memset(ct_iocb, 0, sizeof(ms_iocb_entry_t));</div><div class='hunk'>@@ -3024,25 +2989,20 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)</div><div class='ctx'> 	ct_iocb-&gt;rsp_bytecount =</div><div class='ctx'> 	    cpu_to_le32(bsg_job-&gt;reply_payload.payload_len);</div><div class='ctx'> </div><div class='del'>-	ct_iocb-&gt;dseg_req_address[0] = cpu_to_le32(LSD(sg_dma_address</div><div class='del'>-	    (bsg_job-&gt;request_payload.sg_list)));</div><div class='del'>-	ct_iocb-&gt;dseg_req_address[1] = cpu_to_le32(MSD(sg_dma_address</div><div class='del'>-	    (bsg_job-&gt;request_payload.sg_list)));</div><div class='del'>-	ct_iocb-&gt;dseg_req_length = ct_iocb-&gt;req_bytecount;</div><div class='add'>+	put_unaligned_le64(sg_dma_address(bsg_job-&gt;request_payload.sg_list),</div><div class='add'>+			   &amp;ct_iocb-&gt;req_dsd.address);</div><div class='add'>+	ct_iocb-&gt;req_dsd.length = ct_iocb-&gt;req_bytecount;</div><div class='ctx'> </div><div class='del'>-	ct_iocb-&gt;dseg_rsp_address[0] = cpu_to_le32(LSD(sg_dma_address</div><div class='del'>-	    (bsg_job-&gt;reply_payload.sg_list)));</div><div class='del'>-	ct_iocb-&gt;dseg_rsp_address[1] = cpu_to_le32(MSD(sg_dma_address</div><div class='del'>-	    (bsg_job-&gt;reply_payload.sg_list)));</div><div class='del'>-	ct_iocb-&gt;dseg_rsp_length = ct_iocb-&gt;rsp_bytecount;</div><div class='add'>+	put_unaligned_le64(sg_dma_address(bsg_job-&gt;reply_payload.sg_list),</div><div class='add'>+			   &amp;ct_iocb-&gt;rsp_dsd.address);</div><div class='add'>+	ct_iocb-&gt;rsp_dsd.length = ct_iocb-&gt;rsp_bytecount;</div><div class='ctx'> </div><div class='ctx'> 	avail_dsds = 1;</div><div class='del'>-	cur_dsd = (uint32_t *)ct_iocb-&gt;dseg_rsp_address;</div><div class='add'>+	cur_dsd = &amp;ct_iocb-&gt;rsp_dsd;</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	tot_dsds = bsg_job-&gt;reply_payload.sg_cnt;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(bsg_job-&gt;reply_payload.sg_list, sg, tot_dsds, index) {</div><div class='del'>-		dma_addr_t       sle_dma;</div><div class='ctx'> 		cont_a64_entry_t *cont_pkt;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='hunk'>@@ -3053,16 +3013,12 @@ qla2x00_ct_iocb(srb_t *sp, ms_iocb_entry_t *ct_iocb)</div><div class='ctx'> 			       */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(vha,</div><div class='ctx'> 			    vha-&gt;hw-&gt;req_q_map[0]);</div><div class='del'>-			cur_dsd = (uint32_t *) cont_pkt-&gt;dseg_0_address;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='ctx'> 			avail_dsds = 5;</div><div class='ctx'> 			entry_count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='del'>-		loop_iterartion++;</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> 	ct_iocb-&gt;entry_count = entry_count;</div><div class='hunk'>@@ -3074,7 +3030,7 @@ static void</div><div class='ctx'> qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t        avail_dsds;</div><div class='del'>-	uint32_t        *cur_dsd;</div><div class='add'>+	struct dsd64	*cur_dsd;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	uint16_t cmd_dsds, rsp_dsds;</div><div class='hunk'>@@ -3103,12 +3059,10 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)</div><div class='ctx'>             cpu_to_le32(bsg_job-&gt;request_payload.payload_len);</div><div class='ctx'> </div><div class='ctx'> 	avail_dsds = 2;</div><div class='del'>-	cur_dsd = (uint32_t *)ct_iocb-&gt;dseg_0_address;</div><div class='add'>+	cur_dsd = ct_iocb-&gt;dsd;</div><div class='ctx'> 	index = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(bsg_job-&gt;request_payload.sg_list, sg, cmd_dsds, index) {</div><div class='del'>-		dma_addr_t       sle_dma;</div><div class='del'>-</div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='ctx'> 		if (avail_dsds == 0) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3117,23 +3071,18 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)</div><div class='ctx'> 			 */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(</div><div class='ctx'> 			    vha, ha-&gt;req_q_map[0]);</div><div class='del'>-			cur_dsd = (uint32_t *) cont_pkt-&gt;dseg_0_address;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='ctx'> 			avail_dsds = 5;</div><div class='ctx'> 			entry_count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	index = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(bsg_job-&gt;reply_payload.sg_list, sg, rsp_dsds, index) {</div><div class='del'>-		dma_addr_t       sle_dma;</div><div class='del'>-</div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='ctx'> 		if (avail_dsds == 0) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3142,15 +3091,12 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)</div><div class='ctx'> 			       */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(vha,</div><div class='ctx'> 			    ha-&gt;req_q_map[0]);</div><div class='del'>-			cur_dsd = (uint32_t *) cont_pkt-&gt;dseg_0_address;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='ctx'> 			avail_dsds = 5;</div><div class='ctx'> 			entry_count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'>         ct_iocb-&gt;entry_count = entry_count;</div><div class='hunk'>@@ -3371,10 +3317,8 @@ sufficient_dsds:</div><div class='ctx'> 		*fcp_dl = htonl((uint32_t)scsi_bufflen(cmd));</div><div class='ctx'> </div><div class='ctx'> 		cmd_pkt-&gt;fcp_cmnd_dseg_len = cpu_to_le16(ctx-&gt;fcp_cmnd_len);</div><div class='del'>-		cmd_pkt-&gt;fcp_cmnd_dseg_address[0] =</div><div class='del'>-		    cpu_to_le32(LSD(ctx-&gt;fcp_cmnd_dma));</div><div class='del'>-		cmd_pkt-&gt;fcp_cmnd_dseg_address[1] =</div><div class='del'>-		    cpu_to_le32(MSD(ctx-&gt;fcp_cmnd_dma));</div><div class='add'>+		put_unaligned_le64(ctx-&gt;fcp_cmnd_dma,</div><div class='add'>+				   &amp;cmd_pkt-&gt;fcp_cmnd_dseg_address);</div><div class='ctx'> </div><div class='ctx'> 		sp-&gt;flags |= SRB_FCP_CMND_DMA_VALID;</div><div class='ctx'> 		cmd_pkt-&gt;byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));</div><div class='hunk'>@@ -3386,6 +3330,7 @@ sufficient_dsds:</div><div class='ctx'> 		cmd_pkt-&gt;entry_status = (uint8_t) rsp-&gt;id;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct cmd_type_7 *cmd_pkt;</div><div class='add'>+</div><div class='ctx'> 		req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);</div><div class='ctx'> 		if (req-&gt;cnt &lt; (req_cnt + 2)) {</div><div class='ctx'> 			cnt = (uint16_t)RD_REG_DWORD_RELAXED(</div><div class='hunk'>@@ -3590,15 +3535,13 @@ qla_nvme_ls(srb_t *sp, struct pt_ls4_request *cmd_pkt)</div><div class='ctx'> </div><div class='ctx'> 	cmd_pkt-&gt;tx_dseg_count = 1;</div><div class='ctx'> 	cmd_pkt-&gt;tx_byte_count = nvme-&gt;u.nvme.cmd_len;</div><div class='del'>-	cmd_pkt-&gt;dseg0_len = nvme-&gt;u.nvme.cmd_len;</div><div class='del'>-	cmd_pkt-&gt;dseg0_address[0] = cpu_to_le32(LSD(nvme-&gt;u.nvme.cmd_dma));</div><div class='del'>-	cmd_pkt-&gt;dseg0_address[1] = cpu_to_le32(MSD(nvme-&gt;u.nvme.cmd_dma));</div><div class='add'>+	cmd_pkt-&gt;dsd[0].length = nvme-&gt;u.nvme.cmd_len;</div><div class='add'>+	put_unaligned_le64(nvme-&gt;u.nvme.cmd_dma, &amp;cmd_pkt-&gt;dsd[0].address);</div><div class='ctx'> </div><div class='ctx'> 	cmd_pkt-&gt;rx_dseg_count = 1;</div><div class='ctx'> 	cmd_pkt-&gt;rx_byte_count = nvme-&gt;u.nvme.rsp_len;</div><div class='del'>-	cmd_pkt-&gt;dseg1_len  = nvme-&gt;u.nvme.rsp_len;</div><div class='del'>-	cmd_pkt-&gt;dseg1_address[0] =  cpu_to_le32(LSD(nvme-&gt;u.nvme.rsp_dma));</div><div class='del'>-	cmd_pkt-&gt;dseg1_address[1] =  cpu_to_le32(MSD(nvme-&gt;u.nvme.rsp_dma));</div><div class='add'>+	cmd_pkt-&gt;dsd[1].length  = nvme-&gt;u.nvme.rsp_len;</div><div class='add'>+	put_unaligned_le64(nvme-&gt;u.nvme.rsp_dma, &amp;cmd_pkt-&gt;dsd[1].address);</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='hunk'>@@ -3737,7 +3680,7 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,</div><div class='ctx'> 				struct cmd_bidir *cmd_pkt, uint32_t tot_dsds)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t avail_dsds;</div><div class='del'>-	uint32_t *cur_dsd;</div><div class='add'>+	struct dsd64 *cur_dsd;</div><div class='ctx'> 	uint32_t req_data_len = 0;</div><div class='ctx'> 	uint32_t rsp_data_len = 0;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -3746,8 +3689,7 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,</div><div class='ctx'> 	struct bsg_job *bsg_job = sp-&gt;u.bsg_job;</div><div class='ctx'> </div><div class='ctx'> 	/*Update entry type to indicate bidir command */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) =</div><div class='del'>-		cpu_to_le32(COMMAND_BIDIRECTIONAL);</div><div class='add'>+	put_unaligned_le32(COMMAND_BIDIRECTIONAL, &amp;cmd_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the transfer direction, in this set both flags</div><div class='ctx'> 	 * Also set the BD_WRAP_BACK flag, firmware will take care</div><div class='hunk'>@@ -3773,13 +3715,12 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,</div><div class='ctx'> 	 * are bundled in continuation iocb</div><div class='ctx'> 	 */</div><div class='ctx'> 	avail_dsds = 1;</div><div class='del'>-	cur_dsd = (uint32_t *)&amp;cmd_pkt-&gt;fcp_data_dseg_address;</div><div class='add'>+	cur_dsd = &amp;cmd_pkt-&gt;fcp_dsd;</div><div class='ctx'> </div><div class='ctx'> 	index = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(bsg_job-&gt;request_payload.sg_list, sg,</div><div class='ctx'> 				bsg_job-&gt;request_payload.sg_cnt, index) {</div><div class='del'>-		dma_addr_t sle_dma;</div><div class='ctx'> 		cont_a64_entry_t *cont_pkt;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate additional continuation packets */</div><div class='hunk'>@@ -3788,14 +3729,11 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,</div><div class='ctx'> 			 * 5 DSDS</div><div class='ctx'> 			 */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha-&gt;req);</div><div class='del'>-			cur_dsd = (uint32_t *) cont_pkt-&gt;dseg_0_address;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='ctx'> 			avail_dsds = 5;</div><div class='ctx'> 			entry_count++;</div><div class='ctx'> 		}</div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* For read request DSD will always goes to continuation IOCB</div><div class='hunk'>@@ -3805,7 +3743,6 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_sg(bsg_job-&gt;reply_payload.sg_list, sg,</div><div class='ctx'> 				bsg_job-&gt;reply_payload.sg_cnt, index) {</div><div class='del'>-		dma_addr_t sle_dma;</div><div class='ctx'> 		cont_a64_entry_t *cont_pkt;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate additional continuation packets */</div><div class='hunk'>@@ -3814,14 +3751,11 @@ qla25xx_build_bidir_iocb(srb_t *sp, struct scsi_qla_host *vha,</div><div class='ctx'> 			 * 5 DSDS</div><div class='ctx'> 			 */</div><div class='ctx'> 			cont_pkt = qla2x00_prep_cont_type1_iocb(vha, vha-&gt;req);</div><div class='del'>-			cur_dsd = (uint32_t *) cont_pkt-&gt;dseg_0_address;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='ctx'> 			avail_dsds = 5;</div><div class='ctx'> 			entry_count++;</div><div class='ctx'> 		}</div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* This value should be same as number of IOCB required for this cmd */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c<br/>index 69bbea9239cc..78aec50abe0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_isr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_isr.c</a></div><div class='hunk'>@@ -23,6 +23,14 @@ static void qla2x00_status_cont_entry(struct rsp_que *, sts_cont_entry_t *);</div><div class='ctx'> static int qla2x00_error_entry(scsi_qla_host_t *, struct rsp_que *,</div><div class='ctx'> 	sts_entry_t *);</div><div class='ctx'> </div><div class='add'>+const char *const port_state_str[] = {</div><div class='add'>+	"Unknown",</div><div class='add'>+	"UNCONFIGURED",</div><div class='add'>+	"DEAD",</div><div class='add'>+	"LOST",</div><div class='add'>+	"ONLINE"</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200.</div><div class='ctx'>  * @irq: interrupt number</div><div class='hunk'>@@ -41,7 +49,7 @@ qla2100_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 	int		status;</div><div class='ctx'> 	unsigned long	iter;</div><div class='ctx'> 	uint16_t	hccr;</div><div class='del'>-	uint16_t	mb[4];</div><div class='add'>+	uint16_t	mb[8];</div><div class='ctx'> 	struct rsp_que *rsp;</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +168,7 @@ qla2300_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 	unsigned long	iter;</div><div class='ctx'> 	uint32_t	stat;</div><div class='ctx'> 	uint16_t	hccr;</div><div class='del'>-	uint16_t	mb[4];</div><div class='add'>+	uint16_t	mb[8];</div><div class='ctx'> 	struct rsp_que *rsp;</div><div class='ctx'> 	struct qla_hw_data *ha;</div><div class='ctx'> 	unsigned long	flags;</div><div class='hunk'>@@ -366,7 +374,7 @@ qla2x00_get_link_speed_str(struct qla_hw_data *ha, uint16_t speed)</div><div class='ctx'> 	static const char *const link_speeds[] = {</div><div class='ctx'> 		"1", "2", "?", "4", "8", "16", "32", "10"</div><div class='ctx'> 	};</div><div class='del'>-#define	QLA_LAST_SPEED	7</div><div class='add'>+#define	QLA_LAST_SPEED (ARRAY_SIZE(link_speeds) - 1)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA2100(ha) || IS_QLA2200(ha))</div><div class='ctx'> 		return link_speeds[0];</div><div class='hunk'>@@ -708,12 +716,15 @@ skip_rio:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_SYSTEM_ERR:		/* System Error */</div><div class='del'>-		mbx = (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) ?</div><div class='add'>+		mbx = (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+		    IS_QLA28XX(ha)) ?</div><div class='ctx'> 			RD_REG_WORD(&amp;reg24-&gt;mailbox7) : 0;</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x5003,</div><div class='ctx'> 		    "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh "</div><div class='ctx'> 		    "mbx7=%xh.\n", mb[1], mb[2], mb[3], mbx);</div><div class='del'>-</div><div class='add'>+		ha-&gt;fw_dump_mpi =</div><div class='add'>+		    (IS_QLA27XX(ha) || IS_QLA28XX(ha)) &amp;&amp;</div><div class='add'>+		    RD_REG_WORD(&amp;reg24-&gt;mailbox7) &amp; BIT_8;</div><div class='ctx'> 		ha-&gt;isp_ops-&gt;fw_dump(vha, 1);</div><div class='ctx'> 		ha-&gt;flags.fw_init_done = 0;</div><div class='ctx'> 		QLA_FW_STOPPED(ha);</div><div class='hunk'>@@ -837,6 +848,7 @@ skip_rio:</div><div class='ctx'> 				if (ha-&gt;flags.fawwpn_enabled &amp;&amp;</div><div class='ctx'> 				    (ha-&gt;current_topology == ISP_CFG_F)) {</div><div class='ctx'> 					void *wwpn = ha-&gt;init_cb-&gt;port_name;</div><div class='add'>+</div><div class='ctx'> 					memcpy(vha-&gt;port_name, wwpn, WWN_SIZE);</div><div class='ctx'> 					fc_host_port_name(vha-&gt;host) =</div><div class='ctx'> 					    wwn_to_u64(vha-&gt;port_name);</div><div class='hunk'>@@ -1372,7 +1384,7 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 		    le16_to_cpu(mbx-&gt;status_flags));</div><div class='ctx'> </div><div class='ctx'> 		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5029,</div><div class='del'>-		    (uint8_t *)mbx, sizeof(*mbx));</div><div class='add'>+		    mbx, sizeof(*mbx));</div><div class='ctx'> </div><div class='ctx'> 		goto logio_done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1516,7 +1528,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 			    bsg_reply-&gt;reply_payload_rcv_len = 0;</div><div class='ctx'> 		    }</div><div class='ctx'> 		    ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035,</div><div class='del'>-			(uint8_t *)pkt, sizeof(*pkt));</div><div class='add'>+			pkt, sizeof(*pkt));</div><div class='ctx'> 	    } else {</div><div class='ctx'> 		    res = DID_OK &lt;&lt; 16;</div><div class='ctx'> 		    bsg_reply-&gt;reply_payload_rcv_len =</div><div class='hunk'>@@ -1591,8 +1603,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	comp_status = fw_status[0] = le16_to_cpu(pkt-&gt;comp_status);</div><div class='del'>-	fw_status[1] = le16_to_cpu(((struct els_sts_entry_24xx*)pkt)-&gt;error_subcode_1);</div><div class='del'>-	fw_status[2] = le16_to_cpu(((struct els_sts_entry_24xx*)pkt)-&gt;error_subcode_2);</div><div class='add'>+	fw_status[1] = le16_to_cpu(((struct els_sts_entry_24xx *)pkt)-&gt;error_subcode_1);</div><div class='add'>+	fw_status[2] = le16_to_cpu(((struct els_sts_entry_24xx *)pkt)-&gt;error_subcode_2);</div><div class='ctx'> </div><div class='ctx'> 	if (iocb_type == ELS_IOCB_TYPE) {</div><div class='ctx'> 		els = &amp;sp-&gt;u.iocb_cmd;</div><div class='hunk'>@@ -1613,7 +1625,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 				res = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		ql_log(ql_log_info, vha, 0x503f,</div><div class='add'>+		ql_dbg(ql_dbg_user, vha, 0x503f,</div><div class='ctx'> 		    "ELS IOCB Done -%s error hdl=%x comp_status=0x%x error subcode 1=0x%x error subcode 2=0x%x total_byte=0x%x\n",</div><div class='ctx'> 		    type, sp-&gt;handle, comp_status, fw_status[1], fw_status[2],</div><div class='ctx'> 		    le16_to_cpu(((struct els_sts_entry_24xx *)</div><div class='hunk'>@@ -1656,7 +1668,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 		memcpy(bsg_job-&gt;reply + sizeof(struct fc_bsg_reply),</div><div class='ctx'> 		       fw_status, sizeof(fw_status));</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,</div><div class='del'>-				(uint8_t *)pkt, sizeof(*pkt));</div><div class='add'>+		    pkt, sizeof(*pkt));</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		res =  DID_OK &lt;&lt; 16;</div><div class='hunk'>@@ -1700,7 +1712,7 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 		    fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa,</div><div class='ctx'> 		    logio-&gt;entry_status);</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x504d,</div><div class='del'>-		    (uint8_t *)logio, sizeof(*logio));</div><div class='add'>+		    logio, sizeof(*logio));</div><div class='ctx'> </div><div class='ctx'> 		goto logio_done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1846,8 +1858,8 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, void *tsk)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iocb-&gt;u.tmf.data != QLA_SUCCESS)</div><div class='del'>-		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5055,</div><div class='del'>-		    (uint8_t *)sts, sizeof(*sts));</div><div class='add'>+		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, sp-&gt;vha, 0x5055,</div><div class='add'>+		    sts, sizeof(*sts));</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;done(sp, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1969,6 +1981,52 @@ static void qla_ctrlvp_completed(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 	sp-&gt;done(sp, rval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Process a single response queue entry. */</div><div class='add'>+static void qla2x00_process_response_entry(struct scsi_qla_host *vha,</div><div class='add'>+					   struct rsp_que *rsp,</div><div class='add'>+					   sts_entry_t *pkt)</div><div class='add'>+{</div><div class='add'>+	sts21_entry_t *sts21_entry;</div><div class='add'>+	sts22_entry_t *sts22_entry;</div><div class='add'>+	uint16_t handle_cnt;</div><div class='add'>+	uint16_t cnt;</div><div class='add'>+</div><div class='add'>+	switch (pkt-&gt;entry_type) {</div><div class='add'>+	case STATUS_TYPE:</div><div class='add'>+		qla2x00_status_entry(vha, rsp, pkt);</div><div class='add'>+		break;</div><div class='add'>+	case STATUS_TYPE_21:</div><div class='add'>+		sts21_entry = (sts21_entry_t *)pkt;</div><div class='add'>+		handle_cnt = sts21_entry-&gt;handle_count;</div><div class='add'>+		for (cnt = 0; cnt &lt; handle_cnt; cnt++)</div><div class='add'>+			qla2x00_process_completed_request(vha, rsp-&gt;req,</div><div class='add'>+						sts21_entry-&gt;handle[cnt]);</div><div class='add'>+		break;</div><div class='add'>+	case STATUS_TYPE_22:</div><div class='add'>+		sts22_entry = (sts22_entry_t *)pkt;</div><div class='add'>+		handle_cnt = sts22_entry-&gt;handle_count;</div><div class='add'>+		for (cnt = 0; cnt &lt; handle_cnt; cnt++)</div><div class='add'>+			qla2x00_process_completed_request(vha, rsp-&gt;req,</div><div class='add'>+						sts22_entry-&gt;handle[cnt]);</div><div class='add'>+		break;</div><div class='add'>+	case STATUS_CONT_TYPE:</div><div class='add'>+		qla2x00_status_cont_entry(rsp, (sts_cont_entry_t *)pkt);</div><div class='add'>+		break;</div><div class='add'>+	case MBX_IOCB_TYPE:</div><div class='add'>+		qla2x00_mbx_iocb_entry(vha, rsp-&gt;req, (struct mbx_entry *)pkt);</div><div class='add'>+		break;</div><div class='add'>+	case CT_IOCB_TYPE:</div><div class='add'>+		qla2x00_ct_entry(vha, rsp-&gt;req, pkt, CT_IOCB_TYPE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Type Not Supported. */</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x504a,</div><div class='add'>+		       "Received unknown response pkt type %x entry status=%x.\n",</div><div class='add'>+		       pkt-&gt;entry_type, pkt-&gt;entry_status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_process_response_queue() - Process response queue entries.</div><div class='ctx'>  * @rsp: response queue</div><div class='hunk'>@@ -1980,8 +2038,6 @@ qla2x00_process_response_queue(struct rsp_que *rsp)</div><div class='ctx'> 	struct qla_hw_data *ha = rsp-&gt;hw;</div><div class='ctx'> 	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='ctx'> 	sts_entry_t	*pkt;</div><div class='del'>-	uint16_t        handle_cnt;</div><div class='del'>-	uint16_t        cnt;</div><div class='ctx'> </div><div class='ctx'> 	vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2006,42 +2062,7 @@ qla2x00_process_response_queue(struct rsp_que *rsp)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (pkt-&gt;entry_type) {</div><div class='del'>-		case STATUS_TYPE:</div><div class='del'>-			qla2x00_status_entry(vha, rsp, pkt);</div><div class='del'>-			break;</div><div class='del'>-		case STATUS_TYPE_21:</div><div class='del'>-			handle_cnt = ((sts21_entry_t *)pkt)-&gt;handle_count;</div><div class='del'>-			for (cnt = 0; cnt &lt; handle_cnt; cnt++) {</div><div class='del'>-				qla2x00_process_completed_request(vha, rsp-&gt;req,</div><div class='del'>-				    ((sts21_entry_t *)pkt)-&gt;handle[cnt]);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case STATUS_TYPE_22:</div><div class='del'>-			handle_cnt = ((sts22_entry_t *)pkt)-&gt;handle_count;</div><div class='del'>-			for (cnt = 0; cnt &lt; handle_cnt; cnt++) {</div><div class='del'>-				qla2x00_process_completed_request(vha, rsp-&gt;req,</div><div class='del'>-				    ((sts22_entry_t *)pkt)-&gt;handle[cnt]);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case STATUS_CONT_TYPE:</div><div class='del'>-			qla2x00_status_cont_entry(rsp, (sts_cont_entry_t *)pkt);</div><div class='del'>-			break;</div><div class='del'>-		case MBX_IOCB_TYPE:</div><div class='del'>-			qla2x00_mbx_iocb_entry(vha, rsp-&gt;req,</div><div class='del'>-			    (struct mbx_entry *)pkt);</div><div class='del'>-			break;</div><div class='del'>-		case CT_IOCB_TYPE:</div><div class='del'>-			qla2x00_ct_entry(vha, rsp-&gt;req, pkt, CT_IOCB_TYPE);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* Type Not Supported. */</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x504a,</div><div class='del'>-			    "Received unknown response pkt type %x "</div><div class='del'>-			    "entry status=%x.\n",</div><div class='del'>-			    pkt-&gt;entry_type, pkt-&gt;entry_status);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		qla2x00_process_response_entry(vha, rsp, pkt);</div><div class='ctx'> 		((response_t *)pkt)-&gt;signature = RESPONSE_PROCESSED;</div><div class='ctx'> 		wmb();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2238,6 +2259,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,</div><div class='ctx'> 	struct fc_bsg_reply *bsg_reply;</div><div class='ctx'> 	sts_entry_t *sts;</div><div class='ctx'> 	struct sts_entry_24xx *sts24;</div><div class='add'>+</div><div class='ctx'> 	sts = (sts_entry_t *) pkt;</div><div class='ctx'> 	sts24 = (struct sts_entry_24xx *) pkt;</div><div class='ctx'> </div><div class='hunk'>@@ -3014,7 +3036,8 @@ process_err:</div><div class='ctx'> 			qla24xx_els_ct_entry(vha, rsp-&gt;req, pkt, ELS_IOCB_TYPE);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ABTS_RECV_24XX:</div><div class='del'>-			if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+			if (IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+			    IS_QLA28XX(ha)) {</div><div class='ctx'> 				/* ensure that the ATIO queue is empty */</div><div class='ctx'> 				qlt_handle_abts_recv(vha, rsp,</div><div class='ctx'> 				    (response_t *)pkt);</div><div class='hunk'>@@ -3072,6 +3095,7 @@ process_err:</div><div class='ctx'> 	/* Adjust ring index */</div><div class='ctx'> 	if (IS_P3P_TYPE(ha)) {</div><div class='ctx'> 		struct device_reg_82xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp82;</div><div class='add'>+</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;rsp_q_out[0], rsp-&gt;ring_index);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WRT_REG_DWORD(rsp-&gt;rsp_q_out, rsp-&gt;ring_index);</div><div class='hunk'>@@ -3087,7 +3111,7 @@ qla2xxx_check_risc_status(scsi_qla_host_t *vha)</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(ha))</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='hunk'>@@ -3475,7 +3499,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x00c8,</div><div class='ctx'> 		    "Failed to allocate memory for ha-&gt;msix_entries.\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto msix_out;</div><div class='add'>+		goto free_irqs;</div><div class='ctx'> 	}</div><div class='ctx'> 	ha-&gt;flags.msix_enabled = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -3539,7 +3563,7 @@ msix_register_fail:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable MSI-X vector for response queue update for queue 0 */</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 		if (ha-&gt;msixbase &amp;&amp; ha-&gt;mqiobase &amp;&amp;</div><div class='ctx'> 		    (ha-&gt;max_rsp_queues &gt; 1 || ha-&gt;max_req_queues &gt; 1 ||</div><div class='ctx'> 		     ql2xmqsupport))</div><div class='hunk'>@@ -3558,6 +3582,10 @@ msix_register_fail:</div><div class='ctx'> </div><div class='ctx'> msix_out:</div><div class='ctx'> 	return ret;</div><div class='add'>+</div><div class='add'>+free_irqs:</div><div class='add'>+	pci_free_irq_vectors(ha-&gt;pdev);</div><div class='add'>+	goto msix_out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3570,7 +3598,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)</div><div class='ctx'> 	/* If possible, enable MSI-X. */</div><div class='ctx'> 	if (ql2xenablemsix == 0 || (!IS_QLA2432(ha) &amp;&amp; !IS_QLA2532(ha) &amp;&amp;</div><div class='ctx'> 	    !IS_QLA8432(ha) &amp;&amp; !IS_CNA_CAPABLE(ha) &amp;&amp; !IS_QLA2031(ha) &amp;&amp;</div><div class='del'>-	    !IS_QLAFX00(ha) &amp;&amp; !IS_QLA27XX(ha)))</div><div class='add'>+	    !IS_QLAFX00(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha)))</div><div class='ctx'> 		goto skip_msi;</div><div class='ctx'> </div><div class='ctx'> 	if (ql2xenablemsix == 2)</div><div class='hunk'>@@ -3609,7 +3637,7 @@ skip_msix:</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA24XX(ha) &amp;&amp; !IS_QLA2532(ha) &amp;&amp; !IS_QLA8432(ha) &amp;&amp;</div><div class='ctx'> 	    !IS_QLA8001(ha) &amp;&amp; !IS_P3P_TYPE(ha) &amp;&amp; !IS_QLAFX00(ha) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(ha))</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		goto skip_msi;</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_alloc_irq_vectors(ha-&gt;pdev, 1, 1, PCI_IRQ_MSI);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c<br/>index 5400696e1f6b..133f5f6270ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mbx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_mbx.c</a></div><div class='hunk'>@@ -567,9 +567,9 @@ mbx_done:</div><div class='ctx'> 		    mcp-&gt;mb[0]);</div><div class='ctx'> 	} else if (rval) {</div><div class='ctx'> 		if (ql2xextended_error_logging &amp; (ql_dbg_disc|ql_dbg_mbx)) {</div><div class='del'>-			pr_warn("%s [%s]-%04x:%ld: **** Failed", QL_MSGHDR,</div><div class='add'>+			pr_warn("%s [%s]-%04x:%ld: **** Failed=%x", QL_MSGHDR,</div><div class='ctx'> 			    dev_name(&amp;ha-&gt;pdev-&gt;dev), 0x1020+0x800,</div><div class='del'>-			    vha-&gt;host_no);</div><div class='add'>+			    vha-&gt;host_no, rval);</div><div class='ctx'> 			mboxes = mcp-&gt;in_mb;</div><div class='ctx'> 			cnt = 4;</div><div class='ctx'> 			for (i = 0; i &lt; ha-&gt;mbx_count &amp;&amp; cnt; i++, mboxes &gt;&gt;= 1)</div><div class='hunk'>@@ -634,14 +634,15 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,</div><div class='ctx'> 		mcp-&gt;out_mb |= MBX_4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mcp-&gt;in_mb = MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_1|MBX_0;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='ctx'> 	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='ctx'> </div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x1023,</div><div class='del'>-		    "Failed=%x mb[0]=%x.\n", rval, mcp-&gt;mb[0]);</div><div class='add'>+		    "Failed=%x mb[0]=%x mb[1]=%x.\n",</div><div class='add'>+		    rval, mcp-&gt;mb[0], mcp-&gt;mb[1]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1024,</div><div class='ctx'> 		    "Done %s.\n", __func__);</div><div class='hunk'>@@ -656,7 +657,7 @@ static inline uint16_t qla25xx_set_sfp_lr_dist(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t mb4 = BIT_0;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mb4 |= ha-&gt;long_range_distance &lt;&lt; LR_DIST_FW_POS;</div><div class='ctx'> </div><div class='ctx'> 	return mb4;</div><div class='hunk'>@@ -666,7 +667,7 @@ static inline uint16_t qla25xx_set_nvr_lr_dist(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t mb4 = BIT_0;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 		struct nvram_81xx *nv = ha-&gt;nvram;</div><div class='ctx'> </div><div class='ctx'> 		mb4 |= LR_DIST_FW_FIELD(nv-&gt;enhanced_features);</div><div class='hunk'>@@ -711,7 +712,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)</div><div class='ctx'> 		mcp-&gt;mb[4] = 0;</div><div class='ctx'> 		ha-&gt;flags.using_lr_setting = 0;</div><div class='ctx'> 		if (IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) ||</div><div class='del'>-		    IS_QLA27XX(ha)) {</div><div class='add'>+		    IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			if (ql2xautodetectsfp) {</div><div class='ctx'> 				if (ha-&gt;flags.detected_lr_sfp) {</div><div class='ctx'> 					mcp-&gt;mb[4] |=</div><div class='hunk'>@@ -730,19 +731,20 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (ql2xnvmeenable &amp;&amp; IS_QLA27XX(ha))</div><div class='add'>+		if (ql2xnvmeenable &amp;&amp; (IS_QLA27XX(ha) || IS_QLA28XX(ha)))</div><div class='ctx'> 			mcp-&gt;mb[4] |= NVME_ENABLE_FLAG;</div><div class='ctx'> </div><div class='del'>-		if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+		if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			struct nvram_81xx *nv = ha-&gt;nvram;</div><div class='ctx'> 			/* set minimum speed if specified in nvram */</div><div class='del'>-			if (nv-&gt;min_link_speed &gt;= 2 &amp;&amp;</div><div class='del'>-			    nv-&gt;min_link_speed &lt;= 5) {</div><div class='add'>+			if (nv-&gt;min_supported_speed &gt;= 2 &amp;&amp;</div><div class='add'>+			    nv-&gt;min_supported_speed &lt;= 5) {</div><div class='ctx'> 				mcp-&gt;mb[4] |= BIT_4;</div><div class='del'>-				mcp-&gt;mb[11] = nv-&gt;min_link_speed;</div><div class='add'>+				mcp-&gt;mb[11] |= nv-&gt;min_supported_speed &amp; 0xF;</div><div class='ctx'> 				mcp-&gt;out_mb |= MBX_11;</div><div class='ctx'> 				mcp-&gt;in_mb |= BIT_5;</div><div class='del'>-				vha-&gt;min_link_speed_feat = nv-&gt;min_link_speed;</div><div class='add'>+				vha-&gt;min_supported_speed =</div><div class='add'>+				    nv-&gt;min_supported_speed;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -770,34 +772,39 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x1026,</div><div class='ctx'> 		    "Failed=%x mb[0]=%x.\n", rval, mcp-&gt;mb[0]);</div><div class='del'>-	} else {</div><div class='del'>-		if (IS_FWI2_CAPABLE(ha)) {</div><div class='del'>-			ha-&gt;fw_ability_mask = mcp-&gt;mb[3] &lt;&lt; 16 | mcp-&gt;mb[2];</div><div class='del'>-			ql_dbg(ql_dbg_mbx, vha, 0x119a,</div><div class='del'>-			    "fw_ability_mask=%x.\n", ha-&gt;fw_ability_mask);</div><div class='del'>-			ql_dbg(ql_dbg_mbx, vha, 0x1027,</div><div class='del'>-			    "exchanges=%x.\n", mcp-&gt;mb[1]);</div><div class='del'>-			if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='del'>-				ha-&gt;max_speed_sup = mcp-&gt;mb[2] &amp; BIT_0;</div><div class='del'>-				ql_dbg(ql_dbg_mbx, vha, 0x119b,</div><div class='del'>-				    "Maximum speed supported=%s.\n",</div><div class='del'>-				    ha-&gt;max_speed_sup ? "32Gps" : "16Gps");</div><div class='del'>-				if (vha-&gt;min_link_speed_feat) {</div><div class='del'>-					ha-&gt;min_link_speed = mcp-&gt;mb[5];</div><div class='del'>-					ql_dbg(ql_dbg_mbx, vha, 0x119c,</div><div class='del'>-					    "Minimum speed set=%s.\n",</div><div class='del'>-					    mcp-&gt;mb[5] == 5 ? "32Gps" :</div><div class='del'>-					    mcp-&gt;mb[5] == 4 ? "16Gps" :</div><div class='del'>-					    mcp-&gt;mb[5] == 3 ? "8Gps" :</div><div class='del'>-					    mcp-&gt;mb[5] == 2 ? "4Gps" :</div><div class='del'>-						"unknown");</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+		return rval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_FWI2_CAPABLE(ha))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ha-&gt;fw_ability_mask = mcp-&gt;mb[3] &lt;&lt; 16 | mcp-&gt;mb[2];</div><div class='add'>+	ql_dbg(ql_dbg_mbx, vha, 0x119a,</div><div class='add'>+	    "fw_ability_mask=%x.\n", ha-&gt;fw_ability_mask);</div><div class='add'>+	ql_dbg(ql_dbg_mbx, vha, 0x1027, "exchanges=%x.\n", mcp-&gt;mb[1]);</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+		ha-&gt;max_supported_speed = mcp-&gt;mb[2] &amp; (BIT_0|BIT_1);</div><div class='add'>+		ql_dbg(ql_dbg_mbx, vha, 0x119b, "max_supported_speed=%s.\n",</div><div class='add'>+		    ha-&gt;max_supported_speed == 0 ? "16Gps" :</div><div class='add'>+		    ha-&gt;max_supported_speed == 1 ? "32Gps" :</div><div class='add'>+		    ha-&gt;max_supported_speed == 2 ? "64Gps" : "unknown");</div><div class='add'>+		if (vha-&gt;min_supported_speed) {</div><div class='add'>+			ha-&gt;min_supported_speed = mcp-&gt;mb[5] &amp;</div><div class='add'>+			    (BIT_0 | BIT_1 | BIT_2);</div><div class='add'>+			ql_dbg(ql_dbg_mbx, vha, 0x119c,</div><div class='add'>+			    "min_supported_speed=%s.\n",</div><div class='add'>+			    ha-&gt;min_supported_speed == 6 ? "64Gps" :</div><div class='add'>+			    ha-&gt;min_supported_speed == 5 ? "32Gps" :</div><div class='add'>+			    ha-&gt;min_supported_speed == 4 ? "16Gps" :</div><div class='add'>+			    ha-&gt;min_supported_speed == 3 ? "8Gps" :</div><div class='add'>+			    ha-&gt;min_supported_speed == 2 ? "4Gps" : "unknown");</div><div class='ctx'> 		}</div><div class='del'>-		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1028,</div><div class='del'>-		    "Done.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+done:</div><div class='add'>+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1028,</div><div class='add'>+	    "Done %s.\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1053,10 +1060,10 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_13|MBX_12|MBX_11|MBX_10|MBX_9|MBX_8;</div><div class='ctx'> 	if (IS_FWI2_CAPABLE(ha))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_17|MBX_16|MBX_15;</div><div class='del'>-	if (IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;in_mb |=</div><div class='ctx'> 		    MBX_25|MBX_24|MBX_23|MBX_22|MBX_21|MBX_20|MBX_19|MBX_18|</div><div class='del'>-		    MBX_14|MBX_13|MBX_11|MBX_10|MBX_9|MBX_8;</div><div class='add'>+		    MBX_14|MBX_13|MBX_11|MBX_10|MBX_9|MBX_8|MBX_7;</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='hunk'>@@ -1122,7 +1129,10 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+		ha-&gt;serdes_version[0] = mcp-&gt;mb[7] &amp; 0xff;</div><div class='add'>+		ha-&gt;serdes_version[1] = mcp-&gt;mb[8] &gt;&gt; 8;</div><div class='add'>+		ha-&gt;serdes_version[2] = mcp-&gt;mb[8] &amp; 0xff;</div><div class='ctx'> 		ha-&gt;mpi_version[0] = mcp-&gt;mb[10] &amp; 0xff;</div><div class='ctx'> 		ha-&gt;mpi_version[1] = mcp-&gt;mb[11] &gt;&gt; 8;</div><div class='ctx'> 		ha-&gt;mpi_version[2] = mcp-&gt;mb[11] &amp; 0xff;</div><div class='hunk'>@@ -1133,6 +1143,13 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;fw_shared_ram_end = (mcp-&gt;mb[21] &lt;&lt; 16) | mcp-&gt;mb[20];</div><div class='ctx'> 		ha-&gt;fw_ddr_ram_start = (mcp-&gt;mb[23] &lt;&lt; 16) | mcp-&gt;mb[22];</div><div class='ctx'> 		ha-&gt;fw_ddr_ram_end = (mcp-&gt;mb[25] &lt;&lt; 16) | mcp-&gt;mb[24];</div><div class='add'>+		if (IS_QLA28XX(ha)) {</div><div class='add'>+			if (mcp-&gt;mb[16] &amp; BIT_10) {</div><div class='add'>+				ql_log(ql_log_info, vha, 0xffff,</div><div class='add'>+				    "FW support secure flash updates\n");</div><div class='add'>+				ha-&gt;flags.secure_fw = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='hunk'>@@ -1638,7 +1655,7 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_13|MBX_12|MBX_11|MBX_10;</div><div class='ctx'> 	if (IS_FWI2_CAPABLE(vha-&gt;hw))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_19|MBX_18|MBX_17|MBX_16;</div><div class='del'>-	if (IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	if (IS_QLA27XX(vha-&gt;hw) || IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_15;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='hunk'>@@ -1692,7 +1709,7 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+		if (IS_QLA27XX(vha-&gt;hw) || IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 			vha-&gt;bbcr = mcp-&gt;mb[15];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1808,7 +1825,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* 1 and 2 should normally be captured. */</div><div class='ctx'> 	mcp-&gt;in_mb = MBX_2|MBX_1|MBX_0;</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		/* mb3 is additional info about the installed SFP. */</div><div class='ctx'> 		mcp-&gt;in_mb  |= MBX_3;</div><div class='ctx'> 	mcp-&gt;buf_size = size;</div><div class='hunk'>@@ -1819,10 +1836,20 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x104d,</div><div class='del'>-		    "Failed=%x mb[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x,.\n",</div><div class='add'>+		    "Failed=%x mb[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x.\n",</div><div class='ctx'> 		    rval, mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2], mcp-&gt;mb[3]);</div><div class='add'>+		if (ha-&gt;init_cb) {</div><div class='add'>+			ql_dbg(ql_dbg_mbx, vha, 0x104d, "init_cb:\n");</div><div class='add'>+			ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha,</div><div class='add'>+			    0x0104d, ha-&gt;init_cb, sizeof(*ha-&gt;init_cb));</div><div class='add'>+		}</div><div class='add'>+		if (ha-&gt;ex_init_cb &amp;&amp; ha-&gt;ex_init_cb-&gt;ex_version) {</div><div class='add'>+			ql_dbg(ql_dbg_mbx, vha, 0x104d, "ex_init_cb:\n");</div><div class='add'>+			ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha,</div><div class='add'>+			    0x0104d, ha-&gt;ex_init_cb, sizeof(*ha-&gt;ex_init_cb));</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (IS_QLA27XX(ha)) {</div><div class='add'>+		if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			if (mcp-&gt;mb[2] == 6 || mcp-&gt;mb[3] == 2)</div><div class='ctx'> 				ql_dbg(ql_dbg_mbx, vha, 0x119d,</div><div class='ctx'> 				    "Invalid SFP/Validation Failed\n");</div><div class='hunk'>@@ -2006,7 +2033,7 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)</div><div class='ctx'> </div><div class='ctx'> 		/* Passback COS information. */</div><div class='ctx'> 		fcport-&gt;supported_classes = (pd-&gt;options &amp; BIT_4) ?</div><div class='del'>-		    FC_COS_CLASS2: FC_COS_CLASS3;</div><div class='add'>+		    FC_COS_CLASS2 : FC_COS_CLASS3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> gpd_error_out:</div><div class='hunk'>@@ -2076,7 +2103,7 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x1055, "Failed=%x.\n", rval);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (IS_QLA27XX(ha)) {</div><div class='add'>+		if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			if (mcp-&gt;mb[2] == 6 || mcp-&gt;mb[3] == 2)</div><div class='ctx'> 				ql_dbg(ql_dbg_mbx, vha, 0x119e,</div><div class='ctx'> 				    "Invalid SFP/Validation Failed\n");</div><div class='hunk'>@@ -2859,7 +2886,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha)</div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_GET_RESOURCE_COUNTS;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='ctx'> 	mcp-&gt;in_mb = MBX_11|MBX_10|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='del'>-	if (IS_QLA81XX(vha-&gt;hw) || IS_QLA83XX(vha-&gt;hw) || IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	if (IS_QLA81XX(ha) || IS_QLA83XX(ha) ||</div><div class='add'>+	    IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_12;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='hunk'>@@ -2884,7 +2912,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;orig_fw_iocb_count = mcp-&gt;mb[10];</div><div class='ctx'> 		if (ha-&gt;flags.npiv_supported)</div><div class='ctx'> 			ha-&gt;max_npiv_vports = mcp-&gt;mb[11];</div><div class='del'>-		if (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+		if (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+		    IS_QLA28XX(ha))</div><div class='ctx'> 			ha-&gt;fw_max_fcf_count = mcp-&gt;mb[12];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3248,7 +3277,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,</div><div class='ctx'> </div><div class='ctx'> 	/* Issue marker IOCB. */</div><div class='ctx'> 	rval2 = qla2x00_marker(vha, ha-&gt;base_qpair, fcport-&gt;loop_id, l,</div><div class='del'>-	    type == TCF_LUN_RESET ? MK_SYNC_ID_LUN: MK_SYNC_ID);</div><div class='add'>+	    type == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);</div><div class='ctx'> 	if (rval2 != QLA_SUCCESS) {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x1099,</div><div class='ctx'> 		    "Failed to issue marker IOCB (%x).\n", rval2);</div><div class='hunk'>@@ -3323,7 +3352,7 @@ qla2x00_write_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t data)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA25XX(vha-&gt;hw) &amp;&amp; !IS_QLA2031(vha-&gt;hw) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	    !IS_QLA27XX(vha-&gt;hw) &amp;&amp; !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1182,</div><div class='hunk'>@@ -3362,7 +3391,7 @@ qla2x00_read_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t *data)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA25XX(vha-&gt;hw) &amp;&amp; !IS_QLA2031(vha-&gt;hw) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	    !IS_QLA27XX(vha-&gt;hw) &amp;&amp; !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1185,</div><div class='hunk'>@@ -3631,7 +3660,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,</div><div class='ctx'> 	    "Entered %s.\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA25XX(vha-&gt;hw) &amp;&amp; !IS_QLA81XX(vha-&gt;hw) &amp;&amp;</div><div class='del'>-	    !IS_QLA83XX(vha-&gt;hw) &amp;&amp; !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	    !IS_QLA83XX(vha-&gt;hw) &amp;&amp; !IS_QLA27XX(vha-&gt;hw) &amp;&amp;</div><div class='add'>+	    !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(pci_channel_offline(vha-&gt;hw-&gt;pdev)))</div><div class='hunk'>@@ -3744,7 +3774,7 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,</div><div class='ctx'> 	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='ctx'> </div><div class='ctx'> 	/* Return mailbox statuses. */</div><div class='del'>-	if (mb != NULL) {</div><div class='add'>+	if (mb) {</div><div class='ctx'> 		mb[0] = mcp-&gt;mb[0];</div><div class='ctx'> 		mb[1] = mcp-&gt;mb[1];</div><div class='ctx'> 		mb[3] = mcp-&gt;mb[3];</div><div class='hunk'>@@ -3779,7 +3809,7 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,</div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_PORT_PARAMS;</div><div class='ctx'> 	mcp-&gt;mb[1] = loop_id;</div><div class='ctx'> 	mcp-&gt;mb[2] = BIT_0;</div><div class='del'>-	mcp-&gt;mb[3] = port_speed &amp; (BIT_5|BIT_4|BIT_3|BIT_2|BIT_1|BIT_0);</div><div class='add'>+	mcp-&gt;mb[3] = port_speed &amp; 0x3F;</div><div class='ctx'> 	mcp-&gt;mb[9] = vha-&gt;vp_idx;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_9|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='ctx'> 	mcp-&gt;in_mb = MBX_3|MBX_1|MBX_0;</div><div class='hunk'>@@ -3788,7 +3818,7 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,</div><div class='ctx'> 	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='ctx'> </div><div class='ctx'> 	/* Return mailbox statuses. */</div><div class='del'>-	if (mb != NULL) {</div><div class='add'>+	if (mb) {</div><div class='ctx'> 		mb[0] = mcp-&gt;mb[0];</div><div class='ctx'> 		mb[1] = mcp-&gt;mb[1];</div><div class='ctx'> 		mb[3] = mcp-&gt;mb[3];</div><div class='hunk'>@@ -4230,7 +4260,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111c,</div><div class='ctx'> 		    "Dump of Verify Request.\n");</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111e,</div><div class='del'>-		    (uint8_t *)mn, sizeof(*mn));</div><div class='add'>+		    mn, sizeof(*mn));</div><div class='ctx'> </div><div class='ctx'> 		rval = qla2x00_issue_iocb_timeout(vha, mn, mn_dma, 0, 120);</div><div class='ctx'> 		if (rval != QLA_SUCCESS) {</div><div class='hunk'>@@ -4242,7 +4272,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1110,</div><div class='ctx'> 		    "Dump of Verify Response.\n");</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1118,</div><div class='del'>-		    (uint8_t *)mn, sizeof(*mn));</div><div class='add'>+		    mn, sizeof(*mn));</div><div class='ctx'> </div><div class='ctx'> 		status[0] = le16_to_cpu(mn-&gt;p.rsp.comp_status);</div><div class='ctx'> 		status[1] = status[0] == CS_VCS_CHIP_FAILURE ?</div><div class='hunk'>@@ -4318,7 +4348,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)</div><div class='ctx'> 	mcp-&gt;mb[12] = req-&gt;qos;</div><div class='ctx'> 	mcp-&gt;mb[11] = req-&gt;vp_idx;</div><div class='ctx'> 	mcp-&gt;mb[13] = req-&gt;rid;</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;mb[15] = 0;</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[4] = req-&gt;id;</div><div class='hunk'>@@ -4332,9 +4362,10 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)</div><div class='ctx'> 	mcp-&gt;flags = MBX_DMA_OUT;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS * 2;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_1;</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 		mcp-&gt;out_mb |= MBX_15;</div><div class='ctx'> 		/* debug q create issue in SR-IOV */</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_9 | MBX_8 | MBX_7;</div><div class='hunk'>@@ -4343,7 +4374,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)</div><div class='ctx'> 	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	if (!(req-&gt;options &amp; BIT_0)) {</div><div class='ctx'> 		WRT_REG_DWORD(req-&gt;req_q_in, 0);</div><div class='del'>-		if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+		if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 			WRT_REG_DWORD(req-&gt;req_q_out, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='hunk'>@@ -4387,7 +4418,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)</div><div class='ctx'> 	mcp-&gt;mb[5] = rsp-&gt;length;</div><div class='ctx'> 	mcp-&gt;mb[14] = rsp-&gt;msix-&gt;entry;</div><div class='ctx'> 	mcp-&gt;mb[13] = rsp-&gt;rid;</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;mb[15] = 0;</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[4] = rsp-&gt;id;</div><div class='hunk'>@@ -4404,7 +4435,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)</div><div class='ctx'> 	if (IS_QLA81XX(ha)) {</div><div class='ctx'> 		mcp-&gt;out_mb |= MBX_12|MBX_11|MBX_10;</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_1;</div><div class='del'>-	} else if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	} else if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 		mcp-&gt;out_mb |= MBX_15|MBX_12|MBX_11|MBX_10;</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_1;</div><div class='ctx'> 		/* debug q create issue in SR-IOV */</div><div class='hunk'>@@ -4414,7 +4445,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)</div><div class='ctx'> 	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	if (!(rsp-&gt;options &amp; BIT_0)) {</div><div class='ctx'> 		WRT_REG_DWORD(rsp-&gt;rsp_q_out, 0);</div><div class='del'>-		if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+		if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 			WRT_REG_DWORD(rsp-&gt;rsp_q_in, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4472,7 +4503,7 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)</div><div class='ctx'> 	    "Entered %s.\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA81XX(vha-&gt;hw) &amp;&amp; !IS_QLA83XX(vha-&gt;hw) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	    !IS_QLA27XX(vha-&gt;hw) &amp;&amp; !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_FLASH_ACCESS_CTRL;</div><div class='hunk'>@@ -4504,7 +4535,7 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA81XX(vha-&gt;hw) &amp;&amp; !IS_QLA83XX(vha-&gt;hw) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	    !IS_QLA27XX(vha-&gt;hw) &amp;&amp; !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10df,</div><div class='hunk'>@@ -4539,7 +4570,7 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA81XX(vha-&gt;hw) &amp;&amp; !IS_QLA83XX(vha-&gt;hw) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	    !IS_QLA27XX(vha-&gt;hw) &amp;&amp; !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,</div><div class='hunk'>@@ -4570,6 +4601,42 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='add'>+qla81xx_fac_semaphore_access(scsi_qla_host_t *vha, int lock)</div><div class='add'>+{</div><div class='add'>+	int rval = QLA_SUCCESS;</div><div class='add'>+	mbx_cmd_t mc;</div><div class='add'>+	mbx_cmd_t *mcp = &amp;mc;</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		return rval;</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,</div><div class='add'>+	    "Entered %s.\n", __func__);</div><div class='add'>+</div><div class='add'>+	mcp-&gt;mb[0] = MBC_FLASH_ACCESS_CTRL;</div><div class='add'>+	mcp-&gt;mb[1] = (lock ? FAC_OPT_CMD_LOCK_SEMAPHORE :</div><div class='add'>+	    FAC_OPT_CMD_UNLOCK_SEMAPHORE);</div><div class='add'>+	mcp-&gt;out_mb = MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='add'>+	mcp-&gt;flags = 0;</div><div class='add'>+	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql_dbg(ql_dbg_mbx, vha, 0x10e3,</div><div class='add'>+		    "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",</div><div class='add'>+		    rval, mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2]);</div><div class='add'>+	} else {</div><div class='add'>+		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e4,</div><div class='add'>+		    "Done %s.\n", __func__);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='ctx'> qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	int rval = 0;</div><div class='hunk'>@@ -4818,10 +4885,10 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x10e9,</div><div class='ctx'> 		    "Failed=%x mb[0]=%x.\n", rval, mcp-&gt;mb[0]);</div><div class='del'>-		if (mcp-&gt;mb[0] == MBS_COMMAND_ERROR &amp;&amp;</div><div class='del'>-		    mcp-&gt;mb[1] == 0x22)</div><div class='add'>+		if (mcp-&gt;mb[0] == MBS_COMMAND_ERROR &amp;&amp; mcp-&gt;mb[1] == 0x22) {</div><div class='ctx'> 			/* sfp is not there */</div><div class='ctx'> 			rval = QLA_INTERFACE_ERROR;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,</div><div class='ctx'> 		    "Done %s.\n", __func__);</div><div class='hunk'>@@ -5161,13 +5228,14 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)</div><div class='ctx'> 	mcp-&gt;mb[3] = MSW(data);</div><div class='ctx'> 	mcp-&gt;mb[8] = MSW(risc_addr);</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_8|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='del'>-	mcp-&gt;in_mb = MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_1|MBX_0;</div><div class='ctx'> 	mcp-&gt;tov = 30;</div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='ctx'> 	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, vha, 0x1101,</div><div class='del'>-		    "Failed=%x mb[0]=%x.\n", rval, mcp-&gt;mb[0]);</div><div class='add'>+		    "Failed=%x mb[0]=%x mb[1]=%x.\n",</div><div class='add'>+		    rval, mcp-&gt;mb[0], mcp-&gt;mb[1]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1102,</div><div class='ctx'> 		    "Done %s.\n", __func__);</div><div class='hunk'>@@ -5278,7 +5346,7 @@ qla2x00_set_data_rate(scsi_qla_host_t *vha, uint16_t mode)</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;out_mb = MBX_2|MBX_1|MBX_0;</div><div class='ctx'> 	mcp-&gt;in_mb = MBX_2|MBX_1|MBX_0;</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_4|MBX_3;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='hunk'>@@ -5316,7 +5384,7 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)</div><div class='ctx'> 	mcp-&gt;mb[1] = QLA_GET_DATA_RATE;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_1|MBX_0;</div><div class='ctx'> 	mcp-&gt;in_mb = MBX_2|MBX_1|MBX_0;</div><div class='del'>-	if (IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		mcp-&gt;in_mb |= MBX_3;</div><div class='ctx'> 	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='ctx'> 	mcp-&gt;flags = 0;</div><div class='hunk'>@@ -5346,7 +5414,7 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)</div><div class='ctx'> 	    "Entered %s.\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp; !IS_QLA8044(ha) &amp;&amp;</div><div class='del'>-	    !IS_QLA27XX(ha))</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_GET_PORT_CONFIG;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='hunk'>@@ -5662,6 +5730,7 @@ qla8044_md_get_template(scsi_qla_host_t *vha)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> 	int rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 	int offset = 0, size = MINIDUMP_SIZE_36K;</div><div class='add'>+</div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0xb11f,</div><div class='ctx'> 	    "Entered %s.\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -5842,7 +5911,7 @@ qla83xx_wr_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)</div><div class='ctx'> 	mbx_cmd_t mc;</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1130,</div><div class='hunk'>@@ -5917,7 +5986,7 @@ qla83xx_rd_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t *data)</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	unsigned long retry_max_time = jiffies + (2 * HZ);</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx, vha, 0x114b, "Entered %s.\n", __func__);</div><div class='hunk'>@@ -5967,7 +6036,7 @@ qla83xx_restart_nic_firmware(scsi_qla_host_t *vha)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA83XX(ha))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx, vha, 0x1143, "Entered %s.\n", __func__);</div><div class='hunk'>@@ -6101,7 +6170,8 @@ qla26xx_dport_diagnostics(scsi_qla_host_t *vha,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> 	dma_addr_t dd_dma;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(vha-&gt;hw) &amp;&amp; !IS_QLA27XX(vha-&gt;hw))</div><div class='add'>+	if (!IS_QLA83XX(vha-&gt;hw) &amp;&amp; !IS_QLA27XX(vha-&gt;hw) &amp;&amp;</div><div class='add'>+	    !IS_QLA28XX(vha-&gt;hw))</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x119f,</div><div class='hunk'>@@ -6318,7 +6388,13 @@ int __qla24xx_parse_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport,</div><div class='ctx'> 	fcport-&gt;d_id.b.rsvd_1 = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fcport-&gt;fc4f_nvme) {</div><div class='del'>-		fcport-&gt;port_type = FCT_NVME;</div><div class='add'>+		fcport-&gt;port_type = 0;</div><div class='add'>+		if ((pd-&gt;prli_svc_param_word_3[0] &amp; BIT_5) == 0)</div><div class='add'>+			fcport-&gt;port_type |= FCT_NVME_INITIATOR;</div><div class='add'>+		if ((pd-&gt;prli_svc_param_word_3[0] &amp; BIT_4) == 0)</div><div class='add'>+			fcport-&gt;port_type |= FCT_NVME_TARGET;</div><div class='add'>+		if ((pd-&gt;prli_svc_param_word_3[0] &amp; BIT_3) == 0)</div><div class='add'>+			fcport-&gt;port_type |= FCT_NVME_DISCOVERY;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* If not target must be initiator or unknown type. */</div><div class='ctx'> 		if ((pd-&gt;prli_svc_param_word_3[0] &amp; BIT_4) == 0)</div><div class='hunk'>@@ -6507,3 +6583,101 @@ int qla24xx_res_count_wait(struct scsi_qla_host *vha,</div><div class='ctx'> done:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int qla28xx_secure_flash_update(scsi_qla_host_t *vha, uint16_t opts,</div><div class='add'>+    uint16_t region, uint32_t len, dma_addr_t sfub_dma_addr,</div><div class='add'>+    uint32_t sfub_len)</div><div class='add'>+{</div><div class='add'>+	int		rval;</div><div class='add'>+	mbx_cmd_t mc;</div><div class='add'>+	mbx_cmd_t *mcp = &amp;mc;</div><div class='add'>+</div><div class='add'>+	mcp-&gt;mb[0] = MBC_SECURE_FLASH_UPDATE;</div><div class='add'>+	mcp-&gt;mb[1] = opts;</div><div class='add'>+	mcp-&gt;mb[2] = region;</div><div class='add'>+	mcp-&gt;mb[3] = MSW(len);</div><div class='add'>+	mcp-&gt;mb[4] = LSW(len);</div><div class='add'>+	mcp-&gt;mb[5] = MSW(sfub_dma_addr);</div><div class='add'>+	mcp-&gt;mb[6] = LSW(sfub_dma_addr);</div><div class='add'>+	mcp-&gt;mb[7] = MSW(MSD(sfub_dma_addr));</div><div class='add'>+	mcp-&gt;mb[8] = LSW(MSD(sfub_dma_addr));</div><div class='add'>+	mcp-&gt;mb[9] = sfub_len;</div><div class='add'>+	mcp-&gt;out_mb =</div><div class='add'>+	    MBX_9|MBX_8|MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_2|MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='add'>+	mcp-&gt;flags = 0;</div><div class='add'>+	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql_dbg(ql_dbg_mbx, vha, 0xffff, "%s(%ld): failed rval 0x%x, %x %x %x",</div><div class='add'>+			__func__, vha-&gt;host_no, rval, mcp-&gt;mb[0], mcp-&gt;mb[1],</div><div class='add'>+			mcp-&gt;mb[2]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qla2xxx_write_remote_register(scsi_qla_host_t *vha, uint32_t addr,</div><div class='add'>+    uint32_t data)</div><div class='add'>+{</div><div class='add'>+	int rval;</div><div class='add'>+	mbx_cmd_t mc;</div><div class='add'>+	mbx_cmd_t *mcp = &amp;mc;</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,</div><div class='add'>+	    "Entered %s.\n", __func__);</div><div class='add'>+</div><div class='add'>+	mcp-&gt;mb[0] = MBC_WRITE_REMOTE_REG;</div><div class='add'>+	mcp-&gt;mb[1] = LSW(addr);</div><div class='add'>+	mcp-&gt;mb[2] = MSW(addr);</div><div class='add'>+	mcp-&gt;mb[3] = LSW(data);</div><div class='add'>+	mcp-&gt;mb[4] = MSW(data);</div><div class='add'>+	mcp-&gt;out_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='add'>+	mcp-&gt;flags = 0;</div><div class='add'>+	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql_dbg(ql_dbg_mbx, vha, 0x10e9,</div><div class='add'>+		    "Failed=%x mb[0]=%x.\n", rval, mcp-&gt;mb[0]);</div><div class='add'>+	} else {</div><div class='add'>+		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,</div><div class='add'>+		    "Done %s.\n", __func__);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qla2xxx_read_remote_register(scsi_qla_host_t *vha, uint32_t addr,</div><div class='add'>+    uint32_t *data)</div><div class='add'>+{</div><div class='add'>+	int rval;</div><div class='add'>+	mbx_cmd_t mc;</div><div class='add'>+	mbx_cmd_t *mcp = &amp;mc;</div><div class='add'>+</div><div class='add'>+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,</div><div class='add'>+	    "Entered %s.\n", __func__);</div><div class='add'>+</div><div class='add'>+	mcp-&gt;mb[0] = MBC_READ_REMOTE_REG;</div><div class='add'>+	mcp-&gt;mb[1] = LSW(addr);</div><div class='add'>+	mcp-&gt;mb[2] = MSW(addr);</div><div class='add'>+	mcp-&gt;out_mb = MBX_2|MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;tov = MBX_TOV_SECONDS;</div><div class='add'>+	mcp-&gt;flags = 0;</div><div class='add'>+	rval = qla2x00_mailbox_command(vha, mcp);</div><div class='add'>+</div><div class='add'>+	*data = (uint32_t)((((uint32_t)mcp-&gt;mb[4]) &lt;&lt; 16) | mcp-&gt;mb[3]);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql_dbg(ql_dbg_mbx, vha, 0x10e9,</div><div class='add'>+		    "Failed=%x mb[0]=%x.\n", rval, mcp-&gt;mb[0]);</div><div class='add'>+	} else {</div><div class='add'>+		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,</div><div class='add'>+		    "Done %s.\n", __func__);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c<br/>index 099d8e9851cb..b2977e49356b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mid.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mid.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_mid.c</a></div><div class='hunk'>@@ -905,7 +905,8 @@ static void qla_ctrlvp_sp_done(void *s, int res)</div><div class='ctx'> {</div><div class='ctx'> 	struct srb *sp = s;</div><div class='ctx'> </div><div class='del'>-	complete(&amp;sp-&gt;comp);</div><div class='add'>+	if (sp-&gt;comp)</div><div class='add'>+		complete(sp-&gt;comp);</div><div class='ctx'> 	/* don't free sp here. Let the caller do the free */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -922,6 +923,7 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	int	vp_index = vha-&gt;vp_idx;</div><div class='ctx'> 	struct scsi_qla_host *base_vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(comp);</div><div class='ctx'> 	srb_t *sp;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_vport, vha, 0x10c1,</div><div class='hunk'>@@ -936,6 +938,7 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;type = SRB_CTRL_VP;</div><div class='ctx'> 	sp-&gt;name = "ctrl_vp";</div><div class='add'>+	sp-&gt;comp = &amp;comp;</div><div class='ctx'> 	sp-&gt;done = qla_ctrlvp_sp_done;</div><div class='ctx'> 	sp-&gt;u.iocb_cmd.timeout = qla2x00_async_iocb_timeout;</div><div class='ctx'> 	qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);</div><div class='hunk'>@@ -953,7 +956,9 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)</div><div class='ctx'> 	ql_dbg(ql_dbg_vport, vha, 0x113f, "%s hndl %x submitted\n",</div><div class='ctx'> 	    sp-&gt;name, sp-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	wait_for_completion(&amp;sp-&gt;comp);</div><div class='add'>+	wait_for_completion(&amp;comp);</div><div class='add'>+	sp-&gt;comp = NULL;</div><div class='add'>+</div><div class='ctx'> 	rval = sp-&gt;rc;</div><div class='ctx'> 	switch (rval) {</div><div class='ctx'> 	case QLA_FUNCTION_TIMEOUT:</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c<br/>index 60f964c53c01..942ee13b96a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_mr.c</a></div><div class='hunk'>@@ -273,9 +273,9 @@ premature_exit:</div><div class='ctx'> </div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		ql_log(ql_log_warn, base_vha, 0x1163,</div><div class='del'>-		    "**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, "</div><div class='del'>-		    "mb[3]=%x, cmd=%x ****.\n",</div><div class='del'>-		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2], mcp-&gt;mb[3], command);</div><div class='add'>+		       "**** Failed=%x mbx[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x, cmd=%x ****.\n",</div><div class='add'>+		       rval, mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2], mcp-&gt;mb[3],</div><div class='add'>+		       command);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_mbx, base_vha, 0x1164, "Done %s.\n", __func__);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -629,17 +629,20 @@ qlafx00_soc_cpu_reset(scsi_qla_host_t *vha)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> qlafx00_soft_reset(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(pci_channel_offline(ha-&gt;pdev) &amp;&amp;</div><div class='ctx'> 	    ha-&gt;flags.pci_channel_io_perm_failure))</div><div class='del'>-		return;</div><div class='add'>+		return rval;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;disable_intrs(ha);</div><div class='ctx'> 	qlafx00_soc_cpu_reset(vha);</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1138,8 +1141,8 @@ qlafx00_find_all_targets(scsi_qla_host_t *vha,</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_disc + ql_dbg_init, vha, 0x2088,</div><div class='ctx'> 	    "Listing Target bit map...\n");</div><div class='del'>-	ql_dump_buffer(ql_dbg_disc + ql_dbg_init, vha,</div><div class='del'>-	    0x2089, (uint8_t *)ha-&gt;gid_list, 32);</div><div class='add'>+	ql_dump_buffer(ql_dbg_disc + ql_dbg_init, vha, 0x2089,</div><div class='add'>+	    ha-&gt;gid_list, 32);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate temporary rmtport for any new rmtports discovered. */</div><div class='ctx'> 	new_fcport = qla2x00_alloc_fcport(vha, GFP_KERNEL);</div><div class='hunk'>@@ -1320,6 +1323,7 @@ qlafx00_configure_devices(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	int  rval;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	flags = vha-&gt;dpc_flags;</div><div class='hunk'>@@ -1913,8 +1917,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)</div><div class='ctx'> 			    phost_info-&gt;domainname,</div><div class='ctx'> 			    phost_info-&gt;hostdriver);</div><div class='ctx'> 			ql_dump_buffer(ql_dbg_init + ql_dbg_disc, vha, 0x014d,</div><div class='del'>-			    (uint8_t *)phost_info,</div><div class='del'>-			    sizeof(struct host_system_info));</div><div class='add'>+			    phost_info, sizeof(*phost_info));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1968,7 +1971,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)</div><div class='ctx'> 		vha-&gt;d_id.b.al_pa = pinfo-&gt;port_id[2];</div><div class='ctx'> 		qlafx00_update_host_attr(vha, pinfo);</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0141,</div><div class='del'>-		    (uint8_t *)pinfo, 16);</div><div class='add'>+		    pinfo, 16);</div><div class='ctx'> 	} else if (fx_type == FXDISC_GET_TGT_NODE_INFO) {</div><div class='ctx'> 		struct qlafx00_tgt_node_info *pinfo =</div><div class='ctx'> 		    (struct qlafx00_tgt_node_info *) fdisc-&gt;u.fxiocb.rsp_addr;</div><div class='hunk'>@@ -1976,12 +1979,12 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)</div><div class='ctx'> 		memcpy(fcport-&gt;port_name, pinfo-&gt;tgt_node_wwpn, WWN_SIZE);</div><div class='ctx'> 		fcport-&gt;port_type = FCT_TARGET;</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0144,</div><div class='del'>-		    (uint8_t *)pinfo, 16);</div><div class='add'>+		    pinfo, 16);</div><div class='ctx'> 	} else if (fx_type == FXDISC_GET_TGT_NODE_LIST) {</div><div class='ctx'> 		struct qlafx00_tgt_node_info *pinfo =</div><div class='ctx'> 		    (struct qlafx00_tgt_node_info *) fdisc-&gt;u.fxiocb.rsp_addr;</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0146,</div><div class='del'>-		    (uint8_t *)pinfo, 16);</div><div class='add'>+		    pinfo, 16);</div><div class='ctx'> 		memcpy(vha-&gt;hw-&gt;gid_list, pinfo, QLAFX00_TGT_NODE_LIST_SIZE);</div><div class='ctx'> 	} else if (fx_type == FXDISC_ABORT_IOCTL)</div><div class='ctx'> 		fdisc-&gt;u.fxiocb.result =</div><div class='hunk'>@@ -2248,18 +2251,16 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> </div><div class='ctx'> 		fw_sts_ptr = bsg_job-&gt;reply + sizeof(struct fc_bsg_reply);</div><div class='ctx'> </div><div class='del'>-		memcpy(fw_sts_ptr, (uint8_t *)&amp;fstatus,</div><div class='del'>-		    sizeof(struct qla_mt_iocb_rsp_fx00));</div><div class='add'>+		memcpy(fw_sts_ptr, &amp;fstatus, sizeof(fstatus));</div><div class='ctx'> 		bsg_job-&gt;reply_len = sizeof(struct fc_bsg_reply) +</div><div class='ctx'> 			sizeof(struct qla_mt_iocb_rsp_fx00) + sizeof(uint8_t);</div><div class='ctx'> </div><div class='ctx'> 		ql_dump_buffer(ql_dbg_user + ql_dbg_verbose,</div><div class='del'>-		    sp-&gt;fcport-&gt;vha, 0x5080,</div><div class='del'>-		    (uint8_t *)pkt, sizeof(struct ioctl_iocb_entry_fx00));</div><div class='add'>+		    sp-&gt;vha, 0x5080, pkt, sizeof(*pkt));</div><div class='ctx'> </div><div class='ctx'> 		ql_dump_buffer(ql_dbg_user + ql_dbg_verbose,</div><div class='del'>-		    sp-&gt;fcport-&gt;vha, 0x5074,</div><div class='del'>-		    (uint8_t *)fw_sts_ptr, sizeof(struct qla_mt_iocb_rsp_fx00));</div><div class='add'>+		    sp-&gt;vha, 0x5074,</div><div class='add'>+		    fw_sts_ptr, sizeof(fstatus));</div><div class='ctx'> </div><div class='ctx'> 		res = bsg_reply-&gt;result = DID_OK &lt;&lt; 16;</div><div class='ctx'> 		bsg_reply-&gt;reply_payload_rcv_len =</div><div class='hunk'>@@ -2597,7 +2598,7 @@ qlafx00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)</div><div class='ctx'> </div><div class='ctx'> 		/* Move sense data. */</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x304e,</div><div class='del'>-		    (uint8_t *)pkt, sizeof(sts_cont_entry_t));</div><div class='add'>+		    pkt, sizeof(*pkt));</div><div class='ctx'> 		memcpy(sense_ptr, pkt-&gt;data, sense_sz);</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x304a,</div><div class='ctx'> 		    sense_ptr, sense_sz);</div><div class='hunk'>@@ -2992,7 +2993,7 @@ qlafx00_build_scsi_iocbs(srb_t *sp, struct cmd_type_7_fx00 *cmd_pkt,</div><div class='ctx'> 			 uint16_t tot_dsds, struct cmd_type_7_fx00 *lcmd_pkt)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t	avail_dsds;</div><div class='del'>-	__le32 *cur_dsd;</div><div class='add'>+	struct dsd64	*cur_dsd;</div><div class='ctx'> 	scsi_qla_host_t	*vha;</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -3028,12 +3029,10 @@ qlafx00_build_scsi_iocbs(srb_t *sp, struct cmd_type_7_fx00 *cmd_pkt,</div><div class='ctx'> </div><div class='ctx'> 	/* One DSD is available in the Command Type 3 IOCB */</div><div class='ctx'> 	avail_dsds = 1;</div><div class='del'>-	cur_dsd = (__le32 *)&amp;lcmd_pkt-&gt;dseg_0_address;</div><div class='add'>+	cur_dsd = &amp;lcmd_pkt-&gt;dsd;</div><div class='ctx'> </div><div class='ctx'> 	/* Load data segments */</div><div class='ctx'> 	scsi_for_each_sg(cmd, sg, tot_dsds, i) {</div><div class='del'>-		dma_addr_t	sle_dma;</div><div class='del'>-</div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='ctx'> 		if (avail_dsds == 0) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3043,26 +3042,23 @@ qlafx00_build_scsi_iocbs(srb_t *sp, struct cmd_type_7_fx00 *cmd_pkt,</div><div class='ctx'> 			memset(&amp;lcont_pkt, 0, REQUEST_ENTRY_SIZE);</div><div class='ctx'> 			cont_pkt =</div><div class='ctx'> 			    qlafx00_prep_cont_type1_iocb(req, &amp;lcont_pkt);</div><div class='del'>-			cur_dsd = (__le32 *)lcont_pkt.dseg_0_address;</div><div class='add'>+			cur_dsd = lcont_pkt.dsd;</div><div class='ctx'> 			avail_dsds = 5;</div><div class='ctx'> 			cont = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 		if (avail_dsds == 0 &amp;&amp; cont == 1) {</div><div class='ctx'> 			cont = 0;</div><div class='ctx'> 			memcpy_toio((void __iomem *)cont_pkt, &amp;lcont_pkt,</div><div class='del'>-			    REQUEST_ENTRY_SIZE);</div><div class='add'>+			    sizeof(lcont_pkt));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> 	if (avail_dsds != 0 &amp;&amp; cont == 1) {</div><div class='ctx'> 		memcpy_toio((void __iomem *)cont_pkt, &amp;lcont_pkt,</div><div class='del'>-		    REQUEST_ENTRY_SIZE);</div><div class='add'>+		    sizeof(lcont_pkt));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3172,9 +3168,9 @@ qlafx00_start_scsi(srb_t *sp)</div><div class='ctx'> 	lcmd_pkt.entry_status = (uint8_t) rsp-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302e,</div><div class='del'>-	    (uint8_t *)cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='add'>+	    cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='ctx'> 	ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x3032,</div><div class='del'>-	    (uint8_t *)&amp;lcmd_pkt, REQUEST_ENTRY_SIZE);</div><div class='add'>+	    &amp;lcmd_pkt, sizeof(lcmd_pkt));</div><div class='ctx'> </div><div class='ctx'> 	memcpy_toio((void __iomem *)cmd_pkt, &amp;lcmd_pkt, REQUEST_ENTRY_SIZE);</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -3282,11 +3278,9 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 			fx_iocb.req_dsdcnt = cpu_to_le16(1);</div><div class='ctx'> 			fx_iocb.req_xfrcnt =</div><div class='ctx'> 			    cpu_to_le16(fxio-&gt;u.fxiocb.req_len);</div><div class='del'>-			fx_iocb.dseg_rq_address[0] =</div><div class='del'>-			    cpu_to_le32(LSD(fxio-&gt;u.fxiocb.req_dma_handle));</div><div class='del'>-			fx_iocb.dseg_rq_address[1] =</div><div class='del'>-			    cpu_to_le32(MSD(fxio-&gt;u.fxiocb.req_dma_handle));</div><div class='del'>-			fx_iocb.dseg_rq_len =</div><div class='add'>+			put_unaligned_le64(fxio-&gt;u.fxiocb.req_dma_handle,</div><div class='add'>+					   &amp;fx_iocb.dseg_rq.address);</div><div class='add'>+			fx_iocb.dseg_rq.length =</div><div class='ctx'> 			    cpu_to_le32(fxio-&gt;u.fxiocb.req_len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3294,11 +3288,9 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 			fx_iocb.rsp_dsdcnt = cpu_to_le16(1);</div><div class='ctx'> 			fx_iocb.rsp_xfrcnt =</div><div class='ctx'> 			    cpu_to_le16(fxio-&gt;u.fxiocb.rsp_len);</div><div class='del'>-			fx_iocb.dseg_rsp_address[0] =</div><div class='del'>-			    cpu_to_le32(LSD(fxio-&gt;u.fxiocb.rsp_dma_handle));</div><div class='del'>-			fx_iocb.dseg_rsp_address[1] =</div><div class='del'>-			    cpu_to_le32(MSD(fxio-&gt;u.fxiocb.rsp_dma_handle));</div><div class='del'>-			fx_iocb.dseg_rsp_len =</div><div class='add'>+			put_unaligned_le64(fxio-&gt;u.fxiocb.rsp_dma_handle,</div><div class='add'>+					   &amp;fx_iocb.dseg_rsp.address);</div><div class='add'>+			fx_iocb.dseg_rsp.length =</div><div class='ctx'> 			    cpu_to_le32(fxio-&gt;u.fxiocb.rsp_len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3308,6 +3300,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 		fx_iocb.flags = fxio-&gt;u.fxiocb.flags;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct scatterlist *sg;</div><div class='add'>+</div><div class='ctx'> 		bsg_job = sp-&gt;u.bsg_job;</div><div class='ctx'> 		bsg_request = bsg_job-&gt;request;</div><div class='ctx'> 		piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)</div><div class='hunk'>@@ -3327,19 +3320,17 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 			int avail_dsds, tot_dsds;</div><div class='ctx'> 			cont_a64_entry_t lcont_pkt;</div><div class='ctx'> 			cont_a64_entry_t *cont_pkt = NULL;</div><div class='del'>-			__le32 *cur_dsd;</div><div class='add'>+			struct dsd64 *cur_dsd;</div><div class='ctx'> 			int index = 0, cont = 0;</div><div class='ctx'> </div><div class='ctx'> 			fx_iocb.req_dsdcnt =</div><div class='ctx'> 			    cpu_to_le16(bsg_job-&gt;request_payload.sg_cnt);</div><div class='ctx'> 			tot_dsds =</div><div class='ctx'> 			    bsg_job-&gt;request_payload.sg_cnt;</div><div class='del'>-			cur_dsd = (__le32 *)&amp;fx_iocb.dseg_rq_address[0];</div><div class='add'>+			cur_dsd = &amp;fx_iocb.dseg_rq;</div><div class='ctx'> 			avail_dsds = 1;</div><div class='ctx'> 			for_each_sg(bsg_job-&gt;request_payload.sg_list, sg,</div><div class='ctx'> 			    tot_dsds, index) {</div><div class='del'>-				dma_addr_t sle_dma;</div><div class='del'>-</div><div class='ctx'> 				/* Allocate additional continuation packets? */</div><div class='ctx'> 				if (avail_dsds == 0) {</div><div class='ctx'> 					/*</div><div class='hunk'>@@ -3351,17 +3342,13 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 					cont_pkt =</div><div class='ctx'> 					    qlafx00_prep_cont_type1_iocb(</div><div class='ctx'> 						sp-&gt;vha-&gt;req, &amp;lcont_pkt);</div><div class='del'>-					cur_dsd = (__le32 *)</div><div class='del'>-					    lcont_pkt.dseg_0_address;</div><div class='add'>+					cur_dsd = lcont_pkt.dsd;</div><div class='ctx'> 					avail_dsds = 5;</div><div class='ctx'> 					cont = 1;</div><div class='ctx'> 					entry_cnt++;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				sle_dma = sg_dma_address(sg);</div><div class='del'>-				*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-				*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-				*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+				append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 				avail_dsds--;</div><div class='ctx'> </div><div class='ctx'> 				if (avail_dsds == 0 &amp;&amp; cont == 1) {</div><div class='hunk'>@@ -3389,19 +3376,17 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 			int avail_dsds, tot_dsds;</div><div class='ctx'> 			cont_a64_entry_t lcont_pkt;</div><div class='ctx'> 			cont_a64_entry_t *cont_pkt = NULL;</div><div class='del'>-			__le32 *cur_dsd;</div><div class='add'>+			struct dsd64 *cur_dsd;</div><div class='ctx'> 			int index = 0, cont = 0;</div><div class='ctx'> </div><div class='ctx'> 			fx_iocb.rsp_dsdcnt =</div><div class='ctx'> 			   cpu_to_le16(bsg_job-&gt;reply_payload.sg_cnt);</div><div class='ctx'> 			tot_dsds = bsg_job-&gt;reply_payload.sg_cnt;</div><div class='del'>-			cur_dsd = (__le32 *)&amp;fx_iocb.dseg_rsp_address[0];</div><div class='add'>+			cur_dsd = &amp;fx_iocb.dseg_rsp;</div><div class='ctx'> 			avail_dsds = 1;</div><div class='ctx'> </div><div class='ctx'> 			for_each_sg(bsg_job-&gt;reply_payload.sg_list, sg,</div><div class='ctx'> 			    tot_dsds, index) {</div><div class='del'>-				dma_addr_t sle_dma;</div><div class='del'>-</div><div class='ctx'> 				/* Allocate additional continuation packets? */</div><div class='ctx'> 				if (avail_dsds == 0) {</div><div class='ctx'> 					/*</div><div class='hunk'>@@ -3413,17 +3398,13 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 					cont_pkt =</div><div class='ctx'> 					    qlafx00_prep_cont_type1_iocb(</div><div class='ctx'> 						sp-&gt;vha-&gt;req, &amp;lcont_pkt);</div><div class='del'>-					cur_dsd = (__le32 *)</div><div class='del'>-					    lcont_pkt.dseg_0_address;</div><div class='add'>+					cur_dsd = lcont_pkt.dsd;</div><div class='ctx'> 					avail_dsds = 5;</div><div class='ctx'> 					cont = 1;</div><div class='ctx'> 					entry_cnt++;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				sle_dma = sg_dma_address(sg);</div><div class='del'>-				*cur_dsd++   = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-				*cur_dsd++   = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-				*cur_dsd++   = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+				append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 				avail_dsds--;</div><div class='ctx'> </div><div class='ctx'> 				if (avail_dsds == 0 &amp;&amp; cont == 1) {</div><div class='hunk'>@@ -3454,10 +3435,8 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_dump_buffer(ql_dbg_user + ql_dbg_verbose,</div><div class='del'>-	    sp-&gt;vha, 0x3047,</div><div class='del'>-	    (uint8_t *)&amp;fx_iocb, sizeof(struct fxdisc_entry_fx00));</div><div class='add'>+	    sp-&gt;vha, 0x3047, &amp;fx_iocb, sizeof(fx_iocb));</div><div class='ctx'> </div><div class='del'>-	memcpy_toio((void __iomem *)pfxiocb, &amp;fx_iocb,</div><div class='del'>-	    sizeof(struct fxdisc_entry_fx00));</div><div class='add'>+	memcpy_toio((void __iomem *)pfxiocb, &amp;fx_iocb, sizeof(fx_iocb));</div><div class='ctx'> 	wmb();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mr.h b/drivers/scsi/qla2xxx/qla_mr.h<br/>index aeaa1b40b1fc..4567f0c42486 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mr.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_mr.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_mr.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_mr.h</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'> #ifndef __QLA_MR_H</div><div class='ctx'> #define __QLA_MR_H</div><div class='ctx'> </div><div class='add'>+#include "qla_dsd.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The PCI VendorID and DeviceID for our board.</div><div class='ctx'>  */</div><div class='hunk'>@@ -46,8 +48,7 @@ struct cmd_type_7_fx00 {</div><div class='ctx'> 	uint8_t fcp_cdb[MAX_CMDSZ];	/* SCSI command words. */</div><div class='ctx'> 	__le32 byte_count;		/* Total byte count. */</div><div class='ctx'> </div><div class='del'>-	uint32_t dseg_0_address[2];	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_len;		/* Data segment 0 length. */</div><div class='add'>+	struct dsd64 dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	STATUS_TYPE_FX00	0x01		/* Status entry. */</div><div class='hunk'>@@ -176,10 +177,8 @@ struct fxdisc_entry_fx00 {</div><div class='ctx'> 	uint8_t flags;</div><div class='ctx'> 	uint8_t reserved_1;</div><div class='ctx'> </div><div class='del'>-	__le32 dseg_rq_address[2];	/* Data segment 0 address. */</div><div class='del'>-	__le32 dseg_rq_len;		/* Data segment 0 length. */</div><div class='del'>-	__le32 dseg_rsp_address[2];	/* Data segment 1 address. */</div><div class='del'>-	__le32 dseg_rsp_len;		/* Data segment 1 length. */</div><div class='add'>+	struct dsd64 dseg_rq;</div><div class='add'>+	struct dsd64 dseg_rsp;</div><div class='ctx'> </div><div class='ctx'> 	__le32 dataword;</div><div class='ctx'> 	__le32 adapid;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c<br/>index 41c85da3ab32..22e3fba28e51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nvme.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nvme.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nvme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_nvme.c</a></div><div class='hunk'>@@ -131,14 +131,10 @@ static void qla_nvme_sp_ls_done(void *ptr, int res)</div><div class='ctx'> 	struct nvmefc_ls_req   *fd;</div><div class='ctx'> 	struct nvme_private *priv;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;sp-&gt;ref_count) == 0) {</div><div class='del'>-		ql_log(ql_log_warn, sp-&gt;fcport-&gt;vha, 0x2123,</div><div class='del'>-		    "SP reference-count to ZERO on LS_done -- sp=%p.\n", sp);</div><div class='add'>+	if (WARN_ON_ONCE(atomic_read(&amp;sp-&gt;ref_count) == 0))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!atomic_dec_and_test(&amp;sp-&gt;ref_count))</div><div class='del'>-		return;</div><div class='add'>+	atomic_dec(&amp;sp-&gt;ref_count);</div><div class='ctx'> </div><div class='ctx'> 	if (res)</div><div class='ctx'> 		res = -EINVAL;</div><div class='hunk'>@@ -161,15 +157,18 @@ static void qla_nvme_sp_done(void *ptr, int res)</div><div class='ctx'> 	nvme = &amp;sp-&gt;u.iocb_cmd;</div><div class='ctx'> 	fd = nvme-&gt;u.nvme.desc;</div><div class='ctx'> </div><div class='del'>-	if (!atomic_dec_and_test(&amp;sp-&gt;ref_count))</div><div class='add'>+	if (WARN_ON_ONCE(atomic_read(&amp;sp-&gt;ref_count) == 0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (res == QLA_SUCCESS)</div><div class='del'>-		fd-&gt;status = 0;</div><div class='del'>-	else</div><div class='del'>-		fd-&gt;status = NVME_SC_INTERNAL;</div><div class='add'>+	atomic_dec(&amp;sp-&gt;ref_count);</div><div class='ctx'> </div><div class='del'>-	fd-&gt;rcv_rsplen = nvme-&gt;u.nvme.rsp_pyld_len;</div><div class='add'>+	if (res == QLA_SUCCESS) {</div><div class='add'>+		fd-&gt;rcv_rsplen = nvme-&gt;u.nvme.rsp_pyld_len;</div><div class='add'>+	} else {</div><div class='add'>+		fd-&gt;rcv_rsplen = 0;</div><div class='add'>+		fd-&gt;transferred_length = 0;</div><div class='add'>+	}</div><div class='add'>+	fd-&gt;status = 0;</div><div class='ctx'> 	fd-&gt;done(fd);</div><div class='ctx'> 	qla2xxx_rel_qpair_sp(sp-&gt;qpair, sp);</div><div class='ctx'> </div><div class='hunk'>@@ -185,14 +184,24 @@ static void qla_nvme_abort_work(struct work_struct *work)</div><div class='ctx'> 	struct qla_hw_data *ha = fcport-&gt;vha-&gt;hw;</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='del'>-	if (fcport)</div><div class='del'>-		ql_dbg(ql_dbg_io, fcport-&gt;vha, 0xffff,</div><div class='del'>-		    "%s called for sp=%p, hndl=%x on fcport=%p deleted=%d\n",</div><div class='del'>-		    __func__, sp, sp-&gt;handle, fcport, fcport-&gt;deleted);</div><div class='add'>+	ql_dbg(ql_dbg_io, fcport-&gt;vha, 0xffff,</div><div class='add'>+	       "%s called for sp=%p, hndl=%x on fcport=%p deleted=%d\n",</div><div class='add'>+	       __func__, sp, sp-&gt;handle, fcport, fcport-&gt;deleted);</div><div class='ctx'> </div><div class='ctx'> 	if (!ha-&gt;flags.fw_started &amp;&amp; (fcport &amp;&amp; fcport-&gt;deleted))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (ha-&gt;flags.host_shutting_down) {</div><div class='add'>+		ql_log(ql_log_info, sp-&gt;fcport-&gt;vha, 0xffff,</div><div class='add'>+		    "%s Calling done on sp: %p, type: 0x%x, sp-&gt;ref_count: 0x%x\n",</div><div class='add'>+		    __func__, sp, sp-&gt;type, atomic_read(&amp;sp-&gt;ref_count));</div><div class='add'>+		sp-&gt;done(sp, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(atomic_read(&amp;sp-&gt;ref_count) == 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	rval = ha-&gt;isp_ops-&gt;abort_command(sp);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_io, fcport-&gt;vha, 0x212b,</div><div class='hunk'>@@ -291,7 +300,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)</div><div class='ctx'> 	uint16_t        req_cnt;</div><div class='ctx'> 	uint16_t        tot_dsds;</div><div class='ctx'> 	uint16_t	avail_dsds;</div><div class='del'>-	uint32_t	*cur_dsd;</div><div class='add'>+	struct dsd64	*cur_dsd;</div><div class='ctx'> 	struct req_que *req = NULL;</div><div class='ctx'> 	struct scsi_qla_host *vha = sp-&gt;fcport-&gt;vha;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='hunk'>@@ -340,6 +349,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!fd-&gt;sqid)) {</div><div class='ctx'> 		struct nvme_fc_cmd_iu *cmd = fd-&gt;cmdaddr;</div><div class='add'>+</div><div class='ctx'> 		if (cmd-&gt;sqe.common.opcode == nvme_admin_async_event) {</div><div class='ctx'> 			nvme-&gt;u.nvme.aen_op = 1;</div><div class='ctx'> 			atomic_inc(&amp;ha-&gt;nvme_active_aen_cnt);</div><div class='hunk'>@@ -395,25 +405,22 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)</div><div class='ctx'> </div><div class='ctx'> 	/* NVME RSP IU */</div><div class='ctx'> 	cmd_pkt-&gt;nvme_rsp_dsd_len = cpu_to_le16(fd-&gt;rsplen);</div><div class='del'>-	cmd_pkt-&gt;nvme_rsp_dseg_address[0] = cpu_to_le32(LSD(fd-&gt;rspdma));</div><div class='del'>-	cmd_pkt-&gt;nvme_rsp_dseg_address[1] = cpu_to_le32(MSD(fd-&gt;rspdma));</div><div class='add'>+	put_unaligned_le64(fd-&gt;rspdma, &amp;cmd_pkt-&gt;nvme_rsp_dseg_address);</div><div class='ctx'> </div><div class='ctx'> 	/* NVME CNMD IU */</div><div class='ctx'> 	cmd_pkt-&gt;nvme_cmnd_dseg_len = cpu_to_le16(fd-&gt;cmdlen);</div><div class='del'>-	cmd_pkt-&gt;nvme_cmnd_dseg_address[0] = cpu_to_le32(LSD(fd-&gt;cmddma));</div><div class='del'>-	cmd_pkt-&gt;nvme_cmnd_dseg_address[1] = cpu_to_le32(MSD(fd-&gt;cmddma));</div><div class='add'>+	cmd_pkt-&gt;nvme_cmnd_dseg_address = cpu_to_le64(fd-&gt;cmddma);</div><div class='ctx'> </div><div class='ctx'> 	cmd_pkt-&gt;dseg_count = cpu_to_le16(tot_dsds);</div><div class='ctx'> 	cmd_pkt-&gt;byte_count = cpu_to_le32(fd-&gt;payload_length);</div><div class='ctx'> </div><div class='ctx'> 	/* One DSD is available in the Command Type NVME IOCB */</div><div class='ctx'> 	avail_dsds = 1;</div><div class='del'>-	cur_dsd = (uint32_t *)&amp;cmd_pkt-&gt;nvme_data_dseg_address[0];</div><div class='add'>+	cur_dsd = &amp;cmd_pkt-&gt;nvme_dsd;</div><div class='ctx'> 	sgl = fd-&gt;first_sgl;</div><div class='ctx'> </div><div class='ctx'> 	/* Load data segments */</div><div class='ctx'> 	for_each_sg(sgl, sg, tot_dsds, i) {</div><div class='del'>-		dma_addr_t      sle_dma;</div><div class='ctx'> 		cont_a64_entry_t *cont_pkt;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate additional continuation packets? */</div><div class='hunk'>@@ -432,17 +439,14 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)</div><div class='ctx'> 				req-&gt;ring_ptr++;</div><div class='ctx'> 			}</div><div class='ctx'> 			cont_pkt = (cont_a64_entry_t *)req-&gt;ring_ptr;</div><div class='del'>-			*((uint32_t *)(&amp;cont_pkt-&gt;entry_type)) =</div><div class='del'>-			    cpu_to_le32(CONTINUE_A64_TYPE);</div><div class='add'>+			put_unaligned_le32(CONTINUE_A64_TYPE,</div><div class='add'>+					   &amp;cont_pkt-&gt;entry_type);</div><div class='ctx'> </div><div class='del'>-			cur_dsd = (uint32_t *)cont_pkt-&gt;dseg_0_address;</div><div class='del'>-			avail_dsds = 5;</div><div class='add'>+			cur_dsd = cont_pkt-&gt;dsd;</div><div class='add'>+			avail_dsds = ARRAY_SIZE(cont_pkt-&gt;dsd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sle_dma = sg_dma_address(sg);</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='del'>-		*cur_dsd++ = cpu_to_le32(sg_dma_len(sg));</div><div class='add'>+		append_dsd64(&amp;cur_dsd, sg);</div><div class='ctx'> 		avail_dsds--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -573,7 +577,7 @@ static struct nvme_fc_port_template qla_nvme_fc_transport = {</div><div class='ctx'> 	.fcp_io		= qla_nvme_post_cmd,</div><div class='ctx'> 	.fcp_abort	= qla_nvme_fcp_abort,</div><div class='ctx'> 	.max_hw_queues  = 8,</div><div class='del'>-	.max_sgl_segments = 128,</div><div class='add'>+	.max_sgl_segments = 1024,</div><div class='ctx'> 	.max_dif_sgl_segments = 64,</div><div class='ctx'> 	.dma_boundary = 0xFFFFFFFF,</div><div class='ctx'> 	.local_priv_sz  = 8,</div><div class='hunk'>@@ -582,40 +586,11 @@ static struct nvme_fc_port_template qla_nvme_fc_transport = {</div><div class='ctx'> 	.fcprqst_priv_sz = sizeof(struct nvme_private),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NVME_ABORT_POLLING_PERIOD    2</div><div class='del'>-static int qla_nvme_wait_on_command(srb_t *sp)</div><div class='del'>-{</div><div class='del'>-	int ret = QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-	wait_event_timeout(sp-&gt;nvme_ls_waitq, (atomic_read(&amp;sp-&gt;ref_count) &gt; 1),</div><div class='del'>-	    NVME_ABORT_POLLING_PERIOD*HZ);</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;sp-&gt;ref_count) &gt; 1)</div><div class='del'>-		ret = QLA_FUNCTION_FAILED;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp, int res)</div><div class='del'>-{</div><div class='del'>-	int rval;</div><div class='del'>-</div><div class='del'>-	if (ha-&gt;flags.fw_started) {</div><div class='del'>-		rval = ha-&gt;isp_ops-&gt;abort_command(sp);</div><div class='del'>-		if (!rval &amp;&amp; !qla_nvme_wait_on_command(sp))</div><div class='del'>-			ql_log(ql_log_warn, NULL, 0x2112,</div><div class='del'>-			    "timed out waiting on sp=%p\n", sp);</div><div class='del'>-	} else {</div><div class='del'>-		sp-&gt;done(sp, res);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void qla_nvme_unregister_remote_port(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_port *fcport = container_of(work, struct fc_port,</div><div class='ctx'> 	    nvme_del_work);</div><div class='ctx'> 	struct qla_nvme_rport *qla_rport, *trport;</div><div class='del'>-	scsi_qla_host_t *base_vha;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_NVME_FC))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -623,23 +598,19 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)</div><div class='ctx'> 	ql_log(ql_log_warn, NULL, 0x2112,</div><div class='ctx'> 	    "%s: unregister remoteport on %p\n",__func__, fcport);</div><div class='ctx'> </div><div class='del'>-	base_vha = pci_get_drvdata(fcport-&gt;vha-&gt;hw-&gt;pdev);</div><div class='del'>-	if (test_bit(PFLG_DRIVER_REMOVING, &amp;base_vha-&gt;pci_flags)) {</div><div class='del'>-		ql_dbg(ql_dbg_disc, fcport-&gt;vha, 0x2114,</div><div class='del'>-		    "%s: Notify FC-NVMe transport, set devloss=0\n",</div><div class='del'>-		    __func__);</div><div class='del'>-</div><div class='del'>-		nvme_fc_set_remoteport_devloss(fcport-&gt;nvme_remote_port, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry_safe(qla_rport, trport,</div><div class='ctx'> 	    &amp;fcport-&gt;vha-&gt;nvme_rport_list, list) {</div><div class='ctx'> 		if (qla_rport-&gt;fcport == fcport) {</div><div class='ctx'> 			ql_log(ql_log_info, fcport-&gt;vha, 0x2113,</div><div class='ctx'> 			    "%s: fcport=%p\n", __func__, fcport);</div><div class='add'>+			nvme_fc_set_remoteport_devloss</div><div class='add'>+				(fcport-&gt;nvme_remote_port, 0);</div><div class='ctx'> 			init_completion(&amp;fcport-&gt;nvme_del_done);</div><div class='del'>-			nvme_fc_unregister_remoteport(</div><div class='del'>-			    fcport-&gt;nvme_remote_port);</div><div class='add'>+			if (nvme_fc_unregister_remoteport</div><div class='add'>+			    (fcport-&gt;nvme_remote_port))</div><div class='add'>+				ql_log(ql_log_info, fcport-&gt;vha, 0x2114,</div><div class='add'>+				    "%s: Failed to unregister nvme_remote_port\n",</div><div class='add'>+				    __func__);</div><div class='ctx'> 			wait_for_completion(&amp;fcport-&gt;nvme_del_done);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_nvme.h b/drivers/scsi/qla2xxx/qla_nvme.h<br/>index da8dad5ad693..d3b8a6440113 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nvme.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nvme.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nvme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_nvme.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/nvme-fc-driver.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "qla_def.h"</div><div class='add'>+#include "qla_dsd.h"</div><div class='ctx'> </div><div class='ctx'> /* default dev loss time (seconds) before transport tears down ctrl */</div><div class='ctx'> #define NVME_FC_DEV_LOSS_TMO  30</div><div class='hunk'>@@ -64,16 +65,15 @@ struct cmd_nvme {</div><div class='ctx'> #define CF_WRITE_DATA                   BIT_0</div><div class='ctx'> </div><div class='ctx'> 	uint16_t nvme_cmnd_dseg_len;             /* Data segment length. */</div><div class='del'>-	uint32_t nvme_cmnd_dseg_address[2];      /* Data segment address. */</div><div class='del'>-	uint32_t nvme_rsp_dseg_address[2];       /* Data segment address. */</div><div class='add'>+	__le64	 nvme_cmnd_dseg_address __packed;/* Data segment address. */</div><div class='add'>+	__le64	 nvme_rsp_dseg_address __packed; /* Data segment address. */</div><div class='ctx'> </div><div class='ctx'> 	uint32_t byte_count;            /* Total byte count. */</div><div class='ctx'> </div><div class='ctx'> 	uint8_t port_id[3];             /* PortID of destination port. */</div><div class='ctx'> 	uint8_t vp_index;</div><div class='ctx'> </div><div class='del'>-	uint32_t nvme_data_dseg_address[2];      /* Data segment address. */</div><div class='del'>-	uint32_t nvme_data_dseg_len;             /* Data segment length. */</div><div class='add'>+	struct dsd64 nvme_dsd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PT_LS4_REQUEST 0x89	/* Link Service pass-through IOCB (request) */</div><div class='hunk'>@@ -101,10 +101,7 @@ struct pt_ls4_request {</div><div class='ctx'> 	uint32_t rsvd3;</div><div class='ctx'> 	uint32_t rx_byte_count;</div><div class='ctx'> 	uint32_t tx_byte_count;</div><div class='del'>-	uint32_t dseg0_address[2];</div><div class='del'>-	uint32_t dseg0_len;</div><div class='del'>-	uint32_t dseg1_address[2];</div><div class='del'>-	uint32_t dseg1_len;</div><div class='add'>+	struct dsd64 dsd[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PT_LS4_UNSOL 0x56	/* pass-up unsolicited rec FC-NVMe request */</div><div class='hunk'>@@ -145,7 +142,6 @@ struct pt_ls4_rx_unsol {</div><div class='ctx'> int qla_nvme_register_hba(struct scsi_qla_host *);</div><div class='ctx'> int  qla_nvme_register_remote(struct scsi_qla_host *, struct fc_port *);</div><div class='ctx'> void qla_nvme_delete(struct scsi_qla_host *);</div><div class='del'>-void qla_nvme_abort(struct qla_hw_data *, struct srb *sp, int res);</div><div class='ctx'> void qla24xx_nvme_ls4_iocb(struct scsi_qla_host *, struct pt_ls4_request *,</div><div class='ctx'>     struct req_que *);</div><div class='ctx'> void qla24xx_async_gffid_sp_done(void *, int);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c<br/>index f2f54806f4da..c760ae354174 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_nx.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "qla_def.h"</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -608,6 +609,7 @@ qla82xx_pci_set_window(struct qla_hw_data *ha, unsigned long long addr)</div><div class='ctx'> 	} else if (addr_in_range(addr, QLA82XX_ADDR_OCM0,</div><div class='ctx'> 		QLA82XX_ADDR_OCM0_MAX)) {</div><div class='ctx'> 		unsigned int temp1;</div><div class='add'>+</div><div class='ctx'> 		if ((addr &amp; 0x00ff800) == 0xff800) {</div><div class='ctx'> 			ql_log(ql_log_warn, vha, 0xb004,</div><div class='ctx'> 			    "%s: QM access not handled.\n", __func__);</div><div class='hunk'>@@ -990,6 +992,7 @@ static int</div><div class='ctx'> qla82xx_read_status_reg(struct qla_hw_data *ha, uint32_t *val)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_RDSR);</div><div class='ctx'> 	qla82xx_wait_rom_busy(ha);</div><div class='ctx'> 	if (qla82xx_wait_rom_done(ha)) {</div><div class='hunk'>@@ -1030,6 +1033,7 @@ static int</div><div class='ctx'> qla82xx_flash_set_write_enable(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t val;</div><div class='add'>+</div><div class='ctx'> 	qla82xx_wait_rom_busy(ha);</div><div class='ctx'> 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 0);</div><div class='ctx'> 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WREN);</div><div class='hunk'>@@ -1047,6 +1051,7 @@ static int</div><div class='ctx'> qla82xx_write_status_reg(struct qla_hw_data *ha, uint32_t val)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	if (qla82xx_flash_set_write_enable(ha))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_WDATA, val);</div><div class='hunk'>@@ -1063,6 +1068,7 @@ static int</div><div class='ctx'> qla82xx_write_disable_flash(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WRDI);</div><div class='ctx'> 	if (qla82xx_wait_rom_done(ha)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0xb00f,</div><div class='hunk'>@@ -1435,6 +1441,7 @@ qla82xx_fw_load_from_flash(struct qla_hw_data *ha)</div><div class='ctx'> 	long memaddr = BOOTLD_START;</div><div class='ctx'> 	u64 data;</div><div class='ctx'> 	u32 high, low;</div><div class='add'>+</div><div class='ctx'> 	size = (IMAGE_START - BOOTLD_START) / 8;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; size; i++) {</div><div class='hunk'>@@ -1757,11 +1764,14 @@ qla82xx_pci_config(scsi_qla_host_t *vha)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> qla82xx_reset_chip(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	ha-&gt;isp_ops-&gt;disable_intrs(ha);</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void qla82xx_config_rings(struct scsi_qla_host *vha)</div><div class='hunk'>@@ -1778,10 +1788,8 @@ void qla82xx_config_rings(struct scsi_qla_host *vha)</div><div class='ctx'> 	icb-&gt;response_q_inpointer = cpu_to_le16(0);</div><div class='ctx'> 	icb-&gt;request_q_length = cpu_to_le16(req-&gt;length);</div><div class='ctx'> 	icb-&gt;response_q_length = cpu_to_le16(rsp-&gt;length);</div><div class='del'>-	icb-&gt;request_q_address[0] = cpu_to_le32(LSD(req-&gt;dma));</div><div class='del'>-	icb-&gt;request_q_address[1] = cpu_to_le32(MSD(req-&gt;dma));</div><div class='del'>-	icb-&gt;response_q_address[0] = cpu_to_le32(LSD(rsp-&gt;dma));</div><div class='del'>-	icb-&gt;response_q_address[1] = cpu_to_le32(MSD(rsp-&gt;dma));</div><div class='add'>+	put_unaligned_le64(req-&gt;dma, &amp;icb-&gt;request_q_address);</div><div class='add'>+	put_unaligned_le64(rsp-&gt;dma, &amp;icb-&gt;response_q_address);</div><div class='ctx'> </div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;req_q_out[0], 0);</div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;rsp_q_in[0], 0);</div><div class='hunk'>@@ -1992,6 +2000,7 @@ qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)</div><div class='ctx'> 	uint16_t __iomem *wptr;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct device_reg_82xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp82;</div><div class='add'>+</div><div class='ctx'> 	wptr = (uint16_t __iomem *)&amp;reg-&gt;mailbox_out[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Load return mailbox registers. */</div><div class='hunk'>@@ -2028,7 +2037,7 @@ qla82xx_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	unsigned long	iter;</div><div class='ctx'> 	uint32_t	stat = 0;</div><div class='del'>-	uint16_t	mb[4];</div><div class='add'>+	uint16_t	mb[8];</div><div class='ctx'> </div><div class='ctx'> 	rsp = (struct rsp_que *) dev_id;</div><div class='ctx'> 	if (!rsp) {</div><div class='hunk'>@@ -2112,7 +2121,7 @@ qla82xx_msix_default(int irq, void *dev_id)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	uint32_t stat = 0;</div><div class='ctx'> 	uint32_t host_int = 0;</div><div class='del'>-	uint16_t mb[4];</div><div class='add'>+	uint16_t mb[8];</div><div class='ctx'> </div><div class='ctx'> 	rsp = (struct rsp_que *) dev_id;</div><div class='ctx'> 	if (!rsp) {</div><div class='hunk'>@@ -2208,7 +2217,7 @@ qla82xx_poll(int irq, void *dev_id)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	uint32_t stat;</div><div class='ctx'> 	uint32_t host_int = 0;</div><div class='del'>-	uint16_t mb[4];</div><div class='add'>+	uint16_t mb[8];</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	rsp = (struct rsp_que *) dev_id;</div><div class='hunk'>@@ -2262,6 +2271,7 @@ void</div><div class='ctx'> qla82xx_enable_intrs(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	qla82xx_mbx_intr_enable(vha);</div><div class='ctx'> 	spin_lock_irq(&amp;ha-&gt;hardware_lock);</div><div class='ctx'> 	if (IS_QLA8044(ha))</div><div class='hunk'>@@ -2276,6 +2286,7 @@ void</div><div class='ctx'> qla82xx_disable_intrs(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	qla82xx_mbx_intr_disable(vha);</div><div class='ctx'> 	spin_lock_irq(&amp;ha-&gt;hardware_lock);</div><div class='ctx'> 	if (IS_QLA8044(ha))</div><div class='hunk'>@@ -2658,8 +2669,8 @@ done:</div><div class='ctx'> /*</div><div class='ctx'>  * Address and length are byte address</div><div class='ctx'>  */</div><div class='del'>-uint8_t *</div><div class='del'>-qla82xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+void *</div><div class='add'>+qla82xx_read_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'> 	uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_block_requests(vha-&gt;host);</div><div class='hunk'>@@ -2767,15 +2778,14 @@ write_done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-qla82xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+qla82xx_write_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'> 	uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='ctx'> 	/* Suspend HBA. */</div><div class='ctx'> 	scsi_block_requests(vha-&gt;host);</div><div class='del'>-	rval = qla82xx_write_flash_data(vha, (uint32_t *)buf, offset,</div><div class='del'>-		length &gt;&gt; 2);</div><div class='add'>+	rval = qla82xx_write_flash_data(vha, buf, offset, length &gt;&gt; 2);</div><div class='ctx'> 	scsi_unblock_requests(vha-&gt;host);</div><div class='ctx'> </div><div class='ctx'> 	/* Convert return ISP82xx to generic */</div><div class='hunk'>@@ -4464,6 +4474,7 @@ qla82xx_beacon_on(struct scsi_qla_host *vha)</div><div class='ctx'> </div><div class='ctx'> 	int rval;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	qla82xx_idc_lock(ha);</div><div class='ctx'> 	rval = qla82xx_mbx_beacon_ctl(vha, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -4484,6 +4495,7 @@ qla82xx_beacon_off(struct scsi_qla_host *vha)</div><div class='ctx'> </div><div class='ctx'> 	int rval;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	qla82xx_idc_lock(ha);</div><div class='ctx'> 	rval = qla82xx_mbx_beacon_ctl(vha, 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h<br/>index 71a41093530e..3c7beef92c35 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_nx.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #ifndef __QLA_NX_H</div><div class='ctx'> #define __QLA_NX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Following are the states of the Phantom. Phantom will set them and</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c<br/>index fe856b602e03..369ac04d0454 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nx2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_nx2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_nx2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_nx2.c</a></div><div class='hunk'>@@ -559,12 +559,12 @@ exit_lock_error:</div><div class='ctx'> /*</div><div class='ctx'>  * Address and length are byte address</div><div class='ctx'>  */</div><div class='del'>-uint8_t *</div><div class='del'>-qla8044_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+void *</div><div class='add'>+qla8044_read_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'> 	uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_block_requests(vha-&gt;host);</div><div class='del'>-	if (qla8044_read_flash_data(vha, (uint8_t *)buf, offset, length / 4)</div><div class='add'>+	if (qla8044_read_flash_data(vha, buf, offset, length / 4)</div><div class='ctx'> 	    != QLA_SUCCESS) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha,  0xb08d,</div><div class='ctx'> 		    "%s: Failed to read from flash\n",</div><div class='hunk'>@@ -3007,10 +3007,9 @@ qla8044_minidump_process_rddfe(struct scsi_qla_host *vha,</div><div class='ctx'> 	uint16_t count;</div><div class='ctx'> 	uint32_t poll, mask, modify_mask;</div><div class='ctx'> 	uint32_t wait_count = 0;</div><div class='del'>-</div><div class='ctx'> 	uint32_t *data_ptr = *d_ptr;</div><div class='del'>-</div><div class='ctx'> 	struct qla8044_minidump_entry_rddfe *rddfe;</div><div class='add'>+</div><div class='ctx'> 	rddfe = (struct qla8044_minidump_entry_rddfe *) entry_hdr;</div><div class='ctx'> </div><div class='ctx'> 	addr1 = rddfe-&gt;addr_1;</div><div class='hunk'>@@ -3797,7 +3796,7 @@ qla8044_write_flash_dword_mode(scsi_qla_host_t *vha, uint32_t *dwptr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-qla8044_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+qla8044_write_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'> 			  uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	int rval = QLA_FUNCTION_FAILED, i, burst_iter_count;</div><div class='hunk'>@@ -3896,7 +3895,7 @@ qla8044_intr_handler(int irq, void *dev_id)</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	unsigned long	iter;</div><div class='ctx'> 	uint32_t	stat;</div><div class='del'>-	uint16_t	mb[4];</div><div class='add'>+	uint16_t	mb[8];</div><div class='ctx'> 	uint32_t leg_int_ptr = 0, pf_bit;</div><div class='ctx'> </div><div class='ctx'> 	rsp = (struct rsp_que *) dev_id;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c<br/>index 677f82fdf56f..e1c82a0a9745 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_os.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_os.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static struct kmem_cache *ctx_cachep;</div><div class='ctx'> /*</div><div class='ctx'>  * error level for logging</div><div class='ctx'>  */</div><div class='del'>-int ql_errlev = ql_log_all;</div><div class='add'>+uint ql_errlev = 0x8001;</div><div class='ctx'> </div><div class='ctx'> static int ql2xenableclass2;</div><div class='ctx'> module_param(ql2xenableclass2, int, S_IRUGO|S_IRUSR);</div><div class='hunk'>@@ -108,7 +108,7 @@ MODULE_PARM_DESC(ql2xshiftctondsd,</div><div class='ctx'> 		"Set to control shifting of command type processing "</div><div class='ctx'> 		"based on total number of SG elements.");</div><div class='ctx'> </div><div class='del'>-int ql2xfdmienable=1;</div><div class='add'>+int ql2xfdmienable = 1;</div><div class='ctx'> module_param(ql2xfdmienable, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> module_param_named(fdmi, ql2xfdmienable, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql2xfdmienable,</div><div class='hunk'>@@ -154,7 +154,7 @@ MODULE_PARM_DESC(ql2xenablehba_err_chk,</div><div class='ctx'> 		"  1 -- Error isolation enabled only for DIX Type 0\n"</div><div class='ctx'> 		"  2 -- Error isolation enabled for all Types\n");</div><div class='ctx'> </div><div class='del'>-int ql2xiidmaenable=1;</div><div class='add'>+int ql2xiidmaenable = 1;</div><div class='ctx'> module_param(ql2xiidmaenable, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ql2xiidmaenable,</div><div class='ctx'> 		"Enables iIDMA settings "</div><div class='hunk'>@@ -285,14 +285,14 @@ MODULE_PARM_DESC(qla2xuseresexchforels,</div><div class='ctx'> 		 "Reserve 1/2 of emergency exchanges for ELS.\n"</div><div class='ctx'> 		 " 0 (default): disabled");</div><div class='ctx'> </div><div class='del'>-int ql2xprotmask;</div><div class='add'>+static int ql2xprotmask;</div><div class='ctx'> module_param(ql2xprotmask, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ql2xprotmask,</div><div class='ctx'> 		 "Override DIF/DIX protection capabilities mask\n"</div><div class='ctx'> 		 "Default is 0 which sets protection mask based on "</div><div class='ctx'> 		 "capabilities reported by HBA firmware.\n");</div><div class='ctx'> </div><div class='del'>-int ql2xprotguard;</div><div class='add'>+static int ql2xprotguard;</div><div class='ctx'> module_param(ql2xprotguard, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ql2xprotguard, "Override choice of DIX checksum\n"</div><div class='ctx'> 		 "  0 -- Let HBA firmware decide\n"</div><div class='hunk'>@@ -306,58 +306,12 @@ MODULE_PARM_DESC(ql2xdifbundlinginternalbuffers,</div><div class='ctx'>     "0 (Default). Based on check.\n"</div><div class='ctx'>     "1 Force using internal buffers\n");</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * SCSI host template entry points</div><div class='del'>- */</div><div class='del'>-static int qla2xxx_slave_configure(struct scsi_device * device);</div><div class='del'>-static int qla2xxx_slave_alloc(struct scsi_device *);</div><div class='del'>-static int qla2xxx_scan_finished(struct Scsi_Host *, unsigned long time);</div><div class='del'>-static void qla2xxx_scan_start(struct Scsi_Host *);</div><div class='del'>-static void qla2xxx_slave_destroy(struct scsi_device *);</div><div class='del'>-static int qla2xxx_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *cmd);</div><div class='del'>-static int qla2xxx_eh_abort(struct scsi_cmnd *);</div><div class='del'>-static int qla2xxx_eh_device_reset(struct scsi_cmnd *);</div><div class='del'>-static int qla2xxx_eh_target_reset(struct scsi_cmnd *);</div><div class='del'>-static int qla2xxx_eh_bus_reset(struct scsi_cmnd *);</div><div class='del'>-static int qla2xxx_eh_host_reset(struct scsi_cmnd *);</div><div class='del'>-</div><div class='ctx'> static void qla2x00_clear_drv_active(struct qla_hw_data *);</div><div class='ctx'> static void qla2x00_free_device(scsi_qla_host_t *);</div><div class='ctx'> static int qla2xxx_map_queues(struct Scsi_Host *shost);</div><div class='ctx'> static void qla2x00_destroy_deferred_work(struct qla_hw_data *);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct scsi_host_template qla2xxx_driver_template = {</div><div class='del'>-	.module			= THIS_MODULE,</div><div class='del'>-	.name			= QLA2XXX_DRIVER_NAME,</div><div class='del'>-	.queuecommand		= qla2xxx_queuecommand,</div><div class='del'>-</div><div class='del'>-	.eh_timed_out		= fc_eh_timed_out,</div><div class='del'>-	.eh_abort_handler	= qla2xxx_eh_abort,</div><div class='del'>-	.eh_device_reset_handler = qla2xxx_eh_device_reset,</div><div class='del'>-	.eh_target_reset_handler = qla2xxx_eh_target_reset,</div><div class='del'>-	.eh_bus_reset_handler	= qla2xxx_eh_bus_reset,</div><div class='del'>-	.eh_host_reset_handler	= qla2xxx_eh_host_reset,</div><div class='del'>-</div><div class='del'>-	.slave_configure	= qla2xxx_slave_configure,</div><div class='del'>-</div><div class='del'>-	.slave_alloc		= qla2xxx_slave_alloc,</div><div class='del'>-	.slave_destroy		= qla2xxx_slave_destroy,</div><div class='del'>-	.scan_finished		= qla2xxx_scan_finished,</div><div class='del'>-	.scan_start		= qla2xxx_scan_start,</div><div class='del'>-	.change_queue_depth	= scsi_change_queue_depth,</div><div class='del'>-	.map_queues             = qla2xxx_map_queues,</div><div class='del'>-	.this_id		= -1,</div><div class='del'>-	.cmd_per_lun		= 3,</div><div class='del'>-	.sg_tablesize		= SG_ALL,</div><div class='del'>-</div><div class='del'>-	.max_sectors		= 0xFFFF,</div><div class='del'>-	.shost_attrs		= qla2x00_host_attrs,</div><div class='del'>-</div><div class='del'>-	.supported_mode		= MODE_INITIATOR,</div><div class='del'>-	.track_queue_depth	= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct scsi_transport_template *qla2xxx_transport_template = NULL;</div><div class='ctx'> struct scsi_transport_template *qla2xxx_transport_vport_template = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -411,6 +365,7 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req,</div><div class='ctx'>     struct rsp_que *rsp)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	rsp-&gt;qpair = ha-&gt;base_qpair;</div><div class='ctx'> 	rsp-&gt;req = req;</div><div class='ctx'> 	ha-&gt;base_qpair-&gt;hw = ha;</div><div class='hunk'>@@ -427,7 +382,7 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req,</div><div class='ctx'> 	qla_cpu_update(rsp-&gt;qpair, raw_smp_processor_id());</div><div class='ctx'> 	ha-&gt;base_qpair-&gt;pdev = ha-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha) || IS_QLA83XX(ha))</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		ha-&gt;base_qpair-&gt;reqq_start_iocbs = qla_83xx_start_iocbs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -435,6 +390,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,</div><div class='ctx'> 				struct rsp_que *rsp)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	ha-&gt;req_q_map = kcalloc(ha-&gt;max_req_queues, sizeof(struct req_que *),</div><div class='ctx'> 				GFP_KERNEL);</div><div class='ctx'> 	if (!ha-&gt;req_q_map) {</div><div class='hunk'>@@ -726,7 +682,7 @@ qla2x00_sp_free_dma(void *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx)</div><div class='del'>-		goto end;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (sp-&gt;flags &amp; SRB_CRC_CTX_DSD_VALID) {</div><div class='ctx'> 		/* List assured to be having elements */</div><div class='hunk'>@@ -751,12 +707,6 @@ qla2x00_sp_free_dma(void *ptr)</div><div class='ctx'> 		ha-&gt;gbl_dsd_avail += ctx1-&gt;dsd_use_cnt;</div><div class='ctx'> 		mempool_free(ctx1, ha-&gt;ctx_mempool);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-	if (sp-&gt;type != SRB_NVME_CMD &amp;&amp; sp-&gt;type != SRB_NVME_LS) {</div><div class='del'>-		CMD_SP(cmd) = NULL;</div><div class='del'>-		qla2x00_rel_sp(sp);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -764,22 +714,20 @@ qla2x00_sp_compl(void *ptr, int res)</div><div class='ctx'> {</div><div class='ctx'> 	srb_t *sp = ptr;</div><div class='ctx'> 	struct scsi_cmnd *cmd = GET_CMD_SP(sp);</div><div class='add'>+	struct completion *comp = sp-&gt;comp;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;result = res;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;sp-&gt;ref_count) == 0) {</div><div class='del'>-		ql_dbg(ql_dbg_io, sp-&gt;vha, 0x3015,</div><div class='del'>-		    "SP reference-count to ZERO -- sp=%p cmd=%p.\n",</div><div class='del'>-		    sp, GET_CMD_SP(sp));</div><div class='del'>-		if (ql2xextended_error_logging &amp; ql_dbg_io)</div><div class='del'>-			WARN_ON(atomic_read(&amp;sp-&gt;ref_count) == 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (!atomic_dec_and_test(&amp;sp-&gt;ref_count))</div><div class='add'>+	if (WARN_ON_ONCE(atomic_read(&amp;sp-&gt;ref_count) == 0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	atomic_dec(&amp;sp-&gt;ref_count);</div><div class='add'>+</div><div class='ctx'> 	sp-&gt;free(sp);</div><div class='add'>+	cmd-&gt;result = res;</div><div class='add'>+	CMD_SP(cmd) = NULL;</div><div class='ctx'> 	cmd-&gt;scsi_done(cmd);</div><div class='add'>+	if (comp)</div><div class='add'>+		complete(comp);</div><div class='add'>+	qla2x00_rel_sp(sp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -802,7 +750,7 @@ qla2xxx_qpair_sp_free_dma(void *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx)</div><div class='del'>-		goto end;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (sp-&gt;flags &amp; SRB_CRC_CTX_DSD_VALID) {</div><div class='ctx'> 		/* List assured to be having elements */</div><div class='hunk'>@@ -810,25 +758,8 @@ qla2xxx_qpair_sp_free_dma(void *ptr)</div><div class='ctx'> 		sp-&gt;flags &amp;= ~SRB_CRC_CTX_DSD_VALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sp-&gt;flags &amp; SRB_CRC_CTX_DMA_VALID) {</div><div class='del'>-		struct crc_context *ctx0 = ctx;</div><div class='del'>-</div><div class='del'>-		dma_pool_free(ha-&gt;dl_dma_pool, ctx, ctx0-&gt;crc_ctx_dma);</div><div class='del'>-		sp-&gt;flags &amp;= ~SRB_CRC_CTX_DMA_VALID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sp-&gt;flags &amp; SRB_FCP_CMND_DMA_VALID) {</div><div class='del'>-		struct ct6_dsd *ctx1 = ctx;</div><div class='del'>-		dma_pool_free(ha-&gt;fcp_cmnd_dma_pool, ctx1-&gt;fcp_cmnd,</div><div class='del'>-		    ctx1-&gt;fcp_cmnd_dma);</div><div class='del'>-		list_splice(&amp;ctx1-&gt;dsd_list, &amp;ha-&gt;gbl_dsd_list);</div><div class='del'>-		ha-&gt;gbl_dsd_inuse -= ctx1-&gt;dsd_use_cnt;</div><div class='del'>-		ha-&gt;gbl_dsd_avail += ctx1-&gt;dsd_use_cnt;</div><div class='del'>-		mempool_free(ctx1, ha-&gt;ctx_mempool);</div><div class='del'>-		sp-&gt;flags &amp;= ~SRB_FCP_CMND_DMA_VALID;</div><div class='del'>-	}</div><div class='ctx'> 	if (sp-&gt;flags &amp; SRB_DIF_BUNDL_DMA_VALID) {</div><div class='del'>-		struct crc_context *difctx = sp-&gt;u.scmd.ctx;</div><div class='add'>+		struct crc_context *difctx = ctx;</div><div class='ctx'> 		struct dsd_dma *dif_dsd, *nxt_dsd;</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry_safe(dif_dsd, nxt_dsd,</div><div class='hunk'>@@ -863,9 +794,24 @@ qla2xxx_qpair_sp_free_dma(void *ptr)</div><div class='ctx'> 		sp-&gt;flags &amp;= ~SRB_DIF_BUNDL_DMA_VALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-end:</div><div class='del'>-	CMD_SP(cmd) = NULL;</div><div class='del'>-	qla2xxx_rel_qpair_sp(sp-&gt;qpair, sp);</div><div class='add'>+	if (sp-&gt;flags &amp; SRB_FCP_CMND_DMA_VALID) {</div><div class='add'>+		struct ct6_dsd *ctx1 = ctx;</div><div class='add'>+</div><div class='add'>+		dma_pool_free(ha-&gt;fcp_cmnd_dma_pool, ctx1-&gt;fcp_cmnd,</div><div class='add'>+		    ctx1-&gt;fcp_cmnd_dma);</div><div class='add'>+		list_splice(&amp;ctx1-&gt;dsd_list, &amp;ha-&gt;gbl_dsd_list);</div><div class='add'>+		ha-&gt;gbl_dsd_inuse -= ctx1-&gt;dsd_use_cnt;</div><div class='add'>+		ha-&gt;gbl_dsd_avail += ctx1-&gt;dsd_use_cnt;</div><div class='add'>+		mempool_free(ctx1, ha-&gt;ctx_mempool);</div><div class='add'>+		sp-&gt;flags &amp;= ~SRB_FCP_CMND_DMA_VALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;flags &amp; SRB_CRC_CTX_DMA_VALID) {</div><div class='add'>+		struct crc_context *ctx0 = ctx;</div><div class='add'>+</div><div class='add'>+		dma_pool_free(ha-&gt;dl_dma_pool, ctx, ctx0-&gt;crc_ctx_dma);</div><div class='add'>+		sp-&gt;flags &amp;= ~SRB_CRC_CTX_DMA_VALID;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -873,27 +819,22 @@ qla2xxx_qpair_sp_compl(void *ptr, int res)</div><div class='ctx'> {</div><div class='ctx'> 	srb_t *sp = ptr;</div><div class='ctx'> 	struct scsi_cmnd *cmd = GET_CMD_SP(sp);</div><div class='add'>+	struct completion *comp = sp-&gt;comp;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;result = res;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;sp-&gt;ref_count) == 0) {</div><div class='del'>-		ql_dbg(ql_dbg_io, sp-&gt;fcport-&gt;vha, 0x3079,</div><div class='del'>-		    "SP reference-count to ZERO -- sp=%p cmd=%p.\n",</div><div class='del'>-		    sp, GET_CMD_SP(sp));</div><div class='del'>-		if (ql2xextended_error_logging &amp; ql_dbg_io)</div><div class='del'>-			WARN_ON(atomic_read(&amp;sp-&gt;ref_count) == 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (!atomic_dec_and_test(&amp;sp-&gt;ref_count))</div><div class='add'>+	if (WARN_ON_ONCE(atomic_read(&amp;sp-&gt;ref_count) == 0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	atomic_dec(&amp;sp-&gt;ref_count);</div><div class='add'>+</div><div class='ctx'> 	sp-&gt;free(sp);</div><div class='add'>+	cmd-&gt;result = res;</div><div class='add'>+	CMD_SP(cmd) = NULL;</div><div class='ctx'> 	cmd-&gt;scsi_done(cmd);</div><div class='add'>+	if (comp)</div><div class='add'>+		complete(comp);</div><div class='add'>+	qla2xxx_rel_qpair_sp(sp-&gt;qpair, sp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* If we are SP1 here, we need to still take and release the host_lock as SP1</div><div class='del'>- * does not have the changes necessary to avoid taking host-&gt;host_lock.</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -908,7 +849,8 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)</div><div class='ctx'> 	uint32_t tag;</div><div class='ctx'> 	uint16_t hwq;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(UNLOADING, &amp;base_vha-&gt;dpc_flags))) {</div><div class='add'>+	if (unlikely(test_bit(UNLOADING, &amp;base_vha-&gt;dpc_flags)) ||</div><div class='add'>+	    WARN_ON_ONCE(!rport)) {</div><div class='ctx'> 		cmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='ctx'> 		goto qc24_fail_command;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1031,7 +973,7 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd,</div><div class='ctx'> 	srb_t *sp;</div><div class='ctx'> 	int rval;</div><div class='ctx'> </div><div class='del'>-	rval = fc_remote_port_chkready(rport);</div><div class='add'>+	rval = rport ? fc_remote_port_chkready(rport) : FC_PORTSTATE_OFFLINE;</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		cmd-&gt;result = rval;</div><div class='ctx'> 		ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3076,</div><div class='hunk'>@@ -1272,7 +1214,7 @@ qla2x00_wait_for_chip_reset(scsi_qla_host_t *vha)</div><div class='ctx'> static int</div><div class='ctx'> sp_get(struct srb *sp)</div><div class='ctx'> {</div><div class='del'>-	if (!refcount_inc_not_zero((refcount_t*)&amp;sp-&gt;ref_count))</div><div class='add'>+	if (!refcount_inc_not_zero((refcount_t *)&amp;sp-&gt;ref_count))</div><div class='ctx'> 		/* kref get fail */</div><div class='ctx'> 		return ENXIO;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1332,7 +1274,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	unsigned int id;</div><div class='ctx'> 	uint64_t lun;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int rval, wait = 0;</div><div class='add'>+	int rval;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct qla_qpair *qpair;</div><div class='ctx'> </div><div class='hunk'>@@ -1345,7 +1287,6 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	ret = fc_block_scsi_eh(cmd);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	sp = (srb_t *) CMD_SP(cmd);</div><div class='ctx'> 	if (!sp)</div><div class='hunk'>@@ -1356,7 +1297,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 		return SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(qpair-&gt;qp_lock_ptr, flags);</div><div class='del'>-	if (!CMD_SP(cmd)) {</div><div class='add'>+	if (sp-&gt;type != SRB_SCSI_CMD || GET_CMD_SP(sp) != cmd) {</div><div class='ctx'> 		/* there's a chance an interrupt could clear</div><div class='ctx'> 		   the ptr as part of done &amp; free */</div><div class='ctx'> 		spin_unlock_irqrestore(qpair-&gt;qp_lock_ptr, flags);</div><div class='hunk'>@@ -1377,58 +1318,31 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	    "Aborting from RISC nexus=%ld:%d:%llu sp=%p cmd=%p handle=%x\n",</div><div class='ctx'> 	    vha-&gt;host_no, id, lun, sp, cmd, sp-&gt;handle);</div><div class='ctx'> </div><div class='del'>-	/* Get a reference to the sp and drop the lock.*/</div><div class='del'>-</div><div class='ctx'> 	rval = ha-&gt;isp_ops-&gt;abort_command(sp);</div><div class='del'>-	if (rval) {</div><div class='del'>-		if (rval == QLA_FUNCTION_PARAMETER_ERROR)</div><div class='del'>-			ret = SUCCESS;</div><div class='del'>-		else</div><div class='del'>-			ret = FAILED;</div><div class='del'>-</div><div class='del'>-		ql_dbg(ql_dbg_taskm, vha, 0x8003,</div><div class='del'>-		    "Abort command mbx failed cmd=%p, rval=%x.\n", cmd, rval);</div><div class='del'>-	} else {</div><div class='del'>-		ql_dbg(ql_dbg_taskm, vha, 0x8004,</div><div class='del'>-		    "Abort command mbx success cmd=%p.\n", cmd);</div><div class='del'>-		wait = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(qpair-&gt;qp_lock_ptr, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * Clear the slot in the oustanding_cmds array if we can't find the</div><div class='del'>-	 * command to reclaim the resources.</div><div class='del'>-	 */</div><div class='del'>-	if (rval == QLA_FUNCTION_PARAMETER_ERROR)</div><div class='del'>-		vha-&gt;req-&gt;outstanding_cmds[sp-&gt;handle] = NULL;</div><div class='add'>+	ql_dbg(ql_dbg_taskm, vha, 0x8003,</div><div class='add'>+	       "Abort command mbx cmd=%p, rval=%x.\n", cmd, rval);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * sp-&gt;done will do ref_count--</div><div class='del'>-	 * sp_get() took an extra count above</div><div class='del'>-	 */</div><div class='del'>-	sp-&gt;done(sp, DID_RESET &lt;&lt; 16);</div><div class='del'>-</div><div class='del'>-	/* Did the command return during mailbox execution? */</div><div class='del'>-	if (ret == FAILED &amp;&amp; !CMD_SP(cmd))</div><div class='add'>+	switch (rval) {</div><div class='add'>+	case QLA_SUCCESS:</div><div class='add'>+		/*</div><div class='add'>+		 * The command has been aborted. That means that the firmware</div><div class='add'>+		 * won't report a completion.</div><div class='add'>+		 */</div><div class='add'>+		sp-&gt;done(sp, DID_ABORT &lt;&lt; 16);</div><div class='ctx'> 		ret = SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (!CMD_SP(cmd))</div><div class='del'>-		wait = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(qpair-&gt;qp_lock_ptr, flags);</div><div class='del'>-</div><div class='del'>-	/* Wait for the command to be returned. */</div><div class='del'>-	if (wait) {</div><div class='del'>-		if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x8006,</div><div class='del'>-			    "Abort handler timed out cmd=%p.\n", cmd);</div><div class='del'>-			ret = FAILED;</div><div class='del'>-		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * Either abort failed or abort and completion raced. Let</div><div class='add'>+		 * the SCSI core retry the abort in the former case.</div><div class='add'>+		 */</div><div class='add'>+		ret = FAILED;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x801c,</div><div class='del'>-	    "Abort command issued nexus=%ld:%d:%llu --  %d %x.\n",</div><div class='del'>-	    vha-&gt;host_no, id, lun, wait, ret);</div><div class='add'>+	    "Abort command issued nexus=%ld:%d:%llu -- %x.\n",</div><div class='add'>+	    vha-&gt;host_no, id, lun, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1517,7 +1431,7 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,</div><div class='ctx'> 		goto eh_reset_failed;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 2;</div><div class='del'>-	if (do_reset(fcport, cmd-&gt;device-&gt;lun, blk_mq_rq_cpu(cmd-&gt;request) + 1)</div><div class='add'>+	if (do_reset(fcport, cmd-&gt;device-&gt;lun, 1)</div><div class='ctx'> 		!= QLA_SUCCESS) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x800c,</div><div class='ctx'> 		    "do_reset failed for cmd=%p.\n", cmd);</div><div class='hunk'>@@ -1804,42 +1718,34 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res,</div><div class='ctx'> 	__releases(qp-&gt;qp_lock_ptr)</div><div class='ctx'> 	__acquires(qp-&gt;qp_lock_ptr)</div><div class='ctx'> {</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(comp);</div><div class='ctx'> 	scsi_qla_host_t *vha = qp-&gt;vha;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	int rval;</div><div class='ctx'> </div><div class='del'>-	if (sp-&gt;type == SRB_NVME_CMD || sp-&gt;type == SRB_NVME_LS) {</div><div class='del'>-		if (!sp_get(sp)) {</div><div class='del'>-			/* got sp */</div><div class='del'>-			spin_unlock_irqrestore(qp-&gt;qp_lock_ptr, *flags);</div><div class='del'>-			qla_nvme_abort(ha, sp, res);</div><div class='del'>-			spin_lock_irqsave(qp-&gt;qp_lock_ptr, *flags);</div><div class='del'>-		}</div><div class='del'>-	} else if (GET_CMD_SP(sp) &amp;&amp; !ha-&gt;flags.eeh_busy &amp;&amp;</div><div class='del'>-		   !test_bit(ABORT_ISP_ACTIVE, &amp;vha-&gt;dpc_flags) &amp;&amp;</div><div class='del'>-		   !qla2x00_isp_reg_stat(ha) &amp;&amp; sp-&gt;type == SRB_SCSI_CMD) {</div><div class='del'>-		/*</div><div class='del'>-		 * Don't abort commands in adapter during EEH recovery as it's</div><div class='del'>-		 * not accessible/responding.</div><div class='del'>-		 *</div><div class='del'>-		 * Get a reference to the sp and drop the lock. The reference</div><div class='del'>-		 * ensures this sp-&gt;done() call and not the call in</div><div class='del'>-		 * qla2xxx_eh_abort() ends the SCSI cmd (with result 'res').</div><div class='del'>-		 */</div><div class='del'>-		if (!sp_get(sp)) {</div><div class='del'>-			int status;</div><div class='add'>+	if (sp_get(sp))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-			spin_unlock_irqrestore(qp-&gt;qp_lock_ptr, *flags);</div><div class='del'>-			status = qla2xxx_eh_abort(GET_CMD_SP(sp));</div><div class='del'>-			spin_lock_irqsave(qp-&gt;qp_lock_ptr, *flags);</div><div class='del'>-			/*</div><div class='del'>-			 * Get rid of extra reference caused</div><div class='del'>-			 * by early exit from qla2xxx_eh_abort</div><div class='del'>-			 */</div><div class='del'>-			if (status == FAST_IO_FAIL)</div><div class='del'>-				atomic_dec(&amp;sp-&gt;ref_count);</div><div class='add'>+	if (sp-&gt;type == SRB_NVME_CMD || sp-&gt;type == SRB_NVME_LS ||</div><div class='add'>+	    (sp-&gt;type == SRB_SCSI_CMD &amp;&amp; !ha-&gt;flags.eeh_busy &amp;&amp;</div><div class='add'>+	     !test_bit(ABORT_ISP_ACTIVE, &amp;vha-&gt;dpc_flags) &amp;&amp;</div><div class='add'>+	     !qla2x00_isp_reg_stat(ha))) {</div><div class='add'>+		sp-&gt;comp = &amp;comp;</div><div class='add'>+		rval = ha-&gt;isp_ops-&gt;abort_command(sp);</div><div class='add'>+		spin_unlock_irqrestore(qp-&gt;qp_lock_ptr, *flags);</div><div class='add'>+</div><div class='add'>+		switch (rval) {</div><div class='add'>+		case QLA_SUCCESS:</div><div class='add'>+			sp-&gt;done(sp, res);</div><div class='add'>+			break;</div><div class='add'>+		case QLA_FUNCTION_PARAMETER_ERROR:</div><div class='add'>+			wait_for_completion(&amp;comp);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(qp-&gt;qp_lock_ptr, *flags);</div><div class='add'>+		sp-&gt;comp = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	sp-&gt;done(sp, res);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1875,15 +1781,10 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				cmd = (struct qla_tgt_cmd *)sp;</div><div class='del'>-				qlt_abort_cmd_on_host_reset(cmd-&gt;vha, cmd);</div><div class='add'>+				cmd-&gt;aborted = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case TYPE_TGT_TMCMD:</div><div class='del'>-				/*</div><div class='del'>-				 * Currently, only ABTS response gets on the</div><div class='del'>-				 * outstanding_cmds[]</div><div class='del'>-				 */</div><div class='del'>-				ha-&gt;tgt.tgt_ops-&gt;free_mcmd(</div><div class='del'>-				   (struct qla_tgt_mgmt_cmd *)sp);</div><div class='add'>+				/* Skip task management functions. */</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2753,6 +2654,24 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)</div><div class='ctx'> 		ha-&gt;device_type |= DT_T10_PI;</div><div class='ctx'> 		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='ctx'> 		break;</div><div class='add'>+	case PCI_DEVICE_ID_QLOGIC_ISP2081:</div><div class='add'>+	case PCI_DEVICE_ID_QLOGIC_ISP2089:</div><div class='add'>+		ha-&gt;isp_type |= DT_ISP2081;</div><div class='add'>+		ha-&gt;device_type |= DT_ZIO_SUPPORTED;</div><div class='add'>+		ha-&gt;device_type |= DT_FWI2;</div><div class='add'>+		ha-&gt;device_type |= DT_IIDMA;</div><div class='add'>+		ha-&gt;device_type |= DT_T10_PI;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='add'>+		break;</div><div class='add'>+	case PCI_DEVICE_ID_QLOGIC_ISP2281:</div><div class='add'>+	case PCI_DEVICE_ID_QLOGIC_ISP2289:</div><div class='add'>+		ha-&gt;isp_type |= DT_ISP2281;</div><div class='add'>+		ha-&gt;device_type |= DT_ZIO_SUPPORTED;</div><div class='add'>+		ha-&gt;device_type |= DT_FWI2;</div><div class='add'>+		ha-&gt;device_type |= DT_IIDMA;</div><div class='add'>+		ha-&gt;device_type |= DT_T10_PI;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA82XX(ha))</div><div class='hunk'>@@ -2760,7 +2679,8 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* Get adapter physical port no from interrupt pin register. */</div><div class='ctx'> 		pci_read_config_byte(ha-&gt;pdev, PCI_INTERRUPT_PIN, &amp;ha-&gt;port_no);</div><div class='del'>-		if (IS_QLA27XX(ha))</div><div class='add'>+		if (IS_QLA25XX(ha) || IS_QLA2031(ha) ||</div><div class='add'>+		    IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 			ha-&gt;port_no--;</div><div class='ctx'> 		else</div><div class='ctx'> 			ha-&gt;port_no = !(ha-&gt;port_no &amp; 1);</div><div class='hunk'>@@ -2857,7 +2777,11 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP8044 ||</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2071 ||</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2271 ||</div><div class='del'>-	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2261) {</div><div class='add'>+	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2261 ||</div><div class='add'>+	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2081 ||</div><div class='add'>+	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2281 ||</div><div class='add'>+	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2089 ||</div><div class='add'>+	    pdev-&gt;device == PCI_DEVICE_ID_QLOGIC_ISP2289) {</div><div class='ctx'> 		bars = pci_select_bars(pdev, IORESOURCE_MEM);</div><div class='ctx'> 		mem_only = 1;</div><div class='ctx'> 		ql_dbg_pci(ql_dbg_init, pdev, 0x0007,</div><div class='hunk'>@@ -2877,6 +2801,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	/* This may fail but that's ok */</div><div class='ctx'> 	pci_enable_pcie_error_reporting(pdev);</div><div class='ctx'> </div><div class='add'>+	/* Turn off T10-DIF when FC-NVMe is enabled */</div><div class='add'>+	if (ql2xnvmeenable)</div><div class='add'>+		ql2xenabledif = 0;</div><div class='add'>+</div><div class='ctx'> 	ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL);</div><div class='ctx'> 	if (!ha) {</div><div class='ctx'> 		ql_log_pci(ql_log_fatal, pdev, 0x0009,</div><div class='hunk'>@@ -2906,7 +2834,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	/* Set EEH reset type to fundamental if required by hba */</div><div class='ctx'> 	if (IS_QLA24XX(ha) || IS_QLA25XX(ha) || IS_QLA81XX(ha) ||</div><div class='del'>-	    IS_QLA83XX(ha) || IS_QLA27XX(ha))</div><div class='add'>+	    IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		pdev-&gt;needs_freset = 1;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;prev_topology = 0;</div><div class='hunk'>@@ -3085,6 +3013,23 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		ha-&gt;flash_data_off = FARX_ACCESS_FLASH_DATA_81XX;</div><div class='ctx'> 		ha-&gt;nvram_conf_off = ~0;</div><div class='ctx'> 		ha-&gt;nvram_data_off = ~0;</div><div class='add'>+	} else if (IS_QLA28XX(ha)) {</div><div class='add'>+		ha-&gt;portnum = PCI_FUNC(ha-&gt;pdev-&gt;devfn);</div><div class='add'>+		ha-&gt;max_fibre_devices = MAX_FIBRE_DEVICES_2400;</div><div class='add'>+		ha-&gt;mbx_count = MAILBOX_REGISTER_COUNT;</div><div class='add'>+		req_length = REQUEST_ENTRY_CNT_24XX;</div><div class='add'>+		rsp_length = RESPONSE_ENTRY_CNT_2300;</div><div class='add'>+		ha-&gt;tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;</div><div class='add'>+		ha-&gt;max_loop_id = SNS_LAST_LOOP_ID_2300;</div><div class='add'>+		ha-&gt;init_cb_size = sizeof(struct mid_init_cb_81xx);</div><div class='add'>+		ha-&gt;gid_list_info_size = 8;</div><div class='add'>+		ha-&gt;optrom_size = OPTROM_SIZE_28XX;</div><div class='add'>+		ha-&gt;nvram_npiv_size = QLA_MAX_VPORTS_QLA25XX;</div><div class='add'>+		ha-&gt;isp_ops = &amp;qla27xx_isp_ops;</div><div class='add'>+		ha-&gt;flash_conf_off = FARX_ACCESS_FLASH_CONF_28XX;</div><div class='add'>+		ha-&gt;flash_data_off = FARX_ACCESS_FLASH_DATA_28XX;</div><div class='add'>+		ha-&gt;nvram_conf_off = ~0;</div><div class='add'>+		ha-&gt;nvram_data_off = ~0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg_pci(ql_dbg_init, pdev, 0x001e,</div><div class='hunk'>@@ -3250,7 +3195,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	req-&gt;req_q_out = &amp;ha-&gt;iobase-&gt;isp24.req_q_out;</div><div class='ctx'> 	rsp-&gt;rsp_q_in = &amp;ha-&gt;iobase-&gt;isp24.rsp_q_in;</div><div class='ctx'> 	rsp-&gt;rsp_q_out = &amp;ha-&gt;iobase-&gt;isp24.rsp_q_out;</div><div class='del'>-	if (ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (ha-&gt;mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		req-&gt;req_q_in = &amp;ha-&gt;mqiobase-&gt;isp25mq.req_q_in;</div><div class='ctx'> 		req-&gt;req_q_out = &amp;ha-&gt;mqiobase-&gt;isp25mq.req_q_out;</div><div class='ctx'> 		rsp-&gt;rsp_q_in = &amp;ha-&gt;mqiobase-&gt;isp25mq.rsp_q_in;</div><div class='hunk'>@@ -3395,6 +3341,7 @@ skip_dpc:</div><div class='ctx'> 	if (IS_T10_PI_CAPABLE(ha) &amp;&amp; ql2xenabledif) {</div><div class='ctx'> 		if (ha-&gt;fw_attributes &amp; BIT_4) {</div><div class='ctx'> 			int prot = 0, guard;</div><div class='add'>+</div><div class='ctx'> 			base_vha-&gt;flags.difdix_supported = 1;</div><div class='ctx'> 			ql_dbg(ql_dbg_init, base_vha, 0x00f1,</div><div class='ctx'> 			    "Registering for DIF/DIX type 1 and 3 protection.\n");</div><div class='hunk'>@@ -3576,7 +3523,8 @@ qla2x00_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 	if (ha-&gt;eft)</div><div class='ctx'> 		qla2x00_disable_eft_trace(vha);</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA25XX(ha) ||  IS_QLA2031(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA25XX(ha) ||  IS_QLA2031(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		if (ha-&gt;flags.fw_started)</div><div class='ctx'> 			qla2x00_abort_isp_cleanup(vha);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -3681,7 +3629,8 @@ qla2x00_unmap_iobases(struct qla_hw_data *ha)</div><div class='ctx'> 		if (ha-&gt;mqiobase)</div><div class='ctx'> 			iounmap(ha-&gt;mqiobase);</div><div class='ctx'> </div><div class='del'>-		if ((IS_QLA83XX(ha) || IS_QLA27XX(ha)) &amp;&amp; ha-&gt;msixbase)</div><div class='add'>+		if ((IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) &amp;&amp;</div><div class='add'>+		    ha-&gt;msixbase)</div><div class='ctx'> 			iounmap(ha-&gt;msixbase);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3732,7 +3681,8 @@ qla2x00_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	qla2x00_wait_for_hba_ready(base_vha);</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		if (ha-&gt;flags.fw_started)</div><div class='ctx'> 			qla2x00_abort_isp_cleanup(base_vha);</div><div class='ctx'> 	} else if (!IS_QLAFX00(ha)) {</div><div class='hunk'>@@ -3770,8 +3720,6 @@ qla2x00_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	qla2x00_delete_all_vps(ha, base_vha);</div><div class='ctx'> </div><div class='del'>-	qla2x00_abort_all_cmds(base_vha, DID_NO_CONNECT &lt;&lt; 16);</div><div class='del'>-</div><div class='ctx'> 	qla2x00_dfs_remove(base_vha);</div><div class='ctx'> </div><div class='ctx'> 	qla84xx_put_chip(base_vha);</div><div class='hunk'>@@ -3860,11 +3808,8 @@ void qla2x00_free_fcports(struct scsi_qla_host *vha)</div><div class='ctx'> {</div><div class='ctx'> 	fc_port_t *fcport, *tfcport;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(fcport, tfcport, &amp;vha-&gt;vp_fcports, list) {</div><div class='del'>-		list_del(&amp;fcport-&gt;list);</div><div class='del'>-		qla2x00_clear_loop_id(fcport);</div><div class='del'>-		kfree(fcport);</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry_safe(fcport, tfcport, &amp;vha-&gt;vp_fcports, list)</div><div class='add'>+		qla2x00_free_fcport(fcport);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -3889,6 +3834,7 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,</div><div class='ctx'> 		qla2xxx_wake_dpc(base_vha);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int now;</div><div class='add'>+</div><div class='ctx'> 		if (rport) {</div><div class='ctx'> 			ql_dbg(ql_dbg_disc, fcport-&gt;vha, 0x2109,</div><div class='ctx'> 			    "%s %8phN. rport %p roles %x\n",</div><div class='hunk'>@@ -3980,6 +3926,19 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (IS_FWI2_CAPABLE(ha))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SNS_FIRST_LOOP_ID; i++)</div><div class='add'>+		set_bit(i, ha-&gt;loop_id_map);</div><div class='add'>+	set_bit(MANAGEMENT_SERVER, ha-&gt;loop_id_map);</div><div class='add'>+	set_bit(BROADCAST, ha-&gt;loop_id_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'> * qla2x00_mem_alloc</div><div class='ctx'> *      Allocates adapter memory.</div><div class='hunk'>@@ -4222,7 +4181,8 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,</div><div class='ctx'> 		ha-&gt;npiv_info = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Get consistent memory allocated for EX-INIT-CB. */</div><div class='del'>-	if (IS_CNA_CAPABLE(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_CNA_CAPABLE(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		ha-&gt;ex_init_cb = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL,</div><div class='ctx'> 		    &amp;ha-&gt;ex_init_cb_dma);</div><div class='ctx'> 		if (!ha-&gt;ex_init_cb)</div><div class='hunk'>@@ -4265,8 +4225,20 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,</div><div class='ctx'> 		goto fail_sfp_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ha-&gt;flt = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='add'>+	    sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE, &amp;ha-&gt;flt_dma,</div><div class='add'>+	    GFP_KERNEL);</div><div class='add'>+	if (!ha-&gt;flt) {</div><div class='add'>+		ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x011b,</div><div class='add'>+		    "Unable to allocate memory for FLT.\n");</div><div class='add'>+		goto fail_flt_buffer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+fail_flt_buffer:</div><div class='add'>+	dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, SFP_DEV_SIZE,</div><div class='add'>+	    ha-&gt;sfp_data, ha-&gt;sfp_data_dma);</div><div class='ctx'> fail_sfp_data:</div><div class='ctx'> 	kfree(ha-&gt;loop_id_map);</div><div class='ctx'> fail_loop_id_map:</div><div class='hunk'>@@ -4602,6 +4574,9 @@ qla2x00_free_exchoffld_buffer(struct qla_hw_data *ha)</div><div class='ctx'> static void</div><div class='ctx'> qla2x00_free_fw_dump(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='add'>+	struct fwdt *fwdt = ha-&gt;fwdt;</div><div class='add'>+	uint j;</div><div class='add'>+</div><div class='ctx'> 	if (ha-&gt;fce)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='ctx'> 		    FCE_SIZE, ha-&gt;fce, ha-&gt;fce_dma);</div><div class='hunk'>@@ -4612,8 +4587,6 @@ qla2x00_free_fw_dump(struct qla_hw_data *ha)</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;fw_dump)</div><div class='ctx'> 		vfree(ha-&gt;fw_dump);</div><div class='del'>-	if (ha-&gt;fw_dump_template)</div><div class='del'>-		vfree(ha-&gt;fw_dump_template);</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;fce = NULL;</div><div class='ctx'> 	ha-&gt;fce_dma = 0;</div><div class='hunk'>@@ -4624,8 +4597,13 @@ qla2x00_free_fw_dump(struct qla_hw_data *ha)</div><div class='ctx'> 	ha-&gt;fw_dump_reading = 0;</div><div class='ctx'> 	ha-&gt;fw_dump = NULL;</div><div class='ctx'> 	ha-&gt;fw_dump_len = 0;</div><div class='del'>-	ha-&gt;fw_dump_template = NULL;</div><div class='del'>-	ha-&gt;fw_dump_template_len = 0;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; 2; j++, fwdt++) {</div><div class='add'>+		if (fwdt-&gt;template)</div><div class='add'>+			vfree(fwdt-&gt;template);</div><div class='add'>+		fwdt-&gt;template = NULL;</div><div class='add'>+		fwdt-&gt;length = 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4643,44 +4621,68 @@ qla2x00_mem_free(struct qla_hw_data *ha)</div><div class='ctx'> 	if (ha-&gt;mctp_dump)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, MCTP_DUMP_SIZE, ha-&gt;mctp_dump,</div><div class='ctx'> 		    ha-&gt;mctp_dump_dma);</div><div class='add'>+	ha-&gt;mctp_dump = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mempool_destroy(ha-&gt;srb_mempool);</div><div class='add'>+	ha-&gt;srb_mempool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;dcbx_tlv)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, DCBX_TLV_DATA_SIZE,</div><div class='ctx'> 		    ha-&gt;dcbx_tlv, ha-&gt;dcbx_tlv_dma);</div><div class='add'>+	ha-&gt;dcbx_tlv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;xgmac_data)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, XGMAC_DATA_SIZE,</div><div class='ctx'> 		    ha-&gt;xgmac_data, ha-&gt;xgmac_data_dma);</div><div class='add'>+	ha-&gt;xgmac_data = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;sns_cmd)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, sizeof(struct sns_cmd_pkt),</div><div class='ctx'> 		ha-&gt;sns_cmd, ha-&gt;sns_cmd_dma);</div><div class='add'>+	ha-&gt;sns_cmd = NULL;</div><div class='add'>+	ha-&gt;sns_cmd_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;ct_sns)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, sizeof(struct ct_sns_pkt),</div><div class='ctx'> 		ha-&gt;ct_sns, ha-&gt;ct_sns_dma);</div><div class='add'>+	ha-&gt;ct_sns = NULL;</div><div class='add'>+	ha-&gt;ct_sns_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;sfp_data)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, SFP_DEV_SIZE, ha-&gt;sfp_data,</div><div class='ctx'> 		    ha-&gt;sfp_data_dma);</div><div class='add'>+	ha-&gt;sfp_data = NULL;</div><div class='add'>+</div><div class='add'>+	if (ha-&gt;flt)</div><div class='add'>+		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, SFP_DEV_SIZE,</div><div class='add'>+		    ha-&gt;flt, ha-&gt;flt_dma);</div><div class='add'>+	ha-&gt;flt = NULL;</div><div class='add'>+	ha-&gt;flt_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;ms_iocb)</div><div class='ctx'> 		dma_pool_free(ha-&gt;s_dma_pool, ha-&gt;ms_iocb, ha-&gt;ms_iocb_dma);</div><div class='add'>+	ha-&gt;ms_iocb = NULL;</div><div class='add'>+	ha-&gt;ms_iocb_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;ex_init_cb)</div><div class='ctx'> 		dma_pool_free(ha-&gt;s_dma_pool,</div><div class='ctx'> 			ha-&gt;ex_init_cb, ha-&gt;ex_init_cb_dma);</div><div class='add'>+	ha-&gt;ex_init_cb = NULL;</div><div class='add'>+	ha-&gt;ex_init_cb_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;async_pd)</div><div class='ctx'> 		dma_pool_free(ha-&gt;s_dma_pool, ha-&gt;async_pd, ha-&gt;async_pd_dma);</div><div class='add'>+	ha-&gt;async_pd = NULL;</div><div class='add'>+	ha-&gt;async_pd_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	dma_pool_destroy(ha-&gt;s_dma_pool);</div><div class='add'>+	ha-&gt;s_dma_pool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;gid_list)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, qla2x00_gid_list_size(ha),</div><div class='ctx'> 		ha-&gt;gid_list, ha-&gt;gid_list_dma);</div><div class='add'>+	ha-&gt;gid_list = NULL;</div><div class='add'>+	ha-&gt;gid_list_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA82XX(ha)) {</div><div class='ctx'> 		if (!list_empty(&amp;ha-&gt;gbl_dsd_list)) {</div><div class='hunk'>@@ -4698,10 +4700,13 @@ qla2x00_mem_free(struct qla_hw_data *ha)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_pool_destroy(ha-&gt;dl_dma_pool);</div><div class='add'>+	ha-&gt;dl_dma_pool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	dma_pool_destroy(ha-&gt;fcp_cmnd_dma_pool);</div><div class='add'>+	ha-&gt;fcp_cmnd_dma_pool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mempool_destroy(ha-&gt;ctx_mempool);</div><div class='add'>+	ha-&gt;ctx_mempool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ql2xenabledif) {</div><div class='ctx'> 		struct dsd_dma *dsd, *nxt;</div><div class='hunk'>@@ -4728,53 +4733,26 @@ qla2x00_mem_free(struct qla_hw_data *ha)</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;dif_bundl_pool)</div><div class='ctx'> 		dma_pool_destroy(ha-&gt;dif_bundl_pool);</div><div class='add'>+	ha-&gt;dif_bundl_pool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	qlt_mem_free(ha);</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;init_cb)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, ha-&gt;init_cb_size,</div><div class='ctx'> 			ha-&gt;init_cb, ha-&gt;init_cb_dma);</div><div class='add'>+	ha-&gt;init_cb = NULL;</div><div class='add'>+	ha-&gt;init_cb_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	vfree(ha-&gt;optrom_buffer);</div><div class='add'>+	ha-&gt;optrom_buffer = NULL;</div><div class='ctx'> 	kfree(ha-&gt;nvram);</div><div class='add'>+	ha-&gt;nvram = NULL;</div><div class='ctx'> 	kfree(ha-&gt;npiv_info);</div><div class='add'>+	ha-&gt;npiv_info = NULL;</div><div class='ctx'> 	kfree(ha-&gt;swl);</div><div class='add'>+	ha-&gt;swl = NULL;</div><div class='ctx'> 	kfree(ha-&gt;loop_id_map);</div><div class='del'>-</div><div class='del'>-	ha-&gt;srb_mempool = NULL;</div><div class='del'>-	ha-&gt;ctx_mempool = NULL;</div><div class='del'>-	ha-&gt;sns_cmd = NULL;</div><div class='del'>-	ha-&gt;sns_cmd_dma = 0;</div><div class='del'>-	ha-&gt;ct_sns = NULL;</div><div class='del'>-	ha-&gt;ct_sns_dma = 0;</div><div class='del'>-	ha-&gt;ms_iocb = NULL;</div><div class='del'>-	ha-&gt;ms_iocb_dma = 0;</div><div class='del'>-	ha-&gt;init_cb = NULL;</div><div class='del'>-	ha-&gt;init_cb_dma = 0;</div><div class='del'>-	ha-&gt;ex_init_cb = NULL;</div><div class='del'>-	ha-&gt;ex_init_cb_dma = 0;</div><div class='del'>-	ha-&gt;async_pd = NULL;</div><div class='del'>-	ha-&gt;async_pd_dma = 0;</div><div class='ctx'> 	ha-&gt;loop_id_map = NULL;</div><div class='del'>-	ha-&gt;npiv_info = NULL;</div><div class='del'>-	ha-&gt;optrom_buffer = NULL;</div><div class='del'>-	ha-&gt;swl = NULL;</div><div class='del'>-	ha-&gt;nvram = NULL;</div><div class='del'>-	ha-&gt;mctp_dump = NULL;</div><div class='del'>-	ha-&gt;dcbx_tlv = NULL;</div><div class='del'>-	ha-&gt;xgmac_data = NULL;</div><div class='del'>-	ha-&gt;sfp_data = NULL;</div><div class='del'>-</div><div class='del'>-	ha-&gt;s_dma_pool = NULL;</div><div class='del'>-	ha-&gt;dl_dma_pool = NULL;</div><div class='del'>-	ha-&gt;fcp_cmnd_dma_pool = NULL;</div><div class='del'>-</div><div class='del'>-	ha-&gt;gid_list = NULL;</div><div class='del'>-	ha-&gt;gid_list_dma = 0;</div><div class='del'>-</div><div class='del'>-	ha-&gt;tgt.atio_ring = NULL;</div><div class='del'>-	ha-&gt;tgt.atio_dma = 0;</div><div class='del'>-	ha-&gt;tgt.tgt_vp_map = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,</div><div class='hunk'>@@ -5608,6 +5586,7 @@ qla83xx_force_lock_recovery(scsi_qla_host_t *base_vha)</div><div class='ctx'> 	uint32_t idc_lck_rcvry_stage_mask = 0x3;</div><div class='ctx'> 	uint32_t idc_lck_rcvry_owner_mask = 0x3c;</div><div class='ctx'> 	struct qla_hw_data *ha = base_vha-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	ql_dbg(ql_dbg_p3p, base_vha, 0xb086,</div><div class='ctx'> 	    "Trying force recovery of the IDC lock.\n");</div><div class='ctx'> </div><div class='hunk'>@@ -6677,8 +6656,10 @@ qla2x00_timer(struct timer_list *t)</div><div class='ctx'> 	 * FC-NVME</div><div class='ctx'> 	 * see if the active AEN count has changed from what was last reported.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!vha-&gt;vp_idx &amp;&amp; (atomic_read(&amp;ha-&gt;nvme_active_aen_cnt) !=</div><div class='del'>-	    ha-&gt;nvme_last_rptd_aen) &amp;&amp; ha-&gt;zio_mode == QLA_ZIO_MODE_6) {</div><div class='add'>+	if (!vha-&gt;vp_idx &amp;&amp;</div><div class='add'>+	    (atomic_read(&amp;ha-&gt;nvme_active_aen_cnt) != ha-&gt;nvme_last_rptd_aen) &amp;&amp;</div><div class='add'>+	    ha-&gt;zio_mode == QLA_ZIO_MODE_6 &amp;&amp;</div><div class='add'>+	    !ha-&gt;flags.host_shutting_down) {</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0x3002,</div><div class='ctx'> 		    "nvme: Sched: Set ZIO exchange threshold to %d.\n",</div><div class='ctx'> 		    ha-&gt;nvme_last_rptd_aen);</div><div class='hunk'>@@ -6690,7 +6671,7 @@ qla2x00_timer(struct timer_list *t)</div><div class='ctx'> 	if (!vha-&gt;vp_idx &amp;&amp;</div><div class='ctx'> 	    (atomic_read(&amp;ha-&gt;zio_threshold) != ha-&gt;last_zio_threshold) &amp;&amp;</div><div class='ctx'> 	    (ha-&gt;zio_mode == QLA_ZIO_MODE_6) &amp;&amp;</div><div class='del'>-	    (IS_QLA83XX(ha) || IS_QLA27XX(ha))) {</div><div class='add'>+	    (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))) {</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0x3002,</div><div class='ctx'> 		    "Sched: Set ZIO exchange threshold to %d.\n",</div><div class='ctx'> 		    ha-&gt;last_zio_threshold);</div><div class='hunk'>@@ -6736,7 +6717,6 @@ qla2x00_timer(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> /* Firmware interface routines. */</div><div class='ctx'> </div><div class='del'>-#define FW_BLOBS	11</div><div class='ctx'> #define FW_ISP21XX	0</div><div class='ctx'> #define FW_ISP22XX	1</div><div class='ctx'> #define FW_ISP2300	2</div><div class='hunk'>@@ -6748,6 +6728,7 @@ qla2x00_timer(struct timer_list *t)</div><div class='ctx'> #define FW_ISP2031	8</div><div class='ctx'> #define FW_ISP8031	9</div><div class='ctx'> #define FW_ISP27XX	10</div><div class='add'>+#define FW_ISP28XX	11</div><div class='ctx'> </div><div class='ctx'> #define FW_FILE_ISP21XX	"ql2100_fw.bin"</div><div class='ctx'> #define FW_FILE_ISP22XX	"ql2200_fw.bin"</div><div class='hunk'>@@ -6760,11 +6741,12 @@ qla2x00_timer(struct timer_list *t)</div><div class='ctx'> #define FW_FILE_ISP2031	"ql2600_fw.bin"</div><div class='ctx'> #define FW_FILE_ISP8031	"ql8300_fw.bin"</div><div class='ctx'> #define FW_FILE_ISP27XX	"ql2700_fw.bin"</div><div class='add'>+#define FW_FILE_ISP28XX	"ql2800_fw.bin"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(qla_fw_lock);</div><div class='ctx'> </div><div class='del'>-static struct fw_blob qla_fw_blobs[FW_BLOBS] = {</div><div class='add'>+static struct fw_blob qla_fw_blobs[] = {</div><div class='ctx'> 	{ .name = FW_FILE_ISP21XX, .segs = { 0x1000, 0 }, },</div><div class='ctx'> 	{ .name = FW_FILE_ISP22XX, .segs = { 0x1000, 0 }, },</div><div class='ctx'> 	{ .name = FW_FILE_ISP2300, .segs = { 0x800, 0 }, },</div><div class='hunk'>@@ -6776,6 +6758,8 @@ static struct fw_blob qla_fw_blobs[FW_BLOBS] = {</div><div class='ctx'> 	{ .name = FW_FILE_ISP2031, },</div><div class='ctx'> 	{ .name = FW_FILE_ISP8031, },</div><div class='ctx'> 	{ .name = FW_FILE_ISP27XX, },</div><div class='add'>+	{ .name = FW_FILE_ISP28XX, },</div><div class='add'>+	{ .name = NULL, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fw_blob *</div><div class='hunk'>@@ -6806,10 +6790,15 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)</div><div class='ctx'> 		blob = &amp;qla_fw_blobs[FW_ISP8031];</div><div class='ctx'> 	} else if (IS_QLA27XX(ha)) {</div><div class='ctx'> 		blob = &amp;qla_fw_blobs[FW_ISP27XX];</div><div class='add'>+	} else if (IS_QLA28XX(ha)) {</div><div class='add'>+		blob = &amp;qla_fw_blobs[FW_ISP28XX];</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!blob-&gt;name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;qla_fw_lock);</div><div class='ctx'> 	if (blob-&gt;fw)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -6819,7 +6808,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)</div><div class='ctx'> 		    "Failed to load firmware image (%s).\n", blob-&gt;name);</div><div class='ctx'> 		blob-&gt;fw = NULL;</div><div class='ctx'> 		blob = NULL;</div><div class='del'>-		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -6830,11 +6818,11 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> qla2x00_release_firmware(void)</div><div class='ctx'> {</div><div class='del'>-	int idx;</div><div class='add'>+	struct fw_blob *blob;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;qla_fw_lock);</div><div class='del'>-	for (idx = 0; idx &lt; FW_BLOBS; idx++)</div><div class='del'>-		release_firmware(qla_fw_blobs[idx].fw);</div><div class='add'>+	for (blob = qla_fw_blobs; blob-&gt;name; blob++)</div><div class='add'>+		release_firmware(blob-&gt;fw);</div><div class='ctx'> 	mutex_unlock(&amp;qla_fw_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7179,7 +7167,7 @@ static int qla2xxx_map_queues(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	scsi_qla_host_t *vha = (scsi_qla_host_t *)shost-&gt;hostdata;</div><div class='del'>-	struct blk_mq_queue_map *qmap = &amp;shost-&gt;tag_set.map[0];</div><div class='add'>+	struct blk_mq_queue_map *qmap = &amp;shost-&gt;tag_set.map[HCTX_TYPE_DEFAULT];</div><div class='ctx'> </div><div class='ctx'> 	if (USER_CTRL_IRQ(vha-&gt;hw) || !vha-&gt;hw-&gt;mqiobase)</div><div class='ctx'> 		rc = blk_mq_map_queues(qmap);</div><div class='hunk'>@@ -7188,6 +7176,37 @@ static int qla2xxx_map_queues(struct Scsi_Host *shost)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct scsi_host_template qla2xxx_driver_template = {</div><div class='add'>+	.module			= THIS_MODULE,</div><div class='add'>+	.name			= QLA2XXX_DRIVER_NAME,</div><div class='add'>+	.queuecommand		= qla2xxx_queuecommand,</div><div class='add'>+</div><div class='add'>+	.eh_timed_out		= fc_eh_timed_out,</div><div class='add'>+	.eh_abort_handler	= qla2xxx_eh_abort,</div><div class='add'>+	.eh_device_reset_handler = qla2xxx_eh_device_reset,</div><div class='add'>+	.eh_target_reset_handler = qla2xxx_eh_target_reset,</div><div class='add'>+	.eh_bus_reset_handler	= qla2xxx_eh_bus_reset,</div><div class='add'>+	.eh_host_reset_handler	= qla2xxx_eh_host_reset,</div><div class='add'>+</div><div class='add'>+	.slave_configure	= qla2xxx_slave_configure,</div><div class='add'>+</div><div class='add'>+	.slave_alloc		= qla2xxx_slave_alloc,</div><div class='add'>+	.slave_destroy		= qla2xxx_slave_destroy,</div><div class='add'>+	.scan_finished		= qla2xxx_scan_finished,</div><div class='add'>+	.scan_start		= qla2xxx_scan_start,</div><div class='add'>+	.change_queue_depth	= scsi_change_queue_depth,</div><div class='add'>+	.map_queues             = qla2xxx_map_queues,</div><div class='add'>+	.this_id		= -1,</div><div class='add'>+	.cmd_per_lun		= 3,</div><div class='add'>+	.sg_tablesize		= SG_ALL,</div><div class='add'>+</div><div class='add'>+	.max_sectors		= 0xFFFF,</div><div class='add'>+	.shost_attrs		= qla2x00_host_attrs,</div><div class='add'>+</div><div class='add'>+	.supported_mode		= MODE_INITIATOR,</div><div class='add'>+	.track_queue_depth	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct pci_error_handlers qla2xxx_err_handler = {</div><div class='ctx'> 	.error_detected = qla2xxx_pci_error_detected,</div><div class='ctx'> 	.mmio_enabled = qla2xxx_pci_mmio_enabled,</div><div class='hunk'>@@ -7220,6 +7239,11 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2061) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2081) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2281) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2089) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2289) },</div><div class='ctx'> 	{ 0 },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, qla2xxx_pci_tbl);</div><div class='hunk'>@@ -7249,6 +7273,30 @@ qla2x00_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(sizeof(cmd_entry_t) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(cont_a64_entry_t) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(cont_entry_t) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(init_cb_t) != 96);</div><div class='add'>+	BUILD_BUG_ON(sizeof(ms_iocb_entry_t) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(request_t) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct access_chip_84xx) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct cmd_bidir) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct cmd_nvme) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct cmd_type_6) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct cmd_type_7) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct cmd_type_7_fx00) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct cmd_type_crc_2) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ct_entry_24xx) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ctio_crc2_to_fw) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct els_entry_24xx) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct fxdisc_entry_fx00) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct init_cb_24xx) != 128);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct init_cb_81xx) != 128);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct pt_ls4_request) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct sns_cmd_pkt) != 2064);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct verify_chip_entry_84xx) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct vf_evfp_entry_24xx) != 56);</div><div class='add'>+</div><div class='ctx'> 	/* Allocate cache for SRBs. */</div><div class='ctx'> 	srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,</div><div class='ctx'> 	    SLAB_HWCACHE_ALIGN, NULL);</div><div class='hunk'>@@ -7261,8 +7309,7 @@ qla2x00_module_init(void)</div><div class='ctx'> 	/* Initialize target kmem_cache and mem_pools */</div><div class='ctx'> 	ret = qlt_init();</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		kmem_cache_destroy(srb_cachep);</div><div class='del'>-		return ret;</div><div class='add'>+		goto destroy_cache;</div><div class='ctx'> 	} else if (ret &gt; 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If initiator mode is explictly disabled by qlt_init(),</div><div class='hunk'>@@ -7286,11 +7333,10 @@ qla2x00_module_init(void)</div><div class='ctx'> 	qla2xxx_transport_template =</div><div class='ctx'> 	    fc_attach_transport(&amp;qla2xxx_transport_functions);</div><div class='ctx'> 	if (!qla2xxx_transport_template) {</div><div class='del'>-		kmem_cache_destroy(srb_cachep);</div><div class='ctx'> 		ql_log(ql_log_fatal, NULL, 0x0002,</div><div class='ctx'> 		    "fc_attach_transport failed...Failing load!.\n");</div><div class='del'>-		qlt_exit();</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto qlt_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	apidev_major = register_chrdev(0, QLA2XXX_APIDEV, &amp;apidev_fops);</div><div class='hunk'>@@ -7302,27 +7348,37 @@ qla2x00_module_init(void)</div><div class='ctx'> 	qla2xxx_transport_vport_template =</div><div class='ctx'> 	    fc_attach_transport(&amp;qla2xxx_transport_vport_functions);</div><div class='ctx'> 	if (!qla2xxx_transport_vport_template) {</div><div class='del'>-		kmem_cache_destroy(srb_cachep);</div><div class='del'>-		qlt_exit();</div><div class='del'>-		fc_release_transport(qla2xxx_transport_template);</div><div class='ctx'> 		ql_log(ql_log_fatal, NULL, 0x0004,</div><div class='ctx'> 		    "fc_attach_transport vport failed...Failing load!.\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unreg_chrdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	ql_log(ql_log_info, NULL, 0x0005,</div><div class='ctx'> 	    "QLogic Fibre Channel HBA Driver: %s.\n",</div><div class='ctx'> 	    qla2x00_version_str);</div><div class='ctx'> 	ret = pci_register_driver(&amp;qla2xxx_pci_driver);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		kmem_cache_destroy(srb_cachep);</div><div class='del'>-		qlt_exit();</div><div class='del'>-		fc_release_transport(qla2xxx_transport_template);</div><div class='del'>-		fc_release_transport(qla2xxx_transport_vport_template);</div><div class='ctx'> 		ql_log(ql_log_fatal, NULL, 0x0006,</div><div class='ctx'> 		    "pci_register_driver failed...ret=%d Failing load!.\n",</div><div class='ctx'> 		    ret);</div><div class='add'>+		goto release_vport_transport;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='add'>+</div><div class='add'>+release_vport_transport:</div><div class='add'>+	fc_release_transport(qla2xxx_transport_vport_template);</div><div class='add'>+</div><div class='add'>+unreg_chrdev:</div><div class='add'>+	if (apidev_major &gt;= 0)</div><div class='add'>+		unregister_chrdev(apidev_major, QLA2XXX_APIDEV);</div><div class='add'>+	fc_release_transport(qla2xxx_transport_template);</div><div class='add'>+</div><div class='add'>+qlt_exit:</div><div class='add'>+	qlt_exit();</div><div class='add'>+</div><div class='add'>+destroy_cache:</div><div class='add'>+	kmem_cache_destroy(srb_cachep);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -7331,14 +7387,15 @@ qla2x00_module_init(void)</div><div class='ctx'> static void __exit</div><div class='ctx'> qla2x00_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	unregister_chrdev(apidev_major, QLA2XXX_APIDEV);</div><div class='ctx'> 	pci_unregister_driver(&amp;qla2xxx_pci_driver);</div><div class='ctx'> 	qla2x00_release_firmware();</div><div class='del'>-	kmem_cache_destroy(srb_cachep);</div><div class='del'>-	qlt_exit();</div><div class='ctx'> 	kmem_cache_destroy(ctx_cachep);</div><div class='del'>-	fc_release_transport(qla2xxx_transport_template);</div><div class='ctx'> 	fc_release_transport(qla2xxx_transport_vport_template);</div><div class='add'>+	if (apidev_major &gt;= 0)</div><div class='add'>+		unregister_chrdev(apidev_major, QLA2XXX_APIDEV);</div><div class='add'>+	fc_release_transport(qla2xxx_transport_template);</div><div class='add'>+	qlt_exit();</div><div class='add'>+	kmem_cache_destroy(srb_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(qla2x00_module_init);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c<br/>index 2a3055c799fb..1eb82384d933 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_sup.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_sup.c</a></div><div class='hunk'>@@ -429,66 +429,64 @@ qla2x00_set_nvram_protection(struct qla_hw_data *ha, int stat)</div><div class='ctx'> static inline uint32_t</div><div class='ctx'> flash_conf_addr(struct qla_hw_data *ha, uint32_t faddr)</div><div class='ctx'> {</div><div class='del'>-	return ha-&gt;flash_conf_off | faddr;</div><div class='add'>+	return ha-&gt;flash_conf_off + faddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline uint32_t</div><div class='ctx'> flash_data_addr(struct qla_hw_data *ha, uint32_t faddr)</div><div class='ctx'> {</div><div class='del'>-	return ha-&gt;flash_data_off | faddr;</div><div class='add'>+	return ha-&gt;flash_data_off + faddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline uint32_t</div><div class='ctx'> nvram_conf_addr(struct qla_hw_data *ha, uint32_t naddr)</div><div class='ctx'> {</div><div class='del'>-	return ha-&gt;nvram_conf_off | naddr;</div><div class='add'>+	return ha-&gt;nvram_conf_off + naddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline uint32_t</div><div class='ctx'> nvram_data_addr(struct qla_hw_data *ha, uint32_t naddr)</div><div class='ctx'> {</div><div class='del'>-	return ha-&gt;nvram_data_off | naddr;</div><div class='add'>+	return ha-&gt;nvram_data_off + naddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static uint32_t</div><div class='del'>-qla24xx_read_flash_dword(struct qla_hw_data *ha, uint32_t addr)</div><div class='add'>+static int</div><div class='add'>+qla24xx_read_flash_dword(struct qla_hw_data *ha, uint32_t addr, uint32_t *data)</div><div class='ctx'> {</div><div class='del'>-	int rval;</div><div class='del'>-	uint32_t cnt, data;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='add'>+	ulong cnt = 30000;</div><div class='ctx'> </div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;flash_addr, addr &amp; ~FARX_DATA_FLAG);</div><div class='del'>-	/* Wait for READ cycle to complete. */</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-	for (cnt = 3000;</div><div class='del'>-	    (RD_REG_DWORD(&amp;reg-&gt;flash_addr) &amp; FARX_DATA_FLAG) == 0 &amp;&amp;</div><div class='del'>-	    rval == QLA_SUCCESS; cnt--) {</div><div class='del'>-		if (cnt)</div><div class='del'>-			udelay(10);</div><div class='del'>-		else</div><div class='del'>-			rval = QLA_FUNCTION_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	while (cnt--) {</div><div class='add'>+		if (RD_REG_DWORD(&amp;reg-&gt;flash_addr) &amp; FARX_DATA_FLAG) {</div><div class='add'>+			*data = RD_REG_DWORD(&amp;reg-&gt;flash_data);</div><div class='add'>+			return QLA_SUCCESS;</div><div class='add'>+		}</div><div class='add'>+		udelay(10);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* TODO: What happens if we time out? */</div><div class='del'>-	data = 0xDEADDEAD;</div><div class='del'>-	if (rval == QLA_SUCCESS)</div><div class='del'>-		data = RD_REG_DWORD(&amp;reg-&gt;flash_data);</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='add'>+	ql_log(ql_log_warn, pci_get_drvdata(ha-&gt;pdev), 0x7090,</div><div class='add'>+	    "Flash read dword at %x timeout.\n", addr);</div><div class='add'>+	*data = 0xDEADDEAD;</div><div class='add'>+	return QLA_FUNCTION_TIMEOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint32_t *</div><div class='ctx'> qla24xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'>     uint32_t dwords)</div><div class='ctx'> {</div><div class='del'>-	uint32_t i;</div><div class='add'>+	ulong i;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	/* Dword reads to flash. */</div><div class='del'>-	for (i = 0; i &lt; dwords; i++, faddr++)</div><div class='del'>-		dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,</div><div class='del'>-		    flash_data_addr(ha, faddr)));</div><div class='add'>+	faddr =  flash_data_addr(ha, faddr);</div><div class='add'>+	for (i = 0; i &lt; dwords; i++, faddr++, dwptr++) {</div><div class='add'>+		if (qla24xx_read_flash_dword(ha, faddr, dwptr))</div><div class='add'>+			break;</div><div class='add'>+		cpu_to_le32s(dwptr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return dwptr;</div><div class='ctx'> }</div><div class='hunk'>@@ -496,35 +494,37 @@ qla24xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> static int</div><div class='ctx'> qla24xx_write_flash_dword(struct qla_hw_data *ha, uint32_t addr, uint32_t data)</div><div class='ctx'> {</div><div class='del'>-	int rval;</div><div class='del'>-	uint32_t cnt;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='add'>+	ulong cnt = 500000;</div><div class='ctx'> </div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;flash_data, data);</div><div class='del'>-	RD_REG_DWORD(&amp;reg-&gt;flash_data);		/* PCI Posting. */</div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;flash_addr, addr | FARX_DATA_FLAG);</div><div class='del'>-	/* Wait for Write cycle to complete. */</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-	for (cnt = 500000; (RD_REG_DWORD(&amp;reg-&gt;flash_addr) &amp; FARX_DATA_FLAG) &amp;&amp;</div><div class='del'>-	    rval == QLA_SUCCESS; cnt--) {</div><div class='del'>-		if (cnt)</div><div class='del'>-			udelay(10);</div><div class='del'>-		else</div><div class='del'>-			rval = QLA_FUNCTION_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	while (cnt--) {</div><div class='add'>+		if (!(RD_REG_DWORD(&amp;reg-&gt;flash_addr) &amp; FARX_DATA_FLAG))</div><div class='add'>+			return QLA_SUCCESS;</div><div class='add'>+		udelay(10);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	return rval;</div><div class='add'>+</div><div class='add'>+	ql_log(ql_log_warn, pci_get_drvdata(ha-&gt;pdev), 0x7090,</div><div class='add'>+	    "Flash write dword at %x timeout.\n", addr);</div><div class='add'>+	return QLA_FUNCTION_TIMEOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> qla24xx_get_flash_manufacturer(struct qla_hw_data *ha, uint8_t *man_id,</div><div class='ctx'>     uint8_t *flash_id)</div><div class='ctx'> {</div><div class='del'>-	uint32_t ids;</div><div class='add'>+	uint32_t faddr, ids = 0;</div><div class='ctx'> </div><div class='del'>-	ids = qla24xx_read_flash_dword(ha, flash_conf_addr(ha, 0x03ab));</div><div class='del'>-	*man_id = LSB(ids);</div><div class='del'>-	*flash_id = MSB(ids);</div><div class='add'>+	*man_id = *flash_id = 0;</div><div class='add'>+</div><div class='add'>+	faddr = flash_conf_addr(ha, 0x03ab);</div><div class='add'>+	if (!qla24xx_read_flash_dword(ha, faddr, &amp;ids)) {</div><div class='add'>+		*man_id = LSB(ids);</div><div class='add'>+		*flash_id = MSB(ids);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if man_id and flash_id are valid. */</div><div class='ctx'> 	if (ids != 0xDEADDEAD &amp;&amp; (*man_id == 0 || *flash_id == 0)) {</div><div class='hunk'>@@ -534,9 +534,11 @@ qla24xx_get_flash_manufacturer(struct qla_hw_data *ha, uint8_t *man_id,</div><div class='ctx'> 		 * Example: ATMEL 0x00 01 45 1F</div><div class='ctx'> 		 * Extract MFG and Dev ID from last two bytes.</div><div class='ctx'> 		 */</div><div class='del'>-		ids = qla24xx_read_flash_dword(ha, flash_conf_addr(ha, 0x009f));</div><div class='del'>-		*man_id = LSB(ids);</div><div class='del'>-		*flash_id = MSB(ids);</div><div class='add'>+		faddr = flash_conf_addr(ha, 0x009f);</div><div class='add'>+		if (!qla24xx_read_flash_dword(ha, faddr, &amp;ids)) {</div><div class='add'>+			*man_id = LSB(ids);</div><div class='add'>+			*flash_id = MSB(ids);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -545,12 +547,12 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)</div><div class='ctx'> {</div><div class='ctx'> 	const char *loc, *locations[] = { "DEF", "PCI" };</div><div class='ctx'> 	uint32_t pcihdr, pcids;</div><div class='del'>-	uint32_t *dcode;</div><div class='del'>-	uint8_t *buf, *bcode, last_image;</div><div class='ctx'> 	uint16_t cnt, chksum, *wptr;</div><div class='del'>-	struct qla_flt_location *fltl;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='add'>+	struct qla_flt_location *fltl = (void *)req-&gt;ring;</div><div class='add'>+	uint32_t *dcode = (void *)req-&gt;ring;</div><div class='add'>+	uint8_t *buf = (void *)req-&gt;ring, *bcode,  last_image;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FLT-location structure resides after the last PCI region.</div><div class='hunk'>@@ -571,12 +573,13 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)</div><div class='ctx'> 	} else if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='ctx'> 		*start = FA_FLASH_LAYOUT_ADDR_83;</div><div class='ctx'> 		goto end;</div><div class='add'>+	} else if (IS_QLA28XX(ha)) {</div><div class='add'>+		*start = FA_FLASH_LAYOUT_ADDR_28;</div><div class='add'>+		goto end;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Begin with first PCI expansion ROM header. */</div><div class='del'>-	buf = (uint8_t *)req-&gt;ring;</div><div class='del'>-	dcode = (uint32_t *)req-&gt;ring;</div><div class='ctx'> 	pcihdr = 0;</div><div class='del'>-	last_image = 1;</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* Verify PCI expansion ROM header. */</div><div class='ctx'> 		qla24xx_read_flash_data(vha, dcode, pcihdr &gt;&gt; 2, 0x20);</div><div class='hunk'>@@ -601,22 +604,19 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)</div><div class='ctx'> 	} while (!last_image);</div><div class='ctx'> </div><div class='ctx'> 	/* Now verify FLT-location structure. */</div><div class='del'>-	fltl = (struct qla_flt_location *)req-&gt;ring;</div><div class='del'>-	qla24xx_read_flash_data(vha, dcode, pcihdr &gt;&gt; 2,</div><div class='del'>-	    sizeof(struct qla_flt_location) &gt;&gt; 2);</div><div class='del'>-	if (fltl-&gt;sig[0] != 'Q' || fltl-&gt;sig[1] != 'F' ||</div><div class='del'>-	    fltl-&gt;sig[2] != 'L' || fltl-&gt;sig[3] != 'T')</div><div class='add'>+	qla24xx_read_flash_data(vha, dcode, pcihdr &gt;&gt; 2, sizeof(*fltl) &gt;&gt; 2);</div><div class='add'>+	if (memcmp(fltl-&gt;sig, "QFLT", 4))</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	wptr = (uint16_t *)req-&gt;ring;</div><div class='del'>-	cnt = sizeof(struct qla_flt_location) &gt;&gt; 1;</div><div class='add'>+	wptr = (void *)req-&gt;ring;</div><div class='add'>+	cnt = sizeof(*fltl) / sizeof(*wptr);</div><div class='ctx'> 	for (chksum = 0; cnt--; wptr++)</div><div class='ctx'> 		chksum += le16_to_cpu(*wptr);</div><div class='ctx'> 	if (chksum) {</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x0045,</div><div class='ctx'> 		    "Inconsistent FLTL detected: checksum=0x%x.\n", chksum);</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x010e,</div><div class='del'>-		    buf, sizeof(struct qla_flt_location));</div><div class='add'>+		    fltl, sizeof(*fltl));</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -634,7 +634,7 @@ end:</div><div class='ctx'> static void</div><div class='ctx'> qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> {</div><div class='del'>-	const char *loc, *locations[] = { "DEF", "FLT" };</div><div class='add'>+	const char *locations[] = { "DEF", "FLT" }, *loc = locations[1];</div><div class='ctx'> 	const uint32_t def_fw[] =</div><div class='ctx'> 		{ FA_RISC_CODE_ADDR, FA_RISC_CODE_ADDR, FA_RISC_CODE_ADDR_81 };</div><div class='ctx'> 	const uint32_t def_boot[] =</div><div class='hunk'>@@ -664,20 +664,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 	const uint32_t fcp_prio_cfg1[] =</div><div class='ctx'> 		{ FA_FCP_PRIO1_ADDR, FA_FCP_PRIO1_ADDR_25,</div><div class='ctx'> 			0 };</div><div class='del'>-	uint32_t def;</div><div class='del'>-	uint16_t *wptr;</div><div class='del'>-	uint16_t cnt, chksum;</div><div class='del'>-	uint32_t start;</div><div class='del'>-	struct qla_flt_header *flt;</div><div class='del'>-	struct qla_flt_region *region;</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='ctx'> </div><div class='del'>-	def = 0;</div><div class='del'>-	if (IS_QLA25XX(ha))</div><div class='del'>-		def = 1;</div><div class='del'>-	else if (IS_QLA81XX(ha))</div><div class='del'>-		def = 2;</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	uint32_t def = IS_QLA81XX(ha) ? 2 : IS_QLA25XX(ha) ? 1 : 0;</div><div class='add'>+	struct qla_flt_header *flt = (void *)ha-&gt;flt;</div><div class='add'>+	struct qla_flt_region *region = (void *)&amp;flt[1];</div><div class='add'>+	uint16_t *wptr, cnt, chksum;</div><div class='add'>+	uint32_t start;</div><div class='ctx'> </div><div class='ctx'> 	/* Assign FCP prio region since older adapters may not have FLT, or</div><div class='ctx'> 	   FCP prio region in it's FLT.</div><div class='hunk'>@@ -686,12 +679,11 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 	    fcp_prio_cfg0[def] : fcp_prio_cfg1[def];</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;flt_region_flt = flt_addr;</div><div class='del'>-	wptr = (uint16_t *)req-&gt;ring;</div><div class='del'>-	flt = (struct qla_flt_header *)req-&gt;ring;</div><div class='del'>-	region = (struct qla_flt_region *)&amp;flt[1];</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)req-&gt;ring,</div><div class='del'>-	    flt_addr &lt;&lt; 2, OPTROM_BURST_SIZE);</div><div class='del'>-	if (*wptr == cpu_to_le16(0xffff))</div><div class='add'>+	wptr = (uint16_t *)ha-&gt;flt;</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)flt, flt_addr,</div><div class='add'>+	    (sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE) &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(*wptr) == 0xffff)</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> 	if (flt-&gt;version != cpu_to_le16(1)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x0047,</div><div class='hunk'>@@ -701,7 +693,7 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cnt = (sizeof(struct qla_flt_header) + le16_to_cpu(flt-&gt;length)) &gt;&gt; 1;</div><div class='add'>+	cnt = (sizeof(*flt) + le16_to_cpu(flt-&gt;length)) / sizeof(*wptr);</div><div class='ctx'> 	for (chksum = 0; cnt--; wptr++)</div><div class='ctx'> 		chksum += le16_to_cpu(*wptr);</div><div class='ctx'> 	if (chksum) {</div><div class='hunk'>@@ -712,18 +704,20 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	loc = locations[1];</div><div class='del'>-	cnt = le16_to_cpu(flt-&gt;length) / sizeof(struct qla_flt_region);</div><div class='add'>+	cnt = le16_to_cpu(flt-&gt;length) / sizeof(*region);</div><div class='ctx'> 	for ( ; cnt; cnt--, region++) {</div><div class='ctx'> 		/* Store addresses as DWORD offsets. */</div><div class='ctx'> 		start = le32_to_cpu(region-&gt;start) &gt;&gt; 2;</div><div class='ctx'> 		ql_dbg(ql_dbg_init, vha, 0x0049,</div><div class='del'>-		    "FLT[%02x]: start=0x%x "</div><div class='del'>-		    "end=0x%x size=0x%x.\n", le32_to_cpu(region-&gt;code) &amp; 0xff,</div><div class='del'>-		    start, le32_to_cpu(region-&gt;end) &gt;&gt; 2,</div><div class='del'>-		    le32_to_cpu(region-&gt;size));</div><div class='del'>-</div><div class='del'>-		switch (le32_to_cpu(region-&gt;code) &amp; 0xff) {</div><div class='add'>+		    "FLT[%#x]: start=%#x end=%#x size=%#x.\n",</div><div class='add'>+		    le16_to_cpu(region-&gt;code), start,</div><div class='add'>+		    le32_to_cpu(region-&gt;end) &gt;&gt; 2,</div><div class='add'>+		    le32_to_cpu(region-&gt;size) &gt;&gt; 2);</div><div class='add'>+		if (region-&gt;attribute)</div><div class='add'>+			ql_log(ql_dbg_init, vha, 0xffff,</div><div class='add'>+			    "Region %x is secure\n", region-&gt;code);</div><div class='add'>+</div><div class='add'>+		switch (le16_to_cpu(region-&gt;code)) {</div><div class='ctx'> 		case FLT_REG_FCOE_FW:</div><div class='ctx'> 			if (!IS_QLA8031(ha))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -753,13 +747,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 				ha-&gt;flt_region_vpd = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_VPD_2:</div><div class='del'>-			if (!IS_QLA27XX(ha))</div><div class='add'>+			if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (ha-&gt;port_no == 2)</div><div class='ctx'> 				ha-&gt;flt_region_vpd = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_VPD_3:</div><div class='del'>-			if (!IS_QLA27XX(ha))</div><div class='add'>+			if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (ha-&gt;port_no == 3)</div><div class='ctx'> 				ha-&gt;flt_region_vpd = start;</div><div class='hunk'>@@ -777,13 +771,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 				ha-&gt;flt_region_nvram = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_NVRAM_2:</div><div class='del'>-			if (!IS_QLA27XX(ha))</div><div class='add'>+			if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (ha-&gt;port_no == 2)</div><div class='ctx'> 				ha-&gt;flt_region_nvram = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_NVRAM_3:</div><div class='del'>-			if (!IS_QLA27XX(ha))</div><div class='add'>+			if (!IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (ha-&gt;port_no == 3)</div><div class='ctx'> 				ha-&gt;flt_region_nvram = start;</div><div class='hunk'>@@ -847,36 +841,74 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)</div><div class='ctx'> 				ha-&gt;flt_region_nvram = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_IMG_PRI_27XX:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='add'>+			if (IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				ha-&gt;flt_region_img_status_pri = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_IMG_SEC_27XX:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='add'>+			if (IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				ha-&gt;flt_region_img_status_sec = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_FW_SEC_27XX:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='add'>+			if (IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				ha-&gt;flt_region_fw_sec = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_BOOTLOAD_SEC_27XX:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='add'>+			if (IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 				ha-&gt;flt_region_boot_sec = start;</div><div class='ctx'> 			break;</div><div class='add'>+		case FLT_REG_AUX_IMG_PRI_28XX:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				ha-&gt;flt_region_aux_img_status_pri = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_AUX_IMG_SEC_28XX:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				ha-&gt;flt_region_aux_img_status_sec = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_NVRAM_SEC_28XX_0:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 0)</div><div class='add'>+					ha-&gt;flt_region_nvram_sec = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_NVRAM_SEC_28XX_1:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 1)</div><div class='add'>+					ha-&gt;flt_region_nvram_sec = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_NVRAM_SEC_28XX_2:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 2)</div><div class='add'>+					ha-&gt;flt_region_nvram_sec = start;</div><div class='add'>+			break;</div><div class='add'>+		case FLT_REG_NVRAM_SEC_28XX_3:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 3)</div><div class='add'>+					ha-&gt;flt_region_nvram_sec = start;</div><div class='add'>+			break;</div><div class='ctx'> 		case FLT_REG_VPD_SEC_27XX_0:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='del'>-				ha-&gt;flt_region_vpd_sec = start;</div><div class='add'>+		case FLT_REG_VPD_SEC_28XX_0:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+				ha-&gt;flt_region_vpd_nvram_sec = start;</div><div class='add'>+				if (ha-&gt;port_no == 0)</div><div class='add'>+					ha-&gt;flt_region_vpd_sec = start;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_VPD_SEC_27XX_1:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='del'>-				ha-&gt;flt_region_vpd_sec = start;</div><div class='add'>+		case FLT_REG_VPD_SEC_28XX_1:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 1)</div><div class='add'>+					ha-&gt;flt_region_vpd_sec = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_VPD_SEC_27XX_2:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='del'>-				ha-&gt;flt_region_vpd_sec = start;</div><div class='add'>+		case FLT_REG_VPD_SEC_28XX_2:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 2)</div><div class='add'>+					ha-&gt;flt_region_vpd_sec = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLT_REG_VPD_SEC_27XX_3:</div><div class='del'>-			if (IS_QLA27XX(ha))</div><div class='del'>-				ha-&gt;flt_region_vpd_sec = start;</div><div class='add'>+		case FLT_REG_VPD_SEC_28XX_3:</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				if (ha-&gt;port_no == 3)</div><div class='add'>+					ha-&gt;flt_region_vpd_sec = start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -912,22 +944,19 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)</div><div class='ctx'> #define FLASH_BLK_SIZE_32K	0x8000</div><div class='ctx'> #define FLASH_BLK_SIZE_64K	0x10000</div><div class='ctx'> 	const char *loc, *locations[] = { "MID", "FDT" };</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='ctx'> 	uint16_t cnt, chksum;</div><div class='del'>-	uint16_t *wptr;</div><div class='del'>-	struct qla_fdt_layout *fdt;</div><div class='add'>+	uint16_t *wptr = (void *)req-&gt;ring;</div><div class='add'>+	struct qla_fdt_layout *fdt = (void *)req-&gt;ring;</div><div class='ctx'> 	uint8_t	man_id, flash_id;</div><div class='ctx'> 	uint16_t mid = 0, fid = 0;</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='ctx'> </div><div class='del'>-	wptr = (uint16_t *)req-&gt;ring;</div><div class='del'>-	fdt = (struct qla_fdt_layout *)req-&gt;ring;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)req-&gt;ring,</div><div class='del'>-	    ha-&gt;flt_region_fdt &lt;&lt; 2, OPTROM_BURST_SIZE);</div><div class='del'>-	if (*wptr == cpu_to_le16(0xffff))</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)fdt, ha-&gt;flt_region_fdt,</div><div class='add'>+	    OPTROM_BURST_DWORDS);</div><div class='add'>+	if (le16_to_cpu(*wptr) == 0xffff)</div><div class='ctx'> 		goto no_flash_data;</div><div class='del'>-	if (fdt-&gt;sig[0] != 'Q' || fdt-&gt;sig[1] != 'L' || fdt-&gt;sig[2] != 'I' ||</div><div class='del'>-	    fdt-&gt;sig[3] != 'D')</div><div class='add'>+	if (memcmp(fdt-&gt;sig, "QLID", 4))</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 0, chksum = 0; cnt &lt; sizeof(*fdt) &gt;&gt; 1; cnt++, wptr++)</div><div class='hunk'>@@ -938,7 +967,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)</div><div class='ctx'> 		    " checksum=0x%x id=%c version0x%x.\n", chksum,</div><div class='ctx'> 		    fdt-&gt;sig[0], le16_to_cpu(fdt-&gt;version));</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0113,</div><div class='del'>-		    (uint8_t *)fdt, sizeof(*fdt));</div><div class='add'>+		    fdt, sizeof(*fdt));</div><div class='ctx'> 		goto no_flash_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -958,7 +987,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)</div><div class='ctx'> 		ha-&gt;fdt_unprotect_sec_cmd = flash_conf_addr(ha, 0x0300 |</div><div class='ctx'> 		    fdt-&gt;unprotect_sec_cmd);</div><div class='ctx'> 		ha-&gt;fdt_protect_sec_cmd = fdt-&gt;protect_sec_cmd ?</div><div class='del'>-		    flash_conf_addr(ha, 0x0300 | fdt-&gt;protect_sec_cmd):</div><div class='add'>+		    flash_conf_addr(ha, 0x0300 | fdt-&gt;protect_sec_cmd) :</div><div class='ctx'> 		    flash_conf_addr(ha, 0x0336);</div><div class='ctx'> 	}</div><div class='ctx'> 	goto done;</div><div class='hunk'>@@ -1019,8 +1048,7 @@ qla2xxx_get_idc_param(scsi_qla_host_t *vha)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	wptr = (uint32_t *)req-&gt;ring;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)req-&gt;ring,</div><div class='del'>-		QLA82XX_IDC_PARAM_ADDR , 8);</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, req-&gt;ring, QLA82XX_IDC_PARAM_ADDR, 8);</div><div class='ctx'> </div><div class='ctx'> 	if (*wptr == cpu_to_le32(0xffffffff)) {</div><div class='ctx'> 		ha-&gt;fcoe_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;</div><div class='hunk'>@@ -1045,7 +1073,8 @@ qla2xxx_get_flash_info(scsi_qla_host_t *vha)</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_QLA24XX_TYPE(ha) &amp;&amp; !IS_QLA25XX(ha) &amp;&amp;</div><div class='del'>-	    !IS_CNA_CAPABLE(ha) &amp;&amp; !IS_QLA2031(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	    !IS_CNA_CAPABLE(ha) &amp;&amp; !IS_QLA2031(ha) &amp;&amp;</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		return QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	ret = qla2xxx_find_flt_start(vha, &amp;flt_addr);</div><div class='hunk'>@@ -1081,8 +1110,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)</div><div class='ctx'> 	if (IS_QLA8044(ha))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)&amp;hdr,</div><div class='del'>-	    ha-&gt;flt_region_npiv_conf &lt;&lt; 2, sizeof(struct qla_npiv_header));</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, &amp;hdr, ha-&gt;flt_region_npiv_conf &lt;&lt; 2,</div><div class='add'>+	    sizeof(struct qla_npiv_header));</div><div class='ctx'> 	if (hdr.version == cpu_to_le16(0xffff))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (hdr.version != cpu_to_le16(1)) {</div><div class='hunk'>@@ -1101,8 +1130,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)data,</div><div class='del'>-	    ha-&gt;flt_region_npiv_conf &lt;&lt; 2, NPIV_CONFIG_SIZE);</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, data, ha-&gt;flt_region_npiv_conf &lt;&lt; 2,</div><div class='add'>+	    NPIV_CONFIG_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	cnt = (sizeof(hdr) + le16_to_cpu(hdr.entries) * sizeof(*entry)) &gt;&gt; 1;</div><div class='ctx'> 	for (wptr = data, chksum = 0; cnt--; wptr++)</div><div class='hunk'>@@ -1139,10 +1168,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)</div><div class='ctx'> 		vid.node_name = wwn_to_u64(entry-&gt;node_name);</div><div class='ctx'> </div><div class='ctx'> 		ql_dbg(ql_dbg_user, vha, 0x7093,</div><div class='del'>-		    "NPIV[%02x]: wwpn=%llx "</div><div class='del'>-		    "wwnn=%llx vf_id=0x%x Q_qos=0x%x F_qos=0x%x.\n", cnt,</div><div class='del'>-		    (unsigned long long)vid.port_name,</div><div class='del'>-		    (unsigned long long)vid.node_name,</div><div class='add'>+		    "NPIV[%02x]: wwpn=%llx wwnn=%llx vf_id=%#x Q_qos=%#x F_qos=%#x.\n",</div><div class='add'>+		    cnt, vid.port_name, vid.node_name,</div><div class='ctx'> 		    le16_to_cpu(entry-&gt;vf_id),</div><div class='ctx'> 		    entry-&gt;q_qos, entry-&gt;f_qos);</div><div class='ctx'> </div><div class='hunk'>@@ -1150,10 +1177,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)</div><div class='ctx'> 			vport = fc_vport_create(vha-&gt;host, 0, &amp;vid);</div><div class='ctx'> 			if (!vport)</div><div class='ctx'> 				ql_log(ql_log_warn, vha, 0x7094,</div><div class='del'>-				    "NPIV-Config Failed to create vport [%02x]: "</div><div class='del'>-				    "wwpn=%llx wwnn=%llx.\n", cnt,</div><div class='del'>-				    (unsigned long long)vid.port_name,</div><div class='del'>-				    (unsigned long long)vid.node_name);</div><div class='add'>+				    "NPIV-Config Failed to create vport [%02x]: wwpn=%llx wwnn=%llx.\n",</div><div class='add'>+				    cnt, vid.port_name, vid.node_name);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='hunk'>@@ -1188,9 +1213,10 @@ done:</div><div class='ctx'> static int</div><div class='ctx'> qla24xx_protect_flash(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='del'>-	uint32_t cnt;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='add'>+	ulong cnt = 300;</div><div class='add'>+	uint32_t faddr, dword;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;flags.fac_supported)</div><div class='ctx'> 		return qla81xx_fac_do_write_enable(vha, 0);</div><div class='hunk'>@@ -1199,11 +1225,14 @@ qla24xx_protect_flash(scsi_qla_host_t *vha)</div><div class='ctx'> 		goto skip_wrt_protect;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable flash write-protection and wait for completion. */</div><div class='del'>-	qla24xx_write_flash_dword(ha, flash_conf_addr(ha, 0x101),</div><div class='del'>-	    ha-&gt;fdt_wrt_disable);</div><div class='del'>-	for (cnt = 300; cnt &amp;&amp;</div><div class='del'>-	    qla24xx_read_flash_dword(ha, flash_conf_addr(ha, 0x005)) &amp; BIT_0;</div><div class='del'>-	    cnt--) {</div><div class='add'>+	faddr = flash_conf_addr(ha, 0x101);</div><div class='add'>+	qla24xx_write_flash_dword(ha, faddr, ha-&gt;fdt_wrt_disable);</div><div class='add'>+	faddr = flash_conf_addr(ha, 0x5);</div><div class='add'>+	while (cnt--) {</div><div class='add'>+		if (!qla24xx_read_flash_dword(ha, faddr, &amp;dword)) {</div><div class='add'>+			if (!(dword &amp; BIT_0))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1211,7 +1240,6 @@ skip_wrt_protect:</div><div class='ctx'> 	/* Disable flash write. */</div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;ctrl_status,</div><div class='ctx'> 	    RD_REG_DWORD(&amp;reg-&gt;ctrl_status) &amp; ~CSRX_FLASH_ENABLE);</div><div class='del'>-	RD_REG_DWORD(&amp;reg-&gt;ctrl_status);	/* PCI Posting. */</div><div class='ctx'> </div><div class='ctx'> 	return QLA_SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -1239,107 +1267,103 @@ qla24xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'>     uint32_t dwords)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	uint32_t liter;</div><div class='del'>-	uint32_t sec_mask, rest_addr;</div><div class='del'>-	uint32_t fdata;</div><div class='add'>+	ulong liter;</div><div class='add'>+	ulong dburst = OPTROM_BURST_DWORDS; /* burst size in dwords */</div><div class='add'>+	uint32_t sec_mask, rest_addr, fdata;</div><div class='ctx'> 	dma_addr_t optrom_dma;</div><div class='ctx'> 	void *optrom = NULL;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	/* Prepare burst-capable write on supported ISPs. */</div><div class='del'>-	if ((IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) ||</div><div class='del'>-	    IS_QLA27XX(ha)) &amp;&amp;</div><div class='del'>-	    !(faddr &amp; 0xfff) &amp;&amp; dwords &gt; OPTROM_BURST_DWORDS) {</div><div class='del'>-		optrom = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, OPTROM_BURST_SIZE,</div><div class='del'>-		    &amp;optrom_dma, GFP_KERNEL);</div><div class='del'>-		if (!optrom) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x7095,</div><div class='del'>-			    "Unable to allocate "</div><div class='del'>-			    "memory for optrom burst write (%x KB).\n",</div><div class='del'>-			    OPTROM_BURST_SIZE / 1024);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA83XX(ha) &amp;&amp;</div><div class='add'>+	    !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='add'>+		goto next;</div><div class='ctx'> </div><div class='del'>-	rest_addr = (ha-&gt;fdt_block_size &gt;&gt; 2) - 1;</div><div class='del'>-	sec_mask = ~rest_addr;</div><div class='add'>+	/* Allocate dma buffer for burst write */</div><div class='add'>+	optrom = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, OPTROM_BURST_SIZE,</div><div class='add'>+	    &amp;optrom_dma, GFP_KERNEL);</div><div class='add'>+	if (!optrom) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x7095,</div><div class='add'>+		    "Failed allocate burst (%x bytes)\n", OPTROM_BURST_SIZE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+next:</div><div class='add'>+	ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+	    "Unprotect flash...\n");</div><div class='ctx'> 	ret = qla24xx_unprotect_flash(vha);</div><div class='del'>-	if (ret != QLA_SUCCESS) {</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x7096,</div><div class='del'>-		    "Unable to unprotect flash for update.\n");</div><div class='add'>+		    "Failed to unprotect flash.\n");</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rest_addr = (ha-&gt;fdt_block_size &gt;&gt; 2) - 1;</div><div class='add'>+	sec_mask = ~rest_addr;</div><div class='ctx'> 	for (liter = 0; liter &lt; dwords; liter++, faddr++, dwptr++) {</div><div class='ctx'> 		fdata = (faddr &amp; sec_mask) &lt;&lt; 2;</div><div class='ctx'> </div><div class='ctx'> 		/* Are we at the beginning of a sector? */</div><div class='del'>-		if ((faddr &amp; rest_addr) == 0) {</div><div class='del'>-			/* Do sector unprotect. */</div><div class='del'>-			if (ha-&gt;fdt_unprotect_sec_cmd)</div><div class='del'>-				qla24xx_write_flash_dword(ha,</div><div class='del'>-				    ha-&gt;fdt_unprotect_sec_cmd,</div><div class='del'>-				    (fdata &amp; 0xff00) | ((fdata &lt;&lt; 16) &amp;</div><div class='del'>-				    0xff0000) | ((fdata &gt;&gt; 16) &amp; 0xff));</div><div class='add'>+		if (!(faddr &amp; rest_addr)) {</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+			    "Erase sector %#x...\n", faddr);</div><div class='add'>+</div><div class='ctx'> 			ret = qla24xx_erase_sector(vha, fdata);</div><div class='del'>-			if (ret != QLA_SUCCESS) {</div><div class='add'>+			if (ret) {</div><div class='ctx'> 				ql_dbg(ql_dbg_user, vha, 0x7007,</div><div class='del'>-				    "Unable to erase erase sector: address=%x.\n",</div><div class='del'>-				    faddr);</div><div class='add'>+				    "Failed to erase sector %x.\n", faddr);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Go with burst-write. */</div><div class='del'>-		if (optrom &amp;&amp; (liter + OPTROM_BURST_DWORDS) &lt;= dwords) {</div><div class='del'>-			/* Copy data to DMA'ble buffer. */</div><div class='del'>-			memcpy(optrom, dwptr, OPTROM_BURST_SIZE);</div><div class='add'>+		if (optrom) {</div><div class='add'>+			/* If smaller than a burst remaining */</div><div class='add'>+			if (dwords - liter &lt; dburst)</div><div class='add'>+				dburst = dwords - liter;</div><div class='ctx'> </div><div class='add'>+			/* Copy to dma buffer */</div><div class='add'>+			memcpy(optrom, dwptr, dburst &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+			/* Burst write */</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+			    "Write burst (%#lx dwords)...\n", dburst);</div><div class='ctx'> 			ret = qla2x00_load_ram(vha, optrom_dma,</div><div class='del'>-			    flash_data_addr(ha, faddr),</div><div class='del'>-			    OPTROM_BURST_DWORDS);</div><div class='del'>-			if (ret != QLA_SUCCESS) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x7097,</div><div class='del'>-				    "Unable to burst-write optrom segment "</div><div class='del'>-				    "(%x/%x/%llx).\n", ret,</div><div class='del'>-				    flash_data_addr(ha, faddr),</div><div class='del'>-				    (unsigned long long)optrom_dma);</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x7098,</div><div class='del'>-				    "Reverting to slow-write.\n");</div><div class='del'>-</div><div class='del'>-				dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='del'>-				    OPTROM_BURST_SIZE, optrom, optrom_dma);</div><div class='del'>-				optrom = NULL;</div><div class='del'>-			} else {</div><div class='del'>-				liter += OPTROM_BURST_DWORDS - 1;</div><div class='del'>-				faddr += OPTROM_BURST_DWORDS - 1;</div><div class='del'>-				dwptr += OPTROM_BURST_DWORDS - 1;</div><div class='add'>+			    flash_data_addr(ha, faddr), dburst);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				liter += dburst - 1;</div><div class='add'>+				faddr += dburst - 1;</div><div class='add'>+				dwptr += dburst - 1;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x7097,</div><div class='add'>+			    "Failed burst-write at %x (%p/%#llx)....\n",</div><div class='add'>+			    flash_data_addr(ha, faddr), optrom,</div><div class='add'>+			    (u64)optrom_dma);</div><div class='add'>+</div><div class='add'>+			dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='add'>+			    OPTROM_BURST_SIZE, optrom, optrom_dma);</div><div class='add'>+			optrom = NULL;</div><div class='add'>+			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='add'>+				break;</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x7098,</div><div class='add'>+			    "Reverting to slow write...\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Slow write */</div><div class='ctx'> 		ret = qla24xx_write_flash_dword(ha,</div><div class='ctx'> 		    flash_data_addr(ha, faddr), cpu_to_le32(*dwptr));</div><div class='del'>-		if (ret != QLA_SUCCESS) {</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			ql_dbg(ql_dbg_user, vha, 0x7006,</div><div class='del'>-			    "Unable to program flash address=%x data=%x.\n",</div><div class='del'>-			    faddr, *dwptr);</div><div class='add'>+			    "Failed slopw write %x (%x)\n", faddr, *dwptr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Do sector protect. */</div><div class='del'>-		if (ha-&gt;fdt_unprotect_sec_cmd &amp;&amp;</div><div class='del'>-		    ((faddr &amp; rest_addr) == rest_addr))</div><div class='del'>-			qla24xx_write_flash_dword(ha,</div><div class='del'>-			    ha-&gt;fdt_protect_sec_cmd,</div><div class='del'>-			    (fdata &amp; 0xff00) | ((fdata &lt;&lt; 16) &amp;</div><div class='del'>-			    0xff0000) | ((fdata &gt;&gt; 16) &amp; 0xff));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+	    "Protect flash...\n");</div><div class='ctx'> 	ret = qla24xx_protect_flash(vha);</div><div class='del'>-	if (ret != QLA_SUCCESS)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x7099,</div><div class='del'>-		    "Unable to protect flash after update.\n");</div><div class='add'>+		    "Failed to protect flash\n");</div><div class='ctx'> done:</div><div class='ctx'> 	if (optrom)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -1349,7 +1373,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint8_t *</div><div class='del'>-qla2x00_read_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='add'>+qla2x00_read_nvram_data(scsi_qla_host_t *vha, void *buf, uint32_t naddr,</div><div class='ctx'>     uint32_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t i;</div><div class='hunk'>@@ -1368,27 +1392,30 @@ qla2x00_read_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint8_t *</div><div class='del'>-qla24xx_read_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='add'>+qla24xx_read_nvram_data(scsi_qla_host_t *vha, void *buf, uint32_t naddr,</div><div class='ctx'>     uint32_t bytes)</div><div class='ctx'> {</div><div class='del'>-	uint32_t i;</div><div class='del'>-	uint32_t *dwptr;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	uint32_t *dwptr = buf;</div><div class='add'>+	uint32_t i;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_P3P_TYPE(ha))</div><div class='ctx'> 		return  buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Dword reads to flash. */</div><div class='del'>-	dwptr = (uint32_t *)buf;</div><div class='del'>-	for (i = 0; i &lt; bytes &gt;&gt; 2; i++, naddr++)</div><div class='del'>-		dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,</div><div class='del'>-		    nvram_data_addr(ha, naddr)));</div><div class='add'>+	naddr = nvram_data_addr(ha, naddr);</div><div class='add'>+	bytes &gt;&gt;= 2;</div><div class='add'>+	for (i = 0; i &lt; bytes; i++, naddr++, dwptr++) {</div><div class='add'>+		if (qla24xx_read_flash_dword(ha, naddr, dwptr))</div><div class='add'>+			break;</div><div class='add'>+		cpu_to_le32s(dwptr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-qla2x00_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='add'>+qla2x00_write_nvram_data(scsi_qla_host_t *vha, void *buf, uint32_t naddr,</div><div class='ctx'>     uint32_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, stat;</div><div class='hunk'>@@ -1422,14 +1449,14 @@ qla2x00_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-qla24xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='add'>+qla24xx_write_nvram_data(scsi_qla_host_t *vha, void *buf, uint32_t naddr,</div><div class='ctx'>     uint32_t bytes)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	uint32_t i;</div><div class='del'>-	uint32_t *dwptr;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='add'>+	uint32_t *dwptr = buf;</div><div class='add'>+	uint32_t i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = QLA_SUCCESS;</div><div class='ctx'> </div><div class='hunk'>@@ -1446,11 +1473,10 @@ qla24xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='ctx'> 	qla24xx_write_flash_dword(ha, nvram_conf_addr(ha, 0x101), 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Dword writes to flash. */</div><div class='del'>-	dwptr = (uint32_t *)buf;</div><div class='del'>-	for (i = 0; i &lt; bytes &gt;&gt; 2; i++, naddr++, dwptr++) {</div><div class='del'>-		ret = qla24xx_write_flash_dword(ha,</div><div class='del'>-		    nvram_data_addr(ha, naddr), cpu_to_le32(*dwptr));</div><div class='del'>-		if (ret != QLA_SUCCESS) {</div><div class='add'>+	naddr = nvram_data_addr(ha, naddr);</div><div class='add'>+	bytes &gt;&gt;= 2;</div><div class='add'>+	for (i = 0; i &lt; bytes; i++, naddr++, dwptr++) {</div><div class='add'>+		if (qla24xx_write_flash_dword(ha, naddr, cpu_to_le32(*dwptr))) {</div><div class='ctx'> 			ql_dbg(ql_dbg_user, vha, 0x709a,</div><div class='ctx'> 			    "Unable to program nvram address=%x data=%x.\n",</div><div class='ctx'> 			    naddr, *dwptr);</div><div class='hunk'>@@ -1470,31 +1496,34 @@ qla24xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint8_t *</div><div class='del'>-qla25xx_read_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='add'>+qla25xx_read_nvram_data(scsi_qla_host_t *vha, void *buf, uint32_t naddr,</div><div class='ctx'>     uint32_t bytes)</div><div class='ctx'> {</div><div class='del'>-	uint32_t i;</div><div class='del'>-	uint32_t *dwptr;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	uint32_t *dwptr = buf;</div><div class='add'>+	uint32_t i;</div><div class='ctx'> </div><div class='ctx'> 	/* Dword reads to flash. */</div><div class='del'>-	dwptr = (uint32_t *)buf;</div><div class='del'>-	for (i = 0; i &lt; bytes &gt;&gt; 2; i++, naddr++)</div><div class='del'>-		dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,</div><div class='del'>-		    flash_data_addr(ha, ha-&gt;flt_region_vpd_nvram | naddr)));</div><div class='add'>+	naddr = flash_data_addr(ha, ha-&gt;flt_region_vpd_nvram | naddr);</div><div class='add'>+	bytes &gt;&gt;= 2;</div><div class='add'>+	for (i = 0; i &lt; bytes; i++, naddr++, dwptr++) {</div><div class='add'>+		if (qla24xx_read_flash_dword(ha, naddr, dwptr))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cpu_to_le32s(dwptr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define RMW_BUFFER_SIZE	(64 * 1024)</div><div class='ctx'> int</div><div class='del'>-qla25xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,</div><div class='add'>+qla25xx_write_nvram_data(scsi_qla_host_t *vha, void *buf, uint32_t naddr,</div><div class='ctx'>     uint32_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-#define RMW_BUFFER_SIZE	(64 * 1024)</div><div class='del'>-	uint8_t *dbuf;</div><div class='add'>+	uint8_t *dbuf = vmalloc(RMW_BUFFER_SIZE);</div><div class='ctx'> </div><div class='del'>-	dbuf = vmalloc(RMW_BUFFER_SIZE);</div><div class='ctx'> 	if (!dbuf)</div><div class='ctx'> 		return QLA_MEMORY_ALLOC_FAILED;</div><div class='ctx'> 	ha-&gt;isp_ops-&gt;read_optrom(vha, dbuf, ha-&gt;flt_region_vpd_nvram &lt;&lt; 2,</div><div class='hunk'>@@ -1728,7 +1757,7 @@ qla83xx_select_led_port(struct qla_hw_data *ha)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t led_select_value = 0;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp; !IS_QLA28XX(ha))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;port_no == 0)</div><div class='hunk'>@@ -1749,13 +1778,14 @@ qla83xx_beacon_blink(struct scsi_qla_host *vha)</div><div class='ctx'> 	uint16_t orig_led_cfg[6];</div><div class='ctx'> 	uint32_t led_10_value, led_43_value;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA27XX(ha))</div><div class='add'>+	if (!IS_QLA83XX(ha) &amp;&amp; !IS_QLA81XX(ha) &amp;&amp; !IS_QLA27XX(ha) &amp;&amp;</div><div class='add'>+	    !IS_QLA28XX(ha))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!ha-&gt;beacon_blink_led)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA27XX(ha)) {</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 		qla2x00_write_ram_word(vha, 0x1003, 0x40000230);</div><div class='ctx'> 		qla2x00_write_ram_word(vha, 0x1004, 0x40000230);</div><div class='ctx'> 	} else if (IS_QLA2031(ha)) {</div><div class='hunk'>@@ -1845,7 +1875,7 @@ qla24xx_beacon_on(struct scsi_qla_host *vha)</div><div class='ctx'> 			return QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (IS_QLA2031(ha) || IS_QLA27XX(ha))</div><div class='add'>+		if (IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 			goto skip_gpio;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='hunk'>@@ -1885,7 +1915,7 @@ qla24xx_beacon_off(struct scsi_qla_host *vha)</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;beacon_blink_led = 0;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA2031(ha) || IS_QLA27XX(ha))</div><div class='add'>+	if (IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		goto set_fw_options;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA8031(ha) || IS_QLA81XX(ha))</div><div class='hunk'>@@ -2314,8 +2344,8 @@ qla2x00_resume_hba(struct scsi_qla_host *vha)</div><div class='ctx'> 	scsi_unblock_requests(vha-&gt;host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-uint8_t *</div><div class='del'>-qla2x00_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+void *</div><div class='add'>+qla2x00_read_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'>     uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t addr, midpoint;</div><div class='hunk'>@@ -2349,12 +2379,12 @@ qla2x00_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-qla2x00_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+qla2x00_write_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'>     uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	int rval;</div><div class='del'>-	uint8_t man_id, flash_id, sec_number, data;</div><div class='add'>+	uint8_t man_id, flash_id, sec_number, *data;</div><div class='ctx'> 	uint16_t wd;</div><div class='ctx'> 	uint32_t addr, liter, sec_mask, rest_addr;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='hunk'>@@ -2483,7 +2513,7 @@ update_flash:</div><div class='ctx'> </div><div class='ctx'> 		for (addr = offset, liter = 0; liter &lt; length; liter++,</div><div class='ctx'> 		    addr++) {</div><div class='del'>-			data = buf[liter];</div><div class='add'>+			data = buf + liter;</div><div class='ctx'> 			/* Are we at the beginning of a sector? */</div><div class='ctx'> 			if ((addr &amp; rest_addr) == 0) {</div><div class='ctx'> 				if (IS_QLA2322(ha) || IS_QLA6322(ha)) {</div><div class='hunk'>@@ -2551,7 +2581,7 @@ update_flash:</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (qla2x00_program_flash_address(ha, addr, data,</div><div class='add'>+			if (qla2x00_program_flash_address(ha, addr, *data,</div><div class='ctx'> 			    man_id, flash_id)) {</div><div class='ctx'> 				rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2567,8 +2597,8 @@ update_flash:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-uint8_t *</div><div class='del'>-qla24xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+void *</div><div class='add'>+qla24xx_read_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'>     uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='hunk'>@@ -2578,7 +2608,7 @@ qla24xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> 	set_bit(MBX_UPDATE_FLASH_ACTIVE, &amp;ha-&gt;mbx_cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Go with read. */</div><div class='del'>-	qla24xx_read_flash_data(vha, (uint32_t *)buf, offset &gt;&gt; 2, length &gt;&gt; 2);</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)buf, offset &gt;&gt; 2, length &gt;&gt; 2);</div><div class='ctx'> </div><div class='ctx'> 	/* Resume HBA. */</div><div class='ctx'> 	clear_bit(MBX_UPDATE_FLASH_ACTIVE, &amp;ha-&gt;mbx_cmd_flags);</div><div class='hunk'>@@ -2587,8 +2617,340 @@ qla24xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+qla28xx_extract_sfub_and_verify(struct scsi_qla_host *vha, uint32_t *buf,</div><div class='add'>+    uint32_t len, uint32_t buf_size_without_sfub, uint8_t *sfub_buf)</div><div class='add'>+{</div><div class='add'>+	uint32_t *p, check_sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	p = buf + buf_size_without_sfub;</div><div class='add'>+</div><div class='add'>+	/* Extract SFUB from end of file */</div><div class='add'>+	memcpy(sfub_buf, (uint8_t *)p,</div><div class='add'>+	    sizeof(struct secure_flash_update_block));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (sizeof(struct secure_flash_update_block) &gt;&gt; 2); i++)</div><div class='add'>+		check_sum += p[i];</div><div class='add'>+</div><div class='add'>+	check_sum = (~check_sum) + 1;</div><div class='add'>+</div><div class='add'>+	if (check_sum != p[i]) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x7097,</div><div class='add'>+		    "SFUB checksum failed, 0x%x, 0x%x\n",</div><div class='add'>+		    check_sum, p[i]);</div><div class='add'>+		return QLA_COMMAND_ERROR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return QLA_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qla28xx_get_flash_region(struct scsi_qla_host *vha, uint32_t start,</div><div class='add'>+    struct qla_flt_region *region)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct qla_flt_header *flt;</div><div class='add'>+	struct qla_flt_region *flt_reg;</div><div class='add'>+	uint16_t cnt;</div><div class='add'>+	int rval = QLA_FUNCTION_FAILED;</div><div class='add'>+</div><div class='add'>+	if (!ha-&gt;flt)</div><div class='add'>+		return QLA_FUNCTION_FAILED;</div><div class='add'>+</div><div class='add'>+	flt = (struct qla_flt_header *)ha-&gt;flt;</div><div class='add'>+	flt_reg = (struct qla_flt_region *)&amp;flt[1];</div><div class='add'>+	cnt = le16_to_cpu(flt-&gt;length) / sizeof(struct qla_flt_region);</div><div class='add'>+</div><div class='add'>+	for (; cnt; cnt--, flt_reg++) {</div><div class='add'>+		if (flt_reg-&gt;start == start) {</div><div class='add'>+			memcpy((uint8_t *)region, flt_reg,</div><div class='add'>+			    sizeof(struct qla_flt_region));</div><div class='add'>+			rval = QLA_SUCCESS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qla28xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,</div><div class='add'>+    uint32_t dwords)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	ulong liter;</div><div class='add'>+	ulong dburst = OPTROM_BURST_DWORDS; /* burst size in dwords */</div><div class='add'>+	uint32_t sec_mask, rest_addr, fdata;</div><div class='add'>+	void *optrom = NULL;</div><div class='add'>+	dma_addr_t optrom_dma;</div><div class='add'>+	int rval;</div><div class='add'>+	struct secure_flash_update_block *sfub;</div><div class='add'>+	dma_addr_t sfub_dma;</div><div class='add'>+	uint32_t offset = faddr &lt;&lt; 2;</div><div class='add'>+	uint32_t buf_size_without_sfub = 0;</div><div class='add'>+	struct qla_flt_region region;</div><div class='add'>+	bool reset_to_rom = false;</div><div class='add'>+	uint32_t risc_size, risc_attr = 0;</div><div class='add'>+	uint32_t *fw_array = NULL;</div><div class='add'>+</div><div class='add'>+	/* Retrieve region info - must be a start address passed in */</div><div class='add'>+	rval = qla28xx_get_flash_region(vha, offset, &amp;region);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+		    "Invalid address %x - not a region start address\n",</div><div class='add'>+		    offset);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate dma buffer for burst write */</div><div class='add'>+	optrom = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, OPTROM_BURST_SIZE,</div><div class='add'>+	    &amp;optrom_dma, GFP_KERNEL);</div><div class='add'>+	if (!optrom) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x7095,</div><div class='add'>+		    "Failed allocate burst (%x bytes)\n", OPTROM_BURST_SIZE);</div><div class='add'>+		rval = QLA_COMMAND_ERROR;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If adapter supports secure flash and region is secure</div><div class='add'>+	 * extract secure flash update block (SFUB) and verify</div><div class='add'>+	 */</div><div class='add'>+	if (ha-&gt;flags.secure_adapter &amp;&amp; region.attribute) {</div><div class='add'>+</div><div class='add'>+		ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+		    "Region %x is secure\n", region.code);</div><div class='add'>+</div><div class='add'>+		if (region.code == FLT_REG_FW ||</div><div class='add'>+		    region.code == FLT_REG_FW_SEC_27XX) {</div><div class='add'>+			fw_array = dwptr;</div><div class='add'>+</div><div class='add'>+			/* 1st fw array */</div><div class='add'>+			risc_size = be32_to_cpu(fw_array[3]);</div><div class='add'>+			risc_attr = be32_to_cpu(fw_array[9]);</div><div class='add'>+</div><div class='add'>+			buf_size_without_sfub = risc_size;</div><div class='add'>+			fw_array += risc_size;</div><div class='add'>+</div><div class='add'>+			/* 2nd fw array */</div><div class='add'>+			risc_size = be32_to_cpu(fw_array[3]);</div><div class='add'>+</div><div class='add'>+			buf_size_without_sfub += risc_size;</div><div class='add'>+			fw_array += risc_size;</div><div class='add'>+</div><div class='add'>+			/* 1st dump template */</div><div class='add'>+			risc_size = be32_to_cpu(fw_array[2]);</div><div class='add'>+</div><div class='add'>+			/* skip header and ignore checksum */</div><div class='add'>+			buf_size_without_sfub += risc_size;</div><div class='add'>+			fw_array += risc_size;</div><div class='add'>+</div><div class='add'>+			if (risc_attr &amp; BIT_9) {</div><div class='add'>+				/* 2nd dump template */</div><div class='add'>+				risc_size = be32_to_cpu(fw_array[2]);</div><div class='add'>+</div><div class='add'>+				/* skip header and ignore checksum */</div><div class='add'>+				buf_size_without_sfub += risc_size;</div><div class='add'>+				fw_array += risc_size;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+			    "Secure region %x not supported\n",</div><div class='add'>+			    region.code);</div><div class='add'>+			rval = QLA_COMMAND_ERROR;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sfub = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='add'>+			sizeof(struct secure_flash_update_block), &amp;sfub_dma,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+		if (!sfub) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+			    "Unable to allocate memory for SFUB\n");</div><div class='add'>+			rval = QLA_COMMAND_ERROR;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rval = qla28xx_extract_sfub_and_verify(vha, dwptr, dwords,</div><div class='add'>+			buf_size_without_sfub, (uint8_t *)sfub);</div><div class='add'>+</div><div class='add'>+		if (rval != QLA_SUCCESS)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+		    "SFUB extract and verify successful\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rest_addr = (ha-&gt;fdt_block_size &gt;&gt; 2) - 1;</div><div class='add'>+	sec_mask = ~rest_addr;</div><div class='add'>+</div><div class='add'>+	/* Lock semaphore */</div><div class='add'>+	rval = qla81xx_fac_semaphore_access(vha, FAC_SEMAPHORE_LOCK);</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+		    "Unable to lock flash semaphore.");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+	    "Unprotect flash...\n");</div><div class='add'>+	rval = qla24xx_unprotect_flash(vha);</div><div class='add'>+	if (rval) {</div><div class='add'>+		qla81xx_fac_semaphore_access(vha, FAC_SEMAPHORE_UNLOCK);</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x7096, "Failed unprotect flash\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (liter = 0; liter &lt; dwords; liter++, faddr++) {</div><div class='add'>+		fdata = (faddr &amp; sec_mask) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+		/* If start of sector */</div><div class='add'>+		if (!(faddr &amp; rest_addr)) {</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+			    "Erase sector %#x...\n", faddr);</div><div class='add'>+			rval = qla24xx_erase_sector(vha, fdata);</div><div class='add'>+			if (rval) {</div><div class='add'>+				ql_dbg(ql_dbg_user, vha, 0x7007,</div><div class='add'>+				    "Failed erase sector %#x\n", faddr);</div><div class='add'>+				goto write_protect;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ha-&gt;flags.secure_adapter) {</div><div class='add'>+		/*</div><div class='add'>+		 * If adapter supports secure flash but FW doesn't,</div><div class='add'>+		 * disable write protect, release semaphore and reset</div><div class='add'>+		 * chip to execute ROM code in order to update region securely</div><div class='add'>+		 */</div><div class='add'>+		if (!ha-&gt;flags.secure_fw) {</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+			    "Disable Write and Release Semaphore.");</div><div class='add'>+			rval = qla24xx_protect_flash(vha);</div><div class='add'>+			if (rval != QLA_SUCCESS) {</div><div class='add'>+				qla81xx_fac_semaphore_access(vha,</div><div class='add'>+					FAC_SEMAPHORE_UNLOCK);</div><div class='add'>+				ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+				    "Unable to protect flash.");</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+			    "Reset chip to ROM.");</div><div class='add'>+			set_bit(ISP_ABORT_NEEDED, &amp;vha-&gt;dpc_flags);</div><div class='add'>+			set_bit(ISP_ABORT_TO_ROM, &amp;vha-&gt;dpc_flags);</div><div class='add'>+			qla2xxx_wake_dpc(vha);</div><div class='add'>+			rval = qla2x00_wait_for_chip_reset(vha);</div><div class='add'>+			if (rval != QLA_SUCCESS) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+				    "Unable to reset to ROM code.");</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='add'>+			reset_to_rom = true;</div><div class='add'>+			ha-&gt;flags.fac_supported = 0;</div><div class='add'>+</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+			    "Lock Semaphore");</div><div class='add'>+			rval = qla2xxx_write_remote_register(vha,</div><div class='add'>+			    FLASH_SEMAPHORE_REGISTER_ADDR, 0x00020002);</div><div class='add'>+			if (rval != QLA_SUCCESS) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+				    "Unable to lock flash semaphore.");</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Unprotect flash */</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+			    "Enable Write.");</div><div class='add'>+			rval = qla2x00_write_ram_word(vha, 0x7ffd0101, 0);</div><div class='add'>+			if (rval) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0x7096,</div><div class='add'>+				    "Failed unprotect flash\n");</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If region is secure, send Secure Flash MB Cmd */</div><div class='add'>+		if (region.attribute &amp;&amp; buf_size_without_sfub) {</div><div class='add'>+			ql_log(ql_log_warn + ql_dbg_verbose, vha, 0xffff,</div><div class='add'>+			    "Sending Secure Flash MB Cmd\n");</div><div class='add'>+			rval = qla28xx_secure_flash_update(vha, 0, region.code,</div><div class='add'>+				buf_size_without_sfub, sfub_dma,</div><div class='add'>+				sizeof(struct secure_flash_update_block));</div><div class='add'>+			if (rval != QLA_SUCCESS) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+				    "Secure Flash MB Cmd failed %x.", rval);</div><div class='add'>+				goto write_protect;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* re-init flash offset */</div><div class='add'>+	faddr = offset &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	for (liter = 0; liter &lt; dwords; liter++, faddr++, dwptr++) {</div><div class='add'>+		fdata = (faddr &amp; sec_mask) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+		/* If smaller than a burst remaining */</div><div class='add'>+		if (dwords - liter &lt; dburst)</div><div class='add'>+			dburst = dwords - liter;</div><div class='add'>+</div><div class='add'>+		/* Copy to dma buffer */</div><div class='add'>+		memcpy(optrom, dwptr, dburst &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+		/* Burst write */</div><div class='add'>+		ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+		    "Write burst (%#lx dwords)...\n", dburst);</div><div class='add'>+		rval = qla2x00_load_ram(vha, optrom_dma,</div><div class='add'>+		    flash_data_addr(ha, faddr), dburst);</div><div class='add'>+		if (rval != QLA_SUCCESS) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x7097,</div><div class='add'>+			    "Failed burst write at %x (%p/%#llx)...\n",</div><div class='add'>+			    flash_data_addr(ha, faddr), optrom,</div><div class='add'>+			    (u64)optrom_dma);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		liter += dburst - 1;</div><div class='add'>+		faddr += dburst - 1;</div><div class='add'>+		dwptr += dburst - 1;</div><div class='add'>+		continue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+write_protect:</div><div class='add'>+	ql_log(ql_log_warn + ql_dbg_verbose, vha, 0x7095,</div><div class='add'>+	    "Protect flash...\n");</div><div class='add'>+	rval = qla24xx_protect_flash(vha);</div><div class='add'>+	if (rval) {</div><div class='add'>+		qla81xx_fac_semaphore_access(vha, FAC_SEMAPHORE_UNLOCK);</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x7099,</div><div class='add'>+		    "Failed protect flash\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reset_to_rom == true) {</div><div class='add'>+		/* Schedule DPC to restart the RISC */</div><div class='add'>+		set_bit(ISP_ABORT_NEEDED, &amp;vha-&gt;dpc_flags);</div><div class='add'>+		qla2xxx_wake_dpc(vha);</div><div class='add'>+</div><div class='add'>+		rval = qla2x00_wait_for_hba_online(vha);</div><div class='add'>+		if (rval != QLA_SUCCESS)</div><div class='add'>+			ql_log(ql_log_warn, vha, 0xffff,</div><div class='add'>+			    "Adapter did not come out of reset\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (optrom)</div><div class='add'>+		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='add'>+		    OPTROM_BURST_SIZE, optrom, optrom_dma);</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='del'>-qla24xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+qla24xx_write_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'>     uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	int rval;</div><div class='hunk'>@@ -2599,8 +2961,12 @@ qla24xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> 	set_bit(MBX_UPDATE_FLASH_ACTIVE, &amp;ha-&gt;mbx_cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Go with write. */</div><div class='del'>-	rval = qla24xx_write_flash_data(vha, (uint32_t *)buf, offset &gt;&gt; 2,</div><div class='del'>-	    length &gt;&gt; 2);</div><div class='add'>+	if (IS_QLA28XX(ha))</div><div class='add'>+		rval = qla28xx_write_flash_data(vha, (uint32_t *)buf,</div><div class='add'>+		    offset &gt;&gt; 2, length &gt;&gt; 2);</div><div class='add'>+	else</div><div class='add'>+		rval = qla24xx_write_flash_data(vha, (uint32_t *)buf,</div><div class='add'>+		    offset &gt;&gt; 2, length &gt;&gt; 2);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MBX_UPDATE_FLASH_ACTIVE, &amp;ha-&gt;mbx_cmd_flags);</div><div class='ctx'> 	scsi_unblock_requests(vha-&gt;host);</div><div class='hunk'>@@ -2608,8 +2974,8 @@ qla24xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-uint8_t *</div><div class='del'>-qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='add'>+void *</div><div class='add'>+qla25xx_read_optrom_data(struct scsi_qla_host *vha, void *buf,</div><div class='ctx'>     uint32_t offset, uint32_t length)</div><div class='ctx'> {</div><div class='ctx'> 	int rval;</div><div class='hunk'>@@ -2620,7 +2986,7 @@ qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) ||</div><div class='del'>-	    IS_QLA27XX(ha))</div><div class='add'>+	    IS_QLA27XX(ha) || IS_QLA28XX(ha))</div><div class='ctx'> 		goto try_fast;</div><div class='ctx'> 	if (offset &amp; 0xfff)</div><div class='ctx'> 		goto slow_read;</div><div class='hunk'>@@ -2628,6 +2994,8 @@ qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> 		goto slow_read;</div><div class='ctx'> </div><div class='ctx'> try_fast:</div><div class='add'>+	if (offset &amp; 0xff)</div><div class='add'>+		goto slow_read;</div><div class='ctx'> 	optrom = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, OPTROM_BURST_SIZE,</div><div class='ctx'> 	    &amp;optrom_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!optrom) {</div><div class='hunk'>@@ -2874,7 +3242,7 @@ qla2x00_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 		    "Dumping fw "</div><div class='ctx'> 		    "ver from flash:.\n");</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x010b,</div><div class='del'>-		    (uint8_t *)dbyte, 8);</div><div class='add'>+		    dbyte, 32);</div><div class='ctx'> </div><div class='ctx'> 		if ((dcode[0] == 0xffff &amp;&amp; dcode[1] == 0xffff &amp;&amp;</div><div class='ctx'> 		    dcode[2] == 0xffff &amp;&amp; dcode[3] == 0xffff) ||</div><div class='hunk'>@@ -2905,8 +3273,8 @@ qla82xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = QLA_SUCCESS;</div><div class='ctx'> 	uint32_t pcihdr, pcids;</div><div class='del'>-	uint32_t *dcode;</div><div class='del'>-	uint8_t *bcode;</div><div class='add'>+	uint32_t *dcode = mbuf;</div><div class='add'>+	uint8_t *bcode = mbuf;</div><div class='ctx'> 	uint8_t code_type, last_image;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='hunk'>@@ -2918,17 +3286,14 @@ qla82xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 	memset(ha-&gt;fcode_revision, 0, sizeof(ha-&gt;fcode_revision));</div><div class='ctx'> 	memset(ha-&gt;fw_revision, 0, sizeof(ha-&gt;fw_revision));</div><div class='ctx'> </div><div class='del'>-	dcode = mbuf;</div><div class='del'>-</div><div class='ctx'> 	/* Begin with first PCI expansion ROM header. */</div><div class='ctx'> 	pcihdr = ha-&gt;flt_region_boot &lt;&lt; 2;</div><div class='ctx'> 	last_image = 1;</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* Verify PCI expansion ROM header. */</div><div class='del'>-		ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)dcode, pcihdr,</div><div class='del'>-		    0x20 * 4);</div><div class='add'>+		ha-&gt;isp_ops-&gt;read_optrom(vha, dcode, pcihdr, 0x20 * 4);</div><div class='ctx'> 		bcode = mbuf + (pcihdr % 4);</div><div class='del'>-		if (bcode[0x0] != 0x55 || bcode[0x1] != 0xaa) {</div><div class='add'>+		if (memcmp(bcode, "\x55\xaa", 2)) {</div><div class='ctx'> 			/* No signature */</div><div class='ctx'> 			ql_log(ql_log_fatal, vha, 0x0154,</div><div class='ctx'> 			    "No matching ROM signature.\n");</div><div class='hunk'>@@ -2939,13 +3304,11 @@ qla82xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 		/* Locate PCI data structure. */</div><div class='ctx'> 		pcids = pcihdr + ((bcode[0x19] &lt;&lt; 8) | bcode[0x18]);</div><div class='ctx'> </div><div class='del'>-		ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)dcode, pcids,</div><div class='del'>-		    0x20 * 4);</div><div class='add'>+		ha-&gt;isp_ops-&gt;read_optrom(vha, dcode, pcids, 0x20 * 4);</div><div class='ctx'> 		bcode = mbuf + (pcihdr % 4);</div><div class='ctx'> </div><div class='ctx'> 		/* Validate signature of PCI data structure. */</div><div class='del'>-		if (bcode[0x0] != 'P' || bcode[0x1] != 'C' ||</div><div class='del'>-		    bcode[0x2] != 'I' || bcode[0x3] != 'R') {</div><div class='add'>+		if (memcmp(bcode, "PCIR", 4)) {</div><div class='ctx'> 			/* Incorrect header. */</div><div class='ctx'> 			ql_log(ql_log_fatal, vha, 0x0155,</div><div class='ctx'> 			    "PCI data struct not found pcir_adr=%x.\n", pcids);</div><div class='hunk'>@@ -2996,8 +3359,7 @@ qla82xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 	/* Read firmware image information. */</div><div class='ctx'> 	memset(ha-&gt;fw_revision, 0, sizeof(ha-&gt;fw_revision));</div><div class='ctx'> 	dcode = mbuf;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)dcode, ha-&gt;flt_region_fw &lt;&lt; 2,</div><div class='del'>-	    0x20);</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, dcode, ha-&gt;flt_region_fw &lt;&lt; 2, 0x20);</div><div class='ctx'> 	bcode = mbuf + (pcihdr % 4);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate signature of PCI data structure. */</div><div class='hunk'>@@ -3019,15 +3381,14 @@ int</div><div class='ctx'> qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = QLA_SUCCESS;</div><div class='del'>-	uint32_t pcihdr, pcids;</div><div class='del'>-	uint32_t *dcode;</div><div class='del'>-	uint8_t *bcode;</div><div class='add'>+	uint32_t pcihdr = 0, pcids = 0;</div><div class='add'>+	uint32_t *dcode = mbuf;</div><div class='add'>+	uint8_t *bcode = mbuf;</div><div class='ctx'> 	uint8_t code_type, last_image;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> 	uint32_t faddr = 0;</div><div class='del'>-</div><div class='del'>-	pcihdr = pcids = 0;</div><div class='add'>+	struct active_regions active_regions = { };</div><div class='ctx'> </div><div class='ctx'> 	if (IS_P3P_TYPE(ha))</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -3040,18 +3401,19 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 	memset(ha-&gt;fcode_revision, 0, sizeof(ha-&gt;fcode_revision));</div><div class='ctx'> 	memset(ha-&gt;fw_revision, 0, sizeof(ha-&gt;fw_revision));</div><div class='ctx'> </div><div class='del'>-	dcode = mbuf;</div><div class='ctx'> 	pcihdr = ha-&gt;flt_region_boot &lt;&lt; 2;</div><div class='del'>-	if (IS_QLA27XX(ha) &amp;&amp;</div><div class='del'>-	    qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)</div><div class='del'>-		pcihdr = ha-&gt;flt_region_boot_sec &lt;&lt; 2;</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+		qla27xx_get_active_image(vha, &amp;active_regions);</div><div class='add'>+		if (active_regions.global == QLA27XX_SECONDARY_IMAGE) {</div><div class='add'>+			pcihdr = ha-&gt;flt_region_boot_sec &lt;&lt; 2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	last_image = 1;</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* Verify PCI expansion ROM header. */</div><div class='ctx'> 		qla24xx_read_flash_data(vha, dcode, pcihdr &gt;&gt; 2, 0x20);</div><div class='ctx'> 		bcode = mbuf + (pcihdr % 4);</div><div class='del'>-		if (bcode[0x0] != 0x55 || bcode[0x1] != 0xaa) {</div><div class='add'>+		if (memcmp(bcode, "\x55\xaa", 2)) {</div><div class='ctx'> 			/* No signature */</div><div class='ctx'> 			ql_log(ql_log_fatal, vha, 0x0059,</div><div class='ctx'> 			    "No matching ROM signature.\n");</div><div class='hunk'>@@ -3066,11 +3428,11 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 		bcode = mbuf + (pcihdr % 4);</div><div class='ctx'> </div><div class='ctx'> 		/* Validate signature of PCI data structure. */</div><div class='del'>-		if (bcode[0x0] != 'P' || bcode[0x1] != 'C' ||</div><div class='del'>-		    bcode[0x2] != 'I' || bcode[0x3] != 'R') {</div><div class='add'>+		if (memcmp(bcode, "PCIR", 4)) {</div><div class='ctx'> 			/* Incorrect header. */</div><div class='ctx'> 			ql_log(ql_log_fatal, vha, 0x005a,</div><div class='ctx'> 			    "PCI data struct not found pcir_adr=%x.\n", pcids);</div><div class='add'>+			ql_dump_buffer(ql_dbg_init, vha, 0x0059, dcode, 32);</div><div class='ctx'> 			ret = QLA_FUNCTION_FAILED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3117,30 +3479,24 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> </div><div class='ctx'> 	/* Read firmware image information. */</div><div class='ctx'> 	memset(ha-&gt;fw_revision, 0, sizeof(ha-&gt;fw_revision));</div><div class='del'>-	dcode = mbuf;</div><div class='ctx'> 	faddr = ha-&gt;flt_region_fw;</div><div class='del'>-	if (IS_QLA27XX(ha) &amp;&amp;</div><div class='del'>-	    qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)</div><div class='del'>-		faddr = ha-&gt;flt_region_fw_sec;</div><div class='del'>-</div><div class='del'>-	qla24xx_read_flash_data(vha, dcode, faddr + 4, 4);</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		dcode[i] = be32_to_cpu(dcode[i]);</div><div class='add'>+	if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='add'>+		qla27xx_get_active_image(vha, &amp;active_regions);</div><div class='add'>+		if (active_regions.global == QLA27XX_SECONDARY_IMAGE)</div><div class='add'>+			faddr = ha-&gt;flt_region_fw_sec;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((dcode[0] == 0xffffffff &amp;&amp; dcode[1] == 0xffffffff &amp;&amp;</div><div class='del'>-	    dcode[2] == 0xffffffff &amp;&amp; dcode[3] == 0xffffffff) ||</div><div class='del'>-	    (dcode[0] == 0 &amp;&amp; dcode[1] == 0 &amp;&amp; dcode[2] == 0 &amp;&amp;</div><div class='del'>-	    dcode[3] == 0)) {</div><div class='add'>+	qla24xx_read_flash_data(vha, dcode, faddr, 8);</div><div class='add'>+	if (qla24xx_risc_firmware_invalid(dcode)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x005f,</div><div class='ctx'> 		    "Unrecognized fw revision at %x.\n",</div><div class='ctx'> 		    ha-&gt;flt_region_fw * 4);</div><div class='add'>+		ql_dump_buffer(ql_dbg_init, vha, 0x005f, dcode, 32);</div><div class='ctx'> 	} else {</div><div class='del'>-		ha-&gt;fw_revision[0] = dcode[0];</div><div class='del'>-		ha-&gt;fw_revision[1] = dcode[1];</div><div class='del'>-		ha-&gt;fw_revision[2] = dcode[2];</div><div class='del'>-		ha-&gt;fw_revision[3] = dcode[3];</div><div class='add'>+		for (i = 0; i &lt; 4; i++)</div><div class='add'>+			ha-&gt;fw_revision[i] = be32_to_cpu(dcode[4+i]);</div><div class='ctx'> 		ql_dbg(ql_dbg_init, vha, 0x0060,</div><div class='del'>-		    "Firmware revision %d.%d.%d (%x).\n",</div><div class='add'>+		    "Firmware revision (flash) %u.%u.%u (%x).\n",</div><div class='ctx'> 		    ha-&gt;fw_revision[0], ha-&gt;fw_revision[1],</div><div class='ctx'> 		    ha-&gt;fw_revision[2], ha-&gt;fw_revision[3]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3152,20 +3508,17 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(ha-&gt;gold_fw_version, 0, sizeof(ha-&gt;gold_fw_version));</div><div class='del'>-	dcode = mbuf;</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)dcode,</div><div class='del'>-	    ha-&gt;flt_region_gold_fw &lt;&lt; 2, 32);</div><div class='del'>-</div><div class='del'>-	if (dcode[4] == 0xFFFFFFFF &amp;&amp; dcode[5] == 0xFFFFFFFF &amp;&amp;</div><div class='del'>-	    dcode[6] == 0xFFFFFFFF &amp;&amp; dcode[7] == 0xFFFFFFFF) {</div><div class='add'>+	faddr = ha-&gt;flt_region_gold_fw;</div><div class='add'>+	qla24xx_read_flash_data(vha, (void *)dcode, ha-&gt;flt_region_gold_fw, 8);</div><div class='add'>+	if (qla24xx_risc_firmware_invalid(dcode)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x0056,</div><div class='del'>-		    "Unrecognized golden fw at 0x%x.\n",</div><div class='del'>-		    ha-&gt;flt_region_gold_fw * 4);</div><div class='add'>+		    "Unrecognized golden fw at %#x.\n", faddr);</div><div class='add'>+		ql_dump_buffer(ql_dbg_init, vha, 0x0056, dcode, 32);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 4; i &lt; 8; i++)</div><div class='del'>-		ha-&gt;gold_fw_version[i-4] = be32_to_cpu(dcode[i]);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		ha-&gt;gold_fw_version[i] = be32_to_cpu(dcode[4+i]);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3237,7 +3590,7 @@ qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *vha)</div><div class='ctx'> 	fcp_prio_addr = ha-&gt;flt_region_fcp_prio;</div><div class='ctx'> </div><div class='ctx'> 	/* first read the fcp priority data header from flash */</div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)ha-&gt;fcp_prio_cfg,</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, ha-&gt;fcp_prio_cfg,</div><div class='ctx'> 			fcp_prio_addr &lt;&lt; 2, FCP_PRIO_CFG_HDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (!qla24xx_fcp_prio_cfg_valid(vha, ha-&gt;fcp_prio_cfg, 0))</div><div class='hunk'>@@ -3248,7 +3601,7 @@ qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *vha)</div><div class='ctx'> 	len = ha-&gt;fcp_prio_cfg-&gt;num_entries * FCP_PRIO_CFG_ENTRY_SIZE;</div><div class='ctx'> 	max_len = FCP_PRIO_CFG_SIZE - FCP_PRIO_CFG_HDR_SIZE;</div><div class='ctx'> </div><div class='del'>-	ha-&gt;isp_ops-&gt;read_optrom(vha, (uint8_t *)&amp;ha-&gt;fcp_prio_cfg-&gt;entry[0],</div><div class='add'>+	ha-&gt;isp_ops-&gt;read_optrom(vha, &amp;ha-&gt;fcp_prio_cfg-&gt;entry[0],</div><div class='ctx'> 			fcp_prio_addr &lt;&lt; 2, (len &lt; max_len ? len : max_len));</div><div class='ctx'> </div><div class='ctx'> 	/* revalidate the entire FCP priority config data, including entries */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c<br/>index 582d1663f971..3eeae72793bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_target.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_target.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_target.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_target.c</a></div><div class='hunk'>@@ -184,6 +184,7 @@ static inline int qlt_issue_marker(struct scsi_qla_host *vha, int vha_locked)</div><div class='ctx'> 	/* Send marker if required */</div><div class='ctx'> 	if (unlikely(vha-&gt;marker_needed != 0)) {</div><div class='ctx'> 		int rc = qla2x00_issue_marker(vha, vha_locked);</div><div class='add'>+</div><div class='ctx'> 		if (rc != QLA_SUCCESS) {</div><div class='ctx'> 			ql_dbg(ql_dbg_tgt, vha, 0xe03d,</div><div class='ctx'> 			    "qla_target(%d): issue_marker() failed\n",</div><div class='hunk'>@@ -557,6 +558,7 @@ static int qla24xx_post_nack_work(struct scsi_qla_host *vha, fc_port_t *fcport,</div><div class='ctx'> 	struct imm_ntfy_from_isp *ntfy, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_work_evt *e;</div><div class='add'>+</div><div class='ctx'> 	e = qla2x00_alloc_work(vha, QLA_EVT_NACK);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='hunk'>@@ -680,7 +682,6 @@ done:</div><div class='ctx'> void qla24xx_do_nack_work(struct scsi_qla_host *vha, struct qla_work_evt *e)</div><div class='ctx'> {</div><div class='ctx'> 	fc_port_t *t;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	switch (e-&gt;u.nack.type) {</div><div class='ctx'> 	case SRB_NACK_PRLI:</div><div class='hunk'>@@ -693,24 +694,19 @@ void qla24xx_do_nack_work(struct scsi_qla_host *vha, struct qla_work_evt *e)</div><div class='ctx'> 		if (t) {</div><div class='ctx'> 			ql_log(ql_log_info, vha, 0xd034,</div><div class='ctx'> 			    "%s create sess success %p", __func__, t);</div><div class='del'>-			spin_lock_irqsave(&amp;vha-&gt;hw-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 			/* create sess has an extra kref */</div><div class='ctx'> 			vha-&gt;hw-&gt;tgt.tgt_ops-&gt;put_sess(e-&gt;u.nack.fcport);</div><div class='del'>-			spin_unlock_irqrestore(&amp;vha-&gt;hw-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	qla24xx_async_notify_ack(vha, e-&gt;u.nack.fcport,</div><div class='del'>-	    (struct imm_ntfy_from_isp*)e-&gt;u.nack.iocb, e-&gt;u.nack.type);</div><div class='add'>+	    (struct imm_ntfy_from_isp *)e-&gt;u.nack.iocb, e-&gt;u.nack.type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void qla24xx_delete_sess_fn(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	fc_port_t *fcport = container_of(work, struct fc_port, del_work);</div><div class='ctx'> 	struct qla_hw_data *ha = fcport-&gt;vha-&gt;hw;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (fcport-&gt;se_sess) {</div><div class='ctx'> 		ha-&gt;tgt.tgt_ops-&gt;shutdown_sess(fcport);</div><div class='hunk'>@@ -718,7 +714,6 @@ void qla24xx_delete_sess_fn(struct work_struct *work)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		qlt_unreg_sess(fcport);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -787,8 +782,9 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)</div><div class='ctx'> 		    fcport-&gt;port_name, sess-&gt;loop_id);</div><div class='ctx'> 		sess-&gt;local = 0;</div><div class='ctx'> 	}</div><div class='del'>-	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='add'>+</div><div class='add'>+	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -980,6 +976,8 @@ void qlt_free_session_done(struct work_struct *work)</div><div class='ctx'> 		sess-&gt;send_els_logo);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_SW_RESV_ADDR(sess-&gt;d_id)) {</div><div class='add'>+		qla2x00_mark_device_lost(vha, sess, 0, 0);</div><div class='add'>+</div><div class='ctx'> 		if (sess-&gt;send_els_logo) {</div><div class='ctx'> 			qlt_port_logo_t logo;</div><div class='ctx'> </div><div class='hunk'>@@ -1076,6 +1074,7 @@ void qlt_free_session_done(struct work_struct *work)</div><div class='ctx'> 		struct qlt_plogi_ack_t *con =</div><div class='ctx'> 		    sess-&gt;plogi_link[QLT_PLOGI_LINK_CONFLICT];</div><div class='ctx'> 		struct imm_ntfy_from_isp *iocb;</div><div class='add'>+</div><div class='ctx'> 		own = sess-&gt;plogi_link[QLT_PLOGI_LINK_SAME_WWN];</div><div class='ctx'> </div><div class='ctx'> 		if (con) {</div><div class='hunk'>@@ -1160,8 +1159,6 @@ void qlt_unreg_sess(struct fc_port *sess)</div><div class='ctx'> 	if (sess-&gt;se_sess)</div><div class='ctx'> 		vha-&gt;hw-&gt;tgt.tgt_ops-&gt;clear_nacl_from_fcport_map(sess);</div><div class='ctx'> </div><div class='del'>-	qla2x00_mark_device_lost(vha, sess, 0, 0);</div><div class='del'>-</div><div class='ctx'> 	sess-&gt;deleted = QLA_SESS_DELETION_IN_PROGRESS;</div><div class='ctx'> 	sess-&gt;disc_state = DSC_DELETE_PEND;</div><div class='ctx'> 	sess-&gt;last_rscn_gen = sess-&gt;rscn_gen;</div><div class='hunk'>@@ -1329,6 +1326,7 @@ static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,</div><div class='ctx'> 	res = -ENOENT;</div><div class='ctx'> 	for (i = 0; i &lt; entries; i++) {</div><div class='ctx'> 		struct gid_list_info *gid = (struct gid_list_info *)id_iter;</div><div class='add'>+</div><div class='ctx'> 		if ((gid-&gt;al_pa == s_id[2]) &amp;&amp;</div><div class='ctx'> 		    (gid-&gt;area == s_id[1]) &amp;&amp;</div><div class='ctx'> 		    (gid-&gt;domain == s_id[0])) {</div><div class='hunk'>@@ -2331,14 +2329,14 @@ void qlt_send_resp_ctio(struct qla_qpair *qpair, struct qla_tgt_cmd *cmd,</div><div class='ctx'> 		ctio-&gt;u.status1.scsi_status |=</div><div class='ctx'> 		    cpu_to_le16(SS_RESIDUAL_UNDER);</div><div class='ctx'> </div><div class='del'>-	/* Response code and sense key */</div><div class='del'>-	put_unaligned_le32(((0x70 &lt;&lt; 24) | (sense_key &lt;&lt; 8)),</div><div class='del'>-	    (&amp;ctio-&gt;u.status1.sense_data)[0]);</div><div class='add'>+	/* Fixed format sense data. */</div><div class='add'>+	ctio-&gt;u.status1.sense_data[0] = 0x70;</div><div class='add'>+	ctio-&gt;u.status1.sense_data[2] = sense_key;</div><div class='ctx'> 	/* Additional sense length */</div><div class='del'>-	put_unaligned_le32(0x0a, (&amp;ctio-&gt;u.status1.sense_data)[1]);</div><div class='add'>+	ctio-&gt;u.status1.sense_data[7] = 0xa;</div><div class='ctx'> 	/* ASC and ASCQ */</div><div class='del'>-	put_unaligned_le32(((asc &lt;&lt; 24) | (ascq &lt;&lt; 16)),</div><div class='del'>-	    (&amp;ctio-&gt;u.status1.sense_data)[3]);</div><div class='add'>+	ctio-&gt;u.status1.sense_data[12] = asc;</div><div class='add'>+	ctio-&gt;u.status1.sense_data[13] = ascq;</div><div class='ctx'> </div><div class='ctx'> 	/* Memory Barrier */</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -2387,7 +2385,7 @@ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)</div><div class='ctx'> 		case ELS_PRLO:</div><div class='ctx'> 		case ELS_TPRLO:</div><div class='ctx'> 			ql_dbg(ql_dbg_disc, vha, 0x2106,</div><div class='del'>-			    "TM response logo %phC status %#x state %#x",</div><div class='add'>+			    "TM response logo %8phC status %#x state %#x",</div><div class='ctx'> 			    mcmd-&gt;sess-&gt;port_name, mcmd-&gt;fc_tm_rsp,</div><div class='ctx'> 			    mcmd-&gt;flags);</div><div class='ctx'> 			qlt_schedule_sess_for_deletion(mcmd-&gt;sess);</div><div class='hunk'>@@ -2485,6 +2483,7 @@ static void qlt_unmap_sg(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_hw_data *ha;</div><div class='ctx'> 	struct qla_qpair *qpair;</div><div class='add'>+</div><div class='ctx'> 	if (!cmd-&gt;sg_mapped)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2635,7 +2634,7 @@ static int qlt_24xx_build_ctio_pkt(struct qla_qpair *qpair,</div><div class='ctx'> static void qlt_load_cont_data_segments(struct qla_tgt_prm *prm)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt;</div><div class='del'>-	uint32_t *dword_ptr;</div><div class='add'>+	struct dsd64 *cur_dsd;</div><div class='ctx'> </div><div class='ctx'> 	/* Build continuation packets */</div><div class='ctx'> 	while (prm-&gt;seg_cnt &gt; 0) {</div><div class='hunk'>@@ -2656,19 +2655,13 @@ static void qlt_load_cont_data_segments(struct qla_tgt_prm *prm)</div><div class='ctx'> 		cont_pkt64-&gt;sys_define = 0;</div><div class='ctx'> </div><div class='ctx'> 		cont_pkt64-&gt;entry_type = CONTINUE_A64_TYPE;</div><div class='del'>-		dword_ptr = (uint32_t *)&amp;cont_pkt64-&gt;dseg_0_address;</div><div class='add'>+		cur_dsd = cont_pkt64-&gt;dsd;</div><div class='ctx'> </div><div class='ctx'> 		/* Load continuation entry data segments */</div><div class='ctx'> 		for (cnt = 0;</div><div class='ctx'> 		    cnt &lt; QLA_TGT_DATASEGS_PER_CONT_24XX &amp;&amp; prm-&gt;seg_cnt;</div><div class='ctx'> 		    cnt++, prm-&gt;seg_cnt--) {</div><div class='del'>-			*dword_ptr++ =</div><div class='del'>-			    cpu_to_le32(lower_32_bits</div><div class='del'>-				(sg_dma_address(prm-&gt;sg)));</div><div class='del'>-			*dword_ptr++ = cpu_to_le32(upper_32_bits</div><div class='del'>-			    (sg_dma_address(prm-&gt;sg)));</div><div class='del'>-			*dword_ptr++ = cpu_to_le32(sg_dma_len(prm-&gt;sg));</div><div class='del'>-</div><div class='add'>+			append_dsd64(&amp;cur_dsd, prm-&gt;sg);</div><div class='ctx'> 			prm-&gt;sg = sg_next(prm-&gt;sg);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2681,13 +2674,13 @@ static void qlt_load_cont_data_segments(struct qla_tgt_prm *prm)</div><div class='ctx'> static void qlt_load_data_segments(struct qla_tgt_prm *prm)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt;</div><div class='del'>-	uint32_t *dword_ptr;</div><div class='add'>+	struct dsd64 *cur_dsd;</div><div class='ctx'> 	struct ctio7_to_24xx *pkt24 = (struct ctio7_to_24xx *)prm-&gt;pkt;</div><div class='ctx'> </div><div class='ctx'> 	pkt24-&gt;u.status0.transfer_length = cpu_to_le32(prm-&gt;cmd-&gt;bufflen);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup packet address segment pointer */</div><div class='del'>-	dword_ptr = pkt24-&gt;u.status0.dseg_0_address;</div><div class='add'>+	cur_dsd = &amp;pkt24-&gt;u.status0.dsd;</div><div class='ctx'> </div><div class='ctx'> 	/* Set total data segment count */</div><div class='ctx'> 	if (prm-&gt;seg_cnt)</div><div class='hunk'>@@ -2695,8 +2688,8 @@ static void qlt_load_data_segments(struct qla_tgt_prm *prm)</div><div class='ctx'> </div><div class='ctx'> 	if (prm-&gt;seg_cnt == 0) {</div><div class='ctx'> 		/* No data transfer */</div><div class='del'>-		*dword_ptr++ = 0;</div><div class='del'>-		*dword_ptr = 0;</div><div class='add'>+		cur_dsd-&gt;address = 0;</div><div class='add'>+		cur_dsd-&gt;length = 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2706,14 +2699,7 @@ static void qlt_load_data_segments(struct qla_tgt_prm *prm)</div><div class='ctx'> 	for (cnt = 0;</div><div class='ctx'> 	    (cnt &lt; QLA_TGT_DATASEGS_PER_CMD_24XX) &amp;&amp; prm-&gt;seg_cnt;</div><div class='ctx'> 	    cnt++, prm-&gt;seg_cnt--) {</div><div class='del'>-		*dword_ptr++ =</div><div class='del'>-		    cpu_to_le32(lower_32_bits(sg_dma_address(prm-&gt;sg)));</div><div class='del'>-</div><div class='del'>-		*dword_ptr++ = cpu_to_le32(upper_32_bits(</div><div class='del'>-			sg_dma_address(prm-&gt;sg)));</div><div class='del'>-</div><div class='del'>-		*dword_ptr++ = cpu_to_le32(sg_dma_len(prm-&gt;sg));</div><div class='del'>-</div><div class='add'>+		append_dsd64(&amp;cur_dsd, prm-&gt;sg);</div><div class='ctx'> 		prm-&gt;sg = sg_next(prm-&gt;sg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3037,7 +3023,7 @@ qla_tgt_set_dif_tags(struct qla_tgt_cmd *cmd, struct crc_context *ctx,</div><div class='ctx'> static inline int</div><div class='ctx'> qlt_build_ctio_crc2_pkt(struct qla_qpair *qpair, struct qla_tgt_prm *prm)</div><div class='ctx'> {</div><div class='del'>-	uint32_t		*cur_dsd;</div><div class='add'>+	struct dsd64		*cur_dsd;</div><div class='ctx'> 	uint32_t		transfer_length = 0;</div><div class='ctx'> 	uint32_t		data_bytes;</div><div class='ctx'> 	uint32_t		dif_bytes;</div><div class='hunk'>@@ -3183,12 +3169,11 @@ qlt_build_ctio_crc2_pkt(struct qla_qpair *qpair, struct qla_tgt_prm *prm)</div><div class='ctx'> </div><div class='ctx'> 	qla_tgt_set_dif_tags(cmd, crc_ctx_pkt, &amp;fw_prot_opts);</div><div class='ctx'> </div><div class='del'>-	pkt-&gt;crc_context_address[0] = cpu_to_le32(LSD(crc_ctx_dma));</div><div class='del'>-	pkt-&gt;crc_context_address[1] = cpu_to_le32(MSD(crc_ctx_dma));</div><div class='add'>+	put_unaligned_le64(crc_ctx_dma, &amp;pkt-&gt;crc_context_address);</div><div class='ctx'> 	pkt-&gt;crc_context_len = CRC_CONTEXT_LEN_FW;</div><div class='ctx'> </div><div class='ctx'> 	if (!bundling) {</div><div class='del'>-		cur_dsd = (uint32_t *) &amp;crc_ctx_pkt-&gt;u.nobundling.data_address;</div><div class='add'>+		cur_dsd = &amp;crc_ctx_pkt-&gt;u.nobundling.data_dsd;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Configure Bundling if we need to fetch interlaving</div><div class='hunk'>@@ -3198,7 +3183,7 @@ qlt_build_ctio_crc2_pkt(struct qla_qpair *qpair, struct qla_tgt_prm *prm)</div><div class='ctx'> 		crc_ctx_pkt-&gt;u.bundling.dif_byte_count = cpu_to_le32(dif_bytes);</div><div class='ctx'> 		crc_ctx_pkt-&gt;u.bundling.dseg_count =</div><div class='ctx'> 			cpu_to_le16(prm-&gt;tot_dsds - prm-&gt;prot_seg_cnt);</div><div class='del'>-		cur_dsd = (uint32_t *) &amp;crc_ctx_pkt-&gt;u.bundling.data_address;</div><div class='add'>+		cur_dsd = &amp;crc_ctx_pkt-&gt;u.bundling.data_dsd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Finish the common fields of CRC pkt */</div><div class='hunk'>@@ -3231,7 +3216,7 @@ qlt_build_ctio_crc2_pkt(struct qla_qpair *qpair, struct qla_tgt_prm *prm)</div><div class='ctx'> 		/* Walks dif segments */</div><div class='ctx'> 		pkt-&gt;add_flags |= CTIO_CRC2_AF_DIF_DSD_ENA;</div><div class='ctx'> </div><div class='del'>-		cur_dsd = (uint32_t *) &amp;crc_ctx_pkt-&gt;u.bundling.dif_address;</div><div class='add'>+		cur_dsd = &amp;crc_ctx_pkt-&gt;u.bundling.dif_dsd;</div><div class='ctx'> 		if (qla24xx_walk_and_build_prot_sglist(ha, NULL, cur_dsd,</div><div class='ctx'> 			prm-&gt;prot_seg_cnt, cmd))</div><div class='ctx'> 			goto crc_queuing_error;</div><div class='hunk'>@@ -3263,7 +3248,6 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,</div><div class='ctx'> 	if (!qpair-&gt;fw_started || (cmd-&gt;reset_count != qpair-&gt;chip_reset) ||</div><div class='ctx'> 	    (cmd-&gt;sess &amp;&amp; cmd-&gt;sess-&gt;deleted)) {</div><div class='ctx'> 		cmd-&gt;state = QLA_TGT_STATE_PROCESSED;</div><div class='del'>-		qlt_abort_cmd_on_host_reset(cmd-&gt;vha, cmd);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3292,7 +3276,6 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,</div><div class='ctx'> 		 * previous life, just abort the processing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cmd-&gt;state = QLA_TGT_STATE_PROCESSED;</div><div class='del'>-		qlt_abort_cmd_on_host_reset(cmd-&gt;vha, cmd);</div><div class='ctx'> 		ql_dbg_qp(ql_dbg_async, qpair, 0xe101,</div><div class='ctx'> 			"RESET-RSP online/active/old-count/new-count = %d/%d/%d/%d.\n",</div><div class='ctx'> 			vha-&gt;flags.online, qla2x00_reset_active(vha),</div><div class='hunk'>@@ -3384,9 +3367,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;state = QLA_TGT_STATE_PROCESSED; /* Mid-level is done processing */</div><div class='del'>-	spin_lock(&amp;cmd-&gt;cmd_lock);</div><div class='ctx'> 	cmd-&gt;cmd_sent_to_fw = 1;</div><div class='del'>-	spin_unlock(&amp;cmd-&gt;cmd_lock);</div><div class='ctx'> 	cmd-&gt;ctio_flags = le16_to_cpu(pkt-&gt;u.status0.flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Memory Barrier */</div><div class='hunk'>@@ -3433,8 +3414,10 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)</div><div class='ctx'> 		 * Either the port is not online or this request was from</div><div class='ctx'> 		 * previous life, just abort the processing.</div><div class='ctx'> 		 */</div><div class='del'>-		cmd-&gt;state = QLA_TGT_STATE_NEED_DATA;</div><div class='del'>-		qlt_abort_cmd_on_host_reset(cmd-&gt;vha, cmd);</div><div class='add'>+		cmd-&gt;aborted = 1;</div><div class='add'>+		cmd-&gt;write_data_transferred = 0;</div><div class='add'>+		cmd-&gt;state = QLA_TGT_STATE_DATA_IN;</div><div class='add'>+		vha-&gt;hw-&gt;tgt.tgt_ops-&gt;handle_data(cmd);</div><div class='ctx'> 		ql_dbg_qp(ql_dbg_async, qpair, 0xe102,</div><div class='ctx'> 			"RESET-XFR online/active/old-count/new-count = %d/%d/%d/%d.\n",</div><div class='ctx'> 			vha-&gt;flags.online, qla2x00_reset_active(vha),</div><div class='hunk'>@@ -3465,9 +3448,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)</div><div class='ctx'> 		qlt_load_data_segments(&amp;prm);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;state = QLA_TGT_STATE_NEED_DATA;</div><div class='del'>-	spin_lock(&amp;cmd-&gt;cmd_lock);</div><div class='ctx'> 	cmd-&gt;cmd_sent_to_fw = 1;</div><div class='del'>-	spin_unlock(&amp;cmd-&gt;cmd_lock);</div><div class='ctx'> 	cmd-&gt;ctio_flags = le16_to_cpu(pkt-&gt;u.status0.flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Memory Barrier */</div><div class='hunk'>@@ -3646,33 +3627,11 @@ static int __qlt_send_term_imm_notif(struct scsi_qla_host *vha,</div><div class='ctx'> static void qlt_send_term_imm_notif(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct imm_ntfy_from_isp *imm, int ha_locked)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (ha_locked) {</div><div class='del'>-		rc = __qlt_send_term_imm_notif(vha, imm);</div><div class='del'>-</div><div class='del'>-#if 0	/* Todo  */</div><div class='del'>-		if (rc == -ENOMEM)</div><div class='del'>-			qlt_alloc_qfull_cmd(vha, imm, 0, 0);</div><div class='del'>-#else</div><div class='del'>-		if (rc) {</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;vha-&gt;hw-&gt;hardware_lock, flags);</div><div class='add'>+	WARN_ON_ONCE(!ha_locked);</div><div class='ctx'> 	rc = __qlt_send_term_imm_notif(vha, imm);</div><div class='del'>-</div><div class='del'>-#if 0	/* Todo */</div><div class='del'>-	if (rc == -ENOMEM)</div><div class='del'>-		qlt_alloc_qfull_cmd(vha, imm, 0, 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_unlock_irqrestore(&amp;vha-&gt;hw-&gt;hardware_lock, flags);</div><div class='add'>+	pr_debug("rc = %d\n", rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3913,6 +3872,7 @@ static int qlt_term_ctio_exchange(struct qla_qpair *qpair, void *ctio,</div><div class='ctx'> </div><div class='ctx'> 	if (ctio != NULL) {</div><div class='ctx'> 		struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio;</div><div class='add'>+</div><div class='ctx'> 		term = !(c-&gt;flags &amp;</div><div class='ctx'> 		    cpu_to_le16(OF_TERM_EXCH));</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -3977,39 +3937,6 @@ static void *qlt_ctio_to_cmd(struct scsi_qla_host *vha,</div><div class='ctx'> 	return cmd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* hardware_lock should be held by caller. */</div><div class='del'>-void</div><div class='del'>-qlt_abort_cmd_on_host_reset(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;sg_mapped)</div><div class='del'>-		qlt_unmap_sg(vha, cmd);</div><div class='del'>-</div><div class='del'>-	/* TODO: fix debug message type and ids. */</div><div class='del'>-	if (cmd-&gt;state == QLA_TGT_STATE_PROCESSED) {</div><div class='del'>-		ql_dbg(ql_dbg_io, vha, 0xff00,</div><div class='del'>-		    "HOST-ABORT: state=PROCESSED.\n");</div><div class='del'>-	} else if (cmd-&gt;state == QLA_TGT_STATE_NEED_DATA) {</div><div class='del'>-		cmd-&gt;write_data_transferred = 0;</div><div class='del'>-		cmd-&gt;state = QLA_TGT_STATE_DATA_IN;</div><div class='del'>-</div><div class='del'>-		ql_dbg(ql_dbg_io, vha, 0xff01,</div><div class='del'>-		    "HOST-ABORT: state=DATA_IN.\n");</div><div class='del'>-</div><div class='del'>-		ha-&gt;tgt.tgt_ops-&gt;handle_data(cmd);</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		ql_dbg(ql_dbg_io, vha, 0xff03,</div><div class='del'>-		    "HOST-ABORT: state=BAD(%d).\n",</div><div class='del'>-		    cmd-&gt;state);</div><div class='del'>-		dump_stack();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd-&gt;trc_flags |= TRC_FLUSH;</div><div class='del'>-	ha-&gt;tgt.tgt_ops-&gt;free_cmd(cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * ha-&gt;hardware_lock supposed to be held on entry. Might drop it, then reaquire</div><div class='ctx'>  */</div><div class='hunk'>@@ -4031,7 +3958,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = (struct qla_tgt_cmd *)qlt_ctio_to_cmd(vha, rsp, handle, ctio);</div><div class='add'>+	cmd = qlt_ctio_to_cmd(vha, rsp, handle, ctio);</div><div class='ctx'> 	if (cmd == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -4240,11 +4167,9 @@ static void __qlt_do_work(struct qla_tgt_cmd *cmd)</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto out_term;</div><div class='ctx'> 	/*</div><div class='del'>-	 * Drop extra session reference from qla_tgt_handle_cmd_for_atio*(</div><div class='add'>+	 * Drop extra session reference from qlt_handle_cmd_for_atio().</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_term:</div><div class='hunk'>@@ -4261,9 +4186,7 @@ out_term:</div><div class='ctx'> 	target_free_tag(sess-&gt;se_sess, &amp;cmd-&gt;se_cmd);</div><div class='ctx'> 	spin_unlock_irqrestore(qpair-&gt;qp_lock_ptr, flags);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qlt_do_work(struct work_struct *work)</div><div class='hunk'>@@ -4472,9 +4395,7 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,</div><div class='ctx'> 	if (!cmd) {</div><div class='ctx'> 		ql_dbg(ql_dbg_io, vha, 0x3062,</div><div class='ctx'> 		    "qla_target(%d): Allocation of cmd failed\n", vha-&gt;vp_idx);</div><div class='del'>-		spin_lock_irqsave(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 		ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4773,6 +4694,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(op, &amp;vha-&gt;unknown_atio_list, cmd_list) {</div><div class='ctx'> 		uint32_t op_key = sid_to_key(op-&gt;atio.u.isp24.fcp_hdr.s_id);</div><div class='add'>+</div><div class='ctx'> 		if (op_key == key) {</div><div class='ctx'> 			op-&gt;aborted = true;</div><div class='ctx'> 			count++;</div><div class='hunk'>@@ -4781,6 +4703,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(cmd, &amp;vha-&gt;qla_cmd_list, cmd_list) {</div><div class='ctx'> 		uint32_t cmd_key = sid_to_key(cmd-&gt;atio.u.isp24.fcp_hdr.s_id);</div><div class='add'>+</div><div class='ctx'> 		if (cmd_key == key) {</div><div class='ctx'> 			cmd-&gt;aborted = 1;</div><div class='ctx'> 			count++;</div><div class='hunk'>@@ -5051,6 +4974,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,</div><div class='ctx'> 		if (sess != NULL) {</div><div class='ctx'> 			bool delete = false;</div><div class='ctx'> 			int sec;</div><div class='add'>+</div><div class='ctx'> 			spin_lock_irqsave(&amp;tgt-&gt;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 			switch (sess-&gt;fw_login_state) {</div><div class='ctx'> 			case DSC_LS_PLOGI_PEND:</div><div class='hunk'>@@ -5203,6 +5127,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,</div><div class='ctx'> 	case ELS_ADISC:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct qla_tgt *tgt = vha-&gt;vha_tgt.qla_tgt;</div><div class='add'>+</div><div class='ctx'> 		if (tgt-&gt;link_reinit_iocb_pending) {</div><div class='ctx'> 			qlt_send_notify_ack(ha-&gt;base_qpair,</div><div class='ctx'> 			    &amp;tgt-&gt;link_reinit_iocb, 0, 0, 0, 0, 0, 0);</div><div class='hunk'>@@ -5266,6 +5191,7 @@ static void qlt_handle_imm_notify(struct scsi_qla_host *vha,</div><div class='ctx'> 	case IMM_NTFY_LIP_LINK_REINIT:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct qla_tgt *tgt = vha-&gt;vha_tgt.qla_tgt;</div><div class='add'>+</div><div class='ctx'> 		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033,</div><div class='ctx'> 		    "qla_target(%d): LINK REINIT (loop %#x, "</div><div class='ctx'> 		    "subcode %x)\n", vha-&gt;vp_idx,</div><div class='hunk'>@@ -5492,11 +5418,7 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha,</div><div class='ctx'> 	se_sess = sess-&gt;se_sess;</div><div class='ctx'> </div><div class='ctx'> 	tag = sbitmap_queue_get(&amp;se_sess-&gt;sess_tag_pool, &amp;cpu);</div><div class='del'>-	if (tag &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cmd = &amp;((struct qla_tgt_cmd *)se_sess-&gt;sess_cmd_map)[tag];</div><div class='del'>-	if (!cmd) {</div><div class='add'>+	if (tag &lt; 0) {</div><div class='ctx'> 		ql_dbg(ql_dbg_io, vha, 0x3009,</div><div class='ctx'> 			"qla_target(%d): %s: Allocation of cmd failed\n",</div><div class='ctx'> 			vha-&gt;vp_idx, __func__);</div><div class='hunk'>@@ -5511,6 +5433,7 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cmd = &amp;((struct qla_tgt_cmd *)se_sess-&gt;sess_cmd_map)[tag];</div><div class='ctx'> 	memset(cmd, 0, sizeof(struct qla_tgt_cmd));</div><div class='ctx'> </div><div class='ctx'> 	qlt_incr_num_pend_cmds(vha);</div><div class='hunk'>@@ -5820,8 +5743,7 @@ static void qlt_handle_abts_completion(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla_tgt_mgmt_cmd *mcmd;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	mcmd = (struct qla_tgt_mgmt_cmd *)qlt_ctio_to_cmd(vha, rsp,</div><div class='del'>-	    pkt-&gt;handle, pkt);</div><div class='add'>+	mcmd = qlt_ctio_to_cmd(vha, rsp, pkt-&gt;handle, pkt);</div><div class='ctx'> 	if (mcmd == NULL &amp;&amp; h != QLA_TGT_SKIP_HANDLE) {</div><div class='ctx'> 		ql_dbg(ql_dbg_async, vha, 0xe064,</div><div class='ctx'> 		    "qla_target(%d): ABTS Comp without mcmd\n",</div><div class='hunk'>@@ -5883,6 +5805,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,</div><div class='ctx'> 	case CTIO_TYPE7:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;</div><div class='add'>+</div><div class='ctx'> 		qlt_do_ctio_completion(vha, rsp, entry-&gt;handle,</div><div class='ctx'> 		    le16_to_cpu(entry-&gt;status)|(pkt-&gt;entry_status &lt;&lt; 16),</div><div class='ctx'> 		    entry);</div><div class='hunk'>@@ -5893,6 +5816,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct atio_from_isp *atio = (struct atio_from_isp *)pkt;</div><div class='ctx'> 		int rc;</div><div class='add'>+</div><div class='ctx'> 		if (atio-&gt;u.isp2x.status !=</div><div class='ctx'> 		    cpu_to_le16(ATIO_CDB_VALID)) {</div><div class='ctx'> 			ql_dbg(ql_dbg_tgt, vha, 0xe05e,</div><div class='hunk'>@@ -5941,6 +5865,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,</div><div class='ctx'> 	case CONTINUE_TGT_IO_TYPE:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;</div><div class='add'>+</div><div class='ctx'> 		qlt_do_ctio_completion(vha, rsp, entry-&gt;handle,</div><div class='ctx'> 		    le16_to_cpu(entry-&gt;status)|(pkt-&gt;entry_status &lt;&lt; 16),</div><div class='ctx'> 		    entry);</div><div class='hunk'>@@ -5950,6 +5875,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,</div><div class='ctx'> 	case CTIO_A64_TYPE:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;</div><div class='add'>+</div><div class='ctx'> 		qlt_do_ctio_completion(vha, rsp, entry-&gt;handle,</div><div class='ctx'> 		    le16_to_cpu(entry-&gt;status)|(pkt-&gt;entry_status &lt;&lt; 16),</div><div class='ctx'> 		    entry);</div><div class='hunk'>@@ -5964,6 +5890,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,</div><div class='ctx'> 	case NOTIFY_ACK_TYPE:</div><div class='ctx'> 		if (tgt-&gt;notify_ack_expected &gt; 0) {</div><div class='ctx'> 			struct nack_to_isp *entry = (struct nack_to_isp *)pkt;</div><div class='add'>+</div><div class='ctx'> 			ql_dbg(ql_dbg_tgt, vha, 0xe036,</div><div class='ctx'> 			    "NOTIFY_ACK seq %08x status %x\n",</div><div class='ctx'> 			    le16_to_cpu(entry-&gt;u.isp2x.seq_id),</div><div class='hunk'>@@ -6239,6 +6166,7 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 		if (rc == -ENOENT) {</div><div class='ctx'> 			qlt_port_logo_t logo;</div><div class='add'>+</div><div class='ctx'> 			sid_to_portid(s_id, &amp;logo.id);</div><div class='ctx'> 			logo.cmd_count = 1;</div><div class='ctx'> 			qlt_send_first_logo(vha, &amp;logo);</div><div class='hunk'>@@ -6318,17 +6246,19 @@ static void qlt_abort_work(struct qla_tgt *tgt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = __qlt_24xx_handle_abts(vha, &amp;prm-&gt;abts, sess);</div><div class='del'>-	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags2);</div><div class='ctx'> </div><div class='add'>+	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='add'>+</div><div class='ctx'> 	if (rc != 0)</div><div class='ctx'> 		goto out_term;</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_term2:</div><div class='add'>+	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags2);</div><div class='add'>+</div><div class='ctx'> 	if (sess)</div><div class='ctx'> 		ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags2);</div><div class='ctx'> </div><div class='ctx'> out_term:</div><div class='ctx'> 	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='hunk'>@@ -6386,9 +6316,10 @@ static void qlt_tmr_work(struct qla_tgt *tgt,</div><div class='ctx'> 	    scsilun_to_int((struct scsi_lun *)&amp;a-&gt;u.isp24.fcp_cmnd.lun);</div><div class='ctx'> </div><div class='ctx'> 	rc = qlt_issue_task_mgmt(sess, unpacked_lun, fn, iocb, 0);</div><div class='del'>-	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;tgt.sess_lock, flags);</div><div class='ctx'> </div><div class='add'>+	ha-&gt;tgt.tgt_ops-&gt;put_sess(sess);</div><div class='add'>+</div><div class='ctx'> 	if (rc != 0)</div><div class='ctx'> 		goto out_term;</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -6499,6 +6430,7 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		struct qla_qpair *qpair = ha-&gt;queue_pair_map[i];</div><div class='add'>+</div><div class='ctx'> 		h = &amp;tgt-&gt;qphints[i + 1];</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;h-&gt;hint_elem);</div><div class='ctx'> 		if (qpair) {</div><div class='hunk'>@@ -6937,7 +6869,7 @@ qlt_24xx_config_rings(struct scsi_qla_host *vha)</div><div class='ctx'> 	RD_REG_DWORD(ISP_ATIO_Q_OUT(vha));</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;flags.msix_enabled) {</div><div class='del'>-		if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+		if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			if (IS_QLA2071(ha)) {</div><div class='ctx'> 				/* 4 ports Baker: Enable Interrupt Handshake */</div><div class='ctx'> 				icb-&gt;msix_atio = 0;</div><div class='hunk'>@@ -6952,7 +6884,7 @@ qlt_24xx_config_rings(struct scsi_qla_host *vha)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* INTx|MSI */</div><div class='del'>-		if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+		if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {</div><div class='ctx'> 			icb-&gt;msix_atio = 0;</div><div class='ctx'> 			icb-&gt;firmware_options_2 |= BIT_26;</div><div class='ctx'> 			ql_dbg(ql_dbg_init, vha, 0xf072,</div><div class='hunk'>@@ -7201,7 +7133,8 @@ qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha)</div><div class='ctx'> 	if (!QLA_TGT_MODE_ENABLED())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if  ((ql2xenablemsix == 0) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {</div><div class='add'>+	if  ((ql2xenablemsix == 0) || IS_QLA83XX(ha) || IS_QLA27XX(ha) ||</div><div class='add'>+	    IS_QLA28XX(ha)) {</div><div class='ctx'> 		ISP_ATIO_Q_IN(base_vha) = &amp;ha-&gt;mqiobase-&gt;isp25mq.atio_q_in;</div><div class='ctx'> 		ISP_ATIO_Q_OUT(base_vha) = &amp;ha-&gt;mqiobase-&gt;isp25mq.atio_q_out;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -7329,7 +7262,10 @@ qlt_mem_free(struct qla_hw_data *ha)</div><div class='ctx'> 		    sizeof(struct atio_from_isp), ha-&gt;tgt.atio_ring,</div><div class='ctx'> 		    ha-&gt;tgt.atio_dma);</div><div class='ctx'> 	}</div><div class='add'>+	ha-&gt;tgt.atio_ring = NULL;</div><div class='add'>+	ha-&gt;tgt.atio_dma = 0;</div><div class='ctx'> 	kfree(ha-&gt;tgt.tgt_vp_map);</div><div class='add'>+	ha-&gt;tgt.tgt_vp_map = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* vport_slock to be held by the caller */</div><div class='hunk'>@@ -7413,6 +7349,9 @@ int __init qlt_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ctio7_to_24xx) != 64);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ctio_to_2xxx) != 64);</div><div class='add'>+</div><div class='ctx'> 	if (!qlt_parse_ini_mode()) {</div><div class='ctx'> 		ql_log(ql_log_fatal, NULL, 0xe06b,</div><div class='ctx'> 		    "qlt_parse_ini_mode() failed\n");</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h<br/>index f3de75000a08..89ceffa7d4fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_target.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_target.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_target.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_target.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #define __QLA_TARGET_H</div><div class='ctx'> </div><div class='ctx'> #include "qla_def.h"</div><div class='add'>+#include "qla_dsd.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Must be changed on any change in any initiator visible interfaces or</div><div class='hunk'>@@ -224,12 +225,7 @@ struct ctio_to_2xxx {</div><div class='ctx'> 	uint16_t reserved_1[3];</div><div class='ctx'> 	uint16_t scsi_status;</div><div class='ctx'> 	uint32_t transfer_length;</div><div class='del'>-	uint32_t dseg_0_address;	/* Data segment 0 address. */</div><div class='del'>-	uint32_t dseg_0_length;		/* Data segment 0 length. */</div><div class='del'>-	uint32_t dseg_1_address;	/* Data segment 1 address. */</div><div class='del'>-	uint32_t dseg_1_length;		/* Data segment 1 length. */</div><div class='del'>-	uint32_t dseg_2_address;	/* Data segment 2 address. */</div><div class='del'>-	uint32_t dseg_2_length;		/* Data segment 2 length. */</div><div class='add'>+	struct dsd32 dsd[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> #define ATIO_PATH_INVALID       0x07</div><div class='ctx'> #define ATIO_CANT_PROV_CAP      0x16</div><div class='hunk'>@@ -429,10 +425,7 @@ struct ctio7_to_24xx {</div><div class='ctx'> 			uint32_t reserved2;</div><div class='ctx'> 			uint32_t transfer_length;</div><div class='ctx'> 			uint32_t reserved3;</div><div class='del'>-			/* Data segment 0 address. */</div><div class='del'>-			uint32_t dseg_0_address[2];</div><div class='del'>-			/* Data segment 0 length. */</div><div class='del'>-			uint32_t dseg_0_length;</div><div class='add'>+			struct dsd64 dsd;</div><div class='ctx'> 		} status0;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			uint16_t sense_length;</div><div class='hunk'>@@ -526,10 +519,10 @@ struct ctio_crc2_to_fw {</div><div class='ctx'> 	uint32_t reserved5;</div><div class='ctx'> 	__le32 transfer_length;		/* total fc transfer length */</div><div class='ctx'> 	uint32_t reserved6;</div><div class='del'>-	__le32 crc_context_address[2];/* Data segment address. */</div><div class='add'>+	__le64	 crc_context_address __packed; /* Data segment address. */</div><div class='ctx'> 	uint16_t crc_context_len;	/* Data segment length. */</div><div class='ctx'> 	uint16_t reserved_1;		/* MUST be set to 0. */</div><div class='del'>-} __packed;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* CTIO Type CRC_x Status IOCB */</div><div class='ctx'> struct ctio_crc_from_fw {</div><div class='hunk'>@@ -855,7 +848,7 @@ enum trace_flags {</div><div class='ctx'> 	TRC_CTIO_ERR = BIT_11,</div><div class='ctx'> 	TRC_CTIO_DONE = BIT_12,</div><div class='ctx'> 	TRC_CTIO_ABORTED =  BIT_13,</div><div class='del'>-	TRC_CTIO_STRANGE= BIT_14,</div><div class='add'>+	TRC_CTIO_STRANGE = BIT_14,</div><div class='ctx'> 	TRC_CMD_DONE = BIT_15,</div><div class='ctx'> 	TRC_CMD_CHK_STOP = BIT_16,</div><div class='ctx'> 	TRC_CMD_FREE = BIT_17,</div><div class='hunk'>@@ -889,10 +882,14 @@ struct qla_tgt_cmd {</div><div class='ctx'> 	unsigned int term_exchg:1;</div><div class='ctx'> 	unsigned int cmd_sent_to_fw:1;</div><div class='ctx'> 	unsigned int cmd_in_wq:1;</div><div class='del'>-	unsigned int aborted:1;</div><div class='del'>-	unsigned int data_work:1;</div><div class='del'>-	unsigned int data_work_free:1;</div><div class='del'>-	unsigned int released:1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This variable may be set from outside the LIO and I/O completion</div><div class='add'>+	 * callback functions. Do not declare this member variable as a</div><div class='add'>+	 * bitfield to avoid a read-modify-write operation when this variable</div><div class='add'>+	 * is set.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int aborted;</div><div class='ctx'> </div><div class='ctx'> 	struct scatterlist *sg;	/* cmd data buffer SG vector */</div><div class='ctx'> 	int sg_cnt;		/* SG segments count */</div><div class='hunk'>@@ -1103,7 +1100,5 @@ extern void qlt_do_generation_tick(struct scsi_qla_host *, int *);</div><div class='ctx'> </div><div class='ctx'> void qlt_send_resp_ctio(struct qla_qpair *, struct qla_tgt_cmd *, uint8_t,</div><div class='ctx'>     uint8_t, uint8_t, uint8_t);</div><div class='del'>-extern void qlt_abort_cmd_on_host_reset(struct scsi_qla_host *,</div><div class='del'>-    struct qla_tgt_cmd *);</div><div class='ctx'> </div><div class='ctx'> #endif /* __QLA_TARGET_H */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c<br/>index 9e52500caff0..de696a07532e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_tmpl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_tmpl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_tmpl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_tmpl.c</a></div><div class='hunk'>@@ -7,103 +7,9 @@</div><div class='ctx'> #include "qla_def.h"</div><div class='ctx'> #include "qla_tmpl.h"</div><div class='ctx'> </div><div class='del'>-/* note default template is in big endian */</div><div class='del'>-static const uint32_t ql27xx_fwdt_default_template[] = {</div><div class='del'>-	0x63000000, 0xa4000000, 0x7c050000, 0x00000000,</div><div class='del'>-	0x30000000, 0x01000000, 0x00000000, 0xc0406eb4,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x04010000, 0x14000000, 0x00000000,</div><div class='del'>-	0x02000000, 0x44000000, 0x09010000, 0x10000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x01010000, 0x1c000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00600000, 0x00000000,</div><div class='del'>-	0xc0000000, 0x01010000, 0x1c000000, 0x00000000,</div><div class='del'>-	0x02000000, 0x00600000, 0x00000000, 0xcc000000,</div><div class='del'>-	0x01010000, 0x1c000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x10600000, 0x00000000, 0xd4000000, 0x01010000,</div><div class='del'>-	0x1c000000, 0x00000000, 0x02000000, 0x700f0000,</div><div class='del'>-	0x00000060, 0xf0000000, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00700000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x10700000, 0x041000c0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x40700000, 0x041000c0,</div><div class='del'>-	0x01010000, 0x1c000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x007c0000, 0x01000000, 0xc0000000, 0x00010000,</div><div class='del'>-	0x18000000, 0x00000000, 0x02000000, 0x007c0000,</div><div class='del'>-	0x040300c4, 0x00010000, 0x18000000, 0x00000000,</div><div class='del'>-	0x02000000, 0x007c0000, 0x040100c0, 0x01010000,</div><div class='del'>-	0x1c000000, 0x00000000, 0x02000000, 0x007c0000,</div><div class='del'>-	0x00000000, 0xc0000000, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x007c0000, 0x04200000,</div><div class='del'>-	0x0b010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x0c000000, 0x00000000, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000000b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000010b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000020b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000030b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000040b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000050b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000060b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000070b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000080b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x000090b0, 0x02010000, 0x20000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x700f0000, 0x040100fc,</div><div class='del'>-	0xf0000000, 0x0000a0b0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x0a000000, 0x040100c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x0a000000, 0x04200080, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00be0000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x10be0000, 0x041000c0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x20be0000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x30be0000, 0x041000c0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00b00000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x10b00000, 0x041000c0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x20b00000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x30b00000, 0x041000c0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00300000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x10300000, 0x041000c0, 0x00010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x20300000, 0x041000c0,</div><div class='del'>-	0x00010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x30300000, 0x041000c0, 0x0a010000, 0x10000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x06010000, 0x1c000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x01000000, 0x00000200,</div><div class='del'>-	0xff230200, 0x06010000, 0x1c000000, 0x00000000,</div><div class='del'>-	0x02000000, 0x02000000, 0x00001000, 0x00000000,</div><div class='del'>-	0x07010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x00000000, 0x01000000, 0x07010000, 0x18000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x07010000, 0x18000000, 0x00000000, 0x02000000,</div><div class='del'>-	0x00000000, 0x03000000, 0x0d010000, 0x14000000,</div><div class='del'>-	0x00000000, 0x02000000, 0x00000000, 0xff000000,</div><div class='del'>-	0x10000000, 0x00000000, 0x00000080,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void __iomem *</div><div class='del'>-qla27xx_isp_reg(struct scsi_qla_host *vha)</div><div class='del'>-{</div><div class='del'>-	return &amp;vha-&gt;hw-&gt;iobase-&gt;isp24;</div><div class='del'>-}</div><div class='add'>+#define ISPREG(vha)	(&amp;(vha)-&gt;hw-&gt;iobase-&gt;isp24)</div><div class='add'>+#define IOBAR(reg)	offsetof(typeof(*(reg)), iobase_addr)</div><div class='add'>+#define IOBASE(vha)	IOBAR(ISPREG(vha))</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> qla27xx_insert16(uint16_t value, void *buf, ulong *len)</div><div class='hunk'>@@ -128,7 +34,6 @@ qla27xx_insert32(uint32_t value, void *buf, ulong *len)</div><div class='ctx'> static inline void</div><div class='ctx'> qla27xx_insertbuf(void *mem, ulong size, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	if (buf &amp;&amp; mem &amp;&amp; size) {</div><div class='ctx'> 		buf += *len;</div><div class='ctx'> 		memcpy(buf, mem, size);</div><div class='hunk'>@@ -190,9 +95,9 @@ static inline void</div><div class='ctx'> qla27xx_write_reg(__iomem struct device_reg_24xx *reg,</div><div class='ctx'> 	uint offset, uint32_t data, void *buf)</div><div class='ctx'> {</div><div class='del'>-	__iomem void *window = (void __iomem *)reg + offset;</div><div class='del'>-</div><div class='ctx'> 	if (buf) {</div><div class='add'>+		void __iomem *window = (void __iomem *)reg + offset;</div><div class='add'>+</div><div class='ctx'> 		WRT_REG_DWORD(window, data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -205,7 +110,7 @@ qla27xx_read_window(__iomem struct device_reg_24xx *reg,</div><div class='ctx'> 	void __iomem *window = (void __iomem *)reg + offset;</div><div class='ctx'> 	void (*readn)(void __iomem*, void *, ulong *) = qla27xx_read_vector(width);</div><div class='ctx'> </div><div class='del'>-	qla27xx_write_reg(reg, IOBASE_ADDR, addr, buf);</div><div class='add'>+	qla27xx_write_reg(reg, IOBAR(reg), addr, buf);</div><div class='ctx'> 	while (count--) {</div><div class='ctx'> 		qla27xx_insert32(addr, buf, len);</div><div class='ctx'> 		readn(window, buf, len);</div><div class='hunk'>@@ -224,7 +129,7 @@ qla27xx_skip_entry(struct qla27xx_fwdt_entry *ent, void *buf)</div><div class='ctx'> static inline struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_next_entry(struct qla27xx_fwdt_entry *ent)</div><div class='ctx'> {</div><div class='del'>-	return (void *)ent + ent-&gt;hdr.size;</div><div class='add'>+	return (void *)ent + le32_to_cpu(ent-&gt;hdr.size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct qla27xx_fwdt_entry *</div><div class='hunk'>@@ -254,12 +159,14 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t256(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t256.base_addr);</div><div class='add'>+	uint offset = ent-&gt;t256.pci_offset;</div><div class='add'>+	ulong count = le16_to_cpu(ent-&gt;t256.reg_count);</div><div class='add'>+	uint width = ent-&gt;t256.reg_width;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd200,</div><div class='ctx'> 	    "%s: rdio t1 [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_read_window(reg, ent-&gt;t256.base_addr, ent-&gt;t256.pci_offset,</div><div class='del'>-	    ent-&gt;t256.reg_count, ent-&gt;t256.reg_width, buf, len);</div><div class='add'>+	qla27xx_read_window(ISPREG(vha), addr, offset, count, width, buf, len);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -268,12 +175,14 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t257(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t257.base_addr);</div><div class='add'>+	uint offset = ent-&gt;t257.pci_offset;</div><div class='add'>+	ulong data = le32_to_cpu(ent-&gt;t257.write_data);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd201,</div><div class='ctx'> 	    "%s: wrio t1 [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, IOBASE_ADDR, ent-&gt;t257.base_addr, buf);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t257.pci_offset, ent-&gt;t257.write_data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), IOBASE(vha), addr, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), offset, data, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -282,13 +191,17 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t258(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	uint banksel = ent-&gt;t258.banksel_offset;</div><div class='add'>+	ulong bank = le32_to_cpu(ent-&gt;t258.bank);</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t258.base_addr);</div><div class='add'>+	uint offset = ent-&gt;t258.pci_offset;</div><div class='add'>+	uint count = le16_to_cpu(ent-&gt;t258.reg_count);</div><div class='add'>+	uint width = ent-&gt;t258.reg_width;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd202,</div><div class='ctx'> 	    "%s: rdio t2 [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t258.banksel_offset, ent-&gt;t258.bank, buf);</div><div class='del'>-	qla27xx_read_window(reg, ent-&gt;t258.base_addr, ent-&gt;t258.pci_offset,</div><div class='del'>-	    ent-&gt;t258.reg_count, ent-&gt;t258.reg_width, buf, len);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), banksel, bank, buf);</div><div class='add'>+	qla27xx_read_window(ISPREG(vha), addr, offset, count, width, buf, len);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -297,13 +210,17 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t259(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t259.base_addr);</div><div class='add'>+	uint banksel = ent-&gt;t259.banksel_offset;</div><div class='add'>+	ulong bank = le32_to_cpu(ent-&gt;t259.bank);</div><div class='add'>+	uint offset = ent-&gt;t259.pci_offset;</div><div class='add'>+	ulong data = le32_to_cpu(ent-&gt;t259.write_data);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd203,</div><div class='ctx'> 	    "%s: wrio t2 [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, IOBASE_ADDR, ent-&gt;t259.base_addr, buf);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t259.banksel_offset, ent-&gt;t259.bank, buf);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t259.pci_offset, ent-&gt;t259.write_data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), IOBASE(vha), addr, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), banksel, bank, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), offset, data, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -312,12 +229,12 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t260(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	uint offset = ent-&gt;t260.pci_offset;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd204,</div><div class='ctx'> 	    "%s: rdpci [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_insert32(ent-&gt;t260.pci_offset, buf, len);</div><div class='del'>-	qla27xx_read_reg(reg, ent-&gt;t260.pci_offset, buf, len);</div><div class='add'>+	qla27xx_insert32(offset, buf, len);</div><div class='add'>+	qla27xx_read_reg(ISPREG(vha), offset, buf, len);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -326,11 +243,12 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t261(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	uint offset = ent-&gt;t261.pci_offset;</div><div class='add'>+	ulong data = le32_to_cpu(ent-&gt;t261.write_data);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd205,</div><div class='ctx'> 	    "%s: wrpci [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t261.pci_offset, ent-&gt;t261.write_data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), offset, data, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -339,51 +257,50 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='add'>+	uint area = ent-&gt;t262.ram_area;</div><div class='add'>+	ulong start = le32_to_cpu(ent-&gt;t262.start_addr);</div><div class='add'>+	ulong end = le32_to_cpu(ent-&gt;t262.end_addr);</div><div class='ctx'> 	ulong dwords;</div><div class='del'>-	ulong start;</div><div class='del'>-	ulong end;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd206,</div><div class='ctx'> 	    "%s: rdram(%x) [%lx]\n", __func__, ent-&gt;t262.ram_area, *len);</div><div class='del'>-	start = ent-&gt;t262.start_addr;</div><div class='del'>-	end = ent-&gt;t262.end_addr;</div><div class='ctx'> </div><div class='del'>-	if (ent-&gt;t262.ram_area == T262_RAM_AREA_CRITICAL_RAM) {</div><div class='add'>+	if (area == T262_RAM_AREA_CRITICAL_RAM) {</div><div class='ctx'> 		;</div><div class='del'>-	} else if (ent-&gt;t262.ram_area == T262_RAM_AREA_EXTERNAL_RAM) {</div><div class='add'>+	} else if (area == T262_RAM_AREA_EXTERNAL_RAM) {</div><div class='ctx'> 		end = vha-&gt;hw-&gt;fw_memory_size;</div><div class='ctx'> 		if (buf)</div><div class='del'>-			ent-&gt;t262.end_addr = end;</div><div class='del'>-	} else if (ent-&gt;t262.ram_area == T262_RAM_AREA_SHARED_RAM) {</div><div class='add'>+			ent-&gt;t262.end_addr = cpu_to_le32(end);</div><div class='add'>+	} else if (area == T262_RAM_AREA_SHARED_RAM) {</div><div class='ctx'> 		start = vha-&gt;hw-&gt;fw_shared_ram_start;</div><div class='ctx'> 		end = vha-&gt;hw-&gt;fw_shared_ram_end;</div><div class='ctx'> 		if (buf) {</div><div class='del'>-			ent-&gt;t262.start_addr = start;</div><div class='del'>-			ent-&gt;t262.end_addr = end;</div><div class='add'>+			ent-&gt;t262.start_addr = cpu_to_le32(start);</div><div class='add'>+			ent-&gt;t262.end_addr = cpu_to_le32(end);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ent-&gt;t262.ram_area == T262_RAM_AREA_DDR_RAM) {</div><div class='add'>+	} else if (area == T262_RAM_AREA_DDR_RAM) {</div><div class='ctx'> 		start = vha-&gt;hw-&gt;fw_ddr_ram_start;</div><div class='ctx'> 		end = vha-&gt;hw-&gt;fw_ddr_ram_end;</div><div class='ctx'> 		if (buf) {</div><div class='del'>-			ent-&gt;t262.start_addr = start;</div><div class='del'>-			ent-&gt;t262.end_addr = end;</div><div class='add'>+			ent-&gt;t262.start_addr = cpu_to_le32(start);</div><div class='add'>+			ent-&gt;t262.end_addr = cpu_to_le32(end);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ent-&gt;t262.ram_area == T262_RAM_AREA_MISC) {</div><div class='add'>+	} else if (area == T262_RAM_AREA_MISC) {</div><div class='ctx'> 		if (buf) {</div><div class='del'>-			ent-&gt;t262.start_addr = start;</div><div class='del'>-			ent-&gt;t262.end_addr = end;</div><div class='add'>+			ent-&gt;t262.start_addr = cpu_to_le32(start);</div><div class='add'>+			ent-&gt;t262.end_addr = cpu_to_le32(end);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd022,</div><div class='del'>-		    "%s: unknown area %x\n", __func__, ent-&gt;t262.ram_area);</div><div class='add'>+		    "%s: unknown area %x\n", __func__, area);</div><div class='ctx'> 		qla27xx_skip_entry(ent, buf);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (end &lt; start || start == 0 || end == 0) {</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd023,</div><div class='del'>-		    "%s: unusable range (start=%x end=%x)\n", __func__,</div><div class='del'>-		    ent-&gt;t262.end_addr, ent-&gt;t262.start_addr);</div><div class='add'>+		    "%s: unusable range (start=%lx end=%lx)\n",</div><div class='add'>+		    __func__, start, end);</div><div class='ctx'> 		qla27xx_skip_entry(ent, buf);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -402,13 +319,14 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='add'>+	uint type = ent-&gt;t263.queue_type;</div><div class='ctx'> 	uint count = 0;</div><div class='ctx'> 	uint i;</div><div class='ctx'> 	uint length;</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_misc, vha, 0xd207,</div><div class='del'>-	    "%s: getq(%x) [%lx]\n", __func__, ent-&gt;t263.queue_type, *len);</div><div class='del'>-	if (ent-&gt;t263.queue_type == T263_QUEUE_TYPE_REQ) {</div><div class='add'>+	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd207,</div><div class='add'>+	    "%s: getq(%x) [%lx]\n", __func__, type, *len);</div><div class='add'>+	if (type == T263_QUEUE_TYPE_REQ) {</div><div class='ctx'> 		for (i = 0; i &lt; vha-&gt;hw-&gt;max_req_queues; i++) {</div><div class='ctx'> 			struct req_que *req = vha-&gt;hw-&gt;req_q_map[i];</div><div class='ctx'> </div><div class='hunk'>@@ -422,7 +340,7 @@ qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha,</div><div class='ctx'> 				count++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ent-&gt;t263.queue_type == T263_QUEUE_TYPE_RSP) {</div><div class='add'>+	} else if (type == T263_QUEUE_TYPE_RSP) {</div><div class='ctx'> 		for (i = 0; i &lt; vha-&gt;hw-&gt;max_rsp_queues; i++) {</div><div class='ctx'> 			struct rsp_que *rsp = vha-&gt;hw-&gt;rsp_q_map[i];</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +368,7 @@ qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd026,</div><div class='del'>-		    "%s: unknown queue %x\n", __func__, ent-&gt;t263.queue_type);</div><div class='add'>+		    "%s: unknown queue %x\n", __func__, type);</div><div class='ctx'> 		qla27xx_skip_entry(ent, buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -496,12 +414,10 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t265(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='del'>-</div><div class='del'>-	ql_dbg(ql_dbg_misc, vha, 0xd209,</div><div class='add'>+	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd209,</div><div class='ctx'> 	    "%s: pause risc [%lx]\n", __func__, *len);</div><div class='ctx'> 	if (buf)</div><div class='del'>-		qla24xx_pause_risc(reg, vha-&gt;hw);</div><div class='add'>+		qla24xx_pause_risc(ISPREG(vha), vha-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -522,11 +438,12 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t267(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	uint offset = ent-&gt;t267.pci_offset;</div><div class='add'>+	ulong data = le32_to_cpu(ent-&gt;t267.data);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd20b,</div><div class='ctx'> 	    "%s: dis intr [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t267.pci_offset, ent-&gt;t267.data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), offset, data, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -622,17 +539,16 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t270(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='del'>-	ulong dwords = ent-&gt;t270.count;</div><div class='del'>-	ulong addr = ent-&gt;t270.addr;</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t270.addr);</div><div class='add'>+	ulong dwords = le32_to_cpu(ent-&gt;t270.count);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd20e,</div><div class='ctx'> 	    "%s: rdremreg [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, IOBASE_ADDR, 0x40, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), IOBASE_ADDR, 0x40, buf);</div><div class='ctx'> 	while (dwords--) {</div><div class='del'>-		qla27xx_write_reg(reg, 0xc0, addr|0x80000000, buf);</div><div class='add'>+		qla27xx_write_reg(ISPREG(vha), 0xc0, addr|0x80000000, buf);</div><div class='ctx'> 		qla27xx_insert32(addr, buf, len);</div><div class='del'>-		qla27xx_read_reg(reg, 0xc4, buf, len);</div><div class='add'>+		qla27xx_read_reg(ISPREG(vha), 0xc4, buf, len);</div><div class='ctx'> 		addr += sizeof(uint32_t);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -643,15 +559,14 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t271(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='del'>-	ulong addr = ent-&gt;t271.addr;</div><div class='del'>-	ulong data = ent-&gt;t271.data;</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t271.addr);</div><div class='add'>+	ulong data = le32_to_cpu(ent-&gt;t271.data);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd20f,</div><div class='ctx'> 	    "%s: wrremreg [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, IOBASE_ADDR, 0x40, buf);</div><div class='del'>-	qla27xx_write_reg(reg, 0xc4, data, buf);</div><div class='del'>-	qla27xx_write_reg(reg, 0xc0, addr, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), IOBASE(vha), 0x40, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), 0xc4, data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), 0xc0, addr, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -660,8 +575,8 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t272(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	ulong dwords = ent-&gt;t272.count;</div><div class='del'>-	ulong start = ent-&gt;t272.addr;</div><div class='add'>+	ulong dwords = le32_to_cpu(ent-&gt;t272.count);</div><div class='add'>+	ulong start = le32_to_cpu(ent-&gt;t272.addr);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd210,</div><div class='ctx'> 	    "%s: rdremram [%lx]\n", __func__, *len);</div><div class='hunk'>@@ -680,8 +595,8 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t273(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	ulong dwords = ent-&gt;t273.count;</div><div class='del'>-	ulong addr = ent-&gt;t273.addr;</div><div class='add'>+	ulong dwords = le32_to_cpu(ent-&gt;t273.count);</div><div class='add'>+	ulong addr = le32_to_cpu(ent-&gt;t273.addr);</div><div class='ctx'> 	uint32_t value;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd211,</div><div class='hunk'>@@ -703,12 +618,13 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='add'>+	ulong type = ent-&gt;t274.queue_type;</div><div class='ctx'> 	uint count = 0;</div><div class='ctx'> 	uint i;</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_misc, vha, 0xd212,</div><div class='del'>-	    "%s: getqsh(%x) [%lx]\n", __func__, ent-&gt;t274.queue_type, *len);</div><div class='del'>-	if (ent-&gt;t274.queue_type == T274_QUEUE_TYPE_REQ_SHAD) {</div><div class='add'>+	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd212,</div><div class='add'>+	    "%s: getqsh(%lx) [%lx]\n", __func__, type, *len);</div><div class='add'>+	if (type == T274_QUEUE_TYPE_REQ_SHAD) {</div><div class='ctx'> 		for (i = 0; i &lt; vha-&gt;hw-&gt;max_req_queues; i++) {</div><div class='ctx'> 			struct req_que *req = vha-&gt;hw-&gt;req_q_map[i];</div><div class='ctx'> </div><div class='hunk'>@@ -720,7 +636,7 @@ qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha,</div><div class='ctx'> 				count++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ent-&gt;t274.queue_type == T274_QUEUE_TYPE_RSP_SHAD) {</div><div class='add'>+	} else if (type == T274_QUEUE_TYPE_RSP_SHAD) {</div><div class='ctx'> 		for (i = 0; i &lt; vha-&gt;hw-&gt;max_rsp_queues; i++) {</div><div class='ctx'> 			struct rsp_que *rsp = vha-&gt;hw-&gt;rsp_q_map[i];</div><div class='ctx'> </div><div class='hunk'>@@ -746,7 +662,7 @@ qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd02f,</div><div class='del'>-		    "%s: unknown queue %x\n", __func__, ent-&gt;t274.queue_type);</div><div class='add'>+		    "%s: unknown queue %lx\n", __func__, type);</div><div class='ctx'> 		qla27xx_skip_entry(ent, buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -765,23 +681,26 @@ qla27xx_fwdt_entry_t275(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='ctx'> 	ulong offset = offsetof(typeof(*ent), t275.buffer);</div><div class='add'>+	ulong length = le32_to_cpu(ent-&gt;t275.length);</div><div class='add'>+	ulong size = le32_to_cpu(ent-&gt;hdr.size);</div><div class='add'>+	void *buffer = ent-&gt;t275.buffer;</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_misc, vha, 0xd213,</div><div class='del'>-	    "%s: buffer(%x) [%lx]\n", __func__, ent-&gt;t275.length, *len);</div><div class='del'>-	if (!ent-&gt;t275.length) {</div><div class='add'>+	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd213,</div><div class='add'>+	    "%s: buffer(%lx) [%lx]\n", __func__, length, *len);</div><div class='add'>+	if (!length) {</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd020,</div><div class='ctx'> 		    "%s: buffer zero length\n", __func__);</div><div class='ctx'> 		qla27xx_skip_entry(ent, buf);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	if (offset + ent-&gt;t275.length &gt; ent-&gt;hdr.size) {</div><div class='add'>+	if (offset + length &gt; size) {</div><div class='add'>+		length = size - offset;</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd030,</div><div class='del'>-		    "%s: buffer overflow\n", __func__);</div><div class='del'>-		qla27xx_skip_entry(ent, buf);</div><div class='del'>-		goto done;</div><div class='add'>+		    "%s: buffer overflow, truncate [%lx]\n", __func__, length);</div><div class='add'>+		ent-&gt;t275.length = cpu_to_le32(length);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qla27xx_insertbuf(ent-&gt;t275.buffer, ent-&gt;t275.length, buf, len);</div><div class='add'>+	qla27xx_insertbuf(buffer, length, buf, len);</div><div class='ctx'> done:</div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -790,15 +709,22 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t276(struct scsi_qla_host *vha,</div><div class='ctx'>     struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	uint type = vha-&gt;hw-&gt;pdev-&gt;device &gt;&gt; 4 &amp; 0xf;</div><div class='del'>-	uint func = vha-&gt;hw-&gt;port_no &amp; 0x3;</div><div class='del'>-</div><div class='ctx'> 	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd214,</div><div class='ctx'> 	    "%s: cond [%lx]\n", __func__, *len);</div><div class='ctx'> </div><div class='del'>-	if (type != ent-&gt;t276.cond1 || func != ent-&gt;t276.cond2) {</div><div class='del'>-		ent = qla27xx_next_entry(ent);</div><div class='del'>-		qla27xx_skip_entry(ent, buf);</div><div class='add'>+	if (buf) {</div><div class='add'>+		ulong cond1 = le32_to_cpu(ent-&gt;t276.cond1);</div><div class='add'>+		ulong cond2 = le32_to_cpu(ent-&gt;t276.cond2);</div><div class='add'>+		uint type = vha-&gt;hw-&gt;pdev-&gt;device &gt;&gt; 4 &amp; 0xf;</div><div class='add'>+		uint func = vha-&gt;hw-&gt;port_no &amp; 0x3;</div><div class='add'>+</div><div class='add'>+		if (type != cond1 || func != cond2) {</div><div class='add'>+			struct qla27xx_fwdt_template *tmp = buf;</div><div class='add'>+</div><div class='add'>+			tmp-&gt;count--;</div><div class='add'>+			ent = qla27xx_next_entry(ent);</div><div class='add'>+			qla27xx_skip_entry(ent, buf);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='hunk'>@@ -808,13 +734,15 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t277(struct scsi_qla_host *vha,</div><div class='ctx'>     struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	ulong cmd_addr = le32_to_cpu(ent-&gt;t277.cmd_addr);</div><div class='add'>+	ulong wr_cmd_data = le32_to_cpu(ent-&gt;t277.wr_cmd_data);</div><div class='add'>+	ulong data_addr = le32_to_cpu(ent-&gt;t277.data_addr);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd215,</div><div class='ctx'> 	    "%s: rdpep [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_insert32(ent-&gt;t277.wr_cmd_data, buf, len);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t277.cmd_addr, ent-&gt;t277.wr_cmd_data, buf);</div><div class='del'>-	qla27xx_read_reg(reg, ent-&gt;t277.data_addr, buf, len);</div><div class='add'>+	qla27xx_insert32(wr_cmd_data, buf, len);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), cmd_addr, wr_cmd_data, buf);</div><div class='add'>+	qla27xx_read_reg(ISPREG(vha), data_addr, buf, len);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -823,12 +751,15 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_t278(struct scsi_qla_host *vha,</div><div class='ctx'>     struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);</div><div class='add'>+	ulong cmd_addr = le32_to_cpu(ent-&gt;t278.cmd_addr);</div><div class='add'>+	ulong wr_cmd_data = le32_to_cpu(ent-&gt;t278.wr_cmd_data);</div><div class='add'>+	ulong data_addr = le32_to_cpu(ent-&gt;t278.data_addr);</div><div class='add'>+	ulong wr_data = le32_to_cpu(ent-&gt;t278.wr_data);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd216,</div><div class='ctx'> 	    "%s: wrpep [%lx]\n", __func__, *len);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t278.data_addr, ent-&gt;t278.wr_data, buf);</div><div class='del'>-	qla27xx_write_reg(reg, ent-&gt;t278.cmd_addr, ent-&gt;t278.wr_cmd_data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), data_addr, wr_data, buf);</div><div class='add'>+	qla27xx_write_reg(ISPREG(vha), cmd_addr, wr_cmd_data, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='ctx'> }</div><div class='hunk'>@@ -837,8 +768,10 @@ static struct qla27xx_fwdt_entry *</div><div class='ctx'> qla27xx_fwdt_entry_other(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='add'>+	ulong type = le32_to_cpu(ent-&gt;hdr.type);</div><div class='add'>+</div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd2ff,</div><div class='del'>-	    "%s: type %x [%lx]\n", __func__, ent-&gt;hdr.type, *len);</div><div class='add'>+	    "%s: other %lx [%lx]\n", __func__, type, *len);</div><div class='ctx'> 	qla27xx_skip_entry(ent, buf);</div><div class='ctx'> </div><div class='ctx'> 	return qla27xx_next_entry(ent);</div><div class='hunk'>@@ -893,36 +826,27 @@ static void</div><div class='ctx'> qla27xx_walk_template(struct scsi_qla_host *vha,</div><div class='ctx'> 	struct qla27xx_fwdt_template *tmp, void *buf, ulong *len)</div><div class='ctx'> {</div><div class='del'>-	struct qla27xx_fwdt_entry *ent = (void *)tmp + tmp-&gt;entry_offset;</div><div class='del'>-	ulong count = tmp-&gt;entry_count;</div><div class='add'>+	struct qla27xx_fwdt_entry *ent = (void *)tmp +</div><div class='add'>+	    le32_to_cpu(tmp-&gt;entry_offset);</div><div class='add'>+	ulong type;</div><div class='ctx'> </div><div class='add'>+	tmp-&gt;count = le32_to_cpu(tmp-&gt;entry_count);</div><div class='ctx'> 	ql_dbg(ql_dbg_misc, vha, 0xd01a,</div><div class='del'>-	    "%s: entry count %lx\n", __func__, count);</div><div class='del'>-	while (count--) {</div><div class='del'>-		ent = qla27xx_find_entry(ent-&gt;hdr.type)(vha, ent, buf, len);</div><div class='add'>+	    "%s: entry count %u\n", __func__, tmp-&gt;count);</div><div class='add'>+	while (ent &amp;&amp; tmp-&gt;count--) {</div><div class='add'>+		type = le32_to_cpu(ent-&gt;hdr.type);</div><div class='add'>+		ent = qla27xx_find_entry(type)(vha, ent, buf, len);</div><div class='ctx'> 		if (!ent)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (count)</div><div class='add'>+	if (tmp-&gt;count)</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd018,</div><div class='del'>-		    "%s: entry residual count (%lx)\n", __func__, count);</div><div class='add'>+		    "%s: entry count residual=+%u\n", __func__, tmp-&gt;count);</div><div class='ctx'> </div><div class='ctx'> 	if (ent)</div><div class='ctx'> 		ql_dbg(ql_dbg_misc, vha, 0xd019,</div><div class='del'>-		    "%s: missing end entry (%lx)\n", __func__, count);</div><div class='del'>-</div><div class='del'>-	if (buf &amp;&amp; *len != vha-&gt;hw-&gt;fw_dump_len)</div><div class='del'>-		ql_dbg(ql_dbg_misc, vha, 0xd01b,</div><div class='del'>-		    "%s: length=%#lx residual=%+ld\n",</div><div class='del'>-		    __func__, *len, vha-&gt;hw-&gt;fw_dump_len - *len);</div><div class='del'>-</div><div class='del'>-	if (buf) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0xd015,</div><div class='del'>-		    "Firmware dump saved to temp buffer (%lu/%p)\n",</div><div class='del'>-		    vha-&gt;host_no, vha-&gt;hw-&gt;fw_dump);</div><div class='del'>-		qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);</div><div class='del'>-	}</div><div class='add'>+		    "%s: missing end entry\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -945,8 +869,8 @@ qla27xx_driver_info(struct qla27xx_fwdt_template *tmp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-qla27xx_firmware_info(struct qla27xx_fwdt_template *tmp,</div><div class='del'>-	struct scsi_qla_host *vha)</div><div class='add'>+qla27xx_firmware_info(struct scsi_qla_host *vha,</div><div class='add'>+    struct qla27xx_fwdt_template *tmp)</div><div class='ctx'> {</div><div class='ctx'> 	tmp-&gt;firmware_version[0] = vha-&gt;hw-&gt;fw_major_version;</div><div class='ctx'> 	tmp-&gt;firmware_version[1] = vha-&gt;hw-&gt;fw_minor_version;</div><div class='hunk'>@@ -963,19 +887,19 @@ ql27xx_edit_template(struct scsi_qla_host *vha,</div><div class='ctx'> {</div><div class='ctx'> 	qla27xx_time_stamp(tmp);</div><div class='ctx'> 	qla27xx_driver_info(tmp);</div><div class='del'>-	qla27xx_firmware_info(tmp, vha);</div><div class='add'>+	qla27xx_firmware_info(vha, tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline uint32_t</div><div class='ctx'> qla27xx_template_checksum(void *p, ulong size)</div><div class='ctx'> {</div><div class='del'>-	uint32_t *buf = p;</div><div class='add'>+	__le32 *buf = p;</div><div class='ctx'> 	uint64_t sum = 0;</div><div class='ctx'> </div><div class='ctx'> 	size /= sizeof(*buf);</div><div class='ctx'> </div><div class='del'>-	while (size--)</div><div class='del'>-		sum += *buf++;</div><div class='add'>+	for ( ; size--; buf++)</div><div class='add'>+		sum += le32_to_cpu(*buf);</div><div class='ctx'> </div><div class='ctx'> 	sum = (sum &amp; 0xffffffff) + (sum &gt;&gt; 32);</div><div class='ctx'> </div><div class='hunk'>@@ -991,29 +915,29 @@ qla27xx_verify_template_checksum(struct qla27xx_fwdt_template *tmp)</div><div class='ctx'> static inline int</div><div class='ctx'> qla27xx_verify_template_header(struct qla27xx_fwdt_template *tmp)</div><div class='ctx'> {</div><div class='del'>-	return tmp-&gt;template_type == TEMPLATE_TYPE_FWDUMP;</div><div class='add'>+	return le32_to_cpu(tmp-&gt;template_type) == TEMPLATE_TYPE_FWDUMP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-qla27xx_execute_fwdt_template(struct scsi_qla_host *vha)</div><div class='add'>+static ulong</div><div class='add'>+qla27xx_execute_fwdt_template(struct scsi_qla_host *vha,</div><div class='add'>+    struct qla27xx_fwdt_template *tmp, void *buf)</div><div class='ctx'> {</div><div class='del'>-	struct qla27xx_fwdt_template *tmp = vha-&gt;hw-&gt;fw_dump_template;</div><div class='del'>-	ulong len;</div><div class='add'>+	ulong len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (qla27xx_fwdt_template_valid(tmp)) {</div><div class='ctx'> 		len = tmp-&gt;template_size;</div><div class='del'>-		tmp = memcpy(vha-&gt;hw-&gt;fw_dump, tmp, len);</div><div class='add'>+		tmp = memcpy(buf, tmp, len);</div><div class='ctx'> 		ql27xx_edit_template(vha, tmp);</div><div class='del'>-		qla27xx_walk_template(vha, tmp, tmp, &amp;len);</div><div class='del'>-		vha-&gt;hw-&gt;fw_dump_len = len;</div><div class='del'>-		vha-&gt;hw-&gt;fw_dumped = 1;</div><div class='add'>+		qla27xx_walk_template(vha, tmp, buf, &amp;len);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ulong</div><div class='del'>-qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *vha)</div><div class='add'>+qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *vha, void *p)</div><div class='ctx'> {</div><div class='del'>-	struct qla27xx_fwdt_template *tmp = vha-&gt;hw-&gt;fw_dump_template;</div><div class='add'>+	struct qla27xx_fwdt_template *tmp = p;</div><div class='ctx'> 	ulong len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (qla27xx_fwdt_template_valid(tmp)) {</div><div class='hunk'>@@ -1032,18 +956,6 @@ qla27xx_fwdt_template_size(void *p)</div><div class='ctx'> 	return tmp-&gt;template_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ulong</div><div class='del'>-qla27xx_fwdt_template_default_size(void)</div><div class='del'>-{</div><div class='del'>-	return sizeof(ql27xx_fwdt_default_template);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const void *</div><div class='del'>-qla27xx_fwdt_template_default(void)</div><div class='del'>-{</div><div class='del'>-	return ql27xx_fwdt_default_template;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int</div><div class='ctx'> qla27xx_fwdt_template_valid(void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -1051,7 +963,8 @@ qla27xx_fwdt_template_valid(void *p)</div><div class='ctx'> </div><div class='ctx'> 	if (!qla27xx_verify_template_header(tmp)) {</div><div class='ctx'> 		ql_log(ql_log_warn, NULL, 0xd01c,</div><div class='del'>-		    "%s: template type %x\n", __func__, tmp-&gt;template_type);</div><div class='add'>+		    "%s: template type %x\n", __func__,</div><div class='add'>+		    le32_to_cpu(tmp-&gt;template_type));</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1074,17 +987,41 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked)</div><div class='ctx'> 		spin_lock_irqsave(&amp;vha-&gt;hw-&gt;hardware_lock, flags);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (!vha-&gt;hw-&gt;fw_dump)</div><div class='del'>-		ql_log(ql_log_warn, vha, 0xd01e, "fwdump buffer missing.\n");</div><div class='del'>-	else if (!vha-&gt;hw-&gt;fw_dump_template)</div><div class='del'>-		ql_log(ql_log_warn, vha, 0xd01f, "fwdump template missing.\n");</div><div class='del'>-	else if (vha-&gt;hw-&gt;fw_dumped)</div><div class='del'>-		ql_log(ql_log_warn, vha, 0xd300,</div><div class='del'>-		    "Firmware has been previously dumped (%p),"</div><div class='del'>-		    " -- ignoring request\n", vha-&gt;hw-&gt;fw_dump);</div><div class='del'>-	else {</div><div class='del'>-		QLA_FW_STOPPED(vha-&gt;hw);</div><div class='del'>-		qla27xx_execute_fwdt_template(vha);</div><div class='add'>+	if (!vha-&gt;hw-&gt;fw_dump) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0xd01e, "-&gt; fwdump no buffer\n");</div><div class='add'>+	} else if (vha-&gt;hw-&gt;fw_dumped) {</div><div class='add'>+		ql_log(ql_log_warn, vha, 0xd01f,</div><div class='add'>+		    "-&gt; Firmware already dumped (%p) -- ignoring request\n",</div><div class='add'>+		    vha-&gt;hw-&gt;fw_dump);</div><div class='add'>+	} else {</div><div class='add'>+		struct fwdt *fwdt = vha-&gt;hw-&gt;fwdt;</div><div class='add'>+		uint j;</div><div class='add'>+		ulong len;</div><div class='add'>+		void *buf = vha-&gt;hw-&gt;fw_dump;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 2; j++, fwdt++, buf += len) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0xd011,</div><div class='add'>+			    "-&gt; fwdt%u running...\n", j);</div><div class='add'>+			if (!fwdt-&gt;template) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0xd012,</div><div class='add'>+				    "-&gt; fwdt%u no template\n", j);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			len = qla27xx_execute_fwdt_template(vha,</div><div class='add'>+			    fwdt-&gt;template, buf);</div><div class='add'>+			if (len != fwdt-&gt;dump_size) {</div><div class='add'>+				ql_log(ql_log_warn, vha, 0xd013,</div><div class='add'>+				    "-&gt; fwdt%u fwdump residual=%+ld\n",</div><div class='add'>+				    j, fwdt-&gt;dump_size - len);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		vha-&gt;hw-&gt;fw_dump_len = buf - (void *)vha-&gt;hw-&gt;fw_dump;</div><div class='add'>+		vha-&gt;hw-&gt;fw_dumped = 1;</div><div class='add'>+</div><div class='add'>+		ql_log(ql_log_warn, vha, 0xd015,</div><div class='add'>+		    "-&gt; Firmware dump saved to buffer (%lu/%p) &lt;%lx&gt;\n",</div><div class='add'>+		    vha-&gt;host_no, vha-&gt;hw-&gt;fw_dump, vha-&gt;hw-&gt;fw_dump_cap_flags);</div><div class='add'>+		qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifndef __CHECKER__</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_tmpl.h b/drivers/scsi/qla2xxx/qla_tmpl.h<br/>index 5c2c2a8a19c4..d2a0014e8b21 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_tmpl.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_tmpl.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_tmpl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_tmpl.h</a></div><div class='hunk'>@@ -11,12 +11,12 @@</div><div class='ctx'> #define IOBASE_ADDR	offsetof(struct device_reg_24xx, iobase_addr)</div><div class='ctx'> </div><div class='ctx'> struct __packed qla27xx_fwdt_template {</div><div class='del'>-	uint32_t template_type;</div><div class='del'>-	uint32_t entry_offset;</div><div class='add'>+	__le32 template_type;</div><div class='add'>+	__le32 entry_offset;</div><div class='ctx'> 	uint32_t template_size;</div><div class='del'>-	uint32_t reserved_1;</div><div class='add'>+	uint32_t count;		/* borrow field for running/residual count */</div><div class='ctx'> </div><div class='del'>-	uint32_t entry_count;</div><div class='add'>+	__le32 entry_count;</div><div class='ctx'> 	uint32_t template_version;</div><div class='ctx'> 	uint32_t capture_timestamp;</div><div class='ctx'> 	uint32_t template_checksum;</div><div class='hunk'>@@ -65,8 +65,8 @@ struct __packed qla27xx_fwdt_template {</div><div class='ctx'> </div><div class='ctx'> struct __packed qla27xx_fwdt_entry {</div><div class='ctx'> 	struct __packed {</div><div class='del'>-		uint32_t type;</div><div class='del'>-		uint32_t size;</div><div class='add'>+		__le32 type;</div><div class='add'>+		__le32 size;</div><div class='ctx'> 		uint32_t reserved_1;</div><div class='ctx'> </div><div class='ctx'> 		uint8_t  capture_flags;</div><div class='hunk'>@@ -81,36 +81,36 @@ struct __packed qla27xx_fwdt_entry {</div><div class='ctx'> 		} t255;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t base_addr;</div><div class='add'>+			__le32 base_addr;</div><div class='ctx'> 			uint8_t  reg_width;</div><div class='del'>-			uint16_t reg_count;</div><div class='add'>+			__le16 reg_count;</div><div class='ctx'> 			uint8_t  pci_offset;</div><div class='ctx'> 		} t256;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t base_addr;</div><div class='del'>-			uint32_t write_data;</div><div class='add'>+			__le32 base_addr;</div><div class='add'>+			__le32 write_data;</div><div class='ctx'> 			uint8_t  pci_offset;</div><div class='ctx'> 			uint8_t  reserved[3];</div><div class='ctx'> 		} t257;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t base_addr;</div><div class='add'>+			__le32 base_addr;</div><div class='ctx'> 			uint8_t  reg_width;</div><div class='del'>-			uint16_t reg_count;</div><div class='add'>+			__le16 reg_count;</div><div class='ctx'> 			uint8_t  pci_offset;</div><div class='ctx'> 			uint8_t  banksel_offset;</div><div class='ctx'> 			uint8_t  reserved[3];</div><div class='del'>-			uint32_t bank;</div><div class='add'>+			__le32 bank;</div><div class='ctx'> 		} t258;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t base_addr;</div><div class='del'>-			uint32_t write_data;</div><div class='add'>+			__le32 base_addr;</div><div class='add'>+			__le32 write_data;</div><div class='ctx'> 			uint8_t  reserved[2];</div><div class='ctx'> 			uint8_t  pci_offset;</div><div class='ctx'> 			uint8_t  banksel_offset;</div><div class='del'>-			uint32_t bank;</div><div class='add'>+			__le32 bank;</div><div class='ctx'> 		} t259;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='hunk'>@@ -121,14 +121,14 @@ struct __packed qla27xx_fwdt_entry {</div><div class='ctx'> 		struct __packed {</div><div class='ctx'> 			uint8_t pci_offset;</div><div class='ctx'> 			uint8_t reserved[3];</div><div class='del'>-			uint32_t write_data;</div><div class='add'>+			__le32 write_data;</div><div class='ctx'> 		} t261;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='ctx'> 			uint8_t  ram_area;</div><div class='ctx'> 			uint8_t  reserved[3];</div><div class='del'>-			uint32_t start_addr;</div><div class='del'>-			uint32_t end_addr;</div><div class='add'>+			__le32 start_addr;</div><div class='add'>+			__le32 end_addr;</div><div class='ctx'> 		} t262;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='hunk'>@@ -158,7 +158,7 @@ struct __packed qla27xx_fwdt_entry {</div><div class='ctx'> 		struct __packed {</div><div class='ctx'> 			uint8_t  pci_offset;</div><div class='ctx'> 			uint8_t  reserved[3];</div><div class='del'>-			uint32_t data;</div><div class='add'>+			__le32 data;</div><div class='ctx'> 		} t267;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='hunk'>@@ -173,23 +173,23 @@ struct __packed qla27xx_fwdt_entry {</div><div class='ctx'> 		} t269;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t addr;</div><div class='del'>-			uint32_t count;</div><div class='add'>+			__le32 addr;</div><div class='add'>+			__le32 count;</div><div class='ctx'> 		} t270;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t addr;</div><div class='del'>-			uint32_t data;</div><div class='add'>+			__le32 addr;</div><div class='add'>+			__le32 data;</div><div class='ctx'> 		} t271;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t addr;</div><div class='del'>-			uint32_t count;</div><div class='add'>+			__le32 addr;</div><div class='add'>+			__le32 count;</div><div class='ctx'> 		} t272;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t addr;</div><div class='del'>-			uint32_t count;</div><div class='add'>+			__le32 addr;</div><div class='add'>+			__le32 count;</div><div class='ctx'> 		} t273;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='hunk'>@@ -199,26 +199,26 @@ struct __packed qla27xx_fwdt_entry {</div><div class='ctx'> 		} t274;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t length;</div><div class='add'>+			__le32 length;</div><div class='ctx'> 			uint8_t  buffer[];</div><div class='ctx'> 		} t275;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t cond1;</div><div class='del'>-			uint32_t cond2;</div><div class='add'>+			__le32 cond1;</div><div class='add'>+			__le32 cond2;</div><div class='ctx'> 		} t276;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t cmd_addr;</div><div class='del'>-			uint32_t wr_cmd_data;</div><div class='del'>-			uint32_t data_addr;</div><div class='add'>+			__le32 cmd_addr;</div><div class='add'>+			__le32 wr_cmd_data;</div><div class='add'>+			__le32 data_addr;</div><div class='ctx'> 		} t277;</div><div class='ctx'> </div><div class='ctx'> 		struct __packed {</div><div class='del'>-			uint32_t cmd_addr;</div><div class='del'>-			uint32_t wr_cmd_data;</div><div class='del'>-			uint32_t data_addr;</div><div class='del'>-			uint32_t wr_data;</div><div class='add'>+			__le32 cmd_addr;</div><div class='add'>+			__le32 wr_cmd_data;</div><div class='add'>+			__le32 data_addr;</div><div class='add'>+			__le32 wr_data;</div><div class='ctx'> 		} t278;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h<br/>index 0690dac24081..cd6bdf71e533 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_version.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/qla_version.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/qla_version.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/qla_version.h</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver version</div><div class='ctx'>  */</div><div class='del'>-#define QLA2XXX_VERSION      "10.00.00.14-k"</div><div class='add'>+#define QLA2XXX_VERSION      "10.01.00.16-k"</div><div class='ctx'> </div><div class='ctx'> #define QLA_DRIVER_MAJOR_VER	10</div><div class='del'>-#define QLA_DRIVER_MINOR_VER	0</div><div class='add'>+#define QLA_DRIVER_MINOR_VER	1</div><div class='ctx'> #define QLA_DRIVER_PATCH_VER	0</div><div class='ctx'> #define QLA_DRIVER_BETA_VER	0</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c<br/>index 8a3075d17c63..ec9f1996b417 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/tcm_qla2xxx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla2xxx/tcm_qla2xxx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla2xxx/tcm_qla2xxx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla2xxx/tcm_qla2xxx.c</a></div><div class='hunk'>@@ -24,22 +24,16 @@</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/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/configfs.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_device.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;target/target_core_base.h&gt;</div><div class='ctx'> #include &lt;target/target_core_fabric.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -267,25 +261,17 @@ static void tcm_qla2xxx_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd)</div><div class='ctx'> static void tcm_qla2xxx_complete_free(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);</div><div class='del'>-	bool released = false;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cmd_in_wq = 0;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(cmd-&gt;trc_flags &amp; TRC_CMD_FREE);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;cmd-&gt;cmd_lock, flags);</div><div class='add'>+	/* To do: protect all tgt_counters manipulations with proper locking. */</div><div class='ctx'> 	cmd-&gt;qpair-&gt;tgt_counters.qla_core_ret_sta_ctio++;</div><div class='ctx'> 	cmd-&gt;trc_flags |= TRC_CMD_FREE;</div><div class='ctx'> 	cmd-&gt;cmd_sent_to_fw = 0;</div><div class='del'>-	if (cmd-&gt;released)</div><div class='del'>-		released = true;</div><div class='del'>-	spin_unlock_irqrestore(&amp;cmd-&gt;cmd_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (released)</div><div class='del'>-		qlt_free_cmd(cmd);</div><div class='del'>-	else</div><div class='del'>-		transport_generic_free_cmd(&amp;cmd-&gt;se_cmd, 0);</div><div class='add'>+	transport_generic_free_cmd(&amp;cmd-&gt;se_cmd, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -326,7 +312,6 @@ static int tcm_qla2xxx_check_stop_free(struct se_cmd *se_cmd)</div><div class='ctx'> static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_tgt_cmd *cmd;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (se_cmd-&gt;se_cmd_flags &amp; SCF_SCSI_TMR_CDB) {</div><div class='ctx'> 		struct qla_tgt_mgmt_cmd *mcmd = container_of(se_cmd,</div><div class='hunk'>@@ -336,14 +321,10 @@ static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd)</div><div class='ctx'> 	}</div><div class='ctx'> 	cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;cmd-&gt;cmd_lock, flags);</div><div class='del'>-	if (cmd-&gt;cmd_sent_to_fw) {</div><div class='del'>-		cmd-&gt;released = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;cmd-&gt;cmd_lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;cmd-&gt;cmd_lock, flags);</div><div class='del'>-		qlt_free_cmd(cmd);</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON(cmd-&gt;cmd_sent_to_fw))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	qlt_free_cmd(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tcm_qla2xxx_release_session(struct kref *kref)</div><div class='hunk'>@@ -359,7 +340,6 @@ static void tcm_qla2xxx_put_sess(struct fc_port *sess)</div><div class='ctx'> 	if (!sess)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	assert_spin_locked(&amp;sess-&gt;vha-&gt;hw-&gt;tgt.sess_lock);</div><div class='ctx'> 	kref_put(&amp;sess-&gt;sess_kref, tcm_qla2xxx_release_session);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -374,8 +354,9 @@ static void tcm_qla2xxx_close_session(struct se_session *se_sess)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;vha-&gt;hw-&gt;tgt.sess_lock, flags);</div><div class='ctx'> 	target_sess_cmd_list_set_waiting(se_sess);</div><div class='del'>-	tcm_qla2xxx_put_sess(sess);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;vha-&gt;hw-&gt;tgt.sess_lock, flags);</div><div class='add'>+</div><div class='add'>+	tcm_qla2xxx_put_sess(sess);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)</div><div class='hunk'>@@ -399,6 +380,8 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)</div><div class='ctx'> 			cmd-&gt;se_cmd.transport_state,</div><div class='ctx'> 			cmd-&gt;se_cmd.t_state,</div><div class='ctx'> 			cmd-&gt;se_cmd.se_cmd_flags);</div><div class='add'>+		transport_generic_request_failure(&amp;cmd-&gt;se_cmd,</div><div class='add'>+			TCM_CHECK_CONDITION_ABORT_CMD);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	cmd-&gt;trc_flags |= TRC_XFR_RDY;</div><div class='hunk'>@@ -488,32 +471,18 @@ static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd,</div><div class='ctx'> static void tcm_qla2xxx_handle_data_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that the complete FCP WRITE payload has been received.</div><div class='ctx'> 	 * Otherwise return an exception via CHECK_CONDITION status.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cmd-&gt;cmd_in_wq = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;cmd-&gt;cmd_lock, flags);</div><div class='ctx'> 	cmd-&gt;cmd_sent_to_fw = 0;</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;released) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;cmd-&gt;cmd_lock, flags);</div><div class='del'>-		qlt_free_cmd(cmd);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd-&gt;data_work = 1;</div><div class='ctx'> 	if (cmd-&gt;aborted) {</div><div class='del'>-		cmd-&gt;data_work_free = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;cmd-&gt;cmd_lock, flags);</div><div class='del'>-</div><div class='del'>-		tcm_qla2xxx_free_cmd(cmd);</div><div class='add'>+		transport_generic_request_failure(&amp;cmd-&gt;se_cmd,</div><div class='add'>+			TCM_CHECK_CONDITION_ABORT_CMD);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;cmd-&gt;cmd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;qpair-&gt;tgt_counters.qla_core_ret_ctio++;</div><div class='ctx'> 	if (!cmd-&gt;write_data_transferred) {</div><div class='hunk'>@@ -829,7 +798,6 @@ static void tcm_qla2xxx_clear_nacl_from_fcport_map(struct fc_port *sess)</div><div class='ctx'> </div><div class='ctx'> static void tcm_qla2xxx_shutdown_sess(struct fc_port *sess)</div><div class='ctx'> {</div><div class='del'>-	assert_spin_locked(&amp;sess-&gt;vha-&gt;hw-&gt;tgt.sess_lock);</div><div class='ctx'> 	target_sess_cmd_list_set_waiting(sess-&gt;se_sess);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1489,7 +1457,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(</div><div class='ctx'> 	 */</div><div class='ctx'> 	tpg = lport-&gt;tpg_1;</div><div class='ctx'> 	if (!tpg) {</div><div class='del'>-		pr_err("Unable to lcoate struct tcm_qla2xxx_lport-&gt;tpg_1\n");</div><div class='add'>+		pr_err("Unable to locate struct tcm_qla2xxx_lport-&gt;tpg_1\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c<br/>index 16a18d5d856f..8c674eca09f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla4xxx/ql4_os.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qla4xxx/ql4_os.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qla4xxx/ql4_os.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qla4xxx/ql4_os.c</a></div><div class='hunk'>@@ -3203,6 +3203,8 @@ static int qla4xxx_conn_bind(struct iscsi_cls_session *cls_session,</div><div class='ctx'> 	if (iscsi_conn_bind(cls_session, cls_conn, is_leading))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ep = iscsi_lookup_endpoint(transport_fd);</div><div class='add'>+	if (!ep)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	conn = cls_conn-&gt;dd_data;</div><div class='ctx'> 	qla_conn = conn-&gt;dd_data;</div><div class='ctx'> 	qla_conn-&gt;qla_ep = ep-&gt;dd_data;</div><div class='hunk'>@@ -5928,7 +5930,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])</div><div class='ctx'> 		val = rd_nvram_byte(ha, sec_addr);</div><div class='ctx'> 		if (val &amp; BIT_7)</div><div class='ctx'> 			ddb_index[1] = (val &amp; 0x7f);</div><div class='del'>-</div><div class='add'>+		goto exit_boot_info;</div><div class='ctx'> 	} else if (is_qla80XX(ha)) {</div><div class='ctx'> 		buf = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, size,</div><div class='ctx'> 					 &amp;buf_dma, GFP_KERNEL);</div><div class='head'>diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c<br/>index 8b471a925b43..136681ad18a5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qlogicfas408.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/qlogicfas408.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/qlogicfas408.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/qlogicfas408.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request, int</div><div class='ctx'> 	} else {		/* out */</div><div class='ctx'> #if QL_TURBO_PDMA</div><div class='ctx'> 		rtrc(4)</div><div class='del'>-		    if (reqlen &gt;= 128 &amp;&amp; inb(qbase + 8) &amp; 0x10) {	/* empty */</div><div class='add'>+		if (reqlen &gt;= 128 &amp;&amp; inb(qbase + 8) &amp; 0x10) {	/* empty */</div><div class='ctx'> 			outsl(qbase + 4, request, 32);</div><div class='ctx'> 			reqlen -= 128;</div><div class='ctx'> 			request += 128;</div><div class='hunk'>@@ -240,7 +240,7 @@ static void ql_icmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 	outb(0x40 | qlcfg8 | priv-&gt;qinitid, qbase + 8);</div><div class='ctx'> 	outb(qlcfg7, qbase + 7);</div><div class='ctx'> 	outb(qlcfg6, qbase + 6);</div><div class='del'>-	 /**/ outb(qlcfg5, qbase + 5);	/* select timer */</div><div class='add'>+	outb(qlcfg5, qbase + 5);	/* select timer */</div><div class='ctx'> 	outb(qlcfg9 &amp; 7, qbase + 9);	/* prescaler */</div><div class='ctx'> /*	outb(0x99, qbase + 5);	*/</div><div class='ctx'> 	outb(scmd_id(cmd), qbase + 4);</div><div class='head'>diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c<br/>index c4cbfd07b916..a08ff3bd6310 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_devinfo.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_devinfo.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_devinfo.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_devinfo.c</a></div><div class='hunk'>@@ -238,6 +238,7 @@ static struct {</div><div class='ctx'> 	{"NETAPP", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},</div><div class='ctx'> 	{"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},</div><div class='ctx'> 	{"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},</div><div class='add'>+	{"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},</div><div class='ctx'> 	{"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},</div><div class='ctx'> 	{"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},</div><div class='ctx'> 	{"SONY", "TSL", NULL, BLIST_FORCELUN},		/* DDS3 &amp; DDS4 autoloaders */</div><div class='head'>diff --git a/drivers/scsi/scsi_dh.c b/drivers/scsi/scsi_dh.c<br/>index 5a58cbf3a75d..c14006ac98f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_dh.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_dh.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_dh.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_dh.c</a></div><div class='hunk'>@@ -75,6 +75,7 @@ static const struct scsi_dh_blist scsi_dh_blist[] = {</div><div class='ctx'> 	{"NETAPP", "INF-01-00",		"rdac", },</div><div class='ctx'> 	{"LSI", "INF-01-00",		"rdac", },</div><div class='ctx'> 	{"ENGENIO", "INF-01-00",	"rdac", },</div><div class='add'>+	{"LENOVO", "DE_Series",		"rdac", },</div><div class='ctx'> 	{NULL, NULL,			NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c<br/>index 1b8378f36139..8e9680572b9f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_error.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_error.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_error.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_error.c</a></div><div class='hunk'>@@ -2393,7 +2393,6 @@ out_put_autopm_host:</div><div class='ctx'> 	scsi_autopm_put_host(shost);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(scsi_ioctl_reset);</div><div class='ctx'> </div><div class='ctx'> bool scsi_command_normalize_sense(const struct scsi_cmnd *cmd,</div><div class='ctx'> 				  struct scsi_sense_hdr *sshdr)</div><div class='head'>diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c<br/>index 20189675677a..0916bd6d22b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_lib.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_lib.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_lib.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_lib.c</a></div><div class='hunk'>@@ -141,8 +141,6 @@ scsi_set_blocked(struct scsi_cmnd *cmd, int reason)</div><div class='ctx'> </div><div class='ctx'> static void scsi_mq_requeue_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct scsi_device *sdev = cmd-&gt;device;</div><div class='del'>-</div><div class='ctx'> 	if (cmd-&gt;request-&gt;rq_flags &amp; RQF_DONTPREP) {</div><div class='ctx'> 		cmd-&gt;request-&gt;rq_flags &amp;= ~RQF_DONTPREP;</div><div class='ctx'> 		scsi_mq_uninit_cmd(cmd);</div><div class='hunk'>@@ -150,7 +148,6 @@ static void scsi_mq_requeue_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 		WARN_ON_ONCE(true);</div><div class='ctx'> 	}</div><div class='ctx'> 	blk_mq_requeue_request(cmd-&gt;request, true);</div><div class='del'>-	put_device(&amp;sdev-&gt;sdev_gendev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -189,19 +186,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, bool unbusy)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cmd-&gt;result = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Before a SCSI command is dispatched,</div><div class='del'>-	 * get_device(&amp;sdev-&gt;sdev_gendev) is called and the host,</div><div class='del'>-	 * target and device busy counters are increased. Since</div><div class='del'>-	 * requeuing a request causes these actions to be repeated and</div><div class='del'>-	 * since scsi_device_unbusy() has already been called,</div><div class='del'>-	 * put_device(&amp;device-&gt;sdev_gendev) must still be called. Call</div><div class='del'>-	 * put_device() after blk_mq_requeue_request() to avoid that</div><div class='del'>-	 * removal of the SCSI device can start before requeueing has</div><div class='del'>-	 * happened.</div><div class='del'>-	 */</div><div class='ctx'> 	blk_mq_requeue_request(cmd-&gt;request, true);</div><div class='del'>-	put_device(&amp;device-&gt;sdev_gendev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -585,10 +570,17 @@ static bool scsi_end_request(struct request *req, blk_status_t error,</div><div class='ctx'> 	if (!blk_rq_is_scsi(req)) {</div><div class='ctx'> 		WARN_ON_ONCE(!(cmd-&gt;flags &amp; SCMD_INITIALIZED));</div><div class='ctx'> 		cmd-&gt;flags &amp;= ~SCMD_INITIALIZED;</div><div class='del'>-		destroy_rcu_head(&amp;cmd-&gt;rcu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Calling rcu_barrier() is not necessary here because the</div><div class='add'>+	 * SCSI error handler guarantees that the function called by</div><div class='add'>+	 * call_rcu() has been called before scsi_end_request() is</div><div class='add'>+	 * called.</div><div class='add'>+	 */</div><div class='add'>+	destroy_rcu_head(&amp;cmd-&gt;rcu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * In the MQ case the command gets freed by __blk_mq_end_request,</div><div class='ctx'> 	 * so we have to do all cleanup that depends on it earlier.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -612,7 +604,6 @@ static bool scsi_end_request(struct request *req, blk_status_t error,</div><div class='ctx'> 		blk_mq_run_hw_queues(q, true);</div><div class='ctx'> </div><div class='ctx'> 	percpu_ref_put(&amp;q-&gt;q_usage_counter);</div><div class='del'>-	put_device(&amp;sdev-&gt;sdev_gendev);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1606,7 +1597,6 @@ static void scsi_mq_put_budget(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 	struct scsi_device *sdev = q-&gt;queuedata;</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;sdev-&gt;device_busy);</div><div class='del'>-	put_device(&amp;sdev-&gt;sdev_gendev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool scsi_mq_get_budget(struct blk_mq_hw_ctx *hctx)</div><div class='hunk'>@@ -1614,16 +1604,9 @@ static bool scsi_mq_get_budget(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 	struct request_queue *q = hctx-&gt;queue;</div><div class='ctx'> 	struct scsi_device *sdev = q-&gt;queuedata;</div><div class='ctx'> </div><div class='del'>-	if (!get_device(&amp;sdev-&gt;sdev_gendev))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!scsi_dev_queue_ready(q, sdev))</div><div class='del'>-		goto out_put_device;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='add'>+	if (scsi_dev_queue_ready(q, sdev))</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-out_put_device:</div><div class='del'>-	put_device(&amp;sdev-&gt;sdev_gendev);</div><div class='del'>-out:</div><div class='ctx'> 	if (atomic_read(&amp;sdev-&gt;device_busy) == 0 &amp;&amp; !scsi_device_blocked(sdev))</div><div class='ctx'> 		blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY);</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1699,8 +1682,12 @@ out_put_budget:</div><div class='ctx'> 			ret = BLK_STS_DEV_RESOURCE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		if (unlikely(!scsi_device_online(sdev)))</div><div class='add'>+			scsi_req(req)-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='add'>+		else</div><div class='add'>+			scsi_req(req)-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 		/*</div><div class='del'>-		 * Make sure to release all allocated ressources when</div><div class='add'>+		 * Make sure to release all allocated resources when</div><div class='ctx'> 		 * we hit an error, as we will never see this command</div><div class='ctx'> 		 * again.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1759,7 +1746,7 @@ static int scsi_map_queues(struct blk_mq_tag_set *set)</div><div class='ctx'> </div><div class='ctx'> 	if (shost-&gt;hostt-&gt;map_queues)</div><div class='ctx'> 		return shost-&gt;hostt-&gt;map_queues(shost);</div><div class='del'>-	return blk_mq_map_queues(&amp;set-&gt;map[0]);</div><div class='add'>+	return blk_mq_map_queues(&amp;set-&gt;map[HCTX_TYPE_DEFAULT]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __scsi_init_queue(struct Scsi_Host *shost, struct request_queue *q)</div><div class='hunk'>@@ -2541,8 +2528,10 @@ void scsi_device_resume(struct scsi_device *sdev)</div><div class='ctx'> 	 * device deleted during suspend)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;sdev-&gt;state_mutex);</div><div class='del'>-	sdev-&gt;quiesced_by = NULL;</div><div class='del'>-	blk_clear_pm_only(sdev-&gt;request_queue);</div><div class='add'>+	if (sdev-&gt;quiesced_by) {</div><div class='add'>+		sdev-&gt;quiesced_by = NULL;</div><div class='add'>+		blk_clear_pm_only(sdev-&gt;request_queue);</div><div class='add'>+	}</div><div class='ctx'> 	if (sdev-&gt;sdev_state == SDEV_QUIESCE)</div><div class='ctx'> 		scsi_device_set_state(sdev, SDEV_RUNNING);</div><div class='ctx'> 	mutex_unlock(&amp;sdev-&gt;state_mutex);</div><div class='head'>diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c<br/>index 53380e07b40e..058079f915f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_scan.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_scan.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_scan.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_scan.c</a></div><div class='hunk'>@@ -1129,7 +1129,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'> 	 * that no LUN is present, so don't add sdev in these cases.</div><div class='ctx'> 	 * Two specific examples are:</div><div class='ctx'> 	 * 1) NetApp targets: return PQ=1, PDT=0x1f</div><div class='del'>-	 * 2) USB UFI: returns PDT=0x1f, with the PQ bits being "reserved"</div><div class='add'>+	 * 2) IBM/2145 targets: return PQ=1, PDT=0</div><div class='add'>+	 * 3) USB UFI: returns PDT=0x1f, with the PQ bits being "reserved"</div><div class='ctx'> 	 *    in the UFI 1.0 spec (we cannot rely on reserved bits).</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * References:</div><div class='hunk'>@@ -1143,8 +1144,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'> 	 * PDT=00h Direct-access device (floppy)</div><div class='ctx'> 	 * PDT=1Fh none (no FDD connected to the requested logical unit)</div><div class='ctx'> 	 */</div><div class='del'>-	if (((result[0] &gt;&gt; 5) == 1 || starget-&gt;pdt_1f_for_no_lun) &amp;&amp;</div><div class='del'>-	    (result[0] &amp; 0x1f) == 0x1f &amp;&amp;</div><div class='add'>+	if (((result[0] &gt;&gt; 5) == 1 ||</div><div class='add'>+	    (starget-&gt;pdt_1f_for_no_lun &amp;&amp; (result[0] &amp; 0x1f) == 0x1f)) &amp;&amp;</div><div class='ctx'> 	    !scsi_is_wlun(lun)) {</div><div class='ctx'> 		SCSI_LOG_SCAN_BUS(3, sdev_printk(KERN_INFO, sdev,</div><div class='ctx'> 					"scsi scan: peripheral device type"</div><div class='head'>diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c<br/>index 6a9040faed00..3b119ca0cc0c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_sysfs.c</a></div><div class='hunk'>@@ -771,6 +771,12 @@ store_state_field(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sdev-&gt;state_mutex);</div><div class='ctx'> 	ret = scsi_device_set_state(sdev, state);</div><div class='add'>+	/*</div><div class='add'>+	 * If the device state changes to SDEV_RUNNING, we need to run</div><div class='add'>+	 * the queue to avoid I/O hang.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == 0 &amp;&amp; state == SDEV_RUNNING)</div><div class='add'>+		blk_mq_run_hw_queues(sdev-&gt;request_queue, true);</div><div class='ctx'> 	mutex_unlock(&amp;sdev-&gt;state_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret == 0 ? count : -EINVAL;</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c<br/>index d7035270d274..d9e3cf3721f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_transport_fc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_transport_fc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_transport_fc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_transport_fc.c</a></div><div class='hunk'>@@ -147,6 +147,7 @@ static const struct {</div><div class='ctx'> 	{ FCH_EVT_PORT_OFFLINE,		"port_offline" },</div><div class='ctx'> 	{ FCH_EVT_PORT_FABRIC,		"port_fabric" },</div><div class='ctx'> 	{ FCH_EVT_LINK_UNKNOWN,		"link_unknown" },</div><div class='add'>+	{ FCH_EVT_LINK_FPIN,		"link_FPIN" },</div><div class='ctx'> 	{ FCH_EVT_VENDOR_UNIQUE,	"vendor_unique" },</div><div class='ctx'> };</div><div class='ctx'> fc_enum_name_search(host_event_code, fc_host_event_code,</div><div class='hunk'>@@ -295,6 +296,9 @@ static const struct {</div><div class='ctx'> 	{ FC_PORT_ROLE_FCP_INITIATOR,		"FCP Initiator" },</div><div class='ctx'> 	{ FC_PORT_ROLE_IP_PORT,			"IP Port" },</div><div class='ctx'> 	{ FC_PORT_ROLE_FCP_DUMMY_INITIATOR,	"FCP Dummy Initiator" },</div><div class='add'>+	{ FC_PORT_ROLE_NVME_INITIATOR,		"NVMe Initiator" },</div><div class='add'>+	{ FC_PORT_ROLE_NVME_TARGET,		"NVMe Target" },</div><div class='add'>+	{ FC_PORT_ROLE_NVME_DISCOVERY,		"NVMe Discovery" },</div><div class='ctx'> };</div><div class='ctx'> fc_bitfield_name_search(port_roles, fc_port_role_names)</div><div class='ctx'> </div><div class='hunk'>@@ -523,20 +527,23 @@ fc_get_event_number(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fc_get_event_number);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * fc_host_post_event - called to post an even on an fc_host.</div><div class='add'>+ * fc_host_post_fc_event - routine to do the work of posting an event</div><div class='add'>+ *                      on an fc_host.</div><div class='ctx'>  * @shost:		host the event occurred on</div><div class='ctx'>  * @event_number:	fc event number obtained from get_fc_event_number()</div><div class='ctx'>  * @event_code:		fc_host event being posted</div><div class='del'>- * @event_data:		32bits of data for the event being posted</div><div class='add'>+ * @data_len:		amount, in bytes, of event data</div><div class='add'>+ * @data_buf:		pointer to event data</div><div class='add'>+ * @vendor_id:          value for Vendor id</div><div class='ctx'>  *</div><div class='ctx'>  * Notes:</div><div class='ctx'>  *	This routine assumes no locks are held on entry.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-fc_host_post_event(struct Scsi_Host *shost, u32 event_number,</div><div class='del'>-		enum fc_host_event_code event_code, u32 event_data)</div><div class='add'>+fc_host_post_fc_event(struct Scsi_Host *shost, u32 event_number,</div><div class='add'>+		enum fc_host_event_code event_code,</div><div class='add'>+		u32 data_len, char *data_buf, u64 vendor_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct nlmsghdr	*nlh;</div><div class='hunk'>@@ -545,12 +552,15 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (!data_buf || data_len &lt; 4)</div><div class='add'>+		data_len = 0;</div><div class='add'>+</div><div class='ctx'> 	if (!scsi_nl_sock) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		goto send_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len = FC_NL_MSGALIGN(sizeof(*event));</div><div class='add'>+	len = FC_NL_MSGALIGN(sizeof(*event) + data_len);</div><div class='ctx'> </div><div class='ctx'> 	skb = nlmsg_new(len, GFP_KERNEL);</div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -568,12 +578,13 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,</div><div class='ctx'> 	INIT_SCSI_NL_HDR(&amp;event-&gt;snlh, SCSI_NL_TRANSPORT_FC,</div><div class='ctx'> 				FC_NL_ASYNC_EVENT, len);</div><div class='ctx'> 	event-&gt;seconds = ktime_get_real_seconds();</div><div class='del'>-	event-&gt;vendor_id = 0;</div><div class='add'>+	event-&gt;vendor_id = vendor_id;</div><div class='ctx'> 	event-&gt;host_no = shost-&gt;host_no;</div><div class='del'>-	event-&gt;event_datalen = sizeof(u32);	/* bytes */</div><div class='add'>+	event-&gt;event_datalen = data_len;	/* bytes */</div><div class='ctx'> 	event-&gt;event_num = event_number;</div><div class='ctx'> 	event-&gt;event_code = event_code;</div><div class='del'>-	event-&gt;event_data = event_data;</div><div class='add'>+	if (data_len)</div><div class='add'>+		memcpy(&amp;event-&gt;event_data, data_buf, data_len);</div><div class='ctx'> </div><div class='ctx'> 	nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='hunk'>@@ -586,14 +597,35 @@ send_fail:</div><div class='ctx'> 	printk(KERN_WARNING</div><div class='ctx'> 		"%s: Dropped Event : host %d %s data 0x%08x - err %d\n",</div><div class='ctx'> 		__func__, shost-&gt;host_no,</div><div class='del'>-		(name) ? name : "&lt;unknown&gt;", event_data, err);</div><div class='add'>+		(name) ? name : "&lt;unknown&gt;",</div><div class='add'>+		(data_len) ? *((u32 *)data_buf) : 0xFFFFFFFF, err);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(fc_host_post_fc_event);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fc_host_post_event - called to post an even on an fc_host.</div><div class='add'>+ * @shost:		host the event occurred on</div><div class='add'>+ * @event_number:	fc event number obtained from get_fc_event_number()</div><div class='add'>+ * @event_code:		fc_host event being posted</div><div class='add'>+ * @event_data:		32bits of data for the event being posted</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *	This routine assumes no locks are held on entry.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+fc_host_post_event(struct Scsi_Host *shost, u32 event_number,</div><div class='add'>+		enum fc_host_event_code event_code, u32 event_data)</div><div class='add'>+{</div><div class='add'>+	fc_host_post_fc_event(shost, event_number, event_code,</div><div class='add'>+		(u32)sizeof(u32), (char *)&amp;event_data, 0);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(fc_host_post_event);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fc_host_post_vendor_event - called to post a vendor unique event on an fc_host</div><div class='add'>+ * fc_host_post_vendor_event - called to post a vendor unique event</div><div class='add'>+ *                      on an fc_host</div><div class='ctx'>  * @shost:		host the event occurred on</div><div class='ctx'>  * @event_number:	fc event number obtained from get_fc_event_number()</div><div class='ctx'>  * @data_len:		amount, in bytes, of vendor unique data</div><div class='hunk'>@@ -607,56 +639,27 @@ void</div><div class='ctx'> fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,</div><div class='ctx'> 		u32 data_len, char * data_buf, u64 vendor_id)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct nlmsghdr	*nlh;</div><div class='del'>-	struct fc_nl_event *event;</div><div class='del'>-	u32 len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!scsi_nl_sock) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto send_vendor_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = FC_NL_MSGALIGN(sizeof(*event) + data_len);</div><div class='del'>-</div><div class='del'>-	skb = nlmsg_new(len, GFP_KERNEL);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		err = -ENOBUFS;</div><div class='del'>-		goto send_vendor_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);</div><div class='del'>-	if (!nlh) {</div><div class='del'>-		err = -ENOBUFS;</div><div class='del'>-		goto send_vendor_fail_skb;</div><div class='del'>-	}</div><div class='del'>-	event = nlmsg_data(nlh);</div><div class='del'>-</div><div class='del'>-	INIT_SCSI_NL_HDR(&amp;event-&gt;snlh, SCSI_NL_TRANSPORT_FC,</div><div class='del'>-				FC_NL_ASYNC_EVENT, len);</div><div class='del'>-	event-&gt;seconds = ktime_get_real_seconds();</div><div class='del'>-	event-&gt;vendor_id = vendor_id;</div><div class='del'>-	event-&gt;host_no = shost-&gt;host_no;</div><div class='del'>-	event-&gt;event_datalen = data_len;	/* bytes */</div><div class='del'>-	event-&gt;event_num = event_number;</div><div class='del'>-	event-&gt;event_code = FCH_EVT_VENDOR_UNIQUE;</div><div class='del'>-	memcpy(&amp;event-&gt;event_data, data_buf, data_len);</div><div class='del'>-</div><div class='del'>-	nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-send_vendor_fail_skb:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-send_vendor_fail:</div><div class='del'>-	printk(KERN_WARNING</div><div class='del'>-		"%s: Dropped Event : host %d vendor_unique - err %d\n",</div><div class='del'>-		__func__, shost-&gt;host_no, err);</div><div class='del'>-	return;</div><div class='add'>+	fc_host_post_fc_event(shost, event_number, FCH_EVT_VENDOR_UNIQUE,</div><div class='add'>+		data_len, data_buf, vendor_id);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fc_host_post_vendor_event);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fc_host_rcv_fpin - routine to process a received FPIN.</div><div class='add'>+ * @shost:		host the FPIN was received on</div><div class='add'>+ * @fpin_len:		length of FPIN payload, in bytes</div><div class='add'>+ * @fpin_buf:		pointer to FPIN payload</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *	This routine assumes no locks are held on entry.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+fc_host_fpin_rcv(struct Scsi_Host *shost, u32 fpin_len, char *fpin_buf)</div><div class='add'>+{</div><div class='add'>+	fc_host_post_fc_event(shost, fc_get_event_number(),</div><div class='add'>+				FCH_EVT_LINK_FPIN, fpin_len, fpin_buf, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fc_host_fpin_rcv);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static __init int fc_transport_init(void)</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c<br/>index 0508831d6fb9..0a82e93566dc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/scsi_transport_iscsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/scsi_transport_iscsi.c</a></div><div class='hunk'>@@ -2200,6 +2200,8 @@ void iscsi_remove_session(struct iscsi_cls_session *session)</div><div class='ctx'> 	scsi_target_unblock(&amp;session-&gt;dev, SDEV_TRANSPORT_OFFLINE);</div><div class='ctx'> 	/* flush running scans then delete devices */</div><div class='ctx'> 	flush_work(&amp;session-&gt;scan_work);</div><div class='add'>+	/* flush running unbind operations */</div><div class='add'>+	flush_work(&amp;session-&gt;unbind_work);</div><div class='ctx'> 	__iscsi_unbind_session(&amp;session-&gt;unbind_work);</div><div class='ctx'> </div><div class='ctx'> 	/* hw iscsi may not have removed all connections from session */</div><div class='head'>diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c<br/>index 251db30d0882..ebc80354714c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/sd.c</a></div><div class='hunk'>@@ -1415,11 +1415,6 @@ static void sd_release(struct gendisk *disk, fmode_t mode)</div><div class='ctx'> 			scsi_set_medium_removal(sdev, SCSI_REMOVAL_ALLOW);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * XXX and what if there are packets in flight and this close()</div><div class='del'>-	 * XXX is followed by a "rmmod sd_mod"?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	scsi_disk_put(sdkp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2261,22 +2256,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp,</div><div class='ctx'> </div><div class='ctx'> #define READ_CAPACITY_RETRIES_ON_RESET	10</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Ensure that we don't overflow sector_t when CONFIG_LBDAF is not set</div><div class='del'>- * and the reported logical block size is bigger than 512 bytes. Note</div><div class='del'>- * that last_sector is a u64 and therefore logical_to_sectors() is not</div><div class='del'>- * applicable.</div><div class='del'>- */</div><div class='del'>-static bool sd_addressable_capacity(u64 lba, unsigned int sector_size)</div><div class='del'>-{</div><div class='del'>-	u64 last_sector = (lba + 1ULL) &lt;&lt; (ilog2(sector_size) - 9);</div><div class='del'>-</div><div class='del'>-	if (sizeof(sector_t) == 4 &amp;&amp; last_sector &gt; U32_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='ctx'> static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,</div><div class='ctx'> 						unsigned char *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -2342,14 +2321,6 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sd_addressable_capacity(lba, sector_size)) {</div><div class='del'>-		sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "</div><div class='del'>-			"kernel compiled with support for large block "</div><div class='del'>-			"devices.\n");</div><div class='del'>-		sdkp-&gt;capacity = 0;</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Logical blocks per physical block exponent */</div><div class='ctx'> 	sdkp-&gt;physical_block_size = (1 &lt;&lt; (buffer[13] &amp; 0xf)) * sector_size;</div><div class='ctx'> </div><div class='hunk'>@@ -2431,14 +2402,6 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,</div><div class='ctx'> 		return sector_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sd_addressable_capacity(lba, sector_size)) {</div><div class='del'>-		sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "</div><div class='del'>-			"kernel compiled with support for large block "</div><div class='del'>-			"devices.\n");</div><div class='del'>-		sdkp-&gt;capacity = 0;</div><div class='del'>-		return -EOVERFLOW;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	sdkp-&gt;capacity = lba + 1;</div><div class='ctx'> 	sdkp-&gt;physical_block_size = sector_size;</div><div class='ctx'> 	return sector_size;</div><div class='hunk'>@@ -3076,6 +3039,9 @@ static bool sd_validate_opt_xfer_size(struct scsi_disk *sdkp,</div><div class='ctx'> 	unsigned int opt_xfer_bytes =</div><div class='ctx'> 		logical_to_bytes(sdp, sdkp-&gt;opt_xfer_blocks);</div><div class='ctx'> </div><div class='add'>+	if (sdkp-&gt;opt_xfer_blocks == 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (sdkp-&gt;opt_xfer_blocks &gt; dev_max) {</div><div class='ctx'> 		sd_first_printk(KERN_WARNING, sdkp,</div><div class='ctx'> 				"Optimal transfer size %u logical blocks " \</div><div class='hunk'>@@ -3327,6 +3293,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie)</div><div class='ctx'> 	if (sdp-&gt;removable) {</div><div class='ctx'> 		gd-&gt;flags |= GENHD_FL_REMOVABLE;</div><div class='ctx'> 		gd-&gt;events |= DISK_EVENT_MEDIA_CHANGE;</div><div class='add'>+		gd-&gt;event_flags = DISK_EVENT_FLAG_POLL | DISK_EVENT_FLAG_UEVENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	blk_pm_runtime_init(sdp-&gt;request_queue, dev);</div><div class='hunk'>@@ -3505,9 +3472,21 @@ static void scsi_disk_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_disk *sdkp = to_scsi_disk(dev);</div><div class='ctx'> 	struct gendisk *disk = sdkp-&gt;disk;</div><div class='del'>-	</div><div class='add'>+	struct request_queue *q = disk-&gt;queue;</div><div class='add'>+</div><div class='ctx'> 	ida_free(&amp;sd_index_ida, sdkp-&gt;index);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Wait until all requests that are in progress have completed.</div><div class='add'>+	 * This is necessary to avoid that e.g. scsi_end_request() crashes</div><div class='add'>+	 * due to clearing the disk-&gt;private_data pointer. Wait from inside</div><div class='add'>+	 * scsi_disk_release() instead of from sd_release() to avoid that</div><div class='add'>+	 * freezing and unfreezing the request queue affects user space I/O</div><div class='add'>+	 * in case multiple processes open a /dev/sd... node concurrently.</div><div class='add'>+	 */</div><div class='add'>+	blk_mq_freeze_queue(q);</div><div class='add'>+	blk_mq_unfreeze_queue(q);</div><div class='add'>+</div><div class='ctx'> 	disk-&gt;private_data = NULL;</div><div class='ctx'> 	put_disk(disk);</div><div class='ctx'> 	put_device(&amp;sdkp-&gt;device-&gt;sdev_gendev);</div><div class='head'>diff --git a/drivers/scsi/smartpqi/Makefile b/drivers/scsi/smartpqi/Makefile<br/>index a03a6edb0060..28985e508b5c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/smartpqi/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_SCSI_SMARTPQI) += smartpqi.o</div><div class='ctx'> smartpqi-objs := smartpqi_init.o smartpqi_sis.o smartpqi_sas_transport.o</div><div class='head'>diff --git a/drivers/scsi/smartpqi/smartpqi.h b/drivers/scsi/smartpqi/smartpqi.h<br/>index af962368818b..e8e768849c70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/smartpqi/smartpqi.h</a></div><div class='hunk'>@@ -1,18 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *    driver for Microsemi PQI-based storage controllers</div><div class='del'>- *    Copyright (c) 2016-2017 Microsemi Corporation</div><div class='add'>+ *    Copyright (c) 2019 Microchip Technology Inc. and its subsidiaries</div><div class='add'>+ *    Copyright (c) 2016-2018 Microsemi Corporation</div><div class='ctx'>  *    Copyright (c) 2016 PMC-Sierra, Inc.</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 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, GOOD TITLE or</div><div class='del'>- *    NON INFRINGEMENT.  See the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *    Questions/Comments/Bugfixes to esc.storagedev@microsemi.com</div><div class='add'>+ *    Questions/Comments/Bugfixes to storagedev@microchip.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c<br/>index 75ec43aa8df3..c26cac819f9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/smartpqi/smartpqi_init.c</a></div><div class='hunk'>@@ -1,18 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *    driver for Microsemi PQI-based storage controllers</div><div class='del'>- *    Copyright (c) 2016-2017 Microsemi Corporation</div><div class='add'>+ *    Copyright (c) 2019 Microchip Technology Inc. and its subsidiaries</div><div class='add'>+ *    Copyright (c) 2016-2018 Microsemi Corporation</div><div class='ctx'>  *    Copyright (c) 2016 PMC-Sierra, Inc.</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 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, GOOD TITLE or</div><div class='del'>- *    NON INFRINGEMENT.  See the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *    Questions/Comments/Bugfixes to esc.storagedev@microsemi.com</div><div class='add'>+ *    Questions/Comments/Bugfixes to storagedev@microchip.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -40,11 +33,11 @@</div><div class='ctx'> #define BUILD_TIMESTAMP</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION		"1.2.4-070"</div><div class='add'>+#define DRIVER_VERSION		"1.2.6-015"</div><div class='ctx'> #define DRIVER_MAJOR		1</div><div class='ctx'> #define DRIVER_MINOR		2</div><div class='del'>-#define DRIVER_RELEASE		4</div><div class='del'>-#define DRIVER_REVISION		70</div><div class='add'>+#define DRIVER_RELEASE		6</div><div class='add'>+#define DRIVER_REVISION		15</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME		"Microsemi PQI Driver (v" \</div><div class='ctx'> 				DRIVER_VERSION BUILD_TIMESTAMP ")"</div><div class='hunk'>@@ -5660,9 +5653,11 @@ static int pqi_lun_reset(struct pqi_ctrl_info *ctrl_info,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Performs a reset at the LUN level. */</div><div class='add'>+</div><div class='ctx'> #define PQI_LUN_RESET_RETRIES			3</div><div class='ctx'> #define PQI_LUN_RESET_RETRY_INTERVAL_MSECS	10000</div><div class='del'>-/* Performs a reset at the LUN level. */</div><div class='add'>+#define PQI_LUN_RESET_PENDING_IO_TIMEOUT_SECS	120</div><div class='ctx'> </div><div class='ctx'> static int _pqi_device_reset(struct pqi_ctrl_info *ctrl_info,</div><div class='ctx'> 	struct pqi_scsi_dev *device)</div><div class='hunk'>@@ -5673,12 +5668,12 @@ static int _pqi_device_reset(struct pqi_ctrl_info *ctrl_info,</div><div class='ctx'> </div><div class='ctx'> 	for (retries = 0;;) {</div><div class='ctx'> 		rc = pqi_lun_reset(ctrl_info, device);</div><div class='del'>-		if (rc != -EAGAIN ||</div><div class='del'>-		    ++retries &gt; PQI_LUN_RESET_RETRIES)</div><div class='add'>+		if (rc != -EAGAIN || ++retries &gt; PQI_LUN_RESET_RETRIES)</div><div class='ctx'> 			break;</div><div class='ctx'> 		msleep(PQI_LUN_RESET_RETRY_INTERVAL_MSECS);</div><div class='ctx'> 	}</div><div class='del'>-	timeout_secs = rc ? PQI_LUN_RESET_TIMEOUT_SECS : NO_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	timeout_secs = rc ? PQI_LUN_RESET_PENDING_IO_TIMEOUT_SECS : NO_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	rc |= pqi_device_wait_for_pending_io(ctrl_info, device, timeout_secs);</div><div class='ctx'> </div><div class='hunk'>@@ -5707,6 +5702,7 @@ static int pqi_device_reset(struct pqi_ctrl_info *ctrl_info,</div><div class='ctx'> 	pqi_device_reset_done(device);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ctrl_info-&gt;lun_reset_mutex);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5737,6 +5733,7 @@ static int pqi_eh_device_reset_handler(struct scsi_cmnd *scmd)</div><div class='ctx'> 	pqi_wait_until_ofa_finished(ctrl_info);</div><div class='ctx'> </div><div class='ctx'> 	rc = pqi_device_reset(ctrl_info, device);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	dev_err(&amp;ctrl_info-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 		"reset of scsi %d:%d:%d:%d: %s\n",</div><div class='hunk'>@@ -5795,7 +5792,7 @@ static int pqi_map_queues(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	struct pqi_ctrl_info *ctrl_info = shost_to_hba(shost);</div><div class='ctx'> </div><div class='del'>-	return blk_mq_pci_map_queues(&amp;shost-&gt;tag_set.map[0],</div><div class='add'>+	return blk_mq_pci_map_queues(&amp;shost-&gt;tag_set.map[HCTX_TYPE_DEFAULT],</div><div class='ctx'> 					ctrl_info-&gt;pci_dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7948,6 +7945,22 @@ static const struct pci_device_id pqi_pci_id_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,</div><div class='add'>+			       0x193d, 0x1104)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,</div><div class='add'>+			       0x193d, 0x1105)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,</div><div class='add'>+			       0x193d, 0x1106)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,</div><div class='add'>+			       0x193d, 0x1107)</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,</div><div class='ctx'> 			       0x193d, 0x8460)</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='head'>diff --git a/drivers/scsi/smartpqi/smartpqi_sas_transport.c b/drivers/scsi/smartpqi/smartpqi_sas_transport.c<br/>index 0e4ef215115f..5cca1b9ef1f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_sas_transport.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_sas_transport.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_sas_transport.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/smartpqi/smartpqi_sas_transport.c</a></div><div class='hunk'>@@ -1,18 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *    driver for Microsemi PQI-based storage controllers</div><div class='del'>- *    Copyright (c) 2016-2017 Microsemi Corporation</div><div class='add'>+ *    Copyright (c) 2019 Microchip Technology Inc. and its subsidiaries</div><div class='add'>+ *    Copyright (c) 2016-2018 Microsemi Corporation</div><div class='ctx'>  *    Copyright (c) 2016 PMC-Sierra, Inc.</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 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, GOOD TITLE or</div><div class='del'>- *    NON INFRINGEMENT.  See the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *    Questions/Comments/Bugfixes to esc.storagedev@microsemi.com</div><div class='add'>+ *    Questions/Comments/Bugfixes to storagedev@microchip.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/smartpqi/smartpqi_sis.c b/drivers/scsi/smartpqi/smartpqi_sis.c<br/>index dcd11c6418cc..f0d6e88ba2c1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_sis.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_sis.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_sis.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/smartpqi/smartpqi_sis.c</a></div><div class='hunk'>@@ -1,18 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *    driver for Microsemi PQI-based storage controllers</div><div class='del'>- *    Copyright (c) 2016-2017 Microsemi Corporation</div><div class='add'>+ *    Copyright (c) 2019 Microchip Technology Inc. and its subsidiaries</div><div class='add'>+ *    Copyright (c) 2016-2018 Microsemi Corporation</div><div class='ctx'>  *    Copyright (c) 2016 PMC-Sierra, Inc.</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 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, GOOD TITLE or</div><div class='del'>- *    NON INFRINGEMENT.  See the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *    Questions/Comments/Bugfixes to esc.storagedev@microsemi.com</div><div class='add'>+ *    Questions/Comments/Bugfixes to storagedev@microchip.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/smartpqi/smartpqi_sis.h b/drivers/scsi/smartpqi/smartpqi_sis.h<br/>index d018cb9c3f82..86b0e484d921 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_sis.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/smartpqi/smartpqi_sis.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/smartpqi/smartpqi_sis.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/smartpqi/smartpqi_sis.h</a></div><div class='hunk'>@@ -1,18 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *    driver for Microsemi PQI-based storage controllers</div><div class='del'>- *    Copyright (c) 2016-2017 Microsemi Corporation</div><div class='add'>+ *    Copyright (c) 2019 Microchip Technology Inc. and its subsidiaries</div><div class='add'>+ *    Copyright (c) 2016-2018 Microsemi Corporation</div><div class='ctx'>  *    Copyright (c) 2016 PMC-Sierra, Inc.</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 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, GOOD TITLE or</div><div class='del'>- *    NON INFRINGEMENT.  See the GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *    Questions/Comments/Bugfixes to esc.storagedev@microsemi.com</div><div class='add'>+ *    Questions/Comments/Bugfixes to storagedev@microchip.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c<br/>index 039c27c2d7b3..c3f443d5aea8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/sr.c</a></div><div class='hunk'>@@ -716,6 +716,7 @@ static int sr_probe(struct device *dev)</div><div class='ctx'> 	disk-&gt;fops = &amp;sr_bdops;</div><div class='ctx'> 	disk-&gt;flags = GENHD_FL_CD | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;</div><div class='ctx'> 	disk-&gt;events = DISK_EVENT_MEDIA_CHANGE | DISK_EVENT_EJECT_REQUEST;</div><div class='add'>+	disk-&gt;event_flags = DISK_EVENT_FLAG_POLL | DISK_EVENT_FLAG_UEVENT;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_rq_timeout(sdev-&gt;request_queue, SR_TIMEOUT);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c<br/>index 84380bae20f1..8472de1007ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/storvsc_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/storvsc_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/storvsc_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/storvsc_drv.c</a></div><div class='hunk'>@@ -385,7 +385,7 @@ enum storvsc_request_type {</div><div class='ctx'>  * This is the end of Protocol specific defines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int storvsc_ringbuffer_size = (256 * PAGE_SIZE);</div><div class='add'>+static int storvsc_ringbuffer_size = (128 * 1024);</div><div class='ctx'> static u32 max_outstanding_req_per_channel;</div><div class='ctx'> </div><div class='ctx'> static int storvsc_vcpus_per_sub_channel = 4;</div><div class='hunk'>@@ -668,13 +668,22 @@ static void  handle_multichannel_storage(struct hv_device *device, int max_chns)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;device-&gt;device;</div><div class='ctx'> 	struct storvsc_device *stor_device;</div><div class='del'>-	int num_cpus = num_online_cpus();</div><div class='ctx'> 	int num_sc;</div><div class='ctx'> 	struct storvsc_cmd_request *request;</div><div class='ctx'> 	struct vstor_packet *vstor_packet;</div><div class='ctx'> 	int ret, t;</div><div class='ctx'> </div><div class='del'>-	num_sc = ((max_chns &gt; num_cpus) ? num_cpus : max_chns);</div><div class='add'>+	/*</div><div class='add'>+	 * If the number of CPUs is artificially restricted, such as</div><div class='add'>+	 * with maxcpus=1 on the kernel boot line, Hyper-V could offer</div><div class='add'>+	 * sub-channels &gt;= the number of CPUs. These sub-channels</div><div class='add'>+	 * should not be created. The primary channel is already created</div><div class='add'>+	 * and assigned to one CPU, so check against # CPUs - 1.</div><div class='add'>+	 */</div><div class='add'>+	num_sc = min((int)(num_online_cpus() - 1), max_chns);</div><div class='add'>+	if (!num_sc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	stor_device = get_out_stor_device(device);</div><div class='ctx'> 	if (!stor_device)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c<br/>index 0a2a54517b15..054fb0599263 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sym53c8xx_2/sym_hipd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sym53c8xx_2/sym_hipd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sym53c8xx_2/sym_hipd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/sym53c8xx_2/sym_hipd.c</a></div><div class='hunk'>@@ -3072,6 +3072,7 @@ static void sym_sir_bad_scsi_status(struct sym_hcb *np, int num, struct sym_ccb</div><div class='ctx'> 			sym_print_addr(cp-&gt;cmd, "%s\n",</div><div class='ctx'> 			        s_status == S_BUSY ? "BUSY" : "QUEUE FULL\n");</div><div class='ctx'> 		}</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:	/* S_INT, S_INT_COND_MET, S_CONFLICT */</div><div class='ctx'> 		sym_complete_error (np, cp);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4632,6 +4633,7 @@ static void sym_int_sir(struct sym_hcb *np)</div><div class='ctx'> 	 *  Negotiation failed.</div><div class='ctx'> 	 *  Target does not want answer message.</div><div class='ctx'> 	 */</div><div class='add'>+	/* fall through */</div><div class='ctx'> 	case SIR_NEGO_PROTO:</div><div class='ctx'> 		sym_nego_default(np, tp, cp);</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_nvram.c b/drivers/scsi/sym53c8xx_2/sym_nvram.c<br/>index 5662fbb3ff60..0d37b4f07b5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sym53c8xx_2/sym_nvram.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/sym53c8xx_2/sym_nvram.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/sym53c8xx_2/sym_nvram.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/sym53c8xx_2/sym_nvram.c</a></div><div class='hunk'>@@ -708,6 +708,7 @@ static int sym_read_Tekram_nvram (struct sym_device *np, Tekram_nvram *nvram)</div><div class='ctx'> 					  data, len);</div><div class='ctx'> 		if (!x)</div><div class='ctx'> 			break;</div><div class='add'>+		/* fall through */</div><div class='ctx'> 	default:</div><div class='ctx'> 		x = sym_read_T93C46_nvram(np, nvram);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig<br/>index 6db37cf306b0..0b845ab7c3bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/Kconfig</a></div><div class='hunk'>@@ -99,6 +99,7 @@ config SCSI_UFS_DWC_TC_PLATFORM</div><div class='ctx'> config SCSI_UFS_QCOM</div><div class='ctx'> 	tristate "QCOM specific hooks to UFS controller platform driver"</div><div class='ctx'> 	depends on SCSI_UFSHCD_PLATFORM &amp;&amp; ARCH_QCOM</div><div class='add'>+	select RESET_CONTROLLER</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects the QCOM specific additions to UFSHCD platform driver.</div><div class='ctx'> 	  UFS host on QCOM needs some vendor specific configuration before</div><div class='hunk'>@@ -108,6 +109,20 @@ config SCSI_UFS_QCOM</div><div class='ctx'> 	  Select this if you have UFS controller on QCOM chipset.</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config SCSI_UFS_MEDIATEK</div><div class='add'>+	tristate "Mediatek specific hooks to UFS controller platform driver"</div><div class='add'>+	depends on SCSI_UFSHCD_PLATFORM &amp;&amp; ARCH_MEDIATEK</div><div class='add'>+	select PHY_MTK_UFS</div><div class='add'>+	help</div><div class='add'>+	  This selects the Mediatek specific additions to UFSHCD platform driver.</div><div class='add'>+	  UFS host on Mediatek needs some vendor specific configuration before</div><div class='add'>+	  accessing the hardware which includes PHY configuration and vendor</div><div class='add'>+	  specific registers.</div><div class='add'>+</div><div class='add'>+	  Select this if you have UFS controller on Mediatek chipset.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config SCSI_UFS_HISI</div><div class='ctx'> 	tristate "Hisilicon specific hooks to UFS controller platform driver"</div><div class='ctx'> 	depends on (ARCH_HISI || COMPILE_TEST) &amp;&amp; SCSI_UFSHCD_PLATFORM</div><div class='head'>diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile<br/>index a3bd70c3652c..2a9097939bcb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/Makefile</a></div><div class='hunk'>@@ -10,3 +10,4 @@ ufshcd-core-$(CONFIG_SCSI_UFS_BSG)	+= ufs_bsg.o</div><div class='ctx'> obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o</div><div class='ctx'> obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o</div><div class='ctx'> obj-$(CONFIG_SCSI_UFS_HISI) += ufs-hisi.o</div><div class='add'>+obj-$(CONFIG_SCSI_UFS_MEDIATEK) += ufs-mediatek.o</div><div class='head'>diff --git a/drivers/scsi/ufs/cdns-pltfrm.c b/drivers/scsi/ufs/cdns-pltfrm.c<br/>index 4a37b4f57164..86dbb723f3ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/cdns-pltfrm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/cdns-pltfrm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/cdns-pltfrm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/cdns-pltfrm.c</a></div><div class='hunk'>@@ -17,7 +17,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "ufshcd-pltfrm.h"</div><div class='ctx'> </div><div class='del'>-#define CDNS_UFS_REG_HCLKDIV 0xFC</div><div class='add'>+#define CDNS_UFS_REG_HCLKDIV	0xFC</div><div class='add'>+#define CDNS_UFS_REG_PHY_XCFGD1	0x113C</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Sets HCLKDIV register value based on the core_clk</div><div class='hunk'>@@ -77,11 +78,66 @@ static int cdns_ufs_setup_clocks(struct ufs_hba *hba, bool on,</div><div class='ctx'> 	return cdns_ufs_set_hclkdiv(hba);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ufs_hba_variant_ops cdns_pltfm_hba_vops = {</div><div class='add'>+/**</div><div class='add'>+ * cdns_ufs_init - performs additional ufs initialization</div><div class='add'>+ * @hba: host controller instance</div><div class='add'>+ *</div><div class='add'>+ * Returns status of initialization</div><div class='add'>+ */</div><div class='add'>+static int cdns_ufs_init(struct ufs_hba *hba)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	if (hba-&gt;vops &amp;&amp; hba-&gt;vops-&gt;phy_initialization)</div><div class='add'>+		status = hba-&gt;vops-&gt;phy_initialization(hba);</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'>+ * cdns_ufs_m31_16nm_phy_initialization - performs m31 phy initialization</div><div class='add'>+ * @hba: host controller instance</div><div class='add'>+ *</div><div class='add'>+ * Always returns 0</div><div class='add'>+ */</div><div class='add'>+static int cdns_ufs_m31_16nm_phy_initialization(struct ufs_hba *hba)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	/* Increase RX_Advanced_Min_ActivateTime_Capability */</div><div class='add'>+	data = ufshcd_readl(hba, CDNS_UFS_REG_PHY_XCFGD1);</div><div class='add'>+	data |= BIT(24);</div><div class='add'>+	ufshcd_writel(hba, data, CDNS_UFS_REG_PHY_XCFGD1);</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 ufs_hba_variant_ops cdns_ufs_pltfm_hba_vops = {</div><div class='add'>+	.name = "cdns-ufs-pltfm",</div><div class='add'>+	.setup_clocks = cdns_ufs_setup_clocks,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ufs_hba_variant_ops cdns_ufs_m31_16nm_pltfm_hba_vops = {</div><div class='ctx'> 	.name = "cdns-ufs-pltfm",</div><div class='add'>+	.init = cdns_ufs_init,</div><div class='ctx'> 	.setup_clocks = cdns_ufs_setup_clocks,</div><div class='add'>+	.phy_initialization = cdns_ufs_m31_16nm_phy_initialization,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id cdns_ufs_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "cdns,ufshc",</div><div class='add'>+		.data =  &amp;cdns_ufs_pltfm_hba_vops,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "cdns,ufshc-m31-16nm",</div><div class='add'>+		.data =  &amp;cdns_ufs_m31_16nm_pltfm_hba_vops,</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(of, cdns_ufs_of_match);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cdns_ufs_pltfrm_probe - probe routine of the driver</div><div class='ctx'>  * @pdev: pointer to platform device handle</div><div class='hunk'>@@ -91,10 +147,15 @@ static struct ufs_hba_variant_ops cdns_pltfm_hba_vops = {</div><div class='ctx'> static int cdns_ufs_pltfrm_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	const struct of_device_id *of_id;</div><div class='add'>+	struct ufs_hba_variant_ops *vops;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='add'>+	of_id = of_match_node(cdns_ufs_of_match, dev-&gt;of_node);</div><div class='add'>+	vops = (struct ufs_hba_variant_ops *)of_id-&gt;data;</div><div class='add'>+</div><div class='ctx'> 	/* Perform generic probe */</div><div class='del'>-	err = ufshcd_pltfrm_init(pdev, &amp;cdns_pltfm_hba_vops);</div><div class='add'>+	err = ufshcd_pltfrm_init(pdev, vops);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		dev_err(dev, "ufshcd_pltfrm_init() failed %d\n", err);</div><div class='ctx'> </div><div class='hunk'>@@ -115,13 +176,6 @@ static int cdns_ufs_pltfrm_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id cdns_ufs_of_match[] = {</div><div class='del'>-	{ .compatible = "cdns,ufshc" },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(of, cdns_ufs_of_match);</div><div class='del'>-</div><div class='ctx'> static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {</div><div class='ctx'> 	.suspend         = ufshcd_pltfrm_suspend,</div><div class='ctx'> 	.resume          = ufshcd_pltfrm_resume,</div><div class='head'>diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c<br/>index 0e855b5afe82..7aed0a1a794e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-hisi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-hisi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-hisi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufs-hisi.c</a></div><div class='hunk'>@@ -293,108 +293,7 @@ static int ufs_hisi_link_startup_notify(struct ufs_hba *hba,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ufs_hisi_dev_params {</div><div class='del'>-	u32 pwm_rx_gear; /* pwm rx gear to work in */</div><div class='del'>-	u32 pwm_tx_gear; /* pwm tx gear to work in */</div><div class='del'>-	u32 hs_rx_gear;  /* hs rx gear to work in */</div><div class='del'>-	u32 hs_tx_gear;  /* hs tx gear to work in */</div><div class='del'>-	u32 rx_lanes;    /* number of rx lanes */</div><div class='del'>-	u32 tx_lanes;    /* number of tx lanes */</div><div class='del'>-	u32 rx_pwr_pwm;  /* rx pwm working pwr */</div><div class='del'>-	u32 tx_pwr_pwm;  /* tx pwm working pwr */</div><div class='del'>-	u32 rx_pwr_hs;   /* rx hs working pwr */</div><div class='del'>-	u32 tx_pwr_hs;   /* tx hs working pwr */</div><div class='del'>-	u32 hs_rate;     /* rate A/B to work in HS */</div><div class='del'>-	u32 desired_working_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ufs_hisi_get_pwr_dev_param(</div><div class='del'>-				    struct ufs_hisi_dev_params *hisi_param,</div><div class='del'>-				    struct ufs_pa_layer_attr *dev_max,</div><div class='del'>-				    struct ufs_pa_layer_attr *agreed_pwr)</div><div class='del'>-{</div><div class='del'>-	int min_hisi_gear;</div><div class='del'>-	int min_dev_gear;</div><div class='del'>-	bool is_dev_sup_hs = false;</div><div class='del'>-	bool is_hisi_max_hs = false;</div><div class='del'>-</div><div class='del'>-	if (dev_max-&gt;pwr_rx == FASTAUTO_MODE || dev_max-&gt;pwr_rx == FAST_MODE)</div><div class='del'>-		is_dev_sup_hs = true;</div><div class='del'>-</div><div class='del'>-	if (hisi_param-&gt;desired_working_mode == FAST) {</div><div class='del'>-		is_hisi_max_hs = true;</div><div class='del'>-		min_hisi_gear = min_t(u32, hisi_param-&gt;hs_rx_gear,</div><div class='del'>-				       hisi_param-&gt;hs_tx_gear);</div><div class='del'>-	} else {</div><div class='del'>-		min_hisi_gear = min_t(u32, hisi_param-&gt;pwm_rx_gear,</div><div class='del'>-				       hisi_param-&gt;pwm_tx_gear);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * device doesn't support HS but</div><div class='del'>-	 * hisi_param-&gt;desired_working_mode is HS,</div><div class='del'>-	 * thus device and hisi_param don't agree</div><div class='del'>-	 */</div><div class='del'>-	if (!is_dev_sup_hs &amp;&amp; is_hisi_max_hs) {</div><div class='del'>-		pr_err("%s: device not support HS\n", __func__);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	} else if (is_dev_sup_hs &amp;&amp; is_hisi_max_hs) {</div><div class='del'>-		/*</div><div class='del'>-		 * since device supports HS, it supports FAST_MODE.</div><div class='del'>-		 * since hisi_param-&gt;desired_working_mode is also HS</div><div class='del'>-		 * then final decision (FAST/FASTAUTO) is done according</div><div class='del'>-		 * to hisi_params as it is the restricting factor</div><div class='del'>-		 */</div><div class='del'>-		agreed_pwr-&gt;pwr_rx = agreed_pwr-&gt;pwr_tx =</div><div class='del'>-			hisi_param-&gt;rx_pwr_hs;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * here hisi_param-&gt;desired_working_mode is PWM.</div><div class='del'>-		 * it doesn't matter whether device supports HS or PWM,</div><div class='del'>-		 * in both cases hisi_param-&gt;desired_working_mode will</div><div class='del'>-		 * determine the mode</div><div class='del'>-		 */</div><div class='del'>-		agreed_pwr-&gt;pwr_rx = agreed_pwr-&gt;pwr_tx =</div><div class='del'>-			hisi_param-&gt;rx_pwr_pwm;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we would like tx to work in the minimum number of lanes</div><div class='del'>-	 * between device capability and vendor preferences.</div><div class='del'>-	 * the same decision will be made for rx</div><div class='del'>-	 */</div><div class='del'>-	agreed_pwr-&gt;lane_tx =</div><div class='del'>-		min_t(u32, dev_max-&gt;lane_tx, hisi_param-&gt;tx_lanes);</div><div class='del'>-	agreed_pwr-&gt;lane_rx =</div><div class='del'>-		min_t(u32, dev_max-&gt;lane_rx, hisi_param-&gt;rx_lanes);</div><div class='del'>-</div><div class='del'>-	/* device maximum gear is the minimum between device rx and tx gears */</div><div class='del'>-	min_dev_gear = min_t(u32, dev_max-&gt;gear_rx, dev_max-&gt;gear_tx);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if both device capabilities and vendor pre-defined preferences are</div><div class='del'>-	 * both HS or both PWM then set the minimum gear to be the chosen</div><div class='del'>-	 * working gear.</div><div class='del'>-	 * if one is PWM and one is HS then the one that is PWM get to decide</div><div class='del'>-	 * what is the gear, as it is the one that also decided previously what</div><div class='del'>-	 * pwr the device will be configured to.</div><div class='del'>-	 */</div><div class='del'>-	if ((is_dev_sup_hs &amp;&amp; is_hisi_max_hs) ||</div><div class='del'>-	    (!is_dev_sup_hs &amp;&amp; !is_hisi_max_hs))</div><div class='del'>-		agreed_pwr-&gt;gear_rx = agreed_pwr-&gt;gear_tx =</div><div class='del'>-			min_t(u32, min_dev_gear, min_hisi_gear);</div><div class='del'>-	else</div><div class='del'>-		agreed_pwr-&gt;gear_rx = agreed_pwr-&gt;gear_tx = min_hisi_gear;</div><div class='del'>-</div><div class='del'>-	agreed_pwr-&gt;hs_rate = hisi_param-&gt;hs_rate;</div><div class='del'>-</div><div class='del'>-	pr_info("ufs final power mode: gear = %d, lane = %d, pwr = %d, rate = %d\n",</div><div class='del'>-		agreed_pwr-&gt;gear_rx, agreed_pwr-&gt;lane_rx, agreed_pwr-&gt;pwr_rx,</div><div class='del'>-		agreed_pwr-&gt;hs_rate);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ufs_hisi_set_dev_cap(struct ufs_hisi_dev_params *hisi_param)</div><div class='add'>+static void ufs_hisi_set_dev_cap(struct ufs_dev_params *hisi_param)</div><div class='ctx'> {</div><div class='ctx'> 	hisi_param-&gt;rx_lanes = UFS_HISI_LIMIT_NUM_LANES_RX;</div><div class='ctx'> 	hisi_param-&gt;tx_lanes = UFS_HISI_LIMIT_NUM_LANES_TX;</div><div class='hunk'>@@ -477,7 +376,7 @@ static int ufs_hisi_pwr_change_notify(struct ufs_hba *hba,</div><div class='ctx'> 				       struct ufs_pa_layer_attr *dev_max_params,</div><div class='ctx'> 				       struct ufs_pa_layer_attr *dev_req_params)</div><div class='ctx'> {</div><div class='del'>-	struct ufs_hisi_dev_params ufs_hisi_cap;</div><div class='add'>+	struct ufs_dev_params ufs_hisi_cap;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_req_params) {</div><div class='hunk'>@@ -490,8 +389,8 @@ static int ufs_hisi_pwr_change_notify(struct ufs_hba *hba,</div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 	case PRE_CHANGE:</div><div class='ctx'> 		ufs_hisi_set_dev_cap(&amp;ufs_hisi_cap);</div><div class='del'>-		ret = ufs_hisi_get_pwr_dev_param(</div><div class='del'>-			&amp;ufs_hisi_cap, dev_max_params, dev_req_params);</div><div class='add'>+		ret = ufshcd_get_pwr_dev_param(&amp;ufs_hisi_cap,</div><div class='add'>+					       dev_max_params, dev_req_params);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_err(hba-&gt;dev,</div><div class='ctx'> 			    "%s: failed to determine capabilities\n", __func__);</div><div class='hunk'>@@ -587,6 +486,10 @@ static int ufs_hisi_init_common(struct ufs_hba *hba)</div><div class='ctx'> 	ufshcd_set_variant(hba, host);</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;rst  = devm_reset_control_get(dev, "rst");</div><div class='add'>+	if (IS_ERR(host-&gt;rst)) {</div><div class='add'>+		dev_err(dev, "%s: failed to get reset control\n", __func__);</div><div class='add'>+		return PTR_ERR(host-&gt;rst);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ufs_hisi_set_pm_lvl(hba);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c<br/>new file mode 100644<br/>index 000000000000..0f6ff33ce52e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-mediatek.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufs-mediatek.c</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Stanley Chu &lt;stanley.chu@mediatek.com&gt;</div><div class='add'>+ *	Peter Wang &lt;peter.wang@mediatek.com&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/of_address.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 "ufshcd.h"</div><div class='add'>+#include "ufshcd-pltfrm.h"</div><div class='add'>+#include "unipro.h"</div><div class='add'>+#include "ufs-mediatek.h"</div><div class='add'>+</div><div class='add'>+static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		ufshcd_dme_get(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_SAVEPOWERCONTROL), &amp;tmp);</div><div class='add'>+		tmp = tmp |</div><div class='add'>+		      (1 &lt;&lt; RX_SYMBOL_CLK_GATE_EN) |</div><div class='add'>+		      (1 &lt;&lt; SYS_CLK_GATE_EN) |</div><div class='add'>+		      (1 &lt;&lt; TX_CLK_GATE_EN);</div><div class='add'>+		ufshcd_dme_set(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_SAVEPOWERCONTROL), tmp);</div><div class='add'>+</div><div class='add'>+		ufshcd_dme_get(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_DEBUGCLOCKENABLE), &amp;tmp);</div><div class='add'>+		tmp = tmp &amp; ~(1 &lt;&lt; TX_SYMBOL_CLK_REQ_FORCE);</div><div class='add'>+		ufshcd_dme_set(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_DEBUGCLOCKENABLE), tmp);</div><div class='add'>+	} else {</div><div class='add'>+		ufshcd_dme_get(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_SAVEPOWERCONTROL), &amp;tmp);</div><div class='add'>+		tmp = tmp &amp; ~((1 &lt;&lt; RX_SYMBOL_CLK_GATE_EN) |</div><div class='add'>+			      (1 &lt;&lt; SYS_CLK_GATE_EN) |</div><div class='add'>+			      (1 &lt;&lt; TX_CLK_GATE_EN));</div><div class='add'>+		ufshcd_dme_set(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_SAVEPOWERCONTROL), tmp);</div><div class='add'>+</div><div class='add'>+		ufshcd_dme_get(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_DEBUGCLOCKENABLE), &amp;tmp);</div><div class='add'>+		tmp = tmp | (1 &lt;&lt; TX_SYMBOL_CLK_REQ_FORCE);</div><div class='add'>+		ufshcd_dme_set(hba,</div><div class='add'>+			       UIC_ARG_MIB(VS_DEBUGCLOCKENABLE), tmp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_bind_mphy(struct ufs_hba *hba)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);</div><div class='add'>+	struct device *dev = hba-&gt;dev;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	host-&gt;mphy = devm_of_phy_get_by_index(dev, np, 0);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;mphy == ERR_PTR(-EPROBE_DEFER)) {</div><div class='add'>+		/*</div><div class='add'>+		 * UFS driver might be probed before the phy driver does.</div><div class='add'>+		 * In that case we would like to return EPROBE_DEFER code.</div><div class='add'>+		 */</div><div class='add'>+		err = -EPROBE_DEFER;</div><div class='add'>+		dev_info(dev,</div><div class='add'>+			 "%s: required phy hasn't probed yet. err = %d\n",</div><div class='add'>+			__func__, err);</div><div class='add'>+	} else if (IS_ERR(host-&gt;mphy)) {</div><div class='add'>+		err = PTR_ERR(host-&gt;mphy);</div><div class='add'>+		dev_info(dev, "%s: PHY get failed %d\n", __func__, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		host-&gt;mphy = NULL;</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'>+ * ufs_mtk_setup_clocks - enables/disable clocks</div><div class='add'>+ * @hba: host controller instance</div><div class='add'>+ * @on: If true, enable clocks else disable them.</div><div class='add'>+ * @status: PRE_CHANGE or POST_CHANGE notify</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, non-zero on failure.</div><div class='add'>+ */</div><div class='add'>+static int ufs_mtk_setup_clocks(struct ufs_hba *hba, bool on,</div><div class='add'>+				enum ufs_notify_change_status status)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In case ufs_mtk_init() is not yet done, simply ignore.</div><div class='add'>+	 * This ufs_mtk_setup_clocks() shall be called from</div><div class='add'>+	 * ufs_mtk_init() after init is done.</div><div class='add'>+	 */</div><div class='add'>+	if (!host)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (status) {</div><div class='add'>+	case PRE_CHANGE:</div><div class='add'>+		if (!on)</div><div class='add'>+			ret = phy_power_off(host-&gt;mphy);</div><div class='add'>+		break;</div><div class='add'>+	case POST_CHANGE:</div><div class='add'>+		if (on)</div><div class='add'>+			ret = phy_power_on(host-&gt;mphy);</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'>+ * ufs_mtk_init - find other essential mmio bases</div><div class='add'>+ * @hba: host controller instance</div><div class='add'>+ *</div><div class='add'>+ * Binds PHY with controller and powers up PHY enabling clocks</div><div class='add'>+ * and regulators.</div><div class='add'>+ *</div><div class='add'>+ * Returns -EPROBE_DEFER if binding fails, returns negative error</div><div class='add'>+ * on phy power up failure and returns zero on success.</div><div class='add'>+ */</div><div class='add'>+static int ufs_mtk_init(struct ufs_hba *hba)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_host *host;</div><div class='add'>+	struct device *dev = hba-&gt;dev;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);</div><div class='add'>+	if (!host) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		dev_info(dev, "%s: no memory for mtk ufs host\n", __func__);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host-&gt;hba = hba;</div><div class='add'>+	ufshcd_set_variant(hba, host);</div><div class='add'>+</div><div class='add'>+	err = ufs_mtk_bind_mphy(hba);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_variant_clear;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ufshcd_vops_init() is invoked after</div><div class='add'>+	 * ufshcd_setup_clock(true) in ufshcd_hba_init() thus</div><div class='add'>+	 * phy clock setup is skipped.</div><div class='add'>+	 *</div><div class='add'>+	 * Enable phy clocks specifically here.</div><div class='add'>+	 */</div><div class='add'>+	ufs_mtk_setup_clocks(hba, true, POST_CHANGE);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+out_variant_clear:</div><div class='add'>+	ufshcd_set_variant(hba, NULL);</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 ufs_mtk_pre_pwr_change(struct ufs_hba *hba,</div><div class='add'>+				  struct ufs_pa_layer_attr *dev_max_params,</div><div class='add'>+				  struct ufs_pa_layer_attr *dev_req_params)</div><div class='add'>+{</div><div class='add'>+	struct ufs_dev_params host_cap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	host_cap.tx_lanes = UFS_MTK_LIMIT_NUM_LANES_TX;</div><div class='add'>+	host_cap.rx_lanes = UFS_MTK_LIMIT_NUM_LANES_RX;</div><div class='add'>+	host_cap.hs_rx_gear = UFS_MTK_LIMIT_HSGEAR_RX;</div><div class='add'>+	host_cap.hs_tx_gear = UFS_MTK_LIMIT_HSGEAR_TX;</div><div class='add'>+	host_cap.pwm_rx_gear = UFS_MTK_LIMIT_PWMGEAR_RX;</div><div class='add'>+	host_cap.pwm_tx_gear = UFS_MTK_LIMIT_PWMGEAR_TX;</div><div class='add'>+	host_cap.rx_pwr_pwm = UFS_MTK_LIMIT_RX_PWR_PWM;</div><div class='add'>+	host_cap.tx_pwr_pwm = UFS_MTK_LIMIT_TX_PWR_PWM;</div><div class='add'>+	host_cap.rx_pwr_hs = UFS_MTK_LIMIT_RX_PWR_HS;</div><div class='add'>+	host_cap.tx_pwr_hs = UFS_MTK_LIMIT_TX_PWR_HS;</div><div class='add'>+	host_cap.hs_rate = UFS_MTK_LIMIT_HS_RATE;</div><div class='add'>+	host_cap.desired_working_mode =</div><div class='add'>+				UFS_MTK_LIMIT_DESIRED_MODE;</div><div class='add'>+</div><div class='add'>+	ret = ufshcd_get_pwr_dev_param(&amp;host_cap,</div><div class='add'>+				       dev_max_params,</div><div class='add'>+				       dev_req_params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_info("%s: failed to determine capabilities\n",</div><div class='add'>+			__func__);</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 ufs_mtk_pwr_change_notify(struct ufs_hba *hba,</div><div class='add'>+				     enum ufs_notify_change_status stage,</div><div class='add'>+				     struct ufs_pa_layer_attr *dev_max_params,</div><div class='add'>+				     struct ufs_pa_layer_attr *dev_req_params)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (stage) {</div><div class='add'>+	case PRE_CHANGE:</div><div class='add'>+		ret = ufs_mtk_pre_pwr_change(hba, dev_max_params,</div><div class='add'>+					     dev_req_params);</div><div class='add'>+		break;</div><div class='add'>+	case POST_CHANGE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</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 ufs_mtk_pre_link(struct ufs_hba *hba)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* disable deep stall */</div><div class='add'>+	ret = ufshcd_dme_get(hba, UIC_ARG_MIB(VS_SAVEPOWERCONTROL), &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(1 &lt;&lt; 6);</div><div class='add'>+</div><div class='add'>+	ret = ufshcd_dme_set(hba, UIC_ARG_MIB(VS_SAVEPOWERCONTROL), tmp);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_post_link(struct ufs_hba *hba)</div><div class='add'>+{</div><div class='add'>+	/* disable device LCC */</div><div class='add'>+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE), 0);</div><div class='add'>+</div><div class='add'>+	/* enable unipro clock gating feature */</div><div class='add'>+	ufs_mtk_cfg_unipro_cg(hba, 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 ufs_mtk_link_startup_notify(struct ufs_hba *hba,</div><div class='add'>+				       enum ufs_notify_change_status stage)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (stage) {</div><div class='add'>+	case PRE_CHANGE:</div><div class='add'>+		ret = ufs_mtk_pre_link(hba);</div><div class='add'>+		break;</div><div class='add'>+	case POST_CHANGE:</div><div class='add'>+		ret = ufs_mtk_post_link(hba);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</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 ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);</div><div class='add'>+</div><div class='add'>+	if (ufshcd_is_link_hibern8(hba))</div><div class='add'>+		phy_power_off(host-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)</div><div class='add'>+{</div><div class='add'>+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);</div><div class='add'>+</div><div class='add'>+	if (ufshcd_is_link_hibern8(hba))</div><div class='add'>+		phy_power_on(host-&gt;mphy);</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'>+ * struct ufs_hba_mtk_vops - UFS MTK specific variant operations</div><div class='add'>+ *</div><div class='add'>+ * The variant operations configure the necessary controller and PHY</div><div class='add'>+ * handshake during initialization.</div><div class='add'>+ */</div><div class='add'>+static struct ufs_hba_variant_ops ufs_hba_mtk_vops = {</div><div class='add'>+	.name                = "mediatek.ufshci",</div><div class='add'>+	.init                = ufs_mtk_init,</div><div class='add'>+	.setup_clocks        = ufs_mtk_setup_clocks,</div><div class='add'>+	.link_startup_notify = ufs_mtk_link_startup_notify,</div><div class='add'>+	.pwr_change_notify   = ufs_mtk_pwr_change_notify,</div><div class='add'>+	.suspend             = ufs_mtk_suspend,</div><div class='add'>+	.resume              = ufs_mtk_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ufs_mtk_probe - probe routine of the driver</div><div class='add'>+ * @pdev: pointer to Platform device handle</div><div class='add'>+ *</div><div class='add'>+ * Return zero for success and non-zero for failure</div><div class='add'>+ */</div><div class='add'>+static int ufs_mtk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* perform generic probe */</div><div class='add'>+	err = ufshcd_pltfrm_init(pdev, &amp;ufs_hba_mtk_vops);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_info(dev, "probe failed %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'>+/**</div><div class='add'>+ * ufs_mtk_remove - set driver_data of the device to NULL</div><div class='add'>+ * @pdev: pointer to platform device handle</div><div class='add'>+ *</div><div class='add'>+ * Always return 0</div><div class='add'>+ */</div><div class='add'>+static int ufs_mtk_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ufs_hba *hba =  platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(&amp;(pdev)-&gt;dev);</div><div class='add'>+	ufshcd_remove(hba);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ufs_mtk_of_match[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt8183-ufshci"},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops ufs_mtk_pm_ops = {</div><div class='add'>+	.suspend         = ufshcd_pltfrm_suspend,</div><div class='add'>+	.resume          = ufshcd_pltfrm_resume,</div><div class='add'>+	.runtime_suspend = ufshcd_pltfrm_runtime_suspend,</div><div class='add'>+	.runtime_resume  = ufshcd_pltfrm_runtime_resume,</div><div class='add'>+	.runtime_idle    = ufshcd_pltfrm_runtime_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver ufs_mtk_pltform = {</div><div class='add'>+	.probe      = ufs_mtk_probe,</div><div class='add'>+	.remove     = ufs_mtk_remove,</div><div class='add'>+	.shutdown   = ufshcd_pltfrm_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name   = "ufshcd-mtk",</div><div class='add'>+		.pm     = &amp;ufs_mtk_pm_ops,</div><div class='add'>+		.of_match_table = ufs_mtk_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Stanley Chu &lt;stanley.chu@mediatek.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Peter Wang &lt;peter.wang@mediatek.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek UFS Host Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+module_platform_driver(ufs_mtk_pltform);</div><div class='head'>diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-mediatek.h<br/>new file mode 100644<br/>index 000000000000..19f8c42fe06f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-mediatek.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufs-mediatek.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 MediaTek Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _UFS_MEDIATEK_H</div><div class='add'>+#define _UFS_MEDIATEK_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Vendor specific pre-defined parameters</div><div class='add'>+ */</div><div class='add'>+#define UFS_MTK_LIMIT_NUM_LANES_RX  1</div><div class='add'>+#define UFS_MTK_LIMIT_NUM_LANES_TX  1</div><div class='add'>+#define UFS_MTK_LIMIT_HSGEAR_RX     UFS_HS_G3</div><div class='add'>+#define UFS_MTK_LIMIT_HSGEAR_TX     UFS_HS_G3</div><div class='add'>+#define UFS_MTK_LIMIT_PWMGEAR_RX    UFS_PWM_G4</div><div class='add'>+#define UFS_MTK_LIMIT_PWMGEAR_TX    UFS_PWM_G4</div><div class='add'>+#define UFS_MTK_LIMIT_RX_PWR_PWM    SLOW_MODE</div><div class='add'>+#define UFS_MTK_LIMIT_TX_PWR_PWM    SLOW_MODE</div><div class='add'>+#define UFS_MTK_LIMIT_RX_PWR_HS     FAST_MODE</div><div class='add'>+#define UFS_MTK_LIMIT_TX_PWR_HS     FAST_MODE</div><div class='add'>+#define UFS_MTK_LIMIT_HS_RATE       PA_HS_MODE_B</div><div class='add'>+#define UFS_MTK_LIMIT_DESIRED_MODE  UFS_HS_MODE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Other attributes</div><div class='add'>+ */</div><div class='add'>+#define VS_DEBUGCLOCKENABLE         0xD0A1</div><div class='add'>+#define VS_SAVEPOWERCONTROL         0xD0A6</div><div class='add'>+#define VS_UNIPROPOWERDOWNCONTROL   0xD0A8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VS_DEBUGCLOCKENABLE</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	TX_SYMBOL_CLK_REQ_FORCE = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VS_SAVEPOWERCONTROL</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RX_SYMBOL_CLK_GATE_EN   = 0,</div><div class='add'>+	SYS_CLK_GATE_EN         = 2,</div><div class='add'>+	TX_CLK_GATE_EN          = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ufs_mtk_host {</div><div class='add'>+	struct ufs_hba *hba;</div><div class='add'>+	struct phy *mphy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* !_UFS_MEDIATEK_H */</div><div class='head'>diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c<br/>index 3aeadb14aae1..ea7219407309 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-qcom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-qcom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-qcom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufs-qcom.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/reset-controller.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ufshcd.h"</div><div class='ctx'> #include "ufshcd-pltfrm.h"</div><div class='hunk'>@@ -49,6 +50,11 @@ static void ufs_qcom_get_default_testbus_cfg(struct ufs_qcom_host *host);</div><div class='ctx'> static int ufs_qcom_set_dme_vs_core_clk_ctrl_clear_div(struct ufs_hba *hba,</div><div class='ctx'> 						       u32 clk_cycles);</div><div class='ctx'> </div><div class='add'>+static struct ufs_qcom_host *rcdev_to_ufs_host(struct reset_controller_dev *rcd)</div><div class='add'>+{</div><div class='add'>+	return container_of(rcd, struct ufs_qcom_host, rcdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ufs_qcom_dump_regs_wrapper(struct ufs_hba *hba, int offset, int len,</div><div class='ctx'> 				       const char *prefix, void *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -255,11 +261,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)</div><div class='ctx'> 	if (is_rate_B)</div><div class='ctx'> 		phy_set_mode(phy, PHY_MODE_UFS_HS_B);</div><div class='ctx'> </div><div class='del'>-	/* Assert PHY reset and apply PHY calibration values */</div><div class='del'>-	ufs_qcom_assert_reset(hba);</div><div class='del'>-	/* provide 1ms delay to let the reset pulse propagate */</div><div class='del'>-	usleep_range(1000, 1100);</div><div class='del'>-</div><div class='ctx'> 	/* phy initialization - calibrate the phy */</div><div class='ctx'> 	ret = phy_init(phy);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -268,15 +269,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* De-assert PHY reset and start serdes */</div><div class='del'>-	ufs_qcom_deassert_reset(hba);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * after reset deassertion, phy will need all ref clocks,</div><div class='del'>-	 * voltage, current to settle down before starting serdes.</div><div class='del'>-	 */</div><div class='del'>-	usleep_range(1000, 1100);</div><div class='del'>-</div><div class='ctx'> 	/* power on phy - start serdes and phy's power and clocks */</div><div class='ctx'> 	ret = phy_power_on(phy);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -290,7 +282,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_disable_phy:</div><div class='del'>-	ufs_qcom_assert_reset(hba);</div><div class='ctx'> 	phy_exit(phy);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -554,21 +545,10 @@ static int ufs_qcom_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)</div><div class='ctx'> 		ufs_qcom_disable_lane_clks(host);</div><div class='ctx'> 		phy_power_off(phy);</div><div class='ctx'> </div><div class='del'>-		/* Assert PHY soft reset */</div><div class='del'>-		ufs_qcom_assert_reset(hba);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If UniPro link is not active, PHY ref_clk, main PHY analog power</div><div class='del'>-	 * rail and low noise analog power rail for PLL can be switched off.</div><div class='del'>-	 */</div><div class='del'>-	if (!ufs_qcom_is_link_active(hba)) {</div><div class='add'>+	} else if (!ufs_qcom_is_link_active(hba)) {</div><div class='ctx'> 		ufs_qcom_disable_lane_clks(host);</div><div class='del'>-		phy_power_off(phy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -578,118 +558,25 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)</div><div class='ctx'> 	struct phy *phy = host-&gt;generic_phy;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = phy_power_on(phy);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(hba-&gt;dev, "%s: failed enabling regs, err = %d\n",</div><div class='del'>-			__func__, err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = ufs_qcom_enable_lane_clks(host);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	hba-&gt;is_sys_suspended = false;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ufs_qcom_dev_params {</div><div class='del'>-	u32 pwm_rx_gear;	/* pwm rx gear to work in */</div><div class='del'>-	u32 pwm_tx_gear;	/* pwm tx gear to work in */</div><div class='del'>-	u32 hs_rx_gear;		/* hs rx gear to work in */</div><div class='del'>-	u32 hs_tx_gear;		/* hs tx gear to work in */</div><div class='del'>-	u32 rx_lanes;		/* number of rx lanes */</div><div class='del'>-	u32 tx_lanes;		/* number of tx lanes */</div><div class='del'>-	u32 rx_pwr_pwm;		/* rx pwm working pwr */</div><div class='del'>-	u32 tx_pwr_pwm;		/* tx pwm working pwr */</div><div class='del'>-	u32 rx_pwr_hs;		/* rx hs working pwr */</div><div class='del'>-	u32 tx_pwr_hs;		/* tx hs working pwr */</div><div class='del'>-	u32 hs_rate;		/* rate A/B to work in HS */</div><div class='del'>-	u32 desired_working_mode;</div><div class='del'>-};</div><div class='add'>+	if (ufs_qcom_is_link_off(hba)) {</div><div class='add'>+		err = phy_power_on(phy);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(hba-&gt;dev, "%s: failed PHY power on: %d\n",</div><div class='add'>+				__func__, err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-static int ufs_qcom_get_pwr_dev_param(struct ufs_qcom_dev_params *qcom_param,</div><div class='del'>-				      struct ufs_pa_layer_attr *dev_max,</div><div class='del'>-				      struct ufs_pa_layer_attr *agreed_pwr)</div><div class='del'>-{</div><div class='del'>-	int min_qcom_gear;</div><div class='del'>-	int min_dev_gear;</div><div class='del'>-	bool is_dev_sup_hs = false;</div><div class='del'>-	bool is_qcom_max_hs = false;</div><div class='del'>-</div><div class='del'>-	if (dev_max-&gt;pwr_rx == FAST_MODE)</div><div class='del'>-		is_dev_sup_hs = true;</div><div class='del'>-</div><div class='del'>-	if (qcom_param-&gt;desired_working_mode == FAST) {</div><div class='del'>-		is_qcom_max_hs = true;</div><div class='del'>-		min_qcom_gear = min_t(u32, qcom_param-&gt;hs_rx_gear,</div><div class='del'>-				      qcom_param-&gt;hs_tx_gear);</div><div class='del'>-	} else {</div><div class='del'>-		min_qcom_gear = min_t(u32, qcom_param-&gt;pwm_rx_gear,</div><div class='del'>-				      qcom_param-&gt;pwm_tx_gear);</div><div class='del'>-	}</div><div class='add'>+		err = ufs_qcom_enable_lane_clks(host);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * device doesn't support HS but qcom_param-&gt;desired_working_mode is</div><div class='del'>-	 * HS, thus device and qcom_param don't agree</div><div class='del'>-	 */</div><div class='del'>-	if (!is_dev_sup_hs &amp;&amp; is_qcom_max_hs) {</div><div class='del'>-		pr_err("%s: failed to agree on power mode (device doesn't support HS but requested power is HS)\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	} else if (is_dev_sup_hs &amp;&amp; is_qcom_max_hs) {</div><div class='del'>-		/*</div><div class='del'>-		 * since device supports HS, it supports FAST_MODE.</div><div class='del'>-		 * since qcom_param-&gt;desired_working_mode is also HS</div><div class='del'>-		 * then final decision (FAST/FASTAUTO) is done according</div><div class='del'>-		 * to qcom_params as it is the restricting factor</div><div class='del'>-		 */</div><div class='del'>-		agreed_pwr-&gt;pwr_rx = agreed_pwr-&gt;pwr_tx =</div><div class='del'>-						qcom_param-&gt;rx_pwr_hs;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * here qcom_param-&gt;desired_working_mode is PWM.</div><div class='del'>-		 * it doesn't matter whether device supports HS or PWM,</div><div class='del'>-		 * in both cases qcom_param-&gt;desired_working_mode will</div><div class='del'>-		 * determine the mode</div><div class='del'>-		 */</div><div class='del'>-		 agreed_pwr-&gt;pwr_rx = agreed_pwr-&gt;pwr_tx =</div><div class='del'>-						qcom_param-&gt;rx_pwr_pwm;</div><div class='add'>+	} else if (!ufs_qcom_is_link_active(hba)) {</div><div class='add'>+		err = ufs_qcom_enable_lane_clks(host);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * we would like tx to work in the minimum number of lanes</div><div class='del'>-	 * between device capability and vendor preferences.</div><div class='del'>-	 * the same decision will be made for rx</div><div class='del'>-	 */</div><div class='del'>-	agreed_pwr-&gt;lane_tx = min_t(u32, dev_max-&gt;lane_tx,</div><div class='del'>-						qcom_param-&gt;tx_lanes);</div><div class='del'>-	agreed_pwr-&gt;lane_rx = min_t(u32, dev_max-&gt;lane_rx,</div><div class='del'>-						qcom_param-&gt;rx_lanes);</div><div class='del'>-</div><div class='del'>-	/* device maximum gear is the minimum between device rx and tx gears */</div><div class='del'>-	min_dev_gear = min_t(u32, dev_max-&gt;gear_rx, dev_max-&gt;gear_tx);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if both device capabilities and vendor pre-defined preferences are</div><div class='del'>-	 * both HS or both PWM then set the minimum gear to be the chosen</div><div class='del'>-	 * working gear.</div><div class='del'>-	 * if one is PWM and one is HS then the one that is PWM get to decide</div><div class='del'>-	 * what is the gear, as it is the one that also decided previously what</div><div class='del'>-	 * pwr the device will be configured to.</div><div class='del'>-	 */</div><div class='del'>-	if ((is_dev_sup_hs &amp;&amp; is_qcom_max_hs) ||</div><div class='del'>-	    (!is_dev_sup_hs &amp;&amp; !is_qcom_max_hs))</div><div class='del'>-		agreed_pwr-&gt;gear_rx = agreed_pwr-&gt;gear_tx =</div><div class='del'>-			min_t(u32, min_dev_gear, min_qcom_gear);</div><div class='del'>-	else if (!is_dev_sup_hs)</div><div class='del'>-		agreed_pwr-&gt;gear_rx = agreed_pwr-&gt;gear_tx = min_dev_gear;</div><div class='del'>-	else</div><div class='del'>-		agreed_pwr-&gt;gear_rx = agreed_pwr-&gt;gear_tx = min_qcom_gear;</div><div class='del'>-</div><div class='del'>-	agreed_pwr-&gt;hs_rate = qcom_param-&gt;hs_rate;</div><div class='add'>+	hba-&gt;is_sys_suspended = false;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -920,7 +807,7 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	struct ufs_qcom_host *host = ufshcd_get_variant(hba);</div><div class='del'>-	struct ufs_qcom_dev_params ufs_qcom_cap;</div><div class='add'>+	struct ufs_dev_params ufs_qcom_cap;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_req_params) {</div><div class='hunk'>@@ -959,9 +846,9 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,</div><div class='ctx'> 				ufs_qcom_cap.hs_rx_gear = UFS_HS_G2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = ufs_qcom_get_pwr_dev_param(&amp;ufs_qcom_cap,</div><div class='del'>-						 dev_max_params,</div><div class='del'>-						 dev_req_params);</div><div class='add'>+		ret = ufshcd_get_pwr_dev_param(&amp;ufs_qcom_cap,</div><div class='add'>+					       dev_max_params,</div><div class='add'>+					       dev_req_params);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			pr_err("%s: failed to determine capabilities\n",</div><div class='ctx'> 					__func__);</div><div class='hunk'>@@ -1118,8 +1005,6 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (on &amp;&amp; (status == POST_CHANGE)) {</div><div class='del'>-		phy_power_on(host-&gt;generic_phy);</div><div class='del'>-</div><div class='ctx'> 		/* enable the device ref clock for HS mode*/</div><div class='ctx'> 		if (ufshcd_is_hs_mode(&amp;hba-&gt;pwr_info))</div><div class='ctx'> 			ufs_qcom_dev_ref_clk_ctrl(host, true);</div><div class='hunk'>@@ -1131,9 +1016,6 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,</div><div class='ctx'> 		if (!ufs_qcom_is_link_active(hba)) {</div><div class='ctx'> 			/* disable device ref_clk */</div><div class='ctx'> 			ufs_qcom_dev_ref_clk_ctrl(host, false);</div><div class='del'>-</div><div class='del'>-			/* powering off PHY during aggressive clk gating */</div><div class='del'>-			phy_power_off(host-&gt;generic_phy);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		vote = host-&gt;bus_vote.min_bw_vote;</div><div class='hunk'>@@ -1147,6 +1029,41 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+ufs_qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct ufs_qcom_host *host = rcdev_to_ufs_host(rcdev);</div><div class='add'>+</div><div class='add'>+	/* Currently this code only knows about a single reset. */</div><div class='add'>+	WARN_ON(id);</div><div class='add'>+	ufs_qcom_assert_reset(host-&gt;hba);</div><div class='add'>+	/* provide 1ms delay to let the reset pulse propagate. */</div><div class='add'>+	usleep_range(1000, 1100);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ufs_qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct ufs_qcom_host *host = rcdev_to_ufs_host(rcdev);</div><div class='add'>+</div><div class='add'>+	/* Currently this code only knows about a single reset. */</div><div class='add'>+	WARN_ON(id);</div><div class='add'>+	ufs_qcom_deassert_reset(host-&gt;hba);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * after reset deassertion, phy will need all ref clocks,</div><div class='add'>+	 * voltage, current to settle down before starting serdes.</div><div class='add'>+	 */</div><div class='add'>+	usleep_range(1000, 1100);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct reset_control_ops ufs_qcom_reset_ops = {</div><div class='add'>+	.assert = ufs_qcom_reset_assert,</div><div class='add'>+	.deassert = ufs_qcom_reset_deassert,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define	ANDROID_BOOT_DEV_MAX	30</div><div class='ctx'> static char android_boot_dev[ANDROID_BOOT_DEV_MAX];</div><div class='ctx'> </div><div class='hunk'>@@ -1191,6 +1108,17 @@ static int ufs_qcom_init(struct ufs_hba *hba)</div><div class='ctx'> 	host-&gt;hba = hba;</div><div class='ctx'> 	ufshcd_set_variant(hba, host);</div><div class='ctx'> </div><div class='add'>+	/* Fire up the reset controller. Failure here is non-fatal. */</div><div class='add'>+	host-&gt;rcdev.of_node = dev-&gt;of_node;</div><div class='add'>+	host-&gt;rcdev.ops = &amp;ufs_qcom_reset_ops;</div><div class='add'>+	host-&gt;rcdev.owner = dev-&gt;driver-&gt;owner;</div><div class='add'>+	host-&gt;rcdev.nr_resets = 1;</div><div class='add'>+	err = devm_reset_controller_register(dev, &amp;host-&gt;rcdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_warn(dev, "Failed to register reset controller\n");</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * voting/devoting device ref_clk source is time consuming hence</div><div class='ctx'> 	 * skip devoting it during aggressive clock gating. This clock</div><div class='head'>diff --git a/drivers/scsi/ufs/ufs-qcom.h b/drivers/scsi/ufs/ufs-qcom.h<br/>index c114826316eb..68a880185752 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-qcom.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs-qcom.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs-qcom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufs-qcom.h</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #ifndef UFS_QCOM_H_</div><div class='ctx'> #define UFS_QCOM_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/reset-controller.h&gt;</div><div class='add'>+</div><div class='ctx'> #define MAX_UFS_QCOM_HOSTS	1</div><div class='ctx'> #define MAX_U32                 (~(u32)0)</div><div class='ctx'> #define MPHY_TX_FSM_STATE       0x41</div><div class='hunk'>@@ -237,6 +239,8 @@ struct ufs_qcom_host {</div><div class='ctx'> 	/* Bitmask for enabling debug prints */</div><div class='ctx'> 	u32 dbg_print_en;</div><div class='ctx'> 	struct ufs_qcom_testbus testbus;</div><div class='add'>+</div><div class='add'>+	struct reset_controller_dev rcdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='head'>diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h<br/>index 21e4ccb5ba6e..99a9c4d16f6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufs.h</a></div><div class='hunk'>@@ -516,7 +516,6 @@ struct ufs_vreg {</div><div class='ctx'> 	bool enabled;</div><div class='ctx'> 	int min_uV;</div><div class='ctx'> 	int max_uV;</div><div class='del'>-	int min_uA;</div><div class='ctx'> 	int max_uA;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c<br/>index 27213676329c..8a74ec30c3d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufshcd-pltfrm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufshcd-pltfrm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufshcd-pltfrm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufshcd-pltfrm.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ufshcd.h"</div><div class='ctx'> #include "ufshcd-pltfrm.h"</div><div class='add'>+#include "unipro.h"</div><div class='ctx'> </div><div class='ctx'> #define UFSHCD_DEFAULT_LANES_PER_DIRECTION		2</div><div class='ctx'> </div><div class='hunk'>@@ -151,20 +152,12 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name,</div><div class='ctx'> </div><div class='ctx'> 	vreg-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	/* if fixed regulator no need further initialization */</div><div class='del'>-	snprintf(prop_name, MAX_PROP_SIZE, "%s-fixed-regulator", name);</div><div class='del'>-	if (of_property_read_bool(np, prop_name))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	snprintf(prop_name, MAX_PROP_SIZE, "%s-max-microamp", name);</div><div class='del'>-	ret = of_property_read_u32(np, prop_name, &amp;vreg-&gt;max_uA);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "%s: unable to find %s err %d\n",</div><div class='del'>-				__func__, prop_name, ret);</div><div class='del'>-		goto out;</div><div class='add'>+	if (of_property_read_u32(np, prop_name, &amp;vreg-&gt;max_uA)) {</div><div class='add'>+		dev_info(dev, "%s: unable to find %s\n", __func__, prop_name);</div><div class='add'>+		vreg-&gt;max_uA = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vreg-&gt;min_uA = 0;</div><div class='ctx'> 	if (!strcmp(name, "vcc")) {</div><div class='ctx'> 		if (of_property_read_bool(np, "vcc-supply-1p8")) {</div><div class='ctx'> 			vreg-&gt;min_uV = UFS_VREG_VCC_1P8_MIN_UV;</div><div class='hunk'>@@ -290,6 +283,103 @@ static void ufshcd_init_lanes_per_dir(struct ufs_hba *hba)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ufshcd_get_pwr_dev_param - get finally agreed attributes for</div><div class='add'>+ *                            power mode change</div><div class='add'>+ * @pltfrm_param: pointer to platform parameters</div><div class='add'>+ * @dev_max: pointer to device attributes</div><div class='add'>+ * @agreed_pwr: returned agreed attributes</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, non-zero value on failure</div><div class='add'>+ */</div><div class='add'>+int ufshcd_get_pwr_dev_param(struct ufs_dev_params *pltfrm_param,</div><div class='add'>+			     struct ufs_pa_layer_attr *dev_max,</div><div class='add'>+			     struct ufs_pa_layer_attr *agreed_pwr)</div><div class='add'>+{</div><div class='add'>+	int min_pltfrm_gear;</div><div class='add'>+	int min_dev_gear;</div><div class='add'>+	bool is_dev_sup_hs = false;</div><div class='add'>+	bool is_pltfrm_max_hs = false;</div><div class='add'>+</div><div class='add'>+	if (dev_max-&gt;pwr_rx == FAST_MODE)</div><div class='add'>+		is_dev_sup_hs = true;</div><div class='add'>+</div><div class='add'>+	if (pltfrm_param-&gt;desired_working_mode == UFS_HS_MODE) {</div><div class='add'>+		is_pltfrm_max_hs = true;</div><div class='add'>+		min_pltfrm_gear = min_t(u32, pltfrm_param-&gt;hs_rx_gear,</div><div class='add'>+					pltfrm_param-&gt;hs_tx_gear);</div><div class='add'>+	} else {</div><div class='add'>+		min_pltfrm_gear = min_t(u32, pltfrm_param-&gt;pwm_rx_gear,</div><div class='add'>+					pltfrm_param-&gt;pwm_tx_gear);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * device doesn't support HS but</div><div class='add'>+	 * pltfrm_param-&gt;desired_working_mode is HS,</div><div class='add'>+	 * thus device and pltfrm_param don't agree</div><div class='add'>+	 */</div><div class='add'>+	if (!is_dev_sup_hs &amp;&amp; is_pltfrm_max_hs) {</div><div class='add'>+		pr_info("%s: device doesn't support HS\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	} else if (is_dev_sup_hs &amp;&amp; is_pltfrm_max_hs) {</div><div class='add'>+		/*</div><div class='add'>+		 * since device supports HS, it supports FAST_MODE.</div><div class='add'>+		 * since pltfrm_param-&gt;desired_working_mode is also HS</div><div class='add'>+		 * then final decision (FAST/FASTAUTO) is done according</div><div class='add'>+		 * to pltfrm_params as it is the restricting factor</div><div class='add'>+		 */</div><div class='add'>+		agreed_pwr-&gt;pwr_rx = pltfrm_param-&gt;rx_pwr_hs;</div><div class='add'>+		agreed_pwr-&gt;pwr_tx = agreed_pwr-&gt;pwr_rx;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * here pltfrm_param-&gt;desired_working_mode is PWM.</div><div class='add'>+		 * it doesn't matter whether device supports HS or PWM,</div><div class='add'>+		 * in both cases pltfrm_param-&gt;desired_working_mode will</div><div class='add'>+		 * determine the mode</div><div class='add'>+		 */</div><div class='add'>+		agreed_pwr-&gt;pwr_rx = pltfrm_param-&gt;rx_pwr_pwm;</div><div class='add'>+		agreed_pwr-&gt;pwr_tx = agreed_pwr-&gt;pwr_rx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we would like tx to work in the minimum number of lanes</div><div class='add'>+	 * between device capability and vendor preferences.</div><div class='add'>+	 * the same decision will be made for rx</div><div class='add'>+	 */</div><div class='add'>+	agreed_pwr-&gt;lane_tx = min_t(u32, dev_max-&gt;lane_tx,</div><div class='add'>+				    pltfrm_param-&gt;tx_lanes);</div><div class='add'>+	agreed_pwr-&gt;lane_rx = min_t(u32, dev_max-&gt;lane_rx,</div><div class='add'>+				    pltfrm_param-&gt;rx_lanes);</div><div class='add'>+</div><div class='add'>+	/* device maximum gear is the minimum between device rx and tx gears */</div><div class='add'>+	min_dev_gear = min_t(u32, dev_max-&gt;gear_rx, dev_max-&gt;gear_tx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if both device capabilities and vendor pre-defined preferences are</div><div class='add'>+	 * both HS or both PWM then set the minimum gear to be the chosen</div><div class='add'>+	 * working gear.</div><div class='add'>+	 * if one is PWM and one is HS then the one that is PWM get to decide</div><div class='add'>+	 * what is the gear, as it is the one that also decided previously what</div><div class='add'>+	 * pwr the device will be configured to.</div><div class='add'>+	 */</div><div class='add'>+	if ((is_dev_sup_hs &amp;&amp; is_pltfrm_max_hs) ||</div><div class='add'>+	    (!is_dev_sup_hs &amp;&amp; !is_pltfrm_max_hs)) {</div><div class='add'>+		agreed_pwr-&gt;gear_rx =</div><div class='add'>+			min_t(u32, min_dev_gear, min_pltfrm_gear);</div><div class='add'>+	} else if (!is_dev_sup_hs) {</div><div class='add'>+		agreed_pwr-&gt;gear_rx = min_dev_gear;</div><div class='add'>+	} else {</div><div class='add'>+		agreed_pwr-&gt;gear_rx = min_pltfrm_gear;</div><div class='add'>+	}</div><div class='add'>+	agreed_pwr-&gt;gear_tx = agreed_pwr-&gt;gear_rx;</div><div class='add'>+</div><div class='add'>+	agreed_pwr-&gt;hs_rate = pltfrm_param-&gt;hs_rate;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ufshcd_get_pwr_dev_param);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ufshcd_pltfrm_init - probe routine of the driver</div><div class='ctx'>  * @pdev: pointer to Platform device handle</div><div class='ctx'>  * @vops: pointer to variant ops</div><div class='head'>diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.h b/drivers/scsi/ufs/ufshcd-pltfrm.h<br/>index 1f29e1fd6d52..0919ebba182b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufshcd-pltfrm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufshcd-pltfrm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufshcd-pltfrm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufshcd-pltfrm.h</a></div><div class='hunk'>@@ -16,6 +16,27 @@</div><div class='ctx'> </div><div class='ctx'> #include "ufshcd.h"</div><div class='ctx'> </div><div class='add'>+#define UFS_PWM_MODE 1</div><div class='add'>+#define UFS_HS_MODE  2</div><div class='add'>+</div><div class='add'>+struct ufs_dev_params {</div><div class='add'>+	u32 pwm_rx_gear;        /* pwm rx gear to work in */</div><div class='add'>+	u32 pwm_tx_gear;        /* pwm tx gear to work in */</div><div class='add'>+	u32 hs_rx_gear;         /* hs rx gear to work in */</div><div class='add'>+	u32 hs_tx_gear;         /* hs tx gear to work in */</div><div class='add'>+	u32 rx_lanes;           /* number of rx lanes */</div><div class='add'>+	u32 tx_lanes;           /* number of tx lanes */</div><div class='add'>+	u32 rx_pwr_pwm;         /* rx pwm working pwr */</div><div class='add'>+	u32 tx_pwr_pwm;         /* tx pwm working pwr */</div><div class='add'>+	u32 rx_pwr_hs;          /* rx hs working pwr */</div><div class='add'>+	u32 tx_pwr_hs;          /* tx hs working pwr */</div><div class='add'>+	u32 hs_rate;            /* rate A/B to work in HS */</div><div class='add'>+	u32 desired_working_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ufshcd_get_pwr_dev_param(struct ufs_dev_params *dev_param,</div><div class='add'>+			     struct ufs_pa_layer_attr *dev_max,</div><div class='add'>+			     struct ufs_pa_layer_attr *agreed_pwr);</div><div class='ctx'> int ufshcd_pltfrm_init(struct platform_device *pdev,</div><div class='ctx'> 		       const struct ufs_hba_variant_ops *vops);</div><div class='ctx'> void ufshcd_pltfrm_shutdown(struct platform_device *pdev);</div><div class='head'>diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c<br/>index e040f9dd9ff3..8c1c551f2b42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufshcd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/ufshcd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/ufshcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/ufshcd.c</a></div><div class='hunk'>@@ -4704,10 +4704,10 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)</div><div class='ctx'> 				"Reject UPIU not fully implemented\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 			dev_err(hba-&gt;dev,</div><div class='ctx'> 				"Unexpected request response code = %x\n",</div><div class='ctx'> 				result);</div><div class='add'>+			result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -6294,19 +6294,19 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hba-&gt;vreg_info.vcc)</div><div class='add'>+	if (hba-&gt;vreg_info.vcc &amp;&amp; hba-&gt;vreg_info.vcc-&gt;max_uA)</div><div class='ctx'> 		icc_level = ufshcd_get_max_icc_level(</div><div class='ctx'> 				hba-&gt;vreg_info.vcc-&gt;max_uA,</div><div class='ctx'> 				POWER_DESC_MAX_ACTV_ICC_LVLS - 1,</div><div class='ctx'> 				&amp;desc_buf[PWR_DESC_ACTIVE_LVLS_VCC_0]);</div><div class='ctx'> </div><div class='del'>-	if (hba-&gt;vreg_info.vccq)</div><div class='add'>+	if (hba-&gt;vreg_info.vccq &amp;&amp; hba-&gt;vreg_info.vccq-&gt;max_uA)</div><div class='ctx'> 		icc_level = ufshcd_get_max_icc_level(</div><div class='ctx'> 				hba-&gt;vreg_info.vccq-&gt;max_uA,</div><div class='ctx'> 				icc_level,</div><div class='ctx'> 				&amp;desc_buf[PWR_DESC_ACTIVE_LVLS_VCCQ_0]);</div><div class='ctx'> </div><div class='del'>-	if (hba-&gt;vreg_info.vccq2)</div><div class='add'>+	if (hba-&gt;vreg_info.vccq2 &amp;&amp; hba-&gt;vreg_info.vccq2-&gt;max_uA)</div><div class='ctx'> 		icc_level = ufshcd_get_max_icc_level(</div><div class='ctx'> 				hba-&gt;vreg_info.vccq2-&gt;max_uA,</div><div class='ctx'> 				icc_level,</div><div class='hunk'>@@ -7004,6 +7004,15 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,</div><div class='ctx'> 	if (!vreg)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * "set_load" operation shall be required on those regulators</div><div class='add'>+	 * which specifically configured current limitation. Otherwise</div><div class='add'>+	 * zero max_uA may cause unexpected behavior when regulator is</div><div class='add'>+	 * enabled or set as high power mode.</div><div class='add'>+	 */</div><div class='add'>+	if (!vreg-&gt;max_uA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	ret = regulator_set_load(vreg-&gt;reg, ua);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "%s: %s set load (ua=%d) failed, err=%d\n",</div><div class='hunk'>@@ -7039,12 +7048,15 @@ static int ufshcd_config_vreg(struct device *dev,</div><div class='ctx'> 	name = vreg-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	if (regulator_count_voltages(reg) &gt; 0) {</div><div class='del'>-		min_uV = on ? vreg-&gt;min_uV : 0;</div><div class='del'>-		ret = regulator_set_voltage(reg, min_uV, vreg-&gt;max_uV);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev, "%s: %s set voltage failed, err=%d\n",</div><div class='add'>+		if (vreg-&gt;min_uV &amp;&amp; vreg-&gt;max_uV) {</div><div class='add'>+			min_uV = on ? vreg-&gt;min_uV : 0;</div><div class='add'>+			ret = regulator_set_voltage(reg, min_uV, vreg-&gt;max_uV);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(dev,</div><div class='add'>+					"%s: %s set voltage failed, err=%d\n",</div><div class='ctx'> 					__func__, name, ret);</div><div class='del'>-			goto out;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		uA_load = on ? vreg-&gt;max_uA : 0;</div><div class='hunk'>@@ -7103,9 +7115,6 @@ static int ufshcd_setup_vreg(struct ufs_hba *hba, bool on)</div><div class='ctx'> 	struct device *dev = hba-&gt;dev;</div><div class='ctx'> 	struct ufs_vreg_info *info = &amp;hba-&gt;vreg_info;</div><div class='ctx'> </div><div class='del'>-	if (!info)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	ret = ufshcd_toggle_vreg(dev, info-&gt;vcc, on);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -7131,10 +7140,7 @@ static int ufshcd_setup_hba_vreg(struct ufs_hba *hba, bool on)</div><div class='ctx'> {</div><div class='ctx'> 	struct ufs_vreg_info *info = &amp;hba-&gt;vreg_info;</div><div class='ctx'> </div><div class='del'>-	if (info)</div><div class='del'>-		return ufshcd_toggle_vreg(hba-&gt;dev, info-&gt;vdd_hba, on);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ufshcd_toggle_vreg(hba-&gt;dev, info-&gt;vdd_hba, on);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ufshcd_get_vreg(struct device *dev, struct ufs_vreg *vreg)</div><div class='hunk'>@@ -7160,9 +7166,6 @@ static int ufshcd_init_vreg(struct ufs_hba *hba)</div><div class='ctx'> 	struct device *dev = hba-&gt;dev;</div><div class='ctx'> 	struct ufs_vreg_info *info = &amp;hba-&gt;vreg_info;</div><div class='ctx'> </div><div class='del'>-	if (!info)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	ret = ufshcd_get_vreg(dev, info-&gt;vcc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h<br/>index 23129d7b2678..c77e36526447 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/unipro.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/ufs/unipro.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/ufs/unipro.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/ufs/unipro.h</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #define RX_HS_UNTERMINATED_ENABLE		0x00A6</div><div class='ctx'> #define RX_ENTER_HIBERN8			0x00A7</div><div class='ctx'> #define RX_BYPASS_8B10B_ENABLE			0x00A8</div><div class='del'>-#define RX_TERMINATION_FORCE_ENABLE		0x0089</div><div class='add'>+#define RX_TERMINATION_FORCE_ENABLE		0x00A9</div><div class='ctx'> #define RX_MIN_ACTIVATETIME_CAPABILITY		0x008F</div><div class='ctx'> #define RX_HIBERN8TIME_CAPABILITY		0x0092</div><div class='ctx'> #define RX_REFCLKFREQ				0x00EB</div><div class='head'>diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c<br/>index 8af01777d09c..c47d38bca948 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/virtio_scsi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/scsi/virtio_scsi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/scsi/virtio_scsi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/scsi/virtio_scsi.c</a></div><div class='hunk'>@@ -659,7 +659,7 @@ static int virtscsi_abort(struct scsi_cmnd *sc)</div><div class='ctx'> static int virtscsi_map_queues(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_scsi *vscsi = shost_priv(shost);</div><div class='del'>-	struct blk_mq_queue_map *qmap = &amp;shost-&gt;tag_set.map[0];</div><div class='add'>+	struct blk_mq_queue_map *qmap = &amp;shost-&gt;tag_set.map[HCTX_TYPE_DEFAULT];</div><div class='ctx'> </div><div class='ctx'> 	return blk_mq_virtio_map_queues(qmap, vscsi-&gt;vdev, 2);</div><div class='ctx'> }</div><div class='hunk'>@@ -793,6 +793,7 @@ static int virtscsi_probe(struct virtio_device *vdev)</div><div class='ctx'> </div><div class='ctx'> 	/* We need to know how many queues before we allocate. */</div><div class='ctx'> 	num_queues = virtscsi_config_get(vdev, num_queues) ? : 1;</div><div class='add'>+	num_queues = min_t(unsigned int, nr_cpu_ids, num_queues);</div><div class='ctx'> </div><div class='ctx'> 	num_targets = virtscsi_config_get(vdev, max_target) + 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c<br/>index 71f094c9ec68..f3585777324c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/slimbus/qcom-ngd-ctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/slimbus/qcom-ngd-ctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/slimbus/qcom-ngd-ctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/slimbus/qcom-ngd-ctrl.c</a></div><div class='hunk'>@@ -1342,6 +1342,10 @@ static int of_qcom_slim_ngd_register(struct device *parent,</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		ngd-&gt;pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id);</div><div class='add'>+		if (!ngd-&gt;pdev) {</div><div class='add'>+			kfree(ngd);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		ngd-&gt;id = id;</div><div class='ctx'> 		ngd-&gt;pdev-&gt;dev.parent = parent;</div><div class='ctx'> 		ngd-&gt;pdev-&gt;driver_override = QCOM_SLIM_NGD_DRV_NAME;</div><div class='head'>diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c<br/>index 9351349cf0a9..1e0041ec8132 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soc/bcm/bcm2835-power.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soc/bcm/bcm2835-power.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soc/bcm/bcm2835-power.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soc/bcm/bcm2835-power.c</a></div><div class='hunk'>@@ -150,7 +150,12 @@ struct bcm2835_power {</div><div class='ctx'> </div><div class='ctx'> static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u64 start = ktime_get_ns();</div><div class='add'>+	u64 start;</div><div class='add'>+</div><div class='add'>+	if (!reg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	start = ktime_get_ns();</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the module's async AXI bridges. */</div><div class='ctx'> 	ASB_WRITE(reg, ASB_READ(reg) &amp; ~ASB_REQ_STOP);</div><div class='hunk'>@@ -165,7 +170,12 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg)</div><div class='ctx'> </div><div class='ctx'> static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u64 start = ktime_get_ns();</div><div class='add'>+	u64 start;</div><div class='add'>+</div><div class='add'>+	if (!reg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	start = ktime_get_ns();</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the module's async AXI bridges. */</div><div class='ctx'> 	ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP);</div><div class='hunk'>@@ -475,7 +485,7 @@ static int bcm2835_power_pd_power_off(struct generic_pm_domain *domain)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> bcm2835_init_power_domain(struct bcm2835_power *power,</div><div class='ctx'> 			  int pd_xlate_index, const char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -483,6 +493,17 @@ bcm2835_init_power_domain(struct bcm2835_power *power,</div><div class='ctx'> 	struct bcm2835_power_domain *dom = &amp;power-&gt;domains[pd_xlate_index];</div><div class='ctx'> </div><div class='ctx'> 	dom-&gt;clk = devm_clk_get(dev-&gt;parent, name);</div><div class='add'>+	if (IS_ERR(dom-&gt;clk)) {</div><div class='add'>+		int ret = PTR_ERR(dom-&gt;clk);</div><div class='add'>+</div><div class='add'>+		if (ret == -EPROBE_DEFER)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Some domains don't have a clk, so make sure that we</div><div class='add'>+		 * don't deref an error pointer later.</div><div class='add'>+		 */</div><div class='add'>+		dom-&gt;clk = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dom-&gt;base.name = name;</div><div class='ctx'> 	dom-&gt;base.power_on = bcm2835_power_pd_power_on;</div><div class='hunk'>@@ -495,6 +516,8 @@ bcm2835_init_power_domain(struct bcm2835_power *power,</div><div class='ctx'> 	pm_genpd_init(&amp;dom-&gt;base, NULL, true);</div><div class='ctx'> </div><div class='ctx'> 	power-&gt;pd_xlate.domains[pd_xlate_index] = &amp;dom-&gt;base;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** bcm2835_reset_reset - Resets a block that has a reset line in the</div><div class='hunk'>@@ -592,7 +615,7 @@ static int bcm2835_power_probe(struct platform_device *pdev)</div><div class='ctx'> 		{ BCM2835_POWER_DOMAIN_IMAGE_PERI, BCM2835_POWER_DOMAIN_CAM0 },</div><div class='ctx'> 		{ BCM2835_POWER_DOMAIN_IMAGE_PERI, BCM2835_POWER_DOMAIN_CAM1 },</div><div class='ctx'> 	};</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret = 0, i;</div><div class='ctx'> 	u32 id;</div><div class='ctx'> </div><div class='ctx'> 	power = devm_kzalloc(dev, sizeof(*power), GFP_KERNEL);</div><div class='hunk'>@@ -619,8 +642,11 @@ static int bcm2835_power_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	power-&gt;pd_xlate.num_domains = ARRAY_SIZE(power_domain_names);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(power_domain_names); i++)</div><div class='del'>-		bcm2835_init_power_domain(power, i, power_domain_names[i]);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(power_domain_names); i++) {</div><div class='add'>+		ret = bcm2835_init_power_domain(power, i, power_domain_names[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(domain_deps); i++) {</div><div class='ctx'> 		pm_genpd_add_subdomain(&amp;power-&gt;domains[domain_deps[i].parent].base,</div><div class='hunk'>@@ -634,12 +660,21 @@ static int bcm2835_power_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ret = devm_reset_controller_register(dev, &amp;power-&gt;reset);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	of_genpd_add_provider_onecell(dev-&gt;parent-&gt;of_node, &amp;power-&gt;pd_xlate);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "Broadcom BCM2835 power domains driver");</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(power_domain_names); i++) {</div><div class='add'>+		struct generic_pm_domain *dom = &amp;power-&gt;domains[i].base;</div><div class='add'>+</div><div class='add'>+		if (dom-&gt;name)</div><div class='add'>+			pm_genpd_remove(dom);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm2835_power_remove(struct platform_device *pdev)</div><div class='head'>diff --git a/drivers/soc/sunxi/Kconfig b/drivers/soc/sunxi/Kconfig<br/>index 353b07e40176..e84eb4e59f58 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soc/sunxi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soc/sunxi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soc/sunxi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soc/sunxi/Kconfig</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> config SUNXI_SRAM</div><div class='ctx'> 	bool</div><div class='ctx'> 	default ARCH_SUNXI</div><div class='add'>+	select REGMAP_MMIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say y here to enable the SRAM controller support. This</div><div class='ctx'> 	  device is responsible on mapping the SRAM in the sunXi SoCs</div><div class='head'>diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig<br/>index 19c8efb9a5ee..53b55b79c4af 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> menuconfig SOUNDWIRE</div><div class='ctx'> 	bool "SoundWire support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  SoundWire is a 2-Pin interface with data and clock line ratified</div><div class='ctx'> 	  by the MIPI Alliance. SoundWire is used for transporting data</div><div class='ctx'> 	  typically related to audio functions. SoundWire interface is</div><div class='hunk'>@@ -28,7 +28,7 @@ config SOUNDWIRE_INTEL</div><div class='ctx'> 	select SOUNDWIRE_CADENCE</div><div class='ctx'> 	select SOUNDWIRE_BUS</div><div class='ctx'> 	depends on X86 &amp;&amp; ACPI &amp;&amp; SND_SOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  SoundWire Intel Master driver.</div><div class='ctx'> 	  If you have an Intel platform which has a SoundWire Master then</div><div class='ctx'> 	  enable this config option to get the SoundWire support for that</div><div class='head'>diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c<br/>index 1cbfedfc20ef..aac35fc3cf22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/bus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/bus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/bus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/bus.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@ int sdw_add_bus_master(struct sdw_bus *bus)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!bus-&gt;dev) {</div><div class='del'>-		pr_err("SoundWire bus has no device");</div><div class='add'>+		pr_err("SoundWire bus has no device\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!bus-&gt;ops) {</div><div class='del'>-		dev_err(bus-&gt;dev, "SoundWire Bus ops are not set");</div><div class='add'>+		dev_err(bus-&gt;dev, "SoundWire Bus ops are not set\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -43,13 +43,14 @@ int sdw_add_bus_master(struct sdw_bus *bus)</div><div class='ctx'> 	if (bus-&gt;ops-&gt;read_prop) {</div><div class='ctx'> 		ret = bus-&gt;ops-&gt;read_prop(bus);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Bus read properties failed:%d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev,</div><div class='add'>+				"Bus read properties failed:%d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Device numbers in SoundWire are 0 thru 15. Enumeration device</div><div class='add'>+	 * Device numbers in SoundWire are 0 through 15. Enumeration device</div><div class='ctx'> 	 * number (0), Broadcast device number (15), Group numbers (12 and</div><div class='ctx'> 	 * 13) and Master device number (14) are not used for assignment so</div><div class='ctx'> 	 * mask these and other higher bits.</div><div class='hunk'>@@ -172,7 +173,8 @@ static inline int do_transfer(struct sdw_bus *bus, struct sdw_msg *msg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int do_transfer_defer(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_msg *msg, struct sdw_defer *defer)</div><div class='add'>+				    struct sdw_msg *msg,</div><div class='add'>+				    struct sdw_defer *defer)</div><div class='ctx'> {</div><div class='ctx'> 	int retry = bus-&gt;prop.err_threshold;</div><div class='ctx'> 	enum sdw_command_response resp;</div><div class='hunk'>@@ -224,7 +226,7 @@ int sdw_transfer(struct sdw_bus *bus, struct sdw_msg *msg)</div><div class='ctx'> 	ret = do_transfer(bus, msg);</div><div class='ctx'> 	if (ret != 0 &amp;&amp; ret != -ENODATA)</div><div class='ctx'> 		dev_err(bus-&gt;dev, "trf on Slave %d failed:%d\n",</div><div class='del'>-				msg-&gt;dev_num, ret);</div><div class='add'>+			msg-&gt;dev_num, ret);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;page)</div><div class='ctx'> 		sdw_reset_page(bus, msg-&gt;dev_num);</div><div class='hunk'>@@ -243,7 +245,7 @@ int sdw_transfer(struct sdw_bus *bus, struct sdw_msg *msg)</div><div class='ctx'>  * Caller needs to hold the msg_lock lock while calling this</div><div class='ctx'>  */</div><div class='ctx'> int sdw_transfer_defer(struct sdw_bus *bus, struct sdw_msg *msg,</div><div class='del'>-				struct sdw_defer *defer)</div><div class='add'>+		       struct sdw_defer *defer)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +255,7 @@ int sdw_transfer_defer(struct sdw_bus *bus, struct sdw_msg *msg,</div><div class='ctx'> 	ret = do_transfer_defer(bus, msg, defer);</div><div class='ctx'> 	if (ret != 0 &amp;&amp; ret != -ENODATA)</div><div class='ctx'> 		dev_err(bus-&gt;dev, "Defer trf on Slave %d failed:%d\n",</div><div class='del'>-				msg-&gt;dev_num, ret);</div><div class='add'>+			msg-&gt;dev_num, ret);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;page)</div><div class='ctx'> 		sdw_reset_page(bus, msg-&gt;dev_num);</div><div class='hunk'>@@ -261,9 +263,8 @@ int sdw_transfer_defer(struct sdw_bus *bus, struct sdw_msg *msg,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,</div><div class='del'>-		u32 addr, size_t count, u16 dev_num, u8 flags, u8 *buf)</div><div class='add'>+		 u32 addr, size_t count, u16 dev_num, u8 flags, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	memset(msg, 0, sizeof(*msg));</div><div class='ctx'> 	msg-&gt;addr = addr; /* addr is 16 bit and truncated here */</div><div class='hunk'>@@ -271,8 +272,6 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,</div><div class='ctx'> 	msg-&gt;dev_num = dev_num;</div><div class='ctx'> 	msg-&gt;flags = flags;</div><div class='ctx'> 	msg-&gt;buf = buf;</div><div class='del'>-	msg-&gt;ssp_sync = false;</div><div class='del'>-	msg-&gt;page = false;</div><div class='ctx'> </div><div class='ctx'> 	if (addr &lt; SDW_REG_NO_PAGE) { /* no paging area */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -284,7 +283,7 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,</div><div class='ctx'> 	if (addr &lt; SDW_REG_OPTIONAL_PAGE) { /* 32k but no page */</div><div class='ctx'> 		if (slave &amp;&amp; !slave-&gt;prop.paging_support)</div><div class='ctx'> 			return 0;</div><div class='del'>-		/* no need for else as that will fall thru to paging */</div><div class='add'>+		/* no need for else as that will fall-through to paging */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* paging mandatory */</div><div class='hunk'>@@ -298,7 +297,7 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	} else if (!slave-&gt;prop.paging_support) {</div><div class='ctx'> 		dev_err(&amp;slave-&gt;dev,</div><div class='del'>-			"address %x needs paging but no support", addr);</div><div class='add'>+			"address %x needs paging but no support\n", addr);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -323,7 +322,7 @@ int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_fill_msg(&amp;msg, slave, addr, count,</div><div class='del'>-			slave-&gt;dev_num, SDW_MSG_FLAG_READ, val);</div><div class='add'>+			   slave-&gt;dev_num, SDW_MSG_FLAG_READ, val);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +350,7 @@ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, u8 *val)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_fill_msg(&amp;msg, slave, addr, count,</div><div class='del'>-			slave-&gt;dev_num, SDW_MSG_FLAG_WRITE, val);</div><div class='add'>+			   slave-&gt;dev_num, SDW_MSG_FLAG_WRITE, val);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +392,6 @@ EXPORT_SYMBOL(sdw_read);</div><div class='ctx'> int sdw_write(struct sdw_slave *slave, u32 addr, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	return sdw_nwrite(slave, addr, 1, &amp;value);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sdw_write);</div><div class='ctx'> </div><div class='hunk'>@@ -416,11 +414,10 @@ static struct sdw_slave *sdw_get_slave(struct sdw_bus *bus, int i)</div><div class='ctx'> </div><div class='ctx'> static int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	if ((slave-&gt;id.unique_id != id.unique_id) ||</div><div class='del'>-	    (slave-&gt;id.mfg_id != id.mfg_id) ||</div><div class='del'>-	    (slave-&gt;id.part_id != id.part_id) ||</div><div class='del'>-	    (slave-&gt;id.class_id != id.class_id))</div><div class='add'>+	if (slave-&gt;id.unique_id != id.unique_id ||</div><div class='add'>+	    slave-&gt;id.mfg_id != id.mfg_id ||</div><div class='add'>+	    slave-&gt;id.part_id != id.part_id ||</div><div class='add'>+	    slave-&gt;id.class_id != id.class_id)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -457,24 +454,23 @@ static int sdw_assign_device_num(struct sdw_slave *slave)</div><div class='ctx'> 		dev_num = sdw_get_device_num(slave);</div><div class='ctx'> 		mutex_unlock(&amp;slave-&gt;bus-&gt;bus_lock);</div><div class='ctx'> 		if (dev_num &lt; 0) {</div><div class='del'>-			dev_err(slave-&gt;bus-&gt;dev, "Get dev_num failed: %d",</div><div class='del'>-								dev_num);</div><div class='add'>+			dev_err(slave-&gt;bus-&gt;dev, "Get dev_num failed: %d\n",</div><div class='add'>+				dev_num);</div><div class='ctx'> 			return dev_num;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_info(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"Slave already registered dev_num:%d",</div><div class='del'>-				slave-&gt;dev_num);</div><div class='add'>+			 "Slave already registered dev_num:%d\n",</div><div class='add'>+			 slave-&gt;dev_num);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the slave-&gt;dev_num to transfer message on device 0 */</div><div class='ctx'> 		dev_num = slave-&gt;dev_num;</div><div class='ctx'> 		slave-&gt;dev_num = 0;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_write(slave, SDW_SCP_DEVNUMBER, dev_num);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;slave-&gt;dev, "Program device_num failed: %d", ret);</div><div class='add'>+		dev_err(&amp;slave-&gt;dev, "Program device_num failed: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -485,9 +481,9 @@ static int sdw_assign_device_num(struct sdw_slave *slave)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void sdw_extract_slave_id(struct sdw_bus *bus,</div><div class='del'>-			u64 addr, struct sdw_slave_id *id)</div><div class='add'>+			  u64 addr, struct sdw_slave_id *id)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(bus-&gt;dev, "SDW Slave Addr: %llx", addr);</div><div class='add'>+	dev_dbg(bus-&gt;dev, "SDW Slave Addr: %llx\n", addr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Spec definition</div><div class='hunk'>@@ -507,10 +503,9 @@ void sdw_extract_slave_id(struct sdw_bus *bus,</div><div class='ctx'> 	id-&gt;class_id = addr &amp; GENMASK(7, 0);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(bus-&gt;dev,</div><div class='del'>-		"SDW Slave class_id %x, part_id %x, mfg_id %x, unique_id %x, version %x",</div><div class='add'>+		"SDW Slave class_id %x, part_id %x, mfg_id %x, unique_id %x, version %x\n",</div><div class='ctx'> 				id-&gt;class_id, id-&gt;part_id, id-&gt;mfg_id,</div><div class='ctx'> 				id-&gt;unique_id, id-&gt;sdw_version);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_program_device_num(struct sdw_bus *bus)</div><div class='hunk'>@@ -525,7 +520,7 @@ static int sdw_program_device_num(struct sdw_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	/* No Slave, so use raw xfer api */</div><div class='ctx'> 	ret = sdw_fill_msg(&amp;msg, NULL, SDW_SCP_DEVID_0,</div><div class='del'>-			SDW_NUM_DEV_ID_REGISTERS, 0, SDW_MSG_FLAG_READ, buf);</div><div class='add'>+			   SDW_NUM_DEV_ID_REGISTERS, 0, SDW_MSG_FLAG_READ, buf);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -564,7 +559,7 @@ static int sdw_program_device_num(struct sdw_bus *bus)</div><div class='ctx'> 				ret = sdw_assign_device_num(slave);</div><div class='ctx'> 				if (ret) {</div><div class='ctx'> 					dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-						"Assign dev_num failed:%d",</div><div class='add'>+						"Assign dev_num failed:%d\n",</div><div class='ctx'> 						ret);</div><div class='ctx'> 					return ret;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -573,9 +568,9 @@ static int sdw_program_device_num(struct sdw_bus *bus)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (found == false) {</div><div class='add'>+		if (!found) {</div><div class='ctx'> 			/* TODO: Park this device in Group 13 */</div><div class='del'>-			dev_err(bus-&gt;dev, "Slave Entry not found");</div><div class='add'>+			dev_err(bus-&gt;dev, "Slave Entry not found\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		count++;</div><div class='hunk'>@@ -592,7 +587,7 @@ static int sdw_program_device_num(struct sdw_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdw_modify_slave_status(struct sdw_slave *slave,</div><div class='del'>-				enum sdw_slave_status status)</div><div class='add'>+				    enum sdw_slave_status status)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;slave-&gt;bus-&gt;bus_lock);</div><div class='ctx'> 	slave-&gt;status = status;</div><div class='hunk'>@@ -600,7 +595,7 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sdw_configure_dpn_intr(struct sdw_slave *slave,</div><div class='del'>-			int port, bool enable, int mask)</div><div class='add'>+			   int port, bool enable, int mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -620,7 +615,7 @@ int sdw_configure_dpn_intr(struct sdw_slave *slave,</div><div class='ctx'> 	ret = sdw_update(slave, addr, (mask | SDW_DPN_INT_PORT_READY), val);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_DPN_INTMASK write failed:%d", val);</div><div class='add'>+			"SDW_DPN_INTMASK write failed:%d\n", val);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -644,7 +639,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)</div><div class='ctx'> 	ret = sdw_update(slave, SDW_SCP_INTMASK1, val, val);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_SCP_INTMASK1 write failed:%d", ret);</div><div class='add'>+			"SDW_SCP_INTMASK1 write failed:%d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -659,7 +654,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)</div><div class='ctx'> 	ret = sdw_update(slave, SDW_DP0_INTMASK, val, val);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_DP0_INTMASK read failed:%d", ret);</div><div class='add'>+			"SDW_DP0_INTMASK read failed:%d\n", ret);</div><div class='ctx'> 		return val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -674,14 +669,13 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)</div><div class='ctx'> 	status = sdw_read(slave, SDW_DP0_INT);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_DP0_INT read failed:%d", status);</div><div class='add'>+			"SDW_DP0_INT read failed:%d\n", status);</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-</div><div class='ctx'> 		if (status &amp; SDW_DP0_INT_TEST_FAIL) {</div><div class='del'>-			dev_err(&amp;slave-&gt;dev, "Test fail for port 0");</div><div class='add'>+			dev_err(&amp;slave-&gt;dev, "Test fail for port 0\n");</div><div class='ctx'> 			clear |= SDW_DP0_INT_TEST_FAIL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -696,7 +690,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; SDW_DP0_INT_BRA_FAILURE) {</div><div class='del'>-			dev_err(&amp;slave-&gt;dev, "BRA failed");</div><div class='add'>+			dev_err(&amp;slave-&gt;dev, "BRA failed\n");</div><div class='ctx'> 			clear |= SDW_DP0_INT_BRA_FAILURE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -712,7 +706,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)</div><div class='ctx'> 		ret = sdw_write(slave, SDW_DP0_INT, clear);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_DP0_INT write failed:%d", ret);</div><div class='add'>+				"SDW_DP0_INT write failed:%d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -720,7 +714,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)</div><div class='ctx'> 		status2 = sdw_read(slave, SDW_DP0_INT);</div><div class='ctx'> 		if (status2 &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_DP0_INT read failed:%d", status2);</div><div class='add'>+				"SDW_DP0_INT read failed:%d\n", status2);</div><div class='ctx'> 			return status2;</div><div class='ctx'> 		}</div><div class='ctx'> 		status &amp;= status2;</div><div class='hunk'>@@ -731,13 +725,13 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status)</div><div class='ctx'> 	} while (status != 0 &amp;&amp; count &lt; SDW_READ_INTR_CLEAR_RETRY);</div><div class='ctx'> </div><div class='ctx'> 	if (count == SDW_READ_INTR_CLEAR_RETRY)</div><div class='del'>-		dev_warn(slave-&gt;bus-&gt;dev, "Reached MAX_RETRY on DP0 read");</div><div class='add'>+		dev_warn(slave-&gt;bus-&gt;dev, "Reached MAX_RETRY on DP0 read\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_handle_port_interrupt(struct sdw_slave *slave,</div><div class='del'>-		int port, u8 *slave_status)</div><div class='add'>+				     int port, u8 *slave_status)</div><div class='ctx'> {</div><div class='ctx'> 	u8 clear = 0, impl_int_mask;</div><div class='ctx'> 	int status, status2, ret, count = 0;</div><div class='hunk'>@@ -750,15 +744,14 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,</div><div class='ctx'> 	status = sdw_read(slave, addr);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"SDW_DPN_INT read failed:%d", status);</div><div class='add'>+			"SDW_DPN_INT read failed:%d\n", status);</div><div class='ctx'> </div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-</div><div class='ctx'> 		if (status &amp; SDW_DPN_INT_TEST_FAIL) {</div><div class='del'>-			dev_err(&amp;slave-&gt;dev, "Test fail for port:%d", port);</div><div class='add'>+			dev_err(&amp;slave-&gt;dev, "Test fail for port:%d\n", port);</div><div class='ctx'> 			clear |= SDW_DPN_INT_TEST_FAIL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -774,7 +767,6 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,</div><div class='ctx'> 		impl_int_mask = SDW_DPN_INT_IMPDEF1 |</div><div class='ctx'> 			SDW_DPN_INT_IMPDEF2 | SDW_DPN_INT_IMPDEF3;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 		if (status &amp; impl_int_mask) {</div><div class='ctx'> 			clear |= impl_int_mask;</div><div class='ctx'> 			*slave_status = clear;</div><div class='hunk'>@@ -784,7 +776,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,</div><div class='ctx'> 		ret = sdw_write(slave, addr, clear);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_DPN_INT write failed:%d", ret);</div><div class='add'>+				"SDW_DPN_INT write failed:%d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -792,7 +784,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave,</div><div class='ctx'> 		status2 = sdw_read(slave, addr);</div><div class='ctx'> 		if (status2 &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_DPN_INT read failed:%d", status2);</div><div class='add'>+				"SDW_DPN_INT read failed:%d\n", status2);</div><div class='ctx'> 			return status2;</div><div class='ctx'> 		}</div><div class='ctx'> 		status &amp;= status2;</div><div class='hunk'>@@ -820,17 +812,18 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 	sdw_modify_slave_status(slave, SDW_SLAVE_ALERT);</div><div class='ctx'> </div><div class='ctx'> 	/* Read Instat 1, Instat 2 and Instat 3 registers */</div><div class='del'>-	buf = ret = sdw_read(slave, SDW_SCP_INT1);</div><div class='add'>+	ret = sdw_read(slave, SDW_SCP_INT1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_SCP_INT1 read failed:%d", ret);</div><div class='add'>+			"SDW_SCP_INT1 read failed:%d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	buf = ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, buf2);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_SCP_INT2/3 read failed:%d", ret);</div><div class='add'>+			"SDW_SCP_INT2/3 read failed:%d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -840,12 +833,12 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 		 * interrupt</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (buf &amp; SDW_SCP_INT1_PARITY) {</div><div class='del'>-			dev_err(&amp;slave-&gt;dev, "Parity error detected");</div><div class='add'>+			dev_err(&amp;slave-&gt;dev, "Parity error detected\n");</div><div class='ctx'> 			clear |= SDW_SCP_INT1_PARITY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (buf &amp; SDW_SCP_INT1_BUS_CLASH) {</div><div class='del'>-			dev_err(&amp;slave-&gt;dev, "Bus clash error detected");</div><div class='add'>+			dev_err(&amp;slave-&gt;dev, "Bus clash error detected\n");</div><div class='ctx'> 			clear |= SDW_SCP_INT1_BUS_CLASH;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -869,8 +862,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 		port = port &gt;&gt; SDW_REG_SHIFT(SDW_SCP_INT1_PORT0_3);</div><div class='ctx'> 		for_each_set_bit(bit, &amp;port, 8) {</div><div class='ctx'> 			sdw_handle_port_interrupt(slave, bit,</div><div class='del'>-						&amp;port_status[bit]);</div><div class='del'>-</div><div class='add'>+						  &amp;port_status[bit]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if cascade 2 interrupt is present */</div><div class='hunk'>@@ -898,11 +890,11 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Update the Slave driver */</div><div class='del'>-		if (slave_notify &amp;&amp; (slave-&gt;ops) &amp;&amp;</div><div class='del'>-					(slave-&gt;ops-&gt;interrupt_callback)) {</div><div class='add'>+		if (slave_notify &amp;&amp; slave-&gt;ops &amp;&amp;</div><div class='add'>+		    slave-&gt;ops-&gt;interrupt_callback) {</div><div class='ctx'> 			slave_intr.control_port = clear;</div><div class='ctx'> 			memcpy(slave_intr.port, &amp;port_status,</div><div class='del'>-						sizeof(slave_intr.port));</div><div class='add'>+			       sizeof(slave_intr.port));</div><div class='ctx'> </div><div class='ctx'> 			slave-&gt;ops-&gt;interrupt_callback(slave, &amp;slave_intr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -911,7 +903,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 		ret = sdw_write(slave, SDW_SCP_INT1, clear);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_SCP_INT1 write failed:%d", ret);</div><div class='add'>+				"SDW_SCP_INT1 write failed:%d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -919,17 +911,18 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 		 * Read status again to ensure no new interrupts arrived</div><div class='ctx'> 		 * while servicing interrupts.</div><div class='ctx'> 		 */</div><div class='del'>-		_buf = ret = sdw_read(slave, SDW_SCP_INT1);</div><div class='add'>+		ret = sdw_read(slave, SDW_SCP_INT1);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_SCP_INT1 read failed:%d", ret);</div><div class='add'>+				"SDW_SCP_INT1 read failed:%d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		_buf = ret;</div><div class='ctx'> </div><div class='ctx'> 		ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, _buf2);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-					"SDW_SCP_INT2/3 read failed:%d", ret);</div><div class='add'>+				"SDW_SCP_INT2/3 read failed:%d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -949,15 +942,15 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)</div><div class='ctx'> 	} while (stat != 0 &amp;&amp; count &lt; SDW_READ_INTR_CLEAR_RETRY);</div><div class='ctx'> </div><div class='ctx'> 	if (count == SDW_READ_INTR_CLEAR_RETRY)</div><div class='del'>-		dev_warn(slave-&gt;bus-&gt;dev, "Reached MAX_RETRY on alert read");</div><div class='add'>+		dev_warn(slave-&gt;bus-&gt;dev, "Reached MAX_RETRY on alert read\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_update_slave_status(struct sdw_slave *slave,</div><div class='del'>-				enum sdw_slave_status status)</div><div class='add'>+				   enum sdw_slave_status status)</div><div class='ctx'> {</div><div class='del'>-	if ((slave-&gt;ops) &amp;&amp; (slave-&gt;ops-&gt;update_status))</div><div class='add'>+	if (slave-&gt;ops &amp;&amp; slave-&gt;ops-&gt;update_status)</div><div class='ctx'> 		return slave-&gt;ops-&gt;update_status(slave, status);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -969,7 +962,7 @@ static int sdw_update_slave_status(struct sdw_slave *slave,</div><div class='ctx'>  * @status: Status for all Slave(s)</div><div class='ctx'>  */</div><div class='ctx'> int sdw_handle_slave_status(struct sdw_bus *bus,</div><div class='del'>-			enum sdw_slave_status status[])</div><div class='add'>+			    enum sdw_slave_status status[])</div><div class='ctx'> {</div><div class='ctx'> 	enum sdw_slave_status prev_status;</div><div class='ctx'> 	struct sdw_slave *slave;</div><div class='hunk'>@@ -978,7 +971,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,</div><div class='ctx'> 	if (status[0] == SDW_SLAVE_ATTACHED) {</div><div class='ctx'> 		ret = sdw_program_device_num(bus);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			dev_err(bus-&gt;dev, "Slave attach failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Slave attach failed: %d\n", ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Continue to check other slave statuses */</div><div class='hunk'>@@ -1006,7 +999,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,</div><div class='ctx'> 			ret = sdw_handle_slave_alerts(slave);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				dev_err(bus-&gt;dev,</div><div class='del'>-					"Slave %d alert handling failed: %d",</div><div class='add'>+					"Slave %d alert handling failed: %d\n",</div><div class='ctx'> 					i, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1023,22 +1016,21 @@ int sdw_handle_slave_status(struct sdw_bus *bus,</div><div class='ctx'> 			ret = sdw_initialize_slave(slave);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				dev_err(bus-&gt;dev,</div><div class='del'>-					"Slave %d initialization failed: %d",</div><div class='add'>+					"Slave %d initialization failed: %d\n",</div><div class='ctx'> 					i, ret);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			dev_err(bus-&gt;dev, "Invalid slave %d status:%d",</div><div class='del'>-							i, status[i]);</div><div class='add'>+			dev_err(bus-&gt;dev, "Invalid slave %d status:%d\n",</div><div class='add'>+				i, status[i]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = sdw_update_slave_status(slave, status[i]);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			dev_err(slave-&gt;bus-&gt;dev,</div><div class='del'>-				"Update Slave status failed:%d", ret);</div><div class='del'>-</div><div class='add'>+				"Update Slave status failed:%d\n", ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h<br/>index c77de05b8100..3048ca153f22 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/bus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/bus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/bus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/bus.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'>-// Copyright(c) 2015-17 Intel Corporation.</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */</div><div class='add'>+/* Copyright(c) 2015-17 Intel Corporation. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SDW_BUS_H</div><div class='ctx'> #define __SDW_BUS_H</div><div class='hunk'>@@ -16,7 +16,7 @@ static inline int sdw_acpi_find_slaves(struct sdw_bus *bus)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void sdw_extract_slave_id(struct sdw_bus *bus,</div><div class='del'>-			u64 addr, struct sdw_slave_id *id);</div><div class='add'>+			  u64 addr, struct sdw_slave_id *id);</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	SDW_MSG_FLAG_READ = 0,</div><div class='hunk'>@@ -116,19 +116,19 @@ struct sdw_master_runtime {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,</div><div class='del'>-				enum sdw_data_direction direction,</div><div class='del'>-				unsigned int port_num);</div><div class='add'>+					    enum sdw_data_direction direction,</div><div class='add'>+					    unsigned int port_num);</div><div class='ctx'> int sdw_configure_dpn_intr(struct sdw_slave *slave, int port,</div><div class='del'>-					bool enable, int mask);</div><div class='add'>+			   bool enable, int mask);</div><div class='ctx'> </div><div class='ctx'> int sdw_transfer(struct sdw_bus *bus, struct sdw_msg *msg);</div><div class='ctx'> int sdw_transfer_defer(struct sdw_bus *bus, struct sdw_msg *msg,</div><div class='del'>-				struct sdw_defer *defer);</div><div class='add'>+		       struct sdw_defer *defer);</div><div class='ctx'> </div><div class='ctx'> #define SDW_READ_INTR_CLEAR_RETRY	10</div><div class='ctx'> </div><div class='ctx'> int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,</div><div class='del'>-		u32 addr, size_t count, u16 dev_num, u8 flags, u8 *buf);</div><div class='add'>+		 u32 addr, size_t count, u16 dev_num, u8 flags, u8 *buf);</div><div class='ctx'> </div><div class='ctx'> /* Read-Modify-Write Slave register */</div><div class='ctx'> static inline int</div><div class='head'>diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c<br/>index 283b2832728e..2655602f0cfb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/bus_type.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/bus_type.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/bus_type.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/bus_type.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int sdw_drv_probe(struct device *dev)</div><div class='ctx'> 		slave-&gt;prop.clk_stop_timeout = 300;</div><div class='ctx'> </div><div class='ctx'> 	slave-&gt;bus-&gt;clk_stop_timeout = max_t(u32, slave-&gt;bus-&gt;clk_stop_timeout,</div><div class='del'>-					slave-&gt;prop.clk_stop_timeout);</div><div class='add'>+					     slave-&gt;prop.clk_stop_timeout);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -148,7 +148,7 @@ int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)</div><div class='ctx'> </div><div class='ctx'> 	if (!drv-&gt;probe) {</div><div class='ctx'> 		pr_err("driver %s didn't provide SDW probe routine\n",</div><div class='del'>-							drv-&gt;name);</div><div class='add'>+		       drv-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c<br/>index cb6a331f448a..682789bb8ab3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/cadence_master.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/cadence_master.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/cadence_master.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/cadence_master.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> #define CDNS_MCP_CONTROL_CMD_ACCEPT		BIT(1)</div><div class='ctx'> #define CDNS_MCP_CONTROL_BLOCK_WAKEUP		BIT(0)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define CDNS_MCP_CMDCTRL			0x8</div><div class='ctx'> #define CDNS_MCP_SSPSTAT			0xC</div><div class='ctx'> #define CDNS_MCP_FRAME_SHAPE			0x10</div><div class='hunk'>@@ -226,9 +225,9 @@ static int cdns_clear_bit(struct sdw_cdns *cdns, int offset, u32 value)</div><div class='ctx'> /*</div><div class='ctx'>  * IO Calls</div><div class='ctx'>  */</div><div class='del'>-static enum sdw_command_response cdns_fill_msg_resp(</div><div class='del'>-			struct sdw_cdns *cdns,</div><div class='del'>-			struct sdw_msg *msg, int count, int offset)</div><div class='add'>+static enum sdw_command_response</div><div class='add'>+cdns_fill_msg_resp(struct sdw_cdns *cdns,</div><div class='add'>+		   struct sdw_msg *msg, int count, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	int nack = 0, no_ack = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -263,7 +262,7 @@ static enum sdw_command_response cdns_fill_msg_resp(</div><div class='ctx'> </div><div class='ctx'> static enum sdw_command_response</div><div class='ctx'> _cdns_xfer_msg(struct sdw_cdns *cdns, struct sdw_msg *msg, int cmd,</div><div class='del'>-				int offset, int count, bool defer)</div><div class='add'>+	       int offset, int count, bool defer)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long time;</div><div class='ctx'> 	u32 base, i, data;</div><div class='hunk'>@@ -296,7 +295,7 @@ _cdns_xfer_msg(struct sdw_cdns *cdns, struct sdw_msg *msg, int cmd,</div><div class='ctx'> </div><div class='ctx'> 	/* wait for timeout or response */</div><div class='ctx'> 	time = wait_for_completion_timeout(&amp;cdns-&gt;tx_complete,</div><div class='del'>-				msecs_to_jiffies(CDNS_TX_TIMEOUT));</div><div class='add'>+					   msecs_to_jiffies(CDNS_TX_TIMEOUT));</div><div class='ctx'> 	if (!time) {</div><div class='ctx'> 		dev_err(cdns-&gt;dev, "IO transfer timed out\n");</div><div class='ctx'> 		msg-&gt;len = 0;</div><div class='hunk'>@@ -306,8 +305,8 @@ _cdns_xfer_msg(struct sdw_cdns *cdns, struct sdw_msg *msg, int cmd,</div><div class='ctx'> 	return cdns_fill_msg_resp(cdns, msg, count, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum sdw_command_response cdns_program_scp_addr(</div><div class='del'>-			struct sdw_cdns *cdns, struct sdw_msg *msg)</div><div class='add'>+static enum sdw_command_response</div><div class='add'>+cdns_program_scp_addr(struct sdw_cdns *cdns, struct sdw_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> 	int nack = 0, no_ack = 0;</div><div class='ctx'> 	unsigned long time;</div><div class='hunk'>@@ -336,7 +335,7 @@ static enum sdw_command_response cdns_program_scp_addr(</div><div class='ctx'> 	cdns_writel(cdns, base, data[1]);</div><div class='ctx'> </div><div class='ctx'> 	time = wait_for_completion_timeout(&amp;cdns-&gt;tx_complete,</div><div class='del'>-				msecs_to_jiffies(CDNS_TX_TIMEOUT));</div><div class='add'>+					   msecs_to_jiffies(CDNS_TX_TIMEOUT));</div><div class='ctx'> 	if (!time) {</div><div class='ctx'> 		dev_err(cdns-&gt;dev, "SCP Msg trf timed out\n");</div><div class='ctx'> 		msg-&gt;len = 0;</div><div class='hunk'>@@ -347,10 +346,10 @@ static enum sdw_command_response cdns_program_scp_addr(</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		if (!(cdns-&gt;response_buf[i] &amp; CDNS_MCP_RESP_ACK)) {</div><div class='ctx'> 			no_ack = 1;</div><div class='del'>-			dev_err(cdns-&gt;dev, "Program SCP Ack not received");</div><div class='add'>+			dev_err(cdns-&gt;dev, "Program SCP Ack not received\n");</div><div class='ctx'> 			if (cdns-&gt;response_buf[i] &amp; CDNS_MCP_RESP_NACK) {</div><div class='ctx'> 				nack = 1;</div><div class='del'>-				dev_err(cdns-&gt;dev, "Program SCP NACK received");</div><div class='add'>+				dev_err(cdns-&gt;dev, "Program SCP NACK received\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -358,11 +357,11 @@ static enum sdw_command_response cdns_program_scp_addr(</div><div class='ctx'> 	/* For NACK, NO ack, don't return err if we are in Broadcast mode */</div><div class='ctx'> 	if (nack) {</div><div class='ctx'> 		dev_err(cdns-&gt;dev,</div><div class='del'>-			"SCP_addrpage NACKed for Slave %d", msg-&gt;dev_num);</div><div class='add'>+			"SCP_addrpage NACKed for Slave %d\n", msg-&gt;dev_num);</div><div class='ctx'> 		return SDW_CMD_FAIL;</div><div class='ctx'> 	} else if (no_ack) {</div><div class='ctx'> 		dev_dbg(cdns-&gt;dev,</div><div class='del'>-			"SCP_addrpage ignored for Slave %d", msg-&gt;dev_num);</div><div class='add'>+			"SCP_addrpage ignored for Slave %d\n", msg-&gt;dev_num);</div><div class='ctx'> 		return SDW_CMD_IGNORED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -410,7 +409,7 @@ cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; msg-&gt;len / CDNS_MCP_CMD_LEN; i++) {</div><div class='ctx'> 		ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,</div><div class='del'>-				CDNS_MCP_CMD_LEN, false);</div><div class='add'>+				     CDNS_MCP_CMD_LEN, false);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -419,7 +418,7 @@ cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,</div><div class='del'>-			msg-&gt;len % CDNS_MCP_CMD_LEN, false);</div><div class='add'>+			     msg-&gt;len % CDNS_MCP_CMD_LEN, false);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -428,7 +427,7 @@ EXPORT_SYMBOL(cdns_xfer_msg);</div><div class='ctx'> </div><div class='ctx'> enum sdw_command_response</div><div class='ctx'> cdns_xfer_msg_defer(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_msg *msg, struct sdw_defer *defer)</div><div class='add'>+		    struct sdw_msg *msg, struct sdw_defer *defer)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = bus_to_cdns(bus);</div><div class='ctx'> 	int cmd = 0, ret;</div><div class='hunk'>@@ -483,7 +482,7 @@ static void cdns_read_response(struct sdw_cdns *cdns)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cdns_update_slave_status(struct sdw_cdns *cdns,</div><div class='del'>-					u32 slave0, u32 slave1)</div><div class='add'>+				    u32 slave0, u32 slave1)</div><div class='ctx'> {</div><div class='ctx'> 	enum sdw_slave_status status[SDW_MAX_DEVICES + 1];</div><div class='ctx'> 	bool is_slave = false;</div><div class='hunk'>@@ -526,8 +525,8 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,</div><div class='ctx'> 		/* first check if Slave reported multiple status */</div><div class='ctx'> 		if (set_status &gt; 1) {</div><div class='ctx'> 			dev_warn(cdns-&gt;dev,</div><div class='del'>-					"Slave reported multiple Status: %d\n",</div><div class='del'>-					status[i]);</div><div class='add'>+				 "Slave reported multiple Status: %d\n",</div><div class='add'>+				 status[i]);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * TODO: we need to reread the status here by</div><div class='ctx'> 			 * issuing a PING cmd</div><div class='hunk'>@@ -566,15 +565,15 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		if (cdns-&gt;defer) {</div><div class='ctx'> 			cdns_fill_msg_resp(cdns, cdns-&gt;defer-&gt;msg,</div><div class='del'>-					cdns-&gt;defer-&gt;length, 0);</div><div class='add'>+					   cdns-&gt;defer-&gt;length, 0);</div><div class='ctx'> 			complete(&amp;cdns-&gt;defer-&gt;complete);</div><div class='ctx'> 			cdns-&gt;defer = NULL;</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='ctx'> 			complete(&amp;cdns-&gt;tx_complete);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (int_status &amp; CDNS_MCP_INT_CTRL_CLASH) {</div><div class='del'>-</div><div class='ctx'> 		/* Slave is driving bit slot during control word */</div><div class='ctx'> 		dev_err_ratelimited(cdns-&gt;dev, "Bus clash for control word\n");</div><div class='ctx'> 		int_status |= CDNS_MCP_INT_CTRL_CLASH;</div><div class='hunk'>@@ -592,7 +591,7 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)</div><div class='ctx'> 	if (int_status &amp; CDNS_MCP_INT_SLAVE_MASK) {</div><div class='ctx'> 		/* Mask the Slave interrupt and wake thread */</div><div class='ctx'> 		cdns_updatel(cdns, CDNS_MCP_INTMASK,</div><div class='del'>-				CDNS_MCP_INT_SLAVE_MASK, 0);</div><div class='add'>+			     CDNS_MCP_INT_SLAVE_MASK, 0);</div><div class='ctx'> </div><div class='ctx'> 		int_status &amp;= ~CDNS_MCP_INT_SLAVE_MASK;</div><div class='ctx'> 		ret = IRQ_WAKE_THREAD;</div><div class='hunk'>@@ -625,7 +624,7 @@ irqreturn_t sdw_cdns_thread(int irq, void *dev_id)</div><div class='ctx'> 	/* clear and unmask Slave interrupt now */</div><div class='ctx'> 	cdns_writel(cdns, CDNS_MCP_INTSTAT, CDNS_MCP_INT_SLAVE_MASK);</div><div class='ctx'> 	cdns_updatel(cdns, CDNS_MCP_INTMASK,</div><div class='del'>-			CDNS_MCP_INT_SLAVE_MASK, CDNS_MCP_INT_SLAVE_MASK);</div><div class='add'>+		     CDNS_MCP_INT_SLAVE_MASK, CDNS_MCP_INT_SLAVE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -639,9 +638,9 @@ static int _cdns_enable_interrupt(struct sdw_cdns *cdns)</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> </div><div class='ctx'> 	cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK0,</div><div class='del'>-				CDNS_MCP_SLAVE_INTMASK0_MASK);</div><div class='add'>+		    CDNS_MCP_SLAVE_INTMASK0_MASK);</div><div class='ctx'> 	cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK1,</div><div class='del'>-				CDNS_MCP_SLAVE_INTMASK1_MASK);</div><div class='add'>+		    CDNS_MCP_SLAVE_INTMASK1_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mask = CDNS_MCP_INT_SLAVE_RSVD | CDNS_MCP_INT_SLAVE_ALERT |</div><div class='ctx'> 		CDNS_MCP_INT_SLAVE_ATTACH | CDNS_MCP_INT_SLAVE_NATTACH |</div><div class='hunk'>@@ -663,17 +662,17 @@ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns)</div><div class='ctx'> </div><div class='ctx'> 	_cdns_enable_interrupt(cdns);</div><div class='ctx'> 	ret = cdns_clear_bit(cdns, CDNS_MCP_CONFIG_UPDATE,</div><div class='del'>-			CDNS_MCP_CONFIG_UPDATE_BIT);</div><div class='add'>+			     CDNS_MCP_CONFIG_UPDATE_BIT);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(cdns-&gt;dev, "Config update timedout");</div><div class='add'>+		dev_err(cdns-&gt;dev, "Config update timedout\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sdw_cdns_enable_interrupt);</div><div class='ctx'> </div><div class='ctx'> static int cdns_allocate_pdi(struct sdw_cdns *cdns,</div><div class='del'>-			struct sdw_cdns_pdi **stream,</div><div class='del'>-			u32 num, u32 pdi_offset)</div><div class='add'>+			     struct sdw_cdns_pdi **stream,</div><div class='add'>+			     u32 num, u32 pdi_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns_pdi *pdi;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -701,7 +700,7 @@ static int cdns_allocate_pdi(struct sdw_cdns *cdns,</div><div class='ctx'>  * @config: Stream configurations</div><div class='ctx'>  */</div><div class='ctx'> int sdw_cdns_pdi_init(struct sdw_cdns *cdns,</div><div class='del'>-			struct sdw_cdns_stream_config config)</div><div class='add'>+		      struct sdw_cdns_stream_config config)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns_streams *stream;</div><div class='ctx'> 	int offset, i, ret;</div><div class='hunk'>@@ -770,7 +769,7 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns,</div><div class='ctx'> 	cdns-&gt;num_ports += stream-&gt;num_pdi;</div><div class='ctx'> </div><div class='ctx'> 	cdns-&gt;ports = devm_kcalloc(cdns-&gt;dev, cdns-&gt;num_ports,</div><div class='del'>-				sizeof(*cdns-&gt;ports), GFP_KERNEL);</div><div class='add'>+				   sizeof(*cdns-&gt;ports), GFP_KERNEL);</div><div class='ctx'> 	if (!cdns-&gt;ports) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -796,7 +795,7 @@ int sdw_cdns_init(struct sdw_cdns *cdns)</div><div class='ctx'> </div><div class='ctx'> 	/* Exit clock stop */</div><div class='ctx'> 	ret = cdns_clear_bit(cdns, CDNS_MCP_CONTROL,</div><div class='del'>-			CDNS_MCP_CONTROL_CLK_STOP_CLR);</div><div class='add'>+			     CDNS_MCP_CONTROL_CLK_STOP_CLR);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(cdns-&gt;dev, "Couldn't exit from clock stop\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -816,7 +815,7 @@ int sdw_cdns_init(struct sdw_cdns *cdns)</div><div class='ctx'> </div><div class='ctx'> 	/* Set cmd accept mode */</div><div class='ctx'> 	cdns_updatel(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CMD_ACCEPT,</div><div class='del'>-					CDNS_MCP_CONTROL_CMD_ACCEPT);</div><div class='add'>+		     CDNS_MCP_CONTROL_CMD_ACCEPT);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure mcp config */</div><div class='ctx'> 	val = cdns_readl(cdns, CDNS_MCP_CONFIG);</div><div class='hunk'>@@ -853,7 +852,7 @@ int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params)</div><div class='ctx'> 	int divider;</div><div class='ctx'> </div><div class='ctx'> 	if (!params-&gt;curr_dr_freq) {</div><div class='del'>-		dev_err(cdns-&gt;dev, "NULL curr_dr_freq");</div><div class='add'>+		dev_err(cdns-&gt;dev, "NULL curr_dr_freq\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -873,7 +872,7 @@ int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params)</div><div class='ctx'> EXPORT_SYMBOL(cdns_bus_conf);</div><div class='ctx'> </div><div class='ctx'> static int cdns_port_params(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_port_params *p_params, unsigned int bank)</div><div class='add'>+			    struct sdw_port_params *p_params, unsigned int bank)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = bus_to_cdns(bus);</div><div class='ctx'> 	int dpn_config = 0, dpn_config_off;</div><div class='hunk'>@@ -898,8 +897,8 @@ static int cdns_port_params(struct sdw_bus *bus,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cdns_transport_params(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_transport_params *t_params,</div><div class='del'>-			enum sdw_reg_bank bank)</div><div class='add'>+				 struct sdw_transport_params *t_params,</div><div class='add'>+				 enum sdw_reg_bank bank)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = bus_to_cdns(bus);</div><div class='ctx'> 	int dpn_offsetctrl = 0, dpn_offsetctrl_off;</div><div class='hunk'>@@ -952,7 +951,7 @@ static int cdns_transport_params(struct sdw_bus *bus,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cdns_port_enable(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_enable_ch *enable_ch, unsigned int bank)</div><div class='add'>+			    struct sdw_enable_ch *enable_ch, unsigned int bank)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = bus_to_cdns(bus);</div><div class='ctx'> 	int dpn_chnen_off, ch_mask;</div><div class='hunk'>@@ -988,7 +987,7 @@ int sdw_cdns_probe(struct sdw_cdns *cdns)</div><div class='ctx'> EXPORT_SYMBOL(sdw_cdns_probe);</div><div class='ctx'> </div><div class='ctx'> int cdns_set_sdw_stream(struct snd_soc_dai *dai,</div><div class='del'>-		void *stream, bool pcm, int direction)</div><div class='add'>+			void *stream, bool pcm, int direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);</div><div class='ctx'> 	struct sdw_cdns_dma_data *dma;</div><div class='hunk'>@@ -1026,12 +1025,13 @@ EXPORT_SYMBOL(cdns_set_sdw_stream);</div><div class='ctx'>  * Find and return a free PDI for a given PDI array</div><div class='ctx'>  */</div><div class='ctx'> static struct sdw_cdns_pdi *cdns_find_pdi(struct sdw_cdns *cdns,</div><div class='del'>-		unsigned int num, struct sdw_cdns_pdi *pdi)</div><div class='add'>+					  unsigned int num,</div><div class='add'>+					  struct sdw_cdns_pdi *pdi)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		if (pdi[i].assigned == true)</div><div class='add'>+		if (pdi[i].assigned)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		pdi[i].assigned = true;</div><div class='ctx'> 		return &amp;pdi[i];</div><div class='hunk'>@@ -1050,8 +1050,8 @@ static struct sdw_cdns_pdi *cdns_find_pdi(struct sdw_cdns *cdns,</div><div class='ctx'>  * @pdi: PDI to be used</div><div class='ctx'>  */</div><div class='ctx'> void sdw_cdns_config_stream(struct sdw_cdns *cdns,</div><div class='del'>-				struct sdw_cdns_port *port,</div><div class='del'>-				u32 ch, u32 dir, struct sdw_cdns_pdi *pdi)</div><div class='add'>+			    struct sdw_cdns_port *port,</div><div class='add'>+			    u32 ch, u32 dir, struct sdw_cdns_pdi *pdi)</div><div class='ctx'> {</div><div class='ctx'> 	u32 offset, val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1076,13 +1076,13 @@ EXPORT_SYMBOL(sdw_cdns_config_stream);</div><div class='ctx'>  * @ch_count: Channel count</div><div class='ctx'>  */</div><div class='ctx'> static int cdns_get_num_pdi(struct sdw_cdns *cdns,</div><div class='del'>-		struct sdw_cdns_pdi *pdi,</div><div class='del'>-		unsigned int num, u32 ch_count)</div><div class='add'>+			    struct sdw_cdns_pdi *pdi,</div><div class='add'>+			    unsigned int num, u32 ch_count)</div><div class='ctx'> {</div><div class='ctx'> 	int i, pdis = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		if (pdi[i].assigned == true)</div><div class='add'>+		if (pdi[i].assigned)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (pdi[i].ch_count &lt; ch_count)</div><div class='hunk'>@@ -1139,8 +1139,8 @@ EXPORT_SYMBOL(sdw_cdns_get_stream);</div><div class='ctx'>  * @dir: Data direction</div><div class='ctx'>  */</div><div class='ctx'> int sdw_cdns_alloc_stream(struct sdw_cdns *cdns,</div><div class='del'>-			struct sdw_cdns_streams *stream,</div><div class='del'>-			struct sdw_cdns_port *port, u32 ch, u32 dir)</div><div class='add'>+			  struct sdw_cdns_streams *stream,</div><div class='add'>+			  struct sdw_cdns_port *port, u32 ch, u32 dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns_pdi *pdi = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1167,7 +1167,7 @@ int sdw_cdns_alloc_stream(struct sdw_cdns *cdns,</div><div class='ctx'> EXPORT_SYMBOL(sdw_cdns_alloc_stream);</div><div class='ctx'> </div><div class='ctx'> void sdw_cdns_shutdown(struct snd_pcm_substream *substream,</div><div class='del'>-					struct snd_soc_dai *dai)</div><div class='add'>+		       struct snd_soc_dai *dai)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns_dma_data *dma;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h<br/>index eb902b19c5a4..fe2af62958b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/cadence_master.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/cadence_master.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/cadence_master.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/cadence_master.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'>-// Copyright(c) 2015-17 Intel Corporation.</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */</div><div class='add'>+/* Copyright(c) 2015-17 Intel Corporation. */</div><div class='ctx'> #include &lt;sound/soc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __SDW_CADENCE_H</div><div class='hunk'>@@ -160,24 +160,24 @@ irqreturn_t sdw_cdns_thread(int irq, void *dev_id);</div><div class='ctx'> </div><div class='ctx'> int sdw_cdns_init(struct sdw_cdns *cdns);</div><div class='ctx'> int sdw_cdns_pdi_init(struct sdw_cdns *cdns,</div><div class='del'>-			struct sdw_cdns_stream_config config);</div><div class='add'>+		      struct sdw_cdns_stream_config config);</div><div class='ctx'> int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns);</div><div class='ctx'> </div><div class='ctx'> int sdw_cdns_get_stream(struct sdw_cdns *cdns,</div><div class='ctx'> 			struct sdw_cdns_streams *stream,</div><div class='ctx'> 			u32 ch, u32 dir);</div><div class='ctx'> int sdw_cdns_alloc_stream(struct sdw_cdns *cdns,</div><div class='del'>-			struct sdw_cdns_streams *stream,</div><div class='del'>-			struct sdw_cdns_port *port, u32 ch, u32 dir);</div><div class='add'>+			  struct sdw_cdns_streams *stream,</div><div class='add'>+			  struct sdw_cdns_port *port, u32 ch, u32 dir);</div><div class='ctx'> void sdw_cdns_config_stream(struct sdw_cdns *cdns, struct sdw_cdns_port *port,</div><div class='del'>-			u32 ch, u32 dir, struct sdw_cdns_pdi *pdi);</div><div class='add'>+			    u32 ch, u32 dir, struct sdw_cdns_pdi *pdi);</div><div class='ctx'> </div><div class='ctx'> void sdw_cdns_shutdown(struct snd_pcm_substream *substream,</div><div class='del'>-				struct snd_soc_dai *dai);</div><div class='add'>+		       struct snd_soc_dai *dai);</div><div class='ctx'> int sdw_cdns_pcm_set_stream(struct snd_soc_dai *dai,</div><div class='del'>-				void *stream, int direction);</div><div class='add'>+			    void *stream, int direction);</div><div class='ctx'> int sdw_cdns_pdm_set_stream(struct snd_soc_dai *dai,</div><div class='del'>-				void *stream, int direction);</div><div class='add'>+			    void *stream, int direction);</div><div class='ctx'> </div><div class='ctx'> enum sdw_command_response</div><div class='ctx'> cdns_reset_page_addr(struct sdw_bus *bus, unsigned int dev_num);</div><div class='hunk'>@@ -187,7 +187,7 @@ cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg);</div><div class='ctx'> </div><div class='ctx'> enum sdw_command_response</div><div class='ctx'> cdns_xfer_msg_defer(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_msg *msg, struct sdw_defer *defer);</div><div class='add'>+		    struct sdw_msg *msg, struct sdw_defer *defer);</div><div class='ctx'> </div><div class='ctx'> enum sdw_command_response</div><div class='ctx'> cdns_reset_page_addr(struct sdw_bus *bus, unsigned int dev_num);</div><div class='hunk'>@@ -195,5 +195,5 @@ cdns_reset_page_addr(struct sdw_bus *bus, unsigned int dev_num);</div><div class='ctx'> int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params);</div><div class='ctx'> </div><div class='ctx'> int cdns_set_sdw_stream(struct snd_soc_dai *dai,</div><div class='del'>-		void *stream, bool pcm, int direction);</div><div class='add'>+			void *stream, bool pcm, int direction);</div><div class='ctx'> #endif /* __SDW_CADENCE_H */</div><div class='head'>diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c<br/>index fd8d034cfec1..31336b0271b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/intel.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/intel.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/intel.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/intel.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#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='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='hunk'>@@ -23,18 +24,18 @@</div><div class='ctx'> #define SDW_SHIM_IPPTR			0x8</div><div class='ctx'> #define SDW_SHIM_SYNC			0xC</div><div class='ctx'> </div><div class='del'>-#define SDW_SHIM_CTLSCAP(x)		(0x010 + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_CTLS0CM(x)		(0x012 + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_CTLS1CM(x)		(0x014 + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_CTLS2CM(x)		(0x016 + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_CTLS3CM(x)		(0x018 + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_PCMSCAP(x)		(0x020 + 0x60 * x)</div><div class='add'>+#define SDW_SHIM_CTLSCAP(x)		(0x010 + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_CTLS0CM(x)		(0x012 + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_CTLS1CM(x)		(0x014 + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_CTLS2CM(x)		(0x016 + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_CTLS3CM(x)		(0x018 + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_PCMSCAP(x)		(0x020 + 0x60 * (x))</div><div class='ctx'> </div><div class='del'>-#define SDW_SHIM_PCMSYCHM(x, y)		(0x022 + (0x60 * x) + (0x2 * y))</div><div class='del'>-#define SDW_SHIM_PCMSYCHC(x, y)		(0x042 + (0x60 * x) + (0x2 * y))</div><div class='del'>-#define SDW_SHIM_PDMSCAP(x)		(0x062 + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_IOCTL(x)		(0x06C + 0x60 * x)</div><div class='del'>-#define SDW_SHIM_CTMCTL(x)		(0x06E + 0x60 * x)</div><div class='add'>+#define SDW_SHIM_PCMSYCHM(x, y)		(0x022 + (0x60 * (x)) + (0x2 * (y)))</div><div class='add'>+#define SDW_SHIM_PCMSYCHC(x, y)		(0x042 + (0x60 * (x)) + (0x2 * (y)))</div><div class='add'>+#define SDW_SHIM_PDMSCAP(x)		(0x062 + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_IOCTL(x)		(0x06C + 0x60 * (x))</div><div class='add'>+#define SDW_SHIM_CTMCTL(x)		(0x06E + 0x60 * (x))</div><div class='ctx'> </div><div class='ctx'> #define SDW_SHIM_WAKEEN			0x190</div><div class='ctx'> #define SDW_SHIM_WAKESTS		0x192</div><div class='hunk'>@@ -81,7 +82,7 @@</div><div class='ctx'> #define SDW_SHIM_WAKESTS_STATUS		BIT(0)</div><div class='ctx'> </div><div class='ctx'> /* Intel ALH Register definitions */</div><div class='del'>-#define SDW_ALH_STRMZCFG(x)		(0x000 + (0x4 * x))</div><div class='add'>+#define SDW_ALH_STRMZCFG(x)		(0x000 + (0x4 * (x)))</div><div class='ctx'> </div><div class='ctx'> #define SDW_ALH_STRMZCFG_DMAT_VAL	0x3</div><div class='ctx'> #define SDW_ALH_STRMZCFG_DMAT		GENMASK(7, 0)</div><div class='hunk'>@@ -235,9 +236,9 @@ static int intel_shim_init(struct sdw_intel *sdw)</div><div class='ctx'> 	/* Set SyncCPU bit */</div><div class='ctx'> 	sync_reg |= SDW_SHIM_SYNC_SYNCCPU;</div><div class='ctx'> 	ret = intel_clear_bit(shim, SDW_SHIM_SYNC, sync_reg,</div><div class='del'>-				SDW_SHIM_SYNC_SYNCCPU);</div><div class='add'>+			      SDW_SHIM_SYNC_SYNCCPU);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(sdw-&gt;cdns.dev, "Failed to set sync period: %d", ret);</div><div class='add'>+		dev_err(sdw-&gt;cdns.dev, "Failed to set sync period: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -246,7 +247,7 @@ static int intel_shim_init(struct sdw_intel *sdw)</div><div class='ctx'>  * PDI routines</div><div class='ctx'>  */</div><div class='ctx'> static void intel_pdi_init(struct sdw_intel *sdw,</div><div class='del'>-			struct sdw_cdns_stream_config *config)</div><div class='add'>+			   struct sdw_cdns_stream_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *shim = sdw-&gt;res-&gt;shim;</div><div class='ctx'> 	unsigned int link_id = sdw-&gt;instance;</div><div class='hunk'>@@ -295,9 +296,9 @@ intel_pdi_get_ch_cap(struct sdw_intel *sdw, unsigned int pdi_num, bool pcm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_pdi_get_ch_update(struct sdw_intel *sdw,</div><div class='del'>-				struct sdw_cdns_pdi *pdi,</div><div class='del'>-				unsigned int num_pdi,</div><div class='del'>-				unsigned int *num_ch, bool pcm)</div><div class='add'>+				   struct sdw_cdns_pdi *pdi,</div><div class='add'>+				   unsigned int num_pdi,</div><div class='add'>+				   unsigned int *num_ch, bool pcm)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ch_count = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -312,16 +313,16 @@ static int intel_pdi_get_ch_update(struct sdw_intel *sdw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_pdi_stream_ch_update(struct sdw_intel *sdw,</div><div class='del'>-				struct sdw_cdns_streams *stream, bool pcm)</div><div class='add'>+				      struct sdw_cdns_streams *stream, bool pcm)</div><div class='ctx'> {</div><div class='ctx'> 	intel_pdi_get_ch_update(sdw, stream-&gt;bd, stream-&gt;num_bd,</div><div class='del'>-			&amp;stream-&gt;num_ch_bd, pcm);</div><div class='add'>+				&amp;stream-&gt;num_ch_bd, pcm);</div><div class='ctx'> </div><div class='ctx'> 	intel_pdi_get_ch_update(sdw, stream-&gt;in, stream-&gt;num_in,</div><div class='del'>-			&amp;stream-&gt;num_ch_in, pcm);</div><div class='add'>+				&amp;stream-&gt;num_ch_in, pcm);</div><div class='ctx'> </div><div class='ctx'> 	intel_pdi_get_ch_update(sdw, stream-&gt;out, stream-&gt;num_out,</div><div class='del'>-			&amp;stream-&gt;num_ch_out, pcm);</div><div class='add'>+				&amp;stream-&gt;num_ch_out, pcm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -386,9 +387,9 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_config_stream(struct sdw_intel *sdw,</div><div class='del'>-			struct snd_pcm_substream *substream,</div><div class='del'>-			struct snd_soc_dai *dai,</div><div class='del'>-			struct snd_pcm_hw_params *hw_params, int link_id)</div><div class='add'>+			       struct snd_pcm_substream *substream,</div><div class='add'>+			       struct snd_soc_dai *dai,</div><div class='add'>+			       struct snd_pcm_hw_params *hw_params, int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	if (sdw-&gt;res-&gt;ops &amp;&amp; sdw-&gt;res-&gt;ops-&gt;config_stream)</div><div class='ctx'> 		return sdw-&gt;res-&gt;ops-&gt;config_stream(sdw-&gt;res-&gt;arg,</div><div class='hunk'>@@ -453,9 +454,9 @@ static int intel_post_bank_switch(struct sdw_bus *bus)</div><div class='ctx'> 	sync_reg |= SDW_SHIM_SYNC_SYNCGO;</div><div class='ctx'> </div><div class='ctx'> 	ret = intel_clear_bit(shim, SDW_SHIM_SYNC, sync_reg,</div><div class='del'>-					SDW_SHIM_SYNC_SYNCGO);</div><div class='add'>+			      SDW_SHIM_SYNC_SYNCGO);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(sdw-&gt;cdns.dev, "Post bank switch failed: %d", ret);</div><div class='add'>+		dev_err(sdw-&gt;cdns.dev, "Post bank switch failed: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -465,14 +466,14 @@ static int intel_post_bank_switch(struct sdw_bus *bus)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct sdw_cdns_port *intel_alloc_port(struct sdw_intel *sdw,</div><div class='del'>-				u32 ch, u32 dir, bool pcm)</div><div class='add'>+					      u32 ch, u32 dir, bool pcm)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = &amp;sdw-&gt;cdns;</div><div class='ctx'> 	struct sdw_cdns_port *port = NULL;</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cdns-&gt;num_ports; i++) {</div><div class='del'>-		if (cdns-&gt;ports[i].assigned == true)</div><div class='add'>+		if (cdns-&gt;ports[i].assigned)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		port = &amp;cdns-&gt;ports[i];</div><div class='hunk'>@@ -525,8 +526,8 @@ static void intel_port_cleanup(struct sdw_cdns_dma_data *dma)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				struct snd_pcm_hw_params *params,</div><div class='del'>-				struct snd_soc_dai *dai)</div><div class='add'>+			   struct snd_pcm_hw_params *params,</div><div class='add'>+			   struct snd_soc_dai *dai)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);</div><div class='ctx'> 	struct sdw_intel *sdw = cdns_to_intel(cdns);</div><div class='hunk'>@@ -555,7 +556,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dma-&gt;nr_ports) {</div><div class='del'>-		dev_err(dai-&gt;dev, "ports/resources not available");</div><div class='add'>+		dev_err(dai-&gt;dev, "ports/resources not available\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -574,7 +575,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	/* Inform DSP about PDI stream number */</div><div class='ctx'> 	for (i = 0; i &lt; dma-&gt;nr_ports; i++) {</div><div class='ctx'> 		ret = intel_config_stream(sdw, substream, dai, params,</div><div class='del'>-				dma-&gt;port[i]-&gt;pdi-&gt;intel_alh_id);</div><div class='add'>+					  dma-&gt;port[i]-&gt;pdi-&gt;intel_alh_id);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto port_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -604,9 +605,9 @@ static int intel_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_stream_add_master(&amp;cdns-&gt;bus, &amp;sconfig,</div><div class='del'>-				pconfig, dma-&gt;nr_ports, dma-&gt;stream);</div><div class='add'>+				    pconfig, dma-&gt;nr_ports, dma-&gt;stream);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(cdns-&gt;dev, "add master to stream failed:%d", ret);</div><div class='add'>+		dev_err(cdns-&gt;dev, "add master to stream failed:%d\n", ret);</div><div class='ctx'> 		goto stream_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -634,8 +635,8 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_stream_remove_master(&amp;cdns-&gt;bus, dma-&gt;stream);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(dai-&gt;dev, "remove master from stream %s failed: %d",</div><div class='del'>-							dma-&gt;stream-&gt;name, ret);</div><div class='add'>+		dev_err(dai-&gt;dev, "remove master from stream %s failed: %d\n",</div><div class='add'>+			dma-&gt;stream-&gt;name, ret);</div><div class='ctx'> </div><div class='ctx'> 	intel_port_cleanup(dma);</div><div class='ctx'> 	kfree(dma-&gt;port);</div><div class='hunk'>@@ -643,13 +644,13 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_pcm_set_sdw_stream(struct snd_soc_dai *dai,</div><div class='del'>-					void *stream, int direction)</div><div class='add'>+				    void *stream, int direction)</div><div class='ctx'> {</div><div class='ctx'> 	return cdns_set_sdw_stream(dai, stream, true, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_pdm_set_sdw_stream(struct snd_soc_dai *dai,</div><div class='del'>-					void *stream, int direction)</div><div class='add'>+				    void *stream, int direction)</div><div class='ctx'> {</div><div class='ctx'> 	return cdns_set_sdw_stream(dai, stream, false, direction);</div><div class='ctx'> }</div><div class='hunk'>@@ -673,9 +674,9 @@ static const struct snd_soc_component_driver dai_component = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int intel_create_dai(struct sdw_cdns *cdns,</div><div class='del'>-			struct snd_soc_dai_driver *dais,</div><div class='del'>-			enum intel_pdi_type type,</div><div class='del'>-			u32 num, u32 off, u32 max_ch, bool pcm)</div><div class='add'>+			    struct snd_soc_dai_driver *dais,</div><div class='add'>+			    enum intel_pdi_type type,</div><div class='add'>+			    u32 num, u32 off, u32 max_ch, bool pcm)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -685,14 +686,14 @@ static int intel_create_dai(struct sdw_cdns *cdns,</div><div class='ctx'> 	 /* TODO: Read supported rates/formats from hardware */</div><div class='ctx'> 	for (i = off; i &lt; (off + num); i++) {</div><div class='ctx'> 		dais[i].name = kasprintf(GFP_KERNEL, "SDW%d Pin%d",</div><div class='del'>-					cdns-&gt;instance, i);</div><div class='add'>+					 cdns-&gt;instance, i);</div><div class='ctx'> 		if (!dais[i].name)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		if (type == INTEL_PDI_BD || type == INTEL_PDI_OUT) {</div><div class='del'>-			dais[i].playback.stream_name = kasprintf(GFP_KERNEL,</div><div class='del'>-							"SDW%d Tx%d",</div><div class='del'>-							cdns-&gt;instance, i);</div><div class='add'>+			dais[i].playback.stream_name =</div><div class='add'>+				kasprintf(GFP_KERNEL, "SDW%d Tx%d",</div><div class='add'>+					  cdns-&gt;instance, i);</div><div class='ctx'> 			if (!dais[i].playback.stream_name) {</div><div class='ctx'> 				kfree(dais[i].name);</div><div class='ctx'> 				return -ENOMEM;</div><div class='hunk'>@@ -705,9 +706,9 @@ static int intel_create_dai(struct sdw_cdns *cdns,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (type == INTEL_PDI_BD || type == INTEL_PDI_IN) {</div><div class='del'>-			dais[i].capture.stream_name = kasprintf(GFP_KERNEL,</div><div class='del'>-							"SDW%d Rx%d",</div><div class='del'>-							cdns-&gt;instance, i);</div><div class='add'>+			dais[i].capture.stream_name =</div><div class='add'>+				kasprintf(GFP_KERNEL, "SDW%d Rx%d",</div><div class='add'>+					  cdns-&gt;instance, i);</div><div class='ctx'> 			if (!dais[i].capture.stream_name) {</div><div class='ctx'> 				kfree(dais[i].name);</div><div class='ctx'> 				kfree(dais[i].playback.stream_name);</div><div class='hunk'>@@ -748,45 +749,45 @@ static int intel_register_dai(struct sdw_intel *sdw)</div><div class='ctx'> 	/* Create PCM DAIs */</div><div class='ctx'> 	stream = &amp;cdns-&gt;pcm;</div><div class='ctx'> </div><div class='del'>-	ret = intel_create_dai(cdns, dais, INTEL_PDI_IN,</div><div class='del'>-			stream-&gt;num_in, off, stream-&gt;num_ch_in, true);</div><div class='add'>+	ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, stream-&gt;num_in,</div><div class='add'>+			       off, stream-&gt;num_ch_in, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	off += cdns-&gt;pcm.num_in;</div><div class='del'>-	ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT,</div><div class='del'>-			cdns-&gt;pcm.num_out, off, stream-&gt;num_ch_out, true);</div><div class='add'>+	ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, cdns-&gt;pcm.num_out,</div><div class='add'>+			       off, stream-&gt;num_ch_out, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	off += cdns-&gt;pcm.num_out;</div><div class='del'>-	ret = intel_create_dai(cdns, dais, INTEL_PDI_BD,</div><div class='del'>-			cdns-&gt;pcm.num_bd, off, stream-&gt;num_ch_bd, true);</div><div class='add'>+	ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns-&gt;pcm.num_bd,</div><div class='add'>+			       off, stream-&gt;num_ch_bd, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Create PDM DAIs */</div><div class='ctx'> 	stream = &amp;cdns-&gt;pdm;</div><div class='ctx'> 	off += cdns-&gt;pcm.num_bd;</div><div class='del'>-	ret = intel_create_dai(cdns, dais, INTEL_PDI_IN,</div><div class='del'>-			cdns-&gt;pdm.num_in, off, stream-&gt;num_ch_in, false);</div><div class='add'>+	ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, cdns-&gt;pdm.num_in,</div><div class='add'>+			       off, stream-&gt;num_ch_in, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	off += cdns-&gt;pdm.num_in;</div><div class='del'>-	ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT,</div><div class='del'>-			cdns-&gt;pdm.num_out, off, stream-&gt;num_ch_out, false);</div><div class='add'>+	ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, cdns-&gt;pdm.num_out,</div><div class='add'>+			       off, stream-&gt;num_ch_out, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	off += cdns-&gt;pdm.num_bd;</div><div class='del'>-	ret = intel_create_dai(cdns, dais, INTEL_PDI_BD,</div><div class='del'>-			cdns-&gt;pdm.num_bd, off, stream-&gt;num_ch_bd, false);</div><div class='add'>+	ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns-&gt;pdm.num_bd,</div><div class='add'>+			       off, stream-&gt;num_ch_bd, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return snd_soc_register_component(cdns-&gt;dev, &amp;dai_component,</div><div class='del'>-				dais, num_dai);</div><div class='add'>+					  dais, num_dai);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_prop_read(struct sdw_bus *bus)</div><div class='hunk'>@@ -796,8 +797,8 @@ static int intel_prop_read(struct sdw_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	/* BIOS is not giving some values correctly. So, lets override them */</div><div class='ctx'> 	bus-&gt;prop.num_freq = 1;</div><div class='del'>-	bus-&gt;prop.freq = devm_kcalloc(bus-&gt;dev, sizeof(*bus-&gt;prop.freq),</div><div class='del'>-					bus-&gt;prop.num_freq, GFP_KERNEL);</div><div class='add'>+	bus-&gt;prop.freq = devm_kcalloc(bus-&gt;dev, bus-&gt;prop.num_freq,</div><div class='add'>+				      sizeof(*bus-&gt;prop.freq), GFP_KERNEL);</div><div class='ctx'> 	if (!bus-&gt;prop.freq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -872,19 +873,18 @@ static int intel_probe(struct platform_device *pdev)</div><div class='ctx'> 	intel_pdi_ch_update(sdw);</div><div class='ctx'> </div><div class='ctx'> 	/* Acquire IRQ */</div><div class='del'>-	ret = request_threaded_irq(sdw-&gt;res-&gt;irq, sdw_cdns_irq,</div><div class='del'>-			sdw_cdns_thread, IRQF_SHARED, KBUILD_MODNAME,</div><div class='del'>-			&amp;sdw-&gt;cdns);</div><div class='add'>+	ret = request_threaded_irq(sdw-&gt;res-&gt;irq, sdw_cdns_irq, sdw_cdns_thread,</div><div class='add'>+				   IRQF_SHARED, KBUILD_MODNAME, &amp;sdw-&gt;cdns);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(sdw-&gt;cdns.dev, "unable to grab IRQ %d, disabling device\n",</div><div class='del'>-				sdw-&gt;res-&gt;irq);</div><div class='add'>+			sdw-&gt;res-&gt;irq);</div><div class='ctx'> 		goto err_init;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register DAIs */</div><div class='ctx'> 	ret = intel_register_dai(sdw);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(sdw-&gt;cdns.dev, "DAI registration failed: %d", ret);</div><div class='add'>+		dev_err(sdw-&gt;cdns.dev, "DAI registration failed: %d\n", ret);</div><div class='ctx'> 		snd_soc_unregister_component(sdw-&gt;cdns.dev);</div><div class='ctx'> 		goto err_dai;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h<br/>index c1a5bac6212e..71050e5f643d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/intel.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/intel.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/intel.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/intel.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'>-// Copyright(c) 2015-17 Intel Corporation.</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */</div><div class='add'>+/* Copyright(c) 2015-17 Intel Corporation. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SDW_INTEL_LOCAL_H</div><div class='ctx'> #define __SDW_INTEL_LOCAL_H</div><div class='head'>diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c<br/>index 5c8a20d99878..d3d6b54c5791 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/intel_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/intel_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/intel_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/intel_init.c</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/soundwire/sdw_intel.h&gt;</div><div class='ctx'> #include "intel.h"</div><div class='hunk'>@@ -67,7 +69,7 @@ static struct sdw_intel_ctx</div><div class='ctx'> 	/* Found controller, find links supported */</div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	ret = fwnode_property_read_u8_array(acpi_fwnode_handle(adev),</div><div class='del'>-				  "mipi-sdw-master-count", &amp;count, 1);</div><div class='add'>+					    "mipi-sdw-master-count", &amp;count, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't fail on error, continue and use hw value */</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -85,7 +87,7 @@ static struct sdw_intel_ctx</div><div class='ctx'> 	/* Check count is within bounds */</div><div class='ctx'> 	if (count &gt; SDW_MAX_LINKS) {</div><div class='ctx'> 		dev_err(&amp;adev-&gt;dev, "Link count %d exceeds max %d\n",</div><div class='del'>-						count, SDW_MAX_LINKS);</div><div class='add'>+			count, SDW_MAX_LINKS);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -104,7 +106,6 @@ static struct sdw_intel_ctx</div><div class='ctx'> </div><div class='ctx'> 	/* Create SDW Master devices */</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-</div><div class='ctx'> 		link-&gt;res.irq = res-&gt;irq;</div><div class='ctx'> 		link-&gt;res.registers = res-&gt;mmio_base + SDW_LINK_BASE</div><div class='ctx'> 					+ (SDW_LINK_SIZE * i);</div><div class='hunk'>@@ -145,7 +146,7 @@ link_err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level,</div><div class='del'>-					void *cdata, void **return_value)</div><div class='add'>+				     void *cdata, void **return_value)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_intel_res *res = cdata;</div><div class='ctx'> 	struct acpi_device *adev;</div><div class='hunk'>@@ -172,9 +173,9 @@ void *sdw_intel_init(acpi_handle *parent_handle, struct sdw_intel_res *res)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_walk_namespace(ACPI_TYPE_DEVICE,</div><div class='del'>-					parent_handle, 1,</div><div class='del'>-					sdw_intel_acpi_cb,</div><div class='del'>-					NULL, res, NULL);</div><div class='add'>+				     parent_handle, 1,</div><div class='add'>+				     sdw_intel_acpi_cb,</div><div class='add'>+				     NULL, res, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c<br/>index fdeba0c3b589..c1f51d6a23d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/mipi_disco.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/mipi_disco.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/mipi_disco.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/mipi_disco.c</a></div><div class='hunk'>@@ -35,11 +35,12 @@ int sdw_master_read_prop(struct sdw_bus *bus)</div><div class='ctx'> 	int nval, i;</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(bus-&gt;dev,</div><div class='del'>-			"mipi-sdw-sw-interface-revision", &amp;prop-&gt;revision);</div><div class='add'>+				 "mipi-sdw-sw-interface-revision",</div><div class='add'>+				 &amp;prop-&gt;revision);</div><div class='ctx'> </div><div class='ctx'> 	/* Find master handle */</div><div class='ctx'> 	snprintf(name, sizeof(name),</div><div class='del'>-			"mipi-sdw-master-%d-subproperties", bus-&gt;link_id);</div><div class='add'>+		 "mipi-sdw-master-%d-subproperties", bus-&gt;link_id);</div><div class='ctx'> </div><div class='ctx'> 	link = device_get_named_child_node(bus-&gt;dev, name);</div><div class='ctx'> 	if (!link) {</div><div class='hunk'>@@ -48,23 +49,23 @@ int sdw_master_read_prop(struct sdw_bus *bus)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fwnode_property_read_bool(link,</div><div class='del'>-			"mipi-sdw-clock-stop-mode0-supported") == true)</div><div class='add'>+				      "mipi-sdw-clock-stop-mode0-supported"))</div><div class='ctx'> 		prop-&gt;clk_stop_mode = SDW_CLK_STOP_MODE0;</div><div class='ctx'> </div><div class='ctx'> 	if (fwnode_property_read_bool(link,</div><div class='del'>-			"mipi-sdw-clock-stop-mode1-supported") == true)</div><div class='add'>+				      "mipi-sdw-clock-stop-mode1-supported"))</div><div class='ctx'> 		prop-&gt;clk_stop_mode |= SDW_CLK_STOP_MODE1;</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(link,</div><div class='del'>-			"mipi-sdw-max-clock-frequency", &amp;prop-&gt;max_freq);</div><div class='add'>+				 "mipi-sdw-max-clock-frequency",</div><div class='add'>+				 &amp;prop-&gt;max_freq);</div><div class='ctx'> </div><div class='ctx'> 	nval = fwnode_property_read_u32_array(link,</div><div class='ctx'> 			"mipi-sdw-clock-frequencies-supported", NULL, 0);</div><div class='ctx'> 	if (nval &gt; 0) {</div><div class='del'>-</div><div class='ctx'> 		prop-&gt;num_freq = nval;</div><div class='ctx'> 		prop-&gt;freq = devm_kcalloc(bus-&gt;dev, prop-&gt;num_freq,</div><div class='del'>-				sizeof(*prop-&gt;freq), GFP_KERNEL);</div><div class='add'>+					  sizeof(*prop-&gt;freq), GFP_KERNEL);</div><div class='ctx'> 		if (!prop-&gt;freq)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -88,47 +89,49 @@ int sdw_master_read_prop(struct sdw_bus *bus)</div><div class='ctx'> 	nval = fwnode_property_read_u32_array(link,</div><div class='ctx'> 			"mipi-sdw-supported-clock-gears", NULL, 0);</div><div class='ctx'> 	if (nval &gt; 0) {</div><div class='del'>-</div><div class='ctx'> 		prop-&gt;num_clk_gears = nval;</div><div class='ctx'> 		prop-&gt;clk_gears = devm_kcalloc(bus-&gt;dev, prop-&gt;num_clk_gears,</div><div class='del'>-				sizeof(*prop-&gt;clk_gears), GFP_KERNEL);</div><div class='add'>+					       sizeof(*prop-&gt;clk_gears),</div><div class='add'>+					       GFP_KERNEL);</div><div class='ctx'> 		if (!prop-&gt;clk_gears)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32_array(link,</div><div class='del'>-				"mipi-sdw-supported-clock-gears",</div><div class='del'>-				prop-&gt;clk_gears, prop-&gt;num_clk_gears);</div><div class='add'>+					       "mipi-sdw-supported-clock-gears",</div><div class='add'>+					       prop-&gt;clk_gears,</div><div class='add'>+					       prop-&gt;num_clk_gears);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(link, "mipi-sdw-default-frame-rate",</div><div class='del'>-			&amp;prop-&gt;default_frame_rate);</div><div class='add'>+				 &amp;prop-&gt;default_frame_rate);</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(link, "mipi-sdw-default-frame-row-size",</div><div class='del'>-			&amp;prop-&gt;default_row);</div><div class='add'>+				 &amp;prop-&gt;default_row);</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(link, "mipi-sdw-default-frame-col-size",</div><div class='del'>-			&amp;prop-&gt;default_col);</div><div class='add'>+				 &amp;prop-&gt;default_col);</div><div class='ctx'> </div><div class='ctx'> 	prop-&gt;dynamic_frame =  fwnode_property_read_bool(link,</div><div class='ctx'> 			"mipi-sdw-dynamic-frame-shape");</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(link, "mipi-sdw-command-error-threshold",</div><div class='del'>-			&amp;prop-&gt;err_threshold);</div><div class='add'>+				 &amp;prop-&gt;err_threshold);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sdw_master_read_prop);</div><div class='ctx'> </div><div class='ctx'> static int sdw_slave_read_dp0(struct sdw_slave *slave,</div><div class='del'>-		struct fwnode_handle *port, struct sdw_dp0_prop *dp0)</div><div class='add'>+			      struct fwnode_handle *port,</div><div class='add'>+			      struct sdw_dp0_prop *dp0)</div><div class='ctx'> {</div><div class='ctx'> 	int nval;</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(port, "mipi-sdw-port-max-wordlength",</div><div class='del'>-			&amp;dp0-&gt;max_word);</div><div class='add'>+				 &amp;dp0-&gt;max_word);</div><div class='ctx'> </div><div class='ctx'> 	fwnode_property_read_u32(port, "mipi-sdw-port-min-wordlength",</div><div class='del'>-			&amp;dp0-&gt;min_word);</div><div class='add'>+				 &amp;dp0-&gt;min_word);</div><div class='ctx'> </div><div class='ctx'> 	nval = fwnode_property_read_u32_array(port,</div><div class='ctx'> 			"mipi-sdw-port-wordlength-configs", NULL, 0);</div><div class='hunk'>@@ -136,8 +139,8 @@ static int sdw_slave_read_dp0(struct sdw_slave *slave,</div><div class='ctx'> </div><div class='ctx'> 		dp0-&gt;num_words = nval;</div><div class='ctx'> 		dp0-&gt;words = devm_kcalloc(&amp;slave-&gt;dev,</div><div class='del'>-				dp0-&gt;num_words, sizeof(*dp0-&gt;words),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+					  dp0-&gt;num_words, sizeof(*dp0-&gt;words),</div><div class='add'>+					  GFP_KERNEL);</div><div class='ctx'> 		if (!dp0-&gt;words)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -146,20 +149,21 @@ static int sdw_slave_read_dp0(struct sdw_slave *slave,</div><div class='ctx'> 				dp0-&gt;words, dp0-&gt;num_words);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dp0-&gt;flow_controlled = fwnode_property_read_bool(</div><div class='del'>-			port, "mipi-sdw-bra-flow-controlled");</div><div class='add'>+	dp0-&gt;flow_controlled = fwnode_property_read_bool(port,</div><div class='add'>+				"mipi-sdw-bra-flow-controlled");</div><div class='ctx'> </div><div class='del'>-	dp0-&gt;simple_ch_prep_sm = fwnode_property_read_bool(</div><div class='del'>-			port, "mipi-sdw-simplified-channel-prepare-sm");</div><div class='add'>+	dp0-&gt;simple_ch_prep_sm = fwnode_property_read_bool(port,</div><div class='add'>+				"mipi-sdw-simplified-channel-prepare-sm");</div><div class='ctx'> </div><div class='del'>-	dp0-&gt;device_interrupts = fwnode_property_read_bool(</div><div class='del'>-			port, "mipi-sdw-imp-def-dp0-interrupts-supported");</div><div class='add'>+	dp0-&gt;device_interrupts = fwnode_property_read_bool(port,</div><div class='add'>+				"mipi-sdw-imp-def-dp0-interrupts-supported");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_slave_read_dpn(struct sdw_slave *slave,</div><div class='del'>-		struct sdw_dpn_prop *dpn, int count, int ports, char *type)</div><div class='add'>+			      struct sdw_dpn_prop *dpn, int count, int ports,</div><div class='add'>+			      char *type)</div><div class='ctx'> {</div><div class='ctx'> 	struct fwnode_handle *node;</div><div class='ctx'> 	u32 bit, i = 0;</div><div class='hunk'>@@ -173,7 +177,7 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(bit, &amp;addr, 32) {</div><div class='ctx'> 		snprintf(name, sizeof(name),</div><div class='del'>-			"mipi-sdw-dp-%d-%s-subproperties", bit, type);</div><div class='add'>+			 "mipi-sdw-dp-%d-%s-subproperties", bit, type);</div><div class='ctx'> </div><div class='ctx'> 		dpn[i].num = bit;</div><div class='ctx'> </div><div class='hunk'>@@ -184,18 +188,18 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-port-max-wordlength",</div><div class='del'>-					&amp;dpn[i].max_word);</div><div class='add'>+					 &amp;dpn[i].max_word);</div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-port-min-wordlength",</div><div class='del'>-					&amp;dpn[i].min_word);</div><div class='add'>+					 &amp;dpn[i].min_word);</div><div class='ctx'> </div><div class='ctx'> 		nval = fwnode_property_read_u32_array(node,</div><div class='ctx'> 				"mipi-sdw-port-wordlength-configs", NULL, 0);</div><div class='ctx'> 		if (nval &gt; 0) {</div><div class='del'>-</div><div class='ctx'> 			dpn[i].num_words = nval;</div><div class='ctx'> 			dpn[i].words = devm_kcalloc(&amp;slave-&gt;dev,</div><div class='del'>-					dpn[i].num_words,</div><div class='del'>-					sizeof(*dpn[i].words), GFP_KERNEL);</div><div class='add'>+						    dpn[i].num_words,</div><div class='add'>+						    sizeof(*dpn[i].words),</div><div class='add'>+						    GFP_KERNEL);</div><div class='ctx'> 			if (!dpn[i].words)</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -205,36 +209,36 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-data-port-type",</div><div class='del'>-				&amp;dpn[i].type);</div><div class='add'>+					 &amp;dpn[i].type);</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node,</div><div class='del'>-				"mipi-sdw-max-grouping-supported",</div><div class='del'>-				&amp;dpn[i].max_grouping);</div><div class='add'>+					 "mipi-sdw-max-grouping-supported",</div><div class='add'>+					 &amp;dpn[i].max_grouping);</div><div class='ctx'> </div><div class='ctx'> 		dpn[i].simple_ch_prep_sm = fwnode_property_read_bool(node,</div><div class='ctx'> 				"mipi-sdw-simplified-channelprepare-sm");</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node,</div><div class='del'>-				"mipi-sdw-port-channelprepare-timeout",</div><div class='del'>-				&amp;dpn[i].ch_prep_timeout);</div><div class='add'>+					 "mipi-sdw-port-channelprepare-timeout",</div><div class='add'>+					 &amp;dpn[i].ch_prep_timeout);</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node,</div><div class='ctx'> 				"mipi-sdw-imp-def-dpn-interrupts-supported",</div><div class='ctx'> 				&amp;dpn[i].device_interrupts);</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-min-channel-number",</div><div class='del'>-				&amp;dpn[i].min_ch);</div><div class='add'>+					 &amp;dpn[i].min_ch);</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-max-channel-number",</div><div class='del'>-				&amp;dpn[i].max_ch);</div><div class='add'>+					 &amp;dpn[i].max_ch);</div><div class='ctx'> </div><div class='ctx'> 		nval = fwnode_property_read_u32_array(node,</div><div class='ctx'> 				"mipi-sdw-channel-number-list", NULL, 0);</div><div class='ctx'> 		if (nval &gt; 0) {</div><div class='del'>-</div><div class='ctx'> 			dpn[i].num_ch = nval;</div><div class='ctx'> 			dpn[i].ch = devm_kcalloc(&amp;slave-&gt;dev, dpn[i].num_ch,</div><div class='del'>-					sizeof(*dpn[i].ch), GFP_KERNEL);</div><div class='add'>+						 sizeof(*dpn[i].ch),</div><div class='add'>+						 GFP_KERNEL);</div><div class='ctx'> 			if (!dpn[i].ch)</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +250,6 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,</div><div class='ctx'> 		nval = fwnode_property_read_u32_array(node,</div><div class='ctx'> 				"mipi-sdw-channel-combination-list", NULL, 0);</div><div class='ctx'> 		if (nval &gt; 0) {</div><div class='del'>-</div><div class='ctx'> 			dpn[i].num_ch_combinations = nval;</div><div class='ctx'> 			dpn[i].ch_combinations = devm_kcalloc(&amp;slave-&gt;dev,</div><div class='ctx'> 					dpn[i].num_ch_combinations,</div><div class='hunk'>@@ -265,13 +268,13 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,</div><div class='ctx'> 				"mipi-sdw-modes-supported", &amp;dpn[i].modes);</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-max-async-buffer",</div><div class='del'>-				&amp;dpn[i].max_async_buffer);</div><div class='add'>+					 &amp;dpn[i].max_async_buffer);</div><div class='ctx'> </div><div class='ctx'> 		dpn[i].block_pack_mode = fwnode_property_read_bool(node,</div><div class='ctx'> 				"mipi-sdw-block-packing-mode");</div><div class='ctx'> </div><div class='ctx'> 		fwnode_property_read_u32(node, "mipi-sdw-port-encoding-type",</div><div class='del'>-				&amp;dpn[i].port_encoding);</div><div class='add'>+					 &amp;dpn[i].port_encoding);</div><div class='ctx'> </div><div class='ctx'> 		/* TODO: Read audio mode */</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +296,7 @@ int sdw_slave_read_prop(struct sdw_slave *slave)</div><div class='ctx'> 	int num_of_ports, nval, i, dp0 = 0;</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev, "mipi-sdw-sw-interface-revision",</div><div class='del'>-				&amp;prop-&gt;mipi_revision);</div><div class='add'>+				 &amp;prop-&gt;mipi_revision);</div><div class='ctx'> </div><div class='ctx'> 	prop-&gt;wake_capable = device_property_read_bool(dev,</div><div class='ctx'> 				"mipi-sdw-wake-up-unavailable");</div><div class='hunk'>@@ -311,10 +314,10 @@ int sdw_slave_read_prop(struct sdw_slave *slave)</div><div class='ctx'> 			"mipi-sdw-simplified-clockstopprepare-sm-supported");</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev, "mipi-sdw-clockstopprepare-timeout",</div><div class='del'>-			&amp;prop-&gt;clk_stop_timeout);</div><div class='add'>+				 &amp;prop-&gt;clk_stop_timeout);</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev, "mipi-sdw-slave-channelprepare-timeout",</div><div class='del'>-			&amp;prop-&gt;ch_prep_timeout);</div><div class='add'>+				 &amp;prop-&gt;ch_prep_timeout);</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev,</div><div class='ctx'> 			"mipi-sdw-clockstopprepare-hard-reset-behavior",</div><div class='hunk'>@@ -333,22 +336,22 @@ int sdw_slave_read_prop(struct sdw_slave *slave)</div><div class='ctx'> 			"mipi-sdw-port15-read-behavior", &amp;prop-&gt;p15_behave);</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev, "mipi-sdw-master-count",</div><div class='del'>-				&amp;prop-&gt;master_count);</div><div class='add'>+				 &amp;prop-&gt;master_count);</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev, "mipi-sdw-source-port-list",</div><div class='del'>-				&amp;prop-&gt;source_ports);</div><div class='add'>+				 &amp;prop-&gt;source_ports);</div><div class='ctx'> </div><div class='ctx'> 	device_property_read_u32(dev, "mipi-sdw-sink-port-list",</div><div class='del'>-				&amp;prop-&gt;sink_ports);</div><div class='add'>+				 &amp;prop-&gt;sink_ports);</div><div class='ctx'> </div><div class='ctx'> 	/* Read dp0 properties */</div><div class='ctx'> 	port = device_get_named_child_node(dev, "mipi-sdw-dp-0-subproperties");</div><div class='ctx'> 	if (!port) {</div><div class='ctx'> 		dev_dbg(dev, "DP0 node not found!!\n");</div><div class='ctx'> 	} else {</div><div class='del'>-</div><div class='ctx'> 		prop-&gt;dp0_prop = devm_kzalloc(&amp;slave-&gt;dev,</div><div class='del'>-				sizeof(*prop-&gt;dp0_prop), GFP_KERNEL);</div><div class='add'>+					      sizeof(*prop-&gt;dp0_prop),</div><div class='add'>+					      GFP_KERNEL);</div><div class='ctx'> 		if (!prop-&gt;dp0_prop)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -364,23 +367,25 @@ int sdw_slave_read_prop(struct sdw_slave *slave)</div><div class='ctx'> 	/* Allocate memory for set bits in port lists */</div><div class='ctx'> 	nval = hweight32(prop-&gt;source_ports);</div><div class='ctx'> 	prop-&gt;src_dpn_prop = devm_kcalloc(&amp;slave-&gt;dev, nval,</div><div class='del'>-				sizeof(*prop-&gt;src_dpn_prop), GFP_KERNEL);</div><div class='add'>+					  sizeof(*prop-&gt;src_dpn_prop),</div><div class='add'>+					  GFP_KERNEL);</div><div class='ctx'> 	if (!prop-&gt;src_dpn_prop)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Read dpn properties for source port(s) */</div><div class='ctx'> 	sdw_slave_read_dpn(slave, prop-&gt;src_dpn_prop, nval,</div><div class='del'>-			prop-&gt;source_ports, "source");</div><div class='add'>+			   prop-&gt;source_ports, "source");</div><div class='ctx'> </div><div class='ctx'> 	nval = hweight32(prop-&gt;sink_ports);</div><div class='ctx'> 	prop-&gt;sink_dpn_prop = devm_kcalloc(&amp;slave-&gt;dev, nval,</div><div class='del'>-				sizeof(*prop-&gt;sink_dpn_prop), GFP_KERNEL);</div><div class='add'>+					   sizeof(*prop-&gt;sink_dpn_prop),</div><div class='add'>+					   GFP_KERNEL);</div><div class='ctx'> 	if (!prop-&gt;sink_dpn_prop)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Read dpn properties for sink port(s) */</div><div class='ctx'> 	sdw_slave_read_dpn(slave, prop-&gt;sink_dpn_prop, nval,</div><div class='del'>-			prop-&gt;sink_ports, "sink");</div><div class='add'>+			   prop-&gt;sink_ports, "sink");</div><div class='ctx'> </div><div class='ctx'> 	/* some ports are bidirectional so check total ports by ORing */</div><div class='ctx'> 	nval = prop-&gt;source_ports | prop-&gt;sink_ports;</div><div class='hunk'>@@ -388,7 +393,8 @@ int sdw_slave_read_prop(struct sdw_slave *slave)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate port_ready based on num_of_ports */</div><div class='ctx'> 	slave-&gt;port_ready = devm_kcalloc(&amp;slave-&gt;dev, num_of_ports,</div><div class='del'>-				sizeof(*slave-&gt;port_ready), GFP_KERNEL);</div><div class='add'>+					 sizeof(*slave-&gt;port_ready),</div><div class='add'>+					 GFP_KERNEL);</div><div class='ctx'> 	if (!slave-&gt;port_ready)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c<br/>index ac103bd0c176..f39a5815e25d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/slave.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/slave.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/slave.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/slave.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ static void sdw_slave_release(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_slave_add(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_slave_id *id, struct fwnode_handle *fwnode)</div><div class='add'>+			 struct sdw_slave_id *id, struct fwnode_handle *fwnode)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_slave *slave;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -30,8 +30,8 @@ static int sdw_slave_add(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	/* name shall be sdw:link:mfg:part:class:unique */</div><div class='ctx'> 	dev_set_name(&amp;slave-&gt;dev, "sdw:%x:%x:%x:%x:%x",</div><div class='del'>-			bus-&gt;link_id, id-&gt;mfg_id, id-&gt;part_id,</div><div class='del'>-			id-&gt;class_id, id-&gt;unique_id);</div><div class='add'>+		     bus-&gt;link_id, id-&gt;mfg_id, id-&gt;part_id,</div><div class='add'>+		     id-&gt;class_id, id-&gt;unique_id);</div><div class='ctx'> </div><div class='ctx'> 	slave-&gt;dev.release = sdw_slave_release;</div><div class='ctx'> 	slave-&gt;dev.bus = &amp;sdw_bus_type;</div><div class='hunk'>@@ -84,11 +84,11 @@ int sdw_acpi_find_slaves(struct sdw_bus *bus)</div><div class='ctx'> 		acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_evaluate_integer(adev-&gt;handle,</div><div class='del'>-					METHOD_NAME__ADR, NULL, &amp;addr);</div><div class='add'>+					       METHOD_NAME__ADR, NULL, &amp;addr);</div><div class='ctx'> </div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			dev_err(bus-&gt;dev, "_ADR resolution failed: %x\n",</div><div class='del'>-							status);</div><div class='add'>+				status);</div><div class='ctx'> 			return status;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c<br/>index bd879b1a76c8..d01060dbee96 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/stream.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/soundwire/stream.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/soundwire/stream.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/soundwire/stream.c</a></div><div class='hunk'>@@ -52,10 +52,11 @@ static int sdw_find_row_index(int row)</div><div class='ctx'> 	pr_warn("Requested row not found, selecting lowest row no: 48\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static int _sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='del'>-				struct sdw_slave *slave,</div><div class='del'>-				struct sdw_transport_params *t_params,</div><div class='del'>-				enum sdw_dpn_type type)</div><div class='add'>+					  struct sdw_slave *slave,</div><div class='add'>+					  struct sdw_transport_params *t_params,</div><div class='add'>+					  enum sdw_dpn_type type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr1, addr2, addr3, addr4;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -76,20 +77,20 @@ static int _sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 	/* Program DPN_OffsetCtrl2 registers */</div><div class='ctx'> 	ret = sdw_write(slave, addr1, t_params-&gt;offset2);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(bus-&gt;dev, "DPN_OffsetCtrl2 register write failed");</div><div class='add'>+		dev_err(bus-&gt;dev, "DPN_OffsetCtrl2 register write failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Program DPN_BlockCtrl3 register */</div><div class='ctx'> 	ret = sdw_write(slave, addr2, t_params-&gt;blk_pkg_mode);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(bus-&gt;dev, "DPN_BlockCtrl3 register write failed");</div><div class='add'>+		dev_err(bus-&gt;dev, "DPN_BlockCtrl3 register write failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Data ports are FULL, SIMPLE and REDUCED. This function handles</div><div class='del'>-	 * FULL and REDUCED only and and beyond this point only FULL is</div><div class='add'>+	 * FULL and REDUCED only and beyond this point only FULL is</div><div class='ctx'> 	 * handled, so bail out if we are not FULL data port type</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (type != SDW_DPN_FULL)</div><div class='hunk'>@@ -102,7 +103,7 @@ static int _sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_write(slave, addr3, wbuf);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(bus-&gt;dev, "DPN_SampleCtrl2 register write failed");</div><div class='add'>+		dev_err(bus-&gt;dev, "DPN_SampleCtrl2 register write failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -113,14 +114,14 @@ static int _sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	ret = sdw_write(slave, addr4, wbuf);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(bus-&gt;dev, "DPN_HCtrl register write failed");</div><div class='add'>+		dev_err(bus-&gt;dev, "DPN_HCtrl register write failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_slave_runtime *s_rt,</div><div class='del'>-			struct sdw_port_runtime *p_rt)</div><div class='add'>+					 struct sdw_slave_runtime *s_rt,</div><div class='add'>+					 struct sdw_port_runtime *p_rt)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_transport_params *t_params = &amp;p_rt-&gt;transport_params;</div><div class='ctx'> 	struct sdw_port_params *p_params = &amp;p_rt-&gt;port_params;</div><div class='hunk'>@@ -131,8 +132,8 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 	u8 wbuf;</div><div class='ctx'> </div><div class='ctx'> 	dpn_prop = sdw_get_slave_dpn_prop(s_rt-&gt;slave,</div><div class='del'>-					s_rt-&gt;direction,</div><div class='del'>-					t_params-&gt;port_num);</div><div class='add'>+					  s_rt-&gt;direction,</div><div class='add'>+					  t_params-&gt;port_num);</div><div class='ctx'> 	if (!dpn_prop)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +160,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 	ret = sdw_update(s_rt-&gt;slave, addr1, 0xF, wbuf);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-			"DPN_PortCtrl register write failed for port %d",</div><div class='add'>+			"DPN_PortCtrl register write failed for port %d\n",</div><div class='ctx'> 			t_params-&gt;port_num);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -168,7 +169,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 	ret = sdw_write(s_rt-&gt;slave, addr2, (p_params-&gt;bps - 1));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-			"DPN_BlockCtrl1 register write failed for port %d",</div><div class='add'>+			"DPN_BlockCtrl1 register write failed for port %d\n",</div><div class='ctx'> 			t_params-&gt;port_num);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -178,7 +179,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 	ret = sdw_write(s_rt-&gt;slave, addr3, wbuf);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-			"DPN_SampleCtrl1 register write failed for port %d",</div><div class='add'>+			"DPN_SampleCtrl1 register write failed for port %d\n",</div><div class='ctx'> 			t_params-&gt;port_num);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +188,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 	ret = sdw_write(s_rt-&gt;slave, addr4, t_params-&gt;offset1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-			"DPN_OffsetCtrl1 register write failed for port %d",</div><div class='add'>+			"DPN_OffsetCtrl1 register write failed for port %d\n",</div><div class='ctx'> 			t_params-&gt;port_num);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -197,7 +198,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 		ret = sdw_write(s_rt-&gt;slave, addr5, t_params-&gt;blk_grp_ctrl);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-				"DPN_BlockCtrl2 reg write failed for port %d",</div><div class='add'>+				"DPN_BlockCtrl2 reg write failed for port %d\n",</div><div class='ctx'> 				t_params-&gt;port_num);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -208,7 +209,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> 		ret = sdw_write(s_rt-&gt;slave, addr6, t_params-&gt;lane_ctrl);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-				"DPN_LaneCtrl register write failed for port %d",</div><div class='add'>+				"DPN_LaneCtrl register write failed for port %d\n",</div><div class='ctx'> 				t_params-&gt;port_num);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -216,10 +217,10 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	if (dpn_prop-&gt;type != SDW_DPN_SIMPLE) {</div><div class='ctx'> 		ret = _sdw_program_slave_port_params(bus, s_rt-&gt;slave,</div><div class='del'>-						t_params, dpn_prop-&gt;type);</div><div class='add'>+						     t_params, dpn_prop-&gt;type);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-				"Transport reg write failed for port: %d",</div><div class='add'>+				"Transport reg write failed for port: %d\n",</div><div class='ctx'> 				t_params-&gt;port_num);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -227,13 +228,13 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_program_master_port_params(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_port_runtime *p_rt)</div><div class='add'>+					  struct sdw_port_runtime *p_rt)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we need to set transport and port parameters for the port.</div><div class='del'>-	 * Transport parameters refers to the smaple interval, offsets and</div><div class='add'>+	 * Transport parameters refers to the sample interval, offsets and</div><div class='ctx'> 	 * hstart/stop etc of the data. Port parameters refers to word</div><div class='ctx'> 	 * length, flow mode etc of the port</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -244,8 +245,8 @@ static int sdw_program_master_port_params(struct sdw_bus *bus,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return bus-&gt;port_ops-&gt;dpn_set_port_params(bus,</div><div class='del'>-				&amp;p_rt-&gt;port_params,</div><div class='del'>-				bus-&gt;params.next_bank);</div><div class='add'>+						  &amp;p_rt-&gt;port_params,</div><div class='add'>+						  bus-&gt;params.next_bank);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -292,8 +293,9 @@ static int sdw_program_port_params(struct sdw_master_runtime *m_rt)</div><div class='ctx'>  * actual enable/disable is done with a bank switch</div><div class='ctx'>  */</div><div class='ctx'> static int sdw_enable_disable_slave_ports(struct sdw_bus *bus,</div><div class='del'>-				struct sdw_slave_runtime *s_rt,</div><div class='del'>-				struct sdw_port_runtime *p_rt, bool en)</div><div class='add'>+					  struct sdw_slave_runtime *s_rt,</div><div class='add'>+					  struct sdw_port_runtime *p_rt,</div><div class='add'>+					  bool en)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_transport_params *t_params = &amp;p_rt-&gt;transport_params;</div><div class='ctx'> 	u32 addr;</div><div class='hunk'>@@ -315,19 +317,20 @@ static int sdw_enable_disable_slave_ports(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-			"Slave chn_en reg write failed:%d port:%d",</div><div class='add'>+			"Slave chn_en reg write failed:%d port:%d\n",</div><div class='ctx'> 			ret, t_params-&gt;port_num);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt,</div><div class='del'>-			struct sdw_port_runtime *p_rt, bool en)</div><div class='add'>+					   struct sdw_port_runtime *p_rt,</div><div class='add'>+					   bool en)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_transport_params *t_params = &amp;p_rt-&gt;transport_params;</div><div class='ctx'> 	struct sdw_bus *bus = m_rt-&gt;bus;</div><div class='ctx'> 	struct sdw_enable_ch enable_ch;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	enable_ch.port_num = p_rt-&gt;num;</div><div class='ctx'> 	enable_ch.ch_mask = p_rt-&gt;ch_mask;</div><div class='hunk'>@@ -336,10 +339,11 @@ static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt,</div><div class='ctx'> 	/* Perform Master port channel(s) enable/disable */</div><div class='ctx'> 	if (bus-&gt;port_ops-&gt;dpn_port_enable_ch) {</div><div class='ctx'> 		ret = bus-&gt;port_ops-&gt;dpn_port_enable_ch(bus,</div><div class='del'>-				&amp;enable_ch, bus-&gt;params.next_bank);</div><div class='add'>+							&amp;enable_ch,</div><div class='add'>+							bus-&gt;params.next_bank);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(bus-&gt;dev,</div><div class='del'>-				"Master chn_en write failed:%d port:%d",</div><div class='add'>+				"Master chn_en write failed:%d port:%d\n",</div><div class='ctx'> 				ret, t_params-&gt;port_num);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -370,7 +374,7 @@ static int sdw_enable_disable_ports(struct sdw_master_runtime *m_rt, bool en)</div><div class='ctx'> 	list_for_each_entry(s_rt, &amp;m_rt-&gt;slave_rt_list, m_rt_node) {</div><div class='ctx'> 		list_for_each_entry(s_port, &amp;s_rt-&gt;port_list, port_node) {</div><div class='ctx'> 			ret = sdw_enable_disable_slave_ports(m_rt-&gt;bus, s_rt,</div><div class='del'>-							s_port, en);</div><div class='add'>+							     s_port, en);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -387,7 +391,8 @@ static int sdw_enable_disable_ports(struct sdw_master_runtime *m_rt, bool en)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt,</div><div class='del'>-		struct sdw_prepare_ch prep_ch, enum sdw_port_prep_ops cmd)</div><div class='add'>+			    struct sdw_prepare_ch prep_ch,</div><div class='add'>+			    enum sdw_port_prep_ops cmd)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sdw_slave_ops *ops = s_rt-&gt;slave-&gt;ops;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -396,7 +401,8 @@ static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt,</div><div class='ctx'> 		ret = ops-&gt;port_prep(s_rt-&gt;slave, &amp;prep_ch, cmd);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-				"Slave Port Prep cmd %d failed: %d", cmd, ret);</div><div class='add'>+				"Slave Port Prep cmd %d failed: %d\n",</div><div class='add'>+				cmd, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -405,8 +411,9 @@ static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_slave_runtime *s_rt,</div><div class='del'>-			struct sdw_port_runtime *p_rt, bool prep)</div><div class='add'>+				       struct sdw_slave_runtime *s_rt,</div><div class='add'>+				       struct sdw_port_runtime *p_rt,</div><div class='add'>+				       bool prep)</div><div class='ctx'> {</div><div class='ctx'> 	struct completion *port_ready = NULL;</div><div class='ctx'> 	struct sdw_dpn_prop *dpn_prop;</div><div class='hunk'>@@ -420,11 +427,11 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,</div><div class='ctx'> 	prep_ch.ch_mask = p_rt-&gt;ch_mask;</div><div class='ctx'> </div><div class='ctx'> 	dpn_prop = sdw_get_slave_dpn_prop(s_rt-&gt;slave,</div><div class='del'>-					s_rt-&gt;direction,</div><div class='del'>-					prep_ch.num);</div><div class='add'>+					  s_rt-&gt;direction,</div><div class='add'>+					  prep_ch.num);</div><div class='ctx'> 	if (!dpn_prop) {</div><div class='ctx'> 		dev_err(bus-&gt;dev,</div><div class='del'>-			"Slave Port:%d properties not found", prep_ch.num);</div><div class='add'>+			"Slave Port:%d properties not found\n", prep_ch.num);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +449,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (prep &amp;&amp; intr) {</div><div class='ctx'> 		ret = sdw_configure_dpn_intr(s_rt-&gt;slave, p_rt-&gt;num, prep,</div><div class='del'>-						dpn_prop-&gt;device_interrupts);</div><div class='add'>+					     dpn_prop-&gt;device_interrupts);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -456,13 +463,13 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 		if (prep)</div><div class='ctx'> 			ret = sdw_update(s_rt-&gt;slave, addr,</div><div class='del'>-					0xFF, p_rt-&gt;ch_mask);</div><div class='add'>+					 0xFF, p_rt-&gt;ch_mask);</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = sdw_update(s_rt-&gt;slave, addr, 0xFF, 0x0);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-				"Slave prep_ctrl reg write failed");</div><div class='add'>+				"Slave prep_ctrl reg write failed\n");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -475,7 +482,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,</div><div class='ctx'> 		val &amp;= p_rt-&gt;ch_mask;</div><div class='ctx'> 		if (!time_left || val) {</div><div class='ctx'> 			dev_err(&amp;s_rt-&gt;slave-&gt;dev,</div><div class='del'>-				"Chn prep failed for port:%d", prep_ch.num);</div><div class='add'>+				"Chn prep failed for port:%d\n", prep_ch.num);</div><div class='ctx'> 			return -ETIMEDOUT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -486,13 +493,14 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,</div><div class='ctx'> 	/* Disable interrupt after Port de-prepare */</div><div class='ctx'> 	if (!prep &amp;&amp; intr)</div><div class='ctx'> 		ret = sdw_configure_dpn_intr(s_rt-&gt;slave, p_rt-&gt;num, prep,</div><div class='del'>-						dpn_prop-&gt;device_interrupts);</div><div class='add'>+					     dpn_prop-&gt;device_interrupts);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_prep_deprep_master_ports(struct sdw_master_runtime *m_rt,</div><div class='del'>-				struct sdw_port_runtime *p_rt, bool prep)</div><div class='add'>+					struct sdw_port_runtime *p_rt,</div><div class='add'>+					bool prep)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_transport_params *t_params = &amp;p_rt-&gt;transport_params;</div><div class='ctx'> 	struct sdw_bus *bus = m_rt-&gt;bus;</div><div class='hunk'>@@ -509,8 +517,8 @@ static int sdw_prep_deprep_master_ports(struct sdw_master_runtime *m_rt,</div><div class='ctx'> 	if (ops-&gt;dpn_port_prep) {</div><div class='ctx'> 		ret = ops-&gt;dpn_port_prep(bus, &amp;prep_ch);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Port prepare failed for port:%d",</div><div class='del'>-					t_params-&gt;port_num);</div><div class='add'>+			dev_err(bus-&gt;dev, "Port prepare failed for port:%d\n",</div><div class='add'>+				t_params-&gt;port_num);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -535,7 +543,7 @@ static int sdw_prep_deprep_ports(struct sdw_master_runtime *m_rt, bool prep)</div><div class='ctx'> 	list_for_each_entry(s_rt, &amp;m_rt-&gt;slave_rt_list, m_rt_node) {</div><div class='ctx'> 		list_for_each_entry(p_rt, &amp;s_rt-&gt;port_list, port_node) {</div><div class='ctx'> 			ret = sdw_prep_deprep_slave_ports(m_rt-&gt;bus, s_rt,</div><div class='del'>-							p_rt, prep);</div><div class='add'>+							  p_rt, prep);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -578,8 +586,8 @@ static int sdw_notify_config(struct sdw_master_runtime *m_rt)</div><div class='ctx'> 		if (slave-&gt;ops-&gt;bus_config) {</div><div class='ctx'> 			ret = slave-&gt;ops-&gt;bus_config(slave, &amp;bus-&gt;params);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				dev_err(bus-&gt;dev, "Notify Slave: %d failed",</div><div class='del'>-								slave-&gt;dev_num);</div><div class='add'>+				dev_err(bus-&gt;dev, "Notify Slave: %d failed\n",</div><div class='add'>+					slave-&gt;dev_num);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -602,13 +610,14 @@ static int sdw_program_params(struct sdw_bus *bus)</div><div class='ctx'> 		ret = sdw_program_port_params(m_rt);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(bus-&gt;dev,</div><div class='del'>-				"Program transport params failed: %d", ret);</div><div class='add'>+				"Program transport params failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = sdw_notify_config(m_rt);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Notify bus config failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev,</div><div class='add'>+				"Notify bus config failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +627,7 @@ static int sdw_program_params(struct sdw_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 		ret = sdw_enable_disable_ports(m_rt, true);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Enable channel failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Enable channel failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -658,7 +667,7 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count)</div><div class='ctx'> 		addr = SDW_SCP_FRAMECTRL_B0;</div><div class='ctx'> </div><div class='ctx'> 	sdw_fill_msg(wr_msg, NULL, addr, 1, SDW_BROADCAST_DEV_NUM,</div><div class='del'>-					SDW_MSG_FLAG_WRITE, wbuf);</div><div class='add'>+		     SDW_MSG_FLAG_WRITE, wbuf);</div><div class='ctx'> 	wr_msg-&gt;ssp_sync = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -673,7 +682,7 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count)</div><div class='ctx'> 		ret = sdw_transfer(bus, wr_msg);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(bus-&gt;dev, "Slave frame_ctrl reg write failed");</div><div class='add'>+		dev_err(bus-&gt;dev, "Slave frame_ctrl reg write failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -713,7 +722,7 @@ static int sdw_ml_sync_bank_switch(struct sdw_bus *bus)</div><div class='ctx'> 						bus-&gt;bank_switch_timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (!time_left) {</div><div class='del'>-		dev_err(bus-&gt;dev, "Controller Timed out on bank switch");</div><div class='add'>+		dev_err(bus-&gt;dev, "Controller Timed out on bank switch\n");</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -750,7 +759,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)</div><div class='ctx'> 			ret = ops-&gt;pre_bank_switch(bus);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				dev_err(bus-&gt;dev,</div><div class='del'>-					"Pre bank switch op failed: %d", ret);</div><div class='add'>+					"Pre bank switch op failed: %d\n", ret);</div><div class='ctx'> 				goto msg_unlock;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -763,9 +772,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = sdw_bank_switch(bus, stream-&gt;m_rt_count);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Bank switch failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Bank switch failed: %d\n", ret);</div><div class='ctx'> 			goto error;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -784,12 +792,13 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)</div><div class='ctx'> 			ret = ops-&gt;post_bank_switch(bus);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				dev_err(bus-&gt;dev,</div><div class='del'>-					"Post bank switch op failed: %d", ret);</div><div class='add'>+					"Post bank switch op failed: %d\n",</div><div class='add'>+					ret);</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (bus-&gt;multi_link &amp;&amp; stream-&gt;m_rt_count &gt; 1) {</div><div class='ctx'> 			dev_err(bus-&gt;dev,</div><div class='del'>-				"Post bank switch ops not implemented");</div><div class='add'>+				"Post bank switch ops not implemented\n");</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -801,7 +810,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		ret = sdw_ml_sync_bank_switch(bus);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(bus-&gt;dev,</div><div class='del'>-				"multi link bank switch failed: %d", ret);</div><div class='add'>+				"multi link bank switch failed: %d\n", ret);</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -812,7 +821,6 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	list_for_each_entry(m_rt, &amp;stream-&gt;master_list, stream_node) {</div><div class='del'>-</div><div class='ctx'> 		bus = m_rt-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 		kfree(bus-&gt;defer_msg.msg-&gt;buf);</div><div class='hunk'>@@ -873,7 +881,7 @@ EXPORT_SYMBOL(sdw_alloc_stream);</div><div class='ctx'> </div><div class='ctx'> static struct sdw_master_runtime</div><div class='ctx'> *sdw_find_master_rt(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_stream_runtime *stream)</div><div class='add'>+		    struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_master_runtime *m_rt = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -897,8 +905,8 @@ static struct sdw_master_runtime</div><div class='ctx'>  */</div><div class='ctx'> static struct sdw_master_runtime</div><div class='ctx'> *sdw_alloc_master_rt(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_stream_config *stream_config,</div><div class='del'>-			struct sdw_stream_runtime *stream)</div><div class='add'>+		     struct sdw_stream_config *stream_config,</div><div class='add'>+		     struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_master_runtime *m_rt;</div><div class='ctx'> </div><div class='hunk'>@@ -941,8 +949,8 @@ stream_config:</div><div class='ctx'>  */</div><div class='ctx'> static struct sdw_slave_runtime</div><div class='ctx'> *sdw_alloc_slave_rt(struct sdw_slave *slave,</div><div class='del'>-			struct sdw_stream_config *stream_config,</div><div class='del'>-			struct sdw_stream_runtime *stream)</div><div class='add'>+		    struct sdw_stream_config *stream_config,</div><div class='add'>+		    struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_slave_runtime *s_rt = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -959,20 +967,19 @@ static struct sdw_slave_runtime</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdw_master_port_release(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_master_runtime *m_rt)</div><div class='add'>+				    struct sdw_master_runtime *m_rt)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_port_runtime *p_rt, *_p_rt;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(p_rt, _p_rt,</div><div class='del'>-			&amp;m_rt-&gt;port_list, port_node) {</div><div class='add'>+	list_for_each_entry_safe(p_rt, _p_rt, &amp;m_rt-&gt;port_list, port_node) {</div><div class='ctx'> 		list_del(&amp;p_rt-&gt;port_node);</div><div class='ctx'> 		kfree(p_rt);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdw_slave_port_release(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_slave *slave,</div><div class='del'>-			struct sdw_stream_runtime *stream)</div><div class='add'>+				   struct sdw_slave *slave,</div><div class='add'>+				   struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_port_runtime *p_rt, *_p_rt;</div><div class='ctx'> 	struct sdw_master_runtime *m_rt;</div><div class='hunk'>@@ -980,13 +987,11 @@ static void sdw_slave_port_release(struct sdw_bus *bus,</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(m_rt, &amp;stream-&gt;master_list, stream_node) {</div><div class='ctx'> 		list_for_each_entry(s_rt, &amp;m_rt-&gt;slave_rt_list, m_rt_node) {</div><div class='del'>-</div><div class='ctx'> 			if (s_rt-&gt;slave != slave)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			list_for_each_entry_safe(p_rt, _p_rt,</div><div class='del'>-					&amp;s_rt-&gt;port_list, port_node) {</div><div class='del'>-</div><div class='add'>+						 &amp;s_rt-&gt;port_list, port_node) {</div><div class='ctx'> 				list_del(&amp;p_rt-&gt;port_node);</div><div class='ctx'> 				kfree(p_rt);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1003,7 +1008,7 @@ static void sdw_slave_port_release(struct sdw_bus *bus,</div><div class='ctx'>  * This function is to be called with bus_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static void sdw_release_slave_stream(struct sdw_slave *slave,</div><div class='del'>-			struct sdw_stream_runtime *stream)</div><div class='add'>+				     struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_slave_runtime *s_rt, *_s_rt;</div><div class='ctx'> 	struct sdw_master_runtime *m_rt;</div><div class='hunk'>@@ -1011,8 +1016,7 @@ static void sdw_release_slave_stream(struct sdw_slave *slave,</div><div class='ctx'> 	list_for_each_entry(m_rt, &amp;stream-&gt;master_list, stream_node) {</div><div class='ctx'> 		/* Retrieve Slave runtime handle */</div><div class='ctx'> 		list_for_each_entry_safe(s_rt, _s_rt,</div><div class='del'>-					&amp;m_rt-&gt;slave_rt_list, m_rt_node) {</div><div class='del'>-</div><div class='add'>+					 &amp;m_rt-&gt;slave_rt_list, m_rt_node) {</div><div class='ctx'> 			if (s_rt-&gt;slave == slave) {</div><div class='ctx'> 				list_del(&amp;s_rt-&gt;m_rt_node);</div><div class='ctx'> 				kfree(s_rt);</div><div class='hunk'>@@ -1034,7 +1038,7 @@ static void sdw_release_slave_stream(struct sdw_slave *slave,</div><div class='ctx'>  * no effect as Slave(s) runtime handle would already be freed up.</div><div class='ctx'>  */</div><div class='ctx'> static void sdw_release_master_stream(struct sdw_master_runtime *m_rt,</div><div class='del'>-			struct sdw_stream_runtime *stream)</div><div class='add'>+				      struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_slave_runtime *s_rt, *_s_rt;</div><div class='ctx'> </div><div class='hunk'>@@ -1057,15 +1061,14 @@ static void sdw_release_master_stream(struct sdw_master_runtime *m_rt,</div><div class='ctx'>  * This removes and frees port_rt and master_rt from a stream</div><div class='ctx'>  */</div><div class='ctx'> int sdw_stream_remove_master(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_stream_runtime *stream)</div><div class='add'>+			     struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_master_runtime *m_rt, *_m_rt;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bus-&gt;bus_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(m_rt, _m_rt,</div><div class='del'>-			&amp;stream-&gt;master_list, stream_node) {</div><div class='del'>-</div><div class='add'>+				 &amp;stream-&gt;master_list, stream_node) {</div><div class='ctx'> 		if (m_rt-&gt;bus != bus)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1092,7 +1095,7 @@ EXPORT_SYMBOL(sdw_stream_remove_master);</div><div class='ctx'>  * This removes and frees port_rt and slave_rt from a stream</div><div class='ctx'>  */</div><div class='ctx'> int sdw_stream_remove_slave(struct sdw_slave *slave,</div><div class='del'>-		struct sdw_stream_runtime *stream)</div><div class='add'>+			    struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;slave-&gt;bus-&gt;bus_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1116,8 +1119,9 @@ EXPORT_SYMBOL(sdw_stream_remove_slave);</div><div class='ctx'>  * This function is to be called with bus_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static int sdw_config_stream(struct device *dev,</div><div class='del'>-		struct sdw_stream_runtime *stream,</div><div class='del'>-		struct sdw_stream_config *stream_config, bool is_slave)</div><div class='add'>+			     struct sdw_stream_runtime *stream,</div><div class='add'>+			     struct sdw_stream_config *stream_config,</div><div class='add'>+			     bool is_slave)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update the stream rate, channel and bps based on data</div><div class='hunk'>@@ -1128,14 +1132,14 @@ static int sdw_config_stream(struct device *dev,</div><div class='ctx'> 	 * comparison and allow the value to be set and stored in stream</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (stream-&gt;params.rate &amp;&amp;</div><div class='del'>-			stream-&gt;params.rate != stream_config-&gt;frame_rate) {</div><div class='del'>-		dev_err(dev, "rate not matching, stream:%s", stream-&gt;name);</div><div class='add'>+	    stream-&gt;params.rate != stream_config-&gt;frame_rate) {</div><div class='add'>+		dev_err(dev, "rate not matching, stream:%s\n", stream-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (stream-&gt;params.bps &amp;&amp;</div><div class='del'>-			stream-&gt;params.bps != stream_config-&gt;bps) {</div><div class='del'>-		dev_err(dev, "bps not matching, stream:%s", stream-&gt;name);</div><div class='add'>+	    stream-&gt;params.bps != stream_config-&gt;bps) {</div><div class='add'>+		dev_err(dev, "bps not matching, stream:%s\n", stream-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1151,20 +1155,21 @@ static int sdw_config_stream(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_is_valid_port_range(struct device *dev,</div><div class='del'>-				struct sdw_port_runtime *p_rt)</div><div class='add'>+				   struct sdw_port_runtime *p_rt)</div><div class='ctx'> {</div><div class='ctx'> 	if (!SDW_VALID_PORT_RANGE(p_rt-&gt;num)) {</div><div class='ctx'> 		dev_err(dev,</div><div class='del'>-			"SoundWire: Invalid port number :%d", p_rt-&gt;num);</div><div class='add'>+			"SoundWire: Invalid port number :%d\n", p_rt-&gt;num);</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 struct sdw_port_runtime *sdw_port_alloc(struct device *dev,</div><div class='del'>-				struct sdw_port_config *port_config,</div><div class='del'>-				int port_index)</div><div class='add'>+static struct sdw_port_runtime</div><div class='add'>+*sdw_port_alloc(struct device *dev,</div><div class='add'>+		struct sdw_port_config *port_config,</div><div class='add'>+		int port_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_port_runtime *p_rt;</div><div class='ctx'> </div><div class='hunk'>@@ -1179,9 +1184,9 @@ static struct sdw_port_runtime *sdw_port_alloc(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_master_port_config(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_master_runtime *m_rt,</div><div class='del'>-			struct sdw_port_config *port_config,</div><div class='del'>-			unsigned int num_ports)</div><div class='add'>+				  struct sdw_master_runtime *m_rt,</div><div class='add'>+				  struct sdw_port_config *port_config,</div><div class='add'>+				  unsigned int num_ports)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_port_runtime *p_rt;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1204,9 +1209,9 @@ static int sdw_master_port_config(struct sdw_bus *bus,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdw_slave_port_config(struct sdw_slave *slave,</div><div class='del'>-			struct sdw_slave_runtime *s_rt,</div><div class='del'>-			struct sdw_port_config *port_config,</div><div class='del'>-			unsigned int num_config)</div><div class='add'>+				 struct sdw_slave_runtime *s_rt,</div><div class='add'>+				 struct sdw_port_config *port_config,</div><div class='add'>+				 unsigned int num_config)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_port_runtime *p_rt;</div><div class='ctx'> 	int i, ret;</div><div class='hunk'>@@ -1248,10 +1253,10 @@ static int sdw_slave_port_config(struct sdw_slave *slave,</div><div class='ctx'>  * @stream: SoundWire stream</div><div class='ctx'>  */</div><div class='ctx'> int sdw_stream_add_master(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_stream_config *stream_config,</div><div class='del'>-		struct sdw_port_config *port_config,</div><div class='del'>-		unsigned int num_ports,</div><div class='del'>-		struct sdw_stream_runtime *stream)</div><div class='add'>+			  struct sdw_stream_config *stream_config,</div><div class='add'>+			  struct sdw_port_config *port_config,</div><div class='add'>+			  unsigned int num_ports,</div><div class='add'>+			  struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_master_runtime *m_rt = NULL;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1265,7 +1270,7 @@ int sdw_stream_add_master(struct sdw_bus *bus,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!bus-&gt;multi_link &amp;&amp; stream-&gt;m_rt_count &gt; 0) {</div><div class='ctx'> 		dev_err(bus-&gt;dev,</div><div class='del'>-			"Multilink not supported, link %d", bus-&gt;link_id);</div><div class='add'>+			"Multilink not supported, link %d\n", bus-&gt;link_id);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1273,8 +1278,8 @@ int sdw_stream_add_master(struct sdw_bus *bus,</div><div class='ctx'> 	m_rt = sdw_alloc_master_rt(bus, stream_config, stream);</div><div class='ctx'> 	if (!m_rt) {</div><div class='ctx'> 		dev_err(bus-&gt;dev,</div><div class='del'>-				"Master runtime config failed for stream:%s",</div><div class='del'>-				stream-&gt;name);</div><div class='add'>+			"Master runtime config failed for stream:%s\n",</div><div class='add'>+			stream-&gt;name);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1313,10 +1318,10 @@ EXPORT_SYMBOL(sdw_stream_add_master);</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> int sdw_stream_add_slave(struct sdw_slave *slave,</div><div class='del'>-		struct sdw_stream_config *stream_config,</div><div class='del'>-		struct sdw_port_config *port_config,</div><div class='del'>-		unsigned int num_ports,</div><div class='del'>-		struct sdw_stream_runtime *stream)</div><div class='add'>+			 struct sdw_stream_config *stream_config,</div><div class='add'>+			 struct sdw_port_config *port_config,</div><div class='add'>+			 unsigned int num_ports,</div><div class='add'>+			 struct sdw_stream_runtime *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_slave_runtime *s_rt;</div><div class='ctx'> 	struct sdw_master_runtime *m_rt;</div><div class='hunk'>@@ -1331,8 +1336,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave,</div><div class='ctx'> 	m_rt = sdw_alloc_master_rt(slave-&gt;bus, stream_config, stream);</div><div class='ctx'> 	if (!m_rt) {</div><div class='ctx'> 		dev_err(&amp;slave-&gt;dev,</div><div class='del'>-				"alloc master runtime failed for stream:%s",</div><div class='del'>-				stream-&gt;name);</div><div class='add'>+			"alloc master runtime failed for stream:%s\n",</div><div class='add'>+			stream-&gt;name);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1340,8 +1345,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave,</div><div class='ctx'> 	s_rt = sdw_alloc_slave_rt(slave, stream_config, stream);</div><div class='ctx'> 	if (!s_rt) {</div><div class='ctx'> 		dev_err(&amp;slave-&gt;dev,</div><div class='del'>-				"Slave runtime config failed for stream:%s",</div><div class='del'>-				stream-&gt;name);</div><div class='add'>+			"Slave runtime config failed for stream:%s\n",</div><div class='add'>+			stream-&gt;name);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto stream_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1385,8 +1390,8 @@ EXPORT_SYMBOL(sdw_stream_add_slave);</div><div class='ctx'>  * @port_num: Port number</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,</div><div class='del'>-				enum sdw_data_direction direction,</div><div class='del'>-				unsigned int port_num)</div><div class='add'>+					    enum sdw_data_direction direction,</div><div class='add'>+					    unsigned int port_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdw_dpn_prop *dpn_prop;</div><div class='ctx'> 	u8 num_ports;</div><div class='hunk'>@@ -1470,7 +1475,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> </div><div class='ctx'> 		/* TODO: Support Asynchronous mode */</div><div class='ctx'> 		if ((prop-&gt;max_freq % stream-&gt;params.rate) != 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Async mode not supported");</div><div class='add'>+			dev_err(bus-&gt;dev, "Async mode not supported\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1482,15 +1487,14 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* Program params */</div><div class='ctx'> 		ret = sdw_program_params(bus);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Program params failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Program params failed: %d\n", ret);</div><div class='ctx'> 			goto restore_params;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = do_bank_switch(stream);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(bus-&gt;dev, "Bank switch failed: %d", ret);</div><div class='add'>+		dev_err(bus-&gt;dev, "Bank switch failed: %d\n", ret);</div><div class='ctx'> 		goto restore_params;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1500,8 +1504,8 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* Prepare port(s) on the new clock configuration */</div><div class='ctx'> 		ret = sdw_prep_deprep_ports(m_rt, true);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Prepare port(s) failed ret = %d",</div><div class='del'>-					ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Prepare port(s) failed ret = %d\n",</div><div class='add'>+				ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1527,7 +1531,7 @@ int sdw_prepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!stream) {</div><div class='del'>-		pr_err("SoundWire: Handle not found for stream");</div><div class='add'>+		pr_err("SoundWire: Handle not found for stream\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1535,7 +1539,7 @@ int sdw_prepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> </div><div class='ctx'> 	ret = _sdw_prepare_stream(stream);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		pr_err("Prepare for stream:%s failed: %d", stream-&gt;name, ret);</div><div class='add'>+		pr_err("Prepare for stream:%s failed: %d\n", stream-&gt;name, ret);</div><div class='ctx'> </div><div class='ctx'> 	sdw_release_bus_lock(stream);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1555,21 +1559,22 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* Program params */</div><div class='ctx'> 		ret = sdw_program_params(bus);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Program params failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Program params failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Enable port(s) */</div><div class='ctx'> 		ret = sdw_enable_disable_ports(m_rt, true);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Enable port(s) failed ret: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev,</div><div class='add'>+				"Enable port(s) failed ret: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = do_bank_switch(stream);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(bus-&gt;dev, "Bank switch failed: %d", ret);</div><div class='add'>+		dev_err(bus-&gt;dev, "Bank switch failed: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1589,7 +1594,7 @@ int sdw_enable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!stream) {</div><div class='del'>-		pr_err("SoundWire: Handle not found for stream");</div><div class='add'>+		pr_err("SoundWire: Handle not found for stream\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1597,7 +1602,7 @@ int sdw_enable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> </div><div class='ctx'> 	ret = _sdw_enable_stream(stream);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		pr_err("Enable for stream:%s failed: %d", stream-&gt;name, ret);</div><div class='add'>+		pr_err("Enable for stream:%s failed: %d\n", stream-&gt;name, ret);</div><div class='ctx'> </div><div class='ctx'> 	sdw_release_bus_lock(stream);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1615,7 +1620,7 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* Disable port(s) */</div><div class='ctx'> 		ret = sdw_enable_disable_ports(m_rt, false);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Disable port(s) failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Disable port(s) failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1626,7 +1631,7 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* Program params */</div><div class='ctx'> 		ret = sdw_program_params(bus);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Program params failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Program params failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1646,7 +1651,7 @@ int sdw_disable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!stream) {</div><div class='del'>-		pr_err("SoundWire: Handle not found for stream");</div><div class='add'>+		pr_err("SoundWire: Handle not found for stream\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1654,7 +1659,7 @@ int sdw_disable_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> </div><div class='ctx'> 	ret = _sdw_disable_stream(stream);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		pr_err("Disable for stream:%s failed: %d", stream-&gt;name, ret);</div><div class='add'>+		pr_err("Disable for stream:%s failed: %d\n", stream-&gt;name, ret);</div><div class='ctx'> </div><div class='ctx'> 	sdw_release_bus_lock(stream);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1672,7 +1677,8 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* De-prepare port(s) */</div><div class='ctx'> 		ret = sdw_prep_deprep_ports(m_rt, false);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "De-prepare port(s) failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev,</div><div class='add'>+				"De-prepare port(s) failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1683,10 +1689,9 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 		/* Program params */</div><div class='ctx'> 		ret = sdw_program_params(bus);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(bus-&gt;dev, "Program params failed: %d", ret);</div><div class='add'>+			dev_err(bus-&gt;dev, "Program params failed: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stream-&gt;state = SDW_STREAM_DEPREPARED;</div><div class='hunk'>@@ -1705,14 +1710,14 @@ int sdw_deprepare_stream(struct sdw_stream_runtime *stream)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!stream) {</div><div class='del'>-		pr_err("SoundWire: Handle not found for stream");</div><div class='add'>+		pr_err("SoundWire: Handle not found for stream\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sdw_acquire_bus_lock(stream);</div><div class='ctx'> 	ret = _sdw_deprepare_stream(stream);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		pr_err("De-prepare for stream:%d failed: %d", ret, ret);</div><div class='add'>+		pr_err("De-prepare for stream:%d failed: %d\n", ret, ret);</div><div class='ctx'> </div><div class='ctx'> 	sdw_release_bus_lock(stream);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig<br/>index f761655e2a36..0fba8f400c59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/Kconfig</a></div><div class='hunk'>@@ -426,6 +426,12 @@ config SPI_MT65XX</div><div class='ctx'> 	  say Y or M here.If you are not sure, say N.</div><div class='ctx'> 	  SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs.</div><div class='ctx'> </div><div class='add'>+config SPI_MT7621</div><div class='add'>+	tristate "MediaTek MT7621 SPI Controller"</div><div class='add'>+	depends on RALINK || COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  This selects a driver for the MediaTek MT7621 SPI Controller.</div><div class='add'>+</div><div class='ctx'> config SPI_NPCM_PSPI</div><div class='ctx'> 	tristate "Nuvoton NPCM PSPI Controller"</div><div class='ctx'> 	depends on ARCH_NPCM || COMPILE_TEST</div><div class='hunk'>@@ -842,9 +848,17 @@ config SPI_XTENSA_XTFPGA</div><div class='ctx'> 	  16 bit words in SPI mode 0, automatically asserting CS on transfer</div><div class='ctx'> 	  start and deasserting on end.</div><div class='ctx'> </div><div class='add'>+config SPI_ZYNQ_QSPI</div><div class='add'>+	tristate "Xilinx Zynq QSPI controller"</div><div class='add'>+	depends on ARCH_ZYNQ || COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Zynq Quad SPI controller</div><div class='add'>+	  in master mode.</div><div class='add'>+	  This controller only supports SPI memory interface.</div><div class='add'>+</div><div class='ctx'> config SPI_ZYNQMP_GQSPI</div><div class='ctx'> 	tristate "Xilinx ZynqMP GQSPI controller"</div><div class='del'>-	depends on SPI_MASTER &amp;&amp; HAS_DMA</div><div class='add'>+	depends on (SPI_MASTER &amp;&amp; HAS_DMA) || COMPILE_TEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile<br/>index d8fc03c9faa2..f2f78d03dc28 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/Makefile</a></div><div class='hunk'>@@ -60,6 +60,7 @@ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o</div><div class='ctx'> obj-$(CONFIG_SPI_MPC52xx_PSC)		+= spi-mpc52xx-psc.o</div><div class='ctx'> obj-$(CONFIG_SPI_MPC52xx)		+= spi-mpc52xx.o</div><div class='ctx'> obj-$(CONFIG_SPI_MT65XX)                += spi-mt65xx.o</div><div class='add'>+obj-$(CONFIG_SPI_MT7621)		+= spi-mt7621.o</div><div class='ctx'> obj-$(CONFIG_SPI_MXIC)			+= spi-mxic.o</div><div class='ctx'> obj-$(CONFIG_SPI_MXS)			+= spi-mxs.o</div><div class='ctx'> obj-$(CONFIG_SPI_NPCM_PSPI)		+= spi-npcm-pspi.o</div><div class='hunk'>@@ -118,6 +119,7 @@ obj-$(CONFIG_SPI_XCOMM)		+= spi-xcomm.o</div><div class='ctx'> obj-$(CONFIG_SPI_XILINX)		+= spi-xilinx.o</div><div class='ctx'> obj-$(CONFIG_SPI_XLP)			+= spi-xlp.o</div><div class='ctx'> obj-$(CONFIG_SPI_XTENSA_XTFPGA)		+= spi-xtensa-xtfpga.o</div><div class='add'>+obj-$(CONFIG_SPI_ZYNQ_QSPI)		+= spi-zynq-qspi.o</div><div class='ctx'> obj-$(CONFIG_SPI_ZYNQMP_GQSPI)		+= spi-zynqmp-gqspi.o</div><div class='ctx'> </div><div class='ctx'> # SPI slave protocol handlers</div><div class='head'>diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c<br/>index fffc21cd5f79..9f24d5f0b431 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/atmel-quadspi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/atmel-quadspi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/atmel-quadspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/atmel-quadspi.c</a></div><div class='hunk'>@@ -366,7 +366,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const char *atmel_qspi_get_name(struct spi_mem *spimem)</div><div class='add'>+static const char *atmel_qspi_get_name(struct spi_mem *spimem)</div><div class='ctx'> {</div><div class='ctx'> 	return dev_name(spimem-&gt;spi-&gt;dev.parent);</div><div class='ctx'> }</div><div class='hunk'>@@ -570,7 +570,8 @@ static int atmel_qspi_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused atmel_qspi_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_qspi *aq = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_controller *ctrl = dev_get_drvdata(dev);</div><div class='add'>+	struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);</div><div class='ctx'> </div><div class='ctx'> 	clk_disable_unprepare(aq-&gt;qspick);</div><div class='ctx'> 	clk_disable_unprepare(aq-&gt;pclk);</div><div class='hunk'>@@ -580,7 +581,8 @@ static int __maybe_unused atmel_qspi_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused atmel_qspi_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_qspi *aq = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_controller *ctrl = dev_get_drvdata(dev);</div><div class='add'>+	struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);</div><div class='ctx'> </div><div class='ctx'> 	clk_prepare_enable(aq-&gt;pclk);</div><div class='ctx'> 	clk_prepare_enable(aq-&gt;qspick);</div><div class='head'>diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c<br/>index a694d702e574..f763e14bdf12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-at91-usart.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-at91-usart.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-at91-usart.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-at91-usart.c</a></div><div class='hunk'>@@ -178,12 +178,6 @@ static int at91_usart_spi_setup(struct spi_device *spi)</div><div class='ctx'> 	struct at91_usart_spi *aus = spi_master_get_devdata(spi-&gt;controller);</div><div class='ctx'> 	u32 *ausd = spi-&gt;controller_state;</div><div class='ctx'> 	unsigned int mr = at91_usart_spi_readl(aus, MR);</div><div class='del'>-	u8 bits = spi-&gt;bits_per_word;</div><div class='del'>-</div><div class='del'>-	if (bits != 8) {</div><div class='del'>-		dev_dbg(&amp;spi-&gt;dev, "Only 8 bits per word are supported\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (spi-&gt;mode &amp; SPI_CPOL)</div><div class='ctx'> 		mr |= US_MR_CPOL;</div><div class='hunk'>@@ -212,7 +206,7 @@ static int at91_usart_spi_setup(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;spi-&gt;dev,</div><div class='ctx'> 		"setup: bpw %u mode 0x%x -&gt; mr %d %08x\n",</div><div class='del'>-		bits, spi-&gt;mode, spi-&gt;chip_select, mr);</div><div class='add'>+		spi-&gt;bits_per_word, spi-&gt;mode, spi-&gt;chip_select, mr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c<br/>index 35aebdfd3b4e..8aa22713c483 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-bcm2835.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-bcm2835.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-bcm2835.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-bcm2835.c</a></div><div class='hunk'>@@ -335,20 +335,6 @@ static int bcm2835_spi_transfer_one_irq(struct spi_master *master,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * DMA support</div><div class='del'>- *</div><div class='del'>- * this implementation has currently a few issues in so far as it does</div><div class='del'>- * not work arrount limitations of the HW.</div><div class='del'>- *</div><div class='del'>- * the main one being that DMA transfers are limited to 16 bit</div><div class='del'>- * (so 0 to 65535 bytes) by the SPI HW due to BCM2835_SPI_DLEN</div><div class='del'>- *</div><div class='del'>- * there may be a few more border-cases we may need to address as well</div><div class='del'>- * but unfortunately this would mean splitting up the scatter-gather</div><div class='del'>- * list making it slightly unpractical...</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * bcm2835_spi_transfer_prologue() - transfer first few bytes without DMA</div><div class='ctx'>  * @master: SPI master</div><div class='hunk'>@@ -630,19 +616,6 @@ static bool bcm2835_spi_can_dma(struct spi_master *master,</div><div class='ctx'> 	if (tfr-&gt;len &lt; BCM2835_SPI_DMA_MIN_LENGTH)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/* BCM2835_SPI_DLEN has defined a max transfer size as</div><div class='del'>-	 * 16 bit, so max is 65535</div><div class='del'>-	 * we can revisit this by using an alternative transfer</div><div class='del'>-	 * method - ideally this would get done without any more</div><div class='del'>-	 * interaction...</div><div class='del'>-	 */</div><div class='del'>-	if (tfr-&gt;len &gt; 65535) {</div><div class='del'>-		dev_warn_once(&amp;spi-&gt;dev,</div><div class='del'>-			      "transfer size of %d too big for dma-transfer\n",</div><div class='del'>-			      tfr-&gt;len);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* return OK */</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -707,7 +680,6 @@ static void bcm2835_dma_init(struct spi_master *master, struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* all went well, so set can_dma */</div><div class='ctx'> 	master-&gt;can_dma = bcm2835_spi_can_dma;</div><div class='del'>-	master-&gt;max_dma_len = 65535; /* limitation by BCM2835_SPI_DLEN */</div><div class='ctx'> 	/* need to do TX AND RX DMA, so we need dummy buffers */</div><div class='ctx'> 	master-&gt;flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;</div><div class='ctx'> </div><div class='hunk'>@@ -844,6 +816,17 @@ static int bcm2835_spi_prepare_message(struct spi_master *master,</div><div class='ctx'> 	struct spi_device *spi = msg-&gt;spi;</div><div class='ctx'> 	struct bcm2835_spi *bs = spi_master_get_devdata(master);</div><div class='ctx'> 	u32 cs = bcm2835_rd(bs, BCM2835_SPI_CS);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * DMA transfers are limited to 16 bit (0 to 65535 bytes) by the SPI HW</div><div class='add'>+	 * due to DLEN. Split up transfers (32-bit FIFO aligned) if the limit is</div><div class='add'>+	 * exceeded.</div><div class='add'>+	 */</div><div class='add'>+	ret = spi_split_transfers_maxsize(master, msg, 65532,</div><div class='add'>+					  GFP_KERNEL | GFP_DMA);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	cs &amp;= ~(BCM2835_SPI_CS_CPOL | BCM2835_SPI_CS_CPHA);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c<br/>index f7e054848ca5..bbf87adb3ff8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-bcm2835aux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-bcm2835aux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-bcm2835aux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-bcm2835aux.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -36,6 +37,12 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='add'>+/* define polling limits */</div><div class='add'>+static unsigned int polling_limit_us = 30;</div><div class='add'>+module_param(polling_limit_us, uint, 0664);</div><div class='add'>+MODULE_PARM_DESC(polling_limit_us,</div><div class='add'>+		 "time in us to run a transfer in polling mode - if zero no polling is used\n");</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * spi register defines</div><div class='ctx'>  *</div><div class='hunk'>@@ -88,10 +95,6 @@</div><div class='ctx'> #define BCM2835_AUX_SPI_STAT_BUSY	0x00000040</div><div class='ctx'> #define BCM2835_AUX_SPI_STAT_BITCOUNT	0x0000003F</div><div class='ctx'> </div><div class='del'>-/* timeout values */</div><div class='del'>-#define BCM2835_AUX_SPI_POLLING_LIMIT_US	30</div><div class='del'>-#define BCM2835_AUX_SPI_POLLING_JIFFIES		2</div><div class='del'>-</div><div class='ctx'> struct bcm2835aux_spi {</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	struct clk *clk;</div><div class='hunk'>@@ -102,8 +105,53 @@ struct bcm2835aux_spi {</div><div class='ctx'> 	int tx_len;</div><div class='ctx'> 	int rx_len;</div><div class='ctx'> 	int pending;</div><div class='add'>+</div><div class='add'>+	u64 count_transfer_polling;</div><div class='add'>+	u64 count_transfer_irq;</div><div class='add'>+	u64 count_transfer_irq_after_poll;</div><div class='add'>+</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_DEBUG_FS)</div><div class='add'>+static void bcm2835aux_debugfs_create(struct bcm2835aux_spi *bs,</div><div class='add'>+				      const char *dname)</div><div class='add'>+{</div><div class='add'>+	char name[64];</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+</div><div class='add'>+	/* get full name */</div><div class='add'>+	snprintf(name, sizeof(name), "spi-bcm2835aux-%s", dname);</div><div class='add'>+</div><div class='add'>+	/* the base directory */</div><div class='add'>+	dir = debugfs_create_dir(name, NULL);</div><div class='add'>+	bs-&gt;debugfs_dir = dir;</div><div class='add'>+</div><div class='add'>+	/* the counters */</div><div class='add'>+	debugfs_create_u64("count_transfer_polling", 0444, dir,</div><div class='add'>+			   &amp;bs-&gt;count_transfer_polling);</div><div class='add'>+	debugfs_create_u64("count_transfer_irq", 0444, dir,</div><div class='add'>+			   &amp;bs-&gt;count_transfer_irq);</div><div class='add'>+	debugfs_create_u64("count_transfer_irq_after_poll", 0444, dir,</div><div class='add'>+			   &amp;bs-&gt;count_transfer_irq_after_poll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm2835aux_debugfs_remove(struct bcm2835aux_spi *bs)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(bs-&gt;debugfs_dir);</div><div class='add'>+	bs-&gt;debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void bcm2835aux_debugfs_create(struct bcm2835aux_spi *bs,</div><div class='add'>+				      const char *dname)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm2835aux_debugfs_remove(struct bcm2835aux_spi *bs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='ctx'> static inline u32 bcm2835aux_rd(struct bcm2835aux_spi *bs, unsigned reg)</div><div class='ctx'> {</div><div class='ctx'> 	return readl(bs-&gt;regs + reg);</div><div class='hunk'>@@ -123,9 +171,6 @@ static inline void bcm2835aux_rd_fifo(struct bcm2835aux_spi *bs)</div><div class='ctx'> 	data = bcm2835aux_rd(bs, BCM2835_AUX_SPI_IO);</div><div class='ctx'> 	if (bs-&gt;rx_buf) {</div><div class='ctx'> 		switch (count) {</div><div class='del'>-		case 4:</div><div class='del'>-			*bs-&gt;rx_buf++ = (data &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-			/* fallthrough */</div><div class='ctx'> 		case 3:</div><div class='ctx'> 			*bs-&gt;rx_buf++ = (data &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 			/* fallthrough */</div><div class='hunk'>@@ -178,24 +223,14 @@ static void bcm2835aux_spi_reset_hw(struct bcm2835aux_spi *bs)</div><div class='ctx'> 		      BCM2835_AUX_SPI_CNTL0_CLEARFIFO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)</div><div class='add'>+static void bcm2835aux_spi_transfer_helper(struct bcm2835aux_spi *bs)</div><div class='ctx'> {</div><div class='del'>-	struct spi_master *master = dev_id;</div><div class='del'>-	struct bcm2835aux_spi *bs = spi_master_get_devdata(master);</div><div class='del'>-	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	/* IRQ may be shared, so return if our interrupts are disabled */</div><div class='del'>-	if (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_CNTL1) &amp;</div><div class='del'>-	      (BCM2835_AUX_SPI_CNTL1_TXEMPTY | BCM2835_AUX_SPI_CNTL1_IDLE)))</div><div class='del'>-		return ret;</div><div class='add'>+	u32 stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT);</div><div class='ctx'> </div><div class='ctx'> 	/* check if we have data to read */</div><div class='del'>-	while (bs-&gt;rx_len &amp;&amp;</div><div class='del'>-	       (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &amp;</div><div class='del'>-		  BCM2835_AUX_SPI_STAT_RX_EMPTY))) {</div><div class='add'>+	for (; bs-&gt;rx_len &amp;&amp; (stat &amp; BCM2835_AUX_SPI_STAT_RX_LVL);</div><div class='add'>+	     stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT))</div><div class='ctx'> 		bcm2835aux_rd_fifo(bs);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* check if we have data to write */</div><div class='ctx'> 	while (bs-&gt;tx_len &amp;&amp;</div><div class='hunk'>@@ -203,16 +238,21 @@ static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	       (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &amp;</div><div class='ctx'> 		  BCM2835_AUX_SPI_STAT_TX_FULL))) {</div><div class='ctx'> 		bcm2835aux_wr_fifo(bs);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* and check if we have reached "done" */</div><div class='del'>-	while (bs-&gt;rx_len &amp;&amp;</div><div class='del'>-	       (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &amp;</div><div class='del'>-		  BCM2835_AUX_SPI_STAT_BUSY))) {</div><div class='del'>-		bcm2835aux_rd_fifo(bs);</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='add'>+static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct spi_master *master = dev_id;</div><div class='add'>+	struct bcm2835aux_spi *bs = spi_master_get_devdata(master);</div><div class='add'>+</div><div class='add'>+	/* IRQ may be shared, so return if our interrupts are disabled */</div><div class='add'>+	if (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_CNTL1) &amp;</div><div class='add'>+	      (BCM2835_AUX_SPI_CNTL1_TXEMPTY | BCM2835_AUX_SPI_CNTL1_IDLE)))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* do common fifo handling */</div><div class='add'>+	bcm2835aux_spi_transfer_helper(bs);</div><div class='ctx'> </div><div class='ctx'> 	if (!bs-&gt;tx_len) {</div><div class='ctx'> 		/* disable tx fifo empty interrupt */</div><div class='hunk'>@@ -226,8 +266,7 @@ static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		complete(&amp;master-&gt;xfer_completion);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* and return */</div><div class='del'>-	return ret;</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __bcm2835aux_spi_transfer_one_irq(struct spi_master *master,</div><div class='hunk'>@@ -251,6 +290,9 @@ static int bcm2835aux_spi_transfer_one_irq(struct spi_master *master,</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm2835aux_spi *bs = spi_master_get_devdata(master);</div><div class='ctx'> </div><div class='add'>+	/* update statistics */</div><div class='add'>+	bs-&gt;count_transfer_irq++;</div><div class='add'>+</div><div class='ctx'> 	/* fill in registers and fifos before enabling interrupts */</div><div class='ctx'> 	bcm2835aux_wr(bs, BCM2835_AUX_SPI_CNTL1, bs-&gt;cntl[1]);</div><div class='ctx'> 	bcm2835aux_wr(bs, BCM2835_AUX_SPI_CNTL0, bs-&gt;cntl[0]);</div><div class='hunk'>@@ -273,35 +315,22 @@ static int bcm2835aux_spi_transfer_one_poll(struct spi_master *master,</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm2835aux_spi *bs = spi_master_get_devdata(master);</div><div class='ctx'> 	unsigned long timeout;</div><div class='del'>-	u32 stat;</div><div class='add'>+</div><div class='add'>+	/* update statistics */</div><div class='add'>+	bs-&gt;count_transfer_polling++;</div><div class='ctx'> </div><div class='ctx'> 	/* configure spi */</div><div class='ctx'> 	bcm2835aux_wr(bs, BCM2835_AUX_SPI_CNTL1, bs-&gt;cntl[1]);</div><div class='ctx'> 	bcm2835aux_wr(bs, BCM2835_AUX_SPI_CNTL0, bs-&gt;cntl[0]);</div><div class='ctx'> </div><div class='del'>-	/* set the timeout */</div><div class='del'>-	timeout = jiffies + BCM2835_AUX_SPI_POLLING_JIFFIES;</div><div class='add'>+	/* set the timeout to at least 2 jiffies */</div><div class='add'>+	timeout = jiffies + 2 + HZ * polling_limit_us / 1000000;</div><div class='ctx'> </div><div class='ctx'> 	/* loop until finished the transfer */</div><div class='ctx'> 	while (bs-&gt;rx_len) {</div><div class='del'>-		/* read status */</div><div class='del'>-		stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT);</div><div class='ctx'> </div><div class='del'>-		/* fill in tx fifo with remaining data */</div><div class='del'>-		if ((bs-&gt;tx_len) &amp;&amp; (!(stat &amp; BCM2835_AUX_SPI_STAT_TX_FULL))) {</div><div class='del'>-			bcm2835aux_wr_fifo(bs);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* read data from fifo for both cases */</div><div class='del'>-		if (!(stat &amp; BCM2835_AUX_SPI_STAT_RX_EMPTY)) {</div><div class='del'>-			bcm2835aux_rd_fifo(bs);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!(stat &amp; BCM2835_AUX_SPI_STAT_BUSY)) {</div><div class='del'>-			bcm2835aux_rd_fifo(bs);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		/* do common fifo handling */</div><div class='add'>+		bcm2835aux_spi_transfer_helper(bs);</div><div class='ctx'> </div><div class='ctx'> 		/* there is still data pending to read check the timeout */</div><div class='ctx'> 		if (bs-&gt;rx_len &amp;&amp; time_after(jiffies, timeout)) {</div><div class='hunk'>@@ -310,6 +339,7 @@ static int bcm2835aux_spi_transfer_one_poll(struct spi_master *master,</div><div class='ctx'> 					    jiffies - timeout,</div><div class='ctx'> 					    bs-&gt;tx_len, bs-&gt;rx_len);</div><div class='ctx'> 			/* forward to interrupt handler */</div><div class='add'>+			bs-&gt;count_transfer_irq_after_poll++;</div><div class='ctx'> 			return __bcm2835aux_spi_transfer_one_irq(master,</div><div class='ctx'> 							       spi, tfr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -324,8 +354,8 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master,</div><div class='ctx'> 				       struct spi_transfer *tfr)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm2835aux_spi *bs = spi_master_get_devdata(master);</div><div class='del'>-	unsigned long spi_hz, clk_hz, speed;</div><div class='del'>-	unsigned long spi_used_hz;</div><div class='add'>+	unsigned long spi_hz, clk_hz, speed, spi_used_hz;</div><div class='add'>+	unsigned long hz_per_byte, byte_limit;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the registers to handle</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -369,14 +399,15 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master,</div><div class='ctx'> 	 * of Hz per byte per polling limit.  E.g., we can transfer 1 byte in</div><div class='ctx'> 	 * 30 µs per 300,000 Hz of bus clock.</div><div class='ctx'> 	 */</div><div class='del'>-#define HZ_PER_BYTE ((9 * 1000000) / BCM2835_AUX_SPI_POLLING_LIMIT_US)</div><div class='add'>+	hz_per_byte = polling_limit_us ? (9 * 1000000) / polling_limit_us : 0;</div><div class='add'>+	byte_limit = hz_per_byte ? spi_used_hz / hz_per_byte : 1;</div><div class='add'>+</div><div class='ctx'> 	/* run in polling mode for short transfers */</div><div class='del'>-	if (tfr-&gt;len &lt; spi_used_hz / HZ_PER_BYTE)</div><div class='add'>+	if (tfr-&gt;len &lt; byte_limit)</div><div class='ctx'> 		return bcm2835aux_spi_transfer_one_poll(master, spi, tfr);</div><div class='ctx'> </div><div class='ctx'> 	/* run in interrupt mode for all others */</div><div class='ctx'> 	return bcm2835aux_spi_transfer_one_irq(master, spi, tfr);</div><div class='del'>-#undef HZ_PER_BYTE</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm2835aux_spi_prepare_message(struct spi_master *master,</div><div class='hunk'>@@ -421,6 +452,50 @@ static void bcm2835aux_spi_handle_err(struct spi_master *master,</div><div class='ctx'> 	bcm2835aux_spi_reset_hw(bs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bcm2835aux_spi_setup(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* sanity check for native cs */</div><div class='add'>+	if (spi-&gt;mode &amp; SPI_NO_CS)</div><div class='add'>+		return 0;</div><div class='add'>+	if (gpio_is_valid(spi-&gt;cs_gpio)) {</div><div class='add'>+		/* with gpio-cs set the GPIO to the correct level</div><div class='add'>+		 * and as output (in case the dt has the gpio not configured</div><div class='add'>+		 * as output but native cs)</div><div class='add'>+		 */</div><div class='add'>+		ret = gpio_direction_output(spi-&gt;cs_gpio,</div><div class='add'>+					    (spi-&gt;mode &amp; SPI_CS_HIGH) ? 0 : 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(&amp;spi-&gt;dev,</div><div class='add'>+				"could not set gpio %i as output: %i\n",</div><div class='add'>+				spi-&gt;cs_gpio, ret);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for dt-backwards compatibility: only support native on CS0</div><div class='add'>+	 * known things not supported with broken native CS:</div><div class='add'>+	 * * multiple chip-selects: cs0-cs2 are all</div><div class='add'>+	 *     simultaniously asserted whenever there is a transfer</div><div class='add'>+	 *     this even includes SPI_NO_CS</div><div class='add'>+	 * * SPI_CS_HIGH: cs are always asserted low</div><div class='add'>+	 * * cs_change: cs is deasserted after each spi_transfer</div><div class='add'>+	 * * cs_delay_usec: cs is always deasserted one SCK cycle</div><div class='add'>+	 *     after the last transfer</div><div class='add'>+	 * probably more...</div><div class='add'>+	 */</div><div class='add'>+	dev_warn(&amp;spi-&gt;dev,</div><div class='add'>+		 "Native CS is not supported - please configure cs-gpio in device-tree\n");</div><div class='add'>+</div><div class='add'>+	if (spi-&gt;chip_select == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;spi-&gt;dev, "Native CS is not working for cs &gt; 0\n");</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bcm2835aux_spi_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_master *master;</div><div class='hunk'>@@ -438,7 +513,19 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	platform_set_drvdata(pdev, master);</div><div class='ctx'> 	master-&gt;mode_bits = (SPI_CPOL | SPI_CS_HIGH | SPI_NO_CS);</div><div class='ctx'> 	master-&gt;bits_per_word_mask = SPI_BPW_MASK(8);</div><div class='del'>-	master-&gt;num_chipselect = -1;</div><div class='add'>+	/* even though the driver never officially supported native CS</div><div class='add'>+	 * allow a single native CS for legacy DT support purposes when</div><div class='add'>+	 * no cs-gpio is configured.</div><div class='add'>+	 * Known limitations for native cs are:</div><div class='add'>+	 * * multiple chip-selects: cs0-cs2 are all simultaniously asserted</div><div class='add'>+	 *     whenever there is a transfer -  this even includes SPI_NO_CS</div><div class='add'>+	 * * SPI_CS_HIGH: is ignores - cs are always asserted low</div><div class='add'>+	 * * cs_change: cs is deasserted after each spi_transfer</div><div class='add'>+	 * * cs_delay_usec: cs is always deasserted one SCK cycle after</div><div class='add'>+	 *     a spi_transfer</div><div class='add'>+	 */</div><div class='add'>+	master-&gt;num_chipselect = 1;</div><div class='add'>+	master-&gt;setup = bcm2835aux_spi_setup;</div><div class='ctx'> 	master-&gt;transfer_one = bcm2835aux_spi_transfer_one;</div><div class='ctx'> 	master-&gt;handle_err = bcm2835aux_spi_handle_err;</div><div class='ctx'> 	master-&gt;prepare_message = bcm2835aux_spi_prepare_message;</div><div class='hunk'>@@ -502,6 +589,8 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_clk_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bcm2835aux_debugfs_create(bs, dev_name(&amp;pdev-&gt;dev));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_clk_disable:</div><div class='hunk'>@@ -516,6 +605,8 @@ static int bcm2835aux_spi_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct spi_master *master = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct bcm2835aux_spi *bs = spi_master_get_devdata(master);</div><div class='ctx'> </div><div class='add'>+	bcm2835aux_debugfs_remove(bs);</div><div class='add'>+</div><div class='ctx'> 	bcm2835aux_spi_reset_hw(bs);</div><div class='ctx'> </div><div class='ctx'> 	/* disable the HW block by releasing the clock */</div><div class='head'>diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c<br/>index dd9a8c54a693..4243e53f9f7b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-bitbang.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-bitbang.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-bitbang.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-bitbang.c</a></div><div class='hunk'>@@ -335,6 +335,42 @@ static void spi_bitbang_set_cs(struct spi_device *spi, bool enable)</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+int spi_bitbang_init(struct spi_bitbang *bitbang)</div><div class='add'>+{</div><div class='add'>+	struct spi_master *master = bitbang-&gt;master;</div><div class='add'>+</div><div class='add'>+	if (!master || !bitbang-&gt;chipselect)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;bitbang-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!master-&gt;mode_bits)</div><div class='add'>+		master-&gt;mode_bits = SPI_CPOL | SPI_CPHA | bitbang-&gt;flags;</div><div class='add'>+</div><div class='add'>+	if (master-&gt;transfer || master-&gt;transfer_one_message)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	master-&gt;prepare_transfer_hardware = spi_bitbang_prepare_hardware;</div><div class='add'>+	master-&gt;unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;</div><div class='add'>+	master-&gt;transfer_one = spi_bitbang_transfer_one;</div><div class='add'>+	master-&gt;set_cs = spi_bitbang_set_cs;</div><div class='add'>+</div><div class='add'>+	if (!bitbang-&gt;txrx_bufs) {</div><div class='add'>+		bitbang-&gt;use_dma = 0;</div><div class='add'>+		bitbang-&gt;txrx_bufs = spi_bitbang_bufs;</div><div class='add'>+		if (!master-&gt;setup) {</div><div class='add'>+			if (!bitbang-&gt;setup_transfer)</div><div class='add'>+				bitbang-&gt;setup_transfer =</div><div class='add'>+					 spi_bitbang_setup_transfer;</div><div class='add'>+			master-&gt;setup = spi_bitbang_setup;</div><div class='add'>+			master-&gt;cleanup = spi_bitbang_cleanup;</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_GPL(spi_bitbang_init);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * spi_bitbang_start - start up a polled/bitbanging SPI master driver</div><div class='ctx'>  * @bitbang: driver handle</div><div class='hunk'>@@ -368,33 +404,9 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)</div><div class='ctx'> 	struct spi_master *master = bitbang-&gt;master;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!master || !bitbang-&gt;chipselect)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;bitbang-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!master-&gt;mode_bits)</div><div class='del'>-		master-&gt;mode_bits = SPI_CPOL | SPI_CPHA | bitbang-&gt;flags;</div><div class='del'>-</div><div class='del'>-	if (master-&gt;transfer || master-&gt;transfer_one_message)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	master-&gt;prepare_transfer_hardware = spi_bitbang_prepare_hardware;</div><div class='del'>-	master-&gt;unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;</div><div class='del'>-	master-&gt;transfer_one = spi_bitbang_transfer_one;</div><div class='del'>-	master-&gt;set_cs = spi_bitbang_set_cs;</div><div class='del'>-</div><div class='del'>-	if (!bitbang-&gt;txrx_bufs) {</div><div class='del'>-		bitbang-&gt;use_dma = 0;</div><div class='del'>-		bitbang-&gt;txrx_bufs = spi_bitbang_bufs;</div><div class='del'>-		if (!master-&gt;setup) {</div><div class='del'>-			if (!bitbang-&gt;setup_transfer)</div><div class='del'>-				bitbang-&gt;setup_transfer =</div><div class='del'>-					 spi_bitbang_setup_transfer;</div><div class='del'>-			master-&gt;setup = spi_bitbang_setup;</div><div class='del'>-			master-&gt;cleanup = spi_bitbang_cleanup;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ret = spi_bitbang_init(bitbang);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* driver may get busy before register() returns, especially</div><div class='ctx'> 	 * if someone registered boardinfo for devices</div><div class='head'>diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c<br/>index 4bd59a93d988..de952b17bc10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-dw-mmio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-dw-mmio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-dw-mmio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-dw-mmio.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> struct dw_spi_mmio {</div><div class='ctx'> 	struct dw_spi  dws;</div><div class='ctx'> 	struct clk     *clk;</div><div class='add'>+	struct clk     *pclk;</div><div class='ctx'> 	void           *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -172,6 +173,14 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	/* Optional clock needed to access the registers */</div><div class='add'>+	dwsmmio-&gt;pclk = devm_clk_get_optional(&amp;pdev-&gt;dev, "pclk");</div><div class='add'>+	if (IS_ERR(dwsmmio-&gt;pclk))</div><div class='add'>+		return PTR_ERR(dwsmmio-&gt;pclk);</div><div class='add'>+	ret = clk_prepare_enable(dwsmmio-&gt;pclk);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_clk;</div><div class='add'>+</div><div class='ctx'> 	dws-&gt;bus_num = pdev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	dws-&gt;max_freq = clk_get_rate(dwsmmio-&gt;clk);</div><div class='hunk'>@@ -199,6 +208,8 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	clk_disable_unprepare(dwsmmio-&gt;pclk);</div><div class='add'>+out_clk:</div><div class='ctx'> 	clk_disable_unprepare(dwsmmio-&gt;clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -208,6 +219,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	dw_spi_remove_host(&amp;dwsmmio-&gt;dws);</div><div class='add'>+	clk_disable_unprepare(dwsmmio-&gt;pclk);</div><div class='ctx'> 	clk_disable_unprepare(dwsmmio-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c<br/>index 79fc3940245a..81889389280b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-ep93xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-ep93xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-ep93xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-ep93xx.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_data/dma-ep93xx.h&gt;</div><div class='hunk'>@@ -652,7 +651,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int error;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	info = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!info) {</div><div class='hunk'>@@ -676,6 +674,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!master)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	master-&gt;use_gpio_descriptors = true;</div><div class='ctx'> 	master-&gt;prepare_transfer_hardware = ep93xx_spi_prepare_hardware;</div><div class='ctx'> 	master-&gt;unprepare_transfer_hardware = ep93xx_spi_unprepare_hardware;</div><div class='ctx'> 	master-&gt;prepare_message = ep93xx_spi_prepare_message;</div><div class='hunk'>@@ -683,31 +682,11 @@ static int ep93xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	master-&gt;bus_num = pdev-&gt;id;</div><div class='ctx'> 	master-&gt;mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;</div><div class='ctx'> 	master-&gt;bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 16);</div><div class='del'>-</div><div class='del'>-	master-&gt;num_chipselect = info-&gt;num_chipselect;</div><div class='del'>-	master-&gt;cs_gpios = devm_kcalloc(&amp;master-&gt;dev,</div><div class='del'>-					master-&gt;num_chipselect, sizeof(int),</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-	if (!master-&gt;cs_gpios) {</div><div class='del'>-		error = -ENOMEM;</div><div class='del'>-		goto fail_release_master;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; master-&gt;num_chipselect; i++) {</div><div class='del'>-		master-&gt;cs_gpios[i] = info-&gt;chipselect[i];</div><div class='del'>-</div><div class='del'>-		if (!gpio_is_valid(master-&gt;cs_gpios[i]))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		error = devm_gpio_request_one(&amp;pdev-&gt;dev, master-&gt;cs_gpios[i],</div><div class='del'>-					      GPIOF_OUT_INIT_HIGH,</div><div class='del'>-					      "ep93xx-spi");</div><div class='del'>-		if (error) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "could not request cs gpio %d\n",</div><div class='del'>-				master-&gt;cs_gpios[i]);</div><div class='del'>-			goto fail_release_master;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * The SPI core will count the number of GPIO descriptors to figure</div><div class='add'>+	 * out the number of chip selects available on the platform.</div><div class='add'>+	 */</div><div class='add'>+	master-&gt;num_chipselect = 0;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, master);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-fsl-lib.h b/drivers/spi/spi-fsl-lib.h<br/>index f303f306b38e..483734bc1b1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-lib.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-lib.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-lib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-fsl-lib.h</a></div><div class='hunk'>@@ -95,8 +95,10 @@ static inline u32 mpc8xxx_spi_read_reg(__be32 __iomem *reg)</div><div class='ctx'> </div><div class='ctx'> struct mpc8xxx_spi_probe_info {</div><div class='ctx'> 	struct fsl_spi_platform_data pdata;</div><div class='add'>+	int ngpios;</div><div class='ctx'> 	int *gpios;</div><div class='ctx'> 	bool *alow_flags;</div><div class='add'>+	__be32 __iomem *immr_spi_cs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern u32 mpc8xxx_spi_tx_buf_u8(struct mpc8xxx_spi *mpc8xxx_spi);</div><div class='head'>diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c<br/>index 391863914043..d08e9324140e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-lpspi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-lpspi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-lpspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-fsl-lpspi.c</a></div><div class='hunk'>@@ -8,7 +8,10 @@</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='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/gpio.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/irq.h&gt;</div><div class='hunk'>@@ -16,7 +19,12 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.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='add'>+#include &lt;linux/platform_data/dma-imx.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/spi-imx.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.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/spi/spi_bitbang.h&gt;</div><div class='hunk'>@@ -24,6 +32,11 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "fsl_lpspi"</div><div class='ctx'> </div><div class='add'>+#define FSL_LPSPI_RPM_TIMEOUT 50 /* 50ms */</div><div class='add'>+</div><div class='add'>+/* The maximum bytes that edma can transfer once.*/</div><div class='add'>+#define FSL_LPSPI_MAX_EDMA_BYTES  ((1 &lt;&lt; 15) - 1)</div><div class='add'>+</div><div class='ctx'> /* i.MX7ULP LPSPI registers */</div><div class='ctx'> #define IMX7ULP_VERID	0x0</div><div class='ctx'> #define IMX7ULP_PARAM	0x4</div><div class='hunk'>@@ -57,12 +70,14 @@</div><div class='ctx'> #define IER_FCIE	BIT(9)</div><div class='ctx'> #define IER_RDIE	BIT(1)</div><div class='ctx'> #define IER_TDIE	BIT(0)</div><div class='add'>+#define DER_RDDE	BIT(1)</div><div class='add'>+#define DER_TDDE	BIT(0)</div><div class='ctx'> #define CFGR1_PCSCFG	BIT(27)</div><div class='ctx'> #define CFGR1_PINCFG	(BIT(24)|BIT(25))</div><div class='ctx'> #define CFGR1_PCSPOL	BIT(8)</div><div class='ctx'> #define CFGR1_NOSTALL	BIT(3)</div><div class='ctx'> #define CFGR1_MASTER	BIT(0)</div><div class='del'>-#define FSR_RXCOUNT	(BIT(16)|BIT(17)|BIT(18))</div><div class='add'>+#define FSR_TXCOUNT	(0xFF)</div><div class='ctx'> #define RSR_RXEMPTY	BIT(1)</div><div class='ctx'> #define TCR_CPOL	BIT(31)</div><div class='ctx'> #define TCR_CPHA	BIT(30)</div><div class='hunk'>@@ -84,8 +99,11 @@ struct lpspi_config {</div><div class='ctx'> struct fsl_lpspi_data {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void __iomem *base;</div><div class='del'>-	struct clk *clk;</div><div class='add'>+	unsigned long base_phys;</div><div class='add'>+	struct clk *clk_ipg;</div><div class='add'>+	struct clk *clk_per;</div><div class='ctx'> 	bool is_slave;</div><div class='add'>+	bool is_first_byte;</div><div class='ctx'> </div><div class='ctx'> 	void *rx_buf;</div><div class='ctx'> 	const void *tx_buf;</div><div class='hunk'>@@ -101,6 +119,13 @@ struct fsl_lpspi_data {</div><div class='ctx'> 	struct completion xfer_done;</div><div class='ctx'> </div><div class='ctx'> 	bool slave_aborted;</div><div class='add'>+</div><div class='add'>+	/* DMA */</div><div class='add'>+	bool usedma;</div><div class='add'>+	struct completion dma_rx_completion;</div><div class='add'>+	struct completion dma_tx_completion;</div><div class='add'>+</div><div class='add'>+	int chipselect[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id fsl_lpspi_dt_ids[] = {</div><div class='hunk'>@@ -147,12 +172,48 @@ static void fsl_lpspi_intctrl(struct fsl_lpspi_data *fsl_lpspi,</div><div class='ctx'> 	writel(enable, fsl_lpspi-&gt;base + IMX7ULP_IER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fsl_lpspi_bytes_per_word(const int bpw)</div><div class='add'>+{</div><div class='add'>+	return DIV_ROUND_UP(bpw, BITS_PER_BYTE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fsl_lpspi_can_dma(struct spi_controller *controller,</div><div class='add'>+			      struct spi_device *spi,</div><div class='add'>+			      struct spi_transfer *transfer)</div><div class='add'>+{</div><div class='add'>+	unsigned int bytes_per_word;</div><div class='add'>+</div><div class='add'>+	if (!controller-&gt;dma_rx)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	bytes_per_word = fsl_lpspi_bytes_per_word(transfer-&gt;bits_per_word);</div><div class='add'>+</div><div class='add'>+	switch (bytes_per_word)</div><div class='add'>+	{</div><div class='add'>+		case 1:</div><div class='add'>+		case 2:</div><div class='add'>+		case 4:</div><div class='add'>+			break;</div><div class='add'>+		default:</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='ctx'> static int lpspi_prepare_xfer_hardware(struct spi_controller *controller)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_lpspi_data *fsl_lpspi =</div><div class='ctx'> 				spi_controller_get_devdata(controller);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(fsl_lpspi-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(fsl_lpspi-&gt;dev, "failed to enable clock\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return clk_prepare_enable(fsl_lpspi-&gt;clk);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)</div><div class='hunk'>@@ -160,7 +221,22 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)</div><div class='ctx'> 	struct fsl_lpspi_data *fsl_lpspi =</div><div class='ctx'> 				spi_controller_get_devdata(controller);</div><div class='ctx'> </div><div class='del'>-	clk_disable_unprepare(fsl_lpspi-&gt;clk);</div><div class='add'>+	pm_runtime_mark_last_busy(fsl_lpspi-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(fsl_lpspi-&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 int fsl_lpspi_prepare_message(struct spi_controller *controller,</div><div class='add'>+				     struct spi_message *msg)</div><div class='add'>+{</div><div class='add'>+	struct fsl_lpspi_data *fsl_lpspi =</div><div class='add'>+					spi_controller_get_devdata(controller);</div><div class='add'>+	struct spi_device *spi = msg-&gt;spi;</div><div class='add'>+	int gpio = fsl_lpspi-&gt;chipselect[spi-&gt;chip_select];</div><div class='add'>+</div><div class='add'>+	if (gpio_is_valid(gpio))</div><div class='add'>+		gpio_direction_output(gpio, spi-&gt;mode &amp; SPI_CS_HIGH ? 0 : 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -197,8 +273,7 @@ static void fsl_lpspi_read_rx_fifo(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> 		fsl_lpspi-&gt;rx(fsl_lpspi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi,</div><div class='del'>-			      bool is_first_xfer)</div><div class='add'>+static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> {</div><div class='ctx'> 	u32 temp = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -213,11 +288,13 @@ static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi,</div><div class='ctx'> 		 * For the first transfer, clear TCR_CONTC to assert SS.</div><div class='ctx'> 		 * For subsequent transfer, set TCR_CONTC to keep SS asserted.</div><div class='ctx'> 		 */</div><div class='del'>-		temp |= TCR_CONT;</div><div class='del'>-		if (is_first_xfer)</div><div class='del'>-			temp &amp;= ~TCR_CONTC;</div><div class='del'>-		else</div><div class='del'>-			temp |= TCR_CONTC;</div><div class='add'>+		if (!fsl_lpspi-&gt;usedma) {</div><div class='add'>+			temp |= TCR_CONT;</div><div class='add'>+			if (fsl_lpspi-&gt;is_first_byte)</div><div class='add'>+				temp &amp;= ~TCR_CONTC;</div><div class='add'>+			else</div><div class='add'>+				temp |= TCR_CONTC;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	writel(temp, fsl_lpspi-&gt;base + IMX7ULP_TCR);</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +305,11 @@ static void fsl_lpspi_set_watermark(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> {</div><div class='ctx'> 	u32 temp;</div><div class='ctx'> </div><div class='del'>-	temp = fsl_lpspi-&gt;watermark &gt;&gt; 1 | (fsl_lpspi-&gt;watermark &gt;&gt; 1) &lt;&lt; 16;</div><div class='add'>+	if (!fsl_lpspi-&gt;usedma)</div><div class='add'>+		temp = fsl_lpspi-&gt;watermark &gt;&gt; 1 |</div><div class='add'>+		       (fsl_lpspi-&gt;watermark &gt;&gt; 1) &lt;&lt; 16;</div><div class='add'>+	else</div><div class='add'>+		temp = fsl_lpspi-&gt;watermark &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	writel(temp, fsl_lpspi-&gt;base + IMX7ULP_FCR);</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +322,14 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> 	unsigned int perclk_rate, scldiv;</div><div class='ctx'> 	u8 prescale;</div><div class='ctx'> </div><div class='del'>-	perclk_rate = clk_get_rate(fsl_lpspi-&gt;clk);</div><div class='add'>+	perclk_rate = clk_get_rate(fsl_lpspi-&gt;clk_per);</div><div class='add'>+</div><div class='add'>+	if (config.speed_hz &gt; perclk_rate / 2) {</div><div class='add'>+		dev_err(fsl_lpspi-&gt;dev,</div><div class='add'>+		      "per-clk should be at least two times of transfer speed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (prescale = 0; prescale &lt; 8; prescale++) {</div><div class='ctx'> 		scldiv = perclk_rate /</div><div class='ctx'> 			 (clkdivs[prescale] * config.speed_hz) - 2;</div><div class='hunk'>@@ -257,12 +345,59 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> 	writel(scldiv | (scldiv &lt;&lt; 8) | ((scldiv &gt;&gt; 1) &lt;&lt; 16),</div><div class='ctx'> 					fsl_lpspi-&gt;base + IMX7ULP_CCR);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(fsl_lpspi-&gt;dev, "perclk=%d, speed=%d, prescale =%d, scldiv=%d\n",</div><div class='add'>+	dev_dbg(fsl_lpspi-&gt;dev, "perclk=%d, speed=%d, prescale=%d, scldiv=%d\n",</div><div class='ctx'> 		perclk_rate, config.speed_hz, prescale, scldiv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fsl_lpspi_dma_configure(struct spi_controller *controller)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	enum dma_slave_buswidth buswidth;</div><div class='add'>+	struct dma_slave_config rx = {}, tx = {};</div><div class='add'>+	struct fsl_lpspi_data *fsl_lpspi =</div><div class='add'>+				spi_controller_get_devdata(controller);</div><div class='add'>+</div><div class='add'>+	switch (fsl_lpspi_bytes_per_word(fsl_lpspi-&gt;config.bpw)) {</div><div class='add'>+	case 4:</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE;</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'>+	tx.direction = DMA_MEM_TO_DEV;</div><div class='add'>+	tx.dst_addr = fsl_lpspi-&gt;base_phys + IMX7ULP_TDR;</div><div class='add'>+	tx.dst_addr_width = buswidth;</div><div class='add'>+	tx.dst_maxburst = 1;</div><div class='add'>+	ret = dmaengine_slave_config(controller-&gt;dma_tx, &amp;tx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(fsl_lpspi-&gt;dev, "TX dma configuration failed with %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'>+	rx.direction = DMA_DEV_TO_MEM;</div><div class='add'>+	rx.src_addr = fsl_lpspi-&gt;base_phys + IMX7ULP_RDR;</div><div class='add'>+	rx.src_addr_width = buswidth;</div><div class='add'>+	rx.src_maxburst = 1;</div><div class='add'>+	ret = dmaengine_slave_config(controller-&gt;dma_rx, &amp;rx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(fsl_lpspi-&gt;dev, "RX dma configuration failed with %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='ctx'> static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> {</div><div class='ctx'> 	u32 temp;</div><div class='hunk'>@@ -288,18 +423,27 @@ static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> 	temp |= CR_RRF | CR_RTF | CR_MEN;</div><div class='ctx'> 	writel(temp, fsl_lpspi-&gt;base + IMX7ULP_CR);</div><div class='ctx'> </div><div class='add'>+	temp = 0;</div><div class='add'>+	if (fsl_lpspi-&gt;usedma)</div><div class='add'>+		temp = DER_TDDE | DER_RDDE;</div><div class='add'>+	writel(temp, fsl_lpspi-&gt;base + IMX7ULP_DER);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fsl_lpspi_setup_transfer(struct spi_device *spi,</div><div class='add'>+static int fsl_lpspi_setup_transfer(struct spi_controller *controller,</div><div class='add'>+				     struct spi_device *spi,</div><div class='ctx'> 				     struct spi_transfer *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_lpspi_data *fsl_lpspi =</div><div class='ctx'> 				spi_controller_get_devdata(spi-&gt;controller);</div><div class='ctx'> </div><div class='add'>+	if (t == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	fsl_lpspi-&gt;config.mode = spi-&gt;mode;</div><div class='del'>-	fsl_lpspi-&gt;config.bpw = t ? t-&gt;bits_per_word : spi-&gt;bits_per_word;</div><div class='del'>-	fsl_lpspi-&gt;config.speed_hz = t ? t-&gt;speed_hz : spi-&gt;max_speed_hz;</div><div class='add'>+	fsl_lpspi-&gt;config.bpw = t-&gt;bits_per_word;</div><div class='add'>+	fsl_lpspi-&gt;config.speed_hz = t-&gt;speed_hz;</div><div class='ctx'> 	fsl_lpspi-&gt;config.chip_select = spi-&gt;chip_select;</div><div class='ctx'> </div><div class='ctx'> 	if (!fsl_lpspi-&gt;config.speed_hz)</div><div class='hunk'>@@ -324,7 +468,12 @@ static void fsl_lpspi_setup_transfer(struct spi_device *spi,</div><div class='ctx'> 	else</div><div class='ctx'> 		fsl_lpspi-&gt;watermark = fsl_lpspi-&gt;txfifosize;</div><div class='ctx'> </div><div class='del'>-	fsl_lpspi_config(fsl_lpspi);</div><div class='add'>+	if (fsl_lpspi_can_dma(controller, spi, t))</div><div class='add'>+		fsl_lpspi-&gt;usedma = 1;</div><div class='add'>+	else</div><div class='add'>+		fsl_lpspi-&gt;usedma = 0;</div><div class='add'>+</div><div class='add'>+	return fsl_lpspi_config(fsl_lpspi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fsl_lpspi_slave_abort(struct spi_controller *controller)</div><div class='hunk'>@@ -333,7 +482,13 @@ static int fsl_lpspi_slave_abort(struct spi_controller *controller)</div><div class='ctx'> 				spi_controller_get_devdata(controller);</div><div class='ctx'> </div><div class='ctx'> 	fsl_lpspi-&gt;slave_aborted = true;</div><div class='del'>-	complete(&amp;fsl_lpspi-&gt;xfer_done);</div><div class='add'>+	if (!fsl_lpspi-&gt;usedma)</div><div class='add'>+		complete(&amp;fsl_lpspi-&gt;xfer_done);</div><div class='add'>+	else {</div><div class='add'>+		complete(&amp;fsl_lpspi-&gt;dma_tx_completion);</div><div class='add'>+		complete(&amp;fsl_lpspi-&gt;dma_rx_completion);</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'>@@ -362,8 +517,10 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> {</div><div class='ctx'> 	u32 temp;</div><div class='ctx'> </div><div class='del'>-	/* Disable all interrupt */</div><div class='del'>-	fsl_lpspi_intctrl(fsl_lpspi, 0);</div><div class='add'>+	if (!fsl_lpspi-&gt;usedma) {</div><div class='add'>+		/* Disable all interrupt */</div><div class='add'>+		fsl_lpspi_intctrl(fsl_lpspi, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* W1C for all flags in SR */</div><div class='ctx'> 	temp = 0x3F &lt;&lt; 8;</div><div class='hunk'>@@ -376,8 +533,177 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fsl_lpspi_transfer_one(struct spi_controller *controller,</div><div class='del'>-				  struct spi_device *spi,</div><div class='add'>+static void fsl_lpspi_dma_rx_callback(void *cookie)</div><div class='add'>+{</div><div class='add'>+	struct fsl_lpspi_data *fsl_lpspi = (struct fsl_lpspi_data *)cookie;</div><div class='add'>+</div><div class='add'>+	complete(&amp;fsl_lpspi-&gt;dma_rx_completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsl_lpspi_dma_tx_callback(void *cookie)</div><div class='add'>+{</div><div class='add'>+	struct fsl_lpspi_data *fsl_lpspi = (struct fsl_lpspi_data *)cookie;</div><div class='add'>+</div><div class='add'>+	complete(&amp;fsl_lpspi-&gt;dma_tx_completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsl_lpspi_calculate_timeout(struct fsl_lpspi_data *fsl_lpspi,</div><div class='add'>+				       int size)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = 0;</div><div class='add'>+</div><div class='add'>+	/* Time with actual data transfer and CS change delay related to HW */</div><div class='add'>+	timeout = (8 + 4) * size / fsl_lpspi-&gt;config.speed_hz;</div><div class='add'>+</div><div class='add'>+	/* Add extra second for scheduler related activities */</div><div class='add'>+	timeout += 1;</div><div class='add'>+</div><div class='add'>+	/* Double calculated timeout */</div><div class='add'>+	return msecs_to_jiffies(2 * timeout * MSEC_PER_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsl_lpspi_dma_transfer(struct spi_controller *controller,</div><div class='add'>+				struct fsl_lpspi_data *fsl_lpspi,</div><div class='add'>+				struct spi_transfer *transfer)</div><div class='add'>+{</div><div class='add'>+	struct dma_async_tx_descriptor *desc_tx, *desc_rx;</div><div class='add'>+	unsigned long transfer_timeout;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	struct sg_table *tx = &amp;transfer-&gt;tx_sg, *rx = &amp;transfer-&gt;rx_sg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fsl_lpspi_dma_configure(controller);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	desc_rx = dmaengine_prep_slave_sg(controller-&gt;dma_rx,</div><div class='add'>+				rx-&gt;sgl, rx-&gt;nents, DMA_DEV_TO_MEM,</div><div class='add'>+				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+	if (!desc_rx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	desc_rx-&gt;callback = fsl_lpspi_dma_rx_callback;</div><div class='add'>+	desc_rx-&gt;callback_param = (void *)fsl_lpspi;</div><div class='add'>+	dmaengine_submit(desc_rx);</div><div class='add'>+	reinit_completion(&amp;fsl_lpspi-&gt;dma_rx_completion);</div><div class='add'>+	dma_async_issue_pending(controller-&gt;dma_rx);</div><div class='add'>+</div><div class='add'>+	desc_tx = dmaengine_prep_slave_sg(controller-&gt;dma_tx,</div><div class='add'>+				tx-&gt;sgl, tx-&gt;nents, DMA_MEM_TO_DEV,</div><div class='add'>+				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+	if (!desc_tx) {</div><div class='add'>+		dmaengine_terminate_all(controller-&gt;dma_tx);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc_tx-&gt;callback = fsl_lpspi_dma_tx_callback;</div><div class='add'>+	desc_tx-&gt;callback_param = (void *)fsl_lpspi;</div><div class='add'>+	dmaengine_submit(desc_tx);</div><div class='add'>+	reinit_completion(&amp;fsl_lpspi-&gt;dma_tx_completion);</div><div class='add'>+	dma_async_issue_pending(controller-&gt;dma_tx);</div><div class='add'>+</div><div class='add'>+	fsl_lpspi-&gt;slave_aborted = false;</div><div class='add'>+</div><div class='add'>+	if (!fsl_lpspi-&gt;is_slave) {</div><div class='add'>+		transfer_timeout = fsl_lpspi_calculate_timeout(fsl_lpspi,</div><div class='add'>+							       transfer-&gt;len);</div><div class='add'>+</div><div class='add'>+		/* Wait eDMA to finish the data transfer.*/</div><div class='add'>+		timeout = wait_for_completion_timeout(&amp;fsl_lpspi-&gt;dma_tx_completion,</div><div class='add'>+						      transfer_timeout);</div><div class='add'>+		if (!timeout) {</div><div class='add'>+			dev_err(fsl_lpspi-&gt;dev, "I/O Error in DMA TX\n");</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_tx);</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_rx);</div><div class='add'>+			fsl_lpspi_reset(fsl_lpspi);</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		timeout = wait_for_completion_timeout(&amp;fsl_lpspi-&gt;dma_rx_completion,</div><div class='add'>+						      transfer_timeout);</div><div class='add'>+		if (!timeout) {</div><div class='add'>+			dev_err(fsl_lpspi-&gt;dev, "I/O Error in DMA RX\n");</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_tx);</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_rx);</div><div class='add'>+			fsl_lpspi_reset(fsl_lpspi);</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (wait_for_completion_interruptible(&amp;fsl_lpspi-&gt;dma_tx_completion) ||</div><div class='add'>+			fsl_lpspi-&gt;slave_aborted) {</div><div class='add'>+			dev_dbg(fsl_lpspi-&gt;dev,</div><div class='add'>+				"I/O Error in DMA TX interrupted\n");</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_tx);</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_rx);</div><div class='add'>+			fsl_lpspi_reset(fsl_lpspi);</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (wait_for_completion_interruptible(&amp;fsl_lpspi-&gt;dma_rx_completion) ||</div><div class='add'>+			fsl_lpspi-&gt;slave_aborted) {</div><div class='add'>+			dev_dbg(fsl_lpspi-&gt;dev,</div><div class='add'>+				"I/O Error in DMA RX interrupted\n");</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_tx);</div><div class='add'>+			dmaengine_terminate_all(controller-&gt;dma_rx);</div><div class='add'>+			fsl_lpspi_reset(fsl_lpspi);</div><div class='add'>+			return -EINTR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fsl_lpspi_reset(fsl_lpspi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsl_lpspi_dma_exit(struct spi_controller *controller)</div><div class='add'>+{</div><div class='add'>+	if (controller-&gt;dma_rx) {</div><div class='add'>+		dma_release_channel(controller-&gt;dma_rx);</div><div class='add'>+		controller-&gt;dma_rx = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (controller-&gt;dma_tx) {</div><div class='add'>+		dma_release_channel(controller-&gt;dma_tx);</div><div class='add'>+		controller-&gt;dma_tx = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsl_lpspi_dma_init(struct device *dev,</div><div class='add'>+			      struct fsl_lpspi_data *fsl_lpspi,</div><div class='add'>+			      struct spi_controller *controller)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Prepare for TX DMA: */</div><div class='add'>+	controller-&gt;dma_tx = dma_request_slave_channel_reason(dev, "tx");</div><div class='add'>+	if (IS_ERR(controller-&gt;dma_tx)) {</div><div class='add'>+		ret = PTR_ERR(controller-&gt;dma_tx);</div><div class='add'>+		dev_dbg(dev, "can't get the TX DMA channel, error %d!\n", ret);</div><div class='add'>+		controller-&gt;dma_tx = NULL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare for RX DMA: */</div><div class='add'>+	controller-&gt;dma_rx = dma_request_slave_channel_reason(dev, "rx");</div><div class='add'>+	if (IS_ERR(controller-&gt;dma_rx)) {</div><div class='add'>+		ret = PTR_ERR(controller-&gt;dma_rx);</div><div class='add'>+		dev_dbg(dev, "can't get the RX DMA channel, error %d\n", ret);</div><div class='add'>+		controller-&gt;dma_rx = NULL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;fsl_lpspi-&gt;dma_rx_completion);</div><div class='add'>+	init_completion(&amp;fsl_lpspi-&gt;dma_tx_completion);</div><div class='add'>+	controller-&gt;can_dma = fsl_lpspi_can_dma;</div><div class='add'>+	controller-&gt;max_dma_len = FSL_LPSPI_MAX_EDMA_BYTES;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	fsl_lpspi_dma_exit(controller);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsl_lpspi_pio_transfer(struct spi_controller *controller,</div><div class='ctx'> 				  struct spi_transfer *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_lpspi_data *fsl_lpspi =</div><div class='hunk'>@@ -402,37 +728,30 @@ static int fsl_lpspi_transfer_one(struct spi_controller *controller,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fsl_lpspi_transfer_one_msg(struct spi_controller *controller,</div><div class='del'>-				      struct spi_message *msg)</div><div class='add'>+static int fsl_lpspi_transfer_one(struct spi_controller *controller,</div><div class='add'>+				  struct spi_device *spi,</div><div class='add'>+				  struct spi_transfer *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_lpspi_data *fsl_lpspi =</div><div class='del'>-				spi_controller_get_devdata(controller);</div><div class='del'>-	struct spi_device *spi = msg-&gt;spi;</div><div class='del'>-	struct spi_transfer *xfer;</div><div class='del'>-	bool is_first_xfer = true;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	msg-&gt;status = 0;</div><div class='del'>-	msg-&gt;actual_length = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(xfer, &amp;msg-&gt;transfers, transfer_list) {</div><div class='del'>-		fsl_lpspi_setup_transfer(spi, xfer);</div><div class='del'>-		fsl_lpspi_set_cmd(fsl_lpspi, is_first_xfer);</div><div class='del'>-</div><div class='del'>-		is_first_xfer = false;</div><div class='add'>+					spi_controller_get_devdata(controller);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-		ret = fsl_lpspi_transfer_one(controller, spi, xfer);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto complete;</div><div class='add'>+	fsl_lpspi-&gt;is_first_byte = true;</div><div class='add'>+	ret = fsl_lpspi_setup_transfer(controller, spi, t);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		msg-&gt;actual_length += xfer-&gt;len;</div><div class='del'>-	}</div><div class='add'>+	fsl_lpspi_set_cmd(fsl_lpspi);</div><div class='add'>+	fsl_lpspi-&gt;is_first_byte = false;</div><div class='ctx'> </div><div class='del'>-complete:</div><div class='del'>-	msg-&gt;status = ret;</div><div class='del'>-	spi_finalize_current_message(controller);</div><div class='add'>+	if (fsl_lpspi-&gt;usedma)</div><div class='add'>+		ret = fsl_lpspi_dma_transfer(controller, fsl_lpspi, t);</div><div class='add'>+	else</div><div class='add'>+		ret = fsl_lpspi_pio_transfer(controller, t);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</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'> static irqreturn_t fsl_lpspi_isr(int irq, void *dev_id)</div><div class='hunk'>@@ -452,7 +771,7 @@ static irqreturn_t fsl_lpspi_isr(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (temp_SR &amp; SR_MBF ||</div><div class='del'>-	    readl(fsl_lpspi-&gt;base + IMX7ULP_FSR) &amp; FSR_RXCOUNT) {</div><div class='add'>+	    readl(fsl_lpspi-&gt;base + IMX7ULP_FSR) &amp; FSR_TXCOUNT) {</div><div class='ctx'> 		writel(SR_FCF, fsl_lpspi-&gt;base + IMX7ULP_SR);</div><div class='ctx'> 		fsl_lpspi_intctrl(fsl_lpspi, IER_FCIE);</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='hunk'>@@ -467,15 +786,67 @@ static irqreturn_t fsl_lpspi_isr(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int fsl_lpspi_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct spi_controller *controller = dev_get_drvdata(dev);</div><div class='add'>+	struct fsl_lpspi_data *fsl_lpspi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	fsl_lpspi = spi_controller_get_devdata(controller);</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(fsl_lpspi-&gt;clk_per);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(fsl_lpspi-&gt;clk_ipg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_disable_unprepare(fsl_lpspi-&gt;clk_per);</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 fsl_lpspi_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct spi_controller *controller = dev_get_drvdata(dev);</div><div class='add'>+	struct fsl_lpspi_data *fsl_lpspi;</div><div class='add'>+</div><div class='add'>+	fsl_lpspi = spi_controller_get_devdata(controller);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(fsl_lpspi-&gt;clk_per);</div><div class='add'>+	clk_disable_unprepare(fsl_lpspi-&gt;clk_ipg);</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'>+static int fsl_lpspi_init_rpm(struct fsl_lpspi_data *fsl_lpspi)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = fsl_lpspi-&gt;dev;</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+	pm_runtime_set_autosuspend_delay(dev, FSL_LPSPI_RPM_TIMEOUT);</div><div class='add'>+	pm_runtime_use_autosuspend(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fsl_lpspi_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 fsl_lpspi_data *fsl_lpspi;</div><div class='ctx'> 	struct spi_controller *controller;</div><div class='add'>+	struct spi_imx_master *lpspi_platform_info =</div><div class='add'>+		dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	int ret, irq;</div><div class='add'>+	int i, ret, irq;</div><div class='ctx'> 	u32 temp;</div><div class='add'>+	bool is_slave;</div><div class='ctx'> </div><div class='del'>-	if (of_property_read_bool((&amp;pdev-&gt;dev)-&gt;of_node, "spi-slave"))</div><div class='add'>+	is_slave = of_property_read_bool((&amp;pdev-&gt;dev)-&gt;of_node, "spi-slave");</div><div class='add'>+	if (is_slave)</div><div class='ctx'> 		controller = spi_alloc_slave(&amp;pdev-&gt;dev,</div><div class='ctx'> 					sizeof(struct fsl_lpspi_data));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -487,15 +858,35 @@ static int fsl_lpspi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, controller);</div><div class='ctx'> </div><div class='del'>-	controller-&gt;bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);</div><div class='del'>-	controller-&gt;bus_num = pdev-&gt;id;</div><div class='del'>-</div><div class='ctx'> 	fsl_lpspi = spi_controller_get_devdata(controller);</div><div class='ctx'> 	fsl_lpspi-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	fsl_lpspi-&gt;is_slave = of_property_read_bool((&amp;pdev-&gt;dev)-&gt;of_node,</div><div class='del'>-						    "spi-slave");</div><div class='add'>+	fsl_lpspi-&gt;is_slave = is_slave;</div><div class='ctx'> </div><div class='del'>-	controller-&gt;transfer_one_message = fsl_lpspi_transfer_one_msg;</div><div class='add'>+	if (!fsl_lpspi-&gt;is_slave) {</div><div class='add'>+		for (i = 0; i &lt; controller-&gt;num_chipselect; i++) {</div><div class='add'>+			int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);</div><div class='add'>+</div><div class='add'>+			if (!gpio_is_valid(cs_gpio) &amp;&amp; lpspi_platform_info)</div><div class='add'>+				cs_gpio = lpspi_platform_info-&gt;chipselect[i];</div><div class='add'>+</div><div class='add'>+			fsl_lpspi-&gt;chipselect[i] = cs_gpio;</div><div class='add'>+			if (!gpio_is_valid(cs_gpio))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ret = devm_gpio_request(&amp;pdev-&gt;dev,</div><div class='add'>+						fsl_lpspi-&gt;chipselect[i],</div><div class='add'>+						DRIVER_NAME);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "can't get cs gpios\n");</div><div class='add'>+				goto out_controller_put;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		controller-&gt;cs_gpios = fsl_lpspi-&gt;chipselect;</div><div class='add'>+		controller-&gt;prepare_message = fsl_lpspi_prepare_message;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	controller-&gt;bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);</div><div class='add'>+	controller-&gt;transfer_one = fsl_lpspi_transfer_one;</div><div class='ctx'> 	controller-&gt;prepare_transfer_hardware = lpspi_prepare_xfer_hardware;</div><div class='ctx'> 	controller-&gt;unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware;</div><div class='ctx'> 	controller-&gt;mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;</div><div class='hunk'>@@ -512,6 +903,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)</div><div class='ctx'> 		ret = PTR_ERR(fsl_lpspi-&gt;base);</div><div class='ctx'> 		goto out_controller_put;</div><div class='ctx'> 	}</div><div class='add'>+	fsl_lpspi-&gt;base_phys = res-&gt;start;</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='hunk'>@@ -526,23 +918,39 @@ static int fsl_lpspi_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_controller_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fsl_lpspi-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, "ipg");</div><div class='del'>-	if (IS_ERR(fsl_lpspi-&gt;clk)) {</div><div class='del'>-		ret = PTR_ERR(fsl_lpspi-&gt;clk);</div><div class='add'>+	fsl_lpspi-&gt;clk_per = devm_clk_get(&amp;pdev-&gt;dev, "per");</div><div class='add'>+	if (IS_ERR(fsl_lpspi-&gt;clk_per)) {</div><div class='add'>+		ret = PTR_ERR(fsl_lpspi-&gt;clk_per);</div><div class='ctx'> 		goto out_controller_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = clk_prepare_enable(fsl_lpspi-&gt;clk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can't enable lpspi clock, ret=%d\n", ret);</div><div class='add'>+	fsl_lpspi-&gt;clk_ipg = devm_clk_get(&amp;pdev-&gt;dev, "ipg");</div><div class='add'>+	if (IS_ERR(fsl_lpspi-&gt;clk_ipg)) {</div><div class='add'>+		ret = PTR_ERR(fsl_lpspi-&gt;clk_ipg);</div><div class='add'>+		goto out_controller_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable the clock */</div><div class='add'>+	ret = fsl_lpspi_init_rpm(fsl_lpspi);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_controller_put;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(fsl_lpspi-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(fsl_lpspi-&gt;dev, "failed to enable clock\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	temp = readl(fsl_lpspi-&gt;base + IMX7ULP_PARAM);</div><div class='ctx'> 	fsl_lpspi-&gt;txfifosize = 1 &lt;&lt; (temp &amp; 0x0f);</div><div class='ctx'> 	fsl_lpspi-&gt;rxfifosize = 1 &lt;&lt; ((temp &gt;&gt; 8) &amp; 0x0f);</div><div class='ctx'> </div><div class='del'>-	clk_disable_unprepare(fsl_lpspi-&gt;clk);</div><div class='add'>+	ret = fsl_lpspi_dma_init(&amp;pdev-&gt;dev, fsl_lpspi, controller);</div><div class='add'>+	if (ret == -EPROBE_DEFER)</div><div class='add'>+		goto out_controller_put;</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "dma setup error %d, use pio\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	ret = devm_spi_register_controller(&amp;pdev-&gt;dev, controller);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -564,15 +972,50 @@ static int fsl_lpspi_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct fsl_lpspi_data *fsl_lpspi =</div><div class='ctx'> 				spi_controller_get_devdata(controller);</div><div class='ctx'> </div><div class='del'>-	clk_disable_unprepare(fsl_lpspi-&gt;clk);</div><div class='add'>+	pm_runtime_disable(fsl_lpspi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	spi_master_put(controller);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int fsl_lpspi_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pinctrl_pm_select_sleep_state(dev);</div><div class='add'>+	ret = pm_runtime_force_suspend(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fsl_lpspi_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_force_resume(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Error in resume: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pinctrl_pm_select_default_state(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops fsl_lpspi_pm_ops = {</div><div class='add'>+	SET_RUNTIME_PM_OPS(fsl_lpspi_runtime_suspend,</div><div class='add'>+				fsl_lpspi_runtime_resume, NULL)</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(fsl_lpspi_suspend, fsl_lpspi_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_driver fsl_lpspi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = DRIVER_NAME,</div><div class='ctx'> 		.of_match_table = fsl_lpspi_dt_ids,</div><div class='add'>+		.pm = &amp;fsl_lpspi_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = fsl_lpspi_probe,</div><div class='ctx'> 	.remove = fsl_lpspi_remove,</div><div class='head'>diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c<br/>index 6a713f78a62e..41a49b93ca60 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-qspi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-qspi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-qspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-fsl-qspi.c</a></div><div class='hunk'>@@ -882,7 +882,7 @@ static int fsl_qspi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ctlr-&gt;dev.of_node = np;</div><div class='ctx'> </div><div class='del'>-	ret = spi_register_controller(ctlr);</div><div class='add'>+	ret = devm_spi_register_controller(dev, ctlr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_destroy_mutex;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c<br/>index 8f2e97857e8b..b36ac6aa3b1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-fsl-spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-fsl-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-fsl-spi.c</a></div><div class='hunk'>@@ -39,6 +39,14 @@</div><div class='ctx'> #include &lt;linux/spi/spi_bitbang.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FSL_SOC</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Specific to the MPC8306/MPC8309 */</div><div class='add'>+#define IMMR_SPI_CS_OFFSET 0x14c</div><div class='add'>+#define SPI_BOOT_SEL_BIT   0x80000000</div><div class='add'>+</div><div class='ctx'> #include "spi-fsl-lib.h"</div><div class='ctx'> #include "spi-fsl-cpm.h"</div><div class='ctx'> #include "spi-fsl-spi.h"</div><div class='hunk'>@@ -355,33 +363,50 @@ static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t,</div><div class='ctx'> static int fsl_spi_do_one_msg(struct spi_master *master,</div><div class='ctx'> 			      struct spi_message *m)</div><div class='ctx'> {</div><div class='add'>+	struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(master);</div><div class='ctx'> 	struct spi_device *spi = m-&gt;spi;</div><div class='ctx'> 	struct spi_transfer *t, *first;</div><div class='ctx'> 	unsigned int cs_change;</div><div class='ctx'> 	const int nsecs = 50;</div><div class='del'>-	int status;</div><div class='add'>+	int status, last_bpw;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In CPU mode, optimize large byte transfers to use larger</div><div class='add'>+	 * bits_per_word values to reduce number of interrupts taken.</div><div class='add'>+	 */</div><div class='add'>+	if (!(mpc8xxx_spi-&gt;flags &amp; SPI_CPM_MODE)) {</div><div class='add'>+		list_for_each_entry(t, &amp;m-&gt;transfers, transfer_list) {</div><div class='add'>+			if (t-&gt;len &lt; 256 || t-&gt;bits_per_word != 8)</div><div class='add'>+				continue;</div><div class='add'>+			if ((t-&gt;len &amp; 3) == 0)</div><div class='add'>+				t-&gt;bits_per_word = 32;</div><div class='add'>+			else if ((t-&gt;len &amp; 1) == 0)</div><div class='add'>+				t-&gt;bits_per_word = 16;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't allow changes if CS is active */</div><div class='del'>-	first = list_first_entry(&amp;m-&gt;transfers, struct spi_transfer,</div><div class='del'>-			transfer_list);</div><div class='add'>+	cs_change = 1;</div><div class='ctx'> 	list_for_each_entry(t, &amp;m-&gt;transfers, transfer_list) {</div><div class='del'>-		if ((first-&gt;bits_per_word != t-&gt;bits_per_word) ||</div><div class='del'>-			(first-&gt;speed_hz != t-&gt;speed_hz)) {</div><div class='add'>+		if (cs_change)</div><div class='add'>+			first = t;</div><div class='add'>+		cs_change = t-&gt;cs_change;</div><div class='add'>+		if (first-&gt;speed_hz != t-&gt;speed_hz) {</div><div class='ctx'> 			dev_err(&amp;spi-&gt;dev,</div><div class='del'>-				"bits_per_word/speed_hz should be same for the same SPI transfer\n");</div><div class='add'>+				"speed_hz cannot change while CS is active\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	last_bpw = -1;</div><div class='ctx'> 	cs_change = 1;</div><div class='ctx'> 	status = -EINVAL;</div><div class='ctx'> 	list_for_each_entry(t, &amp;m-&gt;transfers, transfer_list) {</div><div class='del'>-		if (t-&gt;bits_per_word || t-&gt;speed_hz) {</div><div class='del'>-			if (cs_change)</div><div class='del'>-				status = fsl_spi_setup_transfer(spi, t);</div><div class='del'>-			if (status &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		if (cs_change || last_bpw != t-&gt;bits_per_word)</div><div class='add'>+			status = fsl_spi_setup_transfer(spi, t);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		last_bpw = t-&gt;bits_per_word;</div><div class='ctx'> </div><div class='ctx'> 		if (cs_change) {</div><div class='ctx'> 			fsl_spi_chipselect(spi, BITBANG_CS_ACTIVE);</div><div class='hunk'>@@ -701,10 +726,17 @@ static void fsl_spi_cs_control(struct spi_device *spi, bool on)</div><div class='ctx'> 	struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);</div><div class='ctx'> 	struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);</div><div class='ctx'> 	u16 cs = spi-&gt;chip_select;</div><div class='del'>-	int gpio = pinfo-&gt;gpios[cs];</div><div class='del'>-	bool alow = pinfo-&gt;alow_flags[cs];</div><div class='ctx'> </div><div class='del'>-	gpio_set_value(gpio, on ^ alow);</div><div class='add'>+	if (cs &lt; pinfo-&gt;ngpios) {</div><div class='add'>+		int gpio = pinfo-&gt;gpios[cs];</div><div class='add'>+		bool alow = pinfo-&gt;alow_flags[cs];</div><div class='add'>+</div><div class='add'>+		gpio_set_value(gpio, on ^ alow);</div><div class='add'>+	} else {</div><div class='add'>+		if (WARN_ON_ONCE(cs &gt; pinfo-&gt;ngpios || !pinfo-&gt;immr_spi_cs))</div><div class='add'>+			return;</div><div class='add'>+		iowrite32be(on ? SPI_BOOT_SEL_BIT : 0, pinfo-&gt;immr_spi_cs);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int of_fsl_spi_get_chipselects(struct device *dev)</div><div class='hunk'>@@ -712,12 +744,15 @@ static int of_fsl_spi_get_chipselects(struct device *dev)</div><div class='ctx'> 	struct device_node *np = dev-&gt;of_node;</div><div class='ctx'> 	struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);</div><div class='ctx'> 	struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);</div><div class='add'>+	bool spisel_boot = IS_ENABLED(CONFIG_FSL_SOC) &amp;&amp;</div><div class='add'>+		of_property_read_bool(np, "fsl,spisel_boot");</div><div class='ctx'> 	int ngpios;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ngpios = of_gpio_count(np);</div><div class='del'>-	if (ngpios &lt;= 0) {</div><div class='add'>+	ngpios = max(ngpios, 0);</div><div class='add'>+	if (ngpios == 0 &amp;&amp; !spisel_boot) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * SPI w/o chip-select line. One SPI device is still permitted</div><div class='ctx'> 		 * though.</div><div class='hunk'>@@ -726,6 +761,7 @@ static int of_fsl_spi_get_chipselects(struct device *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pinfo-&gt;ngpios = ngpios;</div><div class='ctx'> 	pinfo-&gt;gpios = kmalloc_array(ngpios, sizeof(*pinfo-&gt;gpios),</div><div class='ctx'> 				     GFP_KERNEL);</div><div class='ctx'> 	if (!pinfo-&gt;gpios)</div><div class='hunk'>@@ -769,7 +805,18 @@ static int of_fsl_spi_get_chipselects(struct device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;max_chipselect = ngpios;</div><div class='add'>+#if IS_ENABLED(CONFIG_FSL_SOC)</div><div class='add'>+	if (spisel_boot) {</div><div class='add'>+		pinfo-&gt;immr_spi_cs = ioremap(get_immrbase() + IMMR_SPI_CS_OFFSET, 4);</div><div class='add'>+		if (!pinfo-&gt;immr_spi_cs) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			i = ngpios - 1;</div><div class='add'>+			goto err_loop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pdata-&gt;max_chipselect = ngpios + spisel_boot;</div><div class='ctx'> 	pdata-&gt;cs_control = fsl_spi_cs_control;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c<br/>index 53b35c56a557..487ee55d26f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-gpio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-gpio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-gpio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-gpio.c</a></div><div class='hunk'>@@ -35,20 +35,16 @@</div><div class='ctx'>  * platform_device-&gt;driver_data ... points to spi_gpio</div><div class='ctx'>  *</div><div class='ctx'>  * spi-&gt;controller_state ... reserved for bitbang framework code</div><div class='del'>- * spi-&gt;controller_data ... holds chipselect GPIO</div><div class='ctx'>  *</div><div class='ctx'>  * spi-&gt;master-&gt;dev.driver_data ... points to spi_gpio-&gt;bitbang</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct spi_gpio {</div><div class='ctx'> 	struct spi_bitbang		bitbang;</div><div class='del'>-	struct spi_gpio_platform_data	pdata;</div><div class='del'>-	struct platform_device		*pdev;</div><div class='ctx'> 	struct gpio_desc		*sck;</div><div class='ctx'> 	struct gpio_desc		*miso;</div><div class='ctx'> 	struct gpio_desc		*mosi;</div><div class='ctx'> 	struct gpio_desc		**cs_gpios;</div><div class='del'>-	bool				has_cs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='hunk'>@@ -96,12 +92,6 @@ spi_to_spi_gpio(const struct spi_device *spi)</div><div class='ctx'> 	return spi_gpio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct spi_gpio_platform_data *__pure</div><div class='del'>-spi_to_pdata(const struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	return &amp;spi_to_spi_gpio(spi)-&gt;pdata;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* These helpers are in turn called by the bitbang inlines */</div><div class='ctx'> static inline void setsck(const struct spi_device *spi, int is_on)</div><div class='ctx'> {</div><div class='hunk'>@@ -224,7 +214,7 @@ static void spi_gpio_chipselect(struct spi_device *spi, int is_active)</div><div class='ctx'> 		gpiod_set_value_cansleep(spi_gpio-&gt;sck, spi-&gt;mode &amp; SPI_CPOL);</div><div class='ctx'> </div><div class='ctx'> 	/* Drive chip select line, if we have one */</div><div class='del'>-	if (spi_gpio-&gt;has_cs) {</div><div class='add'>+	if (spi_gpio-&gt;cs_gpios) {</div><div class='ctx'> 		struct gpio_desc *cs = spi_gpio-&gt;cs_gpios[spi-&gt;chip_select];</div><div class='ctx'> </div><div class='ctx'> 		/* SPI chip selects are normally active-low */</div><div class='hunk'>@@ -242,10 +232,12 @@ static int spi_gpio_setup(struct spi_device *spi)</div><div class='ctx'> 	 * The CS GPIOs have already been</div><div class='ctx'> 	 * initialized from the descriptor lookup.</div><div class='ctx'> 	 */</div><div class='del'>-	cs = spi_gpio-&gt;cs_gpios[spi-&gt;chip_select];</div><div class='del'>-	if (!spi-&gt;controller_state &amp;&amp; cs)</div><div class='del'>-		status = gpiod_direction_output(cs,</div><div class='del'>-						!(spi-&gt;mode &amp; SPI_CS_HIGH));</div><div class='add'>+	if (spi_gpio-&gt;cs_gpios) {</div><div class='add'>+		cs = spi_gpio-&gt;cs_gpios[spi-&gt;chip_select];</div><div class='add'>+		if (!spi-&gt;controller_state &amp;&amp; cs)</div><div class='add'>+			status = gpiod_direction_output(cs,</div><div class='add'>+						  !(spi-&gt;mode &amp; SPI_CS_HIGH));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		status = spi_bitbang_setup(spi);</div><div class='hunk'>@@ -296,40 +288,20 @@ static void spi_gpio_cleanup(struct spi_device *spi)</div><div class='ctx'>  * floating signals.  (A weak pulldown would save power too, but many</div><div class='ctx'>  * drivers expect to see all-ones data as the no slave "response".)</div><div class='ctx'>  */</div><div class='del'>-static int spi_gpio_request(struct device *dev,</div><div class='del'>-			    struct spi_gpio *spi_gpio,</div><div class='del'>-			    unsigned int num_chipselects,</div><div class='del'>-			    u16 *mflags)</div><div class='add'>+static int spi_gpio_request(struct device *dev, struct spi_gpio *spi_gpio)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	spi_gpio-&gt;mosi = devm_gpiod_get_optional(dev, "mosi", GPIOD_OUT_LOW);</div><div class='ctx'> 	if (IS_ERR(spi_gpio-&gt;mosi))</div><div class='ctx'> 		return PTR_ERR(spi_gpio-&gt;mosi);</div><div class='del'>-	if (!spi_gpio-&gt;mosi)</div><div class='del'>-		/* HW configuration without MOSI pin */</div><div class='del'>-		*mflags |= SPI_MASTER_NO_TX;</div><div class='ctx'> </div><div class='ctx'> 	spi_gpio-&gt;miso = devm_gpiod_get_optional(dev, "miso", GPIOD_IN);</div><div class='ctx'> 	if (IS_ERR(spi_gpio-&gt;miso))</div><div class='ctx'> 		return PTR_ERR(spi_gpio-&gt;miso);</div><div class='del'>-	/*</div><div class='del'>-	 * No setting SPI_MASTER_NO_RX here - if there is only a MOSI</div><div class='del'>-	 * pin connected the host can still do RX by changing the</div><div class='del'>-	 * direction of the line.</div><div class='del'>-	 */</div><div class='ctx'> </div><div class='ctx'> 	spi_gpio-&gt;sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);</div><div class='ctx'> 	if (IS_ERR(spi_gpio-&gt;sck))</div><div class='ctx'> 		return PTR_ERR(spi_gpio-&gt;sck);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_chipselects; i++) {</div><div class='del'>-		spi_gpio-&gt;cs_gpios[i] = devm_gpiod_get_index(dev, "cs",</div><div class='del'>-							     i, GPIOD_OUT_HIGH);</div><div class='del'>-		if (IS_ERR(spi_gpio-&gt;cs_gpios[i]))</div><div class='del'>-			return PTR_ERR(spi_gpio-&gt;cs_gpios[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -340,142 +312,134 @@ static const struct of_device_id spi_gpio_dt_ids[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, spi_gpio_dt_ids);</div><div class='ctx'> </div><div class='del'>-static int spi_gpio_probe_dt(struct platform_device *pdev)</div><div class='add'>+static int spi_gpio_probe_dt(struct platform_device *pdev,</div><div class='add'>+			     struct spi_master *master)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	u32 tmp;</div><div class='del'>-	struct spi_gpio_platform_data	*pdata;</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='del'>-	const struct of_device_id *of_id =</div><div class='del'>-			of_match_device(spi_gpio_dt_ids, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (!of_id)</div><div class='del'>-		return 0;</div><div class='add'>+	master-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='add'>+	master-&gt;use_gpio_descriptors = true;</div><div class='ctx'> </div><div class='del'>-	pdata = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pdata), GFP_KERNEL);</div><div class='del'>-	if (!pdata)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int spi_gpio_probe_dt(struct platform_device *pdev,</div><div class='add'>+				    struct spi_master *master)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+static int spi_gpio_probe_pdata(struct platform_device *pdev,</div><div class='add'>+				struct spi_master *master)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct spi_gpio_platform_data *pdata = dev_get_platdata(dev);</div><div class='add'>+	struct spi_gpio *spi_gpio = spi_master_get_devdata(master);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	ret = of_property_read_u32(np, "num-chipselects", &amp;tmp);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "num-chipselects property not found\n");</div><div class='del'>-		goto error_free;</div><div class='del'>-	}</div><div class='add'>+#ifdef GENERIC_BITBANG</div><div class='add'>+	if (!pdata || !pdata-&gt;num_chipselect)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * The master needs to think there is a chipselect even if not</div><div class='add'>+	 * connected</div><div class='add'>+	 */</div><div class='add'>+	master-&gt;num_chipselect = pdata-&gt;num_chipselect ?: 1;</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;num_chipselect = tmp;</div><div class='del'>-	pdev-&gt;dev.platform_data = pdata;</div><div class='add'>+	spi_gpio-&gt;cs_gpios = devm_kcalloc(dev, master-&gt;num_chipselect,</div><div class='add'>+					  sizeof(*spi_gpio-&gt;cs_gpios),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!spi_gpio-&gt;cs_gpios)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	for (i = 0; i &lt; master-&gt;num_chipselect; i++) {</div><div class='add'>+		spi_gpio-&gt;cs_gpios[i] = devm_gpiod_get_index(dev, "cs", i,</div><div class='add'>+							     GPIOD_OUT_HIGH);</div><div class='add'>+		if (IS_ERR(spi_gpio-&gt;cs_gpios[i]))</div><div class='add'>+			return PTR_ERR(spi_gpio-&gt;cs_gpios[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-error_free:</div><div class='del'>-	devm_kfree(&amp;pdev-&gt;dev, pdata);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline int spi_gpio_probe_dt(struct platform_device *pdev)</div><div class='add'>+</div><div class='add'>+static void spi_gpio_put(void *data)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	spi_master_put(data);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int spi_gpio_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int				status;</div><div class='ctx'> 	struct spi_master		*master;</div><div class='ctx'> 	struct spi_gpio			*spi_gpio;</div><div class='del'>-	struct spi_gpio_platform_data	*pdata;</div><div class='del'>-	u16 master_flags = 0;</div><div class='del'>-	bool use_of = 0;</div><div class='add'>+	struct device			*dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct spi_bitbang		*bb;</div><div class='add'>+	const struct of_device_id	*of_id;</div><div class='ctx'> </div><div class='del'>-	status = spi_gpio_probe_dt(pdev);</div><div class='del'>-	if (status &lt; 0)</div><div class='del'>-		return status;</div><div class='del'>-	if (status &gt; 0)</div><div class='del'>-		use_of = 1;</div><div class='del'>-</div><div class='del'>-	pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='del'>-#ifdef GENERIC_BITBANG</div><div class='del'>-	if (!pdata || (!use_of &amp;&amp; !pdata-&gt;num_chipselect))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-#endif</div><div class='add'>+	of_id = of_match_device(spi_gpio_dt_ids, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	master = spi_alloc_master(&amp;pdev-&gt;dev, sizeof(*spi_gpio));</div><div class='add'>+	master = spi_alloc_master(dev, sizeof(*spi_gpio));</div><div class='ctx'> 	if (!master)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	spi_gpio = spi_master_get_devdata(master);</div><div class='del'>-</div><div class='del'>-	spi_gpio-&gt;cs_gpios = devm_kcalloc(&amp;pdev-&gt;dev,</div><div class='del'>-				pdata-&gt;num_chipselect,</div><div class='del'>-				sizeof(*spi_gpio-&gt;cs_gpios),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!spi_gpio-&gt;cs_gpios)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	status = devm_add_action_or_reset(&amp;pdev-&gt;dev, spi_gpio_put, master);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, spi_gpio);</div><div class='add'>+	if (of_id)</div><div class='add'>+		status = spi_gpio_probe_dt(pdev, master);</div><div class='add'>+	else</div><div class='add'>+		status = spi_gpio_probe_pdata(pdev, master);</div><div class='ctx'> </div><div class='del'>-	/* Determine if we have chip selects connected */</div><div class='del'>-	spi_gpio-&gt;has_cs = !!pdata-&gt;num_chipselect;</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	spi_gpio-&gt;pdev = pdev;</div><div class='del'>-	if (pdata)</div><div class='del'>-		spi_gpio-&gt;pdata = *pdata;</div><div class='add'>+	spi_gpio = spi_master_get_devdata(master);</div><div class='ctx'> </div><div class='del'>-	status = spi_gpio_request(&amp;pdev-&gt;dev, spi_gpio,</div><div class='del'>-				  pdata-&gt;num_chipselect, &amp;master_flags);</div><div class='add'>+	status = spi_gpio_request(dev, spi_gpio);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	master-&gt;bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);</div><div class='ctx'> 	master-&gt;mode_bits = SPI_3WIRE | SPI_3WIRE_HIZ | SPI_CPHA | SPI_CPOL |</div><div class='ctx'> 			    SPI_CS_HIGH;</div><div class='del'>-	master-&gt;flags = master_flags;</div><div class='add'>+	if (!spi_gpio-&gt;mosi) {</div><div class='add'>+		/* HW configuration without MOSI pin</div><div class='add'>+		 *</div><div class='add'>+		 * No setting SPI_MASTER_NO_RX here - if there is only</div><div class='add'>+		 * a MOSI pin connected the host can still do RX by</div><div class='add'>+		 * changing the direction of the line.</div><div class='add'>+		 */</div><div class='add'>+		master-&gt;flags = SPI_MASTER_NO_TX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	master-&gt;bus_num = pdev-&gt;id;</div><div class='del'>-	/* The master needs to think there is a chipselect even if not connected */</div><div class='del'>-	master-&gt;num_chipselect = spi_gpio-&gt;has_cs ? pdata-&gt;num_chipselect : 1;</div><div class='ctx'> 	master-&gt;setup = spi_gpio_setup;</div><div class='ctx'> 	master-&gt;cleanup = spi_gpio_cleanup;</div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-	master-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	spi_gpio-&gt;bitbang.master = master;</div><div class='del'>-	spi_gpio-&gt;bitbang.chipselect = spi_gpio_chipselect;</div><div class='del'>-	spi_gpio-&gt;bitbang.set_line_direction = spi_gpio_set_direction;</div><div class='add'>+	bb = &amp;spi_gpio-&gt;bitbang;</div><div class='add'>+	bb-&gt;master = master;</div><div class='add'>+	bb-&gt;chipselect = spi_gpio_chipselect;</div><div class='add'>+	bb-&gt;set_line_direction = spi_gpio_set_direction;</div><div class='ctx'> </div><div class='del'>-	if ((master_flags &amp; SPI_MASTER_NO_TX) == 0) {</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_word_mode3;</div><div class='add'>+	if (master-&gt;flags &amp; SPI_MASTER_NO_TX) {</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_0] = spi_gpio_spec_txrx_word_mode0;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_1] = spi_gpio_spec_txrx_word_mode1;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_2] = spi_gpio_spec_txrx_word_mode2;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_3] = spi_gpio_spec_txrx_word_mode3;</div><div class='ctx'> 	} else {</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_0] = spi_gpio_spec_txrx_word_mode0;</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_1] = spi_gpio_spec_txrx_word_mode1;</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_2] = spi_gpio_spec_txrx_word_mode2;</div><div class='del'>-		spi_gpio-&gt;bitbang.txrx_word[SPI_MODE_3] = spi_gpio_spec_txrx_word_mode3;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;</div><div class='add'>+		bb-&gt;txrx_word[SPI_MODE_3] = spi_gpio_txrx_word_mode3;</div><div class='ctx'> 	}</div><div class='del'>-	spi_gpio-&gt;bitbang.setup_transfer = spi_bitbang_setup_transfer;</div><div class='add'>+	bb-&gt;setup_transfer = spi_bitbang_setup_transfer;</div><div class='ctx'> </div><div class='del'>-	status = spi_bitbang_start(&amp;spi_gpio-&gt;bitbang);</div><div class='add'>+	status = spi_bitbang_init(&amp;spi_gpio-&gt;bitbang);</div><div class='ctx'> 	if (status)</div><div class='del'>-		spi_master_put(master);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int spi_gpio_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct spi_gpio			*spi_gpio;</div><div class='del'>-</div><div class='del'>-	spi_gpio = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	/* stop() unregisters child devices too */</div><div class='del'>-	spi_bitbang_stop(&amp;spi_gpio-&gt;bitbang);</div><div class='del'>-</div><div class='del'>-	spi_master_put(spi_gpio-&gt;bitbang.master);</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return devm_spi_register_master(&amp;pdev-&gt;dev, spi_master_get(master));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='hunk'>@@ -486,7 +450,6 @@ static struct platform_driver spi_gpio_driver = {</div><div class='ctx'> 		.of_match_table = of_match_ptr(spi_gpio_dt_ids),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= spi_gpio_probe,</div><div class='del'>-	.remove		= spi_gpio_remove,</div><div class='ctx'> };</div><div class='ctx'> module_platform_driver(spi_gpio_driver);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c<br/>index 6ec647bbba77..09c9a1edb2c6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-imx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-imx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-imx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-imx.c</a></div><div class='hunk'>@@ -28,6 +28,10 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "spi_imx"</div><div class='ctx'> </div><div class='add'>+static bool use_dma = true;</div><div class='add'>+module_param(use_dma, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(use_dma, "Enable usage of DMA when available (default)");</div><div class='add'>+</div><div class='ctx'> #define MXC_CSPIRXDATA		0x00</div><div class='ctx'> #define MXC_CSPITXDATA		0x04</div><div class='ctx'> #define MXC_CSPICTRL		0x08</div><div class='hunk'>@@ -219,6 +223,9 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_imx_data *spi_imx = spi_master_get_devdata(master);</div><div class='ctx'> </div><div class='add'>+	if (!use_dma)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (!master-&gt;dma_rx)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -1494,7 +1501,7 @@ static int spi_imx_transfer(struct spi_device *spi,</div><div class='ctx'> </div><div class='ctx'> 	/* flush rxfifo before transfer */</div><div class='ctx'> 	while (spi_imx-&gt;devtype_data-&gt;rx_available(spi_imx))</div><div class='del'>-		spi_imx-&gt;rx(spi_imx);</div><div class='add'>+		readl(spi_imx-&gt;base + MXC_CSPIRXDATA);</div><div class='ctx'> </div><div class='ctx'> 	if (spi_imx-&gt;slave_mode)</div><div class='ctx'> 		return spi_imx_pio_transfer_slave(spi, transfer);</div><div class='head'>diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c<br/>index a4d8d19ecff9..9f0fa9f3116d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-mem.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-mem.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-mem.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-mem.c</a></div><div class='hunk'>@@ -135,8 +135,8 @@ static int spi_check_buswidth_req(struct spi_mem *mem, u8 buswidth, bool tx)</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool spi_mem_default_supports_op(struct spi_mem *mem,</div><div class='del'>-					const struct spi_mem_op *op)</div><div class='add'>+bool spi_mem_default_supports_op(struct spi_mem *mem,</div><div class='add'>+				 const struct spi_mem_op *op)</div><div class='ctx'> {</div><div class='ctx'> 	if (spi_check_buswidth_req(mem, op-&gt;cmd.buswidth, true))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -622,7 +622,7 @@ void devm_spi_mem_dirmap_destroy(struct device *dev,</div><div class='ctx'> EXPORT_SYMBOL_GPL(devm_spi_mem_dirmap_destroy);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * spi_mem_dirmap_dirmap_read() - Read data through a direct mapping</div><div class='add'>+ * spi_mem_dirmap_read() - Read data through a direct mapping</div><div class='ctx'>  * @desc: direct mapping descriptor</div><div class='ctx'>  * @offs: offset to start reading from. Note that this is not an absolute</div><div class='ctx'>  *	  offset, but the offset within the direct mapping which already has</div><div class='hunk'>@@ -668,7 +668,7 @@ ssize_t spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc,</div><div class='ctx'> EXPORT_SYMBOL_GPL(spi_mem_dirmap_read);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * spi_mem_dirmap_dirmap_write() - Write data through a direct mapping</div><div class='add'>+ * spi_mem_dirmap_write() - Write data through a direct mapping</div><div class='ctx'>  * @desc: direct mapping descriptor</div><div class='ctx'>  * @offs: offset to start writing from. Note that this is not an absolute</div><div class='ctx'>  *	  offset, but the offset within the direct mapping which already has</div><div class='head'>diff --git a/drivers/staging/mt7621-spi/spi-mt7621.c b/drivers/spi/spi-mt7621.c<br/>index b509f9fe3346..ff85982464d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-spi/spi-mt7621.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-spi/spi-mt7621.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-mt7621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-mt7621.c</a></div><div class='hunk'>@@ -1,15 +1,14 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * spi-mt7621.c -- MediaTek MT7621 SPI controller driver</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2011 Sergiy &lt;piratfm@gmail.com&gt;</div><div class='del'>- * Copyright (C) 2011-2013 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- * Copyright (C) 2014-2015 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='del'>- *</div><div class='del'>- * Some parts are based on spi-orion.c:</div><div class='del'>- *   Author: Shadi Ammouri &lt;shadi@marvell.com&gt;</div><div class='del'>- *   Copyright (C) 2007-2008 Marvell Ltd.</div><div class='del'>- */</div><div class='add'>+//</div><div class='add'>+// spi-mt7621.c -- MediaTek MT7621 SPI controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2011 Sergiy &lt;piratfm@gmail.com&gt;</div><div class='add'>+// Copyright (C) 2011-2013 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+// Copyright (C) 2014-2015 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+//</div><div class='add'>+// Some parts are based on spi-orion.c:</div><div class='add'>+//   Author: Shadi Ammouri &lt;shadi@marvell.com&gt;</div><div class='add'>+//   Copyright (C) 2007-2008 Marvell Ltd.</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='hunk'>@@ -52,19 +51,17 @@</div><div class='ctx'> #define MT7621_LSB_FIRST	BIT(3)</div><div class='ctx'> </div><div class='ctx'> struct mt7621_spi {</div><div class='del'>-	struct spi_master	*master;</div><div class='add'>+	struct spi_controller	*master;</div><div class='ctx'> 	void __iomem		*base;</div><div class='ctx'> 	unsigned int		sys_freq;</div><div class='ctx'> 	unsigned int		speed;</div><div class='ctx'> 	struct clk		*clk;</div><div class='ctx'> 	int			pending_write;</div><div class='del'>-</div><div class='del'>-	struct mt7621_spi_ops	*ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)</div><div class='ctx'> {</div><div class='del'>-	return spi_master_get_devdata(spi-&gt;master);</div><div class='add'>+	return spi_controller_get_devdata(spi-&gt;master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 mt7621_spi_read(struct mt7621_spi *rs, u32 reg)</div><div class='hunk'>@@ -77,29 +74,25 @@ static inline void mt7621_spi_write(struct mt7621_spi *rs, u32 reg, u32 val)</div><div class='ctx'> 	iowrite32(val, rs-&gt;base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7621_spi_reset(struct mt7621_spi *rs)</div><div class='add'>+static void mt7621_spi_set_cs(struct spi_device *spi, int enable)</div><div class='ctx'> {</div><div class='del'>-	u32 master = mt7621_spi_read(rs, MT7621_SPI_MASTER);</div><div class='add'>+	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);</div><div class='add'>+	int cs = spi-&gt;chip_select;</div><div class='add'>+	u32 polar = 0;</div><div class='add'>+	u32 master;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Select SPI device 7, enable "more buffer mode" and disable</div><div class='ctx'> 	 * full-duplex (only half-duplex really works on this chip</div><div class='ctx'> 	 * reliably)</div><div class='ctx'> 	 */</div><div class='add'>+	master = mt7621_spi_read(rs, MT7621_SPI_MASTER);</div><div class='ctx'> 	master |= MASTER_RS_SLAVE_SEL | MASTER_MORE_BUFMODE;</div><div class='ctx'> 	master &amp;= ~MASTER_FULL_DUPLEX;</div><div class='del'>-</div><div class='ctx'> 	mt7621_spi_write(rs, MT7621_SPI_MASTER, master);</div><div class='del'>-	rs-&gt;pending_write = 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void mt7621_spi_set_cs(struct spi_device *spi, int enable)</div><div class='del'>-{</div><div class='del'>-	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);</div><div class='del'>-	int cs = spi-&gt;chip_select;</div><div class='del'>-	u32 polar = 0;</div><div class='add'>+	rs-&gt;pending_write = 0;</div><div class='ctx'> </div><div class='del'>-	mt7621_spi_reset(rs);</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		polar = BIT(cs);</div><div class='ctx'> 	mt7621_spi_write(rs, MT7621_SPI_POLAR, polar);</div><div class='hunk'>@@ -163,13 +156,14 @@ static inline int mt7621_spi_wait_till_ready(struct mt7621_spi *rs)</div><div class='ctx'> static void mt7621_spi_read_half_duplex(struct mt7621_spi *rs,</div><div class='ctx'> 					int rx_len, u8 *buf)</div><div class='ctx'> {</div><div class='add'>+	int tx_len;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Combine with any pending write, and perform one or more half-duplex</div><div class='ctx'> 	 * transactions reading 'len' bytes. Data to be written is already in</div><div class='ctx'> 	 * MT7621_SPI_DATA.</div><div class='ctx'> 	 */</div><div class='del'>-	int tx_len = rs-&gt;pending_write;</div><div class='del'>-</div><div class='add'>+	tx_len = rs-&gt;pending_write;</div><div class='ctx'> 	rs-&gt;pending_write = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (rx_len || tx_len) {</div><div class='hunk'>@@ -209,8 +203,8 @@ static inline void mt7621_spi_flush(struct mt7621_spi *rs)</div><div class='ctx'> static void mt7621_spi_write_half_duplex(struct mt7621_spi *rs,</div><div class='ctx'> 					 int tx_len, const u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	int val = 0;</div><div class='ctx'> 	int len = rs-&gt;pending_write;</div><div class='add'>+	int val = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (len &amp; 3) {</div><div class='ctx'> 		val = mt7621_spi_read(rs, MT7621_SPI_OPCODE + (len &amp; ~3));</div><div class='hunk'>@@ -238,6 +232,7 @@ static void mt7621_spi_write_half_duplex(struct mt7621_spi *rs,</div><div class='ctx'> 		}</div><div class='ctx'> 		tx_len -= 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (len &amp; 3) {</div><div class='ctx'> 		if (len &lt; 4) {</div><div class='ctx'> 			val = swab32(val);</div><div class='hunk'>@@ -245,13 +240,14 @@ static void mt7621_spi_write_half_duplex(struct mt7621_spi *rs,</div><div class='ctx'> 		}</div><div class='ctx'> 		mt7621_spi_write(rs, MT7621_SPI_OPCODE + (len &amp; ~3), val);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	rs-&gt;pending_write = len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7621_spi_transfer_one_message(struct spi_master *master,</div><div class='add'>+static int mt7621_spi_transfer_one_message(struct spi_controller *master,</div><div class='ctx'> 					   struct spi_message *m)</div><div class='ctx'> {</div><div class='del'>-	struct mt7621_spi *rs = spi_master_get_devdata(master);</div><div class='add'>+	struct mt7621_spi *rs = spi_controller_get_devdata(master);</div><div class='ctx'> 	struct spi_device *spi = m-&gt;spi;</div><div class='ctx'> 	unsigned int speed = spi-&gt;max_speed_hz;</div><div class='ctx'> 	struct spi_transfer *t = NULL;</div><div class='hunk'>@@ -268,11 +264,14 @@ static int mt7621_spi_transfer_one_message(struct spi_master *master,</div><div class='ctx'> 		goto msg_done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Assert CS */</div><div class='ctx'> 	mt7621_spi_set_cs(spi, 1);</div><div class='add'>+</div><div class='ctx'> 	m-&gt;actual_length = 0;</div><div class='ctx'> 	list_for_each_entry(t, &amp;m-&gt;transfers, transfer_list) {</div><div class='ctx'> 		if ((t-&gt;rx_buf) &amp;&amp; (t-&gt;tx_buf)) {</div><div class='del'>-			/* This controller will shift some extra data out</div><div class='add'>+			/*</div><div class='add'>+			 * This controller will shift some extra data out</div><div class='ctx'> 			 * of spi_opcode if (mosi_bit_cnt &gt; 0) &amp;&amp;</div><div class='ctx'> 			 * (cmd_bit_cnt == 0). So the claimed full-duplex</div><div class='ctx'> 			 * support is broken since we have no way to read</div><div class='hunk'>@@ -287,8 +286,9 @@ static int mt7621_spi_transfer_one_message(struct spi_master *master,</div><div class='ctx'> 		}</div><div class='ctx'> 		m-&gt;actual_length += t-&gt;len;</div><div class='ctx'> 	}</div><div class='del'>-	mt7621_spi_flush(rs);</div><div class='ctx'> </div><div class='add'>+	/* Flush data and deassert CS */</div><div class='add'>+	mt7621_spi_flush(rs);</div><div class='ctx'> 	mt7621_spi_set_cs(spi, 0);</div><div class='ctx'> </div><div class='ctx'> msg_done:</div><div class='hunk'>@@ -303,8 +303,8 @@ static int mt7621_spi_setup(struct spi_device *spi)</div><div class='ctx'> 	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);</div><div class='ctx'> </div><div class='ctx'> 	if ((spi-&gt;max_speed_hz == 0) ||</div><div class='del'>-		(spi-&gt;max_speed_hz &gt; (rs-&gt;sys_freq / 2)))</div><div class='del'>-		spi-&gt;max_speed_hz = (rs-&gt;sys_freq / 2);</div><div class='add'>+	    (spi-&gt;max_speed_hz &gt; (rs-&gt;sys_freq / 2)))</div><div class='add'>+		spi-&gt;max_speed_hz = rs-&gt;sys_freq / 2;</div><div class='ctx'> </div><div class='ctx'> 	if (spi-&gt;max_speed_hz &lt; (rs-&gt;sys_freq / 4097)) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "setup: requested speed is too low %d Hz\n",</div><div class='hunk'>@@ -324,19 +324,17 @@ MODULE_DEVICE_TABLE(of, mt7621_spi_match);</div><div class='ctx'> static int mt7621_spi_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct of_device_id *match;</div><div class='del'>-	struct spi_master *master;</div><div class='add'>+	struct spi_controller *master;</div><div class='ctx'> 	struct mt7621_spi *rs;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	struct mt7621_spi_ops *ops;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	match = of_match_device(mt7621_spi_match, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!match)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	ops = (struct mt7621_spi_ops *)match-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	base = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='hunk'>@@ -361,7 +359,7 @@ static int mt7621_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	master-&gt;mode_bits = SPI_LSB_FIRST;</div><div class='del'>-</div><div class='add'>+	master-&gt;flags = SPI_CONTROLLER_HALF_DUPLEX;</div><div class='ctx'> 	master-&gt;setup = mt7621_spi_setup;</div><div class='ctx'> 	master-&gt;transfer_one_message = mt7621_spi_transfer_one_message;</div><div class='ctx'> 	master-&gt;bits_per_word_mask = SPI_BPW_MASK(8);</div><div class='hunk'>@@ -370,12 +368,11 @@ static int mt7621_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, master);</div><div class='ctx'> </div><div class='del'>-	rs = spi_master_get_devdata(master);</div><div class='add'>+	rs = spi_controller_get_devdata(master);</div><div class='ctx'> 	rs-&gt;base = base;</div><div class='ctx'> 	rs-&gt;clk = clk;</div><div class='ctx'> 	rs-&gt;master = master;</div><div class='ctx'> 	rs-&gt;sys_freq = clk_get_rate(rs-&gt;clk);</div><div class='del'>-	rs-&gt;ops = ops;</div><div class='ctx'> 	rs-&gt;pending_write = 0;</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "sys_freq: %u\n", rs-&gt;sys_freq);</div><div class='ctx'> </div><div class='hunk'>@@ -385,21 +382,18 @@ static int mt7621_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7621_spi_reset(rs);</div><div class='del'>-</div><div class='del'>-	return spi_register_master(master);</div><div class='add'>+	return devm_spi_register_controller(&amp;pdev-&gt;dev, master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7621_spi_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct spi_master *master;</div><div class='add'>+	struct spi_controller *master;</div><div class='ctx'> 	struct mt7621_spi *rs;</div><div class='ctx'> </div><div class='ctx'> 	master = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='del'>-	rs = spi_master_get_devdata(master);</div><div class='add'>+	rs = spi_controller_get_devdata(master);</div><div class='ctx'> </div><div class='del'>-	clk_disable(rs-&gt;clk);</div><div class='del'>-	spi_unregister_master(master);</div><div class='add'>+	clk_disable_unprepare(rs-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c<br/>index e41ae6ef0f8a..f48563c09b97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-mxic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-mxic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-mxic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-mxic.c</a></div><div class='hunk'>@@ -492,8 +492,7 @@ static int mxic_spi_transfer_one(struct spi_master *master,</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused mxic_spi_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct spi_master *master = platform_get_drvdata(pdev);</div><div class='add'>+	struct spi_master *master = dev_get_drvdata(dev);</div><div class='ctx'> 	struct mxic_spi *mxic = spi_master_get_devdata(master);</div><div class='ctx'> </div><div class='ctx'> 	mxic_spi_clk_disable(mxic);</div><div class='hunk'>@@ -504,8 +503,7 @@ static int __maybe_unused mxic_spi_runtime_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused mxic_spi_runtime_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct spi_master *master = platform_get_drvdata(pdev);</div><div class='add'>+	struct spi_master *master = dev_get_drvdata(dev);</div><div class='ctx'> 	struct mxic_spi *mxic = spi_master_get_devdata(master);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c<br/>index 7f280567093e..25ea4a9e0dbc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-orion.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-orion.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-orion.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-orion.c</a></div><div class='hunk'>@@ -470,6 +470,8 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer)</div><div class='ctx'> 			if (orion_spi_write_read_8bit(spi, &amp;tx, &amp;rx) &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			count--;</div><div class='add'>+			if (xfer-&gt;word_delay_usecs)</div><div class='add'>+				udelay(xfer-&gt;word_delay_usecs);</div><div class='ctx'> 		} while (count);</div><div class='ctx'> 	} else if (word_len == 16) {</div><div class='ctx'> 		const u16 *tx = xfer-&gt;tx_buf;</div><div class='hunk'>@@ -479,6 +481,8 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer)</div><div class='ctx'> 			if (orion_spi_write_read_16bit(spi, &amp;tx, &amp;rx) &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			count -= 2;</div><div class='add'>+			if (xfer-&gt;word_delay_usecs)</div><div class='add'>+				udelay(xfer-&gt;word_delay_usecs);</div><div class='ctx'> 		} while (count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c<br/>index 131849adc570..d9f374c8b709 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pic32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pic32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pic32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-pic32.c</a></div><div class='hunk'>@@ -559,7 +559,7 @@ static int pic32_spi_one_transfer(struct spi_master *master,</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "wait error/timedout\n");</div><div class='ctx'> 		if (dma_issued) {</div><div class='ctx'> 			dmaengine_terminate_all(master-&gt;dma_rx);</div><div class='del'>-			dmaengine_terminate_all(master-&gt;dma_rx);</div><div class='add'>+			dmaengine_terminate_all(master-&gt;dma_tx);</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c<br/>index 15592598273e..e5c26c1779ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pxa2xx-dma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pxa2xx-dma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pxa2xx-dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-pxa2xx-dma.c</a></div><div class='hunk'>@@ -239,13 +239,15 @@ int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,</div><div class='ctx'> 					   u32 *threshold)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxa2xx_spi_chip *chip_info = spi-&gt;controller_data;</div><div class='add'>+	struct driver_data *drv_data = spi_controller_get_devdata(spi-&gt;controller);</div><div class='add'>+	u32 dma_burst_size = drv_data-&gt;controller_info-&gt;dma_burst_size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the DMA burst size is given in chip_info we use that,</div><div class='ctx'> 	 * otherwise we use the default. Also we use the default FIFO</div><div class='ctx'> 	 * thresholds for now.</div><div class='ctx'> 	 */</div><div class='del'>-	*burst_code = chip_info ? chip_info-&gt;dma_burst_size : 1;</div><div class='add'>+	*burst_code = chip_info ? chip_info-&gt;dma_burst_size : dma_burst_size;</div><div class='ctx'> 	*threshold = SSCR1_RxTresh(RX_THRESH_DFLT)</div><div class='ctx'> 		   | SSCR1_TxTresh(TX_THRESH_DFLT);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c<br/>index 1727fdfbac28..d456c5251b5d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pxa2xx-pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pxa2xx-pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pxa2xx-pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-pxa2xx-pci.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/clk-provider.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='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/spi/pxa2xx_spi.h&gt;</div><div class='hunk'>@@ -35,6 +34,8 @@ struct pxa_spi_info {</div><div class='ctx'> 	void *tx_param;</div><div class='ctx'> 	void *rx_param;</div><div class='ctx'> </div><div class='add'>+	int dma_burst_size;</div><div class='add'>+</div><div class='ctx'> 	int (*setup)(struct pci_dev *pdev, struct pxa_spi_info *c);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -133,6 +134,7 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c)</div><div class='ctx'> 	rx-&gt;dma_dev = &amp;dma_dev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;dma_filter = lpss_dma_filter;</div><div class='add'>+	c-&gt;dma_burst_size = 8;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -223,6 +225,7 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	spi_pdata.tx_param = c-&gt;tx_param;</div><div class='ctx'> 	spi_pdata.rx_param = c-&gt;rx_param;</div><div class='ctx'> 	spi_pdata.enable_dma = c-&gt;rx_param &amp;&amp; c-&gt;tx_param;</div><div class='add'>+	spi_pdata.dma_burst_size = c-&gt;dma_burst_size ? c-&gt;dma_burst_size : 1;</div><div class='ctx'> </div><div class='ctx'> 	ssp = &amp;spi_pdata.ssp;</div><div class='ctx'> 	ssp-&gt;phys_base = pci_resource_start(dev, 0);</div><div class='head'>diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c<br/>index b6ddba833d02..e59c8b27b155 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pxa2xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-pxa2xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-pxa2xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-pxa2xx.c</a></div><div class='hunk'>@@ -884,10 +884,14 @@ static unsigned int ssp_get_clk_div(struct driver_data *drv_data, int rate)</div><div class='ctx'> </div><div class='ctx'> 	rate = min_t(int, ssp_clk, rate);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Calculate the divisor for the SCR (Serial Clock Rate), avoiding</div><div class='add'>+	 * that the SSP transmission rate can be greater than the device rate</div><div class='add'>+	 */</div><div class='ctx'> 	if (ssp-&gt;type == PXA25x_SSP || ssp-&gt;type == CE4100_SSP)</div><div class='del'>-		return (ssp_clk / (2 * rate) - 1) &amp; 0xff;</div><div class='add'>+		return (DIV_ROUND_UP(ssp_clk, 2 * rate) - 1) &amp; 0xff;</div><div class='ctx'> 	else</div><div class='del'>-		return (ssp_clk / rate - 1) &amp; 0xfff;</div><div class='add'>+		return (DIV_ROUND_UP(ssp_clk, rate) - 1)  &amp; 0xfff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int pxa2xx_ssp_get_clk_div(struct driver_data *drv_data,</div><div class='hunk'>@@ -925,7 +929,7 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,</div><div class='ctx'> {</div><div class='ctx'> 	struct driver_data *drv_data = spi_controller_get_devdata(controller);</div><div class='ctx'> 	struct spi_message *message = controller-&gt;cur_msg;</div><div class='del'>-	struct chip_data *chip = spi_get_ctldata(message-&gt;spi);</div><div class='add'>+	struct chip_data *chip = spi_get_ctldata(spi);</div><div class='ctx'> 	u32 dma_thresh = chip-&gt;dma_threshold;</div><div class='ctx'> 	u32 dma_burst = chip-&gt;dma_burst_size;</div><div class='ctx'> 	u32 change_mask = pxa2xx_spi_get_ssrc1_change_mask(drv_data);</div><div class='hunk'>@@ -943,21 +947,21 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,</div><div class='ctx'> 		/* reject already-mapped transfers; PIO won't always work */</div><div class='ctx'> 		if (message-&gt;is_dma_mapped</div><div class='ctx'> 				|| transfer-&gt;rx_dma || transfer-&gt;tx_dma) {</div><div class='del'>-			dev_err(&amp;drv_data-&gt;pdev-&gt;dev,</div><div class='add'>+			dev_err(&amp;spi-&gt;dev,</div><div class='ctx'> 				"Mapped transfer length of %u is greater than %d\n",</div><div class='ctx'> 				transfer-&gt;len, MAX_DMA_LEN);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* warn ... we force this to PIO mode */</div><div class='del'>-		dev_warn_ratelimited(&amp;message-&gt;spi-&gt;dev,</div><div class='add'>+		dev_warn_ratelimited(&amp;spi-&gt;dev,</div><div class='ctx'> 				     "DMA disabled for transfer length %ld greater than %d\n",</div><div class='ctx'> 				     (long)transfer-&gt;len, MAX_DMA_LEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the transfer state based on the type of transfer */</div><div class='ctx'> 	if (pxa2xx_spi_flush(drv_data) == 0) {</div><div class='del'>-		dev_err(&amp;drv_data-&gt;pdev-&gt;dev, "Flush failed\n");</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Flush failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	drv_data-&gt;n_bytes = chip-&gt;n_bytes;</div><div class='hunk'>@@ -999,15 +1003,15 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (chip-&gt;enable_dma) {</div><div class='ctx'> 		if (pxa2xx_spi_set_dma_burst_and_threshold(chip,</div><div class='del'>-						message-&gt;spi,</div><div class='add'>+						spi,</div><div class='ctx'> 						bits, &amp;dma_burst,</div><div class='ctx'> 						&amp;dma_thresh))</div><div class='del'>-			dev_warn_ratelimited(&amp;message-&gt;spi-&gt;dev,</div><div class='add'>+			dev_warn_ratelimited(&amp;spi-&gt;dev,</div><div class='ctx'> 					     "DMA burst size reduced to match bits_per_word\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_mapped = controller-&gt;can_dma &amp;&amp;</div><div class='del'>-		     controller-&gt;can_dma(controller, message-&gt;spi, transfer) &amp;&amp;</div><div class='add'>+		     controller-&gt;can_dma(controller, spi, transfer) &amp;&amp;</div><div class='ctx'> 		     controller-&gt;cur_msg_mapped;</div><div class='ctx'> 	if (dma_mapped) {</div><div class='ctx'> </div><div class='hunk'>@@ -1035,12 +1039,12 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,</div><div class='ctx'> 	/* NOTE:  PXA25x_SSP _could_ use external clocking ... */</div><div class='ctx'> 	cr0 = pxa2xx_configure_sscr0(drv_data, clk_div, bits);</div><div class='ctx'> 	if (!pxa25x_ssp_comp(drv_data))</div><div class='del'>-		dev_dbg(&amp;message-&gt;spi-&gt;dev, "%u Hz actual, %s\n",</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "%u Hz actual, %s\n",</div><div class='ctx'> 			controller-&gt;max_speed_hz</div><div class='ctx'> 				/ (1 + ((cr0 &amp; SSCR0_SCR(0xfff)) &gt;&gt; 8)),</div><div class='ctx'> 			dma_mapped ? "DMA" : "PIO");</div><div class='ctx'> 	else</div><div class='del'>-		dev_dbg(&amp;message-&gt;spi-&gt;dev, "%u Hz actual, %s\n",</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "%u Hz actual, %s\n",</div><div class='ctx'> 			controller-&gt;max_speed_hz / 2</div><div class='ctx'> 				/ (1 + ((cr0 &amp; SSCR0_SCR(0x0ff)) &gt;&gt; 8)),</div><div class='ctx'> 			dma_mapped ? "DMA" : "PIO");</div><div class='hunk'>@@ -1333,6 +1337,9 @@ static int setup(struct spi_device *spi)</div><div class='ctx'> 			dev_warn(&amp;spi-&gt;dev,</div><div class='ctx'> 				 "in setup: DMA burst size reduced to match bits_per_word\n");</div><div class='ctx'> 		}</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev,</div><div class='add'>+			"in setup: DMA burst size set to %u\n",</div><div class='add'>+			chip-&gt;dma_burst_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (drv_data-&gt;ssp_type) {</div><div class='hunk'>@@ -1451,6 +1458,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0xa32a), LPSS_CNL_SSP },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0xa32b), LPSS_CNL_SSP },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0xa37b), LPSS_CNL_SSP },</div><div class='add'>+	/* CML-LP */</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x02aa), LPSS_CNL_SSP },</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x02ab), LPSS_CNL_SSP },</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x02fb), LPSS_CNL_SSP },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1564,6 +1575,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)</div><div class='ctx'> 	pdata-&gt;is_slave = of_property_read_bool(pdev-&gt;dev.of_node, "spi-slave");</div><div class='ctx'> 	pdata-&gt;num_chipselect = 1;</div><div class='ctx'> 	pdata-&gt;enable_dma = true;</div><div class='add'>+	pdata-&gt;dma_burst_size = 1;</div><div class='ctx'> </div><div class='ctx'> 	return pdata;</div><div class='ctx'> }</div><div class='hunk'>@@ -1692,7 +1704,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (platform_info-&gt;enable_dma) {</div><div class='ctx'> 		status = pxa2xx_spi_dma_setup(drv_data);</div><div class='ctx'> 		if (status) {</div><div class='del'>-			dev_dbg(dev, "no DMA channels available, using PIO\n");</div><div class='add'>+			dev_warn(dev, "no DMA channels available, using PIO\n");</div><div class='ctx'> 			platform_info-&gt;enable_dma = false;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			controller-&gt;can_dma = pxa2xx_spi_can_dma;</div><div class='hunk'>@@ -1953,3 +1965,5 @@ static void __exit pxa2xx_spi_exit(void)</div><div class='ctx'> 	platform_driver_unregister(&amp;driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(pxa2xx_spi_exit);</div><div class='add'>+</div><div class='add'>+MODULE_SOFTDEP("pre: dw_dmac");</div><div class='head'>diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c<br/>index 556870dcdf79..15f5723d9f95 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-rspi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-rspi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-rspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-rspi.c</a></div><div class='hunk'>@@ -271,7 +271,8 @@ static int rspi_set_config_register(struct rspi_data *rspi, int access_size)</div><div class='ctx'> 	/* Sets parity, interrupt mask */</div><div class='ctx'> 	rspi_write8(rspi, 0x00, RSPI_SPCR2);</div><div class='ctx'> </div><div class='del'>-	/* Sets SPCMD */</div><div class='add'>+	/* Resets sequencer */</div><div class='add'>+	rspi_write8(rspi, 0, RSPI_SPSCR);</div><div class='ctx'> 	rspi-&gt;spcmd |= SPCMD_SPB_8_TO_16(access_size);</div><div class='ctx'> 	rspi_write16(rspi, rspi-&gt;spcmd, RSPI_SPCMD0);</div><div class='ctx'> </div><div class='hunk'>@@ -315,7 +316,8 @@ static int rspi_rz_set_config_register(struct rspi_data *rspi, int access_size)</div><div class='ctx'> 	rspi_write8(rspi, 0x00, RSPI_SSLND);</div><div class='ctx'> 	rspi_write8(rspi, 0x00, RSPI_SPND);</div><div class='ctx'> </div><div class='del'>-	/* Sets SPCMD */</div><div class='add'>+	/* Resets sequencer */</div><div class='add'>+	rspi_write8(rspi, 0, RSPI_SPSCR);</div><div class='ctx'> 	rspi-&gt;spcmd |= SPCMD_SPB_8_TO_16(access_size);</div><div class='ctx'> 	rspi_write16(rspi, rspi-&gt;spcmd, RSPI_SPCMD0);</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +368,8 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size)</div><div class='ctx'> 	/* Sets buffer to allow normal operation */</div><div class='ctx'> 	rspi_write8(rspi, 0x00, QSPI_SPBFCR);</div><div class='ctx'> </div><div class='del'>-	/* Sets SPCMD */</div><div class='add'>+	/* Resets sequencer */</div><div class='add'>+	rspi_write8(rspi, 0, RSPI_SPSCR);</div><div class='ctx'> 	rspi_write16(rspi, rspi-&gt;spcmd, RSPI_SPCMD0);</div><div class='ctx'> </div><div class='ctx'> 	/* Sets RSPI mode */</div><div class='hunk'>@@ -736,27 +739,22 @@ static int qspi_trigger_transfer_out_in(struct rspi_data *rspi, const u8 *tx,</div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		n = qspi_set_send_trigger(rspi, len);</div><div class='ctx'> 		qspi_set_receive_trigger(rspi, len);</div><div class='del'>-		if (n == QSPI_BUFFER_SIZE) {</div><div class='del'>-			ret = rspi_wait_for_tx_empty(rspi);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "transmit timeout\n");</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-			for (i = 0; i &lt; n; i++)</div><div class='del'>-				rspi_write_data(rspi, *tx++);</div><div class='add'>+		ret = rspi_wait_for_tx_empty(rspi);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "transmit timeout\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; n; i++)</div><div class='add'>+			rspi_write_data(rspi, *tx++);</div><div class='ctx'> </div><div class='del'>-			ret = rspi_wait_for_rx_full(rspi);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "receive timeout\n");</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-			for (i = 0; i &lt; n; i++)</div><div class='del'>-				*rx++ = rspi_read_data(rspi);</div><div class='del'>-		} else {</div><div class='del'>-			ret = rspi_pio_transfer(rspi, tx, rx, n);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='add'>+		ret = rspi_wait_for_rx_full(rspi);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "receive timeout\n");</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		for (i = 0; i &lt; n; i++)</div><div class='add'>+			*rx++ = rspi_read_data(rspi);</div><div class='add'>+</div><div class='ctx'> 		len -= n;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -793,19 +791,14 @@ static int qspi_transfer_out(struct rspi_data *rspi, struct spi_transfer *xfer)</div><div class='ctx'> </div><div class='ctx'> 	while (n &gt; 0) {</div><div class='ctx'> 		len = qspi_set_send_trigger(rspi, n);</div><div class='del'>-		if (len == QSPI_BUFFER_SIZE) {</div><div class='del'>-			ret = rspi_wait_for_tx_empty(rspi);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "transmit timeout\n");</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-			for (i = 0; i &lt; len; i++)</div><div class='del'>-				rspi_write_data(rspi, *tx++);</div><div class='del'>-		} else {</div><div class='del'>-			ret = rspi_pio_transfer(rspi, tx, NULL, len);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='add'>+		ret = rspi_wait_for_tx_empty(rspi);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "transmit timeout\n");</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			rspi_write_data(rspi, *tx++);</div><div class='add'>+</div><div class='ctx'> 		n -= len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -830,19 +823,14 @@ static int qspi_transfer_in(struct rspi_data *rspi, struct spi_transfer *xfer)</div><div class='ctx'> </div><div class='ctx'> 	while (n &gt; 0) {</div><div class='ctx'> 		len = qspi_set_receive_trigger(rspi, n);</div><div class='del'>-		if (len == QSPI_BUFFER_SIZE) {</div><div class='del'>-			ret = rspi_wait_for_rx_full(rspi);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "receive timeout\n");</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-			for (i = 0; i &lt; len; i++)</div><div class='del'>-				*rx++ = rspi_read_data(rspi);</div><div class='del'>-		} else {</div><div class='del'>-			ret = rspi_pio_transfer(rspi, NULL, rx, len);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='add'>+		ret = rspi_wait_for_rx_full(rspi);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(&amp;rspi-&gt;ctlr-&gt;dev, "receive timeout\n");</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			*rx++ = rspi_read_data(rspi);</div><div class='add'>+</div><div class='ctx'> 		n -= len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -868,28 +856,6 @@ static int qspi_transfer_one(struct spi_controller *ctlr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rspi_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct rspi_data *rspi = spi_controller_get_devdata(spi-&gt;controller);</div><div class='del'>-</div><div class='del'>-	rspi-&gt;max_speed_hz = spi-&gt;max_speed_hz;</div><div class='del'>-</div><div class='del'>-	rspi-&gt;spcmd = SPCMD_SSLKP;</div><div class='del'>-	if (spi-&gt;mode &amp; SPI_CPOL)</div><div class='del'>-		rspi-&gt;spcmd |= SPCMD_CPOL;</div><div class='del'>-	if (spi-&gt;mode &amp; SPI_CPHA)</div><div class='del'>-		rspi-&gt;spcmd |= SPCMD_CPHA;</div><div class='del'>-</div><div class='del'>-	/* CMOS output mode and MOSI signal from previous transfer */</div><div class='del'>-	rspi-&gt;sppcr = 0;</div><div class='del'>-	if (spi-&gt;mode &amp; SPI_LOOP)</div><div class='del'>-		rspi-&gt;sppcr |= SPPCR_SPLP;</div><div class='del'>-</div><div class='del'>-	set_config_register(rspi, 8);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u16 qspi_transfer_mode(const struct spi_transfer *xfer)</div><div class='ctx'> {</div><div class='ctx'> 	if (xfer-&gt;tx_buf)</div><div class='hunk'>@@ -959,8 +925,24 @@ static int rspi_prepare_message(struct spi_controller *ctlr,</div><div class='ctx'> 				struct spi_message *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct rspi_data *rspi = spi_controller_get_devdata(ctlr);</div><div class='add'>+	struct spi_device *spi = msg-&gt;spi;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	rspi-&gt;max_speed_hz = spi-&gt;max_speed_hz;</div><div class='add'>+</div><div class='add'>+	rspi-&gt;spcmd = SPCMD_SSLKP;</div><div class='add'>+	if (spi-&gt;mode &amp; SPI_CPOL)</div><div class='add'>+		rspi-&gt;spcmd |= SPCMD_CPOL;</div><div class='add'>+	if (spi-&gt;mode &amp; SPI_CPHA)</div><div class='add'>+		rspi-&gt;spcmd |= SPCMD_CPHA;</div><div class='add'>+</div><div class='add'>+	/* CMOS output mode and MOSI signal from previous transfer */</div><div class='add'>+	rspi-&gt;sppcr = 0;</div><div class='add'>+	if (spi-&gt;mode &amp; SPI_LOOP)</div><div class='add'>+		rspi-&gt;sppcr |= SPPCR_SPLP;</div><div class='add'>+</div><div class='add'>+	set_config_register(rspi, 8);</div><div class='add'>+</div><div class='ctx'> 	if (msg-&gt;spi-&gt;mode &amp;</div><div class='ctx'> 	    (SPI_TX_DUAL | SPI_TX_QUAD | SPI_RX_DUAL | SPI_RX_QUAD)) {</div><div class='ctx'> 		/* Setup sequencer for messages with multiple transfer modes */</div><div class='hunk'>@@ -1267,7 +1249,6 @@ static int rspi_probe(struct platform_device *pdev)</div><div class='ctx'> 	init_waitqueue_head(&amp;rspi-&gt;wait);</div><div class='ctx'> </div><div class='ctx'> 	ctlr-&gt;bus_num = pdev-&gt;id;</div><div class='del'>-	ctlr-&gt;setup = rspi_setup;</div><div class='ctx'> 	ctlr-&gt;auto_runtime_pm = true;</div><div class='ctx'> 	ctlr-&gt;transfer_one = ops-&gt;transfer_one;</div><div class='ctx'> 	ctlr-&gt;prepare_message = rspi_prepare_message;</div><div class='head'>diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c<br/>index e2eb466db10a..6aab7b2136db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-sh-msiof.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-sh-msiof.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-sh-msiof.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-sh-msiof.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/gpio/consumer.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/of.h&gt;</div><div class='hunk'>@@ -82,111 +83,113 @@ struct sh_msiof_spi_priv {</div><div class='ctx'> #define RFDR	0x60	/* Receive FIFO Data Register */</div><div class='ctx'> </div><div class='ctx'> /* TMDR1 and RMDR1 */</div><div class='del'>-#define MDR1_TRMD	 0x80000000 /* Transfer Mode (1 = Master mode) */</div><div class='del'>-#define MDR1_SYNCMD_MASK 0x30000000 /* SYNC Mode */</div><div class='del'>-#define MDR1_SYNCMD_SPI	 0x20000000 /*   Level mode/SPI */</div><div class='del'>-#define MDR1_SYNCMD_LR	 0x30000000 /*   L/R mode */</div><div class='del'>-#define MDR1_SYNCAC_SHIFT	 25 /* Sync Polarity (1 = Active-low) */</div><div class='del'>-#define MDR1_BITLSB_SHIFT	 24 /* MSB/LSB First (1 = LSB first) */</div><div class='del'>-#define MDR1_DTDL_SHIFT		 20 /* Data Pin Bit Delay for MSIOF_SYNC */</div><div class='del'>-#define MDR1_SYNCDL_SHIFT	 16 /* Frame Sync Signal Timing Delay */</div><div class='del'>-#define MDR1_FLD_MASK	 0x0000000c /* Frame Sync Signal Interval (0-3) */</div><div class='del'>-#define MDR1_FLD_SHIFT		  2</div><div class='del'>-#define MDR1_XXSTP	 0x00000001 /* Transmission/Reception Stop on FIFO */</div><div class='add'>+#define MDR1_TRMD	   BIT(31)  /* Transfer Mode (1 = Master mode) */</div><div class='add'>+#define MDR1_SYNCMD_MASK   GENMASK(29, 28) /* SYNC Mode */</div><div class='add'>+#define MDR1_SYNCMD_SPI	   (2 &lt;&lt; 28)/*   Level mode/SPI */</div><div class='add'>+#define MDR1_SYNCMD_LR	   (3 &lt;&lt; 28)/*   L/R mode */</div><div class='add'>+#define MDR1_SYNCAC_SHIFT  25       /* Sync Polarity (1 = Active-low) */</div><div class='add'>+#define MDR1_BITLSB_SHIFT  24       /* MSB/LSB First (1 = LSB first) */</div><div class='add'>+#define MDR1_DTDL_SHIFT	   20       /* Data Pin Bit Delay for MSIOF_SYNC */</div><div class='add'>+#define MDR1_SYNCDL_SHIFT  16       /* Frame Sync Signal Timing Delay */</div><div class='add'>+#define MDR1_FLD_MASK	   GENMASK(3, 2) /* Frame Sync Signal Interval (0-3) */</div><div class='add'>+#define MDR1_FLD_SHIFT	   2</div><div class='add'>+#define MDR1_XXSTP	   BIT(0)   /* Transmission/Reception Stop on FIFO */</div><div class='ctx'> /* TMDR1 */</div><div class='del'>-#define TMDR1_PCON	 0x40000000 /* Transfer Signal Connection */</div><div class='del'>-#define TMDR1_SYNCCH_MASK 0xc000000 /* Synchronization Signal Channel Select */</div><div class='del'>-#define TMDR1_SYNCCH_SHIFT	 26 /* 0=MSIOF_SYNC, 1=MSIOF_SS1, 2=MSIOF_SS2 */</div><div class='add'>+#define TMDR1_PCON	   BIT(30)  /* Transfer Signal Connection */</div><div class='add'>+#define TMDR1_SYNCCH_MASK  GENMASK(27, 26) /* Sync Signal Channel Select */</div><div class='add'>+#define TMDR1_SYNCCH_SHIFT 26       /* 0=MSIOF_SYNC, 1=MSIOF_SS1, 2=MSIOF_SS2 */</div><div class='ctx'> </div><div class='ctx'> /* TMDR2 and RMDR2 */</div><div class='ctx'> #define MDR2_BITLEN1(i)	(((i) - 1) &lt;&lt; 24) /* Data Size (8-32 bits) */</div><div class='ctx'> #define MDR2_WDLEN1(i)	(((i) - 1) &lt;&lt; 16) /* Word Count (1-64/256 (SH, A1))) */</div><div class='del'>-#define MDR2_GRPMASK1	0x00000001 /* Group Output Mask 1 (SH, A1) */</div><div class='add'>+#define MDR2_GRPMASK1	BIT(0)      /* Group Output Mask 1 (SH, A1) */</div><div class='ctx'> </div><div class='ctx'> /* TSCR and RSCR */</div><div class='del'>-#define SCR_BRPS_MASK	    0x1f00 /* Prescaler Setting (1-32) */</div><div class='add'>+#define SCR_BRPS_MASK	GENMASK(12, 8) /* Prescaler Setting (1-32) */</div><div class='ctx'> #define SCR_BRPS(i)	(((i) - 1) &lt;&lt; 8)</div><div class='del'>-#define SCR_BRDV_MASK	    0x0007 /* Baud Rate Generator's Division Ratio */</div><div class='del'>-#define SCR_BRDV_DIV_2	    0x0000</div><div class='del'>-#define SCR_BRDV_DIV_4	    0x0001</div><div class='del'>-#define SCR_BRDV_DIV_8	    0x0002</div><div class='del'>-#define SCR_BRDV_DIV_16	    0x0003</div><div class='del'>-#define SCR_BRDV_DIV_32	    0x0004</div><div class='del'>-#define SCR_BRDV_DIV_1	    0x0007</div><div class='add'>+#define SCR_BRDV_MASK	GENMASK(2, 0) /* Baud Rate Generator's Division Ratio */</div><div class='add'>+#define SCR_BRDV_DIV_2	0</div><div class='add'>+#define SCR_BRDV_DIV_4	1</div><div class='add'>+#define SCR_BRDV_DIV_8	2</div><div class='add'>+#define SCR_BRDV_DIV_16	3</div><div class='add'>+#define SCR_BRDV_DIV_32	4</div><div class='add'>+#define SCR_BRDV_DIV_1	7</div><div class='ctx'> </div><div class='ctx'> /* CTR */</div><div class='del'>-#define CTR_TSCKIZ_MASK	0xc0000000 /* Transmit Clock I/O Polarity Select */</div><div class='del'>-#define CTR_TSCKIZ_SCK	0x80000000 /*   Disable SCK when TX disabled */</div><div class='del'>-#define CTR_TSCKIZ_POL_SHIFT	30 /*   Transmit Clock Polarity */</div><div class='del'>-#define CTR_RSCKIZ_MASK	0x30000000 /* Receive Clock Polarity Select */</div><div class='del'>-#define CTR_RSCKIZ_SCK	0x20000000 /*   Must match CTR_TSCKIZ_SCK */</div><div class='del'>-#define CTR_RSCKIZ_POL_SHIFT	28 /*   Receive Clock Polarity */</div><div class='del'>-#define CTR_TEDG_SHIFT		27 /* Transmit Timing (1 = falling edge) */</div><div class='del'>-#define CTR_REDG_SHIFT		26 /* Receive Timing (1 = falling edge) */</div><div class='del'>-#define CTR_TXDIZ_MASK	0x00c00000 /* Pin Output When TX is Disabled */</div><div class='del'>-#define CTR_TXDIZ_LOW	0x00000000 /*   0 */</div><div class='del'>-#define CTR_TXDIZ_HIGH	0x00400000 /*   1 */</div><div class='del'>-#define CTR_TXDIZ_HIZ	0x00800000 /*   High-impedance */</div><div class='del'>-#define CTR_TSCKE	0x00008000 /* Transmit Serial Clock Output Enable */</div><div class='del'>-#define CTR_TFSE	0x00004000 /* Transmit Frame Sync Signal Output Enable */</div><div class='del'>-#define CTR_TXE		0x00000200 /* Transmit Enable */</div><div class='del'>-#define CTR_RXE		0x00000100 /* Receive Enable */</div><div class='add'>+#define CTR_TSCKIZ_MASK	GENMASK(31, 30) /* Transmit Clock I/O Polarity Select */</div><div class='add'>+#define CTR_TSCKIZ_SCK	BIT(31)   /*   Disable SCK when TX disabled */</div><div class='add'>+#define CTR_TSCKIZ_POL_SHIFT 30   /*   Transmit Clock Polarity */</div><div class='add'>+#define CTR_RSCKIZ_MASK	GENMASK(29, 28) /* Receive Clock Polarity Select */</div><div class='add'>+#define CTR_RSCKIZ_SCK	BIT(29)   /*   Must match CTR_TSCKIZ_SCK */</div><div class='add'>+#define CTR_RSCKIZ_POL_SHIFT 28   /*   Receive Clock Polarity */</div><div class='add'>+#define CTR_TEDG_SHIFT	     27   /* Transmit Timing (1 = falling edge) */</div><div class='add'>+#define CTR_REDG_SHIFT	     26   /* Receive Timing (1 = falling edge) */</div><div class='add'>+#define CTR_TXDIZ_MASK	GENMASK(23, 22) /* Pin Output When TX is Disabled */</div><div class='add'>+#define CTR_TXDIZ_LOW	(0 &lt;&lt; 22) /*   0 */</div><div class='add'>+#define CTR_TXDIZ_HIGH	(1 &lt;&lt; 22) /*   1 */</div><div class='add'>+#define CTR_TXDIZ_HIZ	(2 &lt;&lt; 22) /*   High-impedance */</div><div class='add'>+#define CTR_TSCKE	BIT(15)   /* Transmit Serial Clock Output Enable */</div><div class='add'>+#define CTR_TFSE	BIT(14)   /* Transmit Frame Sync Signal Output Enable */</div><div class='add'>+#define CTR_TXE		BIT(9)    /* Transmit Enable */</div><div class='add'>+#define CTR_RXE		BIT(8)    /* Receive Enable */</div><div class='add'>+#define CTR_TXRST	BIT(1)    /* Transmit Reset */</div><div class='add'>+#define CTR_RXRST	BIT(0)    /* Receive Reset */</div><div class='ctx'> </div><div class='ctx'> /* FCTR */</div><div class='del'>-#define FCTR_TFWM_MASK	0xe0000000 /* Transmit FIFO Watermark */</div><div class='del'>-#define FCTR_TFWM_64	0x00000000 /*  Transfer Request when 64 empty stages */</div><div class='del'>-#define FCTR_TFWM_32	0x20000000 /*  Transfer Request when 32 empty stages */</div><div class='del'>-#define FCTR_TFWM_24	0x40000000 /*  Transfer Request when 24 empty stages */</div><div class='del'>-#define FCTR_TFWM_16	0x60000000 /*  Transfer Request when 16 empty stages */</div><div class='del'>-#define FCTR_TFWM_12	0x80000000 /*  Transfer Request when 12 empty stages */</div><div class='del'>-#define FCTR_TFWM_8	0xa0000000 /*  Transfer Request when 8 empty stages */</div><div class='del'>-#define FCTR_TFWM_4	0xc0000000 /*  Transfer Request when 4 empty stages */</div><div class='del'>-#define FCTR_TFWM_1	0xe0000000 /*  Transfer Request when 1 empty stage */</div><div class='del'>-#define FCTR_TFUA_MASK	0x07f00000 /* Transmit FIFO Usable Area */</div><div class='del'>-#define FCTR_TFUA_SHIFT		20</div><div class='add'>+#define FCTR_TFWM_MASK	GENMASK(31, 29) /* Transmit FIFO Watermark */</div><div class='add'>+#define FCTR_TFWM_64	(0 &lt;&lt; 29) /*  Transfer Request when 64 empty stages */</div><div class='add'>+#define FCTR_TFWM_32	(1 &lt;&lt; 29) /*  Transfer Request when 32 empty stages */</div><div class='add'>+#define FCTR_TFWM_24	(2 &lt;&lt; 29) /*  Transfer Request when 24 empty stages */</div><div class='add'>+#define FCTR_TFWM_16	(3 &lt;&lt; 29) /*  Transfer Request when 16 empty stages */</div><div class='add'>+#define FCTR_TFWM_12	(4 &lt;&lt; 29) /*  Transfer Request when 12 empty stages */</div><div class='add'>+#define FCTR_TFWM_8	(5 &lt;&lt; 29) /*  Transfer Request when 8 empty stages */</div><div class='add'>+#define FCTR_TFWM_4	(6 &lt;&lt; 29) /*  Transfer Request when 4 empty stages */</div><div class='add'>+#define FCTR_TFWM_1	(7 &lt;&lt; 29) /*  Transfer Request when 1 empty stage */</div><div class='add'>+#define FCTR_TFUA_MASK	GENMASK(26, 20) /* Transmit FIFO Usable Area */</div><div class='add'>+#define FCTR_TFUA_SHIFT	20</div><div class='ctx'> #define FCTR_TFUA(i)	((i) &lt;&lt; FCTR_TFUA_SHIFT)</div><div class='del'>-#define FCTR_RFWM_MASK	0x0000e000 /* Receive FIFO Watermark */</div><div class='del'>-#define FCTR_RFWM_1	0x00000000 /*  Transfer Request when 1 valid stages */</div><div class='del'>-#define FCTR_RFWM_4	0x00002000 /*  Transfer Request when 4 valid stages */</div><div class='del'>-#define FCTR_RFWM_8	0x00004000 /*  Transfer Request when 8 valid stages */</div><div class='del'>-#define FCTR_RFWM_16	0x00006000 /*  Transfer Request when 16 valid stages */</div><div class='del'>-#define FCTR_RFWM_32	0x00008000 /*  Transfer Request when 32 valid stages */</div><div class='del'>-#define FCTR_RFWM_64	0x0000a000 /*  Transfer Request when 64 valid stages */</div><div class='del'>-#define FCTR_RFWM_128	0x0000c000 /*  Transfer Request when 128 valid stages */</div><div class='del'>-#define FCTR_RFWM_256	0x0000e000 /*  Transfer Request when 256 valid stages */</div><div class='del'>-#define FCTR_RFUA_MASK	0x00001ff0 /* Receive FIFO Usable Area (0x40 = full) */</div><div class='del'>-#define FCTR_RFUA_SHIFT		 4</div><div class='add'>+#define FCTR_RFWM_MASK	GENMASK(15, 13) /* Receive FIFO Watermark */</div><div class='add'>+#define FCTR_RFWM_1	(0 &lt;&lt; 13) /*  Transfer Request when 1 valid stages */</div><div class='add'>+#define FCTR_RFWM_4	(1 &lt;&lt; 13) /*  Transfer Request when 4 valid stages */</div><div class='add'>+#define FCTR_RFWM_8	(2 &lt;&lt; 13) /*  Transfer Request when 8 valid stages */</div><div class='add'>+#define FCTR_RFWM_16	(3 &lt;&lt; 13) /*  Transfer Request when 16 valid stages */</div><div class='add'>+#define FCTR_RFWM_32	(4 &lt;&lt; 13) /*  Transfer Request when 32 valid stages */</div><div class='add'>+#define FCTR_RFWM_64	(5 &lt;&lt; 13) /*  Transfer Request when 64 valid stages */</div><div class='add'>+#define FCTR_RFWM_128	(6 &lt;&lt; 13) /*  Transfer Request when 128 valid stages */</div><div class='add'>+#define FCTR_RFWM_256	(7 &lt;&lt; 13) /*  Transfer Request when 256 valid stages */</div><div class='add'>+#define FCTR_RFUA_MASK	GENMASK(12, 4) /* Receive FIFO Usable Area (0x40 = full) */</div><div class='add'>+#define FCTR_RFUA_SHIFT	4</div><div class='ctx'> #define FCTR_RFUA(i)	((i) &lt;&lt; FCTR_RFUA_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* STR */</div><div class='del'>-#define STR_TFEMP	0x20000000 /* Transmit FIFO Empty */</div><div class='del'>-#define STR_TDREQ	0x10000000 /* Transmit Data Transfer Request */</div><div class='del'>-#define STR_TEOF	0x00800000 /* Frame Transmission End */</div><div class='del'>-#define STR_TFSERR	0x00200000 /* Transmit Frame Synchronization Error */</div><div class='del'>-#define STR_TFOVF	0x00100000 /* Transmit FIFO Overflow */</div><div class='del'>-#define STR_TFUDF	0x00080000 /* Transmit FIFO Underflow */</div><div class='del'>-#define STR_RFFUL	0x00002000 /* Receive FIFO Full */</div><div class='del'>-#define STR_RDREQ	0x00001000 /* Receive Data Transfer Request */</div><div class='del'>-#define STR_REOF	0x00000080 /* Frame Reception End */</div><div class='del'>-#define STR_RFSERR	0x00000020 /* Receive Frame Synchronization Error */</div><div class='del'>-#define STR_RFUDF	0x00000010 /* Receive FIFO Underflow */</div><div class='del'>-#define STR_RFOVF	0x00000008 /* Receive FIFO Overflow */</div><div class='add'>+#define STR_TFEMP	BIT(29) /* Transmit FIFO Empty */</div><div class='add'>+#define STR_TDREQ	BIT(28) /* Transmit Data Transfer Request */</div><div class='add'>+#define STR_TEOF	BIT(23) /* Frame Transmission End */</div><div class='add'>+#define STR_TFSERR	BIT(21) /* Transmit Frame Synchronization Error */</div><div class='add'>+#define STR_TFOVF	BIT(20) /* Transmit FIFO Overflow */</div><div class='add'>+#define STR_TFUDF	BIT(19) /* Transmit FIFO Underflow */</div><div class='add'>+#define STR_RFFUL	BIT(13) /* Receive FIFO Full */</div><div class='add'>+#define STR_RDREQ	BIT(12) /* Receive Data Transfer Request */</div><div class='add'>+#define STR_REOF	BIT(7)  /* Frame Reception End */</div><div class='add'>+#define STR_RFSERR	BIT(5)  /* Receive Frame Synchronization Error */</div><div class='add'>+#define STR_RFUDF	BIT(4)  /* Receive FIFO Underflow */</div><div class='add'>+#define STR_RFOVF	BIT(3)  /* Receive FIFO Overflow */</div><div class='ctx'> </div><div class='ctx'> /* IER */</div><div class='del'>-#define IER_TDMAE	0x80000000 /* Transmit Data DMA Transfer Req. Enable */</div><div class='del'>-#define IER_TFEMPE	0x20000000 /* Transmit FIFO Empty Enable */</div><div class='del'>-#define IER_TDREQE	0x10000000 /* Transmit Data Transfer Request Enable */</div><div class='del'>-#define IER_TEOFE	0x00800000 /* Frame Transmission End Enable */</div><div class='del'>-#define IER_TFSERRE	0x00200000 /* Transmit Frame Sync Error Enable */</div><div class='del'>-#define IER_TFOVFE	0x00100000 /* Transmit FIFO Overflow Enable */</div><div class='del'>-#define IER_TFUDFE	0x00080000 /* Transmit FIFO Underflow Enable */</div><div class='del'>-#define IER_RDMAE	0x00008000 /* Receive Data DMA Transfer Req. Enable */</div><div class='del'>-#define IER_RFFULE	0x00002000 /* Receive FIFO Full Enable */</div><div class='del'>-#define IER_RDREQE	0x00001000 /* Receive Data Transfer Request Enable */</div><div class='del'>-#define IER_REOFE	0x00000080 /* Frame Reception End Enable */</div><div class='del'>-#define IER_RFSERRE	0x00000020 /* Receive Frame Sync Error Enable */</div><div class='del'>-#define IER_RFUDFE	0x00000010 /* Receive FIFO Underflow Enable */</div><div class='del'>-#define IER_RFOVFE	0x00000008 /* Receive FIFO Overflow Enable */</div><div class='add'>+#define IER_TDMAE	BIT(31) /* Transmit Data DMA Transfer Req. Enable */</div><div class='add'>+#define IER_TFEMPE	BIT(29) /* Transmit FIFO Empty Enable */</div><div class='add'>+#define IER_TDREQE	BIT(28) /* Transmit Data Transfer Request Enable */</div><div class='add'>+#define IER_TEOFE	BIT(23) /* Frame Transmission End Enable */</div><div class='add'>+#define IER_TFSERRE	BIT(21) /* Transmit Frame Sync Error Enable */</div><div class='add'>+#define IER_TFOVFE	BIT(20) /* Transmit FIFO Overflow Enable */</div><div class='add'>+#define IER_TFUDFE	BIT(19) /* Transmit FIFO Underflow Enable */</div><div class='add'>+#define IER_RDMAE	BIT(15) /* Receive Data DMA Transfer Req. Enable */</div><div class='add'>+#define IER_RFFULE	BIT(13) /* Receive FIFO Full Enable */</div><div class='add'>+#define IER_RDREQE	BIT(12) /* Receive Data Transfer Request Enable */</div><div class='add'>+#define IER_REOFE	BIT(7)  /* Frame Reception End Enable */</div><div class='add'>+#define IER_RFSERRE	BIT(5)  /* Receive Frame Sync Error Enable */</div><div class='add'>+#define IER_RFUDFE	BIT(4)  /* Receive FIFO Underflow Enable */</div><div class='add'>+#define IER_RFOVFE	BIT(3)  /* Receive FIFO Overflow Enable */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static u32 sh_msiof_read(struct sh_msiof_spi_priv *p, int reg_offs)</div><div class='hunk'>@@ -219,21 +222,14 @@ static int sh_msiof_modify_ctr_wait(struct sh_msiof_spi_priv *p,</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = clr | set;</div><div class='ctx'> 	u32 data;</div><div class='del'>-	int k;</div><div class='ctx'> </div><div class='ctx'> 	data = sh_msiof_read(p, CTR);</div><div class='ctx'> 	data &amp;= ~clr;</div><div class='ctx'> 	data |= set;</div><div class='ctx'> 	sh_msiof_write(p, CTR, data);</div><div class='ctx'> </div><div class='del'>-	for (k = 100; k &gt; 0; k--) {</div><div class='del'>-		if ((sh_msiof_read(p, CTR) &amp; mask) == set)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return k &gt; 0 ? 0 : -ETIMEDOUT;</div><div class='add'>+	return readl_poll_timeout_atomic(p-&gt;mapbase + CTR, data,</div><div class='add'>+					 (data &amp; mask) == set, 10, 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t sh_msiof_spi_irq(int irq, void *data)</div><div class='hunk'>@@ -247,6 +243,19 @@ static irqreturn_t sh_msiof_spi_irq(int irq, void *data)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sh_msiof_spi_reset_regs(struct sh_msiof_spi_priv *p)</div><div class='add'>+{</div><div class='add'>+	u32 mask = CTR_TXRST | CTR_RXRST;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	data = sh_msiof_read(p, CTR);</div><div class='add'>+	data |= mask;</div><div class='add'>+	sh_msiof_write(p, CTR, data);</div><div class='add'>+</div><div class='add'>+	readl_poll_timeout_atomic(p-&gt;mapbase + CTR, data, !(data &amp; mask), 1,</div><div class='add'>+				  100);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const u32 sh_msiof_spi_div_array[] = {</div><div class='ctx'> 	SCR_BRDV_DIV_1, SCR_BRDV_DIV_2,	 SCR_BRDV_DIV_4,</div><div class='ctx'> 	SCR_BRDV_DIV_8,	SCR_BRDV_DIV_16, SCR_BRDV_DIV_32,</div><div class='hunk'>@@ -540,25 +549,11 @@ static void sh_msiof_spi_read_fifo_s32u(struct sh_msiof_spi_priv *p,</div><div class='ctx'> </div><div class='ctx'> static int sh_msiof_spi_setup(struct spi_device *spi)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np = spi-&gt;controller-&gt;dev.of_node;</div><div class='ctx'> 	struct sh_msiof_spi_priv *p =</div><div class='ctx'> 		spi_controller_get_devdata(spi-&gt;controller);</div><div class='ctx'> 	u32 clr, set, tmp;</div><div class='ctx'> </div><div class='del'>-	if (!np) {</div><div class='del'>-		/*</div><div class='del'>-		 * Use spi-&gt;controller_data for CS (same strategy as spi_gpio),</div><div class='del'>-		 * if any. otherwise let HW control CS</div><div class='del'>-		 */</div><div class='del'>-		spi-&gt;cs_gpio = (uintptr_t)spi-&gt;controller_data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (gpio_is_valid(spi-&gt;cs_gpio)) {</div><div class='del'>-		gpio_direction_output(spi-&gt;cs_gpio, !(spi-&gt;mode &amp; SPI_CS_HIGH));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spi_controller_is_slave(p-&gt;ctlr))</div><div class='add'>+	if (spi-&gt;cs_gpiod || spi_controller_is_slave(p-&gt;ctlr))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;native_cs_inited &amp;&amp;</div><div class='hunk'>@@ -591,7 +586,7 @@ static int sh_msiof_prepare_message(struct spi_controller *ctlr,</div><div class='ctx'> 	u32 ss, cs_high;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure pins before asserting CS */</div><div class='del'>-	if (gpio_is_valid(spi-&gt;cs_gpio)) {</div><div class='add'>+	if (spi-&gt;cs_gpiod) {</div><div class='ctx'> 		ss = p-&gt;unused_ss;</div><div class='ctx'> 		cs_high = p-&gt;native_cs_high;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -926,6 +921,9 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr,</div><div class='ctx'> 	bool swab;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* reset registers */</div><div class='add'>+	sh_msiof_spi_reset_regs(p);</div><div class='add'>+</div><div class='ctx'> 	/* setup clocks (clock already enabled in chipselect()) */</div><div class='ctx'> 	if (!spi_controller_is_slave(p-&gt;ctlr))</div><div class='ctx'> 		sh_msiof_spi_set_clk_regs(p, clk_get_rate(p-&gt;clk), t-&gt;speed_hz);</div><div class='hunk'>@@ -1144,6 +1142,7 @@ static int sh_msiof_get_cs_gpios(struct sh_msiof_spi_priv *p)</div><div class='ctx'> </div><div class='ctx'> 		gpiod = devm_gpiod_get_index(dev, "cs", i, GPIOD_ASIS);</div><div class='ctx'> 		if (!IS_ERR(gpiod)) {</div><div class='add'>+			devm_gpiod_put(dev, gpiod);</div><div class='ctx'> 			cs_gpios++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1395,6 +1394,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	ctlr-&gt;bits_per_word_mask = chipdata-&gt;bits_per_word_mask;</div><div class='ctx'> 	ctlr-&gt;auto_runtime_pm = true;</div><div class='ctx'> 	ctlr-&gt;transfer_one = sh_msiof_transfer_one;</div><div class='add'>+	ctlr-&gt;use_gpio_descriptors = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = sh_msiof_request_dma(p);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c<br/>index 3b2a9a6b990d..42f8e3c6aa1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-stm32-qspi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-stm32-qspi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-stm32-qspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-stm32-qspi.c</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/iopoll.h&gt;</div><div class='hunk'>@@ -13,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #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='ctx'> #include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='hunk'>@@ -76,7 +79,6 @@</div><div class='ctx'> #define QSPI_PSMAR		0x28</div><div class='ctx'> #define QSPI_PIR		0x2c</div><div class='ctx'> #define QSPI_LPTR		0x30</div><div class='del'>-#define LPTR_DFT_TIMEOUT	0x10</div><div class='ctx'> </div><div class='ctx'> #define STM32_QSPI_MAX_MMAP_SZ	SZ_256M</div><div class='ctx'> #define STM32_QSPI_MAX_NORCHIP	2</div><div class='hunk'>@@ -84,6 +86,7 @@</div><div class='ctx'> #define STM32_FIFO_TIMEOUT_US 30000</div><div class='ctx'> #define STM32_BUSY_TIMEOUT_US 100000</div><div class='ctx'> #define STM32_ABT_TIMEOUT_US 100000</div><div class='add'>+#define STM32_COMP_TIMEOUT_MS 1000</div><div class='ctx'> </div><div class='ctx'> struct stm32_qspi_flash {</div><div class='ctx'> 	struct stm32_qspi *qspi;</div><div class='hunk'>@@ -93,6 +96,8 @@ struct stm32_qspi_flash {</div><div class='ctx'> </div><div class='ctx'> struct stm32_qspi {</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct spi_controller *ctrl;</div><div class='add'>+	phys_addr_t phys_base;</div><div class='ctx'> 	void __iomem *io_base;</div><div class='ctx'> 	void __iomem *mm_base;</div><div class='ctx'> 	resource_size_t mm_size;</div><div class='hunk'>@@ -102,6 +107,13 @@ struct stm32_qspi {</div><div class='ctx'> 	struct completion data_completion;</div><div class='ctx'> 	u32 fmode;</div><div class='ctx'> </div><div class='add'>+	struct dma_chan *dma_chtx;</div><div class='add'>+	struct dma_chan *dma_chrx;</div><div class='add'>+	struct completion dma_completion;</div><div class='add'>+</div><div class='add'>+	u32 cr_reg;</div><div class='add'>+	u32 dcr_reg;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * to protect device configuration, could be different between</div><div class='ctx'> 	 * 2 flash access (bk1, bk2)</div><div class='hunk'>@@ -177,6 +189,81 @@ static int stm32_qspi_tx_mm(struct stm32_qspi *qspi,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void stm32_qspi_dma_callback(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct completion *dma_completion = arg;</div><div class='add'>+</div><div class='add'>+	complete(dma_completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32_qspi_tx_dma(struct stm32_qspi *qspi,</div><div class='add'>+			     const struct spi_mem_op *op)</div><div class='add'>+{</div><div class='add'>+	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	enum dma_transfer_direction dma_dir;</div><div class='add'>+	struct dma_chan *dma_ch;</div><div class='add'>+	struct sg_table sgt;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+	u32 cr, t_out;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (op-&gt;data.dir == SPI_MEM_DATA_IN) {</div><div class='add'>+		dma_dir = DMA_DEV_TO_MEM;</div><div class='add'>+		dma_ch = qspi-&gt;dma_chrx;</div><div class='add'>+	} else {</div><div class='add'>+		dma_dir = DMA_MEM_TO_DEV;</div><div class='add'>+		dma_ch = qspi-&gt;dma_chtx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * spi_map_buf return -EINVAL if the buffer is not DMA-able</div><div class='add'>+	 * (DMA-able: in vmalloc | kmap | virt_addr_valid)</div><div class='add'>+	 */</div><div class='add'>+	err = spi_controller_dma_map_mem_op_data(qspi-&gt;ctrl, op, &amp;sgt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	desc = dmaengine_prep_slave_sg(dma_ch, sgt.sgl, sgt.nents,</div><div class='add'>+				       dma_dir, DMA_PREP_INTERRUPT);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cr = readl_relaxed(qspi-&gt;io_base + QSPI_CR);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;qspi-&gt;dma_completion);</div><div class='add'>+	desc-&gt;callback = stm32_qspi_dma_callback;</div><div class='add'>+	desc-&gt;callback_param = &amp;qspi-&gt;dma_completion;</div><div class='add'>+	cookie = dmaengine_submit(desc);</div><div class='add'>+	err = dma_submit_error(cookie);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dma_async_issue_pending(dma_ch);</div><div class='add'>+</div><div class='add'>+	writel_relaxed(cr | CR_DMAEN, qspi-&gt;io_base + QSPI_CR);</div><div class='add'>+</div><div class='add'>+	t_out = sgt.nents * STM32_COMP_TIMEOUT_MS;</div><div class='add'>+	if (!wait_for_completion_interruptible_timeout(&amp;qspi-&gt;dma_completion,</div><div class='add'>+						       msecs_to_jiffies(t_out)))</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (dma_async_is_tx_complete(dma_ch, cookie,</div><div class='add'>+				     NULL, NULL) != DMA_COMPLETE)</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		dmaengine_terminate_all(dma_ch);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	writel_relaxed(cr &amp; ~CR_DMAEN, qspi-&gt;io_base + QSPI_CR);</div><div class='add'>+out_unmap:</div><div class='add'>+	spi_controller_dma_unmap_mem_op_data(qspi-&gt;ctrl, op, &amp;sgt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int stm32_qspi_tx(struct stm32_qspi *qspi, const struct spi_mem_op *op)</div><div class='ctx'> {</div><div class='ctx'> 	if (!op-&gt;data.nbytes)</div><div class='hunk'>@@ -184,6 +271,10 @@ static int stm32_qspi_tx(struct stm32_qspi *qspi, const struct spi_mem_op *op)</div><div class='ctx'> </div><div class='ctx'> 	if (qspi-&gt;fmode == CCR_FMODE_MM)</div><div class='ctx'> 		return stm32_qspi_tx_mm(qspi, op);</div><div class='add'>+	else if ((op-&gt;data.dir == SPI_MEM_DATA_IN &amp;&amp; qspi-&gt;dma_chrx) ||</div><div class='add'>+		 (op-&gt;data.dir == SPI_MEM_DATA_OUT &amp;&amp; qspi-&gt;dma_chtx))</div><div class='add'>+		if (!stm32_qspi_tx_dma(qspi, op))</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 	return stm32_qspi_tx_poll(qspi, op);</div><div class='ctx'> }</div><div class='hunk'>@@ -214,7 +305,7 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi,</div><div class='ctx'> 	writel_relaxed(cr | CR_TCIE | CR_TEIE, qspi-&gt;io_base + QSPI_CR);</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_for_completion_interruptible_timeout(&amp;qspi-&gt;data_completion,</div><div class='del'>-						msecs_to_jiffies(1000))) {</div><div class='add'>+				msecs_to_jiffies(STM32_COMP_TIMEOUT_MS))) {</div><div class='ctx'> 		err = -ETIMEDOUT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sr = readl_relaxed(qspi-&gt;io_base + QSPI_SR);</div><div class='hunk'>@@ -356,7 +447,7 @@ static int stm32_qspi_setup(struct spi_device *spi)</div><div class='ctx'> 	struct spi_controller *ctrl = spi-&gt;master;</div><div class='ctx'> 	struct stm32_qspi *qspi = spi_controller_get_devdata(ctrl);</div><div class='ctx'> 	struct stm32_qspi_flash *flash;</div><div class='del'>-	u32 cr, presc;</div><div class='add'>+	u32 presc;</div><div class='ctx'> </div><div class='ctx'> 	if (ctrl-&gt;busy)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -372,17 +463,60 @@ static int stm32_qspi_setup(struct spi_device *spi)</div><div class='ctx'> 	flash-&gt;presc = presc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;qspi-&gt;lock);</div><div class='del'>-	writel_relaxed(LPTR_DFT_TIMEOUT, qspi-&gt;io_base + QSPI_LPTR);</div><div class='del'>-	cr = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_TCEN | CR_SSHIFT | CR_EN;</div><div class='del'>-	writel_relaxed(cr, qspi-&gt;io_base + QSPI_CR);</div><div class='add'>+	qspi-&gt;cr_reg = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_SSHIFT | CR_EN;</div><div class='add'>+	writel_relaxed(qspi-&gt;cr_reg, qspi-&gt;io_base + QSPI_CR);</div><div class='ctx'> </div><div class='ctx'> 	/* set dcr fsize to max address */</div><div class='del'>-	writel_relaxed(DCR_FSIZE_MASK, qspi-&gt;io_base + QSPI_DCR);</div><div class='add'>+	qspi-&gt;dcr_reg = DCR_FSIZE_MASK;</div><div class='add'>+	writel_relaxed(qspi-&gt;dcr_reg, qspi-&gt;io_base + QSPI_DCR);</div><div class='ctx'> 	mutex_unlock(&amp;qspi-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void stm32_qspi_dma_setup(struct stm32_qspi *qspi)</div><div class='add'>+{</div><div class='add'>+	struct dma_slave_config dma_cfg;</div><div class='add'>+	struct device *dev = qspi-&gt;dev;</div><div class='add'>+</div><div class='add'>+	memset(&amp;dma_cfg, 0, sizeof(dma_cfg));</div><div class='add'>+</div><div class='add'>+	dma_cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;</div><div class='add'>+	dma_cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;</div><div class='add'>+	dma_cfg.src_addr = qspi-&gt;phys_base + QSPI_DR;</div><div class='add'>+	dma_cfg.dst_addr = qspi-&gt;phys_base + QSPI_DR;</div><div class='add'>+	dma_cfg.src_maxburst = 4;</div><div class='add'>+	dma_cfg.dst_maxburst = 4;</div><div class='add'>+</div><div class='add'>+	qspi-&gt;dma_chrx = dma_request_slave_channel(dev, "rx");</div><div class='add'>+	if (qspi-&gt;dma_chrx) {</div><div class='add'>+		if (dmaengine_slave_config(qspi-&gt;dma_chrx, &amp;dma_cfg)) {</div><div class='add'>+			dev_err(dev, "dma rx config failed\n");</div><div class='add'>+			dma_release_channel(qspi-&gt;dma_chrx);</div><div class='add'>+			qspi-&gt;dma_chrx = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qspi-&gt;dma_chtx = dma_request_slave_channel(dev, "tx");</div><div class='add'>+	if (qspi-&gt;dma_chtx) {</div><div class='add'>+		if (dmaengine_slave_config(qspi-&gt;dma_chtx, &amp;dma_cfg)) {</div><div class='add'>+			dev_err(dev, "dma tx config failed\n");</div><div class='add'>+			dma_release_channel(qspi-&gt;dma_chtx);</div><div class='add'>+			qspi-&gt;dma_chtx = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;qspi-&gt;dma_completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stm32_qspi_dma_free(struct stm32_qspi *qspi)</div><div class='add'>+{</div><div class='add'>+	if (qspi-&gt;dma_chtx)</div><div class='add'>+		dma_release_channel(qspi-&gt;dma_chtx);</div><div class='add'>+	if (qspi-&gt;dma_chrx)</div><div class='add'>+		dma_release_channel(qspi-&gt;dma_chrx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * no special host constraint, so use default spi_mem_default_supports_op</div><div class='ctx'>  * to check supported mode.</div><div class='hunk'>@@ -395,8 +529,10 @@ static void stm32_qspi_release(struct stm32_qspi *qspi)</div><div class='ctx'> {</div><div class='ctx'> 	/* disable qspi */</div><div class='ctx'> 	writel_relaxed(0, qspi-&gt;io_base + QSPI_CR);</div><div class='add'>+	stm32_qspi_dma_free(qspi);</div><div class='ctx'> 	mutex_destroy(&amp;qspi-&gt;lock);</div><div class='ctx'> 	clk_disable_unprepare(qspi-&gt;clk);</div><div class='add'>+	spi_master_put(qspi-&gt;ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stm32_qspi_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -413,43 +549,62 @@ static int stm32_qspi_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	qspi = spi_controller_get_devdata(ctrl);</div><div class='add'>+	qspi-&gt;ctrl = ctrl;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi");</div><div class='ctx'> 	qspi-&gt;io_base = devm_ioremap_resource(dev, res);</div><div class='del'>-	if (IS_ERR(qspi-&gt;io_base))</div><div class='del'>-		return PTR_ERR(qspi-&gt;io_base);</div><div class='add'>+	if (IS_ERR(qspi-&gt;io_base)) {</div><div class='add'>+		ret = PTR_ERR(qspi-&gt;io_base);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qspi-&gt;phys_base = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mm");</div><div class='ctx'> 	qspi-&gt;mm_base = devm_ioremap_resource(dev, res);</div><div class='del'>-	if (IS_ERR(qspi-&gt;mm_base))</div><div class='del'>-		return PTR_ERR(qspi-&gt;mm_base);</div><div class='add'>+	if (IS_ERR(qspi-&gt;mm_base)) {</div><div class='add'>+		ret = PTR_ERR(qspi-&gt;mm_base);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	qspi-&gt;mm_size = resource_size(res);</div><div class='del'>-	if (qspi-&gt;mm_size &gt; STM32_QSPI_MAX_MMAP_SZ)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (qspi-&gt;mm_size &gt; STM32_QSPI_MAX_MMAP_SZ) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		if (irq != -EPROBE_DEFER)</div><div class='add'>+			dev_err(dev, "IRQ error missing or invalid\n");</div><div class='add'>+		return irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0,</div><div class='ctx'> 			       dev_name(dev), qspi);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "failed to request irq\n");</div><div class='del'>-		return ret;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;qspi-&gt;data_completion);</div><div class='ctx'> </div><div class='ctx'> 	qspi-&gt;clk = devm_clk_get(dev, NULL);</div><div class='del'>-	if (IS_ERR(qspi-&gt;clk))</div><div class='del'>-		return PTR_ERR(qspi-&gt;clk);</div><div class='add'>+	if (IS_ERR(qspi-&gt;clk)) {</div><div class='add'>+		ret = PTR_ERR(qspi-&gt;clk);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	qspi-&gt;clk_rate = clk_get_rate(qspi-&gt;clk);</div><div class='del'>-	if (!qspi-&gt;clk_rate)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!qspi-&gt;clk_rate) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = clk_prepare_enable(qspi-&gt;clk);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "can not enable the clock\n");</div><div class='del'>-		return ret;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rstc = devm_reset_control_get_exclusive(dev, NULL);</div><div class='hunk'>@@ -461,6 +616,7 @@ static int stm32_qspi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	qspi-&gt;dev = dev;</div><div class='ctx'> 	platform_set_drvdata(pdev, qspi);</div><div class='add'>+	stm32_qspi_dma_setup(qspi);</div><div class='ctx'> 	mutex_init(&amp;qspi-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ctrl-&gt;mode_bits = SPI_RX_DUAL | SPI_RX_QUAD</div><div class='hunk'>@@ -472,14 +628,11 @@ static int stm32_qspi_probe(struct platform_device *pdev)</div><div class='ctx'> 	ctrl-&gt;dev.of_node = dev-&gt;of_node;</div><div class='ctx'> </div><div class='ctx'> 	ret = devm_spi_register_master(dev, ctrl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_spi_register;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-err_spi_register:</div><div class='add'>+err:</div><div class='ctx'> 	stm32_qspi_release(qspi);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -491,6 +644,31 @@ static int stm32_qspi_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __maybe_unused stm32_qspi_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_qspi *qspi = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(qspi-&gt;clk);</div><div class='add'>+	pinctrl_pm_select_sleep_state(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 __maybe_unused stm32_qspi_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stm32_qspi *qspi = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	pinctrl_pm_select_default_state(dev);</div><div class='add'>+	clk_prepare_enable(qspi-&gt;clk);</div><div class='add'>+</div><div class='add'>+	writel_relaxed(qspi-&gt;cr_reg, qspi-&gt;io_base + QSPI_CR);</div><div class='add'>+	writel_relaxed(qspi-&gt;dcr_reg, qspi-&gt;io_base + QSPI_DCR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(stm32_qspi_pm_ops, stm32_qspi_suspend, stm32_qspi_resume);</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id stm32_qspi_match[] = {</div><div class='ctx'> 	{.compatible = "st,stm32f469-qspi"},</div><div class='ctx'> 	{}</div><div class='hunk'>@@ -503,6 +681,7 @@ static struct platform_driver stm32_qspi_driver = {</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name = "stm32-qspi",</div><div class='ctx'> 		.of_match_table = stm32_qspi_match,</div><div class='add'>+		.pm = &amp;stm32_qspi_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> module_platform_driver(stm32_qspi_driver);</div><div class='head'>diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c<br/>index 4186ed20d796..b222ce8d083e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-stm32.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-stm32.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-stm32.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-stm32.c</a></div><div class='hunk'>@@ -1839,8 +1839,9 @@ static int stm32_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spi-&gt;irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (spi-&gt;irq &lt;= 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no irq: %d\n", spi-&gt;irq);</div><div class='del'>-		ret = -ENOENT;</div><div class='add'>+		ret = spi-&gt;irq;</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "failed to get irq: %d\n", ret);</div><div class='ctx'> 		goto err_master_put;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = devm_request_threaded_irq(&amp;pdev-&gt;dev, spi-&gt;irq,</div><div class='head'>diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c<br/>index a76acedd7e2f..b1f31bb16659 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-tegra114.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-tegra114.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-tegra114.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-tegra114.c</a></div><div class='hunk'>@@ -149,6 +149,8 @@</div><div class='ctx'> </div><div class='ctx'> #define SPI_TX_FIFO				0x108</div><div class='ctx'> #define SPI_RX_FIFO				0x188</div><div class='add'>+#define SPI_INTR_MASK				0x18c</div><div class='add'>+#define SPI_INTR_ALL_MASK			(0x1fUL &lt;&lt; 25)</div><div class='ctx'> #define MAX_CHIP_SELECT				4</div><div class='ctx'> #define SPI_FIFO_DEPTH				64</div><div class='ctx'> #define DATA_DIR_TX				(1 &lt;&lt; 0)</div><div class='hunk'>@@ -161,6 +163,10 @@</div><div class='ctx'> #define MAX_HOLD_CYCLES				16</div><div class='ctx'> #define SPI_DEFAULT_SPEED			25000000</div><div class='ctx'> </div><div class='add'>+struct tegra_spi_soc_data {</div><div class='add'>+	bool has_intr_mask_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct tegra_spi_data {</div><div class='ctx'> 	struct device				*dev;</div><div class='ctx'> 	struct spi_master			*master;</div><div class='hunk'>@@ -211,6 +217,7 @@ struct tegra_spi_data {</div><div class='ctx'> 	u32					*tx_dma_buf;</div><div class='ctx'> 	dma_addr_t				tx_dma_phys;</div><div class='ctx'> 	struct dma_async_tx_descriptor		*tx_dma_desc;</div><div class='add'>+	const struct tegra_spi_soc_data		*soc_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int tegra_spi_runtime_suspend(struct device *dev);</div><div class='hunk'>@@ -259,7 +266,8 @@ static unsigned tegra_spi_calculate_curr_xfer_param(</div><div class='ctx'> </div><div class='ctx'> 	tspi-&gt;bytes_per_word = DIV_ROUND_UP(bits_per_word, 8);</div><div class='ctx'> </div><div class='del'>-	if (bits_per_word == 8 || bits_per_word == 16) {</div><div class='add'>+	if ((bits_per_word == 8 || bits_per_word == 16 ||</div><div class='add'>+	     bits_per_word == 32) &amp;&amp; t-&gt;len &gt; 3) {</div><div class='ctx'> 		tspi-&gt;is_packed = 1;</div><div class='ctx'> 		tspi-&gt;words_per_32bit = 32/bits_per_word;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -307,10 +315,16 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf(</div><div class='ctx'> 				x |= (u32)(*tx_buf++) &lt;&lt; (i * 8);</div><div class='ctx'> 			tegra_spi_writel(tspi, x, SPI_TX_FIFO);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		tspi-&gt;cur_tx_pos += written_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> 	} else {</div><div class='add'>+		unsigned int write_bytes;</div><div class='ctx'> 		max_n_32bit = min(tspi-&gt;curr_dma_words,  tx_empty_count);</div><div class='ctx'> 		written_words = max_n_32bit;</div><div class='ctx'> 		nbytes = written_words * tspi-&gt;bytes_per_word;</div><div class='add'>+		if (nbytes &gt; t-&gt;len - tspi-&gt;cur_pos)</div><div class='add'>+			nbytes = t-&gt;len - tspi-&gt;cur_pos;</div><div class='add'>+		write_bytes = nbytes;</div><div class='ctx'> 		for (count = 0; count &lt; max_n_32bit; count++) {</div><div class='ctx'> 			u32 x = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -319,8 +333,10 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf(</div><div class='ctx'> 				x |= (u32)(*tx_buf++) &lt;&lt; (i * 8);</div><div class='ctx'> 			tegra_spi_writel(tspi, x, SPI_TX_FIFO);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		tspi-&gt;cur_tx_pos += write_bytes;</div><div class='ctx'> 	}</div><div class='del'>-	tspi-&gt;cur_tx_pos += written_words * tspi-&gt;bytes_per_word;</div><div class='add'>+</div><div class='ctx'> 	return written_words;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -344,20 +360,27 @@ static unsigned int tegra_spi_read_rx_fifo_to_client_rxbuf(</div><div class='ctx'> 			for (i = 0; len &amp;&amp; (i &lt; 4); i++, len--)</div><div class='ctx'> 				*rx_buf++ = (x &gt;&gt; i*8) &amp; 0xFF;</div><div class='ctx'> 		}</div><div class='del'>-		tspi-&gt;cur_rx_pos += tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> 		read_words += tspi-&gt;curr_dma_words;</div><div class='add'>+		tspi-&gt;cur_rx_pos += tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 rx_mask = ((u32)1 &lt;&lt; t-&gt;bits_per_word) - 1;</div><div class='add'>+		u8 bytes_per_word = tspi-&gt;bytes_per_word;</div><div class='add'>+		unsigned int read_bytes;</div><div class='ctx'> </div><div class='add'>+		len = rx_full_count * bytes_per_word;</div><div class='add'>+		if (len &gt; t-&gt;len - tspi-&gt;cur_pos)</div><div class='add'>+			len = t-&gt;len - tspi-&gt;cur_pos;</div><div class='add'>+		read_bytes = len;</div><div class='ctx'> 		for (count = 0; count &lt; rx_full_count; count++) {</div><div class='ctx'> 			u32 x = tegra_spi_readl(tspi, SPI_RX_FIFO) &amp; rx_mask;</div><div class='ctx'> </div><div class='del'>-			for (i = 0; (i &lt; tspi-&gt;bytes_per_word); i++)</div><div class='add'>+			for (i = 0; len &amp;&amp; (i &lt; bytes_per_word); i++, len--)</div><div class='ctx'> 				*rx_buf++ = (x &gt;&gt; (i*8)) &amp; 0xFF;</div><div class='ctx'> 		}</div><div class='del'>-		tspi-&gt;cur_rx_pos += rx_full_count * tspi-&gt;bytes_per_word;</div><div class='ctx'> 		read_words += rx_full_count;</div><div class='add'>+		tspi-&gt;cur_rx_pos += read_bytes;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return read_words;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,12 +395,17 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf(</div><div class='ctx'> 		unsigned len = tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(tspi-&gt;tx_dma_buf, t-&gt;tx_buf + tspi-&gt;cur_pos, len);</div><div class='add'>+		tspi-&gt;cur_tx_pos += tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> 		unsigned int count;</div><div class='ctx'> 		u8 *tx_buf = (u8 *)t-&gt;tx_buf + tspi-&gt;cur_tx_pos;</div><div class='ctx'> 		unsigned consume = tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='add'>+		unsigned int write_bytes;</div><div class='ctx'> </div><div class='add'>+		if (consume &gt; t-&gt;len - tspi-&gt;cur_pos)</div><div class='add'>+			consume = t-&gt;len - tspi-&gt;cur_pos;</div><div class='add'>+		write_bytes = consume;</div><div class='ctx'> 		for (count = 0; count &lt; tspi-&gt;curr_dma_words; count++) {</div><div class='ctx'> 			u32 x = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -386,8 +414,9 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf(</div><div class='ctx'> 				x |= (u32)(*tx_buf++) &lt;&lt; (i * 8);</div><div class='ctx'> 			tspi-&gt;tx_dma_buf[count] = x;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		tspi-&gt;cur_tx_pos += write_bytes;</div><div class='ctx'> 	}</div><div class='del'>-	tspi-&gt;cur_tx_pos += tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> </div><div class='ctx'> 	/* Make the dma buffer to read by dma */</div><div class='ctx'> 	dma_sync_single_for_device(tspi-&gt;dev, tspi-&gt;tx_dma_phys,</div><div class='hunk'>@@ -405,20 +434,28 @@ static void tegra_spi_copy_spi_rxbuf_to_client_rxbuf(</div><div class='ctx'> 		unsigned len = tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(t-&gt;rx_buf + tspi-&gt;cur_rx_pos, tspi-&gt;rx_dma_buf, len);</div><div class='add'>+		tspi-&gt;cur_rx_pos += tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> 		unsigned int count;</div><div class='ctx'> 		unsigned char *rx_buf = t-&gt;rx_buf + tspi-&gt;cur_rx_pos;</div><div class='ctx'> 		u32 rx_mask = ((u32)1 &lt;&lt; t-&gt;bits_per_word) - 1;</div><div class='add'>+		unsigned consume = tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='add'>+		unsigned int read_bytes;</div><div class='ctx'> </div><div class='add'>+		if (consume &gt; t-&gt;len - tspi-&gt;cur_pos)</div><div class='add'>+			consume = t-&gt;len - tspi-&gt;cur_pos;</div><div class='add'>+		read_bytes = consume;</div><div class='ctx'> 		for (count = 0; count &lt; tspi-&gt;curr_dma_words; count++) {</div><div class='ctx'> 			u32 x = tspi-&gt;rx_dma_buf[count] &amp; rx_mask;</div><div class='ctx'> </div><div class='del'>-			for (i = 0; (i &lt; tspi-&gt;bytes_per_word); i++)</div><div class='add'>+			for (i = 0; consume &amp;&amp; (i &lt; tspi-&gt;bytes_per_word);</div><div class='add'>+							i++, consume--)</div><div class='ctx'> 				*rx_buf++ = (x &gt;&gt; (i*8)) &amp; 0xFF;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		tspi-&gt;cur_rx_pos += read_bytes;</div><div class='ctx'> 	}</div><div class='del'>-	tspi-&gt;cur_rx_pos += tspi-&gt;curr_dma_words * tspi-&gt;bytes_per_word;</div><div class='ctx'> </div><div class='ctx'> 	/* Make the dma buffer to read by dma */</div><div class='ctx'> 	dma_sync_single_for_device(tspi-&gt;dev, tspi-&gt;rx_dma_phys,</div><div class='hunk'>@@ -470,22 +507,39 @@ static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_spi_start_dma_based_transfer(</div><div class='del'>-		struct tegra_spi_data *tspi, struct spi_transfer *t)</div><div class='add'>+static int tegra_spi_flush_fifos(struct tegra_spi_data *tspi)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	unsigned long timeout = jiffies + HZ;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='del'>-	/* Make sure that Rx and Tx fifo are empty */</div><div class='ctx'> 	status = tegra_spi_readl(tspi, SPI_FIFO_STATUS);</div><div class='ctx'> 	if ((status &amp; SPI_FIFO_EMPTY) != SPI_FIFO_EMPTY) {</div><div class='del'>-		dev_err(tspi-&gt;dev, "Rx/Tx fifo are not empty status 0x%08x\n",</div><div class='del'>-			(unsigned)status);</div><div class='del'>-		return -EIO;</div><div class='add'>+		status |= SPI_RX_FIFO_FLUSH | SPI_TX_FIFO_FLUSH;</div><div class='add'>+		tegra_spi_writel(tspi, status, SPI_FIFO_STATUS);</div><div class='add'>+		while ((status &amp; SPI_FIFO_EMPTY) != SPI_FIFO_EMPTY) {</div><div class='add'>+			status = tegra_spi_readl(tspi, SPI_FIFO_STATUS);</div><div class='add'>+			if (time_after(jiffies, timeout)) {</div><div class='add'>+				dev_err(tspi-&gt;dev,</div><div class='add'>+					"timeout waiting for fifo flush\n");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			udelay(1);</div><div class='add'>+		}</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 int tegra_spi_start_dma_based_transfer(</div><div class='add'>+		struct tegra_spi_data *tspi, struct spi_transfer *t)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 dma_burst;</div><div class='add'>+	struct dma_slave_config dma_sconfig = {0};</div><div class='add'>+</div><div class='ctx'> 	val = SPI_DMA_BLK_SET(tspi-&gt;curr_dma_words - 1);</div><div class='ctx'> 	tegra_spi_writel(tspi, val, SPI_DMA_BLK);</div><div class='ctx'> </div><div class='hunk'>@@ -496,23 +550,40 @@ static int tegra_spi_start_dma_based_transfer(</div><div class='ctx'> 		len = tspi-&gt;curr_dma_words * 4;</div><div class='ctx'> </div><div class='ctx'> 	/* Set attention level based on length of transfer */</div><div class='del'>-	if (len &amp; 0xF)</div><div class='add'>+	if (len &amp; 0xF) {</div><div class='ctx'> 		val |= SPI_TX_TRIG_1 | SPI_RX_TRIG_1;</div><div class='del'>-	else if (((len) &gt;&gt; 4) &amp; 0x1)</div><div class='add'>+		dma_burst = 1;</div><div class='add'>+	} else if (((len) &gt;&gt; 4) &amp; 0x1) {</div><div class='ctx'> 		val |= SPI_TX_TRIG_4 | SPI_RX_TRIG_4;</div><div class='del'>-	else</div><div class='add'>+		dma_burst = 4;</div><div class='add'>+	} else {</div><div class='ctx'> 		val |= SPI_TX_TRIG_8 | SPI_RX_TRIG_8;</div><div class='add'>+		dma_burst = 8;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (tspi-&gt;cur_direction &amp; DATA_DIR_TX)</div><div class='del'>-		val |= SPI_IE_TX;</div><div class='add'>+	if (!tspi-&gt;soc_data-&gt;has_intr_mask_reg) {</div><div class='add'>+		if (tspi-&gt;cur_direction &amp; DATA_DIR_TX)</div><div class='add'>+			val |= SPI_IE_TX;</div><div class='ctx'> </div><div class='del'>-	if (tspi-&gt;cur_direction &amp; DATA_DIR_RX)</div><div class='del'>-		val |= SPI_IE_RX;</div><div class='add'>+		if (tspi-&gt;cur_direction &amp; DATA_DIR_RX)</div><div class='add'>+			val |= SPI_IE_RX;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tegra_spi_writel(tspi, val, SPI_DMA_CTL);</div><div class='ctx'> 	tspi-&gt;dma_control_reg = val;</div><div class='ctx'> </div><div class='add'>+	dma_sconfig.device_fc = true;</div><div class='ctx'> 	if (tspi-&gt;cur_direction &amp; DATA_DIR_TX) {</div><div class='add'>+		dma_sconfig.dst_addr = tspi-&gt;phys + SPI_TX_FIFO;</div><div class='add'>+		dma_sconfig.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='add'>+		dma_sconfig.dst_maxburst = dma_burst;</div><div class='add'>+		ret = dmaengine_slave_config(tspi-&gt;tx_dma_chan, &amp;dma_sconfig);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(tspi-&gt;dev,</div><div class='add'>+				"DMA slave config failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		tegra_spi_copy_client_txbuf_to_spi_txbuf(tspi, t);</div><div class='ctx'> 		ret = tegra_spi_start_tx_dma(tspi, len);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='hunk'>@@ -523,6 +594,16 @@ static int tegra_spi_start_dma_based_transfer(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tspi-&gt;cur_direction &amp; DATA_DIR_RX) {</div><div class='add'>+		dma_sconfig.src_addr = tspi-&gt;phys + SPI_RX_FIFO;</div><div class='add'>+		dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='add'>+		dma_sconfig.src_maxburst = dma_burst;</div><div class='add'>+		ret = dmaengine_slave_config(tspi-&gt;rx_dma_chan, &amp;dma_sconfig);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(tspi-&gt;dev,</div><div class='add'>+				"DMA slave config failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Make the dma buffer to read by dma */</div><div class='ctx'> 		dma_sync_single_for_device(tspi-&gt;dev, tspi-&gt;rx_dma_phys,</div><div class='ctx'> 				tspi-&gt;dma_buf_size, DMA_FROM_DEVICE);</div><div class='hunk'>@@ -570,8 +651,9 @@ static int tegra_spi_start_cpu_based_transfer(</div><div class='ctx'> </div><div class='ctx'> 	tspi-&gt;is_curr_dma_xfer = false;</div><div class='ctx'> </div><div class='del'>-	val |= SPI_DMA_EN;</div><div class='del'>-	tegra_spi_writel(tspi, val, SPI_DMA_CTL);</div><div class='add'>+	val = tspi-&gt;command1_reg;</div><div class='add'>+	val |= SPI_PIO;</div><div class='add'>+	tegra_spi_writel(tspi, val, SPI_COMMAND1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -582,7 +664,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,</div><div class='ctx'> 	u32 *dma_buf;</div><div class='ctx'> 	dma_addr_t dma_phys;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct dma_slave_config dma_sconfig;</div><div class='ctx'> </div><div class='ctx'> 	dma_chan = dma_request_slave_channel_reason(tspi-&gt;dev,</div><div class='ctx'> 					dma_to_memory ? "rx" : "tx");</div><div class='hunk'>@@ -603,19 +684,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dma_to_memory) {</div><div class='del'>-		dma_sconfig.src_addr = tspi-&gt;phys + SPI_RX_FIFO;</div><div class='del'>-		dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='del'>-		dma_sconfig.src_maxburst = 0;</div><div class='del'>-	} else {</div><div class='del'>-		dma_sconfig.dst_addr = tspi-&gt;phys + SPI_TX_FIFO;</div><div class='del'>-		dma_sconfig.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='del'>-		dma_sconfig.dst_maxburst = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = dmaengine_slave_config(dma_chan, &amp;dma_sconfig);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto scrub;</div><div class='del'>-	if (dma_to_memory) {</div><div class='ctx'> 		tspi-&gt;rx_dma_chan = dma_chan;</div><div class='ctx'> 		tspi-&gt;rx_dma_buf = dma_buf;</div><div class='ctx'> 		tspi-&gt;rx_dma_phys = dma_phys;</div><div class='hunk'>@@ -625,11 +693,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,</div><div class='ctx'> 		tspi-&gt;tx_dma_phys = dma_phys;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-scrub:</div><div class='del'>-	dma_free_coherent(tspi-&gt;dev, tspi-&gt;dma_buf_size, dma_buf, dma_phys);</div><div class='del'>-	dma_release_channel(dma_chan);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tegra_spi_deinit_dma_param(struct tegra_spi_data *tspi,</div><div class='hunk'>@@ -696,6 +759,16 @@ static u32 tegra_spi_setup_transfer_one(struct spi_device *spi,</div><div class='ctx'> 		else if (req_mode == SPI_MODE_3)</div><div class='ctx'> 			command1 |= SPI_CONTROL_MODE_3;</div><div class='ctx'> </div><div class='add'>+		if (spi-&gt;mode &amp; SPI_LSB_FIRST)</div><div class='add'>+			command1 |= SPI_LSBIT_FE;</div><div class='add'>+		else</div><div class='add'>+			command1 &amp;= ~SPI_LSBIT_FE;</div><div class='add'>+</div><div class='add'>+		if (spi-&gt;mode &amp; SPI_3WIRE)</div><div class='add'>+			command1 |= SPI_BIDIROE;</div><div class='add'>+		else</div><div class='add'>+			command1 &amp;= ~SPI_BIDIROE;</div><div class='add'>+</div><div class='ctx'> 		if (tspi-&gt;cs_control) {</div><div class='ctx'> 			if (tspi-&gt;cs_control != spi)</div><div class='ctx'> 				tegra_spi_writel(tspi, command1, SPI_COMMAND1);</div><div class='hunk'>@@ -728,8 +801,15 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,</div><div class='ctx'> </div><div class='ctx'> 	total_fifo_words = tegra_spi_calculate_curr_xfer_param(spi, tspi, t);</div><div class='ctx'> </div><div class='add'>+	if (t-&gt;rx_nbits == SPI_NBITS_DUAL || t-&gt;tx_nbits == SPI_NBITS_DUAL)</div><div class='add'>+		command1 |= SPI_BOTH_EN_BIT;</div><div class='add'>+	else</div><div class='add'>+		command1 &amp;= ~SPI_BOTH_EN_BIT;</div><div class='add'>+</div><div class='ctx'> 	if (tspi-&gt;is_packed)</div><div class='ctx'> 		command1 |= SPI_PACKED;</div><div class='add'>+	else</div><div class='add'>+		command1 &amp;= ~SPI_PACKED;</div><div class='ctx'> </div><div class='ctx'> 	command1 &amp;= ~(SPI_CS_SEL_MASK | SPI_TX_EN | SPI_RX_EN);</div><div class='ctx'> 	tspi-&gt;cur_direction = 0;</div><div class='hunk'>@@ -748,6 +828,9 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,</div><div class='ctx'> 	dev_dbg(tspi-&gt;dev, "The def 0x%x and written 0x%x\n",</div><div class='ctx'> 		tspi-&gt;def_command1_reg, (unsigned)command1);</div><div class='ctx'> </div><div class='add'>+	ret = tegra_spi_flush_fifos(tspi);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (total_fifo_words &gt; SPI_FIFO_DEPTH)</div><div class='ctx'> 		ret = tegra_spi_start_dma_based_transfer(tspi, t);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -774,6 +857,12 @@ static int tegra_spi_setup(struct spi_device *spi)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (tspi-&gt;soc_data-&gt;has_intr_mask_reg) {</div><div class='add'>+		val = tegra_spi_readl(tspi, SPI_INTR_MASK);</div><div class='add'>+		val &amp;= ~SPI_INTR_ALL_MASK;</div><div class='add'>+		tegra_spi_writel(tspi, val, SPI_INTR_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;tspi-&gt;lock, flags);</div><div class='ctx'> 	val = tspi-&gt;def_command1_reg;</div><div class='ctx'> 	if (spi-&gt;mode &amp; SPI_CS_HIGH)</div><div class='hunk'>@@ -799,6 +888,33 @@ static void tegra_spi_transfer_delay(int delay)</div><div class='ctx'> 	udelay(delay % 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tegra_spi_transfer_end(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tegra_spi_data *tspi = spi_master_get_devdata(spi-&gt;master);</div><div class='add'>+	int cs_val = (spi-&gt;mode &amp; SPI_CS_HIGH) ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	if (cs_val)</div><div class='add'>+		tspi-&gt;command1_reg |= SPI_CS_SW_VAL;</div><div class='add'>+	else</div><div class='add'>+		tspi-&gt;command1_reg &amp;= ~SPI_CS_SW_VAL;</div><div class='add'>+	tegra_spi_writel(tspi, tspi-&gt;command1_reg, SPI_COMMAND1);</div><div class='add'>+	tegra_spi_writel(tspi, tspi-&gt;def_command1_reg, SPI_COMMAND1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_spi_dump_regs(struct tegra_spi_data *tspi)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(tspi-&gt;dev, "============ SPI REGISTER DUMP ============\n");</div><div class='add'>+	dev_dbg(tspi-&gt;dev, "Command1:    0x%08x | Command2:    0x%08x\n",</div><div class='add'>+		tegra_spi_readl(tspi, SPI_COMMAND1),</div><div class='add'>+		tegra_spi_readl(tspi, SPI_COMMAND2));</div><div class='add'>+	dev_dbg(tspi-&gt;dev, "DMA_CTL:     0x%08x | DMA_BLK:     0x%08x\n",</div><div class='add'>+		tegra_spi_readl(tspi, SPI_DMA_CTL),</div><div class='add'>+		tegra_spi_readl(tspi, SPI_DMA_BLK));</div><div class='add'>+	dev_dbg(tspi-&gt;dev, "TRANS_STAT:  0x%08x | FIFO_STATUS: 0x%08x\n",</div><div class='add'>+		tegra_spi_readl(tspi, SPI_TRANS_STATUS),</div><div class='add'>+		tegra_spi_readl(tspi, SPI_FIFO_STATUS));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tegra_spi_transfer_one_message(struct spi_master *master,</div><div class='ctx'> 			struct spi_message *msg)</div><div class='ctx'> {</div><div class='hunk'>@@ -838,21 +954,32 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,</div><div class='ctx'> 		if (WARN_ON(ret == 0)) {</div><div class='ctx'> 			dev_err(tspi-&gt;dev,</div><div class='ctx'> 				"spi transfer timeout, err %d\n", ret);</div><div class='add'>+			if (tspi-&gt;is_curr_dma_xfer &amp;&amp;</div><div class='add'>+			    (tspi-&gt;cur_direction &amp; DATA_DIR_TX))</div><div class='add'>+				dmaengine_terminate_all(tspi-&gt;tx_dma_chan);</div><div class='add'>+			if (tspi-&gt;is_curr_dma_xfer &amp;&amp;</div><div class='add'>+			    (tspi-&gt;cur_direction &amp; DATA_DIR_RX))</div><div class='add'>+				dmaengine_terminate_all(tspi-&gt;rx_dma_chan);</div><div class='ctx'> 			ret = -EIO;</div><div class='add'>+			tegra_spi_dump_regs(tspi);</div><div class='add'>+			tegra_spi_flush_fifos(tspi);</div><div class='add'>+			reset_control_assert(tspi-&gt;rst);</div><div class='add'>+			udelay(2);</div><div class='add'>+			reset_control_deassert(tspi-&gt;rst);</div><div class='ctx'> 			goto complete_xfer;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tspi-&gt;tx_status ||  tspi-&gt;rx_status) {</div><div class='ctx'> 			dev_err(tspi-&gt;dev, "Error in Transfer\n");</div><div class='ctx'> 			ret = -EIO;</div><div class='add'>+			tegra_spi_dump_regs(tspi);</div><div class='ctx'> 			goto complete_xfer;</div><div class='ctx'> 		}</div><div class='ctx'> 		msg-&gt;actual_length += xfer-&gt;len;</div><div class='ctx'> </div><div class='ctx'> complete_xfer:</div><div class='ctx'> 		if (ret &lt; 0 || skip) {</div><div class='del'>-			tegra_spi_writel(tspi, tspi-&gt;def_command1_reg,</div><div class='del'>-					SPI_COMMAND1);</div><div class='add'>+			tegra_spi_transfer_end(spi);</div><div class='ctx'> 			tegra_spi_transfer_delay(xfer-&gt;delay_usecs);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		} else if (list_is_last(&amp;xfer-&gt;transfer_list,</div><div class='hunk'>@@ -860,13 +987,11 @@ complete_xfer:</div><div class='ctx'> 			if (xfer-&gt;cs_change)</div><div class='ctx'> 				tspi-&gt;cs_control = spi;</div><div class='ctx'> 			else {</div><div class='del'>-				tegra_spi_writel(tspi, tspi-&gt;def_command1_reg,</div><div class='del'>-						SPI_COMMAND1);</div><div class='add'>+				tegra_spi_transfer_end(spi);</div><div class='ctx'> 				tegra_spi_transfer_delay(xfer-&gt;delay_usecs);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (xfer-&gt;cs_change) {</div><div class='del'>-			tegra_spi_writel(tspi, tspi-&gt;def_command1_reg,</div><div class='del'>-					SPI_COMMAND1);</div><div class='add'>+			tegra_spi_transfer_end(spi);</div><div class='ctx'> 			tegra_spi_transfer_delay(xfer-&gt;delay_usecs);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -889,11 +1014,14 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi)</div><div class='ctx'> 			tspi-&gt;status_reg);</div><div class='ctx'> 		dev_err(tspi-&gt;dev, "CpuXfer 0x%08x:0x%08x\n",</div><div class='ctx'> 			tspi-&gt;command1_reg, tspi-&gt;dma_control_reg);</div><div class='add'>+		tegra_spi_dump_regs(tspi);</div><div class='add'>+		tegra_spi_flush_fifos(tspi);</div><div class='add'>+		complete(&amp;tspi-&gt;xfer_completion);</div><div class='add'>+		spin_unlock_irqrestore(&amp;tspi-&gt;lock, flags);</div><div class='ctx'> 		reset_control_assert(tspi-&gt;rst);</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 		reset_control_deassert(tspi-&gt;rst);</div><div class='del'>-		complete(&amp;tspi-&gt;xfer_completion);</div><div class='del'>-		goto exit;</div><div class='add'>+		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tspi-&gt;cur_direction &amp; DATA_DIR_RX)</div><div class='hunk'>@@ -961,11 +1089,13 @@ static irqreturn_t handle_dma_based_xfer(struct tegra_spi_data *tspi)</div><div class='ctx'> 			tspi-&gt;status_reg);</div><div class='ctx'> 		dev_err(tspi-&gt;dev, "DmaXfer 0x%08x:0x%08x\n",</div><div class='ctx'> 			tspi-&gt;command1_reg, tspi-&gt;dma_control_reg);</div><div class='add'>+		tegra_spi_dump_regs(tspi);</div><div class='add'>+		tegra_spi_flush_fifos(tspi);</div><div class='add'>+		complete(&amp;tspi-&gt;xfer_completion);</div><div class='add'>+		spin_unlock_irqrestore(&amp;tspi-&gt;lock, flags);</div><div class='ctx'> 		reset_control_assert(tspi-&gt;rst);</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 		reset_control_deassert(tspi-&gt;rst);</div><div class='del'>-		complete(&amp;tspi-&gt;xfer_completion);</div><div class='del'>-		spin_unlock_irqrestore(&amp;tspi-&gt;lock, flags);</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1021,8 +1151,29 @@ static irqreturn_t tegra_spi_isr(int irq, void *context_data)</div><div class='ctx'> 	return IRQ_WAKE_THREAD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct tegra_spi_soc_data tegra114_spi_soc_data = {</div><div class='add'>+	.has_intr_mask_reg = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tegra_spi_soc_data tegra124_spi_soc_data = {</div><div class='add'>+	.has_intr_mask_reg = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tegra_spi_soc_data tegra210_spi_soc_data = {</div><div class='add'>+	.has_intr_mask_reg = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id tegra_spi_of_match[] = {</div><div class='del'>-	{ .compatible = "nvidia,tegra114-spi", },</div><div class='add'>+	{</div><div class='add'>+		.compatible = "nvidia,tegra114-spi",</div><div class='add'>+		.data	    = &amp;tegra114_spi_soc_data,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "nvidia,tegra124-spi",</div><div class='add'>+		.data	    = &amp;tegra124_spi_soc_data,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "nvidia,tegra210-spi",</div><div class='add'>+		.data	    = &amp;tegra210_spi_soc_data,</div><div class='add'>+	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, tegra_spi_of_match);</div><div class='hunk'>@@ -1033,6 +1184,7 @@ static int tegra_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct tegra_spi_data	*tspi;</div><div class='ctx'> 	struct resource		*r;</div><div class='ctx'> 	int ret, spi_irq;</div><div class='add'>+	int bus_num;</div><div class='ctx'> </div><div class='ctx'> 	master = spi_alloc_master(&amp;pdev-&gt;dev, sizeof(*tspi));</div><div class='ctx'> 	if (!master) {</div><div class='hunk'>@@ -1047,16 +1199,28 @@ static int tegra_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 		master-&gt;max_speed_hz = 25000000; /* 25MHz */</div><div class='ctx'> </div><div class='ctx'> 	/* the spi-&gt;mode bits understood by this driver: */</div><div class='del'>-	master-&gt;mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;</div><div class='add'>+	master-&gt;mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST |</div><div class='add'>+			    SPI_TX_DUAL | SPI_RX_DUAL | SPI_3WIRE;</div><div class='add'>+	master-&gt;bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);</div><div class='ctx'> 	master-&gt;setup = tegra_spi_setup;</div><div class='ctx'> 	master-&gt;transfer_one_message = tegra_spi_transfer_one_message;</div><div class='ctx'> 	master-&gt;num_chipselect = MAX_CHIP_SELECT;</div><div class='ctx'> 	master-&gt;auto_runtime_pm = true;</div><div class='add'>+	bus_num = of_alias_get_id(pdev-&gt;dev.of_node, "spi");</div><div class='add'>+	if (bus_num &gt;= 0)</div><div class='add'>+		master-&gt;bus_num = bus_num;</div><div class='ctx'> </div><div class='ctx'> 	tspi-&gt;master = master;</div><div class='ctx'> 	tspi-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	spin_lock_init(&amp;tspi-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	tspi-&gt;soc_data = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!tspi-&gt;soc_data) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "unsupported tegra\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto exit_free_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	tspi-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='ctx'> 	if (IS_ERR(tspi-&gt;base)) {</div><div class='hunk'>@@ -1067,27 +1231,19 @@ static int tegra_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spi_irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	tspi-&gt;irq = spi_irq;</div><div class='del'>-	ret = request_threaded_irq(tspi-&gt;irq, tegra_spi_isr,</div><div class='del'>-			tegra_spi_isr_thread, IRQF_ONESHOT,</div><div class='del'>-			dev_name(&amp;pdev-&gt;dev), tspi);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to register ISR for IRQ %d\n",</div><div class='del'>-					tspi-&gt;irq);</div><div class='del'>-		goto exit_free_master;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tspi-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, "spi");</div><div class='ctx'> 	if (IS_ERR(tspi-&gt;clk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "can not get clock\n");</div><div class='ctx'> 		ret = PTR_ERR(tspi-&gt;clk);</div><div class='del'>-		goto exit_free_irq;</div><div class='add'>+		goto exit_free_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tspi-&gt;rst = devm_reset_control_get_exclusive(&amp;pdev-&gt;dev, "spi");</div><div class='ctx'> 	if (IS_ERR(tspi-&gt;rst)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "can not get reset\n");</div><div class='ctx'> 		ret = PTR_ERR(tspi-&gt;rst);</div><div class='del'>-		goto exit_free_irq;</div><div class='add'>+		goto exit_free_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tspi-&gt;max_buf_size = SPI_FIFO_DEPTH &lt;&lt; 2;</div><div class='hunk'>@@ -1095,7 +1251,7 @@ static int tegra_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ret = tegra_spi_init_dma_param(tspi, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto exit_free_irq;</div><div class='add'>+		goto exit_free_master;</div><div class='ctx'> 	ret = tegra_spi_init_dma_param(tspi, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto exit_rx_dma_free;</div><div class='hunk'>@@ -1117,18 +1273,32 @@ static int tegra_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "pm runtime get failed, e = %d\n", ret);</div><div class='ctx'> 		goto exit_pm_disable;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	reset_control_assert(tspi-&gt;rst);</div><div class='add'>+	udelay(2);</div><div class='add'>+	reset_control_deassert(tspi-&gt;rst);</div><div class='ctx'> 	tspi-&gt;def_command1_reg  = SPI_M_S;</div><div class='ctx'> 	tegra_spi_writel(tspi, tspi-&gt;def_command1_reg, SPI_COMMAND1);</div><div class='ctx'> 	pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='add'>+	ret = request_threaded_irq(tspi-&gt;irq, tegra_spi_isr,</div><div class='add'>+				   tegra_spi_isr_thread, IRQF_ONESHOT,</div><div class='add'>+				   dev_name(&amp;pdev-&gt;dev), tspi);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to register ISR for IRQ %d\n",</div><div class='add'>+			tspi-&gt;irq);</div><div class='add'>+		goto exit_pm_disable;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	master-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='ctx'> 	ret = devm_spi_register_master(&amp;pdev-&gt;dev, master);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "can not register to master err %d\n", ret);</div><div class='del'>-		goto exit_pm_disable;</div><div class='add'>+		goto exit_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='add'>+exit_free_irq:</div><div class='add'>+	free_irq(spi_irq, tspi);</div><div class='ctx'> exit_pm_disable:</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!pm_runtime_status_suspended(&amp;pdev-&gt;dev))</div><div class='hunk'>@@ -1136,8 +1306,6 @@ exit_pm_disable:</div><div class='ctx'> 	tegra_spi_deinit_dma_param(tspi, false);</div><div class='ctx'> exit_rx_dma_free:</div><div class='ctx'> 	tegra_spi_deinit_dma_param(tspi, true);</div><div class='del'>-exit_free_irq:</div><div class='del'>-	free_irq(spi_irq, tspi);</div><div class='ctx'> exit_free_master:</div><div class='ctx'> 	spi_master_put(master);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c<br/>index 1427f343b39a..6d4679126213 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-tegra20-slink.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-tegra20-slink.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-tegra20-slink.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-tegra20-slink.c</a></div><div class='hunk'>@@ -717,9 +717,6 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi,</div><div class='ctx'> 	command2 = tspi-&gt;command2_reg;</div><div class='ctx'> 	command2 &amp;= ~(SLINK_RXEN | SLINK_TXEN);</div><div class='ctx'> </div><div class='del'>-	tegra_slink_writel(tspi, command, SLINK_COMMAND);</div><div class='del'>-	tspi-&gt;command_reg = command;</div><div class='del'>-</div><div class='ctx'> 	tspi-&gt;cur_direction = 0;</div><div class='ctx'> 	if (t-&gt;rx_buf) {</div><div class='ctx'> 		command2 |= SLINK_RXEN;</div><div class='hunk'>@@ -729,9 +726,18 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi,</div><div class='ctx'> 		command2 |= SLINK_TXEN;</div><div class='ctx'> 		tspi-&gt;cur_direction |= DATA_DIR_TX;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Writing to the command2 register bevore the command register prevents</div><div class='add'>+	 * a spike in chip_select line 0. This selects the chip_select line</div><div class='add'>+	 * before changing the chip_select value.</div><div class='add'>+	 */</div><div class='ctx'> 	tegra_slink_writel(tspi, command2, SLINK_COMMAND2);</div><div class='ctx'> 	tspi-&gt;command2_reg = command2;</div><div class='ctx'> </div><div class='add'>+	tegra_slink_writel(tspi, command, SLINK_COMMAND);</div><div class='add'>+	tspi-&gt;command_reg = command;</div><div class='add'>+</div><div class='ctx'> 	if (total_fifo_words &gt; SLINK_FIFO_DEPTH)</div><div class='ctx'> 		ret = tegra_slink_start_dma_based_transfer(tspi, t);</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c<br/>index fba3f180f233..8a5966963834 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-topcliff-pch.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi-topcliff-pch.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-topcliff-pch.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-topcliff-pch.c</a></div><div class='hunk'>@@ -1299,18 +1299,27 @@ static void pch_free_dma_buf(struct pch_spi_board_data *board_dat,</div><div class='ctx'> 				  dma-&gt;rx_buf_virt, dma-&gt;rx_buf_dma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,</div><div class='add'>+static int pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,</div><div class='ctx'> 			      struct pch_spi_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct pch_spi_dma_ctrl *dma;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dma = &amp;data-&gt;dma;</div><div class='add'>+	ret = 0;</div><div class='ctx'> 	/* Get Consistent memory for Tx DMA */</div><div class='ctx'> 	dma-&gt;tx_buf_virt = dma_alloc_coherent(&amp;board_dat-&gt;pdev-&gt;dev,</div><div class='ctx'> 				PCH_BUF_SIZE, &amp;dma-&gt;tx_buf_dma, GFP_KERNEL);</div><div class='add'>+	if (!dma-&gt;tx_buf_virt)</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	/* Get Consistent memory for Rx DMA */</div><div class='ctx'> 	dma-&gt;rx_buf_virt = dma_alloc_coherent(&amp;board_dat-&gt;pdev-&gt;dev,</div><div class='ctx'> 				PCH_BUF_SIZE, &amp;dma-&gt;rx_buf_dma, GFP_KERNEL);</div><div class='add'>+	if (!dma-&gt;rx_buf_virt)</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pch_spi_pd_probe(struct platform_device *plat_dev)</div><div class='hunk'>@@ -1387,7 +1396,9 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev)</div><div class='ctx'> </div><div class='ctx'> 	if (use_dma) {</div><div class='ctx'> 		dev_info(&amp;plat_dev-&gt;dev, "Use DMA for data transfers\n");</div><div class='del'>-		pch_alloc_dma_buf(board_dat, data);</div><div class='add'>+		ret = pch_alloc_dma_buf(board_dat, data);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_spi_register_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = spi_register_master(master);</div><div class='head'>diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c<br/>new file mode 100644<br/>index 000000000000..c6bee67decb5<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi-zynq-qspi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi-zynq-qspi.c</a></div><div class='hunk'>@@ -0,0 +1,761 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2019 Xilinx, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Naga Sureshkumar Relli &lt;nagasure@xilinx.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/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.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/module.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi-mem.h&gt;</div><div class='add'>+</div><div class='add'>+/* Register offset definitions */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_OFFSET		0x00 /* Configuration  Register, RW */</div><div class='add'>+#define ZYNQ_QSPI_STATUS_OFFSET		0x04 /* Interrupt Status Register, RO */</div><div class='add'>+#define ZYNQ_QSPI_IEN_OFFSET		0x08 /* Interrupt Enable Register, WO */</div><div class='add'>+#define ZYNQ_QSPI_IDIS_OFFSET		0x0C /* Interrupt Disable Reg, WO */</div><div class='add'>+#define ZYNQ_QSPI_IMASK_OFFSET		0x10 /* Interrupt Enabled Mask Reg,RO */</div><div class='add'>+#define ZYNQ_QSPI_ENABLE_OFFSET		0x14 /* Enable/Disable Register, RW */</div><div class='add'>+#define ZYNQ_QSPI_DELAY_OFFSET		0x18 /* Delay Register, RW */</div><div class='add'>+#define ZYNQ_QSPI_TXD_00_00_OFFSET	0x1C /* Transmit 4-byte inst, WO */</div><div class='add'>+#define ZYNQ_QSPI_TXD_00_01_OFFSET	0x80 /* Transmit 1-byte inst, WO */</div><div class='add'>+#define ZYNQ_QSPI_TXD_00_10_OFFSET	0x84 /* Transmit 2-byte inst, WO */</div><div class='add'>+#define ZYNQ_QSPI_TXD_00_11_OFFSET	0x88 /* Transmit 3-byte inst, WO */</div><div class='add'>+#define ZYNQ_QSPI_RXD_OFFSET		0x20 /* Data Receive Register, RO */</div><div class='add'>+#define ZYNQ_QSPI_SIC_OFFSET		0x24 /* Slave Idle Count Register, RW */</div><div class='add'>+#define ZYNQ_QSPI_TX_THRESH_OFFSET	0x28 /* TX FIFO Watermark Reg, RW */</div><div class='add'>+#define ZYNQ_QSPI_RX_THRESH_OFFSET	0x2C /* RX FIFO Watermark Reg, RW */</div><div class='add'>+#define ZYNQ_QSPI_GPIO_OFFSET		0x30 /* GPIO Register, RW */</div><div class='add'>+#define ZYNQ_QSPI_LINEAR_CFG_OFFSET	0xA0 /* Linear Adapter Config Ref, RW */</div><div class='add'>+#define ZYNQ_QSPI_MOD_ID_OFFSET		0xFC /* Module ID Register, RO */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * QSPI Configuration Register bit Masks</div><div class='add'>+ *</div><div class='add'>+ * This register contains various control bits that effect the operation</div><div class='add'>+ * of the QSPI controller</div><div class='add'>+ */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_IFMODE_MASK	BIT(31) /* Flash Memory Interface */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_MANSRT_MASK	BIT(16) /* Manual TX Start */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_MANSRTEN_MASK	BIT(15) /* Enable Manual TX Mode */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_SSFORCE_MASK	BIT(14) /* Manual Chip Select */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_BDRATE_MASK	GENMASK(5, 3) /* Baud Rate Mask */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_CPHA_MASK	BIT(2) /* Clock Phase Control */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_CPOL_MASK	BIT(1) /* Clock Polarity Control */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_SSCTRL_MASK	BIT(10) /* Slave Select Mask */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_FWIDTH_MASK	GENMASK(7, 6) /* FIFO width */</div><div class='add'>+#define ZYNQ_QSPI_CONFIG_MSTREN_MASK	BIT(0) /* Master Mode */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * QSPI Configuration Register - Baud rate and slave select</div><div class='add'>+ *</div><div class='add'>+ * These are the values used in the calculation of baud rate divisor and</div><div class='add'>+ * setting the slave select.</div><div class='add'>+ */</div><div class='add'>+#define ZYNQ_QSPI_BAUD_DIV_MAX		GENMASK(2, 0) /* Baud rate maximum */</div><div class='add'>+#define ZYNQ_QSPI_BAUD_DIV_SHIFT	3 /* Baud rate divisor shift in CR */</div><div class='add'>+#define ZYNQ_QSPI_SS_SHIFT		10 /* Slave Select field shift in CR */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * QSPI Interrupt Registers bit Masks</div><div class='add'>+ *</div><div class='add'>+ * All the four interrupt registers (Status/Mask/Enable/Disable) have the same</div><div class='add'>+ * bit definitions.</div><div class='add'>+ */</div><div class='add'>+#define ZYNQ_QSPI_IXR_RX_OVERFLOW_MASK	BIT(0) /* QSPI RX FIFO Overflow */</div><div class='add'>+#define ZYNQ_QSPI_IXR_TXNFULL_MASK	BIT(2) /* QSPI TX FIFO Overflow */</div><div class='add'>+#define ZYNQ_QSPI_IXR_TXFULL_MASK	BIT(3) /* QSPI TX FIFO is full */</div><div class='add'>+#define ZYNQ_QSPI_IXR_RXNEMTY_MASK	BIT(4) /* QSPI RX FIFO Not Empty */</div><div class='add'>+#define ZYNQ_QSPI_IXR_RXF_FULL_MASK	BIT(5) /* QSPI RX FIFO is full */</div><div class='add'>+#define ZYNQ_QSPI_IXR_TXF_UNDRFLOW_MASK	BIT(6) /* QSPI TX FIFO Underflow */</div><div class='add'>+#define ZYNQ_QSPI_IXR_ALL_MASK		(ZYNQ_QSPI_IXR_RX_OVERFLOW_MASK | \</div><div class='add'>+					ZYNQ_QSPI_IXR_TXNFULL_MASK | \</div><div class='add'>+					ZYNQ_QSPI_IXR_TXFULL_MASK | \</div><div class='add'>+					ZYNQ_QSPI_IXR_RXNEMTY_MASK | \</div><div class='add'>+					ZYNQ_QSPI_IXR_RXF_FULL_MASK | \</div><div class='add'>+					ZYNQ_QSPI_IXR_TXF_UNDRFLOW_MASK)</div><div class='add'>+#define ZYNQ_QSPI_IXR_RXTX_MASK		(ZYNQ_QSPI_IXR_TXNFULL_MASK | \</div><div class='add'>+					ZYNQ_QSPI_IXR_RXNEMTY_MASK)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * QSPI Enable Register bit Masks</div><div class='add'>+ *</div><div class='add'>+ * This register is used to enable or disable the QSPI controller</div><div class='add'>+ */</div><div class='add'>+#define ZYNQ_QSPI_ENABLE_ENABLE_MASK	BIT(0) /* QSPI Enable Bit Mask */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * QSPI Linear Configuration Register</div><div class='add'>+ *</div><div class='add'>+ * It is named Linear Configuration but it controls other modes when not in</div><div class='add'>+ * linear mode also.</div><div class='add'>+ */</div><div class='add'>+#define ZYNQ_QSPI_LCFG_TWO_MEM_MASK	BIT(30) /* LQSPI Two memories Mask */</div><div class='add'>+#define ZYNQ_QSPI_LCFG_SEP_BUS_MASK	BIT(29) /* LQSPI Separate bus Mask */</div><div class='add'>+#define ZYNQ_QSPI_LCFG_U_PAGE_MASK	BIT(28) /* LQSPI Upper Page Mask */</div><div class='add'>+</div><div class='add'>+#define ZYNQ_QSPI_LCFG_DUMMY_SHIFT	8</div><div class='add'>+</div><div class='add'>+#define ZYNQ_QSPI_FAST_READ_QOUT_CODE	0x6B /* read instruction code */</div><div class='add'>+#define ZYNQ_QSPI_FIFO_DEPTH		63 /* FIFO depth in words */</div><div class='add'>+#define ZYNQ_QSPI_RX_THRESHOLD		32 /* Rx FIFO threshold level */</div><div class='add'>+#define ZYNQ_QSPI_TX_THRESHOLD		1 /* Tx FIFO threshold level */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The modebits configurable by the driver to make the SPI support different</div><div class='add'>+ * data formats</div><div class='add'>+ */</div><div class='add'>+#define ZYNQ_QSPI_MODEBITS			(SPI_CPOL | SPI_CPHA)</div><div class='add'>+</div><div class='add'>+/* Default number of chip selects */</div><div class='add'>+#define ZYNQ_QSPI_DEFAULT_NUM_CS	1</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct zynq_qspi - Defines qspi driver instance</div><div class='add'>+ * @regs:		Virtual address of the QSPI controller registers</div><div class='add'>+ * @refclk:		Pointer to the peripheral clock</div><div class='add'>+ * @pclk:		Pointer to the APB clock</div><div class='add'>+ * @irq:		IRQ number</div><div class='add'>+ * @txbuf:		Pointer to the TX buffer</div><div class='add'>+ * @rxbuf:		Pointer to the RX buffer</div><div class='add'>+ * @tx_bytes:		Number of bytes left to transfer</div><div class='add'>+ * @rx_bytes:		Number of bytes left to receive</div><div class='add'>+ * @data_completion:	completion structure</div><div class='add'>+ */</div><div class='add'>+struct zynq_qspi {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	struct clk *refclk;</div><div class='add'>+	struct clk *pclk;</div><div class='add'>+	int irq;</div><div class='add'>+	u8 *txbuf;</div><div class='add'>+	u8 *rxbuf;</div><div class='add'>+	int tx_bytes;</div><div class='add'>+	int rx_bytes;</div><div class='add'>+	struct completion data_completion;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Inline functions for the QSPI controller read/write</div><div class='add'>+ */</div><div class='add'>+static inline u32 zynq_qspi_read(struct zynq_qspi *xqspi, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return readl_relaxed(xqspi-&gt;regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void zynq_qspi_write(struct zynq_qspi *xqspi, u32 offset,</div><div class='add'>+				   u32 val)</div><div class='add'>+{</div><div class='add'>+	writel_relaxed(val, xqspi-&gt;regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_init_hw - Initialize the hardware</div><div class='add'>+ * @xqspi:	Pointer to the zynq_qspi structure</div><div class='add'>+ *</div><div class='add'>+ * The default settings of the QSPI controller's configurable parameters on</div><div class='add'>+ * reset are</div><div class='add'>+ *	- Master mode</div><div class='add'>+ *	- Baud rate divisor is set to 2</div><div class='add'>+ *	- Tx threshold set to 1l Rx threshold set to 32</div><div class='add'>+ *	- Flash memory interface mode enabled</div><div class='add'>+ *	- Size of the word to be transferred as 8 bit</div><div class='add'>+ * This function performs the following actions</div><div class='add'>+ *	- Disable and clear all the interrupts</div><div class='add'>+ *	- Enable manual slave select</div><div class='add'>+ *	- Enable manual start</div><div class='add'>+ *	- Deselect all the chip select lines</div><div class='add'>+ *	- Set the size of the word to be transferred as 32 bit</div><div class='add'>+ *	- Set the little endian mode of TX FIFO and</div><div class='add'>+ *	- Enable the QSPI controller</div><div class='add'>+ */</div><div class='add'>+static void zynq_qspi_init_hw(struct zynq_qspi *xqspi)</div><div class='add'>+{</div><div class='add'>+	u32 config_reg;</div><div class='add'>+</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0);</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_IDIS_OFFSET, ZYNQ_QSPI_IXR_ALL_MASK);</div><div class='add'>+</div><div class='add'>+	/* Disable linear mode as the boot loader may have used it */</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_LINEAR_CFG_OFFSET, 0);</div><div class='add'>+</div><div class='add'>+	/* Clear the RX FIFO */</div><div class='add'>+	while (zynq_qspi_read(xqspi, ZYNQ_QSPI_STATUS_OFFSET) &amp;</div><div class='add'>+			      ZYNQ_QSPI_IXR_RXNEMTY_MASK)</div><div class='add'>+		zynq_qspi_read(xqspi, ZYNQ_QSPI_RXD_OFFSET);</div><div class='add'>+</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_STATUS_OFFSET, ZYNQ_QSPI_IXR_ALL_MASK);</div><div class='add'>+	config_reg = zynq_qspi_read(xqspi, ZYNQ_QSPI_CONFIG_OFFSET);</div><div class='add'>+	config_reg &amp;= ~(ZYNQ_QSPI_CONFIG_MSTREN_MASK |</div><div class='add'>+			ZYNQ_QSPI_CONFIG_CPOL_MASK |</div><div class='add'>+			ZYNQ_QSPI_CONFIG_CPHA_MASK |</div><div class='add'>+			ZYNQ_QSPI_CONFIG_BDRATE_MASK |</div><div class='add'>+			ZYNQ_QSPI_CONFIG_SSFORCE_MASK |</div><div class='add'>+			ZYNQ_QSPI_CONFIG_MANSRTEN_MASK |</div><div class='add'>+			ZYNQ_QSPI_CONFIG_MANSRT_MASK);</div><div class='add'>+	config_reg |= (ZYNQ_QSPI_CONFIG_MSTREN_MASK |</div><div class='add'>+		       ZYNQ_QSPI_CONFIG_SSFORCE_MASK |</div><div class='add'>+		       ZYNQ_QSPI_CONFIG_FWIDTH_MASK |</div><div class='add'>+		       ZYNQ_QSPI_CONFIG_IFMODE_MASK);</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_CONFIG_OFFSET, config_reg);</div><div class='add'>+</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_RX_THRESH_OFFSET,</div><div class='add'>+			ZYNQ_QSPI_RX_THRESHOLD);</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_TX_THRESH_OFFSET,</div><div class='add'>+			ZYNQ_QSPI_TX_THRESHOLD);</div><div class='add'>+</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET,</div><div class='add'>+			ZYNQ_QSPI_ENABLE_ENABLE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool zynq_qspi_supports_op(struct spi_mem *mem,</div><div class='add'>+				  const struct spi_mem_op *op)</div><div class='add'>+{</div><div class='add'>+	if (!spi_mem_default_supports_op(mem, op))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The number of address bytes should be equal to or less than 3 bytes.</div><div class='add'>+	 */</div><div class='add'>+	if (op-&gt;addr.nbytes &gt; 3)</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'>+ * zynq_qspi_rxfifo_op - Read 1..4 bytes from RxFIFO to RX buffer</div><div class='add'>+ * @xqspi:	Pointer to the zynq_qspi structure</div><div class='add'>+ * @size:	Number of bytes to be read (1..4)</div><div class='add'>+ */</div><div class='add'>+static void zynq_qspi_rxfifo_op(struct zynq_qspi *xqspi, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	data = zynq_qspi_read(xqspi, ZYNQ_QSPI_RXD_OFFSET);</div><div class='add'>+</div><div class='add'>+	if (xqspi-&gt;rxbuf) {</div><div class='add'>+		memcpy(xqspi-&gt;rxbuf, ((u8 *)&amp;data) + 4 - size, size);</div><div class='add'>+		xqspi-&gt;rxbuf += size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xqspi-&gt;rx_bytes -= size;</div><div class='add'>+	if (xqspi-&gt;rx_bytes &lt; 0)</div><div class='add'>+		xqspi-&gt;rx_bytes = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_txfifo_op - Write 1..4 bytes from TX buffer to TxFIFO</div><div class='add'>+ * @xqspi:	Pointer to the zynq_qspi structure</div><div class='add'>+ * @size:	Number of bytes to be written (1..4)</div><div class='add'>+ */</div><div class='add'>+static void zynq_qspi_txfifo_op(struct zynq_qspi *xqspi, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int offset[4] = {</div><div class='add'>+		ZYNQ_QSPI_TXD_00_01_OFFSET, ZYNQ_QSPI_TXD_00_10_OFFSET,</div><div class='add'>+		ZYNQ_QSPI_TXD_00_11_OFFSET, ZYNQ_QSPI_TXD_00_00_OFFSET };</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	if (xqspi-&gt;txbuf) {</div><div class='add'>+		data = 0xffffffff;</div><div class='add'>+		memcpy(&amp;data, xqspi-&gt;txbuf, size);</div><div class='add'>+		xqspi-&gt;txbuf += size;</div><div class='add'>+	} else {</div><div class='add'>+		data = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xqspi-&gt;tx_bytes -= size;</div><div class='add'>+	zynq_qspi_write(xqspi, offset[size - 1], data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_chipselect - Select or deselect the chip select line</div><div class='add'>+ * @spi:	Pointer to the spi_device structure</div><div class='add'>+ * @assert:	1 for select or 0 for deselect the chip select line</div><div class='add'>+ */</div><div class='add'>+static void zynq_qspi_chipselect(struct spi_device *spi, bool assert)</div><div class='add'>+{</div><div class='add'>+	struct spi_controller *ctrl = spi-&gt;master;</div><div class='add'>+	struct zynq_qspi *xqspi = spi_controller_get_devdata(ctrl);</div><div class='add'>+	u32 config_reg;</div><div class='add'>+</div><div class='add'>+	config_reg = zynq_qspi_read(xqspi, ZYNQ_QSPI_CONFIG_OFFSET);</div><div class='add'>+	if (assert) {</div><div class='add'>+		/* Select the slave */</div><div class='add'>+		config_reg &amp;= ~ZYNQ_QSPI_CONFIG_SSCTRL_MASK;</div><div class='add'>+		config_reg |= (((~(BIT(spi-&gt;chip_select))) &lt;&lt;</div><div class='add'>+				ZYNQ_QSPI_SS_SHIFT) &amp;</div><div class='add'>+				ZYNQ_QSPI_CONFIG_SSCTRL_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		config_reg |= ZYNQ_QSPI_CONFIG_SSCTRL_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_CONFIG_OFFSET, config_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_config_op - Configure QSPI controller for specified transfer</div><div class='add'>+ * @xqspi:	Pointer to the zynq_qspi structure</div><div class='add'>+ * @qspi:	Pointer to the spi_device structure</div><div class='add'>+ *</div><div class='add'>+ * Sets the operational mode of QSPI controller for the next QSPI transfer and</div><div class='add'>+ * sets the requested clock frequency.</div><div class='add'>+ *</div><div class='add'>+ * Return:	0 on success and -EINVAL on invalid input parameter</div><div class='add'>+ *</div><div class='add'>+ * Note: If the requested frequency is not an exact match with what can be</div><div class='add'>+ * obtained using the prescalar value, the driver sets the clock frequency which</div><div class='add'>+ * is lower than the requested frequency (maximum lower) for the transfer. If</div><div class='add'>+ * the requested frequency is higher or lower than that is supported by the QSPI</div><div class='add'>+ * controller the driver will set the highest or lowest frequency supported by</div><div class='add'>+ * controller.</div><div class='add'>+ */</div><div class='add'>+static int zynq_qspi_config_op(struct zynq_qspi *xqspi, struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	u32 config_reg, baud_rate_val = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the clock frequency</div><div class='add'>+	 * The baud rate divisor is not a direct mapping to the value written</div><div class='add'>+	 * into the configuration register (config_reg[5:3])</div><div class='add'>+	 * i.e. 000 - divide by 2</div><div class='add'>+	 *      001 - divide by 4</div><div class='add'>+	 *      ----------------</div><div class='add'>+	 *      111 - divide by 256</div><div class='add'>+	 */</div><div class='add'>+	while ((baud_rate_val &lt; ZYNQ_QSPI_BAUD_DIV_MAX)  &amp;&amp;</div><div class='add'>+	       (clk_get_rate(xqspi-&gt;refclk) / (2 &lt;&lt; baud_rate_val)) &gt;</div><div class='add'>+		spi-&gt;max_speed_hz)</div><div class='add'>+		baud_rate_val++;</div><div class='add'>+</div><div class='add'>+	config_reg = zynq_qspi_read(xqspi, ZYNQ_QSPI_CONFIG_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Set the QSPI clock phase and clock polarity */</div><div class='add'>+	config_reg &amp;= (~ZYNQ_QSPI_CONFIG_CPHA_MASK) &amp;</div><div class='add'>+		      (~ZYNQ_QSPI_CONFIG_CPOL_MASK);</div><div class='add'>+	if (spi-&gt;mode &amp; SPI_CPHA)</div><div class='add'>+		config_reg |= ZYNQ_QSPI_CONFIG_CPHA_MASK;</div><div class='add'>+	if (spi-&gt;mode &amp; SPI_CPOL)</div><div class='add'>+		config_reg |= ZYNQ_QSPI_CONFIG_CPOL_MASK;</div><div class='add'>+</div><div class='add'>+	config_reg &amp;= ~ZYNQ_QSPI_CONFIG_BDRATE_MASK;</div><div class='add'>+	config_reg |= (baud_rate_val &lt;&lt; ZYNQ_QSPI_BAUD_DIV_SHIFT);</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_CONFIG_OFFSET, config_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'>+ * zynq_qspi_setup - Configure the QSPI controller</div><div class='add'>+ * @spi:	Pointer to the spi_device structure</div><div class='add'>+ *</div><div class='add'>+ * Sets the operational mode of QSPI controller for the next QSPI transfer, baud</div><div class='add'>+ * rate and divisor value to setup the requested qspi clock.</div><div class='add'>+ *</div><div class='add'>+ * Return:	0 on success and error value on failure</div><div class='add'>+ */</div><div class='add'>+static int zynq_qspi_setup_op(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct spi_controller *ctrl = spi-&gt;master;</div><div class='add'>+	struct zynq_qspi *qspi = spi_controller_get_devdata(ctrl);</div><div class='add'>+</div><div class='add'>+	if (ctrl-&gt;busy)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	clk_enable(qspi-&gt;refclk);</div><div class='add'>+	clk_enable(qspi-&gt;pclk);</div><div class='add'>+	zynq_qspi_write(qspi, ZYNQ_QSPI_ENABLE_OFFSET,</div><div class='add'>+			ZYNQ_QSPI_ENABLE_ENABLE_MASK);</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'>+ * zynq_qspi_write_op - Fills the TX FIFO with as many bytes as possible</div><div class='add'>+ * @xqspi:	Pointer to the zynq_qspi structure</div><div class='add'>+ * @txcount:	Maximum number of words to write</div><div class='add'>+ * @txempty:	Indicates that TxFIFO is empty</div><div class='add'>+ */</div><div class='add'>+static void zynq_qspi_write_op(struct zynq_qspi *xqspi, int txcount,</div><div class='add'>+			       bool txempty)</div><div class='add'>+{</div><div class='add'>+	int count, len, k;</div><div class='add'>+</div><div class='add'>+	len = xqspi-&gt;tx_bytes;</div><div class='add'>+	if (len &amp;&amp; len &lt; 4) {</div><div class='add'>+		/*</div><div class='add'>+		 * We must empty the TxFIFO between accesses to TXD0,</div><div class='add'>+		 * TXD1, TXD2, TXD3.</div><div class='add'>+		 */</div><div class='add'>+		if (txempty)</div><div class='add'>+			zynq_qspi_txfifo_op(xqspi, len);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = len / 4;</div><div class='add'>+	if (count &gt; txcount)</div><div class='add'>+		count = txcount;</div><div class='add'>+</div><div class='add'>+	if (xqspi-&gt;txbuf) {</div><div class='add'>+		iowrite32_rep(xqspi-&gt;regs + ZYNQ_QSPI_TXD_00_00_OFFSET,</div><div class='add'>+			      xqspi-&gt;txbuf, count);</div><div class='add'>+		xqspi-&gt;txbuf += count * 4;</div><div class='add'>+	} else {</div><div class='add'>+		for (k = 0; k &lt; count; k++)</div><div class='add'>+			writel_relaxed(0, xqspi-&gt;regs +</div><div class='add'>+					  ZYNQ_QSPI_TXD_00_00_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xqspi-&gt;tx_bytes -= count * 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_read_op - Drains the RX FIFO by as many bytes as possible</div><div class='add'>+ * @xqspi:	Pointer to the zynq_qspi structure</div><div class='add'>+ * @rxcount:	Maximum number of words to read</div><div class='add'>+ */</div><div class='add'>+static void zynq_qspi_read_op(struct zynq_qspi *xqspi, int rxcount)</div><div class='add'>+{</div><div class='add'>+	int count, len, k;</div><div class='add'>+</div><div class='add'>+	len = xqspi-&gt;rx_bytes - xqspi-&gt;tx_bytes;</div><div class='add'>+	count = len / 4;</div><div class='add'>+	if (count &gt; rxcount)</div><div class='add'>+		count = rxcount;</div><div class='add'>+	if (xqspi-&gt;rxbuf) {</div><div class='add'>+		ioread32_rep(xqspi-&gt;regs + ZYNQ_QSPI_RXD_OFFSET,</div><div class='add'>+			     xqspi-&gt;rxbuf, count);</div><div class='add'>+		xqspi-&gt;rxbuf += count * 4;</div><div class='add'>+	} else {</div><div class='add'>+		for (k = 0; k &lt; count; k++)</div><div class='add'>+			readl_relaxed(xqspi-&gt;regs + ZYNQ_QSPI_RXD_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	xqspi-&gt;rx_bytes -= count * 4;</div><div class='add'>+	len -= count * 4;</div><div class='add'>+</div><div class='add'>+	if (len &amp;&amp; len &lt; 4 &amp;&amp; count &lt; rxcount)</div><div class='add'>+		zynq_qspi_rxfifo_op(xqspi, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_irq - Interrupt service routine of the QSPI controller</div><div class='add'>+ * @irq:	IRQ number</div><div class='add'>+ * @dev_id:	Pointer to the xqspi structure</div><div class='add'>+ *</div><div class='add'>+ * This function handles TX empty only.</div><div class='add'>+ * On TX empty interrupt this function reads the received data from RX FIFO and</div><div class='add'>+ * fills the TX FIFO if there is any data remaining to be transferred.</div><div class='add'>+ *</div><div class='add'>+ * Return:	IRQ_HANDLED when interrupt is handled; IRQ_NONE otherwise.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t zynq_qspi_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	u32 intr_status;</div><div class='add'>+	bool txempty;</div><div class='add'>+	struct zynq_qspi *xqspi = (struct zynq_qspi *)dev_id;</div><div class='add'>+</div><div class='add'>+	intr_status = zynq_qspi_read(xqspi, ZYNQ_QSPI_STATUS_OFFSET);</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_STATUS_OFFSET, intr_status);</div><div class='add'>+</div><div class='add'>+	if ((intr_status &amp; ZYNQ_QSPI_IXR_TXNFULL_MASK) ||</div><div class='add'>+	    (intr_status &amp; ZYNQ_QSPI_IXR_RXNEMTY_MASK)) {</div><div class='add'>+		/*</div><div class='add'>+		 * This bit is set when Tx FIFO has &lt; THRESHOLD entries.</div><div class='add'>+		 * We have the THRESHOLD value set to 1,</div><div class='add'>+		 * so this bit indicates Tx FIFO is empty.</div><div class='add'>+		 */</div><div class='add'>+		txempty = !!(intr_status &amp; ZYNQ_QSPI_IXR_TXNFULL_MASK);</div><div class='add'>+		/* Read out the data from the RX FIFO */</div><div class='add'>+		zynq_qspi_read_op(xqspi, ZYNQ_QSPI_RX_THRESHOLD);</div><div class='add'>+		if (xqspi-&gt;tx_bytes) {</div><div class='add'>+			/* There is more data to send */</div><div class='add'>+			zynq_qspi_write_op(xqspi, ZYNQ_QSPI_RX_THRESHOLD,</div><div class='add'>+					   txempty);</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * If transfer and receive is completed then only send</div><div class='add'>+			 * complete signal.</div><div class='add'>+			 */</div><div class='add'>+			if (!xqspi-&gt;rx_bytes) {</div><div class='add'>+				zynq_qspi_write(xqspi,</div><div class='add'>+						ZYNQ_QSPI_IDIS_OFFSET,</div><div class='add'>+						ZYNQ_QSPI_IXR_RXTX_MASK);</div><div class='add'>+				complete(&amp;xqspi-&gt;data_completion);</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'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_exec_mem_op() - Initiates the QSPI transfer</div><div class='add'>+ * @mem: the SPI memory</div><div class='add'>+ * @op: the memory operation to execute</div><div class='add'>+ *</div><div class='add'>+ * Executes a memory operation.</div><div class='add'>+ *</div><div class='add'>+ * This function first selects the chip and starts the memory operation.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 in case of success, a negative error code otherwise.</div><div class='add'>+ */</div><div class='add'>+static int zynq_qspi_exec_mem_op(struct spi_mem *mem,</div><div class='add'>+				 const struct spi_mem_op *op)</div><div class='add'>+{</div><div class='add'>+	struct zynq_qspi *xqspi = spi_controller_get_devdata(mem-&gt;spi-&gt;master);</div><div class='add'>+	int err = 0, i;</div><div class='add'>+	u8 *tmpbuf;</div><div class='add'>+</div><div class='add'>+	dev_dbg(xqspi-&gt;dev, "cmd:%#x mode:%d.%d.%d.%d\n",</div><div class='add'>+		op-&gt;cmd.opcode, op-&gt;cmd.buswidth, op-&gt;addr.buswidth,</div><div class='add'>+		op-&gt;dummy.buswidth, op-&gt;data.buswidth);</div><div class='add'>+</div><div class='add'>+	zynq_qspi_chipselect(mem-&gt;spi, true);</div><div class='add'>+	zynq_qspi_config_op(xqspi, mem-&gt;spi);</div><div class='add'>+</div><div class='add'>+	if (op-&gt;cmd.opcode) {</div><div class='add'>+		reinit_completion(&amp;xqspi-&gt;data_completion);</div><div class='add'>+		xqspi-&gt;txbuf = (u8 *)&amp;op-&gt;cmd.opcode;</div><div class='add'>+		xqspi-&gt;rxbuf = NULL;</div><div class='add'>+		xqspi-&gt;tx_bytes = sizeof(op-&gt;cmd.opcode);</div><div class='add'>+		xqspi-&gt;rx_bytes = sizeof(op-&gt;cmd.opcode);</div><div class='add'>+		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);</div><div class='add'>+		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,</div><div class='add'>+				ZYNQ_QSPI_IXR_RXTX_MASK);</div><div class='add'>+		if (!wait_for_completion_interruptible_timeout(&amp;xqspi-&gt;data_completion,</div><div class='add'>+							       msecs_to_jiffies(1000)))</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (op-&gt;addr.nbytes) {</div><div class='add'>+		for (i = 0; i &lt; op-&gt;addr.nbytes; i++) {</div><div class='add'>+			xqspi-&gt;txbuf[i] = op-&gt;addr.val &gt;&gt;</div><div class='add'>+					(8 * (op-&gt;addr.nbytes - i - 1));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reinit_completion(&amp;xqspi-&gt;data_completion);</div><div class='add'>+		xqspi-&gt;rxbuf = NULL;</div><div class='add'>+		xqspi-&gt;tx_bytes = op-&gt;addr.nbytes;</div><div class='add'>+		xqspi-&gt;rx_bytes = op-&gt;addr.nbytes;</div><div class='add'>+		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);</div><div class='add'>+		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,</div><div class='add'>+				ZYNQ_QSPI_IXR_RXTX_MASK);</div><div class='add'>+		if (!wait_for_completion_interruptible_timeout(&amp;xqspi-&gt;data_completion,</div><div class='add'>+							       msecs_to_jiffies(1000)))</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (op-&gt;dummy.nbytes) {</div><div class='add'>+		tmpbuf = kzalloc(op-&gt;dummy.nbytes, GFP_KERNEL);</div><div class='add'>+		memset(tmpbuf, 0xff, op-&gt;dummy.nbytes);</div><div class='add'>+		reinit_completion(&amp;xqspi-&gt;data_completion);</div><div class='add'>+		xqspi-&gt;txbuf = tmpbuf;</div><div class='add'>+		xqspi-&gt;rxbuf = NULL;</div><div class='add'>+		xqspi-&gt;tx_bytes = op-&gt;dummy.nbytes;</div><div class='add'>+		xqspi-&gt;rx_bytes = op-&gt;dummy.nbytes;</div><div class='add'>+		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);</div><div class='add'>+		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,</div><div class='add'>+				ZYNQ_QSPI_IXR_RXTX_MASK);</div><div class='add'>+		if (!wait_for_completion_interruptible_timeout(&amp;xqspi-&gt;data_completion,</div><div class='add'>+							       msecs_to_jiffies(1000)))</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+		kfree(tmpbuf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (op-&gt;data.nbytes) {</div><div class='add'>+		reinit_completion(&amp;xqspi-&gt;data_completion);</div><div class='add'>+		if (op-&gt;data.dir == SPI_MEM_DATA_OUT) {</div><div class='add'>+			xqspi-&gt;txbuf = (u8 *)op-&gt;data.buf.out;</div><div class='add'>+			xqspi-&gt;tx_bytes = op-&gt;data.nbytes;</div><div class='add'>+			xqspi-&gt;rxbuf = NULL;</div><div class='add'>+			xqspi-&gt;rx_bytes = op-&gt;data.nbytes;</div><div class='add'>+		} else {</div><div class='add'>+			xqspi-&gt;txbuf = NULL;</div><div class='add'>+			xqspi-&gt;rxbuf = (u8 *)op-&gt;data.buf.in;</div><div class='add'>+			xqspi-&gt;rx_bytes = op-&gt;data.nbytes;</div><div class='add'>+			xqspi-&gt;tx_bytes = op-&gt;data.nbytes;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);</div><div class='add'>+		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,</div><div class='add'>+				ZYNQ_QSPI_IXR_RXTX_MASK);</div><div class='add'>+		if (!wait_for_completion_interruptible_timeout(&amp;xqspi-&gt;data_completion,</div><div class='add'>+							       msecs_to_jiffies(1000)))</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	zynq_qspi_chipselect(mem-&gt;spi, false);</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 spi_controller_mem_ops zynq_qspi_mem_ops = {</div><div class='add'>+	.supports_op = zynq_qspi_supports_op,</div><div class='add'>+	.exec_op = zynq_qspi_exec_mem_op,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zynq_qspi_probe - Probe method for the QSPI driver</div><div class='add'>+ * @pdev:	Pointer to the platform_device structure</div><div class='add'>+ *</div><div class='add'>+ * This function initializes the driver data structures and the hardware.</div><div class='add'>+ *</div><div class='add'>+ * Return:	0 on success and error value on failure</div><div class='add'>+ */</div><div class='add'>+static int zynq_qspi_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct spi_controller *ctlr;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	struct zynq_qspi *xqspi;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	u32 num_cs;</div><div class='add'>+</div><div class='add'>+	ctlr = spi_alloc_master(&amp;pdev-&gt;dev, sizeof(*xqspi));</div><div class='add'>+	if (!ctlr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	xqspi = spi_controller_get_devdata(ctlr);</div><div class='add'>+	xqspi-&gt;dev = dev;</div><div class='add'>+	platform_set_drvdata(pdev, xqspi);</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	xqspi-&gt;regs = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(xqspi-&gt;regs)) {</div><div class='add'>+		ret = PTR_ERR(xqspi-&gt;regs);</div><div class='add'>+		goto remove_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xqspi-&gt;pclk = devm_clk_get(&amp;pdev-&gt;dev, "pclk");</div><div class='add'>+	if (IS_ERR(xqspi-&gt;pclk)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "pclk clock not found.\n");</div><div class='add'>+		ret = PTR_ERR(xqspi-&gt;pclk);</div><div class='add'>+		goto remove_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;xqspi-&gt;data_completion);</div><div class='add'>+</div><div class='add'>+	xqspi-&gt;refclk = devm_clk_get(&amp;pdev-&gt;dev, "ref_clk");</div><div class='add'>+	if (IS_ERR(xqspi-&gt;refclk)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ref_clk clock not found.\n");</div><div class='add'>+		ret = PTR_ERR(xqspi-&gt;refclk);</div><div class='add'>+		goto remove_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(xqspi-&gt;pclk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to enable APB clock.\n");</div><div class='add'>+		goto remove_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(xqspi-&gt;refclk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to enable device clock.\n");</div><div class='add'>+		goto clk_dis_pclk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* QSPI controller initializations */</div><div class='add'>+	zynq_qspi_init_hw(xqspi);</div><div class='add'>+</div><div class='add'>+	xqspi-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (xqspi-&gt;irq &lt;= 0) {</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "irq resource not found\n");</div><div class='add'>+		goto remove_master;</div><div class='add'>+	}</div><div class='add'>+	ret = devm_request_irq(&amp;pdev-&gt;dev, xqspi-&gt;irq, zynq_qspi_irq,</div><div class='add'>+			       0, pdev-&gt;name, xqspi);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "request_irq failed\n");</div><div class='add'>+		goto remove_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(np, "num-cs",</div><div class='add'>+				   &amp;num_cs);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ctlr-&gt;num_chipselect = ZYNQ_QSPI_DEFAULT_NUM_CS;</div><div class='add'>+	else</div><div class='add'>+		ctlr-&gt;num_chipselect = num_cs;</div><div class='add'>+</div><div class='add'>+	ctlr-&gt;mode_bits =  SPI_RX_DUAL | SPI_RX_QUAD |</div><div class='add'>+			    SPI_TX_DUAL | SPI_TX_QUAD;</div><div class='add'>+	ctlr-&gt;mem_ops = &amp;zynq_qspi_mem_ops;</div><div class='add'>+	ctlr-&gt;setup = zynq_qspi_setup_op;</div><div class='add'>+	ctlr-&gt;max_speed_hz = clk_get_rate(xqspi-&gt;refclk) / 2;</div><div class='add'>+	ctlr-&gt;dev.of_node = np;</div><div class='add'>+	ret = spi_register_controller(ctlr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "spi_register_master failed\n");</div><div class='add'>+		goto clk_dis_all;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+clk_dis_all:</div><div class='add'>+	clk_disable_unprepare(xqspi-&gt;refclk);</div><div class='add'>+clk_dis_pclk:</div><div class='add'>+	clk_disable_unprepare(xqspi-&gt;pclk);</div><div class='add'>+remove_master:</div><div class='add'>+	spi_controller_put(ctlr);</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'>+ * zynq_qspi_remove - Remove method for the QSPI driver</div><div class='add'>+ * @pdev:	Pointer to the platform_device structure</div><div class='add'>+ *</div><div class='add'>+ * This function is called if a device is physically removed from the system or</div><div class='add'>+ * if the driver module is being unloaded. It frees all resources allocated to</div><div class='add'>+ * the device.</div><div class='add'>+ *</div><div class='add'>+ * Return:	0 on success and error value on failure</div><div class='add'>+ */</div><div class='add'>+static int zynq_qspi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct zynq_qspi *xqspi = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(xqspi-&gt;refclk);</div><div class='add'>+	clk_disable_unprepare(xqspi-&gt;pclk);</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 of_device_id zynq_qspi_of_match[] = {</div><div class='add'>+	{ .compatible = "xlnx,zynq-qspi-1.0", },</div><div class='add'>+	{ /* end of table */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, zynq_qspi_of_match);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * zynq_qspi_driver - This structure defines the QSPI platform driver</div><div class='add'>+ */</div><div class='add'>+static struct platform_driver zynq_qspi_driver = {</div><div class='add'>+	.probe = zynq_qspi_probe,</div><div class='add'>+	.remove = zynq_qspi_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "zynq-qspi",</div><div class='add'>+		.of_match_table = zynq_qspi_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(zynq_qspi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Xilinx, Inc.");</div><div class='add'>+MODULE_DESCRIPTION("Xilinx Zynq QSPI driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c<br/>index 93986f879b09..5e75944ad5d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spi.c</a></div><div class='hunk'>@@ -36,6 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/spi.h&gt;</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL(spi_transfer_start);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL(spi_transfer_stop);</div><div class='ctx'> </div><div class='ctx'> #include "internals.h"</div><div class='ctx'> </div><div class='hunk'>@@ -1039,6 +1041,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)</div><div class='ctx'> 		if (max_tx || max_rx) {</div><div class='ctx'> 			list_for_each_entry(xfer, &amp;msg-&gt;transfers,</div><div class='ctx'> 					    transfer_list) {</div><div class='add'>+				if (!xfer-&gt;len)</div><div class='add'>+					continue;</div><div class='ctx'> 				if (!xfer-&gt;tx_buf)</div><div class='ctx'> 					xfer-&gt;tx_buf = ctlr-&gt;dummy_tx;</div><div class='ctx'> 				if (!xfer-&gt;rx_buf)</div><div class='hunk'>@@ -1177,10 +1181,10 @@ out:</div><div class='ctx'> 	if (msg-&gt;status &amp;&amp; ctlr-&gt;handle_err)</div><div class='ctx'> 		ctlr-&gt;handle_err(ctlr, msg);</div><div class='ctx'> </div><div class='del'>-	spi_res_release(ctlr, msg);</div><div class='del'>-</div><div class='ctx'> 	spi_finalize_current_message(ctlr);</div><div class='ctx'> </div><div class='add'>+	spi_res_release(ctlr, msg);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2195,6 +2199,8 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr)</div><div class='ctx'> 		 */</div><div class='ctx'> 		cs[i] = devm_gpiod_get_index_optional(dev, "cs", i,</div><div class='ctx'> 						      GPIOD_OUT_LOW);</div><div class='add'>+		if (IS_ERR(cs[i]))</div><div class='add'>+			return PTR_ERR(cs[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (cs[i]) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2261,7 +2267,7 @@ int spi_register_controller(struct spi_controller *ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	struct device		*dev = ctlr-&gt;dev.parent;</div><div class='ctx'> 	struct boardinfo	*bi;</div><div class='del'>-	int			status = -ENODEV;</div><div class='add'>+	int			status;</div><div class='ctx'> 	int			id, first_dynamic;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -2275,24 +2281,6 @@ int spi_register_controller(struct spi_controller *ctlr)</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	if (!spi_controller_is_slave(ctlr)) {</div><div class='del'>-		if (ctlr-&gt;use_gpio_descriptors) {</div><div class='del'>-			status = spi_get_gpio_descs(ctlr);</div><div class='del'>-			if (status)</div><div class='del'>-				return status;</div><div class='del'>-			/*</div><div class='del'>-			 * A controller using GPIO descriptors always</div><div class='del'>-			 * supports SPI_CS_HIGH if need be.</div><div class='del'>-			 */</div><div class='del'>-			ctlr-&gt;mode_bits |= SPI_CS_HIGH;</div><div class='del'>-		} else {</div><div class='del'>-			/* Legacy code path for GPIOs from DT */</div><div class='del'>-			status = of_spi_register_master(ctlr);</div><div class='del'>-			if (status)</div><div class='del'>-				return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* even if it's just one always-selected device, there must</div><div class='ctx'> 	 * be at least one chipselect</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2349,6 +2337,25 @@ int spi_register_controller(struct spi_controller *ctlr)</div><div class='ctx'> 	 * registration fails if the bus ID is in use.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev_set_name(&amp;ctlr-&gt;dev, "spi%u", ctlr-&gt;bus_num);</div><div class='add'>+</div><div class='add'>+	if (!spi_controller_is_slave(ctlr)) {</div><div class='add'>+		if (ctlr-&gt;use_gpio_descriptors) {</div><div class='add'>+			status = spi_get_gpio_descs(ctlr);</div><div class='add'>+			if (status)</div><div class='add'>+				return status;</div><div class='add'>+			/*</div><div class='add'>+			 * A controller using GPIO descriptors always</div><div class='add'>+			 * supports SPI_CS_HIGH if need be.</div><div class='add'>+			 */</div><div class='add'>+			ctlr-&gt;mode_bits |= SPI_CS_HIGH;</div><div class='add'>+		} else {</div><div class='add'>+			/* Legacy code path for GPIOs from DT */</div><div class='add'>+			status = of_spi_register_master(ctlr);</div><div class='add'>+			if (status)</div><div class='add'>+				return status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = device_add(&amp;ctlr-&gt;dev);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		/* free bus id */</div><div class='hunk'>@@ -2781,11 +2788,6 @@ static int __spi_split_transfer_maxsize(struct spi_controller *ctlr,</div><div class='ctx'> 	size_t offset;</div><div class='ctx'> 	size_t count, i;</div><div class='ctx'> </div><div class='del'>-	/* warn once about this fact that we are splitting a transfer */</div><div class='del'>-	dev_warn_once(&amp;msg-&gt;spi-&gt;dev,</div><div class='del'>-		      "spi_transfer of length %i exceed max length of %zu - needed to split transfers\n",</div><div class='del'>-		      xfer-&gt;len, maxsize);</div><div class='del'>-</div><div class='ctx'> 	/* calculate how many we have to replace */</div><div class='ctx'> 	count = DIV_ROUND_UP(xfer-&gt;len, maxsize);</div><div class='ctx'> </div><div class='hunk'>@@ -2943,6 +2945,11 @@ int spi_setup(struct spi_device *spi)</div><div class='ctx'> 	 * so it is ignored here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bad_bits = spi-&gt;mode &amp; ~(spi-&gt;controller-&gt;mode_bits | SPI_CS_WORD);</div><div class='add'>+	/* nothing prevents from working with active-high CS in case if it</div><div class='add'>+	 * is driven by GPIO.</div><div class='add'>+	 */</div><div class='add'>+	if (gpio_is_valid(spi-&gt;cs_gpio))</div><div class='add'>+		bad_bits &amp;= ~SPI_CS_HIGH;</div><div class='ctx'> 	ugly_bits = bad_bits &amp;</div><div class='ctx'> 		    (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |</div><div class='ctx'> 		     SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL);</div><div class='hunk'>@@ -2988,6 +2995,21 @@ int spi_setup(struct spi_device *spi)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(spi_setup);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * spi_set_cs_timing - configure CS setup, hold, and inactive delays</div><div class='add'>+ * @spi: the device that requires specific CS timing configuration</div><div class='add'>+ * @setup: CS setup time in terms of clock count</div><div class='add'>+ * @hold: CS hold time in terms of clock count</div><div class='add'>+ * @inactive_dly: CS inactive delay between transfers in terms of clock count</div><div class='add'>+ */</div><div class='add'>+void spi_set_cs_timing(struct spi_device *spi, u8 setup, u8 hold,</div><div class='add'>+		       u8 inactive_dly)</div><div class='add'>+{</div><div class='add'>+	if (spi-&gt;controller-&gt;set_cs_timing)</div><div class='add'>+		spi-&gt;controller-&gt;set_cs_timing(spi, setup, hold, inactive_dly);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(spi_set_cs_timing);</div><div class='add'>+</div><div class='ctx'> static int __spi_validate(struct spi_device *spi, struct spi_message *message)</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_controller *ctlr = spi-&gt;controller;</div><div class='hunk'>@@ -3062,8 +3084,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)</div><div class='ctx'> </div><div class='ctx'> 		if (!xfer-&gt;speed_hz)</div><div class='ctx'> 			xfer-&gt;speed_hz = spi-&gt;max_speed_hz;</div><div class='del'>-		if (!xfer-&gt;speed_hz)</div><div class='del'>-			xfer-&gt;speed_hz = ctlr-&gt;max_speed_hz;</div><div class='ctx'> </div><div class='ctx'> 		if (ctlr-&gt;max_speed_hz &amp;&amp; xfer-&gt;speed_hz &gt; ctlr-&gt;max_speed_hz)</div><div class='ctx'> 			xfer-&gt;speed_hz = ctlr-&gt;max_speed_hz;</div><div class='head'>diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c<br/>index b0c76e2626ce..ce9142d87f41 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spidev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/spi/spidev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/spi/spidev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/spi/spidev.c</a></div><div class='hunk'>@@ -276,17 +276,19 @@ static int spidev_message(struct spidev_data *spidev,</div><div class='ctx'> 		k_tmp-&gt;bits_per_word = u_tmp-&gt;bits_per_word;</div><div class='ctx'> 		k_tmp-&gt;delay_usecs = u_tmp-&gt;delay_usecs;</div><div class='ctx'> 		k_tmp-&gt;speed_hz = u_tmp-&gt;speed_hz;</div><div class='add'>+		k_tmp-&gt;word_delay_usecs = u_tmp-&gt;word_delay_usecs;</div><div class='ctx'> 		if (!k_tmp-&gt;speed_hz)</div><div class='ctx'> 			k_tmp-&gt;speed_hz = spidev-&gt;speed_hz;</div><div class='ctx'> #ifdef VERBOSE</div><div class='ctx'> 		dev_dbg(&amp;spidev-&gt;spi-&gt;dev,</div><div class='del'>-			"  xfer len %u %s%s%s%dbits %u usec %uHz\n",</div><div class='add'>+			"  xfer len %u %s%s%s%dbits %u usec %u usec %uHz\n",</div><div class='ctx'> 			u_tmp-&gt;len,</div><div class='ctx'> 			u_tmp-&gt;rx_buf ? "rx " : "",</div><div class='ctx'> 			u_tmp-&gt;tx_buf ? "tx " : "",</div><div class='ctx'> 			u_tmp-&gt;cs_change ? "cs " : "",</div><div class='ctx'> 			u_tmp-&gt;bits_per_word ? : spidev-&gt;spi-&gt;bits_per_word,</div><div class='ctx'> 			u_tmp-&gt;delay_usecs,</div><div class='add'>+			u_tmp-&gt;word_delay_usecs,</div><div class='ctx'> 			u_tmp-&gt;speed_hz ? : spidev-&gt;spi-&gt;max_speed_hz);</div><div class='ctx'> #endif</div><div class='ctx'> 		spi_message_add_tail(k_tmp, &amp;msg);</div><div class='hunk'>@@ -591,7 +593,7 @@ static int spidev_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	spidev-&gt;users++;</div><div class='ctx'> 	filp-&gt;private_data = spidev;</div><div class='del'>-	nonseekable_open(inode, filp);</div><div class='add'>+	stream_open(inode, filp);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;device_list_lock);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/ssb/bridge_pcmcia_80211.c b/drivers/ssb/bridge_pcmcia_80211.c<br/>index f51f150307df..ffa379efff83 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ssb/bridge_pcmcia_80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ssb/bridge_pcmcia_80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ssb/bridge_pcmcia_80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ssb/bridge_pcmcia_80211.c</a></div><div class='hunk'>@@ -113,16 +113,21 @@ static struct pcmcia_driver ssb_host_pcmcia_driver = {</div><div class='ctx'> 	.resume		= ssb_host_pcmcia_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int pcmcia_init_failed;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are not module init/exit functions!</div><div class='ctx'>  * The module_pcmcia_driver() helper cannot be used here.</div><div class='ctx'>  */</div><div class='ctx'> int ssb_host_pcmcia_init(void)</div><div class='ctx'> {</div><div class='del'>-	return pcmcia_register_driver(&amp;ssb_host_pcmcia_driver);</div><div class='add'>+	pcmcia_init_failed = pcmcia_register_driver(&amp;ssb_host_pcmcia_driver);</div><div class='add'>+</div><div class='add'>+	return pcmcia_init_failed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ssb_host_pcmcia_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pcmcia_unregister_driver(&amp;ssb_host_pcmcia_driver);</div><div class='add'>+	if (!pcmcia_init_failed)</div><div class='add'>+		pcmcia_unregister_driver(&amp;ssb_host_pcmcia_driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c<br/>index 84807a9b4b13..da2d2ab8104d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ssb/pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ssb/pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ssb/pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ssb/pci.c</a></div><div class='hunk'>@@ -305,7 +305,6 @@ static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom)</div><div class='ctx'> 		else if (i % 2)</div><div class='ctx'> 			pr_cont(".");</div><div class='ctx'> 		writew(sprom[i], bus-&gt;mmio + bus-&gt;sprom_offset + (i * 2));</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = pci_read_config_dword(pdev, SSB_SPROMCTL, &amp;spromctl);</div><div class='head'>diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c<br/>index 567013f8a8be..d7d730c245c5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ssb/pcmcia.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/ssb/pcmcia.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/ssb/pcmcia.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/ssb/pcmcia.c</a></div><div class='hunk'>@@ -338,7 +338,6 @@ static void ssb_pcmcia_write8(struct ssb_device *dev, u16 offset, u8 value)</div><div class='ctx'> 	err = select_core_and_segment(dev, &amp;offset);</div><div class='ctx'> 	if (likely(!err))</div><div class='ctx'> 		writeb(value, bus-&gt;mmio + offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bus-&gt;bar_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +351,6 @@ static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value)</div><div class='ctx'> 	err = select_core_and_segment(dev, &amp;offset);</div><div class='ctx'> 	if (likely(!err))</div><div class='ctx'> 		writew(value, bus-&gt;mmio + offset);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bus-&gt;bar_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +366,6 @@ static void ssb_pcmcia_write32(struct ssb_device *dev, u16 offset, u32 value)</div><div class='ctx'> 		writew((value &amp; 0x0000FFFF), bus-&gt;mmio + offset);</div><div class='ctx'> 		writew(((value &amp; 0xFFFF0000) &gt;&gt; 16), bus-&gt;mmio + offset + 2);</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bus-&gt;bar_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -424,7 +421,6 @@ static void ssb_pcmcia_block_write(struct ssb_device *dev, const void *buffer,</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 	}</div><div class='ctx'> unlock:</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bus-&gt;bar_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SSB_BLOCKIO */</div><div class='head'>diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig<br/>index c0901b96cfe4..86001a9f67e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menuconfig STAGING</div><div class='ctx'> 	bool "Staging drivers"</div><div class='del'>-	default n</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This option allows you to select a number of drivers that are</div><div class='ctx'> 	  not of the "normal" Linux kernel quality level.  These drivers</div><div class='hunk'>@@ -16,8 +16,8 @@ menuconfig STAGING</div><div class='ctx'> </div><div class='ctx'> 	  If you wish to work on these drivers, to help improve them, or</div><div class='ctx'> 	  to report problems you have with them, please see the</div><div class='del'>-	  driver_name.README file in the drivers/staging/ directory to</div><div class='del'>-	  see what needs to be worked on, and who to contact.</div><div class='add'>+	  drivers/staging/&lt;driver_name&gt;/TODO file to see what needs to be</div><div class='add'>+	  worked on, and who to contact.</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N here.</div><div class='ctx'> </div><div class='hunk'>@@ -40,8 +40,6 @@ source "drivers/staging/rtl8712/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/rtl8188eu/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/staging/rtlwifi/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/staging/rts5208/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/octeon/Kconfig"</div><div class='hunk'>@@ -106,16 +104,10 @@ source "drivers/staging/mt7621-pci-phy/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/mt7621-pinctrl/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/staging/mt7621-spi/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/staging/mt7621-dma/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/ralink-gdma/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/staging/mt7621-mmc/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/staging/mt7621-eth/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/staging/mt7621-dts/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/gasket/Kconfig"</div><div class='hunk'>@@ -124,4 +116,8 @@ source "drivers/staging/axis-fifo/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/erofs/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/staging/fieldbus/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/kpc2000/Kconfig"</div><div class='add'>+</div><div class='ctx'> endif # STAGING</div><div class='head'>diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile<br/>index 57c6bce13ff4..dc3da72b3ff9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/Makefile</a></div><div class='hunk'>@@ -10,7 +10,6 @@ obj-$(CONFIG_RTL8192E)		+= rtl8192e/</div><div class='ctx'> obj-$(CONFIG_RTL8723BS)		+= rtl8723bs/</div><div class='ctx'> obj-$(CONFIG_R8712U)		+= rtl8712/</div><div class='ctx'> obj-$(CONFIG_R8188EU)		+= rtl8188eu/</div><div class='del'>-obj-$(CONFIG_R8822BE)		+= rtlwifi/</div><div class='ctx'> obj-$(CONFIG_RTS5208)		+= rts5208/</div><div class='ctx'> obj-$(CONFIG_NETLOGIC_XLR_NET)	+= netlogic/</div><div class='ctx'> obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/</div><div class='hunk'>@@ -43,12 +42,11 @@ obj-$(CONFIG_PI433)		+= pi433/</div><div class='ctx'> obj-$(CONFIG_PCI_MT7621)	+= mt7621-pci/</div><div class='ctx'> obj-$(CONFIG_PCI_MT7621_PHY)	+= mt7621-pci-phy/</div><div class='ctx'> obj-$(CONFIG_PINCTRL_RT2880)	+= mt7621-pinctrl/</div><div class='del'>-obj-$(CONFIG_SPI_MT7621)	+= mt7621-spi/</div><div class='ctx'> obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/</div><div class='ctx'> obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/</div><div class='del'>-obj-$(CONFIG_MTK_MMC)		+= mt7621-mmc/</div><div class='del'>-obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)	+= mt7621-eth/</div><div class='ctx'> obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/</div><div class='ctx'> obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket/</div><div class='ctx'> obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/</div><div class='ctx'> obj-$(CONFIG_EROFS_FS)		+= erofs/</div><div class='add'>+obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/</div><div class='add'>+obj-$(CONFIG_KPC2000)		+= kpc2000/</div><div class='head'>diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig<br/>index 17c5587805f5..d6d605d5cbde 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/android/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menu "Android"</div><div class='ctx'> </div><div class='ctx'> if ANDROID</div><div class='ctx'> </div><div class='ctx'> config ASHMEM</div><div class='ctx'> 	bool "Enable the Anonymous Shared Memory Subsystem"</div><div class='del'>-	default n</div><div class='ctx'> 	depends on SHMEM</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ashmem subsystem is a new shared memory allocator, similar to</div><div class='hunk'>@@ -16,7 +16,6 @@ config ASHMEM</div><div class='ctx'> </div><div class='ctx'> config ANDROID_VSOC</div><div class='ctx'> 	tristate "Android Virtual SoC support"</div><div class='del'>-	default n</div><div class='ctx'> 	depends on PCI_MSI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds support for the Virtual SoC driver needed to boot</div><div class='head'>diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile<br/>index 90e6154f11a4..14bd9c6ce10d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/android/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> ccflags-y += -I$(src)			# needed for trace events</div><div class='ctx'> </div><div class='ctx'> obj-y					+= ion/</div><div class='head'>diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig<br/>index 0fdda6f62953..178df581a8fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/ion/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/ion/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/ion/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/android/ion/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menuconfig ION</div><div class='ctx'> 	bool "Ion Memory Manager"</div><div class='ctx'> 	depends on HAS_DMA &amp;&amp; MMU</div><div class='head'>diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c<br/>index 8a75bd27c413..00a1ec7b9154 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/vsoc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/android/vsoc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/android/vsoc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/android/vsoc.c</a></div><div class='hunk'>@@ -259,7 +259,8 @@ do_create_fd_scoped_permission(struct vsoc_device_region *region_p,</div><div class='ctx'> 	atomic_t *owner_ptr = NULL;</div><div class='ctx'> 	struct vsoc_device_region *managed_region_p;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;np-&gt;permission, &amp;arg-&gt;perm, sizeof(*np)) ||</div><div class='add'>+	if (copy_from_user(&amp;np-&gt;permission,</div><div class='add'>+			   &amp;arg-&gt;perm, sizeof(np-&gt;permission)) ||</div><div class='ctx'> 	    copy_from_user(&amp;managed_fd,</div><div class='ctx'> 			   &amp;arg-&gt;managed_region_fd, sizeof(managed_fd))) {</div><div class='ctx'> 		return -EFAULT;</div><div class='head'>diff --git a/drivers/staging/axis-fifo/Kconfig b/drivers/staging/axis-fifo/Kconfig<br/>index 687537203d9c..3fffe4d6f327 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/axis-fifo/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/axis-fifo/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/axis-fifo/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/axis-fifo/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # "Xilinx AXI-Stream FIFO IP core driver"</div><div class='ctx'> #</div><div class='ctx'> config XIL_AXIS_FIFO</div><div class='ctx'> 	tristate "Xilinx AXI-Stream FIFO IP core driver"</div><div class='del'>-	default n</div><div class='add'>+	depends on OF</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for the Xilinx AXI-Stream</div><div class='del'>-	  FIFO IP core driver.</div><div class='add'>+	  This adds support for the Xilinx AXI-Stream FIFO IP core driver.</div><div class='add'>+	  The AXI Streaming FIFO allows memory mapped access to a AXI Streaming</div><div class='add'>+	  interface. The Xilinx AXI-Stream FIFO IP core can be used to interface</div><div class='add'>+	  to the AXI Ethernet without the need to use DMA.</div><div class='head'>diff --git a/drivers/staging/axis-fifo/Makefile b/drivers/staging/axis-fifo/Makefile<br/>index fe62cd1ac5de..c626005c99db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/axis-fifo/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/axis-fifo/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/axis-fifo/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/axis-fifo/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo.o</div><div class='head'>diff --git a/drivers/staging/board/Kconfig b/drivers/staging/board/Kconfig<br/>index 3f287c48e082..d0c6e42eadda 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/board/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/board/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/board/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/board/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config STAGING_BOARD</div><div class='ctx'> 	bool "Staging Board Support"</div><div class='ctx'> 	depends on OF_ADDRESS &amp;&amp; OF_IRQ &amp;&amp; CLKDEV_LOOKUP</div><div class='head'>diff --git a/drivers/staging/board/Makefile b/drivers/staging/board/Makefile<br/>index 6842745feb94..ed7839752e12 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/board/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/board/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/board/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/board/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-y	:= board.o</div><div class='ctx'> obj-$(CONFIG_ARCH_EMEV2)	+= kzm9d.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7740)	+= armadillo800eva.o</div><div class='head'>diff --git a/drivers/staging/clocking-wizard/Kconfig b/drivers/staging/clocking-wizard/Kconfig<br/>index aa57a5865556..04be22dca9b6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/clocking-wizard/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/clocking-wizard/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/clocking-wizard/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/clocking-wizard/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Xilinx Clocking Wizard Driver</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/clocking-wizard/Makefile b/drivers/staging/clocking-wizard/Makefile<br/>index 5ad352f521fe..b1f915224d96 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/clocking-wizard/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/clocking-wizard/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/clocking-wizard/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/clocking-wizard/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)	+= clk-xlnx-clock-wizard.o</div><div class='head'>diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig<br/>index 9ab1ee7d36bf..049b659fa6ad 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config COMEDI</div><div class='ctx'> 	tristate "Data acquisition support (comedi)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for a wide range of data acquisition devices</div><div class='ctx'> 	  for Linux.</div><div class='ctx'> </div><div class='hunk'>@@ -8,14 +9,14 @@ if COMEDI</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DEBUG</div><div class='ctx'> 	bool "Comedi debugging"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is an option for use by developers; most people should</div><div class='ctx'> 	  say N here. This enables comedi core and driver debugging.</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DEFAULT_BUF_SIZE_KB</div><div class='ctx'> 	int "Comedi default initial asynchronous buffer size in KiB"</div><div class='ctx'> 	default "2048"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the default asynchronous buffer size which is used for</div><div class='ctx'> 	  commands running in the background in kernel space.  This</div><div class='ctx'> 	  defaults to 2048 KiB of memory so that a 16 channel card</div><div class='hunk'>@@ -24,7 +25,7 @@ config COMEDI_DEFAULT_BUF_SIZE_KB</div><div class='ctx'> config COMEDI_DEFAULT_BUF_MAXSIZE_KB</div><div class='ctx'> 	int "Comedi default maximum asynchronous buffer size in KiB"</div><div class='ctx'> 	default "20480"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the default maximum asynchronous buffer size which can</div><div class='ctx'> 	  be requested by a userspace program without root privileges.</div><div class='ctx'> 	  This is set to 20480 KiB so that a fast I/O card with 16</div><div class='hunk'>@@ -32,7 +33,7 @@ config COMEDI_DEFAULT_BUF_MAXSIZE_KB</div><div class='ctx'> </div><div class='ctx'> menuconfig COMEDI_MISC_DRIVERS</div><div class='ctx'> 	bool "Comedi misc drivers"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable comedi misc drivers to be built</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question won't directly affect the</div><div class='hunk'>@@ -44,7 +45,7 @@ if COMEDI_MISC_DRIVERS</div><div class='ctx'> config COMEDI_BOND</div><div class='ctx'> 	tristate "Comedi device bonding support"</div><div class='ctx'> 	select COMEDI_KCOMEDILIB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for a driver to 'bond' (merge) multiple subdevices</div><div class='ctx'> 	  from multiple devices together as one.</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +56,7 @@ config COMEDI_BOND</div><div class='ctx'> </div><div class='ctx'> config COMEDI_TEST</div><div class='ctx'> 	tristate "Fake waveform generator support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the fake waveform generator.</div><div class='ctx'> 	  This driver is mainly for testing purposes, but can also be used to</div><div class='ctx'> 	  generate sample waveforms on systems that don't have data acquisition</div><div class='hunk'>@@ -66,7 +67,7 @@ config COMEDI_TEST</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PARPORT</div><div class='ctx'> 	tristate "Parallel port support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the standard parallel port.</div><div class='ctx'> 	  A cheap and easy way to get a few more digital I/O lines. Steal</div><div class='ctx'> 	  additional parallel ports from old computers or your neighbors'</div><div class='hunk'>@@ -78,7 +79,7 @@ config COMEDI_PARPORT</div><div class='ctx'> config COMEDI_SSV_DNP</div><div class='ctx'> 	tristate "SSV Embedded Systems DIL/Net-PC support"</div><div class='ctx'> 	depends on X86_32 || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for SSV Embedded Systems DIL/Net-PC</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -88,7 +89,7 @@ endif # COMEDI_MISC_DRIVERS</div><div class='ctx'> </div><div class='ctx'> menuconfig COMEDI_ISA_DRIVERS</div><div class='ctx'> 	bool "Comedi ISA and PC/104 drivers"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable comedi ISA and PC/104 drivers to be built</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question won't directly affect the</div><div class='hunk'>@@ -100,7 +101,7 @@ if COMEDI_ISA_DRIVERS</div><div class='ctx'> config COMEDI_PCL711</div><div class='ctx'> 	tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -109,7 +110,7 @@ config COMEDI_PCL711</div><div class='ctx'> config COMEDI_PCL724</div><div class='ctx'> 	tristate "Advantech PCL-722/724/731 and ADlink ACL-7122/7124/PET-48DIO"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ISA and PC/104 based 8255 digital i/o boards. This</div><div class='ctx'> 	  driver provides a legacy comedi driver wrapper for the generic 8255</div><div class='ctx'> 	  support driver.</div><div class='hunk'>@@ -129,7 +130,7 @@ config COMEDI_PCL724</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PCL726</div><div class='ctx'> 	tristate "Advantech PCL-726 and compatible ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCL-726 and compatible ISA cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -137,7 +138,7 @@ config COMEDI_PCL726</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PCL730</div><div class='ctx'> 	tristate "Simple Digital I/O board support (8-bit ports)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for various simple ISA or PC/104 Digital I/O boards.</div><div class='ctx'> 	  These boards all use 8-bit I/O ports.</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +163,7 @@ config COMEDI_PCL812</div><div class='ctx'> 	tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink</div><div class='ctx'> 	  ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA,</div><div class='ctx'> 	  A-822PGH/PGL, A-823PGH/PGL, A-826PG and ICP DAS ISO-813 ISA cards</div><div class='hunk'>@@ -174,7 +175,7 @@ config COMEDI_PCL816</div><div class='ctx'> 	tristate "Advantech PCL-814 and PCL-816 ISA card support"</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCL-814 and PCL-816 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -184,7 +185,7 @@ config COMEDI_PCL818</div><div class='ctx'> 	tristate "Advantech PCL-718 and PCL-818 ISA card support"</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCL-818 ISA cards</div><div class='ctx'> 	  PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +195,7 @@ config COMEDI_PCL818</div><div class='ctx'> config COMEDI_PCM3724</div><div class='ctx'> 	tristate "Advantech PCM-3724 PC/104 card support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCM-3724 PC/104 cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -203,7 +204,7 @@ config COMEDI_PCM3724</div><div class='ctx'> config COMEDI_AMPLC_DIO200_ISA</div><div class='ctx'> 	tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E"</div><div class='ctx'> 	select COMEDI_AMPLC_DIO200</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and</div><div class='ctx'> 	  PC272E ISA DIO boards</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +214,7 @@ config COMEDI_AMPLC_DIO200_ISA</div><div class='ctx'> config COMEDI_AMPLC_PC236_ISA</div><div class='ctx'> 	tristate "Amplicon PC36AT DIO board support"</div><div class='ctx'> 	select COMEDI_AMPLC_PC236</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PC36AT ISA DIO board.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -221,7 +222,7 @@ config COMEDI_AMPLC_PC236_ISA</div><div class='ctx'> </div><div class='ctx'> config COMEDI_AMPLC_PC263_ISA</div><div class='ctx'> 	tristate "Amplicon PC263 relay board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PC263 ISA relay board.  This board has</div><div class='ctx'> 	  16 reed relay output channels.</div><div class='ctx'> </div><div class='hunk'>@@ -230,7 +231,7 @@ config COMEDI_AMPLC_PC263_ISA</div><div class='ctx'> </div><div class='ctx'> config COMEDI_RTI800</div><div class='ctx'> 	tristate "Analog Devices RTI-800/815 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Analog Devices RTI-800/815 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -238,7 +239,7 @@ config COMEDI_RTI800</div><div class='ctx'> </div><div class='ctx'> config COMEDI_RTI802</div><div class='ctx'> 	tristate "Analog Devices RTI-802 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Analog Devices RTI-802 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -246,7 +247,7 @@ config COMEDI_RTI802</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DAC02</div><div class='ctx'> 	tristate "Keithley Metrabyte DAC02 compatible ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Keithley Metrabyte DAC02 compatible ISA cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -256,7 +257,7 @@ config COMEDI_DAS16M1</div><div class='ctx'> 	tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Measurement Computing CIO-DAS16/M1 ISA cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -265,7 +266,7 @@ config COMEDI_DAS16M1</div><div class='ctx'> config COMEDI_DAS08_ISA</div><div class='ctx'> 	tristate "DAS-08 compatible ISA and PC/104 card support"</div><div class='ctx'> 	select COMEDI_DAS08</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Keithley Metrabyte/ComputerBoards DAS08</div><div class='ctx'> 	  and compatible ISA and PC/104 cards:</div><div class='ctx'> 	  Keithley Metrabyte/ComputerBoards DAS08, DAS08-PGM, DAS08-PGH,</div><div class='hunk'>@@ -280,7 +281,7 @@ config COMEDI_DAS16</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Keithley Metrabyte/ComputerBoards DAS16</div><div class='ctx'> 	  and compatible ISA and PC/104 cards:</div><div class='ctx'> 	  Keithley Metrabyte DAS-16, DAS-16G, DAS-16F, DAS-1201, DAS-1202,</div><div class='hunk'>@@ -296,7 +297,7 @@ config COMEDI_DAS16</div><div class='ctx'> config COMEDI_DAS800</div><div class='ctx'> 	tristate "DAS800 and compatible ISA card support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Keithley Metrabyte DAS800 and compatible ISA cards</div><div class='ctx'> 	  Keithley Metrabyte DAS-800, DAS-801, DAS-802</div><div class='ctx'> 	  Measurement Computing CIO-DAS800, CIO-DAS801, CIO-DAS802 and</div><div class='hunk'>@@ -309,7 +310,7 @@ config COMEDI_DAS1800</div><div class='ctx'> 	tristate "DAS1800 and compatible ISA card support"</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for DAS1800 and compatible ISA cards</div><div class='ctx'> 	  Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO,</div><div class='ctx'> 	  DAS-1702ST, DAS-1702ST-DA, DAS-1702HR, DAS-1702HR-DA, DAS-1702/AO,</div><div class='hunk'>@@ -323,7 +324,7 @@ config COMEDI_DAS1800</div><div class='ctx'> config COMEDI_DAS6402</div><div class='ctx'> 	tristate "DAS6402 and compatible ISA card support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for DAS6402 and compatible ISA cards</div><div class='ctx'> 	  Computerboards, Keithley Metrabyte DAS6402 and compatibles</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +333,7 @@ config COMEDI_DAS6402</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT2801</div><div class='ctx'> 	tristate "Data Translation DT2801 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT2801 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -340,7 +341,7 @@ config COMEDI_DT2801</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT2811</div><div class='ctx'> 	tristate "Data Translation DT2811 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT2811 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -348,7 +349,7 @@ config COMEDI_DT2811</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT2814</div><div class='ctx'> 	tristate "Data Translation DT2814 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT2814 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -356,7 +357,7 @@ config COMEDI_DT2814</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT2815</div><div class='ctx'> 	tristate "Data Translation DT2815 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT2815 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -364,7 +365,7 @@ config COMEDI_DT2815</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT2817</div><div class='ctx'> 	tristate "Data Translation DT2817 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT2817 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -373,7 +374,7 @@ config COMEDI_DT2817</div><div class='ctx'> config COMEDI_DT282X</div><div class='ctx'> 	tristate "Data Translation DT2821 series and DT-EZ ISA card support"</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT2821 series including DT-EZ</div><div class='ctx'> 	  DT2821, DT2821-F-16SE, DT2821-F-8DI, DT2821-G-16SE, DT2821-G-8DI,</div><div class='ctx'> 	  DT2823 (dt2823), DT2824-PGH, DT2824-PGL, DT2825, DT2827, DT2828,</div><div class='hunk'>@@ -385,7 +386,7 @@ config COMEDI_DT282X</div><div class='ctx'> config COMEDI_DMM32AT</div><div class='ctx'> 	tristate "Diamond Systems MM-32-AT PC/104 board support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Diamond Systems MM-32-AT PC/104 boards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -393,7 +394,7 @@ config COMEDI_DMM32AT</div><div class='ctx'> </div><div class='ctx'> config COMEDI_FL512</div><div class='ctx'> 	tristate "FL512 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for FL512 ISA card</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -403,7 +404,7 @@ config COMEDI_AIO_AIO12_8</div><div class='ctx'> 	tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -411,7 +412,7 @@ config COMEDI_AIO_AIO12_8</div><div class='ctx'> </div><div class='ctx'> config COMEDI_AIO_IIRO_16</div><div class='ctx'> 	tristate "I/O Products PC/104 IIRO16 Board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for I/O Products PC/104 IIRO16 Relay And Isolated</div><div class='ctx'> 	  Input Board</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +422,7 @@ config COMEDI_AIO_IIRO_16</div><div class='ctx'> config COMEDI_II_PCI20KC</div><div class='ctx'> 	tristate "Intelligent Instruments PCI-20001C carrier support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Intelligent Instruments PCI-20001C carrier</div><div class='ctx'> 	  PCI-20001, PCI-20006 and PCI-20341</div><div class='ctx'> </div><div class='hunk'>@@ -430,7 +431,7 @@ config COMEDI_II_PCI20KC</div><div class='ctx'> </div><div class='ctx'> config COMEDI_C6XDIGIO</div><div class='ctx'> 	tristate "Mechatronic Systems Inc. C6x_DIGIO DSP daughter card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Mechatronic Systems Inc. C6x_DIGIO DSP daughter</div><div class='ctx'> 	  card</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +440,7 @@ config COMEDI_C6XDIGIO</div><div class='ctx'> </div><div class='ctx'> config COMEDI_MPC624</div><div class='ctx'> 	tristate "Micro/sys MPC-624 PC/104 board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Micro/sys MPC-624 PC/104 board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -447,7 +448,7 @@ config COMEDI_MPC624</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADQ12B</div><div class='ctx'> 	tristate "MicroAxial ADQ12-B data acquisition and control card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable MicroAxial ADQ12-B daq and control card support.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -457,7 +458,7 @@ config COMEDI_NI_AT_A2150</div><div class='ctx'> 	tristate "NI AT-A2150 ISA card support"</div><div class='ctx'> 	select COMEDI_ISADMA if ISA_DMA_API</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments AT-A2150 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -466,7 +467,7 @@ config COMEDI_NI_AT_A2150</div><div class='ctx'> config COMEDI_NI_AT_AO</div><div class='ctx'> 	tristate "NI AT-AO-6/10 EISA card support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments AT-AO-6/10 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -476,7 +477,7 @@ config COMEDI_NI_ATMIO</div><div class='ctx'> 	tristate "NI AT-MIO E series ISA-PNP card support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='ctx'> 	select COMEDI_NI_TIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments AT-MIO E series cards</div><div class='ctx'> 	  National Instruments AT-MIO-16E-1 (ni_atmio),</div><div class='ctx'> 	  AT-MIO-16E-2, AT-MIO-16E-10, AT-MIO-16DE-10, AT-MIO-64E-3,</div><div class='hunk'>@@ -488,7 +489,7 @@ config COMEDI_NI_ATMIO</div><div class='ctx'> config COMEDI_NI_ATMIO16D</div><div class='ctx'> 	tristate "NI AT-MIO-16/AT-MIO-16D series ISA card support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments AT-MIO-16/AT-MIO-16D cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -497,7 +498,7 @@ config COMEDI_NI_ATMIO16D</div><div class='ctx'> config COMEDI_NI_LABPC_ISA</div><div class='ctx'> 	tristate "NI Lab-PC and compatibles ISA support"</div><div class='ctx'> 	select COMEDI_NI_LABPC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments Lab-PC and compatibles</div><div class='ctx'> 	  Lab-PC-1200, Lab-PC-1200AI, Lab-PC+.</div><div class='ctx'> 	  Kernel-level ISA plug-and-play support for the lab-pc-1200 boards has</div><div class='hunk'>@@ -508,7 +509,7 @@ config COMEDI_NI_LABPC_ISA</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PCMAD</div><div class='ctx'> 	tristate "Winsystems PCM-A/D12 and PCM-A/D16 PC/104 board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Winsystems PCM-A/D12 and PCM-A/D16 PC/104 boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -516,7 +517,7 @@ config COMEDI_PCMAD</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PCMDA12</div><div class='ctx'> 	tristate "Winsystems PCM-D/A-12 8-channel AO PC/104 board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Winsystems PCM-D/A-12 8-channel AO PC/104 boards.</div><div class='ctx'> 	  Note that the board is not ISA-PNP capable and thus needs the I/O</div><div class='ctx'> 	  port comedi_config parameter.</div><div class='hunk'>@@ -526,7 +527,7 @@ config COMEDI_PCMDA12</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PCMMIO</div><div class='ctx'> 	tristate "Winsystems PCM-MIO PC/104 board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Winsystems PCM-MIO multifunction PC/104 boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -534,7 +535,7 @@ config COMEDI_PCMMIO</div><div class='ctx'> </div><div class='ctx'> config COMEDI_PCMUIO</div><div class='ctx'> 	tristate "Winsystems PCM-UIO48A and PCM-UIO96A PC/104 board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for PCM-UIO48A and PCM-UIO96A PC/104 boards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -542,7 +543,7 @@ config COMEDI_PCMUIO</div><div class='ctx'> </div><div class='ctx'> config COMEDI_MULTIQ3</div><div class='ctx'> 	tristate "Quanser Consulting MultiQ-3 ISA card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Quanser Consulting MultiQ-3 ISA cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -550,7 +551,7 @@ config COMEDI_MULTIQ3</div><div class='ctx'> </div><div class='ctx'> config COMEDI_S526</div><div class='ctx'> 	tristate "Sensoray s526 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Sensoray s526</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -561,7 +562,7 @@ endif # COMEDI_ISA_DRIVERS</div><div class='ctx'> menuconfig COMEDI_PCI_DRIVERS</div><div class='ctx'> 	tristate "Comedi PCI drivers"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for comedi PCI drivers.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this support as a module, choose M here: the module will</div><div class='hunk'>@@ -572,7 +573,7 @@ if COMEDI_PCI_DRIVERS</div><div class='ctx'> config COMEDI_8255_PCI</div><div class='ctx'> 	tristate "Generic PCI based 8255 digital i/o board support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for PCI based 8255 digital i/o boards. This driver</div><div class='ctx'> 	  provides a PCI wrapper around the generic 8255 driver.</div><div class='ctx'> </div><div class='hunk'>@@ -588,14 +589,14 @@ config COMEDI_8255_PCI</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADDI_WATCHDOG</div><div class='ctx'> 	tristate</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Provides support for the watchdog subdevice found on many ADDI-DATA</div><div class='ctx'> 	  boards. This module will be automatically selected when needed. The</div><div class='ctx'> 	  module will be called addi_watchdog.</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADDI_APCI_1032</div><div class='ctx'> 	tristate "ADDI-DATA APCI_1032 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_1032 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -603,7 +604,7 @@ config COMEDI_ADDI_APCI_1032</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADDI_APCI_1500</div><div class='ctx'> 	tristate "ADDI-DATA APCI_1500 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_1500 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -612,7 +613,7 @@ config COMEDI_ADDI_APCI_1500</div><div class='ctx'> config COMEDI_ADDI_APCI_1516</div><div class='ctx'> 	tristate "ADDI-DATA APCI-1016/1516/2016 support"</div><div class='ctx'> 	select COMEDI_ADDI_WATCHDOG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI-1016, APCI-1516 and APCI-2016 boards.</div><div class='ctx'> 	  These are 16 channel, optically isolated, digital I/O boards. The 1516</div><div class='ctx'> 	  and 2016 boards also have a watchdog for resetting the outputs to "0".</div><div class='hunk'>@@ -623,7 +624,7 @@ config COMEDI_ADDI_APCI_1516</div><div class='ctx'> config COMEDI_ADDI_APCI_1564</div><div class='ctx'> 	tristate "ADDI-DATA APCI_1564 support"</div><div class='ctx'> 	select COMEDI_ADDI_WATCHDOG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_1564 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -631,7 +632,7 @@ config COMEDI_ADDI_APCI_1564</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADDI_APCI_16XX</div><div class='ctx'> 	tristate "ADDI-DATA APCI_16xx support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_16xx cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -640,7 +641,7 @@ config COMEDI_ADDI_APCI_16XX</div><div class='ctx'> config COMEDI_ADDI_APCI_2032</div><div class='ctx'> 	tristate "ADDI-DATA APCI_2032 support"</div><div class='ctx'> 	select COMEDI_ADDI_WATCHDOG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_2032 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -649,7 +650,7 @@ config COMEDI_ADDI_APCI_2032</div><div class='ctx'> config COMEDI_ADDI_APCI_2200</div><div class='ctx'> 	tristate "ADDI-DATA APCI_2200 support"</div><div class='ctx'> 	select COMEDI_ADDI_WATCHDOG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_2200 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -658,7 +659,7 @@ config COMEDI_ADDI_APCI_2200</div><div class='ctx'> config COMEDI_ADDI_APCI_3120</div><div class='ctx'> 	tristate "ADDI-DATA APCI_3120/3001 support"</div><div class='ctx'> 	depends on HAS_DMA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_3120/3001 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -666,7 +667,7 @@ config COMEDI_ADDI_APCI_3120</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADDI_APCI_3501</div><div class='ctx'> 	tristate "ADDI-DATA APCI_3501 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_3501 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -674,7 +675,7 @@ config COMEDI_ADDI_APCI_3501</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADDI_APCI_3XXX</div><div class='ctx'> 	tristate "ADDI-DATA APCI_3xxx support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADDI-DATA APCI_3xxx cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -682,7 +683,7 @@ config COMEDI_ADDI_APCI_3XXX</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADL_PCI6208</div><div class='ctx'> 	tristate "ADLink PCI-6208A support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADLink PCI-6208A cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -690,7 +691,7 @@ config COMEDI_ADL_PCI6208</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADL_PCI7X3X</div><div class='ctx'> 	tristate "ADLink PCI-723X/743X isolated digital i/o board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADlink PCI-723X/743X isolated digital i/o boards.</div><div class='ctx'> 	  Supported boards include the 32-channel PCI-7230 (16 in/16 out),</div><div class='ctx'> 	  PCI-7233 (32 in), and PCI-7234 (32 out) as well as the 64-channel</div><div class='hunk'>@@ -701,7 +702,7 @@ config COMEDI_ADL_PCI7X3X</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADL_PCI8164</div><div class='ctx'> 	tristate "ADLink PCI-8164 4 Axes Motion Control board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADlink PCI-8164 4 Axes Motion Control board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -710,7 +711,7 @@ config COMEDI_ADL_PCI8164</div><div class='ctx'> config COMEDI_ADL_PCI9111</div><div class='ctx'> 	tristate "ADLink PCI-9111HR support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADlink PCI9111 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -720,7 +721,7 @@ config COMEDI_ADL_PCI9118</div><div class='ctx'> 	tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support"</div><div class='ctx'> 	depends on HAS_DMA</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -729,7 +730,7 @@ config COMEDI_ADL_PCI9118</div><div class='ctx'> config COMEDI_ADV_PCI1710</div><div class='ctx'> 	tristate "Advantech PCI-171x and PCI-1731 support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711,</div><div class='ctx'> 	  PCI-1713 and PCI-1731</div><div class='ctx'> </div><div class='hunk'>@@ -738,7 +739,7 @@ config COMEDI_ADV_PCI1710</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADV_PCI1720</div><div class='ctx'> 	tristate "Advantech PCI-1720 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCI-1720 Analog Output board.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -746,7 +747,7 @@ config COMEDI_ADV_PCI1720</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADV_PCI1723</div><div class='ctx'> 	tristate "Advantech PCI-1723 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCI-1723 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -754,7 +755,7 @@ config COMEDI_ADV_PCI1723</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADV_PCI1724</div><div class='ctx'> 	tristate "Advantech PCI-1724U support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCI-1724U cards.  These are 32-channel</div><div class='ctx'> 	  analog output cards with voltage and current loop output ranges and</div><div class='ctx'> 	  14-bit resolution.</div><div class='hunk'>@@ -764,7 +765,7 @@ config COMEDI_ADV_PCI1724</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ADV_PCI1760</div><div class='ctx'> 	tristate "Advantech PCI-1760 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCI-1760 board.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -774,7 +775,7 @@ config COMEDI_ADV_PCI_DIO</div><div class='ctx'> 	tristate "Advantech PCI DIO card support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Advantech PCI DIO cards</div><div class='ctx'> 	  PCI-1730, PCI-1733, PCI-1734, PCI-1735U, PCI-1736UP, PCI-1739U,</div><div class='ctx'> 	  PCI-1750, PCI-1751, PCI-1752, PCI-1753/E, PCI-1754, PCI-1756,</div><div class='hunk'>@@ -786,7 +787,7 @@ config COMEDI_ADV_PCI_DIO</div><div class='ctx'> config COMEDI_AMPLC_DIO200_PCI</div><div class='ctx'> 	tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support"</div><div class='ctx'> 	select COMEDI_AMPLC_DIO200</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236</div><div class='ctx'> 	  and PCIe296 DIO boards.</div><div class='ctx'> </div><div class='hunk'>@@ -796,7 +797,7 @@ config COMEDI_AMPLC_DIO200_PCI</div><div class='ctx'> config COMEDI_AMPLC_PC236_PCI</div><div class='ctx'> 	tristate "Amplicon PCI236 DIO board support"</div><div class='ctx'> 	select COMEDI_AMPLC_PC236</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PCI236 DIO board.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -804,7 +805,7 @@ config COMEDI_AMPLC_PC236_PCI</div><div class='ctx'> </div><div class='ctx'> config COMEDI_AMPLC_PC263_PCI</div><div class='ctx'> 	tristate "Amplicon PCI263 relay board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PCI263 relay board.  This is a PCI board</div><div class='ctx'> 	  with 16 reed relay output channels.</div><div class='ctx'> </div><div class='hunk'>@@ -814,7 +815,7 @@ config COMEDI_AMPLC_PC263_PCI</div><div class='ctx'> config COMEDI_AMPLC_PCI224</div><div class='ctx'> 	tristate "Amplicon PCI224 and PCI234 support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PCI224 and PCI234 AO boards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -824,7 +825,7 @@ config COMEDI_AMPLC_PCI230</div><div class='ctx'> 	tristate "Amplicon PCI230 and PCI260 support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Amplicon PCI230 and PCI260 Multifunction I/O</div><div class='ctx'> 	  boards</div><div class='ctx'> </div><div class='hunk'>@@ -833,7 +834,7 @@ config COMEDI_AMPLC_PCI230</div><div class='ctx'> </div><div class='ctx'> config COMEDI_CONTEC_PCI_DIO</div><div class='ctx'> 	tristate "Contec PIO1616L digital I/O board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the Contec PIO1616L digital I/O board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -842,7 +843,7 @@ config COMEDI_CONTEC_PCI_DIO</div><div class='ctx'> config COMEDI_DAS08_PCI</div><div class='ctx'> 	tristate "DAS-08 PCI support"</div><div class='ctx'> 	select COMEDI_DAS08</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for PCI DAS-08 cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -850,7 +851,7 @@ config COMEDI_DAS08_PCI</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT3000</div><div class='ctx'> 	tristate "Data Translation DT3000 series support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Data Translation DT3000 series</div><div class='ctx'> 	  DT3001, DT3001-PGL, DT3002, DT3003, DT3003-PGL, DT3004, DT3005 and</div><div class='ctx'> 	  DT3004-200</div><div class='hunk'>@@ -860,7 +861,7 @@ config COMEDI_DT3000</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DYNA_PCI10XX</div><div class='ctx'> 	tristate "Dynalog PCI DAQ series support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Dynalog PCI DAQ series</div><div class='ctx'> 	  PCI-1050</div><div class='ctx'> </div><div class='hunk'>@@ -869,7 +870,7 @@ config COMEDI_DYNA_PCI10XX</div><div class='ctx'> </div><div class='ctx'> config COMEDI_GSC_HPDI</div><div class='ctx'> 	tristate "General Standards PCI-HPDI32 / PMC-HPDI32 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for General Standards Corporation high speed parallel</div><div class='ctx'> 	  digital interface rs485 boards PCI-HPDI32 and PMC-HPDI32.</div><div class='ctx'> 	  Only receive mode works, transmit not supported.</div><div class='hunk'>@@ -879,13 +880,13 @@ config COMEDI_GSC_HPDI</div><div class='ctx'> </div><div class='ctx'> config COMEDI_MF6X4</div><div class='ctx'> 	tristate "Humusoft MF634 and MF624 DAQ Card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports both Humusoft MF634 and MF624 Data acquisition</div><div class='ctx'> 	  cards. The legacy Humusoft MF614 card is not supported.</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ICP_MULTI</div><div class='ctx'> 	tristate "Inova ICP_MULTI support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Inova ICP_MULTI card</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -894,7 +895,7 @@ config COMEDI_ICP_MULTI</div><div class='ctx'> config COMEDI_DAQBOARD2000</div><div class='ctx'> 	tristate "IOtech DAQboard/2000 support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the IOtech DAQboard/2000</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -902,7 +903,7 @@ config COMEDI_DAQBOARD2000</div><div class='ctx'> </div><div class='ctx'> config COMEDI_JR3_PCI</div><div class='ctx'> 	tristate "JR3/PCI force sensor board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for JR3/PCI force sensor boards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -910,7 +911,7 @@ config COMEDI_JR3_PCI</div><div class='ctx'> </div><div class='ctx'> config COMEDI_KE_COUNTER</div><div class='ctx'> 	tristate "Kolter-Electronic PCI Counter 1 card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Kolter-Electronic PCI Counter 1 cards</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -919,7 +920,7 @@ config COMEDI_KE_COUNTER</div><div class='ctx'> config COMEDI_CB_PCIDAS64</div><div class='ctx'> 	tristate "MeasurementComputing PCI-DAS 64xx, 60xx, and 4020 support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ComputerBoards/MeasurementComputing PCI-DAS 64xx,</div><div class='ctx'> 	  60xx, and 4020 series with the PLX 9080 PCI controller</div><div class='ctx'> </div><div class='hunk'>@@ -930,7 +931,7 @@ config COMEDI_CB_PCIDAS</div><div class='ctx'> 	tristate "MeasurementComputing PCI-DAS support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ComputerBoards/MeasurementComputing PCI-DAS with</div><div class='ctx'> 	  AMCC S5933 PCIcontroller: PCI-DAS1602/16, PCI-DAS1602/16jr,</div><div class='ctx'> 	  PCI-DAS1602/12, PCI-DAS1200, PCI-DAS1200jr, PCI-DAS1000, PCI-DAS1001</div><div class='hunk'>@@ -942,7 +943,7 @@ config COMEDI_CB_PCIDAS</div><div class='ctx'> config COMEDI_CB_PCIDDA</div><div class='ctx'> 	tristate "MeasurementComputing PCI-DDA series support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ComputerBoards/MeasurementComputing PCI-DDA</div><div class='ctx'> 	  series: PCI-DDA08/12, PCI-DDA04/12, PCI-DDA02/12, PCI-DDA08/16,</div><div class='ctx'> 	  PCI-DDA04/16 and PCI-DDA02/16</div><div class='hunk'>@@ -954,7 +955,7 @@ config COMEDI_CB_PCIMDAS</div><div class='ctx'> 	tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ComputerBoards/MeasurementComputing PCI Migration</div><div class='ctx'> 	  series PCIM-DAS1602/16 and PCIe-DAS1602/16.</div><div class='ctx'> </div><div class='hunk'>@@ -964,7 +965,7 @@ config COMEDI_CB_PCIMDAS</div><div class='ctx'> config COMEDI_CB_PCIMDDA</div><div class='ctx'> 	tristate "MeasurementComputing PCIM-DDA06-16 support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for ComputerBoards/MeasurementComputing PCIM-DDA06-16</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -973,7 +974,7 @@ config COMEDI_CB_PCIMDDA</div><div class='ctx'> config COMEDI_ME4000</div><div class='ctx'> 	tristate "Meilhaus ME-4000 support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Meilhaus PCI data acquisition cards</div><div class='ctx'> 	  ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is</div><div class='ctx'> </div><div class='hunk'>@@ -982,7 +983,7 @@ config COMEDI_ME4000</div><div class='ctx'> </div><div class='ctx'> config COMEDI_ME_DAQ</div><div class='ctx'> 	tristate "Meilhaus ME-2000i, ME-2600i, ME-3000vm1 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Meilhaus PCI data acquisition cards</div><div class='ctx'> 	  ME-2000i, ME-2600i and ME-3000vm1</div><div class='ctx'> </div><div class='hunk'>@@ -991,7 +992,7 @@ config COMEDI_ME_DAQ</div><div class='ctx'> </div><div class='ctx'> config COMEDI_NI_6527</div><div class='ctx'> 	tristate "NI 6527 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the National Instruments 6527 PCI card</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -999,7 +1000,7 @@ config COMEDI_NI_6527</div><div class='ctx'> </div><div class='ctx'> config COMEDI_NI_65XX</div><div class='ctx'> 	tristate "NI 65xx static dio PCI card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments 65xx static dio boards.</div><div class='ctx'> 	  Supported devices: National Instruments PCI-6509 (ni_65xx),</div><div class='ctx'> 	  PXI-6509, PCI-6510, PCI-6511, PXI-6511, PCI-6512, PXI-6512, PCI-6513,</div><div class='hunk'>@@ -1013,7 +1014,7 @@ config COMEDI_NI_660X</div><div class='ctx'> 	tristate "NI 660x counter/timer PCI card support"</div><div class='ctx'> 	depends on HAS_DMA</div><div class='ctx'> 	select COMEDI_NI_TIOCMD</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments PCI-6601 (ni_660x), PCI-6602,</div><div class='ctx'> 	  PXI-6602, PXI-6608, PCI-6624, and PXI-6624.</div><div class='ctx'> </div><div class='hunk'>@@ -1022,7 +1023,7 @@ config COMEDI_NI_660X</div><div class='ctx'> </div><div class='ctx'> config COMEDI_NI_670X</div><div class='ctx'> 	tristate "NI 670x PCI card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments PCI-6703 and PCI-6704</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1031,7 +1032,7 @@ config COMEDI_NI_670X</div><div class='ctx'> config COMEDI_NI_LABPC_PCI</div><div class='ctx'> 	tristate "NI Lab-PC PCI-1200 support"</div><div class='ctx'> 	select COMEDI_NI_LABPC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments Lab-PC PCI-1200.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1042,7 +1043,7 @@ config COMEDI_NI_PCIDIO</div><div class='ctx'> 	depends on HAS_DMA</div><div class='ctx'> 	select COMEDI_MITE</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments PCI-DIO-32HS, PXI-6533,</div><div class='ctx'> 	  PCI-6533 and PCI-6534</div><div class='ctx'> </div><div class='hunk'>@@ -1054,7 +1055,7 @@ config COMEDI_NI_PCIMIO</div><div class='ctx'> 	depends on HAS_DMA</div><div class='ctx'> 	select COMEDI_NI_TIOCMD</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for National Instruments PCI-MIO-E series and M series</div><div class='ctx'> 	  (all boards): PCI-MIO-16XE-10, PXI-6030E, PCI-MIO-16E-1,</div><div class='ctx'> 	  PCI-MIO-16E-4, PCI-6014, PCI-6040E, PXI-6040E, PCI-6030E, PCI-6031E,</div><div class='hunk'>@@ -1074,7 +1075,7 @@ config COMEDI_NI_PCIMIO</div><div class='ctx'> config COMEDI_RTD520</div><div class='ctx'> 	tristate "Real Time Devices PCI4520/DM7520 support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Real Time Devices PCI4520/DM7520</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1082,7 +1083,7 @@ config COMEDI_RTD520</div><div class='ctx'> </div><div class='ctx'> config COMEDI_S626</div><div class='ctx'> 	tristate "Sensoray 626 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for Sensoray 626</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1103,7 +1104,7 @@ endif # COMEDI_PCI_DRIVERS</div><div class='ctx'> menuconfig COMEDI_PCMCIA_DRIVERS</div><div class='ctx'> 	tristate "Comedi PCMCIA drivers"</div><div class='ctx'> 	depends on PCMCIA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for comedi PCMCIA drivers.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this support as a module, choose M here: the module will</div><div class='hunk'>@@ -1114,7 +1115,7 @@ if COMEDI_PCMCIA_DRIVERS</div><div class='ctx'> config COMEDI_CB_DAS16_CS</div><div class='ctx'> 	tristate "CB DAS16 series PCMCIA support"</div><div class='ctx'> 	select COMEDI_8254</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the ComputerBoards/MeasurementComputing PCMCIA</div><div class='ctx'> 	  cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16</div><div class='ctx'> </div><div class='hunk'>@@ -1124,7 +1125,7 @@ config COMEDI_CB_DAS16_CS</div><div class='ctx'> config COMEDI_DAS08_CS</div><div class='ctx'> 	tristate "CB DAS08 PCMCIA support"</div><div class='ctx'> 	select COMEDI_DAS08</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the ComputerBoards/MeasurementComputing DAS-08</div><div class='ctx'> 	  PCMCIA card</div><div class='ctx'> </div><div class='hunk'>@@ -1133,7 +1134,7 @@ config COMEDI_DAS08_CS</div><div class='ctx'> </div><div class='ctx'> config COMEDI_NI_DAQ_700_CS</div><div class='ctx'> 	tristate "NI DAQCard-700 PCMCIA support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the National Instruments PCMCIA DAQCard-700 DIO</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1142,7 +1143,7 @@ config COMEDI_NI_DAQ_700_CS</div><div class='ctx'> config COMEDI_NI_DAQ_DIO24_CS</div><div class='ctx'> 	tristate "NI DAQ-Card DIO-24 PCMCIA support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the National Instruments PCMCIA DAQ-Card DIO-24</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1151,7 +1152,7 @@ config COMEDI_NI_DAQ_DIO24_CS</div><div class='ctx'> config COMEDI_NI_LABPC_CS</div><div class='ctx'> 	tristate "NI DAQCard-1200 PCMCIA support"</div><div class='ctx'> 	select COMEDI_NI_LABPC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the National Instruments PCMCIA DAQCard-1200</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1161,7 +1162,7 @@ config COMEDI_NI_MIO_CS</div><div class='ctx'> 	tristate "NI DAQCard E series PCMCIA support"</div><div class='ctx'> 	select COMEDI_NI_TIO</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the National Instruments PCMCIA DAQCard E series</div><div class='ctx'> 	  DAQCard-ai-16xe-50, DAQCard-ai-16e-4, DAQCard-6062E, DAQCard-6024E</div><div class='ctx'> 	  and DAQCard-6036E</div><div class='hunk'>@@ -1171,7 +1172,7 @@ config COMEDI_NI_MIO_CS</div><div class='ctx'> </div><div class='ctx'> config COMEDI_QUATECH_DAQP_CS</div><div class='ctx'> 	tristate "Quatech DAQP PCMCIA data capture card support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the Quatech DAQP PCMCIA data capture cards</div><div class='ctx'> 	  DAQP-208 and DAQP-308</div><div class='ctx'> </div><div class='hunk'>@@ -1183,7 +1184,7 @@ endif # COMEDI_PCMCIA_DRIVERS</div><div class='ctx'> menuconfig COMEDI_USB_DRIVERS</div><div class='ctx'> 	tristate "Comedi USB drivers"</div><div class='ctx'> 	depends on USB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for comedi USB drivers.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this support as a module, choose M here: the module will</div><div class='hunk'>@@ -1193,7 +1194,7 @@ if COMEDI_USB_DRIVERS</div><div class='ctx'> </div><div class='ctx'> config COMEDI_DT9812</div><div class='ctx'> 	tristate "DataTranslation DT9812 USB module support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the Data Translation DT9812 USB module</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1201,7 +1202,7 @@ config COMEDI_DT9812</div><div class='ctx'> </div><div class='ctx'> config COMEDI_NI_USB6501</div><div class='ctx'> 	tristate "NI USB-6501 support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the National Instruments USB-6501 module.</div><div class='ctx'> </div><div class='ctx'> 	  The NI USB-6501 is a Full-Speed USB 2.0 (12 Mbit/s) device that</div><div class='hunk'>@@ -1212,7 +1213,7 @@ config COMEDI_NI_USB6501</div><div class='ctx'> </div><div class='ctx'> config COMEDI_USBDUX</div><div class='ctx'> 	tristate "ITL USB-DUX-D support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the Incite Technology Ltd USB-DUX-D Board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1220,7 +1221,7 @@ config COMEDI_USBDUX</div><div class='ctx'> </div><div class='ctx'> config COMEDI_USBDUXFAST</div><div class='ctx'> 	tristate "ITL USB-DUXfast support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the Incite Technology Ltd USB-DUXfast Board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1228,7 +1229,7 @@ config COMEDI_USBDUXFAST</div><div class='ctx'> </div><div class='ctx'> config COMEDI_USBDUXSIGMA</div><div class='ctx'> 	tristate "ITL USB-DUXsigma support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for the Incite Technology Ltd USB-DUXsigma Board</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='hunk'>@@ -1236,7 +1237,7 @@ config COMEDI_USBDUXSIGMA</div><div class='ctx'> </div><div class='ctx'> config COMEDI_VMK80XX</div><div class='ctx'> 	tristate "Velleman VM110/VM140 USB Board support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Build the Velleman USB Board Low-Level Driver supporting the</div><div class='ctx'> 	  K8055/K8061 aka VM110/VM140 devices</div><div class='ctx'> </div><div class='hunk'>@@ -1254,7 +1255,7 @@ config COMEDI_8255</div><div class='ctx'> config COMEDI_8255_SA</div><div class='ctx'> 	tristate "Standalone 8255 support"</div><div class='ctx'> 	select COMEDI_8255</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable support for 8255 digital I/O as a standalone driver.</div><div class='ctx'> </div><div class='ctx'> 	  You should enable compilation this driver if you plan to use a board</div><div class='hunk'>@@ -1271,7 +1272,7 @@ config COMEDI_8255_SA</div><div class='ctx'> </div><div class='ctx'> config COMEDI_KCOMEDILIB</div><div class='ctx'> 	tristate "Comedi kcomedilib"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Build the kcomedilib.</div><div class='ctx'> </div><div class='ctx'> 	  This is a kernel module used to open and manipulate Comedi devices</div><div class='head'>diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c<br/>index f693c2c0bec3..d2c8cc72a99d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/comedi_buf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/comedi_buf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/comedi_buf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/comedi_buf.c</a></div><div class='hunk'>@@ -211,6 +211,8 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_async *async = s-&gt;async;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	/* Round up new_size to multiple of PAGE_SIZE */</div><div class='ctx'> 	new_size = (new_size + PAGE_SIZE - 1) &amp; PAGE_MASK;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c<br/>index 0caae4a5c471..f6d1287c7b83 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/comedi_fops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/comedi_fops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/comedi_fops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/comedi_fops.c</a></div><div class='hunk'>@@ -164,6 +164,7 @@ static bool comedi_clear_board_dev(struct comedi_device *dev)</div><div class='ctx'> 	unsigned int i = dev-&gt;minor;</div><div class='ctx'> 	bool cleared = false;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	mutex_lock(&amp;comedi_board_minor_table_lock);</div><div class='ctx'> 	if (dev == comedi_board_minor_table[i]) {</div><div class='ctx'> 		comedi_board_minor_table[i] = NULL;</div><div class='hunk'>@@ -260,6 +261,7 @@ comedi_read_subdevice(const struct comedi_device *dev, unsigned int minor)</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (minor &gt;= COMEDI_NUM_BOARD_MINORS) {</div><div class='ctx'> 		s = comedi_subdevice_from_minor(dev, minor);</div><div class='ctx'> 		if (!s || (s-&gt;subdev_flags &amp; SDF_CMD_READ))</div><div class='hunk'>@@ -273,6 +275,7 @@ comedi_write_subdevice(const struct comedi_device *dev, unsigned int minor)</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (minor &gt;= COMEDI_NUM_BOARD_MINORS) {</div><div class='ctx'> 		s = comedi_subdevice_from_minor(dev, minor);</div><div class='ctx'> 		if (!s || (s-&gt;subdev_flags &amp; SDF_CMD_WRITE))</div><div class='hunk'>@@ -336,6 +339,8 @@ static int resize_async_buffer(struct comedi_device *dev,</div><div class='ctx'> 	struct comedi_async *async = s-&gt;async;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	if (new_size &gt; async-&gt;max_bufsize)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='hunk'>@@ -726,6 +731,7 @@ static void do_become_nonbusy(struct comedi_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_async *async = s-&gt;async;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	comedi_update_subdevice_runflags(s, COMEDI_SRF_RUNNING, 0);</div><div class='ctx'> 	if (async) {</div><div class='ctx'> 		comedi_buf_reset(s);</div><div class='hunk'>@@ -745,6 +751,7 @@ static int do_cancel(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (comedi_is_subdevice_running(s) &amp;&amp; s-&gt;cancel)</div><div class='ctx'> 		ret = s-&gt;cancel(dev, s);</div><div class='ctx'> </div><div class='hunk'>@@ -758,6 +765,7 @@ void comedi_device_cancel_all(struct comedi_device *dev)</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (!dev-&gt;attached)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -773,6 +781,7 @@ static int is_device_busy(struct comedi_device *dev)</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (!dev-&gt;attached)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -805,6 +814,7 @@ static int do_devconfig_ioctl(struct comedi_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_devconfig it;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='hunk'>@@ -860,6 +870,7 @@ static int do_bufconfig_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (copy_from_user(&amp;bc, arg, sizeof(bc)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -920,6 +931,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> 	struct comedi_devinfo devinfo;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	memset(&amp;devinfo, 0, sizeof(devinfo));</div><div class='ctx'> </div><div class='ctx'> 	/* fill devinfo structure */</div><div class='hunk'>@@ -966,6 +978,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	struct comedi_subdinfo *tmp, *us;</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	tmp = kcalloc(dev-&gt;n_subdevices, sizeof(*tmp), GFP_KERNEL);</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1039,6 +1052,7 @@ static int do_chaninfo_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> 	struct comedi_chaninfo it;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (copy_from_user(&amp;it, arg, sizeof(it)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1098,6 +1112,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	bool become_nonbusy = false;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (copy_from_user(&amp;bi, arg, sizeof(bi)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1282,6 +1297,7 @@ static int check_insn_device_config_length(struct comedi_insn *insn,</div><div class='ctx'>  */</div><div class='ctx'> static int get_valid_routes(struct comedi_device *dev, unsigned int *data)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	data[1] = dev-&gt;get_valid_routes(dev, data[1], data + 2);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1293,6 +1309,7 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (insn-&gt;insn &amp; INSN_MASK_SPECIAL) {</div><div class='ctx'> 		/* a non-subdevice instruction */</div><div class='ctx'> </div><div class='hunk'>@@ -1513,6 +1530,7 @@ static int do_insnlist_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (copy_from_user(&amp;insnlist, arg, sizeof(insnlist)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1605,6 +1623,7 @@ static int do_insn_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int n_data = MIN_SAMPLES;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (copy_from_user(&amp;insn, arg, sizeof(insn)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -1655,6 +1674,7 @@ static int __comedi_get_user_cmd(struct comedi_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (copy_from_user(cmd, arg, sizeof(*cmd))) {</div><div class='ctx'> 		dev_dbg(dev-&gt;class_dev, "bad cmd address\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1713,6 +1733,7 @@ static int __comedi_get_user_chanlist(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int *chanlist;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	cmd-&gt;chanlist = NULL;</div><div class='ctx'> 	chanlist = memdup_user(user_chanlist,</div><div class='ctx'> 			       cmd-&gt;chanlist_len * sizeof(unsigned int));</div><div class='hunk'>@@ -1754,6 +1775,8 @@ static int do_cmd_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int __user *user_chanlist;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	/* get the user's cmd and do some simple validation */</div><div class='ctx'> 	ret = __comedi_get_user_cmd(dev, arg, &amp;cmd);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1861,6 +1884,8 @@ static int do_cmdtest_ioctl(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int __user *user_chanlist;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	/* get the user's cmd and do some simple validation */</div><div class='ctx'> 	ret = __comedi_get_user_cmd(dev, arg, &amp;cmd);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1914,6 +1939,7 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned long arg,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (arg &gt;= dev-&gt;n_subdevices)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	s = &amp;dev-&gt;subdevices[arg];</div><div class='hunk'>@@ -1946,6 +1972,7 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned long arg,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (arg &gt;= dev-&gt;n_subdevices)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	s = &amp;dev-&gt;subdevices[arg];</div><div class='hunk'>@@ -1980,6 +2007,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned long arg,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (arg &gt;= dev-&gt;n_subdevices)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	s = &amp;dev-&gt;subdevices[arg];</div><div class='hunk'>@@ -2013,6 +2041,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned long arg,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (arg &gt;= dev-&gt;n_subdevices)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	s = &amp;dev-&gt;subdevices[arg];</div><div class='hunk'>@@ -2048,6 +2077,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,</div><div class='ctx'> 	struct comedi_file *cfp = file-&gt;private_data;</div><div class='ctx'> 	struct comedi_subdevice *s_old, *s_new;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (arg &gt;= dev-&gt;n_subdevices)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2090,6 +2120,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,</div><div class='ctx'> 	struct comedi_file *cfp = file-&gt;private_data;</div><div class='ctx'> 	struct comedi_subdevice *s_old, *s_new;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (arg &gt;= dev-&gt;n_subdevices)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2995,6 +3026,7 @@ static int __init comedi_init(void)</div><div class='ctx'> 			goto out_cleanup_board_minors;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* comedi_alloc_board_minor() locked the mutex */</div><div class='add'>+		lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h<br/>index a7d569cfca5d..0dff1ac057cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/comedidev.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/comedidev.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/comedidev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/comedidev.h</a></div><div class='hunk'>@@ -1001,6 +1001,8 @@ int comedi_dio_insn_config(struct comedi_device *dev,</div><div class='ctx'> 			   unsigned int mask);</div><div class='ctx'> unsigned int comedi_dio_update_state(struct comedi_subdevice *s,</div><div class='ctx'> 				     unsigned int *data);</div><div class='add'>+unsigned int comedi_bytes_per_scan_cmd(struct comedi_subdevice *s,</div><div class='add'>+				       struct comedi_cmd *cmd);</div><div class='ctx'> unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s);</div><div class='ctx'> unsigned int comedi_nscans_left(struct comedi_subdevice *s,</div><div class='ctx'> 				unsigned int nscans);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c<br/>index eefa62f42c0f..750a6ff3c03c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers.c</a></div><div class='hunk'>@@ -159,6 +159,8 @@ static void comedi_device_detach_cleanup(struct comedi_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;attach_lock);</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (dev-&gt;subdevices) {</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;n_subdevices; i++) {</div><div class='ctx'> 			s = &amp;dev-&gt;subdevices[i];</div><div class='hunk'>@@ -196,6 +198,7 @@ static void comedi_device_detach_cleanup(struct comedi_device *dev)</div><div class='ctx'> </div><div class='ctx'> void comedi_device_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	comedi_device_cancel_all(dev);</div><div class='ctx'> 	down_write(&amp;dev-&gt;attach_lock);</div><div class='ctx'> 	dev-&gt;attached = false;</div><div class='hunk'>@@ -394,11 +397,13 @@ unsigned int comedi_dio_update_state(struct comedi_subdevice *s,</div><div class='ctx'> EXPORT_SYMBOL_GPL(comedi_dio_update_state);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * comedi_bytes_per_scan() - Get length of asynchronous command "scan" in bytes</div><div class='add'>+ * comedi_bytes_per_scan_cmd() - Get length of asynchronous command "scan" in</div><div class='add'>+ * bytes</div><div class='ctx'>  * @s: COMEDI subdevice.</div><div class='add'>+ * @cmd: COMEDI command.</div><div class='ctx'>  *</div><div class='ctx'>  * Determines the overall scan length according to the subdevice type and the</div><div class='del'>- * number of channels in the scan.</div><div class='add'>+ * number of channels in the scan for the specified command.</div><div class='ctx'>  *</div><div class='ctx'>  * For digital input, output or input/output subdevices, samples for</div><div class='ctx'>  * multiple channels are assumed to be packed into one or more unsigned</div><div class='hunk'>@@ -408,9 +413,9 @@ EXPORT_SYMBOL_GPL(comedi_dio_update_state);</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the overall scan length in bytes.</div><div class='ctx'>  */</div><div class='del'>-unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)</div><div class='add'>+unsigned int comedi_bytes_per_scan_cmd(struct comedi_subdevice *s,</div><div class='add'>+				       struct comedi_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct comedi_cmd *cmd = &amp;s-&gt;async-&gt;cmd;</div><div class='ctx'> 	unsigned int num_samples;</div><div class='ctx'> 	unsigned int bits_per_sample;</div><div class='ctx'> </div><div class='hunk'>@@ -427,6 +432,29 @@ unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)</div><div class='ctx'> 	}</div><div class='ctx'> 	return comedi_samples_to_bytes(s, num_samples);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(comedi_bytes_per_scan_cmd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * comedi_bytes_per_scan() - Get length of asynchronous command "scan" in bytes</div><div class='add'>+ * @s: COMEDI subdevice.</div><div class='add'>+ *</div><div class='add'>+ * Determines the overall scan length according to the subdevice type and the</div><div class='add'>+ * number of channels in the scan for the current command.</div><div class='add'>+ *</div><div class='add'>+ * For digital input, output or input/output subdevices, samples for</div><div class='add'>+ * multiple channels are assumed to be packed into one or more unsigned</div><div class='add'>+ * short or unsigned int values according to the subdevice's %SDF_LSAMPL</div><div class='add'>+ * flag.  For other types of subdevice, samples are assumed to occupy a</div><div class='add'>+ * whole unsigned short or unsigned int according to the %SDF_LSAMPL flag.</div><div class='add'>+ *</div><div class='add'>+ * Returns the overall scan length in bytes.</div><div class='add'>+ */</div><div class='add'>+unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)</div><div class='add'>+{</div><div class='add'>+	struct comedi_cmd *cmd = &amp;s-&gt;async-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	return comedi_bytes_per_scan_cmd(s, cmd);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(comedi_bytes_per_scan);</div><div class='ctx'> </div><div class='ctx'> static unsigned int __comedi_nscans_left(struct comedi_subdevice *s,</div><div class='hunk'>@@ -618,6 +646,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int buf_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if ((s-&gt;subdev_flags &amp; (SDF_CMD_READ | SDF_CMD_WRITE)) == 0) {</div><div class='ctx'> 		dev_warn(dev-&gt;class_dev,</div><div class='ctx'> 			 "async subdevices must support SDF_CMD_READ or SDF_CMD_WRITE\n");</div><div class='hunk'>@@ -665,6 +694,7 @@ static int __comedi_device_postconfig(struct comedi_device *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (!dev-&gt;insn_device_config)</div><div class='ctx'> 		dev-&gt;insn_device_config = insn_device_inval;</div><div class='ctx'> </div><div class='hunk'>@@ -722,6 +752,7 @@ static int comedi_device_postconfig(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	ret = __comedi_device_postconfig(dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -921,6 +952,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	struct comedi_driver *driv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (dev-&gt;attached)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='hunk'>@@ -1028,18 +1060,19 @@ int comedi_auto_config(struct device *hardware_device,</div><div class='ctx'> 		return PTR_ERR(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Note: comedi_alloc_board_minor() locked dev-&gt;mutex. */</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;driver = driver;</div><div class='ctx'> 	dev-&gt;board_name = dev-&gt;driver-&gt;driver_name;</div><div class='ctx'> 	ret = driver-&gt;auto_attach(dev, context);</div><div class='ctx'> 	if (ret &gt;= 0)</div><div class='ctx'> 		ret = comedi_device_postconfig(dev);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_warn(hardware_device,</div><div class='ctx'> 			 "driver '%s' failed to auto-configure device.\n",</div><div class='ctx'> 			 driver-&gt;driver_name);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 		comedi_release_hardware_device(hardware_device);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1049,6 +1082,7 @@ int comedi_auto_config(struct device *hardware_device,</div><div class='ctx'> 		dev_info(dev-&gt;class_dev,</div><div class='ctx'> 			 "driver '%s' has successfully auto-configured '%s'.\n",</div><div class='ctx'> 			 driver-&gt;driver_name, dev-&gt;board_name);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c<br/>index 6a93b04f1fdf..dbff0f7e7cf5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/adv_pci1710.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/adv_pci1710.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/adv_pci1710.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/adv_pci1710.c</a></div><div class='hunk'>@@ -317,7 +317,7 @@ static int pci1710_ai_read_sample(struct comedi_device *dev,</div><div class='ctx'> 		chan = sample &gt;&gt; 12;</div><div class='ctx'> 		if (chan != devpriv-&gt;act_chanlist[cur_chan]) {</div><div class='ctx'> 			dev_err(dev-&gt;class_dev,</div><div class='del'>-				"A/D data droput: received from channel %d, expected %d\n",</div><div class='add'>+				"A/D data dropout: received from channel %d, expected %d\n",</div><div class='ctx'> 				chan, devpriv-&gt;act_chanlist[cur_chan]);</div><div class='ctx'> 			return -ENODATA;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c<br/>index 08ffe26c5d43..65f60c2b702a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/amplc_pci230.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/amplc_pci230.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/amplc_pci230.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/amplc_pci230.c</a></div><div class='hunk'>@@ -2464,7 +2464,7 @@ static int pci230_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	devpriv-&gt;adcg = 0;</div><div class='ctx'> 	devpriv-&gt;adccon = PCI230_ADC_TRIG_NONE | PCI230_ADC_IM_SE |</div><div class='ctx'> 			  PCI230_ADC_IR_BIP;</div><div class='del'>-	outw(1 &lt;&lt; 0, devpriv-&gt;daqio + PCI230_ADCEN);</div><div class='add'>+	outw(BIT(0), devpriv-&gt;daqio + PCI230_ADCEN);</div><div class='ctx'> 	outw(devpriv-&gt;adcg, devpriv-&gt;daqio + PCI230_ADCG);</div><div class='ctx'> 	outw(devpriv-&gt;adccon | PCI230_ADC_FIFO_RESET,</div><div class='ctx'> 	     devpriv-&gt;daqio + PCI230_ADCCON);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/comedi_isadma.c b/drivers/staging/comedi/drivers/comedi_isadma.c<br/>index b77dc8d5d3ff..c729094298c2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/comedi_isadma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/comedi_isadma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/comedi_isadma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/comedi_isadma.c</a></div><div class='hunk'>@@ -172,6 +172,19 @@ struct comedi_isadma *comedi_isadma_alloc(struct comedi_device *dev,</div><div class='ctx'> 		goto no_dma;</div><div class='ctx'> 	dma-&gt;desc = desc;</div><div class='ctx'> 	dma-&gt;n_desc = n_desc;</div><div class='add'>+	if (dev-&gt;hw_dev) {</div><div class='add'>+		dma-&gt;dev = dev-&gt;hw_dev;</div><div class='add'>+	} else {</div><div class='add'>+		/* Fall back to using the "class" device. */</div><div class='add'>+		if (!dev-&gt;class_dev)</div><div class='add'>+			goto no_dma;</div><div class='add'>+		/* Need 24-bit mask for ISA DMA. */</div><div class='add'>+		if (dma_coerce_mask_and_coherent(dev-&gt;class_dev,</div><div class='add'>+						 DMA_BIT_MASK(24))) {</div><div class='add'>+			goto no_dma;</div><div class='add'>+		}</div><div class='add'>+		dma-&gt;dev = dev-&gt;class_dev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dma_chans[0] = dma_chan1;</div><div class='ctx'> 	if (dma_chan2 == 0 || dma_chan2 == dma_chan1)</div><div class='hunk'>@@ -192,7 +205,7 @@ struct comedi_isadma *comedi_isadma_alloc(struct comedi_device *dev,</div><div class='ctx'> 		desc = &amp;dma-&gt;desc[i];</div><div class='ctx'> 		desc-&gt;chan = dma_chans[i];</div><div class='ctx'> 		desc-&gt;maxsize = maxsize;</div><div class='del'>-		desc-&gt;virt_addr = dma_alloc_coherent(NULL, desc-&gt;maxsize,</div><div class='add'>+		desc-&gt;virt_addr = dma_alloc_coherent(dma-&gt;dev, desc-&gt;maxsize,</div><div class='ctx'> 						     &amp;desc-&gt;hw_addr,</div><div class='ctx'> 						     GFP_KERNEL);</div><div class='ctx'> 		if (!desc-&gt;virt_addr)</div><div class='hunk'>@@ -224,7 +237,7 @@ void comedi_isadma_free(struct comedi_isadma *dma)</div><div class='ctx'> 		for (i = 0; i &lt; dma-&gt;n_desc; i++) {</div><div class='ctx'> 			desc = &amp;dma-&gt;desc[i];</div><div class='ctx'> 			if (desc-&gt;virt_addr)</div><div class='del'>-				dma_free_coherent(NULL, desc-&gt;maxsize,</div><div class='add'>+				dma_free_coherent(dma-&gt;dev, desc-&gt;maxsize,</div><div class='ctx'> 						  desc-&gt;virt_addr,</div><div class='ctx'> 						  desc-&gt;hw_addr);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/comedi_isadma.h b/drivers/staging/comedi/drivers/comedi_isadma.h<br/>index 2bd1329d727f..9d2b12db7e6e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/comedi_isadma.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/comedi_isadma.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/comedi_isadma.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/comedi_isadma.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct comedi_device;</div><div class='add'>+struct device;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * These are used to avoid issues when &lt;asm/dma.h&gt; and the DMA_MODE_</div><div class='hunk'>@@ -38,6 +39,7 @@ struct comedi_isadma_desc {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct comedi_isadma - ISA DMA data</div><div class='add'>+ * @dev:	device to allocate non-coherent memory for</div><div class='ctx'>  * @desc:	cookie for each DMA buffer</div><div class='ctx'>  * @n_desc:	the number of cookies</div><div class='ctx'>  * @cur_dma:	the current cookie in use</div><div class='hunk'>@@ -45,6 +47,7 @@ struct comedi_isadma_desc {</div><div class='ctx'>  * @chan2:	the second DMA channel requested</div><div class='ctx'>  */</div><div class='ctx'> struct comedi_isadma {</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	struct comedi_isadma_desc *desc;</div><div class='ctx'> 	int n_desc;</div><div class='ctx'> 	int cur_dma;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c<br/>index 327ecf9aea30..65e5f2e6c122 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/das08.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/das08.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/das08.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/das08.c</a></div><div class='hunk'>@@ -236,9 +236,9 @@ static int das08_ai_insn_read(struct comedi_device *dev,</div><div class='ctx'> 			 * COMEDI 16-bit bipolar data value for 0V is 0x8000.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (msb &amp; 0x80)</div><div class='del'>-				data[n] = (1 &lt;&lt; 15) + magnitude;</div><div class='add'>+				data[n] = BIT(15) + magnitude;</div><div class='ctx'> 			else</div><div class='del'>-				data[n] = (1 &lt;&lt; 15) - magnitude;</div><div class='add'>+				data[n] = BIT(15) - magnitude;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_err(dev-&gt;class_dev, "bug! unknown ai encoding\n");</div><div class='ctx'> 			return -1;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c<br/>index 05207a519755..8a1f9efe7d4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/dt2811.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/dt2811.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/dt2811.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/dt2811.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #define DT2811_ADCSR_ADBUSY		BIT(5)	/* r      1=A/D busy */</div><div class='ctx'> #define DT2811_ADCSR_CLRERROR		BIT(4)</div><div class='ctx'> #define DT2811_ADCSR_DMAENB		BIT(3)	/* r/w    1=dma ena */</div><div class='del'>-#define DT2811_ADCSR_INTENB		BIT(2)	/* r/w    1=interupts ena */</div><div class='add'>+#define DT2811_ADCSR_INTENB		BIT(2)	/* r/w    1=interrupts ena */</div><div class='ctx'> #define DT2811_ADCSR_ADMODE(x)		(((x) &amp; 0x3) &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define DT2811_ADGCR_REG		0x01	/* r/w  A/D Gain/Channel */</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c<br/>index 9f165f1cefa5..634f57730c1e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/dt9812.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/dt9812.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/dt9812.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/dt9812.c</a></div><div class='hunk'>@@ -835,11 +835,8 @@ static void dt9812_detach(struct comedi_device *dev)</div><div class='ctx'> 	if (!devpriv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;devpriv-&gt;mut);</div><div class='del'>-</div><div class='add'>+	mutex_destroy(&amp;devpriv-&gt;mut);</div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;devpriv-&gt;mut);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct comedi_driver dt9812_driver = {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c<br/>index e50536731d11..c224422bb126 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/dyna_pci10xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/dyna_pci10xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/dyna_pci10xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/dyna_pci10xx.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ static int dyna_pci10xx_ai_eoc(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> </div><div class='ctx'> 	status = inw_p(dev-&gt;iobase);</div><div class='del'>-	if (status &amp; (1 &lt;&lt; 15))</div><div class='add'>+	if (status &amp; BIT(15))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='hunk'>@@ -106,10 +106,6 @@ static int dyna_pci10xx_insn_write_ao(struct comedi_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct dyna_pci10xx_private *devpriv = dev-&gt;private;</div><div class='ctx'> 	int n;</div><div class='del'>-	unsigned int chan, range;</div><div class='del'>-</div><div class='del'>-	chan = CR_CHAN(insn-&gt;chanspec);</div><div class='del'>-	range = range_codes_pci1050_ai[CR_RANGE((insn-&gt;chanspec))];</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;devpriv-&gt;mutex);</div><div class='ctx'> 	for (n = 0; n &lt; insn-&gt;n; n++) {</div><div class='hunk'>@@ -194,17 +190,15 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	s-&gt;n_chan = 16;</div><div class='ctx'> 	s-&gt;maxdata = 0x0FFF;</div><div class='ctx'> 	s-&gt;range_table = &amp;range_pci1050_ai;</div><div class='del'>-	s-&gt;len_chanlist = 16;</div><div class='ctx'> 	s-&gt;insn_read = dyna_pci10xx_insn_read_ai;</div><div class='ctx'> </div><div class='ctx'> 	/* analog output */</div><div class='ctx'> 	s = &amp;dev-&gt;subdevices[1];</div><div class='ctx'> 	s-&gt;type = COMEDI_SUBD_AO;</div><div class='ctx'> 	s-&gt;subdev_flags = SDF_WRITABLE;</div><div class='del'>-	s-&gt;n_chan = 16;</div><div class='add'>+	s-&gt;n_chan = 1;</div><div class='ctx'> 	s-&gt;maxdata = 0x0FFF;</div><div class='ctx'> 	s-&gt;range_table = &amp;range_unipolar10;</div><div class='del'>-	s-&gt;len_chanlist = 16;</div><div class='ctx'> 	s-&gt;insn_write = dyna_pci10xx_insn_write_ao;</div><div class='ctx'> </div><div class='ctx'> 	/* digital input */</div><div class='hunk'>@@ -214,7 +208,6 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	s-&gt;n_chan = 16;</div><div class='ctx'> 	s-&gt;maxdata = 1;</div><div class='ctx'> 	s-&gt;range_table = &amp;range_digital;</div><div class='del'>-	s-&gt;len_chanlist = 16;</div><div class='ctx'> 	s-&gt;insn_bits = dyna_pci10xx_di_insn_bits;</div><div class='ctx'> </div><div class='ctx'> 	/* digital output */</div><div class='hunk'>@@ -224,7 +217,6 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	s-&gt;n_chan = 16;</div><div class='ctx'> 	s-&gt;maxdata = 1;</div><div class='ctx'> 	s-&gt;range_table = &amp;range_digital;</div><div class='del'>-	s-&gt;len_chanlist = 16;</div><div class='ctx'> 	s-&gt;state = 0;</div><div class='ctx'> 	s-&gt;insn_bits = dyna_pci10xx_do_insn_bits;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c<br/>index 61e03ad84123..639ec1586976 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/mite.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/mite.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/mite.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/mite.c</a></div><div class='hunk'>@@ -371,7 +371,6 @@ static unsigned int mite_get_status(struct mite_channel *mite_chan)</div><div class='ctx'> 		writel(CHOR_CLRDONE,</div><div class='ctx'> 		       mite-&gt;mmio + MITE_CHOR(mite_chan-&gt;channel));</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mite-&gt;lock, flags);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -451,7 +450,6 @@ void mite_dma_arm(struct mite_channel *mite_chan)</div><div class='ctx'> 	mite_chan-&gt;done = 0;</div><div class='ctx'> 	/* arm */</div><div class='ctx'> 	writel(CHOR_START, mite-&gt;mmio + MITE_CHOR(mite_chan-&gt;channel));</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mite-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mite_dma_arm);</div><div class='hunk'>@@ -638,7 +636,6 @@ void mite_release_channel(struct mite_channel *mite_chan)</div><div class='ctx'> 		       CHCR_CLR_LC_IE | CHCR_CLR_CONT_RB_IE,</div><div class='ctx'> 		       mite-&gt;mmio + MITE_CHCR(mite_chan-&gt;channel));</div><div class='ctx'> 		mite_chan-&gt;ring = NULL;</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mite-&gt;lock, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c<br/>index 405573e927cf..4ee9b260eab0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_660x.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_660x.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_660x.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_660x.c</a></div><div class='hunk'>@@ -320,7 +320,6 @@ static inline void ni_660x_set_dma_channel(struct comedi_device *dev,</div><div class='ctx'> 	ni_660x_write(dev, chip, devpriv-&gt;dma_cfg[chip] |</div><div class='ctx'> 		      NI660X_DMA_CFG_RESET(mite_channel),</div><div class='ctx'> 		      NI660X_DMA_CFG);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ni_660x_unset_dma_channel(struct comedi_device *dev,</div><div class='hunk'>@@ -333,7 +332,6 @@ static inline void ni_660x_unset_dma_channel(struct comedi_device *dev,</div><div class='ctx'> 	devpriv-&gt;dma_cfg[chip] &amp;= ~NI660X_DMA_CFG_SEL_MASK(mite_channel);</div><div class='ctx'> 	devpriv-&gt;dma_cfg[chip] |= NI660X_DMA_CFG_SEL_NONE(mite_channel);</div><div class='ctx'> 	ni_660x_write(dev, chip, devpriv-&gt;dma_cfg[chip], NI660X_DMA_CFG);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ni_660x_request_mite_channel(struct comedi_device *dev,</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c<br/>index aad0b295ee2b..814895d01ffa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_at_ao.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_at_ao.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_at_ao.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_at_ao.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ static int atao_calib_insn_write(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		/* write the channel and last data value to the caldac */</div><div class='ctx'> 		/* clock the bitstring to the caldac; MSB -&gt; LSB */</div><div class='del'>-		for (bit = 1 &lt;&lt; 10; bit; bit &gt;&gt;= 1) {</div><div class='add'>+		for (bit = BIT(10); bit; bit &gt;&gt;= 1) {</div><div class='ctx'> 			bits = (bit &amp; bitstring) ? ATAO_CFG2_SDATA : 0;</div><div class='ctx'> </div><div class='ctx'> 			outw(bits, dev-&gt;iobase + ATAO_CFG2_REG);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c<br/>index b9e525b9beb9..81fd4c26a16f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_daq_700.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_daq_700.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_daq_700.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_daq_700.c</a></div><div class='hunk'>@@ -239,7 +239,7 @@ static int daq700_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	s-&gt;type = COMEDI_SUBD_AI;</div><div class='ctx'> 	s-&gt;subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;</div><div class='ctx'> 	s-&gt;n_chan = 16;</div><div class='del'>-	s-&gt;maxdata = (1 &lt;&lt; 12) - 1;</div><div class='add'>+	s-&gt;maxdata = BIT(12) - 1;</div><div class='ctx'> 	s-&gt;range_table = &amp;range_daq700_ai;</div><div class='ctx'> 	s-&gt;insn_read = daq700_ai_rinsn;</div><div class='ctx'> 	daq700_ai_config(dev, s);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c<br/>index 5edf59ac6706..c175227009f1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_mio_common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_mio_common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_mio_common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_mio_common.c</a></div><div class='hunk'>@@ -547,7 +547,6 @@ static inline void ni_set_bitfield(struct comedi_device *dev, int reg,</div><div class='ctx'> 			reg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;devpriv-&gt;soft_reg_copy_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2110,6 +2109,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;scan_begin_src == TRIG_TIMER) {</div><div class='ctx'> 		unsigned int tmp = cmd-&gt;scan_begin_arg;</div><div class='add'>+</div><div class='ctx'> 		cmd-&gt;scan_begin_arg =</div><div class='ctx'> 		    ni_timer_to_ns(dev, ni_ns_to_timer(dev,</div><div class='ctx'> 						       cmd-&gt;scan_begin_arg,</div><div class='hunk'>@@ -2120,6 +2120,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> 	if (cmd-&gt;convert_src == TRIG_TIMER) {</div><div class='ctx'> 		if (!devpriv-&gt;is_611x &amp;&amp; !devpriv-&gt;is_6143) {</div><div class='ctx'> 			unsigned int tmp = cmd-&gt;convert_arg;</div><div class='add'>+</div><div class='ctx'> 			cmd-&gt;convert_arg =</div><div class='ctx'> 			    ni_timer_to_ns(dev, ni_ns_to_timer(dev,</div><div class='ctx'> 							       cmd-&gt;convert_arg,</div><div class='hunk'>@@ -3545,6 +3546,7 @@ static int ni_cdio_cmdtest(struct comedi_device *dev,</div><div class='ctx'> 			   struct comedi_subdevice *s, struct comedi_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ni_private *devpriv = dev-&gt;private;</div><div class='add'>+	unsigned int bytes_per_scan;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Step 1 : check if triggers are trivially valid */</div><div class='hunk'>@@ -3579,9 +3581,12 @@ static int ni_cdio_cmdtest(struct comedi_device *dev,</div><div class='ctx'> 	err |= comedi_check_trigger_arg_is(&amp;cmd-&gt;convert_arg, 0);</div><div class='ctx'> 	err |= comedi_check_trigger_arg_is(&amp;cmd-&gt;scan_end_arg,</div><div class='ctx'> 					   cmd-&gt;chanlist_len);</div><div class='del'>-	err |= comedi_check_trigger_arg_max(&amp;cmd-&gt;stop_arg,</div><div class='del'>-					    s-&gt;async-&gt;prealloc_bufsz /</div><div class='del'>-					    comedi_bytes_per_scan(s));</div><div class='add'>+	bytes_per_scan = comedi_bytes_per_scan_cmd(s, cmd);</div><div class='add'>+	if (bytes_per_scan) {</div><div class='add'>+		err |= comedi_check_trigger_arg_max(&amp;cmd-&gt;stop_arg,</div><div class='add'>+						    s-&gt;async-&gt;prealloc_bufsz /</div><div class='add'>+						    bytes_per_scan);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return 3;</div><div class='hunk'>@@ -4394,9 +4399,13 @@ static int ni_calib_insn_write(struct comedi_device *dev,</div><div class='ctx'> 			       struct comedi_insn *insn,</div><div class='ctx'> 			       unsigned int *data)</div><div class='ctx'> {</div><div class='del'>-	ni_write_caldac(dev, CR_CHAN(insn-&gt;chanspec), data[0]);</div><div class='add'>+	if (insn-&gt;n) {</div><div class='add'>+		/* only bother writing the last sample to the channel */</div><div class='add'>+		ni_write_caldac(dev, CR_CHAN(insn-&gt;chanspec),</div><div class='add'>+				data[insn-&gt;n - 1]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return insn-&gt;n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ni_calib_insn_read(struct comedi_device *dev,</div><div class='hunk'>@@ -4405,10 +4414,12 @@ static int ni_calib_insn_read(struct comedi_device *dev,</div><div class='ctx'> 			      unsigned int *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ni_private *devpriv = dev-&gt;private;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	data[0] = devpriv-&gt;caldacs[CR_CHAN(insn-&gt;chanspec)];</div><div class='add'>+	for (i = 0; i &lt; insn-&gt;n; i++)</div><div class='add'>+		data[0] = devpriv-&gt;caldacs[CR_CHAN(insn-&gt;chanspec)];</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return insn-&gt;n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='hunk'>@@ -4501,9 +4512,15 @@ static int ni_eeprom_insn_read(struct comedi_device *dev,</div><div class='ctx'> 			       struct comedi_insn *insn,</div><div class='ctx'> 			       unsigned int *data)</div><div class='ctx'> {</div><div class='del'>-	data[0] = ni_read_eeprom(dev, CR_CHAN(insn-&gt;chanspec));</div><div class='add'>+	unsigned int val;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	if (insn-&gt;n) {</div><div class='add'>+		val = ni_read_eeprom(dev, CR_CHAN(insn-&gt;chanspec));</div><div class='add'>+		for (i = 0; i &lt; insn-&gt;n; i++)</div><div class='add'>+			data[i] = val;</div><div class='add'>+	}</div><div class='add'>+	return insn-&gt;n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ni_m_series_eeprom_insn_read(struct comedi_device *dev,</div><div class='hunk'>@@ -4512,10 +4529,12 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev,</div><div class='ctx'> 					unsigned int *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ni_private *devpriv = dev-&gt;private;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	data[0] = devpriv-&gt;eeprom_buffer[CR_CHAN(insn-&gt;chanspec)];</div><div class='add'>+	for (i = 0; i &lt; insn-&gt;n; i++)</div><div class='add'>+		data[i] = devpriv-&gt;eeprom_buffer[CR_CHAN(insn-&gt;chanspec)];</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return insn-&gt;n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int ni_old_get_pfi_routing(struct comedi_device *dev,</div><div class='hunk'>@@ -4780,7 +4799,7 @@ static int cs5529_do_conversion(struct comedi_device *dev,</div><div class='ctx'> 	if (data) {</div><div class='ctx'> 		*data = ni_ao_win_inw(dev, NI67XX_CAL_DATA_REG);</div><div class='ctx'> 		/* cs5529 returns 16 bit signed data in bipolar mode */</div><div class='del'>-		*data ^= (1 &lt;&lt; 15);</div><div class='add'>+		*data ^= BIT(15);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -6189,7 +6208,7 @@ static int ni_E_init(struct comedi_device *dev,</div><div class='ctx'> 		s-&gt;subdev_flags = SDF_READABLE | SDF_DIFF | SDF_INTERNAL;</div><div class='ctx'> 		/*  one channel for each analog output channel */</div><div class='ctx'> 		s-&gt;n_chan = board-&gt;n_aochan;</div><div class='del'>-		s-&gt;maxdata = (1 &lt;&lt; 16) - 1;</div><div class='add'>+		s-&gt;maxdata = BIT(16) - 1;</div><div class='ctx'> 		s-&gt;range_table = &amp;range_unknown;	/* XXX */</div><div class='ctx'> 		s-&gt;insn_read = cs5529_ai_insn_read;</div><div class='ctx'> 		s-&gt;insn_config = NULL;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c<br/>index 4bdef87d5dd7..8f3864799c19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_pcidio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_pcidio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_pcidio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_pcidio.c</a></div><div class='hunk'>@@ -310,7 +310,6 @@ static int ni_pcidio_request_di_mite_channel(struct comedi_device *dev)</div><div class='ctx'> 	writeb(primary_DMAChannel_bits(devpriv-&gt;di_mite_chan-&gt;channel) |</div><div class='ctx'> 	       secondary_DMAChannel_bits(devpriv-&gt;di_mite_chan-&gt;channel),</div><div class='ctx'> 	       dev-&gt;mmio + DMA_LINE_CONTROL_GROUP1);</div><div class='del'>-	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;devpriv-&gt;mite_channel_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -327,7 +326,6 @@ static void ni_pcidio_release_di_mite_channel(struct comedi_device *dev)</div><div class='ctx'> 		writeb(primary_DMAChannel_bits(0) |</div><div class='ctx'> 		       secondary_DMAChannel_bits(0),</div><div class='ctx'> 		       dev-&gt;mmio + DMA_LINE_CONTROL_GROUP1);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;devpriv-&gt;mite_channel_lock, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_routing/tools/Makefile b/drivers/staging/comedi/drivers/ni_routing/tools/Makefile<br/>index 1966850584d2..6e92a06a44cb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_routing/tools/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_routing/tools/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_routing/tools/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_routing/tools/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # this make file is simply to help autogenerate these files:</div><div class='ctx'> # 	ni_route_values.h</div><div class='ctx'> #	ni_device_routes.h</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c<br/>index 048cb35723ad..b264db32a411 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_tio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_tio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_tio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_tio.c</a></div><div class='hunk'>@@ -234,7 +234,6 @@ static void ni_tio_set_bits_transient(struct ni_gpct *counter,</div><div class='ctx'> 		regs[reg] &amp;= ~mask;</div><div class='ctx'> 		regs[reg] |= (value &amp; mask);</div><div class='ctx'> 		ni_tio_write(counter, regs[reg] | transient, reg);</div><div class='del'>-		mmiowb();</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;counter_dev-&gt;regs_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1682,9 +1681,11 @@ int ni_tio_insn_write(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int cidx = counter-&gt;counter_index;</div><div class='ctx'> 	unsigned int chip = counter-&gt;chip_index;</div><div class='ctx'> 	unsigned int load_reg;</div><div class='add'>+	unsigned int load_val;</div><div class='ctx'> </div><div class='ctx'> 	if (insn-&gt;n &lt; 1)</div><div class='ctx'> 		return 0;</div><div class='add'>+	load_val = data[insn-&gt;n - 1];</div><div class='ctx'> 	switch (channel) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1697,7 +1698,7 @@ int ni_tio_insn_write(struct comedi_device *dev,</div><div class='ctx'> 		 * load register is already selected.</div><div class='ctx'> 		 */</div><div class='ctx'> 		load_reg = ni_tio_next_load_register(counter);</div><div class='del'>-		ni_tio_write(counter, data[0], load_reg);</div><div class='add'>+		ni_tio_write(counter, load_val, load_reg);</div><div class='ctx'> 		ni_tio_set_bits_transient(counter, NITIO_CMD_REG(cidx),</div><div class='ctx'> 					  0, 0, GI_LOAD);</div><div class='ctx'> 		/* restore load reg */</div><div class='hunk'>@@ -1705,17 +1706,17 @@ int ni_tio_insn_write(struct comedi_device *dev,</div><div class='ctx'> 			     load_reg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		counter_dev-&gt;regs[chip][NITIO_LOADA_REG(cidx)] = data[0];</div><div class='del'>-		ni_tio_write(counter, data[0], NITIO_LOADA_REG(cidx));</div><div class='add'>+		counter_dev-&gt;regs[chip][NITIO_LOADA_REG(cidx)] = load_val;</div><div class='add'>+		ni_tio_write(counter, load_val, NITIO_LOADA_REG(cidx));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		counter_dev-&gt;regs[chip][NITIO_LOADB_REG(cidx)] = data[0];</div><div class='del'>-		ni_tio_write(counter, data[0], NITIO_LOADB_REG(cidx));</div><div class='add'>+		counter_dev-&gt;regs[chip][NITIO_LOADB_REG(cidx)] = load_val;</div><div class='add'>+		ni_tio_write(counter, load_val, NITIO_LOADB_REG(cidx));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return insn-&gt;n;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ni_tio_insn_write);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_usb6501.c b/drivers/staging/comedi/drivers/ni_usb6501.c<br/>index 808ed92ed66f..360e86a19fe3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_usb6501.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/ni_usb6501.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/ni_usb6501.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/ni_usb6501.c</a></div><div class='hunk'>@@ -463,10 +463,8 @@ static int ni6501_alloc_usb_buffers(struct comedi_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	size = usb_endpoint_maxp(devpriv-&gt;ep_tx);</div><div class='ctx'> 	devpriv-&gt;usb_tx_buf = kzalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!devpriv-&gt;usb_tx_buf) {</div><div class='del'>-		kfree(devpriv-&gt;usb_rx_buf);</div><div class='add'>+	if (!devpriv-&gt;usb_tx_buf)</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'>@@ -518,6 +516,9 @@ static int ni6501_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (!devpriv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;devpriv-&gt;mut);</div><div class='add'>+	usb_set_intfdata(intf, devpriv);</div><div class='add'>+</div><div class='ctx'> 	ret = ni6501_find_endpoints(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -526,9 +527,6 @@ static int ni6501_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;devpriv-&gt;mut);</div><div class='del'>-	usb_set_intfdata(intf, devpriv);</div><div class='del'>-</div><div class='ctx'> 	ret = comedi_alloc_subdevices(dev, 2);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -564,14 +562,12 @@ static void ni6501_detach(struct comedi_device *dev)</div><div class='ctx'> 	if (!devpriv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;devpriv-&gt;mut);</div><div class='add'>+	mutex_destroy(&amp;devpriv-&gt;mut);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> </div><div class='ctx'> 	kfree(devpriv-&gt;usb_rx_buf);</div><div class='ctx'> 	kfree(devpriv-&gt;usb_tx_buf);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;devpriv-&gt;mut);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct comedi_driver ni6501_driver = {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c<br/>index 257b0daff01f..6daaacf7a26a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/quatech_daqp_cs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/quatech_daqp_cs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/quatech_daqp_cs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/quatech_daqp_cs.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * quatech_daqp_cs.c</div><div class='ctx'>  * Quatech DAQP PCMCIA data capture cards COMEDI client driver</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c<br/>index f5af6f4069dc..39049d3c56d7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/s626.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/s626.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/s626.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/s626.c</a></div><div class='hunk'>@@ -108,7 +108,6 @@ static void s626_mc_enable(struct comedi_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val = (cmd &lt;&lt; 16) | cmd;</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='ctx'> 	writel(val, dev-&gt;mmio + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +115,6 @@ static void s626_mc_disable(struct comedi_device *dev,</div><div class='ctx'> 			    unsigned int cmd, unsigned int reg)</div><div class='ctx'> {</div><div class='ctx'> 	writel(cmd &lt;&lt; 16, dev-&gt;mmio + reg);</div><div class='del'>-	mmiowb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool s626_mc_test(struct comedi_device *dev,</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/tests/ni_routes_test.c b/drivers/staging/comedi/drivers/tests/ni_routes_test.c<br/>index c6dc18f346e8..f809051820ac 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/tests/ni_routes_test.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/tests/ni_routes_test.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/tests/ni_routes_test.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/tests/ni_routes_test.c</a></div><div class='hunk'>@@ -282,7 +282,7 @@ void test_ni_sort_device_routes(void)</div><div class='ctx'> </div><div class='ctx'> void test_ni_find_route_set(void)</div><div class='ctx'> {</div><div class='del'>-	unittest(ni_find_route_set(bad_dest, &amp;DR) == NULL,</div><div class='add'>+	unittest(!ni_find_route_set(bad_dest, &amp;DR),</div><div class='ctx'> 		 "check for nonexistent route_set\n");</div><div class='ctx'> 	unittest(ni_find_route_set(dest0, &amp;DR) == &amp;DR.routes[0],</div><div class='ctx'> 		 "find first route_set\n");</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c<br/>index de177418190f..b8f54b7fb34a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/usbdux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/usbdux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/usbdux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/usbdux.c</a></div><div class='hunk'>@@ -1691,6 +1691,8 @@ static void usbdux_detach(struct comedi_device *dev)</div><div class='ctx'> 	usbdux_free_usb_buffers(dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;devpriv-&gt;mut);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;devpriv-&gt;mut);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct comedi_driver usbdux_driver = {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c<br/>index 0d54f394dbd2..04bc488385e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/usbduxfast.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/usbduxfast.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/usbduxfast.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/usbduxfast.c</a></div><div class='hunk'>@@ -993,6 +993,8 @@ static void usbduxfast_detach(struct comedi_device *dev)</div><div class='ctx'> 	kfree(devpriv-&gt;duxbuf);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;devpriv-&gt;mut);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;devpriv-&gt;mut);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct comedi_driver usbduxfast_driver = {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c<br/>index af5605a875e2..3cc40d2544be 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/usbduxsigma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/usbduxsigma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/usbduxsigma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/usbduxsigma.c</a></div><div class='hunk'>@@ -1577,6 +1577,8 @@ static void usbduxsigma_detach(struct comedi_device *dev)</div><div class='ctx'> 	usbduxsigma_free_usb_buffers(dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;devpriv-&gt;mut);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;devpriv-&gt;mut);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct comedi_driver usbduxsigma_driver = {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c<br/>index 6234b649d887..65dc6c51037e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/vmk80xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/drivers/vmk80xx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/drivers/vmk80xx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/drivers/vmk80xx.c</a></div><div class='hunk'>@@ -682,10 +682,8 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	size = usb_endpoint_maxp(devpriv-&gt;ep_tx);</div><div class='ctx'> 	devpriv-&gt;usb_tx_buf = kzalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!devpriv-&gt;usb_tx_buf) {</div><div class='del'>-		kfree(devpriv-&gt;usb_rx_buf);</div><div class='add'>+	if (!devpriv-&gt;usb_tx_buf)</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'>@@ -800,6 +798,8 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	devpriv-&gt;model = board-&gt;model;</div><div class='ctx'> </div><div class='add'>+	sema_init(&amp;devpriv-&gt;limit_sem, 8);</div><div class='add'>+</div><div class='ctx'> 	ret = vmk80xx_find_usb_endpoints(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -808,8 +808,6 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	sema_init(&amp;devpriv-&gt;limit_sem, 8);</div><div class='del'>-</div><div class='ctx'> 	usb_set_intfdata(intf, devpriv);</div><div class='ctx'> </div><div class='ctx'> 	if (devpriv-&gt;model == VMK8055_MODEL)</div><div class='head'>diff --git a/drivers/staging/comedi/kcomedilib/Makefile b/drivers/staging/comedi/kcomedilib/Makefile<br/>index 3aff8ed08e2d..8031142a105f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/kcomedilib/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/comedi/kcomedilib/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/comedi/kcomedilib/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/comedi/kcomedilib/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> ccflags-$(CONFIG_COMEDI_DEBUG)		:= -DDEBUG</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_COMEDI_KCOMEDILIB)	+= kcomedilib.o</div><div class='head'>diff --git a/drivers/staging/emxx_udc/Kconfig b/drivers/staging/emxx_udc/Kconfig<br/>index e50e72218364..ad1478c53e9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/emxx_udc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/emxx_udc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/emxx_udc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/emxx_udc/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config USB_EMXX</div><div class='ctx'> 	tristate "EMXX USB Function Device Controller"</div><div class='ctx'> 	depends on USB_GADGET &amp;&amp; (ARCH_RENESAS || (ARM &amp;&amp; COMPILE_TEST))</div><div class='head'>diff --git a/drivers/staging/emxx_udc/Makefile b/drivers/staging/emxx_udc/Makefile<br/>index 6352724c0b57..569c5e9a9bae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/emxx_udc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/emxx_udc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/emxx_udc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/emxx_udc/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_USB_EMXX)	:= emxx_udc.o</div><div class='head'>diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c<br/>index a913d40f0801..4f3c2c13a225 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/emxx_udc/emxx_udc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/emxx_udc/emxx_udc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/emxx_udc/emxx_udc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/emxx_udc/emxx_udc.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ static void _nbu2ss_ep0_complete(struct usb_ep *_ep, struct usb_request *_req)</div><div class='ctx'> 	struct usb_ctrlrequest	*p_ctrl;</div><div class='ctx'> 	struct nbu2ss_udc *udc;</div><div class='ctx'> </div><div class='del'>-	if ((!_ep) || (!_req))</div><div class='add'>+	if (!_ep || !_req)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	udc = (struct nbu2ss_udc *)_req-&gt;context;</div><div class='hunk'>@@ -459,22 +459,22 @@ static void _nbu2ss_dma_map_single(struct nbu2ss_udc *udc,</div><div class='ctx'> 		if (req-&gt;unaligned) {</div><div class='ctx'> 			req-&gt;req.dma = ep-&gt;phys_buf;</div><div class='ctx'> 		} else {</div><div class='del'>-			req-&gt;req.dma = dma_map_single(</div><div class='del'>-				udc-&gt;gadget.dev.parent,</div><div class='del'>-				req-&gt;req.buf,</div><div class='del'>-				req-&gt;req.length,</div><div class='del'>-				(direct == USB_DIR_IN)</div><div class='del'>-				? DMA_TO_DEVICE : DMA_FROM_DEVICE);</div><div class='add'>+			req-&gt;req.dma = dma_map_single(udc-&gt;gadget.dev.parent,</div><div class='add'>+						      req-&gt;req.buf,</div><div class='add'>+						      req-&gt;req.length,</div><div class='add'>+						      (direct == USB_DIR_IN)</div><div class='add'>+						      ? DMA_TO_DEVICE</div><div class='add'>+						      : DMA_FROM_DEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> 		req-&gt;mapped = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!req-&gt;unaligned)</div><div class='del'>-			dma_sync_single_for_device(</div><div class='del'>-				udc-&gt;gadget.dev.parent,</div><div class='del'>-				req-&gt;req.dma,</div><div class='del'>-				req-&gt;req.length,</div><div class='del'>-				(direct == USB_DIR_IN)</div><div class='del'>-				? DMA_TO_DEVICE : DMA_FROM_DEVICE);</div><div class='add'>+			dma_sync_single_for_device(udc-&gt;gadget.dev.parent,</div><div class='add'>+						   req-&gt;req.dma,</div><div class='add'>+						   req-&gt;req.length,</div><div class='add'>+						   (direct == USB_DIR_IN)</div><div class='add'>+						   ? DMA_TO_DEVICE</div><div class='add'>+						   : DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		req-&gt;mapped = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -940,8 +940,8 @@ static int _nbu2ss_epn_out_transfer(struct nbu2ss_udc *udc,</div><div class='ctx'> </div><div class='ctx'> 	/*-------------------------------------------------------------*/</div><div class='ctx'> 	/* Receive Length */</div><div class='del'>-	i_recv_length</div><div class='del'>-		= _nbu2ss_readl(&amp;preg-&gt;EP_REGS[num].EP_LEN_DCNT) &amp; EPN_LDATA;</div><div class='add'>+	i_recv_length =</div><div class='add'>+		_nbu2ss_readl(&amp;preg-&gt;EP_REGS[num].EP_LEN_DCNT) &amp; EPN_LDATA;</div><div class='ctx'> </div><div class='ctx'> 	if (i_recv_length != 0) {</div><div class='ctx'> 		result = _nbu2ss_epn_out_data(udc, ep, req, i_recv_length);</div><div class='hunk'>@@ -1414,12 +1414,11 @@ static inline int _nbu2ss_req_feature(struct nbu2ss_udc *udc, bool bset)</div><div class='ctx'> 			if (selector == USB_ENDPOINT_HALT) {</div><div class='ctx'> 				ep_adrs = wIndex &amp; 0xFF;</div><div class='ctx'> 				if (!bset) {</div><div class='del'>-					_nbu2ss_endpoint_toggle_reset(</div><div class='del'>-						udc, ep_adrs);</div><div class='add'>+					_nbu2ss_endpoint_toggle_reset(udc,</div><div class='add'>+								      ep_adrs);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				_nbu2ss_set_endpoint_stall(</div><div class='del'>-					udc, ep_adrs, bset);</div><div class='add'>+				_nbu2ss_set_endpoint_stall(udc, ep_adrs, bset);</div><div class='ctx'> </div><div class='ctx'> 				result = 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1496,10 +1495,10 @@ static int std_req_get_status(struct nbu2ss_udc *udc)</div><div class='ctx'> 	case USB_RECIP_DEVICE:</div><div class='ctx'> 		if (udc-&gt;ctrl.wIndex == 0x0000) {</div><div class='ctx'> 			if (udc-&gt;gadget.is_selfpowered)</div><div class='del'>-				status_data |= (1 &lt;&lt; USB_DEVICE_SELF_POWERED);</div><div class='add'>+				status_data |= BIT(USB_DEVICE_SELF_POWERED);</div><div class='ctx'> </div><div class='ctx'> 			if (udc-&gt;remote_wakeup)</div><div class='del'>-				status_data |= (1 &lt;&lt; USB_DEVICE_REMOTE_WAKEUP);</div><div class='add'>+				status_data |= BIT(USB_DEVICE_REMOTE_WAKEUP);</div><div class='ctx'> </div><div class='ctx'> 			result = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1511,7 +1510,7 @@ static int std_req_get_status(struct nbu2ss_udc *udc)</div><div class='ctx'> 			result = _nbu2ss_get_ep_stall(udc, ep_adrs);</div><div class='ctx'> </div><div class='ctx'> 			if (result &gt; 0)</div><div class='del'>-				status_data |= (1 &lt;&lt; USB_ENDPOINT_HALT);</div><div class='add'>+				status_data |= BIT(USB_ENDPOINT_HALT);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -2423,13 +2422,13 @@ static int nbu2ss_ep_enable(struct usb_ep *_ep,</div><div class='ctx'> 	struct nbu2ss_ep	*ep;</div><div class='ctx'> 	struct nbu2ss_udc	*udc;</div><div class='ctx'> </div><div class='del'>-	if ((!_ep) || (!desc)) {</div><div class='add'>+	if (!_ep || !desc) {</div><div class='ctx'> 		pr_err(" *** %s, bad param\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ep = container_of(_ep, struct nbu2ss_ep, ep);</div><div class='del'>-	if ((!ep-&gt;udc)) {</div><div class='add'>+	if (!ep-&gt;udc) {</div><div class='ctx'> 		pr_err(" *** %s, ep == NULL !!\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2545,7 +2544,7 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep,</div><div class='ctx'> 	int			result = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* catch various bogus parameters */</div><div class='del'>-	if ((!_ep) || (!_req)) {</div><div class='add'>+	if (!_ep || !_req) {</div><div class='ctx'> 		if (!_ep)</div><div class='ctx'> 			pr_err("udc: %s --- _ep == NULL\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -2595,9 +2594,9 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep,</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;unaligned) {</div><div class='ctx'> 		if (!ep-&gt;virt_buf)</div><div class='del'>-			ep-&gt;virt_buf = dma_alloc_coherent(</div><div class='del'>-				NULL, PAGE_SIZE,</div><div class='del'>-				&amp;ep-&gt;phys_buf, GFP_ATOMIC | GFP_DMA);</div><div class='add'>+			ep-&gt;virt_buf = dma_alloc_coherent(NULL, PAGE_SIZE,</div><div class='add'>+							  &amp;ep-&gt;phys_buf,</div><div class='add'>+							  GFP_ATOMIC | GFP_DMA);</div><div class='ctx'> 		if (ep-&gt;epnum &gt; 0)  {</div><div class='ctx'> 			if (ep-&gt;direct == USB_DIR_IN)</div><div class='ctx'> 				memcpy(ep-&gt;virt_buf, req-&gt;req.buf,</div><div class='hunk'>@@ -2647,7 +2646,7 @@ static int nbu2ss_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* catch various bogus parameters */</div><div class='del'>-	if ((!_ep) || (!_req)) {</div><div class='add'>+	if (!_ep || !_req) {</div><div class='ctx'> 		/* pr_err("%s, bad param(1)\n", __func__); */</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/erofs/Documentation/filesystems/erofs.txt b/drivers/staging/erofs/Documentation/filesystems/erofs.txt<br/>index 961ec4da7705..74cf84ac48a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/Documentation/filesystems/erofs.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/Documentation/filesystems/erofs.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/Documentation/filesystems/erofs.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/Documentation/filesystems/erofs.txt</a></div><div class='hunk'>@@ -60,6 +60,7 @@ fault_injection=%d     Enable fault injection in all supported types with</div><div class='ctx'>                        specified injection rate. Supported injection type:</div><div class='ctx'>                        Type_Name                Type_Value</div><div class='ctx'>                        FAULT_KMALLOC            0x000000001</div><div class='add'>+                       FAULT_READ_IO            0x000000002</div><div class='ctx'> (no)user_xattr         Setup Extended User Attributes. Note: xattr is enabled</div><div class='ctx'>                        by default if CONFIG_EROFS_FS_XATTR is selected.</div><div class='ctx'> (no)acl                Setup POSIX Access Control List. Note: acl is enabled</div><div class='head'>diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c<br/>index 526e0dbea5b5..746685f90564 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/data.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/data.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/data.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/data.c</a></div><div class='hunk'>@@ -17,12 +17,17 @@</div><div class='ctx'> </div><div class='ctx'> static inline void read_endio(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct super_block *const sb = bio-&gt;bi_private;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	const blk_status_t err = bio-&gt;bi_status;</div><div class='add'>+	blk_status_t err = bio-&gt;bi_status;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	if (time_to_inject(EROFS_SB(sb), FAULT_READ_IO)) {</div><div class='add'>+		erofs_show_injection_info(FAULT_READ_IO);</div><div class='add'>+		err = BLK_STS_IOERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		struct page *page = bvec-&gt;bv_page;</div><div class='ctx'> </div><div class='ctx'> 		/* page is already locked */</div><div class='hunk'>@@ -63,7 +68,7 @@ repeat:</div><div class='ctx'> 	if (!PageUptodate(page)) {</div><div class='ctx'> 		struct bio *bio;</div><div class='ctx'> </div><div class='del'>-		bio = erofs_grab_bio(sb, blkaddr, 1, read_endio, nofail);</div><div class='add'>+		bio = erofs_grab_bio(sb, blkaddr, 1, sb, read_endio, nofail);</div><div class='ctx'> 		if (IS_ERR(bio)) {</div><div class='ctx'> 			DBG_BUGON(nofail);</div><div class='ctx'> 			err = PTR_ERR(bio);</div><div class='hunk'>@@ -188,7 +193,8 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,</div><div class='ctx'> 					      unsigned int nblocks,</div><div class='ctx'> 					      bool ra)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct inode *const inode = mapping-&gt;host;</div><div class='add'>+	struct super_block *const sb = inode-&gt;i_sb;</div><div class='ctx'> 	erofs_off_t current_block = (erofs_off_t)page-&gt;index;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -280,9 +286,8 @@ submit_bio_retry:</div><div class='ctx'> 		if (nblocks &gt; BIO_MAX_PAGES)</div><div class='ctx'> 			nblocks = BIO_MAX_PAGES;</div><div class='ctx'> </div><div class='del'>-		bio = erofs_grab_bio(inode-&gt;i_sb,</div><div class='del'>-				     blknr, nblocks, read_endio, false);</div><div class='del'>-</div><div class='add'>+		bio = erofs_grab_bio(sb, blknr, nblocks, sb,</div><div class='add'>+				     read_endio, false);</div><div class='ctx'> 		if (IS_ERR(bio)) {</div><div class='ctx'> 			err = PTR_ERR(bio);</div><div class='ctx'> 			bio = NULL;</div><div class='hunk'>@@ -298,7 +303,7 @@ submit_bio_retry:</div><div class='ctx'> 	*last_block = current_block;</div><div class='ctx'> </div><div class='ctx'> 	/* shift in advance in case of it followed by too many gaps */</div><div class='del'>-	if (unlikely(bio-&gt;bi_vcnt &gt;= bio-&gt;bi_max_vecs)) {</div><div class='add'>+	if (bio-&gt;bi_iter.bi_size &gt;= bio-&gt;bi_max_vecs * PAGE_SIZE) {</div><div class='ctx'> 		/* err should reassign to 0 after submitting */</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		goto submit_bio_out;</div><div class='head'>diff --git a/drivers/staging/erofs/dir.c b/drivers/staging/erofs/dir.c<br/>index 829f7b12e0dc..9bbc68729c11 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/dir.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/dir.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/dir.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/dir.c</a></div><div class='hunk'>@@ -23,6 +23,21 @@ static const unsigned char erofs_filetype_table[EROFS_FT_MAX] = {</div><div class='ctx'> 	[EROFS_FT_SYMLINK]	= DT_LNK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void debug_one_dentry(unsigned char d_type, const char *de_name,</div><div class='add'>+			     unsigned int de_namelen)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_EROFS_FS_DEBUG</div><div class='add'>+	/* since the on-disk name could not have the trailing '\0' */</div><div class='add'>+	unsigned char dbg_namebuf[EROFS_NAME_LEN + 1];</div><div class='add'>+</div><div class='add'>+	memcpy(dbg_namebuf, de_name, de_namelen);</div><div class='add'>+	dbg_namebuf[de_namelen] = '\0';</div><div class='add'>+</div><div class='add'>+	debugln("found dirent %s de_len %u d_type %d", dbg_namebuf,</div><div class='add'>+		de_namelen, d_type);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int erofs_fill_dentries(struct dir_context *ctx,</div><div class='ctx'> 			       void *dentry_blk, unsigned int *ofs,</div><div class='ctx'> 			       unsigned int nameoff, unsigned int maxsize)</div><div class='hunk'>@@ -33,14 +48,10 @@ static int erofs_fill_dentries(struct dir_context *ctx,</div><div class='ctx'> 	de = dentry_blk + *ofs;</div><div class='ctx'> 	while (de &lt; end) {</div><div class='ctx'> 		const char *de_name;</div><div class='del'>-		int de_namelen;</div><div class='add'>+		unsigned int de_namelen;</div><div class='ctx'> 		unsigned char d_type;</div><div class='del'>-#ifdef CONFIG_EROFS_FS_DEBUG</div><div class='del'>-		unsigned int dbg_namelen;</div><div class='del'>-		unsigned char dbg_namebuf[EROFS_NAME_LEN];</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-		if (unlikely(de-&gt;file_type &lt; EROFS_FT_MAX))</div><div class='add'>+		if (de-&gt;file_type &lt; EROFS_FT_MAX)</div><div class='ctx'> 			d_type = erofs_filetype_table[de-&gt;file_type];</div><div class='ctx'> 		else</div><div class='ctx'> 			d_type = DT_UNKNOWN;</div><div class='hunk'>@@ -48,26 +59,20 @@ static int erofs_fill_dentries(struct dir_context *ctx,</div><div class='ctx'> 		nameoff = le16_to_cpu(de-&gt;nameoff);</div><div class='ctx'> 		de_name = (char *)dentry_blk + nameoff;</div><div class='ctx'> </div><div class='del'>-		de_namelen = unlikely(de + 1 &gt;= end) ?</div><div class='del'>-			/* last directory entry */</div><div class='del'>-			strnlen(de_name, maxsize - nameoff) :</div><div class='del'>-			le16_to_cpu(de[1].nameoff) - nameoff;</div><div class='add'>+		/* the last dirent in the block? */</div><div class='add'>+		if (de + 1 &gt;= end)</div><div class='add'>+			de_namelen = strnlen(de_name, maxsize - nameoff);</div><div class='add'>+		else</div><div class='add'>+			de_namelen = le16_to_cpu(de[1].nameoff) - nameoff;</div><div class='ctx'> </div><div class='ctx'> 		/* a corrupted entry is found */</div><div class='del'>-		if (unlikely(de_namelen &lt; 0)) {</div><div class='add'>+		if (unlikely(nameoff + de_namelen &gt; maxsize ||</div><div class='add'>+			     de_namelen &gt; EROFS_NAME_LEN)) {</div><div class='ctx'> 			DBG_BUGON(1);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EROFS_FS_DEBUG</div><div class='del'>-		dbg_namelen = min(EROFS_NAME_LEN - 1, de_namelen);</div><div class='del'>-		memcpy(dbg_namebuf, de_name, dbg_namelen);</div><div class='del'>-		dbg_namebuf[dbg_namelen] = '\0';</div><div class='del'>-</div><div class='del'>-		debugln("%s, found de_name %s de_len %d d_type %d", __func__,</div><div class='del'>-			dbg_namebuf, de_namelen, d_type);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+		debug_one_dentry(d_type, de_name, de_namelen);</div><div class='ctx'> 		if (!dir_emit(ctx, de_name, de_namelen,</div><div class='ctx'> 			      le64_to_cpu(de-&gt;nid), d_type))</div><div class='ctx'> 			/* stopped by some reason */</div><div class='head'>diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c<br/>index 924b8dfc7a8f..c7d3b815a798 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/inode.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/inode.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/inode.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/inode.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ static int read_inode(struct inode *inode, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(vi-&gt;data_mapping_mode &gt;= EROFS_INODE_LAYOUT_MAX)) {</div><div class='ctx'> 		errln("unknown data mapping mode %u of nid %llu",</div><div class='del'>-			vi-&gt;data_mapping_mode, vi-&gt;nid);</div><div class='add'>+		      vi-&gt;data_mapping_mode, vi-&gt;nid);</div><div class='ctx'> 		DBG_BUGON(1);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -38,7 +38,7 @@ static int read_inode(struct inode *inode, void *data)</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_mode = le16_to_cpu(v2-&gt;i_mode);</div><div class='ctx'> 		if (S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode) ||</div><div class='del'>-						S_ISLNK(inode-&gt;i_mode)) {</div><div class='add'>+		    S_ISLNK(inode-&gt;i_mode)) {</div><div class='ctx'> 			vi-&gt;raw_blkaddr = le32_to_cpu(v2-&gt;i_u.raw_blkaddr);</div><div class='ctx'> 		} else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode)) {</div><div class='ctx'> 			inode-&gt;i_rdev =</div><div class='hunk'>@@ -68,7 +68,7 @@ static int read_inode(struct inode *inode, void *data)</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_mode = le16_to_cpu(v1-&gt;i_mode);</div><div class='ctx'> 		if (S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode) ||</div><div class='del'>-						S_ISLNK(inode-&gt;i_mode)) {</div><div class='add'>+		    S_ISLNK(inode-&gt;i_mode)) {</div><div class='ctx'> 			vi-&gt;raw_blkaddr = le32_to_cpu(v1-&gt;i_u.raw_blkaddr);</div><div class='ctx'> 		} else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode)) {</div><div class='ctx'> 			inode-&gt;i_rdev =</div><div class='hunk'>@@ -92,7 +92,7 @@ static int read_inode(struct inode *inode, void *data)</div><div class='ctx'> 		inode-&gt;i_size = le32_to_cpu(v1-&gt;i_size);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		errln("unsupported on-disk inode version %u of nid %llu",</div><div class='del'>-			__inode_version(advise), vi-&gt;nid);</div><div class='add'>+		      __inode_version(advise), vi-&gt;nid);</div><div class='ctx'> 		DBG_BUGON(1);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -129,7 +129,7 @@ static int fill_inline_data(struct inode *inode, void *data,</div><div class='ctx'> 	if (S_ISLNK(inode-&gt;i_mode) &amp;&amp; inode-&gt;i_size &lt; PAGE_SIZE) {</div><div class='ctx'> 		char *lnk = erofs_kmalloc(sbi, inode-&gt;i_size + 1, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(lnk == NULL))</div><div class='add'>+		if (unlikely(!lnk))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		m_pofs += vi-&gt;inode_isize + vi-&gt;xattr_isize;</div><div class='hunk'>@@ -173,7 +173,7 @@ static int fill_inode(struct inode *inode, int isdir)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(page)) {</div><div class='ctx'> 		errln("failed to get inode (nid: %llu) page, err %ld",</div><div class='del'>-			vi-&gt;nid, PTR_ERR(page));</div><div class='add'>+		      vi-&gt;nid, PTR_ERR(page));</div><div class='ctx'> 		return PTR_ERR(page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -260,16 +260,18 @@ static inline struct inode *erofs_iget_locked(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct inode *erofs_iget(struct super_block *sb,</div><div class='del'>-	erofs_nid_t nid, bool isdir)</div><div class='add'>+			 erofs_nid_t nid,</div><div class='add'>+			 bool isdir)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = erofs_iget_locked(sb, nid);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(inode == NULL))</div><div class='add'>+	if (unlikely(!inode))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='ctx'> 		int err;</div><div class='ctx'> 		struct erofs_vnode *vi = EROFS_V(inode);</div><div class='add'>+</div><div class='ctx'> 		vi-&gt;nid = nid;</div><div class='ctx'> </div><div class='ctx'> 		err = fill_inode(inode, isdir);</div><div class='head'>diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h<br/>index e3bfde00c7d2..c47778b3fabd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/internal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/internal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/internal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/internal.h</a></div><div class='hunk'>@@ -44,11 +44,12 @@</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	FAULT_KMALLOC,</div><div class='add'>+	FAULT_READ_IO,</div><div class='ctx'> 	FAULT_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EROFS_FAULT_INJECTION</div><div class='del'>-extern char *erofs_fault_name[FAULT_MAX];</div><div class='add'>+extern const char *erofs_fault_name[FAULT_MAX];</div><div class='ctx'> #define IS_FAULT_SET(fi, type) ((fi)-&gt;inject_type &amp; (1 &lt;&lt; (type)))</div><div class='ctx'> </div><div class='ctx'> struct erofs_fault_info {</div><div class='hunk'>@@ -268,8 +269,15 @@ int erofs_try_to_free_cached_page(struct address_space *mapping,</div><div class='ctx'> 				  struct page *page);</div><div class='ctx'> </div><div class='ctx'> #define MNGD_MAPPING(sbi)	((sbi)-&gt;managed_cache-&gt;i_mapping)</div><div class='add'>+static inline bool erofs_page_is_managed(const struct erofs_sb_info *sbi,</div><div class='add'>+					 struct page *page)</div><div class='add'>+{</div><div class='add'>+	return page-&gt;mapping == MNGD_MAPPING(sbi);</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> #define MNGD_MAPPING(sbi)	(NULL)</div><div class='add'>+static inline bool erofs_page_is_managed(const struct erofs_sb_info *sbi,</div><div class='add'>+					 struct page *page) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_MAX_SYNC_DECOMPRESS_PAGES	3</div><div class='hunk'>@@ -460,7 +468,7 @@ static inline int z_erofs_map_blocks_iter(struct inode *inode,</div><div class='ctx'> /* data.c */</div><div class='ctx'> static inline struct bio *</div><div class='ctx'> erofs_grab_bio(struct super_block *sb,</div><div class='del'>-	       erofs_blk_t blkaddr, unsigned int nr_pages,</div><div class='add'>+	       erofs_blk_t blkaddr, unsigned int nr_pages, void *bi_private,</div><div class='ctx'> 	       bio_end_io_t endio, bool nofail)</div><div class='ctx'> {</div><div class='ctx'> 	const gfp_t gfp = GFP_NOIO;</div><div class='hunk'>@@ -469,7 +477,7 @@ erofs_grab_bio(struct super_block *sb,</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (nr_pages == 1) {</div><div class='ctx'> 			bio = bio_alloc(gfp | (nofail ? __GFP_NOFAIL : 0), 1);</div><div class='del'>-			if (unlikely(bio == NULL)) {</div><div class='add'>+			if (unlikely(!bio)) {</div><div class='ctx'> 				DBG_BUGON(nofail);</div><div class='ctx'> 				return ERR_PTR(-ENOMEM);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -477,11 +485,12 @@ erofs_grab_bio(struct super_block *sb,</div><div class='ctx'> 		}</div><div class='ctx'> 		bio = bio_alloc(gfp, nr_pages);</div><div class='ctx'> 		nr_pages /= 2;</div><div class='del'>-	} while (unlikely(bio == NULL));</div><div class='add'>+	} while (unlikely(!bio));</div><div class='ctx'> </div><div class='ctx'> 	bio-&gt;bi_end_io = endio;</div><div class='ctx'> 	bio_set_dev(bio, sb-&gt;s_bdev);</div><div class='ctx'> 	bio-&gt;bi_iter.bi_sector = (sector_t)blkaddr &lt;&lt; LOG_SECTORS_PER_BLOCK;</div><div class='add'>+	bio-&gt;bi_private = bi_private;</div><div class='ctx'> 	return bio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -565,7 +574,7 @@ static inline void *erofs_vmap(struct page **pages, unsigned int count)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		void *addr = vm_map_ram(pages, count, -1, PAGE_KERNEL);</div><div class='ctx'> 		/* retry two more times (totally 3 times) */</div><div class='del'>-		if (addr != NULL || ++i &gt;= 3)</div><div class='add'>+		if (addr || ++i &gt;= 3)</div><div class='ctx'> 			return addr;</div><div class='ctx'> 		vm_unmap_aliases();</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c<br/>index 3f4fa52c10fa..d8d9dc9dab43 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/namei.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/namei.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/namei.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/namei.c</a></div><div class='hunk'>@@ -211,7 +211,8 @@ int erofs_namei(struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> /* NOTE: i_mutex is already held by vfs */</div><div class='ctx'> static struct dentry *erofs_lookup(struct inode *dir,</div><div class='del'>-	struct dentry *dentry, unsigned int flags)</div><div class='add'>+				   struct dentry *dentry,</div><div class='add'>+				   unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	erofs_nid_t nid;</div><div class='head'>diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c<br/>index 15c784fba879..399847d21146 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/super.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/super.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/super.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/super.c</a></div><div class='hunk'>@@ -33,10 +33,11 @@ static void init_once(void *ptr)</div><div class='ctx'> static int __init erofs_init_inode_cache(void)</div><div class='ctx'> {</div><div class='ctx'> 	erofs_inode_cachep = kmem_cache_create("erofs_inode",</div><div class='del'>-		sizeof(struct erofs_vnode), 0,</div><div class='del'>-		SLAB_RECLAIM_ACCOUNT, init_once);</div><div class='add'>+					       sizeof(struct erofs_vnode), 0,</div><div class='add'>+					       SLAB_RECLAIM_ACCOUNT,</div><div class='add'>+					       init_once);</div><div class='ctx'> </div><div class='del'>-	return erofs_inode_cachep != NULL ? 0 : -ENOMEM;</div><div class='add'>+	return erofs_inode_cachep ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void erofs_exit_inode_cache(void)</div><div class='hunk'>@@ -49,7 +50,7 @@ static struct inode *alloc_inode(struct super_block *sb)</div><div class='ctx'> 	struct erofs_vnode *vi =</div><div class='ctx'> 		kmem_cache_alloc(erofs_inode_cachep, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (vi == NULL)</div><div class='add'>+	if (!vi)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* zero out everything except vfs_inode */</div><div class='hunk'>@@ -57,9 +58,8 @@ static struct inode *alloc_inode(struct super_block *sb)</div><div class='ctx'> 	return &amp;vi-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void i_callback(struct rcu_head *head)</div><div class='add'>+static void free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = container_of(head, struct inode, i_rcu);</div><div class='ctx'> 	struct erofs_vnode *vi = EROFS_V(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* be careful RCU symlink path (see ext4_inode_info-&gt;i_data)! */</div><div class='hunk'>@@ -71,11 +71,6 @@ static void i_callback(struct rcu_head *head)</div><div class='ctx'> 	kmem_cache_free(erofs_inode_cachep, vi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void destroy_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	call_rcu(&amp;inode-&gt;i_rcu, i_callback);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int superblock_read(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *sbi;</div><div class='hunk'>@@ -86,7 +81,7 @@ static int superblock_read(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	bh = sb_bread(sb, 0);</div><div class='ctx'> </div><div class='del'>-	if (bh == NULL) {</div><div class='add'>+	if (!bh) {</div><div class='ctx'> 		errln("cannot read erofs superblock");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -105,7 +100,7 @@ static int superblock_read(struct super_block *sb)</div><div class='ctx'> 	/* 9(512 bytes) + LOG_SECTORS_PER_BLOCK == LOG_BLOCK_SIZE */</div><div class='ctx'> 	if (unlikely(blkszbits != LOG_BLOCK_SIZE)) {</div><div class='ctx'> 		errln("blksize %u isn't supported on this platform",</div><div class='del'>-			1 &lt;&lt; blkszbits);</div><div class='add'>+		      1 &lt;&lt; blkszbits);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -121,7 +116,7 @@ static int superblock_read(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	if (1 &lt;&lt; (sbi-&gt;clusterbits - PAGE_SHIFT) &gt; Z_EROFS_CLUSTER_MAX_PAGES)</div><div class='ctx'> 		errln("clusterbits %u is not supported on this kernel",</div><div class='del'>-			sbi-&gt;clusterbits);</div><div class='add'>+		      sbi-&gt;clusterbits);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;root_nid = le16_to_cpu(layout-&gt;root_nid);</div><div class='hunk'>@@ -132,7 +127,7 @@ static int superblock_read(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;sb-&gt;s_uuid, layout-&gt;uuid, sizeof(layout-&gt;uuid));</div><div class='ctx'> 	memcpy(sbi-&gt;volume_name, layout-&gt;volume_name,</div><div class='del'>-		sizeof(layout-&gt;volume_name));</div><div class='add'>+	       sizeof(layout-&gt;volume_name));</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -141,8 +136,9 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EROFS_FAULT_INJECTION</div><div class='del'>-char *erofs_fault_name[FAULT_MAX] = {</div><div class='add'>+const char *erofs_fault_name[FAULT_MAX] = {</div><div class='ctx'> 	[FAULT_KMALLOC]		= "kmalloc",</div><div class='add'>+	[FAULT_READ_IO]		= "read IO error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,</div><div class='hunk'>@@ -239,7 +235,7 @@ static int parse_options(struct super_block *sb, char *options)</div><div class='ctx'> 	if (!options)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='add'>+	while ((p = strsep(&amp;options, ","))) {</div><div class='ctx'> 		int token;</div><div class='ctx'> </div><div class='ctx'> 		if (!*p)</div><div class='hunk'>@@ -313,7 +309,8 @@ static int managed_cache_releasepage(struct page *page, gfp_t gfp_mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void managed_cache_invalidatepage(struct page *page,</div><div class='del'>-	unsigned int offset, unsigned int length)</div><div class='add'>+					 unsigned int offset,</div><div class='add'>+					 unsigned int length)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned int stop = length + offset;</div><div class='ctx'> </div><div class='hunk'>@@ -336,7 +333,7 @@ static struct inode *erofs_init_managed_cache(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = new_inode(sb);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(inode == NULL))</div><div class='add'>+	if (unlikely(!inode))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	set_nlink(inode, 1);</div><div class='hunk'>@@ -352,7 +349,8 @@ static struct inode *erofs_init_managed_cache(struct super_block *sb)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int erofs_read_super(struct super_block *sb,</div><div class='del'>-	const char *dev_name, void *data, int silent)</div><div class='add'>+			    const char *dev_name,</div><div class='add'>+			    void *data, int silent)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct erofs_sb_info *sbi;</div><div class='hunk'>@@ -367,7 +365,7 @@ static int erofs_read_super(struct super_block *sb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sbi = kzalloc(sizeof(struct erofs_sb_info), GFP_KERNEL);</div><div class='del'>-	if (unlikely(sbi == NULL)) {</div><div class='add'>+	if (unlikely(!sbi)) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -424,21 +422,21 @@ static int erofs_read_super(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	if (!S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 		errln("rootino(nid %llu) is not a directory(i_mode %o)",</div><div class='del'>-			ROOT_NID(sbi), inode-&gt;i_mode);</div><div class='add'>+		      ROOT_NID(sbi), inode-&gt;i_mode);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 		goto err_iget;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_root = d_make_root(inode);</div><div class='del'>-	if (sb-&gt;s_root == NULL) {</div><div class='add'>+	if (!sb-&gt;s_root) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_iget;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* save the device name to sbi */</div><div class='ctx'> 	sbi-&gt;dev_name = __getname();</div><div class='del'>-	if (sbi-&gt;dev_name == NULL) {</div><div class='add'>+	if (!sbi-&gt;dev_name) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_devname;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -450,7 +448,7 @@ static int erofs_read_super(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	if (!silent)</div><div class='ctx'> 		infoln("mounted on %s with opts: %s.", dev_name,</div><div class='del'>-			(char *)data);</div><div class='add'>+		       (char *)data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * please add a label for each exit point and use</div><div class='hunk'>@@ -481,7 +479,7 @@ static void erofs_put_super(struct super_block *sb)</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* for cases which are failed in "read_super" */</div><div class='del'>-	if (sbi == NULL)</div><div class='add'>+	if (!sbi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(sb-&gt;s_magic != EROFS_SUPER_MAGIC);</div><div class='hunk'>@@ -515,7 +513,7 @@ struct erofs_mount_private {</div><div class='ctx'> </div><div class='ctx'> /* support mount_bdev() with options */</div><div class='ctx'> static int erofs_fill_super(struct super_block *sb,</div><div class='del'>-	void *_priv, int silent)</div><div class='add'>+			    void *_priv, int silent)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_mount_private *priv = _priv;</div><div class='ctx'> </div><div class='hunk'>@@ -635,7 +633,7 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> #endif</div><div class='ctx'> 	if (test_opt(sbi, FAULT_INJECTION))</div><div class='ctx'> 		seq_printf(seq, ",fault_injection=%u",</div><div class='del'>-			erofs_get_fault_rate(sbi));</div><div class='add'>+			   erofs_get_fault_rate(sbi));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -668,7 +666,7 @@ out:</div><div class='ctx'> const struct super_operations erofs_sops = {</div><div class='ctx'> 	.put_super = erofs_put_super,</div><div class='ctx'> 	.alloc_inode = alloc_inode,</div><div class='del'>-	.destroy_inode = destroy_inode,</div><div class='add'>+	.free_inode = free_inode,</div><div class='ctx'> 	.statfs = erofs_statfs,</div><div class='ctx'> 	.show_options = erofs_show_options,</div><div class='ctx'> 	.remount_fs = erofs_remount,</div><div class='head'>diff --git a/drivers/staging/erofs/unzip_pagevec.h b/drivers/staging/erofs/unzip_pagevec.h<br/>index 23856ba2742d..f37d8fd14771 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/unzip_pagevec.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/unzip_pagevec.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/unzip_pagevec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/unzip_pagevec.h</a></div><div class='hunk'>@@ -43,7 +43,7 @@ struct z_erofs_pagevec_ctor {</div><div class='ctx'> static inline void z_erofs_pagevec_ctor_exit(struct z_erofs_pagevec_ctor *ctor,</div><div class='ctx'> 					     bool atomic)</div><div class='ctx'> {</div><div class='del'>-	if (ctor-&gt;curr == NULL)</div><div class='add'>+	if (!ctor-&gt;curr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic)</div><div class='hunk'>@@ -59,7 +59,7 @@ z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor,</div><div class='ctx'> 	unsigned index;</div><div class='ctx'> </div><div class='ctx'> 	/* keep away from occupied pages */</div><div class='del'>-	if (ctor-&gt;next != NULL)</div><div class='add'>+	if (ctor-&gt;next)</div><div class='ctx'> 		return ctor-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; nr; ++index) {</div><div class='hunk'>@@ -121,7 +121,7 @@ z_erofs_pagevec_ctor_enqueue(struct z_erofs_pagevec_ctor *ctor,</div><div class='ctx'> 			     bool *occupied)</div><div class='ctx'> {</div><div class='ctx'> 	*occupied = false;</div><div class='del'>-	if (unlikely(ctor-&gt;next == NULL &amp;&amp; type))</div><div class='add'>+	if (unlikely(!ctor-&gt;next &amp;&amp; type))</div><div class='ctx'> 		if (ctor-&gt;index + 1 == ctor-&gt;nr)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c<br/>index 8715bc50e09c..9ecaa872bae8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/unzip_vle.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/unzip_vle.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/unzip_vle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/unzip_vle.c</a></div><div class='hunk'>@@ -313,12 +313,12 @@ static int z_erofs_vle_work_add_page(</div><div class='ctx'> </div><div class='ctx'> 	/* give priority for the compressed data storage */</div><div class='ctx'> 	if (builder-&gt;role &gt;= Z_EROFS_VLE_WORK_PRIMARY &amp;&amp;</div><div class='del'>-		type == Z_EROFS_PAGE_TYPE_EXCLUSIVE &amp;&amp;</div><div class='del'>-		try_to_reuse_as_compressed_page(builder, page))</div><div class='add'>+	    type == Z_EROFS_PAGE_TYPE_EXCLUSIVE &amp;&amp;</div><div class='add'>+	    try_to_reuse_as_compressed_page(builder, page))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = z_erofs_pagevec_ctor_enqueue(&amp;builder-&gt;vector,</div><div class='del'>-		page, type, &amp;occupied);</div><div class='add'>+					   page, type, &amp;occupied);</div><div class='ctx'> 	builder-&gt;work-&gt;vcnt += (unsigned int)ret;</div><div class='ctx'> </div><div class='ctx'> 	return ret ? 0 : -EAGAIN;</div><div class='hunk'>@@ -464,10 +464,9 @@ z_erofs_vle_work_register(const struct z_erofs_vle_work_finder *f,</div><div class='ctx'> 	grp-&gt;obj.index = f-&gt;idx;</div><div class='ctx'> 	grp-&gt;llen = map-&gt;m_llen;</div><div class='ctx'> </div><div class='del'>-	z_erofs_vle_set_workgrp_fmt(grp,</div><div class='del'>-		(map-&gt;m_flags &amp; EROFS_MAP_ZIPPED) ?</div><div class='del'>-			Z_EROFS_VLE_WORKGRP_FMT_LZ4 :</div><div class='del'>-			Z_EROFS_VLE_WORKGRP_FMT_PLAIN);</div><div class='add'>+	z_erofs_vle_set_workgrp_fmt(grp, (map-&gt;m_flags &amp; EROFS_MAP_ZIPPED) ?</div><div class='add'>+				    Z_EROFS_VLE_WORKGRP_FMT_LZ4 :</div><div class='add'>+				    Z_EROFS_VLE_WORKGRP_FMT_PLAIN);</div><div class='ctx'> </div><div class='ctx'> 	/* new workgrps have been claimed as type 1 */</div><div class='ctx'> 	WRITE_ONCE(grp-&gt;next, *f-&gt;owned_head);</div><div class='hunk'>@@ -554,7 +553,8 @@ repeat:</div><div class='ctx'> 		return PTR_ERR(work);</div><div class='ctx'> got_it:</div><div class='ctx'> 	z_erofs_pagevec_ctor_init(&amp;builder-&gt;vector,</div><div class='del'>-		Z_EROFS_VLE_INLINE_PAGEVECS, work-&gt;pagevec, work-&gt;vcnt);</div><div class='add'>+				  Z_EROFS_VLE_INLINE_PAGEVECS,</div><div class='add'>+				  work-&gt;pagevec, work-&gt;vcnt);</div><div class='ctx'> </div><div class='ctx'> 	if (builder-&gt;role &gt;= Z_EROFS_VLE_WORK_PRIMARY) {</div><div class='ctx'> 		/* enable possibly in-place decompression */</div><div class='hunk'>@@ -594,8 +594,9 @@ void erofs_workgroup_free_rcu(struct erofs_workgroup *grp)</div><div class='ctx'> 	call_rcu(&amp;work-&gt;rcu, z_erofs_rcu_callback);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __z_erofs_vle_work_release(struct z_erofs_vle_workgroup *grp,</div><div class='del'>-	struct z_erofs_vle_work *work __maybe_unused)</div><div class='add'>+static void</div><div class='add'>+__z_erofs_vle_work_release(struct z_erofs_vle_workgroup *grp,</div><div class='add'>+			   struct z_erofs_vle_work *work __maybe_unused)</div><div class='ctx'> {</div><div class='ctx'> 	erofs_workgroup_put(&amp;grp-&gt;obj);</div><div class='ctx'> }</div><div class='hunk'>@@ -715,7 +716,7 @@ repeat:</div><div class='ctx'> </div><div class='ctx'> 	/* lucky, within the range of the current map_blocks */</div><div class='ctx'> 	if (offset + cur &gt;= map-&gt;m_la &amp;&amp;</div><div class='del'>-		offset + cur &lt; map-&gt;m_la + map-&gt;m_llen) {</div><div class='add'>+	    offset + cur &lt; map-&gt;m_la + map-&gt;m_llen) {</div><div class='ctx'> 		/* didn't get a valid unzip work previously (very rare) */</div><div class='ctx'> 		if (!builder-&gt;work)</div><div class='ctx'> 			goto restart_now;</div><div class='hunk'>@@ -781,8 +782,8 @@ retry:</div><div class='ctx'> 		struct page *const newpage =</div><div class='ctx'> 			__stagingpage_alloc(page_pool, GFP_NOFS);</div><div class='ctx'> </div><div class='del'>-		err = z_erofs_vle_work_add_page(builder,</div><div class='del'>-			newpage, Z_EROFS_PAGE_TYPE_EXCLUSIVE);</div><div class='add'>+		err = z_erofs_vle_work_add_page(builder, newpage,</div><div class='add'>+						Z_EROFS_PAGE_TYPE_EXCLUSIVE);</div><div class='ctx'> 		if (likely(!err))</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -843,35 +844,30 @@ static void z_erofs_vle_unzip_kickoff(void *ptr, int bios)</div><div class='ctx'> </div><div class='ctx'> static inline void z_erofs_vle_read_endio(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	const blk_status_t err = bio-&gt;bi_status;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	struct erofs_sb_info *sbi = NULL;</div><div class='add'>+	blk_status_t err = bio-&gt;bi_status;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-#ifdef EROFS_FS_HAS_MANAGED_CACHE</div><div class='del'>-	struct address_space *mc = NULL;</div><div class='del'>-#endif</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, i, iter_all) {</div><div class='add'>+	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='ctx'> 		struct page *page = bvec-&gt;bv_page;</div><div class='ctx'> 		bool cachemngd = false;</div><div class='ctx'> </div><div class='ctx'> 		DBG_BUGON(PageUptodate(page));</div><div class='ctx'> 		DBG_BUGON(!page-&gt;mapping);</div><div class='ctx'> </div><div class='del'>-#ifdef EROFS_FS_HAS_MANAGED_CACHE</div><div class='del'>-		if (unlikely(!mc &amp;&amp; !z_erofs_is_stagingpage(page))) {</div><div class='del'>-			struct inode *const inode = page-&gt;mapping-&gt;host;</div><div class='del'>-			struct super_block *const sb = inode-&gt;i_sb;</div><div class='add'>+		if (unlikely(!sbi &amp;&amp; !z_erofs_is_stagingpage(page))) {</div><div class='add'>+			sbi = EROFS_SB(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-			mc = MNGD_MAPPING(EROFS_SB(sb));</div><div class='add'>+			if (time_to_inject(sbi, FAULT_READ_IO)) {</div><div class='add'>+				erofs_show_injection_info(FAULT_READ_IO);</div><div class='add'>+				err = BLK_STS_IOERR;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If mc has not gotten, it equals NULL,</div><div class='del'>-		 * however, page-&gt;mapping never be NULL if working properly.</div><div class='del'>-		 */</div><div class='del'>-		cachemngd = (page-&gt;mapping == mc);</div><div class='del'>-#endif</div><div class='add'>+		/* sbi should already be gotten if the page is managed */</div><div class='add'>+		if (sbi)</div><div class='add'>+			cachemngd = erofs_page_is_managed(sbi, page);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			SetPageError(page);</div><div class='hunk'>@@ -890,8 +886,8 @@ static struct page *z_pagemap_global[Z_EROFS_VLE_VMAP_GLOBAL_PAGES];</div><div class='ctx'> static DEFINE_MUTEX(z_pagemap_global_lock);</div><div class='ctx'> </div><div class='ctx'> static int z_erofs_vle_unzip(struct super_block *sb,</div><div class='del'>-	struct z_erofs_vle_workgroup *grp,</div><div class='del'>-	struct list_head *page_pool)</div><div class='add'>+			     struct z_erofs_vle_workgroup *grp,</div><div class='add'>+			     struct list_head *page_pool)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *const sbi = EROFS_SB(sb);</div><div class='ctx'> 	const unsigned int clusterpages = erofs_clusterpages(sbi);</div><div class='hunk'>@@ -919,12 +915,12 @@ static int z_erofs_vle_unzip(struct super_block *sb,</div><div class='ctx'> 	if (likely(nr_pages &lt;= Z_EROFS_VLE_VMAP_ONSTACK_PAGES))</div><div class='ctx'> 		pages = pages_onstack;</div><div class='ctx'> 	else if (nr_pages &lt;= Z_EROFS_VLE_VMAP_GLOBAL_PAGES &amp;&amp;</div><div class='del'>-		mutex_trylock(&amp;z_pagemap_global_lock))</div><div class='add'>+		 mutex_trylock(&amp;z_pagemap_global_lock))</div><div class='ctx'> 		pages = z_pagemap_global;</div><div class='ctx'> 	else {</div><div class='ctx'> repeat:</div><div class='del'>-		pages = kvmalloc_array(nr_pages,</div><div class='del'>-			sizeof(struct page *), GFP_KERNEL);</div><div class='add'>+		pages = kvmalloc_array(nr_pages, sizeof(struct page *),</div><div class='add'>+				       GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		/* fallback to global pagemap for the lowmem scenario */</div><div class='ctx'> 		if (unlikely(!pages)) {</div><div class='hunk'>@@ -940,8 +936,8 @@ repeat:</div><div class='ctx'> 	for (i = 0; i &lt; nr_pages; ++i)</div><div class='ctx'> 		pages[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	z_erofs_pagevec_ctor_init(&amp;ctor,</div><div class='del'>-		Z_EROFS_VLE_INLINE_PAGEVECS, work-&gt;pagevec, 0);</div><div class='add'>+	z_erofs_pagevec_ctor_init(&amp;ctor, Z_EROFS_VLE_INLINE_PAGEVECS,</div><div class='add'>+				  work-&gt;pagevec, 0);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; work-&gt;vcnt; ++i) {</div><div class='ctx'> 		unsigned int pagenr;</div><div class='hunk'>@@ -972,6 +968,7 @@ repeat:</div><div class='ctx'> 	overlapped = false;</div><div class='ctx'> 	compressed_pages = grp-&gt;compressed_pages;</div><div class='ctx'> </div><div class='add'>+	err = 0;</div><div class='ctx'> 	for (i = 0; i &lt; clusterpages; ++i) {</div><div class='ctx'> 		unsigned int pagenr;</div><div class='ctx'> </div><div class='hunk'>@@ -981,31 +978,42 @@ repeat:</div><div class='ctx'> 		DBG_BUGON(!page);</div><div class='ctx'> 		DBG_BUGON(!page-&gt;mapping);</div><div class='ctx'> </div><div class='del'>-		if (z_erofs_is_stagingpage(page))</div><div class='del'>-			continue;</div><div class='del'>-#ifdef EROFS_FS_HAS_MANAGED_CACHE</div><div class='del'>-		if (page-&gt;mapping == MNGD_MAPPING(sbi)) {</div><div class='del'>-			DBG_BUGON(!PageUptodate(page));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='add'>+		if (!z_erofs_is_stagingpage(page)) {</div><div class='add'>+			if (erofs_page_is_managed(sbi, page)) {</div><div class='add'>+				if (unlikely(!PageUptodate(page)))</div><div class='add'>+					err = -EIO;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		/* only non-head page could be reused as a compressed page */</div><div class='del'>-		pagenr = z_erofs_onlinepage_index(page);</div><div class='add'>+			/*</div><div class='add'>+			 * only if non-head page can be selected</div><div class='add'>+			 * for inplace decompression</div><div class='add'>+			 */</div><div class='add'>+			pagenr = z_erofs_onlinepage_index(page);</div><div class='ctx'> </div><div class='del'>-		DBG_BUGON(pagenr &gt;= nr_pages);</div><div class='del'>-		DBG_BUGON(pages[pagenr]);</div><div class='del'>-		++sparsemem_pages;</div><div class='del'>-		pages[pagenr] = page;</div><div class='add'>+			DBG_BUGON(pagenr &gt;= nr_pages);</div><div class='add'>+			DBG_BUGON(pages[pagenr]);</div><div class='add'>+			++sparsemem_pages;</div><div class='add'>+			pages[pagenr] = page;</div><div class='add'>+</div><div class='add'>+			overlapped = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		overlapped = true;</div><div class='add'>+		/* PG_error needs checking for inplaced and staging pages */</div><div class='add'>+		if (unlikely(PageError(page))) {</div><div class='add'>+			DBG_BUGON(PageUptodate(page));</div><div class='add'>+			err = -EIO;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	llen = (nr_pages &lt;&lt; PAGE_SHIFT) - work-&gt;pageofs;</div><div class='ctx'> </div><div class='ctx'> 	if (z_erofs_vle_workgrp_fmt(grp) == Z_EROFS_VLE_WORKGRP_FMT_PLAIN) {</div><div class='ctx'> 		err = z_erofs_vle_plain_copy(compressed_pages, clusterpages,</div><div class='del'>-			pages, nr_pages, work-&gt;pageofs);</div><div class='add'>+					     pages, nr_pages, work-&gt;pageofs);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1029,9 +1037,13 @@ repeat:</div><div class='ctx'> </div><div class='ctx'> skip_allocpage:</div><div class='ctx'> 	vout = erofs_vmap(pages, nr_pages);</div><div class='add'>+	if (!vout) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = z_erofs_vle_unzip_vmap(compressed_pages,</div><div class='del'>-		clusterpages, vout, llen, work-&gt;pageofs, overlapped);</div><div class='add'>+	err = z_erofs_vle_unzip_vmap(compressed_pages, clusterpages, vout,</div><div class='add'>+				     llen, work-&gt;pageofs, overlapped);</div><div class='ctx'> </div><div class='ctx'> 	erofs_vunmap(vout, nr_pages);</div><div class='ctx'> </div><div class='hunk'>@@ -1040,10 +1052,9 @@ out:</div><div class='ctx'> 	for (i = 0; i &lt; clusterpages; ++i) {</div><div class='ctx'> 		page = compressed_pages[i];</div><div class='ctx'> </div><div class='del'>-#ifdef EROFS_FS_HAS_MANAGED_CACHE</div><div class='del'>-		if (page-&gt;mapping == MNGD_MAPPING(sbi))</div><div class='add'>+		if (erofs_page_is_managed(sbi, page))</div><div class='ctx'> 			continue;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 		/* recycle all individual staging pages */</div><div class='ctx'> 		(void)z_erofs_gather_if_stagingpage(page_pool, page);</div><div class='ctx'> </div><div class='hunk'>@@ -1194,6 +1205,7 @@ repeat:</div><div class='ctx'> 	if (page-&gt;mapping == mc) {</div><div class='ctx'> 		WRITE_ONCE(grp-&gt;compressed_pages[nr], page);</div><div class='ctx'> </div><div class='add'>+		ClearPageError(page);</div><div class='ctx'> 		if (!PagePrivate(page)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * impossible to be !PagePrivate(page) for</div><div class='hunk'>@@ -1427,10 +1439,8 @@ submit_bio_retry:</div><div class='ctx'> </div><div class='ctx'> 		if (!bio) {</div><div class='ctx'> 			bio = erofs_grab_bio(sb, first_index + i,</div><div class='del'>-					     BIO_MAX_PAGES,</div><div class='add'>+					     BIO_MAX_PAGES, bi_private,</div><div class='ctx'> 					     z_erofs_vle_read_endio, true);</div><div class='del'>-			bio-&gt;bi_private = bi_private;</div><div class='del'>-</div><div class='ctx'> 			++nr_bios;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1567,7 +1577,7 @@ static int z_erofs_vle_normalaccess_readpages(struct file *filp,</div><div class='ctx'> 			struct erofs_vnode *vi = EROFS_V(inode);</div><div class='ctx'> </div><div class='ctx'> 			errln("%s, readahead error at page %lu of nid %llu",</div><div class='del'>-				__func__, page-&gt;index, vi-&gt;nid);</div><div class='add'>+			      __func__, page-&gt;index, vi-&gt;nid);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		put_page(page);</div><div class='hunk'>@@ -1722,8 +1732,8 @@ vle_get_logical_extent_head(const struct vle_map_blocks_iter_ctx *ctx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int z_erofs_map_blocks_iter(struct inode *inode,</div><div class='del'>-	struct erofs_map_blocks *map,</div><div class='del'>-	int flags)</div><div class='add'>+			    struct erofs_map_blocks *map,</div><div class='add'>+			    int flags)</div><div class='ctx'> {</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	const struct vle_map_blocks_iter_ctx ctx = {</div><div class='hunk'>@@ -1830,7 +1840,7 @@ int z_erofs_map_blocks_iter(struct inode *inode,</div><div class='ctx'> 		/* logical cluster number should be &gt;= 1 */</div><div class='ctx'> 		if (unlikely(!lcn)) {</div><div class='ctx'> 			errln("invalid logical cluster 0 at nid %llu",</div><div class='del'>-				EROFS_V(inode)-&gt;nid);</div><div class='add'>+			      EROFS_V(inode)-&gt;nid);</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto unmap_out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1850,7 +1860,7 @@ int z_erofs_map_blocks_iter(struct inode *inode,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		errln("unknown cluster type %u at offset %llu of nid %llu",</div><div class='del'>-			cluster_type, ofs, EROFS_V(inode)-&gt;nid);</div><div class='add'>+		      cluster_type, ofs, EROFS_V(inode)-&gt;nid);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto unmap_out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/erofs/unzip_vle_lz4.c b/drivers/staging/erofs/unzip_vle_lz4.c<br/>index 48b263a2731a..0daac9b984a8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/unzip_vle_lz4.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/unzip_vle_lz4.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/unzip_vle_lz4.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/unzip_vle_lz4.c</a></div><div class='hunk'>@@ -136,10 +136,13 @@ int z_erofs_vle_unzip_fast_percpu(struct page **compressed_pages,</div><div class='ctx'> </div><div class='ctx'> 	nr_pages = DIV_ROUND_UP(outlen + pageofs, PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (clusterpages == 1)</div><div class='add'>+	if (clusterpages == 1) {</div><div class='ctx'> 		vin = kmap_atomic(compressed_pages[0]);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		vin = erofs_vmap(compressed_pages, clusterpages);</div><div class='add'>+		if (!vin)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	vout = erofs_pcpubuf[smp_processor_id()].data;</div><div class='head'>diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c<br/>index 5f61f99f4c10..3e7d30b6de1d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/utils.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ struct erofs_workgroup *erofs_find_workgroup(struct super_block *sb,</div><div class='ctx'> repeat:</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	grp = radix_tree_lookup(&amp;sbi-&gt;workstn_tree, index);</div><div class='del'>-	if (grp != NULL) {</div><div class='add'>+	if (grp) {</div><div class='ctx'> 		*tag = xa_pointer_tag(grp);</div><div class='ctx'> 		grp = xa_untag_pointer(grp);</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ repeat:</div><div class='ctx'> 	erofs_workstn_lock(sbi);</div><div class='ctx'> </div><div class='ctx'> 	found = radix_tree_gang_lookup(&amp;sbi-&gt;workstn_tree,</div><div class='del'>-		batch, first_index, PAGEVEC_SIZE);</div><div class='add'>+				       batch, first_index, PAGEVEC_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; found; ++i) {</div><div class='ctx'> 		struct erofs_workgroup *grp = xa_untag_pointer(batch[i]);</div><div class='head'>diff --git a/drivers/staging/erofs/xattr.c b/drivers/staging/erofs/xattr.c<br/>index f716ab0446e5..df40654b9fbb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/xattr.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/erofs/xattr.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/erofs/xattr.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/erofs/xattr.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ static inline void xattr_iter_end(struct xattr_iter *it, bool atomic)</div><div class='ctx'> </div><div class='ctx'> static inline void xattr_iter_end_final(struct xattr_iter *it)</div><div class='ctx'> {</div><div class='del'>-	if (it-&gt;page == NULL)</div><div class='add'>+	if (!it-&gt;page)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	xattr_iter_end(it, true);</div><div class='hunk'>@@ -107,7 +107,7 @@ static int init_inode_xattrs(struct inode *inode)</div><div class='ctx'> 	vi-&gt;xattr_shared_count = ih-&gt;h_shared_count;</div><div class='ctx'> 	vi-&gt;xattr_shared_xattrs = kmalloc_array(vi-&gt;xattr_shared_count,</div><div class='ctx'> 						sizeof(uint), GFP_KERNEL);</div><div class='del'>-	if (vi-&gt;xattr_shared_xattrs == NULL) {</div><div class='add'>+	if (!vi-&gt;xattr_shared_xattrs) {</div><div class='ctx'> 		xattr_iter_end(&amp;it, atomic_map);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -122,8 +122,8 @@ static int init_inode_xattrs(struct inode *inode)</div><div class='ctx'> 			BUG_ON(it.ofs != EROFS_BLKSIZ);</div><div class='ctx'> 			xattr_iter_end(&amp;it, atomic_map);</div><div class='ctx'> </div><div class='del'>-			it.page = erofs_get_meta_page(sb,</div><div class='del'>-				++it.blkaddr, S_ISDIR(inode-&gt;i_mode));</div><div class='add'>+			it.page = erofs_get_meta_page(sb, ++it.blkaddr,</div><div class='add'>+						      S_ISDIR(inode-&gt;i_mode));</div><div class='ctx'> 			if (IS_ERR(it.page)) {</div><div class='ctx'> 				kfree(vi-&gt;xattr_shared_xattrs);</div><div class='ctx'> 				vi-&gt;xattr_shared_xattrs = NULL;</div><div class='hunk'>@@ -187,7 +187,7 @@ static inline int xattr_iter_fixup(struct xattr_iter *it)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inline_xattr_iter_begin(struct xattr_iter *it,</div><div class='del'>-	struct inode *inode)</div><div class='add'>+				   struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_vnode *const vi = EROFS_V(inode);</div><div class='ctx'> 	struct erofs_sb_info *const sbi = EROFS_SB(inode-&gt;i_sb);</div><div class='hunk'>@@ -217,7 +217,8 @@ static int inline_xattr_iter_begin(struct xattr_iter *it,</div><div class='ctx'>  * `ofs' pointing to the next xattr item rather than an arbitrary position.</div><div class='ctx'>  */</div><div class='ctx'> static int xattr_foreach(struct xattr_iter *it,</div><div class='del'>-	const struct xattr_iter_handlers *op, unsigned int *tlimit)</div><div class='add'>+			 const struct xattr_iter_handlers *op,</div><div class='add'>+			 unsigned int *tlimit)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_xattr_entry entry;</div><div class='ctx'> 	unsigned int value_sz, processed, slice;</div><div class='hunk'>@@ -234,7 +235,7 @@ static int xattr_foreach(struct xattr_iter *it,</div><div class='ctx'> 	 *    therefore entry should be in the page</div><div class='ctx'> 	 */</div><div class='ctx'> 	entry = *(struct erofs_xattr_entry *)(it-&gt;kaddr + it-&gt;ofs);</div><div class='del'>-	if (tlimit != NULL) {</div><div class='add'>+	if (tlimit) {</div><div class='ctx'> 		unsigned int entry_sz = EROFS_XATTR_ENTRY_SIZE(&amp;entry);</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(*tlimit &lt; entry_sz);</div><div class='hunk'>@@ -281,7 +282,7 @@ static int xattr_foreach(struct xattr_iter *it,</div><div class='ctx'> 	/* 3. handle xattr value */</div><div class='ctx'> 	processed = 0;</div><div class='ctx'> </div><div class='del'>-	if (op-&gt;alloc_buffer != NULL) {</div><div class='add'>+	if (op-&gt;alloc_buffer) {</div><div class='ctx'> 		err = op-&gt;alloc_buffer(it, value_sz);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			it-&gt;ofs += value_sz;</div><div class='hunk'>@@ -321,7 +322,7 @@ struct getxattr_iter {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int xattr_entrymatch(struct xattr_iter *_it,</div><div class='del'>-	struct erofs_xattr_entry *entry)</div><div class='add'>+			    struct erofs_xattr_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);</div><div class='ctx'> </div><div class='hunk'>@@ -330,7 +331,7 @@ static int xattr_entrymatch(struct xattr_iter *_it,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xattr_namematch(struct xattr_iter *_it,</div><div class='del'>-	unsigned int processed, char *buf, unsigned int len)</div><div class='add'>+			   unsigned int processed, char *buf, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);</div><div class='ctx'> </div><div class='hunk'>@@ -338,17 +339,18 @@ static int xattr_namematch(struct xattr_iter *_it,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xattr_checkbuffer(struct xattr_iter *_it,</div><div class='del'>-	unsigned int value_sz)</div><div class='add'>+			     unsigned int value_sz)</div><div class='ctx'> {</div><div class='ctx'> 	struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);</div><div class='ctx'> 	int err = it-&gt;buffer_size &lt; value_sz ? -ERANGE : 0;</div><div class='ctx'> </div><div class='ctx'> 	it-&gt;buffer_size = value_sz;</div><div class='del'>-	return it-&gt;buffer == NULL ? 1 : err;</div><div class='add'>+	return !it-&gt;buffer ? 1 : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xattr_copyvalue(struct xattr_iter *_it,</div><div class='del'>-	unsigned int processed, char *buf, unsigned int len)</div><div class='add'>+			    unsigned int processed,</div><div class='add'>+			    char *buf, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct getxattr_iter *it = container_of(_it, struct getxattr_iter, it);</div><div class='ctx'> </div><div class='hunk'>@@ -429,13 +431,13 @@ static bool erofs_xattr_trusted_list(struct dentry *dentry)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int erofs_getxattr(struct inode *inode, int index,</div><div class='del'>-	const char *name,</div><div class='del'>-	void *buffer, size_t buffer_size)</div><div class='add'>+		   const char *name,</div><div class='add'>+		   void *buffer, size_t buffer_size)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct getxattr_iter it;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(name == NULL))</div><div class='add'>+	if (unlikely(!name))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = init_inode_xattrs(inode);</div><div class='hunk'>@@ -460,8 +462,8 @@ int erofs_getxattr(struct inode *inode, int index,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_xattr_generic_get(const struct xattr_handler *handler,</div><div class='del'>-		struct dentry *unused, struct inode *inode,</div><div class='del'>-		const char *name, void *buffer, size_t size)</div><div class='add'>+				   struct dentry *unused, struct inode *inode,</div><div class='add'>+				   const char *name, void *buffer, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *const sbi = EROFS_I_SB(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -527,7 +529,7 @@ struct listxattr_iter {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int xattr_entrylist(struct xattr_iter *_it,</div><div class='del'>-	struct erofs_xattr_entry *entry)</div><div class='add'>+			   struct erofs_xattr_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct listxattr_iter *it =</div><div class='ctx'> 		container_of(_it, struct listxattr_iter, it);</div><div class='hunk'>@@ -537,13 +539,13 @@ static int xattr_entrylist(struct xattr_iter *_it,</div><div class='ctx'> 	const struct xattr_handler *h =</div><div class='ctx'> 		erofs_xattr_handler(entry-&gt;e_name_index);</div><div class='ctx'> </div><div class='del'>-	if (h == NULL || (h-&gt;list != NULL &amp;&amp; !h-&gt;list(it-&gt;dentry)))</div><div class='add'>+	if (!h || (h-&gt;list &amp;&amp; !h-&gt;list(it-&gt;dentry)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	prefix = xattr_prefix(h);</div><div class='ctx'> 	prefix_len = strlen(prefix);</div><div class='ctx'> </div><div class='del'>-	if (it-&gt;buffer == NULL) {</div><div class='add'>+	if (!it-&gt;buffer) {</div><div class='ctx'> 		it-&gt;buffer_ofs += prefix_len + entry-&gt;e_name_len + 1;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -558,7 +560,7 @@ static int xattr_entrylist(struct xattr_iter *_it,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xattr_namelist(struct xattr_iter *_it,</div><div class='del'>-	unsigned int processed, char *buf, unsigned int len)</div><div class='add'>+			  unsigned int processed, char *buf, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct listxattr_iter *it =</div><div class='ctx'> 		container_of(_it, struct listxattr_iter, it);</div><div class='hunk'>@@ -569,7 +571,7 @@ static int xattr_namelist(struct xattr_iter *_it,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xattr_skipvalue(struct xattr_iter *_it,</div><div class='del'>-	unsigned int value_sz)</div><div class='add'>+			   unsigned int value_sz)</div><div class='ctx'> {</div><div class='ctx'> 	struct listxattr_iter *it =</div><div class='ctx'> 		container_of(_it, struct listxattr_iter, it);</div><div class='hunk'>@@ -641,7 +643,7 @@ static int shared_listxattr(struct listxattr_iter *it)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t erofs_listxattr(struct dentry *dentry,</div><div class='del'>-	char *buffer, size_t buffer_size)</div><div class='add'>+			char *buffer, size_t buffer_size)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct listxattr_iter it;</div><div class='head'>diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig<br/>index 84b2e7ebc024..8ec524a95ec8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menuconfig FB_TFT</div><div class='ctx'> 	tristate "Support for small TFT LCD display modules"</div><div class='ctx'> 	depends on FB &amp;&amp; SPI</div><div class='head'>diff --git a/drivers/staging/fbtft/fb_agm1264k-fl.c b/drivers/staging/fbtft/fb_agm1264k-fl.c<br/>index 8f27bd8da17d..eeeeec97ad27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_agm1264k-fl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_agm1264k-fl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_agm1264k-fl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fb_agm1264k-fl.c</a></div><div class='hunk'>@@ -383,7 +383,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)</div><div class='ctx'> 			/* select right side (sc1)</div><div class='ctx'> 			 * set addr</div><div class='ctx'> 			 */</div><div class='del'>-			write_reg(par, 0x01, 1 &lt;&lt; 6);</div><div class='add'>+			write_reg(par, 0x01, BIT(6));</div><div class='ctx'> 			write_reg(par, 0x01, (0x17 &lt;&lt; 3) | (u8)y);</div><div class='ctx'> </div><div class='ctx'> 			/* write bitmap */</div><div class='hunk'>@@ -406,7 +406,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)</div><div class='ctx'> static int write(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	gpiod_set_value(par-&gt;RW, 0); /* set write mode */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/fbtft/fb_ra8875.c b/drivers/staging/fbtft/fb_ra8875.c<br/>index 70b37fc7fb66..398bdbf53c9a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ra8875.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ra8875.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ra8875.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fb_ra8875.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@ static int write_spi(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> </div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!par-&gt;spi) {</div><div class='ctx'> 		dev_err(par-&gt;info-&gt;device,</div><div class='head'>diff --git a/drivers/staging/fbtft/fb_ssd1306.c b/drivers/staging/fbtft/fb_ssd1306.c<br/>index d7c5e2e0eee9..6cf9df579e88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ssd1306.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ssd1306.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ssd1306.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fb_ssd1306.c</a></div><div class='hunk'>@@ -184,7 +184,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)</div><div class='ctx'> 		for (y = 0; y &lt; yres / 8; y++) {</div><div class='ctx'> 			*buf = 0x00;</div><div class='ctx'> 			for (i = 0; i &lt; 8; i++)</div><div class='del'>-				*buf |= (vmem16[(y * 8 + i) * xres + x] ? 1 : 0) &lt;&lt; i;</div><div class='add'>+				if (vmem16[(y * 8 + i) * xres + x])</div><div class='add'>+					*buf |= BIT(i);</div><div class='ctx'> 			buf++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/fbtft/fb_ssd1331.c b/drivers/staging/fbtft/fb_ssd1331.c<br/>index 9f54fe28d511..4cfe9f8535d0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ssd1331.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ssd1331.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ssd1331.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fb_ssd1331.c</a></div><div class='hunk'>@@ -74,7 +74,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)</div><div class='ctx'> 		for (i = 0; i &lt; len; i++)</div><div class='ctx'> 			buf[i] = (u8)va_arg(args, unsigned int);</div><div class='ctx'> 		va_end(args);</div><div class='del'>-		fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par-&gt;info-&gt;device, u8, buf, len, "%s: ", __func__);</div><div class='add'>+		fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par-&gt;info-&gt;device,</div><div class='add'>+				  u8, buf, len, "%s: ", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	va_start(args, len);</div><div class='head'>diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c<br/>index 9ac78ce30619..900b28d826b2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ssd1351.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_ssd1351.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_ssd1351.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fb_ssd1351.c</a></div><div class='hunk'>@@ -81,10 +81,10 @@ static int set_var(struct fbtft_par *par)</div><div class='ctx'> </div><div class='ctx'> 	switch (par-&gt;info-&gt;var.rotate) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		write_reg(par, 0xA0, remap | 0x00 | 1 &lt;&lt; 4);</div><div class='add'>+		write_reg(par, 0xA0, remap | 0x00 | BIT(4));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 270:</div><div class='del'>-		write_reg(par, 0xA0, remap | 0x03 | 1 &lt;&lt; 4);</div><div class='add'>+		write_reg(par, 0xA0, remap | 0x03 | BIT(4));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 180:</div><div class='ctx'> 		write_reg(par, 0xA0, remap | 0x02);</div><div class='head'>diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c<br/>index 0a5206d28da4..27cc8eabcbe9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_watterott.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fb_watterott.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fb_watterott.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fb_watterott.c</a></div><div class='hunk'>@@ -90,15 +90,10 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define RGB565toRGB323(c) ((((c) &amp; 0xE000) &gt;&gt; 8) |\</div><div class='del'>-			   (((c) &amp; 000600) &gt;&gt; 6) |\</div><div class='del'>-			   (((c) &amp; 0x001C) &gt;&gt; 2))</div><div class='del'>-#define RGB565toRGB332(c) ((((c) &amp; 0xE000) &gt;&gt; 8) |\</div><div class='del'>-			   (((c) &amp; 000700) &gt;&gt; 6) |\</div><div class='del'>-			   (((c) &amp; 0x0018) &gt;&gt; 3))</div><div class='del'>-#define RGB565toRGB233(c) ((((c) &amp; 0xC000) &gt;&gt; 8) |\</div><div class='del'>-			   (((c) &amp; 000700) &gt;&gt; 5) |\</div><div class='del'>-			   (((c) &amp; 0x001C) &gt;&gt; 2))</div><div class='add'>+static inline int rgb565_to_rgb332(u16 c)</div><div class='add'>+{</div><div class='add'>+	return ((c &amp; 0xE000) &gt;&gt; 8) | ((c &amp; 000700) &gt;&gt; 6) | ((c &amp; 0x0018) &gt;&gt; 3);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -122,7 +117,7 @@ static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len)</div><div class='ctx'> 	for (i = start_line; i &lt;= end_line; i++) {</div><div class='ctx'> 		pos[1] = cpu_to_be16(i);</div><div class='ctx'> 		for (j = 0; j &lt; par-&gt;info-&gt;var.xres; j++) {</div><div class='del'>-			buf8[j] = RGB565toRGB332(*vmem16);</div><div class='add'>+			buf8[j] = rgb565_to_rgb332(*vmem16);</div><div class='ctx'> 			vmem16++;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = par-&gt;fbtftops.write(par,</div><div class='head'>diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/staging/fbtft/fbtft-io.c<br/>index 38cdad6203ea..0863d257d762 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fbtft-io.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fbtft-io.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fbtft-io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fbtft-io.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ int fbtft_write_spi(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> </div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!par-&gt;spi) {</div><div class='ctx'> 		dev_err(par-&gt;info-&gt;device,</div><div class='hunk'>@@ -47,7 +47,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> 	u64 val, dc, tmp;</div><div class='ctx'> </div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!par-&gt;extra) {</div><div class='ctx'> 		dev_err(par-&gt;info-&gt;device, "%s: error: par-&gt;extra is NULL\n",</div><div class='hunk'>@@ -109,7 +109,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> 		txbuf[0] = par-&gt;startbyte | 0x3;</div><div class='ctx'> 		t.tx_buf = txbuf;</div><div class='ctx'> 		fbtft_par_dbg_hex(DEBUG_READ, par, par-&gt;info-&gt;device, u8,</div><div class='del'>-				  txbuf, len, "%s(len=%d) txbuf =&gt; ",</div><div class='add'>+				  txbuf, len, "%s(len=%zu) txbuf =&gt; ",</div><div class='ctx'> 				  __func__, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +117,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> 	spi_message_add_tail(&amp;t, &amp;m);</div><div class='ctx'> 	ret = spi_sync(par-&gt;spi, &amp;m);</div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_READ, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d) buf &lt;= ", __func__, len);</div><div class='add'>+			  "%s(len=%zu) buf &lt;= ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -136,7 +136,7 @@ int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	while (len--) {</div><div class='ctx'> 		data = *(u8 *)buf;</div><div class='hunk'>@@ -186,7 +186,7 @@ int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	while (len) {</div><div class='ctx'> 		data = *(u16 *)buf;</div><div class='head'>diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h<br/>index 7fdd3b0851ef..9b6bdb62093d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fbtft.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fbtft.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fbtft.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fbtft.h</a></div><div class='hunk'>@@ -238,6 +238,7 @@ struct fbtft_par {</div><div class='ctx'> </div><div class='ctx'> /* fbtft-core.c */</div><div class='ctx'> int fbtft_write_buf_dc(struct fbtft_par *par, void *buf, size_t len, int dc);</div><div class='add'>+__printf(5, 6)</div><div class='ctx'> void fbtft_dbg_hex(const struct device *dev, int groupsize,</div><div class='ctx'> 		   void *buf, size_t len, const char *fmt, ...);</div><div class='ctx'> struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,</div><div class='head'>diff --git a/drivers/staging/fbtft/fbtft_device.c b/drivers/staging/fbtft/fbtft_device.c<br/>index 5f6cd0816d58..44e1410eb3fe 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fbtft_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/fbtft_device.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/fbtft_device.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/fbtft_device.c</a></div><div class='hunk'>@@ -965,7 +965,7 @@ static int write_gpio16_wr_slow(struct fbtft_par *par, void *buf, size_t len)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	fbtft_par_dbg_hex(DEBUG_WRITE, par, par-&gt;info-&gt;device, u8, buf, len,</div><div class='del'>-			  "%s(len=%d): ", __func__, len);</div><div class='add'>+			  "%s(len=%zu): ", __func__, len);</div><div class='ctx'> </div><div class='ctx'> 	while (len) {</div><div class='ctx'> 		data = *(u16 *)buf;</div><div class='head'>diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c<br/>index c5fa59105a43..3747321011fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/flexfb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fbtft/flexfb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fbtft/flexfb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fbtft/flexfb.c</a></div><div class='hunk'>@@ -671,7 +671,8 @@ static int flexfb_probe_common(struct spi_device *sdev,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 9:</div><div class='ctx'> 			if (regwidth == 16) {</div><div class='del'>-				dev_err(dev, "argument 'regwidth': %d is not supported with buswidth=%d and SPI.\n", regwidth, buswidth);</div><div class='add'>+				dev_err(dev, "argument 'regwidth': %d is not supported with buswidth=%d and SPI.\n",</div><div class='add'>+					regwidth, buswidth);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			par-&gt;fbtftops.write_register = fbtft_write_reg8_bus9;</div><div class='hunk'>@@ -718,7 +719,9 @@ static int flexfb_probe_common(struct spi_device *sdev,</div><div class='ctx'> 			par-&gt;fbtftops.write_vmem = fbtft_write_vmem16_bus16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			dev_err(dev, "argument 'buswidth': %d is not supported with parallel.\n", buswidth);</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"argument 'buswidth': %d is not supported with parallel.\n",</div><div class='add'>+				buswidth);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev b/drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev<br/>new file mode 100644<br/>index 000000000000..45f631ea32a6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+What:		/dev/fieldbus_devX</div><div class='add'>+Date:		December 2018</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The cdev interface to drivers for Fieldbus Device Memory</div><div class='add'>+			(aka. Process Memory).</div><div class='add'>+</div><div class='add'>+		The following file operations are supported:</div><div class='add'>+</div><div class='add'>+		open(2)</div><div class='add'>+		Create an I/O context associated with the file descriptor.</div><div class='add'>+</div><div class='add'>+		read(2)</div><div class='add'>+		Read from Process Memory's "read area".</div><div class='add'>+		Clears POLLERR | POLLPRI from the file descriptor.</div><div class='add'>+</div><div class='add'>+		write(2)</div><div class='add'>+		Write to Process Memory's "write area".</div><div class='add'>+</div><div class='add'>+		poll(2), select(2), epoll_wait(2) etc.</div><div class='add'>+		When a "Process Memory Read Area Changed" event occurs,</div><div class='add'>+		POLLERR | POLLPRI will be set on the file descriptor.</div><div class='add'>+		Note that POLLIN | POLLOUT events are always set, because the</div><div class='add'>+		process memory area is always readable and writable.</div><div class='add'>+</div><div class='add'>+		close(2)</div><div class='add'>+		Free up the I/O context that was associated</div><div class='add'>+		with the file descriptor.</div><div class='add'>+</div><div class='add'>+Users:		TBD</div><div class='head'>diff --git a/drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev b/drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev<br/>new file mode 100644<br/>index 000000000000..439f14d33c3b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/card_name</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Human-readable name of the Fieldbus Device.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/fieldbus_type</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The type of fieldbus implemented by this device.</div><div class='add'>+		Possible values:</div><div class='add'>+			'unknown'</div><div class='add'>+			'profinet'</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/fieldbus_id</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The unique fieldbus id associated with this device.</div><div class='add'>+		The exact format of this id is fieldbus type dependent, e.g.</div><div class='add'>+		a mac address for profinet.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/read_area_size</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The size, in bytes, of the Process Memory read area.</div><div class='add'>+		Note: this area is accessible by reading from the associated</div><div class='add'>+			character device (/dev/fieldbus_devX).</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/write_area_size</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The size, in bytes, of the Process Memory write area.</div><div class='add'>+		Note: this area is accessible by writing to the associated</div><div class='add'>+			character device (/dev/fieldbus_devX)</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/online</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Whether the fieldbus is online or offline.</div><div class='add'>+		Possible values:</div><div class='add'>+			'1' meaning 'online'</div><div class='add'>+			'0' meaning 'offline'</div><div class='add'>+		Note: an uevent is generated when this property changes.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fieldbus_dev/fieldbus_devX/enabled</div><div class='add'>+KernelVersion:	5.1 (staging)</div><div class='add'>+Contact:	Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Whether the device is enabled (power on) or</div><div class='add'>+			disabled (power off).</div><div class='add'>+		Possible values:</div><div class='add'>+			'1' meaning enabled</div><div class='add'>+			'0' meaning disabled</div><div class='add'>+		Normally a r/o property, but optionally r/w:</div><div class='add'>+		Writing '1' enables the device (power on) with default</div><div class='add'>+			settings.</div><div class='add'>+		Writing '0' disables the card (power off).</div><div class='head'>diff --git a/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt b/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt<br/>new file mode 100644<br/>index 000000000000..56af3f650fa3<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/Documentation/fieldbus_dev.txt</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+                       Fieldbus-Device Subsystem</div><div class='add'>+               ============================================</div><div class='add'>+</div><div class='add'>+Part 0 - What is a Fieldbus Device ?</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Fieldbus is the name of a family of industrial computer network protocols used</div><div class='add'>+for real-time distributed control, standardized as IEC 61158.</div><div class='add'>+</div><div class='add'>+A complex automated industrial system -- such as manufacturing assembly line --</div><div class='add'>+usually needs a distributed control system -- an organized hierarchy of</div><div class='add'>+controller systems -- to function. In this hierarchy, there is usually a</div><div class='add'>+Human Machine Interface (HMI) at the top, where an operator can monitor or</div><div class='add'>+operate the system. This is typically linked to a middle layer of programmable</div><div class='add'>+logic controllers (PLC) via a non-time-critical communications system</div><div class='add'>+(e.g. Ethernet). At the bottom of the control chain is the fieldbus that links</div><div class='add'>+the PLCs to the components that actually do the work, such as sensors,</div><div class='add'>+actuators, electric motors, console lights, switches, valves and contactors.</div><div class='add'>+</div><div class='add'>+(Source: Wikipedia)</div><div class='add'>+</div><div class='add'>+A "Fieldbus Device" is such an actuator, motor, console light, switch, ...</div><div class='add'>+controlled via the Fieldbus by a PLC aka "Fieldbus Controller".</div><div class='add'>+</div><div class='add'>+Communication between PLC and device typically happens via process data memory,</div><div class='add'>+separated into input and output areas. The Fieldbus then cyclically transfers</div><div class='add'>+the PLC's output area to the device's input area, and vice versa.</div><div class='add'>+</div><div class='add'>+Part I - Why do we need this subsystem?</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Fieldbus device (client) adapters are commercially available. They allow data</div><div class='add'>+exchange with a PLC aka "Fieldbus Controller" via process data memory.</div><div class='add'>+</div><div class='add'>+They are typically used when a Linux device wants to expose itself as an</div><div class='add'>+actuator, motor, console light, switch, etc. over the fieldbus.</div><div class='add'>+</div><div class='add'>+The purpose of this subsystem is:</div><div class='add'>+a) present a general, standardized, extensible API/ABI to userspace; and</div><div class='add'>+b) present a convenient interface to drivers.</div><div class='add'>+</div><div class='add'>+Part II - How can drivers use the subsystem?</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+Any driver that wants to register as a Fieldbus Device should allocate and</div><div class='add'>+populate a 'struct fieldbus_dev' (from include/linux/fieldbus_dev.h).</div><div class='add'>+Registration then happens by calling fieldbus_dev_register().</div><div class='add'>+</div><div class='add'>+Part III - How can userspace use the subsystem?</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+Fieldbus protocols and adapters are diverse and varied. However, they share</div><div class='add'>+a limited few common behaviours and properties. This allows us to define</div><div class='add'>+a simple interface consisting of a character device and a set of sysfs files:</div><div class='add'>+</div><div class='add'>+See:</div><div class='add'>+Documentation/ABI/testing/sysfs-class-fieldbus-dev</div><div class='add'>+Documentation/ABI/testing/fieldbus-dev-cdev</div><div class='add'>+</div><div class='add'>+Note that this simple interface does not provide a way to modify adapter</div><div class='add'>+configuration settings. It is therefore useful only for adapters that get their</div><div class='add'>+configuration settings some other way, e.g. non-volatile memory on the adapter,</div><div class='add'>+through the network, ...</div><div class='add'>+</div><div class='add'>+At a later phase, this simple interface can easily co-exist with a future</div><div class='add'>+(netlink-based ?) configuration settings interface.</div><div class='head'>diff --git a/drivers/staging/fieldbus/Kconfig b/drivers/staging/fieldbus/Kconfig<br/>new file mode 100644<br/>index 000000000000..e5e28e52c59b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+menuconfig FIELDBUS_DEV</div><div class='add'>+	tristate "Fieldbus Device Support"</div><div class='add'>+	help</div><div class='add'>+	  Support for Fieldbus Device Adapters.</div><div class='add'>+</div><div class='add'>+	  Fieldbus device (client) adapters allow data exchange with a PLC aka.</div><div class='add'>+	  "Fieldbus Controller" over a fieldbus (Profinet, FLNet, etc.)</div><div class='add'>+</div><div class='add'>+	  They are typically used when a Linux device wants to expose itself</div><div class='add'>+	  as an actuator, motor, console light, switch, etc. over the fieldbus.</div><div class='add'>+</div><div class='add'>+	  This framework is designed to provide a generic interface to Fieldbus</div><div class='add'>+	  Devices from both the Linux Kernel and the userspace.</div><div class='add'>+</div><div class='add'>+	  If unsure, say no.</div><div class='add'>+</div><div class='add'>+source "drivers/staging/fieldbus/anybuss/Kconfig"</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/fieldbus/Makefile b/drivers/staging/fieldbus/Makefile<br/>new file mode 100644<br/>index 000000000000..bdf645d41344<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/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'>+# Makefile for fieldbus_dev drivers.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_FIELDBUS_DEV)	+= fieldbus_dev.o anybuss/</div><div class='add'>+fieldbus_dev-y			:= dev_core.o</div><div class='head'>diff --git a/drivers/staging/fieldbus/TODO b/drivers/staging/fieldbus/TODO<br/>new file mode 100644<br/>index 000000000000..6d6626af4ec7<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/TODO</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+TODO:</div><div class='add'>+-Get more people/drivers to use the Fieldbus userspace ABI. It requires</div><div class='add'>+ verification/sign-off by multiple users.</div><div class='add'>+</div><div class='add'>+Contact: Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/Kconfig b/drivers/staging/fieldbus/anybuss/Kconfig<br/>new file mode 100644<br/>index 000000000000..41f241c73826<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+config HMS_ANYBUSS_BUS</div><div class='add'>+	tristate "HMS Anybus-S Bus Support"</div><div class='add'>+	select REGMAP</div><div class='add'>+	depends on OF &amp;&amp; FIELDBUS_DEV</div><div class='add'>+	help</div><div class='add'>+	  Driver for the HMS Industrial Networks Anybus-S bus.</div><div class='add'>+	  You can attach a single Anybus-S compatible card to it, which</div><div class='add'>+	  typically provides fieldbus and industrial ethernet</div><div class='add'>+	  functionality.</div><div class='add'>+</div><div class='add'>+if HMS_ANYBUSS_BUS</div><div class='add'>+</div><div class='add'>+config ARCX_ANYBUS_CONTROLLER</div><div class='add'>+	tristate "Arcx Anybus-S Controller"</div><div class='add'>+	depends on OF &amp;&amp; GPIOLIB &amp;&amp; HAS_IOMEM &amp;&amp; REGULATOR</div><div class='add'>+	help</div><div class='add'>+	  Select this to get support for the Arcx Anybus controller.</div><div class='add'>+	  It connects to the SoC via a parallel memory bus, and</div><div class='add'>+	  embeds up to two Anybus-S buses (slots).</div><div class='add'>+	  There is also a CAN power readout, unrelated to the Anybus,</div><div class='add'>+	  modelled as a regulator.</div><div class='add'>+</div><div class='add'>+config HMS_PROFINET</div><div class='add'>+	tristate "HMS Profinet IRT Controller (Anybus-S)"</div><div class='add'>+	depends on FIELDBUS_DEV &amp;&amp; HMS_ANYBUSS_BUS</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the HMS Industrial</div><div class='add'>+	  Networks Profinet IRT Controller.</div><div class='add'>+</div><div class='add'>+	  It will be registered with the kernel as a fieldbus_dev,</div><div class='add'>+	  so userspace can interact with it via the fieldbus_dev userspace</div><div class='add'>+	  interface(s).</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 hms-profinet.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/Makefile b/drivers/staging/fieldbus/anybuss/Makefile<br/>new file mode 100644<br/>index 000000000000..3ad3dcc6be56<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/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 anybuss drivers.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_HMS_ANYBUSS_BUS)	+= anybuss_core.o</div><div class='add'>+anybuss_core-y			+= host.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_ARCX_ANYBUS_CONTROLLER) += arcx-anybus.o</div><div class='add'>+obj-$(CONFIG_HMS_PROFINET)	+= hms-profinet.o</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/anybuss-client.h b/drivers/staging/fieldbus/anybuss/anybuss-client.h<br/>new file mode 100644<br/>index 000000000000..0c4b6a1ffe10<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/anybuss-client.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/anybuss-client.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'>+ * Anybus-S client adapter definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2018 Arcx Inc</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_ANYBUSS_CLIENT_H__</div><div class='add'>+#define __LINUX_ANYBUSS_CLIENT_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+</div><div class='add'>+struct anybuss_host;</div><div class='add'>+</div><div class='add'>+struct anybuss_client {</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct anybuss_host *host;</div><div class='add'>+	__be16 anybus_id;</div><div class='add'>+	/*</div><div class='add'>+	 * these can be optionally set by the client to receive event</div><div class='add'>+	 * notifications from the host.</div><div class='add'>+	 */</div><div class='add'>+	void (*on_area_updated)(struct anybuss_client *client);</div><div class='add'>+	void (*on_online_changed)(struct anybuss_client *client, bool online);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct anybuss_client_driver {</div><div class='add'>+	struct device_driver driver;</div><div class='add'>+	int (*probe)(struct anybuss_client *adev);</div><div class='add'>+	int (*remove)(struct anybuss_client *adev);</div><div class='add'>+	u16 anybus_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int anybuss_client_driver_register(struct anybuss_client_driver *drv);</div><div class='add'>+void anybuss_client_driver_unregister(struct anybuss_client_driver *drv);</div><div class='add'>+</div><div class='add'>+static inline struct anybuss_client *to_anybuss_client(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return container_of(dev, struct anybuss_client, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct anybuss_client_driver *</div><div class='add'>+to_anybuss_client_driver(struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	return container_of(drv, struct anybuss_client_driver, driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *</div><div class='add'>+anybuss_get_drvdata(const struct anybuss_client *client)</div><div class='add'>+{</div><div class='add'>+	return dev_get_drvdata(&amp;client-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+anybuss_set_drvdata(struct anybuss_client *client, void *data)</div><div class='add'>+{</div><div class='add'>+	dev_set_drvdata(&amp;client-&gt;dev, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int anybuss_set_power(struct anybuss_client *client, bool power_on);</div><div class='add'>+</div><div class='add'>+enum anybuss_offl_mode {</div><div class='add'>+	AB_OFFL_MODE_CLEAR = 0,</div><div class='add'>+	AB_OFFL_MODE_FREEZE,</div><div class='add'>+	AB_OFFL_MODE_SET</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct anybuss_memcfg {</div><div class='add'>+	u16 input_io;</div><div class='add'>+	u16 input_dpram;</div><div class='add'>+	u16 input_total;</div><div class='add'>+</div><div class='add'>+	u16 output_io;</div><div class='add'>+	u16 output_dpram;</div><div class='add'>+	u16 output_total;</div><div class='add'>+</div><div class='add'>+	enum anybuss_offl_mode offl_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int anybuss_start_init(struct anybuss_client *client,</div><div class='add'>+		       const struct anybuss_memcfg *cfg);</div><div class='add'>+int anybuss_finish_init(struct anybuss_client *client);</div><div class='add'>+int anybuss_read_fbctrl(struct anybuss_client *client, u16 addr,</div><div class='add'>+			void *buf, size_t count);</div><div class='add'>+int anybuss_send_msg(struct anybuss_client *client, u16 cmd_num,</div><div class='add'>+		     const void *buf, size_t count);</div><div class='add'>+int anybuss_send_ext(struct anybuss_client *client, u16 cmd_num,</div><div class='add'>+		     const void *buf, size_t count);</div><div class='add'>+int anybuss_recv_msg(struct anybuss_client *client, u16 cmd_num,</div><div class='add'>+		     void *buf, size_t count);</div><div class='add'>+</div><div class='add'>+/* these help clients make a struct file_operations */</div><div class='add'>+int anybuss_write_input(struct anybuss_client *client,</div><div class='add'>+			const char __user *buf, size_t size,</div><div class='add'>+				loff_t *offset);</div><div class='add'>+int anybuss_read_output(struct anybuss_client *client,</div><div class='add'>+			char __user *buf, size_t size,</div><div class='add'>+				loff_t *offset);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_ANYBUSS_CLIENT_H__ */</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/anybuss-controller.h b/drivers/staging/fieldbus/anybuss/anybuss-controller.h<br/>new file mode 100644<br/>index 000000000000..02fa0749043b<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/anybuss-controller.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/anybuss-controller.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Anybus-S controller definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2018 Arcx Inc</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_ANYBUSS_CONTROLLER_H__</div><div class='add'>+#define __LINUX_ANYBUSS_CONTROLLER_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To instantiate an Anybus-S host, a controller should provide the following:</div><div class='add'>+ * - a reset function which resets the attached card;</div><div class='add'>+ * - a regmap which provides access to the attached card's dpram;</div><div class='add'>+ * - the irq of the attached card</div><div class='add'>+ */</div><div class='add'>+/**</div><div class='add'>+ * struct anybuss_ops - Controller resources to instantiate an Anybus-S host</div><div class='add'>+ *</div><div class='add'>+ * @reset:	asserts/deasserts the anybus card's reset line.</div><div class='add'>+ * @regmap:	provides access to the card's dual-port RAM area.</div><div class='add'>+ * @irq:	number of the interrupt connected to the card's interrupt line.</div><div class='add'>+ * @host_idx:	for multi-host controllers, the host index:</div><div class='add'>+ *		0 for the first host on the controller, 1 for the second, etc.</div><div class='add'>+ */</div><div class='add'>+struct anybuss_ops {</div><div class='add'>+	void (*reset)(struct device *dev, bool assert);</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	int irq;</div><div class='add'>+	int host_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct anybuss_host;</div><div class='add'>+</div><div class='add'>+struct anybuss_host * __must_check</div><div class='add'>+anybuss_host_common_probe(struct device *dev,</div><div class='add'>+			  const struct anybuss_ops *ops);</div><div class='add'>+void anybuss_host_common_remove(struct anybuss_host *host);</div><div class='add'>+</div><div class='add'>+struct anybuss_host * __must_check</div><div class='add'>+devm_anybuss_host_common_probe(struct device *dev,</div><div class='add'>+			       const struct anybuss_ops *ops);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_ANYBUSS_CONTROLLER_H__ */</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/arcx-anybus.c b/drivers/staging/fieldbus/anybuss/arcx-anybus.c<br/>new file mode 100644<br/>index 000000000000..a167fb68e355<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/arcx-anybus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/arcx-anybus.c</a></div><div class='hunk'>@@ -0,0 +1,399 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Arcx Anybus-S Controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Arcx Inc</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/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.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;linux/io.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/idr.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+/* move to &lt;linux/anybuss-controller.h&gt; when taking this out of staging */</div><div class='add'>+#include "anybuss-controller.h"</div><div class='add'>+</div><div class='add'>+#define CPLD_STATUS1		0x80</div><div class='add'>+#define CPLD_CONTROL		0x80</div><div class='add'>+#define CPLD_CONTROL_CRST	0x40</div><div class='add'>+#define CPLD_CONTROL_RST1	0x04</div><div class='add'>+#define CPLD_CONTROL_RST2	0x80</div><div class='add'>+#define CPLD_STATUS1_AB		0x02</div><div class='add'>+#define CPLD_STATUS1_CAN_POWER	0x01</div><div class='add'>+#define CPLD_DESIGN_LO		0x81</div><div class='add'>+#define CPLD_DESIGN_HI		0x82</div><div class='add'>+#define CPLD_CAP		0x83</div><div class='add'>+#define CPLD_CAP_COMPAT		0x01</div><div class='add'>+#define CPLD_CAP_SEP_RESETS	0x02</div><div class='add'>+</div><div class='add'>+struct controller_priv {</div><div class='add'>+	struct device *class_dev;</div><div class='add'>+	bool common_reset;</div><div class='add'>+	struct gpio_desc *reset_gpiod;</div><div class='add'>+	void __iomem *cpld_base;</div><div class='add'>+	struct mutex ctrl_lock; /* protects CONTROL register */</div><div class='add'>+	u8 control_reg;</div><div class='add'>+	char version[3];</div><div class='add'>+	u16 design_no;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void do_reset(struct controller_priv *cd, u8 rst_bit, bool reset)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;cd-&gt;ctrl_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * CPLD_CONTROL is write-only, so cache its value in</div><div class='add'>+	 * cd-&gt;control_reg</div><div class='add'>+	 */</div><div class='add'>+	if (reset)</div><div class='add'>+		cd-&gt;control_reg &amp;= ~rst_bit;</div><div class='add'>+	else</div><div class='add'>+		cd-&gt;control_reg |= rst_bit;</div><div class='add'>+	writeb(cd-&gt;control_reg, cd-&gt;cpld_base + CPLD_CONTROL);</div><div class='add'>+	/*</div><div class='add'>+	 * h/w work-around:</div><div class='add'>+	 * the hardware is 'too fast', so a reset followed by an immediate</div><div class='add'>+	 * not-reset will _not_ change the anybus reset line in any way,</div><div class='add'>+	 * losing the reset. to prevent this from happening, introduce</div><div class='add'>+	 * a minimum reset duration.</div><div class='add'>+	 * Verified minimum safe duration required using a scope</div><div class='add'>+	 * on 14-June-2018: 100 us.</div><div class='add'>+	 */</div><div class='add'>+	if (reset)</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+	mutex_unlock(&amp;cd-&gt;ctrl_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anybuss_reset(struct controller_priv *cd,</div><div class='add'>+			 unsigned long id, bool reset)</div><div class='add'>+{</div><div class='add'>+	if (id &gt;= 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (cd-&gt;common_reset)</div><div class='add'>+		do_reset(cd, CPLD_CONTROL_CRST, reset);</div><div class='add'>+	else</div><div class='add'>+		do_reset(cd, id ? CPLD_CONTROL_RST2 : CPLD_CONTROL_RST1, reset);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void export_reset_0(struct device *dev, bool assert)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	anybuss_reset(cd, 0, assert);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void export_reset_1(struct device *dev, bool assert)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	anybuss_reset(cd, 1, assert);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * parallel bus limitation:</div><div class='add'>+ *</div><div class='add'>+ * the anybus is 8-bit wide. we can't assume that the hardware will translate</div><div class='add'>+ * word accesses on the parallel bus to multiple byte-accesses on the anybus.</div><div class='add'>+ *</div><div class='add'>+ * the imx WEIM bus does not provide this type of translation.</div><div class='add'>+ *</div><div class='add'>+ * to be safe, we will limit parallel bus accesses to a single byte</div><div class='add'>+ * at a time for now.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int read_reg_bus(void *context, unsigned int reg,</div><div class='add'>+			unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = context;</div><div class='add'>+</div><div class='add'>+	*val = readb(base + reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_reg_bus(void *context, unsigned int reg,</div><div class='add'>+			 unsigned int val)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = context;</div><div class='add'>+</div><div class='add'>+	writeb(val, base + reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regmap *create_parallel_regmap(struct platform_device *pdev,</div><div class='add'>+					     int idx)</div><div class='add'>+{</div><div class='add'>+	struct regmap_config regmap_cfg = {</div><div class='add'>+		.reg_bits = 11,</div><div class='add'>+		.val_bits = 8,</div><div class='add'>+		/*</div><div class='add'>+		 * single-byte parallel bus accesses are atomic, so don't</div><div class='add'>+		 * require any synchronization.</div><div class='add'>+		 */</div><div class='add'>+		.disable_locking = true,</div><div class='add'>+		.reg_read = read_reg_bus,</div><div class='add'>+		.reg_write = write_reg_bus,</div><div class='add'>+	};</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1);</div><div class='add'>+	if (resource_size(res) &lt; (1 &lt;&lt; regmap_cfg.reg_bits))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return ERR_CAST(base);</div><div class='add'>+	return devm_regmap_init(dev, NULL, base, &amp;regmap_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct anybuss_host *</div><div class='add'>+create_anybus_host(struct platform_device *pdev, int idx)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_ops ops = {};</div><div class='add'>+</div><div class='add'>+	switch (idx) {</div><div class='add'>+	case 0:</div><div class='add'>+		ops.reset = export_reset_0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		ops.reset = export_reset_1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	ops.host_idx = idx;</div><div class='add'>+	ops.regmap = create_parallel_regmap(pdev, idx);</div><div class='add'>+	if (IS_ERR(ops.regmap))</div><div class='add'>+		return ERR_CAST(ops.regmap);</div><div class='add'>+	ops.irq = platform_get_irq(pdev, idx);</div><div class='add'>+	if (ops.irq &lt;= 0)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	return devm_anybuss_host_common_probe(&amp;pdev-&gt;dev, &amp;ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t version_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", cd-&gt;version);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(version);</div><div class='add'>+</div><div class='add'>+static ssize_t design_number_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", cd-&gt;design_no);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(design_number);</div><div class='add'>+</div><div class='add'>+static struct attribute *controller_attributes[] = {</div><div class='add'>+	&amp;dev_attr_version.attr,</div><div class='add'>+	&amp;dev_attr_design_number.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group controller_attribute_group = {</div><div class='add'>+	.attrs = controller_attributes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *controller_attribute_groups[] = {</div><div class='add'>+	&amp;controller_attribute_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void controller_device_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_power_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd = rdev_get_drvdata(rdev);</div><div class='add'>+</div><div class='add'>+	return !(readb(cd-&gt;cpld_base + CPLD_STATUS1) &amp; CPLD_STATUS1_CAN_POWER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regulator_ops can_power_ops = {</div><div class='add'>+	.is_enabled = can_power_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regulator_desc can_power_desc = {</div><div class='add'>+	.name = "regulator-can-power",</div><div class='add'>+	.id = -1,</div><div class='add'>+	.type = REGULATOR_VOLTAGE,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.ops = &amp;can_power_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct class *controller_class;</div><div class='add'>+static DEFINE_IDA(controller_index_ida);</div><div class='add'>+</div><div class='add'>+static int controller_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct regulator_config config = { };</div><div class='add'>+	struct regulator_dev *regulator;</div><div class='add'>+	int err, id;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct anybuss_host *host;</div><div class='add'>+	u8 status1, cap;</div><div class='add'>+</div><div class='add'>+	cd = devm_kzalloc(dev, sizeof(*cd), GFP_KERNEL);</div><div class='add'>+	if (!cd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev_set_drvdata(dev, cd);</div><div class='add'>+	mutex_init(&amp;cd-&gt;ctrl_lock);</div><div class='add'>+	cd-&gt;reset_gpiod = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(cd-&gt;reset_gpiod))</div><div class='add'>+		return PTR_ERR(cd-&gt;reset_gpiod);</div><div class='add'>+</div><div class='add'>+	/* CPLD control memory, sits at index 0 */</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	cd-&gt;cpld_base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(cd-&gt;cpld_base)) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"failed to map cpld base address\n");</div><div class='add'>+		err = PTR_ERR(cd-&gt;cpld_base);</div><div class='add'>+		goto out_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* identify cpld */</div><div class='add'>+	status1 = readb(cd-&gt;cpld_base + CPLD_STATUS1);</div><div class='add'>+	cd-&gt;design_no = (readb(cd-&gt;cpld_base + CPLD_DESIGN_HI) &lt;&lt; 8) |</div><div class='add'>+				readb(cd-&gt;cpld_base + CPLD_DESIGN_LO);</div><div class='add'>+	snprintf(cd-&gt;version, sizeof(cd-&gt;version), "%c%d",</div><div class='add'>+		 'A' + ((status1 &gt;&gt; 5) &amp; 0x7),</div><div class='add'>+		 (status1 &gt;&gt; 2) &amp; 0x7);</div><div class='add'>+	dev_info(dev, "design number %d, revision %s\n",</div><div class='add'>+		 cd-&gt;design_no,</div><div class='add'>+		cd-&gt;version);</div><div class='add'>+	cap = readb(cd-&gt;cpld_base + CPLD_CAP);</div><div class='add'>+	if (!(cap &amp; CPLD_CAP_COMPAT)) {</div><div class='add'>+		dev_err(dev, "unsupported controller [cap=0x%02X]", cap);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status1 &amp; CPLD_STATUS1_AB) {</div><div class='add'>+		dev_info(dev, "has anybus-S slot(s)");</div><div class='add'>+		cd-&gt;common_reset = !(cap &amp; CPLD_CAP_SEP_RESETS);</div><div class='add'>+		dev_info(dev, "supports %s", cd-&gt;common_reset ?</div><div class='add'>+			"a common reset" : "separate resets");</div><div class='add'>+		for (id = 0; id &lt; 2; id++) {</div><div class='add'>+			host = create_anybus_host(pdev, id);</div><div class='add'>+			if (!IS_ERR(host))</div><div class='add'>+				continue;</div><div class='add'>+			err = PTR_ERR(host);</div><div class='add'>+			/* -ENODEV is fine, it just means no card detected */</div><div class='add'>+			if (err != -ENODEV)</div><div class='add'>+				goto out_reset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = ida_simple_get(&amp;controller_index_ida, 0, 0, GFP_KERNEL);</div><div class='add'>+	if (id &lt; 0) {</div><div class='add'>+		err = id;</div><div class='add'>+		goto out_reset;</div><div class='add'>+	}</div><div class='add'>+	/* export can power readout as a regulator */</div><div class='add'>+	config.dev = dev;</div><div class='add'>+	config.driver_data = cd;</div><div class='add'>+	regulator = devm_regulator_register(dev, &amp;can_power_desc, &amp;config);</div><div class='add'>+	if (IS_ERR(regulator)) {</div><div class='add'>+		err = PTR_ERR(regulator);</div><div class='add'>+		goto out_reset;</div><div class='add'>+	}</div><div class='add'>+	/* make controller info visible to userspace */</div><div class='add'>+	cd-&gt;class_dev = kzalloc(sizeof(*cd-&gt;class_dev), GFP_KERNEL);</div><div class='add'>+	if (!cd-&gt;class_dev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_ida;</div><div class='add'>+	}</div><div class='add'>+	cd-&gt;class_dev-&gt;class = controller_class;</div><div class='add'>+	cd-&gt;class_dev-&gt;groups = controller_attribute_groups;</div><div class='add'>+	cd-&gt;class_dev-&gt;parent = dev;</div><div class='add'>+	cd-&gt;class_dev-&gt;id = id;</div><div class='add'>+	cd-&gt;class_dev-&gt;release = controller_device_release;</div><div class='add'>+	dev_set_name(cd-&gt;class_dev, "%d", cd-&gt;class_dev-&gt;id);</div><div class='add'>+	dev_set_drvdata(cd-&gt;class_dev, cd);</div><div class='add'>+	err = device_register(cd-&gt;class_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_dev;</div><div class='add'>+	return 0;</div><div class='add'>+out_dev:</div><div class='add'>+	put_device(cd-&gt;class_dev);</div><div class='add'>+out_ida:</div><div class='add'>+	ida_simple_remove(&amp;controller_index_ida, id);</div><div class='add'>+out_reset:</div><div class='add'>+	gpiod_set_value_cansleep(cd-&gt;reset_gpiod, 1);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int controller_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct controller_priv *cd = platform_get_drvdata(pdev);</div><div class='add'>+	int id = cd-&gt;class_dev-&gt;id;</div><div class='add'>+</div><div class='add'>+	device_unregister(cd-&gt;class_dev);</div><div class='add'>+	ida_simple_remove(&amp;controller_index_ida, id);</div><div class='add'>+	gpiod_set_value_cansleep(cd-&gt;reset_gpiod, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id controller_of_match[] = {</div><div class='add'>+	{ .compatible = "arcx,anybus-controller" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, controller_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver controller_driver = {</div><div class='add'>+	.probe = controller_probe,</div><div class='add'>+	.remove = controller_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name   = "arcx-anybus-controller",</div><div class='add'>+		.of_match_table	= of_match_ptr(controller_of_match),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init controller_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	controller_class = class_create(THIS_MODULE, "arcx_anybus_controller");</div><div class='add'>+	if (IS_ERR(controller_class))</div><div class='add'>+		return PTR_ERR(controller_class);</div><div class='add'>+	err = platform_driver_register(&amp;controller_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		class_destroy(controller_class);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit controller_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;controller_driver);</div><div class='add'>+	class_destroy(controller_class);</div><div class='add'>+	ida_destroy(&amp;controller_index_ida);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(controller_init);</div><div class='add'>+module_exit(controller_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Arcx Anybus-S Controller driver");</div><div class='add'>+MODULE_AUTHOR("Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/hms-profinet.c b/drivers/staging/fieldbus/anybuss/hms-profinet.c<br/>new file mode 100644<br/>index 000000000000..5446843e35f4<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/hms-profinet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/hms-profinet.c</a></div><div class='hunk'>@@ -0,0 +1,228 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * HMS Profinet Client Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Arcx Inc</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/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+/* move to &lt;linux/fieldbus_dev.h&gt; when taking this out of staging */</div><div class='add'>+#include "../fieldbus_dev.h"</div><div class='add'>+</div><div class='add'>+/* move to &lt;linux/anybuss-client.h&gt; when taking this out of staging */</div><div class='add'>+#include "anybuss-client.h"</div><div class='add'>+</div><div class='add'>+#define PROFI_DPRAM_SIZE	512</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ---------------------------------------------------------------</div><div class='add'>+ * Anybus Profinet mailbox messages - definitions</div><div class='add'>+ * ---------------------------------------------------------------</div><div class='add'>+ * note that we're depending on the layout of these structures being</div><div class='add'>+ * exactly as advertised.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct msg_mac_addr {</div><div class='add'>+	u8 addr[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct profi_priv {</div><div class='add'>+	struct fieldbus_dev fbdev;</div><div class='add'>+	struct anybuss_client *client;</div><div class='add'>+	struct mutex enable_lock; /* serializes card enable */</div><div class='add'>+	bool power_on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+profi_read_area(struct fieldbus_dev *fbdev, char __user *buf, size_t size,</div><div class='add'>+		loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = container_of(fbdev, struct profi_priv, fbdev);</div><div class='add'>+</div><div class='add'>+	return anybuss_read_output(priv-&gt;client, buf, size, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+profi_write_area(struct fieldbus_dev *fbdev, const char __user *buf,</div><div class='add'>+		 size_t size, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = container_of(fbdev, struct profi_priv, fbdev);</div><div class='add'>+</div><div class='add'>+	return anybuss_write_input(priv-&gt;client, buf, size, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int profi_id_get(struct fieldbus_dev *fbdev, char *buf,</div><div class='add'>+			size_t max_size)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = container_of(fbdev, struct profi_priv, fbdev);</div><div class='add'>+	struct msg_mac_addr response;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = anybuss_recv_msg(priv-&gt;client, 0x0010, &amp;response,</div><div class='add'>+			       sizeof(response));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return snprintf(buf, max_size, "%02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='add'>+		response.addr[0], response.addr[1],</div><div class='add'>+		response.addr[2], response.addr[3],</div><div class='add'>+		response.addr[4], response.addr[5]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool profi_enable_get(struct fieldbus_dev *fbdev)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = container_of(fbdev, struct profi_priv, fbdev);</div><div class='add'>+	bool power_on;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;enable_lock);</div><div class='add'>+	power_on = priv-&gt;power_on;</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;enable_lock);</div><div class='add'>+</div><div class='add'>+	return power_on;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __profi_enable(struct profi_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct anybuss_client *client = priv-&gt;client;</div><div class='add'>+	/* Initialization Sequence, Generic Anybus Mode */</div><div class='add'>+	const struct anybuss_memcfg mem_cfg = {</div><div class='add'>+		.input_io = 220,</div><div class='add'>+		.input_dpram = PROFI_DPRAM_SIZE,</div><div class='add'>+		.input_total = PROFI_DPRAM_SIZE,</div><div class='add'>+		.output_io = 220,</div><div class='add'>+		.output_dpram = PROFI_DPRAM_SIZE,</div><div class='add'>+		.output_total = PROFI_DPRAM_SIZE,</div><div class='add'>+		.offl_mode = AB_OFFL_MODE_CLEAR,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * switch anybus off then on, this ensures we can do a complete</div><div class='add'>+	 * configuration cycle in case anybus was already on.</div><div class='add'>+	 */</div><div class='add'>+	anybuss_set_power(client, false);</div><div class='add'>+	ret = anybuss_set_power(client, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	ret = anybuss_start_init(client, &amp;mem_cfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	ret = anybuss_finish_init(client);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	priv-&gt;power_on = true;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	anybuss_set_power(client, false);</div><div class='add'>+	priv-&gt;power_on = false;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __profi_disable(struct profi_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_client *client = priv-&gt;client;</div><div class='add'>+</div><div class='add'>+	anybuss_set_power(client, false);</div><div class='add'>+	priv-&gt;power_on = false;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int profi_simple_enable(struct fieldbus_dev *fbdev, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct profi_priv *priv = container_of(fbdev, struct profi_priv, fbdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;enable_lock);</div><div class='add'>+	if (enable)</div><div class='add'>+		ret = __profi_enable(priv);</div><div class='add'>+	else</div><div class='add'>+		ret = __profi_disable(priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;enable_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 profi_on_area_updated(struct anybuss_client *client)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = anybuss_get_drvdata(client);</div><div class='add'>+</div><div class='add'>+	fieldbus_dev_area_updated(&amp;priv-&gt;fbdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void profi_on_online_changed(struct anybuss_client *client, bool online)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = anybuss_get_drvdata(client);</div><div class='add'>+</div><div class='add'>+	fieldbus_dev_online_changed(&amp;priv-&gt;fbdev, online);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int profinet_probe(struct anybuss_client *client)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv;</div><div class='add'>+	struct device *dev = &amp;client-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	client-&gt;on_area_updated = profi_on_area_updated;</div><div class='add'>+	client-&gt;on_online_changed = profi_on_online_changed;</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'>+	mutex_init(&amp;priv-&gt;enable_lock);</div><div class='add'>+	priv-&gt;client = client;</div><div class='add'>+	priv-&gt;fbdev.read_area_sz = PROFI_DPRAM_SIZE;</div><div class='add'>+	priv-&gt;fbdev.write_area_sz = PROFI_DPRAM_SIZE;</div><div class='add'>+	priv-&gt;fbdev.card_name = "HMS Profinet IRT (Anybus-S)";</div><div class='add'>+	priv-&gt;fbdev.fieldbus_type = FIELDBUS_DEV_TYPE_PROFINET;</div><div class='add'>+	priv-&gt;fbdev.read_area = profi_read_area;</div><div class='add'>+	priv-&gt;fbdev.write_area = profi_write_area;</div><div class='add'>+	priv-&gt;fbdev.fieldbus_id_get = profi_id_get;</div><div class='add'>+	priv-&gt;fbdev.enable_get = profi_enable_get;</div><div class='add'>+	priv-&gt;fbdev.simple_enable_set = profi_simple_enable;</div><div class='add'>+	priv-&gt;fbdev.parent = dev;</div><div class='add'>+	err = fieldbus_dev_register(&amp;priv-&gt;fbdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	dev_info(dev, "card detected, registered as %s",</div><div class='add'>+		 dev_name(priv-&gt;fbdev.dev));</div><div class='add'>+	anybuss_set_drvdata(client, 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 profinet_remove(struct anybuss_client *client)</div><div class='add'>+{</div><div class='add'>+	struct profi_priv *priv = anybuss_get_drvdata(client);</div><div class='add'>+</div><div class='add'>+	fieldbus_dev_unregister(&amp;priv-&gt;fbdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct anybuss_client_driver profinet_driver = {</div><div class='add'>+	.probe = profinet_probe,</div><div class='add'>+	.remove = profinet_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name   = "hms-profinet",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.anybus_id = 0x0089,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init profinet_init(void)</div><div class='add'>+{</div><div class='add'>+	return anybuss_client_driver_register(&amp;profinet_driver);</div><div class='add'>+}</div><div class='add'>+module_init(profinet_init);</div><div class='add'>+</div><div class='add'>+static void __exit profinet_exit(void)</div><div class='add'>+{</div><div class='add'>+	return anybuss_client_driver_unregister(&amp;profinet_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(profinet_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("HMS Profinet IRT Driver (Anybus-S)");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/fieldbus/anybuss/host.c b/drivers/staging/fieldbus/anybuss/host.c<br/>new file mode 100644<br/>index 000000000000..f69dc4930457<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/anybuss/host.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/anybuss/host.c</a></div><div class='hunk'>@@ -0,0 +1,1458 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * HMS Anybus-S Host Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Arcx Inc</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architecture Overview</div><div class='add'>+ * =====================</div><div class='add'>+ * This driver (running on the CPU/SoC) and the Anybus-S card communicate</div><div class='add'>+ * by reading and writing data to/from the Anybus-S Dual-Port RAM (dpram).</div><div class='add'>+ * This is memory connected to both the SoC and Anybus-S card, which both sides</div><div class='add'>+ * can access freely and concurrently.</div><div class='add'>+ *</div><div class='add'>+ * Synchronization happens by means of two registers located in the dpram:</div><div class='add'>+ * IND_AB: written exclusively by the Anybus card; and</div><div class='add'>+ * IND_AP: written exclusively by this driver.</div><div class='add'>+ *</div><div class='add'>+ * Communication happens using one of the following mechanisms:</div><div class='add'>+ * 1. reserve, read/write, release dpram memory areas:</div><div class='add'>+ *	using an IND_AB/IND_AP protocol, the driver is able to reserve certain</div><div class='add'>+ *	memory areas. no dpram memory can be read or written except if reserved.</div><div class='add'>+ *	(with a few limited exceptions)</div><div class='add'>+ * 2. send and receive data structures via a shared mailbox:</div><div class='add'>+ *	using an IND_AB/IND_AP protocol, the driver and Anybus card are able to</div><div class='add'>+ *	exchange commands and responses using a shared mailbox.</div><div class='add'>+ * 3. receive software interrupts:</div><div class='add'>+ *	using an IND_AB/IND_AP protocol, the Anybus card is able to notify the</div><div class='add'>+ *	driver of certain events such as: bus online/offline, data available.</div><div class='add'>+ *	note that software interrupt event bits are located in a memory area</div><div class='add'>+ *	which must be reserved before it can be accessed.</div><div class='add'>+ *</div><div class='add'>+ * The manual[1] is silent on whether these mechanisms can happen concurrently,</div><div class='add'>+ * or how they should be synchronized. However, section 13 (Driver Example)</div><div class='add'>+ * provides the following suggestion for developing a driver:</div><div class='add'>+ * a) an interrupt handler which updates global variables;</div><div class='add'>+ * b) a continuously-running task handling area requests (1 above)</div><div class='add'>+ * c) a continuously-running task handling mailbox requests (2 above)</div><div class='add'>+ * The example conspicuously leaves out software interrupts (3 above), which</div><div class='add'>+ * is the thorniest issue to get right (see below).</div><div class='add'>+ *</div><div class='add'>+ * The naive, straightforward way to implement this would be:</div><div class='add'>+ * - create an isr which updates shared variables;</div><div class='add'>+ * - create a work_struct which handles software interrupts on a queue;</div><div class='add'>+ * - create a function which does reserve/update/unlock in a loop;</div><div class='add'>+ * - create a function which does mailbox send/receive in a loop;</div><div class='add'>+ * - call the above functions from the driver's read/write/ioctl;</div><div class='add'>+ * - synchronize using mutexes/spinlocks:</div><div class='add'>+ *	+ only one area request at a time</div><div class='add'>+ *	+ only one mailbox request at a time</div><div class='add'>+ *	+ protect AB_IND, AB_IND against data hazards (e.g. read-after-write)</div><div class='add'>+ *</div><div class='add'>+ * Unfortunately, the presence of the software interrupt causes subtle yet</div><div class='add'>+ * considerable synchronization issues; especially problematic is the</div><div class='add'>+ * requirement to reserve/release the area which contains the status bits.</div><div class='add'>+ *</div><div class='add'>+ * The driver architecture presented here sidesteps these synchronization issues</div><div class='add'>+ * by accessing the dpram from a single kernel thread only. User-space throws</div><div class='add'>+ * "tasks" (i.e. 1, 2 above) into a task queue, waits for their completion,</div><div class='add'>+ * and the kernel thread runs them to completion.</div><div class='add'>+ *</div><div class='add'>+ * Each task has a task_function, which is called/run by the queue thread.</div><div class='add'>+ * That function communicates with the Anybus card, and returns either</div><div class='add'>+ * 0 (OK), a negative error code (error), or -EINPROGRESS (waiting).</div><div class='add'>+ * On OK or error, the queue thread completes and dequeues the task,</div><div class='add'>+ * which also releases the user space thread which may still be waiting for it.</div><div class='add'>+ * On -EINPROGRESS (waiting), the queue thread will leave the task on the queue,</div><div class='add'>+ * and revisit (call again) whenever an interrupt event comes in.</div><div class='add'>+ *</div><div class='add'>+ * Each task has a state machine, which is run by calling its task_function.</div><div class='add'>+ * It ensures that the task will go through its various stages over time,</div><div class='add'>+ * returning -EINPROGRESS if it wants to wait for an event to happen.</div><div class='add'>+ *</div><div class='add'>+ * Note that according to the manual's driver example, the following operations</div><div class='add'>+ * may run independent of each other:</div><div class='add'>+ * - area reserve/read/write/release	(point 1 above)</div><div class='add'>+ * - mailbox operations			(point 2 above)</div><div class='add'>+ * - switching power on/off</div><div class='add'>+ *</div><div class='add'>+ * To allow them to run independently, each operation class gets its own queue.</div><div class='add'>+ *</div><div class='add'>+ * Userspace processes A, B, C, D post tasks to the appropriate queue,</div><div class='add'>+ * and wait for task completion:</div><div class='add'>+ *</div><div class='add'>+ *	process A	B	C	D</div><div class='add'>+ *		|	|	|	|</div><div class='add'>+ *		v	v	v	v</div><div class='add'>+ *	|&lt;-----	========================================</div><div class='add'>+ *	|		|	   |		|</div><div class='add'>+ *	|		v	   v		v-------&lt;-------+</div><div class='add'>+ *	|	+--------------------------------------+	|</div><div class='add'>+ *	|	| power q     | mbox q    | area q     |	|</div><div class='add'>+ *	|	|------------|------------|------------|	|</div><div class='add'>+ *	|	| task       | task       | task       |	|</div><div class='add'>+ *	|	| task       | task       | task       |	|</div><div class='add'>+ *	|	| task wait  | task wait  | task wait  |	|</div><div class='add'>+ *	|	+--------------------------------------+	|</div><div class='add'>+ *	|		^	   ^		^		|</div><div class='add'>+ *	|		|	   |		|		^</div><div class='add'>+ *	|	+--------------------------------------+	|</div><div class='add'>+ *	|	|	     queue thread	       |	|</div><div class='add'>+ *	|	|--------------------------------------|	|</div><div class='add'>+ *	|	| single-threaded:		       |	|</div><div class='add'>+ *	|	| loop:				       |	|</div><div class='add'>+ *	v	|   for each queue:		       |	|</div><div class='add'>+ *	|	|     run task state machine	       |	|</div><div class='add'>+ *	|	|     if task waiting:		       |	|</div><div class='add'>+ *	|	|       leave on queue		       |	|</div><div class='add'>+ *	|	|     if task done:		       |	|</div><div class='add'>+ *	|	|       complete task, remove from q   |	|</div><div class='add'>+ *	|	|   if software irq event bits set:    |	|</div><div class='add'>+ *	|	|     notify userspace		       |	|</div><div class='add'>+ *	|	|     post clear event bits task------&gt;|&gt;-------+</div><div class='add'>+ *	|	|   wait for IND_AB changed event OR   |</div><div class='add'>+ *	|	|            task added event	  OR   |</div><div class='add'>+ *	|	|	     timeout		       |</div><div class='add'>+ *	|	| end loop			       |</div><div class='add'>+ *	|	+--------------------------------------+</div><div class='add'>+ *	|	+		wake up		       +</div><div class='add'>+ *	|	+--------------------------------------+</div><div class='add'>+ *	|		^			^</div><div class='add'>+ *	|		|			|</div><div class='add'>+ *	+--------&gt;-------			|</div><div class='add'>+ *						|</div><div class='add'>+ *		+--------------------------------------+</div><div class='add'>+ *		|	interrupt service routine      |</div><div class='add'>+ *		|--------------------------------------|</div><div class='add'>+ *		| wake up queue thread on IND_AB change|</div><div class='add'>+ *		+--------------------------------------+</div><div class='add'>+ *</div><div class='add'>+ * Note that the Anybus interrupt is dual-purpose:</div><div class='add'>+ * - after a reset, triggered when the card becomes ready;</div><div class='add'>+ * - during normal operation, triggered when AB_IND changes.</div><div class='add'>+ * This is why the interrupt service routine doesn't just wake up the</div><div class='add'>+ * queue thread, but also completes the card_boot completion.</div><div class='add'>+ *</div><div class='add'>+ * [1] https://www.anybus.com/docs/librariesprovider7/default-document-library/</div><div class='add'>+ *	manuals-design-guides/hms-hmsi-27-275.pdf</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/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+</div><div class='add'>+/* move to &lt;linux/anybuss-*.h&gt; when taking this out of staging */</div><div class='add'>+#include "anybuss-client.h"</div><div class='add'>+#include "anybuss-controller.h"</div><div class='add'>+</div><div class='add'>+#define DPRAM_SIZE		0x800</div><div class='add'>+#define MAX_MBOX_MSG_SZ		0x0FF</div><div class='add'>+#define TIMEOUT			(HZ * 2)</div><div class='add'>+#define MAX_DATA_AREA_SZ	0x200</div><div class='add'>+#define MAX_FBCTRL_AREA_SZ	0x1BE</div><div class='add'>+</div><div class='add'>+#define REG_BOOTLOADER_V	0x7C0</div><div class='add'>+#define REG_API_V		0x7C2</div><div class='add'>+#define REG_FIELDBUS_V		0x7C4</div><div class='add'>+#define REG_SERIAL_NO		0x7C6</div><div class='add'>+#define REG_FIELDBUS_TYPE	0x7CC</div><div class='add'>+#define REG_MODULE_SW_V		0x7CE</div><div class='add'>+#define REG_IND_AB		0x7FF</div><div class='add'>+#define REG_IND_AP		0x7FE</div><div class='add'>+#define REG_EVENT_CAUSE		0x7ED</div><div class='add'>+#define MBOX_IN_AREA		0x400</div><div class='add'>+#define MBOX_OUT_AREA		0x520</div><div class='add'>+#define DATA_IN_AREA		0x000</div><div class='add'>+#define DATA_OUT_AREA		0x200</div><div class='add'>+#define FBCTRL_AREA		0x640</div><div class='add'>+</div><div class='add'>+#define EVENT_CAUSE_DC          0x01</div><div class='add'>+#define EVENT_CAUSE_FBOF        0x02</div><div class='add'>+#define EVENT_CAUSE_FBON        0x04</div><div class='add'>+</div><div class='add'>+#define IND_AB_UPDATED		0x08</div><div class='add'>+#define IND_AX_MIN		0x80</div><div class='add'>+#define IND_AX_MOUT		0x40</div><div class='add'>+#define IND_AX_IN		0x04</div><div class='add'>+#define IND_AX_OUT		0x02</div><div class='add'>+#define IND_AX_FBCTRL		0x01</div><div class='add'>+#define IND_AP_LOCK		0x08</div><div class='add'>+#define IND_AP_ACTION		0x10</div><div class='add'>+#define IND_AX_EVNT		0x20</div><div class='add'>+#define IND_AP_ABITS		(IND_AX_IN | IND_AX_OUT | \</div><div class='add'>+					IND_AX_FBCTRL | \</div><div class='add'>+					IND_AP_ACTION | IND_AP_LOCK)</div><div class='add'>+</div><div class='add'>+#define INFO_TYPE_FB		0x0002</div><div class='add'>+#define INFO_TYPE_APP		0x0001</div><div class='add'>+#define INFO_COMMAND		0x4000</div><div class='add'>+</div><div class='add'>+#define OP_MODE_FBFC		0x0002</div><div class='add'>+#define OP_MODE_FBS		0x0004</div><div class='add'>+#define OP_MODE_CD		0x0200</div><div class='add'>+</div><div class='add'>+#define CMD_START_INIT		0x0001</div><div class='add'>+#define CMD_ANYBUS_INIT		0x0002</div><div class='add'>+#define CMD_END_INIT		0x0003</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ---------------------------------------------------------------</div><div class='add'>+ * Anybus mailbox messages - definitions</div><div class='add'>+ * ---------------------------------------------------------------</div><div class='add'>+ * note that we're depending on the layout of these structures being</div><div class='add'>+ * exactly as advertised.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct anybus_mbox_hdr {</div><div class='add'>+	__be16 id;</div><div class='add'>+	__be16 info;</div><div class='add'>+	__be16 cmd_num;</div><div class='add'>+	__be16 data_size;</div><div class='add'>+	__be16 frame_count;</div><div class='add'>+	__be16 frame_num;</div><div class='add'>+	__be16 offset_high;</div><div class='add'>+	__be16 offset_low;</div><div class='add'>+	__be16 extended[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct msg_anybus_init {</div><div class='add'>+	__be16 input_io_len;</div><div class='add'>+	__be16 input_dpram_len;</div><div class='add'>+	__be16 input_total_len;</div><div class='add'>+	__be16 output_io_len;</div><div class='add'>+	__be16 output_dpram_len;</div><div class='add'>+	__be16 output_total_len;</div><div class='add'>+	__be16 op_mode;</div><div class='add'>+	__be16 notif_config;</div><div class='add'>+	__be16 wd_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ------------- ref counted tasks ------------- */</div><div class='add'>+</div><div class='add'>+struct ab_task;</div><div class='add'>+typedef int (*ab_task_fn_t)(struct anybuss_host *cd,</div><div class='add'>+					struct ab_task *t);</div><div class='add'>+typedef void (*ab_done_fn_t)(struct anybuss_host *cd);</div><div class='add'>+</div><div class='add'>+struct area_priv {</div><div class='add'>+	bool is_write;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u16 addr;</div><div class='add'>+	size_t count;</div><div class='add'>+	u8 buf[MAX_DATA_AREA_SZ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mbox_priv {</div><div class='add'>+	struct anybus_mbox_hdr hdr;</div><div class='add'>+	size_t msg_out_sz;</div><div class='add'>+	size_t msg_in_sz;</div><div class='add'>+	u8 msg[MAX_MBOX_MSG_SZ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ab_task {</div><div class='add'>+	struct kmem_cache	*cache;</div><div class='add'>+	struct kref		refcount;</div><div class='add'>+	ab_task_fn_t		task_fn;</div><div class='add'>+	ab_done_fn_t		done_fn;</div><div class='add'>+	int			result;</div><div class='add'>+	struct completion	done;</div><div class='add'>+	unsigned long		start_jiffies;</div><div class='add'>+	union {</div><div class='add'>+		struct area_priv area_pd;</div><div class='add'>+		struct mbox_priv mbox_pd;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ab_task *ab_task_create_get(struct kmem_cache *cache,</div><div class='add'>+					  ab_task_fn_t task_fn)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+</div><div class='add'>+	t = kmem_cache_alloc(cache, GFP_KERNEL);</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+	t-&gt;cache = cache;</div><div class='add'>+	kref_init(&amp;t-&gt;refcount);</div><div class='add'>+	t-&gt;task_fn = task_fn;</div><div class='add'>+	t-&gt;done_fn = NULL;</div><div class='add'>+	t-&gt;result = 0;</div><div class='add'>+	init_completion(&amp;t-&gt;done);</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ab_task_destroy(struct kref *refcount)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t = container_of(refcount, struct ab_task, refcount);</div><div class='add'>+	struct kmem_cache *cache = t-&gt;cache;</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(cache, t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ab_task_put(struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;t-&gt;refcount, __ab_task_destroy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ab_task *__ab_task_get(struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	kref_get(&amp;t-&gt;refcount);</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ab_task_finish(struct ab_task *t, struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	if (t-&gt;done_fn)</div><div class='add'>+		t-&gt;done_fn(cd);</div><div class='add'>+	complete(&amp;t-&gt;done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ab_task_dequeue_finish_put(struct kfifo *q, struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+</div><div class='add'>+	ret = kfifo_out(q, &amp;t, sizeof(t));</div><div class='add'>+	WARN_ON(!ret);</div><div class='add'>+	__ab_task_finish(t, cd);</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ab_task_enqueue(struct ab_task *t, struct kfifo *q, spinlock_t *slock,</div><div class='add'>+		wait_queue_head_t *wq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	t-&gt;start_jiffies = jiffies;</div><div class='add'>+	__ab_task_get(t);</div><div class='add'>+	ret = kfifo_in_spinlocked(q, &amp;t, sizeof(t), slock);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ab_task_put(t);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	wake_up(wq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ab_task_enqueue_wait(struct ab_task *t, struct kfifo *q, spinlock_t *slock,</div><div class='add'>+		     wait_queue_head_t *wq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ab_task_enqueue(t, q, slock, wq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = wait_for_completion_interruptible(&amp;t-&gt;done);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return t-&gt;result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------ anybus hardware ------------------------ */</div><div class='add'>+</div><div class='add'>+struct anybuss_host {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct anybuss_client *client;</div><div class='add'>+	void (*reset)(struct device *dev, bool assert);</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	int irq;</div><div class='add'>+	int host_idx;</div><div class='add'>+	struct task_struct *qthread;</div><div class='add'>+	wait_queue_head_t wq;</div><div class='add'>+	struct completion card_boot;</div><div class='add'>+	atomic_t ind_ab;</div><div class='add'>+	spinlock_t qlock; /* protects IN side of powerq, mboxq, areaq */</div><div class='add'>+	struct kmem_cache *qcache;</div><div class='add'>+	struct kfifo qs[3];</div><div class='add'>+	struct kfifo *powerq;</div><div class='add'>+	struct kfifo *mboxq;</div><div class='add'>+	struct kfifo *areaq;</div><div class='add'>+	bool power_on;</div><div class='add'>+	bool softint_pending;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void reset_assert(struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	cd-&gt;reset(cd-&gt;dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_deassert(struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	cd-&gt;reset(cd-&gt;dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_dpram(struct regmap *regmap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPRAM_SIZE; i++)</div><div class='add'>+		regmap_write(regmap, i, (u8)i);</div><div class='add'>+	for (i = 0; i &lt; DPRAM_SIZE; i++) {</div><div class='add'>+		regmap_read(regmap, i, &amp;val);</div><div class='add'>+		if ((u8)val != (u8)i)</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 read_ind_ab(struct regmap *regmap)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + HZ / 2;</div><div class='add'>+	unsigned int a, b, i = 0;</div><div class='add'>+</div><div class='add'>+	while (time_before_eq(jiffies, timeout)) {</div><div class='add'>+		regmap_read(regmap, REG_IND_AB, &amp;a);</div><div class='add'>+		regmap_read(regmap, REG_IND_AB, &amp;b);</div><div class='add'>+		if (likely(a == b))</div><div class='add'>+			return (int)a;</div><div class='add'>+		if (i &lt; 10) {</div><div class='add'>+			cpu_relax();</div><div class='add'>+			i++;</div><div class='add'>+		} else {</div><div class='add'>+			usleep_range(500, 1000);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	WARN(1, "IND_AB register not stable");</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_ind_ap(struct regmap *regmap, unsigned int ind_ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + HZ / 2;</div><div class='add'>+	unsigned int v, i = 0;</div><div class='add'>+</div><div class='add'>+	while (time_before_eq(jiffies, timeout)) {</div><div class='add'>+		regmap_write(regmap, REG_IND_AP, ind_ap);</div><div class='add'>+		regmap_read(regmap, REG_IND_AP, &amp;v);</div><div class='add'>+		if (likely(ind_ap == v))</div><div class='add'>+			return 0;</div><div class='add'>+		if (i &lt; 10) {</div><div class='add'>+			cpu_relax();</div><div class='add'>+			i++;</div><div class='add'>+		} else {</div><div class='add'>+			usleep_range(500, 1000);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	WARN(1, "IND_AP register not stable");</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t irq_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = data;</div><div class='add'>+	int ind_ab;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * irq handler needs exclusive access to the IND_AB register,</div><div class='add'>+	 * because the act of reading the register acks the interrupt.</div><div class='add'>+	 *</div><div class='add'>+	 * store the register value in cd-&gt;ind_ab (an atomic_t), so that the</div><div class='add'>+	 * queue thread is able to read it without causing an interrupt ack</div><div class='add'>+	 * side-effect (and without spuriously acking an interrupt).</div><div class='add'>+	 */</div><div class='add'>+	ind_ab = read_ind_ab(cd-&gt;regmap);</div><div class='add'>+	if (ind_ab &lt; 0)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	atomic_set(&amp;cd-&gt;ind_ab, ind_ab);</div><div class='add'>+	complete(&amp;cd-&gt;card_boot);</div><div class='add'>+	wake_up(&amp;cd-&gt;wq);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------ power on/off tasks --------------------- */</div><div class='add'>+</div><div class='add'>+static int task_fn_power_off(struct anybuss_host *cd,</div><div class='add'>+			     struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_client *client = cd-&gt;client;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return 0;</div><div class='add'>+	disable_irq(cd-&gt;irq);</div><div class='add'>+	reset_assert(cd);</div><div class='add'>+	atomic_set(&amp;cd-&gt;ind_ab, IND_AB_UPDATED);</div><div class='add'>+	if (client-&gt;on_online_changed)</div><div class='add'>+		client-&gt;on_online_changed(client, false);</div><div class='add'>+	cd-&gt;power_on = false;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int task_fn_power_on_2(struct anybuss_host *cd,</div><div class='add'>+			      struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	if (completion_done(&amp;cd-&gt;card_boot)) {</div><div class='add'>+		cd-&gt;power_on = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (time_after(jiffies, t-&gt;start_jiffies + TIMEOUT)) {</div><div class='add'>+		disable_irq(cd-&gt;irq);</div><div class='add'>+		reset_assert(cd);</div><div class='add'>+		dev_err(cd-&gt;dev, "power on timed out");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int task_fn_power_on(struct anybuss_host *cd,</div><div class='add'>+			    struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	unsigned int dummy;</div><div class='add'>+</div><div class='add'>+	if (cd-&gt;power_on)</div><div class='add'>+		return 0;</div><div class='add'>+	/*</div><div class='add'>+	 * anybus docs: prevent false 'init done' interrupt by</div><div class='add'>+	 * doing a dummy read of IND_AB register while in reset.</div><div class='add'>+	 */</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AB, &amp;dummy);</div><div class='add'>+	reinit_completion(&amp;cd-&gt;card_boot);</div><div class='add'>+	enable_irq(cd-&gt;irq);</div><div class='add'>+	reset_deassert(cd);</div><div class='add'>+	t-&gt;task_fn = task_fn_power_on_2;</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int anybuss_set_power(struct anybuss_client *client, bool power_on)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	t = ab_task_create_get(cd-&gt;qcache, power_on ?</div><div class='add'>+				task_fn_power_on : task_fn_power_off);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	err = ab_task_enqueue_wait(t, cd-&gt;powerq, &amp;cd-&gt;qlock, &amp;cd-&gt;wq);</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_set_power);</div><div class='add'>+</div><div class='add'>+/* ---------------------------- area tasks ------------------------ */</div><div class='add'>+</div><div class='add'>+static int task_fn_area_3(struct anybuss_host *cd, struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	struct area_priv *pd = &amp;t-&gt;area_pd;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (atomic_read(&amp;cd-&gt;ind_ab) &amp; pd-&gt;flags) {</div><div class='add'>+		/* area not released yet */</div><div class='add'>+		if (time_after(jiffies, t-&gt;start_jiffies + TIMEOUT))</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int task_fn_area_2(struct anybuss_host *cd, struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	struct area_priv *pd = &amp;t-&gt;area_pd;</div><div class='add'>+	unsigned int ind_ap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return -EIO;</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AP, &amp;ind_ap);</div><div class='add'>+	if (!(atomic_read(&amp;cd-&gt;ind_ab) &amp; pd-&gt;flags)) {</div><div class='add'>+		/* we don't own the area yet */</div><div class='add'>+		if (time_after(jiffies, t-&gt;start_jiffies + TIMEOUT)) {</div><div class='add'>+			dev_warn(cd-&gt;dev, "timeout waiting for area");</div><div class='add'>+			dump_stack();</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+	}</div><div class='add'>+	/* we own the area, do what we're here to do */</div><div class='add'>+	if (pd-&gt;is_write)</div><div class='add'>+		regmap_bulk_write(cd-&gt;regmap, pd-&gt;addr, pd-&gt;buf,</div><div class='add'>+				  pd-&gt;count);</div><div class='add'>+	else</div><div class='add'>+		regmap_bulk_read(cd-&gt;regmap, pd-&gt;addr, pd-&gt;buf,</div><div class='add'>+				 pd-&gt;count);</div><div class='add'>+	/* ask to release the area, must use unlocked release */</div><div class='add'>+	ind_ap &amp;= ~IND_AP_ABITS;</div><div class='add'>+	ind_ap |= pd-&gt;flags;</div><div class='add'>+	ret = write_ind_ap(cd-&gt;regmap, ind_ap);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	t-&gt;task_fn = task_fn_area_3;</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int task_fn_area(struct anybuss_host *cd, struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	struct area_priv *pd = &amp;t-&gt;area_pd;</div><div class='add'>+	unsigned int ind_ap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return -EIO;</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AP, &amp;ind_ap);</div><div class='add'>+	/* ask to take the area */</div><div class='add'>+	ind_ap &amp;= ~IND_AP_ABITS;</div><div class='add'>+	ind_ap |= pd-&gt;flags | IND_AP_ACTION | IND_AP_LOCK;</div><div class='add'>+	ret = write_ind_ap(cd-&gt;regmap, ind_ap);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	t-&gt;task_fn = task_fn_area_2;</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ab_task *</div><div class='add'>+create_area_reader(struct kmem_cache *qcache, u16 flags, u16 addr,</div><div class='add'>+		   size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	struct area_priv *ap;</div><div class='add'>+</div><div class='add'>+	t = ab_task_create_get(qcache, task_fn_area);</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+	ap = &amp;t-&gt;area_pd;</div><div class='add'>+	ap-&gt;flags = flags;</div><div class='add'>+	ap-&gt;addr = addr;</div><div class='add'>+	ap-&gt;is_write = false;</div><div class='add'>+	ap-&gt;count = count;</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ab_task *</div><div class='add'>+create_area_writer(struct kmem_cache *qcache, u16 flags, u16 addr,</div><div class='add'>+		   const void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	struct area_priv *ap;</div><div class='add'>+</div><div class='add'>+	t = ab_task_create_get(qcache, task_fn_area);</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+	ap = &amp;t-&gt;area_pd;</div><div class='add'>+	ap-&gt;flags = flags;</div><div class='add'>+	ap-&gt;addr = addr;</div><div class='add'>+	ap-&gt;is_write = true;</div><div class='add'>+	ap-&gt;count = count;</div><div class='add'>+	memcpy(ap-&gt;buf, buf, count);</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ab_task *</div><div class='add'>+create_area_user_writer(struct kmem_cache *qcache, u16 flags, u16 addr,</div><div class='add'>+			const void __user *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	struct area_priv *ap;</div><div class='add'>+</div><div class='add'>+	t = ab_task_create_get(qcache, task_fn_area);</div><div class='add'>+	if (!t)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	ap = &amp;t-&gt;area_pd;</div><div class='add'>+	ap-&gt;flags = flags;</div><div class='add'>+	ap-&gt;addr = addr;</div><div class='add'>+	ap-&gt;is_write = true;</div><div class='add'>+	ap-&gt;count = count;</div><div class='add'>+	if (copy_from_user(ap-&gt;buf, buf, count)) {</div><div class='add'>+		ab_task_put(t);</div><div class='add'>+		return ERR_PTR(-EFAULT);</div><div class='add'>+	}</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool area_range_ok(u16 addr, size_t count, u16 area_start,</div><div class='add'>+			  size_t area_sz)</div><div class='add'>+{</div><div class='add'>+	u16 area_end_ex = area_start + area_sz;</div><div class='add'>+	u16 addr_end_ex;</div><div class='add'>+</div><div class='add'>+	if (addr &lt; area_start)</div><div class='add'>+		return false;</div><div class='add'>+	if (addr &gt;= area_end_ex)</div><div class='add'>+		return false;</div><div class='add'>+	addr_end_ex = addr + count;</div><div class='add'>+	if (addr_end_ex &gt; area_end_ex)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------------------------- mailbox tasks ----------------------- */</div><div class='add'>+</div><div class='add'>+static int task_fn_mbox_2(struct anybuss_host *cd, struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	struct mbox_priv *pd = &amp;t-&gt;mbox_pd;</div><div class='add'>+	unsigned int ind_ap;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return -EIO;</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AP, &amp;ind_ap);</div><div class='add'>+	if (((atomic_read(&amp;cd-&gt;ind_ab) ^ ind_ap) &amp; IND_AX_MOUT) == 0) {</div><div class='add'>+		/* output message not here */</div><div class='add'>+		if (time_after(jiffies, t-&gt;start_jiffies + TIMEOUT))</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+	}</div><div class='add'>+	/* grab the returned header and msg */</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, MBOX_OUT_AREA, &amp;pd-&gt;hdr,</div><div class='add'>+			 sizeof(pd-&gt;hdr));</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, MBOX_OUT_AREA + sizeof(pd-&gt;hdr),</div><div class='add'>+			 pd-&gt;msg, pd-&gt;msg_in_sz);</div><div class='add'>+	/* tell anybus we've consumed the message */</div><div class='add'>+	ind_ap ^= IND_AX_MOUT;</div><div class='add'>+	return write_ind_ap(cd-&gt;regmap, ind_ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int task_fn_mbox(struct anybuss_host *cd, struct ab_task *t)</div><div class='add'>+{</div><div class='add'>+	struct mbox_priv *pd = &amp;t-&gt;mbox_pd;</div><div class='add'>+	unsigned int ind_ap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return -EIO;</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AP, &amp;ind_ap);</div><div class='add'>+	if ((atomic_read(&amp;cd-&gt;ind_ab) ^ ind_ap) &amp; IND_AX_MIN) {</div><div class='add'>+		/* mbox input area busy */</div><div class='add'>+		if (time_after(jiffies, t-&gt;start_jiffies + TIMEOUT))</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+	}</div><div class='add'>+	/* write the header and msg to input area */</div><div class='add'>+	regmap_bulk_write(cd-&gt;regmap, MBOX_IN_AREA, &amp;pd-&gt;hdr,</div><div class='add'>+			  sizeof(pd-&gt;hdr));</div><div class='add'>+	regmap_bulk_write(cd-&gt;regmap, MBOX_IN_AREA + sizeof(pd-&gt;hdr),</div><div class='add'>+			  pd-&gt;msg, pd-&gt;msg_out_sz);</div><div class='add'>+	/* tell anybus we gave it a message */</div><div class='add'>+	ind_ap ^= IND_AX_MIN;</div><div class='add'>+	ret = write_ind_ap(cd-&gt;regmap, ind_ap);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	t-&gt;start_jiffies = jiffies;</div><div class='add'>+	t-&gt;task_fn = task_fn_mbox_2;</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void log_invalid_other(struct device *dev,</div><div class='add'>+			      struct anybus_mbox_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	size_t ext_offs = ARRAY_SIZE(hdr-&gt;extended) - 1;</div><div class='add'>+	u16 code = be16_to_cpu(hdr-&gt;extended[ext_offs]);</div><div class='add'>+</div><div class='add'>+	dev_err(dev, "   Invalid other: [0x%02X]", code);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const EMSGS[] = {</div><div class='add'>+	"Invalid Message ID",</div><div class='add'>+	"Invalid Message Type",</div><div class='add'>+	"Invalid Command",</div><div class='add'>+	"Invalid Data Size",</div><div class='add'>+	"Message Header Malformed (offset 008h)",</div><div class='add'>+	"Message Header Malformed (offset 00Ah)",</div><div class='add'>+	"Message Header Malformed (offset 00Ch - 00Dh)",</div><div class='add'>+	"Invalid Address",</div><div class='add'>+	"Invalid Response",</div><div class='add'>+	"Flash Config Error",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mbox_cmd_err(struct device *dev, struct mbox_priv *mpriv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 ecode;</div><div class='add'>+	struct anybus_mbox_hdr *hdr = &amp;mpriv-&gt;hdr;</div><div class='add'>+	u16 info = be16_to_cpu(hdr-&gt;info);</div><div class='add'>+	u8 *phdr = (u8 *)hdr;</div><div class='add'>+	u8 *pmsg = mpriv-&gt;msg;</div><div class='add'>+</div><div class='add'>+	if (!(info &amp; 0x8000))</div><div class='add'>+		return 0;</div><div class='add'>+	ecode = (info &gt;&gt; 8) &amp; 0x0F;</div><div class='add'>+	dev_err(dev, "mailbox command failed:");</div><div class='add'>+	if (ecode == 0x0F)</div><div class='add'>+		log_invalid_other(dev, hdr);</div><div class='add'>+	else if (ecode &lt; ARRAY_SIZE(EMSGS))</div><div class='add'>+		dev_err(dev, "   Error code: %s (0x%02X)",</div><div class='add'>+			EMSGS[ecode], ecode);</div><div class='add'>+	else</div><div class='add'>+		dev_err(dev, "   Error code: 0x%02X\n", ecode);</div><div class='add'>+	dev_err(dev, "Failed command:");</div><div class='add'>+	dev_err(dev, "Message Header:");</div><div class='add'>+	for (i = 0; i &lt; sizeof(mpriv-&gt;hdr); i += 2)</div><div class='add'>+		dev_err(dev, "%02X%02X", phdr[i], phdr[i + 1]);</div><div class='add'>+	dev_err(dev, "Message Data:");</div><div class='add'>+	for (i = 0; i &lt; mpriv-&gt;msg_in_sz; i += 2)</div><div class='add'>+		dev_err(dev, "%02X%02X", pmsg[i], pmsg[i + 1]);</div><div class='add'>+	dev_err(dev, "Stack dump:");</div><div class='add'>+	dump_stack();</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _anybus_mbox_cmd(struct anybuss_host *cd,</div><div class='add'>+			    u16 cmd_num, bool is_fb_cmd,</div><div class='add'>+				const void *msg_out, size_t msg_out_sz,</div><div class='add'>+				void *msg_in, size_t msg_in_sz,</div><div class='add'>+				const void *ext, size_t ext_sz)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	struct mbox_priv *pd;</div><div class='add'>+	struct anybus_mbox_hdr *h;</div><div class='add'>+	size_t msg_sz = max(msg_in_sz, msg_out_sz);</div><div class='add'>+	u16 info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (msg_sz &gt; MAX_MBOX_MSG_SZ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (ext &amp;&amp; ext_sz &gt; sizeof(h-&gt;extended))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	t = ab_task_create_get(cd-&gt;qcache, task_fn_mbox);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pd = &amp;t-&gt;mbox_pd;</div><div class='add'>+	h = &amp;pd-&gt;hdr;</div><div class='add'>+	info = is_fb_cmd ? INFO_TYPE_FB : INFO_TYPE_APP;</div><div class='add'>+	/*</div><div class='add'>+	 * prevent uninitialized memory in the header from being sent</div><div class='add'>+	 * across the anybus</div><div class='add'>+	 */</div><div class='add'>+	memset(h, 0, sizeof(*h));</div><div class='add'>+	h-&gt;info = cpu_to_be16(info | INFO_COMMAND);</div><div class='add'>+	h-&gt;cmd_num = cpu_to_be16(cmd_num);</div><div class='add'>+	h-&gt;data_size = cpu_to_be16(msg_out_sz);</div><div class='add'>+	h-&gt;frame_count = cpu_to_be16(1);</div><div class='add'>+	h-&gt;frame_num = cpu_to_be16(1);</div><div class='add'>+	h-&gt;offset_high = cpu_to_be16(0);</div><div class='add'>+	h-&gt;offset_low = cpu_to_be16(0);</div><div class='add'>+	if (ext)</div><div class='add'>+		memcpy(h-&gt;extended, ext, ext_sz);</div><div class='add'>+	memcpy(pd-&gt;msg, msg_out, msg_out_sz);</div><div class='add'>+	pd-&gt;msg_out_sz = msg_out_sz;</div><div class='add'>+	pd-&gt;msg_in_sz = msg_in_sz;</div><div class='add'>+	err = ab_task_enqueue_wait(t, cd-&gt;powerq, &amp;cd-&gt;qlock, &amp;cd-&gt;wq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * mailbox mechanism worked ok, but maybe the mbox response</div><div class='add'>+	 * contains an error ?</div><div class='add'>+	 */</div><div class='add'>+	err = mbox_cmd_err(cd-&gt;dev, pd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	memcpy(msg_in, pd-&gt;msg, msg_in_sz);</div><div class='add'>+out:</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------ anybus queues ------------------------ */</div><div class='add'>+</div><div class='add'>+static void process_q(struct anybuss_host *cd, struct kfifo *q)</div><div class='add'>+{</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kfifo_out_peek(q, &amp;t, sizeof(t));</div><div class='add'>+	if (!ret)</div><div class='add'>+		return;</div><div class='add'>+	t-&gt;result = t-&gt;task_fn(cd, t);</div><div class='add'>+	if (t-&gt;result != -EINPROGRESS)</div><div class='add'>+		ab_task_dequeue_finish_put(q, cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool qs_have_work(struct kfifo *qs, size_t num)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++, qs++) {</div><div class='add'>+		ret = kfifo_out_peek(qs, &amp;t, sizeof(t));</div><div class='add'>+		if (ret &amp;&amp; (t-&gt;result != -EINPROGRESS))</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 process_qs(struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	struct kfifo *qs = cd-&gt;qs;</div><div class='add'>+	size_t nqs = ARRAY_SIZE(cd-&gt;qs);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nqs; i++, qs++)</div><div class='add'>+		process_q(cd, qs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void softint_ack(struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	unsigned int ind_ap;</div><div class='add'>+</div><div class='add'>+	cd-&gt;softint_pending = false;</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return;</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AP, &amp;ind_ap);</div><div class='add'>+	ind_ap &amp;= ~IND_AX_EVNT;</div><div class='add'>+	ind_ap |= atomic_read(&amp;cd-&gt;ind_ab) &amp; IND_AX_EVNT;</div><div class='add'>+	write_ind_ap(cd-&gt;regmap, ind_ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_softint(struct anybuss_host *cd)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_client *client = cd-&gt;client;</div><div class='add'>+	static const u8 zero;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int ind_ap, ev;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+</div><div class='add'>+	if (!cd-&gt;power_on)</div><div class='add'>+		return;</div><div class='add'>+	if (cd-&gt;softint_pending)</div><div class='add'>+		return;</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_IND_AP, &amp;ind_ap);</div><div class='add'>+	if (!((atomic_read(&amp;cd-&gt;ind_ab) ^ ind_ap) &amp; IND_AX_EVNT))</div><div class='add'>+		return;</div><div class='add'>+	/* process software interrupt */</div><div class='add'>+	regmap_read(cd-&gt;regmap, REG_EVENT_CAUSE, &amp;ev);</div><div class='add'>+	if (ev &amp; EVENT_CAUSE_FBON) {</div><div class='add'>+		if (client-&gt;on_online_changed)</div><div class='add'>+			client-&gt;on_online_changed(client, true);</div><div class='add'>+		dev_dbg(cd-&gt;dev, "Fieldbus ON");</div><div class='add'>+	}</div><div class='add'>+	if (ev &amp; EVENT_CAUSE_FBOF) {</div><div class='add'>+		if (client-&gt;on_online_changed)</div><div class='add'>+			client-&gt;on_online_changed(client, false);</div><div class='add'>+		dev_dbg(cd-&gt;dev, "Fieldbus OFF");</div><div class='add'>+	}</div><div class='add'>+	if (ev &amp; EVENT_CAUSE_DC) {</div><div class='add'>+		if (client-&gt;on_area_updated)</div><div class='add'>+			client-&gt;on_area_updated(client);</div><div class='add'>+		dev_dbg(cd-&gt;dev, "Fieldbus data changed");</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * reset the event cause bits.</div><div class='add'>+	 * this must be done while owning the fbctrl area, so we'll</div><div class='add'>+	 * enqueue a task to do that.</div><div class='add'>+	 */</div><div class='add'>+	t = create_area_writer(cd-&gt;qcache, IND_AX_FBCTRL,</div><div class='add'>+			       REG_EVENT_CAUSE, &amp;zero, sizeof(zero));</div><div class='add'>+	if (!t) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;done_fn = softint_ack;</div><div class='add'>+	ret = ab_task_enqueue(t, cd-&gt;powerq, &amp;cd-&gt;qlock, &amp;cd-&gt;wq);</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+	cd-&gt;softint_pending = true;</div><div class='add'>+out:</div><div class='add'>+	WARN_ON(ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		softint_ack(cd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qthread_fn(void *data)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = data;</div><div class='add'>+	struct kfifo *qs = cd-&gt;qs;</div><div class='add'>+	size_t nqs = ARRAY_SIZE(cd-&gt;qs);</div><div class='add'>+	unsigned int ind_ab;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this kernel thread has exclusive access to the anybus's memory.</div><div class='add'>+	 * only exception: the IND_AB register, which is accessed exclusively</div><div class='add'>+	 * by the interrupt service routine (ISR). This thread must not touch</div><div class='add'>+	 * the IND_AB register, but it does require access to its value.</div><div class='add'>+	 *</div><div class='add'>+	 * the interrupt service routine stores the register's value in</div><div class='add'>+	 * cd-&gt;ind_ab (an atomic_t), where we may safely access it, with the</div><div class='add'>+	 * understanding that it can be modified by the ISR at any time.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='add'>+		/*</div><div class='add'>+		 * make a local copy of IND_AB, so we can go around the loop</div><div class='add'>+		 * again in case it changed while processing queues and softint.</div><div class='add'>+		 */</div><div class='add'>+		ind_ab = atomic_read(&amp;cd-&gt;ind_ab);</div><div class='add'>+		process_qs(cd);</div><div class='add'>+		process_softint(cd);</div><div class='add'>+		wait_event_timeout(cd-&gt;wq,</div><div class='add'>+				   (atomic_read(&amp;cd-&gt;ind_ab) != ind_ab) ||</div><div class='add'>+				qs_have_work(qs, nqs) ||</div><div class='add'>+				kthread_should_stop(),</div><div class='add'>+			HZ);</div><div class='add'>+		/*</div><div class='add'>+		 * time out so even 'stuck' tasks will run eventually,</div><div class='add'>+		 * and can time out.</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'>+/* ------------------------ anybus exports ------------------------ */</div><div class='add'>+</div><div class='add'>+int anybuss_start_init(struct anybuss_client *client,</div><div class='add'>+		       const struct anybuss_memcfg *cfg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 op_mode;</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+	struct msg_anybus_init msg = {</div><div class='add'>+		.input_io_len = cpu_to_be16(cfg-&gt;input_io),</div><div class='add'>+		.input_dpram_len = cpu_to_be16(cfg-&gt;input_dpram),</div><div class='add'>+		.input_total_len = cpu_to_be16(cfg-&gt;input_total),</div><div class='add'>+		.output_io_len = cpu_to_be16(cfg-&gt;output_io),</div><div class='add'>+		.output_dpram_len = cpu_to_be16(cfg-&gt;output_dpram),</div><div class='add'>+		.output_total_len = cpu_to_be16(cfg-&gt;output_total),</div><div class='add'>+		.notif_config = cpu_to_be16(0x000F),</div><div class='add'>+		.wd_val = cpu_to_be16(0),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (cfg-&gt;offl_mode) {</div><div class='add'>+	case AB_OFFL_MODE_CLEAR:</div><div class='add'>+		op_mode = 0;</div><div class='add'>+		break;</div><div class='add'>+	case AB_OFFL_MODE_FREEZE:</div><div class='add'>+		op_mode = OP_MODE_FBFC;</div><div class='add'>+		break;</div><div class='add'>+	case AB_OFFL_MODE_SET:</div><div class='add'>+		op_mode = OP_MODE_FBS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	msg.op_mode = cpu_to_be16(op_mode | OP_MODE_CD);</div><div class='add'>+	ret = _anybus_mbox_cmd(cd, CMD_START_INIT, false, NULL, 0,</div><div class='add'>+			       NULL, 0, NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return _anybus_mbox_cmd(cd, CMD_ANYBUS_INIT, false,</div><div class='add'>+			&amp;msg, sizeof(msg), NULL, 0, NULL, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_start_init);</div><div class='add'>+</div><div class='add'>+int anybuss_finish_init(struct anybuss_client *client)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+</div><div class='add'>+	return _anybus_mbox_cmd(cd, CMD_END_INIT, false, NULL, 0,</div><div class='add'>+					NULL, 0, NULL, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_finish_init);</div><div class='add'>+</div><div class='add'>+int anybuss_read_fbctrl(struct anybuss_client *client, u16 addr,</div><div class='add'>+			void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!area_range_ok(addr, count, FBCTRL_AREA,</div><div class='add'>+			   MAX_FBCTRL_AREA_SZ))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	t = create_area_reader(cd-&gt;qcache, IND_AX_FBCTRL, addr, count);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ret = ab_task_enqueue_wait(t, cd-&gt;powerq, &amp;cd-&gt;qlock, &amp;cd-&gt;wq);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	memcpy(buf, t-&gt;area_pd.buf, count);</div><div class='add'>+out:</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_read_fbctrl);</div><div class='add'>+</div><div class='add'>+int anybuss_write_input(struct anybuss_client *client,</div><div class='add'>+			const char __user *buf, size_t size,</div><div class='add'>+				loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	ssize_t len = min_t(loff_t, MAX_DATA_AREA_SZ - *offset, size);</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+	t = create_area_user_writer(cd-&gt;qcache, IND_AX_IN,</div><div class='add'>+				    DATA_IN_AREA + *offset, buf, len);</div><div class='add'>+	if (IS_ERR(t))</div><div class='add'>+		return PTR_ERR(t);</div><div class='add'>+	ret = ab_task_enqueue_wait(t, cd-&gt;powerq, &amp;cd-&gt;qlock, &amp;cd-&gt;wq);</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	/* success */</div><div class='add'>+	*offset += len;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_write_input);</div><div class='add'>+</div><div class='add'>+int anybuss_read_output(struct anybuss_client *client,</div><div class='add'>+			char __user *buf, size_t size,</div><div class='add'>+				loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	ssize_t len = min_t(loff_t, MAX_DATA_AREA_SZ - *offset, size);</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+	struct ab_task *t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+	t = create_area_reader(cd-&gt;qcache, IND_AX_OUT,</div><div class='add'>+			       DATA_OUT_AREA + *offset, len);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ret = ab_task_enqueue_wait(t, cd-&gt;powerq, &amp;cd-&gt;qlock, &amp;cd-&gt;wq);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	if (copy_to_user(buf, t-&gt;area_pd.buf, len))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+out:</div><div class='add'>+	ab_task_put(t);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	/* success */</div><div class='add'>+	*offset += len;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_read_output);</div><div class='add'>+</div><div class='add'>+int anybuss_send_msg(struct anybuss_client *client, u16 cmd_num,</div><div class='add'>+		     const void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+</div><div class='add'>+	return _anybus_mbox_cmd(cd, cmd_num, true, buf, count, NULL, 0,</div><div class='add'>+					NULL, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_send_msg);</div><div class='add'>+</div><div class='add'>+int anybuss_send_ext(struct anybuss_client *client, u16 cmd_num,</div><div class='add'>+		     const void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+</div><div class='add'>+	return _anybus_mbox_cmd(cd, cmd_num, true, NULL, 0, NULL, 0,</div><div class='add'>+					buf, count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_send_ext);</div><div class='add'>+</div><div class='add'>+int anybuss_recv_msg(struct anybuss_client *client, u16 cmd_num,</div><div class='add'>+		     void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = client-&gt;host;</div><div class='add'>+</div><div class='add'>+	return _anybus_mbox_cmd(cd, cmd_num, true, NULL, 0, buf, count,</div><div class='add'>+					NULL, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_recv_msg);</div><div class='add'>+</div><div class='add'>+/* ------------------------ bus functions ------------------------ */</div><div class='add'>+</div><div class='add'>+static int anybus_bus_match(struct device *dev,</div><div class='add'>+			    struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_client_driver *adrv =</div><div class='add'>+		to_anybuss_client_driver(drv);</div><div class='add'>+	struct anybuss_client *adev =</div><div class='add'>+		to_anybuss_client(dev);</div><div class='add'>+</div><div class='add'>+	return adrv-&gt;anybus_id == be16_to_cpu(adev-&gt;anybus_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anybus_bus_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_client_driver *adrv =</div><div class='add'>+		to_anybuss_client_driver(dev-&gt;driver);</div><div class='add'>+	struct anybuss_client *adev =</div><div class='add'>+		to_anybuss_client(dev);</div><div class='add'>+</div><div class='add'>+	if (!adrv-&gt;probe)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	return adrv-&gt;probe(adev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anybus_bus_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_client_driver *adrv =</div><div class='add'>+		to_anybuss_client_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (adrv-&gt;remove)</div><div class='add'>+		return adrv-&gt;remove(to_anybuss_client(dev));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bus_type anybus_bus = {</div><div class='add'>+	.name		= "anybuss",</div><div class='add'>+	.match		= anybus_bus_match,</div><div class='add'>+	.probe		= anybus_bus_probe,</div><div class='add'>+	.remove		= anybus_bus_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int anybuss_client_driver_register(struct anybuss_client_driver *drv)</div><div class='add'>+{</div><div class='add'>+	drv-&gt;driver.bus = &amp;anybus_bus;</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_client_driver_register);</div><div class='add'>+</div><div class='add'>+void anybuss_client_driver_unregister(struct anybuss_client_driver *drv)</div><div class='add'>+{</div><div class='add'>+	return driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_client_driver_unregister);</div><div class='add'>+</div><div class='add'>+static void client_device_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(to_anybuss_client(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int taskq_alloc(struct device *dev, struct kfifo *q)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t size = 64 * sizeof(struct ab_task *);</div><div class='add'>+</div><div class='add'>+	buf = devm_kzalloc(dev, size, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return kfifo_init(q, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anybus_of_get_host_idx(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	const __be32 *host_idx;</div><div class='add'>+</div><div class='add'>+	host_idx = of_get_address(np, 0, NULL, NULL);</div><div class='add'>+	if (!host_idx)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	return __be32_to_cpu(*host_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node *</div><div class='add'>+anybus_of_find_child_device(struct device *dev, int host_idx)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node;</div><div class='add'>+</div><div class='add'>+	if (!dev || !dev-&gt;of_node)</div><div class='add'>+		return NULL;</div><div class='add'>+	for_each_child_of_node(dev-&gt;of_node, node) {</div><div class='add'>+		if (anybus_of_get_host_idx(node) == host_idx)</div><div class='add'>+			return node;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct anybuss_host * __must_check</div><div class='add'>+anybuss_host_common_probe(struct device *dev,</div><div class='add'>+			  const struct anybuss_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 val[4];</div><div class='add'>+	__be16 fieldbus_type;</div><div class='add'>+	struct anybuss_host *cd;</div><div class='add'>+</div><div class='add'>+	cd = devm_kzalloc(dev, sizeof(*cd), GFP_KERNEL);</div><div class='add'>+	if (!cd)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	cd-&gt;dev = dev;</div><div class='add'>+	cd-&gt;host_idx = ops-&gt;host_idx;</div><div class='add'>+	init_completion(&amp;cd-&gt;card_boot);</div><div class='add'>+	init_waitqueue_head(&amp;cd-&gt;wq);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cd-&gt;qs); i++) {</div><div class='add'>+		ret = taskq_alloc(dev, &amp;cd-&gt;qs[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+	if (WARN_ON(ARRAY_SIZE(cd-&gt;qs) &lt; 3))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	cd-&gt;powerq = &amp;cd-&gt;qs[0];</div><div class='add'>+	cd-&gt;mboxq = &amp;cd-&gt;qs[1];</div><div class='add'>+	cd-&gt;areaq = &amp;cd-&gt;qs[2];</div><div class='add'>+	cd-&gt;reset = ops-&gt;reset;</div><div class='add'>+	if (!cd-&gt;reset)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	cd-&gt;regmap = ops-&gt;regmap;</div><div class='add'>+	if (!cd-&gt;regmap)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	spin_lock_init(&amp;cd-&gt;qlock);</div><div class='add'>+	cd-&gt;qcache = kmem_cache_create(dev_name(dev),</div><div class='add'>+				       sizeof(struct ab_task), 0, 0, NULL);</div><div class='add'>+	if (!cd-&gt;qcache)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	cd-&gt;irq = ops-&gt;irq;</div><div class='add'>+	if (cd-&gt;irq &lt;= 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_qcache;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * use a dpram test to check if a card is present, this is only</div><div class='add'>+	 * possible while in reset.</div><div class='add'>+	 */</div><div class='add'>+	reset_assert(cd);</div><div class='add'>+	if (test_dpram(cd-&gt;regmap)) {</div><div class='add'>+		dev_err(dev, "no Anybus-S card in slot");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_qcache;</div><div class='add'>+	}</div><div class='add'>+	ret = devm_request_threaded_irq(dev, cd-&gt;irq, NULL, irq_handler,</div><div class='add'>+					IRQF_ONESHOT, dev_name(dev), cd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "could not request irq");</div><div class='add'>+		goto err_qcache;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * startup sequence:</div><div class='add'>+	 *   perform dummy IND_AB read to prevent false 'init done' irq</div><div class='add'>+	 *     (already done by test_dpram() above)</div><div class='add'>+	 *   release reset</div><div class='add'>+	 *   wait for first interrupt</div><div class='add'>+	 *   interrupt came in: ready to go !</div><div class='add'>+	 */</div><div class='add'>+	reset_deassert(cd);</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;cd-&gt;card_boot, TIMEOUT)) {</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		goto err_reset;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * according to the anybus docs, we're allowed to read these</div><div class='add'>+	 * without handshaking / reserving the area</div><div class='add'>+	 */</div><div class='add'>+	dev_info(dev, "Anybus-S card detected");</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, REG_BOOTLOADER_V, val, 2);</div><div class='add'>+	dev_info(dev, "Bootloader version: %02X%02X",</div><div class='add'>+		 val[0], val[1]);</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, REG_API_V, val, 2);</div><div class='add'>+	dev_info(dev, "API version: %02X%02X", val[0], val[1]);</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, REG_FIELDBUS_V, val, 2);</div><div class='add'>+	dev_info(dev, "Fieldbus version: %02X%02X", val[0], val[1]);</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, REG_SERIAL_NO, val, 4);</div><div class='add'>+	dev_info(dev, "Serial number: %02X%02X%02X%02X",</div><div class='add'>+		 val[0], val[1], val[2], val[3]);</div><div class='add'>+	add_device_randomness(&amp;val, 4);</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, REG_FIELDBUS_TYPE, &amp;fieldbus_type,</div><div class='add'>+			 sizeof(fieldbus_type));</div><div class='add'>+	dev_info(dev, "Fieldbus type: %04X", be16_to_cpu(fieldbus_type));</div><div class='add'>+	regmap_bulk_read(cd-&gt;regmap, REG_MODULE_SW_V, val, 2);</div><div class='add'>+	dev_info(dev, "Module SW version: %02X%02X",</div><div class='add'>+		 val[0], val[1]);</div><div class='add'>+	/* put card back reset until a client driver releases it */</div><div class='add'>+	disable_irq(cd-&gt;irq);</div><div class='add'>+	reset_assert(cd);</div><div class='add'>+	atomic_set(&amp;cd-&gt;ind_ab, IND_AB_UPDATED);</div><div class='add'>+	/* fire up the queue thread */</div><div class='add'>+	cd-&gt;qthread = kthread_run(qthread_fn, cd, dev_name(dev));</div><div class='add'>+	if (IS_ERR(cd-&gt;qthread)) {</div><div class='add'>+		dev_err(dev, "could not create kthread");</div><div class='add'>+		ret = PTR_ERR(cd-&gt;qthread);</div><div class='add'>+		goto err_reset;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * now advertise that we've detected a client device (card).</div><div class='add'>+	 * the bus infrastructure will match it to a client driver.</div><div class='add'>+	 */</div><div class='add'>+	cd-&gt;client = kzalloc(sizeof(*cd-&gt;client), GFP_KERNEL);</div><div class='add'>+	if (!cd-&gt;client) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_kthread;</div><div class='add'>+	}</div><div class='add'>+	cd-&gt;client-&gt;anybus_id = fieldbus_type;</div><div class='add'>+	cd-&gt;client-&gt;host = cd;</div><div class='add'>+	cd-&gt;client-&gt;dev.bus = &amp;anybus_bus;</div><div class='add'>+	cd-&gt;client-&gt;dev.parent = dev;</div><div class='add'>+	cd-&gt;client-&gt;dev.release = client_device_release;</div><div class='add'>+	cd-&gt;client-&gt;dev.of_node =</div><div class='add'>+		anybus_of_find_child_device(dev, cd-&gt;host_idx);</div><div class='add'>+	dev_set_name(&amp;cd-&gt;client-&gt;dev, "anybuss.card%d", cd-&gt;host_idx);</div><div class='add'>+	ret = device_register(&amp;cd-&gt;client-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_device;</div><div class='add'>+	return cd;</div><div class='add'>+err_device:</div><div class='add'>+	device_unregister(&amp;cd-&gt;client-&gt;dev);</div><div class='add'>+err_kthread:</div><div class='add'>+	kthread_stop(cd-&gt;qthread);</div><div class='add'>+err_reset:</div><div class='add'>+	reset_assert(cd);</div><div class='add'>+err_qcache:</div><div class='add'>+	kmem_cache_destroy(cd-&gt;qcache);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_host_common_probe);</div><div class='add'>+</div><div class='add'>+void anybuss_host_common_remove(struct anybuss_host *host)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host *cd = host;</div><div class='add'>+</div><div class='add'>+	device_unregister(&amp;cd-&gt;client-&gt;dev);</div><div class='add'>+	kthread_stop(cd-&gt;qthread);</div><div class='add'>+	reset_assert(cd);</div><div class='add'>+	kmem_cache_destroy(cd-&gt;qcache);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anybuss_host_common_remove);</div><div class='add'>+</div><div class='add'>+static void host_release(struct device *dev, void *res)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host **dr = res;</div><div class='add'>+</div><div class='add'>+	anybuss_host_common_remove(*dr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct anybuss_host * __must_check</div><div class='add'>+devm_anybuss_host_common_probe(struct device *dev,</div><div class='add'>+			       const struct anybuss_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct anybuss_host **dr;</div><div class='add'>+	struct anybuss_host *host;</div><div class='add'>+</div><div class='add'>+	dr = devres_alloc(host_release, sizeof(struct anybuss_host *),</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	if (!dr)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	host = anybuss_host_common_probe(dev, ops);</div><div class='add'>+	if (IS_ERR(host)) {</div><div class='add'>+		devres_free(dr);</div><div class='add'>+		return host;</div><div class='add'>+	}</div><div class='add'>+	*dr = host;</div><div class='add'>+	devres_add(dev, dr);</div><div class='add'>+	return host;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devm_anybuss_host_common_probe);</div><div class='add'>+</div><div class='add'>+static int __init anybus_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bus_register(&amp;anybus_bus);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("could not register Anybus-S bus: %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+module_init(anybus_init);</div><div class='add'>+</div><div class='add'>+static void __exit anybus_exit(void)</div><div class='add'>+{</div><div class='add'>+	bus_unregister(&amp;anybus_bus);</div><div class='add'>+}</div><div class='add'>+module_exit(anybus_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HMS Anybus-S Host Driver");</div><div class='add'>+MODULE_AUTHOR("Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/fieldbus/dev_core.c b/drivers/staging/fieldbus/dev_core.c<br/>new file mode 100644<br/>index 000000000000..60b85140675a<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/dev_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/dev_core.c</a></div><div class='hunk'>@@ -0,0 +1,351 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Fieldbus Device Driver Core</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.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/idr.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+</div><div class='add'>+/* move to &lt;linux/fieldbus_dev.h&gt; when taking this out of staging */</div><div class='add'>+#include "fieldbus_dev.h"</div><div class='add'>+</div><div class='add'>+/* Maximum number of fieldbus devices */</div><div class='add'>+#define MAX_FIELDBUSES		32</div><div class='add'>+</div><div class='add'>+/* the dev_t structure to store the dynamically allocated fieldbus devices */</div><div class='add'>+static dev_t fieldbus_devt;</div><div class='add'>+static DEFINE_IDA(fieldbus_ida);</div><div class='add'>+static DEFINE_MUTEX(fieldbus_mtx);</div><div class='add'>+</div><div class='add'>+static const char ctrl_enabled[] = "enabled";</div><div class='add'>+static const char ctrl_disabled[] = "disabled";</div><div class='add'>+</div><div class='add'>+static ssize_t online_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", !!fb-&gt;online);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(online);</div><div class='add'>+</div><div class='add'>+static ssize_t enabled_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (!fb-&gt;enable_get)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return sprintf(buf, "%d\n", !!fb-&gt;enable_get(fb));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t enabled_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			     const char *buf, size_t n)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+	bool value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!fb-&gt;simple_enable_set)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	ret = kstrtobool(buf, &amp;value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = fb-&gt;simple_enable_set(fb, value);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RW(enabled);</div><div class='add'>+</div><div class='add'>+static ssize_t card_name_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			      char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * card_name was provided by child driver, could potentially be long.</div><div class='add'>+	 * protect against buffer overrun.</div><div class='add'>+	 */</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%s\n", fb-&gt;card_name);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(card_name);</div><div class='add'>+</div><div class='add'>+static ssize_t read_area_size_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%zu\n", fb-&gt;read_area_sz);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(read_area_size);</div><div class='add'>+</div><div class='add'>+static ssize_t write_area_size_show(struct device *dev,</div><div class='add'>+				    struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%zu\n", fb-&gt;write_area_sz);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(write_area_size);</div><div class='add'>+</div><div class='add'>+static ssize_t fieldbus_id_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return fb-&gt;fieldbus_id_get(fb, buf, PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(fieldbus_id);</div><div class='add'>+</div><div class='add'>+static ssize_t fieldbus_type_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+	const char *t;</div><div class='add'>+</div><div class='add'>+	switch (fb-&gt;fieldbus_type) {</div><div class='add'>+	case FIELDBUS_DEV_TYPE_PROFINET:</div><div class='add'>+		t = "profinet";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		t = "unknown";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", t);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(fieldbus_type);</div><div class='add'>+</div><div class='add'>+static struct attribute *fieldbus_attrs[] = {</div><div class='add'>+	&amp;dev_attr_enabled.attr,</div><div class='add'>+	&amp;dev_attr_card_name.attr,</div><div class='add'>+	&amp;dev_attr_fieldbus_id.attr,</div><div class='add'>+	&amp;dev_attr_read_area_size.attr,</div><div class='add'>+	&amp;dev_attr_write_area_size.attr,</div><div class='add'>+	&amp;dev_attr_online.attr,</div><div class='add'>+	&amp;dev_attr_fieldbus_type.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static umode_t fieldbus_is_visible(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				   int n)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	struct fieldbus_dev *fb = dev_get_drvdata(dev);</div><div class='add'>+	umode_t mode = attr-&gt;mode;</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;dev_attr_enabled.attr) {</div><div class='add'>+		mode = 0;</div><div class='add'>+		if (fb-&gt;enable_get)</div><div class='add'>+			mode |= 0444;</div><div class='add'>+		if (fb-&gt;simple_enable_set)</div><div class='add'>+			mode |= 0200;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct attribute_group fieldbus_group = {</div><div class='add'>+	.attrs = fieldbus_attrs,</div><div class='add'>+	.is_visible = fieldbus_is_visible,</div><div class='add'>+};</div><div class='add'>+__ATTRIBUTE_GROUPS(fieldbus);</div><div class='add'>+</div><div class='add'>+static struct class fieldbus_class = {</div><div class='add'>+	.name =		"fieldbus_dev",</div><div class='add'>+	.owner =	THIS_MODULE,</div><div class='add'>+	.dev_groups =	fieldbus_groups,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fb_open_file {</div><div class='add'>+	struct fieldbus_dev *fbdev;</div><div class='add'>+	int dc_event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fieldbus_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct fb_open_file *of;</div><div class='add'>+	struct fieldbus_dev *fbdev = container_of(inode-&gt;i_cdev,</div><div class='add'>+						struct fieldbus_dev,</div><div class='add'>+						cdev);</div><div class='add'>+</div><div class='add'>+	of = kzalloc(sizeof(*of), GFP_KERNEL);</div><div class='add'>+	if (!of)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	of-&gt;fbdev = fbdev;</div><div class='add'>+	filp-&gt;private_data = of;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fieldbus_release(struct inode *node, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct fb_open_file *of = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	kfree(of);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t fieldbus_read(struct file *filp, char __user *buf, size_t size,</div><div class='add'>+			     loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct fb_open_file *of = filp-&gt;private_data;</div><div class='add'>+	struct fieldbus_dev *fbdev = of-&gt;fbdev;</div><div class='add'>+</div><div class='add'>+	of-&gt;dc_event = fbdev-&gt;dc_event;</div><div class='add'>+	return fbdev-&gt;read_area(fbdev, buf, size, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t fieldbus_write(struct file *filp, const char __user *buf,</div><div class='add'>+			      size_t size, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct fb_open_file *of = filp-&gt;private_data;</div><div class='add'>+	struct fieldbus_dev *fbdev = of-&gt;fbdev;</div><div class='add'>+</div><div class='add'>+	return fbdev-&gt;write_area(fbdev, buf, size, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int fieldbus_poll(struct file *filp, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct fb_open_file *of = filp-&gt;private_data;</div><div class='add'>+	struct fieldbus_dev *fbdev = of-&gt;fbdev;</div><div class='add'>+	unsigned int mask = POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;</div><div class='add'>+</div><div class='add'>+	poll_wait(filp, &amp;fbdev-&gt;dc_wq, wait);</div><div class='add'>+	/* data changed ? */</div><div class='add'>+	if (fbdev-&gt;dc_event != of-&gt;dc_event)</div><div class='add'>+		mask |= POLLPRI | POLLERR;</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fieldbus_fops = {</div><div class='add'>+	.open		= fieldbus_open,</div><div class='add'>+	.release	= fieldbus_release,</div><div class='add'>+	.read		= fieldbus_read,</div><div class='add'>+	.write		= fieldbus_write,</div><div class='add'>+	.poll		= fieldbus_poll,</div><div class='add'>+	.llseek		= generic_file_llseek,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void fieldbus_dev_area_updated(struct fieldbus_dev *fb)</div><div class='add'>+{</div><div class='add'>+	fb-&gt;dc_event++;</div><div class='add'>+	wake_up_all(&amp;fb-&gt;dc_wq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fieldbus_dev_area_updated);</div><div class='add'>+</div><div class='add'>+void fieldbus_dev_online_changed(struct fieldbus_dev *fb, bool online)</div><div class='add'>+{</div><div class='add'>+	fb-&gt;online = online;</div><div class='add'>+	kobject_uevent(&amp;fb-&gt;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fieldbus_dev_online_changed);</div><div class='add'>+</div><div class='add'>+static void __fieldbus_dev_unregister(struct fieldbus_dev *fb)</div><div class='add'>+{</div><div class='add'>+	if (!fb)</div><div class='add'>+		return;</div><div class='add'>+	device_destroy(&amp;fieldbus_class, fb-&gt;cdev.dev);</div><div class='add'>+	cdev_del(&amp;fb-&gt;cdev);</div><div class='add'>+	ida_simple_remove(&amp;fieldbus_ida, fb-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fieldbus_dev_unregister(struct fieldbus_dev *fb)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;fieldbus_mtx);</div><div class='add'>+	__fieldbus_dev_unregister(fb);</div><div class='add'>+	mutex_unlock(&amp;fieldbus_mtx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fieldbus_dev_unregister);</div><div class='add'>+</div><div class='add'>+static int __fieldbus_dev_register(struct fieldbus_dev *fb)</div><div class='add'>+{</div><div class='add'>+	dev_t devno;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!fb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!fb-&gt;read_area || !fb-&gt;write_area || !fb-&gt;fieldbus_id_get)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	fb-&gt;id = ida_simple_get(&amp;fieldbus_ida, 0, MAX_FIELDBUSES, GFP_KERNEL);</div><div class='add'>+	if (fb-&gt;id &lt; 0)</div><div class='add'>+		return fb-&gt;id;</div><div class='add'>+	devno = MKDEV(MAJOR(fieldbus_devt), fb-&gt;id);</div><div class='add'>+	init_waitqueue_head(&amp;fb-&gt;dc_wq);</div><div class='add'>+	cdev_init(&amp;fb-&gt;cdev, &amp;fieldbus_fops);</div><div class='add'>+	err = cdev_add(&amp;fb-&gt;cdev, devno, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("fieldbus_dev%d unable to add device %d:%d\n",</div><div class='add'>+		       fb-&gt;id, MAJOR(fieldbus_devt), fb-&gt;id);</div><div class='add'>+		goto err_cdev;</div><div class='add'>+	}</div><div class='add'>+	fb-&gt;dev = device_create(&amp;fieldbus_class, fb-&gt;parent, devno, fb,</div><div class='add'>+				"fieldbus_dev%d", fb-&gt;id);</div><div class='add'>+	if (IS_ERR(fb-&gt;dev)) {</div><div class='add'>+		err = PTR_ERR(fb-&gt;dev);</div><div class='add'>+		goto err_dev_create;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dev_create:</div><div class='add'>+	cdev_del(&amp;fb-&gt;cdev);</div><div class='add'>+err_cdev:</div><div class='add'>+	ida_simple_remove(&amp;fieldbus_ida, fb-&gt;id);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fieldbus_dev_register(struct fieldbus_dev *fb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fieldbus_mtx);</div><div class='add'>+	err = __fieldbus_dev_register(fb);</div><div class='add'>+	mutex_unlock(&amp;fieldbus_mtx);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fieldbus_dev_register);</div><div class='add'>+</div><div class='add'>+static int __init fieldbus_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = class_register(&amp;fieldbus_class);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("fieldbus_dev: could not register class\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	err = alloc_chrdev_region(&amp;fieldbus_devt, 0,</div><div class='add'>+				  MAX_FIELDBUSES, "fieldbus_dev");</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("fieldbus_dev: unable to allocate char dev region\n");</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_alloc:</div><div class='add'>+	class_unregister(&amp;fieldbus_class);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit fieldbus_exit(void)</div><div class='add'>+{</div><div class='add'>+	unregister_chrdev_region(fieldbus_devt, MAX_FIELDBUSES);</div><div class='add'>+	class_unregister(&amp;fieldbus_class);</div><div class='add'>+	ida_destroy(&amp;fieldbus_ida);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(fieldbus_init);</div><div class='add'>+module_exit(fieldbus_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sven Van Asbroeck &lt;TheSven73@gmail.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Jonathan Stiles &lt;jonathans@arcx.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Fieldbus Device Driver Core");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/fieldbus/fieldbus_dev.h b/drivers/staging/fieldbus/fieldbus_dev.h<br/>new file mode 100644<br/>index 000000000000..a10fc3b446dc<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fieldbus/fieldbus_dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fieldbus/fieldbus_dev.h</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Fieldbus Device Driver Core</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __FIELDBUS_DEV_H</div><div class='add'>+#define __FIELDBUS_DEV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='add'>+enum fieldbus_dev_type {</div><div class='add'>+	FIELDBUS_DEV_TYPE_UNKNOWN = 0,</div><div class='add'>+	FIELDBUS_DEV_TYPE_PROFINET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fieldbus_dev - Fieldbus device</div><div class='add'>+ * @read_area:		[DRIVER] function to read the process data area of the</div><div class='add'>+ *				 device. same parameters/return values as</div><div class='add'>+ *				 the read function in struct file_operations</div><div class='add'>+ * @write_area:		[DRIVER] function to write to the process data area of</div><div class='add'>+ *				 the device. same parameters/return values as</div><div class='add'>+ *				 the write function in struct file_operations</div><div class='add'>+ * @write_area_sz	[DRIVER] size of the writable process data area</div><div class='add'>+ * @read_area_sz	[DRIVER] size of the readable process data area</div><div class='add'>+ * @card_name		[DRIVER] name of the card, e.g. "ACME Inc. profinet"</div><div class='add'>+ * @fieldbus_type	[DRIVER] fieldbus type of this device, e.g.</div><div class='add'>+ *					FIELDBUS_DEV_TYPE_PROFINET</div><div class='add'>+ * @enable_get		[DRIVER] function which returns true if the card</div><div class='add'>+ *				 is enabled, false otherwise</div><div class='add'>+ * @fieldbus_id_get	[DRIVER] function to retrieve the unique fieldbus id</div><div class='add'>+ *				 by which this device can be identified;</div><div class='add'>+ *				 return value follows the snprintf convention</div><div class='add'>+ * @simple_enable_set	[DRIVER] (optional) function to enable the device</div><div class='add'>+ *				 according to its default settings</div><div class='add'>+ * @parent		[DRIVER] (optional) the device's parent device</div><div class='add'>+ */</div><div class='add'>+struct fieldbus_dev {</div><div class='add'>+	ssize_t (*read_area)(struct fieldbus_dev *fbdev, char __user *buf,</div><div class='add'>+			     size_t size, loff_t *offset);</div><div class='add'>+	ssize_t (*write_area)(struct fieldbus_dev *fbdev,</div><div class='add'>+			      const char __user *buf, size_t size,</div><div class='add'>+			      loff_t *offset);</div><div class='add'>+	size_t write_area_sz, read_area_sz;</div><div class='add'>+	const char *card_name;</div><div class='add'>+	enum fieldbus_dev_type fieldbus_type;</div><div class='add'>+	bool (*enable_get)(struct fieldbus_dev *fbdev);</div><div class='add'>+	int (*fieldbus_id_get)(struct fieldbus_dev *fbdev, char *buf,</div><div class='add'>+			       size_t max_size);</div><div class='add'>+	int (*simple_enable_set)(struct fieldbus_dev *fbdev, bool enable);</div><div class='add'>+	struct device *parent;</div><div class='add'>+</div><div class='add'>+	/* private data */</div><div class='add'>+	int id;</div><div class='add'>+	struct cdev cdev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int dc_event;</div><div class='add'>+	wait_queue_head_t dc_wq;</div><div class='add'>+	bool online;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_FIELDBUS_DEV)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fieldbus_dev_unregister()</div><div class='add'>+ *	- unregister a previously registered fieldbus device</div><div class='add'>+ * @fb:		Device structure previously registered</div><div class='add'>+ **/</div><div class='add'>+void fieldbus_dev_unregister(struct fieldbus_dev *fb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fieldbus_dev_register()</div><div class='add'>+ *	- register a device with the fieldbus device subsystem</div><div class='add'>+ * @fb:		Device structure filled by the device driver</div><div class='add'>+ **/</div><div class='add'>+int __must_check fieldbus_dev_register(struct fieldbus_dev *fb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fieldbus_dev_area_updated()</div><div class='add'>+ *	- notify the subsystem that an external fieldbus controller updated</div><div class='add'>+ *			the process data area</div><div class='add'>+ * @fb:		Device structure</div><div class='add'>+ **/</div><div class='add'>+void fieldbus_dev_area_updated(struct fieldbus_dev *fb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fieldbus_dev_online_changed()</div><div class='add'>+ *	- notify the subsystem that the fieldbus online status changed</div><div class='add'>+ * @fb:		Device structure</div><div class='add'>+ **/</div><div class='add'>+void fieldbus_dev_online_changed(struct fieldbus_dev *fb, bool online);</div><div class='add'>+</div><div class='add'>+#else /* IS_ENABLED(CONFIG_FIELDBUS_DEV) */</div><div class='add'>+</div><div class='add'>+static inline void fieldbus_dev_unregister(struct fieldbus_dev *fb) {}</div><div class='add'>+static inline int __must_check fieldbus_dev_register(struct fieldbus_dev *fb)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fieldbus_dev_area_updated(struct fieldbus_dev *fb) {}</div><div class='add'>+static inline void fieldbus_dev_online_changed(struct fieldbus_dev *fb,</div><div class='add'>+					       bool online) {}</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_FIELDBUS_DEV) */</div><div class='add'>+#endif /* __FIELDBUS_DEV_H */</div><div class='head'>diff --git a/drivers/staging/fsl-dpaa2/Kconfig b/drivers/staging/fsl-dpaa2/Kconfig<br/>index 991e154c0eca..368837cdf281 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fsl-dpaa2/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fsl-dpaa2/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fsl-dpaa2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fsl-dpaa2/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/fsl-dpaa2/Makefile b/drivers/staging/fsl-dpaa2/Makefile<br/>index c92ab98c27d9..9645db7689c9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fsl-dpaa2/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fsl-dpaa2/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fsl-dpaa2/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fsl-dpaa2/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c<br/>index ad577beeb052..e3c3e427309a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fsl-dpaa2/ethsw/ethsw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fsl-dpaa2/ethsw/ethsw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fsl-dpaa2/ethsw/ethsw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fsl-dpaa2/ethsw/ethsw.c</a></div><div class='hunk'>@@ -1350,9 +1350,7 @@ static int ethsw_port_init(struct ethsw_port_priv *port_priv, u16 port)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ethsw_port_fdb_add_mc(port_priv, def_mcast);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return ethsw_port_fdb_add_mc(port_priv, def_mcast);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ethsw_unregister_notifier(struct device *dev)</div><div class='head'>diff --git a/drivers/staging/fwserial/Kconfig b/drivers/staging/fwserial/Kconfig<br/>index 9c7c9267d52c..9543f8454af9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fwserial/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fwserial/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fwserial/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fwserial/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config FIREWIRE_SERIAL</div><div class='ctx'>        tristate "TTY over Firewire"</div><div class='ctx'>        depends on FIREWIRE &amp;&amp; TTY</div><div class='head'>diff --git a/drivers/staging/fwserial/Makefile b/drivers/staging/fwserial/Makefile<br/>index 2170869a19b1..1cd5c5c7e805 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fwserial/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fwserial/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fwserial/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fwserial/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_FIREWIRE_SERIAL) += firewire-serial.o</div><div class='ctx'> firewire-serial-objs := fwserial.o dma_fifo.o</div><div class='head'>diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c<br/>index a1b90ea7fcb8..aec0f19597a9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fwserial/fwserial.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/fwserial/fwserial.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/fwserial/fwserial.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/fwserial/fwserial.c</a></div><div class='hunk'>@@ -19,7 +19,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "fwserial.h"</div><div class='ctx'> </div><div class='del'>-#define be32_to_u64(hi, lo)  ((u64)be32_to_cpu(hi) &lt;&lt; 32 | be32_to_cpu(lo))</div><div class='add'>+inline u64 be32_to_u64(__be32 hi, __be32 lo)</div><div class='add'>+{</div><div class='add'>+	return ((u64)be32_to_cpu(hi) &lt;&lt; 32 | be32_to_cpu(lo));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define LINUX_VENDOR_ID   0xd00d1eU  /* same id used in card root directory   */</div><div class='ctx'> #define FWSERIAL_VERSION  0x00e81cU  /* must be unique within LINUX_VENDOR_ID */</div><div class='head'>diff --git a/drivers/staging/gasket/Kconfig b/drivers/staging/gasket/Kconfig<br/>index e82b85541f7e..d9bef8ca41ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menu "Gasket devices"</div><div class='ctx'> </div><div class='ctx'> config STAGING_GASKET_FRAMEWORK</div><div class='head'>diff --git a/drivers/staging/gasket/Makefile b/drivers/staging/gasket/Makefile<br/>index cec813ece678..ce03e256f501 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> #  Makefile for Gasket framework and dependent drivers.</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c<br/>index 0578bf1ba1e9..2be45ee9d061 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/apex_driver.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/apex_driver.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/apex_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/apex_driver.c</a></div><div class='hunk'>@@ -294,7 +294,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev)</div><div class='ctx'> </div><div class='ctx'> 	/*    - Wait for RAM shutdown. */</div><div class='ctx'> 	if (gasket_wait_with_reschedule(gasket_dev, APEX_BAR_INDEX,</div><div class='del'>-					APEX_BAR2_REG_SCU_3, 1 &lt;&lt; 6, 1 &lt;&lt; 6,</div><div class='add'>+					APEX_BAR2_REG_SCU_3, BIT(6), BIT(6),</div><div class='ctx'> 					APEX_RESET_DELAY, APEX_RESET_RETRY)) {</div><div class='ctx'> 		dev_err(gasket_dev-&gt;dev,</div><div class='ctx'> 			"RAM did not shut down within timeout (%d ms)\n",</div><div class='hunk'>@@ -340,7 +340,7 @@ static int apex_quit_reset(struct gasket_dev *gasket_dev)</div><div class='ctx'> </div><div class='ctx'> 	/*    - Wait for RAM enable. */</div><div class='ctx'> 	if (gasket_wait_with_reschedule(gasket_dev, APEX_BAR_INDEX,</div><div class='del'>-					APEX_BAR2_REG_SCU_3, 1 &lt;&lt; 6, 0,</div><div class='add'>+					APEX_BAR2_REG_SCU_3, BIT(6), 0,</div><div class='ctx'> 					APEX_RESET_DELAY, APEX_RESET_RETRY)) {</div><div class='ctx'> 		dev_err(gasket_dev-&gt;dev,</div><div class='ctx'> 			"RAM did not enable within timeout (%d ms)\n",</div><div class='hunk'>@@ -439,9 +439,7 @@ static int apex_reset(struct gasket_dev *gasket_dev)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = apex_quit_reset(gasket_dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return apex_quit_reset(gasket_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/staging/gasket/gasket_interrupt.c b/drivers/staging/gasket/gasket_interrupt.c<br/>index ff61b782df30..2d6195f7300e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_interrupt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_interrupt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_interrupt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/gasket_interrupt.c</a></div><div class='hunk'>@@ -97,8 +97,7 @@ static void gasket_interrupt_setup(struct gasket_dev *gasket_dev)</div><div class='ctx'> 		 * modify-write and shift based on the packing index.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev_dbg(gasket_dev-&gt;dev,</div><div class='del'>-			"Setting up interrupt index %d with index 0x%llx and "</div><div class='del'>-			"packing %d\n",</div><div class='add'>+			"Setting up interrupt index %d with index 0x%llx and packing %d\n",</div><div class='ctx'> 			interrupt_data-&gt;interrupts[i].index,</div><div class='ctx'> 			interrupt_data-&gt;interrupts[i].reg,</div><div class='ctx'> 			interrupt_data-&gt;interrupts[i].packing);</div><div class='hunk'>@@ -120,8 +119,7 @@ static void gasket_interrupt_setup(struct gasket_dev *gasket_dev)</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				dev_dbg(gasket_dev-&gt;dev,</div><div class='del'>-					"Found interrupt description with "</div><div class='del'>-					"unknown enum %d\n",</div><div class='add'>+					"Found interrupt description with unknown enum %d\n",</div><div class='ctx'> 					interrupt_data-&gt;interrupts[i].packing);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c<br/>index 26755d9ca41d..600928f63577 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_page_table.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_page_table.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_page_table.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/gasket_page_table.c</a></div><div class='hunk'>@@ -768,8 +768,7 @@ static bool gasket_is_extended_dev_addr_bad(struct gasket_page_table *pg_tbl,</div><div class='ctx'> 	page_lvl0_idx = gasket_extended_lvl0_page_idx(pg_tbl, dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the count of affected level 0 pages. */</div><div class='del'>-	num_lvl0_pages = (num_pages + GASKET_PAGES_PER_SUBTABLE - 1) /</div><div class='del'>-		GASKET_PAGES_PER_SUBTABLE;</div><div class='add'>+	num_lvl0_pages = DIV_ROUND_UP(num_pages, GASKET_PAGES_PER_SUBTABLE);</div><div class='ctx'> </div><div class='ctx'> 	if (gasket_components_to_dev_address(pg_tbl, 0, page_global_idx,</div><div class='ctx'> 					     page_offset) != dev_addr) {</div><div class='hunk'>@@ -1258,7 +1257,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,</div><div class='ctx'> 	dma_addr_t handle;</div><div class='ctx'> 	void *mem;</div><div class='ctx'> 	int j;</div><div class='del'>-	unsigned int num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;</div><div class='add'>+	unsigned int num_pages = DIV_ROUND_UP(size, PAGE_SIZE);</div><div class='ctx'> 	const struct gasket_driver_desc *driver_desc =</div><div class='ctx'> 		gasket_get_driver_desc(gasket_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/gasket/gasket_sysfs.c b/drivers/staging/gasket/gasket_sysfs.c<br/>index fc45f0d13e87..a2d67c28f530 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_sysfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_sysfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_sysfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/gasket_sysfs.c</a></div><div class='hunk'>@@ -223,8 +223,7 @@ int gasket_sysfs_create_entries(struct device *device,</div><div class='ctx'> </div><div class='ctx'> 	if (!mapping) {</div><div class='ctx'> 		dev_dbg(device,</div><div class='del'>-			"Creating entries for device without first "</div><div class='del'>-			"initializing mapping\n");</div><div class='add'>+			"Creating entries for device without first initializing mapping\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -233,8 +232,7 @@ int gasket_sysfs_create_entries(struct device *device,</div><div class='ctx'> 		i++) {</div><div class='ctx'> 		if (mapping-&gt;attribute_count == GASKET_SYSFS_MAX_NODES) {</div><div class='ctx'> 			dev_err(device,</div><div class='del'>-				"Maximum number of sysfs nodes reached for "</div><div class='del'>-				"device\n");</div><div class='add'>+				"Maximum number of sysfs nodes reached for device\n");</div><div class='ctx'> 			mutex_unlock(&amp;mapping-&gt;mutex);</div><div class='ctx'> 			put_mapping(mapping);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -264,8 +262,7 @@ void gasket_sysfs_remove_mapping(struct device *device)</div><div class='ctx'> </div><div class='ctx'> 	if (!mapping) {</div><div class='ctx'> 		dev_err(device,</div><div class='del'>-			"Attempted to remove non-existent sysfs mapping to "</div><div class='del'>-			"device\n");</div><div class='add'>+			"Attempted to remove non-existent sysfs mapping to device\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/gasket/gasket_sysfs.h b/drivers/staging/gasket/gasket_sysfs.h<br/>index 151e8edd28ea..1d0eed66a7f4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_sysfs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gasket/gasket_sysfs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gasket/gasket_sysfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gasket/gasket_sysfs.h</a></div><div class='hunk'>@@ -40,8 +40,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #define GASKET_END_OF_ATTR_ARRAY                                               \</div><div class='ctx'> 	{                                                                      \</div><div class='del'>-		.attr = __ATTR(GASKET_ARRAY_END_TOKEN, S_IRUGO, NULL, NULL),   \</div><div class='del'>-		.data.attr_type = 0,                                           \</div><div class='add'>+		.attr = __ATTR_NULL,				\</div><div class='add'>+		.data.attr_type = 0,				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/staging/gdm724x/Kconfig b/drivers/staging/gdm724x/Kconfig<br/>index 0a1f090bbf38..1f403ecd9608 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gdm724x/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # GCT GDM724x LTE driver configuration</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/gdm724x/gdm_lte.c b/drivers/staging/gdm724x/gdm_lte.c<br/>index 3c2aab7a921e..db11498f6fc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/gdm_lte.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/gdm_lte.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/gdm_lte.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gdm724x/gdm_lte.c</a></div><div class='hunk'>@@ -871,7 +871,6 @@ int register_lte_device(struct phy_dev *phy_dev,</div><div class='ctx'> 		net = alloc_netdev(sizeof(struct nic), pdn_dev_name,</div><div class='ctx'> 				   NET_NAME_UNKNOWN, ether_setup);</div><div class='ctx'> 		if (!net) {</div><div class='del'>-			pr_err("alloc_netdev failed\n");</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/gdm724x/gdm_mux.c b/drivers/staging/gdm724x/gdm_mux.c<br/>index e2a050ba6fbb..0678f344fafb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/gdm_mux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/gdm_mux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/gdm_mux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gdm724x/gdm_mux.c</a></div><div class='hunk'>@@ -164,8 +164,7 @@ static int up_to_host(struct mux_rx *r)</div><div class='ctx'> </div><div class='ctx'> 		total_len = ALIGN(MUX_HEADER_SIZE + payload_size, 4);</div><div class='ctx'> </div><div class='del'>-		if (len - packet_size_sum &lt;</div><div class='del'>-			total_len) {</div><div class='add'>+		if (len - packet_size_sum &lt; total_len) {</div><div class='ctx'> 			pr_err("invalid payload : %d %d %04x\n",</div><div class='ctx'> 			       payload_size, len, packet_type);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -376,8 +375,8 @@ static int gdm_mux_send(void *priv_dev, void *data, int len, int tty_index,</div><div class='ctx'> 	mux_header-&gt;packet_type = __cpu_to_le16(packet_type[tty_index]);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(t-&gt;buf + MUX_HEADER_SIZE, data, len);</div><div class='del'>-	memset(t-&gt;buf + MUX_HEADER_SIZE + len, 0, total_len - MUX_HEADER_SIZE -</div><div class='del'>-	       len);</div><div class='add'>+	memset(t-&gt;buf + MUX_HEADER_SIZE + len, 0,</div><div class='add'>+	       total_len - MUX_HEADER_SIZE - len);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;len = total_len;</div><div class='ctx'> 	t-&gt;callback = cb;</div><div class='head'>diff --git a/drivers/staging/gdm724x/hci_packet.h b/drivers/staging/gdm724x/hci_packet.h<br/>index 83fbd2515467..6dea3694afdd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/hci_packet.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gdm724x/hci_packet.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gdm724x/hci_packet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gdm724x/hci_packet.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ struct tlv {</div><div class='ctx'> struct sdu_header {</div><div class='ctx'> 	__dev16 cmd_evt;</div><div class='ctx'> 	__dev16 len;</div><div class='del'>-	__dev32 dftEpsId;</div><div class='add'>+	__dev32 dft_eps_id;</div><div class='ctx'> 	__dev32 bearer_ID;</div><div class='ctx'> 	__dev32 nic_type;</div><div class='ctx'> } __packed;</div><div class='head'>diff --git a/drivers/staging/goldfish/Kconfig b/drivers/staging/goldfish/Kconfig<br/>index 9165385df9de..728f4700b98d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/goldfish/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/goldfish/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/goldfish/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/goldfish/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config GOLDFISH_AUDIO</div><div class='ctx'> 	tristate "Goldfish AVD Audio Device"</div><div class='ctx'> 	depends on GOLDFISH</div><div class='head'>diff --git a/drivers/staging/goldfish/Makefile b/drivers/staging/goldfish/Makefile<br/>index 054eeb82151e..f7cee15529c3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/goldfish/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/goldfish/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/goldfish/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/goldfish/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the Goldfish audio driver</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/greybus/Kconfig b/drivers/staging/greybus/Kconfig<br/>index b571e4e8060b..4894c3514955 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menuconfig GREYBUS</div><div class='ctx'> 	tristate "Greybus support"</div><div class='ctx'> 	depends on SYSFS</div><div class='head'>diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h<br/>index d36f8cd35e06..9ba09ea9c2fc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/audio_codec.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/audio_codec.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/audio_codec.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/audio_codec.h</a></div><div class='hunk'>@@ -173,66 +173,66 @@ int gbaudio_register_module(struct gbaudio_module_info *module);</div><div class='ctx'> void gbaudio_unregister_module(struct gbaudio_module_info *module);</div><div class='ctx'> </div><div class='ctx'> /* protocol related */</div><div class='del'>-extern int gb_audio_gb_get_topology(struct gb_connection *connection,</div><div class='del'>-				    struct gb_audio_topology **topology);</div><div class='del'>-extern int gb_audio_gb_get_control(struct gb_connection *connection,</div><div class='del'>-				   u8 control_id, u8 index,</div><div class='del'>-				   struct gb_audio_ctl_elem_value *value);</div><div class='del'>-extern int gb_audio_gb_set_control(struct gb_connection *connection,</div><div class='del'>-				   u8 control_id, u8 index,</div><div class='del'>-				   struct gb_audio_ctl_elem_value *value);</div><div class='del'>-extern int gb_audio_gb_enable_widget(struct gb_connection *connection,</div><div class='del'>-				     u8 widget_id);</div><div class='del'>-extern int gb_audio_gb_disable_widget(struct gb_connection *connection,</div><div class='del'>-				      u8 widget_id);</div><div class='del'>-extern int gb_audio_gb_get_pcm(struct gb_connection *connection,</div><div class='del'>-			       u16 data_cport, u32 *format,</div><div class='del'>-			       u32 *rate, u8 *channels,</div><div class='del'>-			       u8 *sig_bits);</div><div class='del'>-extern int gb_audio_gb_set_pcm(struct gb_connection *connection,</div><div class='del'>-			       u16 data_cport, u32 format,</div><div class='del'>-			       u32 rate, u8 channels,</div><div class='del'>-			       u8 sig_bits);</div><div class='del'>-extern int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,</div><div class='del'>-					u16 data_cport, u16 size);</div><div class='del'>-extern int gb_audio_gb_activate_tx(struct gb_connection *connection,</div><div class='del'>-				   u16 data_cport);</div><div class='del'>-extern int gb_audio_gb_deactivate_tx(struct gb_connection *connection,</div><div class='del'>-				     u16 data_cport);</div><div class='del'>-extern int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,</div><div class='del'>-					u16 data_cport, u16 size);</div><div class='del'>-extern int gb_audio_gb_activate_rx(struct gb_connection *connection,</div><div class='del'>-				   u16 data_cport);</div><div class='del'>-extern int gb_audio_gb_deactivate_rx(struct gb_connection *connection,</div><div class='del'>-				     u16 data_cport);</div><div class='del'>-extern int gb_audio_apbridgea_set_config(struct gb_connection *connection,</div><div class='del'>-					 __u16 i2s_port, __u32 format,</div><div class='del'>-					 __u32 rate, __u32 mclk_freq);</div><div class='del'>-extern int gb_audio_apbridgea_register_cport(struct gb_connection *connection,</div><div class='del'>-					     __u16 i2s_port, __u16 cportid,</div><div class='del'>-					     __u8 direction);</div><div class='del'>-extern int gb_audio_apbridgea_unregister_cport(struct gb_connection *connection,</div><div class='del'>-					       __u16 i2s_port, __u16 cportid,</div><div class='del'>-					       __u8 direction);</div><div class='del'>-extern int gb_audio_apbridgea_set_tx_data_size(struct gb_connection *connection,</div><div class='del'>-					       __u16 i2s_port, __u16 size);</div><div class='del'>-extern int gb_audio_apbridgea_prepare_tx(struct gb_connection *connection,</div><div class='del'>-					 __u16 i2s_port);</div><div class='del'>-extern int gb_audio_apbridgea_start_tx(struct gb_connection *connection,</div><div class='del'>-				       __u16 i2s_port, __u64 timestamp);</div><div class='del'>-extern int gb_audio_apbridgea_stop_tx(struct gb_connection *connection,</div><div class='del'>-				      __u16 i2s_port);</div><div class='del'>-extern int gb_audio_apbridgea_shutdown_tx(struct gb_connection *connection,</div><div class='del'>-					  __u16 i2s_port);</div><div class='del'>-extern int gb_audio_apbridgea_set_rx_data_size(struct gb_connection *connection,</div><div class='del'>-					       __u16 i2s_port, __u16 size);</div><div class='del'>-extern int gb_audio_apbridgea_prepare_rx(struct gb_connection *connection,</div><div class='del'>-					 __u16 i2s_port);</div><div class='del'>-extern int gb_audio_apbridgea_start_rx(struct gb_connection *connection,</div><div class='del'>-				       __u16 i2s_port);</div><div class='del'>-extern int gb_audio_apbridgea_stop_rx(struct gb_connection *connection,</div><div class='del'>-				      __u16 i2s_port);</div><div class='del'>-extern int gb_audio_apbridgea_shutdown_rx(struct gb_connection *connection,</div><div class='del'>-					  __u16 i2s_port);</div><div class='add'>+int gb_audio_gb_get_topology(struct gb_connection *connection,</div><div class='add'>+			     struct gb_audio_topology **topology);</div><div class='add'>+int gb_audio_gb_get_control(struct gb_connection *connection,</div><div class='add'>+			    u8 control_id, u8 index,</div><div class='add'>+			    struct gb_audio_ctl_elem_value *value);</div><div class='add'>+int gb_audio_gb_set_control(struct gb_connection *connection,</div><div class='add'>+			    u8 control_id, u8 index,</div><div class='add'>+			    struct gb_audio_ctl_elem_value *value);</div><div class='add'>+int gb_audio_gb_enable_widget(struct gb_connection *connection,</div><div class='add'>+			      u8 widget_id);</div><div class='add'>+int gb_audio_gb_disable_widget(struct gb_connection *connection,</div><div class='add'>+			       u8 widget_id);</div><div class='add'>+int gb_audio_gb_get_pcm(struct gb_connection *connection,</div><div class='add'>+			u16 data_cport, u32 *format,</div><div class='add'>+			u32 *rate, u8 *channels,</div><div class='add'>+			u8 *sig_bits);</div><div class='add'>+int gb_audio_gb_set_pcm(struct gb_connection *connection,</div><div class='add'>+			u16 data_cport, u32 format,</div><div class='add'>+			u32 rate, u8 channels,</div><div class='add'>+			u8 sig_bits);</div><div class='add'>+int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,</div><div class='add'>+				 u16 data_cport, u16 size);</div><div class='add'>+int gb_audio_gb_activate_tx(struct gb_connection *connection,</div><div class='add'>+			    u16 data_cport);</div><div class='add'>+int gb_audio_gb_deactivate_tx(struct gb_connection *connection,</div><div class='add'>+			      u16 data_cport);</div><div class='add'>+int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,</div><div class='add'>+				 u16 data_cport, u16 size);</div><div class='add'>+int gb_audio_gb_activate_rx(struct gb_connection *connection,</div><div class='add'>+			    u16 data_cport);</div><div class='add'>+int gb_audio_gb_deactivate_rx(struct gb_connection *connection,</div><div class='add'>+			      u16 data_cport);</div><div class='add'>+int gb_audio_apbridgea_set_config(struct gb_connection *connection,</div><div class='add'>+				  __u16 i2s_port, __u32 format,</div><div class='add'>+				  __u32 rate, __u32 mclk_freq);</div><div class='add'>+int gb_audio_apbridgea_register_cport(struct gb_connection *connection,</div><div class='add'>+				      __u16 i2s_port, __u16 cportid,</div><div class='add'>+				      __u8 direction);</div><div class='add'>+int gb_audio_apbridgea_unregister_cport(struct gb_connection *connection,</div><div class='add'>+					__u16 i2s_port, __u16 cportid,</div><div class='add'>+					__u8 direction);</div><div class='add'>+int gb_audio_apbridgea_set_tx_data_size(struct gb_connection *connection,</div><div class='add'>+					__u16 i2s_port, __u16 size);</div><div class='add'>+int gb_audio_apbridgea_prepare_tx(struct gb_connection *connection,</div><div class='add'>+				  __u16 i2s_port);</div><div class='add'>+int gb_audio_apbridgea_start_tx(struct gb_connection *connection,</div><div class='add'>+				__u16 i2s_port, __u64 timestamp);</div><div class='add'>+int gb_audio_apbridgea_stop_tx(struct gb_connection *connection,</div><div class='add'>+			       __u16 i2s_port);</div><div class='add'>+int gb_audio_apbridgea_shutdown_tx(struct gb_connection *connection,</div><div class='add'>+				   __u16 i2s_port);</div><div class='add'>+int gb_audio_apbridgea_set_rx_data_size(struct gb_connection *connection,</div><div class='add'>+					__u16 i2s_port, __u16 size);</div><div class='add'>+int gb_audio_apbridgea_prepare_rx(struct gb_connection *connection,</div><div class='add'>+				  __u16 i2s_port);</div><div class='add'>+int gb_audio_apbridgea_start_rx(struct gb_connection *connection,</div><div class='add'>+				__u16 i2s_port);</div><div class='add'>+int gb_audio_apbridgea_stop_rx(struct gb_connection *connection,</div><div class='add'>+			       __u16 i2s_port);</div><div class='add'>+int gb_audio_apbridgea_shutdown_rx(struct gb_connection *connection,</div><div class='add'>+				   __u16 i2s_port);</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_GBAUDIO_CODEC_H */</div><div class='head'>diff --git a/drivers/staging/greybus/audio_manager.c b/drivers/staging/greybus/audio_manager.c<br/>index d44b070d8862..c2a4af4c1d06 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/audio_manager.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/audio_manager.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/audio_manager.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/audio_manager.c</a></div><div class='hunk'>@@ -45,6 +45,9 @@ int gb_audio_manager_add(struct gb_audio_manager_module_descriptor *desc)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	id = ida_simple_get(&amp;module_id, 0, 0, GFP_KERNEL);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='ctx'> 	err = gb_audio_manager_module_create(&amp;module, manager_kset,</div><div class='ctx'> 					     id, desc);</div><div class='ctx'> 	if (err) {</div><div class='head'>diff --git a/drivers/staging/greybus/bundle.c b/drivers/staging/greybus/bundle.c<br/>index e97b2b87ba47..3f702db9e098 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/bundle.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/bundle.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/bundle.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/bundle.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> {</div><div class='ctx'> 	struct gb_bundle *bundle = to_gb_bundle(dev);</div><div class='ctx'> </div><div class='del'>-	if (bundle-&gt;state == NULL)</div><div class='add'>+	if (!bundle-&gt;state)</div><div class='ctx'> 		return sprintf(buf, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%s\n", bundle-&gt;state);</div><div class='head'>diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c<br/>index 0b72e1b9d325..8ab810bf5716 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/hid.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/hid.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/hid.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/hid.c</a></div><div class='hunk'>@@ -292,7 +292,6 @@ static int gb_hid_parse(struct hid_device *hid)</div><div class='ctx'> </div><div class='ctx'> 	rdesc = kzalloc(rsize, GFP_KERNEL);</div><div class='ctx'> 	if (!rdesc) {</div><div class='del'>-		dbg_hid("couldn't allocate rdesc memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c<br/>index 0529e5628c24..34b40a409ea3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/power_supply.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/power_supply.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/power_supply.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/power_supply.c</a></div><div class='hunk'>@@ -520,8 +520,8 @@ static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy)</div><div class='ctx'> </div><div class='ctx'> 	op = gb_operation_create(connection,</div><div class='ctx'> 				 GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS,</div><div class='del'>-				 sizeof(req), sizeof(*resp) + props_count *</div><div class='del'>-				 sizeof(struct gb_power_supply_props_desc),</div><div class='add'>+				 sizeof(*req),</div><div class='add'>+				 struct_size(resp, props, props_count),</div><div class='ctx'> 				 GFP_KERNEL);</div><div class='ctx'> 	if (!op)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c<br/>index 38e85033fc4b..a097a8916b3b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/greybus/sdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/greybus/sdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/greybus/sdio.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ static int _gb_sdio_send(struct gb_sdio_host *host, struct mmc_data *data,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	request = operation-&gt;request-&gt;payload;</div><div class='del'>-	request-&gt;data_flags = (data-&gt;flags &gt;&gt; 8);</div><div class='add'>+	request-&gt;data_flags = data-&gt;flags &gt;&gt; 8;</div><div class='ctx'> 	request-&gt;data_blocks = cpu_to_le16(nblocks);</div><div class='ctx'> 	request-&gt;data_blksz = cpu_to_le16(data-&gt;blksz);</div><div class='ctx'> </div><div class='hunk'>@@ -329,7 +329,7 @@ static int _gb_sdio_recv(struct gb_sdio_host *host, struct mmc_data *data,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	request = operation-&gt;request-&gt;payload;</div><div class='del'>-	request-&gt;data_flags = (data-&gt;flags &gt;&gt; 8);</div><div class='add'>+	request-&gt;data_flags = data-&gt;flags &gt;&gt; 8;</div><div class='ctx'> 	request-&gt;data_blocks = cpu_to_le16(nblocks);</div><div class='ctx'> 	request-&gt;data_blksz = cpu_to_le16(data-&gt;blksz);</div><div class='ctx'> </div><div class='hunk'>@@ -602,9 +602,9 @@ static void gb_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 		vdd = 1 &lt;&lt; (ios-&gt;vdd - GB_SDIO_VDD_SHIFT);</div><div class='ctx'> 	request.vdd = cpu_to_le32(vdd);</div><div class='ctx'> </div><div class='del'>-	request.bus_mode = (ios-&gt;bus_mode == MMC_BUSMODE_OPENDRAIN ?</div><div class='add'>+	request.bus_mode = ios-&gt;bus_mode == MMC_BUSMODE_OPENDRAIN ?</div><div class='ctx'> 			    GB_SDIO_BUSMODE_OPENDRAIN :</div><div class='del'>-			    GB_SDIO_BUSMODE_PUSHPULL);</div><div class='add'>+			    GB_SDIO_BUSMODE_PUSHPULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (ios-&gt;power_mode) {</div><div class='ctx'> 	case MMC_POWER_OFF:</div><div class='head'>diff --git a/drivers/staging/gs_fpgaboot/Kconfig b/drivers/staging/gs_fpgaboot/Kconfig<br/>index 550645291fab..968a153c4ab6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gs_fpgaboot/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gs_fpgaboot/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gs_fpgaboot/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gs_fpgaboot/Kconfig</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # "xilinx FPGA firmware download, fpgaboot"</div><div class='ctx'> #</div><div class='ctx'> config GS_FPGABOOT</div><div class='ctx'> 	tristate "Xilinx FPGA firmware download module"</div><div class='del'>-	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Xilinx FPGA firmware download module</div><div class='head'>diff --git a/drivers/staging/gs_fpgaboot/Makefile b/drivers/staging/gs_fpgaboot/Makefile<br/>index d2f0211ba540..33e238be63d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gs_fpgaboot/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/gs_fpgaboot/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/gs_fpgaboot/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/gs_fpgaboot/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> gs_fpga-y	+= gs_fpgaboot.o io.o</div><div class='ctx'> obj-$(CONFIG_GS_FPGABOOT)	+= gs_fpga.o</div><div class='head'>diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig<br/>index e86ac9e47867..a8e970db179d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Industrial I/O subsystem configuration</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig<br/>index befbbfe911c2..3318997a7009 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/accel/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Accelerometer drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile<br/>index 773212e0c859..094cc9be35bd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/accel/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for industrial I/O accelerometer drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/accel/adis16203.c<br/>index 5cc96c8086b5..70381756a64a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/adis16203.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/adis16203.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/adis16203.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/accel/adis16203.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * ADIS16203 Programmable 360 Degrees Inclinometer</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c<br/>index 24e525f1ef25..b80e0d248b0f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/adis16240.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/accel/adis16240.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/accel/adis16240.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/accel/adis16240.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * ADIS16240 Programmable Impact Sensor and Recorder driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig<br/>index 7a93d3a5c113..23d9a655a520 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/Kconfig</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # ADC drivers</div><div class='ctx'> #</div><div class='ctx'> menu "Analog to digital converters"</div><div class='ctx'> </div><div class='del'>-config AD7780</div><div class='del'>-	tristate "Analog Devices AD7780 and similar ADCs driver"</div><div class='del'>-	depends on SPI</div><div class='del'>-	depends on GPIOLIB || COMPILE_TEST</div><div class='del'>-	select AD_SIGMA_DELTA</div><div class='del'>-	help</div><div class='del'>-	  Say yes here to build support for Analog Devices AD7170, AD7171,</div><div class='del'>-	  AD7780 and AD7781 SPI analog to digital converters (ADC).</div><div class='del'>-	  If unsure, say N (but it's safe to say "Y").</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called ad7780.</div><div class='del'>-</div><div class='ctx'> config AD7816</div><div class='ctx'> 	tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"</div><div class='ctx'> 	depends on SPI</div><div class='head'>diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile<br/>index 7a421088ff82..4b76769b32bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/Makefile</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> # Makefile for industrial I/O ADC drivers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_AD7780) += ad7780.o</div><div class='ctx'> obj-$(CONFIG_AD7816) += ad7816.o</div><div class='ctx'> obj-$(CONFIG_AD7192) += ad7192.o</div><div class='ctx'> obj-$(CONFIG_AD7280) += ad7280a.o</div><div class='head'>diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c<br/>index acdbc07fd259..b6d12fe7c12a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7192.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7192.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7192.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/ad7192.c</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD7190 AD7192 AD7193 AD7195 SPI ADC driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2015 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -109,10 +109,10 @@</div><div class='ctx'> #define AD7192_CH_AIN3		BIT(6) /* AIN3 - AINCOM */</div><div class='ctx'> #define AD7192_CH_AIN4		BIT(7) /* AIN4 - AINCOM */</div><div class='ctx'> </div><div class='del'>-#define AD7193_CH_AIN1P_AIN2M	0x000  /* AIN1(+) - AIN2(-) */</div><div class='del'>-#define AD7193_CH_AIN3P_AIN4M	0x001  /* AIN3(+) - AIN4(-) */</div><div class='del'>-#define AD7193_CH_AIN5P_AIN6M	0x002  /* AIN5(+) - AIN6(-) */</div><div class='del'>-#define AD7193_CH_AIN7P_AIN8M	0x004  /* AIN7(+) - AIN8(-) */</div><div class='add'>+#define AD7193_CH_AIN1P_AIN2M	0x001  /* AIN1(+) - AIN2(-) */</div><div class='add'>+#define AD7193_CH_AIN3P_AIN4M	0x002  /* AIN3(+) - AIN4(-) */</div><div class='add'>+#define AD7193_CH_AIN5P_AIN6M	0x004  /* AIN5(+) - AIN6(-) */</div><div class='add'>+#define AD7193_CH_AIN7P_AIN8M	0x008  /* AIN7(+) - AIN8(-) */</div><div class='ctx'> #define AD7193_CH_TEMP		0x100 /* Temp senseor */</div><div class='ctx'> #define AD7193_CH_AIN2P_AIN2M	0x200 /* AIN2(+) - AIN2(-) */</div><div class='ctx'> #define AD7193_CH_AIN1		0x401 /* AIN1 - AINCOM */</div><div class='hunk'>@@ -156,14 +156,16 @@</div><div class='ctx'> struct ad7192_state {</div><div class='ctx'> 	struct regulator		*avdd;</div><div class='ctx'> 	struct regulator		*dvdd;</div><div class='add'>+	struct clk			*mclk;</div><div class='ctx'> 	u16				int_vref_mv;</div><div class='del'>-	u32				mclk;</div><div class='add'>+	u32				fclk;</div><div class='ctx'> 	u32				f_order;</div><div class='ctx'> 	u32				mode;</div><div class='ctx'> 	u32				conf;</div><div class='ctx'> 	u32				scale_avail[8][2];</div><div class='ctx'> 	u8				gpocon;</div><div class='ctx'> 	u8				devid;</div><div class='add'>+	u8				clock_sel;</div><div class='ctx'> 	struct mutex			lock;	/* protect sensor state */</div><div class='ctx'> </div><div class='ctx'> 	struct ad_sigma_delta		sd;</div><div class='hunk'>@@ -216,8 +218,8 @@ static const struct ad_sd_calib_data ad7192_calib_arr[8] = {</div><div class='ctx'> </div><div class='ctx'> static int ad7192_calibrate_all(struct ad7192_state *st)</div><div class='ctx'> {</div><div class='del'>-		return ad_sd_calibrate_all(&amp;st-&gt;sd, ad7192_calib_arr,</div><div class='del'>-				ARRAY_SIZE(ad7192_calib_arr));</div><div class='add'>+	return ad_sd_calibrate_all(&amp;st-&gt;sd, ad7192_calib_arr,</div><div class='add'>+				   ARRAY_SIZE(ad7192_calib_arr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ad7192_valid_external_frequency(u32 freq)</div><div class='hunk'>@@ -226,23 +228,45 @@ static inline bool ad7192_valid_external_frequency(u32 freq)</div><div class='ctx'> 		freq &lt;= AD7192_EXT_FREQ_MHZ_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ad7192_setup(struct ad7192_state *st,</div><div class='del'>-			const struct ad7192_platform_data *pdata)</div><div class='add'>+static int ad7192_of_clock_select(struct ad7192_state *st)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = st-&gt;sd.spi-&gt;dev.of_node;</div><div class='add'>+	unsigned int clock_sel;</div><div class='add'>+</div><div class='add'>+	clock_sel = AD7192_CLK_INT;</div><div class='add'>+</div><div class='add'>+	/* use internal clock */</div><div class='add'>+	if (PTR_ERR(st-&gt;mclk) == -ENOENT) {</div><div class='add'>+		if (of_property_read_bool(np, "adi,int-clock-output-enable"))</div><div class='add'>+			clock_sel = AD7192_CLK_INT_CO;</div><div class='add'>+	} else {</div><div class='add'>+		if (of_property_read_bool(np, "adi,clock-xtal"))</div><div class='add'>+			clock_sel = AD7192_CLK_EXT_MCLK1_2;</div><div class='add'>+		else</div><div class='add'>+			clock_sel = AD7192_CLK_EXT_MCLK2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clock_sel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad7192_setup(struct ad7192_state *st, struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	struct iio_dev *indio_dev = spi_get_drvdata(st-&gt;sd.spi);</div><div class='add'>+	bool rej60_en, sinc3_en, refin2_en, chop_en;</div><div class='add'>+	bool buf_en, bipolar, burnout_curr_en;</div><div class='ctx'> 	unsigned long long scale_uv;</div><div class='ctx'> 	int i, ret, id;</div><div class='ctx'> </div><div class='ctx'> 	/* reset the serial interface */</div><div class='ctx'> 	ret = ad_sd_reset(&amp;st-&gt;sd, 48);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	usleep_range(500, 1000); /* Wait for at least 500us */</div><div class='ctx'> </div><div class='ctx'> 	/* write/read test for device presence */</div><div class='ctx'> 	ret = ad_sd_read_reg(&amp;st-&gt;sd, AD7192_REG_ID, 1, &amp;id);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	id &amp;= AD7192_ID_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -250,44 +274,28 @@ static int ad7192_setup(struct ad7192_state *st,</div><div class='ctx'> 		dev_warn(&amp;st-&gt;sd.spi-&gt;dev, "device ID query failed (0x%X)\n",</div><div class='ctx'> 			 id);</div><div class='ctx'> </div><div class='del'>-	switch (pdata-&gt;clock_source_sel) {</div><div class='del'>-	case AD7192_CLK_INT:</div><div class='del'>-	case AD7192_CLK_INT_CO:</div><div class='del'>-		st-&gt;mclk = AD7192_INT_FREQ_MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case AD7192_CLK_EXT_MCLK1_2:</div><div class='del'>-	case AD7192_CLK_EXT_MCLK2:</div><div class='del'>-		if (ad7192_valid_external_frequency(pdata-&gt;ext_clk_hz)) {</div><div class='del'>-			st-&gt;mclk = pdata-&gt;ext_clk_hz;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		dev_err(&amp;st-&gt;sd.spi-&gt;dev, "Invalid frequency setting %u\n",</div><div class='del'>-			pdata-&gt;ext_clk_hz);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	st-&gt;mode = AD7192_MODE_SEL(AD7192_MODE_IDLE) |</div><div class='del'>-		AD7192_MODE_CLKSRC(pdata-&gt;clock_source_sel) |</div><div class='add'>+		AD7192_MODE_CLKSRC(st-&gt;clock_sel) |</div><div class='ctx'> 		AD7192_MODE_RATE(480);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;conf = AD7192_CONF_GAIN(0);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;rej60_en)</div><div class='add'>+	rej60_en = of_property_read_bool(np, "adi,rejection-60-Hz-enable");</div><div class='add'>+	if (rej60_en)</div><div class='ctx'> 		st-&gt;mode |= AD7192_MODE_REJ60;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;sinc3_en)</div><div class='add'>+	sinc3_en = of_property_read_bool(np, "adi,sinc3-filter-enable");</div><div class='add'>+	if (sinc3_en)</div><div class='ctx'> 		st-&gt;mode |= AD7192_MODE_SINC3;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;refin2_en &amp;&amp; st-&gt;devid != ID_AD7195)</div><div class='add'>+	refin2_en = of_property_read_bool(np, "adi,refin2-pins-enable");</div><div class='add'>+	if (refin2_en &amp;&amp; st-&gt;devid != ID_AD7195)</div><div class='ctx'> 		st-&gt;conf |= AD7192_CONF_REFSEL;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;chop_en) {</div><div class='add'>+	chop_en = of_property_read_bool(np, "adi,chop-enable");</div><div class='add'>+	if (chop_en) {</div><div class='ctx'> 		st-&gt;conf |= AD7192_CONF_CHOP;</div><div class='del'>-		if (pdata-&gt;sinc3_en)</div><div class='add'>+		if (sinc3_en)</div><div class='ctx'> 			st-&gt;f_order = 3; /* SINC 3rd order */</div><div class='ctx'> 		else</div><div class='ctx'> 			st-&gt;f_order = 4; /* SINC 4th order */</div><div class='hunk'>@@ -295,30 +303,34 @@ static int ad7192_setup(struct ad7192_state *st,</div><div class='ctx'> 		st-&gt;f_order = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;buf_en)</div><div class='add'>+	buf_en = of_property_read_bool(np, "adi,buffer-enable");</div><div class='add'>+	if (buf_en)</div><div class='ctx'> 		st-&gt;conf |= AD7192_CONF_BUF;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;unipolar_en)</div><div class='add'>+	bipolar = of_property_read_bool(np, "bipolar");</div><div class='add'>+	if (!bipolar)</div><div class='ctx'> 		st-&gt;conf |= AD7192_CONF_UNIPOLAR;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;burnout_curr_en &amp;&amp; pdata-&gt;buf_en &amp;&amp; !pdata-&gt;chop_en) {</div><div class='add'>+	burnout_curr_en = of_property_read_bool(np,</div><div class='add'>+						"adi,burnout-currents-enable");</div><div class='add'>+	if (burnout_curr_en &amp;&amp; buf_en &amp;&amp; !chop_en) {</div><div class='ctx'> 		st-&gt;conf |= AD7192_CONF_BURN;</div><div class='del'>-	} else if (pdata-&gt;burnout_curr_en) {</div><div class='add'>+	} else if (burnout_curr_en) {</div><div class='ctx'> 		dev_warn(&amp;st-&gt;sd.spi-&gt;dev,</div><div class='ctx'> 			 "Can't enable burnout currents: see CHOP or buffer\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ad_sd_write_reg(&amp;st-&gt;sd, AD7192_REG_MODE, 3, st-&gt;mode);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad_sd_write_reg(&amp;st-&gt;sd, AD7192_REG_CONF, 3, st-&gt;conf);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad7192_calibrate_all(st);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Populate available ADC input ranges */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(st-&gt;scale_avail); i++) {</div><div class='hunk'>@@ -332,35 +344,8 @@ static int ad7192_setup(struct ad7192_state *st,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-out:</div><div class='del'>-	dev_err(&amp;st-&gt;sd.spi-&gt;dev, "setup failed\n");</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-ad7192_show_scale_available(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);</div><div class='del'>-	struct ad7192_state *st = iio_priv(indio_dev);</div><div class='del'>-	int i, len = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(st-&gt;scale_avail); i++)</div><div class='del'>-		len += sprintf(buf + len, "%d.%09u ", st-&gt;scale_avail[i][0],</div><div class='del'>-			       st-&gt;scale_avail[i][1]);</div><div class='del'>-</div><div class='del'>-	len += sprintf(buf + len, "\n");</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static IIO_DEVICE_ATTR_NAMED(in_v_m_v_scale_available,</div><div class='del'>-			     in_voltage-voltage_scale_available,</div><div class='del'>-			     0444, ad7192_show_scale_available, NULL, 0);</div><div class='del'>-</div><div class='del'>-static IIO_DEVICE_ATTR(in_voltage_scale_available, 0444,</div><div class='del'>-		       ad7192_show_scale_available, NULL, 0);</div><div class='del'>-</div><div class='ctx'> static ssize_t ad7192_show_ac_excitation(struct device *dev,</div><div class='ctx'> 					 struct device_attribute *attr,</div><div class='ctx'> 					 char *buf)</div><div class='hunk'>@@ -435,8 +420,6 @@ static IIO_DEVICE_ATTR(ac_excitation_en, 0644,</div><div class='ctx'> 		       AD7192_REG_MODE);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ad7192_attributes[] = {</div><div class='del'>-	&amp;iio_dev_attr_in_v_m_v_scale_available.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_in_voltage_scale_available.dev_attr.attr,</div><div class='ctx'> 	&amp;iio_dev_attr_bridge_switch_en.dev_attr.attr,</div><div class='ctx'> 	&amp;iio_dev_attr_ac_excitation_en.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -447,8 +430,6 @@ static const struct attribute_group ad7192_attribute_group = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ad7195_attributes[] = {</div><div class='del'>-	&amp;iio_dev_attr_in_v_m_v_scale_available.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_in_voltage_scale_available.dev_attr.attr,</div><div class='ctx'> 	&amp;iio_dev_attr_bridge_switch_en.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='hunk'>@@ -499,7 +480,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 			*val -= 273 * ad7192_get_temp_scale(unipolar);</div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='ctx'> 	case IIO_CHAN_INFO_SAMP_FREQ:</div><div class='del'>-		*val = st-&gt;mclk /</div><div class='add'>+		*val = st-&gt;fclk /</div><div class='ctx'> 			(st-&gt;f_order * 1024 * AD7192_MODE_RATE(st-&gt;mode));</div><div class='ctx'> 		return IIO_VAL_INT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -546,7 +527,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		div = st-&gt;mclk / (val * st-&gt;f_order * 1024);</div><div class='add'>+		div = st-&gt;fclk / (val * st-&gt;f_order * 1024);</div><div class='ctx'> 		if (div &lt; 1 || div &gt; 1023) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -579,10 +560,31 @@ static int ad7192_write_raw_get_fmt(struct iio_dev *indio_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ad7192_read_avail(struct iio_dev *indio_dev,</div><div class='add'>+			     struct iio_chan_spec const *chan,</div><div class='add'>+			     const int **vals, int *type, int *length,</div><div class='add'>+			     long mask)</div><div class='add'>+{</div><div class='add'>+	struct ad7192_state *st = iio_priv(indio_dev);</div><div class='add'>+</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case IIO_CHAN_INFO_SCALE:</div><div class='add'>+		*vals = (int *)st-&gt;scale_avail;</div><div class='add'>+		*type = IIO_VAL_INT_PLUS_NANO;</div><div class='add'>+		/* Values are stored in a 2D matrix  */</div><div class='add'>+		*length = ARRAY_SIZE(st-&gt;scale_avail) * 2;</div><div class='add'>+</div><div class='add'>+		return IIO_AVAIL_LIST;</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='ctx'> static const struct iio_info ad7192_info = {</div><div class='ctx'> 	.read_raw = ad7192_read_raw,</div><div class='ctx'> 	.write_raw = ad7192_write_raw,</div><div class='ctx'> 	.write_raw_get_fmt = ad7192_write_raw_get_fmt,</div><div class='add'>+	.read_avail = ad7192_read_avail,</div><div class='ctx'> 	.attrs = &amp;ad7192_attribute_group,</div><div class='ctx'> 	.validate_trigger = ad_sd_validate_trigger,</div><div class='ctx'> };</div><div class='hunk'>@@ -591,6 +593,7 @@ static const struct iio_info ad7195_info = {</div><div class='ctx'> 	.read_raw = ad7192_read_raw,</div><div class='ctx'> 	.write_raw = ad7192_write_raw,</div><div class='ctx'> 	.write_raw_get_fmt = ad7192_write_raw_get_fmt,</div><div class='add'>+	.read_avail = ad7192_read_avail,</div><div class='ctx'> 	.attrs = &amp;ad7195_attribute_group,</div><div class='ctx'> 	.validate_trigger = ad_sd_validate_trigger,</div><div class='ctx'> };</div><div class='hunk'>@@ -625,6 +628,42 @@ static const struct iio_chan_spec ad7193_channels[] = {</div><div class='ctx'> 	IIO_CHAN_SOFT_TIMESTAMP(14),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ad7192_channels_config(struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	struct ad7192_state *st = iio_priv(indio_dev);</div><div class='add'>+	const struct iio_chan_spec *channels;</div><div class='add'>+	struct iio_chan_spec *chan;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (st-&gt;devid) {</div><div class='add'>+	case ID_AD7193:</div><div class='add'>+		channels = ad7193_channels;</div><div class='add'>+		indio_dev-&gt;num_channels = ARRAY_SIZE(ad7193_channels);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		channels = ad7192_channels;</div><div class='add'>+		indio_dev-&gt;num_channels = ARRAY_SIZE(ad7192_channels);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chan = devm_kcalloc(indio_dev-&gt;dev.parent, indio_dev-&gt;num_channels,</div><div class='add'>+			    sizeof(*chan), GFP_KERNEL);</div><div class='add'>+	if (!chan)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	indio_dev-&gt;channels = chan;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; indio_dev-&gt;num_channels; i++) {</div><div class='add'>+		*chan = channels[i];</div><div class='add'>+		if (chan-&gt;type != IIO_TEMP)</div><div class='add'>+			chan-&gt;info_mask_shared_by_type_available |=</div><div class='add'>+				BIT(IIO_CHAN_INFO_SCALE);</div><div class='add'>+		chan++;</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 int ad7192_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ad7192_platform_data *pdata = dev_get_platdata(&amp;spi-&gt;dev);</div><div class='hunk'>@@ -687,16 +726,9 @@ static int ad7192_probe(struct spi_device *spi)</div><div class='ctx'> 	indio_dev-&gt;name = spi_get_device_id(spi)-&gt;name;</div><div class='ctx'> 	indio_dev-&gt;modes = INDIO_DIRECT_MODE;</div><div class='ctx'> </div><div class='del'>-	switch (st-&gt;devid) {</div><div class='del'>-	case ID_AD7193:</div><div class='del'>-		indio_dev-&gt;channels = ad7193_channels;</div><div class='del'>-		indio_dev-&gt;num_channels = ARRAY_SIZE(ad7193_channels);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		indio_dev-&gt;channels = ad7192_channels;</div><div class='del'>-		indio_dev-&gt;num_channels = ARRAY_SIZE(ad7192_channels);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	ret = ad7192_channels_config(indio_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_disable_dvdd;</div><div class='ctx'> </div><div class='ctx'> 	if (st-&gt;devid == ID_AD7195)</div><div class='ctx'> 		indio_dev-&gt;info = &amp;ad7195_info;</div><div class='hunk'>@@ -709,15 +741,42 @@ static int ad7192_probe(struct spi_device *spi)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_disable_dvdd;</div><div class='ctx'> </div><div class='del'>-	ret = ad7192_setup(st, pdata);</div><div class='del'>-	if (ret)</div><div class='add'>+	st-&gt;fclk = AD7192_INT_FREQ_MHZ;</div><div class='add'>+</div><div class='add'>+	st-&gt;mclk = devm_clk_get(&amp;st-&gt;sd.spi-&gt;dev, "mclk");</div><div class='add'>+	if (IS_ERR(st-&gt;mclk) &amp;&amp; PTR_ERR(st-&gt;mclk) != -ENOENT) {</div><div class='add'>+		ret = PTR_ERR(st-&gt;mclk);</div><div class='ctx'> 		goto error_remove_trigger;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	st-&gt;clock_sel = ad7192_of_clock_select(st);</div><div class='add'>+</div><div class='add'>+	if (st-&gt;clock_sel == AD7192_CLK_EXT_MCLK1_2 ||</div><div class='add'>+	    st-&gt;clock_sel == AD7192_CLK_EXT_MCLK2) {</div><div class='add'>+		ret = clk_prepare_enable(st-&gt;mclk);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error_remove_trigger;</div><div class='add'>+</div><div class='add'>+		st-&gt;fclk = clk_get_rate(st-&gt;mclk);</div><div class='add'>+		if (!ad7192_valid_external_frequency(st-&gt;fclk)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			dev_err(&amp;spi-&gt;dev,</div><div class='add'>+				"External clock frequency out of bounds\n");</div><div class='add'>+			goto error_disable_clk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ad7192_setup(st, spi-&gt;dev.of_node);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_disable_clk;</div><div class='ctx'> </div><div class='ctx'> 	ret = iio_device_register(indio_dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto error_remove_trigger;</div><div class='add'>+		goto error_disable_clk;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+error_disable_clk:</div><div class='add'>+	clk_disable_unprepare(st-&gt;mclk);</div><div class='ctx'> error_remove_trigger:</div><div class='ctx'> 	ad_sd_cleanup_buffer_and_trigger(indio_dev);</div><div class='ctx'> error_disable_dvdd:</div><div class='hunk'>@@ -734,6 +793,7 @@ static int ad7192_remove(struct spi_device *spi)</div><div class='ctx'> 	struct ad7192_state *st = iio_priv(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	iio_device_unregister(indio_dev);</div><div class='add'>+	clk_disable_unprepare(st-&gt;mclk);</div><div class='ctx'> 	ad_sd_cleanup_buffer_and_trigger(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	regulator_disable(st-&gt;dvdd);</div><div class='head'>diff --git a/drivers/staging/iio/adc/ad7192.h b/drivers/staging/iio/adc/ad7192.h<br/>index 7433a43c2611..f3669e1df084 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7192.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7192.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7192.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/ad7192.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * AD7190 AD7192 AD7195 SPI ADC driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef IIO_ADC_AD7192_H_</div><div class='ctx'> #define IIO_ADC_AD7192_H_</div><div class='hunk'>@@ -33,15 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> struct ad7192_platform_data {</div><div class='ctx'> 	u16		vref_mv;</div><div class='del'>-	u8		clock_source_sel;</div><div class='del'>-	u32		ext_clk_hz;</div><div class='del'>-	bool		refin2_en;</div><div class='del'>-	bool		rej60_en;</div><div class='del'>-	bool		sinc3_en;</div><div class='del'>-	bool		chop_en;</div><div class='del'>-	bool		buf_en;</div><div class='del'>-	bool		unipolar_en;</div><div class='del'>-	bool		burnout_curr_en;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* IIO_ADC_AD7192_H_ */</div><div class='head'>diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c<br/>index d9df12665176..19a5f244dcae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7280a.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7280a.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7280a.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/ad7280a.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD7280A Lithium Ion Battery Monitoring System</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/crc8.h&gt;</div><div class='hunk'>@@ -97,9 +96,10 @@</div><div class='ctx'> #define AD7280A_NUM_CH			(AD7280A_AUX_ADC_6 - \</div><div class='ctx'> 					AD7280A_CELL_VOLTAGE_1 + 1)</div><div class='ctx'> </div><div class='del'>-#define AD7280A_CALC_VOLTAGE_CHAN_NUM(d, c) ((d * AD7280A_CELLS_PER_DEV) + c)</div><div class='del'>-#define AD7280A_CALC_TEMP_CHAN_NUM(d, c)    ((d * AD7280A_CELLS_PER_DEV) + \</div><div class='del'>-					     c - AD7280A_CELLS_PER_DEV)</div><div class='add'>+#define AD7280A_CALC_VOLTAGE_CHAN_NUM(d, c) (((d) * AD7280A_CELLS_PER_DEV) + \</div><div class='add'>+					     (c))</div><div class='add'>+#define AD7280A_CALC_TEMP_CHAN_NUM(d, c)    (((d) * AD7280A_CELLS_PER_DEV) + \</div><div class='add'>+					     (c) - AD7280A_CELLS_PER_DEV)</div><div class='ctx'> </div><div class='ctx'> #define AD7280A_DEVADDR_MASTER		0</div><div class='ctx'> #define AD7280A_DEVADDR_ALL		0x1F</div><div class='hunk'>@@ -783,43 +783,38 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)</div><div class='ctx'> 	for (i = 0; i &lt; st-&gt;scan_cnt; i++) {</div><div class='ctx'> 		if (((channels[i] &gt;&gt; 23) &amp; 0xF) &lt;= AD7280A_CELL_VOLTAGE_6) {</div><div class='ctx'> 			if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &gt;=</div><div class='del'>-				st-&gt;cell_threshhigh)</div><div class='del'>-				iio_push_event(indio_dev,</div><div class='del'>-					       IIO_EVENT_CODE(IIO_VOLTAGE,</div><div class='del'>-							1,</div><div class='del'>-							0,</div><div class='del'>-							IIO_EV_DIR_RISING,</div><div class='del'>-							IIO_EV_TYPE_THRESH,</div><div class='del'>-							0, 0, 0),</div><div class='add'>+			    st-&gt;cell_threshhigh) {</div><div class='add'>+				u64 tmp = IIO_EVENT_CODE(IIO_VOLTAGE, 1, 0,</div><div class='add'>+							 IIO_EV_DIR_RISING,</div><div class='add'>+							 IIO_EV_TYPE_THRESH,</div><div class='add'>+							 0, 0, 0);</div><div class='add'>+				iio_push_event(indio_dev, tmp,</div><div class='ctx'> 					       iio_get_time_ns(indio_dev));</div><div class='del'>-			else if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &lt;=</div><div class='del'>-				st-&gt;cell_threshlow)</div><div class='del'>-				iio_push_event(indio_dev,</div><div class='del'>-					       IIO_EVENT_CODE(IIO_VOLTAGE,</div><div class='del'>-							1,</div><div class='del'>-							0,</div><div class='del'>-							IIO_EV_DIR_FALLING,</div><div class='del'>-							IIO_EV_TYPE_THRESH,</div><div class='del'>-							0, 0, 0),</div><div class='add'>+			} else if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &lt;=</div><div class='add'>+				   st-&gt;cell_threshlow) {</div><div class='add'>+				u64 tmp = IIO_EVENT_CODE(IIO_VOLTAGE, 1, 0,</div><div class='add'>+							 IIO_EV_DIR_FALLING,</div><div class='add'>+							 IIO_EV_TYPE_THRESH,</div><div class='add'>+							 0, 0, 0);</div><div class='add'>+				iio_push_event(indio_dev, tmp,</div><div class='ctx'> 					       iio_get_time_ns(indio_dev));</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &gt;= st-&gt;aux_threshhigh)</div><div class='del'>-				iio_push_event(indio_dev,</div><div class='del'>-					       IIO_UNMOD_EVENT_CODE(</div><div class='del'>-							IIO_TEMP,</div><div class='del'>-							0,</div><div class='add'>+			if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &gt;=</div><div class='add'>+			    st-&gt;aux_threshhigh) {</div><div class='add'>+				u64 tmp = IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,</div><div class='ctx'> 							IIO_EV_TYPE_THRESH,</div><div class='del'>-							IIO_EV_DIR_RISING),</div><div class='add'>+							IIO_EV_DIR_RISING);</div><div class='add'>+				iio_push_event(indio_dev, tmp,</div><div class='ctx'> 					       iio_get_time_ns(indio_dev));</div><div class='del'>-			else if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &lt;=</div><div class='del'>-				st-&gt;aux_threshlow)</div><div class='del'>-				iio_push_event(indio_dev,</div><div class='del'>-					       IIO_UNMOD_EVENT_CODE(</div><div class='del'>-							IIO_TEMP,</div><div class='del'>-							0,</div><div class='add'>+			} else if (((channels[i] &gt;&gt; 11) &amp; 0xFFF) &lt;=</div><div class='add'>+				st-&gt;aux_threshlow) {</div><div class='add'>+				u64 tmp = IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,</div><div class='ctx'> 							IIO_EV_TYPE_THRESH,</div><div class='del'>-							IIO_EV_DIR_FALLING),</div><div class='add'>+							IIO_EV_DIR_FALLING);</div><div class='add'>+				iio_push_event(indio_dev, tmp,</div><div class='ctx'> 					       iio_get_time_ns(indio_dev));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -830,30 +825,30 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static IIO_DEVICE_ATTR_NAMED(in_thresh_low_value,</div><div class='del'>-		in_voltage-voltage_thresh_low_value,</div><div class='del'>-		0644,</div><div class='del'>-		ad7280_read_channel_config,</div><div class='del'>-		ad7280_write_channel_config,</div><div class='del'>-		AD7280A_CELL_UNDERVOLTAGE);</div><div class='add'>+			     in_voltage-voltage_thresh_low_value,</div><div class='add'>+			     0644,</div><div class='add'>+			     ad7280_read_channel_config,</div><div class='add'>+			     ad7280_write_channel_config,</div><div class='add'>+			     AD7280A_CELL_UNDERVOLTAGE);</div><div class='ctx'> </div><div class='ctx'> static IIO_DEVICE_ATTR_NAMED(in_thresh_high_value,</div><div class='del'>-		in_voltage-voltage_thresh_high_value,</div><div class='del'>-		0644,</div><div class='del'>-		ad7280_read_channel_config,</div><div class='del'>-		ad7280_write_channel_config,</div><div class='del'>-		AD7280A_CELL_OVERVOLTAGE);</div><div class='add'>+			     in_voltage-voltage_thresh_high_value,</div><div class='add'>+			     0644,</div><div class='add'>+			     ad7280_read_channel_config,</div><div class='add'>+			     ad7280_write_channel_config,</div><div class='add'>+			     AD7280A_CELL_OVERVOLTAGE);</div><div class='ctx'> </div><div class='ctx'> static IIO_DEVICE_ATTR(in_temp_thresh_low_value,</div><div class='del'>-		0644,</div><div class='del'>-		ad7280_read_channel_config,</div><div class='del'>-		ad7280_write_channel_config,</div><div class='del'>-		AD7280A_AUX_ADC_UNDERVOLTAGE);</div><div class='add'>+		       0644,</div><div class='add'>+		       ad7280_read_channel_config,</div><div class='add'>+		       ad7280_write_channel_config,</div><div class='add'>+		       AD7280A_AUX_ADC_UNDERVOLTAGE);</div><div class='ctx'> </div><div class='ctx'> static IIO_DEVICE_ATTR(in_temp_thresh_high_value,</div><div class='del'>-		0644,</div><div class='del'>-		ad7280_read_channel_config,</div><div class='del'>-		ad7280_write_channel_config,</div><div class='del'>-		AD7280A_AUX_ADC_OVERVOLTAGE);</div><div class='add'>+		       0644,</div><div class='add'>+		       ad7280_read_channel_config,</div><div class='add'>+		       ad7280_write_channel_config,</div><div class='add'>+		       AD7280A_AUX_ADC_OVERVOLTAGE);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ad7280_event_attributes[] = {</div><div class='ctx'> 	&amp;iio_dev_attr_in_thresh_low_value.dev_attr.attr,</div><div class='hunk'>@@ -921,8 +916,8 @@ static int ad7280_probe(struct spi_device *spi)</div><div class='ctx'> 	const struct ad7280_platform_data *pdata = dev_get_platdata(&amp;spi-&gt;dev);</div><div class='ctx'> 	struct ad7280_state *st;</div><div class='ctx'> 	int ret;</div><div class='del'>-	const unsigned short tACQ_ns[4] = {465, 1010, 1460, 1890};</div><div class='del'>-	const unsigned short nAVG[4] = {1, 2, 4, 8};</div><div class='add'>+	const unsigned short t_acq_ns[4] = {465, 1010, 1460, 1890};</div><div class='add'>+	const unsigned short n_avg[4] = {1, 2, 4, 8};</div><div class='ctx'> 	struct iio_dev *indio_dev;</div><div class='ctx'> </div><div class='ctx'> 	indio_dev = devm_iio_device_alloc(&amp;spi-&gt;dev, sizeof(*st));</div><div class='hunk'>@@ -970,10 +965,9 @@ static int ad7280_probe(struct spi_device *spi)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;readback_delay_us =</div><div class='del'>-		((tACQ_ns[pdata-&gt;acquisition_time &amp; 0x3] + 695) *</div><div class='del'>-		(AD7280A_NUM_CH * nAVG[pdata-&gt;conversion_averaging &amp; 0x3]))</div><div class='del'>-		- tACQ_ns[pdata-&gt;acquisition_time &amp; 0x3] +</div><div class='del'>-		st-&gt;slave_num * 250;</div><div class='add'>+		((t_acq_ns[pdata-&gt;acquisition_time &amp; 0x3] + 695) *</div><div class='add'>+		 (AD7280A_NUM_CH * n_avg[pdata-&gt;conversion_averaging &amp; 0x3])) -</div><div class='add'>+		t_acq_ns[pdata-&gt;acquisition_time &amp; 0x3] + st-&gt;slave_num * 250;</div><div class='ctx'> </div><div class='ctx'> 	/* Convert to usecs */</div><div class='ctx'> 	st-&gt;readback_delay_us = DIV_ROUND_UP(st-&gt;readback_delay_us, 1000);</div><div class='head'>diff --git a/drivers/staging/iio/adc/ad7280a.h b/drivers/staging/iio/adc/ad7280a.h<br/>index ccfb90d20e71..23f18bb9e279 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7280a.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7280a.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7280a.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/ad7280a.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * AD7280A Lithium Ion Battery Monitoring System</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef IIO_ADC_AD7280_H_</div><div class='head'>diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c<br/>index ee50e7296795..a9985a7f8199 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7816.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/adc/ad7816.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/adc/ad7816.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/adc/ad7816.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * AD7816 digital temperature sensor driver supporting AD7816/7/8</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -231,7 +230,7 @@ static ssize_t ad7816_show_value(struct device *dev,</div><div class='ctx'> 		value = (s8)((data &gt;&gt; AD7816_TEMP_FLOAT_OFFSET) - 103);</div><div class='ctx'> 		data &amp;= AD7816_TEMP_FLOAT_MASK;</div><div class='ctx'> 		if (value &lt; 0)</div><div class='del'>-			data = (1 &lt;&lt; AD7816_TEMP_FLOAT_OFFSET) - data;</div><div class='add'>+			data = BIT(AD7816_TEMP_FLOAT_OFFSET) - data;</div><div class='ctx'> 		return sprintf(buf, "%d.%.2d\n", value, data * 25);</div><div class='ctx'> 	}</div><div class='ctx'> 	return sprintf(buf, "%u\n", data);</div><div class='head'>diff --git a/drivers/staging/iio/addac/Kconfig b/drivers/staging/iio/addac/Kconfig<br/>index ba18b8432d9c..b7c3c4a7dfe4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/addac/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # ADDAC drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/addac/Makefile b/drivers/staging/iio/addac/Makefile<br/>index 4c7686133692..8fdbd8cab21f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/addac/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for industrial I/O ADDAC drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c<br/>index 0f26bc38edc6..5543cc909707 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316-i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316-i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/addac/adt7316-i2c.c</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * I2C bus driver for ADT7316/7/8 ADT7516/7/9 digital temperature</div><div class='ctx'>  * sensor, ADC and DAC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c<br/>index 8294b9c1e3c2..2066241b15b1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316-spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316-spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/addac/adt7316-spi.c</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * API bus driver for ADT7316/7/8 ADT7516/7/9 digital temperature</div><div class='ctx'>  * sensor, ADC and DAC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c<br/>index 6f7891b567b9..b6a65ee8d558 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/addac/adt7316.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/9</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -2155,7 +2153,8 @@ int adt7316_probe(struct device *dev, struct adt7316_bus *bus,</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;dac_bits = 8;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;ldac_pin = devm_gpiod_get_optional(dev, "adi,ldac", GPIOD_OUT_LOW);</div><div class='add'>+	chip-&gt;ldac_pin = devm_gpiod_get_optional(dev, "adi,ldac",</div><div class='add'>+						GPIOD_OUT_LOW);</div><div class='ctx'> 	if (IS_ERR(chip-&gt;ldac_pin)) {</div><div class='ctx'> 		ret = PTR_ERR(chip-&gt;ldac_pin);</div><div class='ctx'> 		dev_err(dev, "Failed to request ldac GPIO: %d\n", ret);</div><div class='head'>diff --git a/drivers/staging/iio/addac/adt7316.h b/drivers/staging/iio/addac/adt7316.h<br/>index 84ca4f6c88f5..8c2a92ae7157 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/addac/adt7316.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/addac/adt7316.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/addac/adt7316.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/9</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ADT7316_H_</div><div class='head'>diff --git a/drivers/staging/iio/cdc/Kconfig b/drivers/staging/iio/cdc/Kconfig<br/>index b97478e7cbd0..e0a5ce66a984 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/cdc/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # CDC drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/cdc/Makefile b/drivers/staging/iio/cdc/Makefile<br/>index 1466bc31f244..ab8222579e7e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/cdc/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for industrial I/O DAC drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c<br/>index 24f74ce60f80..dd7fcab8e19e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/ad7150.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/ad7150.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/ad7150.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/cdc/ad7150.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * AD7150 capacitive sensor driver supporting AD7150/1/6</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010-2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c<br/>index 0eb28fea876e..47610d863908 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/ad7746.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/ad7746.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/ad7746.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/cdc/ad7746.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD7746 capacitive sensor driver supporting AD7745, AD7746 and AD7747</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/cdc/ad7746.h b/drivers/staging/iio/cdc/ad7746.h<br/>index ea8572d1df02..8bdbd732dbbd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/ad7746.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/cdc/ad7746.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/cdc/ad7746.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/cdc/ad7746.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * AD7746 capacitive sensor driver supporting AD7745, AD7746 and AD7747</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef IIO_CDC_AD7746_H_</div><div class='head'>diff --git a/drivers/staging/iio/frequency/Kconfig b/drivers/staging/iio/frequency/Kconfig<br/>index fc726d3c64a6..72d899cbef8e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Direct Digital Synthesis drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/frequency/Makefile b/drivers/staging/iio/frequency/Makefile<br/>index e5dbcfce44f9..b8c5cf98aa5e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for Direct Digital Synthesis drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c<br/>index a3ce50427724..74308a2e72db 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9832.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9832.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9832.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/ad9832.c</a></div><div class='hunk'>@@ -1,27 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD9832 SPI DDS driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.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='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='del'>-#include &lt;linux/regulator/consumer.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/div64.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/iio/iio.h&gt;</div><div class='ctx'> #include &lt;linux/iio/sysfs.h&gt;</div><div class='del'>-#include "dds.h"</div><div class='ctx'> </div><div class='ctx'> #include "ad9832.h"</div><div class='ctx'> </div><div class='add'>+#include "dds.h"</div><div class='add'>+</div><div class='ctx'> /* Registers */</div><div class='ctx'> </div><div class='ctx'> #define AD9832_FREQ0LL		0x0</div><div class='hunk'>@@ -94,7 +96,7 @@ struct ad9832_state {</div><div class='ctx'> 	struct spi_device		*spi;</div><div class='ctx'> 	struct regulator		*avdd;</div><div class='ctx'> 	struct regulator		*dvdd;</div><div class='del'>-	unsigned long			mclk;</div><div class='add'>+	struct clk			*mclk;</div><div class='ctx'> 	unsigned short			ctrl_fp;</div><div class='ctx'> 	unsigned short			ctrl_ss;</div><div class='ctx'> 	unsigned short			ctrl_src;</div><div class='hunk'>@@ -129,10 +131,10 @@ static int ad9832_write_frequency(struct ad9832_state *st,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long regval;</div><div class='ctx'> </div><div class='del'>-	if (fout &gt; (st-&gt;mclk / 2))</div><div class='add'>+	if (fout &gt; (clk_get_rate(st-&gt;mclk) / 2))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	regval = ad9832_calc_freqreg(st-&gt;mclk, fout);</div><div class='add'>+	regval = ad9832_calc_freqreg(clk_get_rate(st-&gt;mclk), fout);</div><div class='ctx'> </div><div class='ctx'> 	st-&gt;freq_data[0] = cpu_to_be16((AD9832_CMD_FRE8BITSW &lt;&lt; CMD_SHIFT) |</div><div class='ctx'> 					(addr &lt;&lt; ADD_SHIFT) |</div><div class='hunk'>@@ -333,7 +335,16 @@ static int ad9832_probe(struct spi_device *spi)</div><div class='ctx'> 		goto error_disable_avdd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	st-&gt;mclk = pdata-&gt;mclk;</div><div class='add'>+	st-&gt;mclk = devm_clk_get(&amp;spi-&gt;dev, "mclk");</div><div class='add'>+	if (IS_ERR(st-&gt;mclk)) {</div><div class='add'>+		ret = PTR_ERR(st-&gt;mclk);</div><div class='add'>+		goto error_disable_dvdd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(st-&gt;mclk);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_disable_dvdd;</div><div class='add'>+</div><div class='ctx'> 	st-&gt;spi = spi;</div><div class='ctx'> 	mutex_init(&amp;st-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -384,39 +395,41 @@ static int ad9832_probe(struct spi_device *spi)</div><div class='ctx'> 	ret = spi_sync(st-&gt;spi, &amp;st-&gt;msg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "device init failed\n");</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9832_write_frequency(st, AD9832_FREQ0HM, pdata-&gt;freq0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9832_write_frequency(st, AD9832_FREQ1HM, pdata-&gt;freq1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9832_write_phase(st, AD9832_PHASE0H, pdata-&gt;phase0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9832_write_phase(st, AD9832_PHASE1H, pdata-&gt;phase1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9832_write_phase(st, AD9832_PHASE2H, pdata-&gt;phase2);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	ret = ad9832_write_phase(st, AD9832_PHASE3H, pdata-&gt;phase3);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	ret = iio_device_register(indio_dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_disable_dvdd;</div><div class='add'>+		goto error_unprepare_mclk;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+error_unprepare_mclk:</div><div class='add'>+	clk_disable_unprepare(st-&gt;mclk);</div><div class='ctx'> error_disable_dvdd:</div><div class='ctx'> 	regulator_disable(st-&gt;dvdd);</div><div class='ctx'> error_disable_avdd:</div><div class='hunk'>@@ -431,6 +444,7 @@ static int ad9832_remove(struct spi_device *spi)</div><div class='ctx'> 	struct ad9832_state *st = iio_priv(indio_dev);</div><div class='ctx'> </div><div class='ctx'> 	iio_device_unregister(indio_dev);</div><div class='add'>+	clk_disable_unprepare(st-&gt;mclk);</div><div class='ctx'> 	regulator_disable(st-&gt;dvdd);</div><div class='ctx'> 	regulator_disable(st-&gt;avdd);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/iio/frequency/ad9832.h b/drivers/staging/iio/frequency/ad9832.h<br/>index 39d326cc1af9..98dfbd9289ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9832.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9832.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9832.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/ad9832.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * AD9832 SPI DDS driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef IIO_DDS_AD9832_H_</div><div class='ctx'> #define IIO_DDS_AD9832_H_</div><div class='hunk'>@@ -24,7 +23,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct ad9832_platform_data {</div><div class='del'>-	unsigned long		mclk;</div><div class='ctx'> 	unsigned long		freq0;</div><div class='ctx'> 	unsigned long		freq1;</div><div class='ctx'> 	unsigned short		phase0;</div><div class='head'>diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c<br/>index 0b0287503fb4..6de3cd7363d7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9834.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9834.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9834.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/ad9834.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD9833/AD9834/AD9837/AD9838 SPI DDS driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010-2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -286,7 +285,7 @@ ssize_t ad9834_show_out0_wavetype_available(struct device *dev,</div><div class='ctx'> 	struct ad9834_state *st = iio_priv(indio_dev);</div><div class='ctx'> 	char *str;</div><div class='ctx'> </div><div class='del'>-	if ((st-&gt;devid == ID_AD9833) || (st-&gt;devid == ID_AD9837))</div><div class='add'>+	if (st-&gt;devid == ID_AD9833 || st-&gt;devid == ID_AD9837)</div><div class='ctx'> 		str = "sine triangle square";</div><div class='ctx'> 	else if (st-&gt;control &amp; AD9834_OPBITEN)</div><div class='ctx'> 		str = "sine";</div><div class='head'>diff --git a/drivers/staging/iio/frequency/ad9834.h b/drivers/staging/iio/frequency/ad9834.h<br/>index da7e83ceedad..521943aa0e61 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9834.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/ad9834.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/ad9834.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/ad9834.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * AD9833/AD9834/AD9837/AD9838 SPI DDS driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010-2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef IIO_DDS_AD9834_H_</div><div class='ctx'> #define IIO_DDS_AD9834_H_</div><div class='head'>diff --git a/drivers/staging/iio/frequency/dds.h b/drivers/staging/iio/frequency/dds.h<br/>index d6ccd99c14d7..2ebe68eb7398 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/dds.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/frequency/dds.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/frequency/dds.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/frequency/dds.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * dds.h - sysfs attributes associated with DDS devices</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef IIO_DDS_H_</div><div class='ctx'> #define IIO_DDS_H_</div><div class='head'>diff --git a/drivers/staging/iio/impedance-analyzer/Kconfig b/drivers/staging/iio/impedance-analyzer/Kconfig<br/>index dd97b6bb3fd0..841648847edf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/impedance-analyzer/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/impedance-analyzer/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/impedance-analyzer/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/impedance-analyzer/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Impedance Converter, Network Analyzer drivers</div><div class='ctx'> #</div><div class='hunk'>@@ -10,7 +11,7 @@ config AD5933</div><div class='ctx'> 	select IIO_KFIFO_BUF</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say yes here to build support for Analog Devices Impedance Converter,</div><div class='del'>-	  Network Analyzer, AD5933/4, provides direct access via sysfs.</div><div class='add'>+	  Network Analyzer, AD5933/4.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called ad5933.</div><div class='head'>diff --git a/drivers/staging/iio/impedance-analyzer/Makefile b/drivers/staging/iio/impedance-analyzer/Makefile<br/>index 7604d786583e..b4e657a1ac18 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/impedance-analyzer/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/impedance-analyzer/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/impedance-analyzer/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/impedance-analyzer/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for Impedance Converter, Network Analyzer drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c<br/>index 3134295f014f..af0bcf95ee8a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/impedance-analyzer/ad5933.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/impedance-analyzer/ad5933.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/impedance-analyzer/ad5933.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/impedance-analyzer/ad5933.c</a></div><div class='hunk'>@@ -1,27 +1,26 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * AD5933 AD5934 Impedance Converter, Network Analyzer</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/interrupt.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='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.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='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/iio/iio.h&gt;</div><div class='del'>-#include &lt;linux/iio/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='ctx'> #include &lt;linux/iio/kfifo_buf.h&gt;</div><div class='add'>+#include &lt;linux/iio/sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* AD5933/AD5934 Registers */</div><div class='ctx'> #define AD5933_REG_CONTROL_HB		0x80	/* R/W, 1 byte */</div><div class='hunk'>@@ -284,7 +283,7 @@ static ssize_t ad5933_show_frequency(struct device *dev,</div><div class='ctx'> 	freqreg = be32_to_cpu(dat.d32) &amp; 0xFFFFFF;</div><div class='ctx'> </div><div class='ctx'> 	freqreg = (u64)freqreg * (u64)(st-&gt;mclk_hz / 4);</div><div class='del'>-	do_div(freqreg, 1 &lt;&lt; 27);</div><div class='add'>+	do_div(freqreg, BIT(27));</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%d\n", (int)freqreg);</div><div class='ctx'> }</div><div class='hunk'>@@ -316,12 +315,12 @@ static ssize_t ad5933_store_frequency(struct device *dev,</div><div class='ctx'> 	return ret ? ret : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static IIO_DEVICE_ATTR(out_voltage0_freq_start, 0644,</div><div class='add'>+static IIO_DEVICE_ATTR(out_altvoltage0_frequency_start, 0644,</div><div class='ctx'> 			ad5933_show_frequency,</div><div class='ctx'> 			ad5933_store_frequency,</div><div class='ctx'> 			AD5933_REG_FREQ_START);</div><div class='ctx'> </div><div class='del'>-static IIO_DEVICE_ATTR(out_voltage0_freq_increment, 0644,</div><div class='add'>+static IIO_DEVICE_ATTR(out_altvoltage0_frequency_increment, 0644,</div><div class='ctx'> 			ad5933_show_frequency,</div><div class='ctx'> 			ad5933_store_frequency,</div><div class='ctx'> 			AD5933_REG_FREQ_INC);</div><div class='hunk'>@@ -420,7 +419,7 @@ static ssize_t ad5933_store(struct device *dev,</div><div class='ctx'> 		if (val &gt; 1022)</div><div class='ctx'> 			val = (val &gt;&gt; 2) | (3 &lt;&lt; 9);</div><div class='ctx'> 		else if (val &gt; 511)</div><div class='del'>-			val = (val &gt;&gt; 1) | (1 &lt;&lt; 9);</div><div class='add'>+			val = (val &gt;&gt; 1) | BIT(9);</div><div class='ctx'> </div><div class='ctx'> 		dat = cpu_to_be16(val);</div><div class='ctx'> 		ret = ad5933_i2c_write(st-&gt;client,</div><div class='hunk'>@@ -444,12 +443,12 @@ static ssize_t ad5933_store(struct device *dev,</div><div class='ctx'> 	return ret ? ret : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static IIO_DEVICE_ATTR(out_voltage0_scale, 0644,</div><div class='add'>+static IIO_DEVICE_ATTR(out_altvoltage0_raw, 0644,</div><div class='ctx'> 			ad5933_show,</div><div class='ctx'> 			ad5933_store,</div><div class='ctx'> 			AD5933_OUT_RANGE);</div><div class='ctx'> </div><div class='del'>-static IIO_DEVICE_ATTR(out_voltage0_scale_available, 0444,</div><div class='add'>+static IIO_DEVICE_ATTR(out_altvoltage0_scale_available, 0444,</div><div class='ctx'> 			ad5933_show,</div><div class='ctx'> 			NULL,</div><div class='ctx'> 			AD5933_OUT_RANGE_AVAIL);</div><div class='hunk'>@@ -464,28 +463,29 @@ static IIO_DEVICE_ATTR(in_voltage0_scale_available, 0444,</div><div class='ctx'> 			NULL,</div><div class='ctx'> 			AD5933_IN_PGA_GAIN_AVAIL);</div><div class='ctx'> </div><div class='del'>-static IIO_DEVICE_ATTR(out_voltage0_freq_points, 0644,</div><div class='add'>+static IIO_DEVICE_ATTR(out_altvoltage0_frequency_points, 0644,</div><div class='ctx'> 			ad5933_show,</div><div class='ctx'> 			ad5933_store,</div><div class='ctx'> 			AD5933_FREQ_POINTS);</div><div class='ctx'> </div><div class='del'>-static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,</div><div class='add'>+static IIO_DEVICE_ATTR(out_altvoltage0_settling_cycles, 0644,</div><div class='ctx'> 			ad5933_show,</div><div class='ctx'> 			ad5933_store,</div><div class='ctx'> 			AD5933_OUT_SETTLING_CYCLES);</div><div class='ctx'> </div><div class='del'>-/* note:</div><div class='add'>+/*</div><div class='add'>+ * note:</div><div class='ctx'>  * ideally we would handle the scale attributes via the iio_info</div><div class='ctx'>  * (read|write)_raw methods, however this part is a untypical since we</div><div class='ctx'>  * don't create dedicated sysfs channel attributes for out0 and in0.</div><div class='ctx'>  */</div><div class='ctx'> static struct attribute *ad5933_attributes[] = {</div><div class='del'>-	&amp;iio_dev_attr_out_voltage0_scale.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_out_voltage0_scale_available.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_out_voltage0_freq_start.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_out_voltage0_freq_increment.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_out_voltage0_freq_points.dev_attr.attr,</div><div class='del'>-	&amp;iio_dev_attr_out_voltage0_settling_cycles.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_out_altvoltage0_raw.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_out_altvoltage0_scale_available.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_out_altvoltage0_frequency_start.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_out_altvoltage0_frequency_increment.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_out_altvoltage0_frequency_points.dev_attr.attr,</div><div class='add'>+	&amp;iio_dev_attr_out_altvoltage0_settling_cycles.dev_attr.attr,</div><div class='ctx'> 	&amp;iio_dev_attr_in_voltage0_scale.dev_attr.attr,</div><div class='ctx'> 	&amp;iio_dev_attr_in_voltage0_scale_available.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -572,7 +572,8 @@ static int ad5933_ring_postenable(struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad5933_state *st = iio_priv(indio_dev);</div><div class='ctx'> </div><div class='del'>-	/* AD5933_CTRL_INIT_START_FREQ:</div><div class='add'>+	/*</div><div class='add'>+	 * AD5933_CTRL_INIT_START_FREQ:</div><div class='ctx'> 	 * High Q complex circuits require a long time to reach steady state.</div><div class='ctx'> 	 * To facilitate the measurement of such impedances, this mode allows</div><div class='ctx'> 	 * the user full control of the settling time requirement before</div><div class='hunk'>@@ -663,7 +664,8 @@ static void ad5933_work(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; AD5933_STAT_SWEEP_DONE) {</div><div class='del'>-		/* last sample received - power down do</div><div class='add'>+		/*</div><div class='add'>+		 * last sample received - power down do</div><div class='ctx'> 		 * nothing until the ring enable is toggled</div><div class='ctx'> 		 */</div><div class='ctx'> 		ad5933_cmd(st, AD5933_CTRL_POWER_DOWN);</div><div class='head'>diff --git a/drivers/staging/iio/meter/Kconfig b/drivers/staging/iio/meter/Kconfig<br/>index e01eb8abcdce..aa6a3e7f6cdb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/meter/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # IIO meter drivers configuration</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c<br/>index c3aa6ea9d036..a9a06e8dda51 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/ade7854-i2c.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/ade7854-i2c.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/ade7854-i2c.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/meter/ade7854-i2c.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver (I2C Bus)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c<br/>index fc9146757283..f12a6c8b3e88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/ade7854-spi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/ade7854-spi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/ade7854-spi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/meter/ade7854-spi.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver (SPI Bus)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c<br/>index 029c3bf42d4d..68da6ecde6a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/ade7854.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/meter/ade7854.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/meter/ade7854.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/meter/ade7854.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2010 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -269,7 +268,7 @@ static IIO_DEV_ATTR_VPEAK(0644,</div><div class='ctx'> static IIO_DEV_ATTR_IPEAK(0644,</div><div class='ctx'> 		ade7854_read_32bit,</div><div class='ctx'> 		ade7854_write_32bit,</div><div class='del'>-		ADE7854_VPEAK);</div><div class='add'>+		ADE7854_IPEAK);</div><div class='ctx'> static IIO_DEV_ATTR_APHCAL(0644,</div><div class='ctx'> 		ade7854_read_16bit,</div><div class='ctx'> 		ade7854_write_16bit,</div><div class='head'>diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig<br/>index 4a727c17bb8f..6d1e2622e0b0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/resolver/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/resolver/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/resolver/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/resolver/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Resolver/Synchro drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/resolver/Makefile b/drivers/staging/iio/resolver/Makefile<br/>index b2049f2ce36e..398631f7e79b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/resolver/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/resolver/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/resolver/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/resolver/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for Resolver/Synchro drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c<br/>index cec9d995b3df..b6be0bc202f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/resolver/ad2s1210.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/iio/resolver/ad2s1210.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/iio/resolver/ad2s1210.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/iio/resolver/ad2s1210.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * ad2s1210.c support for the ADI Resolver to Digital Converters: AD2S1210</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010-2010 Analog Devices Inc.</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='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='head'>diff --git a/drivers/staging/kpc2000/Kconfig b/drivers/staging/kpc2000/Kconfig<br/>new file mode 100644<br/>index 000000000000..fb5922928f47<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+config KPC2000</div><div class='add'>+	bool "Daktronics KPC Device support"</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  Select this if you wish to use the Daktronics KPC PCI devices</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config KPC2000_CORE</div><div class='add'>+	tristate "Daktronics KPC PCI UIO device"</div><div class='add'>+	depends on KPC2000</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you wish to support the Daktronics KPC PCI</div><div class='add'>+	  device in UIO mode.</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 kpc2000</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config KPC2000_SPI</div><div class='add'>+	tristate "Kaktronics KPC SPI device"</div><div class='add'>+	depends on KPC2000 &amp;&amp; SPI</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you wish to support the Daktronics KPC PCI</div><div class='add'>+	  device in SPI mode.</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 kpc2000_spi</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config KPC2000_I2C</div><div class='add'>+	tristate "Kaktronics KPC I2C device"</div><div class='add'>+	depends on KPC2000 &amp;&amp; I2C</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you wish to support the Daktronics KPC PCI</div><div class='add'>+	  device in I2C mode.</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 kpc2000_i2c</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config KPC2000_DMA</div><div class='add'>+	tristate "Daktronics KPC DMA controller"</div><div class='add'>+	depends on KPC2000</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you wish to support the Daktronics DMA controller.</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 kpc2000_dma</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/kpc2000/Makefile b/drivers/staging/kpc2000/Makefile<br/>new file mode 100644<br/>index 000000000000..1e48e9df1329<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_KPC2000) += kpc2000/</div><div class='add'>+obj-$(CONFIG_KPC2000_I2C) += kpc_i2c/</div><div class='add'>+obj-$(CONFIG_KPC2000_SPI) += kpc_spi/</div><div class='add'>+obj-$(CONFIG_KPC2000_DMA) += kpc_dma/</div><div class='head'>diff --git a/drivers/staging/kpc2000/TODO b/drivers/staging/kpc2000/TODO<br/>new file mode 100644<br/>index 000000000000..8c7af29fefae<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/TODO</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+- the kpc_spi driver doesn't seem to let multiple transactions (to different instances of the core) happen in parallel...</div><div class='add'>+- The kpc_i2c driver is a hot mess, it should probably be cleaned up a ton.  It functions against current hardware though.</div><div class='add'>+- pcard-&gt;card_num in kp2000_pcie_probe() is a global variable and needs atomic / locking / something better.</div><div class='add'>+- probe_core_uio() probably needs error handling</div><div class='add'>+- the loop in kp2000_probe_cores() that uses probe_core_uio() also probably needs error handling</div><div class='add'>+- would be nice if the AIO fileops in kpc_dma could be made to work</div><div class='add'>+    - probably want to add a CONFIG_ option to control compilation of the AIO functions</div><div class='add'>+- if the AIO fileops in kpc_dma start working, next would be making iov_count &gt; 1 work too</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc.h b/drivers/staging/kpc2000/kpc.h<br/>new file mode 100644<br/>index 000000000000..a3fc9c9221aa<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef KPC_H_</div><div class='add'>+#define KPC_H_</div><div class='add'>+</div><div class='add'>+/* *****  Driver Names  ***** */</div><div class='add'>+#define KP_DRIVER_NAME_KP2000           "kp2000"</div><div class='add'>+#define KP_DRIVER_NAME_INVALID          "kpc_invalid"</div><div class='add'>+#define KP_DRIVER_NAME_DMA_CONTROLLER   "kpc_nwl_dma"</div><div class='add'>+#define KP_DRIVER_NAME_UIO              "uio_pdrv_genirq"</div><div class='add'>+#define KP_DRIVER_NAME_I2C              "kpc_i2c"</div><div class='add'>+#define KP_DRIVER_NAME_SPI              "kpc_spi"</div><div class='add'>+</div><div class='add'>+struct kpc_core_device_platdata {</div><div class='add'>+	u32 card_id;</div><div class='add'>+	u32 build_version;</div><div class='add'>+	u32 hardware_revision;</div><div class='add'>+	u64 ssid;</div><div class='add'>+	u64 ddna;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_DAKTRONICS_KADOKA_P2KR0           0x4b03</div><div class='add'>+</div><div class='add'>+#endif /* KPC_H_ */</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/Makefile b/drivers/staging/kpc2000/kpc2000/Makefile<br/>new file mode 100644<br/>index 000000000000..28ab1e185f9f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-m := kpc2000.o</div><div class='add'>+kpc2000-objs += kp2000_module.o  core.o  cell_probe.o  fileops.o</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/cell_probe.c b/drivers/staging/kpc2000/kpc2000/cell_probe.c<br/>new file mode 100644<br/>index 000000000000..e0dba91e7fa8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/cell_probe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/cell_probe.c</a></div><div class='hunk'>@@ -0,0 +1,471 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</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/types.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/uio_driver.h&gt;</div><div class='add'>+#include "pcie.h"</div><div class='add'>+</div><div class='add'>+/*  Core (Resource) Table Layout:</div><div class='add'>+ *      one Resource per record (8 bytes)</div><div class='add'>+ *                 6         5         4         3         2         1         0</div><div class='add'>+ *              3210987654321098765432109876543210987654321098765432109876543210</div><div class='add'>+ *              IIIIIIIIIIII                                                        Core Type    [up to 4095 types]</div><div class='add'>+ *                          D                                                       S2C DMA Present</div><div class='add'>+ *                           DDD                                                    S2C DMA Channel Number    [up to 8 channels]</div><div class='add'>+ *                              LLLLLLLLLLLLLLLL                                    Register Count (64-bit registers)    [up to 65535 registers]</div><div class='add'>+ *                                              OOOOOOOOOOOOOOOO                    Core Offset (in 4kB blocks)    [up to 65535 cores]</div><div class='add'>+ *                                                              D                   C2S DMA Present</div><div class='add'>+ *                                                               DDD                C2S DMA Channel Number    [up to 8 channels]</div><div class='add'>+ *                                                                  II              IRQ Count [0 to 3 IRQs per core]</div><div class='add'>+                                                                      1111111000</div><div class='add'>+ *                                                                    IIIIIII       IRQ Base Number [up to 128 IRQs per card]</div><div class='add'>+ *                                                                           ___    Spare</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define KPC_OLD_DMA_CH_NUM(present, channel)   ((present) ? (0x8 | ((channel) &amp; 0x7)) : 0)</div><div class='add'>+#define KPC_OLD_S2C_DMA_CH_NUM(cte)   KPC_OLD_DMA_CH_NUM(cte.s2c_dma_present, cte.s2c_dma_channel_num)</div><div class='add'>+#define KPC_OLD_C2S_DMA_CH_NUM(cte)   KPC_OLD_DMA_CH_NUM(cte.c2s_dma_present, cte.c2s_dma_channel_num)</div><div class='add'>+</div><div class='add'>+#define KP_CORE_ID_INVALID      0</div><div class='add'>+#define KP_CORE_ID_I2C          3</div><div class='add'>+#define KP_CORE_ID_SPI          5</div><div class='add'>+</div><div class='add'>+struct core_table_entry {</div><div class='add'>+    u16     type;</div><div class='add'>+    u32     offset;</div><div class='add'>+    u32     length;</div><div class='add'>+    bool    s2c_dma_present;</div><div class='add'>+    u8      s2c_dma_channel_num;</div><div class='add'>+    bool    c2s_dma_present;</div><div class='add'>+    u8      c2s_dma_channel_num;</div><div class='add'>+    u8      irq_count;</div><div class='add'>+    u8      irq_base_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void  parse_core_table_entry_v0(struct core_table_entry *cte, const u64 read_val)</div><div class='add'>+{</div><div class='add'>+    cte-&gt;type                = ((read_val &amp; 0xFFF0000000000000) &gt;&gt; 52);</div><div class='add'>+    cte-&gt;offset              = ((read_val &amp; 0x00000000FFFF0000) &gt;&gt; 16) * 4096;</div><div class='add'>+    cte-&gt;length              = ((read_val &amp; 0x0000FFFF00000000) &gt;&gt; 32) * 8;</div><div class='add'>+    cte-&gt;s2c_dma_present     = ((read_val &amp; 0x0008000000000000) &gt;&gt; 51);</div><div class='add'>+    cte-&gt;s2c_dma_channel_num = ((read_val &amp; 0x0007000000000000) &gt;&gt; 48);</div><div class='add'>+    cte-&gt;c2s_dma_present     = ((read_val &amp; 0x0000000000008000) &gt;&gt; 15);</div><div class='add'>+    cte-&gt;c2s_dma_channel_num = ((read_val &amp; 0x0000000000007000) &gt;&gt; 12);</div><div class='add'>+    cte-&gt;irq_count           = ((read_val &amp; 0x0000000000000C00) &gt;&gt; 10);</div><div class='add'>+    cte-&gt;irq_base_num        = ((read_val &amp; 0x00000000000003F8) &gt;&gt;  3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void dbg_cte(struct kp2000_device *pcard, struct core_table_entry *cte)</div><div class='add'>+{</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "CTE: type:%3d  offset:%3d (%3d)  length:%3d (%3d)  s2c:%d  c2s:%d  irq_count:%d  base_irq:%d\n",</div><div class='add'>+        cte-&gt;type,</div><div class='add'>+        cte-&gt;offset,</div><div class='add'>+        cte-&gt;offset / 4096,</div><div class='add'>+        cte-&gt;length,</div><div class='add'>+        cte-&gt;length / 8,</div><div class='add'>+        (cte-&gt;s2c_dma_present ? cte-&gt;s2c_dma_channel_num : -1),</div><div class='add'>+        (cte-&gt;c2s_dma_present ? cte-&gt;c2s_dma_channel_num : -1),</div><div class='add'>+        cte-&gt;irq_count,</div><div class='add'>+        cte-&gt;irq_base_num</div><div class='add'>+    );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void parse_core_table_entry(struct core_table_entry *cte, const u64 read_val, const u8 entry_rev)</div><div class='add'>+{</div><div class='add'>+	switch (entry_rev) {</div><div class='add'>+	case 0: parse_core_table_entry_v0(cte, read_val); break;</div><div class='add'>+	default: cte-&gt;type = 0; break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int  probe_core_basic(unsigned int core_num, struct kp2000_device *pcard, char *name, const struct core_table_entry cte)</div><div class='add'>+{</div><div class='add'>+    struct mfd_cell  cell = {0};</div><div class='add'>+    struct resource  resources[2];</div><div class='add'>+</div><div class='add'>+    struct kpc_core_device_platdata  core_pdata = {</div><div class='add'>+        .card_id           = pcard-&gt;card_id,</div><div class='add'>+        .build_version     = pcard-&gt;build_version,</div><div class='add'>+        .hardware_revision = pcard-&gt;hardware_revision,</div><div class='add'>+        .ssid              = pcard-&gt;ssid,</div><div class='add'>+        .ddna              = pcard-&gt;ddna,</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "Found Basic core: type = %02d  dma = %02x / %02x  offset = 0x%x  length = 0x%x (%d regs)\n", cte.type, KPC_OLD_S2C_DMA_CH_NUM(cte), KPC_OLD_C2S_DMA_CH_NUM(cte), cte.offset, cte.length, cte.length / 8);</div><div class='add'>+    </div><div class='add'>+    </div><div class='add'>+    cell.platform_data = &amp;core_pdata;</div><div class='add'>+    cell.pdata_size = sizeof(struct kpc_core_device_platdata);</div><div class='add'>+    cell.name = name;</div><div class='add'>+    cell.id = core_num;</div><div class='add'>+    cell.num_resources = 2;</div><div class='add'>+    </div><div class='add'>+    memset(&amp;resources, 0, sizeof(resources));</div><div class='add'>+</div><div class='add'>+    resources[0].start = cte.offset;</div><div class='add'>+    resources[0].end   = cte.offset + (cte.length - 1);</div><div class='add'>+    resources[0].flags = IORESOURCE_MEM;</div><div class='add'>+    </div><div class='add'>+    resources[1].start = pcard-&gt;pdev-&gt;irq;</div><div class='add'>+    resources[1].end   = pcard-&gt;pdev-&gt;irq;</div><div class='add'>+    resources[1].flags = IORESOURCE_IRQ;</div><div class='add'>+    </div><div class='add'>+    cell.resources = resources;</div><div class='add'>+    </div><div class='add'>+    return mfd_add_devices(</div><div class='add'>+        PCARD_TO_DEV(pcard),    // parent</div><div class='add'>+        pcard-&gt;card_num * 100,  // id</div><div class='add'>+        &amp;cell,                  // struct mfd_cell *</div><div class='add'>+        1,                      // ndevs</div><div class='add'>+        &amp;pcard-&gt;regs_base_resource,</div><div class='add'>+        0,                      // irq_base</div><div class='add'>+        NULL                    // struct irq_domain *</div><div class='add'>+    );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct kpc_uio_device {</div><div class='add'>+    struct list_head list;</div><div class='add'>+    struct kp2000_device *pcard;</div><div class='add'>+    struct device  *dev;</div><div class='add'>+    struct uio_info uioinfo;</div><div class='add'>+    struct core_table_entry cte;</div><div class='add'>+    u16 core_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t  show_attr(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+    struct kpc_uio_device *kudev = dev_get_drvdata(dev);</div><div class='add'>+    </div><div class='add'>+    #define ATTR_NAME_CMP(v)  (strcmp(v, attr-&gt;attr.name) == 0)</div><div class='add'>+    if ATTR_NAME_CMP("offset"){</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.offset);</div><div class='add'>+    } else if ATTR_NAME_CMP("size"){</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.length);</div><div class='add'>+    } else if ATTR_NAME_CMP("type"){</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.type);</div><div class='add'>+    }</div><div class='add'>+    else if ATTR_NAME_CMP("s2c_dma"){</div><div class='add'>+        if (kudev-&gt;cte.s2c_dma_present){</div><div class='add'>+            return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.s2c_dma_channel_num);</div><div class='add'>+        } else {</div><div class='add'>+            return scnprintf(buf, PAGE_SIZE, "not present\n");</div><div class='add'>+        }</div><div class='add'>+    } else if ATTR_NAME_CMP("c2s_dma"){</div><div class='add'>+        if (kudev-&gt;cte.c2s_dma_present){</div><div class='add'>+            return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.c2s_dma_channel_num);</div><div class='add'>+        } else {</div><div class='add'>+            return scnprintf(buf, PAGE_SIZE, "not present\n");</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else if ATTR_NAME_CMP("irq_count"){</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.irq_count);</div><div class='add'>+    } else if ATTR_NAME_CMP("irq_base_num"){</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;cte.irq_base_num);</div><div class='add'>+    } else if ATTR_NAME_CMP("core_num"){</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%u\n", kudev-&gt;core_num);</div><div class='add'>+    } else {</div><div class='add'>+        return 0;</div><div class='add'>+    }</div><div class='add'>+    #undef ATTR_NAME_CMP</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DEVICE_ATTR(offset,  0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(size,    0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(type,    0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(s2c_dma_ch, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(c2s_dma_ch, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(s2c_dma, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(c2s_dma, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(irq_count, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(irq_base_num, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(core_num, 0444, show_attr, NULL);</div><div class='add'>+struct attribute * kpc_uio_class_attrs[] = {</div><div class='add'>+	&amp;dev_attr_offset.attr,</div><div class='add'>+	&amp;dev_attr_size.attr,</div><div class='add'>+	&amp;dev_attr_type.attr,</div><div class='add'>+	&amp;dev_attr_s2c_dma_ch.attr,</div><div class='add'>+	&amp;dev_attr_c2s_dma_ch.attr,</div><div class='add'>+	&amp;dev_attr_s2c_dma.attr,</div><div class='add'>+	&amp;dev_attr_c2s_dma.attr,</div><div class='add'>+	&amp;dev_attr_irq_count.attr,</div><div class='add'>+	&amp;dev_attr_irq_base_num.attr,</div><div class='add'>+	&amp;dev_attr_core_num.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int  kp2000_check_uio_irq(struct kp2000_device *pcard, u32 irq_num)</div><div class='add'>+{</div><div class='add'>+    u64 interrupt_active   =  readq(pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_ACTIVE);</div><div class='add'>+    u64 interrupt_mask_inv = ~readq(pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_MASK);</div><div class='add'>+    u64 irq_check_mask = (1 &lt;&lt; irq_num);</div><div class='add'>+    if (interrupt_active &amp; irq_check_mask){ // if it's active (interrupt pending)</div><div class='add'>+        if (interrupt_mask_inv &amp; irq_check_mask){    // and if it's not masked off</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</div><div class='add'>+irqreturn_t  kuio_handler(int irq, struct uio_info *uioinfo)</div><div class='add'>+{</div><div class='add'>+    struct kpc_uio_device *kudev = uioinfo-&gt;priv;</div><div class='add'>+    if (irq != kudev-&gt;pcard-&gt;pdev-&gt;irq)</div><div class='add'>+        return IRQ_NONE;</div><div class='add'>+    </div><div class='add'>+    if (kp2000_check_uio_irq(kudev-&gt;pcard, kudev-&gt;cte.irq_base_num)){</div><div class='add'>+        writeq((1 &lt;&lt; kudev-&gt;cte.irq_base_num), kudev-&gt;pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_ACTIVE); // Clear the active flag</div><div class='add'>+        return IRQ_HANDLED;</div><div class='add'>+    }</div><div class='add'>+    return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int kuio_irqcontrol(struct uio_info *uioinfo, s32 irq_on)</div><div class='add'>+{</div><div class='add'>+    struct kpc_uio_device *kudev = uioinfo-&gt;priv;</div><div class='add'>+    struct kp2000_device *pcard = kudev-&gt;pcard;</div><div class='add'>+    u64 mask;</div><div class='add'>+    </div><div class='add'>+    lock_card(pcard);</div><div class='add'>+    mask = readq(pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_MASK);</div><div class='add'>+    if (irq_on){</div><div class='add'>+        mask &amp;= ~(1 &lt;&lt; (kudev-&gt;cte.irq_base_num));</div><div class='add'>+    } else {</div><div class='add'>+        mask |= (1 &lt;&lt; (kudev-&gt;cte.irq_base_num));</div><div class='add'>+    }</div><div class='add'>+    writeq(mask, pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_MASK);</div><div class='add'>+    unlock_card(pcard);</div><div class='add'>+    </div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int  probe_core_uio(unsigned int core_num, struct kp2000_device *pcard, char *name, const struct core_table_entry cte)</div><div class='add'>+{</div><div class='add'>+    struct kpc_uio_device  *kudev;</div><div class='add'>+    int rv;</div><div class='add'>+</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "Found UIO core:   type = %02d  dma = %02x / %02x  offset = 0x%x  length = 0x%x (%d regs)\n", cte.type, KPC_OLD_S2C_DMA_CH_NUM(cte), KPC_OLD_C2S_DMA_CH_NUM(cte), cte.offset, cte.length, cte.length / 8);</div><div class='add'>+    </div><div class='add'>+    kudev = kzalloc(sizeof(struct kpc_uio_device), GFP_KERNEL);</div><div class='add'>+    if (!kudev){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe_core_uio: failed to kzalloc kpc_uio_device\n");</div><div class='add'>+        return -ENOMEM;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    INIT_LIST_HEAD(&amp;kudev-&gt;list);</div><div class='add'>+    kudev-&gt;pcard = pcard;</div><div class='add'>+    kudev-&gt;cte = cte;</div><div class='add'>+    kudev-&gt;core_num = core_num;</div><div class='add'>+    </div><div class='add'>+    kudev-&gt;uioinfo.priv = kudev;</div><div class='add'>+    kudev-&gt;uioinfo.name = name;</div><div class='add'>+    kudev-&gt;uioinfo.version = "0.0";</div><div class='add'>+    if (cte.irq_count &gt; 0){</div><div class='add'>+        kudev-&gt;uioinfo.irq_flags = IRQF_SHARED;</div><div class='add'>+        kudev-&gt;uioinfo.irq = pcard-&gt;pdev-&gt;irq;</div><div class='add'>+        kudev-&gt;uioinfo.handler = kuio_handler;</div><div class='add'>+        kudev-&gt;uioinfo.irqcontrol = kuio_irqcontrol;</div><div class='add'>+    } else {</div><div class='add'>+        kudev-&gt;uioinfo.irq = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    kudev-&gt;uioinfo.mem[0].name = "uiomap";</div><div class='add'>+    kudev-&gt;uioinfo.mem[0].addr = pci_resource_start(pcard-&gt;pdev, REG_BAR) + cte.offset;</div><div class='add'>+    kudev-&gt;uioinfo.mem[0].size = (cte.length + PAGE_SIZE-1) &amp; ~(PAGE_SIZE-1); // Round up to nearest PAGE_SIZE boundary</div><div class='add'>+    kudev-&gt;uioinfo.mem[0].memtype = UIO_MEM_PHYS;</div><div class='add'>+    </div><div class='add'>+    kudev-&gt;dev = device_create(kpc_uio_class, &amp;pcard-&gt;pdev-&gt;dev, MKDEV(0,0), kudev, "%s.%d.%d.%d", kudev-&gt;uioinfo.name, pcard-&gt;card_num, cte.type, kudev-&gt;core_num);</div><div class='add'>+    if (IS_ERR(kudev-&gt;dev)) {</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe_core_uio device_create failed!\n");</div><div class='add'>+        return -ENODEV;</div><div class='add'>+    }</div><div class='add'>+    dev_set_drvdata(kudev-&gt;dev, kudev);</div><div class='add'>+    </div><div class='add'>+    rv = uio_register_device(kudev-&gt;dev, &amp;kudev-&gt;uioinfo);</div><div class='add'>+    if (rv){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe_core_uio failed uio_register_device: %d\n", rv);</div><div class='add'>+        return rv;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    list_add_tail(&amp;kudev-&gt;list, &amp;pcard-&gt;uio_devices_list);</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'>+static int  create_dma_engine_core(struct kp2000_device *pcard, size_t engine_regs_offset, int engine_num, int irq_num)</div><div class='add'>+{</div><div class='add'>+    struct mfd_cell  cell = {0};</div><div class='add'>+    struct resource  resources[2];</div><div class='add'>+</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "create_dma_core(pcard = [%p], engine_regs_offset = %zx, engine_num = %d)\n", pcard, engine_regs_offset, engine_num);</div><div class='add'>+    </div><div class='add'>+    cell.platform_data = NULL;</div><div class='add'>+    cell.pdata_size = 0;</div><div class='add'>+    cell.id = engine_num;</div><div class='add'>+    cell.name = KP_DRIVER_NAME_DMA_CONTROLLER;</div><div class='add'>+    cell.num_resources = 2;</div><div class='add'>+    </div><div class='add'>+    memset(&amp;resources, 0, sizeof(resources));</div><div class='add'>+</div><div class='add'>+    resources[0].start = engine_regs_offset;</div><div class='add'>+    resources[0].end   = engine_regs_offset + (KPC_DMA_ENGINE_SIZE - 1);</div><div class='add'>+    resources[0].flags = IORESOURCE_MEM;</div><div class='add'>+    </div><div class='add'>+    resources[1].start = irq_num;</div><div class='add'>+    resources[1].end   = irq_num;</div><div class='add'>+    resources[1].flags = IORESOURCE_IRQ;</div><div class='add'>+    </div><div class='add'>+    cell.resources = resources;</div><div class='add'>+    </div><div class='add'>+    return mfd_add_devices(</div><div class='add'>+        PCARD_TO_DEV(pcard),    // parent</div><div class='add'>+        pcard-&gt;card_num * 100,  // id</div><div class='add'>+        &amp;cell,                  // struct mfd_cell *</div><div class='add'>+        1,                      // ndevs</div><div class='add'>+        &amp;pcard-&gt;dma_base_resource,</div><div class='add'>+        0,                      // irq_base</div><div class='add'>+        NULL                    // struct irq_domain *</div><div class='add'>+    );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int  kp2000_setup_dma_controller(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    int err;</div><div class='add'>+    unsigned int i;</div><div class='add'>+    u64 capabilities_reg;</div><div class='add'>+    </div><div class='add'>+    // S2C Engines</div><div class='add'>+    for (i = 0 ; i &lt; 32 ; i++){</div><div class='add'>+        capabilities_reg = readq( pcard-&gt;dma_bar_base + KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i) );</div><div class='add'>+        if (capabilities_reg &amp; ENGINE_CAP_PRESENT_MASK){</div><div class='add'>+            err = create_dma_engine_core(pcard, (KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), i,  pcard-&gt;pdev-&gt;irq);</div><div class='add'>+            if (err) goto err_out;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    // C2S Engines</div><div class='add'>+    for (i = 0 ; i &lt; 32 ; i++){</div><div class='add'>+        capabilities_reg = readq( pcard-&gt;dma_bar_base + KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i) );</div><div class='add'>+        if (capabilities_reg &amp; ENGINE_CAP_PRESENT_MASK){</div><div class='add'>+            err = create_dma_engine_core(pcard, (KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), 32+i,  pcard-&gt;pdev-&gt;irq);</div><div class='add'>+            if (err) goto err_out;</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_out:</div><div class='add'>+    dev_err(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_setup_dma_controller: failed to add a DMA Engine: %d\n", err);</div><div class='add'>+    return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int  kp2000_probe_cores(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    int err = 0;</div><div class='add'>+    int i;</div><div class='add'>+    int current_type_id;</div><div class='add'>+    u64 read_val;</div><div class='add'>+    unsigned int highest_core_id = 0;</div><div class='add'>+    struct core_table_entry cte;</div><div class='add'>+</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_probe_cores(pcard = %p / %d)\n", pcard, pcard-&gt;card_num);</div><div class='add'>+    </div><div class='add'>+    err = kp2000_setup_dma_controller(pcard);</div><div class='add'>+    if (err) return err;</div><div class='add'>+    </div><div class='add'>+    INIT_LIST_HEAD(&amp;pcard-&gt;uio_devices_list);</div><div class='add'>+    </div><div class='add'>+    // First, iterate the core table looking for the highest CORE_ID</div><div class='add'>+    for (i = 0 ; i &lt; pcard-&gt;core_table_length ; i++){</div><div class='add'>+        read_val = readq(pcard-&gt;sysinfo_regs_base + ((pcard-&gt;core_table_offset + i) * 8));</div><div class='add'>+        parse_core_table_entry(&amp;cte, read_val, pcard-&gt;core_table_rev);</div><div class='add'>+        dbg_cte(pcard, &amp;cte);</div><div class='add'>+        if (cte.type &gt; highest_core_id){</div><div class='add'>+            highest_core_id = cte.type;</div><div class='add'>+        }</div><div class='add'>+        if (cte.type == KP_CORE_ID_INVALID){</div><div class='add'>+            dev_info(&amp;pcard-&gt;pdev-&gt;dev, "Found Invalid core: %016llx\n", read_val);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    // Then, iterate over the possible core types.</div><div class='add'>+    for (current_type_id = 1 ; current_type_id &lt;= highest_core_id ; current_type_id++){</div><div class='add'>+        unsigned int core_num = 0;</div><div class='add'>+        // Foreach core type, iterate the whole table and instantiate subdevices for each core.</div><div class='add'>+        // Yes, this is O(n*m) but the actual runtime is small enough that it's an acceptable tradeoff.</div><div class='add'>+        for (i = 0 ; i &lt; pcard-&gt;core_table_length ; i++){</div><div class='add'>+            read_val = readq(pcard-&gt;sysinfo_regs_base + ((pcard-&gt;core_table_offset + i) * 8));</div><div class='add'>+            parse_core_table_entry(&amp;cte, read_val, pcard-&gt;core_table_rev);</div><div class='add'>+            </div><div class='add'>+            if (cte.type == current_type_id){</div><div class='add'>+                switch (cte.type){</div><div class='add'>+                    case KP_CORE_ID_I2C:</div><div class='add'>+                        err = probe_core_basic(core_num, pcard, KP_DRIVER_NAME_I2C, cte);</div><div class='add'>+                        break;</div><div class='add'>+                    </div><div class='add'>+                    case KP_CORE_ID_SPI:</div><div class='add'>+                        err = probe_core_basic(core_num, pcard, KP_DRIVER_NAME_SPI, cte);</div><div class='add'>+                        break;</div><div class='add'>+                    </div><div class='add'>+                    default:</div><div class='add'>+                        err = probe_core_uio(core_num, pcard, "kpc_uio", cte);</div><div class='add'>+                        break;</div><div class='add'>+                }</div><div class='add'>+                if (err){</div><div class='add'>+                    dev_err(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_probe_cores: failed to add core %d: %d\n", i, err);</div><div class='add'>+                    return err;</div><div class='add'>+                }</div><div class='add'>+                core_num++;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    // Finally, instantiate a UIO device for the core_table.</div><div class='add'>+    cte.type                = 0; // CORE_ID_BOARD_INFO</div><div class='add'>+    cte.offset              = 0; // board info is always at the beginning</div><div class='add'>+    cte.length              = 512*8;</div><div class='add'>+    cte.s2c_dma_present     = false;</div><div class='add'>+    cte.s2c_dma_channel_num = 0;</div><div class='add'>+    cte.c2s_dma_present     = false;</div><div class='add'>+    cte.c2s_dma_channel_num = 0;</div><div class='add'>+    cte.irq_count           = 0;</div><div class='add'>+    cte.irq_base_num        = 0;</div><div class='add'>+    err = probe_core_uio(0, pcard, "kpc_uio", cte);</div><div class='add'>+    if (err){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_probe_cores: failed to add board_info core: %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'>+void  kp2000_remove_cores(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    struct list_head *ptr;</div><div class='add'>+    struct list_head *next;</div><div class='add'>+    list_for_each_safe(ptr, next, &amp;pcard-&gt;uio_devices_list){</div><div class='add'>+        struct kpc_uio_device *kudev = list_entry(ptr, struct kpc_uio_device, list);</div><div class='add'>+        uio_unregister_device(&amp;kudev-&gt;uioinfo);</div><div class='add'>+        device_unregister(kudev-&gt;dev);</div><div class='add'>+        list_del(&amp;kudev-&gt;list);</div><div class='add'>+        kfree(kudev);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/core.c b/drivers/staging/kpc2000/kpc2000/core.c<br/>new file mode 100644<br/>index 000000000000..40390cdd3c8d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/core.c</a></div><div class='hunk'>@@ -0,0 +1,437 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</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/types.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include "pcie.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*******************************************************</div><div class='add'>+  * SysFS Attributes</div><div class='add'>+  ******************************************************/</div><div class='add'>+static ssize_t  show_attr(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+    struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+    struct kp2000_device *pcard;</div><div class='add'>+</div><div class='add'>+    if (!pdev)  return -ENXIO;</div><div class='add'>+    pcard = pci_get_drvdata(pdev);</div><div class='add'>+    if (!pcard)  return -ENXIO;</div><div class='add'>+    </div><div class='add'>+    if (strcmp("ssid", attr-&gt;attr.name) == 0){         return scnprintf(buf, PAGE_SIZE, "%016llx\n", pcard-&gt;ssid);  } else</div><div class='add'>+    if (strcmp("ddna", attr-&gt;attr.name) == 0){         return scnprintf(buf, PAGE_SIZE, "%016llx\n", pcard-&gt;ddna);  } else</div><div class='add'>+    if (strcmp("card_id", attr-&gt;attr.name) == 0){      return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard-&gt;card_id);  } else</div><div class='add'>+    if (strcmp("hw_rev", attr-&gt;attr.name) == 0){       return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard-&gt;hardware_revision);  } else</div><div class='add'>+    if (strcmp("build", attr-&gt;attr.name) == 0){        return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard-&gt;build_version);  } else</div><div class='add'>+    if (strcmp("build_date", attr-&gt;attr.name) == 0){   return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard-&gt;build_datestamp);  } else</div><div class='add'>+    if (strcmp("build_time", attr-&gt;attr.name) == 0){   return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard-&gt;build_timestamp);  } else</div><div class='add'>+    { return -ENXIO; }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t  show_cpld_config_reg(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	struct kp2000_device *pcard;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	pcard = pci_get_drvdata(pdev);</div><div class='add'>+	if (!pcard)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	val = readq(pcard-&gt;sysinfo_regs_base + REG_CPLD_CONFIG);</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%016llx\n", val);</div><div class='add'>+}</div><div class='add'>+static ssize_t cpld_reconfigure(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+    struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+    long wr_val;</div><div class='add'>+    struct kp2000_device *pcard;</div><div class='add'>+    int rv;</div><div class='add'>+</div><div class='add'>+    if (!pdev)  return -ENXIO;</div><div class='add'>+    pcard = pci_get_drvdata(pdev);</div><div class='add'>+    if (!pcard)  return -ENXIO;</div><div class='add'>+    </div><div class='add'>+    rv = kstrtol(buf, 0, &amp;wr_val);</div><div class='add'>+    if (rv &lt; 0)  return rv;</div><div class='add'>+    if (wr_val &gt; 7)  return -EINVAL;</div><div class='add'>+    </div><div class='add'>+    wr_val = wr_val &lt;&lt; 8;</div><div class='add'>+    wr_val |= 0x1; // Set the "Configure Go" bit</div><div class='add'>+    writeq(wr_val, pcard-&gt;sysinfo_regs_base + REG_CPLD_CONFIG);</div><div class='add'>+    return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DEVICE_ATTR(ssid,       0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(ddna,       0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(card_id,    0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(hw_rev,     0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(build,      0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(build_date, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(build_time, 0444, show_attr, NULL);</div><div class='add'>+DEVICE_ATTR(cpld_reg,   0444, show_cpld_config_reg, NULL);</div><div class='add'>+DEVICE_ATTR(cpld_reconfigure,   0220, NULL, cpld_reconfigure);</div><div class='add'>+</div><div class='add'>+static const struct attribute *  kp_attr_list[] = {</div><div class='add'>+    &amp;dev_attr_ssid.attr,</div><div class='add'>+    &amp;dev_attr_ddna.attr,</div><div class='add'>+    &amp;dev_attr_card_id.attr,</div><div class='add'>+    &amp;dev_attr_hw_rev.attr,</div><div class='add'>+    &amp;dev_attr_build.attr,</div><div class='add'>+    &amp;dev_attr_build_date.attr,</div><div class='add'>+    &amp;dev_attr_build_time.attr,</div><div class='add'>+    &amp;dev_attr_cpld_reg.attr,</div><div class='add'>+    &amp;dev_attr_cpld_reconfigure.attr,</div><div class='add'>+    NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*******************************************************</div><div class='add'>+  * Functions</div><div class='add'>+  ******************************************************/</div><div class='add'>+</div><div class='add'>+static void wait_and_read_ssid(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    u64 read_val = readq(pcard-&gt;sysinfo_regs_base + REG_FPGA_SSID);</div><div class='add'>+    unsigned long timeout;</div><div class='add'>+    </div><div class='add'>+    if (read_val &amp; 0x8000000000000000){</div><div class='add'>+        pcard-&gt;ssid = read_val;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    timeout = jiffies + (HZ * 2);</div><div class='add'>+    do {</div><div class='add'>+        read_val = readq(pcard-&gt;sysinfo_regs_base + REG_FPGA_SSID);</div><div class='add'>+        if (read_val &amp; 0x8000000000000000){</div><div class='add'>+            pcard-&gt;ssid = read_val;</div><div class='add'>+            return;</div><div class='add'>+        }</div><div class='add'>+        cpu_relax();</div><div class='add'>+        //schedule();</div><div class='add'>+    } while (time_before(jiffies, timeout));</div><div class='add'>+    </div><div class='add'>+    dev_notice(&amp;pcard-&gt;pdev-&gt;dev, "SSID didn't show up!\n");</div><div class='add'>+    </div><div class='add'>+    #if 0</div><div class='add'>+    // Timed out waiting for the SSID to show up, just use the DDNA instead?</div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_FPGA_DDNA);</div><div class='add'>+    pcard-&gt;ssid = read_val;</div><div class='add'>+    #else</div><div class='add'>+    // Timed out waiting for the SSID to show up, stick all zeros in the value</div><div class='add'>+    pcard-&gt;ssid = 0;</div><div class='add'>+    #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int  read_system_regs(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    u64 read_val;</div><div class='add'>+    </div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_MAGIC_NUMBER);</div><div class='add'>+    if (read_val != KP2000_MAGIC_VALUE){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "Invalid magic!  Got: 0x%016llx  Want: 0x%016lx\n", read_val, KP2000_MAGIC_VALUE);</div><div class='add'>+        return -EILSEQ;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_CARD_ID_AND_BUILD);</div><div class='add'>+    pcard-&gt;card_id = (read_val &amp; 0xFFFFFFFF00000000) &gt;&gt; 32;</div><div class='add'>+    pcard-&gt;build_version = (read_val &amp; 0x00000000FFFFFFFF) &gt;&gt; 0;</div><div class='add'>+    </div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_DATE_AND_TIME_STAMPS);</div><div class='add'>+    pcard-&gt;build_datestamp = (read_val &amp; 0xFFFFFFFF00000000) &gt;&gt; 32;</div><div class='add'>+    pcard-&gt;build_timestamp = (read_val &amp; 0x00000000FFFFFFFF) &gt;&gt; 0;</div><div class='add'>+    </div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_CORE_TABLE_OFFSET);</div><div class='add'>+    pcard-&gt;core_table_length = (read_val &amp; 0xFFFFFFFF00000000) &gt;&gt; 32;</div><div class='add'>+    pcard-&gt;core_table_offset = (read_val &amp; 0x00000000FFFFFFFF) &gt;&gt; 0;</div><div class='add'>+    </div><div class='add'>+    wait_and_read_ssid(pcard);</div><div class='add'>+    </div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_FPGA_HW_ID);</div><div class='add'>+    pcard-&gt;core_table_rev    = (read_val &amp; 0x0000000000000F00) &gt;&gt; 8;</div><div class='add'>+    pcard-&gt;hardware_revision = (read_val &amp; 0x000000000000001F);</div><div class='add'>+    </div><div class='add'>+    read_val = readq(pcard-&gt;sysinfo_regs_base + REG_FPGA_DDNA);</div><div class='add'>+    pcard-&gt;ddna = read_val;</div><div class='add'>+    </div><div class='add'>+    dev_info(&amp;pcard-&gt;pdev-&gt;dev, "system_regs: %08x %08x %08x %08x  %02x  %d %d  %016llx  %016llx\n",</div><div class='add'>+        pcard-&gt;card_id,</div><div class='add'>+        pcard-&gt;build_version,</div><div class='add'>+        pcard-&gt;build_datestamp,</div><div class='add'>+        pcard-&gt;build_timestamp,</div><div class='add'>+        pcard-&gt;hardware_revision,</div><div class='add'>+        pcard-&gt;core_table_rev,</div><div class='add'>+        pcard-&gt;core_table_length,</div><div class='add'>+        pcard-&gt;ssid,</div><div class='add'>+        pcard-&gt;ddna</div><div class='add'>+    );</div><div class='add'>+    </div><div class='add'>+    if (pcard-&gt;core_table_rev &gt; 1){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "core table entry revision is higher than we can deal with, cannot continue with this card!\n");</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'>+irqreturn_t  kp2000_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+    struct kp2000_device  *pcard = (struct kp2000_device*)dev_id;</div><div class='add'>+    SetBackEndControl(pcard-&gt;dma_common_regs, KPC_DMA_CARD_IRQ_ENABLE | KPC_DMA_CARD_USER_INTERRUPT_MODE | KPC_DMA_CARD_USER_INTERRUPT_ACTIVE);</div><div class='add'>+    return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int  kp2000_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+    int err = 0;</div><div class='add'>+    struct kp2000_device *pcard;</div><div class='add'>+    static int card_count = 1;</div><div class='add'>+    int rv;</div><div class='add'>+    unsigned long reg_bar_phys_addr;</div><div class='add'>+    unsigned long reg_bar_phys_len;</div><div class='add'>+    unsigned long dma_bar_phys_addr;</div><div class='add'>+    unsigned long dma_bar_phys_len;</div><div class='add'>+    u16 regval;</div><div class='add'>+ </div><div class='add'>+    dev_dbg(&amp;pdev-&gt;dev, "kp2000_pcie_probe(pdev = [%p], id = [%p])\n", pdev, id);</div><div class='add'>+    </div><div class='add'>+    //{ Step 1: Allocate a struct for the pcard</div><div class='add'>+    pcard = kzalloc(sizeof(struct kp2000_device), GFP_KERNEL);</div><div class='add'>+    if (NULL == pcard){</div><div class='add'>+        dev_err(&amp;pdev-&gt;dev, "probe: failed to allocate private card data\n");</div><div class='add'>+        return -ENOMEM;</div><div class='add'>+    }</div><div class='add'>+    dev_dbg(&amp;pdev-&gt;dev, "probe: allocated struct kp2000_device @ %p\n", pcard);</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 2: Initialize trivial pcard elements</div><div class='add'>+    pcard-&gt;card_num = card_count;</div><div class='add'>+    card_count++;</div><div class='add'>+    scnprintf(pcard-&gt;name, 16, "kpcard%d", pcard-&gt;card_num);</div><div class='add'>+    </div><div class='add'>+    mutex_init(&amp;pcard-&gt;sem);</div><div class='add'>+    lock_card(pcard);</div><div class='add'>+    </div><div class='add'>+    pcard-&gt;pdev = pdev;</div><div class='add'>+    pci_set_drvdata(pdev, pcard);</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 3: Enable PCI device</div><div class='add'>+    err = pci_enable_device(pcard-&gt;pdev);</div><div class='add'>+    if (err){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe: failed to enable PCIE2000 PCIe device (%d)\n", err);</div><div class='add'>+        goto out3;</div><div class='add'>+    }</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 4: Setup the Register BAR</div><div class='add'>+    reg_bar_phys_addr = pci_resource_start(pcard-&gt;pdev, REG_BAR);</div><div class='add'>+    reg_bar_phys_len = pci_resource_len(pcard-&gt;pdev, REG_BAR);</div><div class='add'>+    </div><div class='add'>+    pcard-&gt;regs_bar_base = ioremap_nocache(reg_bar_phys_addr, PAGE_SIZE);</div><div class='add'>+    if (NULL == pcard-&gt;regs_bar_base){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe: REG_BAR could not remap memory to virtual space\n");</div><div class='add'>+        err = -ENODEV;</div><div class='add'>+        goto out4;</div><div class='add'>+    }</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "probe: REG_BAR virt hardware address start [%p]\n", pcard-&gt;regs_bar_base);</div><div class='add'>+    </div><div class='add'>+    err = pci_request_region(pcard-&gt;pdev, REG_BAR, KP_DRIVER_NAME_KP2000);</div><div class='add'>+    if (err){</div><div class='add'>+        iounmap(pcard-&gt;regs_bar_base);</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe: failed to acquire PCI region (%d)\n", err);</div><div class='add'>+        err = -ENODEV;</div><div class='add'>+        goto out4;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    pcard-&gt;regs_base_resource.start = reg_bar_phys_addr;</div><div class='add'>+    pcard-&gt;regs_base_resource.end   = reg_bar_phys_addr + reg_bar_phys_len - 1;</div><div class='add'>+    pcard-&gt;regs_base_resource.flags = IORESOURCE_MEM;</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 5: Setup the DMA BAR</div><div class='add'>+    dma_bar_phys_addr = pci_resource_start(pcard-&gt;pdev, DMA_BAR);</div><div class='add'>+    dma_bar_phys_len = pci_resource_len(pcard-&gt;pdev, DMA_BAR);</div><div class='add'>+    </div><div class='add'>+    pcard-&gt;dma_bar_base = ioremap_nocache(dma_bar_phys_addr, dma_bar_phys_len);</div><div class='add'>+    if (NULL == pcard-&gt;dma_bar_base){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe: DMA_BAR could not remap memory to virtual space\n");</div><div class='add'>+        err = -ENODEV;</div><div class='add'>+        goto out5;</div><div class='add'>+    }</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "probe: DMA_BAR virt hardware address start [%p]\n", pcard-&gt;dma_bar_base);</div><div class='add'>+    </div><div class='add'>+    pcard-&gt;dma_common_regs = pcard-&gt;dma_bar_base + KPC_DMA_COMMON_OFFSET;</div><div class='add'>+    </div><div class='add'>+    err = pci_request_region(pcard-&gt;pdev, DMA_BAR, "kp2000_pcie");</div><div class='add'>+    if (err){</div><div class='add'>+        iounmap(pcard-&gt;dma_bar_base);</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "probe: failed to acquire PCI region (%d)\n", err);</div><div class='add'>+        err = -ENODEV;</div><div class='add'>+        goto out5;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    pcard-&gt;dma_base_resource.start = dma_bar_phys_addr;</div><div class='add'>+    pcard-&gt;dma_base_resource.end   = dma_bar_phys_addr + dma_bar_phys_len - 1;</div><div class='add'>+    pcard-&gt;dma_base_resource.flags = IORESOURCE_MEM;</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 6: System Regs</div><div class='add'>+    pcard-&gt;sysinfo_regs_base = pcard-&gt;regs_bar_base;</div><div class='add'>+    err = read_system_regs(pcard);</div><div class='add'>+    if (err)</div><div class='add'>+        goto out6;</div><div class='add'>+    </div><div class='add'>+    // Disable all "user" interrupts because they're not used yet.</div><div class='add'>+    writeq(0xFFFFFFFFFFFFFFFF, pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_MASK);</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 7: Configure PCI thingies</div><div class='add'>+    // let the card master PCIe</div><div class='add'>+    pci_set_master(pcard-&gt;pdev);</div><div class='add'>+    // enable IO and mem if not already done</div><div class='add'>+    pci_read_config_word(pcard-&gt;pdev, PCI_COMMAND, &amp;regval);</div><div class='add'>+    regval |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY);</div><div class='add'>+    pci_write_config_word(pcard-&gt;pdev, PCI_COMMAND, regval);</div><div class='add'>+    </div><div class='add'>+    // Clear relaxed ordering bit</div><div class='add'>+    pcie_capability_clear_and_set_word(pcard-&gt;pdev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN, 0);</div><div class='add'>+    </div><div class='add'>+    // Set Max_Payload_Size and Max_Read_Request_Size</div><div class='add'>+    regval = (0x0) &lt;&lt; 5; // Max_Payload_Size = 128 B</div><div class='add'>+    pcie_capability_clear_and_set_word(pcard-&gt;pdev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_PAYLOAD, regval);</div><div class='add'>+    regval = (0x0) &lt;&lt; 12; // Max_Read_Request_Size = 128 B</div><div class='add'>+    pcie_capability_clear_and_set_word(pcard-&gt;pdev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_READRQ, regval);</div><div class='add'>+    </div><div class='add'>+    // Enable error reporting for: Correctable Errors, Non-Fatal Errors, Fatal Errors, Unsupported Requests</div><div class='add'>+    pcie_capability_clear_and_set_word(pcard-&gt;pdev, PCI_EXP_DEVCTL, 0, PCI_EXP_DEVCTL_CERE | PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE);</div><div class='add'>+    </div><div class='add'>+    err = dma_set_mask(PCARD_TO_DEV(pcard), DMA_BIT_MASK(64));</div><div class='add'>+    if (err){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "CANNOT use DMA mask %0llx\n", DMA_BIT_MASK(64));</div><div class='add'>+        goto out7;</div><div class='add'>+    }</div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "Using DMA mask %0llx\n", dma_get_mask(PCARD_TO_DEV(pcard)));</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 8: Configure IRQs</div><div class='add'>+    err = pci_enable_msi(pcard-&gt;pdev);</div><div class='add'>+    if (err &lt; 0)</div><div class='add'>+        goto out8a;</div><div class='add'>+    </div><div class='add'>+    rv = request_irq(pcard-&gt;pdev-&gt;irq, kp2000_irq_handler, IRQF_SHARED, pcard-&gt;name, pcard);</div><div class='add'>+    if (rv){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_pcie_probe: failed to request_irq: %d\n", rv);</div><div class='add'>+        goto out8b;</div><div class='add'>+    }</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 9: Setup sysfs attributes</div><div class='add'>+    err = sysfs_create_files(&amp;(pdev-&gt;dev.kobj), kp_attr_list);</div><div class='add'>+    if (err){</div><div class='add'>+        dev_err(&amp;pdev-&gt;dev, "Failed to add sysfs files: %d\n", err);</div><div class='add'>+        goto out9;</div><div class='add'>+    }</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 10: Setup misc device</div><div class='add'>+    pcard-&gt;miscdev.minor = MISC_DYNAMIC_MINOR;</div><div class='add'>+    pcard-&gt;miscdev.fops = &amp;kp2000_fops;</div><div class='add'>+    pcard-&gt;miscdev.parent = &amp;pcard-&gt;pdev-&gt;dev;</div><div class='add'>+    pcard-&gt;miscdev.name = pcard-&gt;name;</div><div class='add'>+    </div><div class='add'>+    err = misc_register(&amp;pcard-&gt;miscdev);</div><div class='add'>+    if (err){</div><div class='add'>+        dev_err(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_pcie_probe: misc_register failed: %d\n", err);</div><div class='add'>+        goto out10;</div><div class='add'>+    }</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 11: Probe cores</div><div class='add'>+    err = kp2000_probe_cores(pcard);</div><div class='add'>+    if (err)</div><div class='add'>+        goto out11;</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    //{ Step 12: Enable IRQs in HW</div><div class='add'>+    SetBackEndControl(pcard-&gt;dma_common_regs, KPC_DMA_CARD_IRQ_ENABLE | KPC_DMA_CARD_USER_INTERRUPT_MODE);</div><div class='add'>+    //}</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_pcie_probe() complete!\n");</div><div class='add'>+    unlock_card(pcard);</div><div class='add'>+    return 0;</div><div class='add'>+</div><div class='add'>+  out11:</div><div class='add'>+    misc_deregister(&amp;pcard-&gt;miscdev);</div><div class='add'>+  out10:</div><div class='add'>+    sysfs_remove_files(&amp;(pdev-&gt;dev.kobj), kp_attr_list);</div><div class='add'>+  out9:</div><div class='add'>+    free_irq(pcard-&gt;pdev-&gt;irq, pcard);</div><div class='add'>+  out8b:</div><div class='add'>+    pci_disable_msi(pcard-&gt;pdev);</div><div class='add'>+  out8a:</div><div class='add'>+  out7:</div><div class='add'>+  out6:</div><div class='add'>+    iounmap(pcard-&gt;dma_bar_base);</div><div class='add'>+    pci_release_region(pdev, DMA_BAR);</div><div class='add'>+    pcard-&gt;dma_bar_base = NULL;</div><div class='add'>+  out5:</div><div class='add'>+    iounmap(pcard-&gt;regs_bar_base);</div><div class='add'>+    pci_release_region(pdev, REG_BAR);</div><div class='add'>+    pcard-&gt;regs_bar_base = NULL;</div><div class='add'>+  out4:</div><div class='add'>+    pci_disable_device(pcard-&gt;pdev);</div><div class='add'>+  out3:</div><div class='add'>+    unlock_card(pcard);</div><div class='add'>+    kfree(pcard);</div><div class='add'>+    return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void  kp2000_pcie_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+    struct kp2000_device *pcard = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+    dev_dbg(&amp;pdev-&gt;dev, "kp2000_pcie_remove(pdev=%p)\n", pdev);</div><div class='add'>+    </div><div class='add'>+    if (pcard == NULL)  return;</div><div class='add'>+    </div><div class='add'>+    lock_card(pcard);</div><div class='add'>+    kp2000_remove_cores(pcard);</div><div class='add'>+    mfd_remove_devices(PCARD_TO_DEV(pcard));</div><div class='add'>+    misc_deregister(&amp;pcard-&gt;miscdev);</div><div class='add'>+    sysfs_remove_files(&amp;(pdev-&gt;dev.kobj), kp_attr_list);</div><div class='add'>+    free_irq(pcard-&gt;pdev-&gt;irq, pcard);</div><div class='add'>+    pci_disable_msi(pcard-&gt;pdev);</div><div class='add'>+    if (pcard-&gt;dma_bar_base != NULL){</div><div class='add'>+        iounmap(pcard-&gt;dma_bar_base);</div><div class='add'>+        pci_release_region(pdev, DMA_BAR);</div><div class='add'>+        pcard-&gt;dma_bar_base = NULL;</div><div class='add'>+    }</div><div class='add'>+    if (pcard-&gt;regs_bar_base != NULL){</div><div class='add'>+        iounmap(pcard-&gt;regs_bar_base);</div><div class='add'>+        pci_release_region(pdev, REG_BAR);</div><div class='add'>+        pcard-&gt;regs_bar_base = NULL;</div><div class='add'>+    }</div><div class='add'>+    pci_disable_device(pcard-&gt;pdev);</div><div class='add'>+    pci_set_drvdata(pdev, NULL);</div><div class='add'>+    unlock_card(pcard);</div><div class='add'>+    kfree(pcard);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/dma_common_defs.h b/drivers/staging/kpc2000/kpc2000/dma_common_defs.h<br/>new file mode 100644<br/>index 000000000000..f35e636b1fb7<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/dma_common_defs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/dma_common_defs.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef KPC_DMA_COMMON_DEFS_H_</div><div class='add'>+#define KPC_DMA_COMMON_DEFS_H_</div><div class='add'>+</div><div class='add'>+#define KPC_DMA_COMMON_OFFSET       0x4000</div><div class='add'>+#define KPC_DMA_S2C_BASE_OFFSET     0x0000</div><div class='add'>+#define KPC_DMA_C2S_BASE_OFFSET     0x2000</div><div class='add'>+#define KPC_DMA_ENGINE_SIZE         0x0100</div><div class='add'>+#define  ENGINE_CAP_PRESENT_MASK            0x1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define KPC_DMA_CARD_IRQ_ENABLE                 (1 &lt;&lt; 0)</div><div class='add'>+#define KPC_DMA_CARD_IRQ_ACTIVE                 (1 &lt;&lt; 1)</div><div class='add'>+#define KPC_DMA_CARD_IRQ_PENDING                (1 &lt;&lt; 2)</div><div class='add'>+#define KPC_DMA_CARD_IRQ_MSI                    (1 &lt;&lt; 3)</div><div class='add'>+#define KPC_DMA_CARD_USER_INTERRUPT_MODE        (1 &lt;&lt; 4)</div><div class='add'>+#define KPC_DMA_CARD_USER_INTERRUPT_ACTIVE      (1 &lt;&lt; 5)</div><div class='add'>+#define KPC_DMA_CARD_IRQ_MSIX_MODE              (1 &lt;&lt; 6)</div><div class='add'>+#define KPC_DMA_CARD_MAX_PAYLOAD_SIZE_MASK      0x0700</div><div class='add'>+#define KPC_DMA_CARD_MAX_READ_REQUEST_SIZE_MASK 0x7000</div><div class='add'>+#define KPC_DMA_CARD_S2C_INTERRUPT_STATUS_MASK  0x00FF0000</div><div class='add'>+#define KPC_DMA_CARD_C2S_INTERRUPT_STATUS_MASK  0xFF000000</div><div class='add'>+</div><div class='add'>+static inline  void  SetBackEndControl(void __iomem *regs, u32 value)</div><div class='add'>+{</div><div class='add'>+    writel(value, regs + 0);</div><div class='add'>+}</div><div class='add'>+static inline  u32  GetBackEndStatus(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+    return readl(regs + 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline  u32  BackEndControlSetClear(void __iomem *regs, u32 set_bits, u32 clear_bits)</div><div class='add'>+{</div><div class='add'>+    u32 start_val = GetBackEndStatus(regs);</div><div class='add'>+    u32 new_val = start_val;</div><div class='add'>+    new_val &amp;= ~clear_bits;</div><div class='add'>+    new_val |= set_bits;</div><div class='add'>+    SetBackEndControl(regs, new_val);</div><div class='add'>+    return start_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* KPC_DMA_COMMON_DEFS_H_ */</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/fileops.c b/drivers/staging/kpc2000/kpc2000/fileops.c<br/>new file mode 100644<br/>index 000000000000..b3b0b763fa1e<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/fileops.c</a></div><div class='hunk'>@@ -0,0 +1,131 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;   /* printk() */</div><div class='add'>+#include &lt;linux/slab.h&gt;     /* kmalloc() */</div><div class='add'>+#include &lt;linux/fs.h&gt;       /* everything... */</div><div class='add'>+#include &lt;linux/errno.h&gt;    /* error codes */</div><div class='add'>+#include &lt;linux/types.h&gt;    /* size_t */</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;    /* copy_*_user */</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include "pcie.h"</div><div class='add'>+#include "uapi.h"</div><div class='add'>+</div><div class='add'>+int  kp2000_cdev_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct kp2000_device *pcard = container_of(filp-&gt;private_data, struct kp2000_device, miscdev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_cdev_open(filp = [%p], pcard = [%p])\n", filp, pcard);</div><div class='add'>+</div><div class='add'>+	filp-&gt;private_data = pcard; /* so other methods can access it */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int  kp2000_cdev_close(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct kp2000_device *pcard = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_cdev_close(filp = [%p], pcard = [%p])\n", filp, pcard);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ssize_t  kp2000_cdev_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos)</div><div class='add'>+{</div><div class='add'>+	struct kp2000_device *pcard = filp-&gt;private_data;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	int ret;</div><div class='add'>+#define BUFF_CNT  1024</div><div class='add'>+	char buff[BUFF_CNT] = {0}; //NOTE: Increase this so it is at least as large as all the scnprintfs.  And don't use unbounded strings. "%s"</div><div class='add'>+	//NOTE: also, this is a really shitty way to implement the read() call, but it will work for any size 'count'.</div><div class='add'>+</div><div class='add'>+	if (WARN(NULL == buf, "kp2000_cdev_read: buf is a NULL pointer!\n"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Card ID                 : 0x%08x\n", pcard-&gt;card_id);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Version           : 0x%08x\n", pcard-&gt;build_version);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Date              : 0x%08x\n", pcard-&gt;build_datestamp);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Time              : 0x%08x\n", pcard-&gt;build_timestamp);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Core Table Offset       : 0x%08x\n", pcard-&gt;core_table_offset);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Core Table Length       : 0x%08x\n", pcard-&gt;core_table_length);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Hardware Revision       : 0x%08x\n", pcard-&gt;hardware_revision);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "SSID                    : 0x%016llx\n", pcard-&gt;ssid);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "DDNA                    : 0x%016llx\n", pcard-&gt;ddna);</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "IRQ Mask                : 0x%016llx\n", readq(pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_MASK));</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "IRQ Active              : 0x%016llx\n", readq(pcard-&gt;sysinfo_regs_base + REG_INTERRUPT_ACTIVE));</div><div class='add'>+	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "CPLD                    : 0x%016llx\n", readq(pcard-&gt;sysinfo_regs_base + REG_CPLD_CONFIG));</div><div class='add'>+</div><div class='add'>+	if (*f_pos &gt;= cnt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (count &gt; cnt)</div><div class='add'>+		count = cnt;</div><div class='add'>+</div><div class='add'>+	ret = copy_to_user(buf, buff + *f_pos, count);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	*f_pos += count;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t  kp2000_cdev_write(struct file *filp, const char __user *buf, size_t count, loff_t *f_pos)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long  kp2000_cdev_ioctl(struct file *filp, unsigned int ioctl_num, unsigned long ioctl_param)</div><div class='add'>+{</div><div class='add'>+	struct kp2000_device *pcard = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pcard-&gt;pdev-&gt;dev, "kp2000_cdev_ioctl(filp = [%p], ioctl_num = 0x%08x, ioctl_param = 0x%016lx) pcard = [%p]\n", filp, ioctl_num, ioctl_param, pcard);</div><div class='add'>+</div><div class='add'>+	switch (ioctl_num){</div><div class='add'>+	case KP2000_IOCTL_GET_CPLD_REG:             return readq(pcard-&gt;sysinfo_regs_base + REG_CPLD_CONFIG);</div><div class='add'>+	case KP2000_IOCTL_GET_PCIE_ERROR_REG:       return readq(pcard-&gt;sysinfo_regs_base + REG_PCIE_ERROR_COUNT);</div><div class='add'>+    </div><div class='add'>+	case KP2000_IOCTL_GET_EVERYTHING: {</div><div class='add'>+		struct kp2000_regs temp;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		memset(&amp;temp, 0, sizeof(temp));</div><div class='add'>+		temp.card_id = pcard-&gt;card_id;</div><div class='add'>+		temp.build_version = pcard-&gt;build_version;</div><div class='add'>+		temp.build_datestamp = pcard-&gt;build_datestamp;</div><div class='add'>+		temp.build_timestamp = pcard-&gt;build_timestamp;</div><div class='add'>+		temp.hw_rev = pcard-&gt;hardware_revision;</div><div class='add'>+		temp.ssid = pcard-&gt;ssid;</div><div class='add'>+		temp.ddna = pcard-&gt;ddna;</div><div class='add'>+		temp.cpld_reg = readq(pcard-&gt;sysinfo_regs_base + REG_CPLD_CONFIG);</div><div class='add'>+</div><div class='add'>+		ret = copy_to_user((void*)ioctl_param, (void*)&amp;temp, sizeof(temp));</div><div class='add'>+		if (ret)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return sizeof(temp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct file_operations  kp2000_fops = {</div><div class='add'>+	.owner      = THIS_MODULE,</div><div class='add'>+	.open       = kp2000_cdev_open,</div><div class='add'>+	.release    = kp2000_cdev_close,</div><div class='add'>+	.read       = kp2000_cdev_read,</div><div class='add'>+	//.write      = kp2000_cdev_write,</div><div class='add'>+	//.poll       = kp2000_cdev_poll,</div><div class='add'>+	//.fasync     = kp2000_cdev_fasync,</div><div class='add'>+	.llseek     = noop_llseek,</div><div class='add'>+	.unlocked_ioctl = kp2000_cdev_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/kp2000_module.c b/drivers/staging/kpc2000/kpc2000/kp2000_module.c<br/>new file mode 100644<br/>index 000000000000..fa3bd266ba54<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/kp2000_module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/kp2000_module.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</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/types.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include "pcie.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Lee.Brooke@Daktronics.com, Matt.Sickler@Daktronics.com");</div><div class='add'>+MODULE_SOFTDEP("pre: uio post: kpc_nwl_dma kpc_i2c kpc_spi");</div><div class='add'>+</div><div class='add'>+struct class *kpc_uio_class;</div><div class='add'>+ATTRIBUTE_GROUPS(kpc_uio_class);</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id kp2000_pci_device_ids[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_DAKTRONICS, PCI_DEVICE_ID_DAKTRONICS) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_DAKTRONICS, PCI_DEVICE_ID_DAKTRONICS_KADOKA_P2KR0) },</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, kp2000_pci_device_ids);</div><div class='add'>+</div><div class='add'>+static struct pci_driver  kp2000_driver_inst = {</div><div class='add'>+	.name       = "kp2000_pcie",</div><div class='add'>+	.id_table   = kp2000_pci_device_ids,</div><div class='add'>+	.probe      = kp2000_pcie_probe,</div><div class='add'>+	.remove     = kp2000_pcie_remove</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init  kp2000_pcie_init(void)</div><div class='add'>+{</div><div class='add'>+	kpc_uio_class = class_create(THIS_MODULE, "kpc_uio");</div><div class='add'>+	if (IS_ERR(kpc_uio_class))</div><div class='add'>+		return PTR_ERR(kpc_uio_class);</div><div class='add'>+</div><div class='add'>+	kpc_uio_class-&gt;dev_groups = kpc_uio_class_groups;</div><div class='add'>+	return pci_register_driver(&amp;kp2000_driver_inst);</div><div class='add'>+}</div><div class='add'>+module_init(kp2000_pcie_init);</div><div class='add'>+</div><div class='add'>+static void __exit  kp2000_pcie_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;kp2000_driver_inst);</div><div class='add'>+	class_destroy(kpc_uio_class);</div><div class='add'>+}</div><div class='add'>+module_exit(kp2000_pcie_exit);</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/pcie.h b/drivers/staging/kpc2000/kpc2000/pcie.h<br/>new file mode 100644<br/>index 000000000000..893aebfd1449<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/pcie.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/pcie.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef KP2000_PCIE_H</div><div class='add'>+#define KP2000_PCIE_H</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "../kpc.h"</div><div class='add'>+#include "dma_common_defs.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*      System Register Map (BAR 1, Start Addr 0)</div><div class='add'>+ *</div><div class='add'>+ *  BAR Size:</div><div class='add'>+ *  1048576 (0x100000) bytes = 131072 (0x20000) registers = 256 pages (4K)</div><div class='add'>+ *</div><div class='add'>+ *             6         5         4         3         2         1         0</div><div class='add'>+ *          3210987654321098765432109876543210987654321098765432109876543210</div><div class='add'>+ *      0   &lt;--------------------------- MAGIC ----------------------------&gt;</div><div class='add'>+ *      1   &lt;----------- Card ID ---------&gt;&lt;----------- Revision ----------&gt;</div><div class='add'>+ *      2   &lt;--------- Date Stamp --------&gt;&lt;--------- Time Stamp ----------&gt;</div><div class='add'>+ *      3   &lt;-------- Core Tbl Len -------&gt;&lt;-------- Core Tbl Offset ------&gt;</div><div class='add'>+ *      4   &lt;---------------------------- SSID ----------------------------&gt;</div><div class='add'>+ *      5                                                           &lt; HWID &gt;</div><div class='add'>+ *      6   &lt;------------------------- FPGA DDNA --------------------------&gt;</div><div class='add'>+ *      7   &lt;------------------------ CPLD Config -------------------------&gt;</div><div class='add'>+ *      8   &lt;----------------------- IRQ Mask Flags -----------------------&gt;</div><div class='add'>+ *      9   &lt;---------------------- IRQ Active Flags ----------------------&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define REG_WIDTH   8</div><div class='add'>+#define REG_MAGIC_NUMBER            (0 * REG_WIDTH)</div><div class='add'>+#define REG_CARD_ID_AND_BUILD       (1 * REG_WIDTH)</div><div class='add'>+#define REG_DATE_AND_TIME_STAMPS    (2 * REG_WIDTH)</div><div class='add'>+#define REG_CORE_TABLE_OFFSET       (3 * REG_WIDTH)</div><div class='add'>+#define REG_FPGA_SSID               (4 * REG_WIDTH)</div><div class='add'>+#define REG_FPGA_HW_ID              (5 * REG_WIDTH)</div><div class='add'>+#define REG_FPGA_DDNA               (6 * REG_WIDTH)</div><div class='add'>+#define REG_CPLD_CONFIG             (7 * REG_WIDTH)</div><div class='add'>+#define REG_INTERRUPT_MASK          (8 * REG_WIDTH)</div><div class='add'>+#define REG_INTERRUPT_ACTIVE        (9 * REG_WIDTH)</div><div class='add'>+#define REG_PCIE_ERROR_COUNT        (10 * REG_WIDTH)</div><div class='add'>+</div><div class='add'>+#define KP2000_MAGIC_VALUE      0x196C61482231894D</div><div class='add'>+</div><div class='add'>+#define PCI_VENDOR_ID_DAKTRONICS    0x1c33</div><div class='add'>+#define PCI_DEVICE_ID_DAKTRONICS    0x6021</div><div class='add'>+</div><div class='add'>+#define DMA_BAR     0</div><div class='add'>+#define REG_BAR     1</div><div class='add'>+</div><div class='add'>+struct kp2000_device {</div><div class='add'>+    struct pci_dev     *pdev;</div><div class='add'>+    struct miscdevice   miscdev;</div><div class='add'>+    char                name[16];</div><div class='add'>+    </div><div class='add'>+    unsigned int        card_num;</div><div class='add'>+    struct mutex        sem;</div><div class='add'>+    </div><div class='add'>+    void __iomem       *sysinfo_regs_base;</div><div class='add'>+    void __iomem       *regs_bar_base;</div><div class='add'>+    struct resource     regs_base_resource;</div><div class='add'>+    void __iomem       *dma_bar_base;</div><div class='add'>+    void __iomem       *dma_common_regs;</div><div class='add'>+    struct resource     dma_base_resource;</div><div class='add'>+    </div><div class='add'>+    // "System Registers"</div><div class='add'>+    u32                 card_id;</div><div class='add'>+    u32                 build_version;</div><div class='add'>+    u32                 build_datestamp;</div><div class='add'>+    u32                 build_timestamp;</div><div class='add'>+    u32                 core_table_offset;</div><div class='add'>+    u32                 core_table_length;</div><div class='add'>+    u8                  core_table_rev;</div><div class='add'>+    u8                  hardware_revision;</div><div class='add'>+    u64                 ssid;</div><div class='add'>+    u64                 ddna;</div><div class='add'>+    </div><div class='add'>+    // IRQ stuff</div><div class='add'>+    unsigned int        irq;</div><div class='add'>+    </div><div class='add'>+    struct list_head    uio_devices_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct class *kpc_uio_class;</div><div class='add'>+extern struct attribute *kpc_uio_class_attrs[];</div><div class='add'>+</div><div class='add'>+int   kp2000_pcie_probe(struct pci_dev *dev, const struct pci_device_id *id);</div><div class='add'>+void  kp2000_pcie_remove(struct pci_dev *pdev);</div><div class='add'>+int   kp2000_probe_cores(struct kp2000_device *pcard);</div><div class='add'>+void  kp2000_remove_cores(struct kp2000_device *pcard);</div><div class='add'>+</div><div class='add'>+extern struct file_operations  kp2000_fops;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Define this quick little macro because the expression is used frequently</div><div class='add'>+#define PCARD_TO_DEV(pcard)  (&amp;(pcard-&gt;pdev-&gt;dev))</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+lock_card(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    BUG_ON(pcard == NULL);</div><div class='add'>+    mutex_lock(&amp;pcard-&gt;sem);</div><div class='add'>+}</div><div class='add'>+static inline void</div><div class='add'>+unlock_card(struct kp2000_device *pcard)</div><div class='add'>+{</div><div class='add'>+    BUG_ON(pcard == NULL);</div><div class='add'>+    mutex_unlock(&amp;pcard-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* KP2000_PCIE_H */</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc2000/uapi.h b/drivers/staging/kpc2000/kpc2000/uapi.h<br/>new file mode 100644<br/>index 000000000000..ef8008bcd33d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc2000/uapi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc2000/uapi.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef KP2000_CDEV_UAPI_H_</div><div class='add'>+#define KP2000_CDEV_UAPI_H_</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+struct kp2000_regs {</div><div class='add'>+    __u32 card_id;</div><div class='add'>+    __u32 build_version;</div><div class='add'>+    __u32 build_datestamp;</div><div class='add'>+    __u32 build_timestamp;</div><div class='add'>+    __u32 hw_rev;</div><div class='add'>+    __u64 ssid;</div><div class='add'>+    __u64 ddna;</div><div class='add'>+    __u64 cpld_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define KP2000_IOCTL_GET_CPLD_REG               _IOR('k', 9, __u32)</div><div class='add'>+#define KP2000_IOCTL_GET_PCIE_ERROR_REG         _IOR('k', 11, __u32)</div><div class='add'>+#define KP2000_IOCTL_GET_EVERYTHING             _IOR('k', 8, struct kp2000_regs*)</div><div class='add'>+</div><div class='add'>+#endif /* KP2000_CDEV_UAPI_H_ */</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_dma/Makefile b/drivers/staging/kpc2000/kpc_dma/Makefile<br/>new file mode 100644<br/>index 000000000000..fe5db532c8c8<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_dma/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_dma/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-m := kpc_dma.o</div><div class='add'>+kpc_dma-objs += dma.o</div><div class='add'>+kpc_dma-objs += fileops.o</div><div class='add'>+kpc_dma-objs += kpc_dma_driver.o</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_dma/dma.c b/drivers/staging/kpc2000/kpc_dma/dma.c<br/>new file mode 100644<br/>index 000000000000..6959bac11388<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_dma/dma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_dma/dma.c</a></div><div class='hunk'>@@ -0,0 +1,264 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</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/types.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include "kpc_dma_driver.h"</div><div class='add'>+</div><div class='add'>+/**********  IRQ Handlers  **********/</div><div class='add'>+static</div><div class='add'>+irqreturn_t  ndd_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_device *ldev = (struct kpc_dma_device*)dev_id;</div><div class='add'>+	</div><div class='add'>+	if ((GetEngineControl(ldev) &amp; ENG_CTL_IRQ_ACTIVE) || (ldev-&gt;desc_completed-&gt;MyDMAAddr != GetEngineCompletePtr(ldev)))</div><div class='add'>+		schedule_work(&amp;ldev-&gt;irq_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</div><div class='add'>+void  ndd_irq_worker(struct work_struct *ws)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_descriptor *cur;</div><div class='add'>+	struct kpc_dma_device *eng = container_of(ws, struct kpc_dma_device, irq_work);</div><div class='add'>+	lock_engine(eng);</div><div class='add'>+	</div><div class='add'>+	if (GetEngineCompletePtr(eng) == 0)</div><div class='add'>+		goto out;</div><div class='add'>+	</div><div class='add'>+	if (eng-&gt;desc_completed-&gt;MyDMAAddr == GetEngineCompletePtr(eng))</div><div class='add'>+		goto out;</div><div class='add'>+	</div><div class='add'>+	cur = eng-&gt;desc_completed;</div><div class='add'>+	do {</div><div class='add'>+		cur = cur-&gt;Next;</div><div class='add'>+		dev_dbg(&amp;eng-&gt;pldev-&gt;dev, "Handling completed descriptor %p (acd = %p)\n", cur, cur-&gt;acd);</div><div class='add'>+		BUG_ON(cur == eng-&gt;desc_next); // Ordering failure.</div><div class='add'>+		</div><div class='add'>+		if (cur-&gt;DescControlFlags &amp; DMA_DESC_CTL_SOP){</div><div class='add'>+			eng-&gt;accumulated_bytes = 0;</div><div class='add'>+			eng-&gt;accumulated_flags = 0;</div><div class='add'>+		}</div><div class='add'>+		</div><div class='add'>+		eng-&gt;accumulated_bytes += cur-&gt;DescByteCount;</div><div class='add'>+		if (cur-&gt;DescStatusFlags &amp; DMA_DESC_STS_ERROR)</div><div class='add'>+			eng-&gt;accumulated_flags |= ACD_FLAG_ENG_ACCUM_ERROR;</div><div class='add'>+		</div><div class='add'>+		if (cur-&gt;DescStatusFlags &amp; DMA_DESC_STS_SHORT)</div><div class='add'>+			eng-&gt;accumulated_flags |= ACD_FLAG_ENG_ACCUM_SHORT;</div><div class='add'>+		</div><div class='add'>+		if (cur-&gt;DescControlFlags &amp; DMA_DESC_CTL_EOP){</div><div class='add'>+			if (cur-&gt;acd)</div><div class='add'>+				transfer_complete_cb(cur-&gt;acd, eng-&gt;accumulated_bytes, eng-&gt;accumulated_flags | ACD_FLAG_DONE);</div><div class='add'>+		}</div><div class='add'>+		</div><div class='add'>+		eng-&gt;desc_completed = cur;</div><div class='add'>+	} while (cur-&gt;MyDMAAddr != GetEngineCompletePtr(eng));</div><div class='add'>+	</div><div class='add'>+ out:</div><div class='add'>+	SetClearEngineControl(eng, ENG_CTL_IRQ_ACTIVE, 0);</div><div class='add'>+	</div><div class='add'>+	unlock_engine(eng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********  DMA Engine Init/Teardown  **********/</div><div class='add'>+void  start_dma_engine(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	eng-&gt;desc_next       = eng-&gt;desc_pool_first;</div><div class='add'>+	eng-&gt;desc_completed  = eng-&gt;desc_pool_last;</div><div class='add'>+	</div><div class='add'>+	// Setup the engine pointer registers</div><div class='add'>+	SetEngineNextPtr(eng, eng-&gt;desc_pool_first);</div><div class='add'>+	SetEngineSWPtr(eng, eng-&gt;desc_pool_first);</div><div class='add'>+	ClearEngineCompletePtr(eng);</div><div class='add'>+	</div><div class='add'>+	WriteEngineControl(eng, ENG_CTL_DMA_ENABLE | ENG_CTL_IRQ_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int  setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt)</div><div class='add'>+{</div><div class='add'>+	u32 caps;</div><div class='add'>+	struct kpc_dma_descriptor * cur;</div><div class='add'>+	struct kpc_dma_descriptor * next;</div><div class='add'>+	dma_addr_t next_handle;</div><div class='add'>+	dma_addr_t head_handle;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int rv;</div><div class='add'>+	dev_dbg(&amp;eng-&gt;pldev-&gt;dev, "Setting up DMA engine [%p]\n", eng);</div><div class='add'>+	</div><div class='add'>+	caps = GetEngineCapabilities(eng);</div><div class='add'>+	</div><div class='add'>+	if (WARN(!(caps &amp; ENG_CAP_PRESENT), "setup_dma_engine() called for DMA Engine at %p which isn't present in hardware!\n", eng))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	</div><div class='add'>+	if (caps &amp; ENG_CAP_DIRECTION){</div><div class='add'>+		eng-&gt;dir = DMA_FROM_DEVICE;</div><div class='add'>+	} else {</div><div class='add'>+		eng-&gt;dir = DMA_TO_DEVICE;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	eng-&gt;desc_pool_cnt = desc_cnt;</div><div class='add'>+	eng-&gt;desc_pool = dma_pool_create("KPC DMA Descriptors", &amp;eng-&gt;pldev-&gt;dev, sizeof(struct kpc_dma_descriptor), DMA_DESC_ALIGNMENT, 4096);</div><div class='add'>+	</div><div class='add'>+	eng-&gt;desc_pool_first = dma_pool_alloc(eng-&gt;desc_pool, GFP_KERNEL | GFP_DMA, &amp;head_handle);</div><div class='add'>+	if (!eng-&gt;desc_pool_first){</div><div class='add'>+		dev_err(&amp;eng-&gt;pldev-&gt;dev, "setup_dma_engine: couldn't allocate desc_pool_first!\n");</div><div class='add'>+		dma_pool_destroy(eng-&gt;desc_pool);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	eng-&gt;desc_pool_first-&gt;MyDMAAddr = head_handle;</div><div class='add'>+	clear_desc(eng-&gt;desc_pool_first);</div><div class='add'>+	</div><div class='add'>+	cur = eng-&gt;desc_pool_first;</div><div class='add'>+	for (i = 1 ; i &lt; eng-&gt;desc_pool_cnt ; i++){</div><div class='add'>+		next = dma_pool_alloc(eng-&gt;desc_pool, GFP_KERNEL | GFP_DMA, &amp;next_handle);</div><div class='add'>+		if (next == NULL)</div><div class='add'>+			goto done_alloc;</div><div class='add'>+		</div><div class='add'>+		clear_desc(next);</div><div class='add'>+		next-&gt;MyDMAAddr = next_handle;</div><div class='add'>+		</div><div class='add'>+		cur-&gt;DescNextDescPtr = next_handle;</div><div class='add'>+		cur-&gt;Next = next;</div><div class='add'>+		cur = next;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+ done_alloc:</div><div class='add'>+	// Link the last descriptor back to the first, so it's a circular linked list</div><div class='add'>+	cur-&gt;Next = eng-&gt;desc_pool_first;</div><div class='add'>+	cur-&gt;DescNextDescPtr = eng-&gt;desc_pool_first-&gt;MyDMAAddr;</div><div class='add'>+	</div><div class='add'>+	eng-&gt;desc_pool_last = cur;</div><div class='add'>+	eng-&gt;desc_completed = eng-&gt;desc_pool_last;</div><div class='add'>+	</div><div class='add'>+	// Setup work queue</div><div class='add'>+	INIT_WORK(&amp;eng-&gt;irq_work, ndd_irq_worker);</div><div class='add'>+	</div><div class='add'>+	// Grab IRQ line</div><div class='add'>+	rv = request_irq(eng-&gt;irq, ndd_irq_handler, IRQF_SHARED, KP_DRIVER_NAME_DMA_CONTROLLER, eng);</div><div class='add'>+	if (rv){</div><div class='add'>+		dev_err(&amp;eng-&gt;pldev-&gt;dev, "setup_dma_engine: failed to request_irq: %d\n", rv);</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Turn on the engine!</div><div class='add'>+	start_dma_engine(eng);</div><div class='add'>+	unlock_engine(eng);</div><div class='add'>+	</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void  stop_dma_engine(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	dev_dbg(&amp;eng-&gt;pldev-&gt;dev, "Destroying DMA engine [%p]\n", eng);</div><div class='add'>+	</div><div class='add'>+	// Disable the descriptor engine</div><div class='add'>+	WriteEngineControl(eng, 0);</div><div class='add'>+	</div><div class='add'>+	// Wait for descriptor engine to finish current operaion</div><div class='add'>+	timeout = jiffies + (HZ / 2);</div><div class='add'>+	while (GetEngineControl(eng) &amp; ENG_CTL_DMA_RUNNING){</div><div class='add'>+		if (time_after(jiffies, timeout)){</div><div class='add'>+			dev_crit(&amp;eng-&gt;pldev-&gt;dev, "DMA_RUNNING still asserted!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Request a reset</div><div class='add'>+	WriteEngineControl(eng, ENG_CTL_DMA_RESET_REQUEST);</div><div class='add'>+	</div><div class='add'>+	// Wait for reset request to be processed</div><div class='add'>+	timeout = jiffies + (HZ / 2);</div><div class='add'>+	while (GetEngineControl(eng) &amp; (ENG_CTL_DMA_RUNNING | ENG_CTL_DMA_RESET_REQUEST)){</div><div class='add'>+		if (time_after(jiffies, timeout)){</div><div class='add'>+			dev_crit(&amp;eng-&gt;pldev-&gt;dev, "ENG_CTL_DMA_RESET_REQUEST still asserted!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Request a reset</div><div class='add'>+	WriteEngineControl(eng, ENG_CTL_DMA_RESET);</div><div class='add'>+	</div><div class='add'>+	// And wait for reset to complete</div><div class='add'>+	timeout = jiffies + (HZ / 2);</div><div class='add'>+	while (GetEngineControl(eng) &amp; ENG_CTL_DMA_RESET){</div><div class='add'>+		if (time_after(jiffies, timeout)){</div><div class='add'>+			dev_crit(&amp;eng-&gt;pldev-&gt;dev, "DMA_RESET still asserted!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Clear any persistent bits just to make sure there is no residue from the reset</div><div class='add'>+	SetClearEngineControl(eng, (ENG_CTL_IRQ_ACTIVE | ENG_CTL_DESC_COMPLETE | ENG_CTL_DESC_ALIGN_ERR | ENG_CTL_DESC_FETCH_ERR | ENG_CTL_SW_ABORT_ERR | ENG_CTL_DESC_CHAIN_END | ENG_CTL_DMA_WAITING_PERSIST), 0);</div><div class='add'>+	</div><div class='add'>+	// Reset performance counters</div><div class='add'>+	</div><div class='add'>+	// Completely disable the engine</div><div class='add'>+	WriteEngineControl(eng, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void  destroy_dma_engine(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_descriptor * cur;</div><div class='add'>+	dma_addr_t cur_handle;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	</div><div class='add'>+	stop_dma_engine(eng);</div><div class='add'>+	</div><div class='add'>+	cur = eng-&gt;desc_pool_first;</div><div class='add'>+	cur_handle = eng-&gt;desc_pool_first-&gt;MyDMAAddr;</div><div class='add'>+	</div><div class='add'>+	for (i = 0 ; i &lt; eng-&gt;desc_pool_cnt ; i++){</div><div class='add'>+		struct kpc_dma_descriptor *next = cur-&gt;Next;</div><div class='add'>+		dma_addr_t next_handle = cur-&gt;DescNextDescPtr;</div><div class='add'>+		dma_pool_free(eng-&gt;desc_pool, cur, cur_handle);</div><div class='add'>+		cur_handle = next_handle;</div><div class='add'>+		cur = next;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	dma_pool_destroy(eng-&gt;desc_pool);</div><div class='add'>+	</div><div class='add'>+	free_irq(eng-&gt;irq, eng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********  Helper Functions  **********/</div><div class='add'>+int  count_descriptors_available(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	u32 count = 0;</div><div class='add'>+	struct kpc_dma_descriptor *cur = eng-&gt;desc_next;</div><div class='add'>+	while (cur != eng-&gt;desc_completed){</div><div class='add'>+		BUG_ON(cur == NULL);</div><div class='add'>+		count++;</div><div class='add'>+		cur = cur-&gt;Next;</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void  clear_desc(struct kpc_dma_descriptor *desc)</div><div class='add'>+{</div><div class='add'>+	if (desc == NULL)</div><div class='add'>+		return;</div><div class='add'>+	desc-&gt;DescByteCount         = 0;</div><div class='add'>+	desc-&gt;DescStatusErrorFlags  = 0;</div><div class='add'>+	desc-&gt;DescStatusFlags       = 0;</div><div class='add'>+	desc-&gt;DescUserControlLS     = 0;</div><div class='add'>+	desc-&gt;DescUserControlMS     = 0;</div><div class='add'>+	desc-&gt;DescCardAddrLS        = 0;</div><div class='add'>+	desc-&gt;DescBufferByteCount   = 0;</div><div class='add'>+	desc-&gt;DescCardAddrMS        = 0;</div><div class='add'>+	desc-&gt;DescControlFlags      = 0;</div><div class='add'>+	desc-&gt;DescSystemAddrLS      = 0;</div><div class='add'>+	desc-&gt;DescSystemAddrMS      = 0;</div><div class='add'>+	desc-&gt;acd = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c<br/>new file mode 100644<br/>index 000000000000..5741d2b49a7d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_dma/fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_dma/fileops.c</a></div><div class='hunk'>@@ -0,0 +1,420 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;   /* printk() */</div><div class='add'>+#include &lt;linux/slab.h&gt;     /* kmalloc() */</div><div class='add'>+#include &lt;linux/fs.h&gt;       /* everything... */</div><div class='add'>+#include &lt;linux/errno.h&gt;    /* error codes */</div><div class='add'>+#include &lt;linux/types.h&gt;    /* size_t */</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;    /* copy_*_user */</div><div class='add'>+#include &lt;linux/aio.h&gt;      /* aio stuff */</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include "kpc_dma_driver.h"</div><div class='add'>+#include "uapi.h"</div><div class='add'>+</div><div class='add'>+/**********  Helper Functions  **********/</div><div class='add'>+static inline</div><div class='add'>+unsigned int  count_pages(unsigned long iov_base, size_t iov_len)</div><div class='add'>+{</div><div class='add'>+	unsigned long first = (iov_base             &amp; PAGE_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	unsigned long last  = ((iov_base+iov_len-1) &amp; PAGE_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	return last - first + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+unsigned int  count_parts_for_sge(struct scatterlist *sg)</div><div class='add'>+{</div><div class='add'>+	unsigned int sg_length = sg_dma_len(sg);</div><div class='add'>+	sg_length += (0x80000-1);</div><div class='add'>+	return (sg_length / 0x80000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**********  Transfer Helpers  **********/</div><div class='add'>+static</div><div class='add'>+int  kpc_dma_transfer(struct dev_private_data *priv, struct kiocb *kcb, unsigned long iov_base, size_t iov_len)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+	long rv = 0;</div><div class='add'>+	struct kpc_dma_device *ldev;</div><div class='add'>+	struct aio_cb_data *acd;</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(done);</div><div class='add'>+	u32 desc_needed = 0;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	u32 num_descrs_avail;</div><div class='add'>+	struct kpc_dma_descriptor *desc;</div><div class='add'>+	unsigned int pcnt;</div><div class='add'>+	unsigned int p;</div><div class='add'>+	u64 card_addr;</div><div class='add'>+	u64 dma_addr;</div><div class='add'>+	u64 user_ctl;</div><div class='add'>+	</div><div class='add'>+	BUG_ON(priv == NULL);</div><div class='add'>+	ldev = priv-&gt;ldev;</div><div class='add'>+	BUG_ON(ldev == NULL);</div><div class='add'>+	</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_transfer(priv = [%p], kcb = [%p], iov_base = [%p], iov_len = %ld) ldev = [%p]\n", priv, kcb, (void*)iov_base, iov_len, ldev);</div><div class='add'>+	</div><div class='add'>+	acd = (struct aio_cb_data *) kzalloc(sizeof(struct aio_cb_data), GFP_KERNEL);</div><div class='add'>+	if (!acd){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "Couldn't kmalloc space for for the aio data\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memset(acd, 0x66, sizeof(struct aio_cb_data));</div><div class='add'>+	</div><div class='add'>+	acd-&gt;priv = priv;</div><div class='add'>+	acd-&gt;ldev = priv-&gt;ldev;</div><div class='add'>+	acd-&gt;cpl = &amp;done;</div><div class='add'>+	acd-&gt;flags = 0;</div><div class='add'>+	acd-&gt;kcb = kcb;</div><div class='add'>+	acd-&gt;len = iov_len;</div><div class='add'>+	acd-&gt;page_count = count_pages(iov_base, iov_len);</div><div class='add'>+	</div><div class='add'>+	// Allocate an array of page pointers</div><div class='add'>+	acd-&gt;user_pages = kzalloc(sizeof(struct page *) * acd-&gt;page_count, GFP_KERNEL);</div><div class='add'>+	if (!acd-&gt;user_pages){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "Couldn't kmalloc space for for the page pointers\n");</div><div class='add'>+		rv = -ENOMEM;</div><div class='add'>+		goto err_alloc_userpages;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Lock the user buffer pages in memory, and hold on to the page pointers (for the sglist)</div><div class='add'>+	down_read(&amp;current-&gt;mm-&gt;mmap_sem);      /*  get memory map semaphore */</div><div class='add'>+	rv = get_user_pages(iov_base, acd-&gt;page_count, FOLL_TOUCH | FOLL_WRITE | FOLL_GET, acd-&gt;user_pages, NULL);</div><div class='add'>+	up_read(&amp;current-&gt;mm-&gt;mmap_sem);        /*  release the semaphore */</div><div class='add'>+	if (rv != acd-&gt;page_count){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "Couldn't get_user_pages (%ld)\n", rv);</div><div class='add'>+		goto err_get_user_pages;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Allocate and setup the sg_table (scatterlist entries)</div><div class='add'>+	rv = sg_alloc_table_from_pages(&amp;acd-&gt;sgt, acd-&gt;user_pages, acd-&gt;page_count, iov_base &amp; (PAGE_SIZE-1), iov_len, GFP_KERNEL);</div><div class='add'>+	if (rv){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "Couldn't alloc sg_table (%ld)\n", rv);</div><div class='add'>+		goto err_alloc_sg_table;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Setup the DMA mapping for all the sg entries</div><div class='add'>+	acd-&gt;mapped_entry_count = dma_map_sg(&amp;ldev-&gt;pldev-&gt;dev, acd-&gt;sgt.sgl, acd-&gt;sgt.nents, ldev-&gt;dir);</div><div class='add'>+	if (acd-&gt;mapped_entry_count &lt;= 0){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "Couldn't dma_map_sg (%d)\n", acd-&gt;mapped_entry_count);</div><div class='add'>+		goto err_dma_map_sg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Calculate how many descriptors are actually needed for this transfer.</div><div class='add'>+	for_each_sg(acd-&gt;sgt.sgl, sg, acd-&gt;mapped_entry_count, i){</div><div class='add'>+		desc_needed += count_parts_for_sge(sg);</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	lock_engine(ldev);</div><div class='add'>+	</div><div class='add'>+	// Figoure out how many descriptors are available and return an error if there aren't enough</div><div class='add'>+	num_descrs_avail = count_descriptors_available(ldev);</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d\n", acd-&gt;mapped_entry_count, desc_needed, num_descrs_avail);</div><div class='add'>+	if (desc_needed &gt;= ldev-&gt;desc_pool_cnt){</div><div class='add'>+		dev_warn(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d    TOO MANY to ever complete!\n", acd-&gt;mapped_entry_count, desc_needed, num_descrs_avail);</div><div class='add'>+		rv = -EAGAIN;</div><div class='add'>+		unlock_engine(ldev);</div><div class='add'>+		goto err_descr_too_many;</div><div class='add'>+	}</div><div class='add'>+	if (desc_needed &gt; num_descrs_avail){</div><div class='add'>+		dev_warn(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d    Too many to complete right now.\n", acd-&gt;mapped_entry_count, desc_needed, num_descrs_avail);</div><div class='add'>+		rv = -EMSGSIZE;</div><div class='add'>+		unlock_engine(ldev);</div><div class='add'>+		goto err_descr_too_many;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Loop through all the sg table entries and fill out a descriptor for each one.</div><div class='add'>+	desc = ldev-&gt;desc_next;</div><div class='add'>+	card_addr = acd-&gt;priv-&gt;card_addr;</div><div class='add'>+	for_each_sg(acd-&gt;sgt.sgl, sg, acd-&gt;mapped_entry_count, i){</div><div class='add'>+		pcnt = count_parts_for_sge(sg);</div><div class='add'>+		for (p = 0 ; p &lt; pcnt ; p++){</div><div class='add'>+			// Fill out the descriptor</div><div class='add'>+			BUG_ON(desc == NULL);</div><div class='add'>+			clear_desc(desc);</div><div class='add'>+			if (p != pcnt-1){</div><div class='add'>+				desc-&gt;DescByteCount = 0x80000;</div><div class='add'>+			} else {</div><div class='add'>+				desc-&gt;DescByteCount = sg_dma_len(sg) - (p * 0x80000);</div><div class='add'>+			}</div><div class='add'>+			desc-&gt;DescBufferByteCount = desc-&gt;DescByteCount;</div><div class='add'>+			</div><div class='add'>+			desc-&gt;DescControlFlags |= DMA_DESC_CTL_IRQONERR;</div><div class='add'>+			if (i == 0 &amp;&amp; p == 0)</div><div class='add'>+				desc-&gt;DescControlFlags |= DMA_DESC_CTL_SOP;</div><div class='add'>+			if (i == acd-&gt;mapped_entry_count-1 &amp;&amp; p == pcnt-1)</div><div class='add'>+				desc-&gt;DescControlFlags |= DMA_DESC_CTL_EOP | DMA_DESC_CTL_IRQONDONE;</div><div class='add'>+			</div><div class='add'>+			desc-&gt;DescCardAddrLS = (card_addr &amp; 0xFFFFFFFF);</div><div class='add'>+			desc-&gt;DescCardAddrMS = (card_addr &gt;&gt; 32) &amp; 0xF;</div><div class='add'>+			card_addr += desc-&gt;DescByteCount;</div><div class='add'>+			</div><div class='add'>+			dma_addr  = sg_dma_address(sg) + (p * 0x80000);</div><div class='add'>+			desc-&gt;DescSystemAddrLS = (dma_addr &amp; 0x00000000FFFFFFFF) &gt;&gt;  0;</div><div class='add'>+			desc-&gt;DescSystemAddrMS = (dma_addr &amp; 0xFFFFFFFF00000000) &gt;&gt; 32;</div><div class='add'>+			</div><div class='add'>+			user_ctl = acd-&gt;priv-&gt;user_ctl;</div><div class='add'>+			if (i == acd-&gt;mapped_entry_count-1 &amp;&amp; p == pcnt-1){</div><div class='add'>+				user_ctl = acd-&gt;priv-&gt;user_ctl_last;</div><div class='add'>+			}</div><div class='add'>+			desc-&gt;DescUserControlLS = (user_ctl &amp; 0x00000000FFFFFFFF) &gt;&gt;  0;</div><div class='add'>+			desc-&gt;DescUserControlMS = (user_ctl &amp; 0xFFFFFFFF00000000) &gt;&gt; 32;</div><div class='add'>+			</div><div class='add'>+			if (i == acd-&gt;mapped_entry_count-1 &amp;&amp; p == pcnt-1)</div><div class='add'>+				desc-&gt;acd = acd;</div><div class='add'>+			</div><div class='add'>+			dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "  Filled descriptor %p (acd = %p)\n", desc, desc-&gt;acd);</div><div class='add'>+			</div><div class='add'>+			ldev-&gt;desc_next = desc-&gt;Next;</div><div class='add'>+			desc = desc-&gt;Next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Send the filled descriptors off to the hardware to process!</div><div class='add'>+	SetEngineSWPtr(ldev, ldev-&gt;desc_next);</div><div class='add'>+	</div><div class='add'>+	unlock_engine(ldev);</div><div class='add'>+	</div><div class='add'>+	// If this is a synchronous kiocb, we need to put the calling process to sleep until the transfer is complete</div><div class='add'>+	if (kcb == NULL || is_sync_kiocb(kcb)){</div><div class='add'>+		rv = wait_for_completion_interruptible(&amp;done);</div><div class='add'>+		// If the user aborted (rv == -ERESTARTSYS), we're no longer responsible for cleaning up the acd</div><div class='add'>+		if (rv == -ERESTARTSYS){</div><div class='add'>+			acd-&gt;cpl = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (rv == 0){</div><div class='add'>+			rv = acd-&gt;len;</div><div class='add'>+			kfree(acd);</div><div class='add'>+		}</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	return -EIOCBQUEUED;</div><div class='add'>+</div><div class='add'>+ err_descr_too_many:</div><div class='add'>+	unlock_engine(ldev);</div><div class='add'>+	dma_unmap_sg(&amp;ldev-&gt;pldev-&gt;dev, acd-&gt;sgt.sgl, acd-&gt;sgt.nents, ldev-&gt;dir);</div><div class='add'>+	sg_free_table(&amp;acd-&gt;sgt);</div><div class='add'>+ err_dma_map_sg:</div><div class='add'>+ err_alloc_sg_table:</div><div class='add'>+	for (i = 0 ; i &lt; acd-&gt;page_count ; i++){</div><div class='add'>+		put_page(acd-&gt;user_pages[i]);</div><div class='add'>+	}</div><div class='add'>+ err_get_user_pages:</div><div class='add'>+	kfree(acd-&gt;user_pages);</div><div class='add'>+ err_alloc_userpages:</div><div class='add'>+	kfree(acd);</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_transfer returning with error %ld\n", rv);</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void  transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	</div><div class='add'>+	BUG_ON(acd == NULL);</div><div class='add'>+	BUG_ON(acd-&gt;user_pages == NULL);</div><div class='add'>+	BUG_ON(acd-&gt;sgt.sgl == NULL);</div><div class='add'>+	BUG_ON(acd-&gt;ldev == NULL);</div><div class='add'>+	BUG_ON(acd-&gt;ldev-&gt;pldev == NULL);</div><div class='add'>+	</div><div class='add'>+	dev_dbg(&amp;acd-&gt;ldev-&gt;pldev-&gt;dev, "transfer_complete_cb(acd = [%p])\n", acd);</div><div class='add'>+	</div><div class='add'>+	for (i = 0 ; i &lt; acd-&gt;page_count ; i++){</div><div class='add'>+		if (!PageReserved(acd-&gt;user_pages[i])){</div><div class='add'>+			set_page_dirty(acd-&gt;user_pages[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	dma_unmap_sg(&amp;acd-&gt;ldev-&gt;pldev-&gt;dev, acd-&gt;sgt.sgl, acd-&gt;sgt.nents, acd-&gt;ldev-&gt;dir);</div><div class='add'>+	</div><div class='add'>+	for (i = 0 ; i &lt; acd-&gt;page_count ; i++){</div><div class='add'>+		put_page(acd-&gt;user_pages[i]);</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	sg_free_table(&amp;acd-&gt;sgt);</div><div class='add'>+	</div><div class='add'>+	kfree(acd-&gt;user_pages);</div><div class='add'>+	</div><div class='add'>+	acd-&gt;flags = flags;</div><div class='add'>+	</div><div class='add'>+	if (acd-&gt;kcb == NULL || is_sync_kiocb(acd-&gt;kcb)){</div><div class='add'>+		if (acd-&gt;cpl){</div><div class='add'>+			complete(acd-&gt;cpl);</div><div class='add'>+		} else {</div><div class='add'>+			// There's no completion, so we're responsible for cleaning up the acd</div><div class='add'>+			kfree(acd);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+#ifdef CONFIG_KPC_DMA_AIO</div><div class='add'>+		aio_complete(acd-&gt;kcb, acd-&gt;len, acd-&gt;flags);</div><div class='add'>+#endif</div><div class='add'>+		kfree(acd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**********  Fileops  **********/</div><div class='add'>+static</div><div class='add'>+int  kpc_dma_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv;</div><div class='add'>+	struct kpc_dma_device *ldev = kpc_dma_lookup_device(iminor(inode));</div><div class='add'>+	if (ldev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	</div><div class='add'>+	if (! atomic_dec_and_test(&amp;ldev-&gt;open_count)){</div><div class='add'>+		atomic_inc(&amp;ldev-&gt;open_count);</div><div class='add'>+		return -EBUSY; /* already open */</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	priv = kzalloc(sizeof(struct dev_private_data), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	</div><div class='add'>+	priv-&gt;ldev = ldev;</div><div class='add'>+	filp-&gt;private_data = priv;</div><div class='add'>+	</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_open(inode = [%p], filp = [%p]) priv = [%p] ldev = [%p]\n", inode, filp, priv, priv-&gt;ldev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int  kpc_dma_close(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_descriptor *cur;</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)filp-&gt;private_data;</div><div class='add'>+	struct kpc_dma_device *eng = priv-&gt;ldev;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_close(inode = [%p], filp = [%p]) priv = [%p], ldev = [%p]\n", inode, filp, priv, priv-&gt;ldev);</div><div class='add'>+	</div><div class='add'>+	lock_engine(eng);</div><div class='add'>+	</div><div class='add'>+	stop_dma_engine(eng);</div><div class='add'>+	</div><div class='add'>+	cur = eng-&gt;desc_completed-&gt;Next;</div><div class='add'>+	while (cur != eng-&gt;desc_next){</div><div class='add'>+		dev_dbg(&amp;eng-&gt;pldev-&gt;dev, "Aborting descriptor %p (acd = %p)\n", cur, cur-&gt;acd);</div><div class='add'>+		if (cur-&gt;DescControlFlags &amp; DMA_DESC_CTL_EOP){</div><div class='add'>+			if (cur-&gt;acd)</div><div class='add'>+				transfer_complete_cb(cur-&gt;acd, 0, ACD_FLAG_ABORT);</div><div class='add'>+		}</div><div class='add'>+		</div><div class='add'>+		clear_desc(cur);</div><div class='add'>+		eng-&gt;desc_completed = cur;</div><div class='add'>+		</div><div class='add'>+		cur = cur-&gt;Next;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	start_dma_engine(eng);</div><div class='add'>+	</div><div class='add'>+	unlock_engine(eng);</div><div class='add'>+	</div><div class='add'>+	atomic_inc(&amp;priv-&gt;ldev-&gt;open_count); /* release the device */</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPC_DMA_AIO</div><div class='add'>+static</div><div class='add'>+int  kpc_dma_aio_cancel(struct kiocb *kcb)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)kcb-&gt;ki_filp-&gt;private_data;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_aio_cancel(kcb = [%p]) priv = [%p], ldev = [%p]\n", kcb, priv, priv-&gt;ldev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+ssize_t   kpc_dma_aio_read(struct kiocb *kcb, const struct iovec *iov, unsigned long iov_count, loff_t pos)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)kcb-&gt;ki_filp-&gt;private_data;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_aio_read(kcb = [%p], iov = [%p], iov_count = %ld, pos = %lld) priv = [%p], ldev = [%p]\n", kcb, iov, iov_count, pos, priv, priv-&gt;ldev);</div><div class='add'>+	</div><div class='add'>+	if (priv-&gt;ldev-&gt;dir != DMA_FROM_DEVICE)</div><div class='add'>+		return -EMEDIUMTYPE;</div><div class='add'>+	</div><div class='add'>+	if (iov_count != 1){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_aio_read() called with iov_count &gt; 1!\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	if (!is_sync_kiocb(kcb))</div><div class='add'>+		kiocb_set_cancel_fn(kcb, kpc_dma_aio_cancel);</div><div class='add'>+	return kpc_dma_transfer(priv, kcb, (unsigned long)iov-&gt;iov_base, iov-&gt;iov_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+ssize_t  kpc_dma_aio_write(struct kiocb *kcb, const struct iovec *iov, unsigned long iov_count, loff_t pos)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)kcb-&gt;ki_filp-&gt;private_data;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_aio_write(kcb = [%p], iov = [%p], iov_count = %ld, pos = %lld) priv = [%p], ldev = [%p]\n", kcb, iov, iov_count, pos, priv, priv-&gt;ldev);</div><div class='add'>+	</div><div class='add'>+	if (priv-&gt;ldev-&gt;dir != DMA_TO_DEVICE)</div><div class='add'>+		return -EMEDIUMTYPE;</div><div class='add'>+	</div><div class='add'>+	if (iov_count != 1){</div><div class='add'>+		dev_err(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_aio_write() called with iov_count &gt; 1!\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	if (!is_sync_kiocb(kcb))</div><div class='add'>+		kiocb_set_cancel_fn(kcb, kpc_dma_aio_cancel);</div><div class='add'>+	return kpc_dma_transfer(priv, kcb, (unsigned long)iov-&gt;iov_base, iov-&gt;iov_len);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+ssize_t  kpc_dma_read( struct file *filp,       char __user *user_buf, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)filp-&gt;private_data;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_read(filp = [%p], user_buf = [%p], count = %zu, ppos = [%p]) priv = [%p], ldev = [%p]\n", filp, user_buf, count, ppos, priv, priv-&gt;ldev);</div><div class='add'>+	</div><div class='add'>+	if (priv-&gt;ldev-&gt;dir != DMA_FROM_DEVICE)</div><div class='add'>+		return -EMEDIUMTYPE;</div><div class='add'>+	</div><div class='add'>+	return kpc_dma_transfer(priv, (struct kiocb *)NULL, (unsigned long)user_buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+ssize_t  kpc_dma_write(struct file *filp, const char __user *user_buf, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)filp-&gt;private_data;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_write(filp = [%p], user_buf = [%p], count = %zu, ppos = [%p]) priv = [%p], ldev = [%p]\n", filp, user_buf, count, ppos, priv, priv-&gt;ldev);</div><div class='add'>+	</div><div class='add'>+	if (priv-&gt;ldev-&gt;dir != DMA_TO_DEVICE)</div><div class='add'>+		return -EMEDIUMTYPE;</div><div class='add'>+	</div><div class='add'>+	return kpc_dma_transfer(priv, (struct kiocb *)NULL, (unsigned long)user_buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+long  kpc_dma_ioctl(struct file *filp, unsigned int ioctl_num, unsigned long ioctl_param)</div><div class='add'>+{</div><div class='add'>+	struct dev_private_data *priv = (struct dev_private_data *)filp-&gt;private_data;</div><div class='add'>+	dev_dbg(&amp;priv-&gt;ldev-&gt;pldev-&gt;dev, "kpc_dma_ioctl(filp = [%p], ioctl_num = 0x%x, ioctl_param = 0x%lx) priv = [%p], ldev = [%p]\n", filp, ioctl_num, ioctl_param, priv, priv-&gt;ldev);</div><div class='add'>+	</div><div class='add'>+	switch (ioctl_num){</div><div class='add'>+		case KND_IOCTL_SET_CARD_ADDR:           priv-&gt;card_addr  = ioctl_param; return priv-&gt;card_addr; </div><div class='add'>+		case KND_IOCTL_SET_USER_CTL:            priv-&gt;user_ctl   = ioctl_param; return priv-&gt;user_ctl; </div><div class='add'>+		case KND_IOCTL_SET_USER_CTL_LAST:       priv-&gt;user_ctl_last = ioctl_param; return priv-&gt;user_ctl_last; </div><div class='add'>+		case KND_IOCTL_GET_USER_STS:            return priv-&gt;user_sts;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct file_operations  kpc_dma_fops = {</div><div class='add'>+	.owner      = THIS_MODULE,</div><div class='add'>+	.open           = kpc_dma_open,</div><div class='add'>+	.release        = kpc_dma_close,</div><div class='add'>+	.read           = kpc_dma_read,</div><div class='add'>+	.write          = kpc_dma_write,</div><div class='add'>+#ifdef CONFIG_KPC_DMA_AIO</div><div class='add'>+	.aio_read       = kpc_dma_aio_read,</div><div class='add'>+	.aio_write      = kpc_dma_aio_write,</div><div class='add'>+#endif</div><div class='add'>+	.unlocked_ioctl = kpc_dma_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c b/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c<br/>new file mode 100644<br/>index 000000000000..aeae58d9bc18<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c</a></div><div class='hunk'>@@ -0,0 +1,248 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</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/types.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include "kpc_dma_driver.h"</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Matt.Sickler@daktronics.com");</div><div class='add'>+</div><div class='add'>+#define KPC_DMA_CHAR_MAJOR    UNNAMED_MAJOR</div><div class='add'>+#define KPC_DMA_NUM_MINORS    1 &lt;&lt; MINORBITS</div><div class='add'>+static DEFINE_MUTEX(kpc_dma_mtx);</div><div class='add'>+static int assigned_major_num;</div><div class='add'>+static LIST_HEAD(kpc_dma_list);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********  kpc_dma_list list management  **********/</div><div class='add'>+struct kpc_dma_device *  kpc_dma_lookup_device(int minor)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_device *c;</div><div class='add'>+	mutex_lock(&amp;kpc_dma_mtx);</div><div class='add'>+	list_for_each_entry(c, &amp;kpc_dma_list, list) {</div><div class='add'>+		if (c-&gt;pldev-&gt;id == minor) {</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	c = NULL; // not-found case</div><div class='add'>+  out:</div><div class='add'>+	mutex_unlock(&amp;kpc_dma_mtx);</div><div class='add'>+	return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void  kpc_dma_add_device(struct kpc_dma_device * ldev)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;kpc_dma_mtx);</div><div class='add'>+	list_add(&amp;ldev-&gt;list, &amp;kpc_dma_list);</div><div class='add'>+	mutex_unlock(&amp;kpc_dma_mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kpc_dma_del_device(struct kpc_dma_device * ldev)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;kpc_dma_mtx);</div><div class='add'>+	list_del(&amp;ldev-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;kpc_dma_mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**********  SysFS Attributes **********/</div><div class='add'>+static ssize_t  show_engine_regs(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_device *ldev;</div><div class='add'>+	struct platform_device *pldev = to_platform_device(dev);</div><div class='add'>+	if (!pldev) return 0;</div><div class='add'>+	ldev = platform_get_drvdata(pldev);</div><div class='add'>+	if (!ldev) return 0;</div><div class='add'>+	</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, </div><div class='add'>+		"EngineControlStatus      = 0x%08x\n"</div><div class='add'>+		"RegNextDescPtr           = 0x%08x\n"</div><div class='add'>+		"RegSWDescPtr             = 0x%08x\n"</div><div class='add'>+		"RegCompletedDescPtr      = 0x%08x\n"</div><div class='add'>+		"desc_pool_first          = %p\n"</div><div class='add'>+		"desc_pool_last           = %p\n"</div><div class='add'>+		"desc_next                = %p\n"</div><div class='add'>+		"desc_completed           = %p\n",</div><div class='add'>+		readl(ldev-&gt;eng_regs + 1),</div><div class='add'>+		readl(ldev-&gt;eng_regs + 2),</div><div class='add'>+		readl(ldev-&gt;eng_regs + 3),</div><div class='add'>+		readl(ldev-&gt;eng_regs + 4),</div><div class='add'>+		ldev-&gt;desc_pool_first,</div><div class='add'>+		ldev-&gt;desc_pool_last,</div><div class='add'>+		ldev-&gt;desc_next,</div><div class='add'>+		ldev-&gt;desc_completed</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+DEVICE_ATTR(engine_regs, 0444, show_engine_regs, NULL);</div><div class='add'>+</div><div class='add'>+static const struct attribute *  ndd_attr_list[] = {</div><div class='add'>+	&amp;dev_attr_engine_regs.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct class *kpc_dma_class;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********  Platform Driver Functions  **********/</div><div class='add'>+static</div><div class='add'>+int  kpc_dma_probe(struct platform_device *pldev)</div><div class='add'>+{</div><div class='add'>+	struct resource *r = NULL;</div><div class='add'>+	int rv = 0;</div><div class='add'>+	dev_t dev;</div><div class='add'>+	</div><div class='add'>+	struct kpc_dma_device *ldev = kzalloc(sizeof(struct kpc_dma_device), GFP_KERNEL);</div><div class='add'>+	if (!ldev){</div><div class='add'>+		dev_err(&amp;pldev-&gt;dev, "kpc_dma_probe: unable to kzalloc space for kpc_dma_device\n");</div><div class='add'>+		rv = -ENOMEM;</div><div class='add'>+		goto err_rv;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	dev_dbg(&amp;pldev-&gt;dev, "kpc_dma_probe(pldev = [%p]) ldev = [%p]\n", pldev, ldev);</div><div class='add'>+	</div><div class='add'>+	INIT_LIST_HEAD(&amp;ldev-&gt;list);</div><div class='add'>+	</div><div class='add'>+	ldev-&gt;pldev = pldev;</div><div class='add'>+	platform_set_drvdata(pldev, ldev);</div><div class='add'>+	atomic_set(&amp;ldev-&gt;open_count, 1);</div><div class='add'>+	</div><div class='add'>+	mutex_init(&amp;ldev-&gt;sem);</div><div class='add'>+	lock_engine(ldev);</div><div class='add'>+	</div><div class='add'>+	// Get Engine regs resource</div><div class='add'>+	r = platform_get_resource(pldev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!r){</div><div class='add'>+		dev_err(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_probe: didn't get the engine regs resource!\n");</div><div class='add'>+		rv = -ENXIO;</div><div class='add'>+		goto err_kfree;</div><div class='add'>+	}</div><div class='add'>+	ldev-&gt;eng_regs = ioremap_nocache(r-&gt;start, resource_size(r));</div><div class='add'>+	if (!ldev-&gt;eng_regs){</div><div class='add'>+		dev_err(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_probe: failed to ioremap engine regs!\n");</div><div class='add'>+		rv = -ENXIO;</div><div class='add'>+		goto err_kfree;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	r = platform_get_resource(pldev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (!r){</div><div class='add'>+		dev_err(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_probe: didn't get the IRQ resource!\n");</div><div class='add'>+		rv = -ENXIO;</div><div class='add'>+		goto err_kfree;</div><div class='add'>+	}</div><div class='add'>+	ldev-&gt;irq = r-&gt;start;</div><div class='add'>+	</div><div class='add'>+	// Setup miscdev struct</div><div class='add'>+	dev = MKDEV(assigned_major_num, pldev-&gt;id);</div><div class='add'>+	ldev-&gt;kpc_dma_dev = device_create(kpc_dma_class, &amp;pldev-&gt;dev, dev, ldev, "kpc_dma%d", pldev-&gt;id);</div><div class='add'>+	if (IS_ERR(ldev-&gt;kpc_dma_dev)){</div><div class='add'>+		dev_err(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_probe: device_create failed: %d\n", rv);</div><div class='add'>+		goto err_kfree;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Setup the DMA engine</div><div class='add'>+	rv = setup_dma_engine(ldev, 30);</div><div class='add'>+	if (rv){</div><div class='add'>+		dev_err(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_probe: failed to setup_dma_engine: %d\n", rv);</div><div class='add'>+		goto err_misc_dereg;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	// Setup the sysfs files</div><div class='add'>+	rv = sysfs_create_files(&amp;(ldev-&gt;pldev-&gt;dev.kobj), ndd_attr_list);</div><div class='add'>+	if (rv){</div><div class='add'>+		dev_err(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_probe: Failed to add sysfs files: %d\n", rv);</div><div class='add'>+		goto err_destroy_eng;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	kpc_dma_add_device(ldev);</div><div class='add'>+	</div><div class='add'>+	return 0;</div><div class='add'>+	</div><div class='add'>+ err_destroy_eng:</div><div class='add'>+	destroy_dma_engine(ldev);</div><div class='add'>+ err_misc_dereg:</div><div class='add'>+	device_destroy(kpc_dma_class, dev);</div><div class='add'>+ err_kfree:</div><div class='add'>+	kfree(ldev);</div><div class='add'>+ err_rv:</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int  kpc_dma_remove(struct platform_device *pldev)</div><div class='add'>+{</div><div class='add'>+	struct kpc_dma_device *ldev = platform_get_drvdata(pldev);</div><div class='add'>+	if (!ldev)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	</div><div class='add'>+	dev_dbg(&amp;ldev-&gt;pldev-&gt;dev, "kpc_dma_remove(pldev = [%p]) ldev = [%p]\n", pldev, ldev);</div><div class='add'>+	</div><div class='add'>+	lock_engine(ldev);</div><div class='add'>+	sysfs_remove_files(&amp;(ldev-&gt;pldev-&gt;dev.kobj), ndd_attr_list);</div><div class='add'>+	destroy_dma_engine(ldev);</div><div class='add'>+	kpc_dma_del_device(ldev);</div><div class='add'>+	device_destroy(kpc_dma_class, MKDEV(assigned_major_num, ldev-&gt;pldev-&gt;id));</div><div class='add'>+	kfree(ldev);</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'>+/**********  Driver Functions  **********/</div><div class='add'>+struct platform_driver kpc_dma_plat_driver_i = {</div><div class='add'>+	.probe        = kpc_dma_probe,</div><div class='add'>+	.remove       = kpc_dma_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name   = KP_DRIVER_NAME_DMA_CONTROLLER,</div><div class='add'>+		.owner  = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int __init  kpc_dma_driver_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	</div><div class='add'>+	err = __register_chrdev(KPC_DMA_CHAR_MAJOR, 0, KPC_DMA_NUM_MINORS, "kpc_dma", &amp;kpc_dma_fops);</div><div class='add'>+	if (err &lt; 0){</div><div class='add'>+		pr_err("Can't allocate a major number (%d) for kpc_dma (err = %d)\n", KPC_DMA_CHAR_MAJOR, err);</div><div class='add'>+		goto fail_chrdev_register;</div><div class='add'>+	}</div><div class='add'>+	assigned_major_num = err;</div><div class='add'>+	</div><div class='add'>+	kpc_dma_class = class_create(THIS_MODULE, "kpc_dma");</div><div class='add'>+	err = PTR_ERR(kpc_dma_class);</div><div class='add'>+	if (IS_ERR(kpc_dma_class)){</div><div class='add'>+		pr_err("Can't create class kpc_dma (err = %d)\n", err);</div><div class='add'>+		goto fail_class_create;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	err = platform_driver_register(&amp;kpc_dma_plat_driver_i);</div><div class='add'>+	if (err){</div><div class='add'>+		pr_err("Can't register platform driver for kpc_dma (err = %d)\n", err);</div><div class='add'>+		goto fail_platdriver_register;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	return err;</div><div class='add'>+	</div><div class='add'>+  fail_platdriver_register:</div><div class='add'>+	class_destroy(kpc_dma_class);</div><div class='add'>+  fail_class_create:</div><div class='add'>+	__unregister_chrdev(KPC_DMA_CHAR_MAJOR, 0, KPC_DMA_NUM_MINORS, "kpc_dma");</div><div class='add'>+  fail_chrdev_register:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+module_init(kpc_dma_driver_init);</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void __exit  kpc_dma_driver_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;kpc_dma_plat_driver_i);</div><div class='add'>+	class_destroy(kpc_dma_class);</div><div class='add'>+	__unregister_chrdev(KPC_DMA_CHAR_MAJOR, 0, KPC_DMA_NUM_MINORS, "kpc_dma");</div><div class='add'>+}</div><div class='add'>+module_exit(kpc_dma_driver_exit);</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h b/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h<br/>new file mode 100644<br/>index 000000000000..ef913b7496e6<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef KPC_DMA_DRIVER_H</div><div class='add'>+#define KPC_DMA_DRIVER_H</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.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/pci.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/aio.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include "../kpc.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct kp2000_device;</div><div class='add'>+struct kpc_dma_device {</div><div class='add'>+	struct list_head            list;</div><div class='add'>+	struct platform_device     *pldev;</div><div class='add'>+	u32 __iomem                *eng_regs;</div><div class='add'>+	struct device              *kpc_dma_dev;</div><div class='add'>+	struct kobject              kobj;</div><div class='add'>+	char                        name[16];</div><div class='add'>+	</div><div class='add'>+	int                         dir; // DMA_FROM_DEVICE || DMA_TO_DEVICE</div><div class='add'>+	struct mutex                sem;</div><div class='add'>+	unsigned int                irq;</div><div class='add'>+	struct work_struct          irq_work;</div><div class='add'>+	</div><div class='add'>+	atomic_t                    open_count;</div><div class='add'>+	</div><div class='add'>+	size_t                      accumulated_bytes;</div><div class='add'>+	u32                         accumulated_flags;</div><div class='add'>+	</div><div class='add'>+	// Descriptor "Pool" housekeeping</div><div class='add'>+	u32                         desc_pool_cnt;</div><div class='add'>+	struct dma_pool            *desc_pool;</div><div class='add'>+	struct kpc_dma_descriptor  *desc_pool_first;</div><div class='add'>+	struct kpc_dma_descriptor  *desc_pool_last;</div><div class='add'>+	</div><div class='add'>+	struct kpc_dma_descriptor  *desc_next;</div><div class='add'>+	struct kpc_dma_descriptor  *desc_completed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dev_private_data {</div><div class='add'>+	struct kpc_dma_device      *ldev;</div><div class='add'>+	u64                         card_addr;</div><div class='add'>+	u64                         user_ctl;</div><div class='add'>+	u64                         user_ctl_last;</div><div class='add'>+	u64                         user_sts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kpc_dma_device *  kpc_dma_lookup_device(int minor);</div><div class='add'>+</div><div class='add'>+extern struct file_operations  kpc_dma_fops;</div><div class='add'>+</div><div class='add'>+#define ENG_CAP_PRESENT                 0x00000001</div><div class='add'>+#define ENG_CAP_DIRECTION               0x00000002</div><div class='add'>+#define ENG_CAP_TYPE_MASK               0x000000F0</div><div class='add'>+#define ENG_CAP_NUMBER_MASK             0x0000FF00</div><div class='add'>+#define ENG_CAP_CARD_ADDR_SIZE_MASK     0x007F0000</div><div class='add'>+#define ENG_CAP_DESC_MAX_BYTE_CNT_MASK  0x3F000000</div><div class='add'>+#define ENG_CAP_PERF_SCALE_MASK         0xC0000000</div><div class='add'>+</div><div class='add'>+#define ENG_CTL_IRQ_ENABLE              BIT(0)</div><div class='add'>+#define ENG_CTL_IRQ_ACTIVE              BIT(1)</div><div class='add'>+#define ENG_CTL_DESC_COMPLETE           BIT(2)</div><div class='add'>+#define ENG_CTL_DESC_ALIGN_ERR          BIT(3)</div><div class='add'>+#define ENG_CTL_DESC_FETCH_ERR          BIT(4)</div><div class='add'>+#define ENG_CTL_SW_ABORT_ERR            BIT(5)</div><div class='add'>+#define ENG_CTL_DESC_CHAIN_END          BIT(7)</div><div class='add'>+#define ENG_CTL_DMA_ENABLE              BIT(8)</div><div class='add'>+#define ENG_CTL_DMA_RUNNING             BIT(10)</div><div class='add'>+#define ENG_CTL_DMA_WAITING             BIT(11)</div><div class='add'>+#define ENG_CTL_DMA_WAITING_PERSIST     BIT(12)</div><div class='add'>+#define ENG_CTL_DMA_RESET_REQUEST       BIT(14)</div><div class='add'>+#define ENG_CTL_DMA_RESET               BIT(15)</div><div class='add'>+#define ENG_CTL_DESC_FETCH_ERR_CLASS_MASK   0x700000</div><div class='add'>+</div><div class='add'>+struct aio_cb_data {</div><div class='add'>+	struct dev_private_data    *priv;</div><div class='add'>+	struct kpc_dma_device      *ldev;</div><div class='add'>+	struct completion  *cpl;</div><div class='add'>+	unsigned char       flags;</div><div class='add'>+	struct kiocb       *kcb;</div><div class='add'>+	size_t              len;</div><div class='add'>+	</div><div class='add'>+	unsigned int        page_count;</div><div class='add'>+	struct page       **user_pages;</div><div class='add'>+	struct sg_table     sgt;</div><div class='add'>+	int                 mapped_entry_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ACD_FLAG_DONE               0</div><div class='add'>+#define ACD_FLAG_ABORT              1</div><div class='add'>+#define ACD_FLAG_ENG_ACCUM_ERROR    4</div><div class='add'>+#define ACD_FLAG_ENG_ACCUM_SHORT    5</div><div class='add'>+</div><div class='add'>+struct kpc_dma_descriptor {</div><div class='add'>+	struct {</div><div class='add'>+		volatile u32  DescByteCount              :20;</div><div class='add'>+		volatile u32  DescStatusErrorFlags       :4;</div><div class='add'>+		volatile u32  DescStatusFlags            :8;</div><div class='add'>+	};</div><div class='add'>+		volatile u32  DescUserControlLS;</div><div class='add'>+		volatile u32  DescUserControlMS;</div><div class='add'>+		volatile u32  DescCardAddrLS;</div><div class='add'>+	struct {</div><div class='add'>+		volatile u32  DescBufferByteCount        :20;</div><div class='add'>+		volatile u32  DescCardAddrMS             :4;</div><div class='add'>+		volatile u32  DescControlFlags           :8;</div><div class='add'>+	};</div><div class='add'>+		volatile u32  DescSystemAddrLS;</div><div class='add'>+		volatile u32  DescSystemAddrMS;</div><div class='add'>+		volatile u32  DescNextDescPtr;</div><div class='add'>+		</div><div class='add'>+		dma_addr_t    MyDMAAddr;</div><div class='add'>+		struct kpc_dma_descriptor   *Next;</div><div class='add'>+		</div><div class='add'>+		struct aio_cb_data  *acd;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+// DescControlFlags:</div><div class='add'>+#define DMA_DESC_CTL_SOP            BIT(7)</div><div class='add'>+#define DMA_DESC_CTL_EOP            BIT(6)</div><div class='add'>+#define DMA_DESC_CTL_AFIFO          BIT(2)</div><div class='add'>+#define DMA_DESC_CTL_IRQONERR       BIT(1)</div><div class='add'>+#define DMA_DESC_CTL_IRQONDONE      BIT(0)</div><div class='add'>+// DescStatusFlags:</div><div class='add'>+#define DMA_DESC_STS_SOP            BIT(7)</div><div class='add'>+#define DMA_DESC_STS_EOP            BIT(6)</div><div class='add'>+#define DMA_DESC_STS_ERROR          BIT(4)</div><div class='add'>+#define DMA_DESC_STS_USMSZ          BIT(3)</div><div class='add'>+#define DMA_DESC_STS_USLSZ          BIT(2)</div><div class='add'>+#define DMA_DESC_STS_SHORT          BIT(1)</div><div class='add'>+#define DMA_DESC_STS_COMPLETE       BIT(0)</div><div class='add'>+// DescStatusErrorFlags:</div><div class='add'>+#define DMA_DESC_ESTS_ECRC          BIT(2)</div><div class='add'>+#define DMA_DESC_ESTS_POISON        BIT(1)</div><div class='add'>+#define DMA_DESC_ESTS_UNSUCCESSFUL  BIT(0)</div><div class='add'>+</div><div class='add'>+#define DMA_DESC_ALIGNMENT          0x20</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32  GetEngineCapabilities(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	return readl(eng-&gt;eng_regs + 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void  WriteEngineControl(struct kpc_dma_device *eng, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, eng-&gt;eng_regs + 1);</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+u32  GetEngineControl(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	return readl(eng-&gt;eng_regs + 1);</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+void  SetClearEngineControl(struct kpc_dma_device *eng, u32 set_bits, u32 clear_bits)</div><div class='add'>+{</div><div class='add'>+	u32 val = GetEngineControl(eng);</div><div class='add'>+	val |= set_bits;</div><div class='add'>+	val &amp;= ~clear_bits;</div><div class='add'>+	WriteEngineControl(eng, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void  SetEngineNextPtr(struct kpc_dma_device *eng, struct kpc_dma_descriptor * desc)</div><div class='add'>+{</div><div class='add'>+	writel(desc-&gt;MyDMAAddr, eng-&gt;eng_regs + 2);</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+void  SetEngineSWPtr(struct kpc_dma_device *eng, struct kpc_dma_descriptor * desc)</div><div class='add'>+{</div><div class='add'>+	writel(desc-&gt;MyDMAAddr, eng-&gt;eng_regs + 3);</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+void  ClearEngineCompletePtr(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	writel(0, eng-&gt;eng_regs + 4);</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+u32  GetEngineCompletePtr(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	return readl(eng-&gt;eng_regs + 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void  lock_engine(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(eng == NULL);</div><div class='add'>+	mutex_lock(&amp;eng-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void  unlock_engine(struct kpc_dma_device *eng)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(eng == NULL);</div><div class='add'>+	mutex_unlock(&amp;eng-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/// Shared Functions</div><div class='add'>+void  start_dma_engine(struct kpc_dma_device *eng);</div><div class='add'>+int   setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt);</div><div class='add'>+void  stop_dma_engine(struct kpc_dma_device *eng);</div><div class='add'>+void  destroy_dma_engine(struct kpc_dma_device *eng);</div><div class='add'>+void  clear_desc(struct kpc_dma_descriptor *desc);</div><div class='add'>+int   count_descriptors_available(struct kpc_dma_device *eng);</div><div class='add'>+void  transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags);</div><div class='add'>+</div><div class='add'>+#endif /* KPC_DMA_DRIVER_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_dma/uapi.h b/drivers/staging/kpc2000/kpc_dma/uapi.h<br/>new file mode 100644<br/>index 000000000000..5ff6a1a36ff9<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_dma/uapi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_dma/uapi.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef KPC_DMA_DRIVER_UAPI_H_</div><div class='add'>+#define KPC_DMA_DRIVER_UAPI_H_</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#define KND_IOCTL_SET_CARD_ADDR                     _IOW('k', 1, __u32)</div><div class='add'>+#define KND_IOCTL_SET_USER_CTL                      _IOW('k', 2, __u64)</div><div class='add'>+#define KND_IOCTL_SET_USER_CTL_LAST                 _IOW('k', 4, __u64)</div><div class='add'>+#define KND_IOCTL_GET_USER_STS                      _IOR('k', 3, __u64)</div><div class='add'>+</div><div class='add'>+#endif /* KPC_DMA_DRIVER_UAPI_H_ */</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_i2c/Makefile b/drivers/staging/kpc2000/kpc_i2c/Makefile<br/>new file mode 100644<br/>index 000000000000..73ec07ac7d39<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_i2c/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_i2c/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-m := kpc2000_i2c.o</div><div class='add'>+kpc2000_i2c-objs := i2c_driver.o fileops.o</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_i2c/fileops.c b/drivers/staging/kpc2000/kpc_i2c/fileops.c<br/>new file mode 100644<br/>index 000000000000..e749c0994491<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_i2c/fileops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_i2c/fileops.c</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+#if 0</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;	/* printk() */</div><div class='add'>+#include &lt;linux/slab.h&gt;		/* kmalloc() */</div><div class='add'>+#include &lt;linux/fs.h&gt;		/* everything... */</div><div class='add'>+#include &lt;linux/errno.h&gt;	/* error codes */</div><div class='add'>+#include &lt;linux/types.h&gt;	/* size_t */</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;	/* copy_*_user */</div><div class='add'>+</div><div class='add'>+#include "i2c_driver.h"</div><div class='add'>+</div><div class='add'>+int i2c_cdev_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+  struct i2c_device *lddev;</div><div class='add'>+  </div><div class='add'>+  if(NULL == inode) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_open: inode is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_open: inode is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(NULL == filp) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_open: filp is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_open: filp is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  </div><div class='add'>+  lddev = container_of(inode-&gt;i_cdev, struct i2c_device, cdev);</div><div class='add'>+  //printk(KERN_DEBUG "&lt;pl_i2c&gt; i2c_cdev_open(filp = [%p], lddev = [%p])\n", filp, lddev);</div><div class='add'>+  DBG_PRINT(KERN_DEBUG, "i2c_cdev_open(filp = [%p], lddev = [%p])\n", filp, lddev);</div><div class='add'>+  </div><div class='add'>+  filp-&gt;private_data = lddev; /* so other methods can access it */</div><div class='add'>+  </div><div class='add'>+  return 0;	/* success */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int i2c_cdev_close(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+  struct i2c_device *lddev;</div><div class='add'>+  </div><div class='add'>+  if(NULL == inode) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_close: inode is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_close: inode is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(NULL == filp) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_close: filp is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_close: filp is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  </div><div class='add'>+  lddev = filp-&gt;private_data;</div><div class='add'>+  //printk(KERN_DEBUG "&lt;pl_i2c&gt; i2c_cdev_close(filp = [%p], lddev = [%p])\n", filp, lddev);</div><div class='add'>+  DBG_PRINT(KERN_DEBUG, "i2c_cdev_close(filp = [%p], lddev = [%p])\n", filp, lddev);</div><div class='add'>+  </div><div class='add'>+  return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t i2c_cdev_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos)</div><div class='add'>+{</div><div class='add'>+  size_t copy;</div><div class='add'>+  ssize_t ret = 0;</div><div class='add'>+  int err = 0;</div><div class='add'>+  u64 read_val;</div><div class='add'>+  char tmp_buf[48] = { 0 };</div><div class='add'>+  struct i2c_device *lddev = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+  if(NULL == filp) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_read: filp is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_read: filp is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(NULL == buf) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_read: buf is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_read: buf is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(NULL == f_pos) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_read: f_pos is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_read: f_pos is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  if(count &lt; sizeof(tmp_buf)) {</div><div class='add'>+    //printk(KERN_INFO "&lt;pl_i2c&gt; i2c_cdev_read: buffer is too small (count = %d, should be at least %d bytes)\n", (int)count, (int)sizeof(tmp_buf));</div><div class='add'>+    DBG_PRINT(KERN_INFO, "i2c_cdev_read: buffer is too small (count = %d, should be at least %d bytes)\n", (int)count, (int)sizeof(tmp_buf));</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(((*f_pos * 8) + lddev-&gt;pldev-&gt;resource[0].start) &gt; lddev-&gt;pldev-&gt;resource[0].end) {</div><div class='add'>+    //printk(KERN_INFO "&lt;pl_i2c&gt; i2c_cdev_read: bad read addr %016llx\n", (*f_pos * 8) + lddev-&gt;pldev-&gt;resource[0].start);</div><div class='add'>+    DBG_PRINT(KERN_INFO, "i2c_cdev_read: bad read addr %016llx\n", (*f_pos * 8) + lddev-&gt;pldev-&gt;resource[0].start);</div><div class='add'>+    //printk(KERN_INFO "&lt;pl_i2c&gt; i2c_cdev_read: addr end %016llx\n", lddev-&gt;pldev-&gt;resource[0].end);</div><div class='add'>+    DBG_PRINT(KERN_INFO, "i2c_cdev_read: addr end %016llx\n", lddev-&gt;pldev-&gt;resource[0].end);</div><div class='add'>+    //printk(KERN_INFO "&lt;pl_i2c&gt; i2c_cdev_read: EOF reached\n");</div><div class='add'>+    DBG_PRINT(KERN_INFO, "i2c_cdev_read: EOF reached\n");</div><div class='add'>+    return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  down_read(&amp;lddev-&gt;rw_sem);</div><div class='add'>+  </div><div class='add'>+  read_val = *(lddev-&gt;regs + *f_pos);</div><div class='add'>+  copy = clamp_t(size_t, count, 1, sizeof(tmp_buf));</div><div class='add'>+  copy = scnprintf(tmp_buf, copy, "reg: 0x%x val: 0x%llx\n", (unsigned int)*f_pos, read_val);</div><div class='add'>+  err = copy_to_user(buf, tmp_buf, copy);</div><div class='add'>+  if(err) {</div><div class='add'>+    //printk(KERN_INFO "&lt;pl_i2c&gt; i2c_cdev_read: could not copy to user (err = %d)\n", err);</div><div class='add'>+    DBG_PRINT(KERN_INFO, "i2c_cdev_read: could not copy to user (err = %d)\n", err);</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  ret = (ssize_t)copy;</div><div class='add'>+  (*f_pos)++;</div><div class='add'>+  </div><div class='add'>+  up_read(&amp;lddev-&gt;rw_sem);</div><div class='add'>+  </div><div class='add'>+  return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t i2c_cdev_write(struct file *filp, const char __user *buf, size_t count, loff_t *f_pos)</div><div class='add'>+{</div><div class='add'>+  u8 reg;</div><div class='add'>+  u8 val;</div><div class='add'>+  char tmp[8] = { 0 };</div><div class='add'>+  struct i2c_device *lddev = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+  if(NULL == filp) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_write: filp is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_write: filp is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(NULL == buf) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_write: buf is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_write: buf is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+  if(NULL == f_pos) {</div><div class='add'>+    //printk(KERN_WARNING "&lt;pl_i2c&gt; i2c_cdev_write: f_pos is a NULL pointer\n");</div><div class='add'>+    DBG_PRINT(KERN_WARNING, "i2c_cdev_write: f_pos is a NULL pointer\n");</div><div class='add'>+    return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  //printk(KERN_DEBUG "&lt;pl_i2c&gt; i2c_cdev_write(filp = [%p], lddev = [%p])\n", filp, lddev);</div><div class='add'>+  DBG_PRINT(KERN_DEBUG, "i2c_cdev_write(filp = [%p], lddev = [%p])\n", filp, lddev);</div><div class='add'>+</div><div class='add'>+  down_write(&amp;lddev-&gt;rw_sem);</div><div class='add'>+</div><div class='add'>+  if(count &gt;= 2) {</div><div class='add'>+    if(copy_from_user(tmp, buf, 2)) {</div><div class='add'>+      return -EFAULT;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    reg = tmp[0] - '0';</div><div class='add'>+    val = tmp[1] - '0';</div><div class='add'>+</div><div class='add'>+    //printk(KERN_DEBUG "  reg = %d  val = %d\n", reg, val);</div><div class='add'>+    DBG_PRINT(KERN_DEBUG, "  reg = %d  val = %d\n", reg, val);</div><div class='add'>+</div><div class='add'>+    if(reg &gt;= 0 &amp;&amp; reg &lt; 16) {</div><div class='add'>+      //printk(KERN_DEBUG "  Writing 0x%x to %p\n", val, lddev-&gt;regs + reg);</div><div class='add'>+      DBG_PRINT(KERN_DEBUG, "  Writing 0x%x to %p\n", val, lddev-&gt;regs + reg);</div><div class='add'>+      *(lddev-&gt;regs + reg) = val;</div><div class='add'>+    }</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  (*f_pos)++;</div><div class='add'>+</div><div class='add'>+  up_write(&amp;lddev-&gt;rw_sem);</div><div class='add'>+</div><div class='add'>+  return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct file_operations i2c_fops = {</div><div class='add'>+  .owner		= THIS_MODULE,</div><div class='add'>+  .open		= i2c_cdev_open,</div><div class='add'>+  .release	= i2c_cdev_close,</div><div class='add'>+  .read		= i2c_cdev_read,</div><div class='add'>+  .write		= i2c_cdev_write,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c b/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c<br/>new file mode 100644<br/>index 000000000000..0fb068b2408d<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_i2c/i2c_driver.c</a></div><div class='hunk'>@@ -0,0 +1,699 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*  Copyright (c) 2014-2018  Daktronics,</div><div class='add'>+                             Matt Sickler &lt;matt.sickler@daktronics.com&gt;,</div><div class='add'>+                             Jordon Hofer &lt;jordon.hofer@daktronics.com&gt;</div><div class='add'>+    Adapted i2c-i801.c for use with Kadoka hardware.</div><div class='add'>+    Copyright (c) 1998 - 2002  Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+    Philip Edelbrock &lt;phil@netroedge.com&gt;, and Mark D. Studebaker</div><div class='add'>+    &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+    Copyright (C) 2007 - 2012  Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='add'>+    Copyright (C) 2010         Intel Corporation,</div><div class='add'>+                               David Woodhouse &lt;dwmw2@infradead.org&gt;</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/types.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include "../kpc.h"</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Matt.Sickler@Daktronics.com");</div><div class='add'>+MODULE_SOFTDEP("pre: i2c-dev");</div><div class='add'>+</div><div class='add'>+struct i2c_device {</div><div class='add'>+    unsigned long           smba;</div><div class='add'>+    struct i2c_adapter      adapter;</div><div class='add'>+    struct platform_device *pldev;</div><div class='add'>+    struct rw_semaphore     rw_sem;</div><div class='add'>+    unsigned int            features;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*****************************</div><div class='add'>+ *** Part 1 - i2c Handlers ***</div><div class='add'>+ *****************************/</div><div class='add'>+</div><div class='add'>+#define REG_SIZE 8</div><div class='add'>+</div><div class='add'>+/* I801 SMBus address offsets */</div><div class='add'>+#define SMBHSTSTS(p)    ((0  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBHSTCNT(p)    ((2  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBHSTCMD(p)    ((3  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBHSTADD(p)    ((4  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBHSTDAT0(p)   ((5  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBHSTDAT1(p)   ((6  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBBLKDAT(p)    ((7  * REG_SIZE) + (p)-&gt;smba)</div><div class='add'>+#define SMBPEC(p)       ((8  * REG_SIZE) + (p)-&gt;smba)   /* ICH3 and later */</div><div class='add'>+#define SMBAUXSTS(p)    ((12 * REG_SIZE) + (p)-&gt;smba)   /* ICH4 and later */</div><div class='add'>+#define SMBAUXCTL(p)    ((13 * REG_SIZE) + (p)-&gt;smba)   /* ICH4 and later */</div><div class='add'>+</div><div class='add'>+/* PCI Address Constants */</div><div class='add'>+#define SMBBAR      4</div><div class='add'>+#define SMBHSTCFG   0x040</div><div class='add'>+</div><div class='add'>+/* Host configuration bits for SMBHSTCFG */</div><div class='add'>+#define SMBHSTCFG_HST_EN        1</div><div class='add'>+#define SMBHSTCFG_SMB_SMI_EN    2</div><div class='add'>+#define SMBHSTCFG_I2C_EN        4</div><div class='add'>+</div><div class='add'>+/* Auxiliary control register bits, ICH4+ only */</div><div class='add'>+#define SMBAUXCTL_CRC       1</div><div class='add'>+#define SMBAUXCTL_E32B      2</div><div class='add'>+</div><div class='add'>+/* kill bit for SMBHSTCNT */</div><div class='add'>+#define SMBHSTCNT_KILL      2</div><div class='add'>+</div><div class='add'>+/* Other settings */</div><div class='add'>+#define MAX_RETRIES         400</div><div class='add'>+#define ENABLE_INT9         0       /* set to 0x01 to enable - untested */</div><div class='add'>+</div><div class='add'>+/* I801 command constants */</div><div class='add'>+#define I801_QUICK              0x00</div><div class='add'>+#define I801_BYTE               0x04</div><div class='add'>+#define I801_BYTE_DATA          0x08</div><div class='add'>+#define I801_WORD_DATA          0x0C</div><div class='add'>+#define I801_PROC_CALL          0x10    /* unimplemented */</div><div class='add'>+#define I801_BLOCK_DATA         0x14</div><div class='add'>+#define I801_I2C_BLOCK_DATA     0x18    /* ICH5 and later */</div><div class='add'>+#define I801_BLOCK_LAST         0x34</div><div class='add'>+#define I801_I2C_BLOCK_LAST     0x38    /* ICH5 and later */</div><div class='add'>+#define I801_START              0x40</div><div class='add'>+#define I801_PEC_EN             0x80    /* ICH3 and later */</div><div class='add'>+</div><div class='add'>+/* I801 Hosts Status register bits */</div><div class='add'>+#define SMBHSTSTS_BYTE_DONE     0x80</div><div class='add'>+#define SMBHSTSTS_INUSE_STS     0x40</div><div class='add'>+#define SMBHSTSTS_SMBALERT_STS  0x20</div><div class='add'>+#define SMBHSTSTS_FAILED        0x10</div><div class='add'>+#define SMBHSTSTS_BUS_ERR       0x08</div><div class='add'>+#define SMBHSTSTS_DEV_ERR       0x04</div><div class='add'>+#define SMBHSTSTS_INTR          0x02</div><div class='add'>+#define SMBHSTSTS_HOST_BUSY     0x01</div><div class='add'>+</div><div class='add'>+#define STATUS_FLAGS        (SMBHSTSTS_BYTE_DONE | SMBHSTSTS_FAILED | SMBHSTSTS_BUS_ERR | SMBHSTSTS_DEV_ERR | SMBHSTSTS_INTR)</div><div class='add'>+</div><div class='add'>+/* Older devices have their ID defined in &lt;linux/pci_ids.h&gt; */</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS       0x1c22</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS          0x1d22</div><div class='add'>+/* Patsburg also has three 'Integrated Device Function' SMBus controllers */</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0     0x1d70</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1     0x1d71</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2     0x1d72</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS      0x1e22</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS          0x2330</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS     0x3b30</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS         0x8c22</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS      0x9c22</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define FEATURE_SMBUS_PEC       (1 &lt;&lt; 0)</div><div class='add'>+#define FEATURE_BLOCK_BUFFER    (1 &lt;&lt; 1)</div><div class='add'>+#define FEATURE_BLOCK_PROC      (1 &lt;&lt; 2)</div><div class='add'>+#define FEATURE_I2C_BLOCK_READ  (1 &lt;&lt; 3)</div><div class='add'>+/* Not really a feature, but it's convenient to handle it as such */</div><div class='add'>+#define FEATURE_IDF             (1 &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+static unsigned int disable_features;</div><div class='add'>+module_param(disable_features, uint, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(disable_features, "Disable selected driver features");</div><div class='add'>+</div><div class='add'>+// FIXME!</div><div class='add'>+#undef inb_p</div><div class='add'>+#define inb_p(a) readq((void*)a)</div><div class='add'>+#undef outb_p</div><div class='add'>+#define outb_p(d,a) writeq(d,(void*)a)</div><div class='add'>+</div><div class='add'>+/* Make sure the SMBus host is ready to start transmitting.</div><div class='add'>+   Return 0 if it is, -EBUSY if it is not. */</div><div class='add'>+static int i801_check_pre(struct i2c_device *priv)</div><div class='add'>+{</div><div class='add'>+    int status;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_check_pre\n");</div><div class='add'>+    </div><div class='add'>+    status = inb_p(SMBHSTSTS(priv));</div><div class='add'>+    if (status &amp; SMBHSTSTS_HOST_BUSY) {</div><div class='add'>+        dev_err(&amp;priv-&gt;adapter.dev, "SMBus is busy, can't use it! (status=%x)\n", status);</div><div class='add'>+        return -EBUSY;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    status &amp;= STATUS_FLAGS;</div><div class='add'>+    if (status) {</div><div class='add'>+        //dev_dbg(&amp;priv-&gt;adapter.dev, "Clearing status flags (%02x)\n", status);</div><div class='add'>+        outb_p(status, SMBHSTSTS(priv));</div><div class='add'>+        status = inb_p(SMBHSTSTS(priv)) &amp; STATUS_FLAGS;</div><div class='add'>+        if (status) {</div><div class='add'>+          dev_err(&amp;priv-&gt;adapter.dev, "Failed clearing status flags (%02x)\n", status);</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'>+/* Convert the status register to an error code, and clear it. */</div><div class='add'>+static int i801_check_post(struct i2c_device *priv, int status, int timeout)</div><div class='add'>+{</div><div class='add'>+    int result = 0;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_check_post\n");</div><div class='add'>+    </div><div class='add'>+    /* If the SMBus is still busy, we give up */</div><div class='add'>+    if (timeout) {</div><div class='add'>+        dev_err(&amp;priv-&gt;adapter.dev, "Transaction timeout\n");</div><div class='add'>+        /* try to stop the current command */</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "Terminating the current operation\n");</div><div class='add'>+        outb_p(inb_p(SMBHSTCNT(priv)) | SMBHSTCNT_KILL, SMBHSTCNT(priv));</div><div class='add'>+        usleep_range(1000, 2000);</div><div class='add'>+        outb_p(inb_p(SMBHSTCNT(priv)) &amp; (~SMBHSTCNT_KILL), SMBHSTCNT(priv));</div><div class='add'>+        </div><div class='add'>+        /* Check if it worked */</div><div class='add'>+        status = inb_p(SMBHSTSTS(priv));</div><div class='add'>+        if ((status &amp; SMBHSTSTS_HOST_BUSY) || !(status &amp; SMBHSTSTS_FAILED)) {</div><div class='add'>+            dev_err(&amp;priv-&gt;adapter.dev, "Failed terminating the transaction\n");</div><div class='add'>+        }</div><div class='add'>+        outb_p(STATUS_FLAGS, SMBHSTSTS(priv));</div><div class='add'>+        return -ETIMEDOUT;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (status &amp; SMBHSTSTS_FAILED) {</div><div class='add'>+        result = -EIO;</div><div class='add'>+        dev_err(&amp;priv-&gt;adapter.dev, "Transaction failed\n");</div><div class='add'>+    }</div><div class='add'>+    if (status &amp; SMBHSTSTS_DEV_ERR) {</div><div class='add'>+        result = -ENXIO;</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "No response\n");</div><div class='add'>+    }</div><div class='add'>+    if (status &amp; SMBHSTSTS_BUS_ERR) {</div><div class='add'>+        result = -EAGAIN;</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "Lost arbitration\n");</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (result) {</div><div class='add'>+        /* Clear error flags */</div><div class='add'>+        outb_p(status &amp; STATUS_FLAGS, SMBHSTSTS(priv));</div><div class='add'>+        status = inb_p(SMBHSTSTS(priv)) &amp; STATUS_FLAGS;</div><div class='add'>+        if (status) {</div><div class='add'>+            dev_warn(&amp;priv-&gt;adapter.dev, "Failed clearing status flags at end of transaction (%02x)\n", status);</div><div class='add'>+        }</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 int i801_transaction(struct i2c_device *priv, int xact)</div><div class='add'>+{</div><div class='add'>+    int status;</div><div class='add'>+    int result;</div><div class='add'>+    int timeout = 0;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_transaction\n");</div><div class='add'>+    </div><div class='add'>+    result = i801_check_pre(priv);</div><div class='add'>+    if (result &lt; 0) {</div><div class='add'>+        return result;</div><div class='add'>+    }</div><div class='add'>+    /* the current contents of SMBHSTCNT can be overwritten, since PEC,</div><div class='add'>+    * INTREN, SMBSCMD are passed in xact */</div><div class='add'>+    outb_p(xact | I801_START, SMBHSTCNT(priv));</div><div class='add'>+    </div><div class='add'>+    /* We will always wait for a fraction of a second! */</div><div class='add'>+    do {</div><div class='add'>+        usleep_range(250, 500);</div><div class='add'>+        status = inb_p(SMBHSTSTS(priv));</div><div class='add'>+    } while ((status &amp; SMBHSTSTS_HOST_BUSY) &amp;&amp; (timeout++ &lt; MAX_RETRIES));</div><div class='add'>+    </div><div class='add'>+    result = i801_check_post(priv, status, timeout &gt; MAX_RETRIES);</div><div class='add'>+    if (result &lt; 0) {</div><div class='add'>+        return result;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    outb_p(SMBHSTSTS_INTR, SMBHSTSTS(priv));</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* wait for INTR bit as advised by Intel */</div><div class='add'>+static void i801_wait_hwpec(struct i2c_device *priv)</div><div class='add'>+{</div><div class='add'>+    int timeout = 0;</div><div class='add'>+    int status;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_wait_hwpec\n");</div><div class='add'>+    </div><div class='add'>+    do {</div><div class='add'>+        usleep_range(250, 500);</div><div class='add'>+        status = inb_p(SMBHSTSTS(priv));</div><div class='add'>+    } while ((!(status &amp; SMBHSTSTS_INTR)) &amp;&amp; (timeout++ &lt; MAX_RETRIES));</div><div class='add'>+    </div><div class='add'>+    if (timeout &gt; MAX_RETRIES) {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "PEC Timeout!\n");</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    outb_p(status, SMBHSTSTS(priv));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i801_block_transaction_by_block(struct i2c_device *priv, union i2c_smbus_data *data, char read_write, int hwpec)</div><div class='add'>+{</div><div class='add'>+    int i, len;</div><div class='add'>+    int status;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_block_transaction_by_block\n");</div><div class='add'>+    </div><div class='add'>+    inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */</div><div class='add'>+    </div><div class='add'>+    /* Use 32-byte buffer to process this transaction */</div><div class='add'>+    if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+        len = data-&gt;block[0];</div><div class='add'>+        outb_p(len, SMBHSTDAT0(priv));</div><div class='add'>+        for (i = 0; i &lt; len; i++) {</div><div class='add'>+            outb_p(data-&gt;block[i+1], SMBBLKDAT(priv));</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    status = i801_transaction(priv, I801_BLOCK_DATA | ENABLE_INT9 | I801_PEC_EN * hwpec);</div><div class='add'>+    if (status) {</div><div class='add'>+        return status;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (read_write == I2C_SMBUS_READ) {</div><div class='add'>+        len = inb_p(SMBHSTDAT0(priv));</div><div class='add'>+        if (len &lt; 1 || len &gt; I2C_SMBUS_BLOCK_MAX) {</div><div class='add'>+            return -EPROTO;</div><div class='add'>+        }</div><div class='add'>+        </div><div class='add'>+        data-&gt;block[0] = len;</div><div class='add'>+        for (i = 0; i &lt; len; i++) {</div><div class='add'>+            data-&gt;block[i + 1] = inb_p(SMBBLKDAT(priv));</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 i801_block_transaction_byte_by_byte(struct i2c_device *priv, union i2c_smbus_data *data, char read_write, int command, int hwpec)</div><div class='add'>+{</div><div class='add'>+    int i, len;</div><div class='add'>+    int smbcmd;</div><div class='add'>+    int status;</div><div class='add'>+    int result;</div><div class='add'>+    int timeout;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_block_transaction_byte_by_byte\n");</div><div class='add'>+    </div><div class='add'>+    result = i801_check_pre(priv);</div><div class='add'>+    if (result &lt; 0) {</div><div class='add'>+        return result;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    len = data-&gt;block[0];</div><div class='add'>+    </div><div class='add'>+    if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+        outb_p(len, SMBHSTDAT0(priv));</div><div class='add'>+        outb_p(data-&gt;block[1], SMBBLKDAT(priv));</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    for (i = 1; i &lt;= len; i++) {</div><div class='add'>+        if (i == len &amp;&amp; read_write == I2C_SMBUS_READ) {</div><div class='add'>+            if (command == I2C_SMBUS_I2C_BLOCK_DATA) {</div><div class='add'>+                smbcmd = I801_I2C_BLOCK_LAST;</div><div class='add'>+            } else {</div><div class='add'>+                smbcmd = I801_BLOCK_LAST;</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            if (command == I2C_SMBUS_I2C_BLOCK_DATA &amp;&amp; read_write == I2C_SMBUS_READ) {</div><div class='add'>+                smbcmd = I801_I2C_BLOCK_DATA;</div><div class='add'>+            } else {</div><div class='add'>+                smbcmd = I801_BLOCK_DATA;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        outb_p(smbcmd | ENABLE_INT9, SMBHSTCNT(priv));</div><div class='add'>+        </div><div class='add'>+        if (i == 1) {</div><div class='add'>+            outb_p(inb(SMBHSTCNT(priv)) | I801_START, SMBHSTCNT(priv));</div><div class='add'>+        }</div><div class='add'>+        /* We will always wait for a fraction of a second! */</div><div class='add'>+        timeout = 0;</div><div class='add'>+        do {</div><div class='add'>+            usleep_range(250, 500);</div><div class='add'>+            status = inb_p(SMBHSTSTS(priv));</div><div class='add'>+        } while ((!(status &amp; SMBHSTSTS_BYTE_DONE)) &amp;&amp; (timeout++ &lt; MAX_RETRIES));</div><div class='add'>+        </div><div class='add'>+        result = i801_check_post(priv, status, timeout &gt; MAX_RETRIES);</div><div class='add'>+        if (result &lt; 0) {</div><div class='add'>+            return result;</div><div class='add'>+        }</div><div class='add'>+        if (i == 1 &amp;&amp; read_write == I2C_SMBUS_READ &amp;&amp; command != I2C_SMBUS_I2C_BLOCK_DATA) {</div><div class='add'>+            len = inb_p(SMBHSTDAT0(priv));</div><div class='add'>+            if (len &lt; 1 || len &gt; I2C_SMBUS_BLOCK_MAX) {</div><div class='add'>+                dev_err(&amp;priv-&gt;adapter.dev, "Illegal SMBus block read size %d\n", len);</div><div class='add'>+                /* Recover */</div><div class='add'>+                while (inb_p(SMBHSTSTS(priv)) &amp; SMBHSTSTS_HOST_BUSY) {</div><div class='add'>+                    outb_p(SMBHSTSTS_BYTE_DONE, SMBHSTSTS(priv));</div><div class='add'>+                }</div><div class='add'>+                outb_p(SMBHSTSTS_INTR, SMBHSTSTS(priv));</div><div class='add'>+                return -EPROTO;</div><div class='add'>+            }</div><div class='add'>+            data-&gt;block[0] = len;</div><div class='add'>+        }</div><div class='add'>+        </div><div class='add'>+        /* Retrieve/store value in SMBBLKDAT */</div><div class='add'>+        if (read_write == I2C_SMBUS_READ) {</div><div class='add'>+            data-&gt;block[i] = inb_p(SMBBLKDAT(priv));</div><div class='add'>+        }</div><div class='add'>+        if (read_write == I2C_SMBUS_WRITE &amp;&amp; i+1 &lt;= len) {</div><div class='add'>+            outb_p(data-&gt;block[i+1], SMBBLKDAT(priv));</div><div class='add'>+        }</div><div class='add'>+        /* signals SMBBLKDAT ready */</div><div class='add'>+        outb_p(SMBHSTSTS_BYTE_DONE | SMBHSTSTS_INTR, SMBHSTSTS(priv));</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 i801_set_block_buffer_mode(struct i2c_device *priv)</div><div class='add'>+{</div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_set_block_buffer_mode\n");</div><div class='add'>+    </div><div class='add'>+    outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_E32B, SMBAUXCTL(priv));</div><div class='add'>+    if ((inb_p(SMBAUXCTL(priv)) &amp; SMBAUXCTL_E32B) == 0) {</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'>+/* Block transaction function */</div><div class='add'>+static int i801_block_transaction(struct i2c_device *priv, union i2c_smbus_data *data, char read_write, int command, int hwpec)</div><div class='add'>+{</div><div class='add'>+    int result = 0;</div><div class='add'>+    //unsigned char hostc;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_block_transaction\n");</div><div class='add'>+    </div><div class='add'>+    if (command == I2C_SMBUS_I2C_BLOCK_DATA) {</div><div class='add'>+        if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+            /* set I2C_EN bit in configuration register */</div><div class='add'>+            //TODO: Figure out the right thing to do here...</div><div class='add'>+            //pci_read_config_byte(priv-&gt;pci_dev, SMBHSTCFG, &amp;hostc);</div><div class='add'>+            //pci_write_config_byte(priv-&gt;pci_dev, SMBHSTCFG, hostc | SMBHSTCFG_I2C_EN);</div><div class='add'>+        } else if (!(priv-&gt;features &amp; FEATURE_I2C_BLOCK_READ)) {</div><div class='add'>+            dev_err(&amp;priv-&gt;adapter.dev, "I2C block read is unsupported!\n");</div><div class='add'>+            return -EOPNOTSUPP;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (read_write == I2C_SMBUS_WRITE || command == I2C_SMBUS_I2C_BLOCK_DATA) {</div><div class='add'>+        if (data-&gt;block[0] &lt; 1) {</div><div class='add'>+            data-&gt;block[0] = 1;</div><div class='add'>+        }</div><div class='add'>+        if (data-&gt;block[0] &gt; I2C_SMBUS_BLOCK_MAX) {</div><div class='add'>+            data-&gt;block[0] = I2C_SMBUS_BLOCK_MAX;</div><div class='add'>+        }</div><div class='add'>+    } else {</div><div class='add'>+        data-&gt;block[0] = 32;	/* max for SMBus block reads */</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* Experience has shown that the block buffer can only be used for</div><div class='add'>+        SMBus (not I2C) block transactions, even though the datasheet</div><div class='add'>+        doesn't mention this limitation. */</div><div class='add'>+    if ((priv-&gt;features &amp; FEATURE_BLOCK_BUFFER) &amp;&amp; command != I2C_SMBUS_I2C_BLOCK_DATA &amp;&amp; i801_set_block_buffer_mode(priv) == 0) {</div><div class='add'>+        result = i801_block_transaction_by_block(priv, data, read_write, hwpec);</div><div class='add'>+    } else {</div><div class='add'>+        result = i801_block_transaction_byte_by_byte(priv, data, read_write, command, hwpec);</div><div class='add'>+    }  </div><div class='add'>+    if (result == 0 &amp;&amp; hwpec) {</div><div class='add'>+        i801_wait_hwpec(priv);</div><div class='add'>+    }</div><div class='add'>+    if (command == I2C_SMBUS_I2C_BLOCK_DATA &amp;&amp; read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+        /* restore saved configuration register value */</div><div class='add'>+        //TODO: Figure out the right thing to do here...</div><div class='add'>+        //pci_write_config_byte(priv-&gt;pci_dev, SMBHSTCFG, hostc);</div><div class='add'>+    }</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return negative errno on error. */</div><div class='add'>+static s32 i801_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, u8 command, int size, union i2c_smbus_data *data)</div><div class='add'>+{</div><div class='add'>+    int hwpec;</div><div class='add'>+    int block = 0;</div><div class='add'>+    int ret, xact = 0;</div><div class='add'>+    struct i2c_device *priv = i2c_get_adapdata(adap);</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;priv-&gt;adapter.dev, "i801_access (addr=%0d)  flags=%x  read_write=%x  command=%x  size=%x",</div><div class='add'>+      addr, flags, read_write, command, size );</div><div class='add'>+    </div><div class='add'>+    hwpec = (priv-&gt;features &amp; FEATURE_SMBUS_PEC) &amp;&amp; (flags &amp; I2C_CLIENT_PEC) &amp;&amp; size != I2C_SMBUS_QUICK &amp;&amp; size != I2C_SMBUS_I2C_BLOCK_DATA;</div><div class='add'>+    </div><div class='add'>+    switch (size) {</div><div class='add'>+        case I2C_SMBUS_QUICK:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] SMBUS_QUICK\n");</div><div class='add'>+            outb_p(((addr &amp; 0x7f) &lt;&lt; 1) | (read_write &amp; 0x01), SMBHSTADD(priv));</div><div class='add'>+            xact = I801_QUICK;</div><div class='add'>+            break;</div><div class='add'>+        case I2C_SMBUS_BYTE:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] SMBUS_BYTE\n");</div><div class='add'>+            </div><div class='add'>+            outb_p(((addr &amp; 0x7f) &lt;&lt; 1) | (read_write &amp; 0x01), SMBHSTADD(priv));</div><div class='add'>+            if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+                outb_p(command, SMBHSTCMD(priv));</div><div class='add'>+            }</div><div class='add'>+            xact = I801_BYTE;</div><div class='add'>+            break;</div><div class='add'>+        case I2C_SMBUS_BYTE_DATA:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] SMBUS_BYTE_DATA\n");</div><div class='add'>+            outb_p(((addr &amp; 0x7f) &lt;&lt; 1) | (read_write &amp; 0x01), SMBHSTADD(priv));</div><div class='add'>+            outb_p(command, SMBHSTCMD(priv));</div><div class='add'>+            if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+                outb_p(data-&gt;byte, SMBHSTDAT0(priv));</div><div class='add'>+            }</div><div class='add'>+            xact = I801_BYTE_DATA;</div><div class='add'>+            break;</div><div class='add'>+        case I2C_SMBUS_WORD_DATA:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] SMBUS_WORD_DATA\n");</div><div class='add'>+            outb_p(((addr &amp; 0x7f) &lt;&lt; 1) | (read_write &amp; 0x01), SMBHSTADD(priv));</div><div class='add'>+            outb_p(command, SMBHSTCMD(priv));</div><div class='add'>+            if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+                outb_p(data-&gt;word &amp; 0xff, SMBHSTDAT0(priv));</div><div class='add'>+                outb_p((data-&gt;word &amp; 0xff00) &gt;&gt; 8, SMBHSTDAT1(priv));</div><div class='add'>+            }</div><div class='add'>+            xact = I801_WORD_DATA;</div><div class='add'>+            break;</div><div class='add'>+        case I2C_SMBUS_BLOCK_DATA:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] SMBUS_BLOCK_DATA\n");</div><div class='add'>+            outb_p(((addr &amp; 0x7f) &lt;&lt; 1) | (read_write &amp; 0x01), SMBHSTADD(priv));</div><div class='add'>+            outb_p(command, SMBHSTCMD(priv));</div><div class='add'>+            block = 1;</div><div class='add'>+            break;</div><div class='add'>+        case I2C_SMBUS_I2C_BLOCK_DATA:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] SMBUS_I2C_BLOCK_DATA\n");</div><div class='add'>+            /* NB: page 240 of ICH5 datasheet shows that the R/#W</div><div class='add'>+             * bit should be cleared here, even when reading */</div><div class='add'>+            outb_p((addr &amp; 0x7f) &lt;&lt; 1, SMBHSTADD(priv));</div><div class='add'>+            if (read_write == I2C_SMBUS_READ) {</div><div class='add'>+                /* NB: page 240 of ICH5 datasheet also shows</div><div class='add'>+                 * that DATA1 is the cmd field when reading */</div><div class='add'>+                outb_p(command, SMBHSTDAT1(priv));</div><div class='add'>+            } else {</div><div class='add'>+                outb_p(command, SMBHSTCMD(priv));</div><div class='add'>+            }</div><div class='add'>+            block = 1;</div><div class='add'>+            break;</div><div class='add'>+        default:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] Unsupported transaction %d\n", size);</div><div class='add'>+            return -EOPNOTSUPP;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (hwpec) { /* enable/disable hardware PEC */</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] hwpec: yes\n");</div><div class='add'>+        outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_CRC, SMBAUXCTL(priv));</div><div class='add'>+    } else {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] hwpec: no\n");</div><div class='add'>+        outb_p(inb_p(SMBAUXCTL(priv)) &amp; (~SMBAUXCTL_CRC), SMBAUXCTL(priv));</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (block) {</div><div class='add'>+        //ret = 0;</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] block: yes\n");</div><div class='add'>+        ret = i801_block_transaction(priv, data, read_write, size, hwpec);</div><div class='add'>+    } else {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] block: no\n");</div><div class='add'>+        ret = i801_transaction(priv, xact | ENABLE_INT9);</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* Some BIOSes don't like it when PEC is enabled at reboot or resume</div><div class='add'>+       time, so we forcibly disable it after every transaction. Turn off</div><div class='add'>+       E32B for the same reason. */</div><div class='add'>+    if (hwpec || block) {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] hwpec || block\n");</div><div class='add'>+        outb_p(inb_p(SMBAUXCTL(priv)) &amp; ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));</div><div class='add'>+    }</div><div class='add'>+    if (block) {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] block\n");</div><div class='add'>+        return ret;</div><div class='add'>+    }</div><div class='add'>+    if (ret) {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] ret %d\n", ret);</div><div class='add'>+        return ret;</div><div class='add'>+    }</div><div class='add'>+    if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK)) {</div><div class='add'>+        dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] I2C_SMBUS_WRITE || I801_QUICK  -&gt; ret 0\n");</div><div class='add'>+        return 0;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    switch (xact &amp; 0x7f) {</div><div class='add'>+        case I801_BYTE:  /* Result put in SMBHSTDAT0 */</div><div class='add'>+        case I801_BYTE_DATA:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] I801_BYTE or I801_BYTE_DATA\n");</div><div class='add'>+            data-&gt;byte = inb_p(SMBHSTDAT0(priv));</div><div class='add'>+            break;</div><div class='add'>+        case I801_WORD_DATA:</div><div class='add'>+            dev_dbg(&amp;priv-&gt;adapter.dev, "  [acc] I801_WORD_DATA\n");</div><div class='add'>+            data-&gt;word = inb_p(SMBHSTDAT0(priv)) + (inb_p(SMBHSTDAT1(priv)) &lt;&lt; 8);</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'>+</div><div class='add'>+</div><div class='add'>+static u32 i801_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+    struct i2c_device *priv = i2c_get_adapdata(adapter);</div><div class='add'>+    </div><div class='add'>+    /* original settings</div><div class='add'>+    u32 f = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |</div><div class='add'>+      I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |</div><div class='add'>+      I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK |</div><div class='add'>+      ((priv-&gt;features &amp; FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) |</div><div class='add'>+      ((priv-&gt;features &amp; FEATURE_I2C_BLOCK_READ) ?</div><div class='add'>+       I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0);</div><div class='add'>+     */</div><div class='add'>+    </div><div class='add'>+    // http://lxr.free-electrons.com/source/include/uapi/linux/i2c.h#L85</div><div class='add'>+    </div><div class='add'>+    u32 f = </div><div class='add'>+        I2C_FUNC_I2C                     | /* 0x00000001 (I enabled this one) */</div><div class='add'>+        !I2C_FUNC_10BIT_ADDR             | /* 0x00000002 */</div><div class='add'>+        !I2C_FUNC_PROTOCOL_MANGLING      | /* 0x00000004 */</div><div class='add'>+        ((priv-&gt;features &amp; FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) | /* 0x00000008 */</div><div class='add'>+        !I2C_FUNC_SMBUS_BLOCK_PROC_CALL  | /* 0x00008000 */</div><div class='add'>+        I2C_FUNC_SMBUS_QUICK             | /* 0x00010000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_READ_BYTE        | /* 0x00020000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_WRITE_BYTE       | /* 0x00040000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_READ_BYTE_DATA   | /* 0x00080000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_WRITE_BYTE_DATA  | /* 0x00100000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_READ_WORD_DATA   | /* 0x00200000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_WRITE_WORD_DATA  | /* 0x00400000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_PROC_CALL        | /* 0x00800000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_READ_BLOCK_DATA  | /* 0x01000000 */</div><div class='add'>+        !I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | /* 0x02000000 */</div><div class='add'>+        ((priv-&gt;features &amp; FEATURE_I2C_BLOCK_READ) ? I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0) | /* 0x04000000 */</div><div class='add'>+        I2C_FUNC_SMBUS_WRITE_I2C_BLOCK   | /* 0x08000000 */</div><div class='add'>+        </div><div class='add'>+        I2C_FUNC_SMBUS_BYTE              | /* _READ_BYTE  _WRITE_BYTE */</div><div class='add'>+        I2C_FUNC_SMBUS_BYTE_DATA         | /* _READ_BYTE_DATA  _WRITE_BYTE_DATA */</div><div class='add'>+        I2C_FUNC_SMBUS_WORD_DATA         | /* _READ_WORD_DATA  _WRITE_WORD_DATA */</div><div class='add'>+        I2C_FUNC_SMBUS_BLOCK_DATA        | /* _READ_BLOCK_DATA  _WRITE_BLOCK_DATA */</div><div class='add'>+        !I2C_FUNC_SMBUS_I2C_BLOCK        | /* _READ_I2C_BLOCK  _WRITE_I2C_BLOCK */</div><div class='add'>+        !I2C_FUNC_SMBUS_EMUL;              /* _QUICK  _BYTE  _BYTE_DATA  _WORD_DATA  _PROC_CALL  _WRITE_BLOCK_DATA  _I2C_BLOCK _PEC */</div><div class='add'>+    return f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_algorithm smbus_algorithm = {</div><div class='add'>+    .smbus_xfer     = i801_access,</div><div class='add'>+    .functionality  = i801_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/********************************</div><div class='add'>+ *** Part 2 - Driver Handlers ***</div><div class='add'>+ ********************************/</div><div class='add'>+int pi2c_probe(struct platform_device *pldev)</div><div class='add'>+{</div><div class='add'>+    int err;</div><div class='add'>+    struct i2c_device *priv;</div><div class='add'>+    struct resource *res;</div><div class='add'>+    </div><div class='add'>+    dev_dbg(&amp;pldev-&gt;dev, "pi2c_probe(pldev = %p '%s')\n", pldev, pldev-&gt;name);</div><div class='add'>+    </div><div class='add'>+    priv = kzalloc(sizeof(struct i2c_device), GFP_KERNEL);</div><div class='add'>+    if (!priv) {</div><div class='add'>+        return -ENOMEM;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    i2c_set_adapdata(&amp;priv-&gt;adapter, priv);</div><div class='add'>+    priv-&gt;adapter.owner = THIS_MODULE;</div><div class='add'>+    priv-&gt;adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;</div><div class='add'>+    priv-&gt;adapter.algo = &amp;smbus_algorithm;</div><div class='add'>+    </div><div class='add'>+    res = platform_get_resource(pldev, IORESOURCE_MEM, 0);</div><div class='add'>+    priv-&gt;smba = (unsigned long)ioremap_nocache(res-&gt;start, resource_size(res));</div><div class='add'>+    </div><div class='add'>+    priv-&gt;pldev = pldev;</div><div class='add'>+    pldev-&gt;dev.platform_data = priv;</div><div class='add'>+    </div><div class='add'>+    priv-&gt;features |= FEATURE_IDF;</div><div class='add'>+    priv-&gt;features |= FEATURE_I2C_BLOCK_READ;</div><div class='add'>+    priv-&gt;features |= FEATURE_SMBUS_PEC;</div><div class='add'>+    priv-&gt;features |= FEATURE_BLOCK_BUFFER;</div><div class='add'>+    </div><div class='add'>+    //init_MUTEX(&amp;lddata-&gt;sem);</div><div class='add'>+    init_rwsem(&amp;priv-&gt;rw_sem);</div><div class='add'>+    </div><div class='add'>+    /* set up the sysfs linkage to our parent device */</div><div class='add'>+    priv-&gt;adapter.dev.parent = &amp;pldev-&gt;dev;</div><div class='add'>+    </div><div class='add'>+    /* Retry up to 3 times on lost arbitration */</div><div class='add'>+    priv-&gt;adapter.retries = 3;</div><div class='add'>+    </div><div class='add'>+    //snprintf(priv-&gt;adapter.name, sizeof(priv-&gt;adapter.name), "Fake SMBus I801 adapter at %04lx", priv-&gt;smba);</div><div class='add'>+    snprintf(priv-&gt;adapter.name, sizeof(priv-&gt;adapter.name), "Fake SMBus I801 adapter");</div><div class='add'>+    </div><div class='add'>+    err = i2c_add_adapter(&amp;priv-&gt;adapter);</div><div class='add'>+    if (err) {</div><div class='add'>+        dev_err(&amp;priv-&gt;adapter.dev, "Failed to add SMBus adapter\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'>+int pi2c_remove(struct platform_device *pldev)</div><div class='add'>+{</div><div class='add'>+    struct i2c_device *lddev;</div><div class='add'>+    dev_dbg(&amp;pldev-&gt;dev, "pi2c_remove(pldev = %p '%s')\n", pldev, pldev-&gt;name);</div><div class='add'>+    </div><div class='add'>+    lddev = (struct i2c_device *)pldev-&gt;dev.platform_data;</div><div class='add'>+    </div><div class='add'>+    i2c_del_adapter(&amp;lddev-&gt;adapter);</div><div class='add'>+    </div><div class='add'>+    //TODO: Figure out the right thing to do here...</div><div class='add'>+    //pci_write_config_byte(dev, SMBHSTCFG, priv-&gt;original_hstcfg);</div><div class='add'>+    //pci_release_region(dev, SMBBAR);</div><div class='add'>+    //pci_set_drvdata(dev, NULL);</div><div class='add'>+    </div><div class='add'>+    //cdev_del(&amp;lddev-&gt;cdev);</div><div class='add'>+    if(lddev != 0) {</div><div class='add'>+        kfree(lddev);</div><div class='add'>+        pldev-&gt;dev.platform_data = 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'>+struct platform_driver i2c_plat_driver_i = {</div><div class='add'>+    .probe      = pi2c_probe,</div><div class='add'>+    .remove     = pi2c_remove,</div><div class='add'>+    .driver     = {</div><div class='add'>+        .name   = KP_DRIVER_NAME_I2C,</div><div class='add'>+        .owner  = THIS_MODULE,</div><div class='add'>+    },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(i2c_plat_driver_i);</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_spi/Makefile b/drivers/staging/kpc2000/kpc_spi/Makefile<br/>new file mode 100644<br/>index 000000000000..3018d200484f<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_spi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_spi/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-m += kpc2000_spi.o</div><div class='add'>+kpc2000_spi-objs := spi_driver.o</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_spi/spi_driver.c b/drivers/staging/kpc2000/kpc_spi/spi_driver.c<br/>new file mode 100644<br/>index 000000000000..86df16547a92<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_spi/spi_driver.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_spi/spi_driver.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'>+ * KP2000 SPI controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014-2018 Daktronics</div><div class='add'>+ * Author: Matt Sickler &lt;matt.sickler@daktronics.com&gt;</div><div class='add'>+ * Very loosely based on spi-omap2-mcspi.c</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/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.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/delay.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/err.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/slab.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.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/gcd.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../kpc.h"</div><div class='add'>+#include "spi_parts.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/***************</div><div class='add'>+ * SPI Defines *</div><div class='add'>+ ***************/</div><div class='add'>+#define KP_SPI_REG_CONFIG 0x0 /* 0x00 */</div><div class='add'>+#define KP_SPI_REG_STATUS 0x1 /* 0x08 */</div><div class='add'>+#define KP_SPI_REG_FFCTRL 0x2 /* 0x10 */</div><div class='add'>+#define KP_SPI_REG_TXDATA 0x3 /* 0x18 */</div><div class='add'>+#define KP_SPI_REG_RXDATA 0x4 /* 0x20 */</div><div class='add'>+</div><div class='add'>+#define KP_SPI_CLK           48000000</div><div class='add'>+#define KP_SPI_MAX_FIFODEPTH 64</div><div class='add'>+#define KP_SPI_MAX_FIFOWCNT  0xFFFF</div><div class='add'>+</div><div class='add'>+#define KP_SPI_REG_CONFIG_TRM_TXRX 0</div><div class='add'>+#define KP_SPI_REG_CONFIG_TRM_RX   1</div><div class='add'>+#define KP_SPI_REG_CONFIG_TRM_TX   2</div><div class='add'>+</div><div class='add'>+#define KP_SPI_REG_STATUS_RXS   0x01</div><div class='add'>+#define KP_SPI_REG_STATUS_TXS   0x02</div><div class='add'>+#define KP_SPI_REG_STATUS_EOT   0x04</div><div class='add'>+#define KP_SPI_REG_STATUS_TXFFE 0x10</div><div class='add'>+#define KP_SPI_REG_STATUS_TXFFF 0x20</div><div class='add'>+#define KP_SPI_REG_STATUS_RXFFE 0x40</div><div class='add'>+#define KP_SPI_REG_STATUS_RXFFF 0x80</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************</div><div class='add'>+ * SPI Structures *</div><div class='add'>+ ******************/</div><div class='add'>+struct kp_spi {</div><div class='add'>+	struct spi_master  *master;</div><div class='add'>+	u64 __iomem        *base;</div><div class='add'>+	unsigned long       phys;</div><div class='add'>+	struct device      *dev;</div><div class='add'>+	int                 fifo_depth;</div><div class='add'>+	unsigned int        pin_dir:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct kp_spi_controller_state {</div><div class='add'>+    void __iomem   *base;</div><div class='add'>+    unsigned long   phys;</div><div class='add'>+    unsigned char   chip_select;</div><div class='add'>+    int             word_len;</div><div class='add'>+    s64             conf_cache;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+union kp_spi_config {</div><div class='add'>+    /* use this to access individual elements */</div><div class='add'>+    struct __attribute__((packed)) spi_config_bitfield {</div><div class='add'>+        unsigned int pha       : 1; /* spim_clk Phase      */</div><div class='add'>+        unsigned int pol       : 1; /* spim_clk Polarity   */</div><div class='add'>+        unsigned int epol      : 1; /* spim_csx Polarity   */</div><div class='add'>+        unsigned int dpe       : 1; /* Transmission Enable */</div><div class='add'>+        unsigned int wl        : 5; /* Word Length         */</div><div class='add'>+        unsigned int           : 3;</div><div class='add'>+        unsigned int trm       : 2; /* TxRx Mode           */</div><div class='add'>+        unsigned int cs        : 4; /* Chip Select         */</div><div class='add'>+        unsigned int wcnt      : 7; /* Word Count          */</div><div class='add'>+        unsigned int ffen      : 1; /* FIFO Enable         */</div><div class='add'>+        unsigned int spi_en    : 1; /* SPI Enable          */</div><div class='add'>+        unsigned int           : 5;</div><div class='add'>+    } bitfield;</div><div class='add'>+    /* use this to grab the whole register */</div><div class='add'>+    u32 reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+union kp_spi_status {</div><div class='add'>+    struct __attribute__((packed)) spi_status_bitfield {</div><div class='add'>+        unsigned int rx    :  1; /* Rx Status       */</div><div class='add'>+        unsigned int tx    :  1; /* Tx Status       */</div><div class='add'>+        unsigned int eo    :  1; /* End of Transfer */</div><div class='add'>+        unsigned int       :  1;</div><div class='add'>+        unsigned int txffe :  1; /* Tx FIFO Empty   */</div><div class='add'>+        unsigned int txfff :  1; /* Tx FIFO Full    */</div><div class='add'>+        unsigned int rxffe :  1; /* Rx FIFO Empty   */</div><div class='add'>+        unsigned int rxfff :  1; /* Rx FIFO Full    */</div><div class='add'>+        unsigned int       : 24;</div><div class='add'>+    } bitfield;</div><div class='add'>+    u32 reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+union kp_spi_ffctrl {</div><div class='add'>+    struct __attribute__((packed)) spi_ffctrl_bitfield {</div><div class='add'>+        unsigned int ffstart :  1; /* FIFO Start */</div><div class='add'>+        unsigned int         : 31;</div><div class='add'>+    } bitfield;</div><div class='add'>+    u32 reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/***************</div><div class='add'>+ * SPI Helpers *</div><div class='add'>+ ***************/</div><div class='add'>+static inline int</div><div class='add'>+kp_spi_bytes_per_word(int word_len)</div><div class='add'>+{</div><div class='add'>+    if (word_len &lt;= 8){</div><div class='add'>+        return 1;</div><div class='add'>+    }</div><div class='add'>+    else if (word_len &lt;= 16) {</div><div class='add'>+        return 2;</div><div class='add'>+    }</div><div class='add'>+    else { /* word_len &lt;= 32 */</div><div class='add'>+        return 4;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64</div><div class='add'>+kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx)</div><div class='add'>+{</div><div class='add'>+    u64 __iomem *addr = cs-&gt;base;</div><div class='add'>+    u64 val;</div><div class='add'>+</div><div class='add'>+    addr += idx;</div><div class='add'>+    if ((idx == KP_SPI_REG_CONFIG) &amp;&amp; (cs-&gt;conf_cache &gt;= 0)){</div><div class='add'>+        return cs-&gt;conf_cache;</div><div class='add'>+    }</div><div class='add'>+    val = readq((void*)addr);</div><div class='add'>+    return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+kp_spi_write_reg(struct kp_spi_controller_state *cs, int idx, u64 val)</div><div class='add'>+{</div><div class='add'>+    u64 __iomem *addr = cs-&gt;base;</div><div class='add'>+    addr += idx;</div><div class='add'>+    writeq(val, (void*)addr);</div><div class='add'>+    if (idx == KP_SPI_REG_CONFIG)</div><div class='add'>+        cs-&gt;conf_cache = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+kp_spi_wait_for_reg_bit(struct kp_spi_controller_state *cs, int idx, unsigned long bit)</div><div class='add'>+{</div><div class='add'>+    unsigned long timeout;</div><div class='add'>+    timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+    while (!(kp_spi_read_reg(cs, idx) &amp; bit)) {</div><div class='add'>+        if (time_after(jiffies, timeout)) {</div><div class='add'>+            if (!(kp_spi_read_reg(cs, idx) &amp; bit)) {</div><div class='add'>+                return -ETIMEDOUT;</div><div class='add'>+            } else {</div><div class='add'>+                return 0;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        cpu_relax();</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned</div><div class='add'>+kp_spi_txrx_pio(struct spi_device *spidev, struct spi_transfer *transfer)</div><div class='add'>+{</div><div class='add'>+    struct kp_spi_controller_state *cs = spidev-&gt;controller_state;</div><div class='add'>+    unsigned int count = transfer-&gt;len;</div><div class='add'>+    unsigned int c = count;</div><div class='add'>+    </div><div class='add'>+    int i;</div><div class='add'>+    u8 *rx       = transfer-&gt;rx_buf;</div><div class='add'>+    const u8 *tx = transfer-&gt;tx_buf;</div><div class='add'>+    int processed = 0;</div><div class='add'>+    </div><div class='add'>+    if (tx) {</div><div class='add'>+        for (i = 0 ; i &lt; c ; i++) {</div><div class='add'>+            char val = *tx++;</div><div class='add'>+            </div><div class='add'>+            if (kp_spi_wait_for_reg_bit(cs, KP_SPI_REG_STATUS, KP_SPI_REG_STATUS_TXS) &lt; 0) {</div><div class='add'>+                goto out;</div><div class='add'>+            }</div><div class='add'>+            </div><div class='add'>+            kp_spi_write_reg(cs, KP_SPI_REG_TXDATA, val);</div><div class='add'>+            processed++;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else if(rx) {</div><div class='add'>+        for (i = 0 ; i &lt; c ; i++) {</div><div class='add'>+            char test=0;</div><div class='add'>+            </div><div class='add'>+            kp_spi_write_reg(cs, KP_SPI_REG_TXDATA, 0x00);</div><div class='add'>+            </div><div class='add'>+            if (kp_spi_wait_for_reg_bit(cs, KP_SPI_REG_STATUS, KP_SPI_REG_STATUS_RXS) &lt; 0) {</div><div class='add'>+                goto out;</div><div class='add'>+            }</div><div class='add'>+            </div><div class='add'>+            test = kp_spi_read_reg(cs, KP_SPI_REG_RXDATA);</div><div class='add'>+            *rx++ = test;</div><div class='add'>+            processed++;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (kp_spi_wait_for_reg_bit(cs, KP_SPI_REG_STATUS, KP_SPI_REG_STATUS_EOT) &lt; 0) {</div><div class='add'>+        //TODO: Figure out how to abort transaction??  This has never happened in practice though...</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+ out:</div><div class='add'>+    return processed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************</div><div class='add'>+ * SPI Functions *</div><div class='add'>+ *****************/</div><div class='add'>+static int</div><div class='add'>+kp_spi_setup(struct spi_device *spidev)</div><div class='add'>+{</div><div class='add'>+    union kp_spi_config sc;</div><div class='add'>+    struct kp_spi *kpspi = spi_master_get_devdata(spidev-&gt;master);</div><div class='add'>+    struct kp_spi_controller_state *cs;</div><div class='add'>+    </div><div class='add'>+    /* setup controller state */</div><div class='add'>+    cs = spidev-&gt;controller_state;</div><div class='add'>+    if (!cs) {</div><div class='add'>+        cs = kzalloc(sizeof(*cs), GFP_KERNEL);</div><div class='add'>+        if(!cs) {</div><div class='add'>+            return -ENOMEM;</div><div class='add'>+        }</div><div class='add'>+        cs-&gt;base = kpspi-&gt;base;</div><div class='add'>+        cs-&gt;phys = kpspi-&gt;phys;</div><div class='add'>+        cs-&gt;chip_select = spidev-&gt;chip_select;</div><div class='add'>+        cs-&gt;word_len = spidev-&gt;bits_per_word;</div><div class='add'>+        cs-&gt;conf_cache = -1;</div><div class='add'>+        spidev-&gt;controller_state = cs;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* set config register */</div><div class='add'>+    sc.bitfield.wl = spidev-&gt;bits_per_word - 1;</div><div class='add'>+    sc.bitfield.cs = spidev-&gt;chip_select;</div><div class='add'>+    sc.bitfield.spi_en = 0;</div><div class='add'>+    sc.bitfield.trm = 0;</div><div class='add'>+    sc.bitfield.ffen = 0;</div><div class='add'>+    kp_spi_write_reg(spidev-&gt;controller_state, KP_SPI_REG_CONFIG, sc.reg);</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)</div><div class='add'>+{</div><div class='add'>+    struct kp_spi_controller_state *cs;</div><div class='add'>+    struct spi_device   *spidev;</div><div class='add'>+    struct kp_spi       *kpspi;</div><div class='add'>+    struct spi_transfer *transfer;</div><div class='add'>+    union kp_spi_config sc;</div><div class='add'>+    int status = 0;</div><div class='add'>+    </div><div class='add'>+    spidev = m-&gt;spi;</div><div class='add'>+    kpspi = spi_master_get_devdata(master);</div><div class='add'>+    m-&gt;actual_length = 0;</div><div class='add'>+    m-&gt;status = 0;</div><div class='add'>+    </div><div class='add'>+    cs = spidev-&gt;controller_state;</div><div class='add'>+    </div><div class='add'>+    /* reject invalid messages and transfers */</div><div class='add'>+    if (list_empty(&amp;m-&gt;transfers)) {</div><div class='add'>+        return -EINVAL;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* validate input */</div><div class='add'>+    list_for_each_entry(transfer, &amp;m-&gt;transfers, transfer_list) {</div><div class='add'>+        const void *tx_buf = transfer-&gt;tx_buf;</div><div class='add'>+        void       *rx_buf = transfer-&gt;rx_buf;</div><div class='add'>+        unsigned    len = transfer-&gt;len;</div><div class='add'>+        </div><div class='add'>+        if (transfer-&gt;speed_hz &gt; KP_SPI_CLK || (len &amp;&amp; !(rx_buf || tx_buf))) {</div><div class='add'>+            dev_dbg(kpspi-&gt;dev, "  transfer: %d Hz, %d %s%s, %d bpw\n",</div><div class='add'>+                    transfer-&gt;speed_hz,</div><div class='add'>+                    len,</div><div class='add'>+                    tx_buf ? "tx" : "",</div><div class='add'>+                    rx_buf ? "rx" : "",</div><div class='add'>+                    transfer-&gt;bits_per_word);</div><div class='add'>+            dev_dbg(kpspi-&gt;dev, "  transfer -EINVAL\n");</div><div class='add'>+            return -EINVAL;</div><div class='add'>+        }</div><div class='add'>+        if (transfer-&gt;speed_hz &amp;&amp; (transfer-&gt;speed_hz &lt; (KP_SPI_CLK &gt;&gt; 15))) {</div><div class='add'>+            dev_dbg(kpspi-&gt;dev, "speed_hz %d below minimum %d Hz\n",</div><div class='add'>+                    transfer-&gt;speed_hz,</div><div class='add'>+                    KP_SPI_CLK &gt;&gt; 15);</div><div class='add'>+            dev_dbg(kpspi-&gt;dev, "  speed_hz -EINVAL\n");</div><div class='add'>+            return -EINVAL;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* assert chip select to start the sequence*/</div><div class='add'>+    sc.reg = kp_spi_read_reg(cs, KP_SPI_REG_CONFIG);</div><div class='add'>+    sc.bitfield.spi_en = 1;</div><div class='add'>+    kp_spi_write_reg(cs, KP_SPI_REG_CONFIG, sc.reg);</div><div class='add'>+    </div><div class='add'>+    /* work */</div><div class='add'>+    if (kp_spi_wait_for_reg_bit(cs, KP_SPI_REG_STATUS, KP_SPI_REG_STATUS_EOT) &lt; 0) {</div><div class='add'>+        dev_info(kpspi-&gt;dev, "EOT timed out\n");</div><div class='add'>+        goto out;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* do the transfers for this message */</div><div class='add'>+    list_for_each_entry(transfer, &amp;m-&gt;transfers, transfer_list) {</div><div class='add'>+        if (transfer-&gt;tx_buf == NULL &amp;&amp; transfer-&gt;rx_buf == NULL &amp;&amp; transfer-&gt;len) {</div><div class='add'>+            status = -EINVAL;</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        </div><div class='add'>+        /* transfer */</div><div class='add'>+        if (transfer-&gt;len) {</div><div class='add'>+            unsigned int word_len = spidev-&gt;bits_per_word;</div><div class='add'>+            unsigned count;</div><div class='add'>+            </div><div class='add'>+            /* set up the transfer... */</div><div class='add'>+            sc.reg = kp_spi_read_reg(cs, KP_SPI_REG_CONFIG);</div><div class='add'>+            </div><div class='add'>+            /* ...direction */</div><div class='add'>+            if (transfer-&gt;tx_buf) {</div><div class='add'>+                sc.bitfield.trm = KP_SPI_REG_CONFIG_TRM_TX;</div><div class='add'>+            }</div><div class='add'>+            else if (transfer-&gt;rx_buf) {</div><div class='add'>+                sc.bitfield.trm = KP_SPI_REG_CONFIG_TRM_RX;</div><div class='add'>+            }</div><div class='add'>+            </div><div class='add'>+            /* ...word length */</div><div class='add'>+            if (transfer-&gt;bits_per_word) {</div><div class='add'>+                word_len = transfer-&gt;bits_per_word;</div><div class='add'>+            }</div><div class='add'>+            cs-&gt;word_len = word_len;</div><div class='add'>+            sc.bitfield.wl = word_len-1;</div><div class='add'>+            </div><div class='add'>+            /* ...chip select */</div><div class='add'>+            sc.bitfield.cs = spidev-&gt;chip_select;</div><div class='add'>+            </div><div class='add'>+            /* ...and write the new settings */</div><div class='add'>+            kp_spi_write_reg(cs, KP_SPI_REG_CONFIG, sc.reg);</div><div class='add'>+            </div><div class='add'>+            /* do the transfer */</div><div class='add'>+            count = kp_spi_txrx_pio(spidev, transfer);</div><div class='add'>+            m-&gt;actual_length += count;</div><div class='add'>+            </div><div class='add'>+            if (count != transfer-&gt;len) {</div><div class='add'>+                status = -EIO;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        </div><div class='add'>+        if (transfer-&gt;delay_usecs) {</div><div class='add'>+            udelay(transfer-&gt;delay_usecs);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* de-assert chip select to end the sequence */</div><div class='add'>+    sc.reg = kp_spi_read_reg(cs, KP_SPI_REG_CONFIG);</div><div class='add'>+    sc.bitfield.spi_en = 0;</div><div class='add'>+    kp_spi_write_reg(cs, KP_SPI_REG_CONFIG, sc.reg);</div><div class='add'>+    </div><div class='add'>+ out:</div><div class='add'>+    /* done work */</div><div class='add'>+    spi_finalize_current_message(master);</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+kp_spi_cleanup(struct spi_device *spidev)</div><div class='add'>+{</div><div class='add'>+    struct kp_spi_controller_state *cs = spidev-&gt;controller_state;</div><div class='add'>+    if (cs) {</div><div class='add'>+        kfree(cs);</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'>+ * Probe / Remove *</div><div class='add'>+ ******************/</div><div class='add'>+static int</div><div class='add'>+kp_spi_probe(struct platform_device *pldev)</div><div class='add'>+{</div><div class='add'>+    struct kpc_core_device_platdata *drvdata;</div><div class='add'>+    struct spi_master *master;</div><div class='add'>+    struct kp_spi *kpspi;</div><div class='add'>+    struct resource *r;</div><div class='add'>+    int status = 0;</div><div class='add'>+    int i;</div><div class='add'>+</div><div class='add'>+    drvdata = pldev-&gt;dev.platform_data;</div><div class='add'>+    if (!drvdata){</div><div class='add'>+        dev_err(&amp;pldev-&gt;dev, "kp_spi_probe: platform_data is NULL!\n");</div><div class='add'>+        return -ENODEV;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    master = spi_alloc_master(&amp;pldev-&gt;dev, sizeof(struct kp_spi));</div><div class='add'>+    if (master == NULL) {</div><div class='add'>+        dev_err(&amp;pldev-&gt;dev, "kp_spi_probe: master allocation failed\n");</div><div class='add'>+        return -ENOMEM;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* set up the spi functions */</div><div class='add'>+    master-&gt;mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;</div><div class='add'>+    master-&gt;bits_per_word_mask = (unsigned int)SPI_BPW_RANGE_MASK(4, 32);</div><div class='add'>+    master-&gt;setup = kp_spi_setup;</div><div class='add'>+    master-&gt;transfer_one_message = kp_spi_transfer_one_message;</div><div class='add'>+    master-&gt;cleanup = kp_spi_cleanup;</div><div class='add'>+    </div><div class='add'>+    platform_set_drvdata(pldev, master);</div><div class='add'>+    </div><div class='add'>+    kpspi = spi_master_get_devdata(master);</div><div class='add'>+    kpspi-&gt;master = master;</div><div class='add'>+    kpspi-&gt;dev = &amp;pldev-&gt;dev;</div><div class='add'>+    </div><div class='add'>+    master-&gt;num_chipselect = 4;</div><div class='add'>+    if (pldev-&gt;id != -1) {</div><div class='add'>+        master-&gt;bus_num = pldev-&gt;id;</div><div class='add'>+    }</div><div class='add'>+    kpspi-&gt;pin_dir = 0;</div><div class='add'>+    </div><div class='add'>+    r = platform_get_resource(pldev, IORESOURCE_MEM, 0);</div><div class='add'>+    if (r == NULL) {</div><div class='add'>+        dev_err(&amp;pldev-&gt;dev, "kp_spi_probe: Unable to get platform resources\n");</div><div class='add'>+        status = -ENODEV;</div><div class='add'>+        goto free_master;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    kpspi-&gt;phys = (unsigned long)ioremap_nocache(r-&gt;start, resource_size(r));</div><div class='add'>+    kpspi-&gt;base = (u64 __iomem *)kpspi-&gt;phys;</div><div class='add'>+    </div><div class='add'>+    status = spi_register_master(master);</div><div class='add'>+    if (status &lt; 0) {</div><div class='add'>+        dev_err(&amp;pldev-&gt;dev, "Unable to register SPI device\n");</div><div class='add'>+        goto free_master;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    /* register the slave boards */</div><div class='add'>+    #define NEW_SPI_DEVICE_FROM_BOARD_INFO_TABLE(table) \</div><div class='add'>+        for (i = 0 ; i &lt; ARRAY_SIZE(table) ; i++) { \</div><div class='add'>+            spi_new_device(master, &amp;(table[i])); \</div><div class='add'>+        }</div><div class='add'>+    </div><div class='add'>+    switch ((drvdata-&gt;card_id &amp; 0xFFFF0000) &gt;&gt; 16){</div><div class='add'>+        case PCI_DEVICE_ID_DAKTRONICS_KADOKA_P2KR0:</div><div class='add'>+            NEW_SPI_DEVICE_FROM_BOARD_INFO_TABLE(p2kr0_board_info);</div><div class='add'>+            break;</div><div class='add'>+        default:</div><div class='add'>+            dev_err(&amp;pldev-&gt;dev, "Unknown hardware, cant know what partition table to use!\n");</div><div class='add'>+            goto free_master;</div><div class='add'>+            break;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    return status;</div><div class='add'>+</div><div class='add'>+ free_master:</div><div class='add'>+    spi_master_put(master);</div><div class='add'>+    return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+kp_spi_remove(struct platform_device *pldev)</div><div class='add'>+{</div><div class='add'>+    struct spi_master * master = platform_get_drvdata(pldev);</div><div class='add'>+    spi_unregister_master(master);</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct platform_driver kp_spi_driver = {</div><div class='add'>+    .driver = {</div><div class='add'>+        .name =     KP_DRIVER_NAME_SPI,</div><div class='add'>+    },</div><div class='add'>+    .probe =    kp_spi_probe,</div><div class='add'>+    .remove =   kp_spi_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(kp_spi_driver);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:kp_spi");</div><div class='head'>diff --git a/drivers/staging/kpc2000/kpc_spi/spi_parts.h b/drivers/staging/kpc2000/kpc_spi/spi_parts.h<br/>new file mode 100644<br/>index 000000000000..33e62acc5e08<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/kpc2000/kpc_spi/spi_parts.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/kpc2000/kpc_spi/spi_parts.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+#ifndef __KPC_SPI_SPI_PARTS_H__</div><div class='add'>+#define __KPC_SPI_SPI_PARTS_H__</div><div class='add'>+</div><div class='add'>+static struct mtd_partition p2kr0_spi0_parts[] = {</div><div class='add'>+    { .name = "SLOT_0",    .size = 7798784,          .offset = 0,                 },</div><div class='add'>+    { .name = "SLOT_1",    .size = 7798784,          .offset = MTDPART_OFS_NXTBLK },</div><div class='add'>+    { .name = "SLOT_2",    .size = 7798784,          .offset = MTDPART_OFS_NXTBLK },</div><div class='add'>+    { .name = "SLOT_3",    .size = 7798784,          .offset = MTDPART_OFS_NXTBLK },</div><div class='add'>+    { .name = "CS0_EXTRA", .size = MTDPART_SIZ_FULL, .offset = MTDPART_OFS_NXTBLK }</div><div class='add'>+};</div><div class='add'>+static struct mtd_partition p2kr0_spi1_parts[] = {</div><div class='add'>+    { .name = "SLOT_4",    .size   = 7798784,          .offset = 0,                 },</div><div class='add'>+    { .name = "SLOT_5",    .size   = 7798784,          .offset = MTDPART_OFS_NXTBLK },</div><div class='add'>+    { .name = "SLOT_6",    .size   = 7798784,          .offset = MTDPART_OFS_NXTBLK },</div><div class='add'>+    { .name = "SLOT_7",    .size   = 7798784,          .offset = MTDPART_OFS_NXTBLK },</div><div class='add'>+    { .name = "CS1_EXTRA", .size   = MTDPART_SIZ_FULL, .offset = MTDPART_OFS_NXTBLK }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data p2kr0_spi0_pdata = {</div><div class='add'>+    .name = "SPI0",</div><div class='add'>+    .nr_parts = ARRAY_SIZE(p2kr0_spi0_parts),</div><div class='add'>+    .parts = p2kr0_spi0_parts,</div><div class='add'>+};</div><div class='add'>+static struct flash_platform_data p2kr0_spi1_pdata = {</div><div class='add'>+    .name = "SPI1",</div><div class='add'>+    .nr_parts = ARRAY_SIZE(p2kr0_spi1_parts),</div><div class='add'>+    .parts = p2kr0_spi1_parts,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info p2kr0_board_info[] = {</div><div class='add'>+    {</div><div class='add'>+        .modalias = "n25q256a11",</div><div class='add'>+        .bus_num = 1,</div><div class='add'>+        .chip_select = 0,</div><div class='add'>+        .mode = SPI_MODE_0,</div><div class='add'>+        .platform_data = &amp;p2kr0_spi0_pdata</div><div class='add'>+    },</div><div class='add'>+    {</div><div class='add'>+        .modalias = "n25q256a11",</div><div class='add'>+        .bus_num = 1,</div><div class='add'>+        .chip_select = 1,</div><div class='add'>+        .mode = SPI_MODE_0,</div><div class='add'>+        .platform_data = &amp;p2kr0_spi1_pdata</div><div class='add'>+    },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/ks7010/Kconfig b/drivers/staging/ks7010/Kconfig<br/>index 0b9217674d5b..0987fdc2f70d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ks7010/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ks7010/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ks7010/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/ks7010/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config KS7010</div><div class='ctx'> 	tristate "KeyStream KS7010 SDIO support"</div><div class='ctx'> 	depends on MMC &amp;&amp; WIRELESS</div><div class='head'>diff --git a/drivers/staging/ks7010/Makefile b/drivers/staging/ks7010/Makefile<br/>index 412e2105a3a5..009851a32310 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ks7010/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ks7010/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ks7010/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/ks7010/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_KS7010) += ks7010.o</div><div class='ctx'> </div><div class='ctx'> ks7010-y	:= ks_hostif.o ks_wlan_net.o ks7010_sdio.o</div><div class='head'>diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c<br/>index 06ebea0be118..e089366ed02a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ks7010/ks_hostif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ks7010/ks_hostif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ks7010/ks_hostif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/ks7010/ks_hostif.c</a></div><div class='hunk'>@@ -219,7 +219,6 @@ michael_mic(u8 *key, u8 *data, unsigned int len, u8 priority, u8 *result)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = crypto_shash_init(desc);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -362,6 +361,8 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv,</div><div class='ctx'> 	     (auth_type == TYPE_GMK2 &amp;&amp;</div><div class='ctx'> 	      priv-&gt;wpa.group_suite == IW_AUTH_CIPHER_TKIP)) &amp;&amp;</div><div class='ctx'> 	    key-&gt;key_len) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='ctx'> 		netdev_dbg(priv-&gt;net_dev, "TKIP: protocol=%04X: size=%u\n",</div><div class='ctx'> 			   eth_proto, priv-&gt;rx_size);</div><div class='ctx'> 		/* MIC save */</div><div class='hunk'>@@ -369,15 +370,11 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv,</div><div class='ctx'> 		       (priv-&gt;rxp) + ((priv-&gt;rx_size) - sizeof(recv_mic)),</div><div class='ctx'> 		       sizeof(recv_mic));</div><div class='ctx'> 		priv-&gt;rx_size = priv-&gt;rx_size - sizeof(recv_mic);</div><div class='del'>-		if (auth_type &gt; 0 &amp;&amp; auth_type &lt; 4) {	/* auth_type check */</div><div class='del'>-			int ret;</div><div class='del'>-</div><div class='del'>-			ret = michael_mic(key-&gt;rx_mic_key,</div><div class='del'>-					  priv-&gt;rxp, priv-&gt;rx_size,</div><div class='del'>-					  0, mic);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		ret = michael_mic(key-&gt;rx_mic_key, priv-&gt;rxp, priv-&gt;rx_size,</div><div class='add'>+				  0, mic);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (memcmp(mic, recv_mic, sizeof(mic)) != 0) {</div><div class='ctx'> 			now = jiffies;</div><div class='ctx'> 			mic_failure = &amp;priv-&gt;wpa.mic_failure;</div><div class='head'>diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig<br/>index 1da5c20d65c0..f77f5eee7fc2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menuconfig STAGING_MEDIA</div><div class='ctx'> 	bool "Media staging drivers"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option allows you to select a number of media drivers that</div><div class='ctx'> 	  don't have the "normal" Linux kernel quality level.</div><div class='ctx'> 	  Most of them don't follow properly the V4L, DVB and/or RC API's,</div><div class='hunk'>@@ -33,8 +34,6 @@ source "drivers/staging/media/sunxi/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/media/tegra-vde/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/staging/media/zoran/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/staging/media/ipu3/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/media/soc_camera/Kconfig"</div><div class='head'>diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile<br/>index 0355e3030504..99218bfc997f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/Makefile</a></div><div class='hunk'>@@ -5,7 +5,6 @@ obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/</div><div class='ctx'> obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/</div><div class='ctx'> obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/</div><div class='ctx'> obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/</div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN)	+= zoran/</div><div class='ctx'> obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip/vpu/</div><div class='ctx'> obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/</div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA)	+= soc_camera/</div><div class='head'>diff --git a/drivers/staging/media/bcm2048/Kconfig b/drivers/staging/media/bcm2048/Kconfig<br/>index a9fc6e186494..ab2d50cac140 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/bcm2048/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/bcm2048/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/bcm2048/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/bcm2048/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Multimedia Video device configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -5,7 +6,7 @@</div><div class='ctx'> config I2C_BCM2048</div><div class='ctx'> 	tristate "Broadcom BCM2048 FM Radio Receiver support"</div><div class='ctx'> 	depends on I2C &amp;&amp; VIDEO_V4L2 &amp;&amp; RADIO_ADAPTERS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want support to BCM2048 FM Radio Receiver.</div><div class='ctx'> 	  This device driver supports only i2c bus.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/bcm2048/Makefile b/drivers/staging/media/bcm2048/Makefile<br/>index b4f5663d1408..f42056848dc6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/bcm2048/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/bcm2048/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/bcm2048/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/bcm2048/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_I2C_BCM2048) += radio-bcm2048.o</div><div class='head'>diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c<br/>index d9b02ff66259..09903ffb13ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/bcm2048/radio-bcm2048.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/bcm2048/radio-bcm2048.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/bcm2048/radio-bcm2048.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/bcm2048/radio-bcm2048.c</a></div><div class='hunk'>@@ -2404,7 +2404,7 @@ static int bcm2048_vidioc_g_audio(struct file *file, void *priv,</div><div class='ctx'> 	if (audio-&gt;index &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strncpy(audio-&gt;name, "Radio", 32);</div><div class='add'>+	strscpy(audio-&gt;name, "Radio", sizeof(audio-&gt;name));</div><div class='ctx'> 	audio-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2432,7 +2432,7 @@ static int bcm2048_vidioc_g_tuner(struct file *file, void *priv,</div><div class='ctx'> 	if (tuner-&gt;index &gt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strncpy(tuner-&gt;name, "FM Receiver", 32);</div><div class='add'>+	strscpy(tuner-&gt;name, "FM Receiver", sizeof(tuner-&gt;name));</div><div class='ctx'> 	tuner-&gt;type = V4L2_TUNER_RADIO;</div><div class='ctx'> 	tuner-&gt;rangelow =</div><div class='ctx'> 		dev_to_v4l2(bcm2048_get_region_bottom_frequency(bdev));</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/Kconfig b/drivers/staging/media/davinci_vpfe/Kconfig<br/>index aea449a8dbf8..94bf6746c03f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config VIDEO_DM365_VPFE</div><div class='ctx'> 	tristate "DM365 VPFE Media Controller Capture Driver"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='del'>-	depends on (ARCH_DAVINCI_DM365 &amp;&amp; !VIDEO_DM365_ISIF) || COMPILE_TEST</div><div class='add'>+	depends on (ARCH_DAVINCI_DM365 &amp;&amp; !VIDEO_DM365_ISIF) || (COMPILE_TEST &amp;&amp; !ARCH_OMAP1)</div><div class='ctx'> 	depends on VIDEO_V4L2_SUBDEV_API</div><div class='ctx'> 	depends on VIDEO_DAVINCI_VPBE_DISPLAY</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/Makefile b/drivers/staging/media/davinci_vpfe/Makefile<br/>index 9268e507f791..0ae8c5014f74 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci-vfpe.o</div><div class='ctx'> </div><div class='ctx'> davinci-vfpe-objs := \</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c<br/>index 3d910b85905c..30e2edc0cec5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipe.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipe.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipe.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_ipipe.c</a></div><div class='hunk'>@@ -1264,8 +1264,7 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg)</div><div class='ctx'> 		module_if = &amp;ipipe_modules[i];</div><div class='ctx'> 		from = *(void **)((void *)cfg + module_if-&gt;config_offset);</div><div class='ctx'> </div><div class='del'>-		params = kmalloc(sizeof(struct ipipe_module_params),</div><div class='del'>-				 GFP_KERNEL);</div><div class='add'>+		params = kmalloc(sizeof(*params), GFP_KERNEL);</div><div class='ctx'> 		to = (void *)params + module_if-&gt;param_offset;</div><div class='ctx'> 		size = module_if-&gt;param_size;</div><div class='ctx'> </div><div class='hunk'>@@ -1306,8 +1305,7 @@ static int ipipe_g_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg)</div><div class='ctx'> 		module_if = &amp;ipipe_modules[i];</div><div class='ctx'> 		to = *(void **)((void *)cfg + module_if-&gt;config_offset);</div><div class='ctx'> </div><div class='del'>-		params = kmalloc(sizeof(struct ipipe_module_params),</div><div class='del'>-				 GFP_KERNEL);</div><div class='add'>+		params = kmalloc(sizeof(*params), GFP_KERNEL);</div><div class='ctx'> 		from = (void *)params + module_if-&gt;param_offset;</div><div class='ctx'> 		size = module_if-&gt;param_size;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.h b/drivers/staging/media/davinci_vpfe/dm365_ipipe.h<br/>index 174334b53f96..866ae12aeb07 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipe.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipe.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipe.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_ipipe.h</a></div><div class='hunk'>@@ -27,8 +27,6 @@</div><div class='ctx'> #include "davinci_vpfe_user.h"</div><div class='ctx'> #include "vpfe_video.h"</div><div class='ctx'> </div><div class='del'>-#define CEIL(a, b)	(((a) + (b-1)) / (b))</div><div class='del'>-</div><div class='ctx'> enum ipipe_noise_filter {</div><div class='ctx'> 	IPIPE_D2F_1ST = 0,</div><div class='ctx'> 	IPIPE_D2F_2ND = 1,</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c<br/>index 565a3dc5bed1..110473c30577 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c</a></div><div class='hunk'>@@ -825,8 +825,10 @@ ipipe_set_lum_adj_regs(void __iomem *base_addr, struct ipipe_lum_adj *lum_adj)</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_ADJ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IPIPE_S12Q8(decimal, integer) \</div><div class='del'>-	(((decimal &amp; 0xff) | ((integer &amp; 0xf) &lt;&lt; 8)))</div><div class='add'>+inline u32 ipipe_s12q8(unsigned short decimal, short integer)</div><div class='add'>+{</div><div class='add'>+	return (decimal &amp; 0xff) | ((integer &amp; 0xf) &lt;&lt; 8);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void ipipe_set_rgb2ycbcr_regs(void __iomem *base_addr,</div><div class='ctx'> 			      struct vpfe_ipipe_rgb2yuv *yuv)</div><div class='hunk'>@@ -835,23 +837,23 @@ void ipipe_set_rgb2ycbcr_regs(void __iomem *base_addr,</div><div class='ctx'> </div><div class='ctx'> 	/* S10Q8 */</div><div class='ctx'> 	ipipe_clock_enable(base_addr);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_ry.decimal, yuv-&gt;coef_ry.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_ry.decimal, yuv-&gt;coef_ry.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_RY);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_gy.decimal, yuv-&gt;coef_gy.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_gy.decimal, yuv-&gt;coef_gy.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_GY);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_by.decimal, yuv-&gt;coef_by.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_by.decimal, yuv-&gt;coef_by.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_BY);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_rcb.decimal, yuv-&gt;coef_rcb.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_rcb.decimal, yuv-&gt;coef_rcb.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_RCB);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_gcb.decimal, yuv-&gt;coef_gcb.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_gcb.decimal, yuv-&gt;coef_gcb.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_GCB);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_bcb.decimal, yuv-&gt;coef_bcb.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_bcb.decimal, yuv-&gt;coef_bcb.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_BCB);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_rcr.decimal, yuv-&gt;coef_rcr.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_rcr.decimal, yuv-&gt;coef_rcr.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_RCR);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_gcr.decimal, yuv-&gt;coef_gcr.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_gcr.decimal, yuv-&gt;coef_gcr.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_GCR);</div><div class='del'>-	val = IPIPE_S12Q8(yuv-&gt;coef_bcr.decimal, yuv-&gt;coef_bcr.integer);</div><div class='add'>+	val = ipipe_s12q8(yuv-&gt;coef_bcr.decimal, yuv-&gt;coef_bcr.integer);</div><div class='ctx'> 	regw_ip(base_addr, val, YUV_MUL_BCR);</div><div class='ctx'> 	regw_ip(base_addr, yuv-&gt;out_ofst_y &amp; RGB2YCBCR_OFST_MASK, YUV_OFT_Y);</div><div class='ctx'> 	regw_ip(base_addr, yuv-&gt;out_ofst_cb &amp; RGB2YCBCR_OFST_MASK, YUV_OFT_CB);</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c b/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c<br/>index 22fcdbcde96b..51d4cd1bdb97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipeif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_ipipeif.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ ipipeif_get_cfg_src1(struct vpfe_ipipeif_device *ipipeif)</div><div class='ctx'> </div><div class='ctx'> 	informat = &amp;ipipeif-&gt;formats[IPIPEIF_PAD_SINK];</div><div class='ctx'> 	if (ipipeif-&gt;input == IPIPEIF_INPUT_MEMORY &amp;&amp;</div><div class='del'>-	   (informat-&gt;code == MEDIA_BUS_FMT_Y8_1X8 ||</div><div class='add'>+	    (informat-&gt;code == MEDIA_BUS_FMT_Y8_1X8 ||</div><div class='ctx'> 	    informat-&gt;code == MEDIA_BUS_FMT_UV8_1X8))</div><div class='ctx'> 		return IPIPEIF_CCDC;</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +189,7 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)</div><div class='ctx'> 	enum ipipeif_input_source ipipeif_source;</div><div class='ctx'> 	u32 isif_port_if;</div><div class='ctx'> 	void __iomem *ipipeif_base_addr;</div><div class='del'>-	unsigned int val;</div><div class='add'>+	unsigned long val;</div><div class='ctx'> 	int data_shift;</div><div class='ctx'> 	int pack_mode;</div><div class='ctx'> 	int source1;</div><div class='hunk'>@@ -296,14 +296,14 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)</div><div class='ctx'> 		case MEDIA_BUS_FMT_YUYV8_1X16:</div><div class='ctx'> 		case MEDIA_BUS_FMT_UYVY8_2X8:</div><div class='ctx'> 		case MEDIA_BUS_FMT_Y8_1X8:</div><div class='del'>-			RESETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);</div><div class='del'>-			SETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);</div><div class='add'>+			clear_bit(IPIPEIF_CFG2_YUV8_SHIFT, &amp;val);</div><div class='add'>+			set_bit(IPIPEIF_CFG2_YUV16_SHIFT, &amp;val);</div><div class='ctx'> 			ipipeif_write(val, ipipeif_base_addr, IPIPEIF_CFG2);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			RESETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);</div><div class='del'>-			RESETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);</div><div class='add'>+			clear_bit(IPIPEIF_CFG2_YUV8_SHIFT, &amp;val);</div><div class='add'>+			clear_bit(IPIPEIF_CFG2_YUV16_SHIFT, &amp;val);</div><div class='ctx'> 			ipipeif_write(val, ipipeif_base_addr, IPIPEIF_CFG2);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -344,23 +344,23 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)</div><div class='ctx'> 		switch (isif_port_if) {</div><div class='ctx'> 		case MEDIA_BUS_FMT_YUYV8_1X16:</div><div class='ctx'> 		case MEDIA_BUS_FMT_YUYV10_1X20:</div><div class='del'>-			RESETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);</div><div class='del'>-			SETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);</div><div class='add'>+			clear_bit(IPIPEIF_CFG2_YUV8_SHIFT, &amp;val);</div><div class='add'>+			set_bit(IPIPEIF_CFG2_YUV16_SHIFT, &amp;val);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case MEDIA_BUS_FMT_YUYV8_2X8:</div><div class='ctx'> 		case MEDIA_BUS_FMT_UYVY8_2X8:</div><div class='ctx'> 		case MEDIA_BUS_FMT_Y8_1X8:</div><div class='ctx'> 		case MEDIA_BUS_FMT_YUYV10_2X10:</div><div class='del'>-			SETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);</div><div class='del'>-			SETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);</div><div class='add'>+			set_bit(IPIPEIF_CFG2_YUV8_SHIFT, &amp;val);</div><div class='add'>+			set_bit(IPIPEIF_CFG2_YUV16_SHIFT, &amp;val);</div><div class='ctx'> 			val |= IPIPEIF_CBCR_Y &lt;&lt; IPIPEIF_CFG2_YUV8P_SHIFT;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='ctx'> 			/* Bayer */</div><div class='ctx'> 			ipipeif_write(params.if_5_1.clip, ipipeif_base_addr,</div><div class='del'>-				IPIPEIF_OCLIP);</div><div class='add'>+				      IPIPEIF_OCLIP);</div><div class='ctx'> 		}</div><div class='ctx'> 		ipipeif_write(val, ipipeif_base_addr, IPIPEIF_CFG2);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -389,7 +389,7 @@ ipipeif_set_config(struct v4l2_subdev *sd, struct ipipeif_params *config)</div><div class='ctx'> 	ipipeif-&gt;config.rsz = config-&gt;rsz;</div><div class='ctx'> 	ipipeif-&gt;config.decimation = config-&gt;decimation;</div><div class='ctx'> 	if (ipipeif-&gt;config.decimation &amp;&amp;</div><div class='del'>-	   (ipipeif-&gt;config.rsz &lt; IPIPEIF_RSZ_MIN ||</div><div class='add'>+	    (ipipeif-&gt;config.rsz &lt; IPIPEIF_RSZ_MIN ||</div><div class='ctx'> 	    ipipeif-&gt;config.rsz &gt; IPIPEIF_RSZ_MAX)) {</div><div class='ctx'> 		dev_err(dev, "rsz range is %d to %d\n",</div><div class='ctx'> 			IPIPEIF_RSZ_MIN, IPIPEIF_RSZ_MAX);</div><div class='hunk'>@@ -580,7 +580,7 @@ static int ipipeif_enum_mbus_code(struct v4l2_subdev *sd,</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> ipipeif_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,</div><div class='del'>-		struct v4l2_subdev_format *fmt)</div><div class='add'>+		   struct v4l2_subdev_format *fmt)</div><div class='ctx'> {</div><div class='ctx'> 	struct vpfe_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);</div><div class='ctx'> </div><div class='hunk'>@@ -679,8 +679,8 @@ ipipeif_enum_frame_size(struct v4l2_subdev *sd,</div><div class='ctx'>  */</div><div class='ctx'> static struct v4l2_mbus_framefmt *</div><div class='ctx'> __ipipeif_get_format(struct vpfe_ipipeif_device *ipipeif,</div><div class='del'>-		       struct v4l2_subdev_pad_config *cfg, unsigned int pad,</div><div class='del'>-		       enum v4l2_subdev_format_whence which)</div><div class='add'>+		     struct v4l2_subdev_pad_config *cfg, unsigned int pad,</div><div class='add'>+		     enum v4l2_subdev_format_whence which)</div><div class='ctx'> {</div><div class='ctx'> 	if (which == V4L2_SUBDEV_FORMAT_TRY)</div><div class='ctx'> 		return v4l2_subdev_get_try_format(&amp;ipipeif-&gt;subdev, cfg, pad);</div><div class='hunk'>@@ -697,13 +697,13 @@ __ipipeif_get_format(struct vpfe_ipipeif_device *ipipeif,</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> ipipeif_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,</div><div class='del'>-		struct v4l2_subdev_format *fmt)</div><div class='add'>+		   struct v4l2_subdev_format *fmt)</div><div class='ctx'> {</div><div class='ctx'> 	struct vpfe_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);</div><div class='ctx'> 	struct v4l2_mbus_framefmt *format;</div><div class='ctx'> </div><div class='ctx'> 	format = __ipipeif_get_format(ipipeif, cfg, fmt-&gt;pad, fmt-&gt;which);</div><div class='del'>-	if (format == NULL)</div><div class='add'>+	if (!format)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ipipeif_try_format(ipipeif, cfg, fmt-&gt;pad, &amp;fmt-&gt;format, fmt-&gt;which);</div><div class='hunk'>@@ -879,7 +879,7 @@ static const struct vpfe_video_operations video_in_ops = {</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> ipipeif_link_setup(struct media_entity *entity, const struct media_pad *local,</div><div class='del'>-		const struct media_pad *remote, u32 flags)</div><div class='add'>+		   const struct media_pad *remote, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);</div><div class='ctx'> 	struct vpfe_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);</div><div class='hunk'>@@ -920,8 +920,7 @@ ipipeif_link_setup(struct media_entity *entity, const struct media_pad *local,</div><div class='ctx'> 		if (remote-&gt;entity == &amp;vpfe-&gt;vpfe_ipipe.subdev.entity)</div><div class='ctx'> 			/* connencted to ipipe */</div><div class='ctx'> 			ipipeif-&gt;output = IPIPEIF_OUTPUT_IPIPE;</div><div class='del'>-		else if (remote-&gt;entity == &amp;vpfe-&gt;vpfe_resizer.</div><div class='del'>-			crop_resizer.subdev.entity)</div><div class='add'>+		else if (remote-&gt;entity == &amp;vpfe-&gt;vpfe_resizer.crop_resizer.subdev.entity)</div><div class='ctx'> 			/* connected to resizer */</div><div class='ctx'> 			ipipeif-&gt;output = IPIPEIF_OUTPUT_RESIZER;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -976,7 +975,7 @@ vpfe_ipipeif_register_entities(struct vpfe_ipipeif_device *ipipeif,</div><div class='ctx'> </div><div class='ctx'> 	flags = 0;</div><div class='ctx'> 	ret = media_create_pad_link(&amp;ipipeif-&gt;video_in.video_dev.entity, 0,</div><div class='del'>-					&amp;ipipeif-&gt;subdev.entity, 0, flags);</div><div class='add'>+				    &amp;ipipeif-&gt;subdev.entity, 0, flags);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h b/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h<br/>index 4685d64016de..4d126fc871f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_ipipeif.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_ipipeif.h</a></div><div class='hunk'>@@ -166,8 +166,6 @@ struct vpfe_ipipeif_device {</div><div class='ctx'> #define IPIPEIF_RSZ_MIN			16</div><div class='ctx'> #define IPIPEIF_RSZ_MAX			112</div><div class='ctx'> #define IPIPEIF_RSZ_CONST		16</div><div class='del'>-#define SETBIT(reg, bit)   (reg = ((reg) | ((0x00000001)&lt;&lt;(bit))))</div><div class='del'>-#define RESETBIT(reg, bit) (reg = ((reg) &amp; (~(0x00000001&lt;&lt;(bit)))))</div><div class='ctx'> </div><div class='ctx'> #define IPIPEIF_ADOFS_LSB_MASK		0x1ff</div><div class='ctx'> #define IPIPEIF_ADOFS_LSB_SHIFT		5</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif.c b/drivers/staging/media/davinci_vpfe/dm365_isif.c<br/>index 0a6d038fcec9..46fd8184fc77 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_isif.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_isif.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_isif.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_isif.c</a></div><div class='hunk'>@@ -433,9 +433,9 @@ static int isif_get_params(struct v4l2_subdev *sd, void *params)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isif_validate_df_csc_params(struct vpfe_isif_df_csc *df_csc)</div><div class='add'>+static int isif_validate_df_csc_params(const struct vpfe_isif_df_csc *df_csc)</div><div class='ctx'> {</div><div class='del'>-	struct vpfe_isif_color_space_conv *csc;</div><div class='add'>+	const struct vpfe_isif_color_space_conv *csc;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -481,7 +481,7 @@ static int isif_validate_df_csc_params(struct vpfe_isif_df_csc *df_csc)</div><div class='ctx'> #define DM365_ISIF_MAX_DFCMEM0		0x1fff</div><div class='ctx'> #define DM365_ISIF_MAX_DFCMEM1		0x1fff</div><div class='ctx'> </div><div class='del'>-static int isif_validate_dfc_params(struct vpfe_isif_dfc *dfc)</div><div class='add'>+static int isif_validate_dfc_params(const struct vpfe_isif_dfc *dfc)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -532,7 +532,7 @@ static int isif_validate_dfc_params(struct vpfe_isif_dfc *dfc)</div><div class='ctx'> #define DM365_ISIF_MAX_CLVSV			0x1fff</div><div class='ctx'> #define DM365_ISIF_MAX_HEIGHT_BLACK_REGION	0x1fff</div><div class='ctx'> </div><div class='del'>-static int isif_validate_bclamp_params(struct vpfe_isif_black_clamp *bclamp)</div><div class='add'>+static int isif_validate_bclamp_params(const struct vpfe_isif_black_clamp *bclamp)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -580,7 +580,7 @@ static int isif_validate_bclamp_params(struct vpfe_isif_black_clamp *bclamp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-isif_validate_raw_params(struct vpfe_isif_raw_config *params)</div><div class='add'>+isif_validate_raw_params(const struct vpfe_isif_raw_config *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -593,20 +593,18 @@ isif_validate_raw_params(struct vpfe_isif_raw_config *params)</div><div class='ctx'> 	return isif_validate_bclamp_params(&amp;params-&gt;bclamp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isif_set_params(struct v4l2_subdev *sd, void *params)</div><div class='add'>+static int isif_set_params(struct v4l2_subdev *sd, const struct vpfe_isif_raw_config *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct vpfe_isif_device *isif = v4l2_get_subdevdata(sd);</div><div class='del'>-	struct vpfe_isif_raw_config isif_raw_params;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* only raw module parameters can be set through the IOCTL */</div><div class='ctx'> 	if (isif-&gt;formats[ISIF_PAD_SINK].code != MEDIA_BUS_FMT_SGRBG12_1X12)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;isif_raw_params, params, sizeof(isif_raw_params));</div><div class='del'>-	if (!isif_validate_raw_params(&amp;isif_raw_params)) {</div><div class='del'>-		memcpy(&amp;isif-&gt;isif_cfg.bayer.config_params, &amp;isif_raw_params,</div><div class='del'>-			sizeof(isif_raw_params));</div><div class='add'>+	if (!isif_validate_raw_params(params)) {</div><div class='add'>+		memcpy(&amp;isif-&gt;isif_cfg.bayer.config_params, params,</div><div class='add'>+			sizeof(*params));</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c b/drivers/staging/media/davinci_vpfe/dm365_resizer.c<br/>index 9d726298b406..7adf1fae43f6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_resizer.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/davinci_vpfe/dm365_resizer.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/davinci_vpfe/dm365_resizer.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/davinci_vpfe/dm365_resizer.c</a></div><div class='hunk'>@@ -386,7 +386,7 @@ resizer_calculate_down_scale_f_div_param(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	o = 10 + (two_power &lt;&lt; 2);</div><div class='ctx'> 	if (((input_width &lt;&lt; 7) / rsz) % 2)</div><div class='del'>-		o += (((CEIL(rsz, 1024)) &lt;&lt; 1) &lt;&lt; n);</div><div class='add'>+		o += ((DIV_ROUND_UP(rsz, 1024) &lt;&lt; 1) &lt;&lt; n);</div><div class='ctx'> 	h2 = output_width - h1;</div><div class='ctx'> 	/* phi */</div><div class='ctx'> 	val = (h1 * rsz) - (((upper_h1 - (o - 10)) / two_power) &lt;&lt; 8);</div><div class='hunk'>@@ -630,7 +630,7 @@ resizer_calculate_normal_f_div_param(struct device *dev, int input_width,</div><div class='ctx'> 		val /= rsz &lt;&lt; 1;</div><div class='ctx'> 		val &lt;&lt;= 1;</div><div class='ctx'> 		val += 2;</div><div class='del'>-		o += ((CEIL(rsz, 1024)) &lt;&lt; 1);</div><div class='add'>+		o += (DIV_ROUND_UP(rsz, 1024) &lt;&lt; 1);</div><div class='ctx'> 		h1 = val;</div><div class='ctx'> 	}</div><div class='ctx'> 	h2 = output_width - h1;</div><div class='hunk'>@@ -1881,7 +1881,7 @@ int vpfe_resizer_init(struct vpfe_resizer_device *vpfe_rsz,</div><div class='ctx'> 	struct v4l2_subdev *sd = &amp;vpfe_rsz-&gt;crop_resizer.subdev;</div><div class='ctx'> 	struct media_pad *pads = &amp;vpfe_rsz-&gt;crop_resizer.pads[0];</div><div class='ctx'> 	struct media_entity *me = &amp;sd-&gt;entity;</div><div class='del'>-	static resource_size_t  res_len;</div><div class='add'>+	resource_size_t res_len;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig<br/>index 36b276ea2ecc..4c726345dc25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config VIDEO_IMX_MEDIA</div><div class='ctx'> 	tristate "i.MX5/6 V4L2 media core driver"</div><div class='ctx'> 	depends on ARCH_MXC || COMPILE_TEST</div><div class='hunk'>@@ -6,7 +7,7 @@ config VIDEO_IMX_MEDIA</div><div class='ctx'> 	depends on HAS_DMA</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select V4L2_FWNODE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say yes here to enable support for video4linux media controller</div><div class='ctx'> 	  driver for the i.MX5/6 SOC.</div><div class='ctx'> </div><div class='hunk'>@@ -17,7 +18,7 @@ config VIDEO_IMX_CSI</div><div class='ctx'> 	tristate "i.MX5/6 Camera Sensor Interface driver"</div><div class='ctx'> 	depends on VIDEO_IMX_MEDIA &amp;&amp; VIDEO_DEV &amp;&amp; I2C</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  A video4linux camera sensor interface driver for i.MX5/6.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_IMX7_CSI</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-ic-common.c b/drivers/staging/media/imx/imx-ic-common.c<br/>index 765919487a73..18cd4cb92431 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-ic-common.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Image Converter Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2014-2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -26,7 +22,7 @@ static struct imx_ic_ops *ic_ops[IC_NUM_OPS] = {</div><div class='ctx'> </div><div class='ctx'> static int imx_ic_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct imx_media_internal_sd_platformdata *pdata;</div><div class='add'>+	struct imx_media_ipu_internal_sd_pdata *pdata;</div><div class='ctx'> 	struct imx_ic_priv *priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -63,7 +59,7 @@ static int imx_ic_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;sd.owner = THIS_MODULE;</div><div class='ctx'> 	priv-&gt;sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;</div><div class='ctx'> 	priv-&gt;sd.grp_id = pdata-&gt;grp_id;</div><div class='del'>-	strncpy(priv-&gt;sd.name, pdata-&gt;sd_name, sizeof(priv-&gt;sd.name));</div><div class='add'>+	strscpy(priv-&gt;sd.name, pdata-&gt;sd_name, sizeof(priv-&gt;sd.name));</div><div class='ctx'> </div><div class='ctx'> 	ret = ic_ops[priv-&gt;task_id]-&gt;init(priv);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c<br/>index 3d43cdcb4bb9..10ffe00f1a54 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic-prp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic-prp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic-prp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-ic-prp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Capture IC Preprocess Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  * for resizing, colorspace conversion, and rotation.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2012-2017 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c<br/>index 5c8e6ad8c025..1ba4a5154fb5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic-prpencvf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic-prpencvf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic-prpencvf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-ic-prpencvf.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Capture IC Preprocess Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  * for resizing, colorspace conversion, and rotation.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2012-2017 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-ic.h b/drivers/staging/media/imx/imx-ic.h<br/>index 6b2267bda8ab..0dbcf2a7ab5f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-ic.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-ic.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-ic.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Image Converter Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _IMX_IC_H</div><div class='ctx'> #define _IMX_IC_H</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c<br/>index 9703c85b19c4..b7ce9d439279 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-capture.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-capture.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-capture.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-capture.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Video Capture Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2012-2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -556,6 +552,7 @@ static void capture_stop_streaming(struct vb2_queue *vq)</div><div class='ctx'> {</div><div class='ctx'> 	struct capture_priv *priv = vb2_get_drv_priv(vq);</div><div class='ctx'> 	struct imx_media_buffer *frame;</div><div class='add'>+	struct imx_media_buffer *tmp;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -570,9 +567,7 @@ static void capture_stop_streaming(struct vb2_queue *vq)</div><div class='ctx'> </div><div class='ctx'> 	/* release all active buffers */</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;q_lock, flags);</div><div class='del'>-	while (!list_empty(&amp;priv-&gt;ready_q)) {</div><div class='del'>-		frame = list_entry(priv-&gt;ready_q.next,</div><div class='del'>-				   struct imx_media_buffer, list);</div><div class='add'>+	list_for_each_entry_safe(frame, tmp, &amp;priv-&gt;ready_q, list) {</div><div class='ctx'> 		list_del(&amp;frame-&gt;list);</div><div class='ctx'> 		vb2_buffer_done(&amp;frame-&gt;vbuf.vb2_buf, VB2_BUF_STATE_ERROR);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c<br/>index 3b7517348666..28fe66052cc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-csi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-csi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-csi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-csi.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Capture CSI Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2014-2017 Mentor Graphics Inc.</div><div class='ctx'>  * Copyright (C) 2017 Pengutronix, Philipp Zabel &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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gcd.h&gt;</div><div class='hunk'>@@ -154,9 +150,10 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep,</div><div class='ctx'> /*</div><div class='ctx'>  * Parses the fwnode endpoint from the source pad of the entity</div><div class='ctx'>  * connected to this CSI. This will either be the entity directly</div><div class='del'>- * upstream from the CSI-2 receiver, or directly upstream from the</div><div class='del'>- * video mux. The endpoint is needed to determine the bus type and</div><div class='del'>- * bus config coming into the CSI.</div><div class='add'>+ * upstream from the CSI-2 receiver, directly upstream from the</div><div class='add'>+ * video mux, or directly upstream from the CSI itself. The endpoint</div><div class='add'>+ * is needed to determine the bus type and bus config coming into</div><div class='add'>+ * the CSI.</div><div class='ctx'>  */</div><div class='ctx'> static int csi_get_upstream_endpoint(struct csi_priv *priv,</div><div class='ctx'> 				     struct v4l2_fwnode_endpoint *ep)</div><div class='hunk'>@@ -172,7 +169,8 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv,</div><div class='ctx'> 	if (!priv-&gt;src_sd)</div><div class='ctx'> 		return -EPIPE;</div><div class='ctx'> </div><div class='del'>-	src = &amp;priv-&gt;src_sd-&gt;entity;</div><div class='add'>+	sd = priv-&gt;src_sd;</div><div class='add'>+	src = &amp;sd-&gt;entity;</div><div class='ctx'> </div><div class='ctx'> 	if (src-&gt;function == MEDIA_ENT_F_VID_MUX) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -186,6 +184,14 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv,</div><div class='ctx'> 			src = &amp;sd-&gt;entity;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the source is neither the video mux nor the CSI-2 receiver,</div><div class='add'>+	 * get the source pad directly upstream from CSI itself.</div><div class='add'>+	 */</div><div class='add'>+	if (src-&gt;function != MEDIA_ENT_F_VID_MUX &amp;&amp;</div><div class='add'>+	    sd-&gt;grp_id != IMX_MEDIA_GRP_ID_CSI2)</div><div class='add'>+		src = &amp;priv-&gt;sd.entity;</div><div class='add'>+</div><div class='ctx'> 	/* get source pad of entity directly upstream from src */</div><div class='ctx'> 	pad = imx_media_find_upstream_pad(priv-&gt;md, src, 0);</div><div class='ctx'> 	if (IS_ERR(pad))</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-dev-common.c b/drivers/staging/media/imx/imx-media-dev-common.c<br/>index 910594125889..6cd93419b81d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-dev-common.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-dev-common.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-dev-common.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-dev-common.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, imxmd);</div><div class='ctx'> </div><div class='del'>-	strlcpy(imxmd-&gt;md.model, "imx-media", sizeof(imxmd-&gt;md.model));</div><div class='add'>+	strscpy(imxmd-&gt;md.model, "imx-media", sizeof(imxmd-&gt;md.model));</div><div class='ctx'> 	imxmd-&gt;md.ops = &amp;imx_media_md_ops;</div><div class='ctx'> 	imxmd-&gt;md.dev = dev;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +38,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	imxmd-&gt;v4l2_dev.mdev = &amp;imxmd-&gt;md;</div><div class='ctx'> 	imxmd-&gt;v4l2_dev.notify = imx_media_notify;</div><div class='del'>-	strlcpy(imxmd-&gt;v4l2_dev.name, "imx-media",</div><div class='add'>+	strscpy(imxmd-&gt;v4l2_dev.name, "imx-media",</div><div class='ctx'> 		sizeof(imxmd-&gt;v4l2_dev.name));</div><div class='ctx'> </div><div class='ctx'> 	media_device_init(&amp;imxmd-&gt;md);</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c<br/>index 28a3d23aad5b..6be95584006d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-dev.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Media Controller Driver for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -50,12 +46,14 @@ int imx_media_add_async_subdev(struct imx_media_dev *imxmd,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fwnode) {</div><div class='del'>-		asd = v4l2_async_notifier_add_fwnode_subdev(</div><div class='del'>-			&amp;imxmd-&gt;notifier, fwnode, sizeof(*imxasd));</div><div class='add'>+		asd = v4l2_async_notifier_add_fwnode_subdev(&amp;imxmd-&gt;notifier,</div><div class='add'>+							    fwnode,</div><div class='add'>+							    sizeof(*imxasd));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		devname = dev_name(&amp;pdev-&gt;dev);</div><div class='del'>-		asd = v4l2_async_notifier_add_devname_subdev(</div><div class='del'>-			&amp;imxmd-&gt;notifier, devname, sizeof(*imxasd));</div><div class='add'>+		asd = v4l2_async_notifier_add_devname_subdev(&amp;imxmd-&gt;notifier,</div><div class='add'>+							     devname,</div><div class='add'>+							     sizeof(*imxasd));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(asd)) {</div><div class='hunk'>@@ -266,10 +264,9 @@ static int imx_media_alloc_pad_vdev_lists(struct imx_media_dev *imxmd)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(sd, &amp;imxmd-&gt;v4l2_dev.subdevs, list) {</div><div class='ctx'> 		entity = &amp;sd-&gt;entity;</div><div class='del'>-		vdev_lists = devm_kcalloc(</div><div class='del'>-			imxmd-&gt;md.dev,</div><div class='del'>-			entity-&gt;num_pads, sizeof(*vdev_lists),</div><div class='del'>-			GFP_KERNEL);</div><div class='add'>+		vdev_lists = devm_kcalloc(imxmd-&gt;md.dev,</div><div class='add'>+					  entity-&gt;num_pads, sizeof(*vdev_lists),</div><div class='add'>+					  GFP_KERNEL);</div><div class='ctx'> 		if (!vdev_lists)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -477,13 +474,6 @@ static int imx_media_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = imx_media_add_internal_subdevs(imxmd);</div><div class='del'>-	if (ret) {</div><div class='del'>-		v4l2_err(&amp;imxmd-&gt;v4l2_dev,</div><div class='del'>-			 "add_internal_subdevs failed with %d\n", ret);</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = imx_media_dev_notifier_register(imxmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto del_int;</div><div class='hunk'>@@ -491,7 +481,7 @@ static int imx_media_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> del_int:</div><div class='del'>-	imx_media_remove_internal_subdevs(imxmd);</div><div class='add'>+	imx_media_remove_ipu_internal_subdevs(imxmd);</div><div class='ctx'> cleanup:</div><div class='ctx'> 	v4l2_async_notifier_cleanup(&amp;imxmd-&gt;notifier);</div><div class='ctx'> 	v4l2_device_unregister(&amp;imxmd-&gt;v4l2_dev);</div><div class='hunk'>@@ -508,7 +498,7 @@ static int imx_media_remove(struct platform_device *pdev)</div><div class='ctx'> 	v4l2_info(&amp;imxmd-&gt;v4l2_dev, "Removing imx-media\n");</div><div class='ctx'> </div><div class='ctx'> 	v4l2_async_notifier_unregister(&amp;imxmd-&gt;notifier);</div><div class='del'>-	imx_media_remove_internal_subdevs(imxmd);</div><div class='add'>+	imx_media_remove_ipu_internal_subdevs(imxmd);</div><div class='ctx'> 	v4l2_async_notifier_cleanup(&amp;imxmd-&gt;notifier);</div><div class='ctx'> 	media_device_unregister(&amp;imxmd-&gt;md);</div><div class='ctx'> 	v4l2_device_unregister(&amp;imxmd-&gt;v4l2_dev);</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-fim.c b/drivers/staging/media/imx/imx-media-fim.c<br/>index 8cf773eef9da..2ab64bc30f5c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-fim.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-fim.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-fim.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-fim.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Frame Interval Monitor.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c<br/>index 5e10d95e5529..df49ebfbe98a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-internal-sd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-internal-sd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-internal-sd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-internal-sd.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Media driver for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='del'>- * Adds the internal subdevices and the media links between them.</div><div class='add'>+ * Adds the IPU internal subdevices and the media links between them.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include "imx-media.h"</div><div class='hunk'>@@ -192,7 +188,7 @@ static struct v4l2_subdev *find_sink(struct imx_media_dev *imxmd,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * retrieve IPU id from subdev name, note: can't get this from</div><div class='del'>-	 * struct imx_media_internal_sd_platformdata because if src is</div><div class='add'>+	 * struct imx_media_ipu_internal_sd_pdata because if src is</div><div class='ctx'> 	 * a CSI, it has different struct ipu_client_platformdata which</div><div class='ctx'> 	 * does not contain IPU id.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -270,7 +266,7 @@ static int add_internal_subdev(struct imx_media_dev *imxmd,</div><div class='ctx'> 			       const struct internal_subdev *isd,</div><div class='ctx'> 			       int ipu_id)</div><div class='ctx'> {</div><div class='del'>-	struct imx_media_internal_sd_platformdata pdata;</div><div class='add'>+	struct imx_media_ipu_internal_sd_pdata pdata;</div><div class='ctx'> 	struct platform_device_info pdevinfo = {};</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> </div><div class='hunk'>@@ -298,13 +294,14 @@ static int add_internal_subdev(struct imx_media_dev *imxmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* adds the internal subdevs in one ipu */</div><div class='del'>-static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id)</div><div class='add'>+int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd,</div><div class='add'>+				       int ipu_id)</div><div class='ctx'> {</div><div class='ctx'> 	enum isd_enum i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_isd; i++) {</div><div class='ctx'> 		const struct internal_subdev *isd = &amp;int_subdev[i];</div><div class='del'>-		int ret;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * the CSIs are represented in the device-tree, so those</div><div class='hunk'>@@ -322,32 +319,17 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			goto remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = add_ipu_internal_subdevs(imxmd, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto remove;</div><div class='del'>-</div><div class='del'>-	ret = add_ipu_internal_subdevs(imxmd, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto remove;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> </div><div class='ctx'> remove:</div><div class='del'>-	imx_media_remove_internal_subdevs(imxmd);</div><div class='add'>+	imx_media_remove_ipu_internal_subdevs(imxmd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd)</div><div class='add'>+void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct imx_media_async_subdev *imxasd;</div><div class='ctx'> 	struct v4l2_async_subdev *asd;</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c<br/>index 03446335ac03..990e82aa8e42 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-of.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-of.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-of.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-of.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * Media driver for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Open Firmware parsing.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ctrls.h&gt;</div><div class='hunk'>@@ -23,36 +19,25 @@</div><div class='ctx'> int imx_media_of_add_csi(struct imx_media_dev *imxmd,</div><div class='ctx'> 			 struct device_node *csi_np)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (!of_device_is_available(csi_np)) {</div><div class='ctx'> 		dev_dbg(imxmd-&gt;md.dev, "%s: %pOFn not enabled\n", __func__,</div><div class='ctx'> 			csi_np);</div><div class='del'>-		/* unavailable is not an error */</div><div class='del'>-		return 0;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add CSI fwnode to async notifier */</div><div class='del'>-	ret = imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), NULL);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (ret == -EEXIST) {</div><div class='del'>-			/* already added, everything is fine */</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* other error, can't continue */</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np),</div><div class='add'>+					  NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(imx_media_of_add_csi);</div><div class='ctx'> </div><div class='ctx'> int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,</div><div class='ctx'> 			     struct device_node *np)</div><div class='ctx'> {</div><div class='add'>+	bool ipu_found[2] = {false, false};</div><div class='ctx'> 	struct device_node *csi_np;</div><div class='ctx'> 	int i, ret;</div><div class='add'>+	u32 ipu_id;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; ; i++) {</div><div class='ctx'> 		csi_np = of_parse_phandle(np, "ports", i);</div><div class='hunk'>@@ -60,12 +45,43 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		ret = imx_media_of_add_csi(imxmd, csi_np);</div><div class='del'>-		of_node_put(csi_np);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* unavailable or already added is not an error */</div><div class='add'>+			if (ret == -ENODEV || ret == -EEXIST) {</div><div class='add'>+				of_node_put(csi_np);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* other error, can't continue */</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = of_alias_get_id(csi_np-&gt;parent, "ipu");</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_out;</div><div class='add'>+		if (ret &gt; 1) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ipu_id = ret;</div><div class='add'>+</div><div class='add'>+		if (!ipu_found[ipu_id]) {</div><div class='add'>+			ret = imx_media_add_ipu_internal_subdevs(imxmd,</div><div class='add'>+								 ipu_id);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ipu_found[ipu_id] = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	imx_media_remove_ipu_internal_subdevs(imxmd);</div><div class='add'>+	of_node_put(csi_np);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -145,15 +161,18 @@ int imx_media_create_csi_of_links(struct imx_media_dev *imxmd,</div><div class='ctx'> 				  struct v4l2_subdev *csi)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *csi_np = csi-&gt;dev-&gt;of_node;</div><div class='del'>-	struct fwnode_handle *fwnode, *csi_ep;</div><div class='del'>-	struct v4l2_fwnode_link link;</div><div class='ctx'> 	struct device_node *ep;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	link.local_node = of_fwnode_handle(csi_np);</div><div class='del'>-	link.local_port = CSI_SINK_PAD;</div><div class='ctx'> </div><div class='ctx'> 	for_each_child_of_node(csi_np, ep) {</div><div class='add'>+		struct fwnode_handle *fwnode, *csi_ep;</div><div class='add'>+		struct v4l2_fwnode_link link;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		memset(&amp;link, 0, sizeof(link));</div><div class='add'>+</div><div class='add'>+		link.local_node = of_fwnode_handle(csi_np);</div><div class='add'>+		link.local_port = CSI_SINK_PAD;</div><div class='add'>+</div><div class='ctx'> 		csi_ep = of_fwnode_handle(ep);</div><div class='ctx'> </div><div class='ctx'> 		fwnode = fwnode_graph_get_remote_endpoint(csi_ep);</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c<br/>index 1c63a2765a81..b41842dba5ec 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-utils.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-utils.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-utils.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-utils.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Media Controller Driver for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include "imx-media.h"</div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c<br/>index 2808662e2597..4487374c9435 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-vdic.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media-vdic.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media-vdic.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media-vdic.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Deinterlacer Subdev for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2017 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -231,6 +227,12 @@ static void __maybe_unused prepare_vdi_in_buffers(struct vdic_priv *priv,</div><div class='ctx'> 		curr_phys = vb2_dma_contig_plane_dma_addr(curr_vb, 0);</div><div class='ctx'> 		next_phys = vb2_dma_contig_plane_dma_addr(curr_vb, 0) + is;</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * can't get here, priv-&gt;fieldtype can only be one of</div><div class='add'>+		 * the above. This is to quiet smatch errors.</div><div class='add'>+		 */</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipu_cpmem_set_buffer(priv-&gt;vdi_in_ch_p, 0, prev_phys);</div><div class='hunk'>@@ -744,7 +746,7 @@ static int vdic_link_setup(struct media_entity *entity,</div><div class='ctx'> 		remote_sd = media_entity_to_v4l2_subdev(remote-&gt;entity);</div><div class='ctx'> </div><div class='ctx'> 		/* direct pad must connect to a CSI */</div><div class='del'>-		if (!(remote_sd-&gt;grp_id &amp; IMX_MEDIA_GRP_ID_CSI) ||</div><div class='add'>+		if (!(remote_sd-&gt;grp_id &amp; IMX_MEDIA_GRP_ID_IPU_CSI) ||</div><div class='ctx'> 		    remote-&gt;index != CSI_SRC_PAD_DIRECT) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -934,7 +936,7 @@ static const struct v4l2_subdev_internal_ops vdic_internal_ops = {</div><div class='ctx'> </div><div class='ctx'> static int imx_vdic_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct imx_media_internal_sd_platformdata *pdata;</div><div class='add'>+	struct imx_media_ipu_internal_sd_pdata *pdata;</div><div class='ctx'> 	struct vdic_priv *priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -958,7 +960,7 @@ static int imx_vdic_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;</div><div class='ctx'> 	/* get our group id */</div><div class='ctx'> 	priv-&gt;sd.grp_id = pdata-&gt;grp_id;</div><div class='del'>-	strncpy(priv-&gt;sd.name, pdata-&gt;sd_name, sizeof(priv-&gt;sd.name));</div><div class='add'>+	strscpy(priv-&gt;sd.name, pdata-&gt;sd_name, sizeof(priv-&gt;sd.name));</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h<br/>index ae964c8d5be1..eb59ba0c3b62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx-media.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx-media.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx-media.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 Media Controller Driver for Freescale i.MX5/6 SOC</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2016 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _IMX_MEDIA_H</div><div class='ctx'> #define _IMX_MEDIA_H</div><div class='hunk'>@@ -115,7 +111,7 @@ struct imx_media_pad_vdev {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct imx_media_internal_sd_platformdata {</div><div class='add'>+struct imx_media_ipu_internal_sd_pdata {</div><div class='ctx'> 	char sd_name[V4L2_SUBDEV_NAME_SIZE];</div><div class='ctx'> 	u32 grp_id;</div><div class='ctx'> 	int ipu_id;</div><div class='hunk'>@@ -252,10 +248,11 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd);</div><div class='ctx'> void imx_media_fim_free(struct imx_media_fim *fim);</div><div class='ctx'> </div><div class='ctx'> /* imx-media-internal-sd.c */</div><div class='del'>-int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd);</div><div class='add'>+int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd,</div><div class='add'>+				       int ipu_id);</div><div class='ctx'> int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd,</div><div class='ctx'> 					struct v4l2_subdev *sd);</div><div class='del'>-void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd);</div><div class='add'>+void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd);</div><div class='ctx'> </div><div class='ctx'> /* imx-media-of.c */</div><div class='ctx'> int imx_media_add_of_subdevs(struct imx_media_dev *dev,</div><div class='head'>diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c<br/>index 6a1cee55a49b..f29e28df36ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx6-mipi-csi2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx6-mipi-csi2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx6-mipi-csi2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx6-mipi-csi2.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * MIPI CSI-2 Receiver Subdev for Freescale i.MX6 SOC.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2012-2017 Mentor Graphics Inc.</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, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -628,10 +624,8 @@ static int csi2_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	csi2-&gt;base = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start, PAGE_SIZE);</div><div class='del'>-	if (!csi2-&gt;base) {</div><div class='del'>-		v4l2_err(&amp;csi2-&gt;sd, "failed to map CSI-2 registers\n");</div><div class='add'>+	if (!csi2-&gt;base)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;csi2-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c<br/>index 3fba7c27c0ec..18eb5d3ecf10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx7-media-csi.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx7-media-csi.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx7-media-csi.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx7-media-csi.c</a></div><div class='hunk'>@@ -1051,7 +1051,9 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	imx7_csi_try_fmt(csi, cfg, sdformat, &amp;cc);</div><div class='add'>+	ret = imx7_csi_try_fmt(csi, cfg, sdformat, &amp;cc);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	fmt = imx7_csi_get_format(csi, cfg, sdformat-&gt;pad, sdformat-&gt;which);</div><div class='ctx'> 	if (!fmt) {</div><div class='hunk'>@@ -1271,7 +1273,7 @@ static int imx7_csi_probe(struct platform_device *pdev)</div><div class='ctx'> 	platform_set_drvdata(pdev, &amp;csi-&gt;sd);</div><div class='ctx'> </div><div class='ctx'> 	ret = imx_media_of_add_csi(imxmd, node);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret != -ENODEV &amp;&amp; ret != -EEXIST)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	ret = imx_media_dev_notifier_register(imxmd);</div><div class='head'>diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c<br/>index 2ddcc42ab8ff..19455f425416 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx7-mipi-csis.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/imx/imx7-mipi-csis.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/imx/imx7-mipi-csis.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/imx/imx7-mipi-csis.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -491,7 +492,7 @@ static int mipi_csis_clk_get(struct csi_state *state)</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;wrap_clk = devm_clk_get(dev, "wrap");</div><div class='ctx'> 	if (IS_ERR(state-&gt;wrap_clk))</div><div class='del'>-		return IS_ERR(state-&gt;wrap_clk);</div><div class='add'>+		return PTR_ERR(state-&gt;wrap_clk);</div><div class='ctx'> </div><div class='ctx'> 	/* Set clock rate */</div><div class='ctx'> 	ret = clk_set_rate(state-&gt;wrap_clk, state-&gt;clk_frequency);</div><div class='hunk'>@@ -706,7 +707,7 @@ static int mipi_csis_set_fmt(struct v4l2_subdev *mipi_sd,</div><div class='ctx'> 	fmt = mipi_csis_get_format(state, cfg, sdformat-&gt;which, sdformat-&gt;pad);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;state-&gt;lock);</div><div class='del'>-	if (fmt &amp;&amp; sdformat-&gt;pad == CSIS_PAD_SOURCE) {</div><div class='add'>+	if (sdformat-&gt;pad == CSIS_PAD_SOURCE) {</div><div class='ctx'> 		sdformat-&gt;format = *fmt;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -889,8 +890,6 @@ static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int mipi_csis_dump_regs_show(struct seq_file *m, void *private)</div><div class='ctx'> {</div><div class='hunk'>@@ -900,7 +899,7 @@ static int mipi_csis_dump_regs_show(struct seq_file *m, void *private)</div><div class='ctx'> }</div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(mipi_csis_dump_regs);</div><div class='ctx'> </div><div class='del'>-static int __init_or_module mipi_csis_debugfs_init(struct csi_state *state)</div><div class='add'>+static int mipi_csis_debugfs_init(struct csi_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *d;</div><div class='ctx'> </div><div class='hunk'>@@ -934,17 +933,6 @@ static void mipi_csis_debugfs_exit(struct csi_state *state)</div><div class='ctx'> 	debugfs_remove_recursive(state-&gt;debugfs_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-static int mipi_csis_debugfs_init(struct csi_state *state __maybe_unused)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mipi_csis_debugfs_exit(struct csi_state *state __maybe_unused)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int mipi_csis_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -1039,8 +1027,7 @@ disable_clock:</div><div class='ctx'> </div><div class='ctx'> static int mipi_csis_pm_suspend(struct device *dev, bool runtime)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct v4l2_subdev *mipi_sd = platform_get_drvdata(pdev);</div><div class='add'>+	struct v4l2_subdev *mipi_sd = dev_get_drvdata(dev);</div><div class='ctx'> 	struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1064,8 +1051,7 @@ unlock:</div><div class='ctx'> </div><div class='ctx'> static int mipi_csis_pm_resume(struct device *dev, bool runtime)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct v4l2_subdev *mipi_sd = platform_get_drvdata(pdev);</div><div class='add'>+	struct v4l2_subdev *mipi_sd = dev_get_drvdata(dev);</div><div class='ctx'> 	struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/ipu3/Kconfig b/drivers/staging/media/ipu3/Kconfig<br/>index 75cd889f18f7..4b51c67eac88 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/ipu3/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config VIDEO_IPU3_IMGU</div><div class='ctx'> 	tristate "Intel ipu3-imgu driver"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L2</div><div class='hunk'>@@ -5,7 +6,7 @@ config VIDEO_IPU3_IMGU</div><div class='ctx'> 	depends on X86</div><div class='ctx'> 	select IOMMU_IOVA</div><div class='ctx'> 	select VIDEOBUF2_DMA_SG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the Video4Linux2 driver for Intel IPU3 image processing unit,</div><div class='ctx'> 	  found in Intel Skylake and Kaby Lake SoCs and used for processing</div><div class='ctx'> 	  images and video.</div><div class='head'>diff --git a/drivers/staging/media/ipu3/Makefile b/drivers/staging/media/ipu3/Makefile<br/>index fa7fa3372bcb..cc288ae6d5f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/ipu3/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the IPU3 ImgU drivers</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/media/ipu3/ipu3-css.c b/drivers/staging/media/ipu3/ipu3-css.c<br/>index 15ab77e4b766..23cf5b2cfe8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/ipu3-css.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/ipu3-css.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/ipu3-css.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/ipu3/ipu3-css.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipu3-css.h"</div><div class='ctx'> #include "ipu3-css-fw.h"</div><div class='hunk'>@@ -1744,15 +1745,18 @@ int imgu_css_fmt_try(struct imgu_css *css,</div><div class='ctx'> 	struct v4l2_rect *const bds = &amp;r[IPU3_CSS_RECT_BDS];</div><div class='ctx'> 	struct v4l2_rect *const env = &amp;r[IPU3_CSS_RECT_ENVELOPE];</div><div class='ctx'> 	struct v4l2_rect *const gdc = &amp;r[IPU3_CSS_RECT_GDC];</div><div class='del'>-	struct imgu_css_queue q[IPU3_CSS_QUEUES];</div><div class='del'>-	struct v4l2_pix_format_mplane *const in =</div><div class='del'>-					&amp;q[IPU3_CSS_QUEUE_IN].fmt.mpix;</div><div class='del'>-	struct v4l2_pix_format_mplane *const out =</div><div class='del'>-					&amp;q[IPU3_CSS_QUEUE_OUT].fmt.mpix;</div><div class='del'>-	struct v4l2_pix_format_mplane *const vf =</div><div class='del'>-					&amp;q[IPU3_CSS_QUEUE_VF].fmt.mpix;</div><div class='add'>+	struct imgu_css_queue *q;</div><div class='add'>+	struct v4l2_pix_format_mplane *in, *out, *vf;</div><div class='ctx'> 	int i, s, ret;</div><div class='ctx'> </div><div class='add'>+	q = kcalloc(IPU3_CSS_QUEUES, sizeof(struct imgu_css_queue), GFP_KERNEL);</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	in  = &amp;q[IPU3_CSS_QUEUE_IN].fmt.mpix;</div><div class='add'>+	out = &amp;q[IPU3_CSS_QUEUE_OUT].fmt.mpix;</div><div class='add'>+	vf  = &amp;q[IPU3_CSS_QUEUE_VF].fmt.mpix;</div><div class='add'>+</div><div class='ctx'> 	/* Adjust all formats, get statistics buffer sizes and formats */</div><div class='ctx'> 	for (i = 0; i &lt; IPU3_CSS_QUEUES; i++) {</div><div class='ctx'> 		if (fmts[i])</div><div class='hunk'>@@ -1766,7 +1770,8 @@ int imgu_css_fmt_try(struct imgu_css *css,</div><div class='ctx'> 					IPU3_CSS_QUEUE_TO_FLAGS(i))) {</div><div class='ctx'> 			dev_notice(css-&gt;dev, "can not initialize queue %s\n",</div><div class='ctx'> 				   qnames[i]);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; IPU3_CSS_RECTS; i++) {</div><div class='hunk'>@@ -1788,7 +1793,8 @@ int imgu_css_fmt_try(struct imgu_css *css,</div><div class='ctx'> 	if (!imgu_css_queue_enabled(&amp;q[IPU3_CSS_QUEUE_IN]) ||</div><div class='ctx'> 	    !imgu_css_queue_enabled(&amp;q[IPU3_CSS_QUEUE_OUT])) {</div><div class='ctx'> 		dev_warn(css-&gt;dev, "required queues are disabled\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!imgu_css_queue_enabled(&amp;q[IPU3_CSS_QUEUE_OUT])) {</div><div class='hunk'>@@ -1829,7 +1835,8 @@ int imgu_css_fmt_try(struct imgu_css *css,</div><div class='ctx'> 	ret = imgu_css_find_binary(css, pipe, q, r);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(css-&gt;dev, "failed to find suitable binary\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	css-&gt;pipes[pipe].bindex = ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1843,7 +1850,8 @@ int imgu_css_fmt_try(struct imgu_css *css,</div><div class='ctx'> 						IPU3_CSS_QUEUE_TO_FLAGS(i))) {</div><div class='ctx'> 				dev_err(css-&gt;dev,</div><div class='ctx'> 					"final resolution adjustment failed\n");</div><div class='del'>-				return -EINVAL;</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			*fmts[i] = q[i].fmt.mpix;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1859,7 +1867,10 @@ int imgu_css_fmt_try(struct imgu_css *css,</div><div class='ctx'> 		 bds-&gt;width, bds-&gt;height, gdc-&gt;width, gdc-&gt;height,</div><div class='ctx'> 		 out-&gt;width, out-&gt;height, vf-&gt;width, vf-&gt;height);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(q);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int imgu_css_fmt_set(struct imgu_css *css,</div><div class='hunk'>@@ -2160,11 +2171,6 @@ int imgu_css_set_parameters(struct imgu_css *css, unsigned int pipe,</div><div class='ctx'> 	obgrid_size = imgu_css_fw_obgrid_size(bi);</div><div class='ctx'> 	stripes = bi-&gt;info.isp.sp.iterator.num_stripes ? : 1;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TODO(b/118782861): If userspace queues more than 4 buffers, the</div><div class='del'>-	 * parameters from previous buffers will be overwritten. Fix the driver</div><div class='del'>-	 * not to allow this.</div><div class='del'>-	 */</div><div class='ctx'> 	imgu_css_pool_get(&amp;css_pipe-&gt;pool.parameter_set_info);</div><div class='ctx'> 	param_set = imgu_css_pool_last(&amp;css_pipe-&gt;pool.parameter_set_info,</div><div class='ctx'> 				       0)-&gt;vaddr;</div><div class='head'>diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c<br/>index 9c0352b193a7..a7bc22040ed8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/ipu3-v4l2.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/ipu3-v4l2.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/ipu3-v4l2.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/ipu3/ipu3-v4l2.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static int imgu_subdev_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 	struct imgu_css_pipe *css_pipe = &amp;imgu-&gt;css.pipes[pipe];</div><div class='ctx'> 	struct imgu_media_pipe *imgu_pipe = &amp;imgu-&gt;imgu_pipe[pipe];</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s %d for pipe %d", __func__, enable, pipe);</div><div class='add'>+	dev_dbg(dev, "%s %d for pipe %u", __func__, enable, pipe);</div><div class='ctx'> 	/* grab ctrl after streamon and return after off */</div><div class='ctx'> 	v4l2_ctrl_grab(imgu_sd-&gt;ctrl, enable);</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +101,7 @@ static int imgu_subdev_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 	else</div><div class='ctx'> 		css_pipe-&gt;pipe_id = IPU3_CSS_PIPE_ID_CAPTURE;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "IPU3 pipe %d pipe_id %d", pipe, css_pipe-&gt;pipe_id);</div><div class='add'>+	dev_dbg(dev, "IPU3 pipe %u pipe_id %u", pipe, css_pipe-&gt;pipe_id);</div><div class='ctx'> </div><div class='ctx'> 	rects[IPU3_CSS_RECT_EFFECTIVE] = &amp;imgu_sd-&gt;rect.eff;</div><div class='ctx'> 	rects[IPU3_CSS_RECT_BDS] = &amp;imgu_sd-&gt;rect.bds;</div><div class='hunk'>@@ -109,7 +109,7 @@ static int imgu_subdev_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> </div><div class='ctx'> 	r = imgu_css_fmt_set(&amp;imgu-&gt;css, fmts, rects, pipe);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(dev, "failed to set initial formats pipe %d with (%d)",</div><div class='add'>+		dev_err(dev, "failed to set initial formats pipe %u with (%d)",</div><div class='ctx'> 			pipe, r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -157,7 +157,7 @@ static int imgu_subdev_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 	u32 pad = fmt-&gt;pad;</div><div class='ctx'> 	unsigned int pipe = imgu_sd-&gt;pipe;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "set subdev %d pad %d fmt to [%dx%d]",</div><div class='add'>+	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "set subdev %u pad %u fmt to [%ux%u]",</div><div class='ctx'> 		pipe, pad, fmt-&gt;format.width, fmt-&gt;format.height);</div><div class='ctx'> </div><div class='ctx'> 	imgu_pipe = &amp;imgu-&gt;imgu_pipe[pipe];</div><div class='hunk'>@@ -233,7 +233,7 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,</div><div class='ctx'> 	struct v4l2_rect *rect, *try_sel;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev,</div><div class='del'>-		 "set subdev %d sel which %d target 0x%4x rect [%dx%d]",</div><div class='add'>+		 "set subdev %u sel which %u target 0x%4x rect [%ux%u]",</div><div class='ctx'> 		 imgu_sd-&gt;pipe, sel-&gt;which, sel-&gt;target,</div><div class='ctx'> 		 sel-&gt;r.width, sel-&gt;r.height);</div><div class='ctx'> </div><div class='hunk'>@@ -279,7 +279,7 @@ static int imgu_link_setup(struct media_entity *entity,</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(pad &gt;= IMGU_NODE_NUM);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "pipe %d pad %d is %s", pipe, pad,</div><div class='add'>+	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "pipe %u pad %u is %s", pipe, pad,</div><div class='ctx'> 		 flags &amp; MEDIA_LNK_FL_ENABLED ? "enabled" : "disabled");</div><div class='ctx'> </div><div class='ctx'> 	imgu_pipe = &amp;imgu-&gt;imgu_pipe[pipe];</div><div class='hunk'>@@ -294,7 +294,7 @@ static int imgu_link_setup(struct media_entity *entity,</div><div class='ctx'> 	else</div><div class='ctx'> 		__clear_bit(pipe, imgu-&gt;css.enabled_pipes);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "pipe %d is %s", pipe,</div><div class='add'>+	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "pipe %u is %s", pipe,</div><div class='ctx'> 		 flags &amp; MEDIA_LNK_FL_ENABLED ? "enabled" : "disabled");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -341,8 +341,10 @@ static void imgu_vb2_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	struct imgu_video_device *node =</div><div class='ctx'> 		container_of(vb-&gt;vb2_queue, struct imgu_video_device, vbq);</div><div class='ctx'> 	unsigned int queue = imgu_node_to_queue(node-&gt;id);</div><div class='add'>+	struct imgu_buffer *buf = container_of(vb, struct imgu_buffer,</div><div class='add'>+					       vid_buf.vbb.vb2_buf);</div><div class='ctx'> 	unsigned long need_bytes;</div><div class='del'>-	unsigned int pipe = node-&gt;pipe;</div><div class='add'>+	unsigned long payload = vb2_get_plane_payload(vb, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (vb-&gt;vb2_queue-&gt;type == V4L2_BUF_TYPE_META_CAPTURE ||</div><div class='ctx'> 	    vb-&gt;vb2_queue-&gt;type == V4L2_BUF_TYPE_META_OUTPUT)</div><div class='hunk'>@@ -350,42 +352,26 @@ static void imgu_vb2_buf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	else</div><div class='ctx'> 		need_bytes = node-&gt;vdev_fmt.fmt.pix_mp.plane_fmt[0].sizeimage;</div><div class='ctx'> </div><div class='del'>-	if (queue == IPU3_CSS_QUEUE_PARAMS) {</div><div class='del'>-		unsigned long payload = vb2_get_plane_payload(vb, 0);</div><div class='del'>-		struct vb2_v4l2_buffer *buf =</div><div class='del'>-			container_of(vb, struct vb2_v4l2_buffer, vb2_buf);</div><div class='del'>-		int r = -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (payload == 0) {</div><div class='del'>-			payload = need_bytes;</div><div class='del'>-			vb2_set_plane_payload(vb, 0, payload);</div><div class='del'>-		}</div><div class='del'>-		if (payload &gt;= need_bytes)</div><div class='del'>-			r = imgu_css_set_parameters(&amp;imgu-&gt;css, pipe,</div><div class='del'>-						    vb2_plane_vaddr(vb, 0));</div><div class='del'>-		buf-&gt;flags = V4L2_BUF_FLAG_DONE;</div><div class='del'>-		vb2_buffer_done(vb, r == 0 ? VB2_BUF_STATE_DONE</div><div class='del'>-					   : VB2_BUF_STATE_ERROR);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		struct imgu_buffer *buf = container_of(vb, struct imgu_buffer,</div><div class='del'>-						       vid_buf.vbb.vb2_buf);</div><div class='add'>+	if (queue == IPU3_CSS_QUEUE_PARAMS &amp;&amp; payload &amp;&amp; payload &lt; need_bytes) {</div><div class='add'>+		dev_err(&amp;imgu-&gt;pci_dev-&gt;dev, "invalid data size for params.");</div><div class='add'>+		vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;imgu-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;imgu-&gt;lock);</div><div class='add'>+	if (queue != IPU3_CSS_QUEUE_PARAMS)</div><div class='ctx'> 		imgu_css_buf_init(&amp;buf-&gt;css_buf, queue, buf-&gt;map.daddr);</div><div class='del'>-		list_add_tail(&amp;buf-&gt;vid_buf.list,</div><div class='del'>-			      &amp;node-&gt;buffers);</div><div class='del'>-		mutex_unlock(&amp;imgu-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		vb2_set_plane_payload(&amp;buf-&gt;vid_buf.vbb.vb2_buf, 0, need_bytes);</div><div class='add'>+	list_add_tail(&amp;buf-&gt;vid_buf.list, &amp;node-&gt;buffers);</div><div class='add'>+	mutex_unlock(&amp;imgu-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		if (imgu-&gt;streaming)</div><div class='del'>-			imgu_queue_buffers(imgu, false, pipe);</div><div class='del'>-	}</div><div class='add'>+	vb2_set_plane_payload(vb, 0, need_bytes);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "%s for pipe %d node %d", __func__,</div><div class='del'>-		node-&gt;pipe, node-&gt;id);</div><div class='add'>+	if (imgu-&gt;streaming)</div><div class='add'>+		imgu_queue_buffers(imgu, false, node-&gt;pipe);</div><div class='ctx'> </div><div class='add'>+	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "%s for pipe %u node %u", __func__,</div><div class='add'>+		node-&gt;pipe, node-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int imgu_vb2_queue_setup(struct vb2_queue *vq,</div><div class='hunk'>@@ -435,7 +421,7 @@ static bool imgu_all_nodes_streaming(struct imgu_device *imgu,</div><div class='ctx'> 	pipe = except-&gt;pipe;</div><div class='ctx'> 	if (!test_bit(pipe, imgu-&gt;css.enabled_pipes)) {</div><div class='ctx'> 		dev_warn(&amp;imgu-&gt;pci_dev-&gt;dev,</div><div class='del'>-			 "pipe %d link is not ready yet", pipe);</div><div class='add'>+			 "pipe %u link is not ready yet", pipe);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +465,7 @@ static int imgu_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> 	int r;</div><div class='ctx'> 	unsigned int pipe;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s node name %s pipe %d id %u", __func__,</div><div class='add'>+	dev_dbg(dev, "%s node name %s pipe %u id %u", __func__,</div><div class='ctx'> 		node-&gt;name, node-&gt;pipe, node-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	if (imgu-&gt;streaming) {</div><div class='hunk'>@@ -539,7 +525,7 @@ static void imgu_vb2_stop_streaming(struct vb2_queue *vq)</div><div class='ctx'> 	WARN_ON(!node-&gt;enabled);</div><div class='ctx'> </div><div class='ctx'> 	pipe = node-&gt;pipe;</div><div class='del'>-	dev_dbg(dev, "Try to stream off node [%d][%d]", pipe, node-&gt;id);</div><div class='add'>+	dev_dbg(dev, "Try to stream off node [%u][%u]", pipe, node-&gt;id);</div><div class='ctx'> 	imgu_pipe = &amp;imgu-&gt;imgu_pipe[pipe];</div><div class='ctx'> 	r = v4l2_subdev_call(&amp;imgu_pipe-&gt;imgu_sd.subdev, video, s_stream, 0);</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -664,20 +650,19 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,</div><div class='ctx'> 		    struct v4l2_format *f, bool try)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;imgu-&gt;pci_dev-&gt;dev;</div><div class='del'>-	struct v4l2_pix_format_mplane try_fmts[IPU3_CSS_QUEUES];</div><div class='ctx'> 	struct v4l2_pix_format_mplane *fmts[IPU3_CSS_QUEUES] = { NULL };</div><div class='ctx'> 	struct v4l2_rect *rects[IPU3_CSS_RECTS] = { NULL };</div><div class='ctx'> 	struct v4l2_mbus_framefmt pad_fmt;</div><div class='ctx'> 	unsigned int i, css_q;</div><div class='del'>-	int r;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct imgu_css_pipe *css_pipe = &amp;imgu-&gt;css.pipes[pipe];</div><div class='ctx'> 	struct imgu_media_pipe *imgu_pipe = &amp;imgu-&gt;imgu_pipe[pipe];</div><div class='ctx'> 	struct imgu_v4l2_subdev *imgu_sd = &amp;imgu_pipe-&gt;imgu_sd;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "set fmt node [%u][%u](try = %d)", pipe, node, try);</div><div class='add'>+	dev_dbg(dev, "set fmt node [%u][%u](try = %u)", pipe, node, try);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IMGU_NODE_NUM; i++)</div><div class='del'>-		dev_dbg(dev, "IMGU pipe %d node %d enabled = %d",</div><div class='add'>+		dev_dbg(dev, "IMGU pipe %u node %u enabled = %u",</div><div class='ctx'> 			pipe, i, imgu_pipe-&gt;nodes[i].enabled);</div><div class='ctx'> </div><div class='ctx'> 	if (imgu_pipe-&gt;nodes[IMGU_NODE_VF].enabled)</div><div class='hunk'>@@ -688,7 +673,7 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,</div><div class='ctx'> 	else</div><div class='ctx'> 		css_pipe-&gt;pipe_id = IPU3_CSS_PIPE_ID_CAPTURE;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "IPU3 pipe %d pipe_id = %d", pipe, css_pipe-&gt;pipe_id);</div><div class='add'>+	dev_dbg(dev, "IPU3 pipe %u pipe_id = %u", pipe, css_pipe-&gt;pipe_id);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IPU3_CSS_QUEUES; i++) {</div><div class='ctx'> 		unsigned int inode = imgu_map_node(imgu, i);</div><div class='hunk'>@@ -698,9 +683,13 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (try) {</div><div class='del'>-			try_fmts[i] =</div><div class='del'>-				imgu_pipe-&gt;nodes[inode].vdev_fmt.fmt.pix_mp;</div><div class='del'>-			fmts[i] = &amp;try_fmts[i];</div><div class='add'>+			fmts[i] = kmemdup(&amp;imgu_pipe-&gt;nodes[inode].vdev_fmt.fmt.pix_mp,</div><div class='add'>+					  sizeof(struct v4l2_pix_format_mplane),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+			if (!fmts[i]) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fmts[i] = &amp;imgu_pipe-&gt;nodes[inode].vdev_fmt.fmt.pix_mp;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -730,26 +719,33 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,</div><div class='ctx'> 	 * before we return success from this function, so set it here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	css_q = imgu_node_to_queue(node);</div><div class='del'>-	if (fmts[css_q])</div><div class='del'>-		*fmts[css_q] = f-&gt;fmt.pix_mp;</div><div class='del'>-	else</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!fmts[css_q]) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*fmts[css_q] = f-&gt;fmt.pix_mp;</div><div class='ctx'> </div><div class='ctx'> 	if (try)</div><div class='del'>-		r = imgu_css_fmt_try(&amp;imgu-&gt;css, fmts, rects, pipe);</div><div class='add'>+		ret = imgu_css_fmt_try(&amp;imgu-&gt;css, fmts, rects, pipe);</div><div class='ctx'> 	else</div><div class='del'>-		r = imgu_css_fmt_set(&amp;imgu-&gt;css, fmts, rects, pipe);</div><div class='add'>+		ret = imgu_css_fmt_set(&amp;imgu-&gt;css, fmts, rects, pipe);</div><div class='ctx'> </div><div class='del'>-	/* r is the binary number in the firmware blob */</div><div class='del'>-	if (r &lt; 0)</div><div class='del'>-		return r;</div><div class='add'>+	/* ret is the binary number in the firmware blob */</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (try)</div><div class='ctx'> 		f-&gt;fmt.pix_mp = *fmts[css_q];</div><div class='ctx'> 	else</div><div class='ctx'> 		f-&gt;fmt = imgu_pipe-&gt;nodes[node].vdev_fmt.fmt;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	if (try) {</div><div class='add'>+		for (i = 0; i &lt; IPU3_CSS_QUEUES; i++)</div><div class='add'>+			kfree(fmts[i]);</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 imgu_try_fmt(struct file *file, void *fh, struct v4l2_format *f)</div><div class='hunk'>@@ -781,7 +777,7 @@ static int imgu_vidioc_try_fmt(struct file *file, void *fh,</div><div class='ctx'> 	struct v4l2_pix_format_mplane *pix_mp = &amp;f-&gt;fmt.pix_mp;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s [%ux%u] for node %d\n", __func__,</div><div class='add'>+	dev_dbg(dev, "%s [%ux%u] for node %u\n", __func__,</div><div class='ctx'> 		pix_mp-&gt;width, pix_mp-&gt;height, node-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	r = imgu_try_fmt(file, fh, f);</div><div class='hunk'>@@ -799,7 +795,7 @@ static int imgu_vidioc_s_fmt(struct file *file, void *fh, struct v4l2_format *f)</div><div class='ctx'> 	struct v4l2_pix_format_mplane *pix_mp = &amp;f-&gt;fmt.pix_mp;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s [%ux%u] for node %d\n", __func__,</div><div class='add'>+	dev_dbg(dev, "%s [%ux%u] for node %u\n", __func__,</div><div class='ctx'> 		pix_mp-&gt;width, pix_mp-&gt;height, node-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	r = imgu_try_fmt(file, fh, f);</div><div class='hunk'>@@ -1022,7 +1018,7 @@ static int imgu_sd_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> 	struct imgu_device *imgu = v4l2_get_subdevdata(&amp;imgu_sd-&gt;subdev);</div><div class='ctx'> 	struct device *dev = &amp;imgu-&gt;pci_dev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "set val %d to ctrl 0x%8x for subdev %d",</div><div class='add'>+	dev_dbg(dev, "set val %d to ctrl 0x%8x for subdev %u",</div><div class='ctx'> 		ctrl-&gt;val, ctrl-&gt;id, imgu_sd-&gt;pipe);</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='hunk'>@@ -1122,7 +1118,7 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,</div><div class='ctx'> 	imgu_sd-&gt;subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE |</div><div class='ctx'> 				V4L2_SUBDEV_FL_HAS_EVENTS;</div><div class='ctx'> 	snprintf(imgu_sd-&gt;subdev.name, sizeof(imgu_sd-&gt;subdev.name),</div><div class='del'>-		 "%s %d", IMGU_NAME, pipe);</div><div class='add'>+		 "%s %u", IMGU_NAME, pipe);</div><div class='ctx'> 	v4l2_set_subdevdata(&amp;imgu_sd-&gt;subdev, imgu);</div><div class='ctx'> 	atomic_set(&amp;imgu_sd-&gt;running_mode, IPU3_RUNNING_MODE_VIDEO);</div><div class='ctx'> 	v4l2_ctrl_handler_init(hdl, 1);</div><div class='hunk'>@@ -1240,7 +1236,7 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize vdev */</div><div class='del'>-	snprintf(vdev-&gt;name, sizeof(vdev-&gt;name), "%s %d %s",</div><div class='add'>+	snprintf(vdev-&gt;name, sizeof(vdev-&gt;name), "%s %u %s",</div><div class='ctx'> 		 IMGU_NAME, pipe, node-&gt;name);</div><div class='ctx'> 	vdev-&gt;release = video_device_release_empty;</div><div class='ctx'> 	vdev-&gt;fops = &amp;imgu_v4l2_fops;</div><div class='hunk'>@@ -1335,7 +1331,7 @@ static int imgu_v4l2_register_pipes(struct imgu_device *imgu)</div><div class='ctx'> 		r = imgu_v4l2_subdev_register(imgu, &amp;imgu_pipe-&gt;imgu_sd, i);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			dev_err(&amp;imgu-&gt;pci_dev-&gt;dev,</div><div class='del'>-				"failed to register subdev%d ret (%d)\n", i, r);</div><div class='add'>+				"failed to register subdev%u ret (%d)\n", i, r);</div><div class='ctx'> 			goto pipes_cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> 		r = imgu_v4l2_nodes_setup_pipe(imgu, i);</div><div class='head'>diff --git a/drivers/staging/media/ipu3/ipu3.c b/drivers/staging/media/ipu3/ipu3.c<br/>index d575ac78c8f0..a7372395a101 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/ipu3.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/ipu3/ipu3.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/ipu3/ipu3.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/ipu3/ipu3.c</a></div><div class='hunk'>@@ -236,16 +236,45 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe</div><div class='ctx'> 	dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev, "Queue buffers to pipe %d", pipe);</div><div class='ctx'> 	mutex_lock(&amp;imgu-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (!imgu_css_pipe_queue_empty(&amp;imgu-&gt;css, pipe)) {</div><div class='add'>+		mutex_unlock(&amp;imgu-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Buffer set is queued to FW only when input buffer is ready */</div><div class='ctx'> 	for (node = IMGU_NODE_NUM - 1;</div><div class='ctx'> 	     imgu_queue_getbuf(imgu, IMGU_NODE_IN, pipe);</div><div class='ctx'> 	     node = node ? node - 1 : IMGU_NODE_NUM - 1) {</div><div class='del'>-</div><div class='ctx'> 		if (node == IMGU_NODE_VF &amp;&amp;</div><div class='ctx'> 		    !imgu_pipe-&gt;nodes[IMGU_NODE_VF].enabled) {</div><div class='ctx'> 			dev_warn(&amp;imgu-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 				 "Vf not enabled, ignore queue");</div><div class='ctx'> 			continue;</div><div class='add'>+		} else if (node == IMGU_NODE_PARAMS &amp;&amp;</div><div class='add'>+			   imgu_pipe-&gt;nodes[node].enabled) {</div><div class='add'>+			struct vb2_buffer *vb;</div><div class='add'>+			struct imgu_vb2_buffer *ivb;</div><div class='add'>+</div><div class='add'>+			/* No parameters for this frame */</div><div class='add'>+			if (list_empty(&amp;imgu_pipe-&gt;nodes[node].buffers))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ivb = list_first_entry(&amp;imgu_pipe-&gt;nodes[node].buffers,</div><div class='add'>+					       struct imgu_vb2_buffer, list);</div><div class='add'>+			vb = &amp;ivb-&gt;vbb.vb2_buf;</div><div class='add'>+			r = imgu_css_set_parameters(&amp;imgu-&gt;css, pipe,</div><div class='add'>+						    vb2_plane_vaddr(vb, 0));</div><div class='add'>+			if (r) {</div><div class='add'>+				vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);</div><div class='add'>+				dev_warn(&amp;imgu-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 "set parameters failed.");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			vb2_buffer_done(vb, VB2_BUF_STATE_DONE);</div><div class='add'>+			dev_dbg(&amp;imgu-&gt;pci_dev-&gt;dev,</div><div class='add'>+				"queue user parameters %d to css.", vb-&gt;index);</div><div class='add'>+			list_del(&amp;ivb-&gt;list);</div><div class='ctx'> 		} else if (imgu_pipe-&gt;queue_enabled[node]) {</div><div class='ctx'> 			struct imgu_css_buffer *buf =</div><div class='ctx'> 				imgu_queue_getbuf(imgu, node, pipe);</div><div class='hunk'>@@ -791,7 +820,7 @@ out:</div><div class='ctx'>  * PCI rpm framework checks the existence of driver rpm callbacks.</div><div class='ctx'>  * Place a dummy callback here to avoid rpm going into error state.</div><div class='ctx'>  */</div><div class='del'>-static int imgu_rpm_dummy_cb(struct device *dev)</div><div class='add'>+static __maybe_unused int imgu_rpm_dummy_cb(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/media/mt9t031/Kconfig b/drivers/staging/media/mt9t031/Kconfig<br/>deleted file mode 100644<br/>index 9a58aaf72edd..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/mt9t031/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/mt9t031/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-config SOC_CAMERA_MT9T031</div><div class='del'>-	tristate "mt9t031 support (DEPRECATED)"</div><div class='del'>-	depends on SOC_CAMERA &amp;&amp; I2C</div><div class='del'>-	help</div><div class='del'>-	  This driver supports MT9T031 cameras from Micron.</div><div class='head'>diff --git a/drivers/staging/media/mt9t031/Makefile b/drivers/staging/media/mt9t031/Makefile<br/>deleted file mode 100644<br/>index bfd24c442b33..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/mt9t031/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/mt9t031/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-$(CONFIG_SOC_CAMERA_MT9T031)		+= mt9t031.o</div><div class='head'>diff --git a/drivers/staging/media/mt9t031/TODO b/drivers/staging/media/mt9t031/TODO<br/>deleted file mode 100644<br/>index 15580a4f950c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/mt9t031/TODO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/mt9t031/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-This sensor driver needs to be converted to a regular</div><div class='del'>-v4l2 subdev driver. The soc_camera framework is deprecated and</div><div class='del'>-will be removed in the future. Unless someone does this work this</div><div class='del'>-sensor driver will be deleted when the soc_camera framework is</div><div class='del'>-deleted.</div><div class='head'>diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig<br/>index 841cc0b3ce13..4dcbc5065821 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/omap4iss/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/omap4iss/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/omap4iss/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/omap4iss/Kconfig</a></div><div class='hunk'>@@ -6,5 +6,5 @@ config VIDEO_OMAP4</div><div class='ctx'> 	depends on ARCH_OMAP4 || COMPILE_TEST</div><div class='ctx'> 	select MFD_SYSCON</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for an OMAP 4 ISS controller.</div><div class='head'>diff --git a/drivers/staging/media/rockchip/vpu/Kconfig b/drivers/staging/media/rockchip/vpu/Kconfig<br/>index 9a6fc1378242..fc54bbf6753d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/rockchip/vpu/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config VIDEO_ROCKCHIP_VPU</div><div class='ctx'> 	tristate "Rockchip VPU driver"</div><div class='ctx'> 	depends on ARCH_ROCKCHIP || COMPILE_TEST</div><div class='hunk'>@@ -5,7 +6,6 @@ config VIDEO_ROCKCHIP_VPU</div><div class='ctx'> 	select VIDEOBUF2_DMA_CONTIG</div><div class='ctx'> 	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	select V4L2_MEM2MEM_DEV</div><div class='del'>-	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Video Processing Unit present on Rockchip SoC,</div><div class='ctx'> 	  which accelerates video and image encoding and decoding.</div><div class='head'>diff --git a/drivers/staging/media/rockchip/vpu/Makefile b/drivers/staging/media/rockchip/vpu/Makefile<br/>index e9d733bb7632..ae5d143a0bfa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/rockchip/vpu/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu.o</div><div class='ctx'> </div><div class='ctx'> rockchip-vpu-y += \</div><div class='head'>diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c<br/>index 962412c79b91..58721c46fba4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;media/v4l2-event.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-mem2mem.h&gt;</div><div class='ctx'> #include &lt;media/videobuf2-core.h&gt;</div><div class='del'>-#include &lt;media/videobuf2-core.h&gt;</div><div class='ctx'> #include &lt;media/videobuf2-vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "rockchip_vpu_common.h"</div><div class='hunk'>@@ -463,7 +462,7 @@ static int rockchip_vpu_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vpu-&gt;mdev.dev = vpu-&gt;dev;</div><div class='del'>-	strlcpy(vpu-&gt;mdev.model, DRIVER_NAME, sizeof(vpu-&gt;mdev.model));</div><div class='add'>+	strscpy(vpu-&gt;mdev.model, DRIVER_NAME, sizeof(vpu-&gt;mdev.model));</div><div class='ctx'> 	media_device_init(&amp;vpu-&gt;mdev);</div><div class='ctx'> 	vpu-&gt;v4l2_dev.mdev = &amp;vpu-&gt;mdev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c<br/>index ab0fb2053620..fb5e36aedd8c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'>  * @is_compressed: Is it a compressed format?</div><div class='ctx'>  * @multiplanar: Is it a multiplanar variant format? (e.g. NV12M)</div><div class='ctx'>  */</div><div class='del'>-struct v4l2_format_info {</div><div class='add'>+struct rockchip_vpu_v4l2_format_info {</div><div class='ctx'> 	u32 format;</div><div class='ctx'> 	u32 header_size;</div><div class='ctx'> 	u8 num_planes;</div><div class='hunk'>@@ -52,10 +52,10 @@ struct v4l2_format_info {</div><div class='ctx'> 	u8 multiplanar;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct v4l2_format_info *</div><div class='del'>-v4l2_format_info(u32 format)</div><div class='add'>+static const struct rockchip_vpu_v4l2_format_info *</div><div class='add'>+rockchip_vpu_v4l2_format_info(u32 format)</div><div class='ctx'> {</div><div class='del'>-	static const struct v4l2_format_info formats[] = {</div><div class='add'>+	static const struct rockchip_vpu_v4l2_format_info formats[] = {</div><div class='ctx'> 		{ .format = V4L2_PIX_FMT_YUV420M,	.num_planes = 3, .cpp = { 1, 1, 1 }, .hsub = 2, .vsub = 2, .multiplanar = 1 },</div><div class='ctx'> 		{ .format = V4L2_PIX_FMT_NV12M,		.num_planes = 2, .cpp = { 1, 2, 0 }, .hsub = 2, .vsub = 2, .multiplanar = 1 },</div><div class='ctx'> 		{ .format = V4L2_PIX_FMT_YUYV,		.num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 2, .vsub = 1 },</div><div class='hunk'>@@ -76,11 +76,11 @@ static void</div><div class='ctx'> fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt,</div><div class='ctx'> 	       int pixelformat, int width, int height)</div><div class='ctx'> {</div><div class='del'>-	const struct v4l2_format_info *info;</div><div class='add'>+	const struct rockchip_vpu_v4l2_format_info *info;</div><div class='ctx'> 	struct v4l2_plane_pix_format *plane;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	info = v4l2_format_info(pixelformat);</div><div class='add'>+	info = rockchip_vpu_v4l2_format_info(pixelformat);</div><div class='ctx'> 	if (!info)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/soc_camera/Kconfig b/drivers/staging/media/soc_camera/Kconfig<br/>index bacd30f0348d..4a54db121574 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config SOC_CAMERA</div><div class='ctx'> 	tristate "SoC camera support"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; HAS_DMA &amp;&amp; I2C &amp;&amp; BROKEN</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/TODO b/drivers/staging/media/soc_camera/TODO<br/>new file mode 100644<br/>index 000000000000..932af6443b67<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/TODO</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+The SoC camera framework is obsolete and scheduled for removal in the near</div><div class='add'>+future. Developers are encouraged to convert the drivers to use the</div><div class='add'>+regular V4L2 API if these drivers are still needed (and if someone has the</div><div class='add'>+hardware).</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/imx074.c b/drivers/staging/media/soc_camera/imx074.c<br/>index 1676c166dc83..d907aa62f898 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/imx074.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/imx074.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/imx074.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/imx074.c</a></div><div class='hunk'>@@ -1,15 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for IMX074 CMOS Image Sensor from Sony</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010, Guennadi Liakhovetski &lt;g.liakhovetski@gmx.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Partially inspired by the IMX074 driver from the Android / MSM tree</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='del'>-</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/v4l2-mediabus.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/mt9t031.c b/drivers/staging/media/soc_camera/mt9t031.c<br/>index 4ff179302b4f..615ae9df2c57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/mt9t031.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/mt9t031.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/mt9t031.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/mt9t031.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for MT9T031 CMOS Image Sensor from Micron</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008, Guennadi Liakhovetski, DENX Software Engineering &lt;lg@denx.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 version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/soc_camera.c b/drivers/staging/media/soc_camera/soc_camera.c<br/>index 1ab86a7499b9..a6232dcd59bc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_camera.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_camera.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_camera.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/soc_camera.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * camera image capture (abstract) bus driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,12 +11,7 @@</div><div class='ctx'>  * SoCs. Later it should also be used for i.MX31 SoCs from Freescale.</div><div class='ctx'>  * It can handle multiple cameras and / or multiple buses, which can</div><div class='ctx'>  * be used, e.g., in stereo-vision applications.</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='del'>-</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/soc_mediabus.c b/drivers/staging/media/soc_camera/soc_mediabus.c<br/>index be74008ec0ca..2aa646c89c1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_mediabus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_mediabus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_mediabus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/soc_mediabus.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * soc-camera media bus helper routines</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009, Guennadi Liakhovetski &lt;g.liakhovetski@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 version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/soc_camera/soc_mt9v022.c b/drivers/staging/media/soc_camera/soc_mt9v022.c<br/>index 6d922b17ea94..e7e0d3d29499 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_mt9v022.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_mt9v022.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_mt9v022.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/soc_mt9v022.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for MT9V022 CMOS Image Sensor from Micron</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008, Guennadi Liakhovetski &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 GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/soc_ov5642.c b/drivers/staging/media/soc_camera/soc_ov5642.c<br/>index 0931898c79dd..94696d7baf83 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_ov5642.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_ov5642.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_ov5642.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/soc_ov5642.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for OV5642 CMOS Image Sensor from Omnivision</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,12 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Based on Omnivision OV7670 Camera Driver</div><div class='ctx'>  * Copyright (C) 2006-7 Jonathan Corbet &lt;corbet@lwn.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 GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/soc_camera/soc_ov9740.c b/drivers/staging/media/soc_camera/soc_ov9740.c<br/>index a07d3145d1b4..7c765595d85f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_ov9740.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/soc_camera/soc_ov9740.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/soc_camera/soc_ov9740.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/soc_camera/soc_ov9740.c</a></div><div class='hunk'>@@ -1,15 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * OmniVision OV9740 Camera Driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2011 NVIDIA Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Based on ov9640 camera driver.</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='del'>-</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/sunxi/Kconfig b/drivers/staging/media/sunxi/Kconfig<br/>index c78d92240ceb..4549a135741f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config VIDEO_SUNXI</div><div class='ctx'> 	bool "Allwinner sunXi family Video Devices"</div><div class='ctx'> 	depends on ARCH_SUNXI || COMPILE_TEST</div><div class='head'>diff --git a/drivers/staging/media/sunxi/Makefile b/drivers/staging/media/sunxi/Makefile<br/>index cee2846c3ecf..b87140b0e15f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_VIDEO_SUNXI_CEDRUS)	+= cedrus/</div><div class='head'>diff --git a/drivers/staging/media/sunxi/cedrus/Kconfig b/drivers/staging/media/sunxi/cedrus/Kconfig<br/>index 3252efa422f9..17733e9a088f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/cedrus/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config VIDEO_SUNXI_CEDRUS</div><div class='ctx'> 	tristate "Allwinner Cedrus VPU driver"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; VIDEO_V4L2 &amp;&amp; MEDIA_CONTROLLER</div><div class='head'>diff --git a/drivers/staging/media/sunxi/cedrus/Makefile b/drivers/staging/media/sunxi/cedrus/Makefile<br/>index e9dc68b7bcb6..808842f0119e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/cedrus/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_VIDEO_SUNXI_CEDRUS) += sunxi-cedrus.o</div><div class='ctx'> </div><div class='ctx'> sunxi-cedrus-y = cedrus.o cedrus_video.o cedrus_hw.o cedrus_dec.o cedrus_mpeg2.o</div><div class='head'>diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c<br/>index ff11cbeba205..d0429c0e6b6b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/cedrus/cedrus.c</a></div><div class='hunk'>@@ -300,7 +300,7 @@ static int cedrus_probe(struct platform_device *pdev)</div><div class='ctx'> 			 "Failed to initialize V4L2 M2M device\n");</div><div class='ctx'> 		ret = PTR_ERR(dev-&gt;m2m_dev);</div><div class='ctx'> </div><div class='del'>-		goto err_video;</div><div class='add'>+		goto err_v4l2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mdev.dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -310,23 +310,23 @@ static int cedrus_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev-&gt;mdev.ops = &amp;cedrus_m2m_media_ops;</div><div class='ctx'> 	dev-&gt;v4l2_dev.mdev = &amp;dev-&gt;mdev;</div><div class='ctx'> </div><div class='del'>-	ret = v4l2_m2m_register_media_controller(dev-&gt;m2m_dev, vfd,</div><div class='del'>-						 MEDIA_ENT_F_PROC_VIDEO_DECODER);</div><div class='del'>-	if (ret) {</div><div class='del'>-		v4l2_err(&amp;dev-&gt;v4l2_dev,</div><div class='del'>-			 "Failed to initialize V4L2 M2M media controller\n");</div><div class='del'>-		goto err_m2m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register video device\n");</div><div class='del'>-		goto err_v4l2;</div><div class='add'>+		goto err_m2m;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	v4l2_info(&amp;dev-&gt;v4l2_dev,</div><div class='ctx'> 		  "Device registered as /dev/video%d\n", vfd-&gt;num);</div><div class='ctx'> </div><div class='add'>+	ret = v4l2_m2m_register_media_controller(dev-&gt;m2m_dev, vfd,</div><div class='add'>+						 MEDIA_ENT_F_PROC_VIDEO_DECODER);</div><div class='add'>+	if (ret) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev,</div><div class='add'>+			 "Failed to initialize V4L2 M2M media controller\n");</div><div class='add'>+		goto err_video;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = media_device_register(&amp;dev-&gt;mdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to register media device\n");</div><div class='hunk'>@@ -339,10 +339,10 @@ static int cedrus_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> err_m2m_mc:</div><div class='ctx'> 	v4l2_m2m_unregister_media_controller(dev-&gt;m2m_dev);</div><div class='del'>-err_m2m:</div><div class='del'>-	v4l2_m2m_release(dev-&gt;m2m_dev);</div><div class='ctx'> err_video:</div><div class='ctx'> 	video_unregister_device(&amp;dev-&gt;vfd);</div><div class='add'>+err_m2m:</div><div class='add'>+	v4l2_m2m_release(dev-&gt;m2m_dev);</div><div class='ctx'> err_v4l2:</div><div class='ctx'> 	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -396,6 +396,11 @@ static const struct cedrus_variant sun50i_h5_cedrus_variant = {</div><div class='ctx'> 	.capabilities	= CEDRUS_CAPABILITY_UNTILED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct cedrus_variant sun50i_h6_cedrus_variant = {</div><div class='add'>+	.capabilities	= CEDRUS_CAPABILITY_UNTILED,</div><div class='add'>+	.quirks		= CEDRUS_QUIRK_NO_DMA_OFFSET,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id cedrus_dt_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "allwinner,sun4i-a10-video-engine",</div><div class='hunk'>@@ -425,6 +430,10 @@ static const struct of_device_id cedrus_dt_match[] = {</div><div class='ctx'> 		.compatible = "allwinner,sun50i-h5-video-engine",</div><div class='ctx'> 		.data = &amp;sun50i_h5_cedrus_variant,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "allwinner,sun50i-h6-video-engine",</div><div class='add'>+		.data = &amp;sun50i_h6_cedrus_variant,</div><div class='add'>+	},</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, cedrus_dt_match);</div><div class='head'>diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h<br/>index 4aedd24a9848..c57c04b41d2e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/cedrus/cedrus.h</a></div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> </div><div class='ctx'> #define CEDRUS_CAPABILITY_UNTILED	BIT(0)</div><div class='ctx'> </div><div class='add'>+#define CEDRUS_QUIRK_NO_DMA_OFFSET	BIT(0)</div><div class='add'>+</div><div class='ctx'> enum cedrus_codec {</div><div class='ctx'> 	CEDRUS_CODEC_MPEG2,</div><div class='ctx'> </div><div class='hunk'>@@ -91,6 +93,7 @@ struct cedrus_dec_ops {</div><div class='ctx'> </div><div class='ctx'> struct cedrus_variant {</div><div class='ctx'> 	unsigned int	capabilities;</div><div class='add'>+	unsigned int	quirks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cedrus_dev {</div><div class='head'>diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c<br/>index 0acf219a8c91..fbfff7c1c771 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus_hw.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus_hw.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus_hw.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/cedrus/cedrus_hw.c</a></div><div class='hunk'>@@ -177,7 +177,8 @@ int cedrus_hw_probe(struct cedrus_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> #ifdef PHYS_PFN_OFFSET</div><div class='del'>-	dev-&gt;dev-&gt;dma_pfn_offset = PHYS_PFN_OFFSET;</div><div class='add'>+	if (!(variant-&gt;quirks &amp; CEDRUS_QUIRK_NO_DMA_OFFSET))</div><div class='add'>+		dev-&gt;dev-&gt;dma_pfn_offset = PHYS_PFN_OFFSET;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	ret = of_reserved_mem_device_init(dev-&gt;dev);</div><div class='head'>diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c<br/>index b47854b3bce4..9673874ece10 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus_video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/sunxi/cedrus/cedrus_video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/sunxi/cedrus/cedrus_video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/sunxi/cedrus/cedrus_video.c</a></div><div class='hunk'>@@ -536,6 +536,7 @@ int cedrus_queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='ctx'> 	src_vq-&gt;lock = &amp;ctx-&gt;dev-&gt;dev_mutex;</div><div class='ctx'> 	src_vq-&gt;dev = ctx-&gt;dev-&gt;dev;</div><div class='ctx'> 	src_vq-&gt;supports_requests = true;</div><div class='add'>+	src_vq-&gt;requires_requests = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = vb2_queue_init(src_vq);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/staging/media/tegra-vde/Kconfig b/drivers/staging/media/tegra-vde/Kconfig<br/>index 5c4914674468..ff8e846cd15d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/tegra-vde/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config TEGRA_VDE</div><div class='ctx'> 	tristate "NVIDIA Tegra Video Decoder Engine driver"</div><div class='ctx'> 	depends on ARCH_TEGRA || COMPILE_TEST</div><div class='head'>diff --git a/drivers/staging/media/tegra-vde/Makefile b/drivers/staging/media/tegra-vde/Makefile<br/>index 444c1d62daa1..7f9020e634f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/tegra-vde/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_TEGRA_VDE)	+= tegra-vde.o</div><div class='head'>diff --git a/drivers/staging/media/tegra-vde/tegra-vde.c b/drivers/staging/media/tegra-vde/tegra-vde.c<br/>index aa6c6bba961e..a5020dbf6eef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/tegra-vde.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/tegra-vde.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/tegra-vde.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/tegra-vde/tegra-vde.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  * NVIDIA Tegra Video decoder driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2016-2017 Dmitry Osipenko &lt;digetx@gmail.com&gt;</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</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='head'>diff --git a/drivers/staging/media/tegra-vde/uapi.h b/drivers/staging/media/tegra-vde/uapi.h<br/>index 4bce08a7a54c..a0dad1ed94ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/uapi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/tegra-vde/uapi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/tegra-vde/uapi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/media/tegra-vde/uapi.h</a></div><div class='hunk'>@@ -1,12 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2016-2017 Dmitry Osipenko &lt;digetx@gmail.com&gt;</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</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/* Copyright (C) 2016-2017 Dmitry Osipenko &lt;digetx@gmail.com&gt; */</div><div class='ctx'> #ifndef _UAPI_TEGRA_VDE_H_</div><div class='ctx'> #define _UAPI_TEGRA_VDE_H_</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig<br/>deleted file mode 100644<br/>index 34a18135ede0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-config VIDEO_ZORAN</div><div class='del'>-	tristate "Zoran ZR36057/36067 Video For Linux (Deprecated)"</div><div class='del'>-	depends on PCI &amp;&amp; I2C_ALGOBIT &amp;&amp; VIDEO_V4L2 &amp;&amp; VIRT_TO_BUS</div><div class='del'>-	depends on !ALPHA</div><div class='del'>-	help</div><div class='del'>-	  Say Y for support for MJPEG capture cards based on the Zoran</div><div class='del'>-	  36057/36067 PCI controller chipset. This includes the Iomega</div><div class='del'>-	  Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is</div><div class='del'>-	  a driver homepage at &lt;http://mjpeg.sf.net/driver-zoran/&gt;. For</div><div class='del'>-	  more information, check &lt;file:Documentation/media/v4l-drivers/zoran.rst&gt;.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called zr36067.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_DC30</div><div class='del'>-	tristate "Pinnacle/Miro DC30(+) support"</div><div class='del'>-	depends on VIDEO_ZORAN</div><div class='del'>-	select VIDEO_ADV7175 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_VPX3220 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	help</div><div class='del'>-	  Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback</div><div class='del'>-	  card. This also supports really old DC10 cards based on the</div><div class='del'>-	  zr36050 MJPEG codec and zr36016 VFE.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_ZR36060</div><div class='del'>-	tristate "Zoran ZR36060"</div><div class='del'>-	depends on VIDEO_ZORAN</div><div class='del'>-	help</div><div class='del'>-	  Say Y to support Zoran boards based on 36060 chips.</div><div class='del'>-	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33</div><div class='del'>-	  and 33 R10 and AverMedia 6 boards.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_BUZ</div><div class='del'>-	tristate "Iomega Buz support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_SAA7185 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	help</div><div class='del'>-	  Support for the Iomega Buz MJPEG capture/playback card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_DC10</div><div class='del'>-	tristate "Pinnacle/Miro DC10(+) support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_SAA7110 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_ADV7175 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	help</div><div class='del'>-	  Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback</div><div class='del'>-	  card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_LML33</div><div class='del'>-	tristate "Linux Media Labs LML33 support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_BT819 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_BT856 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	help</div><div class='del'>-	  Support for the Linux Media Labs LML33 MJPEG capture/playback</div><div class='del'>-	  card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_LML33R10</div><div class='del'>-	tristate "Linux Media Labs LML33R10 support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_ADV7170 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	help</div><div class='del'>-	  support for the Linux Media Labs LML33R10 MJPEG capture/playback</div><div class='del'>-	  card.</div><div class='del'>-</div><div class='del'>-config VIDEO_ZORAN_AVS6EYES</div><div class='del'>-	tristate "AverMedia 6 Eyes support"</div><div class='del'>-	depends on VIDEO_ZORAN_ZR36060</div><div class='del'>-	select VIDEO_BT856 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_BT866 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT</div><div class='del'>-	help</div><div class='del'>-	  Support for the AverMedia 6 Eyes video surveillance card.</div><div class='head'>diff --git a/drivers/staging/media/zoran/Makefile b/drivers/staging/media/zoran/Makefile<br/>deleted file mode 100644<br/>index 21ac29a71458..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-zr36067-objs	:=	zoran_procfs.o zoran_device.o \</div><div class='del'>-			zoran_driver.o zoran_card.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o</div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o</div><div class='del'>-obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o</div><div class='head'>diff --git a/drivers/staging/media/zoran/TODO b/drivers/staging/media/zoran/TODO<br/>deleted file mode 100644<br/>index 54464095d0d7..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/TODO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-The zoran driver is marked deprecated. It will be removed</div><div class='del'>-around May 2019 unless someone is willing to update this</div><div class='del'>-driver to the latest V4L2 frameworks (especially the vb2</div><div class='del'>-framework).</div><div class='head'>diff --git a/drivers/staging/media/zoran/videocodec.c b/drivers/staging/media/zoran/videocodec.c<br/>deleted file mode 100644<br/>index 4427ae7126e2..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/videocodec.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/videocodec.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,391 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * VIDEO MOTION CODECs internal API for video devices</div><div class='del'>- *</div><div class='del'>- * Interface for MJPEG (and maybe later MPEG/WAVELETS) codec's</div><div class='del'>- * bound to a master device.</div><div class='del'>- *</div><div class='del'>- * (c) 2002 Wolfgang Scherr &lt;scherr@net4you.at&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: videocodec.c,v 1.1.2.8 2003/03/29 07:16:04 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VIDEOCODEC_VERSION "v0.2"</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/init.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-// kernel config is here (procfs flag)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-static int debug;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0-4)");</div><div class='del'>-</div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-struct attached_list {</div><div class='del'>-	struct videocodec *codec;</div><div class='del'>-	struct attached_list *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct codec_list {</div><div class='del'>-	const struct videocodec *codec;</div><div class='del'>-	int attached;</div><div class='del'>-	struct attached_list *list;</div><div class='del'>-	struct codec_list *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct codec_list *codeclist_top = NULL;</div><div class='del'>-</div><div class='del'>-/* ================================================= */</div><div class='del'>-/* function prototypes of the master/slave interface */</div><div class='del'>-/* ================================================= */</div><div class='del'>-</div><div class='del'>-struct videocodec *</div><div class='del'>-videocodec_attach (struct videocodec_master *master)</div><div class='del'>-{</div><div class='del'>-	struct codec_list *h = codeclist_top;</div><div class='del'>-	struct attached_list *a, *ptr;</div><div class='del'>-	struct videocodec *codec;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	if (!master) {</div><div class='del'>-		dprintk(1, KERN_ERR "videocodec_attach: no data\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(2,</div><div class='del'>-		"videocodec_attach: '%s', flags %lx, magic %lx\n",</div><div class='del'>-		master-&gt;name, master-&gt;flags, master-&gt;magic);</div><div class='del'>-</div><div class='del'>-	if (!h) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"videocodec_attach: no device available\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (h) {</div><div class='del'>-		// attach only if the slave has at least the flags</div><div class='del'>-		// expected by the master</div><div class='del'>-		if ((master-&gt;flags &amp; h-&gt;codec-&gt;flags) == master-&gt;flags) {</div><div class='del'>-			dprintk(4, "videocodec_attach: try '%s'\n",</div><div class='del'>-				h-&gt;codec-&gt;name);</div><div class='del'>-</div><div class='del'>-			if (!try_module_get(h-&gt;codec-&gt;owner))</div><div class='del'>-				return NULL;</div><div class='del'>-</div><div class='del'>-			codec = kmemdup(h-&gt;codec, sizeof(struct videocodec),</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-			if (!codec) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"videocodec_attach: no mem\n");</div><div class='del'>-				goto out_module_put;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			res = strlen(codec-&gt;name);</div><div class='del'>-			snprintf(codec-&gt;name + res, sizeof(codec-&gt;name) - res,</div><div class='del'>-				 "[%d]", h-&gt;attached);</div><div class='del'>-			codec-&gt;master_data = master;</div><div class='del'>-			res = codec-&gt;setup(codec);</div><div class='del'>-			if (res == 0) {</div><div class='del'>-				dprintk(3, "videocodec_attach '%s'\n",</div><div class='del'>-					codec-&gt;name);</div><div class='del'>-				ptr = kzalloc(sizeof(struct attached_list), GFP_KERNEL);</div><div class='del'>-				if (!ptr) {</div><div class='del'>-					dprintk(1,</div><div class='del'>-						KERN_ERR</div><div class='del'>-						"videocodec_attach: no memory\n");</div><div class='del'>-					goto out_kfree;</div><div class='del'>-				}</div><div class='del'>-				ptr-&gt;codec = codec;</div><div class='del'>-</div><div class='del'>-				a = h-&gt;list;</div><div class='del'>-				if (!a) {</div><div class='del'>-					h-&gt;list = ptr;</div><div class='del'>-					dprintk(4,</div><div class='del'>-						"videocodec: first element\n");</div><div class='del'>-				} else {</div><div class='del'>-					while (a-&gt;next)</div><div class='del'>-						a = a-&gt;next;	// find end</div><div class='del'>-					a-&gt;next = ptr;</div><div class='del'>-					dprintk(4,</div><div class='del'>-						"videocodec: in after '%s'\n",</div><div class='del'>-						h-&gt;codec-&gt;name);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				h-&gt;attached += 1;</div><div class='del'>-				return codec;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(codec);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		h = h-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_ERR "videocodec_attach: no codec found!\n");</div><div class='del'>-	return NULL;</div><div class='del'>-</div><div class='del'>- out_module_put:</div><div class='del'>-	module_put(h-&gt;codec-&gt;owner);</div><div class='del'>- out_kfree:</div><div class='del'>-	kfree(codec);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-videocodec_detach (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct codec_list *h = codeclist_top;</div><div class='del'>-	struct attached_list *a, *prev;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	if (!codec) {</div><div class='del'>-		dprintk(1, KERN_ERR "videocodec_detach: no data\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(2,</div><div class='del'>-		"videocodec_detach: '%s', type: %x, flags %lx, magic %lx\n",</div><div class='del'>-		codec-&gt;name, codec-&gt;type, codec-&gt;flags, codec-&gt;magic);</div><div class='del'>-</div><div class='del'>-	if (!h) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "videocodec_detach: no device left...\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (h) {</div><div class='del'>-		a = h-&gt;list;</div><div class='del'>-		prev = NULL;</div><div class='del'>-		while (a) {</div><div class='del'>-			if (codec == a-&gt;codec) {</div><div class='del'>-				res = a-&gt;codec-&gt;unset(a-&gt;codec);</div><div class='del'>-				if (res &gt;= 0) {</div><div class='del'>-					dprintk(3,</div><div class='del'>-						"videocodec_detach: '%s'\n",</div><div class='del'>-						a-&gt;codec-&gt;name);</div><div class='del'>-					a-&gt;codec-&gt;master_data = NULL;</div><div class='del'>-				} else {</div><div class='del'>-					dprintk(1,</div><div class='del'>-						KERN_ERR</div><div class='del'>-						"videocodec_detach: '%s'\n",</div><div class='del'>-						a-&gt;codec-&gt;name);</div><div class='del'>-					a-&gt;codec-&gt;master_data = NULL;</div><div class='del'>-				}</div><div class='del'>-				if (prev == NULL) {</div><div class='del'>-					h-&gt;list = a-&gt;next;</div><div class='del'>-					dprintk(4,</div><div class='del'>-						"videocodec: delete first\n");</div><div class='del'>-				} else {</div><div class='del'>-					prev-&gt;next = a-&gt;next;</div><div class='del'>-					dprintk(4,</div><div class='del'>-						"videocodec: delete middle\n");</div><div class='del'>-				}</div><div class='del'>-				module_put(a-&gt;codec-&gt;owner);</div><div class='del'>-				kfree(a-&gt;codec);</div><div class='del'>-				kfree(a);</div><div class='del'>-				h-&gt;attached -= 1;</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			prev = a;</div><div class='del'>-			a = a-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		h = h-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_ERR "videocodec_detach: given codec not found!\n");</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-videocodec_register (const struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct codec_list *ptr, *h = codeclist_top;</div><div class='del'>-</div><div class='del'>-	if (!codec) {</div><div class='del'>-		dprintk(1, KERN_ERR "videocodec_register: no data!\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(2,</div><div class='del'>-		"videocodec: register '%s', type: %x, flags %lx, magic %lx\n",</div><div class='del'>-		codec-&gt;name, codec-&gt;type, codec-&gt;flags, codec-&gt;magic);</div><div class='del'>-</div><div class='del'>-	ptr = kzalloc(sizeof(struct codec_list), GFP_KERNEL);</div><div class='del'>-	if (!ptr) {</div><div class='del'>-		dprintk(1, KERN_ERR "videocodec_register: no memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	ptr-&gt;codec = codec;</div><div class='del'>-</div><div class='del'>-	if (!h) {</div><div class='del'>-		codeclist_top = ptr;</div><div class='del'>-		dprintk(4, "videocodec: hooked in as first element\n");</div><div class='del'>-	} else {</div><div class='del'>-		while (h-&gt;next)</div><div class='del'>-			h = h-&gt;next;	// find the end</div><div class='del'>-		h-&gt;next = ptr;</div><div class='del'>-		dprintk(4, "videocodec: hooked in after '%s'\n",</div><div class='del'>-			h-&gt;codec-&gt;name);</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</div><div class='del'>-videocodec_unregister (const struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct codec_list *prev = NULL, *h = codeclist_top;</div><div class='del'>-</div><div class='del'>-	if (!codec) {</div><div class='del'>-		dprintk(1, KERN_ERR "videocodec_unregister: no data!\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(2,</div><div class='del'>-		"videocodec: unregister '%s', type: %x, flags %lx, magic %lx\n",</div><div class='del'>-		codec-&gt;name, codec-&gt;type, codec-&gt;flags, codec-&gt;magic);</div><div class='del'>-</div><div class='del'>-	if (!h) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"videocodec_unregister: no device left...\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (h) {</div><div class='del'>-		if (codec == h-&gt;codec) {</div><div class='del'>-			if (h-&gt;attached) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"videocodec: '%s' is used\n",</div><div class='del'>-					h-&gt;codec-&gt;name);</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			}</div><div class='del'>-			dprintk(3, "videocodec: unregister '%s' is ok.\n",</div><div class='del'>-				h-&gt;codec-&gt;name);</div><div class='del'>-			if (prev == NULL) {</div><div class='del'>-				codeclist_top = h-&gt;next;</div><div class='del'>-				dprintk(4,</div><div class='del'>-					"videocodec: delete first element\n");</div><div class='del'>-			} else {</div><div class='del'>-				prev-&gt;next = h-&gt;next;</div><div class='del'>-				dprintk(4,</div><div class='del'>-					"videocodec: delete middle element\n");</div><div class='del'>-			}</div><div class='del'>-			kfree(h);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		prev = h;</div><div class='del'>-		h = h-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_ERR</div><div class='del'>-		"videocodec_unregister: given codec not found!\n");</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int proc_videocodecs_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct codec_list *h = codeclist_top;</div><div class='del'>-	struct attached_list *a;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "&lt;S&gt;lave or attached &lt;M&gt;aster name  type flags    magic    ");</div><div class='del'>-	seq_printf(m, "(connected as)\n");</div><div class='del'>-</div><div class='del'>-	while (h) {</div><div class='del'>-		seq_printf(m, "S %32s %04x %08lx %08lx (TEMPLATE)\n",</div><div class='del'>-			      h-&gt;codec-&gt;name, h-&gt;codec-&gt;type,</div><div class='del'>-			      h-&gt;codec-&gt;flags, h-&gt;codec-&gt;magic);</div><div class='del'>-		a = h-&gt;list;</div><div class='del'>-		while (a) {</div><div class='del'>-			seq_printf(m, "M %32s %04x %08lx %08lx (%s)\n",</div><div class='del'>-				      a-&gt;codec-&gt;master_data-&gt;name,</div><div class='del'>-				      a-&gt;codec-&gt;master_data-&gt;type,</div><div class='del'>-				      a-&gt;codec-&gt;master_data-&gt;flags,</div><div class='del'>-				      a-&gt;codec-&gt;master_data-&gt;magic,</div><div class='del'>-				      a-&gt;codec-&gt;name);</div><div class='del'>-			a = a-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		h = h-&gt;next;</div><div class='del'>-	}</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'>-/* ===================== */</div><div class='del'>-/* hook in driver module */</div><div class='del'>-/* ===================== */</div><div class='del'>-static int __init</div><div class='del'>-videocodec_init (void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	static struct proc_dir_entry *videocodec_proc_entry;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Linux video codec intermediate layer: %s\n",</div><div class='del'>-	       VIDEOCODEC_VERSION);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	videocodec_proc_entry = proc_create_single("videocodecs", 0, NULL,</div><div class='del'>-			proc_videocodecs_show);</div><div class='del'>-	if (!videocodec_proc_entry) {</div><div class='del'>-		dprintk(1, KERN_ERR "videocodec: can't init procfs.\n");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-videocodec_exit (void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	remove_proc_entry("videocodecs", NULL);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(videocodec_attach);</div><div class='del'>-EXPORT_SYMBOL(videocodec_detach);</div><div class='del'>-EXPORT_SYMBOL(videocodec_register);</div><div class='del'>-EXPORT_SYMBOL(videocodec_unregister);</div><div class='del'>-</div><div class='del'>-module_init(videocodec_init);</div><div class='del'>-module_exit(videocodec_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Wolfgang Scherr &lt;scherr@net4you.at&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Intermediate API module for video codecs "</div><div class='del'>-		   VIDEOCODEC_VERSION);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/media/zoran/videocodec.h b/drivers/staging/media/zoran/videocodec.h<br/>deleted file mode 100644<br/>index 8ed5a0f7ac01..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/videocodec.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/videocodec.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,349 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * VIDEO MOTION CODECs internal API for video devices</div><div class='del'>- *</div><div class='del'>- * Interface for MJPEG (and maybe later MPEG/WAVELETS) codec's</div><div class='del'>- * bound to a master device.</div><div class='del'>- *</div><div class='del'>- * (c) 2002 Wolfgang Scherr &lt;scherr@net4you.at&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: videocodec.h,v 1.1.2.4 2003/01/14 21:15:03 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* =================== */</div><div class='del'>-/* general description */</div><div class='del'>-/* =================== */</div><div class='del'>-</div><div class='del'>-/* Should ease the (re-)usage of drivers supporting cards with (different)</div><div class='del'>-   video codecs. The codecs register to this module their functionality,</div><div class='del'>-   and the processors (masters) can attach to them if they fit.</div><div class='del'>-</div><div class='del'>-   The codecs are typically have a "strong" binding to their master - so I</div><div class='del'>-   don't think it makes sense to have a full blown interfacing as with e.g.</div><div class='del'>-   i2c. If you have an other opinion, let's discuss &amp; implement it :-)))</div><div class='del'>-</div><div class='del'>-   Usage:</div><div class='del'>-</div><div class='del'>-   The slave has just to setup the videocodec structure and use two functions:</div><div class='del'>-   videocodec_register(codecdata);</div><div class='del'>-   videocodec_unregister(codecdata);</div><div class='del'>-   The best is just calling them at module (de-)initialisation.</div><div class='del'>-</div><div class='del'>-   The master sets up the structure videocodec_master and calls:</div><div class='del'>-   codecdata=videocodec_attach(master_codecdata);</div><div class='del'>-   videocodec_detach(codecdata);</div><div class='del'>-</div><div class='del'>-   The slave is called during attach/detach via functions setup previously</div><div class='del'>-   during register. At that time, the master_data pointer is set up</div><div class='del'>-   and the slave can access any io registers of the master device (in the case</div><div class='del'>-   the slave is bound to it). Otherwise it doesn't need this functions and</div><div class='del'>-   therfor they may not be initialized.</div><div class='del'>-</div><div class='del'>-   The other functions are just for convenience, as they are for sure used by</div><div class='del'>-   most/all of the codecs. The last ones may be omitted, too.</div><div class='del'>-</div><div class='del'>-   See the structure declaration below for more information and which data has</div><div class='del'>-   to be set up for the master and the slave.</div><div class='del'>-</div><div class='del'>-   ----------------------------------------------------------------------------</div><div class='del'>-   The master should have "knowledge" of the slave and vice versa.  So the data</div><div class='del'>-   structures sent to/from slave via set_data/get_data set_image/get_image are</div><div class='del'>-   device dependent and vary between MJPEG/MPEG/WAVELET/... devices. (!!!!)</div><div class='del'>-   ----------------------------------------------------------------------------</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ========================================== */</div><div class='del'>-/* description of the videocodec_io structure */</div><div class='del'>-/* ========================================== */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   ==== master setup ====</div><div class='del'>-   name -&gt; name of the device structure for reference and debugging</div><div class='del'>-   master_data -&gt;  data ref. for the master (e.g. the zr36055,57,67)</div><div class='del'>-   readreg -&gt; ref. to read-fn from register (setup by master, used by slave)</div><div class='del'>-   writereg -&gt; ref. to write-fn to register (setup by master, used by slave)</div><div class='del'>-	       this two functions do the lowlevel I/O job</div><div class='del'>-</div><div class='del'>-   ==== slave functionality setup ====</div><div class='del'>-   slave_data -&gt; data ref. for the slave (e.g. the zr36050,60)</div><div class='del'>-   check -&gt; fn-ref. checks availability of an device, returns -EIO on failure or</div><div class='del'>-	    the type on success</div><div class='del'>-	    this makes espcecially sense if a driver module supports more than</div><div class='del'>-	    one codec which may be quite similar to access, nevertheless it</div><div class='del'>-	    is good for a first functionality check</div><div class='del'>-</div><div class='del'>-   -- main functions you always need for compression/decompression --</div><div class='del'>-</div><div class='del'>-   set_mode -&gt; this fn-ref. resets the entire codec, and sets up the mode</div><div class='del'>-	       with the last defined norm/size (or device default if not</div><div class='del'>-	       available) - it returns 0 if the mode is possible</div><div class='del'>-   set_size -&gt; this fn-ref. sets the norm and image size for</div><div class='del'>-	       compression/decompression (returns 0 on success)</div><div class='del'>-	       the norm param is defined in videodev2.h (V4L2_STD_*)</div><div class='del'>-</div><div class='del'>-   additional setup may be available, too - but the codec should work with</div><div class='del'>-   some default values even without this</div><div class='del'>-</div><div class='del'>-   set_data -&gt; sets device-specific data (tables, quality etc.)</div><div class='del'>-   get_data -&gt; query device-specific data (tables, quality etc.)</div><div class='del'>-</div><div class='del'>-   if the device delivers interrupts, they may be setup/handled here</div><div class='del'>-   setup_interrupt -&gt; codec irq setup (not needed for 36050/60)</div><div class='del'>-   handle_interrupt -&gt; codec irq handling (not needed for 36050/60)</div><div class='del'>-</div><div class='del'>-   if the device delivers pictures, they may be handled here</div><div class='del'>-   put_image -&gt; puts image data to the codec (not needed for 36050/60)</div><div class='del'>-   get_image -&gt; gets image data from the codec (not needed for 36050/60)</div><div class='del'>-		the calls include frame numbers and flags (even/odd/...)</div><div class='del'>-		if needed and a flag which allows blocking until its ready</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* ============== */</div><div class='del'>-/* user interface */</div><div class='del'>-/* ============== */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   Currently there is only a information display planned, as the layer</div><div class='del'>-   is not visible for the user space at all.</div><div class='del'>-</div><div class='del'>-   Information is available via procfs. The current entry is "/proc/videocodecs"</div><div class='del'>-   but it makes sense to "hide" it in the /proc/video tree of v4l(2) --TODO--.</div><div class='del'>-</div><div class='del'>-A example for such an output is:</div><div class='del'>-</div><div class='del'>-&lt;S&gt;lave or attached &lt;M&gt;aster name  type flags    magic    (connected as)</div><div class='del'>-S                          zr36050 0002 0000d001 00000000 (TEMPLATE)</div><div class='del'>-M                       zr36055[0] 0001 0000c001 00000000 (zr36050[0])</div><div class='del'>-M                       zr36055[1] 0001 0000c001 00000000 (zr36050[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'>-/* special defines for the videocodec_io structure */</div><div class='del'>-/* =============================================== */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_VIDEOCODEC_H</div><div class='del'>-#define __LINUX_VIDEOCODEC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/videodev2.h&gt;</div><div class='del'>-</div><div class='del'>-#define CODEC_DO_COMPRESSION 0</div><div class='del'>-#define CODEC_DO_EXPANSION   1</div><div class='del'>-</div><div class='del'>-/* this are the current codec flags I think they are needed */</div><div class='del'>-/*  -&gt; type value in structure */</div><div class='del'>-#define CODEC_FLAG_JPEG      0x00000001L	// JPEG codec</div><div class='del'>-#define CODEC_FLAG_MPEG      0x00000002L	// MPEG1/2/4 codec</div><div class='del'>-#define CODEC_FLAG_DIVX      0x00000004L	// DIVX codec</div><div class='del'>-#define CODEC_FLAG_WAVELET   0x00000008L	// WAVELET codec</div><div class='del'>-					  // room for other types</div><div class='del'>-</div><div class='del'>-#define CODEC_FLAG_MAGIC     0x00000800L	// magic key must match</div><div class='del'>-#define CODEC_FLAG_HARDWARE  0x00001000L	// is a hardware codec</div><div class='del'>-#define CODEC_FLAG_VFE       0x00002000L	// has direct video frontend</div><div class='del'>-#define CODEC_FLAG_ENCODER   0x00004000L	// compression capability</div><div class='del'>-#define CODEC_FLAG_DECODER   0x00008000L	// decompression capability</div><div class='del'>-#define CODEC_FLAG_NEEDIRQ   0x00010000L	// needs irq handling</div><div class='del'>-#define CODEC_FLAG_RDWRPIC   0x00020000L	// handles picture I/O</div><div class='del'>-</div><div class='del'>-/* a list of modes, some are just examples (is there any HW?) */</div><div class='del'>-#define CODEC_MODE_BJPG      0x0001	// Baseline JPEG</div><div class='del'>-#define CODEC_MODE_LJPG      0x0002	// Lossless JPEG</div><div class='del'>-#define CODEC_MODE_MPEG1     0x0003	// MPEG 1</div><div class='del'>-#define CODEC_MODE_MPEG2     0x0004	// MPEG 2</div><div class='del'>-#define CODEC_MODE_MPEG4     0x0005	// MPEG 4</div><div class='del'>-#define CODEC_MODE_MSDIVX    0x0006	// MS DivX</div><div class='del'>-#define CODEC_MODE_ODIVX     0x0007	// Open DivX</div><div class='del'>-#define CODEC_MODE_WAVELET   0x0008	// Wavelet</div><div class='del'>-</div><div class='del'>-/* this are the current codec types I want to implement */</div><div class='del'>-/*  -&gt; type value in structure */</div><div class='del'>-#define CODEC_TYPE_NONE    0</div><div class='del'>-#define CODEC_TYPE_L64702  1</div><div class='del'>-#define CODEC_TYPE_ZR36050 2</div><div class='del'>-#define CODEC_TYPE_ZR36016 3</div><div class='del'>-#define CODEC_TYPE_ZR36060 4</div><div class='del'>-</div><div class='del'>-/* the type of data may be enhanced by future implementations (data-fn.'s) */</div><div class='del'>-/*  -&gt; used in command                                                     */</div><div class='del'>-#define CODEC_G_STATUS         0x0000	/* codec status (query only) */</div><div class='del'>-#define CODEC_S_CODEC_MODE     0x0001	/* codec mode (baseline JPEG, MPEG1,... */</div><div class='del'>-#define CODEC_G_CODEC_MODE     0x8001</div><div class='del'>-#define CODEC_S_VFE            0x0002	/* additional video frontend setup */</div><div class='del'>-#define CODEC_G_VFE            0x8002</div><div class='del'>-#define CODEC_S_MMAP           0x0003	/* MMAP setup (if available) */</div><div class='del'>-</div><div class='del'>-#define CODEC_S_JPEG_TDS_BYTE  0x0010	/* target data size in bytes */</div><div class='del'>-#define CODEC_G_JPEG_TDS_BYTE  0x8010</div><div class='del'>-#define CODEC_S_JPEG_SCALE     0x0011	/* scaling factor for quant. tables */</div><div class='del'>-#define CODEC_G_JPEG_SCALE     0x8011</div><div class='del'>-#define CODEC_S_JPEG_HDT_DATA  0x0018	/* huffman-tables */</div><div class='del'>-#define CODEC_G_JPEG_HDT_DATA  0x8018</div><div class='del'>-#define CODEC_S_JPEG_QDT_DATA  0x0019	/* quantizing-tables */</div><div class='del'>-#define CODEC_G_JPEG_QDT_DATA  0x8019</div><div class='del'>-#define CODEC_S_JPEG_APP_DATA  0x001A	/* APP marker */</div><div class='del'>-#define CODEC_G_JPEG_APP_DATA  0x801A</div><div class='del'>-#define CODEC_S_JPEG_COM_DATA  0x001B	/* COM marker */</div><div class='del'>-#define CODEC_G_JPEG_COM_DATA  0x801B</div><div class='del'>-</div><div class='del'>-#define CODEC_S_PRIVATE        0x1000	/* "private" commands start here */</div><div class='del'>-#define CODEC_G_PRIVATE        0x9000</div><div class='del'>-</div><div class='del'>-#define CODEC_G_FLAG           0x8000	/* this is how 'get' is detected */</div><div class='del'>-</div><div class='del'>-/* types of transfer, directly user space or a kernel buffer (image-fn.'s) */</div><div class='del'>-/*  -&gt; used in get_image, put_image                                        */</div><div class='del'>-#define CODEC_TRANSFER_KERNEL 0	/* use "memcopy" */</div><div class='del'>-#define CODEC_TRANSFER_USER   1	/* use "to/from_user" */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ========================= */</div><div class='del'>-/* the structures itself ... */</div><div class='del'>-/* ========================= */</div><div class='del'>-</div><div class='del'>-struct vfe_polarity {</div><div class='del'>-	unsigned int vsync_pol:1;</div><div class='del'>-	unsigned int hsync_pol:1;</div><div class='del'>-	unsigned int field_pol:1;</div><div class='del'>-	unsigned int blank_pol:1;</div><div class='del'>-	unsigned int subimg_pol:1;</div><div class='del'>-	unsigned int poe_pol:1;</div><div class='del'>-	unsigned int pvalid_pol:1;</div><div class='del'>-	unsigned int vclk_pol:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vfe_settings {</div><div class='del'>-	__u32 x, y;		/* Offsets into image */</div><div class='del'>-	__u32 width, height;	/* Area to capture */</div><div class='del'>-	__u16 decimation;	/* Decimation divider */</div><div class='del'>-	__u16 flags;		/* Flags for capture */</div><div class='del'>-	__u16 quality;		/* quality of the video */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tvnorm {</div><div class='del'>-	u16 Wt, Wa, HStart, HSyncStart, Ht, Ha, VStart;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct jpeg_com_marker {</div><div class='del'>-	int len; /* number of usable bytes in data */</div><div class='del'>-	char data[60];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct jpeg_app_marker {</div><div class='del'>-	int appn; /* number app segment */</div><div class='del'>-	int len; /* number of usable bytes in data */</div><div class='del'>-	char data[60];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct videocodec {</div><div class='del'>-	struct module *owner;</div><div class='del'>-	/* -- filled in by slave device during register -- */</div><div class='del'>-	char name[32];</div><div class='del'>-	unsigned long magic;	/* may be used for client&lt;-&gt;master attaching */</div><div class='del'>-	unsigned long flags;	/* functionality flags */</div><div class='del'>-	unsigned int type;	/* codec type */</div><div class='del'>-</div><div class='del'>-	/* -- these is filled in later during master device attach -- */</div><div class='del'>-</div><div class='del'>-	struct videocodec_master *master_data;</div><div class='del'>-</div><div class='del'>-	/* -- these are filled in by the slave device during register -- */</div><div class='del'>-</div><div class='del'>-	void *data;		/* private slave data */</div><div class='del'>-</div><div class='del'>-	/* attach/detach client functions (indirect call) */</div><div class='del'>-	int (*setup) (struct videocodec * codec);</div><div class='del'>-	int (*unset) (struct videocodec * codec);</div><div class='del'>-</div><div class='del'>-	/* main functions, every client needs them for sure! */</div><div class='del'>-	// set compression or decompression (or freeze, stop, standby, etc)</div><div class='del'>-	int (*set_mode) (struct videocodec * codec,</div><div class='del'>-			 int mode);</div><div class='del'>-	// setup picture size and norm (for the codec's video frontend)</div><div class='del'>-	int (*set_video) (struct videocodec * codec,</div><div class='del'>-			  struct tvnorm * norm,</div><div class='del'>-			  struct vfe_settings * cap,</div><div class='del'>-			  struct vfe_polarity * pol);</div><div class='del'>-	// other control commands, also mmap setup etc.</div><div class='del'>-	int (*control) (struct videocodec * codec,</div><div class='del'>-			int type,</div><div class='del'>-			int size,</div><div class='del'>-			void *data);</div><div class='del'>-</div><div class='del'>-	/* additional setup/query/processing (may be NULL pointer) */</div><div class='del'>-	// interrupt setup / handling (for irq's delivered by master)</div><div class='del'>-	int (*setup_interrupt) (struct videocodec * codec,</div><div class='del'>-				long mode);</div><div class='del'>-	int (*handle_interrupt) (struct videocodec * codec,</div><div class='del'>-				 int source,</div><div class='del'>-				 long flag);</div><div class='del'>-	// picture interface (if any)</div><div class='del'>-	long (*put_image) (struct videocodec * codec,</div><div class='del'>-			   int tr_type,</div><div class='del'>-			   int block,</div><div class='del'>-			   long *fr_num,</div><div class='del'>-			   long *flag,</div><div class='del'>-			   long size,</div><div class='del'>-			   void *buf);</div><div class='del'>-	long (*get_image) (struct videocodec * codec,</div><div class='del'>-			   int tr_type,</div><div class='del'>-			   int block,</div><div class='del'>-			   long *fr_num,</div><div class='del'>-			   long *flag,</div><div class='del'>-			   long size,</div><div class='del'>-			   void *buf);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct videocodec_master {</div><div class='del'>-	/* -- filled in by master device for registration -- */</div><div class='del'>-	char name[32];</div><div class='del'>-	unsigned long magic;	/* may be used for client&lt;-&gt;master attaching */</div><div class='del'>-	unsigned long flags;	/* functionality flags */</div><div class='del'>-	unsigned int type;	/* master type */</div><div class='del'>-</div><div class='del'>-	void *data;		/* private master data */</div><div class='del'>-</div><div class='del'>-	 __u32(*readreg) (struct videocodec * codec,</div><div class='del'>-			  __u16 reg);</div><div class='del'>-	void (*writereg) (struct videocodec * codec,</div><div class='del'>-			  __u16 reg,</div><div class='del'>-			  __u32 value);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ================================================= */</div><div class='del'>-/* function prototypes of the master/slave interface */</div><div class='del'>-/* ================================================= */</div><div class='del'>-</div><div class='del'>-/* attach and detach commands for the master */</div><div class='del'>-// * master structure needs to be kmalloc'ed before calling attach</div><div class='del'>-//   and free'd after calling detach</div><div class='del'>-// * returns pointer on success, NULL on failure</div><div class='del'>-extern struct videocodec *videocodec_attach(struct videocodec_master *);</div><div class='del'>-// * 0 on success, &lt;0 (errno) on failure</div><div class='del'>-extern int videocodec_detach(struct videocodec *);</div><div class='del'>-</div><div class='del'>-/* register and unregister commands for the slaves */</div><div class='del'>-// * 0 on success, &lt;0 (errno) on failure</div><div class='del'>-extern int videocodec_register(const struct videocodec *);</div><div class='del'>-// * 0 on success, &lt;0 (errno) on failure</div><div class='del'>-extern int videocodec_unregister(const struct videocodec *);</div><div class='del'>-</div><div class='del'>-/* the other calls are directly done via the videocodec structure! */</div><div class='del'>-</div><div class='del'>-#endif				/*ifndef __LINUX_VIDEOCODEC_H */</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h<br/>deleted file mode 100644<br/>index e84fb604a689..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,402 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * zoran - Iomega Buz driver</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Rainer Johanni &lt;Rainer@Johanni.de&gt;</div><div class='del'>- *</div><div class='del'>- * based on</div><div class='del'>- *</div><div class='del'>- * zoran.0.0.3 Copyright (C) 1998 Dave Perks &lt;dperks@ibm.net&gt;</div><div class='del'>- *</div><div class='del'>- * and</div><div class='del'>- *</div><div class='del'>- * bttv - Bt848 frame grabber driver</div><div class='del'>- * Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)</div><div class='del'>- *                        &amp; Marcus Metzler (mocm@thp.uni-koeln.de)</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, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#ifndef _BUZ_H_</div><div class='del'>-#define _BUZ_H_</div><div class='del'>-</div><div class='del'>-#include &lt;media/v4l2-device.h&gt;</div><div class='del'>-#include &lt;media/v4l2-ctrls.h&gt;</div><div class='del'>-#include &lt;media/v4l2-fh.h&gt;</div><div class='del'>-</div><div class='del'>-struct zoran_sync {</div><div class='del'>-	unsigned long frame;	/* number of buffer that has been free'd */</div><div class='del'>-	unsigned long length;	/* number of code bytes in buffer (capture only) */</div><div class='del'>-	unsigned long seq;	/* frame sequence number */</div><div class='del'>-	u64 ts;			/* timestamp */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define ZORAN_NAME    "ZORAN"	/* name of the device */</div><div class='del'>-</div><div class='del'>-#define ZR_DEVNAME(zr) ((zr)-&gt;name)</div><div class='del'>-</div><div class='del'>-#define   BUZ_MAX_WIDTH   (zr-&gt;timing-&gt;Wa)</div><div class='del'>-#define   BUZ_MAX_HEIGHT  (zr-&gt;timing-&gt;Ha)</div><div class='del'>-#define   BUZ_MIN_WIDTH    32	/* never display less than 32 pixels */</div><div class='del'>-#define   BUZ_MIN_HEIGHT   24	/* never display less than 24 rows */</div><div class='del'>-</div><div class='del'>-#define BUZ_NUM_STAT_COM    4</div><div class='del'>-#define BUZ_MASK_STAT_COM   3</div><div class='del'>-</div><div class='del'>-#define BUZ_MAX_FRAME     256	/* Must be a power of 2 */</div><div class='del'>-#define BUZ_MASK_FRAME    255	/* Must be BUZ_MAX_FRAME-1 */</div><div class='del'>-</div><div class='del'>-#define BUZ_MAX_INPUT       16</div><div class='del'>-</div><div class='del'>-#if VIDEO_MAX_FRAME &lt;= 32</div><div class='del'>-#   define   V4L_MAX_FRAME   32</div><div class='del'>-#elif VIDEO_MAX_FRAME &lt;= 64</div><div class='del'>-#   define   V4L_MAX_FRAME   64</div><div class='del'>-#else</div><div class='del'>-#   error   "Too many video frame buffers to handle"</div><div class='del'>-#endif</div><div class='del'>-#define   V4L_MASK_FRAME   (V4L_MAX_FRAME - 1)</div><div class='del'>-</div><div class='del'>-#define MAX_FRAME (BUZ_MAX_FRAME &gt; VIDEO_MAX_FRAME ? BUZ_MAX_FRAME : VIDEO_MAX_FRAME)</div><div class='del'>-</div><div class='del'>-#include "zr36057.h"</div><div class='del'>-</div><div class='del'>-enum card_type {</div><div class='del'>-	UNKNOWN = -1,</div><div class='del'>-</div><div class='del'>-	/* Pinnacle/Miro */</div><div class='del'>-	DC10_old,		/* DC30 like */</div><div class='del'>-	DC10_new,		/* DC10plus like */</div><div class='del'>-	DC10plus,</div><div class='del'>-	DC30,</div><div class='del'>-	DC30plus,</div><div class='del'>-</div><div class='del'>-	/* Linux Media Labs */</div><div class='del'>-	LML33,</div><div class='del'>-	LML33R10,</div><div class='del'>-</div><div class='del'>-	/* Iomega */</div><div class='del'>-	BUZ,</div><div class='del'>-</div><div class='del'>-	/* AverMedia */</div><div class='del'>-	AVS6EYES,</div><div class='del'>-</div><div class='del'>-	/* total number of cards */</div><div class='del'>-	NUM_CARDS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum zoran_codec_mode {</div><div class='del'>-	BUZ_MODE_IDLE,		/* nothing going on */</div><div class='del'>-	BUZ_MODE_MOTION_COMPRESS,	/* grabbing frames */</div><div class='del'>-	BUZ_MODE_MOTION_DECOMPRESS,	/* playing frames */</div><div class='del'>-	BUZ_MODE_STILL_COMPRESS,	/* still frame conversion */</div><div class='del'>-	BUZ_MODE_STILL_DECOMPRESS	/* still frame conversion */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum zoran_buffer_state {</div><div class='del'>-	BUZ_STATE_USER,		/* buffer is owned by application */</div><div class='del'>-	BUZ_STATE_PEND,		/* buffer is queued in pend[] ready to feed to I/O */</div><div class='del'>-	BUZ_STATE_DMA,		/* buffer is queued in dma[] for I/O */</div><div class='del'>-	BUZ_STATE_DONE		/* buffer is ready to return to application */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum zoran_map_mode {</div><div class='del'>-	ZORAN_MAP_MODE_RAW,</div><div class='del'>-	ZORAN_MAP_MODE_JPG_REC,</div><div class='del'>-#define ZORAN_MAP_MODE_JPG ZORAN_MAP_MODE_JPG_REC</div><div class='del'>-	ZORAN_MAP_MODE_JPG_PLAY,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum gpio_type {</div><div class='del'>-	ZR_GPIO_JPEG_SLEEP = 0,</div><div class='del'>-	ZR_GPIO_JPEG_RESET,</div><div class='del'>-	ZR_GPIO_JPEG_FRAME,</div><div class='del'>-	ZR_GPIO_VID_DIR,</div><div class='del'>-	ZR_GPIO_VID_EN,</div><div class='del'>-	ZR_GPIO_VID_RESET,</div><div class='del'>-	ZR_GPIO_CLK_SEL1,</div><div class='del'>-	ZR_GPIO_CLK_SEL2,</div><div class='del'>-	ZR_GPIO_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum gpcs_type {</div><div class='del'>-	GPCS_JPEG_RESET = 0,</div><div class='del'>-	GPCS_JPEG_START,</div><div class='del'>-	GPCS_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct zoran_format {</div><div class='del'>-	char *name;</div><div class='del'>-	__u32 fourcc;</div><div class='del'>-	int colorspace;</div><div class='del'>-	int depth;</div><div class='del'>-	__u32 flags;</div><div class='del'>-	__u32 vfespfr;</div><div class='del'>-};</div><div class='del'>-/* flags */</div><div class='del'>-#define ZORAN_FORMAT_COMPRESSED 1&lt;&lt;0</div><div class='del'>-#define ZORAN_FORMAT_OVERLAY    1&lt;&lt;1</div><div class='del'>-#define ZORAN_FORMAT_CAPTURE	1&lt;&lt;2</div><div class='del'>-#define ZORAN_FORMAT_PLAYBACK	1&lt;&lt;3</div><div class='del'>-</div><div class='del'>-/* overlay-settings */</div><div class='del'>-struct zoran_overlay_settings {</div><div class='del'>-	int is_set;</div><div class='del'>-	int x, y, width, height;	/* position */</div><div class='del'>-	int clipcount;		/* position and number of clips */</div><div class='del'>-	const struct zoran_format *format;	/* overlay format */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* v4l-capture settings */</div><div class='del'>-struct zoran_v4l_settings {</div><div class='del'>-	int width, height, bytesperline;	/* capture size */</div><div class='del'>-	const struct zoran_format *format;	/* capture format */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* jpg-capture/-playback settings */</div><div class='del'>-struct zoran_jpg_settings {</div><div class='del'>-	int decimation;		/* this bit is used to set everything to default */</div><div class='del'>-	int HorDcm, VerDcm, TmpDcm;	/* capture decimation settings (TmpDcm=1 means both fields) */</div><div class='del'>-	int field_per_buff, odd_even;	/* field-settings (odd_even=1 (+TmpDcm=1) means top-field-first) */</div><div class='del'>-	int img_x, img_y, img_width, img_height;	/* crop settings (subframe capture) */</div><div class='del'>-	struct v4l2_jpegcompression jpg_comp;	/* JPEG-specific capture settings */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct zoran_fh;</div><div class='del'>-</div><div class='del'>-struct zoran_mapping {</div><div class='del'>-	struct zoran_fh *fh;</div><div class='del'>-	atomic_t count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct zoran_buffer {</div><div class='del'>-	struct zoran_mapping *map;</div><div class='del'>-	enum zoran_buffer_state state;	/* state: unused/pending/dma/done */</div><div class='del'>-	struct zoran_sync bs;		/* DONE: info to return to application */</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			__le32 *frag_tab;	/* addresses of frag table */</div><div class='del'>-			u32 frag_tab_bus;	/* same value cached to save time in ISR */</div><div class='del'>-		} jpg;</div><div class='del'>-		struct {</div><div class='del'>-			char *fbuffer;		/* virtual address of frame buffer */</div><div class='del'>-			unsigned long fbuffer_phys;/* physical address of frame buffer */</div><div class='del'>-			unsigned long fbuffer_bus;/* bus address of frame buffer */</div><div class='del'>-		} v4l;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum zoran_lock_activity {</div><div class='del'>-	ZORAN_FREE,		/* free for use */</div><div class='del'>-	ZORAN_ACTIVE,		/* active but unlocked */</div><div class='del'>-	ZORAN_LOCKED,		/* locked */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* buffer collections */</div><div class='del'>-struct zoran_buffer_col {</div><div class='del'>-	enum zoran_lock_activity active;	/* feature currently in use? */</div><div class='del'>-	unsigned int num_buffers, buffer_size;</div><div class='del'>-	struct zoran_buffer buffer[MAX_FRAME];	/* buffers */</div><div class='del'>-	u8 allocated;		/* Flag if buffers are allocated  */</div><div class='del'>-	u8 need_contiguous;	/* Flag if contiguous buffers are needed */</div><div class='del'>-	/* only applies to jpg buffers, raw buffers are always contiguous */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct zoran;</div><div class='del'>-</div><div class='del'>-/* zoran_fh contains per-open() settings */</div><div class='del'>-struct zoran_fh {</div><div class='del'>-	struct v4l2_fh fh;</div><div class='del'>-	struct zoran *zr;</div><div class='del'>-</div><div class='del'>-	enum zoran_map_mode map_mode;		/* Flag which bufferset will map by next mmap() */</div><div class='del'>-</div><div class='del'>-	struct zoran_overlay_settings overlay_settings;</div><div class='del'>-	u32 *overlay_mask;			/* overlay mask */</div><div class='del'>-	enum zoran_lock_activity overlay_active;/* feature currently in use? */</div><div class='del'>-</div><div class='del'>-	struct zoran_buffer_col buffers;	/* buffers' info */</div><div class='del'>-</div><div class='del'>-	struct zoran_v4l_settings v4l_settings;	/* structure with a lot of things to play with */</div><div class='del'>-	struct zoran_jpg_settings jpg_settings;	/* structure with a lot of things to play with */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct card_info {</div><div class='del'>-	enum card_type type;</div><div class='del'>-	char name[32];</div><div class='del'>-	const char *i2c_decoder;	/* i2c decoder device */</div><div class='del'>-	const unsigned short *addrs_decoder;</div><div class='del'>-	const char *i2c_encoder;	/* i2c encoder device */</div><div class='del'>-	const unsigned short *addrs_encoder;</div><div class='del'>-	u16 video_vfe, video_codec;			/* videocodec types */</div><div class='del'>-	u16 audio_chip;					/* audio type */</div><div class='del'>-</div><div class='del'>-	int inputs;		/* number of video inputs */</div><div class='del'>-	struct input {</div><div class='del'>-		int muxsel;</div><div class='del'>-		char name[32];</div><div class='del'>-	} input[BUZ_MAX_INPUT];</div><div class='del'>-</div><div class='del'>-	v4l2_std_id norms;</div><div class='del'>-	struct tvnorm *tvn[3];	/* supported TV norms */</div><div class='del'>-</div><div class='del'>-	u32 jpeg_int;		/* JPEG interrupt */</div><div class='del'>-	u32 vsync_int;		/* VSYNC interrupt */</div><div class='del'>-	s8 gpio[ZR_GPIO_MAX];</div><div class='del'>-	u8 gpcs[GPCS_MAX];</div><div class='del'>-</div><div class='del'>-	struct vfe_polarity vfe_pol;</div><div class='del'>-	u8 gpio_pol[ZR_GPIO_MAX];</div><div class='del'>-</div><div class='del'>-	/* is the /GWS line connected? */</div><div class='del'>-	u8 gws_not_connected;</div><div class='del'>-</div><div class='del'>-	/* avs6eyes mux setting */</div><div class='del'>-	u8 input_mux;</div><div class='del'>-</div><div class='del'>-	void (*init) (struct zoran * zr);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct zoran {</div><div class='del'>-	struct v4l2_device v4l2_dev;</div><div class='del'>-	struct v4l2_ctrl_handler hdl;</div><div class='del'>-	struct video_device *video_dev;</div><div class='del'>-</div><div class='del'>-	struct i2c_adapter i2c_adapter;	/* */</div><div class='del'>-	struct i2c_algo_bit_data i2c_algo;	/* */</div><div class='del'>-	u32 i2cbr;</div><div class='del'>-</div><div class='del'>-	struct v4l2_subdev *decoder;	/* video decoder sub-device */</div><div class='del'>-	struct v4l2_subdev *encoder;	/* video encoder sub-device */</div><div class='del'>-</div><div class='del'>-	struct videocodec *codec;	/* video codec */</div><div class='del'>-	struct videocodec *vfe;	/* video front end */</div><div class='del'>-</div><div class='del'>-	struct mutex lock;	/* file ops serialize lock */</div><div class='del'>-</div><div class='del'>-	u8 initialized;		/* flag if zoran has been correctly initialized */</div><div class='del'>-	int user;		/* number of current users */</div><div class='del'>-	struct card_info card;</div><div class='del'>-	struct tvnorm *timing;</div><div class='del'>-</div><div class='del'>-	unsigned short id;	/* number of this device */</div><div class='del'>-	char name[32];		/* name of this device */</div><div class='del'>-	struct pci_dev *pci_dev;	/* PCI device */</div><div class='del'>-	unsigned char revision;	/* revision of zr36057 */</div><div class='del'>-	unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */</div><div class='del'>-</div><div class='del'>-	spinlock_t spinlock;	/* Spinlock */</div><div class='del'>-</div><div class='del'>-	/* Video for Linux parameters */</div><div class='del'>-	int input;	/* card's norm and input */</div><div class='del'>-	v4l2_std_id norm;</div><div class='del'>-</div><div class='del'>-	/* Current buffer params */</div><div class='del'>-	void    *vbuf_base;</div><div class='del'>-	int     vbuf_height, vbuf_width;</div><div class='del'>-	int     vbuf_depth;</div><div class='del'>-	int     vbuf_bytesperline;</div><div class='del'>-</div><div class='del'>-	struct zoran_overlay_settings overlay_settings;</div><div class='del'>-	u32 *overlay_mask;	/* overlay mask */</div><div class='del'>-	enum zoran_lock_activity overlay_active;	/* feature currently in use? */</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t v4l_capq;</div><div class='del'>-</div><div class='del'>-	int v4l_overlay_active;	/* Overlay grab is activated */</div><div class='del'>-	int v4l_memgrab_active;	/* Memory grab is activated */</div><div class='del'>-</div><div class='del'>-	int v4l_grab_frame;	/* Frame number being currently grabbed */</div><div class='del'>-#define NO_GRAB_ACTIVE (-1)</div><div class='del'>-	unsigned long v4l_grab_seq;	/* Number of frames grabbed */</div><div class='del'>-	struct zoran_v4l_settings v4l_settings;	/* structure with a lot of things to play with */</div><div class='del'>-</div><div class='del'>-	/* V4L grab queue of frames pending */</div><div class='del'>-	unsigned long v4l_pend_head;</div><div class='del'>-	unsigned long v4l_pend_tail;</div><div class='del'>-	unsigned long v4l_sync_tail;</div><div class='del'>-	int v4l_pend[V4L_MAX_FRAME];</div><div class='del'>-	struct zoran_buffer_col v4l_buffers;	/* V4L buffers' info */</div><div class='del'>-</div><div class='del'>-	/* Buz MJPEG parameters */</div><div class='del'>-	enum zoran_codec_mode codec_mode;	/* status of codec */</div><div class='del'>-	struct zoran_jpg_settings jpg_settings;	/* structure with a lot of things to play with */</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t jpg_capq;	/* wait here for grab to finish */</div><div class='del'>-</div><div class='del'>-	/* grab queue counts/indices, mask with BUZ_MASK_STAT_COM before using as index */</div><div class='del'>-	/* (dma_head - dma_tail) is number active in DMA, must be &lt;= BUZ_NUM_STAT_COM */</div><div class='del'>-	/* (value &amp; BUZ_MASK_STAT_COM) corresponds to index in stat_com table */</div><div class='del'>-	unsigned long jpg_que_head;	/* Index where to put next buffer which is queued */</div><div class='del'>-	unsigned long jpg_dma_head;	/* Index of next buffer which goes into stat_com  */</div><div class='del'>-	unsigned long jpg_dma_tail;	/* Index of last buffer in stat_com               */</div><div class='del'>-	unsigned long jpg_que_tail;	/* Index of last buffer in queue                  */</div><div class='del'>-	unsigned long jpg_seq_num;	/* count of frames since grab/play started        */</div><div class='del'>-	unsigned long jpg_err_seq;	/* last seq_num before error                      */</div><div class='del'>-	unsigned long jpg_err_shift;</div><div class='del'>-	unsigned long jpg_queued_num;	/* count of frames queued since grab/play started */</div><div class='del'>-</div><div class='del'>-	/* zr36057's code buffer table */</div><div class='del'>-	__le32 *stat_com;		/* stat_com[i] is indexed by dma_head/tail &amp; BUZ_MASK_STAT_COM */</div><div class='del'>-</div><div class='del'>-	/* (value &amp; BUZ_MASK_FRAME) corresponds to index in pend[] queue */</div><div class='del'>-	int jpg_pend[BUZ_MAX_FRAME];</div><div class='del'>-</div><div class='del'>-	/* array indexed by frame number */</div><div class='del'>-	struct zoran_buffer_col jpg_buffers;	/* MJPEG buffers' info */</div><div class='del'>-</div><div class='del'>-	/* Additional stuff for testing */</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	struct proc_dir_entry *zoran_proc;</div><div class='del'>-#else</div><div class='del'>-	void *zoran_proc;</div><div class='del'>-#endif</div><div class='del'>-	int testing;</div><div class='del'>-	int jpeg_error;</div><div class='del'>-	int intr_counter_GIRQ1;</div><div class='del'>-	int intr_counter_GIRQ0;</div><div class='del'>-	int intr_counter_CodRepIRQ;</div><div class='del'>-	int intr_counter_JPEGRepIRQ;</div><div class='del'>-	int field_counter;</div><div class='del'>-	int IRQ1_in;</div><div class='del'>-	int IRQ1_out;</div><div class='del'>-	int JPEG_in;</div><div class='del'>-	int JPEG_out;</div><div class='del'>-	int JPEG_0;</div><div class='del'>-	int JPEG_1;</div><div class='del'>-	int END_event_missed;</div><div class='del'>-	int JPEG_missed;</div><div class='del'>-	int JPEG_error;</div><div class='del'>-	int num_errors;</div><div class='del'>-	int JPEG_max_missed;</div><div class='del'>-	int JPEG_min_missed;</div><div class='del'>-</div><div class='del'>-	u32 last_isr;</div><div class='del'>-	unsigned long frame_num;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t test_q;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)</div><div class='del'>-{</div><div class='del'>-	return container_of(v4l2_dev, struct zoran, v4l2_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* There was something called _ALPHA_BUZ that used the PCI address instead of</div><div class='del'>- * the kernel iomapped address for btread/btwrite.  */</div><div class='del'>-#define btwrite(dat,adr)    writel((dat), zr-&gt;zr36057_mem+(adr))</div><div class='del'>-#define btread(adr)         readl(zr-&gt;zr36057_mem+(adr))</div><div class='del'>-</div><div class='del'>-#define btand(dat,adr)      btwrite((dat) &amp; btread(adr), adr)</div><div class='del'>-#define btor(dat,adr)       btwrite((dat) | btread(adr), adr)</div><div class='del'>-#define btaor(dat,mask,adr) btwrite((dat) | ((mask) &amp; btread(adr)), adr)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c<br/>deleted file mode 100644<br/>index ea10523194e8..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_card.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1524 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * This part handles card-specific data and detection</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Currently maintained by:</div><div class='del'>- *   Ronald Bultje    &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *   Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *   Mailinglist      &lt;mjpeg-users@lists.sf.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.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/init.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='del'>-#include &lt;linux/videodev2.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sem.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='del'>-#include &lt;media/i2c/bt819.h&gt;</div><div class='del'>-</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-#include "zoran.h"</div><div class='del'>-#include "zoran_card.h"</div><div class='del'>-#include "zoran_device.h"</div><div class='del'>-#include "zoran_procfs.h"</div><div class='del'>-</div><div class='del'>-extern const struct zoran_format zoran_formats[];</div><div class='del'>-</div><div class='del'>-static int card[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };</div><div class='del'>-module_param_array(card, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(card, "Card type");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   The video mem address of the video card.</div><div class='del'>-   The driver has a little database for some videocards</div><div class='del'>-   to determine it from there. If your video card is not in there</div><div class='del'>-   you have either to give it to the driver as a parameter</div><div class='del'>-   or set in in a VIDIOCSFBUF ioctl</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned long vidmem;	/* default = 0 - Video memory base address */</div><div class='del'>-module_param_hw(vidmem, ulong, iomem, 0444);</div><div class='del'>-MODULE_PARM_DESC(vidmem, "Default video memory base address");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   Default input and video norm at startup of the driver.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static unsigned int default_input;	/* default 0 = Composite, 1 = S-Video */</div><div class='del'>-module_param(default_input, uint, 0444);</div><div class='del'>-MODULE_PARM_DESC(default_input,</div><div class='del'>-		 "Default input (0=Composite, 1=S-Video, 2=Internal)");</div><div class='del'>-</div><div class='del'>-static int default_mux = 1;	/* 6 Eyes input selection */</div><div class='del'>-module_param(default_mux, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(default_mux,</div><div class='del'>-		 "Default 6 Eyes mux setting (Input selection)");</div><div class='del'>-</div><div class='del'>-static int default_norm;	/* default 0 = PAL, 1 = NTSC 2 = SECAM */</div><div class='del'>-module_param(default_norm, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)");</div><div class='del'>-</div><div class='del'>-/* /dev/videoN, -1 for autodetect */</div><div class='del'>-static int video_nr[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };</div><div class='del'>-module_param_array(video_nr, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(video_nr, "Video device number (-1=Auto)");</div><div class='del'>-</div><div class='del'>-int v4l_nbufs = 4;</div><div class='del'>-int v4l_bufsize = 864;		/* Everybody should be able to work with this setting */</div><div class='del'>-module_param(v4l_nbufs, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(v4l_nbufs, "Maximum number of V4L buffers to use");</div><div class='del'>-module_param(v4l_bufsize, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(v4l_bufsize, "Maximum size per V4L buffer (in kB)");</div><div class='del'>-</div><div class='del'>-int jpg_nbufs = 32;</div><div class='del'>-int jpg_bufsize = 512;		/* max size for 100% quality full-PAL frame */</div><div class='del'>-module_param(jpg_nbufs, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(jpg_nbufs, "Maximum number of JPG buffers to use");</div><div class='del'>-module_param(jpg_bufsize, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(jpg_bufsize, "Maximum size per JPG buffer (in kB)");</div><div class='del'>-</div><div class='del'>-int pass_through = 0;		/* 1=Pass through TV signal when device is not used */</div><div class='del'>-				/* 0=Show color bar when device is not used (LML33: only if lml33dpath=1) */</div><div class='del'>-module_param(pass_through, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(pass_through,</div><div class='del'>-		 "Pass TV signal through to TV-out when idling");</div><div class='del'>-</div><div class='del'>-int zr36067_debug = 1;</div><div class='del'>-module_param_named(debug, zr36067_debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0-5)");</div><div class='del'>-</div><div class='del'>-#define ZORAN_VERSION "0.10.1"</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver");</div><div class='del'>-MODULE_AUTHOR("Serguei Miridonov");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(ZORAN_VERSION);</div><div class='del'>-</div><div class='del'>-#define ZR_DEVICE(subven, subdev, data)	{ \</div><div class='del'>-	.vendor = PCI_VENDOR_ID_ZORAN, .device = PCI_DEVICE_ID_ZORAN_36057, \</div><div class='del'>-	.subvendor = (subven), .subdevice = (subdev), .driver_data = (data) }</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id zr36067_pci_tbl[] = {</div><div class='del'>-	ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC10PLUS, DC10plus),</div><div class='del'>-	ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC30PLUS, DC30plus),</div><div class='del'>-	ZR_DEVICE(PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, PCI_DEVICE_ID_LML_33R10, LML33R10),</div><div class='del'>-	ZR_DEVICE(PCI_VENDOR_ID_IOMEGA, PCI_DEVICE_ID_IOMEGA_BUZ, BUZ),</div><div class='del'>-	ZR_DEVICE(PCI_ANY_ID, PCI_ANY_ID, NUM_CARDS),</div><div class='del'>-	{0}</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl);</div><div class='del'>-</div><div class='del'>-static unsigned int zoran_num;		/* number of cards found */</div><div class='del'>-</div><div class='del'>-/* videocodec bus functions ZR36060 */</div><div class='del'>-static u32</div><div class='del'>-zr36060_read (struct videocodec *codec,</div><div class='del'>-	      u16                reg)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) codec-&gt;master_data-&gt;data;</div><div class='del'>-	__u32 data;</div><div class='del'>-</div><div class='del'>-	if (post_office_wait(zr)</div><div class='del'>-	    || post_office_write(zr, 0, 1, reg &gt;&gt; 8)</div><div class='del'>-	    || post_office_write(zr, 0, 2, reg &amp; 0xff)) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = post_office_read(zr, 0, 3) &amp; 0xff;</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36060_write (struct videocodec *codec,</div><div class='del'>-	       u16                reg,</div><div class='del'>-	       u32                val)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) codec-&gt;master_data-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (post_office_wait(zr)</div><div class='del'>-	    || post_office_write(zr, 0, 1, reg &gt;&gt; 8)</div><div class='del'>-	    || post_office_write(zr, 0, 2, reg &amp; 0xff)) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	post_office_write(zr, 0, 3, val &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* videocodec bus functions ZR36050 */</div><div class='del'>-static u32</div><div class='del'>-zr36050_read (struct videocodec *codec,</div><div class='del'>-	      u16                reg)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) codec-&gt;master_data-&gt;data;</div><div class='del'>-	__u32 data;</div><div class='del'>-</div><div class='del'>-	if (post_office_wait(zr)</div><div class='del'>-	    || post_office_write(zr, 1, 0, reg &gt;&gt; 2)) {	// reg. HIGHBYTES</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = post_office_read(zr, 0, reg &amp; 0x03) &amp; 0xff;	// reg. LOWBYTES + read</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36050_write (struct videocodec *codec,</div><div class='del'>-	       u16                reg,</div><div class='del'>-	       u32                val)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) codec-&gt;master_data-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (post_office_wait(zr)</div><div class='del'>-	    || post_office_write(zr, 1, 0, reg &gt;&gt; 2)) {	// reg. HIGHBYTES</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	post_office_write(zr, 0, reg &amp; 0x03, val &amp; 0xff);	// reg. LOWBYTES + wr. data</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* videocodec bus functions ZR36016 */</div><div class='del'>-static u32</div><div class='del'>-zr36016_read (struct videocodec *codec,</div><div class='del'>-	      u16                reg)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) codec-&gt;master_data-&gt;data;</div><div class='del'>-	__u32 data;</div><div class='del'>-</div><div class='del'>-	if (post_office_wait(zr)) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = post_office_read(zr, 2, reg &amp; 0x03) &amp; 0xff;	// read</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hack for in zoran_device.c */</div><div class='del'>-void</div><div class='del'>-zr36016_write (struct videocodec *codec,</div><div class='del'>-	       u16                reg,</div><div class='del'>-	       u32                val)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) codec-&gt;master_data-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (post_office_wait(zr)) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	post_office_write(zr, 2, reg &amp; 0x03, val &amp; 0x0ff);	// wr. data</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Board specific information</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dc10_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	/* Pixel clock selection */</div><div class='del'>-	GPIO(zr, 4, 0);</div><div class='del'>-	GPIO(zr, 5, 1);</div><div class='del'>-	/* Enable the video bus sync signals */</div><div class='del'>-	GPIO(zr, 7, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dc10plus_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-buz_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	/* some stuff from Iomega */</div><div class='del'>-	pci_write_config_dword(zr-&gt;pci_dev, 0xfc, 0x90680f15);</div><div class='del'>-	pci_write_config_dword(zr-&gt;pci_dev, 0x0c, 0x00012020);</div><div class='del'>-	pci_write_config_dword(zr-&gt;pci_dev, 0xe8, 0xc0200000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-lml33_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	GPIO(zr, 2, 1);		// Set Composite input/output</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-avs6eyes_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	// AverMedia 6-Eyes original driver by Christer Weinigel</div><div class='del'>-</div><div class='del'>-	// Lifted straight from Christer's old driver and</div><div class='del'>-	// modified slightly by Martin Samuelsson.</div><div class='del'>-</div><div class='del'>-	int mux = default_mux; /* 1 = BT866, 7 = VID1 */</div><div class='del'>-</div><div class='del'>-	GPIO(zr, 4, 1); /* Bt866 SLEEP on */</div><div class='del'>-	udelay(2);</div><div class='del'>-</div><div class='del'>-	GPIO(zr, 0, 1); /* ZR36060 /RESET on */</div><div class='del'>-	GPIO(zr, 1, 0); /* ZR36060 /SLEEP on */</div><div class='del'>-	GPIO(zr, 2, mux &amp; 1);   /* MUX S0 */</div><div class='del'>-	GPIO(zr, 3, 0); /* /FRAME on */</div><div class='del'>-	GPIO(zr, 4, 0); /* Bt866 SLEEP off */</div><div class='del'>-	GPIO(zr, 5, mux &amp; 2);   /* MUX S1 */</div><div class='del'>-	GPIO(zr, 6, 0); /* ? */</div><div class='del'>-	GPIO(zr, 7, mux &amp; 4);   /* MUX S2 */</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-codecid_to_modulename (u16 codecid)</div><div class='del'>-{</div><div class='del'>-	char *name = NULL;</div><div class='del'>-</div><div class='del'>-	switch (codecid) {</div><div class='del'>-	case CODEC_TYPE_ZR36060:</div><div class='del'>-		name = "zr36060";</div><div class='del'>-		break;</div><div class='del'>-	case CODEC_TYPE_ZR36050:</div><div class='del'>-		name = "zr36050";</div><div class='del'>-		break;</div><div class='del'>-	case CODEC_TYPE_ZR36016:</div><div class='del'>-		name = "zr36016";</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// struct tvnorm {</div><div class='del'>-//      u16 Wt, Wa, HStart, HSyncStart, Ht, Ha, VStart;</div><div class='del'>-// };</div><div class='del'>-</div><div class='del'>-static struct tvnorm f50sqpixel = { 944, 768, 83, 880, 625, 576, 16 };</div><div class='del'>-static struct tvnorm f60sqpixel = { 780, 640, 51, 716, 525, 480, 12 };</div><div class='del'>-static struct tvnorm f50ccir601 = { 864, 720, 75, 804, 625, 576, 18 };</div><div class='del'>-static struct tvnorm f60ccir601 = { 858, 720, 57, 788, 525, 480, 16 };</div><div class='del'>-</div><div class='del'>-static struct tvnorm f50ccir601_lml33 = { 864, 720, 75+34, 804, 625, 576, 18 };</div><div class='del'>-static struct tvnorm f60ccir601_lml33 = { 858, 720, 57+34, 788, 525, 480, 16 };</div><div class='del'>-</div><div class='del'>-/* The DC10 (57/16/50) uses VActive as HSync, so HStart must be 0 */</div><div class='del'>-static struct tvnorm f50sqpixel_dc10 = { 944, 768, 0, 880, 625, 576, 0 };</div><div class='del'>-static struct tvnorm f60sqpixel_dc10 = { 780, 640, 0, 716, 525, 480, 12 };</div><div class='del'>-</div><div class='del'>-/* FIXME: I cannot swap U and V in saa7114, so i do one</div><div class='del'>- * pixel left shift in zoran (75 -&gt; 74)</div><div class='del'>- * (Maxim Yevtyushkin &lt;max@linuxmedialabs.com&gt;) */</div><div class='del'>-static struct tvnorm f50ccir601_lm33r10 = { 864, 720, 74+54, 804, 625, 576, 18 };</div><div class='del'>-static struct tvnorm f60ccir601_lm33r10 = { 858, 720, 56+54, 788, 525, 480, 16 };</div><div class='del'>-</div><div class='del'>-/* FIXME: The ks0127 seem incapable of swapping U and V, too, which is why I</div><div class='del'>- * copy Maxim's left shift hack for the 6 Eyes.</div><div class='del'>- *</div><div class='del'>- * Christer's driver used the unshifted norms, though...</div><div class='del'>- * /Sam  */</div><div class='del'>-static struct tvnorm f50ccir601_avs6eyes = { 864, 720, 74, 804, 625, 576, 18 };</div><div class='del'>-static struct tvnorm f60ccir601_avs6eyes = { 858, 720, 56, 788, 525, 480, 16 };</div><div class='del'>-</div><div class='del'>-static const unsigned short vpx3220_addrs[] = { 0x43, 0x47, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short saa7110_addrs[] = { 0x4e, 0x4f, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short saa7111_addrs[] = { 0x25, 0x24, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short saa7114_addrs[] = { 0x21, 0x20, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short adv717x_addrs[] = { 0x6a, 0x6b, 0x2a, 0x2b, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short ks0127_addrs[] = { 0x6c, 0x6d, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short saa7185_addrs[] = { 0x44, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short bt819_addrs[] = { 0x45, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short bt856_addrs[] = { 0x44, I2C_CLIENT_END };</div><div class='del'>-static const unsigned short bt866_addrs[] = { 0x44, I2C_CLIENT_END };</div><div class='del'>-</div><div class='del'>-static struct card_info zoran_cards[NUM_CARDS] = {</div><div class='del'>-	{</div><div class='del'>-		.type = DC10_old,</div><div class='del'>-		.name = "DC10(old)",</div><div class='del'>-		.i2c_decoder = "vpx3220a",</div><div class='del'>-		.addrs_decoder = vpx3220_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36050,</div><div class='del'>-		.video_vfe = CODEC_TYPE_ZR36016,</div><div class='del'>-</div><div class='del'>-		.inputs = 3,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 1, "Composite" },</div><div class='del'>-			{ 2, "S-Video" },</div><div class='del'>-			{ 0, "Internal/comp" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL|V4L2_STD_SECAM,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50sqpixel_dc10,</div><div class='del'>-			&amp;f60sqpixel_dc10,</div><div class='del'>-			&amp;f50sqpixel_dc10</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = 0,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.gpio = { 2, 1, -1, 3, 7, 0, 4, 5 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 1, 0, 0, 0, 0 },</div><div class='del'>-		.gpcs = { -1, 0 },</div><div class='del'>-		.vfe_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-		.gws_not_connected = 0,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;dc10_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = DC10_new,</div><div class='del'>-		.name = "DC10(new)",</div><div class='del'>-		.i2c_decoder = "saa7110",</div><div class='del'>-		.addrs_decoder = saa7110_addrs,</div><div class='del'>-		.i2c_encoder = "adv7175",</div><div class='del'>-		.addrs_encoder = adv717x_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36060,</div><div class='del'>-</div><div class='del'>-		.inputs = 3,</div><div class='del'>-		.input = {</div><div class='del'>-				{ 0, "Composite" },</div><div class='del'>-				{ 7, "S-Video" },</div><div class='del'>-				{ 5, "Internal/comp" }</div><div class='del'>-			},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL|V4L2_STD_SECAM,</div><div class='del'>-		.tvn = {</div><div class='del'>-				&amp;f50sqpixel,</div><div class='del'>-				&amp;f60sqpixel,</div><div class='del'>-				&amp;f50sqpixel},</div><div class='del'>-		.jpeg_int = ZR36057_ISR_GIRQ0,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.gpio = { 3, 0, 6, 1, 2, -1, 4, 5 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-		.gpcs = { -1, 1},</div><div class='del'>-		.vfe_pol = { 1, 1, 1, 1, 0, 0, 0, 0 },</div><div class='del'>-		.gws_not_connected = 0,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;dc10plus_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = DC10plus,</div><div class='del'>-		.name = "DC10plus",</div><div class='del'>-		.i2c_decoder = "saa7110",</div><div class='del'>-		.addrs_decoder = saa7110_addrs,</div><div class='del'>-		.i2c_encoder = "adv7175",</div><div class='del'>-		.addrs_encoder = adv717x_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36060,</div><div class='del'>-</div><div class='del'>-		.inputs = 3,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 0, "Composite" },</div><div class='del'>-			{ 7, "S-Video" },</div><div class='del'>-			{ 5, "Internal/comp" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL|V4L2_STD_SECAM,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50sqpixel,</div><div class='del'>-			&amp;f60sqpixel,</div><div class='del'>-			&amp;f50sqpixel</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = ZR36057_ISR_GIRQ0,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.gpio = { 3, 0, 6, 1, 2, -1, 4, 5 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-		.gpcs = { -1, 1 },</div><div class='del'>-		.vfe_pol = { 1, 1, 1, 1, 0, 0, 0, 0 },</div><div class='del'>-		.gws_not_connected = 0,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;dc10plus_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = DC30,</div><div class='del'>-		.name = "DC30",</div><div class='del'>-		.i2c_decoder = "vpx3220a",</div><div class='del'>-		.addrs_decoder = vpx3220_addrs,</div><div class='del'>-		.i2c_encoder = "adv7175",</div><div class='del'>-		.addrs_encoder = adv717x_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36050,</div><div class='del'>-		.video_vfe = CODEC_TYPE_ZR36016,</div><div class='del'>-</div><div class='del'>-		.inputs = 3,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 1, "Composite" },</div><div class='del'>-			{ 2, "S-Video" },</div><div class='del'>-			{ 0, "Internal/comp" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL|V4L2_STD_SECAM,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50sqpixel_dc10,</div><div class='del'>-			&amp;f60sqpixel_dc10,</div><div class='del'>-			&amp;f50sqpixel_dc10</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = 0,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.gpio = { 2, 1, -1, 3, 7, 0, 4, 5 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 1, 0, 0, 0, 0 },</div><div class='del'>-		.gpcs = { -1, 0 },</div><div class='del'>-		.vfe_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-		.gws_not_connected = 0,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;dc10_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = DC30plus,</div><div class='del'>-		.name = "DC30plus",</div><div class='del'>-		.i2c_decoder = "vpx3220a",</div><div class='del'>-		.addrs_decoder = vpx3220_addrs,</div><div class='del'>-		.i2c_encoder = "adv7175",</div><div class='del'>-		.addrs_encoder = adv717x_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36050,</div><div class='del'>-		.video_vfe = CODEC_TYPE_ZR36016,</div><div class='del'>-</div><div class='del'>-		.inputs = 3,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 1, "Composite" },</div><div class='del'>-			{ 2, "S-Video" },</div><div class='del'>-			{ 0, "Internal/comp" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL|V4L2_STD_SECAM,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50sqpixel_dc10,</div><div class='del'>-			&amp;f60sqpixel_dc10,</div><div class='del'>-			&amp;f50sqpixel_dc10</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = 0,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.gpio = { 2, 1, -1, 3, 7, 0, 4, 5 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 1, 0, 0, 0, 0 },</div><div class='del'>-		.gpcs = { -1, 0 },</div><div class='del'>-		.vfe_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-		.gws_not_connected = 0,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;dc10_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = LML33,</div><div class='del'>-		.name = "LML33",</div><div class='del'>-		.i2c_decoder = "bt819a",</div><div class='del'>-		.addrs_decoder = bt819_addrs,</div><div class='del'>-		.i2c_encoder = "bt856",</div><div class='del'>-		.addrs_encoder = bt856_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36060,</div><div class='del'>-</div><div class='del'>-		.inputs = 2,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 0, "Composite" },</div><div class='del'>-			{ 7, "S-Video" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50ccir601_lml33,</div><div class='del'>-			&amp;f60ccir601_lml33,</div><div class='del'>-			NULL</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ0,</div><div class='del'>-		.gpio = { 1, -1, 3, 5, 7, -1, -1, -1 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 0, 1, 0, 0, 0 },</div><div class='del'>-		.gpcs = { 3, 1 },</div><div class='del'>-		.vfe_pol = { 1, 1, 0, 0, 0, 1, 0, 0 },</div><div class='del'>-		.gws_not_connected = 1,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;lml33_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = LML33R10,</div><div class='del'>-		.name = "LML33R10",</div><div class='del'>-		.i2c_decoder = "saa7114",</div><div class='del'>-		.addrs_decoder = saa7114_addrs,</div><div class='del'>-		.i2c_encoder = "adv7170",</div><div class='del'>-		.addrs_encoder = adv717x_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36060,</div><div class='del'>-</div><div class='del'>-		.inputs = 2,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 0, "Composite" },</div><div class='del'>-			{ 7, "S-Video" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50ccir601_lm33r10,</div><div class='del'>-			&amp;f60ccir601_lm33r10,</div><div class='del'>-			NULL</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ0,</div><div class='del'>-		.gpio = { 1, -1, 3, 5, 7, -1, -1, -1 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 0, 1, 0, 0, 0 },</div><div class='del'>-		.gpcs = { 3, 1 },</div><div class='del'>-		.vfe_pol = { 1, 1, 0, 0, 0, 1, 0, 0 },</div><div class='del'>-		.gws_not_connected = 1,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;lml33_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = BUZ,</div><div class='del'>-		.name = "Buz",</div><div class='del'>-		.i2c_decoder = "saa7111",</div><div class='del'>-		.addrs_decoder = saa7111_addrs,</div><div class='del'>-		.i2c_encoder = "saa7185",</div><div class='del'>-		.addrs_encoder = saa7185_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36060,</div><div class='del'>-</div><div class='del'>-		.inputs = 2,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 3, "Composite" },</div><div class='del'>-			{ 7, "S-Video" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL|V4L2_STD_SECAM,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50ccir601,</div><div class='del'>-			&amp;f60ccir601,</div><div class='del'>-			&amp;f50ccir601</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ0,</div><div class='del'>-		.gpio = { 1, -1, 3, -1, -1, -1, -1, -1 },</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-		.gpcs = { 3, 1 },</div><div class='del'>-		.vfe_pol = { 1, 1, 0, 0, 0, 1, 0, 0 },</div><div class='del'>-		.gws_not_connected = 1,</div><div class='del'>-		.input_mux = 0,</div><div class='del'>-		.init = &amp;buz_init,</div><div class='del'>-	}, {</div><div class='del'>-		.type = AVS6EYES,</div><div class='del'>-		.name = "6-Eyes",</div><div class='del'>-		/* AverMedia chose not to brand the 6-Eyes. Thus it</div><div class='del'>-		   can't be autodetected, and requires card=x. */</div><div class='del'>-		.i2c_decoder = "ks0127",</div><div class='del'>-		.addrs_decoder = ks0127_addrs,</div><div class='del'>-		.i2c_encoder = "bt866",</div><div class='del'>-		.addrs_encoder = bt866_addrs,</div><div class='del'>-		.video_codec = CODEC_TYPE_ZR36060,</div><div class='del'>-</div><div class='del'>-		.inputs = 10,</div><div class='del'>-		.input = {</div><div class='del'>-			{ 0, "Composite 1" },</div><div class='del'>-			{ 1, "Composite 2" },</div><div class='del'>-			{ 2, "Composite 3" },</div><div class='del'>-			{ 4, "Composite 4" },</div><div class='del'>-			{ 5, "Composite 5" },</div><div class='del'>-			{ 6, "Composite 6" },</div><div class='del'>-			{ 8, "S-Video 1" },</div><div class='del'>-			{ 9, "S-Video 2" },</div><div class='del'>-			{10, "S-Video 3" },</div><div class='del'>-			{15, "YCbCr" }</div><div class='del'>-		},</div><div class='del'>-		.norms = V4L2_STD_NTSC|V4L2_STD_PAL,</div><div class='del'>-		.tvn = {</div><div class='del'>-			&amp;f50ccir601_avs6eyes,</div><div class='del'>-			&amp;f60ccir601_avs6eyes,</div><div class='del'>-			NULL</div><div class='del'>-		},</div><div class='del'>-		.jpeg_int = ZR36057_ISR_GIRQ1,</div><div class='del'>-		.vsync_int = ZR36057_ISR_GIRQ0,</div><div class='del'>-		.gpio = { 1, 0, 3, -1, -1, -1, -1, -1 },// Validity unknown /Sam</div><div class='del'>-		.gpio_pol = { 0, 0, 0, 0, 0, 0, 0, 0 }, // Validity unknown /Sam</div><div class='del'>-		.gpcs = { 3, 1 },			// Validity unknown /Sam</div><div class='del'>-		.vfe_pol = { 1, 0, 0, 0, 0, 1, 0, 0 },  // Validity unknown /Sam</div><div class='del'>-		.gws_not_connected = 1,</div><div class='del'>-		.input_mux = 1,</div><div class='del'>-		.init = &amp;avs6eyes_init,</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * I2C functions</div><div class='del'>- */</div><div class='del'>-/* software I2C functions */</div><div class='del'>-static int</div><div class='del'>-zoran_i2c_getsda (void *data)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) data;</div><div class='del'>-</div><div class='del'>-	return (btread(ZR36057_I2CBR) &gt;&gt; 1) &amp; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zoran_i2c_getscl (void *data)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) data;</div><div class='del'>-</div><div class='del'>-	return btread(ZR36057_I2CBR) &amp; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zoran_i2c_setsda (void *data,</div><div class='del'>-		  int   state)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) data;</div><div class='del'>-</div><div class='del'>-	if (state)</div><div class='del'>-		zr-&gt;i2cbr |= 2;</div><div class='del'>-	else</div><div class='del'>-		zr-&gt;i2cbr &amp;= ~2;</div><div class='del'>-	btwrite(zr-&gt;i2cbr, ZR36057_I2CBR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zoran_i2c_setscl (void *data,</div><div class='del'>-		  int   state)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = (struct zoran *) data;</div><div class='del'>-</div><div class='del'>-	if (state)</div><div class='del'>-		zr-&gt;i2cbr |= 1;</div><div class='del'>-	else</div><div class='del'>-		zr-&gt;i2cbr &amp;= ~1;</div><div class='del'>-	btwrite(zr-&gt;i2cbr, ZR36057_I2CBR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct i2c_algo_bit_data zoran_i2c_bit_data_template = {</div><div class='del'>-	.setsda = zoran_i2c_setsda,</div><div class='del'>-	.setscl = zoran_i2c_setscl,</div><div class='del'>-	.getsda = zoran_i2c_getsda,</div><div class='del'>-	.getscl = zoran_i2c_getscl,</div><div class='del'>-	.udelay = 10,</div><div class='del'>-	.timeout = 100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zoran_register_i2c (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	zr-&gt;i2c_algo = zoran_i2c_bit_data_template;</div><div class='del'>-	zr-&gt;i2c_algo.data = zr;</div><div class='del'>-	strscpy(zr-&gt;i2c_adapter.name, ZR_DEVNAME(zr),</div><div class='del'>-		sizeof(zr-&gt;i2c_adapter.name));</div><div class='del'>-	i2c_set_adapdata(&amp;zr-&gt;i2c_adapter, &amp;zr-&gt;v4l2_dev);</div><div class='del'>-	zr-&gt;i2c_adapter.algo_data = &amp;zr-&gt;i2c_algo;</div><div class='del'>-	zr-&gt;i2c_adapter.dev.parent = &amp;zr-&gt;pci_dev-&gt;dev;</div><div class='del'>-	return i2c_bit_add_bus(&amp;zr-&gt;i2c_adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zoran_unregister_i2c (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	i2c_del_adapter(&amp;zr-&gt;i2c_adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Check a zoran_params struct for correctness, insert default params */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-zoran_check_jpg_settings (struct zoran              *zr,</div><div class='del'>-			  struct zoran_jpg_settings *settings,</div><div class='del'>-			  int try)</div><div class='del'>-{</div><div class='del'>-	int err = 0, err0 = 0;</div><div class='del'>-</div><div class='del'>-	dprintk(4,</div><div class='del'>-		KERN_DEBUG</div><div class='del'>-		"%s: %s - dec: %d, Hdcm: %d, Vdcm: %d, Tdcm: %d\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__, settings-&gt;decimation, settings-&gt;HorDcm,</div><div class='del'>-		settings-&gt;VerDcm, settings-&gt;TmpDcm);</div><div class='del'>-	dprintk(4,</div><div class='del'>-		KERN_DEBUG</div><div class='del'>-		"%s: %s - x: %d, y: %d, w: %d, y: %d\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__, settings-&gt;img_x, settings-&gt;img_y,</div><div class='del'>-		settings-&gt;img_width, settings-&gt;img_height);</div><div class='del'>-	/* Check decimation, set default values for decimation = 1, 2, 4 */</div><div class='del'>-	switch (settings-&gt;decimation) {</div><div class='del'>-	case 1:</div><div class='del'>-</div><div class='del'>-		settings-&gt;HorDcm = 1;</div><div class='del'>-		settings-&gt;VerDcm = 1;</div><div class='del'>-		settings-&gt;TmpDcm = 1;</div><div class='del'>-		settings-&gt;field_per_buff = 2;</div><div class='del'>-		settings-&gt;img_x = 0;</div><div class='del'>-		settings-&gt;img_y = 0;</div><div class='del'>-		settings-&gt;img_width = BUZ_MAX_WIDTH;</div><div class='del'>-		settings-&gt;img_height = BUZ_MAX_HEIGHT / 2;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-</div><div class='del'>-		settings-&gt;HorDcm = 2;</div><div class='del'>-		settings-&gt;VerDcm = 1;</div><div class='del'>-		settings-&gt;TmpDcm = 2;</div><div class='del'>-		settings-&gt;field_per_buff = 1;</div><div class='del'>-		settings-&gt;img_x = (BUZ_MAX_WIDTH == 720) ? 8 : 0;</div><div class='del'>-		settings-&gt;img_y = 0;</div><div class='del'>-		settings-&gt;img_width =</div><div class='del'>-		    (BUZ_MAX_WIDTH == 720) ? 704 : BUZ_MAX_WIDTH;</div><div class='del'>-		settings-&gt;img_height = BUZ_MAX_HEIGHT / 2;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-</div><div class='del'>-		if (zr-&gt;card.type == DC10_new) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_DEBUG</div><div class='del'>-				"%s: %s - HDec by 4 is not supported on the DC10\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			err0++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		settings-&gt;HorDcm = 4;</div><div class='del'>-		settings-&gt;VerDcm = 2;</div><div class='del'>-		settings-&gt;TmpDcm = 2;</div><div class='del'>-		settings-&gt;field_per_buff = 1;</div><div class='del'>-		settings-&gt;img_x = (BUZ_MAX_WIDTH == 720) ? 8 : 0;</div><div class='del'>-		settings-&gt;img_y = 0;</div><div class='del'>-		settings-&gt;img_width =</div><div class='del'>-		    (BUZ_MAX_WIDTH == 720) ? 704 : BUZ_MAX_WIDTH;</div><div class='del'>-		settings-&gt;img_height = BUZ_MAX_HEIGHT / 2;</div><div class='del'>-		break;</div><div class='del'>-	case 0:</div><div class='del'>-</div><div class='del'>-		/* We have to check the data the user has set */</div><div class='del'>-</div><div class='del'>-		if (settings-&gt;HorDcm != 1 &amp;&amp; settings-&gt;HorDcm != 2 &amp;&amp;</div><div class='del'>-		    (zr-&gt;card.type == DC10_new || settings-&gt;HorDcm != 4)) {</div><div class='del'>-			settings-&gt;HorDcm = clamp(settings-&gt;HorDcm, 1, 2);</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;VerDcm != 1 &amp;&amp; settings-&gt;VerDcm != 2) {</div><div class='del'>-			settings-&gt;VerDcm = clamp(settings-&gt;VerDcm, 1, 2);</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;TmpDcm != 1 &amp;&amp; settings-&gt;TmpDcm != 2) {</div><div class='del'>-			settings-&gt;TmpDcm = clamp(settings-&gt;TmpDcm, 1, 2);</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;field_per_buff != 1 &amp;&amp;</div><div class='del'>-		    settings-&gt;field_per_buff != 2) {</div><div class='del'>-			settings-&gt;field_per_buff = clamp(settings-&gt;field_per_buff, 1, 2);</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_x &lt; 0) {</div><div class='del'>-			settings-&gt;img_x = 0;</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_y &lt; 0) {</div><div class='del'>-			settings-&gt;img_y = 0;</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_width &lt; 0 || settings-&gt;img_width &gt; BUZ_MAX_WIDTH) {</div><div class='del'>-			settings-&gt;img_width = clamp(settings-&gt;img_width, 0, (int)BUZ_MAX_WIDTH);</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_height &lt; 0 || settings-&gt;img_height &gt; BUZ_MAX_HEIGHT / 2) {</div><div class='del'>-			settings-&gt;img_height = clamp(settings-&gt;img_height, 0, BUZ_MAX_HEIGHT / 2);</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_x + settings-&gt;img_width &gt; BUZ_MAX_WIDTH) {</div><div class='del'>-			settings-&gt;img_x = BUZ_MAX_WIDTH - settings-&gt;img_width;</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_y + settings-&gt;img_height &gt; BUZ_MAX_HEIGHT / 2) {</div><div class='del'>-			settings-&gt;img_y = BUZ_MAX_HEIGHT / 2 - settings-&gt;img_height;</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_width % (16 * settings-&gt;HorDcm) != 0) {</div><div class='del'>-			settings-&gt;img_width -= settings-&gt;img_width % (16 * settings-&gt;HorDcm);</div><div class='del'>-			if (settings-&gt;img_width == 0)</div><div class='del'>-				settings-&gt;img_width = 16 * settings-&gt;HorDcm;</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-		if (settings-&gt;img_height % (8 * settings-&gt;VerDcm) != 0) {</div><div class='del'>-			settings-&gt;img_height -= settings-&gt;img_height % (8 * settings-&gt;VerDcm);</div><div class='del'>-			if (settings-&gt;img_height == 0)</div><div class='del'>-				settings-&gt;img_height = 8 * settings-&gt;VerDcm;</div><div class='del'>-			err0++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!try &amp;&amp; err0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - error in params for decimation = 0\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			err++;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - decimation = %d, must be 0, 1, 2 or 4\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, settings-&gt;decimation);</div><div class='del'>-		err++;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (settings-&gt;jpg_comp.quality &gt; 100)</div><div class='del'>-		settings-&gt;jpg_comp.quality = 100;</div><div class='del'>-	if (settings-&gt;jpg_comp.quality &lt; 5)</div><div class='del'>-		settings-&gt;jpg_comp.quality = 5;</div><div class='del'>-	if (settings-&gt;jpg_comp.APPn &lt; 0)</div><div class='del'>-		settings-&gt;jpg_comp.APPn = 0;</div><div class='del'>-	if (settings-&gt;jpg_comp.APPn &gt; 15)</div><div class='del'>-		settings-&gt;jpg_comp.APPn = 15;</div><div class='del'>-	if (settings-&gt;jpg_comp.APP_len &lt; 0)</div><div class='del'>-		settings-&gt;jpg_comp.APP_len = 0;</div><div class='del'>-	if (settings-&gt;jpg_comp.APP_len &gt; 60)</div><div class='del'>-		settings-&gt;jpg_comp.APP_len = 60;</div><div class='del'>-	if (settings-&gt;jpg_comp.COM_len &lt; 0)</div><div class='del'>-		settings-&gt;jpg_comp.COM_len = 0;</div><div class='del'>-	if (settings-&gt;jpg_comp.COM_len &gt; 60)</div><div class='del'>-		settings-&gt;jpg_comp.COM_len = 60;</div><div class='del'>-	if (err)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zoran_open_init_params (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* User must explicitly set a window */</div><div class='del'>-	zr-&gt;overlay_settings.is_set = 0;</div><div class='del'>-	zr-&gt;overlay_mask = NULL;</div><div class='del'>-	zr-&gt;overlay_active = ZORAN_FREE;</div><div class='del'>-</div><div class='del'>-	zr-&gt;v4l_memgrab_active = 0;</div><div class='del'>-	zr-&gt;v4l_overlay_active = 0;</div><div class='del'>-	zr-&gt;v4l_grab_frame = NO_GRAB_ACTIVE;</div><div class='del'>-	zr-&gt;v4l_grab_seq = 0;</div><div class='del'>-	zr-&gt;v4l_settings.width = 192;</div><div class='del'>-	zr-&gt;v4l_settings.height = 144;</div><div class='del'>-	zr-&gt;v4l_settings.format = &amp;zoran_formats[7];	/* YUY2 - YUV-4:2:2 packed */</div><div class='del'>-	zr-&gt;v4l_settings.bytesperline =</div><div class='del'>-	    zr-&gt;v4l_settings.width *</div><div class='del'>-	    ((zr-&gt;v4l_settings.format-&gt;depth + 7) / 8);</div><div class='del'>-</div><div class='del'>-	/* DMA ring stuff for V4L */</div><div class='del'>-	zr-&gt;v4l_pend_tail = 0;</div><div class='del'>-	zr-&gt;v4l_pend_head = 0;</div><div class='del'>-	zr-&gt;v4l_sync_tail = 0;</div><div class='del'>-	zr-&gt;v4l_buffers.active = ZORAN_FREE;</div><div class='del'>-	for (i = 0; i &lt; VIDEO_MAX_FRAME; i++) {</div><div class='del'>-		zr-&gt;v4l_buffers.buffer[i].state = BUZ_STATE_USER;	/* nothing going on */</div><div class='del'>-	}</div><div class='del'>-	zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BUZ_MAX_FRAME; i++) {</div><div class='del'>-		zr-&gt;jpg_buffers.buffer[i].state = BUZ_STATE_USER;	/* nothing going on */</div><div class='del'>-	}</div><div class='del'>-	zr-&gt;jpg_buffers.active = ZORAN_FREE;</div><div class='del'>-	zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-	/* Set necessary params and call zoran_check_jpg_settings to set the defaults */</div><div class='del'>-	zr-&gt;jpg_settings.decimation = 1;</div><div class='del'>-	zr-&gt;jpg_settings.jpg_comp.quality = 50;	/* default compression factor 8 */</div><div class='del'>-	if (zr-&gt;card.type != BUZ)</div><div class='del'>-		zr-&gt;jpg_settings.odd_even = 1;</div><div class='del'>-	else</div><div class='del'>-		zr-&gt;jpg_settings.odd_even = 0;</div><div class='del'>-	zr-&gt;jpg_settings.jpg_comp.APPn = 0;</div><div class='del'>-	zr-&gt;jpg_settings.jpg_comp.APP_len = 0;	/* No APPn marker */</div><div class='del'>-	memset(zr-&gt;jpg_settings.jpg_comp.APP_data, 0,</div><div class='del'>-	       sizeof(zr-&gt;jpg_settings.jpg_comp.APP_data));</div><div class='del'>-	zr-&gt;jpg_settings.jpg_comp.COM_len = 0;	/* No COM marker */</div><div class='del'>-	memset(zr-&gt;jpg_settings.jpg_comp.COM_data, 0,</div><div class='del'>-	       sizeof(zr-&gt;jpg_settings.jpg_comp.COM_data));</div><div class='del'>-	zr-&gt;jpg_settings.jpg_comp.jpeg_markers =</div><div class='del'>-	    V4L2_JPEG_MARKER_DHT | V4L2_JPEG_MARKER_DQT;</div><div class='del'>-	i = zoran_check_jpg_settings(zr, &amp;zr-&gt;jpg_settings, 0);</div><div class='del'>-	if (i)</div><div class='del'>-		dprintk(1, KERN_ERR "%s: %s internal error\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	clear_interrupt_counters(zr);</div><div class='del'>-	zr-&gt;testing = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_interrupts (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	int timeout, icr;</div><div class='del'>-</div><div class='del'>-	clear_interrupt_counters(zr);</div><div class='del'>-</div><div class='del'>-	zr-&gt;testing = 1;</div><div class='del'>-	icr = btread(ZR36057_ICR);</div><div class='del'>-	btwrite(0x78000000 | ZR36057_ICR_IntPinEn, ZR36057_ICR);</div><div class='del'>-	prepare_to_wait(&amp;zr-&gt;test_q, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-	timeout = schedule_timeout(HZ);</div><div class='del'>-	finish_wait(&amp;zr-&gt;test_q, &amp;wait);</div><div class='del'>-	btwrite(0, ZR36057_ICR);</div><div class='del'>-	btwrite(0x78000000, ZR36057_ISR);</div><div class='del'>-	zr-&gt;testing = 0;</div><div class='del'>-	dprintk(5, KERN_INFO "%s: Testing interrupts...\n", ZR_DEVNAME(zr));</div><div class='del'>-	if (timeout) {</div><div class='del'>-		dprintk(1, ": time spent: %d\n", 1 * HZ - timeout);</div><div class='del'>-	}</div><div class='del'>-	if (zr36067_debug &gt; 1)</div><div class='del'>-		print_interrupts(zr);</div><div class='del'>-	btwrite(icr, ZR36057_ICR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zr36057_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	int j, err;</div><div class='del'>-</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"%s: %s - initializing card[%d], zr=%p\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__, zr-&gt;id, zr);</div><div class='del'>-</div><div class='del'>-	/* default setup of all parameters which will persist between opens */</div><div class='del'>-	zr-&gt;user = 0;</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;zr-&gt;v4l_capq);</div><div class='del'>-	init_waitqueue_head(&amp;zr-&gt;jpg_capq);</div><div class='del'>-	init_waitqueue_head(&amp;zr-&gt;test_q);</div><div class='del'>-	zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-	zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-</div><div class='del'>-	zr-&gt;vbuf_base = (void *) vidmem;</div><div class='del'>-	zr-&gt;vbuf_width = 0;</div><div class='del'>-	zr-&gt;vbuf_height = 0;</div><div class='del'>-	zr-&gt;vbuf_depth = 0;</div><div class='del'>-	zr-&gt;vbuf_bytesperline = 0;</div><div class='del'>-</div><div class='del'>-	/* Avoid nonsense settings from user for default input/norm */</div><div class='del'>-	if (default_norm &lt; 0 || default_norm &gt; 2)</div><div class='del'>-		default_norm = 0;</div><div class='del'>-	if (default_norm == 0) {</div><div class='del'>-		zr-&gt;norm = V4L2_STD_PAL;</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[0];</div><div class='del'>-	} else if (default_norm == 1) {</div><div class='del'>-		zr-&gt;norm = V4L2_STD_NTSC;</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[1];</div><div class='del'>-	} else {</div><div class='del'>-		zr-&gt;norm = V4L2_STD_SECAM;</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[2];</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;timing == NULL) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_WARNING</div><div class='del'>-			"%s: %s - default TV standard not supported by hardware. PAL will be used.\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		zr-&gt;norm = V4L2_STD_PAL;</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[0];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (default_input &gt; zr-&gt;card.inputs-1) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_WARNING</div><div class='del'>-			"%s: default_input value %d out of range (0-%d)\n",</div><div class='del'>-			ZR_DEVNAME(zr), default_input, zr-&gt;card.inputs-1);</div><div class='del'>-		default_input = 0;</div><div class='del'>-	}</div><div class='del'>-	zr-&gt;input = default_input;</div><div class='del'>-</div><div class='del'>-	/* default setup (will be repeated at every open) */</div><div class='del'>-	zoran_open_init_params(zr);</div><div class='del'>-</div><div class='del'>-	/* allocate memory *before* doing anything to the hardware</div><div class='del'>-	 * in case allocation fails */</div><div class='del'>-	zr-&gt;stat_com = kzalloc(BUZ_NUM_STAT_COM * 4, GFP_KERNEL);</div><div class='del'>-	zr-&gt;video_dev = video_device_alloc();</div><div class='del'>-	if (!zr-&gt;stat_com || !zr-&gt;video_dev) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - kmalloc (STAT_COM) failed\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto exit_free;</div><div class='del'>-	}</div><div class='del'>-	for (j = 0; j &lt; BUZ_NUM_STAT_COM; j++) {</div><div class='del'>-		zr-&gt;stat_com[j] = cpu_to_le32(1); /* mark as unavailable to zr36057 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *   Now add the template and register the device unit.</div><div class='del'>-	 */</div><div class='del'>-	*zr-&gt;video_dev = zoran_template;</div><div class='del'>-	zr-&gt;video_dev-&gt;v4l2_dev = &amp;zr-&gt;v4l2_dev;</div><div class='del'>-	zr-&gt;video_dev-&gt;lock = &amp;zr-&gt;lock;</div><div class='del'>-	strscpy(zr-&gt;video_dev-&gt;name, ZR_DEVNAME(zr), sizeof(zr-&gt;video_dev-&gt;name));</div><div class='del'>-	/* It's not a mem2mem device, but you can both capture and output from</div><div class='del'>-	   one and the same device. This should really be split up into two</div><div class='del'>-	   device nodes, but that's a job for another day. */</div><div class='del'>-	zr-&gt;video_dev-&gt;vfl_dir = VFL_DIR_M2M;</div><div class='del'>-	err = video_register_device(zr-&gt;video_dev, VFL_TYPE_GRABBER, video_nr[zr-&gt;id]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto exit_free;</div><div class='del'>-	video_set_drvdata(zr-&gt;video_dev, zr);</div><div class='del'>-</div><div class='del'>-	zoran_init_hardware(zr);</div><div class='del'>-	if (zr36067_debug &gt; 2)</div><div class='del'>-		detect_guest_activity(zr);</div><div class='del'>-	test_interrupts(zr);</div><div class='del'>-	if (!pass_through) {</div><div class='del'>-		decoder_call(zr, video, s_stream, 0);</div><div class='del'>-		encoder_call(zr, video, s_routing, 2, 0, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr-&gt;zoran_proc = NULL;</div><div class='del'>-	zr-&gt;initialized = 1;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-exit_free:</div><div class='del'>-	kfree(zr-&gt;stat_com);</div><div class='del'>-	kfree(zr-&gt;video_dev);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zoran_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct v4l2_device *v4l2_dev = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='del'>-	struct zoran *zr = to_zoran(v4l2_dev);</div><div class='del'>-</div><div class='del'>-	if (!zr-&gt;initialized)</div><div class='del'>-		goto exit_free;</div><div class='del'>-</div><div class='del'>-	/* unregister videocodec bus */</div><div class='del'>-	if (zr-&gt;codec) {</div><div class='del'>-		struct videocodec_master *master = zr-&gt;codec-&gt;master_data;</div><div class='del'>-</div><div class='del'>-		videocodec_detach(zr-&gt;codec);</div><div class='del'>-		kfree(master);</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;vfe) {</div><div class='del'>-		struct videocodec_master *master = zr-&gt;vfe-&gt;master_data;</div><div class='del'>-</div><div class='del'>-		videocodec_detach(zr-&gt;vfe);</div><div class='del'>-		kfree(master);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* unregister i2c bus */</div><div class='del'>-	zoran_unregister_i2c(zr);</div><div class='del'>-	/* disable PCI bus-mastering */</div><div class='del'>-	zoran_set_pci_master(zr, 0);</div><div class='del'>-	/* put chip into reset */</div><div class='del'>-	btwrite(0, ZR36057_SPGPPCR);</div><div class='del'>-	free_irq(zr-&gt;pci_dev-&gt;irq, zr);</div><div class='del'>-	/* unmap and free memory */</div><div class='del'>-	kfree(zr-&gt;stat_com);</div><div class='del'>-	zoran_proc_cleanup(zr);</div><div class='del'>-	iounmap(zr-&gt;zr36057_mem);</div><div class='del'>-	pci_disable_device(zr-&gt;pci_dev);</div><div class='del'>-	video_unregister_device(zr-&gt;video_dev);</div><div class='del'>-exit_free:</div><div class='del'>-	v4l2_ctrl_handler_free(&amp;zr-&gt;hdl);</div><div class='del'>-	v4l2_device_unregister(&amp;zr-&gt;v4l2_dev);</div><div class='del'>-	kfree(zr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zoran_vdev_release (struct video_device *vdev)</div><div class='del'>-{</div><div class='del'>-	kfree(vdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct videocodec_master *zoran_setup_videocodec(struct zoran *zr,</div><div class='del'>-							int type)</div><div class='del'>-{</div><div class='del'>-	struct videocodec_master *m = NULL;</div><div class='del'>-</div><div class='del'>-	m = kmalloc(sizeof(struct videocodec_master), GFP_KERNEL);</div><div class='del'>-	if (!m) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: %s - no memory\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* magic and type are unused for master struct. Makes sense only at</div><div class='del'>-	   codec structs.</div><div class='del'>-	   In the past, .type were initialized to the old V4L1 .hardware</div><div class='del'>-	   value, as VID_HARDWARE_ZR36067</div><div class='del'>-	 */</div><div class='del'>-	m-&gt;magic = 0L;</div><div class='del'>-	m-&gt;type = 0;</div><div class='del'>-</div><div class='del'>-	m-&gt;flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER;</div><div class='del'>-	strscpy(m-&gt;name, ZR_DEVNAME(zr), sizeof(m-&gt;name));</div><div class='del'>-	m-&gt;data = zr;</div><div class='del'>-</div><div class='del'>-	switch (type)</div><div class='del'>-	{</div><div class='del'>-	case CODEC_TYPE_ZR36060:</div><div class='del'>-		m-&gt;readreg = zr36060_read;</div><div class='del'>-		m-&gt;writereg = zr36060_write;</div><div class='del'>-		m-&gt;flags |= CODEC_FLAG_JPEG | CODEC_FLAG_VFE;</div><div class='del'>-		break;</div><div class='del'>-	case CODEC_TYPE_ZR36050:</div><div class='del'>-		m-&gt;readreg = zr36050_read;</div><div class='del'>-		m-&gt;writereg = zr36050_write;</div><div class='del'>-		m-&gt;flags |= CODEC_FLAG_JPEG;</div><div class='del'>-		break;</div><div class='del'>-	case CODEC_TYPE_ZR36016:</div><div class='del'>-		m-&gt;readreg = zr36016_read;</div><div class='del'>-		m-&gt;writereg = zr36016_write;</div><div class='del'>-		m-&gt;flags |= CODEC_FLAG_VFE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = to_zoran(sd-&gt;v4l2_dev);</div><div class='del'>-</div><div class='del'>-	/* Bt819 needs to reset its FIFO buffer using #FRST pin and</div><div class='del'>-	   LML33 card uses GPIO(7) for that. */</div><div class='del'>-	if (cmd == BT819_FIFO_RESET_LOW)</div><div class='del'>-		GPIO(zr, 7, 0);</div><div class='del'>-	else if (cmd == BT819_FIFO_RESET_HIGH)</div><div class='del'>-		GPIO(zr, 7, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   Scan for a Buz card (actually for the PCI controller ZR36057),</div><div class='del'>- *   request the irq and map the io memory</div><div class='del'>- */</div><div class='del'>-static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	unsigned char latency, need_latency;</div><div class='del'>-	struct zoran *zr;</div><div class='del'>-	int result;</div><div class='del'>-	struct videocodec_master *master_vfe = NULL;</div><div class='del'>-	struct videocodec_master *master_codec = NULL;</div><div class='del'>-	int card_num;</div><div class='del'>-	char *codec_name, *vfe_name;</div><div class='del'>-	unsigned int nr;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	nr = zoran_num++;</div><div class='del'>-	if (nr &gt;= BUZ_MAX) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: driver limited to %d card(s) maximum\n",</div><div class='del'>-			ZORAN_NAME, BUZ_MAX);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr = kzalloc(sizeof(struct zoran), GFP_KERNEL);</div><div class='del'>-	if (!zr) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: %s - kzalloc failed\n",</div><div class='del'>-			ZORAN_NAME, __func__);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	zr-&gt;v4l2_dev.notify = zoran_subdev_notify;</div><div class='del'>-	if (v4l2_device_register(&amp;pdev-&gt;dev, &amp;zr-&gt;v4l2_dev))</div><div class='del'>-		goto zr_free_mem;</div><div class='del'>-	zr-&gt;pci_dev = pdev;</div><div class='del'>-	zr-&gt;id = nr;</div><div class='del'>-	snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), "MJPEG[%u]", zr-&gt;id);</div><div class='del'>-	if (v4l2_ctrl_handler_init(&amp;zr-&gt;hdl, 10))</div><div class='del'>-		goto zr_unreg;</div><div class='del'>-	zr-&gt;v4l2_dev.ctrl_handler = &amp;zr-&gt;hdl;</div><div class='del'>-	spin_lock_init(&amp;zr-&gt;spinlock);</div><div class='del'>-	mutex_init(&amp;zr-&gt;lock);</div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-		goto zr_unreg;</div><div class='del'>-	zr-&gt;revision = zr-&gt;pci_dev-&gt;revision;</div><div class='del'>-</div><div class='del'>-	dprintk(1,</div><div class='del'>-		KERN_INFO</div><div class='del'>-		"%s: Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08llx\n",</div><div class='del'>-		ZR_DEVNAME(zr), zr-&gt;revision &lt; 2 ? '5' : '6', zr-&gt;revision,</div><div class='del'>-		zr-&gt;pci_dev-&gt;irq, (uint64_t)pci_resource_start(zr-&gt;pci_dev, 0));</div><div class='del'>-	if (zr-&gt;revision &gt;= 2) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s: Subsystem vendor=0x%04x id=0x%04x\n",</div><div class='del'>-			ZR_DEVNAME(zr), zr-&gt;pci_dev-&gt;subsystem_vendor,</div><div class='del'>-			zr-&gt;pci_dev-&gt;subsystem_device);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Use auto-detected card type? */</div><div class='del'>-	if (card[nr] == -1) {</div><div class='del'>-		if (zr-&gt;revision &lt; 2) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: No card type specified, please use the card=X module parameter\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: It is not possible to auto-detect ZR36057 based cards\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-			goto zr_unreg;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		card_num = ent-&gt;driver_data;</div><div class='del'>-		if (card_num &gt;= NUM_CARDS) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: Unknown card, try specifying card=X module parameter\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-			goto zr_unreg;</div><div class='del'>-		}</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: %s() - card %s detected\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, zoran_cards[card_num].name);</div><div class='del'>-	} else {</div><div class='del'>-		card_num = card[nr];</div><div class='del'>-		if (card_num &gt;= NUM_CARDS || card_num &lt; 0) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: User specified card type %d out of range (0 .. %d)\n",</div><div class='del'>-				ZR_DEVNAME(zr), card_num, NUM_CARDS - 1);</div><div class='del'>-			goto zr_unreg;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* even though we make this a non pointer and thus</div><div class='del'>-	 * theoretically allow for making changes to this struct</div><div class='del'>-	 * on a per-individual card basis at runtime, this is</div><div class='del'>-	 * strongly discouraged. This structure is intended to</div><div class='del'>-	 * keep general card information, no settings or anything */</div><div class='del'>-	zr-&gt;card = zoran_cards[card_num];</div><div class='del'>-	snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)),</div><div class='del'>-		 "%s[%u]", zr-&gt;card.name, zr-&gt;id);</div><div class='del'>-</div><div class='del'>-	zr-&gt;zr36057_mem = pci_ioremap_bar(zr-&gt;pci_dev, 0);</div><div class='del'>-	if (!zr-&gt;zr36057_mem) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: %s() - ioremap failed\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		goto zr_unreg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = request_irq(zr-&gt;pci_dev-&gt;irq, zoran_irq,</div><div class='del'>-			     IRQF_SHARED, ZR_DEVNAME(zr), zr);</div><div class='del'>-	if (result &lt; 0) {</div><div class='del'>-		if (result == -EINVAL) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - bad irq number or handler\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-		} else if (result == -EBUSY) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - IRQ %d busy, change your PnP config in BIOS\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, zr-&gt;pci_dev-&gt;irq);</div><div class='del'>-		} else {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - can't assign irq, error code %d\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, result);</div><div class='del'>-		}</div><div class='del'>-		goto zr_unmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set PCI latency timer */</div><div class='del'>-	pci_read_config_byte(zr-&gt;pci_dev, PCI_LATENCY_TIMER,</div><div class='del'>-			     &amp;latency);</div><div class='del'>-	need_latency = zr-&gt;revision &gt; 1 ? 32 : 48;</div><div class='del'>-	if (latency != need_latency) {</div><div class='del'>-		dprintk(2, KERN_INFO "%s: Changing PCI latency from %d to %d\n",</div><div class='del'>-			ZR_DEVNAME(zr), latency, need_latency);</div><div class='del'>-		pci_write_config_byte(zr-&gt;pci_dev, PCI_LATENCY_TIMER,</div><div class='del'>-				      need_latency);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr36057_restart(zr);</div><div class='del'>-	/* i2c */</div><div class='del'>-	dprintk(2, KERN_INFO "%s: Initializing i2c bus...\n",</div><div class='del'>-		ZR_DEVNAME(zr));</div><div class='del'>-</div><div class='del'>-	if (zoran_register_i2c(zr) &lt; 0) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: %s - can't initialize i2c bus\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		goto zr_free_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr-&gt;decoder = v4l2_i2c_new_subdev(&amp;zr-&gt;v4l2_dev,</div><div class='del'>-		&amp;zr-&gt;i2c_adapter, zr-&gt;card.i2c_decoder,</div><div class='del'>-		0, zr-&gt;card.addrs_decoder);</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;card.i2c_encoder)</div><div class='del'>-		zr-&gt;encoder = v4l2_i2c_new_subdev(&amp;zr-&gt;v4l2_dev,</div><div class='del'>-			&amp;zr-&gt;i2c_adapter, zr-&gt;card.i2c_encoder,</div><div class='del'>-			0, zr-&gt;card.addrs_encoder);</div><div class='del'>-</div><div class='del'>-	dprintk(2,</div><div class='del'>-		KERN_INFO "%s: Initializing videocodec bus...\n",</div><div class='del'>-		ZR_DEVNAME(zr));</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;card.video_codec) {</div><div class='del'>-		codec_name = codecid_to_modulename(zr-&gt;card.video_codec);</div><div class='del'>-		if (codec_name) {</div><div class='del'>-			result = request_module(codec_name);</div><div class='del'>-			if (result) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: failed to load modules %s: %d\n",</div><div class='del'>-					ZR_DEVNAME(zr), codec_name, result);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;card.video_vfe) {</div><div class='del'>-		vfe_name = codecid_to_modulename(zr-&gt;card.video_vfe);</div><div class='del'>-		if (vfe_name) {</div><div class='del'>-			result = request_module(vfe_name);</div><div class='del'>-			if (result &lt; 0) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: failed to load modules %s: %d\n",</div><div class='del'>-					ZR_DEVNAME(zr), vfe_name, result);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset JPEG codec */</div><div class='del'>-	jpeg_codec_sleep(zr, 1);</div><div class='del'>-	jpeg_codec_reset(zr);</div><div class='del'>-	/* video bus enabled */</div><div class='del'>-	/* display codec revision */</div><div class='del'>-	if (zr-&gt;card.video_codec != 0) {</div><div class='del'>-		master_codec = zoran_setup_videocodec(zr, zr-&gt;card.video_codec);</div><div class='del'>-		if (!master_codec)</div><div class='del'>-			goto zr_unreg_i2c;</div><div class='del'>-		zr-&gt;codec = videocodec_attach(master_codec);</div><div class='del'>-		if (!zr-&gt;codec) {</div><div class='del'>-			dprintk(1, KERN_ERR "%s: %s - no codec found\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			goto zr_free_codec;</div><div class='del'>-		}</div><div class='del'>-		if (zr-&gt;codec-&gt;type != zr-&gt;card.video_codec) {</div><div class='del'>-			dprintk(1, KERN_ERR "%s: %s - wrong codec\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			goto zr_detach_codec;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;card.video_vfe != 0) {</div><div class='del'>-		master_vfe = zoran_setup_videocodec(zr, zr-&gt;card.video_vfe);</div><div class='del'>-		if (!master_vfe)</div><div class='del'>-			goto zr_detach_codec;</div><div class='del'>-		zr-&gt;vfe = videocodec_attach(master_vfe);</div><div class='del'>-		if (!zr-&gt;vfe) {</div><div class='del'>-			dprintk(1, KERN_ERR "%s: %s - no VFE found\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			goto zr_free_vfe;</div><div class='del'>-		}</div><div class='del'>-		if (zr-&gt;vfe-&gt;type != zr-&gt;card.video_vfe) {</div><div class='del'>-			dprintk(1, KERN_ERR "%s: %s = wrong VFE\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			goto zr_detach_vfe;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* take care of Natoma chipset and a revision 1 zr36057 */</div><div class='del'>-	if ((pci_pci_problems &amp; PCIPCI_NATOMA) &amp;&amp; zr-&gt;revision &lt;= 1) {</div><div class='del'>-		zr-&gt;jpg_buffers.need_contiguous = 1;</div><div class='del'>-		dprintk(1, KERN_INFO</div><div class='del'>-			"%s: ZR36057/Natoma bug, max. buffer size is 128K\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zr36057_init(zr) &lt; 0)</div><div class='del'>-		goto zr_detach_vfe;</div><div class='del'>-</div><div class='del'>-	zoran_proc_init(zr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-zr_detach_vfe:</div><div class='del'>-	videocodec_detach(zr-&gt;vfe);</div><div class='del'>-zr_free_vfe:</div><div class='del'>-	kfree(master_vfe);</div><div class='del'>-zr_detach_codec:</div><div class='del'>-	videocodec_detach(zr-&gt;codec);</div><div class='del'>-zr_free_codec:</div><div class='del'>-	kfree(master_codec);</div><div class='del'>-zr_unreg_i2c:</div><div class='del'>-	zoran_unregister_i2c(zr);</div><div class='del'>-zr_free_irq:</div><div class='del'>-	btwrite(0, ZR36057_SPGPPCR);</div><div class='del'>-	free_irq(zr-&gt;pci_dev-&gt;irq, zr);</div><div class='del'>-zr_unmap:</div><div class='del'>-	iounmap(zr-&gt;zr36057_mem);</div><div class='del'>-zr_unreg:</div><div class='del'>-	v4l2_ctrl_handler_free(&amp;zr-&gt;hdl);</div><div class='del'>-	v4l2_device_unregister(&amp;zr-&gt;v4l2_dev);</div><div class='del'>-zr_free_mem:</div><div class='del'>-	kfree(zr);</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver zoran_driver = {</div><div class='del'>-	.name = "zr36067",</div><div class='del'>-	.id_table = zr36067_pci_tbl,</div><div class='del'>-	.probe = zoran_probe,</div><div class='del'>-	.remove = zoran_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init zoran_init(void)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Zoran MJPEG board driver version %s\n",</div><div class='del'>-	       ZORAN_VERSION);</div><div class='del'>-</div><div class='del'>-	/* check the parameters we have been given, adjust if necessary */</div><div class='del'>-	if (v4l_nbufs &lt; 2)</div><div class='del'>-		v4l_nbufs = 2;</div><div class='del'>-	if (v4l_nbufs &gt; VIDEO_MAX_FRAME)</div><div class='del'>-		v4l_nbufs = VIDEO_MAX_FRAME;</div><div class='del'>-	/* The user specifies the in KB, we want them in byte</div><div class='del'>-	 * (and page aligned) */</div><div class='del'>-	v4l_bufsize = PAGE_ALIGN(v4l_bufsize * 1024);</div><div class='del'>-	if (v4l_bufsize &lt; 32768)</div><div class='del'>-		v4l_bufsize = 32768;</div><div class='del'>-	/* 2 MB is arbitrary but sufficient for the maximum possible images */</div><div class='del'>-	if (v4l_bufsize &gt; 2048 * 1024)</div><div class='del'>-		v4l_bufsize = 2048 * 1024;</div><div class='del'>-	if (jpg_nbufs &lt; 4)</div><div class='del'>-		jpg_nbufs = 4;</div><div class='del'>-	if (jpg_nbufs &gt; BUZ_MAX_FRAME)</div><div class='del'>-		jpg_nbufs = BUZ_MAX_FRAME;</div><div class='del'>-	jpg_bufsize = PAGE_ALIGN(jpg_bufsize * 1024);</div><div class='del'>-	if (jpg_bufsize &lt; 8192)</div><div class='del'>-		jpg_bufsize = 8192;</div><div class='del'>-	if (jpg_bufsize &gt; (512 * 1024))</div><div class='del'>-		jpg_bufsize = 512 * 1024;</div><div class='del'>-	/* Use parameter for vidmem or try to find a video card */</div><div class='del'>-	if (vidmem) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s: Using supplied video memory base address @ 0x%lx\n",</div><div class='del'>-			ZORAN_NAME, vidmem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* some mainboards might not do PCI-PCI data transfer well */</div><div class='del'>-	if (pci_pci_problems &amp; (PCIPCI_FAIL|PCIAGP_FAIL|PCIPCI_ALIMAGIK)) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_WARNING</div><div class='del'>-			"%s: chipset does not support reliable PCI-PCI DMA\n",</div><div class='del'>-			ZORAN_NAME);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = pci_register_driver(&amp;zoran_driver);</div><div class='del'>-	if (res) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: Unable to register ZR36057 driver\n",</div><div class='del'>-			ZORAN_NAME);</div><div class='del'>-		return res;</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 __exit zoran_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;zoran_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(zoran_init);</div><div class='del'>-module_exit(zoran_exit);</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_card.h b/drivers/staging/media/zoran/zoran_card.h<br/>deleted file mode 100644<br/>index 0cdb7d34926d..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_card.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_card.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * This part handles card-specific data and detection</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Currently maintained by:</div><div class='del'>- *   Ronald Bultje    &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *   Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *   Mailinglist      &lt;mjpeg-users@lists.sf.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#ifndef __ZORAN_CARD_H__</div><div class='del'>-#define __ZORAN_CARD_H__</div><div class='del'>-</div><div class='del'>-extern int zr36067_debug;</div><div class='del'>-</div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (zr36067_debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* Anybody who uses more than four? */</div><div class='del'>-#define BUZ_MAX 4</div><div class='del'>-</div><div class='del'>-extern const struct video_device zoran_template;</div><div class='del'>-</div><div class='del'>-extern int zoran_check_jpg_settings(struct zoran *zr,</div><div class='del'>-				    struct zoran_jpg_settings *settings,</div><div class='del'>-				    int try);</div><div class='del'>-extern void zoran_open_init_params(struct zoran *zr);</div><div class='del'>-extern void zoran_vdev_release(struct video_device *vdev);</div><div class='del'>-</div><div class='del'>-void zr36016_write(struct videocodec *codec, u16 reg, u32 val);</div><div class='del'>-</div><div class='del'>-#endif				/* __ZORAN_CARD_H__ */</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c<br/>deleted file mode 100644<br/>index 22b27632762d..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_device.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_device.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1619 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * This part handles device access (PCI/I2C/codec/...)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Currently maintained by:</div><div class='del'>- *   Ronald Bultje    &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *   Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *   Mailinglist      &lt;mjpeg-users@lists.sf.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#include &lt;linux/types.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/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='del'>-#include &lt;linux/videodev2.h&gt;</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sem.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-#include "zoran.h"</div><div class='del'>-#include "zoran_device.h"</div><div class='del'>-#include "zoran_card.h"</div><div class='del'>-</div><div class='del'>-#define IRQ_MASK ( ZR36057_ISR_GIRQ0 | \</div><div class='del'>-		   ZR36057_ISR_GIRQ1 | \</div><div class='del'>-		   ZR36057_ISR_JPEGRepIRQ )</div><div class='del'>-</div><div class='del'>-static bool lml33dpath;		/* default = 0</div><div class='del'>-				 * 1 will use digital path in capture</div><div class='del'>-				 * mode instead of analog. It can be</div><div class='del'>-				 * used for picture adjustments using</div><div class='del'>-				 * tool like xawtv while watching image</div><div class='del'>-				 * on TV monitor connected to the output.</div><div class='del'>-				 * However, due to absence of 75 Ohm</div><div class='del'>-				 * load on Bt819 input, there will be</div><div class='del'>-				 * some image imperfections */</div><div class='del'>-</div><div class='del'>-module_param(lml33dpath, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(lml33dpath,</div><div class='del'>-		 "Use digital path capture mode (on LML33 cards)");</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36057_init_vfe (struct zoran *zr);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * General Purpose I/O and Guest bus access</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is a bit tricky. When a board lacks a GPIO function, the corresponding</div><div class='del'>- * GPIO bit number in the card_info structure is set to 0.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-GPIO (struct zoran *zr,</div><div class='del'>-      int           bit,</div><div class='del'>-      unsigned int  value)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	/* Make sure the bit number is legal</div><div class='del'>-	 * A bit number of -1 (lacking) gives a mask of 0,</div><div class='del'>-	 * making it harmless */</div><div class='del'>-	mask = (1 &lt;&lt; (24 + bit)) &amp; 0xff000000;</div><div class='del'>-	reg = btread(ZR36057_GPPGCR1) &amp; ~mask;</div><div class='del'>-	if (value) {</div><div class='del'>-		reg |= mask;</div><div class='del'>-	}</div><div class='del'>-	btwrite(reg, ZR36057_GPPGCR1);</div><div class='del'>-	udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait til post office is no longer busy</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-post_office_wait (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	u32 por;</div><div class='del'>-</div><div class='del'>-//      while (((por = btread(ZR36057_POR)) &amp; (ZR36057_POR_POPen | ZR36057_POR_POTime)) == ZR36057_POR_POPen) {</div><div class='del'>-	while ((por = btread(ZR36057_POR)) &amp; ZR36057_POR_POPen) {</div><div class='del'>-		/* wait for something to happen */</div><div class='del'>-	}</div><div class='del'>-	if ((por &amp; ZR36057_POR_POTime) &amp;&amp; !zr-&gt;card.gws_not_connected) {</div><div class='del'>-		/* In LML33/BUZ \GWS line is not connected, so it has always timeout set */</div><div class='del'>-		dprintk(1, KERN_INFO "%s: pop timeout %08x\n", ZR_DEVNAME(zr),</div><div class='del'>-			por);</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'>-int</div><div class='del'>-post_office_write (struct zoran *zr,</div><div class='del'>-		   unsigned int  guest,</div><div class='del'>-		   unsigned int  reg,</div><div class='del'>-		   unsigned int  value)</div><div class='del'>-{</div><div class='del'>-	u32 por;</div><div class='del'>-</div><div class='del'>-	por =</div><div class='del'>-	    ZR36057_POR_PODir | ZR36057_POR_POTime | ((guest &amp; 7) &lt;&lt; 20) |</div><div class='del'>-	    ((reg &amp; 7) &lt;&lt; 16) | (value &amp; 0xFF);</div><div class='del'>-	btwrite(por, ZR36057_POR);</div><div class='del'>-</div><div class='del'>-	return post_office_wait(zr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-post_office_read (struct zoran *zr,</div><div class='del'>-		  unsigned int  guest,</div><div class='del'>-		  unsigned int  reg)</div><div class='del'>-{</div><div class='del'>-	u32 por;</div><div class='del'>-</div><div class='del'>-	por = ZR36057_POR_POTime | ((guest &amp; 7) &lt;&lt; 20) | ((reg &amp; 7) &lt;&lt; 16);</div><div class='del'>-	btwrite(por, ZR36057_POR);</div><div class='del'>-	if (post_office_wait(zr) &lt; 0) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return btread(ZR36057_POR) &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * detect guests</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dump_guests (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	if (zr36067_debug &gt; 2) {</div><div class='del'>-		int i, guest[8];</div><div class='del'>-</div><div class='del'>-		for (i = 1; i &lt; 8; i++) {	// Don't read jpeg codec here</div><div class='del'>-			guest[i] = post_office_read(zr, i, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "%s: Guests: %*ph\n",</div><div class='del'>-		       ZR_DEVNAME(zr), 8, guest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-detect_guest_activity (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	int timeout, i, j, res, guest[8], guest0[8], change[8][3];</div><div class='del'>-	ktime_t t0, t1;</div><div class='del'>-</div><div class='del'>-	dump_guests(zr);</div><div class='del'>-	printk(KERN_INFO "%s: Detecting guests activity, please wait...\n",</div><div class='del'>-	       ZR_DEVNAME(zr));</div><div class='del'>-	for (i = 1; i &lt; 8; i++) {	// Don't read jpeg codec here</div><div class='del'>-		guest0[i] = guest[i] = post_office_read(zr, i, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeout = 0;</div><div class='del'>-	j = 0;</div><div class='del'>-	t0 = ktime_get();</div><div class='del'>-	while (timeout &lt; 10000) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		timeout++;</div><div class='del'>-		for (i = 1; (i &lt; 8) &amp;&amp; (j &lt; 8); i++) {</div><div class='del'>-			res = post_office_read(zr, i, 0);</div><div class='del'>-			if (res != guest[i]) {</div><div class='del'>-				t1 = ktime_get();</div><div class='del'>-				change[j][0] = ktime_to_us(ktime_sub(t1, t0));</div><div class='del'>-				t0 = t1;</div><div class='del'>-				change[j][1] = i;</div><div class='del'>-				change[j][2] = res;</div><div class='del'>-				j++;</div><div class='del'>-				guest[i] = res;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (j &gt;= 8)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: Guests: %*ph\n", ZR_DEVNAME(zr), 8, guest0);</div><div class='del'>-</div><div class='del'>-	if (j == 0) {</div><div class='del'>-		printk(KERN_INFO "%s: No activity detected.\n", ZR_DEVNAME(zr));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; j; i++) {</div><div class='del'>-		printk(KERN_INFO "%s: %6d: %d =&gt; 0x%02x\n", ZR_DEVNAME(zr),</div><div class='del'>-		       change[i][0], change[i][1], change[i][2]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * JPEG Codec access</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-jpeg_codec_sleep (struct zoran *zr,</div><div class='del'>-		  int           sleep)</div><div class='del'>-{</div><div class='del'>-	GPIO(zr, zr-&gt;card.gpio[ZR_GPIO_JPEG_SLEEP], !sleep);</div><div class='del'>-	if (!sleep) {</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: jpeg_codec_sleep() - wake GPIO=0x%08x\n",</div><div class='del'>-			ZR_DEVNAME(zr), btread(ZR36057_GPPGCR1));</div><div class='del'>-		udelay(500);</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: jpeg_codec_sleep() - sleep GPIO=0x%08x\n",</div><div class='del'>-			ZR_DEVNAME(zr), btread(ZR36057_GPPGCR1));</div><div class='del'>-		udelay(2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-jpeg_codec_reset (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	/* Take the codec out of sleep */</div><div class='del'>-	jpeg_codec_sleep(zr, 0);</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;card.gpcs[GPCS_JPEG_RESET] != 0xff) {</div><div class='del'>-		post_office_write(zr, zr-&gt;card.gpcs[GPCS_JPEG_RESET], 0,</div><div class='del'>-				  0);</div><div class='del'>-		udelay(2);</div><div class='del'>-	} else {</div><div class='del'>-		GPIO(zr, zr-&gt;card.gpio[ZR_GPIO_JPEG_RESET], 0);</div><div class='del'>-		udelay(2);</div><div class='del'>-		GPIO(zr, zr-&gt;card.gpio[ZR_GPIO_JPEG_RESET], 1);</div><div class='del'>-		udelay(2);</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'>- *   Set the registers for the size we have specified. Don't bother</div><div class='del'>- *   trying to understand this without the ZR36057 manual in front of</div><div class='del'>- *   you [AC].</div><div class='del'>- *</div><div class='del'>- *   PS: The manual is free for download in .pdf format from</div><div class='del'>- *   www.zoran.com - nicely done those folks.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36057_adjust_vfe (struct zoran          *zr,</div><div class='del'>-		    enum zoran_codec_mode  mode)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case BUZ_MODE_MOTION_DECOMPRESS:</div><div class='del'>-		btand(~ZR36057_VFESPFR_ExtFl, ZR36057_VFESPFR);</div><div class='del'>-		reg = btread(ZR36057_VFEHCR);</div><div class='del'>-		if ((reg &amp; (1 &lt;&lt; 10)) &amp;&amp; zr-&gt;card.type != LML33R10) {</div><div class='del'>-			reg += ((1 &lt;&lt; 10) | 1);</div><div class='del'>-		}</div><div class='del'>-		btwrite(reg, ZR36057_VFEHCR);</div><div class='del'>-		break;</div><div class='del'>-	case BUZ_MODE_MOTION_COMPRESS:</div><div class='del'>-	case BUZ_MODE_IDLE:</div><div class='del'>-	default:</div><div class='del'>-		if ((zr-&gt;norm &amp; V4L2_STD_NTSC) ||</div><div class='del'>-		    (zr-&gt;card.type == LML33R10 &amp;&amp;</div><div class='del'>-		     (zr-&gt;norm &amp; V4L2_STD_PAL)))</div><div class='del'>-			btand(~ZR36057_VFESPFR_ExtFl, ZR36057_VFESPFR);</div><div class='del'>-		else</div><div class='del'>-			btor(ZR36057_VFESPFR_ExtFl, ZR36057_VFESPFR);</div><div class='del'>-		reg = btread(ZR36057_VFEHCR);</div><div class='del'>-		if (!(reg &amp; (1 &lt;&lt; 10)) &amp;&amp; zr-&gt;card.type != LML33R10) {</div><div class='del'>-			reg -= ((1 &lt;&lt; 10) | 1);</div><div class='del'>-		}</div><div class='del'>-		btwrite(reg, ZR36057_VFEHCR);</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'>- * set geometry</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36057_set_vfe (struct zoran              *zr,</div><div class='del'>-		 int                        video_width,</div><div class='del'>-		 int                        video_height,</div><div class='del'>-		 const struct zoran_format *format)</div><div class='del'>-{</div><div class='del'>-	struct tvnorm *tvn;</div><div class='del'>-	unsigned HStart, HEnd, VStart, VEnd;</div><div class='del'>-	unsigned DispMode;</div><div class='del'>-	unsigned VidWinWid, VidWinHt;</div><div class='del'>-	unsigned hcrop1, hcrop2, vcrop1, vcrop2;</div><div class='del'>-	unsigned Wa, We, Ha, He;</div><div class='del'>-	unsigned X, Y, HorDcm, VerDcm;</div><div class='del'>-	u32 reg;</div><div class='del'>-	unsigned mask_line_size;</div><div class='del'>-</div><div class='del'>-	tvn = zr-&gt;timing;</div><div class='del'>-</div><div class='del'>-	Wa = tvn-&gt;Wa;</div><div class='del'>-	Ha = tvn-&gt;Ha;</div><div class='del'>-</div><div class='del'>-	dprintk(2, KERN_INFO "%s: set_vfe() - width = %d, height = %d\n",</div><div class='del'>-		ZR_DEVNAME(zr), video_width, video_height);</div><div class='del'>-</div><div class='del'>-	if (video_width &lt; BUZ_MIN_WIDTH ||</div><div class='del'>-	    video_height &lt; BUZ_MIN_HEIGHT ||</div><div class='del'>-	    video_width &gt; Wa || video_height &gt; Ha) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: set_vfe: w=%d h=%d not valid\n",</div><div class='del'>-			ZR_DEVNAME(zr), video_width, video_height);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/**** zr36057 ****/</div><div class='del'>-</div><div class='del'>-	/* horizontal */</div><div class='del'>-	VidWinWid = video_width;</div><div class='del'>-	X = DIV_ROUND_UP(VidWinWid * 64, tvn-&gt;Wa);</div><div class='del'>-	We = (VidWinWid * 64) / X;</div><div class='del'>-	HorDcm = 64 - X;</div><div class='del'>-	hcrop1 = 2 * ((tvn-&gt;Wa - We) / 4);</div><div class='del'>-	hcrop2 = tvn-&gt;Wa - We - hcrop1;</div><div class='del'>-	HStart = tvn-&gt;HStart ? tvn-&gt;HStart : 1;</div><div class='del'>-	/* (Ronald) Original comment:</div><div class='del'>-	 * "| 1 Doesn't have any effect, tested on both a DC10 and a DC10+"</div><div class='del'>-	 * this is false. It inverses chroma values on the LML33R10 (so Cr</div><div class='del'>-	 * suddenly is shown as Cb and reverse, really cool effect if you</div><div class='del'>-	 * want to see blue faces, not useful otherwise). So don't use |1.</div><div class='del'>-	 * However, the DC10 has '0' as HStart, but does need |1, so we</div><div class='del'>-	 * use a dirty check...</div><div class='del'>-	 */</div><div class='del'>-	HEnd = HStart + tvn-&gt;Wa - 1;</div><div class='del'>-	HStart += hcrop1;</div><div class='del'>-	HEnd -= hcrop2;</div><div class='del'>-	reg = ((HStart &amp; ZR36057_VFEHCR_Hmask) &lt;&lt; ZR36057_VFEHCR_HStart)</div><div class='del'>-	    | ((HEnd &amp; ZR36057_VFEHCR_Hmask) &lt;&lt; ZR36057_VFEHCR_HEnd);</div><div class='del'>-	if (zr-&gt;card.vfe_pol.hsync_pol)</div><div class='del'>-		reg |= ZR36057_VFEHCR_HSPol;</div><div class='del'>-	btwrite(reg, ZR36057_VFEHCR);</div><div class='del'>-</div><div class='del'>-	/* Vertical */</div><div class='del'>-	DispMode = !(video_height &gt; BUZ_MAX_HEIGHT / 2);</div><div class='del'>-	VidWinHt = DispMode ? video_height : video_height / 2;</div><div class='del'>-	Y = DIV_ROUND_UP(VidWinHt * 64 * 2, tvn-&gt;Ha);</div><div class='del'>-	He = (VidWinHt * 64) / Y;</div><div class='del'>-	VerDcm = 64 - Y;</div><div class='del'>-	vcrop1 = (tvn-&gt;Ha / 2 - He) / 2;</div><div class='del'>-	vcrop2 = tvn-&gt;Ha / 2 - He - vcrop1;</div><div class='del'>-	VStart = tvn-&gt;VStart;</div><div class='del'>-	VEnd = VStart + tvn-&gt;Ha / 2;	// - 1; FIXME SnapShot times out with -1 in 768*576 on the DC10 - LP</div><div class='del'>-	VStart += vcrop1;</div><div class='del'>-	VEnd -= vcrop2;</div><div class='del'>-	reg = ((VStart &amp; ZR36057_VFEVCR_Vmask) &lt;&lt; ZR36057_VFEVCR_VStart)</div><div class='del'>-	    | ((VEnd &amp; ZR36057_VFEVCR_Vmask) &lt;&lt; ZR36057_VFEVCR_VEnd);</div><div class='del'>-	if (zr-&gt;card.vfe_pol.vsync_pol)</div><div class='del'>-		reg |= ZR36057_VFEVCR_VSPol;</div><div class='del'>-	btwrite(reg, ZR36057_VFEVCR);</div><div class='del'>-</div><div class='del'>-	/* scaler and pixel format */</div><div class='del'>-	reg = 0;</div><div class='del'>-	reg |= (HorDcm &lt;&lt; ZR36057_VFESPFR_HorDcm);</div><div class='del'>-	reg |= (VerDcm &lt;&lt; ZR36057_VFESPFR_VerDcm);</div><div class='del'>-	reg |= (DispMode &lt;&lt; ZR36057_VFESPFR_DispMode);</div><div class='del'>-	/* RJ: I don't know, why the following has to be the opposite</div><div class='del'>-	 * of the corresponding ZR36060 setting, but only this way</div><div class='del'>-	 * we get the correct colors when uncompressing to the screen  */</div><div class='del'>-	//reg |= ZR36057_VFESPFR_VCLKPol; /**/</div><div class='del'>-	/* RJ: Don't know if that is needed for NTSC also */</div><div class='del'>-	if (!(zr-&gt;norm &amp; V4L2_STD_NTSC))</div><div class='del'>-		reg |= ZR36057_VFESPFR_ExtFl;	// NEEDED!!!!!!! Wolfgang</div><div class='del'>-	reg |= ZR36057_VFESPFR_TopField;</div><div class='del'>-	if (HorDcm &gt;= 48) {</div><div class='del'>-		reg |= 3 &lt;&lt; ZR36057_VFESPFR_HFilter;	/* 5 tap filter */</div><div class='del'>-	} else if (HorDcm &gt;= 32) {</div><div class='del'>-		reg |= 2 &lt;&lt; ZR36057_VFESPFR_HFilter;	/* 4 tap filter */</div><div class='del'>-	} else if (HorDcm &gt;= 16) {</div><div class='del'>-		reg |= 1 &lt;&lt; ZR36057_VFESPFR_HFilter;	/* 3 tap filter */</div><div class='del'>-	}</div><div class='del'>-	reg |= format-&gt;vfespfr;</div><div class='del'>-	btwrite(reg, ZR36057_VFESPFR);</div><div class='del'>-</div><div class='del'>-	/* display configuration */</div><div class='del'>-	reg = (16 &lt;&lt; ZR36057_VDCR_MinPix)</div><div class='del'>-	    | (VidWinHt &lt;&lt; ZR36057_VDCR_VidWinHt)</div><div class='del'>-	    | (VidWinWid &lt;&lt; ZR36057_VDCR_VidWinWid);</div><div class='del'>-	if (pci_pci_problems &amp; PCIPCI_TRITON)</div><div class='del'>-		// || zr-&gt;revision &lt; 1) // Revision 1 has also Triton support</div><div class='del'>-		reg &amp;= ~ZR36057_VDCR_Triton;</div><div class='del'>-	else</div><div class='del'>-		reg |= ZR36057_VDCR_Triton;</div><div class='del'>-	btwrite(reg, ZR36057_VDCR);</div><div class='del'>-</div><div class='del'>-	/* (Ronald) don't write this if overlay_mask = NULL */</div><div class='del'>-	if (zr-&gt;overlay_mask) {</div><div class='del'>-		/* Write overlay clipping mask data, but don't enable overlay clipping */</div><div class='del'>-		/* RJ: since this makes only sense on the screen, we use</div><div class='del'>-		 * zr-&gt;overlay_settings.width instead of video_width */</div><div class='del'>-</div><div class='del'>-		mask_line_size = (BUZ_MAX_WIDTH + 31) / 32;</div><div class='del'>-		reg = virt_to_bus(zr-&gt;overlay_mask);</div><div class='del'>-		btwrite(reg, ZR36057_MMTR);</div><div class='del'>-		reg = virt_to_bus(zr-&gt;overlay_mask + mask_line_size);</div><div class='del'>-		btwrite(reg, ZR36057_MMBR);</div><div class='del'>-		reg =</div><div class='del'>-		    mask_line_size - (zr-&gt;overlay_settings.width +</div><div class='del'>-				      31) / 32;</div><div class='del'>-		if (DispMode == 0)</div><div class='del'>-			reg += mask_line_size;</div><div class='del'>-		reg &lt;&lt;= ZR36057_OCR_MaskStride;</div><div class='del'>-		btwrite(reg, ZR36057_OCR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr36057_adjust_vfe(zr, zr-&gt;codec_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Switch overlay on or off</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zr36057_overlay (struct zoran *zr,</div><div class='del'>-		 int           on)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	if (on) {</div><div class='del'>-		/* do the necessary settings ... */</div><div class='del'>-		btand(~ZR36057_VDCR_VidEn, ZR36057_VDCR);	/* switch it off first */</div><div class='del'>-</div><div class='del'>-		zr36057_set_vfe(zr,</div><div class='del'>-				zr-&gt;overlay_settings.width,</div><div class='del'>-				zr-&gt;overlay_settings.height,</div><div class='del'>-				zr-&gt;overlay_settings.format);</div><div class='del'>-</div><div class='del'>-		/* Start and length of each line MUST be 4-byte aligned.</div><div class='del'>-		 * This should be already checked before the call to this routine.</div><div class='del'>-		 * All error messages are internal driver checking only! */</div><div class='del'>-</div><div class='del'>-		/* video display top and bottom registers */</div><div class='del'>-		reg = (long) zr-&gt;vbuf_base +</div><div class='del'>-		    zr-&gt;overlay_settings.x *</div><div class='del'>-		    ((zr-&gt;overlay_settings.format-&gt;depth + 7) / 8) +</div><div class='del'>-		    zr-&gt;overlay_settings.y *</div><div class='del'>-		    zr-&gt;vbuf_bytesperline;</div><div class='del'>-		btwrite(reg, ZR36057_VDTR);</div><div class='del'>-		if (reg &amp; 3)</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: zr36057_overlay() - video_address not aligned\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-		if (zr-&gt;overlay_settings.height &gt; BUZ_MAX_HEIGHT / 2)</div><div class='del'>-			reg += zr-&gt;vbuf_bytesperline;</div><div class='del'>-		btwrite(reg, ZR36057_VDBR);</div><div class='del'>-</div><div class='del'>-		/* video stride, status, and frame grab register */</div><div class='del'>-		reg = zr-&gt;vbuf_bytesperline -</div><div class='del'>-		    zr-&gt;overlay_settings.width *</div><div class='del'>-		    ((zr-&gt;overlay_settings.format-&gt;depth + 7) / 8);</div><div class='del'>-		if (zr-&gt;overlay_settings.height &gt; BUZ_MAX_HEIGHT / 2)</div><div class='del'>-			reg += zr-&gt;vbuf_bytesperline;</div><div class='del'>-		if (reg &amp; 3)</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: zr36057_overlay() - video_stride not aligned\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-		reg = (reg &lt;&lt; ZR36057_VSSFGR_DispStride);</div><div class='del'>-		reg |= ZR36057_VSSFGR_VidOvf;	/* clear overflow status */</div><div class='del'>-		btwrite(reg, ZR36057_VSSFGR);</div><div class='del'>-</div><div class='del'>-		/* Set overlay clipping */</div><div class='del'>-		if (zr-&gt;overlay_settings.clipcount &gt; 0)</div><div class='del'>-			btor(ZR36057_OCR_OvlEnable, ZR36057_OCR);</div><div class='del'>-</div><div class='del'>-		/* ... and switch it on */</div><div class='del'>-		btor(ZR36057_VDCR_VidEn, ZR36057_VDCR);</div><div class='del'>-	} else {</div><div class='del'>-		/* Switch it off */</div><div class='del'>-		btand(~ZR36057_VDCR_VidEn, ZR36057_VDCR);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The overlay mask has one bit for each pixel on a scan line,</div><div class='del'>- *  and the maximum window size is BUZ_MAX_WIDTH * BUZ_MAX_HEIGHT pixels.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void write_overlay_mask(struct zoran_fh *fh, struct v4l2_clip *vp, int count)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned mask_line_size = (BUZ_MAX_WIDTH + 31) / 32;</div><div class='del'>-	u32 *mask;</div><div class='del'>-	int x, y, width, height;</div><div class='del'>-	unsigned i, j, k;</div><div class='del'>-</div><div class='del'>-	/* fill mask with one bits */</div><div class='del'>-	memset(fh-&gt;overlay_mask, ~0, mask_line_size * 4 * BUZ_MAX_HEIGHT);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; count; ++i) {</div><div class='del'>-		/* pick up local copy of clip */</div><div class='del'>-		x = vp[i].c.left;</div><div class='del'>-		y = vp[i].c.top;</div><div class='del'>-		width = vp[i].c.width;</div><div class='del'>-		height = vp[i].c.height;</div><div class='del'>-</div><div class='del'>-		/* trim clips that extend beyond the window */</div><div class='del'>-		if (x &lt; 0) {</div><div class='del'>-			width += x;</div><div class='del'>-			x = 0;</div><div class='del'>-		}</div><div class='del'>-		if (y &lt; 0) {</div><div class='del'>-			height += y;</div><div class='del'>-			y = 0;</div><div class='del'>-		}</div><div class='del'>-		if (x + width &gt; fh-&gt;overlay_settings.width) {</div><div class='del'>-			width = fh-&gt;overlay_settings.width - x;</div><div class='del'>-		}</div><div class='del'>-		if (y + height &gt; fh-&gt;overlay_settings.height) {</div><div class='del'>-			height = fh-&gt;overlay_settings.height - y;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* ignore degenerate clips */</div><div class='del'>-		if (height &lt;= 0) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (width &lt;= 0) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* apply clip for each scan line */</div><div class='del'>-		for (j = 0; j &lt; height; ++j) {</div><div class='del'>-			/* reset bit for each pixel */</div><div class='del'>-			/* this can be optimized later if need be */</div><div class='del'>-			mask = fh-&gt;overlay_mask + (y + j) * mask_line_size;</div><div class='del'>-			for (k = 0; k &lt; width; ++k) {</div><div class='del'>-				mask[(x + k) / 32] &amp;=</div><div class='del'>-				    ~((u32) 1 &lt;&lt; (x + k) % 32);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Enable/Disable uncompressed memory grabbing of the 36057 */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zr36057_set_memgrab (struct zoran *zr,</div><div class='del'>-		     int           mode)</div><div class='del'>-{</div><div class='del'>-	if (mode) {</div><div class='del'>-		/* We only check SnapShot and not FrameGrab here.  SnapShot==1</div><div class='del'>-		 * means a capture is already in progress, but FrameGrab==1</div><div class='del'>-		 * doesn't necessary mean that.  It's more correct to say a 1</div><div class='del'>-		 * to 0 transition indicates a capture completed.  If a</div><div class='del'>-		 * capture is pending when capturing is tuned off, FrameGrab</div><div class='del'>-		 * will be stuck at 1 until capturing is turned back on.</div><div class='del'>-		 */</div><div class='del'>-		if (btread(ZR36057_VSSFGR) &amp; ZR36057_VSSFGR_SnapShot)</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_WARNING</div><div class='del'>-				"%s: zr36057_set_memgrab(1) with SnapShot on!?\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-</div><div class='del'>-		/* switch on VSync interrupts */</div><div class='del'>-		btwrite(IRQ_MASK, ZR36057_ISR);	// Clear Interrupts</div><div class='del'>-		btor(zr-&gt;card.vsync_int, ZR36057_ICR);	// SW</div><div class='del'>-</div><div class='del'>-		/* enable SnapShot */</div><div class='del'>-		btor(ZR36057_VSSFGR_SnapShot, ZR36057_VSSFGR);</div><div class='del'>-</div><div class='del'>-		/* Set zr36057 video front end  and enable video */</div><div class='del'>-		zr36057_set_vfe(zr, zr-&gt;v4l_settings.width,</div><div class='del'>-				zr-&gt;v4l_settings.height,</div><div class='del'>-				zr-&gt;v4l_settings.format);</div><div class='del'>-</div><div class='del'>-		zr-&gt;v4l_memgrab_active = 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* switch off VSync interrupts */</div><div class='del'>-		btand(~zr-&gt;card.vsync_int, ZR36057_ICR);	// SW</div><div class='del'>-</div><div class='del'>-		zr-&gt;v4l_memgrab_active = 0;</div><div class='del'>-		zr-&gt;v4l_grab_frame = NO_GRAB_ACTIVE;</div><div class='del'>-</div><div class='del'>-		/* re-enable grabbing to screen if it was running */</div><div class='del'>-		if (zr-&gt;v4l_overlay_active) {</div><div class='del'>-			zr36057_overlay(zr, 1);</div><div class='del'>-		} else {</div><div class='del'>-			btand(~ZR36057_VDCR_VidEn, ZR36057_VDCR);</div><div class='del'>-			btand(~ZR36057_VSSFGR_SnapShot, ZR36057_VSSFGR);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-wait_grab_pending (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* wait until all pending grabs are finished */</div><div class='del'>-</div><div class='del'>-	if (!zr-&gt;v4l_memgrab_active)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	wait_event_interruptible(zr-&gt;v4l_capq,</div><div class='del'>-			(zr-&gt;v4l_pend_tail == zr-&gt;v4l_pend_head));</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-	zr36057_set_memgrab(zr, 0);</div><div class='del'>-	spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</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'>- *  Set up the Buz-specific MJPEG part                                       *</div><div class='del'>- *                                                                           *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-set_frame (struct zoran *zr,</div><div class='del'>-	   int           val)</div><div class='del'>-{</div><div class='del'>-	GPIO(zr, zr-&gt;card.gpio[ZR_GPIO_JPEG_FRAME], val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_videobus_dir (struct zoran *zr,</div><div class='del'>-		  int           val)</div><div class='del'>-{</div><div class='del'>-	switch (zr-&gt;card.type) {</div><div class='del'>-	case LML33:</div><div class='del'>-	case LML33R10:</div><div class='del'>-		if (!lml33dpath)</div><div class='del'>-			GPIO(zr, 5, val);</div><div class='del'>-		else</div><div class='del'>-			GPIO(zr, 5, 1);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		GPIO(zr, zr-&gt;card.gpio[ZR_GPIO_VID_DIR],</div><div class='del'>-		     zr-&gt;card.gpio_pol[ZR_GPIO_VID_DIR] ? !val : val);</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'>-init_jpeg_queue (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* re-initialize DMA ring stuff */</div><div class='del'>-	zr-&gt;jpg_que_head = 0;</div><div class='del'>-	zr-&gt;jpg_dma_head = 0;</div><div class='del'>-	zr-&gt;jpg_dma_tail = 0;</div><div class='del'>-	zr-&gt;jpg_que_tail = 0;</div><div class='del'>-	zr-&gt;jpg_seq_num = 0;</div><div class='del'>-	zr-&gt;JPEG_error = 0;</div><div class='del'>-	zr-&gt;num_errors = 0;</div><div class='del'>-	zr-&gt;jpg_err_seq = 0;</div><div class='del'>-	zr-&gt;jpg_err_shift = 0;</div><div class='del'>-	zr-&gt;jpg_queued_num = 0;</div><div class='del'>-	for (i = 0; i &lt; zr-&gt;jpg_buffers.num_buffers; i++) {</div><div class='del'>-		zr-&gt;jpg_buffers.buffer[i].state = BUZ_STATE_USER;	/* nothing going on */</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; BUZ_NUM_STAT_COM; i++) {</div><div class='del'>-		zr-&gt;stat_com[i] = cpu_to_le32(1);	/* mark as unavailable to zr36057 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36057_set_jpg (struct zoran          *zr,</div><div class='del'>-		 enum zoran_codec_mode  mode)</div><div class='del'>-{</div><div class='del'>-	struct tvnorm *tvn;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	tvn = zr-&gt;timing;</div><div class='del'>-</div><div class='del'>-	/* assert P_Reset, disable code transfer, deassert Active */</div><div class='del'>-	btwrite(0, ZR36057_JPC);</div><div class='del'>-</div><div class='del'>-	/* MJPEG compression mode */</div><div class='del'>-	switch (mode) {</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_MOTION_COMPRESS:</div><div class='del'>-	default:</div><div class='del'>-		reg = ZR36057_JMC_MJPGCmpMode;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_MOTION_DECOMPRESS:</div><div class='del'>-		reg = ZR36057_JMC_MJPGExpMode;</div><div class='del'>-		reg |= ZR36057_JMC_SyncMstr;</div><div class='del'>-		/* RJ: The following is experimental - improves the output to screen */</div><div class='del'>-		//if(zr-&gt;jpg_settings.VFIFO_FB) reg |= ZR36057_JMC_VFIFO_FB; // No, it doesn't. SM</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_STILL_COMPRESS:</div><div class='del'>-		reg = ZR36057_JMC_JPGCmpMode;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_STILL_DECOMPRESS:</div><div class='del'>-		reg = ZR36057_JMC_JPGExpMode;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	reg |= ZR36057_JMC_JPG;</div><div class='del'>-	if (zr-&gt;jpg_settings.field_per_buff == 1)</div><div class='del'>-		reg |= ZR36057_JMC_Fld_per_buff;</div><div class='del'>-	btwrite(reg, ZR36057_JMC);</div><div class='del'>-</div><div class='del'>-	/* vertical */</div><div class='del'>-	btor(ZR36057_VFEVCR_VSPol, ZR36057_VFEVCR);</div><div class='del'>-	reg = (6 &lt;&lt; ZR36057_VSP_VsyncSize) |</div><div class='del'>-	      (tvn-&gt;Ht &lt;&lt; ZR36057_VSP_FrmTot);</div><div class='del'>-	btwrite(reg, ZR36057_VSP);</div><div class='del'>-	reg = ((zr-&gt;jpg_settings.img_y + tvn-&gt;VStart) &lt;&lt; ZR36057_FVAP_NAY) |</div><div class='del'>-	      (zr-&gt;jpg_settings.img_height &lt;&lt; ZR36057_FVAP_PAY);</div><div class='del'>-	btwrite(reg, ZR36057_FVAP);</div><div class='del'>-</div><div class='del'>-	/* horizontal */</div><div class='del'>-	if (zr-&gt;card.vfe_pol.hsync_pol)</div><div class='del'>-		btor(ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR);</div><div class='del'>-	else</div><div class='del'>-		btand(~ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR);</div><div class='del'>-	reg = ((tvn-&gt;HSyncStart) &lt;&lt; ZR36057_HSP_HsyncStart) |</div><div class='del'>-	      (tvn-&gt;Wt &lt;&lt; ZR36057_HSP_LineTot);</div><div class='del'>-	btwrite(reg, ZR36057_HSP);</div><div class='del'>-	reg = ((zr-&gt;jpg_settings.img_x +</div><div class='del'>-		tvn-&gt;HStart + 4) &lt;&lt; ZR36057_FHAP_NAX) |</div><div class='del'>-	      (zr-&gt;jpg_settings.img_width &lt;&lt; ZR36057_FHAP_PAX);</div><div class='del'>-	btwrite(reg, ZR36057_FHAP);</div><div class='del'>-</div><div class='del'>-	/* field process parameters */</div><div class='del'>-	if (zr-&gt;jpg_settings.odd_even)</div><div class='del'>-		reg = ZR36057_FPP_Odd_Even;</div><div class='del'>-	else</div><div class='del'>-		reg = 0;</div><div class='del'>-</div><div class='del'>-	btwrite(reg, ZR36057_FPP);</div><div class='del'>-</div><div class='del'>-	/* Set proper VCLK Polarity, else colors will be wrong during playback */</div><div class='del'>-	//btor(ZR36057_VFESPFR_VCLKPol, ZR36057_VFESPFR);</div><div class='del'>-</div><div class='del'>-	/* code base address */</div><div class='del'>-	reg = virt_to_bus(zr-&gt;stat_com);</div><div class='del'>-	btwrite(reg, ZR36057_JCBA);</div><div class='del'>-</div><div class='del'>-	/* FIFO threshold (FIFO is 160. double words) */</div><div class='del'>-	/* NOTE: decimal values here */</div><div class='del'>-	switch (mode) {</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_STILL_COMPRESS:</div><div class='del'>-	case BUZ_MODE_MOTION_COMPRESS:</div><div class='del'>-		if (zr-&gt;card.type != BUZ)</div><div class='del'>-			reg = 140;</div><div class='del'>-		else</div><div class='del'>-			reg = 60;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_STILL_DECOMPRESS:</div><div class='del'>-	case BUZ_MODE_MOTION_DECOMPRESS:</div><div class='del'>-		reg = 20;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		reg = 80;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	btwrite(reg, ZR36057_JCFT);</div><div class='del'>-	zr36057_adjust_vfe(zr, mode);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-print_interrupts (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	int res, noerr = 0;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: interrupts received:", ZR_DEVNAME(zr));</div><div class='del'>-	if ((res = zr-&gt;field_counter) &lt; -1 || res &gt; 1) {</div><div class='del'>-		printk(KERN_CONT " FD:%d", res);</div><div class='del'>-	}</div><div class='del'>-	if ((res = zr-&gt;intr_counter_GIRQ1) != 0) {</div><div class='del'>-		printk(KERN_CONT " GIRQ1:%d", res);</div><div class='del'>-		noerr++;</div><div class='del'>-	}</div><div class='del'>-	if ((res = zr-&gt;intr_counter_GIRQ0) != 0) {</div><div class='del'>-		printk(KERN_CONT " GIRQ0:%d", res);</div><div class='del'>-		noerr++;</div><div class='del'>-	}</div><div class='del'>-	if ((res = zr-&gt;intr_counter_CodRepIRQ) != 0) {</div><div class='del'>-		printk(KERN_CONT " CodRepIRQ:%d", res);</div><div class='del'>-		noerr++;</div><div class='del'>-	}</div><div class='del'>-	if ((res = zr-&gt;intr_counter_JPEGRepIRQ) != 0) {</div><div class='del'>-		printk(KERN_CONT " JPEGRepIRQ:%d", res);</div><div class='del'>-		noerr++;</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;JPEG_max_missed) {</div><div class='del'>-		printk(KERN_CONT " JPEG delays: max=%d min=%d", zr-&gt;JPEG_max_missed,</div><div class='del'>-		       zr-&gt;JPEG_min_missed);</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;END_event_missed) {</div><div class='del'>-		printk(KERN_CONT " ENDs missed: %d", zr-&gt;END_event_missed);</div><div class='del'>-	}</div><div class='del'>-	//if (zr-&gt;jpg_queued_num) {</div><div class='del'>-	printk(KERN_CONT " queue_state=%ld/%ld/%ld/%ld", zr-&gt;jpg_que_tail,</div><div class='del'>-	       zr-&gt;jpg_dma_tail, zr-&gt;jpg_dma_head, zr-&gt;jpg_que_head);</div><div class='del'>-	//}</div><div class='del'>-	if (!noerr) {</div><div class='del'>-		printk(KERN_CONT ": no interrupts detected.");</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-clear_interrupt_counters (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	zr-&gt;intr_counter_GIRQ1 = 0;</div><div class='del'>-	zr-&gt;intr_counter_GIRQ0 = 0;</div><div class='del'>-	zr-&gt;intr_counter_CodRepIRQ = 0;</div><div class='del'>-	zr-&gt;intr_counter_JPEGRepIRQ = 0;</div><div class='del'>-	zr-&gt;field_counter = 0;</div><div class='del'>-	zr-&gt;IRQ1_in = 0;</div><div class='del'>-	zr-&gt;IRQ1_out = 0;</div><div class='del'>-	zr-&gt;JPEG_in = 0;</div><div class='del'>-	zr-&gt;JPEG_out = 0;</div><div class='del'>-	zr-&gt;JPEG_0 = 0;</div><div class='del'>-	zr-&gt;JPEG_1 = 0;</div><div class='del'>-	zr-&gt;END_event_missed = 0;</div><div class='del'>-	zr-&gt;JPEG_missed = 0;</div><div class='del'>-	zr-&gt;JPEG_max_missed = 0;</div><div class='del'>-	zr-&gt;JPEG_min_missed = 0x7fffffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-count_reset_interrupt (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	u32 isr;</div><div class='del'>-</div><div class='del'>-	if ((isr = btread(ZR36057_ISR) &amp; 0x78000000)) {</div><div class='del'>-		if (isr &amp; ZR36057_ISR_GIRQ1) {</div><div class='del'>-			btwrite(ZR36057_ISR_GIRQ1, ZR36057_ISR);</div><div class='del'>-			zr-&gt;intr_counter_GIRQ1++;</div><div class='del'>-		}</div><div class='del'>-		if (isr &amp; ZR36057_ISR_GIRQ0) {</div><div class='del'>-			btwrite(ZR36057_ISR_GIRQ0, ZR36057_ISR);</div><div class='del'>-			zr-&gt;intr_counter_GIRQ0++;</div><div class='del'>-		}</div><div class='del'>-		if (isr &amp; ZR36057_ISR_CodRepIRQ) {</div><div class='del'>-			btwrite(ZR36057_ISR_CodRepIRQ, ZR36057_ISR);</div><div class='del'>-			zr-&gt;intr_counter_CodRepIRQ++;</div><div class='del'>-		}</div><div class='del'>-		if (isr &amp; ZR36057_ISR_JPEGRepIRQ) {</div><div class='del'>-			btwrite(ZR36057_ISR_JPEGRepIRQ, ZR36057_ISR);</div><div class='del'>-			zr-&gt;intr_counter_JPEGRepIRQ++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return isr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-jpeg_start (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	int reg;</div><div class='del'>-</div><div class='del'>-	zr-&gt;frame_num = 0;</div><div class='del'>-</div><div class='del'>-	/* deassert P_reset, disable code transfer, deassert Active */</div><div class='del'>-	btwrite(ZR36057_JPC_P_Reset, ZR36057_JPC);</div><div class='del'>-	/* stop flushing the internal code buffer */</div><div class='del'>-	btand(~ZR36057_MCTCR_CFlush, ZR36057_MCTCR);</div><div class='del'>-	/* enable code transfer */</div><div class='del'>-	btor(ZR36057_JPC_CodTrnsEn, ZR36057_JPC);</div><div class='del'>-</div><div class='del'>-	/* clear IRQs */</div><div class='del'>-	btwrite(IRQ_MASK, ZR36057_ISR);</div><div class='del'>-	/* enable the JPEG IRQs */</div><div class='del'>-	btwrite(zr-&gt;card.jpeg_int |</div><div class='del'>-			ZR36057_ICR_JPEGRepIRQ |</div><div class='del'>-			ZR36057_ICR_IntPinEn,</div><div class='del'>-		ZR36057_ICR);</div><div class='del'>-</div><div class='del'>-	set_frame(zr, 0);	// \FRAME</div><div class='del'>-</div><div class='del'>-	/* set the JPEG codec guest ID */</div><div class='del'>-	reg = (zr-&gt;card.gpcs[1] &lt;&lt; ZR36057_JCGI_JPEGuestID) |</div><div class='del'>-	       (0 &lt;&lt; ZR36057_JCGI_JPEGuestReg);</div><div class='del'>-	btwrite(reg, ZR36057_JCGI);</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;card.video_vfe == CODEC_TYPE_ZR36016 &amp;&amp;</div><div class='del'>-	    zr-&gt;card.video_codec == CODEC_TYPE_ZR36050) {</div><div class='del'>-		/* Enable processing on the ZR36016 */</div><div class='del'>-		if (zr-&gt;vfe)</div><div class='del'>-			zr36016_write(zr-&gt;vfe, 0, 1);</div><div class='del'>-</div><div class='del'>-		/* load the address of the GO register in the ZR36050 latch */</div><div class='del'>-		post_office_write(zr, 0, 0, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assert Active */</div><div class='del'>-	btor(ZR36057_JPC_Active, ZR36057_JPC);</div><div class='del'>-</div><div class='del'>-	/* enable the Go generation */</div><div class='del'>-	btor(ZR36057_JMC_Go_en, ZR36057_JMC);</div><div class='del'>-	udelay(30);</div><div class='del'>-</div><div class='del'>-	set_frame(zr, 1);	// /FRAME</div><div class='del'>-</div><div class='del'>-	dprintk(3, KERN_DEBUG "%s: jpeg_start\n", ZR_DEVNAME(zr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zr36057_enable_jpg (struct zoran          *zr,</div><div class='del'>-		    enum zoran_codec_mode  mode)</div><div class='del'>-{</div><div class='del'>-	struct vfe_settings cap;</div><div class='del'>-	int field_size =</div><div class='del'>-	    zr-&gt;jpg_buffers.buffer_size / zr-&gt;jpg_settings.field_per_buff;</div><div class='del'>-</div><div class='del'>-	zr-&gt;codec_mode = mode;</div><div class='del'>-</div><div class='del'>-	cap.x = zr-&gt;jpg_settings.img_x;</div><div class='del'>-	cap.y = zr-&gt;jpg_settings.img_y;</div><div class='del'>-	cap.width = zr-&gt;jpg_settings.img_width;</div><div class='del'>-	cap.height = zr-&gt;jpg_settings.img_height;</div><div class='del'>-	cap.decimation =</div><div class='del'>-	    zr-&gt;jpg_settings.HorDcm | (zr-&gt;jpg_settings.VerDcm &lt;&lt; 8);</div><div class='del'>-	cap.quality = zr-&gt;jpg_settings.jpg_comp.quality;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_MOTION_COMPRESS: {</div><div class='del'>-		struct jpeg_app_marker app;</div><div class='del'>-		struct jpeg_com_marker com;</div><div class='del'>-</div><div class='del'>-		/* In motion compress mode, the decoder output must be enabled, and</div><div class='del'>-		 * the video bus direction set to input.</div><div class='del'>-		 */</div><div class='del'>-		set_videobus_dir(zr, 0);</div><div class='del'>-		decoder_call(zr, video, s_stream, 1);</div><div class='del'>-		encoder_call(zr, video, s_routing, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		/* Take the JPEG codec and the VFE out of sleep */</div><div class='del'>-		jpeg_codec_sleep(zr, 0);</div><div class='del'>-</div><div class='del'>-		/* set JPEG app/com marker */</div><div class='del'>-		app.appn = zr-&gt;jpg_settings.jpg_comp.APPn;</div><div class='del'>-		app.len = zr-&gt;jpg_settings.jpg_comp.APP_len;</div><div class='del'>-		memcpy(app.data, zr-&gt;jpg_settings.jpg_comp.APP_data, 60);</div><div class='del'>-		zr-&gt;codec-&gt;control(zr-&gt;codec, CODEC_S_JPEG_APP_DATA,</div><div class='del'>-				   sizeof(struct jpeg_app_marker), &amp;app);</div><div class='del'>-</div><div class='del'>-		com.len = zr-&gt;jpg_settings.jpg_comp.COM_len;</div><div class='del'>-		memcpy(com.data, zr-&gt;jpg_settings.jpg_comp.COM_data, 60);</div><div class='del'>-		zr-&gt;codec-&gt;control(zr-&gt;codec, CODEC_S_JPEG_COM_DATA,</div><div class='del'>-				   sizeof(struct jpeg_com_marker), &amp;com);</div><div class='del'>-</div><div class='del'>-		/* Setup the JPEG codec */</div><div class='del'>-		zr-&gt;codec-&gt;control(zr-&gt;codec, CODEC_S_JPEG_TDS_BYTE,</div><div class='del'>-				   sizeof(int), &amp;field_size);</div><div class='del'>-		zr-&gt;codec-&gt;set_video(zr-&gt;codec, zr-&gt;timing, &amp;cap,</div><div class='del'>-				     &amp;zr-&gt;card.vfe_pol);</div><div class='del'>-		zr-&gt;codec-&gt;set_mode(zr-&gt;codec, CODEC_DO_COMPRESSION);</div><div class='del'>-</div><div class='del'>-		/* Setup the VFE */</div><div class='del'>-		if (zr-&gt;vfe) {</div><div class='del'>-			zr-&gt;vfe-&gt;control(zr-&gt;vfe, CODEC_S_JPEG_TDS_BYTE,</div><div class='del'>-					 sizeof(int), &amp;field_size);</div><div class='del'>-			zr-&gt;vfe-&gt;set_video(zr-&gt;vfe, zr-&gt;timing, &amp;cap,</div><div class='del'>-					   &amp;zr-&gt;card.vfe_pol);</div><div class='del'>-			zr-&gt;vfe-&gt;set_mode(zr-&gt;vfe, CODEC_DO_COMPRESSION);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		init_jpeg_queue(zr);</div><div class='del'>-		zr36057_set_jpg(zr, mode);	// \P_Reset, ... Video param, FIFO</div><div class='del'>-</div><div class='del'>-		clear_interrupt_counters(zr);</div><div class='del'>-		dprintk(2, KERN_INFO "%s: enable_jpg(MOTION_COMPRESS)\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_MOTION_DECOMPRESS:</div><div class='del'>-		/* In motion decompression mode, the decoder output must be disabled, and</div><div class='del'>-		 * the video bus direction set to output.</div><div class='del'>-		 */</div><div class='del'>-		decoder_call(zr, video, s_stream, 0);</div><div class='del'>-		set_videobus_dir(zr, 1);</div><div class='del'>-		encoder_call(zr, video, s_routing, 1, 0, 0);</div><div class='del'>-</div><div class='del'>-		/* Take the JPEG codec and the VFE out of sleep */</div><div class='del'>-		jpeg_codec_sleep(zr, 0);</div><div class='del'>-		/* Setup the VFE */</div><div class='del'>-		if (zr-&gt;vfe) {</div><div class='del'>-			zr-&gt;vfe-&gt;set_video(zr-&gt;vfe, zr-&gt;timing, &amp;cap,</div><div class='del'>-					   &amp;zr-&gt;card.vfe_pol);</div><div class='del'>-			zr-&gt;vfe-&gt;set_mode(zr-&gt;vfe, CODEC_DO_EXPANSION);</div><div class='del'>-		}</div><div class='del'>-		/* Setup the JPEG codec */</div><div class='del'>-		zr-&gt;codec-&gt;set_video(zr-&gt;codec, zr-&gt;timing, &amp;cap,</div><div class='del'>-				     &amp;zr-&gt;card.vfe_pol);</div><div class='del'>-		zr-&gt;codec-&gt;set_mode(zr-&gt;codec, CODEC_DO_EXPANSION);</div><div class='del'>-</div><div class='del'>-		init_jpeg_queue(zr);</div><div class='del'>-		zr36057_set_jpg(zr, mode);	// \P_Reset, ... Video param, FIFO</div><div class='del'>-</div><div class='del'>-		clear_interrupt_counters(zr);</div><div class='del'>-		dprintk(2, KERN_INFO "%s: enable_jpg(MOTION_DECOMPRESS)\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BUZ_MODE_IDLE:</div><div class='del'>-	default:</div><div class='del'>-		/* shut down processing */</div><div class='del'>-		btand(~(zr-&gt;card.jpeg_int | ZR36057_ICR_JPEGRepIRQ),</div><div class='del'>-		      ZR36057_ICR);</div><div class='del'>-		btwrite(zr-&gt;card.jpeg_int | ZR36057_ICR_JPEGRepIRQ,</div><div class='del'>-			ZR36057_ISR);</div><div class='del'>-		btand(~ZR36057_JMC_Go_en, ZR36057_JMC);	// \Go_en</div><div class='del'>-</div><div class='del'>-		msleep(50);</div><div class='del'>-</div><div class='del'>-		set_videobus_dir(zr, 0);</div><div class='del'>-		set_frame(zr, 1);	// /FRAME</div><div class='del'>-		btor(ZR36057_MCTCR_CFlush, ZR36057_MCTCR);	// /CFlush</div><div class='del'>-		btwrite(0, ZR36057_JPC);	// \P_Reset,\CodTrnsEn,\Active</div><div class='del'>-		btand(~ZR36057_JMC_VFIFO_FB, ZR36057_JMC);</div><div class='del'>-		btand(~ZR36057_JMC_SyncMstr, ZR36057_JMC);</div><div class='del'>-		jpeg_codec_reset(zr);</div><div class='del'>-		jpeg_codec_sleep(zr, 1);</div><div class='del'>-		zr36057_adjust_vfe(zr, mode);</div><div class='del'>-</div><div class='del'>-		decoder_call(zr, video, s_stream, 1);</div><div class='del'>-		encoder_call(zr, video, s_routing, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		dprintk(2, KERN_INFO "%s: enable_jpg(IDLE)\n", ZR_DEVNAME(zr));</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'>-/* when this is called the spinlock must be held */</div><div class='del'>-void</div><div class='del'>-zoran_feed_stat_com (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	/* move frames from pending queue to DMA */</div><div class='del'>-</div><div class='del'>-	int frame, i, max_stat_com;</div><div class='del'>-</div><div class='del'>-	max_stat_com =</div><div class='del'>-	    (zr-&gt;jpg_settings.TmpDcm ==</div><div class='del'>-	     1) ? BUZ_NUM_STAT_COM : (BUZ_NUM_STAT_COM &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-	while ((zr-&gt;jpg_dma_head - zr-&gt;jpg_dma_tail) &lt; max_stat_com &amp;&amp;</div><div class='del'>-	       zr-&gt;jpg_dma_head &lt; zr-&gt;jpg_que_head) {</div><div class='del'>-</div><div class='del'>-		frame = zr-&gt;jpg_pend[zr-&gt;jpg_dma_head &amp; BUZ_MASK_FRAME];</div><div class='del'>-		if (zr-&gt;jpg_settings.TmpDcm == 1) {</div><div class='del'>-			/* fill 1 stat_com entry */</div><div class='del'>-			i = (zr-&gt;jpg_dma_head -</div><div class='del'>-			     zr-&gt;jpg_err_shift) &amp; BUZ_MASK_STAT_COM;</div><div class='del'>-			if (!(zr-&gt;stat_com[i] &amp; cpu_to_le32(1)))</div><div class='del'>-				break;</div><div class='del'>-			zr-&gt;stat_com[i] =</div><div class='del'>-			    cpu_to_le32(zr-&gt;jpg_buffers.buffer[frame].jpg.frag_tab_bus);</div><div class='del'>-		} else {</div><div class='del'>-			/* fill 2 stat_com entries */</div><div class='del'>-			i = ((zr-&gt;jpg_dma_head -</div><div class='del'>-			      zr-&gt;jpg_err_shift) &amp; 1) * 2;</div><div class='del'>-			if (!(zr-&gt;stat_com[i] &amp; cpu_to_le32(1)))</div><div class='del'>-				break;</div><div class='del'>-			zr-&gt;stat_com[i] =</div><div class='del'>-			    cpu_to_le32(zr-&gt;jpg_buffers.buffer[frame].jpg.frag_tab_bus);</div><div class='del'>-			zr-&gt;stat_com[i + 1] =</div><div class='del'>-			    cpu_to_le32(zr-&gt;jpg_buffers.buffer[frame].jpg.frag_tab_bus);</div><div class='del'>-		}</div><div class='del'>-		zr-&gt;jpg_buffers.buffer[frame].state = BUZ_STATE_DMA;</div><div class='del'>-		zr-&gt;jpg_dma_head++;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS)</div><div class='del'>-		zr-&gt;jpg_queued_num++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* when this is called the spinlock must be held */</div><div class='del'>-static void</div><div class='del'>-zoran_reap_stat_com (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	/* move frames from DMA queue to done queue */</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-	u32 stat_com;</div><div class='del'>-	unsigned int seq;</div><div class='del'>-	unsigned int dif;</div><div class='del'>-	struct zoran_buffer *buffer;</div><div class='del'>-	int frame;</div><div class='del'>-</div><div class='del'>-	/* In motion decompress we don't have a hardware frame counter,</div><div class='del'>-	 * we just count the interrupts here */</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS) {</div><div class='del'>-		zr-&gt;jpg_seq_num++;</div><div class='del'>-	}</div><div class='del'>-	while (zr-&gt;jpg_dma_tail &lt; zr-&gt;jpg_dma_head) {</div><div class='del'>-		if (zr-&gt;jpg_settings.TmpDcm == 1)</div><div class='del'>-			i = (zr-&gt;jpg_dma_tail -</div><div class='del'>-			     zr-&gt;jpg_err_shift) &amp; BUZ_MASK_STAT_COM;</div><div class='del'>-		else</div><div class='del'>-			i = ((zr-&gt;jpg_dma_tail -</div><div class='del'>-			      zr-&gt;jpg_err_shift) &amp; 1) * 2 + 1;</div><div class='del'>-</div><div class='del'>-		stat_com = le32_to_cpu(zr-&gt;stat_com[i]);</div><div class='del'>-</div><div class='del'>-		if ((stat_com &amp; 1) == 0) {</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		frame = zr-&gt;jpg_pend[zr-&gt;jpg_dma_tail &amp; BUZ_MASK_FRAME];</div><div class='del'>-		buffer = &amp;zr-&gt;jpg_buffers.buffer[frame];</div><div class='del'>-		buffer-&gt;bs.ts = ktime_get_ns();</div><div class='del'>-</div><div class='del'>-		if (zr-&gt;codec_mode == BUZ_MODE_MOTION_COMPRESS) {</div><div class='del'>-			buffer-&gt;bs.length = (stat_com &amp; 0x7fffff) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-			/* update sequence number with the help of the counter in stat_com */</div><div class='del'>-</div><div class='del'>-			seq = ((stat_com &gt;&gt; 24) + zr-&gt;jpg_err_seq) &amp; 0xff;</div><div class='del'>-			dif = (seq - zr-&gt;jpg_seq_num) &amp; 0xff;</div><div class='del'>-			zr-&gt;jpg_seq_num += dif;</div><div class='del'>-		} else {</div><div class='del'>-			buffer-&gt;bs.length = 0;</div><div class='del'>-		}</div><div class='del'>-		buffer-&gt;bs.seq =</div><div class='del'>-		    zr-&gt;jpg_settings.TmpDcm ==</div><div class='del'>-		    2 ? (zr-&gt;jpg_seq_num &gt;&gt; 1) : zr-&gt;jpg_seq_num;</div><div class='del'>-		buffer-&gt;state = BUZ_STATE_DONE;</div><div class='del'>-</div><div class='del'>-		zr-&gt;jpg_dma_tail++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zoran_restart(struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	/* Now the stat_comm buffer is ready for restart */</div><div class='del'>-	unsigned int status = 0;</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_MOTION_COMPRESS) {</div><div class='del'>-		decoder_call(zr, video, g_input_status, &amp;status);</div><div class='del'>-		mode = CODEC_DO_COMPRESSION;</div><div class='del'>-	} else {</div><div class='del'>-		status = V4L2_IN_ST_NO_SIGNAL;</div><div class='del'>-		mode = CODEC_DO_EXPANSION;</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS ||</div><div class='del'>-	    !(status &amp; V4L2_IN_ST_NO_SIGNAL)) {</div><div class='del'>-		/********** RESTART code *************/</div><div class='del'>-		jpeg_codec_reset(zr);</div><div class='del'>-		zr-&gt;codec-&gt;set_mode(zr-&gt;codec, mode);</div><div class='del'>-		zr36057_set_jpg(zr, zr-&gt;codec_mode);</div><div class='del'>-		jpeg_start(zr);</div><div class='del'>-</div><div class='del'>-		if (zr-&gt;num_errors &lt;= 8)</div><div class='del'>-			dprintk(2, KERN_INFO "%s: Restart\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-</div><div class='del'>-		zr-&gt;JPEG_missed = 0;</div><div class='del'>-		zr-&gt;JPEG_error = 2;</div><div class='del'>-		/********** End RESTART code ***********/</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-error_handler (struct zoran *zr,</div><div class='del'>-	       u32           astat,</div><div class='del'>-	       u32           stat)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* This is JPEG error handling part */</div><div class='del'>-	if (zr-&gt;codec_mode != BUZ_MODE_MOTION_COMPRESS &amp;&amp;</div><div class='del'>-	    zr-&gt;codec_mode != BUZ_MODE_MOTION_DECOMPRESS) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((stat &amp; 1) == 0 &amp;&amp;</div><div class='del'>-	    zr-&gt;codec_mode == BUZ_MODE_MOTION_COMPRESS &amp;&amp;</div><div class='del'>-	    zr-&gt;jpg_dma_tail - zr-&gt;jpg_que_tail &gt;= zr-&gt;jpg_buffers.num_buffers) {</div><div class='del'>-		/* No free buffers... */</div><div class='del'>-		zoran_reap_stat_com(zr);</div><div class='del'>-		zoran_feed_stat_com(zr);</div><div class='del'>-		wake_up_interruptible(&amp;zr-&gt;jpg_capq);</div><div class='del'>-		zr-&gt;JPEG_missed = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;JPEG_error == 1) {</div><div class='del'>-		zoran_restart(zr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First entry: error just happened during normal operation</div><div class='del'>-	 *</div><div class='del'>-	 * In BUZ_MODE_MOTION_COMPRESS:</div><div class='del'>-	 *</div><div class='del'>-	 * Possible glitch in TV signal. In this case we should</div><div class='del'>-	 * stop the codec and wait for good quality signal before</div><div class='del'>-	 * restarting it to avoid further problems</div><div class='del'>-	 *</div><div class='del'>-	 * In BUZ_MODE_MOTION_DECOMPRESS:</div><div class='del'>-	 *</div><div class='del'>-	 * Bad JPEG frame: we have to mark it as processed (codec crashed</div><div class='del'>-	 * and was not able to do it itself), and to remove it from queue.</div><div class='del'>-	 */</div><div class='del'>-	btand(~ZR36057_JMC_Go_en, ZR36057_JMC);</div><div class='del'>-	udelay(1);</div><div class='del'>-	stat = stat | (post_office_read(zr, 7, 0) &amp; 3) &lt;&lt; 8;</div><div class='del'>-	btwrite(0, ZR36057_JPC);</div><div class='del'>-	btor(ZR36057_MCTCR_CFlush, ZR36057_MCTCR);</div><div class='del'>-	jpeg_codec_reset(zr);</div><div class='del'>-	jpeg_codec_sleep(zr, 1);</div><div class='del'>-	zr-&gt;JPEG_error = 1;</div><div class='del'>-	zr-&gt;num_errors++;</div><div class='del'>-</div><div class='del'>-	/* Report error */</div><div class='del'>-	if (zr36067_debug &gt; 1 &amp;&amp; zr-&gt;num_errors &lt;= 8) {</div><div class='del'>-		long frame;</div><div class='del'>-		int j;</div><div class='del'>-</div><div class='del'>-		frame = zr-&gt;jpg_pend[zr-&gt;jpg_dma_tail &amp; BUZ_MASK_FRAME];</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: JPEG error stat=0x%08x(0x%08x) queue_state=%ld/%ld/%ld/%ld seq=%ld frame=%ld. Codec stopped. ",</div><div class='del'>-		       ZR_DEVNAME(zr), stat, zr-&gt;last_isr,</div><div class='del'>-		       zr-&gt;jpg_que_tail, zr-&gt;jpg_dma_tail,</div><div class='del'>-		       zr-&gt;jpg_dma_head, zr-&gt;jpg_que_head,</div><div class='del'>-		       zr-&gt;jpg_seq_num, frame);</div><div class='del'>-		printk(KERN_INFO "stat_com frames:");</div><div class='del'>-		for (j = 0; j &lt; BUZ_NUM_STAT_COM; j++) {</div><div class='del'>-			for (i = 0; i &lt; zr-&gt;jpg_buffers.num_buffers; i++) {</div><div class='del'>-				if (le32_to_cpu(zr-&gt;stat_com[j]) == zr-&gt;jpg_buffers.buffer[i].jpg.frag_tab_bus)</div><div class='del'>-					printk(KERN_CONT "% d-&gt;%d", j, i);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		printk(KERN_CONT "\n");</div><div class='del'>-	}</div><div class='del'>-	/* Find an entry in stat_com and rotate contents */</div><div class='del'>-	if (zr-&gt;jpg_settings.TmpDcm == 1)</div><div class='del'>-		i = (zr-&gt;jpg_dma_tail - zr-&gt;jpg_err_shift) &amp; BUZ_MASK_STAT_COM;</div><div class='del'>-	else</div><div class='del'>-		i = ((zr-&gt;jpg_dma_tail - zr-&gt;jpg_err_shift) &amp; 1) * 2;</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS) {</div><div class='del'>-		/* Mimic zr36067 operation */</div><div class='del'>-		zr-&gt;stat_com[i] |= cpu_to_le32(1);</div><div class='del'>-		if (zr-&gt;jpg_settings.TmpDcm != 1)</div><div class='del'>-			zr-&gt;stat_com[i + 1] |= cpu_to_le32(1);</div><div class='del'>-		/* Refill */</div><div class='del'>-		zoran_reap_stat_com(zr);</div><div class='del'>-		zoran_feed_stat_com(zr);</div><div class='del'>-		wake_up_interruptible(&amp;zr-&gt;jpg_capq);</div><div class='del'>-		/* Find an entry in stat_com again after refill */</div><div class='del'>-		if (zr-&gt;jpg_settings.TmpDcm == 1)</div><div class='del'>-			i = (zr-&gt;jpg_dma_tail - zr-&gt;jpg_err_shift) &amp; BUZ_MASK_STAT_COM;</div><div class='del'>-		else</div><div class='del'>-			i = ((zr-&gt;jpg_dma_tail - zr-&gt;jpg_err_shift) &amp; 1) * 2;</div><div class='del'>-	}</div><div class='del'>-	if (i) {</div><div class='del'>-		/* Rotate stat_comm entries to make current entry first */</div><div class='del'>-		int j;</div><div class='del'>-		__le32 bus_addr[BUZ_NUM_STAT_COM];</div><div class='del'>-</div><div class='del'>-		/* Here we are copying the stat_com array, which</div><div class='del'>-		 * is already in little endian format, so</div><div class='del'>-		 * no endian conversions here</div><div class='del'>-		 */</div><div class='del'>-		memcpy(bus_addr, zr-&gt;stat_com, sizeof(bus_addr));</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; BUZ_NUM_STAT_COM; j++)</div><div class='del'>-			zr-&gt;stat_com[j] = bus_addr[(i + j) &amp; BUZ_MASK_STAT_COM];</div><div class='del'>-</div><div class='del'>-		zr-&gt;jpg_err_shift += i;</div><div class='del'>-		zr-&gt;jpg_err_shift &amp;= BUZ_MASK_STAT_COM;</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_MOTION_COMPRESS)</div><div class='del'>-		zr-&gt;jpg_err_seq = zr-&gt;jpg_seq_num;	/* + 1; */</div><div class='del'>-	zoran_restart(zr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t</div><div class='del'>-zoran_irq (int             irq,</div><div class='del'>-	   void           *dev_id)</div><div class='del'>-{</div><div class='del'>-	u32 stat, astat;</div><div class='del'>-	int count;</div><div class='del'>-	struct zoran *zr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	zr = dev_id;</div><div class='del'>-	count = 0;</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;testing) {</div><div class='del'>-		/* Testing interrupts */</div><div class='del'>-		spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		while ((stat = count_reset_interrupt(zr))) {</div><div class='del'>-			if (count++ &gt; 100) {</div><div class='del'>-				btand(~ZR36057_ICR_IntPinEn, ZR36057_ICR);</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: IRQ lockup while testing, isr=0x%08x, cleared int mask\n",</div><div class='del'>-					ZR_DEVNAME(zr), stat);</div><div class='del'>-				wake_up_interruptible(&amp;zr-&gt;test_q);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		zr-&gt;last_isr = stat;</div><div class='del'>-		spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-	while (1) {</div><div class='del'>-		/* get/clear interrupt status bits */</div><div class='del'>-		stat = count_reset_interrupt(zr);</div><div class='del'>-		astat = stat &amp; IRQ_MASK;</div><div class='del'>-		if (!astat) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		dprintk(4,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"zoran_irq: astat: 0x%08x, mask: 0x%08x\n",</div><div class='del'>-			astat, btread(ZR36057_ICR));</div><div class='del'>-		if (astat &amp; zr-&gt;card.vsync_int) {	// SW</div><div class='del'>-</div><div class='del'>-			if (zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS ||</div><div class='del'>-			    zr-&gt;codec_mode == BUZ_MODE_MOTION_COMPRESS) {</div><div class='del'>-				/* count missed interrupts */</div><div class='del'>-				zr-&gt;JPEG_missed++;</div><div class='del'>-			}</div><div class='del'>-			//post_office_read(zr,1,0);</div><div class='del'>-			/* Interrupts may still happen when</div><div class='del'>-			 * zr-&gt;v4l_memgrab_active is switched off.</div><div class='del'>-			 * We simply ignore them */</div><div class='del'>-</div><div class='del'>-			if (zr-&gt;v4l_memgrab_active) {</div><div class='del'>-				/* A lot more checks should be here ... */</div><div class='del'>-				if ((btread(ZR36057_VSSFGR) &amp; ZR36057_VSSFGR_SnapShot) == 0)</div><div class='del'>-					dprintk(1,</div><div class='del'>-						KERN_WARNING</div><div class='del'>-						"%s: BuzIRQ with SnapShot off ???\n",</div><div class='del'>-						ZR_DEVNAME(zr));</div><div class='del'>-</div><div class='del'>-				if (zr-&gt;v4l_grab_frame != NO_GRAB_ACTIVE) {</div><div class='del'>-					/* There is a grab on a frame going on, check if it has finished */</div><div class='del'>-					if ((btread(ZR36057_VSSFGR) &amp; ZR36057_VSSFGR_FrameGrab) == 0) {</div><div class='del'>-						/* it is finished, notify the user */</div><div class='del'>-</div><div class='del'>-						zr-&gt;v4l_buffers.buffer[zr-&gt;v4l_grab_frame].state = BUZ_STATE_DONE;</div><div class='del'>-						zr-&gt;v4l_buffers.buffer[zr-&gt;v4l_grab_frame].bs.seq = zr-&gt;v4l_grab_seq;</div><div class='del'>-						zr-&gt;v4l_buffers.buffer[zr-&gt;v4l_grab_frame].bs.ts = ktime_get_ns();</div><div class='del'>-						zr-&gt;v4l_grab_frame = NO_GRAB_ACTIVE;</div><div class='del'>-						zr-&gt;v4l_pend_tail++;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (zr-&gt;v4l_grab_frame == NO_GRAB_ACTIVE)</div><div class='del'>-					wake_up_interruptible(&amp;zr-&gt;v4l_capq);</div><div class='del'>-</div><div class='del'>-				/* Check if there is another grab queued */</div><div class='del'>-</div><div class='del'>-				if (zr-&gt;v4l_grab_frame == NO_GRAB_ACTIVE &amp;&amp;</div><div class='del'>-				    zr-&gt;v4l_pend_tail != zr-&gt;v4l_pend_head) {</div><div class='del'>-					int frame = zr-&gt;v4l_pend[zr-&gt;v4l_pend_tail &amp; V4L_MASK_FRAME];</div><div class='del'>-					u32 reg;</div><div class='del'>-</div><div class='del'>-					zr-&gt;v4l_grab_frame = frame;</div><div class='del'>-</div><div class='del'>-					/* Set zr36057 video front end and enable video */</div><div class='del'>-</div><div class='del'>-					/* Buffer address */</div><div class='del'>-</div><div class='del'>-					reg = zr-&gt;v4l_buffers.buffer[frame].v4l.fbuffer_bus;</div><div class='del'>-					btwrite(reg, ZR36057_VDTR);</div><div class='del'>-					if (zr-&gt;v4l_settings.height &gt; BUZ_MAX_HEIGHT / 2)</div><div class='del'>-						reg += zr-&gt;v4l_settings.bytesperline;</div><div class='del'>-					btwrite(reg, ZR36057_VDBR);</div><div class='del'>-</div><div class='del'>-					/* video stride, status, and frame grab register */</div><div class='del'>-					reg = 0;</div><div class='del'>-					if (zr-&gt;v4l_settings.height &gt; BUZ_MAX_HEIGHT / 2)</div><div class='del'>-						reg += zr-&gt;v4l_settings.bytesperline;</div><div class='del'>-					reg = (reg &lt;&lt; ZR36057_VSSFGR_DispStride);</div><div class='del'>-					reg |= ZR36057_VSSFGR_VidOvf;</div><div class='del'>-					reg |= ZR36057_VSSFGR_SnapShot;</div><div class='del'>-					reg |= ZR36057_VSSFGR_FrameGrab;</div><div class='del'>-					btwrite(reg, ZR36057_VSSFGR);</div><div class='del'>-</div><div class='del'>-					btor(ZR36057_VDCR_VidEn,</div><div class='del'>-					     ZR36057_VDCR);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* even if we don't grab, we do want to increment</div><div class='del'>-			 * the sequence counter to see lost frames */</div><div class='del'>-			zr-&gt;v4l_grab_seq++;</div><div class='del'>-		}</div><div class='del'>-#if (IRQ_MASK &amp; ZR36057_ISR_CodRepIRQ)</div><div class='del'>-		if (astat &amp; ZR36057_ISR_CodRepIRQ) {</div><div class='del'>-			zr-&gt;intr_counter_CodRepIRQ++;</div><div class='del'>-			IDEBUG(printk(KERN_DEBUG "%s: ZR36057_ISR_CodRepIRQ\n",</div><div class='del'>-				ZR_DEVNAME(zr)));</div><div class='del'>-			btand(~ZR36057_ICR_CodRepIRQ, ZR36057_ICR);</div><div class='del'>-		}</div><div class='del'>-#endif				/* (IRQ_MASK &amp; ZR36057_ISR_CodRepIRQ) */</div><div class='del'>-</div><div class='del'>-#if (IRQ_MASK &amp; ZR36057_ISR_JPEGRepIRQ)</div><div class='del'>-		if ((astat &amp; ZR36057_ISR_JPEGRepIRQ) &amp;&amp;</div><div class='del'>-		    (zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS ||</div><div class='del'>-		     zr-&gt;codec_mode == BUZ_MODE_MOTION_COMPRESS)) {</div><div class='del'>-			if (zr36067_debug &gt; 1 &amp;&amp; (!zr-&gt;frame_num || zr-&gt;JPEG_error)) {</div><div class='del'>-				char sv[BUZ_NUM_STAT_COM + 1];</div><div class='del'>-				int i;</div><div class='del'>-</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-				       "%s: first frame ready: state=0x%08x odd_even=%d field_per_buff=%d delay=%d\n",</div><div class='del'>-				       ZR_DEVNAME(zr), stat,</div><div class='del'>-				       zr-&gt;jpg_settings.odd_even,</div><div class='del'>-				       zr-&gt;jpg_settings.field_per_buff,</div><div class='del'>-				       zr-&gt;JPEG_missed);</div><div class='del'>-</div><div class='del'>-				for (i = 0; i &lt; BUZ_NUM_STAT_COM; i++)</div><div class='del'>-					sv[i] = le32_to_cpu(zr-&gt;stat_com[i]) &amp; 1 ? '1' : '0';</div><div class='del'>-				sv[BUZ_NUM_STAT_COM] = 0;</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-				       "%s: stat_com=%s queue_state=%ld/%ld/%ld/%ld\n",</div><div class='del'>-				       ZR_DEVNAME(zr), sv,</div><div class='del'>-				       zr-&gt;jpg_que_tail,</div><div class='del'>-				       zr-&gt;jpg_dma_tail,</div><div class='del'>-				       zr-&gt;jpg_dma_head,</div><div class='del'>-				       zr-&gt;jpg_que_head);</div><div class='del'>-			} else {</div><div class='del'>-				/* Get statistics */</div><div class='del'>-				if (zr-&gt;JPEG_missed &gt; zr-&gt;JPEG_max_missed)</div><div class='del'>-					zr-&gt;JPEG_max_missed = zr-&gt;JPEG_missed;</div><div class='del'>-				if (zr-&gt;JPEG_missed &lt; zr-&gt;JPEG_min_missed)</div><div class='del'>-					zr-&gt;JPEG_min_missed = zr-&gt;JPEG_missed;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (zr36067_debug &gt; 2 &amp;&amp; zr-&gt;frame_num &lt; 6) {</div><div class='del'>-				int i;</div><div class='del'>-</div><div class='del'>-				printk(KERN_INFO "%s: seq=%ld stat_com:",</div><div class='del'>-				       ZR_DEVNAME(zr), zr-&gt;jpg_seq_num);</div><div class='del'>-				for (i = 0; i &lt; 4; i++) {</div><div class='del'>-					printk(KERN_CONT " %08x",</div><div class='del'>-					       le32_to_cpu(zr-&gt;stat_com[i]));</div><div class='del'>-				}</div><div class='del'>-				printk(KERN_CONT "\n");</div><div class='del'>-			}</div><div class='del'>-			zr-&gt;frame_num++;</div><div class='del'>-			zr-&gt;JPEG_missed = 0;</div><div class='del'>-			zr-&gt;JPEG_error = 0;</div><div class='del'>-			zoran_reap_stat_com(zr);</div><div class='del'>-			zoran_feed_stat_com(zr);</div><div class='del'>-			wake_up_interruptible(&amp;zr-&gt;jpg_capq);</div><div class='del'>-		}</div><div class='del'>-#endif				/* (IRQ_MASK &amp; ZR36057_ISR_JPEGRepIRQ) */</div><div class='del'>-</div><div class='del'>-		/* DATERR, too many fields missed, error processing */</div><div class='del'>-		if ((astat &amp; zr-&gt;card.jpeg_int) ||</div><div class='del'>-		    zr-&gt;JPEG_missed &gt; 25 ||</div><div class='del'>-		    zr-&gt;JPEG_error == 1	||</div><div class='del'>-		    ((zr-&gt;codec_mode == BUZ_MODE_MOTION_DECOMPRESS) &amp;&amp;</div><div class='del'>-		     (zr-&gt;frame_num &amp;&amp; (zr-&gt;JPEG_missed &gt; zr-&gt;jpg_settings.field_per_buff)))) {</div><div class='del'>-			error_handler(zr, astat, stat);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		count++;</div><div class='del'>-		if (count &gt; 10) {</div><div class='del'>-			dprintk(2, KERN_WARNING "%s: irq loop %d\n",</div><div class='del'>-				ZR_DEVNAME(zr), count);</div><div class='del'>-			if (count &gt; 20) {</div><div class='del'>-				btand(~ZR36057_ICR_IntPinEn, ZR36057_ICR);</div><div class='del'>-				dprintk(2,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: IRQ lockup, cleared int mask\n",</div><div class='del'>-					ZR_DEVNAME(zr));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		zr-&gt;last_isr = stat;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zoran_set_pci_master (struct zoran *zr,</div><div class='del'>-		      int           set_master)</div><div class='del'>-{</div><div class='del'>-	if (set_master) {</div><div class='del'>-		pci_set_master(zr-&gt;pci_dev);</div><div class='del'>-	} else {</div><div class='del'>-		u16 command;</div><div class='del'>-</div><div class='del'>-		pci_read_config_word(zr-&gt;pci_dev, PCI_COMMAND, &amp;command);</div><div class='del'>-		command &amp;= ~PCI_COMMAND_MASTER;</div><div class='del'>-		pci_write_config_word(zr-&gt;pci_dev, PCI_COMMAND, command);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zoran_init_hardware (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	/* Enable bus-mastering */</div><div class='del'>-	zoran_set_pci_master(zr, 1);</div><div class='del'>-</div><div class='del'>-	/* Initialize the board */</div><div class='del'>-	if (zr-&gt;card.init) {</div><div class='del'>-		zr-&gt;card.init(zr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	decoder_call(zr, core, init, 0);</div><div class='del'>-	decoder_call(zr, video, s_std, zr-&gt;norm);</div><div class='del'>-	decoder_call(zr, video, s_routing,</div><div class='del'>-		zr-&gt;card.input[zr-&gt;input].muxsel, 0, 0);</div><div class='del'>-</div><div class='del'>-	encoder_call(zr, core, init, 0);</div><div class='del'>-	encoder_call(zr, video, s_std_output, zr-&gt;norm);</div><div class='del'>-	encoder_call(zr, video, s_routing, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* toggle JPEG codec sleep to sync PLL */</div><div class='del'>-	jpeg_codec_sleep(zr, 1);</div><div class='del'>-	jpeg_codec_sleep(zr, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set individual interrupt enables (without GIRQ1)</div><div class='del'>-	 * but don't global enable until zoran_open()</div><div class='del'>-	 */</div><div class='del'>-	zr36057_init_vfe(zr);</div><div class='del'>-</div><div class='del'>-	zr36057_enable_jpg(zr, BUZ_MODE_IDLE);</div><div class='del'>-</div><div class='del'>-	btwrite(IRQ_MASK, ZR36057_ISR);	// Clears interrupts</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zr36057_restart (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	btwrite(0, ZR36057_SPGPPCR);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	btor(ZR36057_SPGPPCR_SoftReset, ZR36057_SPGPPCR);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	/* assert P_Reset */</div><div class='del'>-	btwrite(0, ZR36057_JPC);</div><div class='del'>-	/* set up GPIO direction - all output */</div><div class='del'>-	btwrite(ZR36057_SPGPPCR_SoftReset | 0, ZR36057_SPGPPCR);</div><div class='del'>-</div><div class='del'>-	/* set up GPIO pins and guest bus timing */</div><div class='del'>-	btwrite((0x81 &lt;&lt; 24) | 0x8888, ZR36057_GPPGCR1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize video front end</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36057_init_vfe (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	reg = btread(ZR36057_VFESPFR);</div><div class='del'>-	reg |= ZR36057_VFESPFR_LittleEndian;</div><div class='del'>-	reg &amp;= ~ZR36057_VFESPFR_VCLKPol;</div><div class='del'>-	reg |= ZR36057_VFESPFR_ExtFl;</div><div class='del'>-	reg |= ZR36057_VFESPFR_TopField;</div><div class='del'>-	btwrite(reg, ZR36057_VFESPFR);</div><div class='del'>-	reg = btread(ZR36057_VDCR);</div><div class='del'>-	if (pci_pci_problems &amp; PCIPCI_TRITON)</div><div class='del'>-		// || zr-&gt;revision &lt; 1) // Revision 1 has also Triton support</div><div class='del'>-		reg &amp;= ~ZR36057_VDCR_Triton;</div><div class='del'>-	else</div><div class='del'>-		reg |= ZR36057_VDCR_Triton;</div><div class='del'>-	btwrite(reg, ZR36057_VDCR);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_device.h b/drivers/staging/media/zoran/zoran_device.h<br/>deleted file mode 100644<br/>index a507aaad4ebb..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_device.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_device.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * This part handles card-specific data and detection</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Currently maintained by:</div><div class='del'>- *   Ronald Bultje    &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *   Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *   Mailinglist      &lt;mjpeg-users@lists.sf.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#ifndef __ZORAN_DEVICE_H__</div><div class='del'>-#define __ZORAN_DEVICE_H__</div><div class='del'>-</div><div class='del'>-/* general purpose I/O */</div><div class='del'>-extern void GPIO(struct zoran *zr,</div><div class='del'>-		 int bit,</div><div class='del'>-		 unsigned int value);</div><div class='del'>-</div><div class='del'>-/* codec (or actually: guest bus) access */</div><div class='del'>-extern int post_office_wait(struct zoran *zr);</div><div class='del'>-extern int post_office_write(struct zoran *zr,</div><div class='del'>-			     unsigned guest,</div><div class='del'>-			     unsigned reg,</div><div class='del'>-			     unsigned value);</div><div class='del'>-extern int post_office_read(struct zoran *zr,</div><div class='del'>-			    unsigned guest,</div><div class='del'>-			    unsigned reg);</div><div class='del'>-</div><div class='del'>-extern void detect_guest_activity(struct zoran *zr);</div><div class='del'>-</div><div class='del'>-extern void jpeg_codec_sleep(struct zoran *zr,</div><div class='del'>-			     int sleep);</div><div class='del'>-extern int jpeg_codec_reset(struct zoran *zr);</div><div class='del'>-</div><div class='del'>-/* zr360x7 access to raw capture */</div><div class='del'>-extern void zr36057_overlay(struct zoran *zr,</div><div class='del'>-			    int on);</div><div class='del'>-extern void write_overlay_mask(struct zoran_fh *fh,</div><div class='del'>-			       struct v4l2_clip *vp,</div><div class='del'>-			       int count);</div><div class='del'>-extern void zr36057_set_memgrab(struct zoran *zr,</div><div class='del'>-				int mode);</div><div class='del'>-extern int wait_grab_pending(struct zoran *zr);</div><div class='del'>-</div><div class='del'>-/* interrupts */</div><div class='del'>-extern void print_interrupts(struct zoran *zr);</div><div class='del'>-extern void clear_interrupt_counters(struct zoran *zr);</div><div class='del'>-extern irqreturn_t zoran_irq(int irq, void *dev_id);</div><div class='del'>-</div><div class='del'>-/* JPEG codec access */</div><div class='del'>-extern void jpeg_start(struct zoran *zr);</div><div class='del'>-extern void zr36057_enable_jpg(struct zoran *zr,</div><div class='del'>-			       enum zoran_codec_mode mode);</div><div class='del'>-extern void zoran_feed_stat_com(struct zoran *zr);</div><div class='del'>-</div><div class='del'>-/* general */</div><div class='del'>-extern void zoran_set_pci_master(struct zoran *zr,</div><div class='del'>-				 int set_master);</div><div class='del'>-extern void zoran_init_hardware(struct zoran *zr);</div><div class='del'>-extern void zr36057_restart(struct zoran *zr);</div><div class='del'>-</div><div class='del'>-extern const struct zoran_format zoran_formats[];</div><div class='del'>-</div><div class='del'>-extern int v4l_nbufs;</div><div class='del'>-extern int v4l_bufsize;</div><div class='del'>-extern int jpg_nbufs;</div><div class='del'>-extern int jpg_bufsize;</div><div class='del'>-extern int pass_through;</div><div class='del'>-</div><div class='del'>-/* i2c */</div><div class='del'>-#define decoder_call(zr, o, f, args...) \</div><div class='del'>-	v4l2_subdev_call(zr-&gt;decoder, o, f, ##args)</div><div class='del'>-#define encoder_call(zr, o, f, args...) \</div><div class='del'>-	v4l2_subdev_call(zr-&gt;encoder, o, f, ##args)</div><div class='del'>-</div><div class='del'>-#endif				/* __ZORAN_DEVICE_H__ */</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c<br/>deleted file mode 100644<br/>index 04f88f9d6bb4..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_driver.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_driver.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2850 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Changes for BUZ by Wolfgang Scherr &lt;scherr@net4you.net&gt;</div><div class='del'>- *</div><div class='del'>- * Changes for DC10/DC30 by Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *</div><div class='del'>- * Changes for LML33R10 by Maxim Yevtyushkin &lt;max@linuxmedialabs.com&gt;</div><div class='del'>- *</div><div class='del'>- * Changes for videodev2/v4l2 by Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *</div><div class='del'>- * Based on</div><div class='del'>- *</div><div class='del'>- * Miro DC10 driver</div><div class='del'>- * Copyright (C) 1999 Wolfgang Scherr &lt;scherr@net4you.net&gt;</div><div class='del'>- *</div><div class='del'>- * Iomega Buz driver version 1.0</div><div class='del'>- * Copyright (C) 1999 Rainer Johanni &lt;Rainer@Johanni.de&gt;</div><div class='del'>- *</div><div class='del'>- * buz.0.0.3</div><div class='del'>- * Copyright (C) 1998 Dave Perks &lt;dperks@ibm.net&gt;</div><div class='del'>- *</div><div class='del'>- * bttv - Bt848 frame grabber driver</div><div class='del'>- * Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)</div><div class='del'>- *                        &amp; Marcus Metzler (mocm@thp.uni-koeln.de)</div><div class='del'>- *</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, or</div><div class='del'>- * (at your option) any later version.</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'>-</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/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/videodev2.h&gt;</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='del'>-#include &lt;media/v4l2-ioctl.h&gt;</div><div class='del'>-#include &lt;media/v4l2-event.h&gt;</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include "zoran.h"</div><div class='del'>-#include "zoran_device.h"</div><div class='del'>-#include "zoran_card.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const struct zoran_format zoran_formats[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "15-bit RGB LE",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_RGB555,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 15,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB555|ZR36057_VFESPFR_ErrDif|</div><div class='del'>-			   ZR36057_VFESPFR_LittleEndian,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "15-bit RGB BE",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_RGB555X,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 15,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB555|ZR36057_VFESPFR_ErrDif,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "16-bit RGB LE",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 16,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB565|ZR36057_VFESPFR_ErrDif|</div><div class='del'>-			   ZR36057_VFESPFR_LittleEndian,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "16-bit RGB BE",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_RGB565X,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 16,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB565|ZR36057_VFESPFR_ErrDif,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "24-bit RGB",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_BGR24,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 24,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_Pack24,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "32-bit RGB LE",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_BGR32,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 32,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_LittleEndian,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "32-bit RGB BE",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_RGB32,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='del'>-		.depth = 32,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_RGB888,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "4:2:2, packed, YUYV",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_YUYV,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SMPTE170M,</div><div class='del'>-		.depth = 16,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_YUV422,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "4:2:2, packed, UYVY",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_UYVY,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SMPTE170M,</div><div class='del'>-		.depth = 16,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_OVERLAY,</div><div class='del'>-		.vfespfr = ZR36057_VFESPFR_YUV422|ZR36057_VFESPFR_LittleEndian,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "Hardware-encoded Motion-JPEG",</div><div class='del'>-		.fourcc = V4L2_PIX_FMT_MJPEG,</div><div class='del'>-		.colorspace = V4L2_COLORSPACE_SMPTE170M,</div><div class='del'>-		.depth = 0,</div><div class='del'>-		.flags = ZORAN_FORMAT_CAPTURE |</div><div class='del'>-			 ZORAN_FORMAT_PLAYBACK |</div><div class='del'>-			 ZORAN_FORMAT_COMPRESSED,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-#define NUM_FORMATS ARRAY_SIZE(zoran_formats)</div><div class='del'>-</div><div class='del'>-	/* small helper function for calculating buffersizes for v4l2</div><div class='del'>-	 * we calculate the nearest higher power-of-two, which</div><div class='del'>-	 * will be the recommended buffersize */</div><div class='del'>-static __u32</div><div class='del'>-zoran_v4l2_calc_bufsize (struct zoran_jpg_settings *settings)</div><div class='del'>-{</div><div class='del'>-	__u8 div = settings-&gt;VerDcm * settings-&gt;HorDcm * settings-&gt;TmpDcm;</div><div class='del'>-	__u32 num = (1024 * 512) / (div);</div><div class='del'>-	__u32 result = 2;</div><div class='del'>-</div><div class='del'>-	num--;</div><div class='del'>-	while (num) {</div><div class='del'>-		num &gt;&gt;= 1;</div><div class='del'>-		result &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (result &gt; jpg_bufsize)</div><div class='del'>-		return jpg_bufsize;</div><div class='del'>-	if (result &lt; 8192)</div><div class='del'>-		return 8192;</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* forward references */</div><div class='del'>-static void v4l_fbuffer_free(struct zoran_fh *fh);</div><div class='del'>-static void jpg_fbuffer_free(struct zoran_fh *fh);</div><div class='del'>-</div><div class='del'>-/* Set mapping mode */</div><div class='del'>-static void map_mode_raw(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	fh-&gt;map_mode = ZORAN_MAP_MODE_RAW;</div><div class='del'>-	fh-&gt;buffers.buffer_size = v4l_bufsize;</div><div class='del'>-	fh-&gt;buffers.num_buffers = v4l_nbufs;</div><div class='del'>-}</div><div class='del'>-static void map_mode_jpg(struct zoran_fh *fh, int play)</div><div class='del'>-{</div><div class='del'>-	fh-&gt;map_mode = play ? ZORAN_MAP_MODE_JPG_PLAY : ZORAN_MAP_MODE_JPG_REC;</div><div class='del'>-	fh-&gt;buffers.buffer_size = jpg_bufsize;</div><div class='del'>-	fh-&gt;buffers.num_buffers = jpg_nbufs;</div><div class='del'>-}</div><div class='del'>-static inline const char *mode_name(enum zoran_map_mode mode)</div><div class='del'>-{</div><div class='del'>-	return mode == ZORAN_MAP_MODE_RAW ? "V4L" : "JPG";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   Allocate the V4L grab buffers</div><div class='del'>- *</div><div class='del'>- *   These have to be pysically contiguous.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int v4l_fbuffer_alloc(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i, off;</div><div class='del'>-	unsigned char *mem;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; fh-&gt;buffers.num_buffers; i++) {</div><div class='del'>-		if (fh-&gt;buffers.buffer[i].v4l.fbuffer)</div><div class='del'>-			dprintk(2,</div><div class='del'>-				KERN_WARNING</div><div class='del'>-				"%s: %s - buffer %d already allocated!?\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, i);</div><div class='del'>-</div><div class='del'>-		//udelay(20);</div><div class='del'>-		mem = kmalloc(fh-&gt;buffers.buffer_size,</div><div class='del'>-			      GFP_KERNEL | __GFP_NOWARN);</div><div class='del'>-		if (!mem) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - kmalloc for V4L buf %d failed\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, i);</div><div class='del'>-			v4l_fbuffer_free(fh);</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		}</div><div class='del'>-		fh-&gt;buffers.buffer[i].v4l.fbuffer = mem;</div><div class='del'>-		fh-&gt;buffers.buffer[i].v4l.fbuffer_phys = virt_to_phys(mem);</div><div class='del'>-		fh-&gt;buffers.buffer[i].v4l.fbuffer_bus = virt_to_bus(mem);</div><div class='del'>-		for (off = 0; off &lt; fh-&gt;buffers.buffer_size;</div><div class='del'>-		     off += PAGE_SIZE)</div><div class='del'>-			SetPageReserved(virt_to_page(mem + off));</div><div class='del'>-		dprintk(4,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s: %s - V4L frame %d mem %p (bus: 0x%llx)\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, i, mem,</div><div class='del'>-			(unsigned long long)virt_to_bus(mem));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fh-&gt;buffers.allocated = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* free the V4L grab buffers */</div><div class='del'>-static void v4l_fbuffer_free(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i, off;</div><div class='del'>-	unsigned char *mem;</div><div class='del'>-</div><div class='del'>-	dprintk(4, KERN_INFO "%s: %s\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; fh-&gt;buffers.num_buffers; i++) {</div><div class='del'>-		if (!fh-&gt;buffers.buffer[i].v4l.fbuffer)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mem = fh-&gt;buffers.buffer[i].v4l.fbuffer;</div><div class='del'>-		for (off = 0; off &lt; fh-&gt;buffers.buffer_size;</div><div class='del'>-		     off += PAGE_SIZE)</div><div class='del'>-			ClearPageReserved(virt_to_page(mem + off));</div><div class='del'>-		kfree(fh-&gt;buffers.buffer[i].v4l.fbuffer);</div><div class='del'>-		fh-&gt;buffers.buffer[i].v4l.fbuffer = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fh-&gt;buffers.allocated = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   Allocate the MJPEG grab buffers.</div><div class='del'>- *</div><div class='del'>- *   If a Natoma chipset is present and this is a revision 1 zr36057,</div><div class='del'>- *   each MJPEG buffer needs to be physically contiguous.</div><div class='del'>- *   (RJ: This statement is from Dave Perks' original driver,</div><div class='del'>- *   I could never check it because I have a zr36067)</div><div class='del'>- *</div><div class='del'>- *   RJ: The contents grab buffers needs never be accessed in the driver.</div><div class='del'>- *       Therefore there is no need to allocate them with vmalloc in order</div><div class='del'>- *       to get a contiguous virtual memory space.</div><div class='del'>- *       I don't understand why many other drivers first allocate them with</div><div class='del'>- *       vmalloc (which uses internally also get_zeroed_page, but delivers you</div><div class='del'>- *       virtual addresses) and then again have to make a lot of efforts</div><div class='del'>- *       to get the physical address.</div><div class='del'>- *</div><div class='del'>- *   Ben Capper:</div><div class='del'>- *       On big-endian architectures (such as ppc) some extra steps</div><div class='del'>- *       are needed. When reading and writing to the stat_com array</div><div class='del'>- *       and fragment buffers, the device expects to see little-</div><div class='del'>- *       endian values. The use of cpu_to_le32() and le32_to_cpu()</div><div class='del'>- *       in this function (and one or two others in zoran_device.c)</div><div class='del'>- *       ensure that these values are always stored in little-endian</div><div class='del'>- *       form, regardless of architecture. The zr36057 does Very Bad</div><div class='del'>- *       Things on big endian architectures if the stat_com array</div><div class='del'>- *       and fragment buffers are not little-endian.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int jpg_fbuffer_alloc(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i, j, off;</div><div class='del'>-	u8 *mem;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; fh-&gt;buffers.num_buffers; i++) {</div><div class='del'>-		if (fh-&gt;buffers.buffer[i].jpg.frag_tab)</div><div class='del'>-			dprintk(2,</div><div class='del'>-				KERN_WARNING</div><div class='del'>-				"%s: %s - buffer %d already allocated!?\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, i);</div><div class='del'>-</div><div class='del'>-		/* Allocate fragment table for this buffer */</div><div class='del'>-</div><div class='del'>-		mem = (void *)get_zeroed_page(GFP_KERNEL);</div><div class='del'>-		if (!mem) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - get_zeroed_page (frag_tab) failed for buffer %d\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, i);</div><div class='del'>-			jpg_fbuffer_free(fh);</div><div class='del'>-			return -ENOBUFS;</div><div class='del'>-		}</div><div class='del'>-		fh-&gt;buffers.buffer[i].jpg.frag_tab = (__le32 *)mem;</div><div class='del'>-		fh-&gt;buffers.buffer[i].jpg.frag_tab_bus = virt_to_bus(mem);</div><div class='del'>-</div><div class='del'>-		if (fh-&gt;buffers.need_contiguous) {</div><div class='del'>-			mem = kmalloc(fh-&gt;buffers.buffer_size, GFP_KERNEL);</div><div class='del'>-			if (mem == NULL) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: %s - kmalloc failed for buffer %d\n",</div><div class='del'>-					ZR_DEVNAME(zr), __func__, i);</div><div class='del'>-				jpg_fbuffer_free(fh);</div><div class='del'>-				return -ENOBUFS;</div><div class='del'>-			}</div><div class='del'>-			fh-&gt;buffers.buffer[i].jpg.frag_tab[0] =</div><div class='del'>-				cpu_to_le32(virt_to_bus(mem));</div><div class='del'>-			fh-&gt;buffers.buffer[i].jpg.frag_tab[1] =</div><div class='del'>-				cpu_to_le32((fh-&gt;buffers.buffer_size &gt;&gt; 1) | 1);</div><div class='del'>-			for (off = 0; off &lt; fh-&gt;buffers.buffer_size; off += PAGE_SIZE)</div><div class='del'>-				SetPageReserved(virt_to_page(mem + off));</div><div class='del'>-		} else {</div><div class='del'>-			/* jpg_bufsize is already page aligned */</div><div class='del'>-			for (j = 0; j &lt; fh-&gt;buffers.buffer_size / PAGE_SIZE; j++) {</div><div class='del'>-				mem = (void *)get_zeroed_page(GFP_KERNEL);</div><div class='del'>-				if (mem == NULL) {</div><div class='del'>-					dprintk(1,</div><div class='del'>-						KERN_ERR</div><div class='del'>-						"%s: %s - get_zeroed_page failed for buffer %d\n",</div><div class='del'>-						ZR_DEVNAME(zr), __func__, i);</div><div class='del'>-					jpg_fbuffer_free(fh);</div><div class='del'>-					return -ENOBUFS;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				fh-&gt;buffers.buffer[i].jpg.frag_tab[2 * j] =</div><div class='del'>-					cpu_to_le32(virt_to_bus(mem));</div><div class='del'>-				fh-&gt;buffers.buffer[i].jpg.frag_tab[2 * j + 1] =</div><div class='del'>-					cpu_to_le32((PAGE_SIZE &gt;&gt; 2) &lt;&lt; 1);</div><div class='del'>-				SetPageReserved(virt_to_page(mem));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			fh-&gt;buffers.buffer[i].jpg.frag_tab[2 * j - 1] |= cpu_to_le32(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(4,</div><div class='del'>-		KERN_DEBUG "%s: %s - %d KB allocated\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__,</div><div class='del'>-		(fh-&gt;buffers.num_buffers * fh-&gt;buffers.buffer_size) &gt;&gt; 10);</div><div class='del'>-</div><div class='del'>-	fh-&gt;buffers.allocated = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* free the MJPEG grab buffers */</div><div class='del'>-static void jpg_fbuffer_free(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i, j, off;</div><div class='del'>-	unsigned char *mem;</div><div class='del'>-	__le32 frag_tab;</div><div class='del'>-	struct zoran_buffer *buffer;</div><div class='del'>-</div><div class='del'>-	dprintk(4, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	for (i = 0, buffer = &amp;fh-&gt;buffers.buffer[0];</div><div class='del'>-	     i &lt; fh-&gt;buffers.num_buffers; i++, buffer++) {</div><div class='del'>-		if (!buffer-&gt;jpg.frag_tab)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (fh-&gt;buffers.need_contiguous) {</div><div class='del'>-			frag_tab = buffer-&gt;jpg.frag_tab[0];</div><div class='del'>-</div><div class='del'>-			if (frag_tab) {</div><div class='del'>-				mem = bus_to_virt(le32_to_cpu(frag_tab));</div><div class='del'>-				for (off = 0; off &lt; fh-&gt;buffers.buffer_size; off += PAGE_SIZE)</div><div class='del'>-					ClearPageReserved(virt_to_page(mem + off));</div><div class='del'>-				kfree(mem);</div><div class='del'>-				buffer-&gt;jpg.frag_tab[0] = 0;</div><div class='del'>-				buffer-&gt;jpg.frag_tab[1] = 0;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			for (j = 0; j &lt; fh-&gt;buffers.buffer_size / PAGE_SIZE; j++) {</div><div class='del'>-				frag_tab = buffer-&gt;jpg.frag_tab[2 * j];</div><div class='del'>-</div><div class='del'>-				if (!frag_tab)</div><div class='del'>-					break;</div><div class='del'>-				ClearPageReserved(virt_to_page(bus_to_virt(le32_to_cpu(frag_tab))));</div><div class='del'>-				free_page((unsigned long)bus_to_virt(le32_to_cpu(frag_tab)));</div><div class='del'>-				buffer-&gt;jpg.frag_tab[2 * j] = 0;</div><div class='del'>-				buffer-&gt;jpg.frag_tab[2 * j + 1] = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		free_page((unsigned long)buffer-&gt;jpg.frag_tab);</div><div class='del'>-		buffer-&gt;jpg.frag_tab = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fh-&gt;buffers.allocated = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   V4L Buffer grabbing</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zoran_v4l_set_format (struct zoran_fh           *fh,</div><div class='del'>-		      int                        width,</div><div class='del'>-		      int                        height,</div><div class='del'>-		      const struct zoran_format *format)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int bpp;</div><div class='del'>-</div><div class='del'>-	/* Check size and format of the grab wanted */</div><div class='del'>-</div><div class='del'>-	if (height &lt; BUZ_MIN_HEIGHT || width &lt; BUZ_MIN_WIDTH ||</div><div class='del'>-	    height &gt; BUZ_MAX_HEIGHT || width &gt; BUZ_MAX_WIDTH) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - wrong frame size (%dx%d)\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, width, height);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bpp = (format-&gt;depth + 7) / 8;</div><div class='del'>-</div><div class='del'>-	/* Check against available buffer size */</div><div class='del'>-	if (height * width * bpp &gt; fh-&gt;buffers.buffer_size) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - video buffer size (%d kB) is too small\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, fh-&gt;buffers.buffer_size &gt;&gt; 10);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The video front end needs 4-byte alinged line sizes */</div><div class='del'>-</div><div class='del'>-	if ((bpp == 2 &amp;&amp; (width &amp; 1)) || (bpp == 3 &amp;&amp; (width &amp; 3))) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - wrong frame alignment\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fh-&gt;v4l_settings.width = width;</div><div class='del'>-	fh-&gt;v4l_settings.height = height;</div><div class='del'>-	fh-&gt;v4l_settings.format = format;</div><div class='del'>-	fh-&gt;v4l_settings.bytesperline = bpp * fh-&gt;v4l_settings.width;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_v4l_queue_frame(struct zoran_fh *fh, int num)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	if (!fh-&gt;buffers.allocated) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - buffers not yet allocated\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		res = -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No grabbing outside the buffer range! */</div><div class='del'>-	if (num &gt;= fh-&gt;buffers.num_buffers || num &lt; 0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - buffer %d is out of range\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, num);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.active == ZORAN_FREE) {</div><div class='del'>-		if (zr-&gt;v4l_buffers.active == ZORAN_FREE) {</div><div class='del'>-			zr-&gt;v4l_buffers = fh-&gt;buffers;</div><div class='del'>-			fh-&gt;buffers.active = ZORAN_ACTIVE;</div><div class='del'>-		} else {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - another session is already capturing\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			res = -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure a grab isn't going on currently with this buffer */</div><div class='del'>-	if (!res) {</div><div class='del'>-		switch (zr-&gt;v4l_buffers.buffer[num].state) {</div><div class='del'>-		default:</div><div class='del'>-		case BUZ_STATE_PEND:</div><div class='del'>-			if (zr-&gt;v4l_buffers.active == ZORAN_FREE) {</div><div class='del'>-				fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-				zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-			}</div><div class='del'>-			res = -EBUSY;	/* what are you doing? */</div><div class='del'>-			break;</div><div class='del'>-		case BUZ_STATE_DONE:</div><div class='del'>-			dprintk(2,</div><div class='del'>-				KERN_WARNING</div><div class='del'>-				"%s: %s - queueing buffer %d in state DONE!?\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, num);</div><div class='del'>-			/* fall through */</div><div class='del'>-		case BUZ_STATE_USER:</div><div class='del'>-			/* since there is at least one unused buffer there's room for at least</div><div class='del'>-			 * one more pend[] entry */</div><div class='del'>-			zr-&gt;v4l_pend[zr-&gt;v4l_pend_head++ &amp; V4L_MASK_FRAME] = num;</div><div class='del'>-			zr-&gt;v4l_buffers.buffer[num].state = BUZ_STATE_PEND;</div><div class='del'>-			zr-&gt;v4l_buffers.buffer[num].bs.length =</div><div class='del'>-			    fh-&gt;v4l_settings.bytesperline *</div><div class='del'>-			    zr-&gt;v4l_settings.height;</div><div class='del'>-			fh-&gt;buffers.buffer[num] = zr-&gt;v4l_buffers.buffer[num];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	if (!res &amp;&amp; zr-&gt;v4l_buffers.active == ZORAN_FREE)</div><div class='del'>-		zr-&gt;v4l_buffers.active = fh-&gt;buffers.active;</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sync on a V4L buffer</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int v4l_sync(struct zoran_fh *fh, int frame)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.active == ZORAN_FREE) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - no grab active for this session\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check passed-in frame number */</div><div class='del'>-	if (frame &gt;= fh-&gt;buffers.num_buffers || frame &lt; 0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "%s: %s - frame %d is invalid\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, frame);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if is buffer was queued at all */</div><div class='del'>-	if (zr-&gt;v4l_buffers.buffer[frame].state == BUZ_STATE_USER) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - attempt to sync on a buffer which was not queued?\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;zr-&gt;lock);</div><div class='del'>-	/* wait on this buffer to get ready */</div><div class='del'>-	if (!wait_event_interruptible_timeout(zr-&gt;v4l_capq,</div><div class='del'>-		(zr-&gt;v4l_buffers.buffer[frame].state != BUZ_STATE_PEND), 10*HZ)) {</div><div class='del'>-		mutex_lock(&amp;zr-&gt;lock);</div><div class='del'>-		return -ETIME;</div><div class='del'>-	}</div><div class='del'>-	mutex_lock(&amp;zr-&gt;lock);</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	/* buffer should now be in BUZ_STATE_DONE */</div><div class='del'>-	if (zr-&gt;v4l_buffers.buffer[frame].state != BUZ_STATE_DONE)</div><div class='del'>-		dprintk(2,</div><div class='del'>-			KERN_ERR "%s: %s - internal state error\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	zr-&gt;v4l_buffers.buffer[frame].state = BUZ_STATE_USER;</div><div class='del'>-	fh-&gt;buffers.buffer[frame] = zr-&gt;v4l_buffers.buffer[frame];</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	/* Check if streaming capture has finished */</div><div class='del'>-	if (zr-&gt;v4l_pend_tail == zr-&gt;v4l_pend_head) {</div><div class='del'>-		zr36057_set_memgrab(zr, 0);</div><div class='del'>-		if (zr-&gt;v4l_buffers.active == ZORAN_ACTIVE) {</div><div class='del'>-			fh-&gt;buffers.active = zr-&gt;v4l_buffers.active = ZORAN_FREE;</div><div class='del'>-			zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</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'>- *   Queue a MJPEG buffer for capture/playback</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int zoran_jpg_queue_frame(struct zoran_fh *fh, int num,</div><div class='del'>-				 enum zoran_codec_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	/* Check if buffers are allocated */</div><div class='del'>-	if (!fh-&gt;buffers.allocated) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - buffers not yet allocated\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No grabbing outside the buffer range! */</div><div class='del'>-	if (num &gt;= fh-&gt;buffers.num_buffers || num &lt; 0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - buffer %d out of range\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, num);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* what is the codec mode right now? */</div><div class='del'>-	if (zr-&gt;codec_mode == BUZ_MODE_IDLE) {</div><div class='del'>-		zr-&gt;jpg_settings = fh-&gt;jpg_settings;</div><div class='del'>-	} else if (zr-&gt;codec_mode != mode) {</div><div class='del'>-		/* wrong codec mode active - invalid */</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - codec in wrong mode\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.active == ZORAN_FREE) {</div><div class='del'>-		if (zr-&gt;jpg_buffers.active == ZORAN_FREE) {</div><div class='del'>-			zr-&gt;jpg_buffers = fh-&gt;buffers;</div><div class='del'>-			fh-&gt;buffers.active = ZORAN_ACTIVE;</div><div class='del'>-		} else {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - another session is already capturing\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			res = -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!res &amp;&amp; zr-&gt;codec_mode == BUZ_MODE_IDLE) {</div><div class='del'>-		/* Ok load up the jpeg codec */</div><div class='del'>-		zr36057_enable_jpg(zr, mode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	if (!res) {</div><div class='del'>-		switch (zr-&gt;jpg_buffers.buffer[num].state) {</div><div class='del'>-		case BUZ_STATE_DONE:</div><div class='del'>-			dprintk(2,</div><div class='del'>-				KERN_WARNING</div><div class='del'>-				"%s: %s - queuing frame in BUZ_STATE_DONE state!?\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			/* fall through */</div><div class='del'>-		case BUZ_STATE_USER:</div><div class='del'>-			/* since there is at least one unused buffer there's room for at</div><div class='del'>-			 *least one more pend[] entry */</div><div class='del'>-			zr-&gt;jpg_pend[zr-&gt;jpg_que_head++ &amp; BUZ_MASK_FRAME] = num;</div><div class='del'>-			zr-&gt;jpg_buffers.buffer[num].state = BUZ_STATE_PEND;</div><div class='del'>-			fh-&gt;buffers.buffer[num] = zr-&gt;jpg_buffers.buffer[num];</div><div class='del'>-			zoran_feed_stat_com(zr);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		case BUZ_STATE_DMA:</div><div class='del'>-		case BUZ_STATE_PEND:</div><div class='del'>-			if (zr-&gt;jpg_buffers.active == ZORAN_FREE) {</div><div class='del'>-				fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-				zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-			}</div><div class='del'>-			res = -EBUSY;	/* what are you doing? */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	if (!res &amp;&amp; zr-&gt;jpg_buffers.active == ZORAN_FREE)</div><div class='del'>-		zr-&gt;jpg_buffers.active = fh-&gt;buffers.active;</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int jpg_qbuf(struct zoran_fh *fh, int frame, enum zoran_codec_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	/* Does the user want to stop streaming? */</div><div class='del'>-	if (frame &lt; 0) {</div><div class='del'>-		if (zr-&gt;codec_mode == mode) {</div><div class='del'>-			if (fh-&gt;buffers.active == ZORAN_FREE) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: %s(-1) - session not active\n",</div><div class='del'>-					ZR_DEVNAME(zr), __func__);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			fh-&gt;buffers.active = zr-&gt;jpg_buffers.active = ZORAN_FREE;</div><div class='del'>-			zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-			zr36057_enable_jpg(zr, BUZ_MODE_IDLE);</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - stop streaming but not in streaming mode\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((res = zoran_jpg_queue_frame(fh, frame, mode)))</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	/* Start the jpeg codec when the first frame is queued  */</div><div class='del'>-	if (!res &amp;&amp; zr-&gt;jpg_que_head == 1)</div><div class='del'>-		jpeg_start(zr);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   Sync on a MJPEG buffer</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int jpg_sync(struct zoran_fh *fh, struct zoran_sync *bs)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int frame;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.active == ZORAN_FREE) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - capture is not currently active\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (zr-&gt;codec_mode != BUZ_MODE_MOTION_DECOMPRESS &amp;&amp;</div><div class='del'>-	    zr-&gt;codec_mode != BUZ_MODE_MOTION_COMPRESS) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - codec not in streaming mode\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;zr-&gt;lock);</div><div class='del'>-	if (!wait_event_interruptible_timeout(zr-&gt;jpg_capq,</div><div class='del'>-			(zr-&gt;jpg_que_tail != zr-&gt;jpg_dma_tail ||</div><div class='del'>-			 zr-&gt;jpg_dma_tail == zr-&gt;jpg_dma_head),</div><div class='del'>-			10*HZ)) {</div><div class='del'>-		int isr;</div><div class='del'>-</div><div class='del'>-		btand(~ZR36057_JMC_Go_en, ZR36057_JMC);</div><div class='del'>-		udelay(1);</div><div class='del'>-		zr-&gt;codec-&gt;control(zr-&gt;codec, CODEC_G_STATUS,</div><div class='del'>-					   sizeof(isr), &amp;isr);</div><div class='del'>-		mutex_lock(&amp;zr-&gt;lock);</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - timeout: codec isr=0x%02x\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, isr);</div><div class='del'>-</div><div class='del'>-		return -ETIME;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	mutex_lock(&amp;zr-&gt;lock);</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;jpg_dma_tail != zr-&gt;jpg_dma_head)</div><div class='del'>-		frame = zr-&gt;jpg_pend[zr-&gt;jpg_que_tail++ &amp; BUZ_MASK_FRAME];</div><div class='del'>-	else</div><div class='del'>-		frame = zr-&gt;jpg_pend[zr-&gt;jpg_que_tail &amp; BUZ_MASK_FRAME];</div><div class='del'>-</div><div class='del'>-	/* buffer should now be in BUZ_STATE_DONE */</div><div class='del'>-	if (zr-&gt;jpg_buffers.buffer[frame].state != BUZ_STATE_DONE)</div><div class='del'>-		dprintk(2,</div><div class='del'>-			KERN_ERR "%s: %s - internal state error\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	*bs = zr-&gt;jpg_buffers.buffer[frame].bs;</div><div class='del'>-	bs-&gt;frame = frame;</div><div class='del'>-	zr-&gt;jpg_buffers.buffer[frame].state = BUZ_STATE_USER;</div><div class='del'>-	fh-&gt;buffers.buffer[frame] = zr-&gt;jpg_buffers.buffer[frame];</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zoran_open_init_session(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	/* Per default, map the V4L Buffers */</div><div class='del'>-	map_mode_raw(fh);</div><div class='del'>-</div><div class='del'>-	/* take over the card's current settings */</div><div class='del'>-	fh-&gt;overlay_settings = zr-&gt;overlay_settings;</div><div class='del'>-	fh-&gt;overlay_settings.is_set = 0;</div><div class='del'>-	fh-&gt;overlay_settings.format = zr-&gt;overlay_settings.format;</div><div class='del'>-	fh-&gt;overlay_active = ZORAN_FREE;</div><div class='del'>-</div><div class='del'>-	/* v4l settings */</div><div class='del'>-	fh-&gt;v4l_settings = zr-&gt;v4l_settings;</div><div class='del'>-	/* jpg settings */</div><div class='del'>-	fh-&gt;jpg_settings = zr-&gt;jpg_settings;</div><div class='del'>-</div><div class='del'>-	/* buffers */</div><div class='del'>-	memset(&amp;fh-&gt;buffers, 0, sizeof(fh-&gt;buffers));</div><div class='del'>-	for (i = 0; i &lt; MAX_FRAME; i++) {</div><div class='del'>-		fh-&gt;buffers.buffer[i].state = BUZ_STATE_USER;	/* nothing going on */</div><div class='del'>-		fh-&gt;buffers.buffer[i].bs.frame = i;</div><div class='del'>-	}</div><div class='del'>-	fh-&gt;buffers.allocated = 0;</div><div class='del'>-	fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zoran_close_end_session(struct zoran_fh *fh)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	/* overlay */</div><div class='del'>-	if (fh-&gt;overlay_active != ZORAN_FREE) {</div><div class='del'>-		fh-&gt;overlay_active = zr-&gt;overlay_active = ZORAN_FREE;</div><div class='del'>-		zr-&gt;v4l_overlay_active = 0;</div><div class='del'>-		if (!zr-&gt;v4l_memgrab_active)</div><div class='del'>-			zr36057_overlay(zr, 0);</div><div class='del'>-		zr-&gt;overlay_mask = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode == ZORAN_MAP_MODE_RAW) {</div><div class='del'>-		/* v4l capture */</div><div class='del'>-		if (fh-&gt;buffers.active != ZORAN_FREE) {</div><div class='del'>-			unsigned long flags;</div><div class='del'>-</div><div class='del'>-			spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-			zr36057_set_memgrab(zr, 0);</div><div class='del'>-			zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-			zr-&gt;v4l_buffers.active = fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-			spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* v4l buffers */</div><div class='del'>-		if (fh-&gt;buffers.allocated)</div><div class='del'>-			v4l_fbuffer_free(fh);</div><div class='del'>-	} else {</div><div class='del'>-		/* jpg capture */</div><div class='del'>-		if (fh-&gt;buffers.active != ZORAN_FREE) {</div><div class='del'>-			zr36057_enable_jpg(zr, BUZ_MODE_IDLE);</div><div class='del'>-			zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-			zr-&gt;jpg_buffers.active = fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* jpg buffers */</div><div class='del'>-		if (fh-&gt;buffers.allocated)</div><div class='del'>-			jpg_fbuffer_free(fh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   Open a zoran card. Right now the flags stuff is just playing</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int zoran_open(struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = video_drvdata(file);</div><div class='del'>-	struct zoran_fh *fh;</div><div class='del'>-	int res, first_open = 0;</div><div class='del'>-</div><div class='del'>-	dprintk(2, KERN_INFO "%s: %s(%s, pid=[%d]), users(-)=%d\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__, current-&gt;comm, task_pid_nr(current), zr-&gt;user + 1);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;zr-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;user &gt;= 2048) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: too many users (%d) on device\n",</div><div class='del'>-			ZR_DEVNAME(zr), zr-&gt;user);</div><div class='del'>-		res = -EBUSY;</div><div class='del'>-		goto fail_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now, create the open()-specific file_ops struct */</div><div class='del'>-	fh = kzalloc(sizeof(struct zoran_fh), GFP_KERNEL);</div><div class='del'>-	if (!fh) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - allocation of zoran_fh failed\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		res = -ENOMEM;</div><div class='del'>-		goto fail_unlock;</div><div class='del'>-	}</div><div class='del'>-	v4l2_fh_init(&amp;fh-&gt;fh, video_devdata(file));</div><div class='del'>-</div><div class='del'>-	/* used to be BUZ_MAX_WIDTH/HEIGHT, but that gives overflows</div><div class='del'>-	 * on norm-change! */</div><div class='del'>-	fh-&gt;overlay_mask =</div><div class='del'>-	    kmalloc(array3_size((768 + 31) / 32, 576, 4), GFP_KERNEL);</div><div class='del'>-	if (!fh-&gt;overlay_mask) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - allocation of overlay_mask failed\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		res = -ENOMEM;</div><div class='del'>-		goto fail_fh;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;user++ == 0)</div><div class='del'>-		first_open = 1;</div><div class='del'>-</div><div class='del'>-	/* default setup - TODO: look at flags */</div><div class='del'>-	if (first_open) {	/* First device open */</div><div class='del'>-		zr36057_restart(zr);</div><div class='del'>-		zoran_open_init_params(zr);</div><div class='del'>-		zoran_init_hardware(zr);</div><div class='del'>-</div><div class='del'>-		btor(ZR36057_ICR_IntPinEn, ZR36057_ICR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set file_ops stuff */</div><div class='del'>-	file-&gt;private_data = fh;</div><div class='del'>-	fh-&gt;zr = zr;</div><div class='del'>-	zoran_open_init_session(fh);</div><div class='del'>-	v4l2_fh_add(&amp;fh-&gt;fh);</div><div class='del'>-	mutex_unlock(&amp;zr-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail_fh:</div><div class='del'>-	v4l2_fh_exit(&amp;fh-&gt;fh);</div><div class='del'>-	kfree(fh);</div><div class='del'>-fail_unlock:</div><div class='del'>-	mutex_unlock(&amp;zr-&gt;lock);</div><div class='del'>-</div><div class='del'>-	dprintk(2, KERN_INFO "%s: open failed (%d), users(-)=%d\n",</div><div class='del'>-		ZR_DEVNAME(zr), res, zr-&gt;user);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zoran_close(struct file  *file)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = file-&gt;private_data;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	dprintk(2, KERN_INFO "%s: %s(%s, pid=[%d]), users(+)=%d\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__, current-&gt;comm, task_pid_nr(current), zr-&gt;user - 1);</div><div class='del'>-</div><div class='del'>-	/* kernel locks (fs/device.c), so don't do that ourselves</div><div class='del'>-	 * (prevents deadlocks) */</div><div class='del'>-	mutex_lock(&amp;zr-&gt;lock);</div><div class='del'>-</div><div class='del'>-	zoran_close_end_session(fh);</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;user-- == 1) {	/* Last process */</div><div class='del'>-		/* Clean up JPEG process */</div><div class='del'>-		wake_up_interruptible(&amp;zr-&gt;jpg_capq);</div><div class='del'>-		zr36057_enable_jpg(zr, BUZ_MODE_IDLE);</div><div class='del'>-		zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-		zr-&gt;jpg_buffers.active = ZORAN_FREE;</div><div class='del'>-</div><div class='del'>-		/* disable interrupts */</div><div class='del'>-		btand(~ZR36057_ICR_IntPinEn, ZR36057_ICR);</div><div class='del'>-</div><div class='del'>-		if (zr36067_debug &gt; 1)</div><div class='del'>-			print_interrupts(zr);</div><div class='del'>-</div><div class='del'>-		/* Overlay off */</div><div class='del'>-		zr-&gt;v4l_overlay_active = 0;</div><div class='del'>-		zr36057_overlay(zr, 0);</div><div class='del'>-		zr-&gt;overlay_mask = NULL;</div><div class='del'>-</div><div class='del'>-		/* capture off */</div><div class='del'>-		wake_up_interruptible(&amp;zr-&gt;v4l_capq);</div><div class='del'>-		zr36057_set_memgrab(zr, 0);</div><div class='del'>-		zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-		zr-&gt;v4l_buffers.active = ZORAN_FREE;</div><div class='del'>-		zoran_set_pci_master(zr, 0);</div><div class='del'>-</div><div class='del'>-		if (!pass_through) {	/* Switch to color bar */</div><div class='del'>-			decoder_call(zr, video, s_stream, 0);</div><div class='del'>-			encoder_call(zr, video, s_routing, 2, 0, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;zr-&gt;lock);</div><div class='del'>-</div><div class='del'>-	v4l2_fh_del(&amp;fh-&gt;fh);</div><div class='del'>-	v4l2_fh_exit(&amp;fh-&gt;fh);</div><div class='del'>-	kfree(fh-&gt;overlay_mask);</div><div class='del'>-	kfree(fh);</div><div class='del'>-</div><div class='del'>-	dprintk(4, KERN_INFO "%s: %s done\n", ZR_DEVNAME(zr), __func__);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int setup_fbuffer(struct zoran_fh *fh,</div><div class='del'>-	       void                      *base,</div><div class='del'>-	       const struct zoran_format *fmt,</div><div class='del'>-	       int                        width,</div><div class='del'>-	       int                        height,</div><div class='del'>-	       int                        bytesperline)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	/* (Ronald) v4l/v4l2 guidelines */</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN) &amp;&amp; !capable(CAP_SYS_RAWIO))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	/* Don't allow frame buffer overlay if PCI or AGP is buggy, or on</div><div class='del'>-	   ALi Magik (that needs very low latency while the card needs a</div><div class='del'>-	   higher value always) */</div><div class='del'>-</div><div class='del'>-	if (pci_pci_problems &amp; (PCIPCI_FAIL | PCIAGP_FAIL | PCIPCI_ALIMAGIK))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	/* we need a bytesperline value, even if not given */</div><div class='del'>-	if (!bytesperline)</div><div class='del'>-		bytesperline = width * ((fmt-&gt;depth + 7) &amp; ~7) / 8;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (zr-&gt;overlay_active) {</div><div class='del'>-		/* dzjee... stupid users... don't even bother to turn off</div><div class='del'>-		 * overlay before changing the memory location...</div><div class='del'>-		 * normally, we would return errors here. However, one of</div><div class='del'>-		 * the tools that does this is... xawtv! and since xawtv</div><div class='del'>-		 * is used by +/- 99% of the users, we'd rather be user-</div><div class='del'>-		 * friendly and silently do as if nothing went wrong */</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - forced overlay turnoff because framebuffer changed\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		zr36057_overlay(zr, 0);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!(fmt-&gt;flags &amp; ZORAN_FORMAT_OVERLAY)) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - no valid overlay format given\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (height &lt;= 0 || width &lt;= 0 || bytesperline &lt;= 0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - invalid height/width/bpl value (%d|%d|%d)\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, width, height, bytesperline);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (bytesperline &amp; 3) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - bytesperline (%d) must be 4-byte aligned\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, bytesperline);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr-&gt;vbuf_base = (void *) ((unsigned long) base &amp; ~3);</div><div class='del'>-	zr-&gt;vbuf_height = height;</div><div class='del'>-	zr-&gt;vbuf_width = width;</div><div class='del'>-	zr-&gt;vbuf_depth = fmt-&gt;depth;</div><div class='del'>-	zr-&gt;overlay_settings.format = fmt;</div><div class='del'>-	zr-&gt;vbuf_bytesperline = bytesperline;</div><div class='del'>-</div><div class='del'>-	/* The user should set new window parameters */</div><div class='del'>-	zr-&gt;overlay_settings.is_set = 0;</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'>-static int setup_window(struct zoran_fh *fh,</div><div class='del'>-			int x,</div><div class='del'>-			int y,</div><div class='del'>-			int width,</div><div class='del'>-			int height,</div><div class='del'>-			struct v4l2_clip __user *clips,</div><div class='del'>-			unsigned int clipcount,</div><div class='del'>-			void __user *bitmap)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	struct v4l2_clip *vcp = NULL;</div><div class='del'>-	int on, end;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!zr-&gt;vbuf_base) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - frame buffer has to be set first\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!fh-&gt;overlay_settings.format) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - no overlay format set\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (clipcount &gt; 2048) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - invalid clipcount\n",</div><div class='del'>-			 ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The video front end needs 4-byte alinged line sizes, we correct that</div><div class='del'>-	 * silently here if necessary</div><div class='del'>-	 */</div><div class='del'>-	if (zr-&gt;vbuf_depth == 15 || zr-&gt;vbuf_depth == 16) {</div><div class='del'>-		end = (x + width) &amp; ~1;	/* round down */</div><div class='del'>-		x = (x + 1) &amp; ~1;	/* round up */</div><div class='del'>-		width = end - x;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;vbuf_depth == 24) {</div><div class='del'>-		end = (x + width) &amp; ~3;	/* round down */</div><div class='del'>-		x = (x + 3) &amp; ~3;	/* round up */</div><div class='del'>-		width = end - x;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (width &gt; BUZ_MAX_WIDTH)</div><div class='del'>-		width = BUZ_MAX_WIDTH;</div><div class='del'>-	if (height &gt; BUZ_MAX_HEIGHT)</div><div class='del'>-		height = BUZ_MAX_HEIGHT;</div><div class='del'>-</div><div class='del'>-	/* Check for invalid parameters */</div><div class='del'>-	if (width &lt; BUZ_MIN_WIDTH || height &lt; BUZ_MIN_HEIGHT ||</div><div class='del'>-	    width &gt; BUZ_MAX_WIDTH || height &gt; BUZ_MAX_HEIGHT) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - width = %d or height = %d invalid\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, width, height);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fh-&gt;overlay_settings.x = x;</div><div class='del'>-	fh-&gt;overlay_settings.y = y;</div><div class='del'>-	fh-&gt;overlay_settings.width = width;</div><div class='del'>-	fh-&gt;overlay_settings.height = height;</div><div class='del'>-	fh-&gt;overlay_settings.clipcount = clipcount;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If an overlay is running, we have to switch it off</div><div class='del'>-	 * and switch it on again in order to get the new settings in effect.</div><div class='del'>-	 *</div><div class='del'>-	 * We also want to avoid that the overlay mask is written</div><div class='del'>-	 * when an overlay is running.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	on = zr-&gt;v4l_overlay_active &amp;&amp; !zr-&gt;v4l_memgrab_active &amp;&amp;</div><div class='del'>-	    zr-&gt;overlay_active != ZORAN_FREE &amp;&amp;</div><div class='del'>-	    fh-&gt;overlay_active != ZORAN_FREE;</div><div class='del'>-	if (on)</div><div class='del'>-		zr36057_overlay(zr, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *   Write the overlay mask if clips are wanted.</div><div class='del'>-	 *   We prefer a bitmap.</div><div class='del'>-	 */</div><div class='del'>-	if (bitmap) {</div><div class='del'>-		/* fake value - it just means we want clips */</div><div class='del'>-		fh-&gt;overlay_settings.clipcount = 1;</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(fh-&gt;overlay_mask, bitmap,</div><div class='del'>-				   (width * height + 7) / 8)) {</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-	} else if (clipcount) {</div><div class='del'>-		/* write our own bitmap from the clips */</div><div class='del'>-		vcp = vmalloc(array_size(sizeof(struct v4l2_clip),</div><div class='del'>-					 clipcount + 4));</div><div class='del'>-		if (vcp == NULL) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - Alloc of clip mask failed\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user</div><div class='del'>-		    (vcp, clips, sizeof(struct v4l2_clip) * clipcount)) {</div><div class='del'>-			vfree(vcp);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		write_overlay_mask(fh, vcp, clipcount);</div><div class='del'>-		vfree(vcp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fh-&gt;overlay_settings.is_set = 1;</div><div class='del'>-	if (fh-&gt;overlay_active != ZORAN_FREE &amp;&amp;</div><div class='del'>-	    zr-&gt;overlay_active != ZORAN_FREE)</div><div class='del'>-		zr-&gt;overlay_settings = fh-&gt;overlay_settings;</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		zr36057_overlay(zr, 1);</div><div class='del'>-</div><div class='del'>-	/* Make sure the changes come into effect */</div><div class='del'>-	return wait_grab_pending(zr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int setup_overlay(struct zoran_fh *fh, int on)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	/* If there is nothing to do, return immediately */</div><div class='del'>-	if ((on &amp;&amp; fh-&gt;overlay_active != ZORAN_FREE) ||</div><div class='del'>-	    (!on &amp;&amp; fh-&gt;overlay_active == ZORAN_FREE))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check whether we're touching someone else's overlay */</div><div class='del'>-	if (on &amp;&amp; zr-&gt;overlay_active != ZORAN_FREE &amp;&amp;</div><div class='del'>-	    fh-&gt;overlay_active == ZORAN_FREE) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - overlay is already active for another session\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (!on &amp;&amp; zr-&gt;overlay_active != ZORAN_FREE &amp;&amp;</div><div class='del'>-	    fh-&gt;overlay_active == ZORAN_FREE) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - you cannot cancel someone else's session\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EPERM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (on == 0) {</div><div class='del'>-		zr-&gt;overlay_active = fh-&gt;overlay_active = ZORAN_FREE;</div><div class='del'>-		zr-&gt;v4l_overlay_active = 0;</div><div class='del'>-		/* When a grab is running, the video simply</div><div class='del'>-		 * won't be switched on any more */</div><div class='del'>-		if (!zr-&gt;v4l_memgrab_active)</div><div class='del'>-			zr36057_overlay(zr, 0);</div><div class='del'>-		zr-&gt;overlay_mask = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		if (!zr-&gt;vbuf_base || !fh-&gt;overlay_settings.is_set) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - buffer or window not set\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (!fh-&gt;overlay_settings.format) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - no overlay format set\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		zr-&gt;overlay_active = fh-&gt;overlay_active = ZORAN_LOCKED;</div><div class='del'>-		zr-&gt;v4l_overlay_active = 1;</div><div class='del'>-		zr-&gt;overlay_mask = fh-&gt;overlay_mask;</div><div class='del'>-		zr-&gt;overlay_settings = fh-&gt;overlay_settings;</div><div class='del'>-		if (!zr-&gt;v4l_memgrab_active)</div><div class='del'>-			zr36057_overlay(zr, 1);</div><div class='del'>-		/* When a grab is running, the video will be</div><div class='del'>-		 * switched on when grab is finished */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure the changes come into effect */</div><div class='del'>-	return wait_grab_pending(zr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get the status of a buffer in the clients buffer queue */</div><div class='del'>-static int zoran_v4l2_buffer_status(struct zoran_fh *fh,</div><div class='del'>-				    struct v4l2_buffer *buf, int num)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	buf-&gt;flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;</div><div class='del'>-</div><div class='del'>-	switch (fh-&gt;map_mode) {</div><div class='del'>-	case ZORAN_MAP_MODE_RAW:</div><div class='del'>-		/* check range */</div><div class='del'>-		if (num &lt; 0 || num &gt;= fh-&gt;buffers.num_buffers ||</div><div class='del'>-		    !fh-&gt;buffers.allocated) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - wrong number or buffers not allocated\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: %s() - raw active=%c, buffer %d: state=%c, map=%c\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__,</div><div class='del'>-			"FAL"[fh-&gt;buffers.active], num,</div><div class='del'>-			"UPMD"[zr-&gt;v4l_buffers.buffer[num].state],</div><div class='del'>-			fh-&gt;buffers.buffer[num].map ? 'Y' : 'N');</div><div class='del'>-		spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-		buf-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='del'>-		buf-&gt;length = fh-&gt;buffers.buffer_size;</div><div class='del'>-</div><div class='del'>-		/* get buffer */</div><div class='del'>-		buf-&gt;bytesused = fh-&gt;buffers.buffer[num].bs.length;</div><div class='del'>-		if (fh-&gt;buffers.buffer[num].state == BUZ_STATE_DONE ||</div><div class='del'>-		    fh-&gt;buffers.buffer[num].state == BUZ_STATE_USER) {</div><div class='del'>-			buf-&gt;sequence = fh-&gt;buffers.buffer[num].bs.seq;</div><div class='del'>-			buf-&gt;flags |= V4L2_BUF_FLAG_DONE;</div><div class='del'>-			buf-&gt;timestamp = ns_to_timeval(fh-&gt;buffers.buffer[num].bs.ts);</div><div class='del'>-		} else {</div><div class='del'>-			buf-&gt;flags |= V4L2_BUF_FLAG_QUEUED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fh-&gt;v4l_settings.height &lt;= BUZ_MAX_HEIGHT / 2)</div><div class='del'>-			buf-&gt;field = V4L2_FIELD_TOP;</div><div class='del'>-		else</div><div class='del'>-			buf-&gt;field = V4L2_FIELD_INTERLACED;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_REC:</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_PLAY:</div><div class='del'>-</div><div class='del'>-		/* check range */</div><div class='del'>-		if (num &lt; 0 || num &gt;= fh-&gt;buffers.num_buffers ||</div><div class='del'>-		    !fh-&gt;buffers.allocated) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s - wrong number or buffers not allocated\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		buf-&gt;type = (fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_REC) ?</div><div class='del'>-			      V4L2_BUF_TYPE_VIDEO_CAPTURE :</div><div class='del'>-			      V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='del'>-		buf-&gt;length = fh-&gt;buffers.buffer_size;</div><div class='del'>-</div><div class='del'>-		/* these variables are only written after frame has been captured */</div><div class='del'>-		if (fh-&gt;buffers.buffer[num].state == BUZ_STATE_DONE ||</div><div class='del'>-		    fh-&gt;buffers.buffer[num].state == BUZ_STATE_USER) {</div><div class='del'>-			buf-&gt;sequence = fh-&gt;buffers.buffer[num].bs.seq;</div><div class='del'>-			buf-&gt;timestamp = ns_to_timeval(fh-&gt;buffers.buffer[num].bs.ts);</div><div class='del'>-			buf-&gt;bytesused = fh-&gt;buffers.buffer[num].bs.length;</div><div class='del'>-			buf-&gt;flags |= V4L2_BUF_FLAG_DONE;</div><div class='del'>-		} else {</div><div class='del'>-			buf-&gt;flags |= V4L2_BUF_FLAG_QUEUED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* which fields are these? */</div><div class='del'>-		if (fh-&gt;jpg_settings.TmpDcm != 1)</div><div class='del'>-			buf-&gt;field = fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM;</div><div class='del'>-		else</div><div class='del'>-			buf-&gt;field = fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-</div><div class='del'>-		dprintk(5,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - invalid buffer type|map_mode (%d|%d)\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, buf-&gt;type, fh-&gt;map_mode);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf-&gt;memory = V4L2_MEMORY_MMAP;</div><div class='del'>-	buf-&gt;index = num;</div><div class='del'>-	buf-&gt;m.offset = buf-&gt;length * num;</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'>-zoran_set_norm (struct zoran *zr,</div><div class='del'>-		v4l2_std_id norm)</div><div class='del'>-{</div><div class='del'>-	int on;</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;v4l_buffers.active != ZORAN_FREE ||</div><div class='del'>-	    zr-&gt;jpg_buffers.active != ZORAN_FREE) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_WARNING</div><div class='del'>-			"%s: %s called while in playback/capture mode\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(norm &amp; zr-&gt;card.norms)) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "%s: %s - unsupported norm %llx\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, norm);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (norm &amp; V4L2_STD_SECAM)</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[2];</div><div class='del'>-	else if (norm &amp; V4L2_STD_NTSC)</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[1];</div><div class='del'>-	else</div><div class='del'>-		zr-&gt;timing = zr-&gt;card.tvn[0];</div><div class='del'>-</div><div class='del'>-	/* We switch overlay off and on since a change in the</div><div class='del'>-	 * norm needs different VFE settings */</div><div class='del'>-	on = zr-&gt;overlay_active &amp;&amp; !zr-&gt;v4l_memgrab_active;</div><div class='del'>-	if (on)</div><div class='del'>-		zr36057_overlay(zr, 0);</div><div class='del'>-</div><div class='del'>-	decoder_call(zr, video, s_std, norm);</div><div class='del'>-	encoder_call(zr, video, s_std_output, norm);</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		zr36057_overlay(zr, 1);</div><div class='del'>-</div><div class='del'>-	/* Make sure the changes come into effect */</div><div class='del'>-	zr-&gt;norm = norm;</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'>-zoran_set_input (struct zoran *zr,</div><div class='del'>-		 int           input)</div><div class='del'>-{</div><div class='del'>-	if (input == zr-&gt;input) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zr-&gt;v4l_buffers.active != ZORAN_FREE ||</div><div class='del'>-	    zr-&gt;jpg_buffers.active != ZORAN_FREE) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_WARNING</div><div class='del'>-			"%s: %s called while in playback/capture mode\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (input &lt; 0 || input &gt;= zr-&gt;card.inputs) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - unsupported input %d\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, input);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr-&gt;input = input;</div><div class='del'>-</div><div class='del'>-	decoder_call(zr, video, s_routing,</div><div class='del'>-			zr-&gt;card.input[input].muxsel, 0, 0);</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'>- *   ioctl routine</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability *cap)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	strscpy(cap-&gt;card, ZR_DEVNAME(zr), sizeof(cap-&gt;card));</div><div class='del'>-	strscpy(cap-&gt;driver, "zoran", sizeof(cap-&gt;driver));</div><div class='del'>-	snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info), "PCI:%s",</div><div class='del'>-		 pci_name(zr-&gt;pci_dev));</div><div class='del'>-	cap-&gt;device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE |</div><div class='del'>-			   V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OVERLAY;</div><div class='del'>-	cap-&gt;capabilities = cap-&gt;device_caps | V4L2_CAP_DEVICE_CAPS;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag)</div><div class='del'>-{</div><div class='del'>-	unsigned int num, i;</div><div class='del'>-</div><div class='del'>-	for (num = i = 0; i &lt; NUM_FORMATS; i++) {</div><div class='del'>-		if (zoran_formats[i].flags &amp; flag &amp;&amp; num++ == fmt-&gt;index) {</div><div class='del'>-			strncpy(fmt-&gt;description, zoran_formats[i].name,</div><div class='del'>-				sizeof(fmt-&gt;description) - 1);</div><div class='del'>-			/* fmt struct pre-zeroed, so adding '\0' not needed */</div><div class='del'>-			fmt-&gt;pixelformat = zoran_formats[i].fourcc;</div><div class='del'>-			if (zoran_formats[i].flags &amp; ZORAN_FORMAT_COMPRESSED)</div><div class='del'>-				fmt-&gt;flags |= V4L2_FMT_FLAG_COMPRESSED;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh,</div><div class='del'>-					    struct v4l2_fmtdesc *f)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	return zoran_enum_fmt(zr, f, ZORAN_FORMAT_CAPTURE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_enum_fmt_vid_out(struct file *file, void *__fh,</div><div class='del'>-					    struct v4l2_fmtdesc *f)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	return zoran_enum_fmt(zr, f, ZORAN_FORMAT_PLAYBACK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_enum_fmt_vid_overlay(struct file *file, void *__fh,</div><div class='del'>-					    struct v4l2_fmtdesc *f)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	return zoran_enum_fmt(zr, f, ZORAN_FORMAT_OVERLAY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_g_fmt_vid_out(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-</div><div class='del'>-	fmt-&gt;fmt.pix.width = fh-&gt;jpg_settings.img_width / fh-&gt;jpg_settings.HorDcm;</div><div class='del'>-	fmt-&gt;fmt.pix.height = fh-&gt;jpg_settings.img_height * 2 /</div><div class='del'>-		(fh-&gt;jpg_settings.VerDcm * fh-&gt;jpg_settings.TmpDcm);</div><div class='del'>-	fmt-&gt;fmt.pix.sizeimage = zoran_v4l2_calc_bufsize(&amp;fh-&gt;jpg_settings);</div><div class='del'>-	fmt-&gt;fmt.pix.pixelformat = V4L2_PIX_FMT_MJPEG;</div><div class='del'>-	if (fh-&gt;jpg_settings.TmpDcm == 1)</div><div class='del'>-		fmt-&gt;fmt.pix.field = (fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT);</div><div class='del'>-	else</div><div class='del'>-		fmt-&gt;fmt.pix.field = (fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);</div><div class='del'>-	fmt-&gt;fmt.pix.bytesperline = 0;</div><div class='del'>-	fmt-&gt;fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_g_fmt_vid_cap(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode != ZORAN_MAP_MODE_RAW)</div><div class='del'>-		return zoran_g_fmt_vid_out(file, fh, fmt);</div><div class='del'>-</div><div class='del'>-	fmt-&gt;fmt.pix.width = fh-&gt;v4l_settings.width;</div><div class='del'>-	fmt-&gt;fmt.pix.height = fh-&gt;v4l_settings.height;</div><div class='del'>-	fmt-&gt;fmt.pix.sizeimage = fh-&gt;v4l_settings.bytesperline *</div><div class='del'>-					fh-&gt;v4l_settings.height;</div><div class='del'>-	fmt-&gt;fmt.pix.pixelformat = fh-&gt;v4l_settings.format-&gt;fourcc;</div><div class='del'>-	fmt-&gt;fmt.pix.colorspace = fh-&gt;v4l_settings.format-&gt;colorspace;</div><div class='del'>-	fmt-&gt;fmt.pix.bytesperline = fh-&gt;v4l_settings.bytesperline;</div><div class='del'>-	if (BUZ_MAX_HEIGHT &lt; (fh-&gt;v4l_settings.height * 2))</div><div class='del'>-		fmt-&gt;fmt.pix.field = V4L2_FIELD_INTERLACED;</div><div class='del'>-	else</div><div class='del'>-		fmt-&gt;fmt.pix.field = V4L2_FIELD_TOP;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_g_fmt_vid_overlay(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	fmt-&gt;fmt.win.w.left = fh-&gt;overlay_settings.x;</div><div class='del'>-	fmt-&gt;fmt.win.w.top = fh-&gt;overlay_settings.y;</div><div class='del'>-	fmt-&gt;fmt.win.w.width = fh-&gt;overlay_settings.width;</div><div class='del'>-	fmt-&gt;fmt.win.w.height = fh-&gt;overlay_settings.height;</div><div class='del'>-	if (fh-&gt;overlay_settings.width * 2 &gt; BUZ_MAX_HEIGHT)</div><div class='del'>-		fmt-&gt;fmt.win.field = V4L2_FIELD_INTERLACED;</div><div class='del'>-	else</div><div class='del'>-		fmt-&gt;fmt.win.field = V4L2_FIELD_TOP;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_try_fmt_vid_overlay(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	if (fmt-&gt;fmt.win.w.width &gt; BUZ_MAX_WIDTH)</div><div class='del'>-		fmt-&gt;fmt.win.w.width = BUZ_MAX_WIDTH;</div><div class='del'>-	if (fmt-&gt;fmt.win.w.width &lt; BUZ_MIN_WIDTH)</div><div class='del'>-		fmt-&gt;fmt.win.w.width = BUZ_MIN_WIDTH;</div><div class='del'>-	if (fmt-&gt;fmt.win.w.height &gt; BUZ_MAX_HEIGHT)</div><div class='del'>-		fmt-&gt;fmt.win.w.height = BUZ_MAX_HEIGHT;</div><div class='del'>-	if (fmt-&gt;fmt.win.w.height &lt; BUZ_MIN_HEIGHT)</div><div class='del'>-		fmt-&gt;fmt.win.w.height = BUZ_MIN_HEIGHT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_try_fmt_vid_out(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	struct zoran_jpg_settings settings;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	if (fmt-&gt;fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	settings = fh-&gt;jpg_settings;</div><div class='del'>-</div><div class='del'>-	/* we actually need to set 'real' parameters now */</div><div class='del'>-	if ((fmt-&gt;fmt.pix.height * 2) &gt; BUZ_MAX_HEIGHT)</div><div class='del'>-		settings.TmpDcm = 1;</div><div class='del'>-	else</div><div class='del'>-		settings.TmpDcm = 2;</div><div class='del'>-	settings.decimation = 0;</div><div class='del'>-	if (fmt-&gt;fmt.pix.height &lt;= fh-&gt;jpg_settings.img_height / 2)</div><div class='del'>-		settings.VerDcm = 2;</div><div class='del'>-	else</div><div class='del'>-		settings.VerDcm = 1;</div><div class='del'>-	if (fmt-&gt;fmt.pix.width &lt;= fh-&gt;jpg_settings.img_width / 4)</div><div class='del'>-		settings.HorDcm = 4;</div><div class='del'>-	else if (fmt-&gt;fmt.pix.width &lt;= fh-&gt;jpg_settings.img_width / 2)</div><div class='del'>-		settings.HorDcm = 2;</div><div class='del'>-	else</div><div class='del'>-		settings.HorDcm = 1;</div><div class='del'>-	if (settings.TmpDcm == 1)</div><div class='del'>-		settings.field_per_buff = 2;</div><div class='del'>-	else</div><div class='del'>-		settings.field_per_buff = 1;</div><div class='del'>-</div><div class='del'>-	if (settings.HorDcm &gt; 1) {</div><div class='del'>-		settings.img_x = (BUZ_MAX_WIDTH == 720) ? 8 : 0;</div><div class='del'>-		settings.img_width = (BUZ_MAX_WIDTH == 720) ? 704 : BUZ_MAX_WIDTH;</div><div class='del'>-	} else {</div><div class='del'>-		settings.img_x = 0;</div><div class='del'>-		settings.img_width = BUZ_MAX_WIDTH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check */</div><div class='del'>-	res = zoran_check_jpg_settings(zr, &amp;settings, 1);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	/* tell the user what we actually did */</div><div class='del'>-	fmt-&gt;fmt.pix.width = settings.img_width / settings.HorDcm;</div><div class='del'>-	fmt-&gt;fmt.pix.height = settings.img_height * 2 /</div><div class='del'>-		(settings.TmpDcm * settings.VerDcm);</div><div class='del'>-	if (settings.TmpDcm == 1)</div><div class='del'>-		fmt-&gt;fmt.pix.field = (fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT);</div><div class='del'>-	else</div><div class='del'>-		fmt-&gt;fmt.pix.field = (fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);</div><div class='del'>-</div><div class='del'>-	fmt-&gt;fmt.pix.sizeimage = zoran_v4l2_calc_bufsize(&amp;settings);</div><div class='del'>-	fmt-&gt;fmt.pix.bytesperline = 0;</div><div class='del'>-	fmt-&gt;fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_try_fmt_vid_cap(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int bpp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (fmt-&gt;fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)</div><div class='del'>-		return zoran_try_fmt_vid_out(file, fh, fmt);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_FORMATS; i++)</div><div class='del'>-		if (zoran_formats[i].fourcc == fmt-&gt;fmt.pix.pixelformat)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (i == NUM_FORMATS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	bpp = DIV_ROUND_UP(zoran_formats[i].depth, 8);</div><div class='del'>-	v4l_bound_align_image(</div><div class='del'>-		&amp;fmt-&gt;fmt.pix.width, BUZ_MIN_WIDTH, BUZ_MAX_WIDTH, bpp == 2 ? 1 : 2,</div><div class='del'>-		&amp;fmt-&gt;fmt.pix.height, BUZ_MIN_HEIGHT, BUZ_MAX_HEIGHT, 0, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_fmt_vid_overlay(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	dprintk(3, "x=%d, y=%d, w=%d, h=%d, cnt=%d, map=0x%p\n",</div><div class='del'>-			fmt-&gt;fmt.win.w.left, fmt-&gt;fmt.win.w.top,</div><div class='del'>-			fmt-&gt;fmt.win.w.width,</div><div class='del'>-			fmt-&gt;fmt.win.w.height,</div><div class='del'>-			fmt-&gt;fmt.win.clipcount,</div><div class='del'>-			fmt-&gt;fmt.win.bitmap);</div><div class='del'>-	res = setup_window(fh, fmt-&gt;fmt.win.w.left, fmt-&gt;fmt.win.w.top,</div><div class='del'>-			   fmt-&gt;fmt.win.w.width, fmt-&gt;fmt.win.w.height,</div><div class='del'>-			   (struct v4l2_clip __user *)fmt-&gt;fmt.win.clips,</div><div class='del'>-			   fmt-&gt;fmt.win.clipcount, fmt-&gt;fmt.win.bitmap);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_fmt_vid_out(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	__le32 printformat = __cpu_to_le32(fmt-&gt;fmt.pix.pixelformat);</div><div class='del'>-	struct zoran_jpg_settings settings;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	dprintk(3, "size=%dx%d, fmt=0x%x (%4.4s)\n",</div><div class='del'>-			fmt-&gt;fmt.pix.width, fmt-&gt;fmt.pix.height,</div><div class='del'>-			fmt-&gt;fmt.pix.pixelformat,</div><div class='del'>-			(char *) &amp;printformat);</div><div class='del'>-	if (fmt-&gt;fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.allocated) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: VIDIOC_S_FMT - cannot change capture mode\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		res = -EBUSY;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	settings = fh-&gt;jpg_settings;</div><div class='del'>-</div><div class='del'>-	/* we actually need to set 'real' parameters now */</div><div class='del'>-	if (fmt-&gt;fmt.pix.height * 2 &gt; BUZ_MAX_HEIGHT)</div><div class='del'>-		settings.TmpDcm = 1;</div><div class='del'>-	else</div><div class='del'>-		settings.TmpDcm = 2;</div><div class='del'>-	settings.decimation = 0;</div><div class='del'>-	if (fmt-&gt;fmt.pix.height &lt;= fh-&gt;jpg_settings.img_height / 2)</div><div class='del'>-		settings.VerDcm = 2;</div><div class='del'>-	else</div><div class='del'>-		settings.VerDcm = 1;</div><div class='del'>-	if (fmt-&gt;fmt.pix.width &lt;= fh-&gt;jpg_settings.img_width / 4)</div><div class='del'>-		settings.HorDcm = 4;</div><div class='del'>-	else if (fmt-&gt;fmt.pix.width &lt;= fh-&gt;jpg_settings.img_width / 2)</div><div class='del'>-		settings.HorDcm = 2;</div><div class='del'>-	else</div><div class='del'>-		settings.HorDcm = 1;</div><div class='del'>-	if (settings.TmpDcm == 1)</div><div class='del'>-		settings.field_per_buff = 2;</div><div class='del'>-	else</div><div class='del'>-		settings.field_per_buff = 1;</div><div class='del'>-</div><div class='del'>-	if (settings.HorDcm &gt; 1) {</div><div class='del'>-		settings.img_x = (BUZ_MAX_WIDTH == 720) ? 8 : 0;</div><div class='del'>-		settings.img_width = (BUZ_MAX_WIDTH == 720) ? 704 : BUZ_MAX_WIDTH;</div><div class='del'>-	} else {</div><div class='del'>-		settings.img_x = 0;</div><div class='del'>-		settings.img_width = BUZ_MAX_WIDTH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check */</div><div class='del'>-	res = zoran_check_jpg_settings(zr, &amp;settings, 0);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	/* it's ok, so set them */</div><div class='del'>-	fh-&gt;jpg_settings = settings;</div><div class='del'>-</div><div class='del'>-	map_mode_jpg(fh, fmt-&gt;type == V4L2_BUF_TYPE_VIDEO_OUTPUT);</div><div class='del'>-	fh-&gt;buffers.buffer_size = zoran_v4l2_calc_bufsize(&amp;fh-&gt;jpg_settings);</div><div class='del'>-</div><div class='del'>-	/* tell the user what we actually did */</div><div class='del'>-	fmt-&gt;fmt.pix.width = settings.img_width / settings.HorDcm;</div><div class='del'>-	fmt-&gt;fmt.pix.height = settings.img_height * 2 /</div><div class='del'>-		(settings.TmpDcm * settings.VerDcm);</div><div class='del'>-	if (settings.TmpDcm == 1)</div><div class='del'>-		fmt-&gt;fmt.pix.field = (fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT);</div><div class='del'>-	else</div><div class='del'>-		fmt-&gt;fmt.pix.field = (fh-&gt;jpg_settings.odd_even ?</div><div class='del'>-				V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);</div><div class='del'>-	fmt-&gt;fmt.pix.bytesperline = 0;</div><div class='del'>-	fmt-&gt;fmt.pix.sizeimage = fh-&gt;buffers.buffer_size;</div><div class='del'>-	fmt-&gt;fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_fmt_vid_cap(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_format *fmt)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	if (fmt-&gt;fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)</div><div class='del'>-		return zoran_s_fmt_vid_out(file, fh, fmt);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_FORMATS; i++)</div><div class='del'>-		if (fmt-&gt;fmt.pix.pixelformat == zoran_formats[i].fourcc)</div><div class='del'>-			break;</div><div class='del'>-	if (i == NUM_FORMATS) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: VIDIOC_S_FMT - unknown/unsupported format 0x%x\n",</div><div class='del'>-			ZR_DEVNAME(zr), fmt-&gt;fmt.pix.pixelformat);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((fh-&gt;map_mode != ZORAN_MAP_MODE_RAW &amp;&amp; fh-&gt;buffers.allocated) ||</div><div class='del'>-	    fh-&gt;buffers.active != ZORAN_FREE) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: VIDIOC_S_FMT - cannot change capture mode\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-		res = -EBUSY;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	if (fmt-&gt;fmt.pix.height &gt; BUZ_MAX_HEIGHT)</div><div class='del'>-		fmt-&gt;fmt.pix.height = BUZ_MAX_HEIGHT;</div><div class='del'>-	if (fmt-&gt;fmt.pix.width &gt; BUZ_MAX_WIDTH)</div><div class='del'>-		fmt-&gt;fmt.pix.width = BUZ_MAX_WIDTH;</div><div class='del'>-</div><div class='del'>-	map_mode_raw(fh);</div><div class='del'>-</div><div class='del'>-	res = zoran_v4l_set_format(fh, fmt-&gt;fmt.pix.width, fmt-&gt;fmt.pix.height,</div><div class='del'>-				   &amp;zoran_formats[i]);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	/* tell the user the results/missing stuff */</div><div class='del'>-	fmt-&gt;fmt.pix.bytesperline = fh-&gt;v4l_settings.bytesperline;</div><div class='del'>-	fmt-&gt;fmt.pix.sizeimage = fh-&gt;v4l_settings.height * fh-&gt;v4l_settings.bytesperline;</div><div class='del'>-	fmt-&gt;fmt.pix.colorspace = fh-&gt;v4l_settings.format-&gt;colorspace;</div><div class='del'>-	if (BUZ_MAX_HEIGHT &lt; (fh-&gt;v4l_settings.height * 2))</div><div class='del'>-		fmt-&gt;fmt.pix.field = V4L2_FIELD_INTERLACED;</div><div class='del'>-	else</div><div class='del'>-		fmt-&gt;fmt.pix.field = V4L2_FIELD_TOP;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_g_fbuf(struct file *file, void *__fh,</div><div class='del'>-		struct v4l2_framebuffer *fb)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	memset(fb, 0, sizeof(*fb));</div><div class='del'>-	fb-&gt;base = zr-&gt;vbuf_base;</div><div class='del'>-	fb-&gt;fmt.width = zr-&gt;vbuf_width;</div><div class='del'>-	fb-&gt;fmt.height = zr-&gt;vbuf_height;</div><div class='del'>-	if (zr-&gt;overlay_settings.format)</div><div class='del'>-		fb-&gt;fmt.pixelformat = fh-&gt;overlay_settings.format-&gt;fourcc;</div><div class='del'>-	fb-&gt;fmt.bytesperline = zr-&gt;vbuf_bytesperline;</div><div class='del'>-	fb-&gt;fmt.colorspace = V4L2_COLORSPACE_SRGB;</div><div class='del'>-	fb-&gt;fmt.field = V4L2_FIELD_INTERLACED;</div><div class='del'>-	fb-&gt;capability = V4L2_FBUF_CAP_LIST_CLIPPING;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_fbuf(struct file *file, void *__fh,</div><div class='del'>-		const struct v4l2_framebuffer *fb)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i, res = 0;</div><div class='del'>-	__le32 printformat = __cpu_to_le32(fb-&gt;fmt.pixelformat);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_FORMATS; i++)</div><div class='del'>-		if (zoran_formats[i].fourcc == fb-&gt;fmt.pixelformat)</div><div class='del'>-			break;</div><div class='del'>-	if (i == NUM_FORMATS) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: VIDIOC_S_FBUF - format=0x%x (%4.4s) not allowed\n",</div><div class='del'>-			ZR_DEVNAME(zr), fb-&gt;fmt.pixelformat,</div><div class='del'>-			(char *)&amp;printformat);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = setup_fbuffer(fh, fb-&gt;base, &amp;zoran_formats[i], fb-&gt;fmt.width,</div><div class='del'>-			    fb-&gt;fmt.height, fb-&gt;fmt.bytesperline);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_overlay(struct file *file, void *__fh, unsigned int on)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	res = setup_overlay(fh, on);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_streamoff(struct file *file, void *__fh, enum v4l2_buf_type type);</div><div class='del'>-</div><div class='del'>-static int zoran_reqbufs(struct file *file, void *__fh, struct v4l2_requestbuffers *req)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	if (req-&gt;memory != V4L2_MEMORY_MMAP) {</div><div class='del'>-		dprintk(2,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: only MEMORY_MMAP capture is supported, not %d\n",</div><div class='del'>-				ZR_DEVNAME(zr), req-&gt;memory);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (req-&gt;count == 0)</div><div class='del'>-		return zoran_streamoff(file, fh, req-&gt;type);</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.allocated) {</div><div class='del'>-		dprintk(2,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: VIDIOC_REQBUFS - buffers already allocated\n",</div><div class='del'>-				ZR_DEVNAME(zr));</div><div class='del'>-		res = -EBUSY;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode == ZORAN_MAP_MODE_RAW &amp;&amp;</div><div class='del'>-	    req-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-		/* control user input */</div><div class='del'>-		if (req-&gt;count &lt; 2)</div><div class='del'>-			req-&gt;count = 2;</div><div class='del'>-		if (req-&gt;count &gt; v4l_nbufs)</div><div class='del'>-			req-&gt;count = v4l_nbufs;</div><div class='del'>-</div><div class='del'>-		/* The next mmap will map the V4L buffers */</div><div class='del'>-		map_mode_raw(fh);</div><div class='del'>-		fh-&gt;buffers.num_buffers = req-&gt;count;</div><div class='del'>-</div><div class='del'>-		if (v4l_fbuffer_alloc(fh)) {</div><div class='del'>-			res = -ENOMEM;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-	} else if (fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_REC ||</div><div class='del'>-		   fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_PLAY) {</div><div class='del'>-		/* we need to calculate size ourselves now */</div><div class='del'>-		if (req-&gt;count &lt; 4)</div><div class='del'>-			req-&gt;count = 4;</div><div class='del'>-		if (req-&gt;count &gt; jpg_nbufs)</div><div class='del'>-			req-&gt;count = jpg_nbufs;</div><div class='del'>-</div><div class='del'>-		/* The next mmap will map the MJPEG buffers */</div><div class='del'>-		map_mode_jpg(fh, req-&gt;type == V4L2_BUF_TYPE_VIDEO_OUTPUT);</div><div class='del'>-		fh-&gt;buffers.num_buffers = req-&gt;count;</div><div class='del'>-		fh-&gt;buffers.buffer_size = zoran_v4l2_calc_bufsize(&amp;fh-&gt;jpg_settings);</div><div class='del'>-</div><div class='del'>-		if (jpg_fbuffer_alloc(fh)) {</div><div class='del'>-			res = -ENOMEM;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: VIDIOC_REQBUFS - unknown type %d\n",</div><div class='del'>-				ZR_DEVNAME(zr), req-&gt;type);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	res = zoran_v4l2_buffer_status(fh, buf, buf-&gt;index);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_qbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0, codec_mode, buf_type;</div><div class='del'>-</div><div class='del'>-	switch (fh-&gt;map_mode) {</div><div class='del'>-	case ZORAN_MAP_MODE_RAW:</div><div class='del'>-		if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			dprintk(1, KERN_ERR</div><div class='del'>-				"%s: VIDIOC_QBUF - invalid buf-&gt;type=%d for map_mode=%d\n",</div><div class='del'>-				ZR_DEVNAME(zr), buf-&gt;type, fh-&gt;map_mode);</div><div class='del'>-			res = -EINVAL;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		res = zoran_v4l_queue_frame(fh, buf-&gt;index);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-		if (!zr-&gt;v4l_memgrab_active &amp;&amp; fh-&gt;buffers.active == ZORAN_LOCKED)</div><div class='del'>-			zr36057_set_memgrab(zr, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_REC:</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_PLAY:</div><div class='del'>-		if (fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_PLAY) {</div><div class='del'>-			buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='del'>-			codec_mode = BUZ_MODE_MOTION_DECOMPRESS;</div><div class='del'>-		} else {</div><div class='del'>-			buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='del'>-			codec_mode = BUZ_MODE_MOTION_COMPRESS;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (buf-&gt;type != buf_type) {</div><div class='del'>-			dprintk(1, KERN_ERR</div><div class='del'>-				"%s: VIDIOC_QBUF - invalid buf-&gt;type=%d for map_mode=%d\n",</div><div class='del'>-				ZR_DEVNAME(zr), buf-&gt;type, fh-&gt;map_mode);</div><div class='del'>-			res = -EINVAL;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		res = zoran_jpg_queue_frame(fh, buf-&gt;index, codec_mode);</div><div class='del'>-		if (res != 0)</div><div class='del'>-			return res;</div><div class='del'>-		if (zr-&gt;codec_mode == BUZ_MODE_IDLE &amp;&amp;</div><div class='del'>-		    fh-&gt;buffers.active == ZORAN_LOCKED)</div><div class='del'>-			zr36057_enable_jpg(zr, codec_mode);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1, KERN_ERR</div><div class='del'>-			"%s: VIDIOC_QBUF - unsupported type %d\n",</div><div class='del'>-			ZR_DEVNAME(zr), buf-&gt;type);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0, buf_type, num = -1;	/* compiler borks here (?) */</div><div class='del'>-</div><div class='del'>-	switch (fh-&gt;map_mode) {</div><div class='del'>-	case ZORAN_MAP_MODE_RAW:</div><div class='del'>-		if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			dprintk(1, KERN_ERR</div><div class='del'>-				"%s: VIDIOC_QBUF - invalid buf-&gt;type=%d for map_mode=%d\n",</div><div class='del'>-				ZR_DEVNAME(zr), buf-&gt;type, fh-&gt;map_mode);</div><div class='del'>-			res = -EINVAL;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		num = zr-&gt;v4l_pend[zr-&gt;v4l_sync_tail &amp; V4L_MASK_FRAME];</div><div class='del'>-		if (file-&gt;f_flags &amp; O_NONBLOCK &amp;&amp;</div><div class='del'>-		    zr-&gt;v4l_buffers.buffer[num].state != BUZ_STATE_DONE) {</div><div class='del'>-			res = -EAGAIN;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-		res = v4l_sync(fh, num);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-		zr-&gt;v4l_sync_tail++;</div><div class='del'>-		res = zoran_v4l2_buffer_status(fh, buf, num);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_REC:</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_PLAY:</div><div class='del'>-	{</div><div class='del'>-		struct zoran_sync bs;</div><div class='del'>-</div><div class='del'>-		if (fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_PLAY)</div><div class='del'>-			buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='del'>-		else</div><div class='del'>-			buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='del'>-</div><div class='del'>-		if (buf-&gt;type != buf_type) {</div><div class='del'>-			dprintk(1, KERN_ERR</div><div class='del'>-				"%s: VIDIOC_QBUF - invalid buf-&gt;type=%d for map_mode=%d\n",</div><div class='del'>-				ZR_DEVNAME(zr), buf-&gt;type, fh-&gt;map_mode);</div><div class='del'>-			res = -EINVAL;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		num = zr-&gt;jpg_pend[zr-&gt;jpg_que_tail &amp; BUZ_MASK_FRAME];</div><div class='del'>-</div><div class='del'>-		if (file-&gt;f_flags &amp; O_NONBLOCK &amp;&amp;</div><div class='del'>-		    zr-&gt;jpg_buffers.buffer[num].state != BUZ_STATE_DONE) {</div><div class='del'>-			res = -EAGAIN;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-		bs.frame = 0; /* suppress compiler warning */</div><div class='del'>-		res = jpg_sync(fh, &amp;bs);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-		res = zoran_v4l2_buffer_status(fh, buf, bs.frame);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1, KERN_ERR</div><div class='del'>-			"%s: VIDIOC_DQBUF - unsupported type %d\n",</div><div class='del'>-			ZR_DEVNAME(zr), buf-&gt;type);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_streamon(struct file *file, void *__fh, enum v4l2_buf_type type)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	switch (fh-&gt;map_mode) {</div><div class='del'>-	case ZORAN_MAP_MODE_RAW:	/* raw capture */</div><div class='del'>-		if (zr-&gt;v4l_buffers.active != ZORAN_ACTIVE ||</div><div class='del'>-		    fh-&gt;buffers.active != ZORAN_ACTIVE) {</div><div class='del'>-			res = -EBUSY;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		zr-&gt;v4l_buffers.active = fh-&gt;buffers.active = ZORAN_LOCKED;</div><div class='del'>-		zr-&gt;v4l_settings = fh-&gt;v4l_settings;</div><div class='del'>-</div><div class='del'>-		zr-&gt;v4l_sync_tail = zr-&gt;v4l_pend_tail;</div><div class='del'>-		if (!zr-&gt;v4l_memgrab_active &amp;&amp;</div><div class='del'>-		    zr-&gt;v4l_pend_head != zr-&gt;v4l_pend_tail) {</div><div class='del'>-			zr36057_set_memgrab(zr, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_REC:</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_PLAY:</div><div class='del'>-		/* what is the codec mode right now? */</div><div class='del'>-		if (zr-&gt;jpg_buffers.active != ZORAN_ACTIVE ||</div><div class='del'>-		    fh-&gt;buffers.active != ZORAN_ACTIVE) {</div><div class='del'>-			res = -EBUSY;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		zr-&gt;jpg_buffers.active = fh-&gt;buffers.active = ZORAN_LOCKED;</div><div class='del'>-</div><div class='del'>-		if (zr-&gt;jpg_que_head != zr-&gt;jpg_que_tail) {</div><div class='del'>-			/* Start the jpeg codec when the first frame is queued  */</div><div class='del'>-			jpeg_start(zr);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: VIDIOC_STREAMON - invalid map mode %d\n",</div><div class='del'>-			ZR_DEVNAME(zr), fh-&gt;map_mode);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_streamoff(struct file *file, void *__fh, enum v4l2_buf_type type)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i, res = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	switch (fh-&gt;map_mode) {</div><div class='del'>-	case ZORAN_MAP_MODE_RAW:	/* raw capture */</div><div class='del'>-		if (fh-&gt;buffers.active == ZORAN_FREE &amp;&amp;</div><div class='del'>-		    zr-&gt;v4l_buffers.active != ZORAN_FREE) {</div><div class='del'>-			res = -EPERM;	/* stay off other's settings! */</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-		if (zr-&gt;v4l_buffers.active == ZORAN_FREE)</div><div class='del'>-			return res;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		/* unload capture */</div><div class='del'>-		if (zr-&gt;v4l_memgrab_active) {</div><div class='del'>-</div><div class='del'>-			zr36057_set_memgrab(zr, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; fh-&gt;buffers.num_buffers; i++)</div><div class='del'>-			zr-&gt;v4l_buffers.buffer[i].state = BUZ_STATE_USER;</div><div class='del'>-		fh-&gt;buffers = zr-&gt;v4l_buffers;</div><div class='del'>-</div><div class='del'>-		zr-&gt;v4l_buffers.active = fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-</div><div class='del'>-		zr-&gt;v4l_grab_seq = 0;</div><div class='del'>-		zr-&gt;v4l_pend_head = zr-&gt;v4l_pend_tail = 0;</div><div class='del'>-		zr-&gt;v4l_sync_tail = 0;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_REC:</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_PLAY:</div><div class='del'>-		if (fh-&gt;buffers.active == ZORAN_FREE &amp;&amp;</div><div class='del'>-		    zr-&gt;jpg_buffers.active != ZORAN_FREE) {</div><div class='del'>-			res = -EPERM;	/* stay off other's settings! */</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-		if (zr-&gt;jpg_buffers.active == ZORAN_FREE)</div><div class='del'>-			return res;</div><div class='del'>-</div><div class='del'>-		res = jpg_qbuf(fh, -1,</div><div class='del'>-			     (fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_REC) ?</div><div class='del'>-			     BUZ_MODE_MOTION_COMPRESS :</div><div class='del'>-			     BUZ_MODE_MOTION_DECOMPRESS);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1, KERN_ERR</div><div class='del'>-			"%s: VIDIOC_STREAMOFF - invalid map mode %d\n",</div><div class='del'>-			ZR_DEVNAME(zr), fh-&gt;map_mode);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	*std = zr-&gt;norm;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	res = zoran_set_norm(zr, std);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	res = wait_grab_pending(zr);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_enum_input(struct file *file, void *__fh,</div><div class='del'>-				 struct v4l2_input *inp)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	if (inp-&gt;index &gt;= zr-&gt;card.inputs)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	strncpy(inp-&gt;name, zr-&gt;card.input[inp-&gt;index].name,</div><div class='del'>-		sizeof(inp-&gt;name) - 1);</div><div class='del'>-	inp-&gt;type = V4L2_INPUT_TYPE_CAMERA;</div><div class='del'>-	inp-&gt;std = V4L2_STD_ALL;</div><div class='del'>-</div><div class='del'>-	/* Get status of video decoder */</div><div class='del'>-	decoder_call(zr, video, g_input_status, &amp;inp-&gt;status);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_g_input(struct file *file, void *__fh, unsigned int *input)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	*input = zr-&gt;input;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_input(struct file *file, void *__fh, unsigned int input)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	res = zoran_set_input(zr, input);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	/* Make sure the changes come into effect */</div><div class='del'>-	res = wait_grab_pending(zr);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_enum_output(struct file *file, void *__fh,</div><div class='del'>-				  struct v4l2_output *outp)</div><div class='del'>-{</div><div class='del'>-	if (outp-&gt;index != 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	outp-&gt;index = 0;</div><div class='del'>-	outp-&gt;type = V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY;</div><div class='del'>-	strncpy(outp-&gt;name, "Autodetect", sizeof(outp-&gt;name)-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 zoran_g_output(struct file *file, void *__fh, unsigned int *output)</div><div class='del'>-{</div><div class='del'>-	*output = 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 zoran_s_output(struct file *file, void *__fh, unsigned int output)</div><div class='del'>-{</div><div class='del'>-	if (output != 0)</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'>-/* cropping (sub-frame capture) */</div><div class='del'>-static int zoran_g_selection(struct file *file, void *__fh, struct v4l2_selection *sel)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-</div><div class='del'>-	if (sel-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='del'>-	    sel-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode == ZORAN_MAP_MODE_RAW) {</div><div class='del'>-		dprintk(1, KERN_ERR</div><div class='del'>-			"%s: VIDIOC_G_SELECTION - subcapture only supported for compressed capture\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (sel-&gt;target) {</div><div class='del'>-	case V4L2_SEL_TGT_CROP:</div><div class='del'>-		sel-&gt;r.top = fh-&gt;jpg_settings.img_y;</div><div class='del'>-		sel-&gt;r.left = fh-&gt;jpg_settings.img_x;</div><div class='del'>-		sel-&gt;r.width = fh-&gt;jpg_settings.img_width;</div><div class='del'>-		sel-&gt;r.height = fh-&gt;jpg_settings.img_height;</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_SEL_TGT_CROP_DEFAULT:</div><div class='del'>-		sel-&gt;r.top = sel-&gt;r.left = 0;</div><div class='del'>-		sel-&gt;r.width = BUZ_MIN_WIDTH;</div><div class='del'>-		sel-&gt;r.height = BUZ_MIN_HEIGHT;</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_SEL_TGT_CROP_BOUNDS:</div><div class='del'>-		sel-&gt;r.top = sel-&gt;r.left = 0;</div><div class='del'>-		sel-&gt;r.width = BUZ_MAX_WIDTH;</div><div class='del'>-		sel-&gt;r.height = BUZ_MAX_HEIGHT;</div><div class='del'>-		break;</div><div class='del'>-	default:</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 zoran_s_selection(struct file *file, void *__fh, struct v4l2_selection *sel)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	struct zoran_jpg_settings settings;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	if (sel-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='del'>-	    sel-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (sel-&gt;target != V4L2_SEL_TGT_CROP)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode == ZORAN_MAP_MODE_RAW) {</div><div class='del'>-		dprintk(1, KERN_ERR</div><div class='del'>-			"%s: VIDIOC_S_SELECTION - subcapture only supported for compressed capture\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	settings = fh-&gt;jpg_settings;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.allocated) {</div><div class='del'>-		dprintk(1, KERN_ERR</div><div class='del'>-			"%s: VIDIOC_S_SELECTION - cannot change settings while active\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* move into a form that we understand */</div><div class='del'>-	settings.img_x = sel-&gt;r.left;</div><div class='del'>-	settings.img_y = sel-&gt;r.top;</div><div class='del'>-	settings.img_width = sel-&gt;r.width;</div><div class='del'>-	settings.img_height = sel-&gt;r.height;</div><div class='del'>-</div><div class='del'>-	/* check validity */</div><div class='del'>-	res = zoran_check_jpg_settings(zr, &amp;settings, 0);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	/* accept */</div><div class='del'>-	fh-&gt;jpg_settings = settings;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_g_jpegcomp(struct file *file, void *__fh,</div><div class='del'>-					struct v4l2_jpegcompression *params)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	memset(params, 0, sizeof(*params));</div><div class='del'>-</div><div class='del'>-	params-&gt;quality = fh-&gt;jpg_settings.jpg_comp.quality;</div><div class='del'>-	params-&gt;APPn = fh-&gt;jpg_settings.jpg_comp.APPn;</div><div class='del'>-	memcpy(params-&gt;APP_data,</div><div class='del'>-	       fh-&gt;jpg_settings.jpg_comp.APP_data,</div><div class='del'>-	       fh-&gt;jpg_settings.jpg_comp.APP_len);</div><div class='del'>-	params-&gt;APP_len = fh-&gt;jpg_settings.jpg_comp.APP_len;</div><div class='del'>-	memcpy(params-&gt;COM_data,</div><div class='del'>-	       fh-&gt;jpg_settings.jpg_comp.COM_data,</div><div class='del'>-	       fh-&gt;jpg_settings.jpg_comp.COM_len);</div><div class='del'>-	params-&gt;COM_len = fh-&gt;jpg_settings.jpg_comp.COM_len;</div><div class='del'>-	params-&gt;jpeg_markers =</div><div class='del'>-	    fh-&gt;jpg_settings.jpg_comp.jpeg_markers;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_s_jpegcomp(struct file *file, void *__fh,</div><div class='del'>-					const struct v4l2_jpegcompression *params)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = __fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int res = 0;</div><div class='del'>-	struct zoran_jpg_settings settings;</div><div class='del'>-</div><div class='del'>-	settings = fh-&gt;jpg_settings;</div><div class='del'>-</div><div class='del'>-	settings.jpg_comp = *params;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;buffers.active != ZORAN_FREE) {</div><div class='del'>-		dprintk(1, KERN_WARNING</div><div class='del'>-			"%s: VIDIOC_S_JPEGCOMP called while in playback/capture mode\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		res = -EBUSY;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = zoran_check_jpg_settings(zr, &amp;settings, 0);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-	if (!fh-&gt;buffers.allocated)</div><div class='del'>-		fh-&gt;buffers.buffer_size =</div><div class='del'>-			zoran_v4l2_calc_bufsize(&amp;fh-&gt;jpg_settings);</div><div class='del'>-	fh-&gt;jpg_settings.jpg_comp = settings.jpg_comp;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __poll_t</div><div class='del'>-zoran_poll (struct file *file,</div><div class='del'>-	    poll_table  *wait)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = file-&gt;private_data;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	__poll_t res = v4l2_ctrl_poll(file, wait);</div><div class='del'>-	int frame;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* we should check whether buffers are ready to be synced on</div><div class='del'>-	 * (w/o waits - O_NONBLOCK) here</div><div class='del'>-	 * if ready for read (sync), return EPOLLIN|EPOLLRDNORM,</div><div class='del'>-	 * if ready for write (sync), return EPOLLOUT|EPOLLWRNORM,</div><div class='del'>-	 * if error, return EPOLLERR,</div><div class='del'>-	 * if no buffers queued or so, return EPOLLNVAL</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (fh-&gt;map_mode) {</div><div class='del'>-	case ZORAN_MAP_MODE_RAW:</div><div class='del'>-		poll_wait(file, &amp;zr-&gt;v4l_capq, wait);</div><div class='del'>-		frame = zr-&gt;v4l_pend[zr-&gt;v4l_sync_tail &amp; V4L_MASK_FRAME];</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: %s() raw - active=%c, sync_tail=%lu/%c, pend_tail=%lu, pend_head=%lu\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__,</div><div class='del'>-			"FAL"[fh-&gt;buffers.active], zr-&gt;v4l_sync_tail,</div><div class='del'>-			"UPMD"[zr-&gt;v4l_buffers.buffer[frame].state],</div><div class='del'>-			zr-&gt;v4l_pend_tail, zr-&gt;v4l_pend_head);</div><div class='del'>-		/* Process is the one capturing? */</div><div class='del'>-		if (fh-&gt;buffers.active != ZORAN_FREE &amp;&amp;</div><div class='del'>-		    /* Buffer ready to DQBUF? */</div><div class='del'>-		    zr-&gt;v4l_buffers.buffer[frame].state == BUZ_STATE_DONE)</div><div class='del'>-			res |= EPOLLIN | EPOLLRDNORM;</div><div class='del'>-		spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_REC:</div><div class='del'>-	case ZORAN_MAP_MODE_JPG_PLAY:</div><div class='del'>-		poll_wait(file, &amp;zr-&gt;jpg_capq, wait);</div><div class='del'>-		frame = zr-&gt;jpg_pend[zr-&gt;jpg_que_tail &amp; BUZ_MASK_FRAME];</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		dprintk(3,</div><div class='del'>-			KERN_DEBUG</div><div class='del'>-			"%s: %s() jpg - active=%c, que_tail=%lu/%c, que_head=%lu, dma=%lu/%lu\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__,</div><div class='del'>-			"FAL"[fh-&gt;buffers.active], zr-&gt;jpg_que_tail,</div><div class='del'>-			"UPMD"[zr-&gt;jpg_buffers.buffer[frame].state],</div><div class='del'>-			zr-&gt;jpg_que_head, zr-&gt;jpg_dma_tail, zr-&gt;jpg_dma_head);</div><div class='del'>-		if (fh-&gt;buffers.active != ZORAN_FREE &amp;&amp;</div><div class='del'>-		    zr-&gt;jpg_buffers.buffer[frame].state == BUZ_STATE_DONE) {</div><div class='del'>-			if (fh-&gt;map_mode == ZORAN_MAP_MODE_JPG_REC)</div><div class='del'>-				res |= EPOLLIN | EPOLLRDNORM;</div><div class='del'>-			else</div><div class='del'>-				res |= EPOLLOUT | EPOLLWRNORM;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - internal error, unknown map_mode=%d\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, fh-&gt;map_mode);</div><div class='del'>-		res |= EPOLLERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This maps the buffers to user space.</div><div class='del'>- *</div><div class='del'>- * Depending on the state of fh-&gt;map_mode</div><div class='del'>- * the V4L or the MJPEG buffers are mapped</div><div class='del'>- * per buffer or all together</div><div class='del'>- *</div><div class='del'>- * Note that we need to connect to some</div><div class='del'>- * unmap signal event to unmap the de-allocate</div><div class='del'>- * the buffer accordingly (zoran_vm_close())</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zoran_vm_open (struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct zoran_mapping *map = vma-&gt;vm_private_data;</div><div class='del'>-	atomic_inc(&amp;map-&gt;count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zoran_vm_close (struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct zoran_mapping *map = vma-&gt;vm_private_data;</div><div class='del'>-	struct zoran_fh *fh = map-&gt;fh;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dprintk(3, KERN_INFO "%s: %s - munmap(%s)\n", ZR_DEVNAME(zr),</div><div class='del'>-		__func__, mode_name(fh-&gt;map_mode));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; fh-&gt;buffers.num_buffers; i++) {</div><div class='del'>-		if (fh-&gt;buffers.buffer[i].map == map)</div><div class='del'>-			fh-&gt;buffers.buffer[i].map = NULL;</div><div class='del'>-	}</div><div class='del'>-	kfree(map);</div><div class='del'>-</div><div class='del'>-	/* Any buffers still mapped? */</div><div class='del'>-	for (i = 0; i &lt; fh-&gt;buffers.num_buffers; i++) {</div><div class='del'>-		if (fh-&gt;buffers.buffer[i].map) {</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintk(3, KERN_INFO "%s: %s - free %s buffers\n", ZR_DEVNAME(zr),</div><div class='del'>-		__func__, mode_name(fh-&gt;map_mode));</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode == ZORAN_MAP_MODE_RAW) {</div><div class='del'>-		if (fh-&gt;buffers.active != ZORAN_FREE) {</div><div class='del'>-			unsigned long flags;</div><div class='del'>-</div><div class='del'>-			spin_lock_irqsave(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-			zr36057_set_memgrab(zr, 0);</div><div class='del'>-			zr-&gt;v4l_buffers.allocated = 0;</div><div class='del'>-			zr-&gt;v4l_buffers.active = fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-			spin_unlock_irqrestore(&amp;zr-&gt;spinlock, flags);</div><div class='del'>-		}</div><div class='del'>-		v4l_fbuffer_free(fh);</div><div class='del'>-	} else {</div><div class='del'>-		if (fh-&gt;buffers.active != ZORAN_FREE) {</div><div class='del'>-			jpg_qbuf(fh, -1, zr-&gt;codec_mode);</div><div class='del'>-			zr-&gt;jpg_buffers.allocated = 0;</div><div class='del'>-			zr-&gt;jpg_buffers.active = fh-&gt;buffers.active = ZORAN_FREE;</div><div class='del'>-		}</div><div class='del'>-		jpg_fbuffer_free(fh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct vm_operations_struct zoran_vm_ops = {</div><div class='del'>-	.open = zoran_vm_open,</div><div class='del'>-	.close = zoran_vm_close,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zoran_mmap (struct file           *file,</div><div class='del'>-	    struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct zoran_fh *fh = file-&gt;private_data;</div><div class='del'>-	struct zoran *zr = fh-&gt;zr;</div><div class='del'>-	unsigned long size = (vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='del'>-	unsigned long offset = vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	int i, j;</div><div class='del'>-	unsigned long page, start = vma-&gt;vm_start, todo, pos, fraglen;</div><div class='del'>-	int first, last;</div><div class='del'>-	struct zoran_mapping *map;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	dprintk(3,</div><div class='del'>-		KERN_INFO "%s: %s(%s) of 0x%08lx-0x%08lx (size=%lu)\n",</div><div class='del'>-		ZR_DEVNAME(zr), __func__,</div><div class='del'>-		mode_name(fh-&gt;map_mode), vma-&gt;vm_start, vma-&gt;vm_end, size);</div><div class='del'>-</div><div class='del'>-	if (!(vma-&gt;vm_flags &amp; VM_SHARED) || !(vma-&gt;vm_flags &amp; VM_READ) ||</div><div class='del'>-	    !(vma-&gt;vm_flags &amp; VM_WRITE)) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s - no MAP_SHARED/PROT_{READ,WRITE} given\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!fh-&gt;buffers.allocated) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s(%s) - buffers not yet allocated\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, mode_name(fh-&gt;map_mode));</div><div class='del'>-		res = -ENOMEM;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	first = offset / fh-&gt;buffers.buffer_size;</div><div class='del'>-	last = first - 1 + size / fh-&gt;buffers.buffer_size;</div><div class='del'>-	if (offset % fh-&gt;buffers.buffer_size != 0 ||</div><div class='del'>-	    size % fh-&gt;buffers.buffer_size != 0 || first &lt; 0 ||</div><div class='del'>-	    last &lt; 0 || first &gt;= fh-&gt;buffers.num_buffers ||</div><div class='del'>-	    last &gt;= fh-&gt;buffers.buffer_size) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: %s(%s) - offset=%lu or size=%lu invalid for bufsize=%d and numbufs=%d\n",</div><div class='del'>-			ZR_DEVNAME(zr), __func__, mode_name(fh-&gt;map_mode), offset, size,</div><div class='del'>-			fh-&gt;buffers.buffer_size,</div><div class='del'>-			fh-&gt;buffers.num_buffers);</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if any buffers are already mapped */</div><div class='del'>-	for (i = first; i &lt;= last; i++) {</div><div class='del'>-		if (fh-&gt;buffers.buffer[i].map) {</div><div class='del'>-			dprintk(1,</div><div class='del'>-				KERN_ERR</div><div class='del'>-				"%s: %s(%s) - buffer %d already mapped\n",</div><div class='del'>-				ZR_DEVNAME(zr), __func__, mode_name(fh-&gt;map_mode), i);</div><div class='del'>-			res = -EBUSY;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* map these buffers */</div><div class='del'>-	map = kmalloc(sizeof(struct zoran_mapping), GFP_KERNEL);</div><div class='del'>-	if (!map) {</div><div class='del'>-		res = -ENOMEM;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	map-&gt;fh = fh;</div><div class='del'>-	atomic_set(&amp;map-&gt;count, 1);</div><div class='del'>-</div><div class='del'>-	vma-&gt;vm_ops = &amp;zoran_vm_ops;</div><div class='del'>-	vma-&gt;vm_flags |= VM_DONTEXPAND;</div><div class='del'>-	vma-&gt;vm_private_data = map;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;map_mode == ZORAN_MAP_MODE_RAW) {</div><div class='del'>-		for (i = first; i &lt;= last; i++) {</div><div class='del'>-			todo = size;</div><div class='del'>-			if (todo &gt; fh-&gt;buffers.buffer_size)</div><div class='del'>-				todo = fh-&gt;buffers.buffer_size;</div><div class='del'>-			page = fh-&gt;buffers.buffer[i].v4l.fbuffer_phys;</div><div class='del'>-			if (remap_pfn_range(vma, start, page &gt;&gt; PAGE_SHIFT,</div><div class='del'>-							todo, PAGE_SHARED)) {</div><div class='del'>-				dprintk(1,</div><div class='del'>-					KERN_ERR</div><div class='del'>-					"%s: %s(V4L) - remap_pfn_range failed\n",</div><div class='del'>-					ZR_DEVNAME(zr), __func__);</div><div class='del'>-				res = -EAGAIN;</div><div class='del'>-				return res;</div><div class='del'>-			}</div><div class='del'>-			size -= todo;</div><div class='del'>-			start += todo;</div><div class='del'>-			fh-&gt;buffers.buffer[i].map = map;</div><div class='del'>-			if (size == 0)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		for (i = first; i &lt;= last; i++) {</div><div class='del'>-			for (j = 0;</div><div class='del'>-			     j &lt; fh-&gt;buffers.buffer_size / PAGE_SIZE;</div><div class='del'>-			     j++) {</div><div class='del'>-				fraglen =</div><div class='del'>-				    (le32_to_cpu(fh-&gt;buffers.buffer[i].jpg.</div><div class='del'>-				     frag_tab[2 * j + 1]) &amp; ~1) &lt;&lt; 1;</div><div class='del'>-				todo = size;</div><div class='del'>-				if (todo &gt; fraglen)</div><div class='del'>-					todo = fraglen;</div><div class='del'>-				pos =</div><div class='del'>-				    le32_to_cpu(fh-&gt;buffers.</div><div class='del'>-				    buffer[i].jpg.frag_tab[2 * j]);</div><div class='del'>-				/* should just be pos on i386 */</div><div class='del'>-				page = virt_to_phys(bus_to_virt(pos))</div><div class='del'>-								&gt;&gt; PAGE_SHIFT;</div><div class='del'>-				if (remap_pfn_range(vma, start, page,</div><div class='del'>-							todo, PAGE_SHARED)) {</div><div class='del'>-					dprintk(1,</div><div class='del'>-						KERN_ERR</div><div class='del'>-						"%s: %s(V4L) - remap_pfn_range failed\n",</div><div class='del'>-						ZR_DEVNAME(zr), __func__);</div><div class='del'>-					res = -EAGAIN;</div><div class='del'>-					return res;</div><div class='del'>-				}</div><div class='del'>-				size -= todo;</div><div class='del'>-				start += todo;</div><div class='del'>-				if (size == 0)</div><div class='del'>-					break;</div><div class='del'>-				if (le32_to_cpu(fh-&gt;buffers.buffer[i].jpg.</div><div class='del'>-				    frag_tab[2 * j + 1]) &amp; 1)</div><div class='del'>-					break;	/* was last fragment */</div><div class='del'>-			}</div><div class='del'>-			fh-&gt;buffers.buffer[i].map = map;</div><div class='del'>-			if (size == 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		}</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 v4l2_ioctl_ops zoran_ioctl_ops = {</div><div class='del'>-	.vidioc_querycap		    = zoran_querycap,</div><div class='del'>-	.vidioc_s_selection		    = zoran_s_selection,</div><div class='del'>-	.vidioc_g_selection		    = zoran_g_selection,</div><div class='del'>-	.vidioc_enum_input		    = zoran_enum_input,</div><div class='del'>-	.vidioc_g_input			    = zoran_g_input,</div><div class='del'>-	.vidioc_s_input			    = zoran_s_input,</div><div class='del'>-	.vidioc_enum_output		    = zoran_enum_output,</div><div class='del'>-	.vidioc_g_output		    = zoran_g_output,</div><div class='del'>-	.vidioc_s_output		    = zoran_s_output,</div><div class='del'>-	.vidioc_g_fbuf			    = zoran_g_fbuf,</div><div class='del'>-	.vidioc_s_fbuf			    = zoran_s_fbuf,</div><div class='del'>-	.vidioc_g_std			    = zoran_g_std,</div><div class='del'>-	.vidioc_s_std			    = zoran_s_std,</div><div class='del'>-	.vidioc_g_jpegcomp		    = zoran_g_jpegcomp,</div><div class='del'>-	.vidioc_s_jpegcomp		    = zoran_s_jpegcomp,</div><div class='del'>-	.vidioc_overlay			    = zoran_overlay,</div><div class='del'>-	.vidioc_reqbufs			    = zoran_reqbufs,</div><div class='del'>-	.vidioc_querybuf		    = zoran_querybuf,</div><div class='del'>-	.vidioc_qbuf			    = zoran_qbuf,</div><div class='del'>-	.vidioc_dqbuf			    = zoran_dqbuf,</div><div class='del'>-	.vidioc_streamon		    = zoran_streamon,</div><div class='del'>-	.vidioc_streamoff		    = zoran_streamoff,</div><div class='del'>-	.vidioc_enum_fmt_vid_cap	    = zoran_enum_fmt_vid_cap,</div><div class='del'>-	.vidioc_enum_fmt_vid_out	    = zoran_enum_fmt_vid_out,</div><div class='del'>-	.vidioc_enum_fmt_vid_overlay	    = zoran_enum_fmt_vid_overlay,</div><div class='del'>-	.vidioc_g_fmt_vid_cap		    = zoran_g_fmt_vid_cap,</div><div class='del'>-	.vidioc_g_fmt_vid_out               = zoran_g_fmt_vid_out,</div><div class='del'>-	.vidioc_g_fmt_vid_overlay           = zoran_g_fmt_vid_overlay,</div><div class='del'>-	.vidioc_s_fmt_vid_cap		    = zoran_s_fmt_vid_cap,</div><div class='del'>-	.vidioc_s_fmt_vid_out               = zoran_s_fmt_vid_out,</div><div class='del'>-	.vidioc_s_fmt_vid_overlay           = zoran_s_fmt_vid_overlay,</div><div class='del'>-	.vidioc_try_fmt_vid_cap		    = zoran_try_fmt_vid_cap,</div><div class='del'>-	.vidioc_try_fmt_vid_out		    = zoran_try_fmt_vid_out,</div><div class='del'>-	.vidioc_try_fmt_vid_overlay	    = zoran_try_fmt_vid_overlay,</div><div class='del'>-	.vidioc_subscribe_event             = v4l2_ctrl_subscribe_event,</div><div class='del'>-	.vidioc_unsubscribe_event           = v4l2_event_unsubscribe,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct v4l2_file_operations zoran_fops = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.open = zoran_open,</div><div class='del'>-	.release = zoran_close,</div><div class='del'>-	.unlocked_ioctl = video_ioctl2,</div><div class='del'>-	.mmap = zoran_mmap,</div><div class='del'>-	.poll = zoran_poll,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct video_device zoran_template = {</div><div class='del'>-	.name = ZORAN_NAME,</div><div class='del'>-	.fops = &amp;zoran_fops,</div><div class='del'>-	.ioctl_ops = &amp;zoran_ioctl_ops,</div><div class='del'>-	.release = &amp;zoran_vdev_release,</div><div class='del'>-	.tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,</div><div class='del'>-};</div><div class='del'>-</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_procfs.c b/drivers/staging/media/zoran/zoran_procfs.c<br/>deleted file mode 100644<br/>index 78ac8f853748..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_procfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_procfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,221 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * This part handles the procFS entries (/proc/ZORAN[%d])</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Currently maintained by:</div><div class='del'>- *   Ronald Bultje    &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *   Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *   Mailinglist      &lt;mjpeg-users@lists.sf.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#include &lt;linux/types.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/vmalloc.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='del'>-#include &lt;linux/videodev2.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sem.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-#include "zoran.h"</div><div class='del'>-#include "zoran_procfs.h"</div><div class='del'>-#include "zoran_card.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-struct procfs_params_zr36067 {</div><div class='del'>-	char *name;</div><div class='del'>-	short reg;</div><div class='del'>-	u32 mask;</div><div class='del'>-	short bit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct procfs_params_zr36067 zr67[] = {</div><div class='del'>-	{"HSPol", 0x000, 1, 30},</div><div class='del'>-	{"HStart", 0x000, 0x3ff, 10},</div><div class='del'>-	{"HEnd", 0x000, 0x3ff, 0},</div><div class='del'>-</div><div class='del'>-	{"VSPol", 0x004, 1, 30},</div><div class='del'>-	{"VStart", 0x004, 0x3ff, 10},</div><div class='del'>-	{"VEnd", 0x004, 0x3ff, 0},</div><div class='del'>-</div><div class='del'>-	{"ExtFl", 0x008, 1, 26},</div><div class='del'>-	{"TopField", 0x008, 1, 25},</div><div class='del'>-	{"VCLKPol", 0x008, 1, 24},</div><div class='del'>-	{"DupFld", 0x008, 1, 20},</div><div class='del'>-	{"LittleEndian", 0x008, 1, 0},</div><div class='del'>-</div><div class='del'>-	{"HsyncStart", 0x10c, 0xffff, 16},</div><div class='del'>-	{"LineTot", 0x10c, 0xffff, 0},</div><div class='del'>-</div><div class='del'>-	{"NAX", 0x110, 0xffff, 16},</div><div class='del'>-	{"PAX", 0x110, 0xffff, 0},</div><div class='del'>-</div><div class='del'>-	{"NAY", 0x114, 0xffff, 16},</div><div class='del'>-	{"PAY", 0x114, 0xffff, 0},</div><div class='del'>-</div><div class='del'>-	/* {"",,,}, */</div><div class='del'>-</div><div class='del'>-	{NULL, 0, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setparam (struct zoran *zr,</div><div class='del'>-	  char         *name,</div><div class='del'>-	  char         *sval)</div><div class='del'>-{</div><div class='del'>-	int i = 0, reg0, reg, val;</div><div class='del'>-</div><div class='del'>-	while (zr67[i].name != NULL) {</div><div class='del'>-		if (!strncmp(name, zr67[i].name, strlen(zr67[i].name))) {</div><div class='del'>-			reg = reg0 = btread(zr67[i].reg);</div><div class='del'>-			reg &amp;= ~(zr67[i].mask &lt;&lt; zr67[i].bit);</div><div class='del'>-			if (!isdigit(sval[0]))</div><div class='del'>-				break;</div><div class='del'>-			val = simple_strtoul(sval, NULL, 0);</div><div class='del'>-			if ((val &amp; ~zr67[i].mask))</div><div class='del'>-				break;</div><div class='del'>-			reg |= (val &amp; zr67[i].mask) &lt;&lt; zr67[i].bit;</div><div class='del'>-			dprintk(4,</div><div class='del'>-				KERN_INFO</div><div class='del'>-				"%s: setparam: setting ZR36067 register 0x%03x: 0x%08x=&gt;0x%08x %s=%d\n",</div><div class='del'>-				ZR_DEVNAME(zr), zr67[i].reg, reg0, reg,</div><div class='del'>-				zr67[i].name, val);</div><div class='del'>-			btwrite(reg, zr67[i].reg);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_show(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = p-&gt;private;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	seq_printf(p, "ZR36067 registers:\n");</div><div class='del'>-	for (i = 0; i &lt; 0x130; i += 16)</div><div class='del'>-		seq_printf(p, "%03X %08X  %08X  %08X  %08X \n", i,</div><div class='del'>-			   btread(i), btread(i+4), btread(i+8), btread(i+12));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int zoran_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct zoran *data = PDE_DATA(inode);</div><div class='del'>-	return single_open(file, zoran_show, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t zoran_write(struct file *file, const char __user *buffer,</div><div class='del'>-			size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct zoran *zr = PDE_DATA(file_inode(file));</div><div class='del'>-	char *string, *sp;</div><div class='del'>-	char *line, *ldelim, *varname, *svar, *tdelim;</div><div class='del'>-</div><div class='del'>-	if (count &gt; 32768)	/* Stupidity filter */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	string = sp = vmalloc(count + 1);</div><div class='del'>-	if (!string) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: write_proc: can not allocate memory\n",</div><div class='del'>-			ZR_DEVNAME(zr));</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if (copy_from_user(string, buffer, count)) {</div><div class='del'>-		vfree (string);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	string[count] = 0;</div><div class='del'>-	dprintk(4, KERN_INFO "%s: write_proc: name=%pD count=%zu zr=%p\n",</div><div class='del'>-		ZR_DEVNAME(zr), file, count, zr);</div><div class='del'>-	ldelim = " \t\n";</div><div class='del'>-	tdelim = "=";</div><div class='del'>-	line = strpbrk(sp, ldelim);</div><div class='del'>-	while (line) {</div><div class='del'>-		*line = 0;</div><div class='del'>-		svar = strpbrk(sp, tdelim);</div><div class='del'>-		if (svar) {</div><div class='del'>-			*svar = 0;</div><div class='del'>-			varname = sp;</div><div class='del'>-			svar++;</div><div class='del'>-			setparam(zr, varname, svar);</div><div class='del'>-		}</div><div class='del'>-		sp = line + 1;</div><div class='del'>-		line = strpbrk(sp, ldelim);</div><div class='del'>-	}</div><div class='del'>-	vfree(string);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations zoran_operations = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= zoran_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.write		= zoran_write,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-zoran_proc_init (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	char name[8];</div><div class='del'>-</div><div class='del'>-	snprintf(name, 7, "zoran%d", zr-&gt;id);</div><div class='del'>-	zr-&gt;zoran_proc = proc_create_data(name, 0, NULL, &amp;zoran_operations, zr);</div><div class='del'>-	if (zr-&gt;zoran_proc != NULL) {</div><div class='del'>-		dprintk(2,</div><div class='del'>-			KERN_INFO</div><div class='del'>-			"%s: procfs entry /proc/%s allocated. data=%p\n",</div><div class='del'>-			ZR_DEVNAME(zr), name, zr);</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: Unable to initialise /proc/%s\n",</div><div class='del'>-			ZR_DEVNAME(zr), name);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-zoran_proc_cleanup (struct zoran *zr)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	char name[8];</div><div class='del'>-</div><div class='del'>-	snprintf(name, 7, "zoran%d", zr-&gt;id);</div><div class='del'>-	if (zr-&gt;zoran_proc)</div><div class='del'>-		remove_proc_entry(name, NULL);</div><div class='del'>-	zr-&gt;zoran_proc = NULL;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/media/zoran/zoran_procfs.h b/drivers/staging/media/zoran/zoran_procfs.h<br/>deleted file mode 100644<br/>index 0ac7cb0011f2..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zoran_procfs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zoran_procfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran zr36057/zr36067 PCI controller driver, for the</div><div class='del'>- * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux</div><div class='del'>- * Media Labs LML33/LML33R10.</div><div class='del'>- *</div><div class='del'>- * This part handles card-specific data and detection</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='del'>- *</div><div class='del'>- * Currently maintained by:</div><div class='del'>- *   Ronald Bultje    &lt;rbultje@ronald.bitfreak.net&gt;</div><div class='del'>- *   Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *   Mailinglist      &lt;mjpeg-users@lists.sf.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#ifndef __ZORAN_PROCFS_H__</div><div class='del'>-#define __ZORAN_PROCFS_H__</div><div class='del'>-</div><div class='del'>-extern int zoran_proc_init(struct zoran *zr);</div><div class='del'>-extern void zoran_proc_cleanup(struct zoran *zr);</div><div class='del'>-</div><div class='del'>-#endif				/* __ZORAN_PROCFS_H__ */</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36016.c b/drivers/staging/media/zoran/zr36016.c<br/>deleted file mode 100644<br/>index 8736b9d8d97e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36016.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36016.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,516 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran ZR36016 basic configuration functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Wolfgang Scherr &lt;scherr@net4you.at&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: zr36016.c,v 1.1.2.14 2003/08/20 19:46:55 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ZR016_VERSION "v0.7"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-/* I/O commands, error codes */</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-/* v4l  API */</div><div class='del'>-</div><div class='del'>-/* headerfile of this module */</div><div class='del'>-#include "zr36016.h"</div><div class='del'>-</div><div class='del'>-/* codec io API */</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-/* it doesn't make sense to have more than 20 or so,</div><div class='del'>-  just to prevent some unwanted loops */</div><div class='del'>-#define MAX_CODECS 20</div><div class='del'>-</div><div class='del'>-/* amount of chips attached via this driver */</div><div class='del'>-static int zr36016_codecs;</div><div class='del'>-</div><div class='del'>-/* debugging is available via module parameter */</div><div class='del'>-static int debug;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0-4)");</div><div class='del'>-</div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local hardware I/O functions:</div><div class='del'>-</div><div class='del'>-   read/write via codec layer (registers are located in the master device)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* read and write functions */</div><div class='del'>-static u8</div><div class='del'>-zr36016_read (struct zr36016 *ptr,</div><div class='del'>-	      u16             reg)</div><div class='del'>-{</div><div class='del'>-	u8 value = 0;</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;readreg)</div><div class='del'>-		value =</div><div class='del'>-		    (ptr-&gt;codec-&gt;master_data-&gt;</div><div class='del'>-		     readreg(ptr-&gt;codec, reg)) &amp; 0xFF;</div><div class='del'>-	else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "%s: invalid I/O setup, nothing read!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-	dprintk(4, "%s: reading from 0x%04x: %02x\n", ptr-&gt;name, reg,</div><div class='del'>-		value);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36016_write (struct zr36016 *ptr,</div><div class='del'>-	       u16             reg,</div><div class='del'>-	       u8              value)</div><div class='del'>-{</div><div class='del'>-	dprintk(4, "%s: writing 0x%02x to 0x%04x\n", ptr-&gt;name, value,</div><div class='del'>-		reg);</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;writereg) {</div><div class='del'>-		ptr-&gt;codec-&gt;master_data-&gt;writereg(ptr-&gt;codec, reg, value);</div><div class='del'>-	} else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: invalid I/O setup, nothing written!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* indirect read and write functions */</div><div class='del'>-/* the 016 supports auto-addr-increment, but</div><div class='del'>- * writing it all time cost not much and is safer... */</div><div class='del'>-static u8</div><div class='del'>-zr36016_readi (struct zr36016 *ptr,</div><div class='del'>-	       u16             reg)</div><div class='del'>-{</div><div class='del'>-	u8 value = 0;</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if ((ptr-&gt;codec-&gt;master_data-&gt;writereg) &amp;&amp;</div><div class='del'>-	    (ptr-&gt;codec-&gt;master_data-&gt;readreg)) {</div><div class='del'>-		ptr-&gt;codec-&gt;master_data-&gt;writereg(ptr-&gt;codec, ZR016_IADDR, reg &amp; 0x0F);	// ADDR</div><div class='del'>-		value = (ptr-&gt;codec-&gt;master_data-&gt;readreg(ptr-&gt;codec, ZR016_IDATA)) &amp; 0xFF;	// DATA</div><div class='del'>-	} else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: invalid I/O setup, nothing read (i)!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-	dprintk(4, "%s: reading indirect from 0x%04x: %02x\n", ptr-&gt;name,</div><div class='del'>-		reg, value);</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36016_writei (struct zr36016 *ptr,</div><div class='del'>-		u16             reg,</div><div class='del'>-		u8              value)</div><div class='del'>-{</div><div class='del'>-	dprintk(4, "%s: writing indirect 0x%02x to 0x%04x\n", ptr-&gt;name,</div><div class='del'>-		value, reg);</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;writereg) {</div><div class='del'>-		ptr-&gt;codec-&gt;master_data-&gt;writereg(ptr-&gt;codec, ZR016_IADDR, reg &amp; 0x0F);	// ADDR</div><div class='del'>-		ptr-&gt;codec-&gt;master_data-&gt;writereg(ptr-&gt;codec, ZR016_IDATA, value &amp; 0x0FF);	// DATA</div><div class='del'>-	} else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: invalid I/O setup, nothing written (i)!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   version read</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* version kept in datastructure */</div><div class='del'>-static u8</div><div class='del'>-zr36016_read_version (struct zr36016 *ptr)</div><div class='del'>-{</div><div class='del'>-	ptr-&gt;version = zr36016_read(ptr, 0) &gt;&gt; 4;</div><div class='del'>-	return ptr-&gt;version;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   basic test of "connectivity", writes/reads to/from PAX-Lo register</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36016_basic_test (struct zr36016 *ptr)</div><div class='del'>-{</div><div class='del'>-	if (debug) {</div><div class='del'>-		int i;</div><div class='del'>-		zr36016_writei(ptr, ZR016I_PAX_LO, 0x55);</div><div class='del'>-		dprintk(1, KERN_INFO "%s: registers: ", ptr-&gt;name);</div><div class='del'>-		for (i = 0; i &lt;= 0x0b; i++)</div><div class='del'>-			dprintk(1, "%02x ", zr36016_readi(ptr, i));</div><div class='del'>-		dprintk(1, "\n");</div><div class='del'>-	}</div><div class='del'>-	// for testing just write 0, then the default value to a register and read</div><div class='del'>-	// it back in both cases</div><div class='del'>-	zr36016_writei(ptr, ZR016I_PAX_LO, 0x00);</div><div class='del'>-	if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, can't connect to vfe processor!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	zr36016_writei(ptr, ZR016I_PAX_LO, 0x0d0);</div><div class='del'>-	if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0d0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, can't connect to vfe processor!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	// we allow version numbers from 0-3, should be enough, though</div><div class='del'>-	zr36016_read_version(ptr);</div><div class='del'>-	if (ptr-&gt;version &amp; 0x0c) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, suspicious version %d found...\n",</div><div class='del'>-			ptr-&gt;name, ptr-&gt;version);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;		/* looks good! */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   simple loop for pushing the init datasets - NO USE --</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static int zr36016_pushit (struct zr36016 *ptr,</div><div class='del'>-			   u16             startreg,</div><div class='del'>-			   u16             len,</div><div class='del'>-			   const char     *data)</div><div class='del'>-{</div><div class='del'>-	int i=0;</div><div class='del'>-</div><div class='del'>-	dprintk(4, "%s: write data block to 0x%04x (len=%d)\n",</div><div class='del'>-		ptr-&gt;name, startreg,len);</div><div class='del'>-	while (i&lt;len) {</div><div class='del'>-		zr36016_writei(ptr, startreg++,  data[i++]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Basic datasets &amp; init:</div><div class='del'>-</div><div class='del'>-   //TODO//</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36016_init (struct zr36016 *ptr)</div><div class='del'>-{</div><div class='del'>-	// stop any processing</div><div class='del'>-	zr36016_write(ptr, ZR016_GOSTOP, 0);</div><div class='del'>-</div><div class='del'>-	// mode setup (yuv422 in and out, compression/expansuon due to mode)</div><div class='del'>-	zr36016_write(ptr, ZR016_MODE,</div><div class='del'>-		      ZR016_YUV422 | ZR016_YUV422_YUV422 |</div><div class='del'>-		      (ptr-&gt;mode == CODEC_DO_COMPRESSION ?</div><div class='del'>-		       ZR016_COMPRESSION : ZR016_EXPANSION));</div><div class='del'>-</div><div class='del'>-	// misc setup</div><div class='del'>-	zr36016_writei(ptr, ZR016I_SETUP1,</div><div class='del'>-		       (ptr-&gt;xdec ? (ZR016_HRFL | ZR016_HORZ) : 0) |</div><div class='del'>-		       (ptr-&gt;ydec ? ZR016_VERT : 0) | ZR016_CNTI);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_SETUP2, ZR016_CCIR);</div><div class='del'>-</div><div class='del'>-	// Window setup</div><div class='del'>-	// (no extra offset for now, norm defines offset, default width height)</div><div class='del'>-	zr36016_writei(ptr, ZR016I_PAX_HI, ptr-&gt;width &gt;&gt; 8);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_PAX_LO, ptr-&gt;width &amp; 0xFF);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_PAY_HI, ptr-&gt;height &gt;&gt; 8);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_PAY_LO, ptr-&gt;height &amp; 0xFF);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_NAX_HI, ptr-&gt;xoff &gt;&gt; 8);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_NAX_LO, ptr-&gt;xoff &amp; 0xFF);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_NAY_HI, ptr-&gt;yoff &gt;&gt; 8);</div><div class='del'>-	zr36016_writei(ptr, ZR016I_NAY_LO, ptr-&gt;yoff &amp; 0xFF);</div><div class='del'>-</div><div class='del'>-	/* shall we continue now, please? */</div><div class='del'>-	zr36016_write(ptr, ZR016_GOSTOP, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   CODEC API FUNCTIONS</div><div class='del'>-</div><div class='del'>-   this functions are accessed by the master via the API structure</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* set compression/expansion mode and launches codec -</div><div class='del'>-   this should be the last call from the master before starting processing */</div><div class='del'>-static int</div><div class='del'>-zr36016_set_mode (struct videocodec *codec,</div><div class='del'>-		  int                mode)</div><div class='del'>-{</div><div class='del'>-	struct zr36016 *ptr = (struct zr36016 *) codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: set_mode %d call\n", ptr-&gt;name, mode);</div><div class='del'>-</div><div class='del'>-	if ((mode != CODEC_DO_EXPANSION) &amp;&amp; (mode != CODEC_DO_COMPRESSION))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ptr-&gt;mode = mode;</div><div class='del'>-	zr36016_init(ptr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set picture size */</div><div class='del'>-static int</div><div class='del'>-zr36016_set_video (struct videocodec   *codec,</div><div class='del'>-		   struct tvnorm       *norm,</div><div class='del'>-		   struct vfe_settings *cap,</div><div class='del'>-		   struct vfe_polarity *pol)</div><div class='del'>-{</div><div class='del'>-	struct zr36016 *ptr = (struct zr36016 *) codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: set_video %d.%d, %d/%d-%dx%d (0x%x) call\n",</div><div class='del'>-		ptr-&gt;name, norm-&gt;HStart, norm-&gt;VStart,</div><div class='del'>-		cap-&gt;x, cap-&gt;y, cap-&gt;width, cap-&gt;height,</div><div class='del'>-		cap-&gt;decimation);</div><div class='del'>-</div><div class='del'>-	/* if () return -EINVAL;</div><div class='del'>-	 * trust the master driver that it knows what it does - so</div><div class='del'>-	 * we allow invalid startx/y for now ... */</div><div class='del'>-	ptr-&gt;width = cap-&gt;width;</div><div class='del'>-	ptr-&gt;height = cap-&gt;height;</div><div class='del'>-	/* (Ronald) This is ugly. zoran_device.c, line 387</div><div class='del'>-	 * already mentions what happens if HStart is even</div><div class='del'>-	 * (blue faces, etc., cr/cb inversed). There's probably</div><div class='del'>-	 * some good reason why HStart is 0 instead of 1, so I'm</div><div class='del'>-	 * leaving it to this for now, but really... This can be</div><div class='del'>-	 * done a lot simpler */</div><div class='del'>-	ptr-&gt;xoff = (norm-&gt;HStart ? norm-&gt;HStart : 1) + cap-&gt;x;</div><div class='del'>-	/* Something to note here (I don't understand it), setting</div><div class='del'>-	 * VStart too high will cause the codec to 'not work'. I</div><div class='del'>-	 * really don't get it. values of 16 (VStart) already break</div><div class='del'>-	 * it here. Just '0' seems to work. More testing needed! */</div><div class='del'>-	ptr-&gt;yoff = norm-&gt;VStart + cap-&gt;y;</div><div class='del'>-	/* (Ronald) dzjeeh, can't this thing do hor_decimation = 4? */</div><div class='del'>-	ptr-&gt;xdec = ((cap-&gt;decimation &amp; 0xff) == 1) ? 0 : 1;</div><div class='del'>-	ptr-&gt;ydec = (((cap-&gt;decimation &gt;&gt; 8) &amp; 0xff) == 1) ? 0 : 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional control functions */</div><div class='del'>-static int</div><div class='del'>-zr36016_control (struct videocodec *codec,</div><div class='del'>-		 int                type,</div><div class='del'>-		 int                size,</div><div class='del'>-		 void              *data)</div><div class='del'>-{</div><div class='del'>-	struct zr36016 *ptr = (struct zr36016 *) codec-&gt;data;</div><div class='del'>-	int *ival = (int *) data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: control %d call with %d byte\n", ptr-&gt;name, type,</div><div class='del'>-		size);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CODEC_G_STATUS:	/* get last status - we don't know it ... */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_CODEC_MODE:</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_CODEC_MODE:</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (*ival != 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		/* not needed, do nothing */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_VFE:</div><div class='del'>-	case CODEC_S_VFE:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_MMAP:</div><div class='del'>-		/* not available, give an error */</div><div class='del'>-		return -ENXIO;</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'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Exit and unregister function:</div><div class='del'>-</div><div class='del'>-   Deinitializes Zoran's JPEG processor</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36016_unset (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct zr36016 *ptr = codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (ptr) {</div><div class='del'>-		/* do wee need some codec deinit here, too ???? */</div><div class='del'>-</div><div class='del'>-		dprintk(1, "%s: finished codec #%d\n", ptr-&gt;name,</div><div class='del'>-			ptr-&gt;num);</div><div class='del'>-		kfree(ptr);</div><div class='del'>-		codec-&gt;data = NULL;</div><div class='del'>-</div><div class='del'>-		zr36016_codecs--;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Setup and registry function:</div><div class='del'>-</div><div class='del'>-   Initializes Zoran's JPEG processor</div><div class='del'>-</div><div class='del'>-   Also sets pixel size, average code size, mode (compr./decompr.)</div><div class='del'>-   (the given size is determined by the processor with the video interface)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36016_setup (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct zr36016 *ptr;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "zr36016: initializing VFE subsystem #%d.\n",</div><div class='del'>-		zr36016_codecs);</div><div class='del'>-</div><div class='del'>-	if (zr36016_codecs == MAX_CODECS) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "zr36016: Can't attach more codecs!\n");</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-	//mem structure init</div><div class='del'>-	codec-&gt;data = ptr = kzalloc(sizeof(struct zr36016), GFP_KERNEL);</div><div class='del'>-	if (NULL == ptr) {</div><div class='del'>-		dprintk(1, KERN_ERR "zr36016: Can't get enough memory!\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(ptr-&gt;name, sizeof(ptr-&gt;name), "zr36016[%d]",</div><div class='del'>-		 zr36016_codecs);</div><div class='del'>-	ptr-&gt;num = zr36016_codecs++;</div><div class='del'>-	ptr-&gt;codec = codec;</div><div class='del'>-</div><div class='del'>-	//testing</div><div class='del'>-	res = zr36016_basic_test(ptr);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		zr36016_unset(codec);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	//final setup</div><div class='del'>-	ptr-&gt;mode = CODEC_DO_COMPRESSION;</div><div class='del'>-	ptr-&gt;width = 768;</div><div class='del'>-	ptr-&gt;height = 288;</div><div class='del'>-	ptr-&gt;xdec = 1;</div><div class='del'>-	ptr-&gt;ydec = 0;</div><div class='del'>-	zr36016_init(ptr);</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_INFO "%s: codec v%d attached and running\n",</div><div class='del'>-		ptr-&gt;name, ptr-&gt;version);</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 videocodec zr36016_codec = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.name = "zr36016",</div><div class='del'>-	.magic = 0L,		// magic not used</div><div class='del'>-	.flags =</div><div class='del'>-	    CODEC_FLAG_HARDWARE | CODEC_FLAG_VFE | CODEC_FLAG_ENCODER |</div><div class='del'>-	    CODEC_FLAG_DECODER,</div><div class='del'>-	.type = CODEC_TYPE_ZR36016,</div><div class='del'>-	.setup = zr36016_setup,	// functionality</div><div class='del'>-	.unset = zr36016_unset,</div><div class='del'>-	.set_mode = zr36016_set_mode,</div><div class='del'>-	.set_video = zr36016_set_video,</div><div class='del'>-	.control = zr36016_control,</div><div class='del'>-	// others are not used</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   HOOK IN DRIVER AS KERNEL MODULE</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-zr36016_init_module (void)</div><div class='del'>-{</div><div class='del'>-	//dprintk(1, "ZR36016 driver %s\n",ZR016_VERSION);</div><div class='del'>-	zr36016_codecs = 0;</div><div class='del'>-	return videocodec_register(&amp;zr36016_codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-zr36016_cleanup_module (void)</div><div class='del'>-{</div><div class='del'>-	if (zr36016_codecs) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			"zr36016: something's wrong - %d codecs left somehow.\n",</div><div class='del'>-			zr36016_codecs);</div><div class='del'>-	}</div><div class='del'>-	videocodec_unregister(&amp;zr36016_codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(zr36016_init_module);</div><div class='del'>-module_exit(zr36016_cleanup_module);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Wolfgang Scherr &lt;scherr@net4you.at&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver module for ZR36016 video frontends "</div><div class='del'>-		   ZR016_VERSION);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36016.h b/drivers/staging/media/zoran/zr36016.h<br/>deleted file mode 100644<br/>index 784bcf5727b8..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36016.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36016.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran ZR36016 basic configuration functions - header file</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Wolfgang Scherr &lt;scherr@net4you.at&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: zr36016.h,v 1.1.2.3 2003/01/14 21:18:07 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ZR36016_H</div><div class='del'>-#define ZR36016_H</div><div class='del'>-</div><div class='del'>-/* data stored for each zoran jpeg codec chip */</div><div class='del'>-struct zr36016 {</div><div class='del'>-	char name[32];</div><div class='del'>-	int num;</div><div class='del'>-	/* io datastructure */</div><div class='del'>-	struct videocodec *codec;</div><div class='del'>-	// coder status</div><div class='del'>-	__u8 version;</div><div class='del'>-	// actual coder setup</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	__u16 xoff;</div><div class='del'>-	__u16 yoff;</div><div class='del'>-	__u16 width;</div><div class='del'>-	__u16 height;</div><div class='del'>-	__u16 xdec;</div><div class='del'>-	__u16 ydec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* direct  register addresses */</div><div class='del'>-#define ZR016_GOSTOP      0x00</div><div class='del'>-#define ZR016_MODE        0x01</div><div class='del'>-#define ZR016_IADDR       0x02</div><div class='del'>-#define ZR016_IDATA       0x03</div><div class='del'>-</div><div class='del'>-/* indirect  register addresses */</div><div class='del'>-#define ZR016I_SETUP1     0x00</div><div class='del'>-#define ZR016I_SETUP2     0x01</div><div class='del'>-#define ZR016I_NAX_LO     0x02</div><div class='del'>-#define ZR016I_NAX_HI     0x03</div><div class='del'>-#define ZR016I_PAX_LO     0x04</div><div class='del'>-#define ZR016I_PAX_HI     0x05</div><div class='del'>-#define ZR016I_NAY_LO     0x06</div><div class='del'>-#define ZR016I_NAY_HI     0x07</div><div class='del'>-#define ZR016I_PAY_LO     0x08</div><div class='del'>-#define ZR016I_PAY_HI     0x09</div><div class='del'>-#define ZR016I_NOL_LO     0x0a</div><div class='del'>-#define ZR016I_NOL_HI     0x0b</div><div class='del'>-</div><div class='del'>-/* possible values for mode register */</div><div class='del'>-#define ZR016_RGB444_YUV444  0x00</div><div class='del'>-#define ZR016_RGB444_YUV422  0x01</div><div class='del'>-#define ZR016_RGB444_YUV411  0x02</div><div class='del'>-#define ZR016_RGB444_Y400    0x03</div><div class='del'>-#define ZR016_RGB444_RGB444  0x04</div><div class='del'>-#define ZR016_YUV444_YUV444  0x08</div><div class='del'>-#define ZR016_YUV444_YUV422  0x09</div><div class='del'>-#define ZR016_YUV444_YUV411  0x0a</div><div class='del'>-#define ZR016_YUV444_Y400    0x0b</div><div class='del'>-#define ZR016_YUV444_RGB444  0x0c</div><div class='del'>-#define ZR016_YUV422_YUV422  0x11</div><div class='del'>-#define ZR016_YUV422_YUV411  0x12</div><div class='del'>-#define ZR016_YUV422_Y400    0x13</div><div class='del'>-#define ZR016_YUV411_YUV411  0x16</div><div class='del'>-#define ZR016_YUV411_Y400    0x17</div><div class='del'>-#define ZR016_4444_4444      0x19</div><div class='del'>-#define ZR016_100_100        0x1b</div><div class='del'>-</div><div class='del'>-#define ZR016_RGB444         0x00</div><div class='del'>-#define ZR016_YUV444         0x20</div><div class='del'>-#define ZR016_YUV422         0x40</div><div class='del'>-</div><div class='del'>-#define ZR016_COMPRESSION    0x80</div><div class='del'>-#define ZR016_EXPANSION      0x80</div><div class='del'>-</div><div class='del'>-/* possible values for setup 1 register */</div><div class='del'>-#define ZR016_CKRT           0x80</div><div class='del'>-#define ZR016_VERT           0x40</div><div class='del'>-#define ZR016_HORZ           0x20</div><div class='del'>-#define ZR016_HRFL           0x10</div><div class='del'>-#define ZR016_DSFL           0x08</div><div class='del'>-#define ZR016_SBFL           0x04</div><div class='del'>-#define ZR016_RSTR           0x02</div><div class='del'>-#define ZR016_CNTI           0x01</div><div class='del'>-</div><div class='del'>-/* possible values for setup 2 register */</div><div class='del'>-#define ZR016_SYEN           0x40</div><div class='del'>-#define ZR016_CCIR           0x04</div><div class='del'>-#define ZR016_SIGN           0x02</div><div class='del'>-#define ZR016_YMCS           0x01</div><div class='del'>-</div><div class='del'>-#endif				/*fndef ZR36016_H */</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c<br/>deleted file mode 100644<br/>index 5ebfc16672f3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36050.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36050.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,896 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran ZR36050 basic configuration functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Wolfgang Scherr &lt;scherr@net4you.at&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: zr36050.c,v 1.1.2.11 2003/08/03 14:54:53 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ZR050_VERSION "v0.7.1"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-/* I/O commands, error codes */</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-/* headerfile of this module */</div><div class='del'>-#include "zr36050.h"</div><div class='del'>-</div><div class='del'>-/* codec io API */</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-/* it doesn't make sense to have more than 20 or so,</div><div class='del'>-  just to prevent some unwanted loops */</div><div class='del'>-#define MAX_CODECS 20</div><div class='del'>-</div><div class='del'>-/* amount of chips attached via this driver */</div><div class='del'>-static int zr36050_codecs;</div><div class='del'>-</div><div class='del'>-/* debugging is available via module parameter */</div><div class='del'>-static int debug;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0-4)");</div><div class='del'>-</div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local hardware I/O functions:</div><div class='del'>-</div><div class='del'>-   read/write via codec layer (registers are located in the master device)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* read and write functions */</div><div class='del'>-static u8</div><div class='del'>-zr36050_read (struct zr36050 *ptr,</div><div class='del'>-	      u16             reg)</div><div class='del'>-{</div><div class='del'>-	u8 value = 0;</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;readreg)</div><div class='del'>-		value = (ptr-&gt;codec-&gt;master_data-&gt;readreg(ptr-&gt;codec,</div><div class='del'>-							  reg)) &amp; 0xFF;</div><div class='del'>-	else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "%s: invalid I/O setup, nothing read!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-	dprintk(4, "%s: reading from 0x%04x: %02x\n", ptr-&gt;name, reg,</div><div class='del'>-		value);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36050_write (struct zr36050 *ptr,</div><div class='del'>-	       u16             reg,</div><div class='del'>-	       u8              value)</div><div class='del'>-{</div><div class='del'>-	dprintk(4, "%s: writing 0x%02x to 0x%04x\n", ptr-&gt;name, value,</div><div class='del'>-		reg);</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;writereg)</div><div class='del'>-		ptr-&gt;codec-&gt;master_data-&gt;writereg(ptr-&gt;codec, reg, value);</div><div class='del'>-	else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: invalid I/O setup, nothing written!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   status read</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* status is kept in datastructure */</div><div class='del'>-static u8</div><div class='del'>-zr36050_read_status1 (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	ptr-&gt;status1 = zr36050_read(ptr, ZR050_STATUS_1);</div><div class='del'>-</div><div class='del'>-	zr36050_read(ptr, 0);</div><div class='del'>-	return ptr-&gt;status1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   scale factor read</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* scale factor is kept in datastructure */</div><div class='del'>-static u16</div><div class='del'>-zr36050_read_scalefactor (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	ptr-&gt;scalefact = (zr36050_read(ptr, ZR050_SF_HI) &lt;&lt; 8) |</div><div class='del'>-			 (zr36050_read(ptr, ZR050_SF_LO) &amp; 0xFF);</div><div class='del'>-</div><div class='del'>-	/* leave 0 selected for an eventually GO from master */</div><div class='del'>-	zr36050_read(ptr, 0);</div><div class='del'>-	return ptr-&gt;scalefact;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   wait if codec is ready to proceed (end of processing) or time is over</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36050_wait_end (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	while (!(zr36050_read_status1(ptr) &amp; 0x4)) {</div><div class='del'>-		udelay(1);</div><div class='del'>-		if (i++ &gt; 200000) {	// 200ms, there is for sure something wrong!!!</div><div class='del'>-			dprintk(1,</div><div class='del'>-				"%s: timeout at wait_end (last status: 0x%02x)\n",</div><div class='del'>-				ptr-&gt;name, ptr-&gt;status1);</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'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   basic test of "connectivity", writes/reads to/from memory the SOF marker</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_basic_test (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	zr36050_write(ptr, ZR050_SOF_IDX, 0x00);</div><div class='del'>-	zr36050_write(ptr, ZR050_SOF_IDX + 1, 0x00);</div><div class='del'>-	if ((zr36050_read(ptr, ZR050_SOF_IDX) |</div><div class='del'>-	     zr36050_read(ptr, ZR050_SOF_IDX + 1)) != 0x0000) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, can't connect to jpeg processor!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	zr36050_write(ptr, ZR050_SOF_IDX, 0xff);</div><div class='del'>-	zr36050_write(ptr, ZR050_SOF_IDX + 1, 0xc0);</div><div class='del'>-	if (((zr36050_read(ptr, ZR050_SOF_IDX) &lt;&lt; 8) |</div><div class='del'>-	     zr36050_read(ptr, ZR050_SOF_IDX + 1)) != 0xffc0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, can't connect to jpeg processor!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr36050_wait_end(ptr);</div><div class='del'>-	if ((ptr-&gt;status1 &amp; 0x4) == 0) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, jpeg processor failed (end flag)!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;		/* looks good! */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   simple loop for pushing the init datasets</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_pushit (struct zr36050 *ptr,</div><div class='del'>-		u16             startreg,</div><div class='del'>-		u16             len,</div><div class='del'>-		const char     *data)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	dprintk(4, "%s: write data block to 0x%04x (len=%d)\n", ptr-&gt;name,</div><div class='del'>-		startreg, len);</div><div class='del'>-	while (i &lt; len) {</div><div class='del'>-		zr36050_write(ptr, startreg++, data[i++]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Basic datasets:</div><div class='del'>-</div><div class='del'>-   jpeg baseline setup data (you find it on lots places in internet, or just</div><div class='del'>-   extract it from any regular .jpg image...)</div><div class='del'>-</div><div class='del'>-   Could be variable, but until it's not needed it they are just fixed to save</div><div class='del'>-   memory. Otherwise expand zr36050 structure with arrays, push the values to</div><div class='del'>-   it and initialize from there, as e.g. the linux zr36057/60 driver does it.</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static const char zr36050_dqt[0x86] = {</div><div class='del'>-	0xff, 0xdb,		//Marker: DQT</div><div class='del'>-	0x00, 0x84,		//Length: 2*65+2</div><div class='del'>-	0x00,			//Pq,Tq first table</div><div class='del'>-	0x10, 0x0b, 0x0c, 0x0e, 0x0c, 0x0a, 0x10, 0x0e,</div><div class='del'>-	0x0d, 0x0e, 0x12, 0x11, 0x10, 0x13, 0x18, 0x28,</div><div class='del'>-	0x1a, 0x18, 0x16, 0x16, 0x18, 0x31, 0x23, 0x25,</div><div class='del'>-	0x1d, 0x28, 0x3a, 0x33, 0x3d, 0x3c, 0x39, 0x33,</div><div class='del'>-	0x38, 0x37, 0x40, 0x48, 0x5c, 0x4e, 0x40, 0x44,</div><div class='del'>-	0x57, 0x45, 0x37, 0x38, 0x50, 0x6d, 0x51, 0x57,</div><div class='del'>-	0x5f, 0x62, 0x67, 0x68, 0x67, 0x3e, 0x4d, 0x71,</div><div class='del'>-	0x79, 0x70, 0x64, 0x78, 0x5c, 0x65, 0x67, 0x63,</div><div class='del'>-	0x01,			//Pq,Tq second table</div><div class='del'>-	0x11, 0x12, 0x12, 0x18, 0x15, 0x18, 0x2f, 0x1a,</div><div class='del'>-	0x1a, 0x2f, 0x63, 0x42, 0x38, 0x42, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char zr36050_dht[0x1a4] = {</div><div class='del'>-	0xff, 0xc4,		//Marker: DHT</div><div class='del'>-	0x01, 0xa2,		//Length: 2*AC, 2*DC</div><div class='del'>-	0x00,			//DC first table</div><div class='del'>-	0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,</div><div class='del'>-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='del'>-	0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,</div><div class='del'>-	0x01,			//DC second table</div><div class='del'>-	0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,</div><div class='del'>-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='del'>-	0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,</div><div class='del'>-	0x10,			//AC first table</div><div class='del'>-	0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,</div><div class='del'>-	0x05, 0x05, 0x04, 0x04, 0x00, 0x00,</div><div class='del'>-	0x01, 0x7D, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11,</div><div class='del'>-	0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61,</div><div class='del'>-	0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1,</div><div class='del'>-	0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0, 0x24,</div><div class='del'>-	0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17,</div><div class='del'>-	0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34,</div><div class='del'>-	0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44,</div><div class='del'>-	0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56,</div><div class='del'>-	0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66,</div><div class='del'>-	0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,</div><div class='del'>-	0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,</div><div class='del'>-	0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,</div><div class='del'>-	0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8,</div><div class='del'>-	0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9,</div><div class='del'>-	0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8,</div><div class='del'>-	0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9,</div><div class='del'>-	0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,</div><div class='del'>-	0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,</div><div class='del'>-	0xF8, 0xF9, 0xFA,</div><div class='del'>-	0x11,			//AC second table</div><div class='del'>-	0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,</div><div class='del'>-	0x07, 0x05, 0x04, 0x04, 0x00, 0x01,</div><div class='del'>-	0x02, 0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04,</div><div class='del'>-	0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,</div><div class='del'>-	0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,</div><div class='del'>-	0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 0x52, 0xF0, 0x15, 0x62,</div><div class='del'>-	0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25,</div><div class='del'>-	0xF1, 0x17, 0x18, 0x19, 0x1A, 0x26, 0x27, 0x28, 0x29, 0x2A,</div><div class='del'>-	0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44,</div><div class='del'>-	0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56,</div><div class='del'>-	0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66,</div><div class='del'>-	0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,</div><div class='del'>-	0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,</div><div class='del'>-	0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,</div><div class='del'>-	0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,</div><div class='del'>-	0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8,</div><div class='del'>-	0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,</div><div class='del'>-	0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8,</div><div class='del'>-	0xD9, 0xDA, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,</div><div class='del'>-	0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,</div><div class='del'>-	0xF9, 0xFA</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* jpeg baseline setup, this is just fixed in this driver (YUV pictures) */</div><div class='del'>-#define NO_OF_COMPONENTS          0x3	//Y,U,V</div><div class='del'>-#define BASELINE_PRECISION        0x8	//MCU size (?)</div><div class='del'>-static const char zr36050_tq[8] = { 0, 1, 1, 0, 0, 0, 0, 0 };	//table idx's QT</div><div class='del'>-static const char zr36050_td[8] = { 0, 1, 1, 0, 0, 0, 0, 0 };	//table idx's DC</div><div class='del'>-static const char zr36050_ta[8] = { 0, 1, 1, 0, 0, 0, 0, 0 };	//table idx's AC</div><div class='del'>-</div><div class='del'>-/* horizontal 422 decimation setup (maybe we support 411 or so later, too) */</div><div class='del'>-static const char zr36050_decimation_h[8] = { 2, 1, 1, 0, 0, 0, 0, 0 };</div><div class='del'>-static const char zr36050_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper functions:</div><div class='del'>-</div><div class='del'>-   calculation and setup of parameter-dependent JPEG baseline segments</div><div class='del'>-   (needed for compression only)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-/* SOF (start of frame) segment depends on width, height and sampling ratio</div><div class='del'>-			 of each color component */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_set_sof (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	char sof_data[34];	// max. size of register set</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dprintk(3, "%s: write SOF (%dx%d, %d components)\n", ptr-&gt;name,</div><div class='del'>-		ptr-&gt;width, ptr-&gt;height, NO_OF_COMPONENTS);</div><div class='del'>-	sof_data[0] = 0xff;</div><div class='del'>-	sof_data[1] = 0xc0;</div><div class='del'>-	sof_data[2] = 0x00;</div><div class='del'>-	sof_data[3] = (3 * NO_OF_COMPONENTS) + 8;</div><div class='del'>-	sof_data[4] = BASELINE_PRECISION;	// only '8' possible with zr36050</div><div class='del'>-	sof_data[5] = (ptr-&gt;height) &gt;&gt; 8;</div><div class='del'>-	sof_data[6] = (ptr-&gt;height) &amp; 0xff;</div><div class='del'>-	sof_data[7] = (ptr-&gt;width) &gt;&gt; 8;</div><div class='del'>-	sof_data[8] = (ptr-&gt;width) &amp; 0xff;</div><div class='del'>-	sof_data[9] = NO_OF_COMPONENTS;</div><div class='del'>-	for (i = 0; i &lt; NO_OF_COMPONENTS; i++) {</div><div class='del'>-		sof_data[10 + (i * 3)] = i;	// index identifier</div><div class='del'>-		sof_data[11 + (i * 3)] = (ptr-&gt;h_samp_ratio[i] &lt;&lt; 4) | (ptr-&gt;v_samp_ratio[i]);	// sampling ratios</div><div class='del'>-		sof_data[12 + (i * 3)] = zr36050_tq[i];	// Q table selection</div><div class='del'>-	}</div><div class='del'>-	return zr36050_pushit(ptr, ZR050_SOF_IDX,</div><div class='del'>-			      (3 * NO_OF_COMPONENTS) + 10, sof_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-/* SOS (start of scan) segment depends on the used scan components</div><div class='del'>-			of each color component */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_set_sos (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	char sos_data[16];	// max. size of register set</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dprintk(3, "%s: write SOS\n", ptr-&gt;name);</div><div class='del'>-	sos_data[0] = 0xff;</div><div class='del'>-	sos_data[1] = 0xda;</div><div class='del'>-	sos_data[2] = 0x00;</div><div class='del'>-	sos_data[3] = 2 + 1 + (2 * NO_OF_COMPONENTS) + 3;</div><div class='del'>-	sos_data[4] = NO_OF_COMPONENTS;</div><div class='del'>-	for (i = 0; i &lt; NO_OF_COMPONENTS; i++) {</div><div class='del'>-		sos_data[5 + (i * 2)] = i;	// index</div><div class='del'>-		sos_data[6 + (i * 2)] = (zr36050_td[i] &lt;&lt; 4) | zr36050_ta[i];	// AC/DC tbl.sel.</div><div class='del'>-	}</div><div class='del'>-	sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00;	// scan start</div><div class='del'>-	sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3F;</div><div class='del'>-	sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 4] = 00;</div><div class='del'>-	return zr36050_pushit(ptr, ZR050_SOS1_IDX,</div><div class='del'>-			      4 + 1 + (2 * NO_OF_COMPONENTS) + 3,</div><div class='del'>-			      sos_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-/* DRI (define restart interval) */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_set_dri (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	char dri_data[6];	// max. size of register set</div><div class='del'>-</div><div class='del'>-	dprintk(3, "%s: write DRI\n", ptr-&gt;name);</div><div class='del'>-	dri_data[0] = 0xff;</div><div class='del'>-	dri_data[1] = 0xdd;</div><div class='del'>-	dri_data[2] = 0x00;</div><div class='del'>-	dri_data[3] = 0x04;</div><div class='del'>-	dri_data[4] = ptr-&gt;dri &gt;&gt; 8;</div><div class='del'>-	dri_data[5] = ptr-&gt;dri &amp; 0xff;</div><div class='del'>-	return zr36050_pushit(ptr, ZR050_DRI_IDX, 6, dri_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Setup function:</div><div class='del'>-</div><div class='del'>-   Setup compression/decompression of Zoran's JPEG processor</div><div class='del'>-   ( see also zoran 36050 manual )</div><div class='del'>-</div><div class='del'>-   ... sorry for the spaghetti code ...</div><div class='del'>-   ========================================================================= */</div><div class='del'>-static void</div><div class='del'>-zr36050_init (struct zr36050 *ptr)</div><div class='del'>-{</div><div class='del'>-	int sum = 0;</div><div class='del'>-	long bitcnt, tmp;</div><div class='del'>-</div><div class='del'>-	if (ptr-&gt;mode == CODEC_DO_COMPRESSION) {</div><div class='del'>-		dprintk(2, "%s: COMPRESSION SETUP\n", ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-		/* 050 communicates with 057 in master mode */</div><div class='del'>-		zr36050_write(ptr, ZR050_HARDWARE, ZR050_HW_MSTR);</div><div class='del'>-</div><div class='del'>-		/* encoding table preload for compression */</div><div class='del'>-		zr36050_write(ptr, ZR050_MODE,</div><div class='del'>-			      ZR050_MO_COMP | ZR050_MO_TLM);</div><div class='del'>-		zr36050_write(ptr, ZR050_OPTIONS, 0);</div><div class='del'>-</div><div class='del'>-		/* disable all IRQs */</div><div class='del'>-		zr36050_write(ptr, ZR050_INT_REQ_0, 0);</div><div class='del'>-		zr36050_write(ptr, ZR050_INT_REQ_1, 3);	// low 2 bits always 1</div><div class='del'>-</div><div class='del'>-		/* volume control settings */</div><div class='del'>-		/*zr36050_write(ptr, ZR050_MBCV, ptr-&gt;max_block_vol);*/</div><div class='del'>-		zr36050_write(ptr, ZR050_SF_HI, ptr-&gt;scalefact &gt;&gt; 8);</div><div class='del'>-		zr36050_write(ptr, ZR050_SF_LO, ptr-&gt;scalefact &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		zr36050_write(ptr, ZR050_AF_HI, 0xff);</div><div class='del'>-		zr36050_write(ptr, ZR050_AF_M, 0xff);</div><div class='del'>-		zr36050_write(ptr, ZR050_AF_LO, 0xff);</div><div class='del'>-</div><div class='del'>-		/* setup the variable jpeg tables */</div><div class='del'>-		sum += zr36050_set_sof(ptr);</div><div class='del'>-		sum += zr36050_set_sos(ptr);</div><div class='del'>-		sum += zr36050_set_dri(ptr);</div><div class='del'>-</div><div class='del'>-		/* setup the fixed jpeg tables - maybe variable, though -</div><div class='del'>-		 * (see table init section above) */</div><div class='del'>-		dprintk(3, "%s: write DQT, DHT, APP\n", ptr-&gt;name);</div><div class='del'>-		sum += zr36050_pushit(ptr, ZR050_DQT_IDX,</div><div class='del'>-				      sizeof(zr36050_dqt), zr36050_dqt);</div><div class='del'>-		sum += zr36050_pushit(ptr, ZR050_DHT_IDX,</div><div class='del'>-				      sizeof(zr36050_dht), zr36050_dht);</div><div class='del'>-		zr36050_write(ptr, ZR050_APP_IDX, 0xff);</div><div class='del'>-		zr36050_write(ptr, ZR050_APP_IDX + 1, 0xe0 + ptr-&gt;app.appn);</div><div class='del'>-		zr36050_write(ptr, ZR050_APP_IDX + 2, 0x00);</div><div class='del'>-		zr36050_write(ptr, ZR050_APP_IDX + 3, ptr-&gt;app.len + 2);</div><div class='del'>-		sum += zr36050_pushit(ptr, ZR050_APP_IDX + 4, 60,</div><div class='del'>-				      ptr-&gt;app.data) + 4;</div><div class='del'>-		zr36050_write(ptr, ZR050_COM_IDX, 0xff);</div><div class='del'>-		zr36050_write(ptr, ZR050_COM_IDX + 1, 0xfe);</div><div class='del'>-		zr36050_write(ptr, ZR050_COM_IDX + 2, 0x00);</div><div class='del'>-		zr36050_write(ptr, ZR050_COM_IDX + 3, ptr-&gt;com.len + 2);</div><div class='del'>-		sum += zr36050_pushit(ptr, ZR050_COM_IDX + 4, 60,</div><div class='del'>-				      ptr-&gt;com.data) + 4;</div><div class='del'>-</div><div class='del'>-		/* do the internal huffman table preload */</div><div class='del'>-		zr36050_write(ptr, ZR050_MARKERS_EN, ZR050_ME_DHTI);</div><div class='del'>-</div><div class='del'>-		zr36050_write(ptr, ZR050_GO, 1);	// launch codec</div><div class='del'>-		zr36050_wait_end(ptr);</div><div class='del'>-		dprintk(2, "%s: Status after table preload: 0x%02x\n",</div><div class='del'>-			ptr-&gt;name, ptr-&gt;status1);</div><div class='del'>-</div><div class='del'>-		if ((ptr-&gt;status1 &amp; 0x4) == 0) {</div><div class='del'>-			dprintk(1, KERN_ERR "%s: init aborted!\n",</div><div class='del'>-				ptr-&gt;name);</div><div class='del'>-			return;	// something is wrong, its timed out!!!!</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* setup misc. data for compression (target code sizes) */</div><div class='del'>-</div><div class='del'>-		/* size of compressed code to reach without header data */</div><div class='del'>-		sum = ptr-&gt;real_code_vol - sum;</div><div class='del'>-		bitcnt = sum &lt;&lt; 3;	/* need the size in bits */</div><div class='del'>-</div><div class='del'>-		tmp = bitcnt &gt;&gt; 16;</div><div class='del'>-		dprintk(3,</div><div class='del'>-			"%s: code: csize=%d, tot=%d, bit=%ld, highbits=%ld\n",</div><div class='del'>-			ptr-&gt;name, sum, ptr-&gt;real_code_vol, bitcnt, tmp);</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_NET_HI, tmp &gt;&gt; 8);</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_NET_MH, tmp &amp; 0xff);</div><div class='del'>-		tmp = bitcnt &amp; 0xffff;</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_NET_ML, tmp &gt;&gt; 8);</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_NET_LO, tmp &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		bitcnt -= bitcnt &gt;&gt; 7;	// bits without stuffing</div><div class='del'>-		bitcnt -= ((bitcnt * 5) &gt;&gt; 6);	// bits without eob</div><div class='del'>-</div><div class='del'>-		tmp = bitcnt &gt;&gt; 16;</div><div class='del'>-		dprintk(3, "%s: code: nettobit=%ld, highnettobits=%ld\n",</div><div class='del'>-			ptr-&gt;name, bitcnt, tmp);</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_DATA_HI, tmp &gt;&gt; 8);</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_DATA_MH, tmp &amp; 0xff);</div><div class='del'>-		tmp = bitcnt &amp; 0xffff;</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_DATA_ML, tmp &gt;&gt; 8);</div><div class='del'>-		zr36050_write(ptr, ZR050_TCV_DATA_LO, tmp &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		/* compression setup with or without bitrate control */</div><div class='del'>-		zr36050_write(ptr, ZR050_MODE,</div><div class='del'>-			      ZR050_MO_COMP | ZR050_MO_PASS2 |</div><div class='del'>-			      (ptr-&gt;bitrate_ctrl ? ZR050_MO_BRC : 0));</div><div class='del'>-</div><div class='del'>-		/* this headers seem to deliver "valid AVI" jpeg frames */</div><div class='del'>-		zr36050_write(ptr, ZR050_MARKERS_EN,</div><div class='del'>-			      ZR050_ME_DQT | ZR050_ME_DHT |</div><div class='del'>-			      ((ptr-&gt;app.len &gt; 0) ? ZR050_ME_APP : 0) |</div><div class='del'>-			      ((ptr-&gt;com.len &gt; 0) ? ZR050_ME_COM : 0));</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(2, "%s: EXPANSION SETUP\n", ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-		/* 050 communicates with 055 in master mode */</div><div class='del'>-		zr36050_write(ptr, ZR050_HARDWARE,</div><div class='del'>-			      ZR050_HW_MSTR | ZR050_HW_CFIS_2_CLK);</div><div class='del'>-</div><div class='del'>-		/* encoding table preload */</div><div class='del'>-		zr36050_write(ptr, ZR050_MODE, ZR050_MO_TLM);</div><div class='del'>-</div><div class='del'>-		/* disable all IRQs */</div><div class='del'>-		zr36050_write(ptr, ZR050_INT_REQ_0, 0);</div><div class='del'>-		zr36050_write(ptr, ZR050_INT_REQ_1, 3);	// low 2 bits always 1</div><div class='del'>-</div><div class='del'>-		dprintk(3, "%s: write DHT\n", ptr-&gt;name);</div><div class='del'>-		zr36050_pushit(ptr, ZR050_DHT_IDX, sizeof(zr36050_dht),</div><div class='del'>-			       zr36050_dht);</div><div class='del'>-</div><div class='del'>-		/* do the internal huffman table preload */</div><div class='del'>-		zr36050_write(ptr, ZR050_MARKERS_EN, ZR050_ME_DHTI);</div><div class='del'>-</div><div class='del'>-		zr36050_write(ptr, ZR050_GO, 1);	// launch codec</div><div class='del'>-		zr36050_wait_end(ptr);</div><div class='del'>-		dprintk(2, "%s: Status after table preload: 0x%02x\n",</div><div class='del'>-			ptr-&gt;name, ptr-&gt;status1);</div><div class='del'>-</div><div class='del'>-		if ((ptr-&gt;status1 &amp; 0x4) == 0) {</div><div class='del'>-			dprintk(1, KERN_ERR "%s: init aborted!\n",</div><div class='del'>-				ptr-&gt;name);</div><div class='del'>-			return;	// something is wrong, its timed out!!!!</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* setup misc. data for expansion */</div><div class='del'>-		zr36050_write(ptr, ZR050_MODE, 0);</div><div class='del'>-		zr36050_write(ptr, ZR050_MARKERS_EN, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* adr on selected, to allow GO from master */</div><div class='del'>-	zr36050_read(ptr, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   CODEC API FUNCTIONS</div><div class='del'>-</div><div class='del'>-   this functions are accessed by the master via the API structure</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* set compression/expansion mode and launches codec -</div><div class='del'>-   this should be the last call from the master before starting processing */</div><div class='del'>-static int</div><div class='del'>-zr36050_set_mode (struct videocodec *codec,</div><div class='del'>-		  int                mode)</div><div class='del'>-{</div><div class='del'>-	struct zr36050 *ptr = (struct zr36050 *) codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: set_mode %d call\n", ptr-&gt;name, mode);</div><div class='del'>-</div><div class='del'>-	if ((mode != CODEC_DO_EXPANSION) &amp;&amp; (mode != CODEC_DO_COMPRESSION))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ptr-&gt;mode = mode;</div><div class='del'>-	zr36050_init(ptr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set picture size (norm is ignored as the codec doesn't know about it) */</div><div class='del'>-static int</div><div class='del'>-zr36050_set_video (struct videocodec   *codec,</div><div class='del'>-		   struct tvnorm       *norm,</div><div class='del'>-		   struct vfe_settings *cap,</div><div class='del'>-		   struct vfe_polarity *pol)</div><div class='del'>-{</div><div class='del'>-	struct zr36050 *ptr = (struct zr36050 *) codec-&gt;data;</div><div class='del'>-	int size;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: set_video %d.%d, %d/%d-%dx%d (0x%x) q%d call\n",</div><div class='del'>-		ptr-&gt;name, norm-&gt;HStart, norm-&gt;VStart,</div><div class='del'>-		cap-&gt;x, cap-&gt;y, cap-&gt;width, cap-&gt;height,</div><div class='del'>-		cap-&gt;decimation, cap-&gt;quality);</div><div class='del'>-	/* if () return -EINVAL;</div><div class='del'>-	 * trust the master driver that it knows what it does - so</div><div class='del'>-	 * we allow invalid startx/y and norm for now ... */</div><div class='del'>-	ptr-&gt;width = cap-&gt;width / (cap-&gt;decimation &amp; 0xff);</div><div class='del'>-	ptr-&gt;height = cap-&gt;height / ((cap-&gt;decimation &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* (KM) JPEG quality */</div><div class='del'>-	size = ptr-&gt;width * ptr-&gt;height;</div><div class='del'>-	size *= 16; /* size in bits */</div><div class='del'>-	/* apply quality setting */</div><div class='del'>-	size = size * cap-&gt;quality / 200;</div><div class='del'>-</div><div class='del'>-	/* Minimum: 1kb */</div><div class='del'>-	if (size &lt; 8192)</div><div class='del'>-		size = 8192;</div><div class='del'>-	/* Maximum: 7/8 of code buffer */</div><div class='del'>-	if (size &gt; ptr-&gt;total_code_vol * 7)</div><div class='del'>-		size = ptr-&gt;total_code_vol * 7;</div><div class='del'>-</div><div class='del'>-	ptr-&gt;real_code_vol = size &gt;&gt; 3; /* in bytes */</div><div class='del'>-</div><div class='del'>-	/* Set max_block_vol here (previously in zr36050_init, moved</div><div class='del'>-	 * here for consistency with zr36060 code */</div><div class='del'>-	zr36050_write(ptr, ZR050_MBCV, ptr-&gt;max_block_vol);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional control functions */</div><div class='del'>-static int</div><div class='del'>-zr36050_control (struct videocodec *codec,</div><div class='del'>-		 int                type,</div><div class='del'>-		 int                size,</div><div class='del'>-		 void              *data)</div><div class='del'>-{</div><div class='del'>-	struct zr36050 *ptr = (struct zr36050 *) codec-&gt;data;</div><div class='del'>-	int *ival = (int *) data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: control %d call with %d byte\n", ptr-&gt;name, type,</div><div class='del'>-		size);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CODEC_G_STATUS:	/* get last status */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		zr36050_read_status1(ptr);</div><div class='del'>-		*ival = ptr-&gt;status1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_CODEC_MODE:</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = CODEC_MODE_BJPG;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_CODEC_MODE:</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (*ival != CODEC_MODE_BJPG)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		/* not needed, do nothing */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_VFE:</div><div class='del'>-	case CODEC_S_VFE:</div><div class='del'>-		/* not needed, do nothing */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_MMAP:</div><div class='del'>-		/* not available, give an error */</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_TDS_BYTE:	/* get target volume in byte */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = ptr-&gt;total_code_vol;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_TDS_BYTE:	/* get target volume in byte */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ptr-&gt;total_code_vol = *ival;</div><div class='del'>-		/* (Kieran Morrissey)</div><div class='del'>-		 * code copied from zr36060.c to ensure proper bitrate */</div><div class='del'>-		ptr-&gt;real_code_vol = (ptr-&gt;total_code_vol * 6) &gt;&gt; 3;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_SCALE:	/* get scaling factor */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = zr36050_read_scalefactor(ptr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_SCALE:	/* set scaling factor */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ptr-&gt;scalefact = *ival;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_APP_DATA: {	/* get appn marker data */</div><div class='del'>-		struct jpeg_app_marker *app = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_app_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		*app = ptr-&gt;app;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_APP_DATA: {	 /* set appn marker data */</div><div class='del'>-		struct jpeg_app_marker *app = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_app_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		ptr-&gt;app = *app;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_COM_DATA: {	/* get comment marker data */</div><div class='del'>-		struct jpeg_com_marker *com = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_com_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		*com = ptr-&gt;com;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_COM_DATA: {	/* set comment marker data */</div><div class='del'>-		struct jpeg_com_marker *com = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_com_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		ptr-&gt;com = *com;</div><div class='del'>-		break;</div><div class='del'>-	}</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'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Exit and unregister function:</div><div class='del'>-</div><div class='del'>-   Deinitializes Zoran's JPEG processor</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_unset (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct zr36050 *ptr = codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (ptr) {</div><div class='del'>-		/* do wee need some codec deinit here, too ???? */</div><div class='del'>-</div><div class='del'>-		dprintk(1, "%s: finished codec #%d\n", ptr-&gt;name,</div><div class='del'>-			ptr-&gt;num);</div><div class='del'>-		kfree(ptr);</div><div class='del'>-		codec-&gt;data = NULL;</div><div class='del'>-</div><div class='del'>-		zr36050_codecs--;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Setup and registry function:</div><div class='del'>-</div><div class='del'>-   Initializes Zoran's JPEG processor</div><div class='del'>-</div><div class='del'>-   Also sets pixel size, average code size, mode (compr./decompr.)</div><div class='del'>-   (the given size is determined by the processor with the video interface)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36050_setup (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct zr36050 *ptr;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "zr36050: initializing MJPEG subsystem #%d.\n",</div><div class='del'>-		zr36050_codecs);</div><div class='del'>-</div><div class='del'>-	if (zr36050_codecs == MAX_CODECS) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "zr36050: Can't attach more codecs!\n");</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-	//mem structure init</div><div class='del'>-	codec-&gt;data = ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);</div><div class='del'>-	if (NULL == ptr) {</div><div class='del'>-		dprintk(1, KERN_ERR "zr36050: Can't get enough memory!\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(ptr-&gt;name, sizeof(ptr-&gt;name), "zr36050[%d]",</div><div class='del'>-		 zr36050_codecs);</div><div class='del'>-	ptr-&gt;num = zr36050_codecs++;</div><div class='del'>-	ptr-&gt;codec = codec;</div><div class='del'>-</div><div class='del'>-	//testing</div><div class='del'>-	res = zr36050_basic_test(ptr);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		zr36050_unset(codec);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	//final setup</div><div class='del'>-	memcpy(ptr-&gt;h_samp_ratio, zr36050_decimation_h, 8);</div><div class='del'>-	memcpy(ptr-&gt;v_samp_ratio, zr36050_decimation_v, 8);</div><div class='del'>-</div><div class='del'>-	ptr-&gt;bitrate_ctrl = 0;	/* 0 or 1 - fixed file size flag</div><div class='del'>-				 * (what is the difference?) */</div><div class='del'>-	ptr-&gt;mode = CODEC_DO_COMPRESSION;</div><div class='del'>-	ptr-&gt;width = 384;</div><div class='del'>-	ptr-&gt;height = 288;</div><div class='del'>-	ptr-&gt;total_code_vol = 16000;</div><div class='del'>-	ptr-&gt;max_block_vol = 240;</div><div class='del'>-	ptr-&gt;scalefact = 0x100;</div><div class='del'>-	ptr-&gt;dri = 1;</div><div class='del'>-</div><div class='del'>-	/* no app/com marker by default */</div><div class='del'>-	ptr-&gt;app.appn = 0;</div><div class='del'>-	ptr-&gt;app.len = 0;</div><div class='del'>-	ptr-&gt;com.len = 0;</div><div class='del'>-</div><div class='del'>-	zr36050_init(ptr);</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_INFO "%s: codec attached and running\n",</div><div class='del'>-		ptr-&gt;name);</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 videocodec zr36050_codec = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.name = "zr36050",</div><div class='del'>-	.magic = 0L,		// magic not used</div><div class='del'>-	.flags =</div><div class='del'>-	    CODEC_FLAG_JPEG | CODEC_FLAG_HARDWARE | CODEC_FLAG_ENCODER |</div><div class='del'>-	    CODEC_FLAG_DECODER,</div><div class='del'>-	.type = CODEC_TYPE_ZR36050,</div><div class='del'>-	.setup = zr36050_setup,	// functionality</div><div class='del'>-	.unset = zr36050_unset,</div><div class='del'>-	.set_mode = zr36050_set_mode,</div><div class='del'>-	.set_video = zr36050_set_video,</div><div class='del'>-	.control = zr36050_control,</div><div class='del'>-	// others are not used</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   HOOK IN DRIVER AS KERNEL MODULE</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-zr36050_init_module (void)</div><div class='del'>-{</div><div class='del'>-	//dprintk(1, "ZR36050 driver %s\n",ZR050_VERSION);</div><div class='del'>-	zr36050_codecs = 0;</div><div class='del'>-	return videocodec_register(&amp;zr36050_codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-zr36050_cleanup_module (void)</div><div class='del'>-{</div><div class='del'>-	if (zr36050_codecs) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			"zr36050: something's wrong - %d codecs left somehow.\n",</div><div class='del'>-			zr36050_codecs);</div><div class='del'>-	}</div><div class='del'>-	videocodec_unregister(&amp;zr36050_codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(zr36050_init_module);</div><div class='del'>-module_exit(zr36050_cleanup_module);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Wolfgang Scherr &lt;scherr@net4you.at&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver module for ZR36050 jpeg processors "</div><div class='del'>-		   ZR050_VERSION);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36050.h b/drivers/staging/media/zoran/zr36050.h<br/>deleted file mode 100644<br/>index 9236486d3c2b..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36050.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36050.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran ZR36050 basic configuration functions - header file</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Wolfgang Scherr &lt;scherr@net4you.at&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: zr36050.h,v 1.1.2.2 2003/01/14 21:18:22 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ZR36050_H</div><div class='del'>-#define ZR36050_H</div><div class='del'>-</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-/* data stored for each zoran jpeg codec chip */</div><div class='del'>-struct zr36050 {</div><div class='del'>-	char name[32];</div><div class='del'>-	int num;</div><div class='del'>-	/* io datastructure */</div><div class='del'>-	struct videocodec *codec;</div><div class='del'>-	// last coder status</div><div class='del'>-	__u8 status1;</div><div class='del'>-	// actual coder setup</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	__u16 width;</div><div class='del'>-	__u16 height;</div><div class='del'>-</div><div class='del'>-	__u16 bitrate_ctrl;</div><div class='del'>-</div><div class='del'>-	__u32 total_code_vol;</div><div class='del'>-	__u32 real_code_vol;</div><div class='del'>-	__u16 max_block_vol;</div><div class='del'>-</div><div class='del'>-	__u8 h_samp_ratio[8];</div><div class='del'>-	__u8 v_samp_ratio[8];</div><div class='del'>-	__u16 scalefact;</div><div class='del'>-	__u16 dri;</div><div class='del'>-</div><div class='del'>-	/* com/app marker */</div><div class='del'>-	struct jpeg_com_marker com;</div><div class='del'>-	struct jpeg_app_marker app;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* zr36050 register addresses */</div><div class='del'>-#define ZR050_GO                  0x000</div><div class='del'>-#define ZR050_HARDWARE            0x002</div><div class='del'>-#define ZR050_MODE                0x003</div><div class='del'>-#define ZR050_OPTIONS             0x004</div><div class='del'>-#define ZR050_MBCV                0x005</div><div class='del'>-#define ZR050_MARKERS_EN          0x006</div><div class='del'>-#define ZR050_INT_REQ_0           0x007</div><div class='del'>-#define ZR050_INT_REQ_1           0x008</div><div class='del'>-#define ZR050_TCV_NET_HI          0x009</div><div class='del'>-#define ZR050_TCV_NET_MH          0x00a</div><div class='del'>-#define ZR050_TCV_NET_ML          0x00b</div><div class='del'>-#define ZR050_TCV_NET_LO          0x00c</div><div class='del'>-#define ZR050_TCV_DATA_HI         0x00d</div><div class='del'>-#define ZR050_TCV_DATA_MH         0x00e</div><div class='del'>-#define ZR050_TCV_DATA_ML         0x00f</div><div class='del'>-#define ZR050_TCV_DATA_LO         0x010</div><div class='del'>-#define ZR050_SF_HI               0x011</div><div class='del'>-#define ZR050_SF_LO               0x012</div><div class='del'>-#define ZR050_AF_HI               0x013</div><div class='del'>-#define ZR050_AF_M                0x014</div><div class='del'>-#define ZR050_AF_LO               0x015</div><div class='del'>-#define ZR050_ACV_HI              0x016</div><div class='del'>-#define ZR050_ACV_MH              0x017</div><div class='del'>-#define ZR050_ACV_ML              0x018</div><div class='del'>-#define ZR050_ACV_LO              0x019</div><div class='del'>-#define ZR050_ACT_HI              0x01a</div><div class='del'>-#define ZR050_ACT_MH              0x01b</div><div class='del'>-#define ZR050_ACT_ML              0x01c</div><div class='del'>-#define ZR050_ACT_LO              0x01d</div><div class='del'>-#define ZR050_ACV_TRUN_HI         0x01e</div><div class='del'>-#define ZR050_ACV_TRUN_MH         0x01f</div><div class='del'>-#define ZR050_ACV_TRUN_ML         0x020</div><div class='del'>-#define ZR050_ACV_TRUN_LO         0x021</div><div class='del'>-#define ZR050_STATUS_0            0x02e</div><div class='del'>-#define ZR050_STATUS_1            0x02f</div><div class='del'>-</div><div class='del'>-#define ZR050_SOF_IDX             0x040</div><div class='del'>-#define ZR050_SOS1_IDX            0x07a</div><div class='del'>-#define ZR050_SOS2_IDX            0x08a</div><div class='del'>-#define ZR050_SOS3_IDX            0x09a</div><div class='del'>-#define ZR050_SOS4_IDX            0x0aa</div><div class='del'>-#define ZR050_DRI_IDX             0x0c0</div><div class='del'>-#define ZR050_DNL_IDX             0x0c6</div><div class='del'>-#define ZR050_DQT_IDX             0x0cc</div><div class='del'>-#define ZR050_DHT_IDX             0x1d4</div><div class='del'>-#define ZR050_APP_IDX             0x380</div><div class='del'>-#define ZR050_COM_IDX             0x3c0</div><div class='del'>-</div><div class='del'>-/* zr36050 hardware register bits */</div><div class='del'>-</div><div class='del'>-#define ZR050_HW_BSWD                0x80</div><div class='del'>-#define ZR050_HW_MSTR                0x40</div><div class='del'>-#define ZR050_HW_DMA                 0x20</div><div class='del'>-#define ZR050_HW_CFIS_1_CLK          0x00</div><div class='del'>-#define ZR050_HW_CFIS_2_CLK          0x04</div><div class='del'>-#define ZR050_HW_CFIS_3_CLK          0x08</div><div class='del'>-#define ZR050_HW_CFIS_4_CLK          0x0C</div><div class='del'>-#define ZR050_HW_CFIS_5_CLK          0x10</div><div class='del'>-#define ZR050_HW_CFIS_6_CLK          0x14</div><div class='del'>-#define ZR050_HW_CFIS_7_CLK          0x18</div><div class='del'>-#define ZR050_HW_CFIS_8_CLK          0x1C</div><div class='del'>-#define ZR050_HW_BELE                0x01</div><div class='del'>-</div><div class='del'>-/* zr36050 mode register bits */</div><div class='del'>-</div><div class='del'>-#define ZR050_MO_COMP                0x80</div><div class='del'>-#define ZR050_MO_ATP                 0x40</div><div class='del'>-#define ZR050_MO_PASS2               0x20</div><div class='del'>-#define ZR050_MO_TLM                 0x10</div><div class='del'>-#define ZR050_MO_DCONLY              0x08</div><div class='del'>-#define ZR050_MO_BRC                 0x04</div><div class='del'>-</div><div class='del'>-#define ZR050_MO_ATP                 0x40</div><div class='del'>-#define ZR050_MO_PASS2               0x20</div><div class='del'>-#define ZR050_MO_TLM                 0x10</div><div class='del'>-#define ZR050_MO_DCONLY              0x08</div><div class='del'>-</div><div class='del'>-/* zr36050 option register bits */</div><div class='del'>-</div><div class='del'>-#define ZR050_OP_NSCN_1              0x00</div><div class='del'>-#define ZR050_OP_NSCN_2              0x20</div><div class='del'>-#define ZR050_OP_NSCN_3              0x40</div><div class='del'>-#define ZR050_OP_NSCN_4              0x60</div><div class='del'>-#define ZR050_OP_NSCN_5              0x80</div><div class='del'>-#define ZR050_OP_NSCN_6              0xA0</div><div class='del'>-#define ZR050_OP_NSCN_7              0xC0</div><div class='del'>-#define ZR050_OP_NSCN_8              0xE0</div><div class='del'>-#define ZR050_OP_OVF                 0x10</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* zr36050 markers-enable register bits */</div><div class='del'>-</div><div class='del'>-#define ZR050_ME_APP                 0x80</div><div class='del'>-#define ZR050_ME_COM                 0x40</div><div class='del'>-#define ZR050_ME_DRI                 0x20</div><div class='del'>-#define ZR050_ME_DQT                 0x10</div><div class='del'>-#define ZR050_ME_DHT                 0x08</div><div class='del'>-#define ZR050_ME_DNL                 0x04</div><div class='del'>-#define ZR050_ME_DQTI                0x02</div><div class='del'>-#define ZR050_ME_DHTI                0x01</div><div class='del'>-</div><div class='del'>-/* zr36050 status0/1 register bit masks */</div><div class='del'>-</div><div class='del'>-#define ZR050_ST_RST_MASK            0x20</div><div class='del'>-#define ZR050_ST_SOF_MASK            0x02</div><div class='del'>-#define ZR050_ST_SOS_MASK            0x02</div><div class='del'>-#define ZR050_ST_DATRDY_MASK         0x80</div><div class='del'>-#define ZR050_ST_MRKDET_MASK         0x40</div><div class='del'>-#define ZR050_ST_RFM_MASK            0x10</div><div class='del'>-#define ZR050_ST_RFD_MASK            0x08</div><div class='del'>-#define ZR050_ST_END_MASK            0x04</div><div class='del'>-#define ZR050_ST_TCVOVF_MASK         0x02</div><div class='del'>-#define ZR050_ST_DATOVF_MASK         0x01</div><div class='del'>-</div><div class='del'>-/* pixel component idx */</div><div class='del'>-</div><div class='del'>-#define ZR050_Y_COMPONENT         0</div><div class='del'>-#define ZR050_U_COMPONENT         1</div><div class='del'>-#define ZR050_V_COMPONENT         2</div><div class='del'>-</div><div class='del'>-#endif				/*fndef ZR36050_H */</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36057.h b/drivers/staging/media/zoran/zr36057.h<br/>deleted file mode 100644<br/>index c8acb21dcb5c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36057.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36057.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,164 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * zr36057.h - zr36057 register offsets</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Dave Perks &lt;dperks@ibm.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 GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</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'>-</div><div class='del'>-#ifndef _ZR36057_H_</div><div class='del'>-#define _ZR36057_H_</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Zoran ZR36057 registers */</div><div class='del'>-</div><div class='del'>-#define ZR36057_VFEHCR          0x000	/* Video Front End, Horizontal Configuration Register */</div><div class='del'>-#define ZR36057_VFEHCR_HSPol            (1&lt;&lt;30)</div><div class='del'>-#define ZR36057_VFEHCR_HStart           10</div><div class='del'>-#define ZR36057_VFEHCR_HEnd		0</div><div class='del'>-#define ZR36057_VFEHCR_Hmask		0x3ff</div><div class='del'>-</div><div class='del'>-#define ZR36057_VFEVCR          0x004	/* Video Front End, Vertical Configuration Register */</div><div class='del'>-#define ZR36057_VFEVCR_VSPol            (1&lt;&lt;30)</div><div class='del'>-#define ZR36057_VFEVCR_VStart           10</div><div class='del'>-#define ZR36057_VFEVCR_VEnd		0</div><div class='del'>-#define ZR36057_VFEVCR_Vmask		0x3ff</div><div class='del'>-</div><div class='del'>-#define ZR36057_VFESPFR         0x008	/* Video Front End, Scaler and Pixel Format Register */</div><div class='del'>-#define ZR36057_VFESPFR_ExtFl           (1&lt;&lt;26)</div><div class='del'>-#define ZR36057_VFESPFR_TopField        (1&lt;&lt;25)</div><div class='del'>-#define ZR36057_VFESPFR_VCLKPol         (1&lt;&lt;24)</div><div class='del'>-#define ZR36057_VFESPFR_HFilter         21</div><div class='del'>-#define ZR36057_VFESPFR_HorDcm          14</div><div class='del'>-#define ZR36057_VFESPFR_VerDcm          8</div><div class='del'>-#define ZR36057_VFESPFR_DispMode        6</div><div class='del'>-#define ZR36057_VFESPFR_YUV422          (0&lt;&lt;3)</div><div class='del'>-#define ZR36057_VFESPFR_RGB888          (1&lt;&lt;3)</div><div class='del'>-#define ZR36057_VFESPFR_RGB565          (2&lt;&lt;3)</div><div class='del'>-#define ZR36057_VFESPFR_RGB555          (3&lt;&lt;3)</div><div class='del'>-#define ZR36057_VFESPFR_ErrDif          (1&lt;&lt;2)</div><div class='del'>-#define ZR36057_VFESPFR_Pack24          (1&lt;&lt;1)</div><div class='del'>-#define ZR36057_VFESPFR_LittleEndian    (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define ZR36057_VDTR            0x00c	/* Video Display "Top" Register */</div><div class='del'>-</div><div class='del'>-#define ZR36057_VDBR            0x010	/* Video Display "Bottom" Register */</div><div class='del'>-</div><div class='del'>-#define ZR36057_VSSFGR          0x014	/* Video Stride, Status, and Frame Grab Register */</div><div class='del'>-#define ZR36057_VSSFGR_DispStride       16</div><div class='del'>-#define ZR36057_VSSFGR_VidOvf           (1&lt;&lt;8)</div><div class='del'>-#define ZR36057_VSSFGR_SnapShot         (1&lt;&lt;1)</div><div class='del'>-#define ZR36057_VSSFGR_FrameGrab        (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define ZR36057_VDCR            0x018	/* Video Display Configuration Register */</div><div class='del'>-#define ZR36057_VDCR_VidEn              (1&lt;&lt;31)</div><div class='del'>-#define ZR36057_VDCR_MinPix             24</div><div class='del'>-#define ZR36057_VDCR_Triton             (1&lt;&lt;24)</div><div class='del'>-#define ZR36057_VDCR_VidWinHt           12</div><div class='del'>-#define ZR36057_VDCR_VidWinWid          0</div><div class='del'>-</div><div class='del'>-#define ZR36057_MMTR            0x01c	/* Masking Map "Top" Register */</div><div class='del'>-</div><div class='del'>-#define ZR36057_MMBR            0x020	/* Masking Map "Bottom" Register */</div><div class='del'>-</div><div class='del'>-#define ZR36057_OCR             0x024	/* Overlay Control Register */</div><div class='del'>-#define ZR36057_OCR_OvlEnable           (1 &lt;&lt; 15)</div><div class='del'>-#define ZR36057_OCR_MaskStride          0</div><div class='del'>-</div><div class='del'>-#define ZR36057_SPGPPCR         0x028	/* System, PCI, and General Purpose Pins Control Register */</div><div class='del'>-#define ZR36057_SPGPPCR_SoftReset	(1&lt;&lt;24)</div><div class='del'>-</div><div class='del'>-#define ZR36057_GPPGCR1         0x02c	/* General Purpose Pins and GuestBus Control Register (1) */</div><div class='del'>-</div><div class='del'>-#define ZR36057_MCSAR           0x030	/* MPEG Code Source Address Register */</div><div class='del'>-</div><div class='del'>-#define ZR36057_MCTCR           0x034	/* MPEG Code Transfer Control Register */</div><div class='del'>-#define ZR36057_MCTCR_CodTime           (1 &lt;&lt; 30)</div><div class='del'>-#define ZR36057_MCTCR_CEmpty            (1 &lt;&lt; 29)</div><div class='del'>-#define ZR36057_MCTCR_CFlush            (1 &lt;&lt; 28)</div><div class='del'>-#define ZR36057_MCTCR_CodGuestID	20</div><div class='del'>-#define ZR36057_MCTCR_CodGuestReg	16</div><div class='del'>-</div><div class='del'>-#define ZR36057_MCMPR           0x038	/* MPEG Code Memory Pointer Register */</div><div class='del'>-</div><div class='del'>-#define ZR36057_ISR             0x03c	/* Interrupt Status Register */</div><div class='del'>-#define ZR36057_ISR_GIRQ1               (1&lt;&lt;30)</div><div class='del'>-#define ZR36057_ISR_GIRQ0               (1&lt;&lt;29)</div><div class='del'>-#define ZR36057_ISR_CodRepIRQ           (1&lt;&lt;28)</div><div class='del'>-#define ZR36057_ISR_JPEGRepIRQ          (1&lt;&lt;27)</div><div class='del'>-</div><div class='del'>-#define ZR36057_ICR             0x040	/* Interrupt Control Register */</div><div class='del'>-#define ZR36057_ICR_GIRQ1               (1&lt;&lt;30)</div><div class='del'>-#define ZR36057_ICR_GIRQ0               (1&lt;&lt;29)</div><div class='del'>-#define ZR36057_ICR_CodRepIRQ           (1&lt;&lt;28)</div><div class='del'>-#define ZR36057_ICR_JPEGRepIRQ          (1&lt;&lt;27)</div><div class='del'>-#define ZR36057_ICR_IntPinEn            (1&lt;&lt;24)</div><div class='del'>-</div><div class='del'>-#define ZR36057_I2CBR           0x044	/* I2C Bus Register */</div><div class='del'>-#define ZR36057_I2CBR_SDA		(1&lt;&lt;1)</div><div class='del'>-#define ZR36057_I2CBR_SCL		(1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define ZR36057_JMC             0x100	/* JPEG Mode and Control */</div><div class='del'>-#define ZR36057_JMC_JPG                 (1 &lt;&lt; 31)</div><div class='del'>-#define ZR36057_JMC_JPGExpMode          (0 &lt;&lt; 29)</div><div class='del'>-#define ZR36057_JMC_JPGCmpMode          (1 &lt;&lt; 29)</div><div class='del'>-#define ZR36057_JMC_MJPGExpMode         (2 &lt;&lt; 29)</div><div class='del'>-#define ZR36057_JMC_MJPGCmpMode         (3 &lt;&lt; 29)</div><div class='del'>-#define ZR36057_JMC_RTBUSY_FB           (1 &lt;&lt; 6)</div><div class='del'>-#define ZR36057_JMC_Go_en               (1 &lt;&lt; 5)</div><div class='del'>-#define ZR36057_JMC_SyncMstr            (1 &lt;&lt; 4)</div><div class='del'>-#define ZR36057_JMC_Fld_per_buff        (1 &lt;&lt; 3)</div><div class='del'>-#define ZR36057_JMC_VFIFO_FB            (1 &lt;&lt; 2)</div><div class='del'>-#define ZR36057_JMC_CFIFO_FB            (1 &lt;&lt; 1)</div><div class='del'>-#define ZR36057_JMC_Stll_LitEndian      (1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define ZR36057_JPC             0x104	/* JPEG Process Control */</div><div class='del'>-#define ZR36057_JPC_P_Reset             (1 &lt;&lt; 7)</div><div class='del'>-#define ZR36057_JPC_CodTrnsEn           (1 &lt;&lt; 5)</div><div class='del'>-#define ZR36057_JPC_Active              (1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define ZR36057_VSP             0x108	/* Vertical Sync Parameters */</div><div class='del'>-#define ZR36057_VSP_VsyncSize           16</div><div class='del'>-#define ZR36057_VSP_FrmTot              0</div><div class='del'>-</div><div class='del'>-#define ZR36057_HSP             0x10c	/* Horizontal Sync Parameters */</div><div class='del'>-#define ZR36057_HSP_HsyncStart          16</div><div class='del'>-#define ZR36057_HSP_LineTot             0</div><div class='del'>-</div><div class='del'>-#define ZR36057_FHAP            0x110	/* Field Horizontal Active Portion */</div><div class='del'>-#define ZR36057_FHAP_NAX                16</div><div class='del'>-#define ZR36057_FHAP_PAX                0</div><div class='del'>-</div><div class='del'>-#define ZR36057_FVAP            0x114	/* Field Vertical Active Portion */</div><div class='del'>-#define ZR36057_FVAP_NAY                16</div><div class='del'>-#define ZR36057_FVAP_PAY                0</div><div class='del'>-</div><div class='del'>-#define ZR36057_FPP             0x118	/* Field Process Parameters */</div><div class='del'>-#define ZR36057_FPP_Odd_Even            (1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define ZR36057_JCBA            0x11c	/* JPEG Code Base Address */</div><div class='del'>-</div><div class='del'>-#define ZR36057_JCFT            0x120	/* JPEG Code FIFO Threshold */</div><div class='del'>-</div><div class='del'>-#define ZR36057_JCGI            0x124	/* JPEG Codec Guest ID */</div><div class='del'>-#define ZR36057_JCGI_JPEGuestID         4</div><div class='del'>-#define ZR36057_JCGI_JPEGuestReg        0</div><div class='del'>-</div><div class='del'>-#define ZR36057_GCR2            0x12c	/* GuestBus Control Register (2) */</div><div class='del'>-</div><div class='del'>-#define ZR36057_POR             0x200	/* Post Office Register */</div><div class='del'>-#define ZR36057_POR_POPen               (1&lt;&lt;25)</div><div class='del'>-#define ZR36057_POR_POTime              (1&lt;&lt;24)</div><div class='del'>-#define ZR36057_POR_PODir               (1&lt;&lt;23)</div><div class='del'>-</div><div class='del'>-#define ZR36057_STR             0x300	/* "Still" Transfer Register */</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36060.c b/drivers/staging/media/zoran/zr36060.c<br/>deleted file mode 100644<br/>index 2c2e8130fc96..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36060.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36060.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1006 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran ZR36060 basic configuration functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: zr36060.c,v 1.1.2.22 2003/05/06 09:35:36 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ZR060_VERSION "v0.7"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-/* I/O commands, error codes */</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-/* headerfile of this module */</div><div class='del'>-#include "zr36060.h"</div><div class='del'>-</div><div class='del'>-/* codec io API */</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-/* it doesn't make sense to have more than 20 or so,</div><div class='del'>-  just to prevent some unwanted loops */</div><div class='del'>-#define MAX_CODECS 20</div><div class='del'>-</div><div class='del'>-/* amount of chips attached via this driver */</div><div class='del'>-static int zr36060_codecs;</div><div class='del'>-</div><div class='del'>-static bool low_bitrate;</div><div class='del'>-module_param(low_bitrate, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate");</div><div class='del'>-</div><div class='del'>-/* debugging is available via module parameter */</div><div class='del'>-static int debug;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0-4)");</div><div class='del'>-</div><div class='del'>-#define dprintk(num, format, args...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (debug &gt;= num) \</div><div class='del'>-			printk(format, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local hardware I/O functions:</div><div class='del'>-</div><div class='del'>-   read/write via codec layer (registers are located in the master device)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* read and write functions */</div><div class='del'>-static u8</div><div class='del'>-zr36060_read (struct zr36060 *ptr,</div><div class='del'>-	      u16             reg)</div><div class='del'>-{</div><div class='del'>-	u8 value = 0;</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;readreg)</div><div class='del'>-		value = (ptr-&gt;codec-&gt;master_data-&gt;readreg(ptr-&gt;codec,</div><div class='del'>-							  reg)) &amp; 0xff;</div><div class='del'>-	else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "%s: invalid I/O setup, nothing read!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-	//dprintk(4, "%s: reading from 0x%04x: %02x\n",ptr-&gt;name,reg,value);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36060_write(struct zr36060 *ptr,</div><div class='del'>-	      u16             reg,</div><div class='del'>-	      u8              value)</div><div class='del'>-{</div><div class='del'>-	//dprintk(4, "%s: writing 0x%02x to 0x%04x\n",ptr-&gt;name,value,reg);</div><div class='del'>-	dprintk(4, "0x%02x @0x%04x\n", value, reg);</div><div class='del'>-</div><div class='del'>-	// just in case something is wrong...</div><div class='del'>-	if (ptr-&gt;codec-&gt;master_data-&gt;writereg)</div><div class='del'>-		ptr-&gt;codec-&gt;master_data-&gt;writereg(ptr-&gt;codec, reg, value);</div><div class='del'>-	else</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: invalid I/O setup, nothing written!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   status read</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* status is kept in datastructure */</div><div class='del'>-static u8</div><div class='del'>-zr36060_read_status (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	ptr-&gt;status = zr36060_read(ptr, ZR060_CFSR);</div><div class='del'>-</div><div class='del'>-	zr36060_read(ptr, 0);</div><div class='del'>-	return ptr-&gt;status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   scale factor read</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* scale factor is kept in datastructure */</div><div class='del'>-static u16</div><div class='del'>-zr36060_read_scalefactor (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	ptr-&gt;scalefact = (zr36060_read(ptr, ZR060_SF_HI) &lt;&lt; 8) |</div><div class='del'>-			 (zr36060_read(ptr, ZR060_SF_LO) &amp; 0xFF);</div><div class='del'>-</div><div class='del'>-	/* leave 0 selected for an eventually GO from master */</div><div class='del'>-	zr36060_read(ptr, 0);</div><div class='del'>-	return ptr-&gt;scalefact;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   wait if codec is ready to proceed (end of processing) or time is over</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-zr36060_wait_end (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	while (zr36060_read_status(ptr) &amp; ZR060_CFSR_Busy) {</div><div class='del'>-		udelay(1);</div><div class='del'>-		if (i++ &gt; 200000) {	// 200ms, there is for sure something wrong!!!</div><div class='del'>-			dprintk(1,</div><div class='del'>-				"%s: timeout at wait_end (last status: 0x%02x)\n",</div><div class='del'>-				ptr-&gt;name, ptr-&gt;status);</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'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   basic test of "connectivity", writes/reads to/from memory the SOF marker</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_basic_test (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	if ((zr36060_read(ptr, ZR060_IDR_DEV) != 0x33) &amp;&amp;</div><div class='del'>-	    (zr36060_read(ptr, ZR060_IDR_REV) != 0x01)) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, can't connect to jpeg processor!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zr36060_wait_end(ptr);</div><div class='del'>-	if (ptr-&gt;status &amp; ZR060_CFSR_Busy) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR</div><div class='del'>-			"%s: attach failed, jpeg processor failed (end flag)!\n",</div><div class='del'>-			ptr-&gt;name);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;		/* looks good! */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper function:</div><div class='del'>-</div><div class='del'>-   simple loop for pushing the init datasets</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_pushit (struct zr36060 *ptr,</div><div class='del'>-		u16             startreg,</div><div class='del'>-		u16             len,</div><div class='del'>-		const char     *data)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	dprintk(4, "%s: write data block to 0x%04x (len=%d)\n", ptr-&gt;name,</div><div class='del'>-		startreg, len);</div><div class='del'>-	while (i &lt; len) {</div><div class='del'>-		zr36060_write(ptr, startreg++, data[i++]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Basic datasets:</div><div class='del'>-</div><div class='del'>-   jpeg baseline setup data (you find it on lots places in internet, or just</div><div class='del'>-   extract it from any regular .jpg image...)</div><div class='del'>-</div><div class='del'>-   Could be variable, but until it's not needed it they are just fixed to save</div><div class='del'>-   memory. Otherwise expand zr36060 structure with arrays, push the values to</div><div class='del'>-   it and initialize from there, as e.g. the linux zr36057/60 driver does it.</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static const char zr36060_dqt[0x86] = {</div><div class='del'>-	0xff, 0xdb,		//Marker: DQT</div><div class='del'>-	0x00, 0x84,		//Length: 2*65+2</div><div class='del'>-	0x00,			//Pq,Tq first table</div><div class='del'>-	0x10, 0x0b, 0x0c, 0x0e, 0x0c, 0x0a, 0x10, 0x0e,</div><div class='del'>-	0x0d, 0x0e, 0x12, 0x11, 0x10, 0x13, 0x18, 0x28,</div><div class='del'>-	0x1a, 0x18, 0x16, 0x16, 0x18, 0x31, 0x23, 0x25,</div><div class='del'>-	0x1d, 0x28, 0x3a, 0x33, 0x3d, 0x3c, 0x39, 0x33,</div><div class='del'>-	0x38, 0x37, 0x40, 0x48, 0x5c, 0x4e, 0x40, 0x44,</div><div class='del'>-	0x57, 0x45, 0x37, 0x38, 0x50, 0x6d, 0x51, 0x57,</div><div class='del'>-	0x5f, 0x62, 0x67, 0x68, 0x67, 0x3e, 0x4d, 0x71,</div><div class='del'>-	0x79, 0x70, 0x64, 0x78, 0x5c, 0x65, 0x67, 0x63,</div><div class='del'>-	0x01,			//Pq,Tq second table</div><div class='del'>-	0x11, 0x12, 0x12, 0x18, 0x15, 0x18, 0x2f, 0x1a,</div><div class='del'>-	0x1a, 0x2f, 0x63, 0x42, 0x38, 0x42, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,</div><div class='del'>-	0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char zr36060_dht[0x1a4] = {</div><div class='del'>-	0xff, 0xc4,		//Marker: DHT</div><div class='del'>-	0x01, 0xa2,		//Length: 2*AC, 2*DC</div><div class='del'>-	0x00,			//DC first table</div><div class='del'>-	0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,</div><div class='del'>-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='del'>-	0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,</div><div class='del'>-	0x01,			//DC second table</div><div class='del'>-	0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,</div><div class='del'>-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,</div><div class='del'>-	0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,</div><div class='del'>-	0x10,			//AC first table</div><div class='del'>-	0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,</div><div class='del'>-	0x05, 0x05, 0x04, 0x04, 0x00, 0x00,</div><div class='del'>-	0x01, 0x7D, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11,</div><div class='del'>-	0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61,</div><div class='del'>-	0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1,</div><div class='del'>-	0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0, 0x24,</div><div class='del'>-	0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17,</div><div class='del'>-	0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34,</div><div class='del'>-	0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44,</div><div class='del'>-	0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56,</div><div class='del'>-	0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66,</div><div class='del'>-	0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,</div><div class='del'>-	0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,</div><div class='del'>-	0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,</div><div class='del'>-	0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8,</div><div class='del'>-	0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9,</div><div class='del'>-	0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8,</div><div class='del'>-	0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9,</div><div class='del'>-	0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,</div><div class='del'>-	0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,</div><div class='del'>-	0xF8, 0xF9, 0xFA,</div><div class='del'>-	0x11,			//AC second table</div><div class='del'>-	0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,</div><div class='del'>-	0x07, 0x05, 0x04, 0x04, 0x00, 0x01,</div><div class='del'>-	0x02, 0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04,</div><div class='del'>-	0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,</div><div class='del'>-	0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,</div><div class='del'>-	0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 0x52, 0xF0, 0x15, 0x62,</div><div class='del'>-	0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25,</div><div class='del'>-	0xF1, 0x17, 0x18, 0x19, 0x1A, 0x26, 0x27, 0x28, 0x29, 0x2A,</div><div class='del'>-	0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44,</div><div class='del'>-	0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56,</div><div class='del'>-	0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66,</div><div class='del'>-	0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,</div><div class='del'>-	0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,</div><div class='del'>-	0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,</div><div class='del'>-	0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,</div><div class='del'>-	0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8,</div><div class='del'>-	0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,</div><div class='del'>-	0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8,</div><div class='del'>-	0xD9, 0xDA, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,</div><div class='del'>-	0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,</div><div class='del'>-	0xF9, 0xFA</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* jpeg baseline setup, this is just fixed in this driver (YUV pictures) */</div><div class='del'>-#define NO_OF_COMPONENTS          0x3	//Y,U,V</div><div class='del'>-#define BASELINE_PRECISION        0x8	//MCU size (?)</div><div class='del'>-static const char zr36060_tq[8] = { 0, 1, 1, 0, 0, 0, 0, 0 };	//table idx's QT</div><div class='del'>-static const char zr36060_td[8] = { 0, 1, 1, 0, 0, 0, 0, 0 };	//table idx's DC</div><div class='del'>-static const char zr36060_ta[8] = { 0, 1, 1, 0, 0, 0, 0, 0 };	//table idx's AC</div><div class='del'>-</div><div class='del'>-/* horizontal 422 decimation setup (maybe we support 411 or so later, too) */</div><div class='del'>-static const char zr36060_decimation_h[8] = { 2, 1, 1, 0, 0, 0, 0, 0 };</div><div class='del'>-static const char zr36060_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Local helper functions:</div><div class='del'>-</div><div class='del'>-   calculation and setup of parameter-dependent JPEG baseline segments</div><div class='del'>-   (needed for compression only)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-/* SOF (start of frame) segment depends on width, height and sampling ratio</div><div class='del'>-			 of each color component */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_set_sof (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	char sof_data[34];	// max. size of register set</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dprintk(3, "%s: write SOF (%dx%d, %d components)\n", ptr-&gt;name,</div><div class='del'>-		ptr-&gt;width, ptr-&gt;height, NO_OF_COMPONENTS);</div><div class='del'>-	sof_data[0] = 0xff;</div><div class='del'>-	sof_data[1] = 0xc0;</div><div class='del'>-	sof_data[2] = 0x00;</div><div class='del'>-	sof_data[3] = (3 * NO_OF_COMPONENTS) + 8;</div><div class='del'>-	sof_data[4] = BASELINE_PRECISION;	// only '8' possible with zr36060</div><div class='del'>-	sof_data[5] = (ptr-&gt;height) &gt;&gt; 8;</div><div class='del'>-	sof_data[6] = (ptr-&gt;height) &amp; 0xff;</div><div class='del'>-	sof_data[7] = (ptr-&gt;width) &gt;&gt; 8;</div><div class='del'>-	sof_data[8] = (ptr-&gt;width) &amp; 0xff;</div><div class='del'>-	sof_data[9] = NO_OF_COMPONENTS;</div><div class='del'>-	for (i = 0; i &lt; NO_OF_COMPONENTS; i++) {</div><div class='del'>-		sof_data[10 + (i * 3)] = i;	// index identifier</div><div class='del'>-		sof_data[11 + (i * 3)] = (ptr-&gt;h_samp_ratio[i] &lt;&lt; 4) |</div><div class='del'>-					 (ptr-&gt;v_samp_ratio[i]); // sampling ratios</div><div class='del'>-		sof_data[12 + (i * 3)] = zr36060_tq[i];	// Q table selection</div><div class='del'>-	}</div><div class='del'>-	return zr36060_pushit(ptr, ZR060_SOF_IDX,</div><div class='del'>-			      (3 * NO_OF_COMPONENTS) + 10, sof_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-/* SOS (start of scan) segment depends on the used scan components</div><div class='del'>-			of each color component */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_set_sos (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	char sos_data[16];	// max. size of register set</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dprintk(3, "%s: write SOS\n", ptr-&gt;name);</div><div class='del'>-	sos_data[0] = 0xff;</div><div class='del'>-	sos_data[1] = 0xda;</div><div class='del'>-	sos_data[2] = 0x00;</div><div class='del'>-	sos_data[3] = 2 + 1 + (2 * NO_OF_COMPONENTS) + 3;</div><div class='del'>-	sos_data[4] = NO_OF_COMPONENTS;</div><div class='del'>-	for (i = 0; i &lt; NO_OF_COMPONENTS; i++) {</div><div class='del'>-		sos_data[5 + (i * 2)] = i;	// index</div><div class='del'>-		sos_data[6 + (i * 2)] = (zr36060_td[i] &lt;&lt; 4) |</div><div class='del'>-					zr36060_ta[i]; // AC/DC tbl.sel.</div><div class='del'>-	}</div><div class='del'>-	sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00;	// scan start</div><div class='del'>-	sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3f;</div><div class='del'>-	sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 4] = 00;</div><div class='del'>-	return zr36060_pushit(ptr, ZR060_SOS_IDX,</div><div class='del'>-			      4 + 1 + (2 * NO_OF_COMPONENTS) + 3,</div><div class='del'>-			      sos_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-/* DRI (define restart interval) */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_set_dri (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	char dri_data[6];	// max. size of register set</div><div class='del'>-</div><div class='del'>-	dprintk(3, "%s: write DRI\n", ptr-&gt;name);</div><div class='del'>-	dri_data[0] = 0xff;</div><div class='del'>-	dri_data[1] = 0xdd;</div><div class='del'>-	dri_data[2] = 0x00;</div><div class='del'>-	dri_data[3] = 0x04;</div><div class='del'>-	dri_data[4] = (ptr-&gt;dri) &gt;&gt; 8;</div><div class='del'>-	dri_data[5] = (ptr-&gt;dri) &amp; 0xff;</div><div class='del'>-	return zr36060_pushit(ptr, ZR060_DRI_IDX, 6, dri_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Setup function:</div><div class='del'>-</div><div class='del'>-   Setup compression/decompression of Zoran's JPEG processor</div><div class='del'>-   ( see also zoran 36060 manual )</div><div class='del'>-</div><div class='del'>-   ... sorry for the spaghetti code ...</div><div class='del'>-   ========================================================================= */</div><div class='del'>-static void</div><div class='del'>-zr36060_init (struct zr36060 *ptr)</div><div class='del'>-{</div><div class='del'>-	int sum = 0;</div><div class='del'>-	long bitcnt, tmp;</div><div class='del'>-</div><div class='del'>-	if (ptr-&gt;mode == CODEC_DO_COMPRESSION) {</div><div class='del'>-		dprintk(2, "%s: COMPRESSION SETUP\n", ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-		zr36060_write(ptr, ZR060_LOAD, ZR060_LOAD_SyncRst);</div><div class='del'>-</div><div class='del'>-		/* 060 communicates with 067 in master mode */</div><div class='del'>-		zr36060_write(ptr, ZR060_CIR, ZR060_CIR_CodeMstr);</div><div class='del'>-</div><div class='del'>-		/* Compression with or without variable scale factor */</div><div class='del'>-		/*FIXME: What about ptr-&gt;bitrate_ctrl? */</div><div class='del'>-		zr36060_write(ptr, ZR060_CMR,</div><div class='del'>-			      ZR060_CMR_Comp | ZR060_CMR_Pass2 |</div><div class='del'>-			      ZR060_CMR_BRB);</div><div class='del'>-</div><div class='del'>-		/* Must be zero */</div><div class='del'>-		zr36060_write(ptr, ZR060_MBZ, 0x00);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCR_HI, 0x00);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCR_LO, 0x00);</div><div class='del'>-</div><div class='del'>-		/* Disable all IRQs - no DataErr means autoreset */</div><div class='del'>-		zr36060_write(ptr, ZR060_IMR, 0);</div><div class='del'>-</div><div class='del'>-		/* volume control settings */</div><div class='del'>-		zr36060_write(ptr, ZR060_SF_HI, ptr-&gt;scalefact &gt;&gt; 8);</div><div class='del'>-		zr36060_write(ptr, ZR060_SF_LO, ptr-&gt;scalefact &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		zr36060_write(ptr, ZR060_AF_HI, 0xff);</div><div class='del'>-		zr36060_write(ptr, ZR060_AF_M, 0xff);</div><div class='del'>-		zr36060_write(ptr, ZR060_AF_LO, 0xff);</div><div class='del'>-</div><div class='del'>-		/* setup the variable jpeg tables */</div><div class='del'>-		sum += zr36060_set_sof(ptr);</div><div class='del'>-		sum += zr36060_set_sos(ptr);</div><div class='del'>-		sum += zr36060_set_dri(ptr);</div><div class='del'>-</div><div class='del'>-		/* setup the fixed jpeg tables - maybe variable, though -</div><div class='del'>-		 * (see table init section above) */</div><div class='del'>-		sum +=</div><div class='del'>-		    zr36060_pushit(ptr, ZR060_DQT_IDX, sizeof(zr36060_dqt),</div><div class='del'>-				   zr36060_dqt);</div><div class='del'>-		sum +=</div><div class='del'>-		    zr36060_pushit(ptr, ZR060_DHT_IDX, sizeof(zr36060_dht),</div><div class='del'>-				   zr36060_dht);</div><div class='del'>-		zr36060_write(ptr, ZR060_APP_IDX, 0xff);</div><div class='del'>-		zr36060_write(ptr, ZR060_APP_IDX + 1, 0xe0 + ptr-&gt;app.appn);</div><div class='del'>-		zr36060_write(ptr, ZR060_APP_IDX + 2, 0x00);</div><div class='del'>-		zr36060_write(ptr, ZR060_APP_IDX + 3, ptr-&gt;app.len + 2);</div><div class='del'>-		sum += zr36060_pushit(ptr, ZR060_APP_IDX + 4, 60,</div><div class='del'>-				      ptr-&gt;app.data) + 4;</div><div class='del'>-		zr36060_write(ptr, ZR060_COM_IDX, 0xff);</div><div class='del'>-		zr36060_write(ptr, ZR060_COM_IDX + 1, 0xfe);</div><div class='del'>-		zr36060_write(ptr, ZR060_COM_IDX + 2, 0x00);</div><div class='del'>-		zr36060_write(ptr, ZR060_COM_IDX + 3, ptr-&gt;com.len + 2);</div><div class='del'>-		sum += zr36060_pushit(ptr, ZR060_COM_IDX + 4, 60,</div><div class='del'>-				      ptr-&gt;com.data) + 4;</div><div class='del'>-</div><div class='del'>-		/* setup misc. data for compression (target code sizes) */</div><div class='del'>-</div><div class='del'>-		/* size of compressed code to reach without header data */</div><div class='del'>-		sum = ptr-&gt;real_code_vol - sum;</div><div class='del'>-		bitcnt = sum &lt;&lt; 3;	/* need the size in bits */</div><div class='del'>-</div><div class='del'>-		tmp = bitcnt &gt;&gt; 16;</div><div class='del'>-		dprintk(3,</div><div class='del'>-			"%s: code: csize=%d, tot=%d, bit=%ld, highbits=%ld\n",</div><div class='del'>-			ptr-&gt;name, sum, ptr-&gt;real_code_vol, bitcnt, tmp);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_NET_HI, tmp &gt;&gt; 8);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_NET_MH, tmp &amp; 0xff);</div><div class='del'>-		tmp = bitcnt &amp; 0xffff;</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_NET_ML, tmp &gt;&gt; 8);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_NET_LO, tmp &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		bitcnt -= bitcnt &gt;&gt; 7;	// bits without stuffing</div><div class='del'>-		bitcnt -= ((bitcnt * 5) &gt;&gt; 6);	// bits without eob</div><div class='del'>-</div><div class='del'>-		tmp = bitcnt &gt;&gt; 16;</div><div class='del'>-		dprintk(3, "%s: code: nettobit=%ld, highnettobits=%ld\n",</div><div class='del'>-			ptr-&gt;name, bitcnt, tmp);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_DATA_HI, tmp &gt;&gt; 8);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_DATA_MH, tmp &amp; 0xff);</div><div class='del'>-		tmp = bitcnt &amp; 0xffff;</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_DATA_ML, tmp &gt;&gt; 8);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCV_DATA_LO, tmp &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		/* JPEG markers to be included in the compressed stream */</div><div class='del'>-		zr36060_write(ptr, ZR060_MER,</div><div class='del'>-			      ZR060_MER_DQT | ZR060_MER_DHT |</div><div class='del'>-			      ((ptr-&gt;com.len &gt; 0) ? ZR060_MER_Com : 0) |</div><div class='del'>-			      ((ptr-&gt;app.len &gt; 0) ? ZR060_MER_App : 0));</div><div class='del'>-</div><div class='del'>-		/* Setup the Video Frontend */</div><div class='del'>-		/* Limit pixel range to 16..235 as per CCIR-601 */</div><div class='del'>-		zr36060_write(ptr, ZR060_VCR, ZR060_VCR_Range);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		dprintk(2, "%s: EXPANSION SETUP\n", ptr-&gt;name);</div><div class='del'>-</div><div class='del'>-		zr36060_write(ptr, ZR060_LOAD, ZR060_LOAD_SyncRst);</div><div class='del'>-</div><div class='del'>-		/* 060 communicates with 067 in master mode */</div><div class='del'>-		zr36060_write(ptr, ZR060_CIR, ZR060_CIR_CodeMstr);</div><div class='del'>-</div><div class='del'>-		/* Decompression */</div><div class='del'>-		zr36060_write(ptr, ZR060_CMR, 0);</div><div class='del'>-</div><div class='del'>-		/* Must be zero */</div><div class='del'>-		zr36060_write(ptr, ZR060_MBZ, 0x00);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCR_HI, 0x00);</div><div class='del'>-		zr36060_write(ptr, ZR060_TCR_LO, 0x00);</div><div class='del'>-</div><div class='del'>-		/* Disable all IRQs - no DataErr means autoreset */</div><div class='del'>-		zr36060_write(ptr, ZR060_IMR, 0);</div><div class='del'>-</div><div class='del'>-		/* setup misc. data for expansion */</div><div class='del'>-		zr36060_write(ptr, ZR060_MER, 0);</div><div class='del'>-</div><div class='del'>-		/* setup the fixed jpeg tables - maybe variable, though -</div><div class='del'>-		 * (see table init section above) */</div><div class='del'>-		zr36060_pushit(ptr, ZR060_DHT_IDX, sizeof(zr36060_dht),</div><div class='del'>-			       zr36060_dht);</div><div class='del'>-</div><div class='del'>-		/* Setup the Video Frontend */</div><div class='del'>-		//zr36060_write(ptr, ZR060_VCR, ZR060_VCR_FIExt);</div><div class='del'>-		//this doesn't seem right and doesn't work...</div><div class='del'>-		zr36060_write(ptr, ZR060_VCR, ZR060_VCR_Range);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load the tables */</div><div class='del'>-	zr36060_write(ptr, ZR060_LOAD,</div><div class='del'>-		      ZR060_LOAD_SyncRst | ZR060_LOAD_Load);</div><div class='del'>-	zr36060_wait_end(ptr);</div><div class='del'>-	dprintk(2, "%s: Status after table preload: 0x%02x\n", ptr-&gt;name,</div><div class='del'>-		ptr-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (ptr-&gt;status &amp; ZR060_CFSR_Busy) {</div><div class='del'>-		dprintk(1, KERN_ERR "%s: init aborted!\n", ptr-&gt;name);</div><div class='del'>-		return;		// something is wrong, its timed out!!!!</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   CODEC API FUNCTIONS</div><div class='del'>-</div><div class='del'>-   this functions are accessed by the master via the API structure</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-/* set compression/expansion mode and launches codec -</div><div class='del'>-   this should be the last call from the master before starting processing */</div><div class='del'>-static int</div><div class='del'>-zr36060_set_mode (struct videocodec *codec,</div><div class='del'>-		  int                mode)</div><div class='del'>-{</div><div class='del'>-	struct zr36060 *ptr = (struct zr36060 *) codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: set_mode %d call\n", ptr-&gt;name, mode);</div><div class='del'>-</div><div class='del'>-	if ((mode != CODEC_DO_EXPANSION) &amp;&amp; (mode != CODEC_DO_COMPRESSION))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ptr-&gt;mode = mode;</div><div class='del'>-	zr36060_init(ptr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set picture size (norm is ignored as the codec doesn't know about it) */</div><div class='del'>-static int</div><div class='del'>-zr36060_set_video (struct videocodec   *codec,</div><div class='del'>-		   struct tvnorm       *norm,</div><div class='del'>-		   struct vfe_settings *cap,</div><div class='del'>-		   struct vfe_polarity *pol)</div><div class='del'>-{</div><div class='del'>-	struct zr36060 *ptr = (struct zr36060 *) codec-&gt;data;</div><div class='del'>-	u32 reg;</div><div class='del'>-	int size;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: set_video %d/%d-%dx%d (%%%d) call\n", ptr-&gt;name,</div><div class='del'>-		cap-&gt;x, cap-&gt;y, cap-&gt;width, cap-&gt;height, cap-&gt;decimation);</div><div class='del'>-</div><div class='del'>-	/* if () return -EINVAL;</div><div class='del'>-	 * trust the master driver that it knows what it does - so</div><div class='del'>-	 * we allow invalid startx/y and norm for now ... */</div><div class='del'>-	ptr-&gt;width = cap-&gt;width / (cap-&gt;decimation &amp; 0xff);</div><div class='del'>-	ptr-&gt;height = cap-&gt;height / (cap-&gt;decimation &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	zr36060_write(ptr, ZR060_LOAD, ZR060_LOAD_SyncRst);</div><div class='del'>-</div><div class='del'>-	/* Note that VSPol/HSPol bits in zr36060 have the opposite</div><div class='del'>-	 * meaning of their zr360x7 counterparts with the same names</div><div class='del'>-	 * N.b. for VSPol this is only true if FIVEdge = 0 (default,</div><div class='del'>-	 * left unchanged here - in accordance with datasheet).</div><div class='del'>-	*/</div><div class='del'>-	reg = (!pol-&gt;vsync_pol ? ZR060_VPR_VSPol : 0)</div><div class='del'>-	    | (!pol-&gt;hsync_pol ? ZR060_VPR_HSPol : 0)</div><div class='del'>-	    | (pol-&gt;field_pol ? ZR060_VPR_FIPol : 0)</div><div class='del'>-	    | (pol-&gt;blank_pol ? ZR060_VPR_BLPol : 0)</div><div class='del'>-	    | (pol-&gt;subimg_pol ? ZR060_VPR_SImgPol : 0)</div><div class='del'>-	    | (pol-&gt;poe_pol ? ZR060_VPR_PoePol : 0)</div><div class='del'>-	    | (pol-&gt;pvalid_pol ? ZR060_VPR_PValPol : 0)</div><div class='del'>-	    | (pol-&gt;vclk_pol ? ZR060_VPR_VCLKPol : 0);</div><div class='del'>-	zr36060_write(ptr, ZR060_VPR, reg);</div><div class='del'>-</div><div class='del'>-	reg = 0;</div><div class='del'>-	switch (cap-&gt;decimation &amp; 0xff) {</div><div class='del'>-	default:</div><div class='del'>-	case 1:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 2:</div><div class='del'>-		reg |= ZR060_SR_HScale2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 4:</div><div class='del'>-		reg |= ZR060_SR_HScale4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cap-&gt;decimation &gt;&gt; 8) {</div><div class='del'>-	default:</div><div class='del'>-	case 1:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 2:</div><div class='del'>-		reg |= ZR060_SR_VScale;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	zr36060_write(ptr, ZR060_SR, reg);</div><div class='del'>-</div><div class='del'>-	zr36060_write(ptr, ZR060_BCR_Y, 0x00);</div><div class='del'>-	zr36060_write(ptr, ZR060_BCR_U, 0x80);</div><div class='del'>-	zr36060_write(ptr, ZR060_BCR_V, 0x80);</div><div class='del'>-</div><div class='del'>-	/* sync generator */</div><div class='del'>-</div><div class='del'>-	reg = norm-&gt;Ht - 1;	/* Vtotal */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_VTOTAL_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_VTOTAL_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg = norm-&gt;Wt - 1;	/* Htotal */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_HTOTAL_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_HTOTAL_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg = 6 - 1;		/* VsyncSize */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_VSYNC, reg);</div><div class='del'>-</div><div class='del'>-	//reg   = 30 - 1;               /* HsyncSize */</div><div class='del'>-///*CP*/        reg = (zr-&gt;params.norm == 1 ? 57 : 68);</div><div class='del'>-	reg = 68;</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_HSYNC, reg);</div><div class='del'>-</div><div class='del'>-	reg = norm-&gt;VStart - 1;	/* BVstart */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_BVSTART, reg);</div><div class='del'>-</div><div class='del'>-	reg += norm-&gt;Ha / 2;	/* BVend */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_BVEND_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_BVEND_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg = norm-&gt;HStart - 1;	/* BHstart */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_BHSTART, reg);</div><div class='del'>-</div><div class='del'>-	reg += norm-&gt;Wa;	/* BHend */</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_BHEND_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SGR_BHEND_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* active area */</div><div class='del'>-	reg = cap-&gt;y + norm-&gt;VStart;	/* Vstart */</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_VSTART_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_VSTART_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg += cap-&gt;height;	/* Vend */</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_VEND_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_VEND_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg = cap-&gt;x + norm-&gt;HStart;	/* Hstart */</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_HSTART_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_HSTART_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg += cap-&gt;width;	/* Hend */</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_HEND_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_AAR_HEND_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* subimage area */</div><div class='del'>-	reg = norm-&gt;VStart - 4;	/* SVstart */</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_VSTART_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_VSTART_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg += norm-&gt;Ha / 2 + 8;	/* SVend */</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_VEND_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_VEND_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg = norm-&gt;HStart /*+ 64 */  - 4;	/* SHstart */</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_HSTART_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_HSTART_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	reg += norm-&gt;Wa + 8;	/* SHend */</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_HEND_HI, (reg &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	zr36060_write(ptr, ZR060_SWR_HEND_LO, (reg &gt;&gt; 0) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	size = ptr-&gt;width * ptr-&gt;height;</div><div class='del'>-	/* Target compressed field size in bits: */</div><div class='del'>-	size = size * 16;	/* uncompressed size in bits */</div><div class='del'>-	/* (Ronald) by default, quality = 100 is a compression</div><div class='del'>-	 * ratio 1:2. Setting low_bitrate (insmod option) sets</div><div class='del'>-	 * it to 1:4 (instead of 1:2, zr36060 max) as limit because the</div><div class='del'>-	 * buz can't handle more at decimation=1... Use low_bitrate if</div><div class='del'>-	 * you have a Buz, unless you know what you're doing */</div><div class='del'>-	size = size * cap-&gt;quality / (low_bitrate ? 400 : 200);</div><div class='del'>-	/* Lower limit (arbitrary, 1 KB) */</div><div class='del'>-	if (size &lt; 8192)</div><div class='del'>-		size = 8192;</div><div class='del'>-	/* Upper limit: 7/8 of the code buffers */</div><div class='del'>-	if (size &gt; ptr-&gt;total_code_vol * 7)</div><div class='del'>-		size = ptr-&gt;total_code_vol * 7;</div><div class='del'>-</div><div class='del'>-	ptr-&gt;real_code_vol = size &gt;&gt; 3;	/* in bytes */</div><div class='del'>-</div><div class='del'>-	/* the MBCVR is the *maximum* block volume, according to the</div><div class='del'>-	 * JPEG ISO specs, this shouldn't be used, since that allows</div><div class='del'>-	 * for the best encoding quality. So set it to it's max value */</div><div class='del'>-	reg = ptr-&gt;max_block_vol;</div><div class='del'>-	zr36060_write(ptr, ZR060_MBCVR, reg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional control functions */</div><div class='del'>-static int</div><div class='del'>-zr36060_control (struct videocodec *codec,</div><div class='del'>-		 int                type,</div><div class='del'>-		 int                size,</div><div class='del'>-		 void              *data)</div><div class='del'>-{</div><div class='del'>-	struct zr36060 *ptr = (struct zr36060 *) codec-&gt;data;</div><div class='del'>-	int *ival = (int *) data;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "%s: control %d call with %d byte\n", ptr-&gt;name, type,</div><div class='del'>-		size);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CODEC_G_STATUS:	/* get last status */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		zr36060_read_status(ptr);</div><div class='del'>-		*ival = ptr-&gt;status;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_CODEC_MODE:</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = CODEC_MODE_BJPG;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_CODEC_MODE:</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (*ival != CODEC_MODE_BJPG)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		/* not needed, do nothing */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_VFE:</div><div class='del'>-	case CODEC_S_VFE:</div><div class='del'>-		/* not needed, do nothing */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_MMAP:</div><div class='del'>-		/* not available, give an error */</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_TDS_BYTE:	/* get target volume in byte */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = ptr-&gt;total_code_vol;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_TDS_BYTE:	/* get target volume in byte */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ptr-&gt;total_code_vol = *ival;</div><div class='del'>-		ptr-&gt;real_code_vol = (ptr-&gt;total_code_vol * 6) &gt;&gt; 3;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_SCALE:	/* get scaling factor */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		*ival = zr36060_read_scalefactor(ptr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_SCALE:	/* set scaling factor */</div><div class='del'>-		if (size != sizeof(int))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ptr-&gt;scalefact = *ival;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_APP_DATA: {	/* get appn marker data */</div><div class='del'>-		struct jpeg_app_marker *app = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_app_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		*app = ptr-&gt;app;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_APP_DATA: {	/* set appn marker data */</div><div class='del'>-		struct jpeg_app_marker *app = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_app_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		ptr-&gt;app = *app;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CODEC_G_JPEG_COM_DATA: {	/* get comment marker data */</div><div class='del'>-		struct jpeg_com_marker *com = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_com_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		*com = ptr-&gt;com;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CODEC_S_JPEG_COM_DATA: {	/* set comment marker data */</div><div class='del'>-		struct jpeg_com_marker *com = data;</div><div class='del'>-</div><div class='del'>-		if (size != sizeof(struct jpeg_com_marker))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		ptr-&gt;com = *com;</div><div class='del'>-		break;</div><div class='del'>-	}</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'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Exit and unregister function:</div><div class='del'>-</div><div class='del'>-   Deinitializes Zoran's JPEG processor</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_unset (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct zr36060 *ptr = codec-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (ptr) {</div><div class='del'>-		/* do wee need some codec deinit here, too ???? */</div><div class='del'>-</div><div class='del'>-		dprintk(1, "%s: finished codec #%d\n", ptr-&gt;name,</div><div class='del'>-			ptr-&gt;num);</div><div class='del'>-		kfree(ptr);</div><div class='del'>-		codec-&gt;data = NULL;</div><div class='del'>-</div><div class='del'>-		zr36060_codecs--;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   Setup and registry function:</div><div class='del'>-</div><div class='del'>-   Initializes Zoran's JPEG processor</div><div class='del'>-</div><div class='del'>-   Also sets pixel size, average code size, mode (compr./decompr.)</div><div class='del'>-   (the given size is determined by the processor with the video interface)</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-zr36060_setup (struct videocodec *codec)</div><div class='del'>-{</div><div class='del'>-	struct zr36060 *ptr;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	dprintk(2, "zr36060: initializing MJPEG subsystem #%d.\n",</div><div class='del'>-		zr36060_codecs);</div><div class='del'>-</div><div class='del'>-	if (zr36060_codecs == MAX_CODECS) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			KERN_ERR "zr36060: Can't attach more codecs!\n");</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-	//mem structure init</div><div class='del'>-	codec-&gt;data = ptr = kzalloc(sizeof(struct zr36060), GFP_KERNEL);</div><div class='del'>-	if (NULL == ptr) {</div><div class='del'>-		dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(ptr-&gt;name, sizeof(ptr-&gt;name), "zr36060[%d]",</div><div class='del'>-		 zr36060_codecs);</div><div class='del'>-	ptr-&gt;num = zr36060_codecs++;</div><div class='del'>-	ptr-&gt;codec = codec;</div><div class='del'>-</div><div class='del'>-	//testing</div><div class='del'>-	res = zr36060_basic_test(ptr);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		zr36060_unset(codec);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	//final setup</div><div class='del'>-	memcpy(ptr-&gt;h_samp_ratio, zr36060_decimation_h, 8);</div><div class='del'>-	memcpy(ptr-&gt;v_samp_ratio, zr36060_decimation_v, 8);</div><div class='del'>-</div><div class='del'>-	ptr-&gt;bitrate_ctrl = 0;	/* 0 or 1 - fixed file size flag</div><div class='del'>-				 * (what is the difference?) */</div><div class='del'>-	ptr-&gt;mode = CODEC_DO_COMPRESSION;</div><div class='del'>-	ptr-&gt;width = 384;</div><div class='del'>-	ptr-&gt;height = 288;</div><div class='del'>-	ptr-&gt;total_code_vol = 16000;	/* CHECKME */</div><div class='del'>-	ptr-&gt;real_code_vol = (ptr-&gt;total_code_vol * 6) &gt;&gt; 3;</div><div class='del'>-	ptr-&gt;max_block_vol = 240;	/* CHECKME, was 120 is 240 */</div><div class='del'>-	ptr-&gt;scalefact = 0x100;</div><div class='del'>-	ptr-&gt;dri = 1;		/* CHECKME, was 8 is 1 */</div><div class='del'>-</div><div class='del'>-	/* by default, no COM or APP markers - app should set those */</div><div class='del'>-	ptr-&gt;com.len = 0;</div><div class='del'>-	ptr-&gt;app.appn = 0;</div><div class='del'>-	ptr-&gt;app.len = 0;</div><div class='del'>-</div><div class='del'>-	zr36060_init(ptr);</div><div class='del'>-</div><div class='del'>-	dprintk(1, KERN_INFO "%s: codec attached and running\n",</div><div class='del'>-		ptr-&gt;name);</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 videocodec zr36060_codec = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.name = "zr36060",</div><div class='del'>-	.magic = 0L,		// magic not used</div><div class='del'>-	.flags =</div><div class='del'>-	    CODEC_FLAG_JPEG | CODEC_FLAG_HARDWARE | CODEC_FLAG_ENCODER |</div><div class='del'>-	    CODEC_FLAG_DECODER | CODEC_FLAG_VFE,</div><div class='del'>-	.type = CODEC_TYPE_ZR36060,</div><div class='del'>-	.setup = zr36060_setup,	// functionality</div><div class='del'>-	.unset = zr36060_unset,</div><div class='del'>-	.set_mode = zr36060_set_mode,</div><div class='del'>-	.set_video = zr36060_set_video,</div><div class='del'>-	.control = zr36060_control,</div><div class='del'>-	// others are not used</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* =========================================================================</div><div class='del'>-   HOOK IN DRIVER AS KERNEL MODULE</div><div class='del'>-   ========================================================================= */</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-zr36060_init_module (void)</div><div class='del'>-{</div><div class='del'>-	//dprintk(1, "zr36060 driver %s\n",ZR060_VERSION);</div><div class='del'>-	zr36060_codecs = 0;</div><div class='del'>-	return videocodec_register(&amp;zr36060_codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-zr36060_cleanup_module (void)</div><div class='del'>-{</div><div class='del'>-	if (zr36060_codecs) {</div><div class='del'>-		dprintk(1,</div><div class='del'>-			"zr36060: something's wrong - %d codecs left somehow.\n",</div><div class='del'>-			zr36060_codecs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* however, we can't just stay alive */</div><div class='del'>-	videocodec_unregister(&amp;zr36060_codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(zr36060_init_module);</div><div class='del'>-module_exit(zr36060_cleanup_module);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver module for ZR36060 jpeg processors "</div><div class='del'>-		   ZR060_VERSION);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/media/zoran/zr36060.h b/drivers/staging/media/zoran/zr36060.h<br/>deleted file mode 100644<br/>index 82911757ba78..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/media/zoran/zr36060.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/media/zoran/zr36060.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,216 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Zoran ZR36060 basic configuration functions - header file</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Laurent Pinchart &lt;laurent.pinchart@skynet.be&gt;</div><div class='del'>- *</div><div class='del'>- * $Id: zr36060.h,v 1.1.1.1.2.3 2003/01/14 21:18:47 rbultje Exp $</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------</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, or</div><div class='del'>- * (at your option) any later version.</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'>- * ------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ZR36060_H</div><div class='del'>-#define ZR36060_H</div><div class='del'>-</div><div class='del'>-#include "videocodec.h"</div><div class='del'>-</div><div class='del'>-/* data stored for each zoran jpeg codec chip */</div><div class='del'>-struct zr36060 {</div><div class='del'>-	char name[32];</div><div class='del'>-	int num;</div><div class='del'>-	/* io datastructure */</div><div class='del'>-	struct videocodec *codec;</div><div class='del'>-	// last coder status</div><div class='del'>-	__u8 status;</div><div class='del'>-	// actual coder setup</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	__u16 width;</div><div class='del'>-	__u16 height;</div><div class='del'>-</div><div class='del'>-	__u16 bitrate_ctrl;</div><div class='del'>-</div><div class='del'>-	__u32 total_code_vol;</div><div class='del'>-	__u32 real_code_vol;</div><div class='del'>-	__u16 max_block_vol;</div><div class='del'>-</div><div class='del'>-	__u8 h_samp_ratio[8];</div><div class='del'>-	__u8 v_samp_ratio[8];</div><div class='del'>-	__u16 scalefact;</div><div class='del'>-	__u16 dri;</div><div class='del'>-</div><div class='del'>-	/* app/com marker data */</div><div class='del'>-	struct jpeg_app_marker app;</div><div class='del'>-	struct jpeg_com_marker com;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ZR36060 register addresses */</div><div class='del'>-#define ZR060_LOAD			0x000</div><div class='del'>-#define ZR060_CFSR			0x001</div><div class='del'>-#define ZR060_CIR			0x002</div><div class='del'>-#define ZR060_CMR			0x003</div><div class='del'>-#define ZR060_MBZ			0x004</div><div class='del'>-#define ZR060_MBCVR			0x005</div><div class='del'>-#define ZR060_MER			0x006</div><div class='del'>-#define ZR060_IMR			0x007</div><div class='del'>-#define ZR060_ISR			0x008</div><div class='del'>-#define ZR060_TCV_NET_HI		0x009</div><div class='del'>-#define ZR060_TCV_NET_MH		0x00a</div><div class='del'>-#define ZR060_TCV_NET_ML		0x00b</div><div class='del'>-#define ZR060_TCV_NET_LO		0x00c</div><div class='del'>-#define ZR060_TCV_DATA_HI		0x00d</div><div class='del'>-#define ZR060_TCV_DATA_MH		0x00e</div><div class='del'>-#define ZR060_TCV_DATA_ML		0x00f</div><div class='del'>-#define ZR060_TCV_DATA_LO		0x010</div><div class='del'>-#define ZR060_SF_HI			0x011</div><div class='del'>-#define ZR060_SF_LO			0x012</div><div class='del'>-#define ZR060_AF_HI			0x013</div><div class='del'>-#define ZR060_AF_M			0x014</div><div class='del'>-#define ZR060_AF_LO			0x015</div><div class='del'>-#define ZR060_ACV_HI			0x016</div><div class='del'>-#define ZR060_ACV_MH			0x017</div><div class='del'>-#define ZR060_ACV_ML			0x018</div><div class='del'>-#define ZR060_ACV_LO			0x019</div><div class='del'>-#define ZR060_ACT_HI			0x01a</div><div class='del'>-#define ZR060_ACT_MH			0x01b</div><div class='del'>-#define ZR060_ACT_ML			0x01c</div><div class='del'>-#define ZR060_ACT_LO			0x01d</div><div class='del'>-#define ZR060_ACV_TRUN_HI		0x01e</div><div class='del'>-#define ZR060_ACV_TRUN_MH		0x01f</div><div class='del'>-#define ZR060_ACV_TRUN_ML		0x020</div><div class='del'>-#define ZR060_ACV_TRUN_LO		0x021</div><div class='del'>-#define ZR060_IDR_DEV			0x022</div><div class='del'>-#define ZR060_IDR_REV			0x023</div><div class='del'>-#define ZR060_TCR_HI			0x024</div><div class='del'>-#define ZR060_TCR_LO			0x025</div><div class='del'>-#define ZR060_VCR			0x030</div><div class='del'>-#define ZR060_VPR			0x031</div><div class='del'>-#define ZR060_SR			0x032</div><div class='del'>-#define ZR060_BCR_Y			0x033</div><div class='del'>-#define ZR060_BCR_U			0x034</div><div class='del'>-#define ZR060_BCR_V			0x035</div><div class='del'>-#define ZR060_SGR_VTOTAL_HI		0x036</div><div class='del'>-#define ZR060_SGR_VTOTAL_LO		0x037</div><div class='del'>-#define ZR060_SGR_HTOTAL_HI		0x038</div><div class='del'>-#define ZR060_SGR_HTOTAL_LO		0x039</div><div class='del'>-#define ZR060_SGR_VSYNC			0x03a</div><div class='del'>-#define ZR060_SGR_HSYNC			0x03b</div><div class='del'>-#define ZR060_SGR_BVSTART		0x03c</div><div class='del'>-#define ZR060_SGR_BHSTART		0x03d</div><div class='del'>-#define ZR060_SGR_BVEND_HI		0x03e</div><div class='del'>-#define ZR060_SGR_BVEND_LO		0x03f</div><div class='del'>-#define ZR060_SGR_BHEND_HI		0x040</div><div class='del'>-#define ZR060_SGR_BHEND_LO		0x041</div><div class='del'>-#define ZR060_AAR_VSTART_HI		0x042</div><div class='del'>-#define ZR060_AAR_VSTART_LO		0x043</div><div class='del'>-#define ZR060_AAR_VEND_HI		0x044</div><div class='del'>-#define ZR060_AAR_VEND_LO		0x045</div><div class='del'>-#define ZR060_AAR_HSTART_HI		0x046</div><div class='del'>-#define ZR060_AAR_HSTART_LO		0x047</div><div class='del'>-#define ZR060_AAR_HEND_HI		0x048</div><div class='del'>-#define ZR060_AAR_HEND_LO		0x049</div><div class='del'>-#define ZR060_SWR_VSTART_HI		0x04a</div><div class='del'>-#define ZR060_SWR_VSTART_LO		0x04b</div><div class='del'>-#define ZR060_SWR_VEND_HI		0x04c</div><div class='del'>-#define ZR060_SWR_VEND_LO		0x04d</div><div class='del'>-#define ZR060_SWR_HSTART_HI		0x04e</div><div class='del'>-#define ZR060_SWR_HSTART_LO		0x04f</div><div class='del'>-#define ZR060_SWR_HEND_HI		0x050</div><div class='del'>-#define ZR060_SWR_HEND_LO		0x051</div><div class='del'>-</div><div class='del'>-#define ZR060_SOF_IDX			0x060</div><div class='del'>-#define ZR060_SOS_IDX			0x07a</div><div class='del'>-#define ZR060_DRI_IDX			0x0c0</div><div class='del'>-#define ZR060_DQT_IDX			0x0cc</div><div class='del'>-#define ZR060_DHT_IDX			0x1d4</div><div class='del'>-#define ZR060_APP_IDX			0x380</div><div class='del'>-#define ZR060_COM_IDX			0x3c0</div><div class='del'>-</div><div class='del'>-/* ZR36060 LOAD register bits */</div><div class='del'>-</div><div class='del'>-#define ZR060_LOAD_Load			(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_LOAD_SyncRst		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Code FIFO Status register bits */</div><div class='del'>-</div><div class='del'>-#define ZR060_CFSR_Busy			(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_CFSR_CBusy		(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_CFSR_CFIFO		(3 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Code Interface register */</div><div class='del'>-</div><div class='del'>-#define ZR060_CIR_Code16		(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_CIR_Endian		(1 &lt;&lt; 6)</div><div class='del'>-#define ZR060_CIR_CFIS			(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_CIR_CodeMstr		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Codec Mode register */</div><div class='del'>-</div><div class='del'>-#define ZR060_CMR_Comp			(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_CMR_ATP			(1 &lt;&lt; 6)</div><div class='del'>-#define ZR060_CMR_Pass2			(1 &lt;&lt; 5)</div><div class='del'>-#define ZR060_CMR_TLM			(1 &lt;&lt; 4)</div><div class='del'>-#define ZR060_CMR_BRB			(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_CMR_FSF			(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Markers Enable register */</div><div class='del'>-</div><div class='del'>-#define ZR060_MER_App			(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_MER_Com			(1 &lt;&lt; 6)</div><div class='del'>-#define ZR060_MER_DRI			(1 &lt;&lt; 5)</div><div class='del'>-#define ZR060_MER_DQT			(1 &lt;&lt; 4)</div><div class='del'>-#define ZR060_MER_DHT			(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Interrupt Mask register */</div><div class='del'>-</div><div class='del'>-#define ZR060_IMR_EOAV			(1 &lt;&lt; 3)</div><div class='del'>-#define ZR060_IMR_EOI			(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_IMR_End			(1 &lt;&lt; 1)</div><div class='del'>-#define ZR060_IMR_DataErr		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Interrupt Status register */</div><div class='del'>-</div><div class='del'>-#define ZR060_ISR_ProCnt		(3 &lt;&lt; 6)</div><div class='del'>-#define ZR060_ISR_EOAV			(1 &lt;&lt; 3)</div><div class='del'>-#define ZR060_ISR_EOI			(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_ISR_End			(1 &lt;&lt; 1)</div><div class='del'>-#define ZR060_ISR_DataErr		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Video Control register */</div><div class='del'>-</div><div class='del'>-#define ZR060_VCR_Video8		(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_VCR_Range			(1 &lt;&lt; 6)</div><div class='del'>-#define ZR060_VCR_FIDet			(1 &lt;&lt; 3)</div><div class='del'>-#define ZR060_VCR_FIVedge		(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_VCR_FIExt			(1 &lt;&lt; 1)</div><div class='del'>-#define ZR060_VCR_SyncMstr		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Video Polarity register */</div><div class='del'>-</div><div class='del'>-#define ZR060_VPR_VCLKPol		(1 &lt;&lt; 7)</div><div class='del'>-#define ZR060_VPR_PValPol		(1 &lt;&lt; 6)</div><div class='del'>-#define ZR060_VPR_PoePol		(1 &lt;&lt; 5)</div><div class='del'>-#define ZR060_VPR_SImgPol		(1 &lt;&lt; 4)</div><div class='del'>-#define ZR060_VPR_BLPol			(1 &lt;&lt; 3)</div><div class='del'>-#define ZR060_VPR_FIPol			(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_VPR_HSPol			(1 &lt;&lt; 1)</div><div class='del'>-#define ZR060_VPR_VSPol			(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* ZR36060 Scaling register */</div><div class='del'>-</div><div class='del'>-#define ZR060_SR_VScale			(1 &lt;&lt; 2)</div><div class='del'>-#define ZR060_SR_HScale2		(1 &lt;&lt; 0)</div><div class='del'>-#define ZR060_SR_HScale4		(2 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#endif				/*fndef ZR36060_H */</div><div class='head'>diff --git a/drivers/staging/most/Documentation/ABI/configfs-most.txt b/drivers/staging/most/Documentation/ABI/configfs-most.txt<br/>new file mode 100644<br/>index 000000000000..25b3e18c4d91<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Documentation/ABI/configfs-most.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/Documentation/ABI/configfs-most.txt</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+What: 		/sys/kernel/config/most_&lt;component&gt;</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description: 	Interface is used to configure and connect device channels</div><div class='add'>+		to component drivers.</div><div class='add'>+</div><div class='add'>+		Attributes are visible only when configfs is mounted. To mount</div><div class='add'>+		configfs in /sys/kernel/config directory use:</div><div class='add'>+		# mount -t configfs none /sys/kernel/config/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What: 		/sys/kernel/config/most_cdev/&lt;link&gt;</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description:</div><div class='add'>+		The attributes:</div><div class='add'>+</div><div class='add'>+		buffer_size	configure the buffer size for this channel</div><div class='add'>+</div><div class='add'>+		subbuffer_size	configure the sub-buffer size for this channel</div><div class='add'>+				(needed for synchronous and isochrnous data)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		num_buffers	configure number of buffers used for this</div><div class='add'>+				channel</div><div class='add'>+</div><div class='add'>+		datatype	configure type of data that will travel over</div><div class='add'>+				this channel</div><div class='add'>+</div><div class='add'>+		direction	configure whether this link will be an input</div><div class='add'>+				or output</div><div class='add'>+</div><div class='add'>+		dbr_size	configure DBR data buffer size (this is used</div><div class='add'>+				for MediaLB communiction only)</div><div class='add'>+</div><div class='add'>+		packets_per_xact</div><div class='add'>+				configure the number of packets that will be</div><div class='add'>+				collected from the network before being</div><div class='add'>+				transmitted via USB (this is used for USB</div><div class='add'>+				communiction only)</div><div class='add'>+</div><div class='add'>+		device		name of the device the link is to be attached to</div><div class='add'>+</div><div class='add'>+		channel		name of the channel the link is to be attached to</div><div class='add'>+</div><div class='add'>+		comp_params	pass parameters needed by some components</div><div class='add'>+</div><div class='add'>+		create_link	write '1' to this attribute to trigger the</div><div class='add'>+				creation of the link. In case of speculative</div><div class='add'>+				configuration, the creation is post-poned until</div><div class='add'>+				a physical device is being attached to the bus.</div><div class='add'>+</div><div class='add'>+		destroy_link	write '1' to this attribute to destroy an</div><div class='add'>+				active link</div><div class='add'>+</div><div class='add'>+What: 		/sys/kernel/config/most_video/&lt;link&gt;</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description:</div><div class='add'>+		The attributes:</div><div class='add'>+</div><div class='add'>+		buffer_size	configure the buffer size for this channel</div><div class='add'>+</div><div class='add'>+		subbuffer_size	configure the sub-buffer size for this channel</div><div class='add'>+				(needed for synchronous and isochrnous data)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		num_buffers	configure number of buffers used for this</div><div class='add'>+				channel</div><div class='add'>+</div><div class='add'>+		datatype	configure type of data that will travel over</div><div class='add'>+				this channel</div><div class='add'>+</div><div class='add'>+		direction	configure whether this link will be an input</div><div class='add'>+				or output</div><div class='add'>+</div><div class='add'>+		dbr_size	configure DBR data buffer size (this is used</div><div class='add'>+				for MediaLB communiction only)</div><div class='add'>+</div><div class='add'>+		packets_per_xact</div><div class='add'>+				configure the number of packets that will be</div><div class='add'>+				collected from the network before being</div><div class='add'>+				transmitted via USB (this is used for USB</div><div class='add'>+				communiction only)</div><div class='add'>+</div><div class='add'>+		device		name of the device the link is to be attached to</div><div class='add'>+</div><div class='add'>+		channel		name of the channel the link is to be attached to</div><div class='add'>+</div><div class='add'>+		comp_params	pass parameters needed by some components</div><div class='add'>+</div><div class='add'>+		create_link	write '1' to this attribute to trigger the</div><div class='add'>+				creation of the link. In case of speculative</div><div class='add'>+				configuration, the creation is post-poned until</div><div class='add'>+				a physical device is being attached to the bus.</div><div class='add'>+</div><div class='add'>+		destroy_link	write '1' to this attribute to destroy an</div><div class='add'>+				active link</div><div class='add'>+</div><div class='add'>+What: 		/sys/kernel/config/most_net/&lt;link&gt;</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description:</div><div class='add'>+		The attributes:</div><div class='add'>+</div><div class='add'>+		buffer_size	configure the buffer size for this channel</div><div class='add'>+</div><div class='add'>+		subbuffer_size	configure the sub-buffer size for this channel</div><div class='add'>+				(needed for synchronous and isochrnous data)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		num_buffers	configure number of buffers used for this</div><div class='add'>+				channel</div><div class='add'>+</div><div class='add'>+		datatype	configure type of data that will travel over</div><div class='add'>+				this channel</div><div class='add'>+</div><div class='add'>+		direction	configure whether this link will be an input</div><div class='add'>+				or output</div><div class='add'>+</div><div class='add'>+		dbr_size	configure DBR data buffer size (this is used</div><div class='add'>+				for MediaLB communiction only)</div><div class='add'>+</div><div class='add'>+		packets_per_xact</div><div class='add'>+				configure the number of packets that will be</div><div class='add'>+				collected from the network before being</div><div class='add'>+				transmitted via USB (this is used for USB</div><div class='add'>+				communiction only)</div><div class='add'>+</div><div class='add'>+		device		name of the device the link is to be attached to</div><div class='add'>+</div><div class='add'>+		channel		name of the channel the link is to be attached to</div><div class='add'>+</div><div class='add'>+		comp_params	pass parameters needed by some components</div><div class='add'>+</div><div class='add'>+		create_link	write '1' to this attribute to trigger the</div><div class='add'>+				creation of the link. In case of speculative</div><div class='add'>+				configuration, the creation is post-poned until</div><div class='add'>+				a physical device is being attached to the bus.</div><div class='add'>+</div><div class='add'>+		destroy_link	write '1' to this attribute to destroy an</div><div class='add'>+				active link</div><div class='add'>+</div><div class='add'>+What: 		/sys/kernel/config/most_sound/&lt;card&gt;</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description:</div><div class='add'>+		The attributes:</div><div class='add'>+</div><div class='add'>+		create_card	write '1' to this attribute to trigger the</div><div class='add'>+                                registration of the sound card with the ALSA</div><div class='add'>+				subsystem.</div><div class='add'>+</div><div class='add'>+What: 		/sys/kernel/config/most_sound/&lt;card&gt;/&lt;link&gt;</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description:</div><div class='add'>+		The attributes:</div><div class='add'>+</div><div class='add'>+		buffer_size	configure the buffer size for this channel</div><div class='add'>+</div><div class='add'>+		subbuffer_size	configure the sub-buffer size for this channel</div><div class='add'>+				(needed for synchronous and isochrnous data)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		num_buffers	configure number of buffers used for this</div><div class='add'>+				channel</div><div class='add'>+</div><div class='add'>+		datatype	configure type of data that will travel over</div><div class='add'>+				this channel</div><div class='add'>+</div><div class='add'>+		direction	configure whether this link will be an input</div><div class='add'>+				or output</div><div class='add'>+</div><div class='add'>+		dbr_size	configure DBR data buffer size (this is used</div><div class='add'>+				for MediaLB communiction only)</div><div class='add'>+</div><div class='add'>+		packets_per_xact</div><div class='add'>+				configure the number of packets that will be</div><div class='add'>+				collected from the network before being</div><div class='add'>+				transmitted via USB (this is used for USB</div><div class='add'>+				communiction only)</div><div class='add'>+</div><div class='add'>+		device		name of the device the link is to be attached to</div><div class='add'>+</div><div class='add'>+		channel		name of the channel the link is to be attached to</div><div class='add'>+</div><div class='add'>+		comp_params	pass parameters needed by some components</div><div class='add'>+</div><div class='add'>+		create_link	write '1' to this attribute to trigger the</div><div class='add'>+				creation of the link. In case of speculative</div><div class='add'>+				configuration, the creation is post-poned until</div><div class='add'>+				a physical device is being attached to the bus.</div><div class='add'>+</div><div class='add'>+		destroy_link	write '1' to this attribute to destroy an</div><div class='add'>+				active link</div><div class='add'>+</div><div class='add'>+What: 		/sys/kernel/config/rdma_cm/&lt;hca&gt;/ports/&lt;port-num&gt;/default_roce_tos</div><div class='add'>+Date: 		March 8, 2019</div><div class='add'>+KernelVersion:  5.2</div><div class='add'>+Description: 	RDMA-CM QPs from HCA &lt;hca&gt; at port &lt;port-num&gt;</div><div class='add'>+		will be created with this TOS as default.</div><div class='add'>+		This can be overridden by using the rdma_set_option API.</div><div class='add'>+		The possible RoCE TOS values are 0-255.</div><div class='head'>diff --git a/drivers/staging/most/Documentation/driver_usage.txt b/drivers/staging/most/Documentation/driver_usage.txt<br/>index da7a8f405b9b..56d79195bb3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Documentation/driver_usage.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/Documentation/driver_usage.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Documentation/driver_usage.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/Documentation/driver_usage.txt</a></div><div class='hunk'>@@ -115,36 +115,75 @@ following components are available</div><div class='ctx'> </div><div class='ctx'> 		Section 2 Usage of the MOST Driver</div><div class='ctx'> </div><div class='del'>-		Section 2.1 Configuration</div><div class='del'>-</div><div class='del'>-See ABI/sysfs-bus-most.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		Section 2.2 Routing Channels</div><div class='del'>-</div><div class='del'>-To connect a configured channel to a certain core component and make it</div><div class='del'>-accessible for user space applications, the driver attribute 'add_link' is</div><div class='del'>-used. The configuration string passed to it has the following format:</div><div class='del'>-</div><div class='del'>-	"device_name:channel_name:component_name:link_name[.param]"</div><div class='del'>-</div><div class='del'>-It is the concatenation of up to four substrings separated by a colon. The</div><div class='del'>-substrings contain the names of the MOST interface, the channel, the</div><div class='del'>-component driver and a custom name with which the link is going to be</div><div class='del'>-referenced with. Since some components need additional information, the</div><div class='del'>-link name can be extended with a component-specific parameter (separated by</div><div class='del'>-a dot). In case the character device component is loaded, the handle would</div><div class='del'>-also appear as a device node in the /dev directory.</div><div class='del'>-</div><div class='del'>-Cdev component example:</div><div class='del'>-        $ echo "mdev0:ep_81:cdev:my_rx_channel" &gt;$(DRV_DIR)/add_link</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Sound component example:</div><div class='del'>-</div><div class='del'>-The sound component needs additional parameters to determine the audio</div><div class='del'>-resolution that is going to be used and to trigger the registration of a</div><div class='del'>-sound card with ALSA. The following audio formats are available:</div><div class='add'>+		Section 2.1 Configuration and Data Link</div><div class='add'>+</div><div class='add'>+The driver is to be configured via configfs. Each loaded component kernel</div><div class='add'>+object (see section 1.3) registers a subsystem with configfs, which is used to</div><div class='add'>+configure and establish communiction pathways (links) to attached devices on</div><div class='add'>+the bus. To do so, the user has to descend into the component's configuration</div><div class='add'>+directory and create a new directory (child config itmes). The name of this</div><div class='add'>+directory will be used as a reference for the link and it will contain the</div><div class='add'>+following attributes:</div><div class='add'>+</div><div class='add'>+	- buffer_size</div><div class='add'>+	  configure the buffer size for this channel</div><div class='add'>+	- subbuffer_size</div><div class='add'>+	  configure the sub-buffer size for this channel (needed for</div><div class='add'>+	  synchronous and isochrnous data)</div><div class='add'>+	- num_buffers</div><div class='add'>+	  configure number of buffers used for this channel</div><div class='add'>+	- datatype</div><div class='add'>+	  configure type of data that will travel over this channel</div><div class='add'>+	- direction</div><div class='add'>+	  configure whether this link will be an input or output</div><div class='add'>+	- dbr_size</div><div class='add'>+	  configure DBR data buffer size (this is used for MediaLB communiction</div><div class='add'>+	  only)</div><div class='add'>+	- packets_per_xact</div><div class='add'>+	  configure the number of packets that will be collected from the</div><div class='add'>+	  network before being transmitted via USB (this is used for USB</div><div class='add'>+	  communiction only)</div><div class='add'>+	- device</div><div class='add'>+	  name of the device the link is to be attached to</div><div class='add'>+	- channel</div><div class='add'>+	  name of the channel the link is to be attached to</div><div class='add'>+	- comp_params</div><div class='add'>+	  pass parameters needed by some components</div><div class='add'>+	- create_link</div><div class='add'>+	  write '1' to this attribute to trigger the creation of the link. In</div><div class='add'>+	  case of speculative configuration, the creation is post-poned until</div><div class='add'>+	  a physical device is being attached to the bus.</div><div class='add'>+	- destroy_link</div><div class='add'>+	  write '1' to this attribute to destroy an already established link</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+See ABI/sysfs-bus-most.txt and ABI/configfs-most.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		Section 2.2 Configure a Sound Card</div><div class='add'>+</div><div class='add'>+Setting up synchronous channels to be mapped as an ALSA sound adapter is a two</div><div class='add'>+step process. Firstly, a directory (child config group) has to be created</div><div class='add'>+inside the most_sound's configuration directory. This adapter dir will</div><div class='add'>+represent the sound adapter. The name of the directory is for user reference</div><div class='add'>+only and has no further influence, as all sound adapters will be given a static</div><div class='add'>+name in ALSA. The sound adapter will have the following attribute:</div><div class='add'>+</div><div class='add'>+	- create_card</div><div class='add'>+	  write '1' to this attribute to trigger the registration of the card</div><div class='add'>+	  with the ALSA subsystem.</div><div class='add'>+	  In case of speculative configuration, the creation is post-poned</div><div class='add'>+	  until a physical device is being attached to the bus.</div><div class='add'>+</div><div class='add'>+Secondly, links will have to be created inside the adapter dir as described in</div><div class='add'>+section 2.1. These links will become the PCM devices of the sound card. The</div><div class='add'>+name of a PCM device will be inherited from the directory name. When all</div><div class='add'>+channels have been configured and created, the sound card itself can be created</div><div class='add'>+by writing '1' to the create_card attribute.</div><div class='add'>+</div><div class='add'>+The sound component needs an additional parameter to determine the audio</div><div class='add'>+resolution that is going to be used.</div><div class='add'>+The following audio formats are available:</div><div class='ctx'> </div><div class='ctx'> 	- "1x8" (Mono)</div><div class='ctx'> 	- "2x16" (16-bit stereo)</div><div class='hunk'>@@ -152,18 +191,8 @@ sound card with ALSA. The following audio formats are available:</div><div class='ctx'> 	- "2x32" (32-bit stereo)</div><div class='ctx'> 	- "6x16" (16-bit surround 5.1)</div><div class='ctx'> </div><div class='del'>-To make the sound module create a sound card and register it with ALSA the</div><div class='del'>-string "create" needs to be attached to the module parameter section of the</div><div class='del'>-configuration string. To create a sound card with with two playback devices</div><div class='del'>-(linked to channel ep01 and ep02) and one capture device (linked to channel</div><div class='del'>-ep83) the following is written to the add_link file:</div><div class='del'>-</div><div class='del'>-        $ echo "mdev0:ep01:sound:most51_playback.6x16" &gt;$(DRV_DIR)/add_link</div><div class='del'>-        $ echo "mdev0:ep02:sound:most_playback.2x16" &gt;$(DRV_DIR)/add_link</div><div class='del'>-        $ echo "mdev0:ep83:sound:most_capture.2x16.create" &gt;$(DRV_DIR)/add_link</div><div class='del'>-</div><div class='del'>-The link names (most51_playback, most_playback and most_capture) will</div><div class='del'>-become the names of the PCM devices of the sound card.</div><div class='add'>+The resolution string has to be written to the link directory's comp_params</div><div class='add'>+attribute.</div><div class='ctx'> </div><div class='ctx'> 		Section 2.3 USB Padding</div><div class='ctx'> </div><div class='hunk'>@@ -174,13 +203,13 @@ hardware, which is for performance optimization purposes of the USB</div><div class='ctx'> transmission.</div><div class='ctx'> </div><div class='ctx'> When transmitting synchronous data the allocated channel width needs to be</div><div class='del'>-written to 'set_subbuffer_size'. Additionally, the number of MOST frames</div><div class='del'>-that should travel to the host within one USB transaction need to be</div><div class='del'>-written to 'packets_per_xact'.</div><div class='add'>+written to 'subbuffer_size'. Additionally, the number of MOST frames that</div><div class='add'>+should travel to the host within one USB transaction need to be written to</div><div class='add'>+'packets_per_xact'.</div><div class='ctx'> </div><div class='ctx'> The driver, then, calculates the synchronous threshold as follows:</div><div class='ctx'> </div><div class='del'>-	frame_size = set_subbuffer_size * packets_per_xact</div><div class='add'>+	frame_size = subbuffer_size * packets_per_xact</div><div class='ctx'> </div><div class='ctx'> In case 'packets_per_xact' is set to 0xFF the maximum number of packets,</div><div class='ctx'> allocated within one MOST frame, is calculated that fit into _one_ 512 byte</div><div class='hunk'>@@ -192,15 +221,15 @@ This frame_size is the number of synchronous data within an USB</div><div class='ctx'> transaction, which renders MTU_USB - frame_size bytes for padding.</div><div class='ctx'> </div><div class='ctx'> When transmitting isochronous AVP data the desired packet size needs to be</div><div class='del'>-written to 'set_subbuffer_size' and hardware will always expect two</div><div class='del'>-isochronous packets within one USB transaction. This renders</div><div class='add'>+written to 'subbuffer_size' and hardware will always expect two isochronous</div><div class='add'>+packets within one USB transaction. This renders</div><div class='ctx'> </div><div class='del'>-	MTU_USB - (2 * set_subbuffer_size)</div><div class='add'>+	MTU_USB - (2 * subbuffer_size)</div><div class='ctx'> </div><div class='ctx'> bytes for padding.</div><div class='ctx'> </div><div class='del'>-Note that at least (2 * set_subbuffer_size) bytes for isochronous data or</div><div class='del'>-(set_subbuffer_size * packts_per_xact) bytes for synchronous data need to</div><div class='add'>+Note that at least (2 * subbuffer_size) bytes for isochronous data or</div><div class='add'>+(subbuffer_size * packts_per_xact) bytes for synchronous data need to</div><div class='ctx'> be put in the transmission buffer and passed to the driver.</div><div class='ctx'> </div><div class='ctx'> Since adapter drivers are allowed to change a chosen configuration to best</div><div class='head'>diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig<br/>index 20047abbe560..db32ea7d1743 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> menuconfig MOST</div><div class='ctx'>         tristate "MOST support"</div><div class='del'>-	depends on HAS_DMA</div><div class='add'>+	depends on HAS_DMA &amp;&amp; CONFIGFS_FS</div><div class='ctx'>         default n</div><div class='ctx'>         ---help---</div><div class='ctx'> 	  Say Y here if you want to enable MOST support.</div><div class='head'>diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile<br/>index c7662f65f6db..85ea5a434ced 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST) += most_core.o</div><div class='ctx'> most_core-y := core.o</div><div class='add'>+most_core-y += configfs.o</div><div class='ctx'> ccflags-y += -I $(srctree)/drivers/staging/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MOST_CDEV)	+= cdev/</div><div class='head'>diff --git a/drivers/staging/most/cdev/Kconfig b/drivers/staging/most/cdev/Kconfig<br/>index 2b04e26bcbea..330c95fe6550 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/cdev/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/cdev/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/cdev/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/cdev/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MOST Cdev configuration</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/most/cdev/Makefile b/drivers/staging/most/cdev/Makefile<br/>index 21b0bd72c01d..9f4a8b8c9c27 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/cdev/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/cdev/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/cdev/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/cdev/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_CDEV) += most_cdev.o</div><div class='ctx'> </div><div class='ctx'> most_cdev-objs := cdev.o</div><div class='head'>diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c<br/>index f2b347cda8b7..d0cc0b746107 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/cdev/cdev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/cdev/cdev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/cdev/cdev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/cdev/cdev.c</a></div><div class='hunk'>@@ -425,7 +425,7 @@ static int comp_tx_completion(struct most_interface *iface, int channel_id)</div><div class='ctx'>  * Returns 0 on success or error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static int comp_probe(struct most_interface *iface, int channel_id,</div><div class='del'>-		      struct most_channel_config *cfg, char *name)</div><div class='add'>+		      struct most_channel_config *cfg, char *name, char *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct comp_channel *c;</div><div class='ctx'> 	unsigned long cl_flags;</div><div class='hunk'>@@ -527,8 +527,13 @@ static int __init mod_init(void)</div><div class='ctx'> 	err = most_register_component(&amp;comp.cc);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_cdev;</div><div class='add'>+	err = most_register_configfs_subsys(&amp;comp.cc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto deregister_comp;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+deregister_comp:</div><div class='add'>+	most_deregister_component(&amp;comp.cc);</div><div class='ctx'> free_cdev:</div><div class='ctx'> 	unregister_chrdev_region(comp.devno, CHRDEV_REGION_SIZE);</div><div class='ctx'> dest_ida:</div><div class='hunk'>@@ -543,13 +548,14 @@ static void __exit mod_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	pr_info("exit module\n");</div><div class='ctx'> </div><div class='add'>+	most_deregister_configfs_subsys(&amp;comp.cc);</div><div class='ctx'> 	most_deregister_component(&amp;comp.cc);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(c, tmp, &amp;channel_list, list) {</div><div class='ctx'> 		destroy_cdev(c);</div><div class='ctx'> 		destroy_channel(c);</div><div class='ctx'> 	}</div><div class='del'>-	unregister_chrdev_region(comp.devno, 1);</div><div class='add'>+	unregister_chrdev_region(comp.devno, CHRDEV_REGION_SIZE);</div><div class='ctx'> 	ida_destroy(&amp;comp.minor_id);</div><div class='ctx'> 	class_destroy(comp.class);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/most/configfs.c b/drivers/staging/most/configfs.c<br/>new file mode 100644<br/>index 000000000000..1d8bf29e0ffb<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/configfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/configfs.c</a></div><div class='hunk'>@@ -0,0 +1,676 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * configfs.c - Implementation of configfs interface to the driver stack</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2013-2015 Microchip Technology Germany II GmbH &amp; Co. KG</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/configfs.h&gt;</div><div class='add'>+#include &lt;most/core.h&gt;</div><div class='add'>+</div><div class='add'>+struct mdev_link {</div><div class='add'>+	struct config_item item;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	bool create_link;</div><div class='add'>+	bool destroy_link;</div><div class='add'>+	u16 num_buffers;</div><div class='add'>+	u16 buffer_size;</div><div class='add'>+	u16 subbuffer_size;</div><div class='add'>+	u16 packets_per_xact;</div><div class='add'>+	u16 dbr_size;</div><div class='add'>+	char datatype[PAGE_SIZE];</div><div class='add'>+	char direction[PAGE_SIZE];</div><div class='add'>+	char name[PAGE_SIZE];</div><div class='add'>+	char device[PAGE_SIZE];</div><div class='add'>+	char channel[PAGE_SIZE];</div><div class='add'>+	char comp[PAGE_SIZE];</div><div class='add'>+	char comp_params[PAGE_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct list_head mdev_link_list;</div><div class='add'>+</div><div class='add'>+static int set_cfg_buffer_size(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;buffer_size)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_buffer_size(link-&gt;device, link-&gt;channel,</div><div class='add'>+					link-&gt;buffer_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cfg_subbuffer_size(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;subbuffer_size)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_subbuffer_size(link-&gt;device, link-&gt;channel,</div><div class='add'>+					   link-&gt;subbuffer_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cfg_dbr_size(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;dbr_size)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_dbr_size(link-&gt;device, link-&gt;channel,</div><div class='add'>+				     link-&gt;dbr_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cfg_num_buffers(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;num_buffers)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_num_buffers(link-&gt;device, link-&gt;channel,</div><div class='add'>+					link-&gt;num_buffers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cfg_packets_xact(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!link-&gt;packets_per_xact)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_packets_xact(link-&gt;device, link-&gt;channel,</div><div class='add'>+					 link-&gt;packets_per_xact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cfg_direction(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!strlen(link-&gt;direction))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_direction(link-&gt;device, link-&gt;channel,</div><div class='add'>+				      link-&gt;direction);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_cfg_datatype(struct mdev_link *link)</div><div class='add'>+{</div><div class='add'>+	if (!strlen(link-&gt;datatype))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	return most_set_cfg_datatype(link-&gt;device, link-&gt;channel,</div><div class='add'>+				     link-&gt;datatype);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int (*set_config_val[])(struct mdev_link *link) = {</div><div class='add'>+	set_cfg_buffer_size,</div><div class='add'>+	set_cfg_subbuffer_size,</div><div class='add'>+	set_cfg_dbr_size,</div><div class='add'>+	set_cfg_num_buffers,</div><div class='add'>+	set_cfg_packets_xact,</div><div class='add'>+	set_cfg_direction,</div><div class='add'>+	set_cfg_datatype,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdev_link *to_mdev_link(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return container_of(item, struct mdev_link, item);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_config_and_add_link(struct mdev_link *mdev_link)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(set_config_val); i++) {</div><div class='add'>+		ret = set_config_val[i](mdev_link);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -ENODEV) {</div><div class='add'>+			pr_err("Config failed\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return most_add_link(mdev_link-&gt;device, mdev_link-&gt;channel,</div><div class='add'>+			     mdev_link-&gt;comp, mdev_link-&gt;name,</div><div class='add'>+			     mdev_link-&gt;comp_params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_create_link_store(struct config_item *item,</div><div class='add'>+					   const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	bool tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(page, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return count;</div><div class='add'>+	ret = set_config_and_add_link(mdev_link);</div><div class='add'>+	if (ret &amp;&amp; ret != -ENODEV)</div><div class='add'>+		return ret;</div><div class='add'>+	list_add_tail(&amp;mdev_link-&gt;list, &amp;mdev_link_list);</div><div class='add'>+	mdev_link-&gt;create_link = tmp;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_destroy_link_store(struct config_item *item,</div><div class='add'>+					    const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	bool tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(page, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return count;</div><div class='add'>+	mdev_link-&gt;destroy_link = tmp;</div><div class='add'>+	ret = most_remove_link(mdev_link-&gt;device, mdev_link-&gt;channel,</div><div class='add'>+			       mdev_link-&gt;comp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!list_empty(&amp;mdev_link_list))</div><div class='add'>+		list_del(&amp;mdev_link-&gt;list);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_direction_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%s\n", to_mdev_link(item)-&gt;direction);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_direction_store(struct config_item *item,</div><div class='add'>+					 const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+</div><div class='add'>+	if (!sysfs_streq(page, "dir_rx") &amp;&amp; !sysfs_streq(page, "rx") &amp;&amp;</div><div class='add'>+	    !sysfs_streq(page, "dir_tx") &amp;&amp; !sysfs_streq(page, "tx"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	strcpy(mdev_link-&gt;direction, page);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_datatype_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%s\n", to_mdev_link(item)-&gt;datatype);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_datatype_store(struct config_item *item,</div><div class='add'>+					const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+</div><div class='add'>+	if (!sysfs_streq(page, "control") &amp;&amp; !sysfs_streq(page, "async") &amp;&amp;</div><div class='add'>+	    !sysfs_streq(page, "sync") &amp;&amp; !sysfs_streq(page, "isoc") &amp;&amp;</div><div class='add'>+	    !sysfs_streq(page, "isoc_avp"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	strcpy(mdev_link-&gt;datatype, page);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_device_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%s\n", to_mdev_link(item)-&gt;device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_device_store(struct config_item *item,</div><div class='add'>+				      const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+</div><div class='add'>+	strcpy(mdev_link-&gt;device, page);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_channel_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%s\n", to_mdev_link(item)-&gt;channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_channel_store(struct config_item *item,</div><div class='add'>+				       const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+</div><div class='add'>+	strcpy(mdev_link-&gt;channel, page);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_comp_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%s\n", to_mdev_link(item)-&gt;comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_comp_store(struct config_item *item,</div><div class='add'>+				    const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+</div><div class='add'>+	strcpy(mdev_link-&gt;comp, page);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_comp_params_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%s\n",</div><div class='add'>+			to_mdev_link(item)-&gt;comp_params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_comp_params_store(struct config_item *item,</div><div class='add'>+					   const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+</div><div class='add'>+	strcpy(mdev_link-&gt;comp_params, page);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_num_buffers_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%d\n",</div><div class='add'>+			to_mdev_link(item)-&gt;num_buffers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_num_buffers_store(struct config_item *item,</div><div class='add'>+					   const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou16(page, 0, &amp;mdev_link-&gt;num_buffers);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_buffer_size_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%d\n",</div><div class='add'>+			to_mdev_link(item)-&gt;buffer_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_buffer_size_store(struct config_item *item,</div><div class='add'>+					   const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou16(page, 0, &amp;mdev_link-&gt;buffer_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_subbuffer_size_show(struct config_item *item,</div><div class='add'>+					     char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%d\n",</div><div class='add'>+			to_mdev_link(item)-&gt;subbuffer_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_subbuffer_size_store(struct config_item *item,</div><div class='add'>+					      const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou16(page, 0, &amp;mdev_link-&gt;subbuffer_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_packets_per_xact_show(struct config_item *item,</div><div class='add'>+					       char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%d\n",</div><div class='add'>+			to_mdev_link(item)-&gt;packets_per_xact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_packets_per_xact_store(struct config_item *item,</div><div class='add'>+						const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou16(page, 0, &amp;mdev_link-&gt;packets_per_xact);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_dbr_size_show(struct config_item *item, char *page)</div><div class='add'>+{</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%d\n", to_mdev_link(item)-&gt;dbr_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mdev_link_dbr_size_store(struct config_item *item,</div><div class='add'>+					const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou16(page, 0, &amp;mdev_link-&gt;dbr_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CONFIGFS_ATTR_WO(mdev_link_, create_link);</div><div class='add'>+CONFIGFS_ATTR_WO(mdev_link_, destroy_link);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, device);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, channel);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, comp);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, comp_params);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, num_buffers);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, buffer_size);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, subbuffer_size);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, packets_per_xact);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, datatype);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, direction);</div><div class='add'>+CONFIGFS_ATTR(mdev_link_, dbr_size);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *mdev_link_attrs[] = {</div><div class='add'>+	&amp;mdev_link_attr_create_link,</div><div class='add'>+	&amp;mdev_link_attr_destroy_link,</div><div class='add'>+	&amp;mdev_link_attr_device,</div><div class='add'>+	&amp;mdev_link_attr_channel,</div><div class='add'>+	&amp;mdev_link_attr_comp,</div><div class='add'>+	&amp;mdev_link_attr_comp_params,</div><div class='add'>+	&amp;mdev_link_attr_num_buffers,</div><div class='add'>+	&amp;mdev_link_attr_buffer_size,</div><div class='add'>+	&amp;mdev_link_attr_subbuffer_size,</div><div class='add'>+	&amp;mdev_link_attr_packets_per_xact,</div><div class='add'>+	&amp;mdev_link_attr_datatype,</div><div class='add'>+	&amp;mdev_link_attr_direction,</div><div class='add'>+	&amp;mdev_link_attr_dbr_size,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mdev_link_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link = to_mdev_link(item);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;mdev_link_list)) {</div><div class='add'>+		ret = most_remove_link(mdev_link-&gt;device, mdev_link-&gt;channel,</div><div class='add'>+				       mdev_link-&gt;comp);</div><div class='add'>+		if (ret &amp;&amp; (ret != -ENODEV))</div><div class='add'>+			pr_err("Removing link failed.\n");</div><div class='add'>+		list_del(&amp;mdev_link-&gt;list);</div><div class='add'>+	}</div><div class='add'>+	kfree(to_mdev_link(item));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations mdev_link_item_ops = {</div><div class='add'>+	.release		= mdev_link_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_item_type mdev_link_type = {</div><div class='add'>+	.ct_item_ops	= &amp;mdev_link_item_ops,</div><div class='add'>+	.ct_attrs	= mdev_link_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct most_common {</div><div class='add'>+	struct config_group group;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct most_common *to_most_common(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return container_of(to_config_group(item), struct most_common, group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct config_item *most_common_make_item(struct config_group *group,</div><div class='add'>+						 const char *name)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link;</div><div class='add'>+</div><div class='add'>+	mdev_link = kzalloc(sizeof(*mdev_link), GFP_KERNEL);</div><div class='add'>+	if (!mdev_link)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	config_item_init_type_name(&amp;mdev_link-&gt;item, name,</div><div class='add'>+				   &amp;mdev_link_type);</div><div class='add'>+</div><div class='add'>+	if (!strcmp(group-&gt;cg_item.ci_namebuf, "most_cdev"))</div><div class='add'>+		strcpy(mdev_link-&gt;comp, "cdev");</div><div class='add'>+	else if (!strcmp(group-&gt;cg_item.ci_namebuf, "most_net"))</div><div class='add'>+		strcpy(mdev_link-&gt;comp, "net");</div><div class='add'>+	else if (!strcmp(group-&gt;cg_item.ci_namebuf, "most_video"))</div><div class='add'>+		strcpy(mdev_link-&gt;comp, "video");</div><div class='add'>+	strcpy(mdev_link-&gt;name, name);</div><div class='add'>+	return &amp;mdev_link-&gt;item;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void most_common_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	kfree(to_most_common(item));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations most_common_item_ops = {</div><div class='add'>+	.release	= most_common_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_group_operations most_common_group_ops = {</div><div class='add'>+	.make_item	= most_common_make_item,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_item_type most_common_type = {</div><div class='add'>+	.ct_item_ops	= &amp;most_common_item_ops,</div><div class='add'>+	.ct_group_ops	= &amp;most_common_group_ops,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_subsystem most_cdev_subsys = {</div><div class='add'>+	.su_group = {</div><div class='add'>+		.cg_item = {</div><div class='add'>+			.ci_namebuf = "most_cdev",</div><div class='add'>+			.ci_type = &amp;most_common_type,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_subsystem most_net_subsys = {</div><div class='add'>+	.su_group = {</div><div class='add'>+		.cg_item = {</div><div class='add'>+			.ci_namebuf = "most_net",</div><div class='add'>+			.ci_type = &amp;most_common_type,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_subsystem most_video_subsys = {</div><div class='add'>+	.su_group = {</div><div class='add'>+		.cg_item = {</div><div class='add'>+			.ci_namebuf = "most_video",</div><div class='add'>+			.ci_type = &amp;most_common_type,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct most_snd_grp {</div><div class='add'>+	struct config_group group;</div><div class='add'>+	bool create_card;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct most_snd_grp *to_most_snd_grp(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return container_of(to_config_group(item), struct most_snd_grp, group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct config_item *most_snd_grp_make_item(struct config_group *group,</div><div class='add'>+						  const char *name)</div><div class='add'>+{</div><div class='add'>+	struct mdev_link *mdev_link;</div><div class='add'>+</div><div class='add'>+	mdev_link = kzalloc(sizeof(*mdev_link), GFP_KERNEL);</div><div class='add'>+	if (!mdev_link)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	config_item_init_type_name(&amp;mdev_link-&gt;item, name, &amp;mdev_link_type);</div><div class='add'>+	mdev_link-&gt;create_link = 0;</div><div class='add'>+	strcpy(mdev_link-&gt;name, name);</div><div class='add'>+	strcpy(mdev_link-&gt;comp, "sound");</div><div class='add'>+	return &amp;mdev_link-&gt;item;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t most_snd_grp_create_card_store(struct config_item *item,</div><div class='add'>+					      const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct most_snd_grp *snd_grp = to_most_snd_grp(item);</div><div class='add'>+	int ret;</div><div class='add'>+	bool tmp;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(page, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (tmp) {</div><div class='add'>+		ret = most_cfg_complete("sound");</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	snd_grp-&gt;create_card = tmp;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CONFIGFS_ATTR_WO(most_snd_grp_, create_card);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *most_snd_grp_attrs[] = {</div><div class='add'>+	&amp;most_snd_grp_attr_create_card,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void most_snd_grp_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	struct most_snd_grp *group = to_most_snd_grp(item);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;group-&gt;list);</div><div class='add'>+	kfree(group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_item_operations most_snd_grp_item_ops = {</div><div class='add'>+	.release	= most_snd_grp_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct configfs_group_operations most_snd_grp_group_ops = {</div><div class='add'>+	.make_item	= most_snd_grp_make_item,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_item_type most_snd_grp_type = {</div><div class='add'>+	.ct_item_ops	= &amp;most_snd_grp_item_ops,</div><div class='add'>+	.ct_group_ops	= &amp;most_snd_grp_group_ops,</div><div class='add'>+	.ct_attrs	= most_snd_grp_attrs,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct most_sound {</div><div class='add'>+	struct configfs_subsystem subsys;</div><div class='add'>+	struct list_head soundcard_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct config_group *most_sound_make_group(struct config_group *group,</div><div class='add'>+						  const char *name)</div><div class='add'>+{</div><div class='add'>+	struct most_snd_grp *most;</div><div class='add'>+	struct most_sound *ms = container_of(to_configfs_subsystem(group),</div><div class='add'>+					     struct most_sound, subsys);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(most, &amp;ms-&gt;soundcard_list, list) {</div><div class='add'>+		if (!most-&gt;create_card) {</div><div class='add'>+			pr_info("adapter configuration still in progress.\n");</div><div class='add'>+			return ERR_PTR(-EPROTO);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	most = kzalloc(sizeof(*most), GFP_KERNEL);</div><div class='add'>+	if (!most)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	config_group_init_type_name(&amp;most-&gt;group, name, &amp;most_snd_grp_type);</div><div class='add'>+	list_add_tail(&amp;most-&gt;list, &amp;ms-&gt;soundcard_list);</div><div class='add'>+	return &amp;most-&gt;group;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct configfs_group_operations most_sound_group_ops = {</div><div class='add'>+	.make_group	= most_sound_make_group,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_item_type most_sound_type = {</div><div class='add'>+	.ct_group_ops	= &amp;most_sound_group_ops,</div><div class='add'>+	.ct_owner	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct most_sound most_sound_subsys = {</div><div class='add'>+	.subsys = {</div><div class='add'>+		.su_group = {</div><div class='add'>+			.cg_item = {</div><div class='add'>+				.ci_namebuf = "most_sound",</div><div class='add'>+				.ci_type = &amp;most_sound_type,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int most_register_configfs_subsys(struct core_component *c)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(c-&gt;name, "cdev"))</div><div class='add'>+		ret = configfs_register_subsystem(&amp;most_cdev_subsys);</div><div class='add'>+	else if (!strcmp(c-&gt;name, "net"))</div><div class='add'>+		ret = configfs_register_subsystem(&amp;most_net_subsys);</div><div class='add'>+	else if (!strcmp(c-&gt;name, "video"))</div><div class='add'>+		ret = configfs_register_subsystem(&amp;most_video_subsys);</div><div class='add'>+	else if (!strcmp(c-&gt;name, "sound"))</div><div class='add'>+		ret = configfs_register_subsystem(&amp;most_sound_subsys.subsys);</div><div class='add'>+	else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Error %d while registering subsystem %s\n",</div><div class='add'>+		       ret, c-&gt;name);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(most_register_configfs_subsys);</div><div class='add'>+</div><div class='add'>+void most_interface_register_notify(const char *mdev)</div><div class='add'>+{</div><div class='add'>+	bool register_snd_card = false;</div><div class='add'>+	struct mdev_link *mdev_link;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mdev_link, &amp;mdev_link_list, list) {</div><div class='add'>+		if (!strcmp(mdev_link-&gt;device, mdev)) {</div><div class='add'>+			set_config_and_add_link(mdev_link);</div><div class='add'>+			if (!strcmp(mdev_link-&gt;comp, "sound"))</div><div class='add'>+				register_snd_card = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (register_snd_card)</div><div class='add'>+		most_cfg_complete("sound");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void most_deregister_configfs_subsys(struct core_component *c)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(c-&gt;name, "cdev"))</div><div class='add'>+		configfs_unregister_subsystem(&amp;most_cdev_subsys);</div><div class='add'>+	else if (!strcmp(c-&gt;name, "net"))</div><div class='add'>+		configfs_unregister_subsystem(&amp;most_net_subsys);</div><div class='add'>+	else if (!strcmp(c-&gt;name, "video"))</div><div class='add'>+		configfs_unregister_subsystem(&amp;most_video_subsys);</div><div class='add'>+	else if (!strcmp(c-&gt;name, "sound"))</div><div class='add'>+		configfs_unregister_subsystem(&amp;most_sound_subsys.subsys);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(most_deregister_configfs_subsys);</div><div class='add'>+</div><div class='add'>+int __init configfs_init(void)</div><div class='add'>+{</div><div class='add'>+	config_group_init(&amp;most_cdev_subsys.su_group);</div><div class='add'>+	mutex_init(&amp;most_cdev_subsys.su_mutex);</div><div class='add'>+</div><div class='add'>+	config_group_init(&amp;most_net_subsys.su_group);</div><div class='add'>+	mutex_init(&amp;most_net_subsys.su_mutex);</div><div class='add'>+</div><div class='add'>+	config_group_init(&amp;most_video_subsys.su_group);</div><div class='add'>+	mutex_init(&amp;most_video_subsys.su_mutex);</div><div class='add'>+</div><div class='add'>+	config_group_init(&amp;most_sound_subsys.subsys.su_group);</div><div class='add'>+	mutex_init(&amp;most_sound_subsys.subsys.su_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;most_sound_subsys.soundcard_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mdev_link_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/staging/most/core.c b/drivers/staging/most/core.c<br/>index 18936cdb1083..86a8545c8d97 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/core.c</a></div><div class='hunk'>@@ -272,19 +272,6 @@ static ssize_t set_number_of_buffers_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", c-&gt;cfg.num_buffers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_number_of_buffers_store(struct device *dev,</div><div class='del'>-					   struct device_attribute *attr,</div><div class='del'>-					   const char *buf,</div><div class='del'>-					   size_t count)</div><div class='del'>-{</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-	int ret = kstrtou16(buf, 0, &amp;c-&gt;cfg.num_buffers);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t set_buffer_size_show(struct device *dev,</div><div class='ctx'> 				    struct device_attribute *attr,</div><div class='ctx'> 				    char *buf)</div><div class='hunk'>@@ -294,19 +281,6 @@ static ssize_t set_buffer_size_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", c-&gt;cfg.buffer_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_buffer_size_store(struct device *dev,</div><div class='del'>-				     struct device_attribute *attr,</div><div class='del'>-				     const char *buf,</div><div class='del'>-				     size_t count)</div><div class='del'>-{</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-	int ret = kstrtou16(buf, 0, &amp;c-&gt;cfg.buffer_size);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t set_direction_show(struct device *dev,</div><div class='ctx'> 				  struct device_attribute *attr,</div><div class='ctx'> 				  char *buf)</div><div class='hunk'>@@ -320,28 +294,6 @@ static ssize_t set_direction_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "unconfigured\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_direction_store(struct device *dev,</div><div class='del'>-				   struct device_attribute *attr,</div><div class='del'>-				   const char *buf,</div><div class='del'>-				   size_t count)</div><div class='del'>-{</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-</div><div class='del'>-	if (!strcmp(buf, "dir_rx\n")) {</div><div class='del'>-		c-&gt;cfg.direction = MOST_CH_RX;</div><div class='del'>-	} else if (!strcmp(buf, "rx\n")) {</div><div class='del'>-		c-&gt;cfg.direction = MOST_CH_RX;</div><div class='del'>-	} else if (!strcmp(buf, "dir_tx\n")) {</div><div class='del'>-		c-&gt;cfg.direction = MOST_CH_TX;</div><div class='del'>-	} else if (!strcmp(buf, "tx\n")) {</div><div class='del'>-		c-&gt;cfg.direction = MOST_CH_TX;</div><div class='del'>-	} else {</div><div class='del'>-		pr_info("WARN: invalid attribute settings\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t set_datatype_show(struct device *dev,</div><div class='ctx'> 				 struct device_attribute *attr,</div><div class='ctx'> 				 char *buf)</div><div class='hunk'>@@ -356,28 +308,6 @@ static ssize_t set_datatype_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "unconfigured\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_datatype_store(struct device *dev,</div><div class='del'>-				  struct device_attribute *attr,</div><div class='del'>-				  const char *buf,</div><div class='del'>-				  size_t count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ch_data_type); i++) {</div><div class='del'>-		if (!strcmp(buf, ch_data_type[i].name)) {</div><div class='del'>-			c-&gt;cfg.data_type = ch_data_type[i].most_ch_data_type;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == ARRAY_SIZE(ch_data_type)) {</div><div class='del'>-		pr_info("WARN: invalid attribute settings\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t set_subbuffer_size_show(struct device *dev,</div><div class='ctx'> 				       struct device_attribute *attr,</div><div class='ctx'> 				       char *buf)</div><div class='hunk'>@@ -387,19 +317,6 @@ static ssize_t set_subbuffer_size_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", c-&gt;cfg.subbuffer_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_subbuffer_size_store(struct device *dev,</div><div class='del'>-					struct device_attribute *attr,</div><div class='del'>-					const char *buf,</div><div class='del'>-					size_t count)</div><div class='del'>-{</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-	int ret = kstrtou16(buf, 0, &amp;c-&gt;cfg.subbuffer_size);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t set_packets_per_xact_show(struct device *dev,</div><div class='ctx'> 					 struct device_attribute *attr,</div><div class='ctx'> 					 char *buf)</div><div class='hunk'>@@ -409,19 +326,6 @@ static ssize_t set_packets_per_xact_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", c-&gt;cfg.packets_per_xact);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_packets_per_xact_store(struct device *dev,</div><div class='del'>-					  struct device_attribute *attr,</div><div class='del'>-					  const char *buf,</div><div class='del'>-					  size_t count)</div><div class='del'>-{</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-	int ret = kstrtou16(buf, 0, &amp;c-&gt;cfg.packets_per_xact);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t set_dbr_size_show(struct device *dev,</div><div class='ctx'> 				 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -430,18 +334,6 @@ static ssize_t set_dbr_size_show(struct device *dev,</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", c-&gt;cfg.dbr_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_dbr_size_store(struct device *dev,</div><div class='del'>-				  struct device_attribute *attr,</div><div class='del'>-				  const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct most_channel *c = to_channel(dev);</div><div class='del'>-	int ret = kstrtou16(buf, 0, &amp;c-&gt;cfg.dbr_size);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define to_dev_attr(a) container_of(a, struct device_attribute, attr)</div><div class='ctx'> static umode_t channel_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 				       struct attribute *attr, int index)</div><div class='hunk'>@@ -469,13 +361,13 @@ static DEVICE_ATTR_RO(number_of_stream_buffers);</div><div class='ctx'> static DEVICE_ATTR_RO(size_of_stream_buffer);</div><div class='ctx'> static DEVICE_ATTR_RO(size_of_packet_buffer);</div><div class='ctx'> static DEVICE_ATTR_RO(channel_starving);</div><div class='del'>-static DEVICE_ATTR_RW(set_buffer_size);</div><div class='del'>-static DEVICE_ATTR_RW(set_number_of_buffers);</div><div class='del'>-static DEVICE_ATTR_RW(set_direction);</div><div class='del'>-static DEVICE_ATTR_RW(set_datatype);</div><div class='del'>-static DEVICE_ATTR_RW(set_subbuffer_size);</div><div class='del'>-static DEVICE_ATTR_RW(set_packets_per_xact);</div><div class='del'>-static DEVICE_ATTR_RW(set_dbr_size);</div><div class='add'>+static DEVICE_ATTR_RO(set_buffer_size);</div><div class='add'>+static DEVICE_ATTR_RO(set_number_of_buffers);</div><div class='add'>+static DEVICE_ATTR_RO(set_direction);</div><div class='add'>+static DEVICE_ATTR_RO(set_datatype);</div><div class='add'>+static DEVICE_ATTR_RO(set_subbuffer_size);</div><div class='add'>+static DEVICE_ATTR_RO(set_packets_per_xact);</div><div class='add'>+static DEVICE_ATTR_RO(set_dbr_size);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *channel_attrs[] = {</div><div class='ctx'> 	DEV_ATTR(available_directions),</div><div class='hunk'>@@ -701,6 +593,7 @@ static struct most_channel *get_channel(char *mdev, char *mdev_ch)</div><div class='ctx'> static</div><div class='ctx'> inline int link_channel_to_component(struct most_channel *c,</div><div class='ctx'> 				     struct core_component *comp,</div><div class='add'>+				     char *name,</div><div class='ctx'> 				     char *comp_param)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -714,7 +607,8 @@ inline int link_channel_to_component(struct most_channel *c,</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	*comp_ptr = comp;</div><div class='del'>-	ret = comp-&gt;probe_channel(c-&gt;iface, c-&gt;channel_id, &amp;c-&gt;cfg, comp_param);</div><div class='add'>+	ret = comp-&gt;probe_channel(c-&gt;iface, c-&gt;channel_id, &amp;c-&gt;cfg, name,</div><div class='add'>+				  comp_param);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		*comp_ptr = NULL;</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -722,65 +616,118 @@ inline int link_channel_to_component(struct most_channel *c,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * add_link_store - store function for add_link attribute</div><div class='del'>- * @drv: device driver</div><div class='del'>- * @buf: buffer</div><div class='del'>- * @len: buffer length</div><div class='del'>- *</div><div class='del'>- * This parses the string given by buf and splits it into</div><div class='del'>- * four substrings. Note: last substring is optional. In case a cdev</div><div class='del'>- * component is loaded the optional 4th substring will make up the name of</div><div class='del'>- * device node in the /dev directory. If omitted, the device node will</div><div class='del'>- * inherit the channel's name within sysfs.</div><div class='del'>- *</div><div class='del'>- * Searches for (device, channel) pair and probes the component</div><div class='del'>- *</div><div class='del'>- * Example:</div><div class='del'>- * (1) echo "mdev0:ch6:cdev:my_rxchannel" &gt;add_link</div><div class='del'>- * (2) echo "mdev1:ep81:cdev" &gt;add_link</div><div class='del'>- *</div><div class='del'>- * (1) would create the device node /dev/my_rxchannel</div><div class='del'>- * (2) would create the device node /dev/mdev1-ep81</div><div class='del'>- */</div><div class='del'>-static ssize_t add_link_store(struct device_driver *drv,</div><div class='del'>-			      const char *buf,</div><div class='del'>-			      size_t len)</div><div class='add'>+int most_set_cfg_buffer_size(char *mdev, char *mdev_ch, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct most_channel *c;</div><div class='del'>-	struct core_component *comp;</div><div class='del'>-	char buffer[STRING_SIZE];</div><div class='del'>-	char *mdev;</div><div class='del'>-	char *mdev_ch;</div><div class='del'>-	char *comp_name;</div><div class='del'>-	char *comp_param;</div><div class='del'>-	char devnod_buf[STRING_SIZE];</div><div class='del'>-	int ret;</div><div class='del'>-	size_t max_len = min_t(size_t, len + 1, STRING_SIZE);</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='ctx'> </div><div class='del'>-	strlcpy(buffer, buf, max_len);</div><div class='del'>-	ret = split_string(buffer, &amp;mdev, &amp;mdev_ch, &amp;comp_name, &amp;comp_param);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	comp = match_component(comp_name);</div><div class='del'>-	if (!comp)</div><div class='add'>+	if (!c)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	if (!comp_param || *comp_param == 0) {</div><div class='del'>-		snprintf(devnod_buf, sizeof(devnod_buf), "%s-%s", mdev,</div><div class='del'>-			 mdev_ch);</div><div class='del'>-		comp_param = devnod_buf;</div><div class='add'>+	c-&gt;cfg.buffer_size = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_set_cfg_subbuffer_size(char *mdev, char *mdev_ch, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	c-&gt;cfg.subbuffer_size = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_set_cfg_dbr_size(char *mdev, char *mdev_ch, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	c-&gt;cfg.dbr_size = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_set_cfg_num_buffers(char *mdev, char *mdev_ch, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	c-&gt;cfg.num_buffers = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_set_cfg_datatype(char *mdev, char *mdev_ch, char *buf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ch_data_type); i++) {</div><div class='add'>+		if (!strcmp(buf, ch_data_type[i].name)) {</div><div class='add'>+			c-&gt;cfg.data_type = ch_data_type[i].most_ch_data_type;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	c = get_channel(mdev, mdev_ch);</div><div class='add'>+	if (i == ARRAY_SIZE(ch_data_type))</div><div class='add'>+		pr_info("WARN: invalid attribute settings\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_set_cfg_direction(char *mdev, char *mdev_ch, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!strcmp(buf, "dir_rx\n")) {</div><div class='add'>+		c-&gt;cfg.direction = MOST_CH_RX;</div><div class='add'>+	} else if (!strcmp(buf, "rx\n")) {</div><div class='add'>+		c-&gt;cfg.direction = MOST_CH_RX;</div><div class='add'>+	} else if (!strcmp(buf, "dir_tx\n")) {</div><div class='add'>+		c-&gt;cfg.direction = MOST_CH_TX;</div><div class='add'>+	} else if (!strcmp(buf, "tx\n")) {</div><div class='add'>+		c-&gt;cfg.direction = MOST_CH_TX;</div><div class='add'>+	} else {</div><div class='add'>+		pr_info("Invalid direction\n");</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_set_cfg_packets_xact(char *mdev, char *mdev_ch, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+</div><div class='ctx'> 	if (!c)</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	c-&gt;cfg.packets_per_xact = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int most_cfg_complete(char *comp_name)</div><div class='add'>+{</div><div class='add'>+	struct core_component *comp;</div><div class='add'>+</div><div class='add'>+	comp = match_component(comp_name);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ret = link_channel_to_component(c, comp, comp_param);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return len;</div><div class='add'>+	return comp-&gt;cfg_complete();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int most_add_link(char *mdev, char *mdev_ch, char *comp_name, char *link_name,</div><div class='add'>+		  char *comp_param)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c = get_channel(mdev, mdev_ch);</div><div class='add'>+	struct core_component *comp = match_component(comp_name);</div><div class='add'>+</div><div class='add'>+	if (!c || !comp)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return link_channel_to_component(c, comp, link_name, comp_param);</div><div class='add'>+}</div><div class='ctx'> /**</div><div class='ctx'>  * remove_link_store - store function for remove_link attribute</div><div class='ctx'>  * @drv: device driver</div><div class='hunk'>@@ -823,17 +770,36 @@ static ssize_t remove_link_store(struct device_driver *drv,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int most_remove_link(char *mdev, char *mdev_ch, char *comp_name)</div><div class='add'>+{</div><div class='add'>+	struct most_channel *c;</div><div class='add'>+	struct core_component *comp;</div><div class='add'>+</div><div class='add'>+	comp = match_component(comp_name);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	c = get_channel(mdev, mdev_ch);</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (comp-&gt;disconnect_channel(c-&gt;iface, c-&gt;channel_id))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (c-&gt;pipe0.comp == comp)</div><div class='add'>+		c-&gt;pipe0.comp = NULL;</div><div class='add'>+	if (c-&gt;pipe1.comp == comp)</div><div class='add'>+		c-&gt;pipe1.comp = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define DRV_ATTR(_name)  (&amp;driver_attr_##_name.attr)</div><div class='ctx'> </div><div class='ctx'> static DRIVER_ATTR_RO(links);</div><div class='ctx'> static DRIVER_ATTR_RO(components);</div><div class='del'>-static DRIVER_ATTR_WO(add_link);</div><div class='ctx'> static DRIVER_ATTR_WO(remove_link);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *mc_attrs[] = {</div><div class='ctx'> 	DRV_ATTR(links),</div><div class='ctx'> 	DRV_ATTR(components),</div><div class='del'>-	DRV_ATTR(add_link),</div><div class='ctx'> 	DRV_ATTR(remove_link),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='hunk'>@@ -1431,7 +1397,7 @@ int most_register_interface(struct most_interface *iface)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;iface-&gt;p-&gt;channel_list);</div><div class='ctx'> 	iface-&gt;p-&gt;dev_id = id;</div><div class='del'>-	snprintf(iface-&gt;p-&gt;name, STRING_SIZE, "mdev%d", id);</div><div class='add'>+	strscpy(iface-&gt;p-&gt;name, iface-&gt;description, sizeof(iface-&gt;p-&gt;name));</div><div class='ctx'> 	iface-&gt;dev.init_name = iface-&gt;p-&gt;name;</div><div class='ctx'> 	iface-&gt;dev.bus = &amp;mc.bus;</div><div class='ctx'> 	iface-&gt;dev.parent = &amp;mc.dev;</div><div class='hunk'>@@ -1487,6 +1453,7 @@ int most_register_interface(struct most_interface *iface)</div><div class='ctx'> 	}</div><div class='ctx'> 	pr_info("registered new device mdev%d (%s)\n",</div><div class='ctx'> 		id, iface-&gt;description);</div><div class='add'>+	most_interface_register_notify(iface-&gt;description);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_most_channel:</div><div class='hunk'>@@ -1621,7 +1588,7 @@ static int __init most_init(void)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_unregister_driver;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	configfs_init();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_unregister_driver:</div><div class='head'>diff --git a/drivers/staging/most/core.h b/drivers/staging/most/core.h<br/>index 64cc02f161e7..652aaa771029 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/core.h</a></div><div class='hunk'>@@ -266,11 +266,13 @@ struct core_component {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int (*probe_channel)(struct most_interface *iface, int channel_idx,</div><div class='del'>-			     struct most_channel_config *cfg, char *name);</div><div class='add'>+			     struct most_channel_config *cfg, char *name,</div><div class='add'>+			     char *param);</div><div class='ctx'> 	int (*disconnect_channel)(struct most_interface *iface,</div><div class='ctx'> 				  int channel_idx);</div><div class='ctx'> 	int (*rx_completion)(struct mbo *mbo);</div><div class='ctx'> 	int (*tx_completion)(struct most_interface *iface, int channel_idx);</div><div class='add'>+	int (*cfg_complete)(void);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -318,5 +320,19 @@ int most_start_channel(struct most_interface *iface, int channel_idx,</div><div class='ctx'> 		       struct core_component *comp);</div><div class='ctx'> int most_stop_channel(struct most_interface *iface, int channel_idx,</div><div class='ctx'> 		      struct core_component *comp);</div><div class='del'>-</div><div class='add'>+int __init configfs_init(void);</div><div class='add'>+int most_register_configfs_subsys(struct core_component *comp);</div><div class='add'>+void most_deregister_configfs_subsys(struct core_component *comp);</div><div class='add'>+int most_add_link(char *mdev, char *mdev_ch, char *comp_name, char *link_name,</div><div class='add'>+		  char *comp_param);</div><div class='add'>+int most_remove_link(char *mdev, char *mdev_ch, char *comp_name);</div><div class='add'>+int most_set_cfg_buffer_size(char *mdev, char *mdev_ch, u16 val);</div><div class='add'>+int most_set_cfg_subbuffer_size(char *mdev, char *mdev_ch, u16 val);</div><div class='add'>+int most_set_cfg_dbr_size(char *mdev, char *mdev_ch, u16 val);</div><div class='add'>+int most_set_cfg_num_buffers(char *mdev, char *mdev_ch, u16 val);</div><div class='add'>+int most_set_cfg_datatype(char *mdev, char *mdev_ch, char *buf);</div><div class='add'>+int most_set_cfg_direction(char *mdev, char *mdev_ch, char *buf);</div><div class='add'>+int most_set_cfg_packets_xact(char *mdev, char *mdev_ch, u16 val);</div><div class='add'>+int most_cfg_complete(char *comp_name);</div><div class='add'>+void most_interface_register_notify(const char *mdev_name);</div><div class='ctx'> #endif /* MOST_CORE_H_ */</div><div class='head'>diff --git a/drivers/staging/most/dim2/Kconfig b/drivers/staging/most/dim2/Kconfig<br/>index 5aeef22c3cba..22f6900187b5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/dim2/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MediaLB configuration</div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/staging/most/dim2/Makefile b/drivers/staging/most/dim2/Makefile<br/>index 6d15f045a767..116f04d69244 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/dim2/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_DIM2) += most_dim2.o</div><div class='ctx'> </div><div class='ctx'> most_dim2-objs := dim2.o hal.o sysfs.o</div><div class='head'>diff --git a/drivers/staging/most/dim2/errors.h b/drivers/staging/most/dim2/errors.h<br/>index 3487510fbd2f..268332e5735e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/errors.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/errors.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/errors.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/dim2/errors.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'>  * errors.h - Definitions of errors for DIM2 HAL API</div><div class='ctx'>  * (MediaLB, Device Interface Macro IP, OS62420)</div><div class='head'>diff --git a/drivers/staging/most/dim2/hal.h b/drivers/staging/most/dim2/hal.h<br/>index e04a5350f134..fca6c22de8a6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/hal.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/hal.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/hal.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/dim2/hal.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'>  * hal.h - DIM2 HAL interface</div><div class='ctx'>  * (MediaLB, Device Interface Macro IP, OS62420)</div><div class='head'>diff --git a/drivers/staging/most/dim2/reg.h b/drivers/staging/most/dim2/reg.h<br/>index 4343a483017e..b0f36c208a57 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/reg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/reg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/dim2/reg.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'>  * reg.h - Definitions for registers of DIM2</div><div class='ctx'>  * (MediaLB, Device Interface Macro IP, OS62420)</div><div class='head'>diff --git a/drivers/staging/most/dim2/sysfs.h b/drivers/staging/most/dim2/sysfs.h<br/>index 33756a3bffe2..24277a17cff3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/sysfs.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/dim2/sysfs.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/dim2/sysfs.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/dim2/sysfs.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'>  * sysfs.h - MediaLB sysfs information</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/staging/most/i2c/Kconfig b/drivers/staging/most/i2c/Kconfig<br/>index 79d0ff27f56d..19a094b5bee0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/i2c/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/i2c/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/i2c/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/i2c/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MOST I2C configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -5,7 +6,7 @@</div><div class='ctx'> config MOST_I2C</div><div class='ctx'> 	tristate "I2C"</div><div class='ctx'> 	depends on I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect via I2C to network tranceiver.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/staging/most/i2c/Makefile b/drivers/staging/most/i2c/Makefile<br/>index c032fea979b3..2b3769dc19e7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/i2c/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/i2c/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/i2c/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/i2c/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_I2C) += most_i2c.o</div><div class='ctx'> </div><div class='ctx'> most_i2c-objs := i2c.o</div><div class='head'>diff --git a/drivers/staging/most/net/Kconfig b/drivers/staging/most/net/Kconfig<br/>index 795330ba94ef..ed8ac7e076d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/net/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/net/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/net/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/net/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MOST Networking configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -6,7 +7,7 @@ config MOST_NET</div><div class='ctx'> 	tristate "Net"</div><div class='ctx'> 	depends on NET</div><div class='ctx'> </div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to commumicate via a networking device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/staging/most/net/Makefile b/drivers/staging/most/net/Makefile<br/>index 820faec6b296..f0ac64dee71b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/net/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/net/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/net/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/net/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_NET) += most_net.o</div><div class='ctx'> </div><div class='ctx'> most_net-objs := net.o</div><div class='head'>diff --git a/drivers/staging/most/net/net.c b/drivers/staging/most/net/net.c<br/>index e20584b1b112..c8a64e209027 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/net/net.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/net/net.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/net/net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/net/net.c</a></div><div class='hunk'>@@ -293,7 +293,8 @@ static struct net_dev_context *get_net_dev_hold(struct most_interface *iface)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int comp_probe_channel(struct most_interface *iface, int channel_idx,</div><div class='del'>-			      struct most_channel_config *ccfg, char *name)</div><div class='add'>+			      struct most_channel_config *ccfg, char *name,</div><div class='add'>+			      char *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_dev_context *nd;</div><div class='ctx'> 	struct net_dev_channel *ch;</div><div class='head'>diff --git a/drivers/staging/most/sound/Kconfig b/drivers/staging/most/sound/Kconfig<br/>index 115262a58a42..ad9f7821af7d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/sound/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/sound/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/sound/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/sound/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MOST ALSA configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -6,7 +7,7 @@ config MOST_SOUND</div><div class='ctx'> 	tristate "Sound"</div><div class='ctx'> 	depends on SND</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to commumicate via ALSA/sound devices.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/staging/most/sound/Makefile b/drivers/staging/most/sound/Makefile<br/>index 5bb55bb108fb..a3d086c6ca70 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/sound/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/sound/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/sound/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/sound/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_SOUND) += most_sound.o</div><div class='ctx'> </div><div class='ctx'> most_sound-objs := sound.o</div><div class='head'>diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c<br/>index 79ab3a78c5ec..342f390d68b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/sound/sound.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/sound/sound.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/sound/sound.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/sound/sound.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;most/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "sound"</div><div class='add'>+#define STRING_SIZE	80</div><div class='ctx'> </div><div class='ctx'> static struct core_component comp;</div><div class='ctx'> </div><div class='hunk'>@@ -471,17 +472,11 @@ static const struct snd_pcm_ops pcm_ops = {</div><div class='ctx'> 	.page       = snd_pcm_lib_get_vmalloc_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int split_arg_list(char *buf, char **device_name, u16 *ch_num,</div><div class='del'>-			  char **sample_res, u8 *create)</div><div class='add'>+static int split_arg_list(char *buf, u16 *ch_num, char **sample_res)</div><div class='ctx'> {</div><div class='ctx'> 	char *num;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*device_name = strsep(&amp;buf, ".");</div><div class='del'>-	if (!*device_name) {</div><div class='del'>-		pr_err("Missing sound card name\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> 	num = strsep(&amp;buf, "x");</div><div class='ctx'> 	if (!num)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -492,8 +487,6 @@ static int split_arg_list(char *buf, char **device_name, u16 *ch_num,</div><div class='ctx'> 	if (!*sample_res)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (buf &amp;&amp; !strcmp(buf, "create"))</div><div class='del'>-		*create = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -579,7 +572,7 @@ static void release_adapter(struct sound_adapter *adpt)</div><div class='ctx'>  */</div><div class='ctx'> static int audio_probe_channel(struct most_interface *iface, int channel_id,</div><div class='ctx'> 			       struct most_channel_config *cfg,</div><div class='del'>-			       char *arg_list)</div><div class='add'>+			       char *device_name, char *arg_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct channel *channel;</div><div class='ctx'> 	struct sound_adapter *adpt;</div><div class='hunk'>@@ -588,10 +581,9 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,</div><div class='ctx'> 	int capture_count = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int direction;</div><div class='del'>-	char *device_name;</div><div class='ctx'> 	u16 ch_num;</div><div class='del'>-	u8 create = 0;</div><div class='ctx'> 	char *sample_res;</div><div class='add'>+	char arg_list_cpy[STRING_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	if (!iface)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -600,9 +592,8 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,</div><div class='ctx'> 		pr_err("Incompatible channel type\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ret = split_arg_list(arg_list, &amp;device_name, &amp;ch_num, &amp;sample_res,</div><div class='del'>-			     &amp;create);</div><div class='add'>+	strlcpy(arg_list_cpy, arg_list, STRING_SIZE);</div><div class='add'>+	ret = split_arg_list(arg_list_cpy, &amp;ch_num, &amp;sample_res);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -622,7 +613,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adpt-&gt;dev_list);</div><div class='ctx'> 	iface-&gt;priv = adpt;</div><div class='ctx'> 	list_add_tail(&amp;adpt-&gt;list, &amp;adpt_list);</div><div class='del'>-	ret = snd_card_new(&amp;iface-&gt;dev, -1, "INIC", THIS_MODULE,</div><div class='add'>+	ret = snd_card_new(iface-&gt;driver_dev, -1, "INIC", THIS_MODULE,</div><div class='ctx'> 			   sizeof(*channel), &amp;adpt-&gt;card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_free_adpt;</div><div class='hunk'>@@ -673,12 +664,6 @@ skip_adpt_alloc:</div><div class='ctx'> 	strscpy(pcm-&gt;name, device_name, sizeof(pcm-&gt;name));</div><div class='ctx'> 	snd_pcm_set_ops(pcm, direction, &amp;pcm_ops);</div><div class='ctx'> </div><div class='del'>-	if (create) {</div><div class='del'>-		ret = snd_card_register(adpt-&gt;card);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto err_free_adpt;</div><div class='del'>-		adpt-&gt;registered = true;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_adpt:</div><div class='hunk'>@@ -686,6 +671,26 @@ err_free_adpt:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int audio_create_sound_card(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct sound_adapter *adpt;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(adpt, &amp;adpt_list, list) {</div><div class='add'>+		if (!adpt-&gt;registered)</div><div class='add'>+			goto adpt_alloc;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+adpt_alloc:</div><div class='add'>+	ret = snd_card_register(adpt-&gt;card);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		release_adapter(adpt);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	adpt-&gt;registered = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * audio_disconnect_channel - function to disconnect a channel</div><div class='ctx'>  * @iface: pointer to interface instance</div><div class='hunk'>@@ -782,20 +787,30 @@ static struct core_component comp = {</div><div class='ctx'> 	.disconnect_channel = audio_disconnect_channel,</div><div class='ctx'> 	.rx_completion = audio_rx_completion,</div><div class='ctx'> 	.tx_completion = audio_tx_completion,</div><div class='add'>+	.cfg_complete = audio_create_sound_card,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init audio_init(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	pr_info("init()\n");</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adpt_list);</div><div class='ctx'> </div><div class='del'>-	return most_register_component(&amp;comp);</div><div class='add'>+	ret = most_register_component(&amp;comp);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("Failed to register %s\n", comp.name);</div><div class='add'>+	ret = most_register_configfs_subsys(&amp;comp);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("Failed to register %s configfs subsys\n", comp.name);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit audio_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("exit()\n");</div><div class='add'>+	most_deregister_configfs_subsys(&amp;comp);</div><div class='ctx'> 	most_deregister_component(&amp;comp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/most/usb/Kconfig b/drivers/staging/most/usb/Kconfig<br/>index ebbdb573a9a6..a86f1f63def4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/usb/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/usb/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/usb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/usb/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MOST USB configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -5,7 +6,7 @@</div><div class='ctx'> config MOST_USB</div><div class='ctx'> 	tristate "USB"</div><div class='ctx'> 	depends on USB &amp;&amp; NET</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to connect via USB to network tranceiver.</div><div class='ctx'> 	  This device driver depends on the networking AIM.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/most/usb/Makefile b/drivers/staging/most/usb/Makefile<br/>index 910cd08bad7c..83cf2ead7122 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/usb/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/usb/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/usb/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/usb/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_USB) += most_usb.o</div><div class='ctx'> </div><div class='ctx'> most_usb-objs := usb.o</div><div class='head'>diff --git a/drivers/staging/most/usb/usb.c b/drivers/staging/most/usb/usb.c<br/>index c0293d8d5934..360cb5b7a10b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/usb/usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/usb/usb.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/usb/usb.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/usb/usb.c</a></div><div class='hunk'>@@ -1072,7 +1072,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)</div><div class='ctx'> 	mdev-&gt;iface.num_channels = num_endpoints;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(mdev-&gt;description, sizeof(mdev-&gt;description),</div><div class='del'>-		 "usb_device %d-%s:%d.%d",</div><div class='add'>+		 "%d-%s:%d.%d",</div><div class='ctx'> 		 usb_dev-&gt;bus-&gt;busnum,</div><div class='ctx'> 		 usb_dev-&gt;devpath,</div><div class='ctx'> 		 usb_dev-&gt;config-&gt;desc.bConfigurationValue,</div><div class='head'>diff --git a/drivers/staging/most/video/Kconfig b/drivers/staging/most/video/Kconfig<br/>index ce6af4f951a6..e0964ca5e7b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/video/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/video/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/video/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/video/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # MOST V4L2 configuration</div><div class='ctx'> #</div><div class='hunk'>@@ -5,7 +6,7 @@</div><div class='ctx'> config MOST_VIDEO</div><div class='ctx'> 	tristate "Video"</div><div class='ctx'> 	depends on VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to commumicate via Video 4 Linux.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='head'>diff --git a/drivers/staging/most/video/Makefile b/drivers/staging/most/video/Makefile<br/>index c6e01b6ecfe6..2d857d3cbcc8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/video/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/video/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/video/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/video/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MOST_VIDEO) += most_video.o</div><div class='ctx'> </div><div class='ctx'> most_video-objs := video.o</div><div class='head'>diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c<br/>index ad7e28ab9a4f..adca250062e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/video/video.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/most/video/video.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/most/video/video.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/most/video/video.c</a></div><div class='hunk'>@@ -453,7 +453,8 @@ static void comp_v4l2_dev_release(struct v4l2_device *v4l2_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int comp_probe_channel(struct most_interface *iface, int channel_idx,</div><div class='del'>-			      struct most_channel_config *ccfg, char *name)</div><div class='add'>+			      struct most_channel_config *ccfg, char *name,</div><div class='add'>+			      char *args)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct most_video_dev *mdev = get_comp_dev(iface, channel_idx);</div><div class='head'>diff --git a/drivers/staging/mt7621-dma/Kconfig b/drivers/staging/mt7621-dma/Kconfig<br/>index b6e48a682c44..54a110288f92 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dma/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dma/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dma/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dma/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config MTK_HSDMA</div><div class='ctx'> 	tristate "MTK HSDMA support"</div><div class='ctx'> 	depends on RALINK &amp;&amp; SOC_MT7621</div><div class='head'>diff --git a/drivers/staging/mt7621-dma/Makefile b/drivers/staging/mt7621-dma/Makefile<br/>index c9e3e1619ab0..66da1bf10c32 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dma/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dma/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dma/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dma/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o</div><div class='ctx'> </div><div class='ctx'> ccflags-y += -I$(srctree)/drivers/dma</div><div class='head'>diff --git a/drivers/staging/mt7621-dma/mtk-hsdma.c b/drivers/staging/mt7621-dma/mtk-hsdma.c<br/>index 97571f1d697b..0fbb9932d6bb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dma/mtk-hsdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dma/mtk-hsdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dma/mtk-hsdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dma/mtk-hsdma.c</a></div><div class='hunk'>@@ -264,8 +264,7 @@ static void mtk_hsdma_reset(struct mtk_hsdam_engine *hsdma,</div><div class='ctx'> 	/* init desc value */</div><div class='ctx'> 	for (i = 0; i &lt; HSDMA_DESCS_NUM; i++) {</div><div class='ctx'> 		chan-&gt;tx_ring[i].addr0 = 0;</div><div class='del'>-		chan-&gt;tx_ring[i].flags = HSDMA_DESC_LS0 |</div><div class='del'>-			HSDMA_DESC_DONE;</div><div class='add'>+		chan-&gt;tx_ring[i].flags = HSDMA_DESC_LS0 | HSDMA_DESC_DONE;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; HSDMA_DESCS_NUM; i++) {</div><div class='ctx'> 		chan-&gt;rx_ring[i].addr0 = 0;</div><div class='hunk'>@@ -435,8 +434,7 @@ static irqreturn_t mtk_hsdma_irq(int irq, void *devid)</div><div class='ctx'> 	if (likely(status &amp; HSDMA_INT_RX_Q0))</div><div class='ctx'> 		tasklet_schedule(&amp;hsdma-&gt;task);</div><div class='ctx'> 	else</div><div class='del'>-		dev_dbg(hsdma-&gt;ddev.dev, "unhandle irq status %08x\n",</div><div class='del'>-			status);</div><div class='add'>+		dev_dbg(hsdma-&gt;ddev.dev, "unhandle irq status %08x\n", status);</div><div class='ctx'> 	/* clean intr bits */</div><div class='ctx'> 	mtk_hsdma_write(hsdma, HSDMA_REG_INT_STATUS, status);</div><div class='ctx'> </div><div class='hunk'>@@ -667,7 +665,6 @@ static int mtk_hsdma_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	hsdma = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*hsdma), GFP_KERNEL);</div><div class='ctx'> 	if (!hsdma) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "alloc dma device failed\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/mt7621-dts/Kconfig b/drivers/staging/mt7621-dts/Kconfig<br/>index 94a9e16c0b92..3ea08ab9d0d3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dts/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config DTB_GNUBEE1</div><div class='ctx'> 	bool "GnuBee1 NAS"</div><div class='ctx'> 	depends on SOC_MT7621 &amp;&amp; DTB_RT_NONE</div><div class='head'>diff --git a/drivers/staging/mt7621-dts/Makefile b/drivers/staging/mt7621-dts/Makefile<br/>index 195eba4a5c65..aeec48a4edc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dts/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> dtb-$(CONFIG_DTB_GNUBEE1)      += gbpc1.dtb</div><div class='ctx'> </div><div class='ctx'> obj-y				+= $(patsubst %.dtb, %.dtb.o, $(dtb-y))</div><div class='head'>diff --git a/drivers/staging/mt7621-dts/gbpc1.dts b/drivers/staging/mt7621-dts/gbpc1.dts<br/>index b73385540216..250c15ace2a7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/gbpc1.dts?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/gbpc1.dts</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/gbpc1.dts?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dts/gbpc1.dts</a></div><div class='hunk'>@@ -117,22 +117,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;ethernet {</div><div class='del'>-	//mtd-mac-address = &lt;&amp;factory 0xe000&gt;;</div><div class='del'>-	gmac1: mac@0 {</div><div class='del'>-		compatible = "mediatek,eth-mac";</div><div class='del'>-		reg = &lt;0&gt;;</div><div class='del'>-		phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mdio-bus {</div><div class='del'>-		phy1: ethernet-phy@1 {</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			phy-mode = "rgmii";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	state_default: pinctrl0 {</div><div class='ctx'> 		gpio {</div><div class='hunk'>@@ -141,3 +125,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;switch0 {</div><div class='add'>+	ports {</div><div class='add'>+		port@0 {</div><div class='add'>+			label = "ethblack";</div><div class='add'>+			status = "ok";</div><div class='add'>+		};</div><div class='add'>+		port@4 {</div><div class='add'>+			label = "ethblue";</div><div class='add'>+			status = "ok";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi<br/>index 6aff3680ce4b..280ec33c8540 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/mt7621.dtsi?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-dts/mt7621.dtsi</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-dts/mt7621.dtsi?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-dts/mt7621.dtsi</a></div><div class='hunk'>@@ -372,16 +372,83 @@</div><div class='ctx'> </div><div class='ctx'> 		mediatek,ethsys = &lt;&amp;ethsys&gt;;</div><div class='ctx'> </div><div class='del'>-		mediatek,switch = &lt;&amp;gsw&gt;;</div><div class='ctx'> </div><div class='add'>+		gmac0: mac@0 {</div><div class='add'>+			compatible = "mediatek,eth-mac";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			phy-mode = "rgmii";</div><div class='add'>+			fixed-link {</div><div class='add'>+				speed = &lt;1000&gt;;</div><div class='add'>+				full-duplex;</div><div class='add'>+				pause;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		gmac1: mac@1 {</div><div class='add'>+			compatible = "mediatek,eth-mac";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			status = "off";</div><div class='add'>+			phy-mode = "rgmii";</div><div class='add'>+			phy-handle = &lt;&amp;phy5&gt;;</div><div class='add'>+		};</div><div class='ctx'> 		mdio-bus {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-			phy1f: ethernet-phy@1f {</div><div class='del'>-				reg = &lt;0x1f&gt;;</div><div class='add'>+			phy5: ethernet-phy@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='ctx'> 				phy-mode = "rgmii";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			switch0: switch0@0 {</div><div class='add'>+				compatible = "mediatek,mt7621";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				mediatek,mcm;</div><div class='add'>+				resets = &lt;&amp;rstctrl 2&gt;;</div><div class='add'>+				reset-names = "mcm";</div><div class='add'>+</div><div class='add'>+				ports {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					port@0 {</div><div class='add'>+						status = "off";</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						label = "lan0";</div><div class='add'>+					};</div><div class='add'>+					port@1 {</div><div class='add'>+						status = "off";</div><div class='add'>+						reg = &lt;1&gt;;</div><div class='add'>+						label = "lan1";</div><div class='add'>+					};</div><div class='add'>+					port@2 {</div><div class='add'>+						status = "off";</div><div class='add'>+						reg = &lt;2&gt;;</div><div class='add'>+						label = "lan2";</div><div class='add'>+					};</div><div class='add'>+					port@3 {</div><div class='add'>+						status = "off";</div><div class='add'>+						reg = &lt;3&gt;;</div><div class='add'>+						label = "lan3";</div><div class='add'>+					};</div><div class='add'>+					port@4 {</div><div class='add'>+						status = "off";</div><div class='add'>+						reg = &lt;4&gt;;</div><div class='add'>+						label = "lan4";</div><div class='add'>+					};</div><div class='add'>+					port@6 {</div><div class='add'>+						reg = &lt;6&gt;;</div><div class='add'>+						label = "cpu";</div><div class='add'>+						ethernet = &lt;&amp;gmac0&gt;;</div><div class='add'>+						phy-mode = "trgmii";</div><div class='add'>+						fixed-link {</div><div class='add'>+							speed = &lt;1000&gt;;</div><div class='add'>+							full-duplex;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -424,7 +491,7 @@</div><div class='ctx'> 		reset-names = "pcie", "pcie0", "pcie1", "pcie2";</div><div class='ctx'> 		clocks = &lt;&amp;clkctrl 24 &amp;clkctrl 25 &amp;clkctrl 26&gt;;</div><div class='ctx'> 		clock-names = "pcie0", "pcie1", "pcie2";</div><div class='del'>-		phys = &lt;&amp;pcie0_port&gt;, &lt;&amp;pcie1_port&gt;, &lt;&amp;pcie2_port&gt;;</div><div class='add'>+		phys = &lt;&amp;pcie0_phy 0&gt;, &lt;&amp;pcie0_phy 1&gt;, &lt;&amp;pcie1_phy 0&gt;;</div><div class='ctx'> 		phy-names = "pcie-phy0", "pcie-phy1", "pcie-phy2";</div><div class='ctx'> </div><div class='ctx'> 		pcie@0,0 {</div><div class='hunk'>@@ -455,29 +522,12 @@</div><div class='ctx'> 	pcie0_phy: pcie-phy@1e149000 {</div><div class='ctx'> 		compatible = "mediatek,mt7621-pci-phy";</div><div class='ctx'> 		reg = &lt;0x1e149000 0x0700&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		pcie0_port: pcie-phy@0 {</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pcie1_port: pcie-phy@1 {</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pcie1_phy: pcie-phy@1e14a000 {</div><div class='ctx'> 		compatible = "mediatek,mt7621-pci-phy";</div><div class='ctx'> 		reg = &lt;0x1e14a000 0x0700&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		pcie2_port: pcie-phy@0 {</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt b/drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt<br/>deleted file mode 100644<br/>index 596b38552697..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-Mediatek Gigabit Switch</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-The mediatek gigabit switch can be found on Mediatek SoCs.</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: Should be "mediatek,mt7620-gsw", "mediatek,mt7621-gsw",</div><div class='del'>-  "mediatek,mt7623-gsw"</div><div class='del'>-- reg: Address and length of the register set for the device</div><div class='del'>-- interrupts: Should contain the gigabit switches interrupt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Additional required properties for ARM based SoCs:</div><div class='del'>-- mediatek,reset-pin: phandle describing the reset GPIO</div><div class='del'>-- clocks: the clocks used by the switch</div><div class='del'>-- clock-names: the names of the clocks listed in the clocks property</div><div class='del'>-  these should be "trgpll", "esw", "gp2", "gp1"</div><div class='del'>-- mt7530-supply: the phandle of the regulator used to power the switch</div><div class='del'>-- mediatek,pctl-regmap: phandle to the port control regmap. this is used to</div><div class='del'>-  setup the drive current</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- interrupt-parent: Should be the phandle for the interrupt controller</div><div class='del'>-  that services interrupts for this device</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-gsw: switch@1b100000 {</div><div class='del'>-	compatible = "mediatek,mt7623-gsw";</div><div class='del'>-	reg = &lt;0 0x1b110000 0 0x300000&gt;;</div><div class='del'>-</div><div class='del'>-	interrupt-parent = &lt;&amp;pio&gt;;</div><div class='del'>-	interrupts = &lt;168 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-</div><div class='del'>-	clocks = &lt;&amp;apmixedsys CLK_APMIXED_TRGPLL&gt;,</div><div class='del'>-		 &lt;&amp;ethsys CLK_ETHSYS_ESW&gt;,</div><div class='del'>-		 &lt;&amp;ethsys CLK_ETHSYS_GP2&gt;,</div><div class='del'>-		 &lt;&amp;ethsys CLK_ETHSYS_GP1&gt;;</div><div class='del'>-	clock-names = "trgpll", "esw", "gp2", "gp1";</div><div class='del'>-</div><div class='del'>-	mt7530-supply = &lt;&amp;mt6323_vpa_reg&gt;;</div><div class='del'>-</div><div class='del'>-	mediatek,pctl-regmap = &lt;&amp;syscfg_pctl_a&gt;;</div><div class='del'>-	mediatek,reset-pin = &lt;&amp;pio 15 0&gt;;</div><div class='del'>-</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/Kconfig b/drivers/staging/mt7621-eth/Kconfig<br/>deleted file mode 100644<br/>index 44ea86c7a96c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-config NET_VENDOR_MEDIATEK_STAGING</div><div class='del'>-	bool "MediaTek ethernet driver - staging version"</div><div class='del'>-	depends on RALINK</div><div class='del'>-	---help---</div><div class='del'>-	  If you have an MT7621 Mediatek SoC with ethernet, say Y.</div><div class='del'>-</div><div class='del'>-if NET_VENDOR_MEDIATEK_STAGING</div><div class='del'>-choice</div><div class='del'>-	prompt "MAC type"</div><div class='del'>-</div><div class='del'>-config NET_MEDIATEK_MT7621</div><div class='del'>-	bool "MT7621"</div><div class='del'>-	depends on MIPS &amp;&amp; SOC_MT7621</div><div class='del'>-</div><div class='del'>-endchoice</div><div class='del'>-</div><div class='del'>-config NET_MEDIATEK_SOC_STAGING</div><div class='del'>-	tristate "MediaTek SoC Gigabit Ethernet support"</div><div class='del'>-	depends on NET_VENDOR_MEDIATEK_STAGING</div><div class='del'>-	select PHYLIB</div><div class='del'>-	---help---</div><div class='del'>-	  This driver supports the gigabit ethernet MACs in the</div><div class='del'>-	  MediaTek SoC family.</div><div class='del'>-</div><div class='del'>-config NET_MEDIATEK_MDIO</div><div class='del'>-	def_bool NET_MEDIATEK_SOC_STAGING</div><div class='del'>-	depends on NET_MEDIATEK_MT7621</div><div class='del'>-	select PHYLIB</div><div class='del'>-</div><div class='del'>-config NET_MEDIATEK_MDIO_MT7620</div><div class='del'>-	def_bool NET_MEDIATEK_SOC_STAGING</div><div class='del'>-	depends on NET_MEDIATEK_MT7621</div><div class='del'>-	select NET_MEDIATEK_MDIO</div><div class='del'>-</div><div class='del'>-config NET_MEDIATEK_GSW_MT7621</div><div class='del'>-	def_tristate NET_MEDIATEK_SOC_STAGING</div><div class='del'>-	depends on NET_MEDIATEK_MT7621</div><div class='del'>-</div><div class='del'>-endif #NET_VENDOR_MEDIATEK_STAGING</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/Makefile b/drivers/staging/mt7621-eth/Makefile<br/>deleted file mode 100644<br/>index 018bcc3596b3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the Ralink SoCs built-in ethernet macs</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-mtk-eth-soc-y					+= mtk_eth_soc.o ethtool.o</div><div class='del'>-</div><div class='del'>-mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO)		+= mdio.o</div><div class='del'>-mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO_MT7620)	+= mdio_mt7620.o</div><div class='del'>-</div><div class='del'>-mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MT7621)	+= soc_mt7621.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_NET_MEDIATEK_GSW_MT7621)		+= gsw_mt7621.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)		+= mtk-eth-soc.o</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/TODO b/drivers/staging/mt7621-eth/TODO<br/>deleted file mode 100644<br/>index f9e47d4b4cd4..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/TODO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-</div><div class='del'>-- verify devicetree documentation is consistent with code</div><div class='del'>-- fix ethtool - currently doesn't return valid data.</div><div class='del'>-- general code review and clean up</div><div class='del'>-- add support for second MAC on mt7621</div><div class='del'>-- convert gsw code to use switchdev interfaces</div><div class='del'>-- md7620_mmi_write etc should probably be wrapped</div><div class='del'>-  in a regmap abstraction.</div><div class='del'>-- Get soc_mt7621 to work with QDMA TX if possible.</div><div class='del'>-- Ensure phys are correctly configured when a cable</div><div class='del'>-  is plugged in.</div><div class='del'>-</div><div class='del'>-Cc: NeilBrown &lt;neil@brown.name&gt;</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/ethtool.c b/drivers/staging/mt7621-eth/ethtool.c<br/>deleted file mode 100644<br/>index 8c4228e2c987..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/ethtool.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,250 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "mtk_eth_soc.h"</div><div class='del'>-#include "ethtool.h"</div><div class='del'>-</div><div class='del'>-struct mtk_stat {</div><div class='del'>-	char name[ETH_GSTRING_LEN];</div><div class='del'>-	unsigned int idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MTK_HW_STAT(stat) { \</div><div class='del'>-	.name = #stat, \</div><div class='del'>-	.idx = offsetof(struct mtk_hw_stats, stat) / sizeof(u64) \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct mtk_stat mtk_ethtool_hw_stats[] = {</div><div class='del'>-	MTK_HW_STAT(tx_bytes),</div><div class='del'>-	MTK_HW_STAT(tx_packets),</div><div class='del'>-	MTK_HW_STAT(tx_skip),</div><div class='del'>-	MTK_HW_STAT(tx_collisions),</div><div class='del'>-	MTK_HW_STAT(rx_bytes),</div><div class='del'>-	MTK_HW_STAT(rx_packets),</div><div class='del'>-	MTK_HW_STAT(rx_overflow),</div><div class='del'>-	MTK_HW_STAT(rx_fcs_errors),</div><div class='del'>-	MTK_HW_STAT(rx_short_errors),</div><div class='del'>-	MTK_HW_STAT(rx_long_errors),</div><div class='del'>-	MTK_HW_STAT(rx_checksum_errors),</div><div class='del'>-	MTK_HW_STAT(rx_flow_control_packets),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MTK_HW_STATS_LEN	ARRAY_SIZE(mtk_ethtool_hw_stats)</div><div class='del'>-</div><div class='del'>-static int mtk_get_link_ksettings(struct net_device *dev,</div><div class='del'>-				  struct ethtool_link_ksettings *cmd)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!mac-&gt;phy_dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;phy_flags == MTK_PHY_FLAG_ATTACH) {</div><div class='del'>-		err = phy_read_status(mac-&gt;phy_dev);</div><div class='del'>-		if (err)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	phy_ethtool_ksettings_get(mac-&gt;phy_dev, cmd);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_set_link_ksettings(struct net_device *dev,</div><div class='del'>-				  const struct ethtool_link_ksettings *cmd)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!mac-&gt;phy_dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;base.phy_address != mac-&gt;phy_dev-&gt;mdio.addr) {</div><div class='del'>-		if (mac-&gt;hw-&gt;phy-&gt;phy_node[cmd-&gt;base.phy_address]) {</div><div class='del'>-			mac-&gt;phy_dev = mac-&gt;hw-&gt;phy-&gt;phy[cmd-&gt;base.phy_address];</div><div class='del'>-			mac-&gt;phy_flags = MTK_PHY_FLAG_PORT;</div><div class='del'>-		} else if (mac-&gt;hw-&gt;mii_bus) {</div><div class='del'>-			mac-&gt;phy_dev = mdiobus_get_phy(mac-&gt;hw-&gt;mii_bus,</div><div class='del'>-						       cmd-&gt;base.phy_address);</div><div class='del'>-			if (!mac-&gt;phy_dev)</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			mac-&gt;phy_flags = MTK_PHY_FLAG_ATTACH;</div><div class='del'>-		} else {</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return phy_ethtool_ksettings_set(mac-&gt;phy_dev, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_get_drvinfo(struct net_device *dev,</div><div class='del'>-			    struct ethtool_drvinfo *info)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_soc_data *soc = mac-&gt;hw-&gt;soc;</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;driver, mac-&gt;hw-&gt;dev-&gt;driver-&gt;name, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;bus_info, dev_name(mac-&gt;hw-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='del'>-</div><div class='del'>-	if (soc-&gt;reg_table[MTK_REG_MTK_COUNTER_BASE])</div><div class='del'>-		info-&gt;n_stats = MTK_HW_STATS_LEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mtk_get_msglevel(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	return mac-&gt;hw-&gt;msg_enable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_set_msglevel(struct net_device *dev, u32 value)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	mac-&gt;hw-&gt;msg_enable = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_nway_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!mac-&gt;phy_dev)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return genphy_restart_aneg(mac-&gt;phy_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mtk_get_link(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!mac-&gt;phy_dev)</div><div class='del'>-		goto out_get_link;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;phy_flags == MTK_PHY_FLAG_ATTACH) {</div><div class='del'>-		err = genphy_update_link(mac-&gt;phy_dev);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_get_link;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mac-&gt;phy_dev-&gt;link;</div><div class='del'>-</div><div class='del'>-out_get_link:</div><div class='del'>-	return ethtool_op_get_link(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_set_ringparam(struct net_device *dev,</div><div class='del'>-			     struct ethtool_ringparam *ring)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if ((ring-&gt;tx_pending &lt; 2) ||</div><div class='del'>-	    (ring-&gt;rx_pending &lt; 2) ||</div><div class='del'>-	    (ring-&gt;rx_pending &gt; mac-&gt;hw-&gt;soc-&gt;dma_ring_size) ||</div><div class='del'>-	    (ring-&gt;tx_pending &gt; mac-&gt;hw-&gt;soc-&gt;dma_ring_size))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev-&gt;netdev_ops-&gt;ndo_stop(dev);</div><div class='del'>-</div><div class='del'>-	mac-&gt;hw-&gt;tx_ring.tx_ring_size = BIT(fls(ring-&gt;tx_pending) - 1);</div><div class='del'>-	mac-&gt;hw-&gt;rx_ring[0].rx_ring_size = BIT(fls(ring-&gt;rx_pending) - 1);</div><div class='del'>-</div><div class='del'>-	return dev-&gt;netdev_ops-&gt;ndo_open(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_get_ringparam(struct net_device *dev,</div><div class='del'>-			      struct ethtool_ringparam *ring)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	ring-&gt;rx_max_pending = mac-&gt;hw-&gt;soc-&gt;dma_ring_size;</div><div class='del'>-	ring-&gt;tx_max_pending = mac-&gt;hw-&gt;soc-&gt;dma_ring_size;</div><div class='del'>-	ring-&gt;rx_pending = mac-&gt;hw-&gt;rx_ring[0].rx_ring_size;</div><div class='del'>-	ring-&gt;tx_pending = mac-&gt;hw-&gt;tx_ring.tx_ring_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_get_strings(struct net_device *dev, u32 stringset, u8 *data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (stringset) {</div><div class='del'>-	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; MTK_HW_STATS_LEN; i++) {</div><div class='del'>-			memcpy(data, mtk_ethtool_hw_stats[i].name,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			data += ETH_GSTRING_LEN;</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 int mtk_get_sset_count(struct net_device *dev, int sset)</div><div class='del'>-{</div><div class='del'>-	switch (sset) {</div><div class='del'>-	case ETH_SS_STATS:</div><div class='del'>-		return MTK_HW_STATS_LEN;</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'>-static void mtk_get_ethtool_stats(struct net_device *dev,</div><div class='del'>-				  struct ethtool_stats *stats, u64 *data)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_hw_stats *hwstats = mac-&gt;hw_stats;</div><div class='del'>-	unsigned int start;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev) &amp;&amp; netif_device_present(dev)) {</div><div class='del'>-		if (spin_trylock(&amp;hwstats-&gt;stats_lock)) {</div><div class='del'>-			mtk_stats_update_mac(mac);</div><div class='del'>-			spin_unlock(&amp;hwstats-&gt;stats_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;hwstats-&gt;syncp);</div><div class='del'>-		for (i = 0; i &lt; MTK_HW_STATS_LEN; i++)</div><div class='del'>-			data[i] = ((u64 *)hwstats)[mtk_ethtool_hw_stats[i].idx];</div><div class='del'>-</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;hwstats-&gt;syncp, start));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ethtool_ops mtk_ethtool_ops = {</div><div class='del'>-	.get_link_ksettings     = mtk_get_link_ksettings,</div><div class='del'>-	.set_link_ksettings     = mtk_set_link_ksettings,</div><div class='del'>-	.get_drvinfo		= mtk_get_drvinfo,</div><div class='del'>-	.get_msglevel		= mtk_get_msglevel,</div><div class='del'>-	.set_msglevel		= mtk_set_msglevel,</div><div class='del'>-	.nway_reset		= mtk_nway_reset,</div><div class='del'>-	.get_link		= mtk_get_link,</div><div class='del'>-	.set_ringparam		= mtk_set_ringparam,</div><div class='del'>-	.get_ringparam		= mtk_get_ringparam,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void mtk_set_ethtool_ops(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(netdev);</div><div class='del'>-	struct mtk_soc_data *soc = mac-&gt;hw-&gt;soc;</div><div class='del'>-</div><div class='del'>-	if (soc-&gt;reg_table[MTK_REG_MTK_COUNTER_BASE]) {</div><div class='del'>-		mtk_ethtool_ops.get_strings = mtk_get_strings;</div><div class='del'>-		mtk_ethtool_ops.get_sset_count = mtk_get_sset_count;</div><div class='del'>-		mtk_ethtool_ops.get_ethtool_stats = mtk_get_ethtool_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netdev-&gt;ethtool_ops = &amp;mtk_ethtool_ops;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/ethtool.h b/drivers/staging/mt7621-eth/ethtool.h<br/>deleted file mode 100644<br/>index 0071469aea6c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/ethtool.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/ethtool.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef MTK_ETHTOOL_H</div><div class='del'>-#define MTK_ETHTOOL_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='del'>-</div><div class='del'>-void mtk_set_ethtool_ops(struct net_device *netdev);</div><div class='del'>-</div><div class='del'>-#endif /* MTK_ETHTOOL_H */</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/gsw_mt7620.h b/drivers/staging/mt7621-eth/gsw_mt7620.h<br/>deleted file mode 100644<br/>index 70f7e5481952..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/gsw_mt7620.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/gsw_mt7620.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,277 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _RALINK_GSW_MT7620_H__</div><div class='del'>-#define _RALINK_GSW_MT7620_H__</div><div class='del'>-</div><div class='del'>-#define GSW_REG_PHY_TIMEOUT	(5 * HZ)</div><div class='del'>-</div><div class='del'>-#define MT7620_GSW_REG_PIAC	0x0004</div><div class='del'>-</div><div class='del'>-#define GSW_NUM_VLANS		16</div><div class='del'>-#define GSW_NUM_VIDS		4096</div><div class='del'>-#define GSW_NUM_PORTS		7</div><div class='del'>-#define GSW_PORT6		6</div><div class='del'>-</div><div class='del'>-#define GSW_MDIO_ACCESS		BIT(31)</div><div class='del'>-#define GSW_MDIO_READ		BIT(19)</div><div class='del'>-#define GSW_MDIO_WRITE		BIT(18)</div><div class='del'>-#define GSW_MDIO_START		BIT(16)</div><div class='del'>-#define GSW_MDIO_ADDR_SHIFT	20</div><div class='del'>-#define GSW_MDIO_REG_SHIFT	25</div><div class='del'>-</div><div class='del'>-#define GSW_REG_PORT_PMCR(x)	(0x3000 + (x * 0x100))</div><div class='del'>-#define GSW_REG_PORT_STATUS(x)	(0x3008 + (x * 0x100))</div><div class='del'>-#define GSW_REG_SMACCR0		0x3fE4</div><div class='del'>-#define GSW_REG_SMACCR1		0x3fE8</div><div class='del'>-#define GSW_REG_CKGCR		0x3ff0</div><div class='del'>-</div><div class='del'>-#define GSW_REG_IMR		0x7008</div><div class='del'>-#define GSW_REG_ISR		0x700c</div><div class='del'>-#define GSW_REG_GPC1		0x7014</div><div class='del'>-</div><div class='del'>-#define SYSC_REG_CHIP_REV_ID	0x0c</div><div class='del'>-#define SYSC_REG_CFG		0x10</div><div class='del'>-#define SYSC_REG_CFG1		0x14</div><div class='del'>-#define RST_CTRL_MCM		BIT(2)</div><div class='del'>-#define SYSC_PAD_RGMII2_MDIO	0x58</div><div class='del'>-#define SYSC_GPIO_MODE		0x60</div><div class='del'>-</div><div class='del'>-#define PORT_IRQ_ST_CHG		0x7f</div><div class='del'>-</div><div class='del'>-#define MT7621_ESW_PHY_POLLING	0x0000</div><div class='del'>-#define MT7620_ESW_PHY_POLLING	0x7000</div><div class='del'>-</div><div class='del'>-#define	PMCR_IPG		BIT(18)</div><div class='del'>-#define	PMCR_MAC_MODE		BIT(16)</div><div class='del'>-#define	PMCR_FORCE		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='del'>-#define	PMCR_BACKOFF		BIT(9)</div><div class='del'>-#define	PMCR_BACKPRES		BIT(8)</div><div class='del'>-#define	PMCR_RX_FC		BIT(5)</div><div class='del'>-#define	PMCR_TX_FC		BIT(4)</div><div class='del'>-#define	PMCR_SPEED(_x)		(_x &lt;&lt; 2)</div><div class='del'>-#define	PMCR_DUPLEX		BIT(1)</div><div class='del'>-#define	PMCR_LINK		BIT(0)</div><div class='del'>-</div><div class='del'>-#define PHY_AN_EN		BIT(31)</div><div class='del'>-#define PHY_PRE_EN		BIT(30)</div><div class='del'>-#define PMY_MDC_CONF(_x)	((_x &amp; 0x3f) &lt;&lt; 24)</div><div class='del'>-</div><div class='del'>-/* ethernet subsystem config register */</div><div class='del'>-#define ETHSYS_SYSCFG0		0x14</div><div class='del'>-/* ethernet subsystem clock register */</div><div class='del'>-#define ETHSYS_CLKCFG0		0x2c</div><div class='del'>-#define ETHSYS_TRGMII_CLK_SEL362_5	BIT(11)</div><div class='del'>-</div><div class='del'>-/* p5 RGMII wrapper TX clock control register */</div><div class='del'>-#define MT7530_P5RGMIITXCR	0x7b04</div><div class='del'>-/* p5 RGMII wrapper RX clock control register */</div><div class='del'>-#define MT7530_P5RGMIIRXCR	0x7b00</div><div class='del'>-/* TRGMII TDX ODT registers */</div><div class='del'>-#define MT7530_TRGMII_TD0_ODT	0x7a54</div><div class='del'>-#define MT7530_TRGMII_TD1_ODT	0x7a5c</div><div class='del'>-#define MT7530_TRGMII_TD2_ODT	0x7a64</div><div class='del'>-#define MT7530_TRGMII_TD3_ODT	0x7a6c</div><div class='del'>-#define MT7530_TRGMII_TD4_ODT	0x7a74</div><div class='del'>-#define MT7530_TRGMII_TD5_ODT	0x7a7c</div><div class='del'>-/* TRGMII TCK ctrl register */</div><div class='del'>-#define MT7530_TRGMII_TCK_CTRL	0x7a78</div><div class='del'>-/* TRGMII Tx ctrl register */</div><div class='del'>-#define MT7530_TRGMII_TXCTRL	0x7a40</div><div class='del'>-/* port 6 extended control register */</div><div class='del'>-#define MT7530_P6ECR            0x7830</div><div class='del'>-/* IO driver control register */</div><div class='del'>-#define MT7530_IO_DRV_CR	0x7810</div><div class='del'>-/* top signal control register */</div><div class='del'>-#define MT7530_TOP_SIG_CTRL	0x7808</div><div class='del'>-/* modified hwtrap register */</div><div class='del'>-#define MT7530_MHWTRAP		0x7804</div><div class='del'>-/* hwtrap status register */</div><div class='del'>-#define MT7530_HWTRAP		0x7800</div><div class='del'>-/* status interrupt register */</div><div class='del'>-#define MT7530_SYS_INT_STS	0x700c</div><div class='del'>-/* system nterrupt register */</div><div class='del'>-#define MT7530_SYS_INT_EN	0x7008</div><div class='del'>-/* system control register */</div><div class='del'>-#define MT7530_SYS_CTRL		0x7000</div><div class='del'>-/* port MAC status register */</div><div class='del'>-#define MT7530_PMSR_P(x)	(0x3008 + (x * 0x100))</div><div class='del'>-/* port MAC control register */</div><div class='del'>-#define MT7530_PMCR_P(x)	(0x3000 + (x * 0x100))</div><div class='del'>-</div><div class='del'>-#define MT7621_XTAL_SHIFT	6</div><div class='del'>-#define MT7621_XTAL_MASK	0x7</div><div class='del'>-#define MT7621_XTAL_25		6</div><div class='del'>-#define MT7621_XTAL_40		3</div><div class='del'>-#define MT7621_MDIO_DRV_MASK	(3 &lt;&lt; 4)</div><div class='del'>-#define MT7621_GE1_MODE_MASK	(3 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-#define TRGMII_TXCTRL_TXC_INV	BIT(30)</div><div class='del'>-#define P6ECR_INTF_MODE_RGMII	BIT(1)</div><div class='del'>-#define P5RGMIIRXCR_C_ALIGN	BIT(8)</div><div class='del'>-#define P5RGMIIRXCR_DELAY_2	BIT(1)</div><div class='del'>-#define P5RGMIITXCR_DELAY_2	(BIT(8) | BIT(2))</div><div class='del'>-</div><div class='del'>-/* TOP_SIG_CTRL bits */</div><div class='del'>-#define TOP_SIG_CTRL_NORMAL	(BIT(17) | BIT(16))</div><div class='del'>-</div><div class='del'>-/* MHWTRAP bits */</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='del'>-</div><div class='del'>-/* HWTRAP bits */</div><div class='del'>-#define HWTRAP_XTAL_SHIFT	9</div><div class='del'>-#define HWTRAP_XTAL_MASK	0x3</div><div class='del'>-</div><div class='del'>-/* SYS_CTRL bits */</div><div class='del'>-#define SYS_CTRL_SW_RST		BIT(1)</div><div class='del'>-#define SYS_CTRL_REG_RST	BIT(0)</div><div class='del'>-</div><div class='del'>-/* PMCR bits */</div><div class='del'>-#define PMCR_IFG_XMIT_96	BIT(18)</div><div class='del'>-#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='del'>-#define PMCR_BACK_PRES_EN	BIT(9)</div><div class='del'>-#define PMCR_BACKOFF_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='del'>-#define PMCR_FORCE_SPEED_1000	BIT(3)</div><div class='del'>-#define PMCR_FORCE_FDX		BIT(1)</div><div class='del'>-#define PMCR_FORCE_LNK		BIT(0)</div><div class='del'>-#define PMCR_FIXED_LINK		(PMCR_IFG_XMIT_96 | PMCR_MAC_MODE | \</div><div class='del'>-				 PMCR_FORCE_MODE | PMCR_TX_EN | PMCR_RX_EN | \</div><div class='del'>-				 PMCR_BACK_PRES_EN | PMCR_BACKOFF_EN | \</div><div class='del'>-				 PMCR_FORCE_SPEED_1000 | PMCR_FORCE_FDX | \</div><div class='del'>-				 PMCR_FORCE_LNK)</div><div class='del'>-</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='del'>-</div><div class='del'>-/* TRGMII control registers */</div><div class='del'>-#define GSW_INTF_MODE		0x390</div><div class='del'>-#define GSW_TRGMII_TD0_ODT	0x354</div><div class='del'>-#define GSW_TRGMII_TD1_ODT	0x35c</div><div class='del'>-#define GSW_TRGMII_TD2_ODT	0x364</div><div class='del'>-#define GSW_TRGMII_TD3_ODT	0x36c</div><div class='del'>-#define GSW_TRGMII_TXCTL_ODT	0x374</div><div class='del'>-#define GSW_TRGMII_TCK_ODT	0x37c</div><div class='del'>-#define GSW_TRGMII_RCK_CTRL	0x300</div><div class='del'>-</div><div class='del'>-#define INTF_MODE_TRGMII	BIT(1)</div><div class='del'>-#define TRGMII_RCK_CTRL_RX_RST	BIT(31)</div><div class='del'>-</div><div class='del'>-/* Mac control registers */</div><div class='del'>-#define MTK_MAC_P2_MCR		0x200</div><div class='del'>-#define MTK_MAC_P1_MCR		0x100</div><div class='del'>-</div><div class='del'>-#define MAC_MCR_MAX_RX_2K	BIT(29)</div><div class='del'>-#define MAC_MCR_IPG_CFG		(BIT(18) | BIT(16))</div><div class='del'>-#define MAC_MCR_FORCE_MODE	BIT(15)</div><div class='del'>-#define MAC_MCR_TX_EN		BIT(14)</div><div class='del'>-#define MAC_MCR_RX_EN		BIT(13)</div><div class='del'>-#define MAC_MCR_BACKOFF_EN	BIT(9)</div><div class='del'>-#define MAC_MCR_BACKPR_EN	BIT(8)</div><div class='del'>-#define MAC_MCR_FORCE_RX_FC	BIT(5)</div><div class='del'>-#define MAC_MCR_FORCE_TX_FC	BIT(4)</div><div class='del'>-#define MAC_MCR_SPEED_1000	BIT(3)</div><div class='del'>-#define MAC_MCR_FORCE_DPX	BIT(1)</div><div class='del'>-#define MAC_MCR_FORCE_LINK	BIT(0)</div><div class='del'>-#define MAC_MCR_FIXED_LINK	(MAC_MCR_MAX_RX_2K | MAC_MCR_IPG_CFG | \</div><div class='del'>-				 MAC_MCR_FORCE_MODE | MAC_MCR_TX_EN | \</div><div class='del'>-				 MAC_MCR_RX_EN | MAC_MCR_BACKOFF_EN | \</div><div class='del'>-				 MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_RX_FC | \</div><div class='del'>-				 MAC_MCR_FORCE_TX_FC | MAC_MCR_SPEED_1000 | \</div><div class='del'>-				 MAC_MCR_FORCE_DPX | MAC_MCR_FORCE_LINK)</div><div class='del'>-#define MAC_MCR_FIXED_LINK_FC	(MAC_MCR_MAX_RX_2K | MAC_MCR_IPG_CFG | \</div><div class='del'>-				 MAC_MCR_FIXED_LINK)</div><div class='del'>-</div><div class='del'>-/* possible XTAL speed */</div><div class='del'>-#define	MT7623_XTAL_40		0</div><div class='del'>-#define MT7623_XTAL_20		1</div><div class='del'>-#define MT7623_XTAL_25		3</div><div class='del'>-</div><div class='del'>-/* GPIO port control registers */</div><div class='del'>-#define	GPIO_OD33_CTRL8		0x4c0</div><div class='del'>-#define	GPIO_BIAS_CTRL		0xed0</div><div class='del'>-#define GPIO_DRV_SEL10		0xf00</div><div class='del'>-</div><div class='del'>-/* on MT7620 the functio of port 4 can be software configured */</div><div class='del'>-enum {</div><div class='del'>-	PORT4_EPHY = 0,</div><div class='del'>-	PORT4_EXT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* struct mt7620_gsw -	the structure that holds the SoC specific data</div><div class='del'>- * @dev:		The Device struct</div><div class='del'>- * @base:		The base address</div><div class='del'>- * @piac_offset:	The PIAC base may change depending on SoC</div><div class='del'>- * @irq:		The IRQ we are using</div><div class='del'>- * @port4:		The port4 mode on MT7620</div><div class='del'>- * @autopoll:		Is MDIO autopolling enabled</div><div class='del'>- * @ethsys:		The ethsys register map</div><div class='del'>- * @pctl:		The pin control register map</div><div class='del'>- * @clk_gsw:		The switch clock</div><div class='del'>- * @clk_gp1:		The gmac1 clock</div><div class='del'>- * @clk_gp2:		The gmac2 clock</div><div class='del'>- * @clk_trgpll:		The trgmii pll clock</div><div class='del'>- */</div><div class='del'>-struct mt7620_gsw {</div><div class='del'>-	struct device		*dev;</div><div class='del'>-	void __iomem		*base;</div><div class='del'>-	u32			piac_offset;</div><div class='del'>-	int			irq;</div><div class='del'>-	int			port4;</div><div class='del'>-	unsigned long int	autopoll;</div><div class='del'>-</div><div class='del'>-	struct regmap		*ethsys;</div><div class='del'>-	struct regmap		*pctl;</div><div class='del'>-</div><div class='del'>-	struct clk		*clk_gsw;</div><div class='del'>-	struct clk		*clk_gp1;</div><div class='del'>-	struct clk		*clk_gp2;</div><div class='del'>-	struct clk		*clk_trgpll;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* switch register I/O wrappers */</div><div class='del'>-void mtk_switch_w32(struct mt7620_gsw *gsw, u32 val, unsigned int reg);</div><div class='del'>-u32 mtk_switch_r32(struct mt7620_gsw *gsw, unsigned int reg);</div><div class='del'>-</div><div class='del'>-/* the callback used by the driver core to bringup the switch */</div><div class='del'>-int mtk_gsw_init(struct mtk_eth *eth);</div><div class='del'>-</div><div class='del'>-/* MDIO access wrappers */</div><div class='del'>-int mt7620_mdio_write(struct mii_bus *bus, int phy_addr, int phy_reg, u16 val);</div><div class='del'>-int mt7620_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg);</div><div class='del'>-void mt7620_mdio_link_adjust(struct mtk_eth *eth, int port);</div><div class='del'>-int mt7620_has_carrier(struct mtk_eth *eth);</div><div class='del'>-void mt7620_print_link_state(struct mtk_eth *eth, int port, int link,</div><div class='del'>-			     int speed, int duplex);</div><div class='del'>-void mt7530_mdio_w32(struct mt7620_gsw *gsw, u32 reg, u32 val);</div><div class='del'>-u32 mt7530_mdio_r32(struct mt7620_gsw *gsw, u32 reg);</div><div class='del'>-void mt7530_mdio_m32(struct mt7620_gsw *gsw, u32 mask, u32 set, u32 reg);</div><div class='del'>-</div><div class='del'>-u32 _mt7620_mii_write(struct mt7620_gsw *gsw, u32 phy_addr,</div><div class='del'>-		      u32 phy_register, u32 write_data);</div><div class='del'>-u32 _mt7620_mii_read(struct mt7620_gsw *gsw, int phy_addr, int phy_reg);</div><div class='del'>-void mt7620_handle_carrier(struct mtk_eth *eth);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/gsw_mt7621.c b/drivers/staging/mt7621-eth/gsw_mt7621.c<br/>deleted file mode 100644<br/>index 53767b17bad9..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/gsw_mt7621.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/gsw_mt7621.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,297 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&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/types.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_irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ralink_regs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mtk_eth_soc.h"</div><div class='del'>-#include "gsw_mt7620.h"</div><div class='del'>-</div><div class='del'>-void mtk_switch_w32(struct mt7620_gsw *gsw, u32 val, unsigned int reg)</div><div class='del'>-{</div><div class='del'>-	iowrite32(val, gsw-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mtk_switch_w32);</div><div class='del'>-</div><div class='del'>-u32 mtk_switch_r32(struct mt7620_gsw *gsw, unsigned int reg)</div><div class='del'>-{</div><div class='del'>-	return ioread32(gsw-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mtk_switch_r32);</div><div class='del'>-</div><div class='del'>-static irqreturn_t gsw_interrupt_mt7621(int irq, void *_eth)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = (struct mtk_eth *)_eth;</div><div class='del'>-	struct mt7620_gsw *gsw = (struct mt7620_gsw *)eth-&gt;sw_priv;</div><div class='del'>-	u32 reg, i;</div><div class='del'>-</div><div class='del'>-	reg = mt7530_mdio_r32(gsw, MT7530_SYS_INT_STS);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		unsigned int link;</div><div class='del'>-</div><div class='del'>-		if ((reg &amp; BIT(i)) == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		link = mt7530_mdio_r32(gsw, MT7530_PMSR_P(i)) &amp; 0x1;</div><div class='del'>-</div><div class='del'>-		if (link == eth-&gt;link[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		eth-&gt;link[i] = link;</div><div class='del'>-		if (link)</div><div class='del'>-			netdev_info(*eth-&gt;netdev,</div><div class='del'>-				    "port %d link up\n", i);</div><div class='del'>-		else</div><div class='del'>-			netdev_info(*eth-&gt;netdev,</div><div class='del'>-				    "port %d link down\n", i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_SYS_INT_STS, 0x1f);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7621_hw_init(struct mtk_eth *eth, struct mt7620_gsw *gsw,</div><div class='del'>-			   struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* hardware reset the switch */</div><div class='del'>-	mtk_reset(eth, RST_CTRL_MCM);</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	/* reduce RGMII2 PAD driving strength */</div><div class='del'>-	rt_sysc_m32(MT7621_MDIO_DRV_MASK, 0, SYSC_PAD_RGMII2_MDIO);</div><div class='del'>-</div><div class='del'>-	/* gpio mux - RGMII1=Normal mode */</div><div class='del'>-	rt_sysc_m32(BIT(14), 0, SYSC_GPIO_MODE);</div><div class='del'>-</div><div class='del'>-	/* set GMAC1 RGMII mode */</div><div class='del'>-	rt_sysc_m32(MT7621_GE1_MODE_MASK, 0, SYSC_REG_CFG1);</div><div class='del'>-</div><div class='del'>-	/* enable MDIO to control MT7530 */</div><div class='del'>-	rt_sysc_m32(3 &lt;&lt; 12, 0, SYSC_GPIO_MODE);</div><div class='del'>-</div><div class='del'>-	/* turn off all PHYs */</div><div class='del'>-	for (i = 0; i &lt;= 4; i++) {</div><div class='del'>-		val = _mt7620_mii_read(gsw, i, 0x0);</div><div class='del'>-		val |= BIT(11);</div><div class='del'>-		_mt7620_mii_write(gsw, i, 0x0, val);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset the switch */</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_SYS_CTRL,</div><div class='del'>-			SYS_CTRL_SW_RST | SYS_CTRL_REG_RST);</div><div class='del'>-	usleep_range(10, 20);</div><div class='del'>-</div><div class='del'>-	if ((rt_sysc_r32(SYSC_REG_CHIP_REV_ID) &amp; 0xFFFF) == 0x0101) {</div><div class='del'>-		/* GE1, Force 1000M/FD, FC ON, MAX_RX_LENGTH 1536 */</div><div class='del'>-		mtk_switch_w32(gsw, MAC_MCR_FIXED_LINK, MTK_MAC_P2_MCR);</div><div class='del'>-		mt7530_mdio_w32(gsw, MT7530_PMCR_P(6), PMCR_FIXED_LINK);</div><div class='del'>-	} else {</div><div class='del'>-		/* GE1, Force 1000M/FD, FC ON, MAX_RX_LENGTH 1536 */</div><div class='del'>-		mtk_switch_w32(gsw, MAC_MCR_FIXED_LINK_FC, MTK_MAC_P1_MCR);</div><div class='del'>-		mt7530_mdio_w32(gsw, MT7530_PMCR_P(6), PMCR_FIXED_LINK_FC);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* GE2, Link down */</div><div class='del'>-	mtk_switch_w32(gsw, MAC_MCR_FORCE_MODE, MTK_MAC_P2_MCR);</div><div class='del'>-</div><div class='del'>-	/* Enable Port 6, P5 as GMAC5, P5 disable */</div><div class='del'>-	val = mt7530_mdio_r32(gsw, MT7530_MHWTRAP);</div><div class='del'>-	/* Enable Port 6 */</div><div class='del'>-	val &amp;= ~MHWTRAP_P6_DIS;</div><div class='del'>-	/* Disable Port 5 */</div><div class='del'>-	val |= MHWTRAP_P5_DIS;</div><div class='del'>-	/* manual override of HW-Trap */</div><div class='del'>-	val |= MHWTRAP_MANUAL;</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_MHWTRAP, val);</div><div class='del'>-</div><div class='del'>-	val = rt_sysc_r32(SYSC_REG_CFG);</div><div class='del'>-	val = (val &gt;&gt; MT7621_XTAL_SHIFT) &amp; MT7621_XTAL_MASK;</div><div class='del'>-	if (val &lt; MT7621_XTAL_25 &amp;&amp; val &gt;= MT7621_XTAL_40) {</div><div class='del'>-		/* 40Mhz */</div><div class='del'>-</div><div class='del'>-		/* disable MT7530 core clock */</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x1f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x410);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x401f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x0);</div><div class='del'>-</div><div class='del'>-		/* disable MT7530 PLL */</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x1f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x40d);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x401f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x2020);</div><div class='del'>-</div><div class='del'>-		/* for MT7530 core clock = 500Mhz */</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x1f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x40e);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x401f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x119);</div><div class='del'>-</div><div class='del'>-		/* enable MT7530 PLL */</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x1f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x40d);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x401f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x2820);</div><div class='del'>-</div><div class='del'>-		usleep_range(20, 40);</div><div class='del'>-</div><div class='del'>-		/* enable MT7530 core clock */</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x1f);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 14, 0x410);</div><div class='del'>-		_mt7620_mii_write(gsw, 0, 13, 0x401f);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* RGMII */</div><div class='del'>-	_mt7620_mii_write(gsw, 0, 14, 0x1);</div><div class='del'>-</div><div class='del'>-	/* set MT7530 central align */</div><div class='del'>-	mt7530_mdio_m32(gsw, BIT(0), P6ECR_INTF_MODE_RGMII, MT7530_P6ECR);</div><div class='del'>-	mt7530_mdio_m32(gsw, TRGMII_TXCTRL_TXC_INV, 0,</div><div class='del'>-			MT7530_TRGMII_TXCTRL);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TCK_CTRL, 0x855);</div><div class='del'>-</div><div class='del'>-	/* delay setting for 10/1000M */</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_P5RGMIIRXCR,</div><div class='del'>-			P5RGMIIRXCR_C_ALIGN | P5RGMIIRXCR_DELAY_2);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_P5RGMIITXCR, 0x14);</div><div class='del'>-</div><div class='del'>-	/* lower Tx Driving*/</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TD0_ODT, 0x44);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TD1_ODT, 0x44);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TD2_ODT, 0x44);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TD3_ODT, 0x44);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TD4_ODT, 0x44);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_TRGMII_TD5_ODT, 0x44);</div><div class='del'>-</div><div class='del'>-	/* turn on all PHYs */</div><div class='del'>-	for (i = 0; i &lt;= 4; i++) {</div><div class='del'>-		val = _mt7620_mii_read(gsw, i, 0);</div><div class='del'>-		val &amp;= ~BIT(11);</div><div class='del'>-		_mt7620_mii_write(gsw, i, 0, val);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define MT7530_NUM_PORTS 8</div><div class='del'>-#define REG_ESW_PORT_PCR(x)    (0x2004 | ((x) &lt;&lt; 8))</div><div class='del'>-#define REG_ESW_PORT_PVC(x)    (0x2010 | ((x) &lt;&lt; 8))</div><div class='del'>-#define REG_ESW_PORT_PPBV1(x)  (0x2014 | ((x) &lt;&lt; 8))</div><div class='del'>-#define MT7530_CPU_PORT                6</div><div class='del'>-</div><div class='del'>-	/* This is copied from mt7530_apply_config in libreCMC driver */</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; MT7530_NUM_PORTS; i++)</div><div class='del'>-			mt7530_mdio_w32(gsw, REG_ESW_PORT_PCR(i), 0x00400000);</div><div class='del'>-</div><div class='del'>-		mt7530_mdio_w32(gsw, REG_ESW_PORT_PCR(MT7530_CPU_PORT),</div><div class='del'>-				0x00ff0000);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; MT7530_NUM_PORTS; i++)</div><div class='del'>-			mt7530_mdio_w32(gsw, REG_ESW_PORT_PVC(i), 0x810000c0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable irq */</div><div class='del'>-	mt7530_mdio_m32(gsw, 0, 3 &lt;&lt; 16, MT7530_TOP_SIG_CTRL);</div><div class='del'>-	mt7530_mdio_w32(gsw, MT7530_SYS_INT_EN, 0x1f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id mediatek_gsw_match[] = {</div><div class='del'>-	{ .compatible = "mediatek,mt7621-gsw" },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, mediatek_gsw_match);</div><div class='del'>-</div><div class='del'>-int mtk_gsw_init(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np = eth-&gt;switch_np;</div><div class='del'>-	struct platform_device *pdev = of_find_device_by_node(np);</div><div class='del'>-	struct mt7620_gsw *gsw;</div><div class='del'>-</div><div class='del'>-	if (!pdev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!of_device_is_compatible(np, mediatek_gsw_match-&gt;compatible))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	gsw = platform_get_drvdata(pdev);</div><div class='del'>-	eth-&gt;sw_priv = gsw;</div><div class='del'>-</div><div class='del'>-	if (!gsw-&gt;irq)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	request_irq(gsw-&gt;irq, gsw_interrupt_mt7621, 0,</div><div class='del'>-		    "gsw", eth);</div><div class='del'>-	disable_irq(gsw-&gt;irq);</div><div class='del'>-</div><div class='del'>-	mt7621_hw_init(eth, gsw, np);</div><div class='del'>-</div><div class='del'>-	enable_irq(gsw-&gt;irq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mtk_gsw_init);</div><div class='del'>-</div><div class='del'>-static int mt7621_gsw_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	struct mt7620_gsw *gsw;</div><div class='del'>-</div><div class='del'>-	gsw = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct mt7620_gsw), GFP_KERNEL);</div><div class='del'>-	if (!gsw)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	gsw-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(gsw-&gt;base))</div><div class='del'>-		return PTR_ERR(gsw-&gt;base);</div><div class='del'>-</div><div class='del'>-	gsw-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	gsw-&gt;irq = irq_of_parse_and_map(pdev-&gt;dev.of_node, 0);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, gsw);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7621_gsw_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</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 gsw_driver = {</div><div class='del'>-	.probe = mt7621_gsw_probe,</div><div class='del'>-	.remove = mt7621_gsw_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "mt7621-gsw",</div><div class='del'>-		.of_match_table = mediatek_gsw_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver(gsw_driver);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("John Crispin &lt;blogic@openwrt.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("GBit switch driver for Mediatek MT7621 SoC");</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/mdio.c b/drivers/staging/mt7621-eth/mdio.c<br/>deleted file mode 100644<br/>index 5fea6a447eed..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/mdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mdio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,275 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&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/phy.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mtk_eth_soc.h"</div><div class='del'>-#include "mdio.h"</div><div class='del'>-</div><div class='del'>-static int mtk_mdio_reset(struct mii_bus *bus)</div><div class='del'>-{</div><div class='del'>-	/* TODO */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_phy_link_adjust(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = netdev_priv(dev);</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;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if (eth-&gt;phy-&gt;phy_node[i]) {</div><div class='del'>-			struct phy_device *phydev = eth-&gt;phy-&gt;phy[i];</div><div class='del'>-			int status_change = 0;</div><div class='del'>-</div><div class='del'>-			if (phydev-&gt;link)</div><div class='del'>-				if (eth-&gt;phy-&gt;duplex[i] != phydev-&gt;duplex ||</div><div class='del'>-				    eth-&gt;phy-&gt;speed[i] != phydev-&gt;speed)</div><div class='del'>-					status_change = 1;</div><div class='del'>-</div><div class='del'>-			if (phydev-&gt;link != eth-&gt;link[i])</div><div class='del'>-				status_change = 1;</div><div class='del'>-</div><div class='del'>-			switch (phydev-&gt;speed) {</div><div class='del'>-			case SPEED_1000:</div><div class='del'>-			case SPEED_100:</div><div class='del'>-			case SPEED_10:</div><div class='del'>-				eth-&gt;link[i] = phydev-&gt;link;</div><div class='del'>-				eth-&gt;phy-&gt;duplex[i] = phydev-&gt;duplex;</div><div class='del'>-				eth-&gt;phy-&gt;speed[i] = phydev-&gt;speed;</div><div class='del'>-</div><div class='del'>-				if (status_change &amp;&amp;</div><div class='del'>-				    eth-&gt;soc-&gt;mdio_adjust_link)</div><div class='del'>-					eth-&gt;soc-&gt;mdio_adjust_link(eth, i);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mtk_connect_phy_node(struct mtk_eth *eth, struct mtk_mac *mac,</div><div class='del'>-			 struct device_node *phy_node)</div><div class='del'>-{</div><div class='del'>-	const __be32 *_port = NULL;</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int phy_mode, port;</div><div class='del'>-</div><div class='del'>-	_port = of_get_property(phy_node, "reg", NULL);</div><div class='del'>-</div><div class='del'>-	if (!_port || (be32_to_cpu(*_port) &gt;= 0x20)) {</div><div class='del'>-		pr_err("%pOFn: invalid port id\n", phy_node);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	port = be32_to_cpu(*_port);</div><div class='del'>-	phy_mode = of_get_phy_mode(phy_node);</div><div class='del'>-	if (phy_mode &lt; 0) {</div><div class='del'>-		dev_err(eth-&gt;dev, "incorrect phy-mode %d\n", phy_mode);</div><div class='del'>-		eth-&gt;phy-&gt;phy_node[port] = NULL;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	phydev = of_phy_connect(eth-&gt;netdev[mac-&gt;id], phy_node,</div><div class='del'>-				mtk_phy_link_adjust, 0, phy_mode);</div><div class='del'>-	if (!phydev) {</div><div class='del'>-		dev_err(eth-&gt;dev, "could not connect to PHY\n");</div><div class='del'>-		eth-&gt;phy-&gt;phy_node[port] = NULL;</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	phydev-&gt;supported &amp;= PHY_1000BT_FEATURES;</div><div class='del'>-	phydev-&gt;advertising = phydev-&gt;supported;</div><div class='del'>-</div><div class='del'>-	dev_info(eth-&gt;dev,</div><div class='del'>-		 "connected port %d to PHY at %s [uid=%08x, driver=%s]\n",</div><div class='del'>-		 port, phydev_name(phydev), phydev-&gt;phy_id,</div><div class='del'>-		 phydev-&gt;drv-&gt;name);</div><div class='del'>-</div><div class='del'>-	eth-&gt;phy-&gt;phy[port] = phydev;</div><div class='del'>-	eth-&gt;link[port] = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void phy_init(struct mtk_eth *eth, struct mtk_mac *mac,</div><div class='del'>-		     struct phy_device *phy)</div><div class='del'>-{</div><div class='del'>-	phy_attach(eth-&gt;netdev[mac-&gt;id], phydev_name(phy),</div><div class='del'>-		   PHY_INTERFACE_MODE_MII);</div><div class='del'>-</div><div class='del'>-	phy-&gt;autoneg = AUTONEG_ENABLE;</div><div class='del'>-	phy-&gt;speed = 0;</div><div class='del'>-	phy-&gt;duplex = 0;</div><div class='del'>-	phy_set_max_speed(phy, SPEED_100);</div><div class='del'>-	phy-&gt;advertising = phy-&gt;supported | ADVERTISED_Autoneg;</div><div class='del'>-</div><div class='del'>-	phy_start_aneg(phy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_phy_connect(struct mtk_mac *mac)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</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'>-		if (eth-&gt;phy-&gt;phy_node[i]) {</div><div class='del'>-			if (!mac-&gt;phy_dev) {</div><div class='del'>-				mac-&gt;phy_dev = eth-&gt;phy-&gt;phy[i];</div><div class='del'>-				mac-&gt;phy_flags = MTK_PHY_FLAG_PORT;</div><div class='del'>-			}</div><div class='del'>-		} else if (eth-&gt;mii_bus) {</div><div class='del'>-			struct phy_device *phy;</div><div class='del'>-</div><div class='del'>-			phy = mdiobus_get_phy(eth-&gt;mii_bus, i);</div><div class='del'>-			if (phy) {</div><div class='del'>-				phy_init(eth, mac, phy);</div><div class='del'>-				if (!mac-&gt;phy_dev) {</div><div class='del'>-					mac-&gt;phy_dev = phy;</div><div class='del'>-					mac-&gt;phy_flags = MTK_PHY_FLAG_ATTACH;</div><div class='del'>-				}</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'>-</div><div class='del'>-static void mtk_phy_disconnect(struct mtk_mac *mac)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	unsigned long flags;</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'>-		if (eth-&gt;phy-&gt;phy_fixed[i]) {</div><div class='del'>-			spin_lock_irqsave(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-			eth-&gt;link[i] = 0;</div><div class='del'>-			if (eth-&gt;soc-&gt;mdio_adjust_link)</div><div class='del'>-				eth-&gt;soc-&gt;mdio_adjust_link(eth, i);</div><div class='del'>-			spin_unlock_irqrestore(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-		} else if (eth-&gt;phy-&gt;phy[i]) {</div><div class='del'>-			phy_disconnect(eth-&gt;phy-&gt;phy[i]);</div><div class='del'>-		} else if (eth-&gt;mii_bus) {</div><div class='del'>-			struct phy_device *phy =</div><div class='del'>-				mdiobus_get_phy(eth-&gt;mii_bus, i);</div><div class='del'>-</div><div class='del'>-			if (phy)</div><div class='del'>-				phy_detach(phy);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_phy_start(struct mtk_mac *mac)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	unsigned long flags;</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'>-		if (eth-&gt;phy-&gt;phy_fixed[i]) {</div><div class='del'>-			spin_lock_irqsave(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-			eth-&gt;link[i] = 1;</div><div class='del'>-			if (eth-&gt;soc-&gt;mdio_adjust_link)</div><div class='del'>-				eth-&gt;soc-&gt;mdio_adjust_link(eth, i);</div><div class='del'>-			spin_unlock_irqrestore(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-		} else if (eth-&gt;phy-&gt;phy[i]) {</div><div class='del'>-			phy_start(eth-&gt;phy-&gt;phy[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_phy_stop(struct mtk_mac *mac)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	unsigned long flags;</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'>-		if (eth-&gt;phy-&gt;phy_fixed[i]) {</div><div class='del'>-			spin_lock_irqsave(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-			eth-&gt;link[i] = 0;</div><div class='del'>-			if (eth-&gt;soc-&gt;mdio_adjust_link)</div><div class='del'>-				eth-&gt;soc-&gt;mdio_adjust_link(eth, i);</div><div class='del'>-			spin_unlock_irqrestore(&amp;eth-&gt;phy-&gt;lock, flags);</div><div class='del'>-		} else if (eth-&gt;phy-&gt;phy[i]) {</div><div class='del'>-			phy_stop(eth-&gt;phy-&gt;phy[i]);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mtk_phy phy_ralink = {</div><div class='del'>-	.connect = mtk_phy_connect,</div><div class='del'>-	.disconnect = mtk_phy_disconnect,</div><div class='del'>-	.start = mtk_phy_start,</div><div class='del'>-	.stop = mtk_phy_stop,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int mtk_mdio_init(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct device_node *mii_np;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!eth-&gt;soc-&gt;mdio_read || !eth-&gt;soc-&gt;mdio_write)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;phy_ralink.lock);</div><div class='del'>-	eth-&gt;phy = &amp;phy_ralink;</div><div class='del'>-</div><div class='del'>-	mii_np = of_get_child_by_name(eth-&gt;dev-&gt;of_node, "mdio-bus");</div><div class='del'>-	if (!mii_np) {</div><div class='del'>-		dev_err(eth-&gt;dev, "no %s child node found", "mdio-bus");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!of_device_is_available(mii_np)) {</div><div class='del'>-		err = 0;</div><div class='del'>-		goto err_put_node;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eth-&gt;mii_bus = mdiobus_alloc();</div><div class='del'>-	if (!eth-&gt;mii_bus) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_put_node;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eth-&gt;mii_bus-&gt;name = "mdio";</div><div class='del'>-	eth-&gt;mii_bus-&gt;read = eth-&gt;soc-&gt;mdio_read;</div><div class='del'>-	eth-&gt;mii_bus-&gt;write = eth-&gt;soc-&gt;mdio_write;</div><div class='del'>-	eth-&gt;mii_bus-&gt;reset = mtk_mdio_reset;</div><div class='del'>-	eth-&gt;mii_bus-&gt;priv = eth;</div><div class='del'>-	eth-&gt;mii_bus-&gt;parent = eth-&gt;dev;</div><div class='del'>-</div><div class='del'>-	snprintf(eth-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%pOFn", mii_np);</div><div class='del'>-	err = of_mdiobus_register(eth-&gt;mii_bus, mii_np);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_bus;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_bus:</div><div class='del'>-	kfree(eth-&gt;mii_bus);</div><div class='del'>-err_put_node:</div><div class='del'>-	of_node_put(mii_np);</div><div class='del'>-	eth-&gt;mii_bus = NULL;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mtk_mdio_cleanup(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	if (!eth-&gt;mii_bus)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mdiobus_unregister(eth-&gt;mii_bus);</div><div class='del'>-	of_node_put(eth-&gt;mii_bus-&gt;dev.of_node);</div><div class='del'>-	kfree(eth-&gt;mii_bus);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/mdio.h b/drivers/staging/mt7621-eth/mdio.h<br/>deleted file mode 100644<br/>index b14e23842a01..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/mdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mdio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _RALINK_MDIO_H__</div><div class='del'>-#define _RALINK_MDIO_H__</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NET_MEDIATEK_MDIO</div><div class='del'>-int mtk_mdio_init(struct mtk_eth *eth);</div><div class='del'>-void mtk_mdio_cleanup(struct mtk_eth *eth);</div><div class='del'>-int mtk_connect_phy_node(struct mtk_eth *eth, struct mtk_mac *mac,</div><div class='del'>-			 struct device_node *phy_node);</div><div class='del'>-#else</div><div class='del'>-static inline int mtk_mdio_init(struct mtk_eth *eth) { return 0; }</div><div class='del'>-static inline void mtk_mdio_cleanup(struct mtk_eth *eth) {}</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/mdio_mt7620.c b/drivers/staging/mt7621-eth/mdio_mt7620.c<br/>deleted file mode 100644<br/>index ced605c2914e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/mdio_mt7620.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mdio_mt7620.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&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/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mtk_eth_soc.h"</div><div class='del'>-#include "gsw_mt7620.h"</div><div class='del'>-#include "mdio.h"</div><div class='del'>-</div><div class='del'>-static int mt7620_mii_busy_wait(struct mt7620_gsw *gsw)</div><div class='del'>-{</div><div class='del'>-	unsigned long t_start = jiffies;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (!(mtk_switch_r32(gsw,</div><div class='del'>-				     gsw-&gt;piac_offset + MT7620_GSW_REG_PIAC) &amp;</div><div class='del'>-				     GSW_MDIO_ACCESS))</div><div class='del'>-			return 0;</div><div class='del'>-		if (time_after(jiffies, t_start + GSW_REG_PHY_TIMEOUT))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_err(gsw-&gt;dev, "mdio: MDIO timeout\n");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 _mt7620_mii_write(struct mt7620_gsw *gsw, u32 phy_addr,</div><div class='del'>-		      u32 phy_register, u32 write_data)</div><div class='del'>-{</div><div class='del'>-	if (mt7620_mii_busy_wait(gsw))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	write_data &amp;= 0xffff;</div><div class='del'>-</div><div class='del'>-	mtk_switch_w32(gsw, GSW_MDIO_ACCESS | GSW_MDIO_START | GSW_MDIO_WRITE |</div><div class='del'>-		(phy_register &lt;&lt; GSW_MDIO_REG_SHIFT) |</div><div class='del'>-		(phy_addr &lt;&lt; GSW_MDIO_ADDR_SHIFT) | write_data,</div><div class='del'>-		MT7620_GSW_REG_PIAC);</div><div class='del'>-</div><div class='del'>-	if (mt7620_mii_busy_wait(gsw))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(_mt7620_mii_write);</div><div class='del'>-</div><div class='del'>-u32 _mt7620_mii_read(struct mt7620_gsw *gsw, int phy_addr, int phy_reg)</div><div class='del'>-{</div><div class='del'>-	u32 d;</div><div class='del'>-</div><div class='del'>-	if (mt7620_mii_busy_wait(gsw))</div><div class='del'>-		return 0xffff;</div><div class='del'>-</div><div class='del'>-	mtk_switch_w32(gsw, GSW_MDIO_ACCESS | GSW_MDIO_START | GSW_MDIO_READ |</div><div class='del'>-		(phy_reg &lt;&lt; GSW_MDIO_REG_SHIFT) |</div><div class='del'>-		(phy_addr &lt;&lt; GSW_MDIO_ADDR_SHIFT),</div><div class='del'>-		MT7620_GSW_REG_PIAC);</div><div class='del'>-</div><div class='del'>-	if (mt7620_mii_busy_wait(gsw))</div><div class='del'>-		return 0xffff;</div><div class='del'>-</div><div class='del'>-	d = mtk_switch_r32(gsw, MT7620_GSW_REG_PIAC) &amp; 0xffff;</div><div class='del'>-</div><div class='del'>-	return d;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(_mt7620_mii_read);</div><div class='del'>-</div><div class='del'>-int mt7620_mdio_write(struct mii_bus *bus, int phy_addr, int phy_reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = bus-&gt;priv;</div><div class='del'>-	struct mt7620_gsw *gsw = (struct mt7620_gsw *)eth-&gt;sw_priv;</div><div class='del'>-</div><div class='del'>-	return _mt7620_mii_write(gsw, phy_addr, phy_reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7620_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = bus-&gt;priv;</div><div class='del'>-	struct mt7620_gsw *gsw = (struct mt7620_gsw *)eth-&gt;sw_priv;</div><div class='del'>-</div><div class='del'>-	return _mt7620_mii_read(gsw, phy_addr, phy_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7530_mdio_w32(struct mt7620_gsw *gsw, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	_mt7620_mii_write(gsw, 0x1f, 0x1f, (reg &gt;&gt; 6) &amp; 0x3ff);</div><div class='del'>-	_mt7620_mii_write(gsw, 0x1f, (reg &gt;&gt; 2) &amp; 0xf,  val &amp; 0xffff);</div><div class='del'>-	_mt7620_mii_write(gsw, 0x1f, 0x10, val &gt;&gt; 16);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7530_mdio_w32);</div><div class='del'>-</div><div class='del'>-u32 mt7530_mdio_r32(struct mt7620_gsw *gsw, u32 reg)</div><div class='del'>-{</div><div class='del'>-	u16 high, low;</div><div class='del'>-</div><div class='del'>-	_mt7620_mii_write(gsw, 0x1f, 0x1f, (reg &gt;&gt; 6) &amp; 0x3ff);</div><div class='del'>-	low = _mt7620_mii_read(gsw, 0x1f, (reg &gt;&gt; 2) &amp; 0xf);</div><div class='del'>-	high = _mt7620_mii_read(gsw, 0x1f, 0x10);</div><div class='del'>-</div><div class='del'>-	return (high &lt;&lt; 16) | (low &amp; 0xffff);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7530_mdio_r32);</div><div class='del'>-</div><div class='del'>-void mt7530_mdio_m32(struct mt7620_gsw *gsw, u32 mask, u32 set, u32 reg)</div><div class='del'>-{</div><div class='del'>-	u32 val = mt7530_mdio_r32(gsw, reg);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	val |= set;</div><div class='del'>-	mt7530_mdio_w32(gsw, reg, val);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7530_mdio_m32);</div><div class='del'>-</div><div class='del'>-static unsigned char *mtk_speed_str(int speed)</div><div class='del'>-{</div><div class='del'>-	switch (speed) {</div><div class='del'>-	case 2:</div><div class='del'>-	case SPEED_1000:</div><div class='del'>-		return "1000";</div><div class='del'>-	case 1:</div><div class='del'>-	case SPEED_100:</div><div class='del'>-		return "100";</div><div class='del'>-	case 0:</div><div class='del'>-	case SPEED_10:</div><div class='del'>-		return "10";</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'>-int mt7620_has_carrier(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct mt7620_gsw *gsw = (struct mt7620_gsw *)eth-&gt;sw_priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; GSW_PORT6; i++)</div><div class='del'>-		if (mt7530_mdio_r32(gsw, GSW_REG_PORT_STATUS(i)) &amp; 0x1)</div><div class='del'>-			return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7620_print_link_state(struct mtk_eth *eth, int port, int link,</div><div class='del'>-			     int speed, int duplex)</div><div class='del'>-{</div><div class='del'>-	struct mt7620_gsw *gsw = eth-&gt;sw_priv;</div><div class='del'>-</div><div class='del'>-	if (link)</div><div class='del'>-		dev_info(gsw-&gt;dev, "port %d link up (%sMbps/%s duplex)\n",</div><div class='del'>-			 port, mtk_speed_str(speed),</div><div class='del'>-			 (duplex) ? "Full" : "Half");</div><div class='del'>-	else</div><div class='del'>-		dev_info(gsw-&gt;dev, "port %d link down\n", port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7620_mdio_link_adjust(struct mtk_eth *eth, int port)</div><div class='del'>-{</div><div class='del'>-	mt7620_print_link_state(eth, port, eth-&gt;link[port],</div><div class='del'>-				eth-&gt;phy-&gt;speed[port],</div><div class='del'>-				(eth-&gt;phy-&gt;duplex[port] == DUPLEX_FULL));</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.c b/drivers/staging/mt7621-eth/mtk_eth_soc.c<br/>deleted file mode 100644<br/>index 6027b19f7bc2..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/mtk_eth_soc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mtk_eth_soc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2176 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&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/types.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/ethtool.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/mfd/syscon.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;linux/reset.h&gt;</div><div class='del'>-#include &lt;linux/tcp.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mtk_eth_soc.h"</div><div class='del'>-#include "mdio.h"</div><div class='del'>-#include "ethtool.h"</div><div class='del'>-</div><div class='del'>-#define	MAX_RX_LENGTH		1536</div><div class='del'>-#define MTK_RX_ETH_HLEN		(VLAN_ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN)</div><div class='del'>-#define MTK_RX_HLEN		(NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN)</div><div class='del'>-#define DMA_DUMMY_DESC		0xffffffff</div><div class='del'>-#define MTK_DEFAULT_MSG_ENABLE \</div><div class='del'>-		(NETIF_MSG_DRV | \</div><div class='del'>-		NETIF_MSG_PROBE | \</div><div class='del'>-		NETIF_MSG_LINK | \</div><div class='del'>-		NETIF_MSG_TIMER | \</div><div class='del'>-		NETIF_MSG_IFDOWN | \</div><div class='del'>-		NETIF_MSG_IFUP | \</div><div class='del'>-		NETIF_MSG_RX_ERR | \</div><div class='del'>-		NETIF_MSG_TX_ERR)</div><div class='del'>-</div><div class='del'>-#define TX_DMA_DESP2_DEF	(TX_DMA_LS0 | TX_DMA_DONE)</div><div class='del'>-#define NEXT_TX_DESP_IDX(X)	(((X) + 1) &amp; (ring-&gt;tx_ring_size - 1))</div><div class='del'>-#define NEXT_RX_DESP_IDX(X)	(((X) + 1) &amp; (ring-&gt;rx_ring_size - 1))</div><div class='del'>-</div><div class='del'>-#define SYSC_REG_RSTCTRL	0x34</div><div class='del'>-</div><div class='del'>-static int mtk_msg_level = -1;</div><div class='del'>-module_param_named(msg_level, mtk_msg_level, int, 0);</div><div class='del'>-MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");</div><div class='del'>-</div><div class='del'>-static const u16 mtk_reg_table_default[MTK_REG_COUNT] = {</div><div class='del'>-	[MTK_REG_PDMA_GLO_CFG] = MTK_PDMA_GLO_CFG,</div><div class='del'>-	[MTK_REG_PDMA_RST_CFG] = MTK_PDMA_RST_CFG,</div><div class='del'>-	[MTK_REG_DLY_INT_CFG] = MTK_DLY_INT_CFG,</div><div class='del'>-	[MTK_REG_TX_BASE_PTR0] = MTK_TX_BASE_PTR0,</div><div class='del'>-	[MTK_REG_TX_MAX_CNT0] = MTK_TX_MAX_CNT0,</div><div class='del'>-	[MTK_REG_TX_CTX_IDX0] = MTK_TX_CTX_IDX0,</div><div class='del'>-	[MTK_REG_TX_DTX_IDX0] = MTK_TX_DTX_IDX0,</div><div class='del'>-	[MTK_REG_RX_BASE_PTR0] = MTK_RX_BASE_PTR0,</div><div class='del'>-	[MTK_REG_RX_MAX_CNT0] = MTK_RX_MAX_CNT0,</div><div class='del'>-	[MTK_REG_RX_CALC_IDX0] = MTK_RX_CALC_IDX0,</div><div class='del'>-	[MTK_REG_RX_DRX_IDX0] = MTK_RX_DRX_IDX0,</div><div class='del'>-	[MTK_REG_MTK_INT_ENABLE] = MTK_INT_ENABLE,</div><div class='del'>-	[MTK_REG_MTK_INT_STATUS] = MTK_INT_STATUS,</div><div class='del'>-	[MTK_REG_MTK_DMA_VID_BASE] = MTK_DMA_VID0,</div><div class='del'>-	[MTK_REG_MTK_COUNTER_BASE] = MTK_GDMA1_TX_GBCNT,</div><div class='del'>-	[MTK_REG_MTK_RST_GL] = MTK_RST_GL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u16 *mtk_reg_table = mtk_reg_table_default;</div><div class='del'>-</div><div class='del'>-void mtk_w32(struct mtk_eth *eth, u32 val, unsigned int reg)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(val, eth-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 mtk_r32(struct mtk_eth *eth, unsigned int reg)</div><div class='del'>-{</div><div class='del'>-	return __raw_readl(eth-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_reg_w32(struct mtk_eth *eth, u32 val, enum mtk_reg reg)</div><div class='del'>-{</div><div class='del'>-	mtk_w32(eth, val, mtk_reg_table[reg]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mtk_reg_r32(struct mtk_eth *eth, enum mtk_reg reg)</div><div class='del'>-{</div><div class='del'>-	return mtk_r32(eth, mtk_reg_table[reg]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* these bits are also exposed via the reset-controller API. however the switch</div><div class='del'>- * and FE need to be brought out of reset in the exakt same moemtn and the</div><div class='del'>- * reset-controller api does not provide this feature yet. Do the reset manually</div><div class='del'>- * until we fixed the reset-controller api to be able to do this</div><div class='del'>- */</div><div class='del'>-void mtk_reset(struct mtk_eth *eth, u32 reset_bits)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	regmap_read(eth-&gt;ethsys, SYSC_REG_RSTCTRL, &amp;val);</div><div class='del'>-	val |= reset_bits;</div><div class='del'>-	regmap_write(eth-&gt;ethsys, SYSC_REG_RSTCTRL, val);</div><div class='del'>-	usleep_range(10, 20);</div><div class='del'>-	val &amp;= ~reset_bits;</div><div class='del'>-	regmap_write(eth-&gt;ethsys, SYSC_REG_RSTCTRL, val);</div><div class='del'>-	usleep_range(10, 20);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(mtk_reset);</div><div class='del'>-</div><div class='del'>-static inline void mtk_irq_ack(struct mtk_eth *eth, u32 mask)</div><div class='del'>-{</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA)</div><div class='del'>-		mtk_reg_w32(eth, mask, MTK_REG_MTK_INT_STATUS);</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA)</div><div class='del'>-		mtk_w32(eth, mask, MTK_QMTK_INT_STATUS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 mtk_irq_pending(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	u32 status = 0;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA)</div><div class='del'>-		status |= mtk_reg_r32(eth, MTK_REG_MTK_INT_STATUS);</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA)</div><div class='del'>-		status |= mtk_r32(eth, MTK_QMTK_INT_STATUS);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_irq_ack_status(struct mtk_eth *eth, u32 mask)</div><div class='del'>-{</div><div class='del'>-	u32 status_reg = MTK_REG_MTK_INT_STATUS;</div><div class='del'>-</div><div class='del'>-	if (mtk_reg_table[MTK_REG_MTK_INT_STATUS2])</div><div class='del'>-		status_reg = MTK_REG_MTK_INT_STATUS2;</div><div class='del'>-</div><div class='del'>-	mtk_reg_w32(eth, mask, status_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mtk_irq_pending_status(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	u32 status_reg = MTK_REG_MTK_INT_STATUS;</div><div class='del'>-</div><div class='del'>-	if (mtk_reg_table[MTK_REG_MTK_INT_STATUS2])</div><div class='del'>-		status_reg = MTK_REG_MTK_INT_STATUS2;</div><div class='del'>-</div><div class='del'>-	return mtk_reg_r32(eth, status_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA) {</div><div class='del'>-		val = mtk_reg_r32(eth, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-		mtk_reg_w32(eth, val &amp; ~mask, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-		/* flush write */</div><div class='del'>-		mtk_reg_r32(eth, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-	}</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA) {</div><div class='del'>-		val = mtk_r32(eth, MTK_QMTK_INT_ENABLE);</div><div class='del'>-		mtk_w32(eth, val &amp; ~mask, MTK_QMTK_INT_ENABLE);</div><div class='del'>-		/* flush write */</div><div class='del'>-		mtk_r32(eth, MTK_QMTK_INT_ENABLE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mtk_irq_enable(struct mtk_eth *eth, u32 mask)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA) {</div><div class='del'>-		val = mtk_reg_r32(eth, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-		mtk_reg_w32(eth, val | mask, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-		/* flush write */</div><div class='del'>-		mtk_reg_r32(eth, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-	}</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA) {</div><div class='del'>-		val = mtk_r32(eth, MTK_QMTK_INT_ENABLE);</div><div class='del'>-		mtk_w32(eth, val | mask, MTK_QMTK_INT_ENABLE);</div><div class='del'>-		/* flush write */</div><div class='del'>-		mtk_r32(eth, MTK_QMTK_INT_ENABLE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 mtk_irq_enabled(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	u32 enabled = 0;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA)</div><div class='del'>-		enabled |= mtk_reg_r32(eth, MTK_REG_MTK_INT_ENABLE);</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA)</div><div class='del'>-		enabled |= mtk_r32(eth, MTK_QMTK_INT_ENABLE);</div><div class='del'>-</div><div class='del'>-	return enabled;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mtk_hw_set_macaddr(struct mtk_mac *mac,</div><div class='del'>-				      unsigned char *macaddr)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mac-&gt;hw-&gt;page_lock, flags);</div><div class='del'>-	mtk_w32(mac-&gt;hw, (macaddr[0] &lt;&lt; 8) | macaddr[1], MTK_GDMA1_MAC_ADRH);</div><div class='del'>-	mtk_w32(mac-&gt;hw, (macaddr[2] &lt;&lt; 24) | (macaddr[3] &lt;&lt; 16) |</div><div class='del'>-		(macaddr[4] &lt;&lt; 8) | macaddr[5],</div><div class='del'>-		MTK_GDMA1_MAC_ADRL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mac-&gt;hw-&gt;page_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_set_mac_address(struct net_device *dev, void *p)</div><div class='del'>-{</div><div class='del'>-	int ret = eth_mac_addr(dev, p);</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;set_mac)</div><div class='del'>-		eth-&gt;soc-&gt;set_mac(mac, dev-&gt;dev_addr);</div><div class='del'>-	else</div><div class='del'>-		mtk_hw_set_macaddr(mac, p);</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 mtk_max_frag_size(int mtu)</div><div class='del'>-{</div><div class='del'>-	/* make sure buf_size will be at least MAX_RX_LENGTH */</div><div class='del'>-	if (mtu + MTK_RX_ETH_HLEN &lt; MAX_RX_LENGTH)</div><div class='del'>-		mtu = MAX_RX_LENGTH - MTK_RX_ETH_HLEN;</div><div class='del'>-</div><div class='del'>-	return SKB_DATA_ALIGN(MTK_RX_HLEN + mtu) +</div><div class='del'>-		SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mtk_max_buf_size(int frag_size)</div><div class='del'>-{</div><div class='del'>-	int buf_size = frag_size - NET_SKB_PAD - NET_IP_ALIGN -</div><div class='del'>-		       SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-</div><div class='del'>-	WARN_ON(buf_size &lt; MAX_RX_LENGTH);</div><div class='del'>-</div><div class='del'>-	return buf_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mtk_get_rxd(struct mtk_rx_dma *rxd,</div><div class='del'>-			       struct mtk_rx_dma *dma_rxd)</div><div class='del'>-{</div><div class='del'>-	rxd-&gt;rxd1 = READ_ONCE(dma_rxd-&gt;rxd1);</div><div class='del'>-	rxd-&gt;rxd2 = READ_ONCE(dma_rxd-&gt;rxd2);</div><div class='del'>-	rxd-&gt;rxd3 = READ_ONCE(dma_rxd-&gt;rxd3);</div><div class='del'>-	rxd-&gt;rxd4 = READ_ONCE(dma_rxd-&gt;rxd4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mtk_set_txd_pdma(struct mtk_tx_dma *txd,</div><div class='del'>-				    struct mtk_tx_dma *dma_txd)</div><div class='del'>-{</div><div class='del'>-	WRITE_ONCE(dma_txd-&gt;txd1, txd-&gt;txd1);</div><div class='del'>-	WRITE_ONCE(dma_txd-&gt;txd3, txd-&gt;txd3);</div><div class='del'>-	WRITE_ONCE(dma_txd-&gt;txd4, txd-&gt;txd4);</div><div class='del'>-	/* clean dma done flag last */</div><div class='del'>-	WRITE_ONCE(dma_txd-&gt;txd2, txd-&gt;txd2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_clean_rx(struct mtk_eth *eth, struct mtk_rx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;rx_data &amp;&amp; ring-&gt;rx_dma) {</div><div class='del'>-		for (i = 0; i &lt; ring-&gt;rx_ring_size; i++) {</div><div class='del'>-			if (!ring-&gt;rx_data[i])</div><div class='del'>-				continue;</div><div class='del'>-			if (!ring-&gt;rx_dma[i].rxd1)</div><div class='del'>-				continue;</div><div class='del'>-			dma_unmap_single(eth-&gt;dev,</div><div class='del'>-					 ring-&gt;rx_dma[i].rxd1,</div><div class='del'>-					 ring-&gt;rx_buf_size,</div><div class='del'>-					 DMA_FROM_DEVICE);</div><div class='del'>-			skb_free_frag(ring-&gt;rx_data[i]);</div><div class='del'>-		}</div><div class='del'>-		kfree(ring-&gt;rx_data);</div><div class='del'>-		ring-&gt;rx_data = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;rx_dma) {</div><div class='del'>-		dma_free_coherent(eth-&gt;dev,</div><div class='del'>-				  ring-&gt;rx_ring_size * sizeof(*ring-&gt;rx_dma),</div><div class='del'>-				  ring-&gt;rx_dma,</div><div class='del'>-				  ring-&gt;rx_phys);</div><div class='del'>-		ring-&gt;rx_dma = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_dma_rx_alloc(struct mtk_eth *eth, struct mtk_rx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	int i, pad = 0;</div><div class='del'>-</div><div class='del'>-	ring-&gt;frag_size = mtk_max_frag_size(ETH_DATA_LEN);</div><div class='del'>-	ring-&gt;rx_buf_size = mtk_max_buf_size(ring-&gt;frag_size);</div><div class='del'>-	ring-&gt;rx_ring_size = eth-&gt;soc-&gt;dma_ring_size;</div><div class='del'>-	ring-&gt;rx_data = kcalloc(ring-&gt;rx_ring_size, sizeof(*ring-&gt;rx_data),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!ring-&gt;rx_data)</div><div class='del'>-		goto no_rx_mem;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ring-&gt;rx_ring_size; i++) {</div><div class='del'>-		ring-&gt;rx_data[i] = netdev_alloc_frag(ring-&gt;frag_size);</div><div class='del'>-		if (!ring-&gt;rx_data[i])</div><div class='del'>-			goto no_rx_mem;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ring-&gt;rx_dma =</div><div class='del'>-		dma_alloc_coherent(eth-&gt;dev,</div><div class='del'>-				   ring-&gt;rx_ring_size * sizeof(*ring-&gt;rx_dma),</div><div class='del'>-				   &amp;ring-&gt;rx_phys, GFP_ATOMIC | __GFP_ZERO);</div><div class='del'>-	if (!ring-&gt;rx_dma)</div><div class='del'>-		goto no_rx_mem;</div><div class='del'>-</div><div class='del'>-	if (!eth-&gt;soc-&gt;rx_2b_offset)</div><div class='del'>-		pad = NET_IP_ALIGN;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ring-&gt;rx_ring_size; i++) {</div><div class='del'>-		dma_addr_t dma_addr = dma_map_single(eth-&gt;dev,</div><div class='del'>-				ring-&gt;rx_data[i] + NET_SKB_PAD + pad,</div><div class='del'>-				ring-&gt;rx_buf_size,</div><div class='del'>-				DMA_FROM_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(eth-&gt;dev, dma_addr)))</div><div class='del'>-			goto no_rx_mem;</div><div class='del'>-		ring-&gt;rx_dma[i].rxd1 = (unsigned int)dma_addr;</div><div class='del'>-</div><div class='del'>-		if (eth-&gt;soc-&gt;rx_sg_dma)</div><div class='del'>-			ring-&gt;rx_dma[i].rxd2 = RX_DMA_PLEN0(ring-&gt;rx_buf_size);</div><div class='del'>-		else</div><div class='del'>-			ring-&gt;rx_dma[i].rxd2 = RX_DMA_LSO;</div><div class='del'>-	}</div><div class='del'>-	ring-&gt;rx_calc_idx = ring-&gt;rx_ring_size - 1;</div><div class='del'>-	/* make sure that all changes to the dma ring are flushed before we</div><div class='del'>-	 * continue</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-no_rx_mem:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_txd_unmap(struct device *dev, struct mtk_tx_buf *tx_buf)</div><div class='del'>-{</div><div class='del'>-	if (tx_buf-&gt;flags &amp; MTK_TX_FLAGS_SINGLE0) {</div><div class='del'>-		dma_unmap_single(dev,</div><div class='del'>-				 dma_unmap_addr(tx_buf, dma_addr0),</div><div class='del'>-				 dma_unmap_len(tx_buf, dma_len0),</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	} else if (tx_buf-&gt;flags &amp; MTK_TX_FLAGS_PAGE0) {</div><div class='del'>-		dma_unmap_page(dev,</div><div class='del'>-			       dma_unmap_addr(tx_buf, dma_addr0),</div><div class='del'>-			       dma_unmap_len(tx_buf, dma_len0),</div><div class='del'>-			       DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-	if (tx_buf-&gt;flags &amp; MTK_TX_FLAGS_PAGE1)</div><div class='del'>-		dma_unmap_page(dev,</div><div class='del'>-			       dma_unmap_addr(tx_buf, dma_addr1),</div><div class='del'>-			       dma_unmap_len(tx_buf, dma_len1),</div><div class='del'>-			       DMA_TO_DEVICE);</div><div class='del'>-</div><div class='del'>-	tx_buf-&gt;flags = 0;</div><div class='del'>-	if (tx_buf-&gt;skb &amp;&amp; (tx_buf-&gt;skb != (struct sk_buff *)DMA_DUMMY_DESC))</div><div class='del'>-		dev_kfree_skb_any(tx_buf-&gt;skb);</div><div class='del'>-	tx_buf-&gt;skb = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_pdma_tx_clean(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;tx_buf) {</div><div class='del'>-		for (i = 0; i &lt; ring-&gt;tx_ring_size; i++)</div><div class='del'>-			mtk_txd_unmap(eth-&gt;dev, &amp;ring-&gt;tx_buf[i]);</div><div class='del'>-		kfree(ring-&gt;tx_buf);</div><div class='del'>-		ring-&gt;tx_buf = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;tx_dma) {</div><div class='del'>-		dma_free_coherent(eth-&gt;dev,</div><div class='del'>-				  ring-&gt;tx_ring_size * sizeof(*ring-&gt;tx_dma),</div><div class='del'>-				  ring-&gt;tx_dma,</div><div class='del'>-				  ring-&gt;tx_phys);</div><div class='del'>-		ring-&gt;tx_dma = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_qdma_tx_clean(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;tx_buf) {</div><div class='del'>-		for (i = 0; i &lt; ring-&gt;tx_ring_size; i++)</div><div class='del'>-			mtk_txd_unmap(eth-&gt;dev, &amp;ring-&gt;tx_buf[i]);</div><div class='del'>-		kfree(ring-&gt;tx_buf);</div><div class='del'>-		ring-&gt;tx_buf = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;tx_dma) {</div><div class='del'>-		dma_free_coherent(eth-&gt;dev,</div><div class='del'>-				  ring-&gt;tx_ring_size * sizeof(*ring-&gt;tx_dma),</div><div class='del'>-				  ring-&gt;tx_dma,</div><div class='del'>-				  ring-&gt;tx_phys);</div><div class='del'>-		ring-&gt;tx_dma = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mtk_stats_update_mac(struct mtk_mac *mac)</div><div class='del'>-{</div><div class='del'>-	struct mtk_hw_stats *hw_stats = mac-&gt;hw_stats;</div><div class='del'>-	unsigned int base = mtk_reg_table[MTK_REG_MTK_COUNTER_BASE];</div><div class='del'>-	u64 stats;</div><div class='del'>-</div><div class='del'>-	base += hw_stats-&gt;reg_offset;</div><div class='del'>-</div><div class='del'>-	u64_stats_update_begin(&amp;hw_stats-&gt;syncp);</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;hw-&gt;soc-&gt;new_stats) {</div><div class='del'>-		hw_stats-&gt;rx_bytes += mtk_r32(mac-&gt;hw, base);</div><div class='del'>-		stats =  mtk_r32(mac-&gt;hw, base + 0x04);</div><div class='del'>-		if (stats)</div><div class='del'>-			hw_stats-&gt;rx_bytes += (stats &lt;&lt; 32);</div><div class='del'>-		hw_stats-&gt;rx_packets += mtk_r32(mac-&gt;hw, base + 0x08);</div><div class='del'>-		hw_stats-&gt;rx_overflow += mtk_r32(mac-&gt;hw, base + 0x10);</div><div class='del'>-		hw_stats-&gt;rx_fcs_errors += mtk_r32(mac-&gt;hw, base + 0x14);</div><div class='del'>-		hw_stats-&gt;rx_short_errors += mtk_r32(mac-&gt;hw, base + 0x18);</div><div class='del'>-		hw_stats-&gt;rx_long_errors += mtk_r32(mac-&gt;hw, base + 0x1c);</div><div class='del'>-		hw_stats-&gt;rx_checksum_errors += mtk_r32(mac-&gt;hw, base + 0x20);</div><div class='del'>-		hw_stats-&gt;rx_flow_control_packets +=</div><div class='del'>-						mtk_r32(mac-&gt;hw, base + 0x24);</div><div class='del'>-		hw_stats-&gt;tx_skip += mtk_r32(mac-&gt;hw, base + 0x28);</div><div class='del'>-		hw_stats-&gt;tx_collisions += mtk_r32(mac-&gt;hw, base + 0x2c);</div><div class='del'>-		hw_stats-&gt;tx_bytes += mtk_r32(mac-&gt;hw, base + 0x30);</div><div class='del'>-		stats =  mtk_r32(mac-&gt;hw, base + 0x34);</div><div class='del'>-		if (stats)</div><div class='del'>-			hw_stats-&gt;tx_bytes += (stats &lt;&lt; 32);</div><div class='del'>-		hw_stats-&gt;tx_packets += mtk_r32(mac-&gt;hw, base + 0x38);</div><div class='del'>-	} else {</div><div class='del'>-		hw_stats-&gt;tx_bytes += mtk_r32(mac-&gt;hw, base);</div><div class='del'>-		hw_stats-&gt;tx_packets += mtk_r32(mac-&gt;hw, base + 0x04);</div><div class='del'>-		hw_stats-&gt;tx_skip += mtk_r32(mac-&gt;hw, base + 0x08);</div><div class='del'>-		hw_stats-&gt;tx_collisions += mtk_r32(mac-&gt;hw, base + 0x0c);</div><div class='del'>-		hw_stats-&gt;rx_bytes += mtk_r32(mac-&gt;hw, base + 0x20);</div><div class='del'>-		hw_stats-&gt;rx_packets += mtk_r32(mac-&gt;hw, base + 0x24);</div><div class='del'>-		hw_stats-&gt;rx_overflow += mtk_r32(mac-&gt;hw, base + 0x28);</div><div class='del'>-		hw_stats-&gt;rx_fcs_errors += mtk_r32(mac-&gt;hw, base + 0x2c);</div><div class='del'>-		hw_stats-&gt;rx_short_errors += mtk_r32(mac-&gt;hw, base + 0x30);</div><div class='del'>-		hw_stats-&gt;rx_long_errors += mtk_r32(mac-&gt;hw, base + 0x34);</div><div class='del'>-		hw_stats-&gt;rx_checksum_errors += mtk_r32(mac-&gt;hw, base + 0x38);</div><div class='del'>-		hw_stats-&gt;rx_flow_control_packets +=</div><div class='del'>-						mtk_r32(mac-&gt;hw, base + 0x3c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	u64_stats_update_end(&amp;hw_stats-&gt;syncp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_get_stats64(struct net_device *dev,</div><div class='del'>-			    struct rtnl_link_stats64 *storage)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_hw_stats *hw_stats = mac-&gt;hw_stats;</div><div class='del'>-	unsigned int base = mtk_reg_table[MTK_REG_MTK_COUNTER_BASE];</div><div class='del'>-	unsigned int start;</div><div class='del'>-</div><div class='del'>-	if (!base) {</div><div class='del'>-		netdev_stats_to_stats64(storage, &amp;dev-&gt;stats);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev) &amp;&amp; netif_device_present(dev)) {</div><div class='del'>-		if (spin_trylock(&amp;hw_stats-&gt;stats_lock)) {</div><div class='del'>-			mtk_stats_update_mac(mac);</div><div class='del'>-			spin_unlock(&amp;hw_stats-&gt;stats_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;hw_stats-&gt;syncp);</div><div class='del'>-		storage-&gt;rx_packets = hw_stats-&gt;rx_packets;</div><div class='del'>-		storage-&gt;tx_packets = hw_stats-&gt;tx_packets;</div><div class='del'>-		storage-&gt;rx_bytes = hw_stats-&gt;rx_bytes;</div><div class='del'>-		storage-&gt;tx_bytes = hw_stats-&gt;tx_bytes;</div><div class='del'>-		storage-&gt;collisions = hw_stats-&gt;tx_collisions;</div><div class='del'>-		storage-&gt;rx_length_errors = hw_stats-&gt;rx_short_errors +</div><div class='del'>-			hw_stats-&gt;rx_long_errors;</div><div class='del'>-		storage-&gt;rx_over_errors = hw_stats-&gt;rx_overflow;</div><div class='del'>-		storage-&gt;rx_crc_errors = hw_stats-&gt;rx_fcs_errors;</div><div class='del'>-		storage-&gt;rx_errors = hw_stats-&gt;rx_checksum_errors;</div><div class='del'>-		storage-&gt;tx_aborted_errors = hw_stats-&gt;tx_skip;</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;hw_stats-&gt;syncp, start));</div><div class='del'>-</div><div class='del'>-	storage-&gt;tx_errors = dev-&gt;stats.tx_errors;</div><div class='del'>-	storage-&gt;rx_dropped = dev-&gt;stats.rx_dropped;</div><div class='del'>-	storage-&gt;tx_dropped = dev-&gt;stats.tx_dropped;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_vlan_rx_add_vid(struct net_device *dev,</div><div class='del'>-			       __be16 proto, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	u32 idx = (vid &amp; 0xf);</div><div class='del'>-	u32 vlan_cfg;</div><div class='del'>-</div><div class='del'>-	if (!((mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE]) &amp;&amp;</div><div class='del'>-	      (dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (test_bit(idx, &amp;eth-&gt;vlan_map)) {</div><div class='del'>-		netdev_warn(dev, "disable tx vlan offload\n");</div><div class='del'>-		dev-&gt;wanted_features &amp;= ~NETIF_F_HW_VLAN_CTAG_TX;</div><div class='del'>-		netdev_update_features(dev);</div><div class='del'>-	} else {</div><div class='del'>-		vlan_cfg = mtk_r32(eth,</div><div class='del'>-				   mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE] +</div><div class='del'>-				   ((idx &gt;&gt; 1) &lt;&lt; 2));</div><div class='del'>-		if (idx &amp; 0x1) {</div><div class='del'>-			vlan_cfg &amp;= 0xffff;</div><div class='del'>-			vlan_cfg |= (vid &lt;&lt; 16);</div><div class='del'>-		} else {</div><div class='del'>-			vlan_cfg &amp;= 0xffff0000;</div><div class='del'>-			vlan_cfg |= vid;</div><div class='del'>-		}</div><div class='del'>-		mtk_w32(eth,</div><div class='del'>-			vlan_cfg, mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE] +</div><div class='del'>-			((idx &gt;&gt; 1) &lt;&lt; 2));</div><div class='del'>-		set_bit(idx, &amp;eth-&gt;vlan_map);</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 mtk_vlan_rx_kill_vid(struct net_device *dev,</div><div class='del'>-				__be16 proto, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	u32 idx = (vid &amp; 0xf);</div><div class='del'>-</div><div class='del'>-	if (!((mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE]) &amp;&amp;</div><div class='del'>-	      (dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	clear_bit(idx, &amp;eth-&gt;vlan_map);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 mtk_pdma_empty_txd(struct mtk_tx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	barrier();</div><div class='del'>-	return (u32)(ring-&gt;tx_ring_size -</div><div class='del'>-		     ((ring-&gt;tx_next_idx - ring-&gt;tx_free_idx) &amp;</div><div class='del'>-		      (ring-&gt;tx_ring_size - 1)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_skb_padto(struct sk_buff *skb, struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(skb-&gt;len &gt;= VLAN_ETH_ZLEN))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;padding_64b &amp;&amp; !eth-&gt;soc-&gt;padding_bug)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (skb_vlan_tag_present(skb))</div><div class='del'>-		len = ETH_ZLEN;</div><div class='del'>-	else if (skb-&gt;protocol == cpu_to_be16(ETH_P_8021Q))</div><div class='del'>-		len = VLAN_ETH_ZLEN;</div><div class='del'>-	else if (!eth-&gt;soc-&gt;padding_64b)</div><div class='del'>-		len = ETH_ZLEN;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &gt;= len)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = skb_pad(skb, len - skb-&gt;len);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	skb-&gt;len = len;</div><div class='del'>-	skb_set_tail_pointer(skb, len);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_pdma_tx_map(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			   int tx_num, struct mtk_tx_ring *ring, bool gso)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	struct skb_frag_struct *frag;</div><div class='del'>-	struct mtk_tx_dma txd, *ptxd;</div><div class='del'>-	struct mtk_tx_buf *tx_buf;</div><div class='del'>-	int i, j, k, frag_size, frag_map_size, offset;</div><div class='del'>-	dma_addr_t mapped_addr;</div><div class='del'>-	unsigned int nr_frags;</div><div class='del'>-	u32 def_txd4;</div><div class='del'>-</div><div class='del'>-	if (mtk_skb_padto(skb, eth)) {</div><div class='del'>-		netif_warn(eth, tx_err, dev, "tx padding failed!\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_buf = &amp;ring-&gt;tx_buf[ring-&gt;tx_next_idx];</div><div class='del'>-	memset(tx_buf, 0, sizeof(*tx_buf));</div><div class='del'>-	memset(&amp;txd, 0, sizeof(txd));</div><div class='del'>-	nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-</div><div class='del'>-	/* init tx descriptor */</div><div class='del'>-	def_txd4 = eth-&gt;soc-&gt;txd4;</div><div class='del'>-	txd.txd4 = def_txd4;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;mac_count &gt; 1)</div><div class='del'>-		txd.txd4 |= (mac-&gt;id + 1) &lt;&lt; TX_DMA_FPORT_SHIFT;</div><div class='del'>-</div><div class='del'>-	if (gso)</div><div class='del'>-		txd.txd4 |= TX_DMA_TSO;</div><div class='del'>-</div><div class='del'>-	/* TX Checksum offload */</div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='del'>-		txd.txd4 |= TX_DMA_CHKSUM;</div><div class='del'>-</div><div class='del'>-	/* VLAN header offload */</div><div class='del'>-	if (skb_vlan_tag_present(skb)) {</div><div class='del'>-		u16 tag = skb_vlan_tag_get(skb);</div><div class='del'>-</div><div class='del'>-		txd.txd4 |= TX_DMA_INS_VLAN |</div><div class='del'>-			((tag &gt;&gt; VLAN_PRIO_SHIFT) &lt;&lt; 4) |</div><div class='del'>-			(tag &amp; 0xF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mapped_addr = dma_map_single(&amp;dev-&gt;dev, skb-&gt;data,</div><div class='del'>-				     skb_headlen(skb), DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(&amp;dev-&gt;dev, mapped_addr)))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	txd.txd1 = mapped_addr;</div><div class='del'>-	txd.txd2 = TX_DMA_PLEN0(skb_headlen(skb));</div><div class='del'>-</div><div class='del'>-	tx_buf-&gt;flags |= MTK_TX_FLAGS_SINGLE0;</div><div class='del'>-	dma_unmap_addr_set(tx_buf, dma_addr0, mapped_addr);</div><div class='del'>-	dma_unmap_len_set(tx_buf, dma_len0, skb_headlen(skb));</div><div class='del'>-</div><div class='del'>-	/* TX SG offload */</div><div class='del'>-	j = ring-&gt;tx_next_idx;</div><div class='del'>-	k = 0;</div><div class='del'>-	for (i = 0; i &lt; nr_frags; i++) {</div><div class='del'>-		offset = 0;</div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='del'>-		frag_size = skb_frag_size(frag);</div><div class='del'>-</div><div class='del'>-		while (frag_size &gt; 0) {</div><div class='del'>-			frag_map_size = min(frag_size, TX_DMA_BUF_LEN);</div><div class='del'>-			mapped_addr = skb_frag_dma_map(&amp;dev-&gt;dev, frag, offset,</div><div class='del'>-						       frag_map_size,</div><div class='del'>-						       DMA_TO_DEVICE);</div><div class='del'>-			if (unlikely(dma_mapping_error(&amp;dev-&gt;dev, mapped_addr)))</div><div class='del'>-				goto err_dma;</div><div class='del'>-</div><div class='del'>-			if (k &amp; 0x1) {</div><div class='del'>-				j = NEXT_TX_DESP_IDX(j);</div><div class='del'>-				txd.txd1 = mapped_addr;</div><div class='del'>-				txd.txd2 = TX_DMA_PLEN0(frag_map_size);</div><div class='del'>-				txd.txd4 = def_txd4;</div><div class='del'>-</div><div class='del'>-				tx_buf = &amp;ring-&gt;tx_buf[j];</div><div class='del'>-				memset(tx_buf, 0, sizeof(*tx_buf));</div><div class='del'>-</div><div class='del'>-				tx_buf-&gt;flags |= MTK_TX_FLAGS_PAGE0;</div><div class='del'>-				dma_unmap_addr_set(tx_buf, dma_addr0,</div><div class='del'>-						   mapped_addr);</div><div class='del'>-				dma_unmap_len_set(tx_buf, dma_len0,</div><div class='del'>-						  frag_map_size);</div><div class='del'>-			} else {</div><div class='del'>-				txd.txd3 = mapped_addr;</div><div class='del'>-				txd.txd2 |= TX_DMA_PLEN1(frag_map_size);</div><div class='del'>-</div><div class='del'>-				tx_buf-&gt;skb = (struct sk_buff *)DMA_DUMMY_DESC;</div><div class='del'>-				tx_buf-&gt;flags |= MTK_TX_FLAGS_PAGE1;</div><div class='del'>-				dma_unmap_addr_set(tx_buf, dma_addr1,</div><div class='del'>-						   mapped_addr);</div><div class='del'>-				dma_unmap_len_set(tx_buf, dma_len1,</div><div class='del'>-						  frag_map_size);</div><div class='del'>-</div><div class='del'>-				if (!((i == (nr_frags - 1)) &amp;&amp;</div><div class='del'>-				      (frag_map_size == frag_size))) {</div><div class='del'>-					mtk_set_txd_pdma(&amp;txd,</div><div class='del'>-							 &amp;ring-&gt;tx_dma[j]);</div><div class='del'>-					memset(&amp;txd, 0, sizeof(txd));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			frag_size -= frag_map_size;</div><div class='del'>-			offset += frag_map_size;</div><div class='del'>-			k++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set last segment */</div><div class='del'>-	if (k &amp; 0x1)</div><div class='del'>-		txd.txd2 |= TX_DMA_LS1;</div><div class='del'>-	else</div><div class='del'>-		txd.txd2 |= TX_DMA_LS0;</div><div class='del'>-	mtk_set_txd_pdma(&amp;txd, &amp;ring-&gt;tx_dma[j]);</div><div class='del'>-</div><div class='del'>-	/* store skb to cleanup */</div><div class='del'>-	tx_buf-&gt;skb = skb;</div><div class='del'>-</div><div class='del'>-	netdev_sent_queue(dev, skb-&gt;len);</div><div class='del'>-	skb_tx_timestamp(skb);</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_next_idx = NEXT_TX_DESP_IDX(j);</div><div class='del'>-	/* make sure that all changes to the dma ring are flushed before we</div><div class='del'>-	 * continue</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-	atomic_set(&amp;ring-&gt;tx_free_count, mtk_pdma_empty_txd(ring));</div><div class='del'>-</div><div class='del'>-	if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)) || !skb-&gt;xmit_more)</div><div class='del'>-		mtk_reg_w32(eth, ring-&gt;tx_next_idx, MTK_REG_TX_CTX_IDX0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_dma:</div><div class='del'>-	j = ring-&gt;tx_next_idx;</div><div class='del'>-	for (i = 0; i &lt; tx_num; i++) {</div><div class='del'>-		ptxd = &amp;ring-&gt;tx_dma[j];</div><div class='del'>-		tx_buf = &amp;ring-&gt;tx_buf[j];</div><div class='del'>-</div><div class='del'>-		/* unmap dma */</div><div class='del'>-		mtk_txd_unmap(&amp;dev-&gt;dev, tx_buf);</div><div class='del'>-</div><div class='del'>-		ptxd-&gt;txd2 = TX_DMA_DESP2_DEF;</div><div class='del'>-		j = NEXT_TX_DESP_IDX(j);</div><div class='del'>-	}</div><div class='del'>-	/* make sure that all changes to the dma ring are flushed before we</div><div class='del'>-	 * continue</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the qdma core needs scratch memory to be setup */</div><div class='del'>-static int mtk_init_fq_dma(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	dma_addr_t dma_addr, phy_ring_head, phy_ring_tail;</div><div class='del'>-	int cnt = eth-&gt;soc-&gt;dma_ring_size;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	eth-&gt;scratch_ring = dma_alloc_coherent(eth-&gt;dev,</div><div class='del'>-					       cnt * sizeof(struct mtk_tx_dma),</div><div class='del'>-					       &amp;phy_ring_head,</div><div class='del'>-					       GFP_ATOMIC | __GFP_ZERO);</div><div class='del'>-	if (unlikely(!eth-&gt;scratch_ring))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	eth-&gt;scratch_head = kcalloc(cnt, QDMA_PAGE_SIZE,</div><div class='del'>-				    GFP_KERNEL);</div><div class='del'>-	dma_addr = dma_map_single(eth-&gt;dev,</div><div class='del'>-				  eth-&gt;scratch_head, cnt * QDMA_PAGE_SIZE,</div><div class='del'>-				  DMA_FROM_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(eth-&gt;dev, dma_addr)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memset(eth-&gt;scratch_ring, 0x0, sizeof(struct mtk_tx_dma) * cnt);</div><div class='del'>-	phy_ring_tail = phy_ring_head + (sizeof(struct mtk_tx_dma) * (cnt - 1));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cnt; i++) {</div><div class='del'>-		eth-&gt;scratch_ring[i].txd1 = (dma_addr + (i * QDMA_PAGE_SIZE));</div><div class='del'>-		if (i &lt; cnt - 1)</div><div class='del'>-			eth-&gt;scratch_ring[i].txd2 = (phy_ring_head +</div><div class='del'>-				((i + 1) * sizeof(struct mtk_tx_dma)));</div><div class='del'>-		eth-&gt;scratch_ring[i].txd3 = TX_QDMA_SDL(QDMA_PAGE_SIZE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mtk_w32(eth, phy_ring_head, MTK_QDMA_FQ_HEAD);</div><div class='del'>-	mtk_w32(eth, phy_ring_tail, MTK_QDMA_FQ_TAIL);</div><div class='del'>-	mtk_w32(eth, (cnt &lt;&lt; 16) | cnt, MTK_QDMA_FQ_CNT);</div><div class='del'>-	mtk_w32(eth, QDMA_PAGE_SIZE &lt;&lt; 16, MTK_QDMA_FQ_BLEN);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *mtk_qdma_phys_to_virt(struct mtk_tx_ring *ring, u32 desc)</div><div class='del'>-{</div><div class='del'>-	void *ret = ring-&gt;tx_dma;</div><div class='del'>-</div><div class='del'>-	return ret + (desc - ring-&gt;tx_phys);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mtk_tx_dma *mtk_tx_next_qdma(struct mtk_tx_ring *ring,</div><div class='del'>-					   struct mtk_tx_dma *txd)</div><div class='del'>-{</div><div class='del'>-	return mtk_qdma_phys_to_virt(ring, txd-&gt;txd2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mtk_tx_buf *mtk_desc_to_tx_buf(struct mtk_tx_ring *ring,</div><div class='del'>-					     struct mtk_tx_dma *txd)</div><div class='del'>-{</div><div class='del'>-	int idx = txd - ring-&gt;tx_dma;</div><div class='del'>-</div><div class='del'>-	return &amp;ring-&gt;tx_buf[idx];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_qdma_tx_map(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-			   int tx_num, struct mtk_tx_ring *ring, bool gso)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	struct mtk_tx_dma *itxd, *txd;</div><div class='del'>-	struct mtk_tx_buf *tx_buf;</div><div class='del'>-	dma_addr_t mapped_addr;</div><div class='del'>-	unsigned int nr_frags;</div><div class='del'>-	int i, n_desc = 1;</div><div class='del'>-	u32 txd4 = eth-&gt;soc-&gt;txd4;</div><div class='del'>-</div><div class='del'>-	itxd = ring-&gt;tx_next_free;</div><div class='del'>-	if (itxd == ring-&gt;tx_last_free)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;mac_count &gt; 1)</div><div class='del'>-		txd4 |= (mac-&gt;id + 1) &lt;&lt; TX_DMA_FPORT_SHIFT;</div><div class='del'>-</div><div class='del'>-	tx_buf = mtk_desc_to_tx_buf(ring, itxd);</div><div class='del'>-	memset(tx_buf, 0, sizeof(*tx_buf));</div><div class='del'>-</div><div class='del'>-	if (gso)</div><div class='del'>-		txd4 |= TX_DMA_TSO;</div><div class='del'>-</div><div class='del'>-	/* TX Checksum offload */</div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='del'>-		txd4 |= TX_DMA_CHKSUM;</div><div class='del'>-</div><div class='del'>-	/* VLAN header offload */</div><div class='del'>-	if (skb_vlan_tag_present(skb))</div><div class='del'>-		txd4 |= TX_DMA_INS_VLAN_MT7621 | skb_vlan_tag_get(skb);</div><div class='del'>-</div><div class='del'>-	mapped_addr = dma_map_single(&amp;dev-&gt;dev, skb-&gt;data,</div><div class='del'>-				     skb_headlen(skb), DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(&amp;dev-&gt;dev, mapped_addr)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	WRITE_ONCE(itxd-&gt;txd1, mapped_addr);</div><div class='del'>-	tx_buf-&gt;flags |= MTK_TX_FLAGS_SINGLE0;</div><div class='del'>-	dma_unmap_addr_set(tx_buf, dma_addr0, mapped_addr);</div><div class='del'>-	dma_unmap_len_set(tx_buf, dma_len0, skb_headlen(skb));</div><div class='del'>-</div><div class='del'>-	/* TX SG offload */</div><div class='del'>-	txd = itxd;</div><div class='del'>-	nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	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='del'>-		unsigned int offset = 0;</div><div class='del'>-		int frag_size = skb_frag_size(frag);</div><div class='del'>-</div><div class='del'>-		while (frag_size) {</div><div class='del'>-			bool last_frag = false;</div><div class='del'>-			unsigned int frag_map_size;</div><div class='del'>-</div><div class='del'>-			txd = mtk_tx_next_qdma(ring, txd);</div><div class='del'>-			if (txd == ring-&gt;tx_last_free)</div><div class='del'>-				goto err_dma;</div><div class='del'>-</div><div class='del'>-			n_desc++;</div><div class='del'>-			frag_map_size = min(frag_size, TX_DMA_BUF_LEN);</div><div class='del'>-			mapped_addr = skb_frag_dma_map(&amp;dev-&gt;dev, frag, offset,</div><div class='del'>-						       frag_map_size,</div><div class='del'>-						       DMA_TO_DEVICE);</div><div class='del'>-			if (unlikely(dma_mapping_error(&amp;dev-&gt;dev, mapped_addr)))</div><div class='del'>-				goto err_dma;</div><div class='del'>-</div><div class='del'>-			if (i == nr_frags - 1 &amp;&amp;</div><div class='del'>-			    (frag_size - frag_map_size) == 0)</div><div class='del'>-				last_frag = true;</div><div class='del'>-</div><div class='del'>-			WRITE_ONCE(txd-&gt;txd1, mapped_addr);</div><div class='del'>-			WRITE_ONCE(txd-&gt;txd3, (QDMA_TX_SWC |</div><div class='del'>-					       TX_DMA_PLEN0(frag_map_size) |</div><div class='del'>-					       last_frag * TX_DMA_LS0) |</div><div class='del'>-					       mac-&gt;id);</div><div class='del'>-			WRITE_ONCE(txd-&gt;txd4, 0);</div><div class='del'>-</div><div class='del'>-			tx_buf-&gt;skb = (struct sk_buff *)DMA_DUMMY_DESC;</div><div class='del'>-			tx_buf = mtk_desc_to_tx_buf(ring, txd);</div><div class='del'>-			memset(tx_buf, 0, sizeof(*tx_buf));</div><div class='del'>-</div><div class='del'>-			tx_buf-&gt;flags |= MTK_TX_FLAGS_PAGE0;</div><div class='del'>-			dma_unmap_addr_set(tx_buf, dma_addr0, mapped_addr);</div><div class='del'>-			dma_unmap_len_set(tx_buf, dma_len0, frag_map_size);</div><div class='del'>-			frag_size -= frag_map_size;</div><div class='del'>-			offset += frag_map_size;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* store skb to cleanup */</div><div class='del'>-	tx_buf-&gt;skb = skb;</div><div class='del'>-</div><div class='del'>-	WRITE_ONCE(itxd-&gt;txd4, txd4);</div><div class='del'>-	WRITE_ONCE(itxd-&gt;txd3, (QDMA_TX_SWC | TX_DMA_PLEN0(skb_headlen(skb)) |</div><div class='del'>-				(!nr_frags * TX_DMA_LS0)));</div><div class='del'>-</div><div class='del'>-	netdev_sent_queue(dev, skb-&gt;len);</div><div class='del'>-	skb_tx_timestamp(skb);</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_next_free = mtk_tx_next_qdma(ring, txd);</div><div class='del'>-	atomic_sub(n_desc, &amp;ring-&gt;tx_free_count);</div><div class='del'>-</div><div class='del'>-	/* make sure that all changes to the dma ring are flushed before we</div><div class='del'>-	 * continue</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)) || !skb-&gt;xmit_more)</div><div class='del'>-		mtk_w32(eth, txd-&gt;txd2, MTK_QTX_CTX_PTR);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_dma:</div><div class='del'>-	do {</div><div class='del'>-		tx_buf = mtk_desc_to_tx_buf(ring, txd);</div><div class='del'>-</div><div class='del'>-		/* unmap dma */</div><div class='del'>-		mtk_txd_unmap(&amp;dev-&gt;dev, tx_buf);</div><div class='del'>-</div><div class='del'>-		itxd-&gt;txd3 = TX_DMA_DESP2_DEF;</div><div class='del'>-		itxd = mtk_tx_next_qdma(ring, itxd);</div><div class='del'>-	} while (itxd != txd);</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mtk_cal_txd_req(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int i, nfrags;</div><div class='del'>-	struct skb_frag_struct *frag;</div><div class='del'>-</div><div class='del'>-	nfrags = 1;</div><div class='del'>-	if (skb_is_gso(skb)) {</div><div class='del'>-		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-			frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='del'>-			nfrags += DIV_ROUND_UP(frag-&gt;size, TX_DMA_BUF_LEN);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		nfrags += skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return DIV_ROUND_UP(nfrags, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	int tx_num;</div><div class='del'>-	int len = skb-&gt;len;</div><div class='del'>-	bool gso = false;</div><div class='del'>-</div><div class='del'>-	tx_num = mtk_cal_txd_req(skb);</div><div class='del'>-	if (unlikely(atomic_read(&amp;ring-&gt;tx_free_count) &lt;= tx_num)) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		netif_err(eth, tx_queued, dev,</div><div class='del'>-			  "Tx Ring full when queue awake!\n");</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TSO: fill MSS info in tcp checksum field */</div><div class='del'>-	if (skb_is_gso(skb)) {</div><div class='del'>-		if (skb_cow_head(skb, 0)) {</div><div class='del'>-			netif_warn(eth, tx_err, dev,</div><div class='del'>-				   "GSO expand head fail.\n");</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (skb_shinfo(skb)-&gt;gso_type &amp;</div><div class='del'>-				(SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {</div><div class='del'>-			gso = true;</div><div class='del'>-			tcp_hdr(skb)-&gt;check = htons(skb_shinfo(skb)-&gt;gso_size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ring-&gt;tx_map(skb, dev, tx_num, ring, gso) &lt; 0)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	stats-&gt;tx_packets++;</div><div class='del'>-	stats-&gt;tx_bytes += len;</div><div class='del'>-</div><div class='del'>-	if (unlikely(atomic_read(&amp;ring-&gt;tx_free_count) &lt;= ring-&gt;tx_thresh)) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		smp_mb();</div><div class='del'>-		if (unlikely(atomic_read(&amp;ring-&gt;tx_free_count) &gt;</div><div class='del'>-			     ring-&gt;tx_thresh))</div><div class='del'>-			netif_wake_queue(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'>-drop:</div><div class='del'>-	stats-&gt;tx_dropped++;</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'>-static int mtk_poll_rx(struct napi_struct *napi, int budget,</div><div class='del'>-		       struct mtk_eth *eth, u32 rx_intr)</div><div class='del'>-{</div><div class='del'>-	struct mtk_soc_data *soc = eth-&gt;soc;</div><div class='del'>-	struct mtk_rx_ring *ring = &amp;eth-&gt;rx_ring[0];</div><div class='del'>-	int idx = ring-&gt;rx_calc_idx;</div><div class='del'>-	u32 checksum_bit;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u8 *data, *new_data;</div><div class='del'>-	struct mtk_rx_dma *rxd, trxd;</div><div class='del'>-	int done = 0, pad;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;hw_features &amp; NETIF_F_RXCSUM)</div><div class='del'>-		checksum_bit = soc-&gt;checksum_bit;</div><div class='del'>-	else</div><div class='del'>-		checksum_bit = 0;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;rx_2b_offset)</div><div class='del'>-		pad = 0;</div><div class='del'>-	else</div><div class='del'>-		pad = NET_IP_ALIGN;</div><div class='del'>-</div><div class='del'>-	while (done &lt; budget) {</div><div class='del'>-		struct net_device *netdev;</div><div class='del'>-		unsigned int pktlen;</div><div class='del'>-		dma_addr_t dma_addr;</div><div class='del'>-		int mac = 0;</div><div class='del'>-</div><div class='del'>-		idx = NEXT_RX_DESP_IDX(idx);</div><div class='del'>-		rxd = &amp;ring-&gt;rx_dma[idx];</div><div class='del'>-		data = ring-&gt;rx_data[idx];</div><div class='del'>-</div><div class='del'>-		mtk_get_rxd(&amp;trxd, rxd);</div><div class='del'>-		if (!(trxd.rxd2 &amp; RX_DMA_DONE))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* find out which mac the packet come from. values start at 1 */</div><div class='del'>-		if (eth-&gt;soc-&gt;mac_count &gt; 1) {</div><div class='del'>-			mac = (trxd.rxd4 &gt;&gt; RX_DMA_FPORT_SHIFT) &amp;</div><div class='del'>-			      RX_DMA_FPORT_MASK;</div><div class='del'>-			mac--;</div><div class='del'>-			if (mac &lt; 0 || mac &gt;= eth-&gt;soc-&gt;mac_count)</div><div class='del'>-				goto release_desc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		netdev = eth-&gt;netdev[mac];</div><div class='del'>-</div><div class='del'>-		/* alloc new buffer */</div><div class='del'>-		new_data = napi_alloc_frag(ring-&gt;frag_size);</div><div class='del'>-		if (unlikely(!new_data || !netdev)) {</div><div class='del'>-			netdev-&gt;stats.rx_dropped++;</div><div class='del'>-			goto release_desc;</div><div class='del'>-		}</div><div class='del'>-		dma_addr = dma_map_single(&amp;netdev-&gt;dev,</div><div class='del'>-					  new_data + NET_SKB_PAD + pad,</div><div class='del'>-					  ring-&gt;rx_buf_size,</div><div class='del'>-					  DMA_FROM_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(&amp;netdev-&gt;dev, dma_addr))) {</div><div class='del'>-			skb_free_frag(new_data);</div><div class='del'>-			goto release_desc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* receive data */</div><div class='del'>-		skb = build_skb(data, ring-&gt;frag_size);</div><div class='del'>-		if (unlikely(!skb)) {</div><div class='del'>-			put_page(virt_to_head_page(new_data));</div><div class='del'>-			goto release_desc;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-		dma_unmap_single(&amp;netdev-&gt;dev, trxd.rxd1,</div><div class='del'>-				 ring-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='del'>-		pktlen = RX_DMA_GET_PLEN0(trxd.rxd2);</div><div class='del'>-		skb-&gt;dev = netdev;</div><div class='del'>-		skb_put(skb, pktlen);</div><div class='del'>-		if (trxd.rxd4 &amp; checksum_bit)</div><div class='del'>-			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-		else</div><div class='del'>-			skb_checksum_none_assert(skb);</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='del'>-</div><div class='del'>-		netdev-&gt;stats.rx_packets++;</div><div class='del'>-		netdev-&gt;stats.rx_bytes += pktlen;</div><div class='del'>-</div><div class='del'>-		if (netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX &amp;&amp;</div><div class='del'>-		    RX_DMA_VID(trxd.rxd3))</div><div class='del'>-			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),</div><div class='del'>-					       RX_DMA_VID(trxd.rxd3));</div><div class='del'>-		napi_gro_receive(napi, skb);</div><div class='del'>-</div><div class='del'>-		ring-&gt;rx_data[idx] = new_data;</div><div class='del'>-		rxd-&gt;rxd1 = (unsigned int)dma_addr;</div><div class='del'>-</div><div class='del'>-release_desc:</div><div class='del'>-		if (eth-&gt;soc-&gt;rx_sg_dma)</div><div class='del'>-			rxd-&gt;rxd2 = RX_DMA_PLEN0(ring-&gt;rx_buf_size);</div><div class='del'>-		else</div><div class='del'>-			rxd-&gt;rxd2 = RX_DMA_LSO;</div><div class='del'>-</div><div class='del'>-		ring-&gt;rx_calc_idx = idx;</div><div class='del'>-		/* make sure that all changes to the dma ring are flushed before</div><div class='del'>-		 * we continue</div><div class='del'>-		 */</div><div class='del'>-		wmb();</div><div class='del'>-		if (eth-&gt;soc-&gt;dma_type == MTK_QDMA)</div><div class='del'>-			mtk_w32(eth, ring-&gt;rx_calc_idx, MTK_QRX_CRX_IDX0);</div><div class='del'>-		else</div><div class='del'>-			mtk_reg_w32(eth, ring-&gt;rx_calc_idx,</div><div class='del'>-				    MTK_REG_RX_CALC_IDX0);</div><div class='del'>-		done++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (done &lt; budget)</div><div class='del'>-		mtk_irq_ack(eth, rx_intr);</div><div class='del'>-</div><div class='del'>-	return done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_pdma_tx_poll(struct mtk_eth *eth, int budget, bool *tx_again)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct mtk_tx_buf *tx_buf;</div><div class='del'>-	int done = 0;</div><div class='del'>-	u32 idx, hwidx;</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	unsigned int bytes = 0;</div><div class='del'>-</div><div class='del'>-	idx = ring-&gt;tx_free_idx;</div><div class='del'>-	hwidx = mtk_reg_r32(eth, MTK_REG_TX_DTX_IDX0);</div><div class='del'>-</div><div class='del'>-	while ((idx != hwidx) &amp;&amp; budget) {</div><div class='del'>-		tx_buf = &amp;ring-&gt;tx_buf[idx];</div><div class='del'>-		skb = tx_buf-&gt;skb;</div><div class='del'>-</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (skb != (struct sk_buff *)DMA_DUMMY_DESC) {</div><div class='del'>-			bytes += skb-&gt;len;</div><div class='del'>-			done++;</div><div class='del'>-			budget--;</div><div class='del'>-		}</div><div class='del'>-		mtk_txd_unmap(eth-&gt;dev, tx_buf);</div><div class='del'>-		idx = NEXT_TX_DESP_IDX(idx);</div><div class='del'>-	}</div><div class='del'>-	ring-&gt;tx_free_idx = idx;</div><div class='del'>-	atomic_set(&amp;ring-&gt;tx_free_count, mtk_pdma_empty_txd(ring));</div><div class='del'>-</div><div class='del'>-	/* read hw index again make sure no new tx packet */</div><div class='del'>-	if (idx != hwidx || idx != mtk_reg_r32(eth, MTK_REG_TX_DTX_IDX0))</div><div class='del'>-		*tx_again = 1;</div><div class='del'>-</div><div class='del'>-	if (done)</div><div class='del'>-		netdev_completed_queue(*eth-&gt;netdev, done, bytes);</div><div class='del'>-</div><div class='del'>-	return done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_qdma_tx_poll(struct mtk_eth *eth, int budget, bool *tx_again)</div><div class='del'>-{</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	struct mtk_tx_dma *desc;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct mtk_tx_buf *tx_buf;</div><div class='del'>-	int total = 0, done[MTK_MAX_DEVS];</div><div class='del'>-	unsigned int bytes[MTK_MAX_DEVS];</div><div class='del'>-	u32 cpu, dma;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(done, 0, sizeof(done));</div><div class='del'>-	memset(bytes, 0, sizeof(bytes));</div><div class='del'>-</div><div class='del'>-	cpu = mtk_r32(eth, MTK_QTX_CRX_PTR);</div><div class='del'>-	dma = mtk_r32(eth, MTK_QTX_DRX_PTR);</div><div class='del'>-</div><div class='del'>-	desc = mtk_qdma_phys_to_virt(ring, cpu);</div><div class='del'>-</div><div class='del'>-	while ((cpu != dma) &amp;&amp; budget) {</div><div class='del'>-		u32 next_cpu = desc-&gt;txd2;</div><div class='del'>-		int mac;</div><div class='del'>-</div><div class='del'>-		desc = mtk_tx_next_qdma(ring, desc);</div><div class='del'>-		if ((desc-&gt;txd3 &amp; QDMA_TX_OWNER_CPU) == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		mac = (desc-&gt;txd4 &gt;&gt; TX_DMA_FPORT_SHIFT) &amp;</div><div class='del'>-		       TX_DMA_FPORT_MASK;</div><div class='del'>-		mac--;</div><div class='del'>-</div><div class='del'>-		tx_buf = mtk_desc_to_tx_buf(ring, desc);</div><div class='del'>-		skb = tx_buf-&gt;skb;</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (skb != (struct sk_buff *)DMA_DUMMY_DESC) {</div><div class='del'>-			bytes[mac] += skb-&gt;len;</div><div class='del'>-			done[mac]++;</div><div class='del'>-			budget--;</div><div class='del'>-		}</div><div class='del'>-		mtk_txd_unmap(eth-&gt;dev, tx_buf);</div><div class='del'>-</div><div class='del'>-		ring-&gt;tx_last_free-&gt;txd2 = next_cpu;</div><div class='del'>-		ring-&gt;tx_last_free = desc;</div><div class='del'>-		atomic_inc(&amp;ring-&gt;tx_free_count);</div><div class='del'>-</div><div class='del'>-		cpu = next_cpu;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mtk_w32(eth, cpu, MTK_QTX_CRX_PTR);</div><div class='del'>-</div><div class='del'>-	/* read hw index again make sure no new tx packet */</div><div class='del'>-	if (cpu != dma || cpu != mtk_r32(eth, MTK_QTX_DRX_PTR))</div><div class='del'>-		*tx_again = true;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; eth-&gt;soc-&gt;mac_count; i++) {</div><div class='del'>-		if (!done[i])</div><div class='del'>-			continue;</div><div class='del'>-		netdev_completed_queue(eth-&gt;netdev[i], done[i], bytes[i]);</div><div class='del'>-		total += done[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_poll_tx(struct mtk_eth *eth, int budget, u32 tx_intr,</div><div class='del'>-		       bool *tx_again)</div><div class='del'>-{</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	struct net_device *netdev = eth-&gt;netdev[0];</div><div class='del'>-	int done;</div><div class='del'>-</div><div class='del'>-	done = eth-&gt;tx_ring.tx_poll(eth, budget, tx_again);</div><div class='del'>-	if (!*tx_again)</div><div class='del'>-		mtk_irq_ack(eth, tx_intr);</div><div class='del'>-</div><div class='del'>-	if (!done)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	smp_mb();</div><div class='del'>-	if (unlikely(!netif_queue_stopped(netdev)))</div><div class='del'>-		return done;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;ring-&gt;tx_free_count) &gt; ring-&gt;tx_thresh)</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='del'>-</div><div class='del'>-	return done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_stats_update(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; eth-&gt;soc-&gt;mac_count; i++) {</div><div class='del'>-		if (!eth-&gt;mac[i] || !eth-&gt;mac[i]-&gt;hw_stats)</div><div class='del'>-			continue;</div><div class='del'>-		if (spin_trylock(&amp;eth-&gt;mac[i]-&gt;hw_stats-&gt;stats_lock)) {</div><div class='del'>-			mtk_stats_update_mac(eth-&gt;mac[i]);</div><div class='del'>-			spin_unlock(&amp;eth-&gt;mac[i]-&gt;hw_stats-&gt;stats_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_poll(struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = container_of(napi, struct mtk_eth, rx_napi);</div><div class='del'>-	u32 status, mtk_status, mask, tx_intr, rx_intr, status_intr;</div><div class='del'>-	int tx_done, rx_done;</div><div class='del'>-	bool tx_again = false;</div><div class='del'>-</div><div class='del'>-	status = mtk_irq_pending(eth);</div><div class='del'>-	mtk_status = mtk_irq_pending_status(eth);</div><div class='del'>-	tx_intr = eth-&gt;soc-&gt;tx_int;</div><div class='del'>-	rx_intr = eth-&gt;soc-&gt;rx_int;</div><div class='del'>-	status_intr = eth-&gt;soc-&gt;status_int;</div><div class='del'>-	tx_done = 0;</div><div class='del'>-	rx_done = 0;</div><div class='del'>-	tx_again = 0;</div><div class='del'>-</div><div class='del'>-	if (status &amp; tx_intr)</div><div class='del'>-		tx_done = mtk_poll_tx(eth, budget, tx_intr, &amp;tx_again);</div><div class='del'>-</div><div class='del'>-	if (status &amp; rx_intr)</div><div class='del'>-		rx_done = mtk_poll_rx(napi, budget, eth, rx_intr);</div><div class='del'>-</div><div class='del'>-	if (unlikely(mtk_status &amp; status_intr)) {</div><div class='del'>-		mtk_stats_update(eth);</div><div class='del'>-		mtk_irq_ack_status(eth, status_intr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(netif_msg_intr(eth))) {</div><div class='del'>-		mask = mtk_irq_enabled(eth);</div><div class='del'>-		netdev_info(eth-&gt;netdev[0],</div><div class='del'>-			    "done tx %d, rx %d, intr 0x%08x/0x%x\n",</div><div class='del'>-			    tx_done, rx_done, status, mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx_again || rx_done == budget)</div><div class='del'>-		return budget;</div><div class='del'>-</div><div class='del'>-	status = mtk_irq_pending(eth);</div><div class='del'>-	if (status &amp; (tx_intr | rx_intr))</div><div class='del'>-		return budget;</div><div class='del'>-</div><div class='del'>-	napi_complete(napi);</div><div class='del'>-	mtk_irq_enable(eth, tx_intr | rx_intr);</div><div class='del'>-</div><div class='del'>-	return rx_done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_pdma_tx_alloc(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_ring_size = eth-&gt;soc-&gt;dma_ring_size;</div><div class='del'>-	ring-&gt;tx_free_idx = 0;</div><div class='del'>-	ring-&gt;tx_next_idx = 0;</div><div class='del'>-	ring-&gt;tx_thresh = max((unsigned long)ring-&gt;tx_ring_size &gt;&gt; 2,</div><div class='del'>-			      MAX_SKB_FRAGS);</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_buf = kcalloc(ring-&gt;tx_ring_size, sizeof(*ring-&gt;tx_buf),</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-	if (!ring-&gt;tx_buf)</div><div class='del'>-		goto no_tx_mem;</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_dma =</div><div class='del'>-		dma_alloc_coherent(eth-&gt;dev,</div><div class='del'>-				   ring-&gt;tx_ring_size * sizeof(*ring-&gt;tx_dma),</div><div class='del'>-				   &amp;ring-&gt;tx_phys, GFP_ATOMIC | __GFP_ZERO);</div><div class='del'>-	if (!ring-&gt;tx_dma)</div><div class='del'>-		goto no_tx_mem;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ring-&gt;tx_ring_size; i++) {</div><div class='del'>-		ring-&gt;tx_dma[i].txd2 = TX_DMA_DESP2_DEF;</div><div class='del'>-		ring-&gt;tx_dma[i].txd4 = eth-&gt;soc-&gt;txd4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;ring-&gt;tx_free_count, mtk_pdma_empty_txd(ring));</div><div class='del'>-	ring-&gt;tx_map = mtk_pdma_tx_map;</div><div class='del'>-	ring-&gt;tx_poll = mtk_pdma_tx_poll;</div><div class='del'>-	ring-&gt;tx_clean = mtk_pdma_tx_clean;</div><div class='del'>-</div><div class='del'>-	/* make sure that all changes to the dma ring are flushed before we</div><div class='del'>-	 * continue</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	mtk_reg_w32(eth, ring-&gt;tx_phys, MTK_REG_TX_BASE_PTR0);</div><div class='del'>-	mtk_reg_w32(eth, ring-&gt;tx_ring_size, MTK_REG_TX_MAX_CNT0);</div><div class='del'>-	mtk_reg_w32(eth, 0, MTK_REG_TX_CTX_IDX0);</div><div class='del'>-	mtk_reg_w32(eth, MTK_PST_DTX_IDX0, MTK_REG_PDMA_RST_CFG);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-no_tx_mem:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_qdma_tx_alloc_tx(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-	int i, sz = sizeof(*ring-&gt;tx_dma);</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_ring_size = eth-&gt;soc-&gt;dma_ring_size;</div><div class='del'>-	ring-&gt;tx_buf = kcalloc(ring-&gt;tx_ring_size, sizeof(*ring-&gt;tx_buf),</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-	if (!ring-&gt;tx_buf)</div><div class='del'>-		goto no_tx_mem;</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_dma = dma_alloc_coherent(eth-&gt;dev, ring-&gt;tx_ring_size * sz,</div><div class='del'>-					  &amp;ring-&gt;tx_phys,</div><div class='del'>-					  GFP_ATOMIC | __GFP_ZERO);</div><div class='del'>-	if (!ring-&gt;tx_dma)</div><div class='del'>-		goto no_tx_mem;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ring-&gt;tx_ring_size; i++) {</div><div class='del'>-		int next = (i + 1) % ring-&gt;tx_ring_size;</div><div class='del'>-		u32 next_ptr = ring-&gt;tx_phys + next * sz;</div><div class='del'>-</div><div class='del'>-		ring-&gt;tx_dma[i].txd2 = next_ptr;</div><div class='del'>-		ring-&gt;tx_dma[i].txd3 = TX_DMA_DESP2_DEF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;ring-&gt;tx_free_count, ring-&gt;tx_ring_size - 2);</div><div class='del'>-	ring-&gt;tx_next_free = &amp;ring-&gt;tx_dma[0];</div><div class='del'>-	ring-&gt;tx_last_free = &amp;ring-&gt;tx_dma[ring-&gt;tx_ring_size - 2];</div><div class='del'>-	ring-&gt;tx_thresh = max((unsigned long)ring-&gt;tx_ring_size &gt;&gt; 2,</div><div class='del'>-			      MAX_SKB_FRAGS);</div><div class='del'>-</div><div class='del'>-	ring-&gt;tx_map = mtk_qdma_tx_map;</div><div class='del'>-	ring-&gt;tx_poll = mtk_qdma_tx_poll;</div><div class='del'>-	ring-&gt;tx_clean = mtk_qdma_tx_clean;</div><div class='del'>-</div><div class='del'>-	/* make sure that all changes to the dma ring are flushed before we</div><div class='del'>-	 * continue</div><div class='del'>-	 */</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	mtk_w32(eth, ring-&gt;tx_phys, MTK_QTX_CTX_PTR);</div><div class='del'>-	mtk_w32(eth, ring-&gt;tx_phys, MTK_QTX_DTX_PTR);</div><div class='del'>-	mtk_w32(eth,</div><div class='del'>-		ring-&gt;tx_phys + ((ring-&gt;tx_ring_size - 1) * sz),</div><div class='del'>-		MTK_QTX_CRX_PTR);</div><div class='del'>-	mtk_w32(eth,</div><div class='del'>-		ring-&gt;tx_phys + ((ring-&gt;tx_ring_size - 1) * sz),</div><div class='del'>-		MTK_QTX_DRX_PTR);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-no_tx_mem:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_qdma_init(struct mtk_eth *eth, int ring)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mtk_init_fq_dma(eth);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mtk_qdma_tx_alloc_tx(eth);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mtk_dma_rx_alloc(eth, &amp;eth-&gt;rx_ring[ring]);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mtk_w32(eth, eth-&gt;rx_ring[ring].rx_phys, MTK_QRX_BASE_PTR0);</div><div class='del'>-	mtk_w32(eth, eth-&gt;rx_ring[ring].rx_ring_size, MTK_QRX_MAX_CNT0);</div><div class='del'>-	mtk_w32(eth, eth-&gt;rx_ring[ring].rx_calc_idx, MTK_QRX_CRX_IDX0);</div><div class='del'>-	mtk_w32(eth, MTK_PST_DRX_IDX0, MTK_QDMA_RST_IDX);</div><div class='del'>-	mtk_w32(eth, (QDMA_RES_THRES &lt;&lt; 8) | QDMA_RES_THRES, MTK_QTX_CFG(0));</div><div class='del'>-</div><div class='del'>-	/* Enable random early drop and set drop threshold automatically */</div><div class='del'>-	mtk_w32(eth, 0x174444, MTK_QDMA_FC_THRES);</div><div class='del'>-	mtk_w32(eth, 0x0, MTK_QDMA_HRED2);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_pdma_qdma_init(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	int err = mtk_qdma_init(eth, 1);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mtk_dma_rx_alloc(eth, &amp;eth-&gt;rx_ring[0]);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mtk_reg_w32(eth, eth-&gt;rx_ring[0].rx_phys, MTK_REG_RX_BASE_PTR0);</div><div class='del'>-	mtk_reg_w32(eth, eth-&gt;rx_ring[0].rx_ring_size, MTK_REG_RX_MAX_CNT0);</div><div class='del'>-	mtk_reg_w32(eth, eth-&gt;rx_ring[0].rx_calc_idx, MTK_REG_RX_CALC_IDX0);</div><div class='del'>-	mtk_reg_w32(eth, MTK_PST_DRX_IDX0, MTK_REG_PDMA_RST_CFG);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_pdma_init(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	struct mtk_rx_ring *ring = &amp;eth-&gt;rx_ring[0];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mtk_pdma_tx_alloc(eth);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mtk_dma_rx_alloc(eth, ring);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mtk_reg_w32(eth, ring-&gt;rx_phys, MTK_REG_RX_BASE_PTR0);</div><div class='del'>-	mtk_reg_w32(eth, ring-&gt;rx_ring_size, MTK_REG_RX_MAX_CNT0);</div><div class='del'>-	mtk_reg_w32(eth, ring-&gt;rx_calc_idx, MTK_REG_RX_CALC_IDX0);</div><div class='del'>-	mtk_reg_w32(eth, MTK_PST_DRX_IDX0, MTK_REG_PDMA_RST_CFG);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_dma_free(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; eth-&gt;soc-&gt;mac_count; i++)</div><div class='del'>-		if (eth-&gt;netdev[i])</div><div class='del'>-			netdev_reset_queue(eth-&gt;netdev[i]);</div><div class='del'>-	eth-&gt;tx_ring.tx_clean(eth);</div><div class='del'>-	mtk_clean_rx(eth, &amp;eth-&gt;rx_ring[0]);</div><div class='del'>-	mtk_clean_rx(eth, &amp;eth-&gt;rx_ring[1]);</div><div class='del'>-	kfree(eth-&gt;scratch_head);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_tx_timeout(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	struct mtk_tx_ring *ring = &amp;eth-&gt;tx_ring;</div><div class='del'>-</div><div class='del'>-	eth-&gt;netdev[mac-&gt;id]-&gt;stats.tx_errors++;</div><div class='del'>-	netif_err(eth, tx_err, dev,</div><div class='del'>-		  "transmit timed out\n");</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA) {</div><div class='del'>-		netif_info(eth, drv, dev, "pdma_cfg:%08x\n",</div><div class='del'>-			   mtk_reg_r32(eth, MTK_REG_PDMA_GLO_CFG));</div><div class='del'>-		netif_info(eth, drv, dev,</div><div class='del'>-			   "tx_ring=%d, base=%08x, max=%u, ctx=%u, dtx=%u, fdx=%hu, next=%hu\n",</div><div class='del'>-			   0, mtk_reg_r32(eth, MTK_REG_TX_BASE_PTR0),</div><div class='del'>-			   mtk_reg_r32(eth, MTK_REG_TX_MAX_CNT0),</div><div class='del'>-			   mtk_reg_r32(eth, MTK_REG_TX_CTX_IDX0),</div><div class='del'>-			   mtk_reg_r32(eth, MTK_REG_TX_DTX_IDX0),</div><div class='del'>-			   ring-&gt;tx_free_idx,</div><div class='del'>-			   ring-&gt;tx_next_idx);</div><div class='del'>-	}</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA) {</div><div class='del'>-		netif_info(eth, drv, dev, "qdma_cfg:%08x\n",</div><div class='del'>-			   mtk_r32(eth, MTK_QDMA_GLO_CFG));</div><div class='del'>-		netif_info(eth, drv, dev,</div><div class='del'>-			   "tx_ring=%d, ctx=%08x, dtx=%08x, crx=%08x, drx=%08x, free=%hu\n",</div><div class='del'>-			   0, mtk_r32(eth, MTK_QTX_CTX_PTR),</div><div class='del'>-			   mtk_r32(eth, MTK_QTX_DTX_PTR),</div><div class='del'>-			   mtk_r32(eth, MTK_QTX_CRX_PTR),</div><div class='del'>-			   mtk_r32(eth, MTK_QTX_DRX_PTR),</div><div class='del'>-			   atomic_read(&amp;ring-&gt;tx_free_count));</div><div class='del'>-	}</div><div class='del'>-	netif_info(eth, drv, dev,</div><div class='del'>-		   "rx_ring=%d, base=%08x, max=%u, calc=%u, drx=%u\n",</div><div class='del'>-		   0, mtk_reg_r32(eth, MTK_REG_RX_BASE_PTR0),</div><div class='del'>-		   mtk_reg_r32(eth, MTK_REG_RX_MAX_CNT0),</div><div class='del'>-		   mtk_reg_r32(eth, MTK_REG_RX_CALC_IDX0),</div><div class='del'>-		   mtk_reg_r32(eth, MTK_REG_RX_DRX_IDX0));</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;mac-&gt;pending_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t mtk_handle_irq(int irq, void *_eth)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = _eth;</div><div class='del'>-	u32 status, int_mask;</div><div class='del'>-</div><div class='del'>-	status = mtk_irq_pending(eth);</div><div class='del'>-	if (unlikely(!status))</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	int_mask = (eth-&gt;soc-&gt;rx_int | eth-&gt;soc-&gt;tx_int);</div><div class='del'>-	if (likely(status &amp; int_mask)) {</div><div class='del'>-		if (likely(napi_schedule_prep(&amp;eth-&gt;rx_napi)))</div><div class='del'>-			__napi_schedule(&amp;eth-&gt;rx_napi);</div><div class='del'>-	} else {</div><div class='del'>-		mtk_irq_ack(eth, status);</div><div class='del'>-	}</div><div class='del'>-	mtk_irq_disable(eth, int_mask);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-static void mtk_poll_controller(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	u32 int_mask = eth-&gt;soc-&gt;tx_int | eth-&gt;soc-&gt;rx_int;</div><div class='del'>-</div><div class='del'>-	mtk_irq_disable(eth, int_mask);</div><div class='del'>-	mtk_handle_irq(dev-&gt;irq, dev);</div><div class='del'>-	mtk_irq_enable(eth, int_mask);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int mtk_set_clock_cycle(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	unsigned long sysclk = eth-&gt;sysclk;</div><div class='del'>-</div><div class='del'>-	sysclk /= MTK_US_CYC_CNT_DIVISOR;</div><div class='del'>-	sysclk &lt;&lt;= MTK_US_CYC_CNT_SHIFT;</div><div class='del'>-</div><div class='del'>-	mtk_w32(eth, (mtk_r32(eth, MTK_GLO_CFG) &amp;</div><div class='del'>-			~(MTK_US_CYC_CNT_MASK &lt;&lt; MTK_US_CYC_CNT_SHIFT)) |</div><div class='del'>-			sysclk,</div><div class='del'>-			MTK_GLO_CFG);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mtk_fwd_config(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	u32 fwd_cfg;</div><div class='del'>-</div><div class='del'>-	fwd_cfg = mtk_r32(eth, MTK_GDMA1_FWD_CFG);</div><div class='del'>-</div><div class='del'>-	/* disable jumbo frame */</div><div class='del'>-	if (eth-&gt;soc-&gt;jumbo_frame)</div><div class='del'>-		fwd_cfg &amp;= ~MTK_GDM1_JMB_EN;</div><div class='del'>-</div><div class='del'>-	/* set unicast/multicast/broadcast frame to cpu */</div><div class='del'>-	fwd_cfg &amp;= ~0xffff;</div><div class='del'>-</div><div class='del'>-	mtk_w32(eth, fwd_cfg, MTK_GDMA1_FWD_CFG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mtk_csum_config(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	if (eth-&gt;soc-&gt;hw_features &amp; NETIF_F_RXCSUM)</div><div class='del'>-		mtk_w32(eth, mtk_r32(eth, MTK_GDMA1_FWD_CFG) |</div><div class='del'>-			(MTK_GDM1_ICS_EN | MTK_GDM1_TCS_EN | MTK_GDM1_UCS_EN),</div><div class='del'>-			MTK_GDMA1_FWD_CFG);</div><div class='del'>-	else</div><div class='del'>-		mtk_w32(eth, mtk_r32(eth, MTK_GDMA1_FWD_CFG) &amp;</div><div class='del'>-			~(MTK_GDM1_ICS_EN | MTK_GDM1_TCS_EN | MTK_GDM1_UCS_EN),</div><div class='del'>-			MTK_GDMA1_FWD_CFG);</div><div class='del'>-	if (eth-&gt;soc-&gt;hw_features &amp; NETIF_F_IP_CSUM)</div><div class='del'>-		mtk_w32(eth, mtk_r32(eth, MTK_CDMA_CSG_CFG) |</div><div class='del'>-			(MTK_ICS_GEN_EN | MTK_TCS_GEN_EN | MTK_UCS_GEN_EN),</div><div class='del'>-			MTK_CDMA_CSG_CFG);</div><div class='del'>-	else</div><div class='del'>-		mtk_w32(eth, mtk_r32(eth, MTK_CDMA_CSG_CFG) &amp;</div><div class='del'>-			~(MTK_ICS_GEN_EN | MTK_TCS_GEN_EN | MTK_UCS_GEN_EN),</div><div class='del'>-			MTK_CDMA_CSG_CFG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_start_dma(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type == MTK_PDMA)</div><div class='del'>-		err = mtk_pdma_init(eth);</div><div class='del'>-	else if (eth-&gt;soc-&gt;dma_type == MTK_QDMA)</div><div class='del'>-		err = mtk_qdma_init(eth, 0);</div><div class='del'>-	else</div><div class='del'>-		err = mtk_pdma_qdma_init(eth);</div><div class='del'>-	if (err) {</div><div class='del'>-		mtk_dma_free(eth);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;eth-&gt;page_lock, flags);</div><div class='del'>-</div><div class='del'>-	val = MTK_TX_WB_DDONE | MTK_RX_DMA_EN | MTK_TX_DMA_EN;</div><div class='del'>-	if (eth-&gt;soc-&gt;rx_2b_offset)</div><div class='del'>-		val |= MTK_RX_2B_OFFSET;</div><div class='del'>-	val |= eth-&gt;soc-&gt;pdma_glo_cfg;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA)</div><div class='del'>-		mtk_reg_w32(eth, val, MTK_REG_PDMA_GLO_CFG);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA)</div><div class='del'>-		mtk_w32(eth, val, MTK_QDMA_GLO_CFG);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;eth-&gt;page_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-</div><div class='del'>-	dma_coerce_mask_and_coherent(&amp;dev-&gt;dev, DMA_BIT_MASK(32));</div><div class='del'>-</div><div class='del'>-	if (!atomic_read(&amp;eth-&gt;dma_refcnt)) {</div><div class='del'>-		int err = mtk_start_dma(eth);</div><div class='del'>-</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		napi_enable(&amp;eth-&gt;rx_napi);</div><div class='del'>-		mtk_irq_enable(eth, eth-&gt;soc-&gt;tx_int | eth-&gt;soc-&gt;rx_int);</div><div class='del'>-	}</div><div class='del'>-	atomic_inc(&amp;eth-&gt;dma_refcnt);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;phy)</div><div class='del'>-		eth-&gt;phy-&gt;start(mac);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;has_carrier &amp;&amp; eth-&gt;soc-&gt;has_carrier(eth))</div><div class='del'>-		netif_carrier_on(dev);</div><div class='del'>-</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-	eth-&gt;soc-&gt;fwd_config(eth);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_stop_dma(struct mtk_eth *eth, u32 glo_cfg)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 val;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* stop the dma enfine */</div><div class='del'>-	spin_lock_irqsave(&amp;eth-&gt;page_lock, flags);</div><div class='del'>-	val = mtk_r32(eth, glo_cfg);</div><div class='del'>-	mtk_w32(eth, val &amp; ~(MTK_TX_WB_DDONE | MTK_RX_DMA_EN | MTK_TX_DMA_EN),</div><div class='del'>-		glo_cfg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;eth-&gt;page_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* wait for dma stop */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		val = mtk_r32(eth, glo_cfg);</div><div class='del'>-		if (val &amp; (MTK_TX_DMA_BUSY | MTK_RX_DMA_BUSY)) {</div><div class='del'>-			msleep(20);</div><div class='del'>-			continue;</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 int mtk_stop(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-</div><div class='del'>-	netif_tx_disable(dev);</div><div class='del'>-	if (eth-&gt;phy)</div><div class='del'>-		eth-&gt;phy-&gt;stop(mac);</div><div class='del'>-</div><div class='del'>-	if (!atomic_dec_and_test(&amp;eth-&gt;dma_refcnt))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mtk_irq_disable(eth, eth-&gt;soc-&gt;tx_int | eth-&gt;soc-&gt;rx_int);</div><div class='del'>-	napi_disable(&amp;eth-&gt;rx_napi);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_PDMA)</div><div class='del'>-		mtk_stop_dma(eth, mtk_reg_table[MTK_REG_PDMA_GLO_CFG]);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA)</div><div class='del'>-		mtk_stop_dma(eth, MTK_QDMA_GLO_CFG);</div><div class='del'>-</div><div class='del'>-	mtk_dma_free(eth);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init mtk_init_hw(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	eth-&gt;soc-&gt;reset_fe(eth);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;switch_init)</div><div class='del'>-		if (eth-&gt;soc-&gt;switch_init(eth)) {</div><div class='del'>-			dev_err(eth-&gt;dev, "failed to initialize switch core\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	err = devm_request_irq(eth-&gt;dev, eth-&gt;irq, mtk_handle_irq, 0,</div><div class='del'>-			       dev_name(eth-&gt;dev), eth);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mtk_mdio_init(eth);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* disable delay and normal interrupt */</div><div class='del'>-	mtk_reg_w32(eth, 0, MTK_REG_DLY_INT_CFG);</div><div class='del'>-	if (eth-&gt;soc-&gt;dma_type &amp; MTK_QDMA)</div><div class='del'>-		mtk_w32(eth, 0, MTK_QDMA_DELAY_INT);</div><div class='del'>-	mtk_irq_disable(eth, eth-&gt;soc-&gt;tx_int | eth-&gt;soc-&gt;rx_int);</div><div class='del'>-</div><div class='del'>-	/* frame engine will push VLAN tag regarding to VIDX field in Tx desc */</div><div class='del'>-	if (mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE])</div><div class='del'>-		for (i = 0; i &lt; 16; i += 2)</div><div class='del'>-			mtk_w32(eth, ((i + 1) &lt;&lt; 16) + i,</div><div class='del'>-				mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE] +</div><div class='del'>-				(i * 2));</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;fwd_config(eth))</div><div class='del'>-		dev_err(eth-&gt;dev, "unable to get clock\n");</div><div class='del'>-</div><div class='del'>-	if (mtk_reg_table[MTK_REG_MTK_RST_GL]) {</div><div class='del'>-		mtk_reg_w32(eth, 1, MTK_REG_MTK_RST_GL);</div><div class='del'>-		mtk_reg_w32(eth, 0, MTK_REG_MTK_RST_GL);</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 __init mtk_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	struct device_node *port;</div><div class='del'>-	const char *mac_addr;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mac_addr = of_get_mac_address(mac-&gt;of_node);</div><div class='del'>-	if (mac_addr)</div><div class='del'>-		ether_addr_copy(dev-&gt;dev_addr, mac_addr);</div><div class='del'>-</div><div class='del'>-	/* If the mac address is invalid, use random mac address  */</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'>-		dev_err(eth-&gt;dev, "generated random MAC address %pM\n",</div><div class='del'>-			dev-&gt;dev_addr);</div><div class='del'>-	}</div><div class='del'>-	mac-&gt;hw-&gt;soc-&gt;set_mac(mac, dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;port_init)</div><div class='del'>-		for_each_child_of_node(mac-&gt;of_node, port)</div><div class='del'>-			if (of_device_is_compatible(port,</div><div class='del'>-						    "mediatek,eth-port") &amp;&amp;</div><div class='del'>-			    of_device_is_available(port))</div><div class='del'>-				eth-&gt;soc-&gt;port_init(eth, mac, port);</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;phy) {</div><div class='del'>-		err = eth-&gt;phy-&gt;connect(mac);</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 mtk_uninit(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;phy)</div><div class='del'>-		eth-&gt;phy-&gt;disconnect(mac);</div><div class='del'>-	mtk_mdio_cleanup(eth);</div><div class='del'>-</div><div class='del'>-	mtk_irq_disable(eth, ~0);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!mac-&gt;phy_dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGMIIPHY:</div><div class='del'>-	case SIOCGMIIREG:</div><div class='del'>-	case SIOCSMIIREG:</div><div class='del'>-		return phy_mii_ioctl(mac-&gt;phy_dev, ifr, cmd);</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_change_mtu(struct net_device *dev, int new_mtu)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = netdev_priv(dev);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	int frag_size, old_mtu;</div><div class='del'>-	u32 fwd_cfg;</div><div class='del'>-</div><div class='del'>-	if (!eth-&gt;soc-&gt;jumbo_frame)</div><div class='del'>-		return eth_change_mtu(dev, new_mtu);</div><div class='del'>-</div><div class='del'>-	frag_size = mtk_max_frag_size(new_mtu);</div><div class='del'>-	if (new_mtu &lt; 68 || frag_size &gt; PAGE_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	old_mtu = dev-&gt;mtu;</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='del'>-</div><div class='del'>-	/* return early if the buffer sizes will not change */</div><div class='del'>-	if (old_mtu &lt;= ETH_DATA_LEN &amp;&amp; new_mtu &lt;= ETH_DATA_LEN)</div><div class='del'>-		return 0;</div><div class='del'>-	if (old_mtu &gt; ETH_DATA_LEN &amp;&amp; new_mtu &gt; ETH_DATA_LEN)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (new_mtu &lt;= ETH_DATA_LEN)</div><div class='del'>-		eth-&gt;rx_ring[0].frag_size = mtk_max_frag_size(ETH_DATA_LEN);</div><div class='del'>-	else</div><div class='del'>-		eth-&gt;rx_ring[0].frag_size = PAGE_SIZE;</div><div class='del'>-	eth-&gt;rx_ring[0].rx_buf_size =</div><div class='del'>-				mtk_max_buf_size(eth-&gt;rx_ring[0].frag_size);</div><div class='del'>-</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mtk_stop(dev);</div><div class='del'>-	fwd_cfg = mtk_r32(eth, MTK_GDMA1_FWD_CFG);</div><div class='del'>-	if (new_mtu &lt;= ETH_DATA_LEN) {</div><div class='del'>-		fwd_cfg &amp;= ~MTK_GDM1_JMB_EN;</div><div class='del'>-	} else {</div><div class='del'>-		fwd_cfg &amp;= ~(MTK_GDM1_JMB_LEN_MASK &lt;&lt; MTK_GDM1_JMB_LEN_SHIFT);</div><div class='del'>-		fwd_cfg |= (DIV_ROUND_UP(frag_size, 1024) &lt;&lt;</div><div class='del'>-				MTK_GDM1_JMB_LEN_SHIFT) | MTK_GDM1_JMB_EN;</div><div class='del'>-	}</div><div class='del'>-	mtk_w32(eth, fwd_cfg, MTK_GDMA1_FWD_CFG);</div><div class='del'>-</div><div class='del'>-	return mtk_open(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtk_pending_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac = container_of(work, struct mtk_mac, pending_work);</div><div class='del'>-	struct mtk_eth *eth = mac-&gt;hw;</div><div class='del'>-	struct net_device *dev = eth-&gt;netdev[mac-&gt;id];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	mtk_stop(dev);</div><div class='del'>-</div><div class='del'>-	err = mtk_open(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		netif_alert(eth, ifup, dev,</div><div class='del'>-			    "Driver up/down cycle failed, closing device.\n");</div><div class='del'>-		dev_close(dev);</div><div class='del'>-	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_cleanup(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; eth-&gt;soc-&gt;mac_count; i++) {</div><div class='del'>-		struct mtk_mac *mac = netdev_priv(eth-&gt;netdev[i]);</div><div class='del'>-</div><div class='del'>-		if (!eth-&gt;netdev[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		unregister_netdev(eth-&gt;netdev[i]);</div><div class='del'>-		free_netdev(eth-&gt;netdev[i]);</div><div class='del'>-		cancel_work_sync(&amp;mac-&gt;pending_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 mtk_netdev_ops = {</div><div class='del'>-	.ndo_init		= mtk_init,</div><div class='del'>-	.ndo_uninit		= mtk_uninit,</div><div class='del'>-	.ndo_open		= mtk_open,</div><div class='del'>-	.ndo_stop		= mtk_stop,</div><div class='del'>-	.ndo_start_xmit		= mtk_start_xmit,</div><div class='del'>-	.ndo_set_mac_address	= mtk_set_mac_address,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= mtk_do_ioctl,</div><div class='del'>-	.ndo_change_mtu		= mtk_change_mtu,</div><div class='del'>-	.ndo_tx_timeout		= mtk_tx_timeout,</div><div class='del'>-	.ndo_get_stats64        = mtk_get_stats64,</div><div class='del'>-	.ndo_vlan_rx_add_vid	= mtk_vlan_rx_add_vid,</div><div class='del'>-	.ndo_vlan_rx_kill_vid	= mtk_vlan_rx_kill_vid,</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	.ndo_poll_controller	= mtk_poll_controller,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	struct mtk_mac *mac;</div><div class='del'>-	const __be32 *_id = of_get_property(np, "reg", NULL);</div><div class='del'>-	int id, err;</div><div class='del'>-</div><div class='del'>-	if (!_id) {</div><div class='del'>-		dev_err(eth-&gt;dev, "missing mac id\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	id = be32_to_cpup(_id);</div><div class='del'>-	if (id &gt;= eth-&gt;soc-&gt;mac_count || eth-&gt;netdev[id]) {</div><div class='del'>-		dev_err(eth-&gt;dev, "%d is not a valid mac id\n", id);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eth-&gt;netdev[id] = alloc_etherdev(sizeof(*mac));</div><div class='del'>-	if (!eth-&gt;netdev[id]) {</div><div class='del'>-		dev_err(eth-&gt;dev, "alloc_etherdev failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	mac = netdev_priv(eth-&gt;netdev[id]);</div><div class='del'>-	eth-&gt;mac[id] = mac;</div><div class='del'>-	mac-&gt;id = id;</div><div class='del'>-	mac-&gt;hw = eth;</div><div class='del'>-	mac-&gt;of_node = np;</div><div class='del'>-	INIT_WORK(&amp;mac-&gt;pending_work, mtk_pending_work);</div><div class='del'>-</div><div class='del'>-	if (mtk_reg_table[MTK_REG_MTK_COUNTER_BASE]) {</div><div class='del'>-		mac-&gt;hw_stats = devm_kzalloc(eth-&gt;dev,</div><div class='del'>-					     sizeof(*mac-&gt;hw_stats),</div><div class='del'>-					     GFP_KERNEL);</div><div class='del'>-		if (!mac-&gt;hw_stats) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto free_netdev;</div><div class='del'>-		}</div><div class='del'>-		spin_lock_init(&amp;mac-&gt;hw_stats-&gt;stats_lock);</div><div class='del'>-		mac-&gt;hw_stats-&gt;reg_offset = id * MTK_STAT_OFFSET;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(eth-&gt;netdev[id], eth-&gt;dev);</div><div class='del'>-	eth-&gt;netdev[id]-&gt;netdev_ops = &amp;mtk_netdev_ops;</div><div class='del'>-	eth-&gt;netdev[id]-&gt;base_addr = (unsigned long)eth-&gt;base;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;init_data)</div><div class='del'>-		eth-&gt;soc-&gt;init_data(eth-&gt;soc, eth-&gt;netdev[id]);</div><div class='del'>-</div><div class='del'>-	eth-&gt;netdev[id]-&gt;vlan_features = eth-&gt;soc-&gt;hw_features &amp;</div><div class='del'>-		~(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);</div><div class='del'>-	eth-&gt;netdev[id]-&gt;features |= eth-&gt;soc-&gt;hw_features;</div><div class='del'>-</div><div class='del'>-	if (mtk_reg_table[MTK_REG_MTK_DMA_VID_BASE])</div><div class='del'>-		eth-&gt;netdev[id]-&gt;features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='del'>-</div><div class='del'>-	mtk_set_ethtool_ops(eth-&gt;netdev[id]);</div><div class='del'>-</div><div class='del'>-	err = register_netdev(eth-&gt;netdev[id]);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(eth-&gt;dev, "error bringing up device\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto free_netdev;</div><div class='del'>-	}</div><div class='del'>-	eth-&gt;netdev[id]-&gt;irq = eth-&gt;irq;</div><div class='del'>-	netif_info(eth, probe, eth-&gt;netdev[id],</div><div class='del'>-		   "mediatek frame engine at 0x%08lx, irq %d\n",</div><div class='del'>-		   eth-&gt;netdev[id]-&gt;base_addr, eth-&gt;netdev[id]-&gt;irq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-free_netdev:</div><div class='del'>-	free_netdev(eth-&gt;netdev[id]);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	const struct of_device_id *match;</div><div class='del'>-	struct device_node *mac_np;</div><div class='del'>-	struct mtk_soc_data *soc;</div><div class='del'>-	struct mtk_eth *eth;</div><div class='del'>-	struct clk *sysclk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	device_reset(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	match = of_match_device(of_mtk_match, &amp;pdev-&gt;dev);</div><div class='del'>-	soc = (struct mtk_soc_data *)match-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (soc-&gt;reg_table)</div><div class='del'>-		mtk_reg_table = soc-&gt;reg_table;</div><div class='del'>-</div><div class='del'>-	eth = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*eth), GFP_KERNEL);</div><div class='del'>-	if (!eth)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	eth-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(eth-&gt;base))</div><div class='del'>-		return PTR_ERR(eth-&gt;base);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;eth-&gt;page_lock);</div><div class='del'>-</div><div class='del'>-	eth-&gt;ethsys = syscon_regmap_lookup_by_phandle(pdev-&gt;dev.of_node,</div><div class='del'>-						      "mediatek,ethsys");</div><div class='del'>-	if (IS_ERR(eth-&gt;ethsys))</div><div class='del'>-		return PTR_ERR(eth-&gt;ethsys);</div><div class='del'>-</div><div class='del'>-	eth-&gt;irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (eth-&gt;irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no IRQ resource found\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sysclk = devm_clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(sysclk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"the clock is not defined in the devicetree\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	eth-&gt;sysclk = clk_get_rate(sysclk);</div><div class='del'>-</div><div class='del'>-	eth-&gt;switch_np = of_parse_phandle(pdev-&gt;dev.of_node,</div><div class='del'>-					  "mediatek,switch", 0);</div><div class='del'>-	if (soc-&gt;has_switch &amp;&amp; !eth-&gt;switch_np) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to read switch phandle\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eth-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	eth-&gt;soc = soc;</div><div class='del'>-	eth-&gt;msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE);</div><div class='del'>-</div><div class='del'>-	err = mtk_init_hw(eth);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (eth-&gt;soc-&gt;mac_count &gt; 1) {</div><div class='del'>-		for_each_child_of_node(pdev-&gt;dev.of_node, mac_np) {</div><div class='del'>-			if (!of_device_is_compatible(mac_np,</div><div class='del'>-						     "mediatek,eth-mac"))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!of_device_is_available(mac_np))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			err = mtk_add_mac(eth, mac_np);</div><div class='del'>-			if (err)</div><div class='del'>-				goto err_free_dev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		init_dummy_netdev(&amp;eth-&gt;dummy_dev);</div><div class='del'>-		netif_napi_add(&amp;eth-&gt;dummy_dev, &amp;eth-&gt;rx_napi, mtk_poll,</div><div class='del'>-			       soc-&gt;napi_weight);</div><div class='del'>-	} else {</div><div class='del'>-		err = mtk_add_mac(eth, pdev-&gt;dev.of_node);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_free_dev;</div><div class='del'>-		netif_napi_add(eth-&gt;netdev[0], &amp;eth-&gt;rx_napi, mtk_poll,</div><div class='del'>-			       soc-&gt;napi_weight);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, eth);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_dev:</div><div class='del'>-	mtk_cleanup(eth);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mtk_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct mtk_eth *eth = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	netif_napi_del(&amp;eth-&gt;rx_napi);</div><div class='del'>-	mtk_cleanup(eth);</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</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 mtk_driver = {</div><div class='del'>-	.probe = mtk_probe,</div><div class='del'>-	.remove = mtk_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "mtk_soc_eth",</div><div class='del'>-		.of_match_table = of_mtk_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver(mtk_driver);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("John Crispin &lt;blogic@openwrt.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Ethernet driver for MediaTek SoC");</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.h b/drivers/staging/mt7621-eth/mtk_eth_soc.h<br/>deleted file mode 100644<br/>index e6ed80433f49..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/mtk_eth_soc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/mtk_eth_soc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,716 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef MTK_ETH_H</div><div class='del'>-#define MTK_ETH_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mii.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.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/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-</div><div class='del'>-/* these registers have different offsets depending on the SoC. we use a lookup</div><div class='del'>- * table for these</div><div class='del'>- */</div><div class='del'>-enum mtk_reg {</div><div class='del'>-	MTK_REG_PDMA_GLO_CFG = 0,</div><div class='del'>-	MTK_REG_PDMA_RST_CFG,</div><div class='del'>-	MTK_REG_DLY_INT_CFG,</div><div class='del'>-	MTK_REG_TX_BASE_PTR0,</div><div class='del'>-	MTK_REG_TX_MAX_CNT0,</div><div class='del'>-	MTK_REG_TX_CTX_IDX0,</div><div class='del'>-	MTK_REG_TX_DTX_IDX0,</div><div class='del'>-	MTK_REG_RX_BASE_PTR0,</div><div class='del'>-	MTK_REG_RX_MAX_CNT0,</div><div class='del'>-	MTK_REG_RX_CALC_IDX0,</div><div class='del'>-	MTK_REG_RX_DRX_IDX0,</div><div class='del'>-	MTK_REG_MTK_INT_ENABLE,</div><div class='del'>-	MTK_REG_MTK_INT_STATUS,</div><div class='del'>-	MTK_REG_MTK_DMA_VID_BASE,</div><div class='del'>-	MTK_REG_MTK_COUNTER_BASE,</div><div class='del'>-	MTK_REG_MTK_RST_GL,</div><div class='del'>-	MTK_REG_MTK_INT_STATUS2,</div><div class='del'>-	MTK_REG_COUNT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* delayed interrupt bits */</div><div class='del'>-#define MTK_DELAY_EN_INT	0x80</div><div class='del'>-#define MTK_DELAY_MAX_INT	0x04</div><div class='del'>-#define MTK_DELAY_MAX_TOUT	0x04</div><div class='del'>-#define MTK_DELAY_TIME		20</div><div class='del'>-#define MTK_DELAY_CHAN		(((MTK_DELAY_EN_INT | MTK_DELAY_MAX_INT) &lt;&lt; 8) \</div><div class='del'>-				 | MTK_DELAY_MAX_TOUT)</div><div class='del'>-#define MTK_DELAY_INIT		((MTK_DELAY_CHAN &lt;&lt; 16) | MTK_DELAY_CHAN)</div><div class='del'>-#define MTK_PSE_FQFC_CFG_INIT	0x80504000</div><div class='del'>-#define MTK_PSE_FQFC_CFG_256Q	0xff908000</div><div class='del'>-</div><div class='del'>-/* interrupt bits */</div><div class='del'>-#define MTK_CNT_PPE_AF		BIT(31)</div><div class='del'>-#define MTK_CNT_GDM_AF		BIT(29)</div><div class='del'>-#define MTK_PSE_P2_FC		BIT(26)</div><div class='del'>-#define MTK_PSE_BUF_DROP	BIT(24)</div><div class='del'>-#define MTK_GDM_OTHER_DROP	BIT(23)</div><div class='del'>-#define MTK_PSE_P1_FC		BIT(22)</div><div class='del'>-#define MTK_PSE_P0_FC		BIT(21)</div><div class='del'>-#define MTK_PSE_FQ_EMPTY	BIT(20)</div><div class='del'>-#define MTK_GE1_STA_CHG		BIT(18)</div><div class='del'>-#define MTK_TX_COHERENT		BIT(17)</div><div class='del'>-#define MTK_RX_COHERENT		BIT(16)</div><div class='del'>-#define MTK_TX_DONE_INT3	BIT(11)</div><div class='del'>-#define MTK_TX_DONE_INT2	BIT(10)</div><div class='del'>-#define MTK_TX_DONE_INT1	BIT(9)</div><div class='del'>-#define MTK_TX_DONE_INT0	BIT(8)</div><div class='del'>-#define MTK_RX_DONE_INT0	BIT(2)</div><div class='del'>-#define MTK_TX_DLY_INT		BIT(1)</div><div class='del'>-#define MTK_RX_DLY_INT		BIT(0)</div><div class='del'>-</div><div class='del'>-#define MTK_RX_DONE_INT		MTK_RX_DONE_INT0</div><div class='del'>-#define MTK_TX_DONE_INT		(MTK_TX_DONE_INT0 | MTK_TX_DONE_INT1 | \</div><div class='del'>-				 MTK_TX_DONE_INT2 | MTK_TX_DONE_INT3)</div><div class='del'>-</div><div class='del'>-#define RT5350_RX_DLY_INT	BIT(30)</div><div class='del'>-#define RT5350_TX_DLY_INT	BIT(28)</div><div class='del'>-#define RT5350_RX_DONE_INT1	BIT(17)</div><div class='del'>-#define RT5350_RX_DONE_INT0	BIT(16)</div><div class='del'>-#define RT5350_TX_DONE_INT3	BIT(3)</div><div class='del'>-#define RT5350_TX_DONE_INT2	BIT(2)</div><div class='del'>-#define RT5350_TX_DONE_INT1	BIT(1)</div><div class='del'>-#define RT5350_TX_DONE_INT0	BIT(0)</div><div class='del'>-</div><div class='del'>-#define RT5350_RX_DONE_INT	(RT5350_RX_DONE_INT0 | RT5350_RX_DONE_INT1)</div><div class='del'>-#define RT5350_TX_DONE_INT	(RT5350_TX_DONE_INT0 | RT5350_TX_DONE_INT1 | \</div><div class='del'>-				 RT5350_TX_DONE_INT2 | RT5350_TX_DONE_INT3)</div><div class='del'>-</div><div class='del'>-/* registers */</div><div class='del'>-#define MTK_GDMA_OFFSET		0x0020</div><div class='del'>-#define MTK_PSE_OFFSET		0x0040</div><div class='del'>-#define MTK_GDMA2_OFFSET	0x0060</div><div class='del'>-#define MTK_CDMA_OFFSET		0x0080</div><div class='del'>-#define MTK_DMA_VID0		0x00a8</div><div class='del'>-#define MTK_PDMA_OFFSET		0x0100</div><div class='del'>-#define MTK_PPE_OFFSET		0x0200</div><div class='del'>-#define MTK_CMTABLE_OFFSET	0x0400</div><div class='del'>-#define MTK_POLICYTABLE_OFFSET	0x1000</div><div class='del'>-</div><div class='del'>-#define MT7621_GDMA_OFFSET	0x0500</div><div class='del'>-#define MT7620_GDMA_OFFSET	0x0600</div><div class='del'>-</div><div class='del'>-#define RT5350_PDMA_OFFSET	0x0800</div><div class='del'>-#define RT5350_SDM_OFFSET	0x0c00</div><div class='del'>-</div><div class='del'>-#define MTK_MDIO_ACCESS		0x00</div><div class='del'>-#define MTK_MDIO_CFG		0x04</div><div class='del'>-#define MTK_GLO_CFG		0x08</div><div class='del'>-#define MTK_RST_GL		0x0C</div><div class='del'>-#define MTK_INT_STATUS		0x10</div><div class='del'>-#define MTK_INT_ENABLE		0x14</div><div class='del'>-#define MTK_MDIO_CFG2		0x18</div><div class='del'>-#define MTK_FOC_TS_T		0x1C</div><div class='del'>-</div><div class='del'>-#define	MTK_GDMA1_FWD_CFG	(MTK_GDMA_OFFSET + 0x00)</div><div class='del'>-#define MTK_GDMA1_SCH_CFG	(MTK_GDMA_OFFSET + 0x04)</div><div class='del'>-#define MTK_GDMA1_SHPR_CFG	(MTK_GDMA_OFFSET + 0x08)</div><div class='del'>-#define MTK_GDMA1_MAC_ADRL	(MTK_GDMA_OFFSET + 0x0C)</div><div class='del'>-#define MTK_GDMA1_MAC_ADRH	(MTK_GDMA_OFFSET + 0x10)</div><div class='del'>-</div><div class='del'>-#define	MTK_GDMA2_FWD_CFG	(MTK_GDMA2_OFFSET + 0x00)</div><div class='del'>-#define MTK_GDMA2_SCH_CFG	(MTK_GDMA2_OFFSET + 0x04)</div><div class='del'>-#define MTK_GDMA2_SHPR_CFG	(MTK_GDMA2_OFFSET + 0x08)</div><div class='del'>-#define MTK_GDMA2_MAC_ADRL	(MTK_GDMA2_OFFSET + 0x0C)</div><div class='del'>-#define MTK_GDMA2_MAC_ADRH	(MTK_GDMA2_OFFSET + 0x10)</div><div class='del'>-</div><div class='del'>-#define MTK_PSE_FQ_CFG		(MTK_PSE_OFFSET + 0x00)</div><div class='del'>-#define MTK_CDMA_FC_CFG		(MTK_PSE_OFFSET + 0x04)</div><div class='del'>-#define MTK_GDMA1_FC_CFG	(MTK_PSE_OFFSET + 0x08)</div><div class='del'>-#define MTK_GDMA2_FC_CFG	(MTK_PSE_OFFSET + 0x0C)</div><div class='del'>-</div><div class='del'>-#define MTK_CDMA_CSG_CFG	(MTK_CDMA_OFFSET + 0x00)</div><div class='del'>-#define MTK_CDMA_SCH_CFG	(MTK_CDMA_OFFSET + 0x04)</div><div class='del'>-</div><div class='del'>-#define	MT7621_GDMA_FWD_CFG(x)	(MT7621_GDMA_OFFSET + (x * 0x1000))</div><div class='del'>-</div><div class='del'>-/* FIXME this might be different for different SOCs */</div><div class='del'>-#define	MT7620_GDMA1_FWD_CFG	(MT7621_GDMA_OFFSET + 0x00)</div><div class='del'>-</div><div class='del'>-#define RT5350_TX_BASE_PTR0	(RT5350_PDMA_OFFSET + 0x00)</div><div class='del'>-#define RT5350_TX_MAX_CNT0	(RT5350_PDMA_OFFSET + 0x04)</div><div class='del'>-#define RT5350_TX_CTX_IDX0	(RT5350_PDMA_OFFSET + 0x08)</div><div class='del'>-#define RT5350_TX_DTX_IDX0	(RT5350_PDMA_OFFSET + 0x0C)</div><div class='del'>-#define RT5350_TX_BASE_PTR1	(RT5350_PDMA_OFFSET + 0x10)</div><div class='del'>-#define RT5350_TX_MAX_CNT1	(RT5350_PDMA_OFFSET + 0x14)</div><div class='del'>-#define RT5350_TX_CTX_IDX1	(RT5350_PDMA_OFFSET + 0x18)</div><div class='del'>-#define RT5350_TX_DTX_IDX1	(RT5350_PDMA_OFFSET + 0x1C)</div><div class='del'>-#define RT5350_TX_BASE_PTR2	(RT5350_PDMA_OFFSET + 0x20)</div><div class='del'>-#define RT5350_TX_MAX_CNT2	(RT5350_PDMA_OFFSET + 0x24)</div><div class='del'>-#define RT5350_TX_CTX_IDX2	(RT5350_PDMA_OFFSET + 0x28)</div><div class='del'>-#define RT5350_TX_DTX_IDX2	(RT5350_PDMA_OFFSET + 0x2C)</div><div class='del'>-#define RT5350_TX_BASE_PTR3	(RT5350_PDMA_OFFSET + 0x30)</div><div class='del'>-#define RT5350_TX_MAX_CNT3	(RT5350_PDMA_OFFSET + 0x34)</div><div class='del'>-#define RT5350_TX_CTX_IDX3	(RT5350_PDMA_OFFSET + 0x38)</div><div class='del'>-#define RT5350_TX_DTX_IDX3	(RT5350_PDMA_OFFSET + 0x3C)</div><div class='del'>-#define RT5350_RX_BASE_PTR0	(RT5350_PDMA_OFFSET + 0x100)</div><div class='del'>-#define RT5350_RX_MAX_CNT0	(RT5350_PDMA_OFFSET + 0x104)</div><div class='del'>-#define RT5350_RX_CALC_IDX0	(RT5350_PDMA_OFFSET + 0x108)</div><div class='del'>-#define RT5350_RX_DRX_IDX0	(RT5350_PDMA_OFFSET + 0x10C)</div><div class='del'>-#define RT5350_RX_BASE_PTR1	(RT5350_PDMA_OFFSET + 0x110)</div><div class='del'>-#define RT5350_RX_MAX_CNT1	(RT5350_PDMA_OFFSET + 0x114)</div><div class='del'>-#define RT5350_RX_CALC_IDX1	(RT5350_PDMA_OFFSET + 0x118)</div><div class='del'>-#define RT5350_RX_DRX_IDX1	(RT5350_PDMA_OFFSET + 0x11C)</div><div class='del'>-#define RT5350_PDMA_GLO_CFG	(RT5350_PDMA_OFFSET + 0x204)</div><div class='del'>-#define RT5350_PDMA_RST_CFG	(RT5350_PDMA_OFFSET + 0x208)</div><div class='del'>-#define RT5350_DLY_INT_CFG	(RT5350_PDMA_OFFSET + 0x20c)</div><div class='del'>-#define RT5350_MTK_INT_STATUS	(RT5350_PDMA_OFFSET + 0x220)</div><div class='del'>-#define RT5350_MTK_INT_ENABLE	(RT5350_PDMA_OFFSET + 0x228)</div><div class='del'>-#define RT5350_PDMA_SCH_CFG	(RT5350_PDMA_OFFSET + 0x280)</div><div class='del'>-</div><div class='del'>-#define MTK_PDMA_GLO_CFG	(MTK_PDMA_OFFSET + 0x00)</div><div class='del'>-#define MTK_PDMA_RST_CFG	(MTK_PDMA_OFFSET + 0x04)</div><div class='del'>-#define MTK_PDMA_SCH_CFG	(MTK_PDMA_OFFSET + 0x08)</div><div class='del'>-#define MTK_DLY_INT_CFG		(MTK_PDMA_OFFSET + 0x0C)</div><div class='del'>-#define MTK_TX_BASE_PTR0	(MTK_PDMA_OFFSET + 0x10)</div><div class='del'>-#define MTK_TX_MAX_CNT0		(MTK_PDMA_OFFSET + 0x14)</div><div class='del'>-#define MTK_TX_CTX_IDX0		(MTK_PDMA_OFFSET + 0x18)</div><div class='del'>-#define MTK_TX_DTX_IDX0		(MTK_PDMA_OFFSET + 0x1C)</div><div class='del'>-#define MTK_TX_BASE_PTR1	(MTK_PDMA_OFFSET + 0x20)</div><div class='del'>-#define MTK_TX_MAX_CNT1		(MTK_PDMA_OFFSET + 0x24)</div><div class='del'>-#define MTK_TX_CTX_IDX1		(MTK_PDMA_OFFSET + 0x28)</div><div class='del'>-#define MTK_TX_DTX_IDX1		(MTK_PDMA_OFFSET + 0x2C)</div><div class='del'>-#define MTK_RX_BASE_PTR0	(MTK_PDMA_OFFSET + 0x30)</div><div class='del'>-#define MTK_RX_MAX_CNT0		(MTK_PDMA_OFFSET + 0x34)</div><div class='del'>-#define MTK_RX_CALC_IDX0	(MTK_PDMA_OFFSET + 0x38)</div><div class='del'>-#define MTK_RX_DRX_IDX0		(MTK_PDMA_OFFSET + 0x3C)</div><div class='del'>-#define MTK_TX_BASE_PTR2	(MTK_PDMA_OFFSET + 0x40)</div><div class='del'>-#define MTK_TX_MAX_CNT2		(MTK_PDMA_OFFSET + 0x44)</div><div class='del'>-#define MTK_TX_CTX_IDX2		(MTK_PDMA_OFFSET + 0x48)</div><div class='del'>-#define MTK_TX_DTX_IDX2		(MTK_PDMA_OFFSET + 0x4C)</div><div class='del'>-#define MTK_TX_BASE_PTR3	(MTK_PDMA_OFFSET + 0x50)</div><div class='del'>-#define MTK_TX_MAX_CNT3		(MTK_PDMA_OFFSET + 0x54)</div><div class='del'>-#define MTK_TX_CTX_IDX3		(MTK_PDMA_OFFSET + 0x58)</div><div class='del'>-#define MTK_TX_DTX_IDX3		(MTK_PDMA_OFFSET + 0x5C)</div><div class='del'>-#define MTK_RX_BASE_PTR1	(MTK_PDMA_OFFSET + 0x60)</div><div class='del'>-#define MTK_RX_MAX_CNT1		(MTK_PDMA_OFFSET + 0x64)</div><div class='del'>-#define MTK_RX_CALC_IDX1	(MTK_PDMA_OFFSET + 0x68)</div><div class='del'>-#define MTK_RX_DRX_IDX1		(MTK_PDMA_OFFSET + 0x6C)</div><div class='del'>-</div><div class='del'>-/* Switch DMA configuration */</div><div class='del'>-#define RT5350_SDM_CFG		(RT5350_SDM_OFFSET + 0x00)</div><div class='del'>-#define RT5350_SDM_RRING	(RT5350_SDM_OFFSET + 0x04)</div><div class='del'>-#define RT5350_SDM_TRING	(RT5350_SDM_OFFSET + 0x08)</div><div class='del'>-#define RT5350_SDM_MAC_ADRL	(RT5350_SDM_OFFSET + 0x0C)</div><div class='del'>-#define RT5350_SDM_MAC_ADRH	(RT5350_SDM_OFFSET + 0x10)</div><div class='del'>-#define RT5350_SDM_TPCNT	(RT5350_SDM_OFFSET + 0x100)</div><div class='del'>-#define RT5350_SDM_TBCNT	(RT5350_SDM_OFFSET + 0x104)</div><div class='del'>-#define RT5350_SDM_RPCNT	(RT5350_SDM_OFFSET + 0x108)</div><div class='del'>-#define RT5350_SDM_RBCNT	(RT5350_SDM_OFFSET + 0x10C)</div><div class='del'>-#define RT5350_SDM_CS_ERR	(RT5350_SDM_OFFSET + 0x110)</div><div class='del'>-</div><div class='del'>-#define RT5350_SDM_ICS_EN	BIT(16)</div><div class='del'>-#define RT5350_SDM_TCS_EN	BIT(17)</div><div class='del'>-#define RT5350_SDM_UCS_EN	BIT(18)</div><div class='del'>-</div><div class='del'>-/* QDMA registers */</div><div class='del'>-#define MTK_QTX_CFG(x)		(0x1800 + (x * 0x10))</div><div class='del'>-#define MTK_QTX_SCH(x)		(0x1804 + (x * 0x10))</div><div class='del'>-#define MTK_QRX_BASE_PTR0	0x1900</div><div class='del'>-#define MTK_QRX_MAX_CNT0	0x1904</div><div class='del'>-#define MTK_QRX_CRX_IDX0	0x1908</div><div class='del'>-#define MTK_QRX_DRX_IDX0	0x190C</div><div class='del'>-#define MTK_QDMA_GLO_CFG	0x1A04</div><div class='del'>-#define MTK_QDMA_RST_IDX	0x1A08</div><div class='del'>-#define MTK_QDMA_DELAY_INT	0x1A0C</div><div class='del'>-#define MTK_QDMA_FC_THRES	0x1A10</div><div class='del'>-#define MTK_QMTK_INT_STATUS	0x1A18</div><div class='del'>-#define MTK_QMTK_INT_ENABLE	0x1A1C</div><div class='del'>-#define MTK_QDMA_HRED2		0x1A44</div><div class='del'>-</div><div class='del'>-#define MTK_QTX_CTX_PTR		0x1B00</div><div class='del'>-#define MTK_QTX_DTX_PTR		0x1B04</div><div class='del'>-</div><div class='del'>-#define MTK_QTX_CRX_PTR		0x1B10</div><div class='del'>-#define MTK_QTX_DRX_PTR		0x1B14</div><div class='del'>-</div><div class='del'>-#define MTK_QDMA_FQ_HEAD	0x1B20</div><div class='del'>-#define MTK_QDMA_FQ_TAIL	0x1B24</div><div class='del'>-#define MTK_QDMA_FQ_CNT		0x1B28</div><div class='del'>-#define MTK_QDMA_FQ_BLEN	0x1B2C</div><div class='del'>-</div><div class='del'>-#define QDMA_PAGE_SIZE		2048</div><div class='del'>-#define QDMA_TX_OWNER_CPU	BIT(31)</div><div class='del'>-#define QDMA_TX_SWC		BIT(14)</div><div class='del'>-#define TX_QDMA_SDL(_x)		(((_x) &amp; 0x3fff) &lt;&lt; 16)</div><div class='del'>-#define QDMA_RES_THRES		4</div><div class='del'>-</div><div class='del'>-/* MDIO_CFG register bits */</div><div class='del'>-#define MTK_MDIO_CFG_AUTO_POLL_EN	BIT(29)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_BP_EN		BIT(16)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_FRC_EN		BIT(15)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_SPEED_10	(0 &lt;&lt; 13)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_SPEED_100	(1 &lt;&lt; 13)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_SPEED_1000	(2 &lt;&lt; 13)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_DUPLEX		BIT(12)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_FC_TX		BIT(11)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_FC_RX		BIT(10)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_LNK_DWN	BIT(9)</div><div class='del'>-#define MTK_MDIO_CFG_GP1_AN_FAIL	BIT(8)</div><div class='del'>-#define MTK_MDIO_CFG_MDC_CLK_DIV_1	(0 &lt;&lt; 6)</div><div class='del'>-#define MTK_MDIO_CFG_MDC_CLK_DIV_2	(1 &lt;&lt; 6)</div><div class='del'>-#define MTK_MDIO_CFG_MDC_CLK_DIV_4	(2 &lt;&lt; 6)</div><div class='del'>-#define MTK_MDIO_CFG_MDC_CLK_DIV_8	(3 &lt;&lt; 6)</div><div class='del'>-#define MTK_MDIO_CFG_TURBO_MII_FREQ	BIT(5)</div><div class='del'>-#define MTK_MDIO_CFG_TURBO_MII_MODE	BIT(4)</div><div class='del'>-#define MTK_MDIO_CFG_RX_CLK_SKEW_0	(0 &lt;&lt; 2)</div><div class='del'>-#define MTK_MDIO_CFG_RX_CLK_SKEW_200	(1 &lt;&lt; 2)</div><div class='del'>-#define MTK_MDIO_CFG_RX_CLK_SKEW_400	(2 &lt;&lt; 2)</div><div class='del'>-#define MTK_MDIO_CFG_RX_CLK_SKEW_INV	(3 &lt;&lt; 2)</div><div class='del'>-#define MTK_MDIO_CFG_TX_CLK_SKEW_0	0</div><div class='del'>-#define MTK_MDIO_CFG_TX_CLK_SKEW_200	1</div><div class='del'>-#define MTK_MDIO_CFG_TX_CLK_SKEW_400	2</div><div class='del'>-#define MTK_MDIO_CFG_TX_CLK_SKEW_INV	3</div><div class='del'>-</div><div class='del'>-/* uni-cast port */</div><div class='del'>-#define MTK_GDM1_JMB_LEN_MASK	0xf</div><div class='del'>-#define MTK_GDM1_JMB_LEN_SHIFT	28</div><div class='del'>-#define MTK_GDM1_ICS_EN		BIT(22)</div><div class='del'>-#define MTK_GDM1_TCS_EN		BIT(21)</div><div class='del'>-#define MTK_GDM1_UCS_EN		BIT(20)</div><div class='del'>-#define MTK_GDM1_JMB_EN		BIT(19)</div><div class='del'>-#define MTK_GDM1_STRPCRC	BIT(16)</div><div class='del'>-#define MTK_GDM1_UFRC_P_CPU	(0 &lt;&lt; 12)</div><div class='del'>-#define MTK_GDM1_UFRC_P_GDMA1	(1 &lt;&lt; 12)</div><div class='del'>-#define MTK_GDM1_UFRC_P_PPE	(6 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-/* checksums */</div><div class='del'>-#define MTK_ICS_GEN_EN		BIT(2)</div><div class='del'>-#define MTK_UCS_GEN_EN		BIT(1)</div><div class='del'>-#define MTK_TCS_GEN_EN		BIT(0)</div><div class='del'>-</div><div class='del'>-/* dma mode */</div><div class='del'>-#define MTK_PDMA		BIT(0)</div><div class='del'>-#define MTK_QDMA		BIT(1)</div><div class='del'>-#define MTK_PDMA_RX_QDMA_TX	(MTK_PDMA | MTK_QDMA)</div><div class='del'>-</div><div class='del'>-/* dma ring */</div><div class='del'>-#define MTK_PST_DRX_IDX0	BIT(16)</div><div class='del'>-#define MTK_PST_DTX_IDX3	BIT(3)</div><div class='del'>-#define MTK_PST_DTX_IDX2	BIT(2)</div><div class='del'>-#define MTK_PST_DTX_IDX1	BIT(1)</div><div class='del'>-#define MTK_PST_DTX_IDX0	BIT(0)</div><div class='del'>-</div><div class='del'>-#define MTK_RX_2B_OFFSET	BIT(31)</div><div class='del'>-#define MTK_TX_WB_DDONE		BIT(6)</div><div class='del'>-#define MTK_RX_DMA_BUSY		BIT(3)</div><div class='del'>-#define MTK_TX_DMA_BUSY		BIT(1)</div><div class='del'>-#define MTK_RX_DMA_EN		BIT(2)</div><div class='del'>-#define MTK_TX_DMA_EN		BIT(0)</div><div class='del'>-</div><div class='del'>-#define MTK_PDMA_SIZE_4DWORDS	(0 &lt;&lt; 4)</div><div class='del'>-#define MTK_PDMA_SIZE_8DWORDS	(1 &lt;&lt; 4)</div><div class='del'>-#define MTK_PDMA_SIZE_16DWORDS	(2 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define MTK_US_CYC_CNT_MASK	0xff</div><div class='del'>-#define MTK_US_CYC_CNT_SHIFT	0x8</div><div class='del'>-#define MTK_US_CYC_CNT_DIVISOR	1000000</div><div class='del'>-</div><div class='del'>-/* PDMA descriptor rxd2 */</div><div class='del'>-#define RX_DMA_DONE		BIT(31)</div><div class='del'>-#define RX_DMA_LSO		BIT(30)</div><div class='del'>-#define RX_DMA_PLEN0(_x)	(((_x) &amp; 0x3fff) &lt;&lt; 16)</div><div class='del'>-#define RX_DMA_GET_PLEN0(_x)	(((_x) &gt;&gt; 16) &amp; 0x3fff)</div><div class='del'>-#define RX_DMA_TAG		BIT(15)</div><div class='del'>-</div><div class='del'>-/* PDMA descriptor rxd3 */</div><div class='del'>-#define RX_DMA_TPID(_x)		(((_x) &gt;&gt; 16) &amp; 0xffff)</div><div class='del'>-#define RX_DMA_VID(_x)		((_x) &amp; 0xfff)</div><div class='del'>-</div><div class='del'>-/* PDMA descriptor rxd4 */</div><div class='del'>-#define RX_DMA_L4VALID		BIT(30)</div><div class='del'>-#define RX_DMA_FPORT_SHIFT	19</div><div class='del'>-#define RX_DMA_FPORT_MASK	0x7</div><div class='del'>-</div><div class='del'>-struct mtk_rx_dma {</div><div class='del'>-	unsigned int rxd1;</div><div class='del'>-	unsigned int rxd2;</div><div class='del'>-	unsigned int rxd3;</div><div class='del'>-	unsigned int rxd4;</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-/* PDMA tx descriptor bits */</div><div class='del'>-#define TX_DMA_BUF_LEN		0x3fff</div><div class='del'>-#define TX_DMA_PLEN0_MASK	(TX_DMA_BUF_LEN &lt;&lt; 16)</div><div class='del'>-#define TX_DMA_PLEN0(_x)	(((_x) &amp; TX_DMA_BUF_LEN) &lt;&lt; 16)</div><div class='del'>-#define TX_DMA_PLEN1(_x)	((_x) &amp; TX_DMA_BUF_LEN)</div><div class='del'>-#define TX_DMA_GET_PLEN0(_x)    (((_x) &gt;&gt; 16) &amp; TX_DMA_BUF_LEN)</div><div class='del'>-#define TX_DMA_GET_PLEN1(_x)    ((_x) &amp; TX_DMA_BUF_LEN)</div><div class='del'>-#define TX_DMA_LS1		BIT(14)</div><div class='del'>-#define TX_DMA_LS0		BIT(30)</div><div class='del'>-#define TX_DMA_DONE		BIT(31)</div><div class='del'>-#define TX_DMA_FPORT_SHIFT	25</div><div class='del'>-#define TX_DMA_FPORT_MASK	0x7</div><div class='del'>-#define TX_DMA_INS_VLAN_MT7621	BIT(16)</div><div class='del'>-#define TX_DMA_INS_VLAN		BIT(7)</div><div class='del'>-#define TX_DMA_INS_PPPOE	BIT(12)</div><div class='del'>-#define TX_DMA_TAG		BIT(15)</div><div class='del'>-#define TX_DMA_TAG_MASK		BIT(15)</div><div class='del'>-#define TX_DMA_QN(_x)		((_x) &lt;&lt; 16)</div><div class='del'>-#define TX_DMA_PN(_x)		((_x) &lt;&lt; 24)</div><div class='del'>-#define TX_DMA_QN_MASK		TX_DMA_QN(0x7)</div><div class='del'>-#define TX_DMA_PN_MASK		TX_DMA_PN(0x7)</div><div class='del'>-#define TX_DMA_UDF		BIT(20)</div><div class='del'>-#define TX_DMA_CHKSUM		(0x7 &lt;&lt; 29)</div><div class='del'>-#define TX_DMA_TSO		BIT(28)</div><div class='del'>-#define TX_DMA_DESP4_DEF	(TX_DMA_QN(3) | TX_DMA_PN(1))</div><div class='del'>-</div><div class='del'>-/* frame engine counters */</div><div class='del'>-#define MTK_PPE_AC_BCNT0	(MTK_CMTABLE_OFFSET + 0x00)</div><div class='del'>-#define MTK_GDMA1_TX_GBCNT	(MTK_CMTABLE_OFFSET + 0x300)</div><div class='del'>-#define MTK_GDMA2_TX_GBCNT	(MTK_GDMA1_TX_GBCNT + 0x40)</div><div class='del'>-</div><div class='del'>-/* phy device flags */</div><div class='del'>-#define MTK_PHY_FLAG_PORT	BIT(0)</div><div class='del'>-#define MTK_PHY_FLAG_ATTACH	BIT(1)</div><div class='del'>-</div><div class='del'>-struct mtk_tx_dma {</div><div class='del'>-	unsigned int txd1;</div><div class='del'>-	unsigned int txd2;</div><div class='del'>-	unsigned int txd3;</div><div class='del'>-	unsigned int txd4;</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mtk_eth;</div><div class='del'>-struct mtk_mac;</div><div class='del'>-</div><div class='del'>-/* manage the attached phys */</div><div class='del'>-struct mtk_phy {</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-</div><div class='del'>-	struct phy_device	*phy[8];</div><div class='del'>-	struct device_node	*phy_node[8];</div><div class='del'>-	const __be32		*phy_fixed[8];</div><div class='del'>-	int			duplex[8];</div><div class='del'>-	int			speed[8];</div><div class='del'>-	int			tx_fc[8];</div><div class='del'>-	int			rx_fc[8];</div><div class='del'>-	int (*connect)(struct mtk_mac *mac);</div><div class='del'>-	void (*disconnect)(struct mtk_mac *mac);</div><div class='del'>-	void (*start)(struct mtk_mac *mac);</div><div class='del'>-	void (*stop)(struct mtk_mac *mac);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* struct mtk_soc_data - the structure that holds the SoC specific data</div><div class='del'>- * @reg_table:		Some of the legacy registers changed their location</div><div class='del'>- *			over time. Their offsets are stored in this table</div><div class='del'>- *</div><div class='del'>- * @init_data:		Some features depend on the silicon revision. This</div><div class='del'>- *			callback allows runtime modification of the content of</div><div class='del'>- *			this struct</div><div class='del'>- * @reset_fe:		This callback is used to trigger the reset of the frame</div><div class='del'>- *			engine</div><div class='del'>- * @set_mac:		This callback is used to set the unicast mac address</div><div class='del'>- *			filter</div><div class='del'>- * @fwd_config:		This callback is used to setup the forward config</div><div class='del'>- *			register of the MAC</div><div class='del'>- * @switch_init:	This callback is used to bring up the switch core</div><div class='del'>- * @port_init:		Some SoCs have ports that can be router to a switch port</div><div class='del'>- *			or an external PHY. This callback is used to setup these</div><div class='del'>- *			ports.</div><div class='del'>- * @has_carrier:	This callback allows driver to check if there is a cable</div><div class='del'>- *			attached.</div><div class='del'>- * @mdio_init:		This callbck is used to setup the MDIO bus if one is</div><div class='del'>- *			present</div><div class='del'>- * @mdio_cleanup:	This callback is used to cleanup the MDIO state.</div><div class='del'>- * @mdio_write:		This callback is used to write data to the MDIO bus.</div><div class='del'>- * @mdio_read:		This callback is used to write data to the MDIO bus.</div><div class='del'>- * @mdio_adjust_link:	This callback is used to apply the PHY settings.</div><div class='del'>- * @piac_offset:	the PIAC register has a different different base offset</div><div class='del'>- * @hw_features:	feature set depends on the SoC type</div><div class='del'>- * @dma_ring_size:	allow GBit SoCs to set bigger rings than FE SoCs</div><div class='del'>- * @napi_weight:	allow GBit SoCs to set bigger napi weight than FE SoCs</div><div class='del'>- * @dma_type:		SoCs is PDMA, QDMA or a mix of the 2</div><div class='del'>- * @pdma_glo_cfg:	the default DMA configuration</div><div class='del'>- * @rx_int:		the TX interrupt bits used by the SoC</div><div class='del'>- * @tx_int:		the TX interrupt bits used by the SoC</div><div class='del'>- * @status_int:		the Status interrupt bits used by the SoC</div><div class='del'>- * @checksum_bit:	the bits used to turn on HW checksumming</div><div class='del'>- * @txd4:		default value of the TXD4 descriptor</div><div class='del'>- * @mac_count:		the number of MACs that the SoC has</div><div class='del'>- * @new_stats:		there is a old and new way to read hardware stats</div><div class='del'>- *			registers</div><div class='del'>- * @jumbo_frame:	does the SoC support jumbo frames ?</div><div class='del'>- * @rx_2b_offset:	tell the rx dma to offset the data by 2 bytes</div><div class='del'>- * @rx_sg_dma:		scatter gather support</div><div class='del'>- * @padding_64b		enable 64 bit padding</div><div class='del'>- * @padding_bug:	rt2880 has a padding bug</div><div class='del'>- * @has_switch:		does the SoC have a built-in switch</div><div class='del'>- *</div><div class='del'>- * Although all of the supported SoCs share the same basic functionality, there</div><div class='del'>- * are several SoC specific functions and features that we need to support. This</div><div class='del'>- * struct holds the SoC specific data so that the common core can figure out</div><div class='del'>- * how to setup and use these differences.</div><div class='del'>- */</div><div class='del'>-struct mtk_soc_data {</div><div class='del'>-	const u16 *reg_table;</div><div class='del'>-</div><div class='del'>-	void (*init_data)(struct mtk_soc_data *data, struct net_device *netdev);</div><div class='del'>-	void (*reset_fe)(struct mtk_eth *eth);</div><div class='del'>-	void (*set_mac)(struct mtk_mac *mac, unsigned char *macaddr);</div><div class='del'>-	int (*fwd_config)(struct mtk_eth *eth);</div><div class='del'>-	int (*switch_init)(struct mtk_eth *eth);</div><div class='del'>-	void (*port_init)(struct mtk_eth *eth, struct mtk_mac *mac,</div><div class='del'>-			  struct device_node *port);</div><div class='del'>-	int (*has_carrier)(struct mtk_eth *eth);</div><div class='del'>-	int (*mdio_init)(struct mtk_eth *eth);</div><div class='del'>-	void (*mdio_cleanup)(struct mtk_eth *eth);</div><div class='del'>-	int (*mdio_write)(struct mii_bus *bus, int phy_addr, int phy_reg,</div><div class='del'>-			  u16 val);</div><div class='del'>-	int (*mdio_read)(struct mii_bus *bus, int phy_addr, int phy_reg);</div><div class='del'>-	void (*mdio_adjust_link)(struct mtk_eth *eth, int port);</div><div class='del'>-	u32 piac_offset;</div><div class='del'>-	netdev_features_t hw_features;</div><div class='del'>-	u32 dma_ring_size;</div><div class='del'>-	u32 napi_weight;</div><div class='del'>-	u32 dma_type;</div><div class='del'>-	u32 pdma_glo_cfg;</div><div class='del'>-	u32 rx_int;</div><div class='del'>-	u32 tx_int;</div><div class='del'>-	u32 status_int;</div><div class='del'>-	u32 checksum_bit;</div><div class='del'>-	u32 txd4;</div><div class='del'>-	u32 mac_count;</div><div class='del'>-</div><div class='del'>-	u32 new_stats:1;</div><div class='del'>-	u32 jumbo_frame:1;</div><div class='del'>-	u32 rx_2b_offset:1;</div><div class='del'>-	u32 rx_sg_dma:1;</div><div class='del'>-	u32 padding_64b:1;</div><div class='del'>-	u32 padding_bug:1;</div><div class='del'>-	u32 has_switch:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MTK_STAT_OFFSET			0x40</div><div class='del'>-</div><div class='del'>-/* struct mtk_hw_stats - the structure that holds the traffic statistics.</div><div class='del'>- * @stats_lock:		make sure that stats operations are atomic</div><div class='del'>- * @reg_offset:		the status register offset of the SoC</div><div class='del'>- * @syncp:		the refcount</div><div class='del'>- *</div><div class='del'>- * All of the supported SoCs have hardware counters for traffic statstics.</div><div class='del'>- * Whenever the status IRQ triggers we can read the latest stats from these</div><div class='del'>- * counters and store them in this struct.</div><div class='del'>- */</div><div class='del'>-struct mtk_hw_stats {</div><div class='del'>-	spinlock_t stats_lock;</div><div class='del'>-	u32 reg_offset;</div><div class='del'>-	struct u64_stats_sync syncp;</div><div class='del'>-</div><div class='del'>-	u64 tx_bytes;</div><div class='del'>-	u64 tx_packets;</div><div class='del'>-	u64 tx_skip;</div><div class='del'>-	u64 tx_collisions;</div><div class='del'>-	u64 rx_bytes;</div><div class='del'>-	u64 rx_packets;</div><div class='del'>-	u64 rx_overflow;</div><div class='del'>-	u64 rx_fcs_errors;</div><div class='del'>-	u64 rx_short_errors;</div><div class='del'>-	u64 rx_long_errors;</div><div class='del'>-	u64 rx_checksum_errors;</div><div class='del'>-	u64 rx_flow_control_packets;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* PDMA descriptor can point at 1-2 segments. This enum allows us to track how</div><div class='del'>- * memory was allocated so that it can be freed properly</div><div class='del'>- */</div><div class='del'>-enum mtk_tx_flags {</div><div class='del'>-	MTK_TX_FLAGS_SINGLE0	= 0x01,</div><div class='del'>-	MTK_TX_FLAGS_PAGE0	= 0x02,</div><div class='del'>-	MTK_TX_FLAGS_PAGE1	= 0x04,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* struct mtk_tx_buf -	This struct holds the pointers to the memory pointed at</div><div class='del'>- *			by the TX descriptor	s</div><div class='del'>- * @skb:		The SKB pointer of the packet being sent</div><div class='del'>- * @dma_addr0:		The base addr of the first segment</div><div class='del'>- * @dma_len0:		The length of the first segment</div><div class='del'>- * @dma_addr1:		The base addr of the second segment</div><div class='del'>- * @dma_len1:		The length of the second segment</div><div class='del'>- */</div><div class='del'>-struct mtk_tx_buf {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u32 flags;</div><div class='del'>-	DEFINE_DMA_UNMAP_ADDR(dma_addr0);</div><div class='del'>-	DEFINE_DMA_UNMAP_LEN(dma_len0);</div><div class='del'>-	DEFINE_DMA_UNMAP_ADDR(dma_addr1);</div><div class='del'>-	DEFINE_DMA_UNMAP_LEN(dma_len1);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* struct mtk_tx_ring -	This struct holds info describing a TX ring</div><div class='del'>- * @tx_dma:		The descriptor ring</div><div class='del'>- * @tx_buf:		The memory pointed at by the ring</div><div class='del'>- * @tx_phys:		The physical addr of tx_buf</div><div class='del'>- * @tx_next_free:	Pointer to the next free descriptor</div><div class='del'>- * @tx_last_free:	Pointer to the last free descriptor</div><div class='del'>- * @tx_thresh:		The threshold of minimum amount of free descriptors</div><div class='del'>- * @tx_map:		Callback to map a new packet into the ring</div><div class='del'>- * @tx_poll:		Callback for the housekeeping function</div><div class='del'>- * @tx_clean:		Callback for the cleanup function</div><div class='del'>- * @tx_ring_size:	How many descriptors are in the ring</div><div class='del'>- * @tx_free_idx:	The index of th next free descriptor</div><div class='del'>- * @tx_next_idx:	QDMA uses a linked list. This element points to the next</div><div class='del'>- *			free descriptor in the list</div><div class='del'>- * @tx_free_count:	QDMA uses a linked list. Track how many free descriptors</div><div class='del'>- *			are present</div><div class='del'>- */</div><div class='del'>-struct mtk_tx_ring {</div><div class='del'>-	struct mtk_tx_dma *tx_dma;</div><div class='del'>-	struct mtk_tx_buf *tx_buf;</div><div class='del'>-	dma_addr_t tx_phys;</div><div class='del'>-	struct mtk_tx_dma *tx_next_free;</div><div class='del'>-	struct mtk_tx_dma *tx_last_free;</div><div class='del'>-	u16 tx_thresh;</div><div class='del'>-	int (*tx_map)(struct sk_buff *skb, struct net_device *dev, int tx_num,</div><div class='del'>-		      struct mtk_tx_ring *ring, bool gso);</div><div class='del'>-	int (*tx_poll)(struct mtk_eth *eth, int budget, bool *tx_again);</div><div class='del'>-	void (*tx_clean)(struct mtk_eth *eth);</div><div class='del'>-</div><div class='del'>-	/* PDMA only */</div><div class='del'>-	u16 tx_ring_size;</div><div class='del'>-	u16 tx_free_idx;</div><div class='del'>-</div><div class='del'>-	/* QDMA only */</div><div class='del'>-	u16 tx_next_idx;</div><div class='del'>-	atomic_t tx_free_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* struct mtk_rx_ring -	This struct holds info describing a RX ring</div><div class='del'>- * @rx_dma:		The descriptor ring</div><div class='del'>- * @rx_data:		The memory pointed at by the ring</div><div class='del'>- * @trx_phys:		The physical addr of rx_buf</div><div class='del'>- * @rx_ring_size:	How many descriptors are in the ring</div><div class='del'>- * @rx_buf_size:	The size of each packet buffer</div><div class='del'>- * @rx_calc_idx:	The current head of ring</div><div class='del'>- */</div><div class='del'>-struct mtk_rx_ring {</div><div class='del'>-	struct mtk_rx_dma *rx_dma;</div><div class='del'>-	u8 **rx_data;</div><div class='del'>-	dma_addr_t rx_phys;</div><div class='del'>-	u16 rx_ring_size;</div><div class='del'>-	u16 frag_size;</div><div class='del'>-	u16 rx_buf_size;</div><div class='del'>-	u16 rx_calc_idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* currently no SoC has more than 2 macs */</div><div class='del'>-#define MTK_MAX_DEVS			2</div><div class='del'>-</div><div class='del'>-/* struct mtk_eth -	This is the main datasructure for holding the state</div><div class='del'>- *			of the driver</div><div class='del'>- * @dev:		The device pointer</div><div class='del'>- * @base:		The mapped register i/o base</div><div class='del'>- * @page_lock:		Make sure that register operations are atomic</div><div class='del'>- * @soc:		pointer to our SoC specific data</div><div class='del'>- * @dummy_dev:		we run 2 netdevs on 1 physical DMA ring and need a</div><div class='del'>- *			dummy for NAPI to work</div><div class='del'>- * @netdev:		The netdev instances</div><div class='del'>- * @mac:		Each netdev is linked to a physical MAC</div><div class='del'>- * @switch_np:		The phandle for the switch</div><div class='del'>- * @irq:		The IRQ that we are using</div><div class='del'>- * @msg_enable:		Ethtool msg level</div><div class='del'>- * @ysclk:		The sysclk rate - neeed for calibration</div><div class='del'>- * @ethsys:		The register map pointing at the range used to setup</div><div class='del'>- *			MII modes</div><div class='del'>- * @dma_refcnt:		track how many netdevs are using the DMA engine</div><div class='del'>- * @tx_ring:		Pointer to the memore holding info about the TX ring</div><div class='del'>- * @rx_ring:		Pointer to the memore holding info about the RX ring</div><div class='del'>- * @rx_napi:		The NAPI struct</div><div class='del'>- * @scratch_ring:	Newer SoCs need memory for a second HW managed TX ring</div><div class='del'>- * @scratch_head:	The scratch memory that scratch_ring points to.</div><div class='del'>- * @phy:		Info about the attached PHYs</div><div class='del'>- * @mii_bus:		If there is a bus we need to create an instance for it</div><div class='del'>- * @link:		Track if the ports have a physical link</div><div class='del'>- * @sw_priv:		Pointer to the switches private data</div><div class='del'>- * @vlan_map:		RX VID tracking</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct mtk_eth {</div><div class='del'>-	struct device			*dev;</div><div class='del'>-	void __iomem			*base;</div><div class='del'>-	spinlock_t			page_lock;</div><div class='del'>-	struct mtk_soc_data		*soc;</div><div class='del'>-	struct net_device		dummy_dev;</div><div class='del'>-	struct net_device		*netdev[MTK_MAX_DEVS];</div><div class='del'>-	struct mtk_mac			*mac[MTK_MAX_DEVS];</div><div class='del'>-	struct device_node		*switch_np;</div><div class='del'>-	int				irq;</div><div class='del'>-	u32				msg_enable;</div><div class='del'>-	unsigned long			sysclk;</div><div class='del'>-	struct regmap			*ethsys;</div><div class='del'>-	atomic_t			dma_refcnt;</div><div class='del'>-	struct mtk_tx_ring		tx_ring;</div><div class='del'>-	struct mtk_rx_ring		rx_ring[2];</div><div class='del'>-	struct napi_struct		rx_napi;</div><div class='del'>-	struct mtk_tx_dma		*scratch_ring;</div><div class='del'>-	void				*scratch_head;</div><div class='del'>-	struct mtk_phy			*phy;</div><div class='del'>-	struct mii_bus			*mii_bus;</div><div class='del'>-	int				link[8];</div><div class='del'>-	void				*sw_priv;</div><div class='del'>-	unsigned long			vlan_map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* struct mtk_mac -	the structure that holds the info about the MACs of the</div><div class='del'>- *			SoC</div><div class='del'>- * @id:			The number of the MAC</div><div class='del'>- * @of_node:		Our devicetree node</div><div class='del'>- * @hw:			Backpointer to our main datastruture</div><div class='del'>- * @hw_stats:		Packet statistics counter</div><div class='del'>- * @phy_dev:		The attached PHY if available</div><div class='del'>- * @phy_flags:		The PHYs flags</div><div class='del'>- * @pending_work:	The workqueue used to reset the dma ring</div><div class='del'>- */</div><div class='del'>-struct mtk_mac {</div><div class='del'>-	int				id;</div><div class='del'>-	struct device_node		*of_node;</div><div class='del'>-	struct mtk_eth			*hw;</div><div class='del'>-	struct mtk_hw_stats		*hw_stats;</div><div class='del'>-	struct phy_device		*phy_dev;</div><div class='del'>-	u32				phy_flags;</div><div class='del'>-	struct work_struct		pending_work;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* the struct describing the SoC. these are declared in the soc_xyz.c files */</div><div class='del'>-extern const struct of_device_id of_mtk_match[];</div><div class='del'>-</div><div class='del'>-/* read the hardware status register */</div><div class='del'>-void mtk_stats_update_mac(struct mtk_mac *mac);</div><div class='del'>-</div><div class='del'>-/* default checksum setup handler */</div><div class='del'>-void mtk_reset(struct mtk_eth *eth, u32 reset_bits);</div><div class='del'>-</div><div class='del'>-/* register i/o wrappers */</div><div class='del'>-void mtk_w32(struct mtk_eth *eth, u32 val, unsigned int reg);</div><div class='del'>-u32 mtk_r32(struct mtk_eth *eth, unsigned int reg);</div><div class='del'>-</div><div class='del'>-/* default clock calibration handler */</div><div class='del'>-int mtk_set_clock_cycle(struct mtk_eth *eth);</div><div class='del'>-</div><div class='del'>-/* default checksum setup handler */</div><div class='del'>-void mtk_csum_config(struct mtk_eth *eth);</div><div class='del'>-</div><div class='del'>-/* default forward config handler */</div><div class='del'>-void mtk_fwd_config(struct mtk_eth *eth);</div><div class='del'>-</div><div class='del'>-#endif /* MTK_ETH_H */</div><div class='head'>diff --git a/drivers/staging/mt7621-eth/soc_mt7621.c b/drivers/staging/mt7621-eth/soc_mt7621.c<br/>deleted file mode 100644<br/>index 5d63b5d96f6b..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-eth/soc_mt7621.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-eth/soc_mt7621.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</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'>- *   Copyright (C) 2009-2016 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2009-2016 Felix Fietkau &lt;nbd@openwrt.org&gt;</div><div class='del'>- *   Copyright (C) 2013-2016 Michael Lee &lt;igvtee@gmail.com&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/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-ralink/ralink_regs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mtk_eth_soc.h"</div><div class='del'>-#include "gsw_mt7620.h"</div><div class='del'>-#include "mdio.h"</div><div class='del'>-</div><div class='del'>-#define MT7620_CDMA_CSG_CFG	0x400</div><div class='del'>-#define MT7621_CDMP_IG_CTRL	(MT7620_CDMA_CSG_CFG + 0x00)</div><div class='del'>-#define MT7621_CDMP_EG_CTRL	(MT7620_CDMA_CSG_CFG + 0x04)</div><div class='del'>-#define MT7621_RESET_FE		BIT(6)</div><div class='del'>-#define MT7621_L4_VALID		BIT(24)</div><div class='del'>-</div><div class='del'>-#define MT7621_TX_DMA_UDF	BIT(19)</div><div class='del'>-</div><div class='del'>-#define CDMA_ICS_EN		BIT(2)</div><div class='del'>-#define CDMA_UCS_EN		BIT(1)</div><div class='del'>-#define CDMA_TCS_EN		BIT(0)</div><div class='del'>-</div><div class='del'>-#define GDMA_ICS_EN		BIT(22)</div><div class='del'>-#define GDMA_TCS_EN		BIT(21)</div><div class='del'>-#define GDMA_UCS_EN		BIT(20)</div><div class='del'>-</div><div class='del'>-/* frame engine counters */</div><div class='del'>-#define MT7621_REG_MIB_OFFSET	0x2000</div><div class='del'>-#define MT7621_PPE_AC_BCNT0	(MT7621_REG_MIB_OFFSET + 0x00)</div><div class='del'>-#define MT7621_GDM1_TX_GBCNT	(MT7621_REG_MIB_OFFSET + 0x400)</div><div class='del'>-#define MT7621_GDM2_TX_GBCNT	(MT7621_GDM1_TX_GBCNT + 0x40)</div><div class='del'>-</div><div class='del'>-#define GSW_REG_GDMA1_MAC_ADRL	0x508</div><div class='del'>-#define GSW_REG_GDMA1_MAC_ADRH	0x50C</div><div class='del'>-#define GSW_REG_GDMA2_MAC_ADRL	0x1508</div><div class='del'>-#define GSW_REG_GDMA2_MAC_ADRH	0x150C</div><div class='del'>-</div><div class='del'>-#define MT7621_MTK_RST_GL	0x04</div><div class='del'>-#define MT7620_MTK_INT_STATUS2	0x08</div><div class='del'>-</div><div class='del'>-/* MTK_INT_STATUS reg on mt7620 define CNT_GDM1_AF at BIT(29)</div><div class='del'>- * but after test it should be BIT(13).</div><div class='del'>- */</div><div class='del'>-#define MT7621_MTK_GDM1_AF	BIT(28)</div><div class='del'>-#define MT7621_MTK_GDM2_AF	BIT(29)</div><div class='del'>-</div><div class='del'>-static const u16 mt7621_reg_table[MTK_REG_COUNT] = {</div><div class='del'>-	[MTK_REG_PDMA_GLO_CFG] = RT5350_PDMA_GLO_CFG,</div><div class='del'>-	[MTK_REG_PDMA_RST_CFG] = RT5350_PDMA_RST_CFG,</div><div class='del'>-	[MTK_REG_DLY_INT_CFG] = RT5350_DLY_INT_CFG,</div><div class='del'>-	[MTK_REG_TX_BASE_PTR0] = RT5350_TX_BASE_PTR0,</div><div class='del'>-	[MTK_REG_TX_MAX_CNT0] = RT5350_TX_MAX_CNT0,</div><div class='del'>-	[MTK_REG_TX_CTX_IDX0] = RT5350_TX_CTX_IDX0,</div><div class='del'>-	[MTK_REG_TX_DTX_IDX0] = RT5350_TX_DTX_IDX0,</div><div class='del'>-	[MTK_REG_RX_BASE_PTR0] = RT5350_RX_BASE_PTR0,</div><div class='del'>-	[MTK_REG_RX_MAX_CNT0] = RT5350_RX_MAX_CNT0,</div><div class='del'>-	[MTK_REG_RX_CALC_IDX0] = RT5350_RX_CALC_IDX0,</div><div class='del'>-	[MTK_REG_RX_DRX_IDX0] = RT5350_RX_DRX_IDX0,</div><div class='del'>-	[MTK_REG_MTK_INT_ENABLE] = RT5350_MTK_INT_ENABLE,</div><div class='del'>-	[MTK_REG_MTK_INT_STATUS] = RT5350_MTK_INT_STATUS,</div><div class='del'>-	[MTK_REG_MTK_DMA_VID_BASE] = 0,</div><div class='del'>-	[MTK_REG_MTK_COUNTER_BASE] = MT7621_GDM1_TX_GBCNT,</div><div class='del'>-	[MTK_REG_MTK_RST_GL] = MT7621_MTK_RST_GL,</div><div class='del'>-	[MTK_REG_MTK_INT_STATUS2] = MT7620_MTK_INT_STATUS2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void mt7621_mtk_reset(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	mtk_reset(eth, MT7621_RESET_FE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7621_fwd_config(struct mtk_eth *eth)</div><div class='del'>-{</div><div class='del'>-	/* Setup GMAC1 only, there is no support for GMAC2 yet */</div><div class='del'>-	mtk_w32(eth, mtk_r32(eth, MT7620_GDMA1_FWD_CFG) &amp; ~0xffff,</div><div class='del'>-		MT7620_GDMA1_FWD_CFG);</div><div class='del'>-</div><div class='del'>-	/* Enable RX checksum */</div><div class='del'>-	mtk_w32(eth, mtk_r32(eth, MT7620_GDMA1_FWD_CFG) | (GDMA_ICS_EN |</div><div class='del'>-		       GDMA_TCS_EN | GDMA_UCS_EN),</div><div class='del'>-		       MT7620_GDMA1_FWD_CFG);</div><div class='del'>-</div><div class='del'>-	/* Enable RX VLan Offloading */</div><div class='del'>-	mtk_w32(eth, 0, MT7621_CDMP_EG_CTRL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7621_set_mac(struct mtk_mac *mac, unsigned char *hwaddr)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mac-&gt;hw-&gt;page_lock, flags);</div><div class='del'>-	if (mac-&gt;id == 0) {</div><div class='del'>-		mtk_w32(mac-&gt;hw, (hwaddr[0] &lt;&lt; 8) | hwaddr[1],</div><div class='del'>-			GSW_REG_GDMA1_MAC_ADRH);</div><div class='del'>-		mtk_w32(mac-&gt;hw, (hwaddr[2] &lt;&lt; 24) | (hwaddr[3] &lt;&lt; 16) |</div><div class='del'>-			(hwaddr[4] &lt;&lt; 8) | hwaddr[5],</div><div class='del'>-			GSW_REG_GDMA1_MAC_ADRL);</div><div class='del'>-	}</div><div class='del'>-	if (mac-&gt;id == 1) {</div><div class='del'>-		mtk_w32(mac-&gt;hw, (hwaddr[0] &lt;&lt; 8) | hwaddr[1],</div><div class='del'>-			GSW_REG_GDMA2_MAC_ADRH);</div><div class='del'>-		mtk_w32(mac-&gt;hw, (hwaddr[2] &lt;&lt; 24) | (hwaddr[3] &lt;&lt; 16) |</div><div class='del'>-			(hwaddr[4] &lt;&lt; 8) | hwaddr[5],</div><div class='del'>-			GSW_REG_GDMA2_MAC_ADRL);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mac-&gt;hw-&gt;page_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mtk_soc_data mt7621_data = {</div><div class='del'>-	.hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |</div><div class='del'>-		       NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |</div><div class='del'>-		       NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |</div><div class='del'>-		       NETIF_F_IPV6_CSUM,</div><div class='del'>-	.dma_type = MTK_PDMA,</div><div class='del'>-	.dma_ring_size = 256,</div><div class='del'>-	.napi_weight = 64,</div><div class='del'>-	.new_stats = 1,</div><div class='del'>-	.padding_64b = 1,</div><div class='del'>-	.rx_2b_offset = 1,</div><div class='del'>-	.rx_sg_dma = 1,</div><div class='del'>-	.has_switch = 1,</div><div class='del'>-	.mac_count = 2,</div><div class='del'>-	.reset_fe = mt7621_mtk_reset,</div><div class='del'>-	.set_mac = mt7621_set_mac,</div><div class='del'>-	.fwd_config = mt7621_fwd_config,</div><div class='del'>-	.switch_init = mtk_gsw_init,</div><div class='del'>-	.reg_table = mt7621_reg_table,</div><div class='del'>-	.pdma_glo_cfg = MTK_PDMA_SIZE_16DWORDS,</div><div class='del'>-	.rx_int = RT5350_RX_DONE_INT,</div><div class='del'>-	.tx_int = RT5350_TX_DONE_INT,</div><div class='del'>-	.status_int = MT7621_MTK_GDM1_AF | MT7621_MTK_GDM2_AF,</div><div class='del'>-	.checksum_bit = MT7621_L4_VALID,</div><div class='del'>-	.has_carrier = mt7620_has_carrier,</div><div class='del'>-	.mdio_read = mt7620_mdio_read,</div><div class='del'>-	.mdio_write = mt7620_mdio_write,</div><div class='del'>-	.mdio_adjust_link = mt7620_mdio_link_adjust,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct of_device_id of_mtk_match[] = {</div><div class='del'>-	{ .compatible = "mediatek,mt7621-eth", .data = &amp;mt7621_data },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(of, of_mtk_match);</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/Kconfig b/drivers/staging/mt7621-mmc/Kconfig<br/>deleted file mode 100644<br/>index 1eb79cd6e22f..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-config MTK_MMC</div><div class='del'>-	tristate "MTK SD/MMC"</div><div class='del'>-	depends on RALINK &amp;&amp; MMC</div><div class='del'>-</div><div class='del'>-config MTK_AEE_KDUMP</div><div class='del'>-	bool "MTK AEE KDUMP"</div><div class='del'>-	depends on MTK_MMC</div><div class='del'>-</div><div class='del'>-config MTK_MMC_CD_POLL</div><div class='del'>-	bool "Card Detect with Polling"</div><div class='del'>-	depends on MTK_MMC</div><div class='del'>-</div><div class='del'>-config MTK_MMC_EMMC_8BIT</div><div class='del'>-	bool "eMMC 8-bit support"</div><div class='del'>-	depends on MTK_MMC &amp;&amp; RALINK_MT7628</div><div class='del'>-</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/Makefile b/drivers/staging/mt7621-mmc/Makefile<br/>deleted file mode 100644<br/>index caead0b54703..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-# Copyright Statement:</div><div class='del'>-#</div><div class='del'>-# This software/firmware and related documentation ("MediaTek Software") are</div><div class='del'>-# protected under relevant copyright laws. The information contained herein</div><div class='del'>-# is confidential and proprietary to MediaTek Inc. and/or its licensors.</div><div class='del'>-# Without the prior written permission of MediaTek inc. and/or its licensors,</div><div class='del'>-# any reproduction, modification, use or disclosure of MediaTek Software,</div><div class='del'>-# and information contained herein, in whole or in part, shall be strictly prohibited.</div><div class='del'>-#</div><div class='del'>-# MediaTek Inc. (C) 2010. All rights reserved.</div><div class='del'>-#</div><div class='del'>-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES</div><div class='del'>-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")</div><div class='del'>-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON</div><div class='del'>-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,</div><div class='del'>-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF</div><div class='del'>-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.</div><div class='del'>-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE</div><div class='del'>-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR</div><div class='del'>-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH</div><div class='del'>-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES</div><div class='del'>-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES</div><div class='del'>-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK</div><div class='del'>-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR</div><div class='del'>-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND</div><div class='del'>-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,</div><div class='del'>-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,</div><div class='del'>-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO</div><div class='del'>-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.</div><div class='del'>-#</div><div class='del'>-# The following software/firmware and/or related documentation ("MediaTek Software")</div><div class='del'>-# have been modified by MediaTek Inc. All revisions are subject to any receiver's</div><div class='del'>-# applicable license agreements with MediaTek Inc.</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_MTK_MMC) += mtk_sd.o</div><div class='del'>-mtk_sd-objs := sd.o dbg.o</div><div class='del'>-ifeq ($(CONFIG_MTK_AEE_KDUMP),y)</div><div class='del'>-EXTRA_CFLAGS		+= -DMT6575_SD_DEBUG</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	@rm -f *.o modules.order .*.cmd</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/TODO b/drivers/staging/mt7621-mmc/TODO<br/>deleted file mode 100644<br/>index febb32d37e07..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/TODO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-</div><div class='del'>-- general code review and clean up</div><div class='del'>-- ensure device-tree requirements are documented</div><div class='del'>-- should probably be merged with drivers/mmc/host/mtk-sd.c</div><div class='del'>-- possibly fix to work with highmem pages so a bounce buffer isn't</div><div class='del'>-  needed.</div><div class='del'>-</div><div class='del'>-Cc: NeilBrown &lt;neil@brown.name&gt;</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h<br/>deleted file mode 100644<br/>index 983791ee308d..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/board.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/board.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* Copyright Statement:</div><div class='del'>- *</div><div class='del'>- * This software/firmware and related documentation ("MediaTek Software") are</div><div class='del'>- * protected under relevant copyright laws. The information contained herein</div><div class='del'>- * is confidential and proprietary to MediaTek Inc. and/or its licensors.</div><div class='del'>- * Without the prior written permission of MediaTek inc. and/or its licensors,</div><div class='del'>- * any reproduction, modification, use or disclosure of MediaTek Software,</div><div class='del'>- * and information contained herein, in whole or in part, shall be strictly prohibited.</div><div class='del'>- */</div><div class='del'>-/* MediaTek Inc. (C) 2010. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES</div><div class='del'>- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")</div><div class='del'>- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON</div><div class='del'>- * AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.</div><div class='del'>- * NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE</div><div class='del'>- * SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR</div><div class='del'>- * SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH</div><div class='del'>- * THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES</div><div class='del'>- * THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES</div><div class='del'>- * CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK</div><div class='del'>- * SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR</div><div class='del'>- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND</div><div class='del'>- * CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,</div><div class='del'>- * AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,</div><div class='del'>- * OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO</div><div class='del'>- * MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.</div><div class='del'>- *</div><div class='del'>- * The following software/firmware and/or related documentation ("MediaTek Software")</div><div class='del'>- * have been modified by MediaTek Inc. All revisions are subject to any receiver's</div><div class='del'>- * applicable license agreements with MediaTek Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ARCH_ARM_MACH_BOARD_H</div><div class='del'>-#define __ARCH_ARM_MACH_BOARD_H</div><div class='del'>-</div><div class='del'>-#define MSDC_CD_PIN_EN      BIT(0)  /* card detection pin is wired   */</div><div class='del'>-#define MSDC_WP_PIN_EN      BIT(1)  /* write protection pin is wired */</div><div class='del'>-#define MSDC_RST_PIN_EN     BIT(2)  /* emmc reset pin is wired       */</div><div class='del'>-#define MSDC_REMOVABLE      BIT(5)  /* removable slot                */</div><div class='del'>-</div><div class='del'>-#define MSDC_SMPL_RISING    (0)</div><div class='del'>-#define MSDC_SMPL_FALLING   (1)</div><div class='del'>-</div><div class='del'>-#define MSDC_CMD_PIN        (0)</div><div class='del'>-#define MSDC_DAT_PIN        (1)</div><div class='del'>-#define MSDC_CD_PIN         (2)</div><div class='del'>-#define MSDC_WP_PIN         (3)</div><div class='del'>-#define MSDC_RST_PIN        (4)</div><div class='del'>-</div><div class='del'>-struct msdc_hw {</div><div class='del'>-	unsigned char  clk_src;          /* host clock source */</div><div class='del'>-	unsigned long  flags;            /* hardware capability flags */</div><div class='del'>-</div><div class='del'>-	/* config gpio pull mode */</div><div class='del'>-	void (*config_gpio_pin)(int type, int pull);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct msdc_hw msdc0_hw;</div><div class='del'>-</div><div class='del'>-#endif /* __ARCH_ARM_MACH_BOARD_H */</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/dbg.c b/drivers/staging/mt7621-mmc/dbg.c<br/>deleted file mode 100644<br/>index c7c091fa1da0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/dbg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/dbg.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,304 +0,0 @@</div><div class='del'>-/* Copyright Statement:</div><div class='del'>- *</div><div class='del'>- * This software/firmware and related documentation ("MediaTek Software") are</div><div class='del'>- * protected under relevant copyright laws. The information contained herein</div><div class='del'>- * is confidential and proprietary to MediaTek Inc. and/or its licensors.</div><div class='del'>- * Without the prior written permission of MediaTek inc. and/or its licensors,</div><div class='del'>- * any reproduction, modification, use or disclosure of MediaTek Software,</div><div class='del'>- * and information contained herein, in whole or in part, shall be strictly</div><div class='del'>- * prohibited.</div><div class='del'>- *</div><div class='del'>- * MediaTek Inc. (C) 2010. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES</div><div class='del'>- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")</div><div class='del'>- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON</div><div class='del'>- * AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.</div><div class='del'>- * NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE</div><div class='del'>- * SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR</div><div class='del'>- * SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO</div><div class='del'>- * SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY</div><div class='del'>- * ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY</div><div class='del'>- * THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK</div><div class='del'>- * SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO</div><div class='del'>- * RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN</div><div class='del'>- * FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND</div><div class='del'>- * CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED</div><div class='del'>- * HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK</div><div class='del'>- * SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE</div><div class='del'>- * PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.</div><div class='del'>- *</div><div class='del'>- * The following software/firmware and/or related documentation</div><div class='del'>- * ("MediaTek Software") have been modified by MediaTek Inc. All revisions</div><div class='del'>- * are subject to any receiver's applicable license agreements with MediaTek</div><div class='del'>- * Inc.</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/sched.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-// #include &lt;mach/mt6575_gpt.h&gt; /* --- by chhung */</div><div class='del'>-#include "dbg.h"</div><div class='del'>-#include "mt6575_sd.h"</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* for debug zone */</div><div class='del'>-unsigned int sd_debug_zone[4] = {</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(MT6575_SD_DEBUG)</div><div class='del'>-static char cmd_buf[256];</div><div class='del'>-/* for driver profile */</div><div class='del'>-#define TICKS_ONE_MS  (13000)</div><div class='del'>-u32 gpt_enable;</div><div class='del'>-u32 sdio_pro_enable;   /* make sure gpt is enabled */</div><div class='del'>-u32 sdio_pro_time;     /* no more than 30s */</div><div class='del'>-struct sdio_profile sdio_perfomance = {0};</div><div class='del'>-</div><div class='del'>-u32 msdc_time_calc(u32 old_L32, u32 old_H32, u32 new_L32, u32 new_H32)</div><div class='del'>-{</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	if (new_H32 == old_H32) {</div><div class='del'>-		ret = new_L32 - old_L32;</div><div class='del'>-	} else if (new_H32 == (old_H32 + 1)) {</div><div class='del'>-		if (new_L32 &gt; old_L32)</div><div class='del'>-			pr_debug("msdc old_L&lt;0x%x&gt; new_L&lt;0x%x&gt;\n",</div><div class='del'>-				 old_L32, new_L32);</div><div class='del'>-		ret = (0xffffffff - old_L32);</div><div class='del'>-		ret += new_L32;</div><div class='del'>-	} else {</div><div class='del'>-		pr_debug("msdc old_H&lt;0x%x&gt; new_H&lt;0x%x&gt;\n", old_H32, new_H32);</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'>-void msdc_sdio_profile(struct sdio_profile *result)</div><div class='del'>-{</div><div class='del'>-	struct cmd_profile *cmd;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	pr_debug("sdio === performance dump ===\n");</div><div class='del'>-	pr_debug("sdio === total execute tick&lt;%d&gt; time&lt;%dms&gt; Tx&lt;%dB&gt; Rx&lt;%dB&gt;\n",</div><div class='del'>-		 result-&gt;total_tc, result-&gt;total_tc / TICKS_ONE_MS,</div><div class='del'>-		 result-&gt;total_tx_bytes, result-&gt;total_rx_bytes);</div><div class='del'>-</div><div class='del'>-	/* CMD52 Dump */</div><div class='del'>-	cmd = &amp;result-&gt;cmd52_rx;</div><div class='del'>-	pr_debug("sdio === CMD52 Rx &lt;%d&gt;times tick&lt;%d&gt; Max&lt;%d&gt; Min&lt;%d&gt; Aver&lt;%d&gt;\n",</div><div class='del'>-		 cmd-&gt;count, cmd-&gt;tot_tc, cmd-&gt;max_tc, cmd-&gt;min_tc,</div><div class='del'>-		 cmd-&gt;tot_tc / cmd-&gt;count);</div><div class='del'>-	cmd = &amp;result-&gt;cmd52_tx;</div><div class='del'>-	pr_debug("sdio === CMD52 Tx &lt;%d&gt;times tick&lt;%d&gt; Max&lt;%d&gt; Min&lt;%d&gt; Aver&lt;%d&gt;\n",</div><div class='del'>-		 cmd-&gt;count, cmd-&gt;tot_tc, cmd-&gt;max_tc, cmd-&gt;min_tc,</div><div class='del'>-		 cmd-&gt;tot_tc / cmd-&gt;count);</div><div class='del'>-</div><div class='del'>-	/* CMD53 Rx bytes + block mode */</div><div class='del'>-	for (i = 0; i &lt; 512; i++) {</div><div class='del'>-		cmd = &amp;result-&gt;cmd53_rx_byte[i];</div><div class='del'>-		if (cmd-&gt;count) {</div><div class='del'>-			pr_debug("sdio&lt;%6d&gt;&lt;%3dB&gt;_Rx_&lt;%9d&gt;&lt;%9d&gt;&lt;%6d&gt;&lt;%6d&gt;_&lt;%9dB&gt;&lt;%2dM&gt;\n",</div><div class='del'>-				 cmd-&gt;count, i, cmd-&gt;tot_tc, cmd-&gt;max_tc,</div><div class='del'>-				 cmd-&gt;min_tc, cmd-&gt;tot_tc / cmd-&gt;count,</div><div class='del'>-				 cmd-&gt;tot_bytes,</div><div class='del'>-				 (cmd-&gt;tot_bytes / 10) * 13 / (cmd-&gt;tot_tc / 10));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		cmd = &amp;result-&gt;cmd53_rx_blk[i];</div><div class='del'>-		if (cmd-&gt;count) {</div><div class='del'>-			pr_debug("sdio&lt;%6d&gt;&lt;%3d&gt;B_Rx_&lt;%9d&gt;&lt;%9d&gt;&lt;%6d&gt;&lt;%6d&gt;_&lt;%9dB&gt;&lt;%2dM&gt;\n",</div><div class='del'>-				 cmd-&gt;count, i, cmd-&gt;tot_tc, cmd-&gt;max_tc,</div><div class='del'>-				 cmd-&gt;min_tc, cmd-&gt;tot_tc / cmd-&gt;count,</div><div class='del'>-				 cmd-&gt;tot_bytes,</div><div class='del'>-				 (cmd-&gt;tot_bytes / 10) * 13 / (cmd-&gt;tot_tc / 10));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* CMD53 Tx bytes + block mode */</div><div class='del'>-	for (i = 0; i &lt; 512; i++) {</div><div class='del'>-		cmd = &amp;result-&gt;cmd53_tx_byte[i];</div><div class='del'>-		if (cmd-&gt;count) {</div><div class='del'>-			pr_debug("sdio&lt;%6d&gt;&lt;%3dB&gt;_Tx_&lt;%9d&gt;&lt;%9d&gt;&lt;%6d&gt;&lt;%6d&gt;_&lt;%9dB&gt;&lt;%2dM&gt;\n",</div><div class='del'>-				 cmd-&gt;count, i, cmd-&gt;tot_tc, cmd-&gt;max_tc,</div><div class='del'>-				 cmd-&gt;min_tc, cmd-&gt;tot_tc / cmd-&gt;count,</div><div class='del'>-				 cmd-&gt;tot_bytes,</div><div class='del'>-				 (cmd-&gt;tot_bytes / 10) * 13 / (cmd-&gt;tot_tc / 10));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		cmd = &amp;result-&gt;cmd53_tx_blk[i];</div><div class='del'>-		if (cmd-&gt;count) {</div><div class='del'>-			pr_debug("sdio&lt;%6d&gt;&lt;%3d&gt;B_Tx_&lt;%9d&gt;&lt;%9d&gt;&lt;%6d&gt;&lt;%6d&gt;_&lt;%9dB&gt;&lt;%2dM&gt;\n",</div><div class='del'>-				 cmd-&gt;count, i, cmd-&gt;tot_tc, cmd-&gt;max_tc,</div><div class='del'>-				 cmd-&gt;min_tc, cmd-&gt;tot_tc / cmd-&gt;count,</div><div class='del'>-				 cmd-&gt;tot_bytes,</div><div class='del'>-				 (cmd-&gt;tot_bytes / 10) * 13 / (cmd-&gt;tot_tc / 10));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_debug("sdio === performance dump done ===\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-//========= sdio command table ===========</div><div class='del'>-void msdc_performance(u32 opcode, u32 sizes, u32 bRx, u32 ticks)</div><div class='del'>-{</div><div class='del'>-	struct sdio_profile *result = &amp;sdio_perfomance;</div><div class='del'>-	struct cmd_profile *cmd;</div><div class='del'>-	u32 block;</div><div class='del'>-</div><div class='del'>-	if (sdio_pro_enable == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (opcode == 52) {</div><div class='del'>-		cmd = bRx ?  &amp;result-&gt;cmd52_rx : &amp;result-&gt;cmd52_tx;</div><div class='del'>-	} else if (opcode == 53) {</div><div class='del'>-		if (sizes &lt; 512) {</div><div class='del'>-			cmd = bRx ?  &amp;result-&gt;cmd53_rx_byte[sizes] : &amp;result-&gt;cmd53_tx_byte[sizes];</div><div class='del'>-		} else {</div><div class='del'>-			block = sizes / 512;</div><div class='del'>-			if (block &gt;= 99) {</div><div class='del'>-				pr_err("cmd53 error blocks\n");</div><div class='del'>-				while (1)</div><div class='del'>-					;</div><div class='del'>-			}</div><div class='del'>-			cmd = bRx ?  &amp;result-&gt;cmd53_rx_blk[block] : &amp;result-&gt;cmd53_tx_blk[block];</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update the members */</div><div class='del'>-	if (ticks &gt; cmd-&gt;max_tc)</div><div class='del'>-		cmd-&gt;max_tc = ticks;</div><div class='del'>-	if (cmd-&gt;min_tc == 0 || ticks &lt; cmd-&gt;min_tc)</div><div class='del'>-		cmd-&gt;min_tc = ticks;</div><div class='del'>-	cmd-&gt;tot_tc += ticks;</div><div class='del'>-	cmd-&gt;tot_bytes += sizes;</div><div class='del'>-	cmd-&gt;count++;</div><div class='del'>-</div><div class='del'>-	if (bRx)</div><div class='del'>-		result-&gt;total_rx_bytes += sizes;</div><div class='del'>-	else</div><div class='del'>-		result-&gt;total_tx_bytes += sizes;</div><div class='del'>-	result-&gt;total_tc += ticks;</div><div class='del'>-</div><div class='del'>-	/* dump when total_tc &gt; 30s */</div><div class='del'>-	if (result-&gt;total_tc &gt;= sdio_pro_time * TICKS_ONE_MS * 1000) {</div><div class='del'>-		msdc_sdio_profile(result);</div><div class='del'>-		memset(result, 0, sizeof(struct sdio_profile));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-//========== driver proc interface ===========</div><div class='del'>-static int msdc_debug_proc_read(struct seq_file *s, void *p)</div><div class='del'>-{</div><div class='del'>-	seq_puts(s, "\n=========================================\n");</div><div class='del'>-	seq_puts(s, "Index&lt;0&gt; + Id + Zone\n");</div><div class='del'>-	seq_puts(s, "-&gt; PWR&lt;9&gt; WRN&lt;8&gt; | FIO&lt;7&gt; OPS&lt;6&gt; FUN&lt;5&gt; CFG&lt;4&gt; | INT&lt;3&gt; RSP&lt;2&gt; CMD&lt;1&gt; DMA&lt;0&gt;\n");</div><div class='del'>-	seq_puts(s, "-&gt; echo 0 3 0x3ff &gt;msdc_bebug -&gt; host[3] debug zone set to 0x3ff\n");</div><div class='del'>-	seq_printf(s, "-&gt; MSDC[0] Zone: 0x%.8x\n", sd_debug_zone[0]);</div><div class='del'>-	seq_printf(s, "-&gt; MSDC[1] Zone: 0x%.8x\n", sd_debug_zone[1]);</div><div class='del'>-	seq_printf(s, "-&gt; MSDC[2] Zone: 0x%.8x\n", sd_debug_zone[2]);</div><div class='del'>-	seq_printf(s, "-&gt; MSDC[3] Zone: 0x%.8x\n", sd_debug_zone[3]);</div><div class='del'>-</div><div class='del'>-	seq_puts(s, "Index&lt;3&gt; + SDIO_PROFILE + TIME\n");</div><div class='del'>-	seq_puts(s, "-&gt; echo 3 1 0x1E &gt;msdc_bebug -&gt; enable sdio_profile, 30s\n");</div><div class='del'>-	seq_printf(s, "-&gt; SDIO_PROFILE&lt;%d&gt; TIME&lt;%ds&gt;\n",</div><div class='del'>-		   sdio_pro_enable, sdio_pro_time);</div><div class='del'>-	seq_puts(s, "=========================================\n\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t msdc_debug_proc_write(struct file *file,</div><div class='del'>-				     const char __user *buf,</div><div class='del'>-				     size_t count, loff_t *data)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	int cmd, p1, p2;</div><div class='del'>-	int id, zone;</div><div class='del'>-	int mode, size;</div><div class='del'>-</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (count &gt; 255)</div><div class='del'>-		count = 255;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(cmd_buf, buf, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	cmd_buf[count] = '\0';</div><div class='del'>-	pr_debug("msdc Write %s\n", cmd_buf);</div><div class='del'>-</div><div class='del'>-	ret = sscanf(cmd_buf, "%x %x %x", &amp;cmd, &amp;p1, &amp;p2);</div><div class='del'>-	if (ret != 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (cmd == SD_TOOL_ZONE) {</div><div class='del'>-		id = p1;</div><div class='del'>-		zone = p2;</div><div class='del'>-		zone &amp;= 0x3ff;</div><div class='del'>-		pr_debug("msdc host_id&lt;%d&gt; zone&lt;0x%.8x&gt;\n", id, zone);</div><div class='del'>-		if (id &gt;= 0 &amp;&amp; id &lt;= 3) {</div><div class='del'>-			sd_debug_zone[id] = zone;</div><div class='del'>-		} else if (id == 4) {</div><div class='del'>-			sd_debug_zone[0] = sd_debug_zone[1] = zone;</div><div class='del'>-			sd_debug_zone[2] = sd_debug_zone[3] = zone;</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("msdc host_id error when set debug zone\n");</div><div class='del'>-		}</div><div class='del'>-	} else if (cmd == SD_TOOL_SDIO_PROFILE) {</div><div class='del'>-		if (p1 == 1) { /* enable profile */</div><div class='del'>-			if (gpt_enable == 0)</div><div class='del'>-				gpt_enable = 1;</div><div class='del'>-			sdio_pro_enable = 1;</div><div class='del'>-			if (p2 == 0)</div><div class='del'>-				p2 = 1;</div><div class='del'>-			if (p2 &gt;= 30)</div><div class='del'>-				p2 = 30;</div><div class='del'>-			sdio_pro_time = p2;</div><div class='del'>-		} else if (p1 == 0) {</div><div class='del'>-			/* todo */</div><div class='del'>-			sdio_pro_enable = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_debug_show(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, msdc_debug_proc_read, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations msdc_debug_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= msdc_debug_show,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.write		= msdc_debug_proc_write,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void msdc_debug_proc_init(void)</div><div class='del'>-{</div><div class='del'>-	proc_create("msdc_debug", 0660, NULL, &amp;msdc_debug_fops);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(msdc_debug_proc_init);</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/dbg.h b/drivers/staging/mt7621-mmc/dbg.h<br/>deleted file mode 100644<br/>index 2d447b2d92ae..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/dbg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/dbg.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-/* Copyright Statement:</div><div class='del'>- *</div><div class='del'>- * This software/firmware and related documentation ("MediaTek Software") are</div><div class='del'>- * protected under relevant copyright laws. The information contained herein</div><div class='del'>- * is confidential and proprietary to MediaTek Inc. and/or its licensors.</div><div class='del'>- * Without the prior written permission of MediaTek inc. and/or its licensors,</div><div class='del'>- * any reproduction, modification, use or disclosure of MediaTek Software,</div><div class='del'>- * and information contained herein, in whole or in part, shall be strictly</div><div class='del'>- * prohibited.</div><div class='del'>- *</div><div class='del'>- * MediaTek Inc. (C) 2010. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES</div><div class='del'>- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")</div><div class='del'>- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON</div><div class='del'>- * AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.</div><div class='del'>- * NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE</div><div class='del'>- * SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR</div><div class='del'>- * SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH</div><div class='del'>- * THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY</div><div class='del'>- * ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY</div><div class='del'>- * THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK</div><div class='del'>- * SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO</div><div class='del'>- * RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN</div><div class='del'>- * FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND</div><div class='del'>- * CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED</div><div class='del'>- * HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK</div><div class='del'>- * SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE</div><div class='del'>- * PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.</div><div class='del'>- *</div><div class='del'>- * The following software/firmware and/or related documentation</div><div class='del'>- * ("MediaTek Software") have been modified by MediaTek Inc. All revisions are</div><div class='del'>- * subject to any receiver's applicable license agreements with MediaTek Inc.</div><div class='del'>- */</div><div class='del'>-#ifndef __MT_MSDC_DEUBG__</div><div class='del'>-#define __MT_MSDC_DEUBG__</div><div class='del'>-</div><div class='del'>-//==========================</div><div class='del'>-extern u32 sdio_pro_enable;</div><div class='del'>-/* for a type command, e.g. CMD53, 2 blocks */</div><div class='del'>-struct cmd_profile {</div><div class='del'>-	u32 max_tc;    /* Max tick count */</div><div class='del'>-	u32 min_tc;</div><div class='del'>-	u32 tot_tc;    /* total tick count */</div><div class='del'>-	u32 tot_bytes;</div><div class='del'>-	u32 count;     /* the counts of the command */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* dump when total_tc and total_bytes */</div><div class='del'>-struct sdio_profile {</div><div class='del'>-	u32 total_tc;         /* total tick count of CMD52 and CMD53 */</div><div class='del'>-	u32 total_tx_bytes;   /* total bytes of CMD53 Tx */</div><div class='del'>-	u32 total_rx_bytes;   /* total bytes of CMD53 Rx */</div><div class='del'>-</div><div class='del'>-	/*CMD52*/</div><div class='del'>-	struct cmd_profile cmd52_tx;</div><div class='del'>-	struct cmd_profile cmd52_rx;</div><div class='del'>-</div><div class='del'>-	/*CMD53 in byte unit */</div><div class='del'>-	struct cmd_profile cmd53_tx_byte[512];</div><div class='del'>-	struct cmd_profile cmd53_rx_byte[512];</div><div class='del'>-</div><div class='del'>-	/*CMD53 in block unit */</div><div class='del'>-	struct cmd_profile cmd53_tx_blk[100];</div><div class='del'>-	struct cmd_profile cmd53_rx_blk[100];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-//==========================</div><div class='del'>-enum msdc_dbg {</div><div class='del'>-	SD_TOOL_ZONE = 0,</div><div class='del'>-	SD_TOOL_DMA_SIZE  = 1,</div><div class='del'>-	SD_TOOL_PM_ENABLE = 2,</div><div class='del'>-	SD_TOOL_SDIO_PROFILE = 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Debug message event */</div><div class='del'>-#define DBG_EVT_NONE        (0)     /* No event */</div><div class='del'>-#define DBG_EVT_DMA         BIT(0)  /* DMA related event */</div><div class='del'>-#define DBG_EVT_CMD         BIT(1)  /* MSDC CMD related event */</div><div class='del'>-#define DBG_EVT_RSP         BIT(2)  /* MSDC CMD RSP related event */</div><div class='del'>-#define DBG_EVT_INT         BIT(3)  /* MSDC INT event */</div><div class='del'>-#define DBG_EVT_CFG         BIT(4)  /* MSDC CFG event */</div><div class='del'>-#define DBG_EVT_FUC         BIT(5)  /* Function event */</div><div class='del'>-#define DBG_EVT_OPS         BIT(6)  /* Read/Write operation event */</div><div class='del'>-#define DBG_EVT_FIO         BIT(7)  /* FIFO operation event */</div><div class='del'>-#define DBG_EVT_WRN         BIT(8)  /* Warning event */</div><div class='del'>-#define DBG_EVT_PWR         BIT(9)  /* Power event */</div><div class='del'>-#define DBG_EVT_ALL         (0xffffffff)</div><div class='del'>-</div><div class='del'>-#define DBG_EVT_MASK        (DBG_EVT_ALL)</div><div class='del'>-</div><div class='del'>-extern unsigned int sd_debug_zone[4];</div><div class='del'>-#define TAG "msdc"</div><div class='del'>-void msdc_debug_proc_init(void);</div><div class='del'>-</div><div class='del'>-u32 msdc_time_calc(u32 old_L32, u32 old_H32, u32 new_L32, u32 new_H32);</div><div class='del'>-void msdc_performance(u32 opcode, u32 sizes, u32 bRx, u32 ticks);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/mt6575_sd.h b/drivers/staging/mt7621-mmc/mt6575_sd.h<br/>deleted file mode 100644<br/>index 038a484a9476..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/mt6575_sd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/mt6575_sd.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,488 +0,0 @@</div><div class='del'>-/* Copyright Statement:</div><div class='del'>- *</div><div class='del'>- * This software/firmware and related documentation ("MediaTek Software") are</div><div class='del'>- * protected under relevant copyright laws. The information contained herein</div><div class='del'>- * is confidential and proprietary to MediaTek Inc. and/or its licensors.</div><div class='del'>- * Without the prior written permission of MediaTek inc. and/or its licensors,</div><div class='del'>- * any reproduction, modification, use or disclosure of MediaTek Software,</div><div class='del'>- * and information contained herein, in whole or in part, shall be strictly prohibited.</div><div class='del'>- */</div><div class='del'>-/* MediaTek Inc. (C) 2010. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES</div><div class='del'>- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")</div><div class='del'>- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON</div><div class='del'>- * AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.</div><div class='del'>- * NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE</div><div class='del'>- * SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR</div><div class='del'>- * SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH</div><div class='del'>- * THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES</div><div class='del'>- * THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES</div><div class='del'>- * CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK</div><div class='del'>- * SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR</div><div class='del'>- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND</div><div class='del'>- * CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,</div><div class='del'>- * AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,</div><div class='del'>- * OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO</div><div class='del'>- * MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.</div><div class='del'>- *</div><div class='del'>- * The following software/firmware and/or related documentation ("MediaTek Software")</div><div class='del'>- * have been modified by MediaTek Inc. All revisions are subject to any receiver's</div><div class='del'>- * applicable license agreements with MediaTek Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef MT6575_SD_H</div><div class='del'>-#define MT6575_SD_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/mmc/host.h&gt;</div><div class='del'>-</div><div class='del'>-// #include &lt;mach/mt6575_reg_base.h&gt; /* --- by chhung */</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* Common Definition                                                        */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-#define MSDC_FIFO_SZ            (128)</div><div class='del'>-#define MSDC_FIFO_THD           (64)  // (128)</div><div class='del'>-#define MSDC_NUM                (4)</div><div class='del'>-</div><div class='del'>-#define MSDC_MS                 (0)</div><div class='del'>-#define MSDC_SDMMC              (1)</div><div class='del'>-</div><div class='del'>-#define MSDC_BUS_1BITS          (0)</div><div class='del'>-#define MSDC_BUS_4BITS          (1)</div><div class='del'>-#define MSDC_BUS_8BITS          (2)</div><div class='del'>-</div><div class='del'>-#define MSDC_BRUST_8B           (3)</div><div class='del'>-#define MSDC_BRUST_16B          (4)</div><div class='del'>-#define MSDC_BRUST_32B          (5)</div><div class='del'>-#define MSDC_BRUST_64B          (6)</div><div class='del'>-</div><div class='del'>-#define MSDC_PIN_PULL_NONE      (0)</div><div class='del'>-#define MSDC_PIN_PULL_DOWN      (1)</div><div class='del'>-#define MSDC_PIN_PULL_UP        (2)</div><div class='del'>-#define MSDC_PIN_KEEP           (3)</div><div class='del'>-</div><div class='del'>-#define MSDC_MAX_SCLK           (48000000) /* +/- by chhung */</div><div class='del'>-#define MSDC_MIN_SCLK           (260000)</div><div class='del'>-</div><div class='del'>-#define MSDC_AUTOCMD12          (0x0001)</div><div class='del'>-#define MSDC_AUTOCMD23          (0x0002)</div><div class='del'>-#define MSDC_AUTOCMD19          (0x0003)</div><div class='del'>-</div><div class='del'>-#define MSDC_EMMC_BOOTMODE0     (0)     /* Pull low CMD mode */</div><div class='del'>-#define MSDC_EMMC_BOOTMODE1     (1)     /* Reset CMD mode */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RESP_NONE = 0,</div><div class='del'>-	RESP_R1,</div><div class='del'>-	RESP_R2,</div><div class='del'>-	RESP_R3,</div><div class='del'>-	RESP_R4,</div><div class='del'>-	RESP_R5,</div><div class='del'>-	RESP_R6,</div><div class='del'>-	RESP_R7,</div><div class='del'>-	RESP_R1B</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* Register Offset                                                          */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-#define MSDC_CFG         (0x0)</div><div class='del'>-#define MSDC_IOCON       (0x04)</div><div class='del'>-#define MSDC_PS          (0x08)</div><div class='del'>-#define MSDC_INT         (0x0c)</div><div class='del'>-#define MSDC_INTEN       (0x10)</div><div class='del'>-#define MSDC_FIFOCS      (0x14)</div><div class='del'>-#define MSDC_TXDATA      (0x18)</div><div class='del'>-#define MSDC_RXDATA      (0x1c)</div><div class='del'>-#define SDC_CFG          (0x30)</div><div class='del'>-#define SDC_CMD          (0x34)</div><div class='del'>-#define SDC_ARG          (0x38)</div><div class='del'>-#define SDC_STS          (0x3c)</div><div class='del'>-#define SDC_RESP0        (0x40)</div><div class='del'>-#define SDC_RESP1        (0x44)</div><div class='del'>-#define SDC_RESP2        (0x48)</div><div class='del'>-#define SDC_RESP3        (0x4c)</div><div class='del'>-#define SDC_BLK_NUM      (0x50)</div><div class='del'>-#define SDC_CSTS         (0x58)</div><div class='del'>-#define SDC_CSTS_EN      (0x5c)</div><div class='del'>-#define SDC_DCRC_STS     (0x60)</div><div class='del'>-#define EMMC_CFG0        (0x70)</div><div class='del'>-#define EMMC_CFG1        (0x74)</div><div class='del'>-#define EMMC_STS         (0x78)</div><div class='del'>-#define EMMC_IOCON       (0x7c)</div><div class='del'>-#define SDC_ACMD_RESP    (0x80)</div><div class='del'>-#define SDC_ACMD19_TRG   (0x84)</div><div class='del'>-#define SDC_ACMD19_STS   (0x88)</div><div class='del'>-#define MSDC_DMA_SA      (0x90)</div><div class='del'>-#define MSDC_DMA_CA      (0x94)</div><div class='del'>-#define MSDC_DMA_CTRL    (0x98)</div><div class='del'>-#define MSDC_DMA_CFG     (0x9c)</div><div class='del'>-#define MSDC_DBG_SEL     (0xa0)</div><div class='del'>-#define MSDC_DBG_OUT     (0xa4)</div><div class='del'>-#define MSDC_PATCH_BIT   (0xb0)</div><div class='del'>-#define MSDC_PATCH_BIT0  MSDC_PATCH_BIT</div><div class='del'>-#define MSDC_PATCH_BIT1  (0xb4)</div><div class='del'>-#define MSDC_PAD_CTL0    (0xe0)</div><div class='del'>-#define MSDC_PAD_CTL1    (0xe4)</div><div class='del'>-#define MSDC_PAD_CTL2    (0xe8)</div><div class='del'>-#define MSDC_PAD_TUNE    (0xec)</div><div class='del'>-#define MSDC_DAT_RDDLY0  (0xf0)</div><div class='del'>-#define MSDC_DAT_RDDLY1  (0xf4)</div><div class='del'>-#define MSDC_HW_DBG      (0xf8)</div><div class='del'>-#define MSDC_VERSION     (0x100)</div><div class='del'>-#define MSDC_ECO_VER     (0x104)</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* Register Mask                                                            */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-/* MSDC_CFG mask */</div><div class='del'>-#define MSDC_CFG_MODE           (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_CFG_CKPDN          (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define MSDC_CFG_RST            (0x1  &lt;&lt; 2)     /* RW */</div><div class='del'>-#define MSDC_CFG_PIO            (0x1  &lt;&lt; 3)     /* RW */</div><div class='del'>-#define MSDC_CFG_CKDRVEN        (0x1  &lt;&lt; 4)     /* RW */</div><div class='del'>-#define MSDC_CFG_BV18SDT        (0x1  &lt;&lt; 5)     /* RW */</div><div class='del'>-#define MSDC_CFG_BV18PSS        (0x1  &lt;&lt; 6)     /* R  */</div><div class='del'>-#define MSDC_CFG_CKSTB          (0x1  &lt;&lt; 7)     /* R  */</div><div class='del'>-#define MSDC_CFG_CKDIV          (0xff &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_CFG_CKMOD          (0x3  &lt;&lt; 16)    /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_IOCON mask */</div><div class='del'>-#define MSDC_IOCON_SDR104CKS    (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_IOCON_RSPL         (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define MSDC_IOCON_DSPL         (0x1  &lt;&lt; 2)     /* RW */</div><div class='del'>-#define MSDC_IOCON_DDLSEL       (0x1  &lt;&lt; 3)     /* RW */</div><div class='del'>-#define MSDC_IOCON_DDR50CKD     (0x1  &lt;&lt; 4)     /* RW */</div><div class='del'>-#define MSDC_IOCON_DSPLSEL      (0x1  &lt;&lt; 5)     /* RW */</div><div class='del'>-#define MSDC_IOCON_D0SPL        (0x1  &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D1SPL        (0x1  &lt;&lt; 17)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D2SPL        (0x1  &lt;&lt; 18)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D3SPL        (0x1  &lt;&lt; 19)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D4SPL        (0x1  &lt;&lt; 20)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D5SPL        (0x1  &lt;&lt; 21)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D6SPL        (0x1  &lt;&lt; 22)    /* RW */</div><div class='del'>-#define MSDC_IOCON_D7SPL        (0x1  &lt;&lt; 23)    /* RW */</div><div class='del'>-#define MSDC_IOCON_RISCSZ       (0x3  &lt;&lt; 24)    /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_PS mask */</div><div class='del'>-#define MSDC_PS_CDEN            (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_PS_CDSTS           (0x1  &lt;&lt; 1)     /* R  */</div><div class='del'>-#define MSDC_PS_CDDEBOUNCE      (0xf  &lt;&lt; 12)    /* RW */</div><div class='del'>-#define MSDC_PS_DAT             (0xff &lt;&lt; 16)    /* R  */</div><div class='del'>-#define MSDC_PS_CMD             (0x1  &lt;&lt; 24)    /* R  */</div><div class='del'>-#define MSDC_PS_WP              (0x1UL &lt;&lt; 31)    /* R  */</div><div class='del'>-</div><div class='del'>-/* MSDC_INT mask */</div><div class='del'>-#define MSDC_INT_MMCIRQ         (0x1  &lt;&lt; 0)     /* W1C */</div><div class='del'>-#define MSDC_INT_CDSC           (0x1  &lt;&lt; 1)     /* W1C */</div><div class='del'>-#define MSDC_INT_ACMDRDY        (0x1  &lt;&lt; 3)     /* W1C */</div><div class='del'>-#define MSDC_INT_ACMDTMO        (0x1  &lt;&lt; 4)     /* W1C */</div><div class='del'>-#define MSDC_INT_ACMDCRCERR     (0x1  &lt;&lt; 5)     /* W1C */</div><div class='del'>-#define MSDC_INT_DMAQ_EMPTY     (0x1  &lt;&lt; 6)     /* W1C */</div><div class='del'>-#define MSDC_INT_SDIOIRQ        (0x1  &lt;&lt; 7)     /* W1C */</div><div class='del'>-#define MSDC_INT_CMDRDY         (0x1  &lt;&lt; 8)     /* W1C */</div><div class='del'>-#define MSDC_INT_CMDTMO         (0x1  &lt;&lt; 9)     /* W1C */</div><div class='del'>-#define MSDC_INT_RSPCRCERR      (0x1  &lt;&lt; 10)    /* W1C */</div><div class='del'>-#define MSDC_INT_CSTA           (0x1  &lt;&lt; 11)    /* R */</div><div class='del'>-#define MSDC_INT_XFER_COMPL     (0x1  &lt;&lt; 12)    /* W1C */</div><div class='del'>-#define MSDC_INT_DXFER_DONE     (0x1  &lt;&lt; 13)    /* W1C */</div><div class='del'>-#define MSDC_INT_DATTMO         (0x1  &lt;&lt; 14)    /* W1C */</div><div class='del'>-#define MSDC_INT_DATCRCERR      (0x1  &lt;&lt; 15)    /* W1C */</div><div class='del'>-#define MSDC_INT_ACMD19_DONE    (0x1  &lt;&lt; 16)    /* W1C */</div><div class='del'>-</div><div class='del'>-/* MSDC_INTEN mask */</div><div class='del'>-#define MSDC_INTEN_MMCIRQ       (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_INTEN_CDSC         (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define MSDC_INTEN_ACMDRDY      (0x1  &lt;&lt; 3)     /* RW */</div><div class='del'>-#define MSDC_INTEN_ACMDTMO      (0x1  &lt;&lt; 4)     /* RW */</div><div class='del'>-#define MSDC_INTEN_ACMDCRCERR   (0x1  &lt;&lt; 5)     /* RW */</div><div class='del'>-#define MSDC_INTEN_DMAQ_EMPTY   (0x1  &lt;&lt; 6)     /* RW */</div><div class='del'>-#define MSDC_INTEN_SDIOIRQ      (0x1  &lt;&lt; 7)     /* RW */</div><div class='del'>-#define MSDC_INTEN_CMDRDY       (0x1  &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_INTEN_CMDTMO       (0x1  &lt;&lt; 9)     /* RW */</div><div class='del'>-#define MSDC_INTEN_RSPCRCERR    (0x1  &lt;&lt; 10)    /* RW */</div><div class='del'>-#define MSDC_INTEN_CSTA         (0x1  &lt;&lt; 11)    /* RW */</div><div class='del'>-#define MSDC_INTEN_XFER_COMPL   (0x1  &lt;&lt; 12)    /* RW */</div><div class='del'>-#define MSDC_INTEN_DXFER_DONE   (0x1  &lt;&lt; 13)    /* RW */</div><div class='del'>-#define MSDC_INTEN_DATTMO       (0x1  &lt;&lt; 14)    /* RW */</div><div class='del'>-#define MSDC_INTEN_DATCRCERR    (0x1  &lt;&lt; 15)    /* RW */</div><div class='del'>-#define MSDC_INTEN_ACMD19_DONE  (0x1  &lt;&lt; 16)    /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_FIFOCS mask */</div><div class='del'>-#define MSDC_FIFOCS_RXCNT       (0xff &lt;&lt; 0)     /* R */</div><div class='del'>-#define MSDC_FIFOCS_TXCNT       (0xff &lt;&lt; 16)    /* R */</div><div class='del'>-#define MSDC_FIFOCS_CLR         (0x1UL &lt;&lt; 31)    /* RW */</div><div class='del'>-</div><div class='del'>-/* SDC_CFG mask */</div><div class='del'>-#define SDC_CFG_SDIOINTWKUP     (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define SDC_CFG_INSWKUP         (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define SDC_CFG_BUSWIDTH        (0x3  &lt;&lt; 16)    /* RW */</div><div class='del'>-#define SDC_CFG_SDIO            (0x1  &lt;&lt; 19)    /* RW */</div><div class='del'>-#define SDC_CFG_SDIOIDE         (0x1  &lt;&lt; 20)    /* RW */</div><div class='del'>-#define SDC_CFG_INTATGAP        (0x1  &lt;&lt; 21)    /* RW */</div><div class='del'>-#define SDC_CFG_DTOC            (0xffUL &lt;&lt; 24)  /* RW */</div><div class='del'>-</div><div class='del'>-/* SDC_CMD mask */</div><div class='del'>-#define SDC_CMD_OPC             (0x3f &lt;&lt; 0)     /* RW */</div><div class='del'>-#define SDC_CMD_BRK             (0x1  &lt;&lt; 6)     /* RW */</div><div class='del'>-#define SDC_CMD_RSPTYP          (0x7  &lt;&lt; 7)     /* RW */</div><div class='del'>-#define SDC_CMD_DTYP            (0x3  &lt;&lt; 11)    /* RW */</div><div class='del'>-#define SDC_CMD_DTYP            (0x3  &lt;&lt; 11)    /* RW */</div><div class='del'>-#define SDC_CMD_RW              (0x1  &lt;&lt; 13)    /* RW */</div><div class='del'>-#define SDC_CMD_STOP            (0x1  &lt;&lt; 14)    /* RW */</div><div class='del'>-#define SDC_CMD_GOIRQ           (0x1  &lt;&lt; 15)    /* RW */</div><div class='del'>-#define SDC_CMD_BLKLEN          (0xfff &lt;&lt; 16)    /* RW */</div><div class='del'>-#define SDC_CMD_AUTOCMD         (0x3  &lt;&lt; 28)    /* RW */</div><div class='del'>-#define SDC_CMD_VOLSWTH         (0x1  &lt;&lt; 30)    /* RW */</div><div class='del'>-</div><div class='del'>-/* SDC_STS mask */</div><div class='del'>-#define SDC_STS_SDCBUSY         (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define SDC_STS_CMDBUSY         (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define SDC_STS_SWR_COMPL       (0x1  &lt;&lt; 31)    /* RW */</div><div class='del'>-</div><div class='del'>-/* SDC_DCRC_STS mask */</div><div class='del'>-#define SDC_DCRC_STS_NEG        (0xf  &lt;&lt; 8)     /* RO */</div><div class='del'>-#define SDC_DCRC_STS_POS        (0xff &lt;&lt; 0)     /* RO */</div><div class='del'>-</div><div class='del'>-/* EMMC_CFG0 mask */</div><div class='del'>-#define EMMC_CFG0_BOOTSTART     (0x1  &lt;&lt; 0)     /* W */</div><div class='del'>-#define EMMC_CFG0_BOOTSTOP      (0x1  &lt;&lt; 1)     /* W */</div><div class='del'>-#define EMMC_CFG0_BOOTMODE      (0x1  &lt;&lt; 2)     /* RW */</div><div class='del'>-#define EMMC_CFG0_BOOTACKDIS    (0x1  &lt;&lt; 3)     /* RW */</div><div class='del'>-#define EMMC_CFG0_BOOTWDLY      (0x7  &lt;&lt; 12)    /* RW */</div><div class='del'>-#define EMMC_CFG0_BOOTSUPP      (0x1  &lt;&lt; 15)    /* RW */</div><div class='del'>-</div><div class='del'>-/* EMMC_CFG1 mask */</div><div class='del'>-#define EMMC_CFG1_BOOTDATTMC    (0xfffff &lt;&lt; 0)  /* RW */</div><div class='del'>-#define EMMC_CFG1_BOOTACKTMC    (0xfffUL &lt;&lt; 20) /* RW */</div><div class='del'>-</div><div class='del'>-/* EMMC_STS mask */</div><div class='del'>-#define EMMC_STS_BOOTCRCERR     (0x1  &lt;&lt; 0)     /* W1C */</div><div class='del'>-#define EMMC_STS_BOOTACKERR     (0x1  &lt;&lt; 1)     /* W1C */</div><div class='del'>-#define EMMC_STS_BOOTDATTMO     (0x1  &lt;&lt; 2)     /* W1C */</div><div class='del'>-#define EMMC_STS_BOOTACKTMO     (0x1  &lt;&lt; 3)     /* W1C */</div><div class='del'>-#define EMMC_STS_BOOTUPSTATE    (0x1  &lt;&lt; 4)     /* R */</div><div class='del'>-#define EMMC_STS_BOOTACKRCV     (0x1  &lt;&lt; 5)     /* W1C */</div><div class='del'>-#define EMMC_STS_BOOTDATRCV     (0x1  &lt;&lt; 6)     /* R */</div><div class='del'>-</div><div class='del'>-/* EMMC_IOCON mask */</div><div class='del'>-#define EMMC_IOCON_BOOTRST      (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-</div><div class='del'>-/* SDC_ACMD19_TRG mask */</div><div class='del'>-#define SDC_ACMD19_TRG_TUNESEL  (0xf  &lt;&lt; 0)     /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_DMA_CTRL mask */</div><div class='del'>-#define MSDC_DMA_CTRL_START     (0x1  &lt;&lt; 0)     /* W */</div><div class='del'>-#define MSDC_DMA_CTRL_STOP      (0x1  &lt;&lt; 1)     /* W */</div><div class='del'>-#define MSDC_DMA_CTRL_RESUME    (0x1  &lt;&lt; 2)     /* W */</div><div class='del'>-#define MSDC_DMA_CTRL_MODE      (0x1  &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_DMA_CTRL_LASTBUF   (0x1  &lt;&lt; 10)    /* RW */</div><div class='del'>-#define MSDC_DMA_CTRL_BRUSTSZ   (0x7  &lt;&lt; 12)    /* RW */</div><div class='del'>-#define MSDC_DMA_CTRL_XFERSZ    (0xffffUL &lt;&lt; 16)/* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_DMA_CFG mask */</div><div class='del'>-#define MSDC_DMA_CFG_STS        (0x1  &lt;&lt; 0)     /* R */</div><div class='del'>-#define MSDC_DMA_CFG_DECSEN     (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define MSDC_DMA_CFG_BDCSERR    (0x1  &lt;&lt; 4)     /* R */</div><div class='del'>-#define MSDC_DMA_CFG_GPDCSERR   (0x1  &lt;&lt; 5)     /* R */</div><div class='del'>-</div><div class='del'>-/* MSDC_PATCH_BIT mask */</div><div class='del'>-#define MSDC_PATCH_BIT_WFLSMODE (0x1  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_ODDSUPP  (0x1  &lt;&lt; 1)     /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_CKGEN_CK (0x1  &lt;&lt; 6)     /* E2: Fixed to 1 */</div><div class='del'>-#define MSDC_PATCH_BIT_IODSSEL  (0x1  &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_IOINTSEL (0x1  &lt;&lt; 17)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_BUSYDLY  (0xf  &lt;&lt; 18)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_WDOD     (0xf  &lt;&lt; 22)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_IDRTSEL  (0x1  &lt;&lt; 26)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_CMDFSEL  (0x1  &lt;&lt; 27)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_INTDLSEL (0x1  &lt;&lt; 28)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_SPCPUSH  (0x1  &lt;&lt; 29)    /* RW */</div><div class='del'>-#define MSDC_PATCH_BIT_DECRCTMO (0x1  &lt;&lt; 30)    /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_PATCH_BIT1 mask */</div><div class='del'>-#define MSDC_PATCH_BIT1_WRDAT_CRCS  (0x7 &lt;&lt; 3)</div><div class='del'>-#define MSDC_PATCH_BIT1_CMD_RSP     (0x7 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/* MSDC_PAD_CTL0 mask */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKDRVN   (0x7  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKDRVP   (0x7  &lt;&lt; 4)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKSR     (0x1  &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKPD     (0x1  &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKPU     (0x1  &lt;&lt; 17)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKSMT    (0x1  &lt;&lt; 18)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKIES    (0x1  &lt;&lt; 19)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKTDSEL  (0xf  &lt;&lt; 20)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL0_CLKRDSEL  (0xffUL &lt;&lt; 24)   /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_PAD_CTL1 mask */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDDRVN   (0x7  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDDRVP   (0x7  &lt;&lt; 4)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDSR     (0x1  &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDPD     (0x1  &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDPU     (0x1  &lt;&lt; 17)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDSMT    (0x1  &lt;&lt; 18)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDIES    (0x1  &lt;&lt; 19)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDTDSEL  (0xf  &lt;&lt; 20)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL1_CMDRDSEL  (0xffUL &lt;&lt; 24)   /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_PAD_CTL2 mask */</div><div class='del'>-#define MSDC_PAD_CTL2_DATDRVN   (0x7  &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATDRVP   (0x7  &lt;&lt; 4)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATSR     (0x1  &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATPD     (0x1  &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATPU     (0x1  &lt;&lt; 17)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATIES    (0x1  &lt;&lt; 19)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATSMT    (0x1  &lt;&lt; 18)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATTDSEL  (0xf  &lt;&lt; 20)    /* RW */</div><div class='del'>-#define MSDC_PAD_CTL2_DATRDSEL  (0xffUL &lt;&lt; 24)   /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_PAD_TUNE mask */</div><div class='del'>-#define MSDC_PAD_TUNE_DATWRDLY  (0x1F &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_PAD_TUNE_DATRRDLY  (0x1F &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_PAD_TUNE_CMDRDLY   (0x1F &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_PAD_TUNE_CMDRRDLY  (0x1FUL &lt;&lt; 22)  /* RW */</div><div class='del'>-#define MSDC_PAD_TUNE_CLKTXDLY  (0x1FUL &lt;&lt; 27)  /* RW */</div><div class='del'>-</div><div class='del'>-/* MSDC_DAT_RDDLY0/1 mask */</div><div class='del'>-#define MSDC_DAT_RDDLY0_D0      (0x1F &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_DAT_RDDLY0_D1      (0x1F &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_DAT_RDDLY0_D2      (0x1F &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_DAT_RDDLY0_D3      (0x1F &lt;&lt; 24)    /* RW */</div><div class='del'>-</div><div class='del'>-#define MSDC_DAT_RDDLY1_D4      (0x1F &lt;&lt; 0)     /* RW */</div><div class='del'>-#define MSDC_DAT_RDDLY1_D5      (0x1F &lt;&lt; 8)     /* RW */</div><div class='del'>-#define MSDC_DAT_RDDLY1_D6      (0x1F &lt;&lt; 16)    /* RW */</div><div class='del'>-#define MSDC_DAT_RDDLY1_D7      (0x1F &lt;&lt; 24)    /* RW */</div><div class='del'>-</div><div class='del'>-#define MSDC_CKGEN_MSDC_DLY_SEL   (0x1F &lt;&lt; 10)</div><div class='del'>-#define MSDC_INT_DAT_LATCH_CK_SEL  (0x7 &lt;&lt; 7)</div><div class='del'>-#define MSDC_CKGEN_MSDC_CK_SEL     (0x1 &lt;&lt; 6)</div><div class='del'>-#define CARD_READY_FOR_DATA		BIT(8)</div><div class='del'>-#define CARD_CURRENT_STATE(x)           ((x &amp; 0x00001E00) &gt;&gt; 9)</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* Descriptor Structure                                                     */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-struct gpd {</div><div class='del'>-	u32  hwo:1; /* could be changed by hw */</div><div class='del'>-	u32  bdp:1;</div><div class='del'>-	u32  rsv0:6;</div><div class='del'>-	u32  chksum:8;</div><div class='del'>-	u32  intr:1;</div><div class='del'>-	u32  rsv1:15;</div><div class='del'>-	void *next;</div><div class='del'>-	void *ptr;</div><div class='del'>-	u32  buflen:16;</div><div class='del'>-	u32  extlen:8;</div><div class='del'>-	u32  rsv2:8;</div><div class='del'>-	u32  arg;</div><div class='del'>-	u32  blknum;</div><div class='del'>-	u32  cmd;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bd {</div><div class='del'>-	u32  eol:1;</div><div class='del'>-	u32  rsv0:7;</div><div class='del'>-	u32  chksum:8;</div><div class='del'>-	u32  rsv1:1;</div><div class='del'>-	u32  blkpad:1;</div><div class='del'>-	u32  dwpad:1;</div><div class='del'>-	u32  rsv2:13;</div><div class='del'>-	void *next;</div><div class='del'>-	void *ptr;</div><div class='del'>-	u32  buflen:16;</div><div class='del'>-	u32  rsv3:16;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct msdc_dma {</div><div class='del'>-	struct gpd *gpd;                  /* pointer to gpd array */</div><div class='del'>-	struct bd  *bd;                   /* pointer to bd array */</div><div class='del'>-	dma_addr_t gpd_addr;         /* the physical address of gpd array */</div><div class='del'>-	dma_addr_t bd_addr;          /* the physical address of bd array */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct msdc_host {</div><div class='del'>-	struct msdc_hw              *hw;</div><div class='del'>-</div><div class='del'>-	struct mmc_host             *mmc;           /* mmc structure */</div><div class='del'>-	struct mmc_command          *cmd;</div><div class='del'>-	struct mmc_data             *data;</div><div class='del'>-	struct mmc_request          *mrq;</div><div class='del'>-	int                         cmd_rsp;</div><div class='del'>-</div><div class='del'>-	int                         error;</div><div class='del'>-	spinlock_t                  lock;           /* mutex */</div><div class='del'>-	struct semaphore            sem;</div><div class='del'>-</div><div class='del'>-	u32                         blksz;          /* host block size */</div><div class='del'>-	void __iomem                *base;           /* host base address */</div><div class='del'>-	int                         id;             /* host id */</div><div class='del'>-	int                         pwr_ref;        /* core power reference count */</div><div class='del'>-</div><div class='del'>-	u32                         xfer_size;      /* total transferred size */</div><div class='del'>-</div><div class='del'>-	struct msdc_dma             dma;            /* dma channel */</div><div class='del'>-	u32                         dma_xfer_size;  /* dma transfer size in bytes */</div><div class='del'>-</div><div class='del'>-	u32                         timeout_ns;     /* data timeout ns */</div><div class='del'>-	u32                         timeout_clks;   /* data timeout clks */</div><div class='del'>-</div><div class='del'>-	int                         irq;            /* host interrupt */</div><div class='del'>-</div><div class='del'>-	struct delayed_work		card_delaywork;</div><div class='del'>-</div><div class='del'>-	struct completion           cmd_done;</div><div class='del'>-	struct completion           xfer_done;</div><div class='del'>-	struct pm_message           pm_state;</div><div class='del'>-</div><div class='del'>-	u32                         mclk;           /* mmc subsystem clock */</div><div class='del'>-	u32                         hclk;           /* host clock speed */</div><div class='del'>-	u32                         sclk;           /* SD/MS clock speed */</div><div class='del'>-	u8                          core_clkon;     /* Host core clock on ? */</div><div class='del'>-	u8                          card_clkon;     /* Card clock on ? */</div><div class='del'>-	u8                          core_power;     /* core power */</div><div class='del'>-	u8                          power_mode;     /* host power mode */</div><div class='del'>-	u8                          card_inserted;  /* card inserted ? */</div><div class='del'>-	u8                          suspend;        /* host suspended ? */</div><div class='del'>-	u8                          app_cmd;        /* for app command */</div><div class='del'>-	u32                         app_cmd_arg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void sdr_set_bits(void __iomem *reg, u32 bs)</div><div class='del'>-{</div><div class='del'>-	u32 val = readl(reg);</div><div class='del'>-</div><div class='del'>-	val |= bs;</div><div class='del'>-	writel(val, reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sdr_clr_bits(void __iomem *reg, u32 bs)</div><div class='del'>-{</div><div class='del'>-	u32 val = readl(reg);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~bs;</div><div class='del'>-	writel(val, reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sdr_set_field(void __iomem *reg, u32 field, u32 val)</div><div class='del'>-{</div><div class='del'>-	unsigned int tv = readl(reg);</div><div class='del'>-</div><div class='del'>-	tv &amp;= ~field;</div><div class='del'>-	tv |= ((val) &lt;&lt; (ffs((unsigned int)field) - 1));</div><div class='del'>-	writel(tv, reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sdr_get_field(void __iomem *reg, u32 field, u32 *val)</div><div class='del'>-{</div><div class='del'>-	unsigned int tv = readl(reg);</div><div class='del'>-	*val = ((tv &amp; field) &gt;&gt; (ffs((unsigned int)field) - 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c<br/>deleted file mode 100644<br/>index 4b26ec896a96..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-mmc/sd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-mmc/sd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1855 +0,0 @@</div><div class='del'>-/* Copyright Statement:</div><div class='del'>- *</div><div class='del'>- * This software/firmware and related documentation ("MediaTek Software") are</div><div class='del'>- * protected under relevant copyright laws. The information contained herein</div><div class='del'>- * is confidential and proprietary to MediaTek Inc. and/or its licensors.</div><div class='del'>- * Without the prior written permission of MediaTek inc. and/or its licensors,</div><div class='del'>- * any reproduction, modification, use or disclosure of MediaTek Software,</div><div class='del'>- * and information contained herein, in whole or in part, shall be strictly prohibited.</div><div class='del'>- *</div><div class='del'>- * MediaTek Inc. (C) 2010. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES</div><div class='del'>- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")</div><div class='del'>- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON</div><div class='del'>- * AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.</div><div class='del'>- * NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE</div><div class='del'>- * SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR</div><div class='del'>- * SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH</div><div class='del'>- * THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES</div><div class='del'>- * THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES</div><div class='del'>- * CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK</div><div class='del'>- * SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR</div><div class='del'>- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND</div><div class='del'>- * CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,</div><div class='del'>- * AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,</div><div class='del'>- * OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO</div><div class='del'>- * MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.</div><div class='del'>- *</div><div class='del'>- * The following software/firmware and/or related documentation ("MediaTek Software")</div><div class='del'>- * have been modified by MediaTek Inc. All revisions are subject to any receiver's</div><div class='del'>- * applicable license agreements with MediaTek Inc.</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/delay.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mmc/host.h&gt;</div><div class='del'>-#include &lt;linux/mmc/mmc.h&gt;</div><div class='del'>-#include &lt;linux/mmc/sd.h&gt;</div><div class='del'>-#include &lt;linux/mmc/sdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-ralink/ralink_regs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "board.h"</div><div class='del'>-#include "dbg.h"</div><div class='del'>-#include "mt6575_sd.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SOC_MT7621</div><div class='del'>-#define RALINK_SYSCTL_BASE		0xbe000000</div><div class='del'>-#else</div><div class='del'>-#define RALINK_SYSCTL_BASE		0xb0000000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define DRV_NAME            "mtk-sd"</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SOC_MT7620)</div><div class='del'>-#define HOST_MAX_MCLK       (48000000) /* +/- by chhung */</div><div class='del'>-#elif defined(CONFIG_SOC_MT7621)</div><div class='del'>-#define HOST_MAX_MCLK       (50000000) /* +/- by chhung */</div><div class='del'>-#endif</div><div class='del'>-#define HOST_MIN_MCLK       (260000)</div><div class='del'>-</div><div class='del'>-#define HOST_MAX_BLKSZ      (2048)</div><div class='del'>-</div><div class='del'>-#define MSDC_OCR_AVAIL      (MMC_VDD_28_29 | MMC_VDD_29_30 | MMC_VDD_30_31 | MMC_VDD_31_32 | MMC_VDD_32_33)</div><div class='del'>-</div><div class='del'>-#define GPIO_PULL_DOWN      (0)</div><div class='del'>-#define GPIO_PULL_UP        (1)</div><div class='del'>-</div><div class='del'>-#define DEFAULT_DEBOUNCE    (8)       /* 8 cycles */</div><div class='del'>-#define DEFAULT_DTOC        (40)      /* data timeout counter. 65536x40 sclk. */</div><div class='del'>-</div><div class='del'>-#define CMD_TIMEOUT         (HZ / 10)     /* 100ms */</div><div class='del'>-#define DAT_TIMEOUT         (HZ / 2 * 5)  /* 500ms x5 */</div><div class='del'>-</div><div class='del'>-#define MAX_DMA_CNT         (64 * 1024 - 512)   /* a single transaction for WIFI may be 50K*/</div><div class='del'>-</div><div class='del'>-#define MAX_GPD_NUM         (1 + 1)  /* one null gpd */</div><div class='del'>-#define MAX_BD_NUM          (1024)</div><div class='del'>-</div><div class='del'>-#define MAX_HW_SGMTS        (MAX_BD_NUM)</div><div class='del'>-#define MAX_SGMT_SZ         (MAX_DMA_CNT)</div><div class='del'>-#define MAX_REQ_SZ          (MAX_SGMT_SZ * 8)</div><div class='del'>-</div><div class='del'>-static int cd_active_low = 1;</div><div class='del'>-</div><div class='del'>-//=================================</div><div class='del'>-#define PERI_MSDC0_PDN      (15)</div><div class='del'>-//#define PERI_MSDC1_PDN    (16)</div><div class='del'>-//#define PERI_MSDC2_PDN    (17)</div><div class='del'>-//#define PERI_MSDC3_PDN    (18)</div><div class='del'>-</div><div class='del'>-/* +++ by chhung */</div><div class='del'>-struct msdc_hw msdc0_hw = {</div><div class='del'>-	.clk_src        = 0,</div><div class='del'>-	.flags          = MSDC_CD_PIN_EN | MSDC_REMOVABLE,</div><div class='del'>-//	.flags          = MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* end of +++ */</div><div class='del'>-</div><div class='del'>-static int msdc_rsp[] = {</div><div class='del'>-	0,  /* RESP_NONE */</div><div class='del'>-	1,  /* RESP_R1 */</div><div class='del'>-	2,  /* RESP_R2 */</div><div class='del'>-	3,  /* RESP_R3 */</div><div class='del'>-	4,  /* RESP_R4 */</div><div class='del'>-	1,  /* RESP_R5 */</div><div class='del'>-	1,  /* RESP_R6 */</div><div class='del'>-	1,  /* RESP_R7 */</div><div class='del'>-	7,  /* RESP_R1b */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define msdc_dma_on()        sdr_clr_bits(host-&gt;base + MSDC_CFG, MSDC_CFG_PIO)</div><div class='del'>-</div><div class='del'>-static void msdc_reset_hw(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_CFG, MSDC_CFG_RST);</div><div class='del'>-	while (readl(host-&gt;base + MSDC_CFG) &amp; MSDC_CFG_RST)</div><div class='del'>-		cpu_relax();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define msdc_clr_int() \</div><div class='del'>-	do {							\</div><div class='del'>-		volatile u32 val = readl(host-&gt;base + MSDC_INT);	\</div><div class='del'>-		writel(val, host-&gt;base + MSDC_INT);			\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-static void msdc_clr_fifo(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_FIFOCS, MSDC_FIFOCS_CLR);</div><div class='del'>-	while (readl(host-&gt;base + MSDC_FIFOCS) &amp; MSDC_FIFOCS_CLR)</div><div class='del'>-		cpu_relax();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define msdc_irq_save(val) \</div><div class='del'>-	do {					\</div><div class='del'>-		val = readl(host-&gt;base + MSDC_INTEN);	\</div><div class='del'>-		sdr_clr_bits(host-&gt;base + MSDC_INTEN, val);	\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* clock source for host: global */</div><div class='del'>-#if defined(CONFIG_SOC_MT7620)</div><div class='del'>-static u32 hclks[] = {48000000}; /* +/- by chhung */</div><div class='del'>-#elif defined(CONFIG_SOC_MT7621)</div><div class='del'>-static u32 hclks[] = {50000000}; /* +/- by chhung */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define sdc_is_busy()          (readl(host-&gt;base + SDC_STS) &amp; SDC_STS_SDCBUSY)</div><div class='del'>-#define sdc_is_cmd_busy()      (readl(host-&gt;base + SDC_STS) &amp; SDC_STS_CMDBUSY)</div><div class='del'>-</div><div class='del'>-#define sdc_send_cmd(cmd, arg) \</div><div class='del'>-	do {					\</div><div class='del'>-		writel((arg), host-&gt;base + SDC_ARG);	\</div><div class='del'>-		writel((cmd), host-&gt;base + SDC_CMD);	\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* +++ by chhung */</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-#define PHYSADDR(a)             (((unsigned long)(a)) &amp; 0x1fffffff)</div><div class='del'>-#else</div><div class='del'>-#define PHYSADDR(a)             ((a) &amp; 0x1fffffff)</div><div class='del'>-#endif</div><div class='del'>-/* end of +++ */</div><div class='del'>-static unsigned int msdc_do_command(struct msdc_host   *host,</div><div class='del'>-				    struct mmc_command *cmd,</div><div class='del'>-				    int                 tune,</div><div class='del'>-				    unsigned long       timeout);</div><div class='del'>-</div><div class='del'>-static int msdc_tune_cmdrsp(struct msdc_host *host, struct mmc_command *cmd);</div><div class='del'>-</div><div class='del'>-static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)</div><div class='del'>-{</div><div class='del'>-	u32 timeout, clk_ns;</div><div class='del'>-</div><div class='del'>-	host-&gt;timeout_ns   = ns;</div><div class='del'>-	host-&gt;timeout_clks = clks;</div><div class='del'>-</div><div class='del'>-	clk_ns  = 1000000000UL / host-&gt;sclk;</div><div class='del'>-	timeout = ns / clk_ns + clks;</div><div class='del'>-	timeout = timeout &gt;&gt; 16; /* in 65536 sclk cycle unit */</div><div class='del'>-	timeout = timeout &gt; 1 ? timeout - 1 : 0;</div><div class='del'>-	timeout = timeout &gt; 255 ? 255 : timeout;</div><div class='del'>-</div><div class='del'>-	sdr_set_field(host-&gt;base + SDC_CFG, SDC_CFG_DTOC, timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void msdc_tasklet_card(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = (struct msdc_host *)container_of(work,</div><div class='del'>-				struct msdc_host, card_delaywork.work);</div><div class='del'>-	u32 inserted;</div><div class='del'>-	u32 status = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;host-&gt;lock);</div><div class='del'>-</div><div class='del'>-	status = readl(host-&gt;base + MSDC_PS);</div><div class='del'>-	if (cd_active_low)</div><div class='del'>-		inserted = (status &amp; MSDC_PS_CDSTS) ? 0 : 1;</div><div class='del'>-	else</div><div class='del'>-		inserted = (status &amp; MSDC_PS_CDSTS) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	/* Make sure: handle the last interrupt */</div><div class='del'>-	host-&gt;card_inserted = inserted;</div><div class='del'>-</div><div class='del'>-	if (!host-&gt;suspend) {</div><div class='del'>-		host-&gt;mmc-&gt;f_max = HOST_MAX_MCLK;</div><div class='del'>-		mmc_detect_change(host-&gt;mmc, msecs_to_jiffies(20));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;host-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz)</div><div class='del'>-{</div><div class='del'>-	//struct msdc_hw *hw = host-&gt;hw;</div><div class='del'>-	u32 mode;</div><div class='del'>-	u32 flags;</div><div class='del'>-	u32 div;</div><div class='del'>-	u32 sclk;</div><div class='del'>-	u32 hclk = host-&gt;hclk;</div><div class='del'>-	//u8  clksrc = hw-&gt;clk_src;</div><div class='del'>-</div><div class='del'>-	if (!hz) { // set mmc system clock to 0 ?</div><div class='del'>-		msdc_reset_hw(host);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msdc_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	if (ddr) {</div><div class='del'>-		mode = 0x2; /* ddr mode and use divisor */</div><div class='del'>-		if (hz &gt;= (hclk &gt;&gt; 2)) {</div><div class='del'>-			div  = 1;         /* mean div = 1/4 */</div><div class='del'>-			sclk = hclk &gt;&gt; 2; /* sclk = clk / 4 */</div><div class='del'>-		} else {</div><div class='del'>-			div  = (hclk + ((hz &lt;&lt; 2) - 1)) / (hz &lt;&lt; 2);</div><div class='del'>-			sclk = (hclk &gt;&gt; 2) / div;</div><div class='del'>-		}</div><div class='del'>-	} else if (hz &gt;= hclk) { /* bug fix */</div><div class='del'>-		mode = 0x1; /* no divisor and divisor is ignored */</div><div class='del'>-		div  = 0;</div><div class='del'>-		sclk = hclk;</div><div class='del'>-	} else {</div><div class='del'>-		mode = 0x0; /* use divisor */</div><div class='del'>-		if (hz &gt;= (hclk &gt;&gt; 1)) {</div><div class='del'>-			div  = 0;         /* mean div = 1/2 */</div><div class='del'>-			sclk = hclk &gt;&gt; 1; /* sclk = clk / 2 */</div><div class='del'>-		} else {</div><div class='del'>-			div  = (hclk + ((hz &lt;&lt; 2) - 1)) / (hz &lt;&lt; 2);</div><div class='del'>-			sclk = (hclk &gt;&gt; 2) / div;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set clock mode and divisor */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_CFG, MSDC_CFG_CKMOD, mode);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_CFG, MSDC_CFG_CKDIV, div);</div><div class='del'>-</div><div class='del'>-	/* wait clock stable */</div><div class='del'>-	while (!(readl(host-&gt;base + MSDC_CFG) &amp; MSDC_CFG_CKSTB))</div><div class='del'>-		cpu_relax();</div><div class='del'>-</div><div class='del'>-	host-&gt;sclk = sclk;</div><div class='del'>-	host-&gt;mclk = hz;</div><div class='del'>-	msdc_set_timeout(host, host-&gt;timeout_ns, host-&gt;timeout_clks); // need?</div><div class='del'>-</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_INTEN, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fix me. when need to abort */</div><div class='del'>-static void msdc_abort_data(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	struct mmc_command *stop = host-&gt;mrq-&gt;stop;</div><div class='del'>-</div><div class='del'>-	dev_err(mmc_dev(host-&gt;mmc), "%d -&gt; Need to Abort.\n", host-&gt;id);</div><div class='del'>-</div><div class='del'>-	msdc_reset_hw(host);</div><div class='del'>-	msdc_clr_fifo(host);</div><div class='del'>-	msdc_clr_int();</div><div class='del'>-</div><div class='del'>-	// need to check FIFO count 0 ?</div><div class='del'>-</div><div class='del'>-	if (stop) {  /* try to stop, but may not success */</div><div class='del'>-		dev_err(mmc_dev(host-&gt;mmc), "%d -&gt; stop when abort CMD&lt;%d&gt;\n",</div><div class='del'>-			host-&gt;id, stop-&gt;opcode);</div><div class='del'>-		(void)msdc_do_command(host, stop, 0, CMD_TIMEOUT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	//if (host-&gt;mclk &gt;= 25000000) {</div><div class='del'>-	//      msdc_set_mclk(host, 0, host-&gt;mclk &gt;&gt; 1);</div><div class='del'>-	//}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/*</div><div class='del'>- *   register as callback function of WIFI(combo_sdio_register_pm) .</div><div class='del'>- *  can called by msdc_drv_suspend/resume too.</div><div class='del'>- */</div><div class='del'>-static void msdc_pm(pm_message_t state, void *data)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = (struct msdc_host *)data;</div><div class='del'>-	int evt = state.event;</div><div class='del'>-</div><div class='del'>-	if (evt == PM_EVENT_SUSPEND || evt == PM_EVENT_USER_SUSPEND) {</div><div class='del'>-		if (host-&gt;suspend) /* already suspend */  /* default 0*/</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* for memory card. already power off by mmc */</div><div class='del'>-		if (evt == PM_EVENT_SUSPEND &amp;&amp; host-&gt;power_mode == MMC_POWER_OFF)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		host-&gt;suspend = 1;</div><div class='del'>-		host-&gt;pm_state = state;  /* default PMSG_RESUME */</div><div class='del'>-</div><div class='del'>-	} else if (evt == PM_EVENT_RESUME || evt == PM_EVENT_USER_RESUME) {</div><div class='del'>-		if (!host-&gt;suspend)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* No PM resume when USR suspend */</div><div class='del'>-		if (evt == PM_EVENT_RESUME &amp;&amp; host-&gt;pm_state.event == PM_EVENT_USER_SUSPEND) {</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt; PM Resume when in USR Suspend\n",</div><div class='del'>-				host-&gt;id); /* won't happen. */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		host-&gt;suspend = 0;</div><div class='del'>-		host-&gt;pm_state = state;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline u32 msdc_cmd_find_resp(struct mmc_command *cmd)</div><div class='del'>-{</div><div class='del'>-	u32 opcode = cmd-&gt;opcode;</div><div class='del'>-	u32 resp;</div><div class='del'>-</div><div class='del'>-	if (opcode == MMC_SET_RELATIVE_ADDR) {</div><div class='del'>-		resp = (mmc_cmd_type(cmd) == MMC_CMD_BCR) ? RESP_R6 : RESP_R1;</div><div class='del'>-	} else if (opcode == MMC_FAST_IO) {</div><div class='del'>-		resp = RESP_R4;</div><div class='del'>-	} else if (opcode == MMC_GO_IRQ_STATE) {</div><div class='del'>-		resp = RESP_R5;</div><div class='del'>-	} else if (opcode == MMC_SELECT_CARD) {</div><div class='del'>-		resp = (cmd-&gt;arg != 0) ? RESP_R1B : RESP_NONE;</div><div class='del'>-	} else if (opcode == SD_IO_RW_DIRECT || opcode == SD_IO_RW_EXTENDED) {</div><div class='del'>-		resp = RESP_R1; /* SDIO workaround. */</div><div class='del'>-	} else if (opcode == SD_SEND_IF_COND &amp;&amp; (mmc_cmd_type(cmd) == MMC_CMD_BCR)) {</div><div class='del'>-		resp = RESP_R1;</div><div class='del'>-	} else {</div><div class='del'>-		switch (mmc_resp_type(cmd)) {</div><div class='del'>-		case MMC_RSP_R1:</div><div class='del'>-			resp = RESP_R1;</div><div class='del'>-			break;</div><div class='del'>-		case MMC_RSP_R1B:</div><div class='del'>-			resp = RESP_R1B;</div><div class='del'>-			break;</div><div class='del'>-		case MMC_RSP_R2:</div><div class='del'>-			resp = RESP_R2;</div><div class='del'>-			break;</div><div class='del'>-		case MMC_RSP_R3:</div><div class='del'>-			resp = RESP_R3;</div><div class='del'>-			break;</div><div class='del'>-		case MMC_RSP_NONE:</div><div class='del'>-		default:</div><div class='del'>-			resp = RESP_NONE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* mmc_host_ops members                                                      */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-static unsigned int msdc_command_start(struct msdc_host   *host,</div><div class='del'>-				       struct mmc_command *cmd,</div><div class='del'>-				       unsigned long       timeout)</div><div class='del'>-{</div><div class='del'>-	u32 opcode = cmd-&gt;opcode;</div><div class='del'>-	u32 rawcmd;</div><div class='del'>-	u32 wints = MSDC_INT_CMDRDY  | MSDC_INT_RSPCRCERR  | MSDC_INT_CMDTMO  |</div><div class='del'>-		    MSDC_INT_ACMDRDY | MSDC_INT_ACMDCRCERR | MSDC_INT_ACMDTMO |</div><div class='del'>-		    MSDC_INT_ACMD19_DONE;</div><div class='del'>-</div><div class='del'>-	u32 resp;</div><div class='del'>-	unsigned long tmo;</div><div class='del'>-</div><div class='del'>-	/* Protocol layer does not provide response type, but our hardware needs</div><div class='del'>-	 * to know exact type, not just size!</div><div class='del'>-	 */</div><div class='del'>-	resp = msdc_cmd_find_resp(cmd);</div><div class='del'>-</div><div class='del'>-	cmd-&gt;error = 0;</div><div class='del'>-	/* rawcmd :</div><div class='del'>-	 * vol_swt &lt;&lt; 30 | auto_cmd &lt;&lt; 28 | blklen &lt;&lt; 16 | go_irq &lt;&lt; 15 |</div><div class='del'>-	 * stop &lt;&lt; 14 | rw &lt;&lt; 13 | dtype &lt;&lt; 11 | rsptyp &lt;&lt; 7 | brk &lt;&lt; 6 | opcode</div><div class='del'>-	 */</div><div class='del'>-	rawcmd = opcode | msdc_rsp[resp] &lt;&lt; 7 | host-&gt;blksz &lt;&lt; 16;</div><div class='del'>-</div><div class='del'>-	if (opcode == MMC_READ_MULTIPLE_BLOCK) {</div><div class='del'>-		rawcmd |= (2 &lt;&lt; 11);</div><div class='del'>-	} else if (opcode == MMC_READ_SINGLE_BLOCK) {</div><div class='del'>-		rawcmd |= (1 &lt;&lt; 11);</div><div class='del'>-	} else if (opcode == MMC_WRITE_MULTIPLE_BLOCK) {</div><div class='del'>-		rawcmd |= ((2 &lt;&lt; 11) | (1 &lt;&lt; 13));</div><div class='del'>-	} else if (opcode == MMC_WRITE_BLOCK) {</div><div class='del'>-		rawcmd |= ((1 &lt;&lt; 11) | (1 &lt;&lt; 13));</div><div class='del'>-	} else if (opcode == SD_IO_RW_EXTENDED) {</div><div class='del'>-		if (cmd-&gt;data-&gt;flags &amp; MMC_DATA_WRITE)</div><div class='del'>-			rawcmd |= (1 &lt;&lt; 13);</div><div class='del'>-		if (cmd-&gt;data-&gt;blocks &gt; 1)</div><div class='del'>-			rawcmd |= (2 &lt;&lt; 11);</div><div class='del'>-		else</div><div class='del'>-			rawcmd |= (1 &lt;&lt; 11);</div><div class='del'>-	} else if (opcode == SD_IO_RW_DIRECT &amp;&amp; cmd-&gt;flags == (unsigned int)-1) {</div><div class='del'>-		rawcmd |= (1 &lt;&lt; 14);</div><div class='del'>-	} else if ((opcode == SD_APP_SEND_SCR) ||</div><div class='del'>-		(opcode == SD_APP_SEND_NUM_WR_BLKS) ||</div><div class='del'>-		(opcode == SD_SWITCH &amp;&amp; (mmc_cmd_type(cmd) == MMC_CMD_ADTC)) ||</div><div class='del'>-		(opcode == SD_APP_SD_STATUS &amp;&amp; (mmc_cmd_type(cmd) == MMC_CMD_ADTC)) ||</div><div class='del'>-		(opcode == MMC_SEND_EXT_CSD &amp;&amp; (mmc_cmd_type(cmd) == MMC_CMD_ADTC))) {</div><div class='del'>-		rawcmd |= (1 &lt;&lt; 11);</div><div class='del'>-	} else if (opcode == MMC_STOP_TRANSMISSION) {</div><div class='del'>-		rawcmd |= (1 &lt;&lt; 14);</div><div class='del'>-		rawcmd &amp;= ~(0x0FFF &lt;&lt; 16);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmo = jiffies + timeout;</div><div class='del'>-</div><div class='del'>-	if (opcode == MMC_SEND_STATUS) {</div><div class='del'>-		for (;;) {</div><div class='del'>-			if (!sdc_is_cmd_busy())</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (time_after(jiffies, tmo)) {</div><div class='del'>-				dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-					"%d -&gt; XXX cmd_busy timeout: before CMD&lt;%d&gt;\n",</div><div class='del'>-					host-&gt;id, opcode);</div><div class='del'>-				cmd-&gt;error = -ETIMEDOUT;</div><div class='del'>-				msdc_reset_hw(host);</div><div class='del'>-				goto end;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		for (;;) {</div><div class='del'>-			if (!sdc_is_busy())</div><div class='del'>-				break;</div><div class='del'>-			if (time_after(jiffies, tmo)) {</div><div class='del'>-				dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-					"%d -&gt; XXX sdc_busy timeout: before CMD&lt;%d&gt;\n",</div><div class='del'>-					host-&gt;id, opcode);</div><div class='del'>-				cmd-&gt;error = -ETIMEDOUT;</div><div class='del'>-				msdc_reset_hw(host);</div><div class='del'>-				goto end;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	//BUG_ON(in_interrupt());</div><div class='del'>-	host-&gt;cmd     = cmd;</div><div class='del'>-	host-&gt;cmd_rsp = resp;</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;host-&gt;cmd_done);</div><div class='del'>-</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_INTEN, wints);</div><div class='del'>-	sdc_send_cmd(rawcmd, cmd-&gt;arg);</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-	return cmd-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int msdc_command_resp(struct msdc_host   *host,</div><div class='del'>-				      struct mmc_command *cmd,</div><div class='del'>-				      int                 tune,</div><div class='del'>-				      unsigned long       timeout)</div><div class='del'>-	__must_hold(&amp;host-&gt;lock)</div><div class='del'>-{</div><div class='del'>-	u32 opcode = cmd-&gt;opcode;</div><div class='del'>-	//u32 rawcmd;</div><div class='del'>-	u32 wints = MSDC_INT_CMDRDY  | MSDC_INT_RSPCRCERR  | MSDC_INT_CMDTMO  |</div><div class='del'>-		    MSDC_INT_ACMDRDY | MSDC_INT_ACMDCRCERR | MSDC_INT_ACMDTMO |</div><div class='del'>-		    MSDC_INT_ACMD19_DONE;</div><div class='del'>-</div><div class='del'>-	BUG_ON(in_interrupt());</div><div class='del'>-	//init_completion(&amp;host-&gt;cmd_done);</div><div class='del'>-	//sdr_set_bits(host-&gt;base + MSDC_INTEN, wints);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;host-&gt;lock);</div><div class='del'>-	if (!wait_for_completion_timeout(&amp;host-&gt;cmd_done, 10 * timeout)) {</div><div class='del'>-		dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-			"%d -&gt; XXX CMD&lt;%d&gt; wait_for_completion timeout ARG&lt;0x%.8x&gt;\n",</div><div class='del'>-			host-&gt;id, opcode, cmd-&gt;arg);</div><div class='del'>-		cmd-&gt;error = -ETIMEDOUT;</div><div class='del'>-		msdc_reset_hw(host);</div><div class='del'>-	}</div><div class='del'>-	spin_lock(&amp;host-&gt;lock);</div><div class='del'>-</div><div class='del'>-	sdr_clr_bits(host-&gt;base + MSDC_INTEN, wints);</div><div class='del'>-	host-&gt;cmd = NULL;</div><div class='del'>-</div><div class='del'>-//end:</div><div class='del'>-	/* do we need to save card's RCA when SD_SEND_RELATIVE_ADDR */</div><div class='del'>-</div><div class='del'>-	if (!tune)</div><div class='del'>-		return cmd-&gt;error;</div><div class='del'>-</div><div class='del'>-	/* memory card CRC */</div><div class='del'>-	if (host-&gt;hw-&gt;flags &amp; MSDC_REMOVABLE &amp;&amp; cmd-&gt;error == -EIO) {</div><div class='del'>-		/* check if has data phase */</div><div class='del'>-		if (readl(host-&gt;base + SDC_CMD) &amp; 0x1800) {</div><div class='del'>-			msdc_abort_data(host);</div><div class='del'>-		} else {</div><div class='del'>-			/* do basic: reset*/</div><div class='del'>-			msdc_reset_hw(host);</div><div class='del'>-			msdc_clr_fifo(host);</div><div class='del'>-			msdc_clr_int();</div><div class='del'>-		}</div><div class='del'>-		cmd-&gt;error = msdc_tune_cmdrsp(host, cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	//  check DAT0</div><div class='del'>-	/* if (resp == RESP_R1B) {</div><div class='del'>-	   while ((readl(host-&gt;base + MSDC_PS) &amp; 0x10000) != 0x10000);</div><div class='del'>-	   } */</div><div class='del'>-	/* CMD12 Error Handle */</div><div class='del'>-</div><div class='del'>-	return cmd-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int msdc_do_command(struct msdc_host   *host,</div><div class='del'>-				    struct mmc_command *cmd,</div><div class='del'>-				    int                 tune,</div><div class='del'>-				    unsigned long       timeout)</div><div class='del'>-{</div><div class='del'>-	if (msdc_command_start(host, cmd, timeout))</div><div class='del'>-		goto end;</div><div class='del'>-</div><div class='del'>-	if (msdc_command_resp(host, cmd, tune, timeout))</div><div class='del'>-		goto end;</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-</div><div class='del'>-	return cmd-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void msdc_dma_start(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	u32 wints = MSDC_INTEN_XFER_COMPL | MSDC_INTEN_DATTMO | MSDC_INTEN_DATCRCERR;</div><div class='del'>-</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_INTEN, wints);</div><div class='del'>-	//dsb(); /* --- by chhung */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_START, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void msdc_dma_stop(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	//u32 retries=500;</div><div class='del'>-	u32 wints = MSDC_INTEN_XFER_COMPL | MSDC_INTEN_DATTMO | MSDC_INTEN_DATCRCERR;</div><div class='del'>-</div><div class='del'>-	//while (readl(host-&gt;base + MSDC_DMA_CFG) &amp; MSDC_DMA_CFG_STS);</div><div class='del'>-</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_STOP, 1);</div><div class='del'>-	while (readl(host-&gt;base + MSDC_DMA_CFG) &amp; MSDC_DMA_CFG_STS)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	//dsb(); /* --- by chhung */</div><div class='del'>-	sdr_clr_bits(host-&gt;base + MSDC_INTEN, wints); /* Not just xfer_comp */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* calc checksum */</div><div class='del'>-static u8 msdc_dma_calcs(u8 *buf, u32 len)</div><div class='del'>-{</div><div class='del'>-	u32 i, sum = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++)</div><div class='del'>-		sum += buf[i];</div><div class='del'>-	return 0xFF - (u8)sum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void msdc_dma_setup(struct msdc_host *host, struct msdc_dma *dma,</div><div class='del'>-			   struct scatterlist *sg_cmd, unsigned int sglen)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	struct gpd *gpd;</div><div class='del'>-	struct bd *bd;</div><div class='del'>-	u32 j;</div><div class='del'>-</div><div class='del'>-	BUG_ON(sglen &gt; MAX_BD_NUM); /* not support currently */</div><div class='del'>-</div><div class='del'>-	gpd = dma-&gt;gpd;</div><div class='del'>-	bd  = dma-&gt;bd;</div><div class='del'>-</div><div class='del'>-	/* modify gpd*/</div><div class='del'>-	//gpd-&gt;intr = 0;</div><div class='del'>-	gpd-&gt;hwo = 1;  /* hw will clear it */</div><div class='del'>-	gpd-&gt;bdp = 1;</div><div class='del'>-	gpd-&gt;chksum = 0;  /* need to clear first. */</div><div class='del'>-	gpd-&gt;chksum = msdc_dma_calcs((u8 *)gpd, 16);</div><div class='del'>-</div><div class='del'>-	/* modify bd*/</div><div class='del'>-	for_each_sg(sg_cmd, sg, sglen, j) {</div><div class='del'>-		bd[j].blkpad = 0;</div><div class='del'>-		bd[j].dwpad = 0;</div><div class='del'>-		bd[j].ptr = (void *)sg_dma_address(sg);</div><div class='del'>-		bd[j].buflen = sg_dma_len(sg);</div><div class='del'>-</div><div class='del'>-		if (j == sglen - 1)</div><div class='del'>-			bd[j].eol = 1;	/* the last bd */</div><div class='del'>-		else</div><div class='del'>-			bd[j].eol = 0;</div><div class='del'>-</div><div class='del'>-		bd[j].chksum = 0; /* checksume need to clear first */</div><div class='del'>-		bd[j].chksum = msdc_dma_calcs((u8 *)(&amp;bd[j]), 16);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_DMA_CFG, MSDC_DMA_CFG_DECSEN, 1);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_BRUSTSZ,</div><div class='del'>-		      MSDC_BRUST_64B);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_MODE, 1);</div><div class='del'>-</div><div class='del'>-	writel(PHYSADDR((u32)dma-&gt;gpd_addr), host-&gt;base + MSDC_DMA_SA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='del'>-	__must_hold(&amp;host-&gt;lock)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-	struct mmc_command *cmd;</div><div class='del'>-	struct mmc_data *data;</div><div class='del'>-	//u32 intsts = 0;</div><div class='del'>-	int read = 1, send_type = 0;</div><div class='del'>-</div><div class='del'>-#define SND_DAT 0</div><div class='del'>-#define SND_CMD 1</div><div class='del'>-</div><div class='del'>-	BUG_ON(!mmc);</div><div class='del'>-	BUG_ON(!mrq);</div><div class='del'>-</div><div class='del'>-	host-&gt;error = 0;</div><div class='del'>-</div><div class='del'>-	cmd  = mrq-&gt;cmd;</div><div class='del'>-	data = mrq-&gt;cmd-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!data) {</div><div class='del'>-		send_type = SND_CMD;</div><div class='del'>-		if (msdc_do_command(host, cmd, 1, CMD_TIMEOUT) != 0)</div><div class='del'>-			goto done;</div><div class='del'>-	} else {</div><div class='del'>-		BUG_ON(data-&gt;blksz &gt; HOST_MAX_BLKSZ);</div><div class='del'>-		send_type = SND_DAT;</div><div class='del'>-</div><div class='del'>-		data-&gt;error = 0;</div><div class='del'>-		read = data-&gt;flags &amp; MMC_DATA_READ ? 1 : 0;</div><div class='del'>-		host-&gt;data = data;</div><div class='del'>-		host-&gt;xfer_size = data-&gt;blocks * data-&gt;blksz;</div><div class='del'>-		host-&gt;blksz = data-&gt;blksz;</div><div class='del'>-</div><div class='del'>-		if (read) {</div><div class='del'>-			if ((host-&gt;timeout_ns != data-&gt;timeout_ns) ||</div><div class='del'>-			    (host-&gt;timeout_clks != data-&gt;timeout_clks)) {</div><div class='del'>-				msdc_set_timeout(host, data-&gt;timeout_ns, data-&gt;timeout_clks);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		writel(data-&gt;blocks, host-&gt;base + SDC_BLK_NUM);</div><div class='del'>-		//msdc_clr_fifo(host);  /* no need */</div><div class='del'>-</div><div class='del'>-		msdc_dma_on();  /* enable DMA mode first!! */</div><div class='del'>-		init_completion(&amp;host-&gt;xfer_done);</div><div class='del'>-</div><div class='del'>-		/* start the command first*/</div><div class='del'>-		if (msdc_command_start(host, cmd, CMD_TIMEOUT) != 0)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		data-&gt;sg_count = dma_map_sg(mmc_dev(mmc), data-&gt;sg,</div><div class='del'>-					    data-&gt;sg_len,</div><div class='del'>-					    mmc_get_dma_dir(data));</div><div class='del'>-		msdc_dma_setup(host, &amp;host-&gt;dma, data-&gt;sg,</div><div class='del'>-			       data-&gt;sg_count);</div><div class='del'>-</div><div class='del'>-		/* then wait command done */</div><div class='del'>-		if (msdc_command_resp(host, cmd, 1, CMD_TIMEOUT) != 0)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		/* for read, the data coming too fast, then CRC error</div><div class='del'>-		 *  start DMA no business with CRC.</div><div class='del'>-		 */</div><div class='del'>-		//init_completion(&amp;host-&gt;xfer_done);</div><div class='del'>-		msdc_dma_start(host);</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;host-&gt;lock);</div><div class='del'>-		if (!wait_for_completion_timeout(&amp;host-&gt;xfer_done, DAT_TIMEOUT)) {</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt; XXX CMD&lt;%d&gt; wait xfer_done&lt;%d&gt; timeout!!\n",</div><div class='del'>-				host-&gt;id, cmd-&gt;opcode,</div><div class='del'>-				data-&gt;blocks * data-&gt;blksz);</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt;     DMA_SA   = 0x%x\n",</div><div class='del'>-				host-&gt;id, readl(host-&gt;base + MSDC_DMA_SA));</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt;     DMA_CA   = 0x%x\n",</div><div class='del'>-				host-&gt;id, readl(host-&gt;base + MSDC_DMA_CA));</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt;     DMA_CTRL = 0x%x\n",</div><div class='del'>-				host-&gt;id, readl(host-&gt;base + MSDC_DMA_CTRL));</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt;     DMA_CFG  = 0x%x\n",</div><div class='del'>-				host-&gt;id, readl(host-&gt;base + MSDC_DMA_CFG));</div><div class='del'>-			data-&gt;error = -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-			msdc_reset_hw(host);</div><div class='del'>-			msdc_clr_fifo(host);</div><div class='del'>-			msdc_clr_int();</div><div class='del'>-		}</div><div class='del'>-		spin_lock(&amp;host-&gt;lock);</div><div class='del'>-		msdc_dma_stop(host);</div><div class='del'>-</div><div class='del'>-		/* Last: stop transfer */</div><div class='del'>-		if (data-&gt;stop) {</div><div class='del'>-			if (msdc_do_command(host, data-&gt;stop, 0, CMD_TIMEOUT) != 0)</div><div class='del'>-				goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (data) {</div><div class='del'>-		host-&gt;data = NULL;</div><div class='del'>-		dma_unmap_sg(mmc_dev(mmc), data-&gt;sg, data-&gt;sg_len,</div><div class='del'>-			     mmc_get_dma_dir(data));</div><div class='del'>-		host-&gt;blksz = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mrq-&gt;cmd-&gt;error)</div><div class='del'>-		host-&gt;error = 0x001;</div><div class='del'>-	if (mrq-&gt;data &amp;&amp; mrq-&gt;data-&gt;error)</div><div class='del'>-		host-&gt;error |= 0x010;</div><div class='del'>-	if (mrq-&gt;stop &amp;&amp; mrq-&gt;stop-&gt;error)</div><div class='del'>-		host-&gt;error |= 0x100;</div><div class='del'>-</div><div class='del'>-	return host-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_app_cmd(struct mmc_host *mmc, struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	struct mmc_command cmd;</div><div class='del'>-	struct mmc_request mrq;</div><div class='del'>-	u32 err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(struct mmc_command));</div><div class='del'>-	cmd.opcode = MMC_APP_CMD;</div><div class='del'>-	cmd.arg = host-&gt;app_cmd_arg;</div><div class='del'>-	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;</div><div class='del'>-</div><div class='del'>-	memset(&amp;mrq, 0, sizeof(struct mmc_request));</div><div class='del'>-	mrq.cmd = &amp;cmd; cmd.mrq = &amp;mrq;</div><div class='del'>-	cmd.data = NULL;</div><div class='del'>-</div><div class='del'>-	err = msdc_do_command(host, &amp;cmd, 0, CMD_TIMEOUT);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_tune_cmdrsp(struct msdc_host *host, struct mmc_command *cmd)</div><div class='del'>-{</div><div class='del'>-	int result = -1;</div><div class='del'>-	u32 rsmpl, cur_rsmpl, orig_rsmpl;</div><div class='del'>-	u32 rrdly, cur_rrdly = 0xffffffff, orig_rrdly;</div><div class='del'>-	u32 skip = 1;</div><div class='del'>-</div><div class='del'>-	/* ==== don't support 3.0 now ====</div><div class='del'>-	 *  1: R_SMPL[1]</div><div class='del'>-	 *  2: PAD_CMD_RESP_RXDLY[26:22]</div><div class='del'>-	 *  ==========================</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	// save the previous tune result</div><div class='del'>-	sdr_get_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_RSPL, &amp;orig_rsmpl);</div><div class='del'>-	sdr_get_field(host-&gt;base + MSDC_PAD_TUNE, MSDC_PAD_TUNE_CMDRRDLY,</div><div class='del'>-		      &amp;orig_rrdly);</div><div class='del'>-</div><div class='del'>-	rrdly = 0;</div><div class='del'>-	do {</div><div class='del'>-		for (rsmpl = 0; rsmpl &lt; 2; rsmpl++) {</div><div class='del'>-			/* Lv1: R_SMPL[1] */</div><div class='del'>-			cur_rsmpl = (orig_rsmpl + rsmpl) % 2;</div><div class='del'>-			if (skip == 1) {</div><div class='del'>-				skip = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_RSPL,</div><div class='del'>-				      cur_rsmpl);</div><div class='del'>-</div><div class='del'>-			if (host-&gt;app_cmd) {</div><div class='del'>-				result = msdc_app_cmd(host-&gt;mmc, host);</div><div class='del'>-				if (result) {</div><div class='del'>-					dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-						"%d -&gt; TUNE_CMD app_cmd&lt;%d&gt; failed: RESP_RXDLY&lt;%d&gt;,R_SMPL&lt;%d&gt;\n",</div><div class='del'>-						host-&gt;id,</div><div class='del'>-						host-&gt;mrq-&gt;cmd-&gt;opcode,</div><div class='del'>-						cur_rrdly, cur_rsmpl);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			result = msdc_do_command(host, cmd, 0, CMD_TIMEOUT); // not tune.</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt; TUNE_CMD&lt;%d&gt; %s PAD_CMD_RESP_RXDLY[26:22]&lt;%d&gt; R_SMPL[1]&lt;%d&gt;\n",</div><div class='del'>-				host-&gt;id, cmd-&gt;opcode,</div><div class='del'>-				(result == 0) ? "PASS" : "FAIL", cur_rrdly,</div><div class='del'>-				cur_rsmpl);</div><div class='del'>-</div><div class='del'>-			if (result == 0)</div><div class='del'>-				return 0;</div><div class='del'>-			if (result != -EIO) {</div><div class='del'>-				dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-					"%d -&gt; TUNE_CMD&lt;%d&gt; Error&lt;%d&gt; not -EIO\n",</div><div class='del'>-					host-&gt;id, cmd-&gt;opcode, result);</div><div class='del'>-				return result;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* should be EIO */</div><div class='del'>-			/* check if has data phase */</div><div class='del'>-			if (readl(host-&gt;base + SDC_CMD) &amp; 0x1800)</div><div class='del'>-				msdc_abort_data(host);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Lv2: PAD_CMD_RESP_RXDLY[26:22] */</div><div class='del'>-		cur_rrdly = (orig_rrdly + rrdly + 1) % 32;</div><div class='del'>-		sdr_set_field(host-&gt;base + MSDC_PAD_TUNE,</div><div class='del'>-			      MSDC_PAD_TUNE_CMDRRDLY, cur_rrdly);</div><div class='del'>-	} while (++rrdly &lt; 32);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Support SD2.0 Only */</div><div class='del'>-static int msdc_tune_bread(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-	u32 ddr = 0;</div><div class='del'>-	u32 dcrc = 0;</div><div class='del'>-	u32 rxdly, cur_rxdly0, cur_rxdly1;</div><div class='del'>-	u32 dsmpl, cur_dsmpl,  orig_dsmpl;</div><div class='del'>-	u32 cur_dat0,  cur_dat1,  cur_dat2,  cur_dat3;</div><div class='del'>-	u32 cur_dat4,  cur_dat5,  cur_dat6,  cur_dat7;</div><div class='del'>-	u32 orig_dat0, orig_dat1, orig_dat2, orig_dat3;</div><div class='del'>-	u32 orig_dat4, orig_dat5, orig_dat6, orig_dat7;</div><div class='del'>-	int result = -1;</div><div class='del'>-	u32 skip = 1;</div><div class='del'>-</div><div class='del'>-	sdr_get_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_DSPL, &amp;orig_dsmpl);</div><div class='del'>-</div><div class='del'>-	/* Tune Method 2. */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 1);</div><div class='del'>-</div><div class='del'>-	rxdly = 0;</div><div class='del'>-	do {</div><div class='del'>-		for (dsmpl = 0; dsmpl &lt; 2; dsmpl++) {</div><div class='del'>-			cur_dsmpl = (orig_dsmpl + dsmpl) % 2;</div><div class='del'>-			if (skip == 1) {</div><div class='del'>-				skip = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_DSPL,</div><div class='del'>-				      cur_dsmpl);</div><div class='del'>-</div><div class='del'>-			if (host-&gt;app_cmd) {</div><div class='del'>-				result = msdc_app_cmd(host-&gt;mmc, host);</div><div class='del'>-				if (result) {</div><div class='del'>-					dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-						"%d -&gt; TUNE_BREAD app_cmd&lt;%d&gt; failed\n",</div><div class='del'>-						host-&gt;id,</div><div class='del'>-						host-&gt;mrq-&gt;cmd-&gt;opcode);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			result = msdc_do_request(mmc, mrq);</div><div class='del'>-</div><div class='del'>-			sdr_get_field(host-&gt;base + SDC_DCRC_STS,</div><div class='del'>-				      SDC_DCRC_STS_POS | SDC_DCRC_STS_NEG,</div><div class='del'>-				      &amp;dcrc); /* RO */</div><div class='del'>-			if (!ddr)</div><div class='del'>-				dcrc &amp;= ~SDC_DCRC_STS_NEG;</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt; TUNE_BREAD&lt;%s&gt; dcrc&lt;0x%x&gt; DATRDDLY0/1&lt;0x%x&gt;&lt;0x%x&gt; dsmpl&lt;0x%x&gt;\n",</div><div class='del'>-				host-&gt;id,</div><div class='del'>-				(result == 0 &amp;&amp; dcrc == 0) ? "PASS" : "FAIL",</div><div class='del'>-				dcrc, readl(host-&gt;base + MSDC_DAT_RDDLY0),</div><div class='del'>-				readl(host-&gt;base + MSDC_DAT_RDDLY1),</div><div class='del'>-				cur_dsmpl);</div><div class='del'>-</div><div class='del'>-			/* Fix me: result is 0, but dcrc is still exist */</div><div class='del'>-			if (result == 0 &amp;&amp; dcrc == 0) {</div><div class='del'>-				goto done;</div><div class='del'>-			} else {</div><div class='del'>-				/* there is a case: command timeout, and data phase not processed */</div><div class='del'>-				if (mrq-&gt;data-&gt;error != 0 &amp;&amp;</div><div class='del'>-				    mrq-&gt;data-&gt;error != -EIO) {</div><div class='del'>-					dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-						"%d -&gt; TUNE_READ: result&lt;0x%x&gt; cmd_error&lt;%d&gt; data_error&lt;%d&gt;\n",</div><div class='del'>-						host-&gt;id, result,</div><div class='del'>-						mrq-&gt;cmd-&gt;error,</div><div class='del'>-						mrq-&gt;data-&gt;error);</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cur_rxdly0 = readl(host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-		cur_rxdly1 = readl(host-&gt;base + MSDC_DAT_RDDLY1);</div><div class='del'>-</div><div class='del'>-		/* E1 ECO. YD: Reverse */</div><div class='del'>-		if (readl(host-&gt;base + MSDC_ECO_VER) &gt;= 4) {</div><div class='del'>-			orig_dat0 = (cur_rxdly0 &gt;&gt; 24) &amp; 0x1F;</div><div class='del'>-			orig_dat1 = (cur_rxdly0 &gt;&gt; 16) &amp; 0x1F;</div><div class='del'>-			orig_dat2 = (cur_rxdly0 &gt;&gt;  8) &amp; 0x1F;</div><div class='del'>-			orig_dat3 = (cur_rxdly0 &gt;&gt;  0) &amp; 0x1F;</div><div class='del'>-			orig_dat4 = (cur_rxdly1 &gt;&gt; 24) &amp; 0x1F;</div><div class='del'>-			orig_dat5 = (cur_rxdly1 &gt;&gt; 16) &amp; 0x1F;</div><div class='del'>-			orig_dat6 = (cur_rxdly1 &gt;&gt;  8) &amp; 0x1F;</div><div class='del'>-			orig_dat7 = (cur_rxdly1 &gt;&gt;  0) &amp; 0x1F;</div><div class='del'>-		} else {</div><div class='del'>-			orig_dat0 = (cur_rxdly0 &gt;&gt;  0) &amp; 0x1F;</div><div class='del'>-			orig_dat1 = (cur_rxdly0 &gt;&gt;  8) &amp; 0x1F;</div><div class='del'>-			orig_dat2 = (cur_rxdly0 &gt;&gt; 16) &amp; 0x1F;</div><div class='del'>-			orig_dat3 = (cur_rxdly0 &gt;&gt; 24) &amp; 0x1F;</div><div class='del'>-			orig_dat4 = (cur_rxdly1 &gt;&gt;  0) &amp; 0x1F;</div><div class='del'>-			orig_dat5 = (cur_rxdly1 &gt;&gt;  8) &amp; 0x1F;</div><div class='del'>-			orig_dat6 = (cur_rxdly1 &gt;&gt; 16) &amp; 0x1F;</div><div class='del'>-			orig_dat7 = (cur_rxdly1 &gt;&gt; 24) &amp; 0x1F;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ddr) {</div><div class='del'>-			cur_dat0 = (dcrc &amp; (1 &lt;&lt; 0) || dcrc &amp; (1 &lt;&lt; 8))  ? ((orig_dat0 + 1) % 32) : orig_dat0;</div><div class='del'>-			cur_dat1 = (dcrc &amp; (1 &lt;&lt; 1) || dcrc &amp; (1 &lt;&lt; 9))  ? ((orig_dat1 + 1) % 32) : orig_dat1;</div><div class='del'>-			cur_dat2 = (dcrc &amp; (1 &lt;&lt; 2) || dcrc &amp; (1 &lt;&lt; 10)) ? ((orig_dat2 + 1) % 32) : orig_dat2;</div><div class='del'>-			cur_dat3 = (dcrc &amp; (1 &lt;&lt; 3) || dcrc &amp; (1 &lt;&lt; 11)) ? ((orig_dat3 + 1) % 32) : orig_dat3;</div><div class='del'>-		} else {</div><div class='del'>-			cur_dat0 = (dcrc &amp; (1 &lt;&lt; 0)) ? ((orig_dat0 + 1) % 32) : orig_dat0;</div><div class='del'>-			cur_dat1 = (dcrc &amp; (1 &lt;&lt; 1)) ? ((orig_dat1 + 1) % 32) : orig_dat1;</div><div class='del'>-			cur_dat2 = (dcrc &amp; (1 &lt;&lt; 2)) ? ((orig_dat2 + 1) % 32) : orig_dat2;</div><div class='del'>-			cur_dat3 = (dcrc &amp; (1 &lt;&lt; 3)) ? ((orig_dat3 + 1) % 32) : orig_dat3;</div><div class='del'>-		}</div><div class='del'>-		cur_dat4 = (dcrc &amp; (1 &lt;&lt; 4)) ? ((orig_dat4 + 1) % 32) : orig_dat4;</div><div class='del'>-		cur_dat5 = (dcrc &amp; (1 &lt;&lt; 5)) ? ((orig_dat5 + 1) % 32) : orig_dat5;</div><div class='del'>-		cur_dat6 = (dcrc &amp; (1 &lt;&lt; 6)) ? ((orig_dat6 + 1) % 32) : orig_dat6;</div><div class='del'>-		cur_dat7 = (dcrc &amp; (1 &lt;&lt; 7)) ? ((orig_dat7 + 1) % 32) : orig_dat7;</div><div class='del'>-</div><div class='del'>-		cur_rxdly0 = (cur_dat0 &lt;&lt; 24) | (cur_dat1 &lt;&lt; 16) | (cur_dat2 &lt;&lt; 8) | (cur_dat3 &lt;&lt; 0);</div><div class='del'>-		cur_rxdly1 = (cur_dat4 &lt;&lt; 24) | (cur_dat5 &lt;&lt; 16) | (cur_dat6 &lt;&lt; 8) | (cur_dat7 &lt;&lt; 0);</div><div class='del'>-</div><div class='del'>-		writel(cur_rxdly0, host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-		writel(cur_rxdly1, host-&gt;base + MSDC_DAT_RDDLY1);</div><div class='del'>-</div><div class='del'>-	} while (++rxdly &lt; 32);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_tune_bwrite(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-</div><div class='del'>-	u32 wrrdly, cur_wrrdly = 0xffffffff, orig_wrrdly;</div><div class='del'>-	u32 dsmpl,  cur_dsmpl,  orig_dsmpl;</div><div class='del'>-	u32 rxdly,  cur_rxdly0;</div><div class='del'>-	u32 orig_dat0, orig_dat1, orig_dat2, orig_dat3;</div><div class='del'>-	u32 cur_dat0,  cur_dat1,  cur_dat2,  cur_dat3;</div><div class='del'>-	int result = -1;</div><div class='del'>-	u32 skip = 1;</div><div class='del'>-</div><div class='del'>-	// MSDC_IOCON_DDR50CKD need to check. [Fix me]</div><div class='del'>-</div><div class='del'>-	sdr_get_field(host-&gt;base + MSDC_PAD_TUNE, MSDC_PAD_TUNE_DATWRDLY,</div><div class='del'>-		      &amp;orig_wrrdly);</div><div class='del'>-	sdr_get_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_DSPL, &amp;orig_dsmpl);</div><div class='del'>-</div><div class='del'>-	/* Tune Method 2. just DAT0 */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 1);</div><div class='del'>-	cur_rxdly0 = readl(host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-</div><div class='del'>-	/* E1 ECO. YD: Reverse */</div><div class='del'>-	if (readl(host-&gt;base + MSDC_ECO_VER) &gt;= 4) {</div><div class='del'>-		orig_dat0 = (cur_rxdly0 &gt;&gt; 24) &amp; 0x1F;</div><div class='del'>-		orig_dat1 = (cur_rxdly0 &gt;&gt; 16) &amp; 0x1F;</div><div class='del'>-		orig_dat2 = (cur_rxdly0 &gt;&gt;  8) &amp; 0x1F;</div><div class='del'>-		orig_dat3 = (cur_rxdly0 &gt;&gt;  0) &amp; 0x1F;</div><div class='del'>-	} else {</div><div class='del'>-		orig_dat0 = (cur_rxdly0 &gt;&gt;  0) &amp; 0x1F;</div><div class='del'>-		orig_dat1 = (cur_rxdly0 &gt;&gt;  8) &amp; 0x1F;</div><div class='del'>-		orig_dat2 = (cur_rxdly0 &gt;&gt; 16) &amp; 0x1F;</div><div class='del'>-		orig_dat3 = (cur_rxdly0 &gt;&gt; 24) &amp; 0x1F;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxdly = 0;</div><div class='del'>-	do {</div><div class='del'>-		wrrdly = 0;</div><div class='del'>-		do {</div><div class='del'>-			for (dsmpl = 0; dsmpl &lt; 2; dsmpl++) {</div><div class='del'>-				cur_dsmpl = (orig_dsmpl + dsmpl) % 2;</div><div class='del'>-				if (skip == 1) {</div><div class='del'>-					skip = 0;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				sdr_set_field(host-&gt;base + MSDC_IOCON,</div><div class='del'>-					      MSDC_IOCON_DSPL, cur_dsmpl);</div><div class='del'>-</div><div class='del'>-				if (host-&gt;app_cmd) {</div><div class='del'>-					result = msdc_app_cmd(host-&gt;mmc, host);</div><div class='del'>-					if (result) {</div><div class='del'>-						dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-							"%d -&gt; TUNE_BWRITE app_cmd&lt;%d&gt; failed\n",</div><div class='del'>-							host-&gt;id,</div><div class='del'>-							host-&gt;mrq-&gt;cmd-&gt;opcode);</div><div class='del'>-						continue;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				result = msdc_do_request(mmc, mrq);</div><div class='del'>-</div><div class='del'>-				dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-					"%d -&gt; TUNE_BWRITE&lt;%s&gt; DSPL&lt;%d&gt; DATWRDLY&lt;%d&gt; MSDC_DAT_RDDLY0&lt;0x%x&gt;\n",</div><div class='del'>-					host-&gt;id,</div><div class='del'>-					result == 0 ? "PASS" : "FAIL",</div><div class='del'>-					cur_dsmpl, cur_wrrdly, cur_rxdly0);</div><div class='del'>-</div><div class='del'>-				if (result == 0) {</div><div class='del'>-					goto done;</div><div class='del'>-				} else {</div><div class='del'>-					/* there is a case: command timeout, and data phase not processed */</div><div class='del'>-					if (mrq-&gt;data-&gt;error != -EIO) {</div><div class='del'>-						dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-							"%d -&gt; TUNE_READ: result&lt;0x%x&gt; cmd_error&lt;%d&gt; data_error&lt;%d&gt;\n",</div><div class='del'>-							host-&gt;id, result,</div><div class='del'>-							mrq-&gt;cmd-&gt;error,</div><div class='del'>-							mrq-&gt;data-&gt;error);</div><div class='del'>-						goto done;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			cur_wrrdly = (orig_wrrdly + wrrdly + 1) % 32;</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_PAD_TUNE,</div><div class='del'>-				      MSDC_PAD_TUNE_DATWRDLY, cur_wrrdly);</div><div class='del'>-		} while (++wrrdly &lt; 32);</div><div class='del'>-</div><div class='del'>-		cur_dat0 = (orig_dat0 + rxdly) % 32; /* only adjust bit-1 for crc */</div><div class='del'>-		cur_dat1 = orig_dat1;</div><div class='del'>-		cur_dat2 = orig_dat2;</div><div class='del'>-		cur_dat3 = orig_dat3;</div><div class='del'>-</div><div class='del'>-		cur_rxdly0 = (cur_dat0 &lt;&lt; 24) | (cur_dat1 &lt;&lt; 16) | (cur_dat2 &lt;&lt; 8) | (cur_dat3 &lt;&lt; 0);</div><div class='del'>-		writel(cur_rxdly0, host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-	} while (++rxdly &lt; 32);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_get_card_status(struct mmc_host *mmc, struct msdc_host *host, u32 *status)</div><div class='del'>-{</div><div class='del'>-	struct mmc_command cmd;</div><div class='del'>-	struct mmc_request mrq;</div><div class='del'>-	u32 err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(struct mmc_command));</div><div class='del'>-	cmd.opcode = MMC_SEND_STATUS;</div><div class='del'>-	if (mmc-&gt;card) {</div><div class='del'>-		cmd.arg = mmc-&gt;card-&gt;rca &lt;&lt; 16;</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(mmc_dev(host-&gt;mmc), "%d -&gt; cmd13 mmc card is null\n",</div><div class='del'>-			host-&gt;id);</div><div class='del'>-		cmd.arg = host-&gt;app_cmd_arg;</div><div class='del'>-	}</div><div class='del'>-	cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC;</div><div class='del'>-</div><div class='del'>-	memset(&amp;mrq, 0, sizeof(struct mmc_request));</div><div class='del'>-	mrq.cmd = &amp;cmd; cmd.mrq = &amp;mrq;</div><div class='del'>-	cmd.data = NULL;</div><div class='del'>-</div><div class='del'>-	err = msdc_do_command(host, &amp;cmd, 1, CMD_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		*status = cmd.resp[0];</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_check_busy(struct mmc_host *mmc, struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	u32 err = 0;</div><div class='del'>-	u32 status = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		err = msdc_get_card_status(mmc, host, &amp;status);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		/* need cmd12? */</div><div class='del'>-		dev_err(mmc_dev(host-&gt;mmc), "%d -&gt; cmd&lt;13&gt; resp&lt;0x%x&gt;\n",</div><div class='del'>-			host-&gt;id, status);</div><div class='del'>-	} while (R1_CURRENT_STATE(status) == 7);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* failed when msdc_do_request */</div><div class='del'>-static int msdc_tune_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-	struct mmc_data *data;</div><div class='del'>-	//u32 base = host-&gt;base;</div><div class='del'>-	int ret = 0, read;</div><div class='del'>-</div><div class='del'>-	data = mrq-&gt;cmd-&gt;data;</div><div class='del'>-</div><div class='del'>-	read = data-&gt;flags &amp; MMC_DATA_READ ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	if (read) {</div><div class='del'>-		if (data-&gt;error == -EIO)</div><div class='del'>-			ret = msdc_tune_bread(mmc, mrq);</div><div class='del'>-	} else {</div><div class='del'>-		ret = msdc_check_busy(mmc, host);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc),</div><div class='del'>-				"%d -&gt; XXX cmd13 wait program done failed\n",</div><div class='del'>-				host-&gt;id);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		/* CRC and TO */</div><div class='del'>-		/* Fix me: don't care card status? */</div><div class='del'>-		ret = msdc_tune_bwrite(mmc, mrq);</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'>-/* ops.request */</div><div class='del'>-static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-</div><div class='del'>-	WARN_ON(host-&gt;mrq);</div><div class='del'>-</div><div class='del'>-	/* start to process */</div><div class='del'>-	spin_lock(&amp;host-&gt;lock);</div><div class='del'>-</div><div class='del'>-	host-&gt;mrq = mrq;</div><div class='del'>-</div><div class='del'>-	if (msdc_do_request(mmc, mrq)) {</div><div class='del'>-		if (host-&gt;hw-&gt;flags &amp; MSDC_REMOVABLE &amp;&amp; ralink_soc == MT762X_SOC_MT7621AT &amp;&amp; mrq-&gt;data &amp;&amp; mrq-&gt;data-&gt;error)</div><div class='del'>-			msdc_tune_request(mmc, mrq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ==== when request done, check if app_cmd ==== */</div><div class='del'>-	if (mrq-&gt;cmd-&gt;opcode == MMC_APP_CMD) {</div><div class='del'>-		host-&gt;app_cmd = 1;</div><div class='del'>-		host-&gt;app_cmd_arg = mrq-&gt;cmd-&gt;arg;  /* save the RCA */</div><div class='del'>-	} else {</div><div class='del'>-		host-&gt;app_cmd = 0;</div><div class='del'>-		//host-&gt;app_cmd_arg = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	host-&gt;mrq = NULL;</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;host-&gt;lock);</div><div class='del'>-</div><div class='del'>-	mmc_request_done(mmc, mrq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by ops.set_ios */</div><div class='del'>-static void msdc_set_buswidth(struct msdc_host *host, u32 width)</div><div class='del'>-{</div><div class='del'>-	u32 val = readl(host-&gt;base + SDC_CFG);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~SDC_CFG_BUSWIDTH;</div><div class='del'>-</div><div class='del'>-	switch (width) {</div><div class='del'>-	default:</div><div class='del'>-	case MMC_BUS_WIDTH_1:</div><div class='del'>-		width = 1;</div><div class='del'>-		val |= (MSDC_BUS_1BITS &lt;&lt; 16);</div><div class='del'>-		break;</div><div class='del'>-	case MMC_BUS_WIDTH_4:</div><div class='del'>-		val |= (MSDC_BUS_4BITS &lt;&lt; 16);</div><div class='del'>-		break;</div><div class='del'>-	case MMC_BUS_WIDTH_8:</div><div class='del'>-		val |= (MSDC_BUS_8BITS &lt;&lt; 16);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	writel(val, host-&gt;base + SDC_CFG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ops.set_ios */</div><div class='del'>-static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-	u32 ddr = 0;</div><div class='del'>-</div><div class='del'>-#ifdef MT6575_SD_DEBUG</div><div class='del'>-	static const char * const vdd[] = {</div><div class='del'>-		"1.50v", "1.55v", "1.60v", "1.65v", "1.70v", "1.80v", "1.90v",</div><div class='del'>-		"2.00v", "2.10v", "2.20v", "2.30v", "2.40v", "2.50v", "2.60v",</div><div class='del'>-		"2.70v", "2.80v", "2.90v", "3.00v", "3.10v", "3.20v", "3.30v",</div><div class='del'>-		"3.40v", "3.50v", "3.60v"</div><div class='del'>-	};</div><div class='del'>-	static const char * const power_mode[] = {</div><div class='del'>-		"OFF", "UP", "ON"</div><div class='del'>-	};</div><div class='del'>-	static const char * const bus_mode[] = {</div><div class='del'>-		"UNKNOWN", "OPENDRAIN", "PUSHPULL"</div><div class='del'>-	};</div><div class='del'>-	static const char * const timing[] = {</div><div class='del'>-		"LEGACY", "MMC_HS", "SD_HS"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	printk("SET_IOS: CLK(%dkHz), BUS(%s), BW(%u), PWR(%s), VDD(%s), TIMING(%s)",</div><div class='del'>-		ios-&gt;clock / 1000, bus_mode[ios-&gt;bus_mode],</div><div class='del'>-		(ios-&gt;bus_width == MMC_BUS_WIDTH_4) ? 4 : 1,</div><div class='del'>-		power_mode[ios-&gt;power_mode], vdd[ios-&gt;vdd], timing[ios-&gt;timing]);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	msdc_set_buswidth(host, ios-&gt;bus_width);</div><div class='del'>-</div><div class='del'>-	/* Power control ??? */</div><div class='del'>-	switch (ios-&gt;power_mode) {</div><div class='del'>-	case MMC_POWER_OFF:</div><div class='del'>-	case MMC_POWER_UP:</div><div class='del'>-		break;</div><div class='del'>-	case MMC_POWER_ON:</div><div class='del'>-		host-&gt;power_mode = MMC_POWER_ON;</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'>-	/* Clock control */</div><div class='del'>-	if (host-&gt;mclk != ios-&gt;clock) {</div><div class='del'>-		if (ios-&gt;clock &gt; 25000000) {</div><div class='del'>-			//if (!(host-&gt;hw-&gt;flags &amp; MSDC_REMOVABLE)) {</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_RSPL,</div><div class='del'>-				      MSDC_SMPL_FALLING);</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_IOCON, MSDC_IOCON_DSPL,</div><div class='del'>-				      MSDC_SMPL_FALLING);</div><div class='del'>-			//} /* for tuning debug */</div><div class='del'>-		} else { /* default value */</div><div class='del'>-			writel(0x00000000, host-&gt;base + MSDC_IOCON);</div><div class='del'>-			// writel(0x00000000, host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-</div><div class='del'>-			// for MT7620 E2 and afterward</div><div class='del'>-			writel(0x10101010, host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-</div><div class='del'>-			writel(0x00000000, host-&gt;base + MSDC_DAT_RDDLY1);</div><div class='del'>-			// writel(0x00000000, host-&gt;base + MSDC_PAD_TUNE);</div><div class='del'>-</div><div class='del'>-			// for MT7620 E2 and afterward</div><div class='del'>-			writel(0x84101010, host-&gt;base + MSDC_PAD_TUNE);</div><div class='del'>-		}</div><div class='del'>-		msdc_set_mclk(host, ddr, ios-&gt;clock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ops.get_ro */</div><div class='del'>-static int msdc_ops_get_ro(struct mmc_host *mmc)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ro = 0;</div><div class='del'>-</div><div class='del'>-	if (host-&gt;hw-&gt;flags &amp; MSDC_WP_PIN_EN) { /* set for card */</div><div class='del'>-		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='del'>-		ro = (readl(host-&gt;base + MSDC_PS) &gt;&gt; 31);</div><div class='del'>-		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-	return ro;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ops.get_cd */</div><div class='del'>-static int msdc_ops_get_cd(struct mmc_host *mmc)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int present = 1;</div><div class='del'>-</div><div class='del'>-	/* for sdio, MSDC_REMOVABLE not set, always return 1 */</div><div class='del'>-	if (!(host-&gt;hw-&gt;flags &amp; MSDC_REMOVABLE)) {</div><div class='del'>-		/* For sdio, read H/W always get&lt;1&gt;, but may timeout some times */</div><div class='del'>-#if 1</div><div class='del'>-		host-&gt;card_inserted = 1;</div><div class='del'>-		return 1;</div><div class='del'>-#else</div><div class='del'>-		host-&gt;card_inserted = (host-&gt;pm_state.event == PM_EVENT_USER_RESUME) ? 1 : 0;</div><div class='del'>-		return host-&gt;card_inserted;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* MSDC_CD_PIN_EN set for card */</div><div class='del'>-	if (host-&gt;hw-&gt;flags &amp; MSDC_CD_PIN_EN) {</div><div class='del'>-		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='del'>-		// CD</div><div class='del'>-		present = readl(host-&gt;base + MSDC_PS) &amp; MSDC_PS_CDSTS;</div><div class='del'>-		if (cd_active_low)</div><div class='del'>-			present = present ? 0 : 1;</div><div class='del'>-		else</div><div class='del'>-			present = present ? 1 : 0;</div><div class='del'>-		host-&gt;card_inserted = present;</div><div class='del'>-		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		present = 0; /* TODO? Check DAT3 pins for card detection */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return present;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mmc_host_ops mt_msdc_ops = {</div><div class='del'>-	.request         = msdc_ops_request,</div><div class='del'>-	.set_ios         = msdc_ops_set_ios,</div><div class='del'>-	.get_ro          = msdc_ops_get_ro,</div><div class='del'>-	.get_cd          = msdc_ops_get_cd,</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 msdc_irq(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct msdc_host  *host = (struct msdc_host *)dev_id;</div><div class='del'>-	struct mmc_data   *data = host-&gt;data;</div><div class='del'>-	struct mmc_command *cmd = host-&gt;cmd;</div><div class='del'>-</div><div class='del'>-	u32 cmdsts = MSDC_INT_RSPCRCERR  | MSDC_INT_CMDTMO  | MSDC_INT_CMDRDY  |</div><div class='del'>-		MSDC_INT_ACMDCRCERR | MSDC_INT_ACMDTMO | MSDC_INT_ACMDRDY |</div><div class='del'>-		MSDC_INT_ACMD19_DONE;</div><div class='del'>-	u32 datsts = MSDC_INT_DATCRCERR | MSDC_INT_DATTMO;</div><div class='del'>-</div><div class='del'>-	u32 intsts = readl(host-&gt;base + MSDC_INT);</div><div class='del'>-	u32 inten  = readl(host-&gt;base + MSDC_INTEN); inten &amp;= intsts;</div><div class='del'>-</div><div class='del'>-	writel(intsts, host-&gt;base + MSDC_INT);  /* clear interrupts */</div><div class='del'>-	/* MSG will cause fatal error */</div><div class='del'>-</div><div class='del'>-	/* card change interrupt */</div><div class='del'>-	if (intsts &amp; MSDC_INT_CDSC) {</div><div class='del'>-		if (host-&gt;mmc-&gt;caps &amp; MMC_CAP_NEEDS_POLL)</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		schedule_delayed_work(&amp;host-&gt;card_delaywork, HZ);</div><div class='del'>-		/* tuning when plug card ? */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* transfer complete interrupt */</div><div class='del'>-	if (data) {</div><div class='del'>-		if (inten &amp; MSDC_INT_XFER_COMPL) {</div><div class='del'>-			data-&gt;bytes_xfered = host-&gt;xfer_size;</div><div class='del'>-			complete(&amp;host-&gt;xfer_done);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (intsts &amp; datsts) {</div><div class='del'>-			/* do basic reset, or stop command will sdc_busy */</div><div class='del'>-			msdc_reset_hw(host);</div><div class='del'>-			msdc_clr_fifo(host);</div><div class='del'>-			msdc_clr_int();</div><div class='del'>-</div><div class='del'>-			if (intsts &amp; MSDC_INT_DATTMO)</div><div class='del'>-				data-&gt;error = -ETIMEDOUT;</div><div class='del'>-			else if (intsts &amp; MSDC_INT_DATCRCERR)</div><div class='del'>-				data-&gt;error = -EIO;</div><div class='del'>-</div><div class='del'>-			//if(readl(MSDC_INTEN) &amp; MSDC_INT_XFER_COMPL) {</div><div class='del'>-			complete(&amp;host-&gt;xfer_done); /* Read CRC come fast, XFER_COMPL not enabled */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* command interrupts */</div><div class='del'>-	if (cmd &amp;&amp; (intsts &amp; cmdsts)) {</div><div class='del'>-		if ((intsts &amp; MSDC_INT_CMDRDY) || (intsts &amp; MSDC_INT_ACMDRDY) ||</div><div class='del'>-		    (intsts &amp; MSDC_INT_ACMD19_DONE)) {</div><div class='del'>-			u32 *rsp = &amp;cmd-&gt;resp[0];</div><div class='del'>-</div><div class='del'>-			switch (host-&gt;cmd_rsp) {</div><div class='del'>-			case RESP_NONE:</div><div class='del'>-				break;</div><div class='del'>-			case RESP_R2:</div><div class='del'>-				*rsp++ = readl(host-&gt;base + SDC_RESP3);</div><div class='del'>-				*rsp++ = readl(host-&gt;base + SDC_RESP2);</div><div class='del'>-				*rsp++ = readl(host-&gt;base + SDC_RESP1);</div><div class='del'>-				*rsp++ = readl(host-&gt;base + SDC_RESP0);</div><div class='del'>-				break;</div><div class='del'>-			default: /* Response types 1, 3, 4, 5, 6, 7(1b) */</div><div class='del'>-				if ((intsts &amp; MSDC_INT_ACMDRDY) || (intsts &amp; MSDC_INT_ACMD19_DONE))</div><div class='del'>-					*rsp = readl(host-&gt;base + SDC_ACMD_RESP);</div><div class='del'>-				else</div><div class='del'>-					*rsp = readl(host-&gt;base + SDC_RESP0);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if ((intsts &amp; MSDC_INT_RSPCRCERR) || (intsts &amp; MSDC_INT_ACMDCRCERR)) {</div><div class='del'>-			cmd-&gt;error = -EIO;</div><div class='del'>-		} else if ((intsts &amp; MSDC_INT_CMDTMO) || (intsts &amp; MSDC_INT_ACMDTMO)) {</div><div class='del'>-			cmd-&gt;error = -ETIMEDOUT;</div><div class='del'>-			msdc_reset_hw(host);</div><div class='del'>-			msdc_clr_fifo(host);</div><div class='del'>-			msdc_clr_int();</div><div class='del'>-		}</div><div class='del'>-		complete(&amp;host-&gt;cmd_done);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* mmc irq interrupts */</div><div class='del'>-	if (intsts &amp; MSDC_INT_MMCIRQ)</div><div class='del'>-		dev_info(mmc_dev(host-&gt;mmc), "msdc[%d] MMCIRQ: SDC_CSTS=0x%.8x\r\n",</div><div class='del'>-			 host-&gt;id, readl(host-&gt;base + SDC_CSTS));</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'>-/* platform_driver members                                                  */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* called by msdc_drv_probe/remove */</div><div class='del'>-static void msdc_enable_cd_irq(struct msdc_host *host, int enable)</div><div class='del'>-{</div><div class='del'>-	struct msdc_hw *hw = host-&gt;hw;</div><div class='del'>-</div><div class='del'>-	/* for sdio, not set */</div><div class='del'>-	if ((hw-&gt;flags &amp; MSDC_CD_PIN_EN) == 0) {</div><div class='del'>-		/* Pull down card detection pin since it is not available */</div><div class='del'>-		/*</div><div class='del'>-		 * if (hw-&gt;config_gpio_pin)</div><div class='del'>-		 * hw-&gt;config_gpio_pin(MSDC_CD_PIN, GPIO_PULL_DOWN);</div><div class='del'>-		 */</div><div class='del'>-		sdr_clr_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='del'>-		sdr_clr_bits(host-&gt;base + MSDC_INTEN, MSDC_INTEN_CDSC);</div><div class='del'>-		sdr_clr_bits(host-&gt;base + SDC_CFG, SDC_CFG_INSWKUP);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		/* card detection circuit relies on the core power so that the core power</div><div class='del'>-		 * shouldn't be turned off. Here adds a reference count to keep</div><div class='del'>-		 * the core power alive.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (hw-&gt;config_gpio_pin) /* NULL */</div><div class='del'>-			hw-&gt;config_gpio_pin(MSDC_CD_PIN, GPIO_PULL_UP);</div><div class='del'>-</div><div class='del'>-		sdr_set_field(host-&gt;base + MSDC_PS, MSDC_PS_CDDEBOUNCE,</div><div class='del'>-			      DEFAULT_DEBOUNCE);</div><div class='del'>-		sdr_set_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='del'>-		sdr_set_bits(host-&gt;base + MSDC_INTEN, MSDC_INTEN_CDSC);</div><div class='del'>-</div><div class='del'>-		/* not in document! Fix me */</div><div class='del'>-		sdr_set_bits(host-&gt;base + SDC_CFG, SDC_CFG_INSWKUP);</div><div class='del'>-	} else {</div><div class='del'>-		if (hw-&gt;config_gpio_pin) /* NULL */</div><div class='del'>-			hw-&gt;config_gpio_pin(MSDC_CD_PIN, GPIO_PULL_DOWN);</div><div class='del'>-</div><div class='del'>-		sdr_clr_bits(host-&gt;base + SDC_CFG, SDC_CFG_INSWKUP);</div><div class='del'>-		sdr_clr_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='del'>-		sdr_clr_bits(host-&gt;base + MSDC_INTEN, MSDC_INTEN_CDSC);</div><div class='del'>-</div><div class='del'>-		/* Here decreases a reference count to core power since card</div><div class='del'>-		 * detection circuit is shutdown.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by msdc_drv_probe */</div><div class='del'>-static void msdc_init_hw(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	/* Configure to MMC/SD mode */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_CFG, MSDC_CFG_MODE, MSDC_SDMMC);</div><div class='del'>-</div><div class='del'>-	/* Reset */</div><div class='del'>-	msdc_reset_hw(host);</div><div class='del'>-	msdc_clr_fifo(host);</div><div class='del'>-</div><div class='del'>-	/* Disable card detection */</div><div class='del'>-	sdr_clr_bits(host-&gt;base + MSDC_PS, MSDC_PS_CDEN);</div><div class='del'>-</div><div class='del'>-	/* Disable and clear all interrupts */</div><div class='del'>-	sdr_clr_bits(host-&gt;base + MSDC_INTEN, readl(host-&gt;base + MSDC_INTEN));</div><div class='del'>-	writel(readl(host-&gt;base + MSDC_INT), host-&gt;base + MSDC_INT);</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-	/* reset tuning parameter */</div><div class='del'>-	writel(0x00090000, host-&gt;base + MSDC_PAD_CTL0);</div><div class='del'>-	writel(0x000A0000, host-&gt;base + MSDC_PAD_CTL1);</div><div class='del'>-	writel(0x000A0000, host-&gt;base + MSDC_PAD_CTL2);</div><div class='del'>-	// writel(  0x00000000, host-&gt;base + MSDC_PAD_TUNE);</div><div class='del'>-</div><div class='del'>-	// for MT7620 E2 and afterward</div><div class='del'>-	writel(0x84101010, host-&gt;base + MSDC_PAD_TUNE);</div><div class='del'>-</div><div class='del'>-	// writel(0x00000000, host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-</div><div class='del'>-	// for MT7620 E2 and afterward</div><div class='del'>-	writel(0x10101010, host-&gt;base + MSDC_DAT_RDDLY0);</div><div class='del'>-</div><div class='del'>-	writel(0x00000000, host-&gt;base + MSDC_DAT_RDDLY1);</div><div class='del'>-	writel(0x00000000, host-&gt;base + MSDC_IOCON);</div><div class='del'>-</div><div class='del'>-	if (readl(host-&gt;base + MSDC_ECO_VER) &gt;= 4) {</div><div class='del'>-		if (host-&gt;id == 1) {</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_PATCH_BIT1,</div><div class='del'>-				      MSDC_PATCH_BIT1_WRDAT_CRCS, 1);</div><div class='del'>-			sdr_set_field(host-&gt;base + MSDC_PATCH_BIT1,</div><div class='del'>-				      MSDC_PATCH_BIT1_CMD_RSP,    1);</div><div class='del'>-</div><div class='del'>-			/* internal clock: latch read data */</div><div class='del'>-			sdr_set_bits(host-&gt;base + MSDC_PATCH_BIT0,</div><div class='del'>-				     MSDC_PATCH_BIT_CKGEN_CK);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* for safety, should clear SDC_CFG.SDIO_INT_DET_EN &amp; set SDC_CFG.SDIO in</div><div class='del'>-	 *  pre-loader,uboot,kernel drivers. and SDC_CFG.SDIO_INT_DET_EN will be only</div><div class='del'>-	 *  set when kernel driver wants to use SDIO bus interrupt</div><div class='del'>-	 */</div><div class='del'>-	/* Configure to enable SDIO mode. it's must otherwise sdio cmd5 failed */</div><div class='del'>-	sdr_set_bits(host-&gt;base + SDC_CFG, SDC_CFG_SDIO);</div><div class='del'>-</div><div class='del'>-	/* disable detect SDIO device interrupt function */</div><div class='del'>-	sdr_clr_bits(host-&gt;base + SDC_CFG, SDC_CFG_SDIOIDE);</div><div class='del'>-</div><div class='del'>-	/* eneable SMT for glitch filter */</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKSMT);</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDSMT);</div><div class='del'>-	sdr_set_bits(host-&gt;base + MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATSMT);</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-	/* set clk, cmd, dat pad driving */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVN, 4);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVP, 4);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVN, 4);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVP, 4);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVN, 4);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVP, 4);</div><div class='del'>-#else</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVN, 0);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL0, MSDC_PAD_CTL0_CLKDRVP, 0);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVN, 0);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL1, MSDC_PAD_CTL1_CMDDRVP, 0);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVN, 0);</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PAD_CTL2, MSDC_PAD_CTL2_DATDRVP, 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* set sampling edge */</div><div class='del'>-</div><div class='del'>-	/* write crc timeout detection */</div><div class='del'>-	sdr_set_field(host-&gt;base + MSDC_PATCH_BIT0, 1 &lt;&lt; 30, 1);</div><div class='del'>-</div><div class='del'>-	/* Configure to default data timeout */</div><div class='del'>-	sdr_set_field(host-&gt;base + SDC_CFG, SDC_CFG_DTOC, DEFAULT_DTOC);</div><div class='del'>-</div><div class='del'>-	msdc_set_buswidth(host, MMC_BUS_WIDTH_1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by msdc_drv_remove */</div><div class='del'>-static void msdc_deinit_hw(struct msdc_host *host)</div><div class='del'>-{</div><div class='del'>-	/* Disable and clear all interrupts */</div><div class='del'>-	sdr_clr_bits(host-&gt;base + MSDC_INTEN, readl(host-&gt;base + MSDC_INTEN));</div><div class='del'>-	writel(readl(host-&gt;base + MSDC_INT), host-&gt;base + MSDC_INT);</div><div class='del'>-</div><div class='del'>-	/* Disable card detection */</div><div class='del'>-	msdc_enable_cd_irq(host, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* init gpd and bd list in msdc_drv_probe */</div><div class='del'>-static void msdc_init_gpd_bd(struct msdc_host *host, struct msdc_dma *dma)</div><div class='del'>-{</div><div class='del'>-	struct gpd *gpd = dma-&gt;gpd;</div><div class='del'>-	struct bd  *bd  = dma-&gt;bd;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* we just support one gpd, but gpd-&gt;next must be set for desc</div><div class='del'>-	 * DMA. That's why we alloc 2 gpd structurs.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	memset(gpd, 0, sizeof(struct gpd) * 2);</div><div class='del'>-</div><div class='del'>-	gpd-&gt;bdp  = 1;   /* hwo, cs, bd pointer */</div><div class='del'>-	gpd-&gt;ptr = (void *)dma-&gt;bd_addr; /* physical address */</div><div class='del'>-	gpd-&gt;next = (void *)((u32)dma-&gt;gpd_addr + sizeof(struct gpd));</div><div class='del'>-</div><div class='del'>-	memset(bd, 0, sizeof(struct bd) * MAX_BD_NUM);</div><div class='del'>-	for (i = 0; i &lt; (MAX_BD_NUM - 1); i++)</div><div class='del'>-		bd[i].next = (void *)(dma-&gt;bd_addr + sizeof(*bd) * (i + 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_drv_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct resource *res;</div><div class='del'>-	__iomem void *base;</div><div class='del'>-	struct mmc_host *mmc;</div><div class='del'>-	struct msdc_host *host;</div><div class='del'>-	struct msdc_hw *hw;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	hw = &amp;msdc0_hw;</div><div class='del'>-</div><div class='del'>-	if (of_property_read_bool(pdev-&gt;dev.of_node, "mtk,wp-en"))</div><div class='del'>-		msdc0_hw.flags |= MSDC_WP_PIN_EN;</div><div class='del'>-</div><div class='del'>-	/* Allocate MMC host for this device */</div><div class='del'>-	mmc = mmc_alloc_host(sizeof(struct msdc_host), &amp;pdev-&gt;dev);</div><div class='del'>-	if (!mmc)</div><div class='del'>-		return -ENOMEM;</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'>-		ret = PTR_ERR(base);</div><div class='del'>-		goto host_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set host parameters to mmc */</div><div class='del'>-	mmc-&gt;ops        = &amp;mt_msdc_ops;</div><div class='del'>-	mmc-&gt;f_min      = HOST_MIN_MCLK;</div><div class='del'>-	mmc-&gt;f_max      = HOST_MAX_MCLK;</div><div class='del'>-	mmc-&gt;ocr_avail  = MSDC_OCR_AVAIL;</div><div class='del'>-</div><div class='del'>-	mmc-&gt;caps   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;</div><div class='del'>-</div><div class='del'>-	//TODO: read this as bus-width from dt (via mmc_of_parse)</div><div class='del'>-	mmc-&gt;caps  |= MMC_CAP_4_BIT_DATA;</div><div class='del'>-</div><div class='del'>-	cd_active_low = !of_property_read_bool(pdev-&gt;dev.of_node, "mediatek,cd-high");</div><div class='del'>-</div><div class='del'>-	if (of_property_read_bool(pdev-&gt;dev.of_node, "mediatek,cd-poll"))</div><div class='del'>-		mmc-&gt;caps |= MMC_CAP_NEEDS_POLL;</div><div class='del'>-</div><div class='del'>-	/* MMC core transfer sizes tunable parameters */</div><div class='del'>-	mmc-&gt;max_segs      = MAX_HW_SGMTS;</div><div class='del'>-</div><div class='del'>-	mmc-&gt;max_seg_size  = MAX_SGMT_SZ;</div><div class='del'>-	mmc-&gt;max_blk_size  = HOST_MAX_BLKSZ;</div><div class='del'>-	mmc-&gt;max_req_size  = MAX_REQ_SZ;</div><div class='del'>-	mmc-&gt;max_blk_count = mmc-&gt;max_req_size;</div><div class='del'>-</div><div class='del'>-	host = mmc_priv(mmc);</div><div class='del'>-	host-&gt;hw        = hw;</div><div class='del'>-	host-&gt;mmc       = mmc;</div><div class='del'>-	host-&gt;id        = pdev-&gt;id;</div><div class='del'>-	if (host-&gt;id &lt; 0 || host-&gt;id &gt;= 4)</div><div class='del'>-		host-&gt;id = 0;</div><div class='del'>-	host-&gt;error     = 0;</div><div class='del'>-</div><div class='del'>-	host-&gt;irq       = platform_get_irq(pdev, 0);</div><div class='del'>-	if (host-&gt;irq &lt; 0) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto host_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	host-&gt;base      = base;</div><div class='del'>-	host-&gt;mclk      = 0;                   /* mclk: the request clock of mmc sub-system */</div><div class='del'>-	host-&gt;hclk      = hclks[hw-&gt;clk_src];  /* hclk: clock of clock source to msdc controller */</div><div class='del'>-	host-&gt;sclk      = 0;                   /* sclk: the really clock after divition */</div><div class='del'>-	host-&gt;pm_state  = PMSG_RESUME;</div><div class='del'>-	host-&gt;suspend   = 0;</div><div class='del'>-	host-&gt;core_clkon = 0;</div><div class='del'>-	host-&gt;card_clkon = 0;</div><div class='del'>-	host-&gt;core_power = 0;</div><div class='del'>-	host-&gt;power_mode = MMC_POWER_OFF;</div><div class='del'>-//    host-&gt;card_inserted = hw-&gt;flags &amp; MSDC_REMOVABLE ? 0 : 1;</div><div class='del'>-	host-&gt;timeout_ns = 0;</div><div class='del'>-	host-&gt;timeout_clks = DEFAULT_DTOC * 65536;</div><div class='del'>-</div><div class='del'>-	host-&gt;mrq = NULL;</div><div class='del'>-	//init_MUTEX(&amp;host-&gt;sem); /* we don't need to support multiple threads access */</div><div class='del'>-</div><div class='del'>-	dma_coerce_mask_and_coherent(mmc_dev(mmc), DMA_BIT_MASK(32));</div><div class='del'>-</div><div class='del'>-	/* using dma_alloc_coherent*/  /* todo: using 1, for all 4 slots */</div><div class='del'>-	host-&gt;dma.gpd = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='del'>-					   MAX_GPD_NUM * sizeof(struct gpd),</div><div class='del'>-					   &amp;host-&gt;dma.gpd_addr, GFP_KERNEL);</div><div class='del'>-	host-&gt;dma.bd =  dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='del'>-					   MAX_BD_NUM  * sizeof(struct bd),</div><div class='del'>-					   &amp;host-&gt;dma.bd_addr,  GFP_KERNEL);</div><div class='del'>-	if (!host-&gt;dma.gpd || !host-&gt;dma.bd) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto release_mem;</div><div class='del'>-	}</div><div class='del'>-	msdc_init_gpd_bd(host, &amp;host-&gt;dma);</div><div class='del'>-</div><div class='del'>-	INIT_DELAYED_WORK(&amp;host-&gt;card_delaywork, msdc_tasklet_card);</div><div class='del'>-	spin_lock_init(&amp;host-&gt;lock);</div><div class='del'>-	msdc_init_hw(host);</div><div class='del'>-</div><div class='del'>-	/* TODO check weather flags 0 is correct, the mtk-sd driver uses</div><div class='del'>-	 * IRQF_TRIGGER_LOW | IRQF_ONESHOT for flags</div><div class='del'>-	 *</div><div class='del'>-	 * for flags 0 the trigger polarity is determined by the</div><div class='del'>-	 * device tree, but not the oneshot flag, but maybe it is also</div><div class='del'>-	 * not needed because the soc could be oneshot safe.</div><div class='del'>-	 */</div><div class='del'>-	ret = devm_request_irq(&amp;pdev-&gt;dev, host-&gt;irq, msdc_irq, 0, pdev-&gt;name,</div><div class='del'>-			       host);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto release;</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, mmc);</div><div class='del'>-</div><div class='del'>-	ret = mmc_add_host(mmc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto release;</div><div class='del'>-</div><div class='del'>-	/* Config card detection pin and enable interrupts */</div><div class='del'>-	if (hw-&gt;flags &amp; MSDC_CD_PIN_EN) {  /* set for card */</div><div class='del'>-		msdc_enable_cd_irq(host, 1);</div><div class='del'>-	} else {</div><div class='del'>-		msdc_enable_cd_irq(host, 0);</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'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-	msdc_deinit_hw(host);</div><div class='del'>-	cancel_delayed_work_sync(&amp;host-&gt;card_delaywork);</div><div class='del'>-</div><div class='del'>-release_mem:</div><div class='del'>-	if (host-&gt;dma.gpd)</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, MAX_GPD_NUM * sizeof(struct gpd),</div><div class='del'>-				  host-&gt;dma.gpd, host-&gt;dma.gpd_addr);</div><div class='del'>-	if (host-&gt;dma.bd)</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, MAX_BD_NUM * sizeof(struct bd),</div><div class='del'>-				  host-&gt;dma.bd, host-&gt;dma.bd_addr);</div><div class='del'>-host_free:</div><div class='del'>-	mmc_free_host(mmc);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 4 device share one driver, using "drvdata" to show difference */</div><div class='del'>-static int msdc_drv_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct mmc_host *mmc;</div><div class='del'>-	struct msdc_host *host;</div><div class='del'>-</div><div class='del'>-	mmc  = platform_get_drvdata(pdev);</div><div class='del'>-	BUG_ON(!mmc);</div><div class='del'>-</div><div class='del'>-	host = mmc_priv(mmc);</div><div class='del'>-	BUG_ON(!host);</div><div class='del'>-</div><div class='del'>-	dev_err(mmc_dev(host-&gt;mmc), "%d -&gt; removed !!!\n",</div><div class='del'>-		host-&gt;id);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-	mmc_remove_host(host-&gt;mmc);</div><div class='del'>-	msdc_deinit_hw(host);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;host-&gt;card_delaywork);</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(&amp;pdev-&gt;dev, MAX_GPD_NUM * sizeof(struct gpd),</div><div class='del'>-			  host-&gt;dma.gpd, host-&gt;dma.gpd_addr);</div><div class='del'>-	dma_free_coherent(&amp;pdev-&gt;dev, MAX_BD_NUM  * sizeof(struct bd),</div><div class='del'>-			  host-&gt;dma.bd,  host-&gt;dma.bd_addr);</div><div class='del'>-</div><div class='del'>-	mmc_free_host(host-&gt;mmc);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fix me: Power Flow */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static void msdc_drv_pm(struct platform_device *pdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct mmc_host *mmc = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	if (mmc) {</div><div class='del'>-		struct msdc_host *host = mmc_priv(mmc);</div><div class='del'>-</div><div class='del'>-		msdc_pm(state, (void *)host);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_drv_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	if (state.event == PM_EVENT_SUSPEND)</div><div class='del'>-		msdc_drv_pm(pdev, state);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msdc_drv_resume(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct pm_message state;</div><div class='del'>-</div><div class='del'>-	state.event = PM_EVENT_RESUME;</div><div class='del'>-	msdc_drv_pm(pdev, state);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct of_device_id mt7620_sdhci_match[] = {</div><div class='del'>-	{ .compatible = "ralink,mt7620-sdhci" },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);</div><div class='del'>-</div><div class='del'>-static struct platform_driver mt_msdc_driver = {</div><div class='del'>-	.probe   = msdc_drv_probe,</div><div class='del'>-	.remove  = msdc_drv_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = msdc_drv_suspend,</div><div class='del'>-	.resume  = msdc_drv_resume,</div><div class='del'>-#endif</div><div class='del'>-	.driver  = {</div><div class='del'>-		.name  = DRV_NAME,</div><div class='del'>-		.of_match_table = mt7620_sdhci_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-/* module init/exit                                                      */</div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-static int __init mt_msdc_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	// Set the pins for sdxc to sdxc mode</div><div class='del'>-	//FIXME: this should be done by pinctl and not by the sd driver</div><div class='del'>-	reg = readl((void __iomem *)(RALINK_SYSCTL_BASE + 0x60)) &amp; ~(0x3 &lt;&lt; 18);</div><div class='del'>-	writel(reg, (void __iomem *)(RALINK_SYSCTL_BASE + 0x60));</div><div class='del'>-</div><div class='del'>-	ret = platform_driver_register(&amp;mt_msdc_driver);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("%s: Can't register driver", DRV_NAME);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if defined(MT6575_SD_DEBUG)</div><div class='del'>-	msdc_debug_proc_init();</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mt_msdc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mt_msdc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mt_msdc_init);</div><div class='del'>-module_exit(mt_msdc_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("MediaTek MT6575 SD/MMC Card Driver");</div><div class='del'>-MODULE_AUTHOR("Infinity Chen &lt;infinity.chen@mediatek.com&gt;");</div><div class='head'>diff --git a/drivers/staging/mt7621-pci-phy/Kconfig b/drivers/staging/mt7621-pci-phy/Kconfig<br/>index b9f6ab784ee8..263e0a91c424 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci-phy/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config PCI_MT7621_PHY</div><div class='ctx'> 	tristate "MediaTek MT7621 PCI PHY Driver"</div><div class='ctx'> 	depends on RALINK &amp;&amp; OF</div><div class='head'>diff --git a/drivers/staging/mt7621-pci-phy/Makefile b/drivers/staging/mt7621-pci-phy/Makefile<br/>index a970056f05c1..b4d99b9119e0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci-phy/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_PCI_MT7621_PHY)       += pci-mt7621-phy.o</div><div class='head'>diff --git a/drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt b/drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt<br/>index 33a8a698bdd0..a369d715378b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt</a></div><div class='hunk'>@@ -3,45 +3,19 @@ Mediatek Mt7621 PCIe PHY</div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: must be "mediatek,mt7621-pci-phy"</div><div class='ctx'> - reg: base address and length of the PCIe PHY block</div><div class='del'>-- #address-cells: must be 1</div><div class='del'>-- #size-cells: must be 0</div><div class='del'>-</div><div class='del'>-Each PCIe PHY should be represented by a child node</div><div class='del'>-</div><div class='del'>-Required properties For the child node:</div><div class='del'>-- reg: the PHY ID</div><div class='del'>-0 - PCIe RC 0</div><div class='del'>-1 - PCIe RC 1</div><div class='del'>-- #phy-cells: must be 0</div><div class='add'>+- #phy-cells: must be &lt;1&gt; for pcie0_phy and for pcie1_phy.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='del'>-	pcie0_phy: pcie-phy@1a149000 {</div><div class='add'>+	pcie0_phy: pcie-phy@1e149000 {</div><div class='ctx'> 		compatible = "mediatek,mt7621-pci-phy";</div><div class='del'>-		reg = &lt;0x1a149000 0x0700&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		pcie0_port: pcie-phy@0 {</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pcie1_port: pcie-phy@1 {</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='add'>+		reg = &lt;0x1e149000 0x0700&gt;;</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pcie1_phy: pcie-phy@1a14a000 {</div><div class='add'>+	pcie1_phy: pcie-phy@1e14a000 {</div><div class='ctx'> 		compatible = "mediatek,mt7621-pci-phy";</div><div class='del'>-		reg = &lt;0x1a14a000 0x0700&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		pcie2_port: pcie-phy@0 {</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='add'>+		reg = &lt;0x1e14a000 0x0700&gt;;</div><div class='add'>+		#phy-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* users of the PCIe phy */</div><div class='hunk'>@@ -49,6 +23,6 @@ Example:</div><div class='ctx'> 	pcie: pcie@1e140000 {</div><div class='ctx'> 		...</div><div class='ctx'> 		...</div><div class='del'>-		phys = &lt;&amp;pcie0_port&gt;, &lt;&amp;pcie1_port&gt;, &lt;&amp;pcie2_port&gt;;</div><div class='add'>+		phys = &lt;&amp;pcie0_phy 0&gt;, &lt;&amp;pcie0_phy 1&gt;, &lt;&amp;pcie1_phy 0&gt;;</div><div class='ctx'> 		phy-names = "pcie-phy0", "pcie-phy1", "pcie-phy2";</div><div class='del'>-	};
\ No newline at end of file</div><div class='add'>+	};</div><div class='head'>diff --git a/drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c b/drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c<br/>index d3ca2f019112..2576f179e30a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c</a></div><div class='hunk'>@@ -11,72 +11,75 @@</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/phy/phy.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/sys_soc.h&gt;</div><div class='ctx'> #include &lt;mt7621.h&gt;</div><div class='ctx'> #include &lt;ralink_regs.h&gt;</div><div class='ctx'> </div><div class='del'>-#define RALINK_CLKCFG1			0x30</div><div class='del'>-#define CHIP_REV_MT7621_E2		0x0101</div><div class='del'>-</div><div class='del'>-#define PCIE_PORT_CLK_EN(x)		BIT(24 + (x))</div><div class='del'>-</div><div class='del'>-#define RG_PE1_PIPE_REG			0x02c</div><div class='del'>-#define RG_PE1_PIPE_RST			BIT(12)</div><div class='del'>-#define RG_PE1_PIPE_CMD_FRC		BIT(4)</div><div class='del'>-</div><div class='del'>-#define RG_P0_TO_P1_WIDTH		0x100</div><div class='del'>-#define RG_PE1_H_LCDDS_REG		0x49c</div><div class='del'>-#define RG_PE1_H_LCDDS_PCW		GENMASK(30, 0)</div><div class='del'>-#define RG_PE1_H_LCDDS_PCW_VAL(x)	((0x7fffffff &amp; (x)) &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_FRC_H_XTAL_REG		0x400</div><div class='del'>-#define RG_PE1_FRC_H_XTAL_TYPE          BIT(8)</div><div class='del'>-#define RG_PE1_H_XTAL_TYPE              GENMASK(10, 9)</div><div class='del'>-#define RG_PE1_H_XTAL_TYPE_VAL(x)       ((0x3 &amp; (x)) &lt;&lt; 9)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_FRC_PHY_REG		0x000</div><div class='del'>-#define RG_PE1_FRC_PHY_EN               BIT(4)</div><div class='del'>-#define RG_PE1_PHY_EN                   BIT(5)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_H_PLL_REG		0x490</div><div class='del'>-#define RG_PE1_H_PLL_BC			GENMASK(23, 22)</div><div class='del'>-#define RG_PE1_H_PLL_BC_VAL(x)		((0x3 &amp; (x)) &lt;&lt; 22)</div><div class='del'>-#define RG_PE1_H_PLL_BP			GENMASK(21, 18)</div><div class='del'>-#define RG_PE1_H_PLL_BP_VAL(x)		((0xf &amp; (x)) &lt;&lt; 18)</div><div class='del'>-#define RG_PE1_H_PLL_IR			GENMASK(15, 12)</div><div class='del'>-#define RG_PE1_H_PLL_IR_VAL(x)		((0xf &amp; (x)) &lt;&lt; 12)</div><div class='del'>-#define RG_PE1_H_PLL_IC			GENMASK(11, 8)</div><div class='del'>-#define RG_PE1_H_PLL_IC_VAL(x)		((0xf &amp; (x)) &lt;&lt; 8)</div><div class='del'>-#define RG_PE1_H_PLL_PREDIV             GENMASK(7, 6)</div><div class='del'>-#define RG_PE1_H_PLL_PREDIV_VAL(x)      ((0x3 &amp; (x)) &lt;&lt; 6)</div><div class='del'>-#define RG_PE1_PLL_DIVEN		GENMASK(3, 1)</div><div class='del'>-#define RG_PE1_PLL_DIVEN_VAL(x)		((0x7 &amp; (x)) &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_H_PLL_FBKSEL_REG		0x4bc</div><div class='del'>-#define RG_PE1_H_PLL_FBKSEL             GENMASK(5, 4)</div><div class='del'>-#define RG_PE1_H_PLL_FBKSEL_VAL(x)      ((0x3 &amp; (x)) &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define	RG_PE1_H_LCDDS_SSC_PRD_REG	0x4a4</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_PRD          GENMASK(15, 0)</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_PRD_VAL(x)   ((0xffff &amp; (x)) &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_DELTA_REG	0x4a8</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_DELTA        GENMASK(11, 0)</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_DELTA_VAL(x) ((0xfff &amp; (x)) &lt;&lt; 0)</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_DELTA1       GENMASK(27, 16)</div><div class='del'>-#define RG_PE1_H_LCDDS_SSC_DELTA1_VAL(x) ((0xff &amp; (x)) &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_LCDDS_CLK_PH_INV_REG	0x4a0</div><div class='del'>-#define RG_PE1_LCDDS_CLK_PH_INV		BIT(5)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_H_PLL_BR_REG		0x4ac</div><div class='del'>-#define RG_PE1_H_PLL_BR			GENMASK(18, 16)</div><div class='del'>-#define RG_PE1_H_PLL_BR_VAL(x)		((0x7 &amp; (x)) &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-#define	RG_PE1_MSTCKDIV_REG		0x414</div><div class='del'>-#define RG_PE1_MSTCKDIV			GENMASK(7, 6)</div><div class='del'>-#define RG_PE1_MSTCKDIV_VAL(x)		((0x3 &amp; (x)) &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-#define RG_PE1_FRC_MSTCKDIV		BIT(5)</div><div class='add'>+#define RALINK_CLKCFG1				0x30</div><div class='add'>+</div><div class='add'>+#define PCIE_PORT_CLK_EN(x)			BIT(24 + (x))</div><div class='add'>+</div><div class='add'>+#define RG_PE1_PIPE_REG				0x02c</div><div class='add'>+#define RG_PE1_PIPE_RST				BIT(12)</div><div class='add'>+#define RG_PE1_PIPE_CMD_FRC			BIT(4)</div><div class='add'>+</div><div class='add'>+#define RG_P0_TO_P1_WIDTH			0x100</div><div class='add'>+#define RG_PE1_H_LCDDS_REG			0x49c</div><div class='add'>+#define RG_PE1_H_LCDDS_PCW			GENMASK(30, 0)</div><div class='add'>+#define RG_PE1_H_LCDDS_PCW_VAL(x)		((0x7fffffff &amp; (x)) &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_FRC_H_XTAL_REG			0x400</div><div class='add'>+#define RG_PE1_FRC_H_XTAL_TYPE			BIT(8)</div><div class='add'>+#define RG_PE1_H_XTAL_TYPE			GENMASK(10, 9)</div><div class='add'>+#define RG_PE1_H_XTAL_TYPE_VAL(x)		((0x3 &amp; (x)) &lt;&lt; 9)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_FRC_PHY_REG			0x000</div><div class='add'>+#define RG_PE1_FRC_PHY_EN			BIT(4)</div><div class='add'>+#define RG_PE1_PHY_EN				BIT(5)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_H_PLL_REG			0x490</div><div class='add'>+#define RG_PE1_H_PLL_BC				GENMASK(23, 22)</div><div class='add'>+#define RG_PE1_H_PLL_BC_VAL(x)			((0x3 &amp; (x)) &lt;&lt; 22)</div><div class='add'>+#define RG_PE1_H_PLL_BP				GENMASK(21, 18)</div><div class='add'>+#define RG_PE1_H_PLL_BP_VAL(x)			((0xf &amp; (x)) &lt;&lt; 18)</div><div class='add'>+#define RG_PE1_H_PLL_IR				GENMASK(15, 12)</div><div class='add'>+#define RG_PE1_H_PLL_IR_VAL(x)			((0xf &amp; (x)) &lt;&lt; 12)</div><div class='add'>+#define RG_PE1_H_PLL_IC				GENMASK(11, 8)</div><div class='add'>+#define RG_PE1_H_PLL_IC_VAL(x)			((0xf &amp; (x)) &lt;&lt; 8)</div><div class='add'>+#define RG_PE1_H_PLL_PREDIV			GENMASK(7, 6)</div><div class='add'>+#define RG_PE1_H_PLL_PREDIV_VAL(x)		((0x3 &amp; (x)) &lt;&lt; 6)</div><div class='add'>+#define RG_PE1_PLL_DIVEN			GENMASK(3, 1)</div><div class='add'>+#define RG_PE1_PLL_DIVEN_VAL(x)			((0x7 &amp; (x)) &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_H_PLL_FBKSEL_REG			0x4bc</div><div class='add'>+#define RG_PE1_H_PLL_FBKSEL			GENMASK(5, 4)</div><div class='add'>+#define RG_PE1_H_PLL_FBKSEL_VAL(x)		((0x3 &amp; (x)) &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define	RG_PE1_H_LCDDS_SSC_PRD_REG		0x4a4</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_PRD			GENMASK(15, 0)</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_PRD_VAL(x)		((0xffff &amp; (x)) &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_DELTA_REG		0x4a8</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_DELTA		GENMASK(11, 0)</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_DELTA_VAL(x)		((0xfff &amp; (x)) &lt;&lt; 0)</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_DELTA1		GENMASK(27, 16)</div><div class='add'>+#define RG_PE1_H_LCDDS_SSC_DELTA1_VAL(x)	((0xff &amp; (x)) &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_LCDDS_CLK_PH_INV_REG		0x4a0</div><div class='add'>+#define RG_PE1_LCDDS_CLK_PH_INV			BIT(5)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_H_PLL_BR_REG			0x4ac</div><div class='add'>+#define RG_PE1_H_PLL_BR				GENMASK(18, 16)</div><div class='add'>+#define RG_PE1_H_PLL_BR_VAL(x)			((0x7 &amp; (x)) &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+#define	RG_PE1_MSTCKDIV_REG			0x414</div><div class='add'>+#define RG_PE1_MSTCKDIV				GENMASK(7, 6)</div><div class='add'>+#define RG_PE1_MSTCKDIV_VAL(x)			((0x3 &amp; (x)) &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define RG_PE1_FRC_MSTCKDIV			BIT(5)</div><div class='add'>+</div><div class='add'>+#define MAX_PHYS	2</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct mt7621_pci_phy_instance - Mt7621 Pcie PHY device</div><div class='hunk'>@@ -93,24 +96,32 @@ struct mt7621_pci_phy_instance {</div><div class='ctx'> /**</div><div class='ctx'>  * struct mt7621_pci_phy - Mt7621 Pcie PHY core</div><div class='ctx'>  * @dev: pointer to device</div><div class='add'>+ * @regmap: kernel regmap pointer</div><div class='ctx'>  * @phys: pointer to Mt7621 PHY device</div><div class='ctx'>  * @nphys: number of PHY devices for this core</div><div class='add'>+ * @bypass_pipe_rst: mark if 'mt7621_bypass_pipe_rst'</div><div class='add'>+ * needs to be executed. Depends on chip revision.</div><div class='ctx'>  */</div><div class='ctx'> struct mt7621_pci_phy {</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='ctx'> 	struct mt7621_pci_phy_instance **phys;</div><div class='ctx'> 	int nphys;</div><div class='add'>+	bool bypass_pipe_rst;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline u32 phy_read(struct mt7621_pci_phy_instance *instance, u32 reg)</div><div class='add'>+static inline u32 phy_read(struct mt7621_pci_phy *phy, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	return readl(instance-&gt;port_base + reg);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	regmap_read(phy-&gt;regmap, reg, &amp;val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void phy_write(struct mt7621_pci_phy_instance *instance,</div><div class='del'>-			     u32 val, u32 reg)</div><div class='add'>+static inline void phy_write(struct mt7621_pci_phy *phy, u32 val, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	writel(val, instance-&gt;port_base + reg);</div><div class='add'>+	regmap_write(phy-&gt;regmap, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7621_bypass_pipe_rst(struct mt7621_pci_phy *phy,</div><div class='hunk'>@@ -120,10 +131,10 @@ static void mt7621_bypass_pipe_rst(struct mt7621_pci_phy *phy,</div><div class='ctx'> 		RG_PE1_PIPE_REG : RG_PE1_PIPE_REG + RG_P0_TO_P1_WIDTH;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	reg = phy_read(instance, offset);</div><div class='add'>+	reg = phy_read(phy, offset);</div><div class='ctx'> 	reg &amp;= ~(RG_PE1_PIPE_RST | RG_PE1_PIPE_CMD_FRC);</div><div class='ctx'> 	reg |= (RG_PE1_PIPE_RST | RG_PE1_PIPE_CMD_FRC);</div><div class='del'>-	phy_write(instance, reg, offset);</div><div class='add'>+	phy_write(phy, reg, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7621_set_phy_for_ssc(struct mt7621_pci_phy *phy,</div><div class='hunk'>@@ -137,72 +148,72 @@ static void mt7621_set_phy_for_ssc(struct mt7621_pci_phy *phy,</div><div class='ctx'> 	reg = (reg &gt;&gt; 6) &amp; 0x7;</div><div class='ctx'> 	/* Set PCIe Port PHY to disable SSC */</div><div class='ctx'> 	/* Debug Xtal Type */</div><div class='del'>-	val = phy_read(instance, RG_PE1_FRC_H_XTAL_REG);</div><div class='add'>+	val = phy_read(phy, RG_PE1_FRC_H_XTAL_REG);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_FRC_H_XTAL_TYPE | RG_PE1_H_XTAL_TYPE);</div><div class='ctx'> 	val |= RG_PE1_FRC_H_XTAL_TYPE;</div><div class='ctx'> 	val |= RG_PE1_H_XTAL_TYPE_VAL(0x00);</div><div class='del'>-	phy_write(instance, val, RG_PE1_FRC_H_XTAL_REG);</div><div class='add'>+	phy_write(phy, val, RG_PE1_FRC_H_XTAL_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* disable port */</div><div class='ctx'> 	offset = (instance-&gt;index != 1) ?</div><div class='ctx'> 		RG_PE1_FRC_PHY_REG : RG_PE1_FRC_PHY_REG + RG_P0_TO_P1_WIDTH;</div><div class='del'>-	val = phy_read(instance, offset);</div><div class='add'>+	val = phy_read(phy, offset);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_FRC_PHY_EN | RG_PE1_PHY_EN);</div><div class='ctx'> 	val |= RG_PE1_FRC_PHY_EN;</div><div class='del'>-	phy_write(instance, val, offset);</div><div class='add'>+	phy_write(phy, val, offset);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Pre-divider ratio (for host mode) */</div><div class='del'>-	val = phy_read(instance, RG_PE1_H_PLL_REG);</div><div class='add'>+	val = phy_read(phy, RG_PE1_H_PLL_REG);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_H_PLL_PREDIV);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &lt;= 5 &amp;&amp; reg &gt;= 3) { /* 40MHz Xtal */</div><div class='ctx'> 		val |= RG_PE1_H_PLL_PREDIV_VAL(0x01);</div><div class='del'>-		phy_write(instance, val, RG_PE1_H_PLL_REG);</div><div class='add'>+		phy_write(phy, val, RG_PE1_H_PLL_REG);</div><div class='ctx'> 		dev_info(dev, "Xtal is 40MHz\n");</div><div class='ctx'> 	} else { /* 25MHz | 20MHz Xtal */</div><div class='ctx'> 		val |= RG_PE1_H_PLL_PREDIV_VAL(0x00);</div><div class='del'>-		phy_write(instance, val, RG_PE1_H_PLL_REG);</div><div class='add'>+		phy_write(phy, val, RG_PE1_H_PLL_REG);</div><div class='ctx'> 		if (reg &gt;= 6) {</div><div class='ctx'> 			dev_info(dev, "Xtal is 25MHz\n");</div><div class='ctx'> </div><div class='ctx'> 			/* Select feedback clock */</div><div class='del'>-			val = phy_read(instance, RG_PE1_H_PLL_FBKSEL_REG);</div><div class='add'>+			val = phy_read(phy, RG_PE1_H_PLL_FBKSEL_REG);</div><div class='ctx'> 			val &amp;= ~(RG_PE1_H_PLL_FBKSEL);</div><div class='ctx'> 			val |= RG_PE1_H_PLL_FBKSEL_VAL(0x01);</div><div class='del'>-			phy_write(instance, val, RG_PE1_H_PLL_FBKSEL_REG);</div><div class='add'>+			phy_write(phy, val, RG_PE1_H_PLL_FBKSEL_REG);</div><div class='ctx'> </div><div class='ctx'> 			/* DDS NCPO PCW (for host mode) */</div><div class='del'>-			val = phy_read(instance, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='add'>+			val = phy_read(phy, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='ctx'> 			val &amp;= ~(RG_PE1_H_LCDDS_SSC_PRD);</div><div class='ctx'> 			val |= RG_PE1_H_LCDDS_SSC_PRD_VAL(0x18000000);</div><div class='del'>-			phy_write(instance, val, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='add'>+			phy_write(phy, val, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='ctx'> </div><div class='ctx'> 			/* DDS SSC dither period control */</div><div class='del'>-			val = phy_read(instance, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='add'>+			val = phy_read(phy, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='ctx'> 			val &amp;= ~(RG_PE1_H_LCDDS_SSC_PRD);</div><div class='ctx'> 			val |= RG_PE1_H_LCDDS_SSC_PRD_VAL(0x18d);</div><div class='del'>-			phy_write(instance, val, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='add'>+			phy_write(phy, val, RG_PE1_H_LCDDS_SSC_PRD_REG);</div><div class='ctx'> </div><div class='ctx'> 			/* DDS SSC dither amplitude control */</div><div class='del'>-			val = phy_read(instance, RG_PE1_H_LCDDS_SSC_DELTA_REG);</div><div class='add'>+			val = phy_read(phy, RG_PE1_H_LCDDS_SSC_DELTA_REG);</div><div class='ctx'> 			val &amp;= ~(RG_PE1_H_LCDDS_SSC_DELTA |</div><div class='ctx'> 				 RG_PE1_H_LCDDS_SSC_DELTA1);</div><div class='ctx'> 			val |= RG_PE1_H_LCDDS_SSC_DELTA_VAL(0x4a);</div><div class='ctx'> 			val |= RG_PE1_H_LCDDS_SSC_DELTA1_VAL(0x4a);</div><div class='del'>-			phy_write(instance, val, RG_PE1_H_LCDDS_SSC_DELTA_REG);</div><div class='add'>+			phy_write(phy, val, RG_PE1_H_LCDDS_SSC_DELTA_REG);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_info(dev, "Xtal is 20MHz\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* DDS clock inversion */</div><div class='del'>-	val = phy_read(instance, RG_PE1_LCDDS_CLK_PH_INV_REG);</div><div class='add'>+	val = phy_read(phy, RG_PE1_LCDDS_CLK_PH_INV_REG);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_LCDDS_CLK_PH_INV);</div><div class='ctx'> 	val |= RG_PE1_LCDDS_CLK_PH_INV;</div><div class='del'>-	phy_write(instance, val, RG_PE1_LCDDS_CLK_PH_INV_REG);</div><div class='add'>+	phy_write(phy, val, RG_PE1_LCDDS_CLK_PH_INV_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Set PLL bits */</div><div class='del'>-	val = phy_read(instance, RG_PE1_H_PLL_REG);</div><div class='add'>+	val = phy_read(phy, RG_PE1_H_PLL_REG);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_H_PLL_BC | RG_PE1_H_PLL_BP | RG_PE1_H_PLL_IR |</div><div class='ctx'> 		 RG_PE1_H_PLL_IC | RG_PE1_PLL_DIVEN);</div><div class='ctx'> 	val |= RG_PE1_H_PLL_BC_VAL(0x02);</div><div class='hunk'>@@ -210,19 +221,19 @@ static void mt7621_set_phy_for_ssc(struct mt7621_pci_phy *phy,</div><div class='ctx'> 	val |= RG_PE1_H_PLL_IR_VAL(0x02);</div><div class='ctx'> 	val |= RG_PE1_H_PLL_IC_VAL(0x01);</div><div class='ctx'> 	val |= RG_PE1_PLL_DIVEN_VAL(0x02);</div><div class='del'>-	phy_write(instance, val, RG_PE1_H_PLL_REG);</div><div class='add'>+	phy_write(phy, val, RG_PE1_H_PLL_REG);</div><div class='ctx'> </div><div class='del'>-	val = phy_read(instance, RG_PE1_H_PLL_BR_REG);</div><div class='add'>+	val = phy_read(phy, RG_PE1_H_PLL_BR_REG);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_H_PLL_BR);</div><div class='ctx'> 	val |= RG_PE1_H_PLL_BR_VAL(0x00);</div><div class='del'>-	phy_write(instance, val, RG_PE1_H_PLL_BR_REG);</div><div class='add'>+	phy_write(phy, val, RG_PE1_H_PLL_BR_REG);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &lt;= 5 &amp;&amp; reg &gt;= 3) { /* 40MHz Xtal */</div><div class='ctx'> 		/* set force mode enable of da_pe1_mstckdiv */</div><div class='del'>-		val = phy_read(instance, RG_PE1_MSTCKDIV_REG);</div><div class='add'>+		val = phy_read(phy, RG_PE1_MSTCKDIV_REG);</div><div class='ctx'> 		val &amp;= ~(RG_PE1_MSTCKDIV | RG_PE1_FRC_MSTCKDIV);</div><div class='ctx'> 		val |= (RG_PE1_MSTCKDIV_VAL(0x01) | RG_PE1_FRC_MSTCKDIV);</div><div class='del'>-		phy_write(instance, val, RG_PE1_MSTCKDIV_REG);</div><div class='add'>+		phy_write(phy, val, RG_PE1_MSTCKDIV_REG);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -230,9 +241,8 @@ static int mt7621_pci_phy_init(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7621_pci_phy_instance *instance = phy_get_drvdata(phy);</div><div class='ctx'> 	struct mt7621_pci_phy *mphy = dev_get_drvdata(phy-&gt;dev.parent);</div><div class='del'>-	u32 chip_rev_id = rt_sysc_r32(SYSC_REG_CHIP_REV);</div><div class='ctx'> </div><div class='del'>-	if ((chip_rev_id &amp; 0xFFFF) == CHIP_REV_MT7621_E2)</div><div class='add'>+	if (mphy-&gt;bypass_pipe_rst)</div><div class='ctx'> 		mt7621_bypass_pipe_rst(mphy, instance);</div><div class='ctx'> </div><div class='ctx'> 	mt7621_set_phy_for_ssc(mphy, instance);</div><div class='hunk'>@@ -243,15 +253,16 @@ static int mt7621_pci_phy_init(struct phy *phy)</div><div class='ctx'> static int mt7621_pci_phy_power_on(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7621_pci_phy_instance *instance = phy_get_drvdata(phy);</div><div class='add'>+	struct mt7621_pci_phy *mphy = dev_get_drvdata(phy-&gt;dev.parent);</div><div class='ctx'> 	u32 offset = (instance-&gt;index != 1) ?</div><div class='ctx'> 		RG_PE1_FRC_PHY_REG : RG_PE1_FRC_PHY_REG + RG_P0_TO_P1_WIDTH;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable PHY and disable force mode */</div><div class='del'>-	val = phy_read(instance, offset);</div><div class='add'>+	val = phy_read(mphy, offset);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_FRC_PHY_EN | RG_PE1_PHY_EN);</div><div class='ctx'> 	val |= (RG_PE1_FRC_PHY_EN | RG_PE1_PHY_EN);</div><div class='del'>-	phy_write(instance, val, offset);</div><div class='add'>+	phy_write(mphy, val, offset);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -259,15 +270,16 @@ static int mt7621_pci_phy_power_on(struct phy *phy)</div><div class='ctx'> static int mt7621_pci_phy_power_off(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7621_pci_phy_instance *instance = phy_get_drvdata(phy);</div><div class='add'>+	struct mt7621_pci_phy *mphy = dev_get_drvdata(phy-&gt;dev.parent);</div><div class='ctx'> 	u32 offset = (instance-&gt;index != 1) ?</div><div class='ctx'> 		RG_PE1_FRC_PHY_REG : RG_PE1_FRC_PHY_REG + RG_P0_TO_P1_WIDTH;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable PHY */</div><div class='del'>-	val = phy_read(instance, offset);</div><div class='add'>+	val = phy_read(mphy, offset);</div><div class='ctx'> 	val &amp;= ~(RG_PE1_FRC_PHY_EN | RG_PE1_PHY_EN);</div><div class='ctx'> 	val |= RG_PE1_FRC_PHY_EN;</div><div class='del'>-	phy_write(instance, val, offset);</div><div class='add'>+	phy_write(mphy, val, offset);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -289,76 +301,100 @@ static const struct phy_ops mt7621_pci_phy_ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct phy *mt7621_pcie_phy_of_xlate(struct device *dev,</div><div class='add'>+					    struct of_phandle_args *args)</div><div class='add'>+{</div><div class='add'>+	struct mt7621_pci_phy *mt7621_phy = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (args-&gt;args_count == 0)</div><div class='add'>+		return mt7621_phy-&gt;phys[0]-&gt;phy;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(args-&gt;args[0] &gt;= MAX_PHYS))</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	return mt7621_phy-&gt;phys[args-&gt;args[0]]-&gt;phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct soc_device_attribute mt7621_pci_quirks_match[] = {</div><div class='add'>+	{ .soc_id = "mt7621", .revision = "E2" }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config mt7621_pci_phy_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 = 0x700,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int mt7621_pci_phy_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct device_node *np = dev-&gt;of_node;</div><div class='del'>-	struct device_node *child_np;</div><div class='add'>+	const struct soc_device_attribute *attr;</div><div class='ctx'> 	struct phy_provider *provider;</div><div class='ctx'> 	struct mt7621_pci_phy *phy;</div><div class='del'>-	struct resource res;</div><div class='del'>-	int port, ret;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int port;</div><div class='ctx'> 	void __iomem *port_base;</div><div class='ctx'> </div><div class='ctx'> 	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);</div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;nphys = of_get_child_count(np);</div><div class='add'>+	phy-&gt;nphys = MAX_PHYS;</div><div class='ctx'> 	phy-&gt;phys = devm_kcalloc(dev, phy-&gt;nphys,</div><div class='ctx'> 				 sizeof(*phy-&gt;phys), GFP_KERNEL);</div><div class='ctx'> 	if (!phy-&gt;phys)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	attr = soc_device_match(mt7621_pci_quirks_match);</div><div class='add'>+	if (attr)</div><div class='add'>+		phy-&gt;bypass_pipe_rst = true;</div><div class='add'>+</div><div class='ctx'> 	phy-&gt;dev = dev;</div><div class='ctx'> 	platform_set_drvdata(pdev, phy);</div><div class='ctx'> </div><div class='del'>-	ret = of_address_to_resource(np, 0, &amp;res);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "failed to get address resource(id-%d)\n", port);</div><div class='del'>-		return ret;</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, "failed to get address resource\n");</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	port_base = devm_ioremap_resource(dev, &amp;res);</div><div class='add'>+	port_base = devm_ioremap_resource(dev, res);</div><div class='ctx'> 	if (IS_ERR(port_base)) {</div><div class='ctx'> 		dev_err(dev, "failed to remap phy regs\n");</div><div class='ctx'> 		return PTR_ERR(port_base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	port = 0;</div><div class='del'>-	for_each_child_of_node(np, child_np) {</div><div class='add'>+	phy-&gt;regmap = devm_regmap_init_mmio(phy-&gt;dev, port_base,</div><div class='add'>+					    &amp;mt7621_pci_phy_regmap_config);</div><div class='add'>+	if (IS_ERR(phy-&gt;regmap))</div><div class='add'>+		return PTR_ERR(phy-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; MAX_PHYS; port++) {</div><div class='ctx'> 		struct mt7621_pci_phy_instance *instance;</div><div class='ctx'> 		struct phy *pphy;</div><div class='ctx'> </div><div class='ctx'> 		instance = devm_kzalloc(dev, sizeof(*instance), GFP_KERNEL);</div><div class='del'>-		if (!instance) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto put_child;</div><div class='del'>-		}</div><div class='add'>+		if (!instance)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		phy-&gt;phys[port] = instance;</div><div class='ctx'> </div><div class='del'>-		pphy = devm_phy_create(dev, child_np, &amp;mt7621_pci_phy_ops);</div><div class='add'>+		pphy = devm_phy_create(dev, dev-&gt;of_node, &amp;mt7621_pci_phy_ops);</div><div class='ctx'> 		if (IS_ERR(phy)) {</div><div class='ctx'> 			dev_err(dev, "failed to create phy\n");</div><div class='del'>-			ret = PTR_ERR(phy);</div><div class='del'>-			goto put_child;</div><div class='add'>+			return PTR_ERR(phy);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		instance-&gt;port_base = port_base;</div><div class='ctx'> 		instance-&gt;phy = pphy;</div><div class='ctx'> 		instance-&gt;index = port;</div><div class='ctx'> 		phy_set_drvdata(pphy, instance);</div><div class='del'>-		port++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);</div><div class='add'>+	provider = devm_of_phy_provider_register(dev, mt7621_pcie_phy_of_xlate);</div><div class='ctx'> </div><div class='ctx'> 	return PTR_ERR_OR_ZERO(provider);</div><div class='del'>-</div><div class='del'>-put_child:</div><div class='del'>-	of_node_put(child_np);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id mt7621_pci_phy_ids[] = {</div><div class='head'>diff --git a/drivers/staging/mt7621-pci/Kconfig b/drivers/staging/mt7621-pci/Kconfig<br/>index d33533872a16..af928b75a940 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config PCI_MT7621</div><div class='ctx'> 	tristate "MediaTek MT7621 PCI Controller"</div><div class='ctx'> 	depends on RALINK</div><div class='add'>+	depends on PCI</div><div class='ctx'> 	select PCI_DRIVERS_GENERIC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects a driver for the MediaTek MT7621 PCI Controller.</div><div class='head'>diff --git a/drivers/staging/mt7621-pci/Makefile b/drivers/staging/mt7621-pci/Makefile<br/>index d4655a726b61..f4e651cf7ce3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_PCI_MT7621)       += pci-mt7621.o</div><div class='head'>diff --git a/drivers/staging/mt7621-pci/pci-mt7621.c b/drivers/staging/mt7621-pci/pci-mt7621.c<br/>index 379ae780c691..03d919a94552 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci/pci-mt7621.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pci/pci-mt7621.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pci/pci-mt7621.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pci/pci-mt7621.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ static int mt7621_pci_parse_request_of_pci_ranges(struct mt7621_pcie *pcie)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (res != NULL)</div><div class='add'>+		if (res)</div><div class='ctx'> 			of_pci_range_to_resource(&amp;range, node, res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/mt7621-pinctrl/Kconfig b/drivers/staging/mt7621-pinctrl/Kconfig<br/>index fc3612711307..f42974026480 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pinctrl/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pinctrl/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pinctrl/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pinctrl/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config PINCTRL_RT2880</div><div class='ctx'> 	bool "RT2800 pinctrl driver for RALINK/Mediatek SOCs"</div><div class='ctx'> 	depends on RALINK</div><div class='head'>diff --git a/drivers/staging/mt7621-pinctrl/Makefile b/drivers/staging/mt7621-pinctrl/Makefile<br/>index 856102137a1e..49445f40c3cd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pinctrl/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-pinctrl/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-pinctrl/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/mt7621-pinctrl/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_PINCTRL_RT2880)   += pinctrl-rt2880.o</div><div class='ctx'> </div><div class='ctx'> ccflags-y += -I$(srctree)/drivers/pinctrl</div><div class='head'>diff --git a/drivers/staging/mt7621-spi/Kconfig b/drivers/staging/mt7621-spi/Kconfig<br/>deleted file mode 100644<br/>index 0b90f4cfa426..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-spi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-spi/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-config SPI_MT7621</div><div class='del'>-	tristate "MediaTek MT7621 SPI Controller"</div><div class='del'>-	depends on RALINK</div><div class='del'>-	help</div><div class='del'>-	  This selects a driver for the MediaTek MT7621 SPI Controller.</div><div class='del'>-</div><div class='head'>diff --git a/drivers/staging/mt7621-spi/Makefile b/drivers/staging/mt7621-spi/Makefile<br/>deleted file mode 100644<br/>index 3be508f63bac..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-spi/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-spi/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-$(CONFIG_SPI_MT7621)		+= spi-mt7621.o</div><div class='head'>diff --git a/drivers/staging/mt7621-spi/TODO b/drivers/staging/mt7621-spi/TODO<br/>deleted file mode 100644<br/>index fdbc5002c32a..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/mt7621-spi/TODO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/mt7621-spi/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-</div><div class='del'>-- general code review and clean up</div><div class='del'>-- ensure device-tree requirements are documented</div><div class='del'>-</div><div class='del'>-Cc: NeilBrown &lt;neil@brown.name&gt;</div><div class='head'>diff --git a/drivers/staging/netlogic/Kconfig b/drivers/staging/netlogic/Kconfig<br/>index c25a00dd2d5f..b2a4d4586697 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/netlogic/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/netlogic/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/netlogic/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/netlogic/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config NETLOGIC_XLR_NET</div><div class='ctx'> 	tristate "Netlogic XLR/XLS network device"</div><div class='ctx'> 	depends on CPU_XLR</div><div class='head'>diff --git a/drivers/staging/netlogic/Makefile b/drivers/staging/netlogic/Makefile<br/>index f7355e3e9c4c..7e2902af26a3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/netlogic/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/netlogic/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/netlogic/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/netlogic/Makefile</a></div><div class='hunk'>@@ -1 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_NETLOGIC_XLR_NET) += xlr_net.o platform_net.o</div><div class='head'>diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c<br/>index 8554fcf4321b..07a06c532dee 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/netlogic/xlr_net.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/netlogic/xlr_net.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/netlogic/xlr_net.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/netlogic/xlr_net.c</a></div><div class='hunk'>@@ -87,8 +87,7 @@ static inline unsigned char *xlr_alloc_skb(void)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	skb_data = skb-&gt;data;</div><div class='del'>-	skb_put(skb, MAC_SKB_BACK_PTR_SIZE);</div><div class='del'>-	skb_pull(skb, MAC_SKB_BACK_PTR_SIZE);</div><div class='add'>+	skb_reserve(skb, MAC_SKB_BACK_PTR_SIZE);</div><div class='ctx'> 	memcpy(skb_data, &amp;skb, buf_len);</div><div class='ctx'> </div><div class='ctx'> 	return skb-&gt;data;</div><div class='hunk'>@@ -185,10 +184,8 @@ static int xlr_net_fill_rx_ring(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_FRIN_SPILL / 4; i++) {</div><div class='ctx'> 		skb_data = xlr_alloc_skb();</div><div class='del'>-		if (!skb_data) {</div><div class='del'>-			netdev_err(ndev, "SKB allocation failed\n");</div><div class='add'>+		if (!skb_data)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 		send_to_rfr_fifo(priv, skb_data);</div><div class='ctx'> 	}</div><div class='ctx'> 	netdev_info(ndev, "Rx ring setup done\n");</div><div class='hunk'>@@ -389,10 +386,8 @@ static void *xlr_config_spill(struct xlr_net_priv *priv, int reg_start_0,</div><div class='ctx'> 	base = priv-&gt;base_addr;</div><div class='ctx'> 	spill_size = size;</div><div class='ctx'> 	spill = kmalloc(spill_size + SMP_CACHE_BYTES, GFP_ATOMIC);</div><div class='del'>-	if (!spill) {</div><div class='del'>-		pr_err("Unable to allocate memory for spill area!\n");</div><div class='add'>+	if (!spill)</div><div class='ctx'> 		return ZERO_SIZE_PTR;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spill = PTR_ALIGN(spill, SMP_CACHE_BYTES);</div><div class='ctx'> 	phys_addr = virt_to_phys(spill);</div><div class='head'>diff --git a/drivers/staging/nvec/Kconfig b/drivers/staging/nvec/Kconfig<br/>index e3a89fb1a4a2..5c12cacf75e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/nvec/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/nvec/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/nvec/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/nvec/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config MFD_NVEC</div><div class='ctx'> 	tristate "NV Tegra Embedded Controller SMBus Interface"</div><div class='ctx'> 	depends on I2C &amp;&amp; GPIOLIB &amp;&amp; ARCH_TEGRA</div><div class='head'>diff --git a/drivers/staging/octeon-usb/Kconfig b/drivers/staging/octeon-usb/Kconfig<br/>index 0b8f1d9c7056..6a5d842ee0f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon-usb/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon-usb/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon-usb/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon-usb/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config OCTEON_USB</div><div class='ctx'> 	tristate "Cavium Networks Octeon USB support"</div><div class='ctx'> 	depends on CAVIUM_OCTEON_SOC &amp;&amp; USB</div><div class='head'>diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c<br/>index 14982b6472a0..aeec16314e0d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon-usb/octeon-hcd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon-usb/octeon-hcd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon-usb/octeon-hcd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon-usb/octeon-hcd.c</a></div><div class='hunk'>@@ -2385,13 +2385,11 @@ static int cvmx_usb_close_pipe(struct octeon_hcd *usb,</div><div class='ctx'>  */</div><div class='ctx'> static int cvmx_usb_get_frame_number(struct octeon_hcd *usb)</div><div class='ctx'> {</div><div class='del'>-	int frame_number;</div><div class='ctx'> 	union cvmx_usbcx_hfnum usbc_hfnum;</div><div class='ctx'> </div><div class='ctx'> 	usbc_hfnum.u32 = cvmx_usb_read_csr32(usb, CVMX_USBCX_HFNUM(usb-&gt;index));</div><div class='del'>-	frame_number = usbc_hfnum.s.frnum;</div><div class='ctx'> </div><div class='del'>-	return frame_number;</div><div class='add'>+	return usbc_hfnum.s.frnum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cvmx_usb_transfer_control(struct octeon_hcd *usb,</div><div class='head'>diff --git a/drivers/staging/octeon-usb/octeon-hcd.h b/drivers/staging/octeon-usb/octeon-hcd.h<br/>index ae7ae50071ae..9ed619c93a4e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon-usb/octeon-hcd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon-usb/octeon-hcd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon-usb/octeon-hcd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon-usb/octeon-hcd.h</a></div><div class='hunk'>@@ -1711,7 +1711,7 @@ union cvmx_usbnx_usbp_ctl_status {</div><div class='ctx'> 	 *	Indicates an internal error was detected during</div><div class='ctx'> 	 *	the BIST sequence.</div><div class='ctx'> 	 * @tdata_out: PHY Test Data Out.</div><div class='del'>-	 *	Presents either internaly generated signals or</div><div class='add'>+	 *	Presents either internally generated signals or</div><div class='ctx'> 	 *	test register contents, based upon the value of</div><div class='ctx'> 	 *	test_data_out_sel.</div><div class='ctx'> 	 * @siddq: Drives the USBP (USB-PHY) SIDDQ input.</div><div class='hunk'>@@ -1737,7 +1737,7 @@ union cvmx_usbnx_usbp_ctl_status {</div><div class='ctx'> 	 *	to D+. When an A/B device is acting as a host</div><div class='ctx'> 	 *	(downstream-facing port), dp_pulldown and</div><div class='ctx'> 	 *	dm_pulldown are enabled. This must not toggle</div><div class='del'>-	 *	during normal opeartion.</div><div class='add'>+	 *	during normal operation.</div><div class='ctx'> 	 * @dm_pulld: PHY DM_PULLDOWN input to the USB-PHY.</div><div class='ctx'> 	 *	This signal enables the pull-down resistance on</div><div class='ctx'> 	 *	the D- line. '1' pull down-resistance is connected</div><div class='hunk'>@@ -1745,7 +1745,7 @@ union cvmx_usbnx_usbp_ctl_status {</div><div class='ctx'> 	 *	to D-. When an A/B device is acting as a host</div><div class='ctx'> 	 *	(downstream-facing port), dp_pulldown and</div><div class='ctx'> 	 *	dm_pulldown are enabled. This must not toggle</div><div class='del'>-	 *	during normal opeartion.</div><div class='add'>+	 *	during normal operation.</div><div class='ctx'> 	 * @hst_mode: When '0' the USB is acting as HOST, when '1'</div><div class='ctx'> 	 *	USB is acting as device. This field needs to be</div><div class='ctx'> 	 *	set while the USB is in reset.</div><div class='hunk'>@@ -1784,7 +1784,7 @@ union cvmx_usbnx_usbp_ctl_status {</div><div class='ctx'> 	 *	Used to activate BIST in the PHY.</div><div class='ctx'> 	 * @tdata_sel: Test Data Out Select.</div><div class='ctx'> 	 *	'1' test_data_out[3:0] (PHY) register contents</div><div class='del'>-	 *	are output. '0' internaly generated signals are</div><div class='add'>+	 *	are output. '0' internally generated signals are</div><div class='ctx'> 	 *	output.</div><div class='ctx'> 	 * @taddr_in: Mode Address for Test Interface.</div><div class='ctx'> 	 *	Specifies the register address for writing to or</div><div class='head'>diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig<br/>index 6e1d5f8d3ec1..1e3012b9991c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config OCTEON_ETHERNET</div><div class='ctx'> 	tristate "Cavium Networks Octeon Ethernet support"</div><div class='ctx'> 	depends on CAVIUM_OCTEON_SOC &amp;&amp; NETDEVICES</div><div class='head'>diff --git a/drivers/staging/octeon/TODO b/drivers/staging/octeon/TODO<br/>new file mode 100644<br/>index 000000000000..67a0a1f6b922<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/TODO?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon/TODO</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3</div><div class='add'>+chips at least up to CN7030.</div><div class='add'>+</div><div class='add'>+TODO:</div><div class='add'>+	- general code review and clean up</div><div class='add'>+	- make driver self-contained instead of being split between staging and</div><div class='add'>+	  arch/mips/cavium-octeon.</div><div class='add'>+</div><div class='add'>+Contact: Aaro Koskinen &lt;aaro.koskinen@iki.fi&gt;</div><div class='head'>diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c<br/>index d6248eecf123..2aee64fdaec5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/ethernet-mdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/ethernet-mdio.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/ethernet-mdio.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon/ethernet-mdio.c</a></div><div class='hunk'>@@ -163,7 +163,7 @@ int cvm_oct_phy_setup_device(struct net_device *dev)</div><div class='ctx'> 		goto no_phy;</div><div class='ctx'> </div><div class='ctx'> 	phydev = of_phy_connect(dev, phy_node, cvm_oct_adjust_link, 0,</div><div class='del'>-				PHY_INTERFACE_MODE_GMII);</div><div class='add'>+				priv-&gt;phy_mode);</div><div class='ctx'> 	of_node_put(phy_node);</div><div class='ctx'> </div><div class='ctx'> 	if (!phydev)</div><div class='head'>diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c<br/>index 317c9720467c..20f513fbaa85 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/ethernet-tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/ethernet-tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/ethernet-tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon/ethernet-tx.c</a></div><div class='hunk'>@@ -214,8 +214,10 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				 * Get the number of skbuffs in use</div><div class='ctx'> 				 * by the hardware</div><div class='ctx'> 				 */</div><div class='del'>-				skb_to_free = cvmx_fau_fetch_and_add32(</div><div class='del'>-					priv-&gt;fau + qos * 4, MAX_SKB_TO_FREE);</div><div class='add'>+				skb_to_free =</div><div class='add'>+				     cvmx_fau_fetch_and_add32(priv-&gt;fau +</div><div class='add'>+							      qos * 4,</div><div class='add'>+							      MAX_SKB_TO_FREE);</div><div class='ctx'> 			}</div><div class='ctx'> 			skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free,</div><div class='ctx'> 								 priv-&gt;fau +</div><div class='hunk'>@@ -280,9 +282,9 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 			struct skb_frag_struct *fs = skb_shinfo(skb)-&gt;frags + i;</div><div class='ctx'> </div><div class='del'>-			hw_buffer.s.addr = XKPHYS_TO_PHYS(</div><div class='del'>-				(u64)(page_address(fs-&gt;page.p) +</div><div class='del'>-				fs-&gt;page_offset));</div><div class='add'>+			hw_buffer.s.addr =</div><div class='add'>+				XKPHYS_TO_PHYS((u64)(page_address(fs-&gt;page.p) +</div><div class='add'>+					       fs-&gt;page_offset));</div><div class='ctx'> 			hw_buffer.s.size = fs-&gt;size;</div><div class='ctx'> 			CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -413,8 +415,8 @@ dont_put_skbuff_in_hw:</div><div class='ctx'> 		queue_type = QUEUE_HW;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (USE_ASYNC_IOBDMA)</div><div class='del'>-		cvmx_fau_async_fetch_and_add32(</div><div class='del'>-				CVMX_SCR_SCRATCH, FAU_TOTAL_TX_TO_CLEAN, 1);</div><div class='add'>+		cvmx_fau_async_fetch_and_add32(CVMX_SCR_SCRATCH,</div><div class='add'>+					       FAU_TOTAL_TX_TO_CLEAN, 1);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_free_list[qos].lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -491,8 +493,8 @@ skip_xmit:</div><div class='ctx'> 		cvmx_scratch_write64(CVMX_SCR_SCRATCH, old_scratch);</div><div class='ctx'> 		cvmx_scratch_write64(CVMX_SCR_SCRATCH + 8, old_scratch2);</div><div class='ctx'> 	} else {</div><div class='del'>-		total_to_clean = cvmx_fau_fetch_and_add32(</div><div class='del'>-						FAU_TOTAL_TX_TO_CLEAN, 1);</div><div class='add'>+		total_to_clean =</div><div class='add'>+			cvmx_fau_fetch_and_add32(FAU_TOTAL_TX_TO_CLEAN, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (total_to_clean &amp; 0x3ff) {</div><div class='head'>diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c<br/>index ce61c5670ef6..8847a11c212f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/ethernet.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/ethernet.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/ethernet.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon/ethernet.c</a></div><div class='hunk'>@@ -421,7 +421,7 @@ int cvm_oct_common_init(struct net_device *dev)</div><div class='ctx'> 	if (priv-&gt;of_node)</div><div class='ctx'> 		mac = of_get_mac_address(priv-&gt;of_node);</div><div class='ctx'> </div><div class='del'>-	if (mac)</div><div class='add'>+	if (!IS_ERR_OR_NULL(mac))</div><div class='ctx'> 		ether_addr_copy(dev-&gt;dev_addr, mac);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_hw_addr_random(dev);</div><div class='hunk'>@@ -653,14 +653,37 @@ static struct device_node *cvm_oct_node_for_port(struct device_node *pip,</div><div class='ctx'> 	return np;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cvm_set_rgmii_delay(struct device_node *np, int iface, int port)</div><div class='add'>+static void cvm_set_rgmii_delay(struct octeon_ethernet *priv, int iface,</div><div class='add'>+				int port)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *np = priv-&gt;of_node;</div><div class='ctx'> 	u32 delay_value;</div><div class='add'>+	bool rx_delay;</div><div class='add'>+	bool tx_delay;</div><div class='ctx'> </div><div class='del'>-	if (!of_property_read_u32(np, "rx-delay", &amp;delay_value))</div><div class='add'>+	/* By default, both RX/TX delay is enabled in</div><div class='add'>+	 * __cvmx_helper_rgmii_enable().</div><div class='add'>+	 */</div><div class='add'>+	rx_delay = true;</div><div class='add'>+	tx_delay = true;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(np, "rx-delay", &amp;delay_value)) {</div><div class='ctx'> 		cvmx_write_csr(CVMX_ASXX_RX_CLK_SETX(port, iface), delay_value);</div><div class='del'>-	if (!of_property_read_u32(np, "tx-delay", &amp;delay_value))</div><div class='add'>+		rx_delay = delay_value &gt; 0;</div><div class='add'>+	}</div><div class='add'>+	if (!of_property_read_u32(np, "tx-delay", &amp;delay_value)) {</div><div class='ctx'> 		cvmx_write_csr(CVMX_ASXX_TX_CLK_SETX(port, iface), delay_value);</div><div class='add'>+		tx_delay = delay_value &gt; 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rx_delay &amp;&amp; !tx_delay)</div><div class='add'>+		priv-&gt;phy_mode = PHY_INTERFACE_MODE_RGMII_ID;</div><div class='add'>+	else if (!rx_delay)</div><div class='add'>+		priv-&gt;phy_mode = PHY_INTERFACE_MODE_RGMII_RXID;</div><div class='add'>+	else if (!tx_delay)</div><div class='add'>+		priv-&gt;phy_mode = PHY_INTERFACE_MODE_RGMII_TXID;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;phy_mode = PHY_INTERFACE_MODE_RGMII;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cvm_oct_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -825,6 +848,7 @@ static int cvm_oct_probe(struct platform_device *pdev)</div><div class='ctx'> 			priv-&gt;port = port;</div><div class='ctx'> 			priv-&gt;queue = cvmx_pko_get_base_queue(priv-&gt;port);</div><div class='ctx'> 			priv-&gt;fau = fau - cvmx_pko_get_num_queues(port) * 4;</div><div class='add'>+			priv-&gt;phy_mode = PHY_INTERFACE_MODE_NA;</div><div class='ctx'> 			for (qos = 0; qos &lt; 16; qos++)</div><div class='ctx'> 				skb_queue_head_init(&amp;priv-&gt;tx_free_list[qos]);</div><div class='ctx'> 			for (qos = 0; qos &lt; cvmx_pko_get_num_queues(port);</div><div class='hunk'>@@ -856,6 +880,7 @@ static int cvm_oct_probe(struct platform_device *pdev)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			case CVMX_HELPER_INTERFACE_MODE_SGMII:</div><div class='add'>+				priv-&gt;phy_mode = PHY_INTERFACE_MODE_SGMII;</div><div class='ctx'> 				dev-&gt;netdev_ops = &amp;cvm_oct_sgmii_netdev_ops;</div><div class='ctx'> 				strcpy(dev-&gt;name, "eth%d");</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -865,11 +890,16 @@ static int cvm_oct_probe(struct platform_device *pdev)</div><div class='ctx'> 				strcpy(dev-&gt;name, "spi%d");</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			case CVMX_HELPER_INTERFACE_MODE_RGMII:</div><div class='ctx'> 			case CVMX_HELPER_INTERFACE_MODE_GMII:</div><div class='add'>+				priv-&gt;phy_mode = PHY_INTERFACE_MODE_GMII;</div><div class='add'>+				dev-&gt;netdev_ops = &amp;cvm_oct_rgmii_netdev_ops;</div><div class='add'>+				strcpy(dev-&gt;name, "eth%d");</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case CVMX_HELPER_INTERFACE_MODE_RGMII:</div><div class='ctx'> 				dev-&gt;netdev_ops = &amp;cvm_oct_rgmii_netdev_ops;</div><div class='ctx'> 				strcpy(dev-&gt;name, "eth%d");</div><div class='del'>-				cvm_set_rgmii_delay(priv-&gt;of_node, interface,</div><div class='add'>+				cvm_set_rgmii_delay(priv, interface,</div><div class='ctx'> 						    port_index);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h<br/>index 4a07e7f43d12..be570d33685a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/octeon-ethernet.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/octeon/octeon-ethernet.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/octeon/octeon-ethernet.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/octeon/octeon-ethernet.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define OCTEON_ETHERNET_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-helper-board.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -33,6 +33,8 @@ struct octeon_ethernet {</div><div class='ctx'> 	 * cvmx_helper_interface_mode_t</div><div class='ctx'> 	 */</div><div class='ctx'> 	int imode;</div><div class='add'>+	/* PHY mode */</div><div class='add'>+	phy_interface_t phy_mode;</div><div class='ctx'> 	/* List of outstanding tx buffers per queue */</div><div class='ctx'> 	struct sk_buff_head tx_free_list[16];</div><div class='ctx'> 	unsigned int last_speed;</div><div class='head'>diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig<br/>index 192cc8d0853f..255e266c40e1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/olpc_dcon/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config FB_OLPC_DCON</div><div class='ctx'> 	tristate "One Laptop Per Child Display CONtroller support"</div><div class='ctx'> 	depends on OLPC &amp;&amp; FB</div><div class='head'>diff --git a/drivers/staging/olpc_dcon/Makefile b/drivers/staging/olpc_dcon/Makefile<br/>index 36c7e67fec20..cb1248c5c162 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/olpc_dcon/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> olpc-dcon-objs += olpc_dcon.o</div><div class='ctx'> olpc-dcon-$(CONFIG_FB_OLPC_DCON_1)	+= olpc_dcon_xo_1.o</div><div class='ctx'> olpc-dcon-$(CONFIG_FB_OLPC_DCON_1_5)	+= olpc_dcon_xo_1_5.o</div><div class='head'>diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h<br/>index c987aaf894e7..22d976a09785 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/olpc_dcon.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/olpc_dcon.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/olpc_dcon.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/olpc_dcon/olpc_dcon.h</a></div><div class='hunk'>@@ -97,6 +97,11 @@ struct dcon_platform_data {</div><div class='ctx'> 	int (*read_status)(u8 *status);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dcon_gpio {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> irqreturn_t dcon_interrupt(int irq, void *id);</div><div class='head'>diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c<br/>index 80b8d4153414..02c059897784 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/olpc_dcon_xo_1.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/olpc_dcon/olpc_dcon_xo_1.c</a></div><div class='hunk'>@@ -26,11 +26,6 @@ enum dcon_gpios {</div><div class='ctx'> 	OLPC_DCON_BLANK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dcon_gpio {</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct dcon_gpio gpios_asis[] = {</div><div class='ctx'> 	[OLPC_DCON_STAT0] = { .name = "dcon_stat0", .flags = GPIOD_ASIS },</div><div class='ctx'> 	[OLPC_DCON_STAT1] = { .name = "dcon_stat1", .flags = GPIOD_ASIS },</div><div class='hunk'>@@ -39,13 +34,13 @@ static const struct dcon_gpio gpios_asis[] = {</div><div class='ctx'> 	[OLPC_DCON_BLANK] = { .name = "dcon_blank", .flags = GPIOD_ASIS },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct gpio_desc *gpios[5];</div><div class='add'>+static struct gpio_desc *gpios[5];</div><div class='ctx'> </div><div class='ctx'> static int dcon_init_xo_1(struct dcon_priv *dcon)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char lob;</div><div class='ctx'> 	int ret, i;</div><div class='del'>-	struct dcon_gpio *pin = &amp;gpios_asis[0];</div><div class='add'>+	const struct dcon_gpio *pin = &amp;gpios_asis[0];</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(gpios_asis); i++) {</div><div class='ctx'> 		gpios[i] = devm_gpiod_get(&amp;dcon-&gt;client-&gt;dev, pin[i].name,</div><div class='head'>diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c<br/>index 838daa2be3ef..52cdcd2a89d6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c</a></div><div class='hunk'>@@ -7,7 +7,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='ctx'> #include &lt;asm/olpc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* TODO: this eventually belongs in linux/vx855.h */</div><div class='hunk'>@@ -38,6 +40,33 @@</div><div class='ctx'> </div><div class='ctx'> #define PREFIX "OLPC DCON:"</div><div class='ctx'> </div><div class='add'>+enum dcon_gpios {</div><div class='add'>+	OLPC_DCON_STAT0,</div><div class='add'>+	OLPC_DCON_STAT1,</div><div class='add'>+	OLPC_DCON_LOAD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gpiod_lookup_table gpios_table = {</div><div class='add'>+	.dev_id = NULL,</div><div class='add'>+	.table = {</div><div class='add'>+		GPIO_LOOKUP("VX855 South Bridge", VX855_GPIO(1), "dcon_load",</div><div class='add'>+			    GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP("VX855 South Bridge", VX855_GPI(10), "dcon_stat0",</div><div class='add'>+			    GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP("VX855 South Bridge", VX855_GPI(11), "dcon_stat1",</div><div class='add'>+			    GPIO_ACTIVE_LOW),</div><div class='add'>+		{ },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dcon_gpio gpios_asis[] = {</div><div class='add'>+	[OLPC_DCON_STAT0] = { .name = "dcon_stat0", .flags = GPIOD_ASIS },</div><div class='add'>+	[OLPC_DCON_STAT1] = { .name = "dcon_stat1", .flags = GPIOD_ASIS },</div><div class='add'>+	[OLPC_DCON_LOAD] = { .name = "dcon_load", .flags = GPIOD_ASIS },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_desc *gpios[3];</div><div class='add'>+</div><div class='ctx'> static void dcon_clear_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* irq status will appear in PMIO_Rx50[6] (RW1C) on gpio12 */</div><div class='hunk'>@@ -57,6 +86,25 @@ static int dcon_was_irq(void)</div><div class='ctx'> static int dcon_init_xo_1_5(struct dcon_priv *dcon)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq;</div><div class='add'>+	const struct dcon_gpio *pin = &amp;gpios_asis[0];</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Add GPIO look up table */</div><div class='add'>+	gpios_table.dev_id = dev_name(&amp;dcon-&gt;client-&gt;dev);</div><div class='add'>+	gpiod_add_lookup_table(&amp;gpios_table);</div><div class='add'>+</div><div class='add'>+	/* Get GPIO descriptor */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gpios_asis); i++) {</div><div class='add'>+		gpios[i] = devm_gpiod_get(&amp;dcon-&gt;client-&gt;dev, pin[i].name,</div><div class='add'>+					  pin[i].flags);</div><div class='add'>+		if (IS_ERR(gpios[i])) {</div><div class='add'>+			ret = PTR_ERR(gpios[i]);</div><div class='add'>+			pr_err("failed to request %s GPIO: %d\n", pin[i].name,</div><div class='add'>+			       ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dcon_clear_irq();</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +179,7 @@ static void dcon_wiggle_xo_1_5(void)</div><div class='ctx'> </div><div class='ctx'> static void dcon_set_dconload_xo_1_5(int val)</div><div class='ctx'> {</div><div class='del'>-	gpio_set_value(VX855_GPIO(1), val);</div><div class='add'>+	gpiod_set_value(gpios[OLPC_DCON_LOAD], val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dcon_read_status_xo_1_5(u8 *status)</div><div class='hunk'>@@ -140,8 +188,8 @@ static int dcon_read_status_xo_1_5(u8 *status)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* i believe this is the same as "inb(0x44b) &amp; 3" */</div><div class='del'>-	*status = gpio_get_value(VX855_GPI(10));</div><div class='del'>-	*status |= gpio_get_value(VX855_GPI(11)) &lt;&lt; 1;</div><div class='add'>+	*status = gpiod_get_value(gpios[OLPC_DCON_STAT0]);</div><div class='add'>+	*status |= gpiod_get_value(gpios[OLPC_DCON_STAT1]) &lt;&lt; 1;</div><div class='ctx'> </div><div class='ctx'> 	dcon_clear_irq();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/pi433/Kconfig b/drivers/staging/pi433/Kconfig<br/>index c7340129dd4c..8acde0814206 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/pi433/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config PI433</div><div class='ctx'>         tristate "Pi433 - a 433MHz radio module for Raspberry Pi"</div><div class='ctx'>         depends on SPI</div><div class='head'>diff --git a/drivers/staging/pi433/Makefile b/drivers/staging/pi433/Makefile<br/>index 417f3e4d12b1..051132fe4dae 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/pi433/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_PI433) += pi433.o</div><div class='ctx'> </div><div class='ctx'> pi433-objs := pi433_if.o rf69.o</div><div class='head'>diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c<br/>index b2314636dc89..c889f0bdf424 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/pi433_if.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/pi433_if.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/pi433_if.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/pi433/pi433_if.c</a></div><div class='hunk'>@@ -45,10 +45,10 @@</div><div class='ctx'> #include "pi433_if.h"</div><div class='ctx'> #include "rf69.h"</div><div class='ctx'> </div><div class='del'>-#define N_PI433_MINORS			BIT(MINORBITS) /*32*/	/* ... up to 256 */</div><div class='del'>-#define MAX_MSG_SIZE			900	/* min: FIFO_SIZE! */</div><div class='del'>-#define MSG_FIFO_SIZE			65536   /* 65536 = 2^16  */</div><div class='del'>-#define NUM_DIO				2</div><div class='add'>+#define N_PI433_MINORS		BIT(MINORBITS) /*32*/	/* ... up to 256 */</div><div class='add'>+#define MAX_MSG_SIZE		900	/* min: FIFO_SIZE! */</div><div class='add'>+#define MSG_FIFO_SIZE		65536   /* 65536 = 2^16  */</div><div class='add'>+#define NUM_DIO			2</div><div class='ctx'> </div><div class='ctx'> static dev_t pi433_dev;</div><div class='ctx'> static DEFINE_IDR(pi433_idr);</div><div class='hunk'>@@ -319,6 +319,12 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tx_cfg-&gt;enable_sync == OPTION_ON) {</div><div class='add'>+		ret = rf69_set_sync_size(dev-&gt;spi, tx_cfg-&gt;sync_length);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = rf69_set_sync_values(dev-&gt;spi, tx_cfg-&gt;sync_pattern);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = rf69_enable_sync(dev-&gt;spi);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -348,16 +354,6 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* configure sync, if enabled */</div><div class='del'>-	if (tx_cfg-&gt;enable_sync == OPTION_ON) {</div><div class='del'>-		ret = rf69_set_sync_size(dev-&gt;spi, tx_cfg-&gt;sync_length);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		ret = rf69_set_sync_values(dev-&gt;spi, tx_cfg-&gt;sync_pattern);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -650,21 +646,19 @@ pi433_tx_thread(void *data)</div><div class='ctx'> 		disable_irq(device-&gt;irq_num[DIO0]);</div><div class='ctx'> 		device-&gt;tx_active = true;</div><div class='ctx'> </div><div class='add'>+		/* clear fifo, set fifo threshold, set payload length */</div><div class='add'>+		retval = rf69_set_mode(spi, standby); /* this clears the fifo */</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+</div><div class='ctx'> 		if (device-&gt;rx_active &amp;&amp; !rx_interrupted) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * rx is currently waiting for a telegram;</div><div class='ctx'> 			 * we need to set the radio module to standby</div><div class='ctx'> 			 */</div><div class='del'>-			retval = rf69_set_mode(device-&gt;spi, standby);</div><div class='del'>-			if (retval &lt; 0)</div><div class='del'>-				return retval;</div><div class='ctx'> 			rx_interrupted = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* clear fifo, set fifo threshold, set payload length */</div><div class='del'>-		retval = rf69_set_mode(spi, standby); /* this clears the fifo */</div><div class='del'>-		if (retval &lt; 0)</div><div class='del'>-			return retval;</div><div class='ctx'> 		retval = rf69_set_fifo_threshold(spi, FIFO_THRESHOLD);</div><div class='ctx'> 		if (retval &lt; 0)</div><div class='ctx'> 			return retval;</div><div class='hunk'>@@ -742,7 +736,7 @@ pi433_tx_thread(void *data)</div><div class='ctx'> 					 device-&gt;free_in_fifo == FIFO_SIZE ||</div><div class='ctx'> 					 kthread_should_stop());</div><div class='ctx'> 		if (kthread_should_stop())</div><div class='del'>-			dev_dbg(device-&gt;dev, "ABORT\n");</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		/* STOP_TRANSMISSION */</div><div class='ctx'> 		dev_dbg(device-&gt;dev, "thread: Packet sent. Set mode to stby.");</div><div class='hunk'>@@ -971,7 +965,7 @@ static int pi433_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	/* instance data as context */</div><div class='ctx'> 	filp-&gt;private_data = instance;</div><div class='del'>-	nonseekable_open(inode, filp);</div><div class='add'>+	stream_open(inode, filp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c<br/>index e19b9ce794a8..4cd16257f0aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/rf69.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/pi433/rf69.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/pi433/rf69.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/pi433/rf69.c</a></div><div class='hunk'>@@ -349,18 +349,51 @@ int rf69_disable_amplifier(struct spi_device *spi, u8 amplifier_mask)</div><div class='ctx'> </div><div class='ctx'> int rf69_set_output_power_level(struct spi_device *spi, u8 power_level)</div><div class='ctx'> {</div><div class='del'>-	// TODO: Dependency to PA0,1,2 setting</div><div class='del'>-	power_level += 18;</div><div class='add'>+	u8 pa_level, ocp, test_pa1, test_pa2;</div><div class='add'>+	bool pa0, pa1, pa2, high_power;</div><div class='add'>+	u8 min_power_level;</div><div class='add'>+</div><div class='add'>+	// check register pa_level</div><div class='add'>+	pa_level = rf69_read_reg(spi, REG_PALEVEL);</div><div class='add'>+	pa0 = pa_level &amp; MASK_PALEVEL_PA0;</div><div class='add'>+	pa1 = pa_level &amp; MASK_PALEVEL_PA1;</div><div class='add'>+	pa2 = pa_level &amp; MASK_PALEVEL_PA2;</div><div class='add'>+</div><div class='add'>+	// check high power mode</div><div class='add'>+	ocp = rf69_read_reg(spi, REG_OCP);</div><div class='add'>+	test_pa1 = rf69_read_reg(spi, REG_TESTPA1);</div><div class='add'>+	test_pa2 = rf69_read_reg(spi, REG_TESTPA2);</div><div class='add'>+	high_power = (ocp == 0x0f) &amp;&amp; (test_pa1 == 0x5d) &amp;&amp; (test_pa2 == 0x7c);</div><div class='add'>+</div><div class='add'>+	if (pa0 &amp;&amp; !pa1 &amp;&amp; !pa2) {</div><div class='add'>+		power_level += 18;</div><div class='add'>+		min_power_level = 0;</div><div class='add'>+	} else if (!pa0 &amp;&amp; pa1 &amp;&amp; !pa2) {</div><div class='add'>+		power_level += 18;</div><div class='add'>+		min_power_level = 16;</div><div class='add'>+	} else if (!pa0 &amp;&amp; pa1 &amp;&amp; pa2) {</div><div class='add'>+		if (high_power)</div><div class='add'>+			power_level += 11;</div><div class='add'>+		else</div><div class='add'>+			power_level += 14;</div><div class='add'>+		min_power_level = 16;</div><div class='add'>+	} else {</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	// check input value</div><div class='del'>-	if (power_level &gt; 0x1f) {</div><div class='del'>-		dev_dbg(&amp;spi-&gt;dev, "set: illegal input param");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (power_level &gt; 0x1f)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	if (power_level &lt; min_power_level)</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	// write value</div><div class='ctx'> 	return rf69_read_mod_write(spi, REG_PALEVEL, MASK_PALEVEL_OUTPUT_POWER,</div><div class='ctx'> 				   power_level);</div><div class='add'>+failed:</div><div class='add'>+	dev_dbg(&amp;spi-&gt;dev, "set: illegal input param");</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rf69_set_pa_ramp(struct spi_device *spi, enum pa_ramp pa_ramp)</div><div class='hunk'>@@ -624,9 +657,7 @@ int rf69_set_preamble_length(struct spi_device *spi, u16 preamble_length)</div><div class='ctx'> 	retval = rf69_write_reg(spi, REG_PREAMBLE_MSB, msb);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='del'>-	retval = rf69_write_reg(spi, REG_PREAMBLE_LSB, lsb);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='add'>+	return rf69_write_reg(spi, REG_PREAMBLE_LSB, lsb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rf69_enable_sync(struct spi_device *spi)</div><div class='head'>diff --git a/drivers/staging/ralink-gdma/Kconfig b/drivers/staging/ralink-gdma/Kconfig<br/>index a12b2c672d48..54e8029e6b1a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ralink-gdma/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ralink-gdma/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ralink-gdma/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/ralink-gdma/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config DMA_RALINK</div><div class='ctx'> 	tristate "RALINK DMA support"</div><div class='ctx'> 	depends on RALINK &amp;&amp; !SOC_RT288X</div><div class='head'>diff --git a/drivers/staging/ralink-gdma/Makefile b/drivers/staging/ralink-gdma/Makefile<br/>index 5d917e0729bb..5c4566b2e405 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ralink-gdma/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ralink-gdma/Makefile</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ralink-gdma/Makefile?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/ralink-gdma/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o</div><div class='ctx'> </div><div class='ctx'> ccflags-y += -I$(srctree)/drivers/dma</div><div class='head'>diff --git a/drivers/staging/ralink-gdma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c<br/>index d78042eba6dd..de3e357b2640 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ralink-gdma/ralink-gdma.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/ralink-gdma/ralink-gdma.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/ralink-gdma/ralink-gdma.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/ralink-gdma/ralink-gdma.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (C) 2013, Lars-Peter Clausen &lt;lars@metafoo.de&gt;</div><div class='ctx'>  *  GDMA4740 DMAC support</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='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='hunk'>@@ -164,17 +159,11 @@ static inline uint32_t gdma_dma_read(struct gdma_dma_dev *dma_dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gdma_dma_write(struct gdma_dma_dev *dma_dev,</div><div class='del'>-				  unsigned reg, uint32_t val)</div><div class='add'>+				  unsigned int reg, uint32_t val)</div><div class='ctx'> {</div><div class='ctx'> 	writel(val, dma_dev-&gt;base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct gdma_dma_desc *gdma_dma_alloc_desc(unsigned int num_sgs)</div><div class='del'>-{</div><div class='del'>-	return kzalloc(sizeof(struct gdma_dma_desc) +</div><div class='del'>-		sizeof(struct gdma_dma_sg) * num_sgs, GFP_ATOMIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static enum gdma_dma_transfer_size gdma_dma_maxburst(u32 maxburst)</div><div class='ctx'> {</div><div class='ctx'> 	if (maxburst &lt; 2)</div><div class='hunk'>@@ -268,14 +257,14 @@ static int gdma_dma_terminate_all(struct dma_chan *c)</div><div class='ctx'> </div><div class='ctx'> static void rt305x_dump_reg(struct gdma_dma_dev *dma_dev, int id)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(dma_dev-&gt;ddev.dev, "chan %d, src %08x, dst %08x, ctr0 %08x, " \</div><div class='del'>-			"ctr1 %08x, intr %08x, signal %08x\n", id,</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_SRC_ADDR(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_DST_ADDR(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_CTRL0(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_CTRL1(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_RT305X_STATUS_INT),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_RT305X_STATUS_SIGNAL));</div><div class='add'>+	dev_dbg(dma_dev-&gt;ddev.dev, "chan %d, src %08x, dst %08x, ctr0 %08x, ctr1 %08x, intr %08x, signal %08x\n",</div><div class='add'>+		id,</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_SRC_ADDR(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_DST_ADDR(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_CTRL0(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_CTRL1(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_RT305X_STATUS_INT),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_RT305X_STATUS_SIGNAL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='hunk'>@@ -283,7 +272,7 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 	struct gdma_dma_dev *dma_dev = gdma_dma_chan_get_dev(chan);</div><div class='ctx'> 	dma_addr_t src_addr, dst_addr;</div><div class='ctx'> 	struct gdma_dma_sg *sg;</div><div class='del'>-	uint32_t ctrl0, ctrl1;</div><div class='add'>+	u32 ctrl0, ctrl1;</div><div class='ctx'> </div><div class='ctx'> 	/* verify chan is already stopped */</div><div class='ctx'> 	ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan-&gt;id));</div><div class='hunk'>@@ -298,14 +287,14 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 	if (chan-&gt;desc-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		src_addr = sg-&gt;src_addr;</div><div class='ctx'> 		dst_addr = chan-&gt;fifo_addr;</div><div class='del'>-		ctrl0 = GDMA_REG_CTRL0_DST_ADDR_FIXED | \</div><div class='del'>-			(8 &lt;&lt; GDMA_RT305X_CTRL0_SRC_REQ_SHIFT) | \</div><div class='add'>+		ctrl0 = GDMA_REG_CTRL0_DST_ADDR_FIXED |</div><div class='add'>+			(8 &lt;&lt; GDMA_RT305X_CTRL0_SRC_REQ_SHIFT) |</div><div class='ctx'> 			(chan-&gt;slave_id &lt;&lt; GDMA_RT305X_CTRL0_DST_REQ_SHIFT);</div><div class='ctx'> 	} else if (chan-&gt;desc-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		src_addr = chan-&gt;fifo_addr;</div><div class='ctx'> 		dst_addr = sg-&gt;dst_addr;</div><div class='del'>-		ctrl0 = GDMA_REG_CTRL0_SRC_ADDR_FIXED | \</div><div class='del'>-			(chan-&gt;slave_id &lt;&lt; GDMA_RT305X_CTRL0_SRC_REQ_SHIFT) | \</div><div class='add'>+		ctrl0 = GDMA_REG_CTRL0_SRC_ADDR_FIXED |</div><div class='add'>+			(chan-&gt;slave_id &lt;&lt; GDMA_RT305X_CTRL0_SRC_REQ_SHIFT) |</div><div class='ctx'> 			(8 &lt;&lt; GDMA_RT305X_CTRL0_DST_REQ_SHIFT);</div><div class='ctx'> 	} else if (chan-&gt;desc-&gt;direction == DMA_MEM_TO_MEM) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -314,8 +303,8 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 		 */</div><div class='ctx'> 		src_addr = sg-&gt;src_addr;</div><div class='ctx'> 		dst_addr = sg-&gt;dst_addr;</div><div class='del'>-		ctrl0 = GDMA_REG_CTRL0_SW_MODE | \</div><div class='del'>-			(8 &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) | \</div><div class='add'>+		ctrl0 = GDMA_REG_CTRL0_SW_MODE |</div><div class='add'>+			(8 &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) |</div><div class='ctx'> 			(8 &lt;&lt; GDMA_REG_CTRL1_DST_REQ_SHIFT);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_err(dma_dev-&gt;ddev.dev, "direction type %d error\n",</div><div class='hunk'>@@ -323,8 +312,8 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctrl0 |= (sg-&gt;len &lt;&lt; GDMA_REG_CTRL0_TX_SHIFT) | \</div><div class='del'>-		 (chan-&gt;burst_size &lt;&lt; GDMA_REG_CTRL0_BURST_SHIFT) | \</div><div class='add'>+	ctrl0 |= (sg-&gt;len &lt;&lt; GDMA_REG_CTRL0_TX_SHIFT) |</div><div class='add'>+		 (chan-&gt;burst_size &lt;&lt; GDMA_REG_CTRL0_BURST_SHIFT) |</div><div class='ctx'> 		 GDMA_REG_CTRL0_DONE_INT | GDMA_REG_CTRL0_ENABLE;</div><div class='ctx'> 	ctrl1 = chan-&gt;id &lt;&lt; GDMA_REG_CTRL1_NEXT_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -342,18 +331,17 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static void rt3883_dump_reg(struct gdma_dma_dev *dma_dev, int id)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(dma_dev-&gt;ddev.dev, "chan %d, src %08x, dst %08x, ctr0 %08x, " \</div><div class='del'>-			"ctr1 %08x, unmask %08x, done %08x, " \</div><div class='del'>-			"req %08x, ack %08x, fin %08x\n", id,</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_SRC_ADDR(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_DST_ADDR(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_CTRL0(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_CTRL1(id)),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_UNMASK_INT),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_DONE_INT),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_REQSTS),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_ACKSTS),</div><div class='del'>-			gdma_dma_read(dma_dev, GDMA_REG_FINSTS));</div><div class='add'>+	dev_dbg(dma_dev-&gt;ddev.dev, "chan %d, src %08x, dst %08x, ctr0 %08x, ctr1 %08x, unmask %08x, done %08x, req %08x, ack %08x, fin %08x\n",</div><div class='add'>+		id,</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_SRC_ADDR(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_DST_ADDR(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_CTRL0(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_CTRL1(id)),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_UNMASK_INT),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_DONE_INT),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_REQSTS),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_ACKSTS),</div><div class='add'>+		gdma_dma_read(dma_dev, GDMA_REG_FINSTS));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='hunk'>@@ -361,7 +349,7 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 	struct gdma_dma_dev *dma_dev = gdma_dma_chan_get_dev(chan);</div><div class='ctx'> 	dma_addr_t src_addr, dst_addr;</div><div class='ctx'> 	struct gdma_dma_sg *sg;</div><div class='del'>-	uint32_t ctrl0, ctrl1;</div><div class='add'>+	u32 ctrl0, ctrl1;</div><div class='ctx'> </div><div class='ctx'> 	/* verify chan is already stopped */</div><div class='ctx'> 	ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan-&gt;id));</div><div class='hunk'>@@ -377,21 +365,21 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 		src_addr = sg-&gt;src_addr;</div><div class='ctx'> 		dst_addr = chan-&gt;fifo_addr;</div><div class='ctx'> 		ctrl0 = GDMA_REG_CTRL0_DST_ADDR_FIXED;</div><div class='del'>-		ctrl1 = (32 &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) | \</div><div class='add'>+		ctrl1 = (32 &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) |</div><div class='ctx'> 			(chan-&gt;slave_id &lt;&lt; GDMA_REG_CTRL1_DST_REQ_SHIFT);</div><div class='ctx'> 	} else if (chan-&gt;desc-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		src_addr = chan-&gt;fifo_addr;</div><div class='ctx'> 		dst_addr = sg-&gt;dst_addr;</div><div class='ctx'> 		ctrl0 = GDMA_REG_CTRL0_SRC_ADDR_FIXED;</div><div class='del'>-		ctrl1 = (chan-&gt;slave_id &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) | \</div><div class='del'>-			(32 &lt;&lt; GDMA_REG_CTRL1_DST_REQ_SHIFT) | \</div><div class='add'>+		ctrl1 = (chan-&gt;slave_id &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) |</div><div class='add'>+			(32 &lt;&lt; GDMA_REG_CTRL1_DST_REQ_SHIFT) |</div><div class='ctx'> 			GDMA_REG_CTRL1_COHERENT;</div><div class='ctx'> 	} else if (chan-&gt;desc-&gt;direction == DMA_MEM_TO_MEM) {</div><div class='ctx'> 		src_addr = sg-&gt;src_addr;</div><div class='ctx'> 		dst_addr = sg-&gt;dst_addr;</div><div class='ctx'> 		ctrl0 = GDMA_REG_CTRL0_SW_MODE;</div><div class='del'>-		ctrl1 = (32 &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) | \</div><div class='del'>-			(32 &lt;&lt; GDMA_REG_CTRL1_DST_REQ_SHIFT) | \</div><div class='add'>+		ctrl1 = (32 &lt;&lt; GDMA_REG_CTRL1_SRC_REQ_SHIFT) |</div><div class='add'>+			(32 &lt;&lt; GDMA_REG_CTRL1_DST_REQ_SHIFT) |</div><div class='ctx'> 			GDMA_REG_CTRL1_COHERENT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_err(dma_dev-&gt;ddev.dev, "direction type %d error\n",</div><div class='hunk'>@@ -399,8 +387,8 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctrl0 |= (sg-&gt;len &lt;&lt; GDMA_REG_CTRL0_TX_SHIFT) | \</div><div class='del'>-		 (chan-&gt;burst_size &lt;&lt; GDMA_REG_CTRL0_BURST_SHIFT) | \</div><div class='add'>+	ctrl0 |= (sg-&gt;len &lt;&lt; GDMA_REG_CTRL0_TX_SHIFT) |</div><div class='add'>+		 (chan-&gt;burst_size &lt;&lt; GDMA_REG_CTRL0_BURST_SHIFT) |</div><div class='ctx'> 		 GDMA_REG_CTRL0_DONE_INT | GDMA_REG_CTRL0_ENABLE;</div><div class='ctx'> 	ctrl1 |= chan-&gt;id &lt;&lt; GDMA_REG_CTRL1_NEXT_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -532,7 +520,7 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_slave_sg(</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	desc = gdma_dma_alloc_desc(sg_len);</div><div class='add'>+	desc = kzalloc(struct_size(desc, sg, sg_len), GFP_ATOMIC);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		dev_err(c-&gt;device-&gt;dev, "alloc sg decs error\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -587,7 +575,7 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_dma_memcpy(</div><div class='ctx'> 	xfer_count = GDMA_REG_CTRL0_TX_MASK;</div><div class='ctx'> 	num_periods = DIV_ROUND_UP(len, xfer_count);</div><div class='ctx'> </div><div class='del'>-	desc = gdma_dma_alloc_desc(num_periods);</div><div class='add'>+	desc = kzalloc(struct_size(desc, sg, num_periods), GFP_ATOMIC);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		dev_err(c-&gt;device-&gt;dev, "alloc memcpy decs error\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -632,7 +620,7 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_dma_cyclic(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	num_periods = buf_len / period_len;</div><div class='del'>-	desc = gdma_dma_alloc_desc(num_periods);</div><div class='add'>+	desc = kzalloc(struct_size(desc, sg, num_periods), GFP_ATOMIC);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		dev_err(c-&gt;device-&gt;dev, "alloc cyclic decs error\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -741,7 +729,9 @@ static void gdma_dma_tasklet(unsigned long arg)</div><div class='ctx'> 				atomic_inc(&amp;dma_dev-&gt;cnt);</div><div class='ctx'> 				gdma_start_transfer(dma_dev, chan);</div><div class='ctx'> 			} else {</div><div class='del'>-				dev_dbg(dma_dev-&gt;ddev.dev, "chan %d no desc to issue\n", chan-&gt;id);</div><div class='add'>+				dev_dbg(dma_dev-&gt;ddev.dev,</div><div class='add'>+					"chan %d no desc to issue\n",</div><div class='add'>+					chan-&gt;id);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!dma_dev-&gt;chan_issued)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -753,7 +743,7 @@ static void gdma_dma_tasklet(unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> static void rt305x_gdma_init(struct gdma_dma_dev *dma_dev)</div><div class='ctx'> {</div><div class='del'>-	uint32_t gct;</div><div class='add'>+	u32 gct;</div><div class='ctx'> </div><div class='ctx'> 	/* all chans round robin */</div><div class='ctx'> 	gdma_dma_write(dma_dev, GDMA_RT305X_GCT, GDMA_REG_GCT_ARBIT_RR);</div><div class='hunk'>@@ -767,7 +757,7 @@ static void rt305x_gdma_init(struct gdma_dma_dev *dma_dev)</div><div class='ctx'> </div><div class='ctx'> static void rt3883_gdma_init(struct gdma_dma_dev *dma_dev)</div><div class='ctx'> {</div><div class='del'>-	uint32_t gct;</div><div class='add'>+	u32 gct;</div><div class='ctx'> </div><div class='ctx'> 	/* all chans round robin */</div><div class='ctx'> 	gdma_dma_write(dma_dev, GDMA_REG_GCT, GDMA_REG_GCT_ARBIT_RR);</div><div class='hunk'>@@ -819,13 +809,12 @@ static int gdma_dma_probe(struct platform_device *pdev)</div><div class='ctx'> 	match = of_match_device(gdma_of_match_table, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!match)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	data = (struct gdma_data *) match-&gt;data;</div><div class='add'>+	data = (struct gdma_data *)match-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	dma_dev = devm_kzalloc(&amp;pdev-&gt;dev,</div><div class='ctx'> 			       struct_size(dma_dev, chan, data-&gt;chancnt),</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	if (!dma_dev) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "alloc dma device failed\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dma_dev-&gt;data = data;</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/Kconfig b/drivers/staging/rtl8188eu/Kconfig<br/>index ff7832798a77..4f7ef287a0f2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config R8188EU</div><div class='ctx'> 	tristate "Realtek RTL8188EU Wireless LAN NIC driver"</div><div class='ctx'> 	depends on WLAN &amp;&amp; USB &amp;&amp; CFG80211</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c<br/>index 94c9d9f8ee5c..51a5b71f8c25 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_ap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_ap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_ap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_ap.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ static void update_BCNTIM(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	/* update TIM IE */</div><div class='ctx'> 	p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &amp;tim_ielen,</div><div class='del'>-			pnetwork_mlmeext-&gt;ie_length - _FIXED_IE_LENGTH_);</div><div class='add'>+		       pnetwork_mlmeext-&gt;ie_length - _FIXED_IE_LENGTH_);</div><div class='ctx'> 	if (p &amp;&amp; tim_ielen &gt; 0) {</div><div class='ctx'> 		tim_ielen += 2;</div><div class='ctx'> 		premainder_ie = p + tim_ielen;</div><div class='hunk'>@@ -89,7 +89,7 @@ static void update_BCNTIM(struct adapter *padapter)</div><div class='ctx'> 			       &amp;tmp_len, (pnetwork_mlmeext-&gt;ie_length -</div><div class='ctx'> 					  _BEACON_IE_OFFSET_));</div><div class='ctx'> 		if (p)</div><div class='del'>-			offset += tmp_len+2;</div><div class='add'>+			offset += tmp_len + 2;</div><div class='ctx'> </div><div class='ctx'> 		/* DS Parameter Set IE, len = 3 */</div><div class='ctx'> 		offset += 3;</div><div class='hunk'>@@ -162,7 +162,7 @@ static u8 chk_sta_is_alive(struct sta_info *psta)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void	expire_timeout_chk(struct adapter *padapter)</div><div class='add'>+void expire_timeout_chk(struct adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *phead, *plist;</div><div class='ctx'> 	u8 updated = 0;</div><div class='hunk'>@@ -368,7 +368,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)</div><div class='ctx'> 	else</div><div class='ctx'> 		sta_band |= WIRELESS_11B;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	psta-&gt;wireless_mode = sta_band;</div><div class='ctx'> </div><div class='ctx'> 	raid = networktype_to_raid(sta_band);</div><div class='hunk'>@@ -923,7 +922,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)</div><div class='ctx'> </div><div class='ctx'> 		pht_cap-&gt;mcs.rx_mask[0] = 0xff;</div><div class='ctx'> 		pht_cap-&gt;mcs.rx_mask[1] = 0x0;</div><div class='del'>-		memcpy(&amp;pmlmepriv-&gt;htpriv.ht_cap, p+2, ie_len);</div><div class='add'>+		memcpy(&amp;pmlmepriv-&gt;htpriv.ht_cap, p + 2, ie_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* parsing HT_INFO_IE */</div><div class='hunk'>@@ -1123,9 +1122,11 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)</div><div class='ctx'> 		struct ndis_802_11_var_ie *pIE = (struct ndis_802_11_var_ie *)p;</div><div class='ctx'> </div><div class='ctx'> 		if (pmlmepriv-&gt;num_sta_non_erp == 1)</div><div class='del'>-			pIE-&gt;data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION;</div><div class='add'>+			pIE-&gt;data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT |</div><div class='add'>+					RTW_ERP_INFO_USE_PROTECTION;</div><div class='ctx'> 		else</div><div class='del'>-			pIE-&gt;data[0] &amp;= ~(RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION);</div><div class='add'>+			pIE-&gt;data[0] &amp;= ~(RTW_ERP_INFO_NON_ERP_PRESENT |</div><div class='add'>+					  RTW_ERP_INFO_USE_PROTECTION);</div><div class='ctx'> </div><div class='ctx'> 		if (pmlmepriv-&gt;num_sta_no_short_preamble &gt; 0)</div><div class='ctx'> 			pIE-&gt;data[0] |= RTW_ERP_INFO_BARKER_PREAMBLE_MODE;</div><div class='hunk'>@@ -1154,12 +1155,13 @@ static void update_bcn_wps_ie(struct adapter *padapter)</div><div class='ctx'> 	if (!pwps_ie_src)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &amp;wps_ielen);</div><div class='add'>+	pwps_ie = rtw_get_wps_ie(ie + _FIXED_IE_LENGTH_,</div><div class='add'>+				 ielen - _FIXED_IE_LENGTH_, NULL, &amp;wps_ielen);</div><div class='ctx'> </div><div class='ctx'> 	if (!pwps_ie || wps_ielen == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	wps_offset = (uint)(pwps_ie-ie);</div><div class='add'>+	wps_offset = (uint)(pwps_ie - ie);</div><div class='ctx'> </div><div class='ctx'> 	premainder_ie = pwps_ie + wps_ielen;</div><div class='ctx'> </div><div class='hunk'>@@ -1172,15 +1174,15 @@ static void update_bcn_wps_ie(struct adapter *padapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wps_ielen = (uint)pwps_ie_src[1];/* to get ie data len */</div><div class='del'>-	if ((wps_offset+wps_ielen+2+remainder_ielen) &lt;= MAX_IE_SZ) {</div><div class='del'>-		memcpy(pwps_ie, pwps_ie_src, wps_ielen+2);</div><div class='del'>-		pwps_ie += (wps_ielen+2);</div><div class='add'>+	if (wps_offset + wps_ielen + 2 + remainder_ielen &lt;= MAX_IE_SZ) {</div><div class='add'>+		memcpy(pwps_ie, pwps_ie_src, wps_ielen + 2);</div><div class='add'>+		pwps_ie += wps_ielen + 2;</div><div class='ctx'> </div><div class='ctx'> 		if (pbackup_remainder_ie)</div><div class='ctx'> 			memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);</div><div class='ctx'> </div><div class='ctx'> 		/* update ie_length */</div><div class='del'>-		pnetwork-&gt;ie_length = wps_offset + (wps_ielen+2) + remainder_ielen;</div><div class='add'>+		pnetwork-&gt;ie_length = wps_offset + wps_ielen + 2 + remainder_ielen;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(pbackup_remainder_ie);</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c<br/>index 83a2e58aef53..a24b40761af2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_cmd.c</a></div><div class='hunk'>@@ -405,10 +405,10 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)</div><div class='ctx'> </div><div class='ctx'> 	psecuritypriv-&gt;authenticator_ie[0] = (unsigned char)psecnetwork-&gt;ie_length;</div><div class='ctx'> </div><div class='del'>-	if ((psecnetwork-&gt;ie_length-12) &lt; (256-1))</div><div class='del'>-		memcpy(&amp;psecuritypriv-&gt;authenticator_ie[1], &amp;psecnetwork-&gt;ies[12], psecnetwork-&gt;ie_length-12);</div><div class='add'>+	if (psecnetwork-&gt;ie_length - 12 &lt; 255)</div><div class='add'>+		memcpy(&amp;psecuritypriv-&gt;authenticator_ie[1], &amp;psecnetwork-&gt;ies[12], psecnetwork-&gt;ie_length - 12);</div><div class='ctx'> 	else</div><div class='del'>-		memcpy(&amp;psecuritypriv-&gt;authenticator_ie[1], &amp;psecnetwork-&gt;ies[12], (256-1));</div><div class='add'>+		memcpy(&amp;psecuritypriv-&gt;authenticator_ie[1], &amp;psecnetwork-&gt;ies[12], 255);</div><div class='ctx'> </div><div class='ctx'> 	psecnetwork-&gt;ie_length = 0;</div><div class='ctx'> 	/*  Added by Albert 2009/02/18 */</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c<br/>index 094e8e78f0e8..797ffa6e64d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_ieee80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_ieee80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_ieee80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_ieee80211.c</a></div><div class='hunk'>@@ -1008,10 +1008,10 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)</div><div class='ctx'> 	/* parsing HT_INFO_IE */</div><div class='ctx'> 	p = rtw_get_ie(pnetwork-&gt;network.ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &amp;len, pnetwork-&gt;network.ie_length - _FIXED_IE_LENGTH_);</div><div class='ctx'> 	if (p &amp;&amp; len &gt; 0) {</div><div class='del'>-			pht_info = (struct HT_info_element *)(p + 2);</div><div class='del'>-			pnetwork-&gt;BcnInfo.ht_info_infos_0 = pht_info-&gt;infos[0];</div><div class='add'>+		pht_info = (struct HT_info_element *)(p + 2);</div><div class='add'>+		pnetwork-&gt;BcnInfo.ht_info_infos_0 = pht_info-&gt;infos[0];</div><div class='ctx'> 	} else {</div><div class='del'>-			pnetwork-&gt;BcnInfo.ht_info_infos_0 = 0;</div><div class='add'>+		pnetwork-&gt;BcnInfo.ht_info_infos_0 = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c<br/>index ca0cf8a86671..9a4aad5ec365 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_mlme.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_mlme.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_mlme.c</a></div><div class='hunk'>@@ -1438,7 +1438,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (*candidate == NULL || (*candidate)-&gt;network.Rssi &lt; competitor-&gt;network.Rssi) {</div><div class='add'>+	if (!*candidate || (*candidate)-&gt;network.Rssi &lt; competitor-&gt;network.Rssi) {</div><div class='ctx'> 		*candidate = competitor;</div><div class='ctx'> 		updated = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1632,8 +1632,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in</div><div class='ctx'> 	pcmd-&gt;rsp = NULL;</div><div class='ctx'> 	pcmd-&gt;rspsz = 0;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pcmd-&gt;list);</div><div class='del'>-	res = rtw_enqueue_cmd(pcmdpriv, pcmd);</div><div class='del'>-	return res;</div><div class='add'>+	return rtw_enqueue_cmd(pcmdpriv, pcmd);</div><div class='ctx'> </div><div class='ctx'> err_free_parm:</div><div class='ctx'> 	kfree(psetkeyparm);</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c<br/>index 6a846d08d449..7b16632048b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_pwrctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_pwrctrl.c</a></div><div class='hunk'>@@ -374,7 +374,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pwrpriv-&gt;pwr_mode == ps_mode) {</div><div class='del'>-		if (PS_MODE_ACTIVE == ps_mode)</div><div class='add'>+		if (ps_mode == PS_MODE_ACTIVE)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if ((pwrpriv-&gt;smart_ps == smart_ps) &amp;&amp;</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c<br/>index 1d83affc08ce..087f6c9a5826 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_recv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_recv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_recv.c</a></div><div class='hunk'>@@ -24,11 +24,11 @@ static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};</div><div class='ctx'> </div><div class='ctx'> /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */</div><div class='ctx'> static u8 rtw_bridge_tunnel_header[] = {</div><div class='del'>-       0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8</div><div class='add'>+	0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 rtw_rfc1042_header[] = {</div><div class='del'>-       0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00</div><div class='add'>+	0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void rtw_signal_stat_timer_hdl(struct timer_list *t);</div><div class='hunk'>@@ -64,10 +64,10 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)</div><div class='ctx'> 	precvframe = PTR_ALIGN(precvpriv-&gt;pallocated_frame_buf, RXFRAME_ALIGN_SZ);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_RECVFRAME; i++) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;(precvframe-&gt;list));</div><div class='add'>+		INIT_LIST_HEAD(&amp;precvframe-&gt;list);</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;(precvframe-&gt;list),</div><div class='del'>-				     &amp;(precvpriv-&gt;free_recv_queue.queue));</div><div class='add'>+		list_add_tail(&amp;precvframe-&gt;list,</div><div class='add'>+				     &amp;precvpriv-&gt;free_recv_queue.queue);</div><div class='ctx'> </div><div class='ctx'> 		precvframe-&gt;pkt = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -134,9 +134,9 @@ int rtw_free_recvframe(struct recv_frame *precvframe,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;pfree_recv_queue-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	list_del_init(&amp;(precvframe-&gt;list));</div><div class='add'>+	list_del_init(&amp;precvframe-&gt;list);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;(precvframe-&gt;list), get_list_head(pfree_recv_queue));</div><div class='add'>+	list_add_tail(&amp;precvframe-&gt;list, get_list_head(pfree_recv_queue));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;pfree_recv_queue-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +261,7 @@ static int recvframe_chkmic(struct adapter *adapter,</div><div class='ctx'> 			rtw_seccalctkipmic(mickey, pframe, payload, datalen, &amp;miccode[0],</div><div class='ctx'> 					   (unsigned char)prxattrib-&gt;priority); /* care the length of the data */</div><div class='ctx'> </div><div class='del'>-			pframemic = payload+datalen;</div><div class='add'>+			pframemic = payload + datalen;</div><div class='ctx'> </div><div class='ctx'> 			bmic_err = false;</div><div class='ctx'> </div><div class='hunk'>@@ -365,9 +365,9 @@ static struct recv_frame *decryptor(struct adapter *padapter,</div><div class='ctx'> 	RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("prxstat-&gt;decrypted=%x prxattrib-&gt;encrypt=0x%03x\n", prxattrib-&gt;bdecrypted, prxattrib-&gt;encrypt));</div><div class='ctx'> </div><div class='ctx'> 	if (prxattrib-&gt;encrypt &gt; 0) {</div><div class='del'>-		u8 *iv = precv_frame-&gt;pkt-&gt;data+prxattrib-&gt;hdrlen;</div><div class='add'>+		u8 *iv = precv_frame-&gt;pkt-&gt;data + prxattrib-&gt;hdrlen;</div><div class='ctx'> </div><div class='del'>-		prxattrib-&gt;key_index = (((iv[3])&gt;&gt;6)&amp;0x3);</div><div class='add'>+		prxattrib-&gt;key_index = (((iv[3]) &gt;&gt; 6) &amp; 0x3);</div><div class='ctx'> </div><div class='ctx'> 		if (prxattrib-&gt;key_index &gt; WEP_KEYS) {</div><div class='ctx'> 			DBG_88E("prxattrib-&gt;key_index(%d)&gt;WEP_KEYS\n", prxattrib-&gt;key_index);</div><div class='hunk'>@@ -632,14 +632,9 @@ static void count_rx_stats(struct adapter *padapter,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sta2sta_data_frame(</div><div class='del'>-	struct adapter *adapter,</div><div class='del'>-	struct recv_frame *precv_frame,</div><div class='del'>-	struct sta_info **psta</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame,</div><div class='del'>-		       struct sta_info **psta)</div><div class='add'>+static int sta2sta_data_frame(struct adapter *adapter,</div><div class='add'>+			      struct recv_frame *precv_frame,</div><div class='add'>+			      struct sta_info **psta)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = _SUCCESS;</div><div class='ctx'> 	struct rx_pkt_attrib *pattrib = &amp;precv_frame-&gt;attrib;</div><div class='hunk'>@@ -1160,7 +1155,7 @@ static int validate_recv_frame(struct adapter *adapter,</div><div class='ctx'> 	u8 bDumpRxPkt;</div><div class='ctx'> 	struct rx_pkt_attrib *pattrib = &amp;precv_frame-&gt;attrib;</div><div class='ctx'> 	u8 *ptr = precv_frame-&gt;pkt-&gt;data;</div><div class='del'>-	u8  ver = (unsigned char)(*ptr)&amp;0x3;</div><div class='add'>+	u8  ver = (unsigned char)(*ptr) &amp; 0x3;</div><div class='ctx'> 	struct mlme_ext_priv *pmlmeext = &amp;adapter-&gt;mlmeextpriv;</div><div class='ctx'> </div><div class='ctx'> 	if (pmlmeext-&gt;sitesurvey_res.state == SCAN_PROCESS) {</div><div class='hunk'>@@ -1308,11 +1303,11 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)</div><div class='ctx'> 		return _FAIL;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ptr, pattrib-&gt;dst, ETH_ALEN);</div><div class='del'>-	memcpy(ptr+ETH_ALEN, pattrib-&gt;src, ETH_ALEN);</div><div class='add'>+	memcpy(ptr + ETH_ALEN, pattrib-&gt;src, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	if (!bsnaphdr) {</div><div class='ctx'> 		be_tmp = htons(len);</div><div class='del'>-		memcpy(ptr+12, &amp;be_tmp, 2);</div><div class='add'>+		memcpy(ptr + 12, &amp;be_tmp, 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return _SUCCESS;</div><div class='hunk'>@@ -1325,7 +1320,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,</div><div class='ctx'> 	struct list_head *plist, *phead;</div><div class='ctx'> 	u8 wlanhdr_offset;</div><div class='ctx'> 	u8	curfragnum;</div><div class='del'>-	struct recv_frame *pfhdr, *pnfhdr;</div><div class='add'>+	struct recv_frame *pnfhdr;</div><div class='ctx'> 	struct recv_frame *prframe, *pnextrframe;</div><div class='ctx'> 	struct __queue *pfree_recv_queue;</div><div class='ctx'> </div><div class='hunk'>@@ -1334,11 +1329,10 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	phead = get_list_head(defrag_q);</div><div class='ctx'> 	plist = phead-&gt;next;</div><div class='del'>-	pfhdr = list_entry(plist, struct recv_frame, list);</div><div class='del'>-	prframe = pfhdr;</div><div class='del'>-	list_del_init(&amp;(prframe-&gt;list));</div><div class='add'>+	prframe = list_entry(plist, struct recv_frame, list);</div><div class='add'>+	list_del_init(&amp;prframe-&gt;list);</div><div class='ctx'> </div><div class='del'>-	if (curfragnum != pfhdr-&gt;attrib.frag_num) {</div><div class='add'>+	if (curfragnum != prframe-&gt;attrib.frag_num) {</div><div class='ctx'> 		/* the first fragment number must be 0 */</div><div class='ctx'> 		/* free the whole queue */</div><div class='ctx'> 		rtw_free_recvframe(prframe, pfree_recv_queue);</div><div class='hunk'>@@ -1377,15 +1371,15 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,</div><div class='ctx'> 		skb_pull(pnextrframe-&gt;pkt, wlanhdr_offset);</div><div class='ctx'> </div><div class='ctx'> 		/* append  to first fragment frame's tail (if privacy frame, pull the ICV) */</div><div class='del'>-		skb_trim(prframe-&gt;pkt, prframe-&gt;pkt-&gt;len - pfhdr-&gt;attrib.icv_len);</div><div class='add'>+		skb_trim(prframe-&gt;pkt, prframe-&gt;pkt-&gt;len - prframe-&gt;attrib.icv_len);</div><div class='ctx'> </div><div class='ctx'> 		/* memcpy */</div><div class='del'>-		memcpy(skb_tail_pointer(pfhdr-&gt;pkt), pnfhdr-&gt;pkt-&gt;data,</div><div class='add'>+		memcpy(skb_tail_pointer(prframe-&gt;pkt), pnfhdr-&gt;pkt-&gt;data,</div><div class='ctx'> 		       pnfhdr-&gt;pkt-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		skb_put(prframe-&gt;pkt, pnfhdr-&gt;pkt-&gt;len);</div><div class='ctx'> </div><div class='del'>-		pfhdr-&gt;attrib.icv_len = pnfhdr-&gt;attrib.icv_len;</div><div class='add'>+		prframe-&gt;attrib.icv_len = pnfhdr-&gt;attrib.icv_len;</div><div class='ctx'> 		plist = plist-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1663,9 +1657,9 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_del_init(&amp;(prframe-&gt;list));</div><div class='add'>+	list_del_init(&amp;prframe-&gt;list);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;(prframe-&gt;list), plist);</div><div class='add'>+	list_add_tail(&amp;prframe-&gt;list, plist);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1704,7 +1698,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor</div><div class='ctx'> 				 ("%s: indicate=%d seq=%d amsdu=%d\n",</div><div class='ctx'> 				  __func__, preorder_ctrl-&gt;indicate_seq, pattrib-&gt;seq_num, pattrib-&gt;amsdu));</div><div class='ctx'> 			plist = plist-&gt;next;</div><div class='del'>-			list_del_init(&amp;(prframe-&gt;list));</div><div class='add'>+			list_del_init(&amp;prframe-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 			if (SN_EQUAL(preorder_ctrl-&gt;indicate_seq, pattrib-&gt;seq_num))</div><div class='ctx'> 				preorder_ctrl-&gt;indicate_seq = (preorder_ctrl-&gt;indicate_seq + 1) &amp; 0xFFF;</div><div class='hunk'>@@ -1763,7 +1757,8 @@ static int recv_indicatepkt_reorder(struct adapter *padapter,</div><div class='ctx'> 			preorder_ctrl-&gt;indicate_seq = pattrib-&gt;seq_num;</div><div class='ctx'> 			rtw_recv_indicatepkt(padapter, prframe);</div><div class='ctx'> </div><div class='del'>-			preorder_ctrl-&gt;indicate_seq = (preorder_ctrl-&gt;indicate_seq + 1)%4096;</div><div class='add'>+			preorder_ctrl-&gt;indicate_seq =</div><div class='add'>+				(preorder_ctrl-&gt;indicate_seq + 1) % 4096;</div><div class='ctx'> 			return _SUCCESS;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (pattrib-&gt;amsdu == 1) { /* temp filter -&gt; means didn't support A-MSDUs in a A-MPDU */</div><div class='hunk'>@@ -1771,7 +1766,8 @@ static int recv_indicatepkt_reorder(struct adapter *padapter,</div><div class='ctx'> 			preorder_ctrl-&gt;indicate_seq = pattrib-&gt;seq_num;</div><div class='ctx'> 			retval = amsdu_to_msdu(padapter, prframe);</div><div class='ctx'> </div><div class='del'>-			preorder_ctrl-&gt;indicate_seq = (preorder_ctrl-&gt;indicate_seq + 1)%4096;</div><div class='add'>+			preorder_ctrl-&gt;indicate_seq =</div><div class='add'>+				(preorder_ctrl-&gt;indicate_seq + 1) % 4096;</div><div class='ctx'> 			return retval;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1857,8 +1853,7 @@ static int process_recv_indicatepkts(struct adapter *padapter,</div><div class='ctx'> 			/*  including perform A-MPDU Rx Ordering Buffer Control */</div><div class='ctx'> 			if ((!padapter-&gt;bDriverStopped) &amp;&amp;</div><div class='ctx'> 			    (!padapter-&gt;bSurpriseRemoved)) {</div><div class='del'>-				retval = _FAIL;</div><div class='del'>-				return retval;</div><div class='add'>+				return _FAIL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else { /* B/G mode */</div><div class='hunk'>@@ -1877,8 +1872,7 @@ static int process_recv_indicatepkts(struct adapter *padapter,</div><div class='ctx'> 			RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ %s- recv_func free_indicatepkt\n", __func__));</div><div class='ctx'> </div><div class='ctx'> 			RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter-&gt;bDriverStopped, padapter-&gt;bSurpriseRemoved));</div><div class='del'>-			retval = _FAIL;</div><div class='del'>-			return retval;</div><div class='add'>+			return _FAIL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c<br/>index 4480deef95a1..f404370d6631 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_wlan_util.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_wlan_util.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_wlan_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_wlan_util.c</a></div><div class='hunk'>@@ -1180,12 +1180,8 @@ unsigned int update_supported_rate(unsigned char *ptn, unsigned int ptn_sz)</div><div class='ctx'> </div><div class='ctx'> unsigned int update_MSC_rate(struct ieee80211_ht_cap *pHT_caps)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask = 0;</div><div class='del'>-</div><div class='del'>-	mask = (pHT_caps-&gt;mcs.rx_mask[0] &lt;&lt; 12) |</div><div class='add'>+	return (pHT_caps-&gt;mcs.rx_mask[0] &lt;&lt; 12) |</div><div class='ctx'> 	       (pHT_caps-&gt;mcs.rx_mask[1] &lt;&lt; 20);</div><div class='del'>-</div><div class='del'>-	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int support_short_GI(struct adapter *padapter, struct ieee80211_ht_cap *pHT_caps)</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c<br/>index 1723a47a96b4..952f2ab51347 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/core/rtw_xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/core/rtw_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/core/rtw_xmit.c</a></div><div class='hunk'>@@ -174,7 +174,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	pxmitpriv-&gt;free_xmit_extbuf_cnt = num_xmit_extbuf;</div><div class='ctx'> </div><div class='del'>-	rtw_alloc_hwxmits(padapter);</div><div class='add'>+	res = rtw_alloc_hwxmits(padapter);</div><div class='add'>+	if (res == _FAIL)</div><div class='add'>+		goto exit;</div><div class='ctx'> 	rtw_init_hwxmits(pxmitpriv-&gt;hwxmits, pxmitpriv-&gt;hwxmit_entry);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='hunk'>@@ -1503,7 +1505,7 @@ exit:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='add'>+s32 rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_xmit *hwxmits;</div><div class='ctx'> 	struct xmit_priv *pxmitpriv = &amp;padapter-&gt;xmitpriv;</div><div class='hunk'>@@ -1512,6 +1514,8 @@ void rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	pxmitpriv-&gt;hwxmits = kcalloc(pxmitpriv-&gt;hwxmit_entry,</div><div class='ctx'> 				     sizeof(struct hw_xmit), GFP_KERNEL);</div><div class='add'>+	if (!pxmitpriv-&gt;hwxmits)</div><div class='add'>+		return _FAIL;</div><div class='ctx'> </div><div class='ctx'> 	hwxmits = pxmitpriv-&gt;hwxmits;</div><div class='ctx'> </div><div class='hunk'>@@ -1519,6 +1523,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='ctx'> 	hwxmits[1] .sta_queue = &amp;pxmitpriv-&gt;vi_pending;</div><div class='ctx'> 	hwxmits[2] .sta_queue = &amp;pxmitpriv-&gt;be_pending;</div><div class='ctx'> 	hwxmits[3] .sta_queue = &amp;pxmitpriv-&gt;bk_pending;</div><div class='add'>+	return _SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtw_free_hwxmits(struct adapter *padapter)</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c<br/>index ba3c3e5a8216..74f7c9c81bf6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/hal/odm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/hal/odm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/hal/odm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/hal/odm.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ u8 CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8] = {</div><div class='ctx'> 	{0x0a, 0x0a, 0x09, 0x07, 0x05, 0x03, 0x02, 0x01}, /*  29, -14.5dB */</div><div class='ctx'> 	{0x0a, 0x09, 0x08, 0x07, 0x05, 0x03, 0x02, 0x01}, /*  30, -15.0dB */</div><div class='ctx'> 	{0x09, 0x09, 0x08, 0x06, 0x05, 0x03, 0x01, 0x01}, /*  31, -15.5dB */</div><div class='del'>-	{0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01}	/*  32, -16.0dB */</div><div class='add'>+	{0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01}  /*  32, -16.0dB */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8] = {</div><div class='hunk'>@@ -1096,7 +1096,7 @@ void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*  Turn Off EDCA turbo here. */</div><div class='ctx'> 		/*  Restore original EDCA according to the declaration of AP. */</div><div class='del'>-		 if (pDM_Odm-&gt;DM_EDCA_Table.bCurrentTurboEDCA) {</div><div class='add'>+		if (pDM_Odm-&gt;DM_EDCA_Table.bCurrentTurboEDCA) {</div><div class='ctx'> 			usb_write32(Adapter, REG_EDCA_BE_PARAM,</div><div class='ctx'> 				    Adapter-&gt;HalData-&gt;AcParam_BE);</div><div class='ctx'> 			pDM_Odm-&gt;DM_EDCA_Table.bCurrentTurboEDCA = false;</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/hal/odm_hwconfig.c b/drivers/staging/rtl8188eu/hal/odm_hwconfig.c<br/>index 7ae476ffcd8c..149b0009ad66 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/hal/odm_hwconfig.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/hal/odm_hwconfig.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/hal/odm_hwconfig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/hal/odm_hwconfig.c</a></div><div class='hunk'>@@ -394,11 +394,11 @@ static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm,</div><div class='ctx'> {</div><div class='ctx'> 	odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus,</div><div class='ctx'> 					 pPktinfo);</div><div class='del'>-	if (dm_odm-&gt;RSSI_test) {</div><div class='add'>+	if (dm_odm-&gt;RSSI_test)</div><div class='ctx'> 		;/*  Select the packets to do RSSI checking for antenna switching. */</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c<br/>index 9e5f23392d58..ab94ad9d608a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c</a></div><div class='hunk'>@@ -168,7 +168,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag</div><div class='ctx'> 	struct odm_dm_struct *odmpriv = &amp;adapt-&gt;HalData-&gt;odmpriv;</div><div class='ctx'> 	struct tx_desc *ptxdesc = (struct tx_desc *)pmem;</div><div class='ctx'> 	struct mlme_ext_priv *pmlmeext = &amp;adapt-&gt;mlmeextpriv;</div><div class='del'>-	struct mlme_ext_info *pmlmeinfo = &amp;(pmlmeext-&gt;mlmext_info);</div><div class='add'>+	struct mlme_ext_info *pmlmeinfo = &amp;pmlmeext-&gt;mlmext_info;</div><div class='ctx'> </div><div class='ctx'> 	if (adapt-&gt;registrypriv.mp_mode == 0) {</div><div class='ctx'> 		if ((!bagg_pkt) &amp;&amp; (urb_zero_packet_chk(adapt, sz) == 0)) {</div><div class='hunk'>@@ -486,23 +486,23 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt,</div><div class='ctx'> 	switch (pfirstframe-&gt;attrib.priority) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	case 2:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.bk_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.bk_q;</div><div class='ctx'> 		phwxmit = pxmitpriv-&gt;hwxmits + 3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='ctx'> 	case 5:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.vi_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.vi_q;</div><div class='ctx'> 		phwxmit = pxmitpriv-&gt;hwxmits + 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 	case 7:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.vo_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.vo_q;</div><div class='ctx'> 		phwxmit = pxmitpriv-&gt;hwxmits;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 	case 3:</div><div class='ctx'> 	default:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.be_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.be_q;</div><div class='ctx'> 		phwxmit = pxmitpriv-&gt;hwxmits + 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/include/odm_precomp.h b/drivers/staging/rtl8188eu/include/odm_precomp.h<br/>index 6efddc8f1675..df096c37f5eb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/odm_precomp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/odm_precomp.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/odm_precomp.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/include/odm_precomp.h</a></div><div class='hunk'>@@ -24,12 +24,12 @@</div><div class='ctx'> #include "odm.h"</div><div class='ctx'> #include "odm_hwconfig.h"</div><div class='ctx'> #include "odm_debug.h"</div><div class='del'>-#include "../../rtlwifi/phydm/phydm_regdefine11n.h"</div><div class='add'>+#include "phydm_regdefine11n.h"</div><div class='ctx'> </div><div class='ctx'> #include "hal8188e_rate_adaptive.h" /* for RA,Power training */</div><div class='ctx'> #include "rtl8188e_hal.h"</div><div class='ctx'> </div><div class='del'>-#include "../../rtlwifi/phydm/phydm_reg.h"</div><div class='add'>+#include "phydm_reg.h"</div><div class='ctx'> </div><div class='ctx'> #include "odm_rtl8188e.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtlwifi/phydm/phydm_features.h b/drivers/staging/rtl8188eu/include/phydm_reg.h<br/>index b4ff293280f7..e3ae006487ba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/phydm/phydm_features.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/phydm/phydm_features.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/phydm_reg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/include/phydm_reg.h</a></div><div class='hunk'>@@ -11,12 +11,12 @@</div><div class='ctx'>  * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='add'>+#ifndef __HAL_ODM_REG_H__</div><div class='add'>+#define __HAL_ODM_REG_H__</div><div class='ctx'> </div><div class='del'>-#ifndef __PHYDM_FEATURES_H__</div><div class='del'>-#define __PHYDM_FEATURES_H__</div><div class='del'>-</div><div class='del'>-/*phydm debyg report &amp; tools*/</div><div class='del'>-</div><div class='del'>-/*Antenna Diversity*/</div><div class='add'>+#define ODM_EDCA_VO_PARAM 0x500</div><div class='add'>+#define ODM_EDCA_VI_PARAM 0x504</div><div class='add'>+#define ODM_EDCA_BE_PARAM 0x508</div><div class='add'>+#define ODM_EDCA_BK_PARAM 0x50C</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/include/phydm_regdefine11n.h b/drivers/staging/rtl8188eu/include/phydm_regdefine11n.h<br/>new file mode 100644<br/>index 000000000000..565996828cab<br/>--- /dev/null<br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/phydm_regdefine11n.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/include/phydm_regdefine11n.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2007 - 2016  Realtek Corporation.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='add'>+ * Hsinchu 300, Taiwan.</div><div class='add'>+ *</div><div class='add'>+ * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __ODM_REGDEFINE11N_H__</div><div class='add'>+#define __ODM_REGDEFINE11N_H__</div><div class='add'>+</div><div class='add'>+#define ODM_REG_TX_ANT_CTRL_11N 0x80C</div><div class='add'>+#define ODM_REG_RX_DEFAULT_A_11N 0x858</div><div class='add'>+#define ODM_REG_ANTSEL_CTRL_11N 0x860</div><div class='add'>+#define ODM_REG_RX_ANT_CTRL_11N 0x864</div><div class='add'>+#define ODM_REG_PIN_CTRL_11N 0x870</div><div class='add'>+#define ODM_REG_SC_CNT_11N 0x8C4</div><div class='add'>+</div><div class='add'>+#define ODM_REG_ANT_MAPPING1_11N 0x914</div><div class='add'>+</div><div class='add'>+#define ODM_REG_CCK_ANTDIV_PARA1_11N 0xA00</div><div class='add'>+#define ODM_REG_CCK_CCA_11N 0xA0A</div><div class='add'>+#define ODM_REG_CCK_ANTDIV_PARA2_11N 0xA0C</div><div class='add'>+#define ODM_REG_CCK_FA_RST_11N 0xA2C</div><div class='add'>+#define ODM_REG_CCK_FA_MSB_11N 0xA58</div><div class='add'>+#define ODM_REG_CCK_FA_LSB_11N 0xA5C</div><div class='add'>+#define ODM_REG_CCK_CCA_CNT_11N 0xA60</div><div class='add'>+#define ODM_REG_BB_PWR_SAV4_11N 0xA74</div><div class='add'>+</div><div class='add'>+#define ODM_REG_LNA_SWITCH_11N 0xB2C</div><div class='add'>+</div><div class='add'>+#define ODM_REG_OFDM_FA_HOLDC_11N 0xC00</div><div class='add'>+#define ODM_REG_IGI_A_11N 0xC50</div><div class='add'>+#define ODM_REG_ANTDIV_PARA1_11N 0xCA4</div><div class='add'>+#define ODM_REG_OFDM_FA_TYPE1_11N 0xCF0</div><div class='add'>+</div><div class='add'>+#define ODM_REG_OFDM_FA_RSTD_11N 0xD00</div><div class='add'>+#define ODM_REG_OFDM_FA_TYPE2_11N 0xDA0</div><div class='add'>+#define ODM_REG_OFDM_FA_TYPE3_11N 0xDA4</div><div class='add'>+#define ODM_REG_OFDM_FA_TYPE4_11N 0xDA8</div><div class='add'>+</div><div class='add'>+#define ODM_REG_ANTSEL_PIN_11N 0x4C</div><div class='add'>+#define ODM_REG_RESP_TX_11N 0x6D8</div><div class='add'>+</div><div class='add'>+#define ODM_BIT_IGI_11N 0x0000007F</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/include/rtw_xmit.h b/drivers/staging/rtl8188eu/include/rtw_xmit.h<br/>index 788f59c74ea1..ba7e15fbde72 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/rtw_xmit.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/rtw_xmit.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/rtw_xmit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/include/rtw_xmit.h</a></div><div class='hunk'>@@ -336,7 +336,7 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter,</div><div class='ctx'> void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry);</div><div class='ctx'> s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter);</div><div class='ctx'> void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv);</div><div class='del'>-void rtw_alloc_hwxmits(struct adapter *padapter);</div><div class='add'>+s32 rtw_alloc_hwxmits(struct adapter *padapter);</div><div class='ctx'> void rtw_free_hwxmits(struct adapter *padapter);</div><div class='ctx'> s32 rtw_xmit(struct adapter *padapter, struct sk_buff **pkt);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8188eu/include/wifi.h b/drivers/staging/rtl8188eu/include/wifi.h<br/>index 5e91b9428c16..d059240b836f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/wifi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/include/wifi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/include/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/include/wifi.h</a></div><div class='hunk'>@@ -667,116 +667,6 @@ enum ht_cap_ampdu_factor {</div><div class='ctx'> #define WPS_ASSOC_STATE_ASSOCIATION_FAILURE	0x03</div><div class='ctx'> #define WPS_ASSOC_STATE_IP_FAILURE		0x04</div><div class='ctx'> </div><div class='del'>-/*	=====================P2P Section===================== */</div><div class='del'>-/*	For P2P */</div><div class='del'>-#define	P2POUI					0x506F9A09</div><div class='del'>-</div><div class='del'>-/*	P2P Attribute ID */</div><div class='del'>-#define	P2P_ATTR_STATUS				0x00</div><div class='del'>-#define	P2P_ATTR_MINOR_REASON_CODE		0x01</div><div class='del'>-#define	P2P_ATTR_CAPABILITY			0x02</div><div class='del'>-#define	P2P_ATTR_DEVICE_ID			0x03</div><div class='del'>-#define	P2P_ATTR_GO_INTENT			0x04</div><div class='del'>-#define	P2P_ATTR_CONF_TIMEOUT			0x05</div><div class='del'>-#define	P2P_ATTR_LISTEN_CH			0x06</div><div class='del'>-#define	P2P_ATTR_GROUP_BSSID			0x07</div><div class='del'>-#define	P2P_ATTR_EX_LISTEN_TIMING		0x08</div><div class='del'>-#define	P2P_ATTR_INTENTED_IF_ADDR		0x09</div><div class='del'>-#define	P2P_ATTR_MANAGEABILITY			0x0A</div><div class='del'>-#define	P2P_ATTR_CH_LIST			0x0B</div><div class='del'>-#define	P2P_ATTR_NOA				0x0C</div><div class='del'>-#define	P2P_ATTR_DEVICE_INFO			0x0D</div><div class='del'>-#define	P2P_ATTR_GROUP_INFO			0x0E</div><div class='del'>-#define	P2P_ATTR_GROUP_ID			0x0F</div><div class='del'>-#define	P2P_ATTR_INTERFACE			0x10</div><div class='del'>-#define	P2P_ATTR_OPERATING_CH			0x11</div><div class='del'>-#define	P2P_ATTR_INVITATION_FLAGS		0x12</div><div class='del'>-</div><div class='del'>-/*	Value of Status Attribute */</div><div class='del'>-#define	P2P_STATUS_SUCCESS				0x00</div><div class='del'>-#define	P2P_STATUS_FAIL_INFO_UNAVAILABLE		0x01</div><div class='del'>-#define	P2P_STATUS_FAIL_INCOMPATIBLE_PARAM		0x02</div><div class='del'>-#define	P2P_STATUS_FAIL_LIMIT_REACHED			0x03</div><div class='del'>-#define	P2P_STATUS_FAIL_INVALID_PARAM			0x04</div><div class='del'>-#define	P2P_STATUS_FAIL_REQUEST_UNABLE			0x05</div><div class='del'>-#define	P2P_STATUS_FAIL_PREVOUS_PROTO_ERR		0x06</div><div class='del'>-#define	P2P_STATUS_FAIL_NO_COMMON_CH			0x07</div><div class='del'>-#define	P2P_STATUS_FAIL_UNKNOWN_P2PGROUP		0x08</div><div class='del'>-#define	P2P_STATUS_FAIL_BOTH_GOINTENT_15		0x09</div><div class='del'>-#define	P2P_STATUS_FAIL_INCOMPATIBLE_PROVSION		0x0A</div><div class='del'>-#define	P2P_STATUS_FAIL_USER_REJECT			0x0B</div><div class='del'>-</div><div class='del'>-/*	Value of Invitation Flags Attribute */</div><div class='del'>-</div><div class='del'>-/*	Value of Device Capability Bitmap */</div><div class='del'>-#define	P2P_DEVCAP_SERVICE_DISCOVERY		BIT(0)</div><div class='del'>-#define	P2P_DEVCAP_CLIENT_DISCOVERABILITY	BIT(1)</div><div class='del'>-#define	P2P_DEVCAP_CONCURRENT_OPERATION		BIT(2)</div><div class='del'>-#define	P2P_DEVCAP_INFRA_MANAGED		BIT(3)</div><div class='del'>-#define	P2P_DEVCAP_DEVICE_LIMIT			BIT(4)</div><div class='del'>-#define	P2P_DEVCAP_INVITATION_PROC		BIT(5)</div><div class='del'>-</div><div class='del'>-/*	Value of Group Capability Bitmap */</div><div class='del'>-#define	P2P_GRPCAP_GO				BIT(0)</div><div class='del'>-#define	P2P_GRPCAP_PERSISTENT_GROUP		BIT(1)</div><div class='del'>-#define	P2P_GRPCAP_GROUP_LIMIT			BIT(2)</div><div class='del'>-#define	P2P_GRPCAP_INTRABSS			BIT(3)</div><div class='del'>-#define	P2P_GRPCAP_CROSS_CONN			BIT(4)</div><div class='del'>-#define	P2P_GRPCAP_PERSISTENT_RECONN		BIT(5)</div><div class='del'>-#define	P2P_GRPCAP_GROUP_FORMATION		BIT(6)</div><div class='del'>-</div><div class='del'>-/*	P2P Public Action Frame (Management Frame) */</div><div class='del'>-#define	P2P_PUB_ACTION_ACTION			0x09</div><div class='del'>-</div><div class='del'>-/*	P2P Public Action Frame Type */</div><div class='del'>-#define	P2P_GO_NEGO_REQ				0</div><div class='del'>-#define	P2P_GO_NEGO_RESP			1</div><div class='del'>-#define	P2P_GO_NEGO_CONF			2</div><div class='del'>-#define	P2P_INVIT_REQ				3</div><div class='del'>-#define	P2P_INVIT_RESP				4</div><div class='del'>-#define	P2P_DEVDISC_REQ				5</div><div class='del'>-#define	P2P_DEVDISC_RESP			6</div><div class='del'>-#define	P2P_PROVISION_DISC_REQ			7</div><div class='del'>-#define	P2P_PROVISION_DISC_RESP			8</div><div class='del'>-</div><div class='del'>-/*	P2P Action Frame Type */</div><div class='del'>-#define	P2P_NOTICE_OF_ABSENCE			0</div><div class='del'>-#define	P2P_PRESENCE_REQUEST			1</div><div class='del'>-#define	P2P_PRESENCE_RESPONSE			2</div><div class='del'>-#define	P2P_GO_DISC_REQUEST			3</div><div class='del'>-</div><div class='del'>-#define	P2P_PROVISIONING_SCAN_CNT		3</div><div class='del'>-</div><div class='del'>-/* default value, used when: (1)p2p disabled or (2)p2p enabled</div><div class='del'>- * but only do 1 scan phase</div><div class='del'>- */</div><div class='del'>-#define	P2P_FINDPHASE_EX_NONE		0</div><div class='del'>-/*  used when p2p enabled and want to do 1 scan phase and</div><div class='del'>- *  P2P_FINDPHASE_EX_MAX-1 find phase</div><div class='del'>- */</div><div class='del'>-#define	P2P_FINDPHASE_EX_FULL		1</div><div class='del'>-#define	P2P_FINDPHASE_EX_SOCIAL_FIRST	(P2P_FINDPHASE_EX_FULL+1)</div><div class='del'>-#define	P2P_FINDPHASE_EX_MAX		4</div><div class='del'>-#define	P2P_FINDPHASE_EX_SOCIAL_LAST	P2P_FINDPHASE_EX_MAX</div><div class='del'>-</div><div class='del'>-/* 5 seconds timeout for sending the provision discovery request */</div><div class='del'>-#define	P2P_PROVISION_TIMEOUT		5000</div><div class='del'>-/* 3 seconds timeout for sending the prov disc request concurrent mode */</div><div class='del'>-#define	P2P_CONCURRENT_PROVISION_TIME	3000</div><div class='del'>-/* 5 seconds timeout for receiving the group negotiation response */</div><div class='del'>-#define	P2P_GO_NEGO_TIMEOUT		5000</div><div class='del'>-/* 3 seconds timeout for sending the negotiation request under concurrent mode */</div><div class='del'>-#define	P2P_CONCURRENT_GO_NEGO_TIME	3000</div><div class='del'>-/* 100ms */</div><div class='del'>-#define	P2P_TX_PRESCAN_TIMEOUT		100</div><div class='del'>-/* 5 seconds timeout for sending the invitation request */</div><div class='del'>-#define	P2P_INVITE_TIMEOUT		5000</div><div class='del'>-/* 3 seconds timeout for sending the invitation request under concurrent mode */</div><div class='del'>-#define	P2P_CONCURRENT_INVITE_TIME	3000</div><div class='del'>-/* 25 seconds timeout to reset the scan channel (based on channel plan) */</div><div class='del'>-#define	P2P_RESET_SCAN_CH		25000</div><div class='del'>-#define	P2P_MAX_INTENT			15</div><div class='del'>-</div><div class='ctx'> /*	WPS Configuration Method */</div><div class='ctx'> #define	WPS_CM_NONE			0x0000</div><div class='ctx'> #define	WPS_CM_LABEL			0x0004</div><div class='hunk'>@@ -791,26 +681,6 @@ enum ht_cap_ampdu_factor {</div><div class='ctx'> #define	WPS_CM_SW_DISPLAY_P		0x2008</div><div class='ctx'> #define	WPS_CM_LCD_DISPLAY_P		0x4008</div><div class='ctx'> </div><div class='del'>-/*	=====================WFD Section===================== */</div><div class='del'>-/*	For Wi-Fi Display */</div><div class='del'>-#define	WFD_ATTR_DEVICE_INFO		0x00</div><div class='del'>-#define	WFD_ATTR_ASSOC_BSSID		0x01</div><div class='del'>-#define	WFD_ATTR_COUPLED_SINK_INFO	0x06</div><div class='del'>-#define	WFD_ATTR_LOCAL_IP_ADDR		0x08</div><div class='del'>-#define	WFD_ATTR_SESSION_INFO		0x09</div><div class='del'>-#define	WFD_ATTR_ALTER_MAC		0x0a</div><div class='del'>-</div><div class='del'>-/*	For WFD Device Information Attribute */</div><div class='del'>-#define	WFD_DEVINFO_SOURCE			0x0000</div><div class='del'>-#define	WFD_DEVINFO_PSINK			0x0001</div><div class='del'>-#define	WFD_DEVINFO_SSINK			0x0002</div><div class='del'>-#define	WFD_DEVINFO_DUAL			0x0003</div><div class='del'>-</div><div class='del'>-#define	WFD_DEVINFO_SESSION_AVAIL		0x0010</div><div class='del'>-#define	WFD_DEVINFO_WSD				0x0040</div><div class='del'>-#define	WFD_DEVINFO_PC_TDLS			0x0080</div><div class='del'>-#define	WFD_DEVINFO_HDCP_SUPPORT		0x0100</div><div class='del'>-</div><div class='ctx'> #define IP_MCAST_MAC(mac)				\</div><div class='ctx'> 	((mac[0] == 0x01) &amp;&amp; (mac[1] == 0x00) &amp;&amp; (mac[2] == 0x5e))</div><div class='ctx'> #define ICMPV6_MCAST_MAC(mac)				\</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c<br/>index 8dde5a40e253..2c088af44c8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/os_dep/os_intfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/os_dep/os_intfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/os_dep/os_intfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/os_dep/os_intfs.c</a></div><div class='hunk'>@@ -245,8 +245,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct net_device *sb_dev,</div><div class='del'>-			    select_queue_fallback_t fallback)</div><div class='add'>+			    struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter = rtw_netdev_priv(dev);</div><div class='ctx'> 	struct mlme_priv *pmlmepriv = &amp;padapter-&gt;mlmepriv;</div><div class='head'>diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c<br/>index e4f2af2974ed..eedf2cd831d1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c</a></div><div class='hunk'>@@ -232,7 +232,6 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i</div><div class='ctx'> 	pIo_buf = kmalloc(MAX_USB_IO_CTL_SIZE, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (!pIo_buf) {</div><div class='del'>-		DBG_88E("[%s] pIo_buf == NULL\n", __func__);</div><div class='ctx'> 		status = -ENOMEM;</div><div class='ctx'> 		goto release_mutex;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig<br/>index 4602a47cdb4a..11528d17bb3c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config RTLLIB</div><div class='ctx'> 	tristate "Support for rtllib wireless devices"</div><div class='ctx'> 	depends on WLAN &amp;&amp; m</div><div class='del'>-	default n</div><div class='ctx'> 	select LIB80211</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a wireless card that uses rtllib, say</div><div class='ctx'> 	  Y. Currently the only card is the rtl8192e.</div><div class='ctx'> </div><div class='hunk'>@@ -16,7 +16,7 @@ config RTLLIB_CRYPTO_CCMP</div><div class='ctx'> 	depends on RTLLIB</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  CCMP crypto driver for rtllib.</div><div class='ctx'> </div><div class='ctx'> 	  If you enabled RTLLIB, you want this.</div><div class='hunk'>@@ -27,7 +27,7 @@ config RTLLIB_CRYPTO_TKIP</div><div class='ctx'> 	select CRYPTO_ARC4</div><div class='ctx'> 	select CRYPTO_MICHAEL_MIC</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  TKIP crypto driver for rtllib.</div><div class='ctx'> </div><div class='ctx'> 	  If you enabled RTLLIB, you want this.</div><div class='hunk'>@@ -37,7 +37,7 @@ config RTLLIB_CRYPTO_WEP</div><div class='ctx'> 	select CRYPTO_ARC4</div><div class='ctx'> 	depends on RTLLIB</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  TKIP crypto driver for rtllib.</div><div class='ctx'> </div><div class='ctx'> 	  If you enabled RTLLIB, you want this.</div><div class='head'>diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c<br/>index 68f53013cb95..82c11caeee7a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/dot11d.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/dot11d.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/dot11d.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/dot11d.c</a></div><div class='hunk'>@@ -1,14 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='ctx'>  ******************************************************************************/</div><div class='head'>diff --git a/drivers/staging/rtl8192e/license b/drivers/staging/rtl8192e/license<br/>deleted file mode 100644<br/>index 4bea9fa60daa..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/license?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/license</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,339 +0,0 @@</div><div class='del'>-</div><div class='del'>-"This software program is licensed subject to the GNU General Public License</div><div class='del'>-(GPL). Version 2, June 1991, available at</div><div class='del'>-&lt;http:</div><div class='del'>-</div><div class='del'>-GNU General Public License</div><div class='del'>-</div><div class='del'>-Version 2, June 1991</div><div class='del'>-</div><div class='del'>-Copyright (C) 1989, 1991 Free Software Foundation, Inc.</div><div class='del'>-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA</div><div class='del'>-</div><div class='del'>-Everyone is permitted to copy and distribute verbatim copies of this license</div><div class='del'>-document, but changing it is not allowed.</div><div class='del'>-</div><div class='del'>-Preamble</div><div class='del'>-</div><div class='del'>-The licenses for most software are designed to take away your freedom to</div><div class='del'>-share and change it. By contrast, the GNU General Public License is intended</div><div class='del'>-to guarantee your freedom to share and change free software--to make sure</div><div class='del'>-the software is free for all its users. This General Public License applies</div><div class='del'>-to most of the Free Software Foundation's software and to any other program</div><div class='del'>-whose authors commit to using it. (Some other Free Software Foundation</div><div class='del'>-software is covered by the GNU Library General Public License instead.) You</div><div class='del'>-can apply it to your programs, too.</div><div class='del'>-</div><div class='del'>-When we speak of free software, we are referring to freedom, not price. Our</div><div class='del'>-General Public Licenses are designed to make sure that you have the freedom</div><div class='del'>-to distribute copies of free software (and charge for this service if you</div><div class='del'>-wish), that you receive source code or can get it if you want it, that you</div><div class='del'>-can change the software or use pieces of it in new free programs; and that</div><div class='del'>-you know you can do these things.</div><div class='del'>-</div><div class='del'>-To protect your rights, we need to make restrictions that forbid anyone to</div><div class='del'>-deny you these rights or to ask you to surrender the rights. These</div><div class='del'>-restrictions translate to certain responsibilities for you if you distribute</div><div class='del'>-copies of the software, or if you modify it.</div><div class='del'>-</div><div class='del'>-For example, if you distribute copies of such a program, whether gratis or</div><div class='del'>-for a fee, you must give the recipients all the rights that you have. You</div><div class='del'>-must make sure that they, too, receive or can get the source code. And you</div><div class='del'>-must show them these terms so they know their rights.</div><div class='del'>-</div><div class='del'>-We protect your rights with two steps: (1) copyright the software, and (2)</div><div class='del'>-offer you this license which gives you legal permission to copy, distribute</div><div class='del'>-and/or modify the software.</div><div class='del'>-</div><div class='del'>-Also, for each author's protection and ours, we want to make certain that</div><div class='del'>-everyone understands that there is no warranty for this free software. If</div><div class='del'>-the software is modified by someone else and passed on, we want its</div><div class='del'>-recipients to know that what they have is not the original, so that any</div><div class='del'>-problems introduced by others will not reflect on the original authors'</div><div class='del'>-reputations.</div><div class='del'>-</div><div class='del'>-Finally, any free program is threatened constantly by software patents. We</div><div class='del'>-wish to avoid the danger that redistributors of a free program will</div><div class='del'>-individually obtain patent licenses, in effect making the program</div><div class='del'>-proprietary. To prevent this, we have made it clear that any patent must be</div><div class='del'>-licensed for everyone's free use or not licensed at all.</div><div class='del'>-</div><div class='del'>-The precise terms and conditions for copying, distribution and modification</div><div class='del'>-follow.</div><div class='del'>-</div><div class='del'>-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</div><div class='del'>-</div><div class='del'>-0. This License applies to any program or other work which contains a notice</div><div class='del'>-   placed by the copyright holder saying it may be distributed under the</div><div class='del'>-   terms of this General Public License. The "Program", below, refers to any</div><div class='del'>-   such program or work, and a "work based on the Program" means either the</div><div class='del'>-   Program or any derivative work under copyright law: that is to say, a</div><div class='del'>-   work containing the Program or a portion of it, either verbatim or with</div><div class='del'>-   modifications and/or translated into another language. (Hereinafter,</div><div class='del'>-   translation is included without limitation in the term "modification".)</div><div class='del'>-   Each licensee is addressed as "you".</div><div class='del'>-</div><div class='del'>-   Activities other than copying, distribution and modification are not</div><div class='del'>-   covered by this License; they are outside its scope. The act of running</div><div class='del'>-   the Program is not restricted, and the output from the Program is covered</div><div class='del'>-   only if its contents constitute a work based on the Program (independent</div><div class='del'>-   of having been made by running the Program). Whether that is true depends</div><div class='del'>-   on what the Program does.</div><div class='del'>-</div><div class='del'>-1. You may copy and distribute verbatim copies of the Program's source code</div><div class='del'>-   as you receive it, in any medium, provided that you conspicuously and</div><div class='del'>-   appropriately publish on each copy an appropriate copyright notice and</div><div class='del'>-   disclaimer of warranty; keep intact all the notices that refer to this</div><div class='del'>-   License and to the absence of any warranty; and give any other recipients</div><div class='del'>-   of the Program a copy of this License along with the Program.</div><div class='del'>-</div><div class='del'>-   You may charge a fee for the physical act of transferring a copy, and you</div><div class='del'>-   may at your option offer warranty protection in exchange for a fee.</div><div class='del'>-</div><div class='del'>-2. You may modify your copy or copies of the Program or any portion of it,</div><div class='del'>-   thus forming a work based on the Program, and copy and distribute such</div><div class='del'>-   modifications or work under the terms of Section 1 above, provided that</div><div class='del'>-   you also meet all of these conditions:</div><div class='del'>-</div><div class='del'>-   * a) You must cause the modified files to carry prominent notices stating</div><div class='del'>-        that you changed the files and the date of any change.</div><div class='del'>-</div><div class='del'>-   * b) You must cause any work that you distribute or publish, that in</div><div class='del'>-        whole or in part contains or is derived from the Program or any part</div><div class='del'>-        thereof, to be licensed as a whole at no charge to all third parties</div><div class='del'>-        under the terms of this License.</div><div class='del'>-</div><div class='del'>-   * c) If the modified program normally reads commands interactively when</div><div class='del'>-        run, you must cause it, when started running for such interactive</div><div class='del'>-        use in the most ordinary way, to print or display an announcement</div><div class='del'>-        including an appropriate copyright notice and a notice that there is</div><div class='del'>-        no warranty (or else, saying that you provide a warranty) and that</div><div class='del'>-        users may redistribute the program under these conditions, and</div><div class='del'>-        telling the user how to view a copy of this License. (Exception: if</div><div class='del'>-        the Program itself is interactive but does not normally print such</div><div class='del'>-        an announcement, your work based on the Program is not required to</div><div class='del'>-        print an announcement.)</div><div class='del'>-</div><div class='del'>-   These requirements apply to the modified work as a whole. If identifiable</div><div class='del'>-   sections of that work are not derived from the Program, and can be</div><div class='del'>-   reasonably considered independent and separate works in themselves, then</div><div class='del'>-   this License, and its terms, do not apply to those sections when you</div><div class='del'>-   distribute them as separate works. But when you distribute the same</div><div class='del'>-   sections as part of a whole which is a work based on the Program, the</div><div class='del'>-   distribution of the whole must be on the terms of this License, whose</div><div class='del'>-   permissions for other licensees extend to the entire whole, and thus to</div><div class='del'>-   each and every part regardless of who wrote it.</div><div class='del'>-</div><div class='del'>-   Thus, it is not the intent of this section to claim rights or contest</div><div class='del'>-   your rights to work written entirely by you; rather, the intent is to</div><div class='del'>-   exercise the right to control the distribution of derivative or</div><div class='del'>-   collective works based on the Program.</div><div class='del'>-</div><div class='del'>-   In addition, mere aggregation of another work not based on the Program</div><div class='del'>-   with the Program (or with a work based on the Program) on a volume of a</div><div class='del'>-   storage or distribution medium does not bring the other work under the</div><div class='del'>-   scope of this License.</div><div class='del'>-</div><div class='del'>-3. You may copy and distribute the Program (or a work based on it, under</div><div class='del'>-   Section 2) in object code or executable form under the terms of Sections</div><div class='del'>-   1 and 2 above provided that you also do one of the following:</div><div class='del'>-</div><div class='del'>-   * a) Accompany it with the complete corresponding machine-readable source</div><div class='del'>-        code, which must be distributed under the terms of Sections 1 and 2</div><div class='del'>-        above on a medium customarily used for software interchange; or,</div><div class='del'>-</div><div class='del'>-   * b) Accompany it with a written offer, valid for at least three years,</div><div class='del'>-        to give any third party, for a charge no more than your cost of</div><div class='del'>-        physically performing source distribution, a complete machine-</div><div class='del'>-        readable copy of the corresponding source code, to be distributed</div><div class='del'>-        under the terms of Sections 1 and 2 above on a medium customarily</div><div class='del'>-        used for software interchange; or,</div><div class='del'>-</div><div class='del'>-   * c) Accompany it with the information you received as to the offer to</div><div class='del'>-        distribute corresponding source code. (This alternative is allowed</div><div class='del'>-        only for noncommercial distribution and only if you received the</div><div class='del'>-        program in object code or executable form with such an offer, in</div><div class='del'>-        accord with Subsection b above.)</div><div class='del'>-</div><div class='del'>-   The source code for a work means the preferred form of the work for</div><div class='del'>-   making modifications to it. For an executable work, complete source code</div><div class='del'>-   means all the source code for all modules it contains, plus any</div><div class='del'>-   associated interface definition files, plus the scripts used to control</div><div class='del'>-   compilation and installation of the executable. However, as a special</div><div class='del'>-   exception, the source code distributed need not include anything that is</div><div class='del'>-   normally distributed (in either source or binary form) with the major</div><div class='del'>-   components (compiler, kernel, and so on) of the operating system on which</div><div class='del'>-   the executable runs, unless that component itself accompanies the</div><div class='del'>-   executable.</div><div class='del'>-</div><div class='del'>-   If distribution of executable or object code is made by offering access</div><div class='del'>-   to copy from a designated place, then offering equivalent access to copy</div><div class='del'>-   the source code from the same place counts as distribution of the source</div><div class='del'>-   code, even though third parties are not compelled to copy the source</div><div class='del'>-   along with the object code.</div><div class='del'>-</div><div class='del'>-4. You may not copy, modify, sublicense, or distribute the Program except as</div><div class='del'>-   expressly provided under this License. Any attempt otherwise to copy,</div><div class='del'>-   modify, sublicense or distribute the Program is void, and will</div><div class='del'>-   automatically terminate your rights under this License. However, parties</div><div class='del'>-   who have received copies, or rights, from you under this License will not</div><div class='del'>-   have their licenses terminated so long as such parties remain in full</div><div class='del'>-   compliance.</div><div class='del'>-</div><div class='del'>-5. You are not required to accept this License, since you have not signed</div><div class='del'>-   it. However, nothing else grants you permission to modify or distribute</div><div class='del'>-   the Program or its derivative works. These actions are prohibited by law</div><div class='del'>-   if you do not accept this License. Therefore, by modifying or</div><div class='del'>-   distributing the Program (or any work based on the Program), you</div><div class='del'>-   indicate your acceptance of this License to do so, and all its terms and</div><div class='del'>-   conditions for copying, distributing or modifying the Program or works</div><div class='del'>-   based on it.</div><div class='del'>-</div><div class='del'>-6. Each time you redistribute the Program (or any work based on the</div><div class='del'>-   Program), the recipient automatically receives a license from the</div><div class='del'>-   original licensor to copy, distribute or modify the Program subject to</div><div class='del'>-   these terms and conditions. You may not impose any further restrictions</div><div class='del'>-   on the recipients' exercise of the rights granted herein. You are not</div><div class='del'>-   responsible for enforcing compliance by third parties to this License.</div><div class='del'>-</div><div class='del'>-7. If, as a consequence of a court judgment or allegation of patent</div><div class='del'>-   infringement or for any other reason (not limited to patent issues),</div><div class='del'>-   conditions are imposed on you (whether by court order, agreement or</div><div class='del'>-   otherwise) that contradict the conditions of this License, they do not</div><div class='del'>-   excuse you from the conditions of this License. If you cannot distribute</div><div class='del'>-   so as to satisfy simultaneously your obligations under this License and</div><div class='del'>-   any other pertinent obligations, then as a consequence you may not</div><div class='del'>-   distribute the Program at all. For example, if a patent license would</div><div class='del'>-   not permit royalty-free redistribution of the Program by all those who</div><div class='del'>-   receive copies directly or indirectly through you, then the only way you</div><div class='del'>-   could satisfy both it and this License would be to refrain entirely from</div><div class='del'>-   distribution of the Program.</div><div class='del'>-</div><div class='del'>-   If any portion of this section is held invalid or unenforceable under any</div><div class='del'>-   particular circumstance, the balance of the section is intended to apply</div><div class='del'>-   and the section as a whole is intended to apply in other circumstances.</div><div class='del'>-</div><div class='del'>-   It is not the purpose of this section to induce you to infringe any</div><div class='del'>-   patents or other property right claims or to contest validity of any</div><div class='del'>-   such claims; this section has the sole purpose of protecting the</div><div class='del'>-   integrity of the free software distribution system, which is implemented</div><div class='del'>-   by public license practices. Many people have made generous contributions</div><div class='del'>-   to the wide range of software distributed through that system in</div><div class='del'>-   reliance on consistent application of that system; it is up to the</div><div class='del'>-   author/donor to decide if he or she is willing to distribute software</div><div class='del'>-   through any other system and a licensee cannot impose that choice.</div><div class='del'>-</div><div class='del'>-   This section is intended to make thoroughly clear what is believed to be</div><div class='del'>-   a consequence of the rest of this License.</div><div class='del'>-</div><div class='del'>-8. If the distribution and/or use of the Program is restricted in certain</div><div class='del'>-   countries either by patents or by copyrighted interfaces, the original</div><div class='del'>-   copyright holder who places the Program under this License may add an</div><div class='del'>-   explicit geographical distribution limitation excluding those countries,</div><div class='del'>-   so that distribution is permitted only in or among countries not thus</div><div class='del'>-   excluded. In such case, this License incorporates the limitation as if</div><div class='del'>-   written in the body of this License.</div><div class='del'>-</div><div class='del'>-9. The Free Software Foundation may publish revised and/or new versions of</div><div class='del'>-   the General Public License from time to time. Such new versions will be</div><div class='del'>-   similar in spirit to the present version, but may differ in detail to</div><div class='del'>-   address new problems or concerns.</div><div class='del'>-</div><div class='del'>-   Each version is given a distinguishing version number. If the Program</div><div class='del'>-   specifies a version number of this License which applies to it and "any</div><div class='del'>-   later version", you have the option of following the terms and</div><div class='del'>-   conditions either of that version or of any later version published by</div><div class='del'>-   the Free Software Foundation. If the Program does not specify a version</div><div class='del'>-   number of this License, you may choose any version ever published by the</div><div class='del'>-   Free Software Foundation.</div><div class='del'>-</div><div class='del'>-10. If you wish to incorporate parts of the Program into other free programs</div><div class='del'>-    whose distribution conditions are different, write to the author to ask</div><div class='del'>-    for permission. For software which is copyrighted by the Free Software</div><div class='del'>-    Foundation, write to the Free Software Foundation; we sometimes make</div><div class='del'>-    exceptions for this. Our decision will be guided by the two goals of</div><div class='del'>-    preserving the free status of all derivatives of our free software and</div><div class='del'>-    of promoting the sharing and reuse of software generally.</div><div class='del'>-</div><div class='del'>-   NO WARRANTY</div><div class='del'>-</div><div class='del'>-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY</div><div class='del'>-    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN</div><div class='del'>-    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES</div><div class='del'>-    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER</div><div class='del'>-    EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE</div><div class='del'>-    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH</div><div class='del'>-    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL</div><div class='del'>-    NECESSARY SERVICING, REPAIR OR CORRECTION.</div><div class='del'>-</div><div class='del'>-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING</div><div class='del'>-    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR</div><div class='del'>-    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR</div><div class='del'>-    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL</div><div class='del'>-    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM</div><div class='del'>-    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED</div><div class='del'>-    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF</div><div class='del'>-    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR</div><div class='del'>-    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</div><div class='del'>-</div><div class='del'>-END OF TERMS AND CONDITIONS</div><div class='del'>-</div><div class='del'>-How to Apply These Terms to Your New Programs</div><div class='del'>-</div><div class='del'>-If you develop a new program, and you want it to be of the greatest</div><div class='del'>-possible use to the public, the best way to achieve this is to make it free</div><div class='del'>-software which everyone can redistribute and change under these terms.</div><div class='del'>-</div><div class='del'>-To do so, attach the following notices to the program. It is safest to</div><div class='del'>-attach them to the start of each source file to most effectively convey the</div><div class='del'>-exclusion of warranty; and each file should have at least the "copyright"</div><div class='del'>-line and a pointer to where the full notice is found.</div><div class='del'>-</div><div class='del'>-one line to give the program's name and an idea of what it does.</div><div class='del'>-Copyright (C) yyyy  name of author</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 Free</div><div class='del'>-Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>-any later version.</div><div class='del'>-</div><div class='del'>-This program is distributed in the hope that 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 with</div><div class='del'>-this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='del'>-Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='del'>-</div><div class='del'>-Also add information on how to contact you by electronic and paper mail.</div><div class='del'>-</div><div class='del'>-If the program is interactive, make it output a short notice like this when</div><div class='del'>-it starts in an interactive mode:</div><div class='del'>-</div><div class='del'>-Gnomovision version 69, Copyright (C) year name of author Gnomovision comes</div><div class='del'>-with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free</div><div class='del'>-software, and you are welcome to redistribute it under certain conditions;</div><div class='del'>-type 'show c' for details.</div><div class='del'>-</div><div class='del'>-The hypothetical commands 'show w' and 'show c' should show the appropriate</div><div class='del'>-parts of the General Public License. Of course, the commands you use may be</div><div class='del'>-called something other than 'show w' and 'show c'; they could even be</div><div class='del'>-mouse-clicks or menu items--whatever suits your program.</div><div class='del'>-</div><div class='del'>-You should also get your employer (if you work as a programmer) or your</div><div class='del'>-school, if any, to sign a "copyright disclaimer" for the program, if</div><div class='del'>-necessary. Here is a sample; alter the names:</div><div class='del'>-</div><div class='del'>-Yoyodyne, Inc., hereby disclaims all copyright interest in the program</div><div class='del'>-'Gnomovision' (which makes passes at compilers) written by James Hacker.</div><div class='del'>-</div><div class='del'>-signature of Ty Coon, 1 April 1989</div><div class='del'>-Ty Coon, President of Vice</div><div class='del'>-</div><div class='del'>-This General Public License does not permit incorporating your program into</div><div class='del'>-proprietary programs. If your program is a subroutine library, you may</div><div class='del'>-consider it more useful to permit linking proprietary applications with the</div><div class='del'>-library. If this is what you want to do, use the GNU Library General Public</div><div class='del'>-License instead of this License.</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/Kconfig b/drivers/staging/rtl8192e/rtl8192e/Kconfig<br/>index 7ac42a590e21..eae8167f79dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config RTL8192E</div><div class='ctx'> 	tristate "RealTek RTL8192E Wireless LAN NIC driver"</div><div class='ctx'> 	depends on PCI &amp;&amp; WLAN &amp;&amp; RTLLIB</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h<br/>index 03421033d14a..53fd79a28189 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8190P_def.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8190P_def.h</a></div><div class='hunk'>@@ -1,19 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef R8190P_DEF_H</div><div class='ctx'> #define R8190P_DEF_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c<br/>index 85f93056d28b..7876b389913a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_phyreg.h"</div><div class='ctx'> #include "r8192E_phy.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h<br/>index bbea13b452b2..4cb483f1a152 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef RTL8225H</div><div class='ctx'> #define RTL8225H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c<br/>index 467287ae6c1c..c5e44bbe997c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_hw.h"</div><div class='ctx'> #include "r8192E_cmdpkt.h"</div><div class='hunk'>@@ -20,7 +11,6 @@</div><div class='ctx'> bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data,</div><div class='ctx'> 			 u32 len)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	bool				rt_status = true;</div><div class='ctx'> 	struct r8192_priv *priv = rtllib_priv(dev);</div><div class='ctx'> 	u16				frag_length = 0, frag_offset = 0;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h<br/>index a8c63ad2ac2e..c63909199e93 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef R819XUSB_CMDPKT_H</div><div class='ctx'> #define R819XUSB_CMDPKT_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c<br/>index 19bb04b3f097..ef92ce957466 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_phy.h"</div><div class='ctx'> #include "r8192E_phyreg.h"</div><div class='hunk'>@@ -338,7 +327,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)</div><div class='ctx'> 		priv-&gt;eeprom_ChannelPlan = usValue&amp;0xff;</div><div class='ctx'> 		IC_Version = (usValue &amp; 0xff00)&gt;&gt;8;</div><div class='ctx'> </div><div class='del'>-		ICVer8192 = (IC_Version&amp;0xf);</div><div class='add'>+		ICVer8192 = IC_Version &amp; 0xf;</div><div class='ctx'> 		ICVer8256 = (IC_Version &amp; 0xf0)&gt;&gt;4;</div><div class='ctx'> 		RT_TRACE(COMP_INIT, "\nICVer8192 = 0x%x\n", ICVer8192);</div><div class='ctx'> 		RT_TRACE(COMP_INIT, "\nICVer8256 = 0x%x\n", ICVer8256);</div><div class='hunk'>@@ -420,7 +409,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)</div><div class='ctx'> 			if (!priv-&gt;AutoloadFailFlag) {</div><div class='ctx'> 				usValue = rtl92e_eeprom_read(dev,</div><div class='ctx'> 					  EEPROM_TxPwDiff_CrystalCap &gt;&gt; 1);</div><div class='del'>-				priv-&gt;EEPROMAntPwDiff = (usValue&amp;0x0fff);</div><div class='add'>+				priv-&gt;EEPROMAntPwDiff = usValue &amp; 0x0fff;</div><div class='ctx'> 				priv-&gt;EEPROMCrystalCap = (u8)((usValue &amp; 0xf000)</div><div class='ctx'> 							 &gt;&gt; 12);</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -475,15 +464,13 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)</div><div class='ctx'> 			}</div><div class='ctx'> 			priv-&gt;LegacyHTTxPowerDiff =</div><div class='ctx'> 					 priv-&gt;EEPROMLegacyHTTxPowerDiff;</div><div class='del'>-			priv-&gt;AntennaTxPwDiff[0] = (priv-&gt;EEPROMAntPwDiff &amp;</div><div class='del'>-						    0xf);</div><div class='add'>+			priv-&gt;AntennaTxPwDiff[0] = priv-&gt;EEPROMAntPwDiff &amp; 0xf;</div><div class='ctx'> 			priv-&gt;AntennaTxPwDiff[1] = (priv-&gt;EEPROMAntPwDiff &amp;</div><div class='ctx'> 							0xf0) &gt;&gt; 4;</div><div class='ctx'> 			priv-&gt;AntennaTxPwDiff[2] = (priv-&gt;EEPROMAntPwDiff &amp;</div><div class='ctx'> 							0xf00) &gt;&gt; 8;</div><div class='ctx'> 			priv-&gt;CrystalCap = priv-&gt;EEPROMCrystalCap;</div><div class='del'>-			priv-&gt;ThermalMeter[0] = (priv-&gt;EEPROMThermalMeter &amp;</div><div class='del'>-						 0xf);</div><div class='add'>+			priv-&gt;ThermalMeter[0] = priv-&gt;EEPROMThermalMeter &amp; 0xf;</div><div class='ctx'> 			priv-&gt;ThermalMeter[1] = (priv-&gt;EEPROMThermalMeter &amp;</div><div class='ctx'> 						     0xf0) &gt;&gt; 4;</div><div class='ctx'> 		} else if (priv-&gt;epromtype == EEPROM_93C56) {</div><div class='hunk'>@@ -540,8 +527,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)</div><div class='ctx'> 			priv-&gt;AntennaTxPwDiff[1] = 0;</div><div class='ctx'> 			priv-&gt;AntennaTxPwDiff[2] = 0;</div><div class='ctx'> 			priv-&gt;CrystalCap = priv-&gt;EEPROMCrystalCap;</div><div class='del'>-			priv-&gt;ThermalMeter[0] = (priv-&gt;EEPROMThermalMeter &amp;</div><div class='del'>-						 0xf);</div><div class='add'>+			priv-&gt;ThermalMeter[0] = priv-&gt;EEPROMThermalMeter &amp; 0xf;</div><div class='ctx'> 			priv-&gt;ThermalMeter[1] = (priv-&gt;EEPROMThermalMeter &amp;</div><div class='ctx'> 						     0xf0) &gt;&gt; 4;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -755,8 +741,8 @@ start:</div><div class='ctx'> 	if (priv-&gt;ResetProgress == RESET_TYPE_NORESET) {</div><div class='ctx'> 		ulRegRead = rtl92e_readl(dev, CPU_GEN);</div><div class='ctx'> 		if (priv-&gt;LoopbackMode == RTL819X_NO_LOOPBACK)</div><div class='del'>-			ulRegRead = ((ulRegRead &amp; CPU_GEN_NO_LOOPBACK_MSK) |</div><div class='del'>-				     CPU_GEN_NO_LOOPBACK_SET);</div><div class='add'>+			ulRegRead = (ulRegRead &amp; CPU_GEN_NO_LOOPBACK_MSK) |</div><div class='add'>+				    CPU_GEN_NO_LOOPBACK_SET;</div><div class='ctx'> 		else if (priv-&gt;LoopbackMode == RTL819X_MAC_LOOPBACK)</div><div class='ctx'> 			ulRegRead |= CPU_CCK_LOOPBACK;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1424,7 +1410,7 @@ static u8 _rtl92e_rate_hw_to_mgn(bool bIsHT, u8 rate)</div><div class='ctx'> 			ret_rate = MGN_MCS15;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DESC90_RATEMCS32:</div><div class='del'>-			ret_rate = (0x80|0x20);</div><div class='add'>+			ret_rate = 0x80 | 0x20;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1927,7 +1913,7 @@ static void _rtl92e_update_received_rate_histogram_stats(</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MGN_2M:</div><div class='ctx'> 		rateIndex = 1;</div><div class='del'>-		 break;</div><div class='add'>+		break;</div><div class='ctx'> 	case MGN_5_5M:</div><div class='ctx'> 		rateIndex = 2;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1945,7 +1931,7 @@ static void _rtl92e_update_received_rate_histogram_stats(</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MGN_18M:</div><div class='ctx'> 		rateIndex = 7;</div><div class='del'>-		 break;</div><div class='add'>+		break;</div><div class='ctx'> 	case MGN_24M:</div><div class='ctx'> 		rateIndex = 8;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2044,7 +2030,7 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;RxDrvInfoSize = pdesc-&gt;RxDrvInfoSize;</div><div class='del'>-	stats-&gt;RxBufShift = ((pdesc-&gt;Shift)&amp;0x03);</div><div class='add'>+	stats-&gt;RxBufShift = (pdesc-&gt;Shift) &amp; 0x03;</div><div class='ctx'> 	stats-&gt;Decrypted = !pdesc-&gt;SWDec;</div><div class='ctx'> </div><div class='ctx'> 	pDrvInfo = (struct rx_fwinfo *)(skb-&gt;data + stats-&gt;RxBufShift);</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h<br/>index f4233bb12f81..1713381dc2b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * Based on the r8180 driver, which is:</div><div class='del'>- * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License 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 that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL8192E_H</div><div class='ctx'> #define _RTL8192E_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c<br/>index 3c7831250987..9b025b9fa7ab 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_hw.h"</div><div class='ctx'> #include "r8192E_hwimg.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h<br/>index 61c8dac826a8..b9059abc901b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef __INC_FIRMWARE_H</div><div class='ctx'> #define __INC_FIRMWARE_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h<br/>index 5c20cb476281..3e223151d4b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h</a></div><div class='hunk'>@@ -1,19 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef R8180_HW</div><div class='ctx'> #define R8180_HW</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c<br/>index d437a8efe933..e6fce749e65b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c</a></div><div class='hunk'>@@ -1,19 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-/*Created on  2008/11/18,  3: 7*/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "r8192E_hwimg.h"</div><div class='ctx'> </div><div class='ctx'> u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE] = {0x0,};</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h<br/>index 4e2bbab6a413..7d63f5a5c1b7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef __INC_HAL8192PciE_FW_IMG_H</div><div class='ctx'> #define __INC_HAL8192PciE_FW_IMG_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c<br/>index 73497d559b77..5215a0b5fd45 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_hw.h"</div><div class='hunk'>@@ -81,8 +72,7 @@ void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,</div><div class='ctx'> 	if (dwBitMask != bMaskDWord) {</div><div class='ctx'> 		OriginalValue = rtl92e_readl(dev, dwRegAddr);</div><div class='ctx'> 		BitShift = _rtl92e_calculate_bit_shift(dwBitMask);</div><div class='del'>-		NewValue = (((OriginalValue) &amp; (~dwBitMask)) |</div><div class='del'>-			    (dwData &lt;&lt; BitShift));</div><div class='add'>+		NewValue = (OriginalValue &amp; ~dwBitMask) | (dwData &lt;&lt; BitShift);</div><div class='ctx'> 		rtl92e_writel(dev, dwRegAddr, NewValue);</div><div class='ctx'> 	} else</div><div class='ctx'> 		rtl92e_writel(dev, dwRegAddr, dwData);</div><div class='hunk'>@@ -188,7 +178,7 @@ static void _rtl92e_phy_rf_write(struct net_device *dev,</div><div class='ctx'> 		NewOffset = Offset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DataAndAddr = (Data&lt;&lt;16) | (NewOffset&amp;0x3f);</div><div class='add'>+	DataAndAddr = (NewOffset &amp; 0x3f) | (Data &lt;&lt; 16);</div><div class='ctx'> </div><div class='ctx'> 	rtl92e_set_bb_reg(dev, pPhyReg-&gt;rf3wireOffset, bMaskDWord, DataAndAddr);</div><div class='ctx'> </div><div class='hunk'>@@ -223,8 +213,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,</div><div class='ctx'> 			Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath,</div><div class='ctx'> 								RegAddr);</div><div class='ctx'> 			BitShift =  _rtl92e_calculate_bit_shift(BitMask);</div><div class='del'>-			New_Value = (((Original_Value) &amp; (~BitMask)) |</div><div class='del'>-				    (Data &lt;&lt; BitShift));</div><div class='add'>+			New_Value = (Original_Value &amp; ~BitMask) | (Data &lt;&lt; BitShift);</div><div class='ctx'> </div><div class='ctx'> 			_rtl92e_phy_rf_fw_write(dev, eRFPath, RegAddr,</div><div class='ctx'> 						New_Value);</div><div class='hunk'>@@ -237,8 +226,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,</div><div class='ctx'> 			Original_Value = _rtl92e_phy_rf_read(dev, eRFPath,</div><div class='ctx'> 							     RegAddr);</div><div class='ctx'> 			BitShift =  _rtl92e_calculate_bit_shift(BitMask);</div><div class='del'>-			New_Value = (((Original_Value) &amp; (~BitMask)) |</div><div class='del'>-				     (Data &lt;&lt; BitShift));</div><div class='add'>+			New_Value = (Original_Value &amp; ~BitMask) | (Data &lt;&lt; BitShift);</div><div class='ctx'> </div><div class='ctx'> 			_rtl92e_phy_rf_write(dev, eRFPath, RegAddr, New_Value);</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -571,9 +559,9 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;IC_Cut  &gt; VERSION_8190_BD) {</div><div class='ctx'> 		if (priv-&gt;rf_type == RF_2T4R)</div><div class='del'>-			dwRegValue = (priv-&gt;AntennaTxPwDiff[2]&lt;&lt;8 |</div><div class='add'>+			dwRegValue = priv-&gt;AntennaTxPwDiff[2]&lt;&lt;8 |</div><div class='ctx'> 				      priv-&gt;AntennaTxPwDiff[1]&lt;&lt;4 |</div><div class='del'>-				      priv-&gt;AntennaTxPwDiff[0]);</div><div class='add'>+				      priv-&gt;AntennaTxPwDiff[0];</div><div class='ctx'> 		else</div><div class='ctx'> 			dwRegValue = 0x0;</div><div class='ctx'> 		rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,</div><div class='hunk'>@@ -655,9 +643,9 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)</div><div class='ctx'> 			priv-&gt;AntennaTxPwDiff[1] = (u8)(ant_pwr_diff);</div><div class='ctx'> 			priv-&gt;AntennaTxPwDiff[0] = 0;</div><div class='ctx'> </div><div class='del'>-			u4RegValue = (priv-&gt;AntennaTxPwDiff[2]&lt;&lt;8 |</div><div class='add'>+			u4RegValue = priv-&gt;AntennaTxPwDiff[2]&lt;&lt;8 |</div><div class='ctx'> 				      priv-&gt;AntennaTxPwDiff[1]&lt;&lt;4 |</div><div class='del'>-				      priv-&gt;AntennaTxPwDiff[0]);</div><div class='add'>+				      priv-&gt;AntennaTxPwDiff[0];</div><div class='ctx'> </div><div class='ctx'> 			rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,</div><div class='ctx'> 					  (bXBTxAGC|bXCTxAGC|bXDTxAGC),</div><div class='hunk'>@@ -1631,5 +1619,4 @@ void rtl92e_scan_op_backup(struct net_device *dev, u8 Operation)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h<br/>index b534d72bf708..7c9148e033d8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _R819XU_PHY_H</div><div class='ctx'> #define _R819XU_PHY_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h<br/>index 03d6d70b2d28..433272a2aae8 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _R819XU_PHYREG_H</div><div class='ctx'> #define _R819XU_PHYREG_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c<br/>index c62481fcf0b1..627ea1029509 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_phy.h"</div><div class='ctx'> #include "r8192E_phyreg.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h<br/>index 12f01f196752..1ebd92e27441 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.h</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL_CAM_H</div><div class='ctx'> #define _RTL_CAM_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c<br/>index 253f1911a3f4..f932cb15e4e5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_core.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h<br/>index 866fe4d4cb28..736f1a824cd2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_core.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_core.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_core.h</a></div><div class='hunk'>@@ -1,24 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL_CORE_H</div><div class='ctx'> #define _RTL_CORE_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c<br/>index 157bcee34067..55d857926bba 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "rtl_dm.h"</div><div class='ctx'> #include "r8192E_hw.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h<br/>index 52a4a1522bae..ea1b14bbcdcd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef	__R8192UDM_H__</div><div class='ctx'> #define __R8192UDM_H__</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c<br/>index e1d305d4fa20..59532ed2156d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "rtl_eeprom.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h<br/>index 6212e5eadede..66f1979bb1d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h</a></div><div class='hunk'>@@ -1,25 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #define EPROM_DELAY 10</div><div class='ctx'> </div><div class='ctx'> u32 rtl92e_eeprom_read(struct net_device *dev, u32 addr);</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c<br/>index f172f776245d..6ae7a67e767f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c</a></div><div class='hunk'>@@ -1,23 +1,11 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</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='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c<br/>index 2ff52e7dd32f..1d992d5c4e17 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_pci.h"</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> </div><div class='hunk'>@@ -44,12 +33,10 @@ static void _rtl92e_parse_pci_configuration(struct pci_dev *pdev,</div><div class='ctx'> bool rtl92e_check_adapter(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);</div><div class='del'>-	u16 VenderID;</div><div class='ctx'> 	u16 DeviceID;</div><div class='ctx'> 	u8  RevisionID;</div><div class='ctx'> 	u16 IrqLine;</div><div class='ctx'> </div><div class='del'>-	VenderID = pdev-&gt;vendor;</div><div class='ctx'> 	DeviceID = pdev-&gt;device;</div><div class='ctx'> 	RevisionID = pdev-&gt;revision;</div><div class='ctx'> 	pci_read_config_word(pdev, 0x3C, &amp;IrqLine);</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h<br/>index 73d357d530d0..866e0efbc4fd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.h</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL_PCI_H</div><div class='ctx'> #define _RTL_PCI_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c<br/>index 81a68b0b4a7f..cd3e17b41d6f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_hw.h"</div><div class='ctx'> #include "r8190P_rtl8256.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h<br/>index 03fe79ff5a1b..e58f2bcdb1dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.h</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef R8192E_PM_H</div><div class='ctx'> #define R8192E_PM_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c<br/>index 9281116366d2..9475f8c6edf7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtl_ps.h"</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "r8192E_phy.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h<br/>index a46f4cffca23..70fe5d39be9a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.h</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8180 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License as</div><div class='del'>- * 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, 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL_PS_H</div><div class='ctx'> #define _RTL_PS_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c<br/>index 44e06cba7b7b..16bcee13f64b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.c</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include "rtl_core.h"</div><div class='ctx'> #include "rtl_wx.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h<br/>index c313fb79de4d..d70a747ac1dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.h</a></div><div class='hunk'>@@ -1,18 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef R819x_WX_H</div><div class='ctx'> #define R819x_WX_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_BA.h b/drivers/staging/rtl8192e/rtl819x_BA.h<br/>index 978c9a54043e..8b6e4c26f0fb 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_BA.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_BA.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_BA.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_BA.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _BATYPE_H_</div><div class='ctx'> #define _BATYPE_H_</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c<br/>index 2d330d2bbf6d..816d31c1d5c7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_BAProc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_BAProc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_BAProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_BAProc.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h<br/>index 24e86620c94c..11269fe6b395 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_HT.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_HT.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_HT.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_HT.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL819XU_HTTYPE_H_</div><div class='ctx'> #define _RTL819XU_HTTYPE_H_</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c<br/>index f0e11726a72a..f02263af9624 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_HTProc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_HTProc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_HTProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_HTProc.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtllib.h"</div><div class='ctx'> #include "rtl819x_HT.h"</div><div class='ctx'> u8 MCS_FILTER_ALL[16] = {</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h<br/>index 576241233a35..5073f9f40fdc 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_Qos.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_Qos.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_Qos.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_Qos.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef __INC_QOS_TYPE_H</div><div class='ctx'> #define __INC_QOS_TYPE_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h<br/>index 654c223030e3..9dc93d41939d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_TS.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_TS.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_TS.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_TS.h</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _TSTYPE_H_</div><div class='ctx'> #define _TSTYPE_H_</div><div class='ctx'> #include "rtl819x_Qos.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c<br/>index f839d2447b85..672bf0987943 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_TSProc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtl819x_TSProc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtl819x_TSProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtl819x_TSProc.c</a></div><div class='hunk'>@@ -1,17 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #include "rtllib.h"</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "rtl819x_TS.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h<br/>index 61ebd12831c3..2dd57e88276e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Merged with mainline rtllib.h in Aug 2004.  Original ieee802_11</div><div class='ctx'>  * remains copyright by the original authors</div><div class='hunk'>@@ -15,11 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Modified for Realtek's wi-fi cards by Andrea Merello</div><div class='ctx'>  * &lt;andrea.merello@gmail.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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef RTLLIB_H</div><div class='ctx'> #define RTLLIB_H</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c<br/>index 55da8c9dfe50..8d2a58e706d5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_crypt_tkip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_crypt_tkip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_crypt_tkip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_crypt_tkip.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Host AP crypt: host-based TKIP encryption implementation for Host AP driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2004, Jouni Malinen &lt;jkmaline@cc.hut.fi&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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='hunk'>@@ -507,7 +503,6 @@ static int michael_mic(struct crypto_shash *tfm_michael, u8 *key, u8 *hdr,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm_michael;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (crypto_shash_setkey(tfm_michael, key, 8))</div><div class='ctx'> 		return -1;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_crypt_wep.c b/drivers/staging/rtl8192e/rtllib_crypt_wep.c<br/>index d11ec39171d5..b1ea650036d2 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_crypt_wep.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_crypt_wep.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_crypt_wep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_crypt_wep.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Host AP crypt: host-based WEP encryption implementation for Host AP driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002-2004, Jouni Malinen &lt;jkmaline@cc.hut.fi&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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_debug.h b/drivers/staging/rtl8192e/rtllib_debug.h<br/>index 7b0e6e9c4456..9065901636f5 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_debug.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_debug.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_debug.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_debug.h</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='del'>-/******************************************************************************</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * Based on the r8180 driver, which is:</div><div class='del'>- * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License 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 that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ * Contact Information: wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='add'>+ */</div><div class='ctx'> #ifndef _RTL_DEBUG_H</div><div class='ctx'> #define _RTL_DEBUG_H</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c<br/>index cdf4c9060c51..bb13b1de2797 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_module.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_module.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_module.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_module.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2004 Intel Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are based on the WEP enablement code provided by the</div><div class='hunk'>@@ -8,23 +8,10 @@</div><div class='ctx'>  * &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>  * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</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 version 2 of the GNU General Public License 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 that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * James P. Ketrenos &lt;ipw2100-admin@linux.intel.com&gt;</div><div class='ctx'>  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -96,7 +83,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	ieee = (struct rtllib_device *)netdev_priv_rsl(dev);</div><div class='del'>-	memset(ieee, 0, sizeof(struct rtllib_device)+sizeof_priv);</div><div class='add'>+	memset(ieee, 0, sizeof(struct rtllib_device) + sizeof_priv);</div><div class='ctx'> 	ieee-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	err = rtllib_networks_allocate(ieee);</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c<br/>index debc2e40af00..0c19ac2bc3bf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_rx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Original code based Host AP (software wireless LAN access point) driver</div><div class='ctx'>  * for Intersil Prism2/2.5/3 - hostap.o module, common routines</div><div class='hunk'>@@ -7,20 +8,11 @@</div><div class='ctx'>  * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>  * Copyright (c) 2004, Intel Corporation</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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='del'>- ******************************************************************************</div><div class='del'>-</div><div class='del'>-  Few modifications for Realtek's Wi-Fi drivers by</div><div class='del'>-  Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='del'>-</div><div class='del'>-  A special thanks goes to Realtek for their support !</div><div class='del'>-</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+ * Few modifications for Realtek's Wi-Fi drivers by</div><div class='add'>+ * Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * A special thanks goes to Realtek for their support !</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c<br/>index ee275857868f..e29e8d6f4611 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_softmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_softmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_softmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_softmac.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* IEEE 802.11 SoftMAC layer</div><div class='ctx'>  * Copyright (c) 2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,11 +10,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * WPA code stolen from the ipw2200 driver.</div><div class='ctx'>  * Copyright who own it's copyright.</div><div class='del'>- *</div><div class='del'>- * released under the GPL</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #include "rtllib.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c<br/>index 5f1412fc410d..f89799d43b1b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_softmac_wx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_softmac_wx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_softmac_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_softmac_wx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* IEEE 802.11 SoftMAC layer</div><div class='ctx'>  * Copyright (c) 2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,11 +10,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * PS wx handler mostly stolen from hostap, copyright who</div><div class='ctx'>  * own it's copyright ;-)</div><div class='del'>- *</div><div class='del'>- * released under the GPL</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "rtllib.h"</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c<br/>index d314b2f602e4..8cddb2e12dc4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_tx.c</a></div><div class='hunk'>@@ -1,32 +1,16 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License 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 that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * James P. Ketrenos &lt;ipw2100-admin@linux.intel.com&gt;</div><div class='ctx'>  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'>  *</div><div class='del'>- *****************************************************************************</div><div class='del'>- *</div><div class='ctx'>  * Few modifications for Realtek's Wi-Fi drivers by</div><div class='ctx'>  * Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * A special thanks goes to Realtek for their support !</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c<br/>index 4f4904a300e0..beb40967936a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_wx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192e/rtllib_wx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192e/rtllib_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192e/rtllib_wx.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='ctx'>  * Copyright(c) 2004 Intel Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are based on the WEP enablement code provided by the</div><div class='hunk'>@@ -8,23 +8,10 @@</div><div class='ctx'>  * &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>  * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</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 version 2 of the GNU General Public License 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 that 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'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * James P. Ketrenos &lt;ipw2100-admin@linux.intel.com&gt;</div><div class='ctx'>  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192u/Kconfig b/drivers/staging/rtl8192u/Kconfig<br/>index 97df6507a485..22c2165e8b1c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config RTL8192U</div><div class='ctx'> 	tristate "RealTek RTL8192U Wireless LAN NIC driver"</div><div class='ctx'> 	depends on PCI &amp;&amp; WLAN &amp;&amp; USB</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h<br/>index 8aa536d79900..d36963469015 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Merged with mainline ieee80211.h in Aug 2004.  Original ieee802_11</div><div class='ctx'>  * remains copyright by the original authors</div><div class='hunk'>@@ -15,11 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Modified for Realtek's wi-fi cards by Andrea Merello</div><div class='ctx'>  * &lt;andrea.merello@gmail.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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef IEEE80211_H</div><div class='ctx'> #define IEEE80211_H</div><div class='hunk'>@@ -296,7 +292,7 @@ struct cb_desc {</div><div class='ctx'> #define ieee80211_wx_get_encode_ext	ieee80211_wx_get_encode_ext_rsl</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-typedef struct ieee_param {</div><div class='add'>+struct ieee_param {</div><div class='ctx'> 	u32 cmd;</div><div class='ctx'> 	u8 sta_addr[ETH_ALEN];</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -323,7 +319,7 @@ typedef struct ieee_param {</div><div class='ctx'> 			u8 key[0];</div><div class='ctx'> 		} crypt;</div><div class='ctx'> 	} u;</div><div class='del'>-} ieee_param;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> // linux under 2.6.9 release may not support it, so modify it for common use</div><div class='hunk'>@@ -1462,23 +1458,23 @@ struct tx_pending {</div><div class='ctx'> 	struct ieee80211_txb *txb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef struct _bandwidth_autoswitch {</div><div class='add'>+struct bandwidth_autoswitch {</div><div class='ctx'> 	long threshold_20Mhzto40Mhz;</div><div class='ctx'> 	long	threshold_40Mhzto20Mhz;</div><div class='ctx'> 	bool bforced_tx20Mhz;</div><div class='ctx'> 	bool bautoswitch_enable;</div><div class='del'>-} bandwidth_autoswitch, *pbandwidth_autoswitch;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> //added by amy for order</div><div class='ctx'> </div><div class='ctx'> #define REORDER_WIN_SIZE	128</div><div class='ctx'> #define REORDER_ENTRY_NUM	128</div><div class='del'>-typedef struct _RX_REORDER_ENTRY {</div><div class='add'>+struct rx_reorder_entry {</div><div class='ctx'> 	struct list_head	List;</div><div class='ctx'> 	u16			SeqNum;</div><div class='ctx'> 	struct ieee80211_rxb *prxb;</div><div class='del'>-} RX_REORDER_ENTRY, *PRX_REORDER_ENTRY;</div><div class='add'>+};</div><div class='ctx'> //added by amy for order</div><div class='ctx'> typedef enum _Fsync_State {</div><div class='ctx'> 	Default_Fsync,</div><div class='hunk'>@@ -1506,9 +1502,9 @@ typedef enum _RT_JOIN_ACTION {</div><div class='ctx'> 	RT_NO_ACTION  = 4,</div><div class='ctx'> } RT_JOIN_ACTION;</div><div class='ctx'> </div><div class='del'>-typedef struct _IbssParms {</div><div class='add'>+struct ibss_parms {</div><div class='ctx'> 	u16   atimWin;</div><div class='del'>-} IbssParms, *PIbssParms;</div><div class='add'>+};</div><div class='ctx'> #define MAX_NUM_RATES	264 // Max num of support rates element: 8,  Max num of ext. support rate: 255. 061122, by rcnjko.</div><div class='ctx'> </div><div class='ctx'> // RF state.</div><div class='hunk'>@@ -1518,7 +1514,7 @@ typedef	enum _RT_RF_POWER_STATE {</div><div class='ctx'> 	eRfOff</div><div class='ctx'> } RT_RF_POWER_STATE;</div><div class='ctx'> </div><div class='del'>-typedef struct _RT_POWER_SAVE_CONTROL {</div><div class='add'>+struct rt_power_save_control {</div><div class='ctx'> </div><div class='ctx'> 	//</div><div class='ctx'> 	// Inactive Power Save(IPS) : Disable RF when disconnected</div><div class='hunk'>@@ -1554,7 +1550,7 @@ typedef struct _RT_POWER_SAVE_CONTROL {</div><div class='ctx'> 	struct octet_string			tmpSuppRateSet;</div><div class='ctx'> 	u8					tmpSuppRateBuf[MAX_NUM_RATES];</div><div class='ctx'> 	bool				bTmpSuppRate;</div><div class='del'>-	IbssParms				tmpIbpm;</div><div class='add'>+	struct ibss_parms			tmpIbpm;</div><div class='ctx'> 	bool				bTmpIbpm;</div><div class='ctx'> </div><div class='ctx'> 	//</div><div class='hunk'>@@ -1562,7 +1558,7 @@ typedef struct _RT_POWER_SAVE_CONTROL {</div><div class='ctx'> 	//</div><div class='ctx'> 	bool				bLeisurePs;</div><div class='ctx'> </div><div class='del'>-} RT_POWER_SAVE_CONTROL, *PRT_POWER_SAVE_CONTROL;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> typedef u32 RT_RF_CHANGE_SOURCE;</div><div class='ctx'> #define RF_CHANGE_BY_SW		BIT(31)</div><div class='hunk'>@@ -1586,7 +1582,7 @@ typedef enum {</div><div class='ctx'> } country_code_type_t;</div><div class='ctx'> </div><div class='ctx'> #define RT_MAX_LD_SLOT_NUM	10</div><div class='del'>-typedef struct _RT_LINK_DETECT_T {</div><div class='add'>+struct rt_link_detect {</div><div class='ctx'> </div><div class='ctx'> 	u32				NumRecvBcnInPeriod;</div><div class='ctx'> 	u32				NumRecvDataInPeriod;</div><div class='hunk'>@@ -1599,7 +1595,7 @@ typedef struct _RT_LINK_DETECT_T {</div><div class='ctx'> 	u32				NumTxOkInPeriod;</div><div class='ctx'> 	u32				NumRxOkInPeriod;</div><div class='ctx'> 	bool				bBusyTraffic;</div><div class='del'>-} RT_LINK_DETECT_T, *PRT_LINK_DETECT_T;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct ieee80211_device {</div><div class='hunk'>@@ -1654,7 +1650,7 @@ struct ieee80211_device {</div><div class='ctx'> 	struct list_head		Rx_TS_Unused_List;</div><div class='ctx'> 	struct rx_ts_record		RxTsRecord[TOTAL_TS_NUM];</div><div class='ctx'> //#ifdef TO_DO_LIST</div><div class='del'>-	RX_REORDER_ENTRY	RxReorderEntry[128];</div><div class='add'>+	struct rx_reorder_entry	RxReorderEntry[128];</div><div class='ctx'> 	struct list_head		RxReorder_Unused_List;</div><div class='ctx'> //#endif</div><div class='ctx'> 	// Qos related. Added by Annie, 2005-11-01.</div><div class='hunk'>@@ -1871,14 +1867,14 @@ struct ieee80211_device {</div><div class='ctx'> 	Fsync_State			fsync_state;</div><div class='ctx'> 	bool		bis_any_nonbepkts;</div><div class='ctx'> 	//20Mhz 40Mhz AutoSwitch Threshold</div><div class='del'>-	bandwidth_autoswitch bandwidth_auto_switch;</div><div class='add'>+	struct bandwidth_autoswitch bandwidth_auto_switch;</div><div class='ctx'> 	//for txpower tracking</div><div class='ctx'> 	bool FwRWRF;</div><div class='ctx'> </div><div class='ctx'> 	//added by amy for AP roaming</div><div class='del'>-	RT_LINK_DETECT_T	LinkDetectInfo;</div><div class='add'>+	struct rt_link_detect LinkDetectInfo;</div><div class='ctx'> 	//added by amy for ps</div><div class='del'>-	RT_POWER_SAVE_CONTROL	PowerSaveControl;</div><div class='add'>+	struct rt_power_save_control PowerSaveControl;</div><div class='ctx'> //}</div><div class='ctx'> 	/* used if IEEE_SOFTMAC_TX_QUEUE is set */</div><div class='ctx'> 	struct  tx_pending tx_pending;</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c<br/>index 6f457812e5a3..36987fccac5d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c</a></div><div class='hunk'>@@ -1,14 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Host AP crypto routines</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>  * Portions Copyright (C) 2004, Intel Corporation &lt;jketreno@linux.intel.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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='del'>- *</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/staging/rtl8192u/ieee80211/ieee80211_crypt.h b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h<br/>index 1f2aea7e0e55..d3bd5598b25b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Original code based on Host AP (software wireless LAN access point) driver</div><div class='ctx'>  * for Intersil Prism2/2.5/3.</div><div class='hunk'>@@ -10,11 +11,6 @@</div><div class='ctx'>  * &lt;jketreno@linux.intel.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004, Intel 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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c<br/>index 3534ddb900d1..d7188b3f3190 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Host AP crypt: host-based CCMP encryption implementation for Host AP driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2004, Jouni Malinen &lt;jkmaline@cc.hut.fi&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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -216,7 +212,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='ctx'> 	*pos++ = key-&gt;tx_pn[5];</div><div class='ctx'> 	*pos++ = key-&gt;tx_pn[4];</div><div class='ctx'> 	*pos++ = 0;</div><div class='del'>-	*pos++ = (key-&gt;key_idx &lt;&lt; 6) | (1 &lt;&lt; 5) /* Ext IV included */;</div><div class='add'>+	*pos++ = (key-&gt;key_idx &lt;&lt; 6) | BIT(5) /* Ext IV included */;</div><div class='ctx'> 	*pos++ = key-&gt;tx_pn[3];</div><div class='ctx'> 	*pos++ = key-&gt;tx_pn[2];</div><div class='ctx'> 	*pos++ = key-&gt;tx_pn[1];</div><div class='hunk'>@@ -274,7 +270,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='ctx'> 	hdr = (struct rtl_80211_hdr_4addr *)skb-&gt;data;</div><div class='ctx'> 	pos = skb-&gt;data + hdr_len;</div><div class='ctx'> 	keyidx = pos[3];</div><div class='del'>-	if (!(keyidx &amp; (1 &lt;&lt; 5))) {</div><div class='add'>+	if (!(keyidx &amp; BIT(5))) {</div><div class='ctx'> 		if (net_ratelimit()) {</div><div class='ctx'> 			netdev_dbg(skb-&gt;dev, "CCMP: received packet without ExtIV flag from %pM\n",</div><div class='ctx'> 				   hdr-&gt;addr2);</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c<br/>index 829fa4bd253c..0927b2b15151 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Host AP crypt: host-based TKIP encryption implementation for Host AP driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2003-2004, Jouni Malinen &lt;jkmaline@cc.hut.fi&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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -331,7 +327,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='ctx'> 		*pos++ = rc4key[2];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pos++ = (tkey-&gt;key_idx &lt;&lt; 6) | (1 &lt;&lt; 5) /* Ext IV included */;</div><div class='add'>+	*pos++ = (tkey-&gt;key_idx &lt;&lt; 6) | BIT(5) /* Ext IV included */;</div><div class='ctx'> 	*pos++ = tkey-&gt;tx_iv32 &amp; 0xff;</div><div class='ctx'> 	*pos++ = (tkey-&gt;tx_iv32 &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	*pos++ = (tkey-&gt;tx_iv32 &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -390,7 +386,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='ctx'> 	hdr = (struct rtl_80211_hdr_4addr *) skb-&gt;data;</div><div class='ctx'> 	pos = skb-&gt;data + hdr_len;</div><div class='ctx'> 	keyidx = pos[3];</div><div class='del'>-	if (!(keyidx &amp; (1 &lt;&lt; 5))) {</div><div class='add'>+	if (!(keyidx &amp; BIT(5))) {</div><div class='ctx'> 		if (net_ratelimit()) {</div><div class='ctx'> 			printk(KERN_DEBUG "TKIP: received packet without ExtIV"</div><div class='ctx'> 			       " flag from %pM\n", hdr-&gt;addr2);</div><div class='hunk'>@@ -503,7 +499,6 @@ static int michael_mic(struct crypto_shash *tfm_michael, u8 *key, u8 *hdr,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;tfm = tfm_michael;</div><div class='del'>-	desc-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (crypto_shash_setkey(tfm_michael, key, 8))</div><div class='ctx'> 		return -1;</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c<br/>index d4a1bf0caa7a..805493a0870d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Host AP crypt: host-based WEP encryption implementation for Host AP driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002-2004, Jouni Malinen &lt;jkmaline@cc.hut.fi&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. See README and COPYING for</div><div class='del'>- * more details.</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/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c<br/>index 5147f7c01e31..0e762e559675 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Original code based Host AP (software wireless LAN access point) driver</div><div class='ctx'>  * for Intersil Prism2/2.5/3 - hostap.o module, common routines</div><div class='hunk'>@@ -6,11 +7,6 @@</div><div class='ctx'>  * &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>  * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>  * Copyright (c) 2004, Intel 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. See README and COPYING for</div><div class='del'>- * more details.</div><div class='ctx'>  ******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Few modifications for Realtek's Wi-Fi drivers by</div><div class='hunk'>@@ -151,7 +147,7 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,</div><div class='ctx'> 		 * should have already been received */</div><div class='ctx'> 		entry = ieee80211_frag_cache_find(ieee, seq, frag, tid,hdr-&gt;addr2,</div><div class='ctx'> 						  hdr-&gt;addr1);</div><div class='del'>-		if (entry != NULL) {</div><div class='add'>+		if (entry) {</div><div class='ctx'> 			entry-&gt;last_frag = frag;</div><div class='ctx'> 			skb = entry-&gt;skb;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -190,7 +186,7 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,</div><div class='ctx'> 	entry = ieee80211_frag_cache_find(ieee, seq, -1, tid, hdr-&gt;addr2,</div><div class='ctx'> 					  hdr-&gt;addr1);</div><div class='ctx'> </div><div class='del'>-	if (entry == NULL) {</div><div class='add'>+	if (!entry) {</div><div class='ctx'> 		IEEE80211_DEBUG_FRAG(</div><div class='ctx'> 			"could not invalidate fragment cache "</div><div class='ctx'> 			"entry (seq=%u)\n", seq);</div><div class='hunk'>@@ -341,7 +337,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,</div><div class='ctx'> 	struct rtl_80211_hdr_4addr *hdr;</div><div class='ctx'> 	int res, hdrlen;</div><div class='ctx'> </div><div class='del'>-	if (crypt == NULL || crypt-&gt;ops-&gt;decrypt_mpdu == NULL)</div><div class='add'>+	if (!crypt || !crypt-&gt;ops-&gt;decrypt_mpdu)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (ieee-&gt;hwsec_active)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -388,7 +384,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *s</div><div class='ctx'> 	struct rtl_80211_hdr_4addr *hdr;</div><div class='ctx'> 	int res, hdrlen;</div><div class='ctx'> </div><div class='del'>-	if (crypt == NULL || crypt-&gt;ops-&gt;decrypt_msdu == NULL)</div><div class='add'>+	if (!crypt || !crypt-&gt;ops-&gt;decrypt_msdu)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (ieee-&gt;hwsec_active)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -508,23 +504,17 @@ drop:</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool AddReorderEntry(struct rx_ts_record *pTS, PRX_REORDER_ENTRY pReorderEntry)</div><div class='add'>+static bool AddReorderEntry(struct rx_ts_record *pTS, struct rx_reorder_entry *pReorderEntry)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *pList = &amp;pTS-&gt;rx_pending_pkt_list;</div><div class='ctx'> 	while(pList-&gt;next != &amp;pTS-&gt;rx_pending_pkt_list)</div><div class='ctx'> 	{</div><div class='del'>-		if( SN_LESS(pReorderEntry-&gt;SeqNum, ((PRX_REORDER_ENTRY)list_entry(pList-&gt;next,RX_REORDER_ENTRY,List))-&gt;SeqNum) )</div><div class='del'>-		{</div><div class='add'>+		if (SN_LESS(pReorderEntry-&gt;SeqNum, list_entry(pList-&gt;next, struct rx_reorder_entry, List)-&gt;SeqNum))</div><div class='ctx'> 			pList = pList-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		else if( SN_EQUAL(pReorderEntry-&gt;SeqNum, ((PRX_REORDER_ENTRY)list_entry(pList-&gt;next,RX_REORDER_ENTRY,List))-&gt;SeqNum) )</div><div class='del'>-		{</div><div class='add'>+		else if (SN_EQUAL(pReorderEntry-&gt;SeqNum, list_entry(pList-&gt;next, struct rx_reorder_entry, List)-&gt;SeqNum))</div><div class='ctx'> 			return false;</div><div class='del'>-		}</div><div class='ctx'> 		else</div><div class='del'>-		{</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	pReorderEntry-&gt;List.next = pList-&gt;next;</div><div class='ctx'> 	pReorderEntry-&gt;List.next-&gt;prev = &amp;pReorderEntry-&gt;List;</div><div class='hunk'>@@ -589,7 +579,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,</div><div class='ctx'> 				    struct rx_ts_record *pTS, u16 SeqNum)</div><div class='ctx'> {</div><div class='ctx'> 	PRT_HIGH_THROUGHPUT	pHTInfo = ieee-&gt;pHTInfo;</div><div class='del'>-	PRX_REORDER_ENTRY	pReorderEntry = NULL;</div><div class='add'>+	struct rx_reorder_entry *pReorderEntry = NULL;</div><div class='ctx'> 	struct ieee80211_rxb **prxbIndicateArray;</div><div class='ctx'> 	u8			WinSize = pHTInfo-&gt;RxReorderWinSize;</div><div class='ctx'> 	u16			WinEnd = (pTS-&gt;rx_indicate_seq + WinSize - 1) % 4096;</div><div class='hunk'>@@ -604,9 +594,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Rx Reorder initialize condition.*/</div><div class='del'>-	if (pTS-&gt;rx_indicate_seq == 0xffff) {</div><div class='add'>+	if (pTS-&gt;rx_indicate_seq == 0xffff)</div><div class='ctx'> 		pTS-&gt;rx_indicate_seq = SeqNum;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Drop out the packet which SeqNum is smaller than WinStart */</div><div class='ctx'> 	if (SN_LESS(SeqNum, pTS-&gt;rx_indicate_seq)) {</div><div class='hunk'>@@ -663,7 +652,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,</div><div class='ctx'> 		/* Current packet is going to be inserted into pending list.*/</div><div class='ctx'> 		//IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): We RX no ordered packed, insert to ordered list\n",__func__);</div><div class='ctx'> 		if(!list_empty(&amp;ieee-&gt;RxReorder_Unused_List)) {</div><div class='del'>-			pReorderEntry = (PRX_REORDER_ENTRY)list_entry(ieee-&gt;RxReorder_Unused_List.next,RX_REORDER_ENTRY,List);</div><div class='add'>+			pReorderEntry = list_entry(ieee-&gt;RxReorder_Unused_List.next, struct rx_reorder_entry, List);</div><div class='ctx'> 			list_del_init(&amp;pReorderEntry-&gt;List);</div><div class='ctx'> </div><div class='ctx'> 			/* Make a reorder entry and insert into a the packet list.*/</div><div class='hunk'>@@ -709,7 +698,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,</div><div class='ctx'> 	/* Check if there is any packet need indicate.*/</div><div class='ctx'> 	while(!list_empty(&amp;pTS-&gt;rx_pending_pkt_list)) {</div><div class='ctx'> 		IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__);</div><div class='del'>-		pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS-&gt;rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List);</div><div class='add'>+		pReorderEntry = list_entry(pTS-&gt;rx_pending_pkt_list.prev, struct rx_reorder_entry, List);</div><div class='ctx'> 		if (SN_LESS(pReorderEntry-&gt;SeqNum, pTS-&gt;rx_indicate_seq) ||</div><div class='ctx'> 		    SN_EQUAL(pReorderEntry-&gt;SeqNum, pTS-&gt;rx_indicate_seq))</div><div class='ctx'> 		{</div><div class='hunk'>@@ -989,8 +978,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		/* allow NULL decrypt to indicate an station specific override</div><div class='ctx'> 		 * for default encryption */</div><div class='del'>-		if (crypt &amp;&amp; (crypt-&gt;ops == NULL ||</div><div class='del'>-			      crypt-&gt;ops-&gt;decrypt_mpdu == NULL))</div><div class='add'>+		if (crypt &amp;&amp; (!crypt-&gt;ops || !crypt-&gt;ops-&gt;decrypt_mpdu))</div><div class='ctx'> 			crypt = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (!crypt &amp;&amp; (fc &amp; IEEE80211_FCTL_WEP)) {</div><div class='hunk'>@@ -1291,7 +1279,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> //added by amy for reorder</div><div class='del'>-	if (!ieee-&gt;pHTInfo-&gt;bCurRxReorderEnable || pTS == NULL){</div><div class='add'>+	if (!ieee-&gt;pHTInfo-&gt;bCurRxReorderEnable || !pTS) {</div><div class='ctx'> //added by amy for reorder</div><div class='ctx'> 		for(i = 0; i&lt;rxb-&gt;nr_subframes; i++) {</div><div class='ctx'> 			struct sk_buff *sub_skb = rxb-&gt;subframes[i];</div><div class='hunk'>@@ -1427,9 +1415,9 @@ static int ieee80211_read_qos_info_element(struct</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u16 size = sizeof(struct ieee80211_qos_information_element) - 2;</div><div class='ctx'> </div><div class='del'>-	if (element_info == NULL)</div><div class='add'>+	if (!element_info)</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (info_element == NULL)</div><div class='add'>+	if (!info_element)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if ((info_element-&gt;id == QOS_ELEMENT_ID) &amp;&amp; (info_element-&gt;len == size)) {</div><div class='hunk'>@@ -2405,22 +2393,22 @@ static inline void ieee80211_process_probe_response(</div><div class='ctx'> 		"'%s' (%pM): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",</div><div class='ctx'> 		escape_essid(info_element-&gt;data, info_element-&gt;len),</div><div class='ctx'> 		beacon-&gt;header.addr3,</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0xf)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0xe)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0xd)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0xc)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0xb)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0xa)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x9)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x8)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x7)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x6)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x5)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x4)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x3)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x2)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x1)) ? '1' : '0',</div><div class='del'>-		(capability &amp; (1 &lt;&lt; 0x0)) ? '1' : '0');</div><div class='add'>+		(capability &amp; BIT(0xf)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0xe)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0xd)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0xc)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0xb)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0xa)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x9)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x8)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x7)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x6)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x5)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x4)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x3)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x2)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x1)) ? '1' : '0',</div><div class='add'>+		(capability &amp; BIT(0x0)) ? '1' : '0');</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_network_init(ieee, beacon, network, stats)) {</div><div class='ctx'> 		IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n",</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c<br/>index 8635faf84316..944c8894f9ff 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* IEEE 802.11 SoftMAC layer</div><div class='ctx'>  * Copyright (c) 2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,8 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * WPA code stolen from the ipw2200 driver.</div><div class='ctx'>  * Copyright who own it's copyright.</div><div class='del'>- *</div><div class='del'>- * released under the GPL</div><div class='ctx'>  */</div><div class='ctx'> #include "ieee80211.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c<br/>index 81020fbcdc20..aab1586fe0dd 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* IEEE 802.11 SoftMAC layer</div><div class='ctx'>  * Copyright (c) 2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,8 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * PS wx handler mostly stolen from hostap, copyright who</div><div class='ctx'>  * own it's copyright ;-)</div><div class='del'>- *</div><div class='del'>- * released under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c<br/>index 024fa2702546..8e1ec4409b4f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c</a></div><div class='hunk'>@@ -1,23 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License 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 that 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 with</div><div class='del'>- *  this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='del'>- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- *  The full GNU General Public License is included in this distribution in the</div><div class='del'>- *  file called LICENSE.</div><div class='del'>- *</div><div class='ctx'>  *  Contact Information:</div><div class='ctx'>  *  James P. Ketrenos &lt;ipw2100-admin@linux.intel.com&gt;</div><div class='ctx'>  *  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='hunk'>@@ -318,17 +303,17 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,</div><div class='ctx'> 		return;</div><div class='ctx'> 	//check packet and mode later</div><div class='ctx'> #ifdef TO_DO_LIST</div><div class='del'>-	if(pTcb-&gt;PacketLength &gt;= 4096)</div><div class='add'>+	if (pTcb-&gt;PacketLength &gt;= 4096)</div><div class='ctx'> 		return;</div><div class='ctx'> 	// For RTL819X, if pairwisekey = wep/tkip, we don't aggrregation.</div><div class='del'>-	if(!Adapter-&gt;HalFunc.GetNmodeSupportBySecCfgHandler(Adapter))</div><div class='add'>+	if (!Adapter-&gt;HalFunc.GetNmodeSupportBySecCfgHandler(Adapter))</div><div class='ctx'> 		return;</div><div class='ctx'> #endif</div><div class='del'>-	if(!ieee-&gt;GetNmodeSupportBySecCfg(ieee-&gt;dev))</div><div class='add'>+	if (!ieee-&gt;GetNmodeSupportBySecCfg(ieee-&gt;dev))</div><div class='ctx'> 	{</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if(pHTInfo-&gt;bCurrentAMPDUEnable)</div><div class='add'>+	if (pHTInfo-&gt;bCurrentAMPDUEnable)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (!GetTs(ieee, (struct ts_common_info **)(&amp;pTxTs), hdr-&gt;addr1, skb-&gt;priority, TX_DIR, true))</div><div class='ctx'> 		{</div><div class='hunk'>@@ -398,18 +383,18 @@ ieee80211_query_HTCapShortGI(struct ieee80211_device *ieee, struct cb_desc *tcb_</div><div class='ctx'> </div><div class='ctx'> 	tcb_desc-&gt;bUseShortGI		= false;</div><div class='ctx'> </div><div class='del'>-	if(!pHTInfo-&gt;bCurrentHTSupport||!pHTInfo-&gt;bEnableHT)</div><div class='add'>+	if (!pHTInfo-&gt;bCurrentHTSupport||!pHTInfo-&gt;bEnableHT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if(pHTInfo-&gt;bForcedShortGI)</div><div class='add'>+	if (pHTInfo-&gt;bForcedShortGI)</div><div class='ctx'> 	{</div><div class='ctx'> 		tcb_desc-&gt;bUseShortGI = true;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if((pHTInfo-&gt;bCurBW40MHz==true) &amp;&amp; pHTInfo-&gt;bCurShortGI40MHz)</div><div class='add'>+	if ((pHTInfo-&gt;bCurBW40MHz==true) &amp;&amp; pHTInfo-&gt;bCurShortGI40MHz)</div><div class='ctx'> 		tcb_desc-&gt;bUseShortGI = true;</div><div class='del'>-	else if((pHTInfo-&gt;bCurBW40MHz==false) &amp;&amp; pHTInfo-&gt;bCurShortGI20MHz)</div><div class='add'>+	else if ((pHTInfo-&gt;bCurBW40MHz==false) &amp;&amp; pHTInfo-&gt;bCurShortGI20MHz)</div><div class='ctx'> 		tcb_desc-&gt;bUseShortGI = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -420,13 +405,13 @@ static void ieee80211_query_BandwidthMode(struct ieee80211_device *ieee,</div><div class='ctx'> </div><div class='ctx'> 	tcb_desc-&gt;bPacketBW = false;</div><div class='ctx'> </div><div class='del'>-	if(!pHTInfo-&gt;bCurrentHTSupport||!pHTInfo-&gt;bEnableHT)</div><div class='add'>+	if (!pHTInfo-&gt;bCurrentHTSupport||!pHTInfo-&gt;bEnableHT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if(tcb_desc-&gt;bMulticast || tcb_desc-&gt;bBroadcast)</div><div class='add'>+	if (tcb_desc-&gt;bMulticast || tcb_desc-&gt;bBroadcast)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if((tcb_desc-&gt;data_rate &amp; 0x80)==0) // If using legacy rate, it shall use 20MHz channel.</div><div class='add'>+	if ((tcb_desc-&gt;data_rate &amp; 0x80)==0) // If using legacy rate, it shall use 20MHz channel.</div><div class='ctx'> 		return;</div><div class='ctx'> 	//BandWidthAutoSwitch is for auto switch to 20 or 40 in long distance</div><div class='ctx'> 	if(pHTInfo-&gt;bCurBW40MHz &amp;&amp; pHTInfo-&gt;bCurTxBW40MHz &amp;&amp; !ieee-&gt;bandwidth_auto_switch.bforced_tx20Mhz)</div><div class='hunk'>@@ -851,7 +836,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		  else</div><div class='ctx'> 			ieee-&gt;seq_ctrl[0]++;</div><div class='ctx'> 		}</div><div class='del'>-	}else{</div><div class='add'>+	} else {</div><div class='ctx'> 		if (unlikely(skb-&gt;len &lt; sizeof(struct rtl_80211_hdr_3addr))) {</div><div class='ctx'> 			printk(KERN_WARNING "%s: skb too small (%d).\n",</div><div class='ctx'> 			ieee-&gt;dev-&gt;name, skb-&gt;len);</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c<br/>index fa59c712c74b..dead134f6de0 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   Copyright(c) 2004 Intel Corporation. All rights reserved.</div><div class='hunk'>@@ -8,22 +9,6 @@</div><div class='ctx'>   &lt;jkmaline@cc.hut.fi&gt;</div><div class='ctx'>   Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</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 version 2 of the GNU General Public License 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 that 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 with</div><div class='del'>-  this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='del'>-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='del'>-</div><div class='del'>-  The full GNU General Public License is included in this distribution in the</div><div class='del'>-  file called LICENSE.</div><div class='del'>-</div><div class='ctx'>   Contact Information:</div><div class='ctx'>   James P. Ketrenos &lt;ipw2100-admin@linux.intel.com&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='hunk'>@@ -86,7 +71,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,</div><div class='ctx'> 	/* Add the protocol name */</div><div class='ctx'> 	iwe.cmd = SIOCGIWNAME;</div><div class='ctx'> 	for(i=0; i&lt;ARRAY_SIZE(ieee80211_modes); i++) {</div><div class='del'>-		if(network-&gt;mode&amp;(1&lt;&lt;i)) {</div><div class='add'>+		if (network-&gt;mode &amp; BIT(i)) {</div><div class='ctx'> 			sprintf(pname,ieee80211_modes[i].mode_string,ieee80211_modes[i].mode_size);</div><div class='ctx'> 			pname +=ieee80211_modes[i].mode_size;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -195,7 +180,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,</div><div class='ctx'> 	if (iwe.u.data.length)</div><div class='ctx'> 	    start = iwe_stream_add_point(info, start, stop, &amp;iwe, custom);</div><div class='ctx'> </div><div class='del'>-	if (ieee-&gt;wpa_enabled &amp;&amp; network-&gt;wpa_ie_len){</div><div class='add'>+	if (ieee-&gt;wpa_enabled &amp;&amp; network-&gt;wpa_ie_len) {</div><div class='ctx'> 		char buf[MAX_WPA_IE_LEN * 2 + 30];</div><div class='ctx'> 	//	printk("WPA IE\n");</div><div class='ctx'> 		u8 *p = buf;</div><div class='hunk'>@@ -210,7 +195,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,</div><div class='ctx'> 		start = iwe_stream_add_point(info, start, stop, &amp;iwe, buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ieee-&gt;wpa_enabled &amp;&amp; network-&gt;rsn_ie_len){</div><div class='add'>+	if (ieee-&gt;wpa_enabled &amp;&amp; network-&gt;rsn_ie_len) {</div><div class='ctx'> 		char buf[MAX_WPA_IE_LEN * 2 + 30];</div><div class='ctx'> </div><div class='ctx'> 		u8 *p = buf;</div><div class='hunk'>@@ -394,9 +379,10 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,</div><div class='ctx'> 		sec.key_sizes[key] = len;</div><div class='ctx'> 		(*crypt)-&gt;ops-&gt;set_key(sec.keys[key], len, NULL,</div><div class='ctx'> 				       (*crypt)-&gt;priv);</div><div class='del'>-		sec.flags |= (1 &lt;&lt; key);</div><div class='add'>+		sec.flags |= BIT(key);</div><div class='ctx'> 		/* This ensures a key will be activated if no key is</div><div class='del'>-		 * explicitely set */</div><div class='add'>+		 * explicitly set</div><div class='add'>+		 */</div><div class='ctx'> 		if (key == sec.active_key)</div><div class='ctx'> 			sec.flags |= SEC_ACTIVE_KEY;</div><div class='ctx'> 		ieee-&gt;tx_keyidx = key;</div><div class='hunk'>@@ -415,7 +401,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,</div><div class='ctx'> 			(*crypt)-&gt;ops-&gt;set_key(sec.keys[key], 13, NULL,</div><div class='ctx'> 					       (*crypt)-&gt;priv);</div><div class='ctx'> 			sec.key_sizes[key] = 13;</div><div class='del'>-			sec.flags |= (1 &lt;&lt; key);</div><div class='add'>+			sec.flags |= BIT(key);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* No key data - just set the default TX key index */</div><div class='hunk'>@@ -636,7 +622,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,</div><div class='ctx'> 	if (ext-&gt;alg != IW_ENCODE_ALG_NONE) {</div><div class='ctx'> 		//memcpy(sec.keys[idx], ext-&gt;key, ext-&gt;key_len);</div><div class='ctx'> 		sec.key_sizes[idx] = ext-&gt;key_len;</div><div class='del'>-		sec.flags |= (1 &lt;&lt; idx);</div><div class='add'>+		sec.flags |= BIT(idx);</div><div class='ctx'> 		if (ext-&gt;alg == IW_ENCODE_ALG_WEP) {</div><div class='ctx'> 		      //  sec.encode_alg[idx] = SEC_ALG_WEP;</div><div class='ctx'> 			sec.flags |= SEC_LEVEL;</div><div class='hunk'>@@ -766,15 +752,13 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,</div><div class='ctx'> 	case IW_AUTH_80211_AUTH_ALG:</div><div class='ctx'> 		//printk("======&gt;%s():data-&gt;value is %d\n",__func__,data-&gt;value);</div><div class='ctx'> 	//	ieee-&gt;open_wep = (data-&gt;value&amp;IW_AUTH_ALG_OPEN_SYSTEM)?1:0;</div><div class='del'>-		if(data-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY){</div><div class='add'>+		if (data-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY) {</div><div class='ctx'> 			ieee-&gt;open_wep = 0;</div><div class='ctx'> 			ieee-&gt;auth_mode = 1;</div><div class='del'>-		}</div><div class='del'>-		else if(data-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM){</div><div class='add'>+		} else if (data-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM) {</div><div class='ctx'> 			ieee-&gt;open_wep = 1;</div><div class='ctx'> 			ieee-&gt;auth_mode = 0;</div><div class='del'>-		}</div><div class='del'>-		else if(data-&gt;value &amp; IW_AUTH_ALG_LEAP){</div><div class='add'>+		} else if (data-&gt;value &amp; IW_AUTH_ALG_LEAP) {</div><div class='ctx'> 			ieee-&gt;open_wep = 1;</div><div class='ctx'> 			ieee-&gt;auth_mode = 2;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c<br/>index 109445407cec..53869b3c985c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c</a></div><div class='hunk'>@@ -108,7 +108,7 @@ void ResetBaEntry(struct ba_record *pBA)</div><div class='ctx'> static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, struct ba_record *pBA, u16 StatusCode, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	 struct rtl_80211_hdr_3addr *BAReq = NULL;</div><div class='add'>+	struct rtl_80211_hdr_3addr *BAReq = NULL;</div><div class='ctx'> 	u8 *tag = NULL;</div><div class='ctx'> 	u16 len = ieee-&gt;tx_headroom + 9;</div><div class='ctx'> 	//category(1) + action field(1) + Dialog Token(1) + BA Parameter Set(2) +  BA Timeout Value(2) +  BA Start SeqCtrl(2)(or StatusCode(2))</div><div class='hunk'>@@ -118,10 +118,8 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, s</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	skb = dev_alloc_skb(len + sizeof(struct rtl_80211_hdr_3addr)); //need to add something others? FIXME</div><div class='del'>-	if (!skb) {</div><div class='del'>-		IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc skb for ADDBA_REQ\n");</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memset(skb-&gt;data, 0, sizeof(struct rtl_80211_hdr_3addr));	//I wonder whether it's necessary. Apparently kernel will not do it when alloc a skb.</div><div class='ctx'> 	skb_reserve(skb, ieee-&gt;tx_headroom);</div><div class='hunk'>@@ -189,7 +187,7 @@ static struct sk_buff *ieee80211_DELBA(</div><div class='ctx'> {</div><div class='ctx'> 	union delba_param_set	DelbaParamSet;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	 struct rtl_80211_hdr_3addr *Delba = NULL;</div><div class='add'>+	struct rtl_80211_hdr_3addr *Delba = NULL;</div><div class='ctx'> 	u8 *tag = NULL;</div><div class='ctx'> 	//len = head len + DELBA Parameter Set(2) + Reason Code(2)</div><div class='ctx'> 	u16 len = 6 + ieee-&gt;tx_headroom;</div><div class='hunk'>@@ -205,10 +203,8 @@ static struct sk_buff *ieee80211_DELBA(</div><div class='ctx'> 	DelbaParamSet.field.tid	= pBA-&gt;param_set.field.tid;</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(len + sizeof(struct rtl_80211_hdr_3addr)); //need to add something others? FIXME</div><div class='del'>-	if (!skb) {</div><div class='del'>-		IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc skb for ADDBA_REQ\n");</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> //	memset(skb-&gt;data, 0, len+sizeof( struct rtl_80211_hdr_3addr));</div><div class='ctx'> 	skb_reserve(skb, ieee-&gt;tx_headroom);</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +314,7 @@ static void ieee80211_send_DELBA(struct ieee80211_device *ieee, u8 *dst,</div><div class='ctx'>  ********************************************************************************************************************/</div><div class='ctx'> int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	 struct rtl_80211_hdr_3addr *req = NULL;</div><div class='add'>+	struct rtl_80211_hdr_3addr *req = NULL;</div><div class='ctx'> 	u16 rc = 0;</div><div class='ctx'> 	u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;</div><div class='ctx'> 	struct ba_record *pBA = NULL;</div><div class='hunk'>@@ -388,9 +384,9 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)</div><div class='ctx'> 	pBA-&gt;start_seq_ctrl = *pBaStartSeqCtrl;</div><div class='ctx'> 	//for half N mode we only aggregate 1 frame</div><div class='ctx'> 	if (ieee-&gt;GetHalfNmodeSupportByAPsHandler(ieee-&gt;dev))</div><div class='del'>-	pBA-&gt;param_set.field.buffer_size = 1;</div><div class='add'>+		pBA-&gt;param_set.field.buffer_size = 1;</div><div class='ctx'> 	else</div><div class='del'>-	pBA-&gt;param_set.field.buffer_size = 32;</div><div class='add'>+		pBA-&gt;param_set.field.buffer_size = 32;</div><div class='ctx'> 	ActivateBAEntry(ieee, pBA, pBA-&gt;timeout_value);</div><div class='ctx'> 	ieee80211_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS);</div><div class='ctx'> </div><div class='hunk'>@@ -418,7 +414,7 @@ OnADDBAReq_Fail:</div><div class='ctx'>  ********************************************************************************************************************/</div><div class='ctx'> int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	 struct rtl_80211_hdr_3addr *rsp = NULL;</div><div class='add'>+	struct rtl_80211_hdr_3addr *rsp = NULL;</div><div class='ctx'> 	struct ba_record        *pPendingBA, *pAdmittedBA;</div><div class='ctx'> 	struct tx_ts_record     *pTS = NULL;</div><div class='ctx'> 	u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;</div><div class='hunk'>@@ -542,7 +538,7 @@ OnADDBARsp_Reject:</div><div class='ctx'>  ********************************************************************************************************************/</div><div class='ctx'> int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	 struct rtl_80211_hdr_3addr *delba = NULL;</div><div class='add'>+	struct rtl_80211_hdr_3addr *delba = NULL;</div><div class='ctx'> 	union delba_param_set   *pDelBaParamSet = NULL;</div><div class='ctx'> 	u8			*dst = NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h<br/>index 64d5359cf7e2..b7769bca9740 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h</a></div><div class='hunk'>@@ -107,13 +107,13 @@ typedef struct _HT_INFORMATION_ELE {</div><div class='ctx'> typedef enum _HT_SPEC_VER {</div><div class='ctx'> 	HT_SPEC_VER_IEEE = 0,</div><div class='ctx'> 	HT_SPEC_VER_EWC = 1,</div><div class='del'>-}HT_SPEC_VER, *PHT_SPEC_VER;</div><div class='add'>+} HT_SPEC_VER, *PHT_SPEC_VER;</div><div class='ctx'> </div><div class='ctx'> typedef enum _HT_AGGRE_MODE_E {</div><div class='ctx'> 	HT_AGG_AUTO = 0,</div><div class='ctx'> 	HT_AGG_FORCE_ENABLE = 1,</div><div class='ctx'> 	HT_AGG_FORCE_DISABLE = 2,</div><div class='del'>-}HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;</div><div class='add'>+} HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  The Data structure is used to keep HT related variables when card is</div><div class='head'>diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c<br/>index c76715ffa08b..7cac668bfb0b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ static void RxPktPendingTimeout(struct timer_list *t)</div><div class='ctx'> 	struct rx_ts_record     *pRxTs = from_timer(pRxTs, t, rx_pkt_pending_timer);</div><div class='ctx'> 	struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs-&gt;num]);</div><div class='ctx'> </div><div class='del'>-	PRX_REORDER_ENTRY	pReorderEntry = NULL;</div><div class='add'>+	struct rx_reorder_entry	*pReorderEntry = NULL;</div><div class='ctx'> </div><div class='ctx'> 	//u32 flags = 0;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='hunk'>@@ -37,18 +37,18 @@ static void RxPktPendingTimeout(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;(ieee-&gt;reorder_spinlock), flags);</div><div class='ctx'> 	IEEE80211_DEBUG(IEEE80211_DL_REORDER, "==================&gt;%s()\n", __func__);</div><div class='del'>-	if(pRxTs-&gt;rx_timeout_indicate_seq != 0xffff) {</div><div class='add'>+	if (pRxTs-&gt;rx_timeout_indicate_seq != 0xffff) {</div><div class='ctx'> 		// Indicate the pending packets sequentially according to SeqNum until meet the gap.</div><div class='del'>-		while(!list_empty(&amp;pRxTs-&gt;rx_pending_pkt_list)) {</div><div class='del'>-			pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs-&gt;rx_pending_pkt_list.prev, RX_REORDER_ENTRY, List);</div><div class='del'>-			if(index == 0)</div><div class='add'>+		while (!list_empty(&amp;pRxTs-&gt;rx_pending_pkt_list)) {</div><div class='add'>+			pReorderEntry = list_entry(pRxTs-&gt;rx_pending_pkt_list.prev, struct rx_reorder_entry, List);</div><div class='add'>+			if (index == 0)</div><div class='ctx'> 				pRxTs-&gt;rx_indicate_seq = pReorderEntry-&gt;SeqNum;</div><div class='ctx'> </div><div class='del'>-			if( SN_LESS(pReorderEntry-&gt;SeqNum, pRxTs-&gt;rx_indicate_seq) ||</div><div class='del'>-				SN_EQUAL(pReorderEntry-&gt;SeqNum, pRxTs-&gt;rx_indicate_seq)	) {</div><div class='add'>+			if (SN_LESS(pReorderEntry-&gt;SeqNum, pRxTs-&gt;rx_indicate_seq) ||</div><div class='add'>+				SN_EQUAL(pReorderEntry-&gt;SeqNum, pRxTs-&gt;rx_indicate_seq)) {</div><div class='ctx'> 				list_del_init(&amp;pReorderEntry-&gt;List);</div><div class='ctx'> </div><div class='del'>-				if(SN_EQUAL(pReorderEntry-&gt;SeqNum, pRxTs-&gt;rx_indicate_seq))</div><div class='add'>+				if (SN_EQUAL(pReorderEntry-&gt;SeqNum, pRxTs-&gt;rx_indicate_seq))</div><div class='ctx'> 					pRxTs-&gt;rx_indicate_seq = (pRxTs-&gt;rx_indicate_seq + 1) % 4096;</div><div class='ctx'> </div><div class='ctx'> 				IEEE80211_DEBUG(IEEE80211_DL_REORDER, "RxPktPendingTimeout(): IndicateSeq: %d\n", pReorderEntry-&gt;SeqNum);</div><div class='hunk'>@@ -63,12 +63,12 @@ static void RxPktPendingTimeout(struct timer_list *t)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(index&gt;0) {</div><div class='add'>+	if (index &gt; 0) {</div><div class='ctx'> 		// Set rx_timeout_indicate_seq to 0xffff to indicate no pending packets in buffer now.</div><div class='ctx'> 		pRxTs-&gt;rx_timeout_indicate_seq = 0xffff;</div><div class='ctx'> </div><div class='ctx'> 		// Indicate packets</div><div class='del'>-		if(index &gt; REORDER_WIN_SIZE) {</div><div class='add'>+		if (index &gt; REORDER_WIN_SIZE) {</div><div class='ctx'> 			IEEE80211_DEBUG(IEEE80211_DL_ERR, "RxReorderIndicatePacket(): Rx Reorder buffer full!! \n");</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;(ieee-&gt;reorder_spinlock), flags);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -76,7 +76,7 @@ static void RxPktPendingTimeout(struct timer_list *t)</div><div class='ctx'> 		ieee80211_indicate_packets(ieee, ieee-&gt;stats_IndicateArray, index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(bPktInBuf &amp;&amp; (pRxTs-&gt;rx_timeout_indicate_seq == 0xffff)) {</div><div class='add'>+	if (bPktInBuf &amp;&amp; (pRxTs-&gt;rx_timeout_indicate_seq == 0xffff)) {</div><div class='ctx'> 		pRxTs-&gt;rx_timeout_indicate_seq = pRxTs-&gt;rx_indicate_seq;</div><div class='ctx'> 		mod_timer(&amp;pRxTs-&gt;rx_pkt_pending_timer,</div><div class='ctx'> 			  jiffies + msecs_to_jiffies(ieee-&gt;pHTInfo-&gt;RxReorderPendingTime));</div><div class='hunk'>@@ -133,7 +133,7 @@ void TSInitialize(struct ieee80211_device *ieee)</div><div class='ctx'> {</div><div class='ctx'> 	struct tx_ts_record     *pTxTS  = ieee-&gt;TxTsRecord;</div><div class='ctx'> 	struct rx_ts_record     *pRxTS  = ieee-&gt;RxTsRecord;</div><div class='del'>-	PRX_REORDER_ENTRY	pRxReorderEntry = ieee-&gt;RxReorderEntry;</div><div class='add'>+	struct rx_reorder_entry	*pRxReorderEntry = ieee-&gt;RxReorderEntry;</div><div class='ctx'> 	u8				count = 0;</div><div class='ctx'> 	IEEE80211_DEBUG(IEEE80211_DL_TS, "==========&gt;%s()\n", __func__);</div><div class='ctx'> 	// Initialize Tx TS related info.</div><div class='hunk'>@@ -141,7 +141,7 @@ void TSInitialize(struct ieee80211_device *ieee)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ieee-&gt;Tx_TS_Pending_List);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ieee-&gt;Tx_TS_Unused_List);</div><div class='ctx'> </div><div class='del'>-	for(count = 0; count &lt; TOTAL_TS_NUM; count++) {</div><div class='add'>+	for (count = 0; count &lt; TOTAL_TS_NUM; count++) {</div><div class='ctx'> 		//</div><div class='ctx'> 		pTxTS-&gt;num = count;</div><div class='ctx'> 		// The timers for the operation of Traffic Stream and Block Ack.</div><div class='hunk'>@@ -164,7 +164,7 @@ void TSInitialize(struct ieee80211_device *ieee)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ieee-&gt;Rx_TS_Admit_List);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ieee-&gt;Rx_TS_Pending_List);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ieee-&gt;Rx_TS_Unused_List);</div><div class='del'>-	for(count = 0; count &lt; TOTAL_TS_NUM; count++) {</div><div class='add'>+	for (count = 0; count &lt; TOTAL_TS_NUM; count++) {</div><div class='ctx'> 		pRxTS-&gt;num = count;</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;pRxTS-&gt;rx_pending_pkt_list);</div><div class='ctx'> 		timer_setup(&amp;pRxTS-&gt;ts_common_info.setup_timer, TsSetupTimeOut,</div><div class='hunk'>@@ -181,9 +181,9 @@ void TSInitialize(struct ieee80211_device *ieee)</div><div class='ctx'> 	// Initialize unused Rx Reorder List.</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ieee-&gt;RxReorder_Unused_List);</div><div class='ctx'> //#ifdef TO_DO_LIST</div><div class='del'>-	for(count = 0; count &lt; REORDER_ENTRY_NUM; count++) {</div><div class='del'>-		list_add_tail( &amp;pRxReorderEntry-&gt;List,&amp;ieee-&gt;RxReorder_Unused_List);</div><div class='del'>-		if(count == (REORDER_ENTRY_NUM-1))</div><div class='add'>+	for (count = 0; count &lt; REORDER_ENTRY_NUM; count++) {</div><div class='add'>+		list_add_tail(&amp;pRxReorderEntry-&gt;List, &amp;ieee-&gt;RxReorder_Unused_List);</div><div class='add'>+		if (count == (REORDER_ENTRY_NUM-1))</div><div class='ctx'> 			break;</div><div class='ctx'> 		pRxReorderEntry = &amp;ieee-&gt;RxReorderEntry[count+1];</div><div class='ctx'> 	}</div><div class='hunk'>@@ -196,7 +196,7 @@ static void AdmitTS(struct ieee80211_device *ieee,</div><div class='ctx'> 	del_timer_sync(&amp;pTsCommonInfo-&gt;setup_timer);</div><div class='ctx'> 	del_timer_sync(&amp;pTsCommonInfo-&gt;inact_timer);</div><div class='ctx'> </div><div class='del'>-	if(InactTime!=0)</div><div class='add'>+	if (InactTime != 0)</div><div class='ctx'> 		mod_timer(&amp;pTsCommonInfo-&gt;inact_timer,</div><div class='ctx'> 			  jiffies + msecs_to_jiffies(InactTime));</div><div class='ctx'> }</div><div class='hunk'>@@ -211,54 +211,54 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,</div><div class='ctx'> 	bool				search_dir[4] = {0};</div><div class='ctx'> 	struct list_head		*psearch_list; //FIXME</div><div class='ctx'> 	struct ts_common_info	*pRet = NULL;</div><div class='del'>-	if(ieee-&gt;iw_mode == IW_MODE_MASTER) { //ap mode</div><div class='del'>-		if(TxRxSelect == TX_DIR) {</div><div class='add'>+	if (ieee-&gt;iw_mode == IW_MODE_MASTER) { //ap mode</div><div class='add'>+		if (TxRxSelect == TX_DIR) {</div><div class='ctx'> 			search_dir[DIR_DOWN] = true;</div><div class='del'>-			search_dir[DIR_BI_DIR]= true;</div><div class='add'>+			search_dir[DIR_BI_DIR] = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			search_dir[DIR_UP]	= true;</div><div class='del'>-			search_dir[DIR_BI_DIR]= true;</div><div class='add'>+			search_dir[DIR_BI_DIR] = true;</div><div class='ctx'> 		}</div><div class='del'>-	} else if(ieee-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='del'>-		if(TxRxSelect == TX_DIR)</div><div class='add'>+	} else if (ieee-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='add'>+		if (TxRxSelect == TX_DIR)</div><div class='ctx'> 			search_dir[DIR_UP]	= true;</div><div class='ctx'> 		else</div><div class='ctx'> 			search_dir[DIR_DOWN] = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		if(TxRxSelect == TX_DIR) {</div><div class='add'>+		if (TxRxSelect == TX_DIR) {</div><div class='ctx'> 			search_dir[DIR_UP]	= true;</div><div class='del'>-			search_dir[DIR_BI_DIR]= true;</div><div class='del'>-			search_dir[DIR_DIRECT]= true;</div><div class='add'>+			search_dir[DIR_BI_DIR] = true;</div><div class='add'>+			search_dir[DIR_DIRECT] = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			search_dir[DIR_DOWN] = true;</div><div class='del'>-			search_dir[DIR_BI_DIR]= true;</div><div class='del'>-			search_dir[DIR_DIRECT]= true;</div><div class='add'>+			search_dir[DIR_BI_DIR] = true;</div><div class='add'>+			search_dir[DIR_DIRECT] = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(TxRxSelect == TX_DIR)</div><div class='add'>+	if (TxRxSelect == TX_DIR)</div><div class='ctx'> 		psearch_list = &amp;ieee-&gt;Tx_TS_Admit_List;</div><div class='ctx'> 	else</div><div class='ctx'> 		psearch_list = &amp;ieee-&gt;Rx_TS_Admit_List;</div><div class='ctx'> </div><div class='ctx'> 	//for(dir = DIR_UP; dir &lt;= DIR_BI_DIR; dir++)</div><div class='del'>-	for(dir = 0; dir &lt;= DIR_BI_DIR; dir++) {</div><div class='add'>+	for (dir = 0; dir &lt;= DIR_BI_DIR; dir++) {</div><div class='ctx'> 		if (!search_dir[dir])</div><div class='ctx'> 			continue;</div><div class='del'>-		list_for_each_entry(pRet, psearch_list, list){</div><div class='add'>+		list_for_each_entry(pRet, psearch_list, list) {</div><div class='ctx'> 	//		IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet-&gt;Addr, pRet-&gt;TSpec.ts_info.ucTSID, pRet-&gt;TSpec.ts_info.ucDirection);</div><div class='ctx'> 			if (memcmp(pRet-&gt;addr, Addr, 6) == 0)</div><div class='ctx'> 				if (pRet-&gt;t_spec.ts_info.uc_tsid == TID)</div><div class='del'>-					if(pRet-&gt;t_spec.ts_info.uc_direction == dir) {</div><div class='add'>+					if (pRet-&gt;t_spec.ts_info.uc_direction == dir) {</div><div class='ctx'> 	//					printk("Bingo! got it\n");</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='ctx'> 		}</div><div class='del'>-		if(&amp;pRet-&gt;list  != psearch_list)</div><div class='add'>+		if (&amp;pRet-&gt;list  != psearch_list)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(&amp;pRet-&gt;list  != psearch_list)</div><div class='add'>+	if (&amp;pRet-&gt;list  != psearch_list)</div><div class='ctx'> 		return pRet ;</div><div class='ctx'> 	else</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -270,15 +270,15 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,</div><div class='ctx'> {</div><div class='ctx'> 	u8	count;</div><div class='ctx'> </div><div class='del'>-	if(pTsCommonInfo == NULL)</div><div class='add'>+	if (pTsCommonInfo == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(pTsCommonInfo-&gt;addr, Addr, 6);</div><div class='ctx'> </div><div class='del'>-	if(pTSPEC != NULL)</div><div class='add'>+	if (pTSPEC != NULL)</div><div class='ctx'> 		memcpy((u8 *)(&amp;(pTsCommonInfo-&gt;t_spec)), (u8 *)pTSPEC, sizeof(struct tspec_body));</div><div class='ctx'> </div><div class='del'>-	for(count = 0; count &lt; TCLAS_Num; count++)</div><div class='add'>+	for (count = 0; count &lt; TCLAS_Num; count++)</div><div class='ctx'> 		memcpy((u8 *)(&amp;(pTsCommonInfo-&gt;t_class[count])), (u8 *)pTCLAS, sizeof(union qos_tclas));</div><div class='ctx'> </div><div class='ctx'> 	pTsCommonInfo-&gt;t_clas_proc = TCLAS_Proc;</div><div class='hunk'>@@ -342,7 +342,7 @@ bool GetTs(</div><div class='ctx'> 			Addr,</div><div class='ctx'> 			UP,</div><div class='ctx'> 			TxRxSelect);</div><div class='del'>-	if(*ppTS != NULL) {</div><div class='add'>+	if (*ppTS != NULL) {</div><div class='ctx'> 		return true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!bAddNewTs) {</div><div class='hunk'>@@ -357,23 +357,23 @@ bool GetTs(</div><div class='ctx'> 			struct tspec_body	TSpec;</div><div class='ctx'> 			struct qos_tsinfo	*pTSInfo = &amp;TSpec.ts_info;</div><div class='ctx'> 			struct list_head	*pUnusedList =</div><div class='del'>-								(TxRxSelect == TX_DIR)?</div><div class='del'>-								(&amp;ieee-&gt;Tx_TS_Unused_List):</div><div class='add'>+								(TxRxSelect == TX_DIR) ?</div><div class='add'>+								(&amp;ieee-&gt;Tx_TS_Unused_List) :</div><div class='ctx'> 								(&amp;ieee-&gt;Rx_TS_Unused_List);</div><div class='ctx'> </div><div class='ctx'> 			struct list_head	*pAddmitList =</div><div class='del'>-								(TxRxSelect == TX_DIR)?</div><div class='del'>-								(&amp;ieee-&gt;Tx_TS_Admit_List):</div><div class='add'>+								(TxRxSelect == TX_DIR) ?</div><div class='add'>+								(&amp;ieee-&gt;Tx_TS_Admit_List) :</div><div class='ctx'> 								(&amp;ieee-&gt;Rx_TS_Admit_List);</div><div class='ctx'> </div><div class='del'>-			enum direction_value	Dir =		(ieee-&gt;iw_mode == IW_MODE_MASTER)?</div><div class='del'>-								((TxRxSelect==TX_DIR)?DIR_DOWN:DIR_UP):</div><div class='del'>-								((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN);</div><div class='add'>+			enum direction_value	Dir =		(ieee-&gt;iw_mode == IW_MODE_MASTER) ?</div><div class='add'>+								((TxRxSelect == TX_DIR)?DIR_DOWN:DIR_UP) :</div><div class='add'>+								((TxRxSelect == TX_DIR)?DIR_UP:DIR_DOWN);</div><div class='ctx'> 			IEEE80211_DEBUG(IEEE80211_DL_TS, "to add Ts\n");</div><div class='del'>-			if(!list_empty(pUnusedList)) {</div><div class='add'>+			if (!list_empty(pUnusedList)) {</div><div class='ctx'> 				(*ppTS) = list_entry(pUnusedList-&gt;next, struct ts_common_info, list);</div><div class='ctx'> 				list_del_init(&amp;(*ppTS)-&gt;list);</div><div class='del'>-				if(TxRxSelect==TX_DIR) {</div><div class='add'>+				if (TxRxSelect == TX_DIR) {</div><div class='ctx'> 					struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, ts_common_info);</div><div class='ctx'> 					ResetTxTsEntry(tmp);</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -416,17 +416,17 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *</div><div class='ctx'> 	del_timer_sync(&amp;pTs-&gt;inact_timer);</div><div class='ctx'> 	TsInitDelBA(ieee, pTs, TxRxSelect);</div><div class='ctx'> </div><div class='del'>-	if(TxRxSelect == RX_DIR) {</div><div class='add'>+	if (TxRxSelect == RX_DIR) {</div><div class='ctx'> //#ifdef TO_DO_LIST</div><div class='del'>-		PRX_REORDER_ENTRY	pRxReorderEntry;</div><div class='add'>+		struct rx_reorder_entry	*pRxReorderEntry;</div><div class='ctx'> 		struct rx_ts_record     *pRxTS = (struct rx_ts_record *)pTs;</div><div class='del'>-		if(timer_pending(&amp;pRxTS-&gt;rx_pkt_pending_timer))</div><div class='add'>+		if (timer_pending(&amp;pRxTS-&gt;rx_pkt_pending_timer))</div><div class='ctx'> 			del_timer_sync(&amp;pRxTS-&gt;rx_pkt_pending_timer);</div><div class='ctx'> </div><div class='del'>-		while(!list_empty(&amp;pRxTS-&gt;rx_pending_pkt_list)) {</div><div class='add'>+		while (!list_empty(&amp;pRxTS-&gt;rx_pending_pkt_list)) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;(ieee-&gt;reorder_spinlock), flags);</div><div class='ctx'> 			//pRxReorderEntry = list_entry(&amp;pRxTS-&gt;rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List);</div><div class='del'>-			pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTS-&gt;rx_pending_pkt_list.prev, RX_REORDER_ENTRY, List);</div><div class='add'>+			pRxReorderEntry = list_entry(pRxTS-&gt;rx_pending_pkt_list.prev, struct rx_reorder_entry, List);</div><div class='ctx'> 			list_del_init(&amp;pRxReorderEntry-&gt;List);</div><div class='ctx'> 			{</div><div class='ctx'> 				int i = 0;</div><div class='hunk'>@@ -435,13 +435,13 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *</div><div class='ctx'> 					spin_unlock_irqrestore(&amp;(ieee-&gt;reorder_spinlock), flags);</div><div class='ctx'> 					return;</div><div class='ctx'> 				}</div><div class='del'>-				for(i =0; i &lt; prxb-&gt;nr_subframes; i++)</div><div class='add'>+				for (i =  0; i &lt; prxb-&gt;nr_subframes; i++)</div><div class='ctx'> 					dev_kfree_skb(prxb-&gt;subframes[i]);</div><div class='ctx'> </div><div class='ctx'> 				kfree(prxb);</div><div class='ctx'> 				prxb = NULL;</div><div class='ctx'> 			}</div><div class='del'>-			list_add_tail(&amp;pRxReorderEntry-&gt;List,&amp;ieee-&gt;RxReorder_Unused_List);</div><div class='add'>+			list_add_tail(&amp;pRxReorderEntry-&gt;List, &amp;ieee-&gt;RxReorder_Unused_List);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;(ieee-&gt;reorder_spinlock), flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -522,9 +522,9 @@ void RemoveAllTS(struct ieee80211_device *ieee)</div><div class='ctx'> </div><div class='ctx'> void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTxTS)</div><div class='ctx'> {</div><div class='del'>-	if(!pTxTS-&gt;add_ba_req_in_progress) {</div><div class='add'>+	if (!pTxTS-&gt;add_ba_req_in_progress) {</div><div class='ctx'> 		pTxTS-&gt;add_ba_req_in_progress = true;</div><div class='del'>-		if(pTxTS-&gt;add_ba_req_delayed)	{</div><div class='add'>+		if (pTxTS-&gt;add_ba_req_delayed)	{</div><div class='ctx'> 			IEEE80211_DEBUG(IEEE80211_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");</div><div class='ctx'> 			mod_timer(&amp;pTxTS-&gt;ts_add_ba_timer,</div><div class='ctx'> 				  jiffies + msecs_to_jiffies(TS_ADDBA_DELAY));</div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8180_93cx6.c b/drivers/staging/rtl8192u/r8180_93cx6.c<br/>index c414efc0662e..de83daa0c9ed 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8180_93cx6.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8180_93cx6.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8180_93cx6.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8180_93cx6.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  *  This files contains card eeprom (93c46 or 93c56) programming routines,</div><div class='ctx'>  *  memory is addressed by 16 bits words.</div><div class='ctx'>  *</div><div class='ctx'>  *  This is part of rtl8180 OpenSource driver.</div><div class='ctx'>  *  Copyright (C) Andrea Merello 2004  &lt;andrea.merello@gmail.com&gt;</div><div class='del'>- *  Released under the terms of GPL (General Public Licence)</div><div class='ctx'>  *</div><div class='ctx'>  *  Parts of this driver are based on the GPL part of the</div><div class='ctx'>  *  official realtek driver.</div><div class='hunk'>@@ -125,21 +125,21 @@ int eprom_read(struct net_device *dev, u32 addr)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;epromtype == EPROM_93c56) {</div><div class='ctx'> 		addr_str[7] = addr &amp; 1;</div><div class='del'>-		addr_str[6] = addr &amp; (1&lt;&lt;1);</div><div class='del'>-		addr_str[5] = addr &amp; (1&lt;&lt;2);</div><div class='del'>-		addr_str[4] = addr &amp; (1&lt;&lt;3);</div><div class='del'>-		addr_str[3] = addr &amp; (1&lt;&lt;4);</div><div class='del'>-		addr_str[2] = addr &amp; (1&lt;&lt;5);</div><div class='del'>-		addr_str[1] = addr &amp; (1&lt;&lt;6);</div><div class='del'>-		addr_str[0] = addr &amp; (1&lt;&lt;7);</div><div class='add'>+		addr_str[6] = addr &amp; BIT(1);</div><div class='add'>+		addr_str[5] = addr &amp; BIT(2);</div><div class='add'>+		addr_str[4] = addr &amp; BIT(3);</div><div class='add'>+		addr_str[3] = addr &amp; BIT(4);</div><div class='add'>+		addr_str[2] = addr &amp; BIT(5);</div><div class='add'>+		addr_str[1] = addr &amp; BIT(6);</div><div class='add'>+		addr_str[0] = addr &amp; BIT(7);</div><div class='ctx'> 		addr_len = 8;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		addr_str[5] = addr &amp; 1;</div><div class='del'>-		addr_str[4] = addr &amp; (1&lt;&lt;1);</div><div class='del'>-		addr_str[3] = addr &amp; (1&lt;&lt;2);</div><div class='del'>-		addr_str[2] = addr &amp; (1&lt;&lt;3);</div><div class='del'>-		addr_str[1] = addr &amp; (1&lt;&lt;4);</div><div class='del'>-		addr_str[0] = addr &amp; (1&lt;&lt;5);</div><div class='add'>+		addr_str[4] = addr &amp; BIT(1);</div><div class='add'>+		addr_str[3] = addr &amp; BIT(2);</div><div class='add'>+		addr_str[2] = addr &amp; BIT(3);</div><div class='add'>+		addr_str[1] = addr &amp; BIT(4);</div><div class='add'>+		addr_str[0] = addr &amp; BIT(5);</div><div class='ctx'> 		addr_len = 6;</div><div class='ctx'> 	}</div><div class='ctx'> 	eprom_cs(dev, 1);</div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8190_rtl8256.c b/drivers/staging/rtl8192u/r8190_rtl8256.c<br/>index a8c8e8c0660d..92de92a3325a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8190_rtl8256.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8190_rtl8256.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8190_rtl8256.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8190_rtl8256.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * This is part of the rtl8192 driver</div><div class='del'>- * released under the GPL (See file COPYING for details).</div><div class='ctx'>  *</div><div class='ctx'>  * This files contains programming code for the rtl8256</div><div class='ctx'>  * radio frontend.</div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c<br/>index f1eaab337dca..4065a4710142 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_core.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_core.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8192U_core.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.</div><div class='ctx'>  * Linux device driver for RTL8192U</div><div class='ctx'>  *</div><div class='ctx'>  * Based on the r8187 driver, which is:</div><div class='ctx'>  * Copyright 2004-2005 Andrea Merello &lt;andrea.merello@gmail.com&gt;, et al.</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 version 2 of the GNU General Public License 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 that 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 with</div><div class='del'>- * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='del'>- *</div><div class='del'>- * The full GNU General Public License is included in this distribution in the</div><div class='del'>- * file called LICENSE.</div><div class='ctx'>  *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * Jerry chuang &lt;wlanfae@realtek.com&gt;</div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c<br/>index 6c9f9d82477d..2ba01041406b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8192U_dm.c</a></div><div class='hunk'>@@ -43,20 +43,8 @@ u8		dm_shadow[16][256] = { {0} };</div><div class='ctx'> /* For Dynamic Rx Path Selection by Signal Strength */</div><div class='ctx'> static struct dynamic_rx_path_sel DM_RxPathSelTable;</div><div class='ctx'> </div><div class='del'>-/*------------------------Define global variable-----------------------------*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*------------------------Define local variable------------------------------*/</div><div class='del'>-/*------------------------Define local variable------------------------------*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*--------------------Define export function prototype-----------------------*/</div><div class='ctx'> extern	void dm_check_fsync(struct net_device *dev);</div><div class='ctx'> </div><div class='del'>-/*--------------------Define export function prototype-----------------------*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*---------------------Define local function prototype-----------------------*/</div><div class='ctx'> /* DM --&gt; Rate Adaptive */</div><div class='ctx'> static	void	dm_check_rate_adaptive(struct net_device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1454,7 +1442,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool  bInCH</div><div class='ctx'> </div><div class='ctx'> 		rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);</div><div class='ctx'> 		RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",</div><div class='del'>-			rCCK0_TxFilter1, TempVal);</div><div class='add'>+			 rCCK0_TxFilter1, TempVal);</div><div class='ctx'> 		/* Write 0xa24 ~ 0xa27 */</div><div class='ctx'> 		TempVal =	CCKSwingTable_Ch14[priv-&gt;CCK_index][2] +</div><div class='ctx'> 					(CCKSwingTable_Ch14[priv-&gt;CCK_index][3]&lt;&lt;8) +</div><div class='hunk'>@@ -1462,14 +1450,14 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool  bInCH</div><div class='ctx'> 					(CCKSwingTable_Ch14[priv-&gt;CCK_index][5]&lt;&lt;24);</div><div class='ctx'> 		rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);</div><div class='ctx'> 		RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",</div><div class='del'>-			rCCK0_TxFilter2, TempVal);</div><div class='add'>+			 rCCK0_TxFilter2, TempVal);</div><div class='ctx'> 		/* Write 0xa28  0xa29 */</div><div class='ctx'> 		TempVal =	CCKSwingTable_Ch14[priv-&gt;CCK_index][6] +</div><div class='ctx'> 					(CCKSwingTable_Ch14[priv-&gt;CCK_index][7]&lt;&lt;8);</div><div class='ctx'> </div><div class='ctx'> 		rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);</div><div class='ctx'> 		RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",</div><div class='del'>-			rCCK0_DebugPort, TempVal);</div><div class='add'>+			 rCCK0_DebugPort, TempVal);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1520,7 +1508,7 @@ void dm_restore_dynamic_mechanism_state(struct net_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* TODO: Only 11n mode is implemented currently, */</div><div class='ctx'> 	if (!(priv-&gt;ieee80211-&gt;mode == WIRELESS_MODE_N_24G ||</div><div class='del'>-		priv-&gt;ieee80211-&gt;mode == WIRELESS_MODE_N_5G))</div><div class='add'>+	      priv-&gt;ieee80211-&gt;mode == WIRELESS_MODE_N_5G))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -1751,7 +1739,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(</div><div class='ctx'> </div><div class='ctx'> 	/* For smooth, we can not change DIG state. */</div><div class='ctx'> 	if ((priv-&gt;undecorated_smoothed_pwdb &gt; dm_digtable.rssi_low_thresh) &amp;&amp;</div><div class='del'>-		(priv-&gt;undecorated_smoothed_pwdb &lt; dm_digtable.rssi_high_thresh))</div><div class='add'>+	    (priv-&gt;undecorated_smoothed_pwdb &lt; dm_digtable.rssi_high_thresh))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*DbgPrint("Dig by Fw False Alarm\n");*/</div><div class='hunk'>@@ -1814,7 +1802,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(</div><div class='ctx'> 		u8 reset_flag = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (dm_digtable.dig_state == DM_STA_DIG_ON &amp;&amp;</div><div class='del'>-			(priv-&gt;reset_count == reset_cnt)) {</div><div class='add'>+		    (priv-&gt;reset_count == reset_cnt)) {</div><div class='ctx'> 			dm_ctrl_initgain_byrssi_highpwr(dev);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1912,7 +1900,7 @@ static void dm_ctrl_initgain_byrssi_highpwr(</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;undecorated_smoothed_pwdb &gt;= dm_digtable.rssi_high_power_highthresh) {</div><div class='ctx'> 		if (dm_digtable.dig_highpwr_state == DM_STA_DIG_ON &amp;&amp;</div><div class='del'>-			(priv-&gt;reset_count == reset_cnt_highpwr))</div><div class='add'>+		    (priv-&gt;reset_count == reset_cnt_highpwr))</div><div class='ctx'> 			return;</div><div class='ctx'> 		dm_digtable.dig_highpwr_state = DM_STA_DIG_ON;</div><div class='ctx'> </div><div class='hunk'>@@ -1928,7 +1916,7 @@ static void dm_ctrl_initgain_byrssi_highpwr(</div><div class='ctx'> 			write_nic_byte(dev, rOFDM0_RxDetector1, 0x43);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dm_digtable.dig_highpwr_state == DM_STA_DIG_OFF &amp;&amp;</div><div class='del'>-			(priv-&gt;reset_count == reset_cnt_highpwr))</div><div class='add'>+		    (priv-&gt;reset_count == reset_cnt_highpwr))</div><div class='ctx'> 			return;</div><div class='ctx'> 		dm_digtable.dig_highpwr_state = DM_STA_DIG_OFF;</div><div class='ctx'> </div><div class='hunk'>@@ -2129,7 +2117,7 @@ static	void dm_cs_ratio(</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		if ((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) ||</div><div class='del'>-			!initialized || force_write) {</div><div class='add'>+		    !initialized || force_write) {</div><div class='ctx'> 			/*DbgPrint("Write CS_ratio state = %d\n", DM_DigTable.CurCS_ratioState);*/</div><div class='ctx'> 			if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_LOWER) {</div><div class='ctx'> 				/*  Lower CS ratio for CCK. */</div><div class='hunk'>@@ -2646,7 +2634,7 @@ void dm_fsync_timer_callback(struct timer_list *t)</div><div class='ctx'> 	bool		bDoubleTimeInterval = false;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;ieee80211-&gt;state == IEEE80211_LINKED &amp;&amp;</div><div class='del'>-		priv-&gt;ieee80211-&gt;bfsync_enable &amp;&amp;</div><div class='add'>+	    priv-&gt;ieee80211-&gt;bfsync_enable &amp;&amp;</div><div class='ctx'> 		(priv-&gt;ieee80211-&gt;pHTInfo-&gt;IOTAction &amp; HT_IOT_ACT_CDD_FSYNC)) {</div><div class='ctx'> 		/* Count rate 54, MCS [7], [12, 13, 14, 15] */</div><div class='ctx'> 		u32 rate_bitmap;</div><div class='hunk'>@@ -2936,17 +2924,17 @@ void dm_shadow_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (page = 0; page &lt; 5; page++)</div><div class='ctx'> 		for (offset = 0; offset &lt; 256; offset++) {</div><div class='del'>-			read_nic_byte(dev, offset+page*256, &amp;dm_shadow[page][offset]);</div><div class='add'>+			read_nic_byte(dev, offset + page * 256, &amp;dm_shadow[page][offset]);</div><div class='ctx'> 			/*DbgPrint("P-%d/O-%02x=%02x\r\n", page, offset, DM_Shadow[page][offset]);*/</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	for (page = 8; page &lt; 11; page++)</div><div class='ctx'> 		for (offset = 0; offset &lt; 256; offset++)</div><div class='del'>-			read_nic_byte(dev, offset+page*256, &amp;dm_shadow[page][offset]);</div><div class='add'>+			read_nic_byte(dev, offset + page * 256, &amp;dm_shadow[page][offset]);</div><div class='ctx'> </div><div class='ctx'> 	for (page = 12; page &lt; 15; page++)</div><div class='ctx'> 		for (offset = 0; offset &lt; 256; offset++)</div><div class='del'>-			read_nic_byte(dev, offset+page*256, &amp;dm_shadow[page][offset]);</div><div class='add'>+			read_nic_byte(dev, offset + page * 256, &amp;dm_shadow[page][offset]);</div><div class='ctx'> </div><div class='ctx'> }   /* dm_shadow_init */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8192U_hw.h b/drivers/staging/rtl8192u/r8192U_hw.h<br/>index 5a958335681d..95a2d2ee3c65 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_hw.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_hw.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_hw.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8192U_hw.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  *	This is part of rtl8187 OpenSource driver.</div><div class='ctx'>  *	Copyright (C) Andrea Merello 2004-2005  &lt;andrea.merello@gmail.com&gt;</div><div class='del'>- *	Released under the terms of GPL (General Public Licence)</div><div class='ctx'>  *</div><div class='ctx'>  *	Parts of this driver are based on the GPL part of the</div><div class='ctx'>  *	official Realtek driver.</div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c<br/>index e4e6c979bedf..5822bb7984b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_wx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_wx.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_wx.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8192U_wx.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains wireless extension handlers.</div><div class='ctx'>  *</div><div class='ctx'>  * This is part of rtl8180 OpenSource driver.</div><div class='ctx'>  * Copyright (C) Andrea Merello 2004-2005  &lt;andrea.merello@gmail.com&gt;</div><div class='del'>- * Released under the terms of GPL (General Public Licence)</div><div class='ctx'>  *</div><div class='ctx'>  * Parts of this driver are based on the GPL part</div><div class='ctx'>  * of the official realtek driver.</div><div class='head'>diff --git a/drivers/staging/rtl8192u/r8192U_wx.h b/drivers/staging/rtl8192u/r8192U_wx.h<br/>index a6c2b95e2e69..27423cd64b4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_wx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8192u/r8192U_wx.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8192u/r8192U_wx.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8192u/r8192U_wx.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * This is part of rtl8180 OpenSource driver - v 0.3</div><div class='ctx'>  * Copyright (C) Andrea Merello 2004  &lt;andrea.merello@gmail.com&gt;</div><div class='del'>- * Released under the terms of GPL (General Public Licence)</div><div class='ctx'>  *</div><div class='ctx'>  * Parts of this driver are based on the GPL part of the official realtek driver</div><div class='ctx'>  * Parts of this driver are based on the rtl8180 driver skeleton from Patric</div><div class='head'>diff --git a/drivers/staging/rtl8712/Kconfig b/drivers/staging/rtl8712/Kconfig<br/>index f160eee52f09..b6dcda77db1f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/Kconfig</a></div><div class='hunk'>@@ -1,17 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config R8712U</div><div class='ctx'> 	tristate "RealTek RTL8712U (RTL8192SU) Wireless LAN NIC driver"</div><div class='ctx'> 	depends on WLAN &amp;&amp; USB</div><div class='ctx'> 	select WIRELESS_EXT</div><div class='ctx'> 	select WEXT_PRIV</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	---help---</div><div class='del'>-	This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.</div><div class='del'>-	If built as a module, it will be called r8712u.</div><div class='add'>+	help</div><div class='add'>+	    This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.</div><div class='add'>+	    If built as a module, it will be called r8712u.</div><div class='ctx'> </div><div class='ctx'> config R8712_TX_AGGR</div><div class='ctx'> 	bool "Realtek RTL8712U Transmit Aggregation code"</div><div class='ctx'> 	depends on R8712U &amp;&amp; BROKEN</div><div class='del'>-	---help---</div><div class='del'>-	This option provides transmit aggregation for the Realtek RTL8712 USB device.</div><div class='add'>+	help</div><div class='add'>+	    This option provides transmit aggregation for the Realtek RTL8712 USB device.</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h<br/>index 48d62fe6c8d4..9ae86631fa8b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/drv_types.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/drv_types.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/drv_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/drv_types.h</a></div><div class='hunk'>@@ -145,9 +145,9 @@ struct _adapter {</div><div class='ctx'> 	struct	hal_priv	halpriv;</div><div class='ctx'> 	struct	led_priv	ledpriv;</div><div class='ctx'> 	struct mp_priv  mppriv;</div><div class='del'>-	s32	bDriverStopped;</div><div class='del'>-	s32	bSurpriseRemoved;</div><div class='del'>-	s32	bSuspended;</div><div class='add'>+	bool	driver_stopped;</div><div class='add'>+	bool	surprise_removed;</div><div class='add'>+	bool	suspended;</div><div class='ctx'> 	u32	IsrContent;</div><div class='ctx'> 	u32	ImrContent;</div><div class='ctx'> 	u8	EepromAddressSize;</div><div class='head'>diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c<br/>index 4c6519ccab30..401f0e442bcf 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/hal_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/hal_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/hal_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/hal_init.c</a></div><div class='hunk'>@@ -100,7 +100,8 @@ static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)</div><div class='ctx'> 		pfwpriv-&gt;rf_config = RTL8712_RFC_1T2R;</div><div class='ctx'> 	}</div><div class='ctx'> 	pfwpriv-&gt;mp_mode = (pregpriv-&gt;mp_mode == 1) ? 1 : 0;</div><div class='del'>-	pfwpriv-&gt;vcs_type = pregpriv-&gt;vrtl_carrier_sense; /* 0:off 1:on 2:auto */</div><div class='add'>+	/* 0:off 1:on 2:auto */</div><div class='add'>+	pfwpriv-&gt;vcs_type = pregpriv-&gt;vrtl_carrier_sense;</div><div class='ctx'> 	pfwpriv-&gt;vcs_mode = pregpriv-&gt;vcs_type; /* 1:RTS/CTS 2:CTS to self */</div><div class='ctx'> 	/* default enable turbo_mode */</div><div class='ctx'> 	pfwpriv-&gt;turbo_mode = ((pregpriv-&gt;wifi_test == 1) ? 0 : 1);</div><div class='head'>diff --git a/drivers/staging/rtl8712/ieee80211.c b/drivers/staging/rtl8712/ieee80211.c<br/>index 2eae11dd6b42..4cca7390c8ef 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/ieee80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/ieee80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/ieee80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/ieee80211.c</a></div><div class='hunk'>@@ -238,7 +238,8 @@ check_next_ie:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned char *r8712_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len, int limit)</div><div class='add'>+unsigned char *r8712_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len,</div><div class='add'>+				 int limit)</div><div class='ctx'> {</div><div class='ctx'> 	return r8712_get_ie(pie, _WPA2_IE_ID_, rsn_ie_len, limit);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h<br/>index 1470771daa62..8098f6905554 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/ieee80211.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/ieee80211.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/ieee80211.h</a></div><div class='hunk'>@@ -728,7 +728,8 @@ struct registry_priv;</div><div class='ctx'> </div><div class='ctx'> u8 *r8712_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen);</div><div class='ctx'> u8 *r8712_get_ie(u8 *pbuf, sint index, uint *len, sint limit);</div><div class='del'>-unsigned char *r8712_get_wpa_ie(unsigned char *pie, uint *rsn_ie_len, int limit);</div><div class='add'>+unsigned char *r8712_get_wpa_ie(unsigned char *pie, uint *rsn_ie_len,</div><div class='add'>+				int limit);</div><div class='ctx'> unsigned char *r8712_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len,</div><div class='ctx'> 				 int limit);</div><div class='ctx'> int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,</div><div class='head'>diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c<br/>index 2d3f38007299..c962696c9822 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/os_intfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/os_intfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/os_intfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/os_intfs.c</a></div><div class='hunk'>@@ -362,7 +362,7 @@ static void enable_video_mode(struct _adapter *padapter, int cbw40_value)</div><div class='ctx'> 	r8712_fw_cmd(padapter, intcmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * This function intends to handle the activation of an interface</div><div class='ctx'>  * i.e. when it is brought Up/Active from a Down state.</div><div class='hunk'>@@ -374,8 +374,8 @@ static int netdev_open(struct net_device *pnetdev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;padapter-&gt;mutex_start);</div><div class='ctx'> 	if (!padapter-&gt;bup) {</div><div class='del'>-		padapter-&gt;bDriverStopped = false;</div><div class='del'>-		padapter-&gt;bSurpriseRemoved = false;</div><div class='add'>+		padapter-&gt;driver_stopped = false;</div><div class='add'>+		padapter-&gt;surprise_removed = false;</div><div class='ctx'> 		padapter-&gt;bup = true;</div><div class='ctx'> 		if (rtl871x_hal_init(padapter) != _SUCCESS)</div><div class='ctx'> 			goto netdev_open_error;</div><div class='hunk'>@@ -430,7 +430,7 @@ netdev_open_error:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * This function intends to handle the shutdown of an interface</div><div class='ctx'>  * i.e. when it is brought Down from an Up/Active state.</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c<br/>index 1920d02f7c9f..6a72a4ad176a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_cmd.c</a></div><div class='hunk'>@@ -147,17 +147,9 @@ static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf)</div><div class='ctx'> </div><div class='ctx'> static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='del'>-	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj	*pcmd);</div><div class='ctx'> 	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;</div><div class='ctx'> </div><div class='del'>-	if (pcmd-&gt;rsp &amp;&amp; pcmd-&gt;rspsz &gt; 0)</div><div class='del'>-		memcpy(pcmd-&gt;rsp, (u8 *)&amp;val, pcmd-&gt;rspsz);</div><div class='del'>-	pcmd_callback = cmd_callback[pcmd-&gt;cmdcode].callback;</div><div class='del'>-	if (!pcmd_callback)</div><div class='del'>-		r8712_free_cmd_obj(pcmd);</div><div class='del'>-	else</div><div class='del'>-		pcmd_callback(padapter, pcmd);</div><div class='add'>+	r8712_free_cmd_obj(pcmd);</div><div class='ctx'> 	return H2C_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +309,7 @@ int r8712_cmd_thread(void *context)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (wait_for_completion_interruptible(cmd_queue_comp))</div><div class='ctx'> 			break;</div><div class='del'>-		if (padapter-&gt;bDriverStopped || padapter-&gt;bSurpriseRemoved)</div><div class='add'>+		if (padapter-&gt;driver_stopped || padapter-&gt;surprise_removed)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (r8712_register_cmd_alive(padapter) != _SUCCESS)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -368,8 +360,8 @@ _next:</div><div class='ctx'> 			pcmdbuf += 2; /* 8 bytes alignment */</div><div class='ctx'> 			memcpy((u8 *)pcmdbuf, pcmd-&gt;parmbuf, pcmd-&gt;cmdsz);</div><div class='ctx'> 			while (check_cmd_fifo(padapter, wr_sz) == _FAIL) {</div><div class='del'>-				if (padapter-&gt;bDriverStopped ||</div><div class='del'>-				    padapter-&gt;bSurpriseRemoved)</div><div class='add'>+				if (padapter-&gt;driver_stopped ||</div><div class='add'>+				    padapter-&gt;surprise_removed)</div><div class='ctx'> 					break;</div><div class='ctx'> 				msleep(100);</div><div class='ctx'> 				continue;</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h<br/>index 92fb77666d44..a34d0dd023f3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_cmd.h</a></div><div class='hunk'>@@ -128,7 +128,6 @@ enum rtl8712_h2c_cmd {</div><div class='ctx'> 	MAX_H2CCMD</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define _GetBBReg_CMD_		_Read_BBREG_CMD_</div><div class='ctx'> #define _SetBBReg_CMD_		_Write_BBREG_CMD_</div><div class='ctx'> #define _GetRFReg_CMD_		_Read_RFREG_CMD_</div><div class='hunk'>@@ -140,7 +139,7 @@ enum rtl8712_h2c_cmd {</div><div class='ctx'> static struct _cmd_callback	cmd_callback[] = {</div><div class='ctx'> 	{GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/</div><div class='ctx'> 	{GEN_CMD_CODE(_Write_MACREG), NULL},</div><div class='del'>-	{GEN_CMD_CODE(_Read_BBREG), &amp;r8712_getbbrfreg_cmdrsp_callback},</div><div class='add'>+	{GEN_CMD_CODE(_Read_BBREG), NULL},</div><div class='ctx'> 	{GEN_CMD_CODE(_Write_BBREG), NULL},</div><div class='ctx'> 	{GEN_CMD_CODE(_Read_RFREG), &amp;r8712_getbbrfreg_cmdrsp_callback},</div><div class='ctx'> 	{GEN_CMD_CODE(_Write_RFREG), NULL}, /*5*/</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c<br/>index 39eb74374d0b..00babd011a62 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_efuse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_efuse.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_efuse.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,</div><div class='del'>-			 const u8 word_en, const u8 *data)</div><div class='add'>+			       const u8 word_en, const u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	u8 pg_header = 0;</div><div class='ctx'> 	u16 efuse_addr = 0, curr_size = 0;</div><div class='hunk'>@@ -441,7 +441,7 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		res = efuse_one_byte_rw(padapter, bRead, start_addr + i,</div><div class='del'>-		      data + i);</div><div class='add'>+					data + i);</div><div class='ctx'> 		if (!bRead &amp;&amp; !res)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -554,7 +554,7 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,</div><div class='ctx'> 		offset++;</div><div class='ctx'> 		if (!empty)</div><div class='ctx'> 			if (!r8712_efuse_pg_packet_read(padapter, offset,</div><div class='del'>-			    pktdata))</div><div class='add'>+							pktdata))</div><div class='ctx'> 				return false;</div><div class='ctx'> 		i = 0;</div><div class='ctx'> 		j = 0;</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_efuse.h b/drivers/staging/rtl8712/rtl8712_efuse.h<br/>index dbba51cd40fb..4969d307e978 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_efuse.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_efuse.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_efuse.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_efuse.h</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "osdep_service.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define _REPEAT_THRESHOLD_	3</div><div class='ctx'> </div><div class='ctx'> #define EFUSE_MAX_SIZE		512</div><div class='hunk'>@@ -40,5 +39,5 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead,</div><div class='ctx'> u8 r8712_efuse_map_read(struct _adapter *padapter, u16 addr,</div><div class='ctx'> 			u16 cnts, u8 *data);</div><div class='ctx'> u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr,</div><div class='del'>-				u16 cnts, u8 *data);</div><div class='add'>+			 u16 cnts, u8 *data);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_io.c b/drivers/staging/rtl8712/rtl8712_io.c<br/>index 8eb79f73c014..384cbdb05e19 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_io.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_io.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_io.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ void r8712_read_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)</div><div class='ctx'> {</div><div class='ctx'> 	struct intf_hdl *hdl = &amp;adapter-&gt;pio_queue-&gt;intf;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;bDriverStopped || adapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (adapter-&gt;driver_stopped || adapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	hdl-&gt;io_ops._read_mem(hdl, addr, cnt, pmem);</div><div class='hunk'>@@ -85,7 +85,7 @@ void r8712_read_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)</div><div class='ctx'> {</div><div class='ctx'> 	struct intf_hdl *hdl = &amp;adapter-&gt;pio_queue-&gt;intf;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;bDriverStopped || adapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (adapter-&gt;driver_stopped || adapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	hdl-&gt;io_ops._read_port(hdl, addr, cnt, pmem);</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_led.c b/drivers/staging/rtl8712/rtl8712_led.c<br/>index 07fcf9b9b811..db99129d3169 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_led.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_led.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_led.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_led.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static void SwLedOn(struct _adapter *padapter, struct LED_871x *pLed)</div><div class='ctx'> {</div><div class='ctx'> 	u8	LedCfg;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved || padapter-&gt;bDriverStopped)</div><div class='add'>+	if (padapter-&gt;surprise_removed || padapter-&gt;driver_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> 	LedCfg = r8712_read8(padapter, LEDCFG);</div><div class='ctx'> 	switch (pLed-&gt;LedPin) {</div><div class='hunk'>@@ -137,7 +137,7 @@ static void SwLedOff(struct _adapter *padapter, struct LED_871x *pLed)</div><div class='ctx'> {</div><div class='ctx'> 	u8	LedCfg;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved || padapter-&gt;bDriverStopped)</div><div class='add'>+	if (padapter-&gt;surprise_removed || padapter-&gt;driver_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> 	LedCfg = r8712_read8(padapter, LEDCFG);</div><div class='ctx'> 	switch (pLed-&gt;LedPin) {</div><div class='hunk'>@@ -419,7 +419,7 @@ static void SwLedBlink1(struct LED_871x *pLed)</div><div class='ctx'> static void SwLedBlink2(struct LED_871x *pLed)</div><div class='ctx'> {</div><div class='ctx'> 	struct _adapter *padapter = pLed-&gt;padapter;</div><div class='del'>-	struct mlme_priv *pmlmepriv = &amp;(padapter-&gt;mlmepriv);</div><div class='add'>+	struct mlme_priv *pmlmepriv = &amp;padapter-&gt;mlmepriv;</div><div class='ctx'> 	u8 bStopBlinking = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Change LED according to BlinkingLedState specified. */</div><div class='hunk'>@@ -816,7 +816,7 @@ static void BlinkTimerCallback(struct timer_list *t)</div><div class='ctx'> 	/* This fixed the crash problem on Fedora 12 when trying to do the</div><div class='ctx'> 	 * insmod;ifconfig up;rmmod commands.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pLed-&gt;padapter-&gt;bSurpriseRemoved || pLed-&gt;padapter-&gt;bDriverStopped)</div><div class='add'>+	if (pLed-&gt;padapter-&gt;surprise_removed || pLed-&gt;padapter-&gt;driver_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> 	schedule_work(&amp;pLed-&gt;BlinkWorkItem);</div><div class='ctx'> }</div><div class='hunk'>@@ -883,7 +883,7 @@ static void SwLedControlMode1(struct _adapter *padapter,</div><div class='ctx'> 	case LED_CTL_NO_LINK:</div><div class='ctx'> 		if (!pLed-&gt;bLedNoLinkBlinkInProgress) {</div><div class='ctx'> 			if (pLed-&gt;CurrLedState == LED_SCAN_BLINK ||</div><div class='del'>-			  IS_LED_WPS_BLINKING(pLed))</div><div class='add'>+			    IS_LED_WPS_BLINKING(pLed))</div><div class='ctx'> 				return;</div><div class='ctx'> 			if (pLed-&gt;bLedLinkBlinkInProgress) {</div><div class='ctx'> 				del_timer(&amp;pLed-&gt;BlinkTimer);</div><div class='hunk'>@@ -1124,7 +1124,7 @@ static void SwLedControlMode2(struct _adapter *padapter,</div><div class='ctx'> 		if (!pLed-&gt;bLedBlinkInProgress &amp;&amp;</div><div class='ctx'> 		    check_fwstate(pmlmepriv, _FW_LINKED)) {</div><div class='ctx'> 			if (pLed-&gt;CurrLedState == LED_SCAN_BLINK ||</div><div class='del'>-			   IS_LED_WPS_BLINKING(pLed))</div><div class='add'>+			    IS_LED_WPS_BLINKING(pLed))</div><div class='ctx'> 				return;</div><div class='ctx'> 			pLed-&gt;bLedBlinkInProgress = true;</div><div class='ctx'> 			pLed-&gt;CurrLedState = LED_TXRX_BLINK;</div><div class='hunk'>@@ -1704,7 +1704,6 @@ static void SwLedControlMode5(struct _adapter *padapter,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void SwLedControlMode6(struct _adapter *padapter,</div><div class='ctx'> 			      enum LED_CTL_MODE LedAction)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c<br/>index 5bf9070b7a28..82ddc0c3ecd4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_recv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_recv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_recv.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter)</div><div class='ctx'> 	if (!precvpriv-&gt;pallocated_recv_buf)</div><div class='ctx'> 		return _FAIL;</div><div class='ctx'> 	precvpriv-&gt;precv_buf = precvpriv-&gt;pallocated_recv_buf + 4 -</div><div class='del'>-			      ((addr_t) (precvpriv-&gt;pallocated_recv_buf) &amp; 3);</div><div class='add'>+			      ((addr_t)(precvpriv-&gt;pallocated_recv_buf) &amp; 3);</div><div class='ctx'> 	precvbuf = (struct recv_buf *)precvpriv-&gt;precv_buf;</div><div class='ctx'> 	for (i = 0; i &lt; NR_RECVBUFF; i++) {</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;precvbuf-&gt;list);</div><div class='hunk'>@@ -135,7 +135,7 @@ int r8712_free_recvframe(union recv_frame *precvframe,</div><div class='ctx'> 	spin_lock_irqsave(&amp;pfree_recv_queue-&gt;lock, irqL);</div><div class='ctx'> 	list_del_init(&amp;(precvframe-&gt;u.hdr.list));</div><div class='ctx'> 	list_add_tail(&amp;(precvframe-&gt;u.hdr.list), &amp;pfree_recv_queue-&gt;queue);</div><div class='del'>-	if (padapter != NULL) {</div><div class='add'>+	if (padapter) {</div><div class='ctx'> 		if (pfree_recv_queue == &amp;precvpriv-&gt;free_recv_queue)</div><div class='ctx'> 			precvpriv-&gt;free_recvframe_cnt++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -273,7 +273,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,</div><div class='ctx'> 		/* 0~(n-1) fragment frame</div><div class='ctx'> 		 * enqueue to defraf_g</div><div class='ctx'> 		 */</div><div class='del'>-		if (pdefrag_q != NULL) {</div><div class='add'>+		if (pdefrag_q) {</div><div class='ctx'> 			if (fragnum == 0) {</div><div class='ctx'> 				/*the first fragment*/</div><div class='ctx'> 				if (!list_empty(&amp;pdefrag_q-&gt;queue)) {</div><div class='hunk'>@@ -299,7 +299,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,</div><div class='ctx'> 		/* the last fragment frame</div><div class='ctx'> 		 * enqueue the last fragment</div><div class='ctx'> 		 */</div><div class='del'>-		if (pdefrag_q != NULL) {</div><div class='add'>+		if (pdefrag_q) {</div><div class='ctx'> 			phead = &amp;pdefrag_q-&gt;queue;</div><div class='ctx'> 			list_add_tail(&amp;pfhdr-&gt;list, phead);</div><div class='ctx'> 			/*call recvframe_defrag to defrag*/</div><div class='hunk'>@@ -313,7 +313,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,</div><div class='ctx'> 			prtnframe = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((prtnframe != NULL) &amp;&amp; (prtnframe-&gt;u.hdr.attrib.privacy)) {</div><div class='add'>+	if (prtnframe &amp;&amp; (prtnframe-&gt;u.hdr.attrib.privacy)) {</div><div class='ctx'> 		/* after defrag we must check tkip mic code */</div><div class='ctx'> 		if (r8712_recvframe_chkmic(padapter, prtnframe) == _FAIL) {</div><div class='ctx'> 			r8712_free_recvframe(prtnframe, pfree_recv_queue);</div><div class='hunk'>@@ -541,8 +541,8 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter,</div><div class='ctx'> 				  (preorder_ctrl-&gt;indicate_seq + 1) % 4096;</div><div class='ctx'> 			/*indicate this recv_frame*/</div><div class='ctx'> 			if (!pattrib-&gt;amsdu) {</div><div class='del'>-				if (!padapter-&gt;bDriverStopped &amp;&amp;</div><div class='del'>-				    !padapter-&gt;bSurpriseRemoved) {</div><div class='add'>+				if (!padapter-&gt;driver_stopped &amp;&amp;</div><div class='add'>+				    !padapter-&gt;surprise_removed) {</div><div class='ctx'> 					/* indicate this recv_frame */</div><div class='ctx'> 					r8712_recv_indicatepkt(padapter,</div><div class='ctx'> 							       prframe);</div><div class='hunk'>@@ -576,8 +576,8 @@ static int recv_indicatepkt_reorder(struct _adapter *padapter,</div><div class='ctx'> 		/* s1. */</div><div class='ctx'> 		r8712_wlanhdr_to_ethhdr(prframe);</div><div class='ctx'> 		if (pattrib-&gt;qos != 1) {</div><div class='del'>-			if (!padapter-&gt;bDriverStopped &amp;&amp;</div><div class='del'>-			    !padapter-&gt;bSurpriseRemoved) {</div><div class='add'>+			if (!padapter-&gt;driver_stopped &amp;&amp;</div><div class='add'>+			    !padapter-&gt;surprise_removed) {</div><div class='ctx'> 				r8712_recv_indicatepkt(padapter, prframe);</div><div class='ctx'> 				return _SUCCESS;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -626,7 +626,7 @@ void r8712_reordering_ctrl_timeout_handler(void *pcontext)</div><div class='ctx'> 	struct  __queue *ppending_recvframe_queue =</div><div class='ctx'> 				 &amp;preorder_ctrl-&gt;pending_recvframe_queue;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped || padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;driver_stopped || padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock_irqsave(&amp;ppending_recvframe_queue-&gt;lock, irql);</div><div class='ctx'> 	r8712_recv_indicatepkts_in_order(padapter, preorder_ctrl, true);</div><div class='hunk'>@@ -643,15 +643,15 @@ static int r8712_process_recv_indicatepkts(struct _adapter *padapter,</div><div class='ctx'> 	if (phtpriv-&gt;ht_option == 1) { /*B/G/N Mode*/</div><div class='ctx'> 		if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) {</div><div class='ctx'> 			/* including perform A-MPDU Rx Ordering Buffer Control*/</div><div class='del'>-			if (!padapter-&gt;bDriverStopped &amp;&amp;</div><div class='del'>-			    !padapter-&gt;bSurpriseRemoved)</div><div class='add'>+			if (!padapter-&gt;driver_stopped &amp;&amp;</div><div class='add'>+			    !padapter-&gt;surprise_removed)</div><div class='ctx'> 				return _FAIL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else { /*B/G mode*/</div><div class='ctx'> 		retval = r8712_wlanhdr_to_ethhdr(prframe);</div><div class='ctx'> 		if (retval != _SUCCESS)</div><div class='ctx'> 			return retval;</div><div class='del'>-		if (!padapter-&gt;bDriverStopped &amp;&amp; !padapter-&gt;bSurpriseRemoved) {</div><div class='add'>+		if (!padapter-&gt;driver_stopped &amp;&amp; !padapter-&gt;surprise_removed) {</div><div class='ctx'> 			/* indicate this recv_frame */</div><div class='ctx'> 			r8712_recv_indicatepkt(padapter, prframe);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -889,7 +889,7 @@ static void process_link_qual(struct _adapter *padapter,</div><div class='ctx'> 	struct rx_pkt_attrib *pattrib;</div><div class='ctx'> 	struct smooth_rssi_data *sqd = &amp;padapter-&gt;recvpriv.signal_qual_data;</div><div class='ctx'> </div><div class='del'>-	if (prframe == NULL || padapter == NULL)</div><div class='add'>+	if (!prframe || !padapter)</div><div class='ctx'> 		return;</div><div class='ctx'> 	pattrib = &amp;prframe-&gt;u.hdr.attrib;</div><div class='ctx'> 	if (pattrib-&gt;signal_qual != 0) {</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c<br/>index aa6fb516f398..7574a4b569a4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl8712_xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl8712_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl8712_xmit.c</a></div><div class='hunk'>@@ -60,20 +60,20 @@ int r8712_txframes_sta_ac_pending(struct _adapter *padapter,</div><div class='ctx'> 	switch (priority) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	case 2:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.bk_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.bk_q;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='ctx'> 	case 5:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.vi_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.vi_q;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 	case 7:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.vo_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.vo_q;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 	case 3:</div><div class='ctx'> 	default:</div><div class='del'>-		ptxservq = &amp;(psta-&gt;sta_xmitpriv.be_q);</div><div class='add'>+		ptxservq = &amp;psta-&gt;sta_xmitpriv.be_q;</div><div class='ctx'> 	break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ptxservq-&gt;qcnt;</div><div class='hunk'>@@ -269,7 +269,7 @@ u8 r8712_construct_txaggr_cmd_hdr(struct xmit_buf *pxmitbuf)</div><div class='ctx'> 	struct xmit_frame *pxmitframe = (struct xmit_frame *)</div><div class='ctx'> 		pxmitbuf-&gt;priv_data;</div><div class='ctx'> 	struct _adapter *padapter = pxmitframe-&gt;padapter;</div><div class='del'>-	struct cmd_priv *pcmdpriv = &amp;(padapter-&gt;cmdpriv);</div><div class='add'>+	struct cmd_priv *pcmdpriv = &amp;padapter-&gt;cmdpriv;</div><div class='ctx'> 	struct cmd_hdr *pcmd_hdr = (struct cmd_hdr  *)</div><div class='ctx'> 		(pxmitbuf-&gt;pbuf + TXDESC_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -532,7 +532,7 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)</div><div class='ctx'> 		    (pattrib-&gt;dhcp_pkt != 1)) {</div><div class='ctx'> 			/*Not EAP &amp; ARP type data packet*/</div><div class='ctx'> 			if (phtpriv-&gt;ht_option == 1) { /*B/G/N Mode*/</div><div class='del'>-				if (phtpriv-&gt;ampdu_enable != true)</div><div class='add'>+				if (!phtpriv-&gt;ampdu_enable)</div><div class='ctx'> 					ptxdesc-&gt;txdw2 |= cpu_to_le32(BK);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c b/drivers/staging/rtl8712/rtl871x_eeprom.c<br/>index 948bd0c757b5..0027d8eb22fa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_eeprom.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_eeprom.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_eeprom.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl871x_eeprom.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)</div><div class='ctx'> {</div><div class='ctx'> 	u16 x, mask;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	mask = 0x01 &lt;&lt; (count - 1);</div><div class='ctx'> 	x = r8712_read8(padapter, EE_9346CR);</div><div class='hunk'>@@ -46,7 +46,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)</div><div class='ctx'> 		x &amp;= ~_EEDI;</div><div class='ctx'> 		if (data &amp; mask)</div><div class='ctx'> 			x |= _EEDI;</div><div class='del'>-		if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+		if (padapter-&gt;surprise_removed)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		r8712_write8(padapter, EE_9346CR, (u8)x);</div><div class='ctx'> 		udelay(CLOCK_RATE);</div><div class='hunk'>@@ -54,7 +54,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)</div><div class='ctx'> 		down_clk(padapter, &amp;x);</div><div class='ctx'> 		mask &gt;&gt;= 1;</div><div class='ctx'> 	} while (mask);</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	x &amp;= ~_EEDI;</div><div class='ctx'> 	r8712_write8(padapter, EE_9346CR, (u8)x);</div><div class='hunk'>@@ -65,7 +65,7 @@ static u16 shift_in_bits(struct _adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	u16 x, d = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	x = r8712_read8(padapter, EE_9346CR);</div><div class='ctx'> 	x &amp;= ~(_EEDO | _EEDI);</div><div class='hunk'>@@ -73,7 +73,7 @@ static u16 shift_in_bits(struct _adapter *padapter)</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 		d &lt;&lt;= 1;</div><div class='ctx'> 		up_clk(padapter, &amp;x);</div><div class='del'>-		if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+		if (padapter-&gt;surprise_removed)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		x = r8712_read8(padapter, EE_9346CR);</div><div class='ctx'> 		x &amp;= ~(_EEDI);</div><div class='hunk'>@@ -117,17 +117,17 @@ static void eeprom_clean(struct _adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	u16 x;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	x = r8712_read8(padapter, EE_9346CR);</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	x &amp;= ~(_EECS | _EEDI);</div><div class='ctx'> 	r8712_write8(padapter, EE_9346CR, (u8)x);</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	up_clk(padapter, &amp;x);</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	down_clk(padapter, &amp;x);</div><div class='ctx'> }</div><div class='hunk'>@@ -194,11 +194,11 @@ u16 r8712_eeprom_read16(struct _adapter *padapter, u16 reg) /*ReadEEprom*/</div><div class='ctx'> 	tmp8_clk_new = tmp8_clk_ori | 0x20;</div><div class='ctx'> 	if (tmp8_clk_new != tmp8_clk_ori)</div><div class='ctx'> 		r8712_write8(padapter, 0x10250003, tmp8_clk_new);</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* select EEPROM, reset bits, set _EECS */</div><div class='ctx'> 	x = r8712_read8(padapter, EE_9346CR);</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	x &amp;= ~(_EEDI | _EEDO | _EESK | _EEM0);</div><div class='ctx'> 	x |= _EEM1 | _EECS;</div><div class='hunk'>@@ -218,4 +218,3 @@ out:</div><div class='ctx'> 		r8712_write8(padapter, 0x102502f1, tmp8_ori);</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c<br/>index e723357ac8c0..a7230c0c7b23 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_ioctl_linux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_ioctl_linux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_ioctl_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl871x_ioctl_linux.c</a></div><div class='hunk'>@@ -1102,7 +1102,7 @@ static int r871x_wx_set_mlme(struct net_device *dev,</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'>  *</div><div class='ctx'>  * This function intends to handle the Set Scan command.</div><div class='ctx'>  * Currently, the request comes via Wireless Extensions' SIOCSIWSCAN ioctl.</div><div class='hunk'>@@ -1118,9 +1118,9 @@ static int r8711_wx_set_scan(struct net_device *dev,</div><div class='ctx'> 	struct mlme_priv *pmlmepriv = &amp;padapter-&gt;mlmepriv;</div><div class='ctx'> 	u8 status = true;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped) {</div><div class='del'>-		netdev_info(dev, "In %s: bDriverStopped=%d\n",</div><div class='del'>-			    __func__, padapter-&gt;bDriverStopped);</div><div class='add'>+	if (padapter-&gt;driver_stopped) {</div><div class='add'>+		netdev_info(dev, "In %s: driver_stopped=%d\n",</div><div class='add'>+			    __func__, padapter-&gt;driver_stopped);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!padapter-&gt;bup)</div><div class='hunk'>@@ -1175,7 +1175,7 @@ static int r8711_wx_get_scan(struct net_device *dev,</div><div class='ctx'> 	char *stop = ev + wrqu-&gt;data.length;</div><div class='ctx'> 	u32 ret = 0, cnt = 0;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped)</div><div class='add'>+	if (padapter-&gt;driver_stopped)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY |</div><div class='ctx'> 			     _FW_UNDER_LINKING)) {</div><div class='hunk'>@@ -1938,7 +1938,7 @@ static int r871x_get_ap_info(struct net_device *dev,</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	char data[33];</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped || (pdata == NULL))</div><div class='add'>+	if (padapter-&gt;driver_stopped || (pdata == NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY |</div><div class='ctx'> 			     _FW_UNDER_LINKING)) {</div><div class='hunk'>@@ -2002,7 +2002,7 @@ static int r871x_set_pid(struct net_device *dev,</div><div class='ctx'> 	struct _adapter *padapter = netdev_priv(dev);</div><div class='ctx'> 	struct iw_point *pdata = &amp;wrqu-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if ((padapter-&gt;bDriverStopped) || (pdata == NULL))</div><div class='add'>+	if ((padapter-&gt;driver_stopped) || (pdata == NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (copy_from_user(&amp;padapter-&gt;pid, pdata-&gt;pointer, sizeof(int)))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2018,7 +2018,7 @@ static int r871x_set_chplan(struct net_device *dev,</div><div class='ctx'> 	struct iw_point *pdata = &amp;wrqu-&gt;data;</div><div class='ctx'> 	int ch_plan = -1;</div><div class='ctx'> </div><div class='del'>-	if ((padapter-&gt;bDriverStopped) || (pdata == NULL)) {</div><div class='add'>+	if ((padapter-&gt;driver_stopped) || (pdata == NULL)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2038,7 +2038,7 @@ static int r871x_wps_start(struct net_device *dev,</div><div class='ctx'> 	struct iw_point *pdata = &amp;wrqu-&gt;data;</div><div class='ctx'> 	u32   u32wps_start = 0;</div><div class='ctx'> </div><div class='del'>-	if ((padapter-&gt;bDriverStopped) || (pdata == NULL))</div><div class='add'>+	if ((padapter-&gt;driver_stopped) || (pdata == NULL))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (copy_from_user((void *)&amp;u32wps_start, pdata-&gt;pointer, 4))</div><div class='ctx'> 		return -EFAULT;</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c<br/>index 3f17ef6f7e39..7c7267d0fc9e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_mlme.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_mlme.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl871x_mlme.c</a></div><div class='hunk'>@@ -95,7 +95,7 @@ static void _free_network(struct mlme_priv *pmlmepriv,</div><div class='ctx'> 	unsigned long irqL;</div><div class='ctx'> 	struct  __queue *free_queue = &amp;(pmlmepriv-&gt;free_bss_pool);</div><div class='ctx'> </div><div class='del'>-	if (pnetwork == NULL)</div><div class='add'>+	if (!pnetwork)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (pnetwork-&gt;fixed)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -115,7 +115,7 @@ static void free_network_nolock(struct mlme_priv *pmlmepriv,</div><div class='ctx'> {</div><div class='ctx'> 	struct  __queue *free_queue = &amp;pmlmepriv-&gt;free_bss_pool;</div><div class='ctx'> </div><div class='del'>-	if (pnetwork == NULL)</div><div class='add'>+	if (!pnetwork)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (pnetwork-&gt;fixed)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -174,7 +174,7 @@ sint r8712_if_up(struct _adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	sint res;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped || padapter-&gt;bSurpriseRemoved ||</div><div class='add'>+	if (padapter-&gt;driver_stopped || padapter-&gt;surprise_removed ||</div><div class='ctx'> 	    !check_fwstate(&amp;padapter-&gt;mlmepriv, _FW_LINKED)) {</div><div class='ctx'> 		res = false;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -399,7 +399,7 @@ static void update_scanned_network(struct _adapter *adapter,</div><div class='ctx'> 			/* Otherwise just pull from the free list */</div><div class='ctx'> 			/* update scan_time */</div><div class='ctx'> 			pnetwork = alloc_network(pmlmepriv);</div><div class='del'>-			if (pnetwork == NULL)</div><div class='add'>+			if (!pnetwork)</div><div class='ctx'> 				return;</div><div class='ctx'> 			bssid_ex_sz = r8712_get_wlan_bssid_ex_sz(target);</div><div class='ctx'> 			target-&gt;Length = bssid_ex_sz;</div><div class='hunk'>@@ -1055,7 +1055,7 @@ void _r8712_join_timeout_handler(struct _adapter *adapter)</div><div class='ctx'> 	unsigned long irqL;</div><div class='ctx'> 	struct mlme_priv *pmlmepriv = &amp;adapter-&gt;mlmepriv;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;bDriverStopped || adapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (adapter-&gt;driver_stopped || adapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock_irqsave(&amp;pmlmepriv-&gt;lock, irqL);</div><div class='ctx'> 	_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);</div><div class='hunk'>@@ -1084,7 +1084,7 @@ void r8712_scan_timeout_handler (struct _adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> void _r8712_dhcp_timeout_handler (struct _adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if (adapter-&gt;bDriverStopped || adapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (adapter-&gt;driver_stopped || adapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (adapter-&gt;pwrctrlpriv.pwr_mode != adapter-&gt;registrypriv.power_mgnt)</div><div class='ctx'> 		r8712_set_ps_mode(adapter, adapter-&gt;registrypriv.power_mgnt,</div><div class='hunk'>@@ -1120,8 +1120,6 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv)</div><div class='ctx'> 		}</div><div class='ctx'> 		pnetwork = container_of(pmlmepriv-&gt;pscanned,</div><div class='ctx'> 					struct wlan_network, list);</div><div class='del'>-		if (pnetwork == NULL)</div><div class='del'>-			return _FAIL;</div><div class='ctx'> 		pmlmepriv-&gt;pscanned = pmlmepriv-&gt;pscanned-&gt;next;</div><div class='ctx'> 		if (pmlmepriv-&gt;assoc_by_bssid) {</div><div class='ctx'> 			dst_ssid = pnetwork-&gt;network.MacAddress;</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c<br/>index 1d5364f5a518..ba379506da3f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_mp.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_mp.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_mp.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl871x_mp.c</a></div><div class='hunk'>@@ -697,15 +697,14 @@ void r8712_ResetPhyRxPktCount(struct _adapter *pAdapter)</div><div class='ctx'> static u32 GetPhyRxPktCounts(struct _adapter *pAdapter, u32 selbit)</div><div class='ctx'> {</div><div class='ctx'> 	/*selection*/</div><div class='del'>-	u32 phyrx_set = 0, count = 0;</div><div class='add'>+	u32 phyrx_set = 0;</div><div class='ctx'> 	u32 SelectBit;</div><div class='ctx'> </div><div class='ctx'> 	SelectBit = selbit &lt;&lt; 28;</div><div class='ctx'> 	phyrx_set |= (SelectBit &amp; 0xF0000000);</div><div class='ctx'> 	r8712_write32(pAdapter, RXERR_RPT, phyrx_set);</div><div class='ctx'> 	/*Read packet count*/</div><div class='del'>-	count = r8712_read32(pAdapter, RXERR_RPT) &amp; RPTMaxCount;</div><div class='del'>-	return count;</div><div class='add'>+	return r8712_read32(pAdapter, RXERR_RPT) &amp; RPTMaxCount;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 r8712_GetPhyRxPktReceived(struct _adapter *pAdapter)</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c<br/>index 351984fe254e..2beafc7742b3 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_pwrctrl.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_pwrctrl.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_pwrctrl.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl871x_pwrctrl.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ void r8712_set_rpwm(struct _adapter *padapter, u8 val8)</div><div class='ctx'> 		if (pwrpriv-&gt;rpwm_retry == 0)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='del'>-	if (padapter-&gt;bDriverStopped || padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;driver_stopped || padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	rpwm = val8 | pwrpriv-&gt;tog;</div><div class='ctx'> 	switch (val8) {</div><div class='hunk'>@@ -117,7 +117,7 @@ static void _rpwm_check_handler (struct _adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwrctrl_priv *pwrpriv = &amp;padapter-&gt;pwrctrlpriv;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped || padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;driver_stopped || padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (pwrpriv-&gt;cpwm != pwrpriv-&gt;rpwm)</div><div class='ctx'> 		schedule_work(&amp;pwrpriv-&gt;rpwm_workitem);</div><div class='head'>diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c<br/>index 7c8857409916..f6fe8ea12961 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/rtl871x_xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/rtl871x_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/rtl871x_xmit.c</a></div><div class='hunk'>@@ -75,8 +75,8 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,</div><div class='ctx'> 	 * and initialize free_xmit_frame below.</div><div class='ctx'> 	 * Please also apply  free_txobj to link_up all the xmit_frames...</div><div class='ctx'> 	 */</div><div class='del'>-	pxmitpriv-&gt;pallocated_frame_buf = kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4,</div><div class='del'>-						  GFP_ATOMIC);</div><div class='add'>+	pxmitpriv-&gt;pallocated_frame_buf =</div><div class='add'>+		kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4, GFP_ATOMIC);</div><div class='ctx'> 	if (!pxmitpriv-&gt;pallocated_frame_buf) {</div><div class='ctx'> 		pxmitpriv-&gt;pxmit_frame_buf = NULL;</div><div class='ctx'> 		return _FAIL;</div><div class='hunk'>@@ -114,8 +114,8 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,</div><div class='ctx'> 	/*init xmit_buf*/</div><div class='ctx'> 	_init_queue(&amp;pxmitpriv-&gt;free_xmitbuf_queue);</div><div class='ctx'> 	_init_queue(&amp;pxmitpriv-&gt;pending_xmitbuf_queue);</div><div class='del'>-	pxmitpriv-&gt;pallocated_xmitbuf = kmalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4,</div><div class='del'>-						GFP_ATOMIC);</div><div class='add'>+	pxmitpriv-&gt;pallocated_xmitbuf =</div><div class='add'>+		kmalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4, GFP_ATOMIC);</div><div class='ctx'> 	if (!pxmitpriv-&gt;pallocated_xmitbuf) {</div><div class='ctx'> 		kfree(pxmitpriv-&gt;pallocated_frame_buf);</div><div class='ctx'> 		pxmitpriv-&gt;pallocated_frame_buf = NULL;</div><div class='head'>diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c<br/>index 005010de9997..7478bbd3de78 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/usb_intf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/usb_intf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/usb_intf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/usb_intf.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ static int r871x_suspend(struct usb_interface *pusb_intf, pm_message_t state)</div><div class='ctx'> 	struct _adapter *padapter = netdev_priv(pnetdev);</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(pnetdev, "Suspending...\n");</div><div class='del'>-	padapter-&gt;bSuspended = true;</div><div class='add'>+	padapter-&gt;suspended = true;</div><div class='ctx'> 	rtl871x_intf_stop(padapter);</div><div class='ctx'> 	if (pnetdev-&gt;netdev_ops-&gt;ndo_stop)</div><div class='ctx'> 		pnetdev-&gt;netdev_ops-&gt;ndo_stop(pnetdev);</div><div class='hunk'>@@ -220,7 +220,7 @@ static int r871x_resume(struct usb_interface *pusb_intf)</div><div class='ctx'> 	netif_device_attach(pnetdev);</div><div class='ctx'> 	if (pnetdev-&gt;netdev_ops-&gt;ndo_open)</div><div class='ctx'> 		pnetdev-&gt;netdev_ops-&gt;ndo_open(pnetdev);</div><div class='del'>-	padapter-&gt;bSuspended = false;</div><div class='add'>+	padapter-&gt;suspended = false;</div><div class='ctx'> 	rtl871x_intf_resume(padapter);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -271,7 +271,7 @@ static void r8712_usb_dvobj_deinit(struct _adapter *padapter)</div><div class='ctx'> void rtl871x_intf_stop(struct _adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	/*disable_hw_interrupt*/</div><div class='del'>-	if (!padapter-&gt;bSurpriseRemoved) {</div><div class='add'>+	if (!padapter-&gt;surprise_removed) {</div><div class='ctx'> 		/*device still exists, so driver can do i/o operation</div><div class='ctx'> 		 * TODO:</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -289,7 +289,7 @@ void r871x_dev_unload(struct _adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	if (padapter-&gt;bup) {</div><div class='ctx'> 		/*s1.*/</div><div class='del'>-		padapter-&gt;bDriverStopped = true;</div><div class='add'>+		padapter-&gt;driver_stopped = true;</div><div class='ctx'> </div><div class='ctx'> 		/*s3.*/</div><div class='ctx'> 		rtl871x_intf_stop(padapter);</div><div class='hunk'>@@ -298,7 +298,7 @@ void r871x_dev_unload(struct _adapter *padapter)</div><div class='ctx'> 		r8712_stop_drv_threads(padapter);</div><div class='ctx'> </div><div class='ctx'> 		/*s5.*/</div><div class='del'>-		if (!padapter-&gt;bSurpriseRemoved) {</div><div class='add'>+		if (!padapter-&gt;surprise_removed) {</div><div class='ctx'> 			padapter-&gt;hw_init_completed = false;</div><div class='ctx'> 			rtl8712_hal_deinit(padapter);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -600,7 +600,7 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)</div><div class='ctx'> 		/* never exit with a firmware callback pending */</div><div class='ctx'> 		wait_for_completion(&amp;padapter-&gt;rtl8712_fw_ready);</div><div class='ctx'> 		if (drvpriv.drv_registered)</div><div class='del'>-			padapter-&gt;bSurpriseRemoved = true;</div><div class='add'>+			padapter-&gt;surprise_removed = true;</div><div class='ctx'> 		unregister_netdev(pnetdev); /* will call netdev_close() */</div><div class='ctx'> 		flush_scheduled_work();</div><div class='ctx'> 		udelay(1);</div><div class='head'>diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c<br/>index ee5968808332..9d290bc2fdb7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/usb_ops_linux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8712/usb_ops_linux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8712/usb_ops_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8712/usb_ops_linux.c</a></div><div class='hunk'>@@ -147,9 +147,9 @@ static void usb_write_mem_complete(struct urb *purb)</div><div class='ctx'> </div><div class='ctx'> 	if (purb-&gt;status != 0) {</div><div class='ctx'> 		if (purb-&gt;status == (-ESHUTDOWN))</div><div class='del'>-			padapter-&gt;bDriverStopped = true;</div><div class='add'>+			padapter-&gt;driver_stopped = true;</div><div class='ctx'> 		else</div><div class='del'>-			padapter-&gt;bSurpriseRemoved = true;</div><div class='add'>+			padapter-&gt;surprise_removed = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	complete(&amp;pintfpriv-&gt;io_retevt_comp);</div><div class='ctx'> }</div><div class='hunk'>@@ -164,7 +164,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)</div><div class='ctx'> 	struct usb_device *pusbd = pdvobj-&gt;pusbdev;</div><div class='ctx'> 	struct urb *piorw_urb = pintfpriv-&gt;piorw_urb;</div><div class='ctx'> </div><div class='del'>-	if ((padapter-&gt;bDriverStopped) || (padapter-&gt;bSurpriseRemoved) ||</div><div class='add'>+	if ((padapter-&gt;driver_stopped) || (padapter-&gt;surprise_removed) ||</div><div class='ctx'> 	    (padapter-&gt;pwrctrlpriv.pnp_bstop_trx))</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* translate DMA FIFO addr to pipehandle */</div><div class='hunk'>@@ -186,7 +186,7 @@ static void r8712_usb_read_port_complete(struct urb *purb)</div><div class='ctx'> 	struct _adapter *padapter = (struct _adapter *)precvbuf-&gt;adapter;</div><div class='ctx'> 	struct recv_priv *precvpriv = &amp;padapter-&gt;recvpriv;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved || padapter-&gt;bDriverStopped)</div><div class='add'>+	if (padapter-&gt;surprise_removed || padapter-&gt;driver_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (purb-&gt;status == 0) { /* SUCCESS */</div><div class='ctx'> 		if ((purb-&gt;actual_length &gt; (MAX_RECVBUF_SZ)) ||</div><div class='hunk'>@@ -218,11 +218,11 @@ static void r8712_usb_read_port_complete(struct urb *purb)</div><div class='ctx'> 		case -EPIPE:</div><div class='ctx'> 		case -ENODEV:</div><div class='ctx'> 		case -ESHUTDOWN:</div><div class='del'>-			padapter-&gt;bDriverStopped = true;</div><div class='add'>+			padapter-&gt;driver_stopped = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -ENOENT:</div><div class='del'>-			if (!padapter-&gt;bSuspended) {</div><div class='del'>-				padapter-&gt;bDriverStopped = true;</div><div class='add'>+			if (!padapter-&gt;suspended) {</div><div class='add'>+				padapter-&gt;driver_stopped = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Fall through. */</div><div class='hunk'>@@ -254,7 +254,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)</div><div class='ctx'> 	struct recv_priv *precvpriv = &amp;adapter-&gt;recvpriv;</div><div class='ctx'> 	struct usb_device *pusbd = pdvobj-&gt;pusbdev;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;bDriverStopped || adapter-&gt;bSurpriseRemoved ||</div><div class='add'>+	if (adapter-&gt;driver_stopped || adapter-&gt;surprise_removed ||</div><div class='ctx'> 	    adapter-&gt;pwrctrlpriv.pnp_bstop_trx || !precvbuf)</div><div class='ctx'> 		return _FAIL;</div><div class='ctx'> 	r8712_init_recvbuf(adapter, precvbuf);</div><div class='hunk'>@@ -314,9 +314,9 @@ void r8712_xmit_bh(void *priv)</div><div class='ctx'> 	struct _adapter *padapter = priv;</div><div class='ctx'> 	struct xmit_priv *pxmitpriv = &amp;padapter-&gt;xmitpriv;</div><div class='ctx'> </div><div class='del'>-	if (padapter-&gt;bDriverStopped ||</div><div class='del'>-	    padapter-&gt;bSurpriseRemoved) {</div><div class='del'>-		netdev_err(padapter-&gt;pnetdev, "xmit_bh =&gt; bDriverStopped or bSurpriseRemoved\n");</div><div class='add'>+	if (padapter-&gt;driver_stopped ||</div><div class='add'>+	    padapter-&gt;surprise_removed) {</div><div class='add'>+		netdev_err(padapter-&gt;pnetdev, "xmit_bh =&gt; driver_stopped or surprise_removed\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = r8712_xmitframe_complete(padapter, pxmitpriv, NULL);</div><div class='hunk'>@@ -360,7 +360,7 @@ static void usb_write_port_complete(struct urb *purb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (padapter-&gt;bSurpriseRemoved)</div><div class='add'>+	if (padapter-&gt;surprise_removed)</div><div class='ctx'> 		return;</div><div class='ctx'> 	switch (purb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -390,7 +390,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)</div><div class='ctx'> 	struct usb_device *pusbd = pdvobj-&gt;pusbdev;</div><div class='ctx'> 	struct pkt_attrib *pattrib = &amp;pxmitframe-&gt;attrib;</div><div class='ctx'> </div><div class='del'>-	if ((padapter-&gt;bDriverStopped) || (padapter-&gt;bSurpriseRemoved) ||</div><div class='add'>+	if ((padapter-&gt;driver_stopped) || (padapter-&gt;surprise_removed) ||</div><div class='ctx'> 	    (padapter-&gt;pwrctrlpriv.pnp_bstop_trx))</div><div class='ctx'> 		return _FAIL;</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/Kconfig b/drivers/staging/rtl8723bs/Kconfig<br/>index deae0427ba6c..744091d46f4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/Kconfig</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/Kconfig?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config RTL8723BS</div><div class='ctx'> 	tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"</div><div class='ctx'> 	depends on WLAN &amp;&amp; MMC &amp;&amp; CFG80211</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c<br/>index cbbfef389874..bc0230672457 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_ap.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_ap.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_ap.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_ap.c</a></div><div class='hunk'>@@ -782,12 +782,8 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)</div><div class='ctx'> 	/* check if there is wps ie, */</div><div class='ctx'> 	/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */</div><div class='ctx'> 	/* and at first time the security ie (RSN/WPA IE) will not include in beacon. */</div><div class='del'>-	if (NULL == rtw_get_wps_ie(</div><div class='del'>-		pnetwork-&gt;IEs+_FIXED_IE_LENGTH_,</div><div class='del'>-		pnetwork-&gt;IELength-_FIXED_IE_LENGTH_,</div><div class='del'>-		NULL,</div><div class='del'>-		NULL</div><div class='del'>-	))</div><div class='add'>+	if (!rtw_get_wps_ie(pnetwork-&gt;IEs+_FIXED_IE_LENGTH_,</div><div class='add'>+			    pnetwork-&gt;IELength-_FIXED_IE_LENGTH_, NULL, NULL))</div><div class='ctx'> 		pmlmeext-&gt;bstart_bss = true;</div><div class='ctx'> </div><div class='ctx'> 	/* todo: update wmm, ht cap */</div><div class='hunk'>@@ -2340,8 +2336,8 @@ void rtw_ap_restore_network(struct adapter *padapter)</div><div class='ctx'> 			Update_RA_Entry(padapter, psta);</div><div class='ctx'> 			/* pairwise key */</div><div class='ctx'> 			/* per sta pairwise key and settings */</div><div class='del'>-			if ((padapter-&gt;securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||</div><div class='del'>-				(padapter-&gt;securitypriv.dot11PrivacyAlgrthm == _AES_)) {</div><div class='add'>+			if ((psecuritypriv-&gt;dot11PrivacyAlgrthm == _TKIP_) ||</div><div class='add'>+				(psecuritypriv-&gt;dot11PrivacyAlgrthm == _AES_)) {</div><div class='ctx'> 				rtw_setstakey_cmd(padapter, psta, true, false);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c<br/>index 91520ca3bbad..ecaa769f12e6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_cmd.c</a></div><div class='hunk'>@@ -162,9 +162,9 @@ Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.</div><div class='ctx'> No irqsave is necessary.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-sint	_rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv)</div><div class='add'>+int rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv)</div><div class='ctx'> {</div><div class='del'>-	sint res = _SUCCESS;</div><div class='add'>+	int res = 0;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;pcmdpriv-&gt;cmd_queue_comp);</div><div class='ctx'> 	init_completion(&amp;pcmdpriv-&gt;terminate_cmdthread_comp);</div><div class='hunk'>@@ -177,8 +177,8 @@ sint	_rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv)</div><div class='ctx'> </div><div class='ctx'> 	pcmdpriv-&gt;cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ);</div><div class='ctx'> </div><div class='del'>-	if (pcmdpriv-&gt;cmd_allocated_buf == NULL) {</div><div class='del'>-		res = _FAIL;</div><div class='add'>+	if (!pcmdpriv-&gt;cmd_allocated_buf) {</div><div class='add'>+		res = -ENOMEM;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -186,8 +186,8 @@ sint	_rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv)</div><div class='ctx'> </div><div class='ctx'> 	pcmdpriv-&gt;rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4);</div><div class='ctx'> </div><div class='del'>-	if (pcmdpriv-&gt;rsp_allocated_buf == NULL) {</div><div class='del'>-		res = _FAIL;</div><div class='add'>+	if (!pcmdpriv-&gt;rsp_allocated_buf) {</div><div class='add'>+		res = -ENOMEM;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -201,10 +201,8 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c2h_wk_callback(_workitem *work);</div><div class='del'>-sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)</div><div class='add'>+int rtw_init_evt_priv(struct evt_priv *pevtpriv)</div><div class='ctx'> {</div><div class='del'>-	sint res = _SUCCESS;</div><div class='del'>-</div><div class='ctx'> 	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */</div><div class='ctx'> 	atomic_set(&amp;pevtpriv-&gt;event_seq, 0);</div><div class='ctx'> 	pevtpriv-&gt;evt_done_cnt = 0;</div><div class='hunk'>@@ -212,8 +210,10 @@ sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)</div><div class='ctx'> 	_init_workitem(&amp;pevtpriv-&gt;c2h_wk, c2h_wk_callback, NULL);</div><div class='ctx'> 	pevtpriv-&gt;c2h_wk_alive = false;</div><div class='ctx'> 	pevtpriv-&gt;c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1);</div><div class='add'>+	if (!pevtpriv-&gt;c2h_queue)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return res;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void _rtw_free_evt_priv(struct	evt_priv *pevtpriv)</div><div class='hunk'>@@ -256,7 +256,7 @@ ISR/Call-Back functions can't call this sub-function.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-sint	_rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)</div><div class='add'>+int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)</div><div class='ctx'> {</div><div class='ctx'> 	_irqL irqL;</div><div class='ctx'> </div><div class='hunk'>@@ -295,22 +295,6 @@ struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue)</div><div class='ctx'> 	return obj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)</div><div class='del'>-{</div><div class='del'>-	u32 res;</div><div class='del'>-</div><div class='del'>-	res = _rtw_init_cmd_priv(pcmdpriv);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 rtw_init_evt_priv(struct	evt_priv *pevtpriv)</div><div class='del'>-{</div><div class='del'>-	int	res;</div><div class='del'>-</div><div class='del'>-	res = _rtw_init_evt_priv(pevtpriv);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void rtw_free_evt_priv(struct	evt_priv *pevtpriv)</div><div class='ctx'> {</div><div class='ctx'> 	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_evt_priv\n"));</div><div class='hunk'>@@ -347,7 +331,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)</div><div class='add'>+int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)</div><div class='ctx'> {</div><div class='ctx'> 	int res = _FAIL;</div><div class='ctx'> 	struct adapter *padapter = pcmdpriv-&gt;padapter;</div><div class='hunk'>@@ -735,12 +719,12 @@ exit:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 rtw_startbss_cmd(struct adapter  *padapter, int flags)</div><div class='add'>+int rtw_startbss_cmd(struct adapter  *padapter, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_obj *pcmd;</div><div class='ctx'> 	struct cmd_priv  *pcmdpriv = &amp;padapter-&gt;cmdpriv;</div><div class='ctx'> 	struct submit_ctx sctx;</div><div class='del'>-	u8 res = _SUCCESS;</div><div class='add'>+	int res = _SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; RTW_CMDF_DIRECTLY) {</div><div class='ctx'> 		/* no need to enqueue, do the cmd hdl directly and free cmd parameter */</div><div class='hunk'>@@ -2007,11 +1991,6 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)</div><div class='ctx'> 	case CHECK_HIQ_WK_CID:</div><div class='ctx'> 		rtw_chk_hi_queue_hdl(padapter);</div><div class='ctx'> 		break;</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	case INTEl_WIDI_WK_CID:</div><div class='del'>-		intel_widi_wk_hdl(padapter, pdrvextra_cmd-&gt;type, pdrvextra_cmd-&gt;pbuf);</div><div class='del'>-		break;</div><div class='del'>-#endif /* CONFIG_INTEL_WIDI */</div><div class='ctx'> 	/* add for CONFIG_IEEE80211W, none 11w can use it */</div><div class='ctx'> 	case RESET_SECURITYPRIV:</div><div class='ctx'> 		reset_securitypriv_hdl(padapter);</div><div class='hunk'>@@ -2121,7 +2100,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)</div><div class='ctx'> </div><div class='ctx'> 		rtw_indicate_connect(padapter);</div><div class='ctx'> 	} else {</div><div class='del'>-		pwlan = _rtw_alloc_network(pmlmepriv);</div><div class='add'>+		pwlan = rtw_alloc_network(pmlmepriv);</div><div class='ctx'> 		spin_lock_bh(&amp;(pmlmepriv-&gt;scanned_queue.lock));</div><div class='ctx'> 		if (pwlan == NULL) {</div><div class='ctx'> 			pwlan = rtw_get_oldest_wlan_network(&amp;pmlmepriv-&gt;scanned_queue);</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c<br/>index a3c8a712bdc2..9f8446ccf771 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_debug.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_debug.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_debug.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_debug.c</a></div><div class='hunk'>@@ -1395,16 +1395,16 @@ ssize_t proc_set_btcoex_dbg(struct file *file, const char __user *buffer, size_t</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	num = sscanf(tmp, "%x %x", module, module+1);</div><div class='del'>-	if (1 == num) {</div><div class='del'>-		if (0 == module[0])</div><div class='add'>+	if (num == 1) {</div><div class='add'>+		if (module[0] == 0)</div><div class='ctx'> 			memset(module, 0, sizeof(module));</div><div class='ctx'> 		else</div><div class='ctx'> 			memset(module, 0xFF, sizeof(module));</div><div class='del'>-	} else if (2 != num) {</div><div class='add'>+	} else if (num != 2) {</div><div class='ctx'> 		DBG_871X(FUNC_ADPT_FMT ": input(\"%s\") format incorrect!\n",</div><div class='ctx'> 			FUNC_ADPT_ARG(padapter), tmp);</div><div class='ctx'> </div><div class='del'>-		if (0 == num)</div><div class='add'>+		if (num == 0)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1425,9 +1425,8 @@ int proc_get_btcoex_info(struct seq_file *m, void *v)</div><div class='ctx'> 	padapter = (struct adapter *)rtw_netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	pbuf = rtw_zmalloc(bufsize);</div><div class='del'>-	if (NULL == pbuf) {</div><div class='add'>+	if (!pbuf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	rtw_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c<br/>index eea3bece59a1..3b8848182221 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_efuse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_efuse.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_efuse.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_efuse.c</a></div><div class='hunk'>@@ -125,11 +125,8 @@ Efuse_GetCurrentSize(</div><div class='ctx'> 	u8 	efuseType,</div><div class='ctx'> 	bool		bPseudoTest)</div><div class='ctx'> {</div><div class='del'>-	u16 ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = padapter-&gt;HalFunc.EfuseGetCurrentSize(padapter, efuseType, bPseudoTest);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return padapter-&gt;HalFunc.EfuseGetCurrentSize(padapter, efuseType,</div><div class='add'>+						     bPseudoTest);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*  11/16/2008 MH Add description. Get current efuse area enabled word!!. */</div><div class='hunk'>@@ -221,7 +218,6 @@ EFUSE_Read1Byte(</div><div class='ctx'> struct adapter *Adapter,</div><div class='ctx'> u16 	Address)</div><div class='ctx'> {</div><div class='del'>-	u8 data;</div><div class='ctx'> 	u8 Bytetemp = {0x00};</div><div class='ctx'> 	u8 temp = {0x00};</div><div class='ctx'> 	u32 k = 0;</div><div class='hunk'>@@ -253,8 +249,7 @@ u16 	Address)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		data = rtw_read8(Adapter, EFUSE_CTRL);</div><div class='del'>-		return data;</div><div class='add'>+		return rtw_read8(Adapter, EFUSE_CTRL);</div><div class='ctx'> 	} else</div><div class='ctx'> 		return 0xFF;</div><div class='ctx'> </div><div class='hunk'>@@ -378,11 +373,8 @@ Efuse_PgPacketRead(struct adapter *padapter,</div><div class='ctx'> 				u8 	*data,</div><div class='ctx'> 				bool		bPseudoTest)</div><div class='ctx'> {</div><div class='del'>-	int	ret = 0;</div><div class='del'>-</div><div class='del'>-	ret =  padapter-&gt;HalFunc.Efuse_PgPacketRead(padapter, offset, data, bPseudoTest);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return padapter-&gt;HalFunc.Efuse_PgPacketRead(padapter, offset, data,</div><div class='add'>+						    bPseudoTest);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -392,11 +384,8 @@ Efuse_PgPacketWrite(struct adapter *padapter,</div><div class='ctx'> 				u8 	*data,</div><div class='ctx'> 				bool		bPseudoTest)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret =  padapter-&gt;HalFunc.Efuse_PgPacketWrite(padapter, offset, word_en, data, bPseudoTest);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return padapter-&gt;HalFunc.Efuse_PgPacketWrite(padapter, offset, word_en,</div><div class='add'>+						     data, bPseudoTest);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------------------------------</div><div class='hunk'>@@ -447,11 +436,9 @@ Efuse_WordEnableDataWrite(struct adapter *padapter,</div><div class='ctx'> 						u8 *data,</div><div class='ctx'> 						bool		bPseudoTest)</div><div class='ctx'> {</div><div class='del'>-	u8 ret = 0;</div><div class='del'>-</div><div class='del'>-	ret =  padapter-&gt;HalFunc.Efuse_WordEnableDataWrite(padapter, efuse_addr, word_en, data, bPseudoTest);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return padapter-&gt;HalFunc.Efuse_WordEnableDataWrite(padapter, efuse_addr,</div><div class='add'>+							   word_en, data,</div><div class='add'>+							   bPseudoTest);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------------------------------</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c<br/>index ac203c01c098..aaf27438cd81 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_ieee80211.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_ieee80211.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_ieee80211.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_ieee80211.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *sourc</div><div class='ctx'> {</div><div class='ctx'> 	memcpy((void *)pbuf, (void *)source, len);</div><div class='ctx'> 	*frlen = *frlen + len;</div><div class='del'>-	return (pbuf + len);</div><div class='add'>+	return pbuf + len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*  rtw_set_ie will update frame length */</div><div class='hunk'>@@ -136,7 +136,7 @@ u8 *rtw_set_ie</div><div class='ctx'> </div><div class='ctx'> 	*frlen = *frlen + (len + 2);</div><div class='ctx'> </div><div class='del'>-	return (pbuf + len + 2);</div><div class='add'>+	return pbuf + len + 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------------------</div><div class='hunk'>@@ -706,7 +706,7 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (*rsn_len + *wpa_len);</div><div class='add'>+	return *rsn_len + *wpa_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen)</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c<br/>index d341069097e2..a92bc19b196a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_io.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_io.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_io.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_io.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct adapt</div><div class='ctx'> 	struct io_priv *piopriv = &amp;padapter-&gt;iopriv;</div><div class='ctx'> 	struct intf_hdl *pintf = &amp;piopriv-&gt;intf;</div><div class='ctx'> </div><div class='del'>-	if (set_intf_ops == NULL)</div><div class='add'>+	if (!set_intf_ops)</div><div class='ctx'> 		return _FAIL;</div><div class='ctx'> </div><div class='ctx'> 	piopriv-&gt;padapter = padapter;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c<br/>index 0c8a050b2a81..bd75bca1ac6e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_ioctl_set.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_ioctl_set.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)</div><div class='ctx'> 	for (i = 0; i &lt; ssid-&gt;SsidLength; i++) {</div><div class='ctx'> 		/* wifi, printable ascii code must be supported */</div><div class='ctx'> 		if (!((ssid-&gt;Ssid[i] &gt;= 0x20) &amp;&amp; (ssid-&gt;Ssid[i] &lt;= 0x7e))) {</div><div class='del'>-			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n"));</div><div class='add'>+			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has non-printable ascii\n"));</div><div class='ctx'> 			ret = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c<br/>index 406e313477aa..5f78f1eaa7aa 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_mlme.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_mlme.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_mlme.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_mlme.c</a></div><div class='hunk'>@@ -13,13 +13,13 @@</div><div class='ctx'> </div><div class='ctx'> extern u8 rtw_do_join(struct adapter *padapter);</div><div class='ctx'> </div><div class='del'>-sint	_rtw_init_mlme_priv(struct adapter *padapter)</div><div class='add'>+int	rtw_init_mlme_priv(struct adapter *padapter)</div><div class='ctx'> {</div><div class='del'>-	sint	i;</div><div class='add'>+	int	i;</div><div class='ctx'> 	u8 *pbuf;</div><div class='ctx'> 	struct wlan_network	*pnetwork;</div><div class='ctx'> 	struct mlme_priv 	*pmlmepriv = &amp;padapter-&gt;mlmepriv;</div><div class='del'>-	sint	res = _SUCCESS;</div><div class='add'>+	int	res = _SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	pmlmepriv-&gt;nic_hdl = (u8 *)padapter;</div><div class='ctx'> </div><div class='hunk'>@@ -29,9 +29,9 @@ sint	_rtw_init_mlme_priv(struct adapter *padapter)</div><div class='ctx'> 	pmlmepriv-&gt;cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown;</div><div class='ctx'> 	pmlmepriv-&gt;scan_mode = SCAN_ACTIVE;/*  1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;(pmlmepriv-&gt;lock));</div><div class='del'>-	_rtw_init_queue(&amp;(pmlmepriv-&gt;free_bss_pool));</div><div class='del'>-	_rtw_init_queue(&amp;(pmlmepriv-&gt;scanned_queue));</div><div class='add'>+	spin_lock_init(&amp;pmlmepriv-&gt;lock);</div><div class='add'>+	_rtw_init_queue(&amp;pmlmepriv-&gt;free_bss_pool);</div><div class='add'>+	_rtw_init_queue(&amp;pmlmepriv-&gt;scanned_queue);</div><div class='ctx'> </div><div class='ctx'> 	set_scanned_network_val(pmlmepriv, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -48,9 +48,9 @@ sint	_rtw_init_mlme_priv(struct adapter *padapter)</div><div class='ctx'> 	pnetwork = (struct wlan_network *)pbuf;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_BSS_CNT; i++) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;(pnetwork-&gt;list));</div><div class='add'>+		INIT_LIST_HEAD(&amp;pnetwork-&gt;list);</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;(pnetwork-&gt;list), &amp;(pmlmepriv-&gt;free_bss_pool.queue));</div><div class='add'>+		list_add_tail(&amp;pnetwork-&gt;list, &amp;pmlmepriv-&gt;free_bss_pool.queue);</div><div class='ctx'> </div><div class='ctx'> 		pnetwork++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -143,7 +143,7 @@ struct	wlan_network *_rtw_dequeue_network(struct __queue *queue)</div><div class='ctx'> }</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-struct	wlan_network *_rtw_alloc_network(struct	mlme_priv *pmlmepriv)/* _queue *free_queue) */</div><div class='add'>+struct	wlan_network *rtw_alloc_network(struct	mlme_priv *pmlmepriv)</div><div class='ctx'> {</div><div class='ctx'> 	struct	wlan_network	*pnetwork;</div><div class='ctx'> 	struct __queue *free_queue = &amp;pmlmepriv-&gt;free_bss_pool;</div><div class='hunk'>@@ -161,7 +161,8 @@ struct	wlan_network *_rtw_alloc_network(struct	mlme_priv *pmlmepriv)/* _queue *f</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;pnetwork-&gt;list);</div><div class='ctx'> </div><div class='del'>-	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr =%p\n", plist));</div><div class='add'>+	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,</div><div class='add'>+		 ("rtw_alloc_network: ptr =%p\n", plist));</div><div class='ctx'> 	pnetwork-&gt;network_type = 0;</div><div class='ctx'> 	pnetwork-&gt;fixed = false;</div><div class='ctx'> 	pnetwork-&gt;last_scanned = jiffies;</div><div class='hunk'>@@ -332,7 +333,7 @@ void rtw_generate_random_ibss(u8 *pibss)</div><div class='ctx'> </div><div class='ctx'> u8 *rtw_get_capability_from_ie(u8 *ie)</div><div class='ctx'> {</div><div class='del'>-	return (ie + 8 + 2);</div><div class='add'>+	return ie + 8 + 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -347,16 +348,7 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss)</div><div class='ctx'> </div><div class='ctx'> u8 *rtw_get_beacon_interval_from_ie(u8 *ie)</div><div class='ctx'> {</div><div class='del'>-	return (ie + 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int	rtw_init_mlme_priv(struct adapter *padapter)/* struct	mlme_priv *pmlmepriv) */</div><div class='del'>-{</div><div class='del'>-	int	res;</div><div class='del'>-</div><div class='del'>-	res = _rtw_init_mlme_priv(padapter);/*  (pmlmepriv); */</div><div class='del'>-	return res;</div><div class='add'>+	return ie + 8;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)</div><div class='hunk'>@@ -375,15 +367,6 @@ static struct	wlan_network *rtw_dequeue_network(struct __queue *queue)</div><div class='ctx'> }</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-struct	wlan_network *rtw_alloc_network(struct	mlme_priv *pmlmepriv);</div><div class='del'>-struct	wlan_network *rtw_alloc_network(struct	mlme_priv *pmlmepriv)/* _queue	*free_queue) */</div><div class='del'>-{</div><div class='del'>-	struct	wlan_network	*pnetwork;</div><div class='del'>-</div><div class='del'>-	pnetwork = _rtw_alloc_network(pmlmepriv);</div><div class='del'>-	return pnetwork;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork);</div><div class='ctx'> void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork)</div><div class='ctx'> {</div><div class='hunk'>@@ -451,14 +434,14 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea</div><div class='ctx'> 	s_cap = le16_to_cpu(tmps);</div><div class='ctx'> 	d_cap = le16_to_cpu(tmpd);</div><div class='ctx'> </div><div class='del'>-	return ((src-&gt;Ssid.SsidLength == dst-&gt;Ssid.SsidLength) &amp;&amp;</div><div class='add'>+	return (src-&gt;Ssid.SsidLength == dst-&gt;Ssid.SsidLength) &amp;&amp;</div><div class='ctx'> 		/* 	(src-&gt;Configuration.DSConfig == dst-&gt;Configuration.DSConfig) &amp;&amp; */</div><div class='ctx'> 			((!memcmp(src-&gt;MacAddress, dst-&gt;MacAddress, ETH_ALEN))) &amp;&amp;</div><div class='ctx'> 			((!memcmp(src-&gt;Ssid.Ssid, dst-&gt;Ssid.Ssid, src-&gt;Ssid.SsidLength))) &amp;&amp;</div><div class='ctx'> 			((s_cap &amp; WLAN_CAPABILITY_IBSS) ==</div><div class='ctx'> 			(d_cap &amp; WLAN_CAPABILITY_IBSS)) &amp;&amp;</div><div class='ctx'> 			((s_cap &amp; WLAN_CAPABILITY_BSS) ==</div><div class='del'>-			(d_cap &amp; WLAN_CAPABILITY_BSS)));</div><div class='add'>+			(d_cap &amp; WLAN_CAPABILITY_BSS));</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -943,13 +926,6 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)</div><div class='ctx'> 						|| _SUCCESS != rtw_sitesurvey_cmd(adapter, &amp;pmlmepriv-&gt;assoc_ssid, 1, NULL, 0)</div><div class='ctx'> 					) {</div><div class='ctx'> 						rtw_set_to_roam(adapter, 0);</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-						if (adapter-&gt;mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {</div><div class='del'>-							memset(pmlmepriv-&gt;sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);</div><div class='del'>-							intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0);</div><div class='del'>-							DBG_871X("change to widi listen\n");</div><div class='del'>-						}</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='ctx'> 						rtw_free_assoc_resources(adapter, 1);</div><div class='ctx'> 						rtw_indicate_disconnect(adapter);</div><div class='ctx'> 					} else {</div><div class='hunk'>@@ -1108,14 +1084,6 @@ void rtw_indicate_connect(struct adapter *padapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rtw_set_to_roam(padapter, 0);</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	if (padapter-&gt;mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {</div><div class='del'>-		memset(pmlmepriv-&gt;sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);</div><div class='del'>-		intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL, 0);</div><div class='del'>-		DBG_871X("change to widi listen\n");</div><div class='del'>-	}</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> 	rtw_set_scan_deny(padapter, 3000);</div><div class='ctx'> </div><div class='ctx'> 	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state = 0x%08x\n", get_fwstate(pmlmepriv)));</div><div class='hunk'>@@ -1703,11 +1671,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)</div><div class='ctx'> 			roam = true;</div><div class='ctx'> 			roam_target = pmlmepriv-&gt;roam_network;</div><div class='ctx'> 		}</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-		else if (adapter-&gt;mlmepriv.widi_state == INTEL_WIDI_STATE_CONNECTED) {</div><div class='del'>-			roam = true;</div><div class='del'>-		}</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='ctx'> </div><div class='ctx'> 		if (roam == true) {</div><div class='ctx'> 			if (rtw_to_roam(adapter) &gt; 0)</div><div class='hunk'>@@ -1732,11 +1695,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;(pmlmepriv-&gt;scanned_queue.lock));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-		if (!rtw_to_roam(adapter))</div><div class='del'>-			process_intel_widi_disconnect(adapter, 1);</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> 		_rtw_roaming(adapter, roam_target);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1833,13 +1791,6 @@ void _rtw_join_timeout_handler(struct timer_list *t)</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			} else {</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-				if (adapter-&gt;mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {</div><div class='del'>-					memset(pmlmepriv-&gt;sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);</div><div class='del'>-					intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0);</div><div class='del'>-					DBG_871X("change to widi listen\n");</div><div class='del'>-				}</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='ctx'> 				DBG_871X("%s We've try roaming but fail\n", __func__);</div><div class='ctx'> 				rtw_indicate_disconnect(adapter);</div><div class='ctx'> 				break;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c<br/>index ebb45acb4446..d110d4514771 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_mlme_ext.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_mlme_ext.c</a></div><div class='hunk'>@@ -697,10 +697,9 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)</div><div class='ctx'> 					psta-&gt;aid = 0;</div><div class='ctx'> 					DBG_871X("no room for more AIDs\n");</div><div class='ctx'> 					return _SUCCESS;</div><div class='del'>-				} else {</div><div class='del'>-					pstapriv-&gt;sta_aid[psta-&gt;aid - 1] = psta;</div><div class='del'>-					DBG_871X("allocate new AID = (%d)\n", psta-&gt;aid);</div><div class='ctx'> 				}</div><div class='add'>+				pstapriv-&gt;sta_aid[psta-&gt;aid - 1] = psta;</div><div class='add'>+				DBG_871X("allocate new AID = (%d)\n", psta-&gt;aid);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			psta-&gt;qos_option = 1;</div><div class='hunk'>@@ -816,7 +815,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)</div><div class='ctx'> 					update_network(&amp;(pmlmepriv-&gt;cur_network.network), pbss, padapter, true);</div><div class='ctx'> 					rtw_get_bcn_info(&amp;(pmlmepriv-&gt;cur_network));</div><div class='ctx'> 				}</div><div class='del'>-				kfree((u8 *)pbss);</div><div class='add'>+				kfree(pbss);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* check the vendor of the assoc AP */</div><div class='hunk'>@@ -1982,7 +1981,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra</div><div class='ctx'> 			if (status == 0) {</div><div class='ctx'> 				/* successful */</div><div class='ctx'> 				DBG_871X("agg_enable for TID =%d\n", tid);</div><div class='del'>-				psta-&gt;htpriv.agg_enable_bitmap |= 1 &lt;&lt; tid;</div><div class='add'>+				psta-&gt;htpriv.agg_enable_bitmap |= BIT(tid);</div><div class='ctx'> 				psta-&gt;htpriv.candidate_tid_bitmap &amp;= ~BIT(tid);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				psta-&gt;htpriv.agg_enable_bitmap &amp;= ~BIT(tid);</div><div class='hunk'>@@ -2000,8 +1999,10 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra</div><div class='ctx'> </div><div class='ctx'> 		case RTW_WLAN_ACTION_DELBA: /* DELBA */</div><div class='ctx'> 			if ((frame_body[3] &amp; BIT(3)) == 0) {</div><div class='del'>-				psta-&gt;htpriv.agg_enable_bitmap &amp;= ~(1 &lt;&lt; ((frame_body[3] &gt;&gt; 4) &amp; 0xf));</div><div class='del'>-				psta-&gt;htpriv.candidate_tid_bitmap &amp;= ~(1 &lt;&lt; ((frame_body[3] &gt;&gt; 4) &amp; 0xf));</div><div class='add'>+				psta-&gt;htpriv.agg_enable_bitmap &amp;=</div><div class='add'>+					~BIT((frame_body[3] &gt;&gt; 4) &amp; 0xf);</div><div class='add'>+				psta-&gt;htpriv.candidate_tid_bitmap &amp;=</div><div class='add'>+					~BIT((frame_body[3] &gt;&gt; 4) &amp; 0xf);</div><div class='ctx'> </div><div class='ctx'> 				/* reason_code = frame_body[4] | (frame_body[5] &lt;&lt; 8); */</div><div class='ctx'> 				reason_code = RTW_GET_LE16(&amp;frame_body[4]);</div><div class='hunk'>@@ -3512,7 +3513,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* da == NULL, assum it's null data for sta to ap*/</div><div class='del'>-	if (da == NULL)</div><div class='add'>+	if (!da)</div><div class='ctx'> 		da = get_my_bssid(&amp;(pmlmeinfo-&gt;network));</div><div class='ctx'> </div><div class='ctx'> 	psta = rtw_get_stainfo(&amp;padapter-&gt;stapriv, da);</div><div class='hunk'>@@ -3569,7 +3570,6 @@ exit:</div><div class='ctx'>  */</div><div class='ctx'> s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct mlme_ext_priv *pmlmeext;</div><div class='ctx'> 	struct mlme_ext_info *pmlmeinfo;</div><div class='ctx'> </div><div class='hunk'>@@ -3578,12 +3578,10 @@ s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da)</div><div class='ctx'> 	pmlmeinfo = &amp;pmlmeext-&gt;mlmext_info;</div><div class='ctx'> </div><div class='ctx'> 	/* da == NULL, assum it's null data for sta to ap*/</div><div class='del'>-	if (da == NULL)</div><div class='add'>+	if (!da)</div><div class='ctx'> 		da = get_my_bssid(&amp;(pmlmeinfo-&gt;network));</div><div class='ctx'> </div><div class='del'>-	ret = _issue_nulldata(padapter, da, 0, false);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return _issue_nulldata(padapter, da, 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* when wait_ack is ture, this function shoule be called at process context */</div><div class='hunk'>@@ -3675,7 +3673,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int</div><div class='ctx'> 	struct mlme_ext_info *pmlmeinfo = &amp;(pmlmeext-&gt;mlmext_info);</div><div class='ctx'> </div><div class='ctx'> 	/* da == NULL, assum it's null data for sta to ap*/</div><div class='del'>-	if (da == NULL)</div><div class='add'>+	if (!da)</div><div class='ctx'> 		da = get_my_bssid(&amp;(pmlmeinfo-&gt;network));</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='hunk'>@@ -3958,7 +3956,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch</div><div class='ctx'> 				/*  A-MSDU NOT Supported */</div><div class='ctx'> 				BA_para_set = 0;</div><div class='ctx'> 				/*  immediate Block Ack */</div><div class='del'>-				BA_para_set |= (1 &lt;&lt; 1) &amp; IEEE80211_ADDBA_PARAM_POLICY_MASK;</div><div class='add'>+				BA_para_set |= BIT(1) &amp; IEEE80211_ADDBA_PARAM_POLICY_MASK;</div><div class='ctx'> 				/*  TID */</div><div class='ctx'> 				BA_para_set |= (status &lt;&lt; 2) &amp; IEEE80211_ADDBA_PARAM_TID_MASK;</div><div class='ctx'> 				/*  max buffer size is 8 MSDU */</div><div class='hunk'>@@ -4579,12 +4577,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str</div><div class='ctx'> 			pmlmepriv-&gt;num_sta_no_ht++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	/* process_intel_widi_query_or_tigger(padapter, bssid); */</div><div class='del'>-	if (process_intel_widi_query_or_tigger(padapter, bssid))</div><div class='del'>-		return _FAIL;</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> 	#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) &amp; 1</div><div class='ctx'> 	if (strcmp(bssid-&gt;Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {</div><div class='ctx'> 		DBG_871X("Receiving %s("MAC_FMT", DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n"</div><div class='hunk'>@@ -5052,7 +5044,7 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame</div><div class='ctx'> 	cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));</div><div class='ctx'> 	pevtcmd = rtw_zmalloc(cmdsz);</div><div class='ctx'> 	if (pevtcmd == NULL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5073,8 +5065,8 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame</div><div class='ctx'> 	psurvey_evt = (struct survey_event *)(pevtcmd + sizeof(struct C2HEvent_Header));</div><div class='ctx'> </div><div class='ctx'> 	if (collect_bss_info(padapter, precv_frame, (struct wlan_bssid_ex *)&amp;psurvey_evt-&gt;bss) == _FAIL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='del'>-		kfree((u8 *)pevtcmd);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='add'>+		kfree(pevtcmd);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5105,7 +5097,7 @@ void report_surveydone_event(struct adapter *padapter)</div><div class='ctx'> 	cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));</div><div class='ctx'> 	pevtcmd = rtw_zmalloc(cmdsz);</div><div class='ctx'> 	if (pevtcmd == NULL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5152,7 +5144,7 @@ void report_join_res(struct adapter *padapter, int res)</div><div class='ctx'> 	cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header));</div><div class='ctx'> 	pevtcmd = rtw_zmalloc(cmdsz);</div><div class='ctx'> 	if (pevtcmd == NULL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5203,7 +5195,7 @@ void report_wmm_edca_update(struct adapter *padapter)</div><div class='ctx'> 	cmdsz = (sizeof(struct wmm_event) + sizeof(struct C2HEvent_Header));</div><div class='ctx'> 	pevtcmd = rtw_zmalloc(cmdsz);</div><div class='ctx'> 	if (pevtcmd == NULL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5250,7 +5242,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi</div><div class='ctx'> 	cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));</div><div class='ctx'> 	pevtcmd = rtw_zmalloc(cmdsz);</div><div class='ctx'> 	if (pevtcmd == NULL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5305,7 +5297,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int</div><div class='ctx'> 	cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));</div><div class='ctx'> 	pevtcmd = rtw_zmalloc(cmdsz);</div><div class='ctx'> 	if (pevtcmd == NULL) {</div><div class='del'>-		kfree((u8 *)pcmd_obj);</div><div class='add'>+		kfree(pcmd_obj);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5713,11 +5705,6 @@ void linked_status_chk(struct adapter *padapter)</div><div class='ctx'> 		/*  Marked by Kurt 20130715 */</div><div class='ctx'> 		/*  For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. */</div><div class='ctx'> 		/*  todo: To check why we under miracast session, rx_chk would be false */</div><div class='del'>-		/* ifdef CONFIG_INTEL_WIDI */</div><div class='del'>-		/* if (padapter-&gt;mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) */</div><div class='del'>-		/* 	rx_chk_limit = 1; */</div><div class='del'>-		/* endif */</div><div class='del'>-</div><div class='ctx'> 		psta = rtw_get_stainfo(pstapriv, pmlmeinfo-&gt;network.MacAddress);</div><div class='ctx'> 		if (psta != NULL) {</div><div class='ctx'> 			if (chk_ap_is_alive(padapter, psta) == false)</div><div class='hunk'>@@ -5836,7 +5823,7 @@ void survey_timer_hdl(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 		psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));</div><div class='ctx'> 		if (psurveyPara == NULL) {</div><div class='del'>-			kfree((unsigned char *)ph2c);</div><div class='add'>+			kfree(ph2c);</div><div class='ctx'> 			goto exit_survey_timer_hdl;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -6603,7 +6590,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param));</div><div class='ctx'> 	if (ptxBeacon_parm == NULL) {</div><div class='del'>-		kfree((unsigned char *)ph2c);</div><div class='add'>+		kfree(ph2c);</div><div class='ctx'> 		res = _FAIL;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c<br/>index b9d36db762a9..bdc52d8d5625 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_sta_mgt.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_sta_mgt.c</a></div><div class='hunk'>@@ -75,7 +75,6 @@ u32 _rtw_init_sta_priv(struct	sta_priv *pstapriv)</div><div class='ctx'> </div><div class='ctx'> 	psta = (struct sta_info *)(pstapriv-&gt;pstainfo_buf);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; NUM_STA; i++) {</div><div class='ctx'> 		_rtw_init_stainfo(psta);</div><div class='ctx'> </div><div class='hunk'>@@ -204,8 +203,7 @@ struct	sta_info *rtw_alloc_stainfo(struct	sta_priv *pstapriv, u8 *hwaddr)</div><div class='ctx'> 	if (list_empty(&amp;pfree_sta_queue-&gt;queue)) {</div><div class='ctx'> 		/* spin_unlock_bh(&amp;(pfree_sta_queue-&gt;lock)); */</div><div class='ctx'> 		spin_unlock_bh(&amp;(pstapriv-&gt;sta_hash_lock));</div><div class='del'>-		psta = NULL;</div><div class='del'>-		return psta;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		psta = LIST_CONTAINOR(get_next(&amp;pfree_sta_queue-&gt;queue), struct sta_info, list);</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +316,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)</div><div class='ctx'> 	struct	sta_priv *pstapriv = &amp;padapter-&gt;stapriv;</div><div class='ctx'> 	struct hw_xmit *phwxmit;</div><div class='ctx'> </div><div class='del'>-	if (psta == NULL)</div><div class='add'>+	if (!psta)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -394,7 +392,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)</div><div class='ctx'> 	);</div><div class='ctx'> 	pstapriv-&gt;asoc_sta_count--;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/*  re-init sta_info; 20061114 will be init in alloc_stainfo */</div><div class='ctx'> 	/* _rtw_init_sta_xmit_priv(&amp;psta-&gt;sta_xmitpriv); */</div><div class='ctx'> 	/* _rtw_init_sta_recv_priv(&amp;psta-&gt;sta_recvpriv); */</div><div class='hunk'>@@ -437,7 +434,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)</div><div class='ctx'> 	if (!(psta-&gt;state &amp; WIFI_AP_STATE))</div><div class='ctx'> 		rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, false);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* release mac id for non-bc/mc station, */</div><div class='ctx'> 	rtw_release_macid(pstapriv-&gt;padapter, psta);</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +520,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)</div><div class='ctx'> 	u8 *addr;</div><div class='ctx'> 	u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='ctx'> </div><div class='del'>-	if (hwaddr == NULL)</div><div class='add'>+	if (!hwaddr)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_MCAST(hwaddr))</div><div class='hunk'>@@ -569,7 +565,7 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	psta = rtw_alloc_stainfo(pstapriv, bcast_addr);</div><div class='ctx'> </div><div class='del'>-	if (psta == NULL) {</div><div class='add'>+	if (!psta) {</div><div class='ctx'> 		res = _FAIL;</div><div class='ctx'> 		RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, ("rtw_alloc_stainfo fail"));</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -583,15 +579,12 @@ exit:</div><div class='ctx'> 	return _SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter)</div><div class='ctx'> {</div><div class='del'>-	struct sta_info *psta;</div><div class='ctx'> 	struct sta_priv *pstapriv = &amp;padapter-&gt;stapriv;</div><div class='ctx'> 	u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='ctx'> </div><div class='del'>-	psta = rtw_get_stainfo(pstapriv, bc_addr);</div><div class='del'>-	return psta;</div><div class='add'>+	return rtw_get_stainfo(pstapriv, bc_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)</div><div class='hunk'>@@ -620,7 +613,6 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;(pacl_node_q-&gt;lock));</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (pacl_list-&gt;mode == 1) /* accept unless in deny list */</div><div class='ctx'> 		res = !match;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c<br/>index 2c172966ea60..fdbf967812f9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_wlan_util.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_wlan_util.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_wlan_util.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_wlan_util.c</a></div><div class='hunk'>@@ -518,7 +518,7 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval)</div><div class='ctx'> 	else if ((bcn_interval &lt;&lt; 2) &gt; WAIT_FOR_BCN_TO_MAX)</div><div class='ctx'> 		return WAIT_FOR_BCN_TO_MAX;</div><div class='ctx'> 	else</div><div class='del'>-		return ((bcn_interval &lt;&lt; 2));</div><div class='add'>+		return bcn_interval &lt;&lt; 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void invalidate_cam_all(struct adapter *padapter)</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c<br/>index 094d61bcb469..2bb679e54dc7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/core/rtw_xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/core/rtw_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/core/rtw_xmit.c</a></div><div class='hunk'>@@ -260,7 +260,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtw_alloc_hwxmits(padapter);</div><div class='add'>+	res = rtw_alloc_hwxmits(padapter);</div><div class='add'>+	if (res == _FAIL)</div><div class='add'>+		goto exit;</div><div class='ctx'> 	rtw_init_hwxmits(pxmitpriv-&gt;hwxmits, pxmitpriv-&gt;hwxmit_entry);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='hunk'>@@ -2144,7 +2146,7 @@ exit:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='add'>+s32 rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_xmit *hwxmits;</div><div class='ctx'> 	struct xmit_priv *pxmitpriv = &amp;padapter-&gt;xmitpriv;</div><div class='hunk'>@@ -2155,10 +2157,8 @@ void rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	pxmitpriv-&gt;hwxmits = rtw_zmalloc(sizeof(struct hw_xmit) * pxmitpriv-&gt;hwxmit_entry);</div><div class='ctx'> </div><div class='del'>-	if (pxmitpriv-&gt;hwxmits == NULL) {</div><div class='del'>-		DBG_871X("alloc hwxmits fail!...\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (!pxmitpriv-&gt;hwxmits)</div><div class='add'>+		return _FAIL;</div><div class='ctx'> </div><div class='ctx'> 	hwxmits = pxmitpriv-&gt;hwxmits;</div><div class='ctx'> </div><div class='hunk'>@@ -2204,7 +2204,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+	return _SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtw_free_hwxmits(struct adapter *padapter)</div><div class='hunk'>@@ -2861,8 +2861,6 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst</div><div class='ctx'> </div><div class='ctx'> 	/* spin_unlock_bh(&amp;psta-&gt;sleep_q.lock); */</div><div class='ctx'> 	spin_unlock_bh(&amp;pxmitpriv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void enqueue_pending_xmitbuf(</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c<br/>index 2b43f6d3c762..6caddd7834a1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/hal_btcoex.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/hal_btcoex.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/hal_btcoex.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/hal_btcoex.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static BTCDBGINFO GLBtcDbgInfo;</div><div class='ctx'> </div><div class='ctx'> static void DBG_BT_INFO_INIT(PBTCDBGINFO pinfo, u8 *pbuf, u32 size)</div><div class='ctx'> {</div><div class='del'>-	if (NULL == pinfo)</div><div class='add'>+	if (!pinfo)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	memset(pinfo, 0, sizeof(BTCDBGINFO));</div><div class='hunk'>@@ -95,7 +95,7 @@ void DBG_BT_INFO(u8 *dbgmsg)</div><div class='ctx'> </div><div class='ctx'> 	pinfo = &amp;GLBtcDbgInfo;</div><div class='ctx'> </div><div class='del'>-	if (NULL == pinfo-&gt;info)</div><div class='add'>+	if (!pinfo-&gt;info)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	msglen = strlen(dbgmsg);</div><div class='hunk'>@@ -112,8 +112,7 @@ void DBG_BT_INFO(u8 *dbgmsg)</div><div class='ctx'> /*  */</div><div class='ctx'> static u8 halbtcoutsrc_IsBtCoexistAvailable(PBTC_COEXIST pBtCoexist)</div><div class='ctx'> {</div><div class='del'>-	if (!pBtCoexist-&gt;bBinded ||</div><div class='del'>-		NULL == pBtCoexist-&gt;Adapter){</div><div class='add'>+	if (!pBtCoexist-&gt;bBinded || !pBtCoexist-&gt;Adapter){</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -1571,7 +1570,7 @@ void hal_btcoex_SetDBG(struct adapter *padapter, u32 *pDbgModule)</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (NULL == pDbgModule)</div><div class='add'>+	if (!pDbgModule)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BTC_MSG_MAX; i++)</div><div class='hunk'>@@ -1585,7 +1584,7 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)</div><div class='ctx'> 	u32 leftSize;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if ((NULL == pStrBuf) || (0 == bufSize))</div><div class='add'>+	if (!pStrBuf || bufSize == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pstr = pStrBuf;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c<br/>index 7f8ec55b08f1..e5f1153527b9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/hal_com.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/hal_com.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/hal_com.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/hal_com.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@ u8 rtw_hal_data_init(struct adapter *padapter)</div><div class='ctx'> 	if (is_primary_adapter(padapter)) {	/* if (padapter-&gt;isprimary) */</div><div class='ctx'> 		padapter-&gt;hal_data_sz = sizeof(struct hal_com_data);</div><div class='ctx'> 		padapter-&gt;HalData = vzalloc(padapter-&gt;hal_data_sz);</div><div class='del'>-		if (padapter-&gt;HalData == NULL) {</div><div class='add'>+		if (!padapter-&gt;HalData) {</div><div class='ctx'> 			DBG_8192C("cannot alloc memory for HAL DATA\n");</div><div class='ctx'> 			return _FAIL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -909,7 +909,7 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u8 trigger;</div><div class='ctx'> </div><div class='del'>-	if (buf == NULL)</div><div class='add'>+	if (!buf)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	trigger = rtw_read8(adapter, REG_C2HEVT_CLEAR);</div><div class='hunk'>@@ -982,7 +982,7 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pst</div><div class='ctx'> 	u8 i, rf_type, limit;</div><div class='ctx'> 	u32 tx_ra_bitmap;</div><div class='ctx'> </div><div class='del'>-	if (psta == NULL)</div><div class='add'>+	if (!psta)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tx_ra_bitmap = 0;</div><div class='hunk'>@@ -1389,11 +1389,11 @@ bool IsHexDigit(char chTmp)</div><div class='ctx'> u32 MapCharToHexDigit(char chTmp)</div><div class='ctx'> {</div><div class='ctx'> 	if (chTmp &gt;= '0' &amp;&amp; chTmp &lt;= '9')</div><div class='del'>-		return (chTmp - '0');</div><div class='add'>+		return chTmp - '0';</div><div class='ctx'> 	else if (chTmp &gt;= 'a' &amp;&amp; chTmp &lt;= 'f')</div><div class='del'>-		return (10 + (chTmp - 'a'));</div><div class='add'>+		return 10 + (chTmp - 'a');</div><div class='ctx'> 	else if (chTmp &gt;= 'A' &amp;&amp; chTmp &lt;= 'F')</div><div class='del'>-		return (10 + (chTmp - 'A'));</div><div class='add'>+		return 10 + (chTmp - 'A');</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1407,7 +1407,7 @@ bool GetHexValueFromString(char *szStr, u32 *pu4bVal, u32 *pu4bMove)</div><div class='ctx'> 	char *szScan = szStr;</div><div class='ctx'> </div><div class='ctx'> 	/*  Check input parameter. */</div><div class='del'>-	if (szStr == NULL || pu4bVal == NULL || pu4bMove == NULL) {</div><div class='add'>+	if (!szStr || !pu4bVal || !pu4bMove) {</div><div class='ctx'> 		DBG_871X("GetHexValueFromString(): Invalid input arguments! szStr: %p, pu4bVal: %p, pu4bMove: %p\n",</div><div class='ctx'> 			 szStr, pu4bVal, pu4bMove);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1618,14 +1618,14 @@ void rtw_get_raw_rssi_info(void *sel, struct adapter *padapter)</div><div class='ctx'> 	isCCKrate = psample_pkt_rssi-&gt;data_rate &lt;= DESC_RATE11M;</div><div class='ctx'> </div><div class='ctx'> 	if (isCCKrate)</div><div class='del'>-		psample_pkt_rssi-&gt;mimo_singal_strength[0] = psample_pkt_rssi-&gt;pwdball;</div><div class='add'>+		psample_pkt_rssi-&gt;mimo_signal_strength[0] = psample_pkt_rssi-&gt;pwdball;</div><div class='ctx'> </div><div class='ctx'> 	for (rf_path = 0; rf_path &lt; pHalData-&gt;NumTotalRFPath; rf_path++) {</div><div class='ctx'> 		DBG_871X_SEL_NL(</div><div class='ctx'> 			sel,</div><div class='del'>-			"RF_PATH_%d =&gt;singal_strength:%d(%%), singal_quality:%d(%%)\n",</div><div class='del'>-			rf_path, psample_pkt_rssi-&gt;mimo_singal_strength[rf_path],</div><div class='del'>-			psample_pkt_rssi-&gt;mimo_singal_quality[rf_path]</div><div class='add'>+			"RF_PATH_%d =&gt;signal_strength:%d(%%), signal_quality:%d(%%)\n",</div><div class='add'>+			rf_path, psample_pkt_rssi-&gt;mimo_signal_strength[rf_path],</div><div class='add'>+			psample_pkt_rssi-&gt;mimo_signal_quality[rf_path]</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='ctx'> 		if (!isCCKrate) {</div><div class='hunk'>@@ -1651,11 +1651,11 @@ void rtw_dump_raw_rssi_info(struct adapter *padapter)</div><div class='ctx'> 	isCCKrate = psample_pkt_rssi-&gt;data_rate &lt;= DESC_RATE11M;</div><div class='ctx'> </div><div class='ctx'> 	if (isCCKrate)</div><div class='del'>-		psample_pkt_rssi-&gt;mimo_singal_strength[0] = psample_pkt_rssi-&gt;pwdball;</div><div class='add'>+		psample_pkt_rssi-&gt;mimo_signal_strength[0] = psample_pkt_rssi-&gt;pwdball;</div><div class='ctx'> </div><div class='ctx'> 	for (rf_path = 0; rf_path &lt; pHalData-&gt;NumTotalRFPath; rf_path++) {</div><div class='del'>-		DBG_871X("RF_PATH_%d =&gt;singal_strength:%d(%%), singal_quality:%d(%%)"</div><div class='del'>-			, rf_path, psample_pkt_rssi-&gt;mimo_singal_strength[rf_path], psample_pkt_rssi-&gt;mimo_singal_quality[rf_path]);</div><div class='add'>+		DBG_871X("RF_PATH_%d =&gt;signal_strength:%d(%%), signal_quality:%d(%%)"</div><div class='add'>+			, rf_path, psample_pkt_rssi-&gt;mimo_signal_strength[rf_path], psample_pkt_rssi-&gt;mimo_signal_quality[rf_path]);</div><div class='ctx'> </div><div class='ctx'> 		if (!isCCKrate) {</div><div class='ctx'> 			printk(", rx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n",</div><div class='hunk'>@@ -1682,8 +1682,8 @@ void rtw_store_phy_info(struct adapter *padapter, union recv_frame *prframe)</div><div class='ctx'> 	psample_pkt_rssi-&gt;pwr_all = pPhyInfo-&gt;recv_signal_power;</div><div class='ctx'> </div><div class='ctx'> 	for (rf_path = 0; rf_path &lt; pHalData-&gt;NumTotalRFPath; rf_path++) {</div><div class='del'>-		psample_pkt_rssi-&gt;mimo_singal_strength[rf_path] = pPhyInfo-&gt;rx_mimo_signal_strength[rf_path];</div><div class='del'>-		psample_pkt_rssi-&gt;mimo_singal_quality[rf_path] = pPhyInfo-&gt;rx_mimo_signal_quality[rf_path];</div><div class='add'>+		psample_pkt_rssi-&gt;mimo_signal_strength[rf_path] = pPhyInfo-&gt;rx_mimo_signal_strength[rf_path];</div><div class='add'>+		psample_pkt_rssi-&gt;mimo_signal_quality[rf_path] = pPhyInfo-&gt;rx_mimo_signal_quality[rf_path];</div><div class='ctx'> 		if (!isCCKrate) {</div><div class='ctx'> 			psample_pkt_rssi-&gt;ofdm_pwr[rf_path] = pPhyInfo-&gt;RxPwr[rf_path];</div><div class='ctx'> 			psample_pkt_rssi-&gt;ofdm_snr[rf_path] = pPhyInfo-&gt;RxSNR[rf_path];</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c<br/>index 12c1cd590056..336764464e7d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/hal_com_phycfg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/hal_com_phycfg.c</a></div><div class='hunk'>@@ -1723,7 +1723,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,</div><div class='ctx'> 	idx_rate_sctn = get_rate_sctn_idx(data_rate);</div><div class='ctx'> </div><div class='ctx'> 	if (band_type == BAND_ON_5G &amp;&amp; idx_rate_sctn == 0)</div><div class='del'>-                DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate);</div><div class='add'>+		DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate);</div><div class='ctx'> </div><div class='ctx'> 	/*  workaround for wrong index combination to obtain tx power limit, */</div><div class='ctx'> 	/*  OFDM only exists in BW 20M */</div><div class='hunk'>@@ -1749,6 +1749,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,</div><div class='ctx'> </div><div class='ctx'> 	if (band_type == BAND_ON_2_4G) {</div><div class='ctx'> 		s8 limits[10] = {0}; u8 i = 0;</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; MAX_REGULATION_NUM; i++)</div><div class='ctx'> 			limits[i] = hal_data-&gt;TxPwrLimit_2_4G[i]</div><div class='ctx'> 							     [idx_bandwidth]</div><div class='hunk'>@@ -1766,6 +1767,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,</div><div class='ctx'> </div><div class='ctx'> 	} else if (band_type == BAND_ON_5G) {</div><div class='ctx'> 		s8 limits[10] = {0}; u8 i = 0;</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; MAX_REGULATION_NUM; ++i)</div><div class='ctx'> 			limits[i] = hal_data-&gt;TxPwrLimit_5G[i]</div><div class='ctx'> 							   [idx_bandwidth]</div><div class='hunk'>@@ -2236,7 +2238,7 @@ int phy_ConfigMACWithParaFile(struct adapter *Adapter, char *pFileName)</div><div class='ctx'> </div><div class='ctx'> 	memset(pHalData-&gt;para_file_buf, 0, MAX_PARA_FILE_BUF_LEN);</div><div class='ctx'> </div><div class='del'>-	if ((pHalData-&gt;mac_reg_len == 0) &amp;&amp; (pHalData-&gt;mac_reg == NULL)) {</div><div class='add'>+	if ((pHalData-&gt;mac_reg_len == 0) &amp;&amp; !pHalData-&gt;mac_reg) {</div><div class='ctx'> 		rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName);</div><div class='ctx'> </div><div class='ctx'> 		if (rtw_is_file_readable(file_path_bs) == true) {</div><div class='hunk'>@@ -2311,7 +2313,7 @@ int phy_ConfigBBWithParaFile(</div><div class='ctx'> </div><div class='ctx'> 	memset(pHalData-&gt;para_file_buf, 0, MAX_PARA_FILE_BUF_LEN);</div><div class='ctx'> </div><div class='del'>-	if ((pBufLen != NULL) &amp;&amp; (*pBufLen == 0) &amp;&amp; (pBuf == NULL)) {</div><div class='add'>+	if (pBufLen &amp;&amp; (*pBufLen == 0) &amp;&amp; !pBuf) {</div><div class='ctx'> 		rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName);</div><div class='ctx'> </div><div class='ctx'> 		if (rtw_is_file_readable(file_path_bs) == true) {</div><div class='hunk'>@@ -2336,7 +2338,7 @@ int phy_ConfigBBWithParaFile(</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((pBufLen != NULL) &amp;&amp; (*pBufLen == 0) &amp;&amp; (pBuf == NULL)) {</div><div class='add'>+		if (pBufLen &amp;&amp; (*pBufLen == 0) &amp;&amp; !pBuf) {</div><div class='ctx'> 			memcpy(pHalData-&gt;para_file_buf, pBuf, *pBufLen);</div><div class='ctx'> 			rtStatus = _SUCCESS;</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -2680,7 +2682,7 @@ int phy_ConfigBBWithPgParaFile(struct adapter *Adapter, char *pFileName)</div><div class='ctx'> </div><div class='ctx'> 	memset(pHalData-&gt;para_file_buf, 0, MAX_PARA_FILE_BUF_LEN);</div><div class='ctx'> </div><div class='del'>-	if ((pHalData-&gt;bb_phy_reg_pg_len == 0) &amp;&amp; (pHalData-&gt;bb_phy_reg_pg == NULL)) {</div><div class='add'>+	if ((pHalData-&gt;bb_phy_reg_pg_len == 0) &amp;&amp; !pHalData-&gt;bb_phy_reg_pg) {</div><div class='ctx'> 		rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName);</div><div class='ctx'> </div><div class='ctx'> 		if (rtw_is_file_readable(file_path_bs) == true) {</div><div class='hunk'>@@ -2743,7 +2745,7 @@ int PHY_ConfigRFWithParaFile(</div><div class='ctx'> </div><div class='ctx'> 	memset(pHalData-&gt;para_file_buf, 0, MAX_PARA_FILE_BUF_LEN);</div><div class='ctx'> </div><div class='del'>-	if ((pBufLen != NULL) &amp;&amp; (*pBufLen == 0) &amp;&amp; (pBuf == NULL)) {</div><div class='add'>+	if (pBufLen &amp;&amp; (*pBufLen == 0) &amp;&amp; !pBuf) {</div><div class='ctx'> 		rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName);</div><div class='ctx'> </div><div class='ctx'> 		if (rtw_is_file_readable(file_path_bs) == true) {</div><div class='hunk'>@@ -2768,7 +2770,7 @@ int PHY_ConfigRFWithParaFile(</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((pBufLen != NULL) &amp;&amp; (*pBufLen == 0) &amp;&amp; (pBuf == NULL)) {</div><div class='add'>+		if (pBufLen &amp;&amp; (*pBufLen == 0) &amp;&amp; !pBuf) {</div><div class='ctx'> 			memcpy(pHalData-&gt;para_file_buf, pBuf, *pBufLen);</div><div class='ctx'> 			rtStatus = _SUCCESS;</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -2925,7 +2927,7 @@ int PHY_ConfigRFWithTxPwrTrackParaFile(struct adapter *Adapter, char *pFileName)</div><div class='ctx'> </div><div class='ctx'> 	memset(pHalData-&gt;para_file_buf, 0, MAX_PARA_FILE_BUF_LEN);</div><div class='ctx'> </div><div class='del'>-	if ((pHalData-&gt;rf_tx_pwr_track_len == 0) &amp;&amp; (pHalData-&gt;rf_tx_pwr_track == NULL)) {</div><div class='add'>+	if ((pHalData-&gt;rf_tx_pwr_track_len == 0) &amp;&amp; !pHalData-&gt;rf_tx_pwr_track) {</div><div class='ctx'> 		rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName);</div><div class='ctx'> </div><div class='ctx'> 		if (rtw_is_file_readable(file_path_bs) == true) {</div><div class='hunk'>@@ -3238,7 +3240,7 @@ int PHY_ConfigRFWithPowerLimitTableParaFile(</div><div class='ctx'> </div><div class='ctx'> 	memset(pHalData-&gt;para_file_buf, 0, MAX_PARA_FILE_BUF_LEN);</div><div class='ctx'> </div><div class='del'>-	if ((pHalData-&gt;rf_tx_pwr_lmt_len == 0) &amp;&amp; (pHalData-&gt;rf_tx_pwr_lmt == NULL)) {</div><div class='add'>+	if ((pHalData-&gt;rf_tx_pwr_lmt_len == 0) &amp;&amp; !pHalData-&gt;rf_tx_pwr_lmt) {</div><div class='ctx'> 		rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName);</div><div class='ctx'> </div><div class='ctx'> 		if (rtw_is_file_readable(file_path_bs) == true) {</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c<br/>index 7de5161e2ac4..e3f4307f3d20 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/odm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/odm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/odm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/odm.c</a></div><div class='hunk'>@@ -691,7 +691,7 @@ void ODM_CmnInfoHook(PDM_ODM_T pDM_Odm, ODM_CMNINFO_E CmnInfo, void *pValue)</div><div class='ctx'> 	/* break; */</div><div class='ctx'> </div><div class='ctx'> 	/* case ODM_CMNINFO_MAC_STATUS: */</div><div class='del'>-	/* pDM_Odm-&gt;pMacInfo = (ODM_MAC_INFO *)pValue; */</div><div class='add'>+	/* pDM_Odm-&gt;pMacInfo = (struct odm_mac_status_info *)pValue; */</div><div class='ctx'> 	/* break; */</div><div class='ctx'> 	/* To remove the compiler warning, must add an empty default statement to handle the other values. */</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1076,7 +1076,7 @@ u32 ODM_Get_Rate_Bitmap(</div><div class='ctx'> 	/* printk("%s ==&gt; rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n", __func__, rssi_level, WirelessMode, rate_bitmap); */</div><div class='ctx'> 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==&gt; rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n", rssi_level, WirelessMode, rate_bitmap));</div><div class='ctx'> </div><div class='del'>-	return (ra_mask&amp;rate_bitmap);</div><div class='add'>+	return ra_mask &amp; rate_bitmap;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h<br/>index 23ab160ac2c8..6ba77bb70889 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/odm.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/odm.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/odm.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/odm.h</a></div><div class='hunk'>@@ -82,15 +82,15 @@</div><div class='ctx'> </div><div class='ctx'> /* Remove DIG by yuchen */</div><div class='ctx'> </div><div class='del'>-typedef struct _Dynamic_Primary_CCA {</div><div class='add'>+struct dynamic_primary_CCA {</div><div class='ctx'> 	u8 PriCCA_flag;</div><div class='ctx'> 	u8 intf_flag;</div><div class='ctx'> 	u8 intf_type;</div><div class='ctx'> 	u8 DupRTS_flag;</div><div class='ctx'> 	u8 Monitor_flag;</div><div class='ctx'> 	u8 CH_offset;</div><div class='del'>-	u8 	MF_state;</div><div class='del'>-} Pri_CCA_T, *pPri_CCA_T;</div><div class='add'>+	u8 MF_state;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> typedef struct _Rate_Adaptive_Table_ {</div><div class='ctx'> 	u8 firstconnect;</div><div class='hunk'>@@ -261,7 +261,7 @@ struct odm_packet_info {</div><div class='ctx'> 	bool is_beacon;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef struct _ODM_Phy_Dbg_Info_ {</div><div class='add'>+struct odm_phy_dbg_info {</div><div class='ctx'> 	/* ODM Write, debug info */</div><div class='ctx'> 	s8 RxSNRdB[4];</div><div class='ctx'> 	u32 NumQryPhyStatus;</div><div class='hunk'>@@ -271,11 +271,11 @@ typedef struct _ODM_Phy_Dbg_Info_ {</div><div class='ctx'> 	/* Others */</div><div class='ctx'> 	s32 RxEVM[4];</div><div class='ctx'> </div><div class='del'>-} ODM_PHY_DBG_INFO_T;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-typedef struct _ODM_Mac_Status_Info_ {</div><div class='add'>+struct odm_mac_status_info {</div><div class='ctx'> 	u8 test;</div><div class='del'>-} ODM_MAC_INFO;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> typedef enum tag_Dynamic_ODM_Support_Ability_Type {</div><div class='ctx'> 	/*  BB Team */</div><div class='hunk'>@@ -1092,11 +1092,11 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure {</div><div class='ctx'> 	/*  Define ........... */</div><div class='ctx'> </div><div class='ctx'> 	/*  Latest packet phy info (ODM write) */</div><div class='del'>-	ODM_PHY_DBG_INFO_T PhyDbgInfo;</div><div class='add'>+	struct odm_phy_dbg_info PhyDbgInfo;</div><div class='ctx'> 	/* PHY_INFO_88E		PhyInfo; */</div><div class='ctx'> </div><div class='ctx'> 	/*  Latest packet phy info (ODM write) */</div><div class='del'>-	ODM_MAC_INFO *pMacInfo;</div><div class='add'>+	struct odm_mac_status_info *pMacInfo;</div><div class='ctx'> 	/* MAC_INFO_88E		MacInfo; */</div><div class='ctx'> </div><div class='ctx'> 	/*  Different Team independt structure?? */</div><div class='hunk'>@@ -1112,7 +1112,7 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure {</div><div class='ctx'> 	FAT_T DM_FatTable;</div><div class='ctx'> 	DIG_T DM_DigTable;</div><div class='ctx'> 	PS_T DM_PSTable;</div><div class='del'>-	Pri_CCA_T DM_PriCCA;</div><div class='add'>+	struct dynamic_primary_CCA DM_PriCCA;</div><div class='ctx'> 	RXHP_T DM_RXHP_Table;</div><div class='ctx'> 	RA_T DM_RA_Table;</div><div class='ctx'> 	false_ALARM_STATISTICS FalseAlmCnt;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c<br/>index ee2c293e4f59..d802a1fde58f 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/odm_HWConfig.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/odm_HWConfig.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/odm_HWConfig.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/odm_HWConfig.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@ static u8 odm_QueryRxPwrPercentage(s8 AntPower)</div><div class='ctx'> 	else if (AntPower &gt;= 0)</div><div class='ctx'> 		return	100;</div><div class='ctx'> 	else</div><div class='del'>-		return	(100+AntPower);</div><div class='add'>+		return 100 + AntPower;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c<br/>index 9f4a10aaa774..fe3891106a6d 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c</a></div><div class='hunk'>@@ -1480,7 +1480,7 @@ static void rtl8723b_set_FwRsvdPagePkt(</div><div class='ctx'> 	MaxRsvdPageBufSize = RsvdPageNum*PageSize;</div><div class='ctx'> </div><div class='ctx'> 	pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);</div><div class='del'>-	if (pcmdframe == NULL) {</div><div class='add'>+	if (!pcmdframe) {</div><div class='ctx'> 		DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1620,7 +1620,7 @@ static void rtl8723b_set_FwRsvdPagePkt(</div><div class='ctx'> </div><div class='ctx'> 	/* if the ap staion info. exists, get the kek, kck from staion info. */</div><div class='ctx'> 	psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));</div><div class='del'>-	if (psta == NULL) {</div><div class='add'>+	if (!psta) {</div><div class='ctx'> 		memset(kek, 0, RTW_KEK_LEN);</div><div class='ctx'> 		memset(kck, 0, RTW_KCK_LEN);</div><div class='ctx'> 		DBG_8192C("%s, KEK, KCK download rsvd page all zero\n", __func__);</div><div class='hunk'>@@ -1856,7 +1856,7 @@ static void rtl8723b_set_AP_FwRsvdPagePkt(</div><div class='ctx'> 	MaxRsvdPageBufSize = RsvdPageNum*PageSize;</div><div class='ctx'> </div><div class='ctx'> 	pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);</div><div class='del'>-	if (pcmdframe == NULL) {</div><div class='add'>+	if (!pcmdframe) {</div><div class='ctx'> 		DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2069,7 +2069,7 @@ void rtl8723b_Add_RateATid(</div><div class='ctx'> 	u32 mask = bitmap&amp;0x0FFFFFFF;</div><div class='ctx'> </div><div class='ctx'> 	psta = pmlmeinfo-&gt;FW_sta_info[mac_id].psta;</div><div class='del'>-	if (psta == NULL)</div><div class='add'>+	if (!psta)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	bw = psta-&gt;bw_mode;</div><div class='hunk'>@@ -2107,7 +2107,7 @@ static void ConstructBtNullFunctionData(</div><div class='ctx'> 	pmlmeext = &amp;padapter-&gt;mlmeextpriv;</div><div class='ctx'> 	pmlmeinfo = &amp;pmlmeext-&gt;mlmext_info;</div><div class='ctx'> </div><div class='del'>-	if (NULL == StaAddr) {</div><div class='add'>+	if (!StaAddr) {</div><div class='ctx'> 		memcpy(bssid, myid(&amp;padapter-&gt;eeprompriv), ETH_ALEN);</div><div class='ctx'> 		StaAddr = bssid;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2176,7 +2176,7 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)</div><div class='ctx'> 	MaxRsvdPageBufSize = RsvdPageNum*PageSize;</div><div class='ctx'> </div><div class='ctx'> 	pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);</div><div class='del'>-	if (pcmdframe == NULL) {</div><div class='add'>+	if (!pcmdframe) {</div><div class='ctx'> 		DBG_8192C("%s: alloc ReservedPagePacket fail!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c<br/>index 6b6fc835c601..65781477cac9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_dm.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723b_dm.c</a></div><div class='hunk'>@@ -254,7 +254,7 @@ void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *Adapter)</div><div class='ctx'> </div><div class='ctx'>       /* 1 Find MIN-RSSI */</div><div class='ctx'> 	psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));</div><div class='del'>-	if (psta == NULL)</div><div class='add'>+	if (!psta)</div><div class='ctx'> 		goto skip_lps_dm;</div><div class='ctx'> </div><div class='ctx'> 	pdmpriv-&gt;EntryMinUndecoratedSmoothedPWDB = psta-&gt;rssi_stat.UndecoratedSmoothedPWDB;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c<br/>index 85fd12cca4ae..caa8e2f39448 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c</a></div><div class='hunk'>@@ -883,7 +883,7 @@ static void hal_ReadEFuse_WiFi(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	efuseTbl = rtw_malloc(EFUSE_MAX_MAP_LEN);</div><div class='del'>-	if (efuseTbl == NULL) {</div><div class='add'>+	if (!efuseTbl) {</div><div class='ctx'> 		DBG_8192C("%s: alloc efuseTbl fail!\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1463,7 +1463,7 @@ static s32 Hal_EfusePgPacketRead(</div><div class='ctx'> 	s32	ret;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (data == NULL)</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, &amp;max_section, bPseudoTest);</div><div class='hunk'>@@ -3664,7 +3664,7 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf)</div><div class='ctx'> 	s32 ret = _SUCCESS;</div><div class='ctx'> 	u8 index = 0;</div><div class='ctx'> </div><div class='del'>-	if (pC2hEvent == NULL) {</div><div class='add'>+	if (!pC2hEvent) {</div><div class='ctx'> 		DBG_8192C("%s(): pC2hEventis NULL\n", __func__);</div><div class='ctx'> 		ret = _FAIL;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -3714,7 +3714,7 @@ static void process_c2h_event(struct adapter *padapter, PC2H_EVT_HDR pC2hEvent,</div><div class='ctx'> {</div><div class='ctx'> 	u8 index = 0;</div><div class='ctx'> </div><div class='del'>-	if (c2hBuf == NULL) {</div><div class='add'>+	if (!c2hBuf) {</div><div class='ctx'> 		DBG_8192C("%s c2hbuff is NULL\n", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c<br/>index 78a4828ecb65..4f2ad54af398 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static	u32 phy_CalculateBitShift(u32 BitMask)</div><div class='ctx'> */</div><div class='ctx'> u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask)</div><div class='ctx'> {</div><div class='del'>-	u32 ReturnValue = 0, OriginalValue, BitShift;</div><div class='add'>+	u32 OriginalValue, BitShift;</div><div class='ctx'> </div><div class='ctx'> #if (DISABLE_BB_RF == 1)</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -68,9 +68,8 @@ u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask)</div><div class='ctx'> </div><div class='ctx'> 	OriginalValue = rtw_read32(Adapter, RegAddr);</div><div class='ctx'> 	BitShift = phy_CalculateBitShift(BitMask);</div><div class='del'>-	ReturnValue = (OriginalValue &amp; BitMask) &gt;&gt; BitShift;</div><div class='ctx'> </div><div class='del'>-	return ReturnValue;</div><div class='add'>+	return (OriginalValue &amp; BitMask) &gt;&gt; BitShift;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,18 +283,16 @@ u32 PHY_QueryRFReg_8723B(</div><div class='ctx'> 	u32 BitMask</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	u32 Original_Value, Readback_Value, BitShift;</div><div class='add'>+	u32 Original_Value, BitShift;</div><div class='ctx'> </div><div class='ctx'> #if (DISABLE_BB_RF == 1)</div><div class='ctx'> 	return 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	Original_Value = phy_RFSerialRead_8723B(Adapter, eRFPath, RegAddr);</div><div class='del'>-</div><div class='ctx'> 	BitShift =  phy_CalculateBitShift(BitMask);</div><div class='del'>-	Readback_Value = (Original_Value &amp; BitMask) &gt;&gt; BitShift;</div><div class='ctx'> </div><div class='del'>-	return Readback_Value;</div><div class='add'>+	return (Original_Value &amp; BitMask) &gt;&gt; BitShift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -827,7 +824,7 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	RT_TRACE(_module_hal_init_c_, _drv_info_, ("SCMapping: SC Value %x\n", ((SCSettingOf40 &lt;&lt; 4) | SCSettingOf20)));</div><div class='del'>-	return  ((SCSettingOf40 &lt;&lt; 4) | SCSettingOf20);</div><div class='add'>+	return  (SCSettingOf40 &lt;&lt; 4) | SCSettingOf20;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void phy_PostSetBwMode8723B(struct adapter *Adapter)</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c b/drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c<br/>index 76c8e6e9e6bc..86512264e280 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@ static void process_link_qual(struct adapter *padapter, union recv_frame *prfram</div><div class='ctx'> 	struct rx_pkt_attrib *pattrib;</div><div class='ctx'> 	struct signal_stat *signal_stat;</div><div class='ctx'> </div><div class='del'>-	if (prframe == NULL || padapter == NULL)</div><div class='add'>+	if (!prframe || !padapter)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pattrib = &amp;prframe-&gt;u.hdr.attrib;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c<br/>index 26742960ed65..b269de52e535 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static void rtl8723bs_c2h_packet_handler(struct adapter *padapter,</div><div class='ctx'> 	/* DBG_871X("+%s() length =%d\n", __func__, length); */</div><div class='ctx'> </div><div class='ctx'> 	tmp = rtw_zmalloc(length);</div><div class='del'>-	if (tmp == NULL)</div><div class='add'>+	if (!tmp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(tmp, pbuf, length);</div><div class='hunk'>@@ -424,7 +424,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	n = NR_RECVBUFF * sizeof(struct recv_buf) + 4;</div><div class='ctx'> 	precvpriv-&gt;pallocated_recv_buf = rtw_zmalloc(n);</div><div class='del'>-	if (precvpriv-&gt;pallocated_recv_buf == NULL) {</div><div class='add'>+	if (!precvpriv-&gt;pallocated_recv_buf) {</div><div class='ctx'> 		res = _FAIL;</div><div class='ctx'> 		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n"));</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -439,7 +439,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)</div><div class='ctx'> 		if (res == _FAIL)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (precvbuf-&gt;pskb == NULL) {</div><div class='add'>+		if (!precvbuf-&gt;pskb) {</div><div class='ctx'> 			SIZE_PTR tmpaddr = 0;</div><div class='ctx'> 			SIZE_PTR alignment = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +453,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)</div><div class='ctx'> 				skb_reserve(precvbuf-&gt;pskb, (RECVBUFF_ALIGN_SZ - alignment));</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (precvbuf-&gt;pskb == NULL) {</div><div class='add'>+			if (!precvbuf-&gt;pskb) {</div><div class='ctx'> 				DBG_871X("%s: alloc_skb fail!\n", __func__);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c<br/>index 69c4db5b5b0c..7b06aab04ee6 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c</a></div><div class='hunk'>@@ -58,12 +58,12 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	ret = ret || check_fwstate(pmlmepriv, _FW_UNDER_SURVEY);</div><div class='ctx'> </div><div class='del'>-	if (true == ret)</div><div class='add'>+	if (ret == true)</div><div class='ctx'> 		pxmitbuf = dequeue_pending_xmitbuf_under_survey(pxmitpriv);</div><div class='ctx'> 	else</div><div class='ctx'> 		pxmitbuf = dequeue_pending_xmitbuf(pxmitpriv);</div><div class='ctx'> </div><div class='del'>-	if (pxmitbuf == NULL)</div><div class='add'>+	if (!pxmitbuf)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	deviceId = ffaddr2deviceId(pdvobjpriv, pxmitbuf-&gt;ff_hwaddr);</div><div class='hunk'>@@ -283,8 +283,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv</div><div class='ctx'> </div><div class='ctx'> 				/*  check xmit_buf size enough or not */</div><div class='ctx'> 				txlen = txdesc_size + rtw_wlan_pkt_size(pxmitframe);</div><div class='del'>-				if (</div><div class='del'>-					(NULL == pxmitbuf) ||</div><div class='add'>+				if(	!pxmitbuf ||</div><div class='ctx'> 					((_RND(pxmitbuf-&gt;len, 8) + txlen) &gt; max_xmit_len) ||</div><div class='ctx'> 					(k &gt;= (rtw_hal_sdio_max_txoqt_free_space(padapter)-1))</div><div class='ctx'> 				) {</div><div class='hunk'>@@ -307,7 +306,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv</div><div class='ctx'> 					}</div><div class='ctx'> </div><div class='ctx'> 					pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);</div><div class='del'>-					if (pxmitbuf == NULL) {</div><div class='add'>+					if (!pxmitbuf) {</div><div class='ctx'> #ifdef DBG_XMIT_BUF</div><div class='ctx'> 						DBG_871X_LEVEL(_drv_err_, "%s: xmit_buf is not enough!\n", __func__);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c<br/>index 3fee34484577..a60162046e5a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/sdio_ops.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/hal/sdio_ops.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/hal/sdio_ops.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/hal/sdio_ops.c</a></div><div class='hunk'>@@ -425,12 +425,9 @@ static u32 sdio_read_port(</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	struct hal_com_data *hal;</div><div class='ctx'> 	u32 oldcnt;</div><div class='del'>-#ifdef SDIO_DYNAMIC_ALLOC_MEM</div><div class='del'>-	u8 *oldmem;</div><div class='del'>-#endif</div><div class='ctx'> 	s32 err;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -447,13 +444,6 @@ static u32 sdio_read_port(</div><div class='ctx'> </div><div class='ctx'> 	err = _sd_read(intfhdl, addr, cnt, mem);</div><div class='ctx'> </div><div class='del'>-#ifdef SDIO_DYNAMIC_ALLOC_MEM</div><div class='del'>-	if ((oldcnt != cnt) &amp;&amp; (oldmem)) {</div><div class='del'>-		memcpy(oldmem, mem, oldcnt);</div><div class='del'>-		kfree(mem);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return _FAIL;</div><div class='ctx'> 	return _SUCCESS;</div><div class='hunk'>@@ -483,7 +473,7 @@ static u32 sdio_write_port(</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	s32 err;</div><div class='ctx'> 	struct xmit_buf *xmitbuf = (struct xmit_buf *)mem;</div><div class='ctx'> </div><div class='hunk'>@@ -560,7 +550,7 @@ static s32 _sdio_local_read(</div><div class='ctx'> 	n = RND4(cnt);</div><div class='ctx'> 	tmpbuf = rtw_malloc(n);</div><div class='ctx'> 	if (!tmpbuf)</div><div class='del'>-		return (-1);</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	err = _sd_read(intfhdl, addr, n, tmpbuf);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -601,7 +591,7 @@ s32 sdio_local_read(</div><div class='ctx'> 	n = RND4(cnt);</div><div class='ctx'> 	tmpbuf = rtw_malloc(n);</div><div class='ctx'> 	if (!tmpbuf)</div><div class='del'>-		return (-1);</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	err = sd_read(intfhdl, addr, n, tmpbuf);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -646,7 +636,7 @@ s32 sdio_local_write(</div><div class='ctx'> </div><div class='ctx'> 	tmpbuf = rtw_malloc(cnt);</div><div class='ctx'> 	if (!tmpbuf)</div><div class='del'>-		return (-1);</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(tmpbuf, buf, cnt);</div><div class='ctx'> </div><div class='hunk'>@@ -1217,7 +1207,7 @@ u8 RecvOnePkt(struct adapter *adapter, u32 size)</div><div class='ctx'> {</div><div class='ctx'> 	struct recv_buf *recvbuf;</div><div class='ctx'> 	struct dvobj_priv *sddev;</div><div class='del'>-	PSDIO_DATA psdio_data;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> </div><div class='ctx'> 	u8 res = false;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/cmd_osdep.h b/drivers/staging/rtl8723bs/include/cmd_osdep.h<br/>index 0749936df032..d3af9f44ad59 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/cmd_osdep.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/cmd_osdep.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/cmd_osdep.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/cmd_osdep.h</a></div><div class='hunk'>@@ -8,11 +8,11 @@</div><div class='ctx'> #define __CMD_OSDEP_H_</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern sint _rtw_init_cmd_priv (struct	cmd_priv *pcmdpriv);</div><div class='del'>-extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv);</div><div class='add'>+int rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv);</div><div class='add'>+int rtw_init_evt_priv(struct evt_priv *pevtpriv);</div><div class='ctx'> extern void _rtw_free_evt_priv (struct	evt_priv *pevtpriv);</div><div class='ctx'> extern void _rtw_free_cmd_priv (struct	cmd_priv *pcmdpriv);</div><div class='del'>-extern sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);</div><div class='add'>+int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);</div><div class='ctx'> extern struct	cmd_obj	*_rtw_dequeue_cmd(struct __queue *queue);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h<br/>index bafb2c30e7fb..0fd84c93e72b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/drv_types.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/drv_types.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/drv_types.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/drv_types.h</a></div><div class='hunk'>@@ -37,10 +37,6 @@ enum _NIC_VERSION {</div><div class='ctx'> </div><div class='ctx'> #include &lt;rtw_ht.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-#include &lt;rtw_intel_widi.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;rtw_cmd.h&gt;</div><div class='ctx'> #include &lt;cmd_osdep.h&gt;</div><div class='ctx'> #include &lt;rtw_security.h&gt;</div><div class='hunk'>@@ -220,7 +216,6 @@ struct registry_priv</div><div class='ctx'> #define BSSID_SZ(field)   sizeof(((struct wlan_bssid_ex *) 0)-&gt;field)</div><div class='ctx'> </div><div class='ctx'> #include &lt;drv_types_sdio.h&gt;</div><div class='del'>-#define INTF_DATA SDIO_DATA</div><div class='ctx'> </div><div class='ctx'> #define is_primary_adapter(adapter) (1)</div><div class='ctx'> #define get_iface_type(adapter) (IFACE_PORT0)</div><div class='hunk'>@@ -476,9 +471,8 @@ struct dvobj_priv</div><div class='ctx'> </div><div class='ctx'> /*-------- below is for SDIO INTERFACE --------*/</div><div class='ctx'> </div><div class='del'>-#ifdef INTF_DATA</div><div class='del'>-	INTF_DATA intf_data;</div><div class='del'>-#endif</div><div class='add'>+struct sdio_data intf_data;</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define dvobj_to_pwrctl(dvobj) (&amp;(dvobj-&gt;pwrctl_priv))</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/drv_types_sdio.h b/drivers/staging/rtl8723bs/include/drv_types_sdio.h<br/>index 23bf30ece2df..09263ad27ce9 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/drv_types_sdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/drv_types_sdio.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/drv_types_sdio.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/drv_types_sdio.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> 	#include &lt;linux/mmc/card.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-typedef struct sdio_data</div><div class='add'>+struct sdio_data</div><div class='ctx'> {</div><div class='ctx'> 	u8  func_number;</div><div class='ctx'> </div><div class='hunk'>@@ -26,6 +26,6 @@ typedef struct sdio_data</div><div class='ctx'> </div><div class='ctx'> 	struct sdio_func	 *func;</div><div class='ctx'> 	void *sys_sdio_irq_thd;</div><div class='del'>-} SDIO_DATA, *PSDIO_DATA;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h<br/>index 9efb4dcb9d3a..74c028fbe8f7 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/ieee80211.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/ieee80211.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/ieee80211.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/ieee80211.h</a></div><div class='hunk'>@@ -202,7 +202,7 @@ enum NETWORK_TYPE</div><div class='ctx'> #define IsSupportedVHT(NetType) (((NetType) &amp; (WIRELESS_11AC)) ? true : false)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-typedef struct ieee_param {</div><div class='add'>+struct ieee_param {</div><div class='ctx'> 	u32 cmd;</div><div class='ctx'> 	u8 sta_addr[ETH_ALEN];</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -240,13 +240,13 @@ typedef struct ieee_param {</div><div class='ctx'> 			u8 buf[0];</div><div class='ctx'> 		} bcn_ie;</div><div class='ctx'> 	} u;</div><div class='del'>-}ieee_param;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-typedef struct ieee_param_ex {</div><div class='add'>+struct ieee_param_ex {</div><div class='ctx'> 	u32 cmd;</div><div class='ctx'> 	u8 sta_addr[ETH_ALEN];</div><div class='ctx'> 	u8 data[0];</div><div class='del'>-}ieee_param_ex;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct sta_data{</div><div class='ctx'> 	u16 aid;</div><div class='hunk'>@@ -870,13 +870,6 @@ static inline int is_zero_mac_addr(const u8 *addr)</div><div class='ctx'> #define CFG_IEEE80211_RESERVE_FCS (1&lt;&lt;0)</div><div class='ctx'> #define CFG_IEEE80211_COMPUTE_FCS (1&lt;&lt;1)</div><div class='ctx'> </div><div class='del'>-typedef struct tx_pending_t{</div><div class='del'>-	int frag;</div><div class='del'>-	struct ieee80211_txb *txb;</div><div class='del'>-}tx_pending_t;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #define MAXTID	16</div><div class='ctx'> </div><div class='ctx'> #define IEEE_A            (1&lt;&lt;0)</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h<br/>index 299b55538788..b83824ca2e31 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_cmd.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_cmd.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/rtw_cmd.h</a></div><div class='hunk'>@@ -122,17 +122,15 @@ struct P2P_PS_CTWPeriod_t {</div><div class='ctx'> 	u8 CTWPeriod;	/* TU */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj);</div><div class='add'>+int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj);</div><div class='ctx'> extern struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv);</div><div class='ctx'> extern void rtw_free_cmd_obj(struct cmd_obj *pcmd);</div><div class='ctx'> </div><div class='ctx'> void rtw_stop_cmd_thread(struct adapter *adapter);</div><div class='ctx'> int rtw_cmd_thread(void *context);</div><div class='ctx'> </div><div class='del'>-extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);</div><div class='ctx'> extern void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);</div><div class='ctx'> </div><div class='del'>-extern u32 rtw_init_evt_priv (struct evt_priv *pevtpriv);</div><div class='ctx'> extern void rtw_free_evt_priv (struct evt_priv *pevtpriv);</div><div class='ctx'> extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv);</div><div class='ctx'> </div><div class='hunk'>@@ -829,7 +827,7 @@ Result:</div><div class='ctx'> </div><div class='ctx'> u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num);</div><div class='ctx'> extern u8 rtw_createbss_cmd(struct adapter  *padapter);</div><div class='del'>-u8 rtw_startbss_cmd(struct adapter  *padapter, int flags);</div><div class='add'>+int rtw_startbss_cmd(struct adapter  *padapter, int flags);</div><div class='ctx'> </div><div class='ctx'> struct sta_info;</div><div class='ctx'> extern u8 rtw_setstakey_cmd(struct adapter  *padapter, struct sta_info *sta, u8 unicast_key, bool enqueue);</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h<br/>index 1ea9ea0e8d2e..2693b554f414 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_mlme.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_mlme.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_mlme.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/rtw_mlme.h</a></div><div class='hunk'>@@ -454,33 +454,6 @@ struct mlme_priv {</div><div class='ctx'> 	_lock	bcn_update_lock;</div><div class='ctx'> 	u8 update_bcn;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	int	widi_state;</div><div class='del'>-	int	listen_state;</div><div class='del'>-	_timer	listen_timer;</div><div class='del'>-	atomic_t	rx_probe_rsp; /*  1:receive probe respone from RDS source. */</div><div class='del'>-	u8 *l2sdTaBuffer;</div><div class='del'>-	u8 channel_idx;</div><div class='del'>-	u8 group_cnt;	/* In WiDi 3.5, they specified another scan algo. for WFD/RDS co-existed */</div><div class='del'>-	u8 sa_ext[L2SDTA_SERVICE_VE_LEN];</div><div class='del'>-</div><div class='del'>-	u8 widi_enable;</div><div class='del'>-	/**</div><div class='del'>-	 * For WiDi 4; upper layer would set</div><div class='del'>-	 * p2p_primary_device_type_category_id</div><div class='del'>-	 * p2p_primary_device_type_sub_category_id</div><div class='del'>-	 * p2p_secondary_device_type_category_id</div><div class='del'>-	 * p2p_secondary_device_type_sub_category_id</div><div class='del'>-	 */</div><div class='del'>-	u16 p2p_pdt_cid;</div><div class='del'>-	u16 p2p_pdt_scid;</div><div class='del'>-	u8 num_p2p_sdt;</div><div class='del'>-	u16 p2p_sdt_cid[MAX_NUM_P2P_SDT];</div><div class='del'>-	u16 p2p_sdt_scid[MAX_NUM_P2P_SDT];</div><div class='del'>-	u8 p2p_reject_disable;	/* When starting NL80211 wpa_supplicant/hostapd, it will call netdev_close */</div><div class='del'>-							/* such that it will cause p2p disabled. Use this flag to reject. */</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> 	u8 NumOfBcnInfoChkFail;</div><div class='ctx'> 	unsigned long	timeBcnInfoChkStart;</div><div class='ctx'> };</div><div class='hunk'>@@ -619,15 +592,13 @@ void rtw_clear_scan_deny(struct adapter *adapter);</div><div class='ctx'> void rtw_set_scan_deny_timer_hdl(struct adapter *adapter);</div><div class='ctx'> void rtw_set_scan_deny(struct adapter *adapter, u32 ms);</div><div class='ctx'> </div><div class='del'>-extern int _rtw_init_mlme_priv(struct adapter *padapter);</div><div class='del'>-</div><div class='ctx'> void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);</div><div class='ctx'> </div><div class='ctx'> extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);</div><div class='ctx'> </div><div class='ctx'> /* extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue); */</div><div class='ctx'> </div><div class='del'>-extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv);</div><div class='add'>+extern struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall);</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h<br/>index e2a4c680125f..2bc922ce5ae1 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_pwrctrl.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/rtw_pwrctrl.h</a></div><div class='hunk'>@@ -159,7 +159,7 @@ enum PS_DENY_REASON {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNO_SUPPORT</div><div class='del'>-typedef struct pno_nlo_info</div><div class='add'>+struct pno_nlo_info</div><div class='ctx'> {</div><div class='ctx'> 	u32 fast_scan_period;				/* Fast scan period */</div><div class='ctx'> 	u32 ssid_num;				/* number of entry */</div><div class='hunk'>@@ -168,26 +168,26 @@ typedef struct pno_nlo_info</div><div class='ctx'> 	u8 ssid_length[MAX_PNO_LIST_COUNT];	/* SSID Length Array */</div><div class='ctx'> 	u8 ssid_cipher_info[MAX_PNO_LIST_COUNT];	/* Cipher information for security */</div><div class='ctx'> 	u8 ssid_channel_info[MAX_PNO_LIST_COUNT];	/* channel information */</div><div class='del'>-}pno_nlo_info_t;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-typedef struct pno_ssid {</div><div class='add'>+struct pno_ssid {</div><div class='ctx'> 	u32 	SSID_len;</div><div class='ctx'> 	u8 SSID[32];</div><div class='del'>-} pno_ssid_t;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-typedef struct pno_ssid_list {</div><div class='del'>-	pno_ssid_t	node[MAX_PNO_LIST_COUNT];</div><div class='del'>-}pno_ssid_list_t;</div><div class='add'>+struct pno_ssid_list {</div><div class='add'>+	struct pno_ssid	node[MAX_PNO_LIST_COUNT];</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-typedef struct pno_scan_channel_info</div><div class='add'>+struct pno_scan_channel_info</div><div class='ctx'> {</div><div class='ctx'> 	u8 channel;</div><div class='ctx'> 	u8 tx_power;</div><div class='ctx'> 	u8 timeout;</div><div class='ctx'> 	u8 active;				/* set 1 means active scan, or pasivite scan. */</div><div class='del'>-}pno_scan_channel_info_t;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-typedef struct pno_scan_info</div><div class='add'>+struct pno_scan_info</div><div class='ctx'> {</div><div class='ctx'> 	u8 enableRFE;			/* Enable RFE */</div><div class='ctx'> 	u8 period_scan_time;		/* exclusive with fast_scan_period and slow_scan_period */</div><div class='hunk'>@@ -198,8 +198,8 @@ typedef struct pno_scan_info</div><div class='ctx'> 	u8 orig_ch;			/* original channel */</div><div class='ctx'> 	u8 channel_num;			/* number of channel */</div><div class='ctx'> 	u64	rfe_type;			/* rfe_type &amp;&amp; 0x00000000000000ff */</div><div class='del'>-	pno_scan_channel_info_t ssid_channel_info[MAX_SCAN_LIST_COUNT];</div><div class='del'>-}pno_scan_info_t;</div><div class='add'>+	struct pno_scan_channel_info ssid_channel_info[MAX_SCAN_LIST_COUNT];</div><div class='add'>+};</div><div class='ctx'> #endif /* CONFIG_PNO_SUPPORT */</div><div class='ctx'> </div><div class='ctx'> struct pwrctrl_priv</div><div class='hunk'>@@ -279,9 +279,9 @@ struct pwrctrl_priv</div><div class='ctx'> #ifdef CONFIG_PNO_SUPPORT</div><div class='ctx'> 	u8 pno_in_resume;</div><div class='ctx'> 	u8 pno_inited;</div><div class='del'>-	pno_nlo_info_t	*pnlo_info;</div><div class='del'>-	pno_scan_info_t	*pscan_info;</div><div class='del'>-	pno_ssid_list_t	*pno_ssid_list;</div><div class='add'>+	struct pno_nlo_info *pnlo_info;</div><div class='add'>+	struct pno_scan_info *pscan_info;</div><div class='add'>+	struct pno_ssid_list *pno_ssid_list;</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 	wowlan_pattern_context[8][5];</div><div class='ctx'> 	u64		wowlan_fw_iv;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h<br/>index 1f53c1c7b0da..5de946e66302 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_recv.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_recv.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_recv.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/rtw_recv.h</a></div><div class='hunk'>@@ -120,8 +120,8 @@ struct rx_raw_rssi</div><div class='ctx'> 	u8 pwdball;</div><div class='ctx'> 	s8 pwr_all;</div><div class='ctx'> </div><div class='del'>-	u8 mimo_singal_strength[4];/*  in 0~100 index */</div><div class='del'>-	u8 mimo_singal_quality[4];</div><div class='add'>+	u8 mimo_signal_strength[4];/*  in 0~100 index */</div><div class='add'>+	u8 mimo_signal_quality[4];</div><div class='ctx'> </div><div class='ctx'> 	s8 ofdm_pwr[4];</div><div class='ctx'> 	u8 ofdm_snr[4];</div><div class='hunk'>@@ -302,7 +302,7 @@ struct recv_buf</div><div class='ctx'> </div><div class='ctx'> 	u32 ref_cnt;</div><div class='ctx'> </div><div class='del'>-	struct adapter * adapter;</div><div class='add'>+	struct adapter *adapter;</div><div class='ctx'> </div><div class='ctx'> 	u8 *pbuf;</div><div class='ctx'> 	u8 *pallocated_buf;</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h<br/>index 1b38b9182b31..ea1396005a13 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_xmit.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/rtw_xmit.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/rtw_xmit.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/rtw_xmit.h</a></div><div class='hunk'>@@ -83,7 +83,7 @@ do{\</div><div class='ctx'> </div><div class='ctx'> #define TXDESC_OFFSET TXDESC_SIZE</div><div class='ctx'> </div><div class='del'>-enum TXDESC_SC{</div><div class='add'>+enum TXDESC_SC {</div><div class='ctx'> 	SC_DONT_CARE = 0x00,</div><div class='ctx'> 	SC_UPPER = 0x01,</div><div class='ctx'> 	SC_LOWER = 0x02,</div><div class='hunk'>@@ -487,7 +487,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter);</div><div class='ctx'> void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void rtw_alloc_hwxmits(struct adapter *padapter);</div><div class='add'>+s32 rtw_alloc_hwxmits(struct adapter *padapter);</div><div class='ctx'> void rtw_free_hwxmits(struct adapter *padapter);</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h<br/>index 559bf2606fb7..8c50bbb20f3b 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/wifi.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/wifi.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/wifi.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/wifi.h</a></div><div class='hunk'>@@ -266,8 +266,8 @@ enum WIFI_REG_DOMAIN {</div><div class='ctx'> </div><div class='ctx'> #define SetFrameType(pbuf, type)	\</div><div class='ctx'> 	do {	\</div><div class='del'>-		*(unsigned short *)(pbuf) &amp;= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \</div><div class='del'>-		*(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \</div><div class='add'>+		*(unsigned short *)(pbuf) &amp;= cpu_to_le16(~(BIT(3) | BIT(2))); \</div><div class='add'>+		*(unsigned short *)(pbuf) |= cpu_to_le16(type); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define GetFrameSubType(pbuf)	(le16_to_cpu(*(__le16 *)(pbuf)) &amp; (BIT(7) |\</div><div class='hunk'>@@ -374,18 +374,18 @@ __inline static unsigned char * get_da(unsigned char *pframe)</div><div class='ctx'> 	unsigned int	to_fr_ds	= (GetToDs(pframe) &lt;&lt; 1) | GetFrDs(pframe);</div><div class='ctx'> </div><div class='ctx'> 	switch (to_fr_ds) {</div><div class='del'>-		case 0x00:	/*  ToDs = 0, FromDs = 0 */</div><div class='del'>-			da = GetAddr1Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x01:	/*  ToDs = 0, FromDs = 1 */</div><div class='del'>-			da = GetAddr1Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x02:	/*  ToDs = 1, FromDs = 0 */</div><div class='del'>-			da = GetAddr3Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		default:	/*  ToDs = 1, FromDs = 1 */</div><div class='del'>-			da = GetAddr3Ptr(pframe);</div><div class='del'>-			break;</div><div class='add'>+	case 0x00:	/*  ToDs = 0, FromDs = 0 */</div><div class='add'>+		da = GetAddr1Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x01:	/*  ToDs = 0, FromDs = 1 */</div><div class='add'>+		da = GetAddr1Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x02:	/*  ToDs = 1, FromDs = 0 */</div><div class='add'>+		da = GetAddr3Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	default:	/*  ToDs = 1, FromDs = 1 */</div><div class='add'>+		da = GetAddr3Ptr(pframe);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return da;</div><div class='hunk'>@@ -398,18 +398,18 @@ __inline static unsigned char * get_sa(unsigned char *pframe)</div><div class='ctx'> 	unsigned int	to_fr_ds	= (GetToDs(pframe) &lt;&lt; 1) | GetFrDs(pframe);</div><div class='ctx'> </div><div class='ctx'> 	switch (to_fr_ds) {</div><div class='del'>-		case 0x00:	/*  ToDs = 0, FromDs = 0 */</div><div class='del'>-			sa = GetAddr2Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x01:	/*  ToDs = 0, FromDs = 1 */</div><div class='del'>-			sa = GetAddr3Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x02:	/*  ToDs = 1, FromDs = 0 */</div><div class='del'>-			sa = GetAddr2Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		default:	/*  ToDs = 1, FromDs = 1 */</div><div class='del'>-			sa = GetAddr4Ptr(pframe);</div><div class='del'>-			break;</div><div class='add'>+	case 0x00:	/*  ToDs = 0, FromDs = 0 */</div><div class='add'>+		sa = GetAddr2Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x01:	/*  ToDs = 0, FromDs = 1 */</div><div class='add'>+		sa = GetAddr3Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x02:	/*  ToDs = 1, FromDs = 0 */</div><div class='add'>+		sa = GetAddr2Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	default:	/*  ToDs = 1, FromDs = 1 */</div><div class='add'>+		sa = GetAddr4Ptr(pframe);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return sa;</div><div class='hunk'>@@ -421,18 +421,18 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe)</div><div class='ctx'> 	unsigned int	to_fr_ds	= (GetToDs(pframe) &lt;&lt; 1) | GetFrDs(pframe);</div><div class='ctx'> </div><div class='ctx'> 	switch (to_fr_ds) {</div><div class='del'>-		case 0x00:	/*  ToDs = 0, FromDs = 0 */</div><div class='del'>-			sa = GetAddr3Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x01:	/*  ToDs = 0, FromDs = 1 */</div><div class='del'>-			sa = GetAddr2Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x02:	/*  ToDs = 1, FromDs = 0 */</div><div class='del'>-			sa = GetAddr1Ptr(pframe);</div><div class='del'>-			break;</div><div class='del'>-		case 0x03:	/*  ToDs = 1, FromDs = 1 */</div><div class='del'>-			sa = GetAddr1Ptr(pframe);</div><div class='del'>-			break;</div><div class='add'>+	case 0x00:	/*  ToDs = 0, FromDs = 0 */</div><div class='add'>+		sa = GetAddr3Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x01:	/*  ToDs = 0, FromDs = 1 */</div><div class='add'>+		sa = GetAddr2Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x02:	/*  ToDs = 1, FromDs = 0 */</div><div class='add'>+		sa = GetAddr1Ptr(pframe);</div><div class='add'>+		break;</div><div class='add'>+	case 0x03:	/*  ToDs = 1, FromDs = 1 */</div><div class='add'>+		sa = GetAddr1Ptr(pframe);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return sa;</div><div class='hunk'>@@ -1070,9 +1070,9 @@ enum P2P_STATE {</div><div class='ctx'> 	P2P_STATE_TX_PROVISION_DIS_REQ = 6,			/* 	In P2P provisioning discovery */</div><div class='ctx'> 	P2P_STATE_RX_PROVISION_DIS_RSP = 7,</div><div class='ctx'> 	P2P_STATE_RX_PROVISION_DIS_REQ = 8,</div><div class='del'>-	P2P_STATE_GONEGO_ING = 9,						/* 	Doing the group owner negoitation handshake */</div><div class='del'>-	P2P_STATE_GONEGO_OK = 10,						/* 	finish the group negoitation handshake with success */</div><div class='del'>-	P2P_STATE_GONEGO_FAIL = 11,					/* 	finish the group negoitation handshake with failure */</div><div class='add'>+	P2P_STATE_GONEGO_ING = 9,						/* 	Doing the group owner negotiation handshake */</div><div class='add'>+	P2P_STATE_GONEGO_OK = 10,						/* 	finish the group negotiation handshake with success */</div><div class='add'>+	P2P_STATE_GONEGO_FAIL = 11,					/* 	finish the group negotiation handshake with failure */</div><div class='ctx'> 	P2P_STATE_RECV_INVITE_REQ_MATCH = 12,		/* 	receiving the P2P Invitation request and match with the profile. */</div><div class='ctx'> 	P2P_STATE_PROVISIONING_ING = 13,				/* 	Doing the P2P WPS */</div><div class='ctx'> 	P2P_STATE_PROVISIONING_DONE = 14,			/* 	Finish the P2P WPS */</div><div class='hunk'>@@ -1082,8 +1082,8 @@ enum P2P_STATE {</div><div class='ctx'> 	P2P_STATE_RECV_INVITE_REQ_GO = 18,			/* 	receiving the P2P Invitation request and this wifi is GO. */</div><div class='ctx'> 	P2P_STATE_RECV_INVITE_REQ_JOIN = 19,			/* 	receiving the P2P Invitation request to join an existing P2P Group. */</div><div class='ctx'> 	P2P_STATE_RX_INVITE_RESP_FAIL = 20,			/* 	recveing the P2P Invitation response with failure */</div><div class='del'>-	P2P_STATE_RX_INFOR_NOREADY = 21,			/*  receiving p2p negoitation response with information is not available */</div><div class='del'>-	P2P_STATE_TX_INFOR_NOREADY = 22,			/*  sending p2p negoitation response with information is not available */</div><div class='add'>+	P2P_STATE_RX_INFOR_NOREADY = 21,			/*  receiving p2p negotiation response with information is not available */</div><div class='add'>+	P2P_STATE_TX_INFOR_NOREADY = 22,			/*  sending p2p negotiation response with information is not available */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum P2P_WPSINFO {</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h<br/>index bdb14a84e5a5..88890b1c3c4c 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/wlan_bssdef.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/include/wlan_bssdef.h</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/include/wlan_bssdef.h?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/include/wlan_bssdef.h</a></div><div class='hunk'>@@ -129,15 +129,15 @@ struct ndis_801_11_ai_resfi {</div><div class='ctx'> </div><div class='ctx'> typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION</div><div class='ctx'> {</div><div class='del'>-    u32                   Length;</div><div class='del'>-    u16                  AvailableRequestFixedIEs;</div><div class='del'>-    struct ndis_802_11_ai_reqfi    RequestFixedIEs;</div><div class='del'>-    u32                   RequestIELength;</div><div class='del'>-    u32                   OffsetRequestIEs;</div><div class='del'>-    u16                  AvailableResponseFixedIEs;</div><div class='del'>-    struct ndis_801_11_ai_resfi    ResponseFixedIEs;</div><div class='del'>-    u32                   ResponseIELength;</div><div class='del'>-    u32                   OffsetResponseIEs;</div><div class='add'>+	u32                   Length;</div><div class='add'>+	u16                  AvailableRequestFixedIEs;</div><div class='add'>+	struct ndis_802_11_ai_reqfi    RequestFixedIEs;</div><div class='add'>+	u32                   RequestIELength;</div><div class='add'>+	u32                   OffsetRequestIEs;</div><div class='add'>+	u16                  AvailableResponseFixedIEs;</div><div class='add'>+	struct ndis_801_11_ai_resfi    ResponseFixedIEs;</div><div class='add'>+	u32                   ResponseIELength;</div><div class='add'>+	u32                   OffsetResponseIEs;</div><div class='ctx'> } NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;</div><div class='ctx'> </div><div class='ctx'> enum NDIS_802_11_RELOAD_DEFAULTS {</div><div class='hunk'>@@ -148,19 +148,19 @@ enum NDIS_802_11_RELOAD_DEFAULTS {</div><div class='ctx'> /*  Key mapping keys require a BSSID */</div><div class='ctx'> typedef struct _NDIS_802_11_KEY</div><div class='ctx'> {</div><div class='del'>-    u32           Length;             /*  Length of this structure */</div><div class='del'>-    u32           KeyIndex;</div><div class='del'>-    u32           KeyLength;          /*  length of key in bytes */</div><div class='del'>-    NDIS_802_11_MAC_ADDRESS BSSID;</div><div class='del'>-    unsigned long long KeyRSC;</div><div class='del'>-    u8           KeyMaterial[32];     /*  variable length depending on above field */</div><div class='add'>+	u32           Length;             /*  Length of this structure */</div><div class='add'>+	u32           KeyIndex;</div><div class='add'>+	u32           KeyLength;          /*  length of key in bytes */</div><div class='add'>+	NDIS_802_11_MAC_ADDRESS BSSID;</div><div class='add'>+	unsigned long long KeyRSC;</div><div class='add'>+	u8           KeyMaterial[32];     /*  variable length depending on above field */</div><div class='ctx'> } NDIS_802_11_KEY, *PNDIS_802_11_KEY;</div><div class='ctx'> </div><div class='ctx'> typedef struct _NDIS_802_11_REMOVE_KEY</div><div class='ctx'> {</div><div class='del'>-    u32                   Length;        /*  Length of this structure */</div><div class='del'>-    u32                   KeyIndex;</div><div class='del'>-    NDIS_802_11_MAC_ADDRESS BSSID;</div><div class='add'>+	u32                   Length;        /*  Length of this structure */</div><div class='add'>+	u32                   KeyIndex;</div><div class='add'>+	NDIS_802_11_MAC_ADDRESS BSSID;</div><div class='ctx'> } NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY;</div><div class='ctx'> </div><div class='ctx'> struct ndis_802_11_wep {</div><div class='hunk'>@@ -181,7 +181,7 @@ struct ndis_802_11_wep {</div><div class='ctx'> #define MIC_CHECK_TIME	60000000</div><div class='ctx'> </div><div class='ctx'> #ifndef Ndis802_11APMode</div><div class='del'>-#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)</div><div class='add'>+#define Ndis802_11APMode (Ndis802_11InfrastructureMax + 1)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct wlan_phy_info {</div><div class='hunk'>@@ -240,15 +240,15 @@ struct	wlan_network {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum VRTL_CARRIER_SENSE {</div><div class='del'>-    DISABLE_VCS,</div><div class='del'>-    ENABLE_VCS,</div><div class='del'>-    AUTO_VCS</div><div class='add'>+	DISABLE_VCS,</div><div class='add'>+	ENABLE_VCS,</div><div class='add'>+	AUTO_VCS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum VCS_TYPE {</div><div class='del'>-    NONE_VCS,</div><div class='del'>-    RTS_CTS,</div><div class='del'>-    CTS_TO_SELF</div><div class='add'>+	NONE_VCS,</div><div class='add'>+	RTS_CTS,</div><div class='add'>+	CTS_TO_SELF</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PWR_CAM 0</div><div class='hunk'>@@ -259,9 +259,9 @@ enum VCS_TYPE {</div><div class='ctx'> </div><div class='ctx'> enum UAPSD_MAX_SP {</div><div class='ctx'> 	NO_LIMIT,</div><div class='del'>-       TWO_MSDU,</div><div class='del'>-       FOUR_MSDU,</div><div class='del'>-       SIX_MSDU</div><div class='add'>+	TWO_MSDU,</div><div class='add'>+	FOUR_MSDU,</div><div class='add'>+	SIX_MSDU</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NUM_PRE_AUTH_KEY 16</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c<br/>index 8fb03efd588b..e3d356952875 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/ioctl_linux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/os_dep/ioctl_linux.c</a></div><div class='hunk'>@@ -961,7 +961,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,</div><div class='ctx'>         if (pPMK-&gt;cmd == IW_PMKSA_ADD) {</div><div class='ctx'>                 DBG_871X("[rtw_wx_set_pmkid] IW_PMKSA_ADD!\n");</div><div class='ctx'>                 if (!memcmp(strIssueBssid, strZeroMacAddress, ETH_ALEN))</div><div class='del'>-                    return(intReturn);</div><div class='add'>+			return intReturn;</div><div class='ctx'>                 else</div><div class='ctx'>                     intReturn = true;</div><div class='ctx'> </div><div class='hunk'>@@ -2590,10 +2590,6 @@ static int rtw_wps_start(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	DBG_871X("[%s] wps_start = %d\n", __func__, u32wps_start);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	process_intel_widi_wps_status(padapter, u32wps_start);</div><div class='del'>-#endif /* CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> exit:</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -4518,42 +4514,6 @@ static int rtw_tdls_get(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-static int rtw_widi_set(struct net_device *dev,</div><div class='del'>-                               struct iw_request_info *info,</div><div class='del'>-                               union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	process_intel_widi_cmd(padapter, extra);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtw_widi_set_probe_request(struct net_device *dev,</div><div class='del'>-                               struct iw_request_info *info,</div><div class='del'>-                               union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	int	ret = 0;</div><div class='del'>-	u8 *pbuf = NULL;</div><div class='del'>-	struct adapter	*padapter = (struct adapter *)rtw_netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	pbuf = rtw_malloc(sizeof(l2_msg_t));</div><div class='del'>-	if (pbuf) {</div><div class='del'>-		if (copy_from_user(pbuf, wrqu-&gt;data.pointer, wrqu-&gt;data.length))</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-		/* memcpy(pbuf, wrqu-&gt;data.pointer, wrqu-&gt;data.length); */</div><div class='del'>-</div><div class='del'>-		if (wrqu-&gt;data.flags == 0)</div><div class='del'>-			intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf, sizeof(l2_msg_t));</div><div class='del'>-		else if (wrqu-&gt;data.flags == 1)</div><div class='del'>-			rtw_set_wfd_rds_sink_info(padapter, (l2_msg_t *)pbuf);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> static int rtw_test(</div><div class='ctx'> 	struct net_device *dev,</div><div class='ctx'> 	struct iw_request_info *info,</div><div class='hunk'>@@ -4791,17 +4751,6 @@ static const struct iw_priv_args rtw_private_args[] = {</div><div class='ctx'> 		IW_PRIV_TYPE_CHAR | 40, IW_PRIV_TYPE_CHAR | 0x7FF, "test"</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	{</div><div class='del'>-		SIOCIWFIRSTPRIV + 0x1E,</div><div class='del'>-		IW_PRIV_TYPE_CHAR | 1024, 0, "widi_set"</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		SIOCIWFIRSTPRIV + 0x1F,</div><div class='del'>-		IW_PRIV_TYPE_CHAR | 128, 0, "widi_prob_req"</div><div class='del'>-	},</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_WOWLAN</div><div class='ctx'> 		{ MP_WOW_ENABLE , IW_PRIV_TYPE_CHAR | 1024, 0, "wow_mode" }, /* set */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4852,10 +4801,6 @@ static iw_handler rtw_private_handler[] = {</div><div class='ctx'> 	rtw_mp_efuse_get,				/* 0x1B */</div><div class='ctx'> 	NULL,							/*  0x1C is reserved for hostapd */</div><div class='ctx'> 	rtw_test,						/*  0x1D */</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	rtw_widi_set,					/* 0x1E */</div><div class='del'>-	rtw_widi_set_probe_request,		/* 0x1F */</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c<br/>index 143e3f9b31aa..8a9d838af24e 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/os_intfs.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/os_intfs.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/os_intfs.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/os_dep/os_intfs.c</a></div><div class='hunk'>@@ -309,9 +309,6 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)</div><div class='ctx'> 	registry_par-&gt;hw_wps_pbc = (u8)rtw_hw_wps_pbc;</div><div class='ctx'> </div><div class='ctx'> 	registry_par-&gt;max_roaming_times = (u8)rtw_max_roaming_times;</div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	registry_par-&gt;max_roaming_times = (u8)rtw_max_roaming_times + 2;</div><div class='del'>-#endif /*  CONFIG_INTEL_WIDI */</div><div class='ctx'> </div><div class='ctx'> 	registry_par-&gt;enable80211d = (u8)rtw_80211d;</div><div class='ctx'> </div><div class='hunk'>@@ -404,8 +401,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct net_device *sb_dev,</div><div class='del'>-			    select_queue_fallback_t fallback)</div><div class='add'>+			    struct net_device *sb_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter	*padapter = rtw_netdev_priv(dev);</div><div class='ctx'> 	struct mlme_priv *pmlmepriv = &amp;padapter-&gt;mlmepriv;</div><div class='hunk'>@@ -757,7 +753,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	rtw_init_hal_com_default_value(padapter);</div><div class='ctx'> </div><div class='del'>-	if ((rtw_init_cmd_priv(&amp;padapter-&gt;cmdpriv)) == _FAIL) {</div><div class='add'>+	if (rtw_init_cmd_priv(&amp;padapter-&gt;cmdpriv)) {</div><div class='ctx'> 		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init cmd_priv\n"));</div><div class='ctx'> 		ret8 = _FAIL;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -765,7 +761,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	padapter-&gt;cmdpriv.padapter = padapter;</div><div class='ctx'> </div><div class='del'>-	if ((rtw_init_evt_priv(&amp;padapter-&gt;evtpriv)) == _FAIL) {</div><div class='add'>+	if (rtw_init_evt_priv(&amp;padapter-&gt;evtpriv)) {</div><div class='ctx'> 		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init evt_priv\n"));</div><div class='ctx'> 		ret8 = _FAIL;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -816,14 +812,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> 	rtw_hal_dm_init(padapter);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	if (rtw_init_intel_widi(padapter) == _FAIL) {</div><div class='del'>-		DBG_871X("Can't rtw_init_intel_widi\n");</div><div class='del'>-		ret8 = _FAIL;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> exit:</div><div class='ctx'> </div><div class='ctx'> 	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n"));</div><div class='hunk'>@@ -860,10 +848,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)</div><div class='ctx'> {</div><div class='ctx'> 	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("==&gt;rtw_free_drv_sw"));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INTEL_WIDI</div><div class='del'>-	rtw_free_intel_widi(padapter);</div><div class='del'>-#endif /* CONFIG_INTEL_WIDI */</div><div class='del'>-</div><div class='ctx'> 	free_mlme_ext_priv(&amp;padapter-&gt;mlmeextpriv);</div><div class='ctx'> </div><div class='ctx'> 	rtw_free_cmd_priv(&amp;padapter-&gt;cmdpriv);</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c<br/>index 73b87da15eb2..a5a5a5c8226a 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/osdep_service.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/osdep_service.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/osdep_service.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/os_dep/osdep_service.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int readFile(struct file *fp, char *buf, int len)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	while (sum&lt;len) {</div><div class='del'>-		rlen =fp-&gt;f_op-&gt;read(fp, (char __force __user *)buf+sum, len-sum, &amp;fp-&gt;f_pos);</div><div class='add'>+		rlen = kernel_read(fp, buf + sum, len - sum, &amp;fp-&gt;f_pos);</div><div class='ctx'> 		if (rlen&gt;0)</div><div class='ctx'> 			sum+=rlen;</div><div class='ctx'> 		else if (0 != rlen)</div><div class='hunk'>@@ -116,7 +116,7 @@ static int readFile(struct file *fp, char *buf, int len)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return  sum;</div><div class='add'>+	return sum;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,22 +129,16 @@ static int isFileReadable(char *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *fp;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	mm_segment_t oldfs;</div><div class='ctx'> 	char buf;</div><div class='ctx'> </div><div class='ctx'> 	fp =filp_open(path, O_RDONLY, 0);</div><div class='del'>-	if (IS_ERR(fp)) {</div><div class='del'>-		ret = PTR_ERR(fp);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		oldfs = get_fs(); set_fs(KERNEL_DS);</div><div class='add'>+	if (IS_ERR(fp))</div><div class='add'>+		return PTR_ERR(fp);</div><div class='ctx'> </div><div class='del'>-		if (1!=readFile(fp, &amp;buf, 1))</div><div class='del'>-			ret = -EINVAL;</div><div class='add'>+	if (readFile(fp, &amp;buf, 1) != 1)</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-		set_fs(oldfs);</div><div class='del'>-		filp_close(fp, NULL);</div><div class='del'>-	}</div><div class='add'>+	filp_close(fp, NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -158,16 +152,15 @@ static int isFileReadable(char *path)</div><div class='ctx'> static int retriveFromFile(char *path, u8 *buf, u32 sz)</div><div class='ctx'> {</div><div class='ctx'> 	int ret =-1;</div><div class='del'>-	mm_segment_t oldfs;</div><div class='ctx'> 	struct file *fp;</div><div class='ctx'> </div><div class='ctx'> 	if (path &amp;&amp; buf) {</div><div class='del'>-		if (0 == (ret =openFile(&amp;fp, path, O_RDONLY, 0))) {</div><div class='add'>+		ret = openFile(&amp;fp, path, O_RDONLY, 0);</div><div class='add'>+</div><div class='add'>+		if (ret == 0) {</div><div class='ctx'> 			DBG_871X("%s openFile path:%s fp =%p\n", __func__, path , fp);</div><div class='ctx'> </div><div class='del'>-			oldfs = get_fs(); set_fs(KERNEL_DS);</div><div class='ctx'> 			ret =readFile(fp, buf, sz);</div><div class='del'>-			set_fs(oldfs);</div><div class='ctx'> 			closeFile(fp);</div><div class='ctx'> </div><div class='ctx'> 			DBG_871X("%s readFile, ret:%d\n", __func__, ret);</div><div class='hunk'>@@ -248,7 +241,7 @@ RETURN:</div><div class='ctx'> 	return pnetdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rtw_free_netdev(struct net_device * netdev)</div><div class='add'>+void rtw_free_netdev(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtw_netdev_priv_indicator *pnpi;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c<br/>index 6d02904de63f..052482554f74 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/sdio_intf.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/sdio_intf.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/sdio_intf.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/os_dep/sdio_intf.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static void sd_sync_int_hdl(struct sdio_func *func)</div><div class='ctx'> </div><div class='ctx'> static int sdio_alloc_irq(struct dvobj_priv *dvobj)</div><div class='ctx'> {</div><div class='del'>-	PSDIO_DATA psdio_data;</div><div class='add'>+	struct sdio_data *psdio_data;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +102,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)</div><div class='ctx'> </div><div class='ctx'> static void sdio_free_irq(struct dvobj_priv *dvobj)</div><div class='ctx'> {</div><div class='del'>-    PSDIO_DATA psdio_data;</div><div class='add'>+    struct sdio_data *psdio_data;</div><div class='ctx'>     struct sdio_func *func;</div><div class='ctx'>     int err;</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +176,7 @@ static void gpio_hostwakeup_free_irq(struct adapter *padapter)</div><div class='ctx'> </div><div class='ctx'> static u32 sdio_init(struct dvobj_priv *dvobj)</div><div class='ctx'> {</div><div class='del'>-	PSDIO_DATA psdio_data;</div><div class='add'>+	struct sdio_data *psdio_data;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +248,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)</div><div class='ctx'> {</div><div class='ctx'> 	int status = _FAIL;</div><div class='ctx'> 	struct dvobj_priv *dvobj = NULL;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	dvobj = devobj_init();</div><div class='ctx'> 	if (dvobj == NULL) {</div><div class='hunk'>@@ -327,7 +327,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct</div><div class='ctx'> 	int status = _FAIL;</div><div class='ctx'> 	struct net_device *pnetdev;</div><div class='ctx'> 	struct adapter *padapter = NULL;</div><div class='del'>-	PSDIO_DATA psdio = &amp;dvobj-&gt;intf_data;</div><div class='add'>+	struct sdio_data *psdio = &amp;dvobj-&gt;intf_data;</div><div class='ctx'> </div><div class='ctx'> 	padapter = vzalloc(sizeof(*padapter));</div><div class='ctx'> 	if (padapter == NULL) {</div><div class='head'>diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c b/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c<br/>index 43a9d922e3aa..1787534487b4 100644<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c</a><br/>+++ b/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c?id=92fab77b6b309dc219b02da4a69ad5dc76f7ec74'>drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> static bool rtw_sdio_claim_host_needed(struct sdio_func *func)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvobj_priv *dvobj = sdio_get_drvdata(func);</div><div class='del'>-	PSDIO_DATA sdio_data = &amp;dvobj-&gt;intf_data;</div><div class='add'>+	struct sdio_data *sdio_data = &amp;dvobj-&gt;intf_data;</div><div class='ctx'> </div><div class='ctx'> 	if (sdio_data-&gt;sys_sdio_irq_thd &amp;&amp; sdio_data-&gt;sys_sdio_irq_thd == current)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -21,7 +21,7 @@ static bool rtw_sdio_claim_host_needed(struct sdio_func *func)</div><div class='ctx'> </div><div class='ctx'> inline void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl)</div><div class='ctx'> {</div><div class='del'>-	PSDIO_DATA sdio_data = &amp;dvobj-&gt;intf_data;</div><div class='add'>+	struct sdio_data *sdio_data = &amp;dvobj-&gt;intf_data;</div><div class='ctx'> </div><div class='ctx'> 	sdio_data-&gt;sys_sdio_irq_thd = thd_hdl;</div><div class='ctx'> }</div><div class='hunk'>@@ -30,7 +30,7 @@ u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	u8 v = 0;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -67,7 +67,7 @@ s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	int err = 0, i;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -102,7 +102,7 @@ s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -137,7 +137,7 @@ s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	int err = 0, i;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -172,7 +172,7 @@ s32 sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -202,7 +202,7 @@ u8 sd_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	u8 v = 0;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -234,7 +234,7 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	u32 v = 0;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	bool claim_needed;</div><div class='hunk'>@@ -299,7 +299,7 @@ void sd_write8(struct intf_hdl *pintfhdl, u32 addr, u8 v, s32 *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	bool claim_needed;</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +328,7 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	bool claim_needed;</div><div class='ctx'> </div><div class='hunk'>@@ -404,7 +404,7 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	int err = -EPERM;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='hunk'>@@ -461,7 +461,7 @@ s32 sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	bool claim_needed;</div><div class='hunk'>@@ -505,7 +505,7 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> </div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	u32 size;</div><div class='hunk'>@@ -565,7 +565,7 @@ s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padapter;</div><div class='ctx'> 	struct dvobj_priv *psdiodev;</div><div class='del'>-	PSDIO_DATA psdio;</div><div class='add'>+	struct sdio_data *psdio;</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	bool claim_needed;</div><div class='ctx'> 	s32 err =  -EPERM;</div><div class='head'>diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig<br/>deleted file mode 100644<br/>index 28286a87a601..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/Kconfig?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-config R8822BE</div><div class='del'>-	tristate "Realtek RTL8822BE Wireless Network Adapter"</div><div class='del'>-	depends on PCI &amp;&amp; MAC80211 &amp;&amp; m</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	help</div><div class='del'>-	This is the staging driver for Realtek RTL8822BE 802.11ac PCIe</div><div class='del'>-	wireless network adapters.</div><div class='del'>-</div><div class='del'>-config RTLWIFI_DEBUG_ST</div><div class='del'>-	bool</div><div class='del'>-	depends on R8822BE</div><div class='del'>-	default y</div><div class='head'>diff --git a/drivers/staging/rtlwifi/Makefile b/drivers/staging/rtlwifi/Makefile<br/>deleted file mode 100644<br/>index 0d738c18b29c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-obj-$(CONFIG_R8822BE) 		+= r8822be.o</div><div class='del'>-</div><div class='del'>-r8822be-objs	:=		\</div><div class='del'>-		base.o		\</div><div class='del'>-		cam.o		\</div><div class='del'>-		core.o		\</div><div class='del'>-		debug.o		\</div><div class='del'>-		efuse.o		\</div><div class='del'>-		ps.o		\</div><div class='del'>-		rc.o		\</div><div class='del'>-		regd.o		\</div><div class='del'>-		stats.o		\</div><div class='del'>-		pci.o		\</div><div class='del'>-		rtl8822be/fw.o	\</div><div class='del'>-		rtl8822be/hw.o	\</div><div class='del'>-		rtl8822be/led.o	\</div><div class='del'>-		rtl8822be/phy.o	\</div><div class='del'>-		rtl8822be/sw.o	\</div><div class='del'>-		rtl8822be/trx.o	\</div><div class='del'>-		btcoexist/halbtc8822b2ant.o	\</div><div class='del'>-		btcoexist/halbtc8822b1ant.o	\</div><div class='del'>-		btcoexist/halbtc8822bwifionly.o	\</div><div class='del'>-		btcoexist/halbtcoutsrc.o	\</div><div class='del'>-		btcoexist/rtl_btc.o		\</div><div class='del'>-		halmac/halmac_api.o	\</div><div class='del'>-		halmac/halmac_88xx/halmac_api_88xx_usb.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_api_88xx_sdio.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_api_88xx.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_api_88xx_pcie.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_func_88xx.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.o	\</div><div class='del'>-	        halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.o	\</div><div class='del'>-	        halmac/rtl_halmac.o					\</div><div class='del'>-		phydm/phydm_debug.o	\</div><div class='del'>-		phydm/phydm_antdiv.o\</div><div class='del'>-		phydm/phydm_interface.o\</div><div class='del'>-		phydm/phydm_hwconfig.o\</div><div class='del'>-		phydm/phydm.o\</div><div class='del'>-		phydm/halphyrf_ce.o\</div><div class='del'>-		phydm/phydm_edcaturbocheck.o\</div><div class='del'>-		phydm/phydm_dig.o\</div><div class='del'>-		phydm/phydm_rainfo.o\</div><div class='del'>-		phydm/phydm_dynamicbbpowersaving.o\</div><div class='del'>-		phydm/phydm_powertracking_ce.o\</div><div class='del'>-		phydm/phydm_dynamictxpower.o\</div><div class='del'>-		phydm/phydm_adaptivity.o\</div><div class='del'>-		phydm/phydm_cfotracking.o\</div><div class='del'>-		phydm/phydm_noisemonitor.o\</div><div class='del'>-		phydm/phydm_acs.o\</div><div class='del'>-		phydm/phydm_psd.o\</div><div class='del'>-		phydm/phydm_adc_sampling.o\</div><div class='del'>-		phydm/phydm_kfree.o\</div><div class='del'>-		phydm/phydm_ccx.o		\</div><div class='del'>-		phydm/rtl8822b/halhwimg8822b_bb.o\</div><div class='del'>-		phydm/rtl8822b/halhwimg8822b_mac.o\</div><div class='del'>-		phydm/rtl8822b/halhwimg8822b_rf.o\</div><div class='del'>-		phydm/rtl8822b/halphyrf_8822b.o\</div><div class='del'>-		phydm/rtl8822b/phydm_hal_api8822b.o\</div><div class='del'>-		phydm/rtl8822b/phydm_iqk_8822b.o\</div><div class='del'>-		phydm/rtl8822b/phydm_regconfig8822b.o\</div><div class='del'>-		phydm/rtl8822b/phydm_rtl8822b.o	\</div><div class='del'>-		phydm/rtl_phydm.o</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_R8822BE)			+= rtl8822be/</div><div class='head'>diff --git a/drivers/staging/rtlwifi/TODO b/drivers/staging/rtlwifi/TODO<br/>deleted file mode 100644<br/>index 4a084f2fc5d0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/TODO?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-TODO:</div><div class='del'>-- find and remove code blocks guarded by never set CONFIG_FOO defines</div><div class='del'>-- convert any remaining unusual variable types</div><div class='del'>-- find codes that can use %pM and %Nph formatting</div><div class='del'>-- checkpatch.pl fixes - most of the remaining ones are lines too long. Many</div><div class='del'>-  of them will require refactoring</div><div class='del'>-- merge Realtek's bugfixes and new features into the driver</div><div class='del'>-- address any reviewers comments</div><div class='del'>-</div><div class='del'>-Please send any patches to Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;,</div><div class='del'>-and Larry Finger &lt;Larry.Finger@lwfinger.net&gt;.</div><div class='head'>diff --git a/drivers/staging/rtlwifi/base.c b/drivers/staging/rtlwifi/base.c<br/>deleted file mode 100644<br/>index 35df2cf60619..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/base.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/base.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2815 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "wifi.h"</div><div class='del'>-#include "rc.h"</div><div class='del'>-#include "base.h"</div><div class='del'>-#include "efuse.h"</div><div class='del'>-#include "cam.h"</div><div class='del'>-#include "ps.h"</div><div class='del'>-#include "regd.h"</div><div class='del'>-#include "pci.h"</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/udp.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *NOTICE!!!: This file will be very big, we should</div><div class='del'>- *keep it clear under following roles:</div><div class='del'>- *</div><div class='del'>- *This file include following parts, so, if you add new</div><div class='del'>- *functions into this file, please check which part it</div><div class='del'>- *should includes. or check if you should add new part</div><div class='del'>- *for this file:</div><div class='del'>- *</div><div class='del'>- *1) mac80211 init functions</div><div class='del'>- *2) tx information functions</div><div class='del'>- *3) functions called by core.c</div><div class='del'>- *4) wq &amp; timer callback functions</div><div class='del'>- *5) frame process functions</div><div class='del'>- *6) IOT functions</div><div class='del'>- *7) sysfs functions</div><div class='del'>- *8) vif functions</div><div class='del'>- *9) ...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*********************************************************</div><div class='del'>- *</div><div class='del'>- * mac80211 init functions</div><div class='del'>- *</div><div class='del'>- *********************************************************/</div><div class='del'>-static struct ieee80211_channel rtl_channeltable_2g[] = {</div><div class='del'>-	{.center_freq = 2412, .hw_value = 1,},</div><div class='del'>-	{.center_freq = 2417, .hw_value = 2,},</div><div class='del'>-	{.center_freq = 2422, .hw_value = 3,},</div><div class='del'>-	{.center_freq = 2427, .hw_value = 4,},</div><div class='del'>-	{.center_freq = 2432, .hw_value = 5,},</div><div class='del'>-	{.center_freq = 2437, .hw_value = 6,},</div><div class='del'>-	{.center_freq = 2442, .hw_value = 7,},</div><div class='del'>-	{.center_freq = 2447, .hw_value = 8,},</div><div class='del'>-	{.center_freq = 2452, .hw_value = 9,},</div><div class='del'>-	{.center_freq = 2457, .hw_value = 10,},</div><div class='del'>-	{.center_freq = 2462, .hw_value = 11,},</div><div class='del'>-	{.center_freq = 2467, .hw_value = 12,},</div><div class='del'>-	{.center_freq = 2472, .hw_value = 13,},</div><div class='del'>-	{.center_freq = 2484, .hw_value = 14,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ieee80211_channel rtl_channeltable_5g[] = {</div><div class='del'>-	{.center_freq = 5180, .hw_value = 36,},</div><div class='del'>-	{.center_freq = 5200, .hw_value = 40,},</div><div class='del'>-	{.center_freq = 5220, .hw_value = 44,},</div><div class='del'>-	{.center_freq = 5240, .hw_value = 48,},</div><div class='del'>-	{.center_freq = 5260, .hw_value = 52,},</div><div class='del'>-	{.center_freq = 5280, .hw_value = 56,},</div><div class='del'>-	{.center_freq = 5300, .hw_value = 60,},</div><div class='del'>-	{.center_freq = 5320, .hw_value = 64,},</div><div class='del'>-	{.center_freq = 5500, .hw_value = 100,},</div><div class='del'>-	{.center_freq = 5520, .hw_value = 104,},</div><div class='del'>-	{.center_freq = 5540, .hw_value = 108,},</div><div class='del'>-	{.center_freq = 5560, .hw_value = 112,},</div><div class='del'>-	{.center_freq = 5580, .hw_value = 116,},</div><div class='del'>-	{.center_freq = 5600, .hw_value = 120,},</div><div class='del'>-	{.center_freq = 5620, .hw_value = 124,},</div><div class='del'>-	{.center_freq = 5640, .hw_value = 128,},</div><div class='del'>-	{.center_freq = 5660, .hw_value = 132,},</div><div class='del'>-	{.center_freq = 5680, .hw_value = 136,},</div><div class='del'>-	{.center_freq = 5700, .hw_value = 140,},</div><div class='del'>-	{.center_freq = 5745, .hw_value = 149,},</div><div class='del'>-	{.center_freq = 5765, .hw_value = 153,},</div><div class='del'>-	{.center_freq = 5785, .hw_value = 157,},</div><div class='del'>-	{.center_freq = 5805, .hw_value = 161,},</div><div class='del'>-	{.center_freq = 5825, .hw_value = 165,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ieee80211_rate rtl_ratetable_2g[] = {</div><div class='del'>-	{.bitrate = 10, .hw_value = 0x00,},</div><div class='del'>-	{.bitrate = 20, .hw_value = 0x01,},</div><div class='del'>-	{.bitrate = 55, .hw_value = 0x02,},</div><div class='del'>-	{.bitrate = 110, .hw_value = 0x03,},</div><div class='del'>-	{.bitrate = 60, .hw_value = 0x04,},</div><div class='del'>-	{.bitrate = 90, .hw_value = 0x05,},</div><div class='del'>-	{.bitrate = 120, .hw_value = 0x06,},</div><div class='del'>-	{.bitrate = 180, .hw_value = 0x07,},</div><div class='del'>-	{.bitrate = 240, .hw_value = 0x08,},</div><div class='del'>-	{.bitrate = 360, .hw_value = 0x09,},</div><div class='del'>-	{.bitrate = 480, .hw_value = 0x0a,},</div><div class='del'>-	{.bitrate = 540, .hw_value = 0x0b,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ieee80211_rate rtl_ratetable_5g[] = {</div><div class='del'>-	{.bitrate = 60, .hw_value = 0x04,},</div><div class='del'>-	{.bitrate = 90, .hw_value = 0x05,},</div><div class='del'>-	{.bitrate = 120, .hw_value = 0x06,},</div><div class='del'>-	{.bitrate = 180, .hw_value = 0x07,},</div><div class='del'>-	{.bitrate = 240, .hw_value = 0x08,},</div><div class='del'>-	{.bitrate = 360, .hw_value = 0x09,},</div><div class='del'>-	{.bitrate = 480, .hw_value = 0x0a,},</div><div class='del'>-	{.bitrate = 540, .hw_value = 0x0b,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_supported_band rtl_band_2ghz = {</div><div class='del'>-	.band = NL80211_BAND_2GHZ,</div><div class='del'>-</div><div class='del'>-	.channels = rtl_channeltable_2g,</div><div class='del'>-	.n_channels = ARRAY_SIZE(rtl_channeltable_2g),</div><div class='del'>-</div><div class='del'>-	.bitrates = rtl_ratetable_2g,</div><div class='del'>-	.n_bitrates = ARRAY_SIZE(rtl_ratetable_2g),</div><div class='del'>-</div><div class='del'>-	.ht_cap = {0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ieee80211_supported_band rtl_band_5ghz = {</div><div class='del'>-	.band = NL80211_BAND_5GHZ,</div><div class='del'>-</div><div class='del'>-	.channels = rtl_channeltable_5g,</div><div class='del'>-	.n_channels = ARRAY_SIZE(rtl_channeltable_5g),</div><div class='del'>-</div><div class='del'>-	.bitrates = rtl_ratetable_5g,</div><div class='del'>-	.n_bitrates = ARRAY_SIZE(rtl_ratetable_5g),</div><div class='del'>-</div><div class='del'>-	.ht_cap = {0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 tid_to_ac[] = {</div><div class='del'>-	2, /* IEEE80211_AC_BE */</div><div class='del'>-	3, /* IEEE80211_AC_BK */</div><div class='del'>-	3, /* IEEE80211_AC_BK */</div><div class='del'>-	2, /* IEEE80211_AC_BE */</div><div class='del'>-	1, /* IEEE80211_AC_VI */</div><div class='del'>-	1, /* IEEE80211_AC_VI */</div><div class='del'>-	0, /* IEEE80211_AC_VO */</div><div class='del'>-	0, /* IEEE80211_AC_VO */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-u8 rtl_tid_to_ac(u8 tid)</div><div class='del'>-{</div><div class='del'>-	return tid_to_ac[tid];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,</div><div class='del'>-				  struct ieee80211_sta_ht_cap *ht_cap)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-</div><div class='del'>-	ht_cap-&gt;ht_supported = true;</div><div class='del'>-	ht_cap-&gt;cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |</div><div class='del'>-	    IEEE80211_HT_CAP_SGI_40 |</div><div class='del'>-	    IEEE80211_HT_CAP_SGI_20 |</div><div class='del'>-	    IEEE80211_HT_CAP_DSSSCCK40 | IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;rtlhal.disable_amsdu_8k)</div><div class='del'>-		ht_cap-&gt;cap &amp;= ~IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *Maximum length of AMPDU that the STA can receive.</div><div class='del'>-	 *Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)</div><div class='del'>-	 */</div><div class='del'>-	ht_cap-&gt;ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='del'>-</div><div class='del'>-	/*Minimum MPDU start spacing , */</div><div class='del'>-	ht_cap-&gt;ampdu_density = IEEE80211_HT_MPDU_DENSITY_16;</div><div class='del'>-</div><div class='del'>-	ht_cap-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='del'>-</div><div class='del'>-	/*hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ]</div><div class='del'>-	 *base on ant_num</div><div class='del'>-	 *rx_mask: RX mask</div><div class='del'>-	 *if rx_ant = 1 rx_mask[0]= 0xff;==&gt;MCS0-MCS7</div><div class='del'>-	 *if rx_ant = 2 rx_mask[1]= 0xff;==&gt;MCS8-MCS15</div><div class='del'>-	 *if rx_ant &gt;= 3 rx_mask[2]= 0xff;</div><div class='del'>-	 *if BW_40 rx_mask[4]= 0x01;</div><div class='del'>-	 *highest supported RX rate</div><div class='del'>-	 */</div><div class='del'>-	if (rtlpriv-&gt;dm.supp_phymode_switch) {</div><div class='del'>-		pr_info("Support phy mode switch\n");</div><div class='del'>-</div><div class='del'>-		ht_cap-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='del'>-		ht_cap-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='del'>-		ht_cap-&gt;mcs.rx_mask[4] = 0x01;</div><div class='del'>-</div><div class='del'>-		ht_cap-&gt;mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);</div><div class='del'>-	} else {</div><div class='del'>-		if (get_rf_type(rtlphy) == RF_1T2R ||</div><div class='del'>-		    get_rf_type(rtlphy) == RF_2T2R) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,</div><div class='del'>-				 "1T2R or 2T2R\n");</div><div class='del'>-			ht_cap-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='del'>-			ht_cap-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='del'>-			ht_cap-&gt;mcs.rx_mask[4] = 0x01;</div><div class='del'>-</div><div class='del'>-			ht_cap-&gt;mcs.rx_highest =</div><div class='del'>-				 cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);</div><div class='del'>-		} else if (get_rf_type(rtlphy) == RF_1T1R) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");</div><div class='del'>-</div><div class='del'>-			ht_cap-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='del'>-			ht_cap-&gt;mcs.rx_mask[1] = 0x00;</div><div class='del'>-			ht_cap-&gt;mcs.rx_mask[4] = 0x01;</div><div class='del'>-</div><div class='del'>-			ht_cap-&gt;mcs.rx_highest =</div><div class='del'>-				 cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_init_hw_vht_capab(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_sta_vht_cap *vht_cap)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (rtlhal-&gt;hw_type == HARDWARE_TYPE_RTL8812AE ||</div><div class='del'>-	    rtlhal-&gt;hw_type == HARDWARE_TYPE_RTL8822BE) {</div><div class='del'>-		u16 mcs_map;</div><div class='del'>-</div><div class='del'>-		vht_cap-&gt;vht_supported = true;</div><div class='del'>-		vht_cap-&gt;cap =</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='del'>-			IEEE80211_VHT_CAP_SHORT_GI_80 |</div><div class='del'>-			IEEE80211_VHT_CAP_TXSTBC |</div><div class='del'>-			IEEE80211_VHT_CAP_RXSTBC_1 |</div><div class='del'>-			IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |</div><div class='del'>-			IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |</div><div class='del'>-			IEEE80211_VHT_CAP_HTC_VHT |</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |</div><div class='del'>-			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |</div><div class='del'>-			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |</div><div class='del'>-			0;</div><div class='del'>-</div><div class='del'>-		mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; 0 |</div><div class='del'>-			IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; 2 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 4 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 6 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 8 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 10 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 12 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 14;</div><div class='del'>-</div><div class='del'>-		vht_cap-&gt;vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);</div><div class='del'>-		vht_cap-&gt;vht_mcs.rx_highest =</div><div class='del'>-			cpu_to_le16(MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9);</div><div class='del'>-		vht_cap-&gt;vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);</div><div class='del'>-		vht_cap-&gt;vht_mcs.tx_highest =</div><div class='del'>-			cpu_to_le16(MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9);</div><div class='del'>-	} else if (rtlhal-&gt;hw_type == HARDWARE_TYPE_RTL8821AE) {</div><div class='del'>-		u16 mcs_map;</div><div class='del'>-</div><div class='del'>-		vht_cap-&gt;vht_supported = true;</div><div class='del'>-		vht_cap-&gt;cap =</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='del'>-			IEEE80211_VHT_CAP_SHORT_GI_80 |</div><div class='del'>-			IEEE80211_VHT_CAP_TXSTBC |</div><div class='del'>-			IEEE80211_VHT_CAP_RXSTBC_1 |</div><div class='del'>-			IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |</div><div class='del'>-			IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |</div><div class='del'>-			IEEE80211_VHT_CAP_HTC_VHT |</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |</div><div class='del'>-			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |</div><div class='del'>-			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |</div><div class='del'>-			0;</div><div class='del'>-</div><div class='del'>-		mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; 0 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 2 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 4 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 6 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 8 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 10 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 12 |</div><div class='del'>-			IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; 14;</div><div class='del'>-</div><div class='del'>-		vht_cap-&gt;vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);</div><div class='del'>-		vht_cap-&gt;vht_mcs.rx_highest =</div><div class='del'>-			cpu_to_le16(MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9);</div><div class='del'>-		vht_cap-&gt;vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);</div><div class='del'>-		vht_cap-&gt;vht_mcs.tx_highest =</div><div class='del'>-			cpu_to_le16(MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_init_mac80211(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-	struct rtl_mac *rtlmac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-</div><div class='del'>-	if (rtlhal-&gt;macphymode == SINGLEMAC_SINGLEPHY &amp;&amp;</div><div class='del'>-	    rtlhal-&gt;bandset == BAND_ON_BOTH) {</div><div class='del'>-		/* 1: 2.4 G bands */</div><div class='del'>-		/* &lt;1&gt; use  mac-&gt;bands as mem for hw-&gt;wiphy-&gt;bands */</div><div class='del'>-		sband = &amp;rtlmac-&gt;bands[NL80211_BAND_2GHZ];</div><div class='del'>-</div><div class='del'>-		/* &lt;2&gt; set hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ]</div><div class='del'>-		 * to default value(1T1R)</div><div class='del'>-		 */</div><div class='del'>-		memcpy(&amp;rtlmac-&gt;bands[NL80211_BAND_2GHZ], &amp;rtl_band_2ghz,</div><div class='del'>-		       sizeof(struct ieee80211_supported_band));</div><div class='del'>-</div><div class='del'>-		/* &lt;3&gt; init ht cap base on ant_num */</div><div class='del'>-		_rtl_init_hw_ht_capab(hw, &amp;sband-&gt;ht_cap);</div><div class='del'>-</div><div class='del'>-		/* &lt;4&gt; set mac-&gt;sband to wiphy-&gt;sband */</div><div class='del'>-		hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ] = sband;</div><div class='del'>-</div><div class='del'>-		/* 2: 5 G bands */</div><div class='del'>-		/* &lt;1&gt; use  mac-&gt;bands as mem for hw-&gt;wiphy-&gt;bands */</div><div class='del'>-		sband = &amp;rtlmac-&gt;bands[NL80211_BAND_5GHZ];</div><div class='del'>-</div><div class='del'>-		/* &lt;2&gt; set hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ]</div><div class='del'>-		 * to default value(1T1R)</div><div class='del'>-		 */</div><div class='del'>-		memcpy(&amp;rtlmac-&gt;bands[NL80211_BAND_5GHZ], &amp;rtl_band_5ghz,</div><div class='del'>-		       sizeof(struct ieee80211_supported_band));</div><div class='del'>-</div><div class='del'>-		/* &lt;3&gt; init ht cap base on ant_num */</div><div class='del'>-		_rtl_init_hw_ht_capab(hw, &amp;sband-&gt;ht_cap);</div><div class='del'>-</div><div class='del'>-		_rtl_init_hw_vht_capab(hw, &amp;sband-&gt;vht_cap);</div><div class='del'>-		/* &lt;4&gt; set mac-&gt;sband to wiphy-&gt;sband */</div><div class='del'>-		hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ] = sband;</div><div class='del'>-	} else {</div><div class='del'>-		if (rtlhal-&gt;current_bandtype == BAND_ON_2_4G) {</div><div class='del'>-			/* &lt;1&gt; use  mac-&gt;bands as mem for hw-&gt;wiphy-&gt;bands */</div><div class='del'>-			sband = &amp;rtlmac-&gt;bands[NL80211_BAND_2GHZ];</div><div class='del'>-</div><div class='del'>-			/* &lt;2&gt; set hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ]</div><div class='del'>-			 * to default value(1T1R)</div><div class='del'>-			 */</div><div class='del'>-			memcpy(&amp;rtlmac-&gt;bands[NL80211_BAND_2GHZ],</div><div class='del'>-			       &amp;rtl_band_2ghz,</div><div class='del'>-			       sizeof(struct ieee80211_supported_band));</div><div class='del'>-</div><div class='del'>-			/* &lt;3&gt; init ht cap base on ant_num */</div><div class='del'>-			_rtl_init_hw_ht_capab(hw, &amp;sband-&gt;ht_cap);</div><div class='del'>-</div><div class='del'>-			/* &lt;4&gt; set mac-&gt;sband to wiphy-&gt;sband */</div><div class='del'>-			hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ] = sband;</div><div class='del'>-		} else if (rtlhal-&gt;current_bandtype == BAND_ON_5G) {</div><div class='del'>-			/* &lt;1&gt; use  mac-&gt;bands as mem for hw-&gt;wiphy-&gt;bands */</div><div class='del'>-			sband = &amp;rtlmac-&gt;bands[NL80211_BAND_5GHZ];</div><div class='del'>-</div><div class='del'>-			/* &lt;2&gt; set hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ]</div><div class='del'>-			 * to default value(1T1R)</div><div class='del'>-			 */</div><div class='del'>-			memcpy(&amp;rtlmac-&gt;bands[NL80211_BAND_5GHZ],</div><div class='del'>-			       &amp;rtl_band_5ghz,</div><div class='del'>-			       sizeof(struct ieee80211_supported_band));</div><div class='del'>-</div><div class='del'>-			/* &lt;3&gt; init ht cap base on ant_num */</div><div class='del'>-			_rtl_init_hw_ht_capab(hw, &amp;sband-&gt;ht_cap);</div><div class='del'>-</div><div class='del'>-			_rtl_init_hw_vht_capab(hw, &amp;sband-&gt;vht_cap);</div><div class='del'>-			/* &lt;4&gt; set mac-&gt;sband to wiphy-&gt;sband */</div><div class='del'>-			hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ] = sband;</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("Err BAND %d\n",</div><div class='del'>-			       rtlhal-&gt;current_bandtype);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* &lt;5&gt; set hw caps */</div><div class='del'>-	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='del'>-	ieee80211_hw_set(hw, RX_INCLUDES_FCS);</div><div class='del'>-	ieee80211_hw_set(hw, AMPDU_AGGREGATION);</div><div class='del'>-	ieee80211_hw_set(hw, CONNECTION_MONITOR);</div><div class='del'>-	ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='del'>-	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);</div><div class='del'>-	ieee80211_hw_set(hw, SUPPORTS_TX_FRAG);</div><div class='del'>-	ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);</div><div class='del'>-	ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);</div><div class='del'>-</div><div class='del'>-	/* swlps or hwlps has been set in diff chip in init_sw_vars */</div><div class='del'>-	if (rtlpriv-&gt;psc.swctrl_lps) {</div><div class='del'>-		ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='del'>-		ieee80211_hw_set(hw, PS_NULLFUNC_STACK);</div><div class='del'>-	}</div><div class='del'>-	if (rtlpriv-&gt;psc.fwctrl_lps) {</div><div class='del'>-		ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='del'>-		ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='del'>-	}</div><div class='del'>-	hw-&gt;wiphy-&gt;interface_modes =</div><div class='del'>-	    BIT(NL80211_IFTYPE_AP) |</div><div class='del'>-	    BIT(NL80211_IFTYPE_STATION) |</div><div class='del'>-	    BIT(NL80211_IFTYPE_ADHOC) |</div><div class='del'>-	    BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='del'>-	    BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='del'>-	    BIT(NL80211_IFTYPE_P2P_GO);</div><div class='del'>-	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;rts_threshold = 2347;</div><div class='del'>-</div><div class='del'>-	hw-&gt;queues = AC_MAX;</div><div class='del'>-	hw-&gt;extra_tx_headroom = RTL_TX_HEADER_SIZE;</div><div class='del'>-</div><div class='del'>-	/* TODO: Correct this value for our hw */</div><div class='del'>-	hw-&gt;max_listen_interval = MAX_LISTEN_INTERVAL;</div><div class='del'>-	hw-&gt;max_rate_tries = MAX_RATE_TRIES;</div><div class='del'>-	/* hw-&gt;max_rates = 1; */</div><div class='del'>-	hw-&gt;sta_data_size = sizeof(struct rtl_sta_info);</div><div class='del'>-</div><div class='del'>-/* wowlan is not supported by kernel if CONFIG_PM is not defined */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	if (rtlpriv-&gt;psc.wo_wlan_mode) {</div><div class='del'>-		if (rtlpriv-&gt;psc.wo_wlan_mode &amp; WAKE_ON_MAGIC_PACKET)</div><div class='del'>-			rtlpriv-&gt;wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT;</div><div class='del'>-		if (rtlpriv-&gt;psc.wo_wlan_mode &amp; WAKE_ON_PATTERN_MATCH) {</div><div class='del'>-			rtlpriv-&gt;wowlan.n_patterns =</div><div class='del'>-				MAX_SUPPORT_WOL_PATTERN_NUM;</div><div class='del'>-			rtlpriv-&gt;wowlan.pattern_min_len = MIN_WOL_PATTERN_SIZE;</div><div class='del'>-			rtlpriv-&gt;wowlan.pattern_max_len = MAX_WOL_PATTERN_SIZE;</div><div class='del'>-		}</div><div class='del'>-		hw-&gt;wiphy-&gt;wowlan = &amp;rtlpriv-&gt;wowlan;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* &lt;6&gt; mac address */</div><div class='del'>-	if (is_valid_ether_addr(rtlefuse-&gt;dev_addr)) {</div><div class='del'>-		SET_IEEE80211_PERM_ADDR(hw, rtlefuse-&gt;dev_addr);</div><div class='del'>-	} else {</div><div class='del'>-		u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };</div><div class='del'>-</div><div class='del'>-		get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);</div><div class='del'>-		SET_IEEE80211_PERM_ADDR(hw, rtlmac1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_init_deferred_work(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	/* &lt;1&gt; timer */</div><div class='del'>-	timer_setup(&amp;rtlpriv-&gt;works.watchdog_timer,</div><div class='del'>-		    rtl_watch_dog_timer_callback, 0);</div><div class='del'>-	timer_setup(&amp;rtlpriv-&gt;works.dualmac_easyconcurrent_retrytimer,</div><div class='del'>-		    rtl_easy_concurrent_retrytimer_callback, 0);</div><div class='del'>-	/* &lt;2&gt; work queue */</div><div class='del'>-	rtlpriv-&gt;works.hw = hw;</div><div class='del'>-	rtlpriv-&gt;works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv-&gt;cfg-&gt;name);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.watchdog_wq,</div><div class='del'>-			  (void *)rtl_watchdog_wq_callback);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.ips_nic_off_wq,</div><div class='del'>-			  (void *)rtl_ips_nic_off_wq_callback);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.ps_work,</div><div class='del'>-			  (void *)rtl_swlps_wq_callback);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.ps_rfon_wq,</div><div class='del'>-			  (void *)rtl_swlps_rfon_wq_callback);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.fwevt_wq,</div><div class='del'>-			  (void *)rtl_fwevt_wq_callback);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;rtlpriv-&gt;works.c2hcmd_wq,</div><div class='del'>-			  (void *)rtl_c2hcmd_wq_callback);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_deinit_deferred_work(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;rtlpriv-&gt;works.watchdog_timer);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work(&amp;rtlpriv-&gt;works.watchdog_wq);</div><div class='del'>-	cancel_delayed_work(&amp;rtlpriv-&gt;works.ips_nic_off_wq);</div><div class='del'>-	cancel_delayed_work(&amp;rtlpriv-&gt;works.ps_work);</div><div class='del'>-	cancel_delayed_work(&amp;rtlpriv-&gt;works.ps_rfon_wq);</div><div class='del'>-	cancel_delayed_work(&amp;rtlpriv-&gt;works.fwevt_wq);</div><div class='del'>-	cancel_delayed_work(&amp;rtlpriv-&gt;works.c2hcmd_wq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_init_rfkill(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	bool radio_state;</div><div class='del'>-	bool blocked;</div><div class='del'>-	u8 valid = 0;</div><div class='del'>-</div><div class='del'>-	/*set init state to on */</div><div class='del'>-	rtlpriv-&gt;rfkill.rfkill_state = true;</div><div class='del'>-	wiphy_rfkill_set_hw_state(hw-&gt;wiphy, 0);</div><div class='del'>-</div><div class='del'>-	radio_state = rtlpriv-&gt;cfg-&gt;ops-&gt;radio_onoff_checking(hw, &amp;valid);</div><div class='del'>-</div><div class='del'>-	if (valid) {</div><div class='del'>-		pr_info("rtlwifi: wireless switch is %s\n",</div><div class='del'>-			rtlpriv-&gt;rfkill.rfkill_state ? "on" : "off");</div><div class='del'>-</div><div class='del'>-		rtlpriv-&gt;rfkill.rfkill_state = radio_state;</div><div class='del'>-</div><div class='del'>-		blocked = (rtlpriv-&gt;rfkill.rfkill_state == 1) ? 0 : 1;</div><div class='del'>-		wiphy_rfkill_set_hw_state(hw-&gt;wiphy, blocked);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wiphy_rfkill_start_polling(hw-&gt;wiphy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_deinit_rfkill(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	wiphy_rfkill_stop_polling(hw-&gt;wiphy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_init_core(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *rtlmac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	/* &lt;1&gt; init mac80211 */</div><div class='del'>-	_rtl_init_mac80211(hw);</div><div class='del'>-	rtlmac-&gt;hw = hw;</div><div class='del'>-</div><div class='del'>-	/* &lt;2&gt; rate control register */</div><div class='del'>-	hw-&gt;rate_control_algorithm = "rtl_rc";</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * &lt;3&gt; init CRDA must come after init</div><div class='del'>-	 * mac80211 hw  in _rtl_init_mac80211.</div><div class='del'>-	 */</div><div class='del'>-	if (rtl_regd_init(hw, rtl_reg_notifier)) {</div><div class='del'>-		pr_err("REGD init failed\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* &lt;4&gt; locks */</div><div class='del'>-	mutex_init(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	mutex_init(&amp;rtlpriv-&gt;locks.ips_mutex);</div><div class='del'>-	mutex_init(&amp;rtlpriv-&gt;locks.lps_mutex);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.irq_th_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.h2c_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.rf_ps_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.rf_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.c2hcmd_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.scan_list_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.cck_and_rw_pagea_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.fw_ps_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.iqk_lock);</div><div class='del'>-	/* &lt;5&gt; init list */</div><div class='del'>-	INIT_LIST_HEAD(&amp;rtlpriv-&gt;entry_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rtlpriv-&gt;c2hcmd_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rtlpriv-&gt;scan_list.list);</div><div class='del'>-</div><div class='del'>-	rtlmac-&gt;link_state = MAC80211_NOLINK;</div><div class='del'>-</div><div class='del'>-	/* &lt;6&gt; init deferred work */</div><div class='del'>-	_rtl_init_deferred_work(hw);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_free_entries_from_scan_list(struct ieee80211_hw *hw);</div><div class='del'>-</div><div class='del'>-void rtl_deinit_core(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	rtl_c2hcmd_launcher(hw, 0);</div><div class='del'>-	rtl_free_entries_from_scan_list(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_init_rx_config(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;get_hw_reg(hw, HW_VAR_RCR, (u8 *)&amp;mac-&gt;rx_conf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********************************************************</div><div class='del'>- *</div><div class='del'>- * tx information functions</div><div class='del'>- *</div><div class='del'>- *********************************************************/</div><div class='del'>-static void _rtl_qurey_shortpreamble_mode(struct ieee80211_hw *hw,</div><div class='del'>-					  struct rtl_tcb_desc *tcb_desc,</div><div class='del'>-					  struct ieee80211_tx_info *info)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 rate_flag = info-&gt;control.rates[0].flags;</div><div class='del'>-</div><div class='del'>-	tcb_desc-&gt;use_shortpreamble = false;</div><div class='del'>-</div><div class='del'>-	/* 1M can only use Long Preamble. 11B spec */</div><div class='del'>-	if (tcb_desc-&gt;hw_rate == rtlpriv-&gt;cfg-&gt;maps[RTL_RC_CCK_RATE1M])</div><div class='del'>-		return;</div><div class='del'>-	else if (rate_flag &amp; IEEE80211_TX_RC_USE_SHORT_PREAMBLE)</div><div class='del'>-		tcb_desc-&gt;use_shortpreamble = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_query_shortgi(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_sta *sta,</div><div class='del'>-			       struct rtl_tcb_desc *tcb_desc,</div><div class='del'>-			       struct ieee80211_tx_info *info)</div><div class='del'>-{</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	u8 rate_flag = info-&gt;control.rates[0].flags;</div><div class='del'>-	u8 sgi_40 = 0, sgi_20 = 0, bw_40 = 0;</div><div class='del'>-	u8 sgi_80 = 0, bw_80 = 0;</div><div class='del'>-</div><div class='del'>-	tcb_desc-&gt;use_shortgi = false;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sgi_40 = sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40;</div><div class='del'>-	sgi_20 = sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20;</div><div class='del'>-	sgi_80 = sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80;</div><div class='del'>-</div><div class='del'>-	if (!sta-&gt;ht_cap.ht_supported &amp;&amp; !sta-&gt;vht_cap.vht_supported)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!sgi_40 &amp;&amp; !sgi_20)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-		bw_40 = mac-&gt;bw_40;</div><div class='del'>-		bw_80 = mac-&gt;bw_80;</div><div class='del'>-	} else if (mac-&gt;opmode == NL80211_IFTYPE_AP ||</div><div class='del'>-		 mac-&gt;opmode == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-		 mac-&gt;opmode == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-		bw_40 = sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='del'>-		bw_80 = sta-&gt;vht_cap.vht_supported;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bw_80) {</div><div class='del'>-		if (sgi_80)</div><div class='del'>-			tcb_desc-&gt;use_shortgi = true;</div><div class='del'>-		else</div><div class='del'>-			tcb_desc-&gt;use_shortgi = false;</div><div class='del'>-	} else {</div><div class='del'>-		if (bw_40 &amp;&amp; sgi_40)</div><div class='del'>-			tcb_desc-&gt;use_shortgi = true;</div><div class='del'>-		else if (!bw_40 &amp;&amp; sgi_20)</div><div class='del'>-			tcb_desc-&gt;use_shortgi = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(rate_flag &amp; IEEE80211_TX_RC_SHORT_GI))</div><div class='del'>-		tcb_desc-&gt;use_shortgi = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_query_protection_mode(struct ieee80211_hw *hw,</div><div class='del'>-				       struct rtl_tcb_desc *tcb_desc,</div><div class='del'>-				       struct ieee80211_tx_info *info)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 rate_flag = info-&gt;control.rates[0].flags;</div><div class='del'>-</div><div class='del'>-	/* Common Settings */</div><div class='del'>-	tcb_desc-&gt;rts_stbc = false;</div><div class='del'>-	tcb_desc-&gt;cts_enable = false;</div><div class='del'>-	tcb_desc-&gt;rts_sc = 0;</div><div class='del'>-	tcb_desc-&gt;rts_bw = false;</div><div class='del'>-	tcb_desc-&gt;rts_use_shortpreamble = false;</div><div class='del'>-	tcb_desc-&gt;rts_use_shortgi = false;</div><div class='del'>-</div><div class='del'>-	if (rate_flag &amp; IEEE80211_TX_RC_USE_CTS_PROTECT) {</div><div class='del'>-		/* Use CTS-to-SELF in protection mode. */</div><div class='del'>-		tcb_desc-&gt;rts_enable = true;</div><div class='del'>-		tcb_desc-&gt;cts_enable = true;</div><div class='del'>-		tcb_desc-&gt;rts_rate = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_OFDM_RATE24M];</div><div class='del'>-	} else if (rate_flag &amp; IEEE80211_TX_RC_USE_RTS_CTS) {</div><div class='del'>-		/* Use RTS-CTS in protection mode. */</div><div class='del'>-		tcb_desc-&gt;rts_enable = true;</div><div class='del'>-		tcb_desc-&gt;rts_rate = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_OFDM_RATE24M];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 rtl_mrate_idx_to_arfr_id(struct ieee80211_hw *hw, u8 rate_index,</div><div class='del'>-			    enum wireless_mode wirelessmode)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	u8 ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (rate_index) {</div><div class='del'>-	case RATR_INX_WIRELESS_NGB:</div><div class='del'>-		if (rtlphy-&gt;rf_type == RF_1T1R)</div><div class='del'>-			ret = RATEID_IDX_BGN_40M_1SS;</div><div class='del'>-		else</div><div class='del'>-			ret = RATEID_IDX_BGN_40M_2SS;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_N:</div><div class='del'>-	case RATR_INX_WIRELESS_NG:</div><div class='del'>-		if (rtlphy-&gt;rf_type == RF_1T1R)</div><div class='del'>-			ret = RATEID_IDX_GN_N1SS;</div><div class='del'>-		else</div><div class='del'>-			ret = RATEID_IDX_GN_N2SS;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_NB:</div><div class='del'>-		if (rtlphy-&gt;rf_type == RF_1T1R)</div><div class='del'>-			ret = RATEID_IDX_BGN_20M_1SS_BN;</div><div class='del'>-		else</div><div class='del'>-			ret = RATEID_IDX_BGN_20M_2SS_BN;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_GB:</div><div class='del'>-		ret = RATEID_IDX_BG;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_G:</div><div class='del'>-		ret = RATEID_IDX_G;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_B:</div><div class='del'>-		ret = RATEID_IDX_B;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_MC:</div><div class='del'>-		if (wirelessmode == WIRELESS_MODE_B ||</div><div class='del'>-		    wirelessmode == WIRELESS_MODE_G ||</div><div class='del'>-		    wirelessmode == WIRELESS_MODE_N_24G ||</div><div class='del'>-		    wirelessmode == WIRELESS_MODE_AC_24G)</div><div class='del'>-			ret = RATEID_IDX_BG;</div><div class='del'>-		else</div><div class='del'>-			ret = RATEID_IDX_G;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_AC_5N:</div><div class='del'>-		if (rtlphy-&gt;rf_type == RF_1T1R)</div><div class='del'>-			ret = RATEID_IDX_VHT_1SS;</div><div class='del'>-		else</div><div class='del'>-			ret = RATEID_IDX_VHT_2SS;</div><div class='del'>-		break;</div><div class='del'>-	case RATR_INX_WIRELESS_AC_24N:</div><div class='del'>-		if (rtlphy-&gt;current_chan_bw == HT_CHANNEL_WIDTH_80) {</div><div class='del'>-			if (rtlphy-&gt;rf_type == RF_1T1R)</div><div class='del'>-				ret = RATEID_IDX_VHT_1SS;</div><div class='del'>-			else</div><div class='del'>-				ret = RATEID_IDX_VHT_2SS;</div><div class='del'>-		} else {</div><div class='del'>-			if (rtlphy-&gt;rf_type == RF_1T1R)</div><div class='del'>-				ret = RATEID_IDX_MIX1;</div><div class='del'>-			else</div><div class='del'>-				ret = RATEID_IDX_MIX2;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = RATEID_IDX_BGN_40M_2SS;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 _rtl_rate_id(struct ieee80211_hw *hw,</div><div class='del'>-			      struct rtl_sta_info *sta_entry,</div><div class='del'>-			      int rate_index)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;spec_ver &amp; RTL_SPEC_NEW_RATEID) {</div><div class='del'>-		int wireless_mode = sta_entry ?</div><div class='del'>-			sta_entry-&gt;wireless_mode : WIRELESS_MODE_G;</div><div class='del'>-</div><div class='del'>-		return rtl_mrate_idx_to_arfr_id(hw, rate_index, wireless_mode);</div><div class='del'>-	} else {</div><div class='del'>-		return rate_index;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_sta *sta,</div><div class='del'>-				   struct rtl_tcb_desc *tcb_desc)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-	u8 ratr_index = _rtl_rate_id(hw, sta_entry, RATR_INX_WIRELESS_MC);</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-		ratr_index = sta_entry-&gt;ratr_index;</div><div class='del'>-	}</div><div class='del'>-	if (!tcb_desc-&gt;disable_ratefallback || !tcb_desc-&gt;use_driver_rate) {</div><div class='del'>-		if (mac-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-			tcb_desc-&gt;ratr_index = 0;</div><div class='del'>-		} else if (mac-&gt;opmode == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-				mac-&gt;opmode == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-			if (tcb_desc-&gt;multicast || tcb_desc-&gt;broadcast) {</div><div class='del'>-				tcb_desc-&gt;hw_rate =</div><div class='del'>-				    rtlpriv-&gt;cfg-&gt;maps[RTL_RC_CCK_RATE2M];</div><div class='del'>-				tcb_desc-&gt;use_driver_rate = 1;</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_MC);</div><div class='del'>-			} else {</div><div class='del'>-				tcb_desc-&gt;ratr_index = ratr_index;</div><div class='del'>-			}</div><div class='del'>-		} else if (mac-&gt;opmode == NL80211_IFTYPE_AP) {</div><div class='del'>-			tcb_desc-&gt;ratr_index = ratr_index;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;dm.useramask) {</div><div class='del'>-		tcb_desc-&gt;ratr_index = ratr_index;</div><div class='del'>-		/* TODO we will differentiate adhoc and station future  */</div><div class='del'>-		if (mac-&gt;opmode == NL80211_IFTYPE_STATION ||</div><div class='del'>-		    mac-&gt;opmode == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-			tcb_desc-&gt;mac_id = 0;</div><div class='del'>-</div><div class='del'>-			if (sta &amp;&amp;</div><div class='del'>-			    (rtlpriv-&gt;cfg-&gt;spec_ver &amp; RTL_SPEC_NEW_RATEID))</div><div class='del'>-				;	/* use sta_entry-&gt;ratr_index */</div><div class='del'>-			else if (mac-&gt;mode == WIRELESS_MODE_AC_5G)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_AC_5N);</div><div class='del'>-			else if (mac-&gt;mode == WIRELESS_MODE_AC_24G)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_AC_24N);</div><div class='del'>-			else if (mac-&gt;mode == WIRELESS_MODE_N_24G)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_NGB);</div><div class='del'>-			else if (mac-&gt;mode == WIRELESS_MODE_N_5G)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_NG);</div><div class='del'>-			else if (mac-&gt;mode &amp; WIRELESS_MODE_G)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_GB);</div><div class='del'>-			else if (mac-&gt;mode &amp; WIRELESS_MODE_B)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_B);</div><div class='del'>-			else if (mac-&gt;mode &amp; WIRELESS_MODE_A)</div><div class='del'>-				tcb_desc-&gt;ratr_index =</div><div class='del'>-					_rtl_rate_id(hw, sta_entry,</div><div class='del'>-						     RATR_INX_WIRELESS_G);</div><div class='del'>-</div><div class='del'>-		} else if (mac-&gt;opmode == NL80211_IFTYPE_AP ||</div><div class='del'>-			mac-&gt;opmode == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-			if (sta) {</div><div class='del'>-				if (sta-&gt;aid &gt; 0)</div><div class='del'>-					tcb_desc-&gt;mac_id = sta-&gt;aid + 1;</div><div class='del'>-				else</div><div class='del'>-					tcb_desc-&gt;mac_id = 1;</div><div class='del'>-			} else {</div><div class='del'>-				tcb_desc-&gt;mac_id = 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'>-static void _rtl_query_bandwidth_mode(struct ieee80211_hw *hw,</div><div class='del'>-				      struct ieee80211_sta *sta,</div><div class='del'>-				      struct rtl_tcb_desc *tcb_desc)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	tcb_desc-&gt;packet_bw = false;</div><div class='del'>-	if (!sta)</div><div class='del'>-		return;</div><div class='del'>-	if (mac-&gt;opmode == NL80211_IFTYPE_AP ||</div><div class='del'>-	    mac-&gt;opmode == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-	    mac-&gt;opmode == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-		if (!(sta-&gt;ht_cap.ht_supported) ||</div><div class='del'>-		    !(sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40))</div><div class='del'>-			return;</div><div class='del'>-	} else if (mac-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-		if (!mac-&gt;bw_40 || !(sta-&gt;ht_cap.ht_supported))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	if (tcb_desc-&gt;multicast || tcb_desc-&gt;broadcast)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*use legency rate, shall use 20MHz */</div><div class='del'>-	if (tcb_desc-&gt;hw_rate &lt;= rtlpriv-&gt;cfg-&gt;maps[RTL_RC_OFDM_RATE54M])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tcb_desc-&gt;packet_bw = HT_CHANNEL_WIDTH_20_40;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE ||</div><div class='del'>-	    rtlpriv-&gt;rtlhal.hw_type == HARDWARE_TYPE_RTL8821AE ||</div><div class='del'>-	    (rtlpriv-&gt;cfg-&gt;spec_ver &amp; RTL_SPEC_SUPPORT_VHT)) {</div><div class='del'>-		if (mac-&gt;opmode == NL80211_IFTYPE_AP ||</div><div class='del'>-		    mac-&gt;opmode == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-		    mac-&gt;opmode == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-			if (!(sta-&gt;vht_cap.vht_supported))</div><div class='del'>-				return;</div><div class='del'>-		} else if (mac-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-			if (!mac-&gt;bw_80 ||</div><div class='del'>-			    !(sta-&gt;vht_cap.vht_supported))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-		if (tcb_desc-&gt;hw_rate &lt;=</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_HT_RATEMCS15])</div><div class='del'>-			return;</div><div class='del'>-		tcb_desc-&gt;packet_bw = HT_CHANNEL_WIDTH_80;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 _rtl_get_vht_highest_n_rate(struct ieee80211_hw *hw,</div><div class='del'>-				      struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	u8 hw_rate;</div><div class='del'>-	u16 tx_mcs_map = le16_to_cpu(sta-&gt;vht_cap.vht_mcs.tx_mcs_map);</div><div class='del'>-</div><div class='del'>-	if ((get_rf_type(rtlphy) == RF_2T2R) &amp;&amp;</div><div class='del'>-	    (tx_mcs_map &amp; 0x000c) != 0x000c) {</div><div class='del'>-		if ((tx_mcs_map &amp; 0x000c) &gt;&gt; 2 ==</div><div class='del'>-			IEEE80211_VHT_MCS_SUPPORT_0_7)</div><div class='del'>-			hw_rate =</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_2SS_MCS7];</div><div class='del'>-		else if ((tx_mcs_map  &amp; 0x000c) &gt;&gt; 2 ==</div><div class='del'>-			IEEE80211_VHT_MCS_SUPPORT_0_8)</div><div class='del'>-			hw_rate =</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_2SS_MCS8];</div><div class='del'>-		else</div><div class='del'>-			hw_rate =</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_2SS_MCS9];</div><div class='del'>-	} else {</div><div class='del'>-		if ((tx_mcs_map  &amp; 0x0003) ==</div><div class='del'>-			IEEE80211_VHT_MCS_SUPPORT_0_7)</div><div class='del'>-			hw_rate =</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_1SS_MCS7];</div><div class='del'>-		else if ((tx_mcs_map  &amp; 0x0003) ==</div><div class='del'>-			IEEE80211_VHT_MCS_SUPPORT_0_8)</div><div class='del'>-			hw_rate =</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_1SS_MCS8];</div><div class='del'>-		else</div><div class='del'>-			hw_rate =</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_1SS_MCS9];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hw_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw,</div><div class='del'>-				  struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	u8 hw_rate;</div><div class='del'>-</div><div class='del'>-	if (get_rf_type(rtlphy) == RF_2T2R &amp;&amp;</div><div class='del'>-	    sta-&gt;ht_cap.mcs.rx_mask[1] != 0)</div><div class='del'>-		hw_rate = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_HT_RATEMCS15];</div><div class='del'>-	else</div><div class='del'>-		hw_rate = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_HT_RATEMCS7];</div><div class='del'>-</div><div class='del'>-	return hw_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mac80211's rate_idx is like this:</div><div class='del'>- *</div><div class='del'>- * 2.4G band:rx_status-&gt;band == NL80211_BAND_2GHZ</div><div class='del'>- *</div><div class='del'>- * B/G rate:</div><div class='del'>- * (rx_status-&gt;flag &amp; RX_FLAG_HT) = 0,</div><div class='del'>- * DESC_RATE1M--&gt;DESC_RATE54M ==&gt; idx is 0--&gt;11,</div><div class='del'>- *</div><div class='del'>- * N rate:</div><div class='del'>- * (rx_status-&gt;flag &amp; RX_FLAG_HT) = 1,</div><div class='del'>- * DESC_RATEMCS0--&gt;DESC_RATEMCS15 ==&gt; idx is 0--&gt;15</div><div class='del'>- *</div><div class='del'>- * 5G band:rx_status-&gt;band == NL80211_BAND_5GHZ</div><div class='del'>- * A rate:</div><div class='del'>- * (rx_status-&gt;flag &amp; RX_FLAG_HT) = 0,</div><div class='del'>- * DESC_RATE6M--&gt;DESC_RATE54M ==&gt; idx is 0--&gt;7,</div><div class='del'>- *</div><div class='del'>- * N rate:</div><div class='del'>- * (rx_status-&gt;flag &amp; RX_FLAG_HT) = 1,</div><div class='del'>- * DESC_RATEMCS0--&gt;DESC_RATEMCS15 ==&gt; idx is 0--&gt;15</div><div class='del'>- *</div><div class='del'>- * VHT rates:</div><div class='del'>- * DESC_RATEVHT1SS_MCS0--&gt;DESC_RATEVHT1SS_MCS9 ==&gt; idx is 0--&gt;9</div><div class='del'>- * DESC_RATEVHT2SS_MCS0--&gt;DESC_RATEVHT2SS_MCS9 ==&gt; idx is 0--&gt;9</div><div class='del'>- */</div><div class='del'>-int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht, bool isvht,</div><div class='del'>-			 u8 desc_rate)</div><div class='del'>-{</div><div class='del'>-	int rate_idx;</div><div class='del'>-</div><div class='del'>-	if (isvht) {</div><div class='del'>-		switch (desc_rate) {</div><div class='del'>-		case DESC_RATEVHT1SS_MCS0:</div><div class='del'>-			rate_idx = 0;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS1:</div><div class='del'>-			rate_idx = 1;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS2:</div><div class='del'>-			rate_idx = 2;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS3:</div><div class='del'>-			rate_idx = 3;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS4:</div><div class='del'>-			rate_idx = 4;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS5:</div><div class='del'>-			rate_idx = 5;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS6:</div><div class='del'>-			rate_idx = 6;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS7:</div><div class='del'>-			rate_idx = 7;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS8:</div><div class='del'>-			rate_idx = 8;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT1SS_MCS9:</div><div class='del'>-			rate_idx = 9;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS0:</div><div class='del'>-			rate_idx = 0;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS1:</div><div class='del'>-			rate_idx = 1;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS2:</div><div class='del'>-			rate_idx = 2;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS3:</div><div class='del'>-			rate_idx = 3;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS4:</div><div class='del'>-			rate_idx = 4;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS5:</div><div class='del'>-			rate_idx = 5;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS6:</div><div class='del'>-			rate_idx = 6;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS7:</div><div class='del'>-			rate_idx = 7;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS8:</div><div class='del'>-			rate_idx = 8;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEVHT2SS_MCS9:</div><div class='del'>-			rate_idx = 9;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rate_idx = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		return rate_idx;</div><div class='del'>-	}</div><div class='del'>-	if (!isht) {</div><div class='del'>-		if (hw-&gt;conf.chandef.chan-&gt;band == NL80211_BAND_2GHZ) {</div><div class='del'>-			switch (desc_rate) {</div><div class='del'>-			case DESC_RATE1M:</div><div class='del'>-				rate_idx = 0;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE2M:</div><div class='del'>-				rate_idx = 1;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE5_5M:</div><div class='del'>-				rate_idx = 2;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE11M:</div><div class='del'>-				rate_idx = 3;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE6M:</div><div class='del'>-				rate_idx = 4;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE9M:</div><div class='del'>-				rate_idx = 5;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE12M:</div><div class='del'>-				rate_idx = 6;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE18M:</div><div class='del'>-				rate_idx = 7;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE24M:</div><div class='del'>-				rate_idx = 8;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE36M:</div><div class='del'>-				rate_idx = 9;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE48M:</div><div class='del'>-				rate_idx = 10;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE54M:</div><div class='del'>-				rate_idx = 11;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				rate_idx = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			switch (desc_rate) {</div><div class='del'>-			case DESC_RATE6M:</div><div class='del'>-				rate_idx = 0;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE9M:</div><div class='del'>-				rate_idx = 1;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE12M:</div><div class='del'>-				rate_idx = 2;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE18M:</div><div class='del'>-				rate_idx = 3;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE24M:</div><div class='del'>-				rate_idx = 4;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE36M:</div><div class='del'>-				rate_idx = 5;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE48M:</div><div class='del'>-				rate_idx = 6;</div><div class='del'>-				break;</div><div class='del'>-			case DESC_RATE54M:</div><div class='del'>-				rate_idx = 7;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				rate_idx = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (desc_rate) {</div><div class='del'>-		case DESC_RATEMCS0:</div><div class='del'>-			rate_idx = 0;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS1:</div><div class='del'>-			rate_idx = 1;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS2:</div><div class='del'>-			rate_idx = 2;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS3:</div><div class='del'>-			rate_idx = 3;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS4:</div><div class='del'>-			rate_idx = 4;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS5:</div><div class='del'>-			rate_idx = 5;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS6:</div><div class='del'>-			rate_idx = 6;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS7:</div><div class='del'>-			rate_idx = 7;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS8:</div><div class='del'>-			rate_idx = 8;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS9:</div><div class='del'>-			rate_idx = 9;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS10:</div><div class='del'>-			rate_idx = 10;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS11:</div><div class='del'>-			rate_idx = 11;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS12:</div><div class='del'>-			rate_idx = 12;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS13:</div><div class='del'>-			rate_idx = 13;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS14:</div><div class='del'>-			rate_idx = 14;</div><div class='del'>-			break;</div><div class='del'>-		case DESC_RATEMCS15:</div><div class='del'>-			rate_idx = 15;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rate_idx = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return rate_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 _rtl_get_tx_hw_rate(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_tx_info *info)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct ieee80211_tx_rate *r = &amp;info-&gt;status.rates[0];</div><div class='del'>-	struct ieee80211_rate *txrate;</div><div class='del'>-	u8 hw_value = 0x0;</div><div class='del'>-</div><div class='del'>-	if (r-&gt;flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='del'>-		/* HT MCS0-15 */</div><div class='del'>-		hw_value = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_HT_RATEMCS15] - 15 +</div><div class='del'>-			   r-&gt;idx;</div><div class='del'>-	} else if (r-&gt;flags &amp; IEEE80211_TX_RC_VHT_MCS) {</div><div class='del'>-		/* VHT MCS0-9, NSS */</div><div class='del'>-		if (ieee80211_rate_get_vht_nss(r) == 2)</div><div class='del'>-			hw_value = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_2SS_MCS9];</div><div class='del'>-		else</div><div class='del'>-			hw_value = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_VHT_RATE_1SS_MCS9];</div><div class='del'>-</div><div class='del'>-		hw_value = hw_value - 9 + ieee80211_rate_get_vht_mcs(r);</div><div class='del'>-	} else {</div><div class='del'>-		/* legacy */</div><div class='del'>-		txrate = ieee80211_get_tx_rate(hw, info);</div><div class='del'>-</div><div class='del'>-		if (txrate)</div><div class='del'>-			hw_value = txrate-&gt;hw_value;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check 5G band */</div><div class='del'>-	if (rtlpriv-&gt;rtlhal.current_bandtype == BAND_ON_5G &amp;&amp;</div><div class='del'>-	    hw_value &lt; rtlpriv-&gt;cfg-&gt;maps[RTL_RC_OFDM_RATE6M])</div><div class='del'>-		hw_value = rtlpriv-&gt;cfg-&gt;maps[RTL_RC_OFDM_RATE6M];</div><div class='del'>-</div><div class='del'>-	return hw_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_get_tcb_desc(struct ieee80211_hw *hw,</div><div class='del'>-		      struct ieee80211_tx_info *info,</div><div class='del'>-		      struct ieee80211_sta *sta,</div><div class='del'>-		      struct sk_buff *skb, struct rtl_tcb_desc *tcb_desc)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *rtlmac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);</div><div class='del'>-	struct rtl_sta_info *sta_entry =</div><div class='del'>-		(sta ? (struct rtl_sta_info *)sta-&gt;drv_priv : NULL);</div><div class='del'>-</div><div class='del'>-	__le16 fc = rtl_get_fc(skb);</div><div class='del'>-</div><div class='del'>-	tcb_desc-&gt;hw_rate = _rtl_get_tx_hw_rate(hw, info);</div><div class='del'>-</div><div class='del'>-	if (rtl_is_tx_report_skb(hw, skb))</div><div class='del'>-		tcb_desc-&gt;use_spe_rpt = 1;</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data(fc)) {</div><div class='del'>-		tcb_desc-&gt;use_driver_rate = true;</div><div class='del'>-		tcb_desc-&gt;ratr_index = _rtl_rate_id(hw, sta_entry,</div><div class='del'>-						    RATR_INX_WIRELESS_MC);</div><div class='del'>-		tcb_desc-&gt;disable_ratefallback = 1;</div><div class='del'>-		tcb_desc-&gt;mac_id = 0;</div><div class='del'>-		tcb_desc-&gt;packet_bw = false;</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'>-	 * We set data rate INX 0</div><div class='del'>-	 * in rtl_rc.c if skb is special data or</div><div class='del'>-	 * mgt which need low data rate.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * So tcb_desc-&gt;hw_rate is just used for</div><div class='del'>-	 * special data and mgt frames</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;control.rates[0].idx == 0 || ieee80211_is_nullfunc(fc)) {</div><div class='del'>-		tcb_desc-&gt;use_driver_rate = true;</div><div class='del'>-		tcb_desc-&gt;ratr_index = _rtl_rate_id(hw, sta_entry,</div><div class='del'>-						    RATR_INX_WIRELESS_MC);</div><div class='del'>-</div><div class='del'>-		tcb_desc-&gt;disable_ratefallback = 1;</div><div class='del'>-	} else if (sta &amp;&amp; sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		/*</div><div class='del'>-		 * Because hw will never use hw_rate</div><div class='del'>-		 * when tcb_desc-&gt;use_driver_rate = false</div><div class='del'>-		 * so we never set highest N rate here,</div><div class='del'>-		 * and N rate will all be controlled by FW</div><div class='del'>-		 * when tcb_desc-&gt;use_driver_rate = false</div><div class='del'>-		 */</div><div class='del'>-		tcb_desc-&gt;hw_rate = _rtl_get_vht_highest_n_rate(hw, sta);</div><div class='del'>-	} else if (sta &amp;&amp; sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		tcb_desc-&gt;hw_rate = _rtl_get_highest_n_rate(hw, sta);</div><div class='del'>-	} else {</div><div class='del'>-		enum rtl_var_map var = RTL_RC_OFDM_RATE54M;</div><div class='del'>-</div><div class='del'>-		if (rtlmac-&gt;mode == WIRELESS_MODE_B)</div><div class='del'>-			var = RTL_RC_CCK_RATE11M;</div><div class='del'>-</div><div class='del'>-		tcb_desc-&gt;hw_rate = rtlpriv-&gt;cfg-&gt;maps[var];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='del'>-		tcb_desc-&gt;multicast = 1;</div><div class='del'>-	else if (is_broadcast_ether_addr(hdr-&gt;addr1))</div><div class='del'>-		tcb_desc-&gt;broadcast = 1;</div><div class='del'>-</div><div class='del'>-	_rtl_txrate_selectmode(hw, sta, tcb_desc);</div><div class='del'>-	_rtl_query_bandwidth_mode(hw, sta, tcb_desc);</div><div class='del'>-	_rtl_qurey_shortpreamble_mode(hw, tcb_desc, info);</div><div class='del'>-	_rtl_query_shortgi(hw, sta, tcb_desc, info);</div><div class='del'>-	_rtl_query_protection_mode(hw, tcb_desc, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	__le16 fc = rtl_get_fc(skb);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;dm.supp_phymode_switch &amp;&amp;</div><div class='del'>-	    mac-&gt;link_state &lt; MAC80211_LINKED &amp;&amp;</div><div class='del'>-	    (ieee80211_is_auth(fc) || ieee80211_is_probe_req(fc))) {</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp)</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp(hw);</div><div class='del'>-	}</div><div class='del'>-	if (ieee80211_is_auth(fc)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");</div><div class='del'>-</div><div class='del'>-		mac-&gt;link_state = MAC80211_LINKING;</div><div class='del'>-		/* Dul mac */</div><div class='del'>-		rtlpriv-&gt;phy.need_iqk = true;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw, u8 *sa,</div><div class='del'>-				u8 *bssid, u16 tid);</div><div class='del'>-</div><div class='del'>-static void process_agg_start(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_hdr *hdr, u16 tid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct ieee80211_rx_status rx_status = { 0 };</div><div class='del'>-	struct sk_buff *skb_delba = NULL;</div><div class='del'>-</div><div class='del'>-	skb_delba = rtl_make_del_ba(hw, hdr-&gt;addr2, hdr-&gt;addr3, tid);</div><div class='del'>-	if (skb_delba) {</div><div class='del'>-		rx_status.freq = hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='del'>-		rx_status.band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='del'>-		rx_status.flag |= RX_FLAG_DECRYPTED;</div><div class='del'>-		rx_status.flag |= RX_FLAG_MACTIME_START;</div><div class='del'>-		rx_status.rate_idx = 0;</div><div class='del'>-		rx_status.signal = 50 + 10;</div><div class='del'>-		memcpy(IEEE80211_SKB_RXCB(skb_delba),</div><div class='del'>-		       &amp;rx_status, sizeof(rx_status));</div><div class='del'>-		RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG,</div><div class='del'>-			      "fake del\n",</div><div class='del'>-			      skb_delba-&gt;data,</div><div class='del'>-			      skb_delba-&gt;len);</div><div class='del'>-		ieee80211_rx_irqsafe(hw, skb_delba);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)</div><div class='del'>-{</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	__le16 fc = rtl_get_fc(skb);</div><div class='del'>-	u8 *act = (u8 *)(((u8 *)skb-&gt;data + MAC80211_3ADDR_LEN));</div><div class='del'>-	u8 category;</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_action(fc))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	category = *act;</div><div class='del'>-	act++;</div><div class='del'>-	switch (category) {</div><div class='del'>-	case ACT_CAT_BA:</div><div class='del'>-		switch (*act) {</div><div class='del'>-		case ACT_ADDBAREQ:</div><div class='del'>-			if (mac-&gt;act_scanning)</div><div class='del'>-				return false;</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,</div><div class='del'>-				 "%s ACT_ADDBAREQ From :%pM\n",</div><div class='del'>-				 is_tx ? "Tx" : "Rx", hdr-&gt;addr2);</div><div class='del'>-			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",</div><div class='del'>-				      skb-&gt;data, skb-&gt;len);</div><div class='del'>-			if (!is_tx) {</div><div class='del'>-				struct ieee80211_sta *sta = NULL;</div><div class='del'>-				struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-				struct rtl_tid_data *tid_data;</div><div class='del'>-				struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='del'>-				u16 capab = 0, tid = 0;</div><div class='del'>-</div><div class='del'>-				rcu_read_lock();</div><div class='del'>-				sta = rtl_find_sta(hw, hdr-&gt;addr3);</div><div class='del'>-				if (!sta) {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_SEND | COMP_RECV,</div><div class='del'>-						 DBG_DMESG, "sta is NULL\n");</div><div class='del'>-					rcu_read_unlock();</div><div class='del'>-					return true;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				sta_entry =</div><div class='del'>-					(struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-				if (!sta_entry) {</div><div class='del'>-					rcu_read_unlock();</div><div class='del'>-					return true;</div><div class='del'>-				}</div><div class='del'>-				capab =</div><div class='del'>-				  le16_to_cpu(mgmt-&gt;u.action.u.addba_req.capab);</div><div class='del'>-				tid = (capab &amp;</div><div class='del'>-				       IEEE80211_ADDBA_PARAM_TID_MASK) &gt;&gt; 2;</div><div class='del'>-				if (tid &gt;= MAX_TID_COUNT) {</div><div class='del'>-					rcu_read_unlock();</div><div class='del'>-					return true;</div><div class='del'>-				}</div><div class='del'>-				tid_data = &amp;sta_entry-&gt;tids[tid];</div><div class='del'>-				if (tid_data-&gt;agg.rx_agg_state ==</div><div class='del'>-				    RTL_RX_AGG_START)</div><div class='del'>-					process_agg_start(hw, hdr, tid);</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case ACT_ADDBARSP:</div><div class='del'>-			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,</div><div class='del'>-				 "%s ACT_ADDBARSP From :%pM\n",</div><div class='del'>-				  is_tx ? "Tx" : "Rx", hdr-&gt;addr2);</div><div class='del'>-			break;</div><div class='del'>-		case ACT_DELBA:</div><div class='del'>-			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,</div><div class='del'>-				 "ACT_ADDBADEL From :%pM\n", hdr-&gt;addr2);</div><div class='del'>-			break;</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='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setup_special_tx(struct rtl_priv *rtlpriv, struct rtl_ps_ctl *ppsc,</div><div class='del'>-			     int type)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;hw;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;ra.is_special_data = true;</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_special_packet_notify(rtlpriv,</div><div class='del'>-								      type);</div><div class='del'>-	rtl_lps_leave(hw);</div><div class='del'>-	ppsc-&gt;last_delaylps_stamp_jiffies = jiffies;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const u8 *rtl_skb_ether_type_ptr(struct ieee80211_hw *hw,</div><div class='del'>-					struct sk_buff *skb, bool is_enc)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 mac_hdr_len = ieee80211_get_hdrlen_from_skb(skb);</div><div class='del'>-	u8 encrypt_header_len = 0;</div><div class='del'>-	u8 offset;</div><div class='del'>-</div><div class='del'>-	switch (rtlpriv-&gt;sec.pairwise_enc_algorithm) {</div><div class='del'>-	case WEP40_ENCRYPTION:</div><div class='del'>-	case WEP104_ENCRYPTION:</div><div class='del'>-		encrypt_header_len = 4;/*WEP_IV_LEN*/</div><div class='del'>-		break;</div><div class='del'>-	case TKIP_ENCRYPTION:</div><div class='del'>-		encrypt_header_len = 8;/*TKIP_IV_LEN*/</div><div class='del'>-		break;</div><div class='del'>-	case AESCCMP_ENCRYPTION:</div><div class='del'>-		encrypt_header_len = 8;/*CCMP_HDR_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'>-	offset = mac_hdr_len + SNAP_SIZE;</div><div class='del'>-	if (is_enc)</div><div class='del'>-		offset += encrypt_header_len;</div><div class='del'>-</div><div class='del'>-	return skb-&gt;data + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*should call before software enc*/</div><div class='del'>-u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,</div><div class='del'>-		       bool is_enc)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-	__le16 fc = rtl_get_fc(skb);</div><div class='del'>-	u16 ether_type;</div><div class='del'>-	const u8 *ether_type_ptr;</div><div class='del'>-	const struct iphdr *ip;</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data(fc))</div><div class='del'>-		goto end;</div><div class='del'>-</div><div class='del'>-	ether_type_ptr = rtl_skb_ether_type_ptr(hw, skb, is_enc);</div><div class='del'>-	ether_type = be16_to_cpup((__be16 *)ether_type_ptr);</div><div class='del'>-</div><div class='del'>-	if (ether_type == ETH_P_IP) {</div><div class='del'>-		ip = (struct iphdr *)((u8 *)ether_type_ptr +</div><div class='del'>-		     PROTOC_TYPE_SIZE);</div><div class='del'>-		if (ip-&gt;protocol == IPPROTO_UDP) {</div><div class='del'>-			struct udphdr *udp = (struct udphdr *)((u8 *)ip +</div><div class='del'>-							       (ip-&gt;ihl &lt;&lt; 2));</div><div class='del'>-			if (((((u8 *)udp)[1] == 68) &amp;&amp;</div><div class='del'>-			     (((u8 *)udp)[3] == 67)) ||</div><div class='del'>-			    ((((u8 *)udp)[1] == 67) &amp;&amp;</div><div class='del'>-			     (((u8 *)udp)[3] == 68))) {</div><div class='del'>-				/* 68 : UDP BOOTP client</div><div class='del'>-				 * 67 : UDP BOOTP server</div><div class='del'>-				 */</div><div class='del'>-				RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),</div><div class='del'>-					 DBG_DMESG, "dhcp %s !!\n",</div><div class='del'>-					 (is_tx) ? "Tx" : "Rx");</div><div class='del'>-</div><div class='del'>-				if (is_tx)</div><div class='del'>-					setup_special_tx(rtlpriv, ppsc,</div><div class='del'>-							 PACKET_DHCP);</div><div class='del'>-</div><div class='del'>-				return true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (ether_type == ETH_P_ARP) {</div><div class='del'>-		if (is_tx)</div><div class='del'>-			setup_special_tx(rtlpriv, ppsc, PACKET_ARP);</div><div class='del'>-</div><div class='del'>-		return true;</div><div class='del'>-	} else if (ether_type == ETH_P_PAE) {</div><div class='del'>-		/* EAPOL is seen as in-4way */</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_info.in_4way = true;</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_info.in_4way_ts = jiffies;</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_info.in_4way_ts = jiffies;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,</div><div class='del'>-			 "802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx");</div><div class='del'>-</div><div class='del'>-		if (is_tx) {</div><div class='del'>-			rtlpriv-&gt;ra.is_special_data = true;</div><div class='del'>-			rtl_lps_leave(hw);</div><div class='del'>-			ppsc-&gt;last_delaylps_stamp_jiffies = jiffies;</div><div class='del'>-</div><div class='del'>-			setup_special_tx(rtlpriv, ppsc, PACKET_EAPOL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return true;</div><div class='del'>-	} else if (ether_type == ETH_P_IPV6) {</div><div class='del'>-		/* TODO: Handle any IPv6 cases that need special handling.</div><div class='del'>-		 * For now, always return false</div><div class='del'>-		 */</div><div class='del'>-		goto end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-	rtlpriv-&gt;ra.is_special_data = false;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_is_tx_report_skb(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	u16 ether_type;</div><div class='del'>-	const u8 *ether_type_ptr;</div><div class='del'>-</div><div class='del'>-	ether_type_ptr = rtl_skb_ether_type_ptr(hw, skb, true);</div><div class='del'>-	ether_type = be16_to_cpup((__be16 *)ether_type_ptr);</div><div class='del'>-</div><div class='del'>-	/* EAPOL */</div><div class='del'>-	if (ether_type == ETH_P_PAE)</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 u16 rtl_get_tx_report_sn(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_tx_report *tx_report = &amp;rtlpriv-&gt;tx_report;</div><div class='del'>-	u16 sn;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * SW_DEFINE[11:8] are reserved (driver fills zeros)</div><div class='del'>-	 * SW_DEFINE[7:2] are used by driver</div><div class='del'>-	 * SW_DEFINE[1:0] are reserved for firmware (driver fills zeros)</div><div class='del'>-	 */</div><div class='del'>-	sn = (atomic_inc_return(&amp;tx_report-&gt;sn) &amp; 0x003F) &lt;&lt; 2;</div><div class='del'>-</div><div class='del'>-	tx_report-&gt;last_sent_sn = sn;</div><div class='del'>-	tx_report-&gt;last_sent_time = jiffies;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,</div><div class='del'>-		 "Send TX-Report sn=0x%X\n", sn);</div><div class='del'>-</div><div class='del'>-	return sn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_get_tx_report(struct rtl_tcb_desc *ptcb_desc, u8 *pdesc,</div><div class='del'>-		       struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	if (ptcb_desc-&gt;use_spe_rpt) {</div><div class='del'>-		u16 sn = rtl_get_tx_report_sn(hw);</div><div class='del'>-</div><div class='del'>-		SET_TX_DESC_SPE_RPT(pdesc, 1);</div><div class='del'>-		SET_TX_DESC_SW_DEFINE(pdesc, sn);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf, u8 c2h_cmd_len)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_tx_report *tx_report = &amp;rtlpriv-&gt;tx_report;</div><div class='del'>-	u16 sn;</div><div class='del'>-	u8 st, retry;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;spec_ver &amp; RTL_SPEC_NEW_FW_C2H) {</div><div class='del'>-		sn = tmp_buf[6];</div><div class='del'>-		st = tmp_buf[7] &amp; 0xC0;</div><div class='del'>-		retry = tmp_buf[8] &amp; 0x3F;</div><div class='del'>-	} else {</div><div class='del'>-		sn = ((tmp_buf[7] &amp; 0x0F) &lt;&lt; 8) | tmp_buf[6];</div><div class='del'>-		st = tmp_buf[0] &amp; 0xC0;</div><div class='del'>-		retry = tmp_buf[2] &amp; 0x3F;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_report-&gt;last_recv_sn = sn;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,</div><div class='del'>-		 "Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n",</div><div class='del'>-		 st, sn, retry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_check_tx_report_acked(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_tx_report *tx_report = &amp;rtlpriv-&gt;tx_report;</div><div class='del'>-</div><div class='del'>-	if (tx_report-&gt;last_sent_sn == tx_report-&gt;last_recv_sn)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (time_before(tx_report-&gt;last_sent_time + 3 * HZ, jiffies)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_WARNING,</div><div class='del'>-			 "Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n",</div><div class='del'>-			 tx_report-&gt;last_sent_sn, tx_report-&gt;last_recv_sn);</div><div class='del'>-		return true;	/* 3 sec. (timeout) seen as acked */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; wait_ms; i++) {</div><div class='del'>-		if (rtl_check_tx_report_acked(hw))</div><div class='del'>-			break;</div><div class='del'>-		usleep_range(1000, 2000);</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-			 "Wait 1ms (%d/%d) to disable key.\n", i, wait_ms);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 rtl_get_hal_edca_param(struct ieee80211_hw *hw,</div><div class='del'>-			   struct ieee80211_vif *vif,</div><div class='del'>-			   enum wireless_mode wirelessmode,</div><div class='del'>-			   struct ieee80211_tx_queue_params *param)</div><div class='del'>-{</div><div class='del'>-	u32 reg = 0;</div><div class='del'>-	u8 sifstime = 10;</div><div class='del'>-	u8 slottime = 20;</div><div class='del'>-</div><div class='del'>-	/* AIFS = AIFSN * slot time + SIFS */</div><div class='del'>-	switch (wirelessmode) {</div><div class='del'>-	case WIRELESS_MODE_A:</div><div class='del'>-	case WIRELESS_MODE_N_24G:</div><div class='del'>-	case WIRELESS_MODE_N_5G:</div><div class='del'>-	case WIRELESS_MODE_AC_5G:</div><div class='del'>-	case WIRELESS_MODE_AC_24G:</div><div class='del'>-		sifstime = 16;</div><div class='del'>-		slottime = 9;</div><div class='del'>-		break;</div><div class='del'>-	case WIRELESS_MODE_G:</div><div class='del'>-		slottime = (vif-&gt;bss_conf.use_short_slot ? 9 : 20);</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'>-	reg |= (param-&gt;txop &amp; 0x7FF) &lt;&lt; 16;</div><div class='del'>-	reg |= (fls(param-&gt;cw_max) &amp; 0xF) &lt;&lt; 12;</div><div class='del'>-	reg |= (fls(param-&gt;cw_min) &amp; 0xF) &lt;&lt; 8;</div><div class='del'>-	reg |= (param-&gt;aifs &amp; 0x0F) * slottime + sifstime;</div><div class='del'>-</div><div class='del'>-	return reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********************************************************</div><div class='del'>- *</div><div class='del'>- * functions called by core.c</div><div class='del'>- *</div><div class='del'>- *********************************************************/</div><div class='del'>-int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		     struct ieee80211_sta *sta, u16 tid, u16 *ssn)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_tid_data *tid_data;</div><div class='del'>-	struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-	if (!sta_entry)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	tid_data = &amp;sta_entry-&gt;tids[tid];</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,</div><div class='del'>-		 "on ra = %pM tid = %d seq:%d\n", sta-&gt;addr, tid,</div><div class='del'>-		 tid_data-&gt;seq_number);</div><div class='del'>-</div><div class='del'>-	*ssn = tid_data-&gt;seq_number;</div><div class='del'>-	tid_data-&gt;agg.agg_state = RTL_AGG_START;</div><div class='del'>-</div><div class='del'>-	ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		    struct ieee80211_sta *sta, u16 tid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_tid_data *tid_data;</div><div class='del'>-	struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,</div><div class='del'>-		 "on ra = %pM tid = %d\n", sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-	tid_data = &amp;sta_entry-&gt;tids[tid];</div><div class='del'>-	sta_entry-&gt;tids[tid].agg.agg_state = RTL_AGG_STOP;</div><div class='del'>-</div><div class='del'>-	ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_rx_agg_start(struct ieee80211_hw *hw,</div><div class='del'>-		     struct ieee80211_sta *sta, u16 tid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_tid_data *tid_data;</div><div class='del'>-	struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-	u8 reject_agg;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status()) {</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_get_ampdu_cfg(rtlpriv,</div><div class='del'>-							      &amp;reject_agg,</div><div class='del'>-							      NULL, NULL);</div><div class='del'>-		if (reject_agg)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-	if (!sta_entry)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	tid_data = &amp;sta_entry-&gt;tids[tid];</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,</div><div class='del'>-		 "on ra = %pM tid = %d seq:%d\n", sta-&gt;addr, tid,</div><div class='del'>-		 tid_data-&gt;seq_number);</div><div class='del'>-</div><div class='del'>-	tid_data-&gt;agg.rx_agg_state = RTL_RX_AGG_START;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_rx_agg_stop(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_sta *sta, u16 tid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,</div><div class='del'>-		 "on ra = %pM tid = %d\n", sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-	sta_entry-&gt;tids[tid].agg.rx_agg_state = RTL_RX_AGG_STOP;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_tx_agg_oper(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_sta *sta, u16 tid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_sta_info *sta_entry = NULL;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,</div><div class='del'>-		 "on ra = %pM tid = %d\n", sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-	sta_entry-&gt;tids[tid].agg.agg_state = RTL_AGG_OPERATIONAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct rtl_btc_ops *btc_ops = rtlpriv-&gt;btcoexist.btc_ops;</div><div class='del'>-	u8 reject_agg = 0, ctrl_agg_size = 0, agg_size = 0;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-		btc_ops-&gt;btc_get_ampdu_cfg(rtlpriv, &amp;reject_agg,</div><div class='del'>-					   &amp;ctrl_agg_size, &amp;agg_size);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,</div><div class='del'>-		 "Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d",</div><div class='del'>-		 reject_agg, ctrl_agg_size, agg_size);</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;hw-&gt;max_rx_aggregation_subframes =</div><div class='del'>-		(ctrl_agg_size ? agg_size : IEEE80211_MAX_AMPDU_BUF_HT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********************************************************</div><div class='del'>- *</div><div class='del'>- * wq &amp; timer callback functions</div><div class='del'>- *</div><div class='del'>- *********************************************************/</div><div class='del'>-/* this function is used for roaming */</div><div class='del'>-void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;mac80211.opmode != NL80211_IFTYPE_STATION)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;mac80211.link_state &lt; MAC80211_LINKED)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check if this really is a beacon */</div><div class='del'>-	if (!ieee80211_is_beacon(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-	    !ieee80211_is_probe_resp(hdr-&gt;frame_control))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* min. beacon length + FCS_LEN */</div><div class='del'>-	if (skb-&gt;len &lt;= 40 + FCS_LEN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* and only beacons from the associated BSSID, please */</div><div class='del'>-	if (!ether_addr_equal(hdr-&gt;addr3, rtlpriv-&gt;mac80211.bssid))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;link_info.bcn_rx_inperiod++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_free_entries_from_scan_list(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_bssid_entry *entry, *next;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, next, &amp;rtlpriv-&gt;scan_list.list, list) {</div><div class='del'>-		list_del(&amp;entry-&gt;list);</div><div class='del'>-		kfree(entry);</div><div class='del'>-		rtlpriv-&gt;scan_list.num--;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_scan_list_expire(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_bssid_entry *entry, *next;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.scan_list_lock, flags);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, next, &amp;rtlpriv-&gt;scan_list.list, list) {</div><div class='del'>-		/* 180 seconds */</div><div class='del'>-		if (jiffies_to_msecs(jiffies - entry-&gt;age) &lt; 180000)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;entry-&gt;list);</div><div class='del'>-		rtlpriv-&gt;scan_list.num--;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,</div><div class='del'>-			 "BSSID=%pM is expire in scan list (total=%d)\n",</div><div class='del'>-			 entry-&gt;bssid, rtlpriv-&gt;scan_list.num);</div><div class='del'>-		kfree(entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.scan_list_lock, flags);</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;btcoexist.btc_info.ap_num = rtlpriv-&gt;scan_list.num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	struct rtl_bssid_entry *entry;</div><div class='del'>-	bool entry_found = false;</div><div class='del'>-</div><div class='del'>-	/* check if it is scanning */</div><div class='del'>-	if (!mac-&gt;act_scanning)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check if this really is a beacon */</div><div class='del'>-	if (!ieee80211_is_beacon(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-	    !ieee80211_is_probe_resp(hdr-&gt;frame_control))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.scan_list_lock, flags);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(entry, &amp;rtlpriv-&gt;scan_list.list, list) {</div><div class='del'>-		if (memcmp(entry-&gt;bssid, hdr-&gt;addr3, ETH_ALEN) == 0) {</div><div class='del'>-			list_del_init(&amp;entry-&gt;list);</div><div class='del'>-			entry_found = true;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,</div><div class='del'>-				 "Update BSSID=%pM to scan list (total=%d)\n",</div><div class='del'>-				 hdr-&gt;addr3, rtlpriv-&gt;scan_list.num);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!entry_found) {</div><div class='del'>-		entry = kmalloc(sizeof(*entry), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!entry)</div><div class='del'>-			goto label_err;</div><div class='del'>-</div><div class='del'>-		memcpy(entry-&gt;bssid, hdr-&gt;addr3, ETH_ALEN);</div><div class='del'>-		rtlpriv-&gt;scan_list.num++;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,</div><div class='del'>-			 "Add BSSID=%pM to scan list (total=%d)\n",</div><div class='del'>-			 hdr-&gt;addr3, rtlpriv-&gt;scan_list.num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry-&gt;age = jiffies;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;entry-&gt;list, &amp;rtlpriv-&gt;scan_list.list);</div><div class='del'>-</div><div class='del'>-label_err:</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.scan_list_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_watchdog_wq_callback(void *data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_works *rtlworks = container_of_dwork_rtl(data,</div><div class='del'>-							    struct rtl_works,</div><div class='del'>-							    watchdog_wq);</div><div class='del'>-	struct ieee80211_hw *hw = rtlworks-&gt;hw;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	bool busytraffic = false;</div><div class='del'>-	bool tx_busy_traffic = false;</div><div class='del'>-	bool rx_busy_traffic = false;</div><div class='del'>-	bool higher_busytraffic = false;</div><div class='del'>-	bool higher_busyrxtraffic = false;</div><div class='del'>-	u8 idx, tid;</div><div class='del'>-	u32 rx_cnt_inp4eriod = 0;</div><div class='del'>-	u32 tx_cnt_inp4eriod = 0;</div><div class='del'>-	u32 aver_rx_cnt_inperiod = 0;</div><div class='del'>-	u32 aver_tx_cnt_inperiod = 0;</div><div class='del'>-	u32 aver_tidtx_inperiod[MAX_TID_COUNT] = {0};</div><div class='del'>-	u32 tidtx_inp4eriod[MAX_TID_COUNT] = {0};</div><div class='del'>-</div><div class='del'>-	if (is_hal_stop(rtlhal))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* &lt;1&gt; Determine if action frame is allowed */</div><div class='del'>-	if (mac-&gt;link_state &gt; MAC80211_NOLINK) {</div><div class='del'>-		if (mac-&gt;cnt_after_linked &lt; 20)</div><div class='del'>-			mac-&gt;cnt_after_linked++;</div><div class='del'>-	} else {</div><div class='del'>-		mac-&gt;cnt_after_linked = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* &lt;2&gt; to check if traffic busy, if</div><div class='del'>-	 * busytraffic we don't change channel</div><div class='del'>-	 */</div><div class='del'>-	if (mac-&gt;link_state &gt;= MAC80211_LINKED) {</div><div class='del'>-		/* (1) get aver_rx_cnt_inperiod &amp; aver_tx_cnt_inperiod */</div><div class='del'>-		for (idx = 0; idx &lt;= 2; idx++) {</div><div class='del'>-			rtlpriv-&gt;link_info.num_rx_in4period[idx] =</div><div class='del'>-			    rtlpriv-&gt;link_info.num_rx_in4period[idx + 1];</div><div class='del'>-			rtlpriv-&gt;link_info.num_tx_in4period[idx] =</div><div class='del'>-			    rtlpriv-&gt;link_info.num_tx_in4period[idx + 1];</div><div class='del'>-		}</div><div class='del'>-		rtlpriv-&gt;link_info.num_rx_in4period[3] =</div><div class='del'>-		    rtlpriv-&gt;link_info.num_rx_inperiod;</div><div class='del'>-		rtlpriv-&gt;link_info.num_tx_in4period[3] =</div><div class='del'>-		    rtlpriv-&gt;link_info.num_tx_inperiod;</div><div class='del'>-		for (idx = 0; idx &lt;= 3; idx++) {</div><div class='del'>-			rx_cnt_inp4eriod +=</div><div class='del'>-			    rtlpriv-&gt;link_info.num_rx_in4period[idx];</div><div class='del'>-			tx_cnt_inp4eriod +=</div><div class='del'>-			    rtlpriv-&gt;link_info.num_tx_in4period[idx];</div><div class='del'>-		}</div><div class='del'>-		aver_rx_cnt_inperiod = rx_cnt_inp4eriod / 4;</div><div class='del'>-		aver_tx_cnt_inperiod = tx_cnt_inp4eriod / 4;</div><div class='del'>-</div><div class='del'>-		/* (2) check traffic busy */</div><div class='del'>-		if (aver_rx_cnt_inperiod &gt; 100 || aver_tx_cnt_inperiod &gt; 100) {</div><div class='del'>-			busytraffic = true;</div><div class='del'>-			if (aver_rx_cnt_inperiod &gt; aver_tx_cnt_inperiod)</div><div class='del'>-				rx_busy_traffic = true;</div><div class='del'>-			else</div><div class='del'>-				tx_busy_traffic = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Higher Tx/Rx data. */</div><div class='del'>-		if (aver_rx_cnt_inperiod &gt; 4000 ||</div><div class='del'>-		    aver_tx_cnt_inperiod &gt; 4000) {</div><div class='del'>-			higher_busytraffic = true;</div><div class='del'>-</div><div class='del'>-			/* Extremely high Rx data. */</div><div class='del'>-			if (aver_rx_cnt_inperiod &gt; 5000)</div><div class='del'>-				higher_busyrxtraffic = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* check every tid's tx traffic */</div><div class='del'>-		for (tid = 0; tid &lt;= 7; tid++) {</div><div class='del'>-			for (idx = 0; idx &lt;= 2; idx++)</div><div class='del'>-				rtlpriv-&gt;link_info.tidtx_in4period[tid][idx] =</div><div class='del'>-					rtlpriv-&gt;link_info.tidtx_in4period[tid]</div><div class='del'>-					[idx + 1];</div><div class='del'>-			rtlpriv-&gt;link_info.tidtx_in4period[tid][3] =</div><div class='del'>-				rtlpriv-&gt;link_info.tidtx_inperiod[tid];</div><div class='del'>-</div><div class='del'>-			for (idx = 0; idx &lt;= 3; idx++)</div><div class='del'>-				tidtx_inp4eriod[tid] +=</div><div class='del'>-				   rtlpriv-&gt;link_info.tidtx_in4period[tid][idx];</div><div class='del'>-			aver_tidtx_inperiod[tid] = tidtx_inp4eriod[tid] / 4;</div><div class='del'>-			if (aver_tidtx_inperiod[tid] &gt; 5000)</div><div class='del'>-				rtlpriv-&gt;link_info.higher_busytxtraffic[tid] =</div><div class='del'>-									true;</div><div class='del'>-			else</div><div class='del'>-				rtlpriv-&gt;link_info.higher_busytxtraffic[tid] =</div><div class='del'>-									false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* PS is controlled by coex. */</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status() &amp;&amp;</div><div class='del'>-		    rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_is_bt_ctrl_lps(rtlpriv))</div><div class='del'>-			goto label_lps_done;</div><div class='del'>-</div><div class='del'>-		if (rtlpriv-&gt;link_info.num_rx_inperiod +</div><div class='del'>-		      rtlpriv-&gt;link_info.num_tx_inperiod &gt; 8 ||</div><div class='del'>-		    rtlpriv-&gt;link_info.num_rx_inperiod &gt; 2)</div><div class='del'>-			rtl_lps_leave(hw);</div><div class='del'>-		else</div><div class='del'>-			rtl_lps_enter(hw);</div><div class='del'>-</div><div class='del'>-label_lps_done:</div><div class='del'>-		;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;link_info.num_rx_inperiod = 0;</div><div class='del'>-	rtlpriv-&gt;link_info.num_tx_inperiod = 0;</div><div class='del'>-	for (tid = 0; tid &lt;= 7; tid++)</div><div class='del'>-		rtlpriv-&gt;link_info.tidtx_inperiod[tid] = 0;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;link_info.busytraffic = busytraffic;</div><div class='del'>-	rtlpriv-&gt;link_info.higher_busytraffic = higher_busytraffic;</div><div class='del'>-	rtlpriv-&gt;link_info.rx_busy_traffic = rx_busy_traffic;</div><div class='del'>-	rtlpriv-&gt;link_info.tx_busy_traffic = tx_busy_traffic;</div><div class='del'>-	rtlpriv-&gt;link_info.higher_busyrxtraffic = higher_busyrxtraffic;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;stats.txbytesunicast_inperiod =</div><div class='del'>-		rtlpriv-&gt;stats.txbytesunicast -</div><div class='del'>-		rtlpriv-&gt;stats.txbytesunicast_last;</div><div class='del'>-	rtlpriv-&gt;stats.rxbytesunicast_inperiod =</div><div class='del'>-		rtlpriv-&gt;stats.rxbytesunicast -</div><div class='del'>-		rtlpriv-&gt;stats.rxbytesunicast_last;</div><div class='del'>-	rtlpriv-&gt;stats.txbytesunicast_last = rtlpriv-&gt;stats.txbytesunicast;</div><div class='del'>-	rtlpriv-&gt;stats.rxbytesunicast_last = rtlpriv-&gt;stats.rxbytesunicast;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;stats.txbytesunicast_inperiod_tp =</div><div class='del'>-		(u32)(rtlpriv-&gt;stats.txbytesunicast_inperiod * 8 / 2 /</div><div class='del'>-		1024 / 1024);</div><div class='del'>-	rtlpriv-&gt;stats.rxbytesunicast_inperiod_tp =</div><div class='del'>-		(u32)(rtlpriv-&gt;stats.rxbytesunicast_inperiod * 8 / 2 /</div><div class='del'>-		1024 / 1024);</div><div class='del'>-</div><div class='del'>-	/* &lt;3&gt; DM */</div><div class='del'>-	if (!rtlpriv-&gt;cfg-&gt;mod_params-&gt;disable_watchdog)</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;dm_watchdog(hw);</div><div class='del'>-</div><div class='del'>-	/* &lt;4&gt; roaming */</div><div class='del'>-	if (mac-&gt;link_state == MAC80211_LINKED &amp;&amp;</div><div class='del'>-	    mac-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-		if ((rtlpriv-&gt;link_info.bcn_rx_inperiod +</div><div class='del'>-		    rtlpriv-&gt;link_info.num_rx_inperiod) == 0) {</div><div class='del'>-			rtlpriv-&gt;link_info.roam_times++;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,</div><div class='del'>-				 "AP off for %d s\n",</div><div class='del'>-				(rtlpriv-&gt;link_info.roam_times * 2));</div><div class='del'>-</div><div class='del'>-			/* if we can't recv beacon for 10s,</div><div class='del'>-			 * we should reconnect this AP</div><div class='del'>-			 */</div><div class='del'>-			if (rtlpriv-&gt;link_info.roam_times &gt;= 5) {</div><div class='del'>-				pr_err("AP off, try to reconnect now\n");</div><div class='del'>-				rtlpriv-&gt;link_info.roam_times = 0;</div><div class='del'>-				ieee80211_connection_loss(rtlpriv-&gt;mac80211.vif);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			rtlpriv-&gt;link_info.roam_times = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_periodical(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;btcoexist.btc_info.in_4way) {</div><div class='del'>-		if (time_after(jiffies, rtlpriv-&gt;btcoexist.btc_info.in_4way_ts +</div><div class='del'>-			       msecs_to_jiffies(IN_4WAY_TIMEOUT_TIME)))</div><div class='del'>-			rtlpriv-&gt;btcoexist.btc_info.in_4way = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;link_info.bcn_rx_inperiod = 0;</div><div class='del'>-</div><div class='del'>-	/* &lt;6&gt; scan list */</div><div class='del'>-	rtl_scan_list_expire(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_watch_dog_timer_callback(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = from_timer(rtlpriv, t, works.watchdog_timer);</div><div class='del'>-</div><div class='del'>-	queue_delayed_work(rtlpriv-&gt;works.rtl_wq,</div><div class='del'>-			   &amp;rtlpriv-&gt;works.watchdog_wq, 0);</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;rtlpriv-&gt;works.watchdog_timer,</div><div class='del'>-		  jiffies + MSECS(RTL_WATCH_DOG_TIME));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_fwevt_wq_callback(void *data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_works *rtlworks =</div><div class='del'>-		container_of_dwork_rtl(data, struct rtl_works, fwevt_wq);</div><div class='del'>-	struct ieee80211_hw *hw = rtlworks-&gt;hw;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;c2h_command_handle(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, u8 tag, u8 len, u8 *val)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct rtl_c2hcmd *c2hcmd;</div><div class='del'>-</div><div class='del'>-	c2hcmd = kmalloc(sizeof(*c2hcmd),</div><div class='del'>-			 in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!c2hcmd)</div><div class='del'>-		goto label_err;</div><div class='del'>-</div><div class='del'>-	c2hcmd-&gt;val = kmalloc(len,</div><div class='del'>-			      in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!c2hcmd-&gt;val)</div><div class='del'>-		goto label_err2;</div><div class='del'>-</div><div class='del'>-	/* fill data */</div><div class='del'>-	c2hcmd-&gt;tag = tag;</div><div class='del'>-	c2hcmd-&gt;len = len;</div><div class='del'>-	memcpy(c2hcmd-&gt;val, val, len);</div><div class='del'>-</div><div class='del'>-	/* enqueue */</div><div class='del'>-	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.c2hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;c2hcmd-&gt;list, &amp;rtlpriv-&gt;c2hcmd_list);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.c2hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* wake up wq */</div><div class='del'>-	queue_delayed_work(rtlpriv-&gt;works.rtl_wq, &amp;rtlpriv-&gt;works.c2hcmd_wq, 0);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-label_err2:</div><div class='del'>-	kfree(c2hcmd);</div><div class='del'>-</div><div class='del'>-label_err:</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_CMD, DBG_WARNING,</div><div class='del'>-		 "C2H cmd enqueue fail.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct rtl_c2hcmd *c2hcmd;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 200; i++) {</div><div class='del'>-		/* dequeue a task */</div><div class='del'>-		spin_lock_irqsave(&amp;rtlpriv-&gt;locks.c2hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-		c2hcmd = list_first_entry_or_null(&amp;rtlpriv-&gt;c2hcmd_list,</div><div class='del'>-						  struct rtl_c2hcmd, list);</div><div class='del'>-</div><div class='del'>-		if (c2hcmd)</div><div class='del'>-			list_del(&amp;c2hcmd-&gt;list);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.c2hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-		/* do it */</div><div class='del'>-		if (!c2hcmd)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;ops-&gt;c2h_content_parsing &amp;&amp; exec)</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;c2h_content_parsing(hw,</div><div class='del'>-					c2hcmd-&gt;tag, c2hcmd-&gt;len, c2hcmd-&gt;val);</div><div class='del'>-</div><div class='del'>-		/* free */</div><div class='del'>-		kfree(c2hcmd-&gt;val);</div><div class='del'>-</div><div class='del'>-		kfree(c2hcmd);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_c2hcmd_wq_callback(void *data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_works *rtlworks = container_of_dwork_rtl(data,</div><div class='del'>-							    struct rtl_works,</div><div class='del'>-							    c2hcmd_wq);</div><div class='del'>-	struct ieee80211_hw *hw = rtlworks-&gt;hw;</div><div class='del'>-</div><div class='del'>-	rtl_c2hcmd_launcher(hw, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv =</div><div class='del'>-		from_timer(rtlpriv, t, works.dualmac_easyconcurrent_retrytimer);</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;hw;</div><div class='del'>-	struct rtl_priv *buddy_priv = rtlpriv-&gt;buddy_priv;</div><div class='del'>-</div><div class='del'>-	if (!buddy_priv)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;dualmac_easy_concurrent(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********************************************************</div><div class='del'>- *</div><div class='del'>- * frame process functions</div><div class='del'>- *</div><div class='del'>- *********************************************************/</div><div class='del'>-u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_mgmt *mgmt = (void *)data;</div><div class='del'>-	u8 *pos, *end;</div><div class='del'>-</div><div class='del'>-	pos = (u8 *)mgmt-&gt;u.beacon.variable;</div><div class='del'>-	end = data + len;</div><div class='del'>-	while (pos &lt; end) {</div><div class='del'>-		if (pos + 2 + pos[1] &gt; end)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		if (pos[0] == ie)</div><div class='del'>-			return pos;</div><div class='del'>-</div><div class='del'>-		pos += 2 + pos[1];</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* when we use 2 rx ants we send IEEE80211_SMPS_OFF */</div><div class='del'>-/* when we use 1 rx ant we send IEEE80211_SMPS_STATIC */</div><div class='del'>-static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,</div><div class='del'>-					    enum ieee80211_smps_mode smps,</div><div class='del'>-					    u8 *da, u8 *bssid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct ieee80211_mgmt *action_frame;</div><div class='del'>-</div><div class='del'>-	/* 27 = header + category + action + smps mode */</div><div class='del'>-	skb = dev_alloc_skb(27 + hw-&gt;extra_tx_headroom);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, hw-&gt;extra_tx_headroom);</div><div class='del'>-	action_frame = skb_put_zero(skb, 27);</div><div class='del'>-	memcpy(action_frame-&gt;da, da, ETH_ALEN);</div><div class='del'>-	memcpy(action_frame-&gt;sa, rtlefuse-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(action_frame-&gt;bssid, bssid, ETH_ALEN);</div><div class='del'>-	action_frame-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='del'>-						  IEEE80211_STYPE_ACTION);</div><div class='del'>-	action_frame-&gt;u.action.category = WLAN_CATEGORY_HT;</div><div class='del'>-	action_frame-&gt;u.action.u.ht_smps.action = WLAN_HT_ACTION_SMPS;</div><div class='del'>-	switch (smps) {</div><div class='del'>-	case IEEE80211_SMPS_AUTOMATIC:/* 0 */</div><div class='del'>-	case IEEE80211_SMPS_NUM_MODES:/* 4 */</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	/* fall through */</div><div class='del'>-	case IEEE80211_SMPS_OFF:/* 1 */ /*MIMO_PS_NOLIMIT*/</div><div class='del'>-		action_frame-&gt;u.action.u.ht_smps.smps_control =</div><div class='del'>-				WLAN_HT_SMPS_CONTROL_DISABLED;/* 0 */</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_SMPS_STATIC:/* 2 */ /*MIMO_PS_STATIC*/</div><div class='del'>-		action_frame-&gt;u.action.u.ht_smps.smps_control =</div><div class='del'>-				WLAN_HT_SMPS_CONTROL_STATIC;/* 1 */</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_SMPS_DYNAMIC:/* 3 */ /*MIMO_PS_DYNAMIC*/</div><div class='del'>-		action_frame-&gt;u.action.u.ht_smps.smps_control =</div><div class='del'>-				WLAN_HT_SMPS_CONTROL_DYNAMIC;/* 3 */</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'>-int rtl_send_smps_action(struct ieee80211_hw *hw,</div><div class='del'>-			 struct ieee80211_sta *sta,</div><div class='del'>-			 enum ieee80211_smps_mode smps)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct rtl_tcb_desc tcb_desc;</div><div class='del'>-	u8 bssid[ETH_ALEN] = {0};</div><div class='del'>-</div><div class='del'>-	memset(&amp;tcb_desc, 0, sizeof(struct rtl_tcb_desc));</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;mac80211.act_scanning)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (unlikely(is_hal_stop(rtlhal) || ppsc-&gt;rfpwr_state != ERFON))</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(RTL_STATUS_INTERFACE_START, &amp;rtlpriv-&gt;status))</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;mac80211.opmode == NL80211_IFTYPE_AP)</div><div class='del'>-		memcpy(bssid, rtlpriv-&gt;efuse.dev_addr, ETH_ALEN);</div><div class='del'>-	else</div><div class='del'>-		memcpy(bssid, rtlpriv-&gt;mac80211.bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	skb = rtl_make_smps_action(hw, smps, sta-&gt;addr, bssid);</div><div class='del'>-	/* this is a type = mgmt * stype = action frame */</div><div class='del'>-	if (skb) {</div><div class='del'>-		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-		struct rtl_sta_info *sta_entry =</div><div class='del'>-			(struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-		sta_entry-&gt;mimo_ps = smps;</div><div class='del'>-		/* rtlpriv-&gt;cfg-&gt;ops-&gt;update_rate_tbl(hw, sta, 0, true); */</div><div class='del'>-</div><div class='del'>-		info-&gt;control.rates[0].idx = 0;</div><div class='del'>-		info-&gt;band = hw-&gt;conf.chandef.chan-&gt;band;</div><div class='del'>-		rtlpriv-&gt;intf_ops-&gt;adapter_tx(hw, sta, skb, &amp;tcb_desc);</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-err_free:</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	enum io_type iotype;</div><div class='del'>-</div><div class='del'>-	if (!is_hal_stop(rtlhal)) {</div><div class='del'>-		switch (operation) {</div><div class='del'>-		case SCAN_OPT_BACKUP:</div><div class='del'>-			iotype = IO_CMD_PAUSE_DM_BY_SCAN;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw,</div><div class='del'>-						      HW_VAR_IO_CMD,</div><div class='del'>-						      (u8 *)&amp;iotype);</div><div class='del'>-			break;</div><div class='del'>-		case SCAN_OPT_RESTORE:</div><div class='del'>-			iotype = IO_CMD_RESUME_DM_BY_SCAN;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw,</div><div class='del'>-						      HW_VAR_IO_CMD,</div><div class='del'>-						      (u8 *)&amp;iotype);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_err("Unknown Scan Backup operation.\n");</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'>-/* because mac80211 have issues when can receive del ba</div><div class='del'>- * so here we just make a fake del_ba if we receive a ba_req</div><div class='del'>- * but rx_agg was opened to let mac80211 release some ba</div><div class='del'>- * related resources, so please this del_ba for tx</div><div class='del'>- */</div><div class='del'>-struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,</div><div class='del'>-				u8 *sa, u8 *bssid, u16 tid)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct ieee80211_mgmt *action_frame;</div><div class='del'>-	u16 params;</div><div class='del'>-</div><div class='del'>-	/* 27 = header + category + action + smps mode */</div><div class='del'>-	skb = dev_alloc_skb(34 + hw-&gt;extra_tx_headroom);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, hw-&gt;extra_tx_headroom);</div><div class='del'>-	action_frame = skb_put_zero(skb, 34);</div><div class='del'>-	memcpy(action_frame-&gt;sa, sa, ETH_ALEN);</div><div class='del'>-	memcpy(action_frame-&gt;da, rtlefuse-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(action_frame-&gt;bssid, bssid, ETH_ALEN);</div><div class='del'>-	action_frame-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='del'>-						  IEEE80211_STYPE_ACTION);</div><div class='del'>-	action_frame-&gt;u.action.category = WLAN_CATEGORY_BACK;</div><div class='del'>-	action_frame-&gt;u.action.u.delba.action_code = WLAN_ACTION_DELBA;</div><div class='del'>-	params = (u16)(1 &lt;&lt; 11);	/* bit 11 initiator */</div><div class='del'>-	params |= (u16)(tid &lt;&lt; 12);	/* bit 15:12 TID number */</div><div class='del'>-</div><div class='del'>-	action_frame-&gt;u.action.u.delba.params = cpu_to_le16(params);</div><div class='del'>-	action_frame-&gt;u.action.u.delba.reason_code =</div><div class='del'>-		cpu_to_le16(WLAN_REASON_QSTA_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	struct ieee80211_hdr *hdr = data;</div><div class='del'>-	struct ieee80211_ht_cap *ht_cap_ie;</div><div class='del'>-	struct ieee80211_ht_operation *ht_oper_ie = NULL;</div><div class='del'>-	struct rtl_beacon_keys bcn_key = {};</div><div class='del'>-	struct rtl_beacon_keys *cur_bcn_key;</div><div class='del'>-	u8 *ht_cap;</div><div class='del'>-	u8 ht_cap_len;</div><div class='del'>-	u8 *ht_oper;</div><div class='del'>-	u8 ht_oper_len;</div><div class='del'>-	u8 *ds_param;</div><div class='del'>-	u8 ds_param_len;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;opmode != NL80211_IFTYPE_STATION)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* check if this really is a beacon*/</div><div class='del'>-	if (!ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* min. beacon length + FCS_LEN */</div><div class='del'>-	if (len &lt;= 40 + FCS_LEN)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	cur_bcn_key = &amp;mac-&gt;cur_beacon_keys;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;mac80211.link_state == MAC80211_NOLINK) {</div><div class='del'>-		if (cur_bcn_key-&gt;valid) {</div><div class='del'>-			cur_bcn_key-&gt;valid = false;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BEACON, DBG_LOUD,</div><div class='del'>-				 "Reset cur_beacon_keys.valid to false!\n");</div><div class='del'>-		}</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and only beacons from the associated BSSID, please */</div><div class='del'>-	if (!ether_addr_equal(hdr-&gt;addr3, rtlpriv-&gt;mac80211.bssid))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/***** Parsing DS Param IE ******/</div><div class='del'>-	ds_param = rtl_find_ie(data, len - FCS_LEN, WLAN_EID_DS_PARAMS);</div><div class='del'>-</div><div class='del'>-	if (ds_param &amp;&amp; !(ds_param[1] &lt; sizeof(*ds_param))) {</div><div class='del'>-		ds_param_len = ds_param[1];</div><div class='del'>-		bcn_key.bcn_channel = ds_param[2];</div><div class='del'>-	} else {</div><div class='del'>-		ds_param = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/***** Parsing HT Cap. IE ******/</div><div class='del'>-	ht_cap = rtl_find_ie(data, len - FCS_LEN, WLAN_EID_HT_CAPABILITY);</div><div class='del'>-</div><div class='del'>-	if (ht_cap &amp;&amp; !(ht_cap[1] &lt; sizeof(*ht_cap))) {</div><div class='del'>-		ht_cap_len = ht_cap[1];</div><div class='del'>-		ht_cap_ie = (struct ieee80211_ht_cap *)&amp;ht_cap[2];</div><div class='del'>-		bcn_key.ht_cap_info = ht_cap_ie-&gt;cap_info;</div><div class='del'>-	} else  {</div><div class='del'>-		ht_cap = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/***** Parsing HT Info. IE ******/</div><div class='del'>-	ht_oper = rtl_find_ie(data, len - FCS_LEN, WLAN_EID_HT_OPERATION);</div><div class='del'>-</div><div class='del'>-	if (ht_oper &amp;&amp; !(ht_oper[1] &lt; sizeof(*ht_oper))) {</div><div class='del'>-		ht_oper_len = ht_oper[1];</div><div class='del'>-		ht_oper_ie = (struct ieee80211_ht_operation *)&amp;ht_oper[2];</div><div class='del'>-	} else {</div><div class='del'>-		ht_oper = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update bcn_key */</div><div class='del'>-</div><div class='del'>-	if (!ds_param &amp;&amp; ht_oper &amp;&amp; ht_oper_ie)</div><div class='del'>-		bcn_key.bcn_channel = ht_oper_ie-&gt;primary_chan;</div><div class='del'>-</div><div class='del'>-	if (ht_oper &amp;&amp; ht_oper_ie)</div><div class='del'>-		bcn_key.ht_info_infos_0_sco = ht_oper_ie-&gt;ht_param &amp; 0x03;</div><div class='del'>-</div><div class='del'>-	bcn_key.valid = true;</div><div class='del'>-</div><div class='del'>-	/* update cur_beacon_keys or compare beacon key */</div><div class='del'>-	if (rtlpriv-&gt;mac80211.link_state != MAC80211_LINKED &amp;&amp;</div><div class='del'>-	    rtlpriv-&gt;mac80211.link_state != MAC80211_LINKED_SCANNING)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (!cur_bcn_key-&gt;valid) {</div><div class='del'>-		/* update cur_beacon_keys */</div><div class='del'>-		memcpy(cur_bcn_key, &amp;bcn_key, sizeof(bcn_key));</div><div class='del'>-		cur_bcn_key-&gt;valid = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BEACON, DBG_LOUD,</div><div class='del'>-			 "Beacon key update!ch=%d, ht_cap_info=0x%x, sco=0x%x\n",</div><div class='del'>-			 cur_bcn_key-&gt;bcn_channel,</div><div class='del'>-			 cur_bcn_key-&gt;ht_cap_info,</div><div class='del'>-			 cur_bcn_key-&gt;ht_info_infos_0_sco);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* compare beacon key */</div><div class='del'>-	if (!memcmp(cur_bcn_key, &amp;bcn_key, sizeof(bcn_key))) {</div><div class='del'>-		/* same beacon key */</div><div class='del'>-		mac-&gt;new_beacon_cnt = 0;</div><div class='del'>-		goto chk_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cur_bcn_key-&gt;bcn_channel == bcn_key.bcn_channel &amp;&amp;</div><div class='del'>-	    cur_bcn_key-&gt;ht_cap_info == bcn_key.ht_cap_info) {</div><div class='del'>-		/* Beacon HT info IE, secondary channel offset check */</div><div class='del'>-		/* 40M -&gt; 20M */</div><div class='del'>-		if (cur_bcn_key-&gt;ht_info_infos_0_sco &gt;</div><div class='del'>-		    bcn_key.ht_info_infos_0_sco) {</div><div class='del'>-			/* Not a new beacon */</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-				 "Beacon BW change! sco:0x%x -&gt; 0x%x\n",</div><div class='del'>-				 cur_bcn_key-&gt;ht_info_infos_0_sco,</div><div class='del'>-				 bcn_key.ht_info_infos_0_sco);</div><div class='del'>-</div><div class='del'>-			cur_bcn_key-&gt;ht_info_infos_0_sco =</div><div class='del'>-					bcn_key.ht_info_infos_0_sco;</div><div class='del'>-		} else {</div><div class='del'>-			/* 20M -&gt; 40M */</div><div class='del'>-			if (rtlphy-&gt;max_ht_chan_bw &gt;= HT_CHANNEL_WIDTH_20_40) {</div><div class='del'>-				/* Not a new beacon */</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-					 "Beacon BW change! sco:0x%x -&gt; 0x%x\n",</div><div class='del'>-					 cur_bcn_key-&gt;ht_info_infos_0_sco,</div><div class='del'>-					 bcn_key.ht_info_infos_0_sco);</div><div class='del'>-</div><div class='del'>-				cur_bcn_key-&gt;ht_info_infos_0_sco =</div><div class='del'>-					bcn_key.ht_info_infos_0_sco;</div><div class='del'>-			} else {</div><div class='del'>-				mac-&gt;new_beacon_cnt++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		mac-&gt;new_beacon_cnt++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;new_beacon_cnt == 1) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-			 "Get new beacon.\n");</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-			 "Cur : ch=%d, ht_cap=0x%x, sco=0x%x\n",</div><div class='del'>-			 cur_bcn_key-&gt;bcn_channel,</div><div class='del'>-			 cur_bcn_key-&gt;ht_cap_info,</div><div class='del'>-			 cur_bcn_key-&gt;ht_info_infos_0_sco);</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-			 "New RX : ch=%d, ht_cap=0x%x, sco=0x%x\n",</div><div class='del'>-			 bcn_key.bcn_channel,</div><div class='del'>-			 bcn_key.ht_cap_info,</div><div class='del'>-			 bcn_key.ht_info_infos_0_sco);</div><div class='del'>-</div><div class='del'>-	} else if (mac-&gt;new_beacon_cnt &gt; 1) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-			 "new beacon cnt: %d\n",</div><div class='del'>-			 mac-&gt;new_beacon_cnt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;new_beacon_cnt &gt; 3) {</div><div class='del'>-		ieee80211_connection_loss(rtlpriv-&gt;mac80211.vif);</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,</div><div class='del'>-			 "new beacon cnt &gt;3, disconnect !\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-chk_exit:</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********************************************************</div><div class='del'>- *</div><div class='del'>- * IOT functions</div><div class='del'>- *</div><div class='del'>- *********************************************************/</div><div class='del'>-static bool rtl_chk_vendor_ouisub(struct ieee80211_hw *hw,</div><div class='del'>-				  struct octet_string vendor_ie)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	bool matched = false;</div><div class='del'>-	static u8 athcap_1[] = { 0x00, 0x03, 0x7F };</div><div class='del'>-	static u8 athcap_2[] = { 0x00, 0x13, 0x74 };</div><div class='del'>-	static u8 broadcap_1[] = { 0x00, 0x10, 0x18 };</div><div class='del'>-	static u8 broadcap_2[] = { 0x00, 0x0a, 0xf7 };</div><div class='del'>-	static u8 broadcap_3[] = { 0x00, 0x05, 0xb5 };</div><div class='del'>-	static u8 racap[] = { 0x00, 0x0c, 0x43 };</div><div class='del'>-	static u8 ciscocap[] = { 0x00, 0x40, 0x96 };</div><div class='del'>-	static u8 marvcap[] = { 0x00, 0x50, 0x43 };</div><div class='del'>-</div><div class='del'>-	if (memcmp(vendor_ie.octet, athcap_1, 3) == 0 ||</div><div class='del'>-	    memcmp(vendor_ie.octet, athcap_2, 3) == 0) {</div><div class='del'>-		rtlpriv-&gt;mac80211.vendor = PEER_ATH;</div><div class='del'>-		matched = true;</div><div class='del'>-	} else if (memcmp(vendor_ie.octet, broadcap_1, 3) == 0 ||</div><div class='del'>-		   memcmp(vendor_ie.octet, broadcap_2, 3) == 0 ||</div><div class='del'>-		   memcmp(vendor_ie.octet, broadcap_3, 3) == 0) {</div><div class='del'>-		rtlpriv-&gt;mac80211.vendor = PEER_BROAD;</div><div class='del'>-		matched = true;</div><div class='del'>-	} else if (memcmp(vendor_ie.octet, racap, 3) == 0) {</div><div class='del'>-		rtlpriv-&gt;mac80211.vendor = PEER_RAL;</div><div class='del'>-		matched = true;</div><div class='del'>-	} else if (memcmp(vendor_ie.octet, ciscocap, 3) == 0) {</div><div class='del'>-		rtlpriv-&gt;mac80211.vendor = PEER_CISCO;</div><div class='del'>-		matched = true;</div><div class='del'>-	} else if (memcmp(vendor_ie.octet, marvcap, 3) == 0) {</div><div class='del'>-		rtlpriv-&gt;mac80211.vendor = PEER_MARV;</div><div class='del'>-		matched = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return matched;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rtl_find_221_ie(struct ieee80211_hw *hw, u8 *data,</div><div class='del'>-			    unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_mgmt *mgmt = (void *)data;</div><div class='del'>-	struct octet_string vendor_ie;</div><div class='del'>-	u8 *pos, *end;</div><div class='del'>-</div><div class='del'>-	pos = (u8 *)mgmt-&gt;u.beacon.variable;</div><div class='del'>-	end = data + len;</div><div class='del'>-	while (pos &lt; end) {</div><div class='del'>-		if (pos[0] == 221) {</div><div class='del'>-			vendor_ie.length = pos[1];</div><div class='del'>-			vendor_ie.octet = &amp;pos[2];</div><div class='del'>-			if (rtl_chk_vendor_ouisub(hw, vendor_ie))</div><div class='del'>-				return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pos + 2 + pos[1] &gt; end)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		pos += 2 + pos[1];</div><div class='del'>-	}</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct ieee80211_hdr *hdr = (void *)data;</div><div class='del'>-	u32 vendor = PEER_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	static u8 ap3_1[3] = { 0x00, 0x14, 0xbf };</div><div class='del'>-	static u8 ap3_2[3] = { 0x00, 0x1a, 0x70 };</div><div class='del'>-	static u8 ap3_3[3] = { 0x00, 0x1d, 0x7e };</div><div class='del'>-	static u8 ap4_1[3] = { 0x00, 0x90, 0xcc };</div><div class='del'>-	static u8 ap4_2[3] = { 0x00, 0x0e, 0x2e };</div><div class='del'>-	static u8 ap4_3[3] = { 0x00, 0x18, 0x02 };</div><div class='del'>-	static u8 ap4_4[3] = { 0x00, 0x17, 0x3f };</div><div class='del'>-	static u8 ap4_5[3] = { 0x00, 0x1c, 0xdf };</div><div class='del'>-	static u8 ap5_1[3] = { 0x00, 0x1c, 0xf0 };</div><div class='del'>-	static u8 ap5_2[3] = { 0x00, 0x21, 0x91 };</div><div class='del'>-	static u8 ap5_3[3] = { 0x00, 0x24, 0x01 };</div><div class='del'>-	static u8 ap5_4[3] = { 0x00, 0x15, 0xe9 };</div><div class='del'>-	static u8 ap5_5[3] = { 0x00, 0x17, 0x9A };</div><div class='del'>-	static u8 ap5_6[3] = { 0x00, 0x18, 0xE7 };</div><div class='del'>-	static u8 ap6_1[3] = { 0x00, 0x17, 0x94 };</div><div class='del'>-	static u8 ap7_1[3] = { 0x00, 0x14, 0xa4 };</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;opmode != NL80211_IFTYPE_STATION)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;link_state == MAC80211_NOLINK) {</div><div class='del'>-		mac-&gt;vendor = PEER_UNKNOWN;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;cnt_after_linked &gt; 2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check if this really is a beacon */</div><div class='del'>-	if (!ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* min. beacon length + FCS_LEN */</div><div class='del'>-	if (len &lt;= 40 + FCS_LEN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* and only beacons from the associated BSSID, please */</div><div class='del'>-	if (!ether_addr_equal_64bits(hdr-&gt;addr3, rtlpriv-&gt;mac80211.bssid))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (rtl_find_221_ie(hw, data, len))</div><div class='del'>-		vendor = mac-&gt;vendor;</div><div class='del'>-</div><div class='del'>-	if ((memcmp(mac-&gt;bssid, ap5_1, 3) == 0) ||</div><div class='del'>-	    (memcmp(mac-&gt;bssid, ap5_2, 3) == 0) ||</div><div class='del'>-	    (memcmp(mac-&gt;bssid, ap5_3, 3) == 0) ||</div><div class='del'>-	    (memcmp(mac-&gt;bssid, ap5_4, 3) == 0) ||</div><div class='del'>-	    (memcmp(mac-&gt;bssid, ap5_5, 3) == 0) ||</div><div class='del'>-	    (memcmp(mac-&gt;bssid, ap5_6, 3) == 0) ||</div><div class='del'>-	    vendor == PEER_ATH) {</div><div class='del'>-		vendor = PEER_ATH;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=&gt;ath find\n");</div><div class='del'>-	} else if ((memcmp(mac-&gt;bssid, ap4_4, 3) == 0) ||</div><div class='del'>-		(memcmp(mac-&gt;bssid, ap4_5, 3) == 0) ||</div><div class='del'>-		(memcmp(mac-&gt;bssid, ap4_1, 3) == 0) ||</div><div class='del'>-		(memcmp(mac-&gt;bssid, ap4_2, 3) == 0) ||</div><div class='del'>-		(memcmp(mac-&gt;bssid, ap4_3, 3) == 0) ||</div><div class='del'>-		vendor == PEER_RAL) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=&gt;ral find\n");</div><div class='del'>-		vendor = PEER_RAL;</div><div class='del'>-	} else if (memcmp(mac-&gt;bssid, ap6_1, 3) == 0 ||</div><div class='del'>-		vendor == PEER_CISCO) {</div><div class='del'>-		vendor = PEER_CISCO;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=&gt;cisco find\n");</div><div class='del'>-	} else if ((memcmp(mac-&gt;bssid, ap3_1, 3) == 0) ||</div><div class='del'>-		(memcmp(mac-&gt;bssid, ap3_2, 3) == 0) ||</div><div class='del'>-		(memcmp(mac-&gt;bssid, ap3_3, 3) == 0) ||</div><div class='del'>-		vendor == PEER_BROAD) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=&gt;broad find\n");</div><div class='del'>-		vendor = PEER_BROAD;</div><div class='del'>-	} else if (memcmp(mac-&gt;bssid, ap7_1, 3) == 0 ||</div><div class='del'>-		vendor == PEER_MARV) {</div><div class='del'>-		vendor = PEER_MARV;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=&gt;marv find\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mac-&gt;vendor = vendor;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("lizhaoming	&lt;chaoming_li@realsil.com.cn&gt;");</div><div class='del'>-MODULE_AUTHOR("Realtek WlanFAE	&lt;wlanfae@realtek.com&gt;");</div><div class='del'>-MODULE_AUTHOR("Larry Finger	&lt;Larry.FInger@lwfinger.net&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core");</div><div class='del'>-</div><div class='del'>-struct rtl_global_var rtl_global_var = {};</div><div class='del'>-</div><div class='del'>-int rtl_core_module_init(void)</div><div class='del'>-{</div><div class='del'>-	if (rtl_rate_control_register())</div><div class='del'>-		pr_err("rtl: Unable to register rtl_rc, use default RC !!\n");</div><div class='del'>-</div><div class='del'>-	/* add debugfs */</div><div class='del'>-	rtl_debugfs_add_topdir();</div><div class='del'>-</div><div class='del'>-	/* init some global vars */</div><div class='del'>-	INIT_LIST_HEAD(&amp;rtl_global_var.glb_priv_list);</div><div class='del'>-	spin_lock_init(&amp;rtl_global_var.glb_list_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_core_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/*RC*/</div><div class='del'>-	rtl_rate_control_unregister();</div><div class='del'>-</div><div class='del'>-	/* remove debugfs */</div><div class='del'>-	rtl_debugfs_remove_topdir();</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/base.h b/drivers/staging/rtlwifi/base.h<br/>deleted file mode 100644<br/>index 591f433be1c3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/base.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/base.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,175 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __RTL_BASE_H__</div><div class='del'>-#define __RTL_BASE_H__</div><div class='del'>-</div><div class='del'>-enum ap_peer {</div><div class='del'>-	PEER_UNKNOWN = 0,</div><div class='del'>-	PEER_RTL = 1,</div><div class='del'>-	PEER_RTL_92SE = 2,</div><div class='del'>-	PEER_BROAD = 3,</div><div class='del'>-	PEER_RAL = 4,</div><div class='del'>-	PEER_ATH = 5,</div><div class='del'>-	PEER_CISCO = 6,</div><div class='del'>-	PEER_MARV = 7,</div><div class='del'>-	PEER_AIRGO = 9,</div><div class='del'>-	PEER_MAX = 10,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define RTL_DUMMY_OFFSET	0</div><div class='del'>-#define RTL_DUMMY_UNIT		8</div><div class='del'>-#define RTL_TX_DUMMY_SIZE	(RTL_DUMMY_OFFSET * RTL_DUMMY_UNIT)</div><div class='del'>-#define RTL_TX_DESC_SIZE	32</div><div class='del'>-#define RTL_TX_HEADER_SIZE	(RTL_TX_DESC_SIZE + RTL_TX_DUMMY_SIZE)</div><div class='del'>-</div><div class='del'>-#define MAX_BIT_RATE_40MHZ_MCS15	300	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_40MHZ_MCS7		150	/* Mbps */</div><div class='del'>-</div><div class='del'>-#define MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9	867	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS7	650	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_LONG_GI_2NSS_80MHZ_MCS9	780	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_LONG_GI_2NSS_80MHZ_MCS7	585	/* Mbps */</div><div class='del'>-</div><div class='del'>-#define MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9	434	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS7	325	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS9	390	/* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS7	293	/* Mbps */</div><div class='del'>-</div><div class='del'>-#define FRAME_OFFSET_FRAME_CONTROL	0</div><div class='del'>-#define FRAME_OFFSET_DURATION		2</div><div class='del'>-#define FRAME_OFFSET_ADDRESS1		4</div><div class='del'>-#define FRAME_OFFSET_ADDRESS2		10</div><div class='del'>-#define FRAME_OFFSET_ADDRESS3		16</div><div class='del'>-#define FRAME_OFFSET_SEQUENCE		22</div><div class='del'>-#define FRAME_OFFSET_ADDRESS4		24</div><div class='del'>-#define MAX_LISTEN_INTERVAL		10</div><div class='del'>-#define MAX_RATE_TRIES			4</div><div class='del'>-</div><div class='del'>-#define SET_80211_HDR_FRAME_CONTROL(_hdr, _val)		\</div><div class='del'>-	WRITEEF2BYTE(_hdr, _val)</div><div class='del'>-#define SET_80211_HDR_TYPE_AND_SUBTYPE(_hdr, _val)	\</div><div class='del'>-	WRITEEF1BYTE(_hdr, _val)</div><div class='del'>-#define SET_80211_HDR_PWR_MGNT(_hdr, _val)		\</div><div class='del'>-	SET_BITS_TO_LE_2BYTE(_hdr, 12, 1, _val)</div><div class='del'>-#define SET_80211_HDR_TO_DS(_hdr, _val)			\</div><div class='del'>-	SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val)</div><div class='del'>-</div><div class='del'>-#define SET_80211_PS_POLL_AID(_hdr, _val)		\</div><div class='del'>-	(*(u16 *)((u8 *)(_hdr) + 2) = _val)</div><div class='del'>-#define SET_80211_PS_POLL_BSSID(_hdr, _val)		\</div><div class='del'>-	ether_addr_copy(((u8 *)(_hdr)) + 4, (u8 *)(_val))</div><div class='del'>-#define SET_80211_PS_POLL_TA(_hdr, _val)		\</div><div class='del'>-	ether_addr_copy(((u8 *)(_hdr)) + 10, (u8 *)(_val))</div><div class='del'>-</div><div class='del'>-#define SET_80211_HDR_DURATION(_hdr, _val)	\</div><div class='del'>-	(*(u16 *)((u8 *)(_hdr) + FRAME_OFFSET_DURATION) = le16_to_cpu(_val))</div><div class='del'>-#define SET_80211_HDR_ADDRESS1(_hdr, _val)	\</div><div class='del'>-	CP_MACADDR((u8 *)(_hdr) + FRAME_OFFSET_ADDRESS1, (u8 *)(_val))</div><div class='del'>-#define SET_80211_HDR_ADDRESS2(_hdr, _val)	\</div><div class='del'>-	CP_MACADDR((u8 *)(_hdr) + FRAME_OFFSET_ADDRESS2, (u8 *)(_val))</div><div class='del'>-#define SET_80211_HDR_ADDRESS3(_hdr, _val)	\</div><div class='del'>-	CP_MACADDR((u8 *)(_hdr) + FRAME_OFFSET_ADDRESS3, (u8 *)(_val))</div><div class='del'>-#define SET_80211_HDR_FRAGMENT_SEQUENCE(_hdr, _val)  \</div><div class='del'>-	WRITEEF2BYTE((u8 *)(_hdr) + FRAME_OFFSET_SEQUENCE, _val)</div><div class='del'>-</div><div class='del'>-#define SET_BEACON_PROBE_RSP_TIME_STAMP_LOW(__phdr, __val)	\</div><div class='del'>-	WRITEEF4BYTE(((u8 *)(__phdr)) + 24, __val)</div><div class='del'>-#define SET_BEACON_PROBE_RSP_TIME_STAMP_HIGH(__phdr, __val) \</div><div class='del'>-	WRITEEF4BYTE(((u8 *)(__phdr)) + 28, __val)</div><div class='del'>-#define SET_BEACON_PROBE_RSP_BEACON_INTERVAL(__phdr, __val) \</div><div class='del'>-	WRITEEF2BYTE(((u8 *)(__phdr)) + 32, __val)</div><div class='del'>-#define GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr)		\</div><div class='del'>-	READEF2BYTE(((u8 *)(__phdr)) + 34)</div><div class='del'>-#define SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, __val) \</div><div class='del'>-	WRITEEF2BYTE(((u8 *)(__phdr)) + 34, __val)</div><div class='del'>-#define MASK_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, __val) \</div><div class='del'>-	SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, \</div><div class='del'>-	(GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr) &amp; (~(__val))))</div><div class='del'>-</div><div class='del'>-#define SET_TX_DESC_SPE_RPT(__pdesc, __val)			\</div><div class='del'>-	SET_BITS_TO_LE_4BYTE((__pdesc) + 8, 19, 1, __val)</div><div class='del'>-#define SET_TX_DESC_SW_DEFINE(__pdesc, __val)	\</div><div class='del'>-	SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 0, 12, __val)</div><div class='del'>-</div><div class='del'>-int rtl_init_core(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_deinit_core(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_init_rx_config(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_init_rfkill(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_deinit_rfkill(struct ieee80211_hw *hw);</div><div class='del'>-</div><div class='del'>-void rtl_watch_dog_timer_callback(struct timer_list *t);</div><div class='del'>-void rtl_deinit_deferred_work(struct ieee80211_hw *hw);</div><div class='del'>-</div><div class='del'>-bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);</div><div class='del'>-int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht,</div><div class='del'>-			 bool isvht, u8 desc_rate);</div><div class='del'>-bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,</div><div class='del'>-		       bool is_enc);</div><div class='del'>-</div><div class='del'>-bool rtl_is_tx_report_skb(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-void rtl_get_tx_report(struct rtl_tcb_desc *ptcb_desc, u8 *pdesc,</div><div class='del'>-		       struct ieee80211_hw *hw);</div><div class='del'>-void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf,</div><div class='del'>-			   u8 c2h_cmd_len);</div><div class='del'>-bool rtl_check_tx_report_acked(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms);</div><div class='del'>-u32 rtl_get_hal_edca_param(struct ieee80211_hw *hw,</div><div class='del'>-			   struct ieee80211_vif *vif,</div><div class='del'>-			   enum wireless_mode wirelessmode,</div><div class='del'>-			   struct ieee80211_tx_queue_params *param);</div><div class='del'>-</div><div class='del'>-void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-void rtl_scan_list_expire(struct ieee80211_hw *hw);</div><div class='del'>-int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		     struct ieee80211_sta *sta, u16 tid, u16 *ssn);</div><div class='del'>-int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		    struct ieee80211_sta *sta, u16 tid);</div><div class='del'>-int rtl_tx_agg_oper(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_sta *sta, u16 tid);</div><div class='del'>-int rtl_rx_agg_start(struct ieee80211_hw *hw,</div><div class='del'>-		     struct ieee80211_sta *sta, u16 tid);</div><div class='del'>-int rtl_rx_agg_stop(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_sta *sta, u16 tid);</div><div class='del'>-void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_watchdog_wq_callback(void *data);</div><div class='del'>-void rtl_fwevt_wq_callback(void *data);</div><div class='del'>-void rtl_c2hcmd_wq_callback(void *data);</div><div class='del'>-void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec);</div><div class='del'>-void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, u8 tag, u8 len, u8 *val);</div><div class='del'>-</div><div class='del'>-u8 rtl_mrate_idx_to_arfr_id(struct ieee80211_hw *hw,</div><div class='del'>-			    u8 rate_index,</div><div class='del'>-			    enum wireless_mode wirelessmode);</div><div class='del'>-void rtl_get_tcb_desc(struct ieee80211_hw *hw,</div><div class='del'>-		      struct ieee80211_tx_info *info,</div><div class='del'>-		      struct ieee80211_sta *sta,</div><div class='del'>-		      struct sk_buff *skb, struct rtl_tcb_desc *tcb_desc);</div><div class='del'>-</div><div class='del'>-int rtl_send_smps_action(struct ieee80211_hw *hw,</div><div class='del'>-			 struct ieee80211_sta *sta,</div><div class='del'>-			 enum ieee80211_smps_mode smps);</div><div class='del'>-u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);</div><div class='del'>-void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);</div><div class='del'>-u8 rtl_tid_to_ac(u8 tid);</div><div class='del'>-void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t);</div><div class='del'>-extern struct rtl_global_var rtl_global_var;</div><div class='del'>-void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);</div><div class='del'>-bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data,</div><div class='del'>-			  unsigned int len);</div><div class='del'>-int rtl_core_module_init(void);</div><div class='del'>-void rtl_core_module_exit(void);</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/Makefile b/drivers/staging/rtlwifi/btcoexist/Makefile<br/>deleted file mode 100644<br/>index f600bcc38a15..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/Makefile?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-btcoexist-objs :=				\</div><div class='del'>-			halbtc8822b1ant.o	\</div><div class='del'>-			halbtc8822b2ant.o	\</div><div class='del'>-			halbtc8822bwifionly.o	\</div><div class='del'>-			halbtcoutsrc.o		\</div><div class='del'>-			rtl_btc.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_RTLBTCOEXIST) += btcoexist.o</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbt_precomp.h b/drivers/staging/rtlwifi/btcoexist/halbt_precomp.h<br/>deleted file mode 100644<br/>index 90d0f2462303..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbt_precomp.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbt_precomp.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'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef	__HALBT_PRECOMP_H__</div><div class='del'>-#define __HALBT_PRECOMP_H__</div><div class='del'>-/*************************************************************</div><div class='del'>- * include files</div><div class='del'>- *************************************************************/</div><div class='del'>-#include "../wifi.h"</div><div class='del'>-#include "../efuse.h"</div><div class='del'>-#include "../base.h"</div><div class='del'>-#include "../regd.h"</div><div class='del'>-#include "../cam.h"</div><div class='del'>-#include "../ps.h"</div><div class='del'>-#include "../pci.h"</div><div class='del'>-</div><div class='del'>-#include "halbtcoutsrc.h"</div><div class='del'>-</div><div class='del'>-/* Interface type */</div><div class='del'>-#define RT_PCI_INTERFACE	1</div><div class='del'>-#define RT_USB_INTERFACE	2</div><div class='del'>-#define RT_SDIO_INTERFACE	3</div><div class='del'>-#define DEV_BUS_TYPE		RT_PCI_INTERFACE</div><div class='del'>-</div><div class='del'>-#include "halbtc8822b1ant.h"</div><div class='del'>-#include "halbtc8822b2ant.h"</div><div class='del'>-#include "halbtc8822bwifionly.h"</div><div class='del'>-</div><div class='del'>-#define GETDEFAULTADAPTER(padapter)	padapter</div><div class='del'>-</div><div class='del'>-#define BIT0	0x00000001</div><div class='del'>-#define BIT1	0x00000002</div><div class='del'>-#define BIT2	0x00000004</div><div class='del'>-#define BIT3	0x00000008</div><div class='del'>-#define BIT4	0x00000010</div><div class='del'>-#define BIT5	0x00000020</div><div class='del'>-#define BIT6	0x00000040</div><div class='del'>-#define BIT7	0x00000080</div><div class='del'>-#define BIT8	0x00000100</div><div class='del'>-#define BIT9	0x00000200</div><div class='del'>-#define BIT10	0x00000400</div><div class='del'>-#define BIT11	0x00000800</div><div class='del'>-#define BIT12	0x00001000</div><div class='del'>-#define BIT13	0x00002000</div><div class='del'>-#define BIT14	0x00004000</div><div class='del'>-#define BIT15	0x00008000</div><div class='del'>-#define BIT16	0x00010000</div><div class='del'>-#define BIT17	0x00020000</div><div class='del'>-#define BIT18	0x00040000</div><div class='del'>-#define BIT19	0x00080000</div><div class='del'>-#define BIT20	0x00100000</div><div class='del'>-#define BIT21	0x00200000</div><div class='del'>-#define BIT22	0x00400000</div><div class='del'>-#define BIT23	0x00800000</div><div class='del'>-#define BIT24	0x01000000</div><div class='del'>-#define BIT25	0x02000000</div><div class='del'>-#define BIT26	0x04000000</div><div class='del'>-#define BIT27	0x08000000</div><div class='del'>-#define BIT28	0x10000000</div><div class='del'>-#define BIT29	0x20000000</div><div class='del'>-#define BIT30	0x40000000</div><div class='del'>-#define BIT31	0x80000000</div><div class='del'>-</div><div class='del'>-#endif	/* __HALBT_PRECOMP_H__ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c b/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c<br/>deleted file mode 100644<br/>index ade271cb4aab..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5233 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-/* ************************************************************</div><div class='del'>- * Description:</div><div class='del'>- *</div><div class='del'>- * This file is for RTL8822B Co-exist mechanism</div><div class='del'>- *</div><div class='del'>- * History</div><div class='del'>- * 2012/11/15 Cosa first check in.</div><div class='del'>- *</div><div class='del'>- * *************************************************************/</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * include files</div><div class='del'>- * *************************************************************/</div><div class='del'>-/*only for rf4ce*/</div><div class='del'>-#include "halbt_precomp.h"</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * Global variables, these are static variables</div><div class='del'>- * *************************************************************/</div><div class='del'>-static struct coex_dm_8822b_1ant glcoex_dm_8822b_1ant;</div><div class='del'>-static struct coex_dm_8822b_1ant *coex_dm = &amp;glcoex_dm_8822b_1ant;</div><div class='del'>-static struct coex_sta_8822b_1ant glcoex_sta_8822b_1ant;</div><div class='del'>-static struct coex_sta_8822b_1ant *coex_sta = &amp;glcoex_sta_8822b_1ant;</div><div class='del'>-static struct psdscan_sta_8822b_1ant gl_psd_scan_8822b_1ant;</div><div class='del'>-static struct psdscan_sta_8822b_1ant *psd_scan = &amp;gl_psd_scan_8822b_1ant;</div><div class='del'>-static struct rfe_type_8822b_1ant gl_rfe_type_8822b_1ant;</div><div class='del'>-static struct rfe_type_8822b_1ant *rfe_type = &amp;gl_rfe_type_8822b_1ant;</div><div class='del'>-</div><div class='del'>-static const char *const glbt_info_src_8822b_1ant[] = {</div><div class='del'>-	"BT Info[wifi fw]", "BT Info[bt rsp]", "BT Info[bt auto report]",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 glcoex_ver_date_8822b_1ant = 20170327;</div><div class='del'>-static u32 glcoex_ver_8822b_1ant = 0x44;</div><div class='del'>-static u32 glcoex_ver_btdesired_8822b_1ant = 0x42;</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * local function proto type if needed</div><div class='del'>- * ************************************************************</div><div class='del'>- * ************************************************************</div><div class='del'>- * local function start with halbtc8822b1ant_</div><div class='del'>- * *************************************************************/</div><div class='del'>-</div><div class='del'>-static u8 halbtc8822b1ant_wifi_rssi_state(struct btc_coexist *btcoexist,</div><div class='del'>-					  u8 index, u8 level_num,</div><div class='del'>-					  u8 rssi_thresh, u8 rssi_thresh1)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	s32 wifi_rssi = 0;</div><div class='del'>-	u8 wifi_rssi_state = coex_sta-&gt;pre_wifi_rssi_state[index];</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &amp;wifi_rssi);</div><div class='del'>-</div><div class='del'>-	if (level_num == 2) {</div><div class='del'>-		if ((coex_sta-&gt;pre_wifi_rssi_state[index] ==</div><div class='del'>-		     BTC_RSSI_STATE_LOW) ||</div><div class='del'>-		    (coex_sta-&gt;pre_wifi_rssi_state[index] ==</div><div class='del'>-		     BTC_RSSI_STATE_STAY_LOW)) {</div><div class='del'>-			if (wifi_rssi &gt;=</div><div class='del'>-			    (rssi_thresh + BTC_RSSI_COEX_THRESH_TOL_8822B_1ANT))</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_HIGH;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_LOW;</div><div class='del'>-		} else {</div><div class='del'>-			if (wifi_rssi &lt; rssi_thresh)</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_HIGH;</div><div class='del'>-		}</div><div class='del'>-	} else if (level_num == 3) {</div><div class='del'>-		if (rssi_thresh &gt; rssi_thresh1) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], wifi RSSI thresh error!!\n");</div><div class='del'>-			return coex_sta-&gt;pre_wifi_rssi_state[index];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;pre_wifi_rssi_state[index] ==</div><div class='del'>-		     BTC_RSSI_STATE_LOW) ||</div><div class='del'>-		    (coex_sta-&gt;pre_wifi_rssi_state[index] ==</div><div class='del'>-		     BTC_RSSI_STATE_STAY_LOW)) {</div><div class='del'>-			if (wifi_rssi &gt;=</div><div class='del'>-			    (rssi_thresh + BTC_RSSI_COEX_THRESH_TOL_8822B_1ANT))</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_MEDIUM;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_LOW;</div><div class='del'>-		} else if ((coex_sta-&gt;pre_wifi_rssi_state[index] ==</div><div class='del'>-			    BTC_RSSI_STATE_MEDIUM) ||</div><div class='del'>-			   (coex_sta-&gt;pre_wifi_rssi_state[index] ==</div><div class='del'>-			    BTC_RSSI_STATE_STAY_MEDIUM)) {</div><div class='del'>-			if (wifi_rssi &gt;= (rssi_thresh1 +</div><div class='del'>-					  BTC_RSSI_COEX_THRESH_TOL_8822B_1ANT))</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_HIGH;</div><div class='del'>-			else if (wifi_rssi &lt; rssi_thresh)</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_MEDIUM;</div><div class='del'>-		} else {</div><div class='del'>-			if (wifi_rssi &lt; rssi_thresh1)</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_MEDIUM;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_HIGH;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;pre_wifi_rssi_state[index] = wifi_rssi_state;</div><div class='del'>-</div><div class='del'>-	return wifi_rssi_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_update_ra_mask(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool force_exec, u32 dis_rate_mask)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_ra_mask = dis_rate_mask;</div><div class='del'>-</div><div class='del'>-	if (force_exec || (coex_dm-&gt;pre_ra_mask != coex_dm-&gt;cur_ra_mask))</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_UPDATE_RAMASK,</div><div class='del'>-				   &amp;coex_dm-&gt;cur_ra_mask);</div><div class='del'>-	coex_dm-&gt;pre_ra_mask = coex_dm-&gt;cur_ra_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_auto_rate_fallback_retry(struct btc_coexist *btcoexist,</div><div class='del'>-					 bool force_exec, u8 type)</div><div class='del'>-{</div><div class='del'>-	bool wifi_under_b_mode = false;</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_arfr_type = type;</div><div class='del'>-</div><div class='del'>-	if (force_exec || (coex_dm-&gt;pre_arfr_type != coex_dm-&gt;cur_arfr_type)) {</div><div class='del'>-		switch (coex_dm-&gt;cur_arfr_type) {</div><div class='del'>-		case 0: /* normal mode */</div><div class='del'>-			btcoexist-&gt;btc_write_4byte(btcoexist, 0x430,</div><div class='del'>-						   coex_dm-&gt;backup_arfr_cnt1);</div><div class='del'>-			btcoexist-&gt;btc_write_4byte(btcoexist, 0x434,</div><div class='del'>-						   coex_dm-&gt;backup_arfr_cnt2);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist,</div><div class='del'>-					   BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-					   &amp;wifi_under_b_mode);</div><div class='del'>-			if (wifi_under_b_mode) {</div><div class='del'>-				btcoexist-&gt;btc_write_4byte(btcoexist, 0x430,</div><div class='del'>-							   0x0);</div><div class='del'>-				btcoexist-&gt;btc_write_4byte(btcoexist, 0x434,</div><div class='del'>-							   0x01010101);</div><div class='del'>-			} else {</div><div class='del'>-				btcoexist-&gt;btc_write_4byte(btcoexist, 0x430,</div><div class='del'>-							   0x0);</div><div class='del'>-				btcoexist-&gt;btc_write_4byte(btcoexist, 0x434,</div><div class='del'>-							   0x04030201);</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='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_arfr_type = coex_dm-&gt;cur_arfr_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_retry_limit(struct btc_coexist *btcoexist,</div><div class='del'>-					bool force_exec, u8 type)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_retry_limit_type = type;</div><div class='del'>-</div><div class='del'>-	if (force_exec ||</div><div class='del'>-	    (coex_dm-&gt;pre_retry_limit_type != coex_dm-&gt;cur_retry_limit_type)) {</div><div class='del'>-		switch (coex_dm-&gt;cur_retry_limit_type) {</div><div class='del'>-		case 0: /* normal mode */</div><div class='del'>-			btcoexist-&gt;btc_write_2byte(btcoexist, 0x42a,</div><div class='del'>-						   coex_dm-&gt;backup_retry_limit);</div><div class='del'>-			break;</div><div class='del'>-		case 1: /* retry limit=8 */</div><div class='del'>-			btcoexist-&gt;btc_write_2byte(btcoexist, 0x42a, 0x0808);</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'>-	coex_dm-&gt;pre_retry_limit_type = coex_dm-&gt;cur_retry_limit_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ampdu_max_time(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool force_exec, u8 type)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_ampdu_time_type = type;</div><div class='del'>-</div><div class='del'>-	if (force_exec ||</div><div class='del'>-	    (coex_dm-&gt;pre_ampdu_time_type != coex_dm-&gt;cur_ampdu_time_type)) {</div><div class='del'>-		switch (coex_dm-&gt;cur_ampdu_time_type) {</div><div class='del'>-		case 0: /* normal mode */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(</div><div class='del'>-				btcoexist, 0x456,</div><div class='del'>-				coex_dm-&gt;backup_ampdu_max_time);</div><div class='del'>-			break;</div><div class='del'>-		case 1: /* AMPDU timw = 0x38 * 32us */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x456, 0x38);</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'>-	coex_dm-&gt;pre_ampdu_time_type = coex_dm-&gt;cur_ampdu_time_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_limited_tx(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool force_exec, u8 ra_mask_type,</div><div class='del'>-				       u8 arfr_type, u8 retry_limit_type,</div><div class='del'>-				       u8 ampdu_time_type)</div><div class='del'>-{</div><div class='del'>-	switch (ra_mask_type) {</div><div class='del'>-	case 0: /* normal mode */</div><div class='del'>-		halbtc8822b1ant_update_ra_mask(btcoexist, force_exec, 0x0);</div><div class='del'>-		break;</div><div class='del'>-	case 1: /* disable cck 1/2 */</div><div class='del'>-		halbtc8822b1ant_update_ra_mask(btcoexist, force_exec,</div><div class='del'>-					       0x00000003);</div><div class='del'>-		break;</div><div class='del'>-	case 2: /* disable cck 1/2/5.5, ofdm 6/9/12/18/24, mcs 0/1/2/3/4 */</div><div class='del'>-		halbtc8822b1ant_update_ra_mask(btcoexist, force_exec,</div><div class='del'>-					       0x0001f1f7);</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'>-	halbtc8822b1ant_auto_rate_fallback_retry(btcoexist, force_exec,</div><div class='del'>-						 arfr_type);</div><div class='del'>-	halbtc8822b1ant_retry_limit(btcoexist, force_exec, retry_limit_type);</div><div class='del'>-	halbtc8822b1ant_ampdu_max_time(btcoexist, force_exec, ampdu_time_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * rx agg size setting :</div><div class='del'>- * 1:      true / don't care / don't care</div><div class='del'>- * max: false / false / don't care</div><div class='del'>- * 7:     false / true / 7</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_limited_rx(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool force_exec, bool rej_ap_agg_pkt,</div><div class='del'>-				       bool bt_ctrl_agg_buf_size,</div><div class='del'>-				       u8 agg_buf_size)</div><div class='del'>-{</div><div class='del'>-	bool reject_rx_agg = rej_ap_agg_pkt;</div><div class='del'>-	bool bt_ctrl_rx_agg_size = bt_ctrl_agg_buf_size;</div><div class='del'>-	u8 rx_agg_size = agg_buf_size;</div><div class='del'>-</div><div class='del'>-	/* ============================================ */</div><div class='del'>-	/*	Rx Aggregation related setting */</div><div class='del'>-	/* ============================================ */</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_TO_REJ_AP_AGG_PKT,</div><div class='del'>-			   &amp;reject_rx_agg);</div><div class='del'>-	/* decide BT control aggregation buf size or not */</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_CTRL_AGG_SIZE,</div><div class='del'>-			   &amp;bt_ctrl_rx_agg_size);</div><div class='del'>-	/* aggregation buf size, only work when BT control Rx aggregation size*/</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_U1_AGG_BUF_SIZE, &amp;rx_agg_size);</div><div class='del'>-	/* real update aggregation setting */</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_AGGREGATE_CTRL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_query_bt_info(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 h2c_parameter[1] = {0};</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], No query BT info because BT is disabled!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_parameter[0] |= BIT(0); /* trigger */</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x61, 1, h2c_parameter);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], WL query BT info!!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_monitor_bt_ctr(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u32 reg_hp_txrx, reg_lp_txrx, u32tmp;</div><div class='del'>-	u32 reg_hp_tx = 0, reg_hp_rx = 0, reg_lp_tx = 0, reg_lp_rx = 0;</div><div class='del'>-	static u8 num_of_bt_counter_chk, cnt_slave, cnt_autoslot_hang;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	reg_hp_txrx = 0x770;</div><div class='del'>-	reg_lp_txrx = 0x774;</div><div class='del'>-</div><div class='del'>-	u32tmp = btcoexist-&gt;btc_read_4byte(btcoexist, reg_hp_txrx);</div><div class='del'>-	reg_hp_tx = u32tmp &amp; MASKLWORD;</div><div class='del'>-	reg_hp_rx = (u32tmp &amp; MASKHWORD) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	u32tmp = btcoexist-&gt;btc_read_4byte(btcoexist, reg_lp_txrx);</div><div class='del'>-	reg_lp_tx = u32tmp &amp; MASKLWORD;</div><div class='del'>-	reg_lp_rx = (u32tmp &amp; MASKHWORD) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;high_priority_tx = reg_hp_tx;</div><div class='del'>-	coex_sta-&gt;high_priority_rx = reg_hp_rx;</div><div class='del'>-	coex_sta-&gt;low_priority_tx = reg_lp_tx;</div><div class='del'>-	coex_sta-&gt;low_priority_rx = reg_lp_rx;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], Hi-Pri Rx/Tx: %d/%d, Lo-Pri Rx/Tx: %d/%d\n",</div><div class='del'>-		 reg_hp_rx, reg_hp_tx, reg_lp_rx, reg_lp_tx);</div><div class='del'>-</div><div class='del'>-	/* reset counter */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x76e, 0xc);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;low_priority_tx &gt; 1150) &amp;&amp;</div><div class='del'>-	    (!coex_sta-&gt;c2h_bt_inquiry_page))</div><div class='del'>-		coex_sta-&gt;pop_event_cnt++;</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;low_priority_rx &gt;= 1150) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;low_priority_rx &gt;= coex_sta-&gt;low_priority_tx) &amp;&amp;</div><div class='del'>-	    (!coex_sta-&gt;under_ips) &amp;&amp; (!coex_sta-&gt;c2h_bt_inquiry_page) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;bt_link_exist)) {</div><div class='del'>-		if (cnt_slave &gt;= 3) {</div><div class='del'>-			bt_link_info-&gt;slave_role = true;</div><div class='del'>-			cnt_slave = 3;</div><div class='del'>-		} else {</div><div class='del'>-			cnt_slave++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (cnt_slave == 0) {</div><div class='del'>-			bt_link_info-&gt;slave_role = false;</div><div class='del'>-			cnt_slave = 0;</div><div class='del'>-		} else {</div><div class='del'>-			cnt_slave--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_tdma_btautoslot) {</div><div class='del'>-		if ((coex_sta-&gt;low_priority_tx &gt;= 1300) &amp;&amp;</div><div class='del'>-		    (coex_sta-&gt;low_priority_rx &lt;= 150)) {</div><div class='del'>-			if (cnt_autoslot_hang &gt;= 2) {</div><div class='del'>-				coex_sta-&gt;is_tdma_btautoslot_hang = true;</div><div class='del'>-				cnt_autoslot_hang = 2;</div><div class='del'>-			} else {</div><div class='del'>-				cnt_autoslot_hang++;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (cnt_autoslot_hang == 0) {</div><div class='del'>-				coex_sta-&gt;is_tdma_btautoslot_hang = false;</div><div class='del'>-				cnt_autoslot_hang = 0;</div><div class='del'>-			} else {</div><div class='del'>-				cnt_autoslot_hang--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;hid_only) {</div><div class='del'>-		if (coex_sta-&gt;low_priority_rx &gt; 50)</div><div class='del'>-			coex_sta-&gt;is_hid_low_pri_tx_overhead = true;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;is_hid_low_pri_tx_overhead = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;high_priority_tx == 0) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;high_priority_rx == 0) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;low_priority_tx == 0) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;low_priority_rx == 0)) {</div><div class='del'>-		num_of_bt_counter_chk++;</div><div class='del'>-</div><div class='del'>-		if (num_of_bt_counter_chk &gt;= 3) {</div><div class='del'>-			halbtc8822b1ant_query_bt_info(btcoexist);</div><div class='del'>-			num_of_bt_counter_chk = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_monitor_wifi_ctr(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	s32 wifi_rssi = 0;</div><div class='del'>-	bool wifi_busy = false, wifi_under_b_mode = false, wifi_scan = false;</div><div class='del'>-	static u8 cck_lock_counter, wl_noisy_count0, wl_noisy_count1 = 3,</div><div class='del'>-						     wl_noisy_count2;</div><div class='del'>-	u32 total_cnt, cck_cnt;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &amp;wifi_rssi);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-			   &amp;wifi_under_b_mode);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;wifi_scan);</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;crc_ok_cck = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_CCK");</div><div class='del'>-	coex_sta-&gt;crc_ok_11g = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_LEGACY");</div><div class='del'>-	coex_sta-&gt;crc_ok_11n = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_HT");</div><div class='del'>-	coex_sta-&gt;crc_ok_11n_vht = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_VHT");</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;crc_err_cck = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_CCK");</div><div class='del'>-	coex_sta-&gt;crc_err_11g = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_LEGACY");</div><div class='del'>-	coex_sta-&gt;crc_err_11n = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_HT");</div><div class='del'>-	coex_sta-&gt;crc_err_11n_vht = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_VHT");</div><div class='del'>-</div><div class='del'>-	cck_cnt = coex_sta-&gt;crc_ok_cck + coex_sta-&gt;crc_err_cck;</div><div class='del'>-</div><div class='del'>-	if (cck_cnt &gt; 250) {</div><div class='del'>-		if (wl_noisy_count2 &lt; 3)</div><div class='del'>-			wl_noisy_count2++;</div><div class='del'>-</div><div class='del'>-		if (wl_noisy_count2 == 3) {</div><div class='del'>-			wl_noisy_count0 = 0;</div><div class='del'>-			wl_noisy_count1 = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (cck_cnt &lt; 50) {</div><div class='del'>-		if (wl_noisy_count0 &lt; 3)</div><div class='del'>-			wl_noisy_count0++;</div><div class='del'>-</div><div class='del'>-		if (wl_noisy_count0 == 3) {</div><div class='del'>-			wl_noisy_count1 = 0;</div><div class='del'>-			wl_noisy_count2 = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		if (wl_noisy_count1 &lt; 3)</div><div class='del'>-			wl_noisy_count1++;</div><div class='del'>-</div><div class='del'>-		if (wl_noisy_count1 == 3) {</div><div class='del'>-			wl_noisy_count0 = 0;</div><div class='del'>-			wl_noisy_count2 = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wl_noisy_count2 == 3)</div><div class='del'>-		coex_sta-&gt;wl_noisy_level = 2;</div><div class='del'>-	else if (wl_noisy_count1 == 3)</div><div class='del'>-		coex_sta-&gt;wl_noisy_level = 1;</div><div class='del'>-	else</div><div class='del'>-		coex_sta-&gt;wl_noisy_level = 0;</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (wifi_rssi &gt;= 30) &amp;&amp; (!wifi_under_b_mode)) {</div><div class='del'>-		total_cnt = coex_sta-&gt;crc_ok_cck + coex_sta-&gt;crc_ok_11g +</div><div class='del'>-			    coex_sta-&gt;crc_ok_11n + coex_sta-&gt;crc_ok_11n_vht;</div><div class='del'>-</div><div class='del'>-		if ((coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) ||</div><div class='del'>-		    (coex_dm-&gt;bt_status ==</div><div class='del'>-		     BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY) ||</div><div class='del'>-		    (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_SCO_BUSY)) {</div><div class='del'>-			if (coex_sta-&gt;crc_ok_cck &gt;</div><div class='del'>-			    (total_cnt - coex_sta-&gt;crc_ok_cck)) {</div><div class='del'>-				if (cck_lock_counter &lt; 3)</div><div class='del'>-					cck_lock_counter++;</div><div class='del'>-			} else {</div><div class='del'>-				if (cck_lock_counter &gt; 0)</div><div class='del'>-					cck_lock_counter--;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			if (cck_lock_counter &gt; 0)</div><div class='del'>-				cck_lock_counter--;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (cck_lock_counter &gt; 0)</div><div class='del'>-			cck_lock_counter--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;pre_ccklock) {</div><div class='del'>-		if (cck_lock_counter &gt;= 3)</div><div class='del'>-			coex_sta-&gt;cck_lock = true;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;cck_lock = false;</div><div class='del'>-	} else {</div><div class='del'>-		if (cck_lock_counter == 0)</div><div class='del'>-			coex_sta-&gt;cck_lock = false;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;cck_lock = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;cck_lock)</div><div class='del'>-		coex_sta-&gt;cck_ever_lock = true;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;pre_ccklock = coex_sta-&gt;cck_lock;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-halbtc8822b1ant_is_wifi_status_changed(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static bool pre_wifi_busy, pre_under_4way, pre_bt_hs_on,</div><div class='del'>-		pre_rf4ce_enabled, pre_bt_off, pre_bt_slave,</div><div class='del'>-		pre_hid_low_pri_tx_overhead, pre_wifi_under_lps,</div><div class='del'>-		pre_bt_setup_link;</div><div class='del'>-	static u8 pre_hid_busy_num, pre_wl_noisy_level;</div><div class='del'>-	bool wifi_busy = false, under_4way = false, bt_hs_on = false,</div><div class='del'>-	     rf4ce_enabled = false;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-			   &amp;under_4way);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled != pre_bt_off) {</div><div class='del'>-		pre_bt_off = coex_sta-&gt;bt_disabled;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_disabled)</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], BT is disabled !!\n");</div><div class='del'>-		else</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], BT is enabled !!\n");</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;bt_coex_supported_feature = 0;</div><div class='del'>-		coex_sta-&gt;bt_coex_supported_version = 0;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_RF4CE_CONNECTED,</div><div class='del'>-			   &amp;rf4ce_enabled);</div><div class='del'>-</div><div class='del'>-	if (rf4ce_enabled != pre_rf4ce_enabled) {</div><div class='del'>-		pre_rf4ce_enabled = rf4ce_enabled;</div><div class='del'>-</div><div class='del'>-		if (rf4ce_enabled)</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], rf4ce is enabled !!\n");</div><div class='del'>-		else</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], rf4ce is disabled !!\n");</div><div class='del'>-</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wifi_connected) {</div><div class='del'>-		if (wifi_busy != pre_wifi_busy) {</div><div class='del'>-			pre_wifi_busy = wifi_busy;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (under_4way != pre_under_4way) {</div><div class='del'>-			pre_under_4way = under_4way;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (bt_hs_on != pre_bt_hs_on) {</div><div class='del'>-			pre_bt_hs_on = bt_hs_on;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (coex_sta-&gt;wl_noisy_level != pre_wl_noisy_level) {</div><div class='del'>-			pre_wl_noisy_level = coex_sta-&gt;wl_noisy_level;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (coex_sta-&gt;under_lps != pre_wifi_under_lps) {</div><div class='del'>-			pre_wifi_under_lps = coex_sta-&gt;under_lps;</div><div class='del'>-			if (coex_sta-&gt;under_lps)</div><div class='del'>-				return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;bt_disabled) {</div><div class='del'>-		if (coex_sta-&gt;hid_busy_num != pre_hid_busy_num) {</div><div class='del'>-			pre_hid_busy_num = coex_sta-&gt;hid_busy_num;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bt_link_info-&gt;slave_role != pre_bt_slave) {</div><div class='del'>-			pre_bt_slave = bt_link_info-&gt;slave_role;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pre_hid_low_pri_tx_overhead !=</div><div class='del'>-		    coex_sta-&gt;is_hid_low_pri_tx_overhead) {</div><div class='del'>-			pre_hid_low_pri_tx_overhead =</div><div class='del'>-				coex_sta-&gt;is_hid_low_pri_tx_overhead;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pre_bt_setup_link != coex_sta-&gt;is_setup_link) {</div><div class='del'>-			pre_bt_setup_link = coex_sta-&gt;is_setup_link;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_update_bt_link_info(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	bool bt_busy = false;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;num_of_profile = 0;</div><div class='del'>-</div><div class='del'>-	/* set link exist status */</div><div class='del'>-	if (!(coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_CONNECTION)) {</div><div class='del'>-		coex_sta-&gt;bt_link_exist = false;</div><div class='del'>-		coex_sta-&gt;pan_exist = false;</div><div class='del'>-		coex_sta-&gt;a2dp_exist = false;</div><div class='del'>-		coex_sta-&gt;hid_exist = false;</div><div class='del'>-		coex_sta-&gt;sco_exist = false;</div><div class='del'>-	} else { /* connection exists */</div><div class='del'>-		coex_sta-&gt;bt_link_exist = true;</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_FTP) {</div><div class='del'>-			coex_sta-&gt;pan_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;pan_exist = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_A2DP) {</div><div class='del'>-			coex_sta-&gt;a2dp_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;a2dp_exist = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_HID) {</div><div class='del'>-			coex_sta-&gt;hid_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;hid_exist = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_SCO_ESCO) {</div><div class='del'>-			coex_sta-&gt;sco_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;sco_exist = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-</div><div class='del'>-	bt_link_info-&gt;bt_link_exist = coex_sta-&gt;bt_link_exist;</div><div class='del'>-	bt_link_info-&gt;sco_exist = coex_sta-&gt;sco_exist;</div><div class='del'>-	bt_link_info-&gt;a2dp_exist = coex_sta-&gt;a2dp_exist;</div><div class='del'>-	bt_link_info-&gt;pan_exist = coex_sta-&gt;pan_exist;</div><div class='del'>-	bt_link_info-&gt;hid_exist = coex_sta-&gt;hid_exist;</div><div class='del'>-	bt_link_info-&gt;acl_busy = coex_sta-&gt;acl_busy;</div><div class='del'>-</div><div class='del'>-	/* work around for HS mode. */</div><div class='del'>-	if (bt_hs_on) {</div><div class='del'>-		bt_link_info-&gt;pan_exist = true;</div><div class='del'>-		bt_link_info-&gt;bt_link_exist = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if Sco only */</div><div class='del'>-	if (bt_link_info-&gt;sco_exist &amp;&amp; !bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    !bt_link_info-&gt;pan_exist &amp;&amp; !bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;sco_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;sco_only = false;</div><div class='del'>-</div><div class='del'>-	/* check if A2dp only */</div><div class='del'>-	if (!bt_link_info-&gt;sco_exist &amp;&amp; bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    !bt_link_info-&gt;pan_exist &amp;&amp; !bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;a2dp_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;a2dp_only = false;</div><div class='del'>-</div><div class='del'>-	/* check if Pan only */</div><div class='del'>-	if (!bt_link_info-&gt;sco_exist &amp;&amp; !bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    bt_link_info-&gt;pan_exist &amp;&amp; !bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;pan_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;pan_only = false;</div><div class='del'>-</div><div class='del'>-	/* check if Hid only */</div><div class='del'>-	if (!bt_link_info-&gt;sco_exist &amp;&amp; !bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    !bt_link_info-&gt;pan_exist &amp;&amp; bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;hid_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;hid_only = false;</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_INQ_PAGE) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_INQ_PAGE;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT Inq/page!!!\n");</div><div class='del'>-	} else if (!(coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_CONNECTION)) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_NON_CONNECTED_IDLE;</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], BtInfoNotify(), BT Non-Connected idle!!!\n");</div><div class='del'>-	} else if (coex_sta-&gt;bt_info == BT_INFO_8822B_1ANT_B_CONNECTION) {</div><div class='del'>-		/* connection exists but no busy */</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_CONNECTED_IDLE;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT Connected-idle!!!\n");</div><div class='del'>-	} else if (((coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_SCO_ESCO) ||</div><div class='del'>-		    (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_SCO_BUSY)) &amp;&amp;</div><div class='del'>-		   (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_ACL_BUSY)) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT ACL SCO busy!!!\n");</div><div class='del'>-	} else if ((coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_SCO_ESCO) ||</div><div class='del'>-		   (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_SCO_BUSY)) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_SCO_BUSY;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT SCO busy!!!\n");</div><div class='del'>-	} else if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_ACL_BUSY) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_ACL_BUSY;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT ACL busy!!!\n");</div><div class='del'>-	} else {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_1ANT_BT_STATUS_MAX;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT Non-Defined state!!!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_SCO_BUSY) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY))</div><div class='del'>-		bt_busy = true;</div><div class='del'>-	else</div><div class='del'>-		bt_busy = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_TRAFFIC_BUSY, &amp;bt_busy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_update_wifi_ch_info(struct btc_coexist *btcoexist,</div><div class='del'>-						u8 type)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_parameter[3] = {0};</div><div class='del'>-	u32 wifi_bw;</div><div class='del'>-	u8 wifi_central_chnl;</div><div class='del'>-</div><div class='del'>-	/* only 2.4G we need to inform bt the chnl mask */</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL,</div><div class='del'>-			   &amp;wifi_central_chnl);</div><div class='del'>-	if ((type == BTC_MEDIA_CONNECT) &amp;&amp; (wifi_central_chnl &lt;= 14)) {</div><div class='del'>-		/* enable BT AFH skip WL channel for 8822b</div><div class='del'>-		 * because BT Rx LO interference</div><div class='del'>-		 */</div><div class='del'>-		h2c_parameter[0] = 0x1;</div><div class='del'>-		h2c_parameter[1] = wifi_central_chnl;</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-		if (wifi_bw == BTC_WIFI_BW_HT40)</div><div class='del'>-			h2c_parameter[2] = 0x30;</div><div class='del'>-		else</div><div class='del'>-			h2c_parameter[2] = 0x20;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;wifi_chnl_info[0] = h2c_parameter[0];</div><div class='del'>-	coex_dm-&gt;wifi_chnl_info[1] = h2c_parameter[1];</div><div class='del'>-	coex_dm-&gt;wifi_chnl_info[2] = h2c_parameter[2];</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x66, 3, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 halbtc8822b1ant_action_algorithm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	u8 algorithm = BT_8822B_1ANT_COEX_ALGO_UNDEFINED;</div><div class='del'>-	u8 num_of_diff_profile = 0;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-</div><div class='del'>-	if (!bt_link_info-&gt;bt_link_exist) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], No BT link exists!!!\n");</div><div class='del'>-		return algorithm;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;sco_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-	if (bt_link_info-&gt;hid_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-	if (bt_link_info-&gt;pan_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-	if (bt_link_info-&gt;a2dp_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-</div><div class='del'>-	if (num_of_diff_profile == 1) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], BT Profile = SCO only\n");</div><div class='del'>-			algorithm = BT_8822B_1ANT_COEX_ALGO_SCO;</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], BT Profile = HID only\n");</div><div class='del'>-				algorithm = BT_8822B_1ANT_COEX_ALGO_HID;</div><div class='del'>-			} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], BT Profile = A2DP only\n");</div><div class='del'>-				algorithm = BT_8822B_1ANT_COEX_ALGO_A2DP;</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = PAN(HS) only\n");</div><div class='del'>-					algorithm =</div><div class='del'>-						BT_8822B_1ANT_COEX_ALGO_PANHS;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = PAN(EDR) only\n");</div><div class='del'>-					algorithm =</div><div class='del'>-						BT_8822B_1ANT_COEX_ALGO_PANEDR;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (num_of_diff_profile == 2) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], BT Profile = SCO + HID\n");</div><div class='del'>-				algorithm = BT_8822B_1ANT_COEX_ALGO_HID;</div><div class='del'>-			} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], BT Profile = SCO + A2DP ==&gt; SCO\n");</div><div class='del'>-				algorithm = BT_8822B_1ANT_COEX_ALGO_SCO;</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + PAN(HS)\n");</div><div class='del'>-					algorithm = BT_8822B_1ANT_COEX_ALGO_SCO;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], BT Profile = HID + A2DP\n");</div><div class='del'>-				algorithm = BT_8822B_1ANT_COEX_ALGO_HID_A2DP;</div><div class='del'>-			} else if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = HID + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_HID_A2DP;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = HID + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_A2DP_PANHS;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = A2DP + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_PANEDR_A2DP;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (num_of_diff_profile == 3) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], BT Profile = SCO + HID + A2DP ==&gt; HID\n");</div><div class='del'>-				algorithm = BT_8822B_1ANT_COEX_ALGO_HID;</div><div class='del'>-			} else if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + HID + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_HID_A2DP;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + HID + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm = BT_8822B_1ANT_COEX_ALGO_SCO;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + A2DP + PAN(EDR) ==&gt; HID\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = HID + A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_HID_A2DP;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = HID + A2DP + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					BT_8822B_1ANT_COEX_ALGO_HID_A2DP_PANEDR;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (num_of_diff_profile &gt;= 3) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], Error!!! BT Profile = SCO + HID + A2DP + PAN(HS)\n");</div><div class='del'>-</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT Profile = SCO + HID + A2DP + PAN(EDR)==&gt;PAN(EDR)+HID\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_1ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return algorithm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_low_penalty_ra(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool force_exec, bool low_penalty_ra)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_low_penalty_ra = low_penalty_ra;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_low_penalty_ra == coex_dm-&gt;cur_low_penalty_ra)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (low_penalty_ra)</div><div class='del'>-		btcoexist-&gt;btc_phydm_modify_ra_pcr_threshold(btcoexist, 0, 25);</div><div class='del'>-	else</div><div class='del'>-		btcoexist-&gt;btc_phydm_modify_ra_pcr_threshold(btcoexist, 0, 0);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_low_penalty_ra = coex_dm-&gt;cur_low_penalty_ra;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_write_score_board(struct btc_coexist *btcoexist,</div><div class='del'>-					      u16 bitpos, bool state)</div><div class='del'>-{</div><div class='del'>-	static u16 originalval = 0x8002;</div><div class='del'>-</div><div class='del'>-	if (state)</div><div class='del'>-		originalval = originalval | bitpos;</div><div class='del'>-	else</div><div class='del'>-		originalval = originalval &amp; (~bitpos);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_2byte(btcoexist, 0xaa, originalval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_read_score_board(struct btc_coexist *btcoexist,</div><div class='del'>-					     u16 *score_board_val)</div><div class='del'>-{</div><div class='del'>-	*score_board_val =</div><div class='del'>-		(btcoexist-&gt;btc_read_2byte(btcoexist, 0xaa)) &amp; 0x7fff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_post_state_to_bt(struct btc_coexist *btcoexist,</div><div class='del'>-					     u16 type, bool state)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b1ant_write_score_board(btcoexist, (u16)type, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_monitor_bt_enable_disable(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u32 bt_disable_cnt;</div><div class='del'>-	bool bt_active = true, bt_disabled = false, wifi_under_5g = false;</div><div class='del'>-	u16 u16tmp;</div><div class='del'>-</div><div class='del'>-	/* This function check if bt is disabled */</div><div class='del'>-</div><div class='del'>-	/* Read BT on/off status from scoreboard[1],</div><div class='del'>-	 * enable this only if BT patch support this feature</div><div class='del'>-	 */</div><div class='del'>-	halbtc8822b1ant_read_score_board(btcoexist, &amp;u16tmp);</div><div class='del'>-</div><div class='del'>-	bt_active = u16tmp &amp; BIT(1);</div><div class='del'>-</div><div class='del'>-	if (bt_active) {</div><div class='del'>-		bt_disable_cnt = 0;</div><div class='del'>-		bt_disabled = false;</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_DISABLE,</div><div class='del'>-				   &amp;bt_disabled);</div><div class='del'>-	} else {</div><div class='del'>-		bt_disable_cnt++;</div><div class='del'>-		if (bt_disable_cnt &gt;= 2) {</div><div class='del'>-			bt_disabled = true;</div><div class='del'>-			bt_disable_cnt = 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_DISABLE,</div><div class='del'>-				   &amp;bt_disabled);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if ((wifi_under_5g) || (bt_disabled))</div><div class='del'>-		halbtc8822b1ant_low_penalty_ra(btcoexist, NORMAL_EXEC, false);</div><div class='del'>-	else</div><div class='del'>-		halbtc8822b1ant_low_penalty_ra(btcoexist, NORMAL_EXEC, true);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled != bt_disabled) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is from %s to %s!!\n",</div><div class='del'>-			 (coex_sta-&gt;bt_disabled ? "disabled" : "enabled"),</div><div class='del'>-			 (bt_disabled ? "disabled" : "enabled"));</div><div class='del'>-		coex_sta-&gt;bt_disabled = bt_disabled;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_enable_gnt_to_gpio(struct btc_coexist *btcoexist,</div><div class='del'>-					       bool isenable)</div><div class='del'>-{</div><div class='del'>-	static u8 bit_val[5] = {0, 0, 0, 0, 0};</div><div class='del'>-	static bool state;</div><div class='del'>-</div><div class='del'>-	if (!btcoexist-&gt;dbg_mode_1ant)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (state == isenable)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	state = isenable;</div><div class='del'>-</div><div class='del'>-	if (isenable) {</div><div class='del'>-		/* enable GNT_WL, GNT_BT to GPIO for debug */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x73, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-		/* store original value */</div><div class='del'>-		bit_val[0] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x66) &amp; BIT(4)) &gt;&gt;</div><div class='del'>-			4; /*0x66[4] */</div><div class='del'>-		bit_val[1] = (btcoexist-&gt;btc_read_1byte(btcoexist, 0x67) &amp;</div><div class='del'>-			      BIT(0)); /*0x66[8] */</div><div class='del'>-		bit_val[2] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x42) &amp; BIT(3)) &gt;&gt;</div><div class='del'>-			3; /*0x40[19] */</div><div class='del'>-		bit_val[3] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x65) &amp; BIT(7)) &gt;&gt;</div><div class='del'>-			7; /*0x64[15] */</div><div class='del'>-		bit_val[4] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x72) &amp; BIT(2)) &gt;&gt;</div><div class='del'>-			2; /*0x70[18] */</div><div class='del'>-</div><div class='del'>-		/*  switch GPIO Mux */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x66, BIT(4),</div><div class='del'>-						   0x0); /*0x66[4] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x67, BIT(0),</div><div class='del'>-						   0x0); /*0x66[8] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x42, BIT(3),</div><div class='del'>-						   0x0); /*0x40[19] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x65, BIT(7),</div><div class='del'>-						   0x0); /*0x64[15] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x72, BIT(2),</div><div class='del'>-						   0x0); /*0x70[18] = 0 */</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x73, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-		/*  Restore original value  */</div><div class='del'>-		/*  switch GPIO Mux */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x66, BIT(4),</div><div class='del'>-						   bit_val[0]); /*0x66[4] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x67, BIT(0),</div><div class='del'>-						   bit_val[1]); /*0x66[8] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x42, BIT(3), bit_val[2]); /*0x40[19] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x65, BIT(7), bit_val[3]); /*0x64[15] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x72, BIT(2), bit_val[4]); /*0x70[18] = 0 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-halbtc8822b1ant_ltecoex_indirect_read_reg(struct btc_coexist *btcoexist,</div><div class='del'>-					  u16 reg_addr)</div><div class='del'>-{</div><div class='del'>-	u32 delay_count = 0;</div><div class='del'>-</div><div class='del'>-	/* wait for ready bit before access 0x1700 */</div><div class='del'>-	while (1) {</div><div class='del'>-		if ((btcoexist-&gt;btc_read_1byte(btcoexist, 0x1703) &amp; BIT(5)) ==</div><div class='del'>-		    0) {</div><div class='del'>-			mdelay(50);</div><div class='del'>-			delay_count++;</div><div class='del'>-			if (delay_count &gt;= 10) {</div><div class='del'>-				delay_count = 0;</div><div class='del'>-				break;</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'>-</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x1700, 0x800F0000 | reg_addr);</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;btc_read_4byte(btcoexist, 0x1708); /* get read data */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_ltecoex_indirect_write_reg(struct btc_coexist *btcoexist,</div><div class='del'>-					   u16 reg_addr, u32 bit_mask,</div><div class='del'>-					   u32 reg_value)</div><div class='del'>-{</div><div class='del'>-	u32 val, i = 0, bitpos = 0, delay_count = 0;</div><div class='del'>-</div><div class='del'>-	if (bit_mask == 0x0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (bit_mask == 0xffffffff) {</div><div class='del'>-		/* wait for ready bit before access 0x1700/0x1704 */</div><div class='del'>-		while (1) {</div><div class='del'>-			if ((btcoexist-&gt;btc_read_1byte(btcoexist, 0x1703) &amp;</div><div class='del'>-			     BIT(5)) == 0) {</div><div class='del'>-				mdelay(50);</div><div class='del'>-				delay_count++;</div><div class='del'>-				if (delay_count &gt;= 10) {</div><div class='del'>-					delay_count = 0;</div><div class='del'>-					break;</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'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1704,</div><div class='del'>-					   reg_value); /* put write data */</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1700,</div><div class='del'>-					   0xc00F0000 | reg_addr);</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt;= 31; i++) {</div><div class='del'>-			if (((bit_mask &gt;&gt; i) &amp; 0x1) == 0x1) {</div><div class='del'>-				bitpos = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* read back register value before write */</div><div class='del'>-		val = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								reg_addr);</div><div class='del'>-		val = (val &amp; (~bit_mask)) | (reg_value &lt;&lt; bitpos);</div><div class='del'>-</div><div class='del'>-		/* wait for ready bit before access 0x1700/0x1704 */</div><div class='del'>-		while (1) {</div><div class='del'>-			if ((btcoexist-&gt;btc_read_1byte(btcoexist, 0x1703) &amp;</div><div class='del'>-			     BIT(5)) == 0) {</div><div class='del'>-				mdelay(50);</div><div class='del'>-				delay_count++;</div><div class='del'>-				if (delay_count &gt;= 10) {</div><div class='del'>-					delay_count = 0;</div><div class='del'>-					break;</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'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1704,</div><div class='del'>-					   val); /* put write data */</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1700,</div><div class='del'>-					   0xc00F0000 | reg_addr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ltecoex_enable(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool enable)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	val = (enable) ? 1 : 0;</div><div class='del'>-	/* 0x38[7] */</div><div class='del'>-	halbtc8822b1ant_ltecoex_indirect_write_reg(btcoexist, 0x38, 0x80, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_ltecoex_pathcontrol_owner(struct btc_coexist *btcoexist,</div><div class='del'>-					  bool wifi_control)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	val = (wifi_control) ? 1 : 0;</div><div class='del'>-	/* 0x70[26] */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x73, 0x4, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ltecoex_set_gnt_bt(struct btc_coexist *btcoexist,</div><div class='del'>-					       u8 control_block,</div><div class='del'>-					       bool sw_control, u8 state)</div><div class='del'>-{</div><div class='del'>-	u32 val = 0, bit_mask;</div><div class='del'>-</div><div class='del'>-	state = state &amp; 0x1;</div><div class='del'>-	/*LTE indirect 0x38=0xccxx (sw : gnt_wl=1,sw gnt_bt=1)</div><div class='del'>-	 *0x38=0xddxx (sw : gnt_bt=1 , sw gnt_wl=0)</div><div class='del'>-	 *0x38=0x55xx(hw pta :gnt_wl /gnt_bt )</div><div class='del'>-	 */</div><div class='del'>-	val = (sw_control) ? ((state &lt;&lt; 1) | 0x1) : 0;</div><div class='del'>-</div><div class='del'>-	switch (control_block) {</div><div class='del'>-	case BT_8822B_1ANT_GNT_BLOCK_RFC_BB:</div><div class='del'>-	default:</div><div class='del'>-		bit_mask = 0xc000;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[15:14] */</div><div class='del'>-		bit_mask = 0x0c00;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[11:10] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_GNT_BLOCK_RFC:</div><div class='del'>-		bit_mask = 0xc000;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[15:14] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_GNT_BLOCK_BB:</div><div class='del'>-		bit_mask = 0x0c00;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[11:10] */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ltecoex_set_gnt_wl(struct btc_coexist *btcoexist,</div><div class='del'>-					       u8 control_block,</div><div class='del'>-					       bool sw_control, u8 state)</div><div class='del'>-{</div><div class='del'>-	u32 val = 0, bit_mask;</div><div class='del'>-	/*LTE indirect 0x38=0xccxx (sw : gnt_wl=1,sw gnt_bt=1)</div><div class='del'>-	 *0x38=0xddxx (sw : gnt_bt=1 , sw gnt_wl=0)</div><div class='del'>-	 *0x38=0x55xx(hw pta :gnt_wl /gnt_bt )</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	state = state &amp; 0x1;</div><div class='del'>-	val = (sw_control) ? ((state &lt;&lt; 1) | 0x1) : 0;</div><div class='del'>-</div><div class='del'>-	switch (control_block) {</div><div class='del'>-	case BT_8822B_1ANT_GNT_BLOCK_RFC_BB:</div><div class='del'>-	default:</div><div class='del'>-		bit_mask = 0x3000;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[13:12] */</div><div class='del'>-		bit_mask = 0x0300;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[9:8] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_GNT_BLOCK_RFC:</div><div class='del'>-		bit_mask = 0x3000;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[13:12] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_GNT_BLOCK_BB:</div><div class='del'>-		bit_mask = 0x0300;</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[9:8] */</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'>-halbtc8822b1ant_ltecoex_set_coex_table(struct btc_coexist *btcoexist,</div><div class='del'>-				       u8 table_type, u16 table_content)</div><div class='del'>-{</div><div class='del'>-	u16 reg_addr = 0x0000;</div><div class='del'>-</div><div class='del'>-	switch (table_type) {</div><div class='del'>-	case BT_8822B_1ANT_CTT_WL_VS_LTE:</div><div class='del'>-		reg_addr = 0xa0;</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_CTT_BT_VS_LTE:</div><div class='del'>-		reg_addr = 0xa4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reg_addr != 0x0000)</div><div class='del'>-		halbtc8822b1ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, reg_addr, 0xffff,</div><div class='del'>-			table_content); /* 0xa0[15:0] or 0xa4[15:0] */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_wltoggle_coex_table(</div><div class='del'>-	struct btc_coexist *btcoexist, bool force_exec, u8 interval,</div><div class='del'>-	u8 val0x6c4_b0, u8 val0x6c4_b1, u8 val0x6c4_b2, u8 val0x6c4_b3)</div><div class='del'>-{</div><div class='del'>-	static u8 pre_h2c_parameter[6] = {0};</div><div class='del'>-	u8 cur_h2c_parameter[6] = {0};</div><div class='del'>-	u8 i, match_cnt = 0;</div><div class='del'>-</div><div class='del'>-	cur_h2c_parameter[0] = 0x7; /* op_code, 0x7= wlan toggle slot*/</div><div class='del'>-</div><div class='del'>-	cur_h2c_parameter[1] = interval;</div><div class='del'>-	cur_h2c_parameter[2] = val0x6c4_b0;</div><div class='del'>-	cur_h2c_parameter[3] = val0x6c4_b1;</div><div class='del'>-	cur_h2c_parameter[4] = val0x6c4_b2;</div><div class='del'>-	cur_h2c_parameter[5] = val0x6c4_b3;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		for (i = 1; i &lt;= 5; i++) {</div><div class='del'>-			if (cur_h2c_parameter[i] != pre_h2c_parameter[i])</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			match_cnt++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (match_cnt == 5)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt;= 5; i++)</div><div class='del'>-		pre_h2c_parameter[i] = cur_h2c_parameter[i];</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x69, 6, cur_h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_coex_table(struct btc_coexist *btcoexist,</div><div class='del'>-					   u32 val0x6c0, u32 val0x6c4,</div><div class='del'>-					   u32 val0x6c8, u8 val0x6cc)</div><div class='del'>-{</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x6c0, val0x6c0);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x6c4, val0x6c4);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x6c8, val0x6c8);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cc, val0x6cc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_coex_table(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool force_exec, u32 val0x6c0,</div><div class='del'>-				       u32 val0x6c4, u32 val0x6c8, u8 val0x6cc)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_val0x6c0 = val0x6c0;</div><div class='del'>-	coex_dm-&gt;cur_val0x6c4 = val0x6c4;</div><div class='del'>-	coex_dm-&gt;cur_val0x6c8 = val0x6c8;</div><div class='del'>-	coex_dm-&gt;cur_val0x6cc = val0x6cc;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if ((coex_dm-&gt;pre_val0x6c0 == coex_dm-&gt;cur_val0x6c0) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_val0x6c4 == coex_dm-&gt;cur_val0x6c4) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_val0x6c8 == coex_dm-&gt;cur_val0x6c8) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_val0x6cc == coex_dm-&gt;cur_val0x6cc))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b1ant_set_coex_table(btcoexist, val0x6c0, val0x6c4, val0x6c8,</div><div class='del'>-				       val0x6cc);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_val0x6c0 = coex_dm-&gt;cur_val0x6c0;</div><div class='del'>-	coex_dm-&gt;pre_val0x6c4 = coex_dm-&gt;cur_val0x6c4;</div><div class='del'>-	coex_dm-&gt;pre_val0x6c8 = coex_dm-&gt;cur_val0x6c8;</div><div class='del'>-	coex_dm-&gt;pre_val0x6cc = coex_dm-&gt;cur_val0x6cc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_coex_table_with_type(struct btc_coexist *btcoexist,</div><div class='del'>-						 bool force_exec, u8 type)</div><div class='del'>-{</div><div class='del'>-	u32 break_table;</div><div class='del'>-	u8 select_table;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;coex_table_type = type;</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;concurrent_rx_mode_on) {</div><div class='del'>-		break_table = 0xf0ffffff; /* set WL hi-pri can break BT */</div><div class='del'>-		select_table = 0x3; /* set Tx response = Hi-Pri</div><div class='del'>-				     * (ex: Transmitting ACK,BA,CTS)</div><div class='del'>-				     */</div><div class='del'>-	} else {</div><div class='del'>-		break_table = 0xffffff;</div><div class='del'>-		select_table = 0x3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case 0:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x55555555, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x5a5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaa5a5a5a,</div><div class='del'>-					   0xaa5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0xaa5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaa555555,</div><div class='del'>-					   0xaa5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x5a5a5a5a,</div><div class='del'>-					   0x5a5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0xaaaaaaaa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaaaaaaaa,</div><div class='del'>-					   0xaaaaaaaa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xffffffff,</div><div class='del'>-					   0xffffffff, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 9:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x5a5a5555,</div><div class='del'>-					   0xaaaa5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 10:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaaaa5aaa,</div><div class='del'>-					   0xaaaa5aaa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 11:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaaaaa5aa,</div><div class='del'>-					   0xaaaaaaaa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 12:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaaaaa5aa,</div><div class='del'>-					   0xaaaaa5aa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 13:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0xaaaa5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 14:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x5a5a555a,</div><div class='del'>-					   0xaaaa5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 15:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0xaaaa55aa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 16:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x5a5a555a,</div><div class='del'>-					   0x5a5a555a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 17:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xaaaa55aa,</div><div class='del'>-					   0xaaaa55aa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 18:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x5aaa5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 19:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0xa5555555,</div><div class='del'>-					   0xaaaa5aaa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 20:</div><div class='del'>-		halbtc8822b1ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0xaaaa5aaa, break_table,</div><div class='del'>-					   select_table);</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</div><div class='del'>-halbtc8822b1ant_set_fw_ignore_wlan_act(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool enable)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_parameter[1] = {0};</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		h2c_parameter[0] |= BIT(0); /* function enable */</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x63, 1, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ignore_wlan_act(struct btc_coexist *btcoexist,</div><div class='del'>-					    bool force_exec, bool enable)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_ignore_wlan_act = enable;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_ignore_wlan_act ==</div><div class='del'>-		    coex_dm-&gt;cur_ignore_wlan_act) {</div><div class='del'>-			coex_dm-&gt;pre_ignore_wlan_act =</div><div class='del'>-				coex_dm-&gt;cur_ignore_wlan_act;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_fw_ignore_wlan_act(btcoexist, enable);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_ignore_wlan_act = coex_dm-&gt;cur_ignore_wlan_act;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_lps_rpwm(struct btc_coexist *btcoexist,</div><div class='del'>-					 u8 lps_val, u8 rpwm_val)</div><div class='del'>-{</div><div class='del'>-	u8 lps = lps_val;</div><div class='del'>-	u8 rpwm = rpwm_val;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_U1_LPS_VAL, &amp;lps);</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_U1_RPWM_VAL, &amp;rpwm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_lps_rpwm(struct btc_coexist *btcoexist,</div><div class='del'>-				     bool force_exec, u8 lps_val, u8 rpwm_val)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_lps = lps_val;</div><div class='del'>-	coex_dm-&gt;cur_rpwm = rpwm_val;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if ((coex_dm-&gt;pre_lps == coex_dm-&gt;cur_lps) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_rpwm == coex_dm-&gt;cur_rpwm))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b1ant_set_lps_rpwm(btcoexist, lps_val, rpwm_val);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_lps = coex_dm-&gt;cur_lps;</div><div class='del'>-	coex_dm-&gt;pre_rpwm = coex_dm-&gt;cur_rpwm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ps_tdma_check_for_power_save_state(</div><div class='del'>-	struct btc_coexist *btcoexist, bool new_ps_state)</div><div class='del'>-{</div><div class='del'>-	u8 lps_mode = 0x0;</div><div class='del'>-	u8 h2c_parameter[5] = {0x8, 0, 0, 0, 0};</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_LPS_MODE, &amp;lps_mode);</div><div class='del'>-</div><div class='del'>-	if (lps_mode) { /* already under LPS state */</div><div class='del'>-		if (new_ps_state) {</div><div class='del'>-			/* keep state under LPS, do nothing. */</div><div class='del'>-		} else {</div><div class='del'>-			/* will leave LPS state, turn off psTdma first */</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_fill_h2c(btcoexist, 0x60, 5,</div><div class='del'>-						h2c_parameter);</div><div class='del'>-		}</div><div class='del'>-	} else { /* NO PS state */</div><div class='del'>-		if (new_ps_state) {</div><div class='del'>-			/* will enter LPS state, turn off psTdma first */</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_fill_h2c(btcoexist, 0x60, 5,</div><div class='del'>-						h2c_parameter);</div><div class='del'>-		} else {</div><div class='del'>-			/* keep state under NO PS state, do nothing. */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool halbtc8822b1ant_power_save_state(struct btc_coexist *btcoexist,</div><div class='del'>-					     u8 ps_type, u8 lps_val,</div><div class='del'>-					     u8 rpwm_val)</div><div class='del'>-{</div><div class='del'>-	bool low_pwr_disable = false, result = true;</div><div class='del'>-</div><div class='del'>-	switch (ps_type) {</div><div class='del'>-	case BTC_PS_WIFI_NATIVE:</div><div class='del'>-		/* recover to original 32k low power setting */</div><div class='del'>-		coex_sta-&gt;force_lps_ctrl = false;</div><div class='del'>-		low_pwr_disable = false;</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_DISABLE_LOW_POWER,</div><div class='del'>-				   &amp;low_pwr_disable);</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_NORMAL_LPS, NULL);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_PS_LPS_ON:</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;force_lps_ctrl = true;</div><div class='del'>-		halbtc8822b1ant_ps_tdma_check_for_power_save_state(btcoexist,</div><div class='del'>-								   true);</div><div class='del'>-		halbtc8822b1ant_lps_rpwm(btcoexist, NORMAL_EXEC, lps_val,</div><div class='del'>-					 rpwm_val);</div><div class='del'>-		/* when coex force to enter LPS, do not enter 32k low power. */</div><div class='del'>-		low_pwr_disable = true;</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_DISABLE_LOW_POWER,</div><div class='del'>-				   &amp;low_pwr_disable);</div><div class='del'>-		/* power save must executed before psTdma. */</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_ENTER_LPS, NULL);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BTC_PS_LPS_OFF:</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;force_lps_ctrl = true;</div><div class='del'>-		halbtc8822b1ant_ps_tdma_check_for_power_save_state(btcoexist,</div><div class='del'>-								   false);</div><div class='del'>-		result = btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_LEAVE_LPS,</div><div class='del'>-					    NULL);</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='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_fw_pstdma(struct btc_coexist *btcoexist,</div><div class='del'>-					  u8 byte1, u8 byte2, u8 byte3,</div><div class='del'>-					  u8 byte4, u8 byte5)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 h2c_parameter[5] = {0};</div><div class='del'>-	u8 real_byte1 = byte1, real_byte5 = byte5;</div><div class='del'>-	bool ap_enable = false, result = false;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	if (byte5 &amp; BIT(2))</div><div class='del'>-		coex_sta-&gt;is_tdma_btautoslot = true;</div><div class='del'>-	else</div><div class='del'>-		coex_sta-&gt;is_tdma_btautoslot = false;</div><div class='del'>-</div><div class='del'>-	/* release bt-auto slot for auto-slot hang is detected!! */</div><div class='del'>-	if (coex_sta-&gt;is_tdma_btautoslot)</div><div class='del'>-		if ((coex_sta-&gt;is_tdma_btautoslot_hang) ||</div><div class='del'>-		    (bt_link_info-&gt;slave_role))</div><div class='del'>-			byte5 = byte5 &amp; 0xfb;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-			   &amp;ap_enable);</div><div class='del'>-</div><div class='del'>-	if ((ap_enable) &amp;&amp; (byte1 &amp; BIT(4) &amp;&amp; !(byte1 &amp; BIT(5)))) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == FW for 1Ant AP mode\n", __func__);</div><div class='del'>-</div><div class='del'>-		real_byte1 &amp;= ~BIT(4);</div><div class='del'>-		real_byte1 |= BIT(5);</div><div class='del'>-</div><div class='del'>-		real_byte5 |= BIT(5);</div><div class='del'>-		real_byte5 &amp;= ~BIT(6);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,</div><div class='del'>-						 0x0, 0x0);</div><div class='del'>-</div><div class='del'>-	} else if (byte1 &amp; BIT(4) &amp;&amp; !(byte1 &amp; BIT(5))) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == Force LPS (byte1 = 0x%x)\n",</div><div class='del'>-			 __func__, byte1);</div><div class='del'>-		if (!halbtc8822b1ant_power_save_state(btcoexist, BTC_PS_LPS_OFF,</div><div class='del'>-						      0x50, 0x4))</div><div class='del'>-			result = true;</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == native power save (byte1 = 0x%x)\n",</div><div class='del'>-			 __func__, byte1);</div><div class='del'>-		halbtc8822b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,</div><div class='del'>-						 0x0, 0x0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;is_set_ps_state_fail = result;</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;is_set_ps_state_fail) {</div><div class='del'>-		h2c_parameter[0] = real_byte1;</div><div class='del'>-		h2c_parameter[1] = byte2;</div><div class='del'>-		h2c_parameter[2] = byte3;</div><div class='del'>-		h2c_parameter[3] = byte4;</div><div class='del'>-		h2c_parameter[4] = real_byte5;</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[0] = real_byte1;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[1] = byte2;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[2] = byte3;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[3] = byte4;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[4] = real_byte5;</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_fill_h2c(btcoexist, 0x60, 5, h2c_parameter);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		coex_sta-&gt;cnt_set_ps_state_fail++;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == Force Leave LPS Fail (cnt = %d)\n",</div><div class='del'>-			 __func__, coex_sta-&gt;cnt_set_ps_state_fail);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_ps_tdma(struct btc_coexist *btcoexist,</div><div class='del'>-				    bool force_exec, bool turn_on, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	static u8 ps_tdma_byte4_modify, pre_ps_tdma_byte4_modify;</div><div class='del'>-	static bool pre_wifi_busy;</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_ps_tdma_on = turn_on;</div><div class='del'>-	coex_dm-&gt;cur_ps_tdma = type;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	if (wifi_busy != pre_wifi_busy) {</div><div class='del'>-		force_exec = true;</div><div class='del'>-		pre_wifi_busy = wifi_busy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 0x778 = 0x1 at wifi slot (no blocking BT Low-Pri pkts) */</div><div class='del'>-	if (bt_link_info-&gt;slave_role)</div><div class='del'>-		ps_tdma_byte4_modify = 0x1;</div><div class='del'>-	else</div><div class='del'>-		ps_tdma_byte4_modify = 0x0;</div><div class='del'>-</div><div class='del'>-	if (pre_ps_tdma_byte4_modify != ps_tdma_byte4_modify) {</div><div class='del'>-		force_exec = true;</div><div class='del'>-		pre_ps_tdma_byte4_modify = ps_tdma_byte4_modify;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if ((coex_dm-&gt;pre_ps_tdma_on == coex_dm-&gt;cur_ps_tdma_on) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_ps_tdma == coex_dm-&gt;cur_ps_tdma)) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], Skip TDMA because no change TDMA(%s, %d)\n",</div><div class='del'>-				(coex_dm-&gt;cur_ps_tdma_on ? "on" : "off"),</div><div class='del'>-				coex_dm-&gt;cur_ps_tdma);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_dm-&gt;cur_ps_tdma_on) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], ********** TDMA(on, %d) **********\n",</div><div class='del'>-			 coex_dm-&gt;cur_ps_tdma);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x550, 0x8, 0x1); /* enable TBTT nterrupt */</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], ********** TDMA(off, %d) **********\n",</div><div class='del'>-			 coex_dm-&gt;cur_ps_tdma);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (turn_on) {</div><div class='del'>-		/* enable TBTT nterrupt */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x550, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-		switch (type) {</div><div class='del'>-		default:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x35,</div><div class='del'>-						      0x03, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x3a,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x30,</div><div class='del'>-						      0x03, 0x10, 0x50);</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x21,</div><div class='del'>-						      0x03, 0x10, 0x50);</div><div class='del'>-			break;</div><div class='del'>-		case 5:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x15,</div><div class='del'>-						      0x3, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 6:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x20,</div><div class='del'>-						      0x3, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 7:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x03, 0x10,</div><div class='del'>-				0x54 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 8:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x03, 0x10,</div><div class='del'>-				0x14 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 11:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x25, 0x03, 0x11,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 12:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x30, 0x03, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 13:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x07, 0x10,</div><div class='del'>-				0x54 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 14:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x15, 0x03, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 15:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x20, 0x03, 0x10,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 17:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x10, 0x03, 0x11,</div><div class='del'>-				0x14 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 18:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x03, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case 20:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x30,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 22:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x25,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 27:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x10,</div><div class='del'>-						      0x03, 0x11, 0x15);</div><div class='del'>-			break;</div><div class='del'>-		case 32:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x35,</div><div class='del'>-						      0x3, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 33:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x35,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 41:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x45,</div><div class='del'>-						      0x3, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 42:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x1e, 0x3, 0x10,</div><div class='del'>-				0x14 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 43:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x45,</div><div class='del'>-						      0x3, 0x10, 0x14);</div><div class='del'>-			break;</div><div class='del'>-		case 44:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x25,</div><div class='del'>-						      0x3, 0x10, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 45:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x29,</div><div class='del'>-						      0x3, 0x10, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 46:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x1a,</div><div class='del'>-						      0x3, 0x10, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 47:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x32,</div><div class='del'>-						      0x3, 0x10, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 48:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x29,</div><div class='del'>-						      0x3, 0x10, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 49:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x55, 0x10,</div><div class='del'>-						      0x3, 0x10, 0x54);</div><div class='del'>-			break;</div><div class='del'>-		case 50:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x51, 0x4a,</div><div class='del'>-						      0x3, 0x10, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 51:</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x61, 0x35,</div><div class='del'>-						      0x3, 0x10, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (type) {</div><div class='del'>-		case 0:</div><div class='del'>-		default: /* Software control, Antenna at BT side */</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x0, 0x0, 0x0,</div><div class='del'>-						      0x0, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		case 8: /* PTA Control */</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x8, 0x0, 0x0,</div><div class='del'>-						      0x0, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		case 9: /* Software control, Antenna at WiFi side */</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x0, 0x0, 0x0,</div><div class='del'>-						      0x0, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		case 10: /* under 5G , 0x778=1*/</div><div class='del'>-			halbtc8822b1ant_set_fw_pstdma(btcoexist, 0x0, 0x0, 0x0,</div><div class='del'>-						      0x0, 0x0);</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'>-	if (!coex_sta-&gt;is_set_ps_state_fail) {</div><div class='del'>-		/* update pre state */</div><div class='del'>-		coex_dm-&gt;pre_ps_tdma_on = coex_dm-&gt;cur_ps_tdma_on;</div><div class='del'>-		coex_dm-&gt;pre_ps_tdma = coex_dm-&gt;cur_ps_tdma;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_sw_mechanism(struct btc_coexist *btcoexist,</div><div class='del'>-					 bool low_penalty_ra)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b1ant_low_penalty_ra(btcoexist, NORMAL_EXEC, low_penalty_ra);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* rf4 type by efuse, and for ant at main aux inverse use,</div><div class='del'>- * because is 2x2, and control types are the same, does not need</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_rfe_type(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-</div><div class='del'>-	/* Ext switch buffer mux */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-	/* the following setup should be got from Efuse in the future */</div><div class='del'>-	rfe_type-&gt;rfe_module_type = board_info-&gt;rfe_type;</div><div class='del'>-</div><div class='del'>-	rfe_type-&gt;ext_ant_switch_ctrl_polarity = 0;</div><div class='del'>-</div><div class='del'>-	switch (rfe_type-&gt;rfe_module_type) {</div><div class='del'>-	case 0:</div><div class='del'>-	default:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*anttenna control by bb mac bt antdiv pta to write 0x4c 0xcb4,0xcbd*/</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_ext_ant_switch(struct btc_coexist *btcoexist,</div><div class='del'>-					       bool force_exec, u8 ctrl_type,</div><div class='del'>-					       u8 pos_type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool switch_polatiry_inverse = false;</div><div class='del'>-	u8 regval_0xcbd = 0, regval_0x64;</div><div class='del'>-	u32 u32tmp1 = 0, u32tmp2 = 0, u32tmp3 = 0;</div><div class='del'>-</div><div class='del'>-	/* Ext switch buffer mux */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-	if (!rfe_type-&gt;ext_ant_switch_exist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_ext_ant_switch_status = (ctrl_type &lt;&lt; 8) + pos_type;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_ext_ant_switch_status ==</div><div class='del'>-		    coex_dm-&gt;cur_ext_ant_switch_status)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_ext_ant_switch_status = coex_dm-&gt;cur_ext_ant_switch_status;</div><div class='del'>-</div><div class='del'>-	/* swap control polarity if use different switch control polarity*/</div><div class='del'>-	/* Normal switch polarity for SPDT,</div><div class='del'>-	 * 0xcbd[1:0] = 2b'01 =&gt; Ant to BTG,</div><div class='del'>-	 * 0xcbd[1:0] = 2b'10 =&gt; Ant to WLG</div><div class='del'>-	 */</div><div class='del'>-	switch_polatiry_inverse = rfe_type-&gt;ext_ant_switch_ctrl_polarity == 1;</div><div class='del'>-</div><div class='del'>-	switch (pos_type) {</div><div class='del'>-	default:</div><div class='del'>-	case BT_8822B_1ANT_EXT_ANT_SWITCH_TO_BT:</div><div class='del'>-	case BT_8822B_1ANT_EXT_ANT_SWITCH_TO_NOCARE:</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_EXT_ANT_SWITCH_TO_WLG:</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_EXT_ANT_SWITCH_TO_WLA:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rfe_type-&gt;ext_ant_switch_type ==</div><div class='del'>-	    BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT) {</div><div class='del'>-		switch (ctrl_type) {</div><div class='del'>-		default:</div><div class='del'>-		case BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW:</div><div class='del'>-			/*  0x4c[23] = 0 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e,</div><div class='del'>-							   0x80, 0x0);</div><div class='del'>-			/* 0x4c[24] = 1 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f,</div><div class='del'>-							   0x01, 0x1);</div><div class='del'>-			/* BB SW, DPDT use RFE_ctrl8 and RFE_ctrl9 as ctrl pin*/</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4,</div><div class='del'>-							   0xff, 0x77);</div><div class='del'>-</div><div class='del'>-			/* 0xcbd[1:0] = 2b'01 for no switch_polatiry_inverse,</div><div class='del'>-			 * ANTSWB =1, ANTSW =0</div><div class='del'>-			 */</div><div class='del'>-			regval_0xcbd = (!switch_polatiry_inverse ? 0x1 : 0x2);</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd,</div><div class='del'>-							   0x3, regval_0xcbd);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_PTA:</div><div class='del'>-			/* 0x4c[23] = 0 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e,</div><div class='del'>-							   0x80, 0x0);</div><div class='del'>-			/* 0x4c[24] = 1 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f,</div><div class='del'>-							   0x01, 0x1);</div><div class='del'>-			/* PTA,  DPDT use RFE_ctrl8 and RFE_ctrl9 as ctrl pin */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4,</div><div class='del'>-							   0xff, 0x66);</div><div class='del'>-</div><div class='del'>-			/* 0xcbd[1:0] = 2b'10 for no switch_polatiry_inverse,</div><div class='del'>-			 * ANTSWB =1, ANTSW =0  @ GNT_BT=1</div><div class='del'>-			 */</div><div class='del'>-			regval_0xcbd = (!switch_polatiry_inverse ? 0x2 : 0x1);</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd,</div><div class='del'>-							   0x3, regval_0xcbd);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_ANTDIV:</div><div class='del'>-			/* 0x4c[23] = 0 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e,</div><div class='del'>-							   0x80, 0x0);</div><div class='del'>-			/* 0x4c[24] = 1 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f,</div><div class='del'>-							   0x01, 0x1);</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4,</div><div class='del'>-							   0xff, 0x88);</div><div class='del'>-</div><div class='del'>-			/* no regval_0xcbd setup required, because</div><div class='del'>-			 * antenna switch control value by antenna diversity</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_MAC:</div><div class='del'>-			/*  0x4c[23] = 1 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e,</div><div class='del'>-							   0x80, 0x1);</div><div class='del'>-</div><div class='del'>-			/* 0x64[0] = 1b'0 for no switch_polatiry_inverse,</div><div class='del'>-			 * DPDT_SEL_N =1, DPDT_SEL_P =0</div><div class='del'>-			 */</div><div class='del'>-			regval_0x64 = (!switch_polatiry_inverse ? 0x0 : 0x1);</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x64, 0x1,</div><div class='del'>-							   regval_0x64);</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BT:</div><div class='del'>-			/* 0x4c[23] = 0 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e,</div><div class='del'>-							   0x80, 0x0);</div><div class='del'>-			/* 0x4c[24] = 0 */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f,</div><div class='del'>-							   0x01, 0x0);</div><div class='del'>-</div><div class='del'>-			/* no setup required, because antenna switch control</div><div class='del'>-			 * value by BT vendor 0xac[1:0]</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'>-	u32tmp1 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcbc);</div><div class='del'>-	u32tmp2 = btcoexist-&gt;btc_read_4byte(btcoexist, 0x4c);</div><div class='del'>-	u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0x64) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], ********** (After Ext Ant switch setup) 0xcbc = 0x%08x, 0x4c = 0x%08x, 0x64= 0x%02x**********\n",</div><div class='del'>-		u32tmp1, u32tmp2, u32tmp3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set gnt_wl gnt_bt control by sw high low, or</div><div class='del'>- * hwpta while in power on, ini, wlan off, wlan only, wl2g non-currrent,</div><div class='del'>- * wl2g current, wl5g</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_set_ant_path(struct btc_coexist *btcoexist,</div><div class='del'>-					 u8 ant_pos_type, bool force_exec,</div><div class='del'>-					 u8 phase)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 u8tmp = 0;</div><div class='del'>-	u32 u32tmp1 = 0;</div><div class='del'>-	u32 u32tmp2 = 0, u32tmp3 = 0;</div><div class='del'>-</div><div class='del'>-	u32tmp1 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-</div><div class='del'>-	/* To avoid indirect access fail  */</div><div class='del'>-	if (((u32tmp1 &amp; 0xf000) &gt;&gt; 12) != ((u32tmp1 &amp; 0x0f00) &gt;&gt; 8)) {</div><div class='del'>-		force_exec = true;</div><div class='del'>-		coex_sta-&gt;gnt_error_cnt++;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex],(Before Ant Setup) 0x38= 0x%x\n", u32tmp1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ext switch buffer mux */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_ant_pos_type = (ant_pos_type &lt;&lt; 8) + phase;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;cur_ant_pos_type == coex_dm-&gt;pre_ant_pos_type)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_ant_pos_type = coex_dm-&gt;cur_ant_pos_type;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;dbg_mode_1ant) {</div><div class='del'>-		u32tmp1 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x38);</div><div class='del'>-		u32tmp2 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x54);</div><div class='del'>-		u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-</div><div class='del'>-		u8tmp = btcoexist-&gt;btc_read_1byte(btcoexist, 0x73);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (Before Ant Setup) 0xcb4 = 0x%x, 0x73 = 0x%x, 0x38= 0x%x, 0x54= 0x%x**********\n",</div><div class='del'>-			u32tmp3, u8tmp, u32tmp1, u32tmp2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (phase) {</div><div class='del'>-	case BT_8822B_1ANT_PHASE_COEX_INIT:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (set_ant_path - 1ANT_PHASE_COEX_INIT) **********\n");</div><div class='del'>-</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side</div><div class='del'>-		 * (this should be on if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b1ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* GNT_WL_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_CTT_WL_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* GNT_BT_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_CTT_BT_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW high */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		/* set GNT_WL to SW low */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_LOW);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at initial step */</div><div class='del'>-		halbtc8822b1ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		/* Ext switch buffer mux */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-		if (ant_pos_type == BTC_ANT_PATH_AUTO)</div><div class='del'>-			ant_pos_type = BTC_ANT_PATH_BT;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_PHASE_WLANONLY_INIT:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (set_ant_path - 1ANT_PHASE_WLANONLY_INIT) **********\n");</div><div class='del'>-</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side</div><div class='del'>-		 * (this should be on if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b1ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* GNT_WL_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_CTT_WL_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* GNT_BT_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_CTT_BT_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW Low */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_LOW);</div><div class='del'>-</div><div class='del'>-		/* Set GNT_WL to SW high */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at initial step */</div><div class='del'>-		halbtc8822b1ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		/* Ext switch buffer mux */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-		if (ant_pos_type == BTC_ANT_PATH_AUTO)</div><div class='del'>-			ant_pos_type = BTC_ANT_PATH_WIFI;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_PHASE_WLAN_OFF:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (set_ant_path - 1ANT_PHASE_WLAN_OFF) **********\n");</div><div class='del'>-</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side */</div><div class='del'>-		halbtc8822b1ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to BT */</div><div class='del'>-		halbtc8822b1ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_PCO_BTSIDE);</div><div class='del'>-</div><div class='del'>-		/* Set Ext Ant Switch to BT control at wifi off step */</div><div class='del'>-		halbtc8822b1ant_set_ext_ant_switch(</div><div class='del'>-			btcoexist, FORCE_EXEC,</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BT,</div><div class='del'>-			BT_8822B_1ANT_EXT_ANT_SWITCH_TO_NOCARE);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_PHASE_2G_RUNTIME:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (set_ant_path - 1ANT_PHASE_2G_RUNTIME) **********\n");</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to PTA */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_PTA,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_BY_HW);</div><div class='del'>-</div><div class='del'>-		/* Set GNT_WL to PTA */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_PTA,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_BY_HW);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at runtime step */</div><div class='del'>-		halbtc8822b1ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = true;</div><div class='del'>-</div><div class='del'>-		if (ant_pos_type == BTC_ANT_PATH_AUTO)</div><div class='del'>-			ant_pos_type = BTC_ANT_PATH_PTA;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_PHASE_5G_RUNTIME:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (set_ant_path - 1ANT_PHASE_5G_RUNTIME) **********\n");</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW Hi */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		/* Set GNT_WL to SW Hi */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at runtime step */</div><div class='del'>-		halbtc8822b1ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = true;</div><div class='del'>-</div><div class='del'>-		if (ant_pos_type == BTC_ANT_PATH_AUTO)</div><div class='del'>-			ant_pos_type = BTC_ANT_PATH_WIFI5G;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_1ANT_PHASE_BTMPMODE:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (set_ant_path - 1ANT_PHASE_BTMPMODE) **********\n");</div><div class='del'>-</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side */</div><div class='del'>-		halbtc8822b1ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW Hi */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		/* Set GNT_WL to SW Lo */</div><div class='del'>-		halbtc8822b1ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_1ANT_SIG_STA_SET_TO_LOW);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL */</div><div class='del'>-		halbtc8822b1ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		/* Set Ext Ant Switch to BT side at BT MP mode */</div><div class='del'>-		if (ant_pos_type == BTC_ANT_PATH_AUTO)</div><div class='del'>-			ant_pos_type = BTC_ANT_PATH_BT;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (phase != BT_8822B_1ANT_PHASE_WLAN_OFF) {</div><div class='del'>-		switch (ant_pos_type) {</div><div class='del'>-		case BTC_ANT_PATH_WIFI:</div><div class='del'>-			halbtc8822b1ant_set_ext_ant_switch(</div><div class='del'>-				btcoexist, force_exec,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_TO_WLG);</div><div class='del'>-			break;</div><div class='del'>-		case BTC_ANT_PATH_WIFI5G:</div><div class='del'>-			halbtc8822b1ant_set_ext_ant_switch(</div><div class='del'>-				btcoexist, force_exec,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_TO_WLA);</div><div class='del'>-			break;</div><div class='del'>-		case BTC_ANT_PATH_BT:</div><div class='del'>-			halbtc8822b1ant_set_ext_ant_switch(</div><div class='del'>-				btcoexist, force_exec,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_TO_BT);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		case BTC_ANT_PATH_PTA:</div><div class='del'>-			halbtc8822b1ant_set_ext_ant_switch(</div><div class='del'>-				btcoexist, force_exec,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_PTA,</div><div class='del'>-				BT_8822B_1ANT_EXT_ANT_SWITCH_TO_NOCARE);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;dbg_mode_1ant) {</div><div class='del'>-		u32tmp1 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x38);</div><div class='del'>-		u32tmp2 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x54);</div><div class='del'>-		u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-</div><div class='del'>-		u8tmp = btcoexist-&gt;btc_read_1byte(btcoexist, 0x73);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (After Ant Setup) 0xcb4 = 0x%x, 0x73 = 0x%x, 0x38= 0x%x, 0x54= 0x%x**********\n",</div><div class='del'>-			u32tmp3, u8tmp, u32tmp1, u32tmp2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool halbtc8822b1ant_is_common_action(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool common = false, wifi_connected = false, wifi_busy = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	if (!wifi_connected &amp;&amp;</div><div class='del'>-	    coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_NON_CONNECTED_IDLE) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], Wifi non connected-idle + BT non connected-idle!!\n");</div><div class='del'>-</div><div class='del'>-		/* halbtc8822b1ant_sw_mechanism(btcoexist, false); */</div><div class='del'>-</div><div class='del'>-		common = true;</div><div class='del'>-	} else if (wifi_connected &amp;&amp;</div><div class='del'>-		   (coex_dm-&gt;bt_status ==</div><div class='del'>-		    BT_8822B_1ANT_BT_STATUS_NON_CONNECTED_IDLE)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], Wifi connected + BT non connected-idle!!\n");</div><div class='del'>-</div><div class='del'>-		/* halbtc8822b1ant_sw_mechanism(btcoexist, false); */</div><div class='del'>-</div><div class='del'>-		common = true;</div><div class='del'>-	} else if (!wifi_connected &amp;&amp; (BT_8822B_1ANT_BT_STATUS_CONNECTED_IDLE ==</div><div class='del'>-				       coex_dm-&gt;bt_status)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], Wifi non connected-idle + BT connected-idle!!\n");</div><div class='del'>-</div><div class='del'>-		/* halbtc8822b1ant_sw_mechanism(btcoexist, false); */</div><div class='del'>-</div><div class='del'>-		common = true;</div><div class='del'>-	} else if (wifi_connected &amp;&amp; (BT_8822B_1ANT_BT_STATUS_CONNECTED_IDLE ==</div><div class='del'>-				      coex_dm-&gt;bt_status)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Wifi connected + BT connected-idle!!\n");</div><div class='del'>-</div><div class='del'>-		/* halbtc8822b1ant_sw_mechanism(btcoexist, false); */</div><div class='del'>-</div><div class='del'>-		common = true;</div><div class='del'>-	} else if (!wifi_connected &amp;&amp; (BT_8822B_1ANT_BT_STATUS_CONNECTED_IDLE !=</div><div class='del'>-				       coex_dm-&gt;bt_status)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Wifi non connected-idle + BT Busy!!\n");</div><div class='del'>-</div><div class='del'>-		/* halbtc8822b1ant_sw_mechanism(btcoexist, false); */</div><div class='del'>-</div><div class='del'>-		common = true;</div><div class='del'>-	} else {</div><div class='del'>-		if (wifi_busy) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Wifi Connected-Busy + BT Busy!!\n");</div><div class='del'>-		} else {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Wifi Connected-Idle + BT Busy!!\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		common = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return common;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_wifi_under5g(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], under 5g start\n");</div><div class='del'>-	/* for test : s3 bt disappear , fail rate 1/600*/</div><div class='del'>-	/*set sw gnt wl bt  high*/</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_5G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x3, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_wifi_only(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_under_5g = false, rf4ce_enabled = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-	if (wifi_under_5g) {</div><div class='del'>-		halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (wlan only -- under 5g ) **********\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rf4ce_enabled) {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x45e, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 50);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 0);</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (wlan only -- under 2g ) **********\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_action_wifi_native_lps(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* *********************************************</div><div class='del'>- *</div><div class='del'>- *	Non-Software Coex Mechanism start</div><div class='del'>- *</div><div class='del'>- * **********************************************/</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_bt_whck_test(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex],action_bt_whck_test\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_action_wifi_multi_port(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex],action_wifi_multi_port\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_hs(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "[BTCoex], action_hs\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_bt_relink(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], run bt multi link function\n");</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_bt_multi_link)</div><div class='del'>-		return;</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], run bt_re-link function\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*"""bt inquiry"""" + wifi any + bt any*/</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_bt_inquiry(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool wifi_connected = false, ap_enable = false, wifi_busy = false,</div><div class='del'>-	     bt_busy = false, rf4ce_enabled = false;</div><div class='del'>-</div><div class='del'>-	bool wifi_scan = false, link = false, roam = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (bt inquiry) **********\n");</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-			   &amp;ap_enable);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_TRAFFIC_BUSY, &amp;bt_busy);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;wifi_scan);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &amp;link);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &amp;roam);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], ********** scan = %d,  link =%d, roam = %d**********\n",</div><div class='del'>-		wifi_scan, link, roam);</div><div class='del'>-</div><div class='del'>-	if ((link) || (roam) || (coex_sta-&gt;wifi_is_high_pri_task)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (bt inquiry wifi  connect or scan ) **********\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 1);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6);</div><div class='del'>-</div><div class='del'>-	} else if ((wifi_scan) &amp;&amp; (coex_sta-&gt;bt_create_connection)) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 22);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6);</div><div class='del'>-</div><div class='del'>-	} else if ((!wifi_connected) &amp;&amp; (!wifi_scan)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (bt inquiry wifi non connect) **********\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	} else if ((bt_link_info-&gt;a2dp_exist) &amp;&amp; (bt_link_info-&gt;pan_exist)) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 22);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-	} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 3);</div><div class='del'>-	} else if (wifi_scan) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-	} else if (wifi_busy) {</div><div class='del'>-		/* for BT inquiry/page fail after S4 resume */</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);</div><div class='del'>-		/*aaaa-&gt;55aa for bt connect while wl busy*/</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC,</div><div class='del'>-						     15);</div><div class='del'>-		if (rf4ce_enabled) {</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x45e,</div><div class='del'>-							   0x8, 0x1);</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						50);</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 0);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (bt inquiry wifi connect) **********\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 22);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     NORMAL_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_action_bt_sco_hid_only_busy(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool wifi_connected = false, wifi_busy = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-	} else {</div><div class='del'>-		if (coex_sta-&gt;is_hid_low_pri_tx_overhead) {</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 6);</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						18);</div><div class='del'>-		} else if (wifi_bw == 0) { /* if 11bg mode */</div><div class='del'>-</div><div class='del'>-			if (coex_sta-&gt;is_bt_multi_link) {</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 11);</div><div class='del'>-				halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 11);</div><div class='del'>-			} else {</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 6);</div><div class='del'>-				halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 11);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 6);</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						11);</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'>-halbtc8822b1ant_action_wifi_connected_bt_acl_busy(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"############# [BTCoex],  scan_ap_num = %d, wl_noisy_level = %d\n",</div><div class='del'>-		coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_relink_downcount != 0) &amp;&amp;</div><div class='del'>-	    (!bt_link_info-&gt;pan_exist) &amp;&amp; (wifi_busy)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"############# [BTCoex],  BT Re-Link + A2DP + WL busy\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	} else if ((bt_link_info-&gt;a2dp_exist) &amp;&amp; (coex_sta-&gt;is_bt_a2dp_sink)) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 12);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6);</div><div class='del'>-	} else if (bt_link_info-&gt;a2dp_only) { /* A2DP		 */</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 7);</div><div class='del'>-</div><div class='del'>-		if (wifi_turbo)</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 19);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 4);</div><div class='del'>-	} else if (((bt_link_info-&gt;a2dp_exist) &amp;&amp; (bt_link_info-&gt;pan_exist)) ||</div><div class='del'>-		   (bt_link_info-&gt;hid_exist &amp;&amp; bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-		    bt_link_info-&gt;pan_exist)) {</div><div class='del'>-		/* A2DP+PAN(OPP,FTP), HID+A2DP+PAN(OPP,FTP) */</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						13);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						14);</div><div class='del'>-</div><div class='del'>-		if (bt_link_info-&gt;hid_exist)</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		else if (wifi_turbo)</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 19);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 4);</div><div class='del'>-	} else if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-		   bt_link_info-&gt;a2dp_exist) { /* HID+A2DP */</div><div class='del'>-</div><div class='del'>-		if (wifi_bw == 0) { /* if 11bg mode */</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-			halbtc8822b1ant_set_wltoggle_coex_table(</div><div class='del'>-				btcoexist, NORMAL_EXEC, 1, 0xaa, 0x5a, 0xaa,</div><div class='del'>-				0xaa);</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						49);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-			halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC,</div><div class='del'>-						   false, true, 8);</div><div class='del'>-			halbtc8822b1ant_set_wltoggle_coex_table(</div><div class='del'>-				btcoexist, NORMAL_EXEC, 1, 0xaa, 0x5a, 0xaa,</div><div class='del'>-				0xaa);</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						49);</div><div class='del'>-		}</div><div class='del'>-		/* PAN(OPP,FTP), HID+PAN(OPP,FTP) */</div><div class='del'>-</div><div class='del'>-	} else if ((bt_link_info-&gt;pan_only) ||</div><div class='del'>-		   (bt_link_info-&gt;hid_exist &amp;&amp; bt_link_info-&gt;pan_exist)) {</div><div class='del'>-		if (!wifi_busy)</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						4);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						3);</div><div class='del'>-</div><div class='del'>-		if (bt_link_info-&gt;hid_exist)</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		else if (wifi_turbo)</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 19);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 4);</div><div class='del'>-	} else {</div><div class='del'>-		/* BT no-profile busy (0x9) */</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 33);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*wifi not connected + bt action*/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_action_wifi_not_connected(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool rf4ce_enabled = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (wifi not connect) **********\n");</div><div class='del'>-</div><div class='del'>-	/* tdma and coex table */</div><div class='del'>-	if (rf4ce_enabled) {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x45e, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 50);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*""""wl not connected scan"""" + bt action*/</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_action_wifi_not_connected_scan(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	u32 wifi_link_status = 0;</div><div class='del'>-	u32 num_of_wifi_link = 0;</div><div class='del'>-	bool bt_ctrl_agg_buf_size = false;</div><div class='del'>-	u8 agg_buf_size = 5;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (wifi non connect scan) **********\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-			   &amp;wifi_link_status);</div><div class='del'>-</div><div class='del'>-	num_of_wifi_link = wifi_link_status &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (num_of_wifi_link &gt;= 2) {</div><div class='del'>-		halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0, 0, 0);</div><div class='del'>-		halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-					   bt_ctrl_agg_buf_size, agg_buf_size);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "############# [BTCoex],  BT Is Inquirying\n");</div><div class='del'>-			halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_action_wifi_multi_port(btcoexist);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-		halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	} else if (bt_hs_on) {</div><div class='del'>-		halbtc8822b1ant_action_hs(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* tdma and coex table */</div><div class='del'>-	if (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) {</div><div class='del'>-		if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						32);</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		} else if (bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-			   bt_link_info-&gt;pan_exist) {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						22);</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						20);</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		}</div><div class='del'>-	} else if ((coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_SCO_BUSY) ||</div><div class='del'>-		   (BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY ==</div><div class='del'>-		    coex_dm-&gt;bt_status)) {</div><div class='del'>-		halbtc8822b1ant_action_bt_sco_hid_only_busy(btcoexist);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     NORMAL_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*""""wl not connected asso"""" + bt action*/</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_wifi_not_connected_asso_auth(</div><div class='del'>-	struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	u32 wifi_link_status = 0;</div><div class='del'>-	u32 num_of_wifi_link = 0;</div><div class='del'>-	bool bt_ctrl_agg_buf_size = false;</div><div class='del'>-	u8 agg_buf_size = 5;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], ********** (wifi non connect asso_auth) **********\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-			   &amp;wifi_link_status);</div><div class='del'>-</div><div class='del'>-	num_of_wifi_link = wifi_link_status &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (num_of_wifi_link &gt;= 2) {</div><div class='del'>-		halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0, 0, 0);</div><div class='del'>-		halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-					   bt_ctrl_agg_buf_size, agg_buf_size);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "############# [BTCoex],  BT Is Inquirying\n");</div><div class='del'>-			halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_action_wifi_multi_port(btcoexist);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-		halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	} else if (bt_hs_on) {</div><div class='del'>-		halbtc8822b1ant_action_hs(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* tdma and coex table */</div><div class='del'>-	if ((bt_link_info-&gt;sco_exist) || (bt_link_info-&gt;hid_exist) ||</div><div class='del'>-	    (bt_link_info-&gt;a2dp_exist)) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 4);</div><div class='del'>-	} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 4);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     NORMAL_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*""""wl  connected scan"""" + bt action*/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b1ant_action_wifi_connected_scan(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	u32 wifi_link_status = 0;</div><div class='del'>-	u32 num_of_wifi_link = 0;</div><div class='del'>-	bool bt_ctrl_agg_buf_size = false;</div><div class='del'>-	u8 agg_buf_size = 5;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (wifi connect scan) **********\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-			   &amp;wifi_link_status);</div><div class='del'>-</div><div class='del'>-	num_of_wifi_link = wifi_link_status &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (num_of_wifi_link &gt;= 2) {</div><div class='del'>-		halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0, 0, 0);</div><div class='del'>-		halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-					   bt_ctrl_agg_buf_size, agg_buf_size);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "############# [BTCoex],  BT Is Inquirying\n");</div><div class='del'>-			halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_action_wifi_multi_port(btcoexist);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-		halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	} else if (bt_hs_on) {</div><div class='del'>-		halbtc8822b1ant_action_hs(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* tdma and coex table */</div><div class='del'>-	if (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) {</div><div class='del'>-		if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						32);</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		} else if (bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-			   bt_link_info-&gt;pan_exist) {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						22);</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						20);</div><div class='del'>-			halbtc8822b1ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		}</div><div class='del'>-	} else if ((coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_SCO_BUSY) ||</div><div class='del'>-		   (BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY ==</div><div class='del'>-		    coex_dm-&gt;bt_status)) {</div><div class='del'>-		halbtc8822b1ant_action_bt_sco_hid_only_busy(btcoexist);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     NORMAL_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*""""wl  connected specific packet"""" + bt action*/</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_wifi_connected_specific_packet(</div><div class='del'>-	struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	u32 wifi_link_status = 0;</div><div class='del'>-	u32 num_of_wifi_link = 0;</div><div class='del'>-	bool bt_ctrl_agg_buf_size = false;</div><div class='del'>-	u8 agg_buf_size = 5;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], ********** (wifi connect specific packet) **********\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-			   &amp;wifi_link_status);</div><div class='del'>-</div><div class='del'>-	num_of_wifi_link = wifi_link_status &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (num_of_wifi_link &gt;= 2) {</div><div class='del'>-		halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0, 0, 0);</div><div class='del'>-		halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-					   bt_ctrl_agg_buf_size, agg_buf_size);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "############# [BTCoex],  BT Is Inquirying\n");</div><div class='del'>-			halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_action_wifi_multi_port(btcoexist);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-		halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	} else if (bt_hs_on) {</div><div class='del'>-		halbtc8822b1ant_action_hs(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	/* no specific packet process for both WiFi and BT very busy */</div><div class='del'>-	if ((wifi_busy) &amp;&amp;</div><div class='del'>-	    ((bt_link_info-&gt;pan_exist) || (coex_sta-&gt;num_of_profile &gt;= 2)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* tdma and coex table */</div><div class='del'>-	if ((bt_link_info-&gt;sco_exist) || (bt_link_info-&gt;hid_exist)) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-	} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);</div><div class='del'>-		/*for a2dp glitch,change from 1 to 15*/</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC,</div><div class='del'>-						     15);</div><div class='del'>-	} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     NORMAL_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* wifi connected input point:</div><div class='del'>- * to set different ps and tdma case (+bt different case)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_action_wifi_connected(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_busy = false, rf4ce_enabled = false;</div><div class='del'>-	bool scan = false, link = false, roam = false;</div><div class='del'>-	bool under_4way = false, ap_enable = false, wifi_under_5g = false;</div><div class='del'>-	u8 wifi_rssi_state;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], CoexForWifiConnect()===&gt;\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if (wifi_under_5g) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], CoexForWifiConnect(), return for wifi is under 5g&lt;===\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], CoexForWifiConnect(), return for wifi is under 2g&lt;===\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-			   &amp;under_4way);</div><div class='del'>-</div><div class='del'>-	if (under_4way) {</div><div class='del'>-		halbtc8822b1ant_action_wifi_connected_specific_packet(</div><div class='del'>-			btcoexist);</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], CoexForWifiConnect(), return for wifi is under 4way&lt;===\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;scan);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &amp;link);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &amp;roam);</div><div class='del'>-	if (scan || link || roam) {</div><div class='del'>-		if (scan)</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected_scan(btcoexist);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected_specific_packet(</div><div class='del'>-				btcoexist);</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], CoexForWifiConnect(), return for wifi is under scan&lt;===\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-			   &amp;ap_enable);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	/* tdma and coex table */</div><div class='del'>-	if (!wifi_busy) {</div><div class='del'>-		if (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) {</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected_bt_acl_busy(</div><div class='del'>-				btcoexist);</div><div class='del'>-		} else if ((BT_8822B_1ANT_BT_STATUS_SCO_BUSY ==</div><div class='del'>-			    coex_dm-&gt;bt_status) ||</div><div class='del'>-			   (BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY ==</div><div class='del'>-			    coex_dm-&gt;bt_status)) {</div><div class='del'>-			halbtc8822b1ant_action_bt_sco_hid_only_busy(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						8);</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_set_ant_path(</div><div class='del'>-				btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-			if ((coex_sta-&gt;high_priority_tx) +</div><div class='del'>-				    (coex_sta-&gt;high_priority_rx) &lt;=</div><div class='del'>-			    60)</div><div class='del'>-				/*sy modify case16 -&gt; case17*/</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) {</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected_bt_acl_busy(</div><div class='del'>-				btcoexist);</div><div class='del'>-		} else if ((BT_8822B_1ANT_BT_STATUS_SCO_BUSY ==</div><div class='del'>-			    coex_dm-&gt;bt_status) ||</div><div class='del'>-			   (BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY ==</div><div class='del'>-			    coex_dm-&gt;bt_status)) {</div><div class='del'>-			halbtc8822b1ant_action_bt_sco_hid_only_busy(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			if (rf4ce_enabled) {</div><div class='del'>-				btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-					btcoexist, 0x45e, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-				halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 50);</div><div class='del'>-</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						8);</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_set_ant_path(</div><div class='del'>-				btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-			wifi_rssi_state = halbtc8822b1ant_wifi_rssi_state(</div><div class='del'>-				btcoexist, 1, 2, 25, 0);</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], ********** before  **********\n");</div><div class='del'>-			if (BT_8822B_1ANT_BT_STATUS_NON_CONNECTED_IDLE ==</div><div class='del'>-			    coex_dm-&gt;bt_status) {</div><div class='del'>-				if (rf4ce_enabled) {</div><div class='del'>-					btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-						btcoexist, 0x45e, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-					halbtc8822b1ant_ps_tdma(btcoexist,</div><div class='del'>-								NORMAL_EXEC,</div><div class='del'>-								true, 50);</div><div class='del'>-</div><div class='del'>-					halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-						btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 1);</div><div class='del'>-			} else {</div><div class='del'>-				halbtc8822b1ant_coex_table_with_type(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 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'>-static void</div><div class='del'>-halbtc8822b1ant_run_sw_coexist_mechanism(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 algorithm = 0;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (run sw coexmech) **********\n");</div><div class='del'>-	algorithm = halbtc8822b1ant_action_algorithm(btcoexist);</div><div class='del'>-	coex_dm-&gt;cur_algorithm = algorithm;</div><div class='del'>-</div><div class='del'>-	if (halbtc8822b1ant_is_common_action(btcoexist)) {</div><div class='del'>-	} else {</div><div class='del'>-		switch (coex_dm-&gt;cur_algorithm) {</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_SCO:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = SCO.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_HID:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = HID.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_A2DP:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = A2DP.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_A2DP_PANHS:</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], Action algorithm = A2DP+PAN(HS).\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_PANEDR:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = PAN(EDR).\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_PANHS:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = HS mode.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_PANEDR_A2DP:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = PAN+A2DP.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_PANEDR_HID:</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], Action algorithm = PAN(EDR)+HID.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_HID_A2DP_PANEDR:</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], Action algorithm = HID+A2DP+PAN.\n");</div><div class='del'>-			break;</div><div class='del'>-		case BT_8822B_1ANT_COEX_ALGO_HID_A2DP:</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Action algorithm = HID+A2DP.\n");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], Action algorithm = coexist All Off!!\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		coex_dm-&gt;pre_algorithm = coex_dm-&gt;cur_algorithm;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool wifi_connected = false, bt_hs_on = false;</div><div class='del'>-	bool increase_scan_dev_num = false;</div><div class='del'>-	bool bt_ctrl_agg_buf_size = false;</div><div class='del'>-	bool miracast_plus_bt = false;</div><div class='del'>-	u8 agg_buf_size = 5;</div><div class='del'>-	u32 wifi_link_status = 0;</div><div class='del'>-	u32 num_of_wifi_link = 0, wifi_bw;</div><div class='del'>-	u8 iot_peer = BTC_IOT_PEER_UNKNOWN;</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], RunCoexistMechanism()===&gt;\n");</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], RunCoexistMechanism(), return for Manual CTRL &lt;===\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;stop_coex_dm) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], RunCoexistMechanism(), return for Stop Coex DM &lt;===\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;under_ips) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], wifi is under IPS !!!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;under_lps) &amp;&amp;</div><div class='del'>-	    (coex_dm-&gt;bt_status != BT_8822B_1ANT_BT_STATUS_ACL_BUSY)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], RunCoexistMechanism(), wifi is under LPS !!!\n");</div><div class='del'>-		halbtc8822b1ant_action_wifi_native_lps(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;run_time_state) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], return for run_time_state = false !!!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;freeze_coexrun_by_btinfo) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], BtInfoNotify(), return for freeze_coexrun_by_btinfo\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-	if (wifi_under_5g) {</div><div class='del'>-		halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], WiFi is under 5G!!!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], WiFi is under 2G!!!\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_whck_test) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is under WHCK TEST!!!\n");</div><div class='del'>-		halbtc8822b1ant_action_bt_whck_test(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is disabled !!!\n");</div><div class='del'>-		halbtc8822b1ant_action_wifi_only(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_setup_link) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is re-link !!!\n");</div><div class='del'>-		halbtc8822b1ant_action_bt_relink(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_SCO_BUSY) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY))</div><div class='del'>-		increase_scan_dev_num = true;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_INC_SCAN_DEV_NUM,</div><div class='del'>-			   &amp;increase_scan_dev_num);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-			   &amp;wifi_link_status);</div><div class='del'>-	num_of_wifi_link = wifi_link_status &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if ((num_of_wifi_link &gt;= 2) ||</div><div class='del'>-	    (wifi_link_status &amp; WIFI_P2P_GO_CONNECTED)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"############# [BTCoex],  Multi-Port num_of_wifi_link = %d, wifi_link_status = 0x%x\n",</div><div class='del'>-			num_of_wifi_link, wifi_link_status);</div><div class='del'>-</div><div class='del'>-		if (bt_link_info-&gt;bt_link_exist) {</div><div class='del'>-			halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 1, 1,</div><div class='del'>-						   0, 1);</div><div class='del'>-			miracast_plus_bt = true;</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0,</div><div class='del'>-						   0, 0);</div><div class='del'>-			miracast_plus_bt = false;</div><div class='del'>-		}</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_MIRACAST_PLUS_BT,</div><div class='del'>-				   &amp;miracast_plus_bt);</div><div class='del'>-		halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-					   bt_ctrl_agg_buf_size, agg_buf_size);</div><div class='del'>-</div><div class='del'>-		if ((bt_link_info-&gt;a2dp_exist) &amp;&amp;</div><div class='del'>-		    (coex_sta-&gt;c2h_bt_inquiry_page)) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "############# [BTCoex],  BT Is Inquirying\n");</div><div class='del'>-			halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_action_wifi_multi_port(btcoexist);</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'>-	miracast_plus_bt = false;</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_MIRACAST_PLUS_BT,</div><div class='del'>-			   &amp;miracast_plus_bt);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	if ((bt_link_info-&gt;bt_link_exist) &amp;&amp; (wifi_connected)) {</div><div class='del'>-		halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 1, 1, 0, 1);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_IOT_PEER, &amp;iot_peer);</div><div class='del'>-</div><div class='del'>-		if (iot_peer != BTC_IOT_PEER_CISCO) {</div><div class='del'>-			if (bt_link_info-&gt;sco_exist)</div><div class='del'>-				halbtc8822b1ant_limited_rx(btcoexist,</div><div class='del'>-							   NORMAL_EXEC, true,</div><div class='del'>-							   false, 0x5);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b1ant_limited_rx(btcoexist,</div><div class='del'>-							   NORMAL_EXEC, false,</div><div class='del'>-							   false, 0x5);</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-				halbtc8822b1ant_limited_rx(btcoexist,</div><div class='del'>-							   NORMAL_EXEC, true,</div><div class='del'>-							   false, 0x5);</div><div class='del'>-			} else {</div><div class='del'>-				if (wifi_bw == BTC_WIFI_BW_HT40)</div><div class='del'>-					halbtc8822b1ant_limited_rx(</div><div class='del'>-						btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						true, 0x10);</div><div class='del'>-				else</div><div class='del'>-					halbtc8822b1ant_limited_rx(</div><div class='del'>-						btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						true, 0x8);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_sw_mechanism(btcoexist, true);</div><div class='del'>-		halbtc8822b1ant_run_sw_coexist_mechanism(</div><div class='del'>-			btcoexist); /* just print debug message */</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_limited_rx(btcoexist, NORMAL_EXEC, false, false,</div><div class='del'>-					   0x5);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_sw_mechanism(btcoexist, false);</div><div class='del'>-		halbtc8822b1ant_run_sw_coexist_mechanism(</div><div class='del'>-			btcoexist); /* just print debug message */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "############# [BTCoex],  BT Is Inquirying\n");</div><div class='del'>-		halbtc8822b1ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	} else if (bt_hs_on) {</div><div class='del'>-		halbtc8822b1ant_action_hs(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!wifi_connected) {</div><div class='del'>-		bool scan = false, link = false, roam = false;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], wifi is non connected-idle !!!\n");</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;scan);</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &amp;link);</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &amp;roam);</div><div class='del'>-</div><div class='del'>-		if (scan)</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected_scan(</div><div class='del'>-				btcoexist);</div><div class='del'>-		else if (link || roam)</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected_asso_auth(</div><div class='del'>-				btcoexist);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected(btcoexist);</div><div class='del'>-	} else { /* wifi LPS/Busy */</div><div class='del'>-		halbtc8822b1ant_action_wifi_connected(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_init_coex_dm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	/* force to reset coex mechanism */</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_low_penalty_ra(btcoexist, NORMAL_EXEC, false);</div><div class='del'>-</div><div class='del'>-	/* sw all off */</div><div class='del'>-	halbtc8822b1ant_sw_mechanism(btcoexist, false);</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;pop_event_cnt = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b1ant_init_hw_config(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool back_up, bool wifi_only)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 u8tmp = 0, i = 0;</div><div class='del'>-	u32 u32tmp1 = 0, u32tmp2 = 0, u32tmp3 = 0;</div><div class='del'>-</div><div class='del'>-	u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-	u32tmp1 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-	u32tmp2 = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist, 0x54);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], ********** (Before Init HW config) 0xcb4 = 0x%x, 0x38= 0x%x, 0x54= 0x%x**********\n",</div><div class='del'>-		u32tmp3, u32tmp1, u32tmp2);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], 1Ant Init HW Config!!\n");</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;bt_coex_supported_feature = 0;</div><div class='del'>-	coex_sta-&gt;bt_coex_supported_version = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_type = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_para[0] = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_para[1] = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_para[2] = 0;</div><div class='del'>-	coex_sta-&gt;bt_reg_vendor_ac = 0xffff;</div><div class='del'>-	coex_sta-&gt;bt_reg_vendor_ae = 0xffff;</div><div class='del'>-	coex_sta-&gt;isolation_btween_wb = BT_8822B_1ANT_DEFAULT_ISOLATION;</div><div class='del'>-	coex_sta-&gt;gnt_error_cnt = 0;</div><div class='del'>-	coex_sta-&gt;bt_relink_downcount = 0;</div><div class='del'>-	coex_sta-&gt;is_set_ps_state_fail = false;</div><div class='del'>-	coex_sta-&gt;cnt_set_ps_state_fail = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= 9; i++)</div><div class='del'>-		coex_sta-&gt;bt_afh_map[i] = 0;</div><div class='del'>-</div><div class='del'>-	/* Setup RF front end type */</div><div class='del'>-	halbtc8822b1ant_set_rfe_type(btcoexist);</div><div class='del'>-</div><div class='del'>-	/* 0xf0[15:12] --&gt; Chip Cut information */</div><div class='del'>-	coex_sta-&gt;cut_version =</div><div class='del'>-		(btcoexist-&gt;btc_read_1byte(btcoexist, 0xf1) &amp; 0xf0) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x550, 0x8,</div><div class='del'>-					   0x1); /* enable TBTT nterrupt */</div><div class='del'>-</div><div class='del'>-	/* BT report packet sample rate	 */</div><div class='del'>-	/* 0x790[5:0]=0x5 */</div><div class='del'>-	u8tmp = btcoexist-&gt;btc_read_1byte(btcoexist, 0x790);</div><div class='del'>-	u8tmp &amp;= 0xc0;</div><div class='del'>-	u8tmp |= 0x5;</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x790, u8tmp);</div><div class='del'>-</div><div class='del'>-	/* Enable BT counter statistics */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x778, 0x1);</div><div class='del'>-</div><div class='del'>-	/* Enable PTA (3-wire function form BT side) */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x40, 0x20, 0x1);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x41, 0x02, 0x1);</div><div class='del'>-</div><div class='del'>-	/* Enable PTA (tx/rx signal form WiFi side) */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4c6, 0x10, 0x1);</div><div class='del'>-	/*GNT_BT=1 while select both */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x763, 0x10, 0x1);</div><div class='del'>-</div><div class='del'>-	/* enable GNT_WL */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x40, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x67, 0x1, 0x0);</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;btc_read_1byte(btcoexist, 0x80) == 0xc6)</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ONOFF, true);</div><div class='del'>-</div><div class='del'>-	/* Antenna config */</div><div class='del'>-	if (coex_sta-&gt;is_rf_state_off) {</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_WLAN_OFF);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], **********  %s (RF Off)**********\n",</div><div class='del'>-			 __func__);</div><div class='del'>-	} else if (wifi_only) {</div><div class='del'>-		coex_sta-&gt;concurrent_rx_mode_on = false;</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_WIFI,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_WLANONLY_INIT);</div><div class='del'>-	} else {</div><div class='del'>-		coex_sta-&gt;concurrent_rx_mode_on = true;</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_COEX_INIT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* PTA parameter */</div><div class='del'>-	halbtc8822b1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_enable_gnt_to_gpio(btcoexist, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_power_on_setting(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-	u8 u8tmp = 0x0;</div><div class='del'>-	u16 u16tmp = 0x0;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"xxxxxxxxxxxxxxxx Execute 8822b 1-Ant PowerOn Setting!! xxxxxxxxxxxxxxxx\n");</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "Ant Det Finish = %s, Ant Det Number  = %d\n",</div><div class='del'>-		 board_info-&gt;btdm_ant_det_finish ? "Yes" : "No",</div><div class='del'>-		 board_info-&gt;btdm_ant_num_by_ant_det);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;dbg_mode_1ant = false;</div><div class='del'>-	btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-</div><div class='del'>-	/* enable BB, REG_SYS_FUNC_EN such that we can write 0x948 correctly. */</div><div class='del'>-	u16tmp = btcoexist-&gt;btc_read_2byte(btcoexist, 0x2);</div><div class='del'>-	btcoexist-&gt;btc_write_2byte(btcoexist, 0x2, u16tmp | BIT(0) | BIT(1));</div><div class='del'>-</div><div class='del'>-	/* set Path control owner to WiFi */</div><div class='del'>-	halbtc8822b1ant_ltecoex_pathcontrol_owner(btcoexist,</div><div class='del'>-						  BT_8822B_1ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-	/* set GNT_BT to high */</div><div class='del'>-	halbtc8822b1ant_ltecoex_set_gnt_bt(btcoexist,</div><div class='del'>-					   BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-					   BT_8822B_1ANT_GNT_CTRL_BY_SW,</div><div class='del'>-					   BT_8822B_1ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-	/* Set GNT_WL to low */</div><div class='del'>-	halbtc8822b1ant_ltecoex_set_gnt_wl(</div><div class='del'>-		btcoexist, BT_8822B_1ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-		BT_8822B_1ANT_GNT_CTRL_BY_SW, BT_8822B_1ANT_SIG_STA_SET_TO_LOW);</div><div class='del'>-</div><div class='del'>-	/* set WLAN_ACT = 0 */</div><div class='del'>-	/* btcoexist-&gt;btc_write_1byte(btcoexist, 0x76e, 0x4); */</div><div class='del'>-</div><div class='del'>-	/* SD1 Chunchu red x issue */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0xff1a, 0x0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_enable_gnt_to_gpio(btcoexist, true);</div><div class='del'>-</div><div class='del'>-	/* */</div><div class='del'>-	/* S0 or S1 setting and Local register setting</div><div class='del'>-	 * (By the setting fw can get ant number, S0/S1, ... info)</div><div class='del'>-	 */</div><div class='del'>-	/* Local setting bit define */</div><div class='del'>-	/*	BIT0: "0" for no antenna inverse; "1" for antenna inverse  */</div><div class='del'>-	/*	BIT1: "0" for internal switch; "1" for external switch */</div><div class='del'>-	/*	BIT2: "0" for one antenna; "1" for two antenna */</div><div class='del'>-	/* NOTE: here default all internal switch and 1-antenna ==&gt;</div><div class='del'>-	 *       BIT1=0 and BIT2=0</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	u8tmp = 0;</div><div class='del'>-	board_info-&gt;btdm_ant_pos = BTC_ANTENNA_AT_MAIN_PORT;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;chip_interface == BTC_INTF_USB)</div><div class='del'>-		btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0xfe08, u8tmp);</div><div class='del'>-	else if (btcoexist-&gt;chip_interface == BTC_INTF_SDIO)</div><div class='del'>-		btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0x60, u8tmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_pre_load_firmware(struct btc_coexist *btcoexist) {}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_init_hw_config(struct btc_coexist *btcoexist,</div><div class='del'>-				    bool wifi_only)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (ini hw config) **********\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_init_hw_config(btcoexist, true, wifi_only);</div><div class='del'>-	btcoexist-&gt;stop_coex_dm = false;</div><div class='del'>-	btcoexist-&gt;auto_report_1ant = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_init_coex_dm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], Coex Mechanism Init!!\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;stop_coex_dm = false;</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_init_coex_dm(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_query_bt_info(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_display_coex_info(struct btc_coexist *btcoexist,</div><div class='del'>-				       struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	u8 u8tmp[4], i, ps_tdma_case = 0;</div><div class='del'>-	u16 u16tmp[4];</div><div class='del'>-	u32 u32tmp[4];</div><div class='del'>-	u32 fa_ofdm, fa_cck, cca_ofdm, cca_cck;</div><div class='del'>-	u32 fw_ver = 0, bt_patch_ver = 0, bt_coex_ver = 0;</div><div class='del'>-	static u8 pop_report_in_10s;</div><div class='del'>-	u32 phyver = 0;</div><div class='del'>-	bool lte_coex_on = false;</div><div class='del'>-	static u8 cnt;</div><div class='del'>-</div><div class='del'>-	seq_puts(m, "\r\n ============[BT Coexist info]============");</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control) {</div><div class='del'>-		seq_puts(m,</div><div class='del'>-			 "\r\n ============[Under Manual Control]============");</div><div class='del'>-		seq_puts(m, "\r\n ==========================================");</div><div class='del'>-	}</div><div class='del'>-	if (btcoexist-&gt;stop_coex_dm) {</div><div class='del'>-		seq_puts(m, "\r\n ============[Coex is STOPPED]============");</div><div class='del'>-		seq_puts(m, "\r\n ==========================================");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;bt_disabled) {</div><div class='del'>-		if (coex_sta-&gt;bt_coex_supported_feature == 0)</div><div class='del'>-			btcoexist-&gt;btc_get(</div><div class='del'>-				btcoexist, BTC_GET_U4_SUPPORTED_FEATURE,</div><div class='del'>-				&amp;coex_sta-&gt;bt_coex_supported_feature);</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_coex_supported_version == 0) ||</div><div class='del'>-		    (coex_sta-&gt;bt_coex_supported_version == 0xffff))</div><div class='del'>-			btcoexist-&gt;btc_get(</div><div class='del'>-				btcoexist, BTC_GET_U4_SUPPORTED_VERSION,</div><div class='del'>-				&amp;coex_sta-&gt;bt_coex_supported_version);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_reg_vendor_ac == 0xffff)</div><div class='del'>-			coex_sta-&gt;bt_reg_vendor_ac = (u16)(</div><div class='del'>-				btcoexist-&gt;btc_get_bt_reg(btcoexist, 3, 0xac) &amp;</div><div class='del'>-				0xffff);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_reg_vendor_ae == 0xffff)</div><div class='del'>-			coex_sta-&gt;bt_reg_vendor_ae = (u16)(</div><div class='del'>-				btcoexist-&gt;btc_get_bt_reg(btcoexist, 3, 0xae) &amp;</div><div class='del'>-				0xffff);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER,</div><div class='del'>-				   &amp;bt_patch_ver);</div><div class='del'>-		btcoexist-&gt;bt_info.bt_get_fw_ver = bt_patch_ver;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;num_of_profile &gt; 0) {</div><div class='del'>-			cnt++;</div><div class='del'>-</div><div class='del'>-			if (cnt &gt;= 3) {</div><div class='del'>-				btcoexist-&gt;btc_get_bt_afh_map_from_bt(</div><div class='del'>-					btcoexist, 0, &amp;coex_sta-&gt;bt_afh_map[0]);</div><div class='del'>-				cnt = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (psd_scan-&gt;ant_det_try_count == 0) {</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s = %d/ %d/ %s / %d",</div><div class='del'>-			"Ant PG Num/ Mech/ Pos/ RFE", board_info-&gt;pg_ant_num,</div><div class='del'>-			board_info-&gt;btdm_ant_num,</div><div class='del'>-			(board_info-&gt;btdm_ant_pos == BTC_ANTENNA_AT_MAIN_PORT ?</div><div class='del'>-				 "Main" :</div><div class='del'>-				 "Aux"),</div><div class='del'>-			rfe_type-&gt;rfe_module_type);</div><div class='del'>-	} else {</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s = %d/ %d/ %s/ %d  (%d/%d/%d)",</div><div class='del'>-			"Ant PG Num/ Mech(Ant_Det)/ Pos/ RFE",</div><div class='del'>-			board_info-&gt;pg_ant_num,</div><div class='del'>-			board_info-&gt;btdm_ant_num_by_ant_det,</div><div class='del'>-			(board_info-&gt;btdm_ant_pos == BTC_ANTENNA_AT_MAIN_PORT ?</div><div class='del'>-				 "Main" :</div><div class='del'>-				 "Aux"),</div><div class='del'>-			rfe_type-&gt;rfe_module_type, psd_scan-&gt;ant_det_try_count,</div><div class='del'>-			psd_scan-&gt;ant_det_fail_count, psd_scan-&gt;ant_det_result);</div><div class='del'>-</div><div class='del'>-		if (board_info-&gt;btdm_ant_det_finish) {</div><div class='del'>-			if (psd_scan-&gt;ant_det_result != 12)</div><div class='del'>-				seq_printf(m, "\r\n %-35s = %s",</div><div class='del'>-					   "Ant Det PSD Value",</div><div class='del'>-					   psd_scan-&gt;ant_det_peak_val);</div><div class='del'>-			else</div><div class='del'>-				seq_printf(m, "\r\n %-35s = %d",</div><div class='del'>-					   "Ant Det PSD Value",</div><div class='del'>-					   psd_scan-&gt;ant_det_psd_scan_peak_val /</div><div class='del'>-						   100);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bt_patch_ver = btcoexist-&gt;bt_info.bt_get_fw_ver;</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &amp;fw_ver);</div><div class='del'>-	phyver = btcoexist-&gt;btc_get_bt_phydm_version(btcoexist);</div><div class='del'>-</div><div class='del'>-	bt_coex_ver = ((coex_sta-&gt;bt_coex_supported_version &amp; 0xff00) &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	seq_printf(</div><div class='del'>-		m, "\r\n %-35s = %d_%02x/ 0x%02x/ 0x%02x (%s)",</div><div class='del'>-		"CoexVer WL/  BT_Desired/ BT_Report",</div><div class='del'>-		glcoex_ver_date_8822b_1ant, glcoex_ver_8822b_1ant,</div><div class='del'>-		glcoex_ver_btdesired_8822b_1ant, bt_coex_ver,</div><div class='del'>-		(bt_coex_ver == 0xff ?</div><div class='del'>-			 "Unknown" :</div><div class='del'>-			 (coex_sta-&gt;bt_disabled ?  "BT-disable" :</div><div class='del'>-			  (bt_coex_ver &gt;= glcoex_ver_btdesired_8822b_1ant ?</div><div class='del'>-				   "Match" :</div><div class='del'>-				   "Mis-Match"))));</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ v%d/ %c", "W_FW/ B_FW/ Phy/ Kt",</div><div class='del'>-		   fw_ver, bt_patch_ver, phyver, coex_sta-&gt;cut_version + 65);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %02x %02x %02x ", "AFH Map to BT",</div><div class='del'>-		   coex_dm-&gt;wifi_chnl_info[0], coex_dm-&gt;wifi_chnl_info[1],</div><div class='del'>-		   coex_dm-&gt;wifi_chnl_info[2]);</div><div class='del'>-</div><div class='del'>-	/* wifi status */</div><div class='del'>-	seq_printf(m, "\r\n %-35s", "============[Wifi Status]============");</div><div class='del'>-	btcoexist-&gt;btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_WIFI_STATUS, m);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s", "============[BT Status]============");</div><div class='del'>-</div><div class='del'>-	pop_report_in_10s++;</div><div class='del'>-	seq_printf(</div><div class='del'>-		m, "\r\n %-35s = [%s/ %d dBm/ %d/ %d] ",</div><div class='del'>-		"BT [status/ rssi/ retryCnt/ popCnt]",</div><div class='del'>-		((coex_sta-&gt;bt_disabled) ?</div><div class='del'>-			 ("disabled") :</div><div class='del'>-			 ((coex_sta-&gt;c2h_bt_inquiry_page) ?  ("inquiry/page") :</div><div class='del'>-			  ((BT_8822B_1ANT_BT_STATUS_NON_CONNECTED_IDLE ==</div><div class='del'>-			    coex_dm-&gt;bt_status) ?</div><div class='del'>-				   "non-connected idle" :</div><div class='del'>-				   ((coex_dm-&gt;bt_status ==</div><div class='del'>-				     BT_8822B_1ANT_BT_STATUS_CONNECTED_IDLE) ?</div><div class='del'>-					    "connected-idle" :</div><div class='del'>-					    "busy")))),</div><div class='del'>-		coex_sta-&gt;bt_rssi - 100, coex_sta-&gt;bt_retry_cnt,</div><div class='del'>-		coex_sta-&gt;pop_event_cnt);</div><div class='del'>-</div><div class='del'>-	if (pop_report_in_10s &gt;= 5) {</div><div class='del'>-		coex_sta-&gt;pop_event_cnt = 0;</div><div class='del'>-		pop_report_in_10s = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;num_of_profile != 0)</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s = %s%s%s%s%s", "Profiles",</div><div class='del'>-			((bt_link_info-&gt;a2dp_exist) ?</div><div class='del'>-				 ((coex_sta-&gt;is_bt_a2dp_sink) ? "A2DP sink," :</div><div class='del'>-								"A2DP,") :</div><div class='del'>-				 ""),</div><div class='del'>-			((bt_link_info-&gt;sco_exist) ? "HFP," : ""),</div><div class='del'>-			((bt_link_info-&gt;hid_exist) ?</div><div class='del'>-				 ((coex_sta-&gt;hid_busy_num &gt;= 2) ?</div><div class='del'>-					  "HID(4/18)," :</div><div class='del'>-					  "HID(2/18),") :</div><div class='del'>-				 ""),</div><div class='del'>-			((bt_link_info-&gt;pan_exist) ? "PAN," : ""),</div><div class='del'>-			((coex_sta-&gt;voice_over_HOGP) ? "Voice" : ""));</div><div class='del'>-	else</div><div class='del'>-		seq_printf(m, "\r\n %-35s = None", "Profiles");</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %s/ %d/ %s",</div><div class='del'>-			   "A2DP Rate/Bitpool/Auto_Slot",</div><div class='del'>-			   ((coex_sta-&gt;is_A2DP_3M) ? "3M" : "No_3M"),</div><div class='del'>-			   coex_sta-&gt;a2dp_bit_pool,</div><div class='del'>-			   ((coex_sta-&gt;is_autoslot) ? "On" : "Off"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;hid_exist) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %d/ %d", "HID PairNum/Forbid_Slot",</div><div class='del'>-			   coex_sta-&gt;hid_pair_cnt, coex_sta-&gt;forbidden_slot);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %d/ %s/ 0x%x",</div><div class='del'>-		   "Role/RoleSwCnt/IgnWlact/Feature",</div><div class='del'>-		   ((bt_link_info-&gt;slave_role) ? "Slave" : "Master"),</div><div class='del'>-		   coex_sta-&gt;cnt_role_switch,</div><div class='del'>-		   ((coex_dm-&gt;cur_ignore_wlan_act) ? "Yes" : "No"),</div><div class='del'>-		   coex_sta-&gt;bt_coex_supported_feature);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x7) != 0x0) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-			   "BLEScan Type/TV/Init/Ble",</div><div class='del'>-			   coex_sta-&gt;bt_ble_scan_type,</div><div class='del'>-			   (coex_sta-&gt;bt_ble_scan_type &amp; 0x1 ?</div><div class='del'>-				    coex_sta-&gt;bt_ble_scan_para[0] :</div><div class='del'>-				    0x0),</div><div class='del'>-			   (coex_sta-&gt;bt_ble_scan_type &amp; 0x2 ?</div><div class='del'>-				    coex_sta-&gt;bt_ble_scan_para[1] :</div><div class='del'>-				    0x0),</div><div class='del'>-			   (coex_sta-&gt;bt_ble_scan_type &amp; 0x4 ?</div><div class='del'>-				    coex_sta-&gt;bt_ble_scan_para[2] :</div><div class='del'>-				    0x0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d/ %d",</div><div class='del'>-		   "ReInit/ReLink/IgnWlact/Page/NameReq", coex_sta-&gt;cnt_reinit,</div><div class='del'>-		   coex_sta-&gt;cnt_setup_link, coex_sta-&gt;cnt_ign_wlan_act,</div><div class='del'>-		   coex_sta-&gt;cnt_page, coex_sta-&gt;cnt_remote_name_req);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_read_score_board(btcoexist, &amp;u16tmp[0]);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_reg_vendor_ae == 0xffff) ||</div><div class='del'>-	    (coex_sta-&gt;bt_reg_vendor_ac == 0xffff))</div><div class='del'>-		seq_printf(m, "\r\n %-35s = x/ x/ %04x",</div><div class='del'>-			   "0xae[4]/0xac[1:0]/Scoreboard", u16tmp[0]);</div><div class='del'>-	else</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ %04x",</div><div class='del'>-			   "0xae[4]/0xac[1:0]/Scoreboard",</div><div class='del'>-			   (int)((coex_sta-&gt;bt_reg_vendor_ae &amp; BIT(4)) &gt;&gt; 4),</div><div class='del'>-			   coex_sta-&gt;bt_reg_vendor_ac &amp; 0x3, u16tmp[0]);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;num_of_profile &gt; 0) {</div><div class='del'>-		seq_printf(</div><div class='del'>-			m,</div><div class='del'>-			"\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",</div><div class='del'>-			"AFH MAP", coex_sta-&gt;bt_afh_map[0],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[1], coex_sta-&gt;bt_afh_map[2],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[3], coex_sta-&gt;bt_afh_map[4],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[5], coex_sta-&gt;bt_afh_map[6],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[7], coex_sta-&gt;bt_afh_map[8],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[9]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BT_INFO_SRC_8822B_1ANT_MAX; i++) {</div><div class='del'>-		if (coex_sta-&gt;bt_info_c2h_cnt[i]) {</div><div class='del'>-			seq_printf(</div><div class='del'>-				m,</div><div class='del'>-				"\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)",</div><div class='del'>-				glbt_info_src_8822b_1ant[i],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][0],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][1],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][2],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][3],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][4],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][5],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][6],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h_cnt[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s",</div><div class='del'>-			"============[mechanisms] (before Manual)============");</div><div class='del'>-	else</div><div class='del'>-		seq_printf(m, "\r\n %-35s",</div><div class='del'>-			   "============[Mechanisms]============");</div><div class='del'>-</div><div class='del'>-	ps_tdma_case = coex_dm-&gt;cur_ps_tdma;</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %02x %02x %02x %02x %02x (case-%d, %s)",</div><div class='del'>-		   "TDMA", coex_dm-&gt;ps_tdma_para[0], coex_dm-&gt;ps_tdma_para[1],</div><div class='del'>-		   coex_dm-&gt;ps_tdma_para[2], coex_dm-&gt;ps_tdma_para[3],</div><div class='del'>-		   coex_dm-&gt;ps_tdma_para[4], ps_tdma_case,</div><div class='del'>-		   (coex_dm-&gt;cur_ps_tdma_on ? "TDMA On" : "TDMA Off"));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6c0);</div><div class='del'>-	u32tmp[1] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6c4);</div><div class='del'>-	u32tmp[2] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6c8);</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-		   "Table/0x6c0/0x6c4/0x6c8", coex_sta-&gt;coex_table_type,</div><div class='del'>-		   u32tmp[0], u32tmp[1], u32tmp[2]);</div><div class='del'>-</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x778);</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6cc);</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x", "0x778/0x6cc", u8tmp[0],</div><div class='del'>-		   u32tmp[0]);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %s/ %s/ %d",</div><div class='del'>-		   "AntDiv/BtCtrlLPS/LPRA/PsFail",</div><div class='del'>-		   ((board_info-&gt;ant_div_cfg) ? "On" : "Off"),</div><div class='del'>-		   ((coex_sta-&gt;force_lps_ctrl) ? "On" : "Off"),</div><div class='del'>-		   ((coex_dm-&gt;cur_low_penalty_ra) ? "On" : "Off"),</div><div class='del'>-		   coex_sta-&gt;cnt_set_ps_state_fail);</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-	lte_coex_on = ((u32tmp[0] &amp; BIT(7)) &gt;&gt; 7) ? true : false;</div><div class='del'>-</div><div class='del'>-	if (lte_coex_on) {</div><div class='del'>-		u32tmp[0] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xa0);</div><div class='del'>-		u32tmp[1] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xa4);</div><div class='del'>-</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x",</div><div class='del'>-			   "LTE Coex Table W_L/B_L", u32tmp[0] &amp; 0xffff,</div><div class='del'>-			   u32tmp[1] &amp; 0xffff);</div><div class='del'>-</div><div class='del'>-		u32tmp[0] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xa8);</div><div class='del'>-		u32tmp[1] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xac);</div><div class='del'>-		u32tmp[2] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xb0);</div><div class='del'>-		u32tmp[3] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xb4);</div><div class='del'>-</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-			   "LTE Break Table W_L/B_L/L_W/L_B",</div><div class='del'>-			   u32tmp[0] &amp; 0xffff, u32tmp[1] &amp; 0xffff,</div><div class='del'>-			   u32tmp[2] &amp; 0xffff, u32tmp[3] &amp; 0xffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Hw setting		 */</div><div class='del'>-	seq_printf(m, "\r\n %-35s", "============[Hw setting]============");</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-	u32tmp[1] = halbtc8822b1ant_ltecoex_indirect_read_reg(btcoexist, 0x54);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x73);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %s", "LTE Coex/Path Owner",</div><div class='del'>-		   ((lte_coex_on) ? "On" : "Off"),</div><div class='del'>-		   ((u8tmp[0] &amp; BIT(2)) ? "WL" : "BT"));</div><div class='del'>-</div><div class='del'>-	if (lte_coex_on) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d",</div><div class='del'>-			   "LTE 3Wire/OPMode/UART/UARTMode",</div><div class='del'>-			   (int)((u32tmp[0] &amp; BIT(6)) &gt;&gt; 6),</div><div class='del'>-			   (int)((u32tmp[0] &amp; (BIT(5) | BIT(4))) &gt;&gt; 4),</div><div class='del'>-			   (int)((u32tmp[0] &amp; BIT(3)) &gt;&gt; 3),</div><div class='del'>-			   (int)(u32tmp[0] &amp; (BIT(2) | BIT(1) | BIT(0))));</div><div class='del'>-</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %d/ %d", "LTE_Busy/UART_Busy",</div><div class='del'>-			   (int)((u32tmp[1] &amp; BIT(1)) &gt;&gt; 1),</div><div class='del'>-			   (int)(u32tmp[1] &amp; BIT(0)));</div><div class='del'>-	}</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s (BB:%s)/ %s (BB:%s)/ %s %d",</div><div class='del'>-		   "GNT_WL_Ctrl/GNT_BT_Ctrl/Dbg",</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(12)) ? "SW" : "HW"),</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(8)) ? "SW" : "HW"),</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(14)) ? "SW" : "HW"),</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(10)) ? "SW" : "HW"),</div><div class='del'>-		   ((u8tmp[0] &amp; BIT(3)) ? "On" : "Off"),</div><div class='del'>-		   coex_sta-&gt;gnt_error_cnt);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d", "GNT_WL/GNT_BT",</div><div class='del'>-		   (int)((u32tmp[1] &amp; BIT(2)) &gt;&gt; 2),</div><div class='del'>-		   (int)((u32tmp[1] &amp; BIT(3)) &gt;&gt; 3));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb0);</div><div class='del'>-	u32tmp[1] = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0xcba);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%04x/ 0x%04x/ 0x%02x %s",</div><div class='del'>-		   "0xcb0/0xcb4/0xcb8[23:16]", u32tmp[0], u32tmp[1], u8tmp[0],</div><div class='del'>-		   ((u8tmp[0] &amp; 0x1) == 0x1 ? "(BTG)" : "(WL_A+G)"));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x4c);</div><div class='del'>-	u8tmp[2] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x64);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x4c6);</div><div class='del'>-	u8tmp[1] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x40);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-		   "4c[24:23]/64[0]/4c6[4]/40[5]",</div><div class='del'>-		   (int)((u32tmp[0] &amp; (BIT(24) | BIT(23))) &gt;&gt; 23),</div><div class='del'>-		   u8tmp[2] &amp; 0x1, (int)((u8tmp[0] &amp; BIT(4)) &gt;&gt; 4),</div><div class='del'>-		   (int)((u8tmp[1] &amp; BIT(5)) &gt;&gt; 5));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x550);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x522);</div><div class='del'>-	u8tmp[1] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x953);</div><div class='del'>-	u8tmp[2] = btcoexist-&gt;btc_read_1byte(btcoexist, 0xc50);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ %s/ 0x%x",</div><div class='del'>-		   "0x550/0x522/4-RxAGC/0xc50", u32tmp[0], u8tmp[0],</div><div class='del'>-		   (u8tmp[1] &amp; 0x2) ? "On" : "Off", u8tmp[2]);</div><div class='del'>-</div><div class='del'>-	fa_ofdm = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-							 "PHYDM_INFO_FA_OFDM");</div><div class='del'>-	fa_cck = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-							"PHYDM_INFO_FA_CCK");</div><div class='del'>-	cca_ofdm = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CCA_OFDM");</div><div class='del'>-	cca_cck = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-							 "PHYDM_INFO_CCA_CCK");</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-		   "CCK-CCA/CCK-FA/OFDM-CCA/OFDM-FA", cca_cck, fa_cck, cca_ofdm,</div><div class='del'>-		   fa_ofdm);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d", "CRC_OK CCK/11g/11n/11ac",</div><div class='del'>-		   coex_sta-&gt;crc_ok_cck, coex_sta-&gt;crc_ok_11g,</div><div class='del'>-		   coex_sta-&gt;crc_ok_11n, coex_sta-&gt;crc_ok_11n_vht);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d", "CRC_Err CCK/11g/11n/11ac",</div><div class='del'>-		   coex_sta-&gt;crc_err_cck, coex_sta-&gt;crc_err_11g,</div><div class='del'>-		   coex_sta-&gt;crc_err_11n, coex_sta-&gt;crc_err_11n_vht);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %s/ %s/ %d",</div><div class='del'>-		   "WlHiPri/ Locking/ Locked/ Noisy",</div><div class='del'>-		   (coex_sta-&gt;wifi_is_high_pri_task ? "Yes" : "No"),</div><div class='del'>-		   (coex_sta-&gt;cck_lock ? "Yes" : "No"),</div><div class='del'>-		   (coex_sta-&gt;cck_ever_lock ? "Yes" : "No"),</div><div class='del'>-		   coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d", "0x770(Hi-pri rx/tx)",</div><div class='del'>-		   coex_sta-&gt;high_priority_rx, coex_sta-&gt;high_priority_tx);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d %s", "0x774(Lo-pri rx/tx)",</div><div class='del'>-		   coex_sta-&gt;low_priority_rx, coex_sta-&gt;low_priority_tx,</div><div class='del'>-		   (bt_link_info-&gt;slave_role ?</div><div class='del'>-			    "(Slave!!)" :</div><div class='del'>-			    (coex_sta-&gt;is_tdma_btautoslot_hang ?</div><div class='del'>-				     "(auto-slot hang!!)" :</div><div class='del'>-				     "")));</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_COEX_STATISTICS, m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == BTC_IPS_ENTER) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], IPS ENTER notify\n");</div><div class='del'>-		coex_sta-&gt;under_ips = true;</div><div class='del'>-</div><div class='del'>-		/* Write WL "Active" in Score-board for LPS off */</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ONOFF, false);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_WLAN_OFF);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-	} else if (type == BTC_IPS_LEAVE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], IPS LEAVE notify\n");</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ONOFF, true);</div><div class='del'>-</div><div class='del'>-		/*leave IPS : run ini hw config (exclude wifi only)*/</div><div class='del'>-		halbtc8822b1ant_init_hw_config(btcoexist, false, false);</div><div class='del'>-		/*sw all off*/</div><div class='del'>-		halbtc8822b1ant_init_coex_dm(btcoexist);</div><div class='del'>-		/*leave IPS : Query bt info*/</div><div class='del'>-		halbtc8822b1ant_query_bt_info(btcoexist);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;under_ips = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static bool pre_force_lps_on;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == BTC_LPS_ENABLE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], LPS ENABLE notify\n");</div><div class='del'>-		coex_sta-&gt;under_lps = true;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;force_lps_ctrl) { /* LPS No-32K */</div><div class='del'>-			/* Write WL "Active" in Score-board for PS-TDMA */</div><div class='del'>-			pre_force_lps_on = true;</div><div class='del'>-			halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-				btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE,</div><div class='del'>-				true);</div><div class='del'>-		} else {</div><div class='del'>-			/* LPS-32K, need check if this h2c 0x71 can work??</div><div class='del'>-			 * (2015/08/28)</div><div class='del'>-			 */</div><div class='del'>-			/* Write WL "Non-Active" in Score-board for Native-PS */</div><div class='del'>-			pre_force_lps_on = false;</div><div class='del'>-			halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-				btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE,</div><div class='del'>-				false);</div><div class='del'>-		}</div><div class='del'>-	} else if (type == BTC_LPS_DISABLE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], LPS DISABLE notify\n");</div><div class='del'>-		coex_sta-&gt;under_lps = false;</div><div class='del'>-</div><div class='del'>-		/* Write WL "Active" in Score-board for LPS off */</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-		if ((!pre_force_lps_on) &amp;&amp; (!coex_sta-&gt;force_lps_ctrl))</div><div class='del'>-			halbtc8822b1ant_query_bt_info(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;freeze_coexrun_by_btinfo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-	if (wifi_connected)</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], ********** WL connected before SCAN\n");</div><div class='del'>-	else</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], **********  WL is not connected before SCAN\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_query_bt_info(btcoexist);</div><div class='del'>-</div><div class='del'>-	/*2.4 g 1*/</div><div class='del'>-	if (type == BTC_SCAN_START) {</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G,</div><div class='del'>-				   &amp;wifi_under_5g);</div><div class='del'>-		/*5 g 1*/</div><div class='del'>-</div><div class='del'>-		if (wifi_under_5g) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** (scan_notify_5g_scan_start) **********\n");</div><div class='del'>-			halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* 2.4G.2.3*/</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (scan_notify_2g_scan_start) **********\n");</div><div class='del'>-</div><div class='del'>-		if (!wifi_connected) { /* non-connected scan */</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** wifi is not connected scan **********\n");</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected_scan(</div><div class='del'>-				btcoexist);</div><div class='del'>-		} else { /* wifi is connected */</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** wifi is connected scan **********\n");</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected_scan(btcoexist);</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'>-	if (type == BTC_SCAN_START_2G) {</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (scan_notify_2g_sacn_start_for_switch_band_used) **********\n");</div><div class='del'>-</div><div class='del'>-		if (!wifi_connected) { /* non-connected scan */</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** wifi is not connected **********\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected_scan(</div><div class='del'>-				btcoexist);</div><div class='del'>-		} else { /* wifi is connected */</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** wifi is connected **********\n");</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected_scan(btcoexist);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = false;</div><div class='del'>-</div><div class='del'>-		/* 2.4G 5 WL scan finish, then get and update sacn ap numbers */</div><div class='del'>-		/*5 g 4*/</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-				   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (scan_finish_notify) **********\n");</div><div class='del'>-</div><div class='del'>-		if (!wifi_connected) { /* non-connected scan */</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** scan_finish_notify wifi is connected **********\n");</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected(btcoexist);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_scan_notify_without_bt(struct btc_coexist *btcoexist,</div><div class='del'>-					    u8 type)</div><div class='del'>-{</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	if (type == BTC_SCAN_START) {</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G,</div><div class='del'>-				   &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-		if (wifi_under_5g) {</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd,</div><div class='del'>-							   0x3, 1);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* under 2.4G */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x3, 2);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (type == BTC_SCAN_START_2G)</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x3, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_switchband_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (switchband_notify) **********\n");</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;switch_band_notify_to = type;</div><div class='del'>-	/*2.4g 4.*/ /*5 g 2*/</div><div class='del'>-	if (type == BTC_SWITCH_TO_5G) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (switchband_notify BTC_SWITCH_TO_5G) **********\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	} else if (type == BTC_SWITCH_TO_24G_NOFORSCAN) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (switchband_notify BTC_SWITCH_TO_2G (no for scan)) **********\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-		/*5 g 3*/</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** (switchband_notify BTC_SWITCH_TO_2G) **********\n");</div><div class='del'>-</div><div class='del'>-		ex_btc8822b1ant_scan_notify(btcoexist, BTC_SCAN_START_2G);</div><div class='del'>-	}</div><div class='del'>-	coex_sta-&gt;switch_band_notify_to = BTC_NOT_SWITCH;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_switchband_notify_without_bt(struct btc_coexist *btcoexist,</div><div class='del'>-						  u8 type)</div><div class='del'>-{</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if (type == BTC_SWITCH_TO_5G) {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x3, 1);</div><div class='del'>-		return;</div><div class='del'>-	} else if (type == BTC_SWITCH_TO_24G_NOFORSCAN) {</div><div class='del'>-		if (wifi_under_5g)</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd,</div><div class='del'>-							   0x3, 1);</div><div class='del'>-</div><div class='del'>-		else</div><div class='del'>-			btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd,</div><div class='del'>-							   0x3, 2);</div><div class='del'>-	} else {</div><div class='del'>-		ex_btc8822b1ant_scan_notify_without_bt(btcoexist,</div><div class='del'>-						       BTC_SCAN_START_2G);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ********** (connect notify) **********\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_post_state_to_bt(btcoexist,</div><div class='del'>-					 BT_8822B_1ANT_SCOREBOARD_SCAN, true);</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((type == BTC_ASSOCIATE_5G_START) ||</div><div class='del'>-	    (type == BTC_ASSOCIATE_5G_FINISH)) {</div><div class='del'>-		if (type == BTC_ASSOCIATE_5G_START) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** (5G associate start notify) **********\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-</div><div class='del'>-		} else if (type == BTC_ASSOCIATE_5G_FINISH) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** (5G associate finish notify) **********\n");</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'>-	if (type == BTC_ASSOCIATE_START) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], 2G CONNECT START notify\n");</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;arp_cnt = 0;</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_action_wifi_not_connected_asso_auth(btcoexist);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;freeze_coexrun_by_btinfo = true;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], 2G CONNECT Finish notify\n");</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = false;</div><div class='del'>-		coex_sta-&gt;freeze_coexrun_by_btinfo = false;</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-				   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-		if (!wifi_connected) /* non-connected scan */</div><div class='del'>-			halbtc8822b1ant_action_wifi_not_connected(btcoexist);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b1ant_action_wifi_connected(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_media_status_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_under_b_mode = false;</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if (type == BTC_MEDIA_CONNECT) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], 2g media connect notify");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-		if (wifi_under_5g) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], 5g media notify\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		/* Force antenna setup for no scan result issue */</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-				   &amp;wifi_under_b_mode);</div><div class='del'>-</div><div class='del'>-		/* Set CCK Tx/Rx high Pri except 11b mode */</div><div class='del'>-		if (wifi_under_b_mode) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** (media status notity under b mode) **********\n");</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cd,</div><div class='del'>-						   0x00); /* CCK Tx */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cf,</div><div class='del'>-						   0x00); /* CCK Rx */</div><div class='del'>-		} else {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** (media status notity not under b mode) **********\n");</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cd,</div><div class='del'>-						   0x00); /* CCK Tx */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cf,</div><div class='del'>-						   0x10); /* CCK Rx */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;backup_arfr_cnt1 =</div><div class='del'>-			btcoexist-&gt;btc_read_4byte(btcoexist, 0x430);</div><div class='del'>-		coex_dm-&gt;backup_arfr_cnt2 =</div><div class='del'>-			btcoexist-&gt;btc_read_4byte(btcoexist, 0x434);</div><div class='del'>-		coex_dm-&gt;backup_retry_limit =</div><div class='del'>-			btcoexist-&gt;btc_read_2byte(btcoexist, 0x42a);</div><div class='del'>-		coex_dm-&gt;backup_ampdu_max_time =</div><div class='del'>-			btcoexist-&gt;btc_read_1byte(btcoexist, 0x456);</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], 2g media disconnect notify\n");</div><div class='del'>-		coex_dm-&gt;arp_cnt = 0;</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cd, 0x0); /* CCK Tx */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cf, 0x0); /* CCK Rx */</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;cck_ever_lock = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_update_wifi_ch_info(btcoexist, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_specific_packet_notify(struct btc_coexist *btcoexist,</div><div class='del'>-					    u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool under_4way = false, wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-	if (wifi_under_5g) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], 5g special packet notify\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_action_wifi_under5g(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-			   &amp;under_4way);</div><div class='del'>-</div><div class='del'>-	if (under_4way) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], specific Packet ---- under_4way!!\n");</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-		coex_sta-&gt;specific_pkt_period_cnt = 2;</div><div class='del'>-	} else if (type == BTC_PACKET_ARP) {</div><div class='del'>-		coex_dm-&gt;arp_cnt++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;wifi_is_high_pri_task) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], specific Packet ARP notify -cnt = %d\n",</div><div class='del'>-				coex_dm-&gt;arp_cnt);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], specific Packet DHCP or EAPOL notify [Type = %d]\n",</div><div class='del'>-			type);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-		coex_sta-&gt;specific_pkt_period_cnt = 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;wifi_is_high_pri_task)</div><div class='del'>-		halbtc8822b1ant_action_wifi_connected_specific_packet(</div><div class='del'>-			btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,</div><div class='del'>-				    u8 length)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 i, rsp_source = 0;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	bool wifi_scan = false, wifi_link = false, wifi_roam = false,</div><div class='del'>-	     wifi_busy = false;</div><div class='del'>-	static bool is_scoreboard_scan;</div><div class='del'>-</div><div class='del'>-	if (psd_scan-&gt;is_ant_det_running) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], bt_info_notify return for AntDet is running\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rsp_source = tmp_buf[0] &amp; 0xf;</div><div class='del'>-	if (rsp_source &gt;= BT_INFO_SRC_8822B_1ANT_MAX)</div><div class='del'>-		rsp_source = BT_INFO_SRC_8822B_1ANT_WIFI_FW;</div><div class='del'>-	coex_sta-&gt;bt_info_c2h_cnt[rsp_source]++;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], Bt_info[%d], len=%d, data=[", rsp_source, length);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; length; i++) {</div><div class='del'>-		coex_sta-&gt;bt_info_c2h[rsp_source][i] = tmp_buf[i];</div><div class='del'>-</div><div class='del'>-		if (i == length - 1) {</div><div class='del'>-			/* last one */</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "0x%02x]\n", tmp_buf[i]);</div><div class='del'>-		} else {</div><div class='del'>-			/* normal */</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "0x%02x, ",</div><div class='del'>-				 tmp_buf[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;bt_info = coex_sta-&gt;bt_info_c2h[rsp_source][1];</div><div class='del'>-	coex_sta-&gt;bt_info_ext = coex_sta-&gt;bt_info_c2h[rsp_source][4];</div><div class='del'>-	coex_sta-&gt;bt_info_ext2 = coex_sta-&gt;bt_info_c2h[rsp_source][5];</div><div class='del'>-</div><div class='del'>-	if (rsp_source != BT_INFO_SRC_8822B_1ANT_WIFI_FW) {</div><div class='del'>-		/* if 0xff, it means BT is under WHCK test */</div><div class='del'>-		coex_sta-&gt;bt_whck_test =</div><div class='del'>-			((coex_sta-&gt;bt_info == 0xff) ? true : false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;bt_create_connection =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0x80) ? true :</div><div class='del'>-									 false);</div><div class='del'>-</div><div class='del'>-		/* unit: %, value-100 to translate to unit: dBm */</div><div class='del'>-		coex_sta-&gt;bt_rssi =</div><div class='del'>-			coex_sta-&gt;bt_info_c2h[rsp_source][3] * 2 + 10;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;c2h_bt_remote_name_req =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0x20) ? true :</div><div class='del'>-									 false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;is_A2DP_3M =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0x10) ? true :</div><div class='del'>-									 false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;acl_busy =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][1] &amp; 0x9) ? true :</div><div class='del'>-									false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;voice_over_HOGP =</div><div class='del'>-			((coex_sta-&gt;bt_info_ext &amp; 0x10) ? true : false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;c2h_bt_inquiry_page =</div><div class='del'>-			((coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_INQ_PAGE) ?</div><div class='del'>-				 true :</div><div class='del'>-				 false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;a2dp_bit_pool =</div><div class='del'>-			(((coex_sta-&gt;bt_info_c2h[rsp_source][1] &amp; 0x49) ==</div><div class='del'>-			  0x49) ?</div><div class='del'>-				 (coex_sta-&gt;bt_info_c2h[rsp_source][6] &amp; 0x7f) :</div><div class='del'>-				 0);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;is_bt_a2dp_sink =</div><div class='del'>-			(coex_sta-&gt;bt_info_c2h[rsp_source][6] &amp; 0x80) ? true :</div><div class='del'>-									false;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;bt_retry_cnt =</div><div class='del'>-			coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0xf;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;is_autoslot = coex_sta-&gt;bt_info_ext2 &amp; 0x8;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;forbidden_slot = coex_sta-&gt;bt_info_ext2 &amp; 0x7;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;hid_busy_num = (coex_sta-&gt;bt_info_ext2 &amp; 0x30) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;hid_pair_cnt = (coex_sta-&gt;bt_info_ext2 &amp; 0xc0) &gt;&gt; 6;</div><div class='del'>-		if (coex_sta-&gt;bt_retry_cnt &gt;= 1)</div><div class='del'>-			coex_sta-&gt;pop_event_cnt++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;c2h_bt_remote_name_req)</div><div class='del'>-			coex_sta-&gt;cnt_remote_name_req++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(1))</div><div class='del'>-			coex_sta-&gt;cnt_reinit++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(2)) {</div><div class='del'>-			coex_sta-&gt;cnt_setup_link++;</div><div class='del'>-			coex_sta-&gt;is_setup_link = true;</div><div class='del'>-			coex_sta-&gt;bt_relink_downcount = 2;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Re-Link start in BT info!!\n");</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;is_setup_link = false;</div><div class='del'>-			coex_sta-&gt;bt_relink_downcount = 0;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Re-Link stop in BT info!!\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(3))</div><div class='del'>-			coex_sta-&gt;cnt_ign_wlan_act++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(6))</div><div class='del'>-			coex_sta-&gt;cnt_role_switch++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(7))</div><div class='del'>-			coex_sta-&gt;is_bt_multi_link = true;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;is_bt_multi_link = false;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_create_connection) {</div><div class='del'>-			coex_sta-&gt;cnt_page++;</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY,</div><div class='del'>-					   &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN,</div><div class='del'>-					   &amp;wifi_scan);</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK,</div><div class='del'>-					   &amp;wifi_link);</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM,</div><div class='del'>-					   &amp;wifi_roam);</div><div class='del'>-</div><div class='del'>-			if ((wifi_link) || (wifi_roam) || (wifi_scan) ||</div><div class='del'>-			    (coex_sta-&gt;wifi_is_high_pri_task) || (wifi_busy)) {</div><div class='del'>-				is_scoreboard_scan = true;</div><div class='del'>-				halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-					btcoexist,</div><div class='del'>-					BT_8822B_1ANT_SCOREBOARD_SCAN, true);</div><div class='del'>-</div><div class='del'>-			} else {</div><div class='del'>-				halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-					btcoexist,</div><div class='del'>-					BT_8822B_1ANT_SCOREBOARD_SCAN, false);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (is_scoreboard_scan) {</div><div class='del'>-				halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-					btcoexist,</div><div class='del'>-					BT_8822B_1ANT_SCOREBOARD_SCAN, false);</div><div class='del'>-				is_scoreboard_scan = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Here we need to resend some wifi info to BT */</div><div class='del'>-		/* because bt is reset and loss of the info. */</div><div class='del'>-</div><div class='del'>-		if ((!btcoexist-&gt;manual_control) &amp;&amp;</div><div class='del'>-		    (!btcoexist-&gt;stop_coex_dm)) {</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-					   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-			/*  Re-Init */</div><div class='del'>-			if ((coex_sta-&gt;bt_info_ext &amp; BIT(1))) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], BT ext info bit1 check, send wifi BW&amp;Chnl to BT!!\n");</div><div class='del'>-				if (wifi_connected)</div><div class='del'>-					halbtc8822b1ant_update_wifi_ch_info(</div><div class='del'>-						btcoexist, BTC_MEDIA_CONNECT);</div><div class='del'>-				else</div><div class='del'>-					halbtc8822b1ant_update_wifi_ch_info(</div><div class='del'>-						btcoexist,</div><div class='del'>-						BTC_MEDIA_DISCONNECT);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*	If Ignore_WLanAct &amp;&amp; not SetUp_Link */</div><div class='del'>-			if ((coex_sta-&gt;bt_info_ext &amp; BIT(3)) &amp;&amp;</div><div class='del'>-			    (!(coex_sta-&gt;bt_info_ext &amp; BIT(2)))) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], BT ext info bit3 check, set BT NOT to ignore Wlan active!!\n");</div><div class='del'>-				halbtc8822b1ant_ignore_wlan_act(</div><div class='del'>-					btcoexist, FORCE_EXEC, false);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_info_ext &amp; BIT(5))) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], BT ext info bit4 check, query BLE Scan type!!\n");</div><div class='del'>-		coex_sta-&gt;bt_ble_scan_type =</div><div class='del'>-			btcoexist-&gt;btc_get_ble_scan_type_from_bt(btcoexist);</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x1) == 0x1)</div><div class='del'>-			coex_sta-&gt;bt_ble_scan_para[0] =</div><div class='del'>-				btcoexist-&gt;btc_get_ble_scan_para_from_bt(</div><div class='del'>-					btcoexist, 0x1);</div><div class='del'>-		if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x2) == 0x2)</div><div class='del'>-			coex_sta-&gt;bt_ble_scan_para[1] =</div><div class='del'>-				btcoexist-&gt;btc_get_ble_scan_para_from_bt(</div><div class='del'>-					btcoexist, 0x2);</div><div class='del'>-		if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x4) == 0x4)</div><div class='del'>-			coex_sta-&gt;bt_ble_scan_para[2] =</div><div class='del'>-				btcoexist-&gt;btc_get_ble_scan_para_from_bt(</div><div class='del'>-					btcoexist, 0x4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_update_bt_link_info(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], RF Status notify\n");</div><div class='del'>-</div><div class='del'>-	if (type == BTC_RF_ON) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], RF is turned ON!!\n");</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ONOFF, true);</div><div class='del'>-</div><div class='del'>-	} else if (type == BTC_RF_OFF) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], RF is turned OFF!!\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ONOFF, false);</div><div class='del'>-		halbtc8822b1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_1ANT_PHASE_WLAN_OFF);</div><div class='del'>-		/* for test : s3 bt disppear , fail rate 1/600*/</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_ignore_wlan_act(btcoexist, FORCE_EXEC, true);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_halt_notify(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "[BTCoex], Halt notify\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-		btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-	halbtc8822b1ant_post_state_to_bt(btcoexist,</div><div class='del'>-					 BT_8822B_1ANT_SCOREBOARD_ONOFF, false);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				     BT_8822B_1ANT_PHASE_WLAN_OFF);</div><div class='del'>-	/* for test : s3 bt disppear , fail rate 1/600*/</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_ignore_wlan_act(btcoexist, FORCE_EXEC, true);</div><div class='del'>-</div><div class='del'>-	ex_btc8822b1ant_media_status_notify(btcoexist, BTC_MEDIA_DISCONNECT);</div><div class='del'>-	btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "[BTCoex], Pnp notify\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if ((pnp_state == BTC_WIFI_PNP_SLEEP) ||</div><div class='del'>-	    (pnp_state == BTC_WIFI_PNP_SLEEP_KEEP_ANT)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Pnp notify to SLEEP\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b1ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_1ANT_SCOREBOARD_ACTIVE |</div><div class='del'>-					   BT_8822B_1ANT_SCOREBOARD_ONOFF |</div><div class='del'>-					   BT_8822B_1ANT_SCOREBOARD_SCAN |</div><div class='del'>-					   BT_8822B_1ANT_SCOREBOARD_UNDERTEST,</div><div class='del'>-			false);</div><div class='del'>-</div><div class='del'>-		if (pnp_state == BTC_WIFI_PNP_SLEEP_KEEP_ANT) {</div><div class='del'>-			if (wifi_under_5g)</div><div class='del'>-				halbtc8822b1ant_set_ant_path(</div><div class='del'>-					btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					FORCE_EXEC,</div><div class='del'>-					BT_8822B_1ANT_PHASE_5G_RUNTIME);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b1ant_set_ant_path(</div><div class='del'>-					btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					FORCE_EXEC,</div><div class='del'>-					BT_8822B_1ANT_PHASE_2G_RUNTIME);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b1ant_set_ant_path(</div><div class='del'>-				btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				BT_8822B_1ANT_PHASE_WLAN_OFF);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-	} else if (pnp_state == BTC_WIFI_PNP_WAKE_UP) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Pnp notify to WAKE UP\n");</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_coex_dm_reset(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], *****************Coex DM Reset*****************\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_init_hw_config(btcoexist, false, false);</div><div class='del'>-	halbtc8822b1ant_init_coex_dm(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_periodical(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool bt_relink_finish = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], ==========================Periodical===========================\n");</div><div class='del'>-</div><div class='del'>-	if (!btcoexist-&gt;auto_report_1ant)</div><div class='del'>-		halbtc8822b1ant_query_bt_info(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_monitor_bt_ctr(btcoexist);</div><div class='del'>-	halbtc8822b1ant_monitor_wifi_ctr(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc8822b1ant_monitor_bt_enable_disable(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_relink_downcount != 0) {</div><div class='del'>-		coex_sta-&gt;bt_relink_downcount--;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_relink_downcount == 0) {</div><div class='del'>-			coex_sta-&gt;is_setup_link = false;</div><div class='del'>-			bt_relink_finish = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* for 4-way, DHCP, EAPOL packet */</div><div class='del'>-	if (coex_sta-&gt;specific_pkt_period_cnt &gt; 0) {</div><div class='del'>-		coex_sta-&gt;specific_pkt_period_cnt--;</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;specific_pkt_period_cnt == 0) &amp;&amp;</div><div class='del'>-		    (coex_sta-&gt;wifi_is_high_pri_task))</div><div class='del'>-			coex_sta-&gt;wifi_is_high_pri_task = false;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ***************** Hi-Pri Task = %s*****************\n",</div><div class='del'>-			(coex_sta-&gt;wifi_is_high_pri_task ? "Yes" : "No"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halbtc8822b1ant_is_wifi_status_changed(btcoexist) ||</div><div class='del'>-	    (bt_relink_finish) || (coex_sta-&gt;is_set_ps_state_fail))</div><div class='del'>-		halbtc8822b1ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_antenna_detection(struct btc_coexist *btcoexist,</div><div class='del'>-				       u32 cent_freq, u32 offset, u32 span,</div><div class='del'>-				       u32 seconds)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_antenna_isolation(struct btc_coexist *btcoexist,</div><div class='del'>-				       u32 cent_freq, u32 offset, u32 span,</div><div class='del'>-				       u32 seconds)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_psd_scan(struct btc_coexist *btcoexist, u32 cent_freq,</div><div class='del'>-			      u32 offset, u32 span, u32 seconds)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_display_ant_detection(struct btc_coexist *btcoexist) {}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_dbg_control(struct btc_coexist *btcoexist, u8 op_code,</div><div class='del'>-				 u8 op_len, u8 *pdata)</div><div class='del'>-{</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h b/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h<br/>deleted file mode 100644<br/>index f1bf83001164..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,433 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-/* *******************************************</div><div class='del'>- * The following is for 8822B 1ANT BT Co-exist definition</div><div class='del'>- * ********************************************/</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_FTP	BIT(7)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_A2DP	BIT(6)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_HID	BIT(5)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_SCO_BUSY	BIT(4)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_ACL_BUSY	BIT(3)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_INQ_PAGE	BIT(2)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_SCO_ESCO	BIT(1)</div><div class='del'>-#define BT_INFO_8822B_1ANT_B_CONNECTION	BIT(0)</div><div class='del'>-</div><div class='del'>-#define BT_INFO_8822B_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_)                      \</div><div class='del'>-	(((_BT_INFO_EXT_ &amp; BIT(0))) ? true : false)</div><div class='del'>-</div><div class='del'>-#define BTC_RSSI_COEX_THRESH_TOL_8822B_1ANT	2</div><div class='del'>-</div><div class='del'>-#define BT_8822B_1ANT_WIFI_NOISY_THRESH	150 /* max: 255 */</div><div class='del'>-#define BT_8822B_1ANT_DEFAULT_ISOLATION	15 /*  unit: dB */</div><div class='del'>-</div><div class='del'>-/* for Antenna detection */</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_PSDTHRES_BACKGROUND	50</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_PSDTHRES_2ANT_BADISOLATION	70</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_PSDTHRES_2ANT_GOODISOLATION	55</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_PSDTHRES_1ANT	35</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_RETRY_INTERVAL                                    \</div><div class='del'>-	10 /* retry timer if ant det is fail, unit: second */</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_ENABLE	0</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_COEXMECHANISMSWITCH_ENABLE	0</div><div class='del'>-</div><div class='del'>-#define BT_8822B_1ANT_LTECOEX_INDIRECTREG_ACCESS_TIMEOUT	30000</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_signal_state {</div><div class='del'>-	BT_8822B_1ANT_SIG_STA_SET_TO_LOW	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_SIG_STA_SET_BY_HW	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_SIG_STA_SET_TO_HIGH	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_SIG_STA_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_path_ctrl_owner {</div><div class='del'>-	BT_8822B_1ANT_PCO_BTSIDE	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_PCO_WLSIDE	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_PCO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_gnt_ctrl_type {</div><div class='del'>-	BT_8822B_1ANT_GNT_CTRL_BY_PTA	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_GNT_CTRL_BY_SW	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_GNT_CTRL_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_gnt_ctrl_block {</div><div class='del'>-	BT_8822B_1ANT_GNT_BLOCK_RFC_BB	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_GNT_BLOCK_RFC	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_GNT_BLOCK_BB	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_GNT_BLOCK_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_lte_coex_table_type {</div><div class='del'>-	BT_8822B_1ANT_CTT_WL_VS_LTE	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_CTT_BT_VS_LTE	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_CTT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_lte_break_table_type {</div><div class='del'>-	BT_8822B_1ANT_LBTT_WL_BREAK_LTE	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_LBTT_BT_BREAK_LTE	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_LBTT_LTE_BREAK_WL	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_LBTT_LTE_BREAK_BT	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_LBTT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_info_src_8822b_1ant {</div><div class='del'>-	BT_INFO_SRC_8822B_1ANT_WIFI_FW	= 0x0,</div><div class='del'>-	BT_INFO_SRC_8822B_1ANT_BT_RSP	= 0x1,</div><div class='del'>-	BT_INFO_SRC_8822B_1ANT_BT_ACTIVE_SEND	= 0x2,</div><div class='del'>-	BT_INFO_SRC_8822B_1ANT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_bt_status {</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_INQ_PAGE	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_ACL_BUSY	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_SCO_BUSY	= 0x4,</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY	= 0x5,</div><div class='del'>-	BT_8822B_1ANT_BT_STATUS_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_wifi_status {</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_NON_CONNECTED_IDLE	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_CONNECTED_SCAN	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_CONNECTED_SPECIFIC_PKT	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_CONNECTED_IDLE	= 0x4,</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_CONNECTED_BUSY	= 0x5,</div><div class='del'>-	BT_8822B_1ANT_WIFI_STATUS_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_coex_algo {</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_UNDEFINED	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_SCO	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_HID	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_A2DP	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_A2DP_PANHS	= 0x4,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_PANEDR	= 0x5,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_PANHS	= 0x6,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_PANEDR_A2DP	= 0x7,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_PANEDR_HID	= 0x8,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_HID_A2DP	= 0xa,</div><div class='del'>-	BT_8822B_1ANT_COEX_ALGO_MAX	= 0xb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_ext_ant_switch_type {</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SPDT	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_USE_SP3T	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_ext_ant_switch_ctrl_type {</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_PTA	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_ANTDIV	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_MAC	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_BY_BT	= 0x4,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_CTRL_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_ext_ant_switch_pos_type {</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_TO_BT	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_TO_WLG	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_TO_WLA	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_TO_NOCARE	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_EXT_ANT_SWITCH_TO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_1ant_phase {</div><div class='del'>-	BT_8822B_1ANT_PHASE_COEX_INIT	= 0x0,</div><div class='del'>-	BT_8822B_1ANT_PHASE_WLANONLY_INIT	= 0x1,</div><div class='del'>-	BT_8822B_1ANT_PHASE_WLAN_OFF	= 0x2,</div><div class='del'>-	BT_8822B_1ANT_PHASE_2G_RUNTIME	= 0x3,</div><div class='del'>-	BT_8822B_1ANT_PHASE_5G_RUNTIME	= 0x4,</div><div class='del'>-	BT_8822B_1ANT_PHASE_BTMPMODE	= 0x5,</div><div class='del'>-	BT_8822B_1ANT_PHASE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*ADD SCOREBOARD TO FIX BT LPS 32K ISSUE WHILE WL BUSY*/</div><div class='del'>-enum bt_8822b_1ant_scoreboard {</div><div class='del'>-	BT_8822B_1ANT_SCOREBOARD_ACTIVE	= BIT(0),</div><div class='del'>-	BT_8822B_1ANT_SCOREBOARD_ONOFF	= BIT(1),</div><div class='del'>-	BT_8822B_1ANT_SCOREBOARD_SCAN	= BIT(2),</div><div class='del'>-	BT_8822B_1ANT_SCOREBOARD_UNDERTEST	= BIT(3),</div><div class='del'>-	BT_8822B_1ANT_SCOREBOARD_WLBUSY = BIT(6)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct coex_dm_8822b_1ant {</div><div class='del'>-	/* hw setting */</div><div class='del'>-	u32	pre_ant_pos_type;</div><div class='del'>-	u32	cur_ant_pos_type;</div><div class='del'>-	/* fw mechanism */</div><div class='del'>-	bool	cur_ignore_wlan_act;</div><div class='del'>-	bool	pre_ignore_wlan_act;</div><div class='del'>-	u8	pre_ps_tdma;</div><div class='del'>-	u8	cur_ps_tdma;</div><div class='del'>-	u8	ps_tdma_para[5];</div><div class='del'>-	u8	ps_tdma_du_adj_type;</div><div class='del'>-	bool	auto_tdma_adjust;</div><div class='del'>-	bool	pre_ps_tdma_on;</div><div class='del'>-	bool	cur_ps_tdma_on;</div><div class='del'>-	bool	pre_bt_auto_report;</div><div class='del'>-	bool	cur_bt_auto_report;</div><div class='del'>-	u8	pre_lps;</div><div class='del'>-	u8	cur_lps;</div><div class='del'>-	u8	pre_rpwm;</div><div class='del'>-	u8	cur_rpwm;</div><div class='del'>-</div><div class='del'>-	/* sw mechanism */</div><div class='del'>-	bool	pre_low_penalty_ra;</div><div class='del'>-	bool	cur_low_penalty_ra;</div><div class='del'>-	u32	pre_val0x6c0;</div><div class='del'>-	u32	cur_val0x6c0;</div><div class='del'>-	u32	pre_val0x6c4;</div><div class='del'>-	u32	cur_val0x6c4;</div><div class='del'>-	u32	pre_val0x6c8;</div><div class='del'>-	u32	cur_val0x6c8;</div><div class='del'>-	u8	pre_val0x6cc;</div><div class='del'>-	u8	cur_val0x6cc;</div><div class='del'>-	bool	limited_dig;</div><div class='del'>-</div><div class='del'>-	u32	backup_arfr_cnt1; /* Auto Rate Fallback Retry cnt */</div><div class='del'>-	u32	backup_arfr_cnt2; /* Auto Rate Fallback Retry cnt */</div><div class='del'>-	u16	backup_retry_limit;</div><div class='del'>-	u8	backup_ampdu_max_time;</div><div class='del'>-</div><div class='del'>-	/* algorithm related */</div><div class='del'>-	u8	pre_algorithm;</div><div class='del'>-	u8	cur_algorithm;</div><div class='del'>-	u8	bt_status;</div><div class='del'>-	u8	wifi_chnl_info[3];</div><div class='del'>-</div><div class='del'>-	u32	pre_ra_mask;</div><div class='del'>-	u32	cur_ra_mask;</div><div class='del'>-	u8	pre_arfr_type;</div><div class='del'>-	u8	cur_arfr_type;</div><div class='del'>-	u8	pre_retry_limit_type;</div><div class='del'>-	u8	cur_retry_limit_type;</div><div class='del'>-	u8	pre_ampdu_time_type;</div><div class='del'>-	u8	cur_ampdu_time_type;</div><div class='del'>-	u32	arp_cnt;</div><div class='del'>-</div><div class='del'>-	u32	pre_ext_ant_switch_status;</div><div class='del'>-	u32	cur_ext_ant_switch_status;</div><div class='del'>-</div><div class='del'>-	u8	error_condition;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct coex_sta_8822b_1ant {</div><div class='del'>-	bool	bt_disabled;</div><div class='del'>-	bool	bt_link_exist;</div><div class='del'>-	bool	sco_exist;</div><div class='del'>-	bool	a2dp_exist;</div><div class='del'>-	bool	hid_exist;</div><div class='del'>-	bool	pan_exist;</div><div class='del'>-	u8	num_of_profile;</div><div class='del'>-</div><div class='del'>-	bool	under_lps;</div><div class='del'>-	bool	under_ips;</div><div class='del'>-	u32	specific_pkt_period_cnt;</div><div class='del'>-	u32	high_priority_tx;</div><div class='del'>-	u32	high_priority_rx;</div><div class='del'>-	u32	low_priority_tx;</div><div class='del'>-	u32	low_priority_rx;</div><div class='del'>-	bool	is_hi_pri_rx_overhead;</div><div class='del'>-	s8	bt_rssi;</div><div class='del'>-	u8	pre_bt_rssi_state;</div><div class='del'>-	u8	pre_wifi_rssi_state[4];</div><div class='del'>-	u8	bt_info_c2h[BT_INFO_SRC_8822B_1ANT_MAX][10];</div><div class='del'>-	u32	bt_info_c2h_cnt[BT_INFO_SRC_8822B_1ANT_MAX];</div><div class='del'>-	bool	bt_whck_test;</div><div class='del'>-	bool	c2h_bt_inquiry_page;</div><div class='del'>-	bool	c2h_bt_remote_name_req;</div><div class='del'>-	bool	c2h_bt_page; /* Add for win8.1 page out issue */</div><div class='del'>-	bool	wifi_is_high_pri_task; /* Add for win8.1 page out issue */</div><div class='del'>-</div><div class='del'>-	u8	bt_info_ext;</div><div class='del'>-	u8	bt_info_ext2;</div><div class='del'>-	u32	pop_event_cnt;</div><div class='del'>-	u8	scan_ap_num;</div><div class='del'>-	u8	bt_retry_cnt;</div><div class='del'>-</div><div class='del'>-	u32	crc_ok_cck;</div><div class='del'>-	u32	crc_ok_11g;</div><div class='del'>-	u32	crc_ok_11n;</div><div class='del'>-	u32	crc_ok_11n_vht;</div><div class='del'>-</div><div class='del'>-	u32	crc_err_cck;</div><div class='del'>-	u32	crc_err_11g;</div><div class='del'>-	u32	crc_err_11n;</div><div class='del'>-	u32	crc_err_11n_vht;</div><div class='del'>-</div><div class='del'>-	bool	cck_lock;</div><div class='del'>-	bool	pre_ccklock;</div><div class='del'>-	bool	cck_ever_lock;</div><div class='del'>-	u8	coex_table_type;</div><div class='del'>-</div><div class='del'>-	bool	force_lps_ctrl;</div><div class='del'>-</div><div class='del'>-	bool	concurrent_rx_mode_on;</div><div class='del'>-</div><div class='del'>-	u16	score_board;</div><div class='del'>-	u8	isolation_btween_wb; /* 0~ 50 */</div><div class='del'>-</div><div class='del'>-	u8	a2dp_bit_pool;</div><div class='del'>-	u8	cut_version;</div><div class='del'>-	bool	acl_busy;</div><div class='del'>-	bool	bt_create_connection;</div><div class='del'>-</div><div class='del'>-	u32	bt_coex_supported_feature;</div><div class='del'>-	u32	bt_coex_supported_version;</div><div class='del'>-</div><div class='del'>-	u8	bt_ble_scan_type;</div><div class='del'>-	u32	bt_ble_scan_para[3];</div><div class='del'>-</div><div class='del'>-	bool	run_time_state;</div><div class='del'>-	bool	freeze_coexrun_by_btinfo;</div><div class='del'>-</div><div class='del'>-	bool	is_A2DP_3M;</div><div class='del'>-	bool	voice_over_HOGP;</div><div class='del'>-	u8	bt_info;</div><div class='del'>-	bool	is_autoslot;</div><div class='del'>-	u8	forbidden_slot;</div><div class='del'>-	u8	hid_busy_num;</div><div class='del'>-	u8	hid_pair_cnt;</div><div class='del'>-</div><div class='del'>-	u32	cnt_remote_name_req;</div><div class='del'>-	u32	cnt_setup_link;</div><div class='del'>-	u32	cnt_reinit;</div><div class='del'>-	u32	cnt_ign_wlan_act;</div><div class='del'>-	u32	cnt_page;</div><div class='del'>-	u32	cnt_role_switch;</div><div class='del'>-</div><div class='del'>-	u16	bt_reg_vendor_ac;</div><div class='del'>-	u16	bt_reg_vendor_ae;</div><div class='del'>-</div><div class='del'>-	bool	is_setup_link;</div><div class='del'>-	u8	wl_noisy_level;</div><div class='del'>-	u32	gnt_error_cnt;</div><div class='del'>-	u8	bt_afh_map[10];</div><div class='del'>-	u8	bt_relink_downcount;</div><div class='del'>-	bool	is_tdma_btautoslot;</div><div class='del'>-	bool	is_tdma_btautoslot_hang;</div><div class='del'>-</div><div class='del'>-	u8	switch_band_notify_to;</div><div class='del'>-	bool	is_rf_state_off;</div><div class='del'>-</div><div class='del'>-	bool	is_hid_low_pri_tx_overhead;</div><div class='del'>-	bool	is_bt_multi_link;</div><div class='del'>-	bool	is_bt_a2dp_sink;</div><div class='del'>-	bool	rf4ce_enabled;</div><div class='del'>-</div><div class='del'>-	bool	is_set_ps_state_fail;</div><div class='del'>-	u8	cnt_set_ps_state_fail;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rfe_type_8822b_1ant {</div><div class='del'>-	u8	rfe_module_type;</div><div class='del'>-	bool	ext_ant_switch_exist;</div><div class='del'>-	u8	ext_ant_switch_type;</div><div class='del'>-	/*  iF 0: ANTSW(rfe_sel9)=0, ANTSWB(rfe_sel8)=1 =&gt;  Ant to BT/5G */</div><div class='del'>-	u8	ext_ant_switch_ctrl_polarity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_PSD_POINTS	256 /* MAX:1024 */</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_PSD_AVGNUM	1 /* MAX:3 */</div><div class='del'>-#define BT_8822B_1ANT_ANTDET_BUF_LEN	16</div><div class='del'>-</div><div class='del'>-struct psdscan_sta_8822b_1ant {</div><div class='del'>-	u32	ant_det_bt_le_channel; /* BT LE Channel ex:2412 */</div><div class='del'>-	u32	ant_det_bt_tx_time;</div><div class='del'>-	u32	ant_det_pre_psdscan_peak_val;</div><div class='del'>-	bool	ant_det_is_ant_det_available;</div><div class='del'>-	u32	ant_det_psd_scan_peak_val;</div><div class='del'>-	bool	ant_det_is_btreply_available;</div><div class='del'>-	u32	ant_det_psd_scan_peak_freq;</div><div class='del'>-</div><div class='del'>-	u8	ant_det_result;</div><div class='del'>-	u8	ant_det_peak_val[BT_8822B_1ANT_ANTDET_BUF_LEN];</div><div class='del'>-	u8	ant_det_peak_freq[BT_8822B_1ANT_ANTDET_BUF_LEN];</div><div class='del'>-	u32	ant_det_try_count;</div><div class='del'>-	u32	ant_det_fail_count;</div><div class='del'>-	u32	ant_det_inteval_count;</div><div class='del'>-	u32	ant_det_thres_offset;</div><div class='del'>-</div><div class='del'>-	u32	real_cent_freq;</div><div class='del'>-	s32	real_offset;</div><div class='del'>-	u32	real_span;</div><div class='del'>-</div><div class='del'>-	u32	psd_band_width; /* unit: Hz */</div><div class='del'>-	u32	psd_point; /* 128/256/512/1024 */</div><div class='del'>-	u32	psd_report[1024]; /* unit:dB (20logx), 0~255 */</div><div class='del'>-	u32	psd_report_max_hold[1024]; /* unit:dB (20logx), 0~255 */</div><div class='del'>-	u32	psd_start_point;</div><div class='del'>-	u32	psd_stop_point;</div><div class='del'>-	u32	psd_max_value_point;</div><div class='del'>-	u32	psd_max_value;</div><div class='del'>-	u32	psd_start_base;</div><div class='del'>-	u32	psd_avg_num; /* 1/8/16/32 */</div><div class='del'>-	u32	psd_gen_count;</div><div class='del'>-	bool	is_psd_running;</div><div class='del'>-	bool	is_psd_show_max_only;</div><div class='del'>-	bool	is_ant_det_running;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* *******************************************</div><div class='del'>- * The following is interface which will notify coex module.</div><div class='del'>- * ********************************************/</div><div class='del'>-void ex_btc8822b1ant_power_on_setting(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b1ant_pre_load_firmware(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b1ant_init_hw_config(struct btc_coexist *btcoexist,</div><div class='del'>-				    bool wifi_only);</div><div class='del'>-void ex_btc8822b1ant_init_coex_dm(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b1ant_scan_notify_without_bt(struct btc_coexist *btcoexist,</div><div class='del'>-					    u8 type);</div><div class='del'>-void ex_btc8822b1ant_switchband_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b1ant_switchband_notify_without_bt(struct btc_coexist *btcoexist,</div><div class='del'>-						  u8 type);</div><div class='del'>-void ex_btc8822b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b1ant_media_status_notify(struct btc_coexist *btcoexist,</div><div class='del'>-					 u8 type);</div><div class='del'>-void ex_btc8822b1ant_specific_packet_notify(struct btc_coexist *btcoexist,</div><div class='del'>-					    u8 type);</div><div class='del'>-void ex_btc8822b1ant_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,</div><div class='del'>-				    u8 length);</div><div class='del'>-void ex_btc8822b1ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b1ant_halt_notify(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);</div><div class='del'>-void ex_halbtc8822b1ant_score_board_status_notify(struct btc_coexist *btcoexist,</div><div class='del'>-						  u8 *tmp_buf, u8 length);</div><div class='del'>-void ex_btc8822b1ant_coex_dm_reset(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b1ant_periodical(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b1ant_display_coex_info(struct btc_coexist *btcoexist,</div><div class='del'>-				       struct seq_file *m);</div><div class='del'>-void ex_btc8822b1ant_antenna_detection(struct btc_coexist *btcoexist,</div><div class='del'>-				       u32 cent_freq, u32 offset, u32 span,</div><div class='del'>-				       u32 seconds);</div><div class='del'>-void ex_btc8822b1ant_antenna_isolation(struct btc_coexist *btcoexist,</div><div class='del'>-				       u32 cent_freq, u32 offset, u32 span,</div><div class='del'>-				       u32 seconds);</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_psd_scan(struct btc_coexist *btcoexist, u32 cent_freq,</div><div class='del'>-			      u32 offset, u32 span, u32 seconds);</div><div class='del'>-void ex_btc8822b1ant_display_ant_detection(struct btc_coexist *btcoexist);</div><div class='del'>-</div><div class='del'>-void ex_btc8822b1ant_dbg_control(struct btc_coexist *btcoexist, u8 op_code,</div><div class='del'>-				 u8 op_len, u8 *pdata);</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c b/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c<br/>deleted file mode 100644<br/>index 7e6071059a95..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5210 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-/* ************************************************************</div><div class='del'>- * Description:</div><div class='del'>- *</div><div class='del'>- * This file is for RTL8822B Co-exist mechanism</div><div class='del'>- *</div><div class='del'>- * History</div><div class='del'>- * 2012/11/15 Cosa first check in.</div><div class='del'>- *</div><div class='del'>- * *************************************************************/</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * include files</div><div class='del'>- * *************************************************************/</div><div class='del'>-#include "halbt_precomp.h"</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * Global variables, these are static variables</div><div class='del'>- * *************************************************************/</div><div class='del'>-static struct coex_dm_8822b_2ant glcoex_dm_8822b_2ant;</div><div class='del'>-static struct coex_dm_8822b_2ant *coex_dm = &amp;glcoex_dm_8822b_2ant;</div><div class='del'>-static struct coex_sta_8822b_2ant glcoex_sta_8822b_2ant;</div><div class='del'>-static struct coex_sta_8822b_2ant *coex_sta = &amp;glcoex_sta_8822b_2ant;</div><div class='del'>-static struct psdscan_sta_8822b_2ant gl_psd_scan_8822b_2ant;</div><div class='del'>-static struct psdscan_sta_8822b_2ant *psd_scan = &amp;gl_psd_scan_8822b_2ant;</div><div class='del'>-static struct rfe_type_8822b_2ant gl_rfe_type_8822b_2ant;</div><div class='del'>-static struct rfe_type_8822b_2ant *rfe_type = &amp;gl_rfe_type_8822b_2ant;</div><div class='del'>-</div><div class='del'>-static const char *const glbt_info_src_8822b_2ant[] = {</div><div class='del'>-	"BT Info[wifi fw]", "BT Info[bt rsp]", "BT Info[bt auto report]",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 glcoex_ver_date_8822b_2ant = 20170327;</div><div class='del'>-static u32 glcoex_ver_8822b_2ant = 0x44;</div><div class='del'>-static u32 glcoex_ver_btdesired_8822b_2ant = 0x42;</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * local function proto type if needed</div><div class='del'>- * ************************************************************</div><div class='del'>- * ************************************************************</div><div class='del'>- * local function start with halbtc8822b2ant_</div><div class='del'>- * *************************************************************/</div><div class='del'>-static u8 halbtc8822b2ant_bt_rssi_state(struct btc_coexist *btcoexist,</div><div class='del'>-					u8 *ppre_bt_rssi_state, u8 level_num,</div><div class='del'>-					u8 rssi_thresh, u8 rssi_thresh1)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	s32 bt_rssi = 0;</div><div class='del'>-	u8 bt_rssi_state = *ppre_bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	bt_rssi = coex_sta-&gt;bt_rssi;</div><div class='del'>-</div><div class='del'>-	if (level_num == 2) {</div><div class='del'>-		if ((*ppre_bt_rssi_state == BTC_RSSI_STATE_LOW) ||</div><div class='del'>-		    (*ppre_bt_rssi_state == BTC_RSSI_STATE_STAY_LOW)) {</div><div class='del'>-			if (bt_rssi &gt;=</div><div class='del'>-			    (rssi_thresh + BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT))</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_HIGH;</div><div class='del'>-			else</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_STAY_LOW;</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_rssi &lt; rssi_thresh)</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-			else</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_STAY_HIGH;</div><div class='del'>-		}</div><div class='del'>-	} else if (level_num == 3) {</div><div class='del'>-		if (rssi_thresh &gt; rssi_thresh1) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], BT Rssi thresh error!!\n");</div><div class='del'>-			return *ppre_bt_rssi_state;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((*ppre_bt_rssi_state == BTC_RSSI_STATE_LOW) ||</div><div class='del'>-		    (*ppre_bt_rssi_state == BTC_RSSI_STATE_STAY_LOW)) {</div><div class='del'>-			if (bt_rssi &gt;=</div><div class='del'>-			    (rssi_thresh + BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT))</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_MEDIUM;</div><div class='del'>-			else</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_STAY_LOW;</div><div class='del'>-		} else if ((*ppre_bt_rssi_state == BTC_RSSI_STATE_MEDIUM) ||</div><div class='del'>-			   (*ppre_bt_rssi_state ==</div><div class='del'>-			    BTC_RSSI_STATE_STAY_MEDIUM)) {</div><div class='del'>-			if (bt_rssi &gt;= (rssi_thresh1 +</div><div class='del'>-					BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT))</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_HIGH;</div><div class='del'>-			else if (bt_rssi &lt; rssi_thresh)</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-			else</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_STAY_MEDIUM;</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_rssi &lt; rssi_thresh1)</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_MEDIUM;</div><div class='del'>-			else</div><div class='del'>-				bt_rssi_state = BTC_RSSI_STATE_STAY_HIGH;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*ppre_bt_rssi_state = bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	return bt_rssi_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 halbtc8822b2ant_wifi_rssi_state(struct btc_coexist *btcoexist,</div><div class='del'>-					  u8 *pprewifi_rssi_state, u8 level_num,</div><div class='del'>-					  u8 rssi_thresh, u8 rssi_thresh1)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	s32 wifi_rssi = 0;</div><div class='del'>-	u8 wifi_rssi_state = *pprewifi_rssi_state;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &amp;wifi_rssi);</div><div class='del'>-</div><div class='del'>-	if (level_num == 2) {</div><div class='del'>-		if ((*pprewifi_rssi_state == BTC_RSSI_STATE_LOW) ||</div><div class='del'>-		    (*pprewifi_rssi_state == BTC_RSSI_STATE_STAY_LOW)) {</div><div class='del'>-			if (wifi_rssi &gt;=</div><div class='del'>-			    (rssi_thresh + BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT))</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_HIGH;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_LOW;</div><div class='del'>-		} else {</div><div class='del'>-			if (wifi_rssi &lt; rssi_thresh)</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_HIGH;</div><div class='del'>-		}</div><div class='del'>-	} else if (level_num == 3) {</div><div class='del'>-		if (rssi_thresh &gt; rssi_thresh1) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], wifi RSSI thresh error!!\n");</div><div class='del'>-			return *pprewifi_rssi_state;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((*pprewifi_rssi_state == BTC_RSSI_STATE_LOW) ||</div><div class='del'>-		    (*pprewifi_rssi_state == BTC_RSSI_STATE_STAY_LOW)) {</div><div class='del'>-			if (wifi_rssi &gt;=</div><div class='del'>-			    (rssi_thresh + BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT))</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_MEDIUM;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_LOW;</div><div class='del'>-		} else if ((*pprewifi_rssi_state == BTC_RSSI_STATE_MEDIUM) ||</div><div class='del'>-			   (*pprewifi_rssi_state ==</div><div class='del'>-			    BTC_RSSI_STATE_STAY_MEDIUM)) {</div><div class='del'>-			if (wifi_rssi &gt;= (rssi_thresh1 +</div><div class='del'>-					  BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT))</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_HIGH;</div><div class='del'>-			else if (wifi_rssi &lt; rssi_thresh)</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_MEDIUM;</div><div class='del'>-		} else {</div><div class='del'>-			if (wifi_rssi &lt; rssi_thresh1)</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_MEDIUM;</div><div class='del'>-			else</div><div class='del'>-				wifi_rssi_state = BTC_RSSI_STATE_STAY_HIGH;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pprewifi_rssi_state = wifi_rssi_state;</div><div class='del'>-</div><div class='del'>-	return wifi_rssi_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_coex_switch_threshold(struct btc_coexist *btcoexist,</div><div class='del'>-						  u8 isolation_measuared)</div><div class='del'>-{</div><div class='del'>-	s8 interference_wl_tx = 0, interference_bt_tx = 0;</div><div class='del'>-</div><div class='del'>-	interference_wl_tx =</div><div class='del'>-		BT_8822B_2ANT_WIFI_MAX_TX_POWER - isolation_measuared;</div><div class='del'>-	interference_bt_tx =</div><div class='del'>-		BT_8822B_2ANT_BT_MAX_TX_POWER - isolation_measuared;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;wifi_coex_thres = BT_8822B_2ANT_WIFI_RSSI_COEXSWITCH_THRES1;</div><div class='del'>-	coex_sta-&gt;wifi_coex_thres2 = BT_8822B_2ANT_WIFI_RSSI_COEXSWITCH_THRES2;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;bt_coex_thres = BT_8822B_2ANT_BT_RSSI_COEXSWITCH_THRES1;</div><div class='del'>-	coex_sta-&gt;bt_coex_thres2 = BT_8822B_2ANT_BT_RSSI_COEXSWITCH_THRES2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_query_bt_info(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 h2c_parameter[1] = {0};</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], No query BT info because BT is disabled!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_parameter[0] |= BIT(0); /* trigger */</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x61, 1, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_monitor_bt_ctr(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	u32 reg_hp_txrx, reg_lp_txrx, u32tmp;</div><div class='del'>-	u32 reg_hp_tx = 0, reg_hp_rx = 0, reg_lp_tx = 0, reg_lp_rx = 0;</div><div class='del'>-	static u8 num_of_bt_counter_chk, cnt_slave, cnt_autoslot_hang;</div><div class='del'>-</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	reg_hp_txrx = 0x770;</div><div class='del'>-	reg_lp_txrx = 0x774;</div><div class='del'>-</div><div class='del'>-	u32tmp = btcoexist-&gt;btc_read_4byte(btcoexist, reg_hp_txrx);</div><div class='del'>-	reg_hp_tx = u32tmp &amp; MASKLWORD;</div><div class='del'>-	reg_hp_rx = (u32tmp &amp; MASKHWORD) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	u32tmp = btcoexist-&gt;btc_read_4byte(btcoexist, reg_lp_txrx);</div><div class='del'>-	reg_lp_tx = u32tmp &amp; MASKLWORD;</div><div class='del'>-	reg_lp_rx = (u32tmp &amp; MASKHWORD) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;high_priority_tx = reg_hp_tx;</div><div class='del'>-	coex_sta-&gt;high_priority_rx = reg_hp_rx;</div><div class='del'>-	coex_sta-&gt;low_priority_tx = reg_lp_tx;</div><div class='del'>-	coex_sta-&gt;low_priority_rx = reg_lp_rx;</div><div class='del'>-</div><div class='del'>-	/* reset counter */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x76e, 0xc);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;low_priority_tx &gt; 1050) &amp;&amp;</div><div class='del'>-	    (!coex_sta-&gt;c2h_bt_inquiry_page))</div><div class='del'>-		coex_sta-&gt;pop_event_cnt++;</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;low_priority_rx &gt;= 950) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;low_priority_rx &gt;= coex_sta-&gt;low_priority_tx) &amp;&amp;</div><div class='del'>-	    (!coex_sta-&gt;under_ips) &amp;&amp; (!coex_sta-&gt;c2h_bt_inquiry_page) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;bt_link_exist)) {</div><div class='del'>-		if (cnt_slave &gt;= 2) {</div><div class='del'>-			bt_link_info-&gt;slave_role = true;</div><div class='del'>-			cnt_slave = 2;</div><div class='del'>-		} else {</div><div class='del'>-			cnt_slave++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (cnt_slave == 0) {</div><div class='del'>-			bt_link_info-&gt;slave_role = false;</div><div class='del'>-			cnt_slave = 0;</div><div class='del'>-		} else {</div><div class='del'>-			cnt_slave--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_tdma_btautoslot) {</div><div class='del'>-		if ((coex_sta-&gt;low_priority_tx &gt;= 1300) &amp;&amp;</div><div class='del'>-		    (coex_sta-&gt;low_priority_rx &lt;= 150)) {</div><div class='del'>-			if (cnt_autoslot_hang &gt;= 2) {</div><div class='del'>-				coex_sta-&gt;is_tdma_btautoslot_hang = true;</div><div class='del'>-				cnt_autoslot_hang = 2;</div><div class='del'>-			} else {</div><div class='del'>-				cnt_autoslot_hang++;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (cnt_autoslot_hang == 0) {</div><div class='del'>-				coex_sta-&gt;is_tdma_btautoslot_hang = false;</div><div class='del'>-				cnt_autoslot_hang = 0;</div><div class='del'>-			} else {</div><div class='del'>-				cnt_autoslot_hang--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;sco_exist) {</div><div class='del'>-		if ((coex_sta-&gt;high_priority_tx &gt;= 400) &amp;&amp;</div><div class='del'>-		    (coex_sta-&gt;high_priority_rx &gt;= 400))</div><div class='del'>-			coex_sta-&gt;is_esco_mode = false;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;is_esco_mode = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;hid_only) {</div><div class='del'>-		if (coex_sta-&gt;low_priority_rx &gt; 50)</div><div class='del'>-			coex_sta-&gt;is_hid_low_pri_tx_overhead = true;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;is_hid_low_pri_tx_overhead = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;high_priority_tx == 0) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;high_priority_rx == 0) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;low_priority_tx == 0) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;low_priority_rx == 0)) {</div><div class='del'>-		num_of_bt_counter_chk++;</div><div class='del'>-		if (num_of_bt_counter_chk &gt;= 3) {</div><div class='del'>-			halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-			num_of_bt_counter_chk = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_monitor_wifi_ctr(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	s32 wifi_rssi = 0;</div><div class='del'>-	bool wifi_busy = false, wifi_under_b_mode = false, wifi_scan = false;</div><div class='del'>-	bool bt_idle = false;</div><div class='del'>-	static u8 cck_lock_counter, wl_noisy_count0, wl_noisy_count1 = 3,</div><div class='del'>-						     wl_noisy_count2;</div><div class='del'>-	u32 total_cnt, cck_cnt;</div><div class='del'>-	u32 cnt_crcok = 0, cnt_crcerr = 0;</div><div class='del'>-	static u8 cnt;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &amp;wifi_rssi);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-			   &amp;wifi_under_b_mode);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;wifi_scan);</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;crc_ok_cck = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_CCK");</div><div class='del'>-	coex_sta-&gt;crc_ok_11g = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_LEGACY");</div><div class='del'>-	coex_sta-&gt;crc_ok_11n = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_HT");</div><div class='del'>-	coex_sta-&gt;crc_ok_11n_vht = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_OK_VHT");</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;crc_err_cck = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_CCK");</div><div class='del'>-	coex_sta-&gt;crc_err_11g = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_LEGACY");</div><div class='del'>-	coex_sta-&gt;crc_err_11n = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_HT");</div><div class='del'>-	coex_sta-&gt;crc_err_11n_vht = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CRC32_ERROR_VHT");</div><div class='del'>-</div><div class='del'>-	cnt_crcok = coex_sta-&gt;crc_ok_cck + coex_sta-&gt;crc_ok_11g +</div><div class='del'>-		    coex_sta-&gt;crc_ok_11n + coex_sta-&gt;crc_ok_11n_vht;</div><div class='del'>-</div><div class='del'>-	cnt_crcerr = coex_sta-&gt;crc_err_cck + coex_sta-&gt;crc_err_11g +</div><div class='del'>-		     coex_sta-&gt;crc_err_11n + coex_sta-&gt;crc_err_11n_vht;</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (cnt_crcerr != 0)) {</div><div class='del'>-		coex_sta-&gt;now_crc_ratio = cnt_crcok / cnt_crcerr;</div><div class='del'>-</div><div class='del'>-		if (cnt == 0)</div><div class='del'>-			coex_sta-&gt;acc_crc_ratio = coex_sta-&gt;now_crc_ratio;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;acc_crc_ratio =</div><div class='del'>-				(coex_sta-&gt;acc_crc_ratio * 7 +</div><div class='del'>-				 coex_sta-&gt;now_crc_ratio * 3) /</div><div class='del'>-				10;</div><div class='del'>-</div><div class='del'>-		if (cnt &gt;= 10)</div><div class='del'>-			cnt = 0;</div><div class='del'>-		else</div><div class='del'>-			cnt++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cck_cnt = coex_sta-&gt;crc_ok_cck + coex_sta-&gt;crc_err_cck;</div><div class='del'>-</div><div class='del'>-	if ((coex_dm-&gt;bt_status ==</div><div class='del'>-	     BT_8822B_2ANT_BT_STATUS_NON_CONNECTED_IDLE) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_2ANT_BT_STATUS_CONNECTED_IDLE) ||</div><div class='del'>-	    (coex_sta-&gt;bt_disabled))</div><div class='del'>-		bt_idle = true;</div><div class='del'>-</div><div class='del'>-	if (cck_cnt &gt; 250) {</div><div class='del'>-		if (wl_noisy_count2 &lt; 3)</div><div class='del'>-			wl_noisy_count2++;</div><div class='del'>-</div><div class='del'>-		if (wl_noisy_count2 == 3) {</div><div class='del'>-			wl_noisy_count0 = 0;</div><div class='del'>-			wl_noisy_count1 = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (cck_cnt &lt; 50) {</div><div class='del'>-		if (wl_noisy_count0 &lt; 3)</div><div class='del'>-			wl_noisy_count0++;</div><div class='del'>-</div><div class='del'>-		if (wl_noisy_count0 == 3) {</div><div class='del'>-			wl_noisy_count1 = 0;</div><div class='del'>-			wl_noisy_count2 = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		if (wl_noisy_count1 &lt; 3)</div><div class='del'>-			wl_noisy_count1++;</div><div class='del'>-</div><div class='del'>-		if (wl_noisy_count1 == 3) {</div><div class='del'>-			wl_noisy_count0 = 0;</div><div class='del'>-			wl_noisy_count2 = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wl_noisy_count2 == 3)</div><div class='del'>-		coex_sta-&gt;wl_noisy_level = 2;</div><div class='del'>-	else if (wl_noisy_count1 == 3)</div><div class='del'>-		coex_sta-&gt;wl_noisy_level = 1;</div><div class='del'>-	else</div><div class='del'>-		coex_sta-&gt;wl_noisy_level = 0;</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (wifi_rssi &gt;= 30) &amp;&amp; (!wifi_under_b_mode)) {</div><div class='del'>-		total_cnt = cnt_crcok;</div><div class='del'>-</div><div class='del'>-		if ((coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_ACL_BUSY) ||</div><div class='del'>-		    (coex_dm-&gt;bt_status ==</div><div class='del'>-		     BT_8822B_1ANT_BT_STATUS_ACL_SCO_BUSY) ||</div><div class='del'>-		    (coex_dm-&gt;bt_status == BT_8822B_1ANT_BT_STATUS_SCO_BUSY)) {</div><div class='del'>-			if (coex_sta-&gt;crc_ok_cck &gt;</div><div class='del'>-			    (total_cnt - coex_sta-&gt;crc_ok_cck)) {</div><div class='del'>-				if (cck_lock_counter &lt; 3)</div><div class='del'>-					cck_lock_counter++;</div><div class='del'>-			} else {</div><div class='del'>-				if (cck_lock_counter &gt; 0)</div><div class='del'>-					cck_lock_counter--;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			if (cck_lock_counter &gt; 0)</div><div class='del'>-				cck_lock_counter--;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (cck_lock_counter &gt; 0)</div><div class='del'>-			cck_lock_counter--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;pre_ccklock) {</div><div class='del'>-		if (cck_lock_counter &gt;= 3)</div><div class='del'>-			coex_sta-&gt;cck_lock = true;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;cck_lock = false;</div><div class='del'>-	} else {</div><div class='del'>-		if (cck_lock_counter == 0)</div><div class='del'>-			coex_sta-&gt;cck_lock = false;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;cck_lock = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;cck_lock)</div><div class='del'>-		coex_sta-&gt;cck_ever_lock = true;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;pre_ccklock = coex_sta-&gt;cck_lock;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-halbtc8822b2ant_is_wifibt_status_changed(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static bool pre_wifi_busy, pre_under_4way, pre_bt_hs_on, pre_bt_off,</div><div class='del'>-		pre_bt_slave, pre_hid_low_pri_tx_overhead, pre_wifi_under_lps,</div><div class='del'>-		pre_bt_setup_link;</div><div class='del'>-	static u8 pre_hid_busy_num, pre_wl_noisy_level;</div><div class='del'>-	bool wifi_busy = false, under_4way = false, bt_hs_on = false;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-			   &amp;under_4way);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled != pre_bt_off) {</div><div class='del'>-		pre_bt_off = coex_sta-&gt;bt_disabled;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_disabled)</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], BT is disabled !!\n");</div><div class='del'>-		else</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], BT is enabled !!\n");</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;bt_coex_supported_feature = 0;</div><div class='del'>-		coex_sta-&gt;bt_coex_supported_version = 0;</div><div class='del'>-		coex_sta-&gt;bt_ble_scan_type = 0;</div><div class='del'>-		coex_sta-&gt;bt_ble_scan_para[0] = 0;</div><div class='del'>-		coex_sta-&gt;bt_ble_scan_para[1] = 0;</div><div class='del'>-		coex_sta-&gt;bt_ble_scan_para[2] = 0;</div><div class='del'>-		coex_sta-&gt;bt_reg_vendor_ac = 0xffff;</div><div class='del'>-		coex_sta-&gt;bt_reg_vendor_ae = 0xffff;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wifi_connected) {</div><div class='del'>-		if (wifi_busy != pre_wifi_busy) {</div><div class='del'>-			pre_wifi_busy = wifi_busy;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (under_4way != pre_under_4way) {</div><div class='del'>-			pre_under_4way = under_4way;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (bt_hs_on != pre_bt_hs_on) {</div><div class='del'>-			pre_bt_hs_on = bt_hs_on;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (coex_sta-&gt;wl_noisy_level != pre_wl_noisy_level) {</div><div class='del'>-			pre_wl_noisy_level = coex_sta-&gt;wl_noisy_level;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		if (coex_sta-&gt;under_lps != pre_wifi_under_lps) {</div><div class='del'>-			pre_wifi_under_lps = coex_sta-&gt;under_lps;</div><div class='del'>-			if (coex_sta-&gt;under_lps)</div><div class='del'>-				return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;bt_disabled) {</div><div class='del'>-		if (coex_sta-&gt;hid_busy_num != pre_hid_busy_num) {</div><div class='del'>-			pre_hid_busy_num = coex_sta-&gt;hid_busy_num;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bt_link_info-&gt;slave_role != pre_bt_slave) {</div><div class='del'>-			pre_bt_slave = bt_link_info-&gt;slave_role;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pre_hid_low_pri_tx_overhead !=</div><div class='del'>-		    coex_sta-&gt;is_hid_low_pri_tx_overhead) {</div><div class='del'>-			pre_hid_low_pri_tx_overhead =</div><div class='del'>-				coex_sta-&gt;is_hid_low_pri_tx_overhead;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pre_bt_setup_link != coex_sta-&gt;is_setup_link) {</div><div class='del'>-			pre_bt_setup_link = coex_sta-&gt;is_setup_link;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_update_bt_link_info(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	bool bt_busy = false;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;num_of_profile = 0;</div><div class='del'>-</div><div class='del'>-	/* set link exist status */</div><div class='del'>-	if (!(coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_CONNECTION)) {</div><div class='del'>-		coex_sta-&gt;bt_link_exist = false;</div><div class='del'>-		coex_sta-&gt;pan_exist = false;</div><div class='del'>-		coex_sta-&gt;a2dp_exist = false;</div><div class='del'>-		coex_sta-&gt;hid_exist = false;</div><div class='del'>-		coex_sta-&gt;sco_exist = false;</div><div class='del'>-	} else { /* connection exists */</div><div class='del'>-		coex_sta-&gt;bt_link_exist = true;</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_FTP) {</div><div class='del'>-			coex_sta-&gt;pan_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;pan_exist = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_A2DP) {</div><div class='del'>-			coex_sta-&gt;a2dp_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;a2dp_exist = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_HID) {</div><div class='del'>-			coex_sta-&gt;hid_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;hid_exist = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_1ANT_B_SCO_ESCO) {</div><div class='del'>-			coex_sta-&gt;sco_exist = true;</div><div class='del'>-			coex_sta-&gt;num_of_profile++;</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;sco_exist = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-</div><div class='del'>-	bt_link_info-&gt;bt_link_exist = coex_sta-&gt;bt_link_exist;</div><div class='del'>-	bt_link_info-&gt;sco_exist = coex_sta-&gt;sco_exist;</div><div class='del'>-	bt_link_info-&gt;a2dp_exist = coex_sta-&gt;a2dp_exist;</div><div class='del'>-	bt_link_info-&gt;pan_exist = coex_sta-&gt;pan_exist;</div><div class='del'>-	bt_link_info-&gt;hid_exist = coex_sta-&gt;hid_exist;</div><div class='del'>-	bt_link_info-&gt;acl_busy = coex_sta-&gt;acl_busy;</div><div class='del'>-</div><div class='del'>-	/* work around for HS mode. */</div><div class='del'>-	if (bt_hs_on) {</div><div class='del'>-		bt_link_info-&gt;pan_exist = true;</div><div class='del'>-		bt_link_info-&gt;bt_link_exist = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if Sco only */</div><div class='del'>-	if (bt_link_info-&gt;sco_exist &amp;&amp; !bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    !bt_link_info-&gt;pan_exist &amp;&amp; !bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;sco_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;sco_only = false;</div><div class='del'>-</div><div class='del'>-	/* check if A2dp only */</div><div class='del'>-	if (!bt_link_info-&gt;sco_exist &amp;&amp; bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    !bt_link_info-&gt;pan_exist &amp;&amp; !bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;a2dp_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;a2dp_only = false;</div><div class='del'>-</div><div class='del'>-	/* check if Pan only */</div><div class='del'>-	if (!bt_link_info-&gt;sco_exist &amp;&amp; !bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    bt_link_info-&gt;pan_exist &amp;&amp; !bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;pan_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;pan_only = false;</div><div class='del'>-</div><div class='del'>-	/* check if Hid only */</div><div class='del'>-	if (!bt_link_info-&gt;sco_exist &amp;&amp; !bt_link_info-&gt;a2dp_exist &amp;&amp;</div><div class='del'>-	    !bt_link_info-&gt;pan_exist &amp;&amp; bt_link_info-&gt;hid_exist)</div><div class='del'>-		bt_link_info-&gt;hid_only = true;</div><div class='del'>-	else</div><div class='del'>-		bt_link_info-&gt;hid_only = false;</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_INQ_PAGE) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_INQ_PAGE;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT Inq/page!!!\n");</div><div class='del'>-	} else if (!(coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_CONNECTION)) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_NON_CONNECTED_IDLE;</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], BtInfoNotify(), BT Non-Connected idle!!!\n");</div><div class='del'>-	} else if (coex_sta-&gt;bt_info == BT_INFO_8822B_2ANT_B_CONNECTION) {</div><div class='del'>-		/* connection exists but no busy */</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_CONNECTED_IDLE;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT Connected-idle!!!\n");</div><div class='del'>-	} else if (((coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_SCO_ESCO) ||</div><div class='del'>-		    (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_SCO_BUSY)) &amp;&amp;</div><div class='del'>-		   (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_ACL_BUSY)) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_ACL_SCO_BUSY;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT ACL SCO busy!!!\n");</div><div class='del'>-	} else if ((coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_SCO_ESCO) ||</div><div class='del'>-		   (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_SCO_BUSY)) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_SCO_BUSY;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT SCO busy!!!\n");</div><div class='del'>-	} else if (coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_ACL_BUSY) {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_ACL_BUSY;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT ACL busy!!!\n");</div><div class='del'>-	} else {</div><div class='del'>-		coex_dm-&gt;bt_status = BT_8822B_2ANT_BT_STATUS_MAX;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BtInfoNotify(), BT Non-Defined state!!!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_dm-&gt;bt_status == BT_8822B_2ANT_BT_STATUS_ACL_BUSY) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_2ANT_BT_STATUS_SCO_BUSY) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_2ANT_BT_STATUS_ACL_SCO_BUSY))</div><div class='del'>-		bt_busy = true;</div><div class='del'>-	else</div><div class='del'>-		bt_busy = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_TRAFFIC_BUSY, &amp;bt_busy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_update_wifi_ch_info(struct btc_coexist *btcoexist,</div><div class='del'>-						u8 type)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_parameter[3] = {0};</div><div class='del'>-	u32 wifi_bw;</div><div class='del'>-	u8 wifi_central_chnl;</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* only 2.4G we need to inform bt the chnl mask */</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL,</div><div class='del'>-			   &amp;wifi_central_chnl);</div><div class='del'>-	if ((type == BTC_MEDIA_CONNECT) &amp;&amp; (wifi_central_chnl &lt;= 14)) {</div><div class='del'>-		/* enable BT AFH skip WL channel for 8822b</div><div class='del'>-		 * because BT Rx LO interference</div><div class='del'>-		 */</div><div class='del'>-		h2c_parameter[0] = 0x1;</div><div class='del'>-		h2c_parameter[1] = wifi_central_chnl;</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-		if (wifi_bw == BTC_WIFI_BW_HT40)</div><div class='del'>-			h2c_parameter[2] = 0x30;</div><div class='del'>-		else</div><div class='del'>-			h2c_parameter[2] = 0x20;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;wifi_chnl_info[0] = h2c_parameter[0];</div><div class='del'>-	coex_dm-&gt;wifi_chnl_info[1] = h2c_parameter[1];</div><div class='del'>-	coex_dm-&gt;wifi_chnl_info[2] = h2c_parameter[2];</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x66, 3, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_set_fw_dac_swing_level(struct btc_coexist *btcoexist,</div><div class='del'>-				       u8 dac_swing_lvl)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_parameter[1] = {0};</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* There are several type of dacswing */</div><div class='del'>-	/* 0x18/ 0x10/ 0xc/ 0x8/ 0x4/ 0x6 */</div><div class='del'>-	h2c_parameter[0] = dac_swing_lvl;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x64, 1, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_fw_dac_swing_lvl(struct btc_coexist *btcoexist,</div><div class='del'>-					     bool force_exec,</div><div class='del'>-					     u8 fw_dac_swing_lvl)</div><div class='del'>-{</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_fw_dac_swing_lvl = fw_dac_swing_lvl;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_fw_dac_swing_lvl ==</div><div class='del'>-		    coex_dm-&gt;cur_fw_dac_swing_lvl)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_set_fw_dac_swing_level(btcoexist,</div><div class='del'>-					       coex_dm-&gt;cur_fw_dac_swing_lvl);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_fw_dac_swing_lvl = coex_dm-&gt;cur_fw_dac_swing_lvl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_set_fw_dec_bt_pwr(struct btc_coexist *btcoexist,</div><div class='del'>-					      u8 dec_bt_pwr_lvl)</div><div class='del'>-{</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-	u8 h2c_parameter[1] = {0};</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	h2c_parameter[0] = dec_bt_pwr_lvl;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x62, 1, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_dec_bt_pwr(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool force_exec, u8 dec_bt_pwr_lvl)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_bt_dec_pwr_lvl = dec_bt_pwr_lvl;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_bt_dec_pwr_lvl == coex_dm-&gt;cur_bt_dec_pwr_lvl)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b2ant_set_fw_dec_bt_pwr(btcoexist,</div><div class='del'>-					  coex_dm-&gt;cur_bt_dec_pwr_lvl);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_bt_dec_pwr_lvl = coex_dm-&gt;cur_bt_dec_pwr_lvl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_low_penalty_ra(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool force_exec, bool low_penalty_ra)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_low_penalty_ra = low_penalty_ra;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_low_penalty_ra == coex_dm-&gt;cur_low_penalty_ra)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (low_penalty_ra)</div><div class='del'>-		btcoexist-&gt;btc_phydm_modify_ra_pcr_threshold(btcoexist, 0, 50);</div><div class='del'>-	else</div><div class='del'>-		btcoexist-&gt;btc_phydm_modify_ra_pcr_threshold(btcoexist, 0, 0);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_low_penalty_ra = coex_dm-&gt;cur_low_penalty_ra;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_write_score_board(struct btc_coexist *btcoexist,</div><div class='del'>-					      u16 bitpos, bool state)</div><div class='del'>-{</div><div class='del'>-	static u16 originalval = 0x8002;</div><div class='del'>-</div><div class='del'>-	if (state)</div><div class='del'>-		originalval = originalval | bitpos;</div><div class='del'>-	else</div><div class='del'>-		originalval = originalval &amp; (~bitpos);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_2byte(btcoexist, 0xaa, originalval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_read_score_board(struct btc_coexist *btcoexist,</div><div class='del'>-					     u16 *score_board_val)</div><div class='del'>-{</div><div class='del'>-	*score_board_val =</div><div class='del'>-		(btcoexist-&gt;btc_read_2byte(btcoexist, 0xaa)) &amp; 0x7fff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_post_state_to_bt(struct btc_coexist *btcoexist,</div><div class='del'>-					     u16 type, bool state)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_write_score_board(btcoexist, (u16)type, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_monitor_bt_enable_disable(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u32 bt_disable_cnt;</div><div class='del'>-	bool bt_active = true, bt_disabled = false, wifi_under_5g = false;</div><div class='del'>-	u16 u16tmp;</div><div class='del'>-</div><div class='del'>-	/* This function check if bt is disabled */</div><div class='del'>-</div><div class='del'>-	/* Read BT on/off status from scoreboard[1],</div><div class='del'>-	 * enable this only if BT patch support this feature</div><div class='del'>-	 */</div><div class='del'>-	halbtc8822b2ant_read_score_board(btcoexist, &amp;u16tmp);</div><div class='del'>-</div><div class='del'>-	bt_active = u16tmp &amp; BIT(1);</div><div class='del'>-</div><div class='del'>-	if (bt_active) {</div><div class='del'>-		bt_disable_cnt = 0;</div><div class='del'>-		bt_disabled = false;</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_DISABLE,</div><div class='del'>-				   &amp;bt_disabled);</div><div class='del'>-	} else {</div><div class='del'>-		bt_disable_cnt++;</div><div class='del'>-		if (bt_disable_cnt &gt;= 10) {</div><div class='del'>-			bt_disabled = true;</div><div class='del'>-			bt_disable_cnt = 10;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_BT_DISABLE,</div><div class='del'>-				   &amp;bt_disabled);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if ((wifi_under_5g) || (bt_disabled))</div><div class='del'>-		halbtc8822b2ant_low_penalty_ra(btcoexist, NORMAL_EXEC, false);</div><div class='del'>-	else</div><div class='del'>-		halbtc8822b2ant_low_penalty_ra(btcoexist, NORMAL_EXEC, true);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled != bt_disabled) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is from %s to %s!!\n",</div><div class='del'>-			 (coex_sta-&gt;bt_disabled ? "disabled" : "enabled"),</div><div class='del'>-			 (bt_disabled ? "disabled" : "enabled"));</div><div class='del'>-		coex_sta-&gt;bt_disabled = bt_disabled;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_enable_gnt_to_gpio(struct btc_coexist *btcoexist,</div><div class='del'>-					       bool isenable)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 bit_val[5] = {0, 0, 0, 0, 0};</div><div class='del'>-</div><div class='del'>-	if (!btcoexist-&gt;dbg_mode_2ant)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (isenable) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], enable_gnt_to_gpio!!\n");</div><div class='del'>-</div><div class='del'>-		/* enable GNT_WL, GNT_BT to GPIO for debug */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x73, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-		/* store original value */</div><div class='del'>-		bit_val[0] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x66) &amp; BIT(4)) &gt;&gt;</div><div class='del'>-			4; /*0x66[4] */</div><div class='del'>-		bit_val[1] = (btcoexist-&gt;btc_read_1byte(btcoexist, 0x67) &amp;</div><div class='del'>-			      BIT(0)); /*0x66[8] */</div><div class='del'>-		bit_val[2] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x42) &amp; BIT(3)) &gt;&gt;</div><div class='del'>-			3; /*0x40[19] */</div><div class='del'>-		bit_val[3] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x65) &amp; BIT(7)) &gt;&gt;</div><div class='del'>-			7; /*0x64[15] */</div><div class='del'>-		bit_val[4] =</div><div class='del'>-			(btcoexist-&gt;btc_read_1byte(btcoexist, 0x72) &amp; BIT(2)) &gt;&gt;</div><div class='del'>-			2; /*0x70[18] */</div><div class='del'>-</div><div class='del'>-		/*  switch GPIO Mux */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x66, BIT(4),</div><div class='del'>-						   0x0); /*0x66[4] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x67, BIT(0),</div><div class='del'>-						   0x0); /*0x66[8] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x42, BIT(3),</div><div class='del'>-						   0x0); /*0x40[19] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x65, BIT(7),</div><div class='del'>-						   0x0); /*0x64[15] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x72, BIT(2),</div><div class='del'>-						   0x0); /*0x70[18] = 0 */</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], disable_gnt_to_gpio!!\n");</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x73, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-		/*  Restore original value  */</div><div class='del'>-		/*  switch GPIO Mux */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x66, BIT(4),</div><div class='del'>-						   bit_val[0]); /*0x66[4] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x67, BIT(0),</div><div class='del'>-						   bit_val[1]); /*0x66[8] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x42, BIT(3), bit_val[2]); /*0x40[19] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x65, BIT(7), bit_val[3]); /*0x64[15] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x72, BIT(2), bit_val[4]); /*0x70[18] = 0 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-halbtc8822b2ant_ltecoex_indirect_read_reg(struct btc_coexist *btcoexist,</div><div class='del'>-					  u16 reg_addr)</div><div class='del'>-{</div><div class='del'>-	u32 delay_count = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if ((btcoexist-&gt;btc_read_1byte(btcoexist, 0x1703) &amp; BIT(5)) ==</div><div class='del'>-		    0) {</div><div class='del'>-			mdelay(50);</div><div class='del'>-			delay_count++;</div><div class='del'>-			if (delay_count &gt;= 10) {</div><div class='del'>-				delay_count = 0;</div><div class='del'>-				break;</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'>-</div><div class='del'>-	/* wait for ready bit before access 0x1700		 */</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x1700, 0x800F0000 | reg_addr);</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;btc_read_4byte(btcoexist, 0x1708); /* get read data */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_ltecoex_indirect_write_reg(struct btc_coexist *btcoexist,</div><div class='del'>-					   u16 reg_addr, u32 bit_mask,</div><div class='del'>-					   u32 reg_value)</div><div class='del'>-{</div><div class='del'>-	u32 val, i = 0, bitpos = 0, delay_count = 0;</div><div class='del'>-</div><div class='del'>-	if (bit_mask == 0x0)</div><div class='del'>-		return;</div><div class='del'>-	if (bit_mask == 0xffffffff) {</div><div class='del'>-		/* wait for ready bit before access 0x1700/0x1704 */</div><div class='del'>-		while (1) {</div><div class='del'>-			if ((btcoexist-&gt;btc_read_1byte(btcoexist, 0x1703) &amp;</div><div class='del'>-			     BIT(5)) == 0) {</div><div class='del'>-				mdelay(50);</div><div class='del'>-				delay_count++;</div><div class='del'>-				if (delay_count &gt;= 10) {</div><div class='del'>-					delay_count = 0;</div><div class='del'>-					break;</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'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1704,</div><div class='del'>-					   reg_value); /* put write data */</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1700,</div><div class='del'>-					   0xc00F0000 | reg_addr);</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt;= 31; i++) {</div><div class='del'>-			if (((bit_mask &gt;&gt; i) &amp; 0x1) == 0x1) {</div><div class='del'>-				bitpos = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* read back register value before write */</div><div class='del'>-		val = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								reg_addr);</div><div class='del'>-		val = (val &amp; (~bit_mask)) | (reg_value &lt;&lt; bitpos);</div><div class='del'>-</div><div class='del'>-		/* wait for ready bit before access 0x1700/0x1704 */</div><div class='del'>-		while (1) {</div><div class='del'>-			if ((btcoexist-&gt;btc_read_1byte(btcoexist, 0x1703) &amp;</div><div class='del'>-			     BIT(5)) == 0) {</div><div class='del'>-				mdelay(50);</div><div class='del'>-				delay_count++;</div><div class='del'>-				if (delay_count &gt;= 10) {</div><div class='del'>-					delay_count = 0;</div><div class='del'>-					break;</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'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1704,</div><div class='del'>-					   val); /* put write data */</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_4byte(btcoexist, 0x1700,</div><div class='del'>-					   0xc00F0000 | reg_addr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_ltecoex_enable(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool enable)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	val = (enable) ? 1 : 0;</div><div class='del'>-	halbtc8822b2ant_ltecoex_indirect_write_reg(btcoexist, 0x38, 0x80,</div><div class='del'>-						   val); /* 0x38[7] */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_ltecoex_pathcontrol_owner(struct btc_coexist *btcoexist,</div><div class='del'>-					  bool wifi_control)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-</div><div class='del'>-	val = (wifi_control) ? 1 : 0;</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x73, 0x4,</div><div class='del'>-					   val); /* 0x70[26] */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_ltecoex_set_gnt_bt(struct btc_coexist *btcoexist,</div><div class='del'>-					       u8 control_block,</div><div class='del'>-					       bool sw_control, u8 state)</div><div class='del'>-{</div><div class='del'>-	u32 val = 0, bit_mask;</div><div class='del'>-</div><div class='del'>-	state = state &amp; 0x1;</div><div class='del'>-	val = (sw_control) ? ((state &lt;&lt; 1) | 0x1) : 0;</div><div class='del'>-</div><div class='del'>-	switch (control_block) {</div><div class='del'>-	case BT_8822B_2ANT_GNT_BLOCK_RFC_BB:</div><div class='del'>-	default:</div><div class='del'>-		bit_mask = 0xc000;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[15:14] */</div><div class='del'>-		bit_mask = 0x0c00;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[11:10] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_GNT_BLOCK_RFC:</div><div class='del'>-		bit_mask = 0xc000;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[15:14] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_GNT_BLOCK_BB:</div><div class='del'>-		bit_mask = 0x0c00;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[11:10] */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_ltecoex_set_gnt_wl(struct btc_coexist *btcoexist,</div><div class='del'>-					       u8 control_block,</div><div class='del'>-					       bool sw_control, u8 state)</div><div class='del'>-{</div><div class='del'>-	u32 val = 0, bit_mask;</div><div class='del'>-</div><div class='del'>-	state = state &amp; 0x1;</div><div class='del'>-	val = (sw_control) ? ((state &lt;&lt; 1) | 0x1) : 0;</div><div class='del'>-</div><div class='del'>-	switch (control_block) {</div><div class='del'>-	case BT_8822B_2ANT_GNT_BLOCK_RFC_BB:</div><div class='del'>-	default:</div><div class='del'>-		bit_mask = 0x3000;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[13:12] */</div><div class='del'>-		bit_mask = 0x0300;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[9:8] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_GNT_BLOCK_RFC:</div><div class='del'>-		bit_mask = 0x3000;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[13:12] */</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_GNT_BLOCK_BB:</div><div class='del'>-		bit_mask = 0x0300;</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, 0x38, bit_mask, val); /* 0x38[9:8] */</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'>-halbtc8822b2ant_ltecoex_set_coex_table(struct btc_coexist *btcoexist,</div><div class='del'>-				       u8 table_type, u16 table_content)</div><div class='del'>-{</div><div class='del'>-	u16 reg_addr = 0x0000;</div><div class='del'>-</div><div class='del'>-	switch (table_type) {</div><div class='del'>-	case BT_8822B_2ANT_CTT_WL_VS_LTE:</div><div class='del'>-		reg_addr = 0xa0;</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_CTT_BT_VS_LTE:</div><div class='del'>-		reg_addr = 0xa4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reg_addr != 0x0000)</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_write_reg(</div><div class='del'>-			btcoexist, reg_addr, 0xffff,</div><div class='del'>-			table_content); /* 0xa0[15:0] or 0xa4[15:0] */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_set_wltoggle_coex_table(</div><div class='del'>-	struct btc_coexist *btcoexist, bool force_exec, u8 interval,</div><div class='del'>-	u8 val0x6c4_b0, u8 val0x6c4_b1, u8 val0x6c4_b2, u8 val0x6c4_b3)</div><div class='del'>-{</div><div class='del'>-	static u8 pre_h2c_parameter[6] = {0};</div><div class='del'>-	u8 cur_h2c_parameter[6] = {0};</div><div class='del'>-	u8 i, match_cnt = 0;</div><div class='del'>-</div><div class='del'>-	cur_h2c_parameter[0] = 0x7; /* op_code, 0x7= wlan toggle slot*/</div><div class='del'>-</div><div class='del'>-	cur_h2c_parameter[1] = interval;</div><div class='del'>-	cur_h2c_parameter[2] = val0x6c4_b0;</div><div class='del'>-	cur_h2c_parameter[3] = val0x6c4_b1;</div><div class='del'>-	cur_h2c_parameter[4] = val0x6c4_b2;</div><div class='del'>-	cur_h2c_parameter[5] = val0x6c4_b3;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		for (i = 1; i &lt;= 5; i++) {</div><div class='del'>-			if (cur_h2c_parameter[i] != pre_h2c_parameter[i])</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			match_cnt++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (match_cnt == 5)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt;= 5; i++)</div><div class='del'>-		pre_h2c_parameter[i] = cur_h2c_parameter[i];</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x69, 6, cur_h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_set_coex_table(struct btc_coexist *btcoexist,</div><div class='del'>-					   u32 val0x6c0, u32 val0x6c4,</div><div class='del'>-					   u32 val0x6c8, u8 val0x6cc)</div><div class='del'>-{</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x6c0, val0x6c0);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x6c4, val0x6c4);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_4byte(btcoexist, 0x6c8, val0x6c8);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cc, val0x6cc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_coex_table(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool force_exec, u32 val0x6c0,</div><div class='del'>-				       u32 val0x6c4, u32 val0x6c8, u8 val0x6cc)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_val0x6c0 = val0x6c0;</div><div class='del'>-	coex_dm-&gt;cur_val0x6c4 = val0x6c4;</div><div class='del'>-	coex_dm-&gt;cur_val0x6c8 = val0x6c8;</div><div class='del'>-	coex_dm-&gt;cur_val0x6cc = val0x6cc;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if ((coex_dm-&gt;pre_val0x6c0 == coex_dm-&gt;cur_val0x6c0) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_val0x6c4 == coex_dm-&gt;cur_val0x6c4) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_val0x6c8 == coex_dm-&gt;cur_val0x6c8) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_val0x6cc == coex_dm-&gt;cur_val0x6cc))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b2ant_set_coex_table(btcoexist, val0x6c0, val0x6c4, val0x6c8,</div><div class='del'>-				       val0x6cc);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_val0x6c0 = coex_dm-&gt;cur_val0x6c0;</div><div class='del'>-	coex_dm-&gt;pre_val0x6c4 = coex_dm-&gt;cur_val0x6c4;</div><div class='del'>-	coex_dm-&gt;pre_val0x6c8 = coex_dm-&gt;cur_val0x6c8;</div><div class='del'>-	coex_dm-&gt;pre_val0x6cc = coex_dm-&gt;cur_val0x6cc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_coex_table_with_type(struct btc_coexist *btcoexist,</div><div class='del'>-						 bool force_exec, u8 type)</div><div class='del'>-{</div><div class='del'>-	u32 break_table;</div><div class='del'>-	u8 select_table;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;coex_table_type = type;</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;concurrent_rx_mode_on) {</div><div class='del'>-		break_table = 0xf0ffffff; /* set WL hi-pri can break BT */</div><div class='del'>-		/* set Tx response = Hi-Pri (ex: Transmitting ACK,BA,CTS) */</div><div class='del'>-		select_table = 0xb;</div><div class='del'>-	} else {</div><div class='del'>-		break_table = 0xffffff;</div><div class='del'>-		select_table = 0x3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case 0:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0xffffffff,</div><div class='del'>-					   0xffffffff, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x5a5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x5a5a5a5a,</div><div class='del'>-					   0x5a5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x5a5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x5a5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x55555555, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0xa5555555,</div><div class='del'>-					   0xfafafafa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0xa5555555,</div><div class='del'>-					   0xaa5a5a5a, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0xa5555555,</div><div class='del'>-					   0xfafafafa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 9:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x5a5a5a5a,</div><div class='del'>-					   0xaaaa5aaa, break_table,</div><div class='del'>-					   select_table);</div><div class='del'>-		break;</div><div class='del'>-	case 10:</div><div class='del'>-		halbtc8822b2ant_coex_table(btcoexist, force_exec, 0x55555555,</div><div class='del'>-					   0x5a5a555a, break_table,</div><div class='del'>-					   select_table);</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</div><div class='del'>-halbtc8822b2ant_set_fw_ignore_wlan_act(struct btc_coexist *btcoexist,</div><div class='del'>-				       bool enable)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_parameter[1] = {0};</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		h2c_parameter[0] |= BIT(0); /* function enable */</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c(btcoexist, 0x63, 1, h2c_parameter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_ignore_wlan_act(struct btc_coexist *btcoexist,</div><div class='del'>-					    bool force_exec, bool enable)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_ignore_wlan_act = enable;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_ignore_wlan_act ==</div><div class='del'>-		    coex_dm-&gt;cur_ignore_wlan_act)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b2ant_set_fw_ignore_wlan_act(btcoexist, enable);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_ignore_wlan_act = coex_dm-&gt;cur_ignore_wlan_act;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_set_lps_rpwm(struct btc_coexist *btcoexist,</div><div class='del'>-					 u8 lps_val, u8 rpwm_val)</div><div class='del'>-{</div><div class='del'>-	u8 lps = lps_val;</div><div class='del'>-	u8 rpwm = rpwm_val;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_U1_LPS_VAL, &amp;lps);</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_U1_RPWM_VAL, &amp;rpwm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_lps_rpwm(struct btc_coexist *btcoexist,</div><div class='del'>-				     bool force_exec, u8 lps_val, u8 rpwm_val)</div><div class='del'>-{</div><div class='del'>-	coex_dm-&gt;cur_lps = lps_val;</div><div class='del'>-	coex_dm-&gt;cur_rpwm = rpwm_val;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if ((coex_dm-&gt;pre_lps == coex_dm-&gt;cur_lps) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_rpwm == coex_dm-&gt;cur_rpwm))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	halbtc8822b2ant_set_lps_rpwm(btcoexist, lps_val, rpwm_val);</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_lps = coex_dm-&gt;cur_lps;</div><div class='del'>-	coex_dm-&gt;pre_rpwm = coex_dm-&gt;cur_rpwm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_ps_tdma_check_for_power_save_state(</div><div class='del'>-	struct btc_coexist *btcoexist, bool new_ps_state)</div><div class='del'>-{</div><div class='del'>-	u8 lps_mode = 0x0;</div><div class='del'>-	u8 h2c_parameter[5] = {0, 0, 0, 0x40, 0};</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_LPS_MODE, &amp;lps_mode);</div><div class='del'>-</div><div class='del'>-	if (lps_mode) { /* already under LPS state */</div><div class='del'>-		if (new_ps_state) {</div><div class='del'>-			/* keep state under LPS, do nothing. */</div><div class='del'>-		} else {</div><div class='del'>-			/* will leave LPS state, turn off psTdma first */</div><div class='del'>-			btcoexist-&gt;btc_fill_h2c(btcoexist, 0x60, 5,</div><div class='del'>-						h2c_parameter);</div><div class='del'>-		}</div><div class='del'>-	} else { /* NO PS state */</div><div class='del'>-		if (new_ps_state) {</div><div class='del'>-			/* will enter LPS state, turn off psTdma first */</div><div class='del'>-			btcoexist-&gt;btc_fill_h2c(btcoexist, 0x60, 5,</div><div class='del'>-						h2c_parameter);</div><div class='del'>-		} else {</div><div class='del'>-			/* keep state under NO PS state, do nothing. */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool halbtc8822b2ant_power_save_state(struct btc_coexist *btcoexist,</div><div class='del'>-					     u8 ps_type, u8 lps_val,</div><div class='del'>-					     u8 rpwm_val)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool low_pwr_disable = false, result = true;</div><div class='del'>-</div><div class='del'>-	switch (ps_type) {</div><div class='del'>-	case BTC_PS_WIFI_NATIVE:</div><div class='del'>-		coex_sta-&gt;force_lps_ctrl = false;</div><div class='del'>-		/* recover to original 32k low power setting */</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == BTC_PS_WIFI_NATIVE\n", __func__);</div><div class='del'>-</div><div class='del'>-		low_pwr_disable = false;</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_DISABLE_LOW_POWER,</div><div class='del'>-				   &amp;low_pwr_disable);</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_NORMAL_LPS, NULL);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_PS_LPS_ON:</div><div class='del'>-		coex_sta-&gt;force_lps_ctrl = true;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == BTC_PS_LPS_ON\n", __func__);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma_check_for_power_save_state(btcoexist,</div><div class='del'>-								   true);</div><div class='del'>-		halbtc8822b2ant_lps_rpwm(btcoexist, NORMAL_EXEC, lps_val,</div><div class='del'>-					 rpwm_val);</div><div class='del'>-		/* when coex force to enter LPS, do not enter 32k low power. */</div><div class='del'>-		low_pwr_disable = true;</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_DISABLE_LOW_POWER,</div><div class='del'>-				   &amp;low_pwr_disable);</div><div class='del'>-		/* power save must executed before psTdma. */</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_ENTER_LPS, NULL);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_PS_LPS_OFF:</div><div class='del'>-		coex_sta-&gt;force_lps_ctrl = true;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == BTC_PS_LPS_OFF\n", __func__);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma_check_for_power_save_state(btcoexist,</div><div class='del'>-								   false);</div><div class='del'>-		result = btcoexist-&gt;btc_set(btcoexist, BTC_SET_ACT_LEAVE_LPS,</div><div class='del'>-					    NULL);</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 result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_set_fw_pstdma(struct btc_coexist *btcoexist,</div><div class='del'>-					  u8 byte1, u8 byte2, u8 byte3,</div><div class='del'>-					  u8 byte4, u8 byte5)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 h2c_parameter[5] = {0};</div><div class='del'>-	u8 real_byte1 = byte1, real_byte5 = byte5;</div><div class='del'>-	bool ap_enable = false, result = false;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	if (byte5 &amp; BIT(2))</div><div class='del'>-		coex_sta-&gt;is_tdma_btautoslot = true;</div><div class='del'>-	else</div><div class='del'>-		coex_sta-&gt;is_tdma_btautoslot = false;</div><div class='del'>-</div><div class='del'>-	/* release bt-auto slot for auto-slot hang is detected!! */</div><div class='del'>-	if (coex_sta-&gt;is_tdma_btautoslot)</div><div class='del'>-		if ((coex_sta-&gt;is_tdma_btautoslot_hang) ||</div><div class='del'>-		    (bt_link_info-&gt;slave_role))</div><div class='del'>-			byte5 = byte5 &amp; 0xfb;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-			   &amp;ap_enable);</div><div class='del'>-</div><div class='del'>-	if ((ap_enable) &amp;&amp; (byte1 &amp; BIT(4) &amp;&amp; !(byte1 &amp; BIT(5)))) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == FW for AP mode\n", __func__);</div><div class='del'>-</div><div class='del'>-		real_byte1 &amp;= ~BIT(4);</div><div class='del'>-		real_byte1 |= BIT(5);</div><div class='del'>-</div><div class='del'>-		real_byte5 |= BIT(5);</div><div class='del'>-		real_byte5 &amp;= ~BIT(6);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,</div><div class='del'>-						 0x0, 0x0);</div><div class='del'>-	} else if (byte1 &amp; BIT(4) &amp;&amp; !(byte1 &amp; BIT(5))) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == Force LPS (byte1 = 0x%x)\n",</div><div class='del'>-			 __func__, byte1);</div><div class='del'>-</div><div class='del'>-		if (!halbtc8822b2ant_power_save_state(btcoexist, BTC_PS_LPS_OFF,</div><div class='del'>-						      0x50, 0x4))</div><div class='del'>-			result = true;</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == Native LPS (byte1 = 0x%x)\n",</div><div class='del'>-			 __func__, byte1);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,</div><div class='del'>-						 0x0, 0x0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;is_set_ps_state_fail = result;</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;is_set_ps_state_fail) {</div><div class='del'>-		h2c_parameter[0] = real_byte1;</div><div class='del'>-		h2c_parameter[1] = byte2;</div><div class='del'>-		h2c_parameter[2] = byte3;</div><div class='del'>-		h2c_parameter[3] = byte4;</div><div class='del'>-		h2c_parameter[4] = real_byte5;</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[0] = real_byte1;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[1] = byte2;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[2] = byte3;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[3] = byte4;</div><div class='del'>-		coex_dm-&gt;ps_tdma_para[4] = real_byte5;</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_fill_h2c(btcoexist, 0x60, 5, h2c_parameter);</div><div class='del'>-	} else {</div><div class='del'>-		coex_sta-&gt;cnt_set_ps_state_fail++;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], %s == Force Leave LPS Fail (cnt = %d)\n",</div><div class='del'>-			 __func__, coex_sta-&gt;cnt_set_ps_state_fail);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_ps_tdma(struct btc_coexist *btcoexist,</div><div class='del'>-				    bool force_exec, bool turn_on, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 ps_tdma_byte4_modify, pre_ps_tdma_byte4_modify;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_ps_tdma_on = turn_on;</div><div class='del'>-	coex_dm-&gt;cur_ps_tdma = type;</div><div class='del'>-</div><div class='del'>-	/* 0x778 = 0x1 at wifi slot (no blocking BT Low-Pri pkts) */</div><div class='del'>-	if (bt_link_info-&gt;slave_role)</div><div class='del'>-		ps_tdma_byte4_modify = 0x1;</div><div class='del'>-	else</div><div class='del'>-		ps_tdma_byte4_modify = 0x0;</div><div class='del'>-</div><div class='del'>-	if (pre_ps_tdma_byte4_modify != ps_tdma_byte4_modify) {</div><div class='del'>-		force_exec = true;</div><div class='del'>-		pre_ps_tdma_byte4_modify = ps_tdma_byte4_modify;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if ((coex_dm-&gt;pre_ps_tdma_on == coex_dm-&gt;cur_ps_tdma_on) &amp;&amp;</div><div class='del'>-		    (coex_dm-&gt;pre_ps_tdma == coex_dm-&gt;cur_ps_tdma)) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], Skip TDMA because no change TDMA(%s, %d)\n",</div><div class='del'>-				(coex_dm-&gt;cur_ps_tdma_on ? "on" : "off"),</div><div class='del'>-				coex_dm-&gt;cur_ps_tdma);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_dm-&gt;cur_ps_tdma_on) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], ********** TDMA(on, %d) **********\n",</div><div class='del'>-			 coex_dm-&gt;cur_ps_tdma);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x550, 0x8, 0x1); /* enable TBTT nterrupt */</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], ********** TDMA(off, %d) **********\n",</div><div class='del'>-			 coex_dm-&gt;cur_ps_tdma);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (turn_on) {</div><div class='del'>-		switch (type) {</div><div class='del'>-		case 1:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x10, 0x03, 0x91,</div><div class='del'>-				0x54 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-		default:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x35, 0x03, 0x11,</div><div class='del'>-				0x11 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x3a, 0x3, 0x91,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x21, 0x3, 0x91,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 5:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x25, 0x3, 0x91,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 6:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x10, 0x3, 0x91,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 7:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x20, 0x3, 0x91,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 8:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x15,</div><div class='del'>-						      0x03, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 10:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x30,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 11:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x35, 0x03, 0x11,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 12:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x35,</div><div class='del'>-						      0x03, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 13:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x1c, 0x03, 0x11,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 14:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x20,</div><div class='del'>-						      0x03, 0x11, 0x11);</div><div class='del'>-			break;</div><div class='del'>-		case 15:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x10,</div><div class='del'>-						      0x03, 0x11, 0x14);</div><div class='del'>-			break;</div><div class='del'>-		case 16:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x10,</div><div class='del'>-						      0x03, 0x11, 0x15);</div><div class='del'>-			break;</div><div class='del'>-		case 21:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x30,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 22:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x25,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 23:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x61, 0x10,</div><div class='del'>-						      0x03, 0x11, 0x10);</div><div class='del'>-			break;</div><div class='del'>-		case 51:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x10, 0x03, 0x91,</div><div class='del'>-				0x10 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 101:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x25, 0x03, 0x11,</div><div class='del'>-				0x11 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 102:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x35, 0x03, 0x11,</div><div class='del'>-				0x11 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 103:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x3a, 0x3, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 104:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x21, 0x3, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 105:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x30, 0x3, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 106:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x3, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 107:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x7, 0x10,</div><div class='del'>-				0x54 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 108:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x30, 0x3, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 109:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x03, 0x10,</div><div class='del'>-				0x54 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 110:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x55, 0x30, 0x03, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 111:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x61, 0x25, 0x03, 0x11,</div><div class='del'>-				0x11 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		case 151:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(</div><div class='del'>-				btcoexist, 0x51, 0x10, 0x03, 0x10,</div><div class='del'>-				0x50 | ps_tdma_byte4_modify);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* disable PS tdma */</div><div class='del'>-		switch (type) {</div><div class='del'>-		case 0:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x0, 0x0, 0x0,</div><div class='del'>-						      0x40, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x0, 0x0, 0x0,</div><div class='del'>-						      0x48, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			halbtc8822b2ant_set_fw_pstdma(btcoexist, 0x0, 0x0, 0x0,</div><div class='del'>-						      0x40, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;is_set_ps_state_fail) {</div><div class='del'>-		/* update pre state */</div><div class='del'>-		coex_dm-&gt;pre_ps_tdma_on = coex_dm-&gt;cur_ps_tdma_on;</div><div class='del'>-		coex_dm-&gt;pre_ps_tdma = coex_dm-&gt;cur_ps_tdma;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*anttenna control by bb mac bt antdiv pta to write 0x4c 0xcb4,0xcbd*/</div><div class='del'>-static void halbtc8822b2ant_set_ext_ant_switch(struct btc_coexist *btcoexist,</div><div class='del'>-					       bool force_exec, u8 ctrl_type,</div><div class='del'>-					       u8 pos_type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool switch_polatiry_inverse = false;</div><div class='del'>-	u8 regval_0xcbc = 0, regval_0x64;</div><div class='del'>-	u32 u32tmp1 = 0, u32tmp2 = 0, u32tmp3 = 0;</div><div class='del'>-</div><div class='del'>-	if (!rfe_type-&gt;ext_ant_switch_exist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_ext_ant_switch_status = (ctrl_type &lt;&lt; 8) + pos_type;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;pre_ext_ant_switch_status ==</div><div class='del'>-		    coex_dm-&gt;cur_ext_ant_switch_status)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	coex_dm-&gt;pre_ext_ant_switch_status = coex_dm-&gt;cur_ext_ant_switch_status;</div><div class='del'>-</div><div class='del'>-	/* Ext switch buffer mux */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-	switch (ctrl_type) {</div><div class='del'>-	default:</div><div class='del'>-	case BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x0); /*  0x4c[23] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-						   0x1); /* 0x4c[24] = 1 */</div><div class='del'>-		/* BB SW, DPDT use RFE_ctrl8 and RFE_ctrl9 as conctrol pin */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4, 0xff,</div><div class='del'>-						   0x77);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x03, 01);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_PTA:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x0); /* 0x4c[23] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-						   0x1); /* 0x4c[24] = 1 */</div><div class='del'>-		/* PTA,  DPDT use RFE_ctrl8 and RFE_ctrl9 as conctrol pin */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4, 0xff,</div><div class='del'>-						   0x66);</div><div class='del'>-</div><div class='del'>-		/* 0xcb4[29:28] = 2b'10 for no switch_polatiry_inverse,</div><div class='del'>-		 * DPDT_SEL_N =1, DPDT_SEL_P =0  @ GNT_BT=1</div><div class='del'>-		 */</div><div class='del'>-		regval_0xcbc = (!switch_polatiry_inverse ? 0x2 : 0x1);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbc, 0x03,</div><div class='del'>-						   regval_0xcbc);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_ANTDIV:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x0); /* 0x4c[23] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-						   0x1); /* 0x4c[24] = 1 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4, 0xff,</div><div class='del'>-						   0x88);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_MAC:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x1); /*  0x4c[23] = 1 */</div><div class='del'>-</div><div class='del'>-		/* 0x64[0] = 1b'0 for no switch_polatiry_inverse,</div><div class='del'>-		 * DPDT_SEL_N =1, DPDT_SEL_P =0</div><div class='del'>-		 */</div><div class='del'>-		regval_0x64 = (!switch_polatiry_inverse ? 0x0 : 0x1);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x64, 0x1,</div><div class='del'>-						   regval_0x64);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_BT:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x0); /* 0x4c[23] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-						   0x0); /* 0x4c[24] = 0 */</div><div class='del'>-</div><div class='del'>-		/* no setup required, because  antenna switch control value by</div><div class='del'>-		 * BT vendor 0x1c[1:0]</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* PAPE, LNA_ON control by BT while WLAN off for current leakage issue*/</div><div class='del'>-	if (ctrl_type == BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_BT) {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x67, 0x20, 0x0); /* PAPE   0x64[29] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x67, 0x10, 0x0); /* LNA_ON 0x64[28] = 0 */</div><div class='del'>-	} else {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x67, 0x20, 0x1); /* PAPE   0x64[29] = 1 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(</div><div class='del'>-			btcoexist, 0x67, 0x10, 0x1); /* LNA_ON 0x64[28] = 1 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;dbg_mode_2ant) {</div><div class='del'>-		u32tmp1 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-		u32tmp2 = btcoexist-&gt;btc_read_4byte(btcoexist, 0x4c);</div><div class='del'>-		u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0x64) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], (After Ext Ant switch setup) 0xcb4 = 0x%08x, 0x4c = 0x%08x, 0x64= 0x%02x\n",</div><div class='del'>-			u32tmp1, u32tmp2, u32tmp3);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* rf4 type by efuse, and for ant at main aux inverse use,</div><div class='del'>- * because is 2x2, and control types are the same, does not need</div><div class='del'>- */</div><div class='del'>-static void halbtc8822b2ant_set_rfe_type(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-</div><div class='del'>-	rfe_type-&gt;ext_band_switch_exist = false;</div><div class='del'>-	rfe_type-&gt;ext_band_switch_type =</div><div class='del'>-		BT_8822B_2ANT_EXT_BAND_SWITCH_USE_SPDT; /* SPDT; */</div><div class='del'>-	rfe_type-&gt;ext_band_switch_ctrl_polarity = 0;</div><div class='del'>-	/* Ext switch buffer mux */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-</div><div class='del'>-	if (rfe_type-&gt;ext_band_switch_exist) {</div><div class='del'>-		/* band switch use RFE_ctrl1 (pin name: PAPE_A) and</div><div class='del'>-		 * RFE_ctrl3 (pin name: LNAON_A)</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* set RFE_ctrl1 as software control */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb0, 0xf0, 0x7);</div><div class='del'>-</div><div class='del'>-		/* set RFE_ctrl3 as software control */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb1, 0xf0, 0x7);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the following setup should be got from Efuse in the future */</div><div class='del'>-	rfe_type-&gt;rfe_module_type = board_info-&gt;rfe_type;</div><div class='del'>-</div><div class='del'>-	rfe_type-&gt;ext_ant_switch_ctrl_polarity = 0;</div><div class='del'>-</div><div class='del'>-	switch (rfe_type-&gt;rfe_module_type) {</div><div class='del'>-	case 0:</div><div class='del'>-	default:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_exist = true;</div><div class='del'>-		rfe_type-&gt;ext_ant_switch_type =</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set gnt_wl gnt_bt control by sw high low, or hwpta while in</div><div class='del'>- * power on, ini, wlan off, wlan only, wl2g non-currrent, wl2g current, wl5g</div><div class='del'>- */</div><div class='del'>-static void halbtc8822b2ant_set_ant_path(struct btc_coexist *btcoexist,</div><div class='del'>-					 u8 ant_pos_type, bool force_exec,</div><div class='del'>-					 u8 phase)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 u8tmp = 0;</div><div class='del'>-	u32 u32tmp1 = 0;</div><div class='del'>-	u32 u32tmp2 = 0, u32tmp3 = 0;</div><div class='del'>-</div><div class='del'>-	u32tmp1 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-</div><div class='del'>-	/* To avoid indirect access fail  */</div><div class='del'>-	if (((u32tmp1 &amp; 0xf000) &gt;&gt; 12) != ((u32tmp1 &amp; 0x0f00) &gt;&gt; 8)) {</div><div class='del'>-		force_exec = true;</div><div class='del'>-		coex_sta-&gt;gnt_error_cnt++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ext switch buffer mux */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x974, 0xff);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x1991, 0x3, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbe, 0x8, 0x0);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-					   0x0); /*  0x4c[23] = 0 */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-					   0x1); /* 0x4c[24] = 1 */</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;cur_ant_pos_type = (ant_pos_type &lt;&lt; 8) + phase;</div><div class='del'>-</div><div class='del'>-	if (!force_exec) {</div><div class='del'>-		if (coex_dm-&gt;cur_ant_pos_type == coex_dm-&gt;pre_ant_pos_type)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_ant_pos_type = coex_dm-&gt;cur_ant_pos_type;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;dbg_mode_2ant) {</div><div class='del'>-		u32tmp1 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x38);</div><div class='del'>-		u32tmp2 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x54);</div><div class='del'>-		u8tmp = btcoexist-&gt;btc_read_1byte(btcoexist, 0x73);</div><div class='del'>-</div><div class='del'>-		u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], (Before Ant Setup) 0xcb4 = 0x%x, 0x73 = 0x%x, 0x38= 0x%x, 0x54= 0x%x\n",</div><div class='del'>-			u32tmp3, u8tmp, u32tmp1, u32tmp2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (phase) {</div><div class='del'>-	case BT_8822B_2ANT_PHASE_COEX_POWERON:</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at initial step */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_BTSIDE);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		/* Set GNT_WL to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_PHASE_COEX_INIT:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x0); /*  0x4c[23] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-						   0x1); /* 0x4c[24] = 1 */</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side</div><div class='del'>-		 * (this should be on if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b2ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* GNT_WL_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_CTT_WL_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* GNT_BT_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_CTT_BT_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at initial step */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		/* Set GNT_WL to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_PHASE_WLANONLY_INIT:</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side</div><div class='del'>-		 * (this should be on if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b2ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* GNT_WL_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_CTT_WL_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* GNT_BT_LTE always = 1</div><div class='del'>-		 * (this should be config if LTE coex is required)</div><div class='del'>-		 */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_coex_table(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_CTT_BT_VS_LTE, 0xffff);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at initial step */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW Low */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_LOW);</div><div class='del'>-		/* Set GNT_WL to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_PHASE_WLAN_OFF:</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4e, 0x80,</div><div class='del'>-						   0x0); /* 0x4c[23] = 0 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4f, 0x01,</div><div class='del'>-						   0x0); /* 0x4c[24] = 0 */</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side */</div><div class='del'>-		halbtc8822b2ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to BT */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_BTSIDE);</div><div class='del'>-</div><div class='del'>-		/* Set Ext Ant Switch to BT control at wifi off step */</div><div class='del'>-		halbtc8822b2ant_set_ext_ant_switch(</div><div class='del'>-			btcoexist, FORCE_EXEC,</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_BT,</div><div class='del'>-			BT_8822B_2ANT_EXT_ANT_SWITCH_MAIN_TO_NOCARE);</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_PHASE_2G_RUNTIME:</div><div class='del'>-	case BT_8822B_2ANT_PHASE_2G_RUNTIME_CONCURRENT:</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at runtime step */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_WLSIDE);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcb4, 0xff,</div><div class='del'>-						   0x66);</div><div class='del'>-		if (phase == BT_8822B_2ANT_PHASE_2G_RUNTIME_CONCURRENT) {</div><div class='del'>-			/* set GNT_BT to PTA */</div><div class='del'>-			halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-				btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-				BT_8822B_2ANT_GNT_TYPE_CTRL_BY_PTA,</div><div class='del'>-				BT_8822B_2ANT_SIG_STA_SET_BY_HW);</div><div class='del'>-</div><div class='del'>-			/* Set GNT_WL to SW High */</div><div class='del'>-			halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-				btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-				BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-				BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		} else {</div><div class='del'>-			/* set GNT_BT to PTA */</div><div class='del'>-			halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-				btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-				BT_8822B_2ANT_GNT_TYPE_CTRL_BY_PTA,</div><div class='del'>-				BT_8822B_2ANT_SIG_STA_SET_BY_HW);</div><div class='del'>-</div><div class='del'>-			/* Set GNT_WL to PTA */</div><div class='del'>-			halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-				btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-				BT_8822B_2ANT_GNT_TYPE_CTRL_BY_PTA,</div><div class='del'>-				BT_8822B_2ANT_SIG_STA_SET_BY_HW);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ************* under2g 0xcbd setting =2 *************\n");</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x03, 02);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BT_8822B_2ANT_PHASE_5G_RUNTIME:</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL at runtime step */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW Hi */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		/* Set GNT_WL to SW Hi */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		coex_sta-&gt;run_time_state = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ************* under5g 0xcbd setting =1 *************\n");</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0xcbd, 0x03, 01);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_PHASE_BTMPMODE:</div><div class='del'>-		/* Disable LTE Coex Function in WiFi side */</div><div class='del'>-		halbtc8822b2ant_ltecoex_enable(btcoexist, 0x0);</div><div class='del'>-</div><div class='del'>-		/* set Path control owner to WL */</div><div class='del'>-		halbtc8822b2ant_ltecoex_pathcontrol_owner(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_PCO_WLSIDE);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW Hi */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-</div><div class='del'>-		/* Set GNT_WL to SW Lo */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_LOW);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;run_time_state = false;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;dbg_mode_2ant) {</div><div class='del'>-		u32tmp1 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x38);</div><div class='del'>-		u32tmp2 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								    0x54);</div><div class='del'>-		u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-		u8tmp = btcoexist-&gt;btc_read_1byte(btcoexist, 0x73);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], (After Ant-Setup phase---%d) 0xcb4 = 0x%x, 0x73 = 0x%x, 0x38= 0x%x, 0x54= 0x%x\n",</div><div class='del'>-			phase, u32tmp3, u8tmp, u32tmp1, u32tmp2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 halbtc8822b2ant_action_algorithm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool bt_hs_on = false;</div><div class='del'>-	u8 algorithm = BT_8822B_2ANT_COEX_ALGO_UNDEFINED;</div><div class='del'>-	u8 num_of_diff_profile = 0;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-</div><div class='del'>-	if (!bt_link_info-&gt;bt_link_exist) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], No BT link exists!!!\n");</div><div class='del'>-		return algorithm;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;sco_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-	if (bt_link_info-&gt;hid_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-	if (bt_link_info-&gt;pan_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-	if (bt_link_info-&gt;a2dp_exist)</div><div class='del'>-		num_of_diff_profile++;</div><div class='del'>-</div><div class='del'>-	if (num_of_diff_profile == 0) {</div><div class='del'>-		if (bt_link_info-&gt;acl_busy) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], No-Profile busy\n");</div><div class='del'>-			algorithm = BT_8822B_2ANT_COEX_ALGO_NOPROFILEBUSY;</div><div class='del'>-		}</div><div class='del'>-	} else if ((bt_link_info-&gt;a2dp_exist) &amp;&amp; (coex_sta-&gt;is_bt_a2dp_sink)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], A2DP Sink\n");</div><div class='del'>-		algorithm = BT_8822B_2ANT_COEX_ALGO_A2DPSINK;</div><div class='del'>-	} else if (num_of_diff_profile == 1) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], SCO only\n");</div><div class='del'>-			algorithm = BT_8822B_2ANT_COEX_ALGO_SCO;</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], HID only\n");</div><div class='del'>-				algorithm = BT_8822B_2ANT_COEX_ALGO_HID;</div><div class='del'>-			} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], A2DP only\n");</div><div class='del'>-				algorithm = BT_8822B_2ANT_COEX_ALGO_A2DP;</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], PAN(HS) only\n");</div><div class='del'>-					algorithm =</div><div class='del'>-						BT_8822B_2ANT_COEX_ALGO_PANHS;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], PAN(EDR) only\n");</div><div class='del'>-					algorithm =</div><div class='del'>-						BT_8822B_2ANT_COEX_ALGO_PANEDR;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (num_of_diff_profile == 2) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], SCO + HID\n");</div><div class='del'>-				algorithm = BT_8822B_2ANT_COEX_ALGO_SCO;</div><div class='del'>-			} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					 "[BTCoex], SCO + A2DP ==&gt; A2DP\n");</div><div class='del'>-				algorithm = BT_8822B_2ANT_COEX_ALGO_A2DP;</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], SCO + PAN(HS)\n");</div><div class='del'>-					algorithm = BT_8822B_2ANT_COEX_ALGO_SCO;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], SCO + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-						BT_8822B_2ANT_COEX_ALGO_PANEDR;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				{</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], HID + A2DP\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_HID_A2DP;</div><div class='del'>-				}</div><div class='del'>-			} else if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], HID + PAN(HS)\n");</div><div class='del'>-					algorithm = BT_8822B_2ANT_COEX_ALGO_HID;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], HID + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_A2DP_PANHS;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						 DBG_LOUD,</div><div class='del'>-						 "[BTCoex], A2DP + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_PANEDR_A2DP;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (num_of_diff_profile == 3) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], SCO + HID + A2DP ==&gt; HID + A2DP\n");</div><div class='del'>-				algorithm = BT_8822B_2ANT_COEX_ALGO_HID_A2DP;</div><div class='del'>-			} else if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;pan_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], SCO + HID + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], SCO + HID + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_PANEDR_HID;</div><div class='del'>-				}</div><div class='del'>-			} else if (bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-				   bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], SCO + A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_A2DP_PANHS;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], SCO + A2DP + PAN(EDR) ==&gt; HID\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					    BT_8822B_2ANT_COEX_ALGO_PANEDR_A2DP;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], HID + A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					BT_8822B_2ANT_COEX_ALGO_HID_A2DP_PANEDR;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], HID + A2DP + PAN(EDR)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					BT_8822B_2ANT_COEX_ALGO_HID_A2DP_PANEDR;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (num_of_diff_profile &gt;= 3) {</div><div class='del'>-		if (bt_link_info-&gt;sco_exist) {</div><div class='del'>-			if (bt_link_info-&gt;hid_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;pan_exist &amp;&amp;</div><div class='del'>-			    bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-				if (bt_hs_on) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], Error!!! SCO + HID + A2DP + PAN(HS)\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					BT_8822B_2ANT_COEX_ALGO_HID_A2DP_PANEDR;</div><div class='del'>-				} else {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], SCO + HID + A2DP + PAN(EDR)==&gt;PAN(EDR)+HID\n");</div><div class='del'>-					algorithm =</div><div class='del'>-					BT_8822B_2ANT_COEX_ALGO_HID_A2DP_PANEDR;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return algorithm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_coex_all_off(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-	/* fw all off */</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_wifi_under5g(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	/* fw all off */</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ************* under5g *************\n");</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				     BT_8822B_2ANT_PHASE_5G_RUNTIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_action_wifi_native_lps(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_bt_inquiry(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	bool wifi_scan = false, wifi_link = false, wifi_roam = false;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;wifi_scan);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &amp;wifi_link);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &amp;wifi_roam);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_create_connection) &amp;&amp;</div><div class='del'>-	    ((wifi_link) || (wifi_roam) || (wifi_scan) || (wifi_busy) ||</div><div class='del'>-	     (coex_sta-&gt;wifi_is_high_pri_task))) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], Wifi link/roam/Scan/busy/hi-pri-task + BT Inq/Page!!\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-		if ((bt_link_info-&gt;a2dp_exist) &amp;&amp; (!bt_link_info-&gt;pan_exist))</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						15);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						11);</div><div class='del'>-	} else if ((!wifi_connected) &amp;&amp; (!wifi_scan)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Wifi no-link + no-scan + BT Inq/Page!!\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 22);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-	} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC,</div><div class='del'>-						     10);</div><div class='del'>-	} else {</div><div class='del'>-		if ((wifi_link) || (wifi_roam) || (wifi_scan) || (wifi_busy) ||</div><div class='del'>-		    (coex_sta-&gt;wifi_is_high_pri_task))</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						21);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						23);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, FORCE_EXEC, 0xd8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_action_wifi_link_process(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, FORCE_EXEC, 0xd4);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;pan_exist) {</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 22);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-	} else if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 16);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 21);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_action_wifi_nonconnected(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	/* fw all off */</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_bt_relink(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], run bt multi link function\n");</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_bt_multi_link)</div><div class='del'>-		return;</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], run bt re-link function\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_bt_idle(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	if (!wifi_busy) {</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14);</div><div class='del'>-	} else { /* if wl busy */</div><div class='del'>-</div><div class='del'>-		if (BT_8822B_2ANT_BT_STATUS_NON_CONNECTED_IDLE ==</div><div class='del'>-		    coex_dm-&gt;bt_status) {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						0);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 8);</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						12);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, FORCE_EXEC, 0xd8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* SCO only or SCO+PAN(HS) */</div><div class='del'>-static void halbtc8822b2ant_action_sco(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;is_esco_mode)</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-		else /* 2-Ant free run if SCO mode */</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 8);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_hid(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;is_hid_low_pri_tx_overhead) {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 4);</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						108);</div><div class='del'>-		} else if (wifi_bw == 0) { /* if 11bg mode */</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 8);</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						111);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 8);</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						111);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_a2dpsink(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "############# [BTCoex],  scan_ap_num = %d, wl_noisy = %d\n",</div><div class='del'>-		 coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						1);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						16);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_relink_downcount != 0) &amp;&amp; (wifi_busy)) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"############# [BTCoex],  BT Re-Link + A2DP + WL busy\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						0);</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 8);</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						105);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */</div><div class='del'>-static void halbtc8822b2ant_action_a2dp(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "############# [BTCoex],  scan_ap_num = %d, wl_noisy = %d\n",</div><div class='del'>-		 coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						1);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						16);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_relink_downcount != 0) &amp;&amp; (wifi_busy)) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"############# [BTCoex],  BT Re-Link + A2DP + WL busy\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						0);</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 10);</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						109);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_pan_edr(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "############# [BTCoex],  scan_ap_num = %d, wl_noisy = %d\n",</div><div class='del'>-		 coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						3);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						4);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						103);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						104);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_hid_a2dp(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						1);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						16);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_relink_downcount != 0) &amp;&amp; (wifi_busy)) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"############# [BTCoex],  BT Re-Link + A2DP + WL busy\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false,</div><div class='del'>-						0);</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 5);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 8);</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						109);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_a2dp_pan_hs(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "############# [BTCoex],  scan_ap_num = %d, wl_noisy = %d\n",</div><div class='del'>-		 coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		/*halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);*/</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		/*halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);*/</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy) {</div><div class='del'>-			if ((coex_sta-&gt;a2dp_bit_pool &gt; 40) &amp;&amp;</div><div class='del'>-			    (coex_sta-&gt;a2dp_bit_pool &lt; 255))</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 7);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 5);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						6);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		/*halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);*/</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		if (wifi_turbo)</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 6);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 7);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy) {</div><div class='del'>-			if ((coex_sta-&gt;a2dp_bit_pool &gt; 40) &amp;&amp;</div><div class='del'>-			    (coex_sta-&gt;a2dp_bit_pool &lt; 255))</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 107);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 105);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						106);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* PAN(EDR)+A2DP */</div><div class='del'>-static void halbtc8822b2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "############# [BTCoex],  scan_ap_num = %d, wl_noisy = %d\n",</div><div class='del'>-		 coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy) {</div><div class='del'>-			if (((coex_sta-&gt;a2dp_bit_pool &gt; 40) &amp;&amp;</div><div class='del'>-			     (coex_sta-&gt;a2dp_bit_pool &lt; 255)) ||</div><div class='del'>-			    (!coex_sta-&gt;is_A2DP_3M))</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 7);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 5);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						6);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						107);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						106);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_pan_edr_hid(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 2);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						3);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						4);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-		halbtc8822b2ant_dec_bt_pwr(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy)</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						103);</div><div class='del'>-		else</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						104);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* HID+A2DP+PAN(EDR) */</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_action_hid_a2dp_pan_edr(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	u32 wifi_bw = 1;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);</div><div class='del'>-</div><div class='del'>-		if (wifi_busy) {</div><div class='del'>-			if (((coex_sta-&gt;a2dp_bit_pool &gt; 40) &amp;&amp;</div><div class='del'>-			     (coex_sta-&gt;a2dp_bit_pool &lt; 255)) ||</div><div class='del'>-			    (!coex_sta-&gt;is_A2DP_3M))</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 7);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 5);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						6);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;hid_busy_num &gt;= 2) {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 8);</div><div class='del'>-</div><div class='del'>-			if (wifi_bw == 0) {</div><div class='del'>-				halbtc8822b2ant_set_wltoggle_coex_table(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 0x1, 0xaa, 0x5a,</div><div class='del'>-					0xaa, 0xaa);</div><div class='del'>-			} else {</div><div class='del'>-				halbtc8822b2ant_set_wltoggle_coex_table(</div><div class='del'>-					btcoexist, NORMAL_EXEC, 0x2, 0xaa, 0x5a,</div><div class='del'>-					0xaa, 0xaa);</div><div class='del'>-			}</div><div class='del'>-			halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true,</div><div class='del'>-						110);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_coex_table_with_type(btcoexist,</div><div class='del'>-							     NORMAL_EXEC, 1);</div><div class='del'>-</div><div class='del'>-			if (wifi_busy) {</div><div class='del'>-				if ((coex_sta-&gt;a2dp_bit_pool &gt; 40) &amp;&amp;</div><div class='del'>-				    (coex_sta-&gt;a2dp_bit_pool &lt; 255))</div><div class='del'>-					halbtc8822b2ant_ps_tdma(btcoexist,</div><div class='del'>-								NORMAL_EXEC,</div><div class='del'>-								true, 107);</div><div class='del'>-				else</div><div class='del'>-					halbtc8822b2ant_ps_tdma(btcoexist,</div><div class='del'>-								NORMAL_EXEC,</div><div class='del'>-								true, 105);</div><div class='del'>-			} else {</div><div class='del'>-				halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC,</div><div class='del'>-							true, 106);</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 halbtc8822b2ant_action_bt_whck_test(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_bt_hs(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static u8 prewifi_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state, bt_rssi_state;</div><div class='del'>-</div><div class='del'>-	static u8 prewifi_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	static u8 pre_bt_rssi_state2 = BTC_RSSI_STATE_LOW;</div><div class='del'>-	u8 wifi_rssi_state2, bt_rssi_state2;</div><div class='del'>-	bool wifi_busy = false, wifi_turbo = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-			   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "############# [BTCoex],  scan_ap_num = %d, wl_noisy = %d\n",</div><div class='del'>-		 coex_sta-&gt;scan_ap_num, coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	if ((wifi_busy) &amp;&amp; (coex_sta-&gt;wl_noisy_level == 0))</div><div class='del'>-		wifi_turbo = true;</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state, 2, coex_sta-&gt;wifi_coex_thres,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	wifi_rssi_state2 = halbtc8822b2ant_wifi_rssi_state(</div><div class='del'>-		btcoexist, &amp;prewifi_rssi_state2, 2, coex_sta-&gt;wifi_coex_thres2,</div><div class='del'>-		0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state, 2, coex_sta-&gt;bt_coex_thres, 0);</div><div class='del'>-</div><div class='del'>-	bt_rssi_state2 = halbtc8822b2ant_bt_rssi_state(</div><div class='del'>-		btcoexist, &amp;pre_bt_rssi_state2, 2, coex_sta-&gt;bt_coex_thres2, 0);</div><div class='del'>-</div><div class='del'>-	if (BTC_RSSI_HIGH(wifi_rssi_state) &amp;&amp; BTC_RSSI_HIGH(bt_rssi_state)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	} else if (BTC_RSSI_HIGH(wifi_rssi_state2) &amp;&amp;</div><div class='del'>-		   BTC_RSSI_HIGH(bt_rssi_state2)) {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xc8);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;is_switch_to_1dot5_ant = true;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-halbtc8822b2ant_action_wifi_multi_port(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-	/* hw all off */</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_action_wifi_connected(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	switch (coex_dm-&gt;cur_algorithm) {</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_SCO:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = SCO.\n");</div><div class='del'>-		halbtc8822b2ant_action_sco(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_HID:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = HID.\n");</div><div class='del'>-		halbtc8822b2ant_action_hid(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_A2DP:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = A2DP.\n");</div><div class='del'>-		halbtc8822b2ant_action_a2dp(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_A2DPSINK:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = A2DP Sink.\n");</div><div class='del'>-		halbtc8822b2ant_action_a2dpsink(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_A2DP_PANHS:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = A2DP+PAN(HS).\n");</div><div class='del'>-		halbtc8822b2ant_action_a2dp_pan_hs(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_PANEDR:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = PAN(EDR).\n");</div><div class='del'>-		halbtc8822b2ant_action_pan_edr(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_PANEDR_A2DP:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = PAN+A2DP.\n");</div><div class='del'>-		halbtc8822b2ant_action_pan_edr_a2dp(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_PANEDR_HID:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = PAN(EDR)+HID.\n");</div><div class='del'>-		halbtc8822b2ant_action_pan_edr_hid(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_HID_A2DP_PANEDR:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = HID+A2DP+PAN.\n");</div><div class='del'>-		halbtc8822b2ant_action_hid_a2dp_pan_edr(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_HID_A2DP:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, algorithm = HID+A2DP.\n");</div><div class='del'>-		halbtc8822b2ant_action_hid_a2dp(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BT_8822B_2ANT_COEX_ALGO_NOPROFILEBUSY:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], Action 2-Ant, algorithm = No-Profile busy.\n");</div><div class='del'>-		halbtc8822b2ant_action_bt_idle(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], Action 2-Ant, algorithm = coexist All Off!!\n");</div><div class='del'>-		halbtc8822b2ant_action_coex_all_off(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_dm-&gt;pre_algorithm = coex_dm-&gt;cur_algorithm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_run_coexist_mechanism(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 algorithm = 0;</div><div class='del'>-	u32 num_of_wifi_link = 0;</div><div class='del'>-	u32 wifi_link_status = 0;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-	bool miracast_plus_bt = false;</div><div class='del'>-	bool scan = false, link = false, roam = false, under_4way = false,</div><div class='del'>-	     wifi_connected = false, wifi_under_5g = false, bt_hs_on = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;scan);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &amp;link);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &amp;roam);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-			   &amp;under_4way);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], RunCoexistMechanism()===&gt;\n");</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], RunCoexistMechanism(), return for Manual CTRL &lt;===\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;stop_coex_dm) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], RunCoexistMechanism(), return for Stop Coex DM &lt;===\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;under_ips) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], wifi is under IPS !!!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;under_lps) &amp;&amp;</div><div class='del'>-	    (coex_dm-&gt;bt_status != BT_8822B_2ANT_BT_STATUS_ACL_BUSY)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], RunCoexistMechanism(), wifi is under LPS !!!\n");</div><div class='del'>-		halbtc8822b2ant_action_wifi_native_lps(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;run_time_state) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], return for run_time_state = false !!!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;freeze_coexrun_by_btinfo) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], BtInfoNotify(), return for freeze_coexrun_by_btinfo\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if ((wifi_under_5g) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;switch_band_notify_to != BTC_SWITCH_TO_24G) &amp;&amp;</div><div class='del'>-	    (coex_sta-&gt;switch_band_notify_to != BTC_SWITCH_TO_24G_NOFORSCAN)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], WiFi is under 5G!!!\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_wifi_under5g(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], WiFi is under 2G!!!\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, NORMAL_EXEC,</div><div class='del'>-				     BT_8822B_2ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_whck_test) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is under WHCK TEST!!!\n");</div><div class='del'>-		halbtc8822b2ant_action_bt_whck_test(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_disabled) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is disabled!!!\n");</div><div class='del'>-		halbtc8822b2ant_action_coex_all_off(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;c2h_bt_inquiry_page) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is under inquiry/page scan !!\n");</div><div class='del'>-		halbtc8822b2ant_action_bt_inquiry(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_setup_link) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], BT is re-link !!!\n");</div><div class='del'>-		halbtc8822b2ant_action_bt_relink(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* for P2P */</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-			   &amp;wifi_link_status);</div><div class='del'>-	num_of_wifi_link = wifi_link_status &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if ((num_of_wifi_link &gt;= 2) ||</div><div class='del'>-	    (wifi_link_status &amp; WIFI_P2P_GO_CONNECTED)) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"############# [BTCoex],  Multi-Port num_of_wifi_link = %d, wifi_link_status = 0x%x\n",</div><div class='del'>-			num_of_wifi_link, wifi_link_status);</div><div class='del'>-</div><div class='del'>-		if (bt_link_info-&gt;bt_link_exist)</div><div class='del'>-			miracast_plus_bt = true;</div><div class='del'>-		else</div><div class='del'>-			miracast_plus_bt = false;</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_MIRACAST_PLUS_BT,</div><div class='del'>-				   &amp;miracast_plus_bt);</div><div class='del'>-</div><div class='del'>-		if (scan || link || roam || under_4way) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], scan = %d, link = %d, roam = %d 4way = %d!!!\n",</div><div class='del'>-				scan, link, roam, under_4way);</div><div class='del'>-</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], wifi is under linkscan process + Multi-Port !!\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_action_wifi_link_process(btcoexist);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_action_wifi_multi_port(btcoexist);</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'>-	miracast_plus_bt = false;</div><div class='del'>-	btcoexist-&gt;btc_set(btcoexist, BTC_SET_BL_MIRACAST_PLUS_BT,</div><div class='del'>-			   &amp;miracast_plus_bt);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-</div><div class='del'>-	if (bt_hs_on) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "############# [BTCoex],  BT Is hs\n");</div><div class='del'>-		halbtc8822b2ant_action_bt_hs(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((BT_8822B_2ANT_BT_STATUS_NON_CONNECTED_IDLE ==</div><div class='del'>-	     coex_dm-&gt;bt_status) ||</div><div class='del'>-	    (coex_dm-&gt;bt_status == BT_8822B_2ANT_BT_STATUS_CONNECTED_IDLE)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, bt idle!!.\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_bt_idle(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	algorithm = halbtc8822b2ant_action_algorithm(btcoexist);</div><div class='del'>-	coex_dm-&gt;cur_algorithm = algorithm;</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], Algorithm = %d\n", coex_dm-&gt;cur_algorithm);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-	if (scan || link || roam || under_4way) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], WiFi is under Link Process !!\n");</div><div class='del'>-		halbtc8822b2ant_action_wifi_link_process(btcoexist);</div><div class='del'>-	} else if (wifi_connected) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, wifi connected!!.\n");</div><div class='del'>-		halbtc8822b2ant_action_wifi_connected(btcoexist);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Action 2-Ant, wifi not-connected!!.\n");</div><div class='del'>-		halbtc8822b2ant_action_wifi_nonconnected(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_init_coex_dm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], Coex Mechanism Init!!\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_low_penalty_ra(btcoexist, NORMAL_EXEC, false);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);</div><div class='del'>-</div><div class='del'>-	/* fw all off */</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 0xd8);</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;pop_event_cnt = 0;</div><div class='del'>-	coex_sta-&gt;cnt_remote_name_req = 0;</div><div class='del'>-	coex_sta-&gt;cnt_reinit = 0;</div><div class='del'>-	coex_sta-&gt;cnt_setup_link = 0;</div><div class='del'>-	coex_sta-&gt;cnt_ign_wlan_act = 0;</div><div class='del'>-	coex_sta-&gt;cnt_page = 0;</div><div class='del'>-	coex_sta-&gt;cnt_role_switch = 0;</div><div class='del'>-	coex_sta-&gt;switch_band_notify_to = BTC_NOT_SWITCH;</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc8822b2ant_init_hw_config(struct btc_coexist *btcoexist,</div><div class='del'>-					   bool wifi_only)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u32 u32tmp1 = 0, u32tmp2 = 0, u32tmp3 = 0;</div><div class='del'>-	u32 RTL97F_8822B = 0;</div><div class='del'>-	u8 i = 0;</div><div class='del'>-</div><div class='del'>-	u32tmp3 = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-	u32tmp1 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-	u32tmp2 = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x54);</div><div class='del'>-</div><div class='del'>-	if (RTL97F_8822B) {</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x66, 0x04, 0x0);</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x41, 0x02, 0x0);</div><div class='del'>-</div><div class='del'>-		/* set GNT_BT to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		/* Set GNT_WL to SW high */</div><div class='del'>-		halbtc8822b2ant_ltecoex_set_gnt_wl(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_GNT_BLOCK_RFC_BB,</div><div class='del'>-			BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW,</div><div class='del'>-			BT_8822B_2ANT_SIG_STA_SET_TO_HIGH);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], (Before Init HW config) 0xcb4 = 0x%x, 0x38= 0x%x, 0x54= 0x%x\n",</div><div class='del'>-		u32tmp3, u32tmp1, u32tmp2);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], 2Ant Init HW Config!!\n");</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;bt_coex_supported_feature = 0;</div><div class='del'>-	coex_sta-&gt;bt_coex_supported_version = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_type = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_para[0] = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_para[1] = 0;</div><div class='del'>-	coex_sta-&gt;bt_ble_scan_para[2] = 0;</div><div class='del'>-	coex_sta-&gt;bt_reg_vendor_ac = 0xffff;</div><div class='del'>-	coex_sta-&gt;bt_reg_vendor_ae = 0xffff;</div><div class='del'>-	coex_sta-&gt;isolation_btween_wb = BT_8822B_2ANT_DEFAULT_ISOLATION;</div><div class='del'>-	coex_sta-&gt;gnt_error_cnt = 0;</div><div class='del'>-	coex_sta-&gt;bt_relink_downcount = 0;</div><div class='del'>-	coex_sta-&gt;is_set_ps_state_fail = false;</div><div class='del'>-	coex_sta-&gt;cnt_set_ps_state_fail = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= 9; i++)</div><div class='del'>-		coex_sta-&gt;bt_afh_map[i] = 0;</div><div class='del'>-</div><div class='del'>-	/* 0xf0[15:12] --&gt; Chip Cut information */</div><div class='del'>-	coex_sta-&gt;cut_version =</div><div class='del'>-		(btcoexist-&gt;btc_read_1byte(btcoexist, 0xf1) &amp; 0xf0) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;dis_ver_info_cnt = 0;</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_coex_switch_threshold(btcoexist,</div><div class='del'>-					      coex_sta-&gt;isolation_btween_wb);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x550, 0x8,</div><div class='del'>-					   0x1); /* enable TBTT nterrupt */</div><div class='del'>-</div><div class='del'>-	/* BT report packet sample rate	 */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x790, 0x5);</div><div class='del'>-</div><div class='del'>-	/* Init 0x778 = 0x1 for 2-Ant */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(btcoexist, 0x778, 0x1);</div><div class='del'>-</div><div class='del'>-	/* Enable PTA (3-wire function form BT side) */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x40, 0x20, 0x1);</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x41, 0x02, 0x1);</div><div class='del'>-</div><div class='del'>-	/* Enable PTA (tx/rx signal form WiFi side) */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x4c6, 0x10, 0x1);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_enable_gnt_to_gpio(btcoexist, true);</div><div class='del'>-</div><div class='del'>-	/*GNT_BT=1 while select both */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x763, 0x10, 0x1);</div><div class='del'>-</div><div class='del'>-	/* check if WL firmware download ok */</div><div class='del'>-	halbtc8822b2ant_post_state_to_bt(btcoexist,</div><div class='del'>-					 BT_8822B_2ANT_SCOREBOARD_ONOFF, true);</div><div class='del'>-</div><div class='del'>-	/* Enable counter statistics */</div><div class='del'>-	btcoexist-&gt;btc_write_1byte(</div><div class='del'>-		btcoexist, 0x76e,</div><div class='del'>-		0x4); /* 0x76e[3] =1, WLAN_Act control by PTA */</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_coex_table_with_type(btcoexist, FORCE_EXEC, 5);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_ps_tdma(btcoexist, FORCE_EXEC, false, 0);</div><div class='del'>-</div><div class='del'>-	psd_scan-&gt;ant_det_is_ant_det_available = true;</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;is_rf_state_off) {</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_WLAN_OFF);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], **********  %s (RF Off)**********\n",</div><div class='del'>-			 __func__);</div><div class='del'>-	} else if (wifi_only) {</div><div class='del'>-		coex_sta-&gt;concurrent_rx_mode_on = false;</div><div class='del'>-		/* Path config	 */</div><div class='del'>-		/* Set Antenna Path */</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_WLANONLY_INIT);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-	} else {</div><div class='del'>-		/* Set BT polluted packet on for Tx rate adaptive not including</div><div class='del'>-		 * Tx retry break by PTA, 0x45c[19] =1</div><div class='del'>-		 */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte_bitmask(btcoexist, 0x45e, 0x8, 0x1);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;concurrent_rx_mode_on = true;</div><div class='del'>-</div><div class='del'>-		/* RF 0x1[1] = 0-&gt;Set GNT_WL_RF_Rx always = 1 for</div><div class='del'>-		 * con-current Rx, mask Tx only</div><div class='del'>-		 */</div><div class='del'>-		btcoexist-&gt;btc_set_rf_reg(btcoexist, BTC_RF_A, 0x1, 0x2, 0x0);</div><div class='del'>-</div><div class='del'>-		/* Set Antenna Path */</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_COEX_INIT);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ************************************************************</div><div class='del'>- * work around function start with wa_halbtc8822b2ant_</div><div class='del'>- * ************************************************************</div><div class='del'>- * ************************************************************</div><div class='del'>- * extern function start with ex_halbtc8822b2ant_</div><div class='del'>- * *************************************************************/</div><div class='del'>-void ex_btc8822b2ant_power_on_setting(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-	u8 u8tmp = 0x0;</div><div class='del'>-	u16 u16tmp = 0x0;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"xxxxxxxxxxxxxxxx Execute 8822b 2-Ant PowerOn Setting xxxxxxxxxxxxxxxx!!\n");</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "Ant Det Finish = %s, Ant Det Number  = %d\n",</div><div class='del'>-		 (board_info-&gt;btdm_ant_det_finish ? "Yes" : "No"),</div><div class='del'>-		 board_info-&gt;btdm_ant_num_by_ant_det);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;dbg_mode_2ant = false;</div><div class='del'>-	btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-	psd_scan-&gt;ant_det_is_ant_det_available = false;</div><div class='del'>-</div><div class='del'>-	/* enable BB, REG_SYS_FUNC_EN such that we can write BB Reg correctly */</div><div class='del'>-	u16tmp = btcoexist-&gt;btc_read_2byte(btcoexist, 0x2);</div><div class='del'>-	btcoexist-&gt;btc_write_2byte(btcoexist, 0x2, u16tmp | BIT(0) | BIT(1));</div><div class='del'>-</div><div class='del'>-	/* Local setting bit define */</div><div class='del'>-	/*	BIT0: "0" for no antenna inverse; "1" for antenna inverse  */</div><div class='del'>-	/*	BIT1: "0" for internal switch; "1" for external switch */</div><div class='del'>-	/*	BIT2: "0" for one antenna; "1" for two antenna */</div><div class='del'>-	/* NOTE: here default all internal switch and 1-antenna ==&gt;</div><div class='del'>-	 * BIT1=0 and BIT2=0</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Check efuse 0xc3[6] for Single Antenna Path */</div><div class='del'>-</div><div class='del'>-	/* Setup RF front end type */</div><div class='del'>-	halbtc8822b2ant_set_rfe_type(btcoexist);</div><div class='del'>-</div><div class='del'>-	/* Set Antenna Path to BT side */</div><div class='del'>-	halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				     BT_8822B_2ANT_PHASE_COEX_POWERON);</div><div class='del'>-</div><div class='del'>-	/* Save"single antenna position" info in Local register setting for</div><div class='del'>-	 * FW reading, because FW may not ready at power on</div><div class='del'>-	 */</div><div class='del'>-	if (btcoexist-&gt;chip_interface == BTC_INTF_PCI)</div><div class='del'>-		btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0x3e0, u8tmp);</div><div class='del'>-	else if (btcoexist-&gt;chip_interface == BTC_INTF_USB)</div><div class='del'>-		btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0xfe08, u8tmp);</div><div class='del'>-	else if (btcoexist-&gt;chip_interface == BTC_INTF_SDIO)</div><div class='del'>-		btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0x60, u8tmp);</div><div class='del'>-</div><div class='del'>-	/* enable GNT_WL/GNT_BT debug signal to GPIO14/15 */</div><div class='del'>-	halbtc8822b2ant_enable_gnt_to_gpio(btcoexist, true);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], **********  LTE coex Reg 0x38 (Power-On) = 0x%x**********\n",</div><div class='del'>-		halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x38));</div><div class='del'>-</div><div class='del'>-	RT_TRACE(</div><div class='del'>-		rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		"[BTCoex], **********  MAC Reg 0x70/ BB Reg 0xcb4 (Power-On) = 0x%x / 0x%x\n",</div><div class='del'>-		btcoexist-&gt;btc_read_4byte(btcoexist, 0x70),</div><div class='del'>-		btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_pre_load_firmware(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-	u8 u8tmp = 0x4; /* Set BIT2 by default since it's 2ant case */</div><div class='del'>-</div><div class='del'>-	/* */</div><div class='del'>-	/* S0 or S1 setting and Local register setting</div><div class='del'>-	 * (By the setting fw can get ant number, S0/S1, ... info)</div><div class='del'>-	 */</div><div class='del'>-	/* Local setting bit define */</div><div class='del'>-	/*	BIT0: "0" for no antenna inverse; "1" for antenna inverse  */</div><div class='del'>-	/*	BIT1: "0" for internal switch; "1" for external switch */</div><div class='del'>-	/*	BIT2: "0" for one antenna; "1" for two antenna */</div><div class='del'>-	/* NOTE: here default all internal switch and 1-antenna ==&gt;</div><div class='del'>-	 *       BIT1=0 and BIT2=0</div><div class='del'>-	 */</div><div class='del'>-	if (btcoexist-&gt;chip_interface == BTC_INTF_USB) {</div><div class='del'>-		/* fixed at S0 for USB interface */</div><div class='del'>-		u8tmp |= 0x1; /* antenna inverse */</div><div class='del'>-		btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0xfe08, u8tmp);</div><div class='del'>-	} else {</div><div class='del'>-		/* for PCIE and SDIO interface, we check efuse 0xc3[6] */</div><div class='del'>-		if (board_info-&gt;single_ant_path == 0) {</div><div class='del'>-		} else if (board_info-&gt;single_ant_path == 1) {</div><div class='del'>-			/* set to S0 */</div><div class='del'>-			u8tmp |= 0x1; /* antenna inverse */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (btcoexist-&gt;chip_interface == BTC_INTF_PCI)</div><div class='del'>-			btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0x3e0,</div><div class='del'>-							     u8tmp);</div><div class='del'>-		else if (btcoexist-&gt;chip_interface == BTC_INTF_SDIO)</div><div class='del'>-			btcoexist-&gt;btc_write_local_reg_1byte(btcoexist, 0x60,</div><div class='del'>-							     u8tmp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_init_hw_config(struct btc_coexist *btcoexist,</div><div class='del'>-				    bool wifi_only)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_init_hw_config(btcoexist, wifi_only);</div><div class='del'>-	btcoexist-&gt;auto_report_2ant = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_init_coex_dm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	halbtc8822b2ant_init_coex_dm(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_display_coex_info(struct btc_coexist *btcoexist,</div><div class='del'>-				       struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-	struct btc_board_info *board_info = &amp;btcoexist-&gt;board_info;</div><div class='del'>-	struct btc_bt_link_info *bt_link_info = &amp;btcoexist-&gt;bt_link_info;</div><div class='del'>-</div><div class='del'>-	u8 u8tmp[4], i, ps_tdma_case = 0;</div><div class='del'>-	u32 u32tmp[4];</div><div class='del'>-	u16 u16tmp[4];</div><div class='del'>-	u32 fa_ofdm, fa_cck, cca_ofdm, cca_cck, ratio_ofdm;</div><div class='del'>-	u32 fw_ver = 0, bt_patch_ver = 0, bt_coex_ver = 0;</div><div class='del'>-	static u8 pop_report_in_10s;</div><div class='del'>-	u32 phyver = 0;</div><div class='del'>-	bool lte_coex_on = false;</div><div class='del'>-	static u8 cnt;</div><div class='del'>-</div><div class='del'>-	seq_puts(m, "\r\n ============[BT Coexist info]============");</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control) {</div><div class='del'>-		seq_puts(m,</div><div class='del'>-			 "\r\n ============[Under Manual Control]============");</div><div class='del'>-		seq_puts(m, "\r\n ==========================================");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!coex_sta-&gt;bt_disabled) {</div><div class='del'>-		if (coex_sta-&gt;bt_coex_supported_feature == 0)</div><div class='del'>-			btcoexist-&gt;btc_get(</div><div class='del'>-				btcoexist, BTC_GET_U4_SUPPORTED_FEATURE,</div><div class='del'>-				&amp;coex_sta-&gt;bt_coex_supported_feature);</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_coex_supported_version == 0) ||</div><div class='del'>-		    (coex_sta-&gt;bt_coex_supported_version == 0xffff))</div><div class='del'>-			btcoexist-&gt;btc_get(</div><div class='del'>-				btcoexist, BTC_GET_U4_SUPPORTED_VERSION,</div><div class='del'>-				&amp;coex_sta-&gt;bt_coex_supported_version);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_reg_vendor_ac == 0xffff)</div><div class='del'>-			coex_sta-&gt;bt_reg_vendor_ac = (u16)(</div><div class='del'>-				btcoexist-&gt;btc_get_bt_reg(btcoexist, 3, 0xac) &amp;</div><div class='del'>-				0xffff);</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_reg_vendor_ae == 0xffff)</div><div class='del'>-			coex_sta-&gt;bt_reg_vendor_ae = (u16)(</div><div class='del'>-				btcoexist-&gt;btc_get_bt_reg(btcoexist, 3, 0xae) &amp;</div><div class='del'>-				0xffff);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_BT_PATCH_VER,</div><div class='del'>-				   &amp;bt_patch_ver);</div><div class='del'>-		btcoexist-&gt;bt_info.bt_get_fw_ver = bt_patch_ver;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;num_of_profile &gt; 0) {</div><div class='del'>-			cnt++;</div><div class='del'>-</div><div class='del'>-			if (cnt &gt;= 3) {</div><div class='del'>-				btcoexist-&gt;btc_get_bt_afh_map_from_bt(</div><div class='del'>-					btcoexist, 0, &amp;coex_sta-&gt;bt_afh_map[0]);</div><div class='del'>-				cnt = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (psd_scan-&gt;ant_det_try_count == 0) {</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s = %d/ %d/ %s / %d",</div><div class='del'>-			"Ant PG Num/ Mech/ Pos/ RFE", board_info-&gt;pg_ant_num,</div><div class='del'>-			board_info-&gt;btdm_ant_num,</div><div class='del'>-			(board_info-&gt;btdm_ant_pos == BTC_ANTENNA_AT_MAIN_PORT ?</div><div class='del'>-				 "Main" :</div><div class='del'>-				 "Aux"),</div><div class='del'>-			rfe_type-&gt;rfe_module_type);</div><div class='del'>-	} else {</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s = %d/ %d/ %s/ %d  (%d/%d/%d)",</div><div class='del'>-			"Ant PG Num/ Mech(Ant_Det)/ Pos/ RFE",</div><div class='del'>-			board_info-&gt;pg_ant_num,</div><div class='del'>-			board_info-&gt;btdm_ant_num_by_ant_det,</div><div class='del'>-			(board_info-&gt;btdm_ant_pos == BTC_ANTENNA_AT_MAIN_PORT ?</div><div class='del'>-				 "Main" :</div><div class='del'>-				 "Aux"),</div><div class='del'>-			rfe_type-&gt;rfe_module_type, psd_scan-&gt;ant_det_try_count,</div><div class='del'>-			psd_scan-&gt;ant_det_fail_count, psd_scan-&gt;ant_det_result);</div><div class='del'>-</div><div class='del'>-		if (board_info-&gt;btdm_ant_det_finish) {</div><div class='del'>-			if (psd_scan-&gt;ant_det_result != 12)</div><div class='del'>-				seq_printf(m, "\r\n %-35s = %s",</div><div class='del'>-					   "Ant Det PSD Value",</div><div class='del'>-					   psd_scan-&gt;ant_det_peak_val);</div><div class='del'>-			else</div><div class='del'>-				seq_printf(m, "\r\n %-35s = %d",</div><div class='del'>-					   "Ant Det PSD Value",</div><div class='del'>-					   psd_scan-&gt;ant_det_psd_scan_peak_val /</div><div class='del'>-						   100);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bt_patch_ver = btcoexist-&gt;bt_info.bt_get_fw_ver;</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_FW_VER, &amp;fw_ver);</div><div class='del'>-	phyver = btcoexist-&gt;btc_get_bt_phydm_version(btcoexist);</div><div class='del'>-</div><div class='del'>-	bt_coex_ver = (coex_sta-&gt;bt_coex_supported_version &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	seq_printf(</div><div class='del'>-		m, "\r\n %-35s = %d_%02x/ 0x%02x/ 0x%02x (%s)",</div><div class='del'>-		"CoexVer WL/  BT_Desired/ BT_Report",</div><div class='del'>-		glcoex_ver_date_8822b_2ant, glcoex_ver_8822b_2ant,</div><div class='del'>-		glcoex_ver_btdesired_8822b_2ant, bt_coex_ver,</div><div class='del'>-		(bt_coex_ver == 0xff ?</div><div class='del'>-			 "Unknown" :</div><div class='del'>-			 (coex_sta-&gt;bt_disabled ?  "BT-disable" :</div><div class='del'>-			  (bt_coex_ver &gt;= glcoex_ver_btdesired_8822b_2ant ?</div><div class='del'>-					   "Match" :</div><div class='del'>-					   "Mis-Match"))));</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ v%d/ %c", "W_FW/ B_FW/ Phy/ Kt",</div><div class='del'>-		   fw_ver, bt_patch_ver, phyver, coex_sta-&gt;cut_version + 65);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %02x %02x %02x ", "AFH Map to BT",</div><div class='del'>-		   coex_dm-&gt;wifi_chnl_info[0], coex_dm-&gt;wifi_chnl_info[1],</div><div class='del'>-		   coex_dm-&gt;wifi_chnl_info[2]);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d / %d / %d ",</div><div class='del'>-		   "Isolation/WL_Thres/BT_Thres", coex_sta-&gt;isolation_btween_wb,</div><div class='del'>-		   coex_sta-&gt;wifi_coex_thres, coex_sta-&gt;bt_coex_thres);</div><div class='del'>-</div><div class='del'>-	/* wifi status */</div><div class='del'>-	seq_printf(m, "\r\n %-35s", "============[Wifi Status]============");</div><div class='del'>-	btcoexist-&gt;btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_WIFI_STATUS, m);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s", "============[BT Status]============");</div><div class='del'>-</div><div class='del'>-	pop_report_in_10s++;</div><div class='del'>-	seq_printf(</div><div class='del'>-		m, "\r\n %-35s = [%s/ %d dBm/ %d/ %d] ",</div><div class='del'>-		"BT [status/ rssi/ retryCnt/ popCnt]",</div><div class='del'>-		((coex_sta-&gt;bt_disabled) ?</div><div class='del'>-			 ("disabled") :</div><div class='del'>-			 ((coex_sta-&gt;c2h_bt_inquiry_page) ?  ("inquiry/page") :</div><div class='del'>-			  ((BT_8822B_2ANT_BT_STATUS_NON_CONNECTED_IDLE ==</div><div class='del'>-			    coex_dm-&gt;bt_status) ?</div><div class='del'>-				   "non-connected idle" :</div><div class='del'>-				   ((coex_dm-&gt;bt_status ==</div><div class='del'>-				     BT_8822B_2ANT_BT_STATUS_CONNECTED_IDLE) ?</div><div class='del'>-					    "connected-idle" :</div><div class='del'>-					    "busy")))),</div><div class='del'>-		coex_sta-&gt;bt_rssi - 100, coex_sta-&gt;bt_retry_cnt,</div><div class='del'>-		coex_sta-&gt;pop_event_cnt);</div><div class='del'>-</div><div class='del'>-	if (pop_report_in_10s &gt;= 5) {</div><div class='del'>-		coex_sta-&gt;pop_event_cnt = 0;</div><div class='del'>-		pop_report_in_10s = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;num_of_profile != 0)</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s = %s%s%s%s%s", "Profiles",</div><div class='del'>-			((bt_link_info-&gt;a2dp_exist) ?</div><div class='del'>-				 ((coex_sta-&gt;is_bt_a2dp_sink) ? "A2DP sink," :</div><div class='del'>-								"A2DP,") :</div><div class='del'>-				 ""),</div><div class='del'>-			((bt_link_info-&gt;sco_exist) ? "HFP," : ""),</div><div class='del'>-			((bt_link_info-&gt;hid_exist) ?</div><div class='del'>-				 ((coex_sta-&gt;hid_busy_num &gt;= 2) ?</div><div class='del'>-					  "HID(4/18)," :</div><div class='del'>-					  "HID(2/18),") :</div><div class='del'>-				 ""),</div><div class='del'>-			((bt_link_info-&gt;pan_exist) ? "PAN," : ""),</div><div class='del'>-			((coex_sta-&gt;voice_over_HOGP) ? "Voice" : ""));</div><div class='del'>-	else</div><div class='del'>-		seq_printf(m, "\r\n %-35s = None", "Profiles");</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;a2dp_exist) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %s/ %d/ %s",</div><div class='del'>-			   "A2DP Rate/Bitpool/Auto_Slot",</div><div class='del'>-			   ((coex_sta-&gt;is_A2DP_3M) ? "3M" : "No_3M"),</div><div class='del'>-			   coex_sta-&gt;a2dp_bit_pool,</div><div class='del'>-			   ((coex_sta-&gt;is_autoslot) ? "On" : "Off"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_link_info-&gt;hid_exist) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %d/ %d", "HID PairNum/Forbid_Slot",</div><div class='del'>-			   coex_sta-&gt;hid_pair_cnt, coex_sta-&gt;forbidden_slot);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %d/ %s/ 0x%x",</div><div class='del'>-		   "Role/RoleSwCnt/IgnWlact/Feature",</div><div class='del'>-		   ((bt_link_info-&gt;slave_role) ? "Slave" : "Master"),</div><div class='del'>-		   coex_sta-&gt;cnt_role_switch,</div><div class='del'>-		   ((coex_dm-&gt;cur_ignore_wlan_act) ? "Yes" : "No"),</div><div class='del'>-		   coex_sta-&gt;bt_coex_supported_feature);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x7) != 0x0) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-			   "BLEScan Type/TV/Init/Ble",</div><div class='del'>-			   coex_sta-&gt;bt_ble_scan_type,</div><div class='del'>-			   (coex_sta-&gt;bt_ble_scan_type &amp; 0x1 ?</div><div class='del'>-				    coex_sta-&gt;bt_ble_scan_para[0] :</div><div class='del'>-				    0x0),</div><div class='del'>-			   (coex_sta-&gt;bt_ble_scan_type &amp; 0x2 ?</div><div class='del'>-				    coex_sta-&gt;bt_ble_scan_para[1] :</div><div class='del'>-				    0x0),</div><div class='del'>-			   (coex_sta-&gt;bt_ble_scan_type &amp; 0x4 ?</div><div class='del'>-				    coex_sta-&gt;bt_ble_scan_para[2] :</div><div class='del'>-				    0x0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d/ %d",</div><div class='del'>-		   "ReInit/ReLink/IgnWlact/Page/NameReq", coex_sta-&gt;cnt_reinit,</div><div class='del'>-		   coex_sta-&gt;cnt_setup_link, coex_sta-&gt;cnt_ign_wlan_act,</div><div class='del'>-		   coex_sta-&gt;cnt_page, coex_sta-&gt;cnt_remote_name_req);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_read_score_board(btcoexist, &amp;u16tmp[0]);</div><div class='del'>-</div><div class='del'>-	if ((coex_sta-&gt;bt_reg_vendor_ae == 0xffff) ||</div><div class='del'>-	    (coex_sta-&gt;bt_reg_vendor_ac == 0xffff))</div><div class='del'>-		seq_printf(m, "\r\n %-35s = x/ x/ %04x",</div><div class='del'>-			   "0xae[4]/0xac[1:0]/Scoreboard", u16tmp[0]);</div><div class='del'>-	else</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ %04x",</div><div class='del'>-			   "0xae[4]/0xac[1:0]/Scoreboard",</div><div class='del'>-			   (int)((coex_sta-&gt;bt_reg_vendor_ae &amp; BIT(4)) &gt;&gt; 4),</div><div class='del'>-			   coex_sta-&gt;bt_reg_vendor_ac &amp; 0x3, u16tmp[0]);</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;num_of_profile &gt; 0) {</div><div class='del'>-		seq_printf(</div><div class='del'>-			m,</div><div class='del'>-			"\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",</div><div class='del'>-			"AFH MAP", coex_sta-&gt;bt_afh_map[0],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[1], coex_sta-&gt;bt_afh_map[2],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[3], coex_sta-&gt;bt_afh_map[4],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[5], coex_sta-&gt;bt_afh_map[6],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[7], coex_sta-&gt;bt_afh_map[8],</div><div class='del'>-			coex_sta-&gt;bt_afh_map[9]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BT_INFO_SRC_8822B_2ANT_MAX; i++) {</div><div class='del'>-		if (coex_sta-&gt;bt_info_c2h_cnt[i]) {</div><div class='del'>-			seq_printf(</div><div class='del'>-				m,</div><div class='del'>-				"\r\n %-35s = %02x %02x %02x %02x %02x %02x %02x(%d)",</div><div class='del'>-				glbt_info_src_8822b_2ant[i],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][0],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][1],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][2],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][3],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][4],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][5],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h[i][6],</div><div class='del'>-				coex_sta-&gt;bt_info_c2h_cnt[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sw mechanism	 */</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		seq_printf(</div><div class='del'>-			m, "\r\n %-35s",</div><div class='del'>-			"============[mechanism] (before Manual)============");</div><div class='del'>-	else</div><div class='del'>-		seq_printf(m, "\r\n %-35s",</div><div class='del'>-			   "============[Mechanism]============");</div><div class='del'>-</div><div class='del'>-	ps_tdma_case = coex_dm-&gt;cur_ps_tdma;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %02x %02x %02x %02x %02x (case-%d, %s, %s)",</div><div class='del'>-		   "TDMA", coex_dm-&gt;ps_tdma_para[0], coex_dm-&gt;ps_tdma_para[1],</div><div class='del'>-		   coex_dm-&gt;ps_tdma_para[2], coex_dm-&gt;ps_tdma_para[3],</div><div class='del'>-		   coex_dm-&gt;ps_tdma_para[4], ps_tdma_case,</div><div class='del'>-		   (coex_dm-&gt;cur_ps_tdma_on ? "TDMA On" : "TDMA Off"),</div><div class='del'>-		   (coex_dm-&gt;is_switch_to_1dot5_ant ? "1.5Ant" : "2Ant"));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6c0);</div><div class='del'>-	u32tmp[1] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6c4);</div><div class='del'>-	u32tmp[2] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6c8);</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-		   "Table/0x6c0/0x6c4/0x6c8", coex_sta-&gt;coex_table_type,</div><div class='del'>-		   u32tmp[0], u32tmp[1], u32tmp[2]);</div><div class='del'>-</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x778);</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x6cc);</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x", "0x778/0x6cc", u8tmp[0],</div><div class='del'>-		   u32tmp[0]);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %s/ %s/ %d",</div><div class='del'>-		   "AntDiv/BtCtrlLPS/LPRA/PsFail",</div><div class='del'>-		   ((board_info-&gt;ant_div_cfg) ? "On" : "Off"),</div><div class='del'>-		   ((coex_sta-&gt;force_lps_ctrl) ? "On" : "Off"),</div><div class='del'>-		   ((coex_dm-&gt;cur_low_penalty_ra) ? "On" : "Off"),</div><div class='del'>-		   coex_sta-&gt;cnt_set_ps_state_fail);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x", "WL_DACSwing/ BT_Dec_Pwr",</div><div class='del'>-		   coex_dm-&gt;cur_fw_dac_swing_lvl, coex_dm-&gt;cur_bt_dec_pwr_lvl);</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-	lte_coex_on = ((u32tmp[0] &amp; BIT(7)) &gt;&gt; 7) ? true : false;</div><div class='del'>-</div><div class='del'>-	if (lte_coex_on) {</div><div class='del'>-		u32tmp[0] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xa0);</div><div class='del'>-		u32tmp[1] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xa4);</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x",</div><div class='del'>-			   "LTE Coex Table W_L/B_L", u32tmp[0] &amp; 0xffff,</div><div class='del'>-			   u32tmp[1] &amp; 0xffff);</div><div class='del'>-</div><div class='del'>-		u32tmp[0] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xa8);</div><div class='del'>-		u32tmp[1] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xac);</div><div class='del'>-		u32tmp[2] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xb0);</div><div class='del'>-		u32tmp[3] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist,</div><div class='del'>-								      0xb4);</div><div class='del'>-		seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-			   "LTE Break Table W_L/B_L/L_W/L_B",</div><div class='del'>-			   u32tmp[0] &amp; 0xffff, u32tmp[1] &amp; 0xffff,</div><div class='del'>-			   u32tmp[2] &amp; 0xffff, u32tmp[3] &amp; 0xffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Hw setting		 */</div><div class='del'>-	seq_printf(m, "\r\n %-35s", "============[Hw setting]============");</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x38);</div><div class='del'>-	u32tmp[1] = halbtc8822b2ant_ltecoex_indirect_read_reg(btcoexist, 0x54);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x73);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %s", "LTE Coex/Path Owner",</div><div class='del'>-		   ((lte_coex_on) ? "On" : "Off"),</div><div class='del'>-		   ((u8tmp[0] &amp; BIT(2)) ? "WL" : "BT"));</div><div class='del'>-</div><div class='del'>-	if (lte_coex_on) {</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d",</div><div class='del'>-			   "LTE 3Wire/OPMode/UART/UARTMode",</div><div class='del'>-			   (int)((u32tmp[0] &amp; BIT(6)) &gt;&gt; 6),</div><div class='del'>-			   (int)((u32tmp[0] &amp; (BIT(5) | BIT(4))) &gt;&gt; 4),</div><div class='del'>-			   (int)((u32tmp[0] &amp; BIT(3)) &gt;&gt; 3),</div><div class='del'>-			   (int)(u32tmp[0] &amp; (BIT(2) | BIT(1) | BIT(0))));</div><div class='del'>-</div><div class='del'>-		seq_printf(m, "\r\n %-35s = %d/ %d", "LTE_Busy/UART_Busy",</div><div class='del'>-			   (int)((u32tmp[1] &amp; BIT(1)) &gt;&gt; 1),</div><div class='del'>-			   (int)(u32tmp[1] &amp; BIT(0)));</div><div class='del'>-	}</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s (BB:%s)/ %s (BB:%s)/ %s %d",</div><div class='del'>-		   "GNT_WL_Ctrl/GNT_BT_Ctrl/Dbg",</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(12)) ? "SW" : "HW"),</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(8)) ? "SW" : "HW"),</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(14)) ? "SW" : "HW"),</div><div class='del'>-		   ((u32tmp[0] &amp; BIT(10)) ? "SW" : "HW"),</div><div class='del'>-		   ((u8tmp[0] &amp; BIT(3)) ? "On" : "Off"),</div><div class='del'>-		   coex_sta-&gt;gnt_error_cnt);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d", "GNT_WL/GNT_BT",</div><div class='del'>-		   (int)((u32tmp[1] &amp; BIT(2)) &gt;&gt; 2),</div><div class='del'>-		   (int)((u32tmp[1] &amp; BIT(3)) &gt;&gt; 3));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcbc);</div><div class='del'>-	u32tmp[1] = btcoexist-&gt;btc_read_4byte(btcoexist, 0xcb4);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0xcba);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%04x/ 0x%04x/ 0x%02x %s",</div><div class='del'>-		   "0xcbc/0xcb4/0xcb8[23:16]", u32tmp[0], u32tmp[1], u8tmp[0],</div><div class='del'>-		   ((u8tmp[0] &amp; 0x1) == 0x1 ? "(BTG)" : "(WL_A+G)"));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x4c);</div><div class='del'>-	u8tmp[2] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x64);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x4c6);</div><div class='del'>-	u8tmp[1] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x40);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x",</div><div class='del'>-		   "4c[24:23]/64[0]/4c6[4]/40[5]",</div><div class='del'>-		   (int)(u32tmp[0] &amp; (BIT(24) | BIT(23))) &gt;&gt; 23, u8tmp[2] &amp; 0x1,</div><div class='del'>-		   (int)((u8tmp[0] &amp; BIT(4)) &gt;&gt; 4),</div><div class='del'>-		   (int)((u8tmp[1] &amp; BIT(5)) &gt;&gt; 5));</div><div class='del'>-</div><div class='del'>-	u32tmp[0] = btcoexist-&gt;btc_read_4byte(btcoexist, 0x550);</div><div class='del'>-	u8tmp[0] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x522);</div><div class='del'>-	u8tmp[1] = btcoexist-&gt;btc_read_1byte(btcoexist, 0x953);</div><div class='del'>-	u8tmp[2] = btcoexist-&gt;btc_read_1byte(btcoexist, 0xc50);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ %s/ 0x%x",</div><div class='del'>-		   "0x550/0x522/4-RxAGC/0xc50", u32tmp[0], u8tmp[0],</div><div class='del'>-		   (u8tmp[1] &amp; 0x2) ? "On" : "Off", u8tmp[2]);</div><div class='del'>-</div><div class='del'>-	fa_ofdm = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-							 "PHYDM_INFO_FA_OFDM");</div><div class='del'>-	fa_cck = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-							"PHYDM_INFO_FA_CCK");</div><div class='del'>-	cca_ofdm = btcoexist-&gt;btc_phydm_query_phy_counter(</div><div class='del'>-		btcoexist, "PHYDM_INFO_CCA_OFDM");</div><div class='del'>-	cca_cck = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-							 "PHYDM_INFO_CCA_CCK");</div><div class='del'>-</div><div class='del'>-	ratio_ofdm = (fa_ofdm == 0) ? 1000 : (cca_ofdm / fa_ofdm);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = 0x%x/ 0x%x/ 0x%x/ 0x%x  (%d)",</div><div class='del'>-		   "CCK-CCA/CCK-FA/OFDM-CCA/OFDM-FA", cca_cck, fa_cck, cca_ofdm,</div><div class='del'>-		   fa_ofdm, ratio_ofdm);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d", "CRC_OK CCK/11g/11n/11ac",</div><div class='del'>-		   coex_sta-&gt;crc_ok_cck, coex_sta-&gt;crc_ok_11g,</div><div class='del'>-		   coex_sta-&gt;crc_ok_11n, coex_sta-&gt;crc_ok_11n_vht);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d/ %d/ %d  (%d, %d)",</div><div class='del'>-		   "CRC_Err CCK/11g/11n/11ac", coex_sta-&gt;crc_err_cck,</div><div class='del'>-		   coex_sta-&gt;crc_err_11g, coex_sta-&gt;crc_err_11n,</div><div class='del'>-		   coex_sta-&gt;crc_err_11n_vht, coex_sta-&gt;now_crc_ratio,</div><div class='del'>-		   coex_sta-&gt;acc_crc_ratio);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %s/ %s/ %s/ %d",</div><div class='del'>-		   "WlHiPri/ Locking/ Locked/ Noisy",</div><div class='del'>-		   (coex_sta-&gt;wifi_is_high_pri_task ? "Yes" : "No"),</div><div class='del'>-		   (coex_sta-&gt;cck_lock ? "Yes" : "No"),</div><div class='del'>-		   (coex_sta-&gt;cck_ever_lock ? "Yes" : "No"),</div><div class='del'>-		   coex_sta-&gt;wl_noisy_level);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d", "0x770(Hi-pri rx/tx)",</div><div class='del'>-		   coex_sta-&gt;high_priority_rx, coex_sta-&gt;high_priority_tx);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\r\n %-35s = %d/ %d %s", "0x774(Lo-pri rx/tx)",</div><div class='del'>-		   coex_sta-&gt;low_priority_rx, coex_sta-&gt;low_priority_tx,</div><div class='del'>-		   (bt_link_info-&gt;slave_role ?</div><div class='del'>-			    "(Slave!!)" :</div><div class='del'>-			    (coex_sta-&gt;is_tdma_btautoslot_hang ?</div><div class='del'>-				     "(auto-slot hang!!)" :</div><div class='del'>-				     "")));</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_COEX_STATISTICS, m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_ips_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == BTC_IPS_ENTER) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], IPS ENTER notify\n");</div><div class='del'>-		coex_sta-&gt;under_ips = true;</div><div class='del'>-		coex_sta-&gt;under_lps = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ONOFF, false);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_WLAN_OFF);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_coex_all_off(btcoexist);</div><div class='del'>-	} else if (type == BTC_IPS_LEAVE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], IPS LEAVE notify\n");</div><div class='del'>-		coex_sta-&gt;under_ips = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ONOFF, true);</div><div class='del'>-		halbtc8822b2ant_init_hw_config(btcoexist, false);</div><div class='del'>-		halbtc8822b2ant_init_coex_dm(btcoexist);</div><div class='del'>-		halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_lps_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	static bool pre_force_lps_on;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == BTC_LPS_ENABLE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], LPS ENABLE notify\n");</div><div class='del'>-		coex_sta-&gt;under_lps = true;</div><div class='del'>-		coex_sta-&gt;under_ips = false;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;force_lps_ctrl) { /* LPS No-32K */</div><div class='del'>-			/* Write WL "Active" in Score-board for PS-TDMA */</div><div class='del'>-			pre_force_lps_on = true;</div><div class='del'>-			halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-				btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE,</div><div class='del'>-				true);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			/* LPS-32K, need check if this h2c 0x71 can work??</div><div class='del'>-			 * (2015/08/28)</div><div class='del'>-			 */</div><div class='del'>-			/* Write WL "Non-Active" in Score-board for Native-PS */</div><div class='del'>-			pre_force_lps_on = false;</div><div class='del'>-			halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-				btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE,</div><div class='del'>-				false);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (type == BTC_LPS_DISABLE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], LPS DISABLE notify\n");</div><div class='del'>-		coex_sta-&gt;under_lps = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-		if ((!pre_force_lps_on) &amp;&amp; (!coex_sta-&gt;force_lps_ctrl))</div><div class='del'>-			halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_scan_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], SCAN notify()\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_post_state_to_bt(btcoexist,</div><div class='del'>-					 BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-			   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-	/* this can't be removed for RF off_on event, or BT would dis-connect */</div><div class='del'>-	halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (type == BTC_SCAN_START) {</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G,</div><div class='del'>-				   &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-		if (wifi_under_5g) {</div><div class='del'>-			RT_TRACE(</div><div class='del'>-				rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				"[BTCoex], ********** SCAN START notify (5g)\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_action_wifi_under5g(btcoexist);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], ********** SCAN START notify (2g)\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type == BTC_SCAN_START_2G) {</div><div class='del'>-		if (!wifi_connected)</div><div class='del'>-			coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], SCAN START notify (2G)\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_SCAN, true);</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-</div><div class='del'>-	} else if (type == BTC_SCAN_FINISH) {</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = false;</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM,</div><div class='del'>-				   &amp;coex_sta-&gt;scan_ap_num);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], SCAN FINISH notify  (Scan-AP = %d)\n",</div><div class='del'>-			 coex_sta-&gt;scan_ap_num);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_SCAN, false);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_switchband_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-	coex_sta-&gt;switch_band_notify_to = type;</div><div class='del'>-</div><div class='del'>-	if (type == BTC_SWITCH_TO_5G) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], switchband_notify ---  switch to 5G\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_wifi_under5g(btcoexist);</div><div class='del'>-</div><div class='del'>-	} else if (type == BTC_SWITCH_TO_24G_NOFORSCAN) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ********** switchband_notify BTC_SWITCH_TO_2G (no for scan)\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], switchband_notify ---  switch to 2G\n");</div><div class='del'>-</div><div class='del'>-		ex_btc8822b2ant_scan_notify(btcoexist, BTC_SCAN_START_2G);</div><div class='del'>-	}</div><div class='del'>-	coex_sta-&gt;switch_band_notify_to = BTC_NOT_SWITCH;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_connect_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_post_state_to_bt(btcoexist,</div><div class='del'>-					 BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((type == BTC_ASSOCIATE_5G_START) ||</div><div class='del'>-	    (type == BTC_ASSOCIATE_5G_FINISH)) {</div><div class='del'>-		if (type == BTC_ASSOCIATE_5G_START)</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], connect_notify ---  5G start\n");</div><div class='del'>-		else</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], connect_notify ---  5G finish\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_wifi_under5g(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type == BTC_ASSOCIATE_START) {</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], CONNECT START notify (2G)\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_wifi_link_process(btcoexist);</div><div class='del'>-</div><div class='del'>-		/* To keep TDMA case during connect process,</div><div class='del'>-		 * to avoid changed by Btinfo and runcoexmechanism</div><div class='del'>-		 */</div><div class='del'>-		coex_sta-&gt;freeze_coexrun_by_btinfo = true;</div><div class='del'>-</div><div class='del'>-		coex_dm-&gt;arp_cnt = 0;</div><div class='del'>-</div><div class='del'>-	} else if (type == BTC_ASSOCIATE_FINISH) {</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = false;</div><div class='del'>-		coex_sta-&gt;freeze_coexrun_by_btinfo = false;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], CONNECT FINISH notify	(2G)\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_media_status_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_under_b_mode = false, wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if (type == BTC_MEDIA_CONNECT) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], MEDIA connect notify\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-</div><div class='del'>-		if (wifi_under_5g) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], WiFi is under 5G!!!\n");</div><div class='del'>-</div><div class='del'>-			halbtc8822b2ant_action_wifi_under5g(btcoexist);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_2G_RUNTIME);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-				   &amp;wifi_under_b_mode);</div><div class='del'>-</div><div class='del'>-		/* Set CCK Tx/Rx high Pri except 11b mode */</div><div class='del'>-		if (wifi_under_b_mode) {</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cd,</div><div class='del'>-						   0x00); /* CCK Tx */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cf,</div><div class='del'>-						   0x00); /* CCK Rx */</div><div class='del'>-		} else {</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cd,</div><div class='del'>-						   0x00); /* CCK Tx */</div><div class='del'>-			btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cf,</div><div class='del'>-						   0x10); /* CCK Rx */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], MEDIA disconnect notify\n");</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cd, 0x0); /* CCK Tx */</div><div class='del'>-		btcoexist-&gt;btc_write_1byte(btcoexist, 0x6cf, 0x0); /* CCK Rx */</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_update_wifi_ch_info(btcoexist, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_specific_packet_notify(struct btc_coexist *btcoexist,</div><div class='del'>-					    u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool under_4way = false, wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control || btcoexist-&gt;stop_coex_dm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if (wifi_under_5g) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], WiFi is under 5G!!!\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_wifi_under5g(btcoexist);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-			   &amp;under_4way);</div><div class='del'>-</div><div class='del'>-	if (under_4way) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], specific Packet ---- under_4way!!\n");</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-		coex_sta-&gt;specific_pkt_period_cnt = 2;</div><div class='del'>-</div><div class='del'>-	} else if (type == BTC_PACKET_ARP) {</div><div class='del'>-		coex_dm-&gt;arp_cnt++;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], specific Packet ARP notify -cnt = %d\n",</div><div class='del'>-			 coex_dm-&gt;arp_cnt);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], specific Packet DHCP or EAPOL notify [Type = %d]\n",</div><div class='del'>-			type);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;wifi_is_high_pri_task = true;</div><div class='del'>-		coex_sta-&gt;specific_pkt_period_cnt = 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;wifi_is_high_pri_task)</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,</div><div class='del'>-				    u8 length)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 i, rsp_source = 0;</div><div class='del'>-	bool wifi_connected = false;</div><div class='del'>-	bool wifi_scan = false, wifi_link = false, wifi_roam = false,</div><div class='del'>-	     wifi_busy = false;</div><div class='del'>-	static bool is_scoreboard_scan;</div><div class='del'>-</div><div class='del'>-	rsp_source = tmp_buf[0] &amp; 0xf;</div><div class='del'>-	if (rsp_source &gt;= BT_INFO_SRC_8822B_2ANT_MAX)</div><div class='del'>-		rsp_source = BT_INFO_SRC_8822B_2ANT_WIFI_FW;</div><div class='del'>-	coex_sta-&gt;bt_info_c2h_cnt[rsp_source]++;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], Bt_info[%d], len=%d, data=[", rsp_source, length);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; length; i++) {</div><div class='del'>-		coex_sta-&gt;bt_info_c2h[rsp_source][i] = tmp_buf[i];</div><div class='del'>-</div><div class='del'>-		if (i == length - 1) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "0x%02x]\n", tmp_buf[i]);</div><div class='del'>-		} else {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "0x%02x, ",</div><div class='del'>-				 tmp_buf[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	coex_sta-&gt;bt_info = coex_sta-&gt;bt_info_c2h[rsp_source][1];</div><div class='del'>-	coex_sta-&gt;bt_info_ext = coex_sta-&gt;bt_info_c2h[rsp_source][4];</div><div class='del'>-	coex_sta-&gt;bt_info_ext2 = coex_sta-&gt;bt_info_c2h[rsp_source][5];</div><div class='del'>-</div><div class='del'>-	if (rsp_source != BT_INFO_SRC_8822B_2ANT_WIFI_FW) {</div><div class='del'>-		/* if 0xff, it means BT is under WHCK test */</div><div class='del'>-		coex_sta-&gt;bt_whck_test =</div><div class='del'>-			((coex_sta-&gt;bt_info == 0xff) ? true : false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;bt_create_connection =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0x80) ? true :</div><div class='del'>-									 false);</div><div class='del'>-</div><div class='del'>-		/* unit: %, value-100 to translate to unit: dBm */</div><div class='del'>-		coex_sta-&gt;bt_rssi =</div><div class='del'>-			coex_sta-&gt;bt_info_c2h[rsp_source][3] * 2 + 10;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;c2h_bt_remote_name_req =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0x20) ? true :</div><div class='del'>-									 false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;is_A2DP_3M =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0x10) ? true :</div><div class='del'>-									 false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;acl_busy =</div><div class='del'>-			((coex_sta-&gt;bt_info_c2h[rsp_source][1] &amp; 0x9) ? true :</div><div class='del'>-									false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;voice_over_HOGP =</div><div class='del'>-			((coex_sta-&gt;bt_info_ext &amp; 0x10) ? true : false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;c2h_bt_inquiry_page =</div><div class='del'>-			((coex_sta-&gt;bt_info &amp; BT_INFO_8822B_2ANT_B_INQ_PAGE) ?</div><div class='del'>-				 true :</div><div class='del'>-				 false);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;a2dp_bit_pool =</div><div class='del'>-			(((coex_sta-&gt;bt_info_c2h[rsp_source][1] &amp; 0x49) ==</div><div class='del'>-			  0x49) ?</div><div class='del'>-				 (coex_sta-&gt;bt_info_c2h[rsp_source][6] &amp; 0x7f) :</div><div class='del'>-				 0);</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;is_bt_a2dp_sink =</div><div class='del'>-			(coex_sta-&gt;bt_info_c2h[rsp_source][6] &amp; 0x80) ? true :</div><div class='del'>-									false;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;bt_retry_cnt =</div><div class='del'>-			coex_sta-&gt;bt_info_c2h[rsp_source][2] &amp; 0xf;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;is_autoslot = coex_sta-&gt;bt_info_ext2 &amp; 0x8;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;forbidden_slot = coex_sta-&gt;bt_info_ext2 &amp; 0x7;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;hid_busy_num = (coex_sta-&gt;bt_info_ext2 &amp; 0x30) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-		coex_sta-&gt;hid_pair_cnt = (coex_sta-&gt;bt_info_ext2 &amp; 0xc0) &gt;&gt; 6;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_retry_cnt &gt;= 1)</div><div class='del'>-			coex_sta-&gt;pop_event_cnt++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;c2h_bt_remote_name_req)</div><div class='del'>-			coex_sta-&gt;cnt_remote_name_req++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(1))</div><div class='del'>-			coex_sta-&gt;cnt_reinit++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(2)) {</div><div class='del'>-			coex_sta-&gt;cnt_setup_link++;</div><div class='del'>-			coex_sta-&gt;is_setup_link = true;</div><div class='del'>-			coex_sta-&gt;bt_relink_downcount = 2;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Re-Link start in BT info!!\n");</div><div class='del'>-		} else {</div><div class='del'>-			coex_sta-&gt;is_setup_link = false;</div><div class='del'>-			coex_sta-&gt;bt_relink_downcount = 0;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-				 "[BTCoex], Re-Link stop in BT info!!\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(3))</div><div class='del'>-			coex_sta-&gt;cnt_ign_wlan_act++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(6))</div><div class='del'>-			coex_sta-&gt;cnt_role_switch++;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_info_ext &amp; BIT(7))</div><div class='del'>-			coex_sta-&gt;is_bt_multi_link = true;</div><div class='del'>-		else</div><div class='del'>-			coex_sta-&gt;is_bt_multi_link = false;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_create_connection) {</div><div class='del'>-			coex_sta-&gt;cnt_page++;</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY,</div><div class='del'>-					   &amp;wifi_busy);</div><div class='del'>-</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN,</div><div class='del'>-					   &amp;wifi_scan);</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK,</div><div class='del'>-					   &amp;wifi_link);</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM,</div><div class='del'>-					   &amp;wifi_roam);</div><div class='del'>-</div><div class='del'>-			if ((wifi_link) || (wifi_roam) || (wifi_scan) ||</div><div class='del'>-			    (coex_sta-&gt;wifi_is_high_pri_task) || (wifi_busy)) {</div><div class='del'>-				is_scoreboard_scan = true;</div><div class='del'>-				halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-					btcoexist,</div><div class='del'>-					BT_8822B_2ANT_SCOREBOARD_SCAN, true);</div><div class='del'>-</div><div class='del'>-			} else {</div><div class='del'>-				halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-					btcoexist,</div><div class='del'>-					BT_8822B_2ANT_SCOREBOARD_SCAN, false);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (is_scoreboard_scan) {</div><div class='del'>-				halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-					btcoexist,</div><div class='del'>-					BT_8822B_2ANT_SCOREBOARD_SCAN, false);</div><div class='del'>-				is_scoreboard_scan = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Here we need to resend some wifi info to BT */</div><div class='del'>-		/* because bt is reset and loss of the info. */</div><div class='del'>-</div><div class='del'>-		if ((!btcoexist-&gt;manual_control) &amp;&amp;</div><div class='del'>-		    (!btcoexist-&gt;stop_coex_dm)) {</div><div class='del'>-			btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-					   &amp;wifi_connected);</div><div class='del'>-</div><div class='del'>-			/*  Re-Init */</div><div class='del'>-			if ((coex_sta-&gt;bt_info_ext &amp; BIT(1))) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], BT ext info bit1 check, send wifi BW&amp;Chnl to BT!!\n");</div><div class='del'>-				if (wifi_connected)</div><div class='del'>-					halbtc8822b2ant_update_wifi_ch_info(</div><div class='del'>-						btcoexist, BTC_MEDIA_CONNECT);</div><div class='del'>-				else</div><div class='del'>-					halbtc8822b2ant_update_wifi_ch_info(</div><div class='del'>-						btcoexist,</div><div class='del'>-						BTC_MEDIA_DISCONNECT);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*  If Ignore_WLanAct &amp;&amp; not SetUp_Link */</div><div class='del'>-			if ((coex_sta-&gt;bt_info_ext &amp; BIT(3)) &amp;&amp;</div><div class='del'>-			    (!(coex_sta-&gt;bt_info_ext &amp; BIT(2))) &amp;&amp;</div><div class='del'>-			    (!(coex_sta-&gt;bt_info_ext &amp; BIT(6)))) {</div><div class='del'>-				RT_TRACE(</div><div class='del'>-					rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-					"[BTCoex], BT ext info bit3 check, set BT NOT to ignore Wlan active!!\n");</div><div class='del'>-				halbtc8822b2ant_ignore_wlan_act(</div><div class='del'>-					btcoexist, FORCE_EXEC, false);</div><div class='del'>-			} else {</div><div class='del'>-				if (coex_sta-&gt;bt_info_ext &amp; BIT(2)) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT ignore Wlan active because Re-link!!\n");</div><div class='del'>-				} else if (coex_sta-&gt;bt_info_ext &amp; BIT(6)) {</div><div class='del'>-					RT_TRACE(</div><div class='del'>-						rtlpriv, COMP_BT_COEXIST,</div><div class='del'>-						DBG_LOUD,</div><div class='del'>-						"[BTCoex], BT ignore Wlan active because Role-Switch!!\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'>-	if ((coex_sta-&gt;bt_info_ext &amp; BIT(5))) {</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], BT ext info bit4 check, query BLE Scan type!!\n");</div><div class='del'>-		coex_sta-&gt;bt_ble_scan_type =</div><div class='del'>-			btcoexist-&gt;btc_get_ble_scan_type_from_bt(btcoexist);</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x1) == 0x1)</div><div class='del'>-			coex_sta-&gt;bt_ble_scan_para[0] =</div><div class='del'>-				btcoexist-&gt;btc_get_ble_scan_para_from_bt(</div><div class='del'>-					btcoexist, 0x1);</div><div class='del'>-		if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x2) == 0x2)</div><div class='del'>-			coex_sta-&gt;bt_ble_scan_para[1] =</div><div class='del'>-				btcoexist-&gt;btc_get_ble_scan_para_from_bt(</div><div class='del'>-					btcoexist, 0x2);</div><div class='del'>-		if ((coex_sta-&gt;bt_ble_scan_type &amp; 0x4) == 0x4)</div><div class='del'>-			coex_sta-&gt;bt_ble_scan_para[2] =</div><div class='del'>-				btcoexist-&gt;btc_get_ble_scan_para_from_bt(</div><div class='del'>-					btcoexist, 0x4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_update_bt_link_info(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], RF Status notify\n");</div><div class='del'>-</div><div class='del'>-	if (type == BTC_RF_ON) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], RF is turned ON!!\n");</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = false;</div><div class='del'>-		coex_sta-&gt;is_rf_state_off = false;</div><div class='del'>-	} else if (type == BTC_RF_OFF) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], RF is turned OFF!!\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					     FORCE_EXEC,</div><div class='del'>-					     BT_8822B_2ANT_PHASE_WLAN_OFF);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_action_coex_all_off(btcoexist);</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE |</div><div class='del'>-					   BT_8822B_2ANT_SCOREBOARD_ONOFF |</div><div class='del'>-					   BT_8822B_2ANT_SCOREBOARD_SCAN |</div><div class='del'>-					   BT_8822B_2ANT_SCOREBOARD_UNDERTEST,</div><div class='del'>-			false);</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;stop_coex_dm = true;</div><div class='del'>-		coex_sta-&gt;is_rf_state_off = true;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_halt_notify(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "[BTCoex], Halt notify\n");</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_set_ant_path(btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				     BT_8822B_2ANT_PHASE_WLAN_OFF);</div><div class='del'>-</div><div class='del'>-	ex_btc8822b2ant_media_status_notify(btcoexist, BTC_MEDIA_DISCONNECT);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-		btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-	halbtc8822b2ant_post_state_to_bt(btcoexist,</div><div class='del'>-					 BT_8822B_2ANT_SCOREBOARD_ONOFF, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_under_5g = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, "[BTCoex], Pnp notify\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-</div><div class='del'>-	if ((pnp_state == BTC_WIFI_PNP_SLEEP) ||</div><div class='del'>-	    (pnp_state == BTC_WIFI_PNP_SLEEP_KEEP_ANT)) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Pnp notify to SLEEP\n");</div><div class='del'>-</div><div class='del'>-		/* Sinda 20150819, workaround for driver skip leave IPS/LPS to</div><div class='del'>-		 * speed up sleep time.</div><div class='del'>-		 * Driver do not leave IPS/LPS when driver is going to sleep,</div><div class='del'>-		 * so BTCoexistence think wifi is still under IPS/LPS.</div><div class='del'>-		 * BT should clear UnderIPS/UnderLPS state to avoid mismatch</div><div class='del'>-		 * state after wakeup.</div><div class='del'>-		 */</div><div class='del'>-		coex_sta-&gt;under_ips = false;</div><div class='del'>-		coex_sta-&gt;under_lps = false;</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, false);</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ONOFF, false);</div><div class='del'>-</div><div class='del'>-		if (pnp_state == BTC_WIFI_PNP_SLEEP_KEEP_ANT) {</div><div class='del'>-			if (wifi_under_5g)</div><div class='del'>-				halbtc8822b2ant_set_ant_path(</div><div class='del'>-					btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					FORCE_EXEC,</div><div class='del'>-					BT_8822B_2ANT_PHASE_5G_RUNTIME);</div><div class='del'>-			else</div><div class='del'>-				halbtc8822b2ant_set_ant_path(</div><div class='del'>-					btcoexist, BTC_ANT_PATH_AUTO,</div><div class='del'>-					FORCE_EXEC,</div><div class='del'>-					BT_8822B_2ANT_PHASE_2G_RUNTIME);</div><div class='del'>-		} else {</div><div class='del'>-			halbtc8822b2ant_set_ant_path(</div><div class='del'>-				btcoexist, BTC_ANT_PATH_AUTO, FORCE_EXEC,</div><div class='del'>-				BT_8822B_2ANT_PHASE_WLAN_OFF);</div><div class='del'>-		}</div><div class='del'>-	} else if (pnp_state == BTC_WIFI_PNP_WAKE_UP) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Pnp notify to WAKE UP\n");</div><div class='del'>-</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ACTIVE, true);</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_ONOFF, true);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_periodical(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	bool wifi_busy = false;</div><div class='del'>-	u16 bt_scoreboard_val = 0;</div><div class='del'>-	bool bt_relink_finish = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "[BTCoex], ************* Periodical *************\n");</div><div class='del'>-</div><div class='del'>-	if (!btcoexist-&gt;auto_report_2ant)</div><div class='del'>-		halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc8822b2ant_monitor_bt_ctr(btcoexist);</div><div class='del'>-	halbtc8822b2ant_monitor_wifi_ctr(btcoexist);</div><div class='del'>-	halbtc8822b2ant_monitor_bt_enable_disable(btcoexist);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	halbtc8822b2ant_read_score_board(btcoexist, &amp;bt_scoreboard_val);</div><div class='del'>-</div><div class='del'>-	if (wifi_busy) {</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_UNDERTEST, true);</div><div class='del'>-		/*for bt lps32 clock offset*/</div><div class='del'>-		if (bt_scoreboard_val &amp; BIT(6))</div><div class='del'>-			halbtc8822b2ant_query_bt_info(btcoexist);</div><div class='del'>-	} else {</div><div class='del'>-		halbtc8822b2ant_post_state_to_bt(</div><div class='del'>-			btcoexist, BT_8822B_2ANT_SCOREBOARD_UNDERTEST, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coex_sta-&gt;bt_relink_downcount != 0) {</div><div class='del'>-		coex_sta-&gt;bt_relink_downcount--;</div><div class='del'>-</div><div class='del'>-		if (coex_sta-&gt;bt_relink_downcount == 0) {</div><div class='del'>-			coex_sta-&gt;is_setup_link = false;</div><div class='del'>-			bt_relink_finish = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* for 4-way, DHCP, EAPOL packet */</div><div class='del'>-	if (coex_sta-&gt;specific_pkt_period_cnt &gt; 0) {</div><div class='del'>-		coex_sta-&gt;specific_pkt_period_cnt--;</div><div class='del'>-</div><div class='del'>-		if ((coex_sta-&gt;specific_pkt_period_cnt == 0) &amp;&amp;</div><div class='del'>-		    (coex_sta-&gt;wifi_is_high_pri_task))</div><div class='del'>-			coex_sta-&gt;wifi_is_high_pri_task = false;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(</div><div class='del'>-			rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			"[BTCoex], ***************** Hi-Pri Task = %s*****************\n",</div><div class='del'>-			(coex_sta-&gt;wifi_is_high_pri_task ? "Yes" : "No"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halbtc8822b2ant_is_wifibt_status_changed(btcoexist) ||</div><div class='del'>-	    (bt_relink_finish) || (coex_sta-&gt;is_set_ps_state_fail))</div><div class='del'>-		halbtc8822b2ant_run_coexist_mechanism(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_antenna_detection(struct btc_coexist *btcoexist,</div><div class='del'>-				       u32 cent_freq, u32 offset, u32 span,</div><div class='del'>-				       u32 seconds)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_btc8822b2ant_display_ant_detection(struct btc_coexist *btcoexist) {}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h b/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h<br/>deleted file mode 100644<br/>index c99aa6ff1d7f..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,487 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-/* *******************************************</div><div class='del'>- * The following is for 8822B 2Ant BT Co-exist definition</div><div class='del'>- * ********************************************/</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_FTP	BIT(7)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_A2DP	BIT(6)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_HID	BIT(5)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_SCO_BUSY	BIT(4)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_ACL_BUSY	BIT(3)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_INQ_PAGE	BIT(2)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_SCO_ESCO	BIT(1)</div><div class='del'>-#define BT_INFO_8822B_2ANT_B_CONNECTION	BIT(0)</div><div class='del'>-</div><div class='del'>-#define BTC_RSSI_COEX_THRESH_TOL_8822B_2ANT	2</div><div class='del'>-</div><div class='del'>-/* unit: % WiFi RSSI Threshold for 2-Ant free-run/2-Ant TDMA translation.</div><div class='del'>- * (default = 42)</div><div class='del'>- */</div><div class='del'>-#define BT_8822B_2ANT_WIFI_RSSI_COEXSWITCH_THRES1	80</div><div class='del'>-/* unit: % BT RSSI Threshold for 2-Ant free-run/2-Ant TDMA translation.</div><div class='del'>- * (default = 46)</div><div class='del'>- */</div><div class='del'>-#define BT_8822B_2ANT_BT_RSSI_COEXSWITCH_THRES1	80</div><div class='del'>-/* unit: % WiFi RSSI Threshold for 1-Ant TDMA/1-Ant PS-TDMA translation.</div><div class='del'>- * (default = 42)</div><div class='del'>- */</div><div class='del'>-#define BT_8822B_2ANT_WIFI_RSSI_COEXSWITCH_THRES2	80</div><div class='del'>-/* unit: % BT RSSI Threshold for 1-Ant TDMA/1-Ant PS-TDMA translation.</div><div class='del'>- * (default = 46)</div><div class='del'>- */</div><div class='del'>-#define BT_8822B_2ANT_BT_RSSI_COEXSWITCH_THRES2	80</div><div class='del'>-#define BT_8822B_2ANT_DEFAULT_ISOLATION	15 /*  unit: dB */</div><div class='del'>-#define BT_8822B_2ANT_WIFI_MAX_TX_POWER	15 /*  unit: dBm */</div><div class='del'>-#define BT_8822B_2ANT_BT_MAX_TX_POWER	3 /*  unit: dBm */</div><div class='del'>-#define BT_8822B_2ANT_WIFI_SIR_THRES1 -15 /*  unit: dB */</div><div class='del'>-#define BT_8822B_2ANT_WIFI_SIR_THRES2 -30 /*  unit: dB */</div><div class='del'>-#define BT_8822B_2ANT_BT_SIR_THRES1 -15 /*  unit: dB */</div><div class='del'>-#define BT_8822B_2ANT_BT_SIR_THRES2 -30 /*  unit: dB */</div><div class='del'>-</div><div class='del'>-/* for Antenna detection */</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSDTHRES_BACKGROUND	50</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSDTHRES_2ANT_BADISOLATION	70</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSDTHRES_2ANT_GOODISOLATION	52</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSDTHRES_1ANT	40</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_RETRY_INTERVAL                                    \</div><div class='del'>-	10 /* retry timer if ant det is fail, unit: second */</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_SWEEPPOINT_DELAY	60000</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_ENABLE	0</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_BTTXTIME	100</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_BTTXCHANNEL	39</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSD_SWWEEPCOUNT	50</div><div class='del'>-</div><div class='del'>-#define BT_8822B_2ANT_LTECOEX_INDIRECTREG_ACCESS_TIMEOUT	30000</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_signal_state {</div><div class='del'>-	BT_8822B_2ANT_SIG_STA_SET_TO_LOW	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_SIG_STA_SET_BY_HW	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_SIG_STA_SET_TO_HIGH	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_SIG_STA_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_path_ctrl_owner {</div><div class='del'>-	BT_8822B_2ANT_PCO_BTSIDE	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_PCO_WLSIDE	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_PCO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_gnt_ctrl_type {</div><div class='del'>-	BT_8822B_2ANT_GNT_TYPE_CTRL_BY_PTA	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_GNT_TYPE_CTRL_BY_SW	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_GNT_TYPE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_gnt_ctrl_block {</div><div class='del'>-	BT_8822B_2ANT_GNT_BLOCK_RFC_BB	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_GNT_BLOCK_RFC	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_GNT_BLOCK_BB	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_GNT_BLOCK_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_lte_coex_table_type {</div><div class='del'>-	BT_8822B_2ANT_CTT_WL_VS_LTE	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_CTT_BT_VS_LTE	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_CTT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_lte_break_table_type {</div><div class='del'>-	BT_8822B_2ANT_LBTT_WL_BREAK_LTE	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_LBTT_BT_BREAK_LTE	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_LBTT_LTE_BREAK_WL	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_LBTT_LTE_BREAK_BT	= 0x3,</div><div class='del'>-	BT_8822B_2ANT_LBTT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_info_src_8822b_2ant {</div><div class='del'>-	BT_INFO_SRC_8822B_2ANT_WIFI_FW	= 0x0,</div><div class='del'>-	BT_INFO_SRC_8822B_2ANT_BT_RSP	= 0x1,</div><div class='del'>-	BT_INFO_SRC_8822B_2ANT_BT_ACTIVE_SEND	= 0x2,</div><div class='del'>-	BT_INFO_SRC_8822B_2ANT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_bt_status {</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_NON_CONNECTED_IDLE	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_CONNECTED_IDLE	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_INQ_PAGE	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_ACL_BUSY	= 0x3,</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_SCO_BUSY	= 0x4,</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_ACL_SCO_BUSY	= 0x5,</div><div class='del'>-	BT_8822B_2ANT_BT_STATUS_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_coex_algo {</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_UNDEFINED	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_SCO	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_HID	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_A2DP	= 0x3,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_A2DP_PANHS	= 0x4,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_PANEDR	= 0x5,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_PANHS	= 0x6,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_PANEDR_A2DP	= 0x7,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_PANEDR_HID	= 0x8,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_HID_A2DP_PANEDR	= 0x9,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_HID_A2DP	= 0xa,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_NOPROFILEBUSY	= 0xb,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_A2DPSINK	= 0xc,</div><div class='del'>-	BT_8822B_2ANT_COEX_ALGO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_ext_ant_switch_type {</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_USE_DPDT	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_USE_SPDT	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_NONE	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_ext_ant_switch_ctrl_type {</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_BBSW	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_PTA	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_ANTDIV	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_MAC	= 0x3,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_BY_BT	= 0x4,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_CTRL_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_ext_ant_switch_pos_type {</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_MAIN_TO_BT	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_MAIN_TO_WLG	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_MAIN_TO_WLA	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_MAIN_TO_NOCARE	= 0x3,</div><div class='del'>-	BT_8822B_2ANT_EXT_ANT_SWITCH_MAIN_TO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_ext_band_switch_pos_type {</div><div class='del'>-	BT_8822B_2ANT_EXT_BAND_SWITCH_TO_WLG	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_EXT_BAND_SWITCH_TO_WLA	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_EXT_BAND_SWITCH_TO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_int_block {</div><div class='del'>-	BT_8822B_2ANT_INT_BLOCK_SWITCH_TO_WLG_OF_BTG	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_INT_BLOCK_SWITCH_TO_WLG_OF_WLAG	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_INT_BLOCK_SWITCH_TO_WLA_OF_WLAG	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_INT_BLOCK_SWITCH_TO_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_phase {</div><div class='del'>-	BT_8822B_2ANT_PHASE_COEX_INIT	= 0x0,</div><div class='del'>-	BT_8822B_2ANT_PHASE_WLANONLY_INIT	= 0x1,</div><div class='del'>-	BT_8822B_2ANT_PHASE_WLAN_OFF	= 0x2,</div><div class='del'>-	BT_8822B_2ANT_PHASE_2G_RUNTIME	= 0x3,</div><div class='del'>-	BT_8822B_2ANT_PHASE_5G_RUNTIME	= 0x4,</div><div class='del'>-	BT_8822B_2ANT_PHASE_BTMPMODE	= 0x5,</div><div class='del'>-	BT_8822B_2ANT_PHASE_ANTENNA_DET	= 0x6,</div><div class='del'>-	BT_8822B_2ANT_PHASE_COEX_POWERON	= 0x7,</div><div class='del'>-	BT_8822B_2ANT_PHASE_2G_RUNTIME_CONCURRENT	= 0x8,</div><div class='del'>-	BT_8822B_2ANT_PHASE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*ADD SCOREBOARD TO FIX BT LPS 32K ISSUE WHILE WL BUSY*/</div><div class='del'>-</div><div class='del'>-enum bt_8822b_2ant_scoreboard {</div><div class='del'>-	BT_8822B_2ANT_SCOREBOARD_ACTIVE	= BIT(0),</div><div class='del'>-	BT_8822B_2ANT_SCOREBOARD_ONOFF	= BIT(1),</div><div class='del'>-	BT_8822B_2ANT_SCOREBOARD_SCAN	= BIT(2),</div><div class='del'>-	BT_8822B_2ANT_SCOREBOARD_UNDERTEST	= BIT(3),</div><div class='del'>-	BT_8822B_2ANT_SCOREBOARD_WLBUSY = BIT(6)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct coex_dm_8822b_2ant {</div><div class='del'>-	/* hw setting */</div><div class='del'>-	u32	pre_ant_pos_type;</div><div class='del'>-	u32	cur_ant_pos_type;</div><div class='del'>-	/* fw mechanism */</div><div class='del'>-	u8	pre_bt_dec_pwr_lvl;</div><div class='del'>-	u8	cur_bt_dec_pwr_lvl;</div><div class='del'>-	u8	pre_fw_dac_swing_lvl;</div><div class='del'>-	u8	cur_fw_dac_swing_lvl;</div><div class='del'>-	bool	cur_ignore_wlan_act;</div><div class='del'>-	bool	pre_ignore_wlan_act;</div><div class='del'>-	u8	pre_ps_tdma;</div><div class='del'>-	u8	cur_ps_tdma;</div><div class='del'>-	u8	ps_tdma_para[5];</div><div class='del'>-	u8	ps_tdma_du_adj_type;</div><div class='del'>-	bool	reset_tdma_adjust;</div><div class='del'>-	bool	pre_ps_tdma_on;</div><div class='del'>-	bool	cur_ps_tdma_on;</div><div class='del'>-	bool	pre_bt_auto_report;</div><div class='del'>-	bool	cur_bt_auto_report;</div><div class='del'>-</div><div class='del'>-	/* sw mechanism */</div><div class='del'>-	bool	pre_rf_rx_lpf_shrink;</div><div class='del'>-	bool	cur_rf_rx_lpf_shrink;</div><div class='del'>-	u32	bt_rf_0x1e_backup;</div><div class='del'>-	bool	pre_low_penalty_ra;</div><div class='del'>-	bool	cur_low_penalty_ra;</div><div class='del'>-	bool	pre_dac_swing_on;</div><div class='del'>-	u32	pre_dac_swing_lvl;</div><div class='del'>-	bool	cur_dac_swing_on;</div><div class='del'>-	u32	cur_dac_swing_lvl;</div><div class='del'>-	bool	pre_adc_back_off;</div><div class='del'>-	bool	cur_adc_back_off;</div><div class='del'>-	bool	pre_agc_table_en;</div><div class='del'>-	bool	cur_agc_table_en;</div><div class='del'>-	u32	pre_val0x6c0;</div><div class='del'>-	u32	cur_val0x6c0;</div><div class='del'>-	u32	pre_val0x6c4;</div><div class='del'>-	u32	cur_val0x6c4;</div><div class='del'>-	u32	pre_val0x6c8;</div><div class='del'>-	u32	cur_val0x6c8;</div><div class='del'>-	u8	pre_val0x6cc;</div><div class='del'>-	u8	cur_val0x6cc;</div><div class='del'>-	bool	limited_dig;</div><div class='del'>-</div><div class='del'>-	/* algorithm related */</div><div class='del'>-	u8	pre_algorithm;</div><div class='del'>-	u8	cur_algorithm;</div><div class='del'>-	u8	bt_status;</div><div class='del'>-	u8	wifi_chnl_info[3];</div><div class='del'>-</div><div class='del'>-	bool	need_recover0x948;</div><div class='del'>-	u32	backup0x948;</div><div class='del'>-</div><div class='del'>-	u8	pre_lps;</div><div class='del'>-	u8	cur_lps;</div><div class='del'>-	u8	pre_rpwm;</div><div class='del'>-	u8	cur_rpwm;</div><div class='del'>-</div><div class='del'>-	bool	is_switch_to_1dot5_ant;</div><div class='del'>-	u8	switch_thres_offset;</div><div class='del'>-	u32	arp_cnt;</div><div class='del'>-</div><div class='del'>-	u32	pre_ext_ant_switch_status;</div><div class='del'>-	u32	cur_ext_ant_switch_status;</div><div class='del'>-</div><div class='del'>-	u8	pre_ext_band_switch_status;</div><div class='del'>-	u8	cur_ext_band_switch_status;</div><div class='del'>-</div><div class='del'>-	u8	pre_int_block_status;</div><div class='del'>-	u8	cur_int_block_status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct coex_sta_8822b_2ant {</div><div class='del'>-	bool	bt_disabled;</div><div class='del'>-	bool	bt_link_exist;</div><div class='del'>-	bool	sco_exist;</div><div class='del'>-	bool	a2dp_exist;</div><div class='del'>-	bool	hid_exist;</div><div class='del'>-	bool	pan_exist;</div><div class='del'>-</div><div class='del'>-	bool	under_lps;</div><div class='del'>-	bool	under_ips;</div><div class='del'>-	u32	high_priority_tx;</div><div class='del'>-	u32	high_priority_rx;</div><div class='del'>-	u32	low_priority_tx;</div><div class='del'>-	u32	low_priority_rx;</div><div class='del'>-	bool	is_hi_pri_rx_overhead;</div><div class='del'>-	u8	bt_rssi;</div><div class='del'>-	u8	pre_bt_rssi_state;</div><div class='del'>-	u8	pre_wifi_rssi_state[4];</div><div class='del'>-	u8	bt_info_c2h[BT_INFO_SRC_8822B_2ANT_MAX][10];</div><div class='del'>-	u32	bt_info_c2h_cnt[BT_INFO_SRC_8822B_2ANT_MAX];</div><div class='del'>-	bool	bt_whck_test;</div><div class='del'>-	bool	c2h_bt_inquiry_page;</div><div class='del'>-	bool	c2h_bt_remote_name_req;</div><div class='del'>-</div><div class='del'>-	u8	bt_info_ext;</div><div class='del'>-	u8	bt_info_ext2;</div><div class='del'>-	u32	pop_event_cnt;</div><div class='del'>-	u8	scan_ap_num;</div><div class='del'>-	u8	bt_retry_cnt;</div><div class='del'>-</div><div class='del'>-	u32	crc_ok_cck;</div><div class='del'>-	u32	crc_ok_11g;</div><div class='del'>-	u32	crc_ok_11n;</div><div class='del'>-	u32	crc_ok_11n_vht;</div><div class='del'>-</div><div class='del'>-	u32	crc_err_cck;</div><div class='del'>-	u32	crc_err_11g;</div><div class='del'>-	u32	crc_err_11n;</div><div class='del'>-	u32	crc_err_11n_vht;</div><div class='del'>-</div><div class='del'>-	u32	acc_crc_ratio;</div><div class='del'>-	u32	now_crc_ratio;</div><div class='del'>-</div><div class='del'>-	bool	cck_lock;</div><div class='del'>-	bool	pre_ccklock;</div><div class='del'>-	bool	cck_ever_lock;</div><div class='del'>-</div><div class='del'>-	u8	coex_table_type;</div><div class='del'>-	bool	force_lps_ctrl;</div><div class='del'>-</div><div class='del'>-	u8	dis_ver_info_cnt;</div><div class='del'>-</div><div class='del'>-	u8	a2dp_bit_pool;</div><div class='del'>-	u8	cut_version;</div><div class='del'>-</div><div class='del'>-	bool	concurrent_rx_mode_on;</div><div class='del'>-</div><div class='del'>-	u16	score_board;</div><div class='del'>-	u8	isolation_btween_wb; /* 0~ 50 */</div><div class='del'>-	u8	wifi_coex_thres;</div><div class='del'>-	u8	bt_coex_thres;</div><div class='del'>-	u8	wifi_coex_thres2;</div><div class='del'>-	u8	bt_coex_thres2;</div><div class='del'>-</div><div class='del'>-	u8	num_of_profile;</div><div class='del'>-	bool	acl_busy;</div><div class='del'>-	bool	bt_create_connection;</div><div class='del'>-	bool	wifi_is_high_pri_task;</div><div class='del'>-	u32	specific_pkt_period_cnt;</div><div class='del'>-	u32	bt_coex_supported_feature;</div><div class='del'>-	u32	bt_coex_supported_version;</div><div class='del'>-</div><div class='del'>-	u8	bt_ble_scan_type;</div><div class='del'>-	u32	bt_ble_scan_para[3];</div><div class='del'>-</div><div class='del'>-	bool	run_time_state;</div><div class='del'>-	bool	freeze_coexrun_by_btinfo;</div><div class='del'>-</div><div class='del'>-	bool	is_A2DP_3M;</div><div class='del'>-	bool	voice_over_HOGP;</div><div class='del'>-	u8	bt_info;</div><div class='del'>-	bool	is_autoslot;</div><div class='del'>-	u8	forbidden_slot;</div><div class='del'>-	u8	hid_busy_num;</div><div class='del'>-	u8	hid_pair_cnt;</div><div class='del'>-</div><div class='del'>-	u32	cnt_remote_name_req;</div><div class='del'>-	u32	cnt_setup_link;</div><div class='del'>-	u32	cnt_reinit;</div><div class='del'>-	u32	cnt_ign_wlan_act;</div><div class='del'>-	u32	cnt_page;</div><div class='del'>-	u32	cnt_role_switch;</div><div class='del'>-</div><div class='del'>-	u16	bt_reg_vendor_ac;</div><div class='del'>-	u16	bt_reg_vendor_ae;</div><div class='del'>-</div><div class='del'>-	bool	is_setup_link;</div><div class='del'>-	u8	wl_noisy_level;</div><div class='del'>-	u32	gnt_error_cnt;</div><div class='del'>-</div><div class='del'>-	u8	bt_afh_map[10];</div><div class='del'>-	u8	bt_relink_downcount;</div><div class='del'>-	bool	is_tdma_btautoslot;</div><div class='del'>-	bool	is_tdma_btautoslot_hang;</div><div class='del'>-</div><div class='del'>-	bool	is_esco_mode;</div><div class='del'>-	u8	switch_band_notify_to;</div><div class='del'>-	bool	is_rf_state_off;</div><div class='del'>-</div><div class='del'>-	bool	is_hid_low_pri_tx_overhead;</div><div class='del'>-	bool	is_bt_multi_link;</div><div class='del'>-	bool	is_bt_a2dp_sink;</div><div class='del'>-</div><div class='del'>-	bool	is_set_ps_state_fail;</div><div class='del'>-	u8	cnt_set_ps_state_fail;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BT_8822B_2ANT_EXT_BAND_SWITCH_USE_DPDT	0</div><div class='del'>-#define BT_8822B_2ANT_EXT_BAND_SWITCH_USE_SPDT	1</div><div class='del'>-</div><div class='del'>-struct rfe_type_8822b_2ant {</div><div class='del'>-	u8	rfe_module_type;</div><div class='del'>-	bool	ext_ant_switch_exist;</div><div class='del'>-	u8	ext_ant_switch_type; /* 0:DPDT, 1:SPDT */</div><div class='del'>-	/*  iF 0: DPDT_P=0, DPDT_N=1 =&gt; BTG to Main, WL_A+G to Aux */</div><div class='del'>-	u8	ext_ant_switch_ctrl_polarity;</div><div class='del'>-</div><div class='del'>-	bool	ext_band_switch_exist;</div><div class='del'>-	u8	ext_band_switch_type; /* 0:DPDT, 1:SPDT */</div><div class='del'>-	u8	ext_band_switch_ctrl_polarity;</div><div class='del'>-</div><div class='del'>-	/*  If true:  WLG at BTG, If false: WLG at WLAG */</div><div class='del'>-	bool	wlg_locate_at_btg;</div><div class='del'>-</div><div class='del'>-	bool	ext_ant_switch_diversity; /* If diversity on */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSD_POINTS	256 /* MAX:1024 */</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_PSD_AVGNUM	1 /* MAX:3 */</div><div class='del'>-#define BT_8822B_2ANT_ANTDET_BUF_LEN	16</div><div class='del'>-</div><div class='del'>-struct psdscan_sta_8822b_2ant {</div><div class='del'>-	u32	ant_det_bt_le_channel; /* BT LE Channel ex:2412 */</div><div class='del'>-	u32	ant_det_bt_tx_time;</div><div class='del'>-	u32	ant_det_pre_psdscan_peak_val;</div><div class='del'>-	bool	ant_det_is_ant_det_available;</div><div class='del'>-	u32	ant_det_psd_scan_peak_val;</div><div class='del'>-	bool	ant_det_is_btreply_available;</div><div class='del'>-	u32	ant_det_psd_scan_peak_freq;</div><div class='del'>-</div><div class='del'>-	u8	ant_det_result;</div><div class='del'>-	u8	ant_det_peak_val[BT_8822B_2ANT_ANTDET_BUF_LEN];</div><div class='del'>-	u8	ant_det_peak_freq[BT_8822B_2ANT_ANTDET_BUF_LEN];</div><div class='del'>-	u32	ant_det_try_count;</div><div class='del'>-	u32	ant_det_fail_count;</div><div class='del'>-	u32	ant_det_inteval_count;</div><div class='del'>-	u32	ant_det_thres_offset;</div><div class='del'>-</div><div class='del'>-	u32	real_cent_freq;</div><div class='del'>-	s32	real_offset;</div><div class='del'>-	u32	real_span;</div><div class='del'>-</div><div class='del'>-	u32	psd_band_width; /* unit: Hz */</div><div class='del'>-	u32	psd_point; /* 128/256/512/1024 */</div><div class='del'>-	u32	psd_report[1024]; /* unit:dB (20logx), 0~255 */</div><div class='del'>-	u32	psd_report_max_hold[1024]; /* unit:dB (20logx), 0~255 */</div><div class='del'>-	u32	psd_start_point;</div><div class='del'>-	u32	psd_stop_point;</div><div class='del'>-	u32	psd_max_value_point;</div><div class='del'>-	u32	psd_max_value;</div><div class='del'>-	u32	psd_max_value2;</div><div class='del'>-	/* filter loop_max_value that below BT_8822B_1ANT_ANTDET_PSDTHRES_1ANT,</div><div class='del'>-	 * and average the rest</div><div class='del'>-	 */</div><div class='del'>-	u32	psd_avg_value;</div><div class='del'>-	/*max value in each loop */</div><div class='del'>-	u32	psd_loop_max_value[BT_8822B_2ANT_ANTDET_PSD_SWWEEPCOUNT];</div><div class='del'>-	u32	psd_start_base;</div><div class='del'>-	u32	psd_avg_num; /* 1/8/16/32 */</div><div class='del'>-	u32	psd_gen_count;</div><div class='del'>-	bool	is_ant_det_running;</div><div class='del'>-	bool	is_psd_show_max_only;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* *******************************************</div><div class='del'>- * The following is interface which will notify coex module.</div><div class='del'>- * ********************************************/</div><div class='del'>-void ex_btc8822b2ant_power_on_setting(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b2ant_pre_load_firmware(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b2ant_init_hw_config(struct btc_coexist *btcoexist,</div><div class='del'>-				    bool wifi_only);</div><div class='del'>-void ex_btc8822b2ant_init_coex_dm(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b2ant_ips_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b2ant_lps_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b2ant_scan_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b2ant_switchband_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b2ant_connect_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b2ant_media_status_notify(struct btc_coexist *btcoexist,</div><div class='del'>-					 u8 type);</div><div class='del'>-void ex_btc8822b2ant_specific_packet_notify(struct btc_coexist *btcoexist,</div><div class='del'>-					    u8 type);</div><div class='del'>-void ex_btc8822b2ant_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,</div><div class='del'>-				    u8 length);</div><div class='del'>-void ex_btc8822b2ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void ex_btc8822b2ant_halt_notify(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b2ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);</div><div class='del'>-void ex_btc8822b2ant_periodical(struct btc_coexist *btcoexist);</div><div class='del'>-void ex_btc8822b2ant_display_coex_info(struct btc_coexist *btcoexist,</div><div class='del'>-				       struct seq_file *m);</div><div class='del'>-void ex_btc8822b2ant_antenna_detection(struct btc_coexist *btcoexist,</div><div class='del'>-				       u32 cent_freq, u32 offset, u32 span,</div><div class='del'>-				       u32 seconds);</div><div class='del'>-void ex_btc8822b2ant_display_ant_detection(struct btc_coexist *btcoexist);</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.c b/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.c<br/>deleted file mode 100644<br/>index ad7b6c42840b..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halbt_precomp.h"</div><div class='del'>-</div><div class='del'>-void ex_hal8822b_wifi_only_hw_config(struct wifi_only_cfg *wifionlycfg)</div><div class='del'>-{</div><div class='del'>-	/*BB control*/</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0x4c, 0x01800000, 0x2);</div><div class='del'>-	/*SW control*/</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0xcb4, 0xff, 0x77);</div><div class='del'>-	/*antenna mux switch */</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0x974, 0x300, 0x3);</div><div class='del'>-</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0x1990, 0x300, 0x0);</div><div class='del'>-</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0xcbc, 0x80000, 0x0);</div><div class='del'>-	/*switch to WL side controller and gnt_wl gnt_bt debug signal */</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0x70, 0xff000000, 0x0e);</div><div class='del'>-	/*gnt_wl=1 , gnt_bt=0*/</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0x1704, 0xffffffff, 0x7700);</div><div class='del'>-	halwifionly_phy_set_bb_reg(wifionlycfg, 0x1700, 0xffffffff, 0xc00f0038);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_hal8822b_wifi_only_scannotify(struct wifi_only_cfg *wifionlycfg,</div><div class='del'>-				      u8 is_5g)</div><div class='del'>-{</div><div class='del'>-	hal8822b_wifi_only_switch_antenna(wifionlycfg, is_5g);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ex_hal8822b_wifi_only_switchbandnotify(struct wifi_only_cfg *wifionlycfg,</div><div class='del'>-					    u8 is_5g)</div><div class='del'>-{</div><div class='del'>-	hal8822b_wifi_only_switch_antenna(wifionlycfg, is_5g);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hal8822b_wifi_only_switch_antenna(struct wifi_only_cfg *wifionlycfg,</div><div class='del'>-				       u8 is_5g)</div><div class='del'>-{</div><div class='del'>-	if (is_5g)</div><div class='del'>-		halwifionly_phy_set_bb_reg(wifionlycfg, 0xcbc, 0x300, 0x1);</div><div class='del'>-	else</div><div class='del'>-		halwifionly_phy_set_bb_reg(wifionlycfg, 0xcbc, 0x300, 0x2);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.h b/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.h<br/>deleted file mode 100644<br/>index 5910fe1a1fb0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef __INC_HAL8822BWIFIONLYHWCFG_H</div><div class='del'>-#define __INC_HAL8822BWIFIONLYHWCFG_H</div><div class='del'>-</div><div class='del'>-void ex_hal8822b_wifi_only_hw_config(struct wifi_only_cfg *wifionlycfg);</div><div class='del'>-void ex_hal8822b_wifi_only_scannotify(struct wifi_only_cfg *wifionlycfg,</div><div class='del'>-				      u8 is_5g);</div><div class='del'>-void ex_hal8822b_wifi_only_switchbandnotify(struct wifi_only_cfg *wifionlycfg,</div><div class='del'>-					    u8 is_5g);</div><div class='del'>-void hal8822b_wifi_only_switch_antenna(struct wifi_only_cfg *wifionlycfg,</div><div class='del'>-				       u8 is_5g);</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c<br/>deleted file mode 100644<br/>index b519d181b419..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1837 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2007 - 2013 Realtek Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "halbt_precomp.h"</div><div class='del'>-</div><div class='del'>-/***************************************************</div><div class='del'>- *		Debug related function</div><div class='del'>- ***************************************************/</div><div class='del'>-</div><div class='del'>-static const char *const gl_btc_wifi_bw_string[] = {</div><div class='del'>-	"11bg",</div><div class='del'>-	"HT20",</div><div class='del'>-	"HT40",</div><div class='del'>-	"HT80",</div><div class='del'>-	"HT160"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *const gl_btc_wifi_freq_string[] = {</div><div class='del'>-	"2.4G",</div><div class='del'>-	"5G"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool halbtc_is_bt_coexist_available(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!btcoexist-&gt;binded || NULL == btcoexist-&gt;adapter)</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 bool halbtc_is_wifi_busy(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	if (rtlpriv-&gt;link_info.busytraffic)</div><div class='del'>-		return true;</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_dbg_init(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***************************************************</div><div class='del'>- *		helper function</div><div class='del'>- ***************************************************/</div><div class='del'>-static bool is_any_client_connect_to_ap(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtlpriv);</div><div class='del'>-	struct rtl_sta_info *drv_priv;</div><div class='del'>-	u8 cnt = 0;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;opmode == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-	    mac-&gt;opmode == NL80211_IFTYPE_MESH_POINT ||</div><div class='del'>-	    mac-&gt;opmode == NL80211_IFTYPE_AP) {</div><div class='del'>-		if (in_interrupt() &gt; 0) {</div><div class='del'>-			list_for_each_entry(drv_priv, &amp;rtlpriv-&gt;entry_list,</div><div class='del'>-					    list) {</div><div class='del'>-				cnt++;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			spin_lock_bh(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-			list_for_each_entry(drv_priv, &amp;rtlpriv-&gt;entry_list,</div><div class='del'>-					    list) {</div><div class='del'>-				cnt++;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_bh(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (cnt &gt; 0)</div><div class='del'>-		return true;</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool halbtc_legacy(struct rtl_priv *adapter)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = adapter;</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtlpriv);</div><div class='del'>-</div><div class='del'>-	bool is_legacy = false;</div><div class='del'>-</div><div class='del'>-	if ((mac-&gt;mode == WIRELESS_MODE_B) || (mac-&gt;mode == WIRELESS_MODE_G))</div><div class='del'>-		is_legacy = true;</div><div class='del'>-</div><div class='del'>-	return is_legacy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool halbtc_is_wifi_uplink(struct rtl_priv *adapter)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = adapter;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;link_info.tx_busy_traffic)</div><div class='del'>-		return true;</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_wifi_bw(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv =</div><div class='del'>-		(struct rtl_priv *)btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	u32 wifi_bw = BTC_WIFI_BW_HT20;</div><div class='del'>-</div><div class='del'>-	if (halbtc_legacy(rtlpriv)) {</div><div class='del'>-		wifi_bw = BTC_WIFI_BW_LEGACY;</div><div class='del'>-	} else {</div><div class='del'>-		switch (rtlphy-&gt;current_chan_bw) {</div><div class='del'>-		case HT_CHANNEL_WIDTH_20:</div><div class='del'>-			wifi_bw = BTC_WIFI_BW_HT20;</div><div class='del'>-			break;</div><div class='del'>-		case HT_CHANNEL_WIDTH_20_40:</div><div class='del'>-			wifi_bw = BTC_WIFI_BW_HT40;</div><div class='del'>-			break;</div><div class='del'>-		case HT_CHANNEL_WIDTH_80:</div><div class='del'>-			wifi_bw = BTC_WIFI_BW_HT80;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return wifi_bw;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 halbtc_get_wifi_central_chnl(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_phy	*rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	u8 chnl = 1;</div><div class='del'>-</div><div class='del'>-	if (rtlphy-&gt;current_channel != 0)</div><div class='del'>-		chnl = rtlphy-&gt;current_channel;</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "%s:%d\n", __func__, chnl);</div><div class='del'>-	return chnl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	return rtlpriv-&gt;btcoexist.btc_info.single_ant_path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	return rtlpriv-&gt;btcoexist.btc_info.bt_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	u8 num;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;btcoexist.btc_info.ant_num == ANT_X2)</div><div class='del'>-		num = 2;</div><div class='del'>-	else</div><div class='del'>-		num = 1;</div><div class='del'>-</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 rtl_get_hwpg_package_type(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-</div><div class='del'>-	return rtlhal-&gt;package_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-u8 rtl_get_hwpg_rfe_type(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-</div><div class='del'>-	return rtlhal-&gt;rfe_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ************************************</div><div class='del'>- *         Hal helper function</div><div class='del'>- * ************************************</div><div class='del'>- */</div><div class='del'>-static</div><div class='del'>-bool halbtc_is_hw_mailbox_exist(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (IS_HARDWARE_TYPE_8812(btcoexist-&gt;adapter))</div><div class='del'>-		return false;</div><div class='del'>-	else</div><div class='del'>-		return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-bool halbtc_send_bt_mp_operation(struct btc_coexist *btcoexist, u8 op_code,</div><div class='del'>-				 u8 *cmd, u32 len, unsigned long wait_ms)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv;</div><div class='del'>-	const u8 oper_ver = 0;</div><div class='del'>-	u8 req_num;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_hw_mailbox_exist(btcoexist))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (wait_ms)	/* before h2c to avoid race condition */</div><div class='del'>-		reinit_completion(&amp;btcoexist-&gt;bt_mp_comp);</div><div class='del'>-</div><div class='del'>-	rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * fill req_num by op_code, and rtl_btc_btmpinfo_notify() use it</div><div class='del'>-	 * to know message type</div><div class='del'>-	 */</div><div class='del'>-	switch (op_code) {</div><div class='del'>-	case BT_OP_GET_BT_VERSION:</div><div class='del'>-		req_num = BT_SEQ_GET_BT_VERSION;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_AFH_MAP_L:</div><div class='del'>-		req_num = BT_SEQ_GET_AFH_MAP_L;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_AFH_MAP_M:</div><div class='del'>-		req_num = BT_SEQ_GET_AFH_MAP_M;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_AFH_MAP_H:</div><div class='del'>-		req_num = BT_SEQ_GET_AFH_MAP_H;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_BT_COEX_SUPPORTED_FEATURE:</div><div class='del'>-		req_num = BT_SEQ_GET_BT_COEX_SUPPORTED_FEATURE;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_BT_COEX_SUPPORTED_VERSION:</div><div class='del'>-		req_num = BT_SEQ_GET_BT_COEX_SUPPORTED_VERSION;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_BT_ANT_DET_VAL:</div><div class='del'>-		req_num = BT_SEQ_GET_BT_ANT_DET_VAL;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_BT_BLE_SCAN_PARA:</div><div class='del'>-		req_num = BT_SEQ_GET_BT_BLE_SCAN_PARA;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_GET_BT_BLE_SCAN_TYPE:</div><div class='del'>-		req_num = BT_SEQ_GET_BT_BLE_SCAN_TYPE;</div><div class='del'>-		break;</div><div class='del'>-	case BT_OP_WRITE_REG_ADDR:</div><div class='del'>-	case BT_OP_WRITE_REG_VALUE:</div><div class='del'>-	case BT_OP_READ_REG:</div><div class='del'>-	default:</div><div class='del'>-		req_num = BT_SEQ_DONT_CARE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd[0] |= (oper_ver &amp; 0x0f);		/* Set OperVer */</div><div class='del'>-	cmd[0] |= ((req_num &lt;&lt; 4) &amp; 0xf0);	/* Set ReqNum */</div><div class='del'>-	cmd[1] = op_code;</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;fill_h2c_cmd(rtlpriv-&gt;mac80211.hw, 0x67, len, cmd);</div><div class='del'>-</div><div class='del'>-	/* wait? */</div><div class='del'>-	if (!wait_ms)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "btmpinfo wait req_num=%d wait=%ld\n", req_num, wait_ms);</div><div class='del'>-</div><div class='del'>-	if (in_interrupt())</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (wait_for_completion_timeout(&amp;btcoexist-&gt;bt_mp_comp,</div><div class='del'>-					msecs_to_jiffies(wait_ms)) == 0) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,</div><div class='del'>-			 "btmpinfo wait (req_num=%d) timeout\n", req_num);</div><div class='del'>-</div><div class='del'>-		return false;	/* timeout */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_leave_lps(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv;</div><div class='del'>-	bool ap_enable = false;</div><div class='del'>-</div><div class='del'>-	rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-			   &amp;ap_enable);</div><div class='del'>-</div><div class='del'>-	if (ap_enable) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,</div><div class='del'>-			 "%s()&lt;--dont leave lps under AP mode\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.bt_ctrl_lps = true;</div><div class='del'>-	btcoexist-&gt;bt_info.bt_lps_on = false;</div><div class='del'>-	rtl_lps_leave(rtlpriv-&gt;mac80211.hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_enter_lps(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv;</div><div class='del'>-	bool ap_enable = false;</div><div class='del'>-</div><div class='del'>-	rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-			   &amp;ap_enable);</div><div class='del'>-</div><div class='del'>-	if (ap_enable) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,</div><div class='del'>-			 "%s()&lt;--dont enter lps under AP mode\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.bt_ctrl_lps = true;</div><div class='del'>-	btcoexist-&gt;bt_info.bt_lps_on = true;</div><div class='del'>-	rtl_lps_enter(rtlpriv-&gt;mac80211.hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_normal_lps(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv;</div><div class='del'>-</div><div class='del'>-	rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;bt_info.bt_ctrl_lps) {</div><div class='del'>-		btcoexist-&gt;bt_info.bt_lps_on = false;</div><div class='del'>-		rtl_lps_leave(rtlpriv-&gt;mac80211.hw);</div><div class='del'>-		btcoexist-&gt;bt_info.bt_ctrl_lps = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_leave_low_power(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_normal_low_power(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_disable_low_power(struct btc_coexist *btcoexist,</div><div class='del'>-				     bool low_pwr_disable)</div><div class='del'>-{</div><div class='del'>-	/* TODO: original/leave 32k low power */</div><div class='del'>-	btcoexist-&gt;bt_info.bt_disable_low_pwr = low_pwr_disable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_aggregation_check(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	bool need_to_act = false;</div><div class='del'>-	static unsigned long pre_time;</div><div class='del'>-	unsigned long cur_time = 0;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	/* To void continuous deleteBA=&gt;addBA=&gt;deleteBA=&gt;addBA</div><div class='del'>-	 * This function is not allowed to continuous called</div><div class='del'>-	 * It can only be called after 8 seconds</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	cur_time = jiffies;</div><div class='del'>-	if (jiffies_to_msecs(cur_time - pre_time) &lt;= 8000) {</div><div class='del'>-		/* over 8 seconds you can execute this function again. */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	pre_time = cur_time;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;bt_info.reject_agg_pkt) {</div><div class='del'>-		need_to_act = true;</div><div class='del'>-		btcoexist-&gt;bt_info.pre_reject_agg_pkt =</div><div class='del'>-			btcoexist-&gt;bt_info.reject_agg_pkt;</div><div class='del'>-	} else {</div><div class='del'>-		if (btcoexist-&gt;bt_info.pre_reject_agg_pkt) {</div><div class='del'>-			need_to_act = true;</div><div class='del'>-			btcoexist-&gt;bt_info.pre_reject_agg_pkt =</div><div class='del'>-				btcoexist-&gt;bt_info.reject_agg_pkt;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (btcoexist-&gt;bt_info.pre_bt_ctrl_agg_buf_size !=</div><div class='del'>-		    btcoexist-&gt;bt_info.bt_ctrl_agg_buf_size) {</div><div class='del'>-			need_to_act = true;</div><div class='del'>-			btcoexist-&gt;bt_info.pre_bt_ctrl_agg_buf_size =</div><div class='del'>-				btcoexist-&gt;bt_info.bt_ctrl_agg_buf_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (btcoexist-&gt;bt_info.bt_ctrl_agg_buf_size) {</div><div class='del'>-			if (btcoexist-&gt;bt_info.pre_agg_buf_size !=</div><div class='del'>-			    btcoexist-&gt;bt_info.agg_buf_size) {</div><div class='del'>-				need_to_act = true;</div><div class='del'>-			}</div><div class='del'>-			btcoexist-&gt;bt_info.pre_agg_buf_size =</div><div class='del'>-				btcoexist-&gt;bt_info.agg_buf_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (need_to_act)</div><div class='del'>-			rtl_rx_ampdu_apply(rtlpriv);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_bt_patch_version(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	u8 cmd_buffer[4] = {0};</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;bt_info.bt_real_fw_ver)</div><div class='del'>-		goto label_done;</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_BT_VERSION,</div><div class='del'>-				    cmd_buffer, 4, 200);</div><div class='del'>-</div><div class='del'>-label_done:</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_real_fw_ver;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_bt_coex_supported_feature(void *btc_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer[4] = {0};</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;bt_info.bt_supported_feature)</div><div class='del'>-		goto label_done;</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist,</div><div class='del'>-				    BT_OP_GET_BT_COEX_SUPPORTED_FEATURE,</div><div class='del'>-				    cmd_buffer, 4, 200);</div><div class='del'>-</div><div class='del'>-label_done:</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_supported_feature;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_bt_coex_supported_version(void *btc_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer[4] = {0};</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;bt_info.bt_supported_version)</div><div class='del'>-		goto label_done;</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist,</div><div class='del'>-				    BT_OP_GET_BT_COEX_SUPPORTED_VERSION,</div><div class='del'>-				    cmd_buffer, 4, 200);</div><div class='del'>-</div><div class='del'>-label_done:</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_supported_version;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	/* return value:</div><div class='del'>-	 * [31:16] =&gt; connected port number</div><div class='del'>-	 * [15:0]  =&gt; port connected bit define</div><div class='del'>-	 */</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtlpriv);</div><div class='del'>-	u32 ret_val = 0;</div><div class='del'>-	u32 port_connected_status = 0, num_of_connected_port = 0;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;opmode == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    mac-&gt;link_state &gt;= MAC80211_LINKED) {</div><div class='del'>-		port_connected_status |= WIFI_STA_CONNECTED;</div><div class='del'>-		num_of_connected_port++;</div><div class='del'>-	}</div><div class='del'>-	/* AP &amp; ADHOC &amp; MESH */</div><div class='del'>-	if (is_any_client_connect_to_ap(btcoexist)) {</div><div class='del'>-		port_connected_status |= WIFI_AP_CONNECTED;</div><div class='del'>-		num_of_connected_port++;</div><div class='del'>-	}</div><div class='del'>-	/* TODO: P2P Connected Status */</div><div class='del'>-</div><div class='del'>-	ret_val = (num_of_connected_port &lt;&lt; 16) | port_connected_status;</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)void_btcoexist;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtlpriv);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-	bool *bool_tmp = (bool *)out_buf;</div><div class='del'>-	int *s32_tmp = (int *)out_buf;</div><div class='del'>-	u32 *u32_tmp = (u32 *)out_buf;</div><div class='del'>-	u8 *u8_tmp = (u8 *)out_buf;</div><div class='del'>-	bool tmp = false;</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	switch (get_type) {</div><div class='del'>-	case BTC_GET_BL_HS_OPERATION:</div><div class='del'>-		*bool_tmp = false;</div><div class='del'>-		ret = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_HS_CONNECTING:</div><div class='del'>-		*bool_tmp = false;</div><div class='del'>-		ret = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_CONNECTED:</div><div class='del'>-		if (rtlpriv-&gt;mac80211.opmode == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-		    rtlpriv-&gt;mac80211.link_state &gt;= MAC80211_LINKED)</div><div class='del'>-			tmp = true;</div><div class='del'>-		if (is_any_client_connect_to_ap(btcoexist))</div><div class='del'>-			tmp = true;</div><div class='del'>-		*bool_tmp = tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_BUSY:</div><div class='del'>-		if (halbtc_is_wifi_busy(rtlpriv))</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_SCAN:</div><div class='del'>-		if (mac-&gt;act_scanning)</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_LINK:</div><div class='del'>-		if (mac-&gt;link_state == MAC80211_LINKING)</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_ROAM:</div><div class='del'>-		if (mac-&gt;link_state == MAC80211_LINKING)</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_4_WAY_PROGRESS:</div><div class='del'>-		*bool_tmp = rtlpriv-&gt;btcoexist.btc_info.in_4way;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_UNDER_5G:</div><div class='del'>-		if (rtlhal-&gt;current_bandtype == BAND_ON_5G)</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_AP_MODE_ENABLE:</div><div class='del'>-		if (mac-&gt;opmode == NL80211_IFTYPE_AP)</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_ENABLE_ENCRYPTION:</div><div class='del'>-		if (rtlpriv-&gt;sec.pairwise_enc_algorithm == NO_ENCRYPTION)</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_UNDER_B_MODE:</div><div class='del'>-		if (rtlpriv-&gt;mac80211.mode == WIRELESS_MODE_B)</div><div class='del'>-			*bool_tmp = true;</div><div class='del'>-		else</div><div class='del'>-			*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_EXT_SWITCH:</div><div class='del'>-		*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_WIFI_IS_IN_MP_MODE:</div><div class='del'>-		*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_IS_ASUS_8723B:</div><div class='del'>-		*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_BL_RF4CE_CONNECTED:</div><div class='del'>-		*bool_tmp = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_S4_WIFI_RSSI:</div><div class='del'>-		*s32_tmp = rtlpriv-&gt;dm.undec_sm_pwdb;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_S4_HS_RSSI:</div><div class='del'>-		*s32_tmp = 0;</div><div class='del'>-		ret = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_BW:</div><div class='del'>-		*u32_tmp = halbtc_get_wifi_bw(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_TRAFFIC_DIRECTION:</div><div class='del'>-		if (halbtc_is_wifi_uplink(rtlpriv))</div><div class='del'>-			*u32_tmp = BTC_WIFI_TRAFFIC_TX;</div><div class='del'>-		else</div><div class='del'>-			*u32_tmp = BTC_WIFI_TRAFFIC_RX;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_FW_VER:</div><div class='del'>-		*u32_tmp = (rtlhal-&gt;fw_version &lt;&lt; 16) | rtlhal-&gt;fw_subversion;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_LINK_STATUS:</div><div class='del'>-		*u32_tmp = halbtc_get_wifi_link_status(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_BT_PATCH_VER:</div><div class='del'>-		*u32_tmp = halbtc_get_bt_patch_version(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_VENDOR:</div><div class='del'>-		*u32_tmp = BTC_VENDOR_OTHER;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_SUPPORTED_VERSION:</div><div class='del'>-		*u32_tmp = halbtc_get_bt_coex_supported_version(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_SUPPORTED_FEATURE:</div><div class='del'>-		*u32_tmp = halbtc_get_bt_coex_supported_feature(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_IQK_TOTAL:</div><div class='del'>-		*u32_tmp = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-								  "IQK_TOTAL");</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_IQK_OK:</div><div class='del'>-		*u32_tmp = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-								  "IQK_OK");</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U4_WIFI_IQK_FAIL:</div><div class='del'>-		*u32_tmp = btcoexist-&gt;btc_phydm_query_phy_counter(btcoexist,</div><div class='del'>-								  "IQK_FAIL");</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U1_WIFI_DOT11_CHNL:</div><div class='del'>-		*u8_tmp = rtlphy-&gt;current_channel;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U1_WIFI_CENTRAL_CHNL:</div><div class='del'>-		*u8_tmp = halbtc_get_wifi_central_chnl(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U1_WIFI_HS_CHNL:</div><div class='del'>-		*u8_tmp = 0;</div><div class='del'>-		ret = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U1_AP_NUM:</div><div class='del'>-		*u8_tmp = rtlpriv-&gt;btcoexist.btc_info.ap_num;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U1_ANT_TYPE:</div><div class='del'>-		*u8_tmp = (u8)BTC_ANT_TYPE_0;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_GET_U1_IOT_PEER:</div><div class='del'>-		*u8_tmp = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		/************* 1Ant **************/</div><div class='del'>-	case BTC_GET_U1_LPS_MODE:</div><div class='del'>-		*u8_tmp = btcoexist-&gt;pwr_mode_val[0];</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = false;</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 bool halbtc_set(void *void_btcoexist, u8 set_type, void *in_buf)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)void_btcoexist;</div><div class='del'>-	bool *bool_tmp = (bool *)in_buf;</div><div class='del'>-	u8 *u8_tmp = (u8 *)in_buf;</div><div class='del'>-	u32 *u32_tmp = (u32 *)in_buf;</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	switch (set_type) {</div><div class='del'>-	/* set some bool type variables. */</div><div class='del'>-	case BTC_SET_BL_BT_DISABLE:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_disabled = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_BT_TRAFFIC_BUSY:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_busy = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_BT_LIMITED_DIG:</div><div class='del'>-		btcoexist-&gt;bt_info.limited_dig = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_FORCE_TO_ROAM:</div><div class='del'>-		btcoexist-&gt;bt_info.force_to_roam = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_TO_REJ_AP_AGG_PKT:</div><div class='del'>-		btcoexist-&gt;bt_info.reject_agg_pkt = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_BT_CTRL_AGG_SIZE:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_ctrl_agg_buf_size = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_INC_SCAN_DEV_NUM:</div><div class='del'>-		btcoexist-&gt;bt_info.increase_scan_dev_num = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_BT_TX_RX_MASK:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_tx_rx_mask = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_BL_MIRACAST_PLUS_BT:</div><div class='del'>-		btcoexist-&gt;bt_info.miracast_plus_bt = *bool_tmp;</div><div class='del'>-		break;</div><div class='del'>-		/* set some u1Byte type variables. */</div><div class='del'>-	case BTC_SET_U1_RSSI_ADJ_VAL_FOR_AGC_TABLE_ON:</div><div class='del'>-		btcoexist-&gt;bt_info.rssi_adjust_for_agc_table_on = *u8_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_U1_AGG_BUF_SIZE:</div><div class='del'>-		btcoexist-&gt;bt_info.agg_buf_size = *u8_tmp;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* the following are some action which will be triggered */</div><div class='del'>-	case BTC_SET_ACT_GET_BT_RSSI:</div><div class='del'>-		ret = false;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_AGGREGATE_CTRL:</div><div class='del'>-		halbtc_aggregation_check(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* 1Ant */</div><div class='del'>-	case BTC_SET_U1_RSSI_ADJ_VAL_FOR_1ANT_COEX_TYPE:</div><div class='del'>-		btcoexist-&gt;bt_info.rssi_adjust_for_1ant_coex_type = *u8_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_UI_SCAN_SIG_COMPENSATION:</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_U1_LPS_VAL:</div><div class='del'>-		btcoexist-&gt;bt_info.lps_val = *u8_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_U1_RPWM_VAL:</div><div class='del'>-		btcoexist-&gt;bt_info.rpwm_val = *u8_tmp;</div><div class='del'>-		break;</div><div class='del'>-	/* the following are some action which will be triggered  */</div><div class='del'>-	case BTC_SET_ACT_LEAVE_LPS:</div><div class='del'>-		halbtc_leave_lps(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_ENTER_LPS:</div><div class='del'>-		halbtc_enter_lps(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_NORMAL_LPS:</div><div class='del'>-		halbtc_normal_lps(btcoexist);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_DISABLE_LOW_POWER:</div><div class='del'>-		halbtc_disable_low_power(btcoexist, *bool_tmp);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_UPDATE_RAMASK:</div><div class='del'>-		btcoexist-&gt;bt_info.ra_mask = *u32_tmp;</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_SEND_MIMO_PS:</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_CTRL_BT_INFO: /*wait for 8812/8821*/</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_CTRL_BT_COEX:</div><div class='del'>-		break;</div><div class='del'>-	case BTC_SET_ACT_CTRL_8723B_ANT:</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='del'>-static void halbtc_display_coex_statistics(struct btc_coexist *btcoexist,</div><div class='del'>-					   struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_display_bt_link_info(struct btc_coexist *btcoexist,</div><div class='del'>-					struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_display_wifi_status(struct btc_coexist *btcoexist,</div><div class='del'>-				       struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	s32 wifi_rssi = 0, bt_hs_rssi = 0;</div><div class='del'>-	bool scan = false, link = false, roam = false, wifi_busy = false;</div><div class='del'>-	bool wifi_under_b_mode = false, wifi_under_5g = false;</div><div class='del'>-	u32 wifi_bw = BTC_WIFI_BW_HT20;</div><div class='del'>-	u32 wifi_traffic_dir = BTC_WIFI_TRAFFIC_TX;</div><div class='del'>-	u32 wifi_freq = BTC_FREQ_2_4G;</div><div class='del'>-	u32 wifi_link_status = 0x0;</div><div class='del'>-	bool bt_hs_on = false, under_ips = false, under_lps = false;</div><div class='del'>-	bool low_power = false, dc_mode = false;</div><div class='del'>-	u8 wifi_chnl = 0, wifi_hs_chnl = 0;</div><div class='del'>-	u8 ap_num = 0;</div><div class='del'>-</div><div class='del'>-	wifi_link_status = halbtc_get_wifi_link_status(btcoexist);</div><div class='del'>-	seq_printf(m, "\n %-35s = %d/ %d/ %d/ %d/ %d",</div><div class='del'>-		   "STA/vWifi/HS/p2pGo/p2pGc",</div><div class='del'>-		   ((wifi_link_status &amp; WIFI_STA_CONNECTED) ? 1 : 0),</div><div class='del'>-		   ((wifi_link_status &amp; WIFI_AP_CONNECTED) ? 1 : 0),</div><div class='del'>-		   ((wifi_link_status &amp; WIFI_HS_CONNECTED) ? 1 : 0),</div><div class='del'>-		   ((wifi_link_status &amp; WIFI_P2P_GO_CONNECTED) ? 1 : 0),</div><div class='del'>-		   ((wifi_link_status &amp; WIFI_P2P_GC_CONNECTED) ? 1 : 0));</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &amp;bt_hs_on);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_WIFI_DOT11_CHNL, &amp;wifi_chnl);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_WIFI_HS_CHNL, &amp;wifi_hs_chnl);</div><div class='del'>-	seq_printf(m, "\n %-35s = %d / %d(%d)",</div><div class='del'>-		   "Dot11 channel / HsChnl(High Speed)",</div><div class='del'>-		   wifi_chnl, wifi_hs_chnl, bt_hs_on);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, &amp;wifi_rssi);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_S4_HS_RSSI, &amp;bt_hs_rssi);</div><div class='del'>-	seq_printf(m, "\n %-35s = %d/ %d",</div><div class='del'>-		   "Wifi rssi/ HS rssi",</div><div class='del'>-		   wifi_rssi - 100, bt_hs_rssi - 100);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_SCAN, &amp;scan);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &amp;link);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &amp;roam);</div><div class='del'>-	seq_printf(m, "\n %-35s = %d/ %d/ %d ",</div><div class='del'>-		   "Wifi link/ roam/ scan",</div><div class='del'>-		   link, roam, scan);</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &amp;wifi_under_5g);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &amp;wifi_bw);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &amp;wifi_busy);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,</div><div class='del'>-			   &amp;wifi_traffic_dir);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_U1_AP_NUM, &amp;ap_num);</div><div class='del'>-	wifi_freq = (wifi_under_5g ? BTC_FREQ_5G : BTC_FREQ_2_4G);</div><div class='del'>-	btcoexist-&gt;btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-			   &amp;wifi_under_b_mode);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\n %-35s = %s / %s/ %s/ AP=%d ",</div><div class='del'>-		   "Wifi freq/ bw/ traffic",</div><div class='del'>-		   gl_btc_wifi_freq_string[wifi_freq],</div><div class='del'>-		   ((wifi_under_b_mode) ? "11b" :</div><div class='del'>-		    gl_btc_wifi_bw_string[wifi_bw]),</div><div class='del'>-		   ((!wifi_busy) ? "idle" : ((BTC_WIFI_TRAFFIC_TX ==</div><div class='del'>-					      wifi_traffic_dir) ? "uplink" :</div><div class='del'>-					     "downlink")),</div><div class='del'>-		   ap_num);</div><div class='del'>-</div><div class='del'>-	/* power status	 */</div><div class='del'>-	dc_mode = true;	/*TODO*/</div><div class='del'>-	under_ips = rtlpriv-&gt;psc.inactive_pwrstate == ERFOFF ? 1 : 0;</div><div class='del'>-	under_lps = rtlpriv-&gt;psc.dot11_psmode == EACTIVE ? 0 : 1;</div><div class='del'>-	low_power = 0; /*TODO*/</div><div class='del'>-	seq_printf(m, "\n %-35s = %s%s%s%s",</div><div class='del'>-		   "Power Status",</div><div class='del'>-		   (dc_mode ? "DC mode" : "AC mode"),</div><div class='del'>-		   (under_ips ? ", IPS ON" : ""),</div><div class='del'>-		   (under_lps ? ", LPS ON" : ""),</div><div class='del'>-		   (low_power ? ", 32k" : ""));</div><div class='del'>-</div><div class='del'>-	seq_printf(m,</div><div class='del'>-		   "\n %-35s = %02x %02x %02x %02x %02x %02x (0x%x/0x%x)",</div><div class='del'>-		   "Power mode cmd(lps/rpwm)",</div><div class='del'>-		   btcoexist-&gt;pwr_mode_val[0], btcoexist-&gt;pwr_mode_val[1],</div><div class='del'>-		   btcoexist-&gt;pwr_mode_val[2], btcoexist-&gt;pwr_mode_val[3],</div><div class='del'>-		   btcoexist-&gt;pwr_mode_val[4], btcoexist-&gt;pwr_mode_val[5],</div><div class='del'>-		   btcoexist-&gt;bt_info.lps_val,</div><div class='del'>-		   btcoexist-&gt;bt_info.rpwm_val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/************************************************************</div><div class='del'>- *		IO related function</div><div class='del'>- ************************************************************/</div><div class='del'>-static u8 halbtc_read_1byte(void *bt_context, u32 reg_addr)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	return	rtl_read_byte(rtlpriv, reg_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 halbtc_read_2byte(void *bt_context, u32 reg_addr)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	return	rtl_read_word(rtlpriv, reg_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_read_4byte(void *bt_context, u32 reg_addr)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	return	rtl_read_dword(rtlpriv, reg_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_write_1byte(void *bt_context, u32 reg_addr, u32 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, reg_addr, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_bitmask_write_1byte(void *bt_context, u32 reg_addr,</div><div class='del'>-				       u32 bit_mask, u8 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 original_value, bit_shift = 0;</div><div class='del'>-	u8 i;</div><div class='del'>-</div><div class='del'>-	if (bit_mask != MASKDWORD) {/*if not "double word" write*/</div><div class='del'>-		original_value = rtl_read_byte(rtlpriv, reg_addr);</div><div class='del'>-		for (i = 0; i &lt;= 7; i++) {</div><div class='del'>-			if ((bit_mask &gt;&gt; i) &amp; 0x1)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		bit_shift = i;</div><div class='del'>-		data = (original_value &amp; (~bit_mask)) |</div><div class='del'>-			((data &lt;&lt; bit_shift) &amp; bit_mask);</div><div class='del'>-	}</div><div class='del'>-	rtl_write_byte(rtlpriv, reg_addr, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_write_2byte(void *bt_context, u32 reg_addr, u16 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtl_write_word(rtlpriv, reg_addr, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_write_4byte(void *bt_context, u32 reg_addr, u32 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist =</div><div class='del'>-		(struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtl_write_dword(rtlpriv, reg_addr, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_write_local_reg_1byte(void *btc_context, u32 reg_addr,</div><div class='del'>-					 u8 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;chip_interface == BTC_INTF_SDIO)</div><div class='del'>-		;</div><div class='del'>-	else if (btcoexist-&gt;chip_interface == BTC_INTF_PCI)</div><div class='del'>-		rtl_write_byte(rtlpriv, reg_addr, data);</div><div class='del'>-	else if (btcoexist-&gt;chip_interface == BTC_INTF_USB)</div><div class='del'>-		rtl_write_byte(rtlpriv, reg_addr, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_set_bbreg(void *bt_context, u32 reg_addr, u32 bit_mask,</div><div class='del'>-			     u32 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtl_set_bbreg(rtlpriv-&gt;mac80211.hw, reg_addr, bit_mask, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_bbreg(void *bt_context, u32 reg_addr, u32 bit_mask)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	return rtl_get_bbreg(rtlpriv-&gt;mac80211.hw, reg_addr, bit_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_set_rfreg(void *bt_context, u8 rf_path, u32 reg_addr,</div><div class='del'>-			     u32 bit_mask, u32 data)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtl_set_rfreg(rtlpriv-&gt;mac80211.hw, rf_path, reg_addr, bit_mask, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_rfreg(void *bt_context, u8 rf_path, u32 reg_addr,</div><div class='del'>-			    u32 bit_mask)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	return rtl_get_rfreg(rtlpriv-&gt;mac80211.hw, rf_path, reg_addr, bit_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_fill_h2c_cmd(void *bt_context, u8 element_id,</div><div class='del'>-				u32 cmd_len, u8 *cmd_buf)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;fill_h2c_cmd(rtlpriv-&gt;mac80211.hw, element_id,</div><div class='del'>-					cmd_len, cmd_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_send_wifi_port_id_cmd(void *bt_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	u8 cmd_buf[1] = {0};	/* port id [2:0] = 0 */</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;fill_h2c_cmd(rtlpriv-&gt;mac80211.hw, 0x71, 1,</div><div class='del'>-					cmd_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_set_default_port_id_cmd(void *bt_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;mac80211.hw;</div><div class='del'>-</div><div class='del'>-	if (!rtlpriv-&gt;cfg-&gt;ops-&gt;set_default_port_id_cmd)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_default_port_id_cmd(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-void halbtc_set_bt_reg(void *btc_context, u8 reg_type, u32 offset, u32 set_val)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer1[4] = {0};</div><div class='del'>-	u8 cmd_buffer2[4] = {0};</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	*((__le16 *)&amp;cmd_buffer1[2]) = cpu_to_le16((u16)set_val);</div><div class='del'>-	if (!halbtc_send_bt_mp_operation(btcoexist, BT_OP_WRITE_REG_VALUE,</div><div class='del'>-					 cmd_buffer1, 4, 200))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	cmd_buffer2[2] = reg_type;</div><div class='del'>-	*((u8 *)&amp;cmd_buffer2[3]) = (u8)offset;</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist, BT_OP_WRITE_REG_ADDR,</div><div class='del'>-				    cmd_buffer2, 4, 200);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void halbtc_display_dbg_msg(void *bt_context, u8 disp_type,</div><div class='del'>-				   struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;</div><div class='del'>-</div><div class='del'>-	switch (disp_type) {</div><div class='del'>-	case BTC_DBG_DISP_COEX_STATISTICS:</div><div class='del'>-		halbtc_display_coex_statistics(btcoexist, m);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_DBG_DISP_BT_LINK_INFO:</div><div class='del'>-		halbtc_display_bt_link_info(btcoexist, m);</div><div class='del'>-		break;</div><div class='del'>-	case BTC_DBG_DISP_WIFI_STATUS:</div><div class='del'>-		halbtc_display_wifi_status(btcoexist, m);</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 u32 halbtc_get_bt_reg(void *btc_context, u8 reg_type, u32 offset)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-u32 halbtc_get_phydm_version(void *btc_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;phydm.ops)</div><div class='del'>-		return rtlpriv-&gt;phydm.ops-&gt;phydm_get_version(rtlpriv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-void halbtc_phydm_modify_ra_pcr_threshold(void *btc_context,</div><div class='del'>-					  u8 ra_offset_direction,</div><div class='del'>-					  u8 ra_threshold_offset)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_phydm_ops *phydm_ops = rtlpriv-&gt;phydm.ops;</div><div class='del'>-</div><div class='del'>-	if (phydm_ops)</div><div class='del'>-		phydm_ops-&gt;phydm_modify_ra_pcr_threshold(rtlpriv,</div><div class='del'>-							 ra_offset_direction,</div><div class='del'>-							 ra_threshold_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-u32 halbtc_phydm_query_phy_counter(void *btc_context, const char *info_type)</div><div class='del'>-{</div><div class='del'>-	/* info_type may be strings below:</div><div class='del'>-	 * PHYDM_INFO_FA_OFDM, PHYDM_INFO_FA_CCK, PHYDM_INFO_CCA_OFDM,</div><div class='del'>-	 * PHYDM_INFO_CCA_CCK</div><div class='del'>-	 * IQK_TOTAL, IQK_OK, IQK_FAIL</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	struct rtl_priv *rtlpriv = btcoexist-&gt;adapter;</div><div class='del'>-	struct rtl_phydm_ops *phydm_ops = rtlpriv-&gt;phydm.ops;</div><div class='del'>-</div><div class='del'>-	if (phydm_ops)</div><div class='del'>-		return phydm_ops-&gt;phydm_query_counter(rtlpriv, info_type);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 halbtc_get_ant_det_val_from_bt(void *btc_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer[4] = {0};</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_BT_ANT_DET_VAL,</div><div class='del'>-				    cmd_buffer, 4, 200);</div><div class='del'>-</div><div class='del'>-	/* need wait completion to return correct value */</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_ant_det_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 halbtc_get_ble_scan_type_from_bt(void *btc_context)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer[4] = {0};</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_BT_BLE_SCAN_TYPE,</div><div class='del'>-				    cmd_buffer, 4, 200);</div><div class='del'>-</div><div class='del'>-	/* need wait completion to return correct value */</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_ble_scan_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 halbtc_get_ble_scan_para_from_bt(void *btc_context, u8 scan_type)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer[4] = {0};</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_BT_BLE_SCAN_PARA,</div><div class='del'>-				    cmd_buffer, 4, 200);</div><div class='del'>-</div><div class='del'>-	/* need wait completion to return correct value */</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_ble_scan_para;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool halbtc_get_bt_afh_map_from_bt(void *btc_context, u8 map_type,</div><div class='del'>-					  u8 *afh_map)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context;</div><div class='del'>-	u8 cmd_buffer[2] = {0};</div><div class='del'>-	bool ret;</div><div class='del'>-	u32 *afh_map_l = (u32 *)afh_map;</div><div class='del'>-	u32 *afh_map_m = (u32 *)(afh_map + 4);</div><div class='del'>-	u16 *afh_map_h = (u16 *)(afh_map + 8);</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	ret = halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_AFH_MAP_L,</div><div class='del'>-					  cmd_buffer, 2, 200);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	*afh_map_l = btcoexist-&gt;bt_info.afh_map_l;</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	ret = halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_AFH_MAP_M,</div><div class='del'>-					  cmd_buffer, 2, 200);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	*afh_map_m = btcoexist-&gt;bt_info.afh_map_m;</div><div class='del'>-</div><div class='del'>-	/* cmd_buffer[0] and [1] is filled by halbtc_send_bt_mp_operation() */</div><div class='del'>-	ret = halbtc_send_bt_mp_operation(btcoexist, BT_OP_GET_AFH_MAP_H,</div><div class='del'>-					  cmd_buffer, 2, 200);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	*afh_map_h = btcoexist-&gt;bt_info.afh_map_h;</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************</div><div class='del'>- *         Extern functions called by other module</div><div class='del'>- *****************************************************************/</div><div class='del'>-bool exhalbtc_initlize_variables(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	halbtc_dbg_init();</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_read_1byte = halbtc_read_1byte;</div><div class='del'>-	btcoexist-&gt;btc_write_1byte = halbtc_write_1byte;</div><div class='del'>-	btcoexist-&gt;btc_write_1byte_bitmask = halbtc_bitmask_write_1byte;</div><div class='del'>-	btcoexist-&gt;btc_read_2byte = halbtc_read_2byte;</div><div class='del'>-	btcoexist-&gt;btc_write_2byte = halbtc_write_2byte;</div><div class='del'>-	btcoexist-&gt;btc_read_4byte = halbtc_read_4byte;</div><div class='del'>-	btcoexist-&gt;btc_write_4byte = halbtc_write_4byte;</div><div class='del'>-	btcoexist-&gt;btc_write_local_reg_1byte = halbtc_write_local_reg_1byte;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set_bb_reg = halbtc_set_bbreg;</div><div class='del'>-	btcoexist-&gt;btc_get_bb_reg = halbtc_get_bbreg;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_set_rf_reg = halbtc_set_rfreg;</div><div class='del'>-	btcoexist-&gt;btc_get_rf_reg = halbtc_get_rfreg;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_fill_h2c = halbtc_fill_h2c_cmd;</div><div class='del'>-	btcoexist-&gt;btc_disp_dbg_msg = halbtc_display_dbg_msg;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get = halbtc_get;</div><div class='del'>-	btcoexist-&gt;btc_set = halbtc_set;</div><div class='del'>-	btcoexist-&gt;btc_set_bt_reg = halbtc_set_bt_reg;</div><div class='del'>-	btcoexist-&gt;btc_get_bt_reg = halbtc_get_bt_reg;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.bt_ctrl_buf_size = false;</div><div class='del'>-	btcoexist-&gt;bt_info.agg_buf_size = 5;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.increase_scan_dev_num = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;btc_get_bt_coex_supported_feature =</div><div class='del'>-					halbtc_get_bt_coex_supported_feature;</div><div class='del'>-	btcoexist-&gt;btc_get_bt_coex_supported_version =</div><div class='del'>-					halbtc_get_bt_coex_supported_version;</div><div class='del'>-	btcoexist-&gt;btc_get_bt_phydm_version = halbtc_get_phydm_version;</div><div class='del'>-	btcoexist-&gt;btc_phydm_modify_ra_pcr_threshold =</div><div class='del'>-					halbtc_phydm_modify_ra_pcr_threshold;</div><div class='del'>-	btcoexist-&gt;btc_phydm_query_phy_counter = halbtc_phydm_query_phy_counter;</div><div class='del'>-	btcoexist-&gt;btc_get_ant_det_val_from_bt = halbtc_get_ant_det_val_from_bt;</div><div class='del'>-	btcoexist-&gt;btc_get_ble_scan_type_from_bt =</div><div class='del'>-					halbtc_get_ble_scan_type_from_bt;</div><div class='del'>-	btcoexist-&gt;btc_get_ble_scan_para_from_bt =</div><div class='del'>-					halbtc_get_ble_scan_para_from_bt;</div><div class='del'>-	btcoexist-&gt;btc_get_bt_afh_map_from_bt =</div><div class='del'>-					halbtc_get_bt_afh_map_from_bt;</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;btcoexist-&gt;bt_mp_comp);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool exhalbtc_initlize_variables_wifi_only(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);</div><div class='del'>-	struct wifi_only_haldata *wifionly_haldata;</div><div class='del'>-</div><div class='del'>-	if (!wifionly_cfg)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	wifionly_cfg-&gt;adapter = rtlpriv;</div><div class='del'>-</div><div class='del'>-	switch (rtlpriv-&gt;rtlhal.interface) {</div><div class='del'>-	case INTF_PCI:</div><div class='del'>-		wifionly_cfg-&gt;chip_interface = WIFIONLY_INTF_PCI;</div><div class='del'>-		break;</div><div class='del'>-	case INTF_USB:</div><div class='del'>-		wifionly_cfg-&gt;chip_interface = WIFIONLY_INTF_USB;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		wifionly_cfg-&gt;chip_interface = WIFIONLY_INTF_UNKNOWN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wifionly_haldata = &amp;wifionly_cfg-&gt;haldata_info;</div><div class='del'>-</div><div class='del'>-	wifionly_haldata-&gt;customer_id = CUSTOMER_NORMAL;</div><div class='del'>-	wifionly_haldata-&gt;efuse_pg_antnum = rtl_get_hwpg_ant_num(rtlpriv);</div><div class='del'>-	wifionly_haldata-&gt;efuse_pg_antpath =</div><div class='del'>-					rtl_get_hwpg_single_ant_path(rtlpriv);</div><div class='del'>-	wifionly_haldata-&gt;rfe_type = rtl_get_hwpg_rfe_type(rtlpriv);</div><div class='del'>-	wifionly_haldata-&gt;ant_div_cfg = 0;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool exhalbtc_bind_bt_coex_withadapter(void *adapter)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = adapter;</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-	u8 ant_num = 2, chip_type, single_ant_path = 0;</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;binded)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	switch (rtlpriv-&gt;rtlhal.interface) {</div><div class='del'>-	case INTF_PCI:</div><div class='del'>-		btcoexist-&gt;chip_interface = BTC_INTF_PCI;</div><div class='del'>-		break;</div><div class='del'>-	case INTF_USB:</div><div class='del'>-		btcoexist-&gt;chip_interface = BTC_INTF_USB;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		btcoexist-&gt;chip_interface = BTC_INTF_UNKNOWN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;binded = true;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_bind++;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;adapter = adapter;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;stack_info.profile_notified = false;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.bt_ctrl_agg_buf_size = false;</div><div class='del'>-	btcoexist-&gt;bt_info.agg_buf_size = 5;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.increase_scan_dev_num = false;</div><div class='del'>-	btcoexist-&gt;bt_info.miracast_plus_bt = false;</div><div class='del'>-</div><div class='del'>-	chip_type = rtl_get_hwpg_bt_type(rtlpriv);</div><div class='del'>-	exhalbtc_set_chip_type(btcoexist, chip_type);</div><div class='del'>-	ant_num = rtl_get_hwpg_ant_num(rtlpriv);</div><div class='del'>-	exhalbtc_set_ant_num(rtlpriv, BT_COEX_ANT_TYPE_PG, ant_num);</div><div class='del'>-</div><div class='del'>-	/* set default antenna position to main  port */</div><div class='del'>-	btcoexist-&gt;board_info.btdm_ant_pos = BTC_ANTENNA_AT_MAIN_PORT;</div><div class='del'>-</div><div class='del'>-	single_ant_path = rtl_get_hwpg_single_ant_path(rtlpriv);</div><div class='del'>-	exhalbtc_set_single_ant_path(btcoexist, single_ant_path);</div><div class='del'>-</div><div class='del'>-	if (rtl_get_hwpg_package_type(rtlpriv) == 0)</div><div class='del'>-		btcoexist-&gt;board_info.tfbga_package = false;</div><div class='del'>-	else if (rtl_get_hwpg_package_type(rtlpriv) == 1)</div><div class='del'>-		btcoexist-&gt;board_info.tfbga_package = false;</div><div class='del'>-	else</div><div class='del'>-		btcoexist-&gt;board_info.tfbga_package = true;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;board_info.tfbga_package)</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Package Type = TFBGA\n");</div><div class='del'>-	else</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-			 "[BTCoex], Package Type = Non-TFBGA\n");</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;board_info.rfe_type = rtl_get_hwpg_rfe_type(rtlpriv);</div><div class='del'>-	btcoexist-&gt;board_info.ant_div_cfg = 0;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_power_on_setting(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;statistics.cnt_power_on++;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_power_on_setting(btcoexist);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_power_on_setting(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_pre_load_firmware(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;statistics.cnt_pre_load_firmware++;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_pre_load_firmware(btcoexist);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_pre_load_firmware(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_init_hw_config(struct btc_coexist *btcoexist, bool wifi_only)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;statistics.cnt_init_hw_config++;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_init_hw_config(btcoexist, wifi_only);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_init_hw_config(btcoexist, wifi_only);</div><div class='del'>-</div><div class='del'>-		halbtc_set_default_port_id_cmd(btcoexist);</div><div class='del'>-		halbtc_send_wifi_port_id_cmd(btcoexist);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_init_hw_config_wifi_only(struct wifi_only_cfg *wifionly_cfg)</div><div class='del'>-{</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(wifionly_cfg-&gt;adapter))</div><div class='del'>-		ex_hal8822b_wifi_only_hw_config(wifionly_cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_init_coex_dm(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;statistics.cnt_init_coex_dm++;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_init_coex_dm(btcoexist);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_init_coex_dm(btcoexist);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;initilized = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_ips_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	u8 ips_type;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_ips_notify++;</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == ERFOFF)</div><div class='del'>-		ips_type = BTC_IPS_ENTER;</div><div class='del'>-	else</div><div class='del'>-		ips_type = BTC_IPS_LEAVE;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_ips_notify(btcoexist, ips_type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_ips_notify(btcoexist, ips_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_lps_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	u8 lps_type;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_lps_notify++;</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == EACTIVE)</div><div class='del'>-		lps_type = BTC_LPS_DISABLE;</div><div class='del'>-	else</div><div class='del'>-		lps_type = BTC_LPS_ENABLE;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_lps_notify(btcoexist, lps_type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_lps_notify(btcoexist, lps_type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_scan_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	u8 scan_type;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_scan_notify++;</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type)</div><div class='del'>-		scan_type = BTC_SCAN_START;</div><div class='del'>-	else</div><div class='del'>-		scan_type = BTC_SCAN_FINISH;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_scan_notify(btcoexist, scan_type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_scan_notify(btcoexist, scan_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_scan_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,</div><div class='del'>-				    u8 is_5g)</div><div class='del'>-{</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(wifionly_cfg-&gt;adapter))</div><div class='del'>-		ex_hal8822b_wifi_only_scannotify(wifionly_cfg, is_5g);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action)</div><div class='del'>-{</div><div class='del'>-	u8 asso_type;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_connect_notify++;</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (action)</div><div class='del'>-		asso_type = BTC_ASSOCIATE_START;</div><div class='del'>-	else</div><div class='del'>-		asso_type = BTC_ASSOCIATE_FINISH;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_connect_notify(btcoexist, asso_type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_connect_notify(btcoexist, asso_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_mediastatus_notify(struct btc_coexist *btcoexist,</div><div class='del'>-				 enum rt_media_status media_status)</div><div class='del'>-{</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_media_status_notify++;</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (media_status == RT_MEDIA_CONNECT)</div><div class='del'>-		status = BTC_MEDIA_CONNECT;</div><div class='del'>-	else</div><div class='del'>-		status = BTC_MEDIA_DISCONNECT;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_media_status_notify(btcoexist, status);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_media_status_notify(btcoexist, status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_special_packet_notify(struct btc_coexist *btcoexist, u8 pkt_type)</div><div class='del'>-{</div><div class='del'>-	u8 packet_type;</div><div class='del'>-</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_special_packet_notify++;</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (pkt_type == PACKET_DHCP) {</div><div class='del'>-		packet_type = BTC_PACKET_DHCP;</div><div class='del'>-	} else if (pkt_type == PACKET_EAPOL) {</div><div class='del'>-		packet_type = BTC_PACKET_EAPOL;</div><div class='del'>-	} else if (pkt_type == PACKET_ARP) {</div><div class='del'>-		packet_type = BTC_PACKET_ARP;</div><div class='del'>-	} else {</div><div class='del'>-		packet_type = BTC_PACKET_UNKNOWN;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_specific_packet_notify(btcoexist,</div><div class='del'>-							       packet_type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_specific_packet_notify(btcoexist,</div><div class='del'>-							       packet_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_bt_info_notify(struct btc_coexist *btcoexist,</div><div class='del'>-			     u8 *tmp_buf, u8 length)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_bt_info_notify++;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_bt_info_notify(btcoexist, tmp_buf,</div><div class='del'>-						       length);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_bt_info_notify(btcoexist, tmp_buf,</div><div class='del'>-						       length);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_rf_status_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_rf_status_notify(btcoexist, type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_rf_status_notify(btcoexist, type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_stack_operation_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_stack_operation_notify++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_halt_notify(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_halt_notify(btcoexist);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_halt_notify(btcoexist);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;binded = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* currently only 1ant we have to do the notification,</div><div class='del'>-	 * once pnp is notified to sleep state, we have to leave LPS that</div><div class='del'>-	 * we can sleep normally.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_pnp_notify(btcoexist, pnp_state);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_pnp_notify(btcoexist, pnp_state);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_coex_dm_switch(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_coex_dm_switch++;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_periodical(struct btc_coexist *btcoexist)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_periodical++;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_periodical(btcoexist);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_periodical(btcoexist);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_dbg_control(struct btc_coexist *btcoexist,</div><div class='del'>-			  u8 code, u8 len, u8 *data)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-	btcoexist-&gt;statistics.cnt_dbg_ctrl++;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_antenna_detection(struct btc_coexist *btcoexist, u32 cent_freq,</div><div class='del'>-				u32 offset, u32 span, u32 seconds)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_stack_update_profile_info(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_update_min_bt_rssi(struct btc_coexist *btcoexist, s8 bt_rssi)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;stack_info.min_bt_rssi = bt_rssi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_set_hci_version(struct btc_coexist *btcoexist, u16 hci_version)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;stack_info.hci_version = hci_version;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_set_bt_patch_version(struct btc_coexist *btcoexist,</div><div class='del'>-				   u16 bt_hci_version, u16 bt_patch_version)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btcoexist-&gt;bt_info.bt_real_fw_ver = bt_patch_version;</div><div class='del'>-	btcoexist-&gt;bt_info.bt_hci_ver = bt_hci_version;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_set_chip_type(struct btc_coexist *btcoexist, u8 chip_type)</div><div class='del'>-{</div><div class='del'>-	switch (chip_type) {</div><div class='del'>-	default:</div><div class='del'>-	case BT_2WIRE:</div><div class='del'>-	case BT_ISSC_3WIRE:</div><div class='del'>-	case BT_ACCEL:</div><div class='del'>-	case BT_RTL8756:</div><div class='del'>-		btcoexist-&gt;board_info.bt_chip_type = BTC_CHIP_UNDEF;</div><div class='del'>-		break;</div><div class='del'>-	case BT_CSR_BC4:</div><div class='del'>-		btcoexist-&gt;board_info.bt_chip_type = BTC_CHIP_CSR_BC4;</div><div class='del'>-		break;</div><div class='del'>-	case BT_CSR_BC8:</div><div class='del'>-		btcoexist-&gt;board_info.bt_chip_type = BTC_CHIP_CSR_BC8;</div><div class='del'>-		break;</div><div class='del'>-	case BT_RTL8723A:</div><div class='del'>-		btcoexist-&gt;board_info.bt_chip_type = BTC_CHIP_RTL8723A;</div><div class='del'>-		break;</div><div class='del'>-	case BT_RTL8821A:</div><div class='del'>-		btcoexist-&gt;board_info.bt_chip_type = BTC_CHIP_RTL8821;</div><div class='del'>-		break;</div><div class='del'>-	case BT_RTL8723B:</div><div class='del'>-		btcoexist-&gt;board_info.bt_chip_type = BTC_CHIP_RTL8723B;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_set_ant_num(struct rtl_priv *rtlpriv, u8 type, u8 ant_num)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (type == BT_COEX_ANT_TYPE_PG) {</div><div class='del'>-		btcoexist-&gt;board_info.pg_ant_num = ant_num;</div><div class='del'>-		btcoexist-&gt;board_info.btdm_ant_num = ant_num;</div><div class='del'>-	} else if (type == BT_COEX_ANT_TYPE_ANTDIV) {</div><div class='del'>-		btcoexist-&gt;board_info.btdm_ant_num = ant_num;</div><div class='del'>-	} else if (type == BT_COEX_ANT_TYPE_DETECTED) {</div><div class='del'>-		btcoexist-&gt;board_info.btdm_ant_num = ant_num;</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;mod_params-&gt;ant_sel == 1)</div><div class='del'>-			btcoexist-&gt;board_info.btdm_ant_pos =</div><div class='del'>-				BTC_ANTENNA_AT_AUX_PORT;</div><div class='del'>-		else</div><div class='del'>-			btcoexist-&gt;board_info.btdm_ant_pos =</div><div class='del'>-				BTC_ANTENNA_AT_MAIN_PORT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Currently used by 8723b only, S0 or S1 */</div><div class='del'>-void exhalbtc_set_single_ant_path(struct btc_coexist *btcoexist,</div><div class='del'>-				  u8 single_ant_path)</div><div class='del'>-{</div><div class='del'>-	btcoexist-&gt;board_info.single_ant_path = single_ant_path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_display_bt_coex_info(struct btc_coexist *btcoexist,</div><div class='del'>-				   struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_display_coex_info(btcoexist, m);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_display_coex_info(btcoexist, m);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_switch_band_notify(struct btc_coexist *btcoexist, u8 type)</div><div class='del'>-{</div><div class='del'>-	if (!halbtc_is_bt_coexist_available(btcoexist))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (btcoexist-&gt;manual_control)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	halbtc_leave_low_power(btcoexist);</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(btcoexist-&gt;adapter)) {</div><div class='del'>-		if (btcoexist-&gt;board_info.btdm_ant_num == 1)</div><div class='del'>-			ex_btc8822b1ant_switchband_notify(btcoexist, type);</div><div class='del'>-		else if (btcoexist-&gt;board_info.btdm_ant_num == 2)</div><div class='del'>-			ex_btc8822b2ant_switchband_notify(btcoexist, type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halbtc_normal_low_power(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void exhalbtc_switch_band_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,</div><div class='del'>-					   u8 is_5g)</div><div class='del'>-{</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(wifionly_cfg-&gt;adapter))</div><div class='del'>-		ex_hal8822b_wifi_only_switchbandnotify(wifionly_cfg, is_5g);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h<br/>deleted file mode 100644<br/>index fd65de2ac8b5..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,791 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef	__HALBTC_OUT_SRC_H__</div><div class='del'>-#define __HALBTC_OUT_SRC_H__</div><div class='del'>-</div><div class='del'>-#include	"../wifi.h"</div><div class='del'>-</div><div class='del'>-#define		BTC_COEX_OFFLOAD			0</div><div class='del'>-</div><div class='del'>-#define		NORMAL_EXEC				false</div><div class='del'>-#define		FORCE_EXEC				true</div><div class='del'>-</div><div class='del'>-#define		BTC_RF_OFF				0x0</div><div class='del'>-#define		BTC_RF_ON				0x1</div><div class='del'>-</div><div class='del'>-#define		BTC_RF_A				RF90_PATH_A</div><div class='del'>-#define		BTC_RF_B				RF90_PATH_B</div><div class='del'>-#define		BTC_RF_C				RF90_PATH_C</div><div class='del'>-#define		BTC_RF_D				RF90_PATH_D</div><div class='del'>-</div><div class='del'>-#define		BTC_SMSP				SINGLEMAC_SINGLEPHY</div><div class='del'>-#define		BTC_DMDP				DUALMAC_DUALPHY</div><div class='del'>-#define		BTC_DMSP				DUALMAC_SINGLEPHY</div><div class='del'>-#define		BTC_MP_UNKNOWN				0xff</div><div class='del'>-</div><div class='del'>-#define		IN</div><div class='del'>-#define		OUT</div><div class='del'>-</div><div class='del'>-#define		BT_TMP_BUF_SIZE				100</div><div class='del'>-</div><div class='del'>-#define		BT_COEX_ANT_TYPE_PG			0</div><div class='del'>-#define		BT_COEX_ANT_TYPE_ANTDIV			1</div><div class='del'>-#define		BT_COEX_ANT_TYPE_DETECTED		2</div><div class='del'>-</div><div class='del'>-#define		BTC_MIMO_PS_STATIC			0</div><div class='del'>-#define		BTC_MIMO_PS_DYNAMIC			1</div><div class='del'>-</div><div class='del'>-#define		BTC_RATE_DISABLE			0</div><div class='del'>-#define		BTC_RATE_ENABLE				1</div><div class='del'>-</div><div class='del'>-/* single Antenna definition */</div><div class='del'>-#define		BTC_ANT_PATH_WIFI			0</div><div class='del'>-#define		BTC_ANT_PATH_BT				1</div><div class='del'>-#define		BTC_ANT_PATH_PTA			2</div><div class='del'>-#define		BTC_ANT_PATH_WIFI5G			3</div><div class='del'>-#define		BTC_ANT_PATH_AUTO			4</div><div class='del'>-/* dual Antenna definition */</div><div class='del'>-#define		BTC_ANT_WIFI_AT_MAIN			0</div><div class='del'>-#define		BTC_ANT_WIFI_AT_AUX			1</div><div class='del'>-#define		BTC_ANT_WIFI_AT_DIVERSITY	2</div><div class='del'>-/* coupler Antenna definition */</div><div class='del'>-#define		BTC_ANT_WIFI_AT_CPL_MAIN		0</div><div class='del'>-#define		BTC_ANT_WIFI_AT_CPL_AUX			1</div><div class='del'>-</div><div class='del'>-enum btc_bt_reg_type {</div><div class='del'>-	BTC_BT_REG_RF		= 0,</div><div class='del'>-	BTC_BT_REG_MODEM	= 1,</div><div class='del'>-	BTC_BT_REG_BLUEWIZE	= 2,</div><div class='del'>-	BTC_BT_REG_VENDOR	= 3,</div><div class='del'>-	BTC_BT_REG_LE		= 4,</div><div class='del'>-	BTC_BT_REG_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_chip_interface {</div><div class='del'>-	BTC_INTF_UNKNOWN	= 0,</div><div class='del'>-	BTC_INTF_PCI		= 1,</div><div class='del'>-	BTC_INTF_USB		= 2,</div><div class='del'>-	BTC_INTF_SDIO		= 3,</div><div class='del'>-	BTC_INTF_GSPI		= 4,</div><div class='del'>-	BTC_INTF_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_chip_type {</div><div class='del'>-	BTC_CHIP_UNDEF		= 0,</div><div class='del'>-	BTC_CHIP_CSR_BC4	= 1,</div><div class='del'>-	BTC_CHIP_CSR_BC8	= 2,</div><div class='del'>-	BTC_CHIP_RTL8723A	= 3,</div><div class='del'>-	BTC_CHIP_RTL8821	= 4,</div><div class='del'>-	BTC_CHIP_RTL8723B	= 5,</div><div class='del'>-	BTC_CHIP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_msg_type {</div><div class='del'>-	BTC_MSG_INTERFACE	= 0x0,</div><div class='del'>-	BTC_MSG_ALGORITHM	= 0x1,</div><div class='del'>-	BTC_MSG_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* following is for BTC_MSG_INTERFACE */</div><div class='del'>-#define		INTF_INIT				BIT0</div><div class='del'>-#define		INTF_NOTIFY				BIT2</div><div class='del'>-</div><div class='del'>-/* following is for BTC_ALGORITHM */</div><div class='del'>-#define		ALGO_BT_RSSI_STATE			BIT0</div><div class='del'>-#define		ALGO_WIFI_RSSI_STATE			BIT1</div><div class='del'>-#define		ALGO_BT_MONITOR				BIT2</div><div class='del'>-#define		ALGO_TRACE				BIT3</div><div class='del'>-#define		ALGO_TRACE_FW				BIT4</div><div class='del'>-#define		ALGO_TRACE_FW_DETAIL			BIT5</div><div class='del'>-#define		ALGO_TRACE_FW_EXEC			BIT6</div><div class='del'>-#define		ALGO_TRACE_SW				BIT7</div><div class='del'>-#define		ALGO_TRACE_SW_DETAIL			BIT8</div><div class='del'>-#define		ALGO_TRACE_SW_EXEC			BIT9</div><div class='del'>-</div><div class='del'>-/* following is for wifi link status */</div><div class='del'>-#define		WIFI_STA_CONNECTED			BIT0</div><div class='del'>-#define		WIFI_AP_CONNECTED			BIT1</div><div class='del'>-#define		WIFI_HS_CONNECTED			BIT2</div><div class='del'>-#define		WIFI_P2P_GO_CONNECTED			BIT3</div><div class='del'>-#define		WIFI_P2P_GC_CONNECTED			BIT4</div><div class='del'>-</div><div class='del'>-#define	BTC_RSSI_HIGH(_rssi_)	\</div><div class='del'>-	((_rssi_ == BTC_RSSI_STATE_HIGH ||	\</div><div class='del'>-	  _rssi_ == BTC_RSSI_STATE_STAY_HIGH) ? true : false)</div><div class='del'>-#define	BTC_RSSI_MEDIUM(_rssi_)	\</div><div class='del'>-	((_rssi_ == BTC_RSSI_STATE_MEDIUM ||	\</div><div class='del'>-	  _rssi_ == BTC_RSSI_STATE_STAY_MEDIUM) ? true : false)</div><div class='del'>-#define	BTC_RSSI_LOW(_rssi_)	\</div><div class='del'>-	((_rssi_ == BTC_RSSI_STATE_LOW ||	\</div><div class='del'>-	  _rssi_ == BTC_RSSI_STATE_STAY_LOW) ? true : false)</div><div class='del'>-</div><div class='del'>-enum btc_power_save_type {</div><div class='del'>-	BTC_PS_WIFI_NATIVE = 0,</div><div class='del'>-	BTC_PS_LPS_ON = 1,</div><div class='del'>-	BTC_PS_LPS_OFF = 2,</div><div class='del'>-	BTC_PS_LPS_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btc_board_info {</div><div class='del'>-	/* The following is some board information */</div><div class='del'>-	u8 bt_chip_type;</div><div class='del'>-	u8 pg_ant_num;	/* pg ant number */</div><div class='del'>-	u8 btdm_ant_num;	/* ant number for btdm */</div><div class='del'>-	u8 btdm_ant_num_by_ant_det;</div><div class='del'>-	u8 btdm_ant_pos;</div><div class='del'>-	u8 single_ant_path; /* current used for 8723b only, 1=&gt;s0,  0=&gt;s1 */</div><div class='del'>-	bool tfbga_package;</div><div class='del'>-	bool btdm_ant_det_finish;</div><div class='del'>-</div><div class='del'>-	u8 rfe_type;</div><div class='del'>-	u8 ant_div_cfg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_dbg_opcode {</div><div class='del'>-	BTC_DBG_SET_COEX_NORMAL = 0x0,</div><div class='del'>-	BTC_DBG_SET_COEX_WIFI_ONLY = 0x1,</div><div class='del'>-	BTC_DBG_SET_COEX_BT_ONLY = 0x2,</div><div class='del'>-	BTC_DBG_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_rssi_state {</div><div class='del'>-	BTC_RSSI_STATE_HIGH = 0x0,</div><div class='del'>-	BTC_RSSI_STATE_MEDIUM = 0x1,</div><div class='del'>-	BTC_RSSI_STATE_LOW = 0x2,</div><div class='del'>-	BTC_RSSI_STATE_STAY_HIGH = 0x3,</div><div class='del'>-	BTC_RSSI_STATE_STAY_MEDIUM = 0x4,</div><div class='del'>-	BTC_RSSI_STATE_STAY_LOW = 0x5,</div><div class='del'>-	BTC_RSSI_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_wifi_role {</div><div class='del'>-	BTC_ROLE_STATION = 0x0,</div><div class='del'>-	BTC_ROLE_AP = 0x1,</div><div class='del'>-	BTC_ROLE_IBSS = 0x2,</div><div class='del'>-	BTC_ROLE_HS_MODE = 0x3,</div><div class='del'>-	BTC_ROLE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_wireless_freq {</div><div class='del'>-	BTC_FREQ_2_4G = 0x0,</div><div class='del'>-	BTC_FREQ_5G = 0x1,</div><div class='del'>-	BTC_FREQ_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_wifi_bw_mode {</div><div class='del'>-	BTC_WIFI_BW_LEGACY = 0x0,</div><div class='del'>-	BTC_WIFI_BW_HT20 = 0x1,</div><div class='del'>-	BTC_WIFI_BW_HT40 = 0x2,</div><div class='del'>-	BTC_WIFI_BW_HT80 = 0x3,</div><div class='del'>-	BTC_WIFI_BW_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_wifi_traffic_dir {</div><div class='del'>-	BTC_WIFI_TRAFFIC_TX = 0x0,</div><div class='del'>-	BTC_WIFI_TRAFFIC_RX = 0x1,</div><div class='del'>-	BTC_WIFI_TRAFFIC_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_wifi_pnp {</div><div class='del'>-	BTC_WIFI_PNP_WAKE_UP = 0x0,</div><div class='del'>-	BTC_WIFI_PNP_SLEEP = 0x1,</div><div class='del'>-	BTC_WIFI_PNP_SLEEP_KEEP_ANT = 0x2,</div><div class='del'>-	BTC_WIFI_PNP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_iot_peer {</div><div class='del'>-	BTC_IOT_PEER_UNKNOWN = 0,</div><div class='del'>-	BTC_IOT_PEER_REALTEK = 1,</div><div class='del'>-	BTC_IOT_PEER_REALTEK_92SE = 2,</div><div class='del'>-	BTC_IOT_PEER_BROADCOM = 3,</div><div class='del'>-	BTC_IOT_PEER_RALINK = 4,</div><div class='del'>-	BTC_IOT_PEER_ATHEROS = 5,</div><div class='del'>-	BTC_IOT_PEER_CISCO = 6,</div><div class='del'>-	BTC_IOT_PEER_MERU = 7,</div><div class='del'>-	BTC_IOT_PEER_MARVELL = 8,</div><div class='del'>-	BTC_IOT_PEER_REALTEK_SOFTAP = 9,</div><div class='del'>-	BTC_IOT_PEER_SELF_SOFTAP = 10, /* Self is SoftAP */</div><div class='del'>-	BTC_IOT_PEER_AIRGO = 11,</div><div class='del'>-	BTC_IOT_PEER_REALTEK_JAGUAR_BCUTAP = 12,</div><div class='del'>-	BTC_IOT_PEER_REALTEK_JAGUAR_CCUTAP = 13,</div><div class='del'>-	BTC_IOT_PEER_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* for 8723b-d cut large current issue */</div><div class='del'>-enum bt_wifi_coex_state {</div><div class='del'>-	BTC_WIFI_STAT_INIT,</div><div class='del'>-	BTC_WIFI_STAT_IQK,</div><div class='del'>-	BTC_WIFI_STAT_NORMAL_OFF,</div><div class='del'>-	BTC_WIFI_STAT_MP_OFF,</div><div class='del'>-	BTC_WIFI_STAT_NORMAL,</div><div class='del'>-	BTC_WIFI_STAT_ANT_DIV,</div><div class='del'>-	BTC_WIFI_STAT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bt_ant_type {</div><div class='del'>-	BTC_ANT_TYPE_0,</div><div class='del'>-	BTC_ANT_TYPE_1,</div><div class='del'>-	BTC_ANT_TYPE_2,</div><div class='del'>-	BTC_ANT_TYPE_3,</div><div class='del'>-	BTC_ANT_TYPE_4,</div><div class='del'>-	BTC_ANT_TYPE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_get_type {</div><div class='del'>-	/* type bool */</div><div class='del'>-	BTC_GET_BL_HS_OPERATION,</div><div class='del'>-	BTC_GET_BL_HS_CONNECTING,</div><div class='del'>-	BTC_GET_BL_WIFI_CONNECTED,</div><div class='del'>-	BTC_GET_BL_WIFI_BUSY,</div><div class='del'>-	BTC_GET_BL_WIFI_SCAN,</div><div class='del'>-	BTC_GET_BL_WIFI_LINK,</div><div class='del'>-	BTC_GET_BL_WIFI_DHCP,</div><div class='del'>-	BTC_GET_BL_WIFI_SOFTAP_IDLE,</div><div class='del'>-	BTC_GET_BL_WIFI_SOFTAP_LINKING,</div><div class='del'>-	BTC_GET_BL_WIFI_IN_EARLY_SUSPEND,</div><div class='del'>-	BTC_GET_BL_WIFI_ROAM,</div><div class='del'>-	BTC_GET_BL_WIFI_4_WAY_PROGRESS,</div><div class='del'>-	BTC_GET_BL_WIFI_UNDER_5G,</div><div class='del'>-	BTC_GET_BL_WIFI_AP_MODE_ENABLE,</div><div class='del'>-	BTC_GET_BL_WIFI_ENABLE_ENCRYPTION,</div><div class='del'>-	BTC_GET_BL_WIFI_UNDER_B_MODE,</div><div class='del'>-	BTC_GET_BL_EXT_SWITCH,</div><div class='del'>-	BTC_GET_BL_WIFI_IS_IN_MP_MODE,</div><div class='del'>-	BTC_GET_BL_IS_ASUS_8723B,</div><div class='del'>-	BTC_GET_BL_FW_READY,</div><div class='del'>-	BTC_GET_BL_RF4CE_CONNECTED,</div><div class='del'>-</div><div class='del'>-	/* type s4Byte */</div><div class='del'>-	BTC_GET_S4_WIFI_RSSI,</div><div class='del'>-	BTC_GET_S4_HS_RSSI,</div><div class='del'>-</div><div class='del'>-	/* type u32 */</div><div class='del'>-	BTC_GET_U4_WIFI_BW,</div><div class='del'>-	BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,</div><div class='del'>-	BTC_GET_U4_WIFI_FW_VER,</div><div class='del'>-	BTC_GET_U4_WIFI_LINK_STATUS,</div><div class='del'>-	BTC_GET_U4_BT_PATCH_VER,</div><div class='del'>-	BTC_GET_U4_VENDOR,</div><div class='del'>-	BTC_GET_U4_SUPPORTED_VERSION,</div><div class='del'>-	BTC_GET_U4_SUPPORTED_FEATURE,</div><div class='del'>-	BTC_GET_U4_WIFI_IQK_TOTAL,</div><div class='del'>-	BTC_GET_U4_WIFI_IQK_OK,</div><div class='del'>-	BTC_GET_U4_WIFI_IQK_FAIL,</div><div class='del'>-</div><div class='del'>-	/* type u1Byte */</div><div class='del'>-	BTC_GET_U1_WIFI_DOT11_CHNL,</div><div class='del'>-	BTC_GET_U1_WIFI_CENTRAL_CHNL,</div><div class='del'>-	BTC_GET_U1_WIFI_HS_CHNL,</div><div class='del'>-	BTC_GET_U1_MAC_PHY_MODE,</div><div class='del'>-	BTC_GET_U1_AP_NUM,</div><div class='del'>-	BTC_GET_U1_ANT_TYPE,</div><div class='del'>-	BTC_GET_U1_IOT_PEER,</div><div class='del'>-</div><div class='del'>-	/* for 1Ant */</div><div class='del'>-	BTC_GET_U1_LPS_MODE,</div><div class='del'>-	BTC_GET_BL_BT_SCO_BUSY,</div><div class='del'>-</div><div class='del'>-	/* for test mode */</div><div class='del'>-	BTC_GET_DRIVER_TEST_CFG,</div><div class='del'>-	BTC_GET_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_vendor {</div><div class='del'>-	BTC_VENDOR_LENOVO,</div><div class='del'>-	BTC_VENDOR_ASUS,</div><div class='del'>-	BTC_VENDOR_OTHER</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_set_type {</div><div class='del'>-	/* type bool */</div><div class='del'>-	BTC_SET_BL_BT_DISABLE,</div><div class='del'>-	BTC_SET_BL_BT_ENABLE_DISABLE_CHANGE,</div><div class='del'>-	BTC_SET_BL_BT_TRAFFIC_BUSY,</div><div class='del'>-	BTC_SET_BL_BT_LIMITED_DIG,</div><div class='del'>-	BTC_SET_BL_FORCE_TO_ROAM,</div><div class='del'>-	BTC_SET_BL_TO_REJ_AP_AGG_PKT,</div><div class='del'>-	BTC_SET_BL_BT_CTRL_AGG_SIZE,</div><div class='del'>-	BTC_SET_BL_INC_SCAN_DEV_NUM,</div><div class='del'>-	BTC_SET_BL_BT_TX_RX_MASK,</div><div class='del'>-	BTC_SET_BL_MIRACAST_PLUS_BT,</div><div class='del'>-</div><div class='del'>-	/* type u1Byte */</div><div class='del'>-	BTC_SET_U1_RSSI_ADJ_VAL_FOR_AGC_TABLE_ON,</div><div class='del'>-	BTC_SET_UI_SCAN_SIG_COMPENSATION,</div><div class='del'>-	BTC_SET_U1_AGG_BUF_SIZE,</div><div class='del'>-</div><div class='del'>-	/* type trigger some action */</div><div class='del'>-	BTC_SET_ACT_GET_BT_RSSI,</div><div class='del'>-	BTC_SET_ACT_AGGREGATE_CTRL,</div><div class='del'>-	BTC_SET_ACT_ANTPOSREGRISTRY_CTRL,</div><div class='del'>-</div><div class='del'>-	/********* for 1Ant **********/</div><div class='del'>-	/* type bool */</div><div class='del'>-	BTC_SET_BL_BT_SCO_BUSY,</div><div class='del'>-	/* type u1Byte */</div><div class='del'>-	BTC_SET_U1_RSSI_ADJ_VAL_FOR_1ANT_COEX_TYPE,</div><div class='del'>-	BTC_SET_U1_LPS_VAL,</div><div class='del'>-	BTC_SET_U1_RPWM_VAL,</div><div class='del'>-	BTC_SET_U1_1ANT_LPS,</div><div class='del'>-	BTC_SET_U1_1ANT_RPWM,</div><div class='del'>-	/* type trigger some action */</div><div class='del'>-	BTC_SET_ACT_LEAVE_LPS,</div><div class='del'>-	BTC_SET_ACT_ENTER_LPS,</div><div class='del'>-	BTC_SET_ACT_NORMAL_LPS,</div><div class='del'>-	BTC_SET_ACT_INC_FORCE_EXEC_PWR_CMD_CNT,</div><div class='del'>-	BTC_SET_ACT_DISABLE_LOW_POWER,</div><div class='del'>-	BTC_SET_ACT_UPDATE_RAMASK,</div><div class='del'>-	BTC_SET_ACT_SEND_MIMO_PS,</div><div class='del'>-	/* BT Coex related */</div><div class='del'>-	BTC_SET_ACT_CTRL_BT_INFO,</div><div class='del'>-	BTC_SET_ACT_CTRL_BT_COEX,</div><div class='del'>-	BTC_SET_ACT_CTRL_8723B_ANT,</div><div class='del'>-	/***************************/</div><div class='del'>-	BTC_SET_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_dbg_disp_type {</div><div class='del'>-	BTC_DBG_DISP_COEX_STATISTICS = 0x0,</div><div class='del'>-	BTC_DBG_DISP_BT_LINK_INFO = 0x1,</div><div class='del'>-	BTC_DBG_DISP_BT_FW_VER = 0x2,</div><div class='del'>-	BTC_DBG_DISP_FW_PWR_MODE_CMD = 0x3,</div><div class='del'>-	BTC_DBG_DISP_WIFI_STATUS = 0x04,</div><div class='del'>-	BTC_DBG_DISP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_ips {</div><div class='del'>-	BTC_IPS_LEAVE = 0x0,</div><div class='del'>-	BTC_IPS_ENTER = 0x1,</div><div class='del'>-	BTC_IPS_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_lps {</div><div class='del'>-	BTC_LPS_DISABLE = 0x0,</div><div class='del'>-	BTC_LPS_ENABLE = 0x1,</div><div class='del'>-	BTC_LPS_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_scan {</div><div class='del'>-	BTC_SCAN_FINISH = 0x0,</div><div class='del'>-	BTC_SCAN_START = 0x1,</div><div class='del'>-	BTC_SCAN_START_2G = 0x2,</div><div class='del'>-	BTC_SCAN_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_switchband {</div><div class='del'>-	BTC_NOT_SWITCH = 0x0,</div><div class='del'>-	BTC_SWITCH_TO_24G = 0x1,</div><div class='del'>-	BTC_SWITCH_TO_5G = 0x2,</div><div class='del'>-	BTC_SWITCH_TO_24G_NOFORSCAN = 0x3,</div><div class='del'>-	BTC_SWITCH_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_associate {</div><div class='del'>-	BTC_ASSOCIATE_FINISH = 0x0,</div><div class='del'>-	BTC_ASSOCIATE_START = 0x1,</div><div class='del'>-	BTC_ASSOCIATE_5G_FINISH = 0x2,</div><div class='del'>-	BTC_ASSOCIATE_5G_START = 0x3,</div><div class='del'>-	BTC_ASSOCIATE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_media_status {</div><div class='del'>-	BTC_MEDIA_DISCONNECT = 0x0,</div><div class='del'>-	BTC_MEDIA_CONNECT = 0x1,</div><div class='del'>-	BTC_MEDIA_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_special_packet {</div><div class='del'>-	BTC_PACKET_UNKNOWN = 0x0,</div><div class='del'>-	BTC_PACKET_DHCP = 0x1,</div><div class='del'>-	BTC_PACKET_ARP = 0x2,</div><div class='del'>-	BTC_PACKET_EAPOL = 0x3,</div><div class='del'>-	BTC_PACKET_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum hci_ext_bt_operation {</div><div class='del'>-	HCI_BT_OP_NONE = 0x0,</div><div class='del'>-	HCI_BT_OP_INQUIRY_START = 0x1,</div><div class='del'>-	HCI_BT_OP_INQUIRY_FINISH = 0x2,</div><div class='del'>-	HCI_BT_OP_PAGING_START = 0x3,</div><div class='del'>-	HCI_BT_OP_PAGING_SUCCESS = 0x4,</div><div class='del'>-	HCI_BT_OP_PAGING_UNSUCCESS = 0x5,</div><div class='del'>-	HCI_BT_OP_PAIRING_START = 0x6,</div><div class='del'>-	HCI_BT_OP_PAIRING_FINISH = 0x7,</div><div class='del'>-	HCI_BT_OP_BT_DEV_ENABLE = 0x8,</div><div class='del'>-	HCI_BT_OP_BT_DEV_DISABLE = 0x9,</div><div class='del'>-	HCI_BT_OP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_notify_type_stack_operation {</div><div class='del'>-	BTC_STACK_OP_NONE = 0x0,</div><div class='del'>-	BTC_STACK_OP_INQ_PAGE_PAIR_START = 0x1,</div><div class='del'>-	BTC_STACK_OP_INQ_PAGE_PAIR_FINISH = 0x2,</div><div class='del'>-	BTC_STACK_OP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef u8 (*bfp_btc_r1)(void *btc_context, u32 reg_addr);</div><div class='del'>-</div><div class='del'>-typedef u16 (*bfp_btc_r2)(void *btc_context, u32 reg_addr);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_r4)(void *btc_context, u32 reg_addr);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_w1)(void *btc_context, u32 reg_addr, u32 data);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_w1_bit_mak)(void *btc_context, u32 reg_addr,</div><div class='del'>-				   u32 bit_mask, u8 data1b);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_w2)(void *btc_context, u32 reg_addr, u16 data);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_w4)(void *btc_context, u32 reg_addr, u32 data);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_local_reg_w1)(void *btc_context, u32 reg_addr, u8 data);</div><div class='del'>-typedef void (*bfp_btc_wr_1byte_bit_mask)(void *btc_context, u32 reg_addr,</div><div class='del'>-					  u8 bit_mask, u8 data);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_set_bb_reg)(void *btc_context, u32 reg_addr,</div><div class='del'>-				   u32 bit_mask, u32 data);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_get_bb_reg)(void *btc_context, u32 reg_addr,</div><div class='del'>-				  u32 bit_mask);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_set_rf_reg)(void *btc_context, u8 rf_path, u32 reg_addr,</div><div class='del'>-				   u32 bit_mask, u32 data);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_get_rf_reg)(void *btc_context, u8 rf_path,</div><div class='del'>-				  u32 reg_addr, u32 bit_mask);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_fill_h2c)(void *btc_context, u8 element_id,</div><div class='del'>-				 u32 cmd_len, u8 *cmd_buffer);</div><div class='del'>-</div><div class='del'>-typedef	bool (*bfp_btc_get)(void *btcoexist, u8 get_type, void *out_buf);</div><div class='del'>-</div><div class='del'>-typedef	bool (*bfp_btc_set)(void *btcoexist, u8 set_type, void *in_buf);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_get_bt_coex_supported_feature)(void *btcoexist);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_get_bt_coex_supported_version)(void *btcoexist);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_get_bt_phydm_version)(void *btcoexist);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_phydm_modify_ra_pcr_threshold)(void *btcoexist,</div><div class='del'>-					  u8 ra_offset_direction,</div><div class='del'>-					  u8 ra_threshold_offset);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_phydm_query_phy_counter)(void *btcoexist,</div><div class='del'>-					       const char *info_type);</div><div class='del'>-</div><div class='del'>-typedef u8 (*bfp_btc_get_ant_det_val_from_bt)(void *btcoexist);</div><div class='del'>-</div><div class='del'>-typedef u8 (*bfp_btc_get_ble_scan_type_from_bt)(void *btcoexist);</div><div class='del'>-</div><div class='del'>-typedef u32 (*bfp_btc_get_ble_scan_para_from_bt)(void *btcoexist, u8 scan_type);</div><div class='del'>-</div><div class='del'>-typedef bool (*bfp_btc_get_bt_afh_map_from_bt)(void *btcoexist, u8 map_type,</div><div class='del'>-					       u8 *afh_map);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_set_bt_reg)(void *btc_context, u8 reg_type, u32 offset,</div><div class='del'>-				   u32 value);</div><div class='del'>-typedef u32 (*bfp_btc_get_bt_reg)(void *btc_context, u8 reg_type, u32 offset);</div><div class='del'>-</div><div class='del'>-typedef void (*bfp_btc_disp_dbg_msg)(void *btcoexist, u8 disp_type,</div><div class='del'>-				     struct seq_file *m);</div><div class='del'>-</div><div class='del'>-struct btc_bt_info {</div><div class='del'>-	bool bt_disabled;</div><div class='del'>-	u8 rssi_adjust_for_agc_table_on;</div><div class='del'>-	u8 rssi_adjust_for_1ant_coex_type;</div><div class='del'>-	bool pre_bt_ctrl_agg_buf_size;</div><div class='del'>-	bool bt_busy;</div><div class='del'>-	u8 pre_agg_buf_size;</div><div class='del'>-	u8 agg_buf_size;</div><div class='del'>-	bool limited_dig;</div><div class='del'>-	bool pre_reject_agg_pkt;</div><div class='del'>-	bool reject_agg_pkt;</div><div class='del'>-	bool bt_ctrl_buf_size;</div><div class='del'>-	bool increase_scan_dev_num;</div><div class='del'>-	bool miracast_plus_bt;</div><div class='del'>-	bool bt_ctrl_agg_buf_size;</div><div class='del'>-	bool bt_tx_rx_mask;</div><div class='del'>-	u16 bt_hci_ver;</div><div class='del'>-	u16 bt_real_fw_ver;</div><div class='del'>-	u8 bt_fw_ver;</div><div class='del'>-	u32 bt_get_fw_ver;</div><div class='del'>-</div><div class='del'>-	bool bt_disable_low_pwr;</div><div class='del'>-</div><div class='del'>-	/* the following is for 1Ant solution */</div><div class='del'>-	bool bt_ctrl_lps;</div><div class='del'>-	bool bt_pwr_save_mode;</div><div class='del'>-	bool bt_lps_on;</div><div class='del'>-	bool force_to_roam;</div><div class='del'>-	u8 force_exec_pwr_cmd_cnt;</div><div class='del'>-	u8 lps_val;</div><div class='del'>-	u8 rpwm_val;</div><div class='del'>-	u32 ra_mask;</div><div class='del'>-</div><div class='del'>-	u32 afh_map_l;</div><div class='del'>-	u32 afh_map_m;</div><div class='del'>-	u16 afh_map_h;</div><div class='del'>-	u32 bt_supported_feature;</div><div class='del'>-	u32 bt_supported_version;</div><div class='del'>-	u8 bt_ant_det_val;</div><div class='del'>-	u8 bt_ble_scan_type;</div><div class='del'>-	u32 bt_ble_scan_para;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btc_stack_info {</div><div class='del'>-	bool profile_notified;</div><div class='del'>-	u16 hci_version;	/* stack hci version */</div><div class='del'>-	u8 num_of_link;</div><div class='del'>-	bool bt_link_exist;</div><div class='del'>-	bool sco_exist;</div><div class='del'>-	bool acl_exist;</div><div class='del'>-	bool a2dp_exist;</div><div class='del'>-	bool hid_exist;</div><div class='del'>-	u8 num_of_hid;</div><div class='del'>-	bool pan_exist;</div><div class='del'>-	bool unknown_acl_exist;</div><div class='del'>-	s8 min_bt_rssi;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btc_statistics {</div><div class='del'>-	u32 cnt_bind;</div><div class='del'>-	u32 cnt_init_hw_config;</div><div class='del'>-	u32 cnt_init_coex_dm;</div><div class='del'>-	u32 cnt_ips_notify;</div><div class='del'>-	u32 cnt_lps_notify;</div><div class='del'>-	u32 cnt_scan_notify;</div><div class='del'>-	u32 cnt_connect_notify;</div><div class='del'>-	u32 cnt_media_status_notify;</div><div class='del'>-	u32 cnt_special_packet_notify;</div><div class='del'>-	u32 cnt_bt_info_notify;</div><div class='del'>-	u32 cnt_periodical;</div><div class='del'>-	u32 cnt_coex_dm_switch;</div><div class='del'>-	u32 cnt_stack_operation_notify;</div><div class='del'>-	u32 cnt_dbg_ctrl;</div><div class='del'>-	u32 cnt_pre_load_firmware;</div><div class='del'>-	u32 cnt_power_on;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btc_bt_link_info {</div><div class='del'>-	bool bt_link_exist;</div><div class='del'>-	bool bt_hi_pri_link_exist;</div><div class='del'>-	bool sco_exist;</div><div class='del'>-	bool sco_only;</div><div class='del'>-	bool a2dp_exist;</div><div class='del'>-	bool a2dp_only;</div><div class='del'>-	bool hid_exist;</div><div class='del'>-	bool hid_only;</div><div class='del'>-	bool pan_exist;</div><div class='del'>-	bool pan_only;</div><div class='del'>-	bool slave_role;</div><div class='del'>-	bool acl_busy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_antenna_pos {</div><div class='del'>-	BTC_ANTENNA_AT_MAIN_PORT = 0x1,</div><div class='del'>-	BTC_ANTENNA_AT_AUX_PORT = 0x2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_mp_h2c_op_code {</div><div class='del'>-	BT_OP_GET_BT_VERSION			= 0,</div><div class='del'>-	BT_OP_WRITE_REG_ADDR			= 12,</div><div class='del'>-	BT_OP_WRITE_REG_VALUE			= 13,</div><div class='del'>-	BT_OP_READ_REG				= 17,</div><div class='del'>-	BT_OP_GET_AFH_MAP_L			= 30,</div><div class='del'>-	BT_OP_GET_AFH_MAP_M			= 31,</div><div class='del'>-	BT_OP_GET_AFH_MAP_H			= 32,</div><div class='del'>-	BT_OP_GET_BT_COEX_SUPPORTED_FEATURE	= 42,</div><div class='del'>-	BT_OP_GET_BT_COEX_SUPPORTED_VERSION	= 43,</div><div class='del'>-	BT_OP_GET_BT_ANT_DET_VAL		= 44,</div><div class='del'>-	BT_OP_GET_BT_BLE_SCAN_PARA		= 45,</div><div class='del'>-	BT_OP_GET_BT_BLE_SCAN_TYPE		= 46,</div><div class='del'>-	BT_OP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btc_mp_h2c_req_num {</div><div class='del'>-	/* 4 bits only */</div><div class='del'>-	BT_SEQ_DONT_CARE			= 0,</div><div class='del'>-	BT_SEQ_GET_BT_VERSION			= 0xE,</div><div class='del'>-	BT_SEQ_GET_AFH_MAP_L			= 0x5,</div><div class='del'>-	BT_SEQ_GET_AFH_MAP_M			= 0x6,</div><div class='del'>-	BT_SEQ_GET_AFH_MAP_H			= 0x9,</div><div class='del'>-	BT_SEQ_GET_BT_COEX_SUPPORTED_FEATURE	= 0x7,</div><div class='del'>-	BT_SEQ_GET_BT_COEX_SUPPORTED_VERSION	= 0x8,</div><div class='del'>-	BT_SEQ_GET_BT_ANT_DET_VAL		= 0x2,</div><div class='del'>-	BT_SEQ_GET_BT_BLE_SCAN_PARA		= 0x3,</div><div class='del'>-	BT_SEQ_GET_BT_BLE_SCAN_TYPE		= 0x4,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btc_coexist {</div><div class='del'>-	/* make sure only one adapter can bind the data context  */</div><div class='del'>-	bool binded;</div><div class='del'>-	/* default adapter */</div><div class='del'>-	void *adapter;</div><div class='del'>-	struct btc_board_info board_info;</div><div class='del'>-	/* some bt info referenced by non-bt module */</div><div class='del'>-	struct btc_bt_info bt_info;</div><div class='del'>-	struct btc_stack_info stack_info;</div><div class='del'>-	enum btc_chip_interface	chip_interface;</div><div class='del'>-	struct btc_bt_link_info bt_link_info;</div><div class='del'>-</div><div class='del'>-	/* boolean variables to replace BT_AUTO_REPORT_ONLY_XXXXY_ZANT</div><div class='del'>-	 * configuration parameters</div><div class='del'>-	 */</div><div class='del'>-	bool auto_report_1ant;</div><div class='del'>-	bool auto_report_2ant;</div><div class='del'>-	bool dbg_mode_1ant;</div><div class='del'>-	bool dbg_mode_2ant;</div><div class='del'>-	bool initilized;</div><div class='del'>-	bool stop_coex_dm;</div><div class='del'>-	bool manual_control;</div><div class='del'>-	struct btc_statistics statistics;</div><div class='del'>-	u8 pwr_mode_val[10];</div><div class='del'>-</div><div class='del'>-	struct completion bt_mp_comp;</div><div class='del'>-</div><div class='del'>-	/* function pointers - io related */</div><div class='del'>-	bfp_btc_r1 btc_read_1byte;</div><div class='del'>-	bfp_btc_w1 btc_write_1byte;</div><div class='del'>-	bfp_btc_w1_bit_mak btc_write_1byte_bitmask;</div><div class='del'>-	bfp_btc_r2 btc_read_2byte;</div><div class='del'>-	bfp_btc_w2 btc_write_2byte;</div><div class='del'>-	bfp_btc_r4 btc_read_4byte;</div><div class='del'>-	bfp_btc_w4 btc_write_4byte;</div><div class='del'>-	bfp_btc_local_reg_w1 btc_write_local_reg_1byte;</div><div class='del'>-</div><div class='del'>-	bfp_btc_set_bb_reg btc_set_bb_reg;</div><div class='del'>-	bfp_btc_get_bb_reg btc_get_bb_reg;</div><div class='del'>-</div><div class='del'>-	bfp_btc_set_rf_reg btc_set_rf_reg;</div><div class='del'>-	bfp_btc_get_rf_reg btc_get_rf_reg;</div><div class='del'>-</div><div class='del'>-	bfp_btc_fill_h2c btc_fill_h2c;</div><div class='del'>-</div><div class='del'>-	bfp_btc_disp_dbg_msg btc_disp_dbg_msg;</div><div class='del'>-</div><div class='del'>-	bfp_btc_get btc_get;</div><div class='del'>-	bfp_btc_set btc_set;</div><div class='del'>-</div><div class='del'>-	bfp_btc_set_bt_reg btc_set_bt_reg;</div><div class='del'>-	bfp_btc_get_bt_reg btc_get_bt_reg;</div><div class='del'>-</div><div class='del'>-	bfp_btc_get_bt_coex_supported_feature btc_get_bt_coex_supported_feature;</div><div class='del'>-	bfp_btc_get_bt_coex_supported_version btc_get_bt_coex_supported_version;</div><div class='del'>-	bfp_btc_get_bt_phydm_version btc_get_bt_phydm_version;</div><div class='del'>-	bfp_btc_phydm_modify_ra_pcr_threshold btc_phydm_modify_ra_pcr_threshold;</div><div class='del'>-	bfp_btc_phydm_query_phy_counter btc_phydm_query_phy_counter;</div><div class='del'>-	bfp_btc_get_ant_det_val_from_bt btc_get_ant_det_val_from_bt;</div><div class='del'>-	bfp_btc_get_ble_scan_type_from_bt btc_get_ble_scan_type_from_bt;</div><div class='del'>-	bfp_btc_get_ble_scan_para_from_bt btc_get_ble_scan_para_from_bt;</div><div class='del'>-	bfp_btc_get_bt_afh_map_from_bt btc_get_bt_afh_map_from_bt;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-bool halbtc_is_wifi_uplink(struct rtl_priv *adapter);</div><div class='del'>-</div><div class='del'>-#define rtl_btc_coexist(rtlpriv)				\</div><div class='del'>-	((struct btc_coexist *)((rtlpriv)-&gt;btcoexist.btc_context))</div><div class='del'>-#define rtl_btc_wifi_only(rtlpriv)				\</div><div class='del'>-	((struct wifi_only_cfg *)((rtlpriv)-&gt;btcoexist.wifi_only_context))</div><div class='del'>-</div><div class='del'>-struct wifi_only_cfg;</div><div class='del'>-</div><div class='del'>-bool exhalbtc_initlize_variables(struct rtl_priv *rtlpriv);</div><div class='del'>-bool exhalbtc_initlize_variables_wifi_only(struct rtl_priv *rtlpriv);</div><div class='del'>-bool exhalbtc_bind_bt_coex_withadapter(void *adapter);</div><div class='del'>-void exhalbtc_power_on_setting(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_pre_load_firmware(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_init_hw_config(struct btc_coexist *btcoexist, bool wifi_only);</div><div class='del'>-void exhalbtc_init_hw_config_wifi_only(struct wifi_only_cfg *wifionly_cfg);</div><div class='del'>-void exhalbtc_init_coex_dm(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_ips_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void exhalbtc_lps_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void exhalbtc_scan_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void exhalbtc_scan_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,</div><div class='del'>-				    u8 is_5g);</div><div class='del'>-void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action);</div><div class='del'>-void exhalbtc_mediastatus_notify(struct btc_coexist *btcoexist,</div><div class='del'>-				 enum rt_media_status media_status);</div><div class='del'>-void exhalbtc_special_packet_notify(struct btc_coexist *btcoexist, u8 pkt_type);</div><div class='del'>-void exhalbtc_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,</div><div class='del'>-			     u8 length);</div><div class='del'>-void exhalbtc_rf_status_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void exhalbtc_stack_operation_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void exhalbtc_halt_notify(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);</div><div class='del'>-void exhalbtc_coex_dm_switch(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_periodical(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_dbg_control(struct btc_coexist *btcoexist, u8 code, u8 len,</div><div class='del'>-			  u8 *data);</div><div class='del'>-void exhalbtc_antenna_detection(struct btc_coexist *btcoexist, u32 cent_freq,</div><div class='del'>-				u32 offset, u32 span, u32 seconds);</div><div class='del'>-void exhalbtc_stack_update_profile_info(void);</div><div class='del'>-void exhalbtc_set_hci_version(struct btc_coexist *btcoexist, u16 hci_version);</div><div class='del'>-void exhalbtc_set_bt_patch_version(struct btc_coexist *btcoexist,</div><div class='del'>-				   u16 bt_hci_version, u16 bt_patch_version);</div><div class='del'>-void exhalbtc_update_min_bt_rssi(struct btc_coexist *btcoexist, s8 bt_rssi);</div><div class='del'>-void exhalbtc_set_bt_exist(struct btc_coexist *btcoexist, bool bt_exist);</div><div class='del'>-void exhalbtc_set_chip_type(struct btc_coexist *btcoexist, u8 chip_type);</div><div class='del'>-void exhalbtc_set_ant_num(struct rtl_priv *rtlpriv, u8 type, u8 ant_num);</div><div class='del'>-void exhalbtc_display_bt_coex_info(struct btc_coexist *btcoexist,</div><div class='del'>-				   struct seq_file *m);</div><div class='del'>-void exhalbtc_switch_band_notify(struct btc_coexist *btcoexist, u8 type);</div><div class='del'>-void exhalbtc_switch_band_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,</div><div class='del'>-					   u8 is_5g);</div><div class='del'>-void exhalbtc_signal_compensation(struct btc_coexist *btcoexist,</div><div class='del'>-				  u8 *rssi_wifi, u8 *rssi_bt);</div><div class='del'>-void exhalbtc_lps_leave(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_low_wifi_traffic_notify(struct btc_coexist *btcoexist);</div><div class='del'>-void exhalbtc_set_single_ant_path(struct btc_coexist *btcoexist,</div><div class='del'>-				  u8 single_ant_path);</div><div class='del'>-</div><div class='del'>-/* The following are used by wifi_only case */</div><div class='del'>-enum wifionly_chip_interface {</div><div class='del'>-	WIFIONLY_INTF_UNKNOWN	= 0,</div><div class='del'>-	WIFIONLY_INTF_PCI		= 1,</div><div class='del'>-	WIFIONLY_INTF_USB		= 2,</div><div class='del'>-	WIFIONLY_INTF_SDIO		= 3,</div><div class='del'>-	WIFIONLY_INTF_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum wifionly_customer_id {</div><div class='del'>-	CUSTOMER_NORMAL			= 0,</div><div class='del'>-	CUSTOMER_HP_1			= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct wifi_only_haldata {</div><div class='del'>-	u16		customer_id;</div><div class='del'>-	u8		efuse_pg_antnum;</div><div class='del'>-	u8		efuse_pg_antpath;</div><div class='del'>-	u8		rfe_type;</div><div class='del'>-	u8		ant_div_cfg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct wifi_only_cfg {</div><div class='del'>-	void				*adapter;</div><div class='del'>-	struct wifi_only_haldata	haldata_info;</div><div class='del'>-	enum wifionly_chip_interface	chip_interface;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void halwifionly_phy_set_bb_reg(struct wifi_only_cfg *wifi_conly_cfg,</div><div class='del'>-				u32 regaddr, u32 bitmask, u32 data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = (struct rtl_priv *)wifi_conly_cfg-&gt;adapter;</div><div class='del'>-</div><div class='del'>-	rtl_set_bbreg(rtlpriv-&gt;hw, regaddr, bitmask, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/rtl_btc.c b/drivers/staging/rtlwifi/btcoexist/rtl_btc.c<br/>deleted file mode 100644<br/>index dfd47b88e54b..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/rtl_btc.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/rtl_btc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,517 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2013  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "../wifi.h"</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include "rtl_btc.h"</div><div class='del'>-#include "halbt_precomp.h"</div><div class='del'>-</div><div class='del'>-static struct rtl_btc_ops rtl_btc_operation = {</div><div class='del'>-	.btc_init_variables = rtl_btc_init_variables,</div><div class='del'>-	.btc_init_variables_wifi_only = rtl_btc_init_variables_wifi_only,</div><div class='del'>-	.btc_deinit_variables = rtl_btc_deinit_variables,</div><div class='del'>-	.btc_init_hal_vars = rtl_btc_init_hal_vars,</div><div class='del'>-	.btc_power_on_setting = rtl_btc_power_on_setting,</div><div class='del'>-	.btc_init_hw_config = rtl_btc_init_hw_config,</div><div class='del'>-	.btc_init_hw_config_wifi_only = rtl_btc_init_hw_config_wifi_only,</div><div class='del'>-	.btc_ips_notify = rtl_btc_ips_notify,</div><div class='del'>-	.btc_lps_notify = rtl_btc_lps_notify,</div><div class='del'>-	.btc_scan_notify = rtl_btc_scan_notify,</div><div class='del'>-	.btc_scan_notify_wifi_only = rtl_btc_scan_notify_wifi_only,</div><div class='del'>-	.btc_connect_notify = rtl_btc_connect_notify,</div><div class='del'>-	.btc_mediastatus_notify = rtl_btc_mediastatus_notify,</div><div class='del'>-	.btc_periodical = rtl_btc_periodical,</div><div class='del'>-	.btc_halt_notify = rtl_btc_halt_notify,</div><div class='del'>-	.btc_btinfo_notify = rtl_btc_btinfo_notify,</div><div class='del'>-	.btc_btmpinfo_notify = rtl_btc_btmpinfo_notify,</div><div class='del'>-	.btc_is_limited_dig = rtl_btc_is_limited_dig,</div><div class='del'>-	.btc_is_disable_edca_turbo = rtl_btc_is_disable_edca_turbo,</div><div class='del'>-	.btc_is_bt_disabled = rtl_btc_is_bt_disabled,</div><div class='del'>-	.btc_special_packet_notify = rtl_btc_special_packet_notify,</div><div class='del'>-	.btc_switch_band_notify = rtl_btc_switch_band_notify,</div><div class='del'>-	.btc_switch_band_notify_wifi_only = rtl_btc_switch_band_notify_wifionly,</div><div class='del'>-	.btc_record_pwr_mode = rtl_btc_record_pwr_mode,</div><div class='del'>-	.btc_get_lps_val = rtl_btc_get_lps_val,</div><div class='del'>-	.btc_get_rpwm_val = rtl_btc_get_rpwm_val,</div><div class='del'>-	.btc_is_bt_ctrl_lps = rtl_btc_is_bt_ctrl_lps,</div><div class='del'>-	.btc_is_bt_lps_on = rtl_btc_is_bt_lps_on,</div><div class='del'>-	.btc_get_ampdu_cfg = rtl_btc_get_ampdu_cfg,</div><div class='del'>-	.btc_display_bt_coex_info = rtl_btc_display_bt_coex_info,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void rtl_btc_display_bt_coex_info(struct rtl_priv *rtlpriv, struct seq_file *m)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist) {</div><div class='del'>-		seq_puts(m, "btc_coexist context is NULL!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	exhalbtc_display_bt_coex_info(btcoexist, m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_record_pwr_mode(struct rtl_priv *rtlpriv, u8 *buf, u8 len)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-	u8 safe_len;</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	safe_len = sizeof(btcoexist-&gt;pwr_mode_val);</div><div class='del'>-</div><div class='del'>-	if (safe_len &gt; len)</div><div class='del'>-		safe_len = len;</div><div class='del'>-</div><div class='del'>-	memcpy(btcoexist-&gt;pwr_mode_val, buf, safe_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 rtl_btc_get_lps_val(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.lps_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 rtl_btc_get_rpwm_val(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.rpwm_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_btc_is_bt_ctrl_lps(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_ctrl_lps;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_btc_is_bt_lps_on(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.bt_lps_on;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_get_ampdu_cfg(struct rtl_priv *rtlpriv, u8 *reject_agg,</div><div class='del'>-			   u8 *ctrl_agg_size, u8 *agg_size)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist) {</div><div class='del'>-		*reject_agg = false;</div><div class='del'>-		*ctrl_agg_size = false;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reject_agg)</div><div class='del'>-		*reject_agg = btcoexist-&gt;bt_info.reject_agg_pkt;</div><div class='del'>-	if (ctrl_agg_size)</div><div class='del'>-		*ctrl_agg_size = btcoexist-&gt;bt_info.bt_ctrl_agg_buf_size;</div><div class='del'>-	if (agg_size)</div><div class='del'>-		*agg_size = btcoexist-&gt;bt_info.agg_buf_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_btc_alloc_variable(struct rtl_priv *rtlpriv, bool wifi_only)</div><div class='del'>-{</div><div class='del'>-	if (wifi_only)</div><div class='del'>-		rtlpriv-&gt;btcoexist.wifi_only_context =</div><div class='del'>-			kzalloc(sizeof(struct wifi_only_cfg), GFP_KERNEL);</div><div class='del'>-	else</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_context =</div><div class='del'>-			kzalloc(sizeof(struct btc_coexist), GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_btc_free_variable(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	kfree(rtlpriv-&gt;btcoexist.btc_context);</div><div class='del'>-	rtlpriv-&gt;btcoexist.btc_context = NULL;</div><div class='del'>-</div><div class='del'>-	kfree(rtlpriv-&gt;btcoexist.wifi_only_context);</div><div class='del'>-	rtlpriv-&gt;btcoexist.wifi_only_context = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_init_variables(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	rtl_btc_alloc_variable(rtlpriv, false);</div><div class='del'>-</div><div class='del'>-	exhalbtc_initlize_variables(rtlpriv);</div><div class='del'>-	exhalbtc_bind_bt_coex_withadapter(rtlpriv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_init_variables_wifi_only(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	rtl_btc_alloc_variable(rtlpriv, true);</div><div class='del'>-</div><div class='del'>-	exhalbtc_initlize_variables_wifi_only(rtlpriv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_deinit_variables(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	rtl_btc_free_variable(rtlpriv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	/* move ant_num, bt_type and single_ant_path to</div><div class='del'>-	 * exhalbtc_bind_bt_coex_withadapter()</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_power_on_setting(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_power_on_setting(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	u8 bt_exist;</div><div class='del'>-</div><div class='del'>-	bt_exist = rtl_get_hwpg_bt_exist(rtlpriv);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,</div><div class='del'>-		 "%s, bt_exist is %d\n", __func__, bt_exist);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_init_hw_config(btcoexist, !bt_exist);</div><div class='del'>-	exhalbtc_init_coex_dm(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_init_hw_config_wifi_only(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!wifionly_cfg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_init_hw_config_wifi_only(wifionly_cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_ips_notify(btcoexist, type);</div><div class='del'>-</div><div class='del'>-	if (type == ERFON) {</div><div class='del'>-		/*</div><div class='del'>-		 * In some situation, it doesn't scan after leaving IPS, and</div><div class='del'>-		 * this will cause btcoex in wrong state.</div><div class='del'>-		 */</div><div class='del'>-		exhalbtc_scan_notify(btcoexist, 1);</div><div class='del'>-		exhalbtc_scan_notify(btcoexist, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_lps_notify(struct rtl_priv *rtlpriv, u8 type)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_lps_notify(btcoexist, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_scan_notify(btcoexist, scantype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_scan_notify_wifi_only(struct rtl_priv *rtlpriv, u8 scantype)</div><div class='del'>-{</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-	struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);</div><div class='del'>-	u8 is_5g = (rtlhal-&gt;current_bandtype == BAND_ON_5G);</div><div class='del'>-</div><div class='del'>-	if (!wifionly_cfg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_scan_notify_wifi_only(wifionly_cfg, is_5g);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_connect_notify(struct rtl_priv *rtlpriv, u8 action)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_connect_notify(btcoexist, action);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv,</div><div class='del'>-				enum rt_media_status mstatus)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_mediastatus_notify(btcoexist, mstatus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_periodical(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*rtl_bt_dm_monitor();*/</div><div class='del'>-	exhalbtc_periodical(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_halt_notify(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_halt_notify(btcoexist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_bt_info_notify(btcoexist, tmp_buf, length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-	u8 extid, seq, len;</div><div class='del'>-	u16 bt_real_fw_ver;</div><div class='del'>-	u8 bt_fw_ver;</div><div class='del'>-	u8 *data;</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((length &lt; 4) || (!tmp_buf))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	extid = tmp_buf[0];</div><div class='del'>-	/* not response from BT FW then exit*/</div><div class='del'>-	if (extid != 1) /* C2H_TRIG_BY_BT_FW = 1 */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = tmp_buf[1] &gt;&gt; 4;</div><div class='del'>-	seq = tmp_buf[2] &gt;&gt; 4;</div><div class='del'>-	data = &amp;tmp_buf[3];</div><div class='del'>-</div><div class='del'>-	/* BT Firmware version response */</div><div class='del'>-	switch (seq) {</div><div class='del'>-	case BT_SEQ_GET_BT_VERSION:</div><div class='del'>-		bt_real_fw_ver = tmp_buf[3] | (tmp_buf[4] &lt;&lt; 8);</div><div class='del'>-		bt_fw_ver = tmp_buf[5];</div><div class='del'>-</div><div class='del'>-		btcoexist-&gt;bt_info.bt_real_fw_ver = bt_real_fw_ver;</div><div class='del'>-		btcoexist-&gt;bt_info.bt_fw_ver = bt_fw_ver;</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_AFH_MAP_L:</div><div class='del'>-		btcoexist-&gt;bt_info.afh_map_l = le32_to_cpu(*(__le32 *)data);</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_AFH_MAP_M:</div><div class='del'>-		btcoexist-&gt;bt_info.afh_map_m = le32_to_cpu(*(__le32 *)data);</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_AFH_MAP_H:</div><div class='del'>-		btcoexist-&gt;bt_info.afh_map_h = le16_to_cpu(*(__le16 *)data);</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_BT_COEX_SUPPORTED_FEATURE:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_supported_feature = tmp_buf[3] |</div><div class='del'>-							  (tmp_buf[4] &lt;&lt; 8);</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_BT_COEX_SUPPORTED_VERSION:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_supported_version = tmp_buf[3] |</div><div class='del'>-							  (tmp_buf[4] &lt;&lt; 8);</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_BT_ANT_DET_VAL:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_ant_det_val = tmp_buf[3];</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_BT_BLE_SCAN_PARA:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_ble_scan_para = tmp_buf[3] |</div><div class='del'>-						      (tmp_buf[4] &lt;&lt; 8) |</div><div class='del'>-						      (tmp_buf[5] &lt;&lt; 16) |</div><div class='del'>-						      (tmp_buf[6] &lt;&lt; 24);</div><div class='del'>-		break;</div><div class='del'>-	case BT_SEQ_GET_BT_BLE_SCAN_TYPE:</div><div class='del'>-		btcoexist-&gt;bt_info.bt_ble_scan_type = tmp_buf[3];</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,</div><div class='del'>-		 "btmpinfo complete req_num=%d\n", seq);</div><div class='del'>-</div><div class='del'>-	complete(&amp;btcoexist-&gt;bt_mp_comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return btcoexist-&gt;bt_info.limited_dig;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	bool bt_change_edca = false;</div><div class='del'>-	u32 cur_edca_val;</div><div class='del'>-	u32 edca_bt_hs_uplink = 0x5ea42b, edca_bt_hs_downlink = 0x5ea42b;</div><div class='del'>-	u32 edca_hs;</div><div class='del'>-	u32 edca_addr = 0x504;</div><div class='del'>-</div><div class='del'>-	cur_edca_val = rtl_read_dword(rtlpriv, edca_addr);</div><div class='del'>-	if (halbtc_is_wifi_uplink(rtlpriv)) {</div><div class='del'>-		if (cur_edca_val != edca_bt_hs_uplink) {</div><div class='del'>-			edca_hs = edca_bt_hs_uplink;</div><div class='del'>-			bt_change_edca = true;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (cur_edca_val != edca_bt_hs_downlink) {</div><div class='del'>-			edca_hs = edca_bt_hs_downlink;</div><div class='del'>-			bt_change_edca = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bt_change_edca)</div><div class='del'>-		rtl_write_dword(rtlpriv, edca_addr, edca_hs);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* It seems 'bt_disabled' is never be initialized or set. */</div><div class='del'>-	if (btcoexist-&gt;bt_info.bt_disabled)</div><div class='del'>-		return true;</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	return exhalbtc_special_packet_notify(btcoexist, pkt_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_switch_band_notify(struct rtl_priv *rtlpriv, u8 band_type,</div><div class='del'>-				bool scanning)</div><div class='del'>-{</div><div class='del'>-	struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);</div><div class='del'>-	u8 type = BTC_NOT_SWITCH;</div><div class='del'>-</div><div class='del'>-	if (!btcoexist)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (band_type) {</div><div class='del'>-	case BAND_ON_2_4G:</div><div class='del'>-		if (scanning)</div><div class='del'>-			type = BTC_SWITCH_TO_24G;</div><div class='del'>-		else</div><div class='del'>-			type = BTC_SWITCH_TO_24G_NOFORSCAN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BAND_ON_5G:</div><div class='del'>-		type = BTC_SWITCH_TO_5G;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type != BTC_NOT_SWITCH)</div><div class='del'>-		exhalbtc_switch_band_notify(btcoexist, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_btc_switch_band_notify_wifionly(struct rtl_priv *rtlpriv, u8 band_type,</div><div class='del'>-					 bool scanning)</div><div class='del'>-{</div><div class='del'>-	struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);</div><div class='del'>-	u8 is_5g = (band_type == BAND_ON_5G);</div><div class='del'>-</div><div class='del'>-	if (!wifionly_cfg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	exhalbtc_switch_band_notify_wifi_only(wifionly_cfg, is_5g);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct rtl_btc_ops *rtl_btc_get_ops_pointer(void)</div><div class='del'>-{</div><div class='del'>-	return &amp;rtl_btc_operation;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	enum rt_media_status    m_status = RT_MEDIA_DISCONNECT;</div><div class='del'>-</div><div class='del'>-	u8 bibss = (mac-&gt;opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	if (bibss || rtlpriv-&gt;mac80211.link_state &gt;= MAC80211_LINKED)</div><div class='del'>-		m_status = RT_MEDIA_CONNECT;</div><div class='del'>-</div><div class='del'>-	return m_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 rtl_get_hwpg_bt_exist(struct rtl_priv *rtlpriv)</div><div class='del'>-{</div><div class='del'>-	return rtlpriv-&gt;btcoexist.btc_info.btcoexist;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/btcoexist/rtl_btc.h b/drivers/staging/rtlwifi/btcoexist/rtl_btc.h<br/>deleted file mode 100644<br/>index 0141f4641ef0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/btcoexist/rtl_btc.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/btcoexist/rtl_btc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2010  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __RTL_BTC_H__</div><div class='del'>-#define __RTL_BTC_H__</div><div class='del'>-</div><div class='del'>-#include "halbt_precomp.h"</div><div class='del'>-</div><div class='del'>-void rtl_btc_init_variables(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_init_variables_wifi_only(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_deinit_variables(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_power_on_setting(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_init_hw_config_wifi_only(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type);</div><div class='del'>-void rtl_btc_lps_notify(struct rtl_priv *rtlpriv, u8 type);</div><div class='del'>-void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype);</div><div class='del'>-void rtl_btc_scan_notify_wifi_only(struct rtl_priv *rtlpriv, u8 scantype);</div><div class='del'>-void rtl_btc_connect_notify(struct rtl_priv *rtlpriv, u8 action);</div><div class='del'>-void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv,</div><div class='del'>-				enum rt_media_status mstatus);</div><div class='del'>-void rtl_btc_periodical(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_halt_notify(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmpbuf, u8 length);</div><div class='del'>-void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length);</div><div class='del'>-bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv);</div><div class='del'>-bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv);</div><div class='del'>-bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type);</div><div class='del'>-void rtl_btc_switch_band_notify(struct rtl_priv *rtlpriv, u8 band_type,</div><div class='del'>-				bool scanning);</div><div class='del'>-void rtl_btc_switch_band_notify_wifionly(struct rtl_priv *rtlpriv, u8 band_type,</div><div class='del'>-					 bool scanning);</div><div class='del'>-void rtl_btc_display_bt_coex_info(struct rtl_priv *rtlpriv, struct seq_file *m);</div><div class='del'>-void rtl_btc_record_pwr_mode(struct rtl_priv *rtlpriv, u8 *buf, u8 len);</div><div class='del'>-u8   rtl_btc_get_lps_val(struct rtl_priv *rtlpriv);</div><div class='del'>-u8   rtl_btc_get_rpwm_val(struct rtl_priv *rtlpriv);</div><div class='del'>-bool rtl_btc_is_bt_ctrl_lps(struct rtl_priv *rtlpriv);</div><div class='del'>-bool rtl_btc_is_bt_lps_on(struct rtl_priv *rtlpriv);</div><div class='del'>-void rtl_btc_get_ampdu_cfg(struct rtl_priv *rtlpriv, u8 *reject_agg,</div><div class='del'>-			   u8 *ctrl_agg_size, u8 *agg_size);</div><div class='del'>-</div><div class='del'>-struct rtl_btc_ops *rtl_btc_get_ops_pointer(void);</div><div class='del'>-</div><div class='del'>-u8 rtl_get_hwpg_bt_exist(struct rtl_priv *rtlpriv);</div><div class='del'>-u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv);</div><div class='del'>-u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv);</div><div class='del'>-u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv);</div><div class='del'>-u8 rtl_get_hwpg_package_type(struct rtl_priv *rtlpriv);</div><div class='del'>-</div><div class='del'>-enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/cam.c b/drivers/staging/rtlwifi/cam.c<br/>deleted file mode 100644<br/>index e8572d654655..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/cam.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/cam.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,315 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "wifi.h"</div><div class='del'>-#include "cam.h"</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-void rtl_cam_reset_sec_info(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;sec.use_defaultkey = false;</div><div class='del'>-	rtlpriv-&gt;sec.pairwise_enc_algorithm = NO_ENCRYPTION;</div><div class='del'>-	rtlpriv-&gt;sec.group_enc_algorithm = NO_ENCRYPTION;</div><div class='del'>-	memset(rtlpriv-&gt;sec.key_buf, 0, KEY_BUF_SIZE * MAX_KEY_LEN);</div><div class='del'>-	memset(rtlpriv-&gt;sec.key_len, 0, KEY_BUF_SIZE);</div><div class='del'>-	rtlpriv-&gt;sec.pairwise_key = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,</div><div class='del'>-				  u8 *mac_addr, u8 *key_cont_128, u16 us_config)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	u32 target_command;</div><div class='del'>-	u32 target_content = 0;</div><div class='del'>-	int entry_i;</div><div class='del'>-</div><div class='del'>-	RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_DMESG, "Key content :",</div><div class='del'>-		      key_cont_128, 16);</div><div class='del'>-</div><div class='del'>-	/* 0-1 config + mac, 2-5 fill 128key,6-7 are reserved */</div><div class='del'>-	for (entry_i = CAM_CONTENT_COUNT - 1; entry_i &gt;= 0; entry_i--) {</div><div class='del'>-		target_command = entry_i + CAM_CONTENT_COUNT * entry_no;</div><div class='del'>-		target_command = target_command | BIT(31) | BIT(16);</div><div class='del'>-</div><div class='del'>-		if (entry_i == 0) {</div><div class='del'>-			target_content = (u32)(*(mac_addr + 0)) &lt;&lt; 16 |</div><div class='del'>-					 (u32)(*(mac_addr + 1)) &lt;&lt; 24 |</div><div class='del'>-					 (u32)us_config;</div><div class='del'>-</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[WCAMI],</div><div class='del'>-					target_content);</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM],</div><div class='del'>-					target_command);</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "WRITE %x: %x\n",</div><div class='del'>-				 rtlpriv-&gt;cfg-&gt;maps[WCAMI], target_content);</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "The Key ID is %d\n", entry_no);</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "WRITE %x: %x\n",</div><div class='del'>-				 rtlpriv-&gt;cfg-&gt;maps[RWCAM], target_command);</div><div class='del'>-</div><div class='del'>-		} else if (entry_i == 1) {</div><div class='del'>-			target_content = (u32)(*(mac_addr + 5)) &lt;&lt; 24 |</div><div class='del'>-					 (u32)(*(mac_addr + 4)) &lt;&lt; 16 |</div><div class='del'>-					 (u32)(*(mac_addr + 3)) &lt;&lt; 8 |</div><div class='del'>-					 (u32)(*(mac_addr + 2));</div><div class='del'>-</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[WCAMI],</div><div class='del'>-					target_content);</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM],</div><div class='del'>-					target_command);</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "WRITE A4: %x\n", target_content);</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "WRITE A0: %x\n", target_command);</div><div class='del'>-		} else {</div><div class='del'>-			target_content =</div><div class='del'>-			    (u32)(*(key_cont_128 + (entry_i * 4 - 8) + 3)) &lt;&lt;</div><div class='del'>-			    24 | (u32)(*(key_cont_128 + (entry_i * 4 - 8) + 2))</div><div class='del'>-			    &lt;&lt; 16 |</div><div class='del'>-			    (u32)(*(key_cont_128 + (entry_i * 4 - 8) + 1)) &lt;&lt; 8</div><div class='del'>-			    | (u32)(*(key_cont_128 + (entry_i * 4 - 8) + 0));</div><div class='del'>-</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[WCAMI],</div><div class='del'>-					target_content);</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM],</div><div class='del'>-					target_command);</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "WRITE A4: %x\n", target_content);</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-				 "WRITE A0: %x\n", target_command);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-		 "after set key, usconfig:%x\n", us_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,</div><div class='del'>-			 u32 ul_key_id, u32 ul_entry_idx, u32 ul_enc_alg,</div><div class='del'>-			 u32 ul_default_key, u8 *key_content)</div><div class='del'>-{</div><div class='del'>-	u32 us_config;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-		 "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",</div><div class='del'>-		 ul_entry_idx, ul_key_id, ul_enc_alg,</div><div class='del'>-		 ul_default_key, mac_addr);</div><div class='del'>-</div><div class='del'>-	if (ul_key_id == TOTAL_CAM_ENTRY) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,</div><div class='del'>-			 "ulKeyId exceed!\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ul_default_key == 1)</div><div class='del'>-		us_config = CFG_VALID | ((u16)(ul_enc_alg) &lt;&lt; 2);</div><div class='del'>-	else</div><div class='del'>-		us_config = CFG_VALID | ((ul_enc_alg) &lt;&lt; 2) | ul_key_id;</div><div class='del'>-</div><div class='del'>-	rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,</div><div class='del'>-			      (u8 *)key_content, us_config);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "end\n");</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_cam_delete_one_entry(struct ieee80211_hw *hw,</div><div class='del'>-			     u8 *mac_addr, u32 ul_key_id)</div><div class='del'>-{</div><div class='del'>-	u32 ul_command;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);</div><div class='del'>-</div><div class='del'>-	ul_command = ul_key_id * CAM_CONTENT_COUNT;</div><div class='del'>-	ul_command = ul_command | BIT(31) | BIT(16);</div><div class='del'>-</div><div class='del'>-	rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[WCAMI], 0);</div><div class='del'>-	rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM], ul_command);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-		 "%s(): WRITE A4: %x\n", __func__, 0);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-		 "%s(): WRITE A0: %x\n", __func__, ul_command);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_cam_reset_all_entry(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	u32 ul_command;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	ul_command = BIT(31) | BIT(30);</div><div class='del'>-	rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM], ul_command);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	u32 ul_command;</div><div class='del'>-	u32 ul_content;</div><div class='del'>-	u32 ul_enc_algo;</div><div class='del'>-</div><div class='del'>-	switch (rtlpriv-&gt;sec.pairwise_enc_algorithm) {</div><div class='del'>-	case WEP40_ENCRYPTION:</div><div class='del'>-		ul_enc_algo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_WEP40];</div><div class='del'>-		break;</div><div class='del'>-	case WEP104_ENCRYPTION:</div><div class='del'>-		ul_enc_algo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_WEP104];</div><div class='del'>-		break;</div><div class='del'>-	case TKIP_ENCRYPTION:</div><div class='del'>-		ul_enc_algo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_TKIP];</div><div class='del'>-		break;</div><div class='del'>-	case AESCCMP_ENCRYPTION:</div><div class='del'>-		ul_enc_algo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_AES];</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ul_enc_algo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_AES];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ul_content = (uc_index &amp; 3) | ((u16)(ul_enc_algo) &lt;&lt; 2);</div><div class='del'>-</div><div class='del'>-	ul_content |= BIT(15);</div><div class='del'>-	ul_command = CAM_CONTENT_COUNT * uc_index;</div><div class='del'>-	ul_command = ul_command | BIT(31) | BIT(16);</div><div class='del'>-</div><div class='del'>-	rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[WCAMI], ul_content);</div><div class='del'>-	rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM], ul_command);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-		 "%s(): WRITE A4: %x\n", __func__, ul_content);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-		 "%s(): WRITE A0: %x\n", __func__, ul_command);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	u32 ul_command;</div><div class='del'>-	u32 ul_content;</div><div class='del'>-	u32 ul_encalgo;</div><div class='del'>-	u8 entry_i;</div><div class='del'>-</div><div class='del'>-	switch (rtlpriv-&gt;sec.pairwise_enc_algorithm) {</div><div class='del'>-	case WEP40_ENCRYPTION:</div><div class='del'>-		ul_encalgo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_WEP40];</div><div class='del'>-		break;</div><div class='del'>-	case WEP104_ENCRYPTION:</div><div class='del'>-		ul_encalgo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_WEP104];</div><div class='del'>-		break;</div><div class='del'>-	case TKIP_ENCRYPTION:</div><div class='del'>-		ul_encalgo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_TKIP];</div><div class='del'>-		break;</div><div class='del'>-	case AESCCMP_ENCRYPTION:</div><div class='del'>-		ul_encalgo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_AES];</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ul_encalgo = rtlpriv-&gt;cfg-&gt;maps[SEC_CAM_AES];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (entry_i = 0; entry_i &lt; CAM_CONTENT_COUNT; entry_i++) {</div><div class='del'>-		if (entry_i == 0) {</div><div class='del'>-			ul_content =</div><div class='del'>-			    (uc_index &amp; 0x03) | ((u16)(ul_encalgo) &lt;&lt; 2);</div><div class='del'>-			ul_content |= BIT(15);</div><div class='del'>-		} else {</div><div class='del'>-			ul_content = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ul_command = CAM_CONTENT_COUNT * uc_index + entry_i;</div><div class='del'>-		ul_command = ul_command | BIT(31) | BIT(16);</div><div class='del'>-</div><div class='del'>-		rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[WCAMI], ul_content);</div><div class='del'>-		rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM], ul_command);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-			 "%s(): WRITE A4: %x\n", __func__, ul_content);</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,</div><div class='del'>-			 "%s(): WRITE A0: %x\n", __func__, ul_command);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u32 bitmap = (rtlpriv-&gt;sec.hwsec_cam_bitmap) &gt;&gt; 4;</div><div class='del'>-	u8 entry_idx = 0;</div><div class='del'>-	u8 i, *addr;</div><div class='del'>-</div><div class='del'>-	if (!sta_addr) {</div><div class='del'>-		pr_err("sta_addr is NULL.\n");</div><div class='del'>-		return TOTAL_CAM_ENTRY;</div><div class='del'>-	}</div><div class='del'>-	/* Does STA already exist? */</div><div class='del'>-	for (i = 4; i &lt; TOTAL_CAM_ENTRY; i++) {</div><div class='del'>-		addr = rtlpriv-&gt;sec.hwsec_cam_sta_addr[i];</div><div class='del'>-		if (ether_addr_equal_unaligned(addr, sta_addr))</div><div class='del'>-			return i;</div><div class='del'>-	}</div><div class='del'>-	/* Get a free CAM entry. */</div><div class='del'>-	for (entry_idx = 4; entry_idx &lt; TOTAL_CAM_ENTRY; entry_idx++) {</div><div class='del'>-		if ((bitmap &amp; BIT(0)) == 0) {</div><div class='del'>-			pr_err("-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",</div><div class='del'>-			       rtlpriv-&gt;sec.hwsec_cam_bitmap, entry_idx);</div><div class='del'>-			rtlpriv-&gt;sec.hwsec_cam_bitmap |= BIT(0) &lt;&lt; entry_idx;</div><div class='del'>-			memcpy(rtlpriv-&gt;sec.hwsec_cam_sta_addr[entry_idx],</div><div class='del'>-			       sta_addr, ETH_ALEN);</div><div class='del'>-			return entry_idx;</div><div class='del'>-		}</div><div class='del'>-		bitmap = bitmap &gt;&gt; 1;</div><div class='del'>-	}</div><div class='del'>-	return TOTAL_CAM_ENTRY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u32 bitmap;</div><div class='del'>-	u8 i, *addr;</div><div class='del'>-</div><div class='del'>-	if (!sta_addr) {</div><div class='del'>-		pr_err("sta_addr is NULL.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_zero_ether_addr(sta_addr)) {</div><div class='del'>-		pr_err("sta_addr is %pM\n", sta_addr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* Does STA already exist? */</div><div class='del'>-	for (i = 4; i &lt; TOTAL_CAM_ENTRY; i++) {</div><div class='del'>-		addr = rtlpriv-&gt;sec.hwsec_cam_sta_addr[i];</div><div class='del'>-		bitmap = (rtlpriv-&gt;sec.hwsec_cam_bitmap) &gt;&gt; i;</div><div class='del'>-		if (((bitmap &amp; BIT(0)) == BIT(0)) &amp;&amp;</div><div class='del'>-		    (ether_addr_equal_unaligned(addr, sta_addr))) {</div><div class='del'>-			/* Remove from HW Security CAM */</div><div class='del'>-			eth_zero_addr(rtlpriv-&gt;sec.hwsec_cam_sta_addr[i]);</div><div class='del'>-			rtlpriv-&gt;sec.hwsec_cam_bitmap &amp;= ~(BIT(0) &lt;&lt; i);</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-				 "&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;del entry %d\n", i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/cam.h b/drivers/staging/rtlwifi/cam.h<br/>deleted file mode 100644<br/>index 3f1d8b5a13a5..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/cam.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/cam.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __RTL_CAM_H_</div><div class='del'>-#define __RTL_CAM_H_</div><div class='del'>-</div><div class='del'>-#define CAM_CONTENT_COUNT				8</div><div class='del'>-</div><div class='del'>-#define CFG_VALID					BIT(15)</div><div class='del'>-</div><div class='del'>-#define PAIRWISE_KEYIDX					0</div><div class='del'>-#define CAM_PAIRWISE_KEY_POSITION			4</div><div class='del'>-</div><div class='del'>-#define	CAM_CONFIG_NO_USEDK				0</div><div class='del'>-</div><div class='del'>-void rtl_cam_reset_all_entry(struct ieee80211_hw *hw);</div><div class='del'>-u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,</div><div class='del'>-			 u32 ul_key_id, u32 ul_entry_idx, u32 ul_enc_alg,</div><div class='del'>-			 u32 ul_default_key, u8 *key_content);</div><div class='del'>-int rtl_cam_delete_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,</div><div class='del'>-			     u32 ul_key_id);</div><div class='del'>-void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index);</div><div class='del'>-void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index);</div><div class='del'>-void rtl_cam_reset_sec_info(struct ieee80211_hw *hw);</div><div class='del'>-u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr);</div><div class='del'>-void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/core.c b/drivers/staging/rtlwifi/core.c<br/>deleted file mode 100644<br/>index a9902818ae7e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/core.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/core.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1996 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "wifi.h"</div><div class='del'>-#include "core.h"</div><div class='del'>-#include "cam.h"</div><div class='del'>-#include "base.h"</div><div class='del'>-#include "ps.h"</div><div class='del'>-#include "pwrseqcmd.h"</div><div class='del'>-</div><div class='del'>-#include "btcoexist/rtl_btc.h"</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-</div><div class='del'>-u8 channel5g[CHANNEL_MAX_NUMBER_5G] = {</div><div class='del'>-	36, 38, 40, 42, 44, 46, 48,		/* Band 1 */</div><div class='del'>-	52, 54, 56, 58, 60, 62, 64,		/* Band 2 */</div><div class='del'>-	100, 102, 104, 106, 108, 110, 112,	/* Band 3 */</div><div class='del'>-	116, 118, 120, 122, 124, 126, 128,	/* Band 3 */</div><div class='del'>-	132, 134, 136, 138, 140, 142, 144,	/* Band 3 */</div><div class='del'>-	149, 151, 153, 155, 157, 159, 161,	/* Band 4 */</div><div class='del'>-	165, 167, 169, 171, 173, 175, 177	/* Band 4 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-u8 channel5g_80m[CHANNEL_MAX_NUMBER_5G_80M] = {</div><div class='del'>-	42, 58, 106, 122, 138, 155, 171</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void rtl_fw_do_work(const struct firmware *firmware, void *context,</div><div class='del'>-			   bool is_wow)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = context;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,</div><div class='del'>-		 "Firmware callback routine entered!\n");</div><div class='del'>-	complete(&amp;rtlpriv-&gt;firmware_loading_complete);</div><div class='del'>-	if (!firmware) {</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;alt_fw_name) {</div><div class='del'>-			err = request_firmware(&amp;firmware,</div><div class='del'>-					       rtlpriv-&gt;cfg-&gt;alt_fw_name,</div><div class='del'>-					       rtlpriv-&gt;io.dev);</div><div class='del'>-			pr_info("Loading alternative firmware %s\n",</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;alt_fw_name);</div><div class='del'>-			if (!err)</div><div class='del'>-				goto found_alt;</div><div class='del'>-		}</div><div class='del'>-		pr_err("Selected firmware is not available\n");</div><div class='del'>-		rtlpriv-&gt;max_fw_size = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-found_alt:</div><div class='del'>-	if (firmware-&gt;size &gt; rtlpriv-&gt;max_fw_size) {</div><div class='del'>-		pr_err("Firmware is too big!\n");</div><div class='del'>-		release_firmware(firmware);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (!is_wow) {</div><div class='del'>-		memcpy(rtlpriv-&gt;rtlhal.pfirmware, firmware-&gt;data,</div><div class='del'>-		       firmware-&gt;size);</div><div class='del'>-		rtlpriv-&gt;rtlhal.fwsize = firmware-&gt;size;</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(rtlpriv-&gt;rtlhal.wowlan_firmware, firmware-&gt;data,</div><div class='del'>-		       firmware-&gt;size);</div><div class='del'>-		rtlpriv-&gt;rtlhal.wowlan_fwsize = firmware-&gt;size;</div><div class='del'>-	}</div><div class='del'>-	rtlpriv-&gt;rtlhal.fwsize = firmware-&gt;size;</div><div class='del'>-	release_firmware(firmware);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_fw_cb(const struct firmware *firmware, void *context)</div><div class='del'>-{</div><div class='del'>-	rtl_fw_do_work(firmware, context, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_wowlan_fw_cb(const struct firmware *firmware, void *context)</div><div class='del'>-{</div><div class='del'>-	rtl_fw_do_work(firmware, context, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*mutex for start &amp; stop is must here. */</div><div class='del'>-static int rtl_op_start(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	if (!is_hal_stop(rtlhal))</div><div class='del'>-		return 0;</div><div class='del'>-	if (!test_bit(RTL_STATUS_INTERFACE_START, &amp;rtlpriv-&gt;status))</div><div class='del'>-		return 0;</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	err = rtlpriv-&gt;intf_ops-&gt;adapter_start(hw);</div><div class='del'>-	if (!err)</div><div class='del'>-		rtl_watch_dog_timer_callback(&amp;rtlpriv-&gt;works.watchdog_timer);</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_stop(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-	bool support_remote_wakeup = false;</div><div class='del'>-</div><div class='del'>-	if (is_hal_stop(rtlhal))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;get_hw_reg(hw, HAL_DEF_WOWLAN,</div><div class='del'>-				      (u8 *)(&amp;support_remote_wakeup));</div><div class='del'>-	/* here is must, because adhoc do stop and start,</div><div class='del'>-	 * but stop with RFOFF may cause something wrong,</div><div class='del'>-	 * like adhoc TP</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(ppsc-&gt;rfpwr_state == ERFOFF))</div><div class='del'>-		rtl_ips_nic_on(hw);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	/* if wowlan supported, DON'T clear connected info */</div><div class='del'>-	if (!(support_remote_wakeup &amp;&amp;</div><div class='del'>-	      rtlhal-&gt;enter_pnp_sleep)) {</div><div class='del'>-		mac-&gt;link_state = MAC80211_NOLINK;</div><div class='del'>-		eth_zero_addr(mac-&gt;bssid);</div><div class='del'>-		mac-&gt;vendor = PEER_UNKNOWN;</div><div class='del'>-</div><div class='del'>-		/* reset sec info */</div><div class='del'>-		rtl_cam_reset_sec_info(hw);</div><div class='del'>-</div><div class='del'>-		rtl_deinit_deferred_work(hw);</div><div class='del'>-	}</div><div class='del'>-	rtlpriv-&gt;intf_ops-&gt;adapter_stop(hw);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_tx(struct ieee80211_hw *hw,</div><div class='del'>-		      struct ieee80211_tx_control *control,</div><div class='del'>-		      struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-	struct rtl_tcb_desc tcb_desc;</div><div class='del'>-</div><div class='del'>-	memset(&amp;tcb_desc, 0, sizeof(struct rtl_tcb_desc));</div><div class='del'>-</div><div class='del'>-	if (unlikely(is_hal_stop(rtlhal) || ppsc-&gt;rfpwr_state != ERFON))</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(RTL_STATUS_INTERFACE_START, &amp;rtlpriv-&gt;status))</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	if (!rtlpriv-&gt;intf_ops-&gt;waitq_insert(hw, control-&gt;sta, skb))</div><div class='del'>-		rtlpriv-&gt;intf_ops-&gt;adapter_tx(hw, control-&gt;sta, skb, &amp;tcb_desc);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-err_free:</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_add_interface(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	int err = 0;</div><div class='del'>-	u8 retry_limit = 0x30;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;vif) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,</div><div class='del'>-			 "vif has been set!! mac-&gt;vif = 0x%p\n", mac-&gt;vif);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-</div><div class='del'>-	rtl_ips_nic_on(hw);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	switch (ieee80211_vif_type_p2p(vif)) {</div><div class='del'>-	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		mac-&gt;p2p = P2P_ROLE_CLIENT;</div><div class='del'>-		/*fall through*/</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (mac-&gt;beacon_enabled == 1) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "NL80211_IFTYPE_STATION\n");</div><div class='del'>-			mac-&gt;beacon_enabled = 0;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;update_interrupt_mask(hw, 0,</div><div class='del'>-					rtlpriv-&gt;cfg-&gt;maps[RTL_IBSS_INT_MASKS]);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "NL80211_IFTYPE_ADHOC\n");</div><div class='del'>-</div><div class='del'>-		mac-&gt;link_state = MAC80211_LINKED;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_bcn_reg(hw);</div><div class='del'>-		if (rtlpriv-&gt;rtlhal.current_bandtype == BAND_ON_2_4G)</div><div class='del'>-			mac-&gt;basic_rates = 0xfff;</div><div class='del'>-		else</div><div class='del'>-			mac-&gt;basic_rates = 0xff0;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_BASIC_RATE,</div><div class='del'>-				(u8 *)(&amp;mac-&gt;basic_rates));</div><div class='del'>-</div><div class='del'>-		retry_limit = 0x07;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		mac-&gt;p2p = P2P_ROLE_GO;</div><div class='del'>-		/*fall through*/</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "NL80211_IFTYPE_AP\n");</div><div class='del'>-</div><div class='del'>-		mac-&gt;link_state = MAC80211_LINKED;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_bcn_reg(hw);</div><div class='del'>-		if (rtlpriv-&gt;rtlhal.current_bandtype == BAND_ON_2_4G)</div><div class='del'>-			mac-&gt;basic_rates = 0xfff;</div><div class='del'>-		else</div><div class='del'>-			mac-&gt;basic_rates = 0xff0;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_BASIC_RATE,</div><div class='del'>-					      (u8 *)(&amp;mac-&gt;basic_rates));</div><div class='del'>-</div><div class='del'>-		retry_limit = 0x07;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "NL80211_IFTYPE_MESH_POINT\n");</div><div class='del'>-</div><div class='del'>-		mac-&gt;link_state = MAC80211_LINKED;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_bcn_reg(hw);</div><div class='del'>-		if (rtlpriv-&gt;rtlhal.current_bandtype == BAND_ON_2_4G)</div><div class='del'>-			mac-&gt;basic_rates = 0xfff;</div><div class='del'>-		else</div><div class='del'>-			mac-&gt;basic_rates = 0xff0;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_BASIC_RATE,</div><div class='del'>-				(u8 *)(&amp;mac-&gt;basic_rates));</div><div class='del'>-</div><div class='del'>-		retry_limit = 0x07;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("operation mode %d is not supported!\n",</div><div class='del'>-		       vif-&gt;type);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;p2p) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "p2p role %x\n", vif-&gt;type);</div><div class='del'>-		mac-&gt;basic_rates = 0xff0;/*disable cck rate for p2p*/</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_BASIC_RATE,</div><div class='del'>-				(u8 *)(&amp;mac-&gt;basic_rates));</div><div class='del'>-	}</div><div class='del'>-	mac-&gt;vif = vif;</div><div class='del'>-	mac-&gt;opmode = vif-&gt;type;</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_network_type(hw, vif-&gt;type);</div><div class='del'>-	memcpy(mac-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_ETHER_ADDR, mac-&gt;mac_addr);</div><div class='del'>-</div><div class='del'>-	mac-&gt;retry_long = retry_limit;</div><div class='del'>-	mac-&gt;retry_short = retry_limit;</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_RETRY_LIMIT,</div><div class='del'>-			(u8 *)(&amp;retry_limit));</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_remove_interface(struct ieee80211_hw *hw,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-</div><div class='del'>-	/* Free beacon resources */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-		if (mac-&gt;beacon_enabled == 1) {</div><div class='del'>-			mac-&gt;beacon_enabled = 0;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;update_interrupt_mask(hw, 0,</div><div class='del'>-					rtlpriv-&gt;cfg-&gt;maps[RTL_IBSS_INT_MASKS]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *Note: We assume NL80211_IFTYPE_UNSPECIFIED as</div><div class='del'>-	 *NO LINK for our hardware.</div><div class='del'>-	 */</div><div class='del'>-	mac-&gt;p2p = 0;</div><div class='del'>-	mac-&gt;vif = NULL;</div><div class='del'>-	mac-&gt;link_state = MAC80211_NOLINK;</div><div class='del'>-	eth_zero_addr(mac-&gt;bssid);</div><div class='del'>-	mac-&gt;vendor = PEER_UNKNOWN;</div><div class='del'>-	mac-&gt;opmode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_network_type(hw, mac-&gt;opmode);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_change_interface(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   enum nl80211_iftype new_type, bool p2p)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	rtl_op_remove_interface(hw, vif);</div><div class='del'>-</div><div class='del'>-	vif-&gt;type = new_type;</div><div class='del'>-	vif-&gt;p2p = p2p;</div><div class='del'>-	ret = rtl_op_add_interface(hw, vif);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-		 "p2p  %x\n", p2p);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static u16 crc16_ccitt(u8 data, u16 crc)</div><div class='del'>-{</div><div class='del'>-	u8 shift_in, data_bit, crc_bit11, crc_bit4, crc_bit15;</div><div class='del'>-	u8 i;</div><div class='del'>-	u16 result;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		crc_bit15 = ((crc &amp; BIT(15)) ? 1 : 0);</div><div class='del'>-		data_bit  = (data &amp; (BIT(0) &lt;&lt; i) ? 1 : 0);</div><div class='del'>-		shift_in = crc_bit15 ^ data_bit;</div><div class='del'>-</div><div class='del'>-		result = crc &lt;&lt; 1;</div><div class='del'>-		if (shift_in == 0)</div><div class='del'>-			result &amp;= (~BIT(0));</div><div class='del'>-		else</div><div class='del'>-			result |= BIT(0);</div><div class='del'>-</div><div class='del'>-		crc_bit11 = ((crc &amp; BIT(11)) ? 1 : 0) ^ shift_in;</div><div class='del'>-		if (crc_bit11 == 0)</div><div class='del'>-			result &amp;= (~BIT(12));</div><div class='del'>-		else</div><div class='del'>-			result |= BIT(12);</div><div class='del'>-</div><div class='del'>-		crc_bit4 = ((crc &amp; BIT(4)) ? 1 : 0) ^ shift_in;</div><div class='del'>-		if (crc_bit4 == 0)</div><div class='del'>-			result &amp;= (~BIT(5));</div><div class='del'>-		else</div><div class='del'>-			result |= BIT(5);</div><div class='del'>-</div><div class='del'>-		crc = result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 _calculate_wol_pattern_crc(u8 *pattern, u16 len)</div><div class='del'>-{</div><div class='del'>-	u16 crc = 0xffff;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++)</div><div class='del'>-		crc = crc16_ccitt(pattern[i], crc);</div><div class='del'>-</div><div class='del'>-	crc = ~crc;</div><div class='del'>-</div><div class='del'>-	return crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _rtl_add_wowlan_patterns(struct ieee80211_hw *hw,</div><div class='del'>-				     struct cfg80211_wowlan *wow)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = &amp;rtlpriv-&gt;mac80211;</div><div class='del'>-	struct cfg80211_pkt_pattern *patterns = wow-&gt;patterns;</div><div class='del'>-	struct rtl_wow_pattern rtl_pattern;</div><div class='del'>-	const u8 *pattern_os, *mask_os;</div><div class='del'>-	u8 mask[MAX_WOL_BIT_MASK_SIZE] = {0};</div><div class='del'>-	u8 content[MAX_WOL_PATTERN_SIZE] = {0};</div><div class='del'>-	u8 broadcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='del'>-	u8 multicast_addr1[2] = {0x33, 0x33};</div><div class='del'>-	u8 multicast_addr2[3] = {0x01, 0x00, 0x5e};</div><div class='del'>-	u8 i, mask_len;</div><div class='del'>-	u16 j, len;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; wow-&gt;n_patterns; i++) {</div><div class='del'>-		memset(&amp;rtl_pattern, 0, sizeof(struct rtl_wow_pattern));</div><div class='del'>-		memset(mask, 0, MAX_WOL_BIT_MASK_SIZE);</div><div class='del'>-		if (patterns[i].pattern_len &lt; 0 ||</div><div class='del'>-		    patterns[i].pattern_len &gt; MAX_WOL_PATTERN_SIZE) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_POWER, DBG_WARNING,</div><div class='del'>-				 "Pattern[%d] is too long\n", i);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		pattern_os = patterns[i].pattern;</div><div class='del'>-		mask_len = DIV_ROUND_UP(patterns[i].pattern_len, 8);</div><div class='del'>-		mask_os = patterns[i].mask;</div><div class='del'>-		RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,</div><div class='del'>-			      "pattern content\n", pattern_os,</div><div class='del'>-			       patterns[i].pattern_len);</div><div class='del'>-		RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,</div><div class='del'>-			      "mask content\n", mask_os, mask_len);</div><div class='del'>-		/* 1. unicast? multicast? or broadcast? */</div><div class='del'>-		if (memcmp(pattern_os, broadcast_addr, 6) == 0)</div><div class='del'>-			rtl_pattern.type = BROADCAST_PATTERN;</div><div class='del'>-		else if (memcmp(pattern_os, multicast_addr1, 2) == 0 ||</div><div class='del'>-			 memcmp(pattern_os, multicast_addr2, 3) == 0)</div><div class='del'>-			rtl_pattern.type = MULTICAST_PATTERN;</div><div class='del'>-		else if  (memcmp(pattern_os, mac-&gt;mac_addr, 6) == 0)</div><div class='del'>-			rtl_pattern.type = UNICAST_PATTERN;</div><div class='del'>-		else</div><div class='del'>-			rtl_pattern.type = UNKNOWN_TYPE;</div><div class='del'>-</div><div class='del'>-		/* 2. translate mask_from_os to mask_for_hw */</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- * pattern from OS uses 'ethenet frame', like this:</div><div class='del'>-</div><div class='del'>-		   |    6   |    6   |   2  |     20    |  Variable  |	4  |</div><div class='del'>-		   |--------+--------+------+-----------+------------+-----|</div><div class='del'>-		   |    802.3 Mac Header    | IP Header | TCP Packet | FCS |</div><div class='del'>-		   |   DA   |   SA   | Type |</div><div class='del'>-</div><div class='del'>- * BUT, packet catched by our HW is in '802.11 frame', begin from LLC,</div><div class='del'>-</div><div class='del'>-	|     24 or 30      |    6   |   2  |     20    |  Variable  |  4  |</div><div class='del'>-	|-------------------+--------+------+-----------+------------+-----|</div><div class='del'>-	| 802.11 MAC Header |       LLC     | IP Header | TCP Packet | FCS |</div><div class='del'>-			    | Others | Tpye |</div><div class='del'>-</div><div class='del'>- * Therefore, we need translate mask_from_OS to mask_to_hw.</div><div class='del'>- * We should left-shift mask by 6 bits, then set the new bit[0~5] = 0,</div><div class='del'>- * because new mask[0~5] means 'SA', but our HW packet begins from LLC,</div><div class='del'>- * bit[0~5] corresponds to first 6 Bytes in LLC, they just don't match.</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-		/* Shift 6 bits */</div><div class='del'>-		for (j = 0; j &lt; mask_len - 1; j++) {</div><div class='del'>-			mask[j] = mask_os[j] &gt;&gt; 6;</div><div class='del'>-			mask[j] |= (mask_os[j + 1] &amp; 0x3F) &lt;&lt; 2;</div><div class='del'>-		}</div><div class='del'>-		mask[j] = (mask_os[j] &gt;&gt; 6) &amp; 0x3F;</div><div class='del'>-		/* Set bit 0-5 to zero */</div><div class='del'>-		mask[0] &amp;= 0xC0;</div><div class='del'>-</div><div class='del'>-		RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,</div><div class='del'>-			      "mask to hw\n", mask, mask_len);</div><div class='del'>-		for (j = 0; j &lt; (MAX_WOL_BIT_MASK_SIZE + 1) / 4; j++) {</div><div class='del'>-			rtl_pattern.mask[j] = mask[j * 4];</div><div class='del'>-			rtl_pattern.mask[j] |= (mask[j * 4 + 1] &lt;&lt; 8);</div><div class='del'>-			rtl_pattern.mask[j] |= (mask[j * 4 + 2] &lt;&lt; 16);</div><div class='del'>-			rtl_pattern.mask[j] |= (mask[j * 4 + 3] &lt;&lt; 24);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* To get the wake up pattern from the mask.</div><div class='del'>-		 * We do not count first 12 bits which means</div><div class='del'>-		 * DA[6] and SA[6] in the pattern to match HW design.</div><div class='del'>-		 */</div><div class='del'>-		len = 0;</div><div class='del'>-		for (j = 12; j &lt; patterns[i].pattern_len; j++) {</div><div class='del'>-			if ((mask_os[j / 8] &gt;&gt; (j % 8)) &amp; 0x01) {</div><div class='del'>-				content[len] = pattern_os[j];</div><div class='del'>-				len++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RT_PRINT_DATA(rtlpriv, COMP_POWER, DBG_TRACE,</div><div class='del'>-			      "pattern to hw\n", content, len);</div><div class='del'>-		/* 3. calculate crc */</div><div class='del'>-		rtl_pattern.crc = _calculate_wol_pattern_crc(content, len);</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,</div><div class='del'>-			 "CRC_Remainder = 0x%x\n", rtl_pattern.crc);</div><div class='del'>-</div><div class='del'>-		/* 4. write crc &amp; mask_for_hw to hw */</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;add_wowlan_pattern(hw, &amp;rtl_pattern, i);</div><div class='del'>-	}</div><div class='del'>-	rtl_write_byte(rtlpriv, 0x698, wow-&gt;n_patterns);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_suspend(struct ieee80211_hw *hw,</div><div class='del'>-			  struct cfg80211_wowlan *wow)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");</div><div class='del'>-	if (WARN_ON(!wow))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* to resolve s4 can not wake up*/</div><div class='del'>-	rtlhal-&gt;last_suspend_sec = ktime_get_real_seconds();</div><div class='del'>-</div><div class='del'>-	if ((ppsc-&gt;wo_wlan_mode &amp; WAKE_ON_PATTERN_MATCH) &amp;&amp; wow-&gt;n_patterns)</div><div class='del'>-		_rtl_add_wowlan_patterns(hw, wow);</div><div class='del'>-</div><div class='del'>-	rtlhal-&gt;driver_is_goingto_unload = true;</div><div class='del'>-	rtlhal-&gt;enter_pnp_sleep = true;</div><div class='del'>-</div><div class='del'>-	rtl_lps_leave(hw);</div><div class='del'>-	rtl_op_stop(hw);</div><div class='del'>-	device_set_wakeup_enable(wiphy_dev(hw-&gt;wiphy), true);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_resume(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");</div><div class='del'>-	rtlhal-&gt;driver_is_goingto_unload = false;</div><div class='del'>-	rtlhal-&gt;enter_pnp_sleep = false;</div><div class='del'>-	rtlhal-&gt;wake_from_pnp_sleep = true;</div><div class='del'>-</div><div class='del'>-	/* to resovle s4 can not wake up*/</div><div class='del'>-	if (ktime_get_real_seconds() - rtlhal-&gt;last_suspend_sec &lt; 5)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	rtl_op_start(hw);</div><div class='del'>-	device_set_wakeup_enable(wiphy_dev(hw-&gt;wiphy), false);</div><div class='del'>-	ieee80211_resume_disconnect(mac-&gt;vif);</div><div class='del'>-	rtlhal-&gt;wake_from_pnp_sleep = false;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;skip_scan)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {	/* BIT(2)*/</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*For IPS */</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_IDLE) {</div><div class='del'>-		if (hw-&gt;conf.flags &amp; IEEE80211_CONF_IDLE)</div><div class='del'>-			rtl_ips_nic_off(hw);</div><div class='del'>-		else</div><div class='del'>-			rtl_ips_nic_on(hw);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 *although rfoff may not cause by ips, but we will</div><div class='del'>-		 *check the reason in set_rf_power_state function</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(ppsc-&gt;rfpwr_state == ERFOFF))</div><div class='del'>-			rtl_ips_nic_on(hw);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*For LPS */</div><div class='del'>-	if ((changed &amp; IEEE80211_CONF_CHANGE_PS) &amp;&amp;</div><div class='del'>-	    rtlpriv-&gt;psc.swctrl_lps &amp;&amp; !rtlpriv-&gt;psc.fwctrl_lps) {</div><div class='del'>-		cancel_delayed_work(&amp;rtlpriv-&gt;works.ps_work);</div><div class='del'>-		cancel_delayed_work(&amp;rtlpriv-&gt;works.ps_rfon_wq);</div><div class='del'>-		if (conf-&gt;flags &amp; IEEE80211_CONF_PS) {</div><div class='del'>-			rtlpriv-&gt;psc.sw_ps_enabled = true;</div><div class='del'>-			/* sleep here is must, or we may recv the beacon and</div><div class='del'>-			 * cause mac80211 into wrong ps state, this will cause</div><div class='del'>-			 * power save nullfunc send fail, and further cause</div><div class='del'>-			 * pkt loss, So sleep must quickly but not immediately</div><div class='del'>-			 * because that will cause nullfunc send by mac80211</div><div class='del'>-			 * fail, and cause pkt loss, we have tested that 5mA</div><div class='del'>-			 * works very well</div><div class='del'>-			 */</div><div class='del'>-			if (!rtlpriv-&gt;psc.multi_buffered)</div><div class='del'>-				queue_delayed_work(rtlpriv-&gt;works.rtl_wq,</div><div class='del'>-						   &amp;rtlpriv-&gt;works.ps_work,</div><div class='del'>-						   MSECS(5));</div><div class='del'>-		} else {</div><div class='del'>-			rtl_swlps_rf_awake(hw);</div><div class='del'>-			rtlpriv-&gt;psc.sw_ps_enabled = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_RETRY_LIMITS) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",</div><div class='del'>-			 hw-&gt;conf.long_frame_max_tx_count);</div><div class='del'>-		/* brought up everything changes (changed == ~0) indicates first</div><div class='del'>-		 * open, so use our default value instead of that of wiphy.</div><div class='del'>-		 */</div><div class='del'>-		if (changed != ~0) {</div><div class='del'>-			mac-&gt;retry_long = hw-&gt;conf.long_frame_max_tx_count;</div><div class='del'>-			mac-&gt;retry_short = hw-&gt;conf.long_frame_max_tx_count;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_RETRY_LIMIT,</div><div class='del'>-				(u8 *)(&amp;hw-&gt;conf.long_frame_max_tx_count));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL &amp;&amp;</div><div class='del'>-	    !rtlpriv-&gt;proximity.proxim_on) {</div><div class='del'>-		struct ieee80211_channel *channel = hw-&gt;conf.chandef.chan;</div><div class='del'>-		enum nl80211_chan_width width = hw-&gt;conf.chandef.width;</div><div class='del'>-		enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;</div><div class='del'>-		u8 wide_chan = (u8)channel-&gt;hw_value;</div><div class='del'>-</div><div class='del'>-		/* channel_type is for 20&amp;40M */</div><div class='del'>-		if (width &lt; NL80211_CHAN_WIDTH_80)</div><div class='del'>-			channel_type =</div><div class='del'>-				cfg80211_get_chandef_type(&amp;hw-&gt;conf.chandef);</div><div class='del'>-		if (mac-&gt;act_scanning)</div><div class='del'>-			mac-&gt;n_channels++;</div><div class='del'>-</div><div class='del'>-		if (rtlpriv-&gt;dm.supp_phymode_switch &amp;&amp;</div><div class='del'>-		    mac-&gt;link_state &lt; MAC80211_LINKED &amp;&amp;</div><div class='del'>-		    !mac-&gt;act_scanning) {</div><div class='del'>-			if (rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp)</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp(hw);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *because we should back channel to</div><div class='del'>-		 *current_network.chan in in scanning,</div><div class='del'>-		 *So if set_chan == current_network.chan</div><div class='del'>-		 *we should set it.</div><div class='del'>-		 *because mac80211 tell us wrong bw40</div><div class='del'>-		 *info for cisco1253 bw20, so we modify</div><div class='del'>-		 *it here based on UPPER &amp; LOWER</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (width &gt;= NL80211_CHAN_WIDTH_80) {</div><div class='del'>-			if (width == NL80211_CHAN_WIDTH_80) {</div><div class='del'>-				u32 center = hw-&gt;conf.chandef.center_freq1;</div><div class='del'>-				u32 primary =</div><div class='del'>-				(u32)hw-&gt;conf.chandef.chan-&gt;center_freq;</div><div class='del'>-</div><div class='del'>-				rtlphy-&gt;current_chan_bw =</div><div class='del'>-					HT_CHANNEL_WIDTH_80;</div><div class='del'>-				mac-&gt;bw_80 = true;</div><div class='del'>-				mac-&gt;bw_40 = true;</div><div class='del'>-				if (center &gt; primary) {</div><div class='del'>-					mac-&gt;cur_80_prime_sc =</div><div class='del'>-					PRIME_CHNL_OFFSET_LOWER;</div><div class='del'>-					if (center - primary == 10) {</div><div class='del'>-						mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_UPPER;</div><div class='del'>-</div><div class='del'>-						wide_chan += 2;</div><div class='del'>-					} else if (center - primary == 30) {</div><div class='del'>-						mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_LOWER;</div><div class='del'>-</div><div class='del'>-						wide_chan += 6;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					mac-&gt;cur_80_prime_sc =</div><div class='del'>-					PRIME_CHNL_OFFSET_UPPER;</div><div class='del'>-					if (primary - center == 10) {</div><div class='del'>-						mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_LOWER;</div><div class='del'>-</div><div class='del'>-						wide_chan -= 2;</div><div class='del'>-					} else if (primary - center == 30) {</div><div class='del'>-						mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_UPPER;</div><div class='del'>-</div><div class='del'>-						wide_chan -= 6;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			switch (channel_type) {</div><div class='del'>-			case NL80211_CHAN_HT20:</div><div class='del'>-			case NL80211_CHAN_NO_HT:</div><div class='del'>-					/* SC */</div><div class='del'>-					mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_DONT_CARE;</div><div class='del'>-					rtlphy-&gt;current_chan_bw =</div><div class='del'>-						HT_CHANNEL_WIDTH_20;</div><div class='del'>-					mac-&gt;bw_40 = false;</div><div class='del'>-					mac-&gt;bw_80 = false;</div><div class='del'>-					break;</div><div class='del'>-			case NL80211_CHAN_HT40MINUS:</div><div class='del'>-					/* SC */</div><div class='del'>-					mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_UPPER;</div><div class='del'>-					rtlphy-&gt;current_chan_bw =</div><div class='del'>-						HT_CHANNEL_WIDTH_20_40;</div><div class='del'>-					mac-&gt;bw_40 = true;</div><div class='del'>-					mac-&gt;bw_80 = false;</div><div class='del'>-</div><div class='del'>-					/*wide channel */</div><div class='del'>-					wide_chan -= 2;</div><div class='del'>-</div><div class='del'>-					break;</div><div class='del'>-			case NL80211_CHAN_HT40PLUS:</div><div class='del'>-					/* SC */</div><div class='del'>-					mac-&gt;cur_40_prime_sc =</div><div class='del'>-						PRIME_CHNL_OFFSET_LOWER;</div><div class='del'>-					rtlphy-&gt;current_chan_bw =</div><div class='del'>-						HT_CHANNEL_WIDTH_20_40;</div><div class='del'>-					mac-&gt;bw_40 = true;</div><div class='del'>-					mac-&gt;bw_80 = false;</div><div class='del'>-</div><div class='del'>-					/*wide channel */</div><div class='del'>-					wide_chan += 2;</div><div class='del'>-</div><div class='del'>-					break;</div><div class='del'>-			default:</div><div class='del'>-					mac-&gt;bw_40 = false;</div><div class='del'>-					mac-&gt;bw_80 = false;</div><div class='del'>-					pr_err("switch case %#x not processed\n",</div><div class='del'>-					       channel_type);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wide_chan &lt;= 0)</div><div class='del'>-			wide_chan = 1;</div><div class='del'>-</div><div class='del'>-		/* In scanning, when before we offchannel we may send a ps=1</div><div class='del'>-		 * null to AP, and then we may send a ps = 0 null to AP quickly,</div><div class='del'>-		 * but first null may have caused AP to put lots of packet to</div><div class='del'>-		 * hw tx buffer. These packets must be tx'd before we go off</div><div class='del'>-		 * channel so we must delay more time to let AP flush these</div><div class='del'>-		 * packets before going offchannel, or dis-association or</div><div class='del'>-		 * delete BA will be caused by AP</div><div class='del'>-		 */</div><div class='del'>-		if (rtlpriv-&gt;mac80211.offchan_delay) {</div><div class='del'>-			rtlpriv-&gt;mac80211.offchan_delay = false;</div><div class='del'>-			mdelay(50);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rtlphy-&gt;current_channel = wide_chan;</div><div class='del'>-</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;switch_channel(hw);</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_channel_access(hw);</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_bw_mode(hw, channel_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-				    unsigned int changed_flags,</div><div class='del'>-				    unsigned int *new_flags, u64 multicast)</div><div class='del'>-{</div><div class='del'>-	bool update_rcr = false;</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	*new_flags &amp;= RTL_SUPPORTED_FILTERS;</div><div class='del'>-	if (changed_flags == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*TODO: we disable broadcase now, so enable here */</div><div class='del'>-	if (changed_flags &amp; FIF_ALLMULTI) {</div><div class='del'>-		if (*new_flags &amp; FIF_ALLMULTI) {</div><div class='del'>-			mac-&gt;rx_conf |= rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_AM] |</div><div class='del'>-			    rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_AB];</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Enable receive multicast frame\n");</div><div class='del'>-		} else {</div><div class='del'>-			mac-&gt;rx_conf &amp;= ~(rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_AM] |</div><div class='del'>-					  rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_AB]);</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Disable receive multicast frame\n");</div><div class='del'>-		}</div><div class='del'>-		update_rcr = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed_flags &amp; FIF_FCSFAIL) {</div><div class='del'>-		if (*new_flags &amp; FIF_FCSFAIL) {</div><div class='del'>-			mac-&gt;rx_conf |= rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_ACRC32];</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Enable receive FCS error frame\n");</div><div class='del'>-		} else {</div><div class='del'>-			mac-&gt;rx_conf &amp;= ~rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_ACRC32];</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Disable receive FCS error frame\n");</div><div class='del'>-		}</div><div class='del'>-		if (!update_rcr)</div><div class='del'>-			update_rcr = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if ssid not set to hw don't check bssid</div><div class='del'>-	 * here just used for linked scanning, &amp; linked</div><div class='del'>-	 * and nolink check bssid is set in set network_type</div><div class='del'>-	 */</div><div class='del'>-	if (changed_flags &amp; FIF_BCN_PRBRESP_PROMISC &amp;&amp;</div><div class='del'>-	    mac-&gt;link_state &gt;= MAC80211_LINKED) {</div><div class='del'>-		if (mac-&gt;opmode != NL80211_IFTYPE_AP &amp;&amp;</div><div class='del'>-		    mac-&gt;opmode != NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-			if (*new_flags &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;set_chk_bssid(hw, false);</div><div class='del'>-			else</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;set_chk_bssid(hw, true);</div><div class='del'>-			if (update_rcr)</div><div class='del'>-				update_rcr = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed_flags &amp; FIF_CONTROL) {</div><div class='del'>-		if (*new_flags &amp; FIF_CONTROL) {</div><div class='del'>-			mac-&gt;rx_conf |= rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_ACF];</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Enable receive control frame.\n");</div><div class='del'>-		} else {</div><div class='del'>-			mac-&gt;rx_conf &amp;= ~rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_ACF];</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Disable receive control frame.\n");</div><div class='del'>-		}</div><div class='del'>-		if (!update_rcr)</div><div class='del'>-			update_rcr = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed_flags &amp; FIF_OTHER_BSS) {</div><div class='del'>-		if (*new_flags &amp; FIF_OTHER_BSS) {</div><div class='del'>-			mac-&gt;rx_conf |= rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_AAP];</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Enable receive other BSS's frame.\n");</div><div class='del'>-		} else {</div><div class='del'>-			mac-&gt;rx_conf &amp;= ~rtlpriv-&gt;cfg-&gt;maps[MAC_RCR_AAP];</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-				 "Disable receive other BSS's frame.\n");</div><div class='del'>-		}</div><div class='del'>-		if (!update_rcr)</div><div class='del'>-			update_rcr = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (update_rcr)</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_RCR,</div><div class='del'>-					      (u8 *)(&amp;mac-&gt;rx_conf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_sta_add(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif,</div><div class='del'>-			  struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_sta_info *sta_entry;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-		spin_lock_bh(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-		list_add_tail(&amp;sta_entry-&gt;list, &amp;rtlpriv-&gt;entry_list);</div><div class='del'>-		spin_unlock_bh(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-		if (rtlhal-&gt;current_bandtype == BAND_ON_2_4G) {</div><div class='del'>-			sta_entry-&gt;wireless_mode = WIRELESS_MODE_G;</div><div class='del'>-			if (sta-&gt;supp_rates[0] &lt;= 0xf)</div><div class='del'>-				sta_entry-&gt;wireless_mode = WIRELESS_MODE_B;</div><div class='del'>-			if (sta-&gt;ht_cap.ht_supported)</div><div class='del'>-				sta_entry-&gt;wireless_mode = WIRELESS_MODE_N_24G;</div><div class='del'>-</div><div class='del'>-			if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-				sta_entry-&gt;wireless_mode = WIRELESS_MODE_G;</div><div class='del'>-		} else if (rtlhal-&gt;current_bandtype == BAND_ON_5G) {</div><div class='del'>-			sta_entry-&gt;wireless_mode = WIRELESS_MODE_A;</div><div class='del'>-			if (sta-&gt;ht_cap.ht_supported)</div><div class='del'>-				sta_entry-&gt;wireless_mode = WIRELESS_MODE_N_5G;</div><div class='del'>-			if (sta-&gt;vht_cap.vht_supported)</div><div class='del'>-				sta_entry-&gt;wireless_mode = WIRELESS_MODE_AC_5G;</div><div class='del'>-</div><div class='del'>-			if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-				sta_entry-&gt;wireless_mode = WIRELESS_MODE_A;</div><div class='del'>-		}</div><div class='del'>-		/*disable cck rate for p2p*/</div><div class='del'>-		if (mac-&gt;p2p)</div><div class='del'>-			sta-&gt;supp_rates[0] &amp;= 0xfffffff0;</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-			if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40)</div><div class='del'>-				rtlphy-&gt;max_ht_chan_bw = HT_CHANNEL_WIDTH_20_40;</div><div class='del'>-			else</div><div class='del'>-				rtlphy-&gt;max_ht_chan_bw = HT_CHANNEL_WIDTH_20;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported)</div><div class='del'>-			rtlphy-&gt;max_vht_chan_bw = HT_CHANNEL_WIDTH_80;</div><div class='del'>-</div><div class='del'>-		memcpy(sta_entry-&gt;mac_addr, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-			 "Add sta addr is %pM\n", sta-&gt;addr);</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;update_rate_tbl(hw, sta, 0, true);</div><div class='del'>-</div><div class='del'>-		if (rtlpriv-&gt;phydm.ops)</div><div class='del'>-			rtlpriv-&gt;phydm.ops-&gt;phydm_add_sta(rtlpriv, sta);</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 rtl_op_sta_remove(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif,</div><div class='del'>-			     struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_sta_info *sta_entry;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-			 "Remove sta addr is %pM\n", sta-&gt;addr);</div><div class='del'>-</div><div class='del'>-		if (rtlpriv-&gt;phydm.ops)</div><div class='del'>-			rtlpriv-&gt;phydm.ops-&gt;phydm_del_sta(rtlpriv, sta);</div><div class='del'>-</div><div class='del'>-		sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-		sta_entry-&gt;wireless_mode = 0;</div><div class='del'>-		sta_entry-&gt;ratr_index = 0;</div><div class='del'>-		spin_lock_bh(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-		list_del(&amp;sta_entry-&gt;list);</div><div class='del'>-		spin_unlock_bh(&amp;rtlpriv-&gt;locks.entry_list_lock);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _rtl_get_hal_qnum(u16 queue)</div><div class='del'>-{</div><div class='del'>-	int qnum;</div><div class='del'>-</div><div class='del'>-	switch (queue) {</div><div class='del'>-	case 0:</div><div class='del'>-		qnum = AC3_VO;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		qnum = AC2_VI;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		qnum = AC0_BE;</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		qnum = AC1_BK;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		qnum = AC0_BE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return qnum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_sta_statistics(struct ieee80211_hw *hw,</div><div class='del'>-				  struct ieee80211_vif *vif,</div><div class='del'>-				  struct ieee80211_sta *sta,</div><div class='del'>-				  struct station_info *sinfo)</div><div class='del'>-{</div><div class='del'>-	/* nothing filled by driver, so mac80211 will update all info */</div><div class='del'>-	sinfo-&gt;filled = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *for mac80211 VO = 0, VI = 1, BE = 2, BK = 3</div><div class='del'>- *for rtl819x  BE = 0, BK = 1, VI = 2, VO = 3</div><div class='del'>- */</div><div class='del'>-static int rtl_op_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif, u16 queue,</div><div class='del'>-			  const struct ieee80211_tx_queue_params *param)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	int aci;</div><div class='del'>-</div><div class='del'>-	if (queue &gt;= AC_MAX) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,</div><div class='del'>-			 "queue number %d is incorrect!\n", queue);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aci = _rtl_get_hal_qnum(queue);</div><div class='del'>-	mac-&gt;ac[aci].aifs = param-&gt;aifs;</div><div class='del'>-	mac-&gt;ac[aci].cw_min = cpu_to_le16(param-&gt;cw_min);</div><div class='del'>-	mac-&gt;ac[aci].cw_max = cpu_to_le16(param-&gt;cw_max);</div><div class='del'>-	mac-&gt;ac[aci].tx_op = cpu_to_le16(param-&gt;txop);</div><div class='del'>-	memcpy(&amp;mac-&gt;edca_param[aci], param, sizeof(*param));</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_qos(hw, aci);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void send_beacon_frame(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct sk_buff *skb = ieee80211_beacon_get(hw, vif);</div><div class='del'>-	struct rtl_tcb_desc tcb_desc;</div><div class='del'>-</div><div class='del'>-	if (skb) {</div><div class='del'>-		memset(&amp;tcb_desc, 0, sizeof(struct rtl_tcb_desc));</div><div class='del'>-		rtlpriv-&gt;intf_ops-&gt;adapter_tx(hw, NULL, skb, &amp;tcb_desc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-				    u32 changed)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_phy *rtlphy = &amp;rtlpriv-&gt;phy;</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-		if (changed &amp; BSS_CHANGED_BEACON ||</div><div class='del'>-		    (changed &amp; BSS_CHANGED_BEACON_ENABLED &amp;&amp;</div><div class='del'>-		     bss_conf-&gt;enable_beacon)) {</div><div class='del'>-			if (mac-&gt;beacon_enabled == 0) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-					 "BSS_CHANGED_BEACON_ENABLED\n");</div><div class='del'>-</div><div class='del'>-				/*start hw beacon interrupt. */</div><div class='del'>-				/*rtlpriv-&gt;cfg-&gt;ops-&gt;set_bcn_reg(hw); */</div><div class='del'>-				mac-&gt;beacon_enabled = 1;</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;update_interrupt_mask(hw,</div><div class='del'>-						rtlpriv-&gt;cfg-&gt;maps</div><div class='del'>-						[RTL_IBSS_INT_MASKS], 0);</div><div class='del'>-</div><div class='del'>-				if (rtlpriv-&gt;cfg-&gt;ops-&gt;linked_set_reg)</div><div class='del'>-					rtlpriv-&gt;cfg-&gt;ops-&gt;linked_set_reg(hw);</div><div class='del'>-				send_beacon_frame(hw, vif);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if ((changed &amp; BSS_CHANGED_BEACON_ENABLED &amp;&amp;</div><div class='del'>-		     !bss_conf-&gt;enable_beacon)) {</div><div class='del'>-			if (mac-&gt;beacon_enabled == 1) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-					 "ADHOC DISABLE BEACON\n");</div><div class='del'>-</div><div class='del'>-				mac-&gt;beacon_enabled = 0;</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;update_interrupt_mask(hw, 0,</div><div class='del'>-						rtlpriv-&gt;cfg-&gt;maps</div><div class='del'>-						[RTL_IBSS_INT_MASKS]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (changed &amp; BSS_CHANGED_BEACON_INT) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_BEACON, DBG_TRACE,</div><div class='del'>-				 "BSS_CHANGED_BEACON_INT\n");</div><div class='del'>-			mac-&gt;beacon_interval = bss_conf-&gt;beacon_int;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_bcn_intv(hw);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*TODO: reference to enum ieee80211_bss_change */</div><div class='del'>-	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		u8 mstatus;</div><div class='del'>-</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='del'>-			struct ieee80211_sta *sta = NULL;</div><div class='del'>-			u8 keep_alive = 10;</div><div class='del'>-</div><div class='del'>-			mstatus = RT_MEDIA_CONNECT;</div><div class='del'>-			/* we should reset all sec info &amp; cam</div><div class='del'>-			 * before set cam after linked, we should not</div><div class='del'>-			 * reset in disassoc, that will cause tkip-&gt;wep</div><div class='del'>-			 * fail because some flag will be wrong</div><div class='del'>-			 * reset sec info</div><div class='del'>-			 */</div><div class='del'>-			rtl_cam_reset_sec_info(hw);</div><div class='del'>-			/* reset cam to fix wep fail issue</div><div class='del'>-			 * when change from wpa to wep</div><div class='del'>-			 */</div><div class='del'>-			rtl_cam_reset_all_entry(hw);</div><div class='del'>-</div><div class='del'>-			mac-&gt;link_state = MAC80211_LINKED;</div><div class='del'>-			mac-&gt;cnt_after_linked = 0;</div><div class='del'>-			mac-&gt;assoc_id = bss_conf-&gt;aid;</div><div class='del'>-			memcpy(mac-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-			if (rtlpriv-&gt;cfg-&gt;ops-&gt;linked_set_reg)</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;linked_set_reg(hw);</div><div class='del'>-</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			sta = ieee80211_find_sta(vif, (u8 *)bss_conf-&gt;bssid);</div><div class='del'>-			if (!sta) {</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_EASY_CONCURRENT, DBG_LOUD,</div><div class='del'>-				 "send PS STATIC frame\n");</div><div class='del'>-			if (rtlpriv-&gt;dm.supp_phymode_switch) {</div><div class='del'>-				if (sta-&gt;ht_cap.ht_supported)</div><div class='del'>-					rtl_send_smps_action(hw, sta,</div><div class='del'>-							     IEEE80211_SMPS_STATIC);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (rtlhal-&gt;current_bandtype == BAND_ON_5G) {</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_A;</div><div class='del'>-			} else {</div><div class='del'>-				if (sta-&gt;supp_rates[0] &lt;= 0xf)</div><div class='del'>-					mac-&gt;mode = WIRELESS_MODE_B;</div><div class='del'>-				else</div><div class='del'>-					mac-&gt;mode = WIRELESS_MODE_G;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-				if (rtlhal-&gt;current_bandtype == BAND_ON_2_4G)</div><div class='del'>-					mac-&gt;mode = WIRELESS_MODE_N_24G;</div><div class='del'>-				else</div><div class='del'>-					mac-&gt;mode = WIRELESS_MODE_N_5G;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-				if (rtlhal-&gt;current_bandtype == BAND_ON_5G)</div><div class='del'>-					mac-&gt;mode = WIRELESS_MODE_AC_5G;</div><div class='del'>-				else</div><div class='del'>-					mac-&gt;mode = WIRELESS_MODE_AC_24G;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-				rtlpriv-&gt;cfg-&gt;ops-&gt;update_rate_tbl(hw, sta, 0,</div><div class='del'>-								   true);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			/* to avoid AP Disassociation caused by inactivity */</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw,</div><div class='del'>-						      HW_VAR_KEEP_ALIVE,</div><div class='del'>-						      (u8 *)(&amp;keep_alive));</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-				 "BSS_CHANGED_ASSOC\n");</div><div class='del'>-		} else {</div><div class='del'>-			struct cfg80211_bss *bss = NULL;</div><div class='del'>-</div><div class='del'>-			mstatus = RT_MEDIA_DISCONNECT;</div><div class='del'>-</div><div class='del'>-			if (mac-&gt;link_state == MAC80211_LINKED)</div><div class='del'>-				rtl_lps_leave(hw);</div><div class='del'>-			if (ppsc-&gt;p2p_ps_info.p2p_ps_mode &gt; P2P_PS_NONE)</div><div class='del'>-				rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE);</div><div class='del'>-			mac-&gt;link_state = MAC80211_NOLINK;</div><div class='del'>-</div><div class='del'>-			bss = cfg80211_get_bss(hw-&gt;wiphy, NULL,</div><div class='del'>-					       (u8 *)mac-&gt;bssid, NULL, 0,</div><div class='del'>-					       IEEE80211_BSS_TYPE_ESS,</div><div class='del'>-					       IEEE80211_PRIVACY_OFF);</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-				 "bssid = %x-%x-%x-%x-%x-%x\n",</div><div class='del'>-				 mac-&gt;bssid[0], mac-&gt;bssid[1],</div><div class='del'>-				 mac-&gt;bssid[2], mac-&gt;bssid[3],</div><div class='del'>-				 mac-&gt;bssid[4], mac-&gt;bssid[5]);</div><div class='del'>-</div><div class='del'>-			if (bss) {</div><div class='del'>-				cfg80211_unlink_bss(hw-&gt;wiphy, bss);</div><div class='del'>-				cfg80211_put_bss(hw-&gt;wiphy, bss);</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-					 "cfg80211_unlink !!\n");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			eth_zero_addr(mac-&gt;bssid);</div><div class='del'>-			mac-&gt;vendor = PEER_UNKNOWN;</div><div class='del'>-			mac-&gt;mode = 0;</div><div class='del'>-</div><div class='del'>-			if (rtlpriv-&gt;dm.supp_phymode_switch) {</div><div class='del'>-				if (rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp)</div><div class='del'>-					rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp(hw);</div><div class='del'>-			}</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-				 "BSS_CHANGED_UN_ASSOC\n");</div><div class='del'>-		}</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_network_type(hw, vif-&gt;type);</div><div class='del'>-		/* For FW LPS:</div><div class='del'>-		 * To tell firmware we have connected or disconnected</div><div class='del'>-		 */</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw,</div><div class='del'>-					      HW_VAR_H2C_FW_JOINBSSRPT,</div><div class='del'>-					      (u8 *)(&amp;mstatus));</div><div class='del'>-		ppsc-&gt;report_linked = (mstatus == RT_MEDIA_CONNECT) ?</div><div class='del'>-				      true : false;</div><div class='del'>-</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-			rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_mediastatus_notify(</div><div class='del'>-							rtlpriv, mstatus);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "BSS_CHANGED_ERP_CTS_PROT\n");</div><div class='del'>-		mac-&gt;use_cts_protect = bss_conf-&gt;use_cts_prot;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,</div><div class='del'>-			 "BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",</div><div class='del'>-			  bss_conf-&gt;use_short_preamble);</div><div class='del'>-</div><div class='del'>-		mac-&gt;short_preamble = bss_conf-&gt;use_short_preamble;</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,</div><div class='del'>-					      (u8 *)(&amp;mac-&gt;short_preamble));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "BSS_CHANGED_ERP_SLOT\n");</div><div class='del'>-</div><div class='del'>-		if (bss_conf-&gt;use_short_slot)</div><div class='del'>-			mac-&gt;slot_time = RTL_SLOT_TIME_9;</div><div class='del'>-		else</div><div class='del'>-			mac-&gt;slot_time = RTL_SLOT_TIME_20;</div><div class='del'>-</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_SLOT_TIME,</div><div class='del'>-					      (u8 *)(&amp;mac-&gt;slot_time));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; BSS_CHANGED_HT) {</div><div class='del'>-		struct ieee80211_sta *sta = NULL;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "BSS_CHANGED_HT\n");</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = ieee80211_find_sta(vif, (u8 *)bss_conf-&gt;bssid);</div><div class='del'>-		if (sta) {</div><div class='del'>-			if (sta-&gt;ht_cap.ampdu_density &gt;</div><div class='del'>-			    mac-&gt;current_ampdu_density)</div><div class='del'>-				mac-&gt;current_ampdu_density =</div><div class='del'>-				    sta-&gt;ht_cap.ampdu_density;</div><div class='del'>-			if (sta-&gt;ht_cap.ampdu_factor &lt;</div><div class='del'>-			    mac-&gt;current_ampdu_factor)</div><div class='del'>-				mac-&gt;current_ampdu_factor =</div><div class='del'>-				    sta-&gt;ht_cap.ampdu_factor;</div><div class='del'>-</div><div class='del'>-			if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-				if (sta-&gt;ht_cap.cap &amp;</div><div class='del'>-				    IEEE80211_HT_CAP_SUP_WIDTH_20_40)</div><div class='del'>-					rtlphy-&gt;max_ht_chan_bw =</div><div class='del'>-							HT_CHANNEL_WIDTH_20_40;</div><div class='del'>-				else</div><div class='del'>-					rtlphy-&gt;max_ht_chan_bw =</div><div class='del'>-							HT_CHANNEL_WIDTH_20;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_SHORTGI_DENSITY,</div><div class='del'>-					      (u8 *)(&amp;mac-&gt;max_mss_density));</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_AMPDU_FACTOR,</div><div class='del'>-					      &amp;mac-&gt;current_ampdu_factor);</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE,</div><div class='del'>-					      &amp;mac-&gt;current_ampdu_density);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; BSS_CHANGED_BANDWIDTH) {</div><div class='del'>-		struct ieee80211_sta *sta = NULL;</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "BSS_CHANGED_BANDWIDTH\n");</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = ieee80211_find_sta(vif, (u8 *)bss_conf-&gt;bssid);</div><div class='del'>-</div><div class='del'>-		if (sta) {</div><div class='del'>-			if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-				if (sta-&gt;ht_cap.cap &amp;</div><div class='del'>-				    IEEE80211_HT_CAP_SUP_WIDTH_20_40)</div><div class='del'>-					rtlphy-&gt;max_ht_chan_bw =</div><div class='del'>-							HT_CHANNEL_WIDTH_20_40;</div><div class='del'>-				else</div><div class='del'>-					rtlphy-&gt;max_ht_chan_bw =</div><div class='del'>-							HT_CHANNEL_WIDTH_20;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (sta-&gt;vht_cap.vht_supported)</div><div class='del'>-				rtlphy-&gt;max_vht_chan_bw = HT_CHANNEL_WIDTH_80;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; BSS_CHANGED_BSSID) {</div><div class='del'>-		u32 basic_rates;</div><div class='del'>-		struct ieee80211_sta *sta = NULL;</div><div class='del'>-</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_BSSID,</div><div class='del'>-					      (u8 *)bss_conf-&gt;bssid);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,</div><div class='del'>-			 "bssid: %pM\n", bss_conf-&gt;bssid);</div><div class='del'>-</div><div class='del'>-		mac-&gt;vendor = PEER_UNKNOWN;</div><div class='del'>-		memcpy(mac-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = ieee80211_find_sta(vif, (u8 *)bss_conf-&gt;bssid);</div><div class='del'>-		if (!sta) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rtlhal-&gt;current_bandtype == BAND_ON_5G) {</div><div class='del'>-			mac-&gt;mode = WIRELESS_MODE_A;</div><div class='del'>-		} else {</div><div class='del'>-			if (sta-&gt;supp_rates[0] &lt;= 0xf)</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_B;</div><div class='del'>-			else</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_G;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-			if (rtlhal-&gt;current_bandtype == BAND_ON_2_4G)</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_N_24G;</div><div class='del'>-			else</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_N_5G;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-			if (rtlhal-&gt;current_bandtype == BAND_ON_5G)</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_AC_5G;</div><div class='del'>-			else</div><div class='del'>-				mac-&gt;mode = WIRELESS_MODE_AC_24G;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* just station need it, because ibss &amp; ap mode will</div><div class='del'>-		 * set in sta_add, and will be NULL here</div><div class='del'>-		 */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-			struct rtl_sta_info *sta_entry;</div><div class='del'>-</div><div class='del'>-			sta_entry = (struct rtl_sta_info *)sta-&gt;drv_priv;</div><div class='del'>-			sta_entry-&gt;wireless_mode = mac-&gt;mode;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-			mac-&gt;ht_enable = true;</div><div class='del'>-</div><div class='del'>-			/* for cisco 1252 bw20 it's wrong</div><div class='del'>-			 * if (ht_cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40) {</div><div class='del'>-			 *	mac-&gt;bw_40 = true;</div><div class='del'>-			 * }</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported)</div><div class='del'>-			mac-&gt;vht_enable = true;</div><div class='del'>-</div><div class='del'>-		if (changed &amp; BSS_CHANGED_BASIC_RATES) {</div><div class='del'>-			/* for 5G must &lt;&lt; RATE_6M_INDEX = 4,</div><div class='del'>-			 * because 5G have no cck rate</div><div class='del'>-			 */</div><div class='del'>-			if (rtlhal-&gt;current_bandtype == BAND_ON_5G)</div><div class='del'>-				basic_rates = sta-&gt;supp_rates[1] &lt;&lt; 4;</div><div class='del'>-			else</div><div class='del'>-				basic_rates = sta-&gt;supp_rates[0];</div><div class='del'>-</div><div class='del'>-			mac-&gt;basic_rates = basic_rates;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_BASIC_RATE,</div><div class='del'>-					(u8 *)(&amp;basic_rates));</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 rtl_op_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u64 tsf;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;get_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *)(&amp;tsf));</div><div class='del'>-	return tsf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_set_tsf(struct ieee80211_hw *hw,</div><div class='del'>-			   struct ieee80211_vif *vif, u64 tsf)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-	u8 bibss = (mac-&gt;opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	mac-&gt;tsf = tsf;</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *)(&amp;bibss));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 tmp = 0;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, (u8 *)(&amp;tmp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_sta_notify(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif,</div><div class='del'>-			      enum sta_notify_cmd cmd,</div><div class='del'>-			      struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case STA_NOTIFY_SLEEP:</div><div class='del'>-		break;</div><div class='del'>-	case STA_NOTIFY_AWAKE:</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 rtl_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_vif *vif,</div><div class='del'>-			       struct ieee80211_ampdu_params *params)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='del'>-	enum ieee80211_ampdu_mlme_action action = params-&gt;action;</div><div class='del'>-	u16 tid = params-&gt;tid;</div><div class='del'>-	u16 *ssn = &amp;params-&gt;ssn;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "IEEE80211_AMPDU_TX_START: TID:%d\n", tid);</div><div class='del'>-		return rtl_tx_agg_start(hw, vif, sta, tid, ssn);</div><div class='del'>-	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='del'>-	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='del'>-	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);</div><div class='del'>-		return rtl_tx_agg_stop(hw, vif, sta, tid);</div><div class='del'>-	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid);</div><div class='del'>-		rtl_tx_agg_oper(hw, sta, tid);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "IEEE80211_AMPDU_RX_START:TID:%d\n", tid);</div><div class='del'>-		return rtl_rx_agg_start(hw, sta, tid);</div><div class='del'>-	case IEEE80211_AMPDU_RX_STOP:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,</div><div class='del'>-			 "IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid);</div><div class='del'>-		return rtl_rx_agg_stop(hw, sta, tid);</div><div class='del'>-	default:</div><div class='del'>-		pr_err("IEEE80211_AMPDU_ERR!!!!:\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_sw_scan_start(struct ieee80211_hw *hw,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 const u8 *mac_addr)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");</div><div class='del'>-	mac-&gt;act_scanning = true;</div><div class='del'>-	if (rtlpriv-&gt;link_info.higher_busytraffic) {</div><div class='del'>-		mac-&gt;skip_scan = true;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;phydm.ops)</div><div class='del'>-		rtlpriv-&gt;phydm.ops-&gt;phydm_pause_dig(rtlpriv, 1);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_scan_notify(rtlpriv, 1);</div><div class='del'>-	else if (rtlpriv-&gt;btcoexist.btc_ops)</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_scan_notify_wifi_only(rtlpriv,</div><div class='del'>-								      1);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;dm.supp_phymode_switch) {</div><div class='del'>-		if (rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp)</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;chk_switch_dmdp(hw);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;link_state == MAC80211_LINKED) {</div><div class='del'>-		rtl_lps_leave(hw);</div><div class='del'>-		mac-&gt;link_state = MAC80211_LINKED_SCANNING;</div><div class='del'>-	} else {</div><div class='del'>-		rtl_ips_nic_on(hw);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Dul mac */</div><div class='del'>-	rtlpriv-&gt;rtlhal.load_imrandiqk_setting_for2g = false;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;led_control(hw, LED_CTL_SITE_SURVEY);</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;scan_operation_backup(hw, SCAN_OPT_BACKUP_BAND0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");</div><div class='del'>-	mac-&gt;act_scanning = false;</div><div class='del'>-	mac-&gt;skip_scan = false;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;btcoexist.btc_info.ap_num = rtlpriv-&gt;scan_list.num;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;link_info.higher_busytraffic)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* p2p will use 1/6/11 to scan */</div><div class='del'>-	if (mac-&gt;n_channels == 3)</div><div class='del'>-		mac-&gt;p2p_in_use = true;</div><div class='del'>-	else</div><div class='del'>-		mac-&gt;p2p_in_use = false;</div><div class='del'>-	mac-&gt;n_channels = 0;</div><div class='del'>-	/* Dul mac */</div><div class='del'>-	rtlpriv-&gt;rtlhal.load_imrandiqk_setting_for2g = false;</div><div class='del'>-</div><div class='del'>-	if (mac-&gt;link_state == MAC80211_LINKED_SCANNING) {</div><div class='del'>-		mac-&gt;link_state = MAC80211_LINKED;</div><div class='del'>-		if (mac-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-			/* fix fwlps issue */</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;set_network_type(hw, mac-&gt;opmode);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;scan_operation_backup(hw, SCAN_OPT_RESTORE);</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_scan_notify(rtlpriv, 0);</div><div class='del'>-	else if (rtlpriv-&gt;btcoexist.btc_ops)</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_scan_notify_wifi_only(rtlpriv,</div><div class='del'>-								      0);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;phydm.ops)</div><div class='del'>-		rtlpriv-&gt;phydm.ops-&gt;phydm_pause_dig(rtlpriv, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='del'>-			  struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='del'>-			  struct ieee80211_key_conf *key)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 key_type = NO_ENCRYPTION;</div><div class='del'>-	u8 key_idx;</div><div class='del'>-	bool group_key = false;</div><div class='del'>-	bool wep_only = false;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u8 mac_addr[ETH_ALEN];</div><div class='del'>-	u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;btcoexist.btc_info.in_4way = false;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;mod_params-&gt;sw_crypto || rtlpriv-&gt;sec.use_sw_sec) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,</div><div class='del'>-			 "not open hw encryption\n");</div><div class='del'>-		return -ENOSPC;	/*User disabled HW-crypto */</div><div class='del'>-	}</div><div class='del'>-	/* To support IBSS, use sw-crypto for GTK */</div><div class='del'>-	if ((vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-	     vif-&gt;type == NL80211_IFTYPE_MESH_POINT) &amp;&amp;</div><div class='del'>-	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-		 "%s hardware based encryption for keyidx: %d, mac: %pM\n",</div><div class='del'>-		  cmd == SET_KEY ? "Using" : "Disabling", key-&gt;keyidx,</div><div class='del'>-		  sta ? sta-&gt;addr : bcast_addr);</div><div class='del'>-	rtlpriv-&gt;sec.being_setkey = true;</div><div class='del'>-	rtl_ips_nic_on(hw);</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	/* &lt;1&gt; get encryption alg */</div><div class='del'>-</div><div class='del'>-	switch (key-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		key_type = WEP40_ENCRYPTION;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP40\n");</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP104\n");</div><div class='del'>-		key_type = WEP104_ENCRYPTION;</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		key_type = TKIP_ENCRYPTION;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:TKIP\n");</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		key_type = AESCCMP_ENCRYPTION;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CCMP\n");</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='del'>-		/* HW don't support CMAC encryption,</div><div class='del'>-		 * use software CMAC encryption</div><div class='del'>-		 */</div><div class='del'>-		key_type = AESCMAC_ENCRYPTION;</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CMAC\n");</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-			 "HW don't support CMAC encryption, use software CMAC encryption\n");</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("alg_err:%x!!!!:\n", key-&gt;cipher);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-	if (key_type == WEP40_ENCRYPTION ||</div><div class='del'>-	    key_type == WEP104_ENCRYPTION ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-		rtlpriv-&gt;sec.use_defaultkey = true;</div><div class='del'>-</div><div class='del'>-	/* &lt;2&gt; get key_idx */</div><div class='del'>-	key_idx = (u8)(key-&gt;keyidx);</div><div class='del'>-	if (key_idx &gt; 3)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	/* &lt;3&gt; if pairwise key enable_hw_sec */</div><div class='del'>-	group_key = !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE);</div><div class='del'>-</div><div class='del'>-	/* wep always be group key, but there are two conditions:</div><div class='del'>-	 * 1) wep only: is just for wep enc, in this condition</div><div class='del'>-	 * rtlpriv-&gt;sec.pairwise_enc_algorithm == NO_ENCRYPTION</div><div class='del'>-	 * will be true &amp; enable_hw_sec will be set when wep</div><div class='del'>-	 * ke setting.</div><div class='del'>-	 * 2) wep(group) + AES(pairwise): some AP like cisco</div><div class='del'>-	 * may use it, in this condition enable_hw_sec will not</div><div class='del'>-	 * be set when wep key setting.</div><div class='del'>-	 * we must reset sec_info after lingked before set key,</div><div class='del'>-	 * or some flag will be wrong</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-		if (!group_key || key_type == WEP40_ENCRYPTION ||</div><div class='del'>-		    key_type == WEP104_ENCRYPTION) {</div><div class='del'>-			if (group_key)</div><div class='del'>-				wep_only = true;</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;enable_hw_sec(hw);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (!group_key || vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='del'>-		    rtlpriv-&gt;sec.pairwise_enc_algorithm == NO_ENCRYPTION) {</div><div class='del'>-			if (rtlpriv-&gt;sec.pairwise_enc_algorithm ==</div><div class='del'>-			    NO_ENCRYPTION &amp;&amp;</div><div class='del'>-			   (key_type == WEP40_ENCRYPTION ||</div><div class='del'>-			    key_type == WEP104_ENCRYPTION))</div><div class='del'>-				wep_only = true;</div><div class='del'>-			rtlpriv-&gt;sec.pairwise_enc_algorithm = key_type;</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-				 "set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1 TKIP:2 AES:4 WEP104:5)\n",</div><div class='del'>-				 key_type);</div><div class='del'>-			rtlpriv-&gt;cfg-&gt;ops-&gt;enable_hw_sec(hw);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* &lt;4&gt; set key based on cmd */</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SET_KEY:</div><div class='del'>-		if (wep_only) {</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-				 "set WEP(group/pairwise) key\n");</div><div class='del'>-			/* Pairwise key with an assigned MAC address. */</div><div class='del'>-			rtlpriv-&gt;sec.pairwise_enc_algorithm = key_type;</div><div class='del'>-			rtlpriv-&gt;sec.group_enc_algorithm = key_type;</div><div class='del'>-			/*set local buf about wep key. */</div><div class='del'>-			memcpy(rtlpriv-&gt;sec.key_buf[key_idx],</div><div class='del'>-			       key-&gt;key, key-&gt;keylen);</div><div class='del'>-			rtlpriv-&gt;sec.key_len[key_idx] = key-&gt;keylen;</div><div class='del'>-			eth_zero_addr(mac_addr);</div><div class='del'>-		} else if (group_key) {	/* group key */</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-				 "set group key\n");</div><div class='del'>-			/* group key */</div><div class='del'>-			rtlpriv-&gt;sec.group_enc_algorithm = key_type;</div><div class='del'>-			/*set local buf about group key. */</div><div class='del'>-			memcpy(rtlpriv-&gt;sec.key_buf[key_idx],</div><div class='del'>-			       key-&gt;key, key-&gt;keylen);</div><div class='del'>-			rtlpriv-&gt;sec.key_len[key_idx] = key-&gt;keylen;</div><div class='del'>-			memcpy(mac_addr, bcast_addr, ETH_ALEN);</div><div class='del'>-		} else {	/* pairwise key */</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-				 "set pairwise key\n");</div><div class='del'>-			if (!sta) {</div><div class='del'>-				WARN_ONCE(true,</div><div class='del'>-					  "rtlwifi: pairwise key without mac_addr\n");</div><div class='del'>-</div><div class='del'>-				err = -EOPNOTSUPP;</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='del'>-			/* Pairwise key with an assigned MAC address. */</div><div class='del'>-			rtlpriv-&gt;sec.pairwise_enc_algorithm = key_type;</div><div class='del'>-			/*set local buf about pairwise key. */</div><div class='del'>-			memcpy(rtlpriv-&gt;sec.key_buf[PAIRWISE_KEYIDX],</div><div class='del'>-			       key-&gt;key, key-&gt;keylen);</div><div class='del'>-			rtlpriv-&gt;sec.key_len[PAIRWISE_KEYIDX] = key-&gt;keylen;</div><div class='del'>-			rtlpriv-&gt;sec.pairwise_key =</div><div class='del'>-			    rtlpriv-&gt;sec.key_buf[PAIRWISE_KEYIDX];</div><div class='del'>-			memcpy(mac_addr, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-		}</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;ops-&gt;set_key(hw, key_idx, mac_addr,</div><div class='del'>-					   group_key, key_type, wep_only,</div><div class='del'>-					   false);</div><div class='del'>-		/* &lt;5&gt; tell mac80211 do something: */</div><div class='del'>-		/*must use sw generate IV, or can not work !!!!. */</div><div class='del'>-		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-		key-&gt;hw_key_idx = key_idx;</div><div class='del'>-		if (key_type == TKIP_ENCRYPTION)</div><div class='del'>-			key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='del'>-		/*use software CCMP encryption for management frames (MFP) */</div><div class='del'>-		if (key_type == AESCCMP_ENCRYPTION)</div><div class='del'>-			key-&gt;flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;</div><div class='del'>-		break;</div><div class='del'>-	case DISABLE_KEY:</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,</div><div class='del'>-			 "disable key delete one entry\n");</div><div class='del'>-		/*set local buf about wep key. */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT) {</div><div class='del'>-			if (sta)</div><div class='del'>-				rtl_cam_del_entry(hw, sta-&gt;addr);</div><div class='del'>-		}</div><div class='del'>-		memset(rtlpriv-&gt;sec.key_buf[key_idx], 0, key-&gt;keylen);</div><div class='del'>-		rtlpriv-&gt;sec.key_len[key_idx] = 0;</div><div class='del'>-		eth_zero_addr(mac_addr);</div><div class='del'>-		/*</div><div class='del'>-		 *mac80211 will delete entries one by one,</div><div class='del'>-		 *so don't use rtl_cam_reset_all_entry</div><div class='del'>-		 *or clear all entries here.</div><div class='del'>-		 */</div><div class='del'>-		rtl_wait_tx_report_acked(hw, 500); /* wait 500ms for TX ack */</div><div class='del'>-</div><div class='del'>-		rtl_cam_delete_one_entry(hw, mac_addr, key_idx);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("cmd_err:%x!!!!:\n", cmd);</div><div class='del'>-	}</div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-	rtlpriv-&gt;sec.being_setkey = false;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	bool radio_state;</div><div class='del'>-	bool blocked;</div><div class='del'>-	u8 valid = 0;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(RTL_STATUS_INTERFACE_START, &amp;rtlpriv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-</div><div class='del'>-	/*if Radio On return true here */</div><div class='del'>-	radio_state = rtlpriv-&gt;cfg-&gt;ops-&gt;radio_onoff_checking(hw, &amp;valid);</div><div class='del'>-</div><div class='del'>-	if (valid) {</div><div class='del'>-		if (unlikely(radio_state != rtlpriv-&gt;rfkill.rfkill_state)) {</div><div class='del'>-			rtlpriv-&gt;rfkill.rfkill_state = radio_state;</div><div class='del'>-</div><div class='del'>-			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,</div><div class='del'>-				 "wireless radio switch turned %s\n",</div><div class='del'>-				  radio_state ? "on" : "off");</div><div class='del'>-</div><div class='del'>-			blocked = (rtlpriv-&gt;rfkill.rfkill_state == 1) ? 0 : 1;</div><div class='del'>-			wiphy_rfkill_set_hw_state(hw-&gt;wiphy, blocked);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this function is called by mac80211 to flush tx buffer</div><div class='del'>- * before switch channel or power save, or tx buffer packet</div><div class='del'>- * maybe send after offchannel or rf sleep, this may cause</div><div class='del'>- * dis-association by AP</div><div class='del'>- */</div><div class='del'>-static void rtl_op_flush(struct ieee80211_hw *hw,</div><div class='del'>-			 struct ieee80211_vif *vif,</div><div class='del'>-			 u32 queues,</div><div class='del'>-			 bool drop)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;intf_ops-&gt;flush)</div><div class='del'>-		rtlpriv-&gt;intf_ops-&gt;flush(hw, queues, drop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*	Description:</div><div class='del'>- *		This routine deals with the Power Configuration CMD</div><div class='del'>- *		 parsing for RTL8723/RTL8188E Series IC.</div><div class='del'>- *	Assumption:</div><div class='del'>- *		We should follow specific format that was released from HW SD.</div><div class='del'>- */</div><div class='del'>-bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,</div><div class='del'>-			      u8 faversion, u8 interface_type,</div><div class='del'>-			      struct wlan_pwr_cfg pwrcfgcmd[])</div><div class='del'>-{</div><div class='del'>-	struct wlan_pwr_cfg cfg_cmd;</div><div class='del'>-	bool polling_bit = false;</div><div class='del'>-	u32 ary_idx = 0;</div><div class='del'>-	u8 value = 0;</div><div class='del'>-	u32 offset = 0;</div><div class='del'>-	u32 polling_count = 0;</div><div class='del'>-	u32 max_polling_cnt = 5000;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		cfg_cmd = pwrcfgcmd[ary_idx];</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='del'>-			 "%s(): offset(%#x),cut_msk(%#x), famsk(%#x), interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), value(%#x)\n",</div><div class='del'>-			 __func__, GET_PWR_CFG_OFFSET(cfg_cmd),</div><div class='del'>-					    GET_PWR_CFG_CUT_MASK(cfg_cmd),</div><div class='del'>-			 GET_PWR_CFG_FAB_MASK(cfg_cmd),</div><div class='del'>-					      GET_PWR_CFG_INTF_MASK(cfg_cmd),</div><div class='del'>-			 GET_PWR_CFG_BASE(cfg_cmd), GET_PWR_CFG_CMD(cfg_cmd),</div><div class='del'>-			 GET_PWR_CFG_MASK(cfg_cmd), GET_PWR_CFG_VALUE(cfg_cmd));</div><div class='del'>-</div><div class='del'>-		if ((GET_PWR_CFG_FAB_MASK(cfg_cmd) &amp; faversion) &amp;&amp;</div><div class='del'>-		    (GET_PWR_CFG_CUT_MASK(cfg_cmd) &amp; cut_version) &amp;&amp;</div><div class='del'>-		    (GET_PWR_CFG_INTF_MASK(cfg_cmd) &amp; interface_type)) {</div><div class='del'>-			switch (GET_PWR_CFG_CMD(cfg_cmd)) {</div><div class='del'>-			case PWR_CMD_READ:</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='del'>-					 "%s(): PWR_CMD_READ\n", __func__);</div><div class='del'>-				break;</div><div class='del'>-			case PWR_CMD_WRITE:</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='del'>-					 "%s(): PWR_CMD_WRITE\n", __func__);</div><div class='del'>-				offset = GET_PWR_CFG_OFFSET(cfg_cmd);</div><div class='del'>-</div><div class='del'>-				/*Read the value from system register*/</div><div class='del'>-				value = rtl_read_byte(rtlpriv, offset);</div><div class='del'>-				value &amp;= (~(GET_PWR_CFG_MASK(cfg_cmd)));</div><div class='del'>-				value |= (GET_PWR_CFG_VALUE(cfg_cmd) &amp;</div><div class='del'>-					  GET_PWR_CFG_MASK(cfg_cmd));</div><div class='del'>-</div><div class='del'>-				/*Write the value back to system register*/</div><div class='del'>-				rtl_write_byte(rtlpriv, offset, value);</div><div class='del'>-				break;</div><div class='del'>-			case PWR_CMD_POLLING:</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='del'>-					 "%s(): PWR_CMD_POLLING\n", __func__);</div><div class='del'>-				polling_bit = false;</div><div class='del'>-				offset = GET_PWR_CFG_OFFSET(cfg_cmd);</div><div class='del'>-</div><div class='del'>-				do {</div><div class='del'>-					value = rtl_read_byte(rtlpriv, offset);</div><div class='del'>-</div><div class='del'>-					value &amp;= GET_PWR_CFG_MASK(cfg_cmd);</div><div class='del'>-					if (value ==</div><div class='del'>-					    (GET_PWR_CFG_VALUE(cfg_cmd) &amp;</div><div class='del'>-					     GET_PWR_CFG_MASK(cfg_cmd)))</div><div class='del'>-						polling_bit = true;</div><div class='del'>-					else</div><div class='del'>-						udelay(10);</div><div class='del'>-</div><div class='del'>-					if (polling_count++ &gt; max_polling_cnt)</div><div class='del'>-						return false;</div><div class='del'>-				} while (!polling_bit);</div><div class='del'>-				break;</div><div class='del'>-			case PWR_CMD_DELAY:</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='del'>-					 "%s(): PWR_CMD_DELAY\n", __func__);</div><div class='del'>-				if (GET_PWR_CFG_VALUE(cfg_cmd) ==</div><div class='del'>-				    PWRSEQ_DELAY_US)</div><div class='del'>-					udelay(GET_PWR_CFG_OFFSET(cfg_cmd));</div><div class='del'>-				else</div><div class='del'>-					mdelay(GET_PWR_CFG_OFFSET(cfg_cmd));</div><div class='del'>-				break;</div><div class='del'>-			case PWR_CMD_END:</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='del'>-					 "%s(): PWR_CMD_END\n", __func__);</div><div class='del'>-				return true;</div><div class='del'>-			default:</div><div class='del'>-				WARN_ONCE(true,</div><div class='del'>-					  "rtlwifi: %s(): Unknown CMD!!\n",</div><div class='del'>-					  __func__);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		ary_idx++;</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));</div><div class='del'>-	struct rtl8192_tx_ring *ring;</div><div class='del'>-	struct rtl_tx_desc *pdesc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct sk_buff *pskb = NULL;</div><div class='del'>-</div><div class='del'>-	ring = &amp;rtlpci-&gt;tx_ring[BEACON_QUEUE];</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.irq_th_lock, flags);</div><div class='del'>-	pskb = __skb_dequeue(&amp;ring-&gt;queue);</div><div class='del'>-	if (pskb)</div><div class='del'>-		dev_kfree_skb_irq(pskb);</div><div class='del'>-</div><div class='del'>-	/*this is wrong, fill_tx_cmddesc needs update*/</div><div class='del'>-	pdesc = &amp;ring-&gt;desc[0];</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;fill_tx_cmddesc(hw, (u8 *)pdesc, 1, 1, skb);</div><div class='del'>-</div><div class='del'>-	__skb_queue_tail(&amp;ring-&gt;queue, skb);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.irq_th_lock, flags);</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;tx_polling(hw, BEACON_QUEUE);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct ieee80211_ops rtl_ops = {</div><div class='del'>-	.start = rtl_op_start,</div><div class='del'>-	.stop = rtl_op_stop,</div><div class='del'>-	.tx = rtl_op_tx,</div><div class='del'>-	.add_interface = rtl_op_add_interface,</div><div class='del'>-	.remove_interface = rtl_op_remove_interface,</div><div class='del'>-	.change_interface = rtl_op_change_interface,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = rtl_op_suspend,</div><div class='del'>-	.resume = rtl_op_resume,</div><div class='del'>-#endif</div><div class='del'>-	.config = rtl_op_config,</div><div class='del'>-	.configure_filter = rtl_op_configure_filter,</div><div class='del'>-	.set_key = rtl_op_set_key,</div><div class='del'>-	.sta_statistics = rtl_op_sta_statistics,</div><div class='del'>-	.set_frag_threshold = rtl_op_set_frag_threshold,</div><div class='del'>-	.conf_tx = rtl_op_conf_tx,</div><div class='del'>-	.bss_info_changed = rtl_op_bss_info_changed,</div><div class='del'>-	.get_tsf = rtl_op_get_tsf,</div><div class='del'>-	.set_tsf = rtl_op_set_tsf,</div><div class='del'>-	.reset_tsf = rtl_op_reset_tsf,</div><div class='del'>-	.sta_notify = rtl_op_sta_notify,</div><div class='del'>-	.ampdu_action = rtl_op_ampdu_action,</div><div class='del'>-	.sw_scan_start = rtl_op_sw_scan_start,</div><div class='del'>-	.sw_scan_complete = rtl_op_sw_scan_complete,</div><div class='del'>-	.rfkill_poll = rtl_op_rfkill_poll,</div><div class='del'>-	.sta_add = rtl_op_sta_add,</div><div class='del'>-	.sta_remove = rtl_op_sta_remove,</div><div class='del'>-	.flush = rtl_op_flush,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-bool rtl_btc_status_false(void)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_dm_diginit(struct ieee80211_hw *hw, u32 cur_igvalue)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct dig_t *dm_digtable = &amp;rtlpriv-&gt;dm_digtable;</div><div class='del'>-</div><div class='del'>-	dm_digtable-&gt;dig_enable_flag = true;</div><div class='del'>-	dm_digtable-&gt;dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;</div><div class='del'>-	dm_digtable-&gt;cur_igvalue = cur_igvalue;</div><div class='del'>-	dm_digtable-&gt;pre_igvalue = 0;</div><div class='del'>-	dm_digtable-&gt;cur_sta_cstate = DIG_STA_DISCONNECT;</div><div class='del'>-	dm_digtable-&gt;presta_cstate = DIG_STA_DISCONNECT;</div><div class='del'>-	dm_digtable-&gt;curmultista_cstate = DIG_MULTISTA_DISCONNECT;</div><div class='del'>-	dm_digtable-&gt;rssi_lowthresh = DM_DIG_THRESH_LOW;</div><div class='del'>-	dm_digtable-&gt;rssi_highthresh = DM_DIG_THRESH_HIGH;</div><div class='del'>-	dm_digtable-&gt;fa_lowthresh = DM_FALSEALARM_THRESH_LOW;</div><div class='del'>-	dm_digtable-&gt;fa_highthresh = DM_FALSEALARM_THRESH_HIGH;</div><div class='del'>-	dm_digtable-&gt;rx_gain_max = DM_DIG_MAX;</div><div class='del'>-	dm_digtable-&gt;rx_gain_min = DM_DIG_MIN;</div><div class='del'>-	dm_digtable-&gt;back_val = DM_DIG_BACKOFF_DEFAULT;</div><div class='del'>-	dm_digtable-&gt;back_range_max = DM_DIG_BACKOFF_MAX;</div><div class='del'>-	dm_digtable-&gt;back_range_min = DM_DIG_BACKOFF_MIN;</div><div class='del'>-	dm_digtable-&gt;pre_cck_cca_thres = 0xff;</div><div class='del'>-	dm_digtable-&gt;cur_cck_cca_thres = 0x83;</div><div class='del'>-	dm_digtable-&gt;forbidden_igi = DM_DIG_MIN;</div><div class='del'>-	dm_digtable-&gt;large_fa_hit = 0;</div><div class='del'>-	dm_digtable-&gt;recover_cnt = 0;</div><div class='del'>-	dm_digtable-&gt;dig_min_0 = 0x25;</div><div class='del'>-	dm_digtable-&gt;dig_min_1 = 0x25;</div><div class='del'>-	dm_digtable-&gt;media_connect_0 = false;</div><div class='del'>-	dm_digtable-&gt;media_connect_1 = false;</div><div class='del'>-	rtlpriv-&gt;dm.dm_initialgain_enable = true;</div><div class='del'>-	dm_digtable-&gt;bt30_cur_igi = 0x32;</div><div class='del'>-	dm_digtable-&gt;pre_cck_pd_state = CCK_PD_STAGE_MAX;</div><div class='del'>-	dm_digtable-&gt;cur_cck_pd_state = CCK_PD_STAGE_LOWRSSI;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/core.h b/drivers/staging/rtlwifi/core.h<br/>deleted file mode 100644<br/>index 991af1abf8ca..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/core.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/core.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __RTL_CORE_H__</div><div class='del'>-#define __RTL_CORE_H__</div><div class='del'>-</div><div class='del'>-#define RTL_SUPPORTED_FILTERS		\</div><div class='del'>-	(FIF_ALLMULTI | FIF_CONTROL | \</div><div class='del'>-	FIF_OTHER_BSS | \</div><div class='del'>-	FIF_FCSFAIL | \</div><div class='del'>-	FIF_BCN_PRBRESP_PROMISC)</div><div class='del'>-</div><div class='del'>-#define DM_DIG_THRESH_HIGH		40</div><div class='del'>-#define DM_DIG_THRESH_LOW		35</div><div class='del'>-#define DM_FALSEALARM_THRESH_LOW	400</div><div class='del'>-#define DM_FALSEALARM_THRESH_HIGH	1000</div><div class='del'>-</div><div class='del'>-#define DM_DIG_MAX			0x3e</div><div class='del'>-#define DM_DIG_MIN			0x1e</div><div class='del'>-#define DM_DIG_MAX_AP			0x32</div><div class='del'>-#define DM_DIG_BACKOFF_MAX		12</div><div class='del'>-#define DM_DIG_BACKOFF_MIN		-4</div><div class='del'>-#define DM_DIG_BACKOFF_DEFAULT		10</div><div class='del'>-</div><div class='del'>-enum cck_packet_detection_threshold {</div><div class='del'>-	CCK_PD_STAGE_LOWRSSI = 0,</div><div class='del'>-	CCK_PD_STAGE_HIGHRSSI = 1,</div><div class='del'>-	CCK_FA_STAGE_LOW = 2,</div><div class='del'>-	CCK_FA_STAGE_HIGH = 3,</div><div class='del'>-	CCK_PD_STAGE_MAX = 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dm_dig_ext_port_alg_e {</div><div class='del'>-	DIG_EXT_PORT_STAGE_0 = 0,</div><div class='del'>-	DIG_EXT_PORT_STAGE_1 = 1,</div><div class='del'>-	DIG_EXT_PORT_STAGE_2 = 2,</div><div class='del'>-	DIG_EXT_PORT_STAGE_3 = 3,</div><div class='del'>-	DIG_EXT_PORT_STAGE_MAX = 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dm_dig_connect_e {</div><div class='del'>-	DIG_STA_DISCONNECT,</div><div class='del'>-	DIG_STA_CONNECT,</div><div class='del'>-	DIG_STA_BEFORE_CONNECT,</div><div class='del'>-	DIG_MULTISTA_DISCONNECT,</div><div class='del'>-	DIG_MULTISTA_CONNECT,</div><div class='del'>-	DIG_AP_DISCONNECT,</div><div class='del'>-	DIG_AP_CONNECT,</div><div class='del'>-	DIG_AP_ADD_STATION,</div><div class='del'>-	DIG_CONNECT_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern const struct ieee80211_ops rtl_ops;</div><div class='del'>-void rtl_fw_cb(const struct firmware *firmware, void *context);</div><div class='del'>-void rtl_wowlan_fw_cb(const struct firmware *firmware, void *context);</div><div class='del'>-bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-bool rtl_btc_status_false(void);</div><div class='del'>-void rtl_dm_diginit(struct ieee80211_hw *hw, u32 cur_igval);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/debug.c b/drivers/staging/rtlwifi/debug.c<br/>deleted file mode 100644<br/>index 8999feda29b4..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/debug.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/debug.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,624 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "wifi.h"</div><div class='del'>-#include "cam.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_RTLWIFI_DEBUG_ST</div><div class='del'>-void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level,</div><div class='del'>-		    const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	if (unlikely((comp &amp; rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug_mask) &amp;&amp;</div><div class='del'>-		     level &lt;= rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug_level)) {</div><div class='del'>-		struct va_format vaf;</div><div class='del'>-		va_list args;</div><div class='del'>-</div><div class='del'>-		va_start(args, fmt);</div><div class='del'>-</div><div class='del'>-		vaf.fmt = fmt;</div><div class='del'>-		vaf.va = &amp;args;</div><div class='del'>-</div><div class='del'>-		pr_info(":&lt;%lx&gt; %pV", in_interrupt(), &amp;vaf);</div><div class='del'>-</div><div class='del'>-		va_end(args);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level,</div><div class='del'>-		    const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	if (unlikely((comp &amp; rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug_mask) &amp;&amp;</div><div class='del'>-		     level &lt;= rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug_level)) {</div><div class='del'>-		struct va_format vaf;</div><div class='del'>-		va_list args;</div><div class='del'>-</div><div class='del'>-		va_start(args, fmt);</div><div class='del'>-</div><div class='del'>-		vaf.fmt = fmt;</div><div class='del'>-		vaf.va = &amp;args;</div><div class='del'>-</div><div class='del'>-		pr_info("%pV", &amp;vaf);</div><div class='del'>-</div><div class='del'>-		va_end(args);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,</div><div class='del'>-			 const char *titlestring,</div><div class='del'>-			 const void *hexdata, int hexdatalen)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(((comp) &amp; rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug_mask) &amp;&amp;</div><div class='del'>-		     ((level) &lt;= rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug_level))) {</div><div class='del'>-		pr_info("In process \"%s\" (pid %i): %s\n",</div><div class='del'>-			current-&gt;comm, current-&gt;pid, titlestring);</div><div class='del'>-		print_hex_dump_bytes("", DUMP_PREFIX_NONE,</div><div class='del'>-				     hexdata, hexdatalen);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct rtl_debugfs_priv {</div><div class='del'>-	struct rtl_priv *rtlpriv;</div><div class='del'>-	int (*cb_read)(struct seq_file *m, void *v);</div><div class='del'>-	ssize_t (*cb_write)(struct file *filp, const char __user *buffer,</div><div class='del'>-			    size_t count, loff_t *loff);</div><div class='del'>-	u32 cb_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dentry *debugfs_topdir;</div><div class='del'>-</div><div class='del'>-static int rtl_debug_get_common(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-</div><div class='del'>-	return debugfs_priv-&gt;cb_read(m, v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dl_debug_open_common(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, rtl_debug_get_common, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations file_ops_common = {</div><div class='del'>-	.open = dl_debug_open_common,</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='del'>-</div><div class='del'>-static int rtl_debug_get_mac_page(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	u32 page = debugfs_priv-&gt;cb_data;</div><div class='del'>-	int i, n;</div><div class='del'>-	int max = 0xff;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt;= max; ) {</div><div class='del'>-		seq_printf(m, "\n%8.8x  ", n + page);</div><div class='del'>-		for (i = 0; i &lt; 4 &amp;&amp; n &lt;= max; i++, n += 4)</div><div class='del'>-			seq_printf(m, "%8.8x    ",</div><div class='del'>-				   rtl_read_dword(rtlpriv, (page | n)));</div><div class='del'>-	}</div><div class='del'>-	seq_puts(m, "\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTL_DEBUG_IMPL_MAC_SERIES(page, addr)			\</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_mac_ ##page = {	\</div><div class='del'>-	.cb_read = rtl_debug_get_mac_page,			\</div><div class='del'>-	.cb_data = addr,					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(0, 0x0000);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(1, 0x0100);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(2, 0x0200);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(3, 0x0300);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(4, 0x0400);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(5, 0x0500);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(6, 0x0600);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(7, 0x0700);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(10, 0x1000);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(11, 0x1100);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(12, 0x1200);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(13, 0x1300);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(14, 0x1400);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(15, 0x1500);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(16, 0x1600);</div><div class='del'>-RTL_DEBUG_IMPL_MAC_SERIES(17, 0x1700);</div><div class='del'>-</div><div class='del'>-static int rtl_debug_get_bb_page(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;hw;</div><div class='del'>-	u32 page = debugfs_priv-&gt;cb_data;</div><div class='del'>-	int i, n;</div><div class='del'>-	int max = 0xff;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt;= max; ) {</div><div class='del'>-		seq_printf(m, "\n%8.8x  ", n + page);</div><div class='del'>-		for (i = 0; i &lt; 4 &amp;&amp; n &lt;= max; i++, n += 4)</div><div class='del'>-			seq_printf(m, "%8.8x    ",</div><div class='del'>-				   rtl_get_bbreg(hw, (page | n), 0xffffffff));</div><div class='del'>-	}</div><div class='del'>-	seq_puts(m, "\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTL_DEBUG_IMPL_BB_SERIES(page, addr)			\</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_bb_ ##page = {	\</div><div class='del'>-	.cb_read = rtl_debug_get_bb_page,			\</div><div class='del'>-	.cb_data = addr,					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(8, 0x0800);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(9, 0x0900);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(a, 0x0a00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(b, 0x0b00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(c, 0x0c00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(d, 0x0d00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(e, 0x0e00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(f, 0x0f00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(18, 0x1800);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(19, 0x1900);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(1a, 0x1a00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(1b, 0x1b00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(1c, 0x1c00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(1d, 0x1d00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(1e, 0x1e00);</div><div class='del'>-RTL_DEBUG_IMPL_BB_SERIES(1f, 0x1f00);</div><div class='del'>-</div><div class='del'>-static int rtl_debug_get_reg_rf(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;hw;</div><div class='del'>-	enum radio_path rfpath = debugfs_priv-&gt;cb_data;</div><div class='del'>-	int i, n;</div><div class='del'>-	int max = 0x40;</div><div class='del'>-</div><div class='del'>-	if (IS_HARDWARE_TYPE_8822B(rtlpriv))</div><div class='del'>-		max = 0xff;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\nPATH(%d)", rfpath);</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt;= max; ) {</div><div class='del'>-		seq_printf(m, "\n%8.8x  ", n);</div><div class='del'>-		for (i = 0; i &lt; 4 &amp;&amp; n &lt;= max; n += 1, i++)</div><div class='del'>-			seq_printf(m, "%8.8x    ",</div><div class='del'>-				   rtl_get_rfreg(hw, rfpath, n, 0xffffffff));</div><div class='del'>-	}</div><div class='del'>-	seq_puts(m, "\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTL_DEBUG_IMPL_RF_SERIES(page, addr)			\</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_rf_ ##page = {	\</div><div class='del'>-	.cb_read = rtl_debug_get_reg_rf,			\</div><div class='del'>-	.cb_data = addr,					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-RTL_DEBUG_IMPL_RF_SERIES(a, RF90_PATH_A);</div><div class='del'>-RTL_DEBUG_IMPL_RF_SERIES(b, RF90_PATH_B);</div><div class='del'>-</div><div class='del'>-static int rtl_debug_get_cam_register(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	int start = debugfs_priv-&gt;cb_data;</div><div class='del'>-	u32 target_cmd = 0;</div><div class='del'>-	u32 target_val = 0;</div><div class='del'>-	u8 entry_i = 0;</div><div class='del'>-	u32 ulstatus;</div><div class='del'>-	int i = 100, j = 0;</div><div class='del'>-	int end = (start + 11 &gt; TOTAL_CAM_ENTRY ? TOTAL_CAM_ENTRY : start + 11);</div><div class='del'>-</div><div class='del'>-	/* This dump the current register page */</div><div class='del'>-	seq_printf(m,</div><div class='del'>-		   "\n#################### SECURITY CAM (%d-%d) ##################\n",</div><div class='del'>-		   start, end - 1);</div><div class='del'>-</div><div class='del'>-	for (j = start; j &lt; end; j++) {</div><div class='del'>-		seq_printf(m, "\nD:  %2x &gt; ", j);</div><div class='del'>-		for (entry_i = 0; entry_i &lt; CAM_CONTENT_COUNT; entry_i++) {</div><div class='del'>-			/* polling bit, and No Write enable, and address  */</div><div class='del'>-			target_cmd = entry_i + CAM_CONTENT_COUNT * j;</div><div class='del'>-			target_cmd = target_cmd | BIT(31);</div><div class='del'>-</div><div class='del'>-			/* Check polling bit is clear */</div><div class='del'>-			while ((i--) &gt;= 0) {</div><div class='del'>-				ulstatus = rtl_read_dword(</div><div class='del'>-						rtlpriv,</div><div class='del'>-						rtlpriv-&gt;cfg-&gt;maps[RWCAM]);</div><div class='del'>-				if (ulstatus &amp; BIT(31))</div><div class='del'>-					continue;</div><div class='del'>-				else</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rtl_write_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[RWCAM],</div><div class='del'>-					target_cmd);</div><div class='del'>-			target_val = rtl_read_dword(rtlpriv,</div><div class='del'>-						    rtlpriv-&gt;cfg-&gt;maps[RCAMO]);</div><div class='del'>-			seq_printf(m, "%8.8x ", target_val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	seq_puts(m, "\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTL_DEBUG_IMPL_CAM_SERIES(page, addr)			\</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_cam_ ##page = {	\</div><div class='del'>-	.cb_read = rtl_debug_get_cam_register,			\</div><div class='del'>-	.cb_data = addr,					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-RTL_DEBUG_IMPL_CAM_SERIES(1, 0);</div><div class='del'>-RTL_DEBUG_IMPL_CAM_SERIES(2, 11);</div><div class='del'>-RTL_DEBUG_IMPL_CAM_SERIES(3, 22);</div><div class='del'>-</div><div class='del'>-static int rtl_debug_get_btcoex(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;cfg-&gt;ops-&gt;get_btc_status())</div><div class='del'>-		rtlpriv-&gt;btcoexist.btc_ops-&gt;btc_display_bt_coex_info(rtlpriv,</div><div class='del'>-								     m);</div><div class='del'>-</div><div class='del'>-	seq_puts(m, "\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_btcoex = {</div><div class='del'>-	.cb_read = rtl_debug_get_btcoex,</div><div class='del'>-	.cb_data = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t rtl_debugfs_set_write_reg(struct file *filp,</div><div class='del'>-					 const char __user *buffer,</div><div class='del'>-					 size_t count, loff_t *loff)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	char tmp[32 + 1];</div><div class='del'>-	int tmp_len;</div><div class='del'>-	u32 addr, val, len;</div><div class='del'>-	int num;</div><div class='del'>-</div><div class='del'>-	if (count &lt; 3)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	tmp_len = (count &gt; sizeof(tmp) - 1 ? sizeof(tmp) - 1 : count);</div><div class='del'>-</div><div class='del'>-	if (!buffer || copy_from_user(tmp, buffer, tmp_len))</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	tmp[tmp_len] = '\0';</div><div class='del'>-</div><div class='del'>-	/* write BB/MAC register */</div><div class='del'>-	num = sscanf(tmp, "%x %x %x", &amp;addr, &amp;val, &amp;len);</div><div class='del'>-</div><div class='del'>-	if (num !=  3)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	switch (len) {</div><div class='del'>-	case 1:</div><div class='del'>-		rtl_write_byte(rtlpriv, addr, (u8)val);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		rtl_write_word(rtlpriv, addr, (u16)val);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		rtl_write_dword(rtlpriv, addr, val);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/*printk("error write length=%d", len);*/</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_write_reg = {</div><div class='del'>-	.cb_write = rtl_debugfs_set_write_reg,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t rtl_debugfs_set_write_h2c(struct file *filp,</div><div class='del'>-					 const char __user *buffer,</div><div class='del'>-					 size_t count, loff_t *loff)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;hw;</div><div class='del'>-	char tmp[32 + 1];</div><div class='del'>-	int tmp_len;</div><div class='del'>-	u8 h2c_len, h2c_data_packed[8];</div><div class='del'>-	int h2c_data[8];	/* idx 0: cmd */</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (count &lt; 3)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	tmp_len = (count &gt; sizeof(tmp) - 1 ? sizeof(tmp) - 1 : count);</div><div class='del'>-</div><div class='del'>-	if (!buffer || copy_from_user(tmp, buffer, tmp_len))</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	tmp[tmp_len] = '\0';</div><div class='del'>-</div><div class='del'>-	h2c_len = sscanf(tmp, "%X %X %X %X %X %X %X %X",</div><div class='del'>-			 &amp;h2c_data[0], &amp;h2c_data[1],</div><div class='del'>-			 &amp;h2c_data[2], &amp;h2c_data[3],</div><div class='del'>-			 &amp;h2c_data[4], &amp;h2c_data[5],</div><div class='del'>-			 &amp;h2c_data[6], &amp;h2c_data[7]);</div><div class='del'>-</div><div class='del'>-	if (h2c_len &lt;= 0)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; h2c_len; i++)</div><div class='del'>-		h2c_data_packed[i] = (u8)h2c_data[i];</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;fill_h2c_cmd(hw, h2c_data_packed[0],</div><div class='del'>-					h2c_len - 1,</div><div class='del'>-					&amp;h2c_data_packed[1]);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_write_h2c = {</div><div class='del'>-	.cb_write = rtl_debugfs_set_write_h2c,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp,</div><div class='del'>-					   const char __user *buffer,</div><div class='del'>-					    size_t count, loff_t *loff)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-	struct ieee80211_hw *hw = rtlpriv-&gt;hw;</div><div class='del'>-	char tmp[32 + 1];</div><div class='del'>-	int tmp_len;</div><div class='del'>-	int num;</div><div class='del'>-	int path;</div><div class='del'>-	u32 addr, bitmask, data;</div><div class='del'>-</div><div class='del'>-	if (count &lt; 3)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	tmp_len = (count &gt; sizeof(tmp) - 1 ? sizeof(tmp) - 1 : count);</div><div class='del'>-</div><div class='del'>-	if (!buffer || copy_from_user(tmp, buffer, tmp_len))</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	tmp[tmp_len] = '\0';</div><div class='del'>-</div><div class='del'>-	num = sscanf(tmp, "%X %X %X %X",</div><div class='del'>-		     &amp;path, &amp;addr, &amp;bitmask, &amp;data);</div><div class='del'>-</div><div class='del'>-	if (num != 4) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,</div><div class='del'>-			 "Format is &lt;path&gt; &lt;addr&gt; &lt;mask&gt; &lt;data&gt;\n");</div><div class='del'>-		return count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rtl_set_rfreg(hw, path, addr, bitmask, data);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_write_rfreg = {</div><div class='del'>-	.cb_write = rtl_debugfs_set_write_rfreg,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int rtl_debugfs_close(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t rtl_debugfs_common_write(struct file *filp,</div><div class='del'>-					const char __user *buffer,</div><div class='del'>-					size_t count, loff_t *loff)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	return debugfs_priv-&gt;cb_write(filp, buffer, count, loff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations file_ops_common_write = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.write = rtl_debugfs_common_write,</div><div class='del'>-	.open = simple_open,</div><div class='del'>-	.release = rtl_debugfs_close,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t rtl_debugfs_phydm_cmd(struct file *filp,</div><div class='del'>-				     const char __user *buffer,</div><div class='del'>-				     size_t count, loff_t *loff)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = filp-&gt;private_data;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-</div><div class='del'>-	char tmp[64];</div><div class='del'>-</div><div class='del'>-	if (!rtlpriv-&gt;dbg.msg_buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!rtlpriv-&gt;phydm.ops)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (buffer &amp;&amp; !copy_from_user(tmp, buffer, sizeof(tmp))) {</div><div class='del'>-		tmp[count] = '\0';</div><div class='del'>-</div><div class='del'>-		rtlpriv-&gt;phydm.ops-&gt;phydm_debug_cmd(rtlpriv, tmp, count,</div><div class='del'>-						    rtlpriv-&gt;dbg.msg_buf,</div><div class='del'>-						    80 * 25);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_debug_get_phydm_cmd(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct rtl_debugfs_priv *debugfs_priv = m-&gt;private;</div><div class='del'>-	struct rtl_priv *rtlpriv = debugfs_priv-&gt;rtlpriv;</div><div class='del'>-</div><div class='del'>-	if (rtlpriv-&gt;dbg.msg_buf)</div><div class='del'>-		seq_puts(m, rtlpriv-&gt;dbg.msg_buf);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_debugfs_open_rw(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (filp-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-		ret = single_open(filp, rtl_debug_get_common, inode-&gt;i_private);</div><div class='del'>-	else</div><div class='del'>-		filp-&gt;private_data = inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl_debugfs_close_rw(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	if (filp-&gt;f_mode == FMODE_READ)</div><div class='del'>-		single_release(inode, filp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtl_debugfs_priv rtl_debug_priv_phydm_cmd = {</div><div class='del'>-	.cb_read = rtl_debug_get_phydm_cmd,</div><div class='del'>-	.cb_write = rtl_debugfs_phydm_cmd,</div><div class='del'>-	.cb_data = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct file_operations file_ops_common_rw = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.open = rtl_debugfs_open_rw,</div><div class='del'>-	.release = rtl_debugfs_close_rw,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.llseek = seq_lseek,</div><div class='del'>-	.write = rtl_debugfs_common_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define RTL_DEBUGFS_ADD_CORE(name, mode, fopname)			   \</div><div class='del'>-	do {								   \</div><div class='del'>-		rtl_debug_priv_ ##name.rtlpriv = rtlpriv;		   \</div><div class='del'>-		debugfs_create_file(#name, mode, parent,		   \</div><div class='del'>-				    &amp;rtl_debug_priv_ ##name,		   \</div><div class='del'>-				    &amp;file_ops_ ##fopname);		   \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define RTL_DEBUGFS_ADD(name)						   \</div><div class='del'>-		RTL_DEBUGFS_ADD_CORE(name, S_IFREG | 0444, common)</div><div class='del'>-#define RTL_DEBUGFS_ADD_W(name)						   \</div><div class='del'>-		RTL_DEBUGFS_ADD_CORE(name, S_IFREG | 0222, common_write)</div><div class='del'>-#define RTL_DEBUGFS_ADD_RW(name)					   \</div><div class='del'>-		RTL_DEBUGFS_ADD_CORE(name, S_IFREG | 0666, common_rw)</div><div class='del'>-</div><div class='del'>-void rtl_debug_add_one(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	struct dentry *parent;</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;dbg.msg_buf = vzalloc(80 * 25);</div><div class='del'>-</div><div class='del'>-	snprintf(rtlpriv-&gt;dbg.debugfs_name, 18, "%pMF", rtlefuse-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	rtlpriv-&gt;dbg.debugfs_dir =</div><div class='del'>-		debugfs_create_dir(rtlpriv-&gt;dbg.debugfs_name, debugfs_topdir);</div><div class='del'>-	if (!rtlpriv-&gt;dbg.debugfs_dir) {</div><div class='del'>-		pr_err("Unable to init debugfs:/%s/%s\n", rtlpriv-&gt;cfg-&gt;name,</div><div class='del'>-		       rtlpriv-&gt;dbg.debugfs_name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parent = rtlpriv-&gt;dbg.debugfs_dir;</div><div class='del'>-</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_0);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_1);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_2);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_3);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_4);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_5);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_6);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_7);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_8);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_9);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_a);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_b);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_c);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_d);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_e);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_f);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_10);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_11);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_12);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_13);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_14);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_15);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_16);</div><div class='del'>-	RTL_DEBUGFS_ADD(mac_17);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_18);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_19);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_1a);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_1b);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_1c);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_1d);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_1e);</div><div class='del'>-	RTL_DEBUGFS_ADD(bb_1f);</div><div class='del'>-	RTL_DEBUGFS_ADD(rf_a);</div><div class='del'>-	RTL_DEBUGFS_ADD(rf_b);</div><div class='del'>-</div><div class='del'>-	RTL_DEBUGFS_ADD(cam_1);</div><div class='del'>-	RTL_DEBUGFS_ADD(cam_2);</div><div class='del'>-	RTL_DEBUGFS_ADD(cam_3);</div><div class='del'>-</div><div class='del'>-	RTL_DEBUGFS_ADD(btcoex);</div><div class='del'>-</div><div class='del'>-	RTL_DEBUGFS_ADD_W(write_reg);</div><div class='del'>-	RTL_DEBUGFS_ADD_W(write_h2c);</div><div class='del'>-	RTL_DEBUGFS_ADD_W(write_rfreg);</div><div class='del'>-</div><div class='del'>-	RTL_DEBUGFS_ADD_RW(phydm_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_debug_remove_one(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	debugfs_remove_recursive(rtlpriv-&gt;dbg.debugfs_dir);</div><div class='del'>-	rtlpriv-&gt;dbg.debugfs_dir = NULL;</div><div class='del'>-</div><div class='del'>-	vfree(rtlpriv-&gt;dbg.msg_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_debugfs_add_topdir(void)</div><div class='del'>-{</div><div class='del'>-	debugfs_topdir = debugfs_create_dir("rtlwifi", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_debugfs_remove_topdir(void)</div><div class='del'>-{</div><div class='del'>-	debugfs_remove_recursive(debugfs_topdir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/debug.h b/drivers/staging/rtlwifi/debug.h<br/>deleted file mode 100644<br/>index 666d7bc80c48..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/debug.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/debug.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,223 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __RTL_DEBUG_H__</div><div class='del'>-#define __RTL_DEBUG_H__</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------</div><div class='del'>- *			Debug level</div><div class='del'>- *------------------------------------------------------------</div><div class='del'>- *</div><div class='del'>- *Fatal bug.</div><div class='del'>- *For example, Tx/Rx/IO locked up,</div><div class='del'>- *memory access violation,</div><div class='del'>- *resource allocation failed,</div><div class='del'>- *unexpected HW behavior, HW BUG</div><div class='del'>- *and so on.</div><div class='del'>- */</div><div class='del'>-/*#define DBG_EMERG			0 */</div><div class='del'>-</div><div class='del'>-/*Abnormal, rare, or unexpected cases.</div><div class='del'>- *For example, Packet/IO Ctl canceled,</div><div class='del'>- *device surprisingly removed and so on.</div><div class='del'>- */</div><div class='del'>-#define	DBG_WARNING			2</div><div class='del'>-</div><div class='del'>-/*Normal case driver developer should</div><div class='del'>- *open, we can see link status like</div><div class='del'>- *assoc/AddBA/DHCP/adapter start and</div><div class='del'>- *so on basic and useful infromations.</div><div class='del'>- */</div><div class='del'>-#define DBG_DMESG			3</div><div class='del'>-</div><div class='del'>-/*Normal case with useful information</div><div class='del'>- *about current SW or HW state.</div><div class='del'>- *For example, Tx/Rx descriptor to fill,</div><div class='del'>- *Tx/Rx descriptor completed status,</div><div class='del'>- *SW protocol state change, dynamic</div><div class='del'>- *mechanism state change and so on.</div><div class='del'>- */</div><div class='del'>-#define DBG_LOUD			4</div><div class='del'>-</div><div class='del'>-/*Normal case with detail execution</div><div class='del'>- *flow or information.</div><div class='del'>- */</div><div class='del'>-#define	DBG_TRACE			5</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------</div><div class='del'>- *		Define the rt_trace components</div><div class='del'>- *--------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-#define COMP_ERR			BIT(0)</div><div class='del'>-#define COMP_FW				BIT(1)</div><div class='del'>-#define COMP_INIT			BIT(2)	/*For init/deinit */</div><div class='del'>-#define COMP_RECV			BIT(3)	/*For Rx. */</div><div class='del'>-#define COMP_SEND			BIT(4)	/*For Tx. */</div><div class='del'>-#define COMP_MLME			BIT(5)	/*For MLME. */</div><div class='del'>-#define COMP_SCAN			BIT(6)	/*For Scan. */</div><div class='del'>-#define COMP_INTR			BIT(7)	/*For interrupt Related. */</div><div class='del'>-#define COMP_LED			BIT(8)	/*For LED. */</div><div class='del'>-#define COMP_SEC			BIT(9)	/*For sec. */</div><div class='del'>-#define COMP_BEACON			BIT(10)	/*For beacon. */</div><div class='del'>-#define COMP_RATE			BIT(11)	/*For rate. */</div><div class='del'>-#define COMP_RXDESC			BIT(12)	/*For rx desc. */</div><div class='del'>-#define COMP_DIG			BIT(13)	/*For DIG */</div><div class='del'>-#define COMP_TXAGC			BIT(14)	/*For Tx power */</div><div class='del'>-#define COMP_HIPWR			BIT(15)	/*For High Power Mechanism */</div><div class='del'>-#define COMP_POWER			BIT(16)	/*For lps/ips/aspm. */</div><div class='del'>-#define COMP_POWER_TRACKING	BIT(17)	/*For TX POWER TRACKING */</div><div class='del'>-#define COMP_BB_POWERSAVING	BIT(18)</div><div class='del'>-#define COMP_SWAS			BIT(19)	/*For SW Antenna Switch */</div><div class='del'>-#define COMP_RF				BIT(20)	/*For RF. */</div><div class='del'>-#define COMP_TURBO			BIT(21)	/*For EDCA TURBO. */</div><div class='del'>-#define COMP_RATR			BIT(22)</div><div class='del'>-#define COMP_CMD			BIT(23)</div><div class='del'>-#define COMP_EFUSE			BIT(24)</div><div class='del'>-#define COMP_QOS			BIT(25)</div><div class='del'>-#define COMP_MAC80211		BIT(26)</div><div class='del'>-#define COMP_REGD			BIT(27)</div><div class='del'>-#define COMP_CHAN			BIT(28)</div><div class='del'>-#define COMP_USB			BIT(29)</div><div class='del'>-#define COMP_EASY_CONCURRENT	COMP_USB /* reuse of this bit is OK */</div><div class='del'>-#define COMP_BT_COEXIST			BIT(30)</div><div class='del'>-#define COMP_IQK			BIT(31)</div><div class='del'>-#define COMP_TX_REPORT			BIT_ULL(32)</div><div class='del'>-#define COMP_HALMAC			BIT_ULL(34)</div><div class='del'>-#define COMP_PHYDM			BIT_ULL(35)</div><div class='del'>-</div><div class='del'>-/*--------------------------------------------------------------</div><div class='del'>- *		Define the rt_print components</div><div class='del'>- *--------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-/* Define EEPROM and EFUSE  check module bit*/</div><div class='del'>-#define EEPROM_W			BIT(0)</div><div class='del'>-#define EFUSE_PG			BIT(1)</div><div class='del'>-#define EFUSE_READ_ALL			BIT(2)</div><div class='del'>-</div><div class='del'>-/* Define init check for module bit*/</div><div class='del'>-#define	INIT_EEPROM			BIT(0)</div><div class='del'>-#define	INIT_TXPOWER			BIT(1)</div><div class='del'>-#define	INIT_IQK			BIT(2)</div><div class='del'>-#define	INIT_RF				BIT(3)</div><div class='del'>-</div><div class='del'>-/* Define PHY-BB/RF/MAC check module bit */</div><div class='del'>-#define	PHY_BBR				BIT(0)</div><div class='del'>-#define	PHY_BBW				BIT(1)</div><div class='del'>-#define	PHY_RFR				BIT(2)</div><div class='del'>-#define	PHY_RFW				BIT(3)</div><div class='del'>-#define	PHY_MACR			BIT(4)</div><div class='del'>-#define	PHY_MACW			BIT(5)</div><div class='del'>-#define	PHY_ALLR			BIT(6)</div><div class='del'>-#define	PHY_ALLW			BIT(7)</div><div class='del'>-#define	PHY_TXPWR			BIT(8)</div><div class='del'>-#define	PHY_PWRDIFF			BIT(9)</div><div class='del'>-</div><div class='del'>-/* Define Dynamic Mechanism check module bit --&gt; FDM */</div><div class='del'>-#define WA_IOT				BIT(0)</div><div class='del'>-#define DM_PWDB				BIT(1)</div><div class='del'>-#define DM_MONITOR			BIT(2)</div><div class='del'>-#define DM_DIG				BIT(3)</div><div class='del'>-#define DM_EDCA_TURBO			BIT(4)</div><div class='del'>-</div><div class='del'>-#define DM_PWDB				BIT(1)</div><div class='del'>-</div><div class='del'>-enum dbgp_flag_e {</div><div class='del'>-	FQOS = 0,</div><div class='del'>-	FTX = 1,</div><div class='del'>-	FRX = 2,</div><div class='del'>-	FSEC = 3,</div><div class='del'>-	FMGNT = 4,</div><div class='del'>-	FMLME = 5,</div><div class='del'>-	FRESOURCE = 6,</div><div class='del'>-	FBEACON = 7,</div><div class='del'>-	FISR = 8,</div><div class='del'>-	FPHY = 9,</div><div class='del'>-	FMP = 10,</div><div class='del'>-	FEEPROM = 11,</div><div class='del'>-	FPWR = 12,</div><div class='del'>-	FDM = 13,</div><div class='del'>-	FDBGCTRL = 14,</div><div class='del'>-	FC2H = 15,</div><div class='del'>-	FBT = 16,</div><div class='del'>-	FINIT = 17,</div><div class='del'>-	FIOCTL = 18,</div><div class='del'>-	DBGP_TYPE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_RTLWIFI_DEBUG_ST</div><div class='del'>-</div><div class='del'>-struct rtl_priv;</div><div class='del'>-</div><div class='del'>-__printf(4, 5)</div><div class='del'>-void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level,</div><div class='del'>-		    const char *fmt, ...);</div><div class='del'>-</div><div class='del'>-__printf(4, 5)</div><div class='del'>-void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level,</div><div class='del'>-		    const char *fmt, ...);</div><div class='del'>-</div><div class='del'>-void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,</div><div class='del'>-			 const char *titlestring,</div><div class='del'>-			 const void *hexdata, int hexdatalen);</div><div class='del'>-</div><div class='del'>-#define RT_TRACE(rtlpriv, comp, level, fmt, ...)			\</div><div class='del'>-	_rtl_dbg_trace(rtlpriv, comp, level,				\</div><div class='del'>-		       fmt, ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define RTPRINT(rtlpriv, dbgtype, dbgflag, fmt, ...)			\</div><div class='del'>-	_rtl_dbg_print(rtlpriv, dbgtype, dbgflag, fmt, ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata,	\</div><div class='del'>-		      _hexdatalen)					\</div><div class='del'>-	_rtl_dbg_print_data(rtlpriv, _comp, _level,			\</div><div class='del'>-			    _titlestring, _hexdata, _hexdatalen)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-struct rtl_priv;</div><div class='del'>-</div><div class='del'>-__printf(4, 5)</div><div class='del'>-static inline void RT_TRACE(struct rtl_priv *rtlpriv,</div><div class='del'>-			    u64 comp, int level,</div><div class='del'>-			    const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__printf(4, 5)</div><div class='del'>-static inline void RTPRINT(struct rtl_priv *rtlpriv,</div><div class='del'>-			   int dbgtype, int dbgflag,</div><div class='del'>-			   const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void RT_PRINT_DATA(struct rtl_priv *rtlpriv,</div><div class='del'>-				 u64 comp, int level,</div><div class='del'>-				 const char *titlestring,</div><div class='del'>-				 const void *hexdata, size_t hexdatalen)</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'>-#ifdef CONFIG_RTLWIFI_DEBUG_ST</div><div class='del'>-void rtl_debug_add_one(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_debug_remove_one(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_debugfs_add_topdir(void);</div><div class='del'>-void rtl_debugfs_remove_topdir(void);</div><div class='del'>-#else</div><div class='del'>-#define rtl_debug_add_one(hw)</div><div class='del'>-#define rtl_debug_remove_one(hw)</div><div class='del'>-#define rtl_debugfs_add_topdir()</div><div class='del'>-#define rtl_debugfs_remove_topdir()</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/efuse.c b/drivers/staging/rtlwifi/efuse.c<br/>deleted file mode 100644<br/>index a7c9e186f2b2..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/efuse.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/efuse.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1329 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "wifi.h"</div><div class='del'>-#include "efuse.h"</div><div class='del'>-#include "pci.h"</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-static const u8 MAX_PGPKT_SIZE = 9;</div><div class='del'>-static const u8 PGPKT_DATA_SIZE = 8;</div><div class='del'>-static const int EFUSE_MAX_SIZE = 512;</div><div class='del'>-</div><div class='del'>-#define START_ADDRESS		0x1000</div><div class='del'>-#define REG_MCUFWDL		0x0080</div><div class='del'>-</div><div class='del'>-static const struct efuse_map RTL8712_SDIO_EFUSE_TABLE[] = {</div><div class='del'>-	{0, 0, 0, 2},</div><div class='del'>-	{0, 1, 0, 2},</div><div class='del'>-	{0, 2, 0, 2},</div><div class='del'>-	{1, 0, 0, 1},</div><div class='del'>-	{1, 0, 1, 1},</div><div class='del'>-	{1, 1, 0, 1},</div><div class='del'>-	{1, 1, 1, 3},</div><div class='del'>-	{1, 3, 0, 17},</div><div class='del'>-	{3, 3, 1, 48},</div><div class='del'>-	{10, 0, 0, 6},</div><div class='del'>-	{10, 3, 0, 1},</div><div class='del'>-	{10, 3, 1, 1},</div><div class='del'>-	{11, 0, 0, 28}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_read_1byte(struct ieee80211_hw *hw, u16 offset,</div><div class='del'>-				    u8 *value);</div><div class='del'>-static void efuse_shadow_read_2byte(struct ieee80211_hw *hw, u16 offset,</div><div class='del'>-				    u16 *value);</div><div class='del'>-static void efuse_shadow_read_4byte(struct ieee80211_hw *hw, u16 offset,</div><div class='del'>-				    u32 *value);</div><div class='del'>-static void efuse_shadow_write_1byte(struct ieee80211_hw *hw, u16 offset,</div><div class='del'>-				     u8 value);</div><div class='del'>-static void efuse_shadow_write_2byte(struct ieee80211_hw *hw, u16 offset,</div><div class='del'>-				     u16 value);</div><div class='del'>-static void efuse_shadow_write_4byte(struct ieee80211_hw *hw, u16 offset,</div><div class='del'>-				     u32 value);</div><div class='del'>-static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr,</div><div class='del'>-				u8 data);</div><div class='del'>-static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse);</div><div class='del'>-static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset,</div><div class='del'>-				u8 *data);</div><div class='del'>-static int efuse_pg_packet_write(struct ieee80211_hw *hw, u8 offset,</div><div class='del'>-				 u8 word_en, u8 *data);</div><div class='del'>-static void efuse_word_enable_data_read(u8 word_en, u8 *sourdata,</div><div class='del'>-					u8 *targetdata);</div><div class='del'>-static u8 enable_efuse_data_write(struct ieee80211_hw *hw,</div><div class='del'>-				  u16 efuse_addr, u8 word_en, u8 *data);</div><div class='del'>-static u16 efuse_get_current_size(struct ieee80211_hw *hw);</div><div class='del'>-static u8 efuse_calculate_word_cnts(u8 word_en);</div><div class='del'>-</div><div class='del'>-void efuse_initialize(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 bytetemp;</div><div class='del'>-	u8 temp;</div><div class='del'>-</div><div class='del'>-	bytetemp = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[SYS_FUNC_EN] + 1);</div><div class='del'>-	temp = bytetemp | 0x20;</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[SYS_FUNC_EN] + 1, temp);</div><div class='del'>-</div><div class='del'>-	bytetemp = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[SYS_ISO_CTRL] + 1);</div><div class='del'>-	temp = bytetemp &amp; 0xFE;</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[SYS_ISO_CTRL] + 1, temp);</div><div class='del'>-</div><div class='del'>-	bytetemp = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_TEST] + 3);</div><div class='del'>-	temp = bytetemp | 0x80;</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_TEST] + 3, temp);</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, 0x2F8, 0x3);</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3, 0x72);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 efuse_read_1byte(struct ieee80211_hw *hw, u16 address)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 data;</div><div class='del'>-	u8 bytetemp;</div><div class='del'>-	u8 temp;</div><div class='del'>-	u32 k = 0;</div><div class='del'>-	const u32 efuse_len =</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;maps[EFUSE_REAL_CONTENT_SIZE];</div><div class='del'>-</div><div class='del'>-	if (address &lt; efuse_len) {</div><div class='del'>-		temp = address &amp; 0xFF;</div><div class='del'>-		rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 1,</div><div class='del'>-			       temp);</div><div class='del'>-		bytetemp = rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2);</div><div class='del'>-		temp = ((address &gt;&gt; 8) &amp; 0x03) | (bytetemp &amp; 0xFC);</div><div class='del'>-		rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2,</div><div class='del'>-			       temp);</div><div class='del'>-</div><div class='del'>-		bytetemp = rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-		temp = bytetemp &amp; 0x7F;</div><div class='del'>-		rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3,</div><div class='del'>-			       temp);</div><div class='del'>-</div><div class='del'>-		bytetemp = rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-		while (!(bytetemp &amp; 0x80)) {</div><div class='del'>-			bytetemp =</div><div class='del'>-			   rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-			k++;</div><div class='del'>-			if (k == 1000) {</div><div class='del'>-				k = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		data = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL]);</div><div class='del'>-		return data;</div><div class='del'>-	}</div><div class='del'>-	return 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void efuse_write_1byte(struct ieee80211_hw *hw, u16 address, u8 value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 bytetemp;</div><div class='del'>-	u8 temp;</div><div class='del'>-	u32 k = 0;</div><div class='del'>-	const u32 efuse_len =</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;maps[EFUSE_REAL_CONTENT_SIZE];</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr=%x Data =%x\n",</div><div class='del'>-		 address, value);</div><div class='del'>-</div><div class='del'>-	if (address &lt; efuse_len) {</div><div class='del'>-		rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL], value);</div><div class='del'>-</div><div class='del'>-		temp = address &amp; 0xFF;</div><div class='del'>-		rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 1,</div><div class='del'>-			       temp);</div><div class='del'>-		bytetemp = rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2);</div><div class='del'>-</div><div class='del'>-		temp = ((address &gt;&gt; 8) &amp; 0x03) | (bytetemp &amp; 0xFC);</div><div class='del'>-		rtl_write_byte(rtlpriv,</div><div class='del'>-			       rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2, temp);</div><div class='del'>-</div><div class='del'>-		bytetemp = rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-		temp = bytetemp | 0x80;</div><div class='del'>-		rtl_write_byte(rtlpriv,</div><div class='del'>-			       rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3, temp);</div><div class='del'>-</div><div class='del'>-		bytetemp = rtl_read_byte(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-</div><div class='del'>-		while (bytetemp &amp; 0x80) {</div><div class='del'>-			bytetemp =</div><div class='del'>-			    rtl_read_byte(rtlpriv,</div><div class='del'>-					  rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-			k++;</div><div class='del'>-			if (k == 100) {</div><div class='del'>-				k = 0;</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'>-</div><div class='del'>-void read_efuse_byte(struct ieee80211_hw *hw, u16 _offset, u8 *pbuf)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u32 value32;</div><div class='del'>-	u8 readbyte;</div><div class='del'>-	u16 retry;</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 1,</div><div class='del'>-		       (_offset &amp; 0xff));</div><div class='del'>-	readbyte = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2);</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2,</div><div class='del'>-		       ((_offset &gt;&gt; 8) &amp; 0x03) | (readbyte &amp; 0xfc));</div><div class='del'>-</div><div class='del'>-	readbyte = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3);</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3,</div><div class='del'>-		       (readbyte &amp; 0x7f));</div><div class='del'>-</div><div class='del'>-	retry = 0;</div><div class='del'>-	value32 = rtl_read_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL]);</div><div class='del'>-	while (!(((value32 &gt;&gt; 24) &amp; 0xff) &amp; 0x80) &amp;&amp; (retry &lt; 10000)) {</div><div class='del'>-		value32 = rtl_read_dword(rtlpriv,</div><div class='del'>-					 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL]);</div><div class='del'>-		retry++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	udelay(50);</div><div class='del'>-	value32 = rtl_read_dword(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL]);</div><div class='del'>-</div><div class='del'>-	*pbuf = (u8)(value32 &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	u8 *efuse_tbl;</div><div class='del'>-	u8 rtemp8[1];</div><div class='del'>-	u16 efuse_addr = 0;</div><div class='del'>-	u8 offset, wren;</div><div class='del'>-	u8 u1temp = 0;</div><div class='del'>-	u16 i;</div><div class='del'>-	u16 j;</div><div class='del'>-	const u16 efuse_max_section =</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;maps[EFUSE_MAX_SECTION_MAP];</div><div class='del'>-	const u32 efuse_len =</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;maps[EFUSE_REAL_CONTENT_SIZE];</div><div class='del'>-	u16 **efuse_word;</div><div class='del'>-	u16 efuse_utilized = 0;</div><div class='del'>-	u8 efuse_usage;</div><div class='del'>-</div><div class='del'>-	if ((_offset + _size_byte) &gt; rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE]) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,</div><div class='del'>-			 "%s(): Invalid offset(%#x) with read bytes(%#x)!!\n",</div><div class='del'>-			 __func__, _offset, _size_byte);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate memory for efuse_tbl and efuse_word */</div><div class='del'>-	efuse_tbl = kzalloc(rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE],</div><div class='del'>-			    GFP_ATOMIC);</div><div class='del'>-	if (!efuse_tbl)</div><div class='del'>-		return;</div><div class='del'>-	efuse_word = kcalloc(EFUSE_MAX_WORD_UNIT, sizeof(u16 *), GFP_ATOMIC);</div><div class='del'>-	if (!efuse_word)</div><div class='del'>-		goto out;</div><div class='del'>-	for (i = 0; i &lt; EFUSE_MAX_WORD_UNIT; i++) {</div><div class='del'>-		efuse_word[i] = kcalloc(efuse_max_section, sizeof(u16),</div><div class='del'>-					GFP_ATOMIC);</div><div class='del'>-		if (!efuse_word[i])</div><div class='del'>-			goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; efuse_max_section; i++)</div><div class='del'>-		for (j = 0; j &lt; EFUSE_MAX_WORD_UNIT; j++)</div><div class='del'>-			efuse_word[j][i] = 0xFFFF;</div><div class='del'>-</div><div class='del'>-	read_efuse_byte(hw, efuse_addr, rtemp8);</div><div class='del'>-	if (*rtemp8 != 0xFF) {</div><div class='del'>-		efuse_utilized++;</div><div class='del'>-		RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,</div><div class='del'>-			"Addr=%d\n", efuse_addr);</div><div class='del'>-		efuse_addr++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((*rtemp8 != 0xFF) &amp;&amp; (efuse_addr &lt; efuse_len)) {</div><div class='del'>-		/*  Check PG header for section num.  */</div><div class='del'>-		if ((*rtemp8 &amp; 0x1F) == 0x0F) {/* extended header */</div><div class='del'>-			u1temp = ((*rtemp8 &amp; 0xE0) &gt;&gt; 5);</div><div class='del'>-			read_efuse_byte(hw, efuse_addr, rtemp8);</div><div class='del'>-</div><div class='del'>-			if ((*rtemp8 &amp; 0x0F) == 0x0F) {</div><div class='del'>-				efuse_addr++;</div><div class='del'>-				read_efuse_byte(hw, efuse_addr, rtemp8);</div><div class='del'>-</div><div class='del'>-				if (*rtemp8 != 0xFF &amp;&amp;</div><div class='del'>-				    (efuse_addr &lt; efuse_len)) {</div><div class='del'>-					efuse_addr++;</div><div class='del'>-				}</div><div class='del'>-				continue;</div><div class='del'>-			} else {</div><div class='del'>-				offset = ((*rtemp8 &amp; 0xF0) &gt;&gt; 1) | u1temp;</div><div class='del'>-				wren = (*rtemp8 &amp; 0x0F);</div><div class='del'>-				efuse_addr++;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			offset = ((*rtemp8 &gt;&gt; 4) &amp; 0x0f);</div><div class='del'>-			wren = (*rtemp8 &amp; 0x0f);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (offset &lt; efuse_max_section) {</div><div class='del'>-			RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,</div><div class='del'>-				"offset-%d Worden=%x\n", offset, wren);</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; EFUSE_MAX_WORD_UNIT; i++) {</div><div class='del'>-				if (!(wren &amp; 0x01)) {</div><div class='del'>-					RTPRINT(rtlpriv, FEEPROM,</div><div class='del'>-						EFUSE_READ_ALL,</div><div class='del'>-						"Addr=%d\n", efuse_addr);</div><div class='del'>-</div><div class='del'>-					read_efuse_byte(hw, efuse_addr, rtemp8);</div><div class='del'>-					efuse_addr++;</div><div class='del'>-					efuse_utilized++;</div><div class='del'>-					efuse_word[i][offset] =</div><div class='del'>-							 (*rtemp8 &amp; 0xff);</div><div class='del'>-</div><div class='del'>-					if (efuse_addr &gt;= efuse_len)</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					RTPRINT(rtlpriv, FEEPROM,</div><div class='del'>-						EFUSE_READ_ALL,</div><div class='del'>-						"Addr=%d\n", efuse_addr);</div><div class='del'>-</div><div class='del'>-					read_efuse_byte(hw, efuse_addr, rtemp8);</div><div class='del'>-					efuse_addr++;</div><div class='del'>-					efuse_utilized++;</div><div class='del'>-					efuse_word[i][offset] |=</div><div class='del'>-					    (((u16)*rtemp8 &lt;&lt; 8) &amp; 0xff00);</div><div class='del'>-</div><div class='del'>-					if (efuse_addr &gt;= efuse_len)</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				wren &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,</div><div class='del'>-			"Addr=%d\n", efuse_addr);</div><div class='del'>-		read_efuse_byte(hw, efuse_addr, rtemp8);</div><div class='del'>-		if (*rtemp8 != 0xFF &amp;&amp; (efuse_addr &lt; efuse_len)) {</div><div class='del'>-			efuse_utilized++;</div><div class='del'>-			efuse_addr++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; efuse_max_section; i++) {</div><div class='del'>-		for (j = 0; j &lt; EFUSE_MAX_WORD_UNIT; j++) {</div><div class='del'>-			efuse_tbl[(i * 8) + (j * 2)] =</div><div class='del'>-			    (efuse_word[j][i] &amp; 0xff);</div><div class='del'>-			efuse_tbl[(i * 8) + ((j * 2) + 1)] =</div><div class='del'>-			    ((efuse_word[j][i] &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; _size_byte; i++)</div><div class='del'>-		pbuf[i] = efuse_tbl[_offset + i];</div><div class='del'>-</div><div class='del'>-	rtlefuse-&gt;efuse_usedbytes = efuse_utilized;</div><div class='del'>-	efuse_usage = (u8)((efuse_utilized * 100) / efuse_len);</div><div class='del'>-	rtlefuse-&gt;efuse_usedpercentage = efuse_usage;</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_EFUSE_BYTES,</div><div class='del'>-				      (u8 *)&amp;efuse_utilized);</div><div class='del'>-	rtlpriv-&gt;cfg-&gt;ops-&gt;set_hw_reg(hw, HW_VAR_EFUSE_USAGE,</div><div class='del'>-				      &amp;efuse_usage);</div><div class='del'>-done:</div><div class='del'>-	for (i = 0; i &lt; EFUSE_MAX_WORD_UNIT; i++)</div><div class='del'>-		kfree(efuse_word[i]);</div><div class='del'>-	kfree(efuse_word);</div><div class='del'>-out:</div><div class='del'>-	kfree(efuse_tbl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool efuse_shadow_update_chk(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	u8 section_idx, i, base;</div><div class='del'>-	u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used;</div><div class='del'>-	bool wordchanged, result = true;</div><div class='del'>-</div><div class='del'>-	for (section_idx = 0; section_idx &lt; 16; section_idx++) {</div><div class='del'>-		base = section_idx * 8;</div><div class='del'>-		wordchanged = false;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8; i = i + 2) {</div><div class='del'>-			if ((rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][base + i] !=</div><div class='del'>-			     rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][base + i]) ||</div><div class='del'>-			    (rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][base + i + 1] !=</div><div class='del'>-			     rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][base + i +</div><div class='del'>-								   1])) {</div><div class='del'>-				words_need++;</div><div class='del'>-				wordchanged = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wordchanged)</div><div class='del'>-			hdr_num++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	totalbytes = hdr_num + words_need * 2;</div><div class='del'>-	efuse_used = rtlefuse-&gt;efuse_usedbytes;</div><div class='del'>-</div><div class='del'>-	if ((totalbytes + efuse_used) &gt;=</div><div class='del'>-	    (EFUSE_MAX_SIZE - rtlpriv-&gt;cfg-&gt;maps[EFUSE_OOB_PROTECT_BYTES_LEN]))</div><div class='del'>-		result = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,</div><div class='del'>-		 "%s(): totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",</div><div class='del'>-		 __func__, totalbytes, hdr_num, words_need, efuse_used);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,</div><div class='del'>-		       u16 offset, u32 *value)</div><div class='del'>-{</div><div class='del'>-	if (type == 1)</div><div class='del'>-		efuse_shadow_read_1byte(hw, offset, (u8 *)value);</div><div class='del'>-	else if (type == 2)</div><div class='del'>-		efuse_shadow_read_2byte(hw, offset, (u16 *)value);</div><div class='del'>-	else if (type == 4)</div><div class='del'>-		efuse_shadow_read_4byte(hw, offset, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void efuse_shadow_write(struct ieee80211_hw *hw, u8 type, u16 offset,</div><div class='del'>-			u32 value)</div><div class='del'>-{</div><div class='del'>-	if (type == 1)</div><div class='del'>-		efuse_shadow_write_1byte(hw, offset, (u8)value);</div><div class='del'>-	else if (type == 2)</div><div class='del'>-		efuse_shadow_write_2byte(hw, offset, (u16)value);</div><div class='del'>-	else if (type == 4)</div><div class='del'>-		efuse_shadow_write_4byte(hw, offset, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool efuse_shadow_update(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	u16 i, offset, base;</div><div class='del'>-	u8 word_en = 0x0F;</div><div class='del'>-	u8 first_pg = false;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");</div><div class='del'>-</div><div class='del'>-	if (!efuse_shadow_update_chk(hw)) {</div><div class='del'>-		efuse_read_all_map(hw, &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0]);</div><div class='del'>-		memcpy(&amp;rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][0],</div><div class='del'>-		       &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0],</div><div class='del'>-		       rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE]);</div><div class='del'>-</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,</div><div class='del'>-			 "efuse out of capacity!!\n");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	efuse_power_switch(hw, true, true);</div><div class='del'>-</div><div class='del'>-	for (offset = 0; offset &lt; 16; offset++) {</div><div class='del'>-		word_en = 0x0F;</div><div class='del'>-		base = offset * 8;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8; i++) {</div><div class='del'>-			if (first_pg) {</div><div class='del'>-				word_en &amp;= ~(BIT(i / 2));</div><div class='del'>-</div><div class='del'>-				rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][base + i] =</div><div class='del'>-				    rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][base + i];</div><div class='del'>-			} else {</div><div class='del'>-				if (rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][base + i] !=</div><div class='del'>-				    rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][base + i]) {</div><div class='del'>-					word_en &amp;= ~(BIT(i / 2));</div><div class='del'>-</div><div class='del'>-					rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][base + i] =</div><div class='del'>-					    rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][base + i];</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (word_en != 0x0F) {</div><div class='del'>-			u8 tmpdata[8];</div><div class='del'>-</div><div class='del'>-			memcpy(tmpdata,</div><div class='del'>-			       &amp;rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][base],</div><div class='del'>-			       8);</div><div class='del'>-			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-				      "U-efuse\n", tmpdata, 8);</div><div class='del'>-</div><div class='del'>-			if (!efuse_pg_packet_write(hw, (u8)offset, word_en,</div><div class='del'>-						   tmpdata)) {</div><div class='del'>-				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,</div><div class='del'>-					 "PG section(%#x) fail!!\n", offset);</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'>-	efuse_power_switch(hw, true, false);</div><div class='del'>-	efuse_read_all_map(hw, &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0]);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][0],</div><div class='del'>-	       &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0],</div><div class='del'>-	       rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE]);</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "\n");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	if (rtlefuse-&gt;autoload_failflag)</div><div class='del'>-		memset((&amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0]),</div><div class='del'>-		       0xFF, rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE]);</div><div class='del'>-	else</div><div class='del'>-		efuse_read_all_map(hw, &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0]);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][0],</div><div class='del'>-	       &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0],</div><div class='del'>-	       rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void efuse_force_write_vendor_id(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	u8 tmpdata[8] = { 0xFF, 0xFF, 0xEC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='del'>-</div><div class='del'>-	efuse_power_switch(hw, true, true);</div><div class='del'>-</div><div class='del'>-	efuse_pg_packet_write(hw, 1, 0xD, tmpdata);</div><div class='del'>-</div><div class='del'>-	efuse_power_switch(hw, true, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_read_1byte(struct ieee80211_hw *hw,</div><div class='del'>-				    u16 offset, u8 *value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	*value = rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_read_2byte(struct ieee80211_hw *hw,</div><div class='del'>-				    u16 offset, u16 *value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	*value = rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset];</div><div class='del'>-	*value |= rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 1] &lt;&lt; 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_read_4byte(struct ieee80211_hw *hw,</div><div class='del'>-				    u16 offset, u32 *value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	*value = rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset];</div><div class='del'>-	*value |= rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 1] &lt;&lt; 8;</div><div class='del'>-	*value |= rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 2] &lt;&lt; 16;</div><div class='del'>-	*value |= rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 3] &lt;&lt; 24;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_write_1byte(struct ieee80211_hw *hw,</div><div class='del'>-				     u16 offset, u8 value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset] = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_write_2byte(struct ieee80211_hw *hw,</div><div class='del'>-				     u16 offset, u16 value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset] = value &amp; 0x00FF;</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 1] = value &gt;&gt; 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_shadow_write_4byte(struct ieee80211_hw *hw,</div><div class='del'>-				     u16 offset, u32 value)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset] =</div><div class='del'>-	    (u8)(value &amp; 0x000000FF);</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 1] =</div><div class='del'>-	    (u8)((value &gt;&gt; 8) &amp; 0x0000FF);</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 2] =</div><div class='del'>-	    (u8)((value &gt;&gt; 16) &amp; 0x00FF);</div><div class='del'>-	rtlefuse-&gt;efuse_map[EFUSE_MODIFY_MAP][offset + 3] =</div><div class='del'>-	    (u8)((value &gt;&gt; 24) &amp; 0xFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 tmpidx = 0;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 1,</div><div class='del'>-		       (u8)(addr &amp; 0xff));</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2,</div><div class='del'>-		       ((u8)((addr &gt;&gt; 8) &amp; 0x03)) |</div><div class='del'>-		       (rtl_read_byte(rtlpriv,</div><div class='del'>-				      rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2) &amp;</div><div class='del'>-			0xFC));</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3, 0x72);</div><div class='del'>-</div><div class='del'>-	while (!(0x80 &amp; rtl_read_byte(rtlpriv,</div><div class='del'>-				      rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3)) &amp;&amp;</div><div class='del'>-	       (tmpidx &lt; 100)) {</div><div class='del'>-		tmpidx++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmpidx &lt; 100) {</div><div class='del'>-		*data = rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL]);</div><div class='del'>-		result = true;</div><div class='del'>-	} else {</div><div class='del'>-		*data = 0xff;</div><div class='del'>-		result = false;</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 tmpidx = 0;</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,</div><div class='del'>-		 "Addr = %x Data=%x\n", addr, data);</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv,</div><div class='del'>-		       rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 1, (u8)(addr &amp; 0xff));</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 2,</div><div class='del'>-		       (rtl_read_byte(rtlpriv,</div><div class='del'>-			 rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] +</div><div class='del'>-			 2) &amp; 0xFC) | (u8)((addr &gt;&gt; 8) &amp; 0x03));</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL], data);</div><div class='del'>-	rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3, 0xF2);</div><div class='del'>-</div><div class='del'>-	while ((0x80 &amp;</div><div class='del'>-		rtl_read_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CTRL] + 3)) &amp;&amp;</div><div class='del'>-	       (tmpidx &lt; 100)) {</div><div class='del'>-		tmpidx++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmpidx &lt; 100)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-</div><div class='del'>-	efuse_power_switch(hw, false, true);</div><div class='del'>-	read_efuse(hw, 0, rtlpriv-&gt;cfg-&gt;maps[EFUSE_HWSET_MAX_SIZE], efuse);</div><div class='del'>-	efuse_power_switch(hw, false, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_read_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,</div><div class='del'>-				  u8 efuse_data, u8 offset, u8 *tmpdata,</div><div class='del'>-				  u8 *readstate)</div><div class='del'>-{</div><div class='del'>-	bool dataempty = true;</div><div class='del'>-	u8 hoffset;</div><div class='del'>-	u8 tmpidx;</div><div class='del'>-	u8 hworden;</div><div class='del'>-	u8 word_cnts;</div><div class='del'>-</div><div class='del'>-	hoffset = (efuse_data &gt;&gt; 4) &amp; 0x0F;</div><div class='del'>-	hworden = efuse_data &amp; 0x0F;</div><div class='del'>-	word_cnts = efuse_calculate_word_cnts(hworden);</div><div class='del'>-</div><div class='del'>-	if (hoffset == offset) {</div><div class='del'>-		for (tmpidx = 0; tmpidx &lt; word_cnts * 2; tmpidx++) {</div><div class='del'>-			if (efuse_one_byte_read(hw, *efuse_addr + 1 + tmpidx,</div><div class='del'>-						&amp;efuse_data)) {</div><div class='del'>-				tmpdata[tmpidx] = efuse_data;</div><div class='del'>-				if (efuse_data != 0xff)</div><div class='del'>-					dataempty = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!dataempty) {</div><div class='del'>-			*readstate = PG_STATE_DATA;</div><div class='del'>-		} else {</div><div class='del'>-			*efuse_addr = *efuse_addr + (word_cnts * 2) + 1;</div><div class='del'>-			*readstate = PG_STATE_HEADER;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		*efuse_addr = *efuse_addr + (word_cnts * 2) + 1;</div><div class='del'>-		*readstate = PG_STATE_HEADER;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)</div><div class='del'>-{</div><div class='del'>-	u8 readstate = PG_STATE_HEADER;</div><div class='del'>-</div><div class='del'>-	bool continual = true;</div><div class='del'>-</div><div class='del'>-	u8 efuse_data, word_cnts = 0;</div><div class='del'>-	u16 efuse_addr = 0;</div><div class='del'>-	u8 tmpdata[8];</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return false;</div><div class='del'>-	if (offset &gt; 15)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	memset(data, 0xff, PGPKT_DATA_SIZE * sizeof(u8));</div><div class='del'>-	memset(tmpdata, 0xff, PGPKT_DATA_SIZE * sizeof(u8));</div><div class='del'>-</div><div class='del'>-	while (continual &amp;&amp; (efuse_addr &lt; EFUSE_MAX_SIZE)) {</div><div class='del'>-		if (readstate &amp; PG_STATE_HEADER) {</div><div class='del'>-			if (efuse_one_byte_read(hw, efuse_addr, &amp;efuse_data) &amp;&amp;</div><div class='del'>-			    (efuse_data != 0xFF))</div><div class='del'>-				efuse_read_data_case1(hw, &amp;efuse_addr,</div><div class='del'>-						      efuse_data, offset,</div><div class='del'>-						      tmpdata, &amp;readstate);</div><div class='del'>-			else</div><div class='del'>-				continual = false;</div><div class='del'>-		} else if (readstate &amp; PG_STATE_DATA) {</div><div class='del'>-			efuse_word_enable_data_read(0, tmpdata, data);</div><div class='del'>-			efuse_addr = efuse_addr + (word_cnts * 2) + 1;</div><div class='del'>-			readstate = PG_STATE_HEADER;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((data[0] == 0xff) &amp;&amp; (data[1] == 0xff) &amp;&amp;</div><div class='del'>-	    (data[2] == 0xff) &amp;&amp; (data[3] == 0xff) &amp;&amp;</div><div class='del'>-	    (data[4] == 0xff) &amp;&amp; (data[5] == 0xff) &amp;&amp;</div><div class='del'>-	    (data[6] == 0xff) &amp;&amp; (data[7] == 0xff))</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,</div><div class='del'>-				   u8 efuse_data, u8 offset,</div><div class='del'>-				   int *continual, u8 *write_state,</div><div class='del'>-				   struct pgpkt_struct *target_pkt,</div><div class='del'>-				   int *repeat_times, int *result, u8 word_en)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct pgpkt_struct tmp_pkt;</div><div class='del'>-	int dataempty = true;</div><div class='del'>-	u8 originaldata[8 * sizeof(u8)];</div><div class='del'>-	u8 badworden = 0x0F;</div><div class='del'>-	u8 match_word_en, tmp_word_en;</div><div class='del'>-	u8 tmpindex;</div><div class='del'>-	u8 tmp_header = efuse_data;</div><div class='del'>-	u8 tmp_word_cnts;</div><div class='del'>-</div><div class='del'>-	tmp_pkt.offset = (tmp_header &gt;&gt; 4) &amp; 0x0F;</div><div class='del'>-	tmp_pkt.word_en = tmp_header &amp; 0x0F;</div><div class='del'>-	tmp_word_cnts = efuse_calculate_word_cnts(tmp_pkt.word_en);</div><div class='del'>-</div><div class='del'>-	if (tmp_pkt.offset != target_pkt-&gt;offset) {</div><div class='del'>-		*efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;</div><div class='del'>-		*write_state = PG_STATE_HEADER;</div><div class='del'>-	} else {</div><div class='del'>-		for (tmpindex = 0; tmpindex &lt; (tmp_word_cnts * 2); tmpindex++) {</div><div class='del'>-			if (efuse_one_byte_read(hw,</div><div class='del'>-						(*efuse_addr + 1 + tmpindex),</div><div class='del'>-						&amp;efuse_data) &amp;&amp;</div><div class='del'>-			    (efuse_data != 0xFF))</div><div class='del'>-				dataempty = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!dataempty) {</div><div class='del'>-			*efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;</div><div class='del'>-			*write_state = PG_STATE_HEADER;</div><div class='del'>-		} else {</div><div class='del'>-			match_word_en = 0x0F;</div><div class='del'>-			if (!((target_pkt-&gt;word_en &amp; BIT(0)) |</div><div class='del'>-			    (tmp_pkt.word_en &amp; BIT(0))))</div><div class='del'>-				match_word_en &amp;= (~BIT(0));</div><div class='del'>-</div><div class='del'>-			if (!((target_pkt-&gt;word_en &amp; BIT(1)) |</div><div class='del'>-			    (tmp_pkt.word_en &amp; BIT(1))))</div><div class='del'>-				match_word_en &amp;= (~BIT(1));</div><div class='del'>-</div><div class='del'>-			if (!((target_pkt-&gt;word_en &amp; BIT(2)) |</div><div class='del'>-			    (tmp_pkt.word_en &amp; BIT(2))))</div><div class='del'>-				match_word_en &amp;= (~BIT(2));</div><div class='del'>-</div><div class='del'>-			if (!((target_pkt-&gt;word_en &amp; BIT(3)) |</div><div class='del'>-			    (tmp_pkt.word_en &amp; BIT(3))))</div><div class='del'>-				match_word_en &amp;= (~BIT(3));</div><div class='del'>-</div><div class='del'>-			if ((match_word_en &amp; 0x0F) != 0x0F) {</div><div class='del'>-				badworden =</div><div class='del'>-				  enable_efuse_data_write(hw,</div><div class='del'>-							  *efuse_addr + 1,</div><div class='del'>-							  tmp_pkt.word_en,</div><div class='del'>-							  target_pkt-&gt;data);</div><div class='del'>-</div><div class='del'>-				if (0x0F != (badworden &amp; 0x0F))	{</div><div class='del'>-					u8 reorg_offset = offset;</div><div class='del'>-					u8 reorg_worden = badworden;</div><div class='del'>-</div><div class='del'>-					efuse_pg_packet_write(hw, reorg_offset,</div><div class='del'>-							      reorg_worden,</div><div class='del'>-							      originaldata);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				tmp_word_en = 0x0F;</div><div class='del'>-				if ((target_pkt-&gt;word_en &amp; BIT(0)) ^</div><div class='del'>-				    (match_word_en &amp; BIT(0)))</div><div class='del'>-					tmp_word_en &amp;= (~BIT(0));</div><div class='del'>-</div><div class='del'>-				if ((target_pkt-&gt;word_en &amp; BIT(1)) ^</div><div class='del'>-				    (match_word_en &amp; BIT(1)))</div><div class='del'>-					tmp_word_en &amp;= (~BIT(1));</div><div class='del'>-</div><div class='del'>-				if ((target_pkt-&gt;word_en &amp; BIT(2)) ^</div><div class='del'>-				    (match_word_en &amp; BIT(2)))</div><div class='del'>-					tmp_word_en &amp;= (~BIT(2));</div><div class='del'>-</div><div class='del'>-				if ((target_pkt-&gt;word_en &amp; BIT(3)) ^</div><div class='del'>-				    (match_word_en &amp; BIT(3)))</div><div class='del'>-					tmp_word_en &amp;= (~BIT(3));</div><div class='del'>-</div><div class='del'>-				if ((tmp_word_en &amp; 0x0F) != 0x0F) {</div><div class='del'>-					*efuse_addr =</div><div class='del'>-					    efuse_get_current_size(hw);</div><div class='del'>-					target_pkt-&gt;offset = offset;</div><div class='del'>-					target_pkt-&gt;word_en = tmp_word_en;</div><div class='del'>-				} else {</div><div class='del'>-					*continual = false;</div><div class='del'>-				}</div><div class='del'>-				*write_state = PG_STATE_HEADER;</div><div class='del'>-				*repeat_times += 1;</div><div class='del'>-				if (*repeat_times &gt; EFUSE_REPEAT_THRESHOLD_) {</div><div class='del'>-					*continual = false;</div><div class='del'>-					*result = false;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				*efuse_addr += (2 * tmp_word_cnts) + 1;</div><div class='del'>-				target_pkt-&gt;offset = offset;</div><div class='del'>-				target_pkt-&gt;word_en = word_en;</div><div class='del'>-				*write_state = PG_STATE_HEADER;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, "efuse PG_STATE_HEADER-1\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,</div><div class='del'>-				   int *continual, u8 *write_state,</div><div class='del'>-				   struct pgpkt_struct target_pkt,</div><div class='del'>-				   int *repeat_times, int *result)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct pgpkt_struct tmp_pkt;</div><div class='del'>-	u8 pg_header;</div><div class='del'>-	u8 tmp_header;</div><div class='del'>-	u8 originaldata[8 * sizeof(u8)];</div><div class='del'>-	u8 tmp_word_cnts;</div><div class='del'>-	u8 badworden = 0x0F;</div><div class='del'>-</div><div class='del'>-	pg_header = ((target_pkt.offset &lt;&lt; 4) &amp; 0xf0) | target_pkt.word_en;</div><div class='del'>-	efuse_one_byte_write(hw, *efuse_addr, pg_header);</div><div class='del'>-	efuse_one_byte_read(hw, *efuse_addr, &amp;tmp_header);</div><div class='del'>-</div><div class='del'>-	if (tmp_header == pg_header) {</div><div class='del'>-		*write_state = PG_STATE_DATA;</div><div class='del'>-	} else if (tmp_header == 0xFF) {</div><div class='del'>-		*write_state = PG_STATE_HEADER;</div><div class='del'>-		*repeat_times += 1;</div><div class='del'>-		if (*repeat_times &gt; EFUSE_REPEAT_THRESHOLD_) {</div><div class='del'>-			*continual = false;</div><div class='del'>-			*result = false;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		tmp_pkt.offset = (tmp_header &gt;&gt; 4) &amp; 0x0F;</div><div class='del'>-		tmp_pkt.word_en = tmp_header &amp; 0x0F;</div><div class='del'>-</div><div class='del'>-		tmp_word_cnts = efuse_calculate_word_cnts(tmp_pkt.word_en);</div><div class='del'>-</div><div class='del'>-		memset(originaldata, 0xff,  8 * sizeof(u8));</div><div class='del'>-</div><div class='del'>-		if (efuse_pg_packet_read(hw, tmp_pkt.offset, originaldata)) {</div><div class='del'>-			badworden = enable_efuse_data_write(hw,</div><div class='del'>-							    *efuse_addr + 1,</div><div class='del'>-							    tmp_pkt.word_en,</div><div class='del'>-							    originaldata);</div><div class='del'>-</div><div class='del'>-			if (0x0F != (badworden &amp; 0x0F)) {</div><div class='del'>-				u8 reorg_offset = tmp_pkt.offset;</div><div class='del'>-				u8 reorg_worden = badworden;</div><div class='del'>-</div><div class='del'>-				efuse_pg_packet_write(hw, reorg_offset,</div><div class='del'>-						      reorg_worden,</div><div class='del'>-						      originaldata);</div><div class='del'>-				*efuse_addr = efuse_get_current_size(hw);</div><div class='del'>-			} else {</div><div class='del'>-				*efuse_addr = *efuse_addr +</div><div class='del'>-					      (tmp_word_cnts * 2) + 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			*efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*write_state = PG_STATE_HEADER;</div><div class='del'>-		*repeat_times += 1;</div><div class='del'>-		if (*repeat_times &gt; EFUSE_REPEAT_THRESHOLD_) {</div><div class='del'>-			*continual = false;</div><div class='del'>-			*result = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,</div><div class='del'>-			"efuse PG_STATE_HEADER-2\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int efuse_pg_packet_write(struct ieee80211_hw *hw,</div><div class='del'>-				 u8 offset, u8 word_en, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct pgpkt_struct target_pkt;</div><div class='del'>-	u8 write_state = PG_STATE_HEADER;</div><div class='del'>-	int continual = true, result = true;</div><div class='del'>-	u16 efuse_addr = 0;</div><div class='del'>-	u8 efuse_data;</div><div class='del'>-	u8 target_word_cnts = 0;</div><div class='del'>-	u8 badworden = 0x0F;</div><div class='del'>-	static int repeat_times;</div><div class='del'>-</div><div class='del'>-	if (efuse_get_current_size(hw) &gt;= (EFUSE_MAX_SIZE -</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {</div><div class='del'>-		RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,</div><div class='del'>-			"%s error\n", __func__);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	target_pkt.offset = offset;</div><div class='del'>-	target_pkt.word_en = word_en;</div><div class='del'>-</div><div class='del'>-	memset(target_pkt.data, 0xFF,  8 * sizeof(u8));</div><div class='del'>-</div><div class='del'>-	efuse_word_enable_data_read(word_en, data, target_pkt.data);</div><div class='del'>-	target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en);</div><div class='del'>-</div><div class='del'>-	RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, "efuse Power ON\n");</div><div class='del'>-</div><div class='del'>-	while (continual &amp;&amp; (efuse_addr &lt; (EFUSE_MAX_SIZE -</div><div class='del'>-	       rtlpriv-&gt;cfg-&gt;maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) {</div><div class='del'>-		if (write_state == PG_STATE_HEADER) {</div><div class='del'>-			badworden = 0x0F;</div><div class='del'>-			RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,</div><div class='del'>-				"efuse PG_STATE_HEADER\n");</div><div class='del'>-</div><div class='del'>-			if (efuse_one_byte_read(hw, efuse_addr, &amp;efuse_data) &amp;&amp;</div><div class='del'>-			    (efuse_data != 0xFF))</div><div class='del'>-				efuse_write_data_case1(hw, &amp;efuse_addr,</div><div class='del'>-						       efuse_data, offset,</div><div class='del'>-						       &amp;continual,</div><div class='del'>-						       &amp;write_state,</div><div class='del'>-						       &amp;target_pkt,</div><div class='del'>-						       &amp;repeat_times, &amp;result,</div><div class='del'>-						       word_en);</div><div class='del'>-			else</div><div class='del'>-				efuse_write_data_case2(hw, &amp;efuse_addr,</div><div class='del'>-						       &amp;continual,</div><div class='del'>-						       &amp;write_state,</div><div class='del'>-						       target_pkt,</div><div class='del'>-						       &amp;repeat_times,</div><div class='del'>-						       &amp;result);</div><div class='del'>-</div><div class='del'>-		} else if (write_state == PG_STATE_DATA) {</div><div class='del'>-			RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,</div><div class='del'>-				"efuse PG_STATE_DATA\n");</div><div class='del'>-			badworden = 0x0f;</div><div class='del'>-			badworden =</div><div class='del'>-			    enable_efuse_data_write(hw, efuse_addr + 1,</div><div class='del'>-						    target_pkt.word_en,</div><div class='del'>-						    target_pkt.data);</div><div class='del'>-</div><div class='del'>-			if ((badworden &amp; 0x0F) == 0x0F) {</div><div class='del'>-				continual = false;</div><div class='del'>-			} else {</div><div class='del'>-				efuse_addr =</div><div class='del'>-				    efuse_addr + (2 * target_word_cnts) + 1;</div><div class='del'>-</div><div class='del'>-				target_pkt.offset = offset;</div><div class='del'>-				target_pkt.word_en = badworden;</div><div class='del'>-				target_word_cnts =</div><div class='del'>-				    efuse_calculate_word_cnts(target_pkt.word_en);</div><div class='del'>-				write_state = PG_STATE_HEADER;</div><div class='del'>-				repeat_times++;</div><div class='del'>-				if (repeat_times &gt; EFUSE_REPEAT_THRESHOLD_) {</div><div class='del'>-					continual = false;</div><div class='del'>-					result = false;</div><div class='del'>-				}</div><div class='del'>-				RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,</div><div class='del'>-					"efuse PG_STATE_HEADER-3\n");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (efuse_addr &gt;= (EFUSE_MAX_SIZE -</div><div class='del'>-		rtlpriv-&gt;cfg-&gt;maps[EFUSE_OOB_PROTECT_BYTES_LEN])) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,</div><div class='del'>-			 "efuse_addr(%#x) Out of size!!\n", efuse_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void efuse_word_enable_data_read(u8 word_en, u8 *sourdata,</div><div class='del'>-					u8 *targetdata)</div><div class='del'>-{</div><div class='del'>-	if (!(word_en &amp; BIT(0))) {</div><div class='del'>-		targetdata[0] = sourdata[0];</div><div class='del'>-		targetdata[1] = sourdata[1];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(1))) {</div><div class='del'>-		targetdata[2] = sourdata[2];</div><div class='del'>-		targetdata[3] = sourdata[3];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(2))) {</div><div class='del'>-		targetdata[4] = sourdata[4];</div><div class='del'>-		targetdata[5] = sourdata[5];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(3))) {</div><div class='del'>-		targetdata[6] = sourdata[6];</div><div class='del'>-		targetdata[7] = sourdata[7];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 enable_efuse_data_write(struct ieee80211_hw *hw,</div><div class='del'>-				  u16 efuse_addr, u8 word_en, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u16 tmpaddr;</div><div class='del'>-	u16 start_addr = efuse_addr;</div><div class='del'>-	u8 badworden = 0x0F;</div><div class='del'>-	u8 tmpdata[8];</div><div class='del'>-</div><div class='del'>-	memset(tmpdata, 0xff, PGPKT_DATA_SIZE);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,</div><div class='del'>-		 "word_en = %x efuse_addr=%x\n", word_en, efuse_addr);</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(0))) {</div><div class='del'>-		tmpaddr = start_addr;</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[0]);</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[1]);</div><div class='del'>-</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr, &amp;tmpdata[0]);</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr + 1, &amp;tmpdata[1]);</div><div class='del'>-		if ((data[0] != tmpdata[0]) || (data[1] != tmpdata[1]))</div><div class='del'>-			badworden &amp;= (~BIT(0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(1))) {</div><div class='del'>-		tmpaddr = start_addr;</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[2]);</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[3]);</div><div class='del'>-</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr, &amp;tmpdata[2]);</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr + 1, &amp;tmpdata[3]);</div><div class='del'>-		if ((data[2] != tmpdata[2]) || (data[3] != tmpdata[3]))</div><div class='del'>-			badworden &amp;= (~BIT(1));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(2))) {</div><div class='del'>-		tmpaddr = start_addr;</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[4]);</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[5]);</div><div class='del'>-</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr, &amp;tmpdata[4]);</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr + 1, &amp;tmpdata[5]);</div><div class='del'>-		if ((data[4] != tmpdata[4]) || (data[5] != tmpdata[5]))</div><div class='del'>-			badworden &amp;= (~BIT(2));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(3))) {</div><div class='del'>-		tmpaddr = start_addr;</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[6]);</div><div class='del'>-		efuse_one_byte_write(hw, start_addr++, data[7]);</div><div class='del'>-</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr, &amp;tmpdata[6]);</div><div class='del'>-		efuse_one_byte_read(hw, tmpaddr + 1, &amp;tmpdata[7]);</div><div class='del'>-		if ((data[6] != tmpdata[6]) || (data[7] != tmpdata[7]))</div><div class='del'>-			badworden &amp;= (~BIT(3));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return badworden;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	u8 tempval;</div><div class='del'>-	u16 tmpv16;</div><div class='del'>-</div><div class='del'>-	if (pwrstate &amp;&amp; (rtlhal-&gt;hw_type != HARDWARE_TYPE_RTL8192SE)) {</div><div class='del'>-		if (rtlhal-&gt;hw_type != HARDWARE_TYPE_RTL8192CE &amp;&amp;</div><div class='del'>-		    rtlhal-&gt;hw_type != HARDWARE_TYPE_RTL8192DE) {</div><div class='del'>-			rtl_write_byte(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[EFUSE_ACCESS], 0x69);</div><div class='del'>-		} else {</div><div class='del'>-			tmpv16 =</div><div class='del'>-			  rtl_read_word(rtlpriv,</div><div class='del'>-					rtlpriv-&gt;cfg-&gt;maps[SYS_ISO_CTRL]);</div><div class='del'>-			if (!(tmpv16 &amp; rtlpriv-&gt;cfg-&gt;maps[EFUSE_PWC_EV12V])) {</div><div class='del'>-				tmpv16 |= rtlpriv-&gt;cfg-&gt;maps[EFUSE_PWC_EV12V];</div><div class='del'>-				rtl_write_word(rtlpriv,</div><div class='del'>-					       rtlpriv-&gt;cfg-&gt;maps[SYS_ISO_CTRL],</div><div class='del'>-					       tmpv16);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		tmpv16 = rtl_read_word(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[SYS_FUNC_EN]);</div><div class='del'>-		if (!(tmpv16 &amp; rtlpriv-&gt;cfg-&gt;maps[EFUSE_FEN_ELDR])) {</div><div class='del'>-			tmpv16 |= rtlpriv-&gt;cfg-&gt;maps[EFUSE_FEN_ELDR];</div><div class='del'>-			rtl_write_word(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[SYS_FUNC_EN], tmpv16);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tmpv16 = rtl_read_word(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[SYS_CLK]);</div><div class='del'>-		if ((!(tmpv16 &amp; rtlpriv-&gt;cfg-&gt;maps[EFUSE_LOADER_CLK_EN])) ||</div><div class='del'>-		    (!(tmpv16 &amp; rtlpriv-&gt;cfg-&gt;maps[EFUSE_ANA8M]))) {</div><div class='del'>-			tmpv16 |= (rtlpriv-&gt;cfg-&gt;maps[EFUSE_LOADER_CLK_EN] |</div><div class='del'>-				   rtlpriv-&gt;cfg-&gt;maps[EFUSE_ANA8M]);</div><div class='del'>-			rtl_write_word(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[SYS_CLK], tmpv16);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pwrstate) {</div><div class='del'>-		if (write) {</div><div class='del'>-			tempval = rtl_read_byte(rtlpriv,</div><div class='del'>-						rtlpriv-&gt;cfg-&gt;maps[EFUSE_TEST] +</div><div class='del'>-						3);</div><div class='del'>-</div><div class='del'>-			if (rtlhal-&gt;hw_type == HARDWARE_TYPE_RTL8812AE) {</div><div class='del'>-				tempval &amp;= ~(BIT(3) | BIT(4) | BIT(5) | BIT(6));</div><div class='del'>-				tempval |= (VOLTAGE_V25 &lt;&lt; 3);</div><div class='del'>-			} else if (rtlhal-&gt;hw_type != HARDWARE_TYPE_RTL8192SE) {</div><div class='del'>-				tempval &amp;= 0x0F;</div><div class='del'>-				tempval |= (VOLTAGE_V25 &lt;&lt; 4);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rtl_write_byte(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[EFUSE_TEST] + 3,</div><div class='del'>-				       (tempval | 0x80));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rtlhal-&gt;hw_type == HARDWARE_TYPE_RTL8192SE) {</div><div class='del'>-			rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CLK],</div><div class='del'>-				       0x03);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (rtlhal-&gt;hw_type != HARDWARE_TYPE_RTL8192CE &amp;&amp;</div><div class='del'>-		    rtlhal-&gt;hw_type != HARDWARE_TYPE_RTL8192DE)</div><div class='del'>-			rtl_write_byte(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[EFUSE_ACCESS], 0);</div><div class='del'>-</div><div class='del'>-		if (write) {</div><div class='del'>-			tempval = rtl_read_byte(rtlpriv,</div><div class='del'>-						rtlpriv-&gt;cfg-&gt;maps[EFUSE_TEST] +</div><div class='del'>-						3);</div><div class='del'>-			rtl_write_byte(rtlpriv,</div><div class='del'>-				       rtlpriv-&gt;cfg-&gt;maps[EFUSE_TEST] + 3,</div><div class='del'>-				       (tempval &amp; 0x7F));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rtlhal-&gt;hw_type == HARDWARE_TYPE_RTL8192SE) {</div><div class='del'>-			rtl_write_byte(rtlpriv, rtlpriv-&gt;cfg-&gt;maps[EFUSE_CLK],</div><div class='del'>-				       0x02);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 efuse_get_current_size(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	int continual = true;</div><div class='del'>-	u16 efuse_addr = 0;</div><div class='del'>-	u8 hworden;</div><div class='del'>-	u8 efuse_data, word_cnts;</div><div class='del'>-</div><div class='del'>-	while (continual &amp;&amp; efuse_one_byte_read(hw, efuse_addr, &amp;efuse_data) &amp;&amp;</div><div class='del'>-	       (efuse_addr &lt; EFUSE_MAX_SIZE)) {</div><div class='del'>-		if (efuse_data != 0xFF) {</div><div class='del'>-			hworden = efuse_data &amp; 0x0F;</div><div class='del'>-			word_cnts = efuse_calculate_word_cnts(hworden);</div><div class='del'>-			efuse_addr = efuse_addr + (word_cnts * 2) + 1;</div><div class='del'>-		} else {</div><div class='del'>-			continual = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return efuse_addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 efuse_calculate_word_cnts(u8 word_en)</div><div class='del'>-{</div><div class='del'>-	u8 word_cnts = 0;</div><div class='del'>-</div><div class='del'>-	if (!(word_en &amp; BIT(0)))</div><div class='del'>-		word_cnts++;</div><div class='del'>-	if (!(word_en &amp; BIT(1)))</div><div class='del'>-		word_cnts++;</div><div class='del'>-	if (!(word_en &amp; BIT(2)))</div><div class='del'>-		word_cnts++;</div><div class='del'>-	if (!(word_en &amp; BIT(3)))</div><div class='del'>-		word_cnts++;</div><div class='del'>-	return word_cnts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,</div><div class='del'>-		   int max_size, u8 *hwinfo, int *params)</div><div class='del'>-{</div><div class='del'>-	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));</div><div class='del'>-	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);</div><div class='del'>-	struct device *dev = &amp;rtlpcipriv-&gt;dev.pdev-&gt;dev;</div><div class='del'>-	u16 eeprom_id;</div><div class='del'>-	u16 i, usvalue;</div><div class='del'>-</div><div class='del'>-	switch (rtlefuse-&gt;epromtype) {</div><div class='del'>-	case EEPROM_BOOT_EFUSE:</div><div class='del'>-		rtl_efuse_shadow_map_update(hw);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case EEPROM_93C46:</div><div class='del'>-		pr_err("RTL8XXX did not boot from eeprom, check it !!\n");</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_warn(dev, "no efuse data\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(hwinfo, &amp;rtlefuse-&gt;efuse_map[EFUSE_INIT_MAP][0], max_size);</div><div class='del'>-</div><div class='del'>-	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",</div><div class='del'>-		      hwinfo, max_size);</div><div class='del'>-</div><div class='del'>-	eeprom_id = *((u16 *)&amp;hwinfo[0]);</div><div class='del'>-	if (eeprom_id != params[0]) {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,</div><div class='del'>-			 "EEPROM ID(%#x) is invalid!!\n", eeprom_id);</div><div class='del'>-		rtlefuse-&gt;autoload_failflag = true;</div><div class='del'>-	} else {</div><div class='del'>-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");</div><div class='del'>-		rtlefuse-&gt;autoload_failflag = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rtlefuse-&gt;autoload_failflag)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	rtlefuse-&gt;eeprom_vid = *(u16 *)&amp;hwinfo[params[1]];</div><div class='del'>-	rtlefuse-&gt;eeprom_did = *(u16 *)&amp;hwinfo[params[2]];</div><div class='del'>-	rtlefuse-&gt;eeprom_svid = *(u16 *)&amp;hwinfo[params[3]];</div><div class='del'>-	rtlefuse-&gt;eeprom_smid = *(u16 *)&amp;hwinfo[params[4]];</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-		 "EEPROMId = 0x%4x\n", eeprom_id);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-		 "EEPROM VID = 0x%4x\n", rtlefuse-&gt;eeprom_vid);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-		 "EEPROM DID = 0x%4x\n", rtlefuse-&gt;eeprom_did);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-		 "EEPROM SVID = 0x%4x\n", rtlefuse-&gt;eeprom_svid);</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-		 "EEPROM SMID = 0x%4x\n", rtlefuse-&gt;eeprom_smid);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 6; i += 2) {</div><div class='del'>-		usvalue = *(u16 *)&amp;hwinfo[params[5] + i];</div><div class='del'>-		*((u16 *)(&amp;rtlefuse-&gt;dev_addr[i])) = usvalue;</div><div class='del'>-	}</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	rtlefuse-&gt;eeprom_channelplan = *&amp;hwinfo[params[6]];</div><div class='del'>-	rtlefuse-&gt;eeprom_version = *(u16 *)&amp;hwinfo[params[7]];</div><div class='del'>-	rtlefuse-&gt;txpwr_fromeprom = true;</div><div class='del'>-	rtlefuse-&gt;eeprom_oemid = *&amp;hwinfo[params[8]];</div><div class='del'>-</div><div class='del'>-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='del'>-		 "EEPROM Customer ID: 0x%2x\n", rtlefuse-&gt;eeprom_oemid);</div><div class='del'>-</div><div class='del'>-	/* set channel plan to world wide 13 */</div><div class='del'>-	rtlefuse-&gt;channel_plan = params[9];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_fw_block_write(struct ieee80211_hw *hw, const u8 *buffer, u32 size)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 *pu4byteptr = (u8 *)buffer;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		rtl_write_byte(rtlpriv, (START_ADDRESS + i), *(pu4byteptr + i));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, const u8 *buffer,</div><div class='del'>-		       u32 size)</div><div class='del'>-{</div><div class='del'>-	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='del'>-	u8 value8;</div><div class='del'>-	u8 u8page = (u8)(page &amp; 0x07);</div><div class='del'>-</div><div class='del'>-	value8 = (rtl_read_byte(rtlpriv, REG_MCUFWDL + 2) &amp; 0xF8) | u8page;</div><div class='del'>-</div><div class='del'>-	rtl_write_byte(rtlpriv, (REG_MCUFWDL + 2), value8);</div><div class='del'>-	rtl_fw_block_write(hw, buffer, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void rtl_fill_dummy(u8 *pfwbuf, u32 *pfwlen)</div><div class='del'>-{</div><div class='del'>-	u32 fwlen = *pfwlen;</div><div class='del'>-	u8 remain = (u8)(fwlen % 4);</div><div class='del'>-</div><div class='del'>-	remain = (remain == 0) ? 0 : (4 - remain);</div><div class='del'>-</div><div class='del'>-	while (remain &gt; 0) {</div><div class='del'>-		pfwbuf[fwlen] = 0;</div><div class='del'>-		fwlen++;</div><div class='del'>-		remain--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pfwlen = fwlen;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/efuse.h b/drivers/staging/rtlwifi/efuse.h<br/>deleted file mode 100644<br/>index 5335d3ee6da7..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/efuse.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/efuse.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009-2012  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __RTL_EFUSE_H_</div><div class='del'>-#define __RTL_EFUSE_H_</div><div class='del'>-</div><div class='del'>-#define EFUSE_IC_ID_OFFSET		506</div><div class='del'>-</div><div class='del'>-#define EFUSE_MAX_WORD_UNIT		4</div><div class='del'>-</div><div class='del'>-#define EFUSE_INIT_MAP			0</div><div class='del'>-#define EFUSE_MODIFY_MAP		1</div><div class='del'>-</div><div class='del'>-#define PG_STATE_HEADER			0x01</div><div class='del'>-#define PG_STATE_WORD_0			0x02</div><div class='del'>-#define PG_STATE_WORD_1			0x04</div><div class='del'>-#define PG_STATE_WORD_2			0x08</div><div class='del'>-#define PG_STATE_WORD_3			0x10</div><div class='del'>-#define PG_STATE_DATA			0x20</div><div class='del'>-</div><div class='del'>-#define EFUSE_REPEAT_THRESHOLD_		3</div><div class='del'>-#define EFUSE_ERROE_HANDLE		1</div><div class='del'>-</div><div class='del'>-struct efuse_map {</div><div class='del'>-	u8 offset;</div><div class='del'>-	u8 word_start;</div><div class='del'>-	u8 byte_start;</div><div class='del'>-	u8 byte_cnts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pgpkt_struct {</div><div class='del'>-	u8 offset;</div><div class='del'>-	u8 word_en;</div><div class='del'>-	u8 data[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum efuse_data_item {</div><div class='del'>-	EFUSE_CHIP_ID = 0,</div><div class='del'>-	EFUSE_LDO_SETTING,</div><div class='del'>-	EFUSE_CLK_SETTING,</div><div class='del'>-	EFUSE_SDIO_SETTING,</div><div class='del'>-	EFUSE_CCCR,</div><div class='del'>-	EFUSE_SDIO_MODE,</div><div class='del'>-	EFUSE_OCR,</div><div class='del'>-	EFUSE_F0CIS,</div><div class='del'>-	EFUSE_F1CIS,</div><div class='del'>-	EFUSE_MAC_ADDR,</div><div class='del'>-	EFUSE_EEPROM_VER,</div><div class='del'>-	EFUSE_CHAN_PLAN,</div><div class='del'>-	EFUSE_TXPW_TAB</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	VOLTAGE_V25 = 0x03,</div><div class='del'>-	LDOE25_SHIFT = 28,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct efuse_priv {</div><div class='del'>-	u8 id[2];</div><div class='del'>-	u8 ldo_setting[2];</div><div class='del'>-	u8 clk_setting[2];</div><div class='del'>-	u8 cccr;</div><div class='del'>-	u8 sdio_mode;</div><div class='del'>-	u8 ocr[3];</div><div class='del'>-	u8 cis0[17];</div><div class='del'>-	u8 cis1[48];</div><div class='del'>-	u8 mac_addr[6];</div><div class='del'>-	u8 eeprom_verno;</div><div class='del'>-	u8 channel_plan;</div><div class='del'>-	u8 tx_power_b[14];</div><div class='del'>-	u8 tx_power_g[14];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void read_efuse_byte(struct ieee80211_hw *hw, u16 _offset, u8 *pbuf);</div><div class='del'>-void efuse_initialize(struct ieee80211_hw *hw);</div><div class='del'>-u8 efuse_read_1byte(struct ieee80211_hw *hw, u16 address);</div><div class='del'>-int efuse_one_byte_read(struct ieee80211_hw *hw, u16 addr, u8 *data);</div><div class='del'>-void efuse_write_1byte(struct ieee80211_hw *hw, u16 address, u8 value);</div><div class='del'>-void read_efuse(struct ieee80211_hw *hw, u16 _offset,</div><div class='del'>-		u16 _size_byte, u8 *pbuf);</div><div class='del'>-void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,</div><div class='del'>-		       u16 offset, u32 *value);</div><div class='del'>-void efuse_shadow_write(struct ieee80211_hw *hw, u8 type,</div><div class='del'>-			u16 offset, u32 value);</div><div class='del'>-bool efuse_shadow_update(struct ieee80211_hw *hw);</div><div class='del'>-bool efuse_shadow_update_chk(struct ieee80211_hw *hw);</div><div class='del'>-void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw);</div><div class='del'>-void efuse_force_write_vendor_id(struct ieee80211_hw *hw);</div><div class='del'>-void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);</div><div class='del'>-void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate);</div><div class='del'>-int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,</div><div class='del'>-		   int max_size, u8 *hwinfo, int *params);</div><div class='del'>-void rtl_fill_dummy(u8 *pfwbuf, u32 *pfwlen);</div><div class='del'>-void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, const u8 *buffer,</div><div class='del'>-		       u32 size);</div><div class='del'>-void rtl_fw_block_write(struct ieee80211_hw *hw, const u8 *buffer, u32 size);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_2_platform.h b/drivers/staging/rtlwifi/halmac/halmac_2_platform.h<br/>deleted file mode 100644<br/>index 262304deb7fc..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_2_platform.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_2_platform.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_2_PLATFORM_H_</div><div class='del'>-#define _HALMAC_2_PLATFORM_H_</div><div class='del'>-</div><div class='del'>-#include "../wifi.h"</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-#define HALMAC_PLATFORM_LITTLE_ENDIAN 1</div><div class='del'>-#define HALMAC_PLATFORM_BIG_ENDIAN 0</div><div class='del'>-</div><div class='del'>-/* Note : Named HALMAC_PLATFORM_LITTLE_ENDIAN / HALMAC_PLATFORM_BIG_ENDIAN</div><div class='del'>- * is not mandatory. But Little endian must be '1'. Big endian must be '0'</div><div class='del'>- */</div><div class='del'>-#if defined(__LITTLE_ENDIAN)</div><div class='del'>-#define HALMAC_SYSTEM_ENDIAN HALMAC_PLATFORM_LITTLE_ENDIAN</div><div class='del'>-#elif defined(__BIG_ENDIAN)</div><div class='del'>-#define HALMAC_SYSTEM_ENDIAN HALMAC_PLATFORM_BIG_ENDIAN</div><div class='del'>-#else</div><div class='del'>-#error</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* define the Platform SDIO Bus CLK */</div><div class='del'>-#define PLATFORM_SD_CLK 50000000 /*50MHz*/</div><div class='del'>-</div><div class='del'>-/* define the Rx FIFO expanding mode packet size unit for 8821C and 8822B */</div><div class='del'>-/* Should be 8 Byte alignment */</div><div class='del'>-#define HALMAC_RX_FIFO_EXPANDING_MODE_PKT_SIZE 16 /*Bytes*/</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_2_PLATFORM_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.h<br/>deleted file mode 100644<br/>index 9013baefcede..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,121 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_8822B_CFG_H_</div><div class='del'>-#define _HALMAC_8822B_CFG_H_</div><div class='del'>-</div><div class='del'>-#include "halmac_8822b_pwr_seq.h"</div><div class='del'>-#include "halmac_api_8822b.h"</div><div class='del'>-#include "halmac_api_8822b_usb.h"</div><div class='del'>-#include "halmac_api_8822b_sdio.h"</div><div class='del'>-#include "halmac_api_8822b_pcie.h"</div><div class='del'>-#include "../../halmac_bit2.h"</div><div class='del'>-#include "../../halmac_reg2.h"</div><div class='del'>-#include "../../halmac_api.h"</div><div class='del'>-</div><div class='del'>-#define HALMAC_TX_FIFO_SIZE_8822B 262144 /* 256k */</div><div class='del'>-#define HALMAC_TX_FIFO_SIZE_LA_8822B 131072 /* 128k */</div><div class='del'>-#define HALMAC_RX_FIFO_SIZE_8822B 24576 /* 24k */</div><div class='del'>-#define HALMAC_TX_PAGE_SIZE_8822B 128 /* PageSize 128Byte */</div><div class='del'>-#define HALMAC_TX_ALIGN_SIZE_8822B 8</div><div class='del'>-#define HALMAC_TX_PAGE_SIZE_2_POWER_8822B 7 /* 128 = 2^7 */</div><div class='del'>-#define HALMAC_SECURITY_CAM_ENTRY_NUM_8822B 64 /* CAM Entry size */</div><div class='del'>-#define HALMAC_TX_AGG_ALIGNMENT_SIZE_8822B 8</div><div class='del'>-#define HALMAC_TX_DESC_SIZE_8822B 48</div><div class='del'>-#define HALMAC_RX_DESC_SIZE_8822B 24</div><div class='del'>-#define HALMAC_RX_DESC_DUMMY_SIZE_MAX_8822B 120</div><div class='del'>-#define HALMAC_C2H_PKT_BUF_8822B 256</div><div class='del'>-#define HALMAC_RX_FIFO_EXPANDING_MODE_PKT_SIZE_MAX_8822B 80 /* align 8 Byte*/</div><div class='del'>-#define HALMAC_RX_FIFO_EXPANDING_UNIT_8822B                                    \</div><div class='del'>-	(HALMAC_RX_DESC_SIZE_8822B + HALMAC_RX_DESC_DUMMY_SIZE_MAX_8822B +     \</div><div class='del'>-	 HALMAC_RX_FIFO_EXPANDING_MODE_PKT_SIZE) /* align 8 Byte*/</div><div class='del'>-#define HALMAC_RX_FIFO_EXPANDING_UNIT_MAX_8822B                                \</div><div class='del'>-	(HALMAC_RX_DESC_SIZE_8822B + HALMAC_RX_DESC_DUMMY_SIZE_MAX_8822B +     \</div><div class='del'>-	 HALMAC_RX_FIFO_EXPANDING_MODE_PKT_SIZE_MAX_8822B) /* align 8 Byte*/</div><div class='del'>-</div><div class='del'>-#define HALMAC_TX_FIFO_SIZE_EX_1_BLK_8822B 196608 /* 192k */</div><div class='del'>-#define HALMAC_RX_FIFO_SIZE_EX_1_BLK_8822B                                     \</div><div class='del'>-	((((HALMAC_RX_FIFO_EXPANDING_UNIT_8822B &lt;&lt; 8) - 1) &gt;&gt; 10)              \</div><div class='del'>-	 &lt;&lt; 10) /* &lt; 56k*/</div><div class='del'>-#define HALMAC_RX_FIFO_SIZE_EX_1_BLK_MAX_8822B                                 \</div><div class='del'>-	((((HALMAC_RX_FIFO_EXPANDING_UNIT_MAX_8822B &lt;&lt; 8) - 1) &gt;&gt; 10)          \</div><div class='del'>-	 &lt;&lt; 10) /* 55k*/</div><div class='del'>-#define HALMAC_TX_FIFO_SIZE_EX_2_BLK_8822B 131072 /* 128k */</div><div class='del'>-#define HALMAC_RX_FIFO_SIZE_EX_2_BLK_8822B 155648 /* 152k */</div><div class='del'>-#define HALMAC_TX_FIFO_SIZE_EX_3_BLK_8822B 65536 /* 64k */</div><div class='del'>-#define HALMAC_RX_FIFO_SIZE_EX_3_BLK_8822B 221184 /* 216k */</div><div class='del'>-</div><div class='del'>-/* TXFIFO LAYOUT</div><div class='del'>- * HIGH_QUEUE</div><div class='del'>- * NORMAL_QUEUE</div><div class='del'>- * LOW_QUEUE</div><div class='del'>- * EXTRA_QUEUE</div><div class='del'>- * PUBLIC_QUEUE -- decided after all other queue are defined</div><div class='del'>- * GAP_QUEUE -- Used to separate AC queue and Rsvd page</div><div class='del'>- *</div><div class='del'>- * RSVD_DRIVER -- Driver used rsvd page area</div><div class='del'>- * RSVD_H2C_EXTRAINFO -- Extra Information for h2c</div><div class='del'>- * RSVD_H2C_QUEUE -- h2c queue in rsvd page</div><div class='del'>- * RSVD_CPU_INSTRUCTION -- extend fw code</div><div class='del'>- * RSVD_FW_TXBUFF -- fw used this area to send packet</div><div class='del'>- *</div><div class='del'>- * Symbol: HALMAC_MODE_QUEUE_UNIT_CHIP, ex: HALMAC_LB_2BULKOUT_FWCMD_PGNUM_8822B</div><div class='del'>- */</div><div class='del'>-#define HALMAC_EXTRA_INFO_BUFF_SIZE_FULL_FIFO_8822B                            \</div><div class='del'>-	16384 /*16K, only used in init case*/</div><div class='del'>-</div><div class='del'>-#define HALMAC_RSVD_DRV_PGNUM_8822B 16 /*2048*/</div><div class='del'>-#define HALMAC_RSVD_H2C_EXTRAINFO_PGNUM_8822B 32 /*4096*/</div><div class='del'>-#define HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B 8 /*1024*/</div><div class='del'>-#define HALMAC_RSVD_CPU_INSTRUCTION_PGNUM_8822B 0 /*0*/</div><div class='del'>-#define HALMAC_RSVD_FW_TXBUFF_PGNUM_8822B 4 /*512*/</div><div class='del'>-</div><div class='del'>-#define HALMAC_EFUSE_SIZE_8822B 1024 /* 0x400 */</div><div class='del'>-#define HALMAC_BT_EFUSE_SIZE_8822B 128 /* 0x80 */</div><div class='del'>-#define HALMAC_EEPROM_SIZE_8822B 0x300</div><div class='del'>-#define HALMAC_CR_TRX_ENABLE_8822B                                             \</div><div class='del'>-	(BIT_HCI_TXDMA_EN | BIT_HCI_RXDMA_EN | BIT_TXDMA_EN | BIT_RXDMA_EN |   \</div><div class='del'>-	 BIT_PROTOCOL_EN | BIT_SCHEDULE_EN | BIT_MACTXEN | BIT_MACRXEN)</div><div class='del'>-</div><div class='del'>-#define HALMAC_BLK_DESC_NUM_8822B 0x3 /* Only for USB */</div><div class='del'>-</div><div class='del'>-/* AMPDU max time (unit : 32us) */</div><div class='del'>-#define HALMAC_AMPDU_MAX_TIME_8822B 0x70</div><div class='del'>-</div><div class='del'>-/* Protect mode control */</div><div class='del'>-#define HALMAC_PROT_RTS_LEN_TH_8822B 0xFF</div><div class='del'>-#define HALMAC_PROT_RTS_TX_TIME_TH_8822B 0x08</div><div class='del'>-#define HALMAC_PROT_MAX_AGG_PKT_LIMIT_8822B 0x20</div><div class='del'>-#define HALMAC_PROT_RTS_MAX_AGG_PKT_LIMIT_8822B 0x20</div><div class='del'>-</div><div class='del'>-/* Fast EDCA setting */</div><div class='del'>-#define HALMAC_FAST_EDCA_VO_TH_8822B 0x06</div><div class='del'>-#define HALMAC_FAST_EDCA_VI_TH_8822B 0x06</div><div class='del'>-#define HALMAC_FAST_EDCA_BE_TH_8822B 0x06</div><div class='del'>-#define HALMAC_FAST_EDCA_BK_TH_8822B 0x06</div><div class='del'>-</div><div class='del'>-/* BAR setting */</div><div class='del'>-#define HALMAC_BAR_RETRY_LIMIT_8822B 0x01</div><div class='del'>-#define HALMAC_RA_TRY_RATE_AGG_LIMIT_8822B 0x08</div><div class='del'>-</div><div class='del'>-enum halmac_normal_rxagg_th_to_8822b {</div><div class='del'>-	HALMAC_NORMAL_RXAGG_THRESHOLD_8822B = 0xFF,</div><div class='del'>-	HALMAC_NORMAL_RXAGG_TIMEOUT_8822B = 0x01,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum halmac_loopback_rxagg_th_to_8822b {</div><div class='del'>-	HALMAC_LOOPBACK_RXAGG_THRESHOLD_8822B = 0xFF,</div><div class='del'>-	HALMAC_LOOPBACK_RXAGG_TIMEOUT_8822B = 0x01,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c<br/>deleted file mode 100644<br/>index c68b9e82c2e7..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "../halmac_88xx_cfg.h"</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ============ip sel item list============</div><div class='del'>- * HALMAC_IP_SEL_INTF_PHY</div><div class='del'>- *	USB2 : usb2 phy, 1byte value</div><div class='del'>- *	USB3 : usb3 phy, 2byte value</div><div class='del'>- *	PCIE1 : pcie gen1 mdio, 2byte value</div><div class='del'>- *	PCIE2 : pcie gen2 mdio, 2byte value</div><div class='del'>- * HALMAC_IP_SEL_MAC</div><div class='del'>- *	USB2, USB3, PCIE1, PCIE2 : mac ip, 1byte value</div><div class='del'>- * HALMAC_IP_SEL_PCIE_DBI</div><div class='del'>- *	USB2 USB3 : none</div><div class='del'>- *	PCIE1, PCIE2 : pcie dbi, 1byte value</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct halmac_intf_phy_para_ HALMAC_RTL8822B_USB2_PHY[] = {</div><div class='del'>-	/* {offset, value, ip sel, cut mask, platform mask} */</div><div class='del'>-	{0xFFFF, 0x00, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_ALL,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct halmac_intf_phy_para_ HALMAC_RTL8822B_USB3_PHY[] = {</div><div class='del'>-	/* {offset, value, ip sel, cut mask, platform mask} */</div><div class='del'>-	{0x0001, 0xA841, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_D,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0xFFFF, 0x0000, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_ALL,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct halmac_intf_phy_para_ HALMAC_RTL8822B_PCIE_PHY_GEN1[] = {</div><div class='del'>-	/* {offset, value, ip sel, cut mask, platform mask} */</div><div class='del'>-	{0x0001, 0xA841, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0002, 0x60C6, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0008, 0x3596, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0009, 0x321C, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x000A, 0x9623, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0020, 0x94FF, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0021, 0xFFCF, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0026, 0xC006, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0029, 0xFF0E, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x002A, 0x1840, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0xFFFF, 0x0000, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_ALL,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct halmac_intf_phy_para_ HALMAC_RTL8822B_PCIE_PHY_GEN2[] = {</div><div class='del'>-	/* {offset, value, ip sel, cut mask, platform mask} */</div><div class='del'>-	{0x0001, 0xA841, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0002, 0x60C6, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0008, 0x3597, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0009, 0x321C, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x000A, 0x9623, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0020, 0x94FF, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0021, 0xFFCF, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0026, 0xC006, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x0029, 0xFF0E, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0x002A, 0x3040, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_C,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-	{0xFFFF, 0x0000, HALMAC_IP_SEL_INTF_PHY, HALMAC_INTF_PHY_CUT_ALL,</div><div class='del'>-	 HALMAC_INTF_PHY_PLATFORM_ALL},</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c<br/>deleted file mode 100644<br/>index 08f6536840cf..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,552 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "../halmac_88xx_cfg.h"</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_CARDEMU_TO_ACT[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0012, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /*SWR OCP = SWR OCP = 010 1382.40*/</div><div class='del'>-	{0x0012, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /*SWR OCP = 010 1382.40 */</div><div class='del'>-	{0x0020, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, BIT(0),</div><div class='del'>-	 BIT(0)}, /*0x20[0] = 1b'1 enable LDOA12 MACRO block for all interface*/</div><div class='del'>-	{0x0001, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_DELAY, 1,</div><div class='del'>-	 HALMAC_PWRSEQ_DELAY_MS}, /*Delay 1ms*/</div><div class='del'>-	{0x0000, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, BIT(5),</div><div class='del'>-	 0}, /*0x00[5] = 1b'0 release analog Ips to digital ,1:isolation*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 (BIT(4) | BIT(3) | BIT(2)),</div><div class='del'>-	 0}, /* disable SW LPS 0x04[10]=0 and WLSUS_EN 0x04[12:11]=0*/</div><div class='del'>-	{0x0075, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* Disable USB suspend */</div><div class='del'>-	{0x0006, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(1),</div><div class='del'>-	 BIT(1)}, /* wait till 0x04[17] = 1    power ready*/</div><div class='del'>-	{0x0075, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), 0}, /* Enable USB suspend */</div><div class='del'>-	{0xFF1A, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0}, /*0xFF1A = 0 to release resume signals*/</div><div class='del'>-	{0x0006, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* release WLON reset  0x04[16]=1*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(7), 0}, /* disable HWPDN 0x04[15]=0*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 (BIT(4) | BIT(3)), 0}, /* disable WL suspend*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* polling until return 0*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(0), 0},</div><div class='del'>-	{0x0020, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3), BIT(3)}, /*Enable XTAL_CLK*/</div><div class='del'>-	{0x10A8, HALMAC_PWR_CUT_C_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0}, /*NFC pad enabled*/</div><div class='del'>-	{0x10A9, HALMAC_PWR_CUT_C_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xef}, /*NFC pad enabled*/</div><div class='del'>-	{0x10AA, HALMAC_PWR_CUT_C_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x0c}, /*NFC pad enabled*/</div><div class='del'>-	{0x0068, HALMAC_PWR_CUT_C_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(4), BIT(4)}, /*SDIO pad power down disabled*/</div><div class='del'>-	{0x0029, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xF9}, /*PLL seting*/</div><div class='del'>-	{0x0024, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(2), 0}, /*Improve TX EVM of CH13 and some 5G channles */</div><div class='del'>-	{0x0074, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(5), BIT(5)}, /*PCIE WAKE# enabled*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_ACT_TO_CARDEMU[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0003, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(2), 0}, /*0x02[10] = 0 Disable MCU Core*/</div><div class='del'>-	{0x0093, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3), 0}, /*LPS option 0x93[3]=0 , SWR PFM*/</div><div class='del'>-	{0x001F, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0}, /*0x1F[7:0] = 0 turn off RF*/</div><div class='del'>-	{0x00EF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0}, /*0xEF[7:0] = 0 turn off RF*/</div><div class='del'>-	{0xFF1A, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x30}, /*0xFF1A = 0x30 to block resume signals*/</div><div class='del'>-	{0x0049, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /*Enable rising edge triggering interrupt*/</div><div class='del'>-	{0x0006, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* release WLON reset  0x04[16]=1*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /* Whole BB is reset */</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), BIT(1)}, /*0x04[9] = 1 turn off MAC by HW state machine*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(1),</div><div class='del'>-	 0}, /*wait till 0x04[9] = 0 polling until return 0 to disable*/</div><div class='del'>-	{0x0020, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3), 0}, /* XTAL_CLK gated*/</div><div class='del'>-	{0x0000, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, BIT(5),</div><div class='del'>-	 BIT(5)}, /*0x00[5] = 1b'1 analog Ips to digital ,1:isolation*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_CARDEMU_TO_SUS[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(4) | BIT(3),</div><div class='del'>-	 (BIT(4) | BIT(3))}, /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, BIT(3) | BIT(4),</div><div class='del'>-	 BIT(3)}, /*0x04[12:11] = 2b'01 enable WL suspend*/</div><div class='del'>-	{0x0007, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, 0xFF,</div><div class='del'>-	 0x20}, /*0x07[7:0] = 0x20 SDIO SOP option to disable BG/MB/ACK/SWR*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3) | BIT(4),</div><div class='del'>-	 BIT(3) | BIT(4)}, /*0x04[12:11] = 2b'11 enable WL suspend for PCIe*/</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(0),</div><div class='del'>-	 BIT(0)}, /*Set SDIO suspend local register*/</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(1), 0}, /*wait power state to suspend*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_SUS_TO_CARDEMU[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3) | BIT(7), 0}, /*clear suspend enable and power down enable*/</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(0), 0}, /*Set SDIO suspend local register*/</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(1),</div><div class='del'>-	 BIT(1)}, /*wait power state to suspend*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3) | BIT(4), 0}, /*0x04[12:11] = 2b'01enable WL suspend*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_CARDEMU_TO_CARDDIS[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(7),</div><div class='del'>-	 BIT(7)}, /*suspend enable and power down enable*/</div><div class='del'>-	{0x0007, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, 0xFF,</div><div class='del'>-	 0x20}, /*0x07=0x20 , SOP option to disable BG/MB*/</div><div class='del'>-	{0x0067, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(5), 0}, /*0x67[5]=0 , BIT_PAPE_WLBT_SEL*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_SDIO_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, BIT(3) | BIT(4),</div><div class='del'>-	 BIT(3)}, /*0x04[12:11] = 2b'01 enable WL suspend*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(2), BIT(2)}, /*0x04[10] = 1, enable SW LPS*/</div><div class='del'>-	{0x004A, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), 0}, /*0x48[16] = 0 to disable GPIO9 as EXT WAKEUP*/</div><div class='del'>-	{0x0067, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(5),</div><div class='del'>-	 0}, /* 0: BT PAPE control ; 1: WL BB LNAON control*/</div><div class='del'>-	{0x0067, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(4),</div><div class='del'>-	 0}, /* 0: BT GPIO[11:10] control  ; 1: WL BB LNAON control*/</div><div class='del'>-	{0x004F, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(0), 0}, /* 0: BT Control*/</div><div class='del'>-	{0x0067, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(1),</div><div class='del'>-	 0}, /* turn off BT_3DD_SYNC_B and BT_GPIO[18] */</div><div class='del'>-	{0x0046, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(6), BIT(6)}, /* GPIO[6] : Output mode*/</div><div class='del'>-	{0x0067, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(2), 0}, /* turn off BT_GPIO[16] */</div><div class='del'>-	{0x0046, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(7), BIT(7)}, /* GPIO[7] : Output mode*/</div><div class='del'>-	{0x0062, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(4), BIT(4)}, /* GPIO[12] : Output mode */</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(0),</div><div class='del'>-	 BIT(0)}, /*Set SDIO suspend local register*/</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(1), 0}, /*wait power state to suspend*/</div><div class='del'>-	{0x0090, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK | HALMAC_PWR_INTF_PCI_MSK,</div><div class='del'>-	 HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE, BIT(1),</div><div class='del'>-	 0}, /*0x90[1]=0 , disable 32k clock*/</div><div class='del'>-	{0x0044, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, 0xFF,</div><div class='del'>-	 0}, /*0x90[1]=0 , disable 32k clock by indirect access*/</div><div class='del'>-	{0x0040, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, 0xFF,</div><div class='del'>-	 0x90}, /*0x90[1]=0 , disable 32k clock by indirect access*/</div><div class='del'>-	{0x0041, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, 0xFF,</div><div class='del'>-	 0x00}, /*0x90[1]=0 , disable 32k clock by indirect access*/</div><div class='del'>-	{0x0042, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, 0xFF,</div><div class='del'>-	 0x04}, /*0x90[1]=0 , disable 32k clock by indirect access*/</div><div class='del'>-	{0x0081, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(7), 0}, /*0x80[15]clean fw init ready bit*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_CARDDIS_TO_CARDEMU[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(0), 0}, /*Set SDIO suspend local register*/</div><div class='del'>-	{0x0086, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(1),</div><div class='del'>-	 BIT(1)}, /*wait power state to suspend*/</div><div class='del'>-	{0x004A, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), 0}, /*0x48[16] = 0 to disable GPIO9 as EXT WAKEUP*/</div><div class='del'>-	{0x0005, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3) | BIT(4) | BIT(7),</div><div class='del'>-	 0}, /*clear suspend enable and power down enable*/</div><div class='del'>-	{0x0301, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0},</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_ACT_TO_LPS[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0101, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(2), BIT(2)}, /*Enable 32k calibration and thermal meter*/</div><div class='del'>-	{0x0199, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3), BIT(3)}, /*Register write data of 32K calibration*/</div><div class='del'>-	{0x019B, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(7), BIT(7)}, /*Enable 32k calibration reg write*/</div><div class='del'>-	{0x1138, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0) | BIT(1), BIT(0) | BIT(1)}, /*set RPWM IMR*/</div><div class='del'>-	{0x0194, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* enable 32K CLK*/</div><div class='del'>-	{0x0093, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x42}, /* LPS Option MAC OFF enable*/</div><div class='del'>-	{0x0092, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x20}, /* LPS Option  Enable memory to deep sleep mode*/</div><div class='del'>-	{0x0090, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), BIT(1)}, /* enable reg use 32K CLK*/</div><div class='del'>-	{0x0301, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*PCIe DMA stop*/</div><div class='del'>-	{0x0522, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*Tx Pause*/</div><div class='del'>-	{0x05F8, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x05F9, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x05FA, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x05FB, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), 0}, /*CCK and OFDM are disabled,and clock are gated*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_DELAY,</div><div class='del'>-	 0, HALMAC_PWRSEQ_DELAY_US}, /*Delay 1us*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /*Whole BB is reset*/</div><div class='del'>-	{0x0100, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x3F}, /*Reset MAC TRX*/</div><div class='del'>-	{0x0101, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /*check if removed later*/</div><div class='del'>-	{0x0553, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(5), BIT(5)}, /*Respond TxOK to scheduler*/</div><div class='del'>-	{0x0008, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(4), BIT(4)}, /* switch TSF clock to 32K*/</div><div class='del'>-	{0x0109, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(7),</div><div class='del'>-	 BIT(7)}, /*Polling 0x109[7]=0  TSF in 40M*/</div><div class='del'>-	{0x0090, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* enable WL_LPS_EN*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_ACT_TO_DEEP_LPS[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0101, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(2), BIT(2)}, /*Enable 32k calibration and thermal meter*/</div><div class='del'>-	{0x0199, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(3), BIT(3)}, /*Register write data of 32K calibration*/</div><div class='del'>-	{0x019B, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(7), BIT(7)}, /*Enable 32k calibration reg write*/</div><div class='del'>-	{0x1138, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0) | BIT(1), BIT(0) | BIT(1)}, /*set RPWM IMR*/</div><div class='del'>-	{0x0194, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* enable 32K CLK*/</div><div class='del'>-	{0x0093, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x40}, /* LPS Option MAC OFF enable*/</div><div class='del'>-	{0x0092, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x20}, /* LPS Option  Enable memory to deep sleep mode*/</div><div class='del'>-	{0x0090, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), BIT(1)}, /* enable reg use 32K CLK*/</div><div class='del'>-	{0x0301, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*PCIe DMA stop*/</div><div class='del'>-	{0x0522, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*Tx Pause*/</div><div class='del'>-	{0x05F8, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x05F9, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x05FA, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x05FB, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, 0xFF,</div><div class='del'>-	 0}, /*Should be zero if no packet is transmitting*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), 0}, /*CCK and OFDM are disabled,and clock are gated*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_DELAY,</div><div class='del'>-	 0, HALMAC_PWRSEQ_DELAY_US}, /*Delay 1us*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /*Whole BB is reset*/</div><div class='del'>-	{0x0100, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x3F}, /*Reset MAC TRX*/</div><div class='del'>-	{0x0101, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /*check if removed later*/</div><div class='del'>-	{0x0553, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(5), BIT(5)}, /*Respond TxOK to scheduler*/</div><div class='del'>-	{0x0008, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(4), BIT(4)}, /* switch TSF clock to 32K*/</div><div class='del'>-	{0x0109, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(7),</div><div class='del'>-	 BIT(7)}, /*Polling 0x109[7]=1  TSF in 32K*/</div><div class='del'>-	{0x0090, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(0), BIT(0)}, /* enable WL_LPS_EN*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct halmac_wl_pwr_cfg_ HALMAC_RTL8822B_TRANS_LPS_TO_ACT[] = {</div><div class='del'>-	/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value } */</div><div class='del'>-	{0x0080, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(7), BIT(7)}, /*SDIO RPWM*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_DELAY,</div><div class='del'>-	 0, HALMAC_PWRSEQ_DELAY_MS}, /*Delay*/</div><div class='del'>-	{0x0080, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_SDIO_MSK, HALMAC_PWR_BASEADDR_SDIO,</div><div class='del'>-	 HALMAC_PWR_CMD_WRITE, BIT(7), 0}, /*SDIO RPWM*/</div><div class='del'>-	{0xFE58, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_USB_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x84}, /*USB RPWM*/</div><div class='del'>-	{0x0361, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_PCI_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x84}, /*PCIe RPWM*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_DELAY,</div><div class='del'>-	 0, HALMAC_PWRSEQ_DELAY_MS}, /*Delay*/</div><div class='del'>-	{0x0008, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(4), 0}, /* switch TSF to 40M*/</div><div class='del'>-	{0x0109, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC,</div><div class='del'>-	 HALMAC_PWR_CMD_POLLING, BIT(7), 0}, /*Polling 0x109[7]=0  TSF in 40M*/</div><div class='del'>-	{0x0101, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), BIT(1)},</div><div class='del'>-	{0x0100, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*nable WMAC TRX*/</div><div class='del'>-	{0x0002, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1) | BIT(0), BIT(1) | BIT(0)}, /*nable BB macro*/</div><div class='del'>-	{0x0522, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0},</div><div class='del'>-	{0x113C, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0x03}, /*clear RPWM INT*/</div><div class='del'>-	{0x0124, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*clear FW INT*/</div><div class='del'>-	{0x0125, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*clear FW INT*/</div><div class='del'>-	{0x0126, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*clear FW INT*/</div><div class='del'>-	{0x0127, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 0xFF, 0xFF}, /*clear FW INT*/</div><div class='del'>-	{0x0090, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(1), 0}, /* disable reg use 32K CLK*/</div><div class='del'>-	{0x0101, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, HALMAC_PWR_BASEADDR_MAC, HALMAC_PWR_CMD_WRITE,</div><div class='del'>-	 BIT(2), 0}, /*disable 32k calibration and thermal meter*/</div><div class='del'>-	{0xFFFF, HALMAC_PWR_CUT_ALL_MSK, HALMAC_PWR_FAB_ALL_MSK,</div><div class='del'>-	 HALMAC_PWR_INTF_ALL_MSK, 0, HALMAC_PWR_CMD_END, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Card Enable Array */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_card_enable_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_CARDDIS_TO_CARDEMU,</div><div class='del'>-	HALMAC_RTL8822B_TRANS_CARDEMU_TO_ACT, NULL};</div><div class='del'>-</div><div class='del'>-/* Card Disable Array */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_card_disable_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_ACT_TO_CARDEMU,</div><div class='del'>-	HALMAC_RTL8822B_TRANS_CARDEMU_TO_CARDDIS, NULL};</div><div class='del'>-</div><div class='del'>-/* Suspend Array */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_suspend_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_ACT_TO_CARDEMU,</div><div class='del'>-	HALMAC_RTL8822B_TRANS_CARDEMU_TO_SUS, NULL};</div><div class='del'>-</div><div class='del'>-/* Resume Array */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_resume_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_SUS_TO_CARDEMU,</div><div class='del'>-	HALMAC_RTL8822B_TRANS_CARDEMU_TO_ACT, NULL};</div><div class='del'>-</div><div class='del'>-/* HWPDN Array - HW behavior */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_hwpdn_flow[] = {NULL};</div><div class='del'>-</div><div class='del'>-/* Enter LPS - FW behavior */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_enter_lps_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_ACT_TO_LPS, NULL};</div><div class='del'>-</div><div class='del'>-/* Enter Deep LPS - FW behavior */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_enter_deep_lps_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_ACT_TO_DEEP_LPS, NULL};</div><div class='del'>-</div><div class='del'>-/* Leave LPS -FW behavior */</div><div class='del'>-struct halmac_wl_pwr_cfg_ *halmac_8822b_leave_lps_flow[] = {</div><div class='del'>-	HALMAC_RTL8822B_TRANS_LPS_TO_ACT, NULL};</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.h<br/>deleted file mode 100644<br/>index 03bbec32a3e3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef HALMAC_POWER_SEQUENCE_8822B</div><div class='del'>-#define HALMAC_POWER_SEQUENCE_8822B</div><div class='del'>-</div><div class='del'>-#include "../../halmac_pwr_seq_cmd.h"</div><div class='del'>-</div><div class='del'>-#define HALMAC_8822B_PWR_SEQ_VER "V17"</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_card_disable_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_card_enable_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_suspend_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_resume_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_hwpdn_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_enter_lps_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_enter_deep_lps_flow[];</div><div class='del'>-extern struct halmac_wl_pwr_cfg_ *halmac_8822b_leave_lps_flow[];</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c<br/>deleted file mode 100644<br/>index aea481bb2403..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-#include "halmac_func_8822b.h"</div><div class='del'>-#include "../halmac_func_88xx.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mount_api_8822b() - attach functions to function pointer</div><div class='del'>- * @halmac_adapter</div><div class='del'>- *</div><div class='del'>- * SD1 internal use</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mount_api_8822b(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api =</div><div class='del'>-		(struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;chip_id = HALMAC_CHIP_ID_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.efuse_size = HALMAC_EFUSE_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.eeprom_size = HALMAC_EEPROM_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.bt_efuse_size =</div><div class='del'>-		HALMAC_BT_EFUSE_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.cam_entry_num =</div><div class='del'>-		HALMAC_SECURITY_CAM_ENTRY_NUM_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.txdesc_size = HALMAC_TX_DESC_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.rxdesc_size = HALMAC_RX_DESC_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.tx_fifo_size = HALMAC_TX_FIFO_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.rx_fifo_size = HALMAC_RX_FIFO_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.page_size = HALMAC_TX_PAGE_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.tx_align_size =</div><div class='del'>-		HALMAC_TX_ALIGN_SIZE_8822B;</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.page_size_2_power =</div><div class='del'>-		HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num =</div><div class='del'>-		HALMAC_RSVD_DRV_PGNUM_8822B;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_init_trx_cfg = halmac_init_trx_cfg_8822b;</div><div class='del'>-	halmac_api-&gt;halmac_init_protocol_cfg = halmac_init_protocol_cfg_8822b;</div><div class='del'>-	halmac_api-&gt;halmac_init_h2c = halmac_init_h2c_8822b;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		halmac_api-&gt;halmac_tx_allowed_sdio =</div><div class='del'>-			halmac_tx_allowed_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_cfg_tx_agg_align =</div><div class='del'>-			halmac_cfg_tx_agg_align_sdio_not_support_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_mac_power_switch =</div><div class='del'>-			halmac_mac_power_switch_8822b_sdio;</div><div class='del'>-		halmac_api-&gt;halmac_phy_cfg = halmac_phy_cfg_8822b_sdio;</div><div class='del'>-		halmac_api-&gt;halmac_interface_integration_tuning =</div><div class='del'>-			halmac_interface_integration_tuning_8822b_sdio;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		halmac_api-&gt;halmac_mac_power_switch =</div><div class='del'>-			halmac_mac_power_switch_8822b_usb;</div><div class='del'>-		halmac_api-&gt;halmac_cfg_tx_agg_align =</div><div class='del'>-			halmac_cfg_tx_agg_align_usb_not_support_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_phy_cfg = halmac_phy_cfg_8822b_usb;</div><div class='del'>-		halmac_api-&gt;halmac_interface_integration_tuning =</div><div class='del'>-			halmac_interface_integration_tuning_8822b_usb;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_PCIE) {</div><div class='del'>-		halmac_api-&gt;halmac_mac_power_switch =</div><div class='del'>-			halmac_mac_power_switch_8822b_pcie;</div><div class='del'>-		halmac_api-&gt;halmac_cfg_tx_agg_align =</div><div class='del'>-			halmac_cfg_tx_agg_align_pcie_not_support_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_pcie_switch = halmac_pcie_switch_8822b;</div><div class='del'>-		halmac_api-&gt;halmac_phy_cfg = halmac_phy_cfg_8822b_pcie;</div><div class='del'>-		halmac_api-&gt;halmac_interface_integration_tuning =</div><div class='del'>-			halmac_interface_integration_tuning_8822b_pcie;</div><div class='del'>-	} else {</div><div class='del'>-		halmac_api-&gt;halmac_pcie_switch = halmac_pcie_switch_8822b_nc;</div><div class='del'>-	}</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_trx_cfg_8822b() - config trx dma register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_trx_mode : trx mode selection</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_trx_cfg_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_trx_mode halmac_trx_mode)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 value32;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_TRX_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-	halmac_adapter-&gt;trx_mode = halmac_trx_mode;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_init_trx_cfg ==========&gt;halmac_trx_mode = %d\n",</div><div class='del'>-			halmac_trx_mode);</div><div class='del'>-</div><div class='del'>-	status = halmac_txdma_queue_mapping_8822b(halmac_adapter,</div><div class='del'>-						  halmac_trx_mode);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_txdma_queue_mapping fail!\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = 0;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR, value8);</div><div class='del'>-	value8 = HALMAC_CR_TRX_ENABLE_8822B;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR, value8);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2CQ_CSR, BIT(31));</div><div class='del'>-</div><div class='del'>-	status = halmac_priority_queue_config_8822b(halmac_adapter,</div><div class='del'>-						    halmac_trx_mode);</div><div class='del'>-	if (halmac_adapter-&gt;txff_allocation.rx_fifo_expanding_mode !=</div><div class='del'>-	    HALMAC_RX_FIFO_EXPANDING_MODE_DISABLE)</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_RX_DRVINFO_SZ, 0xF);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_txdma_queue_mapping fail!\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Config H2C packet buffer */</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_HEAD);</div><div class='del'>-	value32 = (value32 &amp; 0xFFFC0000) |</div><div class='del'>-		  (halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy</div><div class='del'>-		   &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2C_HEAD, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_READ_ADDR);</div><div class='del'>-	value32 = (value32 &amp; 0xFFFC0000) |</div><div class='del'>-		  (halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy</div><div class='del'>-		   &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2C_READ_ADDR, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_TAIL);</div><div class='del'>-	value32 = (value32 &amp; 0xFFFC0000) |</div><div class='del'>-		  ((halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy</div><div class='del'>-		    &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B) +</div><div class='del'>-		   (HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B</div><div class='del'>-		    &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B));</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2C_TAIL, value32);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_H2C_INFO);</div><div class='del'>-	value8 = (u8)((value8 &amp; 0xFC) | 0x01);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_H2C_INFO, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_H2C_INFO);</div><div class='del'>-	value8 = (u8)((value8 &amp; 0xFB) | 0x04);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_H2C_INFO, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_TXDMA_OFFSET_CHK + 1);</div><div class='del'>-	value8 = (u8)((value8 &amp; 0x7f) | 0x80);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXDMA_OFFSET_CHK + 1, value8);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;h2c_buff_size = HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B</div><div class='del'>-					&lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-	halmac_get_h2c_buff_free_space_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;h2c_buff_size !=</div><div class='del'>-	    halmac_adapter-&gt;h2c_buf_free_space) {</div><div class='del'>-		pr_err("get h2c free space error!\n");</div><div class='del'>-		return HALMAC_RET_GET_H2C_SPACE_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_init_trx_cfg &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_protocol_cfg_8822b() - config protocol register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_protocol_cfg_8822b(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u32 value32;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_PROTOCOL_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_AMPDU_MAX_TIME_V1,</div><div class='del'>-			   HALMAC_AMPDU_MAX_TIME_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TX_HANG_CTRL, BIT_EN_EOF_V1);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_PROT_RTS_LEN_TH_8822B |</div><div class='del'>-		  (HALMAC_PROT_RTS_TX_TIME_TH_8822B &lt;&lt; 8) |</div><div class='del'>-		  (HALMAC_PROT_MAX_AGG_PKT_LIMIT_8822B &lt;&lt; 16) |</div><div class='del'>-		  (HALMAC_PROT_RTS_MAX_AGG_PKT_LIMIT_8822B &lt;&lt; 24);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_PROT_MODE_CTRL, value32);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_BAR_MODE_CTRL + 2,</div><div class='del'>-			    HALMAC_BAR_RETRY_LIMIT_8822B |</div><div class='del'>-				    HALMAC_RA_TRY_RATE_AGG_LIMIT_8822B &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FAST_EDCA_VOVI_SETTING,</div><div class='del'>-			   HALMAC_FAST_EDCA_VO_TH_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FAST_EDCA_VOVI_SETTING + 2,</div><div class='del'>-			   HALMAC_FAST_EDCA_VI_TH_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FAST_EDCA_BEBK_SETTING,</div><div class='del'>-			   HALMAC_FAST_EDCA_BE_TH_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FAST_EDCA_BEBK_SETTING + 2,</div><div class='del'>-			   HALMAC_FAST_EDCA_BK_TH_8822B);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_h2c_8822b() - config h2c packet buffer</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_h2c_8822b(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 value32;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	value8 = 0;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR, value8);</div><div class='del'>-	value8 = HALMAC_CR_TRX_ENABLE_8822B;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR, value8);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_HEAD);</div><div class='del'>-	value32 = (value32 &amp; 0xFFFC0000) |</div><div class='del'>-		  (halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy</div><div class='del'>-		   &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2C_HEAD, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_READ_ADDR);</div><div class='del'>-	value32 = (value32 &amp; 0xFFFC0000) |</div><div class='del'>-		  (halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy</div><div class='del'>-		   &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2C_READ_ADDR, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_TAIL);</div><div class='del'>-	value32 = (value32 &amp; 0xFFFC0000) |</div><div class='del'>-		  ((halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy</div><div class='del'>-		    &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B) +</div><div class='del'>-		   (HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B</div><div class='del'>-		    &lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B));</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2C_TAIL, value32);</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_H2C_INFO);</div><div class='del'>-	value8 = (u8)((value8 &amp; 0xFC) | 0x01);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_H2C_INFO, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_H2C_INFO);</div><div class='del'>-	value8 = (u8)((value8 &amp; 0xFB) | 0x04);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_H2C_INFO, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_TXDMA_OFFSET_CHK + 1);</div><div class='del'>-	value8 = (u8)((value8 &amp; 0x7f) | 0x80);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXDMA_OFFSET_CHK + 1, value8);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;h2c_buff_size = HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B</div><div class='del'>-					&lt;&lt; HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-	halmac_get_h2c_buff_free_space_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;h2c_buff_size !=</div><div class='del'>-	    halmac_adapter-&gt;h2c_buf_free_space) {</div><div class='del'>-		pr_err("get h2c free space error!\n");</div><div class='del'>-		return HALMAC_RET_GET_H2C_SPACE_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"h2c free space : %d\n",</div><div class='del'>-			halmac_adapter-&gt;h2c_buf_free_space);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.h<br/>deleted file mode 100644<br/>index 072cd40fd339..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_8822B_H_</div><div class='del'>-#define _HALMAC_API_8822B_H_</div><div class='del'>-</div><div class='del'>-#include "../../halmac_2_platform.h"</div><div class='del'>-#include "../../halmac_type.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mount_api_8822b(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_trx_cfg_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_trx_mode halmac_trx_mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_protocol_cfg_8822b(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_h2c_8822b(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_8822B_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c<br/>deleted file mode 100644<br/>index a716fb532170..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,312 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "../halmac_88xx_cfg.h"</div><div class='del'>-#include "../halmac_api_88xx_pcie.h"</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mac_power_switch_8822b_pcie() - switch mac power</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_power : power state</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mac_power_switch_8822b_pcie(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_mac_power halmac_power)</div><div class='del'>-{</div><div class='del'>-	u8 interface_mask;</div><div class='del'>-	u8 value8;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_MAC_POWER_SWITCH);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-		"halmac_mac_power_switch_88xx_pcie halmac_power =  %x ==========&gt;\n",</div><div class='del'>-		halmac_power);</div><div class='del'>-	interface_mask = HALMAC_PWR_INTF_PCI_MSK;</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CR);</div><div class='del'>-	if (value8 == 0xEA)</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-	else</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_ON;</div><div class='del'>-</div><div class='del'>-	/* Check if power switch is needed */</div><div class='del'>-	if (halmac_power == HALMAC_MAC_POWER_ON &amp;&amp;</div><div class='del'>-	    halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_ON) {</div><div class='del'>-		HALMAC_RT_TRACE(</div><div class='del'>-			driver_adapter, HALMAC_MSG_PWR, DBG_WARNING,</div><div class='del'>-			"halmac_mac_power_switch power state unchange!\n");</div><div class='del'>-		return HALMAC_RET_PWR_UNCHANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_power == HALMAC_MAC_POWER_OFF) {</div><div class='del'>-		if (halmac_pwr_seq_parser_88xx(</div><div class='del'>-			    halmac_adapter, HALMAC_PWR_CUT_ALL_MSK,</div><div class='del'>-			    HALMAC_PWR_FAB_TSMC_MSK, interface_mask,</div><div class='del'>-			    halmac_8822b_card_disable_flow) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("Handle power off cmd error\n");</div><div class='del'>-			return HALMAC_RET_POWER_OFF_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.ps_state =</div><div class='del'>-			HALMAC_PS_STATE_UNDEFINE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.dlfw_state = HALMAC_DLFW_NONE;</div><div class='del'>-		halmac_init_adapter_dynamic_para_88xx(halmac_adapter);</div><div class='del'>-	} else {</div><div class='del'>-		if (halmac_pwr_seq_parser_88xx(</div><div class='del'>-			    halmac_adapter, HALMAC_PWR_CUT_ALL_MSK,</div><div class='del'>-			    HALMAC_PWR_FAB_TSMC_MSK, interface_mask,</div><div class='del'>-			    halmac_8822b_card_enable_flow) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("Handle power on cmd error\n");</div><div class='del'>-			return HALMAC_RET_POWER_ON_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_ON;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.ps_state = HALMAC_PS_STATE_ACT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_mac_power_switch_88xx_pcie &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_pcie_switch_8822b() - pcie gen1/gen2 switch</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @pcie_cfg : gen1/gen2 selection</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pcie_switch_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_pcie_cfg pcie_cfg)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u8 current_link_speed = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PCIE_SWITCH);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* Link Control 2 Register[3:0] Target Link Speed</div><div class='del'>-	 * Defined encodings are:</div><div class='del'>-	 * 0001b Target Link 2.5 GT/s</div><div class='del'>-	 * 0010b Target Link 5.0 GT/s</div><div class='del'>-	 * 0100b Target Link 8.0 GT/s</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (pcie_cfg == HALMAC_PCIE_GEN1) {</div><div class='del'>-		/* cfg 0xA0[3:0]=4'b0001 */</div><div class='del'>-		halmac_dbi_write8_88xx(</div><div class='del'>-			halmac_adapter, LINK_CTRL2_REG_OFFSET,</div><div class='del'>-			(halmac_dbi_read8_88xx(halmac_adapter,</div><div class='del'>-					       LINK_CTRL2_REG_OFFSET) &amp;</div><div class='del'>-			 0xF0) | BIT(0));</div><div class='del'>-</div><div class='del'>-		/* cfg 0x80C[17]=1 //PCIe DesignWave */</div><div class='del'>-		halmac_dbi_write32_88xx(</div><div class='del'>-			halmac_adapter, GEN2_CTRL_OFFSET,</div><div class='del'>-			halmac_dbi_read32_88xx(halmac_adapter,</div><div class='del'>-					       GEN2_CTRL_OFFSET) |</div><div class='del'>-				BIT(17));</div><div class='del'>-</div><div class='del'>-		/* check link speed if GEN1 */</div><div class='del'>-		/* cfg 0x82[3:0]=4'b0001 */</div><div class='del'>-		current_link_speed =</div><div class='del'>-			halmac_dbi_read8_88xx(halmac_adapter,</div><div class='del'>-					      LINK_STATUS_REG_OFFSET) &amp;</div><div class='del'>-			0x0F;</div><div class='del'>-		count = 2000;</div><div class='del'>-</div><div class='del'>-		while (current_link_speed != GEN1_SPEED &amp;&amp; count != 0) {</div><div class='del'>-			usleep_range(50, 60);</div><div class='del'>-			current_link_speed =</div><div class='del'>-				halmac_dbi_read8_88xx(halmac_adapter,</div><div class='del'>-						      LINK_STATUS_REG_OFFSET) &amp;</div><div class='del'>-				0x0F;</div><div class='del'>-			count--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (current_link_speed != GEN1_SPEED) {</div><div class='del'>-			pr_err("Speed change to GEN1 fail !\n");</div><div class='del'>-			return HALMAC_RET_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (pcie_cfg == HALMAC_PCIE_GEN2) {</div><div class='del'>-		/* cfg 0xA0[3:0]=4'b0010 */</div><div class='del'>-		halmac_dbi_write8_88xx(</div><div class='del'>-			halmac_adapter, LINK_CTRL2_REG_OFFSET,</div><div class='del'>-			(halmac_dbi_read8_88xx(halmac_adapter,</div><div class='del'>-					       LINK_CTRL2_REG_OFFSET) &amp;</div><div class='del'>-			 0xF0) | BIT(1));</div><div class='del'>-</div><div class='del'>-		/* cfg 0x80C[17]=1 //PCIe DesignWave */</div><div class='del'>-		halmac_dbi_write32_88xx(</div><div class='del'>-			halmac_adapter, GEN2_CTRL_OFFSET,</div><div class='del'>-			halmac_dbi_read32_88xx(halmac_adapter,</div><div class='del'>-					       GEN2_CTRL_OFFSET) |</div><div class='del'>-				BIT(17));</div><div class='del'>-</div><div class='del'>-		/* check link speed if GEN2 */</div><div class='del'>-		/* cfg 0x82[3:0]=4'b0010 */</div><div class='del'>-		current_link_speed =</div><div class='del'>-			halmac_dbi_read8_88xx(halmac_adapter,</div><div class='del'>-					      LINK_STATUS_REG_OFFSET) &amp;</div><div class='del'>-			0x0F;</div><div class='del'>-		count = 2000;</div><div class='del'>-</div><div class='del'>-		while (current_link_speed != GEN2_SPEED &amp;&amp; count != 0) {</div><div class='del'>-			usleep_range(50, 60);</div><div class='del'>-			current_link_speed =</div><div class='del'>-				halmac_dbi_read8_88xx(halmac_adapter,</div><div class='del'>-						      LINK_STATUS_REG_OFFSET) &amp;</div><div class='del'>-				0x0F;</div><div class='del'>-			count--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (current_link_speed != GEN2_SPEED) {</div><div class='del'>-			pr_err("Speed change to GEN1 fail !\n");</div><div class='del'>-			return HALMAC_RET_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("Error Speed !\n");</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pcie_switch_8822b_nc(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    enum halmac_pcie_cfg pcie_cfg)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PCIE_SWITCH);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_phy_cfg_8822b_pcie() - phy config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_phy_cfg_8822b_pcie(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_intf_phy_platform platform)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PHY_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_phy_cfg ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	status = halmac_parse_intf_phy_88xx(halmac_adapter,</div><div class='del'>-					    HALMAC_RTL8822B_PCIE_PHY_GEN1,</div><div class='del'>-					    platform, HAL_INTF_PHY_PCIE_GEN1);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	status = halmac_parse_intf_phy_88xx(halmac_adapter,</div><div class='del'>-					    HALMAC_RTL8822B_PCIE_PHY_GEN2,</div><div class='del'>-					    platform, HAL_INTF_PHY_PCIE_GEN2);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_phy_cfg &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_interface_integration_tuning_8822b_pcie() - pcie interface fine tuning</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : Rick Liu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_interface_integration_tuning_8822b_pcie(</div><div class='del'>-	struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.h<br/>deleted file mode 100644<br/>index b47c50863f06..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_8822B_PCIE_H_</div><div class='del'>-#define _HALMAC_API_8822B_PCIE_H_</div><div class='del'>-</div><div class='del'>-#include "../../halmac_2_platform.h"</div><div class='del'>-#include "../../halmac_type.h"</div><div class='del'>-</div><div class='del'>-extern struct halmac_intf_phy_para_ HALMAC_RTL8822B_PCIE_PHY_GEN1[];</div><div class='del'>-extern struct halmac_intf_phy_para_ HALMAC_RTL8822B_PCIE_PHY_GEN2[];</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mac_power_switch_8822b_pcie(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_mac_power halmac_power);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pcie_switch_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_pcie_cfg pcie_cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pcie_switch_8822b_nc(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    enum halmac_pcie_cfg pcie_cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_phy_cfg_8822b_pcie(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_intf_phy_platform platform);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_interface_integration_tuning_8822b_pcie(</div><div class='del'>-	struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_8822B_PCIE_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c<br/>deleted file mode 100644<br/>index a6b6d7fa2689..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mac_power_switch_8822b_sdio() - switch mac power</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_power : power state</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mac_power_switch_8822b_sdio(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_mac_power halmac_power)</div><div class='del'>-{</div><div class='del'>-	u8 interface_mask;</div><div class='del'>-	u8 value8;</div><div class='del'>-	u8 rpwm;</div><div class='del'>-	u32 imr_backup;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-		"[TRACE]halmac_mac_power_switch_88xx_sdio==========&gt;\n");</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"[TRACE]halmac_power = %x ==========&gt;\n", halmac_power);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"[TRACE]8822B pwr seq ver = %s\n",</div><div class='del'>-			HALMAC_8822B_PWR_SEQ_VER);</div><div class='del'>-</div><div class='del'>-	interface_mask = HALMAC_PWR_INTF_SDIO_MSK;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;rpwm_record =</div><div class='del'>-		HALMAC_REG_READ_8(halmac_adapter, REG_SDIO_HRPWM1);</div><div class='del'>-</div><div class='del'>-	/* Check FW still exist or not */</div><div class='del'>-	if (HALMAC_REG_READ_16(halmac_adapter, REG_MCUFW_CTRL) == 0xC078) {</div><div class='del'>-		/* Leave 32K */</div><div class='del'>-		rpwm = (u8)((halmac_adapter-&gt;rpwm_record ^ BIT(7)) &amp; 0x80);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SDIO_HRPWM1, rpwm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CR);</div><div class='del'>-	if (value8 == 0xEA)</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-	else</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_ON;</div><div class='del'>-</div><div class='del'>-	/*Check if power switch is needed*/</div><div class='del'>-	if (halmac_power == HALMAC_MAC_POWER_ON &amp;&amp;</div><div class='del'>-	    halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_ON) {</div><div class='del'>-		HALMAC_RT_TRACE(</div><div class='del'>-			driver_adapter, HALMAC_MSG_PWR, DBG_WARNING,</div><div class='del'>-			"[WARN]halmac_mac_power_switch power state unchange!\n");</div><div class='del'>-		return HALMAC_RET_PWR_UNCHANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imr_backup = HALMAC_REG_READ_32(halmac_adapter, REG_SDIO_HIMR);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_SDIO_HIMR, 0);</div><div class='del'>-</div><div class='del'>-	if (halmac_power == HALMAC_MAC_POWER_OFF) {</div><div class='del'>-		if (halmac_pwr_seq_parser_88xx(</div><div class='del'>-			    halmac_adapter, HALMAC_PWR_CUT_ALL_MSK,</div><div class='del'>-			    HALMAC_PWR_FAB_TSMC_MSK, interface_mask,</div><div class='del'>-			    halmac_8822b_card_disable_flow) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("[ERR]Handle power off cmd error\n");</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter, REG_SDIO_HIMR,</div><div class='del'>-					    imr_backup);</div><div class='del'>-			return HALMAC_RET_POWER_OFF_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.ps_state =</div><div class='del'>-			HALMAC_PS_STATE_UNDEFINE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.dlfw_state = HALMAC_DLFW_NONE;</div><div class='del'>-		halmac_init_adapter_dynamic_para_88xx(halmac_adapter);</div><div class='del'>-	} else {</div><div class='del'>-		if (halmac_pwr_seq_parser_88xx(</div><div class='del'>-			    halmac_adapter, HALMAC_PWR_CUT_ALL_MSK,</div><div class='del'>-			    HALMAC_PWR_FAB_TSMC_MSK, interface_mask,</div><div class='del'>-			    halmac_8822b_card_enable_flow) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("[ERR]Handle power on cmd error\n");</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter, REG_SDIO_HIMR,</div><div class='del'>-					    imr_backup);</div><div class='del'>-			return HALMAC_RET_POWER_ON_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_ON;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.ps_state = HALMAC_PS_STATE_ACT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_SDIO_HIMR, imr_backup);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-		"[TRACE]halmac_mac_power_switch_88xx_sdio &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_phy_cfg_8822b_sdio() - phy config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_phy_cfg_8822b_sdio(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_intf_phy_platform platform)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PHY_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_phy_cfg ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"sdio no phy\n");</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_phy_cfg &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_interface_integration_tuning_8822b_sdio() - sdio interface fine tuning</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : Ivan</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_interface_integration_tuning_8822b_sdio(</div><div class='del'>-	struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.h<br/>deleted file mode 100644<br/>index 75c83f7f031e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_8822B_SDIO_H_</div><div class='del'>-#define _HALMAC_API_8822B_SDIO_H_</div><div class='del'>-</div><div class='del'>-#include "../../halmac_2_platform.h"</div><div class='del'>-#include "../../halmac_type.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mac_power_switch_8822b_sdio(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_mac_power halmac_power);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_phy_cfg_8822b_sdio(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_intf_phy_platform platform);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_interface_integration_tuning_8822b_sdio(</div><div class='del'>-	struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_8822B_SDIO_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c<br/>deleted file mode 100644<br/>index 2eaf362ca8c3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,174 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "../halmac_88xx_cfg.h"</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mac_power_switch_8822b_usb() - switch mac power</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_power : power state</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mac_power_switch_8822b_usb(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  enum halmac_mac_power halmac_power)</div><div class='del'>-{</div><div class='del'>-	u8 interface_mask;</div><div class='del'>-	u8 value8;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_MAC_POWER_SWITCH);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-		"halmac_mac_power_switch_88xx_usb halmac_power = %x ==========&gt;\n",</div><div class='del'>-		halmac_power);</div><div class='del'>-</div><div class='del'>-	interface_mask = HALMAC_PWR_INTF_USB_MSK;</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CR);</div><div class='del'>-	if (value8 == 0xEA) {</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-	} else {</div><div class='del'>-		if (BIT(0) ==</div><div class='del'>-		    (HALMAC_REG_READ_8(halmac_adapter, REG_SYS_STATUS1 + 1) &amp;</div><div class='del'>-		     BIT(0)))</div><div class='del'>-			halmac_adapter-&gt;halmac_state.mac_power =</div><div class='del'>-				HALMAC_MAC_POWER_OFF;</div><div class='del'>-		else</div><div class='del'>-			halmac_adapter-&gt;halmac_state.mac_power =</div><div class='del'>-				HALMAC_MAC_POWER_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*Check if power switch is needed*/</div><div class='del'>-	if (halmac_power == HALMAC_MAC_POWER_ON &amp;&amp;</div><div class='del'>-	    halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_ON) {</div><div class='del'>-		HALMAC_RT_TRACE(</div><div class='del'>-			driver_adapter, HALMAC_MSG_PWR, DBG_WARNING,</div><div class='del'>-			"halmac_mac_power_switch power state unchange!\n");</div><div class='del'>-		return HALMAC_RET_PWR_UNCHANGE;</div><div class='del'>-	}</div><div class='del'>-	if (halmac_power == HALMAC_MAC_POWER_OFF) {</div><div class='del'>-		if (halmac_pwr_seq_parser_88xx(</div><div class='del'>-			    halmac_adapter, HALMAC_PWR_CUT_ALL_MSK,</div><div class='del'>-			    HALMAC_PWR_FAB_TSMC_MSK, interface_mask,</div><div class='del'>-			    halmac_8822b_card_disable_flow) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("Handle power off cmd error\n");</div><div class='del'>-			return HALMAC_RET_POWER_OFF_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.ps_state =</div><div class='del'>-			HALMAC_PS_STATE_UNDEFINE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.dlfw_state = HALMAC_DLFW_NONE;</div><div class='del'>-		halmac_init_adapter_dynamic_para_88xx(halmac_adapter);</div><div class='del'>-	} else {</div><div class='del'>-		if (halmac_pwr_seq_parser_88xx(</div><div class='del'>-			    halmac_adapter, HALMAC_PWR_CUT_ALL_MSK,</div><div class='del'>-			    HALMAC_PWR_FAB_TSMC_MSK, interface_mask,</div><div class='del'>-			    halmac_8822b_card_enable_flow) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("Handle power on cmd error\n");</div><div class='del'>-			return HALMAC_RET_POWER_ON_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_SYS_STATUS1 + 1,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_SYS_STATUS1 + 1) &amp;</div><div class='del'>-				~(BIT(0)));</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.mac_power = HALMAC_MAC_POWER_ON;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.ps_state = HALMAC_PS_STATE_ACT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_mac_power_switch_88xx_usb &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_phy_cfg_8822b_usb() - phy config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_phy_cfg_8822b_usb(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_intf_phy_platform platform)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PHY_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_phy_cfg ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	status = halmac_parse_intf_phy_88xx(halmac_adapter,</div><div class='del'>-					    HALMAC_RTL8822B_USB2_PHY, platform,</div><div class='del'>-					    HAL_INTF_PHY_USB2);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	status = halmac_parse_intf_phy_88xx(halmac_adapter,</div><div class='del'>-					    HALMAC_RTL8822B_USB3_PHY, platform,</div><div class='del'>-					    HAL_INTF_PHY_USB3);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"halmac_phy_cfg &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_interface_integration_tuning_8822b_usb() - usb interface fine tuning</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : Ivan</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_interface_integration_tuning_8822b_usb(</div><div class='del'>-	struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.h<br/>deleted file mode 100644<br/>index 8ba7bee0a99b..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_8822B_USB_H_</div><div class='del'>-#define _HALMAC_API_8822B_USB_H_</div><div class='del'>-</div><div class='del'>-extern struct halmac_intf_phy_para_ HALMAC_RTL8822B_USB2_PHY[];</div><div class='del'>-extern struct halmac_intf_phy_para_ HALMAC_RTL8822B_USB3_PHY[];</div><div class='del'>-</div><div class='del'>-#include "../../halmac_2_platform.h"</div><div class='del'>-#include "../../halmac_type.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mac_power_switch_8822b_usb(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  enum halmac_mac_power halmac_power);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_phy_cfg_8822b_usb(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_intf_phy_platform platform);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_interface_integration_tuning_8822b_usb(</div><div class='del'>-	struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_8822B_USB_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c<br/>deleted file mode 100644<br/>index bcc402838bc0..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,403 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_8822b_cfg.h"</div><div class='del'>-#include "halmac_func_8822b.h"</div><div class='del'>-</div><div class='del'>-/*SDIO RQPN Mapping*/</div><div class='del'>-static struct halmac_rqpn_ HALMAC_RQPN_SDIO_8822B[] = {</div><div class='del'>-	/* { mode, vo_map, vi_map, be_map, bk_map, mg_map, hi_map } */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, HALMAC_MAP2_HQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*PCIE RQPN Mapping*/</div><div class='del'>-static struct halmac_rqpn_ HALMAC_RQPN_PCIE_8822B[] = {</div><div class='del'>-	/* { mode, vo_map, vi_map, be_map, bk_map, mg_map, hi_map } */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, HALMAC_MAP2_HQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*USB 2 Bulkout RQPN Mapping*/</div><div class='del'>-static struct halmac_rqpn_ HALMAC_RQPN_2BULKOUT_8822B[] = {</div><div class='del'>-	/* { mode, vo_map, vi_map, be_map, bk_map, mg_map, hi_map } */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_HQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_HQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ,</div><div class='del'>-	 HALMAC_MAP2_HQ, HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ,</div><div class='del'>-	 HALMAC_MAP2_HQ, HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*USB 3 Bulkout RQPN Mapping*/</div><div class='del'>-static struct halmac_rqpn_ HALMAC_RQPN_3BULKOUT_8822B[] = {</div><div class='del'>-	/* { mode, vo_map, vi_map, be_map, bk_map, mg_map, hi_map } */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, HALMAC_MAP2_HQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_NQ, HALMAC_MAP2_HQ, HALMAC_MAP2_HQ},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*USB 4 Bulkout RQPN Mapping*/</div><div class='del'>-static struct halmac_rqpn_ HALMAC_RQPN_4BULKOUT_8822B[] = {</div><div class='del'>-	/* { mode, vo_map, vi_map, be_map, bk_map, mg_map, hi_map } */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, HALMAC_MAP2_HQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_NQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ, HALMAC_MAP2_LQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, HALMAC_MAP2_NQ, HALMAC_MAP2_NQ,</div><div class='del'>-	 HALMAC_MAP2_LQ, HALMAC_MAP2_LQ, HALMAC_MAP2_EXQ, HALMAC_MAP2_HQ},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*SDIO Page Number*/</div><div class='del'>-static struct halmac_pg_num_ HALMAC_PG_NUM_SDIO_8822B[] = {</div><div class='del'>-	/* { mode, hq_num, nq_num, lq_num, exq_num, gap_num} */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, 32, 32, 32, 32, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, 64, 64, 64, 64, 640},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, 64, 64, 64, 64, 640},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*PCIE Page Number*/</div><div class='del'>-static struct halmac_pg_num_ HALMAC_PG_NUM_PCIE_8822B[] = {</div><div class='del'>-	/* { mode, hq_num, nq_num, lq_num, exq_num, gap_num} */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, 64, 64, 64, 64, 640},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, 64, 64, 64, 64, 640},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*USB 2 Bulkout Page Number*/</div><div class='del'>-static struct halmac_pg_num_ HALMAC_PG_NUM_2BULKOUT_8822B[] = {</div><div class='del'>-	/* { mode, hq_num, nq_num, lq_num, exq_num, gap_num} */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, 64, 64, 0, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, 64, 64, 0, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, 64, 64, 0, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, 64, 64, 0, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, 64, 64, 0, 0, 1024},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, 64, 64, 0, 0, 1024},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*USB 3 Bulkout Page Number*/</div><div class='del'>-static struct halmac_pg_num_ HALMAC_PG_NUM_3BULKOUT_8822B[] = {</div><div class='del'>-	/* { mode, hq_num, nq_num, lq_num, exq_num, gap_num} */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, 64, 64, 64, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, 64, 64, 64, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, 64, 64, 64, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, 64, 64, 64, 0, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, 64, 64, 64, 0, 1024},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, 64, 64, 64, 0, 1024},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*USB 4 Bulkout Page Number*/</div><div class='del'>-static struct halmac_pg_num_ HALMAC_PG_NUM_4BULKOUT_8822B[] = {</div><div class='del'>-	/* { mode, hq_num, nq_num, lq_num, exq_num, gap_num} */</div><div class='del'>-	{HALMAC_TRX_MODE_NORMAL, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_TRXSHARE, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_WMM, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_P2P, 64, 64, 64, 64, 1},</div><div class='del'>-	{HALMAC_TRX_MODE_LOOPBACK, 64, 64, 64, 64, 640},</div><div class='del'>-	{HALMAC_TRX_MODE_DELAY_LOOPBACK, 64, 64, 64, 64, 640},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_txdma_queue_mapping_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 enum halmac_trx_mode halmac_trx_mode)</div><div class='del'>-{</div><div class='del'>-	u16 value16;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_rqpn_ *curr_rqpn_sel = NULL;</div><div class='del'>-	enum halmac_ret_status status;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		curr_rqpn_sel = HALMAC_RQPN_SDIO_8822B;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_PCIE) {</div><div class='del'>-		curr_rqpn_sel = HALMAC_RQPN_PCIE_8822B;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		if (halmac_adapter-&gt;halmac_bulkout_num == 2) {</div><div class='del'>-			curr_rqpn_sel = HALMAC_RQPN_2BULKOUT_8822B;</div><div class='del'>-		} else if (halmac_adapter-&gt;halmac_bulkout_num == 3) {</div><div class='del'>-			curr_rqpn_sel = HALMAC_RQPN_3BULKOUT_8822B;</div><div class='del'>-		} else if (halmac_adapter-&gt;halmac_bulkout_num == 4) {</div><div class='del'>-			curr_rqpn_sel = HALMAC_RQPN_4BULKOUT_8822B;</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("[ERR]interface not support\n");</div><div class='del'>-			return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_rqpn_parser_88xx(halmac_adapter, halmac_trx_mode,</div><div class='del'>-					 curr_rqpn_sel);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	value16 = 0;</div><div class='del'>-	value16 |= BIT_TXDMA_HIQ_MAP(</div><div class='del'>-		halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_HI]);</div><div class='del'>-	value16 |= BIT_TXDMA_MGQ_MAP(</div><div class='del'>-		halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_MG]);</div><div class='del'>-	value16 |= BIT_TXDMA_BKQ_MAP(</div><div class='del'>-		halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BK]);</div><div class='del'>-	value16 |= BIT_TXDMA_BEQ_MAP(</div><div class='del'>-		halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BE]);</div><div class='del'>-	value16 |= BIT_TXDMA_VIQ_MAP(</div><div class='del'>-		halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VI]);</div><div class='del'>-	value16 |= BIT_TXDMA_VOQ_MAP(</div><div class='del'>-		halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VO]);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_TXDMA_PQ_MAP, value16);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_priority_queue_config_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_trx_mode halmac_trx_mode)</div><div class='del'>-{</div><div class='del'>-	u8 transfer_mode = 0;</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 counter;</div><div class='del'>-	enum halmac_ret_status status;</div><div class='del'>-	struct halmac_pg_num_ *curr_pg_num = NULL;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;txff_allocation.la_mode == HALMAC_LA_MODE_DISABLE) {</div><div class='del'>-		if (halmac_adapter-&gt;txff_allocation.rx_fifo_expanding_mode ==</div><div class='del'>-		    HALMAC_RX_FIFO_EXPANDING_MODE_DISABLE) {</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num =</div><div class='del'>-				HALMAC_TX_FIFO_SIZE_8822B &gt;&gt;</div><div class='del'>-				HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-		} else if (halmac_adapter-&gt;txff_allocation</div><div class='del'>-				   .rx_fifo_expanding_mode ==</div><div class='del'>-			   HALMAC_RX_FIFO_EXPANDING_MODE_1_BLOCK) {</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num =</div><div class='del'>-				HALMAC_TX_FIFO_SIZE_EX_1_BLK_8822B &gt;&gt;</div><div class='del'>-				HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-			halmac_adapter-&gt;hw_config_info.tx_fifo_size =</div><div class='del'>-				HALMAC_TX_FIFO_SIZE_EX_1_BLK_8822B;</div><div class='del'>-			if (HALMAC_RX_FIFO_SIZE_EX_1_BLK_8822B &lt;=</div><div class='del'>-			    HALMAC_RX_FIFO_SIZE_EX_1_BLK_MAX_8822B)</div><div class='del'>-				halmac_adapter-&gt;hw_config_info.rx_fifo_size =</div><div class='del'>-					HALMAC_RX_FIFO_SIZE_EX_1_BLK_8822B;</div><div class='del'>-			else</div><div class='del'>-				halmac_adapter-&gt;hw_config_info.rx_fifo_size =</div><div class='del'>-					HALMAC_RX_FIFO_SIZE_EX_1_BLK_MAX_8822B;</div><div class='del'>-		} else {</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num =</div><div class='del'>-				HALMAC_TX_FIFO_SIZE_8822B &gt;&gt;</div><div class='del'>-				HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-			pr_err("[ERR]rx_fifo_expanding_mode = %d not support\n",</div><div class='del'>-			       halmac_adapter-&gt;txff_allocation</div><div class='del'>-				       .rx_fifo_expanding_mode);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num =</div><div class='del'>-			HALMAC_TX_FIFO_SIZE_LA_8822B &gt;&gt;</div><div class='del'>-			HALMAC_TX_PAGE_SIZE_2_POWER_8822B;</div><div class='del'>-	}</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_pg_num =</div><div class='del'>-		(halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num +</div><div class='del'>-		 HALMAC_RSVD_H2C_EXTRAINFO_PGNUM_8822B +</div><div class='del'>-		 HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B +</div><div class='del'>-		 HALMAC_RSVD_CPU_INSTRUCTION_PGNUM_8822B +</div><div class='del'>-		 HALMAC_RSVD_FW_TXBUFF_PGNUM_8822B);</div><div class='del'>-	if (halmac_adapter-&gt;txff_allocation.rsvd_pg_num &gt;</div><div class='del'>-	    halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num)</div><div class='del'>-		return HALMAC_RET_CFG_TXFIFO_PAGE_FAIL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.ac_q_pg_num =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num -</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_pg_num;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num -</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_pg_num;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_fw_txbuff_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num -</div><div class='del'>-		HALMAC_RSVD_FW_TXBUFF_PGNUM_8822B;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_cpu_instr_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_fw_txbuff_pg_bndy -</div><div class='del'>-		HALMAC_RSVD_CPU_INSTRUCTION_PGNUM_8822B;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_cpu_instr_pg_bndy -</div><div class='del'>-		HALMAC_RSVD_H2C_QUEUE_PGNUM_8822B;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_h2c_extra_info_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy -</div><div class='del'>-		HALMAC_RSVD_H2C_EXTRAINFO_PGNUM_8822B;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_h2c_extra_info_pg_bndy -</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		curr_pg_num = HALMAC_PG_NUM_SDIO_8822B;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_PCIE) {</div><div class='del'>-		curr_pg_num = HALMAC_PG_NUM_PCIE_8822B;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		if (halmac_adapter-&gt;halmac_bulkout_num == 2) {</div><div class='del'>-			curr_pg_num = HALMAC_PG_NUM_2BULKOUT_8822B;</div><div class='del'>-		} else if (halmac_adapter-&gt;halmac_bulkout_num == 3) {</div><div class='del'>-			curr_pg_num = HALMAC_PG_NUM_3BULKOUT_8822B;</div><div class='del'>-		} else if (halmac_adapter-&gt;halmac_bulkout_num == 4) {</div><div class='del'>-			curr_pg_num = HALMAC_PG_NUM_4BULKOUT_8822B;</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("[ERR]interface not support\n");</div><div class='del'>-			return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_pg_num_parser_88xx(halmac_adapter, halmac_trx_mode,</div><div class='del'>-					   curr_pg_num);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_INFO_1,</div><div class='del'>-			    halmac_adapter-&gt;txff_allocation.high_queue_pg_num);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_INFO_2,</div><div class='del'>-			    halmac_adapter-&gt;txff_allocation.low_queue_pg_num);</div><div class='del'>-	HALMAC_REG_WRITE_16(</div><div class='del'>-		halmac_adapter, REG_FIFOPAGE_INFO_3,</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.normal_queue_pg_num);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_INFO_4,</div><div class='del'>-			    halmac_adapter-&gt;txff_allocation.extra_queue_pg_num);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_INFO_5,</div><div class='del'>-			    halmac_adapter-&gt;txff_allocation.pub_queue_pg_num);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;sdio_free_space.high_queue_number =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.high_queue_pg_num;</div><div class='del'>-	halmac_adapter-&gt;sdio_free_space.normal_queue_number =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.normal_queue_pg_num;</div><div class='del'>-	halmac_adapter-&gt;sdio_free_space.low_queue_number =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.low_queue_pg_num;</div><div class='del'>-	halmac_adapter-&gt;sdio_free_space.public_queue_number =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.pub_queue_pg_num;</div><div class='del'>-	halmac_adapter-&gt;sdio_free_space.extra_queue_number =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.extra_queue_pg_num;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(</div><div class='del'>-		halmac_adapter, REG_RQPN_CTRL_2,</div><div class='del'>-		HALMAC_REG_READ_32(halmac_adapter, REG_RQPN_CTRL_2) | BIT(31));</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_BCNQ_BDNY_V1,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCNQ_PGBNDY_V1));</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2 + 2,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_BCNQ1_BDNY_V1,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCNQ_PGBNDY_V1));</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_RXFF_BNDY,</div><div class='del'>-			    halmac_adapter-&gt;hw_config_info.rx_fifo_size -</div><div class='del'>-				    HALMAC_C2H_PKT_BUF_8822B - 1);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		value8 = (u8)(</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_AUTO_LLT_V1) &amp;</div><div class='del'>-			~(BIT_MASK_BLK_DESC_NUM &lt;&lt; BIT_SHIFT_BLK_DESC_NUM));</div><div class='del'>-		value8 = (u8)(value8 | (HALMAC_BLK_DESC_NUM_8822B</div><div class='del'>-					&lt;&lt; BIT_SHIFT_BLK_DESC_NUM));</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_AUTO_LLT_V1, value8);</div><div class='del'>-</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_AUTO_LLT_V1 + 3,</div><div class='del'>-				   HALMAC_BLK_DESC_NUM_8822B);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_TXDMA_OFFSET_CHK + 1,</div><div class='del'>-				   HALMAC_REG_READ_8(halmac_adapter,</div><div class='del'>-						     REG_TXDMA_OFFSET_CHK + 1) |</div><div class='del'>-					   BIT(1));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_AUTO_LLT_V1,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_AUTO_LLT_V1) |</div><div class='del'>-		     BIT_AUTO_INIT_LLT_V1));</div><div class='del'>-	counter = 1000;</div><div class='del'>-	while (HALMAC_REG_READ_8(halmac_adapter, REG_AUTO_LLT_V1) &amp;</div><div class='del'>-	       BIT_AUTO_INIT_LLT_V1) {</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0)</div><div class='del'>-			return HALMAC_RET_INIT_LLT_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_trx_mode == HALMAC_TRX_MODE_DELAY_LOOPBACK) {</div><div class='del'>-		transfer_mode = HALMAC_TRNSFER_LOOPBACK_DELAY;</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_WMAC_LBK_BUF_HD_V1,</div><div class='del'>-			(u16)halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy);</div><div class='del'>-	} else if (halmac_trx_mode == HALMAC_TRX_MODE_LOOPBACK) {</div><div class='del'>-		transfer_mode = HALMAC_TRNSFER_LOOPBACK_DIRECT;</div><div class='del'>-	} else {</div><div class='del'>-		transfer_mode = HALMAC_TRNSFER_NORMAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR + 3, (u8)transfer_mode);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.h<br/>deleted file mode 100644<br/>index 8488fc5f98ee..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_FUNC_8822B_H_</div><div class='del'>-#define _HALMAC_FUNC_8822B_H_</div><div class='del'>-</div><div class='del'>-#include "../../halmac_type.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_txdma_queue_mapping_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 enum halmac_trx_mode halmac_trx_mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_priority_queue_config_8822b(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_trx_mode halmac_trx_mode);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_FUNC_8822B_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h<br/>deleted file mode 100644<br/>index ec9b10277450..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,160 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_88XX_CFG_H_</div><div class='del'>-#define _HALMAC_88XX_CFG_H_</div><div class='del'>-</div><div class='del'>-#include "../halmac_2_platform.h"</div><div class='del'>-#include "../halmac_type.h"</div><div class='del'>-#include "../halmac_api.h"</div><div class='del'>-#include "../halmac_bit2.h"</div><div class='del'>-#include "../halmac_reg2.h"</div><div class='del'>-#include "../halmac_pwr_seq_cmd.h"</div><div class='del'>-#include "halmac_func_88xx.h"</div><div class='del'>-#include "halmac_api_88xx.h"</div><div class='del'>-#include "halmac_api_88xx_usb.h"</div><div class='del'>-#include "halmac_api_88xx_pcie.h"</div><div class='del'>-#include "halmac_api_88xx_sdio.h"</div><div class='del'>-</div><div class='del'>-#define HALMAC_SVN_VER_88XX "13359M"</div><div class='del'>-</div><div class='del'>-#define HALMAC_MAJOR_VER_88XX 0x0001 /* major version, ver_1 for async_api */</div><div class='del'>-/* For halmac_api num change or prototype change, increment prototype version.</div><div class='del'>- * Otherwise, increase minor version</div><div class='del'>- */</div><div class='del'>-#define HALMAC_PROTOTYPE_VER_88XX 0x0003 /* prototype version */</div><div class='del'>-#define HALMAC_MINOR_VER_88XX 0x0005 /* minor version */</div><div class='del'>-#define HALMAC_PATCH_VER_88XX 0x0000 /* patch version */</div><div class='del'>-</div><div class='del'>-#define HALMAC_C2H_DATA_OFFSET_88XX 10</div><div class='del'>-#define HALMAC_RX_AGG_ALIGNMENT_SIZE_88XX 8</div><div class='del'>-#define HALMAC_TX_AGG_ALIGNMENT_SIZE_88XX 8</div><div class='del'>-#define HALMAC_TX_AGG_BUFF_SIZE_88XX 32768</div><div class='del'>-</div><div class='del'>-#define HALMAC_EXTRA_INFO_BUFF_SIZE_88XX 4096 /*4K*/</div><div class='del'>-#define HALMAC_EXTRA_INFO_BUFF_SIZE_FULL_FIFO_88XX 16384 /*16K*/</div><div class='del'>-#define HALMAC_FW_OFFLOAD_CMD_SIZE_88XX                                        \</div><div class='del'>-	12 /*Fw config parameter cmd size, each 12 byte*/</div><div class='del'>-</div><div class='del'>-#define HALMAC_H2C_CMD_ORIGINAL_SIZE_88XX 8</div><div class='del'>-#define HALMAC_H2C_CMD_SIZE_UNIT_88XX 32 /* Only support 32 byte packet now */</div><div class='del'>-</div><div class='del'>-#define HALMAC_NLO_INFO_SIZE_88XX 1024</div><div class='del'>-</div><div class='del'>-/* Download FW */</div><div class='del'>-#define HALMAC_FW_SIZE_MAX_88XX 0x40000</div><div class='del'>-#define HALMAC_FWHDR_SIZE_88XX 64</div><div class='del'>-#define HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX 8</div><div class='del'>-#define HALMAC_FW_MAX_DL_SIZE_88XX 0x2000 /* need power of 2 */</div><div class='del'>-/* Max dlfw size can not over 31K, because SDIO HW restriction */</div><div class='del'>-#define HALMAC_FW_CFG_MAX_DL_SIZE_MAX_88XX 0x7C00</div><div class='del'>-</div><div class='del'>-#define DLFW_RESTORE_REG_NUM_88XX 9</div><div class='del'>-#define ID_INFORM_DLEMEM_RDY 0x80</div><div class='del'>-</div><div class='del'>-/* FW header information */</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_VERSION_88XX 4</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_SUBVERSION_88XX 6</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_SUBINDEX_88XX 7</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_MEM_USAGE_88XX 24</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_H2C_FORMAT_VER_88XX 28</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_DMEM_ADDR_88XX 32</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_DMEM_SIZE_88XX 36</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_IRAM_SIZE_88XX 48</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_ERAM_SIZE_88XX 52</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_EMEM_ADDR_88XX 56</div><div class='del'>-#define HALMAC_FWHDR_OFFSET_IRAM_ADDR_88XX 60</div><div class='del'>-</div><div class='del'>-/* HW memory address */</div><div class='del'>-#define HALMAC_OCPBASE_TXBUF_88XX 0x18780000</div><div class='del'>-#define HALMAC_OCPBASE_DMEM_88XX 0x00200000</div><div class='del'>-#define HALMAC_OCPBASE_IMEM_88XX 0x00000000</div><div class='del'>-</div><div class='del'>-/* define the SDIO Bus CLK threshold, for avoiding CMD53 fails that</div><div class='del'>- * result from SDIO CLK sync to ana_clk fail</div><div class='del'>- */</div><div class='del'>-#define HALMAC_SD_CLK_THRESHOLD_88XX 150000000 /* 150MHz */</div><div class='del'>-</div><div class='del'>-/* MAC clock */</div><div class='del'>-#define HALMAC_MAC_CLOCK_88XX 80 /* 80M */</div><div class='del'>-</div><div class='del'>-/* H2C/C2H*/</div><div class='del'>-#define HALMAC_H2C_CMD_SIZE_88XX 32</div><div class='del'>-#define HALMAC_H2C_CMD_HDR_SIZE_88XX 8</div><div class='del'>-</div><div class='del'>-#define HALMAC_PROTECTED_EFUSE_SIZE_88XX 0x60</div><div class='del'>-</div><div class='del'>-/* Function enable */</div><div class='del'>-#define HALMAC_FUNCTION_ENABLE_88XX 0xDC</div><div class='del'>-</div><div class='del'>-/* FIFO size &amp; packet size */</div><div class='del'>-/* #define HALMAC_WOWLAN_PATTERN_SIZE	256 */</div><div class='del'>-</div><div class='del'>-/* CFEND rate */</div><div class='del'>-#define HALMAC_BASIC_CFEND_RATE_88XX 0x5</div><div class='del'>-#define HALMAC_STBC_CFEND_RATE_88XX 0xF</div><div class='del'>-</div><div class='del'>-/* Response rate */</div><div class='del'>-#define HALMAC_RESPONSE_RATE_BITMAP_ALL_88XX 0xFFFFF</div><div class='del'>-#define HALMAC_RESPONSE_RATE_88XX HALMAC_RESPONSE_RATE_BITMAP_ALL_88XX</div><div class='del'>-</div><div class='del'>-/* Spec SIFS */</div><div class='del'>-#define HALMAC_SIFS_CCK_PTCL_88XX 16</div><div class='del'>-#define HALMAC_SIFS_OFDM_PTCL_88XX 16</div><div class='del'>-</div><div class='del'>-/* Retry limit */</div><div class='del'>-#define HALMAC_LONG_RETRY_LIMIT_88XX 8</div><div class='del'>-#define HALMAC_SHORT_RETRY_LIMIT_88XX 7</div><div class='del'>-</div><div class='del'>-/* Slot, SIFS, PIFS time */</div><div class='del'>-#define HALMAC_SLOT_TIME_88XX 0x05</div><div class='del'>-#define HALMAC_PIFS_TIME_88XX 0x19</div><div class='del'>-#define HALMAC_SIFS_CCK_CTX_88XX 0xA</div><div class='del'>-#define HALMAC_SIFS_OFDM_CTX_88XX 0xA</div><div class='del'>-#define HALMAC_SIFS_CCK_TRX_88XX 0x10</div><div class='del'>-#define HALMAC_SIFS_OFDM_TRX_88XX 0x10</div><div class='del'>-</div><div class='del'>-/* TXOP limit */</div><div class='del'>-#define HALMAC_VO_TXOP_LIMIT_88XX 0x186</div><div class='del'>-#define HALMAC_VI_TXOP_LIMIT_88XX 0x3BC</div><div class='del'>-</div><div class='del'>-/* NAV */</div><div class='del'>-#define HALMAC_RDG_NAV_88XX 0x05</div><div class='del'>-#define HALMAC_TXOP_NAV_88XX 0x1B</div><div class='del'>-</div><div class='del'>-/* TSF */</div><div class='del'>-#define HALMAC_CCK_RX_TSF_88XX 0x30</div><div class='del'>-#define HALMAC_OFDM_RX_TSF_88XX 0x30</div><div class='del'>-</div><div class='del'>-/* Send beacon related */</div><div class='del'>-#define HALMAC_TBTT_PROHIBIT_88XX 0x04</div><div class='del'>-#define HALMAC_TBTT_HOLD_TIME_88XX 0x064</div><div class='del'>-#define HALMAC_DRIVER_EARLY_INT_88XX 0x04</div><div class='del'>-#define HALMAC_BEACON_DMA_TIM_88XX 0x02</div><div class='del'>-</div><div class='del'>-/* RX filter */</div><div class='del'>-#define HALMAC_RX_FILTER0_RECIVE_ALL_88XX 0xFFFFFFF</div><div class='del'>-#define HALMAC_RX_FILTER0_88XX HALMAC_RX_FILTER0_RECIVE_ALL_88XX</div><div class='del'>-#define HALMAC_RX_FILTER_RECIVE_ALL_88XX 0xFFFF</div><div class='del'>-#define HALMAC_RX_FILTER_88XX HALMAC_RX_FILTER_RECIVE_ALL_88XX</div><div class='del'>-</div><div class='del'>-/* RCR */</div><div class='del'>-#define HALMAC_RCR_CONFIG_88XX 0xE400631E</div><div class='del'>-</div><div class='del'>-/* Security config */</div><div class='del'>-#define HALMAC_SECURITY_CONFIG_88XX 0x01CC</div><div class='del'>-</div><div class='del'>-/* CCK rate ACK timeout */</div><div class='del'>-#define HALMAC_ACK_TO_CCK_88XX 0x40</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c<br/>deleted file mode 100644<br/>index acd7930e417d..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5970 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_adapter_para_88xx() - int halmac adapter</div><div class='del'>- * @halmac_adapter</div><div class='del'>- *</div><div class='del'>- * SD1 internal use</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : void</div><div class='del'>- */</div><div class='del'>-void halmac_init_adapter_para_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	halmac_adapter-&gt;api_record.array_wptr = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_adapter_backup = halmac_adapter;</div><div class='del'>-	halmac_adapter-&gt;hal_efuse_map = (u8 *)NULL;</div><div class='del'>-	halmac_adapter-&gt;hal_efuse_map_valid = false;</div><div class='del'>-	halmac_adapter-&gt;efuse_end = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_mac_addr[0].address_l_h.address_low = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_mac_addr[0].address_l_h.address_high = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_mac_addr[1].address_l_h.address_low = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_mac_addr[1].address_l_h.address_high = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_bss_addr[0].address_l_h.address_low = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_bss_addr[0].address_l_h.address_high = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_bss_addr[1].address_l_h.address_low = 0;</div><div class='del'>-	halmac_adapter-&gt;hal_bss_addr[1].address_l_h.address_high = 0;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;low_clk = false;</div><div class='del'>-	halmac_adapter-&gt;max_download_size = HALMAC_FW_MAX_DL_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	/* Init LPS Option */</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.mode = 0x01; /*0:Active 1:LPS 2:WMMPS*/</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.awake_interval = 1;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.enter_32K = 1;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.clk_request = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.rlbm = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.smart_ps = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.awake_interval = 1;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.all_queue_uapsd = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.pwr_state = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.low_pwr_rx_beacon = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.ant_auto_switch = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.ps_allow_bt_high_priority = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.protect_bcn = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.silence_period = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.fast_bt_connect = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.two_antenna_en = 0;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.adopt_user_setting = 1;</div><div class='del'>-	halmac_adapter-&gt;fwlps_option.drv_bcn_early_shift = 0;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;config_para_info.cfg_para_buf = NULL;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.para_buf_w = NULL;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.para_num = 0;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.full_fifo_mode = false;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.para_buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.avai_para_buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.offset_accumulation = 0;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.value_accumulation = 0;</div><div class='del'>-	halmac_adapter-&gt;config_para_info.datapack_segment = 0;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_info_buf = NULL;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_info_buf_w = NULL;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.extra_info_en = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.avai_buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.total_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_num = 0;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;drv_info_size = 0;</div><div class='del'>-</div><div class='del'>-	memset(halmac_adapter-&gt;api_record.api_array, HALMAC_API_STUFF,</div><div class='del'>-	       sizeof(halmac_adapter-&gt;api_record.api_array));</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.tx_fifo_pg_num = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.ac_q_pg_num = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_bndy = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_h2c_extra_info_pg_bndy = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_h2c_queue_pg_bndy = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_cpu_instr_pg_bndy = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rsvd_fw_txbuff_pg_bndy = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.pub_queue_pg_num = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.high_queue_pg_num = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.low_queue_pg_num = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.normal_queue_pg_num = 0;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.extra_queue_pg_num = 0;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.la_mode = HALMAC_LA_MODE_DISABLE;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rx_fifo_expanding_mode =</div><div class='del'>-		HALMAC_RX_FIFO_EXPANDING_MODE_DISABLE;</div><div class='del'>-</div><div class='del'>-	halmac_init_adapter_dynamic_para_88xx(halmac_adapter);</div><div class='del'>-	halmac_init_state_machine_88xx(halmac_adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_adapter_dynamic_para_88xx() - int halmac adapter</div><div class='del'>- * @halmac_adapter</div><div class='del'>- *</div><div class='del'>- * SD1 internal use</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : void</div><div class='del'>- */</div><div class='del'>-void halmac_init_adapter_dynamic_para_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	halmac_adapter-&gt;h2c_packet_seq = 0;</div><div class='del'>-	halmac_adapter-&gt;h2c_buf_free_space = 0;</div><div class='del'>-	halmac_adapter-&gt;gen_info_valid = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_state_machine_88xx() - init halmac software state machine</div><div class='del'>- * @halmac_adapter</div><div class='del'>- *</div><div class='del'>- * SD1 internal use.</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : void</div><div class='del'>- */</div><div class='del'>-void halmac_init_state_machine_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	struct halmac_state *state = &amp;halmac_adapter-&gt;halmac_state;</div><div class='del'>-</div><div class='del'>-	halmac_init_offload_feature_state_machine_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	state-&gt;api_state = HALMAC_API_STATE_INIT;</div><div class='del'>-</div><div class='del'>-	state-&gt;dlfw_state = HALMAC_DLFW_NONE;</div><div class='del'>-	state-&gt;mac_power = HALMAC_MAC_POWER_OFF;</div><div class='del'>-	state-&gt;ps_state = HALMAC_PS_STATE_UNDEFINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mount_api_88xx() - attach functions to function pointer</div><div class='del'>- * @halmac_adapter</div><div class='del'>- *</div><div class='del'>- * SD1 internal use</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mount_api_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	struct halmac_api *halmac_api = (struct halmac_api *)NULL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_api =</div><div class='del'>-		kzalloc(sizeof(struct halmac_api), GFP_KERNEL);</div><div class='del'>-	if (!halmac_adapter-&gt;halmac_api)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			HALMAC_SVN_VER_88XX "\n");</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_MAJOR_VER_88XX = %x\n", HALMAC_MAJOR_VER_88XX);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_PROTOTYPE_88XX = %x\n",</div><div class='del'>-			HALMAC_PROTOTYPE_VER_88XX);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_MINOR_VER_88XX = %x\n", HALMAC_MINOR_VER_88XX);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_PATCH_VER_88XX = %x\n", HALMAC_PATCH_VER_88XX);</div><div class='del'>-</div><div class='del'>-	/* Mount function pointer */</div><div class='del'>-	halmac_api-&gt;halmac_download_firmware = halmac_download_firmware_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_free_download_firmware =</div><div class='del'>-		halmac_free_download_firmware_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_fw_version = halmac_get_fw_version_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_mac_addr = halmac_cfg_mac_addr_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_bssid = halmac_cfg_bssid_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_multicast_addr = halmac_cfg_multicast_addr_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_pre_init_system_cfg =</div><div class='del'>-		halmac_pre_init_system_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_system_cfg = halmac_init_system_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_edca_cfg = halmac_init_edca_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_operation_mode = halmac_cfg_operation_mode_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_ch_bw = halmac_cfg_ch_bw_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_bw = halmac_cfg_bw_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_wmac_cfg = halmac_init_wmac_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_mac_cfg = halmac_init_mac_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_sdio_cfg = halmac_init_sdio_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_usb_cfg = halmac_init_usb_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_init_pcie_cfg = halmac_init_pcie_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_deinit_sdio_cfg = halmac_deinit_sdio_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_deinit_usb_cfg = halmac_deinit_usb_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_deinit_pcie_cfg = halmac_deinit_pcie_cfg_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_dump_efuse_map = halmac_dump_efuse_map_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_dump_efuse_map_bt = halmac_dump_efuse_map_bt_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_write_efuse_bt = halmac_write_efuse_bt_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_dump_logical_efuse_map =</div><div class='del'>-		halmac_dump_logical_efuse_map_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_pg_efuse_by_map = halmac_pg_efuse_by_map_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_efuse_size = halmac_get_efuse_size_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_efuse_available_size =</div><div class='del'>-		halmac_get_efuse_available_size_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_c2h_info = halmac_get_c2h_info_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_get_logical_efuse_size =</div><div class='del'>-		halmac_get_logical_efuse_size_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_write_logical_efuse =</div><div class='del'>-		halmac_write_logical_efuse_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_read_logical_efuse = halmac_read_logical_efuse_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_cfg_fwlps_option = halmac_cfg_fwlps_option_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_fwips_option = halmac_cfg_fwips_option_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_enter_wowlan = halmac_enter_wowlan_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_leave_wowlan = halmac_leave_wowlan_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_enter_ps = halmac_enter_ps_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_leave_ps = halmac_leave_ps_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_h2c_lb = halmac_h2c_lb_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_debug = halmac_debug_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_parameter = halmac_cfg_parameter_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_update_datapack = halmac_update_datapack_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_run_datapack = halmac_run_datapack_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_drv_info = halmac_cfg_drv_info_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_send_bt_coex = halmac_send_bt_coex_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_verify_platform_api =</div><div class='del'>-		halmac_verify_platform_api_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_update_packet = halmac_update_packet_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_bcn_ie_filter = halmac_bcn_ie_filter_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_txbf = halmac_cfg_txbf_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_mumimo = halmac_cfg_mumimo_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_sounding = halmac_cfg_sounding_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_del_sounding = halmac_del_sounding_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_su_bfer_entry_init = halmac_su_bfer_entry_init_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_su_bfee_entry_init = halmac_su_bfee_entry_init_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_mu_bfer_entry_init = halmac_mu_bfer_entry_init_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_mu_bfee_entry_init = halmac_mu_bfee_entry_init_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_su_bfer_entry_del = halmac_su_bfer_entry_del_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_su_bfee_entry_del = halmac_su_bfee_entry_del_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_mu_bfer_entry_del = halmac_mu_bfer_entry_del_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_mu_bfee_entry_del = halmac_mu_bfee_entry_del_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_add_ch_info = halmac_add_ch_info_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_add_extra_ch_info = halmac_add_extra_ch_info_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_ctrl_ch_switch = halmac_ctrl_ch_switch_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_p2pps = halmac_p2pps_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_clear_ch_info = halmac_clear_ch_info_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_send_general_info = halmac_send_general_info_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_start_iqk = halmac_start_iqk_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_ctrl_pwr_tracking = halmac_ctrl_pwr_tracking_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_psd = halmac_psd_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_la_mode = halmac_cfg_la_mode_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_rx_fifo_expanding_mode =</div><div class='del'>-		halmac_cfg_rx_fifo_expanding_mode_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_config_security = halmac_config_security_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_used_cam_entry_num =</div><div class='del'>-		halmac_get_used_cam_entry_num_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_read_cam_entry = halmac_read_cam_entry_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_write_cam = halmac_write_cam_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_clear_cam_entry = halmac_clear_cam_entry_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_get_hw_value = halmac_get_hw_value_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_set_hw_value = halmac_set_hw_value_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_cfg_drv_rsvd_pg_num =</div><div class='del'>-		halmac_cfg_drv_rsvd_pg_num_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_chip_version = halmac_get_chip_version_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_query_status = halmac_query_status_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_reset_feature = halmac_reset_feature_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_check_fw_status = halmac_check_fw_status_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_dump_fw_dmem = halmac_dump_fw_dmem_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_max_dl_size = halmac_cfg_max_dl_size_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_dump_fifo = halmac_dump_fifo_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_fifo_size = halmac_get_fifo_size_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_chk_txdesc = halmac_chk_txdesc_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_dl_drv_rsvd_page = halmac_dl_drv_rsvd_page_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_cfg_csi_rate = halmac_cfg_csi_rate_88xx;</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_sdio_cmd53_4byte = halmac_sdio_cmd53_4byte_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_txfifo_is_empty = halmac_txfifo_is_empty_88xx;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		halmac_api-&gt;halmac_cfg_rx_aggregation =</div><div class='del'>-			halmac_cfg_rx_aggregation_88xx_sdio;</div><div class='del'>-		halmac_api-&gt;halmac_init_interface_cfg =</div><div class='del'>-			halmac_init_sdio_cfg_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_deinit_interface_cfg =</div><div class='del'>-			halmac_deinit_sdio_cfg_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_8 = halmac_reg_read_8_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_8 = halmac_reg_write_8_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_16 = halmac_reg_read_16_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_16 = halmac_reg_write_16_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_32 = halmac_reg_read_32_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_32 = halmac_reg_write_32_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_indirect_32 =</div><div class='del'>-			halmac_reg_read_indirect_32_sdio_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_sdio_cmd53_read_n =</div><div class='del'>-			halmac_reg_read_nbyte_sdio_88xx;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		halmac_api-&gt;halmac_cfg_rx_aggregation =</div><div class='del'>-			halmac_cfg_rx_aggregation_88xx_usb;</div><div class='del'>-		halmac_api-&gt;halmac_init_interface_cfg =</div><div class='del'>-			halmac_init_usb_cfg_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_deinit_interface_cfg =</div><div class='del'>-			halmac_deinit_usb_cfg_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_8 = halmac_reg_read_8_usb_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_8 = halmac_reg_write_8_usb_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_16 = halmac_reg_read_16_usb_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_16 = halmac_reg_write_16_usb_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_32 = halmac_reg_read_32_usb_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_32 = halmac_reg_write_32_usb_88xx;</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_PCIE) {</div><div class='del'>-		halmac_api-&gt;halmac_cfg_rx_aggregation =</div><div class='del'>-			halmac_cfg_rx_aggregation_88xx_pcie;</div><div class='del'>-		halmac_api-&gt;halmac_init_interface_cfg =</div><div class='del'>-			halmac_init_pcie_cfg_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_deinit_interface_cfg =</div><div class='del'>-			halmac_deinit_pcie_cfg_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_8 = halmac_reg_read_8_pcie_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_8 = halmac_reg_write_8_pcie_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_16 = halmac_reg_read_16_pcie_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_16 = halmac_reg_write_16_pcie_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_read_32 = halmac_reg_read_32_pcie_88xx;</div><div class='del'>-		halmac_api-&gt;halmac_reg_write_32 = halmac_reg_write_32_pcie_88xx;</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("Set halmac io function Error!!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_api-&gt;halmac_set_bulkout_num = halmac_set_bulkout_num_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_sdio_tx_addr = halmac_get_sdio_tx_addr_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_get_usb_bulkout_id = halmac_get_usb_bulkout_id_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_timer_2s = halmac_timer_2s_88xx;</div><div class='del'>-	halmac_api-&gt;halmac_fill_txdesc_checksum =</div><div class='del'>-		halmac_fill_txdesc_check_sum_88xx;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;chip_id == HALMAC_CHIP_ID_8822B) {</div><div class='del'>-		/*mount 8822b function and data*/</div><div class='del'>-		halmac_mount_api_8822b(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	} else if (halmac_adapter-&gt;chip_id == HALMAC_CHIP_ID_8821C) {</div><div class='del'>-	} else if (halmac_adapter-&gt;chip_id == HALMAC_CHIP_ID_8814B) {</div><div class='del'>-	} else if (halmac_adapter-&gt;chip_id == HALMAC_CHIP_ID_8197F) {</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("Chip ID undefine!!\n");</div><div class='del'>-		return HALMAC_RET_CHIP_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_download_firmware_88xx() - download Firmware</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @hamacl_fw : firmware bin</div><div class='del'>- * @halmac_fw_size : firmware size</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_download_firmware_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u8 *hamacl_fw, u32 halmac_fw_size)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u8 *file_ptr;</div><div class='del'>-	u32 dest;</div><div class='del'>-	u16 value16;</div><div class='del'>-	u32 restore_index = 0;</div><div class='del'>-	u32 halmac_h2c_ver = 0, fw_h2c_ver = 0;</div><div class='del'>-	u32 iram_pkt_size, dmem_pkt_size, eram_pkt_size = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_restore_info restore_info[DLFW_RESTORE_REG_NUM_88XX];</div><div class='del'>-	u32 temp;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DOWNLOAD_FIRMWARE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s start!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_size &gt; HALMAC_FW_SIZE_MAX_88XX ||</div><div class='del'>-	    halmac_fw_size &lt; HALMAC_FWHDR_SIZE_88XX) {</div><div class='del'>-		pr_err("FW size error!\n");</div><div class='del'>-		return HALMAC_RET_FW_SIZE_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fw_h2c_ver = le32_to_cpu(</div><div class='del'>-		*((__le32 *)</div><div class='del'>-		  (hamacl_fw + HALMAC_FWHDR_OFFSET_H2C_FORMAT_VER_88XX)));</div><div class='del'>-	halmac_h2c_ver = H2C_FORMAT_VERSION;</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"halmac h2c/c2h format = %x, fw h2c/c2h format = %x!!\n",</div><div class='del'>-		halmac_h2c_ver, fw_h2c_ver);</div><div class='del'>-	if (fw_h2c_ver != halmac_h2c_ver)</div><div class='del'>-		HALMAC_RT_TRACE(</div><div class='del'>-			driver_adapter, HALMAC_MSG_INIT, DBG_WARNING,</div><div class='del'>-			"[WARN]H2C/C2H version between HALMAC and FW is compatible!!\n");</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.dlfw_state = HALMAC_DLFW_NONE;</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_SYS_FUNC_EN + 1);</div><div class='del'>-	value8 = (u8)(value8 &amp; ~(BIT(2)));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_SYS_FUNC_EN + 1,</div><div class='del'>-			   value8); /* Disable CPU reset */</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_RSV_CTRL + 1);</div><div class='del'>-	value8 = (u8)(value8 &amp; ~(BIT(0)));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_RSV_CTRL + 1, value8);</div><div class='del'>-</div><div class='del'>-	restore_info[restore_index].length = 1;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_TXDMA_PQ_MAP + 1;</div><div class='del'>-	restore_info[restore_index].value =</div><div class='del'>-		HALMAC_REG_READ_8(halmac_adapter, REG_TXDMA_PQ_MAP + 1);</div><div class='del'>-	restore_index++;</div><div class='del'>-	value8 = HALMAC_DMA_MAPPING_HIGH &lt;&lt; 6;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXDMA_PQ_MAP + 1,</div><div class='del'>-			   value8); /* set HIQ to hi priority */</div><div class='del'>-</div><div class='del'>-	/* DLFW only use HIQ, map HIQ to hi priority */</div><div class='del'>-	halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_HI] =</div><div class='del'>-		HALMAC_DMA_MAPPING_HIGH;</div><div class='del'>-	restore_info[restore_index].length = 1;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_CR;</div><div class='del'>-	restore_info[restore_index].value =</div><div class='del'>-		HALMAC_REG_READ_8(halmac_adapter, REG_CR);</div><div class='del'>-	restore_index++;</div><div class='del'>-	restore_info[restore_index].length = 4;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_H2CQ_CSR;</div><div class='del'>-	restore_info[restore_index].value = BIT(31);</div><div class='del'>-	restore_index++;</div><div class='del'>-	value8 = BIT_HCI_TXDMA_EN | BIT_TXDMA_EN;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR, value8);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_H2CQ_CSR, BIT(31));</div><div class='del'>-</div><div class='del'>-	/* Config hi priority queue and public priority queue page number</div><div class='del'>-	 * (only for DLFW)</div><div class='del'>-	 */</div><div class='del'>-	restore_info[restore_index].length = 2;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_FIFOPAGE_INFO_1;</div><div class='del'>-	restore_info[restore_index].value =</div><div class='del'>-		HALMAC_REG_READ_16(halmac_adapter, REG_FIFOPAGE_INFO_1);</div><div class='del'>-	restore_index++;</div><div class='del'>-	restore_info[restore_index].length = 4;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_RQPN_CTRL_2;</div><div class='del'>-	restore_info[restore_index].value =</div><div class='del'>-		HALMAC_REG_READ_32(halmac_adapter, REG_RQPN_CTRL_2) | BIT(31);</div><div class='del'>-	restore_index++;</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_INFO_1, 0x200);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_RQPN_CTRL_2,</div><div class='del'>-			    restore_info[restore_index - 1].value);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		HALMAC_REG_READ_32(halmac_adapter, REG_SDIO_FREE_TXPG);</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_SDIO_TX_CTRL,</div><div class='del'>-				    0x00000000);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;fw_version.version = le16_to_cpu(</div><div class='del'>-		*((__le16 *)(hamacl_fw + HALMAC_FWHDR_OFFSET_VERSION_88XX)));</div><div class='del'>-	halmac_adapter-&gt;fw_version.sub_version =</div><div class='del'>-		*(hamacl_fw + HALMAC_FWHDR_OFFSET_SUBVERSION_88XX);</div><div class='del'>-	halmac_adapter-&gt;fw_version.sub_index =</div><div class='del'>-		*(hamacl_fw + HALMAC_FWHDR_OFFSET_SUBINDEX_88XX);</div><div class='del'>-	halmac_adapter-&gt;fw_version.h2c_version = (u16)fw_h2c_ver;</div><div class='del'>-</div><div class='del'>-	dmem_pkt_size = le32_to_cpu(*((__le32 *)(hamacl_fw +</div><div class='del'>-				      HALMAC_FWHDR_OFFSET_DMEM_SIZE_88XX)));</div><div class='del'>-	iram_pkt_size = le32_to_cpu(*((__le32 *)(hamacl_fw +</div><div class='del'>-				      HALMAC_FWHDR_OFFSET_IRAM_SIZE_88XX)));</div><div class='del'>-	if (((*(hamacl_fw + HALMAC_FWHDR_OFFSET_MEM_USAGE_88XX)) &amp; BIT(4)) != 0)</div><div class='del'>-		eram_pkt_size =</div><div class='del'>-		     le32_to_cpu(*((__le32 *)(hamacl_fw +</div><div class='del'>-				   HALMAC_FWHDR_OFFSET_ERAM_SIZE_88XX)));</div><div class='del'>-</div><div class='del'>-	dmem_pkt_size += HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX;</div><div class='del'>-	iram_pkt_size += HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX;</div><div class='del'>-	if (eram_pkt_size != 0)</div><div class='del'>-		eram_pkt_size += HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_size != (HALMAC_FWHDR_SIZE_88XX + dmem_pkt_size +</div><div class='del'>-			       iram_pkt_size + eram_pkt_size)) {</div><div class='del'>-		pr_err("FW size mismatch the real fw size!\n");</div><div class='del'>-		goto DLFW_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CR + 1);</div><div class='del'>-	restore_info[restore_index].length = 1;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_CR + 1;</div><div class='del'>-	restore_info[restore_index].value = value8;</div><div class='del'>-	restore_index++;</div><div class='del'>-	value8 = (u8)(value8 | BIT(0));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR + 1,</div><div class='del'>-			   value8); /* Enable SW TX beacon */</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_BCN_CTRL);</div><div class='del'>-	restore_info[restore_index].length = 1;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_BCN_CTRL;</div><div class='del'>-	restore_info[restore_index].value = value8;</div><div class='del'>-	restore_index++;</div><div class='del'>-	value8 = (u8)((value8 &amp; (~BIT(3))) | BIT(4));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_BCN_CTRL,</div><div class='del'>-			   value8); /* Disable beacon related functions */</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_FWHW_TXQ_CTRL + 2);</div><div class='del'>-	restore_info[restore_index].length = 1;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_FWHW_TXQ_CTRL + 2;</div><div class='del'>-	restore_info[restore_index].value = value8;</div><div class='del'>-	restore_index++;</div><div class='del'>-	value8 = (u8)(value8 &amp; ~(BIT(6)));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FWHW_TXQ_CTRL + 2,</div><div class='del'>-			   value8); /* Disable ptcl tx bcnq */</div><div class='del'>-</div><div class='del'>-	restore_info[restore_index].length = 2;</div><div class='del'>-	restore_info[restore_index].mac_register = REG_FIFOPAGE_CTRL_2;</div><div class='del'>-	restore_info[restore_index].value =</div><div class='del'>-		HALMAC_REG_READ_16(halmac_adapter, REG_FIFOPAGE_CTRL_2) |</div><div class='del'>-		BIT(15);</div><div class='del'>-	restore_index++;</div><div class='del'>-	value16 = 0x8000;</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    value16); /* Set beacon header to  0 */</div><div class='del'>-</div><div class='del'>-	value16 = (u16)(HALMAC_REG_READ_16(halmac_adapter, REG_MCUFW_CTRL) &amp;</div><div class='del'>-			0x3800);</div><div class='del'>-	value16 |= BIT(0);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-			    value16); /* MCU/FW setting */</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CPU_DMEM_CON + 2);</div><div class='del'>-	value8 &amp;= ~(BIT(0));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CPU_DMEM_CON + 2, value8);</div><div class='del'>-	value8 |= BIT(0);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CPU_DMEM_CON + 2, value8);</div><div class='del'>-</div><div class='del'>-	/* Download to DMEM */</div><div class='del'>-	file_ptr = hamacl_fw + HALMAC_FWHDR_SIZE_88XX;</div><div class='del'>-	temp = le32_to_cpu(*((__le32 *)(hamacl_fw +</div><div class='del'>-			   HALMAC_FWHDR_OFFSET_DMEM_ADDR_88XX))) &amp;</div><div class='del'>-			   ~(BIT(31));</div><div class='del'>-	if (halmac_dlfw_to_mem_88xx(halmac_adapter, file_ptr, temp,</div><div class='del'>-				    dmem_pkt_size) != HALMAC_RET_SUCCESS)</div><div class='del'>-		goto DLFW_END;</div><div class='del'>-</div><div class='del'>-	/* Download to IMEM */</div><div class='del'>-	file_ptr = hamacl_fw + HALMAC_FWHDR_SIZE_88XX + dmem_pkt_size;</div><div class='del'>-	temp = le32_to_cpu(*((__le32 *)(hamacl_fw +</div><div class='del'>-			   HALMAC_FWHDR_OFFSET_IRAM_ADDR_88XX))) &amp;</div><div class='del'>-			   ~(BIT(31));</div><div class='del'>-	if (halmac_dlfw_to_mem_88xx(halmac_adapter, file_ptr, temp,</div><div class='del'>-				    iram_pkt_size) != HALMAC_RET_SUCCESS)</div><div class='del'>-		goto DLFW_END;</div><div class='del'>-</div><div class='del'>-	/* Download to EMEM */</div><div class='del'>-	if (eram_pkt_size != 0) {</div><div class='del'>-		file_ptr = hamacl_fw + HALMAC_FWHDR_SIZE_88XX + dmem_pkt_size +</div><div class='del'>-			   iram_pkt_size;</div><div class='del'>-		dest = le32_to_cpu((*((__le32 *)(hamacl_fw +</div><div class='del'>-				    HALMAC_FWHDR_OFFSET_EMEM_ADDR_88XX)))) &amp;</div><div class='del'>-				   ~(BIT(31));</div><div class='del'>-		if (halmac_dlfw_to_mem_88xx(halmac_adapter, file_ptr, dest,</div><div class='del'>-					    eram_pkt_size) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS)</div><div class='del'>-			goto DLFW_END;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_init_offload_feature_state_machine_88xx(halmac_adapter);</div><div class='del'>-DLFW_END:</div><div class='del'>-</div><div class='del'>-	halmac_restore_mac_register_88xx(halmac_adapter, restore_info,</div><div class='del'>-					 DLFW_RESTORE_REG_NUM_88XX);</div><div class='del'>-</div><div class='del'>-	if (halmac_dlfw_end_flow_88xx(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		goto DLFW_FAIL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.dlfw_state = HALMAC_DLFW_DONE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-DLFW_FAIL:</div><div class='del'>-</div><div class='del'>-	/* Disable FWDL_EN */</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_MCUFW_CTRL) &amp;</div><div class='del'>-		     ~(BIT(0))));</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_free_download_firmware_88xx() - download specific memory firmware</div><div class='del'>- * @halmac_adapter</div><div class='del'>- * @dlfw_mem : memory selection</div><div class='del'>- * @hamacl_fw : firmware bin</div><div class='del'>- * @halmac_fw_size : firmware size</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_free_download_firmware_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_dlfw_mem dlfw_mem, u8 *hamacl_fw,</div><div class='del'>-				   u32 halmac_fw_size)</div><div class='del'>-{</div><div class='del'>-	u8 tx_pause_backup;</div><div class='del'>-	u8 *file_ptr;</div><div class='del'>-	u32 dest;</div><div class='del'>-	u16 bcn_head_backup;</div><div class='del'>-	u32 iram_pkt_size, dmem_pkt_size, eram_pkt_size = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_DLFW_FAIL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_size &gt; HALMAC_FW_SIZE_MAX_88XX ||</div><div class='del'>-	    halmac_fw_size &lt; HALMAC_FWHDR_SIZE_88XX) {</div><div class='del'>-		pr_err("[ERR]FW size error!\n");</div><div class='del'>-		return HALMAC_RET_FW_SIZE_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dmem_pkt_size =</div><div class='del'>-	    le32_to_cpu(*(__le32 *)(hamacl_fw +</div><div class='del'>-				    HALMAC_FWHDR_OFFSET_DMEM_SIZE_88XX));</div><div class='del'>-	iram_pkt_size =</div><div class='del'>-	    le32_to_cpu(*(__le32 *)(hamacl_fw +</div><div class='del'>-				    HALMAC_FWHDR_OFFSET_IRAM_SIZE_88XX));</div><div class='del'>-	if (((*(hamacl_fw + HALMAC_FWHDR_OFFSET_MEM_USAGE_88XX)) &amp; BIT(4)) != 0)</div><div class='del'>-		eram_pkt_size =</div><div class='del'>-		  le32_to_cpu(*(__le32 *)(hamacl_fw +</div><div class='del'>-					  HALMAC_FWHDR_OFFSET_ERAM_SIZE_88XX));</div><div class='del'>-</div><div class='del'>-	dmem_pkt_size += HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX;</div><div class='del'>-	iram_pkt_size += HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX;</div><div class='del'>-	if (eram_pkt_size != 0)</div><div class='del'>-		eram_pkt_size += HALMAC_FW_CHKSUM_DUMMY_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_size != (HALMAC_FWHDR_SIZE_88XX + dmem_pkt_size +</div><div class='del'>-			       iram_pkt_size + eram_pkt_size)) {</div><div class='del'>-		pr_err("[ERR]FW size mismatch the real fw size!\n");</div><div class='del'>-		return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_pause_backup = HALMAC_REG_READ_8(halmac_adapter, REG_TXPAUSE);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXPAUSE,</div><div class='del'>-			   tx_pause_backup | BIT(7));</div><div class='del'>-</div><div class='del'>-	bcn_head_backup =</div><div class='del'>-		HALMAC_REG_READ_16(halmac_adapter, REG_FIFOPAGE_CTRL_2) |</div><div class='del'>-		BIT(15);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2, 0x8000);</div><div class='del'>-</div><div class='del'>-	if (eram_pkt_size != 0) {</div><div class='del'>-		file_ptr = hamacl_fw + HALMAC_FWHDR_SIZE_88XX + dmem_pkt_size +</div><div class='del'>-			   iram_pkt_size;</div><div class='del'>-		dest = le32_to_cpu(*((__le32 *)(hamacl_fw +</div><div class='del'>-				   HALMAC_FWHDR_OFFSET_EMEM_ADDR_88XX))) &amp;</div><div class='del'>-				   ~(BIT(31));</div><div class='del'>-		status = halmac_dlfw_to_mem_88xx(halmac_adapter, file_ptr, dest,</div><div class='del'>-						 eram_pkt_size);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-			goto DL_FREE_FW_END;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_free_dl_fw_end_flow_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-DL_FREE_FW_END:</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXPAUSE, tx_pause_backup);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    bcn_head_backup);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</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'>- * halmac_get_fw_version_88xx() - get FW version</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @fw_version : fw version info</div><div class='del'>- * Author : Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_fw_version_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   struct halmac_fw_version *fw_version)</div><div class='del'>-{</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.dlfw_state == 0)</div><div class='del'>-		return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-</div><div class='del'>-	fw_version-&gt;version = halmac_adapter-&gt;fw_version.version;</div><div class='del'>-	fw_version-&gt;sub_version = halmac_adapter-&gt;fw_version.sub_version;</div><div class='del'>-	fw_version-&gt;sub_index = halmac_adapter-&gt;fw_version.sub_index;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_mac_addr_88xx() - config mac address</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_port :0 for port0, 1 for port1, 2 for port2, 3 for port3, 4 for port4</div><div class='del'>- * @hal_address : mac address</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_mac_addr_88xx(struct halmac_adapter *halmac_adapter, u8 halmac_port,</div><div class='del'>-			 union halmac_wlan_addr *hal_address)</div><div class='del'>-{</div><div class='del'>-	u16 mac_address_H;</div><div class='del'>-	u32 mac_address_L;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_port &gt;= HALMAC_PORTIDMAX) {</div><div class='del'>-		pr_err("[ERR]port index &gt; 5\n");</div><div class='del'>-		return HALMAC_RET_PORT_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mac_address_L = le32_to_cpu(hal_address-&gt;address_l_h.le_address_low);</div><div class='del'>-	mac_address_H = le16_to_cpu(hal_address-&gt;address_l_h.le_address_high);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;hal_mac_addr[halmac_port].address_l_h.address_low =</div><div class='del'>-		mac_address_L;</div><div class='del'>-	halmac_adapter-&gt;hal_mac_addr[halmac_port].address_l_h.address_high =</div><div class='del'>-		mac_address_H;</div><div class='del'>-</div><div class='del'>-	switch (halmac_port) {</div><div class='del'>-	case HALMAC_PORTID0:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_MACID, mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_MACID + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID1:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_MACID1, mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_MACID1 + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID2:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_MACID2, mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_MACID2 + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID3:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_MACID3, mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_MACID3 + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID4:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_MACID4, mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_MACID4 + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_bssid_88xx() - config BSSID</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_port :0 for port0, 1 for port1, 2 for port2, 3 for port3, 4 for port4</div><div class='del'>- * @hal_address : bssid</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_bssid_88xx(struct halmac_adapter *halmac_adapter, u8 halmac_port,</div><div class='del'>-		      union halmac_wlan_addr *hal_address)</div><div class='del'>-{</div><div class='del'>-	u16 bssid_address_H;</div><div class='del'>-	u32 bssid_address_L;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_port &gt;= HALMAC_PORTIDMAX) {</div><div class='del'>-		pr_err("[ERR]port index &gt; 5\n");</div><div class='del'>-		return HALMAC_RET_PORT_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bssid_address_L = le32_to_cpu(hal_address-&gt;address_l_h.le_address_low);</div><div class='del'>-	bssid_address_H = le16_to_cpu(hal_address-&gt;address_l_h.le_address_high);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;hal_bss_addr[halmac_port].address_l_h.address_low =</div><div class='del'>-		bssid_address_L;</div><div class='del'>-	halmac_adapter-&gt;hal_bss_addr[halmac_port].address_l_h.address_high =</div><div class='del'>-		bssid_address_H;</div><div class='del'>-</div><div class='del'>-	switch (halmac_port) {</div><div class='del'>-	case HALMAC_PORTID0:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_BSSID, bssid_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_BSSID + 4,</div><div class='del'>-				    bssid_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID1:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_BSSID1,</div><div class='del'>-				    bssid_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_BSSID1 + 4,</div><div class='del'>-				    bssid_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID2:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_BSSID2,</div><div class='del'>-				    bssid_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_BSSID2 + 4,</div><div class='del'>-				    bssid_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID3:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_BSSID3,</div><div class='del'>-				    bssid_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_BSSID3 + 4,</div><div class='del'>-				    bssid_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_PORTID4:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_BSSID4,</div><div class='del'>-				    bssid_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_BSSID4 + 4,</div><div class='del'>-				    bssid_address_H);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_multicast_addr_88xx() - config multicast address</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @hal_address : multicast address</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_multicast_addr_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       union halmac_wlan_addr *hal_address)</div><div class='del'>-{</div><div class='del'>-	u16 address_H;</div><div class='del'>-	u32 address_L;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_MULTICAST_ADDR);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	address_L = le32_to_cpu(hal_address-&gt;address_l_h.le_address_low);</div><div class='del'>-	address_H = le16_to_cpu(hal_address-&gt;address_l_h.le_address_high);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_MAR, address_L);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_MAR + 4, address_H);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_pre_init_system_cfg_88xx() - pre-init system config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pre_init_system_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u32 value32, counter;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	bool enable_bb;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_PRE_INIT_SYSTEM_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_pre_init_system_cfg ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_SDIO_HSUS_CTRL,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_SDIO_HSUS_CTRL) &amp;</div><div class='del'>-				~(BIT(0)));</div><div class='del'>-		counter = 10000;</div><div class='del'>-		while (!(HALMAC_REG_READ_8(halmac_adapter, REG_SDIO_HSUS_CTRL) &amp;</div><div class='del'>-			 0x02)) {</div><div class='del'>-			counter--;</div><div class='del'>-			if (counter == 0)</div><div class='del'>-				return HALMAC_RET_SDIO_LEAVE_SUSPEND_FAIL;</div><div class='del'>-		}</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		if (HALMAC_REG_READ_8(halmac_adapter, REG_SYS_CFG2 + 3) ==</div><div class='del'>-		    0x20) /* usb3.0 */</div><div class='del'>-			HALMAC_REG_WRITE_8(</div><div class='del'>-				halmac_adapter, 0xFE5B,</div><div class='del'>-				HALMAC_REG_READ_8(halmac_adapter, 0xFE5B) |</div><div class='del'>-					BIT(4));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Config PIN Mux */</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_PAD_CTRL1);</div><div class='del'>-	value32 = value32 &amp; (~(BIT(28) | BIT(29)));</div><div class='del'>-	value32 = value32 | BIT(28) | BIT(29);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_PAD_CTRL1, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_LED_CFG);</div><div class='del'>-	value32 = value32 &amp; (~(BIT(25) | BIT(26)));</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_LED_CFG, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_GPIO_MUXCFG);</div><div class='del'>-	value32 = value32 &amp; (~(BIT(2)));</div><div class='del'>-	value32 = value32 | BIT(2);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_GPIO_MUXCFG, value32);</div><div class='del'>-</div><div class='del'>-	enable_bb = false;</div><div class='del'>-	halmac_set_hw_value_88xx(halmac_adapter, HALMAC_HW_EN_BB_RF,</div><div class='del'>-				 &amp;enable_bb);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_pre_init_system_cfg &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_system_cfg_88xx() -  init system config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_system_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_SYSTEM_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_init_system_cfg ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_SYS_FUNC_EN + 1,</div><div class='del'>-			   HALMAC_FUNCTION_ENABLE_88XX);</div><div class='del'>-	HALMAC_REG_WRITE_32(</div><div class='del'>-		halmac_adapter, REG_SYS_SDIO_CTRL,</div><div class='del'>-		(u32)(HALMAC_REG_READ_32(halmac_adapter, REG_SYS_SDIO_CTRL) |</div><div class='del'>-		      BIT_LTE_MUX_CTRL_PATH));</div><div class='del'>-	HALMAC_REG_WRITE_32(</div><div class='del'>-		halmac_adapter, REG_CPU_DMEM_CON,</div><div class='del'>-		(u32)(HALMAC_REG_READ_32(halmac_adapter, REG_CPU_DMEM_CON) |</div><div class='del'>-		      BIT_WL_PLATFORM_RST));</div><div class='del'>-</div><div class='del'>-	/* halmac_api-&gt;halmac_init_h2c(halmac_adapter); */</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_init_system_cfg &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_edca_cfg_88xx() - init EDCA config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_edca_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 value32;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_EDCA_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* Clear TX pause */</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_TXPAUSE, 0x0000);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_SLOT, HALMAC_SLOT_TIME_88XX);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PIFS, HALMAC_PIFS_TIME_88XX);</div><div class='del'>-	value32 = HALMAC_SIFS_CCK_CTX_88XX |</div><div class='del'>-		  (HALMAC_SIFS_OFDM_CTX_88XX &lt;&lt; BIT_SHIFT_SIFS_OFDM_CTX) |</div><div class='del'>-		  (HALMAC_SIFS_CCK_TRX_88XX &lt;&lt; BIT_SHIFT_SIFS_CCK_TRX) |</div><div class='del'>-		  (HALMAC_SIFS_OFDM_TRX_88XX &lt;&lt; BIT_SHIFT_SIFS_OFDM_TRX);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_SIFS, value32);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(</div><div class='del'>-		halmac_adapter, REG_EDCA_VO_PARAM,</div><div class='del'>-		HALMAC_REG_READ_32(halmac_adapter, REG_EDCA_VO_PARAM) &amp; 0xFFFF);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_EDCA_VO_PARAM + 2,</div><div class='del'>-			    HALMAC_VO_TXOP_LIMIT_88XX);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_EDCA_VI_PARAM + 2,</div><div class='del'>-			    HALMAC_VI_TXOP_LIMIT_88XX);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_RD_NAV_NXT,</div><div class='del'>-			    HALMAC_RDG_NAV_88XX | (HALMAC_TXOP_NAV_88XX &lt;&lt; 16));</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_RXTSF_OFFSET_CCK,</div><div class='del'>-			    HALMAC_CCK_RX_TSF_88XX |</div><div class='del'>-				    (HALMAC_OFDM_RX_TSF_88XX) &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_RD_CTRL + 1);</div><div class='del'>-	value8 |=</div><div class='del'>-		(BIT_VOQ_RD_INIT_EN | BIT_VIQ_RD_INIT_EN | BIT_BEQ_RD_INIT_EN);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_RD_CTRL + 1, value8);</div><div class='del'>-</div><div class='del'>-	/* Set beacon cotnrol - enable TSF and other related functions */</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_BCN_CTRL,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_BCN_CTRL) |</div><div class='del'>-		     BIT_EN_BCN_FUNCTION));</div><div class='del'>-</div><div class='del'>-	/* Set send beacon related registers */</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_TBTT_PROHIBIT,</div><div class='del'>-			    HALMAC_TBTT_PROHIBIT_88XX |</div><div class='del'>-				    (HALMAC_TBTT_HOLD_TIME_88XX</div><div class='del'>-				     &lt;&lt; BIT_SHIFT_TBTT_HOLD_TIME_AP));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DRVERLYINT,</div><div class='del'>-			   HALMAC_DRIVER_EARLY_INT_88XX);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_BCNDMATIM,</div><div class='del'>-			   HALMAC_BEACON_DMA_TIM_88XX);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_wmac_cfg_88xx() - init wmac config</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_wmac_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_WMAC_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_RXFLTMAP0,</div><div class='del'>-			    HALMAC_RX_FILTER0_88XX);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_RXFLTMAP,</div><div class='del'>-			    HALMAC_RX_FILTER_88XX);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_RCR, HALMAC_RCR_CONFIG_88XX);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_TCR + 1,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_TCR + 1) | 0x30));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TCR + 2, 0x30);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TCR + 1, 0x00);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_WMAC_OPTION_FUNCTION + 8,</div><div class='del'>-			    0x30810041);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_WMAC_OPTION_FUNCTION + 4,</div><div class='del'>-			    0x50802080);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_mac_cfg_88xx() - config page1~page7 register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @mode : trx mode</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_mac_cfg_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_trx_mode mode)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_MAC_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;mode = %d\n", __func__,</div><div class='del'>-			mode);</div><div class='del'>-</div><div class='del'>-	status = halmac_api-&gt;halmac_init_trx_cfg(halmac_adapter, mode);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_init_trx_cfg error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-	status = halmac_api-&gt;halmac_init_protocol_cfg(halmac_adapter);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_init_protocol_cfg_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_init_edca_cfg_88xx(halmac_adapter);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_init_edca_cfg_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_init_wmac_cfg_88xx(halmac_adapter);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_init_wmac_cfg_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</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'>- * halmac_cfg_operation_mode_88xx() - config operation mode</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @wireless_mode : 802.11 standard(b/g/n/ac)</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_operation_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       enum halmac_wireless_mode wireless_mode)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_wireless_mode wireless_mode_local =</div><div class='del'>-		HALMAC_WIRELESS_MODE_UNDEFINE;</div><div class='del'>-</div><div class='del'>-	wireless_mode_local = wireless_mode;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_OPERATION_MODE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s ==========&gt;wireless_mode = %d\n", __func__,</div><div class='del'>-		wireless_mode);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_ch_bw_88xx() - config channel &amp; bandwidth</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @channel : WLAN channel, support 2.4G &amp; 5G</div><div class='del'>- * @pri_ch_idx : primary channel index, idx1, idx2, idx3, idx4</div><div class='del'>- * @bw : band width, 20, 40, 80, 160, 5 ,10</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_ch_bw_88xx(struct halmac_adapter *halmac_adapter, u8 channel,</div><div class='del'>-		      enum halmac_pri_ch_idx pri_ch_idx, enum halmac_bw bw)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_CH_BW);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;ch = %d, idx=%d, bw=%d\n", __func__,</div><div class='del'>-			channel, pri_ch_idx, bw);</div><div class='del'>-</div><div class='del'>-	halmac_cfg_pri_ch_idx_88xx(halmac_adapter, pri_ch_idx);</div><div class='del'>-</div><div class='del'>-	halmac_cfg_bw_88xx(halmac_adapter, bw);</div><div class='del'>-</div><div class='del'>-	halmac_cfg_ch_88xx(halmac_adapter, channel);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_ch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  u8 channel)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_CH_BW);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;ch = %d\n", __func__, channel);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CCK_CHECK);</div><div class='del'>-	value8 = value8 &amp; (~(BIT(7)));</div><div class='del'>-</div><div class='del'>-	if (channel &gt; 35)</div><div class='del'>-		value8 = value8 | BIT(7);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CCK_CHECK, value8);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_pri_ch_idx_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   enum halmac_pri_ch_idx pri_ch_idx)</div><div class='del'>-{</div><div class='del'>-	u8 txsc_40 = 0, txsc_20 = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_CH_BW);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt; idx=%d\n", __func__,</div><div class='del'>-			pri_ch_idx);</div><div class='del'>-</div><div class='del'>-	txsc_20 = pri_ch_idx;</div><div class='del'>-	if (txsc_20 == HALMAC_CH_IDX_1 || txsc_20 == HALMAC_CH_IDX_3)</div><div class='del'>-		txsc_40 = 9;</div><div class='del'>-	else</div><div class='del'>-		txsc_40 = 10;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DATA_SC,</div><div class='del'>-			   BIT_TXSC_20M(txsc_20) | BIT_TXSC_40M(txsc_40));</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_bw_88xx() - config bandwidth</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @bw : band width, 20, 40, 80, 160, 5 ,10</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_cfg_bw_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  enum halmac_bw bw)</div><div class='del'>-{</div><div class='del'>-	u32 value32;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_BW);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;bw=%d\n", __func__, bw);</div><div class='del'>-</div><div class='del'>-	/* RF mode */</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_WMAC_TRXPTCL_CTL);</div><div class='del'>-	value32 = value32 &amp; (~(BIT(7) | BIT(8)));</div><div class='del'>-</div><div class='del'>-	switch (bw) {</div><div class='del'>-	case HALMAC_BW_80:</div><div class='del'>-		value32 = value32 | BIT(7);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_BW_40:</div><div class='del'>-		value32 = value32 | BIT(8);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_BW_20:</div><div class='del'>-	case HALMAC_BW_10:</div><div class='del'>-	case HALMAC_BW_5:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s switch case not support\n", __func__);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_WMAC_TRXPTCL_CTL, value32);</div><div class='del'>-</div><div class='del'>-	/* MAC CLK */</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_AFE_CTRL1);</div><div class='del'>-	value32 = (value32 &amp; (~(BIT(20) | BIT(21)))) |</div><div class='del'>-		  (HALMAC_MAC_CLOCK_HW_DEF_80M &lt;&lt; BIT_SHIFT_MAC_CLK_SEL);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_AFE_CTRL1, value32);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_USTIME_TSF,</div><div class='del'>-			   HALMAC_MAC_CLOCK_88XX);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_USTIME_EDCA,</div><div class='del'>-			   HALMAC_MAC_CLOCK_88XX);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_dump_efuse_map_88xx() - dump "physical" efuse map</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @cfg : dump efuse method</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   enum halmac_efuse_read_cfg cfg)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DUMP_EFUSE_MAP);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;cfg=%d\n", __func__, cfg);</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF)</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_WARNING,</div><div class='del'>-				"[WARN]Dump efuse in suspend mode\n");</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	halmac_adapter-&gt;event_trigger.physical_efuse_map = 1;</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    HALMAC_EFUSE_BANK_WIFI);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_dump_efuse_88xx(halmac_adapter, cfg);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_read_efuse error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;hal_efuse_map_valid) {</div><div class='del'>-		*process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE,</div><div class='del'>-			*process_status, halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-			halmac_adapter-&gt;hw_config_info.efuse_size);</div><div class='del'>-		halmac_adapter-&gt;event_trigger.physical_efuse_map = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_dump_efuse_map_bt_88xx() - dump "BT physical" efuse map</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_efuse_bank : bt efuse bank</div><div class='del'>- * @bt_efuse_map_size : bt efuse map size. get from halmac_get_efuse_size API</div><div class='del'>- * @bt_efuse_map : bt efuse map</div><div class='del'>- * Author : Soar / Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_map_bt_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      enum halmac_efuse_bank halmac_efuse_bank,</div><div class='del'>-			      u32 bt_efuse_map_size, u8 *bt_efuse_map)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DUMP_EFUSE_MAP_BT);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;hw_config_info.bt_efuse_size != bt_efuse_map_size)</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-</div><div class='del'>-	if ((halmac_efuse_bank &gt;= HALMAC_EFUSE_BANK_MAX) ||</div><div class='del'>-	    halmac_efuse_bank == HALMAC_EFUSE_BANK_WIFI) {</div><div class='del'>-		pr_err("Undefined BT bank\n");</div><div class='del'>-		return HALMAC_RET_EFUSE_BANK_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    halmac_efuse_bank);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_read_hw_efuse_88xx(halmac_adapter, 0, bt_efuse_map_size,</div><div class='del'>-					   bt_efuse_map);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_read_hw_efuse_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_write_efuse_bt_88xx() - write "BT physical" efuse offset</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : offset</div><div class='del'>- * @halmac_value : Write value</div><div class='del'>- * @bt_efuse_map : bt efuse map</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_write_efuse_bt_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u32 halmac_offset, u8 halmac_value,</div><div class='del'>-			   enum halmac_efuse_bank halmac_efuse_bank)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_WRITE_EFUSE_BT);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"offset : %X value : %X Bank : %X\n", halmac_offset,</div><div class='del'>-			halmac_value, halmac_efuse_bank);</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait/Rcvd event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_offset &gt;= halmac_adapter-&gt;hw_config_info.efuse_size) {</div><div class='del'>-		pr_err("Offset is too large\n");</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_efuse_bank &gt; HALMAC_EFUSE_BANK_MAX ||</div><div class='del'>-	    halmac_efuse_bank == HALMAC_EFUSE_BANK_WIFI) {</div><div class='del'>-		pr_err("Undefined BT bank\n");</div><div class='del'>-		return HALMAC_RET_EFUSE_BANK_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    halmac_efuse_bank);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_write_efuse_88xx(halmac_adapter, halmac_offset,</div><div class='del'>-					      halmac_value);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_write_efuse error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_efuse_available_size_88xx() - get efuse available size</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_size : physical efuse available size</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_efuse_available_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				     u32 *halmac_size)</div><div class='del'>-{</div><div class='del'>-	enum halmac_ret_status status;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	status = halmac_dump_logical_efuse_map_88xx(halmac_adapter,</div><div class='del'>-						    HALMAC_EFUSE_R_DRV);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	*halmac_size = halmac_adapter-&gt;hw_config_info.efuse_size -</div><div class='del'>-		       HALMAC_PROTECTED_EFUSE_SIZE_88XX -</div><div class='del'>-		       halmac_adapter-&gt;efuse_end;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_efuse_size_88xx() - get "physical" efuse size</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_size : physical efuse size</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_efuse_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u32 *halmac_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_GET_EFUSE_SIZE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	*halmac_size = halmac_adapter-&gt;hw_config_info.efuse_size;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_logical_efuse_size_88xx() - get "logical" efuse size</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_size : logical efuse size</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_logical_efuse_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u32 *halmac_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_GET_LOGICAL_EFUSE_SIZE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	*halmac_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_dump_logical_efuse_map_88xx() - dump "logical" efuse map</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @cfg : dump efuse method</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_efuse_read_cfg cfg)</div><div class='del'>-{</div><div class='del'>-	u8 *eeprom_map = NULL;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_DUMP_LOGICAL_EFUSE_MAP);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;cfg = %d\n", __func__, cfg);</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait/Rcvd event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF)</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_WARNING,</div><div class='del'>-				"[WARN]Dump logical efuse in suspend mode\n");</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	halmac_adapter-&gt;event_trigger.logical_efuse_map = 1;</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    HALMAC_EFUSE_BANK_WIFI);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_dump_efuse_88xx(halmac_adapter, cfg);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_eeprom_parser_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;hal_efuse_map_valid) {</div><div class='del'>-		*process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-</div><div class='del'>-		eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='del'>-		if (!eeprom_map) {</div><div class='del'>-			/* out of memory */</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-		}</div><div class='del'>-		memset(eeprom_map, 0xFF, eeprom_size);</div><div class='del'>-</div><div class='del'>-		if (halmac_eeprom_parser_88xx(halmac_adapter,</div><div class='del'>-					      halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-					      eeprom_map) != HALMAC_RET_SUCCESS) {</div><div class='del'>-			kfree(eeprom_map);</div><div class='del'>-			return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_DUMP_LOGICAL_EFUSE,</div><div class='del'>-			*process_status, eeprom_map, eeprom_size);</div><div class='del'>-		halmac_adapter-&gt;event_trigger.logical_efuse_map = 0;</div><div class='del'>-</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_read_logical_efuse_88xx() - read logical efuse map 1 byte</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : offset</div><div class='del'>- * @value : 1 byte efuse value</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u32 halmac_offset, u8 *value)</div><div class='del'>-{</div><div class='del'>-	u8 *eeprom_map = NULL;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_READ_LOGICAL_EFUSE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_offset &gt;= eeprom_size) {</div><div class='del'>-		pr_err("Offset is too large\n");</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait/Rcvd event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    HALMAC_EFUSE_BANK_WIFI);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='del'>-	if (!eeprom_map) {</div><div class='del'>-		/* out of memory */</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	}</div><div class='del'>-	memset(eeprom_map, 0xFF, eeprom_size);</div><div class='del'>-</div><div class='del'>-	status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_read_logical_efuse_map error = %x\n", status);</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*value = *(eeprom_map + halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS) {</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	kfree(eeprom_map);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_write_logical_efuse_88xx() - write "logical" efuse offset</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : offset</div><div class='del'>- * @halmac_value : value</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_write_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				u32 halmac_offset, u8 halmac_value)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_WRITE_LOGICAL_EFUSE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_offset &gt;= halmac_adapter-&gt;hw_config_info.eeprom_size) {</div><div class='del'>-		pr_err("Offset is too large\n");</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait/Rcvd event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    HALMAC_EFUSE_BANK_WIFI);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_write_logical_efuse_88xx(</div><div class='del'>-		halmac_adapter, halmac_offset, halmac_value);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_write_logical_efuse error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_pg_efuse_by_map_88xx() - pg logical efuse by map</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @pg_efuse_info : efuse map information</div><div class='del'>- * @cfg : dump efuse method</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pg_efuse_by_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			    enum halmac_efuse_read_cfg cfg)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PG_EFUSE_BY_MAP);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (pg_efuse_info-&gt;efuse_map_size !=</div><div class='del'>-	    halmac_adapter-&gt;hw_config_info.eeprom_size) {</div><div class='del'>-		pr_err("efuse_map_size is incorrect, should be %d bytes\n",</div><div class='del'>-		       halmac_adapter-&gt;hw_config_info.eeprom_size);</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((pg_efuse_info-&gt;efuse_map_size &amp; 0xF) &gt; 0) {</div><div class='del'>-		pr_err("efuse_map_size should be multiple of 16\n");</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pg_efuse_info-&gt;efuse_mask_size !=</div><div class='del'>-	    pg_efuse_info-&gt;efuse_map_size &gt;&gt; 4) {</div><div class='del'>-		pr_err("efuse_mask_size is incorrect, should be %d bytes\n",</div><div class='del'>-		       pg_efuse_info-&gt;efuse_map_size &gt;&gt; 4);</div><div class='del'>-		return HALMAC_RET_EFUSE_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pg_efuse_info-&gt;efuse_map) {</div><div class='del'>-		pr_err("efuse_map is NULL\n");</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pg_efuse_info-&gt;efuse_mask) {</div><div class='del'>-		pr_err("efuse_mask is NULL\n");</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait/Rcvd event(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_efuse_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(dump efuse)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_switch_efuse_bank_88xx(halmac_adapter,</div><div class='del'>-						    HALMAC_EFUSE_BANK_WIFI);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_func_switch_efuse_bank error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_pg_efuse_by_map_88xx(halmac_adapter, pg_efuse_info,</div><div class='del'>-						  cfg);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_pg_efuse_by_map error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_EFUSE, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_c2h_info_88xx() - process halmac C2H packet</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_buf : RX Packet pointer</div><div class='del'>- * @halmac_size : RX Packet size</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- *</div><div class='del'>- * Used to process c2h packet info from RX path. After receiving the packet,</div><div class='del'>- * user need to call this api and pass the packet pointer.</div><div class='del'>- *</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_c2h_info_88xx(struct halmac_adapter *halmac_adapter, u8 *halmac_buf,</div><div class='del'>-			 u32 halmac_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_GET_C2H_INFO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	/* Check if it is C2H packet */</div><div class='del'>-	if (GET_RX_DESC_C2H(halmac_buf)) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-				"C2H packet, start parsing!\n");</div><div class='del'>-</div><div class='del'>-		status = halmac_parse_c2h_packet_88xx(halmac_adapter,</div><div class='del'>-						      halmac_buf, halmac_size);</div><div class='del'>-</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("halmac_parse_c2h_packet_88xx error = %x\n",</div><div class='del'>-			       status);</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_fwlps_option_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     struct halmac_fwlps_option *lps_option)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_fwlps_option *hal_fwlps_option;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_FWLPS_OPTION);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	hal_fwlps_option = &amp;halmac_adapter-&gt;fwlps_option;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	hal_fwlps_option-&gt;mode = lps_option-&gt;mode;</div><div class='del'>-	hal_fwlps_option-&gt;clk_request = lps_option-&gt;clk_request;</div><div class='del'>-	hal_fwlps_option-&gt;rlbm = lps_option-&gt;rlbm;</div><div class='del'>-	hal_fwlps_option-&gt;smart_ps = lps_option-&gt;smart_ps;</div><div class='del'>-	hal_fwlps_option-&gt;awake_interval = lps_option-&gt;awake_interval;</div><div class='del'>-	hal_fwlps_option-&gt;all_queue_uapsd = lps_option-&gt;all_queue_uapsd;</div><div class='del'>-	hal_fwlps_option-&gt;pwr_state = lps_option-&gt;pwr_state;</div><div class='del'>-	hal_fwlps_option-&gt;low_pwr_rx_beacon = lps_option-&gt;low_pwr_rx_beacon;</div><div class='del'>-	hal_fwlps_option-&gt;ant_auto_switch = lps_option-&gt;ant_auto_switch;</div><div class='del'>-	hal_fwlps_option-&gt;ps_allow_bt_high_priority =</div><div class='del'>-		lps_option-&gt;ps_allow_bt_high_priority;</div><div class='del'>-	hal_fwlps_option-&gt;protect_bcn = lps_option-&gt;protect_bcn;</div><div class='del'>-	hal_fwlps_option-&gt;silence_period = lps_option-&gt;silence_period;</div><div class='del'>-	hal_fwlps_option-&gt;fast_bt_connect = lps_option-&gt;fast_bt_connect;</div><div class='del'>-	hal_fwlps_option-&gt;two_antenna_en = lps_option-&gt;two_antenna_en;</div><div class='del'>-	hal_fwlps_option-&gt;adopt_user_setting = lps_option-&gt;adopt_user_setting;</div><div class='del'>-	hal_fwlps_option-&gt;drv_bcn_early_shift = lps_option-&gt;drv_bcn_early_shift;</div><div class='del'>-	hal_fwlps_option-&gt;enter_32K = lps_option-&gt;enter_32K;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_fwips_option_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     struct halmac_fwips_option *ips_option)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_fwips_option *ips_option_local;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_FWIPS_OPTION);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	ips_option_local = ips_option;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_enter_wowlan_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 struct halmac_wowlan_option *wowlan_option)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_wowlan_option *wowlan_option_local;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_ENTER_WOWLAN);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	wowlan_option_local = wowlan_option;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_leave_wowlan_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_LEAVE_WOWLAN);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_enter_ps_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		     enum halmac_ps_state ps_state)</div><div class='del'>-{</div><div class='del'>-	u8 rpwm;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_ENTER_PS);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (ps_state == halmac_adapter-&gt;halmac_state.ps_state) {</div><div class='del'>-		pr_err("power state is already in PS State!!\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ps_state == HALMAC_PS_STATE_LPS) {</div><div class='del'>-		status = halmac_send_h2c_set_pwr_mode_88xx(</div><div class='del'>-			halmac_adapter, &amp;halmac_adapter-&gt;fwlps_option);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("halmac_send_h2c_set_pwr_mode_88xx error = %x!!\n",</div><div class='del'>-			       status);</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-	} else if (ps_state == HALMAC_PS_STATE_IPS) {</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.ps_state = ps_state;</div><div class='del'>-</div><div class='del'>-	/* Enter 32K */</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		if (halmac_adapter-&gt;fwlps_option.enter_32K) {</div><div class='del'>-			rpwm = (u8)(((halmac_adapter-&gt;rpwm_record ^ (BIT(7))) |</div><div class='del'>-				     (BIT(0))) &amp;</div><div class='del'>-				    0x81);</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_SDIO_HRPWM1,</div><div class='del'>-					   rpwm);</div><div class='del'>-			halmac_adapter-&gt;low_clk = true;</div><div class='del'>-		}</div><div class='del'>-	} else if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_USB) {</div><div class='del'>-		if (halmac_adapter-&gt;fwlps_option.enter_32K) {</div><div class='del'>-			rpwm = (u8)(((halmac_adapter-&gt;rpwm_record ^ (BIT(7))) |</div><div class='del'>-				     (BIT(0))) &amp;</div><div class='del'>-				    0x81);</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, 0xFE58, rpwm);</div><div class='del'>-			halmac_adapter-&gt;low_clk = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_leave_ps_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 rpwm, cpwm;</div><div class='del'>-	u32 counter;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_fwlps_option fw_lps_option;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_LEAVE_PS);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.ps_state == HALMAC_PS_STATE_ACT) {</div><div class='del'>-		pr_err("power state is already in active!!\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;low_clk) {</div><div class='del'>-		cpwm = HALMAC_REG_READ_8(halmac_adapter, REG_SDIO_HRPWM1);</div><div class='del'>-		rpwm = (u8)(</div><div class='del'>-			((halmac_adapter-&gt;rpwm_record ^ (BIT(7))) | (BIT(6))) &amp;</div><div class='del'>-			0xC0);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SDIO_HRPWM1, rpwm);</div><div class='del'>-</div><div class='del'>-		cpwm = (u8)((cpwm ^ BIT(7)) &amp; BIT(7));</div><div class='del'>-		counter = 100;</div><div class='del'>-		while (cpwm !=</div><div class='del'>-		       (HALMAC_REG_READ_8(halmac_adapter, REG_SDIO_HRPWM1) &amp;</div><div class='del'>-			BIT(7))) {</div><div class='del'>-			usleep_range(50, 60);</div><div class='del'>-			counter--;</div><div class='del'>-			if (counter == 0)</div><div class='del'>-				return HALMAC_RET_CHANGE_PS_FAIL;</div><div class='del'>-		}</div><div class='del'>-		halmac_adapter-&gt;low_clk = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;fw_lps_option, &amp;halmac_adapter-&gt;fwlps_option,</div><div class='del'>-	       sizeof(struct halmac_fwlps_option));</div><div class='del'>-	fw_lps_option.mode = 0;</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_set_pwr_mode_88xx(halmac_adapter,</div><div class='del'>-						   &amp;fw_lps_option);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_set_pwr_mode_88xx error!!=%x\n",</div><div class='del'>-		       status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.ps_state = HALMAC_PS_STATE_ACT;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * (debug API)halmac_h2c_lb_88xx() - send h2c loopback packet</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_h2c_lb_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_H2C_LB);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_debug_88xx() - dump information for debugging</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_debug_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 temp8 = 0;</div><div class='del'>-	u32 i = 0, temp32 = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DEBUG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		/* Dump CCCR, it needs new platform api */</div><div class='del'>-</div><div class='del'>-		/*Dump SDIO Local Register, use CMD52*/</div><div class='del'>-		for (i = 0x10250000; i &lt; 0x102500ff; i++) {</div><div class='del'>-			temp8 = PLATFORM_SDIO_CMD52_READ(halmac_adapter, i);</div><div class='del'>-			HALMAC_RT_TRACE(</div><div class='del'>-				driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: sdio[%x]=%x\n", i, temp8);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*Dump MAC Register*/</div><div class='del'>-		for (i = 0x0000; i &lt; 0x17ff; i++) {</div><div class='del'>-			temp8 = PLATFORM_SDIO_CMD52_READ(halmac_adapter, i);</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "halmac_debug: mac[%x]=%x\n",</div><div class='del'>-					i, temp8);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*Check RX Fifo status*/</div><div class='del'>-		i = REG_RXFF_PTR_V1;</div><div class='del'>-		temp8 = PLATFORM_SDIO_CMD52_READ(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp8);</div><div class='del'>-		i = REG_RXFF_WTR_V1;</div><div class='del'>-		temp8 = PLATFORM_SDIO_CMD52_READ(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp8);</div><div class='del'>-		i = REG_RXFF_PTR_V1;</div><div class='del'>-		temp8 = PLATFORM_SDIO_CMD52_READ(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp8);</div><div class='del'>-		i = REG_RXFF_WTR_V1;</div><div class='del'>-		temp8 = PLATFORM_SDIO_CMD52_READ(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp8);</div><div class='del'>-	} else {</div><div class='del'>-		/*Dump MAC Register*/</div><div class='del'>-		for (i = 0x0000; i &lt; 0x17fc; i += 4) {</div><div class='del'>-			temp32 = HALMAC_REG_READ_32(halmac_adapter, i);</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "halmac_debug: mac[%x]=%x\n",</div><div class='del'>-					i, temp32);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*Check RX Fifo status*/</div><div class='del'>-		i = REG_RXFF_PTR_V1;</div><div class='del'>-		temp32 = HALMAC_REG_READ_32(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp32);</div><div class='del'>-		i = REG_RXFF_WTR_V1;</div><div class='del'>-		temp32 = HALMAC_REG_READ_32(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp32);</div><div class='del'>-		i = REG_RXFF_PTR_V1;</div><div class='del'>-		temp32 = HALMAC_REG_READ_32(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp32);</div><div class='del'>-		i = REG_RXFF_WTR_V1;</div><div class='del'>-		temp32 = HALMAC_REG_READ_32(halmac_adapter, i);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"halmac_debug: mac[%x]=%x\n", i, temp32);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*	TODO: Add check register code, including MAC CLK, CPU CLK */</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_parameter_88xx() - config parameter by FW</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @para_info : cmd id, content</div><div class='del'>- * @full_fifo : parameter information</div><div class='del'>- *</div><div class='del'>- * If msk_en = true, the format of array is {reg_info, mask, value}.</div><div class='del'>- * If msk_en =_FAUSE, the format of array is {reg_info, value}</div><div class='del'>- * The format of reg_info is</div><div class='del'>- * reg_info[31]=rf_reg, 0: MAC_BB reg, 1: RF reg</div><div class='del'>- * reg_info[27:24]=rf_path, 0: path_A, 1: path_B</div><div class='del'>- * if rf_reg=0(MAC_BB reg), rf_path is meaningless.</div><div class='del'>- * ref_info[15:0]=offset</div><div class='del'>- *</div><div class='del'>- * Example: msk_en = false</div><div class='del'>- * {0x8100000a, 0x00001122}</div><div class='del'>- * =&gt;Set RF register, path_B, offset 0xA to 0x00001122</div><div class='del'>- * {0x00000824, 0x11224433}</div><div class='del'>- * =&gt;Set MAC_BB register, offset 0x800 to 0x11224433</div><div class='del'>- *</div><div class='del'>- * Note : full fifo mode only for init flow</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_parameter_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  struct halmac_phy_parameter_info *para_info,</div><div class='del'>-			  u8 full_fifo)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.cfg_para_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_PARAMETER);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.dlfw_state == HALMAC_DLFW_NONE) {</div><div class='del'>-		pr_err("%s Fail due to DLFW NONE!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(cfg para)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_cfg_para_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE &amp;&amp;</div><div class='del'>-	    halmac_query_cfg_para_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_CONSTRUCTING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Not idle state(cfg para)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_send_h2c_phy_parameter_88xx(halmac_adapter,</div><div class='del'>-							para_info, full_fifo);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_phy_parameter_88xx Fail!! = %x\n",</div><div class='del'>-		       ret_status);</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_update_packet_88xx() - send specific packet to FW</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @pkt_id : packet id, to know the purpose of this packet</div><div class='del'>- * @pkt : packet</div><div class='del'>- * @pkt_size : packet size</div><div class='del'>- *</div><div class='del'>- * Note : TX_DESC is not included in the pkt</div><div class='del'>- *</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_packet_id pkt_id, u8 *pkt, u32 pkt_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.update_packet_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_UPDATE_PACKET);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(update_packet)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_update_packet_88xx(halmac_adapter, pkt_id, pkt,</div><div class='del'>-						    pkt_size);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_update_packet_88xx packet = %x,  fail = %x!!\n",</div><div class='del'>-		       pkt_id, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_bcn_ie_filter_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  struct halmac_bcn_ie_info *bcn_ie_info)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_BCN_IE_FILTER);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_update_bcn_parse_info_88xx(halmac_adapter,</div><div class='del'>-							    bcn_ie_info);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_update_bcn_parse_info_88xx fail = %x\n",</div><div class='del'>-		       status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    enum halmac_data_type halmac_data_type,</div><div class='del'>-			    struct halmac_phy_parameter_info *para_info)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_run_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_data_type halmac_data_type)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_RUN_DATAPACK);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_send_h2c_run_datapack_88xx(halmac_adapter,</div><div class='del'>-						       halmac_data_type);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_run_datapack_88xx Fail, datatype = %x, status = %x!!\n",</div><div class='del'>-		       halmac_data_type, ret_status);</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_update_datapack_88xx &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_drv_info_88xx() - config driver info</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_drv_info : driver information selection</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_drv_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_drv_info halmac_drv_info)</div><div class='del'>-{</div><div class='del'>-	u8 drv_info_size = 0;</div><div class='del'>-	u8 phy_status_en = 0;</div><div class='del'>-	u8 sniffer_en = 0;</div><div class='del'>-	u8 plcp_hdr_en = 0;</div><div class='del'>-	u32 value32;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_DRV_INFO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_cfg_drv_info = %d\n", halmac_drv_info);</div><div class='del'>-</div><div class='del'>-	switch (halmac_drv_info) {</div><div class='del'>-	case HALMAC_DRV_INFO_NONE:</div><div class='del'>-		drv_info_size = 0;</div><div class='del'>-		phy_status_en = 0;</div><div class='del'>-		sniffer_en = 0;</div><div class='del'>-		plcp_hdr_en = 0;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DRV_INFO_PHY_STATUS:</div><div class='del'>-		drv_info_size = 4;</div><div class='del'>-		phy_status_en = 1;</div><div class='del'>-		sniffer_en = 0;</div><div class='del'>-		plcp_hdr_en = 0;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DRV_INFO_PHY_SNIFFER:</div><div class='del'>-		drv_info_size = 5; /* phy status 4byte, sniffer info 1byte */</div><div class='del'>-		phy_status_en = 1;</div><div class='del'>-		sniffer_en = 1;</div><div class='del'>-		plcp_hdr_en = 0;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DRV_INFO_PHY_PLCP:</div><div class='del'>-		drv_info_size = 6; /* phy status 4byte, plcp header 2byte */</div><div class='del'>-		phy_status_en = 1;</div><div class='del'>-		sniffer_en = 0;</div><div class='del'>-		plcp_hdr_en = 1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		status = HALMAC_RET_SW_CASE_NOT_SUPPORT;</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;txff_allocation.rx_fifo_expanding_mode !=</div><div class='del'>-	    HALMAC_RX_FIFO_EXPANDING_MODE_DISABLE)</div><div class='del'>-		drv_info_size = 0xF;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_RX_DRVINFO_SZ, drv_info_size);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;drv_info_size = drv_info_size;</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_RCR);</div><div class='del'>-	value32 = (value32 &amp; (~BIT_APP_PHYSTS));</div><div class='del'>-	if (phy_status_en == 1)</div><div class='del'>-		value32 = value32 | BIT_APP_PHYSTS;</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_RCR, value32);</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter,</div><div class='del'>-				     REG_WMAC_OPTION_FUNCTION + 4);</div><div class='del'>-	value32 = (value32 &amp; (~(BIT(8) | BIT(9))));</div><div class='del'>-	if (sniffer_en == 1)</div><div class='del'>-		value32 = value32 | BIT(9);</div><div class='del'>-	if (plcp_hdr_en == 1)</div><div class='del'>-		value32 = value32 | BIT(8);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_WMAC_OPTION_FUNCTION + 4,</div><div class='del'>-			    value32);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_bt_coex_88xx(struct halmac_adapter *halmac_adapter, u8 *bt_buf,</div><div class='del'>-			 u32 bt_size, u8 ack)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_SEND_BT_COEX);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_send_bt_coex_cmd_88xx(halmac_adapter, bt_buf,</div><div class='del'>-						  bt_size, ack);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_bt_coex_cmd_88xx Fail = %x!!\n",</div><div class='del'>-		       ret_status);</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * (debug API)halmac_verify_platform_api_88xx() - verify platform api</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_verify_platform_api_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_VERIFY_PLATFORM_API);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_verify_io_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return ret_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;txff_allocation.la_mode != HALMAC_LA_MODE_FULL)</div><div class='del'>-		ret_status = halmac_verify_send_rsvd_page_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return ret_status;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return ret_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_original_h2c_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u8 *original_h2c, u16 *seq, u8 ack)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_SEND_ORIGINAL_H2C);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	status = halmac_func_send_original_h2c_88xx(halmac_adapter,</div><div class='del'>-						    original_h2c, seq, ack);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_original_h2c FAIL = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_timer_2s_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_fill_txdesc_check_sum_88xx() -  fill in tx desc check sum</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @cur_desc : tx desc packet</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_fill_txdesc_check_sum_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  u8 *cur_desc)</div><div class='del'>-{</div><div class='del'>-	u16 chk_result = 0;</div><div class='del'>-	u16 *data = (u16 *)NULL;</div><div class='del'>-	u32 i;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_FILL_TXDESC_CHECKSUM);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (!cur_desc) {</div><div class='del'>-		pr_err("%s NULL PTR", __func__);</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SET_TX_DESC_TXDESC_CHECKSUM(cur_desc, 0x0000);</div><div class='del'>-</div><div class='del'>-	data = (u16 *)(cur_desc);</div><div class='del'>-</div><div class='del'>-	/* HW clculates only 32byte */</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		chk_result ^= (*(data + 2 * i) ^ *(data + (2 * i + 1)));</div><div class='del'>-</div><div class='del'>-	SET_TX_DESC_TXDESC_CHECKSUM(cur_desc, chk_result);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_dump_fifo_88xx() - dump fifo data</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_fifo_sel : FIFO selection</div><div class='del'>- * @halmac_start_addr : start address of selected FIFO</div><div class='del'>- * @halmac_fifo_dump_size : dump size of selected FIFO</div><div class='del'>- * @fifo_map : FIFO data</div><div class='del'>- *</div><div class='del'>- * Note : before dump fifo, user need to call halmac_get_fifo_size to</div><div class='del'>- * get fifo size. Then input this size to halmac_dump_fifo.</div><div class='del'>- *</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_fifo_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		      enum hal_fifo_sel halmac_fifo_sel, u32 halmac_start_addr,</div><div class='del'>-		      u32 halmac_fifo_dump_size, u8 *fifo_map)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DUMP_FIFO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_fifo_sel == HAL_FIFO_SEL_TX &amp;&amp;</div><div class='del'>-	    (halmac_start_addr + halmac_fifo_dump_size) &gt;</div><div class='del'>-		    halmac_adapter-&gt;hw_config_info.tx_fifo_size) {</div><div class='del'>-		pr_err("TX fifo dump size is too large\n");</div><div class='del'>-		return HALMAC_RET_DUMP_FIFOSIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_fifo_sel == HAL_FIFO_SEL_RX &amp;&amp;</div><div class='del'>-	    (halmac_start_addr + halmac_fifo_dump_size) &gt;</div><div class='del'>-		    halmac_adapter-&gt;hw_config_info.rx_fifo_size) {</div><div class='del'>-		pr_err("RX fifo dump size is too large\n");</div><div class='del'>-		return HALMAC_RET_DUMP_FIFOSIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((halmac_fifo_dump_size &amp; (4 - 1)) != 0) {</div><div class='del'>-		pr_err("halmac_fifo_dump_size shall 4byte align\n");</div><div class='del'>-		return HALMAC_RET_DUMP_FIFOSIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!fifo_map) {</div><div class='del'>-		pr_err("fifo_map address is NULL\n");</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_buffer_read_88xx(halmac_adapter, halmac_start_addr,</div><div class='del'>-					 halmac_fifo_dump_size, halmac_fifo_sel,</div><div class='del'>-					 fifo_map);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_buffer_read_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_fifo_size_88xx() - get fifo size</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_fifo_sel : FIFO selection</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : u32</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u32 halmac_get_fifo_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      enum hal_fifo_sel halmac_fifo_sel)</div><div class='del'>-{</div><div class='del'>-	u32 fifo_size = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_GET_FIFO_SIZE);</div><div class='del'>-</div><div class='del'>-	if (halmac_fifo_sel == HAL_FIFO_SEL_TX)</div><div class='del'>-		fifo_size = halmac_adapter-&gt;hw_config_info.tx_fifo_size;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_RX)</div><div class='del'>-		fifo_size = halmac_adapter-&gt;hw_config_info.rx_fifo_size;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_RSVD_PAGE)</div><div class='del'>-		fifo_size =</div><div class='del'>-			((halmac_adapter-&gt;hw_config_info.tx_fifo_size &gt;&gt; 7) -</div><div class='del'>-			 halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy)</div><div class='del'>-			&lt;&lt; 7;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_REPORT)</div><div class='del'>-		fifo_size = 65536;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_LLT)</div><div class='del'>-		fifo_size = 65536;</div><div class='del'>-</div><div class='del'>-	return fifo_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_txbf_88xx() - enable/disable specific user's txbf</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @userid : su bfee userid = 0 or 1 to apply TXBF</div><div class='del'>- * @bw : the sounding bandwidth</div><div class='del'>- * @txbf_en : 0: disable TXBF, 1: enable TXBF</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_txbf_88xx(struct halmac_adapter *halmac_adapter, u8 userid,</div><div class='del'>-		     enum halmac_bw bw, u8 txbf_en)</div><div class='del'>-{</div><div class='del'>-	u16 temp42C = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_TXBF);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (txbf_en) {</div><div class='del'>-		switch (bw) {</div><div class='del'>-		case HALMAC_BW_80:</div><div class='del'>-			temp42C |= BIT_R_TXBF0_80M;</div><div class='del'>-			/* fall through */</div><div class='del'>-		case HALMAC_BW_40:</div><div class='del'>-			temp42C |= BIT_R_TXBF0_40M;</div><div class='del'>-			/* fall through */</div><div class='del'>-		case HALMAC_BW_20:</div><div class='del'>-			temp42C |= BIT_R_TXBF0_20M;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_err("%s invalid TXBF BW setting 0x%x of userid %d\n",</div><div class='del'>-			       __func__, bw, userid);</div><div class='del'>-			return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (userid) {</div><div class='del'>-	case 0:</div><div class='del'>-		temp42C |=</div><div class='del'>-			HALMAC_REG_READ_16(halmac_adapter, REG_TXBF_CTRL) &amp;</div><div class='del'>-			~(BIT_R_TXBF0_20M | BIT_R_TXBF0_40M | BIT_R_TXBF0_80M);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_TXBF_CTRL, temp42C);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		temp42C |=</div><div class='del'>-			HALMAC_REG_READ_16(halmac_adapter, REG_TXBF_CTRL + 2) &amp;</div><div class='del'>-			~(BIT_R_TXBF0_20M | BIT_R_TXBF0_40M | BIT_R_TXBF0_80M);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_TXBF_CTRL + 2, temp42C);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid userid %d\n", __func__, userid);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s, txbf_en = %x &lt;==========\n", __func__,</div><div class='del'>-			txbf_en);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_mumimo_88xx() -config mumimo</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @cfgmu : parameters to configure MU PPDU Tx/Rx</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_mumimo_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		       struct halmac_cfg_mumimo_para *cfgmu)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u8 i, idx, id0, id1, gid, mu_tab_sel;</div><div class='del'>-	u8 mu_tab_valid = 0;</div><div class='del'>-	u32 gid_valid[6] = {0};</div><div class='del'>-	u8 temp14C0 = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_MUMIMO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (cfgmu-&gt;role == HAL_BFEE) {</div><div class='del'>-		/*config MU BFEE*/</div><div class='del'>-		temp14C0 = HALMAC_REG_READ_8(halmac_adapter, REG_MU_TX_CTL) &amp;</div><div class='del'>-			   ~BIT_MASK_R_MU_TABLE_VALID;</div><div class='del'>-		/*enable MU table 0 and 1, disable MU TX*/</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL,</div><div class='del'>-				   (temp14C0 | BIT(0) | BIT(1)) &amp; ~(BIT(7)));</div><div class='del'>-</div><div class='del'>-		/*config GID valid table and user position table*/</div><div class='del'>-		mu_tab_sel =</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_MU_TX_CTL + 1) &amp;</div><div class='del'>-			~(BIT(0) | BIT(1) | BIT(2));</div><div class='del'>-		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL + 1,</div><div class='del'>-					   mu_tab_sel | i);</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter, REG_MU_STA_GID_VLD,</div><div class='del'>-					    cfgmu-&gt;given_gid_tab[i]);</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter,</div><div class='del'>-					    REG_MU_STA_USER_POS_INFO,</div><div class='del'>-					    cfgmu-&gt;given_user_pos[i * 2]);</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter,</div><div class='del'>-					    REG_MU_STA_USER_POS_INFO + 4,</div><div class='del'>-					    cfgmu-&gt;given_user_pos[i * 2 + 1]);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*config MU BFER*/</div><div class='del'>-		if (!cfgmu-&gt;mu_tx_en) {</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL,</div><div class='del'>-					   HALMAC_REG_READ_8(halmac_adapter,</div><div class='del'>-							     REG_MU_TX_CTL) &amp;</div><div class='del'>-						   ~(BIT(7)));</div><div class='del'>-			HALMAC_RT_TRACE(</div><div class='del'>-				driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-				"%s disable mu tx &lt;==========\n", __func__);</div><div class='del'>-			return HALMAC_RET_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*Transform BB grouping bitmap[14:0] to MAC GID_valid table*/</div><div class='del'>-		for (idx = 0; idx &lt; 15; idx++) {</div><div class='del'>-			if (idx &lt; 5) {</div><div class='del'>-				/*group_bitmap bit0~4, MU_STA0 with MUSTA1~5*/</div><div class='del'>-				id0 = 0;</div><div class='del'>-				id1 = (u8)(idx + 1);</div><div class='del'>-			} else if (idx &lt; 9) {</div><div class='del'>-				/*group_bitmap bit5~8, MU_STA1 with MUSTA2~5*/</div><div class='del'>-				id0 = 1;</div><div class='del'>-				id1 = (u8)(idx - 3);</div><div class='del'>-			} else if (idx &lt; 12) {</div><div class='del'>-				/*group_bitmap bit9~11, MU_STA2 with MUSTA3~5*/</div><div class='del'>-				id0 = 2;</div><div class='del'>-				id1 = (u8)(idx - 6);</div><div class='del'>-			} else if (idx &lt; 14) {</div><div class='del'>-				/*group_bitmap bit12~13, MU_STA3 with MUSTA4~5*/</div><div class='del'>-				id0 = 3;</div><div class='del'>-				id1 = (u8)(idx - 8);</div><div class='del'>-			} else {</div><div class='del'>-				/*group_bitmap bit14, MU_STA4 with MUSTA5*/</div><div class='del'>-				id0 = 4;</div><div class='del'>-				id1 = (u8)(idx - 9);</div><div class='del'>-			}</div><div class='del'>-			if (cfgmu-&gt;grouping_bitmap &amp; BIT(idx)) {</div><div class='del'>-				/*Pair 1*/</div><div class='del'>-				gid = (idx &lt;&lt; 1) + 1;</div><div class='del'>-				gid_valid[id0] |= (BIT(gid));</div><div class='del'>-				gid_valid[id1] |= (BIT(gid));</div><div class='del'>-				/*Pair 2*/</div><div class='del'>-				gid += 1;</div><div class='del'>-				gid_valid[id0] |= (BIT(gid));</div><div class='del'>-				gid_valid[id1] |= (BIT(gid));</div><div class='del'>-			} else {</div><div class='del'>-				/*Pair 1*/</div><div class='del'>-				gid = (idx &lt;&lt; 1) + 1;</div><div class='del'>-				gid_valid[id0] &amp;= ~(BIT(gid));</div><div class='del'>-				gid_valid[id1] &amp;= ~(BIT(gid));</div><div class='del'>-				/*Pair 2*/</div><div class='del'>-				gid += 1;</div><div class='del'>-				gid_valid[id0] &amp;= ~(BIT(gid));</div><div class='del'>-				gid_valid[id1] &amp;= ~(BIT(gid));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*set MU STA GID valid TABLE*/</div><div class='del'>-		mu_tab_sel =</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_MU_TX_CTL + 1) &amp;</div><div class='del'>-			~(BIT(0) | BIT(1) | BIT(2));</div><div class='del'>-		for (idx = 0; idx &lt; 6; idx++) {</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL + 1,</div><div class='del'>-					   idx | mu_tab_sel);</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter, REG_MU_STA_GID_VLD,</div><div class='del'>-					    gid_valid[idx]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*To validate the sounding successful MU STA and enable MU TX*/</div><div class='del'>-		for (i = 0; i &lt; 6; i++) {</div><div class='del'>-			if (cfgmu-&gt;sounding_sts[i])</div><div class='del'>-				mu_tab_valid |= BIT(i);</div><div class='del'>-		}</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL,</div><div class='del'>-				   mu_tab_valid | BIT(7));</div><div class='del'>-	}</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_sounding_88xx() - configure general sounding</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @role : driver's role, BFer or BFee</div><div class='del'>- * @datarate : set ndpa tx rate if driver is BFer, or set csi response rate</div><div class='del'>- *             if driver is BFee</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_sounding_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_snd_role role,</div><div class='del'>-			 enum halmac_data_rate datarate)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_SOUNDING);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (role) {</div><div class='del'>-	case HAL_BFER:</div><div class='del'>-		HALMAC_REG_WRITE_32(</div><div class='del'>-			halmac_adapter, REG_TXBF_CTRL,</div><div class='del'>-			HALMAC_REG_READ_32(halmac_adapter, REG_TXBF_CTRL) |</div><div class='del'>-				BIT_R_ENABLE_NDPA | BIT_USE_NDPA_PARAMETER |</div><div class='del'>-				BIT_R_EN_NDPA_INT | BIT_DIS_NDP_BFEN);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_NDPA_RATE, datarate);</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_NDPA_OPT_CTRL,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_NDPA_OPT_CTRL) &amp;</div><div class='del'>-				(~(BIT(0) | BIT(1))));</div><div class='del'>-		/*service file length 2 bytes; fix non-STA1 csi start offset */</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SND_PTCL_CTRL + 1,</div><div class='del'>-				   0x2 | BIT(7));</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SND_PTCL_CTRL + 2, 0x2);</div><div class='del'>-		break;</div><div class='del'>-	case HAL_BFEE:</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SND_PTCL_CTRL, 0xDB);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SND_PTCL_CTRL + 3, 0x50);</div><div class='del'>-		/*use ndpa rx rate to decide csi rate*/</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_BBPSF_CTRL + 3,</div><div class='del'>-				   HALMAC_OFDM54 | BIT(6));</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_RRSR,</div><div class='del'>-			HALMAC_REG_READ_16(halmac_adapter, REG_RRSR) |</div><div class='del'>-				BIT(datarate));</div><div class='del'>-		/*RXFF do not accept BF Rpt Poll, avoid CSI crc error*/</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_RXFLTMAP1,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_RXFLTMAP1) &amp;</div><div class='del'>-				(~(BIT(4))));</div><div class='del'>-		/*FWFF do not accept BF Rpt Poll, avoid CSI crc error*/</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_RXFLTMAP4,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_RXFLTMAP4) &amp;</div><div class='del'>-				(~(BIT(4))));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid role\n", __func__);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_del_sounding_88xx() - reset general sounding</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @role : driver's role, BFer or BFee</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_del_sounding_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_snd_role role)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DEL_SOUNDING);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (role) {</div><div class='del'>-	case HAL_BFER:</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_TXBF_CTRL + 3, 0);</div><div class='del'>-		break;</div><div class='del'>-	case HAL_BFEE:</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SND_PTCL_CTRL, 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid role\n", __func__);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_su_bfee_entry_init_88xx() - config SU beamformee's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @userid : SU bfee userid = 0 or 1 to be added</div><div class='del'>- * @paid : partial AID of this bfee</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfee_entry_init_88xx(struct halmac_adapter *halmac_adapter, u8 userid,</div><div class='del'>-			       u16 paid)</div><div class='del'>-{</div><div class='del'>-	u16 temp42C = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_SU_BFEE_ENTRY_INIT);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (userid) {</div><div class='del'>-	case 0:</div><div class='del'>-		temp42C = HALMAC_REG_READ_16(halmac_adapter, REG_TXBF_CTRL) &amp;</div><div class='del'>-			  ~(BIT_MASK_R_TXBF0_AID | BIT_R_TXBF0_20M |</div><div class='del'>-			    BIT_R_TXBF0_40M | BIT_R_TXBF0_80M);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_TXBF_CTRL,</div><div class='del'>-				    temp42C | paid);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_ASSOCIATED_BFMEE_SEL,</div><div class='del'>-				    paid);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		temp42C =</div><div class='del'>-			HALMAC_REG_READ_16(halmac_adapter, REG_TXBF_CTRL + 2) &amp;</div><div class='del'>-			~(BIT_MASK_R_TXBF1_AID | BIT_R_TXBF0_20M |</div><div class='del'>-			  BIT_R_TXBF0_40M | BIT_R_TXBF0_80M);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_TXBF_CTRL + 2,</div><div class='del'>-				    temp42C | paid);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMEE_SEL + 2,</div><div class='del'>-				    paid | BIT(9));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid userid %d\n", __func__,</div><div class='del'>-		       userid);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_su_bfee_entry_init_88xx() - config SU beamformer's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @su_bfer_init : parameters to configure SU BFER entry</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfer_entry_init_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_su_bfer_init_para *su_bfer_init)</div><div class='del'>-{</div><div class='del'>-	u16 mac_address_H;</div><div class='del'>-	u32 mac_address_L;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_SU_BFER_ENTRY_INIT);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	/* mac_address_L = bfer_address.address_l_h.address_low; */</div><div class='del'>-	/* mac_address_H = bfer_address.address_l_h.address_high; */</div><div class='del'>-</div><div class='del'>-	mac_address_L = le32_to_cpu(</div><div class='del'>-		su_bfer_init-&gt;bfer_address.address_l_h.le_address_low);</div><div class='del'>-	mac_address_H = le16_to_cpu(</div><div class='del'>-		su_bfer_init-&gt;bfer_address.address_l_h.le_address_high);</div><div class='del'>-</div><div class='del'>-	switch (su_bfer_init-&gt;userid) {</div><div class='del'>-	case 0:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO,</div><div class='del'>-				    mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMER0_INFO + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMER0_INFO + 6,</div><div class='del'>-				    su_bfer_init-&gt;paid);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_TX_CSI_RPT_PARAM_BW20,</div><div class='del'>-				    su_bfer_init-&gt;csi_para);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER1_INFO,</div><div class='del'>-				    mac_address_L);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMER1_INFO + 4,</div><div class='del'>-				    mac_address_H);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMER1_INFO + 6,</div><div class='del'>-				    su_bfer_init-&gt;paid);</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_TX_CSI_RPT_PARAM_BW20 + 2,</div><div class='del'>-				    su_bfer_init-&gt;csi_para);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid userid %d\n", __func__,</div><div class='del'>-		       su_bfer_init-&gt;userid);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mu_bfee_entry_init_88xx() - config MU beamformee's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @mu_bfee_init : parameters to configure MU BFEE entry</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfee_entry_init_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_mu_bfee_init_para *mu_bfee_init)</div><div class='del'>-{</div><div class='del'>-	u16 temp168X = 0, temp14C0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_MU_BFEE_ENTRY_INIT);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	temp168X |= mu_bfee_init-&gt;paid | BIT(9);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, (0x1680 + mu_bfee_init-&gt;userid * 2),</div><div class='del'>-			    temp168X);</div><div class='del'>-</div><div class='del'>-	temp14C0 = HALMAC_REG_READ_16(halmac_adapter, REG_MU_TX_CTL) &amp;</div><div class='del'>-		   ~(BIT(8) | BIT(9) | BIT(10));</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_MU_TX_CTL,</div><div class='del'>-			    temp14C0 | ((mu_bfee_init-&gt;userid - 2) &lt;&lt; 8));</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_MU_STA_GID_VLD, 0);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_MU_STA_USER_POS_INFO,</div><div class='del'>-			    mu_bfee_init-&gt;user_position_l);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_MU_STA_USER_POS_INFO + 4,</div><div class='del'>-			    mu_bfee_init-&gt;user_position_h);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mu_bfer_entry_init_88xx() - config MU beamformer's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @mu_bfer_init : parameters to configure MU BFER entry</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfer_entry_init_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_mu_bfer_init_para *mu_bfer_init)</div><div class='del'>-{</div><div class='del'>-	u16 temp1680 = 0;</div><div class='del'>-	u16 mac_address_H;</div><div class='del'>-	u32 mac_address_L;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_MU_BFER_ENTRY_INIT);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	mac_address_L =</div><div class='del'>-	    le32_to_cpu(mu_bfer_init-&gt;bfer_address.address_l_h.le_address_low);</div><div class='del'>-	mac_address_H =</div><div class='del'>-	    le16_to_cpu(mu_bfer_init-&gt;bfer_address.address_l_h.le_address_high);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO,</div><div class='del'>-			    mac_address_L);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO + 4,</div><div class='del'>-			    mac_address_H);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO + 6,</div><div class='del'>-			    mu_bfer_init-&gt;paid);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_TX_CSI_RPT_PARAM_BW20,</div><div class='del'>-			    mu_bfer_init-&gt;csi_para);</div><div class='del'>-</div><div class='del'>-	temp1680 = HALMAC_REG_READ_16(halmac_adapter, 0x1680) &amp; 0xC000;</div><div class='del'>-	temp1680 |= mu_bfer_init-&gt;my_aid | (mu_bfer_init-&gt;csi_length_sel &lt;&lt; 12);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, 0x1680, temp1680);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_su_bfee_entry_del_88xx() - reset SU beamformee's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @userid : the SU BFee userid to be deleted</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfee_entry_del_88xx(struct halmac_adapter *halmac_adapter, u8 userid)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_SU_BFEE_ENTRY_DEL);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (userid) {</div><div class='del'>-	case 0:</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_TXBF_CTRL,</div><div class='del'>-			HALMAC_REG_READ_16(halmac_adapter, REG_TXBF_CTRL) &amp;</div><div class='del'>-				~(BIT_MASK_R_TXBF0_AID | BIT_R_TXBF0_20M |</div><div class='del'>-				  BIT_R_TXBF0_40M | BIT_R_TXBF0_80M));</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_ASSOCIATED_BFMEE_SEL,</div><div class='del'>-				    0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_TXBF_CTRL + 2,</div><div class='del'>-			HALMAC_REG_READ_16(halmac_adapter, REG_TXBF_CTRL + 2) &amp;</div><div class='del'>-				~(BIT_MASK_R_TXBF1_AID | BIT_R_TXBF0_20M |</div><div class='del'>-				  BIT_R_TXBF0_40M | BIT_R_TXBF0_80M));</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMEE_SEL + 2, 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid userid %d\n", __func__,</div><div class='del'>-		       userid);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_su_bfee_entry_del_88xx() - reset SU beamformer's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @userid : the SU BFer userid to be deleted</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfer_entry_del_88xx(struct halmac_adapter *halmac_adapter, u8 userid)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_SU_BFER_ENTRY_DEL);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (userid) {</div><div class='del'>-	case 0:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO,</div><div class='del'>-				    0);</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMER0_INFO + 4, 0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER1_INFO,</div><div class='del'>-				    0);</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter,</div><div class='del'>-				    REG_ASSOCIATED_BFMER1_INFO + 4, 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid userid %d\n", __func__,</div><div class='del'>-		       userid);</div><div class='del'>-		return HALMAC_RET_INVALID_SOUNDING_SETTING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mu_bfee_entry_del_88xx() - reset MU beamformee's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @userid : the MU STA userid to be deleted</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfee_entry_del_88xx(struct halmac_adapter *halmac_adapter, u8 userid)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_MU_BFEE_ENTRY_DEL);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, 0x1680 + userid * 2, 0);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL,</div><div class='del'>-			   HALMAC_REG_READ_8(halmac_adapter, REG_MU_TX_CTL) &amp;</div><div class='del'>-				   ~(BIT(userid - 2)));</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_mu_bfer_entry_del_88xx() -reset MU beamformer's registers</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfer_entry_del_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_MU_BFER_ENTRY_DEL);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO, 0);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_ASSOCIATED_BFMER0_INFO + 4, 0);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, 0x1680, 0);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_MU_TX_CTL, 0);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_add_ch_info_88xx() -add channel information</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @ch_info : channel information</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_add_ch_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			struct halmac_ch_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_cs_info *ch_sw_info;</div><div class='del'>-	enum halmac_scan_cmd_construct_state state_scan;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	ch_sw_info = &amp;halmac_adapter-&gt;ch_sw_info;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.dlfw_state != HALMAC_GEN_INFO_SENT) {</div><div class='del'>-		pr_err("[ERR]%s: gen_info is not send to FW!!!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_GEN_INFO_NOT_SENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state_scan = halmac_query_scan_curr_state_88xx(halmac_adapter);</div><div class='del'>-	if (state_scan != HALMAC_SCAN_CMD_CONSTRUCT_BUFFER_CLEARED &amp;&amp;</div><div class='del'>-	    state_scan != HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_WARNING,</div><div class='del'>-				"[WARN]Scan machine fail(add ch info)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ch_sw_info-&gt;ch_info_buf) {</div><div class='del'>-		ch_sw_info-&gt;ch_info_buf =</div><div class='del'>-			kzalloc(HALMAC_EXTRA_INFO_BUFF_SIZE_88XX, GFP_KERNEL);</div><div class='del'>-		if (!ch_sw_info-&gt;ch_info_buf)</div><div class='del'>-			return HALMAC_RET_NULL_POINTER;</div><div class='del'>-		ch_sw_info-&gt;ch_info_buf_w = ch_sw_info-&gt;ch_info_buf;</div><div class='del'>-		ch_sw_info-&gt;buf_size = HALMAC_EXTRA_INFO_BUFF_SIZE_88XX;</div><div class='del'>-		ch_sw_info-&gt;avai_buf_size = HALMAC_EXTRA_INFO_BUFF_SIZE_88XX;</div><div class='del'>-		ch_sw_info-&gt;total_size = 0;</div><div class='del'>-		ch_sw_info-&gt;extra_info_en = 0;</div><div class='del'>-		ch_sw_info-&gt;ch_num = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ch_sw_info-&gt;extra_info_en == 1) {</div><div class='del'>-		pr_err("[ERR]%s: construct sequence wrong!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_CH_SW_SEQ_WRONG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ch_sw_info-&gt;avai_buf_size &lt; 4) {</div><div class='del'>-		pr_err("[ERR]%s: no available buffer!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_CH_SW_NO_BUF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_scan_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	CHANNEL_INFO_SET_CHANNEL(ch_sw_info-&gt;ch_info_buf_w, ch_info-&gt;channel);</div><div class='del'>-	CHANNEL_INFO_SET_PRI_CH_IDX(ch_sw_info-&gt;ch_info_buf_w,</div><div class='del'>-				    ch_info-&gt;pri_ch_idx);</div><div class='del'>-	CHANNEL_INFO_SET_BANDWIDTH(ch_sw_info-&gt;ch_info_buf_w, ch_info-&gt;bw);</div><div class='del'>-	CHANNEL_INFO_SET_TIMEOUT(ch_sw_info-&gt;ch_info_buf_w, ch_info-&gt;timeout);</div><div class='del'>-	CHANNEL_INFO_SET_ACTION_ID(ch_sw_info-&gt;ch_info_buf_w,</div><div class='del'>-				   ch_info-&gt;action_id);</div><div class='del'>-	CHANNEL_INFO_SET_CH_EXTRA_INFO(ch_sw_info-&gt;ch_info_buf_w,</div><div class='del'>-				       ch_info-&gt;extra_info);</div><div class='del'>-</div><div class='del'>-	ch_sw_info-&gt;avai_buf_size = ch_sw_info-&gt;avai_buf_size - 4;</div><div class='del'>-	ch_sw_info-&gt;total_size = ch_sw_info-&gt;total_size + 4;</div><div class='del'>-	ch_sw_info-&gt;ch_num++;</div><div class='del'>-	ch_sw_info-&gt;extra_info_en = ch_info-&gt;extra_info;</div><div class='del'>-	ch_sw_info-&gt;ch_info_buf_w = ch_sw_info-&gt;ch_info_buf_w + 4;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_add_extra_ch_info_88xx() -add extra channel information</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @ch_extra_info : extra channel information</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_add_extra_ch_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_ch_extra_info *ch_extra_info)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_cs_info *ch_sw_info;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_ADD_EXTRA_CH_INFO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	ch_sw_info = &amp;halmac_adapter-&gt;ch_sw_info;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (!ch_sw_info-&gt;ch_info_buf) {</div><div class='del'>-		pr_err("%s: NULL==ch_sw_info-&gt;ch_info_buf!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_CH_SW_SEQ_WRONG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ch_sw_info-&gt;extra_info_en == 0) {</div><div class='del'>-		pr_err("%s: construct sequence wrong!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_CH_SW_SEQ_WRONG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ch_sw_info-&gt;avai_buf_size &lt;</div><div class='del'>-	    (u32)(ch_extra_info-&gt;extra_info_size + 2)) {</div><div class='del'>-		/* +2: ch_extra_info_id, ch_extra_info, ch_extra_info_size</div><div class='del'>-		 * are totally 2Byte</div><div class='del'>-		 */</div><div class='del'>-		pr_err("%s: no available buffer!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_CH_SW_NO_BUF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_query_scan_curr_state_88xx(halmac_adapter) !=</div><div class='del'>-	    HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Scan machine fail(add extra ch info)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_scan_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	CH_EXTRA_INFO_SET_CH_EXTRA_INFO_ID(ch_sw_info-&gt;ch_info_buf_w,</div><div class='del'>-					   ch_extra_info-&gt;extra_action_id);</div><div class='del'>-	CH_EXTRA_INFO_SET_CH_EXTRA_INFO(ch_sw_info-&gt;ch_info_buf_w,</div><div class='del'>-					ch_extra_info-&gt;extra_info);</div><div class='del'>-	CH_EXTRA_INFO_SET_CH_EXTRA_INFO_SIZE(ch_sw_info-&gt;ch_info_buf_w,</div><div class='del'>-					     ch_extra_info-&gt;extra_info_size);</div><div class='del'>-	memcpy(ch_sw_info-&gt;ch_info_buf_w + 2, ch_extra_info-&gt;extra_info_data,</div><div class='del'>-	       ch_extra_info-&gt;extra_info_size);</div><div class='del'>-</div><div class='del'>-	ch_sw_info-&gt;avai_buf_size = ch_sw_info-&gt;avai_buf_size -</div><div class='del'>-				    (2 + ch_extra_info-&gt;extra_info_size);</div><div class='del'>-	ch_sw_info-&gt;total_size =</div><div class='del'>-		ch_sw_info-&gt;total_size + (2 + ch_extra_info-&gt;extra_info_size);</div><div class='del'>-	ch_sw_info-&gt;extra_info_en = ch_extra_info-&gt;extra_info;</div><div class='del'>-	ch_sw_info-&gt;ch_info_buf_w = ch_sw_info-&gt;ch_info_buf_w +</div><div class='del'>-				    (2 + ch_extra_info-&gt;extra_info_size);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_ctrl_ch_switch_88xx() -send channel switch cmd</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @cs_option : channel switch config</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_ctrl_ch_switch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   struct halmac_ch_switch_option *cs_option)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_scan_cmd_construct_state state_scan;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.scan_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CTRL_CH_SWITCH);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s  cs_option-&gt;switch_en = %d==========&gt;\n", __func__,</div><div class='del'>-			cs_option-&gt;switch_en);</div><div class='del'>-</div><div class='del'>-	if (!cs_option-&gt;switch_en)</div><div class='del'>-		*process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING ||</div><div class='del'>-	    *process_status == HALMAC_CMD_PROCESS_RCVD) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(ctrl ch switch)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state_scan = halmac_query_scan_curr_state_88xx(halmac_adapter);</div><div class='del'>-	if (cs_option-&gt;switch_en) {</div><div class='del'>-		if (state_scan != HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING) {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C,</div><div class='del'>-					DBG_DMESG,</div><div class='del'>-					"%s(on)  invalid in state %x\n",</div><div class='del'>-					__func__, state_scan);</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (state_scan != HALMAC_SCAN_CMD_CONSTRUCT_BUFFER_CLEARED) {</div><div class='del'>-			HALMAC_RT_TRACE(</div><div class='del'>-				driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-				"%s(off)  invalid in state %x\n", __func__,</div><div class='del'>-				state_scan);</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_ctrl_ch_switch_88xx(halmac_adapter, cs_option);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_ctrl_ch_switch FAIL = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_clear_ch_info_88xx() -clear channel information</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_clear_ch_info_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CLEAR_CH_INFO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_query_scan_curr_state_88xx(halmac_adapter) ==</div><div class='del'>-	    HALMAC_SCAN_CMD_CONSTRUCT_H2C_SENT) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Scan machine fail(clear ch info)...\n");</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_scan_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_SCAN_CMD_CONSTRUCT_BUFFER_CLEARED) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	kfree(halmac_adapter-&gt;ch_sw_info.ch_info_buf);</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_info_buf = NULL;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_info_buf_w = NULL;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.extra_info_en = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.avai_buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.total_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_num = 0;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_p2pps_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					 struct halmac_p2pps *p2p_ps)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 6)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	status = halmac_func_p2pps_88xx(halmac_adapter, p2p_ps);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("[ERR]halmac_p2pps FAIL = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_p2pps_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		       struct halmac_p2pps *p2p_ps)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]halmac_p2pps !!\n");</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	P2PPS_SET_OFFLOAD_EN(h2c_buff, p2p_ps-&gt;offload_en);</div><div class='del'>-	P2PPS_SET_ROLE(h2c_buff, p2p_ps-&gt;role);</div><div class='del'>-	P2PPS_SET_CTWINDOW_EN(h2c_buff, p2p_ps-&gt;ctwindow_en);</div><div class='del'>-	P2PPS_SET_NOA_EN(h2c_buff, p2p_ps-&gt;noa_en);</div><div class='del'>-	P2PPS_SET_NOA_SEL(h2c_buff, p2p_ps-&gt;noa_sel);</div><div class='del'>-	P2PPS_SET_ALLSTASLEEP(h2c_buff, p2p_ps-&gt;all_sta_sleep);</div><div class='del'>-	P2PPS_SET_DISCOVERY(h2c_buff, p2p_ps-&gt;discovery);</div><div class='del'>-	P2PPS_SET_P2P_PORT_ID(h2c_buff, p2p_ps-&gt;p2p_port_id);</div><div class='del'>-	P2PPS_SET_P2P_GROUP(h2c_buff, p2p_ps-&gt;p2p_group);</div><div class='del'>-	P2PPS_SET_P2P_MACID(h2c_buff, p2p_ps-&gt;p2p_macid);</div><div class='del'>-</div><div class='del'>-	P2PPS_SET_CTWINDOW_LENGTH(h2c_buff, p2p_ps-&gt;ctwindow_length);</div><div class='del'>-</div><div class='del'>-	P2PPS_SET_NOA_DURATION_PARA(h2c_buff, p2p_ps-&gt;noa_duration_para);</div><div class='del'>-	P2PPS_SET_NOA_INTERVAL_PARA(h2c_buff, p2p_ps-&gt;noa_interval_para);</div><div class='del'>-	P2PPS_SET_NOA_START_TIME_PARA(h2c_buff, p2p_ps-&gt;noa_start_time_para);</div><div class='del'>-	P2PPS_SET_NOA_COUNT_PARA(h2c_buff, p2p_ps-&gt;noa_count_para);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_P2PPS;</div><div class='del'>-	h2c_header_info.content_size = 24;</div><div class='del'>-	h2c_header_info.ack = false;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, false);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		pr_err("[ERR]halmac_send_h2c_p2pps_88xx Fail = %x!!\n", 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'>- * halmac_send_general_info_88xx() -send general information to FW</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @general_info : general information</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_general_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_general_info *general_info)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;fw_version.h2c_version &lt; 4)</div><div class='del'>-		return HALMAC_RET_FW_NO_SUPPORT;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_SEND_GENERAL_INFO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.dlfw_state == HALMAC_DLFW_NONE) {</div><div class='del'>-		pr_err("%s Fail due to DLFW NONE!!\n", __func__);</div><div class='del'>-		return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_func_send_general_info_88xx(halmac_adapter,</div><div class='del'>-						    general_info);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_general_info error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.dlfw_state == HALMAC_DLFW_DONE)</div><div class='del'>-		halmac_adapter-&gt;halmac_state.dlfw_state = HALMAC_GEN_INFO_SENT;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;gen_info_valid = true;</div><div class='del'>-	memcpy(&amp;halmac_adapter-&gt;general_info, general_info,</div><div class='del'>-	       sizeof(struct halmac_general_info));</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_start_iqk_88xx() -trigger FW IQK</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @iqk_para : IQK parameter</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_start_iqk_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		      struct halmac_iqk_para_ *iqk_para)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_num = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.iqk_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_START_IQK);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(iqk)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	IQK_SET_CLEAR(h2c_buff, iqk_para-&gt;clear);</div><div class='del'>-	IQK_SET_SEGMENT_IQK(h2c_buff, iqk_para-&gt;segment_iqk);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_IQK;</div><div class='del'>-	h2c_header_info.content_size = 1;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_num);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.iqk_set.seq_num = h2c_seq_num;</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_ctrl_pwr_tracking_88xx() -trigger FW power tracking</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @pwr_tracking_opt : power tracking option</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_ctrl_pwr_tracking_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	struct halmac_pwr_tracking_option *pwr_tracking_opt)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.power_tracking_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CTRL_PWR_TRACKING);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_start_iqk_88xx ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(pwr tracking)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	POWER_TRACKING_SET_TYPE(h2c_buff, pwr_tracking_opt-&gt;type);</div><div class='del'>-	POWER_TRACKING_SET_BBSWING_INDEX(h2c_buff,</div><div class='del'>-					 pwr_tracking_opt-&gt;bbswing_index);</div><div class='del'>-	POWER_TRACKING_SET_ENABLE_A(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_A].enable);</div><div class='del'>-	POWER_TRACKING_SET_TX_PWR_INDEX_A(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_A]</div><div class='del'>-				  .tx_pwr_index);</div><div class='del'>-	POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_A(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_A]</div><div class='del'>-				  .pwr_tracking_offset_value);</div><div class='del'>-	POWER_TRACKING_SET_TSSI_VALUE_A(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_A]</div><div class='del'>-				  .tssi_value);</div><div class='del'>-	POWER_TRACKING_SET_ENABLE_B(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_B].enable);</div><div class='del'>-	POWER_TRACKING_SET_TX_PWR_INDEX_B(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_B]</div><div class='del'>-				  .tx_pwr_index);</div><div class='del'>-	POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_B(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_B]</div><div class='del'>-				  .pwr_tracking_offset_value);</div><div class='del'>-	POWER_TRACKING_SET_TSSI_VALUE_B(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_B]</div><div class='del'>-				  .tssi_value);</div><div class='del'>-	POWER_TRACKING_SET_ENABLE_C(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_C].enable);</div><div class='del'>-	POWER_TRACKING_SET_TX_PWR_INDEX_C(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_C]</div><div class='del'>-				  .tx_pwr_index);</div><div class='del'>-	POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_C(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_C]</div><div class='del'>-				  .pwr_tracking_offset_value);</div><div class='del'>-	POWER_TRACKING_SET_TSSI_VALUE_C(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_C]</div><div class='del'>-				  .tssi_value);</div><div class='del'>-	POWER_TRACKING_SET_ENABLE_D(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_D].enable);</div><div class='del'>-	POWER_TRACKING_SET_TX_PWR_INDEX_D(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_D]</div><div class='del'>-				  .tx_pwr_index);</div><div class='del'>-	POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_D(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_D]</div><div class='del'>-				  .pwr_tracking_offset_value);</div><div class='del'>-	POWER_TRACKING_SET_TSSI_VALUE_D(</div><div class='del'>-		h2c_buff, pwr_tracking_opt-&gt;pwr_tracking_para[HALMAC_RF_PATH_D]</div><div class='del'>-				  .tssi_value);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_POWER_TRACKING;</div><div class='del'>-	h2c_header_info.content_size = 20;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.power_tracking_set.seq_num = h2c_seq_mum;</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_start_iqk_88xx &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_query_status_88xx() -query the offload feature status</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @feature_id : feature_id</div><div class='del'>- * @process_status : feature_status</div><div class='del'>- * @data : data buffer</div><div class='del'>- * @size : data size</div><div class='del'>- *</div><div class='del'>- * Note :</div><div class='del'>- * If user wants to know the data size, use can allocate zero</div><div class='del'>- * size buffer first. If this size less than the data size, halmac</div><div class='del'>- * will return  HALMAC_RET_BUFFER_TOO_SMALL. User need to</div><div class='del'>- * re-allocate data buffer with correct data size.</div><div class='del'>- *</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_query_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_feature_id feature_id,</div><div class='del'>-			 enum halmac_cmd_process_status *process_status,</div><div class='del'>-			 u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_QUERY_STATE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	if (!process_status) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-				"null pointer!!\n");</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (feature_id) {</div><div class='del'>-	case HALMAC_FEATURE_CFG_PARA:</div><div class='del'>-		status = halmac_query_cfg_para_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE:</div><div class='del'>-		status = halmac_query_dump_physical_efuse_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_DUMP_LOGICAL_EFUSE:</div><div class='del'>-		status = halmac_query_dump_logical_efuse_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_CHANNEL_SWITCH:</div><div class='del'>-		status = halmac_query_channel_switch_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_UPDATE_PACKET:</div><div class='del'>-		status = halmac_query_update_packet_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_IQK:</div><div class='del'>-		status = halmac_query_iqk_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_POWER_TRACKING:</div><div class='del'>-		status = halmac_query_power_tracking_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_PSD:</div><div class='del'>-		status = halmac_query_psd_status_88xx(</div><div class='del'>-			halmac_adapter, process_status, data, size);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid feature id %d\n", __func__,</div><div class='del'>-		       feature_id);</div><div class='del'>-		return HALMAC_RET_INVALID_FEATURE_ID;</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'>- * halmac_reset_feature_88xx() -reset async api cmd status</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @feature_id : feature_id</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status.</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reset_feature_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_feature_id feature_id)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_state *state = &amp;halmac_adapter-&gt;halmac_state;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_RESET_FEATURE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	switch (feature_id) {</div><div class='del'>-	case HALMAC_FEATURE_CFG_PARA:</div><div class='del'>-		state-&gt;cfg_para_state_set.process_status =</div><div class='del'>-			HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		state-&gt;cfg_para_state_set.cfg_para_cmd_construct_state =</div><div class='del'>-			HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE:</div><div class='del'>-	case HALMAC_FEATURE_DUMP_LOGICAL_EFUSE:</div><div class='del'>-		state-&gt;efuse_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		state-&gt;efuse_state_set.efuse_cmd_construct_state =</div><div class='del'>-			HALMAC_EFUSE_CMD_CONSTRUCT_IDLE;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_CHANNEL_SWITCH:</div><div class='del'>-		state-&gt;scan_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		state-&gt;scan_state_set.scan_cmd_construct_state =</div><div class='del'>-			HALMAC_SCAN_CMD_CONSTRUCT_IDLE;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_UPDATE_PACKET:</div><div class='del'>-		state-&gt;update_packet_set.process_status =</div><div class='del'>-			HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_FEATURE_ALL:</div><div class='del'>-		state-&gt;cfg_para_state_set.process_status =</div><div class='del'>-			HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		state-&gt;cfg_para_state_set.cfg_para_cmd_construct_state =</div><div class='del'>-			HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE;</div><div class='del'>-		state-&gt;efuse_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		state-&gt;efuse_state_set.efuse_cmd_construct_state =</div><div class='del'>-			HALMAC_EFUSE_CMD_CONSTRUCT_IDLE;</div><div class='del'>-		state-&gt;scan_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		state-&gt;scan_state_set.scan_cmd_construct_state =</div><div class='del'>-			HALMAC_SCAN_CMD_CONSTRUCT_IDLE;</div><div class='del'>-		state-&gt;update_packet_set.process_status =</div><div class='del'>-			HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s invalid feature id %d\n", __func__,</div><div class='del'>-		       feature_id);</div><div class='del'>-		return HALMAC_RET_INVALID_FEATURE_ID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_check_fw_status_88xx() -check fw status</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @fw_status : fw status</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_check_fw_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    bool *fw_status)</div><div class='del'>-{</div><div class='del'>-	u32 value32 = 0, value32_backup = 0, i = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CHECK_FW_STATUS);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	value32 = PLATFORM_REG_READ_32(driver_adapter, REG_FW_DBG6);</div><div class='del'>-</div><div class='del'>-	if (value32 != 0) {</div><div class='del'>-		pr_err("halmac_check_fw_status REG_FW_DBG6 !=0\n");</div><div class='del'>-		*fw_status = false;</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value32_backup = PLATFORM_REG_READ_32(driver_adapter, REG_FW_DBG7);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= 10; i++) {</div><div class='del'>-		value32 = PLATFORM_REG_READ_32(driver_adapter, REG_FW_DBG7);</div><div class='del'>-		if (value32_backup != value32)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (i == 10) {</div><div class='del'>-			pr_err("halmac_check_fw_status Polling FW PC fail\n");</div><div class='del'>-			*fw_status = false;</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_fw_dmem_88xx(struct halmac_adapter *halmac_adapter, u8 *dmem,</div><div class='del'>-			 u32 *size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DUMP_FW_DMEM);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</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'>- * halmac_cfg_max_dl_size_88xx() - config max download FW size</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @size : max download fw size</div><div class='del'>- *</div><div class='del'>- * Halmac uses this setting to set max packet size for</div><div class='del'>- * download FW.</div><div class='del'>- * If user has not called this API, halmac use default</div><div class='del'>- * setting for download FW</div><div class='del'>- * Note1 : size need multiple of 2</div><div class='del'>- * Note2 : max size is 31K</div><div class='del'>- *</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_max_dl_size_88xx(struct halmac_adapter *halmac_adapter, u32 size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_MAX_DL_SIZE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_FW, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (size &gt; HALMAC_FW_CFG_MAX_DL_SIZE_MAX_88XX) {</div><div class='del'>-		pr_err("size &gt; HALMAC_FW_CFG_MAX_DL_SIZE_MAX!\n");</div><div class='del'>-		return HALMAC_RET_CFG_DLFW_SIZE_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((size &amp; (2 - 1)) != 0) {</div><div class='del'>-		pr_err("size is not power of 2!\n");</div><div class='del'>-		return HALMAC_RET_CFG_DLFW_SIZE_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;max_download_size = size;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_FW, DBG_DMESG,</div><div class='del'>-			"Cfg max size is : %X\n", size);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_FW, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_psd_88xx() - trigger fw psd</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @start_psd : start PSD</div><div class='del'>- * @end_psd : end PSD</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_psd_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				       u16 start_psd, u16 end_psd)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.psd_set.process_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_fw_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_NO_DLFW;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_PSD);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Wait event(psd)...\n");</div><div class='del'>-		return HALMAC_RET_BUSY_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(halmac_adapter-&gt;halmac_state.psd_set.data);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.psd_set.data = (u8 *)NULL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.psd_set.data_size = 0;</div><div class='del'>-	halmac_adapter-&gt;halmac_state.psd_set.segment_size = 0;</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	PSD_SET_START_PSD(h2c_buff, start_psd);</div><div class='del'>-	PSD_SET_END_PSD(h2c_buff, end_psd);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_PSD;</div><div class='del'>-	h2c_header_info.content_size = 4;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_la_mode_88xx() - config la mode</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @la_mode :</div><div class='del'>- *	disable : no TXFF space reserved for LA debug</div><div class='del'>- *	partial : partial TXFF space is reserved for LA debug</div><div class='del'>- *	full : all TXFF space is reserved for LA debug</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_la_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			enum halmac_la_mode la_mode)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_LA_MODE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;la_mode = %d\n", __func__,</div><div class='del'>-			la_mode);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.la_mode = la_mode;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_rx_fifo_expanding_mode_88xx() - rx fifo expanding</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @la_mode :</div><div class='del'>- *	disable : normal mode</div><div class='del'>- *	1 block : Rx FIFO + 1 FIFO block; Tx fifo - 1 FIFO block</div><div class='del'>- *	2 block : Rx FIFO + 2 FIFO block; Tx fifo - 2 FIFO block</div><div class='del'>- *	3 block : Rx FIFO + 3 FIFO block; Tx fifo - 3 FIFO block</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_cfg_rx_fifo_expanding_mode_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_rx_fifo_expanding_mode rx_fifo_expanding_mode)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_RX_FIFO_EXPANDING_MODE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-		"%s ==========&gt;rx_fifo_expanding_mode = %d\n", __func__,</div><div class='del'>-		rx_fifo_expanding_mode);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.rx_fifo_expanding_mode =</div><div class='del'>-		rx_fifo_expanding_mode;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_config_security_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    struct halmac_security_setting *sec_setting)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_CR,</div><div class='del'>-			    (u16)(HALMAC_REG_READ_16(halmac_adapter, REG_CR) |</div><div class='del'>-				  BIT_MAC_SEC_EN));</div><div class='del'>-</div><div class='del'>-	if (sec_setting-&gt;tx_encryption == 1)</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_SECCFG,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_SECCFG) | BIT(2));</div><div class='del'>-	else</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_SECCFG,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_SECCFG) &amp;</div><div class='del'>-				~(BIT(2)));</div><div class='del'>-</div><div class='del'>-	if (sec_setting-&gt;rx_decryption == 1)</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_SECCFG,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_SECCFG) | BIT(3));</div><div class='del'>-	else</div><div class='del'>-		HALMAC_REG_WRITE_8(</div><div class='del'>-			halmac_adapter, REG_SECCFG,</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_SECCFG) &amp;</div><div class='del'>-				~(BIT(3)));</div><div class='del'>-</div><div class='del'>-	if (sec_setting-&gt;bip_enable == 1) {</div><div class='del'>-		if (halmac_adapter-&gt;chip_id == HALMAC_CHIP_ID_8822B)</div><div class='del'>-			return HALMAC_RET_BIP_NO_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 halmac_get_used_cam_entry_num_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				      enum hal_security_type sec_type)</div><div class='del'>-{</div><div class='del'>-	u8 entry_num;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	switch (sec_type) {</div><div class='del'>-	case HAL_SECURITY_TYPE_WEP40:</div><div class='del'>-	case HAL_SECURITY_TYPE_WEP104:</div><div class='del'>-	case HAL_SECURITY_TYPE_TKIP:</div><div class='del'>-	case HAL_SECURITY_TYPE_AES128:</div><div class='del'>-	case HAL_SECURITY_TYPE_GCMP128:</div><div class='del'>-	case HAL_SECURITY_TYPE_GCMSMS4:</div><div class='del'>-	case HAL_SECURITY_TYPE_BIP:</div><div class='del'>-		entry_num = 1;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_WAPI:</div><div class='del'>-	case HAL_SECURITY_TYPE_AES256:</div><div class='del'>-	case HAL_SECURITY_TYPE_GCMP256:</div><div class='del'>-		entry_num = 2;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		entry_num = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return entry_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_write_cam_88xx(struct halmac_adapter *halmac_adapter, u32 entry_index,</div><div class='del'>-		      struct halmac_cam_entry_info *cam_entry_info)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 command = 0x80010000;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_cam_entry_format *cam_entry_format = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (entry_index &gt;= halmac_adapter-&gt;hw_config_info.cam_entry_num)</div><div class='del'>-		return HALMAC_RET_ENTRY_INDEX_ERROR;</div><div class='del'>-</div><div class='del'>-	if (cam_entry_info-&gt;key_id &gt; 3)</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-</div><div class='del'>-	cam_entry_format = kzalloc(sizeof(*cam_entry_format), GFP_KERNEL);</div><div class='del'>-	if (!cam_entry_format)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	cam_entry_format-&gt;key_id = cam_entry_info-&gt;key_id;</div><div class='del'>-	cam_entry_format-&gt;valid = cam_entry_info-&gt;valid;</div><div class='del'>-	memcpy(cam_entry_format-&gt;mac_address, cam_entry_info-&gt;mac_address, 6);</div><div class='del'>-	memcpy(cam_entry_format-&gt;key, cam_entry_info-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-	switch (cam_entry_info-&gt;security_type) {</div><div class='del'>-	case HAL_SECURITY_TYPE_NONE:</div><div class='del'>-		cam_entry_format-&gt;type = 0;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_WEP40:</div><div class='del'>-		cam_entry_format-&gt;type = 1;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_WEP104:</div><div class='del'>-		cam_entry_format-&gt;type = 5;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_TKIP:</div><div class='del'>-		cam_entry_format-&gt;type = 2;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_AES128:</div><div class='del'>-		cam_entry_format-&gt;type = 4;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_WAPI:</div><div class='del'>-		cam_entry_format-&gt;type = 6;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_AES256:</div><div class='del'>-		cam_entry_format-&gt;type = 4;</div><div class='del'>-		cam_entry_format-&gt;ext_sectype = 1;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_GCMP128:</div><div class='del'>-		cam_entry_format-&gt;type = 7;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_GCMP256:</div><div class='del'>-	case HAL_SECURITY_TYPE_GCMSMS4:</div><div class='del'>-		cam_entry_format-&gt;type = 7;</div><div class='del'>-		cam_entry_format-&gt;ext_sectype = 1;</div><div class='del'>-		break;</div><div class='del'>-	case HAL_SECURITY_TYPE_BIP:</div><div class='del'>-		cam_entry_format-&gt;type = cam_entry_info-&gt;unicast == 1 ? 4 : 0;</div><div class='del'>-		cam_entry_format-&gt;mgnt = 1;</div><div class='del'>-		cam_entry_format-&gt;grp = cam_entry_info-&gt;unicast == 1 ? 0 : 1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		kfree(cam_entry_format);</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_CAMWRITE,</div><div class='del'>-				    *((u32 *)cam_entry_format + i));</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_CAMCMD,</div><div class='del'>-				    command | ((entry_index &lt;&lt; 3) + i));</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-				"[TRACE]1 - CAM entry format : %X\n",</div><div class='del'>-				*((u32 *)cam_entry_format + i));</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-				"[TRACE]1 - REG_CAMCMD : %X\n",</div><div class='del'>-				command | ((entry_index &lt;&lt; 3) + i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cam_entry_info-&gt;security_type == HAL_SECURITY_TYPE_WAPI ||</div><div class='del'>-	    cam_entry_info-&gt;security_type == HAL_SECURITY_TYPE_AES256 ||</div><div class='del'>-	    cam_entry_info-&gt;security_type == HAL_SECURITY_TYPE_GCMP256 ||</div><div class='del'>-	    cam_entry_info-&gt;security_type == HAL_SECURITY_TYPE_GCMSMS4) {</div><div class='del'>-		cam_entry_format-&gt;mic = 1;</div><div class='del'>-		memcpy(cam_entry_format-&gt;key, cam_entry_info-&gt;key_ext, 16);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8; i++) {</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter, REG_CAMWRITE,</div><div class='del'>-					    *((u32 *)cam_entry_format + i));</div><div class='del'>-			HALMAC_REG_WRITE_32(</div><div class='del'>-				halmac_adapter, REG_CAMCMD,</div><div class='del'>-				command | (((entry_index + 1) &lt;&lt; 3) + i));</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON,</div><div class='del'>-					DBG_DMESG,</div><div class='del'>-					"[TRACE]2 - CAM entry format : %X\n",</div><div class='del'>-					*((u32 *)cam_entry_format + i));</div><div class='del'>-			HALMAC_RT_TRACE(</div><div class='del'>-				driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-				"[TRACE]2 - REG_CAMCMD : %X\n",</div><div class='del'>-				command | (((entry_index + 1) &lt;&lt; 3) + i));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(cam_entry_format);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"[TRACE]%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_cam_entry_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u32 entry_index,</div><div class='del'>-			   struct halmac_cam_entry_format *content)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 command = 0x80000000;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (entry_index &gt;= halmac_adapter-&gt;hw_config_info.cam_entry_num)</div><div class='del'>-		return HALMAC_RET_ENTRY_INDEX_ERROR;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_CAMCMD,</div><div class='del'>-				    command | ((entry_index &lt;&lt; 3) + i));</div><div class='del'>-		*((u32 *)content + i) =</div><div class='del'>-			HALMAC_REG_READ_32(halmac_adapter, REG_CAMREAD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_clear_cam_entry_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u32 entry_index)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 command = 0x80010000;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_cam_entry_format *cam_entry_format;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]halmac_clear_security_cam_88xx ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	if (entry_index &gt;= halmac_adapter-&gt;hw_config_info.cam_entry_num)</div><div class='del'>-		return HALMAC_RET_ENTRY_INDEX_ERROR;</div><div class='del'>-</div><div class='del'>-	cam_entry_format = kzalloc(sizeof(*cam_entry_format), GFP_KERNEL);</div><div class='del'>-	if (!cam_entry_format)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_CAMWRITE,</div><div class='del'>-				    *((u32 *)cam_entry_format + i));</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_CAMCMD,</div><div class='del'>-				    command | ((entry_index &lt;&lt; 3) + i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(cam_entry_format);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]halmac_clear_security_cam_88xx &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_hw_value_88xx() -get hw config value</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @hw_id : hw id for driver to query</div><div class='del'>- * @pvalue : hw value, reference table to get data type</div><div class='del'>- * Author : KaiYuan Chang / Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_hw_value_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_hw_id hw_id, void *pvalue)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_GET_HW_VALUE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (!pvalue) {</div><div class='del'>-		pr_err("%s (!pvalue)==========&gt;\n", __func__);</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (hw_id) {</div><div class='del'>-	case HALMAC_HW_RQPN_MAPPING:</div><div class='del'>-		((struct halmac_rqpn_map *)pvalue)-&gt;dma_map_vo =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VO];</div><div class='del'>-		((struct halmac_rqpn_map *)pvalue)-&gt;dma_map_vi =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VI];</div><div class='del'>-		((struct halmac_rqpn_map *)pvalue)-&gt;dma_map_be =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BE];</div><div class='del'>-		((struct halmac_rqpn_map *)pvalue)-&gt;dma_map_bk =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BK];</div><div class='del'>-		((struct halmac_rqpn_map *)pvalue)-&gt;dma_map_mg =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_MG];</div><div class='del'>-		((struct halmac_rqpn_map *)pvalue)-&gt;dma_map_hi =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_HI];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_EFUSE_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.efuse_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_EEPROM_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_BT_BANK_EFUSE_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.bt_efuse_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_BT_BANK1_EFUSE_SIZE:</div><div class='del'>-	case HALMAC_HW_BT_BANK2_EFUSE_SIZE:</div><div class='del'>-		*(u32 *)pvalue = 0;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_TXFIFO_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.tx_fifo_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_RSVD_PG_BNDY:</div><div class='del'>-		*(u16 *)pvalue =</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_bndy;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_CAM_ENTRY_NUM:</div><div class='del'>-		*(u8 *)pvalue = halmac_adapter-&gt;hw_config_info.cam_entry_num;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_WLAN_EFUSE_AVAILABLE_SIZE: /*Remove later*/</div><div class='del'>-		status = halmac_dump_logical_efuse_map_88xx(halmac_adapter,</div><div class='del'>-							    HALMAC_EFUSE_R_DRV);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-			return status;</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.efuse_size -</div><div class='del'>-				 HALMAC_PROTECTED_EFUSE_SIZE_88XX -</div><div class='del'>-				 halmac_adapter-&gt;efuse_end;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_IC_VERSION:</div><div class='del'>-		*(u8 *)pvalue = halmac_adapter-&gt;chip_version;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_PAGE_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.page_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_TX_AGG_ALIGN_SIZE:</div><div class='del'>-		*(u16 *)pvalue = halmac_adapter-&gt;hw_config_info.tx_align_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_RX_AGG_ALIGN_SIZE:</div><div class='del'>-		*(u8 *)pvalue = 8;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_DRV_INFO_SIZE:</div><div class='del'>-		*(u8 *)pvalue = halmac_adapter-&gt;drv_info_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_TXFF_ALLOCATION:</div><div class='del'>-		memcpy(pvalue, &amp;halmac_adapter-&gt;txff_allocation,</div><div class='del'>-		       sizeof(struct halmac_txff_allocation));</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_TX_DESC_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.txdesc_size;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_RX_DESC_SIZE:</div><div class='del'>-		*(u32 *)pvalue = halmac_adapter-&gt;hw_config_info.rxdesc_size;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return HALMAC_RET_PARA_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_set_hw_value_88xx() -set hw config value</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @hw_id : hw id for driver to config</div><div class='del'>- * @pvalue : hw value, reference table to get data type</div><div class='del'>- * Author : KaiYuan Chang / Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_hw_value_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_hw_id hw_id, void *pvalue)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_GET_HW_VALUE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (!pvalue) {</div><div class='del'>-		pr_err("%s (!pvalue)==========&gt;\n", __func__);</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (hw_id) {</div><div class='del'>-	case HALMAC_HW_USB_MODE:</div><div class='del'>-		status = halmac_set_usb_mode_88xx(</div><div class='del'>-			halmac_adapter, *(enum halmac_usb_mode *)pvalue);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-			return status;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_SEQ_EN:</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_BANDWIDTH:</div><div class='del'>-		halmac_cfg_bw_88xx(halmac_adapter, *(enum halmac_bw *)pvalue);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_CHANNEL:</div><div class='del'>-		halmac_cfg_ch_88xx(halmac_adapter, *(u8 *)pvalue);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_PRI_CHANNEL_IDX:</div><div class='del'>-		halmac_cfg_pri_ch_idx_88xx(halmac_adapter,</div><div class='del'>-					   *(enum halmac_pri_ch_idx *)pvalue);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_EN_BB_RF:</div><div class='del'>-		halmac_enable_bb_rf_88xx(halmac_adapter, *(u8 *)pvalue);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_SDIO_TX_PAGE_THRESHOLD:</div><div class='del'>-		halmac_config_sdio_tx_page_threshold_88xx(</div><div class='del'>-			halmac_adapter,</div><div class='del'>-			(struct halmac_tx_page_threshold_info *)pvalue);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_HW_AMPDU_CONFIG:</div><div class='del'>-		halmac_config_ampdu_88xx(halmac_adapter,</div><div class='del'>-					 (struct halmac_ampdu_config *)pvalue);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return HALMAC_RET_PARA_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_drv_rsvd_pg_num_88xx() -config reserved page number for driver</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @pg_num : page number</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_drv_rsvd_pg_num_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				enum halmac_drv_rsvd_pg_num pg_num)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_DRV_RSVD_PG_NUM);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;pg_num = %d\n", __func__,</div><div class='del'>-			pg_num);</div><div class='del'>-</div><div class='del'>-	switch (pg_num) {</div><div class='del'>-	case HALMAC_RSVD_PG_NUM16:</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num = 16;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_RSVD_PG_NUM24:</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num = 24;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_RSVD_PG_NUM32:</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num = 32;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_chip_version_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     struct halmac_ver *version)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-	version-&gt;major_ver = (u8)HALMAC_MAJOR_VER_88XX;</div><div class='del'>-	version-&gt;prototype_ver = (u8)HALMAC_PROTOTYPE_VER_88XX;</div><div class='del'>-	version-&gt;minor_ver = (u8)HALMAC_MINOR_VER_88XX;</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_chk_txdesc_88xx() -check if the tx packet format is incorrect</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_buf : tx Packet buffer, tx desc is included</div><div class='del'>- * @halmac_size : tx packet size</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_chk_txdesc_88xx(struct halmac_adapter *halmac_adapter, u8 *halmac_buf,</div><div class='del'>-		       u32 halmac_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (GET_TX_DESC_BMC(halmac_buf))</div><div class='del'>-		if (GET_TX_DESC_AGG_EN(halmac_buf))</div><div class='del'>-			pr_err("TxDesc: Agg should not be set when BMC\n");</div><div class='del'>-</div><div class='del'>-	if (halmac_size &lt; (GET_TX_DESC_TXPKTSIZE(halmac_buf) +</div><div class='del'>-			   GET_TX_DESC_OFFSET(halmac_buf)))</div><div class='del'>-		pr_err("TxDesc: PktSize too small\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_dl_drv_rsvd_page_88xx() - download packet to rsvd page</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @pg_offset : page offset of driver's rsvd page</div><div class='del'>- * @halmac_buf : data to be downloaded, tx_desc is not included</div><div class='del'>- * @halmac_size : data size to be downloaded</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dl_drv_rsvd_page_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 pg_offset, u8 *halmac_buf, u32 halmac_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status ret_status;</div><div class='del'>-	u16 drv_pg_bndy = 0;</div><div class='del'>-	u32 dl_pg_num = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DL_DRV_RSVD_PG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	/*check boundary and size valid*/</div><div class='del'>-	dl_pg_num = halmac_size / halmac_adapter-&gt;hw_config_info.page_size +</div><div class='del'>-		    ((halmac_size &amp;</div><div class='del'>-		      (halmac_adapter-&gt;hw_config_info.page_size - 1)) ?</div><div class='del'>-			     1 :</div><div class='del'>-			     0);</div><div class='del'>-	if (pg_offset + dl_pg_num &gt;</div><div class='del'>-	    halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_num) {</div><div class='del'>-		pr_err("[ERROR] driver download offset or size error ==========&gt;\n");</div><div class='del'>-		return HALMAC_RET_DRV_DL_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*update to target download boundary*/</div><div class='del'>-	drv_pg_bndy =</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_drv_pg_bndy + pg_offset;</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    (u16)(drv_pg_bndy &amp; BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_download_rsvd_page_88xx(halmac_adapter, halmac_buf,</div><div class='del'>-						    halmac_size);</div><div class='del'>-</div><div class='del'>-	/*restore to original bundary*/</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_download_rsvd_page_88xx Fail = %x!!\n",</div><div class='del'>-		       ret_status);</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			(u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-			      BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt; ==========\n", __func__);</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_csi_rate_88xx() - config CSI frame Tx rate</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @rssi : rssi in decimal value</div><div class='del'>- * @current_rate : current CSI frame rate</div><div class='del'>- * @fixrate_en : enable to fix CSI frame in VHT rate, otherwise legacy OFDM rate</div><div class='del'>- * @new_rate : API returns the final CSI frame rate</div><div class='del'>- * Author : chunchu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_csi_rate_88xx(struct halmac_adapter *halmac_adapter, u8 rssi,</div><div class='del'>-			 u8 current_rate, u8 fixrate_en, u8 *new_rate)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u32 temp_csi_setting;</div><div class='del'>-	u16 current_rrsr;</div><div class='del'>-	enum halmac_ret_status ret_status;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_CSI_RATE);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_SND, DBG_DMESG,</div><div class='del'>-			"&lt;%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	temp_csi_setting = HALMAC_REG_READ_32(halmac_adapter, REG_BBPSF_CTRL) &amp;</div><div class='del'>-			   ~(BIT_MASK_WMAC_CSI_RATE &lt;&lt; BIT_SHIFT_WMAC_CSI_RATE);</div><div class='del'>-</div><div class='del'>-	current_rrsr = HALMAC_REG_READ_16(halmac_adapter, REG_RRSR);</div><div class='del'>-</div><div class='del'>-	if (rssi &gt;= 40) {</div><div class='del'>-		if (current_rate != HALMAC_OFDM54) {</div><div class='del'>-			HALMAC_REG_WRITE_16(halmac_adapter, REG_RRSR,</div><div class='del'>-					    current_rrsr | BIT(HALMAC_OFDM54));</div><div class='del'>-			HALMAC_REG_WRITE_32(</div><div class='del'>-				halmac_adapter, REG_BBPSF_CTRL,</div><div class='del'>-				temp_csi_setting |</div><div class='del'>-					BIT_WMAC_CSI_RATE(HALMAC_OFDM54));</div><div class='del'>-		}</div><div class='del'>-		*new_rate = HALMAC_OFDM54;</div><div class='del'>-		ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-	} else {</div><div class='del'>-		if (current_rate != HALMAC_OFDM24) {</div><div class='del'>-			HALMAC_REG_WRITE_16(halmac_adapter, REG_RRSR,</div><div class='del'>-					    current_rrsr &amp;</div><div class='del'>-						    ~(BIT(HALMAC_OFDM54)));</div><div class='del'>-			HALMAC_REG_WRITE_32(</div><div class='del'>-				halmac_adapter, REG_BBPSF_CTRL,</div><div class='del'>-				temp_csi_setting |</div><div class='del'>-					BIT_WMAC_CSI_RATE(HALMAC_OFDM24));</div><div class='del'>-		}</div><div class='del'>-		*new_rate = HALMAC_OFDM24;</div><div class='del'>-		ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_sdio_cmd53_4byte_88xx() - cmd53 only for 4byte len register IO</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @enable : 1-&gt;CMD53 only use in 4byte reg, 0 : No limitation</div><div class='del'>- * Author : Ivan Lin/KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_sdio_cmd53_4byte_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     enum halmac_sdio_cmd53_4byte_mode cmd53_4byte_mode)</div><div class='del'>-{</div><div class='del'>-	halmac_adapter-&gt;sdio_cmd53_4byte = cmd53_4byte_mode;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_txfifo_is_empty_88xx() -check if txfifo is empty</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_txfifo_is_empty_88xx(struct halmac_adapter *halmac_adapter, u32 chk_num)</div><div class='del'>-{</div><div class='del'>-	u32 counter;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	counter = (chk_num &lt;= 10) ? 10 : chk_num;</div><div class='del'>-	do {</div><div class='del'>-		if (HALMAC_REG_READ_8(halmac_adapter, REG_TXPKT_EMPTY) != 0xFF)</div><div class='del'>-			return HALMAC_RET_TXFIFO_NO_EMPTY;</div><div class='del'>-</div><div class='del'>-		if ((HALMAC_REG_READ_8(halmac_adapter, REG_TXPKT_EMPTY + 1) &amp;</div><div class='del'>-		     0x07) != 0x07)</div><div class='del'>-			return HALMAC_RET_TXFIFO_NO_EMPTY;</div><div class='del'>-		counter--;</div><div class='del'>-</div><div class='del'>-	} while (counter != 0);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_COMMON, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h<br/>deleted file mode 100644<br/>index 6c6eb85a09a3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,385 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_88XX_H_</div><div class='del'>-#define _HALMAC_API_88XX_H_</div><div class='del'>-</div><div class='del'>-#include "../halmac_2_platform.h"</div><div class='del'>-#include "../halmac_type.h"</div><div class='del'>-</div><div class='del'>-void halmac_init_state_machine_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-void halmac_init_adapter_para_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-void halmac_init_adapter_dynamic_para_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mount_api_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_download_firmware_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u8 *hamacl_fw, u32 halmac_fw_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_free_download_firmware_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_dlfw_mem dlfw_mem, u8 *hamacl_fw,</div><div class='del'>-				   u32 halmac_fw_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_fw_version_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   struct halmac_fw_version *fw_version);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_mac_addr_88xx(struct halmac_adapter *halmac_adapter, u8 halmac_port,</div><div class='del'>-			 union halmac_wlan_addr *hal_address);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_bssid_88xx(struct halmac_adapter *halmac_adapter, u8 halmac_port,</div><div class='del'>-		      union halmac_wlan_addr *hal_address);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_multicast_addr_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       union halmac_wlan_addr *hal_address);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pre_init_system_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_system_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_rxagg_cfg halmac_rxagg_cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_edca_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_operation_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       enum halmac_wireless_mode wireless_mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_ch_bw_88xx(struct halmac_adapter *halmac_adapter, u8 channel,</div><div class='del'>-		      enum halmac_pri_ch_idx pri_ch_idx, enum halmac_bw bw);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_ch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  u8 channel);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_pri_ch_idx_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   enum halmac_pri_ch_idx pri_ch_idx);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_bw_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  enum halmac_bw bw);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_wmac_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_mac_cfg_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_trx_mode mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   enum halmac_efuse_read_cfg cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_map_bt_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      enum halmac_efuse_bank halmac_efuse_bank,</div><div class='del'>-			      u32 bt_efuse_map_size, u8 *bt_efuse_map);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_write_efuse_bt_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u32 halmac_offset, u8 halmac_value,</div><div class='del'>-			   enum halmac_efuse_bank halmac_efuse_bank);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pg_efuse_by_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			    enum halmac_efuse_read_cfg cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_efuse_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u32 *halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_efuse_available_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				     u32 *halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_c2h_info_88xx(struct halmac_adapter *halmac_adapter, u8 *halmac_buf,</div><div class='del'>-			 u32 halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_logical_efuse_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u32 *halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_efuse_read_cfg cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_write_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				u32 halmac_offset, u8 halmac_value);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u32 halmac_offset, u8 *value);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_fwlps_option_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     struct halmac_fwlps_option *lps_option);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_fwips_option_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     struct halmac_fwips_option *ips_option);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_enter_wowlan_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 struct halmac_wowlan_option *wowlan_option);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_leave_wowlan_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_enter_ps_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		     enum halmac_ps_state ps_state);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_leave_ps_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_h2c_lb_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_debug_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_parameter_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  struct halmac_phy_parameter_info *para_info,</div><div class='del'>-			  u8 full_fifo);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_packet_id pkt_id, u8 *pkt, u32 pkt_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_bcn_ie_filter_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  struct halmac_bcn_ie_info *bcn_ie_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_original_h2c_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u8 *original_h2c, u16 *seq, u8 ack);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    enum halmac_data_type halmac_data_type,</div><div class='del'>-			    struct halmac_phy_parameter_info *para_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_run_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_data_type halmac_data_type);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_drv_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_drv_info halmac_drv_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_bt_coex_88xx(struct halmac_adapter *halmac_adapter, u8 *bt_buf,</div><div class='del'>-			 u32 bt_size, u8 ack);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_verify_platform_api_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_timer_2s_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_fill_txdesc_check_sum_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  u8 *cur_desc);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_fifo_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		      enum hal_fifo_sel halmac_fifo_sel, u32 halmac_start_addr,</div><div class='del'>-		      u32 halmac_fifo_dump_size, u8 *fifo_map);</div><div class='del'>-</div><div class='del'>-u32 halmac_get_fifo_size_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      enum hal_fifo_sel halmac_fifo_sel);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_txbf_88xx(struct halmac_adapter *halmac_adapter, u8 userid,</div><div class='del'>-		     enum halmac_bw bw, u8 txbf_en);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_mumimo_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		       struct halmac_cfg_mumimo_para *cfgmu);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_sounding_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_snd_role role,</div><div class='del'>-			 enum halmac_data_rate datarate);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_del_sounding_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_snd_role role);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfee_entry_init_88xx(struct halmac_adapter *halmac_adapter, u8 userid,</div><div class='del'>-			       u16 paid);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfer_entry_init_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_su_bfer_init_para *su_bfer_init);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfee_entry_init_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_mu_bfee_init_para *mu_bfee_init);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfer_entry_init_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_mu_bfer_init_para *mu_bfer_init);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfee_entry_del_88xx(struct halmac_adapter *halmac_adapter, u8 userid);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_su_bfer_entry_del_88xx(struct halmac_adapter *halmac_adapter, u8 userid);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfee_entry_del_88xx(struct halmac_adapter *halmac_adapter, u8 userid);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mu_bfer_entry_del_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_add_ch_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			struct halmac_ch_info *ch_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_add_extra_ch_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_ch_extra_info *ch_extra_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_ctrl_ch_switch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   struct halmac_ch_switch_option *cs_option);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_p2pps_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					 struct halmac_p2pps *p2p_ps);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_p2pps_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		       struct halmac_p2pps *p2p_ps);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_clear_ch_info_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_general_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_general_info *general_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_start_iqk_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		      struct halmac_iqk_para_ *iqk_para);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_ctrl_pwr_tracking_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	struct halmac_pwr_tracking_option *pwr_tracking_opt);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_query_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_feature_id feature_id,</div><div class='del'>-			 enum halmac_cmd_process_status *process_status,</div><div class='del'>-			 u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reset_feature_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_feature_id feature_id);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_check_fw_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    bool *fw_status);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_fw_dmem_88xx(struct halmac_adapter *halmac_adapter, u8 *dmem,</div><div class='del'>-			 u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_max_dl_size_88xx(struct halmac_adapter *halmac_adapter, u32 size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_psd_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				       u16 start_psd, u16 end_psd);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_la_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			enum halmac_la_mode la_mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_rx_fifo_expanding_mode_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_rx_fifo_expanding_mode rx_fifo_expanding_mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_config_security_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    struct halmac_security_setting *sec_setting);</div><div class='del'>-</div><div class='del'>-u8 halmac_get_used_cam_entry_num_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				      enum hal_security_type sec_type);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_write_cam_88xx(struct halmac_adapter *halmac_adapter, u32 entry_index,</div><div class='del'>-		      struct halmac_cam_entry_info *cam_entry_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_cam_entry_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u32 entry_index,</div><div class='del'>-			   struct halmac_cam_entry_format *content);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_clear_cam_entry_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u32 entry_index);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_hw_value_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_hw_id hw_id, void *pvalue);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_hw_value_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_hw_id hw_id, void *pvalue);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_drv_rsvd_pg_num_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				enum halmac_drv_rsvd_pg_num pg_num);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_chip_version_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     struct halmac_ver *version);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_chk_txdesc_88xx(struct halmac_adapter *halmac_adapter, u8 *halmac_buf,</div><div class='del'>-		       u32 halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dl_drv_rsvd_page_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 pg_offset, u8 *halmac_buf, u32 halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_csi_rate_88xx(struct halmac_adapter *halmac_adapter, u8 rssi,</div><div class='del'>-			 u8 current_rate, u8 fixrate_en, u8 *new_rate);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_sdio_cmd53_4byte_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_sdio_cmd53_4byte_mode cmd53_4byte_mode);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_txfifo_is_empty_88xx(struct halmac_adapter *halmac_adapter, u32 chk_num);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c<br/>deleted file mode 100644<br/>index 8462f23b652e..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,318 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_pcie_cfg_88xx() -  init PCIe</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_pcie_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_PCIE_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_deinit_pcie_cfg_88xx() - deinit PCIE</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_pcie_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DEINIT_PCIE_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_rx_aggregation_88xx_pcie() - config rx aggregation</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_rx_agg_mode</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx_pcie(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				    struct halmac_rxagg_cfg *phalmac_rxagg_cfg)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_RX_AGGREGATION);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_8_pcie_88xx() - read 1byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u8 halmac_reg_read_8_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	return PLATFORM_REG_READ_8(driver_adapter, halmac_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_8_pcie_88xx() - write 1byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_8_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u8 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_8(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_16_pcie_88xx() - read 2byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u16 halmac_reg_read_16_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	return PLATFORM_REG_READ_16(driver_adapter, halmac_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_16_pcie_88xx() - write 2byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_16_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u16 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_16(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_32_pcie_88xx() - read 4byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u32 halmac_reg_read_32_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	return PLATFORM_REG_READ_32(driver_adapter, halmac_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_32_pcie_88xx() - write 4byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_32_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u32 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_32(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_tx_agg_align_pcie_88xx() -config sdio bus tx agg alignment</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @enable : function enable(1)/disable(0)</div><div class='del'>- * @align_size : sdio bus tx agg alignment size (2^n, n = 3~11)</div><div class='del'>- * Author : Soar Tu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_cfg_tx_agg_align_pcie_not_support_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 enable, u16 align_size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_TX_AGG_ALIGN);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s not support\n", __func__);</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.h<br/>deleted file mode 100644<br/>index dc4d98bcc68c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_88XX_PCIE_H_</div><div class='del'>-#define _HALMAC_API_88XX_PCIE_H_</div><div class='del'>-</div><div class='del'>-#include "../halmac_2_platform.h"</div><div class='del'>-#include "../halmac_type.h"</div><div class='del'>-</div><div class='del'>-#define LINK_CTRL2_REG_OFFSET 0xA0</div><div class='del'>-#define GEN2_CTRL_OFFSET 0x80C</div><div class='del'>-#define LINK_STATUS_REG_OFFSET 0x82</div><div class='del'>-#define GEN1_SPEED 0x01</div><div class='del'>-#define GEN2_SPEED 0x02</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_pcie_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_pcie_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx_pcie(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				    struct halmac_rxagg_cfg *phalmac_rxagg_cfg);</div><div class='del'>-</div><div class='del'>-u8 halmac_reg_read_8_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_8_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u8 halmac_data);</div><div class='del'>-</div><div class='del'>-u16 halmac_reg_read_16_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_16_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u16 halmac_data);</div><div class='del'>-</div><div class='del'>-u32 halmac_reg_read_32_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_32_pcie_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u32 halmac_data);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_tx_agg_align_pcie_not_support_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 enable, u16 align_size);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_88XX_PCIE_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c<br/>deleted file mode 100644<br/>index 979821ea54a1..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,963 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_sdio_cfg_88xx() - init SDIO</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_sdio_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_SDIO_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_READ_32(halmac_adapter, REG_SDIO_FREE_TXPG);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_SDIO_TX_CTRL, 0x00000000);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_deinit_sdio_cfg_88xx() - deinit SDIO</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_sdio_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DEINIT_SDIO_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_rx_aggregation_88xx_sdio() - config rx aggregation</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_rx_agg_mode</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx_sdio(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				    struct halmac_rxagg_cfg *phalmac_rxagg_cfg)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u8 size = 0, timeout = 0, agg_enable = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_RX_AGGREGATION);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	agg_enable = HALMAC_REG_READ_8(halmac_adapter, REG_TXDMA_PQ_MAP);</div><div class='del'>-</div><div class='del'>-	switch (phalmac_rxagg_cfg-&gt;mode) {</div><div class='del'>-	case HALMAC_RX_AGG_MODE_NONE:</div><div class='del'>-		agg_enable &amp;= ~(BIT_RXDMA_AGG_EN);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_RX_AGG_MODE_DMA:</div><div class='del'>-	case HALMAC_RX_AGG_MODE_USB:</div><div class='del'>-		agg_enable |= BIT_RXDMA_AGG_EN;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("halmac_cfg_rx_aggregation_88xx_usb switch case not support\n");</div><div class='del'>-		agg_enable &amp;= ~BIT_RXDMA_AGG_EN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!phalmac_rxagg_cfg-&gt;threshold.drv_define) {</div><div class='del'>-		size = 0xFF;</div><div class='del'>-		timeout = 0x01;</div><div class='del'>-	} else {</div><div class='del'>-		size = phalmac_rxagg_cfg-&gt;threshold.size;</div><div class='del'>-		timeout = phalmac_rxagg_cfg-&gt;threshold.timeout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXDMA_PQ_MAP, agg_enable);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_RXDMA_AGG_PG_TH,</div><div class='del'>-			    (u16)(size | (timeout &lt;&lt; BIT_SHIFT_DMA_AGG_TO)));</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_RXDMA_MODE);</div><div class='del'>-	if ((agg_enable &amp; BIT_RXDMA_AGG_EN) != 0)</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_RXDMA_MODE,</div><div class='del'>-				   value8 | BIT_DMA_MODE);</div><div class='del'>-	else</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_RXDMA_MODE,</div><div class='del'>-				   value8 &amp; ~(BIT_DMA_MODE));</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_8_sdio_88xx() - read 1byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u8 halmac_reg_read_8_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = PLATFORM_SDIO_CMD52_READ(driver_adapter, halmac_offset);</div><div class='del'>-</div><div class='del'>-	return value8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_8_sdio_88xx() - write 1byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_8_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u8 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_16_sdio_88xx() - read 2byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u16 halmac_reg_read_16_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		u16 word;</div><div class='del'>-		u8 byte[2];</div><div class='del'>-		__le16 le_word;</div><div class='del'>-	} value16 = {0x0000};</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF ||</div><div class='del'>-	    (halmac_offset &amp; (2 - 1)) != 0 ||</div><div class='del'>-	    halmac_adapter-&gt;sdio_cmd53_4byte ==</div><div class='del'>-		    HALMAC_SDIO_CMD53_4BYTE_MODE_RW ||</div><div class='del'>-	    halmac_adapter-&gt;sdio_cmd53_4byte ==</div><div class='del'>-		    HALMAC_SDIO_CMD53_4BYTE_MODE_R) {</div><div class='del'>-		value16.byte[0] =</div><div class='del'>-			PLATFORM_SDIO_CMD52_READ(driver_adapter, halmac_offset);</div><div class='del'>-		value16.byte[1] = PLATFORM_SDIO_CMD52_READ(driver_adapter,</div><div class='del'>-							   halmac_offset + 1);</div><div class='del'>-		value16.word = le16_to_cpu(value16.le_word);</div><div class='del'>-	} else {</div><div class='del'>-#if (PLATFORM_SD_CLK &gt; HALMAC_SD_CLK_THRESHOLD_88XX)</div><div class='del'>-		if ((halmac_offset &amp; 0xffffef00) == 0x00000000) {</div><div class='del'>-			value16.byte[0] = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-				driver_adapter, halmac_offset);</div><div class='del'>-			value16.byte[1] = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-				driver_adapter, halmac_offset + 1);</div><div class='del'>-			value16.word = le16_to_cpu(value16.word);</div><div class='del'>-		} else {</div><div class='del'>-			value16.word = PLATFORM_SDIO_CMD53_READ_16(</div><div class='del'>-				driver_adapter, halmac_offset);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		value16.word = PLATFORM_SDIO_CMD53_READ_16(driver_adapter,</div><div class='del'>-							   halmac_offset);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return value16.word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_16_sdio_88xx() - write 2byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_16_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u16 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF ||</div><div class='del'>-	    (halmac_offset &amp; (2 - 1)) != 0 ||</div><div class='del'>-	    halmac_adapter-&gt;sdio_cmd53_4byte ==</div><div class='del'>-		    HALMAC_SDIO_CMD53_4BYTE_MODE_RW ||</div><div class='del'>-	    halmac_adapter-&gt;sdio_cmd53_4byte ==</div><div class='del'>-		    HALMAC_SDIO_CMD53_4BYTE_MODE_W) {</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset,</div><div class='del'>-					  (u8)(halmac_data &amp; 0xFF));</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset + 1,</div><div class='del'>-					  (u8)((halmac_data &amp; 0xFF00) &gt;&gt; 8));</div><div class='del'>-	} else {</div><div class='del'>-		PLATFORM_SDIO_CMD53_WRITE_16(driver_adapter, halmac_offset,</div><div class='del'>-					     halmac_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_32_sdio_88xx() - read 4byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u32 halmac_reg_read_32_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	u32 halmac_offset_old = 0;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		u32 dword;</div><div class='del'>-		u8 byte[4];</div><div class='del'>-		__le32 le_dword;</div><div class='del'>-	} value32 = {0x00000000};</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_offset_old = halmac_offset;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF ||</div><div class='del'>-	    (halmac_offset &amp; (4 - 1)) != 0) {</div><div class='del'>-		value32.byte[0] =</div><div class='del'>-			PLATFORM_SDIO_CMD52_READ(driver_adapter, halmac_offset);</div><div class='del'>-		value32.byte[1] = PLATFORM_SDIO_CMD52_READ(driver_adapter,</div><div class='del'>-							   halmac_offset + 1);</div><div class='del'>-		value32.byte[2] = PLATFORM_SDIO_CMD52_READ(driver_adapter,</div><div class='del'>-							   halmac_offset + 2);</div><div class='del'>-		value32.byte[3] = PLATFORM_SDIO_CMD52_READ(driver_adapter,</div><div class='del'>-							   halmac_offset + 3);</div><div class='del'>-		value32.dword = le32_to_cpu(value32.le_dword);</div><div class='del'>-	} else {</div><div class='del'>-#if (PLATFORM_SD_CLK &gt; HALMAC_SD_CLK_THRESHOLD_88XX)</div><div class='del'>-		if ((halmac_offset_old &amp; 0xffffef00) == 0x00000000) {</div><div class='del'>-			value32.byte[0] = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-				driver_adapter, halmac_offset);</div><div class='del'>-			value32.byte[1] = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-				driver_adapter, halmac_offset + 1);</div><div class='del'>-			value32.byte[2] = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-				driver_adapter, halmac_offset + 2);</div><div class='del'>-			value32.byte[3] = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-				driver_adapter, halmac_offset + 3);</div><div class='del'>-			value32.dword = le32_to_cpu(value32.dword);</div><div class='del'>-		} else {</div><div class='del'>-			value32.dword = PLATFORM_SDIO_CMD53_READ_32(</div><div class='del'>-				driver_adapter, halmac_offset);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		value32.dword = PLATFORM_SDIO_CMD53_READ_32(driver_adapter,</div><div class='del'>-							    halmac_offset);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return value32.dword;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_32_sdio_88xx() - write 4byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_32_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u32 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF ||</div><div class='del'>-	    (halmac_offset &amp; (4 - 1)) != 0) {</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset,</div><div class='del'>-					  (u8)(halmac_data &amp; 0xFF));</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset + 1,</div><div class='del'>-					  (u8)((halmac_data &amp; 0xFF00) &gt;&gt; 8));</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset + 2,</div><div class='del'>-					  (u8)((halmac_data &amp; 0xFF0000) &gt;&gt; 16));</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(</div><div class='del'>-			driver_adapter, halmac_offset + 3,</div><div class='del'>-			(u8)((halmac_data &amp; 0xFF000000) &gt;&gt; 24));</div><div class='del'>-	} else {</div><div class='del'>-		PLATFORM_SDIO_CMD53_WRITE_32(driver_adapter, halmac_offset,</div><div class='del'>-					     halmac_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_nbyte_sdio_88xx() - read n byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_size : register value size</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u8 halmac_reg_read_nbyte_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u32 halmac_offset, u32 halmac_size,</div><div class='del'>-				   u8 *halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0) {</div><div class='del'>-		pr_err("halmac_offset error = 0x%x\n", halmac_offset);</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset_88xx(halmac_adapter,</div><div class='del'>-							&amp;halmac_offset);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.mac_power == HALMAC_MAC_POWER_OFF) {</div><div class='del'>-		pr_err("halmac_state error = 0x%x\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.mac_power);</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PLATFORM_SDIO_CMD53_READ_N(driver_adapter, halmac_offset, halmac_size,</div><div class='del'>-				   halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_sdio_tx_addr_sdio_88xx() - get CMD53 addr for the TX packet</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_buf : tx packet, include txdesc</div><div class='del'>- * @halmac_size : tx packet size</div><div class='del'>- * @pcmd53_addr : cmd53 addr value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_sdio_tx_addr_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 *halmac_buf, u32 halmac_size, u32 *pcmd53_addr)</div><div class='del'>-{</div><div class='del'>-	u32 four_byte_len;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_queue_select queue_sel;</div><div class='del'>-	enum halmac_dma_mapping dma_mapping;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_GET_SDIO_TX_ADDR);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (!halmac_buf) {</div><div class='del'>-		pr_err("halmac_buf is NULL!!\n");</div><div class='del'>-		return HALMAC_RET_DATA_BUF_NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_size == 0) {</div><div class='del'>-		pr_err("halmac_size is 0!!\n");</div><div class='del'>-		return HALMAC_RET_DATA_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_sel = (enum halmac_queue_select)GET_TX_DESC_QSEL(halmac_buf);</div><div class='del'>-</div><div class='del'>-	switch (queue_sel) {</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VO];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VI];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BE];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BK];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_MGNT:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_MG];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_HIGH:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BCN:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_CMD:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_HI];</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("Qsel is out of range\n");</div><div class='del'>-		return HALMAC_RET_QSEL_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	four_byte_len = (halmac_size &gt;&gt; 2) + ((halmac_size &amp; (4 - 1)) ? 1 : 0);</div><div class='del'>-</div><div class='del'>-	switch (dma_mapping) {</div><div class='del'>-	case HALMAC_DMA_MAPPING_HIGH:</div><div class='del'>-		*pcmd53_addr = HALMAC_SDIO_CMD_ADDR_TXFF_HIGH;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_NORMAL:</div><div class='del'>-		*pcmd53_addr = HALMAC_SDIO_CMD_ADDR_TXFF_NORMAL;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_LOW:</div><div class='del'>-		*pcmd53_addr = HALMAC_SDIO_CMD_ADDR_TXFF_LOW;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_EXTRA:</div><div class='del'>-		*pcmd53_addr = HALMAC_SDIO_CMD_ADDR_TXFF_EXTRA;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("DmaMapping is out of range\n");</div><div class='del'>-		return HALMAC_RET_DMA_MAP_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pcmd53_addr = (*pcmd53_addr &lt;&lt; 13) |</div><div class='del'>-		       (four_byte_len &amp; HALMAC_SDIO_4BYTE_LEN_MASK);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_tx_agg_align_sdio_88xx() -config sdio bus tx agg alignment</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @enable : function enable(1)/disable(0)</div><div class='del'>- * @align_size : sdio bus tx agg alignment size (2^n, n = 3~11)</div><div class='del'>- * Author : Soar Tu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_tx_agg_align_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  u8 enable, u16 align_size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	u8 i, align_size_ok = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_TX_AGG_ALIGN);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if ((align_size &amp; 0xF000) != 0) {</div><div class='del'>-		pr_err("Align size is out of range\n");</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 3; i &lt;= 11; i++) {</div><div class='del'>-		if (align_size == 1 &lt;&lt; i) {</div><div class='del'>-			align_size_ok = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (align_size_ok == 0) {</div><div class='del'>-		pr_err("Align size is not 2^3 ~ 2^11\n");</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*Keep sdio tx agg alignment size for driver query*/</div><div class='del'>-	halmac_adapter-&gt;hw_config_info.tx_align_size = align_size;</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_RQPN_CTRL_2,</div><div class='del'>-				    0x8000 | align_size);</div><div class='del'>-	else</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_RQPN_CTRL_2,</div><div class='del'>-				    align_size);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_tx_agg_align_sdio_not_support_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 enable, u16 align_size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_TX_AGG_ALIGN);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s not support\n", __func__);</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_tx_allowed_sdio_88xx() - check tx status</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_buf : tx packet, include txdesc</div><div class='del'>- * @halmac_size : tx packet size, include txdesc</div><div class='del'>- * Author : Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_tx_allowed_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u8 *halmac_buf, u32 halmac_size)</div><div class='del'>-{</div><div class='del'>-	u8 *curr_packet;</div><div class='del'>-	u16 *curr_free_space;</div><div class='del'>-	u32 i, counter;</div><div class='del'>-	u32 tx_agg_num, packet_size = 0;</div><div class='del'>-	u32 tx_required_page_num, total_required_page_num = 0;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_dma_mapping dma_mapping;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_TX_ALLOWED_SDIO);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	tx_agg_num = GET_TX_DESC_DMA_TXAGG_NUM(halmac_buf);</div><div class='del'>-	curr_packet = halmac_buf;</div><div class='del'>-</div><div class='del'>-	tx_agg_num = tx_agg_num == 0 ? 1 : tx_agg_num;</div><div class='del'>-</div><div class='del'>-	switch ((enum halmac_queue_select)GET_TX_DESC_QSEL(curr_packet)) {</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VO];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VI];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BE];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BK];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_MGNT:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_MG];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_HIGH:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_HI];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BCN:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_CMD:</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("Qsel is out of range\n");</div><div class='del'>-		return HALMAC_RET_QSEL_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (dma_mapping) {</div><div class='del'>-	case HALMAC_DMA_MAPPING_HIGH:</div><div class='del'>-		curr_free_space =</div><div class='del'>-			&amp;halmac_adapter-&gt;sdio_free_space.high_queue_number;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_NORMAL:</div><div class='del'>-		curr_free_space =</div><div class='del'>-			&amp;halmac_adapter-&gt;sdio_free_space.normal_queue_number;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_LOW:</div><div class='del'>-		curr_free_space =</div><div class='del'>-			&amp;halmac_adapter-&gt;sdio_free_space.low_queue_number;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_EXTRA:</div><div class='del'>-		curr_free_space =</div><div class='del'>-			&amp;halmac_adapter-&gt;sdio_free_space.extra_queue_number;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("DmaMapping is out of range\n");</div><div class='del'>-		return HALMAC_RET_DMA_MAP_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; tx_agg_num; i++) {</div><div class='del'>-		packet_size = GET_TX_DESC_TXPKTSIZE(curr_packet) +</div><div class='del'>-			      GET_TX_DESC_OFFSET(curr_packet) +</div><div class='del'>-			      (GET_TX_DESC_PKT_OFFSET(curr_packet) &lt;&lt; 3);</div><div class='del'>-		tx_required_page_num =</div><div class='del'>-			(packet_size &gt;&gt;</div><div class='del'>-			 halmac_adapter-&gt;hw_config_info.page_size_2_power) +</div><div class='del'>-			((packet_size &amp;</div><div class='del'>-			  (halmac_adapter-&gt;hw_config_info.page_size - 1)) ?</div><div class='del'>-				 1 :</div><div class='del'>-				 0);</div><div class='del'>-		total_required_page_num += tx_required_page_num;</div><div class='del'>-</div><div class='del'>-		packet_size = HALMAC_ALIGN(packet_size, 8);</div><div class='del'>-</div><div class='del'>-		curr_packet += packet_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	counter = 10;</div><div class='del'>-	do {</div><div class='del'>-		if ((u32)(*curr_free_space +</div><div class='del'>-			  halmac_adapter-&gt;sdio_free_space.public_queue_number) &gt;</div><div class='del'>-		    total_required_page_num) {</div><div class='del'>-			if (*curr_free_space &gt;= total_required_page_num) {</div><div class='del'>-				*curr_free_space -=</div><div class='del'>-					(u16)total_required_page_num;</div><div class='del'>-			} else {</div><div class='del'>-				halmac_adapter-&gt;sdio_free_space</div><div class='del'>-					.public_queue_number -=</div><div class='del'>-					(u16)(total_required_page_num -</div><div class='del'>-					      *curr_free_space);</div><div class='del'>-				*curr_free_space = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			status = halmac_check_oqt_88xx(halmac_adapter,</div><div class='del'>-						       tx_agg_num, halmac_buf);</div><div class='del'>-</div><div class='del'>-			if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-				return status;</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		halmac_update_sdio_free_page_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0)</div><div class='del'>-			return HALMAC_RET_FREE_SPACE_NOT_ENOUGH;</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_indirect_32_sdio_88xx() - read MAC reg by SDIO reg</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : Soar</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u32 halmac_reg_read_indirect_32_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	u8 rtemp;</div><div class='del'>-	u32 counter = 1000;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		u32 dword;</div><div class='del'>-		u8 byte[4];</div><div class='del'>-	} value32 = {0x00000000};</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	PLATFORM_SDIO_CMD53_WRITE_32(</div><div class='del'>-		driver_adapter,</div><div class='del'>-		(HALMAC_SDIO_CMD_ADDR_SDIO_REG &lt;&lt; 13) |</div><div class='del'>-			(REG_SDIO_INDIRECT_REG_CFG &amp; HALMAC_SDIO_LOCAL_MSK),</div><div class='del'>-		halmac_offset | BIT(19) | BIT(17));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		rtemp = PLATFORM_SDIO_CMD52_READ(</div><div class='del'>-			driver_adapter,</div><div class='del'>-			(HALMAC_SDIO_CMD_ADDR_SDIO_REG &lt;&lt; 13) |</div><div class='del'>-				((REG_SDIO_INDIRECT_REG_CFG + 2) &amp;</div><div class='del'>-				 HALMAC_SDIO_LOCAL_MSK));</div><div class='del'>-		counter--;</div><div class='del'>-	} while ((rtemp &amp; BIT(4)) != 0 &amp;&amp; counter &gt; 0);</div><div class='del'>-</div><div class='del'>-	value32.dword = PLATFORM_SDIO_CMD53_READ_32(</div><div class='del'>-		driver_adapter,</div><div class='del'>-		(HALMAC_SDIO_CMD_ADDR_SDIO_REG &lt;&lt; 13) |</div><div class='del'>-			(REG_SDIO_INDIRECT_REG_DATA &amp; HALMAC_SDIO_LOCAL_MSK));</div><div class='del'>-</div><div class='del'>-	return value32.dword;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h<br/>deleted file mode 100644<br/>index 2a891b0f6ab8..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_88XX_SDIO_H_</div><div class='del'>-#define _HALMAC_API_88XX_SDIO_H_</div><div class='del'>-</div><div class='del'>-#include "../halmac_2_platform.h"</div><div class='del'>-#include "../halmac_type.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_sdio_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_sdio_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx_sdio(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				    struct halmac_rxagg_cfg *phalmac_rxagg_cfg);</div><div class='del'>-</div><div class='del'>-u8 halmac_reg_read_8_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_8_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u8 halmac_data);</div><div class='del'>-</div><div class='del'>-u16 halmac_reg_read_16_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_16_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u16 halmac_data);</div><div class='del'>-</div><div class='del'>-u32 halmac_reg_read_32_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_32_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset, u32 halmac_data);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_sdio_tx_addr_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 *halmac_buf, u32 halmac_size, u32 *pcmd53_addr);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_tx_agg_align_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  u8 enable, u16 align_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_tx_agg_align_sdio_not_support_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 enable, u16 align_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_tx_allowed_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u8 *halmac_buf, u32 halmac_size);</div><div class='del'>-</div><div class='del'>-u32 halmac_reg_read_indirect_32_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-u8 halmac_reg_read_nbyte_sdio_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u32 halmac_offset, u32 halmac_size,</div><div class='del'>-				   u8 *halmac_data);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_88XX_SDIO_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c<br/>deleted file mode 100644<br/>index 0bd6abdd0a68..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,543 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_usb_cfg_88xx() - init USB</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_usb_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	u8 value8 = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_INIT_USB_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	value8 |= (BIT_DMA_MODE |</div><div class='del'>-		   (0x3 &lt;&lt; BIT_SHIFT_BURST_CNT)); /* burst number = 4 */</div><div class='del'>-</div><div class='del'>-	if (PLATFORM_REG_READ_8(driver_adapter, REG_SYS_CFG2 + 3) ==</div><div class='del'>-	    0x20) { /* usb3.0 */</div><div class='del'>-		value8 |= (HALMAC_USB_BURST_SIZE_3_0 &lt;&lt; BIT_SHIFT_BURST_SIZE);</div><div class='del'>-	} else {</div><div class='del'>-		if ((PLATFORM_REG_READ_8(driver_adapter, REG_USB_USBSTAT) &amp;</div><div class='del'>-		     0x3) == 0x1) /* usb2.0 */</div><div class='del'>-			value8 |= HALMAC_USB_BURST_SIZE_2_0_HSPEED</div><div class='del'>-				  &lt;&lt; BIT_SHIFT_BURST_SIZE;</div><div class='del'>-		else /* usb1.1 */</div><div class='del'>-			value8 |= HALMAC_USB_BURST_SIZE_2_0_FSPEED</div><div class='del'>-				  &lt;&lt; BIT_SHIFT_BURST_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_8(driver_adapter, REG_RXDMA_MODE, value8);</div><div class='del'>-	PLATFORM_REG_WRITE_16(</div><div class='del'>-		driver_adapter, REG_TXDMA_OFFSET_CHK,</div><div class='del'>-		PLATFORM_REG_READ_16(driver_adapter, REG_TXDMA_OFFSET_CHK) |</div><div class='del'>-			BIT_DROP_DATA_EN);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_deinit_usb_cfg_88xx() - deinit USB</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_usb_cfg_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_DEINIT_USB_CFG);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_rx_aggregation_88xx_usb() - config rx aggregation</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_rx_agg_mode</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx_usb(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   struct halmac_rxagg_cfg *phalmac_rxagg_cfg)</div><div class='del'>-{</div><div class='del'>-	u8 dma_usb_agg;</div><div class='del'>-	u8 size = 0, timeout = 0, agg_enable = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_CFG_RX_AGGREGATION);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	dma_usb_agg =</div><div class='del'>-		HALMAC_REG_READ_8(halmac_adapter, REG_RXDMA_AGG_PG_TH + 3);</div><div class='del'>-	agg_enable = HALMAC_REG_READ_8(halmac_adapter, REG_TXDMA_PQ_MAP);</div><div class='del'>-</div><div class='del'>-	switch (phalmac_rxagg_cfg-&gt;mode) {</div><div class='del'>-	case HALMAC_RX_AGG_MODE_NONE:</div><div class='del'>-		agg_enable &amp;= ~BIT_RXDMA_AGG_EN;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_RX_AGG_MODE_DMA:</div><div class='del'>-		agg_enable |= BIT_RXDMA_AGG_EN;</div><div class='del'>-		dma_usb_agg |= BIT(7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HALMAC_RX_AGG_MODE_USB:</div><div class='del'>-		agg_enable |= BIT_RXDMA_AGG_EN;</div><div class='del'>-		dma_usb_agg &amp;= ~BIT(7);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s switch case not support\n", __func__);</div><div class='del'>-		agg_enable &amp;= ~BIT_RXDMA_AGG_EN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!phalmac_rxagg_cfg-&gt;threshold.drv_define) {</div><div class='del'>-		if (PLATFORM_REG_READ_8(driver_adapter, REG_SYS_CFG2 + 3) ==</div><div class='del'>-		    0x20) {</div><div class='del'>-			/* usb3.0 */</div><div class='del'>-			size = 0x5;</div><div class='del'>-			timeout = 0xA;</div><div class='del'>-		} else {</div><div class='del'>-			/* usb2.0 */</div><div class='del'>-			size = 0x5;</div><div class='del'>-			timeout = 0x20;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		size = phalmac_rxagg_cfg-&gt;threshold.size;</div><div class='del'>-		timeout = phalmac_rxagg_cfg-&gt;threshold.timeout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_TXDMA_PQ_MAP, agg_enable);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_RXDMA_AGG_PG_TH + 3,</div><div class='del'>-			   dma_usb_agg);</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_RXDMA_AGG_PG_TH,</div><div class='del'>-			    (u16)(size | (timeout &lt;&lt; BIT_SHIFT_DMA_AGG_TO)));</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_8_usb_88xx() - read 1byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	value8 = PLATFORM_REG_READ_8(driver_adapter, halmac_offset);</div><div class='del'>-</div><div class='del'>-	return value8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_8_usb_88xx() - write 1byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_8_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u32 halmac_offset, u8 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_8(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_16_usb_88xx() - read 2byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u16 halmac_reg_read_16_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		u16 word;</div><div class='del'>-		u8 byte[2];</div><div class='del'>-	} value16 = {0x0000};</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	value16.word = PLATFORM_REG_READ_16(driver_adapter, halmac_offset);</div><div class='del'>-</div><div class='del'>-	return value16.word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_16_usb_88xx() - write 2byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_16_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u16 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_16(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_read_32_usb_88xx() - read 4byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-u32 halmac_reg_read_32_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				u32 halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		u32 dword;</div><div class='del'>-		u8 byte[4];</div><div class='del'>-	} value32 = {0x00000000};</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	value32.dword = PLATFORM_REG_READ_32(driver_adapter, halmac_offset);</div><div class='del'>-</div><div class='del'>-	return value32.dword;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_reg_write_32_usb_88xx() - write 4byte register</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_offset : register offset</div><div class='del'>- * @halmac_data : register value</div><div class='del'>- * Author : KaiYuan Chang/Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_32_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u32 halmac_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	PLATFORM_REG_WRITE_32(driver_adapter, halmac_offset, halmac_data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_set_bulkout_num_usb_88xx() - inform bulk-out num</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @bulkout_num : usb bulk-out number</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_bulkout_num_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u8 bulkout_num)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_SET_BULKOUT_NUM);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_bulkout_num = bulkout_num;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_usb_bulkout_id_usb_88xx() - get bulk out id for the TX packet</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @halmac_buf : tx packet, include txdesc</div><div class='del'>- * @halmac_size : tx packet size</div><div class='del'>- * @bulkout_id : usb bulk-out id</div><div class='del'>- * Author : KaiYuan Chang</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_usb_bulkout_id_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u8 *halmac_buf, u32 halmac_size, u8 *bulkout_id)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_queue_select queue_sel;</div><div class='del'>-	enum halmac_dma_mapping dma_mapping;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter,</div><div class='del'>-				  HALMAC_API_GET_USB_BULKOUT_ID);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (!halmac_buf) {</div><div class='del'>-		pr_err("halmac_buf is NULL!!\n");</div><div class='del'>-		return HALMAC_RET_DATA_BUF_NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_size == 0) {</div><div class='del'>-		pr_err("halmac_size is 0!!\n");</div><div class='del'>-		return HALMAC_RET_DATA_SIZE_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_sel = (enum halmac_queue_select)GET_TX_DESC_QSEL(halmac_buf);</div><div class='del'>-</div><div class='del'>-	switch (queue_sel) {</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VO];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VI];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BE];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK_V2:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BK];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_MGNT:</div><div class='del'>-		dma_mapping =</div><div class='del'>-			halmac_adapter-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_MG];</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_QUEUE_SELECT_HIGH:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BCN:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_CMD:</div><div class='del'>-		dma_mapping = HALMAC_DMA_MAPPING_HIGH;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("Qsel is out of range\n");</div><div class='del'>-		return HALMAC_RET_QSEL_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (dma_mapping) {</div><div class='del'>-	case HALMAC_DMA_MAPPING_HIGH:</div><div class='del'>-		*bulkout_id = 0;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_NORMAL:</div><div class='del'>-		*bulkout_id = 1;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_LOW:</div><div class='del'>-		*bulkout_id = 2;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_DMA_MAPPING_EXTRA:</div><div class='del'>-		*bulkout_id = 3;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("DmaMapping is out of range\n");</div><div class='del'>-		return HALMAC_RET_DMA_MAP_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_cfg_tx_agg_align_usb_88xx() -config sdio bus tx agg alignment</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * @enable : function enable(1)/disable(0)</div><div class='del'>- * @align_size : sdio bus tx agg alignment size (2^n, n = 3~11)</div><div class='del'>- * Author : Soar Tu</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_cfg_tx_agg_align_usb_not_support_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 enable, u16 align_size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	if (halmac_api_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_API_INVALID;</div><div class='del'>-</div><div class='del'>-	halmac_api_record_id_88xx(halmac_adapter, HALMAC_API_CFG_TX_AGG_ALIGN);</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s not support\n", __func__);</div><div class='del'>-	HALMAC_RT_TRACE(</div><div class='del'>-		driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-		"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.h<br/>deleted file mode 100644<br/>index befa4a5415db..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_88XX_USB_H_</div><div class='del'>-#define _HALMAC_API_88XX_USB_H_</div><div class='del'>-</div><div class='del'>-#include "../halmac_2_platform.h"</div><div class='del'>-#include "../halmac_type.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_usb_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_usb_cfg_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_cfg_rx_aggregation_88xx_usb(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   struct halmac_rxagg_cfg *phalmac_rxagg_cfg);</div><div class='del'>-</div><div class='del'>-u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_8_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u32 halmac_offset, u8 halmac_data);</div><div class='del'>-</div><div class='del'>-u16 halmac_reg_read_16_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_16_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u16 halmac_data);</div><div class='del'>-</div><div class='del'>-u32 halmac_reg_read_32_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				u32 halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_reg_write_32_usb_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u32 halmac_offset, u32 halmac_data);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_bulkout_num_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u8 bulkout_num);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_usb_bulkout_id_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u8 *halmac_buf, u32 halmac_size, u8 *bulkout_id);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_cfg_tx_agg_align_usb_not_support_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 enable, u16 align_size);</div><div class='del'>-</div><div class='del'>-#endif /* _HALMAC_API_88XX_USB_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c<br/>deleted file mode 100644<br/>index ddbeff8224ab..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4465 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_fw_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_drv_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_update_eeprom_mask_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			       u8 *eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_check_efuse_enough_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			       u8 *eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_program_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			  u8 *eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_pwr_sub_seq_parer_88xx(struct halmac_adapter *halmac_adapter, u8 cut,</div><div class='del'>-			      u8 fab, u8 intf,</div><div class='del'>-			      struct halmac_wl_pwr_cfg_ *pwr_sub_seq_cfg);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_c2h_debug_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			    u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_scan_status_rpt_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			   u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_efuse_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			     u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			  u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_enqueue_para_buff_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_phy_parameter_info *para_info,</div><div class='del'>-			      u8 *curr_buff_wptr, bool *end_cmd);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_phy_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				    u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_cfg_para_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_gen_cfg_para_h2c_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 *h2c_buff);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_update_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_update_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_run_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				       u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_channel_switch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					 u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_iqk_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_power_tracking_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					 u8 *c2h_buf, u32 c2h_size);</div><div class='del'>-</div><div class='del'>-void halmac_init_offload_feature_state_machine_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	struct halmac_state *state = &amp;halmac_adapter-&gt;halmac_state;</div><div class='del'>-</div><div class='del'>-	state-&gt;efuse_state_set.efuse_cmd_construct_state =</div><div class='del'>-		HALMAC_EFUSE_CMD_CONSTRUCT_IDLE;</div><div class='del'>-	state-&gt;efuse_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;efuse_state_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-</div><div class='del'>-	state-&gt;cfg_para_state_set.cfg_para_cmd_construct_state =</div><div class='del'>-		HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE;</div><div class='del'>-	state-&gt;cfg_para_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;cfg_para_state_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-</div><div class='del'>-	state-&gt;scan_state_set.scan_cmd_construct_state =</div><div class='del'>-		HALMAC_SCAN_CMD_CONSTRUCT_IDLE;</div><div class='del'>-	state-&gt;scan_state_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;scan_state_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-</div><div class='del'>-	state-&gt;update_packet_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;update_packet_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-</div><div class='del'>-	state-&gt;iqk_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;iqk_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-</div><div class='del'>-	state-&gt;power_tracking_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;power_tracking_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-</div><div class='del'>-	state-&gt;psd_set.process_status = HALMAC_CMD_PROCESS_IDLE;</div><div class='del'>-	state-&gt;psd_set.seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-	state-&gt;psd_set.data_size = 0;</div><div class='del'>-	state-&gt;psd_set.segment_size = 0;</div><div class='del'>-	state-&gt;psd_set.data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		       enum halmac_efuse_read_cfg cfg)</div><div class='del'>-{</div><div class='del'>-	u32 chk_h2c_init;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api =</div><div class='del'>-		(struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_H2C_SENT) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	if (cfg == HALMAC_EFUSE_R_AUTO) {</div><div class='del'>-		chk_h2c_init = HALMAC_REG_READ_32(halmac_adapter,</div><div class='del'>-						  REG_H2C_PKT_READADDR);</div><div class='del'>-		if (halmac_adapter-&gt;halmac_state.dlfw_state ==</div><div class='del'>-			    HALMAC_DLFW_NONE ||</div><div class='del'>-		    chk_h2c_init == 0)</div><div class='del'>-			status = halmac_dump_efuse_drv_88xx(halmac_adapter);</div><div class='del'>-		else</div><div class='del'>-			status = halmac_dump_efuse_fw_88xx(halmac_adapter);</div><div class='del'>-	} else if (cfg == HALMAC_EFUSE_R_FW) {</div><div class='del'>-		status = halmac_dump_efuse_fw_88xx(halmac_adapter);</div><div class='del'>-	} else {</div><div class='del'>-		status = halmac_dump_efuse_drv_88xx(halmac_adapter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_read_efuse error = %x\n", status);</div><div class='del'>-		return status;</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'>-enum halmac_ret_status</div><div class='del'>-halmac_func_read_efuse_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			    u32 size, u8 *efuse_map)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	if (!efuse_map) {</div><div class='del'>-		pr_err("Malloc for dump efuse map error\n");</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;hal_efuse_map_valid)</div><div class='del'>-		memcpy(efuse_map, halmac_adapter-&gt;hal_efuse_map + offset, size);</div><div class='del'>-	else if (halmac_read_hw_efuse_88xx(halmac_adapter, offset, size,</div><div class='del'>-					   efuse_map) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_EFUSE_R_FAIL;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_hw_efuse_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			  u32 size, u8 *efuse_map)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 value32;</div><div class='del'>-	u32 address;</div><div class='del'>-	u32 tmp32, counter;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	/* Read efuse no need 2.5V LDO */</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 3);</div><div class='del'>-	if (value8 &amp; BIT(7))</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 3,</div><div class='del'>-				   (u8)(value8 &amp; ~(BIT(7))));</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_EFUSE_CTRL);</div><div class='del'>-</div><div class='del'>-	for (address = offset; address &lt; offset + size; address++) {</div><div class='del'>-		value32 = value32 &amp;</div><div class='del'>-			  ~((BIT_MASK_EF_DATA) |</div><div class='del'>-			    (BIT_MASK_EF_ADDR &lt;&lt; BIT_SHIFT_EF_ADDR));</div><div class='del'>-		value32 = value32 |</div><div class='del'>-			  ((address &amp; BIT_MASK_EF_ADDR) &lt;&lt; BIT_SHIFT_EF_ADDR);</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_EFUSE_CTRL,</div><div class='del'>-				    value32 &amp; (~BIT_EF_FLAG));</div><div class='del'>-</div><div class='del'>-		counter = 1000000;</div><div class='del'>-		do {</div><div class='del'>-			udelay(1);</div><div class='del'>-			tmp32 = HALMAC_REG_READ_32(halmac_adapter,</div><div class='del'>-						   REG_EFUSE_CTRL);</div><div class='del'>-			counter--;</div><div class='del'>-			if (counter == 0) {</div><div class='del'>-				pr_err("HALMAC_RET_EFUSE_R_FAIL\n");</div><div class='del'>-				return HALMAC_RET_EFUSE_R_FAIL;</div><div class='del'>-			}</div><div class='del'>-		} while ((tmp32 &amp; BIT_EF_FLAG) == 0);</div><div class='del'>-</div><div class='del'>-		*(efuse_map + address - offset) =</div><div class='del'>-			(u8)(tmp32 &amp; BIT_MASK_EF_DATA);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_drv_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 *efuse_map = NULL;</div><div class='del'>-	u32 efuse_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	efuse_size = halmac_adapter-&gt;hw_config_info.efuse_size;</div><div class='del'>-</div><div class='del'>-	if (!halmac_adapter-&gt;hal_efuse_map) {</div><div class='del'>-		halmac_adapter-&gt;hal_efuse_map = kzalloc(efuse_size, GFP_KERNEL);</div><div class='del'>-		if (!halmac_adapter-&gt;hal_efuse_map)</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	efuse_map = kzalloc(efuse_size, GFP_KERNEL);</div><div class='del'>-	if (!efuse_map)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-</div><div class='del'>-	if (halmac_read_hw_efuse_88xx(halmac_adapter, 0, efuse_size,</div><div class='del'>-				      efuse_map) != HALMAC_RET_SUCCESS) {</div><div class='del'>-		kfree(efuse_map);</div><div class='del'>-		return HALMAC_RET_EFUSE_R_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-	memcpy(halmac_adapter-&gt;hal_efuse_map, efuse_map, efuse_size);</div><div class='del'>-	halmac_adapter-&gt;hal_efuse_map_valid = true;</div><div class='del'>-	spin_unlock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-</div><div class='del'>-	kfree(efuse_map);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_fw_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_DUMP_PHYSICAL_EFUSE;</div><div class='del'>-	h2c_header_info.content_size = 0;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num = h2c_seq_mum;</div><div class='del'>-</div><div class='del'>-	if (!halmac_adapter-&gt;hal_efuse_map) {</div><div class='del'>-		halmac_adapter-&gt;hal_efuse_map = kzalloc(</div><div class='del'>-			halmac_adapter-&gt;hw_config_info.efuse_size, GFP_KERNEL);</div><div class='del'>-		if (!halmac_adapter-&gt;hal_efuse_map)</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!halmac_adapter-&gt;hal_efuse_map_valid) {</div><div class='del'>-		status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-						  HALMAC_H2C_CMD_SIZE_88XX,</div><div class='del'>-						  true);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("halmac_read_efuse_fw Fail = %x!!\n", status);</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_write_efuse_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			     u8 value)</div><div class='del'>-{</div><div class='del'>-	const u8 wite_protect_code = 0x69;</div><div class='del'>-	u32 value32, tmp32, counter;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-	halmac_adapter-&gt;hal_efuse_map_valid = false;</div><div class='del'>-	spin_unlock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PMC_DBG_CTRL2 + 3,</div><div class='del'>-			   wite_protect_code);</div><div class='del'>-</div><div class='del'>-	/* Enable 2.5V LDO */</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_LDO_EFUSE_CTRL + 3,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 3) |</div><div class='del'>-		     BIT(7)));</div><div class='del'>-</div><div class='del'>-	value32 = HALMAC_REG_READ_32(halmac_adapter, REG_EFUSE_CTRL);</div><div class='del'>-	value32 =</div><div class='del'>-		value32 &amp;</div><div class='del'>-		~((BIT_MASK_EF_DATA) | (BIT_MASK_EF_ADDR &lt;&lt; BIT_SHIFT_EF_ADDR));</div><div class='del'>-	value32 = value32 | ((offset &amp; BIT_MASK_EF_ADDR) &lt;&lt; BIT_SHIFT_EF_ADDR) |</div><div class='del'>-		  (value &amp; BIT_MASK_EF_DATA);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_EFUSE_CTRL,</div><div class='del'>-			    value32 | BIT_EF_FLAG);</div><div class='del'>-</div><div class='del'>-	counter = 1000000;</div><div class='del'>-	do {</div><div class='del'>-		udelay(1);</div><div class='del'>-		tmp32 = HALMAC_REG_READ_32(halmac_adapter, REG_EFUSE_CTRL);</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("halmac_write_efuse Fail !!\n");</div><div class='del'>-			return HALMAC_RET_EFUSE_W_FAIL;</div><div class='del'>-		}</div><div class='del'>-	} while ((tmp32 &amp; BIT_EF_FLAG) == BIT_EF_FLAG);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PMC_DBG_CTRL2 + 3, 0x00);</div><div class='del'>-</div><div class='del'>-	/* Disable 2.5V LDO */</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_LDO_EFUSE_CTRL + 3,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 3) &amp;</div><div class='del'>-		     ~(BIT(7))));</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_switch_efuse_bank_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_efuse_bank efuse_bank)</div><div class='del'>-{</div><div class='del'>-	u8 reg_value;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_efuse_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_EFUSE_CMD_CONSTRUCT_BUSY) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	reg_value = HALMAC_REG_READ_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 1);</div><div class='del'>-</div><div class='del'>-	if (efuse_bank == (reg_value &amp; (BIT(0) | BIT(1))))</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	reg_value &amp;= ~(BIT(0) | BIT(1));</div><div class='del'>-	reg_value |= efuse_bank;</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 1, reg_value);</div><div class='del'>-</div><div class='del'>-	if ((HALMAC_REG_READ_8(halmac_adapter, REG_LDO_EFUSE_CTRL + 1) &amp;</div><div class='del'>-	     (BIT(0) | BIT(1))) != efuse_bank)</div><div class='del'>-		return HALMAC_RET_SWITCH_EFUSE_BANK_FAIL;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_eeprom_parser_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  u8 *physical_efuse_map, u8 *logical_efuse_map)</div><div class='del'>-{</div><div class='del'>-	u8 j;</div><div class='del'>-	u8 value8;</div><div class='del'>-	u8 block_index;</div><div class='del'>-	u8 valid_word_enable, word_enable;</div><div class='del'>-	u8 efuse_read_header, efuse_read_header2 = 0;</div><div class='del'>-	u32 eeprom_index;</div><div class='del'>-	u32 efuse_index = 0;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	memset(logical_efuse_map, 0xFF, eeprom_size);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		value8 = *(physical_efuse_map + efuse_index);</div><div class='del'>-		efuse_read_header = value8;</div><div class='del'>-</div><div class='del'>-		if ((efuse_read_header &amp; 0x1f) == 0x0f) {</div><div class='del'>-			efuse_index++;</div><div class='del'>-			value8 = *(physical_efuse_map + efuse_index);</div><div class='del'>-			efuse_read_header2 = value8;</div><div class='del'>-			block_index = ((efuse_read_header2 &amp; 0xF0) &gt;&gt; 1) |</div><div class='del'>-				      ((efuse_read_header &gt;&gt; 5) &amp; 0x07);</div><div class='del'>-			word_enable = efuse_read_header2 &amp; 0x0F;</div><div class='del'>-		} else {</div><div class='del'>-			block_index = (efuse_read_header &amp; 0xF0) &gt;&gt; 4;</div><div class='del'>-			word_enable = efuse_read_header &amp; 0x0F;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (efuse_read_header == 0xff)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		efuse_index++;</div><div class='del'>-</div><div class='del'>-		if (efuse_index &gt;= halmac_adapter-&gt;hw_config_info.efuse_size -</div><div class='del'>-					   HALMAC_PROTECTED_EFUSE_SIZE_88XX - 1)</div><div class='del'>-			return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; 4; j++) {</div><div class='del'>-			valid_word_enable =</div><div class='del'>-				(u8)((~(word_enable &gt;&gt; j)) &amp; BIT(0));</div><div class='del'>-			if (valid_word_enable != 1)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			eeprom_index = (block_index &lt;&lt; 3) + (j &lt;&lt; 1);</div><div class='del'>-</div><div class='del'>-			if ((eeprom_index + 1) &gt; eeprom_size) {</div><div class='del'>-				pr_err("Error: EEPROM addr exceeds eeprom_size:0x%X, at eFuse 0x%X\n",</div><div class='del'>-				       eeprom_size, efuse_index - 1);</div><div class='del'>-				if ((efuse_read_header &amp; 0x1f) == 0x0f)</div><div class='del'>-					pr_err("Error: EEPROM header: 0x%X, 0x%X,\n",</div><div class='del'>-					       efuse_read_header,</div><div class='del'>-					       efuse_read_header2);</div><div class='del'>-				else</div><div class='del'>-					pr_err("Error: EEPROM header: 0x%X,\n",</div><div class='del'>-					       efuse_read_header);</div><div class='del'>-</div><div class='del'>-				return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			value8 = *(physical_efuse_map + efuse_index);</div><div class='del'>-			*(logical_efuse_map + eeprom_index) = value8;</div><div class='del'>-</div><div class='del'>-			eeprom_index++;</div><div class='del'>-			efuse_index++;</div><div class='del'>-</div><div class='del'>-			if (efuse_index &gt;</div><div class='del'>-			    halmac_adapter-&gt;hw_config_info.efuse_size -</div><div class='del'>-				    HALMAC_PROTECTED_EFUSE_SIZE_88XX - 1)</div><div class='del'>-				return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-</div><div class='del'>-			value8 = *(physical_efuse_map + efuse_index);</div><div class='del'>-			*(logical_efuse_map + eeprom_index) = value8;</div><div class='del'>-</div><div class='del'>-			efuse_index++;</div><div class='del'>-</div><div class='del'>-			if (efuse_index &gt;</div><div class='del'>-			    halmac_adapter-&gt;hw_config_info.efuse_size -</div><div class='del'>-				    HALMAC_PROTECTED_EFUSE_SIZE_88XX)</div><div class='del'>-				return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-		}</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;efuse_end = efuse_index;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u8 *map)</div><div class='del'>-{</div><div class='del'>-	u8 *efuse_map = NULL;</div><div class='del'>-	u32 efuse_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	efuse_size = halmac_adapter-&gt;hw_config_info.efuse_size;</div><div class='del'>-</div><div class='del'>-	if (!halmac_adapter-&gt;hal_efuse_map_valid) {</div><div class='del'>-		efuse_map = kzalloc(efuse_size, GFP_KERNEL);</div><div class='del'>-		if (!efuse_map)</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-</div><div class='del'>-		status = halmac_func_read_efuse_88xx(halmac_adapter, 0,</div><div class='del'>-						     efuse_size, efuse_map);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("[ERR]halmac_read_efuse error = %x\n", status);</div><div class='del'>-			kfree(efuse_map);</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!halmac_adapter-&gt;hal_efuse_map) {</div><div class='del'>-			halmac_adapter-&gt;hal_efuse_map =</div><div class='del'>-				kzalloc(efuse_size, GFP_KERNEL);</div><div class='del'>-			if (!halmac_adapter-&gt;hal_efuse_map) {</div><div class='del'>-				kfree(efuse_map);</div><div class='del'>-				return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-		memcpy(halmac_adapter-&gt;hal_efuse_map, efuse_map, efuse_size);</div><div class='del'>-		halmac_adapter-&gt;hal_efuse_map_valid = true;</div><div class='del'>-		spin_unlock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-</div><div class='del'>-		kfree(efuse_map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_eeprom_parser_88xx(halmac_adapter,</div><div class='del'>-				      halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-				      map) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_write_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				     u32 offset, u8 value)</div><div class='del'>-{</div><div class='del'>-	u8 pg_efuse_byte1, pg_efuse_byte2;</div><div class='del'>-	u8 pg_block, pg_block_index;</div><div class='del'>-	u8 pg_efuse_header, pg_efuse_header2;</div><div class='del'>-	u8 *eeprom_map = NULL;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	u32 efuse_end, pg_efuse_num;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='del'>-	if (!eeprom_map)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	memset(eeprom_map, 0xFF, eeprom_size);</div><div class='del'>-</div><div class='del'>-	status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("[ERR]halmac_read_logical_efuse_map_88xx error = %x\n",</div><div class='del'>-		       status);</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*(eeprom_map + offset) != value) {</div><div class='del'>-		efuse_end = halmac_adapter-&gt;efuse_end;</div><div class='del'>-		pg_block = (u8)(offset &gt;&gt; 3);</div><div class='del'>-		pg_block_index = (u8)((offset &amp; (8 - 1)) &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-		if (offset &gt; 0x7f) {</div><div class='del'>-			pg_efuse_header =</div><div class='del'>-				(((pg_block &amp; 0x07) &lt;&lt; 5) &amp; 0xE0) | 0x0F;</div><div class='del'>-			pg_efuse_header2 =</div><div class='del'>-				(u8)(((pg_block &amp; 0x78) &lt;&lt; 1) +</div><div class='del'>-				     ((0x1 &lt;&lt; pg_block_index) ^ 0x0F));</div><div class='del'>-		} else {</div><div class='del'>-			pg_efuse_header =</div><div class='del'>-				(u8)((pg_block &lt;&lt; 4) +</div><div class='del'>-				     ((0x01 &lt;&lt; pg_block_index) ^ 0x0F));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((offset &amp; 1) == 0) {</div><div class='del'>-			pg_efuse_byte1 = value;</div><div class='del'>-			pg_efuse_byte2 = *(eeprom_map + offset + 1);</div><div class='del'>-		} else {</div><div class='del'>-			pg_efuse_byte1 = *(eeprom_map + offset - 1);</div><div class='del'>-			pg_efuse_byte2 = value;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (offset &gt; 0x7f) {</div><div class='del'>-			pg_efuse_num = 4;</div><div class='del'>-			if (halmac_adapter-&gt;hw_config_info.efuse_size &lt;=</div><div class='del'>-			    (pg_efuse_num + HALMAC_PROTECTED_EFUSE_SIZE_88XX +</div><div class='del'>-			     halmac_adapter-&gt;efuse_end)) {</div><div class='del'>-				kfree(eeprom_map);</div><div class='del'>-				return HALMAC_RET_EFUSE_NOT_ENOUGH;</div><div class='del'>-			}</div><div class='del'>-			halmac_func_write_efuse_88xx(halmac_adapter, efuse_end,</div><div class='del'>-						     pg_efuse_header);</div><div class='del'>-			halmac_func_write_efuse_88xx(halmac_adapter,</div><div class='del'>-						     efuse_end + 1,</div><div class='del'>-						     pg_efuse_header2);</div><div class='del'>-			halmac_func_write_efuse_88xx(</div><div class='del'>-				halmac_adapter, efuse_end + 2, pg_efuse_byte1);</div><div class='del'>-			status = halmac_func_write_efuse_88xx(</div><div class='del'>-				halmac_adapter, efuse_end + 3, pg_efuse_byte2);</div><div class='del'>-		} else {</div><div class='del'>-			pg_efuse_num = 3;</div><div class='del'>-			if (halmac_adapter-&gt;hw_config_info.efuse_size &lt;=</div><div class='del'>-			    (pg_efuse_num + HALMAC_PROTECTED_EFUSE_SIZE_88XX +</div><div class='del'>-			     halmac_adapter-&gt;efuse_end)) {</div><div class='del'>-				kfree(eeprom_map);</div><div class='del'>-				return HALMAC_RET_EFUSE_NOT_ENOUGH;</div><div class='del'>-			}</div><div class='del'>-			halmac_func_write_efuse_88xx(halmac_adapter, efuse_end,</div><div class='del'>-						     pg_efuse_header);</div><div class='del'>-			halmac_func_write_efuse_88xx(</div><div class='del'>-				halmac_adapter, efuse_end + 1, pg_efuse_byte1);</div><div class='del'>-			status = halmac_func_write_efuse_88xx(</div><div class='del'>-				halmac_adapter, efuse_end + 2, pg_efuse_byte2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("[ERR]halmac_write_logical_efuse error = %x\n",</div><div class='del'>-			       status);</div><div class='del'>-			kfree(eeprom_map);</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(eeprom_map);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_pg_efuse_by_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-				 enum halmac_efuse_read_cfg cfg)</div><div class='del'>-{</div><div class='del'>-	u8 *eeprom_mask_updated = NULL;</div><div class='del'>-	u32 eeprom_mask_size = halmac_adapter-&gt;hw_config_info.eeprom_size &gt;&gt; 4;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	eeprom_mask_updated = kzalloc(eeprom_mask_size, GFP_KERNEL);</div><div class='del'>-	if (!eeprom_mask_updated)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-</div><div class='del'>-	status = halmac_update_eeprom_mask_88xx(halmac_adapter, pg_efuse_info,</div><div class='del'>-						eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("[ERR]halmac_update_eeprom_mask_88xx error = %x\n",</div><div class='del'>-		       status);</div><div class='del'>-		kfree(eeprom_mask_updated);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_check_efuse_enough_88xx(halmac_adapter, pg_efuse_info,</div><div class='del'>-						eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("[ERR]halmac_check_efuse_enough_88xx error = %x\n",</div><div class='del'>-		       status);</div><div class='del'>-		kfree(eeprom_mask_updated);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = halmac_program_efuse_88xx(halmac_adapter, pg_efuse_info,</div><div class='del'>-					   eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("[ERR]halmac_program_efuse_88xx error = %x\n", status);</div><div class='del'>-		kfree(eeprom_mask_updated);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(eeprom_mask_updated);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_update_eeprom_mask_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			       u8 *eeprom_mask_updated)</div><div class='del'>-{</div><div class='del'>-	u8 *eeprom_map = NULL;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	u8 *eeprom_map_pg, *eeprom_mask;</div><div class='del'>-	u16 i, j;</div><div class='del'>-	u16 map_byte_offset, mask_byte_offset;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='del'>-	if (!eeprom_map)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-</div><div class='del'>-	memset(eeprom_map, 0xFF, eeprom_size);</div><div class='del'>-	memset(eeprom_mask_updated, 0x00, pg_efuse_info-&gt;efuse_mask_size);</div><div class='del'>-</div><div class='del'>-	status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eeprom_map_pg = pg_efuse_info-&gt;efuse_map;</div><div class='del'>-	eeprom_mask = pg_efuse_info-&gt;efuse_mask;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pg_efuse_info-&gt;efuse_mask_size; i++)</div><div class='del'>-		*(eeprom_mask_updated + i) = *(eeprom_mask + i);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pg_efuse_info-&gt;efuse_map_size; i = i + 16) {</div><div class='del'>-		for (j = 0; j &lt; 16; j = j + 2) {</div><div class='del'>-			map_byte_offset = i + j;</div><div class='del'>-			mask_byte_offset = i &gt;&gt; 4;</div><div class='del'>-			if (*(eeprom_map_pg + map_byte_offset) ==</div><div class='del'>-			    *(eeprom_map + map_byte_offset)) {</div><div class='del'>-				if (*(eeprom_map_pg + map_byte_offset + 1) ==</div><div class='del'>-				    *(eeprom_map + map_byte_offset + 1)) {</div><div class='del'>-					switch (j) {</div><div class='del'>-					case 0:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(4) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 2:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(5) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 4:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(6) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 6:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(7) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 8:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(0) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 10:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(1) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 12:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(2) ^ 0xFF);</div><div class='del'>-						break;</div><div class='del'>-					case 14:</div><div class='del'>-						*(eeprom_mask_updated +</div><div class='del'>-						  mask_byte_offset) =</div><div class='del'>-							*(eeprom_mask_updated +</div><div class='del'>-							  mask_byte_offset) &amp;</div><div class='del'>-							(BIT(3) ^ 0xFF);</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'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(eeprom_map);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_check_efuse_enough_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			       u8 *eeprom_mask_updated)</div><div class='del'>-{</div><div class='del'>-	u8 pre_word_enb, word_enb;</div><div class='del'>-	u8 pg_efuse_header, pg_efuse_header2;</div><div class='del'>-	u8 pg_block;</div><div class='del'>-	u16 i, j;</div><div class='del'>-	u32 efuse_end;</div><div class='del'>-	u32 tmp_eeprom_offset, pg_efuse_num = 0;</div><div class='del'>-</div><div class='del'>-	efuse_end = halmac_adapter-&gt;efuse_end;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pg_efuse_info-&gt;efuse_map_size; i = i + 8) {</div><div class='del'>-		tmp_eeprom_offset = i;</div><div class='del'>-</div><div class='del'>-		if ((tmp_eeprom_offset &amp; 7) &gt; 0) {</div><div class='del'>-			pre_word_enb =</div><div class='del'>-				(*(eeprom_mask_updated + (i &gt;&gt; 4)) &amp; 0x0F);</div><div class='del'>-			word_enb = pre_word_enb ^ 0x0F;</div><div class='del'>-		} else {</div><div class='del'>-			pre_word_enb = (*(eeprom_mask_updated + (i &gt;&gt; 4)) &gt;&gt; 4);</div><div class='del'>-			word_enb = pre_word_enb ^ 0x0F;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pg_block = (u8)(tmp_eeprom_offset &gt;&gt; 3);</div><div class='del'>-</div><div class='del'>-		if (pre_word_enb &gt; 0) {</div><div class='del'>-			if (tmp_eeprom_offset &gt; 0x7f) {</div><div class='del'>-				pg_efuse_header =</div><div class='del'>-					(((pg_block &amp; 0x07) &lt;&lt; 5) &amp; 0xE0) |</div><div class='del'>-					0x0F;</div><div class='del'>-				pg_efuse_header2 = (u8)(</div><div class='del'>-					((pg_block &amp; 0x78) &lt;&lt; 1) + word_enb);</div><div class='del'>-			} else {</div><div class='del'>-				pg_efuse_header =</div><div class='del'>-					(u8)((pg_block &lt;&lt; 4) + word_enb);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (tmp_eeprom_offset &gt; 0x7f) {</div><div class='del'>-				pg_efuse_num++;</div><div class='del'>-				pg_efuse_num++;</div><div class='del'>-				efuse_end = efuse_end + 2;</div><div class='del'>-				for (j = 0; j &lt; 4; j++) {</div><div class='del'>-					if (((pre_word_enb &gt;&gt; j) &amp; 0x1) &gt; 0) {</div><div class='del'>-						pg_efuse_num++;</div><div class='del'>-						pg_efuse_num++;</div><div class='del'>-						efuse_end = efuse_end + 2;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				pg_efuse_num++;</div><div class='del'>-				efuse_end = efuse_end + 1;</div><div class='del'>-				for (j = 0; j &lt; 4; j++) {</div><div class='del'>-					if (((pre_word_enb &gt;&gt; j) &amp; 0x1) &gt; 0) {</div><div class='del'>-						pg_efuse_num++;</div><div class='del'>-						pg_efuse_num++;</div><div class='del'>-						efuse_end = efuse_end + 2;</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'>-	if (halmac_adapter-&gt;hw_config_info.efuse_size &lt;=</div><div class='del'>-	    (pg_efuse_num + HALMAC_PROTECTED_EFUSE_SIZE_88XX +</div><div class='del'>-	     halmac_adapter-&gt;efuse_end))</div><div class='del'>-		return HALMAC_RET_EFUSE_NOT_ENOUGH;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_program_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-			  u8 *eeprom_mask_updated)</div><div class='del'>-{</div><div class='del'>-	u8 pre_word_enb, word_enb;</div><div class='del'>-	u8 pg_efuse_header, pg_efuse_header2;</div><div class='del'>-	u8 pg_block;</div><div class='del'>-	u16 i, j;</div><div class='del'>-	u32 efuse_end;</div><div class='del'>-	u32 tmp_eeprom_offset;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	efuse_end = halmac_adapter-&gt;efuse_end;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pg_efuse_info-&gt;efuse_map_size; i = i + 8) {</div><div class='del'>-		tmp_eeprom_offset = i;</div><div class='del'>-</div><div class='del'>-		if (((tmp_eeprom_offset &gt;&gt; 3) &amp; 1) &gt; 0) {</div><div class='del'>-			pre_word_enb =</div><div class='del'>-				(*(eeprom_mask_updated + (i &gt;&gt; 4)) &amp; 0x0F);</div><div class='del'>-			word_enb = pre_word_enb ^ 0x0F;</div><div class='del'>-		} else {</div><div class='del'>-			pre_word_enb = (*(eeprom_mask_updated + (i &gt;&gt; 4)) &gt;&gt; 4);</div><div class='del'>-			word_enb = pre_word_enb ^ 0x0F;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pg_block = (u8)(tmp_eeprom_offset &gt;&gt; 3);</div><div class='del'>-</div><div class='del'>-		if (pre_word_enb &lt;= 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (tmp_eeprom_offset &gt; 0x7f) {</div><div class='del'>-			pg_efuse_header =</div><div class='del'>-				(((pg_block &amp; 0x07) &lt;&lt; 5) &amp; 0xE0) | 0x0F;</div><div class='del'>-			pg_efuse_header2 =</div><div class='del'>-				(u8)(((pg_block &amp; 0x78) &lt;&lt; 1) + word_enb);</div><div class='del'>-		} else {</div><div class='del'>-			pg_efuse_header = (u8)((pg_block &lt;&lt; 4) + word_enb);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tmp_eeprom_offset &gt; 0x7f) {</div><div class='del'>-			halmac_func_write_efuse_88xx(halmac_adapter, efuse_end,</div><div class='del'>-						     pg_efuse_header);</div><div class='del'>-			status = halmac_func_write_efuse_88xx(halmac_adapter,</div><div class='del'>-							      efuse_end + 1,</div><div class='del'>-							      pg_efuse_header2);</div><div class='del'>-			efuse_end = efuse_end + 2;</div><div class='del'>-			for (j = 0; j &lt; 4; j++) {</div><div class='del'>-				if (((pre_word_enb &gt;&gt; j) &amp; 0x1) &gt; 0) {</div><div class='del'>-					halmac_func_write_efuse_88xx(</div><div class='del'>-						halmac_adapter, efuse_end,</div><div class='del'>-						*(pg_efuse_info-&gt;efuse_map +</div><div class='del'>-						  tmp_eeprom_offset +</div><div class='del'>-						  (j &lt;&lt; 1)));</div><div class='del'>-					status = halmac_func_write_efuse_88xx(</div><div class='del'>-						halmac_adapter, efuse_end + 1,</div><div class='del'>-						*(pg_efuse_info-&gt;efuse_map +</div><div class='del'>-						  tmp_eeprom_offset + (j &lt;&lt; 1) +</div><div class='del'>-						  1));</div><div class='del'>-					efuse_end = efuse_end + 2;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			status = halmac_func_write_efuse_88xx(</div><div class='del'>-				halmac_adapter, efuse_end, pg_efuse_header);</div><div class='del'>-			efuse_end = efuse_end + 1;</div><div class='del'>-			for (j = 0; j &lt; 4; j++) {</div><div class='del'>-				if (((pre_word_enb &gt;&gt; j) &amp; 0x1) &gt; 0) {</div><div class='del'>-					halmac_func_write_efuse_88xx(</div><div class='del'>-						halmac_adapter, efuse_end,</div><div class='del'>-						*(pg_efuse_info-&gt;efuse_map +</div><div class='del'>-						  tmp_eeprom_offset +</div><div class='del'>-						  (j &lt;&lt; 1)));</div><div class='del'>-					status = halmac_func_write_efuse_88xx(</div><div class='del'>-						halmac_adapter, efuse_end + 1,</div><div class='del'>-						*(pg_efuse_info-&gt;efuse_map +</div><div class='del'>-						  tmp_eeprom_offset + (j &lt;&lt; 1) +</div><div class='del'>-						  1));</div><div class='del'>-					efuse_end = efuse_end + 2;</div><div class='del'>-				}</div><div class='del'>-			}</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'>-enum halmac_ret_status</div><div class='del'>-halmac_dlfw_to_mem_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,</div><div class='del'>-			u32 dest, u32 code_size)</div><div class='del'>-{</div><div class='del'>-	u8 *code_ptr;</div><div class='del'>-	u8 first_part;</div><div class='del'>-	u32 mem_offset;</div><div class='del'>-	u32 pkt_size_tmp, send_pkt_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	code_ptr = ram_code;</div><div class='del'>-	mem_offset = 0;</div><div class='del'>-	first_part = 1;</div><div class='del'>-	pkt_size_tmp = code_size;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(</div><div class='del'>-		halmac_adapter, REG_DDMA_CH0CTRL,</div><div class='del'>-		HALMAC_REG_READ_32(halmac_adapter, REG_DDMA_CH0CTRL) |</div><div class='del'>-			BIT_DDMACH0_RESET_CHKSUM_STS);</div><div class='del'>-</div><div class='del'>-	while (pkt_size_tmp != 0) {</div><div class='del'>-		if (pkt_size_tmp &gt;= halmac_adapter-&gt;max_download_size)</div><div class='del'>-			send_pkt_size = halmac_adapter-&gt;max_download_size;</div><div class='del'>-		else</div><div class='del'>-			send_pkt_size = pkt_size_tmp;</div><div class='del'>-</div><div class='del'>-		if (halmac_send_fwpkt_88xx(</div><div class='del'>-			    halmac_adapter, code_ptr + mem_offset,</div><div class='del'>-			    send_pkt_size) != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("halmac_send_fwpkt_88xx fail!!\n");</div><div class='del'>-			return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (halmac_iddma_dlfw_88xx(</div><div class='del'>-			    halmac_adapter,</div><div class='del'>-			    HALMAC_OCPBASE_TXBUF_88XX +</div><div class='del'>-				    halmac_adapter-&gt;hw_config_info.txdesc_size,</div><div class='del'>-			    dest + mem_offset, send_pkt_size,</div><div class='del'>-			    first_part) != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("halmac_iddma_dlfw_88xx fail!!\n");</div><div class='del'>-			return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		first_part = 0;</div><div class='del'>-		mem_offset += send_pkt_size;</div><div class='del'>-		pkt_size_tmp -= send_pkt_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_check_fw_chksum_88xx(halmac_adapter, dest) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_check_fw_chksum_88xx fail!!\n");</div><div class='del'>-		return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_fwpkt_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,</div><div class='del'>-		       u32 code_size)</div><div class='del'>-{</div><div class='del'>-	if (halmac_download_rsvd_page_88xx(halmac_adapter, ram_code,</div><div class='del'>-					   code_size) != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("PLATFORM_SEND_RSVD_PAGE 0 error!!\n");</div><div class='del'>-		return HALMAC_RET_DL_RSVD_PAGE_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_iddma_dlfw_88xx(struct halmac_adapter *halmac_adapter, u32 source,</div><div class='del'>-		       u32 dest, u32 length, u8 first)</div><div class='del'>-{</div><div class='del'>-	u32 counter;</div><div class='del'>-	u32 ch0_control = (u32)(BIT_DDMACH0_CHKSUM_EN | BIT_DDMACH0_OWN);</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	counter = HALMC_DDMA_POLLING_COUNT;</div><div class='del'>-	while (HALMAC_REG_READ_32(halmac_adapter, REG_DDMA_CH0CTRL) &amp;</div><div class='del'>-	       BIT_DDMACH0_OWN) {</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("%s error-1!!\n", __func__);</div><div class='del'>-			return HALMAC_RET_DDMA_FAIL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ch0_control |= (length &amp; BIT_MASK_DDMACH0_DLEN);</div><div class='del'>-	if (first == 0)</div><div class='del'>-		ch0_control |= BIT_DDMACH0_CHKSUM_CONT;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_DDMA_CH0SA, source);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_DDMA_CH0DA, dest);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_DDMA_CH0CTRL, ch0_control);</div><div class='del'>-</div><div class='del'>-	counter = HALMC_DDMA_POLLING_COUNT;</div><div class='del'>-	while (HALMAC_REG_READ_32(halmac_adapter, REG_DDMA_CH0CTRL) &amp;</div><div class='del'>-	       BIT_DDMACH0_OWN) {</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("%s error-2!!\n", __func__);</div><div class='del'>-			return HALMAC_RET_DDMA_FAIL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_check_fw_chksum_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u32 memory_address)</div><div class='del'>-{</div><div class='del'>-	u8 mcu_fw_ctrl;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	mcu_fw_ctrl = HALMAC_REG_READ_8(halmac_adapter, REG_MCUFW_CTRL);</div><div class='del'>-</div><div class='del'>-	if (HALMAC_REG_READ_32(halmac_adapter, REG_DDMA_CH0CTRL) &amp;</div><div class='del'>-	    BIT_DDMACH0_CHKSUM_STS) {</div><div class='del'>-		if (memory_address &lt; HALMAC_OCPBASE_DMEM_88XX) {</div><div class='del'>-			mcu_fw_ctrl |= BIT_IMEM_DW_OK;</div><div class='del'>-			HALMAC_REG_WRITE_8(</div><div class='del'>-				halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-				(u8)(mcu_fw_ctrl &amp; ~(BIT_IMEM_CHKSUM_OK)));</div><div class='del'>-		} else {</div><div class='del'>-			mcu_fw_ctrl |= BIT_DMEM_DW_OK;</div><div class='del'>-			HALMAC_REG_WRITE_8(</div><div class='del'>-				halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-				(u8)(mcu_fw_ctrl &amp; ~(BIT_DMEM_CHKSUM_OK)));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pr_err("%s error!!\n", __func__);</div><div class='del'>-</div><div class='del'>-		status = HALMAC_RET_FW_CHECKSUM_FAIL;</div><div class='del'>-	} else {</div><div class='del'>-		if (memory_address &lt; HALMAC_OCPBASE_DMEM_88XX) {</div><div class='del'>-			mcu_fw_ctrl |= BIT_IMEM_DW_OK;</div><div class='del'>-			HALMAC_REG_WRITE_8(</div><div class='del'>-				halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-				(u8)(mcu_fw_ctrl | BIT_IMEM_CHKSUM_OK));</div><div class='del'>-		} else {</div><div class='del'>-			mcu_fw_ctrl |= BIT_DMEM_DW_OK;</div><div class='del'>-			HALMAC_REG_WRITE_8(</div><div class='del'>-				halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-				(u8)(mcu_fw_ctrl | BIT_DMEM_CHKSUM_OK));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = HALMAC_RET_SUCCESS;</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'>-enum halmac_ret_status</div><div class='del'>-halmac_dlfw_end_flow_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 counter;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	struct halmac_api *halmac_api =</div><div class='del'>-		(struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_TXDMA_STATUS, BIT(2));</div><div class='del'>-</div><div class='del'>-	/* Check IMEM &amp; DMEM checksum is OK or not */</div><div class='del'>-	if ((HALMAC_REG_READ_8(halmac_adapter, REG_MCUFW_CTRL) &amp; 0x50) == 0x50)</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-				    (u16)(HALMAC_REG_READ_16(halmac_adapter,</div><div class='del'>-							     REG_MCUFW_CTRL) |</div><div class='del'>-					  BIT_FW_DW_RDY));</div><div class='del'>-	else</div><div class='del'>-		return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(</div><div class='del'>-		halmac_adapter, REG_MCUFW_CTRL,</div><div class='del'>-		(u8)(HALMAC_REG_READ_8(halmac_adapter, REG_MCUFW_CTRL) &amp;</div><div class='del'>-		     ~(BIT(0))));</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_RSV_CTRL + 1);</div><div class='del'>-	value8 = (u8)(value8 | BIT(0));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_RSV_CTRL + 1, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_SYS_FUNC_EN + 1);</div><div class='del'>-	value8 = (u8)(value8 | BIT(2));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_SYS_FUNC_EN + 1,</div><div class='del'>-			   value8); /* Release MCU reset */</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"Download Finish, Reset CPU\n");</div><div class='del'>-</div><div class='del'>-	counter = 10000;</div><div class='del'>-	while (HALMAC_REG_READ_16(halmac_adapter, REG_MCUFW_CTRL) != 0xC078) {</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("Check 0x80 = 0xC078 fail\n");</div><div class='del'>-			if ((HALMAC_REG_READ_32(halmac_adapter, REG_FW_DBG7) &amp;</div><div class='del'>-			     0xFFFFFF00) == 0xFAAAAA00)</div><div class='del'>-				pr_err("Key fail\n");</div><div class='del'>-			return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-		}</div><div class='del'>-		counter--;</div><div class='del'>-		usleep_range(50, 60);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"Check 0x80 = 0xC078 counter = %d\n", counter);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_free_dl_fw_end_flow_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u32 counter;</div><div class='del'>-	struct halmac_api *halmac_api =</div><div class='del'>-		(struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	counter = 100;</div><div class='del'>-	while (HALMAC_REG_READ_8(halmac_adapter, REG_HMETFR + 3) != 0) {</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("[ERR]0x1CF != 0\n");</div><div class='del'>-			return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-		}</div><div class='del'>-		usleep_range(50, 60);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_HMETFR + 3,</div><div class='del'>-			   ID_INFORM_DLEMEM_RDY);</div><div class='del'>-</div><div class='del'>-	counter = 10000;</div><div class='del'>-	while (HALMAC_REG_READ_8(halmac_adapter, REG_C2HEVT_3 + 3) !=</div><div class='del'>-	       ID_INFORM_DLEMEM_RDY) {</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("[ERR]0x1AF != 0x80\n");</div><div class='del'>-			return HALMAC_RET_DLFW_FAIL;</div><div class='del'>-		}</div><div class='del'>-		usleep_range(50, 60);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_C2HEVT_3 + 3, 0);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pwr_seq_parser_88xx(struct halmac_adapter *halmac_adapter, u8 cut,</div><div class='del'>-			   u8 fab, u8 intf,</div><div class='del'>-			   struct halmac_wl_pwr_cfg_ **pp_pwr_seq_cfg)</div><div class='del'>-{</div><div class='del'>-	u32 seq_idx = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_wl_pwr_cfg_ *seq_cmd;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		seq_cmd = pp_pwr_seq_cfg[seq_idx];</div><div class='del'>-</div><div class='del'>-		if (!seq_cmd)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		status = halmac_pwr_sub_seq_parer_88xx(halmac_adapter, cut, fab,</div><div class='del'>-						       intf, seq_cmd);</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("[Err]pwr sub seq parser fail, status = 0x%X!\n",</div><div class='del'>-			       status);</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		seq_idx++;</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_pwr_sub_seq_parer_do_cmd_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				     struct halmac_wl_pwr_cfg_ *sub_seq_cmd,</div><div class='del'>-				     bool *reti)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u8 value, flag;</div><div class='del'>-	u8 polling_bit;</div><div class='del'>-	u32 polling_count;</div><div class='del'>-	static u32 poll_to_static;</div><div class='del'>-	u32 offset;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-	*reti = true;</div><div class='del'>-</div><div class='del'>-	switch (sub_seq_cmd-&gt;cmd) {</div><div class='del'>-	case HALMAC_PWR_CMD_WRITE:</div><div class='del'>-		if (sub_seq_cmd-&gt;base == HALMAC_PWR_BASEADDR_SDIO)</div><div class='del'>-			offset = sub_seq_cmd-&gt;offset | SDIO_LOCAL_OFFSET;</div><div class='del'>-		else</div><div class='del'>-			offset = sub_seq_cmd-&gt;offset;</div><div class='del'>-</div><div class='del'>-		value = HALMAC_REG_READ_8(halmac_adapter, offset);</div><div class='del'>-		value = (u8)(value &amp; (u8)(~(sub_seq_cmd-&gt;msk)));</div><div class='del'>-		value = (u8)(value |</div><div class='del'>-			     (u8)(sub_seq_cmd-&gt;value &amp; sub_seq_cmd-&gt;msk));</div><div class='del'>-</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, offset, value);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PWR_CMD_POLLING:</div><div class='del'>-		polling_bit = 0;</div><div class='del'>-		polling_count = HALMAC_POLLING_READY_TIMEOUT_COUNT;</div><div class='del'>-		flag = 0;</div><div class='del'>-</div><div class='del'>-		if (sub_seq_cmd-&gt;base == HALMAC_PWR_BASEADDR_SDIO)</div><div class='del'>-			offset = sub_seq_cmd-&gt;offset | SDIO_LOCAL_OFFSET;</div><div class='del'>-		else</div><div class='del'>-			offset = sub_seq_cmd-&gt;offset;</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			polling_count--;</div><div class='del'>-			value = HALMAC_REG_READ_8(halmac_adapter, offset);</div><div class='del'>-			value = (u8)(value &amp; sub_seq_cmd-&gt;msk);</div><div class='del'>-</div><div class='del'>-			if (value == (sub_seq_cmd-&gt;value &amp; sub_seq_cmd-&gt;msk)) {</div><div class='del'>-				polling_bit = 1;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (polling_count != 0) {</div><div class='del'>-				usleep_range(50, 60);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (halmac_adapter-&gt;halmac_interface ==</div><div class='del'>-				    HALMAC_INTERFACE_PCIE &amp;&amp;</div><div class='del'>-			    flag == 0) {</div><div class='del'>-				/* For PCIE + USB package poll power bit</div><div class='del'>-				 * timeout issue</div><div class='del'>-				 */</div><div class='del'>-				poll_to_static++;</div><div class='del'>-				HALMAC_RT_TRACE(</div><div class='del'>-					driver_adapter, HALMAC_MSG_PWR,</div><div class='del'>-					DBG_WARNING,</div><div class='del'>-					"[WARN]PCIE polling timeout : %d!!\n",</div><div class='del'>-					poll_to_static);</div><div class='del'>-				HALMAC_REG_WRITE_8(</div><div class='del'>-					halmac_adapter, REG_SYS_PW_CTRL,</div><div class='del'>-					HALMAC_REG_READ_8(halmac_adapter,</div><div class='del'>-							  REG_SYS_PW_CTRL) |</div><div class='del'>-						BIT(3));</div><div class='del'>-				HALMAC_REG_WRITE_8(</div><div class='del'>-					halmac_adapter, REG_SYS_PW_CTRL,</div><div class='del'>-					HALMAC_REG_READ_8(halmac_adapter,</div><div class='del'>-							  REG_SYS_PW_CTRL) &amp;</div><div class='del'>-						~BIT(3));</div><div class='del'>-				polling_bit = 0;</div><div class='del'>-				polling_count =</div><div class='del'>-					HALMAC_POLLING_READY_TIMEOUT_COUNT;</div><div class='del'>-				flag = 1;</div><div class='del'>-			} else {</div><div class='del'>-				pr_err("[ERR]Pwr cmd polling timeout!!\n");</div><div class='del'>-				pr_err("[ERR]Pwr cmd offset : %X!!\n",</div><div class='del'>-				       sub_seq_cmd-&gt;offset);</div><div class='del'>-				pr_err("[ERR]Pwr cmd value : %X!!\n",</div><div class='del'>-				       sub_seq_cmd-&gt;value);</div><div class='del'>-				pr_err("[ERR]Pwr cmd msk : %X!!\n",</div><div class='del'>-				       sub_seq_cmd-&gt;msk);</div><div class='del'>-				pr_err("[ERR]Read offset = %X value = %X!!\n",</div><div class='del'>-				       offset, value);</div><div class='del'>-				return HALMAC_RET_PWRSEQ_POLLING_FAIL;</div><div class='del'>-			}</div><div class='del'>-		} while (!polling_bit);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PWR_CMD_DELAY:</div><div class='del'>-		if (sub_seq_cmd-&gt;value == HALMAC_PWRSEQ_DELAY_US)</div><div class='del'>-			udelay(sub_seq_cmd-&gt;offset);</div><div class='del'>-		else</div><div class='del'>-			usleep_range(1000 * sub_seq_cmd-&gt;offset,</div><div class='del'>-				     1000 * sub_seq_cmd-&gt;offset + 100);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PWR_CMD_READ:</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PWR_CMD_END:</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	default:</div><div class='del'>-		return HALMAC_RET_PWRSEQ_CMD_INCORRECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*reti = false;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_pwr_sub_seq_parer_88xx(struct halmac_adapter *halmac_adapter, u8 cut,</div><div class='del'>-			      u8 fab, u8 intf,</div><div class='del'>-			      struct halmac_wl_pwr_cfg_ *pwr_sub_seq_cfg)</div><div class='del'>-{</div><div class='del'>-	struct halmac_wl_pwr_cfg_ *sub_seq_cmd;</div><div class='del'>-	bool reti;</div><div class='del'>-	enum halmac_ret_status status;</div><div class='del'>-</div><div class='del'>-	for (sub_seq_cmd = pwr_sub_seq_cfg;; sub_seq_cmd++) {</div><div class='del'>-		if ((sub_seq_cmd-&gt;interface_msk &amp; intf) &amp;&amp;</div><div class='del'>-		    (sub_seq_cmd-&gt;fab_msk &amp; fab) &amp;&amp;</div><div class='del'>-		    (sub_seq_cmd-&gt;cut_msk &amp; cut)) {</div><div class='del'>-			status = halmac_pwr_sub_seq_parer_do_cmd_88xx(</div><div class='del'>-				halmac_adapter, sub_seq_cmd, &amp;reti);</div><div class='del'>-</div><div class='del'>-			if (reti)</div><div class='del'>-				return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_h2c_buff_free_space_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u32 hw_wptr, fw_rptr;</div><div class='del'>-	struct halmac_api *halmac_api =</div><div class='del'>-		(struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	hw_wptr = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_PKT_WRITEADDR) &amp;</div><div class='del'>-		  BIT_MASK_H2C_WR_ADDR;</div><div class='del'>-	fw_rptr = HALMAC_REG_READ_32(halmac_adapter, REG_H2C_PKT_READADDR) &amp;</div><div class='del'>-		  BIT_MASK_H2C_READ_ADDR;</div><div class='del'>-</div><div class='del'>-	if (hw_wptr &gt;= fw_rptr)</div><div class='del'>-		halmac_adapter-&gt;h2c_buf_free_space =</div><div class='del'>-			halmac_adapter-&gt;h2c_buff_size - (hw_wptr - fw_rptr);</div><div class='del'>-	else</div><div class='del'>-		halmac_adapter-&gt;h2c_buf_free_space = fw_rptr - hw_wptr;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_pkt_88xx(struct halmac_adapter *halmac_adapter, u8 *hal_h2c_cmd,</div><div class='del'>-			 u32 size, bool ack)</div><div class='del'>-{</div><div class='del'>-	u32 counter = 100;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	while (halmac_adapter-&gt;h2c_buf_free_space &lt;=</div><div class='del'>-	       HALMAC_H2C_CMD_SIZE_UNIT_88XX) {</div><div class='del'>-		halmac_get_h2c_buff_free_space_88xx(halmac_adapter);</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("h2c free space is not enough!!\n");</div><div class='del'>-			return HALMAC_RET_H2C_SPACE_FULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send TxDesc + H2C_CMD */</div><div class='del'>-	if (!PLATFORM_SEND_H2C_PKT(driver_adapter, hal_h2c_cmd, size)) {</div><div class='del'>-		pr_err("Send H2C_CMD pkt error!!\n");</div><div class='del'>-		return HALMAC_RET_SEND_H2C_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;h2c_buf_free_space -= HALMAC_H2C_CMD_SIZE_UNIT_88XX;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"H2C free space : %d\n",</div><div class='del'>-			halmac_adapter-&gt;h2c_buf_free_space);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_download_rsvd_page_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u8 *hal_buf, u32 size)</div><div class='del'>-{</div><div class='del'>-	u8 restore[3];</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 counter;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (size == 0) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-				"Rsvd page packet size is zero!!\n");</div><div class='del'>-		return HALMAC_RET_ZERO_LEN_RSVD_PACKET;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_FIFOPAGE_CTRL_2 + 1);</div><div class='del'>-	value8 = (u8)(value8 | BIT(7));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FIFOPAGE_CTRL_2 + 1, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_CR + 1);</div><div class='del'>-	restore[0] = value8;</div><div class='del'>-	value8 = (u8)(value8 | BIT(0));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR + 1, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_BCN_CTRL);</div><div class='del'>-	restore[1] = value8;</div><div class='del'>-	value8 = (u8)((value8 &amp; ~(BIT(3))) | BIT(4));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_BCN_CTRL, value8);</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_FWHW_TXQ_CTRL + 2);</div><div class='del'>-	restore[2] = value8;</div><div class='del'>-	value8 = (u8)(value8 &amp; ~(BIT(6)));</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FWHW_TXQ_CTRL + 2, value8);</div><div class='del'>-</div><div class='del'>-	if (!PLATFORM_SEND_RSVD_PAGE(driver_adapter, hal_buf, size)) {</div><div class='del'>-		pr_err("PLATFORM_SEND_RSVD_PAGE 1 error!!\n");</div><div class='del'>-		status = HALMAC_RET_DL_RSVD_PAGE_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check Bcn_Valid_Bit */</div><div class='del'>-	counter = 1000;</div><div class='del'>-	while (!(HALMAC_REG_READ_8(halmac_adapter, REG_FIFOPAGE_CTRL_2 + 1) &amp;</div><div class='del'>-		 BIT(7))) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		counter--;</div><div class='del'>-		if (counter == 0) {</div><div class='del'>-			pr_err("Polling Bcn_Valid_Fail error!!\n");</div><div class='del'>-			status = HALMAC_RET_POLLING_BCN_VALID_FAIL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = HALMAC_REG_READ_8(halmac_adapter, REG_FIFOPAGE_CTRL_2 + 1);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FIFOPAGE_CTRL_2 + 1,</div><div class='del'>-			   (value8 | BIT(7)));</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_FWHW_TXQ_CTRL + 2, restore[2]);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_BCN_CTRL, restore[1]);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_CR + 1, restore[0]);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_h2c_header_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u8 *hal_h2c_hdr, u16 *seq, bool ack)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	H2C_CMD_HEADER_SET_CATEGORY(hal_h2c_hdr, 0x00);</div><div class='del'>-	H2C_CMD_HEADER_SET_TOTAL_LEN(hal_h2c_hdr, 16);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;halmac_adapter-&gt;h2c_seq_lock);</div><div class='del'>-	H2C_CMD_HEADER_SET_SEQ_NUM(hal_h2c_hdr, halmac_adapter-&gt;h2c_packet_seq);</div><div class='del'>-	*seq = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-	halmac_adapter-&gt;h2c_packet_seq++;</div><div class='del'>-	spin_unlock(&amp;halmac_adapter-&gt;h2c_seq_lock);</div><div class='del'>-</div><div class='del'>-	if (ack)</div><div class='del'>-		H2C_CMD_HEADER_SET_ACK(hal_h2c_hdr, 1);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_set_fw_offload_h2c_header_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 *hal_h2c_hdr,</div><div class='del'>-	struct halmac_h2c_header_info *h2c_header_info, u16 *seq_num)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	FW_OFFLOAD_H2C_SET_TOTAL_LEN(hal_h2c_hdr,</div><div class='del'>-				     8 + h2c_header_info-&gt;content_size);</div><div class='del'>-	FW_OFFLOAD_H2C_SET_SUB_CMD_ID(hal_h2c_hdr, h2c_header_info-&gt;sub_cmd_id);</div><div class='del'>-</div><div class='del'>-	FW_OFFLOAD_H2C_SET_CATEGORY(hal_h2c_hdr, 0x01);</div><div class='del'>-	FW_OFFLOAD_H2C_SET_CMD_ID(hal_h2c_hdr, 0xFF);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;halmac_adapter-&gt;h2c_seq_lock);</div><div class='del'>-	FW_OFFLOAD_H2C_SET_SEQ_NUM(hal_h2c_hdr, halmac_adapter-&gt;h2c_packet_seq);</div><div class='del'>-	*seq_num = halmac_adapter-&gt;h2c_packet_seq;</div><div class='del'>-	halmac_adapter-&gt;h2c_packet_seq++;</div><div class='del'>-	spin_unlock(&amp;halmac_adapter-&gt;h2c_seq_lock);</div><div class='del'>-</div><div class='del'>-	if (h2c_header_info-&gt;ack)</div><div class='del'>-		FW_OFFLOAD_H2C_SET_ACK(hal_h2c_hdr, 1);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_set_pwr_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  struct halmac_fwlps_option *hal_fw_lps_opt)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX];</div><div class='del'>-	u8 *h2c_header, *h2c_cmd;</div><div class='del'>-	u16 seq = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	h2c_header = h2c_buff;</div><div class='del'>-	h2c_cmd = h2c_header + HALMAC_H2C_CMD_HDR_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	memset(h2c_buff, 0x00, HALMAC_H2C_CMD_SIZE_88XX);</div><div class='del'>-</div><div class='del'>-	SET_PWR_MODE_SET_CMD_ID(h2c_cmd, CMD_ID_SET_PWR_MODE);</div><div class='del'>-	SET_PWR_MODE_SET_CLASS(h2c_cmd, CLASS_SET_PWR_MODE);</div><div class='del'>-	SET_PWR_MODE_SET_MODE(h2c_cmd, hal_fw_lps_opt-&gt;mode);</div><div class='del'>-	SET_PWR_MODE_SET_CLK_REQUEST(h2c_cmd, hal_fw_lps_opt-&gt;clk_request);</div><div class='del'>-	SET_PWR_MODE_SET_RLBM(h2c_cmd, hal_fw_lps_opt-&gt;rlbm);</div><div class='del'>-	SET_PWR_MODE_SET_SMART_PS(h2c_cmd, hal_fw_lps_opt-&gt;smart_ps);</div><div class='del'>-	SET_PWR_MODE_SET_AWAKE_INTERVAL(h2c_cmd,</div><div class='del'>-					hal_fw_lps_opt-&gt;awake_interval);</div><div class='del'>-	SET_PWR_MODE_SET_B_ALL_QUEUE_UAPSD(h2c_cmd,</div><div class='del'>-					   hal_fw_lps_opt-&gt;all_queue_uapsd);</div><div class='del'>-	SET_PWR_MODE_SET_PWR_STATE(h2c_cmd, hal_fw_lps_opt-&gt;pwr_state);</div><div class='del'>-	SET_PWR_MODE_SET_ANT_AUTO_SWITCH(h2c_cmd,</div><div class='del'>-					 hal_fw_lps_opt-&gt;ant_auto_switch);</div><div class='del'>-	SET_PWR_MODE_SET_PS_ALLOW_BT_HIGH_PRIORITY(</div><div class='del'>-		h2c_cmd, hal_fw_lps_opt-&gt;ps_allow_bt_high_priority);</div><div class='del'>-	SET_PWR_MODE_SET_PROTECT_BCN(h2c_cmd, hal_fw_lps_opt-&gt;protect_bcn);</div><div class='del'>-	SET_PWR_MODE_SET_SILENCE_PERIOD(h2c_cmd,</div><div class='del'>-					hal_fw_lps_opt-&gt;silence_period);</div><div class='del'>-	SET_PWR_MODE_SET_FAST_BT_CONNECT(h2c_cmd,</div><div class='del'>-					 hal_fw_lps_opt-&gt;fast_bt_connect);</div><div class='del'>-	SET_PWR_MODE_SET_TWO_ANTENNA_EN(h2c_cmd,</div><div class='del'>-					hal_fw_lps_opt-&gt;two_antenna_en);</div><div class='del'>-	SET_PWR_MODE_SET_ADOPT_USER_SETTING(h2c_cmd,</div><div class='del'>-					    hal_fw_lps_opt-&gt;adopt_user_setting);</div><div class='del'>-	SET_PWR_MODE_SET_DRV_BCN_EARLY_SHIFT(</div><div class='del'>-		h2c_cmd, hal_fw_lps_opt-&gt;drv_bcn_early_shift);</div><div class='del'>-</div><div class='del'>-	halmac_set_h2c_header_88xx(halmac_adapter, h2c_header, &amp;seq, true);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s Fail = %x!!\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_send_original_h2c_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u8 *original_h2c, u16 *seq, u8 ack)</div><div class='del'>-{</div><div class='del'>-	u8 H2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u8 *h2c_header, *h2c_cmd;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_send_original_h2c ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	h2c_header = H2c_buff;</div><div class='del'>-	h2c_cmd = h2c_header + HALMAC_H2C_CMD_HDR_SIZE_88XX;</div><div class='del'>-	memcpy(h2c_cmd, original_h2c, 8); /* Original H2C 8 byte */</div><div class='del'>-</div><div class='del'>-	halmac_set_h2c_header_88xx(halmac_adapter, h2c_header, seq, ack);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, H2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, ack);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_original_h2c Fail = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_send_original_h2c &lt;==========\n");</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_media_status_rpt_88xx(struct halmac_adapter *halmac_adapter, u8 op_mode,</div><div class='del'>-			     u8 mac_id_ind, u8 mac_id, u8 mac_id_end)</div><div class='del'>-{</div><div class='del'>-	u8 H2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u8 *h2c_header, *h2c_cmd;</div><div class='del'>-	u16 seq = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_send_h2c_set_pwr_mode_88xx!!\n");</div><div class='del'>-</div><div class='del'>-	h2c_header = H2c_buff;</div><div class='del'>-	h2c_cmd = h2c_header + HALMAC_H2C_CMD_HDR_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	memset(H2c_buff, 0x00, HALMAC_H2C_CMD_SIZE_88XX);</div><div class='del'>-</div><div class='del'>-	MEDIA_STATUS_RPT_SET_CMD_ID(h2c_cmd, CMD_ID_MEDIA_STATUS_RPT);</div><div class='del'>-	MEDIA_STATUS_RPT_SET_CLASS(h2c_cmd, CLASS_MEDIA_STATUS_RPT);</div><div class='del'>-	MEDIA_STATUS_RPT_SET_OP_MODE(h2c_cmd, op_mode);</div><div class='del'>-	MEDIA_STATUS_RPT_SET_MACID_IN(h2c_cmd, mac_id_ind);</div><div class='del'>-	MEDIA_STATUS_RPT_SET_MACID(h2c_cmd, mac_id);</div><div class='del'>-	MEDIA_STATUS_RPT_SET_MACID_END(h2c_cmd, mac_id_end);</div><div class='del'>-</div><div class='del'>-	halmac_set_h2c_header_88xx(halmac_adapter, h2c_header, &amp;seq, true);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, H2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s Fail = %x!!\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_update_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_packet_id pkt_id, u8 *pkt,</div><div class='del'>-				   u32 pkt_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation</div><div class='del'>-					  .rsvd_h2c_extra_info_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-	ret_status =</div><div class='del'>-		halmac_download_rsvd_page_88xx(halmac_adapter, pkt, pkt_size);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_download_rsvd_page_88xx Fail = %x!!\n",</div><div class='del'>-		       ret_status);</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			(u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-			      BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-	UPDATE_PACKET_SET_SIZE(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		pkt_size + halmac_adapter-&gt;hw_config_info.txdesc_size);</div><div class='del'>-	UPDATE_PACKET_SET_PACKET_ID(h2c_buff, pkt_id);</div><div class='del'>-	UPDATE_PACKET_SET_PACKET_LOC(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_h2c_extra_info_pg_bndy -</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_UPDATE_PACKET;</div><div class='del'>-	h2c_header_info.content_size = 8;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.update_packet_set.seq_num = h2c_seq_mum;</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s Fail = %x!!\n", __func__, ret_status);</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_phy_parameter_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   struct halmac_phy_parameter_info *para_info,</div><div class='del'>-				   bool full_fifo)</div><div class='del'>-{</div><div class='del'>-	bool drv_trigger_send = false;</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	u32 info_size = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	struct halmac_config_para_info *config_para_info;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-	config_para_info = &amp;halmac_adapter-&gt;config_para_info;</div><div class='del'>-</div><div class='del'>-	if (!config_para_info-&gt;cfg_para_buf) {</div><div class='del'>-		if (full_fifo)</div><div class='del'>-			config_para_info-&gt;para_buf_size =</div><div class='del'>-				HALMAC_EXTRA_INFO_BUFF_SIZE_FULL_FIFO_88XX;</div><div class='del'>-		else</div><div class='del'>-			config_para_info-&gt;para_buf_size =</div><div class='del'>-				HALMAC_EXTRA_INFO_BUFF_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-		config_para_info-&gt;cfg_para_buf =</div><div class='del'>-			kzalloc(config_para_info-&gt;para_buf_size, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (config_para_info-&gt;cfg_para_buf) {</div><div class='del'>-			memset(config_para_info-&gt;cfg_para_buf, 0x00,</div><div class='del'>-			       config_para_info-&gt;para_buf_size);</div><div class='del'>-			config_para_info-&gt;full_fifo_mode = full_fifo;</div><div class='del'>-			config_para_info-&gt;para_buf_w =</div><div class='del'>-				config_para_info-&gt;cfg_para_buf;</div><div class='del'>-			config_para_info-&gt;para_num = 0;</div><div class='del'>-			config_para_info-&gt;avai_para_buf_size =</div><div class='del'>-				config_para_info-&gt;para_buf_size;</div><div class='del'>-			config_para_info-&gt;value_accumulation = 0;</div><div class='del'>-			config_para_info-&gt;offset_accumulation = 0;</div><div class='del'>-		} else {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C,</div><div class='del'>-					DBG_DMESG,</div><div class='del'>-					"Allocate cfg_para_buf fail!!\n");</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_cfg_para_state_88xx(</div><div class='del'>-		    halmac_adapter,</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_CONSTRUCTING) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	halmac_enqueue_para_buff_88xx(halmac_adapter, para_info,</div><div class='del'>-				      config_para_info-&gt;para_buf_w,</div><div class='del'>-				      &amp;drv_trigger_send);</div><div class='del'>-</div><div class='del'>-	if (para_info-&gt;cmd_id != HALMAC_PARAMETER_CMD_END) {</div><div class='del'>-		config_para_info-&gt;para_num++;</div><div class='del'>-		config_para_info-&gt;para_buf_w += HALMAC_FW_OFFLOAD_CMD_SIZE_88XX;</div><div class='del'>-		config_para_info-&gt;avai_para_buf_size =</div><div class='del'>-			config_para_info-&gt;avai_para_buf_size -</div><div class='del'>-			HALMAC_FW_OFFLOAD_CMD_SIZE_88XX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((config_para_info-&gt;avai_para_buf_size -</div><div class='del'>-	     halmac_adapter-&gt;hw_config_info.txdesc_size) &gt;</div><div class='del'>-		    HALMAC_FW_OFFLOAD_CMD_SIZE_88XX &amp;&amp;</div><div class='del'>-	    !drv_trigger_send)</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (config_para_info-&gt;para_num == 0) {</div><div class='del'>-		kfree(config_para_info-&gt;cfg_para_buf);</div><div class='del'>-		config_para_info-&gt;cfg_para_buf = NULL;</div><div class='del'>-		config_para_info-&gt;para_buf_w = NULL;</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_WARNING,</div><div class='del'>-				"no cfg parameter element!!\n");</div><div class='del'>-</div><div class='del'>-		if (halmac_transition_cfg_para_state_88xx(</div><div class='del'>-			    halmac_adapter,</div><div class='del'>-			    HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-		    HALMAC_RET_SUCCESS)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_cfg_para_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_CFG_PARA_CMD_CONSTRUCT_H2C_SENT) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.cfg_para_state_set.process_status =</div><div class='del'>-		HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	if (config_para_info-&gt;full_fifo_mode)</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2, 0);</div><div class='del'>-	else</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-				    (u16)(halmac_adapter-&gt;txff_allocation</div><div class='del'>-						  .rsvd_h2c_extra_info_pg_bndy &amp;</div><div class='del'>-					  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-	info_size =</div><div class='del'>-		config_para_info-&gt;para_num * HALMAC_FW_OFFLOAD_CMD_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	status = halmac_download_rsvd_page_88xx(</div><div class='del'>-		halmac_adapter, (u8 *)config_para_info-&gt;cfg_para_buf,</div><div class='del'>-		info_size);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_download_rsvd_page_88xx Fail!!\n");</div><div class='del'>-	} else {</div><div class='del'>-		halmac_gen_cfg_para_h2c_88xx(halmac_adapter, h2c_buff);</div><div class='del'>-</div><div class='del'>-		h2c_header_info.sub_cmd_id = SUB_CMD_ID_CFG_PARAMETER;</div><div class='del'>-		h2c_header_info.content_size = 4;</div><div class='del'>-		h2c_header_info.ack = true;</div><div class='del'>-		halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-						      &amp;h2c_header_info,</div><div class='del'>-						      &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-		halmac_adapter-&gt;halmac_state.cfg_para_state_set.seq_num =</div><div class='del'>-			h2c_seq_mum;</div><div class='del'>-</div><div class='del'>-		status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-						  HALMAC_H2C_CMD_SIZE_88XX,</div><div class='del'>-						  true);</div><div class='del'>-</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-			pr_err("halmac_send_h2c_pkt_88xx Fail!!\n");</div><div class='del'>-</div><div class='del'>-		HALMAC_RT_TRACE(</div><div class='del'>-			driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"config parameter time = %d\n",</div><div class='del'>-			HALMAC_REG_READ_32(halmac_adapter, REG_FW_DBG6));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(config_para_info-&gt;cfg_para_buf);</div><div class='del'>-	config_para_info-&gt;cfg_para_buf = NULL;</div><div class='del'>-	config_para_info-&gt;para_buf_w = NULL;</div><div class='del'>-</div><div class='del'>-	/* Restore bcn head */</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			    (u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-				  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_cfg_para_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	if (!drv_trigger_send) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-				"Buffer full trigger sending H2C!!\n");</div><div class='del'>-		return HALMAC_RET_PARA_SENDING;</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 enum halmac_ret_status</div><div class='del'>-halmac_enqueue_para_buff_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_phy_parameter_info *para_info,</div><div class='del'>-			      u8 *curr_buff_wptr, bool *end_cmd)</div><div class='del'>-{</div><div class='del'>-	struct halmac_config_para_info *config_para_info =</div><div class='del'>-		&amp;halmac_adapter-&gt;config_para_info;</div><div class='del'>-</div><div class='del'>-	*end_cmd = false;</div><div class='del'>-</div><div class='del'>-	PHY_PARAMETER_INFO_SET_LENGTH(curr_buff_wptr,</div><div class='del'>-				      HALMAC_FW_OFFLOAD_CMD_SIZE_88XX);</div><div class='del'>-	PHY_PARAMETER_INFO_SET_IO_CMD(curr_buff_wptr, para_info-&gt;cmd_id);</div><div class='del'>-</div><div class='del'>-	switch (para_info-&gt;cmd_id) {</div><div class='del'>-	case HALMAC_PARAMETER_CMD_BB_W8:</div><div class='del'>-	case HALMAC_PARAMETER_CMD_BB_W16:</div><div class='del'>-	case HALMAC_PARAMETER_CMD_BB_W32:</div><div class='del'>-	case HALMAC_PARAMETER_CMD_MAC_W8:</div><div class='del'>-	case HALMAC_PARAMETER_CMD_MAC_W16:</div><div class='del'>-	case HALMAC_PARAMETER_CMD_MAC_W32:</div><div class='del'>-		PHY_PARAMETER_INFO_SET_IO_ADDR(</div><div class='del'>-			curr_buff_wptr, para_info-&gt;content.MAC_REG_W.offset);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_DATA(curr_buff_wptr,</div><div class='del'>-					    para_info-&gt;content.MAC_REG_W.value);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_MASK(curr_buff_wptr,</div><div class='del'>-					    para_info-&gt;content.MAC_REG_W.msk);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_MSK_EN(</div><div class='del'>-			curr_buff_wptr, para_info-&gt;content.MAC_REG_W.msk_en);</div><div class='del'>-		config_para_info-&gt;value_accumulation +=</div><div class='del'>-			para_info-&gt;content.MAC_REG_W.value;</div><div class='del'>-		config_para_info-&gt;offset_accumulation +=</div><div class='del'>-			para_info-&gt;content.MAC_REG_W.offset;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PARAMETER_CMD_RF_W:</div><div class='del'>-		/*In rf register, the address is only 1 byte*/</div><div class='del'>-		PHY_PARAMETER_INFO_SET_RF_ADDR(</div><div class='del'>-			curr_buff_wptr, para_info-&gt;content.RF_REG_W.offset);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_RF_PATH(</div><div class='del'>-			curr_buff_wptr, para_info-&gt;content.RF_REG_W.rf_path);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_DATA(curr_buff_wptr,</div><div class='del'>-					    para_info-&gt;content.RF_REG_W.value);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_MASK(curr_buff_wptr,</div><div class='del'>-					    para_info-&gt;content.RF_REG_W.msk);</div><div class='del'>-		PHY_PARAMETER_INFO_SET_MSK_EN(</div><div class='del'>-			curr_buff_wptr, para_info-&gt;content.RF_REG_W.msk_en);</div><div class='del'>-		config_para_info-&gt;value_accumulation +=</div><div class='del'>-			para_info-&gt;content.RF_REG_W.value;</div><div class='del'>-		config_para_info-&gt;offset_accumulation +=</div><div class='del'>-			(para_info-&gt;content.RF_REG_W.offset +</div><div class='del'>-			 (para_info-&gt;content.RF_REG_W.rf_path &lt;&lt; 8));</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PARAMETER_CMD_DELAY_US:</div><div class='del'>-	case HALMAC_PARAMETER_CMD_DELAY_MS:</div><div class='del'>-		PHY_PARAMETER_INFO_SET_DELAY_VALUE(</div><div class='del'>-			curr_buff_wptr,</div><div class='del'>-			para_info-&gt;content.DELAY_TIME.delay_time);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_PARAMETER_CMD_END:</div><div class='del'>-		*end_cmd = true;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err(" halmac_send_h2c_phy_parameter_88xx illegal cmd_id!!\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_gen_cfg_para_h2c_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 *h2c_buff)</div><div class='del'>-{</div><div class='del'>-	struct halmac_config_para_info *config_para_info =</div><div class='del'>-		&amp;halmac_adapter-&gt;config_para_info;</div><div class='del'>-</div><div class='del'>-	CFG_PARAMETER_SET_NUM(h2c_buff, config_para_info-&gt;para_num);</div><div class='del'>-</div><div class='del'>-	if (config_para_info-&gt;full_fifo_mode) {</div><div class='del'>-		CFG_PARAMETER_SET_INIT_CASE(h2c_buff, 0x1);</div><div class='del'>-		CFG_PARAMETER_SET_PHY_PARAMETER_LOC(h2c_buff, 0);</div><div class='del'>-	} else {</div><div class='del'>-		CFG_PARAMETER_SET_INIT_CASE(h2c_buff, 0x0);</div><div class='del'>-		CFG_PARAMETER_SET_PHY_PARAMETER_LOC(</div><div class='del'>-			h2c_buff,</div><div class='del'>-			halmac_adapter-&gt;txff_allocation</div><div class='del'>-					.rsvd_h2c_extra_info_pg_bndy -</div><div class='del'>-				halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_run_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  enum halmac_data_type halmac_data_type)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	RUN_DATAPACK_SET_DATAPACK_ID(h2c_buff, halmac_data_type);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_RUN_DATAPACK;</div><div class='del'>-	h2c_header_info.content_size = 4;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_bt_coex_cmd_88xx(struct halmac_adapter *halmac_adapter, u8 *bt_buf,</div><div class='del'>-			     u32 bt_size, u8 ack)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	memcpy(h2c_buff + 8, bt_buf, bt_size);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_BT_COEX;</div><div class='del'>-	h2c_header_info.content_size = (u16)bt_size;</div><div class='del'>-	h2c_header_info.ack = ack;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, ack);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_ctrl_ch_switch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				struct halmac_ch_switch_option *cs_option)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	enum halmac_cmd_process_status *process_status =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.scan_state_set.process_status;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_ctrl_ch_switch!!\n");</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_scan_state_88xx(</div><div class='del'>-		    halmac_adapter, HALMAC_SCAN_CMD_CONSTRUCT_H2C_SENT) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	*process_status = HALMAC_CMD_PROCESS_SENDING;</div><div class='del'>-</div><div class='del'>-	if (cs_option-&gt;switch_en != 0) {</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-				    (u16)(halmac_adapter-&gt;txff_allocation</div><div class='del'>-						  .rsvd_h2c_extra_info_pg_bndy &amp;</div><div class='del'>-					  BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-</div><div class='del'>-		status = halmac_download_rsvd_page_88xx(</div><div class='del'>-			halmac_adapter, halmac_adapter-&gt;ch_sw_info.ch_info_buf,</div><div class='del'>-			halmac_adapter-&gt;ch_sw_info.total_size);</div><div class='del'>-</div><div class='del'>-		if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-			pr_err("halmac_download_rsvd_page_88xx Fail = %x!!\n",</div><div class='del'>-			       status);</div><div class='del'>-			HALMAC_REG_WRITE_16(</div><div class='del'>-				halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-				(u16)(halmac_adapter-&gt;txff_allocation</div><div class='del'>-					      .rsvd_pg_bndy &amp;</div><div class='del'>-				      BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-			return status;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		HALMAC_REG_WRITE_16(</div><div class='del'>-			halmac_adapter, REG_FIFOPAGE_CTRL_2,</div><div class='del'>-			(u16)(halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &amp;</div><div class='del'>-			      BIT_MASK_BCN_HEAD_1_V1));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CHANNEL_SWITCH_SET_SWITCH_START(h2c_buff, cs_option-&gt;switch_en);</div><div class='del'>-	CHANNEL_SWITCH_SET_CHANNEL_NUM(h2c_buff,</div><div class='del'>-				       halmac_adapter-&gt;ch_sw_info.ch_num);</div><div class='del'>-	CHANNEL_SWITCH_SET_CHANNEL_INFO_LOC(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_h2c_extra_info_pg_bndy -</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy);</div><div class='del'>-	CHANNEL_SWITCH_SET_DEST_CH_EN(h2c_buff, cs_option-&gt;dest_ch_en);</div><div class='del'>-	CHANNEL_SWITCH_SET_DEST_CH(h2c_buff, cs_option-&gt;dest_ch);</div><div class='del'>-	CHANNEL_SWITCH_SET_PRI_CH_IDX(h2c_buff, cs_option-&gt;dest_pri_ch_idx);</div><div class='del'>-	CHANNEL_SWITCH_SET_ABSOLUTE_TIME(h2c_buff, cs_option-&gt;absolute_time_en);</div><div class='del'>-	CHANNEL_SWITCH_SET_TSF_LOW(h2c_buff, cs_option-&gt;tsf_low);</div><div class='del'>-	CHANNEL_SWITCH_SET_PERIODIC_OPTION(h2c_buff,</div><div class='del'>-					   cs_option-&gt;periodic_option);</div><div class='del'>-	CHANNEL_SWITCH_SET_NORMAL_CYCLE(h2c_buff, cs_option-&gt;normal_cycle);</div><div class='del'>-	CHANNEL_SWITCH_SET_NORMAL_PERIOD(h2c_buff, cs_option-&gt;normal_period);</div><div class='del'>-	CHANNEL_SWITCH_SET_SLOW_PERIOD(h2c_buff, cs_option-&gt;phase_2_period);</div><div class='del'>-	CHANNEL_SWITCH_SET_CHANNEL_INFO_SIZE(</div><div class='del'>-		h2c_buff, halmac_adapter-&gt;ch_sw_info.total_size);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_CHANNEL_SWITCH;</div><div class='del'>-	h2c_header_info.content_size = 20;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.scan_state_set.seq_num = h2c_seq_mum;</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-</div><div class='del'>-	kfree(halmac_adapter-&gt;ch_sw_info.ch_info_buf);</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_info_buf = NULL;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_info_buf_w = NULL;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.extra_info_en = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.avai_buf_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.total_size = 0;</div><div class='del'>-	halmac_adapter-&gt;ch_sw_info.ch_num = 0;</div><div class='del'>-</div><div class='del'>-	if (halmac_transition_scan_state_88xx(halmac_adapter,</div><div class='del'>-					      HALMAC_SCAN_CMD_CONSTRUCT_IDLE) !=</div><div class='del'>-	    HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_send_general_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   struct halmac_general_info *general_info)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"halmac_send_general_info!!\n");</div><div class='del'>-</div><div class='del'>-	GENERAL_INFO_SET_REF_TYPE(h2c_buff, general_info-&gt;rfe_type);</div><div class='del'>-	GENERAL_INFO_SET_RF_TYPE(h2c_buff, general_info-&gt;rf_type);</div><div class='del'>-	GENERAL_INFO_SET_FW_TX_BOUNDARY(</div><div class='del'>-		h2c_buff,</div><div class='del'>-		halmac_adapter-&gt;txff_allocation.rsvd_fw_txbuff_pg_bndy -</div><div class='del'>-			halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy);</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_GENERAL_INFO;</div><div class='del'>-	h2c_header_info.content_size = 4;</div><div class='del'>-	h2c_header_info.ack = false;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_send_h2c_update_bcn_parse_info_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	struct halmac_bcn_ie_info *bcn_ie_info)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u16 h2c_seq_mum = 0;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	struct halmac_h2c_header_info h2c_header_info;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_FUNC_EN(h2c_buff, bcn_ie_info-&gt;func_en);</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_SIZE_TH(h2c_buff, bcn_ie_info-&gt;size_th);</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_TIMEOUT(h2c_buff, bcn_ie_info-&gt;timeout);</div><div class='del'>-</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_0(</div><div class='del'>-		h2c_buff, (u32)(bcn_ie_info-&gt;ie_bmp[0]));</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_1(</div><div class='del'>-		h2c_buff, (u32)(bcn_ie_info-&gt;ie_bmp[1]));</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_2(</div><div class='del'>-		h2c_buff, (u32)(bcn_ie_info-&gt;ie_bmp[2]));</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_3(</div><div class='del'>-		h2c_buff, (u32)(bcn_ie_info-&gt;ie_bmp[3]));</div><div class='del'>-	UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_4(</div><div class='del'>-		h2c_buff, (u32)(bcn_ie_info-&gt;ie_bmp[4]));</div><div class='del'>-</div><div class='del'>-	h2c_header_info.sub_cmd_id = SUB_CMD_ID_UPDATE_BEACON_PARSING_INFO;</div><div class='del'>-	h2c_header_info.content_size = 24;</div><div class='del'>-	h2c_header_info.ack = true;</div><div class='del'>-	halmac_set_fw_offload_h2c_header_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					      &amp;h2c_header_info, &amp;h2c_seq_mum);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, true);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail =%x !!\n", status);</div><div class='del'>-		return status;</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'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_ps_tuning_para_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_buff[HALMAC_H2C_CMD_SIZE_88XX] = {0};</div><div class='del'>-	u8 *h2c_header, *h2c_cmd;</div><div class='del'>-	u16 seq = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"%s!!\n", __func__);</div><div class='del'>-</div><div class='del'>-	h2c_header = h2c_buff;</div><div class='del'>-	h2c_cmd = h2c_header + HALMAC_H2C_CMD_HDR_SIZE_88XX;</div><div class='del'>-</div><div class='del'>-	halmac_set_h2c_header_88xx(halmac_adapter, h2c_header, &amp;seq, false);</div><div class='del'>-</div><div class='del'>-	status = halmac_send_h2c_pkt_88xx(halmac_adapter, h2c_buff,</div><div class='del'>-					  HALMAC_H2C_CMD_SIZE_88XX, false);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_send_h2c_pkt_88xx Fail = %x!!\n", status);</div><div class='del'>-		return status;</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'>-enum halmac_ret_status</div><div class='del'>-halmac_parse_c2h_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 *halmac_buf, u32 halmac_size)</div><div class='del'>-{</div><div class='del'>-	u8 c2h_cmd, c2h_sub_cmd_id;</div><div class='del'>-	u8 *c2h_buf = halmac_buf + halmac_adapter-&gt;hw_config_info.rxdesc_size;</div><div class='del'>-	u32 c2h_size = halmac_size - halmac_adapter-&gt;hw_config_info.rxdesc_size;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	c2h_cmd = (u8)C2H_HDR_GET_CMD_ID(c2h_buf);</div><div class='del'>-</div><div class='del'>-	/* FW offload C2H cmd is 0xFF */</div><div class='del'>-	if (c2h_cmd != 0xFF) {</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-				"C2H_PKT not for FwOffloadC2HFormat!!\n");</div><div class='del'>-		return HALMAC_RET_C2H_NOT_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get C2H sub cmd ID */</div><div class='del'>-	c2h_sub_cmd_id = (u8)C2H_HDR_GET_C2H_SUB_CMD_ID(c2h_buf);</div><div class='del'>-</div><div class='del'>-	switch (c2h_sub_cmd_id) {</div><div class='del'>-	case C2H_SUB_CMD_ID_C2H_DBG:</div><div class='del'>-		status = halmac_parse_c2h_debug_88xx(halmac_adapter, c2h_buf,</div><div class='del'>-						     c2h_size);</div><div class='del'>-		break;</div><div class='del'>-	case C2H_SUB_CMD_ID_H2C_ACK_HDR:</div><div class='del'>-		status = halmac_parse_h2c_ack_88xx(halmac_adapter, c2h_buf,</div><div class='del'>-						   c2h_size);</div><div class='del'>-		break;</div><div class='del'>-	case C2H_SUB_CMD_ID_BT_COEX_INFO:</div><div class='del'>-		status = HALMAC_RET_C2H_NOT_HANDLED;</div><div class='del'>-		break;</div><div class='del'>-	case C2H_SUB_CMD_ID_SCAN_STATUS_RPT:</div><div class='del'>-		status = halmac_parse_scan_status_rpt_88xx(halmac_adapter,</div><div class='del'>-							   c2h_buf, c2h_size);</div><div class='del'>-		break;</div><div class='del'>-	case C2H_SUB_CMD_ID_PSD_DATA:</div><div class='del'>-		status = halmac_parse_psd_data_88xx(halmac_adapter, c2h_buf,</div><div class='del'>-						    c2h_size);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case C2H_SUB_CMD_ID_EFUSE_DATA:</div><div class='del'>-		status = halmac_parse_efuse_data_88xx(halmac_adapter, c2h_buf,</div><div class='del'>-						      c2h_size);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("c2h_sub_cmd_id switch case out of boundary!!\n");</div><div class='del'>-		pr_err("[ERR]c2h pkt : %.8X %.8X!!\n", *(u32 *)c2h_buf,</div><div class='del'>-		       *(u32 *)(c2h_buf + 4));</div><div class='del'>-		status = HALMAC_RET_C2H_NOT_HANDLED;</div><div class='del'>-		break;</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 enum halmac_ret_status</div><div class='del'>-halmac_parse_c2h_debug_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			    u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	u8 *c2h_buf_local = (u8 *)NULL;</div><div class='del'>-	u32 c2h_size_local = 0;</div><div class='del'>-	u8 dbg_content_length = 0;</div><div class='del'>-	u8 dbg_seq_num = 0;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	c2h_buf_local = c2h_buf;</div><div class='del'>-	c2h_size_local = c2h_size;</div><div class='del'>-</div><div class='del'>-	dbg_content_length = (u8)C2H_HDR_GET_LEN((u8 *)c2h_buf_local);</div><div class='del'>-</div><div class='del'>-	if (dbg_content_length &gt; C2H_DBG_CONTENT_MAX_LENGTH)</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	*(c2h_buf_local + C2H_DBG_HEADER_LENGTH + dbg_content_length - 2) =</div><div class='del'>-		'\n';</div><div class='del'>-	dbg_seq_num = (u8)(*(c2h_buf_local + C2H_DBG_HEADER_LENGTH));</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[RTKFW, SEQ=%d]: %s", dbg_seq_num,</div><div class='del'>-			(char *)(c2h_buf_local + C2H_DBG_HEADER_LENGTH + 1));</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_scan_status_rpt_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)SCAN_STATUS_RPT_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	process_status = (enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-					 HALMAC_H2C_RETURN_SUCCESS ?</div><div class='del'>-				 HALMAC_CMD_PROCESS_DONE :</div><div class='del'>-				 HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-</div><div class='del'>-	PLATFORM_EVENT_INDICATION(driver_adapter, HALMAC_FEATURE_CHANNEL_SWITCH,</div><div class='del'>-				  process_status, NULL, 0);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;halmac_state.scan_state_set.process_status =</div><div class='del'>-		process_status;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]scan status : %X\n", process_status);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			   u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 segment_id = 0, segment_size = 0, h2c_seq = 0;</div><div class='del'>-	u16 total_size;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-	struct halmac_psd_state_set *psd_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.psd_set;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)PSD_DATA_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			psd_set-&gt;seq_num, h2c_seq);</div><div class='del'>-	if (h2c_seq != psd_set-&gt;seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num mismatch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       psd_set-&gt;seq_num, h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (psd_set-&gt;process_status != HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	total_size = (u16)PSD_DATA_GET_TOTAL_SIZE(c2h_buf);</div><div class='del'>-	segment_id = (u8)PSD_DATA_GET_SEGMENT_ID(c2h_buf);</div><div class='del'>-	segment_size = (u8)PSD_DATA_GET_SEGMENT_SIZE(c2h_buf);</div><div class='del'>-	psd_set-&gt;data_size = total_size;</div><div class='del'>-</div><div class='del'>-	if (!psd_set-&gt;data) {</div><div class='del'>-		psd_set-&gt;data = kzalloc(psd_set-&gt;data_size, GFP_KERNEL);</div><div class='del'>-		if (!psd_set-&gt;data)</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (segment_id == 0)</div><div class='del'>-		psd_set-&gt;segment_size = segment_size;</div><div class='del'>-</div><div class='del'>-	memcpy(psd_set-&gt;data + segment_id * psd_set-&gt;segment_size,</div><div class='del'>-	       c2h_buf + HALMAC_C2H_DATA_OFFSET_88XX, segment_size);</div><div class='del'>-</div><div class='del'>-	if (!PSD_DATA_GET_END_SEGMENT(c2h_buf))</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-	psd_set-&gt;process_status = process_status;</div><div class='del'>-</div><div class='del'>-	PLATFORM_EVENT_INDICATION(driver_adapter, HALMAC_FEATURE_PSD,</div><div class='del'>-				  process_status, psd_set-&gt;data,</div><div class='del'>-				  psd_set-&gt;data_size);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_efuse_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			     u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 segment_id = 0, segment_size = 0, h2c_seq = 0;</div><div class='del'>-	u8 *eeprom_map = NULL;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	u8 h2c_return_code = 0;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)EFUSE_DATA_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num,</div><div class='del'>-			h2c_seq);</div><div class='del'>-	if (h2c_seq != halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num mismatch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num,</div><div class='del'>-		       h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.efuse_state_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	segment_id = (u8)EFUSE_DATA_GET_SEGMENT_ID(c2h_buf);</div><div class='del'>-	segment_size = (u8)EFUSE_DATA_GET_SEGMENT_SIZE(c2h_buf);</div><div class='del'>-	if (segment_id == 0)</div><div class='del'>-		halmac_adapter-&gt;efuse_segment_size = segment_size;</div><div class='del'>-</div><div class='del'>-	eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='del'>-	if (!eeprom_map)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	memset(eeprom_map, 0xFF, eeprom_size);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-	memcpy(halmac_adapter-&gt;hal_efuse_map +</div><div class='del'>-		       segment_id * halmac_adapter-&gt;efuse_segment_size,</div><div class='del'>-	       c2h_buf + HALMAC_C2H_DATA_OFFSET_88XX, segment_size);</div><div class='del'>-	spin_unlock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-</div><div class='del'>-	if (!EFUSE_DATA_GET_END_SEGMENT(c2h_buf)) {</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code =</div><div class='del'>-		halmac_adapter-&gt;halmac_state.efuse_state_set.fw_return_code;</div><div class='del'>-</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-	    HALMAC_H2C_RETURN_SUCCESS) {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.efuse_state_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-		halmac_adapter-&gt;hal_efuse_map_valid = true;</div><div class='del'>-		spin_unlock(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-</div><div class='del'>-		if (halmac_adapter-&gt;event_trigger.physical_efuse_map == 1) {</div><div class='del'>-			PLATFORM_EVENT_INDICATION(</div><div class='del'>-				driver_adapter,</div><div class='del'>-				HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE,</div><div class='del'>-				process_status, halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-				halmac_adapter-&gt;hw_config_info.efuse_size);</div><div class='del'>-			halmac_adapter-&gt;event_trigger.physical_efuse_map = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (halmac_adapter-&gt;event_trigger.logical_efuse_map == 1) {</div><div class='del'>-			if (halmac_eeprom_parser_88xx(</div><div class='del'>-				    halmac_adapter,</div><div class='del'>-				    halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-				    eeprom_map) != HALMAC_RET_SUCCESS) {</div><div class='del'>-				kfree(eeprom_map);</div><div class='del'>-				return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-			}</div><div class='del'>-			PLATFORM_EVENT_INDICATION(</div><div class='del'>-				driver_adapter,</div><div class='del'>-				HALMAC_FEATURE_DUMP_LOGICAL_EFUSE,</div><div class='del'>-				process_status, eeprom_map, eeprom_size);</div><div class='del'>-			halmac_adapter-&gt;event_trigger.logical_efuse_map = 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.efuse_state_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-</div><div class='del'>-		if (halmac_adapter-&gt;event_trigger.physical_efuse_map == 1) {</div><div class='del'>-			PLATFORM_EVENT_INDICATION(</div><div class='del'>-				driver_adapter,</div><div class='del'>-				HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE,</div><div class='del'>-				process_status,</div><div class='del'>-				&amp;halmac_adapter-&gt;halmac_state.efuse_state_set</div><div class='del'>-					 .fw_return_code,</div><div class='del'>-				1);</div><div class='del'>-			halmac_adapter-&gt;event_trigger.physical_efuse_map = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (halmac_adapter-&gt;event_trigger.logical_efuse_map == 1) {</div><div class='del'>-			if (halmac_eeprom_parser_88xx(</div><div class='del'>-				    halmac_adapter,</div><div class='del'>-				    halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-				    eeprom_map) != HALMAC_RET_SUCCESS) {</div><div class='del'>-				kfree(eeprom_map);</div><div class='del'>-				return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-			}</div><div class='del'>-			PLATFORM_EVENT_INDICATION(</div><div class='del'>-				driver_adapter,</div><div class='del'>-				HALMAC_FEATURE_DUMP_LOGICAL_EFUSE,</div><div class='del'>-				process_status,</div><div class='del'>-				&amp;halmac_adapter-&gt;halmac_state.efuse_state_set</div><div class='del'>-					 .fw_return_code,</div><div class='del'>-				1);</div><div class='del'>-			halmac_adapter-&gt;event_trigger.logical_efuse_map = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(eeprom_map);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,</div><div class='del'>-			  u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_cmd_id, h2c_sub_cmd_id;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"Ack for C2H!!\n");</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code !=</div><div class='del'>-	    HALMAC_H2C_RETURN_SUCCESS)</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-				"C2H_PKT Status Error!! Status = %d\n",</div><div class='del'>-				h2c_return_code);</div><div class='del'>-</div><div class='del'>-	h2c_cmd_id = (u8)H2C_ACK_HDR_GET_H2C_CMD_ID(c2h_buf);</div><div class='del'>-</div><div class='del'>-	if (h2c_cmd_id != 0xFF) {</div><div class='del'>-		pr_err("original h2c ack is not handled!!\n");</div><div class='del'>-		status = HALMAC_RET_C2H_NOT_HANDLED;</div><div class='del'>-	} else {</div><div class='del'>-		h2c_sub_cmd_id = (u8)H2C_ACK_HDR_GET_H2C_SUB_CMD_ID(c2h_buf);</div><div class='del'>-</div><div class='del'>-		switch (h2c_sub_cmd_id) {</div><div class='del'>-		case H2C_SUB_CMD_ID_DUMP_PHYSICAL_EFUSE_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_phy_efuse_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_CFG_PARAMETER_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_cfg_para_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_UPDATE_PACKET_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_update_packet_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_UPDATE_DATAPACK_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_update_datapack_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_RUN_DATAPACK_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_run_datapack_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_CHANNEL_SWITCH_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_channel_switch_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_IQK_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_iqk_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_POWER_TRACKING_ACK:</div><div class='del'>-			status = halmac_parse_h2c_ack_power_tracking_88xx(</div><div class='del'>-				halmac_adapter, c2h_buf, c2h_size);</div><div class='del'>-			break;</div><div class='del'>-		case H2C_SUB_CMD_ID_PSD_ACK:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_err("h2c_sub_cmd_id switch case out of boundary!!\n");</div><div class='del'>-			status = HALMAC_RET_C2H_NOT_HANDLED;</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 enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_phy_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				    u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_seq = 0;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)H2C_ACK_HDR_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num,</div><div class='del'>-			h2c_seq);</div><div class='del'>-	if (h2c_seq != halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num mismatch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.efuse_state_set.seq_num,</div><div class='del'>-		       h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.efuse_state_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.efuse_state_set.fw_return_code =</div><div class='del'>-		h2c_return_code;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_cfg_para_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_seq = 0;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	u32 offset_accu = 0, value_accu = 0;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status =</div><div class='del'>-		HALMAC_CMD_PROCESS_UNDEFINE;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)H2C_ACK_HDR_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.cfg_para_state_set.seq_num,</div><div class='del'>-			h2c_seq);</div><div class='del'>-	if (h2c_seq !=</div><div class='del'>-	    halmac_adapter-&gt;halmac_state.cfg_para_state_set.seq_num) {</div><div class='del'>-		pr_err("Seq num mismatch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.cfg_para_state_set.seq_num,</div><div class='del'>-		       h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.cfg_para_state_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.cfg_para_state_set.fw_return_code =</div><div class='del'>-		h2c_return_code;</div><div class='del'>-	offset_accu = CFG_PARAMETER_ACK_GET_OFFSET_ACCUMULATION(c2h_buf);</div><div class='del'>-	value_accu = CFG_PARAMETER_ACK_GET_VALUE_ACCUMULATION(c2h_buf);</div><div class='del'>-</div><div class='del'>-	if ((offset_accu !=</div><div class='del'>-	     halmac_adapter-&gt;config_para_info.offset_accumulation) ||</div><div class='del'>-	    (value_accu !=</div><div class='del'>-	     halmac_adapter-&gt;config_para_info.value_accumulation)) {</div><div class='del'>-		pr_err("[C2H]offset_accu : %x, value_accu : %x!!\n",</div><div class='del'>-		       offset_accu, value_accu);</div><div class='del'>-		pr_err("[Adapter]offset_accu : %x, value_accu : %x!!\n",</div><div class='del'>-		       halmac_adapter-&gt;config_para_info.offset_accumulation,</div><div class='del'>-		       halmac_adapter-&gt;config_para_info.value_accumulation);</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-		    HALMAC_H2C_RETURN_SUCCESS &amp;&amp;</div><div class='del'>-	    process_status != HALMAC_CMD_PROCESS_ERROR) {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.cfg_para_state_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(driver_adapter,</div><div class='del'>-					  HALMAC_FEATURE_CFG_PARA,</div><div class='del'>-					  process_status, NULL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.cfg_para_state_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_CFG_PARA, process_status,</div><div class='del'>-			&amp;halmac_adapter-&gt;halmac_state.cfg_para_state_set</div><div class='del'>-				 .fw_return_code,</div><div class='del'>-			1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_update_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_seq = 0;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)H2C_ACK_HDR_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.update_packet_set.seq_num,</div><div class='del'>-			h2c_seq);</div><div class='del'>-	if (h2c_seq != halmac_adapter-&gt;halmac_state.update_packet_set.seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num mismatch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.update_packet_set.seq_num,</div><div class='del'>-		       h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.update_packet_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.update_packet_set.fw_return_code =</div><div class='del'>-		h2c_return_code;</div><div class='del'>-</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-	    HALMAC_H2C_RETURN_SUCCESS) {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.update_packet_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(driver_adapter,</div><div class='del'>-					  HALMAC_FEATURE_UPDATE_PACKET,</div><div class='del'>-					  process_status, NULL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.update_packet_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_UPDATE_PACKET,</div><div class='del'>-			process_status,</div><div class='del'>-			&amp;halmac_adapter-&gt;halmac_state.update_packet_set</div><div class='del'>-				 .fw_return_code,</div><div class='del'>-			1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_update_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					  u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status =</div><div class='del'>-		HALMAC_CMD_PROCESS_UNDEFINE;</div><div class='del'>-</div><div class='del'>-	PLATFORM_EVENT_INDICATION(driver_adapter,</div><div class='del'>-				  HALMAC_FEATURE_UPDATE_DATAPACK,</div><div class='del'>-				  process_status, NULL, 0);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_run_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				       u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status =</div><div class='del'>-		HALMAC_CMD_PROCESS_UNDEFINE;</div><div class='del'>-</div><div class='del'>-	PLATFORM_EVENT_INDICATION(driver_adapter, HALMAC_FEATURE_RUN_DATAPACK,</div><div class='del'>-				  process_status, NULL, 0);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_channel_switch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					 u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_seq = 0;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)H2C_ACK_HDR_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.scan_state_set.seq_num,</div><div class='del'>-			h2c_seq);</div><div class='del'>-	if (h2c_seq != halmac_adapter-&gt;halmac_state.scan_state_set.seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num misactch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.scan_state_set.seq_num,</div><div class='del'>-		       h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.scan_state_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.scan_state_set.fw_return_code =</div><div class='del'>-		h2c_return_code;</div><div class='del'>-</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-	    HALMAC_H2C_RETURN_SUCCESS) {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_RCVD;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.scan_state_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(driver_adapter,</div><div class='del'>-					  HALMAC_FEATURE_CHANNEL_SWITCH,</div><div class='del'>-					  process_status, NULL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.scan_state_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_CHANNEL_SWITCH,</div><div class='del'>-			process_status, &amp;halmac_adapter-&gt;halmac_state</div><div class='del'>-						 .scan_state_set.fw_return_code,</div><div class='del'>-			1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_iqk_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_seq = 0;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)H2C_ACK_HDR_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.iqk_set.seq_num, h2c_seq);</div><div class='del'>-	if (h2c_seq != halmac_adapter-&gt;halmac_state.iqk_set.seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num misactch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.iqk_set.seq_num, h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.iqk_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.iqk_set.fw_return_code = h2c_return_code;</div><div class='del'>-</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-	    HALMAC_H2C_RETURN_SUCCESS) {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.iqk_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(driver_adapter, HALMAC_FEATURE_IQK,</div><div class='del'>-					  process_status, NULL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.iqk_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_IQK, process_status,</div><div class='del'>-			&amp;halmac_adapter-&gt;halmac_state.iqk_set.fw_return_code,</div><div class='del'>-			1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_parse_h2c_ack_power_tracking_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-					 u8 *c2h_buf, u32 c2h_size)</div><div class='del'>-{</div><div class='del'>-	u8 h2c_seq = 0;</div><div class='del'>-	u8 h2c_return_code;</div><div class='del'>-	void *driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	enum halmac_cmd_process_status process_status;</div><div class='del'>-</div><div class='del'>-	h2c_seq = (u8)H2C_ACK_HDR_GET_H2C_SEQ(c2h_buf);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_H2C, DBG_DMESG,</div><div class='del'>-			"[TRACE]Seq num : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-			halmac_adapter-&gt;halmac_state.power_tracking_set.seq_num,</div><div class='del'>-			h2c_seq);</div><div class='del'>-	if (h2c_seq !=</div><div class='del'>-	    halmac_adapter-&gt;halmac_state.power_tracking_set.seq_num) {</div><div class='del'>-		pr_err("[ERR]Seq num mismatch : h2c -&gt; %d c2h -&gt; %d\n",</div><div class='del'>-		       halmac_adapter-&gt;halmac_state.power_tracking_set.seq_num,</div><div class='del'>-		       h2c_seq);</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_state.power_tracking_set.process_status !=</div><div class='del'>-	    HALMAC_CMD_PROCESS_SENDING) {</div><div class='del'>-		pr_err("[ERR]Not in HALMAC_CMD_PROCESS_SENDING\n");</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h2c_return_code = (u8)H2C_ACK_HDR_GET_H2C_RETURN_CODE(c2h_buf);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.power_tracking_set.fw_return_code =</div><div class='del'>-		h2c_return_code;</div><div class='del'>-</div><div class='del'>-	if ((enum halmac_h2c_return_code)h2c_return_code ==</div><div class='del'>-	    HALMAC_H2C_RETURN_SUCCESS) {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_DONE;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.power_tracking_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(driver_adapter,</div><div class='del'>-					  HALMAC_FEATURE_POWER_TRACKING,</div><div class='del'>-					  process_status, NULL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		process_status = HALMAC_CMD_PROCESS_ERROR;</div><div class='del'>-		halmac_adapter-&gt;halmac_state.power_tracking_set.process_status =</div><div class='del'>-			process_status;</div><div class='del'>-		PLATFORM_EVENT_INDICATION(</div><div class='del'>-			driver_adapter, HALMAC_FEATURE_POWER_TRACKING,</div><div class='del'>-			process_status,</div><div class='del'>-			&amp;halmac_adapter-&gt;halmac_state.power_tracking_set</div><div class='del'>-				 .fw_return_code,</div><div class='del'>-			1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_convert_to_sdio_bus_offset_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				       u32 *halmac_offset)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	switch ((*halmac_offset) &amp; 0xFFFF0000) {</div><div class='del'>-	case WLAN_IOREG_OFFSET:</div><div class='del'>-		*halmac_offset = (HALMAC_SDIO_CMD_ADDR_MAC_REG &lt;&lt; 13) |</div><div class='del'>-				 (*halmac_offset &amp; HALMAC_WLAN_MAC_REG_MSK);</div><div class='del'>-		break;</div><div class='del'>-	case SDIO_LOCAL_OFFSET:</div><div class='del'>-		*halmac_offset = (HALMAC_SDIO_CMD_ADDR_SDIO_REG &lt;&lt; 13) |</div><div class='del'>-				 (*halmac_offset &amp; HALMAC_SDIO_LOCAL_MSK);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*halmac_offset = 0xFFFFFFFF;</div><div class='del'>-		pr_err("Unknown base address!!\n");</div><div class='del'>-		return HALMAC_RET_CONVERT_SDIO_OFFSET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_sdio_free_page_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u32 free_page = 0, free_page2 = 0, free_page3 = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_sdio_free_space *sdio_free_space;</div><div class='del'>-	u8 data[12] = {0};</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	sdio_free_space = &amp;halmac_adapter-&gt;sdio_free_space;</div><div class='del'>-	/*need to use HALMAC_REG_READ_N, 20160316, Soar*/</div><div class='del'>-	HALMAC_REG_SDIO_CMD53_READ_N(halmac_adapter, REG_SDIO_FREE_TXPG, 12,</div><div class='del'>-				     data);</div><div class='del'>-	free_page =</div><div class='del'>-		data[0] | (data[1] &lt;&lt; 8) | (data[2] &lt;&lt; 16) | (data[3] &lt;&lt; 24);</div><div class='del'>-	free_page2 =</div><div class='del'>-		data[4] | (data[5] &lt;&lt; 8) | (data[6] &lt;&lt; 16) | (data[7] &lt;&lt; 24);</div><div class='del'>-	free_page3 =</div><div class='del'>-		data[8] | (data[9] &lt;&lt; 8) | (data[10] &lt;&lt; 16) | (data[11] &lt;&lt; 24);</div><div class='del'>-</div><div class='del'>-	sdio_free_space-&gt;high_queue_number =</div><div class='del'>-		(u16)BIT_GET_HIQ_FREEPG_V1(free_page);</div><div class='del'>-	sdio_free_space-&gt;normal_queue_number =</div><div class='del'>-		(u16)BIT_GET_MID_FREEPG_V1(free_page);</div><div class='del'>-	sdio_free_space-&gt;low_queue_number =</div><div class='del'>-		(u16)BIT_GET_LOW_FREEPG_V1(free_page2);</div><div class='del'>-	sdio_free_space-&gt;public_queue_number =</div><div class='del'>-		(u16)BIT_GET_PUB_FREEPG_V1(free_page2);</div><div class='del'>-	sdio_free_space-&gt;extra_queue_number =</div><div class='del'>-		(u16)BIT_GET_EXQ_FREEPG_V1(free_page3);</div><div class='del'>-	sdio_free_space-&gt;ac_oqt_number = (u8)((free_page3 &gt;&gt; 16) &amp; 0xFF);</div><div class='del'>-	sdio_free_space-&gt;non_ac_oqt_number = (u8)((free_page3 &gt;&gt; 24) &amp; 0xFF);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_oqt_free_space_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_sdio_free_space *sdio_free_space;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	sdio_free_space = &amp;halmac_adapter-&gt;sdio_free_space;</div><div class='del'>-</div><div class='del'>-	sdio_free_space-&gt;ac_oqt_number = HALMAC_REG_READ_8(</div><div class='del'>-		halmac_adapter, REG_SDIO_OQT_FREE_TXPG_V1 + 2);</div><div class='del'>-	sdio_free_space-&gt;ac_empty =</div><div class='del'>-		HALMAC_REG_READ_8(halmac_adapter, REG_TXPKT_EMPTY);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s &lt;==========\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_efuse_cmd_construct_state</div><div class='del'>-halmac_query_efuse_curr_state_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	return halmac_adapter-&gt;halmac_state.efuse_state_set</div><div class='del'>-		.efuse_cmd_construct_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_transition_efuse_state_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_efuse_cmd_construct_state dest_state)</div><div class='del'>-{</div><div class='del'>-	struct halmac_efuse_state_set *efuse_state =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set;</div><div class='del'>-</div><div class='del'>-	if (efuse_state-&gt;efuse_cmd_construct_state !=</div><div class='del'>-		    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE &amp;&amp;</div><div class='del'>-	    efuse_state-&gt;efuse_cmd_construct_state !=</div><div class='del'>-		    HALMAC_EFUSE_CMD_CONSTRUCT_BUSY &amp;&amp;</div><div class='del'>-	    efuse_state-&gt;efuse_cmd_construct_state !=</div><div class='del'>-		    HALMAC_EFUSE_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	if (efuse_state-&gt;efuse_cmd_construct_state == dest_state)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	if (dest_state == HALMAC_EFUSE_CMD_CONSTRUCT_BUSY) {</div><div class='del'>-		if (efuse_state-&gt;efuse_cmd_construct_state ==</div><div class='del'>-		    HALMAC_EFUSE_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	} else if (dest_state == HALMAC_EFUSE_CMD_CONSTRUCT_H2C_SENT) {</div><div class='del'>-		if (efuse_state-&gt;efuse_cmd_construct_state ==</div><div class='del'>-		    HALMAC_EFUSE_CMD_CONSTRUCT_IDLE)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	efuse_state-&gt;efuse_cmd_construct_state = dest_state;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_cfg_para_cmd_construct_state</div><div class='del'>-halmac_query_cfg_para_curr_state_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	return halmac_adapter-&gt;halmac_state.cfg_para_state_set</div><div class='del'>-		.cfg_para_cmd_construct_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_transition_cfg_para_state_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cfg_para_cmd_construct_state dest_state)</div><div class='del'>-{</div><div class='del'>-	struct halmac_cfg_para_state_set *cfg_para =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.cfg_para_state_set;</div><div class='del'>-</div><div class='del'>-	if (cfg_para-&gt;cfg_para_cmd_construct_state !=</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE &amp;&amp;</div><div class='del'>-	    cfg_para-&gt;cfg_para_cmd_construct_state !=</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_CONSTRUCTING &amp;&amp;</div><div class='del'>-	    cfg_para-&gt;cfg_para_cmd_construct_state !=</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	if (dest_state == HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		if (cfg_para-&gt;cfg_para_cmd_construct_state ==</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_CONSTRUCTING)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	} else if (dest_state == HALMAC_CFG_PARA_CMD_CONSTRUCT_CONSTRUCTING) {</div><div class='del'>-		if (cfg_para-&gt;cfg_para_cmd_construct_state ==</div><div class='del'>-		    HALMAC_CFG_PARA_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	} else if (dest_state == HALMAC_CFG_PARA_CMD_CONSTRUCT_H2C_SENT) {</div><div class='del'>-		if (cfg_para-&gt;cfg_para_cmd_construct_state ==</div><div class='del'>-			    HALMAC_CFG_PARA_CMD_CONSTRUCT_IDLE ||</div><div class='del'>-		    cfg_para-&gt;cfg_para_cmd_construct_state ==</div><div class='del'>-			    HALMAC_CFG_PARA_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cfg_para-&gt;cfg_para_cmd_construct_state = dest_state;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_scan_cmd_construct_state</div><div class='del'>-halmac_query_scan_curr_state_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	return halmac_adapter-&gt;halmac_state.scan_state_set</div><div class='del'>-		.scan_cmd_construct_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_transition_scan_state_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_scan_cmd_construct_state dest_state)</div><div class='del'>-{</div><div class='del'>-	struct halmac_scan_state_set *scan =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.scan_state_set;</div><div class='del'>-</div><div class='del'>-	if (scan-&gt;scan_cmd_construct_state &gt; HALMAC_SCAN_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-		return HALMAC_RET_ERROR_STATE;</div><div class='del'>-</div><div class='del'>-	if (dest_state == HALMAC_SCAN_CMD_CONSTRUCT_IDLE) {</div><div class='del'>-		if (scan-&gt;scan_cmd_construct_state ==</div><div class='del'>-			    HALMAC_SCAN_CMD_CONSTRUCT_BUFFER_CLEARED ||</div><div class='del'>-		    scan-&gt;scan_cmd_construct_state ==</div><div class='del'>-			    HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	} else if (dest_state == HALMAC_SCAN_CMD_CONSTRUCT_BUFFER_CLEARED) {</div><div class='del'>-		if (scan-&gt;scan_cmd_construct_state ==</div><div class='del'>-		    HALMAC_SCAN_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	} else if (dest_state == HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING) {</div><div class='del'>-		if (scan-&gt;scan_cmd_construct_state ==</div><div class='del'>-			    HALMAC_SCAN_CMD_CONSTRUCT_IDLE ||</div><div class='del'>-		    scan-&gt;scan_cmd_construct_state ==</div><div class='del'>-			    HALMAC_SCAN_CMD_CONSTRUCT_H2C_SENT)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	} else if (dest_state == HALMAC_SCAN_CMD_CONSTRUCT_H2C_SENT) {</div><div class='del'>-		if (scan-&gt;scan_cmd_construct_state !=</div><div class='del'>-			    HALMAC_SCAN_CMD_CONSTRUCT_CONSTRUCTING &amp;&amp;</div><div class='del'>-		    scan-&gt;scan_cmd_construct_state !=</div><div class='del'>-			    HALMAC_SCAN_CMD_CONSTRUCT_BUFFER_CLEARED)</div><div class='del'>-			return HALMAC_RET_ERROR_STATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scan-&gt;scan_cmd_construct_state = dest_state;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_cfg_para_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_cfg_para_state_set *cfg_para_state_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.cfg_para_state_set;</div><div class='del'>-</div><div class='del'>-	*process_status = cfg_para_state_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_dump_physical_efuse_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_efuse_state_set *efuse_state_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	*process_status = efuse_state_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	if (!size)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_DONE) {</div><div class='del'>-		if (*size &lt; halmac_adapter-&gt;hw_config_info.efuse_size) {</div><div class='del'>-			*size = halmac_adapter-&gt;hw_config_info.efuse_size;</div><div class='del'>-			return HALMAC_RET_BUFFER_TOO_SMALL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*size = halmac_adapter-&gt;hw_config_info.efuse_size;</div><div class='del'>-		memcpy(data, halmac_adapter-&gt;hal_efuse_map, *size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_dump_logical_efuse_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	u8 *eeprom_map = NULL;</div><div class='del'>-	u32 eeprom_size = halmac_adapter-&gt;hw_config_info.eeprom_size;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_efuse_state_set *efuse_state_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.efuse_state_set;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	*process_status = efuse_state_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	if (!size)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_DONE) {</div><div class='del'>-		if (*size &lt; eeprom_size) {</div><div class='del'>-			*size = eeprom_size;</div><div class='del'>-			return HALMAC_RET_BUFFER_TOO_SMALL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*size = eeprom_size;</div><div class='del'>-</div><div class='del'>-		eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);</div><div class='del'>-		if (!eeprom_map)</div><div class='del'>-			return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-		memset(eeprom_map, 0xFF, eeprom_size);</div><div class='del'>-</div><div class='del'>-		if (halmac_eeprom_parser_88xx(</div><div class='del'>-			    halmac_adapter, halmac_adapter-&gt;hal_efuse_map,</div><div class='del'>-			    eeprom_map) != HALMAC_RET_SUCCESS) {</div><div class='del'>-			kfree(eeprom_map);</div><div class='del'>-			return HALMAC_RET_EEPROM_PARSING_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(data, eeprom_map, *size);</div><div class='del'>-</div><div class='del'>-		kfree(eeprom_map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_channel_switch_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_scan_state_set *scan_state_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.scan_state_set;</div><div class='del'>-</div><div class='del'>-	*process_status = scan_state_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_update_packet_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_update_packet_state_set *update_packet_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.update_packet_set;</div><div class='del'>-</div><div class='del'>-	*process_status = update_packet_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_query_iqk_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     enum halmac_cmd_process_status *process_status,</div><div class='del'>-			     u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_iqk_state_set *iqk_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.iqk_set;</div><div class='del'>-</div><div class='del'>-	*process_status = iqk_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_power_tracking_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	struct halmac_power_tracking_state_set *power_tracking_state_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.power_tracking_set;</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-	*process_status = power_tracking_state_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_query_psd_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     enum halmac_cmd_process_status *process_status,</div><div class='del'>-			     u8 *data, u32 *size)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_psd_state_set *psd_set =</div><div class='del'>-		&amp;halmac_adapter-&gt;halmac_state.psd_set;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	*process_status = psd_set-&gt;process_status;</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	if (!size)</div><div class='del'>-		return HALMAC_RET_NULL_POINTER;</div><div class='del'>-</div><div class='del'>-	if (*process_status == HALMAC_CMD_PROCESS_DONE) {</div><div class='del'>-		if (*size &lt; psd_set-&gt;data_size) {</div><div class='del'>-			*size = psd_set-&gt;data_size;</div><div class='del'>-			return HALMAC_RET_BUFFER_TOO_SMALL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*size = psd_set-&gt;data_size;</div><div class='del'>-		memcpy(data, psd_set-&gt;data, *size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_verify_io_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 value8, wvalue8;</div><div class='del'>-	u32 value32, value32_2, wvalue32;</div><div class='del'>-	u32 halmac_offset;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		halmac_offset = REG_PAGE5_DUMMY;</div><div class='del'>-		if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-			halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-		ret_status = halmac_convert_to_sdio_bus_offset_88xx(</div><div class='del'>-			halmac_adapter, &amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-		/* Verify CMD52 R/W */</div><div class='del'>-		wvalue8 = 0xab;</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset,</div><div class='del'>-					  wvalue8);</div><div class='del'>-</div><div class='del'>-		value8 =</div><div class='del'>-			PLATFORM_SDIO_CMD52_READ(driver_adapter, halmac_offset);</div><div class='del'>-</div><div class='del'>-		if (value8 != wvalue8) {</div><div class='del'>-			pr_err("cmd52 r/w fail write = %X read = %X\n", wvalue8,</div><div class='del'>-			       value8);</div><div class='del'>-			ret_status = HALMAC_RET_PLATFORM_API_INCORRECT;</div><div class='del'>-		} else {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "cmd52 r/w ok\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Verify CMD53 R/W */</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset, 0xaa);</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset + 1,</div><div class='del'>-					  0xbb);</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset + 2,</div><div class='del'>-					  0xcc);</div><div class='del'>-		PLATFORM_SDIO_CMD52_WRITE(driver_adapter, halmac_offset + 3,</div><div class='del'>-					  0xdd);</div><div class='del'>-</div><div class='del'>-		value32 = PLATFORM_SDIO_CMD53_READ_32(driver_adapter,</div><div class='del'>-						      halmac_offset);</div><div class='del'>-</div><div class='del'>-		if (value32 != 0xddccbbaa) {</div><div class='del'>-			pr_err("cmd53 r fail : read = %X\n", value32);</div><div class='del'>-			ret_status = HALMAC_RET_PLATFORM_API_INCORRECT;</div><div class='del'>-		} else {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "cmd53 r ok\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		wvalue32 = 0x11223344;</div><div class='del'>-		PLATFORM_SDIO_CMD53_WRITE_32(driver_adapter, halmac_offset,</div><div class='del'>-					     wvalue32);</div><div class='del'>-</div><div class='del'>-		value32 = PLATFORM_SDIO_CMD53_READ_32(driver_adapter,</div><div class='del'>-						      halmac_offset);</div><div class='del'>-</div><div class='del'>-		if (value32 != wvalue32) {</div><div class='del'>-			pr_err("cmd53 w fail\n");</div><div class='del'>-			ret_status = HALMAC_RET_PLATFORM_API_INCORRECT;</div><div class='del'>-		} else {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "cmd53 w ok\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		value32 = PLATFORM_SDIO_CMD53_READ_32(</div><div class='del'>-			driver_adapter,</div><div class='del'>-			halmac_offset + 2); /* value32 should be 0x33441122 */</div><div class='del'>-</div><div class='del'>-		wvalue32 = 0x11225566;</div><div class='del'>-		PLATFORM_SDIO_CMD53_WRITE_32(driver_adapter, halmac_offset,</div><div class='del'>-					     wvalue32);</div><div class='del'>-</div><div class='del'>-		value32_2 = PLATFORM_SDIO_CMD53_READ_32(</div><div class='del'>-			driver_adapter,</div><div class='del'>-			halmac_offset + 2); /* value32 should be 0x55661122 */</div><div class='del'>-		if (value32_2 == value32) {</div><div class='del'>-			pr_err("cmd52 is used for HAL_SDIO_CMD53_READ_32\n");</div><div class='del'>-			ret_status = HALMAC_RET_PLATFORM_API_INCORRECT;</div><div class='del'>-		} else {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "cmd53 is correctly used\n");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		wvalue32 = 0x77665511;</div><div class='del'>-		PLATFORM_REG_WRITE_32(driver_adapter, REG_PAGE5_DUMMY,</div><div class='del'>-				      wvalue32);</div><div class='del'>-</div><div class='del'>-		value32 = PLATFORM_REG_READ_32(driver_adapter, REG_PAGE5_DUMMY);</div><div class='del'>-		if (value32 != wvalue32) {</div><div class='del'>-			pr_err("reg rw\n");</div><div class='del'>-			ret_status = HALMAC_RET_PLATFORM_API_INCORRECT;</div><div class='del'>-		} else {</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "reg rw ok\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_verify_send_rsvd_page_88xx(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	u8 *rsvd_buf = NULL;</div><div class='del'>-	u8 *rsvd_page = NULL;</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 h2c_pkt_verify_size = 64, h2c_pkt_verify_payload = 0xab;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	enum halmac_ret_status ret_status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	rsvd_buf = kzalloc(h2c_pkt_verify_size, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!rsvd_buf)</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-</div><div class='del'>-	memset(rsvd_buf, (u8)h2c_pkt_verify_payload, h2c_pkt_verify_size);</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_download_rsvd_page_88xx(halmac_adapter, rsvd_buf,</div><div class='del'>-						    h2c_pkt_verify_size);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		kfree(rsvd_buf);</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rsvd_page = kzalloc(h2c_pkt_verify_size +</div><div class='del'>-				    halmac_adapter-&gt;hw_config_info.txdesc_size,</div><div class='del'>-			    GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!rsvd_page) {</div><div class='del'>-		kfree(rsvd_buf);</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret_status = halmac_dump_fifo_88xx(</div><div class='del'>-		halmac_adapter, HAL_FIFO_SEL_RSVD_PAGE, 0,</div><div class='del'>-		h2c_pkt_verify_size +</div><div class='del'>-			halmac_adapter-&gt;hw_config_info.txdesc_size,</div><div class='del'>-		rsvd_page);</div><div class='del'>-</div><div class='del'>-	if (ret_status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		kfree(rsvd_buf);</div><div class='del'>-		kfree(rsvd_page);</div><div class='del'>-		return ret_status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; h2c_pkt_verify_size; i++) {</div><div class='del'>-		if (*(rsvd_buf + i) !=</div><div class='del'>-		    *(rsvd_page +</div><div class='del'>-		      (i + halmac_adapter-&gt;hw_config_info.txdesc_size))) {</div><div class='del'>-			pr_err("[ERR]Compare RSVD page Fail\n");</div><div class='del'>-			ret_status = HALMAC_RET_PLATFORM_API_INCORRECT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(rsvd_buf);</div><div class='del'>-	kfree(rsvd_page);</div><div class='del'>-</div><div class='del'>-	return ret_status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void halmac_power_save_cb_88xx(void *cb_data)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_adapter *halmac_adapter = (struct halmac_adapter *)NULL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter = (struct halmac_adapter *)cb_data;</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_PWR, DBG_DMESG,</div><div class='del'>-			"%s\n", __func__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_buffer_read_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			u32 size, enum hal_fifo_sel halmac_fifo_sel,</div><div class='del'>-			u8 *fifo_map)</div><div class='del'>-{</div><div class='del'>-	u32 start_page, value_read;</div><div class='del'>-	u32 i, counter = 0, residue;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (halmac_fifo_sel == HAL_FIFO_SEL_RSVD_PAGE)</div><div class='del'>-		offset = offset +</div><div class='del'>-			 (halmac_adapter-&gt;txff_allocation.rsvd_pg_bndy &lt;&lt; 7);</div><div class='del'>-</div><div class='del'>-	start_page = offset &gt;&gt; 12;</div><div class='del'>-	residue = offset &amp; (4096 - 1);</div><div class='del'>-</div><div class='del'>-	if (halmac_fifo_sel == HAL_FIFO_SEL_TX ||</div><div class='del'>-	    halmac_fifo_sel == HAL_FIFO_SEL_RSVD_PAGE)</div><div class='del'>-		start_page += 0x780;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_RX)</div><div class='del'>-		start_page += 0x700;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_REPORT)</div><div class='del'>-		start_page += 0x660;</div><div class='del'>-	else if (halmac_fifo_sel == HAL_FIFO_SEL_LLT)</div><div class='del'>-		start_page += 0x650;</div><div class='del'>-	else</div><div class='del'>-		return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-</div><div class='del'>-	value_read = HALMAC_REG_READ_16(halmac_adapter, REG_PKTBUF_DBG_CTRL);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		HALMAC_REG_WRITE_16(halmac_adapter, REG_PKTBUF_DBG_CTRL,</div><div class='del'>-				    (u16)(start_page | (value_read &amp; 0xF000)));</div><div class='del'>-</div><div class='del'>-		for (i = 0x8000 + residue; i &lt;= 0x8FFF; i += 4) {</div><div class='del'>-			*(u32 *)(fifo_map + counter) =</div><div class='del'>-				HALMAC_REG_READ_32(halmac_adapter, i);</div><div class='del'>-			*(u32 *)(fifo_map + counter) =</div><div class='del'>-				le32_to_cpu(*(__le32 *)(fifo_map + counter));</div><div class='del'>-			counter += 4;</div><div class='del'>-			if (size == counter)</div><div class='del'>-				goto HALMAC_BUF_READ_OK;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		residue = 0;</div><div class='del'>-		start_page++;</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-HALMAC_BUF_READ_OK:</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_PKTBUF_DBG_CTRL,</div><div class='del'>-			    (u16)value_read);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void halmac_restore_mac_register_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				      struct halmac_restore_info *restore_info,</div><div class='del'>-				      u32 restore_num)</div><div class='del'>-{</div><div class='del'>-	u8 value_length;</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 mac_register;</div><div class='del'>-	u32 mac_value;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	struct halmac_restore_info *curr_restore_info = restore_info;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; restore_num; i++) {</div><div class='del'>-		mac_register = curr_restore_info-&gt;mac_register;</div><div class='del'>-		mac_value = curr_restore_info-&gt;value;</div><div class='del'>-		value_length = curr_restore_info-&gt;length;</div><div class='del'>-</div><div class='del'>-		if (value_length == 1)</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, mac_register,</div><div class='del'>-					   (u8)mac_value);</div><div class='del'>-		else if (value_length == 2)</div><div class='del'>-			HALMAC_REG_WRITE_16(halmac_adapter, mac_register,</div><div class='del'>-					    (u16)mac_value);</div><div class='del'>-		else if (value_length == 4)</div><div class='del'>-			HALMAC_REG_WRITE_32(halmac_adapter, mac_register,</div><div class='del'>-					    mac_value);</div><div class='del'>-</div><div class='del'>-		curr_restore_info++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void halmac_api_record_id_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       enum halmac_api_id api_id)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_usb_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_usb_mode usb_mode)</div><div class='del'>-{</div><div class='del'>-	u32 usb_temp;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	enum halmac_usb_mode current_usb_mode;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	current_usb_mode =</div><div class='del'>-		HALMAC_REG_READ_8(halmac_adapter, REG_SYS_CFG2 + 3) == 0x20 ?</div><div class='del'>-			HALMAC_USB_MODE_U3 :</div><div class='del'>-			HALMAC_USB_MODE_U2;</div><div class='del'>-</div><div class='del'>-	/*check if HW supports usb2_usb3 swtich*/</div><div class='del'>-	usb_temp = HALMAC_REG_READ_32(halmac_adapter, REG_PAD_CTRL2);</div><div class='del'>-	if (!BIT_GET_USB23_SW_MODE_V1(usb_temp) &amp;&amp;</div><div class='del'>-	    !(usb_temp &amp; BIT_USB3_USB2_TRANSITION)) {</div><div class='del'>-		pr_err("HALMAC_HW_USB_MODE usb mode HW unsupport\n");</div><div class='del'>-		return HALMAC_RET_USB2_3_SWITCH_UNSUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (usb_mode == current_usb_mode) {</div><div class='del'>-		pr_err("HALMAC_HW_USB_MODE usb mode unchange\n");</div><div class='del'>-		return HALMAC_RET_USB_MODE_UNCHANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	usb_temp &amp;= ~(BIT_USB23_SW_MODE_V1(0x3));</div><div class='del'>-</div><div class='del'>-	if (usb_mode == HALMAC_USB_MODE_U2) {</div><div class='del'>-		/* usb3 to usb2 */</div><div class='del'>-		HALMAC_REG_WRITE_32(</div><div class='del'>-			halmac_adapter, REG_PAD_CTRL2,</div><div class='del'>-			usb_temp | BIT_USB23_SW_MODE_V1(HALMAC_USB_MODE_U2) |</div><div class='del'>-				BIT_RSM_EN_V1);</div><div class='del'>-	} else {</div><div class='del'>-		/* usb2 to usb3 */</div><div class='del'>-		HALMAC_REG_WRITE_32(</div><div class='del'>-			halmac_adapter, REG_PAD_CTRL2,</div><div class='del'>-			usb_temp | BIT_USB23_SW_MODE_V1(HALMAC_USB_MODE_U3) |</div><div class='del'>-				BIT_RSM_EN_V1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PAD_CTRL2 + 1,</div><div class='del'>-			   4); /* set counter down timer 4x64 ms */</div><div class='del'>-	HALMAC_REG_WRITE_16(</div><div class='del'>-		halmac_adapter, REG_SYS_PW_CTRL,</div><div class='del'>-		HALMAC_REG_READ_16(halmac_adapter, REG_SYS_PW_CTRL) |</div><div class='del'>-			BIT_APFM_OFFMAC);</div><div class='del'>-	usleep_range(1000, 1100);</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_PAD_CTRL2,</div><div class='del'>-			    HALMAC_REG_READ_32(halmac_adapter, REG_PAD_CTRL2) |</div><div class='del'>-				    BIT_NO_PDN_CHIPOFF_V1);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void halmac_enable_bb_rf_88xx(struct halmac_adapter *halmac_adapter, u8 enable)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 value32;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (enable == 1) {</div><div class='del'>-		value8 = HALMAC_REG_READ_8(halmac_adapter, REG_SYS_FUNC_EN);</div><div class='del'>-		value8 = value8 | BIT(0) | BIT(1);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SYS_FUNC_EN, value8);</div><div class='del'>-</div><div class='del'>-		value8 = HALMAC_REG_READ_8(halmac_adapter, REG_RF_CTRL);</div><div class='del'>-		value8 = value8 | BIT(0) | BIT(1) | BIT(2);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_RF_CTRL, value8);</div><div class='del'>-</div><div class='del'>-		value32 = HALMAC_REG_READ_32(halmac_adapter, REG_WLRF1);</div><div class='del'>-		value32 = value32 | BIT(24) | BIT(25) | BIT(26);</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_WLRF1, value32);</div><div class='del'>-	} else {</div><div class='del'>-		value8 = HALMAC_REG_READ_8(halmac_adapter, REG_SYS_FUNC_EN);</div><div class='del'>-		value8 = value8 &amp; (~(BIT(0) | BIT(1)));</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_SYS_FUNC_EN, value8);</div><div class='del'>-</div><div class='del'>-		value8 = HALMAC_REG_READ_8(halmac_adapter, REG_RF_CTRL);</div><div class='del'>-		value8 = value8 &amp; (~(BIT(0) | BIT(1) | BIT(2)));</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, REG_RF_CTRL, value8);</div><div class='del'>-</div><div class='del'>-		value32 = HALMAC_REG_READ_32(halmac_adapter, REG_WLRF1);</div><div class='del'>-		value32 = value32 &amp; (~(BIT(24) | BIT(25) | BIT(26)));</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_WLRF1, value32);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void halmac_config_sdio_tx_page_threshold_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	struct halmac_tx_page_threshold_info *threshold_info)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (threshold_info-&gt;dma_queue_sel) {</div><div class='del'>-	case HALMAC_MAP2_HQ:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_TQPNT1,</div><div class='del'>-				    threshold_info-&gt;threshold);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_MAP2_NQ:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_TQPNT2,</div><div class='del'>-				    threshold_info-&gt;threshold);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_MAP2_LQ:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_TQPNT3,</div><div class='del'>-				    threshold_info-&gt;threshold);</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_MAP2_EXQ:</div><div class='del'>-		HALMAC_REG_WRITE_32(halmac_adapter, REG_TQPNT4,</div><div class='del'>-				    threshold_info-&gt;threshold);</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'>-void halmac_config_ampdu_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_ampdu_config *ampdu_config)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PROT_MODE_CTRL + 2,</div><div class='del'>-			   ampdu_config-&gt;max_agg_num);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PROT_MODE_CTRL + 3,</div><div class='del'>-			   ampdu_config-&gt;max_agg_num);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_check_oqt_88xx(struct halmac_adapter *halmac_adapter, u32 tx_agg_num,</div><div class='del'>-		      u8 *halmac_buf)</div><div class='del'>-{</div><div class='del'>-	u32 counter = 10;</div><div class='del'>-</div><div class='del'>-	/*S0, S1 are not allowed to use, 0x4E4[0] should be 0. Soar 20160323*/</div><div class='del'>-	/*no need to check non_ac_oqt_number. HI and MGQ blocked will cause</div><div class='del'>-	 *protocal issue before H_OQT being full</div><div class='del'>-	 */</div><div class='del'>-	switch ((enum halmac_queue_select)GET_TX_DESC_QSEL(halmac_buf)) {</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VO_V2:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_VI_V2:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BE_V2:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK:</div><div class='del'>-	case HALMAC_QUEUE_SELECT_BK_V2:</div><div class='del'>-		counter = 10;</div><div class='del'>-		do {</div><div class='del'>-			if (halmac_adapter-&gt;sdio_free_space.ac_empty &gt; 0) {</div><div class='del'>-				halmac_adapter-&gt;sdio_free_space.ac_empty -= 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (halmac_adapter-&gt;sdio_free_space.ac_oqt_number &gt;=</div><div class='del'>-			    tx_agg_num) {</div><div class='del'>-				halmac_adapter-&gt;sdio_free_space.ac_oqt_number -=</div><div class='del'>-					(u8)tx_agg_num;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			halmac_update_oqt_free_space_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-			counter--;</div><div class='del'>-			if (counter == 0)</div><div class='del'>-				return HALMAC_RET_OQT_NOT_ENOUGH;</div><div class='del'>-		} while (1);</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 HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_rqpn_parser_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			enum halmac_trx_mode halmac_trx_mode,</div><div class='del'>-			struct halmac_rqpn_ *rqpn_table)</div><div class='del'>-{</div><div class='del'>-	u8 search_flag;</div><div class='del'>-	u32 i;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	search_flag = 0;</div><div class='del'>-	for (i = 0; i &lt; HALMAC_TRX_MODE_MAX; i++) {</div><div class='del'>-		if (halmac_trx_mode == rqpn_table[i].mode) {</div><div class='del'>-			halmac_adapter</div><div class='del'>-				-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VO] =</div><div class='del'>-				rqpn_table[i].dma_map_vo;</div><div class='del'>-			halmac_adapter</div><div class='del'>-				-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_VI] =</div><div class='del'>-				rqpn_table[i].dma_map_vi;</div><div class='del'>-			halmac_adapter</div><div class='del'>-				-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BE] =</div><div class='del'>-				rqpn_table[i].dma_map_be;</div><div class='del'>-			halmac_adapter</div><div class='del'>-				-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_BK] =</div><div class='del'>-				rqpn_table[i].dma_map_bk;</div><div class='del'>-			halmac_adapter</div><div class='del'>-				-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_MG] =</div><div class='del'>-				rqpn_table[i].dma_map_mg;</div><div class='del'>-			halmac_adapter</div><div class='del'>-				-&gt;halmac_ptcl_queue[HALMAC_PTCL_QUEUE_HI] =</div><div class='del'>-				rqpn_table[i].dma_map_hi;</div><div class='del'>-			search_flag = 1;</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "%s done\n", __func__);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (search_flag == 0) {</div><div class='del'>-		pr_err("HALMAC_RET_TRX_MODE_NOT_SUPPORT 1 switch case not support\n");</div><div class='del'>-		return HALMAC_RET_TRX_MODE_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pg_num_parser_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_trx_mode halmac_trx_mode,</div><div class='del'>-			  struct halmac_pg_num_ *pg_num_table)</div><div class='del'>-{</div><div class='del'>-	u8 search_flag;</div><div class='del'>-	u16 HPQ_num = 0, lpq_nnum = 0, NPQ_num = 0, GAPQ_num = 0;</div><div class='del'>-	u16 EXPQ_num = 0, PUBQ_num = 0;</div><div class='del'>-	u32 i = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	search_flag = 0;</div><div class='del'>-	for (i = 0; i &lt; HALMAC_TRX_MODE_MAX; i++) {</div><div class='del'>-		if (halmac_trx_mode == pg_num_table[i].mode) {</div><div class='del'>-			HPQ_num = pg_num_table[i].hq_num;</div><div class='del'>-			lpq_nnum = pg_num_table[i].lq_num;</div><div class='del'>-			NPQ_num = pg_num_table[i].nq_num;</div><div class='del'>-			EXPQ_num = pg_num_table[i].exq_num;</div><div class='del'>-			GAPQ_num = pg_num_table[i].gap_num;</div><div class='del'>-			PUBQ_num = halmac_adapter-&gt;txff_allocation.ac_q_pg_num -</div><div class='del'>-				   HPQ_num - lpq_nnum - NPQ_num - EXPQ_num -</div><div class='del'>-				   GAPQ_num;</div><div class='del'>-			search_flag = 1;</div><div class='del'>-			HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT,</div><div class='del'>-					DBG_DMESG, "%s done\n", __func__);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (search_flag == 0) {</div><div class='del'>-		pr_err("HALMAC_RET_TRX_MODE_NOT_SUPPORT 1 switch case not support\n");</div><div class='del'>-		return HALMAC_RET_TRX_MODE_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;txff_allocation.ac_q_pg_num &lt;</div><div class='del'>-	    HPQ_num + lpq_nnum + NPQ_num + EXPQ_num + GAPQ_num)</div><div class='del'>-		return HALMAC_RET_CFG_TXFIFO_PAGE_FAIL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.high_queue_pg_num = HPQ_num;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.low_queue_pg_num = lpq_nnum;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.normal_queue_pg_num = NPQ_num;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.extra_queue_pg_num = EXPQ_num;</div><div class='del'>-	halmac_adapter-&gt;txff_allocation.pub_queue_pg_num = PUBQ_num;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_parse_intf_phy_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   struct halmac_intf_phy_para_ *intf_phy_para,</div><div class='del'>-			   enum halmac_intf_phy_platform platform,</div><div class='del'>-			   enum hal_intf_phy intf_phy)</div><div class='del'>-{</div><div class='del'>-	u16 value;</div><div class='del'>-	u16 curr_cut;</div><div class='del'>-	u16 offset;</div><div class='del'>-	u16 ip_sel;</div><div class='del'>-	struct halmac_intf_phy_para_ *curr_phy_para;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	u8 result = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	switch (halmac_adapter-&gt;chip_version) {</div><div class='del'>-	case HALMAC_CHIP_VER_A_CUT:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_A;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_CHIP_VER_B_CUT:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_B;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_CHIP_VER_C_CUT:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_C;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_CHIP_VER_D_CUT:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_D;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_CHIP_VER_E_CUT:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_E;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_CHIP_VER_F_CUT:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_F;</div><div class='del'>-		break;</div><div class='del'>-	case HALMAC_CHIP_VER_TEST:</div><div class='del'>-		curr_cut = (u16)HALMAC_INTF_PHY_CUT_TESTCHIP;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (curr_phy_para = intf_phy_para;; curr_phy_para++) {</div><div class='del'>-		if (!(curr_phy_para-&gt;cut &amp; curr_cut) ||</div><div class='del'>-		    !(curr_phy_para-&gt;plaform &amp; (u16)platform))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		offset = curr_phy_para-&gt;offset;</div><div class='del'>-		value = curr_phy_para-&gt;value;</div><div class='del'>-		ip_sel = curr_phy_para-&gt;ip_sel;</div><div class='del'>-</div><div class='del'>-		if (offset == 0xFFFF)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (ip_sel == HALMAC_IP_SEL_MAC) {</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, (u32)offset,</div><div class='del'>-					   (u8)value);</div><div class='del'>-		} else if (intf_phy == HAL_INTF_PHY_USB2) {</div><div class='del'>-			result = halmac_usbphy_write_88xx(halmac_adapter,</div><div class='del'>-							  (u8)offset, value,</div><div class='del'>-							  HAL_INTF_PHY_USB2);</div><div class='del'>-</div><div class='del'>-			if (result != HALMAC_RET_SUCCESS)</div><div class='del'>-				pr_err("[ERR]Write USB2PHY fail!\n");</div><div class='del'>-</div><div class='del'>-		} else if (intf_phy == HAL_INTF_PHY_USB3) {</div><div class='del'>-			result = halmac_usbphy_write_88xx(halmac_adapter,</div><div class='del'>-							  (u8)offset, value,</div><div class='del'>-							  HAL_INTF_PHY_USB3);</div><div class='del'>-</div><div class='del'>-			if (result != HALMAC_RET_SUCCESS)</div><div class='del'>-				pr_err("[ERR]Write USB3PHY fail!\n");</div><div class='del'>-</div><div class='del'>-		} else if (intf_phy == HAL_INTF_PHY_PCIE_GEN1) {</div><div class='del'>-			if (ip_sel == HALMAC_IP_SEL_INTF_PHY)</div><div class='del'>-				result = halmac_mdio_write_88xx(</div><div class='del'>-					halmac_adapter, (u8)offset, value,</div><div class='del'>-					HAL_INTF_PHY_PCIE_GEN1);</div><div class='del'>-			else</div><div class='del'>-				result = halmac_dbi_write8_88xx(</div><div class='del'>-					halmac_adapter, offset, (u8)value);</div><div class='del'>-</div><div class='del'>-			if (result != HALMAC_RET_SUCCESS)</div><div class='del'>-				pr_err("[ERR]MDIO write GEN1 fail!\n");</div><div class='del'>-</div><div class='del'>-		} else if (intf_phy == HAL_INTF_PHY_PCIE_GEN2) {</div><div class='del'>-			if (ip_sel == HALMAC_IP_SEL_INTF_PHY)</div><div class='del'>-				result = halmac_mdio_write_88xx(</div><div class='del'>-					halmac_adapter, (u8)offset, value,</div><div class='del'>-					HAL_INTF_PHY_PCIE_GEN2);</div><div class='del'>-			else</div><div class='del'>-				result = halmac_dbi_write8_88xx(</div><div class='del'>-					halmac_adapter, offset, (u8)value);</div><div class='del'>-</div><div class='del'>-			if (result != HALMAC_RET_SUCCESS)</div><div class='del'>-				pr_err("[ERR]MDIO write GEN2 fail!\n");</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("[ERR]Parse intf phy cfg error!\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dbi_write32_88xx(struct halmac_adapter *halmac_adapter, u16 addr,</div><div class='del'>-			u32 data)</div><div class='del'>-{</div><div class='del'>-	u8 tmp_u1b = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-	u16 write_addr = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_32(halmac_adapter, REG_DBI_WDATA_V1, data);</div><div class='del'>-</div><div class='del'>-	write_addr = ((addr &amp; 0x0ffc) | (0x000F &lt;&lt; 12));</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_DBI_FLAG_V1, write_addr);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_DBI, DBG_DMESG,</div><div class='del'>-			"WriteAddr = %x\n", write_addr);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DBI_FLAG_V1 + 2, 0x01);</div><div class='del'>-	tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-</div><div class='del'>-	count = 20;</div><div class='del'>-	while (tmp_u1b &amp;&amp; count != 0) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		tmp_u1b =</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp_u1b) {</div><div class='del'>-		pr_err("DBI write fail!\n");</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	} else {</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 halmac_dbi_read32_88xx(struct halmac_adapter *halmac_adapter, u16 addr)</div><div class='del'>-{</div><div class='del'>-	u16 read_addr = addr &amp; 0x0ffc;</div><div class='del'>-	u8 tmp_u1b = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_DBI_FLAG_V1, read_addr);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DBI_FLAG_V1 + 2, 0x2);</div><div class='del'>-	tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-</div><div class='del'>-	count = 20;</div><div class='del'>-	while (tmp_u1b &amp;&amp; count != 0) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		tmp_u1b =</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp_u1b) {</div><div class='del'>-		ret = 0xFFFF;</div><div class='del'>-		pr_err("DBI read fail!\n");</div><div class='del'>-	} else {</div><div class='del'>-		ret = HALMAC_REG_READ_32(halmac_adapter, REG_DBI_RDATA_V1);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_DBI, DBG_DMESG,</div><div class='del'>-				"Read Value = %x\n", ret);</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'>-enum halmac_ret_status</div><div class='del'>-halmac_dbi_write8_88xx(struct halmac_adapter *halmac_adapter, u16 addr, u8 data)</div><div class='del'>-{</div><div class='del'>-	u8 tmp_u1b = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-	u16 write_addr = 0;</div><div class='del'>-	u16 remainder = addr &amp; (4 - 1);</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DBI_WDATA_V1 + remainder, data);</div><div class='del'>-</div><div class='del'>-	write_addr = ((addr &amp; 0x0ffc) | (BIT(0) &lt;&lt; (remainder + 12)));</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_DBI_FLAG_V1, write_addr);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_DBI, DBG_DMESG,</div><div class='del'>-			"WriteAddr = %x\n", write_addr);</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DBI_FLAG_V1 + 2, 0x01);</div><div class='del'>-</div><div class='del'>-	tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-</div><div class='del'>-	count = 20;</div><div class='del'>-	while (tmp_u1b &amp;&amp; count != 0) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		tmp_u1b =</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp_u1b) {</div><div class='del'>-		pr_err("DBI write fail!\n");</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	} else {</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 halmac_dbi_read8_88xx(struct halmac_adapter *halmac_adapter, u16 addr)</div><div class='del'>-{</div><div class='del'>-	u16 read_addr = addr &amp; 0x0ffc;</div><div class='del'>-	u8 tmp_u1b = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-	u8 ret = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_DBI_FLAG_V1, read_addr);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_DBI_FLAG_V1 + 2, 0x2);</div><div class='del'>-</div><div class='del'>-	tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-</div><div class='del'>-	count = 20;</div><div class='del'>-	while (tmp_u1b &amp;&amp; count != 0) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		tmp_u1b =</div><div class='del'>-			HALMAC_REG_READ_8(halmac_adapter, REG_DBI_FLAG_V1 + 2);</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp_u1b) {</div><div class='del'>-		ret = 0xFF;</div><div class='del'>-		pr_err("DBI read fail!\n");</div><div class='del'>-	} else {</div><div class='del'>-		ret = HALMAC_REG_READ_8(halmac_adapter,</div><div class='del'>-					REG_DBI_RDATA_V1 + (addr &amp; (4 - 1)));</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_DBI, DBG_DMESG,</div><div class='del'>-				"Read Value = %x\n", ret);</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'>-enum halmac_ret_status</div><div class='del'>-halmac_mdio_write_88xx(struct halmac_adapter *halmac_adapter, u8 addr, u16 data,</div><div class='del'>-		       u8 speed)</div><div class='del'>-{</div><div class='del'>-	u8 tmp_u1b = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u8 real_addr = 0;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_16(halmac_adapter, REG_MDIO_V1, data);</div><div class='del'>-</div><div class='del'>-	/* address : 5bit */</div><div class='del'>-	real_addr = (addr &amp; 0x1F);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG, real_addr);</div><div class='del'>-</div><div class='del'>-	if (speed == HAL_INTF_PHY_PCIE_GEN1) {</div><div class='del'>-		/* GEN1 page 0 */</div><div class='del'>-		if (addr &lt; 0x20) {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b00 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x00);</div><div class='del'>-</div><div class='del'>-			/* GEN1 page 1 */</div><div class='del'>-		} else {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b01 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x01);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (speed == HAL_INTF_PHY_PCIE_GEN2) {</div><div class='del'>-		/* GEN2 page 0 */</div><div class='del'>-		if (addr &lt; 0x20) {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b10 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x02);</div><div class='del'>-</div><div class='del'>-			/* GEN2 page 1 */</div><div class='del'>-		} else {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b11 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x03);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("Error Speed !\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG,</div><div class='del'>-			   HALMAC_REG_READ_8(halmac_adapter, REG_PCIE_MIX_CFG) |</div><div class='del'>-				   BIT_MDIO_WFLAG_V1);</div><div class='del'>-</div><div class='del'>-	tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_PCIE_MIX_CFG) &amp;</div><div class='del'>-		  BIT_MDIO_WFLAG_V1;</div><div class='del'>-	count = 20;</div><div class='del'>-</div><div class='del'>-	while (tmp_u1b &amp;&amp; count != 0) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_PCIE_MIX_CFG) &amp;</div><div class='del'>-			  BIT_MDIO_WFLAG_V1;</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp_u1b) {</div><div class='del'>-		pr_err("MDIO write fail!\n");</div><div class='del'>-		return HALMAC_RET_FAIL;</div><div class='del'>-	} else {</div><div class='del'>-		return HALMAC_RET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 halmac_mdio_read_88xx(struct halmac_adapter *halmac_adapter, u8 addr,</div><div class='del'>-			  u8 speed</div><div class='del'>-</div><div class='del'>-			  )</div><div class='del'>-{</div><div class='del'>-	u16 ret = 0;</div><div class='del'>-	u8 tmp_u1b = 0;</div><div class='del'>-	u32 count = 0;</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u8 real_addr = 0;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	/* address : 5bit */</div><div class='del'>-	real_addr = (addr &amp; 0x1F);</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG, real_addr);</div><div class='del'>-</div><div class='del'>-	if (speed == HAL_INTF_PHY_PCIE_GEN1) {</div><div class='del'>-		/* GEN1 page 0 */</div><div class='del'>-		if (addr &lt; 0x20) {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b00 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x00);</div><div class='del'>-</div><div class='del'>-			/* GEN1 page 1 */</div><div class='del'>-		} else {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b01 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x01);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (speed == HAL_INTF_PHY_PCIE_GEN2) {</div><div class='del'>-		/* GEN2 page 0 */</div><div class='del'>-		if (addr &lt; 0x20) {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b10 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x02);</div><div class='del'>-</div><div class='del'>-			/* GEN2 page 1 */</div><div class='del'>-		} else {</div><div class='del'>-			/* select MDIO PHY Addr : reg 0x3F8[28:24]=5'b11 */</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG + 3,</div><div class='del'>-					   0x03);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("Error Speed !\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_REG_WRITE_8(halmac_adapter, REG_PCIE_MIX_CFG,</div><div class='del'>-			   HALMAC_REG_READ_8(halmac_adapter, REG_PCIE_MIX_CFG) |</div><div class='del'>-				   BIT_MDIO_RFLAG_V1);</div><div class='del'>-</div><div class='del'>-	tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_PCIE_MIX_CFG) &amp;</div><div class='del'>-		  BIT_MDIO_RFLAG_V1;</div><div class='del'>-	count = 20;</div><div class='del'>-</div><div class='del'>-	while (tmp_u1b &amp;&amp; count != 0) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		tmp_u1b = HALMAC_REG_READ_8(halmac_adapter, REG_PCIE_MIX_CFG) &amp;</div><div class='del'>-			  BIT_MDIO_RFLAG_V1;</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tmp_u1b) {</div><div class='del'>-		ret = 0xFFFF;</div><div class='del'>-		pr_err("MDIO read fail!\n");</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		ret = HALMAC_REG_READ_16(halmac_adapter, REG_MDIO_V1 + 2);</div><div class='del'>-		HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_MDIO, DBG_DMESG,</div><div class='del'>-				"Read Value = %x\n", ret);</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'>-enum halmac_ret_status</div><div class='del'>-halmac_usbphy_write_88xx(struct halmac_adapter *halmac_adapter, u8 addr,</div><div class='del'>-			 u16 data, u8 speed)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (speed == HAL_INTF_PHY_USB3) {</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xff0d, (u8)data);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xff0e, (u8)(data &gt;&gt; 8));</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xff0c, addr | BIT(7));</div><div class='del'>-	} else if (speed == HAL_INTF_PHY_USB2) {</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xfe41, (u8)data);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xfe40, addr);</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xfe42, 0x81);</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("[ERR]Error USB Speed !\n");</div><div class='del'>-		return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 halmac_usbphy_read_88xx(struct halmac_adapter *halmac_adapter, u8 addr,</div><div class='del'>-			    u8 speed)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_api *halmac_api;</div><div class='del'>-	u16 value = 0;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	if (speed == HAL_INTF_PHY_USB3) {</div><div class='del'>-		HALMAC_REG_WRITE_8(halmac_adapter, 0xff0c, addr | BIT(6));</div><div class='del'>-		value = (u16)(HALMAC_REG_READ_32(halmac_adapter, 0xff0c) &gt;&gt; 8);</div><div class='del'>-	} else if (speed == HAL_INTF_PHY_USB2) {</div><div class='del'>-		if ((addr &gt;= 0xE0) /*&amp;&amp; (addr &lt;= 0xFF)*/)</div><div class='del'>-			addr -= 0x20;</div><div class='del'>-		if ((addr &gt;= 0xC0) &amp;&amp; (addr &lt;= 0xDF)) {</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, 0xfe40, addr);</div><div class='del'>-			HALMAC_REG_WRITE_8(halmac_adapter, 0xfe42, 0x81);</div><div class='del'>-			value = HALMAC_REG_READ_8(halmac_adapter, 0xfe43);</div><div class='del'>-		} else {</div><div class='del'>-			pr_err("[ERR]Error USB2PHY offset!\n");</div><div class='del'>-			return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("[ERR]Error USB Speed !\n");</div><div class='del'>-		return HALMAC_RET_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h<br/>deleted file mode 100644<br/>index 86d59d9b76f3..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,310 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_FUNC_88XX_H_</div><div class='del'>-#define _HALMAC_FUNC_88XX_H_</div><div class='del'>-</div><div class='del'>-#include "../halmac_type.h"</div><div class='del'>-</div><div class='del'>-void halmac_init_offload_feature_state_machine_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_pkt_88xx(struct halmac_adapter *halmac_adapter, u8 *hal_buff,</div><div class='del'>-			 u32 size, bool ack);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_download_rsvd_page_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       u8 *hal_buf, u32 size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_h2c_header_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   u8 *hal_h2c_hdr, u16 *seq, bool ack);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_set_fw_offload_h2c_header_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter, u8 *hal_h2c_hdr,</div><div class='del'>-	struct halmac_h2c_header_info *h2c_header_info, u16 *seq_num);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-		       enum halmac_efuse_read_cfg cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_read_efuse_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			    u32 size, u8 *efuse_map);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_write_efuse_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			     u8 value);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_switch_efuse_bank_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_efuse_bank efuse_bank);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u8 *map);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_write_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				     u32 offset, u8 value);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_pg_efuse_by_map_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				 struct halmac_pg_efuse_info *pg_efuse_info,</div><div class='del'>-				 enum halmac_efuse_read_cfg cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_eeprom_parser_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  u8 *physical_efuse_map, u8 *logical_efuse_map);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_read_hw_efuse_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			  u32 size, u8 *efuse_map);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dlfw_to_mem_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,</div><div class='del'>-			u32 dest, u32 code_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_fwpkt_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,</div><div class='del'>-		       u32 code_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_iddma_dlfw_88xx(struct halmac_adapter *halmac_adapter, u32 source,</div><div class='del'>-		       u32 dest, u32 length, u8 first);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_check_fw_chksum_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			    u32 memory_address);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dlfw_end_flow_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_free_dl_fw_end_flow_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pwr_seq_parser_88xx(struct halmac_adapter *halmac_adapter, u8 cut,</div><div class='del'>-			   u8 fab, u8 intf,</div><div class='del'>-			   struct halmac_wl_pwr_cfg_ **pp_pwr_seq_cfg</div><div class='del'>-</div><div class='del'>-			   );</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_get_h2c_buff_free_space_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_set_pwr_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  struct halmac_fwlps_option *hal_fw_lps_opt);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_send_original_h2c_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u8 *original_h2c, u16 *seq, u8 ack);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_media_status_rpt_88xx(struct halmac_adapter *halmac_adapter, u8 op_mode,</div><div class='del'>-			     u8 mac_id_ind, u8 mac_id, u8 mac_id_end);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_send_h2c_update_datapack_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_data_type halmac_data_type,</div><div class='del'>-	struct halmac_phy_parameter_info *para_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_run_datapack_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				  enum halmac_data_type halmac_data_type);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_bt_coex_cmd_88xx(struct halmac_adapter *halmac_adapter, u8 *bt_buf,</div><div class='del'>-			     u32 bt_size, u8 ack);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_ctrl_ch_switch_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				struct halmac_ch_switch_option *cs_option);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_func_send_general_info_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   struct halmac_general_info *general_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_ps_tuning_para_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_parse_c2h_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     u8 *halmac_buf, u32 halmac_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_update_packet_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   enum halmac_packet_id pkt_id, u8 *pkt,</div><div class='del'>-				   u32 pkt_size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_send_h2c_phy_parameter_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   struct halmac_phy_parameter_info *para_info,</div><div class='del'>-				   bool full_fifo);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dump_physical_efuse_fw_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				   u32 offset, u32 size, u8 *efuse_map);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_send_h2c_update_bcn_parse_info_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	struct halmac_bcn_ie_info *bcn_ie_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_convert_to_sdio_bus_offset_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				       u32 *halmac_offset);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_sdio_free_page_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_update_oqt_free_space_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_efuse_cmd_construct_state</div><div class='del'>-halmac_query_efuse_curr_state_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_transition_efuse_state_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_efuse_cmd_construct_state dest_state);</div><div class='del'>-</div><div class='del'>-enum halmac_cfg_para_cmd_construct_state</div><div class='del'>-halmac_query_cfg_para_curr_state_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_transition_cfg_para_state_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cfg_para_cmd_construct_state dest_state);</div><div class='del'>-</div><div class='del'>-enum halmac_scan_cmd_construct_state</div><div class='del'>-halmac_query_scan_curr_state_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_transition_scan_state_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_scan_cmd_construct_state dest_state);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_cfg_para_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_dump_physical_efuse_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_dump_logical_efuse_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_channel_switch_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_update_packet_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_query_iqk_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     enum halmac_cmd_process_status *process_status,</div><div class='del'>-			     u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_query_power_tracking_status_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	enum halmac_cmd_process_status *process_status, u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_query_psd_status_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			     enum halmac_cmd_process_status *process_status,</div><div class='del'>-			     u8 *data, u32 *size);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_verify_io_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_verify_send_rsvd_page_88xx(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-void halmac_power_save_cb_88xx(void *cb_data);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_buffer_read_88xx(struct halmac_adapter *halmac_adapter, u32 offset,</div><div class='del'>-			u32 size, enum hal_fifo_sel halmac_fifo_sel,</div><div class='del'>-			u8 *fifo_map);</div><div class='del'>-</div><div class='del'>-void halmac_restore_mac_register_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-				      struct halmac_restore_info *restore_info,</div><div class='del'>-				      u32 restore_num);</div><div class='del'>-</div><div class='del'>-void halmac_api_record_id_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			       enum halmac_api_id api_id);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_set_usb_mode_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			 enum halmac_usb_mode usb_mode);</div><div class='del'>-</div><div class='del'>-void halmac_enable_bb_rf_88xx(struct halmac_adapter *halmac_adapter, u8 enable);</div><div class='del'>-</div><div class='del'>-void halmac_config_sdio_tx_page_threshold_88xx(</div><div class='del'>-	struct halmac_adapter *halmac_adapter,</div><div class='del'>-	struct halmac_tx_page_threshold_info *threshold_info);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_rqpn_parser_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			enum halmac_trx_mode halmac_trx_mode,</div><div class='del'>-			struct halmac_rqpn_ *pwr_seq_cfg);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_check_oqt_88xx(struct halmac_adapter *halmac_adapter, u32 tx_agg_num,</div><div class='del'>-		      u8 *halmac_buf);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_pg_num_parser_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			  enum halmac_trx_mode halmac_trx_mode,</div><div class='del'>-			  struct halmac_pg_num_ *pg_num_table);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_parse_intf_phy_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			   struct halmac_intf_phy_para_ *intf_phy_para,</div><div class='del'>-			   enum halmac_intf_phy_platform platform,</div><div class='del'>-			   enum hal_intf_phy intf_phy);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dbi_write32_88xx(struct halmac_adapter *halmac_adapter, u16 addr,</div><div class='del'>-			u32 data);</div><div class='del'>-</div><div class='del'>-u32 halmac_dbi_read32_88xx(struct halmac_adapter *halmac_adapter, u16 addr);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_dbi_write8_88xx(struct halmac_adapter *halmac_adapter, u16 addr,</div><div class='del'>-		       u8 data);</div><div class='del'>-</div><div class='del'>-u8 halmac_dbi_read8_88xx(struct halmac_adapter *halmac_adapter, u16 addr);</div><div class='del'>-</div><div class='del'>-u16 halmac_mdio_read_88xx(struct halmac_adapter *halmac_adapter, u8 addr,</div><div class='del'>-			  u8 speed</div><div class='del'>-</div><div class='del'>-			  );</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_mdio_write_88xx(struct halmac_adapter *halmac_adapter, u8 addr, u16 data,</div><div class='del'>-		       u8 speed);</div><div class='del'>-</div><div class='del'>-void halmac_config_ampdu_88xx(struct halmac_adapter *halmac_adapter,</div><div class='del'>-			      struct halmac_ampdu_config *ampdu_config);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_usbphy_write_88xx(struct halmac_adapter *halmac_adapter, u8 addr,</div><div class='del'>-			 u16 data, u8 speed);</div><div class='del'>-</div><div class='del'>-u16 halmac_usbphy_read_88xx(struct halmac_adapter *halmac_adapter, u8 addr,</div><div class='del'>-			    u8 speed);</div><div class='del'>-#endif /* _HALMAC_FUNC_88XX_H_ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_api.c b/drivers/staging/rtlwifi/halmac/halmac_api.c<br/>deleted file mode 100644<br/>index e75eb42009c8..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_api.c?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_api.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,415 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include "halmac_2_platform.h"</div><div class='del'>-#include "halmac_type.h"</div><div class='del'>-#include "halmac_88xx/halmac_api_88xx.h"</div><div class='del'>-#include "halmac_88xx/halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-#include "halmac_88xx/halmac_8822b/halmac_8822b_cfg.h"</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_check_platform_api(void *driver_adapter,</div><div class='del'>-			  enum halmac_interface halmac_interface,</div><div class='del'>-			  struct halmac_platform_api *halmac_platform_api)</div><div class='del'>-{</div><div class='del'>-	void *adapter_local = NULL;</div><div class='del'>-</div><div class='del'>-	adapter_local = driver_adapter;</div><div class='del'>-</div><div class='del'>-	if (!halmac_platform_api)</div><div class='del'>-		return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD52_READ) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD52_READ)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_READ_8) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_READ_8)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_READ_16) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_READ_16)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_READ_32) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_READ_32)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_READ_N) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_READ_N)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD52_WRITE) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD52_WRITE)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_WRITE_8) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_WRITE_8)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_WRITE_16) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_WRITE_16)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;SDIO_CMD53_WRITE_32) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;SDIO_CMD53_WRITE_32)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (halmac_interface == HALMAC_INTERFACE_USB ||</div><div class='del'>-	    halmac_interface == HALMAC_INTERFACE_PCIE) {</div><div class='del'>-		if (!halmac_platform_api-&gt;REG_READ_8) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;REG_READ_8)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;REG_READ_16) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;REG_READ_16)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;REG_READ_32) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;REG_READ_32)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;REG_WRITE_8) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;REG_WRITE_8)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;REG_WRITE_16) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;REG_WRITE_16)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!halmac_platform_api-&gt;REG_WRITE_32) {</div><div class='del'>-			pr_err("(!halmac_platform_api-&gt;REG_WRITE_32)\n");</div><div class='del'>-			return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!halmac_platform_api-&gt;EVENT_INDICATION) {</div><div class='del'>-		pr_err("(!halmac_platform_api-&gt;EVENT_INDICATION)\n");</div><div class='del'>-		return HALMAC_RET_PLATFORM_API_NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_convert_to_sdio_bus_offset(u32 *halmac_offset)</div><div class='del'>-{</div><div class='del'>-	switch ((*halmac_offset) &amp; 0xFFFF0000) {</div><div class='del'>-	case WLAN_IOREG_OFFSET:</div><div class='del'>-		*halmac_offset = (HALMAC_SDIO_CMD_ADDR_MAC_REG &lt;&lt; 13) |</div><div class='del'>-				 (*halmac_offset &amp; HALMAC_WLAN_MAC_REG_MSK);</div><div class='del'>-		break;</div><div class='del'>-	case SDIO_LOCAL_OFFSET:</div><div class='del'>-		*halmac_offset = (HALMAC_SDIO_CMD_ADDR_SDIO_REG &lt;&lt; 13) |</div><div class='del'>-				 (*halmac_offset &amp; HALMAC_SDIO_LOCAL_MSK);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*halmac_offset = 0xFFFFFFFF;</div><div class='del'>-		return HALMAC_RET_CONVERT_SDIO_OFFSET_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8</div><div class='del'>-platform_reg_read_8_sdio(void *driver_adapter,</div><div class='del'>-			 struct halmac_platform_api *halmac_platform_api,</div><div class='del'>-			 u32 offset)</div><div class='del'>-{</div><div class='del'>-	u8 value8;</div><div class='del'>-	u32 halmac_offset = offset;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset(&amp;halmac_offset);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("%s error = %x\n", __func__, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value8 = halmac_platform_api-&gt;SDIO_CMD52_READ(driver_adapter,</div><div class='del'>-						      halmac_offset);</div><div class='del'>-</div><div class='del'>-	return value8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-platform_reg_write_8_sdio(void *driver_adapter,</div><div class='del'>-			  struct halmac_platform_api *halmac_platform_api,</div><div class='del'>-			  u32 offset, u8 data)</div><div class='del'>-{</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-	u32 halmac_offset = offset;</div><div class='del'>-</div><div class='del'>-	if ((halmac_offset &amp; 0xFFFF0000) == 0)</div><div class='del'>-		halmac_offset |= WLAN_IOREG_OFFSET;</div><div class='del'>-</div><div class='del'>-	status = halmac_convert_to_sdio_bus_offset(&amp;halmac_offset);</div><div class='del'>-</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("halmac_reg_write_8_sdio_88xx error = %x\n", status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-	halmac_platform_api-&gt;SDIO_CMD52_WRITE(driver_adapter, halmac_offset,</div><div class='del'>-					      data);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum halmac_ret_status</div><div class='del'>-halmac_get_chip_info(void *driver_adapter,</div><div class='del'>-		     struct halmac_platform_api *halmac_platform_api,</div><div class='del'>-		     enum halmac_interface halmac_interface,</div><div class='del'>-		     struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	struct halmac_api *halmac_api = (struct halmac_api *)NULL;</div><div class='del'>-	u8 chip_id, chip_version;</div><div class='del'>-	u32 polling_count;</div><div class='del'>-</div><div class='del'>-	halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	/* Get Chip_id and Chip_version */</div><div class='del'>-	if (halmac_adapter-&gt;halmac_interface == HALMAC_INTERFACE_SDIO) {</div><div class='del'>-		platform_reg_write_8_sdio(</div><div class='del'>-			driver_adapter, halmac_platform_api, REG_SDIO_HSUS_CTRL,</div><div class='del'>-			platform_reg_read_8_sdio(driver_adapter,</div><div class='del'>-						 halmac_platform_api,</div><div class='del'>-						 REG_SDIO_HSUS_CTRL) &amp;</div><div class='del'>-				~(BIT(0)));</div><div class='del'>-</div><div class='del'>-		polling_count = 10000;</div><div class='del'>-		while (!(platform_reg_read_8_sdio(driver_adapter,</div><div class='del'>-						  halmac_platform_api,</div><div class='del'>-						  REG_SDIO_HSUS_CTRL) &amp;</div><div class='del'>-			 0x02)) {</div><div class='del'>-			polling_count--;</div><div class='del'>-			if (polling_count == 0)</div><div class='del'>-				return HALMAC_RET_SDIO_LEAVE_SUSPEND_FAIL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		chip_id = platform_reg_read_8_sdio(</div><div class='del'>-			driver_adapter, halmac_platform_api, REG_SYS_CFG2);</div><div class='del'>-		chip_version = platform_reg_read_8_sdio(driver_adapter,</div><div class='del'>-							halmac_platform_api,</div><div class='del'>-							REG_SYS_CFG1 + 1) &gt;&gt;</div><div class='del'>-			       4;</div><div class='del'>-	} else {</div><div class='del'>-		chip_id = halmac_platform_api-&gt;REG_READ_8(driver_adapter,</div><div class='del'>-							  REG_SYS_CFG2);</div><div class='del'>-		chip_version = halmac_platform_api-&gt;REG_READ_8(</div><div class='del'>-				       driver_adapter, REG_SYS_CFG1 + 1) &gt;&gt;</div><div class='del'>-			       4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]Chip id : 0x%X\n", chip_id);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]Chip version : 0x%X\n", chip_version);</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;chip_version = (enum halmac_chip_ver)chip_version;</div><div class='del'>-</div><div class='del'>-	if (chip_id == HALMAC_CHIP_ID_HW_DEF_8822B)</div><div class='del'>-		halmac_adapter-&gt;chip_id = HALMAC_CHIP_ID_8822B;</div><div class='del'>-	else if (chip_id == HALMAC_CHIP_ID_HW_DEF_8821C)</div><div class='del'>-		halmac_adapter-&gt;chip_id = HALMAC_CHIP_ID_8821C;</div><div class='del'>-	else if (chip_id == HALMAC_CHIP_ID_HW_DEF_8814B)</div><div class='del'>-		halmac_adapter-&gt;chip_id = HALMAC_CHIP_ID_8814B;</div><div class='del'>-	else if (chip_id == HALMAC_CHIP_ID_HW_DEF_8197F)</div><div class='del'>-		halmac_adapter-&gt;chip_id = HALMAC_CHIP_ID_8197F;</div><div class='del'>-	else</div><div class='del'>-		halmac_adapter-&gt;chip_id = HALMAC_CHIP_ID_UNDEFINE;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter-&gt;chip_id == HALMAC_CHIP_ID_UNDEFINE)</div><div class='del'>-		return HALMAC_RET_CHIP_NOT_SUPPORT;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_init_adapter() - init halmac_adapter</div><div class='del'>- * @driver_adapter : the adapter of caller</div><div class='del'>- * @halmac_platform_api : the platform APIs which is used in halmac APIs</div><div class='del'>- * @halmac_interface : bus interface</div><div class='del'>- * @pp_halmac_adapter : the adapter of halmac</div><div class='del'>- * @pp_halmac_api : the function pointer of APIs, caller shall call APIs by</div><div class='del'>- *                 function pointer</div><div class='del'>- * Author : KaiYuan Chang / Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_adapter(void *driver_adapter,</div><div class='del'>-		    struct halmac_platform_api *halmac_platform_api,</div><div class='del'>-		    enum halmac_interface halmac_interface,</div><div class='del'>-		    struct halmac_adapter **pp_halmac_adapter,</div><div class='del'>-		    struct halmac_api **pp_halmac_api)</div><div class='del'>-{</div><div class='del'>-	struct halmac_adapter *halmac_adapter = (struct halmac_adapter *)NULL;</div><div class='del'>-	enum halmac_ret_status status = HALMAC_RET_SUCCESS;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		u32 i;</div><div class='del'>-		u8 x[4];</div><div class='del'>-	} ENDIAN_CHECK = {0x01000000};</div><div class='del'>-</div><div class='del'>-	status = halmac_check_platform_api(driver_adapter, halmac_interface,</div><div class='del'>-					   halmac_platform_api);</div><div class='del'>-	if (status != HALMAC_RET_SUCCESS)</div><div class='del'>-		return status;</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			HALMAC_SVN_VER "\n");</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_MAJOR_VER = %x\n", HALMAC_MAJOR_VER);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_PROTOTYPE_VER = %x\n", HALMAC_PROTOTYPE_VER);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_MINOR_VER = %x\n", HALMAC_MINOR_VER);</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"HALMAC_PATCH_VER = %x\n", HALMAC_PATCH_VER);</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_init_adapter_88xx ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	/* Check endian setting - Little endian : 1, Big endian : 0*/</div><div class='del'>-	if (ENDIAN_CHECK.x[0] == HALMAC_SYSTEM_ENDIAN) {</div><div class='del'>-		pr_err("Endian setting Err!!\n");</div><div class='del'>-		return HALMAC_RET_ENDIAN_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	halmac_adapter = kzalloc(sizeof(*halmac_adapter), GFP_KERNEL);</div><div class='del'>-	if (!halmac_adapter) {</div><div class='del'>-		/* out of memory */</div><div class='del'>-		return HALMAC_RET_MALLOC_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* return halmac adapter address to caller */</div><div class='del'>-	*pp_halmac_adapter = halmac_adapter;</div><div class='del'>-</div><div class='del'>-	/* Record caller info */</div><div class='del'>-	halmac_adapter-&gt;halmac_platform_api = halmac_platform_api;</div><div class='del'>-	halmac_adapter-&gt;driver_adapter = driver_adapter;</div><div class='del'>-	halmac_interface = halmac_interface == HALMAC_INTERFACE_AXI ?</div><div class='del'>-				   HALMAC_INTERFACE_PCIE :</div><div class='del'>-				   halmac_interface;</div><div class='del'>-	halmac_adapter-&gt;halmac_interface = halmac_interface;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;halmac_adapter-&gt;efuse_lock);</div><div class='del'>-	spin_lock_init(&amp;halmac_adapter-&gt;h2c_seq_lock);</div><div class='del'>-</div><div class='del'>-	/*Get Chip*/</div><div class='del'>-	if (halmac_get_chip_info(driver_adapter, halmac_platform_api,</div><div class='del'>-				 halmac_interface,</div><div class='del'>-				 halmac_adapter) != HALMAC_RET_SUCCESS) {</div><div class='del'>-		pr_err("HALMAC_RET_CHIP_NOT_SUPPORT\n");</div><div class='del'>-		return HALMAC_RET_CHIP_NOT_SUPPORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assign function pointer to halmac API */</div><div class='del'>-	halmac_init_adapter_para_88xx(halmac_adapter);</div><div class='del'>-	status = halmac_mount_api_88xx(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	/* Return halmac API function pointer */</div><div class='del'>-	*pp_halmac_api = (struct halmac_api *)halmac_adapter-&gt;halmac_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"halmac_init_adapter_88xx &lt;==========\n");</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'>- * halmac_halt_api() - stop halmac_api action</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_halt_api(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-	struct halmac_platform_api *halmac_platform_api =</div><div class='del'>-		(struct halmac_platform_api *)NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-	halmac_platform_api = halmac_adapter-&gt;halmac_platform_api;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.api_state = HALMAC_API_STATE_HALT;</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"%s ==========&gt;\n", __func__);</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_deinit_adapter() - deinit halmac adapter</div><div class='del'>- * @halmac_adapter : the adapter of halmac</div><div class='del'>- * Author : KaiYuan Chang / Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_adapter(struct halmac_adapter *halmac_adapter)</div><div class='del'>-{</div><div class='del'>-	void *driver_adapter = NULL;</div><div class='del'>-</div><div class='del'>-	if (halmac_adapter_validate(halmac_adapter) != HALMAC_RET_SUCCESS)</div><div class='del'>-		return HALMAC_RET_ADAPTER_INVALID;</div><div class='del'>-</div><div class='del'>-	driver_adapter = halmac_adapter-&gt;driver_adapter;</div><div class='del'>-</div><div class='del'>-	HALMAC_RT_TRACE(driver_adapter, HALMAC_MSG_INIT, DBG_DMESG,</div><div class='del'>-			"[TRACE]halmac_deinit_adapter_88xx ==========&gt;\n");</div><div class='del'>-</div><div class='del'>-	kfree(halmac_adapter-&gt;hal_efuse_map);</div><div class='del'>-	halmac_adapter-&gt;hal_efuse_map = (u8 *)NULL;</div><div class='del'>-</div><div class='del'>-	kfree(halmac_adapter-&gt;halmac_state.psd_set.data);</div><div class='del'>-	halmac_adapter-&gt;halmac_state.psd_set.data = (u8 *)NULL;</div><div class='del'>-</div><div class='del'>-	kfree(halmac_adapter-&gt;halmac_api);</div><div class='del'>-	halmac_adapter-&gt;halmac_api = NULL;</div><div class='del'>-</div><div class='del'>-	halmac_adapter-&gt;hal_adapter_backup = NULL;</div><div class='del'>-	kfree(halmac_adapter);</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * halmac_get_version() - get HALMAC version</div><div class='del'>- * @version : return version of major, prototype and minor information</div><div class='del'>- * Author : KaiYuan Chang / Ivan Lin</div><div class='del'>- * Return : enum halmac_ret_status</div><div class='del'>- * More details of status code can be found in prototype document</div><div class='del'>- */</div><div class='del'>-enum halmac_ret_status halmac_get_version(struct halmac_ver *version)</div><div class='del'>-{</div><div class='del'>-	version-&gt;major_ver = (u8)HALMAC_MAJOR_VER;</div><div class='del'>-	version-&gt;prototype_ver = (u8)HALMAC_PROTOTYPE_VER;</div><div class='del'>-	version-&gt;minor_ver = (u8)HALMAC_MINOR_VER;</div><div class='del'>-</div><div class='del'>-	return HALMAC_RET_SUCCESS;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_api.h b/drivers/staging/rtlwifi/halmac/halmac_api.h<br/>deleted file mode 100644<br/>index e220db39c8a7..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_api.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_api.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_API_H_</div><div class='del'>-#define _HALMAC_API_H_</div><div class='del'>-</div><div class='del'>-#define HALMAC_SVN_VER "13348M"</div><div class='del'>-</div><div class='del'>-#define HALMAC_MAJOR_VER 0x0001 /* major version, ver_1 for async_api */</div><div class='del'>-/* For halmac_api num change or prototype change, increment prototype version.</div><div class='del'>- * Otherwise, increase minor version</div><div class='del'>- */</div><div class='del'>-#define HALMAC_PROTOTYPE_VER 0x0003 /* prototype version */</div><div class='del'>-#define HALMAC_MINOR_VER 0x0005 /* minor version */</div><div class='del'>-#define HALMAC_PATCH_VER 0x0000 /* patch version */</div><div class='del'>-</div><div class='del'>-#include "halmac_2_platform.h"</div><div class='del'>-#include "halmac_type.h"</div><div class='del'>-</div><div class='del'>-#include "halmac_usb_reg.h"</div><div class='del'>-#include "halmac_sdio_reg.h"</div><div class='del'>-</div><div class='del'>-#include "halmac_bit2.h"</div><div class='del'>-#include "halmac_reg2.h"</div><div class='del'>-</div><div class='del'>-#include "halmac_tx_desc_nic.h"</div><div class='del'>-#include "halmac_rx_desc_nic.h"</div><div class='del'>-#include "halmac_tx_bd_nic.h"</div><div class='del'>-#include "halmac_rx_bd_nic.h"</div><div class='del'>-#include "halmac_fw_offload_c2h_nic.h"</div><div class='del'>-#include "halmac_fw_offload_h2c_nic.h"</div><div class='del'>-#include "halmac_h2c_extra_info_nic.h"</div><div class='del'>-#include "halmac_original_c2h_nic.h"</div><div class='del'>-#include "halmac_original_h2c_nic.h"</div><div class='del'>-</div><div class='del'>-#include "halmac_tx_desc_chip.h"</div><div class='del'>-#include "halmac_rx_desc_chip.h"</div><div class='del'>-#include "halmac_tx_bd_chip.h"</div><div class='del'>-#include "halmac_rx_bd_chip.h"</div><div class='del'>-#include "halmac_88xx/halmac_88xx_cfg.h"</div><div class='del'>-</div><div class='del'>-#include "halmac_88xx/halmac_8822b/halmac_8822b_cfg.h"</div><div class='del'>-#include "halmac_reg_8822b.h"</div><div class='del'>-#include "halmac_bit_8822b.h"</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_init_adapter(void *driver_adapter,</div><div class='del'>-		    struct halmac_platform_api *halmac_platform_api,</div><div class='del'>-		    enum halmac_interface halmac_interface,</div><div class='del'>-		    struct halmac_adapter **pp_halmac_adapter,</div><div class='del'>-		    struct halmac_api **pp_halmac_api);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status</div><div class='del'>-halmac_deinit_adapter(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_halt_api(struct halmac_adapter *halmac_adapter);</div><div class='del'>-</div><div class='del'>-enum halmac_ret_status halmac_get_version(struct halmac_ver *version);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_bit2.h b/drivers/staging/rtlwifi/halmac/halmac_bit2.h<br/>deleted file mode 100644<br/>index 5f0f8528d136..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_bit2.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_bit2.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13396 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef __RTL_WLAN_BITDEF_H__</div><div class='del'>-#define __RTL_WLAN_BITDEF_H__</div><div class='del'>-</div><div class='del'>-/*-------------------------Modification Log-----------------------------------</div><div class='del'>- *	Base on MAC_Register.doc SVN391</div><div class='del'>- *-------------------------Modification Log-----------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*--------------------------Include File--------------------------------------*/</div><div class='del'>-/*--------------------------Include File--------------------------------------*/</div><div class='del'>-</div><div class='del'>-/* 3 ============Programming guide Start===================== */</div><div class='del'>-/*</div><div class='del'>- *	1. For all bit define, it should be prefixed by "BIT_"</div><div class='del'>- *	2. For all bit mask, it should be prefixed by "BIT_MASK_"</div><div class='del'>- *	3. For all bit shift, it should be prefixed by "BIT_SHIFT_"</div><div class='del'>- *	4. For other case, prefix is not needed</div><div class='del'>- *</div><div class='del'>- * Example:</div><div class='del'>- * #define BIT_SHIFT_MAX_TXDMA		16</div><div class='del'>- * #define BIT_MASK_MAX_TXDMA		0x7</div><div class='del'>- * #define BIT_MAX_TXDMA(x)		\</div><div class='del'>- *			(((x) &amp; BIT_MASK_MAX_TXDMA) &lt;&lt; BIT_SHIFT_MAX_TXDMA)</div><div class='del'>- * #define BIT_GET_MAX_TXDMA(x)		\</div><div class='del'>- *			(((x) &gt;&gt; BIT_SHIFT_MAX_TXDMA) &amp; BIT_MASK_MAX_TXDMA)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-/* 3 ============Programming guide End===================== */</div><div class='del'>-</div><div class='del'>-#define CPU_OPT_WIDTH 0x1F</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WATCH_DOG_RECORD_V1 10</div><div class='del'>-#define BIT_MASK_WATCH_DOG_RECORD_V1 0x3fff</div><div class='del'>-#define BIT_WATCH_DOG_RECORD_V1(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WATCH_DOG_RECORD_V1) &lt;&lt; BIT_SHIFT_WATCH_DOG_RECORD_V1)</div><div class='del'>-#define BIT_GET_WATCH_DOG_RECORD_V1(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WATCH_DOG_RECORD_V1) &amp; BIT_MASK_WATCH_DOG_RECORD_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_R_IO_TIMEOUT_FLAG_V1 BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_MD2PP BIT(0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_IPV6_MYIPAD 0</div><div class='del'>-#define BIT_MASK_R_WMAC_IPV6_MYIPAD 0xffffffffffffffffffffffffffffffffL</div><div class='del'>-#define BIT_R_WMAC_IPV6_MYIPAD(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_IPV6_MYIPAD) &lt;&lt; BIT_SHIFT_R_WMAC_IPV6_MYIPAD)</div><div class='del'>-#define BIT_GET_R_WMAC_IPV6_MYIPAD(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_IPV6_MYIPAD) &amp; BIT_MASK_R_WMAC_IPV6_MYIPAD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_INT_TIMEOUT 16</div><div class='del'>-#define BIT_MASK_SDIO_INT_TIMEOUT 0xffff</div><div class='del'>-#define BIT_SDIO_INT_TIMEOUT(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_INT_TIMEOUT) &lt;&lt; BIT_SHIFT_SDIO_INT_TIMEOUT)</div><div class='del'>-#define BIT_GET_SDIO_INT_TIMEOUT(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_INT_TIMEOUT) &amp; BIT_MASK_SDIO_INT_TIMEOUT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_PWC_EV12V BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_IO_ERR_STATUS BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_PWC_EV25V BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_PA33V_EN BIT(13)</div><div class='del'>-#define BIT_PA12V_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_UA33V_EN BIT(11)</div><div class='del'>-#define BIT_UA12V_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_RFDIO BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_REPLY_ERRCRC_IN_DATA BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_EB2CORE BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_CMD53_OVERLAP BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_DIOE BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_REPLY_ERR_IN_R5 BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_WLPON2PP BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_R18A_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_IP2MAC_WA2PP BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_INIT_CMD_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_PD2CORE BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_PA2PCIE BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_UD2CORE BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_RXDMA_MASK_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_UA2USB BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_MASK_TIMER BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL			(Offset 0x0000) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_WD2PP BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL			(Offset 0x10250000) */</div><div class='del'>-</div><div class='del'>-#define BIT_CMD_ERR_STOP_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_FUNC_EN				(Offset 0x0002) */</div><div class='del'>-</div><div class='del'>-#define BIT_FEN_MREGEN BIT(15)</div><div class='del'>-#define BIT_FEN_HWPDN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_FUNC_EN				(Offset 0x0002) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_25_1 BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_FUNC_EN				(Offset 0x0002) */</div><div class='del'>-</div><div class='del'>-#define BIT_FEN_ELDR BIT(12)</div><div class='del'>-#define BIT_FEN_DCORE BIT(11)</div><div class='del'>-#define BIT_FEN_CPUEN BIT(10)</div><div class='del'>-#define BIT_FEN_DIOE BIT(9)</div><div class='del'>-#define BIT_FEN_PCIED BIT(8)</div><div class='del'>-#define BIT_FEN_PPLL BIT(7)</div><div class='del'>-#define BIT_FEN_PCIEA BIT(6)</div><div class='del'>-#define BIT_FEN_DIO_PCIE BIT(5)</div><div class='del'>-#define BIT_FEN_USBD BIT(4)</div><div class='del'>-#define BIT_FEN_UPLL BIT(3)</div><div class='del'>-#define BIT_FEN_USBA BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_FUNC_EN				(Offset 0x0002) */</div><div class='del'>-</div><div class='del'>-#define BIT_FEN_BB_GLB_RSTN BIT(1)</div><div class='del'>-#define BIT_FEN_BBRSTB BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SOP_EABM BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SOP_ACKF BIT(30)</div><div class='del'>-#define BIT_SOP_ERCK BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SOP_ESWR BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SOP_PWMM BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SOP_EECK BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SOP_EXTL BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYM_OP_RING_12M BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_ROP_SWPR BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_HW_LPLDM BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_OPT_SWRST_WLMCU BIT(19)</div><div class='del'>-#define BIT_RDY_SYSPWR BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_WLON BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_APDM_HPDN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_AFSM_PCIE_SUS_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_AFSM_WLSUS_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_APFM_SWLPS BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_APFM_OFFMAC BIT(9)</div><div class='del'>-#define BIT_APFN_ONMAC BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_CHIP_PDN_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_RDY_MACDIS BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_RING_CLK_12M_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_PFM_WOWL BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_PFM_LDKP BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_HCI_ALD BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL				(Offset 0x0004) */</div><div class='del'>-</div><div class='del'>-#define BIT_PFM_LDALL BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_LDO_DUMMY BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPU_CLK_EN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYMREG_CLK_EN BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_HCI_CLK_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_MAC_CLK_EN BIT(11)</div><div class='del'>-#define BIT_SEC_CLK_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_PHY_SSC_RSTB BIT(9)</div><div class='del'>-#define BIT_EXT_32K_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_CLK_TEST BIT(7)</div><div class='del'>-#define BIT_OP_SPS_PWM_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_LOADER_CLK_EN BIT(5)</div><div class='del'>-#define BIT_MACSLP BIT(4)</div><div class='del'>-#define BIT_WAKEPAD_EN BIT(3)</div><div class='del'>-#define BIT_ROMD16V_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_CKANA12M_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL			(Offset 0x0008) */</div><div class='del'>-</div><div class='del'>-#define BIT_CNTD16V_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_EEPROM_CTRL			(Offset 0x000A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VPDIDX 8</div><div class='del'>-#define BIT_MASK_VPDIDX 0xff</div><div class='del'>-#define BIT_VPDIDX(x) (((x) &amp; BIT_MASK_VPDIDX) &lt;&lt; BIT_SHIFT_VPDIDX)</div><div class='del'>-#define BIT_GET_VPDIDX(x) (((x) &gt;&gt; BIT_SHIFT_VPDIDX) &amp; BIT_MASK_VPDIDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EEM1_0 6</div><div class='del'>-#define BIT_MASK_EEM1_0 0x3</div><div class='del'>-#define BIT_EEM1_0(x) (((x) &amp; BIT_MASK_EEM1_0) &lt;&lt; BIT_SHIFT_EEM1_0)</div><div class='del'>-#define BIT_GET_EEM1_0(x) (((x) &gt;&gt; BIT_SHIFT_EEM1_0) &amp; BIT_MASK_EEM1_0)</div><div class='del'>-</div><div class='del'>-#define BIT_AUTOLOAD_SUS BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_EEPROM_CTRL			(Offset 0x000A) */</div><div class='del'>-</div><div class='del'>-#define BIT_EERPOMSEL BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_EEPROM_CTRL			(Offset 0x000A) */</div><div class='del'>-</div><div class='del'>-#define BIT_EECS_V1 BIT(3)</div><div class='del'>-#define BIT_EESK_V1 BIT(2)</div><div class='del'>-#define BIT_EEDI_V1 BIT(1)</div><div class='del'>-#define BIT_EEDO_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EE_VPD				(Offset 0x000C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VPD_DATA 0</div><div class='del'>-#define BIT_MASK_VPD_DATA 0xffffffffL</div><div class='del'>-#define BIT_VPD_DATA(x) (((x) &amp; BIT_MASK_VPD_DATA) &lt;&lt; BIT_SHIFT_VPD_DATA)</div><div class='del'>-#define BIT_GET_VPD_DATA(x) (((x) &gt;&gt; BIT_SHIFT_VPD_DATA) &amp; BIT_MASK_VPD_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_C2_L_BIT0 BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C1_L 29</div><div class='del'>-#define BIT_MASK_C1_L 0x3</div><div class='del'>-#define BIT_C1_L(x) (((x) &amp; BIT_MASK_C1_L) &lt;&lt; BIT_SHIFT_C1_L)</div><div class='del'>-#define BIT_GET_C1_L(x) (((x) &gt;&gt; BIT_SHIFT_C1_L) &amp; BIT_MASK_C1_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_FREQ_L 25</div><div class='del'>-#define BIT_MASK_REG_FREQ_L 0x7</div><div class='del'>-#define BIT_REG_FREQ_L(x) (((x) &amp; BIT_MASK_REG_FREQ_L) &lt;&lt; BIT_SHIFT_REG_FREQ_L)</div><div class='del'>-#define BIT_GET_REG_FREQ_L(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_FREQ_L) &amp; BIT_MASK_REG_FREQ_L)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_EN_DUTY BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_MODE 22</div><div class='del'>-#define BIT_MASK_REG_MODE 0x3</div><div class='del'>-#define BIT_REG_MODE(x) (((x) &amp; BIT_MASK_REG_MODE) &lt;&lt; BIT_SHIFT_REG_MODE)</div><div class='del'>-#define BIT_GET_REG_MODE(x) (((x) &gt;&gt; BIT_SHIFT_REG_MODE) &amp; BIT_MASK_REG_MODE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_EN_SP BIT(21)</div><div class='del'>-#define BIT_REG_AUTO_L BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_SELD_BIT0 BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_POWOCP BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OCP_L1 15</div><div class='del'>-#define BIT_MASK_OCP_L1 0x7</div><div class='del'>-#define BIT_OCP_L1(x) (((x) &amp; BIT_MASK_OCP_L1) &lt;&lt; BIT_SHIFT_OCP_L1)</div><div class='del'>-#define BIT_GET_OCP_L1(x) (((x) &gt;&gt; BIT_SHIFT_OCP_L1) &amp; BIT_MASK_OCP_L1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CF_L 13</div><div class='del'>-#define BIT_MASK_CF_L 0x3</div><div class='del'>-#define BIT_CF_L(x) (((x) &amp; BIT_MASK_CF_L) &lt;&lt; BIT_SHIFT_CF_L)</div><div class='del'>-#define BIT_GET_CF_L(x) (((x) &gt;&gt; BIT_SHIFT_CF_L) &amp; BIT_MASK_CF_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_FPWM BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_SWEN BIT(9)</div><div class='del'>-#define BIT_SW18_LDEN BIT(8)</div><div class='del'>-#define BIT_MAC_ID_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1			(Offset 0x0010) */</div><div class='del'>-</div><div class='del'>-#define BIT_AFE_BGEN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_POW_ZCD_L BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_CRCERR_MSK BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_AUTOZCD_L BIT(30)</div><div class='del'>-#define BIT_SDIO_HSISR3_IND_MSK BIT(30)</div><div class='del'>-#define BIT_SDIO_HSISR2_IND_MSK BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_DELAY 28</div><div class='del'>-#define BIT_MASK_REG_DELAY 0x3</div><div class='del'>-#define BIT_REG_DELAY(x) (((x) &amp; BIT_MASK_REG_DELAY) &lt;&lt; BIT_SHIFT_REG_DELAY)</div><div class='del'>-#define BIT_GET_REG_DELAY(x) (((x) &gt;&gt; BIT_SHIFT_REG_DELAY) &amp; BIT_MASK_REG_DELAY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_HEISR_IND_MSK BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_CTWEND_MSK BIT(27)</div><div class='del'>-#define BIT_SDIO_ATIMEND_E_MSK BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIIO_ATIMEND_MSK BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_OCPINT_MSK BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_V15ADJ_L1_V1 24</div><div class='del'>-#define BIT_MASK_V15ADJ_L1_V1 0x7</div><div class='del'>-#define BIT_V15ADJ_L1_V1(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_V15ADJ_L1_V1) &lt;&lt; BIT_SHIFT_V15ADJ_L1_V1)</div><div class='del'>-#define BIT_GET_V15ADJ_L1_V1(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_V15ADJ_L1_V1) &amp; BIT_MASK_V15ADJ_L1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_PSTIMEOUT_MSK BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_GTINT4_MSK BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_GTINT3_MSK BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_HSISR_IND_MSK BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOL_L1_V1 20</div><div class='del'>-#define BIT_MASK_VOL_L1_V1 0xf</div><div class='del'>-#define BIT_VOL_L1_V1(x) (((x) &amp; BIT_MASK_VOL_L1_V1) &lt;&lt; BIT_SHIFT_VOL_L1_V1)</div><div class='del'>-#define BIT_GET_VOL_L1_V1(x) (((x) &gt;&gt; BIT_SHIFT_VOL_L1_V1) &amp; BIT_MASK_VOL_L1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_CPWM2_MSK BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_CPWM1_MSK BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_C2HCMD_INT_MSK BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IN_L1_V1 17</div><div class='del'>-#define BIT_MASK_IN_L1_V1 0x7</div><div class='del'>-#define BIT_IN_L1_V1(x) (((x) &amp; BIT_MASK_IN_L1_V1) &lt;&lt; BIT_SHIFT_IN_L1_V1)</div><div class='del'>-#define BIT_GET_IN_L1_V1(x) (((x) &gt;&gt; BIT_SHIFT_IN_L1_V1) &amp; BIT_MASK_IN_L1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_BCNERLY_INT_MSK BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBOX_L1 15</div><div class='del'>-#define BIT_MASK_TBOX_L1 0x3</div><div class='del'>-#define BIT_TBOX_L1(x) (((x) &amp; BIT_MASK_TBOX_L1) &lt;&lt; BIT_SHIFT_TBOX_L1)</div><div class='del'>-#define BIT_GET_TBOX_L1(x) (((x) &gt;&gt; BIT_SHIFT_TBOX_L1) &amp; BIT_MASK_TBOX_L1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_SEL BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_SD BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_TXBCNERR_MSK BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R3_L 7</div><div class='del'>-#define BIT_MASK_R3_L 0x3</div><div class='del'>-#define BIT_R3_L(x) (((x) &amp; BIT_MASK_R3_L) &lt;&lt; BIT_SHIFT_R3_L)</div><div class='del'>-#define BIT_GET_R3_L(x) (((x) &gt;&gt; BIT_SHIFT_R3_L) &amp; BIT_MASK_R3_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_TXBCNOK_MSK BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SW18_R2 5</div><div class='del'>-#define BIT_MASK_SW18_R2 0x3</div><div class='del'>-#define BIT_SW18_R2(x) (((x) &amp; BIT_MASK_SW18_R2) &lt;&lt; BIT_SHIFT_SW18_R2)</div><div class='del'>-#define BIT_GET_SW18_R2(x) (((x) &gt;&gt; BIT_SHIFT_SW18_R2) &amp; BIT_MASK_SW18_R2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_RXFOVW_MSK BIT(5)</div><div class='del'>-#define BIT_SDIO_TXFOVW_MSK BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SW18_R1 3</div><div class='del'>-#define BIT_MASK_SW18_R1 0x3</div><div class='del'>-#define BIT_SW18_R1(x) (((x) &amp; BIT_MASK_SW18_R1) &lt;&lt; BIT_SHIFT_SW18_R1)</div><div class='del'>-#define BIT_GET_SW18_R1(x) (((x) &gt;&gt; BIT_SHIFT_SW18_R1) &amp; BIT_MASK_SW18_R1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_RXERR_MSK BIT(3)</div><div class='del'>-#define BIT_SDIO_TXERR_MSK BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_AVAL_MSK BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C3_L_C3 1</div><div class='del'>-#define BIT_MASK_C3_L_C3 0x3</div><div class='del'>-#define BIT_C3_L_C3(x) (((x) &amp; BIT_MASK_C3_L_C3) &lt;&lt; BIT_SHIFT_C3_L_C3)</div><div class='del'>-#define BIT_GET_C3_L_C3(x) (((x) &gt;&gt; BIT_SHIFT_C3_L_C3) &amp; BIT_MASK_C3_L_C3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR				(Offset 0x10250014) */</div><div class='del'>-</div><div class='del'>-#define BIT_RX_REQUEST_MSK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2			(Offset 0x0014) */</div><div class='del'>-</div><div class='del'>-#define BIT_C2_L_BIT1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL3			(Offset 0x0018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SPS18_OCP_DIS BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HISR				(Offset 0x10250018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_CRCERR BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HISR				(Offset 0x10250018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_HSISR3_IND BIT(30)</div><div class='del'>-#define BIT_SDIO_HSISR2_IND BIT(29)</div><div class='del'>-#define BIT_SDIO_HEISR_IND BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HISR				(Offset 0x10250018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_CTWEND BIT(27)</div><div class='del'>-#define BIT_SDIO_ATIMEND_E BIT(26)</div><div class='del'>-#define BIT_SDIO_ATIMEND BIT(25)</div><div class='del'>-#define BIT_SDIO_OCPINT BIT(24)</div><div class='del'>-#define BIT_SDIO_PSTIMEOUT BIT(23)</div><div class='del'>-#define BIT_SDIO_GTINT4 BIT(22)</div><div class='del'>-#define BIT_SDIO_GTINT3 BIT(21)</div><div class='del'>-#define BIT_SDIO_HSISR_IND BIT(20)</div><div class='del'>-#define BIT_SDIO_CPWM2 BIT(19)</div><div class='del'>-#define BIT_SDIO_CPWM1 BIT(18)</div><div class='del'>-#define BIT_SDIO_C2HCMD_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL3			(Offset 0x0018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPS18_OCP_TH 16</div><div class='del'>-#define BIT_MASK_SPS18_OCP_TH 0x7fff</div><div class='del'>-#define BIT_SPS18_OCP_TH(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPS18_OCP_TH) &lt;&lt; BIT_SHIFT_SPS18_OCP_TH)</div><div class='del'>-#define BIT_GET_SPS18_OCP_TH(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPS18_OCP_TH) &amp; BIT_MASK_SPS18_OCP_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HISR				(Offset 0x10250018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_BCNERLY_INT BIT(16)</div><div class='del'>-#define BIT_SDIO_TXBCNERR BIT(7)</div><div class='del'>-#define BIT_SDIO_TXBCNOK BIT(6)</div><div class='del'>-#define BIT_SDIO_RXFOVW BIT(5)</div><div class='del'>-#define BIT_SDIO_TXFOVW BIT(4)</div><div class='del'>-#define BIT_SDIO_RXERR BIT(3)</div><div class='del'>-#define BIT_SDIO_TXERR BIT(2)</div><div class='del'>-#define BIT_SDIO_AVAL BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL3			(Offset 0x0018) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OCP_WINDOW 0</div><div class='del'>-#define BIT_MASK_OCP_WINDOW 0xffff</div><div class='del'>-#define BIT_OCP_WINDOW(x) (((x) &amp; BIT_MASK_OCP_WINDOW) &lt;&lt; BIT_SHIFT_OCP_WINDOW)</div><div class='del'>-#define BIT_GET_OCP_WINDOW(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OCP_WINDOW) &amp; BIT_MASK_OCP_WINDOW)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HISR				(Offset 0x10250018) */</div><div class='del'>-</div><div class='del'>-#define BIT_RX_REQUEST BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL				(Offset 0x001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_HREG_DBG BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL				(Offset 0x001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLMCUIOIF BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL				(Offset 0x001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_LOCK_ALL_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL				(Offset 0x001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_DIS_PRST BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL				(Offset 0x001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLOCK_1C_B6 BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL				(Offset 0x001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLOCK_40 BIT(4)</div><div class='del'>-#define BIT_WLOCK_08 BIT(3)</div><div class='del'>-#define BIT_WLOCK_04 BIT(2)</div><div class='del'>-#define BIT_WLOCK_00 BIT(1)</div><div class='del'>-#define BIT_WLOCK_ALL BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_RX_REQ_LEN			(Offset 0x1025001C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_REQ_LEN_V1 0</div><div class='del'>-#define BIT_MASK_RX_REQ_LEN_V1 0x3ffff</div><div class='del'>-#define BIT_RX_REQ_LEN_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_REQ_LEN_V1) &lt;&lt; BIT_SHIFT_RX_REQ_LEN_V1)</div><div class='del'>-#define BIT_GET_RX_REQ_LEN_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_REQ_LEN_V1) &amp; BIT_MASK_RX_REQ_LEN_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RF_CTRL				(Offset 0x001F) */</div><div class='del'>-</div><div class='del'>-#define BIT_RF_SDMRSTB BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RF_CTRL				(Offset 0x001F) */</div><div class='del'>-</div><div class='del'>-#define BIT_RF_RSTB BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RF_CTRL				(Offset 0x001F) */</div><div class='del'>-</div><div class='del'>-#define BIT_RF_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG_SEQ_V1		(Offset 0x1025001F) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FREE_TXPG_SEQ 0</div><div class='del'>-#define BIT_MASK_FREE_TXPG_SEQ 0xff</div><div class='del'>-#define BIT_FREE_TXPG_SEQ(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FREE_TXPG_SEQ) &lt;&lt; BIT_SHIFT_FREE_TXPG_SEQ)</div><div class='del'>-#define BIT_GET_FREE_TXPG_SEQ(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FREE_TXPG_SEQ) &amp; BIT_MASK_FREE_TXPG_SEQ)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPLDH12_RSV 29</div><div class='del'>-#define BIT_MASK_LPLDH12_RSV 0x7</div><div class='del'>-#define BIT_LPLDH12_RSV(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPLDH12_RSV) &lt;&lt; BIT_SHIFT_LPLDH12_RSV)</div><div class='del'>-#define BIT_GET_LPLDH12_RSV(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPLDH12_RSV) &amp; BIT_MASK_LPLDH12_RSV)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_LPLDH12_SLP BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPLDH12_VADJ 24</div><div class='del'>-#define BIT_MASK_LPLDH12_VADJ 0xf</div><div class='del'>-#define BIT_LPLDH12_VADJ(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPLDH12_VADJ) &lt;&lt; BIT_SHIFT_LPLDH12_VADJ)</div><div class='del'>-#define BIT_GET_LPLDH12_VADJ(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPLDH12_VADJ) &amp; BIT_MASK_LPLDH12_VADJ)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_LDH12_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG			(Offset 0x10250020) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_FREEPG_V1 16</div><div class='del'>-#define BIT_MASK_MID_FREEPG_V1 0xfff</div><div class='del'>-#define BIT_MID_FREEPG_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_FREEPG_V1) &lt;&lt; BIT_SHIFT_MID_FREEPG_V1)</div><div class='del'>-#define BIT_GET_MID_FREEPG_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_FREEPG_V1) &amp; BIT_MASK_MID_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLBBOFF_BIG_PWC_EN BIT(14)</div><div class='del'>-#define BIT_WLBBOFF_SMALL_PWC_EN BIT(13)</div><div class='del'>-#define BIT_WLMACOFF_BIG_PWC_EN BIT(12)</div><div class='del'>-#define BIT_WLPON_PWC_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_POW_REGU_P1 BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_LDOV12W_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_EX_XTAL_DRV_DIGI BIT(7)</div><div class='del'>-#define BIT_EX_XTAL_DRV_USB BIT(6)</div><div class='del'>-#define BIT_EX_XTAL_DRV_AFE BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_EX_XTAL_DRV_RF2 BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_EX_XTAL_DRV_RF1 BIT(3)</div><div class='del'>-#define BIT_POW_REGU_P0 BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL			(Offset 0x0020) */</div><div class='del'>-</div><div class='del'>-#define BIT_POW_PLL_LDO BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG			(Offset 0x10250020) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIQ_FREEPG_V1 0</div><div class='del'>-#define BIT_MASK_HIQ_FREEPG_V1 0xfff</div><div class='del'>-#define BIT_HIQ_FREEPG_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIQ_FREEPG_V1) &lt;&lt; BIT_SHIFT_HIQ_FREEPG_V1)</div><div class='del'>-#define BIT_GET_HIQ_FREEPG_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIQ_FREEPG_V1) &amp; BIT_MASK_HIQ_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_AGPIO_GPE BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_CAP_XI 25</div><div class='del'>-#define BIT_MASK_XTAL_CAP_XI 0x3f</div><div class='del'>-#define BIT_XTAL_CAP_XI(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_CAP_XI) &lt;&lt; BIT_SHIFT_XTAL_CAP_XI)</div><div class='del'>-#define BIT_GET_XTAL_CAP_XI(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_CAP_XI) &amp; BIT_MASK_XTAL_CAP_XI)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_DIGI 23</div><div class='del'>-#define BIT_MASK_XTAL_DRV_DIGI 0x3</div><div class='del'>-#define BIT_XTAL_DRV_DIGI(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_DIGI) &lt;&lt; BIT_SHIFT_XTAL_DRV_DIGI)</div><div class='del'>-#define BIT_GET_XTAL_DRV_DIGI(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_DIGI) &amp; BIT_MASK_XTAL_DRV_DIGI)</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DRV_USB_BIT1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_CLK_SEL 20</div><div class='del'>-#define BIT_MASK_MAC_CLK_SEL 0x3</div><div class='del'>-#define BIT_MAC_CLK_SEL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_CLK_SEL) &lt;&lt; BIT_SHIFT_MAC_CLK_SEL)</div><div class='del'>-#define BIT_GET_MAC_CLK_SEL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_CLK_SEL) &amp; BIT_MASK_MAC_CLK_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DRV_USB_BIT0 BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_AFE 17</div><div class='del'>-#define BIT_MASK_XTAL_DRV_AFE 0x3</div><div class='del'>-#define BIT_XTAL_DRV_AFE(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_AFE) &lt;&lt; BIT_SHIFT_XTAL_DRV_AFE)</div><div class='del'>-#define BIT_GET_XTAL_DRV_AFE(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_AFE) &amp; BIT_MASK_XTAL_DRV_AFE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG2			(Offset 0x10250024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PUB_FREEPG_V1 16</div><div class='del'>-#define BIT_MASK_PUB_FREEPG_V1 0xfff</div><div class='del'>-#define BIT_PUB_FREEPG_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PUB_FREEPG_V1) &lt;&lt; BIT_SHIFT_PUB_FREEPG_V1)</div><div class='del'>-#define BIT_GET_PUB_FREEPG_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PUB_FREEPG_V1) &amp; BIT_MASK_PUB_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_RF2 15</div><div class='del'>-#define BIT_MASK_XTAL_DRV_RF2 0x3</div><div class='del'>-#define BIT_XTAL_DRV_RF2(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_RF2) &lt;&lt; BIT_SHIFT_XTAL_DRV_RF2)</div><div class='del'>-#define BIT_GET_XTAL_DRV_RF2(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_RF2) &amp; BIT_MASK_XTAL_DRV_RF2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_RF1 13</div><div class='del'>-#define BIT_MASK_XTAL_DRV_RF1 0x3</div><div class='del'>-#define BIT_XTAL_DRV_RF1(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_RF1) &lt;&lt; BIT_SHIFT_XTAL_DRV_RF1)</div><div class='del'>-#define BIT_GET_XTAL_DRV_RF1(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_RF1) &amp; BIT_MASK_XTAL_DRV_RF1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DELAY_DIGI BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DELAY_USB BIT(11)</div><div class='del'>-#define BIT_XTAL_DELAY_AFE BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_LDO_VREF 7</div><div class='del'>-#define BIT_MASK_XTAL_LDO_VREF 0x7</div><div class='del'>-#define BIT_XTAL_LDO_VREF(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_LDO_VREF) &lt;&lt; BIT_SHIFT_XTAL_LDO_VREF)</div><div class='del'>-#define BIT_GET_XTAL_LDO_VREF(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_LDO_VREF) &amp; BIT_MASK_XTAL_LDO_VREF)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_XQSEL_RF BIT(6)</div><div class='del'>-#define BIT_XTAL_XQSEL BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_GMN_V2 3</div><div class='del'>-#define BIT_MASK_XTAL_GMN_V2 0x3</div><div class='del'>-#define BIT_XTAL_GMN_V2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_GMN_V2) &lt;&lt; BIT_SHIFT_XTAL_GMN_V2)</div><div class='del'>-#define BIT_GET_XTAL_GMN_V2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_GMN_V2) &amp; BIT_MASK_XTAL_GMN_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_GMP_V2 1</div><div class='del'>-#define BIT_MASK_XTAL_GMP_V2 0x3</div><div class='del'>-#define BIT_XTAL_GMP_V2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_GMP_V2) &lt;&lt; BIT_SHIFT_XTAL_GMP_V2)</div><div class='del'>-#define BIT_GET_XTAL_GMP_V2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_GMP_V2) &amp; BIT_MASK_XTAL_GMP_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1				(Offset 0x0024) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG2			(Offset 0x10250024) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LOW_FREEPG_V1 0</div><div class='del'>-#define BIT_MASK_LOW_FREEPG_V1 0xfff</div><div class='del'>-#define BIT_LOW_FREEPG_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_LOW_FREEPG_V1) &lt;&lt; BIT_SHIFT_LOW_FREEPG_V1)</div><div class='del'>-#define BIT_GET_LOW_FREEPG_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LOW_FREEPG_V1) &amp; BIT_MASK_LOW_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_C3_V4 30</div><div class='del'>-#define BIT_MASK_REG_C3_V4 0x3</div><div class='del'>-#define BIT_REG_C3_V4(x) (((x) &amp; BIT_MASK_REG_C3_V4) &lt;&lt; BIT_SHIFT_REG_C3_V4)</div><div class='del'>-#define BIT_GET_REG_C3_V4(x) (((x) &gt;&gt; BIT_SHIFT_REG_C3_V4) &amp; BIT_MASK_REG_C3_V4)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_CP_BIT1 BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_RS_V4 26</div><div class='del'>-#define BIT_MASK_REG_RS_V4 0x7</div><div class='del'>-#define BIT_REG_RS_V4(x) (((x) &amp; BIT_MASK_REG_RS_V4) &lt;&lt; BIT_SHIFT_REG_RS_V4)</div><div class='del'>-#define BIT_GET_REG_RS_V4(x) (((x) &gt;&gt; BIT_SHIFT_REG_RS_V4) &amp; BIT_MASK_REG_RS_V4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_OQT_FREE_TXPG_V1		(Offset 0x10250028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOAC_OQT_FREEPG_V1 24</div><div class='del'>-#define BIT_MASK_NOAC_OQT_FREEPG_V1 0xff</div><div class='del'>-#define BIT_NOAC_OQT_FREEPG_V1(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOAC_OQT_FREEPG_V1) &lt;&lt; BIT_SHIFT_NOAC_OQT_FREEPG_V1)</div><div class='del'>-#define BIT_GET_NOAC_OQT_FREEPG_V1(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOAC_OQT_FREEPG_V1) &amp; BIT_MASK_NOAC_OQT_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG__CS 24</div><div class='del'>-#define BIT_MASK_REG__CS 0x3</div><div class='del'>-#define BIT_REG__CS(x) (((x) &amp; BIT_MASK_REG__CS) &lt;&lt; BIT_SHIFT_REG__CS)</div><div class='del'>-#define BIT_GET_REG__CS(x) (((x) &gt;&gt; BIT_SHIFT_REG__CS) &amp; BIT_MASK_REG__CS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_CP_OFFSET 21</div><div class='del'>-#define BIT_MASK_REG_CP_OFFSET 0x7</div><div class='del'>-#define BIT_REG_CP_OFFSET(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_CP_OFFSET) &lt;&lt; BIT_SHIFT_REG_CP_OFFSET)</div><div class='del'>-#define BIT_GET_REG_CP_OFFSET(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_CP_OFFSET) &amp; BIT_MASK_REG_CP_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CP_BIAS 18</div><div class='del'>-#define BIT_MASK_CP_BIAS 0x7</div><div class='del'>-#define BIT_CP_BIAS(x) (((x) &amp; BIT_MASK_CP_BIAS) &lt;&lt; BIT_SHIFT_CP_BIAS)</div><div class='del'>-#define BIT_GET_CP_BIAS(x) (((x) &gt;&gt; BIT_SHIFT_CP_BIAS) &amp; BIT_MASK_CP_BIAS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_IDOUBLE_V2 BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_SYN BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC_OQT_FREEPG_V1 16</div><div class='del'>-#define BIT_MASK_AC_OQT_FREEPG_V1 0xff</div><div class='del'>-#define BIT_AC_OQT_FREEPG_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC_OQT_FREEPG_V1) &lt;&lt; BIT_SHIFT_AC_OQT_FREEPG_V1)</div><div class='del'>-#define BIT_GET_AC_OQT_FREEPG_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC_OQT_FREEPG_V1) &amp; BIT_MASK_AC_OQT_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCCO 14</div><div class='del'>-#define BIT_MASK_MCCO 0x3</div><div class='del'>-#define BIT_MCCO(x) (((x) &amp; BIT_MASK_MCCO) &lt;&lt; BIT_SHIFT_MCCO)</div><div class='del'>-#define BIT_GET_MCCO(x) (((x) &gt;&gt; BIT_SHIFT_MCCO) &amp; BIT_MASK_MCCO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_LDO_SEL 12</div><div class='del'>-#define BIT_MASK_REG_LDO_SEL 0x3</div><div class='del'>-#define BIT_REG_LDO_SEL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_LDO_SEL) &lt;&lt; BIT_SHIFT_REG_LDO_SEL)</div><div class='del'>-#define BIT_GET_REG_LDO_SEL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_LDO_SEL) &amp; BIT_MASK_REG_LDO_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_KVCO_V2 BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_AGPIO_GPO BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AGPIO_DRV 7</div><div class='del'>-#define BIT_MASK_AGPIO_DRV 0x3</div><div class='del'>-#define BIT_AGPIO_DRV(x) (((x) &amp; BIT_MASK_AGPIO_DRV) &lt;&lt; BIT_SHIFT_AGPIO_DRV)</div><div class='del'>-#define BIT_GET_AGPIO_DRV(x) (((x) &gt;&gt; BIT_SHIFT_AGPIO_DRV) &amp; BIT_MASK_AGPIO_DRV)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_CAP_XO 1</div><div class='del'>-#define BIT_MASK_XTAL_CAP_XO 0x3f</div><div class='del'>-#define BIT_XTAL_CAP_XO(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_CAP_XO) &lt;&lt; BIT_SHIFT_XTAL_CAP_XO)</div><div class='del'>-#define BIT_GET_XTAL_CAP_XO(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_CAP_XO) &amp; BIT_MASK_XTAL_CAP_XO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2				(Offset 0x0028) */</div><div class='del'>-</div><div class='del'>-#define BIT_POW_PLL BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_OQT_FREE_TXPG_V1		(Offset 0x10250028) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_FREEPG_V1 0</div><div class='del'>-#define BIT_MASK_EXQ_FREEPG_V1 0xfff</div><div class='del'>-#define BIT_EXQ_FREEPG_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_FREEPG_V1) &lt;&lt; BIT_SHIFT_EXQ_FREEPG_V1)</div><div class='del'>-#define BIT_GET_EXQ_FREEPG_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_FREEPG_V1) &amp; BIT_MASK_EXQ_FREEPG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL3				(Offset 0x002C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS 7</div><div class='del'>-#define BIT_MASK_PS 0x7</div><div class='del'>-#define BIT_PS(x) (((x) &amp; BIT_MASK_PS) &lt;&lt; BIT_SHIFT_PS)</div><div class='del'>-#define BIT_GET_PS(x) (((x) &gt;&gt; BIT_SHIFT_PS) &amp; BIT_MASK_PS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL3				(Offset 0x002C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PSEN BIT(6)</div><div class='del'>-#define BIT_DOGENB BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL3				(Offset 0x002C) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_MBIAS BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL3				(Offset 0x002C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_R3_V4 1</div><div class='del'>-#define BIT_MASK_REG_R3_V4 0x7</div><div class='del'>-#define BIT_REG_R3_V4(x) (((x) &amp; BIT_MASK_REG_R3_V4) &lt;&lt; BIT_SHIFT_REG_R3_V4)</div><div class='del'>-#define BIT_GET_REG_R3_V4(x) (((x) &gt;&gt; BIT_SHIFT_REG_R3_V4) &amp; BIT_MASK_REG_R3_V4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL3				(Offset 0x002C) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_CP_BIT0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EFUSE_CTRL				(Offset 0x0030) */</div><div class='del'>-</div><div class='del'>-#define BIT_EF_FLAG BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_PGPD 28</div><div class='del'>-#define BIT_MASK_EF_PGPD 0x7</div><div class='del'>-#define BIT_EF_PGPD(x) (((x) &amp; BIT_MASK_EF_PGPD) &lt;&lt; BIT_SHIFT_EF_PGPD)</div><div class='del'>-#define BIT_GET_EF_PGPD(x) (((x) &gt;&gt; BIT_SHIFT_EF_PGPD) &amp; BIT_MASK_EF_PGPD)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_RDT 24</div><div class='del'>-#define BIT_MASK_EF_RDT 0xf</div><div class='del'>-#define BIT_EF_RDT(x) (((x) &amp; BIT_MASK_EF_RDT) &lt;&lt; BIT_SHIFT_EF_RDT)</div><div class='del'>-#define BIT_GET_EF_RDT(x) (((x) &gt;&gt; BIT_SHIFT_EF_RDT) &amp; BIT_MASK_EF_RDT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_PGTS 20</div><div class='del'>-#define BIT_MASK_EF_PGTS 0xf</div><div class='del'>-#define BIT_EF_PGTS(x) (((x) &amp; BIT_MASK_EF_PGTS) &lt;&lt; BIT_SHIFT_EF_PGTS)</div><div class='del'>-#define BIT_GET_EF_PGTS(x) (((x) &gt;&gt; BIT_SHIFT_EF_PGTS) &amp; BIT_MASK_EF_PGTS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EFUSE_CTRL				(Offset 0x0030) */</div><div class='del'>-</div><div class='del'>-#define BIT_EF_PDWN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EFUSE_CTRL				(Offset 0x0030) */</div><div class='del'>-</div><div class='del'>-#define BIT_EF_ALDEN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HTSFR_INFO			(Offset 0x10250030) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HTSFR1 16</div><div class='del'>-#define BIT_MASK_HTSFR1 0xffff</div><div class='del'>-#define BIT_HTSFR1(x) (((x) &amp; BIT_MASK_HTSFR1) &lt;&lt; BIT_SHIFT_HTSFR1)</div><div class='del'>-#define BIT_GET_HTSFR1(x) (((x) &gt;&gt; BIT_SHIFT_HTSFR1) &amp; BIT_MASK_HTSFR1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EFUSE_CTRL				(Offset 0x0030) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_ADDR 8</div><div class='del'>-#define BIT_MASK_EF_ADDR 0x3ff</div><div class='del'>-#define BIT_EF_ADDR(x) (((x) &amp; BIT_MASK_EF_ADDR) &lt;&lt; BIT_SHIFT_EF_ADDR)</div><div class='del'>-#define BIT_GET_EF_ADDR(x) (((x) &gt;&gt; BIT_SHIFT_EF_ADDR) &amp; BIT_MASK_EF_ADDR)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_DATA 0</div><div class='del'>-#define BIT_MASK_EF_DATA 0xff</div><div class='del'>-#define BIT_EF_DATA(x) (((x) &amp; BIT_MASK_EF_DATA) &lt;&lt; BIT_SHIFT_EF_DATA)</div><div class='del'>-#define BIT_GET_EF_DATA(x) (((x) &gt;&gt; BIT_SHIFT_EF_DATA) &amp; BIT_MASK_EF_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HTSFR_INFO			(Offset 0x10250030) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HTSFR0 0</div><div class='del'>-#define BIT_MASK_HTSFR0 0xffff</div><div class='del'>-#define BIT_HTSFR0(x) (((x) &amp; BIT_MASK_HTSFR0) &lt;&lt; BIT_SHIFT_HTSFR0)</div><div class='del'>-#define BIT_GET_HTSFR0(x) (((x) &gt;&gt; BIT_SHIFT_HTSFR0) &amp; BIT_MASK_HTSFR0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_LDOE25_EN BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LDOE25_V12ADJ_L 27</div><div class='del'>-#define BIT_MASK_LDOE25_V12ADJ_L 0xf</div><div class='del'>-#define BIT_LDOE25_V12ADJ_L(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_LDOE25_V12ADJ_L) &lt;&lt; BIT_SHIFT_LDOE25_V12ADJ_L)</div><div class='del'>-#define BIT_GET_LDOE25_V12ADJ_L(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LDOE25_V12ADJ_L) &amp; BIT_MASK_LDOE25_V12ADJ_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_EF_CRES_SEL BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_SCAN_START_V1 16</div><div class='del'>-#define BIT_MASK_EF_SCAN_START_V1 0x3ff</div><div class='del'>-#define BIT_EF_SCAN_START_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_SCAN_START_V1) &lt;&lt; BIT_SHIFT_EF_SCAN_START_V1)</div><div class='del'>-#define BIT_GET_EF_SCAN_START_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_SCAN_START_V1) &amp; BIT_MASK_EF_SCAN_START_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_SCAN_END 12</div><div class='del'>-#define BIT_MASK_EF_SCAN_END 0xf</div><div class='del'>-#define BIT_EF_SCAN_END(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_SCAN_END) &lt;&lt; BIT_SHIFT_EF_SCAN_END)</div><div class='del'>-#define BIT_GET_EF_SCAN_END(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_SCAN_END) &amp; BIT_MASK_EF_SCAN_END)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_EF_PD_DIS BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_CELL_SEL 8</div><div class='del'>-#define BIT_MASK_EF_CELL_SEL 0x3</div><div class='del'>-#define BIT_EF_CELL_SEL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_CELL_SEL) &lt;&lt; BIT_SHIFT_EF_CELL_SEL)</div><div class='del'>-#define BIT_GET_EF_CELL_SEL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_CELL_SEL) &amp; BIT_MASK_EF_CELL_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL			(Offset 0x0034) */</div><div class='del'>-</div><div class='del'>-#define BIT_EF_TRPT BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_TTHD 0</div><div class='del'>-#define BIT_MASK_EF_TTHD 0x7f</div><div class='del'>-#define BIT_EF_TTHD(x) (((x) &amp; BIT_MASK_EF_TTHD) &lt;&lt; BIT_SHIFT_EF_TTHD)</div><div class='del'>-#define BIT_GET_EF_TTHD(x) (((x) &gt;&gt; BIT_SHIFT_EF_TTHD) &amp; BIT_MASK_EF_TTHD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBG_SEL_V1 16</div><div class='del'>-#define BIT_MASK_DBG_SEL_V1 0xff</div><div class='del'>-#define BIT_DBG_SEL_V1(x) (((x) &amp; BIT_MASK_DBG_SEL_V1) &lt;&lt; BIT_SHIFT_DBG_SEL_V1)</div><div class='del'>-#define BIT_GET_DBG_SEL_V1(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBG_SEL_V1) &amp; BIT_MASK_DBG_SEL_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBG_SEL_BYTE 14</div><div class='del'>-#define BIT_MASK_DBG_SEL_BYTE 0x3</div><div class='del'>-#define BIT_DBG_SEL_BYTE(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBG_SEL_BYTE) &lt;&lt; BIT_SHIFT_DBG_SEL_BYTE)</div><div class='del'>-#define BIT_GET_DBG_SEL_BYTE(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBG_SEL_BYTE) &amp; BIT_MASK_DBG_SEL_BYTE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STD_L1_V1 12</div><div class='del'>-#define BIT_MASK_STD_L1_V1 0x3</div><div class='del'>-#define BIT_STD_L1_V1(x) (((x) &amp; BIT_MASK_STD_L1_V1) &lt;&lt; BIT_SHIFT_STD_L1_V1)</div><div class='del'>-#define BIT_GET_STD_L1_V1(x) (((x) &gt;&gt; BIT_SHIFT_STD_L1_V1) &amp; BIT_MASK_STD_L1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYSON_DBG_PAD_E2 BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYSON_LED_PAD_E2 BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYSON_GPEE_PAD_E2 BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYSON_PCI_PAD_E2 BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MATCH_CNT 8</div><div class='del'>-#define BIT_MASK_MATCH_CNT 0xff</div><div class='del'>-#define BIT_MATCH_CNT(x) (((x) &amp; BIT_MASK_MATCH_CNT) &lt;&lt; BIT_SHIFT_MATCH_CNT)</div><div class='del'>-#define BIT_GET_MATCH_CNT(x) (((x) &gt;&gt; BIT_SHIFT_MATCH_CNT) &amp; BIT_MASK_MATCH_CNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_AUTO_SW_LDO_VOL_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_SPS0WWV_WT 4</div><div class='del'>-#define BIT_MASK_SYSON_SPS0WWV_WT 0x3</div><div class='del'>-#define BIT_SYSON_SPS0WWV_WT(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_SPS0WWV_WT) &lt;&lt; BIT_SHIFT_SYSON_SPS0WWV_WT)</div><div class='del'>-#define BIT_GET_SYSON_SPS0WWV_WT(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_SPS0WWV_WT) &amp; BIT_MASK_SYSON_SPS0WWV_WT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_SPS0LDO_WT 2</div><div class='del'>-#define BIT_MASK_SYSON_SPS0LDO_WT 0x3</div><div class='del'>-#define BIT_SYSON_SPS0LDO_WT(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_SPS0LDO_WT) &lt;&lt; BIT_SHIFT_SYSON_SPS0LDO_WT)</div><div class='del'>-#define BIT_GET_SYSON_SPS0LDO_WT(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_SPS0LDO_WT) &amp; BIT_MASK_SYSON_SPS0LDO_WT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL			(Offset 0x0038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_RCLK_SCALE 0</div><div class='del'>-#define BIT_MASK_SYSON_RCLK_SCALE 0x3</div><div class='del'>-#define BIT_SYSON_RCLK_SCALE(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_RCLK_SCALE) &lt;&lt; BIT_SHIFT_SYSON_RCLK_SCALE)</div><div class='del'>-#define BIT_GET_SYSON_RCLK_SCALE(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_RCLK_SCALE) &amp; BIT_MASK_SYSON_RCLK_SCALE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HCPWM1_V2			(Offset 0x10250038) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYS_CLK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAL_TIMER				(Offset 0x003C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAL_SCAL 0</div><div class='del'>-#define BIT_MASK_CAL_SCAL 0xff</div><div class='del'>-#define BIT_CAL_SCAL(x) (((x) &amp; BIT_MASK_CAL_SCAL) &lt;&lt; BIT_SHIFT_CAL_SCAL)</div><div class='del'>-#define BIT_GET_CAL_SCAL(x) (((x) &gt;&gt; BIT_SHIFT_CAL_SCAL) &amp; BIT_MASK_CAL_SCAL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACLK_MON				(Offset 0x003E) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RCLK_MON 5</div><div class='del'>-#define BIT_MASK_RCLK_MON 0x7ff</div><div class='del'>-#define BIT_RCLK_MON(x) (((x) &amp; BIT_MASK_RCLK_MON) &lt;&lt; BIT_SHIFT_RCLK_MON)</div><div class='del'>-#define BIT_GET_RCLK_MON(x) (((x) &gt;&gt; BIT_SHIFT_RCLK_MON) &amp; BIT_MASK_RCLK_MON)</div><div class='del'>-</div><div class='del'>-#define BIT_CAL_EN BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DPSTU 2</div><div class='del'>-#define BIT_MASK_DPSTU 0x3</div><div class='del'>-#define BIT_DPSTU(x) (((x) &amp; BIT_MASK_DPSTU) &lt;&lt; BIT_SHIFT_DPSTU)</div><div class='del'>-#define BIT_GET_DPSTU(x) (((x) &gt;&gt; BIT_SHIFT_DPSTU) &amp; BIT_MASK_DPSTU)</div><div class='del'>-</div><div class='del'>-#define BIT_SUS_16X BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_CFG		(Offset 0x10250040) */</div><div class='del'>-</div><div class='del'>-#define BIT_INDIRECT_REG_RDY BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_FSPI_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_CFG		(Offset 0x10250040) */</div><div class='del'>-</div><div class='del'>-#define BIT_INDIRECT_REG_R BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_RTS_EXT_32K_SEL BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_CFG		(Offset 0x10250040) */</div><div class='del'>-</div><div class='del'>-#define BIT_INDIRECT_REG_W BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLGP_SPI_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_CFG		(Offset 0x10250040) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INDIRECT_REG_SIZE 16</div><div class='del'>-#define BIT_MASK_INDIRECT_REG_SIZE 0x3</div><div class='del'>-#define BIT_INDIRECT_REG_SIZE(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_INDIRECT_REG_SIZE) &lt;&lt; BIT_SHIFT_INDIRECT_REG_SIZE)</div><div class='del'>-#define BIT_GET_INDIRECT_REG_SIZE(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INDIRECT_REG_SIZE) &amp; BIT_MASK_INDIRECT_REG_SIZE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_SIC_LBK BIT(15)</div><div class='del'>-#define BIT_ENHTP BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_ENSIC BIT(12)</div><div class='del'>-#define BIT_SIC_SWRST BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_PO_WIFI_PTA_PINS BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_PO_BT_PTA_PINS BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_ENUART BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BTMODE 6</div><div class='del'>-#define BIT_MASK_BTMODE 0x3</div><div class='del'>-#define BIT_BTMODE(x) (((x) &amp; BIT_MASK_BTMODE) &lt;&lt; BIT_SHIFT_BTMODE)</div><div class='del'>-#define BIT_GET_BTMODE(x) (((x) &gt;&gt; BIT_SHIFT_BTMODE) &amp; BIT_MASK_BTMODE)</div><div class='del'>-</div><div class='del'>-#define BIT_ENBT BIT(5)</div><div class='del'>-#define BIT_EROM_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLRFE_6_7_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLRFE_4_5_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG				(Offset 0x0040) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIOSEL 0</div><div class='del'>-#define BIT_MASK_GPIOSEL 0x3</div><div class='del'>-#define BIT_GPIOSEL(x) (((x) &amp; BIT_MASK_GPIOSEL) &lt;&lt; BIT_SHIFT_GPIOSEL)</div><div class='del'>-#define BIT_GET_GPIOSEL(x) (((x) &gt;&gt; BIT_SHIFT_GPIOSEL) &amp; BIT_MASK_GPIOSEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_CFG		(Offset 0x10250040) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INDIRECT_REG_ADDR 0</div><div class='del'>-#define BIT_MASK_INDIRECT_REG_ADDR 0xffff</div><div class='del'>-#define BIT_INDIRECT_REG_ADDR(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_INDIRECT_REG_ADDR) &lt;&lt; BIT_SHIFT_INDIRECT_REG_ADDR)</div><div class='del'>-#define BIT_GET_INDIRECT_REG_ADDR(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INDIRECT_REG_ADDR) &amp; BIT_MASK_INDIRECT_REG_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_PIN_CTRL			(Offset 0x0044) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_MOD_7_TO_0 24</div><div class='del'>-#define BIT_MASK_GPIO_MOD_7_TO_0 0xff</div><div class='del'>-#define BIT_GPIO_MOD_7_TO_0(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_MOD_7_TO_0) &lt;&lt; BIT_SHIFT_GPIO_MOD_7_TO_0)</div><div class='del'>-#define BIT_GET_GPIO_MOD_7_TO_0(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_MOD_7_TO_0) &amp; BIT_MASK_GPIO_MOD_7_TO_0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IO_SEL_7_TO_0 16</div><div class='del'>-#define BIT_MASK_GPIO_IO_SEL_7_TO_0 0xff</div><div class='del'>-#define BIT_GPIO_IO_SEL_7_TO_0(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IO_SEL_7_TO_0) &lt;&lt; BIT_SHIFT_GPIO_IO_SEL_7_TO_0)</div><div class='del'>-#define BIT_GET_GPIO_IO_SEL_7_TO_0(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IO_SEL_7_TO_0) &amp; BIT_MASK_GPIO_IO_SEL_7_TO_0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_OUT_7_TO_0 8</div><div class='del'>-#define BIT_MASK_GPIO_OUT_7_TO_0 0xff</div><div class='del'>-#define BIT_GPIO_OUT_7_TO_0(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_OUT_7_TO_0) &lt;&lt; BIT_SHIFT_GPIO_OUT_7_TO_0)</div><div class='del'>-#define BIT_GET_GPIO_OUT_7_TO_0(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_OUT_7_TO_0) &amp; BIT_MASK_GPIO_OUT_7_TO_0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IN_7_TO_0 0</div><div class='del'>-#define BIT_MASK_GPIO_IN_7_TO_0 0xff</div><div class='del'>-#define BIT_GPIO_IN_7_TO_0(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IN_7_TO_0) &lt;&lt; BIT_SHIFT_GPIO_IN_7_TO_0)</div><div class='del'>-#define BIT_GET_GPIO_IN_7_TO_0(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IN_7_TO_0) &amp; BIT_MASK_GPIO_IN_7_TO_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_DATA		(Offset 0x10250044) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INDIRECT_REG_DATA 0</div><div class='del'>-#define BIT_MASK_INDIRECT_REG_DATA 0xffffffffL</div><div class='del'>-#define BIT_INDIRECT_REG_DATA(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_INDIRECT_REG_DATA) &lt;&lt; BIT_SHIFT_INDIRECT_REG_DATA)</div><div class='del'>-#define BIT_GET_INDIRECT_REG_DATA(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INDIRECT_REG_DATA) &amp; BIT_MASK_INDIRECT_REG_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_INTM				(Offset 0x0048) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MUXDBG_SEL 30</div><div class='del'>-#define BIT_MASK_MUXDBG_SEL 0x3</div><div class='del'>-#define BIT_MUXDBG_SEL(x) (((x) &amp; BIT_MASK_MUXDBG_SEL) &lt;&lt; BIT_SHIFT_MUXDBG_SEL)</div><div class='del'>-#define BIT_GET_MUXDBG_SEL(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MUXDBG_SEL) &amp; BIT_MASK_MUXDBG_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_INTM				(Offset 0x0048) */</div><div class='del'>-</div><div class='del'>-#define BIT_EXTWOL_SEL BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_INTM				(Offset 0x0048) */</div><div class='del'>-</div><div class='del'>-#define BIT_EXTWOL_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_INTM				(Offset 0x0048) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIOF_INT_MD BIT(15)</div><div class='del'>-#define BIT_GPIOE_INT_MD BIT(14)</div><div class='del'>-#define BIT_GPIOD_INT_MD BIT(13)</div><div class='del'>-#define BIT_GPIOC_INT_MD BIT(12)</div><div class='del'>-#define BIT_GPIOB_INT_MD BIT(11)</div><div class='del'>-#define BIT_GPIOA_INT_MD BIT(10)</div><div class='del'>-#define BIT_GPIO9_INT_MD BIT(9)</div><div class='del'>-#define BIT_GPIO8_INT_MD BIT(8)</div><div class='del'>-#define BIT_GPIO7_INT_MD BIT(7)</div><div class='del'>-#define BIT_GPIO6_INT_MD BIT(6)</div><div class='del'>-#define BIT_GPIO5_INT_MD BIT(5)</div><div class='del'>-#define BIT_GPIO4_INT_MD BIT(4)</div><div class='del'>-#define BIT_GPIO3_INT_MD BIT(3)</div><div class='del'>-#define BIT_GPIO2_INT_MD BIT(2)</div><div class='del'>-#define BIT_GPIO1_INT_MD BIT(1)</div><div class='del'>-#define BIT_GPIO0_INT_MD BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO3_WL_CTRL_EN BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_LNAON_SEL_EN BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAPE_SEL_EN BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_DPDT_WLBT_SEL BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_DPDT_SEL_EN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO13_14_WL_CTRL_EN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_LED2DIS BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_LED2PL BIT(20)</div><div class='del'>-#define BIT_LED2SV BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LED2CM 16</div><div class='del'>-#define BIT_MASK_LED2CM 0x7</div><div class='del'>-#define BIT_LED2CM(x) (((x) &amp; BIT_MASK_LED2CM) &lt;&lt; BIT_SHIFT_LED2CM)</div><div class='del'>-#define BIT_GET_LED2CM(x) (((x) &gt;&gt; BIT_SHIFT_LED2CM) &amp; BIT_MASK_LED2CM)</div><div class='del'>-</div><div class='del'>-#define BIT_LED1DIS BIT(15)</div><div class='del'>-#define BIT_LED1PL BIT(12)</div><div class='del'>-#define BIT_LED1SV BIT(11)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LED1CM 8</div><div class='del'>-#define BIT_MASK_LED1CM 0x7</div><div class='del'>-#define BIT_LED1CM(x) (((x) &amp; BIT_MASK_LED1CM) &lt;&lt; BIT_SHIFT_LED1CM)</div><div class='del'>-#define BIT_GET_LED1CM(x) (((x) &gt;&gt; BIT_SHIFT_LED1CM) &amp; BIT_MASK_LED1CM)</div><div class='del'>-</div><div class='del'>-#define BIT_LED0DIS BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AFE_LDO_SWR_CHECK 5</div><div class='del'>-#define BIT_MASK_AFE_LDO_SWR_CHECK 0x3</div><div class='del'>-#define BIT_AFE_LDO_SWR_CHECK(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_AFE_LDO_SWR_CHECK) &lt;&lt; BIT_SHIFT_AFE_LDO_SWR_CHECK)</div><div class='del'>-#define BIT_GET_AFE_LDO_SWR_CHECK(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AFE_LDO_SWR_CHECK) &amp; BIT_MASK_AFE_LDO_SWR_CHECK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG				(Offset 0x004C) */</div><div class='del'>-</div><div class='del'>-#define BIT_LED0PL BIT(4)</div><div class='del'>-#define BIT_LED0SV BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LED0CM 0</div><div class='del'>-#define BIT_MASK_LED0CM 0x7</div><div class='del'>-#define BIT_LED0CM(x) (((x) &amp; BIT_MASK_LED0CM) &lt;&lt; BIT_SHIFT_LED0CM)</div><div class='del'>-#define BIT_GET_LED0CM(x) (((x) &gt;&gt; BIT_SHIFT_LED0CM) &amp; BIT_MASK_LED0CM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PDNINT_EN BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_NFC_INT_PAD_EN BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_SPS_OCP_INT_EN BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PWMERR_INT_EN BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIOF_INT_EN BIT(27)</div><div class='del'>-#define BIT_FS_GPIOE_INT_EN BIT(26)</div><div class='del'>-#define BIT_FS_GPIOD_INT_EN BIT(25)</div><div class='del'>-#define BIT_FS_GPIOC_INT_EN BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIOB_INT_EN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIOA_INT_EN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO9_INT_EN BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO8_INT_EN BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO7_INT_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO6_INT_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO5_INT_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO4_INT_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO3_INT_EN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO2_INT_EN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO1_INT_EN BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO0_INT_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HCI_SUS_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HCI_RES_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HCI_RESET_EN BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_BTON_STS_UPDATE_MSK_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_ACT2RECOVERY_INT_EN_V1 BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_GEN1GEN2_SWITCH BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_HCI_TXDMA_REQ_HIMR BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_32K_LEAVE_SETTING_MAK BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_32K_ENTER_SETTING_MAK BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_USB_LPMRSM_MSK BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR				(Offset 0x0050) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_USB_LPMINT_MSK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PDNINT BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_SPS_OCP_INT BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PWMERR_INT BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIOF_INT BIT(27)</div><div class='del'>-#define BIT_FS_GPIOE_INT BIT(26)</div><div class='del'>-#define BIT_FS_GPIOD_INT BIT(25)</div><div class='del'>-#define BIT_FS_GPIOC_INT BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIOB_INT BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIOA_INT BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO9_INT BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO8_INT BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO7_INT BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO6_INT BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO5_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO4_INT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO3_INT BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO2_INT BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO1_INT BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GPIO0_INT BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HCI_SUS_INT BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HCI_RES_INT BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HCI_RESET_INT BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_ACT2RECOVERY BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_HCI_TXDMA_REQ_HISR BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_32K_LEAVE_SETTING_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_32K_ENTER_SETTING_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_USB_LPMRSM_INT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR				(Offset 0x0054) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_USB_LPMINT_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIOF_INT_EN BIT(31)</div><div class='del'>-#define BIT_GPIOE_INT_EN BIT(30)</div><div class='del'>-#define BIT_GPIOD_INT_EN BIT(29)</div><div class='del'>-#define BIT_GPIOC_INT_EN BIT(28)</div><div class='del'>-#define BIT_GPIOB_INT_EN BIT(27)</div><div class='del'>-#define BIT_GPIOA_INT_EN BIT(26)</div><div class='del'>-#define BIT_GPIO9_INT_EN BIT(25)</div><div class='del'>-#define BIT_GPIO8_INT_EN BIT(24)</div><div class='del'>-#define BIT_GPIO7_INT_EN BIT(23)</div><div class='del'>-#define BIT_GPIO6_INT_EN BIT(22)</div><div class='del'>-#define BIT_GPIO5_INT_EN BIT(21)</div><div class='del'>-#define BIT_GPIO4_INT_EN BIT(20)</div><div class='del'>-#define BIT_GPIO3_INT_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO1_INT_EN BIT(17)</div><div class='del'>-#define BIT_GPIO0_INT_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO2_INT_EN_V1 BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_PDNINT_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_RON_INT_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_SPS_OCP_INT_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR				(Offset 0x0058) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO15_0_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIOF_INT BIT(31)</div><div class='del'>-#define BIT_GPIOE_INT BIT(30)</div><div class='del'>-#define BIT_GPIOD_INT BIT(29)</div><div class='del'>-#define BIT_GPIOC_INT BIT(28)</div><div class='del'>-#define BIT_GPIOB_INT BIT(27)</div><div class='del'>-#define BIT_GPIOA_INT BIT(26)</div><div class='del'>-#define BIT_GPIO9_INT BIT(25)</div><div class='del'>-#define BIT_GPIO8_INT BIT(24)</div><div class='del'>-#define BIT_GPIO7_INT BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO6_INT BIT(22)</div><div class='del'>-#define BIT_GPIO5_INT BIT(21)</div><div class='del'>-#define BIT_GPIO4_INT BIT(20)</div><div class='del'>-#define BIT_GPIO3_INT BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO1_INT BIT(17)</div><div class='del'>-#define BIT_GPIO0_INT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO2_INT_V1 BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PDNINT BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_RON_INT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SPS_OCP_INT BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR				(Offset 0x005C) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO15_0_INT BIT(0)</div><div class='del'>-#define BIT_MCUFWDL_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_EXT_CTRL			(Offset 0x0060) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_MOD_15_TO_8 24</div><div class='del'>-#define BIT_MASK_GPIO_MOD_15_TO_8 0xff</div><div class='del'>-#define BIT_GPIO_MOD_15_TO_8(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_MOD_15_TO_8) &lt;&lt; BIT_SHIFT_GPIO_MOD_15_TO_8)</div><div class='del'>-#define BIT_GET_GPIO_MOD_15_TO_8(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_MOD_15_TO_8) &amp; BIT_MASK_GPIO_MOD_15_TO_8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IO_SEL_15_TO_8 16</div><div class='del'>-#define BIT_MASK_GPIO_IO_SEL_15_TO_8 0xff</div><div class='del'>-#define BIT_GPIO_IO_SEL_15_TO_8(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IO_SEL_15_TO_8) &lt;&lt; BIT_SHIFT_GPIO_IO_SEL_15_TO_8)</div><div class='del'>-#define BIT_GET_GPIO_IO_SEL_15_TO_8(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IO_SEL_15_TO_8) &amp; BIT_MASK_GPIO_IO_SEL_15_TO_8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_OUT_15_TO_8 8</div><div class='del'>-#define BIT_MASK_GPIO_OUT_15_TO_8 0xff</div><div class='del'>-#define BIT_GPIO_OUT_15_TO_8(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_OUT_15_TO_8) &lt;&lt; BIT_SHIFT_GPIO_OUT_15_TO_8)</div><div class='del'>-#define BIT_GET_GPIO_OUT_15_TO_8(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_OUT_15_TO_8) &amp; BIT_MASK_GPIO_OUT_15_TO_8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IN_15_TO_8 0</div><div class='del'>-#define BIT_MASK_GPIO_IN_15_TO_8 0xff</div><div class='del'>-#define BIT_GPIO_IN_15_TO_8(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IN_15_TO_8) &lt;&lt; BIT_SHIFT_GPIO_IN_15_TO_8)</div><div class='del'>-#define BIT_GET_GPIO_IN_15_TO_8(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IN_15_TO_8) &amp; BIT_MASK_GPIO_IN_15_TO_8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_H2C				(Offset 0x10250060) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_H2C_MSG 0</div><div class='del'>-#define BIT_MASK_SDIO_H2C_MSG 0xffffffffL</div><div class='del'>-#define BIT_SDIO_H2C_MSG(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_H2C_MSG) &lt;&lt; BIT_SHIFT_SDIO_H2C_MSG)</div><div class='del'>-#define BIT_GET_SDIO_H2C_MSG(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_H2C_MSG) &amp; BIT_MASK_SDIO_H2C_MSG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAPE_WLBT_SEL BIT(29)</div><div class='del'>-#define BIT_LNAON_WLBT_SEL BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_GPG3_FEN BIT(26)</div><div class='del'>-#define BIT_BTGP_GPG2_FEN BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_JTAG_EN BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_CLK_EXTARNAL_EN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_UART0_EN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_UART1_EN BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_SPI_EN BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_GPIO_E2 BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTGP_GPIO_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BTGP_GPIO_SL 16</div><div class='del'>-#define BIT_MASK_BTGP_GPIO_SL 0x3</div><div class='del'>-#define BIT_BTGP_GPIO_SL(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BTGP_GPIO_SL) &lt;&lt; BIT_SHIFT_BTGP_GPIO_SL)</div><div class='del'>-#define BIT_GET_BTGP_GPIO_SL(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BTGP_GPIO_SL) &amp; BIT_MASK_BTGP_GPIO_SL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_SDIO_SR BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO14_OUTPUT_PL BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_HOST_WAKE_PAD_PULL_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_HOST_WAKE_PAD_SL BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_LNAON_SR BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_LNAON_E2 BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW_LNAON_G_SEL_DATA BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW_LNAON_A_SEL_DATA BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_PAPE_SR BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_PAPE_E2 BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW_PAPE_G_SEL_DATA BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW_PAPE_A_SEL_DATA BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_DPDT_SR BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_DPDT_PAD_E2 BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1				(Offset 0x0064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SW_DPDT_SEL_DATA BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_C2H				(Offset 0x10250064) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_C2H_MSG 0</div><div class='del'>-#define BIT_MASK_SDIO_C2H_MSG 0xffffffffL</div><div class='del'>-#define BIT_SDIO_C2H_MSG(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_C2H_MSG) &lt;&lt; BIT_SHIFT_SDIO_C2H_MSG)</div><div class='del'>-#define BIT_GET_SDIO_C2H_MSG(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_C2H_MSG) &amp; BIT_MASK_SDIO_C2H_MSG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_BD2PP BIT(31)</div><div class='del'>-#define BIT_LDOV12B_EN BIT(30)</div><div class='del'>-#define BIT_CKEN_BTGPS BIT(29)</div><div class='del'>-#define BIT_FEN_BTGPS BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_MULRW BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTCPU_BOOTSEL BIT(27)</div><div class='del'>-#define BIT_SPI_SPEEDUP BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_DEVWAKE_PAD_TYPE_SEL BIT(24)</div><div class='del'>-#define BIT_CLKREQ_PAD_TYPE_SEL BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_CPL_TIMEOUT_PS BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_BTPON2PP BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_TXDMA_FAIL_PS BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_HWENTR_L1 BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_HWROF_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_ADV_CLKGATE BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_FUNC_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_HWPDN_SL BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_DISN_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_PDN_PULL_EN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_PDN_PULL_EN BIT(14)</div><div class='del'>-#define BIT_EXTERNAL_REQUEST_PL BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_GPIO0_2_3_PULL_LOW_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_BA2PP BIT(11)</div><div class='del'>-#define BIT_BT_AFE_LDO_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_AFE_PLL_EN BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_DIG_CLK_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_DRV_EXIST_IDX BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_DOP_EHPAD BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_HWROF_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_FUNC_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL			(Offset 0x0068) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_HWPDN_SL BIT(1)</div><div class='del'>-#define BIT_WL_HWPDN_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDM_DEBUG				(Offset 0x006C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLCLK_PHASE 0</div><div class='del'>-#define BIT_MASK_WLCLK_PHASE 0x1f</div><div class='del'>-#define BIT_WLCLK_PHASE(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLCLK_PHASE) &lt;&lt; BIT_SHIFT_WLCLK_PHASE)</div><div class='del'>-#define BIT_GET_WLCLK_PHASE(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLCLK_PHASE) &amp; BIT_MASK_WLCLK_PHASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_DBG_GNT_WL_BT BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_LTE_MUX_CTRL_PATH BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_LTE_COEX_UART BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_3W_LTE_WL_GPIO BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_INT_POLARITY BIT(19)</div><div class='del'>-#define BIT_SDIO_INT BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_OFF_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_ON_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_WAIT_TIMEOUT_EVENT BIT(10)</div><div class='del'>-#define BIT_PCIE_WAIT_TIME BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL			(Offset 0x0070) */</div><div class='del'>-</div><div class='del'>-#define BIT_MPCIE_REFCLK_XTAL_SEL BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT_SEL 29</div><div class='del'>-#define BIT_MASK_TSFT_SEL 0x7</div><div class='del'>-#define BIT_TSFT_SEL(x) (((x) &amp; BIT_MASK_TSFT_SEL) &lt;&lt; BIT_SHIFT_TSFT_SEL)</div><div class='del'>-#define BIT_GET_TSFT_SEL(x) (((x) &gt;&gt; BIT_SHIFT_TSFT_SEL) &amp; BIT_MASK_TSFT_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RPWM 24</div><div class='del'>-#define BIT_MASK_RPWM 0xff</div><div class='del'>-#define BIT_RPWM(x) (((x) &amp; BIT_MASK_RPWM) &lt;&lt; BIT_SHIFT_RPWM)</div><div class='del'>-#define BIT_GET_RPWM(x) (((x) &gt;&gt; BIT_SHIFT_RPWM) &amp; BIT_MASK_RPWM)</div><div class='del'>-</div><div class='del'>-#define BIT_ROM_DLEN BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ROM_PGE 16</div><div class='del'>-#define BIT_MASK_ROM_PGE 0x7</div><div class='del'>-#define BIT_ROM_PGE(x) (((x) &amp; BIT_MASK_ROM_PGE) &lt;&lt; BIT_SHIFT_ROM_PGE)</div><div class='del'>-#define BIT_GET_ROM_PGE(x) (((x) &gt;&gt; BIT_SHIFT_ROM_PGE) &amp; BIT_MASK_ROM_PGE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_HOST_PWR_OFF_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYM_LPS_BLOCK_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_LPM_ACT_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_LPM_NY BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_SUS_DIS BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_PAD_E 5</div><div class='del'>-#define BIT_MASK_SDIO_PAD_E 0x7</div><div class='del'>-#define BIT_SDIO_PAD_E(x) (((x) &amp; BIT_MASK_SDIO_PAD_E) &lt;&lt; BIT_SHIFT_SDIO_PAD_E)</div><div class='del'>-#define BIT_GET_SDIO_PAD_E(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_PAD_E) &amp; BIT_MASK_SDIO_PAD_E)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_LPPLL_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_ROP_SW15 BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCI_CKRDY_OPT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL			(Offset 0x0074) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCI_VAUX_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_ZCD_HW_AUTO_EN BIT(27)</div><div class='del'>-#define BIT_ZCD_REGSEL BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AUTO_ZCD_IN_CODE 21</div><div class='del'>-#define BIT_MASK_AUTO_ZCD_IN_CODE 0x1f</div><div class='del'>-#define BIT_AUTO_ZCD_IN_CODE(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_AUTO_ZCD_IN_CODE) &lt;&lt; BIT_SHIFT_AUTO_ZCD_IN_CODE)</div><div class='del'>-#define BIT_GET_AUTO_ZCD_IN_CODE(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AUTO_ZCD_IN_CODE) &amp; BIT_MASK_AUTO_ZCD_IN_CODE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ZCD_CODE_IN_L 16</div><div class='del'>-#define BIT_MASK_ZCD_CODE_IN_L 0x1f</div><div class='del'>-#define BIT_ZCD_CODE_IN_L(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_ZCD_CODE_IN_L) &lt;&lt; BIT_SHIFT_ZCD_CODE_IN_L)</div><div class='del'>-#define BIT_GET_ZCD_CODE_IN_L(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ZCD_CODE_IN_L) &amp; BIT_MASK_ZCD_CODE_IN_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LDO_HV5_DUMMY 14</div><div class='del'>-#define BIT_MASK_LDO_HV5_DUMMY 0x3</div><div class='del'>-#define BIT_LDO_HV5_DUMMY(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_LDO_HV5_DUMMY) &lt;&lt; BIT_SHIFT_LDO_HV5_DUMMY)</div><div class='del'>-#define BIT_GET_LDO_HV5_DUMMY(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LDO_HV5_DUMMY) &amp; BIT_MASK_LDO_HV5_DUMMY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_VTUNE33_BIT0_TO_BIT1 12</div><div class='del'>-#define BIT_MASK_REG_VTUNE33_BIT0_TO_BIT1 0x3</div><div class='del'>-#define BIT_REG_VTUNE33_BIT0_TO_BIT1(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_VTUNE33_BIT0_TO_BIT1)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_VTUNE33_BIT0_TO_BIT1)</div><div class='del'>-#define BIT_GET_REG_VTUNE33_BIT0_TO_BIT1(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_VTUNE33_BIT0_TO_BIT1) &amp;                         \</div><div class='del'>-	 BIT_MASK_REG_VTUNE33_BIT0_TO_BIT1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_STANDBY33_BIT0_TO_BIT1 10</div><div class='del'>-#define BIT_MASK_REG_STANDBY33_BIT0_TO_BIT1 0x3</div><div class='del'>-#define BIT_REG_STANDBY33_BIT0_TO_BIT1(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_STANDBY33_BIT0_TO_BIT1)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_STANDBY33_BIT0_TO_BIT1)</div><div class='del'>-#define BIT_GET_REG_STANDBY33_BIT0_TO_BIT1(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_STANDBY33_BIT0_TO_BIT1) &amp;                       \</div><div class='del'>-	 BIT_MASK_REG_STANDBY33_BIT0_TO_BIT1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_LOAD33_BIT0_TO_BIT1 8</div><div class='del'>-#define BIT_MASK_REG_LOAD33_BIT0_TO_BIT1 0x3</div><div class='del'>-#define BIT_REG_LOAD33_BIT0_TO_BIT1(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_LOAD33_BIT0_TO_BIT1)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_LOAD33_BIT0_TO_BIT1)</div><div class='del'>-#define BIT_GET_REG_LOAD33_BIT0_TO_BIT1(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_LOAD33_BIT0_TO_BIT1) &amp;                          \</div><div class='del'>-	 BIT_MASK_REG_LOAD33_BIT0_TO_BIT1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_BYPASS_L BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_LDOF_L BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_TYPE_L_V1 BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_ARENB_L BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CFC_L 1</div><div class='del'>-#define BIT_MASK_CFC_L 0x3</div><div class='del'>-#define BIT_CFC_L(x) (((x) &amp; BIT_MASK_CFC_L) &lt;&lt; BIT_SHIFT_CFC_L)</div><div class='del'>-#define BIT_GET_CFC_L(x) (((x) &gt;&gt; BIT_SHIFT_CFC_L) &amp; BIT_MASK_CFC_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL			(Offset 0x007C) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_OCPS_L_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_ANA_PORT_EN BIT(22)</div><div class='del'>-#define BIT_MAC_PORT_EN BIT(21)</div><div class='del'>-#define BIT_BOOT_FSPI_EN BIT(20)</div><div class='del'>-#define BIT_FW_INIT_RDY BIT(15)</div><div class='del'>-#define BIT_FW_DW_RDY BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPU_CLK_SEL 12</div><div class='del'>-#define BIT_MASK_CPU_CLK_SEL 0x3</div><div class='del'>-#define BIT_CPU_CLK_SEL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPU_CLK_SEL) &lt;&lt; BIT_SHIFT_CPU_CLK_SEL)</div><div class='del'>-#define BIT_GET_CPU_CLK_SEL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPU_CLK_SEL) &amp; BIT_MASK_CPU_CLK_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_CCLK_CHG_MASK BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_EMEM__TXBUF_CHKSUM_OK BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_EMEM_TXBUF_DW_RDY BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_EMEM_CHKSUM_OK BIT(8)</div><div class='del'>-#define BIT_EMEM_DW_OK BIT(7)</div><div class='del'>-#define BIT_TOGGLING BIT(7)</div><div class='del'>-#define BIT_DMEM_CHKSUM_OK BIT(6)</div><div class='del'>-#define BIT_ACK BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_DMEM_DW_OK BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_IMEM_CHKSUM_OK BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_IMEM_DW_OK BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_IMEM_BOOT_LOAD_CHKSUM_OK BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL				(Offset 0x0080) */</div><div class='del'>-</div><div class='del'>-#define BIT_IMEM_BOOT_LOAD_DW_OK BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HRPWM1				(Offset 0x10250080) */</div><div class='del'>-</div><div class='del'>-#define BIT_32K_PERMISSION BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCU_TST_CFG				(Offset 0x0084) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LBKTST 0</div><div class='del'>-#define BIT_MASK_LBKTST 0xffff</div><div class='del'>-#define BIT_LBKTST(x) (((x) &amp; BIT_MASK_LBKTST) &lt;&lt; BIT_SHIFT_LBKTST)</div><div class='del'>-#define BIT_GET_LBKTST(x) (((x) &gt;&gt; BIT_SHIFT_LBKTST) &amp; BIT_MASK_LBKTST)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_BUS_CTRL			(Offset 0x10250085) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_CLK_XHGE_EN BIT(3)</div><div class='del'>-#define BIT_INTER_CLK_EN BIT(2)</div><div class='del'>-#define BIT_EN_RPT_TXCRC BIT(1)</div><div class='del'>-#define BIT_DIS_RXDMA_STS BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSUS_CTRL			(Offset 0x10250086) */</div><div class='del'>-</div><div class='del'>-#define BIT_INTR_CTRL BIT(4)</div><div class='del'>-#define BIT_SDIO_VOLTAGE BIT(3)</div><div class='del'>-#define BIT_BYPASS_INIT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSUS_CTRL			(Offset 0x10250086) */</div><div class='del'>-</div><div class='del'>-#define BIT_HCI_RESUME_RDY BIT(1)</div><div class='del'>-#define BIT_HCI_SUS_REQ BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E0_E1			(Offset 0x0088) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E1 16</div><div class='del'>-#define BIT_MASK_HOST_MSG_E1 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E1(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E1) &lt;&lt; BIT_SHIFT_HOST_MSG_E1)</div><div class='del'>-#define BIT_GET_HOST_MSG_E1(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E1) &amp; BIT_MASK_HOST_MSG_E1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E0 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_E0 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E0(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E0) &lt;&lt; BIT_SHIFT_HOST_MSG_E0)</div><div class='del'>-#define BIT_GET_HOST_MSG_E0(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E0) &amp; BIT_MASK_HOST_MSG_E0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_RESPONSE_TIMER			(Offset 0x10250088) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMDIN_2RESP_TIMER 0</div><div class='del'>-#define BIT_MASK_CMDIN_2RESP_TIMER 0xffff</div><div class='del'>-#define BIT_CMDIN_2RESP_TIMER(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMDIN_2RESP_TIMER) &lt;&lt; BIT_SHIFT_CMDIN_2RESP_TIMER)</div><div class='del'>-#define BIT_GET_CMDIN_2RESP_TIMER(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMDIN_2RESP_TIMER) &amp; BIT_MASK_CMDIN_2RESP_TIMER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CMD_CRC			(Offset 0x1025008A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_CMD_CRC_V1 0</div><div class='del'>-#define BIT_MASK_SDIO_CMD_CRC_V1 0xff</div><div class='del'>-#define BIT_SDIO_CMD_CRC_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_CMD_CRC_V1) &lt;&lt; BIT_SHIFT_SDIO_CMD_CRC_V1)</div><div class='del'>-#define BIT_GET_SDIO_CMD_CRC_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_CMD_CRC_V1) &amp; BIT_MASK_SDIO_CMD_CRC_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E2_E3			(Offset 0x008C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E3 16</div><div class='del'>-#define BIT_MASK_HOST_MSG_E3 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E3(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E3) &lt;&lt; BIT_SHIFT_HOST_MSG_E3)</div><div class='del'>-#define BIT_GET_HOST_MSG_E3(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E3) &amp; BIT_MASK_HOST_MSG_E3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E2 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_E2 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E2) &lt;&lt; BIT_SHIFT_HOST_MSG_E2)</div><div class='del'>-#define BIT_GET_HOST_MSG_E2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E2) &amp; BIT_MASK_HOST_MSG_E2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_EABM BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_ACKF BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_DLDM BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_ESWR BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_PWMM BIT(27)</div><div class='del'>-#define BIT_WLLPSOP_EECK BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_WLMACOFF BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_EXTAL BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_SYNPON_VOLTSPDN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_WLBBOFF BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLLPSOP_WLMEM_DS BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPLDH12_VADJ_STEP_DN 12</div><div class='del'>-#define BIT_MASK_LPLDH12_VADJ_STEP_DN 0xf</div><div class='del'>-#define BIT_LPLDH12_VADJ_STEP_DN(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPLDH12_VADJ_STEP_DN)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LPLDH12_VADJ_STEP_DN)</div><div class='del'>-#define BIT_GET_LPLDH12_VADJ_STEP_DN(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPLDH12_VADJ_STEP_DN) &amp;                             \</div><div class='del'>-	 BIT_MASK_LPLDH12_VADJ_STEP_DN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_V15ADJ_L1_STEP_DN 8</div><div class='del'>-#define BIT_MASK_V15ADJ_L1_STEP_DN 0x7</div><div class='del'>-#define BIT_V15ADJ_L1_STEP_DN(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_V15ADJ_L1_STEP_DN) &lt;&lt; BIT_SHIFT_V15ADJ_L1_STEP_DN)</div><div class='del'>-#define BIT_GET_V15ADJ_L1_STEP_DN(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_V15ADJ_L1_STEP_DN) &amp; BIT_MASK_V15ADJ_L1_STEP_DN)</div><div class='del'>-</div><div class='del'>-#define BIT_REGU_32K_CLK_EN BIT(1)</div><div class='del'>-#define BIT_DRV_WLAN_INT_CLR BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL				(Offset 0x0090) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_LPS_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSISR				(Offset 0x10250090) */</div><div class='del'>-</div><div class='del'>-#define BIT_DRV_WLAN_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSIMR				(Offset 0x10250091) */</div><div class='del'>-</div><div class='del'>-#define BIT_HISR_MASK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL5				(Offset 0x0094) */</div><div class='del'>-</div><div class='del'>-#define BIT_BB_DBG_SEL_AFE_SDM_BIT0 BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL5				(Offset 0x0094) */</div><div class='del'>-</div><div class='del'>-#define BIT_ORDER_SDM BIT(30)</div><div class='del'>-#define BIT_RFE_SEL_SDM BIT(29)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REF_SEL 25</div><div class='del'>-#define BIT_MASK_REF_SEL 0xf</div><div class='del'>-#define BIT_REF_SEL(x) (((x) &amp; BIT_MASK_REF_SEL) &lt;&lt; BIT_SHIFT_REF_SEL)</div><div class='del'>-#define BIT_GET_REF_SEL(x) (((x) &gt;&gt; BIT_SHIFT_REF_SEL) &amp; BIT_MASK_REF_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL5				(Offset 0x0094) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_F0F_SDM 12</div><div class='del'>-#define BIT_MASK_F0F_SDM 0x1fff</div><div class='del'>-#define BIT_F0F_SDM(x) (((x) &amp; BIT_MASK_F0F_SDM) &lt;&lt; BIT_SHIFT_F0F_SDM)</div><div class='del'>-#define BIT_GET_F0F_SDM(x) (((x) &gt;&gt; BIT_SHIFT_F0F_SDM) &amp; BIT_MASK_F0F_SDM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL5				(Offset 0x0094) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_F0N_SDM 9</div><div class='del'>-#define BIT_MASK_F0N_SDM 0x7</div><div class='del'>-#define BIT_F0N_SDM(x) (((x) &amp; BIT_MASK_F0N_SDM) &lt;&lt; BIT_SHIFT_F0N_SDM)</div><div class='del'>-#define BIT_GET_F0N_SDM(x) (((x) &gt;&gt; BIT_SHIFT_F0N_SDM) &amp; BIT_MASK_F0N_SDM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL5				(Offset 0x0094) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DIVN_SDM 3</div><div class='del'>-#define BIT_MASK_DIVN_SDM 0x3f</div><div class='del'>-#define BIT_DIVN_SDM(x) (((x) &amp; BIT_MASK_DIVN_SDM) &lt;&lt; BIT_SHIFT_DIVN_SDM)</div><div class='del'>-#define BIT_GET_DIVN_SDM(x) (((x) &gt;&gt; BIT_SHIFT_DIVN_SDM) &amp; BIT_MASK_DIVN_SDM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_DEBOUNCE_CTRL			(Offset 0x0098) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLGP_DBC1EN BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLGP_DBC1 8</div><div class='del'>-#define BIT_MASK_WLGP_DBC1 0xf</div><div class='del'>-#define BIT_WLGP_DBC1(x) (((x) &amp; BIT_MASK_WLGP_DBC1) &lt;&lt; BIT_SHIFT_WLGP_DBC1)</div><div class='del'>-#define BIT_GET_WLGP_DBC1(x) (((x) &gt;&gt; BIT_SHIFT_WLGP_DBC1) &amp; BIT_MASK_WLGP_DBC1)</div><div class='del'>-</div><div class='del'>-#define BIT_WLGP_DBC0EN BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLGP_DBC0 0</div><div class='del'>-#define BIT_MASK_WLGP_DBC0 0xf</div><div class='del'>-#define BIT_WLGP_DBC0(x) (((x) &amp; BIT_MASK_WLGP_DBC0) &lt;&lt; BIT_SHIFT_WLGP_DBC0)</div><div class='del'>-#define BIT_GET_WLGP_DBC0(x) (((x) &gt;&gt; BIT_SHIFT_WLGP_DBC0) &amp; BIT_MASK_WLGP_DBC0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RPWM2				(Offset 0x009C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RPWM2 16</div><div class='del'>-#define BIT_MASK_RPWM2 0xffff</div><div class='del'>-#define BIT_RPWM2(x) (((x) &amp; BIT_MASK_RPWM2) &lt;&lt; BIT_SHIFT_RPWM2)</div><div class='del'>-#define BIT_GET_RPWM2(x) (((x) &gt;&gt; BIT_SHIFT_RPWM2) &amp; BIT_MASK_RPWM2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYSON_FSM_MON			(Offset 0x00A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FSM_MON_SEL 24</div><div class='del'>-#define BIT_MASK_FSM_MON_SEL 0x7</div><div class='del'>-#define BIT_FSM_MON_SEL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_FSM_MON_SEL) &lt;&lt; BIT_SHIFT_FSM_MON_SEL)</div><div class='del'>-#define BIT_GET_FSM_MON_SEL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FSM_MON_SEL) &amp; BIT_MASK_FSM_MON_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_DOP_ELDO BIT(23)</div><div class='del'>-#define BIT_FSM_MON_UPD BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FSM_PAR 0</div><div class='del'>-#define BIT_MASK_FSM_PAR 0x7fff</div><div class='del'>-#define BIT_FSM_PAR(x) (((x) &amp; BIT_MASK_FSM_PAR) &lt;&lt; BIT_SHIFT_FSM_PAR)</div><div class='del'>-#define BIT_GET_FSM_PAR(x) (((x) &gt;&gt; BIT_SHIFT_FSM_PAR) &amp; BIT_MASK_FSM_PAR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL6				(Offset 0x00A4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_DBG_SEL_AFE_SDM_BIT3_1 0</div><div class='del'>-#define BIT_MASK_BB_DBG_SEL_AFE_SDM_BIT3_1 0x7</div><div class='del'>-#define BIT_BB_DBG_SEL_AFE_SDM_BIT3_1(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_DBG_SEL_AFE_SDM_BIT3_1)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BB_DBG_SEL_AFE_SDM_BIT3_1)</div><div class='del'>-#define BIT_GET_BB_DBG_SEL_AFE_SDM_BIT3_1(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_DBG_SEL_AFE_SDM_BIT3_1) &amp;                        \</div><div class='del'>-	 BIT_MASK_BB_DBG_SEL_AFE_SDM_BIT3_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL1			(Offset 0x00A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_INT_EN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RD_WR_WIFI_BT_INFO 16</div><div class='del'>-#define BIT_MASK_RD_WR_WIFI_BT_INFO 0x7fff</div><div class='del'>-#define BIT_RD_WR_WIFI_BT_INFO(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RD_WR_WIFI_BT_INFO) &lt;&lt; BIT_SHIFT_RD_WR_WIFI_BT_INFO)</div><div class='del'>-#define BIT_GET_RD_WR_WIFI_BT_INFO(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RD_WR_WIFI_BT_INFO) &amp; BIT_MASK_RD_WR_WIFI_BT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL1			(Offset 0x00A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_PMC_WR_OVF BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLPMC_ERRINT 0</div><div class='del'>-#define BIT_MASK_WLPMC_ERRINT 0xff</div><div class='del'>-#define BIT_WLPMC_ERRINT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLPMC_ERRINT) &lt;&lt; BIT_SHIFT_WLPMC_ERRINT)</div><div class='del'>-#define BIT_GET_WLPMC_ERRINT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLPMC_ERRINT) &amp; BIT_MASK_WLPMC_ERRINT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL7				(Offset 0x00AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SEL_V 30</div><div class='del'>-#define BIT_MASK_SEL_V 0x3</div><div class='del'>-#define BIT_SEL_V(x) (((x) &amp; BIT_MASK_SEL_V) &lt;&lt; BIT_SHIFT_SEL_V)</div><div class='del'>-#define BIT_GET_SEL_V(x) (((x) &gt;&gt; BIT_SHIFT_SEL_V) &amp; BIT_MASK_SEL_V)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL7				(Offset 0x00AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_TXFIFO_TH_INT BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL7				(Offset 0x00AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SEL_LDO_PC BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL7				(Offset 0x00AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CK_MON_SEL 26</div><div class='del'>-#define BIT_MASK_CK_MON_SEL 0x7</div><div class='del'>-#define BIT_CK_MON_SEL(x) (((x) &amp; BIT_MASK_CK_MON_SEL) &lt;&lt; BIT_SHIFT_CK_MON_SEL)</div><div class='del'>-#define BIT_GET_CK_MON_SEL(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CK_MON_SEL) &amp; BIT_MASK_CK_MON_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL7				(Offset 0x00AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_CK_MON_EN BIT(25)</div><div class='del'>-#define BIT_FREF_EDGE BIT(24)</div><div class='del'>-#define BIT_CK320M_EN BIT(23)</div><div class='del'>-#define BIT_CK_5M_EN BIT(22)</div><div class='del'>-#define BIT_TESTEN BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR0				(Offset 0x00B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIMEOUT_INTERRUPT2_MASK BIT(31)</div><div class='del'>-#define BIT_TIMEOUT_INTERRUTP1_MASK BIT(30)</div><div class='del'>-#define BIT_PSTIMEOUT_MSK BIT(29)</div><div class='del'>-#define BIT_GTINT4_MSK BIT(28)</div><div class='del'>-#define BIT_GTINT3_MSK BIT(27)</div><div class='del'>-#define BIT_TXBCN0ERR_MSK BIT(26)</div><div class='del'>-#define BIT_TXBCN0OK_MSK BIT(25)</div><div class='del'>-#define BIT_TSF_BIT32_TOGGLE_MSK BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT0_MSK BIT(20)</div><div class='del'>-#define BIT_BCNDERR0_MSK BIT(16)</div><div class='del'>-#define BIT_HSISR_IND_ON_INT_MSK BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR0				(Offset 0x00B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT_E_MSK BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR0				(Offset 0x00B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTWEND_MSK BIT(12)</div><div class='del'>-#define BIT_HISR1_IND_MSK BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR0				(Offset 0x00B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_C2HCMD_MSK BIT(10)</div><div class='del'>-#define BIT_CPWM2_MSK BIT(9)</div><div class='del'>-#define BIT_CPWM_MSK BIT(8)</div><div class='del'>-#define BIT_HIGHDOK_MSK BIT(7)</div><div class='del'>-#define BIT_MGTDOK_MSK BIT(6)</div><div class='del'>-#define BIT_BKDOK_MSK BIT(5)</div><div class='del'>-#define BIT_BEDOK_MSK BIT(4)</div><div class='del'>-#define BIT_VIDOK_MSK BIT(3)</div><div class='del'>-#define BIT_VODOK_MSK BIT(2)</div><div class='del'>-#define BIT_RDU_MSK BIT(1)</div><div class='del'>-#define BIT_RXOK_MSK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0				(Offset 0x00B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIMEOUT_INTERRUPT2 BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0				(Offset 0x00B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIMEOUT_INTERRUTP1 BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0				(Offset 0x00B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_PSTIMEOUT BIT(29)</div><div class='del'>-#define BIT_GTINT4 BIT(28)</div><div class='del'>-#define BIT_GTINT3 BIT(27)</div><div class='del'>-#define BIT_TXBCN0ERR BIT(26)</div><div class='del'>-#define BIT_TXBCN0OK BIT(25)</div><div class='del'>-#define BIT_TSF_BIT32_TOGGLE BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT0 BIT(20)</div><div class='del'>-#define BIT_BCNDERR0 BIT(16)</div><div class='del'>-#define BIT_HSISR_IND_ON_INT BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0				(Offset 0x00B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT_E BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0				(Offset 0x00B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTWEND BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0				(Offset 0x00B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_HISR1_IND_INT BIT(11)</div><div class='del'>-#define BIT_C2HCMD BIT(10)</div><div class='del'>-#define BIT_CPWM2 BIT(9)</div><div class='del'>-#define BIT_CPWM BIT(8)</div><div class='del'>-#define BIT_HIGHDOK BIT(7)</div><div class='del'>-#define BIT_MGTDOK BIT(6)</div><div class='del'>-#define BIT_BKDOK BIT(5)</div><div class='del'>-#define BIT_BEDOK BIT(4)</div><div class='del'>-#define BIT_VIDOK BIT(3)</div><div class='del'>-#define BIT_VODOK BIT(2)</div><div class='del'>-#define BIT_RDU BIT(1)</div><div class='del'>-#define BIT_RXOK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTON_STS_UPDATE_MASK BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_MCU_ERR_MASK BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT7__MSK BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT6__MSK BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT5__MSK BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT4__MSK BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT3_MSK BIT(23)</div><div class='del'>-#define BIT_BCNDMAINT2_MSK BIT(22)</div><div class='del'>-#define BIT_BCNDMAINT1_MSK BIT(21)</div><div class='del'>-#define BIT_BCNDERR7_MSK BIT(20)</div><div class='del'>-#define BIT_BCNDERR6_MSK BIT(19)</div><div class='del'>-#define BIT_BCNDERR5_MSK BIT(18)</div><div class='del'>-#define BIT_BCNDERR4_MSK BIT(17)</div><div class='del'>-#define BIT_BCNDERR3_MSK BIT(16)</div><div class='del'>-#define BIT_BCNDERR2_MSK BIT(15)</div><div class='del'>-#define BIT_BCNDERR1_MSK BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_ATIMEND_E_MSK BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_ATIMEND__MSK BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_TXERR_MSK BIT(11)</div><div class='del'>-#define BIT_RXERR_MSK BIT(10)</div><div class='del'>-#define BIT_TXFOVW_MSK BIT(9)</div><div class='del'>-#define BIT_FOVW_MSK BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1				(Offset 0x00B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_MSK BIT(5)</div><div class='del'>-#define BIT_PS_TIMER_C_MSK BIT(4)</div><div class='del'>-#define BIT_PS_TIMER_B_MSK BIT(3)</div><div class='del'>-#define BIT_PS_TIMER_A_MSK BIT(2)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_MSK BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1				(Offset 0x00BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_BTON_STS_UPDATE_INT BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1				(Offset 0x00BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_MCU_ERR BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1				(Offset 0x00BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT7 BIT(27)</div><div class='del'>-#define BIT_BCNDMAINT6 BIT(26)</div><div class='del'>-#define BIT_BCNDMAINT5 BIT(25)</div><div class='del'>-#define BIT_BCNDMAINT4 BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT3 BIT(23)</div><div class='del'>-#define BIT_BCNDMAINT2 BIT(22)</div><div class='del'>-#define BIT_BCNDMAINT1 BIT(21)</div><div class='del'>-#define BIT_BCNDERR7 BIT(20)</div><div class='del'>-#define BIT_BCNDERR6 BIT(19)</div><div class='del'>-#define BIT_BCNDERR5 BIT(18)</div><div class='del'>-#define BIT_BCNDERR4 BIT(17)</div><div class='del'>-#define BIT_BCNDERR3 BIT(16)</div><div class='del'>-#define BIT_BCNDERR2 BIT(15)</div><div class='del'>-#define BIT_BCNDERR1 BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1				(Offset 0x00BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_ATIMEND_E BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1				(Offset 0x00BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_ATIMEND BIT(12)</div><div class='del'>-#define BIT_TXERR_INT BIT(11)</div><div class='del'>-#define BIT_RXERR_INT BIT(10)</div><div class='del'>-#define BIT_TXFOVW BIT(9)</div><div class='del'>-#define BIT_FOVW BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1				(Offset 0x00BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE BIT(5)</div><div class='del'>-#define BIT_PS_TIMER_C BIT(4)</div><div class='del'>-#define BIT_PS_TIMER_B BIT(3)</div><div class='del'>-#define BIT_PS_TIMER_A BIT(2)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_ERR_RPT			(Offset 0x102500C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_HR_FF_OVF BIT(6)</div><div class='del'>-#define BIT_HR_FF_UDN BIT(5)</div><div class='del'>-#define BIT_TXDMA_BUSY_ERR BIT(4)</div><div class='del'>-#define BIT_TXDMA_VLD_ERR BIT(3)</div><div class='del'>-#define BIT_QSEL_UNKNOWN_ERR BIT(2)</div><div class='del'>-#define BIT_QSEL_MIS_ERR BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBG_PORT_SEL			(Offset 0x00C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DEBUG_ST 0</div><div class='del'>-#define BIT_MASK_DEBUG_ST 0xffffffffL</div><div class='del'>-#define BIT_DEBUG_ST(x) (((x) &amp; BIT_MASK_DEBUG_ST) &lt;&lt; BIT_SHIFT_DEBUG_ST)</div><div class='del'>-#define BIT_GET_DEBUG_ST(x) (((x) &gt;&gt; BIT_SHIFT_DEBUG_ST) &amp; BIT_MASK_DEBUG_ST)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_ERR_RPT			(Offset 0x102500C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_OVERRD_ERR BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CMD_ERRCNT			(Offset 0x102500C1) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMD_CRC_ERR_CNT 0</div><div class='del'>-#define BIT_MASK_CMD_CRC_ERR_CNT 0xff</div><div class='del'>-#define BIT_CMD_CRC_ERR_CNT(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMD_CRC_ERR_CNT) &lt;&lt; BIT_SHIFT_CMD_CRC_ERR_CNT)</div><div class='del'>-#define BIT_GET_CMD_CRC_ERR_CNT(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMD_CRC_ERR_CNT) &amp; BIT_MASK_CMD_CRC_ERR_CNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_DATA_ERRCNT			(Offset 0x102500C2) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DATA_CRC_ERR_CNT 0</div><div class='del'>-#define BIT_MASK_DATA_CRC_ERR_CNT 0xff</div><div class='del'>-#define BIT_DATA_CRC_ERR_CNT(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DATA_CRC_ERR_CNT) &lt;&lt; BIT_SHIFT_DATA_CRC_ERR_CNT)</div><div class='del'>-#define BIT_GET_DATA_CRC_ERR_CNT(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DATA_CRC_ERR_CNT) &amp; BIT_MASK_DATA_CRC_ERR_CNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB3_USB2_TRANSITION BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB23_SW_MODE_V1 18</div><div class='del'>-#define BIT_MASK_USB23_SW_MODE_V1 0x3</div><div class='del'>-#define BIT_USB23_SW_MODE_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB23_SW_MODE_V1) &lt;&lt; BIT_SHIFT_USB23_SW_MODE_V1)</div><div class='del'>-#define BIT_GET_USB23_SW_MODE_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB23_SW_MODE_V1) &amp; BIT_MASK_USB23_SW_MODE_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_NO_PDN_CHIPOFF_V1 BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_RSM_EN_V1 BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_LD_B12V_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_EECS_IOSEL_V1 BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_EECS_DATA_O_V1 BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_EECS_DATA_I_V1 BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_EESK_IOSEL_V1 BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_EESK_DATA_O_V1 BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2				(Offset 0x00C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_EESK_DATA_I_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CMD_ERR_CONTENT		(Offset 0x102500C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_CMD_ERR_CONTENT 0</div><div class='del'>-#define BIT_MASK_SDIO_CMD_ERR_CONTENT 0xffffffffffL</div><div class='del'>-#define BIT_SDIO_CMD_ERR_CONTENT(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_CMD_ERR_CONTENT)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SDIO_CMD_ERR_CONTENT)</div><div class='del'>-#define BIT_GET_SDIO_CMD_ERR_CONTENT(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_CMD_ERR_CONTENT) &amp;                             \</div><div class='del'>-	 BIT_MASK_SDIO_CMD_ERR_CONTENT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CRC_ERR_IDX			(Offset 0x102500C9) */</div><div class='del'>-</div><div class='del'>-#define BIT_D3_CRC_ERR BIT(4)</div><div class='del'>-#define BIT_D2_CRC_ERR BIT(3)</div><div class='del'>-#define BIT_D1_CRC_ERR BIT(2)</div><div class='del'>-#define BIT_D0_CRC_ERR BIT(1)</div><div class='del'>-#define BIT_CMD_CRC_ERR BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_DATA_CRC			(Offset 0x102500CA) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_DATA_CRC 0</div><div class='del'>-#define BIT_MASK_SDIO_DATA_CRC 0xff</div><div class='del'>-#define BIT_SDIO_DATA_CRC(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_DATA_CRC) &lt;&lt; BIT_SHIFT_SDIO_DATA_CRC)</div><div class='del'>-#define BIT_GET_SDIO_DATA_CRC(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_DATA_CRC) &amp; BIT_MASK_SDIO_DATA_CRC)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_DATA_REPLY_TIME		(Offset 0x102500CB) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_DATA_REPLY_TIME 0</div><div class='del'>-#define BIT_MASK_SDIO_DATA_REPLY_TIME 0x7</div><div class='del'>-#define BIT_SDIO_DATA_REPLY_TIME(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_DATA_REPLY_TIME)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SDIO_DATA_REPLY_TIME)</div><div class='del'>-#define BIT_GET_SDIO_DATA_REPLY_TIME(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_DATA_REPLY_TIME) &amp;                             \</div><div class='del'>-	 BIT_MASK_SDIO_DATA_REPLY_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL2			(Offset 0x00CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EFUSE_BURN_GNT 24</div><div class='del'>-#define BIT_MASK_EFUSE_BURN_GNT 0xff</div><div class='del'>-#define BIT_EFUSE_BURN_GNT(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_EFUSE_BURN_GNT) &lt;&lt; BIT_SHIFT_EFUSE_BURN_GNT)</div><div class='del'>-#define BIT_GET_EFUSE_BURN_GNT(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EFUSE_BURN_GNT) &amp; BIT_MASK_EFUSE_BURN_GNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL2			(Offset 0x00CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_STOP_WL_PMC BIT(9)</div><div class='del'>-#define BIT_STOP_SYM_PMC BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL2			(Offset 0x00CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_REG_RST_WLPMC BIT(5)</div><div class='del'>-#define BIT_REG_RST_PD12N BIT(4)</div><div class='del'>-#define BIT_SYSON_DIS_WLREG_WRMSK BIT(3)</div><div class='del'>-#define BIT_SYSON_DIS_PMCREG_WRMSK BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_REG_ARB 0</div><div class='del'>-#define BIT_MASK_SYSON_REG_ARB 0x3</div><div class='del'>-#define BIT_SYSON_REG_ARB(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_REG_ARB) &lt;&lt; BIT_SHIFT_SYSON_REG_ARB)</div><div class='del'>-#define BIT_GET_SYSON_REG_ARB(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_REG_ARB) &amp; BIT_MASK_SYSON_REG_ARB)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_USB_DIS BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_PCI_DIS BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_BT_DIS BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_WL_DIS BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BIST_RPT_SEL 16</div><div class='del'>-#define BIT_MASK_BIST_RPT_SEL 0xf</div><div class='del'>-#define BIT_BIST_RPT_SEL(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BIST_RPT_SEL) &lt;&lt; BIT_SHIFT_BIST_RPT_SEL)</div><div class='del'>-#define BIT_GET_BIST_RPT_SEL(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BIST_RPT_SEL) &amp; BIT_MASK_BIST_RPT_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_RESUME_PS BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_RESUME BIT(3)</div><div class='del'>-#define BIT_BIST_NORMAL BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL				(Offset 0x00D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_RSTN BIT(1)</div><div class='del'>-#define BIT_BIST_CLK_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_RPT				(Offset 0x00D4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIST_REPORT 0</div><div class='del'>-#define BIT_MASK_MBIST_REPORT 0xffffffffL</div><div class='del'>-#define BIT_MBIST_REPORT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIST_REPORT) &lt;&lt; BIT_SHIFT_MBIST_REPORT)</div><div class='del'>-#define BIT_GET_MBIST_REPORT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIST_REPORT) &amp; BIT_MASK_MBIST_REPORT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL				(Offset 0x00D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_UMEM_RME BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL				(Offset 0x00D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_SPRAM 28</div><div class='del'>-#define BIT_MASK_BT_SPRAM 0x3</div><div class='del'>-#define BIT_BT_SPRAM(x) (((x) &amp; BIT_MASK_BT_SPRAM) &lt;&lt; BIT_SHIFT_BT_SPRAM)</div><div class='del'>-#define BIT_GET_BT_SPRAM(x) (((x) &gt;&gt; BIT_SHIFT_BT_SPRAM) &amp; BIT_MASK_BT_SPRAM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL				(Offset 0x00D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_ROM 24</div><div class='del'>-#define BIT_MASK_BT_ROM 0xf</div><div class='del'>-#define BIT_BT_ROM(x) (((x) &amp; BIT_MASK_BT_ROM) &lt;&lt; BIT_SHIFT_BT_ROM)</div><div class='del'>-#define BIT_GET_BT_ROM(x) (((x) &gt;&gt; BIT_SHIFT_BT_ROM) &amp; BIT_MASK_BT_ROM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCI_DPRAM 10</div><div class='del'>-#define BIT_MASK_PCI_DPRAM 0x3</div><div class='del'>-#define BIT_PCI_DPRAM(x) (((x) &amp; BIT_MASK_PCI_DPRAM) &lt;&lt; BIT_SHIFT_PCI_DPRAM)</div><div class='del'>-#define BIT_GET_PCI_DPRAM(x) (((x) &gt;&gt; BIT_SHIFT_PCI_DPRAM) &amp; BIT_MASK_PCI_DPRAM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL				(Offset 0x00D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCI_SPRAM 8</div><div class='del'>-#define BIT_MASK_PCI_SPRAM 0x3</div><div class='del'>-#define BIT_PCI_SPRAM(x) (((x) &amp; BIT_MASK_PCI_SPRAM) &lt;&lt; BIT_SHIFT_PCI_SPRAM)</div><div class='del'>-#define BIT_GET_PCI_SPRAM(x) (((x) &gt;&gt; BIT_SHIFT_PCI_SPRAM) &amp; BIT_MASK_PCI_SPRAM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SPRAM 6</div><div class='del'>-#define BIT_MASK_USB_SPRAM 0x3</div><div class='del'>-#define BIT_USB_SPRAM(x) (((x) &amp; BIT_MASK_USB_SPRAM) &lt;&lt; BIT_SHIFT_USB_SPRAM)</div><div class='del'>-#define BIT_GET_USB_SPRAM(x) (((x) &gt;&gt; BIT_SHIFT_USB_SPRAM) &amp; BIT_MASK_USB_SPRAM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL				(Offset 0x00D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SPRF 4</div><div class='del'>-#define BIT_MASK_USB_SPRF 0x3</div><div class='del'>-#define BIT_USB_SPRF(x) (((x) &amp; BIT_MASK_USB_SPRF) &lt;&lt; BIT_SHIFT_USB_SPRF)</div><div class='del'>-#define BIT_GET_USB_SPRF(x) (((x) &gt;&gt; BIT_SHIFT_USB_SPRF) &amp; BIT_MASK_USB_SPRF)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL				(Offset 0x00D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCU_ROM 0</div><div class='del'>-#define BIT_MASK_MCU_ROM 0xf</div><div class='del'>-#define BIT_MCU_ROM(x) (((x) &amp; BIT_MASK_MCU_ROM) &lt;&lt; BIT_SHIFT_MCU_ROM)</div><div class='del'>-#define BIT_GET_MCU_ROM(x) (((x) &gt;&gt; BIT_SHIFT_MCU_ROM) &amp; BIT_MASK_MCU_ROM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL8				(Offset 0x00DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYN_AGPIO BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL8				(Offset 0x00DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_LP BIT(4)</div><div class='del'>-#define BIT_XTAL_GM_SEP BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL8				(Offset 0x00DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_SEL_TOK 0</div><div class='del'>-#define BIT_MASK_XTAL_SEL_TOK 0x7</div><div class='del'>-#define BIT_XTAL_SEL_TOK(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_SEL_TOK) &lt;&lt; BIT_SHIFT_XTAL_SEL_TOK)</div><div class='del'>-#define BIT_GET_XTAL_SEL_TOK(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_SEL_TOK) &amp; BIT_MASK_XTAL_SEL_TOK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USB_SIE_INTF			(Offset 0x00E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_RD_SEL BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USB_SIE_INTF			(Offset 0x00E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_SIE_INTF_WE_V1 BIT(30)</div><div class='del'>-#define BIT_USB_SIE_INTF_BYIOREG_V1 BIT(29)</div><div class='del'>-#define BIT_USB_SIE_SELECT BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USB_SIE_INTF			(Offset 0x00E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SIE_INTF_ADDR_V1 16</div><div class='del'>-#define BIT_MASK_USB_SIE_INTF_ADDR_V1 0x1ff</div><div class='del'>-#define BIT_USB_SIE_INTF_ADDR_V1(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SIE_INTF_ADDR_V1)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_SIE_INTF_ADDR_V1)</div><div class='del'>-#define BIT_GET_USB_SIE_INTF_ADDR_V1(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SIE_INTF_ADDR_V1) &amp;                             \</div><div class='del'>-	 BIT_MASK_USB_SIE_INTF_ADDR_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USB_SIE_INTF			(Offset 0x00E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SIE_INTF_RD 8</div><div class='del'>-#define BIT_MASK_USB_SIE_INTF_RD 0xff</div><div class='del'>-#define BIT_USB_SIE_INTF_RD(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SIE_INTF_RD) &lt;&lt; BIT_SHIFT_USB_SIE_INTF_RD)</div><div class='del'>-#define BIT_GET_USB_SIE_INTF_RD(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SIE_INTF_RD) &amp; BIT_MASK_USB_SIE_INTF_RD)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SIE_INTF_WD 0</div><div class='del'>-#define BIT_MASK_USB_SIE_INTF_WD 0xff</div><div class='del'>-#define BIT_USB_SIE_INTF_WD(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SIE_INTF_WD) &lt;&lt; BIT_SHIFT_USB_SIE_INTF_WD)</div><div class='del'>-#define BIT_GET_USB_SIE_INTF_WD(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SIE_INTF_WD) &amp; BIT_MASK_USB_SIE_INTF_WD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIO_INTF			(Offset 0x00E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_MIO_BYIOREG BIT(13)</div><div class='del'>-#define BIT_PCIE_MIO_RE BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MIO_WE 8</div><div class='del'>-#define BIT_MASK_PCIE_MIO_WE 0xf</div><div class='del'>-#define BIT_PCIE_MIO_WE(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MIO_WE) &lt;&lt; BIT_SHIFT_PCIE_MIO_WE)</div><div class='del'>-#define BIT_GET_PCIE_MIO_WE(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MIO_WE) &amp; BIT_MASK_PCIE_MIO_WE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MIO_ADDR 0</div><div class='del'>-#define BIT_MASK_PCIE_MIO_ADDR 0xff</div><div class='del'>-#define BIT_PCIE_MIO_ADDR(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MIO_ADDR) &lt;&lt; BIT_SHIFT_PCIE_MIO_ADDR)</div><div class='del'>-#define BIT_GET_PCIE_MIO_ADDR(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MIO_ADDR) &amp; BIT_MASK_PCIE_MIO_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIO_INTD			(Offset 0x00E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MIO_DATA 0</div><div class='del'>-#define BIT_MASK_PCIE_MIO_DATA 0xffffffffL</div><div class='del'>-#define BIT_PCIE_MIO_DATA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MIO_DATA) &lt;&lt; BIT_SHIFT_PCIE_MIO_DATA)</div><div class='del'>-#define BIT_GET_PCIE_MIO_DATA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MIO_DATA) &amp; BIT_MASK_PCIE_MIO_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLRF1				(Offset 0x00EC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLRF1_CTRL 24</div><div class='del'>-#define BIT_MASK_WLRF1_CTRL 0xff</div><div class='del'>-#define BIT_WLRF1_CTRL(x) (((x) &amp; BIT_MASK_WLRF1_CTRL) &lt;&lt; BIT_SHIFT_WLRF1_CTRL)</div><div class='del'>-#define BIT_GET_WLRF1_CTRL(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLRF1_CTRL) &amp; BIT_MASK_WLRF1_CTRL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRP_ICFG 28</div><div class='del'>-#define BIT_MASK_TRP_ICFG 0xf</div><div class='del'>-#define BIT_TRP_ICFG(x) (((x) &amp; BIT_MASK_TRP_ICFG) &lt;&lt; BIT_SHIFT_TRP_ICFG)</div><div class='del'>-#define BIT_GET_TRP_ICFG(x) (((x) &gt;&gt; BIT_SHIFT_TRP_ICFG) &amp; BIT_MASK_TRP_ICFG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_RF_TYPE_ID BIT(27)</div><div class='del'>-#define BIT_BD_HCI_SEL BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BD_PKG_SEL BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SPSLDO_SEL BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_RTL_ID BIT(23)</div><div class='del'>-#define BIT_PAD_HWPD_IDN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_TESTMODE BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VENDOR_ID 16</div><div class='del'>-#define BIT_MASK_VENDOR_ID 0xf</div><div class='del'>-#define BIT_VENDOR_ID(x) (((x) &amp; BIT_MASK_VENDOR_ID) &lt;&lt; BIT_SHIFT_VENDOR_ID)</div><div class='del'>-#define BIT_GET_VENDOR_ID(x) (((x) &gt;&gt; BIT_SHIFT_VENDOR_ID) &amp; BIT_MASK_VENDOR_ID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CHIP_VER 12</div><div class='del'>-#define BIT_MASK_CHIP_VER 0xf</div><div class='del'>-#define BIT_CHIP_VER(x) (((x) &amp; BIT_MASK_CHIP_VER) &lt;&lt; BIT_SHIFT_CHIP_VER)</div><div class='del'>-#define BIT_GET_CHIP_VER(x) (((x) &gt;&gt; BIT_SHIFT_CHIP_VER) &amp; BIT_MASK_CHIP_VER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BD_MAC3 BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BD_MAC1 BIT(10)</div><div class='del'>-#define BIT_BD_MAC2 BIT(9)</div><div class='del'>-#define BIT_SIC_IDLE BIT(8)</div><div class='del'>-#define BIT_SW_OFFLOAD_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_OCP_SHUTDN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_V15_VLD BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIRSTB BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCLK_VLD BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_UCLK_VLD BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_ACLK_VLD BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1				(Offset 0x00F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_XCLK_VLD BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RF_RL_ID 28</div><div class='del'>-#define BIT_MASK_RF_RL_ID 0xf</div><div class='del'>-#define BIT_RF_RL_ID(x) (((x) &amp; BIT_MASK_RF_RL_ID) &lt;&lt; BIT_SHIFT_RF_RL_ID)</div><div class='del'>-#define BIT_GET_RF_RL_ID(x) (((x) &gt;&gt; BIT_SHIFT_RF_RL_ID) &amp; BIT_MASK_RF_RL_ID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_HPHY_ICFG BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SEL_0XC0 16</div><div class='del'>-#define BIT_MASK_SEL_0XC0 0x3</div><div class='del'>-#define BIT_SEL_0XC0(x) (((x) &amp; BIT_MASK_SEL_0XC0) &lt;&lt; BIT_SHIFT_SEL_0XC0)</div><div class='del'>-#define BIT_GET_SEL_0XC0(x) (((x) &gt;&gt; BIT_SHIFT_SEL_0XC0) &amp; BIT_MASK_SEL_0XC0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HCI_SEL_V3 12</div><div class='del'>-#define BIT_MASK_HCI_SEL_V3 0x7</div><div class='del'>-#define BIT_HCI_SEL_V3(x) (((x) &amp; BIT_MASK_HCI_SEL_V3) &lt;&lt; BIT_SHIFT_HCI_SEL_V3)</div><div class='del'>-#define BIT_GET_HCI_SEL_V3(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HCI_SEL_V3) &amp; BIT_MASK_HCI_SEL_V3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_USB_OPERATION_MODE BIT(10)</div><div class='del'>-#define BIT_BT_PDN BIT(9)</div><div class='del'>-#define BIT_AUTO_WLPON BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_WL_MODE BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_PKG_SEL_HCI BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PAD_HCI_SEL_V1 3</div><div class='del'>-#define BIT_MASK_PAD_HCI_SEL_V1 0x7</div><div class='del'>-#define BIT_PAD_HCI_SEL_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PAD_HCI_SEL_V1) &lt;&lt; BIT_SHIFT_PAD_HCI_SEL_V1)</div><div class='del'>-#define BIT_GET_PAD_HCI_SEL_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PAD_HCI_SEL_V1) &amp; BIT_MASK_PAD_HCI_SEL_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1				(Offset 0x00F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EFS_HCI_SEL_V1 0</div><div class='del'>-#define BIT_MASK_EFS_HCI_SEL_V1 0x7</div><div class='del'>-#define BIT_EFS_HCI_SEL_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_EFS_HCI_SEL_V1) &lt;&lt; BIT_SHIFT_EFS_HCI_SEL_V1)</div><div class='del'>-#define BIT_GET_EFS_HCI_SEL_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EFS_HCI_SEL_V1) &amp; BIT_MASK_EFS_HCI_SEL_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS2				(Offset 0x00F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SIO_ALDN BIT(19)</div><div class='del'>-#define BIT_USB_ALDN BIT(18)</div><div class='del'>-#define BIT_PCI_ALDN BIT(17)</div><div class='del'>-#define BIT_SYS_ALDN BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EPVID1 8</div><div class='del'>-#define BIT_MASK_EPVID1 0xff</div><div class='del'>-#define BIT_EPVID1(x) (((x) &amp; BIT_MASK_EPVID1) &lt;&lt; BIT_SHIFT_EPVID1)</div><div class='del'>-#define BIT_GET_EPVID1(x) (((x) &gt;&gt; BIT_SHIFT_EPVID1) &amp; BIT_MASK_EPVID1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EPVID0 0</div><div class='del'>-#define BIT_MASK_EPVID0 0xff</div><div class='del'>-#define BIT_EPVID0(x) (((x) &amp; BIT_MASK_EPVID0) &lt;&lt; BIT_SHIFT_EPVID0)</div><div class='del'>-#define BIT_GET_EPVID0(x) (((x) &gt;&gt; BIT_SHIFT_EPVID0) &amp; BIT_MASK_EPVID0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG2				(Offset 0x00FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_HCI_SEL_EMBEDDED BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG2				(Offset 0x00FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_ID 0</div><div class='del'>-#define BIT_MASK_HW_ID 0xff</div><div class='del'>-#define BIT_HW_ID(x) (((x) &amp; BIT_MASK_HW_ID) &lt;&lt; BIT_SHIFT_HW_ID)</div><div class='del'>-#define BIT_GET_HW_ID(x) (((x) &gt;&gt; BIT_SHIFT_HW_ID) &amp; BIT_MASK_HW_ID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CR					(Offset 0x0100) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LBMODE 24</div><div class='del'>-#define BIT_MASK_LBMODE 0x1f</div><div class='del'>-#define BIT_LBMODE(x) (((x) &amp; BIT_MASK_LBMODE) &lt;&lt; BIT_SHIFT_LBMODE)</div><div class='del'>-#define BIT_GET_LBMODE(x) (((x) &gt;&gt; BIT_SHIFT_LBMODE) &amp; BIT_MASK_LBMODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE1 18</div><div class='del'>-#define BIT_MASK_NETYPE1 0x3</div><div class='del'>-#define BIT_NETYPE1(x) (((x) &amp; BIT_MASK_NETYPE1) &lt;&lt; BIT_SHIFT_NETYPE1)</div><div class='del'>-#define BIT_GET_NETYPE1(x) (((x) &gt;&gt; BIT_SHIFT_NETYPE1) &amp; BIT_MASK_NETYPE1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE0 16</div><div class='del'>-#define BIT_MASK_NETYPE0 0x3</div><div class='del'>-#define BIT_NETYPE0(x) (((x) &amp; BIT_MASK_NETYPE0) &lt;&lt; BIT_SHIFT_NETYPE0)</div><div class='del'>-#define BIT_GET_NETYPE0(x) (((x) &gt;&gt; BIT_SHIFT_NETYPE0) &amp; BIT_MASK_NETYPE0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CR					(Offset 0x0100) */</div><div class='del'>-</div><div class='del'>-#define BIT_I2C_MAILBOX_EN BIT(12)</div><div class='del'>-#define BIT_SHCUT_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CR					(Offset 0x0100) */</div><div class='del'>-</div><div class='del'>-#define BIT_32K_CAL_TMR_EN BIT(10)</div><div class='del'>-#define BIT_MAC_SEC_EN BIT(9)</div><div class='del'>-#define BIT_ENSWBCN BIT(8)</div><div class='del'>-#define BIT_MACRXEN BIT(7)</div><div class='del'>-#define BIT_MACTXEN BIT(6)</div><div class='del'>-#define BIT_SCHEDULE_EN BIT(5)</div><div class='del'>-#define BIT_PROTOCOL_EN BIT(4)</div><div class='del'>-#define BIT_RXDMA_EN BIT(3)</div><div class='del'>-#define BIT_TXDMA_EN BIT(2)</div><div class='del'>-#define BIT_HCI_RXDMA_EN BIT(1)</div><div class='del'>-#define BIT_HCI_TXDMA_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_BUFF_ACCESS_CTRL		(Offset 0x0106) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_BUFF_ACCESS_CTRL 0</div><div class='del'>-#define BIT_MASK_PKT_BUFF_ACCESS_CTRL 0xff</div><div class='del'>-#define BIT_PKT_BUFF_ACCESS_CTRL(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_BUFF_ACCESS_CTRL)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKT_BUFF_ACCESS_CTRL)</div><div class='del'>-#define BIT_GET_PKT_BUFF_ACCESS_CTRL(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_BUFF_ACCESS_CTRL) &amp;                             \</div><div class='del'>-	 BIT_MASK_PKT_BUFF_ACCESS_CTRL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSF_CLK_STATE			(Offset 0x0108) */</div><div class='del'>-</div><div class='del'>-#define BIT_TSF_CLK_STABLE BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_I2C_M_BUS_GNT_FW 4</div><div class='del'>-#define BIT_MASK_I2C_M_BUS_GNT_FW 0x7</div><div class='del'>-#define BIT_I2C_M_BUS_GNT_FW(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_I2C_M_BUS_GNT_FW) &lt;&lt; BIT_SHIFT_I2C_M_BUS_GNT_FW)</div><div class='del'>-#define BIT_GET_I2C_M_BUS_GNT_FW(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_I2C_M_BUS_GNT_FW) &amp; BIT_MASK_I2C_M_BUS_GNT_FW)</div><div class='del'>-</div><div class='del'>-#define BIT_I2C_M_GNT_FW BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_I2C_M_SPEED 1</div><div class='del'>-#define BIT_MASK_I2C_M_SPEED 0x3</div><div class='del'>-#define BIT_I2C_M_SPEED(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_I2C_M_SPEED) &lt;&lt; BIT_SHIFT_I2C_M_SPEED)</div><div class='del'>-#define BIT_GET_I2C_M_SPEED(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_I2C_M_SPEED) &amp; BIT_MASK_I2C_M_SPEED)</div><div class='del'>-</div><div class='del'>-#define BIT_I2C_M_UNLOCK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_PQ_MAP			(Offset 0x010C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_HIQ_MAP 14</div><div class='del'>-#define BIT_MASK_TXDMA_HIQ_MAP 0x3</div><div class='del'>-#define BIT_TXDMA_HIQ_MAP(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_HIQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_HIQ_MAP)</div><div class='del'>-#define BIT_GET_TXDMA_HIQ_MAP(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_HIQ_MAP) &amp; BIT_MASK_TXDMA_HIQ_MAP)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_MGQ_MAP 12</div><div class='del'>-#define BIT_MASK_TXDMA_MGQ_MAP 0x3</div><div class='del'>-#define BIT_TXDMA_MGQ_MAP(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_MGQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_MGQ_MAP)</div><div class='del'>-#define BIT_GET_TXDMA_MGQ_MAP(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_MGQ_MAP) &amp; BIT_MASK_TXDMA_MGQ_MAP)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_BKQ_MAP 10</div><div class='del'>-#define BIT_MASK_TXDMA_BKQ_MAP 0x3</div><div class='del'>-#define BIT_TXDMA_BKQ_MAP(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_BKQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_BKQ_MAP)</div><div class='del'>-#define BIT_GET_TXDMA_BKQ_MAP(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_BKQ_MAP) &amp; BIT_MASK_TXDMA_BKQ_MAP)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_BEQ_MAP 8</div><div class='del'>-#define BIT_MASK_TXDMA_BEQ_MAP 0x3</div><div class='del'>-#define BIT_TXDMA_BEQ_MAP(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_BEQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_BEQ_MAP)</div><div class='del'>-#define BIT_GET_TXDMA_BEQ_MAP(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_BEQ_MAP) &amp; BIT_MASK_TXDMA_BEQ_MAP)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_VIQ_MAP 6</div><div class='del'>-#define BIT_MASK_TXDMA_VIQ_MAP 0x3</div><div class='del'>-#define BIT_TXDMA_VIQ_MAP(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_VIQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_VIQ_MAP)</div><div class='del'>-#define BIT_GET_TXDMA_VIQ_MAP(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_VIQ_MAP) &amp; BIT_MASK_TXDMA_VIQ_MAP)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_VOQ_MAP 4</div><div class='del'>-#define BIT_MASK_TXDMA_VOQ_MAP 0x3</div><div class='del'>-#define BIT_TXDMA_VOQ_MAP(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_VOQ_MAP) &lt;&lt; BIT_SHIFT_TXDMA_VOQ_MAP)</div><div class='del'>-#define BIT_GET_TXDMA_VOQ_MAP(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_VOQ_MAP) &amp; BIT_MASK_TXDMA_VOQ_MAP)</div><div class='del'>-</div><div class='del'>-#define BIT_RXDMA_AGG_EN BIT(2)</div><div class='del'>-#define BIT_RXSHFT_EN BIT(1)</div><div class='del'>-#define BIT_RXDMA_ARBBW_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRXFF_BNDY				(Offset 0x0114) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFFOVFL_RSV_V2 8</div><div class='del'>-#define BIT_MASK_RXFFOVFL_RSV_V2 0xf</div><div class='del'>-#define BIT_RXFFOVFL_RSV_V2(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFFOVFL_RSV_V2) &lt;&lt; BIT_SHIFT_RXFFOVFL_RSV_V2)</div><div class='del'>-#define BIT_GET_RXFFOVFL_RSV_V2(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFFOVFL_RSV_V2) &amp; BIT_MASK_RXFFOVFL_RSV_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRXFF_BNDY				(Offset 0x0114) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKTBUF_PGBNDY 0</div><div class='del'>-#define BIT_MASK_TXPKTBUF_PGBNDY 0xff</div><div class='del'>-#define BIT_TXPKTBUF_PGBNDY(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKTBUF_PGBNDY) &lt;&lt; BIT_SHIFT_TXPKTBUF_PGBNDY)</div><div class='del'>-#define BIT_GET_TXPKTBUF_PGBNDY(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKTBUF_PGBNDY) &amp; BIT_MASK_TXPKTBUF_PGBNDY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRXFF_BNDY				(Offset 0x0114) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFF0_BNDY_V2 0</div><div class='del'>-#define BIT_MASK_RXFF0_BNDY_V2 0x3ffff</div><div class='del'>-#define BIT_RXFF0_BNDY_V2(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFF0_BNDY_V2) &lt;&lt; BIT_SHIFT_RXFF0_BNDY_V2)</div><div class='del'>-#define BIT_GET_RXFF0_BNDY_V2(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFF0_BNDY_V2) &amp; BIT_MASK_RXFF0_BNDY_V2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFF0_RDPTR_V2 0</div><div class='del'>-#define BIT_MASK_RXFF0_RDPTR_V2 0x3ffff</div><div class='del'>-#define BIT_RXFF0_RDPTR_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFF0_RDPTR_V2) &lt;&lt; BIT_SHIFT_RXFF0_RDPTR_V2)</div><div class='del'>-#define BIT_GET_RXFF0_RDPTR_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFF0_RDPTR_V2) &amp; BIT_MASK_RXFF0_RDPTR_V2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFF0_WTPTR_V2 0</div><div class='del'>-#define BIT_MASK_RXFF0_WTPTR_V2 0x3ffff</div><div class='del'>-#define BIT_RXFF0_WTPTR_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFF0_WTPTR_V2) &lt;&lt; BIT_SHIFT_RXFF0_WTPTR_V2)</div><div class='del'>-#define BIT_GET_RXFF0_WTPTR_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFF0_WTPTR_V2) &amp; BIT_MASK_RXFF0_WTPTR_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTA_I2C_MBOX			(Offset 0x0118) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_I2C_M_STATUS 8</div><div class='del'>-#define BIT_MASK_I2C_M_STATUS 0xf</div><div class='del'>-#define BIT_I2C_M_STATUS(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_I2C_M_STATUS) &lt;&lt; BIT_SHIFT_I2C_M_STATUS)</div><div class='del'>-#define BIT_GET_I2C_M_STATUS(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_I2C_M_STATUS) &amp; BIT_MASK_I2C_M_STATUS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR				(Offset 0x0120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_RXDMA2_DONE_INT_EN BIT(28)</div><div class='del'>-#define BIT_FS_RXDONE3_INT_EN BIT(27)</div><div class='del'>-#define BIT_FS_RXDONE2_INT_EN BIT(26)</div><div class='del'>-#define BIT_FS_RX_BCN_P4_INT_EN BIT(25)</div><div class='del'>-#define BIT_FS_RX_BCN_P3_INT_EN BIT(24)</div><div class='del'>-#define BIT_FS_RX_BCN_P2_INT_EN BIT(23)</div><div class='del'>-#define BIT_FS_RX_BCN_P1_INT_EN BIT(22)</div><div class='del'>-#define BIT_FS_RX_BCN_P0_INT_EN BIT(21)</div><div class='del'>-#define BIT_FS_RX_UMD0_INT_EN BIT(20)</div><div class='del'>-#define BIT_FS_RX_UMD1_INT_EN BIT(19)</div><div class='del'>-#define BIT_FS_RX_BMD0_INT_EN BIT(18)</div><div class='del'>-#define BIT_FS_RX_BMD1_INT_EN BIT(17)</div><div class='del'>-#define BIT_FS_RXDONE_INT_EN BIT(16)</div><div class='del'>-#define BIT_FS_WWLAN_INT_EN BIT(15)</div><div class='del'>-#define BIT_FS_SOUND_DONE_INT_EN BIT(14)</div><div class='del'>-#define BIT_FS_LP_STBY_INT_EN BIT(13)</div><div class='del'>-#define BIT_FS_TRL_MTR_INT_EN BIT(12)</div><div class='del'>-#define BIT_FS_BF1_PRETO_INT_EN BIT(11)</div><div class='del'>-#define BIT_FS_BF0_PRETO_INT_EN BIT(10)</div><div class='del'>-#define BIT_FS_PTCL_RELEASE_MACID_INT_EN BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR				(Offset 0x0120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_LTE_COEX_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR				(Offset 0x0120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_WLACTOFF_INT_EN BIT(5)</div><div class='del'>-#define BIT_FS_WLACTON_INT_EN BIT(4)</div><div class='del'>-#define BIT_FS_BTCMD_INT_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR				(Offset 0x0120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_REG_MAILBOX_TO_I2C_INT_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR				(Offset 0x0120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TRPC_TO_INT_EN_V1 BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR				(Offset 0x0120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_RPC_O_T_INT_EN_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR				(Offset 0x0124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_RXDMA2_DONE_INT BIT(28)</div><div class='del'>-#define BIT_FS_RXDONE3_INT BIT(27)</div><div class='del'>-#define BIT_FS_RXDONE2_INT BIT(26)</div><div class='del'>-#define BIT_FS_RX_BCN_P4_INT BIT(25)</div><div class='del'>-#define BIT_FS_RX_BCN_P3_INT BIT(24)</div><div class='del'>-#define BIT_FS_RX_BCN_P2_INT BIT(23)</div><div class='del'>-#define BIT_FS_RX_BCN_P1_INT BIT(22)</div><div class='del'>-#define BIT_FS_RX_BCN_P0_INT BIT(21)</div><div class='del'>-#define BIT_FS_RX_UMD0_INT BIT(20)</div><div class='del'>-#define BIT_FS_RX_UMD1_INT BIT(19)</div><div class='del'>-#define BIT_FS_RX_BMD0_INT BIT(18)</div><div class='del'>-#define BIT_FS_RX_BMD1_INT BIT(17)</div><div class='del'>-#define BIT_FS_RXDONE_INT BIT(16)</div><div class='del'>-#define BIT_FS_WWLAN_INT BIT(15)</div><div class='del'>-#define BIT_FS_SOUND_DONE_INT BIT(14)</div><div class='del'>-#define BIT_FS_LP_STBY_INT BIT(13)</div><div class='del'>-#define BIT_FS_TRL_MTR_INT BIT(12)</div><div class='del'>-#define BIT_FS_BF1_PRETO_INT BIT(11)</div><div class='del'>-#define BIT_FS_BF0_PRETO_INT BIT(10)</div><div class='del'>-#define BIT_FS_PTCL_RELEASE_MACID_INT BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR				(Offset 0x0124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_LTE_COEX_INT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR				(Offset 0x0124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_WLACTOFF_INT BIT(5)</div><div class='del'>-#define BIT_FS_WLACTON_INT BIT(4)</div><div class='del'>-#define BIT_FS_BCN_RX_INT_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR				(Offset 0x0124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MAILBOX_TO_I2C_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR				(Offset 0x0124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TRPC_TO_INT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR				(Offset 0x0124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_RPC_O_T_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPWM				(Offset 0x012C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPWM_TOGGLING BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPWM_MOD 24</div><div class='del'>-#define BIT_MASK_CPWM_MOD 0x7f</div><div class='del'>-#define BIT_CPWM_MOD(x) (((x) &amp; BIT_MASK_CPWM_MOD) &lt;&lt; BIT_SHIFT_CPWM_MOD)</div><div class='del'>-#define BIT_GET_CPWM_MOD(x) (((x) &gt;&gt; BIT_SHIFT_CPWM_MOD) &amp; BIT_MASK_CPWM_MOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB7_INT_EN BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB6_INT_EN BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB5_INT_EN BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB4_INT_EN BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB3_INT_EN BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB2_INT_EN BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB1_INT_EN BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB0_INT_EN BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB7_INT_EN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB6_INT_EN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB5_INT_EN BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB4_INT_EN BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB3_INT_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB2_INT_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB1_INT_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB0_INT_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_INT_EN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_SIFS_OVERSPEC_INT_EN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MGNTQ_RPTR_RELEASE_INT_EN BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MGNTQFF_TO_INT_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA1_LP_INT_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA1_HP_INT_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA0_LP_INT_EN BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA0_HP_INT_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TRXRPT_INT_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_C2H_W_READY_INT_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HRCV_INT_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_H2CCMD_INT_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXPKTIN_INT_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_ERRORHDL_INT_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXCCX_INT_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR				(Offset 0x0130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXCLOSE_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB7_INT BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB6_INT BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB5_INT BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB4_INT BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB3_INT BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB2_INT BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB1_INT BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNOK_MB0_INT BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB7_INT BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB6_INT BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB5_INT BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB4_INT BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB3_INT BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB2_INT BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB1_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXBCNERR_MB0_INT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_INT BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_SIFS_OVERSPEC_INT BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MGNTQ_RPTR_RELEASE_INT BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MGNTQFF_TO_INT BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA1_LP_INT BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA1_HP_INT BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA0_LP_INT BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_DDMA0_HP_INT BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TRXRPT_INT BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_C2H_W_READY_INT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_HRCV_INT BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_H2CCMD_INT BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXPKTIN_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_ERRORHDL_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXCCX_INT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR				(Offset 0x0134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXCLOSE_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_C_EARLY_INT_EN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_B_EARLY_INT_EN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_A_EARLY_INT_EN BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_EARLY_INT_EN BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_C_INT_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_B_INT_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_A_INT_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_INT_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PS_TIMEOUT2_EN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PS_TIMEOUT1_EN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PS_TIMEOUT0_EN BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT8_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT7_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT6_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT5_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT4_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT3_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT2_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT1_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR				(Offset 0x0138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT0_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_C_EARLY__INT BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_B_EARLY__INT BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_A_EARLY__INT BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_EARLY_INT BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_C_INT BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_B_INT BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_A_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_INT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PS_TIMEOUT2_INT BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PS_TIMEOUT1_INT BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_PS_TIMEOUT0_INT BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT8_INT BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT7_INT BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT6_INT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT5_INT BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT4_INT BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT3_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT2_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT1_INT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR				(Offset 0x013C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_GTINT0_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_CTRL			(Offset 0x0140) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_WRITE_EN 24</div><div class='del'>-#define BIT_MASK_PKTBUF_WRITE_EN 0xff</div><div class='del'>-#define BIT_PKTBUF_WRITE_EN(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_WRITE_EN) &lt;&lt; BIT_SHIFT_PKTBUF_WRITE_EN)</div><div class='del'>-#define BIT_GET_PKTBUF_WRITE_EN(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_WRITE_EN) &amp; BIT_MASK_PKTBUF_WRITE_EN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_CTRL			(Offset 0x0140) */</div><div class='del'>-</div><div class='del'>-#define BIT_TXRPTBUF_DBG BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_CTRL			(Offset 0x0140) */</div><div class='del'>-</div><div class='del'>-#define BIT_TXPKTBUF_DBG_V2 BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_CTRL			(Offset 0x0140) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXPKTBUF_DBG BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_CTRL			(Offset 0x0140) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_DBG_ADDR 0</div><div class='del'>-#define BIT_MASK_PKTBUF_DBG_ADDR 0x1fff</div><div class='del'>-#define BIT_PKTBUF_DBG_ADDR(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_DBG_ADDR) &lt;&lt; BIT_SHIFT_PKTBUF_DBG_ADDR)</div><div class='del'>-#define BIT_GET_PKTBUF_DBG_ADDR(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_DBG_ADDR) &amp; BIT_MASK_PKTBUF_DBG_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_DATA_L			(Offset 0x0144) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_DBG_DATA_L 0</div><div class='del'>-#define BIT_MASK_PKTBUF_DBG_DATA_L 0xffffffffL</div><div class='del'>-#define BIT_PKTBUF_DBG_DATA_L(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_DBG_DATA_L) &lt;&lt; BIT_SHIFT_PKTBUF_DBG_DATA_L)</div><div class='del'>-#define BIT_GET_PKTBUF_DBG_DATA_L(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_DBG_DATA_L) &amp; BIT_MASK_PKTBUF_DBG_DATA_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_DATA_H			(Offset 0x0148) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_DBG_DATA_H 0</div><div class='del'>-#define BIT_MASK_PKTBUF_DBG_DATA_H 0xffffffffL</div><div class='del'>-#define BIT_PKTBUF_DBG_DATA_H(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_DBG_DATA_H) &lt;&lt; BIT_SHIFT_PKTBUF_DBG_DATA_H)</div><div class='del'>-#define BIT_GET_PKTBUF_DBG_DATA_H(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_DBG_DATA_H) &amp; BIT_MASK_PKTBUF_DBG_DATA_H)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPWM2				(Offset 0x014C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_L0S_TO_RCVY_NUM 16</div><div class='del'>-#define BIT_MASK_L0S_TO_RCVY_NUM 0xff</div><div class='del'>-#define BIT_L0S_TO_RCVY_NUM(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_L0S_TO_RCVY_NUM) &lt;&lt; BIT_SHIFT_L0S_TO_RCVY_NUM)</div><div class='del'>-#define BIT_GET_L0S_TO_RCVY_NUM(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_L0S_TO_RCVY_NUM) &amp; BIT_MASK_L0S_TO_RCVY_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_CPWM2_TOGGLING BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPWM2_MOD 0</div><div class='del'>-#define BIT_MASK_CPWM2_MOD 0x7fff</div><div class='del'>-#define BIT_CPWM2_MOD(x) (((x) &amp; BIT_MASK_CPWM2_MOD) &lt;&lt; BIT_SHIFT_CPWM2_MOD)</div><div class='del'>-#define BIT_GET_CPWM2_MOD(x) (((x) &gt;&gt; BIT_SHIFT_CPWM2_MOD) &amp; BIT_MASK_CPWM2_MOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC0_CTRL				(Offset 0x0150) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC0INT_EN BIT(26)</div><div class='del'>-#define BIT_TC0MODE BIT(25)</div><div class='del'>-#define BIT_TC0EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC0DATA 0</div><div class='del'>-#define BIT_MASK_TC0DATA 0xffffff</div><div class='del'>-#define BIT_TC0DATA(x) (((x) &amp; BIT_MASK_TC0DATA) &lt;&lt; BIT_SHIFT_TC0DATA)</div><div class='del'>-#define BIT_GET_TC0DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC0DATA) &amp; BIT_MASK_TC0DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC1_CTRL				(Offset 0x0154) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC1INT_EN BIT(26)</div><div class='del'>-#define BIT_TC1MODE BIT(25)</div><div class='del'>-#define BIT_TC1EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC1DATA 0</div><div class='del'>-#define BIT_MASK_TC1DATA 0xffffff</div><div class='del'>-#define BIT_TC1DATA(x) (((x) &amp; BIT_MASK_TC1DATA) &lt;&lt; BIT_SHIFT_TC1DATA)</div><div class='del'>-#define BIT_GET_TC1DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC1DATA) &amp; BIT_MASK_TC1DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC2_CTRL				(Offset 0x0158) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC2INT_EN BIT(26)</div><div class='del'>-#define BIT_TC2MODE BIT(25)</div><div class='del'>-#define BIT_TC2EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC2DATA 0</div><div class='del'>-#define BIT_MASK_TC2DATA 0xffffff</div><div class='del'>-#define BIT_TC2DATA(x) (((x) &amp; BIT_MASK_TC2DATA) &lt;&lt; BIT_SHIFT_TC2DATA)</div><div class='del'>-#define BIT_GET_TC2DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC2DATA) &amp; BIT_MASK_TC2DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC3_CTRL				(Offset 0x015C) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC3INT_EN BIT(26)</div><div class='del'>-#define BIT_TC3MODE BIT(25)</div><div class='del'>-#define BIT_TC3EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC3DATA 0</div><div class='del'>-#define BIT_MASK_TC3DATA 0xffffff</div><div class='del'>-#define BIT_TC3DATA(x) (((x) &amp; BIT_MASK_TC3DATA) &lt;&lt; BIT_SHIFT_TC3DATA)</div><div class='del'>-#define BIT_GET_TC3DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC3DATA) &amp; BIT_MASK_TC3DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC4_CTRL				(Offset 0x0160) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC4INT_EN BIT(26)</div><div class='del'>-#define BIT_TC4MODE BIT(25)</div><div class='del'>-#define BIT_TC4EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC4DATA 0</div><div class='del'>-#define BIT_MASK_TC4DATA 0xffffff</div><div class='del'>-#define BIT_TC4DATA(x) (((x) &amp; BIT_MASK_TC4DATA) &lt;&lt; BIT_SHIFT_TC4DATA)</div><div class='del'>-#define BIT_GET_TC4DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC4DATA) &amp; BIT_MASK_TC4DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCUNIT_BASE				(Offset 0x0164) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TCUNIT_BASE 0</div><div class='del'>-#define BIT_MASK_TCUNIT_BASE 0x3fff</div><div class='del'>-#define BIT_TCUNIT_BASE(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_TCUNIT_BASE) &lt;&lt; BIT_SHIFT_TCUNIT_BASE)</div><div class='del'>-#define BIT_GET_TCUNIT_BASE(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TCUNIT_BASE) &amp; BIT_MASK_TCUNIT_BASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC5_CTRL				(Offset 0x0168) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC5INT_EN BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC5_CTRL				(Offset 0x0168) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC5MODE BIT(25)</div><div class='del'>-#define BIT_TC5EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC5DATA 0</div><div class='del'>-#define BIT_MASK_TC5DATA 0xffffff</div><div class='del'>-#define BIT_TC5DATA(x) (((x) &amp; BIT_MASK_TC5DATA) &lt;&lt; BIT_SHIFT_TC5DATA)</div><div class='del'>-#define BIT_GET_TC5DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC5DATA) &amp; BIT_MASK_TC5DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC6_CTRL				(Offset 0x016C) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC6INT_EN BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC6_CTRL				(Offset 0x016C) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC6MODE BIT(25)</div><div class='del'>-#define BIT_TC6EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC6DATA 0</div><div class='del'>-#define BIT_MASK_TC6DATA 0xffffff</div><div class='del'>-#define BIT_TC6DATA(x) (((x) &amp; BIT_MASK_TC6DATA) &lt;&lt; BIT_SHIFT_TC6DATA)</div><div class='del'>-#define BIT_GET_TC6DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC6DATA) &amp; BIT_MASK_TC6DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_FAIL				(Offset 0x0170) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_8051_MBIST_FAIL 26</div><div class='del'>-#define BIT_MASK_8051_MBIST_FAIL 0x7</div><div class='del'>-#define BIT_8051_MBIST_FAIL(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_8051_MBIST_FAIL) &lt;&lt; BIT_SHIFT_8051_MBIST_FAIL)</div><div class='del'>-#define BIT_GET_8051_MBIST_FAIL(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_8051_MBIST_FAIL) &amp; BIT_MASK_8051_MBIST_FAIL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_MBIST_FAIL 24</div><div class='del'>-#define BIT_MASK_USB_MBIST_FAIL 0x3</div><div class='del'>-#define BIT_USB_MBIST_FAIL(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_MBIST_FAIL) &lt;&lt; BIT_SHIFT_USB_MBIST_FAIL)</div><div class='del'>-#define BIT_GET_USB_MBIST_FAIL(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_MBIST_FAIL) &amp; BIT_MASK_USB_MBIST_FAIL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MBIST_FAIL 16</div><div class='del'>-#define BIT_MASK_PCIE_MBIST_FAIL 0x3f</div><div class='del'>-#define BIT_PCIE_MBIST_FAIL(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MBIST_FAIL) &lt;&lt; BIT_SHIFT_PCIE_MBIST_FAIL)</div><div class='del'>-#define BIT_GET_PCIE_MBIST_FAIL(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MBIST_FAIL) &amp; BIT_MASK_PCIE_MBIST_FAIL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_FAIL				(Offset 0x0170) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_MBIST_FAIL 0</div><div class='del'>-#define BIT_MASK_MAC_MBIST_FAIL 0xfff</div><div class='del'>-#define BIT_MAC_MBIST_FAIL(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_MBIST_FAIL) &lt;&lt; BIT_SHIFT_MAC_MBIST_FAIL)</div><div class='del'>-#define BIT_GET_MAC_MBIST_FAIL(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_MBIST_FAIL) &amp; BIT_MASK_MAC_MBIST_FAIL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_START_PAUSE			(Offset 0x0174) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_8051_MBIST_START_PAUSE 26</div><div class='del'>-#define BIT_MASK_8051_MBIST_START_PAUSE 0x7</div><div class='del'>-#define BIT_8051_MBIST_START_PAUSE(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_8051_MBIST_START_PAUSE)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_8051_MBIST_START_PAUSE)</div><div class='del'>-#define BIT_GET_8051_MBIST_START_PAUSE(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_8051_MBIST_START_PAUSE) &amp;                           \</div><div class='del'>-	 BIT_MASK_8051_MBIST_START_PAUSE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_MBIST_START_PAUSE 24</div><div class='del'>-#define BIT_MASK_USB_MBIST_START_PAUSE 0x3</div><div class='del'>-#define BIT_USB_MBIST_START_PAUSE(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_MBIST_START_PAUSE)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_MBIST_START_PAUSE)</div><div class='del'>-#define BIT_GET_USB_MBIST_START_PAUSE(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_MBIST_START_PAUSE) &amp;                            \</div><div class='del'>-	 BIT_MASK_USB_MBIST_START_PAUSE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MBIST_START_PAUSE 16</div><div class='del'>-#define BIT_MASK_PCIE_MBIST_START_PAUSE 0x3f</div><div class='del'>-#define BIT_PCIE_MBIST_START_PAUSE(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MBIST_START_PAUSE)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PCIE_MBIST_START_PAUSE)</div><div class='del'>-#define BIT_GET_PCIE_MBIST_START_PAUSE(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MBIST_START_PAUSE) &amp;                           \</div><div class='del'>-	 BIT_MASK_PCIE_MBIST_START_PAUSE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_START_PAUSE			(Offset 0x0174) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_MBIST_START_PAUSE 0</div><div class='del'>-#define BIT_MASK_MAC_MBIST_START_PAUSE 0xfff</div><div class='del'>-#define BIT_MAC_MBIST_START_PAUSE(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_MBIST_START_PAUSE)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MAC_MBIST_START_PAUSE)</div><div class='del'>-#define BIT_GET_MAC_MBIST_START_PAUSE(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_MBIST_START_PAUSE) &amp;                            \</div><div class='del'>-	 BIT_MASK_MAC_MBIST_START_PAUSE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_DONE				(Offset 0x0178) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_8051_MBIST_DONE 26</div><div class='del'>-#define BIT_MASK_8051_MBIST_DONE 0x7</div><div class='del'>-#define BIT_8051_MBIST_DONE(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_8051_MBIST_DONE) &lt;&lt; BIT_SHIFT_8051_MBIST_DONE)</div><div class='del'>-#define BIT_GET_8051_MBIST_DONE(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_8051_MBIST_DONE) &amp; BIT_MASK_8051_MBIST_DONE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_MBIST_DONE 24</div><div class='del'>-#define BIT_MASK_USB_MBIST_DONE 0x3</div><div class='del'>-#define BIT_USB_MBIST_DONE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_MBIST_DONE) &lt;&lt; BIT_SHIFT_USB_MBIST_DONE)</div><div class='del'>-#define BIT_GET_USB_MBIST_DONE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_MBIST_DONE) &amp; BIT_MASK_USB_MBIST_DONE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MBIST_DONE 16</div><div class='del'>-#define BIT_MASK_PCIE_MBIST_DONE 0x3f</div><div class='del'>-#define BIT_PCIE_MBIST_DONE(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MBIST_DONE) &lt;&lt; BIT_SHIFT_PCIE_MBIST_DONE)</div><div class='del'>-#define BIT_GET_PCIE_MBIST_DONE(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MBIST_DONE) &amp; BIT_MASK_PCIE_MBIST_DONE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_DONE				(Offset 0x0178) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_MBIST_DONE 0</div><div class='del'>-#define BIT_MASK_MAC_MBIST_DONE 0xfff</div><div class='del'>-#define BIT_MAC_MBIST_DONE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_MBIST_DONE) &lt;&lt; BIT_SHIFT_MAC_MBIST_DONE)</div><div class='del'>-#define BIT_GET_MAC_MBIST_DONE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_MBIST_DONE) &amp; BIT_MASK_MAC_MBIST_DONE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_FAIL_NRML			(Offset 0x017C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIST_FAIL_NRML 0</div><div class='del'>-#define BIT_MASK_MBIST_FAIL_NRML 0xffffffffL</div><div class='del'>-#define BIT_MBIST_FAIL_NRML(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIST_FAIL_NRML) &lt;&lt; BIT_SHIFT_MBIST_FAIL_NRML)</div><div class='del'>-#define BIT_GET_MBIST_FAIL_NRML(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIST_FAIL_NRML) &amp; BIT_MASK_MBIST_FAIL_NRML)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AES_DECRPT_DATA			(Offset 0x0180) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IPS_CFG_ADDR 0</div><div class='del'>-#define BIT_MASK_IPS_CFG_ADDR 0xff</div><div class='del'>-#define BIT_IPS_CFG_ADDR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_IPS_CFG_ADDR) &lt;&lt; BIT_SHIFT_IPS_CFG_ADDR)</div><div class='del'>-#define BIT_GET_IPS_CFG_ADDR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IPS_CFG_ADDR) &amp; BIT_MASK_IPS_CFG_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AES_DECRPT_CFG			(Offset 0x0184) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IPS_CFG_DATA 0</div><div class='del'>-#define BIT_MASK_IPS_CFG_DATA 0xffffffffL</div><div class='del'>-#define BIT_IPS_CFG_DATA(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_IPS_CFG_DATA) &lt;&lt; BIT_SHIFT_IPS_CFG_DATA)</div><div class='del'>-#define BIT_GET_IPS_CFG_DATA(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IPS_CFG_DATA) &amp; BIT_MASK_IPS_CFG_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TMETER				(Offset 0x0190) */</div><div class='del'>-</div><div class='del'>-#define BIT_TEMP_VALID BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TEMP_VALUE 24</div><div class='del'>-#define BIT_MASK_TEMP_VALUE 0x3f</div><div class='del'>-#define BIT_TEMP_VALUE(x) (((x) &amp; BIT_MASK_TEMP_VALUE) &lt;&lt; BIT_SHIFT_TEMP_VALUE)</div><div class='del'>-#define BIT_GET_TEMP_VALUE(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TEMP_VALUE) &amp; BIT_MASK_TEMP_VALUE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_TMETER_TIMER 8</div><div class='del'>-#define BIT_MASK_REG_TMETER_TIMER 0xfff</div><div class='del'>-#define BIT_REG_TMETER_TIMER(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_TMETER_TIMER) &lt;&lt; BIT_SHIFT_REG_TMETER_TIMER)</div><div class='del'>-#define BIT_GET_REG_TMETER_TIMER(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_TMETER_TIMER) &amp; BIT_MASK_REG_TMETER_TIMER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_TEMP_DELTA 2</div><div class='del'>-#define BIT_MASK_REG_TEMP_DELTA 0x3f</div><div class='del'>-#define BIT_REG_TEMP_DELTA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_TEMP_DELTA) &lt;&lt; BIT_SHIFT_REG_TEMP_DELTA)</div><div class='del'>-#define BIT_GET_REG_TEMP_DELTA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_TEMP_DELTA) &amp; BIT_MASK_REG_TEMP_DELTA)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_TMETER_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OSC_32K_CTRL			(Offset 0x0194) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OSC_32K_CLKGEN_0 16</div><div class='del'>-#define BIT_MASK_OSC_32K_CLKGEN_0 0xffff</div><div class='del'>-#define BIT_OSC_32K_CLKGEN_0(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_OSC_32K_CLKGEN_0) &lt;&lt; BIT_SHIFT_OSC_32K_CLKGEN_0)</div><div class='del'>-#define BIT_GET_OSC_32K_CLKGEN_0(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OSC_32K_CLKGEN_0) &amp; BIT_MASK_OSC_32K_CLKGEN_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OSC_32K_CTRL			(Offset 0x0194) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OSC_32K_RES_COMP 4</div><div class='del'>-#define BIT_MASK_OSC_32K_RES_COMP 0x3</div><div class='del'>-#define BIT_OSC_32K_RES_COMP(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_OSC_32K_RES_COMP) &lt;&lt; BIT_SHIFT_OSC_32K_RES_COMP)</div><div class='del'>-#define BIT_GET_OSC_32K_RES_COMP(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OSC_32K_RES_COMP) &amp; BIT_MASK_OSC_32K_RES_COMP)</div><div class='del'>-</div><div class='del'>-#define BIT_OSC_32K_OUT_SEL BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OSC_32K_CTRL			(Offset 0x0194) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISO_WL_2_OSC_32K BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OSC_32K_CTRL			(Offset 0x0194) */</div><div class='del'>-</div><div class='del'>-#define BIT_POW_CKGEN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_32K_CAL_REG1			(Offset 0x0198) */</div><div class='del'>-</div><div class='del'>-#define BIT_CAL_32K_REG_WR BIT(31)</div><div class='del'>-#define BIT_CAL_32K_DBG_SEL BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAL_32K_REG_ADDR 16</div><div class='del'>-#define BIT_MASK_CAL_32K_REG_ADDR 0x3f</div><div class='del'>-#define BIT_CAL_32K_REG_ADDR(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAL_32K_REG_ADDR) &lt;&lt; BIT_SHIFT_CAL_32K_REG_ADDR)</div><div class='del'>-#define BIT_GET_CAL_32K_REG_ADDR(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAL_32K_REG_ADDR) &amp; BIT_MASK_CAL_32K_REG_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_32K_CAL_REG1			(Offset 0x0198) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAL_32K_REG_DATA 0</div><div class='del'>-#define BIT_MASK_CAL_32K_REG_DATA 0xffff</div><div class='del'>-#define BIT_CAL_32K_REG_DATA(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAL_32K_REG_DATA) &lt;&lt; BIT_SHIFT_CAL_32K_REG_DATA)</div><div class='del'>-#define BIT_GET_CAL_32K_REG_DATA(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAL_32K_REG_DATA) &amp; BIT_MASK_CAL_32K_REG_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_C2HEVT				(Offset 0x01A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C2HEVT_MSG 0</div><div class='del'>-#define BIT_MASK_C2HEVT_MSG 0xffffffffffffffffffffffffffffffffL</div><div class='del'>-#define BIT_C2HEVT_MSG(x) (((x) &amp; BIT_MASK_C2HEVT_MSG) &lt;&lt; BIT_SHIFT_C2HEVT_MSG)</div><div class='del'>-#define BIT_GET_C2HEVT_MSG(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_C2HEVT_MSG) &amp; BIT_MASK_C2HEVT_MSG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_DEFINED_PAGE1			(Offset 0x01B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SW_DEFINED_PAGE1 0</div><div class='del'>-#define BIT_MASK_SW_DEFINED_PAGE1 0xffffffffffffffffL</div><div class='del'>-#define BIT_SW_DEFINED_PAGE1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SW_DEFINED_PAGE1) &lt;&lt; BIT_SHIFT_SW_DEFINED_PAGE1)</div><div class='del'>-#define BIT_GET_SW_DEFINED_PAGE1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SW_DEFINED_PAGE1) &amp; BIT_MASK_SW_DEFINED_PAGE1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUTST_I				(Offset 0x01C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCUDMSG_I 0</div><div class='del'>-#define BIT_MASK_MCUDMSG_I 0xffffffffL</div><div class='del'>-#define BIT_MCUDMSG_I(x) (((x) &amp; BIT_MASK_MCUDMSG_I) &lt;&lt; BIT_SHIFT_MCUDMSG_I)</div><div class='del'>-#define BIT_GET_MCUDMSG_I(x) (((x) &gt;&gt; BIT_SHIFT_MCUDMSG_I) &amp; BIT_MASK_MCUDMSG_I)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUTST_II				(Offset 0x01C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCUDMSG_II 0</div><div class='del'>-#define BIT_MASK_MCUDMSG_II 0xffffffffL</div><div class='del'>-#define BIT_MCUDMSG_II(x) (((x) &amp; BIT_MASK_MCUDMSG_II) &lt;&lt; BIT_SHIFT_MCUDMSG_II)</div><div class='del'>-#define BIT_GET_MCUDMSG_II(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCUDMSG_II) &amp; BIT_MASK_MCUDMSG_II)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FMETHR				(Offset 0x01C8) */</div><div class='del'>-</div><div class='del'>-#define BIT_FMSG_INT BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG 0</div><div class='del'>-#define BIT_MASK_FW_MSG 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG(x) (((x) &amp; BIT_MASK_FW_MSG) &lt;&lt; BIT_SHIFT_FW_MSG)</div><div class='del'>-#define BIT_GET_FW_MSG(x) (((x) &gt;&gt; BIT_SHIFT_FW_MSG) &amp; BIT_MASK_FW_MSG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMETFR				(Offset 0x01CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HRCV_MSG 24</div><div class='del'>-#define BIT_MASK_HRCV_MSG 0xff</div><div class='del'>-#define BIT_HRCV_MSG(x) (((x) &amp; BIT_MASK_HRCV_MSG) &lt;&lt; BIT_SHIFT_HRCV_MSG)</div><div class='del'>-#define BIT_GET_HRCV_MSG(x) (((x) &gt;&gt; BIT_SHIFT_HRCV_MSG) &amp; BIT_MASK_HRCV_MSG)</div><div class='del'>-</div><div class='del'>-#define BIT_INT_BOX3 BIT(3)</div><div class='del'>-#define BIT_INT_BOX2 BIT(2)</div><div class='del'>-#define BIT_INT_BOX1 BIT(1)</div><div class='del'>-#define BIT_INT_BOX0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX0				(Offset 0x01D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_0 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_0 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_0(x) (((x) &amp; BIT_MASK_HOST_MSG_0) &lt;&lt; BIT_SHIFT_HOST_MSG_0)</div><div class='del'>-#define BIT_GET_HOST_MSG_0(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_0) &amp; BIT_MASK_HOST_MSG_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX1				(Offset 0x01D4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_1 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_1 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_1(x) (((x) &amp; BIT_MASK_HOST_MSG_1) &lt;&lt; BIT_SHIFT_HOST_MSG_1)</div><div class='del'>-#define BIT_GET_HOST_MSG_1(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_1) &amp; BIT_MASK_HOST_MSG_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX2				(Offset 0x01D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_2 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_2 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_2(x) (((x) &amp; BIT_MASK_HOST_MSG_2) &lt;&lt; BIT_SHIFT_HOST_MSG_2)</div><div class='del'>-#define BIT_GET_HOST_MSG_2(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_2) &amp; BIT_MASK_HOST_MSG_2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX3				(Offset 0x01DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_3 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_3 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_3(x) (((x) &amp; BIT_MASK_HOST_MSG_3) &lt;&lt; BIT_SHIFT_HOST_MSG_3)</div><div class='del'>-#define BIT_GET_HOST_MSG_3(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_3) &amp; BIT_MASK_HOST_MSG_3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LLT_INIT				(Offset 0x01E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTE_RWM 30</div><div class='del'>-#define BIT_MASK_LLTE_RWM 0x3</div><div class='del'>-#define BIT_LLTE_RWM(x) (((x) &amp; BIT_MASK_LLTE_RWM) &lt;&lt; BIT_SHIFT_LLTE_RWM)</div><div class='del'>-#define BIT_GET_LLTE_RWM(x) (((x) &gt;&gt; BIT_SHIFT_LLTE_RWM) &amp; BIT_MASK_LLTE_RWM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LLT_INIT				(Offset 0x01E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTINI_PDATA_V1 16</div><div class='del'>-#define BIT_MASK_LLTINI_PDATA_V1 0xfff</div><div class='del'>-#define BIT_LLTINI_PDATA_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTINI_PDATA_V1) &lt;&lt; BIT_SHIFT_LLTINI_PDATA_V1)</div><div class='del'>-#define BIT_GET_LLTINI_PDATA_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTINI_PDATA_V1) &amp; BIT_MASK_LLTINI_PDATA_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LLT_INIT				(Offset 0x01E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTINI_HDATA_V1 0</div><div class='del'>-#define BIT_MASK_LLTINI_HDATA_V1 0xfff</div><div class='del'>-#define BIT_LLTINI_HDATA_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTINI_HDATA_V1) &lt;&lt; BIT_SHIFT_LLTINI_HDATA_V1)</div><div class='del'>-#define BIT_GET_LLTINI_HDATA_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTINI_HDATA_V1) &amp; BIT_MASK_LLTINI_HDATA_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LLT_INIT_ADDR			(Offset 0x01E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTINI_ADDR_V1 0</div><div class='del'>-#define BIT_MASK_LLTINI_ADDR_V1 0xfff</div><div class='del'>-#define BIT_LLTINI_ADDR_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTINI_ADDR_V1) &lt;&lt; BIT_SHIFT_LLTINI_ADDR_V1)</div><div class='del'>-#define BIT_GET_LLTINI_ADDR_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTINI_ADDR_V1) &amp; BIT_MASK_LLTINI_ADDR_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BB_ACCESS_CTRL			(Offset 0x01E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_WRITE_READ 30</div><div class='del'>-#define BIT_MASK_BB_WRITE_READ 0x3</div><div class='del'>-#define BIT_BB_WRITE_READ(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_WRITE_READ) &lt;&lt; BIT_SHIFT_BB_WRITE_READ)</div><div class='del'>-#define BIT_GET_BB_WRITE_READ(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_WRITE_READ) &amp; BIT_MASK_BB_WRITE_READ)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BB_ACCESS_CTRL			(Offset 0x01E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_WRITE_EN 12</div><div class='del'>-#define BIT_MASK_BB_WRITE_EN 0xf</div><div class='del'>-#define BIT_BB_WRITE_EN(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_WRITE_EN) &lt;&lt; BIT_SHIFT_BB_WRITE_EN)</div><div class='del'>-#define BIT_GET_BB_WRITE_EN(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_WRITE_EN) &amp; BIT_MASK_BB_WRITE_EN)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_ADDR 2</div><div class='del'>-#define BIT_MASK_BB_ADDR 0x1ff</div><div class='del'>-#define BIT_BB_ADDR(x) (((x) &amp; BIT_MASK_BB_ADDR) &lt;&lt; BIT_SHIFT_BB_ADDR)</div><div class='del'>-#define BIT_GET_BB_ADDR(x) (((x) &gt;&gt; BIT_SHIFT_BB_ADDR) &amp; BIT_MASK_BB_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BB_ACCESS_CTRL			(Offset 0x01E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_BB_ERRACC BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BB_ACCESS_DATA			(Offset 0x01EC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_DATA 0</div><div class='del'>-#define BIT_MASK_BB_DATA 0xffffffffL</div><div class='del'>-#define BIT_BB_DATA(x) (((x) &amp; BIT_MASK_BB_DATA) &lt;&lt; BIT_SHIFT_BB_DATA)</div><div class='del'>-#define BIT_GET_BB_DATA(x) (((x) &gt;&gt; BIT_SHIFT_BB_DATA) &amp; BIT_MASK_BB_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E0				(Offset 0x01F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E0 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E0 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E0(x) (((x) &amp; BIT_MASK_HMEBOX_E0) &lt;&lt; BIT_SHIFT_HMEBOX_E0)</div><div class='del'>-#define BIT_GET_HMEBOX_E0(x) (((x) &gt;&gt; BIT_SHIFT_HMEBOX_E0) &amp; BIT_MASK_HMEBOX_E0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E1				(Offset 0x01F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E1 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E1 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E1(x) (((x) &amp; BIT_MASK_HMEBOX_E1) &lt;&lt; BIT_SHIFT_HMEBOX_E1)</div><div class='del'>-#define BIT_GET_HMEBOX_E1(x) (((x) &gt;&gt; BIT_SHIFT_HMEBOX_E1) &amp; BIT_MASK_HMEBOX_E1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E2				(Offset 0x01F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E2 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E2 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E2(x) (((x) &amp; BIT_MASK_HMEBOX_E2) &lt;&lt; BIT_SHIFT_HMEBOX_E2)</div><div class='del'>-#define BIT_GET_HMEBOX_E2(x) (((x) &gt;&gt; BIT_SHIFT_HMEBOX_E2) &amp; BIT_MASK_HMEBOX_E2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E3				(Offset 0x01FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_LD_RQPN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E3 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E3 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E3(x) (((x) &amp; BIT_MASK_HMEBOX_E3) &lt;&lt; BIT_SHIFT_HMEBOX_E3)</div><div class='del'>-#define BIT_GET_HMEBOX_E3(x) (((x) &gt;&gt; BIT_SHIFT_HMEBOX_E3) &amp; BIT_MASK_HMEBOX_E3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_1			(Offset 0x0200) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TX_OQT_HE_FREE_SPACE_V1 16</div><div class='del'>-#define BIT_MASK_TX_OQT_HE_FREE_SPACE_V1 0xff</div><div class='del'>-#define BIT_TX_OQT_HE_FREE_SPACE_V1(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_TX_OQT_HE_FREE_SPACE_V1)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TX_OQT_HE_FREE_SPACE_V1)</div><div class='del'>-#define BIT_GET_TX_OQT_HE_FREE_SPACE_V1(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TX_OQT_HE_FREE_SPACE_V1) &amp;                          \</div><div class='del'>-	 BIT_MASK_TX_OQT_HE_FREE_SPACE_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_1			(Offset 0x0200) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TX_OQT_NL_FREE_SPACE_V1 0</div><div class='del'>-#define BIT_MASK_TX_OQT_NL_FREE_SPACE_V1 0xff</div><div class='del'>-#define BIT_TX_OQT_NL_FREE_SPACE_V1(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_TX_OQT_NL_FREE_SPACE_V1)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TX_OQT_NL_FREE_SPACE_V1)</div><div class='del'>-#define BIT_GET_TX_OQT_NL_FREE_SPACE_V1(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TX_OQT_NL_FREE_SPACE_V1) &amp;                          \</div><div class='del'>-	 BIT_MASK_TX_OQT_NL_FREE_SPACE_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_2			(Offset 0x0204) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCN_VALID_1_V1 BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_2			(Offset 0x0204) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_HEAD_1_V1 16</div><div class='del'>-#define BIT_MASK_BCN_HEAD_1_V1 0xfff</div><div class='del'>-#define BIT_BCN_HEAD_1_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_HEAD_1_V1) &lt;&lt; BIT_SHIFT_BCN_HEAD_1_V1)</div><div class='del'>-#define BIT_GET_BCN_HEAD_1_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_HEAD_1_V1) &amp; BIT_MASK_BCN_HEAD_1_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_BCN_VALID_V1 BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_2			(Offset 0x0204) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_HEAD_V1 0</div><div class='del'>-#define BIT_MASK_BCN_HEAD_V1 0xfff</div><div class='del'>-#define BIT_BCN_HEAD_V1(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_HEAD_V1) &lt;&lt; BIT_SHIFT_BCN_HEAD_V1)</div><div class='del'>-#define BIT_GET_BCN_HEAD_V1(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_HEAD_V1) &amp; BIT_MASK_BCN_HEAD_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AUTO_LLT_V1				(Offset 0x0208) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1 24</div><div class='del'>-#define BIT_MASK_MAX_TX_PKT_FOR_USB_AND_SDIO_V1 0xff</div><div class='del'>-#define BIT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1(x)                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAX_TX_PKT_FOR_USB_AND_SDIO_V1)                       \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1)</div><div class='del'>-#define BIT_GET_MAX_TX_PKT_FOR_USB_AND_SDIO_V1(x)                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1) &amp;                   \</div><div class='del'>-	 BIT_MASK_MAX_TX_PKT_FOR_USB_AND_SDIO_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AUTO_LLT_V1				(Offset 0x0208) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLT_FREE_PAGE_V1 8</div><div class='del'>-#define BIT_MASK_LLT_FREE_PAGE_V1 0xffff</div><div class='del'>-#define BIT_LLT_FREE_PAGE_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLT_FREE_PAGE_V1) &lt;&lt; BIT_SHIFT_LLT_FREE_PAGE_V1)</div><div class='del'>-#define BIT_GET_LLT_FREE_PAGE_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLT_FREE_PAGE_V1) &amp; BIT_MASK_LLT_FREE_PAGE_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DWBCN0_CTRL				(Offset 0x0208) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BLK_DESC_NUM 4</div><div class='del'>-#define BIT_MASK_BLK_DESC_NUM 0xf</div><div class='del'>-#define BIT_BLK_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BLK_DESC_NUM) &lt;&lt; BIT_SHIFT_BLK_DESC_NUM)</div><div class='del'>-#define BIT_GET_BLK_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BLK_DESC_NUM) &amp; BIT_MASK_BLK_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AUTO_LLT_V1				(Offset 0x0208) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_BCN_HEAD_SEL BIT(3)</div><div class='del'>-#define BIT_R_EN_BCN_SW_HEAD_SEL BIT(2)</div><div class='del'>-#define BIT_LLT_DBG_SEL BIT(1)</div><div class='del'>-#define BIT_AUTO_INIT_LLT_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_OFFSET_CHK			(Offset 0x020C) */</div><div class='del'>-</div><div class='del'>-#define BIT_EM_CHKSUM_FIN BIT(31)</div><div class='del'>-#define BIT_EMN_PCIE_DMA_MOD BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_OFFSET_CHK			(Offset 0x020C) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_TXQUE_CLR BIT(29)</div><div class='del'>-#define BIT_EN_PCIE_FIFO_MODE BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_OFFSET_CHK			(Offset 0x020C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PG_UNDER_TH_V1 16</div><div class='del'>-#define BIT_MASK_PG_UNDER_TH_V1 0xfff</div><div class='del'>-#define BIT_PG_UNDER_TH_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PG_UNDER_TH_V1) &lt;&lt; BIT_SHIFT_PG_UNDER_TH_V1)</div><div class='del'>-#define BIT_GET_PG_UNDER_TH_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PG_UNDER_TH_V1) &amp; BIT_MASK_PG_UNDER_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_OFFSET_CHK			(Offset 0x020C) */</div><div class='del'>-</div><div class='del'>-#define BIT_RESTORE_H2C_ADDRESS BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_OFFSET_CHK			(Offset 0x020C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SDIO_TXDESC_CHKSUM_EN BIT(13)</div><div class='del'>-#define BIT_RST_RDPTR BIT(12)</div><div class='del'>-#define BIT_RST_WRPTR BIT(11)</div><div class='del'>-#define BIT_CHK_PG_TH_EN BIT(10)</div><div class='del'>-#define BIT_DROP_DATA_EN BIT(9)</div><div class='del'>-#define BIT_CHECK_OFFSET_EN BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CHECK_OFFSET 0</div><div class='del'>-#define BIT_MASK_CHECK_OFFSET 0xff</div><div class='del'>-#define BIT_CHECK_OFFSET(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_CHECK_OFFSET) &lt;&lt; BIT_SHIFT_CHECK_OFFSET)</div><div class='del'>-#define BIT_GET_CHECK_OFFSET(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CHECK_OFFSET) &amp; BIT_MASK_CHECK_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_STATUS			(Offset 0x0210) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI_OQT_UDN BIT(17)</div><div class='del'>-#define BIT_HI_OQT_OVF BIT(16)</div><div class='del'>-#define BIT_PAYLOAD_CHKSUM_ERR BIT(15)</div><div class='del'>-#define BIT_PAYLOAD_UDN BIT(14)</div><div class='del'>-#define BIT_PAYLOAD_OVF BIT(13)</div><div class='del'>-#define BIT_DSC_CHKSUM_FAIL BIT(12)</div><div class='del'>-#define BIT_UNKNOWN_QSEL BIT(11)</div><div class='del'>-#define BIT_EP_QSEL_DIFF BIT(10)</div><div class='del'>-#define BIT_TX_OFFS_UNMATCH BIT(9)</div><div class='del'>-#define BIT_TXOQT_UDN BIT(8)</div><div class='del'>-#define BIT_TXOQT_OVF BIT(7)</div><div class='del'>-#define BIT_TXDMA_SFF_UDN BIT(6)</div><div class='del'>-#define BIT_TXDMA_SFF_OVF BIT(5)</div><div class='del'>-#define BIT_LLT_NULL_PG BIT(4)</div><div class='del'>-#define BIT_PAGE_UDN BIT(3)</div><div class='del'>-#define BIT_PAGE_OVF BIT(2)</div><div class='del'>-#define BIT_TXFF_PG_UDN BIT(1)</div><div class='del'>-#define BIT_TXFF_PG_OVF BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT1				(Offset 0x0218) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_HIGH_TH_V1 16</div><div class='del'>-#define BIT_MASK_HPQ_HIGH_TH_V1 0xfff</div><div class='del'>-#define BIT_HPQ_HIGH_TH_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_HIGH_TH_V1) &lt;&lt; BIT_SHIFT_HPQ_HIGH_TH_V1)</div><div class='del'>-#define BIT_GET_HPQ_HIGH_TH_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_HIGH_TH_V1) &amp; BIT_MASK_HPQ_HIGH_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT1				(Offset 0x0218) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_LOW_TH_V1 0</div><div class='del'>-#define BIT_MASK_HPQ_LOW_TH_V1 0xfff</div><div class='del'>-#define BIT_HPQ_LOW_TH_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_LOW_TH_V1) &lt;&lt; BIT_SHIFT_HPQ_LOW_TH_V1)</div><div class='del'>-#define BIT_GET_HPQ_LOW_TH_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_LOW_TH_V1) &amp; BIT_MASK_HPQ_LOW_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT2				(Offset 0x021C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_HIGH_TH_V1 16</div><div class='del'>-#define BIT_MASK_NPQ_HIGH_TH_V1 0xfff</div><div class='del'>-#define BIT_NPQ_HIGH_TH_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_HIGH_TH_V1) &lt;&lt; BIT_SHIFT_NPQ_HIGH_TH_V1)</div><div class='del'>-#define BIT_GET_NPQ_HIGH_TH_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_HIGH_TH_V1) &amp; BIT_MASK_NPQ_HIGH_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT2				(Offset 0x021C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_LOW_TH_V1 0</div><div class='del'>-#define BIT_MASK_NPQ_LOW_TH_V1 0xfff</div><div class='del'>-#define BIT_NPQ_LOW_TH_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_LOW_TH_V1) &lt;&lt; BIT_SHIFT_NPQ_LOW_TH_V1)</div><div class='del'>-#define BIT_GET_NPQ_LOW_TH_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_LOW_TH_V1) &amp; BIT_MASK_NPQ_LOW_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT3				(Offset 0x0220) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_HIGH_TH_V1 16</div><div class='del'>-#define BIT_MASK_LPQ_HIGH_TH_V1 0xfff</div><div class='del'>-#define BIT_LPQ_HIGH_TH_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_HIGH_TH_V1) &lt;&lt; BIT_SHIFT_LPQ_HIGH_TH_V1)</div><div class='del'>-#define BIT_GET_LPQ_HIGH_TH_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_HIGH_TH_V1) &amp; BIT_MASK_LPQ_HIGH_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT3				(Offset 0x0220) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_LOW_TH_V1 0</div><div class='del'>-#define BIT_MASK_LPQ_LOW_TH_V1 0xfff</div><div class='del'>-#define BIT_LPQ_LOW_TH_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_LOW_TH_V1) &lt;&lt; BIT_SHIFT_LPQ_LOW_TH_V1)</div><div class='del'>-#define BIT_GET_LPQ_LOW_TH_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_LOW_TH_V1) &amp; BIT_MASK_LPQ_LOW_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT4				(Offset 0x0224) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_HIGH_TH_V1 16</div><div class='del'>-#define BIT_MASK_EXQ_HIGH_TH_V1 0xfff</div><div class='del'>-#define BIT_EXQ_HIGH_TH_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_HIGH_TH_V1) &lt;&lt; BIT_SHIFT_EXQ_HIGH_TH_V1)</div><div class='del'>-#define BIT_GET_EXQ_HIGH_TH_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_HIGH_TH_V1) &amp; BIT_MASK_EXQ_HIGH_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT4				(Offset 0x0224) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_LOW_TH_V1 0</div><div class='del'>-#define BIT_MASK_EXQ_LOW_TH_V1 0xfff</div><div class='del'>-#define BIT_EXQ_LOW_TH_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_LOW_TH_V1) &lt;&lt; BIT_SHIFT_EXQ_LOW_TH_V1)</div><div class='del'>-#define BIT_GET_EXQ_LOW_TH_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_LOW_TH_V1) &amp; BIT_MASK_EXQ_LOW_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RQPN_CTRL_1				(Offset 0x0228) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKTNUM_H 16</div><div class='del'>-#define BIT_MASK_TXPKTNUM_H 0xffff</div><div class='del'>-#define BIT_TXPKTNUM_H(x) (((x) &amp; BIT_MASK_TXPKTNUM_H) &lt;&lt; BIT_SHIFT_TXPKTNUM_H)</div><div class='del'>-#define BIT_GET_TXPKTNUM_H(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKTNUM_H) &amp; BIT_MASK_TXPKTNUM_H)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RQPN_CTRL_1				(Offset 0x0228) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKTNUM_V2 0</div><div class='del'>-#define BIT_MASK_TXPKTNUM_V2 0xffff</div><div class='del'>-#define BIT_TXPKTNUM_V2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKTNUM_V2) &lt;&lt; BIT_SHIFT_TXPKTNUM_V2)</div><div class='del'>-#define BIT_GET_TXPKTNUM_V2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKTNUM_V2) &amp; BIT_MASK_TXPKTNUM_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RQPN_CTRL_2				(Offset 0x022C) */</div><div class='del'>-</div><div class='del'>-#define BIT_EXQ_PUBLIC_DIS_V1 BIT(19)</div><div class='del'>-#define BIT_NPQ_PUBLIC_DIS_V1 BIT(18)</div><div class='del'>-#define BIT_LPQ_PUBLIC_DIS_V1 BIT(17)</div><div class='del'>-#define BIT_HPQ_PUBLIC_DIS_V1 BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_1			(Offset 0x0230) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_AVAL_PG_V1 16</div><div class='del'>-#define BIT_MASK_HPQ_AVAL_PG_V1 0xfff</div><div class='del'>-#define BIT_HPQ_AVAL_PG_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_AVAL_PG_V1) &lt;&lt; BIT_SHIFT_HPQ_AVAL_PG_V1)</div><div class='del'>-#define BIT_GET_HPQ_AVAL_PG_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_AVAL_PG_V1) &amp; BIT_MASK_HPQ_AVAL_PG_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_V1 0</div><div class='del'>-#define BIT_MASK_HPQ_V1 0xfff</div><div class='del'>-#define BIT_HPQ_V1(x) (((x) &amp; BIT_MASK_HPQ_V1) &lt;&lt; BIT_SHIFT_HPQ_V1)</div><div class='del'>-#define BIT_GET_HPQ_V1(x) (((x) &gt;&gt; BIT_SHIFT_HPQ_V1) &amp; BIT_MASK_HPQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_2			(Offset 0x0234) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_AVAL_PG_V1 16</div><div class='del'>-#define BIT_MASK_LPQ_AVAL_PG_V1 0xfff</div><div class='del'>-#define BIT_LPQ_AVAL_PG_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_AVAL_PG_V1) &lt;&lt; BIT_SHIFT_LPQ_AVAL_PG_V1)</div><div class='del'>-#define BIT_GET_LPQ_AVAL_PG_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_AVAL_PG_V1) &amp; BIT_MASK_LPQ_AVAL_PG_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_V1 0</div><div class='del'>-#define BIT_MASK_LPQ_V1 0xfff</div><div class='del'>-#define BIT_LPQ_V1(x) (((x) &amp; BIT_MASK_LPQ_V1) &lt;&lt; BIT_SHIFT_LPQ_V1)</div><div class='del'>-#define BIT_GET_LPQ_V1(x) (((x) &gt;&gt; BIT_SHIFT_LPQ_V1) &amp; BIT_MASK_LPQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_3			(Offset 0x0238) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_AVAL_PG_V1 16</div><div class='del'>-#define BIT_MASK_NPQ_AVAL_PG_V1 0xfff</div><div class='del'>-#define BIT_NPQ_AVAL_PG_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_AVAL_PG_V1) &lt;&lt; BIT_SHIFT_NPQ_AVAL_PG_V1)</div><div class='del'>-#define BIT_GET_NPQ_AVAL_PG_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_AVAL_PG_V1) &amp; BIT_MASK_NPQ_AVAL_PG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_3			(Offset 0x0238) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_V1 0</div><div class='del'>-#define BIT_MASK_NPQ_V1 0xfff</div><div class='del'>-#define BIT_NPQ_V1(x) (((x) &amp; BIT_MASK_NPQ_V1) &lt;&lt; BIT_SHIFT_NPQ_V1)</div><div class='del'>-#define BIT_GET_NPQ_V1(x) (((x) &gt;&gt; BIT_SHIFT_NPQ_V1) &amp; BIT_MASK_NPQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_4			(Offset 0x023C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_AVAL_PG_V1 16</div><div class='del'>-#define BIT_MASK_EXQ_AVAL_PG_V1 0xfff</div><div class='del'>-#define BIT_EXQ_AVAL_PG_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_AVAL_PG_V1) &lt;&lt; BIT_SHIFT_EXQ_AVAL_PG_V1)</div><div class='del'>-#define BIT_GET_EXQ_AVAL_PG_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_AVAL_PG_V1) &amp; BIT_MASK_EXQ_AVAL_PG_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_V1 0</div><div class='del'>-#define BIT_MASK_EXQ_V1 0xfff</div><div class='del'>-#define BIT_EXQ_V1(x) (((x) &amp; BIT_MASK_EXQ_V1) &lt;&lt; BIT_SHIFT_EXQ_V1)</div><div class='del'>-#define BIT_GET_EXQ_V1(x) (((x) &gt;&gt; BIT_SHIFT_EXQ_V1) &amp; BIT_MASK_EXQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_5			(Offset 0x0240) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PUBQ_AVAL_PG_V1 16</div><div class='del'>-#define BIT_MASK_PUBQ_AVAL_PG_V1 0xfff</div><div class='del'>-#define BIT_PUBQ_AVAL_PG_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PUBQ_AVAL_PG_V1) &lt;&lt; BIT_SHIFT_PUBQ_AVAL_PG_V1)</div><div class='del'>-#define BIT_GET_PUBQ_AVAL_PG_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PUBQ_AVAL_PG_V1) &amp; BIT_MASK_PUBQ_AVAL_PG_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PUBQ_V1 0</div><div class='del'>-#define BIT_MASK_PUBQ_V1 0xfff</div><div class='del'>-#define BIT_PUBQ_V1(x) (((x) &amp; BIT_MASK_PUBQ_V1) &lt;&lt; BIT_SHIFT_PUBQ_V1)</div><div class='del'>-#define BIT_GET_PUBQ_V1(x) (((x) &gt;&gt; BIT_SHIFT_PUBQ_V1) &amp; BIT_MASK_PUBQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_HEAD				(Offset 0x0244) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_HEAD 0</div><div class='del'>-#define BIT_MASK_H2C_HEAD 0x3ffff</div><div class='del'>-#define BIT_H2C_HEAD(x) (((x) &amp; BIT_MASK_H2C_HEAD) &lt;&lt; BIT_SHIFT_H2C_HEAD)</div><div class='del'>-#define BIT_GET_H2C_HEAD(x) (((x) &gt;&gt; BIT_SHIFT_H2C_HEAD) &amp; BIT_MASK_H2C_HEAD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_TAIL				(Offset 0x0248) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_TAIL 0</div><div class='del'>-#define BIT_MASK_H2C_TAIL 0x3ffff</div><div class='del'>-#define BIT_H2C_TAIL(x) (((x) &amp; BIT_MASK_H2C_TAIL) &lt;&lt; BIT_SHIFT_H2C_TAIL)</div><div class='del'>-#define BIT_GET_H2C_TAIL(x) (((x) &gt;&gt; BIT_SHIFT_H2C_TAIL) &amp; BIT_MASK_H2C_TAIL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_READ_ADDR			(Offset 0x024C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_READ_ADDR 0</div><div class='del'>-#define BIT_MASK_H2C_READ_ADDR 0x3ffff</div><div class='del'>-#define BIT_H2C_READ_ADDR(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_READ_ADDR) &lt;&lt; BIT_SHIFT_H2C_READ_ADDR)</div><div class='del'>-#define BIT_GET_H2C_READ_ADDR(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_READ_ADDR) &amp; BIT_MASK_H2C_READ_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_WR_ADDR				(Offset 0x0250) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_WR_ADDR 0</div><div class='del'>-#define BIT_MASK_H2C_WR_ADDR 0x3ffff</div><div class='del'>-#define BIT_H2C_WR_ADDR(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_WR_ADDR) &lt;&lt; BIT_SHIFT_H2C_WR_ADDR)</div><div class='del'>-#define BIT_GET_H2C_WR_ADDR(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_WR_ADDR) &amp; BIT_MASK_H2C_WR_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_INFO				(Offset 0x0254) */</div><div class='del'>-</div><div class='del'>-#define BIT_H2C_SPACE_VLD BIT(3)</div><div class='del'>-#define BIT_H2C_WR_ADDR_RST BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_LEN_SEL 0</div><div class='del'>-#define BIT_MASK_H2C_LEN_SEL 0x3</div><div class='del'>-#define BIT_H2C_LEN_SEL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_LEN_SEL) &lt;&lt; BIT_SHIFT_H2C_LEN_SEL)</div><div class='del'>-#define BIT_GET_H2C_LEN_SEL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_LEN_SEL) &amp; BIT_MASK_H2C_LEN_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_AGG_PG_TH			(Offset 0x0280) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXDMA_AGG_OLD_MOD 24</div><div class='del'>-#define BIT_MASK_RXDMA_AGG_OLD_MOD 0xff</div><div class='del'>-#define BIT_RXDMA_AGG_OLD_MOD(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXDMA_AGG_OLD_MOD) &lt;&lt; BIT_SHIFT_RXDMA_AGG_OLD_MOD)</div><div class='del'>-#define BIT_GET_RXDMA_AGG_OLD_MOD(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXDMA_AGG_OLD_MOD) &amp; BIT_MASK_RXDMA_AGG_OLD_MOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_AGG_PG_TH			(Offset 0x0280) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_NUM_WOL 16</div><div class='del'>-#define BIT_MASK_PKT_NUM_WOL 0xff</div><div class='del'>-#define BIT_PKT_NUM_WOL(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_NUM_WOL) &lt;&lt; BIT_SHIFT_PKT_NUM_WOL)</div><div class='del'>-#define BIT_GET_PKT_NUM_WOL(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_NUM_WOL) &amp; BIT_MASK_PKT_NUM_WOL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_AGG_PG_TH			(Offset 0x0280) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DMA_AGG_TO 8</div><div class='del'>-#define BIT_MASK_DMA_AGG_TO 0xf</div><div class='del'>-#define BIT_DMA_AGG_TO(x) (((x) &amp; BIT_MASK_DMA_AGG_TO) &lt;&lt; BIT_SHIFT_DMA_AGG_TO)</div><div class='del'>-#define BIT_GET_DMA_AGG_TO(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DMA_AGG_TO) &amp; BIT_MASK_DMA_AGG_TO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_AGG_PG_TH			(Offset 0x0280) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXDMA_AGG_PG_TH_V1 0</div><div class='del'>-#define BIT_MASK_RXDMA_AGG_PG_TH_V1 0xf</div><div class='del'>-#define BIT_RXDMA_AGG_PG_TH_V1(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXDMA_AGG_PG_TH_V1) &lt;&lt; BIT_SHIFT_RXDMA_AGG_PG_TH_V1)</div><div class='del'>-#define BIT_GET_RXDMA_AGG_PG_TH_V1(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXDMA_AGG_PG_TH_V1) &amp; BIT_MASK_RXDMA_AGG_PG_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXPKT_NUM				(Offset 0x0284) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT_NUM 24</div><div class='del'>-#define BIT_MASK_RXPKT_NUM 0xff</div><div class='del'>-#define BIT_RXPKT_NUM(x) (((x) &amp; BIT_MASK_RXPKT_NUM) &lt;&lt; BIT_SHIFT_RXPKT_NUM)</div><div class='del'>-#define BIT_GET_RXPKT_NUM(x) (((x) &gt;&gt; BIT_SHIFT_RXPKT_NUM) &amp; BIT_MASK_RXPKT_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXPKT_NUM				(Offset 0x0284) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_UPD_RDPTR19_TO_16 20</div><div class='del'>-#define BIT_MASK_FW_UPD_RDPTR19_TO_16 0xf</div><div class='del'>-#define BIT_FW_UPD_RDPTR19_TO_16(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_UPD_RDPTR19_TO_16)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_FW_UPD_RDPTR19_TO_16)</div><div class='del'>-#define BIT_GET_FW_UPD_RDPTR19_TO_16(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_UPD_RDPTR19_TO_16) &amp;                             \</div><div class='del'>-	 BIT_MASK_FW_UPD_RDPTR19_TO_16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXPKT_NUM				(Offset 0x0284) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXDMA_REQ BIT(19)</div><div class='del'>-#define BIT_RW_RELEASE_EN BIT(18)</div><div class='del'>-#define BIT_RXDMA_IDLE BIT(17)</div><div class='del'>-#define BIT_RXPKT_RELEASE_POLL BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_UPD_RDPTR 0</div><div class='del'>-#define BIT_MASK_FW_UPD_RDPTR 0xffff</div><div class='del'>-#define BIT_FW_UPD_RDPTR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_UPD_RDPTR) &lt;&lt; BIT_SHIFT_FW_UPD_RDPTR)</div><div class='del'>-#define BIT_GET_FW_UPD_RDPTR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_UPD_RDPTR) &amp; BIT_MASK_FW_UPD_RDPTR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_STATUS			(Offset 0x0288) */</div><div class='del'>-</div><div class='del'>-#define BIT_C2H_PKT_OVF BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_STATUS			(Offset 0x0288) */</div><div class='del'>-</div><div class='del'>-#define BIT_AGG_CONFGI_ISSUE BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_STATUS			(Offset 0x0288) */</div><div class='del'>-</div><div class='del'>-#define BIT_FW_POLL_ISSUE BIT(5)</div><div class='del'>-#define BIT_RX_DATA_UDN BIT(4)</div><div class='del'>-#define BIT_RX_SFF_UDN BIT(3)</div><div class='del'>-#define BIT_RX_SFF_OVF BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_STATUS			(Offset 0x0288) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXPKT_OVF BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_DPR				(Offset 0x028C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RDE_DEBUG 0</div><div class='del'>-#define BIT_MASK_RDE_DEBUG 0xffffffffL</div><div class='del'>-#define BIT_RDE_DEBUG(x) (((x) &amp; BIT_MASK_RDE_DEBUG) &lt;&lt; BIT_SHIFT_RDE_DEBUG)</div><div class='del'>-#define BIT_GET_RDE_DEBUG(x) (((x) &gt;&gt; BIT_SHIFT_RDE_DEBUG) &amp; BIT_MASK_RDE_DEBUG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_MODE				(Offset 0x0290) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTNUM_TH_V2 24</div><div class='del'>-#define BIT_MASK_PKTNUM_TH_V2 0x1f</div><div class='del'>-#define BIT_PKTNUM_TH_V2(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTNUM_TH_V2) &lt;&lt; BIT_SHIFT_PKTNUM_TH_V2)</div><div class='del'>-#define BIT_GET_PKTNUM_TH_V2(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTNUM_TH_V2) &amp; BIT_MASK_PKTNUM_TH_V2)</div><div class='del'>-</div><div class='del'>-#define BIT_TXBA_BREAK_USBAGG BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTLEN_PARA 16</div><div class='del'>-#define BIT_MASK_PKTLEN_PARA 0x7</div><div class='del'>-#define BIT_PKTLEN_PARA(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTLEN_PARA) &lt;&lt; BIT_SHIFT_PKTLEN_PARA)</div><div class='del'>-#define BIT_GET_PKTLEN_PARA(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTLEN_PARA) &amp; BIT_MASK_PKTLEN_PARA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_MODE				(Offset 0x0290) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BURST_SIZE 4</div><div class='del'>-#define BIT_MASK_BURST_SIZE 0x3</div><div class='del'>-#define BIT_BURST_SIZE(x) (((x) &amp; BIT_MASK_BURST_SIZE) &lt;&lt; BIT_SHIFT_BURST_SIZE)</div><div class='del'>-#define BIT_GET_BURST_SIZE(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BURST_SIZE) &amp; BIT_MASK_BURST_SIZE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BURST_CNT 2</div><div class='del'>-#define BIT_MASK_BURST_CNT 0x3</div><div class='del'>-#define BIT_BURST_CNT(x) (((x) &amp; BIT_MASK_BURST_CNT) &lt;&lt; BIT_SHIFT_BURST_CNT)</div><div class='del'>-#define BIT_GET_BURST_CNT(x) (((x) &gt;&gt; BIT_SHIFT_BURST_CNT) &amp; BIT_MASK_BURST_CNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_MODE				(Offset 0x0290) */</div><div class='del'>-</div><div class='del'>-#define BIT_DMA_MODE BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_C2H_PKT				(Offset 0x0294) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_C2H_STR_ADDR_16_TO_19 24</div><div class='del'>-#define BIT_MASK_R_C2H_STR_ADDR_16_TO_19 0xf</div><div class='del'>-#define BIT_R_C2H_STR_ADDR_16_TO_19(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_C2H_STR_ADDR_16_TO_19)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_C2H_STR_ADDR_16_TO_19)</div><div class='del'>-#define BIT_GET_R_C2H_STR_ADDR_16_TO_19(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_C2H_STR_ADDR_16_TO_19) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_C2H_STR_ADDR_16_TO_19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_PHY_ADDR 24</div><div class='del'>-#define BIT_MASK_MDIO_PHY_ADDR 0x1f</div><div class='del'>-#define BIT_MDIO_PHY_ADDR(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MDIO_PHY_ADDR) &lt;&lt; BIT_SHIFT_MDIO_PHY_ADDR)</div><div class='del'>-#define BIT_GET_MDIO_PHY_ADDR(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_PHY_ADDR) &amp; BIT_MASK_MDIO_PHY_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_C2H_PKT				(Offset 0x0294) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_C2H_PKT_REQ BIT(16)</div><div class='del'>-#define BIT_RX_CLOSE_EN BIT(15)</div><div class='del'>-#define BIT_STOP_BCNQ BIT(14)</div><div class='del'>-#define BIT_STOP_MGQ BIT(13)</div><div class='del'>-#define BIT_STOP_VOQ BIT(12)</div><div class='del'>-#define BIT_STOP_VIQ BIT(11)</div><div class='del'>-#define BIT_STOP_BEQ BIT(10)</div><div class='del'>-#define BIT_STOP_BKQ BIT(9)</div><div class='del'>-#define BIT_STOP_RXQ BIT(8)</div><div class='del'>-#define BIT_STOP_HI7Q BIT(7)</div><div class='del'>-#define BIT_STOP_HI6Q BIT(6)</div><div class='del'>-#define BIT_STOP_HI5Q BIT(5)</div><div class='del'>-#define BIT_STOP_HI4Q BIT(4)</div><div class='del'>-#define BIT_STOP_HI3Q BIT(3)</div><div class='del'>-#define BIT_STOP_HI2Q BIT(2)</div><div class='del'>-#define BIT_STOP_HI1Q BIT(1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_C2H_STR_ADDR 0</div><div class='del'>-#define BIT_MASK_R_C2H_STR_ADDR 0xffff</div><div class='del'>-#define BIT_R_C2H_STR_ADDR(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_C2H_STR_ADDR) &lt;&lt; BIT_SHIFT_R_C2H_STR_ADDR)</div><div class='del'>-#define BIT_GET_R_C2H_STR_ADDR(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_C2H_STR_ADDR) &amp; BIT_MASK_R_C2H_STR_ADDR)</div><div class='del'>-</div><div class='del'>-#define BIT_STOP_HI0Q BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_C2H				(Offset 0x0298) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C2H_DMA_ADDR 0</div><div class='del'>-#define BIT_MASK_C2H_DMA_ADDR 0x3ffff</div><div class='del'>-#define BIT_C2H_DMA_ADDR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_C2H_DMA_ADDR) &lt;&lt; BIT_SHIFT_C2H_DMA_ADDR)</div><div class='del'>-#define BIT_GET_C2H_DMA_ADDR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_C2H_DMA_ADDR) &amp; BIT_MASK_C2H_DMA_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_CTRL				(Offset 0x029C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FWFF_DMAPKT_REQ BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_DMA_PKT_NUM 16</div><div class='del'>-#define BIT_MASK_FWFF_DMA_PKT_NUM 0xff</div><div class='del'>-#define BIT_FWFF_DMA_PKT_NUM(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_DMA_PKT_NUM) &lt;&lt; BIT_SHIFT_FWFF_DMA_PKT_NUM)</div><div class='del'>-#define BIT_GET_FWFF_DMA_PKT_NUM(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_DMA_PKT_NUM) &amp; BIT_MASK_FWFF_DMA_PKT_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_STR_ADDR 0</div><div class='del'>-#define BIT_MASK_FWFF_STR_ADDR 0xffff</div><div class='del'>-#define BIT_FWFF_STR_ADDR(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_STR_ADDR) &lt;&lt; BIT_SHIFT_FWFF_STR_ADDR)</div><div class='del'>-#define BIT_GET_FWFF_STR_ADDR(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_STR_ADDR) &amp; BIT_MASK_FWFF_STR_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_PKT_INFO			(Offset 0x02A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_PKT_QUEUED 16</div><div class='del'>-#define BIT_MASK_FWFF_PKT_QUEUED 0xff</div><div class='del'>-#define BIT_FWFF_PKT_QUEUED(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_PKT_QUEUED) &lt;&lt; BIT_SHIFT_FWFF_PKT_QUEUED)</div><div class='del'>-#define BIT_GET_FWFF_PKT_QUEUED(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_PKT_QUEUED) &amp; BIT_MASK_FWFF_PKT_QUEUED)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_PKT_INFO			(Offset 0x02A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_PKT_STR_ADDR 0</div><div class='del'>-#define BIT_MASK_FWFF_PKT_STR_ADDR 0xffff</div><div class='del'>-#define BIT_FWFF_PKT_STR_ADDR(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_PKT_STR_ADDR) &lt;&lt; BIT_SHIFT_FWFF_PKT_STR_ADDR)</div><div class='del'>-#define BIT_GET_FWFF_PKT_STR_ADDR(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_PKT_STR_ADDR) &amp; BIT_MASK_FWFF_PKT_STR_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL				(Offset 0x0300) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIEIO_PERSTB_SEL BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL				(Offset 0x0300) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MAX_RXDMA 28</div><div class='del'>-#define BIT_MASK_PCIE_MAX_RXDMA 0x7</div><div class='del'>-#define BIT_PCIE_MAX_RXDMA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MAX_RXDMA) &lt;&lt; BIT_SHIFT_PCIE_MAX_RXDMA)</div><div class='del'>-#define BIT_GET_PCIE_MAX_RXDMA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MAX_RXDMA) &amp; BIT_MASK_PCIE_MAX_RXDMA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL				(Offset 0x0300) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MAX_TXDMA 24</div><div class='del'>-#define BIT_MASK_PCIE_MAX_TXDMA 0x7</div><div class='del'>-#define BIT_PCIE_MAX_TXDMA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MAX_TXDMA) &lt;&lt; BIT_SHIFT_PCIE_MAX_TXDMA)</div><div class='del'>-#define BIT_GET_PCIE_MAX_TXDMA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MAX_TXDMA) &amp; BIT_MASK_PCIE_MAX_TXDMA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL				(Offset 0x0300) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_RST_TRXDMA_INTF BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL				(Offset 0x0300) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_EN_SWENT_L23 BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL				(Offset 0x0300) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_EN_HWEXT_L1 BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_INT_MIG				(Offset 0x0304) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXTTIMER_MATCH_NUM 28</div><div class='del'>-#define BIT_MASK_TXTTIMER_MATCH_NUM 0xf</div><div class='del'>-#define BIT_TXTTIMER_MATCH_NUM(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXTTIMER_MATCH_NUM) &lt;&lt; BIT_SHIFT_TXTTIMER_MATCH_NUM)</div><div class='del'>-#define BIT_GET_TXTTIMER_MATCH_NUM(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXTTIMER_MATCH_NUM) &amp; BIT_MASK_TXTTIMER_MATCH_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKT_NUM_MATCH 24</div><div class='del'>-#define BIT_MASK_TXPKT_NUM_MATCH 0xf</div><div class='del'>-#define BIT_TXPKT_NUM_MATCH(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKT_NUM_MATCH) &lt;&lt; BIT_SHIFT_TXPKT_NUM_MATCH)</div><div class='del'>-#define BIT_GET_TXPKT_NUM_MATCH(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKT_NUM_MATCH) &amp; BIT_MASK_TXPKT_NUM_MATCH)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXTTIMER_MATCH_NUM 20</div><div class='del'>-#define BIT_MASK_RXTTIMER_MATCH_NUM 0xf</div><div class='del'>-#define BIT_RXTTIMER_MATCH_NUM(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXTTIMER_MATCH_NUM) &lt;&lt; BIT_SHIFT_RXTTIMER_MATCH_NUM)</div><div class='del'>-#define BIT_GET_RXTTIMER_MATCH_NUM(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXTTIMER_MATCH_NUM) &amp; BIT_MASK_RXTTIMER_MATCH_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT_NUM_MATCH 16</div><div class='del'>-#define BIT_MASK_RXPKT_NUM_MATCH 0xf</div><div class='del'>-#define BIT_RXPKT_NUM_MATCH(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKT_NUM_MATCH) &lt;&lt; BIT_SHIFT_RXPKT_NUM_MATCH)</div><div class='del'>-#define BIT_GET_RXPKT_NUM_MATCH(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT_NUM_MATCH) &amp; BIT_MASK_RXPKT_NUM_MATCH)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MIGRATE_TIMER 0</div><div class='del'>-#define BIT_MASK_MIGRATE_TIMER 0xffff</div><div class='del'>-#define BIT_MIGRATE_TIMER(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MIGRATE_TIMER) &lt;&lt; BIT_SHIFT_MIGRATE_TIMER)</div><div class='del'>-#define BIT_GET_MIGRATE_TIMER(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MIGRATE_TIMER) &amp; BIT_MASK_MIGRATE_TIMER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ_TXBD_DESA			(Offset 0x0308) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_BCNQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_BCNQ_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_BCNQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_BCNQ_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_TXBD_DESA) &amp; BIT_MASK_BCNQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_DESA			(Offset 0x0310) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_MGQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_MGQ_TXBD_DESA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_MGQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_MGQ_TXBD_DESA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_TXBD_DESA) &amp; BIT_MASK_MGQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_DESA			(Offset 0x0318) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_VOQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_VOQ_TXBD_DESA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_VOQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_VOQ_TXBD_DESA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_TXBD_DESA) &amp; BIT_MASK_VOQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_DESA			(Offset 0x0320) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_VIQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_VIQ_TXBD_DESA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_VIQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_VIQ_TXBD_DESA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_TXBD_DESA) &amp; BIT_MASK_VIQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_DESA			(Offset 0x0328) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_BEQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_BEQ_TXBD_DESA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_BEQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_BEQ_TXBD_DESA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_TXBD_DESA) &amp; BIT_MASK_BEQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_DESA			(Offset 0x0330) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_BKQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_BKQ_TXBD_DESA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_BKQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_BKQ_TXBD_DESA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_TXBD_DESA) &amp; BIT_MASK_BKQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXQ_RXBD_DESA			(Offset 0x0338) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_RXBD_DESA 0</div><div class='del'>-#define BIT_MASK_RXQ_RXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_RXQ_RXBD_DESA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_RXBD_DESA) &lt;&lt; BIT_SHIFT_RXQ_RXBD_DESA)</div><div class='del'>-#define BIT_GET_RXQ_RXBD_DESA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_RXBD_DESA) &amp; BIT_MASK_RXQ_RXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI0Q_TXBD_DESA			(Offset 0x0340) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI0Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI0Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI0Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI0Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_TXBD_DESA) &amp; BIT_MASK_HI0Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI1Q_TXBD_DESA			(Offset 0x0348) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI1Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI1Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI1Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI1Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_TXBD_DESA) &amp; BIT_MASK_HI1Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI2Q_TXBD_DESA			(Offset 0x0350) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI2Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI2Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI2Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI2Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_TXBD_DESA) &amp; BIT_MASK_HI2Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI3Q_TXBD_DESA			(Offset 0x0358) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI3Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI3Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI3Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI3Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_TXBD_DESA) &amp; BIT_MASK_HI3Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI4Q_TXBD_DESA			(Offset 0x0360) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI4Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI4Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI4Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI4Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_TXBD_DESA) &amp; BIT_MASK_HI4Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI5Q_TXBD_DESA			(Offset 0x0368) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI5Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI5Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI5Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI5Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_TXBD_DESA) &amp; BIT_MASK_HI5Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI6Q_TXBD_DESA			(Offset 0x0370) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI6Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI6Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI6Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI6Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_TXBD_DESA) &amp; BIT_MASK_HI6Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI7Q_TXBD_DESA			(Offset 0x0378) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_HI7Q_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI7Q_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_TXBD_DESA) &lt;&lt; BIT_SHIFT_HI7Q_TXBD_DESA)</div><div class='del'>-#define BIT_GET_HI7Q_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_TXBD_DESA) &amp; BIT_MASK_HI7Q_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_NUM			(Offset 0x0380) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_MGQ_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_NUM			(Offset 0x0380) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_MGQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_MGQ_DESC_MODE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_DESC_MODE) &lt;&lt; BIT_SHIFT_MGQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_MGQ_DESC_MODE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_DESC_MODE) &amp; BIT_MASK_MGQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_MGQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_MGQ_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_DESC_NUM) &lt;&lt; BIT_SHIFT_MGQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_MGQ_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_DESC_NUM) &amp; BIT_MASK_MGQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_RXBD_NUM				(Offset 0x0382) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYS_32_64 BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_DESC_MODE 13</div><div class='del'>-#define BIT_MASK_BCNQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_BCNQ_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_DESC_MODE) &lt;&lt; BIT_SHIFT_BCNQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_BCNQ_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_DESC_MODE) &amp; BIT_MASK_BCNQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_RXBD_NUM				(Offset 0x0382) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_BCNQ_FLAG BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_RXBD_NUM				(Offset 0x0382) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_RXQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_RXQ_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_DESC_NUM) &lt;&lt; BIT_SHIFT_RXQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_RXQ_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_DESC_NUM) &amp; BIT_MASK_RXQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_NUM			(Offset 0x0384) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_VOQ_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_NUM			(Offset 0x0384) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_VOQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_VOQ_DESC_MODE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_DESC_MODE) &lt;&lt; BIT_SHIFT_VOQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_VOQ_DESC_MODE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_DESC_MODE) &amp; BIT_MASK_VOQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_VOQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_VOQ_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_DESC_NUM) &lt;&lt; BIT_SHIFT_VOQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_VOQ_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_DESC_NUM) &amp; BIT_MASK_VOQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_NUM			(Offset 0x0386) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_VIQ_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_NUM			(Offset 0x0386) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_VIQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_VIQ_DESC_MODE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_DESC_MODE) &lt;&lt; BIT_SHIFT_VIQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_VIQ_DESC_MODE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_DESC_MODE) &amp; BIT_MASK_VIQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_VIQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_VIQ_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_DESC_NUM) &lt;&lt; BIT_SHIFT_VIQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_VIQ_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_DESC_NUM) &amp; BIT_MASK_VIQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_NUM			(Offset 0x0388) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_BEQ_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_NUM			(Offset 0x0388) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_BEQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_BEQ_DESC_MODE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_DESC_MODE) &lt;&lt; BIT_SHIFT_BEQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_BEQ_DESC_MODE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_DESC_MODE) &amp; BIT_MASK_BEQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_BEQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_BEQ_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_DESC_NUM) &lt;&lt; BIT_SHIFT_BEQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_BEQ_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_DESC_NUM) &amp; BIT_MASK_BEQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_NUM			(Offset 0x038A) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_BKQ_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_NUM			(Offset 0x038A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_BKQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_BKQ_DESC_MODE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_DESC_MODE) &lt;&lt; BIT_SHIFT_BKQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_BKQ_DESC_MODE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_DESC_MODE) &amp; BIT_MASK_BKQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_BKQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_BKQ_DESC_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_DESC_NUM) &lt;&lt; BIT_SHIFT_BKQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_BKQ_DESC_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_DESC_NUM) &amp; BIT_MASK_BKQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI0Q_TXBD_NUM			(Offset 0x038C) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI0Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI0Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI0Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI0Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI0Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_DESC_MODE) &amp; BIT_MASK_HI0Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI0Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI0Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI0Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI0Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_DESC_NUM) &amp; BIT_MASK_HI0Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI1Q_TXBD_NUM			(Offset 0x038E) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI1Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI1Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI1Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI1Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI1Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_DESC_MODE) &amp; BIT_MASK_HI1Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI1Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI1Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI1Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI1Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_DESC_NUM) &amp; BIT_MASK_HI1Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI2Q_TXBD_NUM			(Offset 0x0390) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI2Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI2Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI2Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI2Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI2Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_DESC_MODE) &amp; BIT_MASK_HI2Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI2Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI2Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI2Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI2Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_DESC_NUM) &amp; BIT_MASK_HI2Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI3Q_TXBD_NUM			(Offset 0x0392) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI3Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI3Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI3Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI3Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI3Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_DESC_MODE) &amp; BIT_MASK_HI3Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI3Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI3Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI3Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI3Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_DESC_NUM) &amp; BIT_MASK_HI3Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI4Q_TXBD_NUM			(Offset 0x0394) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI4Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI4Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI4Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI4Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI4Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_DESC_MODE) &amp; BIT_MASK_HI4Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI4Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI4Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI4Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI4Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_DESC_NUM) &amp; BIT_MASK_HI4Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI5Q_TXBD_NUM			(Offset 0x0396) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI5Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI5Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI5Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI5Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI5Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_DESC_MODE) &amp; BIT_MASK_HI5Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI5Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI5Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI5Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI5Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_DESC_NUM) &amp; BIT_MASK_HI5Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI6Q_TXBD_NUM			(Offset 0x0398) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI6Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI6Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI6Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI6Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI6Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_DESC_MODE) &amp; BIT_MASK_HI6Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI6Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI6Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI6Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI6Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_DESC_NUM) &amp; BIT_MASK_HI6Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI7Q_TXBD_NUM			(Offset 0x039A) */</div><div class='del'>-</div><div class='del'>-#define BIT_HI7Q_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_HI7Q_DESC_MODE 0x3</div><div class='del'>-#define BIT_HI7Q_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_DESC_MODE) &lt;&lt; BIT_SHIFT_HI7Q_DESC_MODE)</div><div class='del'>-#define BIT_GET_HI7Q_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_DESC_MODE) &amp; BIT_MASK_HI7Q_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_HI7Q_DESC_NUM 0xfff</div><div class='del'>-#define BIT_HI7Q_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_DESC_NUM) &lt;&lt; BIT_SHIFT_HI7Q_DESC_NUM)</div><div class='del'>-#define BIT_GET_HI7Q_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_DESC_NUM) &amp; BIT_MASK_HI7Q_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI7Q_HW_IDX BIT(29)</div><div class='del'>-#define BIT_CLR_HI6Q_HW_IDX BIT(28)</div><div class='del'>-#define BIT_CLR_HI5Q_HW_IDX BIT(27)</div><div class='del'>-#define BIT_CLR_HI4Q_HW_IDX BIT(26)</div><div class='del'>-#define BIT_CLR_HI3Q_HW_IDX BIT(25)</div><div class='del'>-#define BIT_CLR_HI2Q_HW_IDX BIT(24)</div><div class='del'>-#define BIT_CLR_HI1Q_HW_IDX BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI0Q_HW_IDX BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_BKQ_HW_IDX BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_BEQ_HW_IDX BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_VIQ_HW_IDX BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_VOQ_HW_IDX BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_MGQ_HW_IDX BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTIMER_HCI			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT2_HCI 16</div><div class='del'>-#define BIT_MASK_TSFT2_HCI 0xffff</div><div class='del'>-#define BIT_TSFT2_HCI(x) (((x) &amp; BIT_MASK_TSFT2_HCI) &lt;&lt; BIT_SHIFT_TSFT2_HCI)</div><div class='del'>-#define BIT_GET_TSFT2_HCI(x) (((x) &gt;&gt; BIT_SHIFT_TSFT2_HCI) &amp; BIT_MASK_TSFT2_HCI)</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_RXQ_HW_IDX BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI7Q_HOST_IDX BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI6Q_HOST_IDX BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI5Q_HOST_IDX BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI4Q_HOST_IDX BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI3Q_HOST_IDX BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI2Q_HOST_IDX BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_HI1Q_HOST_IDX BIT(7)</div><div class='del'>-#define BIT_CLR_HI0Q_HOST_IDX BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_BKQ_HOST_IDX BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_BEQ_HOST_IDX BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_VIQ_HOST_IDX BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_VOQ_HOST_IDX BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_MGQ_HOST_IDX BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTIMER_HCI			(Offset 0x039C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT1_HCI 0</div><div class='del'>-#define BIT_MASK_TSFT1_HCI 0xffff</div><div class='del'>-#define BIT_TSFT1_HCI(x) (((x) &amp; BIT_MASK_TSFT1_HCI) &lt;&lt; BIT_SHIFT_TSFT1_HCI)</div><div class='del'>-#define BIT_GET_TSFT1_HCI(x) (((x) &gt;&gt; BIT_SHIFT_TSFT1_HCI) &amp; BIT_MASK_TSFT1_HCI)</div><div class='del'>-</div><div class='del'>-#define BIT_CLR_RXQ_HOST_IDX BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_IDX			(Offset 0x03A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_VOQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_VOQ_HW_IDX(x) (((x) &amp; BIT_MASK_VOQ_HW_IDX) &lt;&lt; BIT_SHIFT_VOQ_HW_IDX)</div><div class='del'>-#define BIT_GET_VOQ_HW_IDX(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_HW_IDX) &amp; BIT_MASK_VOQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_VOQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_VOQ_HOST_IDX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_HOST_IDX) &lt;&lt; BIT_SHIFT_VOQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_VOQ_HOST_IDX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_HOST_IDX) &amp; BIT_MASK_VOQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_IDX			(Offset 0x03A4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_VIQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_VIQ_HW_IDX(x) (((x) &amp; BIT_MASK_VIQ_HW_IDX) &lt;&lt; BIT_SHIFT_VIQ_HW_IDX)</div><div class='del'>-#define BIT_GET_VIQ_HW_IDX(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_HW_IDX) &amp; BIT_MASK_VIQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_VIQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_VIQ_HOST_IDX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_HOST_IDX) &lt;&lt; BIT_SHIFT_VIQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_VIQ_HOST_IDX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_HOST_IDX) &amp; BIT_MASK_VIQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_IDX			(Offset 0x03A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_BEQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_BEQ_HW_IDX(x) (((x) &amp; BIT_MASK_BEQ_HW_IDX) &lt;&lt; BIT_SHIFT_BEQ_HW_IDX)</div><div class='del'>-#define BIT_GET_BEQ_HW_IDX(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_HW_IDX) &amp; BIT_MASK_BEQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_BEQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_BEQ_HOST_IDX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_HOST_IDX) &lt;&lt; BIT_SHIFT_BEQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_BEQ_HOST_IDX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_HOST_IDX) &amp; BIT_MASK_BEQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_IDX			(Offset 0x03AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_BKQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_BKQ_HW_IDX(x) (((x) &amp; BIT_MASK_BKQ_HW_IDX) &lt;&lt; BIT_SHIFT_BKQ_HW_IDX)</div><div class='del'>-#define BIT_GET_BKQ_HW_IDX(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_HW_IDX) &amp; BIT_MASK_BKQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_BKQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_BKQ_HOST_IDX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_HOST_IDX) &lt;&lt; BIT_SHIFT_BKQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_BKQ_HOST_IDX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_HOST_IDX) &amp; BIT_MASK_BKQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_IDX			(Offset 0x03B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_MGQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_MGQ_HW_IDX(x) (((x) &amp; BIT_MASK_MGQ_HW_IDX) &lt;&lt; BIT_SHIFT_MGQ_HW_IDX)</div><div class='del'>-#define BIT_GET_MGQ_HW_IDX(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_HW_IDX) &amp; BIT_MASK_MGQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_MGQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_MGQ_HOST_IDX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_HOST_IDX) &lt;&lt; BIT_SHIFT_MGQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_MGQ_HOST_IDX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_HOST_IDX) &amp; BIT_MASK_MGQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXQ_RXBD_IDX			(Offset 0x03B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_RXQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_RXQ_HW_IDX(x) (((x) &amp; BIT_MASK_RXQ_HW_IDX) &lt;&lt; BIT_SHIFT_RXQ_HW_IDX)</div><div class='del'>-#define BIT_GET_RXQ_HW_IDX(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_HW_IDX) &amp; BIT_MASK_RXQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_RXQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_RXQ_HOST_IDX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_HOST_IDX) &lt;&lt; BIT_SHIFT_RXQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_RXQ_HOST_IDX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_HOST_IDX) &amp; BIT_MASK_RXQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI0Q_TXBD_IDX			(Offset 0x03B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI0Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI0Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI0Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI0Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_HW_IDX) &amp; BIT_MASK_HI0Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI0Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI0Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI0Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI0Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_HOST_IDX) &amp; BIT_MASK_HI0Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI1Q_TXBD_IDX			(Offset 0x03BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI1Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI1Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI1Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI1Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_HW_IDX) &amp; BIT_MASK_HI1Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI1Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI1Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI1Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI1Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_HOST_IDX) &amp; BIT_MASK_HI1Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI2Q_TXBD_IDX			(Offset 0x03C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI2Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI2Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI2Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI2Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_HW_IDX) &amp; BIT_MASK_HI2Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI2Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI2Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI2Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI2Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_HOST_IDX) &amp; BIT_MASK_HI2Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI3Q_TXBD_IDX			(Offset 0x03C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI3Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI3Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI3Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI3Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_HW_IDX) &amp; BIT_MASK_HI3Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI3Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI3Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI3Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI3Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_HOST_IDX) &amp; BIT_MASK_HI3Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI4Q_TXBD_IDX			(Offset 0x03C8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI4Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI4Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI4Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI4Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_HW_IDX) &amp; BIT_MASK_HI4Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI4Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI4Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI4Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI4Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_HOST_IDX) &amp; BIT_MASK_HI4Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI5Q_TXBD_IDX			(Offset 0x03CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI5Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI5Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI5Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI5Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_HW_IDX) &amp; BIT_MASK_HI5Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI5Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI5Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI5Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI5Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_HOST_IDX) &amp; BIT_MASK_HI5Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI6Q_TXBD_IDX			(Offset 0x03D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI6Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI6Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI6Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI6Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_HW_IDX) &amp; BIT_MASK_HI6Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI6Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI6Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI6Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI6Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_HOST_IDX) &amp; BIT_MASK_HI6Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI7Q_TXBD_IDX			(Offset 0x03D4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_HW_IDX 16</div><div class='del'>-#define BIT_MASK_HI7Q_HW_IDX 0xfff</div><div class='del'>-#define BIT_HI7Q_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_HW_IDX) &lt;&lt; BIT_SHIFT_HI7Q_HW_IDX)</div><div class='del'>-#define BIT_GET_HI7Q_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_HW_IDX) &amp; BIT_MASK_HI7Q_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_HI7Q_HOST_IDX 0xfff</div><div class='del'>-#define BIT_HI7Q_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_HOST_IDX) &lt;&lt; BIT_SHIFT_HI7Q_HOST_IDX)</div><div class='del'>-#define BIT_GET_HI7Q_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_HOST_IDX) &amp; BIT_MASK_HI7Q_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBG_SEL_V1				(Offset 0x03D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_TXDMA_PRE BIT(7)</div><div class='del'>-#define BIT_DIS_RXDMA_PRE BIT(6)</div><div class='del'>-#define BIT_TXFLAG_EXIT_L1_EN BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBG_SEL 0</div><div class='del'>-#define BIT_MASK_DBG_SEL 0xff</div><div class='del'>-#define BIT_DBG_SEL(x) (((x) &amp; BIT_MASK_DBG_SEL) &lt;&lt; BIT_SHIFT_DBG_SEL)</div><div class='del'>-#define BIT_GET_DBG_SEL(x) (((x) &gt;&gt; BIT_SHIFT_DBG_SEL) &amp; BIT_MASK_DBG_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HRPWM1_V1			(Offset 0x03D9) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HRPWM 0</div><div class='del'>-#define BIT_MASK_PCIE_HRPWM 0xff</div><div class='del'>-#define BIT_PCIE_HRPWM(x) (((x) &amp; BIT_MASK_PCIE_HRPWM) &lt;&lt; BIT_SHIFT_PCIE_HRPWM)</div><div class='del'>-#define BIT_GET_PCIE_HRPWM(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HRPWM) &amp; BIT_MASK_PCIE_HRPWM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HCPWM1_V1			(Offset 0x03DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HCPWM 0</div><div class='del'>-#define BIT_MASK_PCIE_HCPWM 0xff</div><div class='del'>-#define BIT_PCIE_HCPWM(x) (((x) &amp; BIT_MASK_PCIE_HCPWM) &lt;&lt; BIT_SHIFT_PCIE_HCPWM)</div><div class='del'>-#define BIT_GET_PCIE_HCPWM(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HCPWM) &amp; BIT_MASK_PCIE_HCPWM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL2				(Offset 0x03DB) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPS_CLKR_PCIE 4</div><div class='del'>-#define BIT_MASK_HPS_CLKR_PCIE 0x3</div><div class='del'>-#define BIT_HPS_CLKR_PCIE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPS_CLKR_PCIE) &lt;&lt; BIT_SHIFT_HPS_CLKR_PCIE)</div><div class='del'>-#define BIT_GET_HPS_CLKR_PCIE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPS_CLKR_PCIE) &amp; BIT_MASK_HPS_CLKR_PCIE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL2				(Offset 0x03DB) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL2				(Offset 0x03DB) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_RXDMA_ALIGN BIT(1)</div><div class='del'>-#define BIT_EN_TXDMA_ALIGN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HRPWM2_V1			(Offset 0x03DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HRPWM2 0</div><div class='del'>-#define BIT_MASK_PCIE_HRPWM2 0xffff</div><div class='del'>-#define BIT_PCIE_HRPWM2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_HRPWM2) &lt;&lt; BIT_SHIFT_PCIE_HRPWM2)</div><div class='del'>-#define BIT_GET_PCIE_HRPWM2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HRPWM2) &amp; BIT_MASK_PCIE_HRPWM2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HCPWM2_V1			(Offset 0x03DE) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HCPWM2 0</div><div class='del'>-#define BIT_MASK_PCIE_HCPWM2 0xffff</div><div class='del'>-#define BIT_PCIE_HCPWM2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_HCPWM2) &lt;&lt; BIT_SHIFT_PCIE_HCPWM2)</div><div class='del'>-#define BIT_GET_PCIE_HCPWM2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HCPWM2) &amp; BIT_MASK_PCIE_HCPWM2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_H2C_MSG_V1			(Offset 0x03E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DRV2FW_INFO 0</div><div class='del'>-#define BIT_MASK_DRV2FW_INFO 0xffffffffL</div><div class='del'>-#define BIT_DRV2FW_INFO(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_DRV2FW_INFO) &lt;&lt; BIT_SHIFT_DRV2FW_INFO)</div><div class='del'>-#define BIT_GET_DRV2FW_INFO(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DRV2FW_INFO) &amp; BIT_MASK_DRV2FW_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_C2H_MSG_V1			(Offset 0x03E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HCI_PCIE_C2H_MSG 0</div><div class='del'>-#define BIT_MASK_HCI_PCIE_C2H_MSG 0xffffffffL</div><div class='del'>-#define BIT_HCI_PCIE_C2H_MSG(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HCI_PCIE_C2H_MSG) &lt;&lt; BIT_SHIFT_HCI_PCIE_C2H_MSG)</div><div class='del'>-#define BIT_GET_HCI_PCIE_C2H_MSG(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HCI_PCIE_C2H_MSG) &amp; BIT_MASK_HCI_PCIE_C2H_MSG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBI_WDATA_V1			(Offset 0x03E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_WDATA 0</div><div class='del'>-#define BIT_MASK_DBI_WDATA 0xffffffffL</div><div class='del'>-#define BIT_DBI_WDATA(x) (((x) &amp; BIT_MASK_DBI_WDATA) &lt;&lt; BIT_SHIFT_DBI_WDATA)</div><div class='del'>-#define BIT_GET_DBI_WDATA(x) (((x) &gt;&gt; BIT_SHIFT_DBI_WDATA) &amp; BIT_MASK_DBI_WDATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBI_RDATA_V1			(Offset 0x03EC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_RDATA 0</div><div class='del'>-#define BIT_MASK_DBI_RDATA 0xffffffffL</div><div class='del'>-#define BIT_DBI_RDATA(x) (((x) &amp; BIT_MASK_DBI_RDATA) &lt;&lt; BIT_SHIFT_DBI_RDATA)</div><div class='del'>-#define BIT_GET_DBI_RDATA(x) (((x) &gt;&gt; BIT_SHIFT_DBI_RDATA) &amp; BIT_MASK_DBI_RDATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBI_FLAG_V1				(Offset 0x03F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_STUCK_DBG BIT(26)</div><div class='del'>-#define BIT_RX_STUCK BIT(25)</div><div class='del'>-#define BIT_TX_STUCK BIT(24)</div><div class='del'>-#define BIT_DBI_RFLAG BIT(17)</div><div class='del'>-#define BIT_DBI_WFLAG BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_WREN 12</div><div class='del'>-#define BIT_MASK_DBI_WREN 0xf</div><div class='del'>-#define BIT_DBI_WREN(x) (((x) &amp; BIT_MASK_DBI_WREN) &lt;&lt; BIT_SHIFT_DBI_WREN)</div><div class='del'>-#define BIT_GET_DBI_WREN(x) (((x) &gt;&gt; BIT_SHIFT_DBI_WREN) &amp; BIT_MASK_DBI_WREN)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_ADDR 0</div><div class='del'>-#define BIT_MASK_DBI_ADDR 0xfff</div><div class='del'>-#define BIT_DBI_ADDR(x) (((x) &amp; BIT_MASK_DBI_ADDR) &lt;&lt; BIT_SHIFT_DBI_ADDR)</div><div class='del'>-#define BIT_GET_DBI_ADDR(x) (((x) &gt;&gt; BIT_SHIFT_DBI_ADDR) &amp; BIT_MASK_DBI_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MDIO_V1				(Offset 0x03F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_RDATA 16</div><div class='del'>-#define BIT_MASK_MDIO_RDATA 0xffff</div><div class='del'>-#define BIT_MDIO_RDATA(x) (((x) &amp; BIT_MASK_MDIO_RDATA) &lt;&lt; BIT_SHIFT_MDIO_RDATA)</div><div class='del'>-#define BIT_GET_MDIO_RDATA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_RDATA) &amp; BIT_MASK_MDIO_RDATA)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_WDATA 0</div><div class='del'>-#define BIT_MASK_MDIO_WDATA 0xffff</div><div class='del'>-#define BIT_MDIO_WDATA(x) (((x) &amp; BIT_MASK_MDIO_WDATA) &lt;&lt; BIT_SHIFT_MDIO_WDATA)</div><div class='del'>-#define BIT_GET_MDIO_WDATA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_WDATA) &amp; BIT_MASK_MDIO_WDATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIX_CFG			(Offset 0x03F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_WATCH_DOG BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIX_CFG			(Offset 0x03F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_REG_ADDR_V1 0</div><div class='del'>-#define BIT_MASK_MDIO_REG_ADDR_V1 0x1f</div><div class='del'>-#define BIT_MDIO_REG_ADDR_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MDIO_REG_ADDR_V1) &lt;&lt; BIT_SHIFT_MDIO_REG_ADDR_V1)</div><div class='del'>-#define BIT_GET_MDIO_REG_ADDR_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_REG_ADDR_V1) &amp; BIT_MASK_MDIO_REG_ADDR_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_MIX_CFG				(Offset 0x03FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_HOST_GEN2_SUPPORT BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_ERR_FLAG 16</div><div class='del'>-#define BIT_MASK_TXDMA_ERR_FLAG 0xf</div><div class='del'>-#define BIT_TXDMA_ERR_FLAG(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_ERR_FLAG) &lt;&lt; BIT_SHIFT_TXDMA_ERR_FLAG)</div><div class='del'>-#define BIT_GET_TXDMA_ERR_FLAG(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_ERR_FLAG) &amp; BIT_MASK_TXDMA_ERR_FLAG)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EARLY_MODE_SEL 12</div><div class='del'>-#define BIT_MASK_EARLY_MODE_SEL 0xf</div><div class='del'>-#define BIT_EARLY_MODE_SEL(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_EARLY_MODE_SEL) &lt;&lt; BIT_SHIFT_EARLY_MODE_SEL)</div><div class='del'>-#define BIT_GET_EARLY_MODE_SEL(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EARLY_MODE_SEL) &amp; BIT_MASK_EARLY_MODE_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_EPHY_RX50_EN BIT(11)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MSI_TIMEOUT_ID_V1 8</div><div class='del'>-#define BIT_MASK_MSI_TIMEOUT_ID_V1 0x7</div><div class='del'>-#define BIT_MSI_TIMEOUT_ID_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MSI_TIMEOUT_ID_V1) &lt;&lt; BIT_SHIFT_MSI_TIMEOUT_ID_V1)</div><div class='del'>-#define BIT_GET_MSI_TIMEOUT_ID_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MSI_TIMEOUT_ID_V1) &amp; BIT_MASK_MSI_TIMEOUT_ID_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_RADDR_RD BIT(7)</div><div class='del'>-#define BIT_EN_MUL_TAG BIT(6)</div><div class='del'>-#define BIT_EN_EARLY_MODE BIT(5)</div><div class='del'>-#define BIT_L0S_LINK_OFF BIT(4)</div><div class='del'>-#define BIT_ACT_LINK_OFF BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_MIX_CFG				(Offset 0x03FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_SLOW_MAC_TX BIT(2)</div><div class='del'>-#define BIT_EN_SLOW_MAC_RX BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_INFO				(Offset 0x0400) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q0_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q0_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q0_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q0_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q0_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q0_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q0_V1) &amp; BIT_MASK_QUEUEMACID_Q0_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q0_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q0_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q0_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q0_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q0_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q0_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q0_V1) &amp; BIT_MASK_QUEUEAC_Q0_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_INFO				(Offset 0x0400) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q0_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_INFO				(Offset 0x0400) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q0_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q0_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q0_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q0_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q0_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q0_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q0_V2) &amp; BIT_MASK_TAIL_PKT_Q0_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_INFO				(Offset 0x0400) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q0_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q0_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q0_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q0_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q0_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q0_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q0_V1) &amp; BIT_MASK_HEAD_PKT_Q0_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q1_INFO				(Offset 0x0404) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q1_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q1_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q1_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q1_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q1_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q1_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q1_V1) &amp; BIT_MASK_QUEUEMACID_Q1_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q1_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q1_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q1_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q1_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q1_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q1_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q1_V1) &amp; BIT_MASK_QUEUEAC_Q1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q1_INFO				(Offset 0x0404) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q1_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q1_INFO				(Offset 0x0404) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q1_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q1_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q1_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q1_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q1_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q1_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q1_V2) &amp; BIT_MASK_TAIL_PKT_Q1_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q1_INFO				(Offset 0x0404) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q1_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q1_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q1_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q1_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q1_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q1_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q1_V1) &amp; BIT_MASK_HEAD_PKT_Q1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_INFO				(Offset 0x0408) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q2_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q2_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q2_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q2_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q2_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q2_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q2_V1) &amp; BIT_MASK_QUEUEMACID_Q2_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q2_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q2_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q2_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q2_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q2_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q2_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q2_V1) &amp; BIT_MASK_QUEUEAC_Q2_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_INFO				(Offset 0x0408) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q2_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_INFO				(Offset 0x0408) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q2_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q2_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q2_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q2_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q2_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q2_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q2_V2) &amp; BIT_MASK_TAIL_PKT_Q2_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_INFO				(Offset 0x0408) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q2_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q2_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q2_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q2_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q2_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q2_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q2_V1) &amp; BIT_MASK_HEAD_PKT_Q2_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q3_INFO				(Offset 0x040C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q3_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q3_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q3_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q3_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q3_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q3_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q3_V1) &amp; BIT_MASK_QUEUEMACID_Q3_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q3_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q3_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q3_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q3_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q3_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q3_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q3_V1) &amp; BIT_MASK_QUEUEAC_Q3_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q3_INFO				(Offset 0x040C) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q3_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q3_INFO				(Offset 0x040C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q3_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q3_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q3_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q3_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q3_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q3_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q3_V2) &amp; BIT_MASK_TAIL_PKT_Q3_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q3_INFO				(Offset 0x040C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q3_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q3_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q3_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q3_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q3_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q3_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q3_V1) &amp; BIT_MASK_HEAD_PKT_Q3_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_INFO				(Offset 0x0410) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_MGQ_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_MGQ_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_MGQ_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_MGQ_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_MGQ_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_MGQ_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_MGQ_V1) &amp; BIT_MASK_QUEUEMACID_MGQ_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_MGQ_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_MGQ_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_MGQ_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_MGQ_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_MGQ_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_MGQ_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_MGQ_V1) &amp; BIT_MASK_QUEUEAC_MGQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_INFO				(Offset 0x0410) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_MGQ_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_INFO				(Offset 0x0410) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_MGQ_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_MGQ_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_MGQ_V2(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_MGQ_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_MGQ_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_MGQ_V2(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_MGQ_V2) &amp; BIT_MASK_TAIL_PKT_MGQ_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_INFO				(Offset 0x0410) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_MGQ_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_MGQ_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_MGQ_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_MGQ_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_MGQ_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_MGQ_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_MGQ_V1) &amp; BIT_MASK_HEAD_PKT_MGQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_INFO				(Offset 0x0414) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_HIQ_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_HIQ_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_HIQ_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_HIQ_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_HIQ_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_HIQ_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_HIQ_V1) &amp; BIT_MASK_QUEUEMACID_HIQ_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_HIQ_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_HIQ_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_HIQ_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_HIQ_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_HIQ_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_HIQ_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_HIQ_V1) &amp; BIT_MASK_QUEUEAC_HIQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_INFO				(Offset 0x0414) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_HIQ_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_INFO				(Offset 0x0414) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_HIQ_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_HIQ_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_HIQ_V2(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_HIQ_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_HIQ_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_HIQ_V2(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_HIQ_V2) &amp; BIT_MASK_TAIL_PKT_HIQ_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_INFO				(Offset 0x0414) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_HIQ_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_HIQ_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_HIQ_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_HIQ_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_HIQ_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_HIQ_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_HIQ_V1) &amp; BIT_MASK_HEAD_PKT_HIQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ_INFO				(Offset 0x0418) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_HEAD_PG_V1 0</div><div class='del'>-#define BIT_MASK_BCNQ_HEAD_PG_V1 0xfff</div><div class='del'>-#define BIT_BCNQ_HEAD_PG_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_HEAD_PG_V1) &lt;&lt; BIT_SHIFT_BCNQ_HEAD_PG_V1)</div><div class='del'>-#define BIT_GET_BCNQ_HEAD_PG_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_HEAD_PG_V1) &amp; BIT_MASK_BCNQ_HEAD_PG_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXPKT_EMPTY				(Offset 0x041A) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNQ_EMPTY BIT(11)</div><div class='del'>-#define BIT_HQQ_EMPTY BIT(10)</div><div class='del'>-#define BIT_MQQ_EMPTY BIT(9)</div><div class='del'>-#define BIT_MGQ_CPU_EMPTY BIT(8)</div><div class='del'>-#define BIT_AC7Q_EMPTY BIT(7)</div><div class='del'>-#define BIT_AC6Q_EMPTY BIT(6)</div><div class='del'>-#define BIT_AC5Q_EMPTY BIT(5)</div><div class='del'>-#define BIT_AC4Q_EMPTY BIT(4)</div><div class='del'>-#define BIT_AC3Q_EMPTY BIT(3)</div><div class='del'>-#define BIT_AC2Q_EMPTY BIT(2)</div><div class='del'>-#define BIT_AC1Q_EMPTY BIT(1)</div><div class='del'>-#define BIT_AC0Q_EMPTY BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_MGQ_INFO			(Offset 0x041C) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCN1_POLL BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_MGQ_INFO			(Offset 0x041C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGT_POLL BIT(29)</div><div class='del'>-#define BIT_BCN_POLL BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_MGQ_INFO			(Offset 0x041C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGQ_FW_NUM_V1 BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_MGQ_INFO			(Offset 0x041C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_FREE_TAIL_V1 0</div><div class='del'>-#define BIT_MASK_FW_FREE_TAIL_V1 0xfff</div><div class='del'>-#define BIT_FW_FREE_TAIL_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_FREE_TAIL_V1) &lt;&lt; BIT_SHIFT_FW_FREE_TAIL_V1)</div><div class='del'>-#define BIT_GET_FW_FREE_TAIL_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_FREE_TAIL_V1) &amp; BIT_MASK_FW_FREE_TAIL_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWHW_TXQ_CTRL			(Offset 0x0420) */</div><div class='del'>-</div><div class='del'>-#define BIT_RTS_LIMIT_IN_OFDM BIT(23)</div><div class='del'>-#define BIT_EN_BCNQ_DL BIT(22)</div><div class='del'>-#define BIT_EN_RD_RESP_NAV_BK BIT(21)</div><div class='del'>-#define BIT_EN_WR_FREE_TAIL BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EN_QUEUE_RPT 8</div><div class='del'>-#define BIT_MASK_EN_QUEUE_RPT 0xff</div><div class='del'>-#define BIT_EN_QUEUE_RPT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_EN_QUEUE_RPT) &lt;&lt; BIT_SHIFT_EN_QUEUE_RPT)</div><div class='del'>-#define BIT_GET_EN_QUEUE_RPT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EN_QUEUE_RPT) &amp; BIT_MASK_EN_QUEUE_RPT)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_RTY_BK BIT(7)</div><div class='del'>-#define BIT_EN_USE_INI_RAT BIT(6)</div><div class='del'>-#define BIT_EN_RTS_NAV_BK BIT(5)</div><div class='del'>-#define BIT_DIS_SSN_CHECK BIT(4)</div><div class='del'>-#define BIT_MACID_MATCH_RTS BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWHW_TXQ_CTRL			(Offset 0x0420) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_BCN_TRXRPT_V1 BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWHW_TXQ_CTRL			(Offset 0x0420) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_FTMACKRPT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWHW_TXQ_CTRL			(Offset 0x0420) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_FTMRPT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DATAFB_SEL				(Offset 0x0423) */</div><div class='del'>-</div><div class='del'>-#define BIT__R_EN_RTY_BK_COD BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DATAFB_SEL				(Offset 0x0423) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT__R_DATA_FALLBACK_SEL 0</div><div class='del'>-#define BIT_MASK__R_DATA_FALLBACK_SEL 0x3</div><div class='del'>-#define BIT__R_DATA_FALLBACK_SEL(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK__R_DATA_FALLBACK_SEL)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT__R_DATA_FALLBACK_SEL)</div><div class='del'>-#define BIT_GET__R_DATA_FALLBACK_SEL(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT__R_DATA_FALLBACK_SEL) &amp;                             \</div><div class='del'>-	 BIT_MASK__R_DATA_FALLBACK_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ_BDNY_V1			(Offset 0x0424) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_PGBNDY_V1 0</div><div class='del'>-#define BIT_MASK_BCNQ_PGBNDY_V1 0xfff</div><div class='del'>-#define BIT_BCNQ_PGBNDY_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_PGBNDY_V1) &lt;&lt; BIT_SHIFT_BCNQ_PGBNDY_V1)</div><div class='del'>-#define BIT_GET_BCNQ_PGBNDY_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_PGBNDY_V1) &amp; BIT_MASK_BCNQ_PGBNDY_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LIFETIME_EN				(Offset 0x0426) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_INT_CPU BIT(7)</div><div class='del'>-#define BIT_BT_INT_PTA BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LIFETIME_EN				(Offset 0x0426) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_CTRL_RTYBIT BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LIFETIME_EN				(Offset 0x0426) */</div><div class='del'>-</div><div class='del'>-#define BIT_LIFETIME_BK_EN BIT(3)</div><div class='del'>-#define BIT_LIFETIME_BE_EN BIT(2)</div><div class='del'>-#define BIT_LIFETIME_VI_EN BIT(1)</div><div class='del'>-#define BIT_LIFETIME_VO_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPEC_SIFS				(Offset 0x0428) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_OFDM_PTCL 8</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_OFDM_PTCL 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_OFDM_PTCL(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_OFDM_PTCL) &lt;&lt; BIT_SHIFT_SPEC_SIFS_OFDM_PTCL)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_OFDM_PTCL(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_OFDM_PTCL) &amp; BIT_MASK_SPEC_SIFS_OFDM_PTCL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_CCK_PTCL 0</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_CCK_PTCL 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_CCK_PTCL(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_CCK_PTCL) &lt;&lt; BIT_SHIFT_SPEC_SIFS_CCK_PTCL)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_CCK_PTCL(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_CCK_PTCL) &amp; BIT_MASK_SPEC_SIFS_CCK_PTCL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RETRY_LIMIT				(Offset 0x042A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SRL 8</div><div class='del'>-#define BIT_MASK_SRL 0x3f</div><div class='del'>-#define BIT_SRL(x) (((x) &amp; BIT_MASK_SRL) &lt;&lt; BIT_SHIFT_SRL)</div><div class='del'>-#define BIT_GET_SRL(x) (((x) &gt;&gt; BIT_SHIFT_SRL) &amp; BIT_MASK_SRL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LRL 0</div><div class='del'>-#define BIT_MASK_LRL 0x3f</div><div class='del'>-#define BIT_LRL(x) (((x) &amp; BIT_MASK_LRL) &lt;&lt; BIT_SHIFT_LRL)</div><div class='del'>-#define BIT_GET_LRL(x) (((x) &gt;&gt; BIT_SHIFT_LRL) &amp; BIT_MASK_LRL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXBF_CTRL				(Offset 0x042C) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_ENABLE_NDPA BIT(31)</div><div class='del'>-#define BIT_USE_NDPA_PARAMETER BIT(30)</div><div class='del'>-#define BIT_R_PROP_TXBF BIT(29)</div><div class='del'>-#define BIT_R_EN_NDPA_INT BIT(28)</div><div class='del'>-#define BIT_R_TXBF1_80M BIT(27)</div><div class='del'>-#define BIT_R_TXBF1_40M BIT(26)</div><div class='del'>-#define BIT_R_TXBF1_20M BIT(25)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TXBF1_AID 16</div><div class='del'>-#define BIT_MASK_R_TXBF1_AID 0x1ff</div><div class='del'>-#define BIT_R_TXBF1_AID(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TXBF1_AID) &lt;&lt; BIT_SHIFT_R_TXBF1_AID)</div><div class='del'>-#define BIT_GET_R_TXBF1_AID(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TXBF1_AID) &amp; BIT_MASK_R_TXBF1_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXBF_CTRL				(Offset 0x042C) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_NDP_BFEN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXBF_CTRL				(Offset 0x042C) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_TXBCN_NOBLOCK_NDP BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXBF_CTRL				(Offset 0x042C) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_TXBF0_80M BIT(11)</div><div class='del'>-#define BIT_R_TXBF0_40M BIT(10)</div><div class='del'>-#define BIT_R_TXBF0_20M BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TXBF0_AID 0</div><div class='del'>-#define BIT_MASK_R_TXBF0_AID 0x1ff</div><div class='del'>-#define BIT_R_TXBF0_AID(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TXBF0_AID) &lt;&lt; BIT_SHIFT_R_TXBF0_AID)</div><div class='del'>-#define BIT_GET_R_TXBF0_AID(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TXBF0_AID) &amp; BIT_MASK_R_TXBF0_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DARFRC				(Offset 0x0430) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC8 (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC8 0x1f</div><div class='del'>-#define BIT_DARF_RC8(x) (((x) &amp; BIT_MASK_DARF_RC8) &lt;&lt; BIT_SHIFT_DARF_RC8)</div><div class='del'>-#define BIT_GET_DARF_RC8(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC8) &amp; BIT_MASK_DARF_RC8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC7 (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC7 0x1f</div><div class='del'>-#define BIT_DARF_RC7(x) (((x) &amp; BIT_MASK_DARF_RC7) &lt;&lt; BIT_SHIFT_DARF_RC7)</div><div class='del'>-#define BIT_GET_DARF_RC7(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC7) &amp; BIT_MASK_DARF_RC7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC6 (40 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC6 0x1f</div><div class='del'>-#define BIT_DARF_RC6(x) (((x) &amp; BIT_MASK_DARF_RC6) &lt;&lt; BIT_SHIFT_DARF_RC6)</div><div class='del'>-#define BIT_GET_DARF_RC6(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC6) &amp; BIT_MASK_DARF_RC6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC5 (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC5 0x1f</div><div class='del'>-#define BIT_DARF_RC5(x) (((x) &amp; BIT_MASK_DARF_RC5) &lt;&lt; BIT_SHIFT_DARF_RC5)</div><div class='del'>-#define BIT_GET_DARF_RC5(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC5) &amp; BIT_MASK_DARF_RC5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC4 24</div><div class='del'>-#define BIT_MASK_DARF_RC4 0x1f</div><div class='del'>-#define BIT_DARF_RC4(x) (((x) &amp; BIT_MASK_DARF_RC4) &lt;&lt; BIT_SHIFT_DARF_RC4)</div><div class='del'>-#define BIT_GET_DARF_RC4(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC4) &amp; BIT_MASK_DARF_RC4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC3 16</div><div class='del'>-#define BIT_MASK_DARF_RC3 0x1f</div><div class='del'>-#define BIT_DARF_RC3(x) (((x) &amp; BIT_MASK_DARF_RC3) &lt;&lt; BIT_SHIFT_DARF_RC3)</div><div class='del'>-#define BIT_GET_DARF_RC3(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC3) &amp; BIT_MASK_DARF_RC3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC2 8</div><div class='del'>-#define BIT_MASK_DARF_RC2 0x1f</div><div class='del'>-#define BIT_DARF_RC2(x) (((x) &amp; BIT_MASK_DARF_RC2) &lt;&lt; BIT_SHIFT_DARF_RC2)</div><div class='del'>-#define BIT_GET_DARF_RC2(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC2) &amp; BIT_MASK_DARF_RC2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC1 0</div><div class='del'>-#define BIT_MASK_DARF_RC1 0x1f</div><div class='del'>-#define BIT_DARF_RC1(x) (((x) &amp; BIT_MASK_DARF_RC1) &lt;&lt; BIT_SHIFT_DARF_RC1)</div><div class='del'>-#define BIT_GET_DARF_RC1(x) (((x) &gt;&gt; BIT_SHIFT_DARF_RC1) &amp; BIT_MASK_DARF_RC1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RARFRC				(Offset 0x0438) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC8 (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC8 0x1f</div><div class='del'>-#define BIT_RARF_RC8(x) (((x) &amp; BIT_MASK_RARF_RC8) &lt;&lt; BIT_SHIFT_RARF_RC8)</div><div class='del'>-#define BIT_GET_RARF_RC8(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC8) &amp; BIT_MASK_RARF_RC8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC7 (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC7 0x1f</div><div class='del'>-#define BIT_RARF_RC7(x) (((x) &amp; BIT_MASK_RARF_RC7) &lt;&lt; BIT_SHIFT_RARF_RC7)</div><div class='del'>-#define BIT_GET_RARF_RC7(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC7) &amp; BIT_MASK_RARF_RC7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC6 (40 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC6 0x1f</div><div class='del'>-#define BIT_RARF_RC6(x) (((x) &amp; BIT_MASK_RARF_RC6) &lt;&lt; BIT_SHIFT_RARF_RC6)</div><div class='del'>-#define BIT_GET_RARF_RC6(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC6) &amp; BIT_MASK_RARF_RC6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC5 (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC5 0x1f</div><div class='del'>-#define BIT_RARF_RC5(x) (((x) &amp; BIT_MASK_RARF_RC5) &lt;&lt; BIT_SHIFT_RARF_RC5)</div><div class='del'>-#define BIT_GET_RARF_RC5(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC5) &amp; BIT_MASK_RARF_RC5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC4 24</div><div class='del'>-#define BIT_MASK_RARF_RC4 0x1f</div><div class='del'>-#define BIT_RARF_RC4(x) (((x) &amp; BIT_MASK_RARF_RC4) &lt;&lt; BIT_SHIFT_RARF_RC4)</div><div class='del'>-#define BIT_GET_RARF_RC4(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC4) &amp; BIT_MASK_RARF_RC4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC3 16</div><div class='del'>-#define BIT_MASK_RARF_RC3 0x1f</div><div class='del'>-#define BIT_RARF_RC3(x) (((x) &amp; BIT_MASK_RARF_RC3) &lt;&lt; BIT_SHIFT_RARF_RC3)</div><div class='del'>-#define BIT_GET_RARF_RC3(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC3) &amp; BIT_MASK_RARF_RC3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC2 8</div><div class='del'>-#define BIT_MASK_RARF_RC2 0x1f</div><div class='del'>-#define BIT_RARF_RC2(x) (((x) &amp; BIT_MASK_RARF_RC2) &lt;&lt; BIT_SHIFT_RARF_RC2)</div><div class='del'>-#define BIT_GET_RARF_RC2(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC2) &amp; BIT_MASK_RARF_RC2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC1 0</div><div class='del'>-#define BIT_MASK_RARF_RC1 0x1f</div><div class='del'>-#define BIT_RARF_RC1(x) (((x) &amp; BIT_MASK_RARF_RC1) &lt;&lt; BIT_SHIFT_RARF_RC1)</div><div class='del'>-#define BIT_GET_RARF_RC1(x) (((x) &gt;&gt; BIT_SHIFT_RARF_RC1) &amp; BIT_MASK_RARF_RC1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RRSR				(Offset 0x0440) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RRSR_RSC 21</div><div class='del'>-#define BIT_MASK_RRSR_RSC 0x3</div><div class='del'>-#define BIT_RRSR_RSC(x) (((x) &amp; BIT_MASK_RRSR_RSC) &lt;&lt; BIT_SHIFT_RRSR_RSC)</div><div class='del'>-#define BIT_GET_RRSR_RSC(x) (((x) &gt;&gt; BIT_SHIFT_RRSR_RSC) &amp; BIT_MASK_RRSR_RSC)</div><div class='del'>-</div><div class='del'>-#define BIT_RRSR_BW BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RRSC_BITMAP 0</div><div class='del'>-#define BIT_MASK_RRSC_BITMAP 0xfffff</div><div class='del'>-#define BIT_RRSC_BITMAP(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_RRSC_BITMAP) &lt;&lt; BIT_SHIFT_RRSC_BITMAP)</div><div class='del'>-#define BIT_GET_RRSC_BITMAP(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RRSC_BITMAP) &amp; BIT_MASK_RRSC_BITMAP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR0				(Offset 0x0444) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR0_V1 0</div><div class='del'>-#define BIT_MASK_ARFR0_V1 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR0_V1(x) (((x) &amp; BIT_MASK_ARFR0_V1) &lt;&lt; BIT_SHIFT_ARFR0_V1)</div><div class='del'>-#define BIT_GET_ARFR0_V1(x) (((x) &gt;&gt; BIT_SHIFT_ARFR0_V1) &amp; BIT_MASK_ARFR0_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR1_V1				(Offset 0x044C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR1_V1 0</div><div class='del'>-#define BIT_MASK_ARFR1_V1 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR1_V1(x) (((x) &amp; BIT_MASK_ARFR1_V1) &lt;&lt; BIT_SHIFT_ARFR1_V1)</div><div class='del'>-#define BIT_GET_ARFR1_V1(x) (((x) &gt;&gt; BIT_SHIFT_ARFR1_V1) &amp; BIT_MASK_ARFR1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CCK_CHECK				(Offset 0x0454) */</div><div class='del'>-</div><div class='del'>-#define BIT_CHECK_CCK_EN BIT(7)</div><div class='del'>-#define BIT_EN_BCN_PKT_REL BIT(6)</div><div class='del'>-#define BIT_BCN_PORT_SEL BIT(5)</div><div class='del'>-#define BIT_MOREDATA_BYPASS BIT(4)</div><div class='del'>-#define BIT_EN_CLR_CMD_REL_BCN_PKT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CCK_CHECK				(Offset 0x0454) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_EN_SET_MOREDATA BIT(2)</div><div class='del'>-#define BIT__R_DIS_CLEAR_MACID_RELEASE BIT(1)</div><div class='del'>-#define BIT__R_MACID_RELEASE_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AMPDU_MAX_TIME			(Offset 0x0456) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AMPDU_MAX_TIME 0</div><div class='del'>-#define BIT_MASK_AMPDU_MAX_TIME 0xff</div><div class='del'>-#define BIT_AMPDU_MAX_TIME(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_AMPDU_MAX_TIME) &lt;&lt; BIT_SHIFT_AMPDU_MAX_TIME)</div><div class='del'>-#define BIT_GET_AMPDU_MAX_TIME(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AMPDU_MAX_TIME) &amp; BIT_MASK_AMPDU_MAX_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ1_BDNY_V1			(Offset 0x0456) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ1_PGBNDY_V1 0</div><div class='del'>-#define BIT_MASK_BCNQ1_PGBNDY_V1 0xfff</div><div class='del'>-#define BIT_BCNQ1_PGBNDY_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ1_PGBNDY_V1) &lt;&lt; BIT_SHIFT_BCNQ1_PGBNDY_V1)</div><div class='del'>-#define BIT_GET_BCNQ1_PGBNDY_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ1_PGBNDY_V1) &amp; BIT_MASK_BCNQ1_PGBNDY_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AMPDU_MAX_LENGTH			(Offset 0x0458) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AMPDU_MAX_LENGTH 0</div><div class='del'>-#define BIT_MASK_AMPDU_MAX_LENGTH 0xffffffffL</div><div class='del'>-#define BIT_AMPDU_MAX_LENGTH(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_AMPDU_MAX_LENGTH) &lt;&lt; BIT_SHIFT_AMPDU_MAX_LENGTH)</div><div class='del'>-#define BIT_GET_AMPDU_MAX_LENGTH(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AMPDU_MAX_LENGTH) &amp; BIT_MASK_AMPDU_MAX_LENGTH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACQ_STOP				(Offset 0x045C) */</div><div class='del'>-</div><div class='del'>-#define BIT_AC7Q_STOP BIT(7)</div><div class='del'>-#define BIT_AC6Q_STOP BIT(6)</div><div class='del'>-#define BIT_AC5Q_STOP BIT(5)</div><div class='del'>-#define BIT_AC4Q_STOP BIT(4)</div><div class='del'>-#define BIT_AC3Q_STOP BIT(3)</div><div class='del'>-#define BIT_AC2Q_STOP BIT(2)</div><div class='del'>-#define BIT_AC1Q_STOP BIT(1)</div><div class='del'>-#define BIT_AC0Q_STOP BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_RATE				(Offset 0x045D) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_NDPA_RATE_V1 0</div><div class='del'>-#define BIT_MASK_R_NDPA_RATE_V1 0xff</div><div class='del'>-#define BIT_R_NDPA_RATE_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_NDPA_RATE_V1) &lt;&lt; BIT_SHIFT_R_NDPA_RATE_V1)</div><div class='del'>-#define BIT_GET_R_NDPA_RATE_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_NDPA_RATE_V1) &amp; BIT_MASK_R_NDPA_RATE_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_HANG_CTRL			(Offset 0x045E) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_EN_GNT_BT_AWAKE BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_HANG_CTRL			(Offset 0x045E) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_EOF_V1 BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_HANG_CTRL			(Offset 0x045E) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_OQT_BLOCK BIT(1)</div><div class='del'>-#define BIT_SEARCH_QUEUE_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_OPT_CTRL			(Offset 0x045F) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_DIS_MACID_RELEASE_RTY BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_OPT_CTRL			(Offset 0x045F) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BW_SIGTA 3</div><div class='del'>-#define BIT_MASK_BW_SIGTA 0x3</div><div class='del'>-#define BIT_BW_SIGTA(x) (((x) &amp; BIT_MASK_BW_SIGTA) &lt;&lt; BIT_SHIFT_BW_SIGTA)</div><div class='del'>-#define BIT_GET_BW_SIGTA(x) (((x) &gt;&gt; BIT_SHIFT_BW_SIGTA) &amp; BIT_MASK_BW_SIGTA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_OPT_CTRL			(Offset 0x045F) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_BAR_SIGTA BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_OPT_CTRL			(Offset 0x045F) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_NDPA_BW 0</div><div class='del'>-#define BIT_MASK_R_NDPA_BW 0x3</div><div class='del'>-#define BIT_R_NDPA_BW(x) (((x) &amp; BIT_MASK_R_NDPA_BW) &lt;&lt; BIT_SHIFT_R_NDPA_BW)</div><div class='del'>-#define BIT_GET_R_NDPA_BW(x) (((x) &gt;&gt; BIT_SHIFT_R_NDPA_BW) &amp; BIT_MASK_R_NDPA_BW)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_RESP_PKT_TH			(Offset 0x0463) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RD_RESP_PKT_TH_V1 0</div><div class='del'>-#define BIT_MASK_RD_RESP_PKT_TH_V1 0x3f</div><div class='del'>-#define BIT_RD_RESP_PKT_TH_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RD_RESP_PKT_TH_V1) &lt;&lt; BIT_SHIFT_RD_RESP_PKT_TH_V1)</div><div class='del'>-#define BIT_GET_RD_RESP_PKT_TH_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RD_RESP_PKT_TH_V1) &amp; BIT_MASK_RD_RESP_PKT_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_INFO				(Offset 0x0464) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_CMDQ_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_CMDQ_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_CMDQ_V1(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_CMDQ_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_CMDQ_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_CMDQ_V1(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_CMDQ_V1) &amp; BIT_MASK_QUEUEMACID_CMDQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_INFO				(Offset 0x0464) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_CMDQ_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_CMDQ_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_CMDQ_V1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_CMDQ_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_CMDQ_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_CMDQ_V1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_CMDQ_V1) &amp; BIT_MASK_QUEUEAC_CMDQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_INFO				(Offset 0x0464) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_CMDQ_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_INFO				(Offset 0x0464) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_CMDQ_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_CMDQ_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_CMDQ_V2(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_CMDQ_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_CMDQ_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_CMDQ_V2(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_CMDQ_V2) &amp; BIT_MASK_TAIL_PKT_CMDQ_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_INFO				(Offset 0x0464) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_CMDQ_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_CMDQ_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_CMDQ_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_CMDQ_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_CMDQ_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_CMDQ_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_CMDQ_V1) &amp; BIT_MASK_HEAD_PKT_CMDQ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_INFO				(Offset 0x0468) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q4_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q4_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q4_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q4_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q4_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q4_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q4_V1) &amp; BIT_MASK_QUEUEMACID_Q4_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q4_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q4_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q4_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q4_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q4_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q4_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q4_V1) &amp; BIT_MASK_QUEUEAC_Q4_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_INFO				(Offset 0x0468) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q4_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_INFO				(Offset 0x0468) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q4_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q4_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q4_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q4_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q4_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q4_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q4_V2) &amp; BIT_MASK_TAIL_PKT_Q4_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_INFO				(Offset 0x0468) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q4_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q4_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q4_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q4_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q4_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q4_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q4_V1) &amp; BIT_MASK_HEAD_PKT_Q4_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q5_INFO				(Offset 0x046C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q5_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q5_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q5_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q5_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q5_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q5_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q5_V1) &amp; BIT_MASK_QUEUEMACID_Q5_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q5_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q5_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q5_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q5_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q5_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q5_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q5_V1) &amp; BIT_MASK_QUEUEAC_Q5_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q5_INFO				(Offset 0x046C) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q5_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q5_INFO				(Offset 0x046C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q5_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q5_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q5_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q5_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q5_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q5_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q5_V2) &amp; BIT_MASK_TAIL_PKT_Q5_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q5_INFO				(Offset 0x046C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q5_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q5_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q5_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q5_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q5_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q5_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q5_V1) &amp; BIT_MASK_HEAD_PKT_Q5_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_INFO				(Offset 0x0470) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q6_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q6_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q6_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q6_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q6_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q6_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q6_V1) &amp; BIT_MASK_QUEUEMACID_Q6_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q6_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q6_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q6_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q6_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q6_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q6_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q6_V1) &amp; BIT_MASK_QUEUEAC_Q6_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_INFO				(Offset 0x0470) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q6_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_INFO				(Offset 0x0470) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q6_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q6_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q6_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q6_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q6_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q6_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q6_V2) &amp; BIT_MASK_TAIL_PKT_Q6_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_INFO				(Offset 0x0470) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q6_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q6_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q6_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q6_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q6_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q6_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q6_V1) &amp; BIT_MASK_HEAD_PKT_Q6_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q7_INFO				(Offset 0x0474) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q7_V1 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q7_V1 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q7_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q7_V1) &lt;&lt; BIT_SHIFT_QUEUEMACID_Q7_V1)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q7_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q7_V1) &amp; BIT_MASK_QUEUEMACID_Q7_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q7_V1 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q7_V1 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q7_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q7_V1) &lt;&lt; BIT_SHIFT_QUEUEAC_Q7_V1)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q7_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q7_V1) &amp; BIT_MASK_QUEUEAC_Q7_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q7_INFO				(Offset 0x0474) */</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q7_V1 BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q7_INFO				(Offset 0x0474) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q7_V2 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q7_V2 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q7_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q7_V2) &lt;&lt; BIT_SHIFT_TAIL_PKT_Q7_V2)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q7_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q7_V2) &amp; BIT_MASK_TAIL_PKT_Q7_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q7_INFO				(Offset 0x0474) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q7_V1 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q7_V1 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q7_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q7_V1) &lt;&lt; BIT_SHIFT_HEAD_PKT_Q7_V1)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q7_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q7_V1) &amp; BIT_MASK_HEAD_PKT_Q7_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_LBK_BUF_HD_V1			(Offset 0x0478) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_LBK_BUF_HEAD_V1 0</div><div class='del'>-#define BIT_MASK_WMAC_LBK_BUF_HEAD_V1 0xfff</div><div class='del'>-#define BIT_WMAC_LBK_BUF_HEAD_V1(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_LBK_BUF_HEAD_V1)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_LBK_BUF_HEAD_V1)</div><div class='del'>-#define BIT_GET_WMAC_LBK_BUF_HEAD_V1(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_LBK_BUF_HEAD_V1) &amp;                             \</div><div class='del'>-	 BIT_MASK_WMAC_LBK_BUF_HEAD_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_BDNY_V1				(Offset 0x047A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_PGBNDY_V1 0</div><div class='del'>-#define BIT_MASK_MGQ_PGBNDY_V1 0xfff</div><div class='del'>-#define BIT_MGQ_PGBNDY_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_PGBNDY_V1) &lt;&lt; BIT_SHIFT_MGQ_PGBNDY_V1)</div><div class='del'>-#define BIT_GET_MGQ_PGBNDY_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_PGBNDY_V1) &amp; BIT_MASK_MGQ_PGBNDY_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_CTRL				(Offset 0x047C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_TIMER_TH 24</div><div class='del'>-#define BIT_MASK_TRXRPT_TIMER_TH 0xff</div><div class='del'>-#define BIT_TRXRPT_TIMER_TH(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_TIMER_TH) &lt;&lt; BIT_SHIFT_TRXRPT_TIMER_TH)</div><div class='del'>-#define BIT_GET_TRXRPT_TIMER_TH(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_TIMER_TH) &amp; BIT_MASK_TRXRPT_TIMER_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_CTRL				(Offset 0x047C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_LEN_TH 16</div><div class='del'>-#define BIT_MASK_TRXRPT_LEN_TH 0xff</div><div class='del'>-#define BIT_TRXRPT_LEN_TH(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_LEN_TH) &lt;&lt; BIT_SHIFT_TRXRPT_LEN_TH)</div><div class='del'>-#define BIT_GET_TRXRPT_LEN_TH(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_LEN_TH) &amp; BIT_MASK_TRXRPT_LEN_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_CTRL				(Offset 0x047C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_READ_PTR 8</div><div class='del'>-#define BIT_MASK_TRXRPT_READ_PTR 0xff</div><div class='del'>-#define BIT_TRXRPT_READ_PTR(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_READ_PTR) &lt;&lt; BIT_SHIFT_TRXRPT_READ_PTR)</div><div class='del'>-#define BIT_GET_TRXRPT_READ_PTR(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_READ_PTR) &amp; BIT_MASK_TRXRPT_READ_PTR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_CTRL				(Offset 0x047C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_WRITE_PTR 0</div><div class='del'>-#define BIT_MASK_TRXRPT_WRITE_PTR 0xff</div><div class='del'>-#define BIT_TRXRPT_WRITE_PTR(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_WRITE_PTR) &lt;&lt; BIT_SHIFT_TRXRPT_WRITE_PTR)</div><div class='del'>-#define BIT_GET_TRXRPT_WRITE_PTR(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_WRITE_PTR) &amp; BIT_MASK_TRXRPT_WRITE_PTR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_INIRTS_RATE_SEL			(Offset 0x0480) */</div><div class='del'>-</div><div class='del'>-#define BIT_LEAG_RTS_BW_DUP BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BASIC_CFEND_RATE			(Offset 0x0481) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BASIC_CFEND_RATE 0</div><div class='del'>-#define BIT_MASK_BASIC_CFEND_RATE 0x1f</div><div class='del'>-#define BIT_BASIC_CFEND_RATE(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BASIC_CFEND_RATE) &lt;&lt; BIT_SHIFT_BASIC_CFEND_RATE)</div><div class='del'>-#define BIT_GET_BASIC_CFEND_RATE(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BASIC_CFEND_RATE) &amp; BIT_MASK_BASIC_CFEND_RATE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STBC_CFEND_RATE			(Offset 0x0482) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STBC_CFEND_RATE 0</div><div class='del'>-#define BIT_MASK_STBC_CFEND_RATE 0x1f</div><div class='del'>-#define BIT_STBC_CFEND_RATE(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STBC_CFEND_RATE) &lt;&lt; BIT_SHIFT_STBC_CFEND_RATE)</div><div class='del'>-#define BIT_GET_STBC_CFEND_RATE(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STBC_CFEND_RATE) &amp; BIT_MASK_STBC_CFEND_RATE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DATA_SC				(Offset 0x0483) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXSC_40M 4</div><div class='del'>-#define BIT_MASK_TXSC_40M 0xf</div><div class='del'>-#define BIT_TXSC_40M(x) (((x) &amp; BIT_MASK_TXSC_40M) &lt;&lt; BIT_SHIFT_TXSC_40M)</div><div class='del'>-#define BIT_GET_TXSC_40M(x) (((x) &gt;&gt; BIT_SHIFT_TXSC_40M) &amp; BIT_MASK_TXSC_40M)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXSC_20M 0</div><div class='del'>-#define BIT_MASK_TXSC_20M 0xf</div><div class='del'>-#define BIT_TXSC_20M(x) (((x) &amp; BIT_MASK_TXSC_20M) &lt;&lt; BIT_SHIFT_TXSC_20M)</div><div class='del'>-#define BIT_GET_TXSC_20M(x) (((x) &gt;&gt; BIT_SHIFT_TXSC_20M) &amp; BIT_MASK_TXSC_20M)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP3			(Offset 0x0484) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID127_96_PKTSLEEP 0</div><div class='del'>-#define BIT_MASK_MACID127_96_PKTSLEEP 0xffffffffL</div><div class='del'>-#define BIT_MACID127_96_PKTSLEEP(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID127_96_PKTSLEEP)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID127_96_PKTSLEEP)</div><div class='del'>-#define BIT_GET_MACID127_96_PKTSLEEP(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID127_96_PKTSLEEP) &amp;                             \</div><div class='del'>-	 BIT_MASK_MACID127_96_PKTSLEEP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP1			(Offset 0x0488) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID63_32_PKTSLEEP 0</div><div class='del'>-#define BIT_MASK_MACID63_32_PKTSLEEP 0xffffffffL</div><div class='del'>-#define BIT_MACID63_32_PKTSLEEP(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID63_32_PKTSLEEP) &lt;&lt; BIT_SHIFT_MACID63_32_PKTSLEEP)</div><div class='del'>-#define BIT_GET_MACID63_32_PKTSLEEP(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID63_32_PKTSLEEP) &amp; BIT_MASK_MACID63_32_PKTSLEEP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR2_V1				(Offset 0x048C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR2_V1 0</div><div class='del'>-#define BIT_MASK_ARFR2_V1 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR2_V1(x) (((x) &amp; BIT_MASK_ARFR2_V1) &lt;&lt; BIT_SHIFT_ARFR2_V1)</div><div class='del'>-#define BIT_GET_ARFR2_V1(x) (((x) &gt;&gt; BIT_SHIFT_ARFR2_V1) &amp; BIT_MASK_ARFR2_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR3_V1				(Offset 0x0494) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR3_V1 0</div><div class='del'>-#define BIT_MASK_ARFR3_V1 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR3_V1(x) (((x) &amp; BIT_MASK_ARFR3_V1) &lt;&lt; BIT_SHIFT_ARFR3_V1)</div><div class='del'>-#define BIT_GET_ARFR3_V1(x) (((x) &gt;&gt; BIT_SHIFT_ARFR3_V1) &amp; BIT_MASK_ARFR3_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR4				(Offset 0x049C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR4 0</div><div class='del'>-#define BIT_MASK_ARFR4 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR4(x) (((x) &amp; BIT_MASK_ARFR4) &lt;&lt; BIT_SHIFT_ARFR4)</div><div class='del'>-#define BIT_GET_ARFR4(x) (((x) &gt;&gt; BIT_SHIFT_ARFR4) &amp; BIT_MASK_ARFR4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR5				(Offset 0x04A4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR5 0</div><div class='del'>-#define BIT_MASK_ARFR5 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR5(x) (((x) &amp; BIT_MASK_ARFR5) &lt;&lt; BIT_SHIFT_ARFR5)</div><div class='del'>-#define BIT_GET_ARFR5(x) (((x) &gt;&gt; BIT_SHIFT_ARFR5) &amp; BIT_MASK_ARFR5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_START_OFFSET			(Offset 0x04AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_MURATE_OFFSET 24</div><div class='del'>-#define BIT_MASK_MACID_MURATE_OFFSET 0xff</div><div class='del'>-#define BIT_MACID_MURATE_OFFSET(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_MURATE_OFFSET) &lt;&lt; BIT_SHIFT_MACID_MURATE_OFFSET)</div><div class='del'>-#define BIT_GET_MACID_MURATE_OFFSET(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_MURATE_OFFSET) &amp; BIT_MASK_MACID_MURATE_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_START_OFFSET			(Offset 0x04AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_RPTFIFO_SIZE_OPT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_START_OFFSET			(Offset 0x04AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_CTRL_OFFSET 8</div><div class='del'>-#define BIT_MASK_MACID_CTRL_OFFSET 0xff</div><div class='del'>-#define BIT_MACID_CTRL_OFFSET(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_CTRL_OFFSET) &lt;&lt; BIT_SHIFT_MACID_CTRL_OFFSET)</div><div class='del'>-#define BIT_GET_MACID_CTRL_OFFSET(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_CTRL_OFFSET) &amp; BIT_MASK_MACID_CTRL_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_START_OFFSET			(Offset 0x04AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AMPDU_TXRPT_OFFSET 0</div><div class='del'>-#define BIT_MASK_AMPDU_TXRPT_OFFSET 0xff</div><div class='del'>-#define BIT_AMPDU_TXRPT_OFFSET(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AMPDU_TXRPT_OFFSET) &lt;&lt; BIT_SHIFT_AMPDU_TXRPT_OFFSET)</div><div class='del'>-#define BIT_GET_AMPDU_TXRPT_OFFSET(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AMPDU_TXRPT_OFFSET) &amp; BIT_MASK_AMPDU_TXRPT_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWER_STAGE1			(Offset 0x04B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_CPU_MGQ BIT(31)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_BCNQ BIT(30)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_HIQ BIT(29)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_MGQ BIT(28)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_BK BIT(27)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_BE BIT(26)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_VI BIT(25)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_VO BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWER_STAGE1			(Offset 0x04B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_POWER_STAGE1 0</div><div class='del'>-#define BIT_MASK_POWER_STAGE1 0xffffff</div><div class='del'>-#define BIT_POWER_STAGE1(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_POWER_STAGE1) &lt;&lt; BIT_SHIFT_POWER_STAGE1)</div><div class='del'>-#define BIT_GET_POWER_STAGE1(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_POWER_STAGE1) &amp; BIT_MASK_POWER_STAGE1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWER_STAGE2			(Offset 0x04B8) */</div><div class='del'>-</div><div class='del'>-#define BIT__R_CTRL_PKT_POW_ADJ BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWER_STAGE2			(Offset 0x04B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_POWER_STAGE2 0</div><div class='del'>-#define BIT_MASK_POWER_STAGE2 0xffffff</div><div class='del'>-#define BIT_POWER_STAGE2(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_POWER_STAGE2) &lt;&lt; BIT_SHIFT_POWER_STAGE2)</div><div class='del'>-#define BIT_GET_POWER_STAGE2(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_POWER_STAGE2) &amp; BIT_MASK_POWER_STAGE2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_AMPDU_BURST_MODE_CTRL		(Offset 0x04BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PAD_NUM_THRES 24</div><div class='del'>-#define BIT_MASK_PAD_NUM_THRES 0x3f</div><div class='del'>-#define BIT_PAD_NUM_THRES(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PAD_NUM_THRES) &lt;&lt; BIT_SHIFT_PAD_NUM_THRES)</div><div class='del'>-#define BIT_GET_PAD_NUM_THRES(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PAD_NUM_THRES) &amp; BIT_MASK_PAD_NUM_THRES)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_AMPDU_BURST_MODE_CTRL		(Offset 0x04BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_BK BIT(23)</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_BE BIT(22)</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_VI BIT(21)</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_VO BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TOTAL_LEN_TH 8</div><div class='del'>-#define BIT_MASK_R_TOTAL_LEN_TH 0xfff</div><div class='del'>-#define BIT_R_TOTAL_LEN_TH(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TOTAL_LEN_TH) &lt;&lt; BIT_SHIFT_R_TOTAL_LEN_TH)</div><div class='del'>-#define BIT_GET_R_TOTAL_LEN_TH(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TOTAL_LEN_TH) &amp; BIT_MASK_R_TOTAL_LEN_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_AMPDU_BURST_MODE_CTRL		(Offset 0x04BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_NEW_EARLY BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_AMPDU_BURST_MODE_CTRL		(Offset 0x04BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_PRE_TX_CMD BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NUM_SCL_EN 4</div><div class='del'>-#define BIT_MASK_NUM_SCL_EN 0x3</div><div class='del'>-#define BIT_NUM_SCL_EN(x) (((x) &amp; BIT_MASK_NUM_SCL_EN) &lt;&lt; BIT_SHIFT_NUM_SCL_EN)</div><div class='del'>-#define BIT_GET_NUM_SCL_EN(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NUM_SCL_EN) &amp; BIT_MASK_NUM_SCL_EN)</div><div class='del'>-</div><div class='del'>-#define BIT_BK_EN BIT(3)</div><div class='del'>-#define BIT_BE_EN BIT(2)</div><div class='del'>-#define BIT_VI_EN BIT(1)</div><div class='del'>-#define BIT_VO_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_LIFE_TIME			(Offset 0x04C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_LIFTIME_BEBK 16</div><div class='del'>-#define BIT_MASK_PKT_LIFTIME_BEBK 0xffff</div><div class='del'>-#define BIT_PKT_LIFTIME_BEBK(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_LIFTIME_BEBK) &lt;&lt; BIT_SHIFT_PKT_LIFTIME_BEBK)</div><div class='del'>-#define BIT_GET_PKT_LIFTIME_BEBK(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_LIFTIME_BEBK) &amp; BIT_MASK_PKT_LIFTIME_BEBK)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_LIFTIME_VOVI 0</div><div class='del'>-#define BIT_MASK_PKT_LIFTIME_VOVI 0xffff</div><div class='del'>-#define BIT_PKT_LIFTIME_VOVI(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_LIFTIME_VOVI) &lt;&lt; BIT_SHIFT_PKT_LIFTIME_VOVI)</div><div class='del'>-#define BIT_GET_PKT_LIFTIME_VOVI(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_LIFTIME_VOVI) &amp; BIT_MASK_PKT_LIFTIME_VOVI)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STBC_SETTING			(Offset 0x04C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CDEND_TXTIME_L 4</div><div class='del'>-#define BIT_MASK_CDEND_TXTIME_L 0xf</div><div class='del'>-#define BIT_CDEND_TXTIME_L(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_CDEND_TXTIME_L) &lt;&lt; BIT_SHIFT_CDEND_TXTIME_L)</div><div class='del'>-#define BIT_GET_CDEND_TXTIME_L(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CDEND_TXTIME_L) &amp; BIT_MASK_CDEND_TXTIME_L)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NESS 2</div><div class='del'>-#define BIT_MASK_NESS 0x3</div><div class='del'>-#define BIT_NESS(x) (((x) &amp; BIT_MASK_NESS) &lt;&lt; BIT_SHIFT_NESS)</div><div class='del'>-#define BIT_GET_NESS(x) (((x) &gt;&gt; BIT_SHIFT_NESS) &amp; BIT_MASK_NESS)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STBC_CFEND 0</div><div class='del'>-#define BIT_MASK_STBC_CFEND 0x3</div><div class='del'>-#define BIT_STBC_CFEND(x) (((x) &amp; BIT_MASK_STBC_CFEND) &lt;&lt; BIT_SHIFT_STBC_CFEND)</div><div class='del'>-#define BIT_GET_STBC_CFEND(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STBC_CFEND) &amp; BIT_MASK_STBC_CFEND)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STBC_SETTING2			(Offset 0x04C5) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CDEND_TXTIME_H 0</div><div class='del'>-#define BIT_MASK_CDEND_TXTIME_H 0x1f</div><div class='del'>-#define BIT_CDEND_TXTIME_H(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_CDEND_TXTIME_H) &lt;&lt; BIT_SHIFT_CDEND_TXTIME_H)</div><div class='del'>-#define BIT_GET_CDEND_TXTIME_H(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CDEND_TXTIME_H) &amp; BIT_MASK_CDEND_TXTIME_H)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_CTRL				(Offset 0x04C6) */</div><div class='del'>-</div><div class='del'>-#define BIT_PTA_EDCCA_EN BIT(5)</div><div class='del'>-#define BIT_PTA_WL_TX_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_CTRL				(Offset 0x04C6) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_USE_DATA_BW BIT(3)</div><div class='del'>-#define BIT_TRI_PKT_INT_MODE1 BIT(2)</div><div class='del'>-#define BIT_TRI_PKT_INT_MODE0 BIT(1)</div><div class='del'>-#define BIT_ACQ_MODE_SEL BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SINGLE_AMPDU_CTRL			(Offset 0x04C7) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_SINGLE_APMDU BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PROT_MODE_CTRL			(Offset 0x04C8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTS_MAX_AGG_NUM 24</div><div class='del'>-#define BIT_MASK_RTS_MAX_AGG_NUM 0x3f</div><div class='del'>-#define BIT_RTS_MAX_AGG_NUM(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTS_MAX_AGG_NUM) &lt;&lt; BIT_SHIFT_RTS_MAX_AGG_NUM)</div><div class='del'>-#define BIT_GET_RTS_MAX_AGG_NUM(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTS_MAX_AGG_NUM) &amp; BIT_MASK_RTS_MAX_AGG_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAX_AGG_NUM 16</div><div class='del'>-#define BIT_MASK_MAX_AGG_NUM 0x3f</div><div class='del'>-#define BIT_MAX_AGG_NUM(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAX_AGG_NUM) &lt;&lt; BIT_SHIFT_MAX_AGG_NUM)</div><div class='del'>-#define BIT_GET_MAX_AGG_NUM(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAX_AGG_NUM) &amp; BIT_MASK_MAX_AGG_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTS_TXTIME_TH 8</div><div class='del'>-#define BIT_MASK_RTS_TXTIME_TH 0xff</div><div class='del'>-#define BIT_RTS_TXTIME_TH(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTS_TXTIME_TH) &lt;&lt; BIT_SHIFT_RTS_TXTIME_TH)</div><div class='del'>-#define BIT_GET_RTS_TXTIME_TH(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTS_TXTIME_TH) &amp; BIT_MASK_RTS_TXTIME_TH)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTS_LEN_TH 0</div><div class='del'>-#define BIT_MASK_RTS_LEN_TH 0xff</div><div class='del'>-#define BIT_RTS_LEN_TH(x) (((x) &amp; BIT_MASK_RTS_LEN_TH) &lt;&lt; BIT_SHIFT_RTS_LEN_TH)</div><div class='del'>-#define BIT_GET_RTS_LEN_TH(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTS_LEN_TH) &amp; BIT_MASK_RTS_LEN_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BAR_MODE_CTRL			(Offset 0x04CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BAR_RTY_LMT 16</div><div class='del'>-#define BIT_MASK_BAR_RTY_LMT 0x3</div><div class='del'>-#define BIT_BAR_RTY_LMT(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BAR_RTY_LMT) &lt;&lt; BIT_SHIFT_BAR_RTY_LMT)</div><div class='del'>-#define BIT_GET_BAR_RTY_LMT(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BAR_RTY_LMT) &amp; BIT_MASK_BAR_RTY_LMT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BAR_PKT_TXTIME_TH 8</div><div class='del'>-#define BIT_MASK_BAR_PKT_TXTIME_TH 0xff</div><div class='del'>-#define BIT_BAR_PKT_TXTIME_TH(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BAR_PKT_TXTIME_TH) &lt;&lt; BIT_SHIFT_BAR_PKT_TXTIME_TH)</div><div class='del'>-#define BIT_GET_BAR_PKT_TXTIME_TH(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BAR_PKT_TXTIME_TH) &amp; BIT_MASK_BAR_PKT_TXTIME_TH)</div><div class='del'>-</div><div class='del'>-#define BIT_BAR_EN_V1 BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BAR_PKTNUM_TH_V1 0</div><div class='del'>-#define BIT_MASK_BAR_PKTNUM_TH_V1 0x3f</div><div class='del'>-#define BIT_BAR_PKTNUM_TH_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BAR_PKTNUM_TH_V1) &lt;&lt; BIT_SHIFT_BAR_PKTNUM_TH_V1)</div><div class='del'>-#define BIT_GET_BAR_PKTNUM_TH_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BAR_PKTNUM_TH_V1) &amp; BIT_MASK_BAR_PKTNUM_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RA_TRY_RATE_AGG_LMT			(Offset 0x04CF) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RA_TRY_RATE_AGG_LMT_V1 0</div><div class='del'>-#define BIT_MASK_RA_TRY_RATE_AGG_LMT_V1 0x3f</div><div class='del'>-#define BIT_RA_TRY_RATE_AGG_LMT_V1(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_RA_TRY_RATE_AGG_LMT_V1)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RA_TRY_RATE_AGG_LMT_V1)</div><div class='del'>-#define BIT_GET_RA_TRY_RATE_AGG_LMT_V1(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RA_TRY_RATE_AGG_LMT_V1) &amp;                           \</div><div class='del'>-	 BIT_MASK_RA_TRY_RATE_AGG_LMT_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP2			(Offset 0x04D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID95_64PKTSLEEP 0</div><div class='del'>-#define BIT_MASK_MACID95_64PKTSLEEP 0xffffffffL</div><div class='del'>-#define BIT_MACID95_64PKTSLEEP(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID95_64PKTSLEEP) &lt;&lt; BIT_SHIFT_MACID95_64PKTSLEEP)</div><div class='del'>-#define BIT_GET_MACID95_64PKTSLEEP(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID95_64PKTSLEEP) &amp; BIT_MASK_MACID95_64PKTSLEEP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP				(Offset 0x04D4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID31_0_PKTSLEEP 0</div><div class='del'>-#define BIT_MASK_MACID31_0_PKTSLEEP 0xffffffffL</div><div class='del'>-#define BIT_MACID31_0_PKTSLEEP(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID31_0_PKTSLEEP) &lt;&lt; BIT_SHIFT_MACID31_0_PKTSLEEP)</div><div class='del'>-#define BIT_GET_MACID31_0_PKTSLEEP(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID31_0_PKTSLEEP) &amp; BIT_MASK_MACID31_0_PKTSLEEP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ0				(Offset 0x04D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ0 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ0 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ0(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ0) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ0)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ0(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ0) &amp; BIT_MASK_HW_SSN_SEQ0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ1				(Offset 0x04DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ1 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ1 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ1(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ1) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ1)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ1(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ1) &amp; BIT_MASK_HW_SSN_SEQ1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ2				(Offset 0x04DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ2 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ2 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ2(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ2) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ2)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ2(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ2) &amp; BIT_MASK_HW_SSN_SEQ2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ3				(Offset 0x04DE) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ3 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ3 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ3(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ3) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ3)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ3(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ3) &amp; BIT_MASK_HW_SSN_SEQ3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NULL_PKT_STATUS_V1			(Offset 0x04E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PTCL_TOTAL_PG_V2 2</div><div class='del'>-#define BIT_MASK_PTCL_TOTAL_PG_V2 0x3fff</div><div class='del'>-#define BIT_PTCL_TOTAL_PG_V2(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PTCL_TOTAL_PG_V2) &lt;&lt; BIT_SHIFT_PTCL_TOTAL_PG_V2)</div><div class='del'>-#define BIT_GET_PTCL_TOTAL_PG_V2(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PTCL_TOTAL_PG_V2) &amp; BIT_MASK_PTCL_TOTAL_PG_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NULL_PKT_STATUS			(Offset 0x04E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_TX_NULL_1 BIT(1)</div><div class='del'>-#define BIT_TX_NULL_0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTCL_ERR_STATUS			(Offset 0x04E2) */</div><div class='del'>-</div><div class='del'>-#define BIT_PTCL_RATE_TABLE_INVALID BIT(7)</div><div class='del'>-#define BIT_FTM_T2R_ERROR BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTCL_ERR_STATUS			(Offset 0x04E2) */</div><div class='del'>-</div><div class='del'>-#define BIT_PTCL_ERR0 BIT(5)</div><div class='del'>-#define BIT_PTCL_ERR1 BIT(4)</div><div class='del'>-#define BIT_PTCL_ERR2 BIT(3)</div><div class='del'>-#define BIT_PTCL_ERR3 BIT(2)</div><div class='del'>-#define BIT_PTCL_ERR4 BIT(1)</div><div class='del'>-#define BIT_PTCL_ERR5 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NULL_PKT_STATUS_EXTEND		(Offset 0x04E3) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI3_TX_NULL_1 BIT(7)</div><div class='del'>-#define BIT_CLI3_TX_NULL_0 BIT(6)</div><div class='del'>-#define BIT_CLI2_TX_NULL_1 BIT(5)</div><div class='del'>-#define BIT_CLI2_TX_NULL_0 BIT(4)</div><div class='del'>-#define BIT_CLI1_TX_NULL_1 BIT(3)</div><div class='del'>-#define BIT_CLI1_TX_NULL_0 BIT(2)</div><div class='del'>-#define BIT_CLI0_TX_NULL_1 BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NULL_PKT_STATUS_EXTEND		(Offset 0x04E3) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI0_TX_NULL_0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIDEO_ENHANCEMENT_FUN		(Offset 0x04E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_VIDEO_JUST_DROP BIT(1)</div><div class='del'>-#define BIT_VIDEO_ENHANCEMENT_FUN_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_POLLUTE_PKT_CNT			(Offset 0x04E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_POLLUTE_PKT_CNT 0</div><div class='del'>-#define BIT_MASK_BT_POLLUTE_PKT_CNT 0xffff</div><div class='del'>-#define BIT_BT_POLLUTE_PKT_CNT(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_POLLUTE_PKT_CNT) &lt;&lt; BIT_SHIFT_BT_POLLUTE_PKT_CNT)</div><div class='del'>-#define BIT_GET_BT_POLLUTE_PKT_CNT(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_POLLUTE_PKT_CNT) &amp; BIT_MASK_BT_POLLUTE_PKT_CNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTCL_DBG				(Offset 0x04EC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PTCL_DBG 0</div><div class='del'>-#define BIT_MASK_PTCL_DBG 0xffffffffL</div><div class='del'>-#define BIT_PTCL_DBG(x) (((x) &amp; BIT_MASK_PTCL_DBG) &lt;&lt; BIT_SHIFT_PTCL_DBG)</div><div class='del'>-#define BIT_GET_PTCL_DBG(x) (((x) &gt;&gt; BIT_SHIFT_PTCL_DBG) &amp; BIT_MASK_PTCL_DBG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPUMGQ_TIMER_CTRL2			(Offset 0x04F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID 28</div><div class='del'>-#define BIT_MASK_GTAB_ID 0x7</div><div class='del'>-#define BIT_GTAB_ID(x) (((x) &amp; BIT_MASK_GTAB_ID) &lt;&lt; BIT_SHIFT_GTAB_ID)</div><div class='del'>-#define BIT_GET_GTAB_ID(x) (((x) &gt;&gt; BIT_SHIFT_GTAB_ID) &amp; BIT_MASK_GTAB_ID)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRI_HEAD_ADDR 16</div><div class='del'>-#define BIT_MASK_TRI_HEAD_ADDR 0xfff</div><div class='del'>-#define BIT_TRI_HEAD_ADDR(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRI_HEAD_ADDR) &lt;&lt; BIT_SHIFT_TRI_HEAD_ADDR)</div><div class='del'>-#define BIT_GET_TRI_HEAD_ADDR(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRI_HEAD_ADDR) &amp; BIT_MASK_TRI_HEAD_ADDR)</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_V1 BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_V1 12</div><div class='del'>-#define BIT_MASK_GTAB_ID_V1 0x7</div><div class='del'>-#define BIT_GTAB_ID_V1(x) (((x) &amp; BIT_MASK_GTAB_ID_V1) &lt;&lt; BIT_SHIFT_GTAB_ID_V1)</div><div class='del'>-#define BIT_GET_GTAB_ID_V1(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_V1) &amp; BIT_MASK_GTAB_ID_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_DROP_TH_EN BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DROP_TH 0</div><div class='del'>-#define BIT_MASK_DROP_TH 0xff</div><div class='del'>-#define BIT_DROP_TH(x) (((x) &amp; BIT_MASK_DROP_TH) &lt;&lt; BIT_SHIFT_DROP_TH)</div><div class='del'>-#define BIT_GET_DROP_TH(x) (((x) &gt;&gt; BIT_SHIFT_DROP_TH) &amp; BIT_MASK_DROP_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUMMY_PAGE4_V1			(Offset 0x04FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCN_EN_EXTHWSEQ BIT(1)</div><div class='del'>-#define BIT_BCN_EN_HWSEQ BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MOREDATA				(Offset 0x04FE) */</div><div class='del'>-</div><div class='del'>-#define BIT_MOREDATA_CTRL2_EN_V1 BIT(3)</div><div class='del'>-#define BIT_MOREDATA_CTRL1_EN_V1 BIT(2)</div><div class='del'>-#define BIT_PKTIN_MOREDATA_REPLACE_ENABLE_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_VO_PARAM			(Offset 0x0500) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOPLIMIT 16</div><div class='del'>-#define BIT_MASK_TXOPLIMIT 0x7ff</div><div class='del'>-#define BIT_TXOPLIMIT(x) (((x) &amp; BIT_MASK_TXOPLIMIT) &lt;&lt; BIT_SHIFT_TXOPLIMIT)</div><div class='del'>-#define BIT_GET_TXOPLIMIT(x) (((x) &gt;&gt; BIT_SHIFT_TXOPLIMIT) &amp; BIT_MASK_TXOPLIMIT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CW 8</div><div class='del'>-#define BIT_MASK_CW 0xff</div><div class='del'>-#define BIT_CW(x) (((x) &amp; BIT_MASK_CW) &lt;&lt; BIT_SHIFT_CW)</div><div class='del'>-#define BIT_GET_CW(x) (((x) &gt;&gt; BIT_SHIFT_CW) &amp; BIT_MASK_CW)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AIFS 0</div><div class='del'>-#define BIT_MASK_AIFS 0xff</div><div class='del'>-#define BIT_AIFS(x) (((x) &amp; BIT_MASK_AIFS) &lt;&lt; BIT_SHIFT_AIFS)</div><div class='del'>-#define BIT_GET_AIFS(x) (((x) &gt;&gt; BIT_SHIFT_AIFS) &amp; BIT_MASK_AIFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNTCFG				(Offset 0x0510) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNCW_MAX 12</div><div class='del'>-#define BIT_MASK_BCNCW_MAX 0xf</div><div class='del'>-#define BIT_BCNCW_MAX(x) (((x) &amp; BIT_MASK_BCNCW_MAX) &lt;&lt; BIT_SHIFT_BCNCW_MAX)</div><div class='del'>-#define BIT_GET_BCNCW_MAX(x) (((x) &gt;&gt; BIT_SHIFT_BCNCW_MAX) &amp; BIT_MASK_BCNCW_MAX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNCW_MIN 8</div><div class='del'>-#define BIT_MASK_BCNCW_MIN 0xf</div><div class='del'>-#define BIT_BCNCW_MIN(x) (((x) &amp; BIT_MASK_BCNCW_MIN) &lt;&lt; BIT_SHIFT_BCNCW_MIN)</div><div class='del'>-#define BIT_GET_BCNCW_MIN(x) (((x) &gt;&gt; BIT_SHIFT_BCNCW_MIN) &amp; BIT_MASK_BCNCW_MIN)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNIFS 0</div><div class='del'>-#define BIT_MASK_BCNIFS 0xff</div><div class='del'>-#define BIT_BCNIFS(x) (((x) &amp; BIT_MASK_BCNIFS) &lt;&lt; BIT_SHIFT_BCNIFS)</div><div class='del'>-#define BIT_GET_BCNIFS(x) (((x) &gt;&gt; BIT_SHIFT_BCNIFS) &amp; BIT_MASK_BCNIFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PIFS				(Offset 0x0512) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PIFS 0</div><div class='del'>-#define BIT_MASK_PIFS 0xff</div><div class='del'>-#define BIT_PIFS(x) (((x) &amp; BIT_MASK_PIFS) &lt;&lt; BIT_SHIFT_PIFS)</div><div class='del'>-#define BIT_GET_PIFS(x) (((x) &gt;&gt; BIT_SHIFT_PIFS) &amp; BIT_MASK_PIFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RDG_PIFS				(Offset 0x0513) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RDG_PIFS 0</div><div class='del'>-#define BIT_MASK_RDG_PIFS 0xff</div><div class='del'>-#define BIT_RDG_PIFS(x) (((x) &amp; BIT_MASK_RDG_PIFS) &lt;&lt; BIT_SHIFT_RDG_PIFS)</div><div class='del'>-#define BIT_GET_RDG_PIFS(x) (((x) &gt;&gt; BIT_SHIFT_RDG_PIFS) &amp; BIT_MASK_RDG_PIFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SIFS				(Offset 0x0514) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_OFDM_TRX 24</div><div class='del'>-#define BIT_MASK_SIFS_OFDM_TRX 0xff</div><div class='del'>-#define BIT_SIFS_OFDM_TRX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_OFDM_TRX) &lt;&lt; BIT_SHIFT_SIFS_OFDM_TRX)</div><div class='del'>-#define BIT_GET_SIFS_OFDM_TRX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_OFDM_TRX) &amp; BIT_MASK_SIFS_OFDM_TRX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_CCK_TRX 16</div><div class='del'>-#define BIT_MASK_SIFS_CCK_TRX 0xff</div><div class='del'>-#define BIT_SIFS_CCK_TRX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_CCK_TRX) &lt;&lt; BIT_SHIFT_SIFS_CCK_TRX)</div><div class='del'>-#define BIT_GET_SIFS_CCK_TRX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_CCK_TRX) &amp; BIT_MASK_SIFS_CCK_TRX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_OFDM_CTX 8</div><div class='del'>-#define BIT_MASK_SIFS_OFDM_CTX 0xff</div><div class='del'>-#define BIT_SIFS_OFDM_CTX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_OFDM_CTX) &lt;&lt; BIT_SHIFT_SIFS_OFDM_CTX)</div><div class='del'>-#define BIT_GET_SIFS_OFDM_CTX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_OFDM_CTX) &amp; BIT_MASK_SIFS_OFDM_CTX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_CCK_CTX 0</div><div class='del'>-#define BIT_MASK_SIFS_CCK_CTX 0xff</div><div class='del'>-#define BIT_SIFS_CCK_CTX(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_CCK_CTX) &lt;&lt; BIT_SHIFT_SIFS_CCK_CTX)</div><div class='del'>-#define BIT_GET_SIFS_CCK_CTX(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_CCK_CTX) &amp; BIT_MASK_SIFS_CCK_CTX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTR_SYN_OFFSET			(Offset 0x0518) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFTR_SNC_OFFSET 0</div><div class='del'>-#define BIT_MASK_TSFTR_SNC_OFFSET 0xffff</div><div class='del'>-#define BIT_TSFTR_SNC_OFFSET(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFTR_SNC_OFFSET) &lt;&lt; BIT_SHIFT_TSFTR_SNC_OFFSET)</div><div class='del'>-#define BIT_GET_TSFTR_SNC_OFFSET(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFTR_SNC_OFFSET) &amp; BIT_MASK_TSFTR_SNC_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AGGR_BREAK_TIME			(Offset 0x051A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AGGR_BK_TIME 0</div><div class='del'>-#define BIT_MASK_AGGR_BK_TIME 0xff</div><div class='del'>-#define BIT_AGGR_BK_TIME(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AGGR_BK_TIME) &lt;&lt; BIT_SHIFT_AGGR_BK_TIME)</div><div class='del'>-#define BIT_GET_AGGR_BK_TIME(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AGGR_BK_TIME) &amp; BIT_MASK_AGGR_BK_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SLOT				(Offset 0x051B) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SLOT 0</div><div class='del'>-#define BIT_MASK_SLOT 0xff</div><div class='del'>-#define BIT_SLOT(x) (((x) &amp; BIT_MASK_SLOT) &lt;&lt; BIT_SHIFT_SLOT)</div><div class='del'>-#define BIT_GET_SLOT(x) (((x) &gt;&gt; BIT_SHIFT_SLOT) &amp; BIT_MASK_SLOT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_PTCL_CTRL			(Offset 0x0520) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_EDCCA BIT(15)</div><div class='del'>-#define BIT_DIS_CCA BIT(14)</div><div class='del'>-#define BIT_LSIG_TXOP_TXCMD_NAV BIT(13)</div><div class='del'>-#define BIT_SIFS_BK_EN BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXQ_NAV_MSK 8</div><div class='del'>-#define BIT_MASK_TXQ_NAV_MSK 0xf</div><div class='del'>-#define BIT_TXQ_NAV_MSK(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXQ_NAV_MSK) &lt;&lt; BIT_SHIFT_TXQ_NAV_MSK)</div><div class='del'>-#define BIT_GET_TXQ_NAV_MSK(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXQ_NAV_MSK) &amp; BIT_MASK_TXQ_NAV_MSK)</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_CW BIT(7)</div><div class='del'>-#define BIT_NAV_END_TXOP BIT(6)</div><div class='del'>-#define BIT_RDG_END_TXOP BIT(5)</div><div class='del'>-#define BIT_AC_INBCN_HOLD BIT(4)</div><div class='del'>-#define BIT_MGTQ_TXOP_EN BIT(3)</div><div class='del'>-#define BIT_MGTQ_RTSMF_EN BIT(2)</div><div class='del'>-#define BIT_HIQ_RTSMF_EN BIT(1)</div><div class='del'>-#define BIT_BCN_RTSMF_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXPAUSE				(Offset 0x0522) */</div><div class='del'>-</div><div class='del'>-#define BIT_STOP_BCN_HI_MGT BIT(7)</div><div class='del'>-#define BIT_MAC_STOPBCNQ BIT(6)</div><div class='del'>-#define BIT_MAC_STOPHIQ BIT(5)</div><div class='del'>-#define BIT_MAC_STOPMGQ BIT(4)</div><div class='del'>-#define BIT_MAC_STOPBK BIT(3)</div><div class='del'>-#define BIT_MAC_STOPBE BIT(2)</div><div class='del'>-#define BIT_MAC_STOPVI BIT(1)</div><div class='del'>-#define BIT_MAC_STOPVO BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DIS_TXREQ_CLR			(Offset 0x0523) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_BT_CCA BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DIS_TXREQ_CLR			(Offset 0x0523) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_HI BIT(5)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_MGQ BIT(4)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_VO BIT(3)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_VI BIT(2)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_BE BIT(1)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_BK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_CTRL				(Offset 0x0524) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_CLR_TXREQ_INCCA BIT(15)</div><div class='del'>-#define BIT_DIS_TX_OVER_BCNQ BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_CTRL				(Offset 0x0524) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_BCNERR_INCCCA BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_CTRL				(Offset 0x0524) */</div><div class='del'>-</div><div class='del'>-#define BIT_EDCCA_MSK_CNTDOWN_EN BIT(11)</div><div class='del'>-#define BIT_DIS_TXOP_CFE BIT(10)</div><div class='del'>-#define BIT_DIS_LSIG_CFE BIT(9)</div><div class='del'>-#define BIT_DIS_STBC_CFE BIT(8)</div><div class='del'>-#define BIT_BKQ_RD_INIT_EN BIT(7)</div><div class='del'>-#define BIT_BEQ_RD_INIT_EN BIT(6)</div><div class='del'>-#define BIT_VIQ_RD_INIT_EN BIT(5)</div><div class='del'>-#define BIT_VOQ_RD_INIT_EN BIT(4)</div><div class='del'>-#define BIT_BKQ_RD_RESP_EN BIT(3)</div><div class='del'>-#define BIT_BEQ_RD_RESP_EN BIT(2)</div><div class='del'>-#define BIT_VIQ_RD_RESP_EN BIT(1)</div><div class='del'>-#define BIT_VOQ_RD_RESP_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_CTRL				(Offset 0x0526) */</div><div class='del'>-</div><div class='del'>-#define BIT_MBID_BCNQ7_EN BIT(7)</div><div class='del'>-#define BIT_MBID_BCNQ6_EN BIT(6)</div><div class='del'>-#define BIT_MBID_BCNQ5_EN BIT(5)</div><div class='del'>-#define BIT_MBID_BCNQ4_EN BIT(4)</div><div class='del'>-#define BIT_MBID_BCNQ3_EN BIT(3)</div><div class='del'>-#define BIT_MBID_BCNQ2_EN BIT(2)</div><div class='del'>-#define BIT_MBID_BCNQ1_EN BIT(1)</div><div class='del'>-#define BIT_MBID_BCNQ0_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_CTRL				(Offset 0x0527) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P_CTW_ALLSTASLEEP BIT(7)</div><div class='del'>-#define BIT_P2P_OFF_DISTX_EN BIT(6)</div><div class='del'>-#define BIT_PWR_MGT_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_CTRL				(Offset 0x0527) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P_NOA1_EN BIT(2)</div><div class='del'>-#define BIT_P2P_NOA0_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_LIFETIME_CTRL			(Offset 0x0528) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_P2P_CTWND1 BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_LIFETIME_CTRL			(Offset 0x0528) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_BKF_CLR_TXREQ BIT(22)</div><div class='del'>-#define BIT_EN_TSFBIT32_RST_P2P BIT(21)</div><div class='del'>-#define BIT_EN_BCN_TX_BTCCA BIT(20)</div><div class='del'>-#define BIT_DIS_PKT_TX_ATIM BIT(19)</div><div class='del'>-#define BIT_DIS_BCN_DIS_CTN BIT(18)</div><div class='del'>-#define BIT_EN_NAVEND_RST_TXOP BIT(17)</div><div class='del'>-#define BIT_EN_FILTER_CCA BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CCA_FILTER_THRS 8</div><div class='del'>-#define BIT_MASK_CCA_FILTER_THRS 0xff</div><div class='del'>-#define BIT_CCA_FILTER_THRS(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CCA_FILTER_THRS) &lt;&lt; BIT_SHIFT_CCA_FILTER_THRS)</div><div class='del'>-#define BIT_GET_CCA_FILTER_THRS(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CCA_FILTER_THRS) &amp; BIT_MASK_CCA_FILTER_THRS)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EDCCA_THRS 0</div><div class='del'>-#define BIT_MASK_EDCCA_THRS 0xff</div><div class='del'>-#define BIT_EDCCA_THRS(x) (((x) &amp; BIT_MASK_EDCCA_THRS) &lt;&lt; BIT_SHIFT_EDCCA_THRS)</div><div class='del'>-#define BIT_GET_EDCCA_THRS(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EDCCA_THRS) &amp; BIT_MASK_EDCCA_THRS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_SPEC_STATE			(Offset 0x052B) */</div><div class='del'>-</div><div class='del'>-#define BIT_SPEC_POWER_STATE BIT(7)</div><div class='del'>-#define BIT_SPEC_CTWINDOW_ON BIT(6)</div><div class='del'>-#define BIT_SPEC_BEACON_AREA_ON BIT(5)</div><div class='del'>-#define BIT_SPEC_CTWIN_EARLY_DISTX BIT(4)</div><div class='del'>-#define BIT_SPEC_NOA1_OFF_PERIOD BIT(3)</div><div class='del'>-#define BIT_SPEC_FORCE_DOZE1 BIT(2)</div><div class='del'>-#define BIT_SPEC_NOA0_OFF_PERIOD BIT(1)</div><div class='del'>-#define BIT_SPEC_FORCE_DOZE0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_THR			(Offset 0x0538) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_QUEUE_THR 24</div><div class='del'>-#define BIT_MASK_BK_QUEUE_THR 0xff</div><div class='del'>-#define BIT_BK_QUEUE_THR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_QUEUE_THR) &lt;&lt; BIT_SHIFT_BK_QUEUE_THR)</div><div class='del'>-#define BIT_GET_BK_QUEUE_THR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_QUEUE_THR) &amp; BIT_MASK_BK_QUEUE_THR)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_QUEUE_THR 16</div><div class='del'>-#define BIT_MASK_BE_QUEUE_THR 0xff</div><div class='del'>-#define BIT_BE_QUEUE_THR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_QUEUE_THR) &lt;&lt; BIT_SHIFT_BE_QUEUE_THR)</div><div class='del'>-#define BIT_GET_BE_QUEUE_THR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_QUEUE_THR) &amp; BIT_MASK_BE_QUEUE_THR)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_QUEUE_THR 8</div><div class='del'>-#define BIT_MASK_VI_QUEUE_THR 0xff</div><div class='del'>-#define BIT_VI_QUEUE_THR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_QUEUE_THR) &lt;&lt; BIT_SHIFT_VI_QUEUE_THR)</div><div class='del'>-#define BIT_GET_VI_QUEUE_THR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_QUEUE_THR) &amp; BIT_MASK_VI_QUEUE_THR)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_QUEUE_THR 0</div><div class='del'>-#define BIT_MASK_VO_QUEUE_THR 0xff</div><div class='del'>-#define BIT_VO_QUEUE_THR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_QUEUE_THR) &lt;&lt; BIT_SHIFT_VO_QUEUE_THR)</div><div class='del'>-#define BIT_GET_VO_QUEUE_THR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_QUEUE_THR) &amp; BIT_MASK_VO_QUEUE_THR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_EN			(Offset 0x053C) */</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_INCOL_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_EN			(Offset 0x053C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_TRIGGER_NUM 12</div><div class='del'>-#define BIT_MASK_BE_TRIGGER_NUM 0xf</div><div class='del'>-#define BIT_BE_TRIGGER_NUM(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_TRIGGER_NUM) &lt;&lt; BIT_SHIFT_BE_TRIGGER_NUM)</div><div class='del'>-#define BIT_GET_BE_TRIGGER_NUM(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_TRIGGER_NUM) &amp; BIT_MASK_BE_TRIGGER_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_EN			(Offset 0x053C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_TRIGGER_NUM 8</div><div class='del'>-#define BIT_MASK_BK_TRIGGER_NUM 0xf</div><div class='del'>-#define BIT_BK_TRIGGER_NUM(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_TRIGGER_NUM) &lt;&lt; BIT_SHIFT_BK_TRIGGER_NUM)</div><div class='del'>-#define BIT_GET_BK_TRIGGER_NUM(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_TRIGGER_NUM) &amp; BIT_MASK_BK_TRIGGER_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_EN			(Offset 0x053C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_TRIGGER_NUM 4</div><div class='del'>-#define BIT_MASK_VI_TRIGGER_NUM 0xf</div><div class='del'>-#define BIT_VI_TRIGGER_NUM(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_TRIGGER_NUM) &lt;&lt; BIT_SHIFT_VI_TRIGGER_NUM)</div><div class='del'>-#define BIT_GET_VI_TRIGGER_NUM(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_TRIGGER_NUM) &amp; BIT_MASK_VI_TRIGGER_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_TRIGGER_NUM 0</div><div class='del'>-#define BIT_MASK_VO_TRIGGER_NUM 0xf</div><div class='del'>-#define BIT_VO_TRIGGER_NUM(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_TRIGGER_NUM) &lt;&lt; BIT_SHIFT_VO_TRIGGER_NUM)</div><div class='del'>-#define BIT_GET_VO_TRIGGER_NUM(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_TRIGGER_NUM) &amp; BIT_MASK_VO_TRIGGER_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_PROHIBIT			(Offset 0x0540) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_HOLD_TIME_AP 8</div><div class='del'>-#define BIT_MASK_TBTT_HOLD_TIME_AP 0xfff</div><div class='del'>-#define BIT_TBTT_HOLD_TIME_AP(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_HOLD_TIME_AP) &lt;&lt; BIT_SHIFT_TBTT_HOLD_TIME_AP)</div><div class='del'>-#define BIT_GET_TBTT_HOLD_TIME_AP(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_HOLD_TIME_AP) &amp; BIT_MASK_TBTT_HOLD_TIME_AP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_PROHIBIT			(Offset 0x0540) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_PROHIBIT_SETUP 0</div><div class='del'>-#define BIT_MASK_TBTT_PROHIBIT_SETUP 0xf</div><div class='del'>-#define BIT_TBTT_PROHIBIT_SETUP(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_PROHIBIT_SETUP) &lt;&lt; BIT_SHIFT_TBTT_PROHIBIT_SETUP)</div><div class='del'>-#define BIT_GET_TBTT_PROHIBIT_SETUP(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_PROHIBIT_SETUP) &amp; BIT_MASK_TBTT_PROHIBIT_SETUP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_STATE				(Offset 0x0543) */</div><div class='del'>-</div><div class='del'>-#define BIT_POWER_STATE BIT(7)</div><div class='del'>-#define BIT_CTWINDOW_ON BIT(6)</div><div class='del'>-#define BIT_BEACON_AREA_ON BIT(5)</div><div class='del'>-#define BIT_CTWIN_EARLY_DISTX BIT(4)</div><div class='del'>-#define BIT_NOA1_OFF_PERIOD BIT(3)</div><div class='del'>-#define BIT_FORCE_DOZE1 BIT(2)</div><div class='del'>-#define BIT_NOA0_OFF_PERIOD BIT(1)</div><div class='del'>-#define BIT_FORCE_DOZE0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_NAV_NXT				(Offset 0x0544) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RD_NAV_PROT_NXT 0</div><div class='del'>-#define BIT_MASK_RD_NAV_PROT_NXT 0xffff</div><div class='del'>-#define BIT_RD_NAV_PROT_NXT(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RD_NAV_PROT_NXT) &lt;&lt; BIT_SHIFT_RD_NAV_PROT_NXT)</div><div class='del'>-#define BIT_GET_RD_NAV_PROT_NXT(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RD_NAV_PROT_NXT) &amp; BIT_MASK_RD_NAV_PROT_NXT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NAV_PROT_LEN			(Offset 0x0546) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NAV_PROT_LEN 0</div><div class='del'>-#define BIT_MASK_NAV_PROT_LEN 0xffff</div><div class='del'>-#define BIT_NAV_PROT_LEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_NAV_PROT_LEN) &lt;&lt; BIT_SHIFT_NAV_PROT_LEN)</div><div class='del'>-#define BIT_GET_NAV_PROT_LEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NAV_PROT_LEN) &amp; BIT_MASK_NAV_PROT_LEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL				(Offset 0x0550) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_RX_BSSID_FIT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL				(Offset 0x0550) */</div><div class='del'>-</div><div class='del'>-#define BIT_P0_EN_TXBCN_RPT BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL				(Offset 0x0550) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_TSF_UDT BIT(4)</div><div class='del'>-#define BIT_EN_BCN_FUNCTION BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL				(Offset 0x0550) */</div><div class='del'>-</div><div class='del'>-#define BIT_P0_EN_RXBCN_RPT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL				(Offset 0x0550) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_P2P_CTWINDOW BIT(1)</div><div class='del'>-#define BIT_EN_P2P_BCNQ_AREA BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT0			(Offset 0x0551) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI0_DIS_RX_BSSID_FIT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT0			(Offset 0x0551) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI0_DIS_TSF_UDT BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT0			(Offset 0x0551) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI0_EN_BCN_FUNCTION BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT0			(Offset 0x0551) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI0_EN_RXBCN_RPT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT0			(Offset 0x0551) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI0_ENP2P_CTWINDOW BIT(1)</div><div class='del'>-#define BIT_CLI0_ENP2P_BCNQ_AREA BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBID_NUM				(Offset 0x0552) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_PRE_DL_BEACON BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBID_BCN_NUM 0</div><div class='del'>-#define BIT_MASK_MBID_BCN_NUM 0x7</div><div class='del'>-#define BIT_MBID_BCN_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBID_BCN_NUM) &lt;&lt; BIT_SHIFT_MBID_BCN_NUM)</div><div class='del'>-#define BIT_GET_MBID_BCN_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBID_BCN_NUM) &amp; BIT_MASK_MBID_BCN_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST			(Offset 0x0553) */</div><div class='del'>-</div><div class='del'>-#define BIT_FREECNT_RST BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST			(Offset 0x0553) */</div><div class='del'>-</div><div class='del'>-#define BIT_TSFTR_CLI3_RST BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST			(Offset 0x0553) */</div><div class='del'>-</div><div class='del'>-#define BIT_TSFTR_CLI2_RST BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST			(Offset 0x0553) */</div><div class='del'>-</div><div class='del'>-#define BIT_TSFTR_CLI1_RST BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST			(Offset 0x0553) */</div><div class='del'>-</div><div class='del'>-#define BIT_TSFTR_CLI0_RST BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST			(Offset 0x0553) */</div><div class='del'>-</div><div class='del'>-#define BIT_TSFTR_RST BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE			(Offset 0x0554) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_TIMER_SEL_FWRD 28</div><div class='del'>-#define BIT_MASK_BCN_TIMER_SEL_FWRD 0x7</div><div class='del'>-#define BIT_BCN_TIMER_SEL_FWRD(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_TIMER_SEL_FWRD) &lt;&lt; BIT_SHIFT_BCN_TIMER_SEL_FWRD)</div><div class='del'>-#define BIT_GET_BCN_TIMER_SEL_FWRD(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_TIMER_SEL_FWRD) &amp; BIT_MASK_BCN_TIMER_SEL_FWRD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE			(Offset 0x0554) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT0 16</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT0 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT0(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT0) &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT0)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT0(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT0) &amp; BIT_MASK_BCN_SPACE_CLINT0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE			(Offset 0x0554) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE0 0</div><div class='del'>-#define BIT_MASK_BCN_SPACE0 0xffff</div><div class='del'>-#define BIT_BCN_SPACE0(x) (((x) &amp; BIT_MASK_BCN_SPACE0) &lt;&lt; BIT_SHIFT_BCN_SPACE0)</div><div class='del'>-#define BIT_GET_BCN_SPACE0(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE0) &amp; BIT_MASK_BCN_SPACE0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DRVERLYINT				(Offset 0x0558) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DRVERLYITV 0</div><div class='del'>-#define BIT_MASK_DRVERLYITV 0xff</div><div class='del'>-#define BIT_DRVERLYITV(x) (((x) &amp; BIT_MASK_DRVERLYITV) &lt;&lt; BIT_SHIFT_DRVERLYITV)</div><div class='del'>-#define BIT_GET_DRVERLYITV(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DRVERLYITV) &amp; BIT_MASK_DRVERLYITV)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNDMATIM				(Offset 0x0559) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNDMATIM 0</div><div class='del'>-#define BIT_MASK_BCNDMATIM 0xff</div><div class='del'>-#define BIT_BCNDMATIM(x) (((x) &amp; BIT_MASK_BCNDMATIM) &lt;&lt; BIT_SHIFT_BCNDMATIM)</div><div class='del'>-#define BIT_GET_BCNDMATIM(x) (((x) &gt;&gt; BIT_SHIFT_BCNDMATIM) &amp; BIT_MASK_BCNDMATIM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND				(Offset 0x055A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND0 0</div><div class='del'>-#define BIT_MASK_ATIMWND0 0xffff</div><div class='del'>-#define BIT_ATIMWND0(x) (((x) &amp; BIT_MASK_ATIMWND0) &lt;&lt; BIT_SHIFT_ATIMWND0)</div><div class='del'>-#define BIT_GET_ATIMWND0(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND0) &amp; BIT_MASK_ATIMWND0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USTIME_TSF				(Offset 0x055C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USTIME_TSF_V1 0</div><div class='del'>-#define BIT_MASK_USTIME_TSF_V1 0xff</div><div class='del'>-#define BIT_USTIME_TSF_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_USTIME_TSF_V1) &lt;&lt; BIT_SHIFT_USTIME_TSF_V1)</div><div class='del'>-#define BIT_GET_USTIME_TSF_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USTIME_TSF_V1) &amp; BIT_MASK_USTIME_TSF_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_MAX_ERR				(Offset 0x055D) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_MAX_ERR 0</div><div class='del'>-#define BIT_MASK_BCN_MAX_ERR 0xff</div><div class='del'>-#define BIT_BCN_MAX_ERR(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_MAX_ERR) &lt;&lt; BIT_SHIFT_BCN_MAX_ERR)</div><div class='del'>-#define BIT_GET_BCN_MAX_ERR(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_MAX_ERR) &amp; BIT_MASK_BCN_MAX_ERR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXTSF_OFFSET_CCK			(Offset 0x055E) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CCK_RXTSF_OFFSET 0</div><div class='del'>-#define BIT_MASK_CCK_RXTSF_OFFSET 0xff</div><div class='del'>-#define BIT_CCK_RXTSF_OFFSET(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_CCK_RXTSF_OFFSET) &lt;&lt; BIT_SHIFT_CCK_RXTSF_OFFSET)</div><div class='del'>-#define BIT_GET_CCK_RXTSF_OFFSET(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CCK_RXTSF_OFFSET) &amp; BIT_MASK_CCK_RXTSF_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXTSF_OFFSET_OFDM			(Offset 0x055F) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OFDM_RXTSF_OFFSET 0</div><div class='del'>-#define BIT_MASK_OFDM_RXTSF_OFFSET 0xff</div><div class='del'>-#define BIT_OFDM_RXTSF_OFFSET(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_OFDM_RXTSF_OFFSET) &lt;&lt; BIT_SHIFT_OFDM_RXTSF_OFFSET)</div><div class='del'>-#define BIT_GET_OFDM_RXTSF_OFFSET(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OFDM_RXTSF_OFFSET) &amp; BIT_MASK_OFDM_RXTSF_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTR				(Offset 0x0560) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSF_TIMER 0</div><div class='del'>-#define BIT_MASK_TSF_TIMER 0xffffffffffffffffL</div><div class='del'>-#define BIT_TSF_TIMER(x) (((x) &amp; BIT_MASK_TSF_TIMER) &lt;&lt; BIT_SHIFT_TSF_TIMER)</div><div class='del'>-#define BIT_GET_TSF_TIMER(x) (((x) &gt;&gt; BIT_SHIFT_TSF_TIMER) &amp; BIT_MASK_TSF_TIMER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FREERUN_CNT				(Offset 0x0568) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FREERUN_CNT 0</div><div class='del'>-#define BIT_MASK_FREERUN_CNT 0xffffffffffffffffL</div><div class='del'>-#define BIT_FREERUN_CNT(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_FREERUN_CNT) &lt;&lt; BIT_SHIFT_FREERUN_CNT)</div><div class='del'>-#define BIT_GET_FREERUN_CNT(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FREERUN_CNT) &amp; BIT_MASK_FREERUN_CNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND1_V1				(Offset 0x0570) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND1_V1 0</div><div class='del'>-#define BIT_MASK_ATIMWND1_V1 0xff</div><div class='del'>-#define BIT_ATIMWND1_V1(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND1_V1) &lt;&lt; BIT_SHIFT_ATIMWND1_V1)</div><div class='del'>-#define BIT_GET_ATIMWND1_V1(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND1_V1) &amp; BIT_MASK_ATIMWND1_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_PROHIBIT_INFRA			(Offset 0x0571) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_PROHIBIT_INFRA 0</div><div class='del'>-#define BIT_MASK_TBTT_PROHIBIT_INFRA 0xff</div><div class='del'>-#define BIT_TBTT_PROHIBIT_INFRA(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_PROHIBIT_INFRA) &lt;&lt; BIT_SHIFT_TBTT_PROHIBIT_INFRA)</div><div class='del'>-#define BIT_GET_TBTT_PROHIBIT_INFRA(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_PROHIBIT_INFRA) &amp; BIT_MASK_TBTT_PROHIBIT_INFRA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CTWND				(Offset 0x0572) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CTWND 0</div><div class='del'>-#define BIT_MASK_CTWND 0xff</div><div class='del'>-#define BIT_CTWND(x) (((x) &amp; BIT_MASK_CTWND) &lt;&lt; BIT_SHIFT_CTWND)</div><div class='del'>-#define BIT_GET_CTWND(x) (((x) &gt;&gt; BIT_SHIFT_CTWND) &amp; BIT_MASK_CTWND)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNIVLCUNT				(Offset 0x0573) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNIVLCUNT 0</div><div class='del'>-#define BIT_MASK_BCNIVLCUNT 0x7f</div><div class='del'>-#define BIT_BCNIVLCUNT(x) (((x) &amp; BIT_MASK_BCNIVLCUNT) &lt;&lt; BIT_SHIFT_BCNIVLCUNT)</div><div class='del'>-#define BIT_GET_BCNIVLCUNT(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNIVLCUNT) &amp; BIT_MASK_BCNIVLCUNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNDROPCTRL				(Offset 0x0574) */</div><div class='del'>-</div><div class='del'>-#define BIT_BEACON_DROP_EN BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEACON_DROP_IVL 0</div><div class='del'>-#define BIT_MASK_BEACON_DROP_IVL 0x7f</div><div class='del'>-#define BIT_BEACON_DROP_IVL(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEACON_DROP_IVL) &lt;&lt; BIT_SHIFT_BEACON_DROP_IVL)</div><div class='del'>-#define BIT_GET_BEACON_DROP_IVL(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEACON_DROP_IVL) &amp; BIT_MASK_BEACON_DROP_IVL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HGQ_TIMEOUT_PERIOD			(Offset 0x0575) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HGQ_TIMEOUT_PERIOD 0</div><div class='del'>-#define BIT_MASK_HGQ_TIMEOUT_PERIOD 0xff</div><div class='del'>-#define BIT_HGQ_TIMEOUT_PERIOD(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_HGQ_TIMEOUT_PERIOD) &lt;&lt; BIT_SHIFT_HGQ_TIMEOUT_PERIOD)</div><div class='del'>-#define BIT_GET_HGQ_TIMEOUT_PERIOD(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HGQ_TIMEOUT_PERIOD) &amp; BIT_MASK_HGQ_TIMEOUT_PERIOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_TIMEOUT_PERIOD		(Offset 0x0576) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXCMD_TIMEOUT_PERIOD 0</div><div class='del'>-#define BIT_MASK_TXCMD_TIMEOUT_PERIOD 0xff</div><div class='del'>-#define BIT_TXCMD_TIMEOUT_PERIOD(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXCMD_TIMEOUT_PERIOD)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TXCMD_TIMEOUT_PERIOD)</div><div class='del'>-#define BIT_GET_TXCMD_TIMEOUT_PERIOD(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXCMD_TIMEOUT_PERIOD) &amp;                             \</div><div class='del'>-	 BIT_MASK_TXCMD_TIMEOUT_PERIOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MISC_CTRL				(Offset 0x0577) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_TRX_CAL_BCN BIT(5)</div><div class='del'>-#define BIT_DIS_TX_CAL_TBTT BIT(4)</div><div class='del'>-#define BIT_EN_FREECNT BIT(3)</div><div class='del'>-#define BIT_BCN_AGGRESSION BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DIS_SECONDARY_CCA 0</div><div class='del'>-#define BIT_MASK_DIS_SECONDARY_CCA 0x3</div><div class='del'>-#define BIT_DIS_SECONDARY_CCA(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_DIS_SECONDARY_CCA) &lt;&lt; BIT_SHIFT_DIS_SECONDARY_CCA)</div><div class='del'>-#define BIT_GET_DIS_SECONDARY_CCA(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DIS_SECONDARY_CCA) &amp; BIT_MASK_DIS_SECONDARY_CCA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT1			(Offset 0x0578) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI1_DIS_RX_BSSID_FIT BIT(6)</div><div class='del'>-#define BIT_CLI1_DIS_TSF_UDT BIT(4)</div><div class='del'>-#define BIT_CLI1_EN_BCN_FUNCTION BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT1			(Offset 0x0578) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI1_EN_RXBCN_RPT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT1			(Offset 0x0578) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI1_ENP2P_CTWINDOW BIT(1)</div><div class='del'>-#define BIT_CLI1_ENP2P_BCNQ_AREA BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT2			(Offset 0x0579) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI2_DIS_RX_BSSID_FIT BIT(6)</div><div class='del'>-#define BIT_CLI2_DIS_TSF_UDT BIT(4)</div><div class='del'>-#define BIT_CLI2_EN_BCN_FUNCTION BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT2			(Offset 0x0579) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI2_EN_RXBCN_RPT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT2			(Offset 0x0579) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI2_ENP2P_CTWINDOW BIT(1)</div><div class='del'>-#define BIT_CLI2_ENP2P_BCNQ_AREA BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT3			(Offset 0x057A) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI3_DIS_RX_BSSID_FIT BIT(6)</div><div class='del'>-#define BIT_CLI3_DIS_TSF_UDT BIT(4)</div><div class='del'>-#define BIT_CLI3_EN_BCN_FUNCTION BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT3			(Offset 0x057A) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI3_EN_RXBCN_RPT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT3			(Offset 0x057A) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI3_ENP2P_CTWINDOW BIT(1)</div><div class='del'>-#define BIT_CLI3_ENP2P_BCNQ_AREA BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EXTEND_CTRL				(Offset 0x057B) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_TSFBIT32_RST_P2P2 BIT(5)</div><div class='del'>-#define BIT_EN_TSFBIT32_RST_P2P1 BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PORT_SEL 0</div><div class='del'>-#define BIT_MASK_PORT_SEL 0x7</div><div class='del'>-#define BIT_PORT_SEL(x) (((x) &amp; BIT_MASK_PORT_SEL) &lt;&lt; BIT_SHIFT_PORT_SEL)</div><div class='del'>-#define BIT_GET_PORT_SEL(x) (((x) &gt;&gt; BIT_SHIFT_PORT_SEL) &amp; BIT_MASK_PORT_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS1_SPEC_STATE			(Offset 0x057C) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P1_SPEC_POWER_STATE BIT(7)</div><div class='del'>-#define BIT_P2P1_SPEC_CTWINDOW_ON BIT(6)</div><div class='del'>-#define BIT_P2P1_SPEC_BCN_AREA_ON BIT(5)</div><div class='del'>-#define BIT_P2P1_SPEC_CTWIN_EARLY_DISTX BIT(4)</div><div class='del'>-#define BIT_P2P1_SPEC_NOA1_OFF_PERIOD BIT(3)</div><div class='del'>-#define BIT_P2P1_SPEC_FORCE_DOZE1 BIT(2)</div><div class='del'>-#define BIT_P2P1_SPEC_NOA0_OFF_PERIOD BIT(1)</div><div class='del'>-#define BIT_P2P1_SPEC_FORCE_DOZE0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS1_STATE			(Offset 0x057D) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P1_POWER_STATE BIT(7)</div><div class='del'>-#define BIT_P2P1_CTWINDOW_ON BIT(6)</div><div class='del'>-#define BIT_P2P1_BEACON_AREA_ON BIT(5)</div><div class='del'>-#define BIT_P2P1_CTWIN_EARLY_DISTX BIT(4)</div><div class='del'>-#define BIT_P2P1_NOA1_OFF_PERIOD BIT(3)</div><div class='del'>-#define BIT_P2P1_FORCE_DOZE1 BIT(2)</div><div class='del'>-#define BIT_P2P1_NOA0_OFF_PERIOD BIT(1)</div><div class='del'>-#define BIT_P2P1_FORCE_DOZE0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS2_SPEC_STATE			(Offset 0x057E) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P2_SPEC_POWER_STATE BIT(7)</div><div class='del'>-#define BIT_P2P2_SPEC_CTWINDOW_ON BIT(6)</div><div class='del'>-#define BIT_P2P2_SPEC_BCN_AREA_ON BIT(5)</div><div class='del'>-#define BIT_P2P2_SPEC_CTWIN_EARLY_DISTX BIT(4)</div><div class='del'>-#define BIT_P2P2_SPEC_NOA1_OFF_PERIOD BIT(3)</div><div class='del'>-#define BIT_P2P2_SPEC_FORCE_DOZE1 BIT(2)</div><div class='del'>-#define BIT_P2P2_SPEC_NOA0_OFF_PERIOD BIT(1)</div><div class='del'>-#define BIT_P2P2_SPEC_FORCE_DOZE0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS2_STATE			(Offset 0x057F) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P2_POWER_STATE BIT(7)</div><div class='del'>-#define BIT_P2P2_CTWINDOW_ON BIT(6)</div><div class='del'>-#define BIT_P2P2_BEACON_AREA_ON BIT(5)</div><div class='del'>-#define BIT_P2P2_CTWIN_EARLY_DISTX BIT(4)</div><div class='del'>-#define BIT_P2P2_NOA1_OFF_PERIOD BIT(3)</div><div class='del'>-#define BIT_P2P2_FORCE_DOZE1 BIT(2)</div><div class='del'>-#define BIT_P2P2_NOA0_OFF_PERIOD BIT(1)</div><div class='del'>-#define BIT_P2P2_FORCE_DOZE0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER0				(Offset 0x0580) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSTIMER0_INT 5</div><div class='del'>-#define BIT_MASK_PSTIMER0_INT 0x7ffffff</div><div class='del'>-#define BIT_PSTIMER0_INT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSTIMER0_INT) &lt;&lt; BIT_SHIFT_PSTIMER0_INT)</div><div class='del'>-#define BIT_GET_PSTIMER0_INT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSTIMER0_INT) &amp; BIT_MASK_PSTIMER0_INT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER1				(Offset 0x0584) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSTIMER1_INT 5</div><div class='del'>-#define BIT_MASK_PSTIMER1_INT 0x7ffffff</div><div class='del'>-#define BIT_PSTIMER1_INT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSTIMER1_INT) &lt;&lt; BIT_SHIFT_PSTIMER1_INT)</div><div class='del'>-#define BIT_GET_PSTIMER1_INT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSTIMER1_INT) &amp; BIT_MASK_PSTIMER1_INT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER2				(Offset 0x0588) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSTIMER2_INT 5</div><div class='del'>-#define BIT_MASK_PSTIMER2_INT 0x7ffffff</div><div class='del'>-#define BIT_PSTIMER2_INT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSTIMER2_INT) &lt;&lt; BIT_SHIFT_PSTIMER2_INT)</div><div class='del'>-#define BIT_GET_PSTIMER2_INT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSTIMER2_INT) &amp; BIT_MASK_PSTIMER2_INT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_CTN_AREA			(Offset 0x058C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_CTN_AREA 0</div><div class='del'>-#define BIT_MASK_TBTT_CTN_AREA 0xff</div><div class='del'>-#define BIT_TBTT_CTN_AREA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_CTN_AREA) &lt;&lt; BIT_SHIFT_TBTT_CTN_AREA)</div><div class='del'>-#define BIT_GET_TBTT_CTN_AREA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_CTN_AREA) &amp; BIT_MASK_TBTT_CTN_AREA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FORCE_BCN_IFS			(Offset 0x058E) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FORCE_BCN_IFS 0</div><div class='del'>-#define BIT_MASK_FORCE_BCN_IFS 0xff</div><div class='del'>-#define BIT_FORCE_BCN_IFS(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FORCE_BCN_IFS) &lt;&lt; BIT_SHIFT_FORCE_BCN_IFS)</div><div class='del'>-#define BIT_GET_FORCE_BCN_IFS(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FORCE_BCN_IFS) &amp; BIT_MASK_FORCE_BCN_IFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXOP_MIN				(Offset 0x0590) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOP_MIN 0</div><div class='del'>-#define BIT_MASK_TXOP_MIN 0x3fff</div><div class='del'>-#define BIT_TXOP_MIN(x) (((x) &amp; BIT_MASK_TXOP_MIN) &lt;&lt; BIT_SHIFT_TXOP_MIN)</div><div class='del'>-#define BIT_GET_TXOP_MIN(x) (((x) &gt;&gt; BIT_SHIFT_TXOP_MIN) &amp; BIT_MASK_TXOP_MIN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PRE_BKF_TIME			(Offset 0x0592) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRE_BKF_TIME 0</div><div class='del'>-#define BIT_MASK_PRE_BKF_TIME 0xff</div><div class='del'>-#define BIT_PRE_BKF_TIME(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRE_BKF_TIME) &lt;&lt; BIT_SHIFT_PRE_BKF_TIME)</div><div class='del'>-#define BIT_GET_PRE_BKF_TIME(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRE_BKF_TIME) &amp; BIT_MASK_PRE_BKF_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CROSS_TXOP_CTRL			(Offset 0x0593) */</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM_BYPASS BIT(2)</div><div class='del'>-#define BIT_RTS_NAV_TXOP BIT(1)</div><div class='del'>-#define BIT_NOT_CROSS_TXOP BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND2				(Offset 0x05A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND2 0</div><div class='del'>-#define BIT_MASK_ATIMWND2 0xff</div><div class='del'>-#define BIT_ATIMWND2(x) (((x) &amp; BIT_MASK_ATIMWND2) &lt;&lt; BIT_SHIFT_ATIMWND2)</div><div class='del'>-#define BIT_GET_ATIMWND2(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND2) &amp; BIT_MASK_ATIMWND2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND3				(Offset 0x05A1) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND3 0</div><div class='del'>-#define BIT_MASK_ATIMWND3 0xff</div><div class='del'>-#define BIT_ATIMWND3(x) (((x) &amp; BIT_MASK_ATIMWND3) &lt;&lt; BIT_SHIFT_ATIMWND3)</div><div class='del'>-#define BIT_GET_ATIMWND3(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND3) &amp; BIT_MASK_ATIMWND3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND4				(Offset 0x05A2) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND4 0</div><div class='del'>-#define BIT_MASK_ATIMWND4 0xff</div><div class='del'>-#define BIT_ATIMWND4(x) (((x) &amp; BIT_MASK_ATIMWND4) &lt;&lt; BIT_SHIFT_ATIMWND4)</div><div class='del'>-#define BIT_GET_ATIMWND4(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND4) &amp; BIT_MASK_ATIMWND4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND5				(Offset 0x05A3) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND5 0</div><div class='del'>-#define BIT_MASK_ATIMWND5 0xff</div><div class='del'>-#define BIT_ATIMWND5(x) (((x) &amp; BIT_MASK_ATIMWND5) &lt;&lt; BIT_SHIFT_ATIMWND5)</div><div class='del'>-#define BIT_GET_ATIMWND5(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND5) &amp; BIT_MASK_ATIMWND5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND6				(Offset 0x05A4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND6 0</div><div class='del'>-#define BIT_MASK_ATIMWND6 0xff</div><div class='del'>-#define BIT_ATIMWND6(x) (((x) &amp; BIT_MASK_ATIMWND6) &lt;&lt; BIT_SHIFT_ATIMWND6)</div><div class='del'>-#define BIT_GET_ATIMWND6(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND6) &amp; BIT_MASK_ATIMWND6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND7				(Offset 0x05A5) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND7 0</div><div class='del'>-#define BIT_MASK_ATIMWND7 0xff</div><div class='del'>-#define BIT_ATIMWND7(x) (((x) &amp; BIT_MASK_ATIMWND7) &lt;&lt; BIT_SHIFT_ATIMWND7)</div><div class='del'>-#define BIT_GET_ATIMWND7(x) (((x) &gt;&gt; BIT_SHIFT_ATIMWND7) &amp; BIT_MASK_ATIMWND7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMUGT				(Offset 0x05A6) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIM_URGENT 0</div><div class='del'>-#define BIT_MASK_ATIM_URGENT 0xff</div><div class='del'>-#define BIT_ATIM_URGENT(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIM_URGENT) &lt;&lt; BIT_SHIFT_ATIM_URGENT)</div><div class='del'>-#define BIT_GET_ATIM_URGENT(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIM_URGENT) &amp; BIT_MASK_ATIM_URGENT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_NO_LMT_EN			(Offset 0x05A7) */</div><div class='del'>-</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP7 BIT(7)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP6 BIT(6)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP5 BIT(5)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP4 BIT(4)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP3 BIT(3)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP2 BIT(2)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP1 BIT(1)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_ROOT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_ROOT			(Offset 0x05A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_ROOT 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_ROOT 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_ROOT(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_ROOT) &lt;&lt; BIT_SHIFT_DTIM_COUNT_ROOT)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_ROOT(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_ROOT) &amp; BIT_MASK_DTIM_COUNT_ROOT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP1			(Offset 0x05A9) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP1 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP1 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP1) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP1)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP1) &amp; BIT_MASK_DTIM_COUNT_VAP1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP2			(Offset 0x05AA) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP2 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP2 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP2(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP2) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP2)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP2(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP2) &amp; BIT_MASK_DTIM_COUNT_VAP2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP3			(Offset 0x05AB) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP3 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP3 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP3(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP3) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP3)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP3(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP3) &amp; BIT_MASK_DTIM_COUNT_VAP3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP4			(Offset 0x05AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP4 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP4 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP4(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP4) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP4)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP4(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP4) &amp; BIT_MASK_DTIM_COUNT_VAP4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP5			(Offset 0x05AD) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP5 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP5 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP5(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP5) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP5)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP5(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP5) &amp; BIT_MASK_DTIM_COUNT_VAP5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP6			(Offset 0x05AE) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP6 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP6 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP6(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP6) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP6)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP6(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP6) &amp; BIT_MASK_DTIM_COUNT_VAP6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP7			(Offset 0x05AF) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP7 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP7 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP7(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP7) &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP7)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP7(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP7) &amp; BIT_MASK_DTIM_COUNT_VAP7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DIS_ATIM				(Offset 0x05B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_ATIM_VAP7 BIT(7)</div><div class='del'>-#define BIT_DIS_ATIM_VAP6 BIT(6)</div><div class='del'>-#define BIT_DIS_ATIM_VAP5 BIT(5)</div><div class='del'>-#define BIT_DIS_ATIM_VAP4 BIT(4)</div><div class='del'>-#define BIT_DIS_ATIM_VAP3 BIT(3)</div><div class='del'>-#define BIT_DIS_ATIM_VAP2 BIT(2)</div><div class='del'>-#define BIT_DIS_ATIM_VAP1 BIT(1)</div><div class='del'>-#define BIT_DIS_ATIM_ROOT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EARLY_128US				(Offset 0x05B1) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT_SEL_TIMER1 3</div><div class='del'>-#define BIT_MASK_TSFT_SEL_TIMER1 0x7</div><div class='del'>-#define BIT_TSFT_SEL_TIMER1(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT_SEL_TIMER1) &lt;&lt; BIT_SHIFT_TSFT_SEL_TIMER1)</div><div class='del'>-#define BIT_GET_TSFT_SEL_TIMER1(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT_SEL_TIMER1) &amp; BIT_MASK_TSFT_SEL_TIMER1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EARLY_128US 0</div><div class='del'>-#define BIT_MASK_EARLY_128US 0x7</div><div class='del'>-#define BIT_EARLY_128US(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_EARLY_128US) &lt;&lt; BIT_SHIFT_EARLY_128US)</div><div class='del'>-#define BIT_GET_EARLY_128US(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EARLY_128US) &amp; BIT_MASK_EARLY_128US)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS1_CTRL				(Offset 0x05B2) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P1_CTW_ALLSTASLEEP BIT(7)</div><div class='del'>-#define BIT_P2P1_OFF_DISTX_EN BIT(6)</div><div class='del'>-#define BIT_P2P1_PWR_MGT_EN BIT(5)</div><div class='del'>-#define BIT_P2P1_NOA1_EN BIT(2)</div><div class='del'>-#define BIT_P2P1_NOA0_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS2_CTRL				(Offset 0x05B3) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P2_CTW_ALLSTASLEEP BIT(7)</div><div class='del'>-#define BIT_P2P2_OFF_DISTX_EN BIT(6)</div><div class='del'>-#define BIT_P2P2_PWR_MGT_EN BIT(5)</div><div class='del'>-#define BIT_P2P2_NOA1_EN BIT(2)</div><div class='del'>-#define BIT_P2P2_NOA0_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TIMER0_SRC_SEL			(Offset 0x05B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYNC_CLI_SEL 4</div><div class='del'>-#define BIT_MASK_SYNC_CLI_SEL 0x7</div><div class='del'>-#define BIT_SYNC_CLI_SEL(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYNC_CLI_SEL) &lt;&lt; BIT_SHIFT_SYNC_CLI_SEL)</div><div class='del'>-#define BIT_GET_SYNC_CLI_SEL(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYNC_CLI_SEL) &amp; BIT_MASK_SYNC_CLI_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT_SEL_TIMER0 0</div><div class='del'>-#define BIT_MASK_TSFT_SEL_TIMER0 0x7</div><div class='del'>-#define BIT_TSFT_SEL_TIMER0(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT_SEL_TIMER0) &lt;&lt; BIT_SHIFT_TSFT_SEL_TIMER0)</div><div class='del'>-#define BIT_GET_TSFT_SEL_TIMER0(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT_SEL_TIMER0) &amp; BIT_MASK_TSFT_SEL_TIMER0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOA_UNIT_SEL			(Offset 0x05B5) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_UNIT2_SEL 8</div><div class='del'>-#define BIT_MASK_NOA_UNIT2_SEL 0x7</div><div class='del'>-#define BIT_NOA_UNIT2_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_UNIT2_SEL) &lt;&lt; BIT_SHIFT_NOA_UNIT2_SEL)</div><div class='del'>-#define BIT_GET_NOA_UNIT2_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_UNIT2_SEL) &amp; BIT_MASK_NOA_UNIT2_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_UNIT1_SEL 4</div><div class='del'>-#define BIT_MASK_NOA_UNIT1_SEL 0x7</div><div class='del'>-#define BIT_NOA_UNIT1_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_UNIT1_SEL) &lt;&lt; BIT_SHIFT_NOA_UNIT1_SEL)</div><div class='del'>-#define BIT_GET_NOA_UNIT1_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_UNIT1_SEL) &amp; BIT_MASK_NOA_UNIT1_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_UNIT0_SEL 0</div><div class='del'>-#define BIT_MASK_NOA_UNIT0_SEL 0x7</div><div class='del'>-#define BIT_NOA_UNIT0_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_UNIT0_SEL) &lt;&lt; BIT_SHIFT_NOA_UNIT0_SEL)</div><div class='del'>-#define BIT_GET_NOA_UNIT0_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_UNIT0_SEL) &amp; BIT_MASK_NOA_UNIT0_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2POFF_DIS_TXTIME			(Offset 0x05B7) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_P2POFF_DIS_TXTIME 0</div><div class='del'>-#define BIT_MASK_P2POFF_DIS_TXTIME 0xff</div><div class='del'>-#define BIT_P2POFF_DIS_TXTIME(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_P2POFF_DIS_TXTIME) &lt;&lt; BIT_SHIFT_P2POFF_DIS_TXTIME)</div><div class='del'>-#define BIT_GET_P2POFF_DIS_TXTIME(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_P2POFF_DIS_TXTIME) &amp; BIT_MASK_P2POFF_DIS_TXTIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE2			(Offset 0x05B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT2 16</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT2 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT2(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT2) &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT2)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT2(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT2) &amp; BIT_MASK_BCN_SPACE_CLINT2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT1 0</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT1 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT1) &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT1)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT1) &amp; BIT_MASK_BCN_SPACE_CLINT1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE3			(Offset 0x05BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SUB_BCN_SPACE 16</div><div class='del'>-#define BIT_MASK_SUB_BCN_SPACE 0xff</div><div class='del'>-#define BIT_SUB_BCN_SPACE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SUB_BCN_SPACE) &lt;&lt; BIT_SHIFT_SUB_BCN_SPACE)</div><div class='del'>-#define BIT_GET_SUB_BCN_SPACE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SUB_BCN_SPACE) &amp; BIT_MASK_SUB_BCN_SPACE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE3			(Offset 0x05BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT3 0</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT3 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT3(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT3) &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT3)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT3(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT3) &amp; BIT_MASK_BCN_SPACE_CLINT3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACMHWCTRL				(Offset 0x05C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BEQ_ACM_STATUS BIT(7)</div><div class='del'>-#define BIT_VIQ_ACM_STATUS BIT(6)</div><div class='del'>-#define BIT_VOQ_ACM_STATUS BIT(5)</div><div class='del'>-#define BIT_BEQ_ACM_EN BIT(3)</div><div class='del'>-#define BIT_VIQ_ACM_EN BIT(2)</div><div class='del'>-#define BIT_VOQ_ACM_EN BIT(1)</div><div class='del'>-#define BIT_ACMHWEN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACMRSTCTRL				(Offset 0x05C1) */</div><div class='del'>-</div><div class='del'>-#define BIT_BE_ACM_RESET_USED_TIME BIT(2)</div><div class='del'>-#define BIT_VI_ACM_RESET_USED_TIME BIT(1)</div><div class='del'>-#define BIT_VO_ACM_RESET_USED_TIME BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACMAVG				(Offset 0x05C2) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AVGPERIOD 0</div><div class='del'>-#define BIT_MASK_AVGPERIOD 0xffff</div><div class='del'>-#define BIT_AVGPERIOD(x) (((x) &amp; BIT_MASK_AVGPERIOD) &lt;&lt; BIT_SHIFT_AVGPERIOD)</div><div class='del'>-#define BIT_GET_AVGPERIOD(x) (((x) &gt;&gt; BIT_SHIFT_AVGPERIOD) &amp; BIT_MASK_AVGPERIOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VO_ADMTIME				(Offset 0x05C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_ADMITTED_TIME 0</div><div class='del'>-#define BIT_MASK_VO_ADMITTED_TIME 0xffff</div><div class='del'>-#define BIT_VO_ADMITTED_TIME(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_ADMITTED_TIME) &lt;&lt; BIT_SHIFT_VO_ADMITTED_TIME)</div><div class='del'>-#define BIT_GET_VO_ADMITTED_TIME(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_ADMITTED_TIME) &amp; BIT_MASK_VO_ADMITTED_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VI_ADMTIME				(Offset 0x05C6) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_ADMITTED_TIME 0</div><div class='del'>-#define BIT_MASK_VI_ADMITTED_TIME 0xffff</div><div class='del'>-#define BIT_VI_ADMITTED_TIME(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_ADMITTED_TIME) &lt;&lt; BIT_SHIFT_VI_ADMITTED_TIME)</div><div class='del'>-#define BIT_GET_VI_ADMITTED_TIME(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_ADMITTED_TIME) &amp; BIT_MASK_VI_ADMITTED_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BE_ADMTIME				(Offset 0x05C8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_ADMITTED_TIME 0</div><div class='del'>-#define BIT_MASK_BE_ADMITTED_TIME 0xffff</div><div class='del'>-#define BIT_BE_ADMITTED_TIME(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_ADMITTED_TIME) &lt;&lt; BIT_SHIFT_BE_ADMITTED_TIME)</div><div class='del'>-#define BIT_GET_BE_ADMITTED_TIME(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_ADMITTED_TIME) &amp; BIT_MASK_BE_ADMITTED_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_RANDOM_GEN			(Offset 0x05CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RANDOM_GEN 0</div><div class='del'>-#define BIT_MASK_RANDOM_GEN 0xffffff</div><div class='del'>-#define BIT_RANDOM_GEN(x) (((x) &amp; BIT_MASK_RANDOM_GEN) &lt;&lt; BIT_SHIFT_RANDOM_GEN)</div><div class='del'>-#define BIT_GET_RANDOM_GEN(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RANDOM_GEN) &amp; BIT_MASK_RANDOM_GEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_NOA_SEL			(Offset 0x05CF) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_SEL 4</div><div class='del'>-#define BIT_MASK_NOA_SEL 0x7</div><div class='del'>-#define BIT_NOA_SEL(x) (((x) &amp; BIT_MASK_NOA_SEL) &lt;&lt; BIT_SHIFT_NOA_SEL)</div><div class='del'>-#define BIT_GET_NOA_SEL(x) (((x) &gt;&gt; BIT_SHIFT_NOA_SEL) &amp; BIT_MASK_NOA_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_NOA_SEL			(Offset 0x05CF) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXCMD_SEG_SEL 0</div><div class='del'>-#define BIT_MASK_TXCMD_SEG_SEL 0xf</div><div class='del'>-#define BIT_TXCMD_SEG_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXCMD_SEG_SEL) &lt;&lt; BIT_SHIFT_TXCMD_SEG_SEL)</div><div class='del'>-#define BIT_GET_TXCMD_SEG_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXCMD_SEG_SEL) &amp; BIT_MASK_TXCMD_SEG_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOA_PARAM				(Offset 0x05E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_COUNT (96 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_NOA_COUNT 0xff</div><div class='del'>-#define BIT_NOA_COUNT(x) (((x) &amp; BIT_MASK_NOA_COUNT) &lt;&lt; BIT_SHIFT_NOA_COUNT)</div><div class='del'>-#define BIT_GET_NOA_COUNT(x) (((x) &gt;&gt; BIT_SHIFT_NOA_COUNT) &amp; BIT_MASK_NOA_COUNT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_START_TIME (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_NOA_START_TIME 0xffffffffL</div><div class='del'>-#define BIT_NOA_START_TIME(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_START_TIME) &lt;&lt; BIT_SHIFT_NOA_START_TIME)</div><div class='del'>-#define BIT_GET_NOA_START_TIME(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_START_TIME) &amp; BIT_MASK_NOA_START_TIME)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_INTERVAL (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_NOA_INTERVAL 0xffffffffL</div><div class='del'>-#define BIT_NOA_INTERVAL(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_INTERVAL) &lt;&lt; BIT_SHIFT_NOA_INTERVAL)</div><div class='del'>-#define BIT_GET_NOA_INTERVAL(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_INTERVAL) &amp; BIT_MASK_NOA_INTERVAL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_DURATION 0</div><div class='del'>-#define BIT_MASK_NOA_DURATION 0xffffffffL</div><div class='del'>-#define BIT_NOA_DURATION(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_DURATION) &lt;&lt; BIT_SHIFT_NOA_DURATION)</div><div class='del'>-#define BIT_GET_NOA_DURATION(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_DURATION) &amp; BIT_MASK_NOA_DURATION)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2P_RST				(Offset 0x05F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_P2P2_PWR_RST1 BIT(5)</div><div class='del'>-#define BIT_P2P2_PWR_RST0 BIT(4)</div><div class='del'>-#define BIT_P2P1_PWR_RST1 BIT(3)</div><div class='del'>-#define BIT_P2P1_PWR_RST0 BIT(2)</div><div class='del'>-#define BIT_P2P_PWR_RST1_V1 BIT(1)</div><div class='del'>-#define BIT_P2P_PWR_RST0_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SCHEDULER_RST			(Offset 0x05F1) */</div><div class='del'>-</div><div class='del'>-#define BIT_SYNC_CLI BIT(1)</div><div class='del'>-#define BIT_SCHEDULER_RST_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SCH_TXCMD				(Offset 0x05F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SCH_TXCMD 0</div><div class='del'>-#define BIT_MASK_SCH_TXCMD 0xffffffffL</div><div class='del'>-#define BIT_SCH_TXCMD(x) (((x) &amp; BIT_MASK_SCH_TXCMD) &lt;&lt; BIT_SHIFT_SCH_TXCMD)</div><div class='del'>-#define BIT_GET_SCH_TXCMD(x) (((x) &gt;&gt; BIT_SHIFT_SCH_TXCMD) &amp; BIT_MASK_SCH_TXCMD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_CR				(Offset 0x0600) */</div><div class='del'>-</div><div class='del'>-#define BIT_IC_MACPHY_M BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_FWPKT_CR			(Offset 0x0601) */</div><div class='del'>-</div><div class='del'>-#define BIT_FWEN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_FWPKT_CR			(Offset 0x0601) */</div><div class='del'>-</div><div class='del'>-#define BIT_PHYSTS_PKT_CTRL BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_FWPKT_CR			(Offset 0x0601) */</div><div class='del'>-</div><div class='del'>-#define BIT_APPHDR_MIDSRCH_FAIL BIT(4)</div><div class='del'>-#define BIT_FWPARSING_EN BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_APPEND_MHDR_LEN 0</div><div class='del'>-#define BIT_MASK_APPEND_MHDR_LEN 0x7</div><div class='del'>-#define BIT_APPEND_MHDR_LEN(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_APPEND_MHDR_LEN) &lt;&lt; BIT_SHIFT_APPEND_MHDR_LEN)</div><div class='del'>-#define BIT_GET_APPEND_MHDR_LEN(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_APPEND_MHDR_LEN) &amp; BIT_MASK_APPEND_MHDR_LEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_EN_RTS_ADDR BIT(31)</div><div class='del'>-#define BIT_WMAC_DISABLE_CCK BIT(30)</div><div class='del'>-#define BIT_WMAC_RAW_LEN BIT(29)</div><div class='del'>-#define BIT_WMAC_NOTX_IN_RXNDP BIT(28)</div><div class='del'>-#define BIT_WMAC_EN_EOF BIT(27)</div><div class='del'>-#define BIT_WMAC_BF_SEL BIT(26)</div><div class='del'>-#define BIT_WMAC_ANTMODE_SEL BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_TCRPWRMGT_HWCTL BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_SMOOTH_VAL BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_FETCH_MPDU_AFTER_WSEC_RDY BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_TCR_EN_20MST BIT(19)</div><div class='del'>-#define BIT_WMAC_DIS_SIGTA BIT(18)</div><div class='del'>-#define BIT_WMAC_DIS_A2B0 BIT(17)</div><div class='del'>-#define BIT_WMAC_MSK_SIGBCRC BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_3 BIT(15)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_2 BIT(14)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_1 BIT(13)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_0 BIT(12)</div><div class='del'>-#define BIT_WMAC_TCR_TXSK_PERPKT BIT(11)</div><div class='del'>-#define BIT_ICV BIT(10)</div><div class='del'>-#define BIT_CFEND_FORMAT BIT(9)</div><div class='del'>-#define BIT_CRC BIT(8)</div><div class='del'>-#define BIT_PWRBIT_OW_EN BIT(7)</div><div class='del'>-#define BIT_PWR_ST BIT(6)</div><div class='del'>-#define BIT_WMAC_TCR_UPD_TIMIE BIT(5)</div><div class='del'>-#define BIT_WMAC_TCR_UPD_HGQMD BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_VHTSIGA1_TXPS BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR					(Offset 0x0604) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_SEL BIT(2)</div><div class='del'>-#define BIT_DIS_GCLK BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR					(Offset 0x0608) */</div><div class='del'>-</div><div class='del'>-#define BIT_APP_FCS BIT(31)</div><div class='del'>-#define BIT_APP_MIC BIT(30)</div><div class='del'>-#define BIT_APP_ICV BIT(29)</div><div class='del'>-#define BIT_APP_PHYSTS BIT(28)</div><div class='del'>-#define BIT_APP_BASSN BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR					(Offset 0x0608) */</div><div class='del'>-</div><div class='del'>-#define BIT_VHT_DACK BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR					(Offset 0x0608) */</div><div class='del'>-</div><div class='del'>-#define BIT_TCPOFLD_EN BIT(25)</div><div class='del'>-#define BIT_ENMBID BIT(24)</div><div class='del'>-#define BIT_LSIGEN BIT(23)</div><div class='del'>-#define BIT_MFBEN BIT(22)</div><div class='del'>-#define BIT_DISCHKPPDLLEN BIT(21)</div><div class='del'>-#define BIT_PKTCTL_DLEN BIT(20)</div><div class='del'>-#define BIT_TIM_PARSER_EN BIT(18)</div><div class='del'>-#define BIT_BC_MD_EN BIT(17)</div><div class='del'>-#define BIT_UC_MD_EN BIT(16)</div><div class='del'>-#define BIT_RXSK_PERPKT BIT(15)</div><div class='del'>-#define BIT_HTC_LOC_CTRL BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR					(Offset 0x0608) */</div><div class='del'>-</div><div class='del'>-#define BIT_RPFM_CAM_ENABLE BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR					(Offset 0x0608) */</div><div class='del'>-</div><div class='del'>-#define BIT_TA_BCN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR					(Offset 0x0608) */</div><div class='del'>-</div><div class='del'>-#define BIT_DISDECMYPKT BIT(10)</div><div class='del'>-#define BIT_AICV BIT(9)</div><div class='del'>-#define BIT_ACRC32 BIT(8)</div><div class='del'>-#define BIT_CBSSID_BCN BIT(7)</div><div class='del'>-#define BIT_CBSSID_DATA BIT(6)</div><div class='del'>-#define BIT_APWRMGT BIT(5)</div><div class='del'>-#define BIT_ADD3 BIT(4)</div><div class='del'>-#define BIT_AB BIT(3)</div><div class='del'>-#define BIT_AM BIT(2)</div><div class='del'>-#define BIT_APM BIT(1)</div><div class='del'>-#define BIT_AAP BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_PKT_LIMIT			(Offset 0x060C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKTLMT 0</div><div class='del'>-#define BIT_MASK_RXPKTLMT 0x3f</div><div class='del'>-#define BIT_RXPKTLMT(x) (((x) &amp; BIT_MASK_RXPKTLMT) &lt;&lt; BIT_SHIFT_RXPKTLMT)</div><div class='del'>-#define BIT_GET_RXPKTLMT(x) (((x) &gt;&gt; BIT_SHIFT_RXPKTLMT) &amp; BIT_MASK_RXPKTLMT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DLK_TIME				(Offset 0x060D) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_DLK_TIME 0</div><div class='del'>-#define BIT_MASK_RX_DLK_TIME 0xff</div><div class='del'>-#define BIT_RX_DLK_TIME(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_DLK_TIME) &lt;&lt; BIT_SHIFT_RX_DLK_TIME)</div><div class='del'>-#define BIT_GET_RX_DLK_TIME(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_DLK_TIME) &amp; BIT_MASK_RX_DLK_TIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ			(Offset 0x060F) */</div><div class='del'>-</div><div class='del'>-#define BIT_DATA_RPFM15EN BIT(15)</div><div class='del'>-#define BIT_DATA_RPFM14EN BIT(14)</div><div class='del'>-#define BIT_DATA_RPFM13EN BIT(13)</div><div class='del'>-#define BIT_DATA_RPFM12EN BIT(12)</div><div class='del'>-#define BIT_DATA_RPFM11EN BIT(11)</div><div class='del'>-#define BIT_DATA_RPFM10EN BIT(10)</div><div class='del'>-#define BIT_DATA_RPFM9EN BIT(9)</div><div class='del'>-#define BIT_DATA_RPFM8EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ			(Offset 0x060F) */</div><div class='del'>-</div><div class='del'>-#define BIT_PHYSTS_PER_PKT_MODE BIT(7)</div><div class='del'>-#define BIT_DATA_RPFM7EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ			(Offset 0x060F) */</div><div class='del'>-</div><div class='del'>-#define BIT_DATA_RPFM6EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ			(Offset 0x060F) */</div><div class='del'>-</div><div class='del'>-#define BIT_DATA_RPFM5EN BIT(5)</div><div class='del'>-#define BIT_DATA_RPFM4EN BIT(4)</div><div class='del'>-#define BIT_DATA_RPFM3EN BIT(3)</div><div class='del'>-#define BIT_DATA_RPFM2EN BIT(2)</div><div class='del'>-#define BIT_DATA_RPFM1EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ			(Offset 0x060F) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DRVINFO_SZ_V1 0</div><div class='del'>-#define BIT_MASK_DRVINFO_SZ_V1 0xf</div><div class='del'>-#define BIT_DRVINFO_SZ_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_DRVINFO_SZ_V1) &lt;&lt; BIT_SHIFT_DRVINFO_SZ_V1)</div><div class='del'>-#define BIT_GET_DRVINFO_SZ_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DRVINFO_SZ_V1) &amp; BIT_MASK_DRVINFO_SZ_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ			(Offset 0x060F) */</div><div class='del'>-</div><div class='del'>-#define BIT_DATA_RPFM0EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID				(Offset 0x0610) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID 0</div><div class='del'>-#define BIT_MASK_MACID 0xffffffffffffL</div><div class='del'>-#define BIT_MACID(x) (((x) &amp; BIT_MASK_MACID) &lt;&lt; BIT_SHIFT_MACID)</div><div class='del'>-#define BIT_GET_MACID(x) (((x) &gt;&gt; BIT_SHIFT_MACID) &amp; BIT_MASK_MACID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID				(Offset 0x0618) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID 0</div><div class='del'>-#define BIT_MASK_BSSID 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID(x) (((x) &amp; BIT_MASK_BSSID) &lt;&lt; BIT_SHIFT_BSSID)</div><div class='del'>-#define BIT_GET_BSSID(x) (((x) &gt;&gt; BIT_SHIFT_BSSID) &amp; BIT_MASK_BSSID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MAR					(Offset 0x0620) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAR 0</div><div class='del'>-#define BIT_MASK_MAR 0xffffffffffffffffL</div><div class='del'>-#define BIT_MAR(x) (((x) &amp; BIT_MASK_MAR) &lt;&lt; BIT_SHIFT_MAR)</div><div class='del'>-#define BIT_GET_MAR(x) (((x) &gt;&gt; BIT_SHIFT_MAR) &amp; BIT_MASK_MAR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIDCAMCFG_1			(Offset 0x0628) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIDCAM_RWDATA_L 0</div><div class='del'>-#define BIT_MASK_MBIDCAM_RWDATA_L 0xffffffffL</div><div class='del'>-#define BIT_MBIDCAM_RWDATA_L(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIDCAM_RWDATA_L) &lt;&lt; BIT_SHIFT_MBIDCAM_RWDATA_L)</div><div class='del'>-#define BIT_GET_MBIDCAM_RWDATA_L(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIDCAM_RWDATA_L) &amp; BIT_MASK_MBIDCAM_RWDATA_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIDCAMCFG_2			(Offset 0x062C) */</div><div class='del'>-</div><div class='del'>-#define BIT_MBIDCAM_POLL BIT(31)</div><div class='del'>-#define BIT_MBIDCAM_WT_EN BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIDCAM_ADDR 24</div><div class='del'>-#define BIT_MASK_MBIDCAM_ADDR 0x1f</div><div class='del'>-#define BIT_MBIDCAM_ADDR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIDCAM_ADDR) &lt;&lt; BIT_SHIFT_MBIDCAM_ADDR)</div><div class='del'>-#define BIT_GET_MBIDCAM_ADDR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIDCAM_ADDR) &amp; BIT_MASK_MBIDCAM_ADDR)</div><div class='del'>-</div><div class='del'>-#define BIT_MBIDCAM_VALID BIT(23)</div><div class='del'>-#define BIT_LSIC_TXOP_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIDCAMCFG_2			(Offset 0x062C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTS_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIDCAMCFG_2			(Offset 0x062C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIDCAM_RWDATA_H 0</div><div class='del'>-#define BIT_MASK_MBIDCAM_RWDATA_H 0xffff</div><div class='del'>-#define BIT_MBIDCAM_RWDATA_H(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIDCAM_RWDATA_H) &lt;&lt; BIT_SHIFT_MBIDCAM_RWDATA_H)</div><div class='del'>-#define BIT_GET_MBIDCAM_RWDATA_H(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIDCAM_RWDATA_H) &amp; BIT_MASK_MBIDCAM_RWDATA_H)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TCR_TSFT_OFS			(Offset 0x0630) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_TCR_TSFT_OFS 0</div><div class='del'>-#define BIT_MASK_WMAC_TCR_TSFT_OFS 0xffff</div><div class='del'>-#define BIT_WMAC_TCR_TSFT_OFS(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_TCR_TSFT_OFS) &lt;&lt; BIT_SHIFT_WMAC_TCR_TSFT_OFS)</div><div class='del'>-#define BIT_GET_WMAC_TCR_TSFT_OFS(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_TCR_TSFT_OFS) &amp; BIT_MASK_WMAC_TCR_TSFT_OFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_UDF_THSD				(Offset 0x0632) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_UDF_THSD 0</div><div class='del'>-#define BIT_MASK_UDF_THSD 0xff</div><div class='del'>-#define BIT_UDF_THSD(x) (((x) &amp; BIT_MASK_UDF_THSD) &lt;&lt; BIT_SHIFT_UDF_THSD)</div><div class='del'>-#define BIT_GET_UDF_THSD(x) (((x) &gt;&gt; BIT_SHIFT_UDF_THSD) &amp; BIT_MASK_UDF_THSD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ZLD_NUM				(Offset 0x0633) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ZLD_NUM 0</div><div class='del'>-#define BIT_MASK_ZLD_NUM 0xff</div><div class='del'>-#define BIT_ZLD_NUM(x) (((x) &amp; BIT_MASK_ZLD_NUM) &lt;&lt; BIT_SHIFT_ZLD_NUM)</div><div class='del'>-#define BIT_GET_ZLD_NUM(x) (((x) &gt;&gt; BIT_SHIFT_ZLD_NUM) &amp; BIT_MASK_ZLD_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STMP_THSD				(Offset 0x0634) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STMP_THSD 0</div><div class='del'>-#define BIT_MASK_STMP_THSD 0xff</div><div class='del'>-#define BIT_STMP_THSD(x) (((x) &amp; BIT_MASK_STMP_THSD) &lt;&lt; BIT_SHIFT_STMP_THSD)</div><div class='del'>-#define BIT_GET_STMP_THSD(x) (((x) &gt;&gt; BIT_SHIFT_STMP_THSD) &amp; BIT_MASK_STMP_THSD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TXTIMEOUT			(Offset 0x0635) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_TXTIMEOUT 0</div><div class='del'>-#define BIT_MASK_WMAC_TXTIMEOUT 0xff</div><div class='del'>-#define BIT_WMAC_TXTIMEOUT(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_TXTIMEOUT) &lt;&lt; BIT_SHIFT_WMAC_TXTIMEOUT)</div><div class='del'>-#define BIT_GET_WMAC_TXTIMEOUT(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_TXTIMEOUT) &amp; BIT_MASK_WMAC_TXTIMEOUT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCU_TEST_2_V1			(Offset 0x0636) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCU_RSVD_2_V1 0</div><div class='del'>-#define BIT_MASK_MCU_RSVD_2_V1 0xffff</div><div class='del'>-#define BIT_MCU_RSVD_2_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MCU_RSVD_2_V1) &lt;&lt; BIT_SHIFT_MCU_RSVD_2_V1)</div><div class='del'>-#define BIT_GET_MCU_RSVD_2_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCU_RSVD_2_V1) &amp; BIT_MASK_MCU_RSVD_2_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USTIME_EDCA				(Offset 0x0638) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USTIME_EDCA_V1 0</div><div class='del'>-#define BIT_MASK_USTIME_EDCA_V1 0x1ff</div><div class='del'>-#define BIT_USTIME_EDCA_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_USTIME_EDCA_V1) &lt;&lt; BIT_SHIFT_USTIME_EDCA_V1)</div><div class='del'>-#define BIT_GET_USTIME_EDCA_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USTIME_EDCA_V1) &amp; BIT_MASK_USTIME_EDCA_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MAC_SPEC_SIFS			(Offset 0x063A) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_OFDM 8</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_OFDM 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_OFDM(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_OFDM) &lt;&lt; BIT_SHIFT_SPEC_SIFS_OFDM)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_OFDM(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_OFDM) &amp; BIT_MASK_SPEC_SIFS_OFDM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_CCK 0</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_CCK 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_CCK(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_CCK) &lt;&lt; BIT_SHIFT_SPEC_SIFS_CCK)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_CCK(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_CCK) &amp; BIT_MASK_SPEC_SIFS_CCK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RESP_SIFS_CCK			(Offset 0x063C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_R2T_CCK 8</div><div class='del'>-#define BIT_MASK_SIFS_R2T_CCK 0xff</div><div class='del'>-#define BIT_SIFS_R2T_CCK(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_R2T_CCK) &lt;&lt; BIT_SHIFT_SIFS_R2T_CCK)</div><div class='del'>-#define BIT_GET_SIFS_R2T_CCK(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_R2T_CCK) &amp; BIT_MASK_SIFS_R2T_CCK)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_T2T_CCK 0</div><div class='del'>-#define BIT_MASK_SIFS_T2T_CCK 0xff</div><div class='del'>-#define BIT_SIFS_T2T_CCK(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_T2T_CCK) &lt;&lt; BIT_SHIFT_SIFS_T2T_CCK)</div><div class='del'>-#define BIT_GET_SIFS_T2T_CCK(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_T2T_CCK) &amp; BIT_MASK_SIFS_T2T_CCK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RESP_SIFS_OFDM			(Offset 0x063E) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_R2T_OFDM 8</div><div class='del'>-#define BIT_MASK_SIFS_R2T_OFDM 0xff</div><div class='del'>-#define BIT_SIFS_R2T_OFDM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_R2T_OFDM) &lt;&lt; BIT_SHIFT_SIFS_R2T_OFDM)</div><div class='del'>-#define BIT_GET_SIFS_R2T_OFDM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_R2T_OFDM) &amp; BIT_MASK_SIFS_R2T_OFDM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_T2T_OFDM 0</div><div class='del'>-#define BIT_MASK_SIFS_T2T_OFDM 0xff</div><div class='del'>-#define BIT_SIFS_T2T_OFDM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_T2T_OFDM) &lt;&lt; BIT_SHIFT_SIFS_T2T_OFDM)</div><div class='del'>-#define BIT_GET_SIFS_T2T_OFDM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_T2T_OFDM) &amp; BIT_MASK_SIFS_T2T_OFDM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACKTO				(Offset 0x0640) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKTO 0</div><div class='del'>-#define BIT_MASK_ACKTO 0xff</div><div class='del'>-#define BIT_ACKTO(x) (((x) &amp; BIT_MASK_ACKTO) &lt;&lt; BIT_SHIFT_ACKTO)</div><div class='del'>-#define BIT_GET_ACKTO(x) (((x) &gt;&gt; BIT_SHIFT_ACKTO) &amp; BIT_MASK_ACKTO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CTS2TO				(Offset 0x0641) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CTS2TO 0</div><div class='del'>-#define BIT_MASK_CTS2TO 0xff</div><div class='del'>-#define BIT_CTS2TO(x) (((x) &amp; BIT_MASK_CTS2TO) &lt;&lt; BIT_SHIFT_CTS2TO)</div><div class='del'>-#define BIT_GET_CTS2TO(x) (((x) &gt;&gt; BIT_SHIFT_CTS2TO) &amp; BIT_MASK_CTS2TO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EIFS				(Offset 0x0642) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EIFS 0</div><div class='del'>-#define BIT_MASK_EIFS 0xffff</div><div class='del'>-#define BIT_EIFS(x) (((x) &amp; BIT_MASK_EIFS) &lt;&lt; BIT_SHIFT_EIFS)</div><div class='del'>-#define BIT_GET_EIFS(x) (((x) &gt;&gt; BIT_SHIFT_EIFS) &amp; BIT_MASK_EIFS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NAV_CTRL				(Offset 0x0650) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NAV_UPPER 16</div><div class='del'>-#define BIT_MASK_NAV_UPPER 0xff</div><div class='del'>-#define BIT_NAV_UPPER(x) (((x) &amp; BIT_MASK_NAV_UPPER) &lt;&lt; BIT_SHIFT_NAV_UPPER)</div><div class='del'>-#define BIT_GET_NAV_UPPER(x) (((x) &gt;&gt; BIT_SHIFT_NAV_UPPER) &amp; BIT_MASK_NAV_UPPER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXMYRTS_NAV 8</div><div class='del'>-#define BIT_MASK_RXMYRTS_NAV 0xf</div><div class='del'>-#define BIT_RXMYRTS_NAV(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXMYRTS_NAV) &lt;&lt; BIT_SHIFT_RXMYRTS_NAV)</div><div class='del'>-#define BIT_GET_RXMYRTS_NAV(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXMYRTS_NAV) &amp; BIT_MASK_RXMYRTS_NAV)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTSRST 0</div><div class='del'>-#define BIT_MASK_RTSRST 0xff</div><div class='del'>-#define BIT_RTSRST(x) (((x) &amp; BIT_MASK_RTSRST) &lt;&lt; BIT_SHIFT_RTSRST)</div><div class='del'>-#define BIT_GET_RTSRST(x) (((x) &gt;&gt; BIT_SHIFT_RTSRST) &amp; BIT_MASK_RTSRST)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BACAMCMD				(Offset 0x0654) */</div><div class='del'>-</div><div class='del'>-#define BIT_BACAM_POLL BIT(31)</div><div class='del'>-#define BIT_BACAM_RST BIT(17)</div><div class='del'>-#define BIT_BACAM_RW BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXSBM 14</div><div class='del'>-#define BIT_MASK_TXSBM 0x3</div><div class='del'>-#define BIT_TXSBM(x) (((x) &amp; BIT_MASK_TXSBM) &lt;&lt; BIT_SHIFT_TXSBM)</div><div class='del'>-#define BIT_GET_TXSBM(x) (((x) &gt;&gt; BIT_SHIFT_TXSBM) &amp; BIT_MASK_TXSBM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BACAM_ADDR 0</div><div class='del'>-#define BIT_MASK_BACAM_ADDR 0x3f</div><div class='del'>-#define BIT_BACAM_ADDR(x) (((x) &amp; BIT_MASK_BACAM_ADDR) &lt;&lt; BIT_SHIFT_BACAM_ADDR)</div><div class='del'>-#define BIT_GET_BACAM_ADDR(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BACAM_ADDR) &amp; BIT_MASK_BACAM_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BACAMCONTENT			(Offset 0x0658) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BA_CONTENT_H (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_BA_CONTENT_H 0xffffffffL</div><div class='del'>-#define BIT_BA_CONTENT_H(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BA_CONTENT_H) &lt;&lt; BIT_SHIFT_BA_CONTENT_H)</div><div class='del'>-#define BIT_GET_BA_CONTENT_H(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BA_CONTENT_H) &amp; BIT_MASK_BA_CONTENT_H)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BA_CONTENT_L 0</div><div class='del'>-#define BIT_MASK_BA_CONTENT_L 0xffffffffL</div><div class='del'>-#define BIT_BA_CONTENT_L(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BA_CONTENT_L) &lt;&lt; BIT_SHIFT_BA_CONTENT_L)</div><div class='del'>-#define BIT_GET_BA_CONTENT_L(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BA_CONTENT_L) &amp; BIT_MASK_BA_CONTENT_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LBDLY				(Offset 0x0660) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LBDLY 0</div><div class='del'>-#define BIT_MASK_LBDLY 0x1f</div><div class='del'>-#define BIT_LBDLY(x) (((x) &amp; BIT_MASK_LBDLY) &lt;&lt; BIT_SHIFT_LBDLY)</div><div class='del'>-#define BIT_GET_LBDLY(x) (((x) &gt;&gt; BIT_SHIFT_LBDLY) &amp; BIT_MASK_LBDLY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_BACAM_RPMEN			(Offset 0x0661) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BITMAP_SSNBK_COUNTER 2</div><div class='del'>-#define BIT_MASK_BITMAP_SSNBK_COUNTER 0x3f</div><div class='del'>-#define BIT_BITMAP_SSNBK_COUNTER(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BITMAP_SSNBK_COUNTER)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BITMAP_SSNBK_COUNTER)</div><div class='del'>-#define BIT_GET_BITMAP_SSNBK_COUNTER(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BITMAP_SSNBK_COUNTER) &amp;                             \</div><div class='del'>-	 BIT_MASK_BITMAP_SSNBK_COUNTER)</div><div class='del'>-</div><div class='del'>-#define BIT_BITMAP_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_BACAM_RPMEN			(Offset 0x0661) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_BACAM_RPMEN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_RX				(Offset 0x0662) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT_TYPE 2</div><div class='del'>-#define BIT_MASK_RXPKT_TYPE 0x3f</div><div class='del'>-#define BIT_RXPKT_TYPE(x) (((x) &amp; BIT_MASK_RXPKT_TYPE) &lt;&lt; BIT_SHIFT_RXPKT_TYPE)</div><div class='del'>-#define BIT_GET_RXPKT_TYPE(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT_TYPE) &amp; BIT_MASK_RXPKT_TYPE)</div><div class='del'>-</div><div class='del'>-#define BIT_TXACT_IND BIT(1)</div><div class='del'>-#define BIT_RXACT_IND BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_BITMAP_CTL			(Offset 0x0663) */</div><div class='del'>-</div><div class='del'>-#define BIT_BITMAP_VO BIT(7)</div><div class='del'>-#define BIT_BITMAP_VI BIT(6)</div><div class='del'>-#define BIT_BITMAP_BE BIT(5)</div><div class='del'>-#define BIT_BITMAP_BK BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BITMAP_CONDITION 2</div><div class='del'>-#define BIT_MASK_BITMAP_CONDITION 0x3</div><div class='del'>-#define BIT_BITMAP_CONDITION(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BITMAP_CONDITION) &lt;&lt; BIT_SHIFT_BITMAP_CONDITION)</div><div class='del'>-#define BIT_GET_BITMAP_CONDITION(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BITMAP_CONDITION) &amp; BIT_MASK_BITMAP_CONDITION)</div><div class='del'>-</div><div class='del'>-#define BIT_BITMAP_SSNBK_COUNTER_CLR BIT(1)</div><div class='del'>-#define BIT_BITMAP_FORCE BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT				(Offset 0x0664) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXERR_RPT_SEL_V1_3_0 28</div><div class='del'>-#define BIT_MASK_RXERR_RPT_SEL_V1_3_0 0xf</div><div class='del'>-#define BIT_RXERR_RPT_SEL_V1_3_0(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXERR_RPT_SEL_V1_3_0)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXERR_RPT_SEL_V1_3_0)</div><div class='del'>-#define BIT_GET_RXERR_RPT_SEL_V1_3_0(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXERR_RPT_SEL_V1_3_0) &amp;                             \</div><div class='del'>-	 BIT_MASK_RXERR_RPT_SEL_V1_3_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT				(Offset 0x0664) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXERR_RPT_RST BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT				(Offset 0x0664) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXERR_RPT_SEL_V1_4 BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT				(Offset 0x0664) */</div><div class='del'>-</div><div class='del'>-#define BIT_W1S BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT				(Offset 0x0664) */</div><div class='del'>-</div><div class='del'>-#define BIT_UD_SELECT_BSSID BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT				(Offset 0x0664) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_UD_SUB_TYPE 18</div><div class='del'>-#define BIT_MASK_UD_SUB_TYPE 0xf</div><div class='del'>-#define BIT_UD_SUB_TYPE(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_UD_SUB_TYPE) &lt;&lt; BIT_SHIFT_UD_SUB_TYPE)</div><div class='del'>-#define BIT_GET_UD_SUB_TYPE(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_UD_SUB_TYPE) &amp; BIT_MASK_UD_SUB_TYPE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_UD_TYPE 16</div><div class='del'>-#define BIT_MASK_UD_TYPE 0x3</div><div class='del'>-#define BIT_UD_TYPE(x) (((x) &amp; BIT_MASK_UD_TYPE) &lt;&lt; BIT_SHIFT_UD_TYPE)</div><div class='del'>-#define BIT_GET_UD_TYPE(x) (((x) &gt;&gt; BIT_SHIFT_UD_TYPE) &amp; BIT_MASK_UD_TYPE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RPT_COUNTER 0</div><div class='del'>-#define BIT_MASK_RPT_COUNTER 0xffff</div><div class='del'>-#define BIT_RPT_COUNTER(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_RPT_COUNTER) &lt;&lt; BIT_SHIFT_RPT_COUNTER)</div><div class='del'>-#define BIT_GET_RPT_COUNTER(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RPT_COUNTER) &amp; BIT_MASK_RPT_COUNTER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBA_TYPSEL (60 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBA_TYPSEL 0xf</div><div class='del'>-#define BIT_ACKBA_TYPSEL(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBA_TYPSEL) &lt;&lt; BIT_SHIFT_ACKBA_TYPSEL)</div><div class='del'>-#define BIT_GET_ACKBA_TYPSEL(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBA_TYPSEL) &amp; BIT_MASK_ACKBA_TYPSEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBA_ACKPCHK (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBA_ACKPCHK 0xf</div><div class='del'>-#define BIT_ACKBA_ACKPCHK(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBA_ACKPCHK) &lt;&lt; BIT_SHIFT_ACKBA_ACKPCHK)</div><div class='del'>-#define BIT_GET_ACKBA_ACKPCHK(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBA_ACKPCHK) &amp; BIT_MASK_ACKBA_ACKPCHK)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBAR_TYPESEL (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBAR_TYPESEL 0xff</div><div class='del'>-#define BIT_ACKBAR_TYPESEL(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBAR_TYPESEL) &lt;&lt; BIT_SHIFT_ACKBAR_TYPESEL)</div><div class='del'>-#define BIT_GET_ACKBAR_TYPESEL(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBAR_TYPESEL) &amp; BIT_MASK_ACKBAR_TYPESEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBAR_ACKPCHK (44 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBAR_ACKPCHK 0xf</div><div class='del'>-#define BIT_ACKBAR_ACKPCHK(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBAR_ACKPCHK) &lt;&lt; BIT_SHIFT_ACKBAR_ACKPCHK)</div><div class='del'>-#define BIT_GET_ACKBAR_ACKPCHK(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBAR_ACKPCHK) &amp; BIT_MASK_ACKBAR_ACKPCHK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXBA_IGNOREA2 BIT(42)</div><div class='del'>-#define BIT_EN_SAVE_ALL_TXOPADDR BIT(41)</div><div class='del'>-#define BIT_EN_TXCTS_TO_TXOPOWNER_INRXNAV BIT(40)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_TXBA_AMPDUFCSERR BIT(39)</div><div class='del'>-#define BIT_DIS_TXBA_RXBARINFULL BIT(38)</div><div class='del'>-#define BIT_DIS_TXCFE_INFULL BIT(37)</div><div class='del'>-#define BIT_DIS_TXCTS_INFULL BIT(36)</div><div class='del'>-#define BIT_EN_TXACKBA_IN_TX_RDG BIT(35)</div><div class='del'>-#define BIT_EN_TXACKBA_IN_TXOP BIT(34)</div><div class='del'>-#define BIT_EN_TXCTS_IN_RXNAV BIT(33)</div><div class='del'>-#define BIT_EN_TXCTS_INTXOP BIT(32)</div><div class='del'>-#define BIT_BLK_EDCA_BBSLP BIT(31)</div><div class='del'>-#define BIT_BLK_EDCA_BBSBY BIT(30)</div><div class='del'>-#define BIT_ACKTO_BLOCK_SCH_EN BIT(27)</div><div class='del'>-#define BIT_EIFS_BLOCK_SCH_EN BIT(26)</div><div class='del'>-#define BIT_PLCPCHK_RST_EIFS BIT(25)</div><div class='del'>-#define BIT_CCA_RST_EIFS BIT(24)</div><div class='del'>-#define BIT_DIS_UPD_MYRXPKTNAV BIT(23)</div><div class='del'>-#define BIT_EARLY_TXBA BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RESP_CHNBUSY 20</div><div class='del'>-#define BIT_MASK_RESP_CHNBUSY 0x3</div><div class='del'>-#define BIT_RESP_CHNBUSY(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RESP_CHNBUSY) &lt;&lt; BIT_SHIFT_RESP_CHNBUSY)</div><div class='del'>-#define BIT_GET_RESP_CHNBUSY(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RESP_CHNBUSY) &amp; BIT_MASK_RESP_CHNBUSY)</div><div class='del'>-</div><div class='del'>-#define BIT_RESP_DCTS_EN BIT(19)</div><div class='del'>-#define BIT_RESP_DCFE_EN BIT(18)</div><div class='del'>-#define BIT_RESP_SPLCPEN BIT(17)</div><div class='del'>-#define BIT_RESP_SGIEN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_RESP_LDPC_EN BIT(15)</div><div class='del'>-#define BIT_DIS_RESP_ACKINCCA BIT(14)</div><div class='del'>-#define BIT_DIS_RESP_CTSINCCA BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_SECOND_CCA_TIMER 10</div><div class='del'>-#define BIT_MASK_R_WMAC_SECOND_CCA_TIMER 0x7</div><div class='del'>-#define BIT_R_WMAC_SECOND_CCA_TIMER(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_SECOND_CCA_TIMER)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_SECOND_CCA_TIMER)</div><div class='del'>-#define BIT_GET_R_WMAC_SECOND_CCA_TIMER(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_SECOND_CCA_TIMER) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_WMAC_SECOND_CCA_TIMER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RFMOD 7</div><div class='del'>-#define BIT_MASK_RFMOD 0x3</div><div class='del'>-#define BIT_RFMOD(x) (((x) &amp; BIT_MASK_RFMOD) &lt;&lt; BIT_SHIFT_RFMOD)</div><div class='del'>-#define BIT_GET_RFMOD(x) (((x) &gt;&gt; BIT_SHIFT_RFMOD) &amp; BIT_MASK_RFMOD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RESP_CTS_DYNBW_SEL 5</div><div class='del'>-#define BIT_MASK_RESP_CTS_DYNBW_SEL 0x3</div><div class='del'>-#define BIT_RESP_CTS_DYNBW_SEL(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RESP_CTS_DYNBW_SEL) &lt;&lt; BIT_SHIFT_RESP_CTS_DYNBW_SEL)</div><div class='del'>-#define BIT_GET_RESP_CTS_DYNBW_SEL(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RESP_CTS_DYNBW_SEL) &amp; BIT_MASK_RESP_CTS_DYNBW_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_DLY_TX_WAIT_RXANTSEL BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_TXRESP_BY_RXANTSEL BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL			(Offset 0x0668) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ORIG_DCTS_CHK 0</div><div class='del'>-#define BIT_MASK_ORIG_DCTS_CHK 0x3</div><div class='del'>-#define BIT_ORIG_DCTS_CHK(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_ORIG_DCTS_CHK) &lt;&lt; BIT_SHIFT_ORIG_DCTS_CHK)</div><div class='del'>-#define BIT_GET_ORIG_DCTS_CHK(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ORIG_DCTS_CHK) &amp; BIT_MASK_ORIG_DCTS_CHK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMCMD				(Offset 0x0670) */</div><div class='del'>-</div><div class='del'>-#define BIT_SECCAM_POLLING BIT(31)</div><div class='del'>-#define BIT_SECCAM_CLR BIT(30)</div><div class='del'>-#define BIT_MFBCAM_CLR BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMCMD				(Offset 0x0670) */</div><div class='del'>-</div><div class='del'>-#define BIT_SECCAM_WE BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMCMD				(Offset 0x0670) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SECCAM_ADDR_V2 0</div><div class='del'>-#define BIT_MASK_SECCAM_ADDR_V2 0x3ff</div><div class='del'>-#define BIT_SECCAM_ADDR_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_SECCAM_ADDR_V2) &lt;&lt; BIT_SHIFT_SECCAM_ADDR_V2)</div><div class='del'>-#define BIT_GET_SECCAM_ADDR_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SECCAM_ADDR_V2) &amp; BIT_MASK_SECCAM_ADDR_V2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMWRITE				(Offset 0x0674) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMW_DATA 0</div><div class='del'>-#define BIT_MASK_CAMW_DATA 0xffffffffL</div><div class='del'>-#define BIT_CAMW_DATA(x) (((x) &amp; BIT_MASK_CAMW_DATA) &lt;&lt; BIT_SHIFT_CAMW_DATA)</div><div class='del'>-#define BIT_GET_CAMW_DATA(x) (((x) &gt;&gt; BIT_SHIFT_CAMW_DATA) &amp; BIT_MASK_CAMW_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMREAD				(Offset 0x0678) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMR_DATA 0</div><div class='del'>-#define BIT_MASK_CAMR_DATA 0xffffffffL</div><div class='del'>-#define BIT_CAMR_DATA(x) (((x) &amp; BIT_MASK_CAMR_DATA) &lt;&lt; BIT_SHIFT_CAMR_DATA)</div><div class='del'>-#define BIT_GET_CAMR_DATA(x) (((x) &gt;&gt; BIT_SHIFT_CAMR_DATA) &amp; BIT_MASK_CAMR_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMDBG				(Offset 0x067C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SECCAM_INFO BIT(31)</div><div class='del'>-#define BIT_SEC_KEYFOUND BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMDBG_SEC_TYPE 12</div><div class='del'>-#define BIT_MASK_CAMDBG_SEC_TYPE 0x7</div><div class='del'>-#define BIT_CAMDBG_SEC_TYPE(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMDBG_SEC_TYPE) &lt;&lt; BIT_SHIFT_CAMDBG_SEC_TYPE)</div><div class='del'>-#define BIT_GET_CAMDBG_SEC_TYPE(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMDBG_SEC_TYPE) &amp; BIT_MASK_CAMDBG_SEC_TYPE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMDBG				(Offset 0x067C) */</div><div class='del'>-</div><div class='del'>-#define BIT_CAMDBG_EXT_SECTYPE BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMDBG				(Offset 0x067C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMDBG_MIC_KEY_IDX 5</div><div class='del'>-#define BIT_MASK_CAMDBG_MIC_KEY_IDX 0x1f</div><div class='del'>-#define BIT_CAMDBG_MIC_KEY_IDX(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMDBG_MIC_KEY_IDX) &lt;&lt; BIT_SHIFT_CAMDBG_MIC_KEY_IDX)</div><div class='del'>-#define BIT_GET_CAMDBG_MIC_KEY_IDX(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMDBG_MIC_KEY_IDX) &amp; BIT_MASK_CAMDBG_MIC_KEY_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMDBG_SEC_KEY_IDX 0</div><div class='del'>-#define BIT_MASK_CAMDBG_SEC_KEY_IDX 0x1f</div><div class='del'>-#define BIT_CAMDBG_SEC_KEY_IDX(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMDBG_SEC_KEY_IDX) &lt;&lt; BIT_SHIFT_CAMDBG_SEC_KEY_IDX)</div><div class='del'>-#define BIT_GET_CAMDBG_SEC_KEY_IDX(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMDBG_SEC_KEY_IDX) &amp; BIT_MASK_CAMDBG_SEC_KEY_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SECCFG				(Offset 0x0680) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_GCLK_WAPI BIT(15)</div><div class='del'>-#define BIT_DIS_GCLK_AES BIT(14)</div><div class='del'>-#define BIT_DIS_GCLK_TKIP BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SECCFG				(Offset 0x0680) */</div><div class='del'>-</div><div class='del'>-#define BIT_AES_SEL_QC_1 BIT(12)</div><div class='del'>-#define BIT_AES_SEL_QC_0 BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SECCFG				(Offset 0x0680) */</div><div class='del'>-</div><div class='del'>-#define BIT_CHK_BMC BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SECCFG				(Offset 0x0680) */</div><div class='del'>-</div><div class='del'>-#define BIT_CHK_KEYID BIT(8)</div><div class='del'>-#define BIT_RXBCUSEDK BIT(7)</div><div class='del'>-#define BIT_TXBCUSEDK BIT(6)</div><div class='del'>-#define BIT_NOSKMC BIT(5)</div><div class='del'>-#define BIT_SKBYA2 BIT(4)</div><div class='del'>-#define BIT_RXDEC BIT(3)</div><div class='del'>-#define BIT_TXENC BIT(2)</div><div class='del'>-#define BIT_RXUHUSEDK BIT(1)</div><div class='del'>-#define BIT_TXUHUSEDK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_CATEGORY_1			(Offset 0x0682) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_CATEGORY_1 0</div><div class='del'>-#define BIT_MASK_RXFILTER_CATEGORY_1 0xff</div><div class='del'>-#define BIT_RXFILTER_CATEGORY_1(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_CATEGORY_1) &lt;&lt; BIT_SHIFT_RXFILTER_CATEGORY_1)</div><div class='del'>-#define BIT_GET_RXFILTER_CATEGORY_1(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_CATEGORY_1) &amp; BIT_MASK_RXFILTER_CATEGORY_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_ACTION_1			(Offset 0x0683) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_ACTION_1 0</div><div class='del'>-#define BIT_MASK_RXFILTER_ACTION_1 0xff</div><div class='del'>-#define BIT_RXFILTER_ACTION_1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_ACTION_1) &lt;&lt; BIT_SHIFT_RXFILTER_ACTION_1)</div><div class='del'>-#define BIT_GET_RXFILTER_ACTION_1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_ACTION_1) &amp; BIT_MASK_RXFILTER_ACTION_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_CATEGORY_2			(Offset 0x0684) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_CATEGORY_2 0</div><div class='del'>-#define BIT_MASK_RXFILTER_CATEGORY_2 0xff</div><div class='del'>-#define BIT_RXFILTER_CATEGORY_2(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_CATEGORY_2) &lt;&lt; BIT_SHIFT_RXFILTER_CATEGORY_2)</div><div class='del'>-#define BIT_GET_RXFILTER_CATEGORY_2(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_CATEGORY_2) &amp; BIT_MASK_RXFILTER_CATEGORY_2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_ACTION_2			(Offset 0x0685) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_ACTION_2 0</div><div class='del'>-#define BIT_MASK_RXFILTER_ACTION_2 0xff</div><div class='del'>-#define BIT_RXFILTER_ACTION_2(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_ACTION_2) &lt;&lt; BIT_SHIFT_RXFILTER_ACTION_2)</div><div class='del'>-#define BIT_GET_RXFILTER_ACTION_2(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_ACTION_2) &amp; BIT_MASK_RXFILTER_ACTION_2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_CATEGORY_3			(Offset 0x0686) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_CATEGORY_3 0</div><div class='del'>-#define BIT_MASK_RXFILTER_CATEGORY_3 0xff</div><div class='del'>-#define BIT_RXFILTER_CATEGORY_3(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_CATEGORY_3) &lt;&lt; BIT_SHIFT_RXFILTER_CATEGORY_3)</div><div class='del'>-#define BIT_GET_RXFILTER_CATEGORY_3(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_CATEGORY_3) &amp; BIT_MASK_RXFILTER_CATEGORY_3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_ACTION_3			(Offset 0x0687) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_ACTION_3 0</div><div class='del'>-#define BIT_MASK_RXFILTER_ACTION_3 0xff</div><div class='del'>-#define BIT_RXFILTER_ACTION_3(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_ACTION_3) &lt;&lt; BIT_SHIFT_RXFILTER_ACTION_3)</div><div class='del'>-#define BIT_GET_RXFILTER_ACTION_3(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_ACTION_3) &amp; BIT_MASK_RXFILTER_ACTION_3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP3				(Offset 0x0688) */</div><div class='del'>-</div><div class='del'>-#define BIT_MGTFLT15EN_FW BIT(15)</div><div class='del'>-#define BIT_MGTFLT14EN_FW BIT(14)</div><div class='del'>-#define BIT_MGTFLT13EN_FW BIT(13)</div><div class='del'>-#define BIT_MGTFLT12EN_FW BIT(12)</div><div class='del'>-#define BIT_MGTFLT11EN_FW BIT(11)</div><div class='del'>-#define BIT_MGTFLT10EN_FW BIT(10)</div><div class='del'>-#define BIT_MGTFLT9EN_FW BIT(9)</div><div class='del'>-#define BIT_MGTFLT8EN_FW BIT(8)</div><div class='del'>-#define BIT_MGTFLT7EN_FW BIT(7)</div><div class='del'>-#define BIT_MGTFLT6EN_FW BIT(6)</div><div class='del'>-#define BIT_MGTFLT5EN_FW BIT(5)</div><div class='del'>-#define BIT_MGTFLT4EN_FW BIT(4)</div><div class='del'>-#define BIT_MGTFLT3EN_FW BIT(3)</div><div class='del'>-#define BIT_MGTFLT2EN_FW BIT(2)</div><div class='del'>-#define BIT_MGTFLT1EN_FW BIT(1)</div><div class='del'>-#define BIT_MGTFLT0EN_FW BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP4				(Offset 0x068A) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTRLFLT15EN_FW BIT(15)</div><div class='del'>-#define BIT_CTRLFLT14EN_FW BIT(14)</div><div class='del'>-#define BIT_CTRLFLT13EN_FW BIT(13)</div><div class='del'>-#define BIT_CTRLFLT12EN_FW BIT(12)</div><div class='del'>-#define BIT_CTRLFLT11EN_FW BIT(11)</div><div class='del'>-#define BIT_CTRLFLT10EN_FW BIT(10)</div><div class='del'>-#define BIT_CTRLFLT9EN_FW BIT(9)</div><div class='del'>-#define BIT_CTRLFLT8EN_FW BIT(8)</div><div class='del'>-#define BIT_CTRLFLT7EN_FW BIT(7)</div><div class='del'>-#define BIT_CTRLFLT6EN_FW BIT(6)</div><div class='del'>-#define BIT_CTRLFLT5EN_FW BIT(5)</div><div class='del'>-#define BIT_CTRLFLT4EN_FW BIT(4)</div><div class='del'>-#define BIT_CTRLFLT3EN_FW BIT(3)</div><div class='del'>-#define BIT_CTRLFLT2EN_FW BIT(2)</div><div class='del'>-#define BIT_CTRLFLT1EN_FW BIT(1)</div><div class='del'>-#define BIT_CTRLFLT0EN_FW BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP5				(Offset 0x068C) */</div><div class='del'>-</div><div class='del'>-#define BIT_DATAFLT15EN_FW BIT(15)</div><div class='del'>-#define BIT_DATAFLT14EN_FW BIT(14)</div><div class='del'>-#define BIT_DATAFLT13EN_FW BIT(13)</div><div class='del'>-#define BIT_DATAFLT12EN_FW BIT(12)</div><div class='del'>-#define BIT_DATAFLT11EN_FW BIT(11)</div><div class='del'>-#define BIT_DATAFLT10EN_FW BIT(10)</div><div class='del'>-#define BIT_DATAFLT9EN_FW BIT(9)</div><div class='del'>-#define BIT_DATAFLT8EN_FW BIT(8)</div><div class='del'>-#define BIT_DATAFLT7EN_FW BIT(7)</div><div class='del'>-#define BIT_DATAFLT6EN_FW BIT(6)</div><div class='del'>-#define BIT_DATAFLT5EN_FW BIT(5)</div><div class='del'>-#define BIT_DATAFLT4EN_FW BIT(4)</div><div class='del'>-#define BIT_DATAFLT3EN_FW BIT(3)</div><div class='del'>-#define BIT_DATAFLT2EN_FW BIT(2)</div><div class='del'>-#define BIT_DATAFLT1EN_FW BIT(1)</div><div class='del'>-#define BIT_DATAFLT0EN_FW BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP6				(Offset 0x068E) */</div><div class='del'>-</div><div class='del'>-#define BIT_ACTIONFLT15EN_FW BIT(15)</div><div class='del'>-#define BIT_ACTIONFLT14EN_FW BIT(14)</div><div class='del'>-#define BIT_ACTIONFLT13EN_FW BIT(13)</div><div class='del'>-#define BIT_ACTIONFLT12EN_FW BIT(12)</div><div class='del'>-#define BIT_ACTIONFLT11EN_FW BIT(11)</div><div class='del'>-#define BIT_ACTIONFLT10EN_FW BIT(10)</div><div class='del'>-#define BIT_ACTIONFLT9EN_FW BIT(9)</div><div class='del'>-#define BIT_ACTIONFLT8EN_FW BIT(8)</div><div class='del'>-#define BIT_ACTIONFLT7EN_FW BIT(7)</div><div class='del'>-#define BIT_ACTIONFLT6EN_FW BIT(6)</div><div class='del'>-#define BIT_ACTIONFLT5EN_FW BIT(5)</div><div class='del'>-#define BIT_ACTIONFLT4EN_FW BIT(4)</div><div class='del'>-#define BIT_ACTIONFLT3EN_FW BIT(3)</div><div class='del'>-#define BIT_ACTIONFLT2EN_FW BIT(2)</div><div class='del'>-#define BIT_ACTIONFLT1EN_FW BIT(1)</div><div class='del'>-#define BIT_ACTIONFLT0EN_FW BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WOW_CTRL				(Offset 0x0690) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSF_BSSIDSEL_B2B1 6</div><div class='del'>-#define BIT_MASK_PSF_BSSIDSEL_B2B1 0x3</div><div class='del'>-#define BIT_PSF_BSSIDSEL_B2B1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSF_BSSIDSEL_B2B1) &lt;&lt; BIT_SHIFT_PSF_BSSIDSEL_B2B1)</div><div class='del'>-#define BIT_GET_PSF_BSSIDSEL_B2B1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSF_BSSIDSEL_B2B1) &amp; BIT_MASK_PSF_BSSIDSEL_B2B1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WOW_CTRL				(Offset 0x0690) */</div><div class='del'>-</div><div class='del'>-#define BIT_WOWHCI BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WOW_CTRL				(Offset 0x0690) */</div><div class='del'>-</div><div class='del'>-#define BIT_PSF_BSSIDSEL_B0 BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WOW_CTRL				(Offset 0x0690) */</div><div class='del'>-</div><div class='del'>-#define BIT_UWF BIT(3)</div><div class='del'>-#define BIT_MAGIC BIT(2)</div><div class='del'>-#define BIT_WOWEN BIT(1)</div><div class='del'>-#define BIT_FORCE_WAKEUP BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NAN_RX_TSF_FILTER			(Offset 0x0691) */</div><div class='del'>-</div><div class='del'>-#define BIT_CHK_TSF_TA BIT(2)</div><div class='del'>-#define BIT_CHK_TSF_CBSSID BIT(1)</div><div class='del'>-#define BIT_CHK_TSF_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_RX_INFO				(Offset 0x0692) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PORTSEL__PS_RX_INFO 5</div><div class='del'>-#define BIT_MASK_PORTSEL__PS_RX_INFO 0x7</div><div class='del'>-#define BIT_PORTSEL__PS_RX_INFO(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PORTSEL__PS_RX_INFO) &lt;&lt; BIT_SHIFT_PORTSEL__PS_RX_INFO)</div><div class='del'>-#define BIT_GET_PORTSEL__PS_RX_INFO(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PORTSEL__PS_RX_INFO) &amp; BIT_MASK_PORTSEL__PS_RX_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_RX_INFO				(Offset 0x0692) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXCTRLIN0 BIT(4)</div><div class='del'>-#define BIT_RXMGTIN0 BIT(3)</div><div class='del'>-#define BIT_RXDATAIN2 BIT(2)</div><div class='del'>-#define BIT_RXDATAIN1 BIT(1)</div><div class='del'>-#define BIT_RXDATAIN0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMMPS_UAPSD_TID			(Offset 0x0693) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID7 BIT(7)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID6 BIT(6)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID5 BIT(5)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID4 BIT(4)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID3 BIT(3)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID2 BIT(2)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID1 BIT(1)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LPNAV_CTRL				(Offset 0x0694) */</div><div class='del'>-</div><div class='del'>-#define BIT_LPNAV_EN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPNAV_EARLY 16</div><div class='del'>-#define BIT_MASK_LPNAV_EARLY 0x7fff</div><div class='del'>-#define BIT_LPNAV_EARLY(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPNAV_EARLY) &lt;&lt; BIT_SHIFT_LPNAV_EARLY)</div><div class='del'>-#define BIT_GET_LPNAV_EARLY(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPNAV_EARLY) &amp; BIT_MASK_LPNAV_EARLY)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPNAV_TH 0</div><div class='del'>-#define BIT_MASK_LPNAV_TH 0xffff</div><div class='del'>-#define BIT_LPNAV_TH(x) (((x) &amp; BIT_MASK_LPNAV_TH) &lt;&lt; BIT_SHIFT_LPNAV_TH)</div><div class='del'>-#define BIT_GET_LPNAV_TH(x) (((x) &gt;&gt; BIT_SHIFT_LPNAV_TH) &amp; BIT_MASK_LPNAV_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WKFMCAM_CMD				(Offset 0x0698) */</div><div class='del'>-</div><div class='del'>-#define BIT_WKFCAM_POLLING_V1 BIT(31)</div><div class='del'>-#define BIT_WKFCAM_CLR_V1 BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WKFMCAM_CMD				(Offset 0x0698) */</div><div class='del'>-</div><div class='del'>-#define BIT_WKFCAM_WE BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WKFMCAM_CMD				(Offset 0x0698) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WKFCAM_ADDR_V2 8</div><div class='del'>-#define BIT_MASK_WKFCAM_ADDR_V2 0xff</div><div class='del'>-#define BIT_WKFCAM_ADDR_V2(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_WKFCAM_ADDR_V2) &lt;&lt; BIT_SHIFT_WKFCAM_ADDR_V2)</div><div class='del'>-#define BIT_GET_WKFCAM_ADDR_V2(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WKFCAM_ADDR_V2) &amp; BIT_MASK_WKFCAM_ADDR_V2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WKFCAM_CAM_NUM_V1 0</div><div class='del'>-#define BIT_MASK_WKFCAM_CAM_NUM_V1 0xff</div><div class='del'>-#define BIT_WKFCAM_CAM_NUM_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WKFCAM_CAM_NUM_V1) &lt;&lt; BIT_SHIFT_WKFCAM_CAM_NUM_V1)</div><div class='del'>-#define BIT_GET_WKFCAM_CAM_NUM_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WKFCAM_CAM_NUM_V1) &amp; BIT_MASK_WKFCAM_CAM_NUM_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WKFMCAM_RWD				(Offset 0x069C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WKFMCAM_RWD 0</div><div class='del'>-#define BIT_MASK_WKFMCAM_RWD 0xffffffffL</div><div class='del'>-#define BIT_WKFMCAM_RWD(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_WKFMCAM_RWD) &lt;&lt; BIT_SHIFT_WKFMCAM_RWD)</div><div class='del'>-#define BIT_GET_WKFMCAM_RWD(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WKFMCAM_RWD) &amp; BIT_MASK_WKFMCAM_RWD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP0				(Offset 0x06A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_MGTFLT15EN BIT(15)</div><div class='del'>-#define BIT_MGTFLT14EN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP0				(Offset 0x06A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_MGTFLT13EN BIT(13)</div><div class='del'>-#define BIT_MGTFLT12EN BIT(12)</div><div class='del'>-#define BIT_MGTFLT11EN BIT(11)</div><div class='del'>-#define BIT_MGTFLT10EN BIT(10)</div><div class='del'>-#define BIT_MGTFLT9EN BIT(9)</div><div class='del'>-#define BIT_MGTFLT8EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP0				(Offset 0x06A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_MGTFLT7EN BIT(7)</div><div class='del'>-#define BIT_MGTFLT6EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP0				(Offset 0x06A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_MGTFLT5EN BIT(5)</div><div class='del'>-#define BIT_MGTFLT4EN BIT(4)</div><div class='del'>-#define BIT_MGTFLT3EN BIT(3)</div><div class='del'>-#define BIT_MGTFLT2EN BIT(2)</div><div class='del'>-#define BIT_MGTFLT1EN BIT(1)</div><div class='del'>-#define BIT_MGTFLT0EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP1				(Offset 0x06A2) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTRLFLT15EN BIT(15)</div><div class='del'>-#define BIT_CTRLFLT14EN BIT(14)</div><div class='del'>-#define BIT_CTRLFLT13EN BIT(13)</div><div class='del'>-#define BIT_CTRLFLT12EN BIT(12)</div><div class='del'>-#define BIT_CTRLFLT11EN BIT(11)</div><div class='del'>-#define BIT_CTRLFLT10EN BIT(10)</div><div class='del'>-#define BIT_CTRLFLT9EN BIT(9)</div><div class='del'>-#define BIT_CTRLFLT8EN BIT(8)</div><div class='del'>-#define BIT_CTRLFLT7EN BIT(7)</div><div class='del'>-#define BIT_CTRLFLT6EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP1				(Offset 0x06A2) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTRLFLT5EN BIT(5)</div><div class='del'>-#define BIT_CTRLFLT4EN BIT(4)</div><div class='del'>-#define BIT_CTRLFLT3EN BIT(3)</div><div class='del'>-#define BIT_CTRLFLT2EN BIT(2)</div><div class='del'>-#define BIT_CTRLFLT1EN BIT(1)</div><div class='del'>-#define BIT_CTRLFLT0EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP				(Offset 0x06A4) */</div><div class='del'>-</div><div class='del'>-#define BIT_DATAFLT15EN BIT(15)</div><div class='del'>-#define BIT_DATAFLT14EN BIT(14)</div><div class='del'>-#define BIT_DATAFLT13EN BIT(13)</div><div class='del'>-#define BIT_DATAFLT12EN BIT(12)</div><div class='del'>-#define BIT_DATAFLT11EN BIT(11)</div><div class='del'>-#define BIT_DATAFLT10EN BIT(10)</div><div class='del'>-#define BIT_DATAFLT9EN BIT(9)</div><div class='del'>-#define BIT_DATAFLT8EN BIT(8)</div><div class='del'>-#define BIT_DATAFLT7EN BIT(7)</div><div class='del'>-#define BIT_DATAFLT6EN BIT(6)</div><div class='del'>-#define BIT_DATAFLT5EN BIT(5)</div><div class='del'>-#define BIT_DATAFLT4EN BIT(4)</div><div class='del'>-#define BIT_DATAFLT3EN BIT(3)</div><div class='del'>-#define BIT_DATAFLT2EN BIT(2)</div><div class='del'>-#define BIT_DATAFLT1EN BIT(1)</div><div class='del'>-#define BIT_DATAFLT0EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT				(Offset 0x06A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT 0xff</div><div class='del'>-#define BIT_DTIM_CNT(x) (((x) &amp; BIT_MASK_DTIM_CNT) &lt;&lt; BIT_SHIFT_DTIM_CNT)</div><div class='del'>-#define BIT_GET_DTIM_CNT(x) (((x) &gt;&gt; BIT_SHIFT_DTIM_CNT) &amp; BIT_MASK_DTIM_CNT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD) &lt;&lt; BIT_SHIFT_DTIM_PERIOD)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD) &amp; BIT_MASK_DTIM_PERIOD)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM BIT(15)</div><div class='del'>-#define BIT_TIM BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_0 0</div><div class='del'>-#define BIT_MASK_PS_AID_0 0x7ff</div><div class='del'>-#define BIT_PS_AID_0(x) (((x) &amp; BIT_MASK_PS_AID_0) &lt;&lt; BIT_SHIFT_PS_AID_0)</div><div class='del'>-#define BIT_GET_PS_AID_0(x) (((x) &gt;&gt; BIT_SHIFT_PS_AID_0) &amp; BIT_MASK_PS_AID_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_RPC				(Offset 0x06AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FLC_RPC 0</div><div class='del'>-#define BIT_MASK_FLC_RPC 0xff</div><div class='del'>-#define BIT_FLC_RPC(x) (((x) &amp; BIT_MASK_FLC_RPC) &lt;&lt; BIT_SHIFT_FLC_RPC)</div><div class='del'>-#define BIT_GET_FLC_RPC(x) (((x) &gt;&gt; BIT_SHIFT_FLC_RPC) &amp; BIT_MASK_FLC_RPC)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_RPCT				(Offset 0x06AD) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FLC_RPCT 0</div><div class='del'>-#define BIT_MASK_FLC_RPCT 0xff</div><div class='del'>-#define BIT_FLC_RPCT(x) (((x) &amp; BIT_MASK_FLC_RPCT) &lt;&lt; BIT_SHIFT_FLC_RPCT)</div><div class='del'>-#define BIT_GET_FLC_RPCT(x) (((x) &gt;&gt; BIT_SHIFT_FLC_RPCT) &amp; BIT_MASK_FLC_RPCT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_PTS				(Offset 0x06AE) */</div><div class='del'>-</div><div class='del'>-#define BIT_CMF BIT(2)</div><div class='del'>-#define BIT_CCF BIT(1)</div><div class='del'>-#define BIT_CDF BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_TRPC				(Offset 0x06AF) */</div><div class='del'>-</div><div class='del'>-#define BIT_FLC_RPCT_V1 BIT(7)</div><div class='del'>-#define BIT_MODE BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRPCD 0</div><div class='del'>-#define BIT_MASK_TRPCD 0x3f</div><div class='del'>-#define BIT_TRPCD(x) (((x) &amp; BIT_MASK_TRPCD) &lt;&lt; BIT_SHIFT_TRPCD)</div><div class='del'>-#define BIT_GET_TRPCD(x) (((x) &gt;&gt; BIT_SHIFT_TRPCD) &amp; BIT_MASK_TRPCD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXPKTMON_CTRL			(Offset 0x06B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXBKQPKT_SEQ 20</div><div class='del'>-#define BIT_MASK_RXBKQPKT_SEQ 0xf</div><div class='del'>-#define BIT_RXBKQPKT_SEQ(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXBKQPKT_SEQ) &lt;&lt; BIT_SHIFT_RXBKQPKT_SEQ)</div><div class='del'>-#define BIT_GET_RXBKQPKT_SEQ(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXBKQPKT_SEQ) &amp; BIT_MASK_RXBKQPKT_SEQ)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXBEQPKT_SEQ 16</div><div class='del'>-#define BIT_MASK_RXBEQPKT_SEQ 0xf</div><div class='del'>-#define BIT_RXBEQPKT_SEQ(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXBEQPKT_SEQ) &lt;&lt; BIT_SHIFT_RXBEQPKT_SEQ)</div><div class='del'>-#define BIT_GET_RXBEQPKT_SEQ(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXBEQPKT_SEQ) &amp; BIT_MASK_RXBEQPKT_SEQ)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXVIQPKT_SEQ 12</div><div class='del'>-#define BIT_MASK_RXVIQPKT_SEQ 0xf</div><div class='del'>-#define BIT_RXVIQPKT_SEQ(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXVIQPKT_SEQ) &lt;&lt; BIT_SHIFT_RXVIQPKT_SEQ)</div><div class='del'>-#define BIT_GET_RXVIQPKT_SEQ(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXVIQPKT_SEQ) &amp; BIT_MASK_RXVIQPKT_SEQ)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXVOQPKT_SEQ 8</div><div class='del'>-#define BIT_MASK_RXVOQPKT_SEQ 0xf</div><div class='del'>-#define BIT_RXVOQPKT_SEQ(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXVOQPKT_SEQ) &lt;&lt; BIT_SHIFT_RXVOQPKT_SEQ)</div><div class='del'>-#define BIT_GET_RXVOQPKT_SEQ(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXVOQPKT_SEQ) &amp; BIT_MASK_RXVOQPKT_SEQ)</div><div class='del'>-</div><div class='del'>-#define BIT_RXBKQPKT_ERR BIT(7)</div><div class='del'>-#define BIT_RXBEQPKT_ERR BIT(6)</div><div class='del'>-#define BIT_RXVIQPKT_ERR BIT(5)</div><div class='del'>-#define BIT_RXVOQPKT_ERR BIT(4)</div><div class='del'>-#define BIT_RXDMA_MON_EN BIT(2)</div><div class='del'>-#define BIT_RXPKT_MON_RST BIT(1)</div><div class='del'>-#define BIT_RXPKT_MON_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STATE_MON				(Offset 0x06B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATE_SEL 24</div><div class='del'>-#define BIT_MASK_STATE_SEL 0x1f</div><div class='del'>-#define BIT_STATE_SEL(x) (((x) &amp; BIT_MASK_STATE_SEL) &lt;&lt; BIT_SHIFT_STATE_SEL)</div><div class='del'>-#define BIT_GET_STATE_SEL(x) (((x) &gt;&gt; BIT_SHIFT_STATE_SEL) &amp; BIT_MASK_STATE_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATE_INFO 8</div><div class='del'>-#define BIT_MASK_STATE_INFO 0xff</div><div class='del'>-#define BIT_STATE_INFO(x) (((x) &amp; BIT_MASK_STATE_INFO) &lt;&lt; BIT_SHIFT_STATE_INFO)</div><div class='del'>-#define BIT_GET_STATE_INFO(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATE_INFO) &amp; BIT_MASK_STATE_INFO)</div><div class='del'>-</div><div class='del'>-#define BIT_UPD_NXT_STATE BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STATE_MON				(Offset 0x06B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CUR_STATE 0</div><div class='del'>-#define BIT_MASK_CUR_STATE 0x7f</div><div class='del'>-#define BIT_CUR_STATE(x) (((x) &amp; BIT_MASK_CUR_STATE) &lt;&lt; BIT_SHIFT_CUR_STATE)</div><div class='del'>-#define BIT_GET_CUR_STATE(x) (((x) &gt;&gt; BIT_SHIFT_CUR_STATE) &amp; BIT_MASK_CUR_STATE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ERROR_MON				(Offset 0x06B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_MACRX_ERR_1 BIT(17)</div><div class='del'>-#define BIT_MACRX_ERR_0 BIT(16)</div><div class='del'>-#define BIT_MACTX_ERR_3 BIT(3)</div><div class='del'>-#define BIT_MACTX_ERR_2 BIT(2)</div><div class='del'>-#define BIT_MACTX_ERR_1 BIT(1)</div><div class='del'>-#define BIT_MACTX_ERR_0 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SEARCH_MACID			(Offset 0x06BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_TXRPTBUF_CLK BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INFO_INDEX_OFFSET 16</div><div class='del'>-#define BIT_MASK_INFO_INDEX_OFFSET 0x1fff</div><div class='del'>-#define BIT_INFO_INDEX_OFFSET(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_INFO_INDEX_OFFSET) &lt;&lt; BIT_SHIFT_INFO_INDEX_OFFSET)</div><div class='del'>-#define BIT_GET_INFO_INDEX_OFFSET(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INFO_INDEX_OFFSET) &amp; BIT_MASK_INFO_INDEX_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SEARCH_MACID			(Offset 0x06BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_SRCH_FIFOFULL BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SEARCH_MACID			(Offset 0x06BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_INFOSRCH BIT(14)</div><div class='del'>-#define BIT_DISABLE_B0 BIT(13)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INFO_ADDR_OFFSET 0</div><div class='del'>-#define BIT_MASK_INFO_ADDR_OFFSET 0x1fff</div><div class='del'>-#define BIT_INFO_ADDR_OFFSET(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_INFO_ADDR_OFFSET) &lt;&lt; BIT_SHIFT_INFO_ADDR_OFFSET)</div><div class='del'>-#define BIT_GET_INFO_ADDR_OFFSET(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INFO_ADDR_OFFSET) &amp; BIT_MASK_INFO_ADDR_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_TABLE			(Offset 0x06C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_PRI_MASK_RX_RESP BIT(126)</div><div class='del'>-#define BIT_PRI_MASK_RXOFDM BIT(125)</div><div class='del'>-#define BIT_PRI_MASK_RXCCK BIT(124)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_TXAC (117 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_TXAC 0x7f</div><div class='del'>-#define BIT_PRI_MASK_TXAC(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_TXAC) &lt;&lt; BIT_SHIFT_PRI_MASK_TXAC)</div><div class='del'>-#define BIT_GET_PRI_MASK_TXAC(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_TXAC) &amp; BIT_MASK_PRI_MASK_TXAC)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_NAV (109 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_NAV 0xff</div><div class='del'>-#define BIT_PRI_MASK_NAV(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_NAV) &lt;&lt; BIT_SHIFT_PRI_MASK_NAV)</div><div class='del'>-#define BIT_GET_PRI_MASK_NAV(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_NAV) &amp; BIT_MASK_PRI_MASK_NAV)</div><div class='del'>-</div><div class='del'>-#define BIT_PRI_MASK_CCK BIT(108)</div><div class='del'>-#define BIT_PRI_MASK_OFDM BIT(107)</div><div class='del'>-#define BIT_PRI_MASK_RTY BIT(106)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_NUM (102 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_NUM 0xf</div><div class='del'>-#define BIT_PRI_MASK_NUM(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_NUM) &lt;&lt; BIT_SHIFT_PRI_MASK_NUM)</div><div class='del'>-#define BIT_GET_PRI_MASK_NUM(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_NUM) &amp; BIT_MASK_PRI_MASK_NUM)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_TYPE (98 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_TYPE 0xf</div><div class='del'>-#define BIT_PRI_MASK_TYPE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_TYPE) &lt;&lt; BIT_SHIFT_PRI_MASK_TYPE)</div><div class='del'>-#define BIT_GET_PRI_MASK_TYPE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_TYPE) &amp; BIT_MASK_PRI_MASK_TYPE)</div><div class='del'>-</div><div class='del'>-#define BIT_OOB BIT(97)</div><div class='del'>-#define BIT_ANT_SEL BIT(96)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BREAK_TABLE_2 (80 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_BREAK_TABLE_2 0xffff</div><div class='del'>-#define BIT_BREAK_TABLE_2(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BREAK_TABLE_2) &lt;&lt; BIT_SHIFT_BREAK_TABLE_2)</div><div class='del'>-#define BIT_GET_BREAK_TABLE_2(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BREAK_TABLE_2) &amp; BIT_MASK_BREAK_TABLE_2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BREAK_TABLE_1 (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_BREAK_TABLE_1 0xffff</div><div class='del'>-#define BIT_BREAK_TABLE_1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BREAK_TABLE_1) &lt;&lt; BIT_SHIFT_BREAK_TABLE_1)</div><div class='del'>-#define BIT_GET_BREAK_TABLE_1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BREAK_TABLE_1) &amp; BIT_MASK_BREAK_TABLE_1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_COEX_TABLE_2 (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_COEX_TABLE_2 0xffffffffL</div><div class='del'>-#define BIT_COEX_TABLE_2(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_COEX_TABLE_2) &lt;&lt; BIT_SHIFT_COEX_TABLE_2)</div><div class='del'>-#define BIT_GET_COEX_TABLE_2(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_COEX_TABLE_2) &amp; BIT_MASK_COEX_TABLE_2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_COEX_TABLE_1 0</div><div class='del'>-#define BIT_MASK_COEX_TABLE_1 0xffffffffL</div><div class='del'>-#define BIT_COEX_TABLE_1(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_COEX_TABLE_1) &lt;&lt; BIT_SHIFT_COEX_TABLE_1)</div><div class='del'>-#define BIT_GET_COEX_TABLE_1(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_COEX_TABLE_1) &amp; BIT_MASK_COEX_TABLE_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXCMD_0				(Offset 0x06D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXCMD_EN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXCMD_INFO 0</div><div class='del'>-#define BIT_MASK_RXCMD_INFO 0x7fffffffL</div><div class='del'>-#define BIT_RXCMD_INFO(x) (((x) &amp; BIT_MASK_RXCMD_INFO) &lt;&lt; BIT_SHIFT_RXCMD_INFO)</div><div class='del'>-#define BIT_GET_RXCMD_INFO(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXCMD_INFO) &amp; BIT_MASK_RXCMD_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXCMD_1				(Offset 0x06D4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXCMD_PRD 0</div><div class='del'>-#define BIT_MASK_RXCMD_PRD 0xffff</div><div class='del'>-#define BIT_RXCMD_PRD(x) (((x) &amp; BIT_MASK_RXCMD_PRD) &lt;&lt; BIT_SHIFT_RXCMD_PRD)</div><div class='del'>-#define BIT_GET_RXCMD_PRD(x) (((x) &gt;&gt; BIT_SHIFT_RXCMD_PRD) &amp; BIT_MASK_RXCMD_PRD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_RESP_TXINFO			(Offset 0x06D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_MFB 25</div><div class='del'>-#define BIT_MASK_WMAC_RESP_MFB 0x7f</div><div class='del'>-#define BIT_WMAC_RESP_MFB(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_MFB) &lt;&lt; BIT_SHIFT_WMAC_RESP_MFB)</div><div class='del'>-#define BIT_GET_WMAC_RESP_MFB(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_MFB) &amp; BIT_MASK_WMAC_RESP_MFB)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ANTINF_SEL 23</div><div class='del'>-#define BIT_MASK_WMAC_ANTINF_SEL 0x3</div><div class='del'>-#define BIT_WMAC_ANTINF_SEL(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ANTINF_SEL) &lt;&lt; BIT_SHIFT_WMAC_ANTINF_SEL)</div><div class='del'>-#define BIT_GET_WMAC_ANTINF_SEL(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ANTINF_SEL) &amp; BIT_MASK_WMAC_ANTINF_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ANTSEL_SEL 21</div><div class='del'>-#define BIT_MASK_WMAC_ANTSEL_SEL 0x3</div><div class='del'>-#define BIT_WMAC_ANTSEL_SEL(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ANTSEL_SEL) &lt;&lt; BIT_SHIFT_WMAC_ANTSEL_SEL)</div><div class='del'>-#define BIT_GET_WMAC_ANTSEL_SEL(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ANTSEL_SEL) &amp; BIT_MASK_WMAC_ANTSEL_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_RESP_TXINFO			(Offset 0x06D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RESP_TXPOWER 18</div><div class='del'>-#define BIT_MASK_R_WMAC_RESP_TXPOWER 0x7</div><div class='del'>-#define BIT_R_WMAC_RESP_TXPOWER(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RESP_TXPOWER) &lt;&lt; BIT_SHIFT_R_WMAC_RESP_TXPOWER)</div><div class='del'>-#define BIT_GET_R_WMAC_RESP_TXPOWER(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RESP_TXPOWER) &amp; BIT_MASK_R_WMAC_RESP_TXPOWER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_RESP_TXINFO			(Offset 0x06D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_TXANT 0</div><div class='del'>-#define BIT_MASK_WMAC_RESP_TXANT 0x3ffff</div><div class='del'>-#define BIT_WMAC_RESP_TXANT(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_TXANT) &lt;&lt; BIT_SHIFT_WMAC_RESP_TXANT)</div><div class='del'>-#define BIT_GET_WMAC_RESP_TXANT(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_TXANT) &amp; BIT_MASK_WMAC_RESP_TXANT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BBPSF_CTRL				(Offset 0x06DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_CTL_IDLE_CLR_CSI_RPT BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BBPSF_CTRL				(Offset 0x06DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_USE_NDPARATE BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_CSI_RATE 24</div><div class='del'>-#define BIT_MASK_WMAC_CSI_RATE 0x3f</div><div class='del'>-#define BIT_WMAC_CSI_RATE(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_CSI_RATE) &lt;&lt; BIT_SHIFT_WMAC_CSI_RATE)</div><div class='del'>-#define BIT_GET_WMAC_CSI_RATE(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_CSI_RATE) &amp; BIT_MASK_WMAC_CSI_RATE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_TXRATE 16</div><div class='del'>-#define BIT_MASK_WMAC_RESP_TXRATE 0xff</div><div class='del'>-#define BIT_WMAC_RESP_TXRATE(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_TXRATE) &lt;&lt; BIT_SHIFT_WMAC_RESP_TXRATE)</div><div class='del'>-#define BIT_GET_WMAC_RESP_TXRATE(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_TXRATE) &amp; BIT_MASK_WMAC_RESP_TXRATE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BBPSF_CTRL				(Offset 0x06DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_BBPSF_MPDUCHKEN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BBPSF_CTRL				(Offset 0x06DC) */</div><div class='del'>-</div><div class='del'>-#define BIT_BBPSF_MHCHKEN BIT(4)</div><div class='del'>-#define BIT_BBPSF_ERRCHKEN BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BBPSF_ERRTHR 0</div><div class='del'>-#define BIT_MASK_BBPSF_ERRTHR 0x7</div><div class='del'>-#define BIT_BBPSF_ERRTHR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BBPSF_ERRTHR) &lt;&lt; BIT_SHIFT_BBPSF_ERRTHR)</div><div class='del'>-#define BIT_GET_BBPSF_ERRTHR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BBPSF_ERRTHR) &amp; BIT_MASK_BBPSF_ERRTHR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2P_RX_BCN_NOA			(Offset 0x06E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_NOA_PARSER_EN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2P_RX_BCN_NOA			(Offset 0x06E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BSSID_SEL BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2P_RX_BCN_NOA			(Offset 0x06E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_P2P_OUI_TYPE 0</div><div class='del'>-#define BIT_MASK_P2P_OUI_TYPE 0xff</div><div class='del'>-#define BIT_P2P_OUI_TYPE(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_P2P_OUI_TYPE) &lt;&lt; BIT_SHIFT_P2P_OUI_TYPE)</div><div class='del'>-#define BIT_GET_P2P_OUI_TYPE(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_P2P_OUI_TYPE) &amp; BIT_MASK_P2P_OUI_TYPE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ASSOCIATED_BFMER0_INFO		(Offset 0x06E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_TXCSI_AID0 (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_TXCSI_AID0 0x1ff</div><div class='del'>-#define BIT_R_WMAC_TXCSI_AID0(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_TXCSI_AID0) &lt;&lt; BIT_SHIFT_R_WMAC_TXCSI_AID0)</div><div class='del'>-#define BIT_GET_R_WMAC_TXCSI_AID0(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_TXCSI_AID0) &amp; BIT_MASK_R_WMAC_TXCSI_AID0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R0 0</div><div class='del'>-#define BIT_MASK_R_WMAC_SOUNDING_RXADD_R0 0xffffffffffffL</div><div class='del'>-#define BIT_R_WMAC_SOUNDING_RXADD_R0(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_SOUNDING_RXADD_R0)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R0)</div><div class='del'>-#define BIT_GET_R_WMAC_SOUNDING_RXADD_R0(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R0) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_SOUNDING_RXADD_R0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ASSOCIATED_BFMER1_INFO		(Offset 0x06EC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_TXCSI_AID1 (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_TXCSI_AID1 0x1ff</div><div class='del'>-#define BIT_R_WMAC_TXCSI_AID1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_TXCSI_AID1) &lt;&lt; BIT_SHIFT_R_WMAC_TXCSI_AID1)</div><div class='del'>-#define BIT_GET_R_WMAC_TXCSI_AID1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_TXCSI_AID1) &amp; BIT_MASK_R_WMAC_TXCSI_AID1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R1 0</div><div class='del'>-#define BIT_MASK_R_WMAC_SOUNDING_RXADD_R1 0xffffffffffffL</div><div class='del'>-#define BIT_R_WMAC_SOUNDING_RXADD_R1(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_SOUNDING_RXADD_R1)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R1)</div><div class='del'>-#define BIT_GET_R_WMAC_SOUNDING_RXADD_R1(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R1) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_SOUNDING_RXADD_R1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_CSI_RPT_PARAM_BW20		(Offset 0x06F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_BFINFO_20M_1 16</div><div class='del'>-#define BIT_MASK_R_WMAC_BFINFO_20M_1 0xfff</div><div class='del'>-#define BIT_R_WMAC_BFINFO_20M_1(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_BFINFO_20M_1) &lt;&lt; BIT_SHIFT_R_WMAC_BFINFO_20M_1)</div><div class='del'>-#define BIT_GET_R_WMAC_BFINFO_20M_1(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_BFINFO_20M_1) &amp; BIT_MASK_R_WMAC_BFINFO_20M_1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_BFINFO_20M_0 0</div><div class='del'>-#define BIT_MASK_R_WMAC_BFINFO_20M_0 0xfff</div><div class='del'>-#define BIT_R_WMAC_BFINFO_20M_0(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_BFINFO_20M_0) &lt;&lt; BIT_SHIFT_R_WMAC_BFINFO_20M_0)</div><div class='del'>-#define BIT_GET_R_WMAC_BFINFO_20M_0(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_BFINFO_20M_0) &amp; BIT_MASK_R_WMAC_BFINFO_20M_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_CSI_RPT_PARAM_BW40		(Offset 0x06F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_ANTCD 0</div><div class='del'>-#define BIT_MASK_WMAC_RESP_ANTCD 0xf</div><div class='del'>-#define BIT_WMAC_RESP_ANTCD(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_ANTCD) &lt;&lt; BIT_SHIFT_WMAC_RESP_ANTCD)</div><div class='del'>-#define BIT_GET_WMAC_RESP_ANTCD(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_ANTCD) &amp; BIT_MASK_WMAC_RESP_ANTCD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID1				(Offset 0x0700) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID1 0</div><div class='del'>-#define BIT_MASK_MACID1 0xffffffffffffL</div><div class='del'>-#define BIT_MACID1(x) (((x) &amp; BIT_MASK_MACID1) &lt;&lt; BIT_SHIFT_MACID1)</div><div class='del'>-#define BIT_GET_MACID1(x) (((x) &gt;&gt; BIT_SHIFT_MACID1) &amp; BIT_MASK_MACID1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID1				(Offset 0x0708) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID1 0</div><div class='del'>-#define BIT_MASK_BSSID1 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID1(x) (((x) &amp; BIT_MASK_BSSID1) &lt;&lt; BIT_SHIFT_BSSID1)</div><div class='del'>-#define BIT_GET_BSSID1(x) (((x) &gt;&gt; BIT_SHIFT_BSSID1) &amp; BIT_MASK_BSSID1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT1			(Offset 0x0710) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT1 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT1 0xff</div><div class='del'>-#define BIT_DTIM_CNT1(x) (((x) &amp; BIT_MASK_DTIM_CNT1) &lt;&lt; BIT_SHIFT_DTIM_CNT1)</div><div class='del'>-#define BIT_GET_DTIM_CNT1(x) (((x) &gt;&gt; BIT_SHIFT_DTIM_CNT1) &amp; BIT_MASK_DTIM_CNT1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD1 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD1 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD1(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD1) &lt;&lt; BIT_SHIFT_DTIM_PERIOD1)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD1(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD1) &amp; BIT_MASK_DTIM_PERIOD1)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM1 BIT(15)</div><div class='del'>-#define BIT_TIM1 BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_1 0</div><div class='del'>-#define BIT_MASK_PS_AID_1 0x7ff</div><div class='del'>-#define BIT_PS_AID_1(x) (((x) &amp; BIT_MASK_PS_AID_1) &lt;&lt; BIT_SHIFT_PS_AID_1)</div><div class='del'>-#define BIT_GET_PS_AID_1(x) (((x) &gt;&gt; BIT_SHIFT_PS_AID_1) &amp; BIT_MASK_PS_AID_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ASSOCIATED_BFMEE_SEL		(Offset 0x0714) */</div><div class='del'>-</div><div class='del'>-#define BIT_TXUSER_ID1 BIT(25)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AID1 16</div><div class='del'>-#define BIT_MASK_AID1 0x1ff</div><div class='del'>-#define BIT_AID1(x) (((x) &amp; BIT_MASK_AID1) &lt;&lt; BIT_SHIFT_AID1)</div><div class='del'>-#define BIT_GET_AID1(x) (((x) &gt;&gt; BIT_SHIFT_AID1) &amp; BIT_MASK_AID1)</div><div class='del'>-</div><div class='del'>-#define BIT_TXUSER_ID0 BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AID0 0</div><div class='del'>-#define BIT_MASK_AID0 0x1ff</div><div class='del'>-#define BIT_AID0(x) (((x) &amp; BIT_MASK_AID0) &lt;&lt; BIT_SHIFT_AID0)</div><div class='del'>-#define BIT_GET_AID0(x) (((x) &gt;&gt; BIT_SHIFT_AID0) &amp; BIT_MASK_AID0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SND_PTCL_CTRL			(Offset 0x0718) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NDP_RX_STANDBY_TIMER 24</div><div class='del'>-#define BIT_MASK_NDP_RX_STANDBY_TIMER 0xff</div><div class='del'>-#define BIT_NDP_RX_STANDBY_TIMER(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_NDP_RX_STANDBY_TIMER)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_NDP_RX_STANDBY_TIMER)</div><div class='del'>-#define BIT_GET_NDP_RX_STANDBY_TIMER(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NDP_RX_STANDBY_TIMER) &amp;                             \</div><div class='del'>-	 BIT_MASK_NDP_RX_STANDBY_TIMER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CSI_RPT_OFFSET_HT 16</div><div class='del'>-#define BIT_MASK_CSI_RPT_OFFSET_HT 0xff</div><div class='del'>-#define BIT_CSI_RPT_OFFSET_HT(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_CSI_RPT_OFFSET_HT) &lt;&lt; BIT_SHIFT_CSI_RPT_OFFSET_HT)</div><div class='del'>-#define BIT_GET_CSI_RPT_OFFSET_HT(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CSI_RPT_OFFSET_HT) &amp; BIT_MASK_CSI_RPT_OFFSET_HT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SND_PTCL_CTRL			(Offset 0x0718) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_VHT_CATEGORY 8</div><div class='del'>-#define BIT_MASK_R_WMAC_VHT_CATEGORY 0xff</div><div class='del'>-#define BIT_R_WMAC_VHT_CATEGORY(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_VHT_CATEGORY) &lt;&lt; BIT_SHIFT_R_WMAC_VHT_CATEGORY)</div><div class='del'>-#define BIT_GET_R_WMAC_VHT_CATEGORY(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_VHT_CATEGORY) &amp; BIT_MASK_R_WMAC_VHT_CATEGORY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SND_PTCL_CTRL			(Offset 0x0718) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_USE_NSTS BIT(7)</div><div class='del'>-#define BIT_R_DISABLE_CHECK_VHTSIGB_CRC BIT(6)</div><div class='del'>-#define BIT_R_DISABLE_CHECK_VHTSIGA_CRC BIT(5)</div><div class='del'>-#define BIT_R_WMAC_BFPARAM_SEL BIT(4)</div><div class='del'>-#define BIT_R_WMAC_CSISEQ_SEL BIT(3)</div><div class='del'>-#define BIT_R_WMAC_CSI_WITHHTC_EN BIT(2)</div><div class='del'>-#define BIT_R_WMAC_HT_NDPA_EN BIT(1)</div><div class='del'>-#define BIT_R_WMAC_VHT_NDPA_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NS_ARP_CTRL				(Offset 0x0720) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_NSARP_RSPEN BIT(15)</div><div class='del'>-#define BIT_R_WMAC_NSARP_RARP BIT(9)</div><div class='del'>-#define BIT_R_WMAC_NSARP_RIPV6 BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_NSARP_MODEN 6</div><div class='del'>-#define BIT_MASK_R_WMAC_NSARP_MODEN 0x3</div><div class='del'>-#define BIT_R_WMAC_NSARP_MODEN(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_NSARP_MODEN) &lt;&lt; BIT_SHIFT_R_WMAC_NSARP_MODEN)</div><div class='del'>-#define BIT_GET_R_WMAC_NSARP_MODEN(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_NSARP_MODEN) &amp; BIT_MASK_R_WMAC_NSARP_MODEN)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_NSARP_RSPFTP 4</div><div class='del'>-#define BIT_MASK_R_WMAC_NSARP_RSPFTP 0x3</div><div class='del'>-#define BIT_R_WMAC_NSARP_RSPFTP(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_NSARP_RSPFTP) &lt;&lt; BIT_SHIFT_R_WMAC_NSARP_RSPFTP)</div><div class='del'>-#define BIT_GET_R_WMAC_NSARP_RSPFTP(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_NSARP_RSPFTP) &amp; BIT_MASK_R_WMAC_NSARP_RSPFTP)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_NSARP_RSPSEC 0</div><div class='del'>-#define BIT_MASK_R_WMAC_NSARP_RSPSEC 0xf</div><div class='del'>-#define BIT_R_WMAC_NSARP_RSPSEC(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_NSARP_RSPSEC) &lt;&lt; BIT_SHIFT_R_WMAC_NSARP_RSPSEC)</div><div class='del'>-#define BIT_GET_R_WMAC_NSARP_RSPSEC(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_NSARP_RSPSEC) &amp; BIT_MASK_R_WMAC_NSARP_RSPSEC)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NS_ARP_INFO				(Offset 0x0724) */</div><div class='del'>-</div><div class='del'>-#define BIT_REQ_IS_MCNS BIT(23)</div><div class='del'>-#define BIT_REQ_IS_UCNS BIT(22)</div><div class='del'>-#define BIT_REQ_IS_USNS BIT(21)</div><div class='del'>-#define BIT_REQ_IS_ARP BIT(20)</div><div class='del'>-#define BIT_EXPRSP_MH_WITHQC BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXPRSP_SECTYPE 16</div><div class='del'>-#define BIT_MASK_EXPRSP_SECTYPE 0x7</div><div class='del'>-#define BIT_EXPRSP_SECTYPE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXPRSP_SECTYPE) &lt;&lt; BIT_SHIFT_EXPRSP_SECTYPE)</div><div class='del'>-#define BIT_GET_EXPRSP_SECTYPE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXPRSP_SECTYPE) &amp; BIT_MASK_EXPRSP_SECTYPE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXPRSP_CHKSM_7_TO_0 8</div><div class='del'>-#define BIT_MASK_EXPRSP_CHKSM_7_TO_0 0xff</div><div class='del'>-#define BIT_EXPRSP_CHKSM_7_TO_0(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXPRSP_CHKSM_7_TO_0) &lt;&lt; BIT_SHIFT_EXPRSP_CHKSM_7_TO_0)</div><div class='del'>-#define BIT_GET_EXPRSP_CHKSM_7_TO_0(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXPRSP_CHKSM_7_TO_0) &amp; BIT_MASK_EXPRSP_CHKSM_7_TO_0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXPRSP_CHKSM_15_TO_8 0</div><div class='del'>-#define BIT_MASK_EXPRSP_CHKSM_15_TO_8 0xff</div><div class='del'>-#define BIT_EXPRSP_CHKSM_15_TO_8(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXPRSP_CHKSM_15_TO_8)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EXPRSP_CHKSM_15_TO_8)</div><div class='del'>-#define BIT_GET_EXPRSP_CHKSM_15_TO_8(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXPRSP_CHKSM_15_TO_8) &amp;                             \</div><div class='del'>-	 BIT_MASK_EXPRSP_CHKSM_15_TO_8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEAMFORMING_INFO_NSARP_V1		(Offset 0x0728) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ARPIP 0</div><div class='del'>-#define BIT_MASK_WMAC_ARPIP 0xffffffffL</div><div class='del'>-#define BIT_WMAC_ARPIP(x) (((x) &amp; BIT_MASK_WMAC_ARPIP) &lt;&lt; BIT_SHIFT_WMAC_ARPIP)</div><div class='del'>-#define BIT_GET_WMAC_ARPIP(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ARPIP) &amp; BIT_MASK_WMAC_ARPIP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEAMFORMING_INFO_NSARP		(Offset 0x072C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEAMFORMING_INFO 0</div><div class='del'>-#define BIT_MASK_BEAMFORMING_INFO 0xffffffffL</div><div class='del'>-#define BIT_BEAMFORMING_INFO(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEAMFORMING_INFO) &lt;&lt; BIT_SHIFT_BEAMFORMING_INFO)</div><div class='del'>-#define BIT_GET_BEAMFORMING_INFO(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEAMFORMING_INFO) &amp; BIT_MASK_BEAMFORMING_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_RTX_CTX_SUBTYPE_CFG		(Offset 0x0750) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_CTX_SUBTYPE 4</div><div class='del'>-#define BIT_MASK_R_WMAC_CTX_SUBTYPE 0xf</div><div class='del'>-#define BIT_R_WMAC_CTX_SUBTYPE(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_CTX_SUBTYPE) &lt;&lt; BIT_SHIFT_R_WMAC_CTX_SUBTYPE)</div><div class='del'>-#define BIT_GET_R_WMAC_CTX_SUBTYPE(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_CTX_SUBTYPE) &amp; BIT_MASK_R_WMAC_CTX_SUBTYPE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RTX_SUBTYPE 0</div><div class='del'>-#define BIT_MASK_R_WMAC_RTX_SUBTYPE 0xf</div><div class='del'>-#define BIT_R_WMAC_RTX_SUBTYPE(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RTX_SUBTYPE) &lt;&lt; BIT_SHIFT_R_WMAC_RTX_SUBTYPE)</div><div class='del'>-#define BIT_GET_R_WMAC_RTX_SUBTYPE(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RTX_SUBTYPE) &amp; BIT_MASK_R_WMAC_RTX_SUBTYPE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_V2				(Offset 0x0762) */</div><div class='del'>-</div><div class='del'>-#define BIT_GNT_BT_POLARITY BIT(12)</div><div class='del'>-#define BIT_GNT_BT_BYPASS_PRIORITY BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TIMER 0</div><div class='del'>-#define BIT_MASK_TIMER 0xff</div><div class='del'>-#define BIT_TIMER(x) (((x) &amp; BIT_MASK_TIMER) &lt;&lt; BIT_SHIFT_TIMER)</div><div class='del'>-#define BIT_GET_TIMER(x) (((x) &gt;&gt; BIT_SHIFT_TIMER) &amp; BIT_MASK_TIMER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX				(Offset 0x0764) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_GNT_BT_RFC_SW BIT(12)</div><div class='del'>-#define BIT_R_GNT_BT_RFC_SW_EN BIT(11)</div><div class='del'>-#define BIT_R_GNT_BT_BB_SW BIT(10)</div><div class='del'>-#define BIT_R_GNT_BT_BB_SW_EN BIT(9)</div><div class='del'>-#define BIT_R_BT_CNT_THREN BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_BT_CNT_THR 0</div><div class='del'>-#define BIT_MASK_R_BT_CNT_THR 0xff</div><div class='del'>-#define BIT_R_BT_CNT_THR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_BT_CNT_THR) &lt;&lt; BIT_SHIFT_R_BT_CNT_THR)</div><div class='del'>-#define BIT_GET_R_BT_CNT_THR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_BT_CNT_THR) &amp; BIT_MASK_R_BT_CNT_THR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLAN_ACT_MASK_CTRL			(Offset 0x0768) */</div><div class='del'>-</div><div class='del'>-#define BIT_WLRX_TER_BY_CTL BIT(43)</div><div class='del'>-#define BIT_WLRX_TER_BY_AD BIT(42)</div><div class='del'>-#define BIT_ANT_DIVERSITY_SEL BIT(41)</div><div class='del'>-#define BIT_ANTSEL_FOR_BT_CTRL_EN BIT(40)</div><div class='del'>-#define BIT_WLACT_LOW_GNTWL_EN BIT(34)</div><div class='del'>-#define BIT_WLACT_HIGH_GNTBT_EN BIT(33)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLAN_ACT_MASK_CTRL			(Offset 0x0768) */</div><div class='del'>-</div><div class='del'>-#define BIT_NAV_UPPER_V1 BIT(32)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLAN_ACT_MASK_CTRL			(Offset 0x0768) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXMYRTS_NAV_V1 8</div><div class='del'>-#define BIT_MASK_RXMYRTS_NAV_V1 0xff</div><div class='del'>-#define BIT_RXMYRTS_NAV_V1(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXMYRTS_NAV_V1) &lt;&lt; BIT_SHIFT_RXMYRTS_NAV_V1)</div><div class='del'>-#define BIT_GET_RXMYRTS_NAV_V1(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXMYRTS_NAV_V1) &amp; BIT_MASK_RXMYRTS_NAV_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTSRST_V1 0</div><div class='del'>-#define BIT_MASK_RTSRST_V1 0xff</div><div class='del'>-#define BIT_RTSRST_V1(x) (((x) &amp; BIT_MASK_RTSRST_V1) &lt;&lt; BIT_SHIFT_RTSRST_V1)</div><div class='del'>-#define BIT_GET_RTSRST_V1(x) (((x) &gt;&gt; BIT_SHIFT_RTSRST_V1) &amp; BIT_MASK_RTSRST_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_ENHANCED_INTR_CTRL		(Offset 0x076E) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_STAT_DELAY 12</div><div class='del'>-#define BIT_MASK_BT_STAT_DELAY 0xf</div><div class='del'>-#define BIT_BT_STAT_DELAY(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_STAT_DELAY) &lt;&lt; BIT_SHIFT_BT_STAT_DELAY)</div><div class='del'>-#define BIT_GET_BT_STAT_DELAY(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_STAT_DELAY) &amp; BIT_MASK_BT_STAT_DELAY)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_TRX_INIT_DETECT 8</div><div class='del'>-#define BIT_MASK_BT_TRX_INIT_DETECT 0xf</div><div class='del'>-#define BIT_BT_TRX_INIT_DETECT(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_TRX_INIT_DETECT) &lt;&lt; BIT_SHIFT_BT_TRX_INIT_DETECT)</div><div class='del'>-#define BIT_GET_BT_TRX_INIT_DETECT(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_TRX_INIT_DETECT) &amp; BIT_MASK_BT_TRX_INIT_DETECT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_PRI_DETECT_TO 4</div><div class='del'>-#define BIT_MASK_BT_PRI_DETECT_TO 0xf</div><div class='del'>-#define BIT_BT_PRI_DETECT_TO(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_PRI_DETECT_TO) &lt;&lt; BIT_SHIFT_BT_PRI_DETECT_TO)</div><div class='del'>-#define BIT_GET_BT_PRI_DETECT_TO(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_PRI_DETECT_TO) &amp; BIT_MASK_BT_PRI_DETECT_TO)</div><div class='del'>-</div><div class='del'>-#define BIT_R_GRANTALL_WLMASK BIT(3)</div><div class='del'>-#define BIT_STATIS_BT_EN BIT(2)</div><div class='del'>-#define BIT_WL_ACT_MASK_ENABLE BIT(1)</div><div class='del'>-#define BIT_ENHANCED_BT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ACT_STATISTICS			(Offset 0x0770) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_LO_RX (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_STATIS_BT_LO_RX 0xffff</div><div class='del'>-#define BIT_STATIS_BT_LO_RX(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_LO_RX) &lt;&lt; BIT_SHIFT_STATIS_BT_LO_RX)</div><div class='del'>-#define BIT_GET_STATIS_BT_LO_RX(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_LO_RX) &amp; BIT_MASK_STATIS_BT_LO_RX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_LO_TX (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_STATIS_BT_LO_TX 0xffff</div><div class='del'>-#define BIT_STATIS_BT_LO_TX(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_LO_TX) &lt;&lt; BIT_SHIFT_STATIS_BT_LO_TX)</div><div class='del'>-#define BIT_GET_STATIS_BT_LO_TX(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_LO_TX) &amp; BIT_MASK_STATIS_BT_LO_TX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ACT_STATISTICS			(Offset 0x0770) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_HI_RX 16</div><div class='del'>-#define BIT_MASK_STATIS_BT_HI_RX 0xffff</div><div class='del'>-#define BIT_STATIS_BT_HI_RX(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_HI_RX) &lt;&lt; BIT_SHIFT_STATIS_BT_HI_RX)</div><div class='del'>-#define BIT_GET_STATIS_BT_HI_RX(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_HI_RX) &amp; BIT_MASK_STATIS_BT_HI_RX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_HI_TX 0</div><div class='del'>-#define BIT_MASK_STATIS_BT_HI_TX 0xffff</div><div class='del'>-#define BIT_STATIS_BT_HI_TX(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_HI_TX) &lt;&lt; BIT_SHIFT_STATIS_BT_HI_TX)</div><div class='del'>-#define BIT_GET_STATIS_BT_HI_TX(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_HI_TX) &amp; BIT_MASK_STATIS_BT_HI_TX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_STATISTICS_CONTROL_REGISTER	(Offset 0x0778) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_BT_CMD_RPT 16</div><div class='del'>-#define BIT_MASK_R_BT_CMD_RPT 0xffff</div><div class='del'>-#define BIT_R_BT_CMD_RPT(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_BT_CMD_RPT) &lt;&lt; BIT_SHIFT_R_BT_CMD_RPT)</div><div class='del'>-#define BIT_GET_R_BT_CMD_RPT(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_BT_CMD_RPT) &amp; BIT_MASK_R_BT_CMD_RPT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_RPT_FROM_BT 8</div><div class='del'>-#define BIT_MASK_R_RPT_FROM_BT 0xff</div><div class='del'>-#define BIT_R_RPT_FROM_BT(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_RPT_FROM_BT) &lt;&lt; BIT_SHIFT_R_RPT_FROM_BT)</div><div class='del'>-#define BIT_GET_R_RPT_FROM_BT(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_RPT_FROM_BT) &amp; BIT_MASK_R_RPT_FROM_BT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_HID_ISR_SET 6</div><div class='del'>-#define BIT_MASK_BT_HID_ISR_SET 0x3</div><div class='del'>-#define BIT_BT_HID_ISR_SET(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_HID_ISR_SET) &lt;&lt; BIT_SHIFT_BT_HID_ISR_SET)</div><div class='del'>-#define BIT_GET_BT_HID_ISR_SET(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_HID_ISR_SET) &amp; BIT_MASK_BT_HID_ISR_SET)</div><div class='del'>-</div><div class='del'>-#define BIT_TDMA_BT_START_NOTIFY BIT(5)</div><div class='del'>-#define BIT_ENABLE_TDMA_FW_MODE BIT(4)</div><div class='del'>-#define BIT_ENABLE_PTA_TDMA_MODE BIT(3)</div><div class='del'>-#define BIT_ENABLE_COEXIST_TAB_IN_TDMA BIT(2)</div><div class='del'>-#define BIT_GPIO2_GPIO3_EXANGE_OR_NO_BT_CCA BIT(1)</div><div class='del'>-#define BIT_RTK_BT_ENABLE BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_STATUS_REPORT_REGISTER		(Offset 0x077C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_PROFILE 24</div><div class='del'>-#define BIT_MASK_BT_PROFILE 0xff</div><div class='del'>-#define BIT_BT_PROFILE(x) (((x) &amp; BIT_MASK_BT_PROFILE) &lt;&lt; BIT_SHIFT_BT_PROFILE)</div><div class='del'>-#define BIT_GET_BT_PROFILE(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_PROFILE) &amp; BIT_MASK_BT_PROFILE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_POWER 16</div><div class='del'>-#define BIT_MASK_BT_POWER 0xff</div><div class='del'>-#define BIT_BT_POWER(x) (((x) &amp; BIT_MASK_BT_POWER) &lt;&lt; BIT_SHIFT_BT_POWER)</div><div class='del'>-#define BIT_GET_BT_POWER(x) (((x) &gt;&gt; BIT_SHIFT_BT_POWER) &amp; BIT_MASK_BT_POWER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_PREDECT_STATUS 8</div><div class='del'>-#define BIT_MASK_BT_PREDECT_STATUS 0xff</div><div class='del'>-#define BIT_BT_PREDECT_STATUS(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_PREDECT_STATUS) &lt;&lt; BIT_SHIFT_BT_PREDECT_STATUS)</div><div class='del'>-#define BIT_GET_BT_PREDECT_STATUS(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_PREDECT_STATUS) &amp; BIT_MASK_BT_PREDECT_STATUS)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_CMD_INFO 0</div><div class='del'>-#define BIT_MASK_BT_CMD_INFO 0xff</div><div class='del'>-#define BIT_BT_CMD_INFO(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_CMD_INFO) &lt;&lt; BIT_SHIFT_BT_CMD_INFO)</div><div class='del'>-#define BIT_GET_BT_CMD_INFO(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_CMD_INFO) &amp; BIT_MASK_BT_CMD_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_INTERRUPT_CONTROL_REGISTER	(Offset 0x0780) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_MAC_NULL_PKT_NOTIFY BIT(31)</div><div class='del'>-#define BIT_EN_WLAN_RPT_AND_BT_QUERY BIT(30)</div><div class='del'>-#define BIT_EN_BT_STSTUS_RPT BIT(29)</div><div class='del'>-#define BIT_EN_BT_POWER BIT(28)</div><div class='del'>-#define BIT_EN_BT_CHANNEL BIT(27)</div><div class='del'>-#define BIT_EN_BT_SLOT_CHANGE BIT(26)</div><div class='del'>-#define BIT_EN_BT_PROFILE_OR_HID BIT(25)</div><div class='del'>-#define BIT_WLAN_RPT_NOTIFY BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLAN_RPT_DATA 16</div><div class='del'>-#define BIT_MASK_WLAN_RPT_DATA 0xff</div><div class='del'>-#define BIT_WLAN_RPT_DATA(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLAN_RPT_DATA) &lt;&lt; BIT_SHIFT_WLAN_RPT_DATA)</div><div class='del'>-#define BIT_GET_WLAN_RPT_DATA(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLAN_RPT_DATA) &amp; BIT_MASK_WLAN_RPT_DATA)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMD_ID 8</div><div class='del'>-#define BIT_MASK_CMD_ID 0xff</div><div class='del'>-#define BIT_CMD_ID(x) (((x) &amp; BIT_MASK_CMD_ID) &lt;&lt; BIT_SHIFT_CMD_ID)</div><div class='del'>-#define BIT_GET_CMD_ID(x) (((x) &gt;&gt; BIT_SHIFT_CMD_ID) &amp; BIT_MASK_CMD_ID)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_DATA 0</div><div class='del'>-#define BIT_MASK_BT_DATA 0xff</div><div class='del'>-#define BIT_BT_DATA(x) (((x) &amp; BIT_MASK_BT_DATA) &lt;&lt; BIT_SHIFT_BT_DATA)</div><div class='del'>-#define BIT_GET_BT_DATA(x) (((x) &gt;&gt; BIT_SHIFT_BT_DATA) &amp; BIT_MASK_BT_DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLAN_REPORT_TIME_OUT_CONTROL_REGISTER (Offset 0x0784) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLAN_RPT_TO 0</div><div class='del'>-#define BIT_MASK_WLAN_RPT_TO 0xff</div><div class='del'>-#define BIT_WLAN_RPT_TO(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLAN_RPT_TO) &lt;&lt; BIT_SHIFT_WLAN_RPT_TO)</div><div class='del'>-#define BIT_GET_WLAN_RPT_TO(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLAN_RPT_TO) &amp; BIT_MASK_WLAN_RPT_TO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ISOLATION_TABLE_REGISTER_REGISTER (Offset 0x0785) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ISOLATION_CHK 1</div><div class='del'>-#define BIT_MASK_ISOLATION_CHK 0x7fffffffffffffffffffL</div><div class='del'>-#define BIT_ISOLATION_CHK(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_ISOLATION_CHK) &lt;&lt; BIT_SHIFT_ISOLATION_CHK)</div><div class='del'>-#define BIT_GET_ISOLATION_CHK(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ISOLATION_CHK) &amp; BIT_MASK_ISOLATION_CHK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ISOLATION_TABLE_REGISTER_REGISTER (Offset 0x0785) */</div><div class='del'>-</div><div class='del'>-#define BIT_ISOLATION_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_INTERRUPT_STATUS_REGISTER	(Offset 0x078F) */</div><div class='del'>-</div><div class='del'>-#define BIT_BT_HID_ISR BIT(7)</div><div class='del'>-#define BIT_BT_QUERY_ISR BIT(6)</div><div class='del'>-#define BIT_MAC_NULL_PKT_NOTIFY_ISR BIT(5)</div><div class='del'>-#define BIT_WLAN_RPT_ISR BIT(4)</div><div class='del'>-#define BIT_BT_POWER_ISR BIT(3)</div><div class='del'>-#define BIT_BT_CHANNEL_ISR BIT(2)</div><div class='del'>-#define BIT_BT_SLOT_CHANGE_ISR BIT(1)</div><div class='del'>-#define BIT_BT_PROFILE_ISR BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_TDMA_TIME_REGISTER		(Offset 0x0790) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_TIME 6</div><div class='del'>-#define BIT_MASK_BT_TIME 0x3ffffff</div><div class='del'>-#define BIT_BT_TIME(x) (((x) &amp; BIT_MASK_BT_TIME) &lt;&lt; BIT_SHIFT_BT_TIME)</div><div class='del'>-#define BIT_GET_BT_TIME(x) (((x) &gt;&gt; BIT_SHIFT_BT_TIME) &amp; BIT_MASK_BT_TIME)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_RPT_SAMPLE_RATE 0</div><div class='del'>-#define BIT_MASK_BT_RPT_SAMPLE_RATE 0x3f</div><div class='del'>-#define BIT_BT_RPT_SAMPLE_RATE(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_RPT_SAMPLE_RATE) &lt;&lt; BIT_SHIFT_BT_RPT_SAMPLE_RATE)</div><div class='del'>-#define BIT_GET_BT_RPT_SAMPLE_RATE(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_RPT_SAMPLE_RATE) &amp; BIT_MASK_BT_RPT_SAMPLE_RATE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ACT_REGISTER			(Offset 0x0794) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_EISR_EN 16</div><div class='del'>-#define BIT_MASK_BT_EISR_EN 0xff</div><div class='del'>-#define BIT_BT_EISR_EN(x) (((x) &amp; BIT_MASK_BT_EISR_EN) &lt;&lt; BIT_SHIFT_BT_EISR_EN)</div><div class='del'>-#define BIT_GET_BT_EISR_EN(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_EISR_EN) &amp; BIT_MASK_BT_EISR_EN)</div><div class='del'>-</div><div class='del'>-#define BIT_BT_ACT_FALLING_ISR BIT(10)</div><div class='del'>-#define BIT_BT_ACT_RISING_ISR BIT(9)</div><div class='del'>-#define BIT_TDMA_TO_ISR BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_CH 0</div><div class='del'>-#define BIT_MASK_BT_CH 0xff</div><div class='del'>-#define BIT_BT_CH(x) (((x) &amp; BIT_MASK_BT_CH) &lt;&lt; BIT_SHIFT_BT_CH)</div><div class='del'>-#define BIT_GET_BT_CH(x) (((x) &gt;&gt; BIT_SHIFT_BT_CH) &amp; BIT_MASK_BT_CH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OBFF_CTRL_BASIC			(Offset 0x0798) */</div><div class='del'>-</div><div class='del'>-#define BIT_OBFF_EN_V1 BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OBFF_STATE_V1 28</div><div class='del'>-#define BIT_MASK_OBFF_STATE_V1 0x3</div><div class='del'>-#define BIT_OBFF_STATE_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_OBFF_STATE_V1) &lt;&lt; BIT_SHIFT_OBFF_STATE_V1)</div><div class='del'>-#define BIT_GET_OBFF_STATE_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OBFF_STATE_V1) &amp; BIT_MASK_OBFF_STATE_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_OBFF_ACT_RXDMA_EN BIT(27)</div><div class='del'>-#define BIT_OBFF_BLOCK_INT_EN BIT(26)</div><div class='del'>-#define BIT_OBFF_AUTOACT_EN BIT(25)</div><div class='del'>-#define BIT_OBFF_AUTOIDLE_EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MAX_PLS 20</div><div class='del'>-#define BIT_MASK_WAKE_MAX_PLS 0x7</div><div class='del'>-#define BIT_WAKE_MAX_PLS(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MAX_PLS) &lt;&lt; BIT_SHIFT_WAKE_MAX_PLS)</div><div class='del'>-#define BIT_GET_WAKE_MAX_PLS(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MAX_PLS) &amp; BIT_MASK_WAKE_MAX_PLS)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MIN_PLS 16</div><div class='del'>-#define BIT_MASK_WAKE_MIN_PLS 0x7</div><div class='del'>-#define BIT_WAKE_MIN_PLS(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MIN_PLS) &lt;&lt; BIT_SHIFT_WAKE_MIN_PLS)</div><div class='del'>-#define BIT_GET_WAKE_MIN_PLS(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MIN_PLS) &amp; BIT_MASK_WAKE_MIN_PLS)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MAX_F2F 12</div><div class='del'>-#define BIT_MASK_WAKE_MAX_F2F 0x7</div><div class='del'>-#define BIT_WAKE_MAX_F2F(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MAX_F2F) &lt;&lt; BIT_SHIFT_WAKE_MAX_F2F)</div><div class='del'>-#define BIT_GET_WAKE_MAX_F2F(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MAX_F2F) &amp; BIT_MASK_WAKE_MAX_F2F)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MIN_F2F 8</div><div class='del'>-#define BIT_MASK_WAKE_MIN_F2F 0x7</div><div class='del'>-#define BIT_WAKE_MIN_F2F(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MIN_F2F) &lt;&lt; BIT_SHIFT_WAKE_MIN_F2F)</div><div class='del'>-#define BIT_GET_WAKE_MIN_F2F(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MIN_F2F) &amp; BIT_MASK_WAKE_MIN_F2F)</div><div class='del'>-</div><div class='del'>-#define BIT_APP_CPU_ACT_V1 BIT(3)</div><div class='del'>-#define BIT_APP_OBFF_V1 BIT(2)</div><div class='del'>-#define BIT_APP_IDLE_V1 BIT(1)</div><div class='del'>-#define BIT_APP_INIT_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OBFF_CTRL2_TIMER			(Offset 0x079C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_HIGH_TIMER_IDX 24</div><div class='del'>-#define BIT_MASK_RX_HIGH_TIMER_IDX 0x7</div><div class='del'>-#define BIT_RX_HIGH_TIMER_IDX(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_HIGH_TIMER_IDX) &lt;&lt; BIT_SHIFT_RX_HIGH_TIMER_IDX)</div><div class='del'>-#define BIT_GET_RX_HIGH_TIMER_IDX(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_HIGH_TIMER_IDX) &amp; BIT_MASK_RX_HIGH_TIMER_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_MED_TIMER_IDX 16</div><div class='del'>-#define BIT_MASK_RX_MED_TIMER_IDX 0x7</div><div class='del'>-#define BIT_RX_MED_TIMER_IDX(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_MED_TIMER_IDX) &lt;&lt; BIT_SHIFT_RX_MED_TIMER_IDX)</div><div class='del'>-#define BIT_GET_RX_MED_TIMER_IDX(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_MED_TIMER_IDX) &amp; BIT_MASK_RX_MED_TIMER_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_LOW_TIMER_IDX 8</div><div class='del'>-#define BIT_MASK_RX_LOW_TIMER_IDX 0x7</div><div class='del'>-#define BIT_RX_LOW_TIMER_IDX(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_LOW_TIMER_IDX) &lt;&lt; BIT_SHIFT_RX_LOW_TIMER_IDX)</div><div class='del'>-#define BIT_GET_RX_LOW_TIMER_IDX(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_LOW_TIMER_IDX) &amp; BIT_MASK_RX_LOW_TIMER_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OBFF_INT_TIMER_IDX 0</div><div class='del'>-#define BIT_MASK_OBFF_INT_TIMER_IDX 0x7</div><div class='del'>-#define BIT_OBFF_INT_TIMER_IDX(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_OBFF_INT_TIMER_IDX) &lt;&lt; BIT_SHIFT_OBFF_INT_TIMER_IDX)</div><div class='del'>-#define BIT_GET_OBFF_INT_TIMER_IDX(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OBFF_INT_TIMER_IDX) &amp; BIT_MASK_OBFF_INT_TIMER_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_CTRL_BASIC			(Offset 0x07A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_LTR_EN_V1 BIT(31)</div><div class='del'>-#define BIT_LTR_HW_EN_V1 BIT(30)</div><div class='del'>-#define BIT_LRT_ACT_CTS_EN BIT(29)</div><div class='del'>-#define BIT_LTR_ACT_RXPKT_EN BIT(28)</div><div class='del'>-#define BIT_LTR_ACT_RXDMA_EN BIT(27)</div><div class='del'>-#define BIT_LTR_IDLE_NO_SNOOP BIT(26)</div><div class='del'>-#define BIT_SPDUP_MGTPKT BIT(25)</div><div class='del'>-#define BIT_RX_AGG_EN BIT(24)</div><div class='del'>-#define BIT_APP_LTR_ACT BIT(23)</div><div class='del'>-#define BIT_APP_LTR_IDLE BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIGH_RATE_TRIG_SEL 20</div><div class='del'>-#define BIT_MASK_HIGH_RATE_TRIG_SEL 0x3</div><div class='del'>-#define BIT_HIGH_RATE_TRIG_SEL(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIGH_RATE_TRIG_SEL) &lt;&lt; BIT_SHIFT_HIGH_RATE_TRIG_SEL)</div><div class='del'>-#define BIT_GET_HIGH_RATE_TRIG_SEL(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIGH_RATE_TRIG_SEL) &amp; BIT_MASK_HIGH_RATE_TRIG_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MED_RATE_TRIG_SEL 18</div><div class='del'>-#define BIT_MASK_MED_RATE_TRIG_SEL 0x3</div><div class='del'>-#define BIT_MED_RATE_TRIG_SEL(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MED_RATE_TRIG_SEL) &lt;&lt; BIT_SHIFT_MED_RATE_TRIG_SEL)</div><div class='del'>-#define BIT_GET_MED_RATE_TRIG_SEL(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MED_RATE_TRIG_SEL) &amp; BIT_MASK_MED_RATE_TRIG_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LOW_RATE_TRIG_SEL 16</div><div class='del'>-#define BIT_MASK_LOW_RATE_TRIG_SEL 0x3</div><div class='del'>-#define BIT_LOW_RATE_TRIG_SEL(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_LOW_RATE_TRIG_SEL) &lt;&lt; BIT_SHIFT_LOW_RATE_TRIG_SEL)</div><div class='del'>-#define BIT_GET_LOW_RATE_TRIG_SEL(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LOW_RATE_TRIG_SEL) &amp; BIT_MASK_LOW_RATE_TRIG_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIGH_RATE_BD_IDX 8</div><div class='del'>-#define BIT_MASK_HIGH_RATE_BD_IDX 0x7f</div><div class='del'>-#define BIT_HIGH_RATE_BD_IDX(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIGH_RATE_BD_IDX) &lt;&lt; BIT_SHIFT_HIGH_RATE_BD_IDX)</div><div class='del'>-#define BIT_GET_HIGH_RATE_BD_IDX(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIGH_RATE_BD_IDX) &amp; BIT_MASK_HIGH_RATE_BD_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LOW_RATE_BD_IDX 0</div><div class='del'>-#define BIT_MASK_LOW_RATE_BD_IDX 0x7f</div><div class='del'>-#define BIT_LOW_RATE_BD_IDX(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_LOW_RATE_BD_IDX) &lt;&lt; BIT_SHIFT_LOW_RATE_BD_IDX)</div><div class='del'>-#define BIT_GET_LOW_RATE_BD_IDX(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LOW_RATE_BD_IDX) &amp; BIT_MASK_LOW_RATE_BD_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_CTRL2_TIMER_THRESHOLD		(Offset 0x07A4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_EMPTY_TIMER_IDX 24</div><div class='del'>-#define BIT_MASK_RX_EMPTY_TIMER_IDX 0x7</div><div class='del'>-#define BIT_RX_EMPTY_TIMER_IDX(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_EMPTY_TIMER_IDX) &lt;&lt; BIT_SHIFT_RX_EMPTY_TIMER_IDX)</div><div class='del'>-#define BIT_GET_RX_EMPTY_TIMER_IDX(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_EMPTY_TIMER_IDX) &amp; BIT_MASK_RX_EMPTY_TIMER_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_AFULL_TH_IDX 20</div><div class='del'>-#define BIT_MASK_RX_AFULL_TH_IDX 0x7</div><div class='del'>-#define BIT_RX_AFULL_TH_IDX(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_AFULL_TH_IDX) &lt;&lt; BIT_SHIFT_RX_AFULL_TH_IDX)</div><div class='del'>-#define BIT_GET_RX_AFULL_TH_IDX(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_AFULL_TH_IDX) &amp; BIT_MASK_RX_AFULL_TH_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_HIGH_TH_IDX 16</div><div class='del'>-#define BIT_MASK_RX_HIGH_TH_IDX 0x7</div><div class='del'>-#define BIT_RX_HIGH_TH_IDX(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_HIGH_TH_IDX) &lt;&lt; BIT_SHIFT_RX_HIGH_TH_IDX)</div><div class='del'>-#define BIT_GET_RX_HIGH_TH_IDX(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_HIGH_TH_IDX) &amp; BIT_MASK_RX_HIGH_TH_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_MED_TH_IDX 12</div><div class='del'>-#define BIT_MASK_RX_MED_TH_IDX 0x7</div><div class='del'>-#define BIT_RX_MED_TH_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_MED_TH_IDX) &lt;&lt; BIT_SHIFT_RX_MED_TH_IDX)</div><div class='del'>-#define BIT_GET_RX_MED_TH_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_MED_TH_IDX) &amp; BIT_MASK_RX_MED_TH_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_LOW_TH_IDX 8</div><div class='del'>-#define BIT_MASK_RX_LOW_TH_IDX 0x7</div><div class='del'>-#define BIT_RX_LOW_TH_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_LOW_TH_IDX) &lt;&lt; BIT_SHIFT_RX_LOW_TH_IDX)</div><div class='del'>-#define BIT_GET_RX_LOW_TH_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_LOW_TH_IDX) &amp; BIT_MASK_RX_LOW_TH_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_SPACE_IDX 4</div><div class='del'>-#define BIT_MASK_LTR_SPACE_IDX 0x3</div><div class='del'>-#define BIT_LTR_SPACE_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTR_SPACE_IDX) &lt;&lt; BIT_SHIFT_LTR_SPACE_IDX)</div><div class='del'>-#define BIT_GET_LTR_SPACE_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_SPACE_IDX) &amp; BIT_MASK_LTR_SPACE_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_IDLE_TIMER_IDX 0</div><div class='del'>-#define BIT_MASK_LTR_IDLE_TIMER_IDX 0x7</div><div class='del'>-#define BIT_LTR_IDLE_TIMER_IDX(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTR_IDLE_TIMER_IDX) &lt;&lt; BIT_SHIFT_LTR_IDLE_TIMER_IDX)</div><div class='del'>-#define BIT_GET_LTR_IDLE_TIMER_IDX(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_IDLE_TIMER_IDX) &amp; BIT_MASK_LTR_IDLE_TIMER_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_IDLE_LATENCY_V1			(Offset 0x07A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_IDLE_L 0</div><div class='del'>-#define BIT_MASK_LTR_IDLE_L 0xffffffffL</div><div class='del'>-#define BIT_LTR_IDLE_L(x) (((x) &amp; BIT_MASK_LTR_IDLE_L) &lt;&lt; BIT_SHIFT_LTR_IDLE_L)</div><div class='del'>-#define BIT_GET_LTR_IDLE_L(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_IDLE_L) &amp; BIT_MASK_LTR_IDLE_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_ACTIVE_LATENCY_V1		(Offset 0x07AC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_ACT_L 0</div><div class='del'>-#define BIT_MASK_LTR_ACT_L 0xffffffffL</div><div class='del'>-#define BIT_LTR_ACT_L(x) (((x) &amp; BIT_MASK_LTR_ACT_L) &lt;&lt; BIT_SHIFT_LTR_ACT_L)</div><div class='del'>-#define BIT_GET_LTR_ACT_L(x) (((x) &gt;&gt; BIT_SHIFT_LTR_ACT_L) &amp; BIT_MASK_LTR_ACT_L)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ANTENNA_TRAINING_CONTROL_REGISTER	(Offset 0x07B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_APPEND_MACID_IN_RESP_EN BIT(50)</div><div class='del'>-#define BIT_ADDR2_MATCH_EN BIT(49)</div><div class='del'>-#define BIT_ANTTRN_EN BIT(48)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRAIN_STA_ADDR 0</div><div class='del'>-#define BIT_MASK_TRAIN_STA_ADDR 0xffffffffffffL</div><div class='del'>-#define BIT_TRAIN_STA_ADDR(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRAIN_STA_ADDR) &lt;&lt; BIT_SHIFT_TRAIN_STA_ADDR)</div><div class='del'>-#define BIT_GET_TRAIN_STA_ADDR(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRAIN_STA_ADDR) &amp; BIT_MASK_TRAIN_STA_ADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PKTCNT_RWD			(Offset 0x07B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTCNT_BSSIDMAP 4</div><div class='del'>-#define BIT_MASK_PKTCNT_BSSIDMAP 0xf</div><div class='del'>-#define BIT_PKTCNT_BSSIDMAP(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTCNT_BSSIDMAP) &lt;&lt; BIT_SHIFT_PKTCNT_BSSIDMAP)</div><div class='del'>-#define BIT_GET_PKTCNT_BSSIDMAP(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTCNT_BSSIDMAP) &amp; BIT_MASK_PKTCNT_BSSIDMAP)</div><div class='del'>-</div><div class='del'>-#define BIT_PKTCNT_CNTRST BIT(1)</div><div class='del'>-#define BIT_PKTCNT_CNTEN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PKTCNT_CTRL			(Offset 0x07BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_PKTCNT_TRST BIT(9)</div><div class='del'>-#define BIT_WMAC_PKTCNT_FEN BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PKTCNT_CFGAD 0</div><div class='del'>-#define BIT_MASK_WMAC_PKTCNT_CFGAD 0xff</div><div class='del'>-#define BIT_WMAC_PKTCNT_CFGAD(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PKTCNT_CFGAD) &lt;&lt; BIT_SHIFT_WMAC_PKTCNT_CFGAD)</div><div class='del'>-#define BIT_GET_WMAC_PKTCNT_CFGAD(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PKTCNT_CFGAD) &amp; BIT_MASK_WMAC_PKTCNT_CFGAD)</div><div class='del'>-</div><div class='del'>-/* 2 REG_IQ_DUMP				(Offset 0x07C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_MATCH_REF_MAC (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_MATCH_REF_MAC 0xffffffffL</div><div class='del'>-#define BIT_R_WMAC_MATCH_REF_MAC(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_MATCH_REF_MAC)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_MATCH_REF_MAC)</div><div class='del'>-#define BIT_GET_R_WMAC_MATCH_REF_MAC(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_MATCH_REF_MAC) &amp;                             \</div><div class='del'>-	 BIT_MASK_R_WMAC_MATCH_REF_MAC)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RX_FIL_LEN (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_RX_FIL_LEN 0xffff</div><div class='del'>-#define BIT_R_WMAC_RX_FIL_LEN(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RX_FIL_LEN) &lt;&lt; BIT_SHIFT_R_WMAC_RX_FIL_LEN)</div><div class='del'>-#define BIT_GET_R_WMAC_RX_FIL_LEN(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RX_FIL_LEN) &amp; BIT_MASK_R_WMAC_RX_FIL_LEN)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RXFIFO_FULL_TH (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_RXFIFO_FULL_TH 0xff</div><div class='del'>-#define BIT_R_WMAC_RXFIFO_FULL_TH(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RXFIFO_FULL_TH)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_RXFIFO_FULL_TH)</div><div class='del'>-#define BIT_GET_R_WMAC_RXFIFO_FULL_TH(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RXFIFO_FULL_TH) &amp;                            \</div><div class='del'>-	 BIT_MASK_R_WMAC_RXFIFO_FULL_TH)</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_TYPE BIT(51)</div><div class='del'>-#define BIT_R_WMAC_NDP_RST BIT(50)</div><div class='del'>-#define BIT_R_WMAC_POWINT_EN BIT(49)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_PERPKT BIT(48)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_MID BIT(47)</div><div class='del'>-#define BIT_R_WMAC_PFIN_TOEN BIT(46)</div><div class='del'>-#define BIT_R_WMAC_FIL_SECERR BIT(45)</div><div class='del'>-#define BIT_R_WMAC_FIL_CTLPKTLEN BIT(44)</div><div class='del'>-#define BIT_R_WMAC_FIL_FCTYPE BIT(43)</div><div class='del'>-#define BIT_R_WMAC_FIL_FCPROVER BIT(42)</div><div class='del'>-#define BIT_R_WMAC_PHYSTS_SNIF BIT(41)</div><div class='del'>-#define BIT_R_WMAC_PHYSTS_PLCP BIT(40)</div><div class='del'>-#define BIT_R_MAC_TCR_VBONF_RD BIT(39)</div><div class='del'>-#define BIT_R_WMAC_TCR_MPAR_NDP BIT(38)</div><div class='del'>-#define BIT_R_WMAC_NDP_FILTER BIT(37)</div><div class='del'>-#define BIT_R_WMAC_RXLEN_SEL BIT(36)</div><div class='del'>-#define BIT_R_WMAC_RXLEN_SEL1 BIT(35)</div><div class='del'>-#define BIT_R_OFDM_FILTER BIT(34)</div><div class='del'>-#define BIT_R_WMAC_CHK_OFDM_LEN BIT(33)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_MASK_LA_MAC (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_MASK_LA_MAC 0xffffffffL</div><div class='del'>-#define BIT_R_WMAC_MASK_LA_MAC(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_MASK_LA_MAC) &lt;&lt; BIT_SHIFT_R_WMAC_MASK_LA_MAC)</div><div class='del'>-#define BIT_GET_R_WMAC_MASK_LA_MAC(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_MASK_LA_MAC) &amp; BIT_MASK_R_WMAC_MASK_LA_MAC)</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_CHK_CCK_LEN BIT(32)</div><div class='del'>-</div><div class='del'>-/* 2 REG_IQ_DUMP				(Offset 0x07C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_OFDM_LEN 26</div><div class='del'>-#define BIT_MASK_R_OFDM_LEN 0x3f</div><div class='del'>-#define BIT_R_OFDM_LEN(x) (((x) &amp; BIT_MASK_R_OFDM_LEN) &lt;&lt; BIT_SHIFT_R_OFDM_LEN)</div><div class='del'>-#define BIT_GET_R_OFDM_LEN(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_OFDM_LEN) &amp; BIT_MASK_R_OFDM_LEN)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DUMP_OK_ADDR 15</div><div class='del'>-#define BIT_MASK_DUMP_OK_ADDR 0x1ffff</div><div class='del'>-#define BIT_DUMP_OK_ADDR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DUMP_OK_ADDR) &lt;&lt; BIT_SHIFT_DUMP_OK_ADDR)</div><div class='del'>-#define BIT_GET_DUMP_OK_ADDR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DUMP_OK_ADDR) &amp; BIT_MASK_DUMP_OK_ADDR)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TRIG_TIME_SEL 8</div><div class='del'>-#define BIT_MASK_R_TRIG_TIME_SEL 0x7f</div><div class='del'>-#define BIT_R_TRIG_TIME_SEL(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TRIG_TIME_SEL) &lt;&lt; BIT_SHIFT_R_TRIG_TIME_SEL)</div><div class='del'>-#define BIT_GET_R_TRIG_TIME_SEL(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TRIG_TIME_SEL) &amp; BIT_MASK_R_TRIG_TIME_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_TRIG_SEL 6</div><div class='del'>-#define BIT_MASK_R_MAC_TRIG_SEL 0x3</div><div class='del'>-#define BIT_R_MAC_TRIG_SEL(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_TRIG_SEL) &lt;&lt; BIT_SHIFT_R_MAC_TRIG_SEL)</div><div class='del'>-#define BIT_GET_R_MAC_TRIG_SEL(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_TRIG_SEL) &amp; BIT_MASK_R_MAC_TRIG_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_MAC_TRIG_REG BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_LEVEL_PULSE_SEL 3</div><div class='del'>-#define BIT_MASK_R_LEVEL_PULSE_SEL 0x3</div><div class='del'>-#define BIT_R_LEVEL_PULSE_SEL(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_LEVEL_PULSE_SEL) &lt;&lt; BIT_SHIFT_R_LEVEL_PULSE_SEL)</div><div class='del'>-#define BIT_GET_R_LEVEL_PULSE_SEL(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_LEVEL_PULSE_SEL) &amp; BIT_MASK_R_LEVEL_PULSE_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_LA_MAC BIT(2)</div><div class='del'>-#define BIT_R_EN_IQDUMP BIT(1)</div><div class='del'>-#define BIT_R_IQDATA_DUMP BIT(0)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_CCK_LEN 0</div><div class='del'>-#define BIT_MASK_R_CCK_LEN 0xffff</div><div class='del'>-#define BIT_R_CCK_LEN(x) (((x) &amp; BIT_MASK_R_CCK_LEN) &lt;&lt; BIT_SHIFT_R_CCK_LEN)</div><div class='del'>-#define BIT_GET_R_CCK_LEN(x) (((x) &gt;&gt; BIT_SHIFT_R_CCK_LEN) &amp; BIT_MASK_R_CCK_LEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_FTM_CTL			(Offset 0x07CC) */</div><div class='del'>-</div><div class='del'>-#define BIT_RXFTM_TXACK_SC BIT(6)</div><div class='del'>-#define BIT_RXFTM_TXACK_BW BIT(5)</div><div class='del'>-#define BIT_RXFTM_EN BIT(3)</div><div class='del'>-#define BIT_RXFTMREQ_BYDRV BIT(2)</div><div class='del'>-#define BIT_RXFTMREQ_EN BIT(1)</div><div class='del'>-#define BIT_FTM_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_FILTER_FUNCTION			(Offset 0x07DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_MHRDDY_LATCH BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_FILTER_FUNCTION			(Offset 0x07DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_MHRDDY_CLR BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_FILTER_FUNCTION			(Offset 0x07DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_RXPKTCTL_FSM_BASED_MPDURDY1 BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_FILTER_FUNCTION			(Offset 0x07DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_DIS_VHT_PLCP_CHK_MU BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_FILTER_FUNCTION			(Offset 0x07DA) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_CHK_DELIMIT_LEN BIT(10)</div><div class='del'>-#define BIT_R_REAPTER_ADDR_MATCH BIT(9)</div><div class='del'>-#define BIT_R_RXPKTCTL_FSM_BASED_MPDURDY BIT(8)</div><div class='del'>-#define BIT_R_LATCH_MACHRDY BIT(7)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_REND BIT(6)</div><div class='del'>-#define BIT_R_WMAC_MPDURDY_CLR BIT(5)</div><div class='del'>-#define BIT_R_WMAC_CLRRXSEC BIT(4)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_RDEL BIT(3)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_FCSE BIT(2)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_MESH_DEL BIT(1)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_MASKM BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDP_SIG				(Offset 0x07E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_TXNDP_SIGB 0</div><div class='del'>-#define BIT_MASK_R_WMAC_TXNDP_SIGB 0x1fffff</div><div class='del'>-#define BIT_R_WMAC_TXNDP_SIGB(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_TXNDP_SIGB) &lt;&lt; BIT_SHIFT_R_WMAC_TXNDP_SIGB)</div><div class='del'>-#define BIT_GET_R_WMAC_TXNDP_SIGB(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_TXNDP_SIGB) &amp; BIT_MASK_R_WMAC_TXNDP_SIGB)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_INFO_FOR_RSP_PKT		(Offset 0x07E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_DEBUG (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_MAC_DEBUG 0xffffffffL</div><div class='del'>-#define BIT_R_MAC_DEBUG(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_DEBUG) &lt;&lt; BIT_SHIFT_R_MAC_DEBUG)</div><div class='del'>-#define BIT_GET_R_MAC_DEBUG(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_DEBUG) &amp; BIT_MASK_R_MAC_DEBUG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_INFO_FOR_RSP_PKT		(Offset 0x07E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_DBG_SHIFT 8</div><div class='del'>-#define BIT_MASK_R_MAC_DBG_SHIFT 0x7</div><div class='del'>-#define BIT_R_MAC_DBG_SHIFT(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_DBG_SHIFT) &lt;&lt; BIT_SHIFT_R_MAC_DBG_SHIFT)</div><div class='del'>-#define BIT_GET_R_MAC_DBG_SHIFT(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_DBG_SHIFT) &amp; BIT_MASK_R_MAC_DBG_SHIFT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_DBG_SEL 0</div><div class='del'>-#define BIT_MASK_R_MAC_DBG_SEL 0x3</div><div class='del'>-#define BIT_R_MAC_DBG_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_DBG_SEL) &lt;&lt; BIT_SHIFT_R_MAC_DBG_SEL)</div><div class='del'>-#define BIT_GET_R_MAC_DBG_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_DBG_SEL) &amp; BIT_MASK_R_MAC_DBG_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG3				(Offset 0x1000) */</div><div class='del'>-</div><div class='del'>-#define BIT_PWC_MA33V BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG3				(Offset 0x1000) */</div><div class='del'>-</div><div class='del'>-#define BIT_PWC_MA12V BIT(14)</div><div class='del'>-#define BIT_PWC_MD12V BIT(13)</div><div class='del'>-#define BIT_PWC_PD12V BIT(12)</div><div class='del'>-#define BIT_PWC_UD12V BIT(11)</div><div class='del'>-#define BIT_ISO_MA2MD BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG5				(Offset 0x1070) */</div><div class='del'>-</div><div class='del'>-#define BIT_LPS_STATUS BIT(3)</div><div class='del'>-#define BIT_HCI_TXDMA_BUSY BIT(2)</div><div class='del'>-#define BIT_HCI_TXDMA_ALLOW BIT(1)</div><div class='del'>-#define BIT_FW_CTRL_HCI_TXDMA_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_DMEM_CON			(Offset 0x1080) */</div><div class='del'>-</div><div class='del'>-#define BIT_WDT_OPT_IOWRAPPER BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_DMEM_CON			(Offset 0x1080) */</div><div class='del'>-</div><div class='del'>-#define BIT_ANA_PORT_IDLE BIT(18)</div><div class='del'>-#define BIT_MAC_PORT_IDLE BIT(17)</div><div class='del'>-#define BIT_WL_PLATFORM_RST BIT(16)</div><div class='del'>-#define BIT_WL_SECURITY_CLK BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_DMEM_CON			(Offset 0x1080) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPU_DMEM_CON 0</div><div class='del'>-#define BIT_MASK_CPU_DMEM_CON 0xff</div><div class='del'>-#define BIT_CPU_DMEM_CON(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPU_DMEM_CON) &lt;&lt; BIT_SHIFT_CPU_DMEM_CON)</div><div class='del'>-#define BIT_GET_CPU_DMEM_CON(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPU_DMEM_CON) &amp; BIT_MASK_CPU_DMEM_CON)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BOOT_REASON				(Offset 0x1088) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BOOT_REASON 0</div><div class='del'>-#define BIT_MASK_BOOT_REASON 0x7</div><div class='del'>-#define BIT_BOOT_REASON(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BOOT_REASON) &lt;&lt; BIT_SHIFT_BOOT_REASON)</div><div class='del'>-#define BIT_GET_BOOT_REASON(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BOOT_REASON) &amp; BIT_MASK_BOOT_REASON)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NFCPAD_CTRL				(Offset 0x10A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_SHUTDW BIT(18)</div><div class='del'>-#define BIT_SYSON_NFC_PAD BIT(17)</div><div class='del'>-#define BIT_NFC_INT_PAD_CTRL BIT(16)</div><div class='del'>-#define BIT_NFC_RFDIS_PAD_CTRL BIT(15)</div><div class='del'>-#define BIT_NFC_CLK_PAD_CTRL BIT(14)</div><div class='del'>-#define BIT_NFC_DATA_PAD_CTRL BIT(13)</div><div class='del'>-#define BIT_NFC_PAD_PULL_CTRL BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NFCPAD_IO_SEL 8</div><div class='del'>-#define BIT_MASK_NFCPAD_IO_SEL 0xf</div><div class='del'>-#define BIT_NFCPAD_IO_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NFCPAD_IO_SEL) &lt;&lt; BIT_SHIFT_NFCPAD_IO_SEL)</div><div class='del'>-#define BIT_GET_NFCPAD_IO_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NFCPAD_IO_SEL) &amp; BIT_MASK_NFCPAD_IO_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NFCPAD_OUT 4</div><div class='del'>-#define BIT_MASK_NFCPAD_OUT 0xf</div><div class='del'>-#define BIT_NFCPAD_OUT(x) (((x) &amp; BIT_MASK_NFCPAD_OUT) &lt;&lt; BIT_SHIFT_NFCPAD_OUT)</div><div class='del'>-#define BIT_GET_NFCPAD_OUT(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NFCPAD_OUT) &amp; BIT_MASK_NFCPAD_OUT)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NFCPAD_IN 0</div><div class='del'>-#define BIT_MASK_NFCPAD_IN 0xf</div><div class='del'>-#define BIT_NFCPAD_IN(x) (((x) &amp; BIT_MASK_NFCPAD_IN) &lt;&lt; BIT_SHIFT_NFCPAD_IN)</div><div class='del'>-#define BIT_GET_NFCPAD_IN(x) (((x) &gt;&gt; BIT_SHIFT_NFCPAD_IN) &amp; BIT_MASK_NFCPAD_IN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR2				(Offset 0x10B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT_P4_MSK BIT(31)</div><div class='del'>-#define BIT_BCNDMAINT_P3_MSK BIT(30)</div><div class='del'>-#define BIT_BCNDMAINT_P2_MSK BIT(29)</div><div class='del'>-#define BIT_BCNDMAINT_P1_MSK BIT(28)</div><div class='del'>-#define BIT_ATIMEND7_MSK BIT(22)</div><div class='del'>-#define BIT_ATIMEND6_MSK BIT(21)</div><div class='del'>-#define BIT_ATIMEND5_MSK BIT(20)</div><div class='del'>-#define BIT_ATIMEND4_MSK BIT(19)</div><div class='del'>-#define BIT_ATIMEND3_MSK BIT(18)</div><div class='del'>-#define BIT_ATIMEND2_MSK BIT(17)</div><div class='del'>-#define BIT_ATIMEND1_MSK BIT(16)</div><div class='del'>-#define BIT_TXBCN7OK_MSK BIT(14)</div><div class='del'>-#define BIT_TXBCN6OK_MSK BIT(13)</div><div class='del'>-#define BIT_TXBCN5OK_MSK BIT(12)</div><div class='del'>-#define BIT_TXBCN4OK_MSK BIT(11)</div><div class='del'>-#define BIT_TXBCN3OK_MSK BIT(10)</div><div class='del'>-#define BIT_TXBCN2OK_MSK BIT(9)</div><div class='del'>-#define BIT_TXBCN1OK_MSK_V1 BIT(8)</div><div class='del'>-#define BIT_TXBCN7ERR_MSK BIT(6)</div><div class='del'>-#define BIT_TXBCN6ERR_MSK BIT(5)</div><div class='del'>-#define BIT_TXBCN5ERR_MSK BIT(4)</div><div class='del'>-#define BIT_TXBCN4ERR_MSK BIT(3)</div><div class='del'>-#define BIT_TXBCN3ERR_MSK BIT(2)</div><div class='del'>-#define BIT_TXBCN2ERR_MSK BIT(1)</div><div class='del'>-#define BIT_TXBCN1ERR_MSK_V1 BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR2				(Offset 0x10B4) */</div><div class='del'>-</div><div class='del'>-#define BIT_BCNDMAINT_P4 BIT(31)</div><div class='del'>-#define BIT_BCNDMAINT_P3 BIT(30)</div><div class='del'>-#define BIT_BCNDMAINT_P2 BIT(29)</div><div class='del'>-#define BIT_BCNDMAINT_P1 BIT(28)</div><div class='del'>-#define BIT_ATIMEND7 BIT(22)</div><div class='del'>-#define BIT_ATIMEND6 BIT(21)</div><div class='del'>-#define BIT_ATIMEND5 BIT(20)</div><div class='del'>-#define BIT_ATIMEND4 BIT(19)</div><div class='del'>-#define BIT_ATIMEND3 BIT(18)</div><div class='del'>-#define BIT_ATIMEND2 BIT(17)</div><div class='del'>-#define BIT_ATIMEND1 BIT(16)</div><div class='del'>-#define BIT_TXBCN7OK BIT(14)</div><div class='del'>-#define BIT_TXBCN6OK BIT(13)</div><div class='del'>-#define BIT_TXBCN5OK BIT(12)</div><div class='del'>-#define BIT_TXBCN4OK BIT(11)</div><div class='del'>-#define BIT_TXBCN3OK BIT(10)</div><div class='del'>-#define BIT_TXBCN2OK BIT(9)</div><div class='del'>-#define BIT_TXBCN1OK BIT(8)</div><div class='del'>-#define BIT_TXBCN7ERR BIT(6)</div><div class='del'>-#define BIT_TXBCN6ERR BIT(5)</div><div class='del'>-#define BIT_TXBCN5ERR BIT(4)</div><div class='del'>-#define BIT_TXBCN4ERR BIT(3)</div><div class='del'>-#define BIT_TXBCN3ERR BIT(2)</div><div class='del'>-#define BIT_TXBCN2ERR BIT(1)</div><div class='del'>-#define BIT_TXBCN1ERR BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR3				(Offset 0x10B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_WDT_PLATFORM_INT_MSK BIT(18)</div><div class='del'>-#define BIT_WDT_CPU_INT_MSK BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR3				(Offset 0x10B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SETH2CDOK_MASK BIT(16)</div><div class='del'>-#define BIT_H2C_CMD_FULL_MASK BIT(15)</div><div class='del'>-#define BIT_PWR_INT_127_MASK BIT(14)</div><div class='del'>-#define BIT_TXSHORTCUT_TXDESUPDATEOK_MASK BIT(13)</div><div class='del'>-#define BIT_TXSHORTCUT_BKUPDATEOK_MASK BIT(12)</div><div class='del'>-#define BIT_TXSHORTCUT_BEUPDATEOK_MASK BIT(11)</div><div class='del'>-#define BIT_TXSHORTCUT_VIUPDATEOK_MAS BIT(10)</div><div class='del'>-#define BIT_TXSHORTCUT_VOUPDATEOK_MASK BIT(9)</div><div class='del'>-#define BIT_PWR_INT_127_MASK_V1 BIT(8)</div><div class='del'>-#define BIT_PWR_INT_126TO96_MASK BIT(7)</div><div class='del'>-#define BIT_PWR_INT_95TO64_MASK BIT(6)</div><div class='del'>-#define BIT_PWR_INT_63TO32_MASK BIT(5)</div><div class='del'>-#define BIT_PWR_INT_31TO0_MASK BIT(4)</div><div class='del'>-#define BIT_DDMA0_LP_INT_MSK BIT(1)</div><div class='del'>-#define BIT_DDMA0_HP_INT_MSK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR3				(Offset 0x10BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_WDT_PLATFORM_INT BIT(18)</div><div class='del'>-#define BIT_WDT_CPU_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR3				(Offset 0x10BC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SETH2CDOK BIT(16)</div><div class='del'>-#define BIT_H2C_CMD_FULL BIT(15)</div><div class='del'>-#define BIT_PWR_INT_127 BIT(14)</div><div class='del'>-#define BIT_TXSHORTCUT_TXDESUPDATEOK BIT(13)</div><div class='del'>-#define BIT_TXSHORTCUT_BKUPDATEOK BIT(12)</div><div class='del'>-#define BIT_TXSHORTCUT_BEUPDATEOK BIT(11)</div><div class='del'>-#define BIT_TXSHORTCUT_VIUPDATEOK BIT(10)</div><div class='del'>-#define BIT_TXSHORTCUT_VOUPDATEOK BIT(9)</div><div class='del'>-#define BIT_PWR_INT_127_V1 BIT(8)</div><div class='del'>-#define BIT_PWR_INT_126TO96 BIT(7)</div><div class='del'>-#define BIT_PWR_INT_95TO64 BIT(6)</div><div class='del'>-#define BIT_PWR_INT_63TO32 BIT(5)</div><div class='del'>-#define BIT_PWR_INT_31TO0 BIT(4)</div><div class='del'>-#define BIT_DDMA0_LP_INT BIT(1)</div><div class='del'>-#define BIT_DDMA0_HP_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_MDIO				(Offset 0x10C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_TIMEOUT_IO BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_FLUSH				(Offset 0x10C4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FLUSH_HOLDN_EN BIT(25)</div><div class='del'>-#define BIT_FLUSH_WR_EN BIT(24)</div><div class='del'>-#define BIT_SW_FLASH_CONTROL BIT(23)</div><div class='del'>-#define BIT_SW_FLASH_WEN_E BIT(19)</div><div class='del'>-#define BIT_SW_FLASH_HOLDN_E BIT(18)</div><div class='del'>-#define BIT_SW_FLASH_SO_E BIT(17)</div><div class='del'>-#define BIT_SW_FLASH_SI_E BIT(16)</div><div class='del'>-#define BIT_SW_FLASH_SK_O BIT(13)</div><div class='del'>-#define BIT_SW_FLASH_CEN_O BIT(12)</div><div class='del'>-#define BIT_SW_FLASH_WEN_O BIT(11)</div><div class='del'>-#define BIT_SW_FLASH_HOLDN_O BIT(10)</div><div class='del'>-#define BIT_SW_FLASH_SO_O BIT(9)</div><div class='del'>-#define BIT_SW_FLASH_SI_O BIT(8)</div><div class='del'>-#define BIT_SW_FLASH_WEN_I BIT(3)</div><div class='del'>-#define BIT_SW_FLASH_HOLDN_I BIT(2)</div><div class='del'>-#define BIT_SW_FLASH_SO_I BIT(1)</div><div class='del'>-#define BIT_SW_FLASH_SI_I BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_PKT_READADDR			(Offset 0x10D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_PKT_READADDR 0</div><div class='del'>-#define BIT_MASK_H2C_PKT_READADDR 0x3ffff</div><div class='del'>-#define BIT_H2C_PKT_READADDR(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_PKT_READADDR) &lt;&lt; BIT_SHIFT_H2C_PKT_READADDR)</div><div class='del'>-#define BIT_GET_H2C_PKT_READADDR(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_PKT_READADDR) &amp; BIT_MASK_H2C_PKT_READADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_PKT_WRITEADDR			(Offset 0x10D4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_PKT_WRITEADDR 0</div><div class='del'>-#define BIT_MASK_H2C_PKT_WRITEADDR 0x3ffff</div><div class='del'>-#define BIT_H2C_PKT_WRITEADDR(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_PKT_WRITEADDR) &lt;&lt; BIT_SHIFT_H2C_PKT_WRITEADDR)</div><div class='del'>-#define BIT_GET_H2C_PKT_WRITEADDR(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_PKT_WRITEADDR) &amp; BIT_MASK_H2C_PKT_WRITEADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_PWR_CRTL			(Offset 0x10D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_MEM_BB_SD BIT(17)</div><div class='del'>-#define BIT_MEM_BB_DS BIT(16)</div><div class='del'>-#define BIT_MEM_BT_DS BIT(10)</div><div class='del'>-#define BIT_MEM_SDIO_LS BIT(9)</div><div class='del'>-#define BIT_MEM_SDIO_DS BIT(8)</div><div class='del'>-#define BIT_MEM_USB_LS BIT(7)</div><div class='del'>-#define BIT_MEM_USB_DS BIT(6)</div><div class='del'>-#define BIT_MEM_PCI_LS BIT(5)</div><div class='del'>-#define BIT_MEM_PCI_DS BIT(4)</div><div class='del'>-#define BIT_MEM_WLMAC_LS BIT(3)</div><div class='del'>-#define BIT_MEM_WLMAC_DS BIT(2)</div><div class='del'>-#define BIT_MEM_WLMCU_LS BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_PWR_CRTL			(Offset 0x10D8) */</div><div class='del'>-</div><div class='del'>-#define BIT_MEM_WLMCU_DS BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG0				(Offset 0x10E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG0 0</div><div class='del'>-#define BIT_MASK_FW_DBG0 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG0(x) (((x) &amp; BIT_MASK_FW_DBG0) &lt;&lt; BIT_SHIFT_FW_DBG0)</div><div class='del'>-#define BIT_GET_FW_DBG0(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG0) &amp; BIT_MASK_FW_DBG0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG1				(Offset 0x10E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG1 0</div><div class='del'>-#define BIT_MASK_FW_DBG1 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG1(x) (((x) &amp; BIT_MASK_FW_DBG1) &lt;&lt; BIT_SHIFT_FW_DBG1)</div><div class='del'>-#define BIT_GET_FW_DBG1(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG1) &amp; BIT_MASK_FW_DBG1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG2				(Offset 0x10E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG2 0</div><div class='del'>-#define BIT_MASK_FW_DBG2 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG2(x) (((x) &amp; BIT_MASK_FW_DBG2) &lt;&lt; BIT_SHIFT_FW_DBG2)</div><div class='del'>-#define BIT_GET_FW_DBG2(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG2) &amp; BIT_MASK_FW_DBG2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG3				(Offset 0x10EC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG3 0</div><div class='del'>-#define BIT_MASK_FW_DBG3 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG3(x) (((x) &amp; BIT_MASK_FW_DBG3) &lt;&lt; BIT_SHIFT_FW_DBG3)</div><div class='del'>-#define BIT_GET_FW_DBG3(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG3) &amp; BIT_MASK_FW_DBG3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG4				(Offset 0x10F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG4 0</div><div class='del'>-#define BIT_MASK_FW_DBG4 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG4(x) (((x) &amp; BIT_MASK_FW_DBG4) &lt;&lt; BIT_SHIFT_FW_DBG4)</div><div class='del'>-#define BIT_GET_FW_DBG4(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG4) &amp; BIT_MASK_FW_DBG4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG5				(Offset 0x10F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG5 0</div><div class='del'>-#define BIT_MASK_FW_DBG5 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG5(x) (((x) &amp; BIT_MASK_FW_DBG5) &lt;&lt; BIT_SHIFT_FW_DBG5)</div><div class='del'>-#define BIT_GET_FW_DBG5(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG5) &amp; BIT_MASK_FW_DBG5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG6				(Offset 0x10F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG6 0</div><div class='del'>-#define BIT_MASK_FW_DBG6 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG6(x) (((x) &amp; BIT_MASK_FW_DBG6) &lt;&lt; BIT_SHIFT_FW_DBG6)</div><div class='del'>-#define BIT_GET_FW_DBG6(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG6) &amp; BIT_MASK_FW_DBG6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG7				(Offset 0x10FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG7 0</div><div class='del'>-#define BIT_MASK_FW_DBG7 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG7(x) (((x) &amp; BIT_MASK_FW_DBG7) &lt;&lt; BIT_SHIFT_FW_DBG7)</div><div class='del'>-#define BIT_GET_FW_DBG7(x) (((x) &gt;&gt; BIT_SHIFT_FW_DBG7) &amp; BIT_MASK_FW_DBG7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CR_EXT				(Offset 0x1100) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PHY_REQ_DELAY 24</div><div class='del'>-#define BIT_MASK_PHY_REQ_DELAY 0xf</div><div class='del'>-#define BIT_PHY_REQ_DELAY(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PHY_REQ_DELAY) &lt;&lt; BIT_SHIFT_PHY_REQ_DELAY)</div><div class='del'>-#define BIT_GET_PHY_REQ_DELAY(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PHY_REQ_DELAY) &amp; BIT_MASK_PHY_REQ_DELAY)</div><div class='del'>-</div><div class='del'>-#define BIT_SPD_DOWN BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE4 4</div><div class='del'>-#define BIT_MASK_NETYPE4 0x3</div><div class='del'>-#define BIT_NETYPE4(x) (((x) &amp; BIT_MASK_NETYPE4) &lt;&lt; BIT_SHIFT_NETYPE4)</div><div class='del'>-#define BIT_GET_NETYPE4(x) (((x) &gt;&gt; BIT_SHIFT_NETYPE4) &amp; BIT_MASK_NETYPE4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE3 2</div><div class='del'>-#define BIT_MASK_NETYPE3 0x3</div><div class='del'>-#define BIT_NETYPE3(x) (((x) &amp; BIT_MASK_NETYPE3) &lt;&lt; BIT_SHIFT_NETYPE3)</div><div class='del'>-#define BIT_GET_NETYPE3(x) (((x) &gt;&gt; BIT_SHIFT_NETYPE3) &amp; BIT_MASK_NETYPE3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE2 0</div><div class='del'>-#define BIT_MASK_NETYPE2 0x3</div><div class='del'>-#define BIT_NETYPE2(x) (((x) &amp; BIT_MASK_NETYPE2) &lt;&lt; BIT_SHIFT_NETYPE2)</div><div class='del'>-#define BIT_GET_NETYPE2(x) (((x) &gt;&gt; BIT_SHIFT_NETYPE2) &amp; BIT_MASK_NETYPE2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF				(Offset 0x1114) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTNUM_TH_V1 24</div><div class='del'>-#define BIT_MASK_PKTNUM_TH_V1 0xff</div><div class='del'>-#define BIT_PKTNUM_TH_V1(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTNUM_TH_V1) &lt;&lt; BIT_SHIFT_PKTNUM_TH_V1)</div><div class='del'>-#define BIT_GET_PKTNUM_TH_V1(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTNUM_TH_V1) &amp; BIT_MASK_PKTNUM_TH_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF				(Offset 0x1114) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TIMER_TH 16</div><div class='del'>-#define BIT_MASK_TIMER_TH 0xff</div><div class='del'>-#define BIT_TIMER_TH(x) (((x) &amp; BIT_MASK_TIMER_TH) &lt;&lt; BIT_SHIFT_TIMER_TH)</div><div class='del'>-#define BIT_GET_TIMER_TH(x) (((x) &gt;&gt; BIT_SHIFT_TIMER_TH) &amp; BIT_MASK_TIMER_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF				(Offset 0x1114) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT1ENADDR 0</div><div class='del'>-#define BIT_MASK_RXPKT1ENADDR 0xffff</div><div class='del'>-#define BIT_RXPKT1ENADDR(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKT1ENADDR) &lt;&lt; BIT_SHIFT_RXPKT1ENADDR)</div><div class='del'>-#define BIT_GET_RXPKT1ENADDR(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT1ENADDR) &amp; BIT_MASK_RXPKT1ENADDR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2IMR				(Offset 0x1120) */</div><div class='del'>-</div><div class='del'>-#define BIT__FE4ISR__IND_MSK BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2IMR				(Offset 0x1120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXSC_DESC_DONE_INT_EN BIT(28)</div><div class='del'>-#define BIT_FS_TXSC_BKDONE_INT_EN BIT(27)</div><div class='del'>-#define BIT_FS_TXSC_BEDONE_INT_EN BIT(26)</div><div class='del'>-#define BIT_FS_TXSC_VIDONE_INT_EN BIT(25)</div><div class='del'>-#define BIT_FS_TXSC_VODONE_INT_EN BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2IMR				(Offset 0x1120) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_ATIM_MB7_INT_EN BIT(23)</div><div class='del'>-#define BIT_FS_ATIM_MB6_INT_EN BIT(22)</div><div class='del'>-#define BIT_FS_ATIM_MB5_INT_EN BIT(21)</div><div class='del'>-#define BIT_FS_ATIM_MB4_INT_EN BIT(20)</div><div class='del'>-#define BIT_FS_ATIM_MB3_INT_EN BIT(19)</div><div class='del'>-#define BIT_FS_ATIM_MB2_INT_EN BIT(18)</div><div class='del'>-#define BIT_FS_ATIM_MB1_INT_EN BIT(17)</div><div class='del'>-#define BIT_FS_ATIM_MB0_INT_EN BIT(16)</div><div class='del'>-#define BIT_FS_TBTT4INT_EN BIT(11)</div><div class='del'>-#define BIT_FS_TBTT3INT_EN BIT(10)</div><div class='del'>-#define BIT_FS_TBTT2INT_EN BIT(9)</div><div class='del'>-#define BIT_FS_TBTT1INT_EN BIT(8)</div><div class='del'>-#define BIT_FS_TBTT0_MB7INT_EN BIT(7)</div><div class='del'>-#define BIT_FS_TBTT0_MB6INT_EN BIT(6)</div><div class='del'>-#define BIT_FS_TBTT0_MB5INT_EN BIT(5)</div><div class='del'>-#define BIT_FS_TBTT0_MB4INT_EN BIT(4)</div><div class='del'>-#define BIT_FS_TBTT0_MB3INT_EN BIT(3)</div><div class='del'>-#define BIT_FS_TBTT0_MB2INT_EN BIT(2)</div><div class='del'>-#define BIT_FS_TBTT0_MB1INT_EN BIT(1)</div><div class='del'>-#define BIT_FS_TBTT0_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2ISR				(Offset 0x1124) */</div><div class='del'>-</div><div class='del'>-#define BIT__FE4ISR__IND_INT BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2ISR				(Offset 0x1124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TXSC_DESC_DONE_INT BIT(28)</div><div class='del'>-#define BIT_FS_TXSC_BKDONE_INT BIT(27)</div><div class='del'>-#define BIT_FS_TXSC_BEDONE_INT BIT(26)</div><div class='del'>-#define BIT_FS_TXSC_VIDONE_INT BIT(25)</div><div class='del'>-#define BIT_FS_TXSC_VODONE_INT BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2ISR				(Offset 0x1124) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_ATIM_MB7_INT BIT(23)</div><div class='del'>-#define BIT_FS_ATIM_MB6_INT BIT(22)</div><div class='del'>-#define BIT_FS_ATIM_MB5_INT BIT(21)</div><div class='del'>-#define BIT_FS_ATIM_MB4_INT BIT(20)</div><div class='del'>-#define BIT_FS_ATIM_MB3_INT BIT(19)</div><div class='del'>-#define BIT_FS_ATIM_MB2_INT BIT(18)</div><div class='del'>-#define BIT_FS_ATIM_MB1_INT BIT(17)</div><div class='del'>-#define BIT_FS_ATIM_MB0_INT BIT(16)</div><div class='del'>-#define BIT_FS_TBTT4INT BIT(11)</div><div class='del'>-#define BIT_FS_TBTT3INT BIT(10)</div><div class='del'>-#define BIT_FS_TBTT2INT BIT(9)</div><div class='del'>-#define BIT_FS_TBTT1INT BIT(8)</div><div class='del'>-#define BIT_FS_TBTT0_MB7INT BIT(7)</div><div class='del'>-#define BIT_FS_TBTT0_MB6INT BIT(6)</div><div class='del'>-#define BIT_FS_TBTT0_MB5INT BIT(5)</div><div class='del'>-#define BIT_FS_TBTT0_MB4INT BIT(4)</div><div class='del'>-#define BIT_FS_TBTT0_MB3INT BIT(3)</div><div class='del'>-#define BIT_FS_TBTT0_MB2INT BIT(2)</div><div class='del'>-#define BIT_FS_TBTT0_MB1INT BIT(1)</div><div class='del'>-#define BIT_FS_TBTT0_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3IMR				(Offset 0x1128) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_MTI_BCNIVLEAR_INT__EN BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3IMR				(Offset 0x1128) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_MTI_BCNIVLEAR_INT__EN BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3IMR				(Offset 0x1128) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_MTI_BCNIVLEAR_INT__EN BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3IMR				(Offset 0x1128) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_MTI_BCNIVLEAR_INT__EN BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3IMR				(Offset 0x1128) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_BCNDMA4_INT_EN BIT(27)</div><div class='del'>-#define BIT_FS_BCNDMA3_INT_EN BIT(26)</div><div class='del'>-#define BIT_FS_BCNDMA2_INT_EN BIT(25)</div><div class='del'>-#define BIT_FS_BCNDMA1_INT_EN BIT(24)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB7_INT_EN BIT(23)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB6_INT_EN BIT(22)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB5_INT_EN BIT(21)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB4_INT_EN BIT(20)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB3_INT_EN BIT(19)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB2_INT_EN BIT(18)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB1_INT_EN BIT(17)</div><div class='del'>-#define BIT_FS_BCNDMA0_INT_EN BIT(16)</div><div class='del'>-#define BIT_FS_MTI_BCNIVLEAR_INT__EN BIT(15)</div><div class='del'>-#define BIT_FS_BCNERLY4_INT_EN BIT(11)</div><div class='del'>-#define BIT_FS_BCNERLY3_INT_EN BIT(10)</div><div class='del'>-#define BIT_FS_BCNERLY2_INT_EN BIT(9)</div><div class='del'>-#define BIT_FS_BCNERLY1_INT_EN BIT(8)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB7INT_EN BIT(7)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB6INT_EN BIT(6)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB5INT_EN BIT(5)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB4INT_EN BIT(4)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB3INT_EN BIT(3)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB2INT_EN BIT(2)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB1INT_EN BIT(1)</div><div class='del'>-#define BIT_FS_BCNERLY0_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3ISR				(Offset 0x112C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_MTI_BCNIVLEAR_INT BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3ISR				(Offset 0x112C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_MTI_BCNIVLEAR_INT BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3ISR				(Offset 0x112C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_MTI_BCNIVLEAR_INT BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3ISR				(Offset 0x112C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_MTI_BCNIVLEAR_INT BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3ISR				(Offset 0x112C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_BCNDMA4_INT BIT(27)</div><div class='del'>-#define BIT_FS_BCNDMA3_INT BIT(26)</div><div class='del'>-#define BIT_FS_BCNDMA2_INT BIT(25)</div><div class='del'>-#define BIT_FS_BCNDMA1_INT BIT(24)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB7_INT BIT(23)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB6_INT BIT(22)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB5_INT BIT(21)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB4_INT BIT(20)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB3_INT BIT(19)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB2_INT BIT(18)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB1_INT BIT(17)</div><div class='del'>-#define BIT_FS_BCNDMA0_INT BIT(16)</div><div class='del'>-#define BIT_FS_MTI_BCNIVLEAR_INT BIT(15)</div><div class='del'>-#define BIT_FS_BCNERLY4_INT BIT(11)</div><div class='del'>-#define BIT_FS_BCNERLY3_INT BIT(10)</div><div class='del'>-#define BIT_FS_BCNERLY2_INT BIT(9)</div><div class='del'>-#define BIT_FS_BCNERLY1_INT BIT(8)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB7INT BIT(7)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB6INT BIT(6)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB5INT BIT(5)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB4INT BIT(4)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB3INT BIT(3)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB2INT BIT(2)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB1INT BIT(1)</div><div class='del'>-#define BIT_FS_BCNERLY0_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TXPKTIN_INT_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TXPKTIN_INT_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TXPKTIN_INT_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TXPKTIN_INT_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD0_INT_EN BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD1_INT_EN BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD0_INT_EN BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD1_INT_EN BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD0_INT_EN BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD1_INT_EN BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD0_INT_EN BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD1_INT_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD0_INT_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD1_INT_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD0_INT_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD1_INT_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD0_INT_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD1_INT_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD0_INT_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR				(Offset 0x1130) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD1_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TXPKTIN_INT BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TXPKTIN_INT BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TXPKTIN_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TXPKTIN_INT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD0_INT BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD1_INT BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD0_INT BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD1_INT BIT(12)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD0_INT BIT(11)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD1_INT BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD0_INT BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD1_INT BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD0_INT BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD1_INT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD0_INT BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD1_INT BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD0_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD1_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD0_INT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR				(Offset 0x1134) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD1_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1IMR				(Offset 0x1138) */</div><div class='del'>-</div><div class='del'>-#define BIT__FT2ISR__IND_MSK BIT(30)</div><div class='del'>-#define BIT_FTM_PTT_INT_EN BIT(29)</div><div class='del'>-#define BIT_RXFTMREQ_INT_EN BIT(28)</div><div class='del'>-#define BIT_RXFTM_INT_EN BIT(27)</div><div class='del'>-#define BIT_TXFTM_INT_EN BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1IMR				(Offset 0x1138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_H2C_CMD_OK_INT_EN BIT(25)</div><div class='del'>-#define BIT_FS_H2C_CMD_FULL_INT_EN BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1IMR				(Offset 0x1138) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE5_INT_EN BIT(23)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE4_INT_EN BIT(22)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE3_INT_EN BIT(21)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE2_INT_EN BIT(20)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE1_INT_EN BIT(19)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE0_INT_EN BIT(18)</div><div class='del'>-#define BIT_FS_CTWEND2_INT_EN BIT(17)</div><div class='del'>-#define BIT_FS_CTWEND1_INT_EN BIT(16)</div><div class='del'>-#define BIT_FS_CTWEND0_INT_EN BIT(15)</div><div class='del'>-#define BIT_FS_TX_NULL1_INT_EN BIT(14)</div><div class='del'>-#define BIT_FS_TX_NULL0_INT_EN BIT(13)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_EN BIT(12)</div><div class='del'>-#define BIT_FS_P2P_RFON2_INT_EN BIT(11)</div><div class='del'>-#define BIT_FS_P2P_RFOFF2_INT_EN BIT(10)</div><div class='del'>-#define BIT_FS_P2P_RFON1_INT_EN BIT(9)</div><div class='del'>-#define BIT_FS_P2P_RFOFF1_INT_EN BIT(8)</div><div class='del'>-#define BIT_FS_P2P_RFON0_INT_EN BIT(7)</div><div class='del'>-#define BIT_FS_P2P_RFOFF0_INT_EN BIT(6)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD1_EN BIT(5)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD0_EN BIT(4)</div><div class='del'>-#define BIT_FS_TRIGGER_PKT_EN BIT(3)</div><div class='del'>-#define BIT_FS_EOSP_INT_EN BIT(2)</div><div class='del'>-#define BIT_FS_RPWM2_INT_EN BIT(1)</div><div class='del'>-#define BIT_FS_RPWM_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1ISR				(Offset 0x113C) */</div><div class='del'>-</div><div class='del'>-#define BIT__FT2ISR__IND_INT BIT(30)</div><div class='del'>-#define BIT_FTM_PTT_INT BIT(29)</div><div class='del'>-#define BIT_RXFTMREQ_INT BIT(28)</div><div class='del'>-#define BIT_RXFTM_INT BIT(27)</div><div class='del'>-#define BIT_TXFTM_INT BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1ISR				(Offset 0x113C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_H2C_CMD_OK_INT BIT(25)</div><div class='del'>-#define BIT_FS_H2C_CMD_FULL_INT BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1ISR				(Offset 0x113C) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE5_INT BIT(23)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE4_INT BIT(22)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE3_INT BIT(21)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE2_INT BIT(20)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE1_INT BIT(19)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE0_INT BIT(18)</div><div class='del'>-#define BIT_FS_CTWEND2_INT BIT(17)</div><div class='del'>-#define BIT_FS_CTWEND1_INT BIT(16)</div><div class='del'>-#define BIT_FS_CTWEND0_INT BIT(15)</div><div class='del'>-#define BIT_FS_TX_NULL1_INT BIT(14)</div><div class='del'>-#define BIT_FS_TX_NULL0_INT BIT(13)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_INT BIT(12)</div><div class='del'>-#define BIT_FS_P2P_RFON2_INT BIT(11)</div><div class='del'>-#define BIT_FS_P2P_RFOFF2_INT BIT(10)</div><div class='del'>-#define BIT_FS_P2P_RFON1_INT BIT(9)</div><div class='del'>-#define BIT_FS_P2P_RFOFF1_INT BIT(8)</div><div class='del'>-#define BIT_FS_P2P_RFON0_INT BIT(7)</div><div class='del'>-#define BIT_FS_P2P_RFOFF0_INT BIT(6)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD1_INT BIT(5)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD0_INT BIT(4)</div><div class='del'>-#define BIT_FS_TRIGGER_PKT_INT BIT(3)</div><div class='del'>-#define BIT_FS_EOSP_INT BIT(2)</div><div class='del'>-#define BIT_FS_RPWM2_INT BIT(1)</div><div class='del'>-#define BIT_FS_RPWM_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR0				(Offset 0x1140) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_31TO0 0</div><div class='del'>-#define BIT_MASK_MID_31TO0 0xffffffffL</div><div class='del'>-#define BIT_MID_31TO0(x) (((x) &amp; BIT_MASK_MID_31TO0) &lt;&lt; BIT_SHIFT_MID_31TO0)</div><div class='del'>-#define BIT_GET_MID_31TO0(x) (((x) &gt;&gt; BIT_SHIFT_MID_31TO0) &amp; BIT_MASK_MID_31TO0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR1				(Offset 0x1144) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_63TO32 0</div><div class='del'>-#define BIT_MASK_MID_63TO32 0xffffffffL</div><div class='del'>-#define BIT_MID_63TO32(x) (((x) &amp; BIT_MASK_MID_63TO32) &lt;&lt; BIT_SHIFT_MID_63TO32)</div><div class='del'>-#define BIT_GET_MID_63TO32(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_63TO32) &amp; BIT_MASK_MID_63TO32)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR2				(Offset 0x1148) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_95O64 0</div><div class='del'>-#define BIT_MASK_MID_95O64 0xffffffffL</div><div class='del'>-#define BIT_MID_95O64(x) (((x) &amp; BIT_MASK_MID_95O64) &lt;&lt; BIT_SHIFT_MID_95O64)</div><div class='del'>-#define BIT_GET_MID_95O64(x) (((x) &gt;&gt; BIT_SHIFT_MID_95O64) &amp; BIT_MASK_MID_95O64)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR3				(Offset 0x114C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_127TO96 0</div><div class='del'>-#define BIT_MASK_MID_127TO96 0xffffffffL</div><div class='del'>-#define BIT_MID_127TO96(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_127TO96) &lt;&lt; BIT_SHIFT_MID_127TO96)</div><div class='del'>-#define BIT_GET_MID_127TO96(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_127TO96) &amp; BIT_MASK_MID_127TO96)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWSEQ				(Offset 0x1150) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SEQNUM_MID 16</div><div class='del'>-#define BIT_MASK_SEQNUM_MID 0xffff</div><div class='del'>-#define BIT_SEQNUM_MID(x) (((x) &amp; BIT_MASK_SEQNUM_MID) &lt;&lt; BIT_SHIFT_SEQNUM_MID)</div><div class='del'>-#define BIT_GET_SEQNUM_MID(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SEQNUM_MID) &amp; BIT_MASK_SEQNUM_MID)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REF_MID 0</div><div class='del'>-#define BIT_MASK_REF_MID 0x7f</div><div class='del'>-#define BIT_REF_MID(x) (((x) &amp; BIT_MASK_REF_MID) &lt;&lt; BIT_SHIFT_REF_MID)</div><div class='del'>-#define BIT_GET_REF_MID(x) (((x) &gt;&gt; BIT_SHIFT_REF_MID) &amp; BIT_MASK_REF_MID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC7_CTRL_V1				(Offset 0x1158) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC7INT_EN BIT(26)</div><div class='del'>-#define BIT_TC7MODE BIT(25)</div><div class='del'>-#define BIT_TC7EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC7DATA 0</div><div class='del'>-#define BIT_MASK_TC7DATA 0xffffff</div><div class='del'>-#define BIT_TC7DATA(x) (((x) &amp; BIT_MASK_TC7DATA) &lt;&lt; BIT_SHIFT_TC7DATA)</div><div class='del'>-#define BIT_GET_TC7DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC7DATA) &amp; BIT_MASK_TC7DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC8_CTRL_V1				(Offset 0x115C) */</div><div class='del'>-</div><div class='del'>-#define BIT_TC8INT_EN BIT(26)</div><div class='del'>-#define BIT_TC8MODE BIT(25)</div><div class='del'>-#define BIT_TC8EN BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC8DATA 0</div><div class='del'>-#define BIT_MASK_TC8DATA 0xffffff</div><div class='del'>-#define BIT_TC8DATA(x) (((x) &amp; BIT_MASK_TC8DATA) &lt;&lt; BIT_SHIFT_TC8DATA)</div><div class='del'>-#define BIT_GET_TC8DATA(x) (((x) &gt;&gt; BIT_SHIFT_TC8DATA) &amp; BIT_MASK_TC8DATA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD1_EN BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD0_EN BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TRIGGER_PKT_EN BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_EOSP_INT_EN BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD1_EN BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD0_EN BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TRIGGER_PKT_EN BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_EOSP_INT_EN BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD1_EN BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD0_EN BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TRIGGER_PKT_EN BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_EOSP_INT_EN BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD1_EN BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD0_EN BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TRIGGER_PKT_EN BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_EOSP_INT_EN BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P2_EN BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P1_EN BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL1_INT_EN BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL0_INT_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL1_INT_EN BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL0_INT_EN BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL1_INT_EN BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL0_INT_EN BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL1_INT_EN BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR				(Offset 0x11E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL0_INT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD1_INT BIT(31)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD0_INT BIT(30)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TRIGGER_PKT_INT BIT(29)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_EOSP_INT BIT(28)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD1_INT BIT(27)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD0_INT BIT(26)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TRIGGER_PKT_INT BIT(25)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_EOSP_INT BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD1_INT BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD0_INT BIT(22)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TRIGGER_PKT_INT BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_EOSP_INT BIT(20)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD1_INT BIT(19)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD0_INT BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TRIGGER_PKT_INT BIT(17)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_EOSP_INT BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P2_INT BIT(9)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P1_INT BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL1_INT BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL0_INT BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL1_INT BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL0_INT BIT(4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL1_INT BIT(3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL0_INT BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL1_INT BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR				(Offset 0x11E4) */</div><div class='del'>-</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL0_INT BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG2				(Offset 0x11F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG2 0</div><div class='del'>-#define BIT_MASK_FW_MSG2 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG2(x) (((x) &amp; BIT_MASK_FW_MSG2) &lt;&lt; BIT_SHIFT_FW_MSG2)</div><div class='del'>-#define BIT_GET_FW_MSG2(x) (((x) &gt;&gt; BIT_SHIFT_FW_MSG2) &amp; BIT_MASK_FW_MSG2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG3				(Offset 0x11F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG3 0</div><div class='del'>-#define BIT_MASK_FW_MSG3 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG3(x) (((x) &amp; BIT_MASK_FW_MSG3) &lt;&lt; BIT_SHIFT_FW_MSG3)</div><div class='del'>-#define BIT_GET_FW_MSG3(x) (((x) &gt;&gt; BIT_SHIFT_FW_MSG3) &amp; BIT_MASK_FW_MSG3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG4				(Offset 0x11F8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG4 0</div><div class='del'>-#define BIT_MASK_FW_MSG4 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG4(x) (((x) &amp; BIT_MASK_FW_MSG4) &lt;&lt; BIT_SHIFT_FW_MSG4)</div><div class='del'>-#define BIT_GET_FW_MSG4(x) (((x) &gt;&gt; BIT_SHIFT_FW_MSG4) &amp; BIT_MASK_FW_MSG4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG5				(Offset 0x11FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG5 0</div><div class='del'>-#define BIT_MASK_FW_MSG5 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG5(x) (((x) &amp; BIT_MASK_FW_MSG5) &lt;&lt; BIT_SHIFT_FW_MSG5)</div><div class='del'>-#define BIT_GET_FW_MSG5(x) (((x) &gt;&gt; BIT_SHIFT_FW_MSG5) &amp; BIT_MASK_FW_MSG5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH0SA				(Offset 0x1200) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH0_SA 0</div><div class='del'>-#define BIT_MASK_DDMACH0_SA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH0_SA(x) (((x) &amp; BIT_MASK_DDMACH0_SA) &lt;&lt; BIT_SHIFT_DDMACH0_SA)</div><div class='del'>-#define BIT_GET_DDMACH0_SA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH0_SA) &amp; BIT_MASK_DDMACH0_SA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH0DA				(Offset 0x1204) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH0_DA 0</div><div class='del'>-#define BIT_MASK_DDMACH0_DA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH0_DA(x) (((x) &amp; BIT_MASK_DDMACH0_DA) &lt;&lt; BIT_SHIFT_DDMACH0_DA)</div><div class='del'>-#define BIT_GET_DDMACH0_DA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH0_DA) &amp; BIT_MASK_DDMACH0_DA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH0CTRL			(Offset 0x1208) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH0_OWN BIT(31)</div><div class='del'>-#define BIT_DDMACH0_CHKSUM_EN BIT(29)</div><div class='del'>-#define BIT_DDMACH0_DA_W_DISABLE BIT(28)</div><div class='del'>-#define BIT_DDMACH0_CHKSUM_STS BIT(27)</div><div class='del'>-#define BIT_DDMACH0_DDMA_MODE BIT(26)</div><div class='del'>-#define BIT_DDMACH0_RESET_CHKSUM_STS BIT(25)</div><div class='del'>-#define BIT_DDMACH0_CHKSUM_CONT BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH0_DLEN 0</div><div class='del'>-#define BIT_MASK_DDMACH0_DLEN 0x3ffff</div><div class='del'>-#define BIT_DDMACH0_DLEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH0_DLEN) &lt;&lt; BIT_SHIFT_DDMACH0_DLEN)</div><div class='del'>-#define BIT_GET_DDMACH0_DLEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH0_DLEN) &amp; BIT_MASK_DDMACH0_DLEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH1SA				(Offset 0x1210) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH1_SA 0</div><div class='del'>-#define BIT_MASK_DDMACH1_SA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH1_SA(x) (((x) &amp; BIT_MASK_DDMACH1_SA) &lt;&lt; BIT_SHIFT_DDMACH1_SA)</div><div class='del'>-#define BIT_GET_DDMACH1_SA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH1_SA) &amp; BIT_MASK_DDMACH1_SA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH1DA				(Offset 0x1214) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH1_DA 0</div><div class='del'>-#define BIT_MASK_DDMACH1_DA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH1_DA(x) (((x) &amp; BIT_MASK_DDMACH1_DA) &lt;&lt; BIT_SHIFT_DDMACH1_DA)</div><div class='del'>-#define BIT_GET_DDMACH1_DA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH1_DA) &amp; BIT_MASK_DDMACH1_DA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH1CTRL			(Offset 0x1218) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH1_OWN BIT(31)</div><div class='del'>-#define BIT_DDMACH1_CHKSUM_EN BIT(29)</div><div class='del'>-#define BIT_DDMACH1_DA_W_DISABLE BIT(28)</div><div class='del'>-#define BIT_DDMACH1_CHKSUM_STS BIT(27)</div><div class='del'>-#define BIT_DDMACH1_DDMA_MODE BIT(26)</div><div class='del'>-#define BIT_DDMACH1_RESET_CHKSUM_STS BIT(25)</div><div class='del'>-#define BIT_DDMACH1_CHKSUM_CONT BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH1_DLEN 0</div><div class='del'>-#define BIT_MASK_DDMACH1_DLEN 0x3ffff</div><div class='del'>-#define BIT_DDMACH1_DLEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH1_DLEN) &lt;&lt; BIT_SHIFT_DDMACH1_DLEN)</div><div class='del'>-#define BIT_GET_DDMACH1_DLEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH1_DLEN) &amp; BIT_MASK_DDMACH1_DLEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH2SA				(Offset 0x1220) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH2_SA 0</div><div class='del'>-#define BIT_MASK_DDMACH2_SA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH2_SA(x) (((x) &amp; BIT_MASK_DDMACH2_SA) &lt;&lt; BIT_SHIFT_DDMACH2_SA)</div><div class='del'>-#define BIT_GET_DDMACH2_SA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH2_SA) &amp; BIT_MASK_DDMACH2_SA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH2DA				(Offset 0x1224) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH2_DA 0</div><div class='del'>-#define BIT_MASK_DDMACH2_DA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH2_DA(x) (((x) &amp; BIT_MASK_DDMACH2_DA) &lt;&lt; BIT_SHIFT_DDMACH2_DA)</div><div class='del'>-#define BIT_GET_DDMACH2_DA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH2_DA) &amp; BIT_MASK_DDMACH2_DA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH2CTRL			(Offset 0x1228) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH2_OWN BIT(31)</div><div class='del'>-#define BIT_DDMACH2_CHKSUM_EN BIT(29)</div><div class='del'>-#define BIT_DDMACH2_DA_W_DISABLE BIT(28)</div><div class='del'>-#define BIT_DDMACH2_CHKSUM_STS BIT(27)</div><div class='del'>-#define BIT_DDMACH2_DDMA_MODE BIT(26)</div><div class='del'>-#define BIT_DDMACH2_RESET_CHKSUM_STS BIT(25)</div><div class='del'>-#define BIT_DDMACH2_CHKSUM_CONT BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH2_DLEN 0</div><div class='del'>-#define BIT_MASK_DDMACH2_DLEN 0x3ffff</div><div class='del'>-#define BIT_DDMACH2_DLEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH2_DLEN) &lt;&lt; BIT_SHIFT_DDMACH2_DLEN)</div><div class='del'>-#define BIT_GET_DDMACH2_DLEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH2_DLEN) &amp; BIT_MASK_DDMACH2_DLEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH3SA				(Offset 0x1230) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH3_SA 0</div><div class='del'>-#define BIT_MASK_DDMACH3_SA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH3_SA(x) (((x) &amp; BIT_MASK_DDMACH3_SA) &lt;&lt; BIT_SHIFT_DDMACH3_SA)</div><div class='del'>-#define BIT_GET_DDMACH3_SA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH3_SA) &amp; BIT_MASK_DDMACH3_SA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH3DA				(Offset 0x1234) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH3_DA 0</div><div class='del'>-#define BIT_MASK_DDMACH3_DA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH3_DA(x) (((x) &amp; BIT_MASK_DDMACH3_DA) &lt;&lt; BIT_SHIFT_DDMACH3_DA)</div><div class='del'>-#define BIT_GET_DDMACH3_DA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH3_DA) &amp; BIT_MASK_DDMACH3_DA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH3CTRL			(Offset 0x1238) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH3_OWN BIT(31)</div><div class='del'>-#define BIT_DDMACH3_CHKSUM_EN BIT(29)</div><div class='del'>-#define BIT_DDMACH3_DA_W_DISABLE BIT(28)</div><div class='del'>-#define BIT_DDMACH3_CHKSUM_STS BIT(27)</div><div class='del'>-#define BIT_DDMACH3_DDMA_MODE BIT(26)</div><div class='del'>-#define BIT_DDMACH3_RESET_CHKSUM_STS BIT(25)</div><div class='del'>-#define BIT_DDMACH3_CHKSUM_CONT BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH3_DLEN 0</div><div class='del'>-#define BIT_MASK_DDMACH3_DLEN 0x3ffff</div><div class='del'>-#define BIT_DDMACH3_DLEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH3_DLEN) &lt;&lt; BIT_SHIFT_DDMACH3_DLEN)</div><div class='del'>-#define BIT_GET_DDMACH3_DLEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH3_DLEN) &amp; BIT_MASK_DDMACH3_DLEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH4SA				(Offset 0x1240) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH4_SA 0</div><div class='del'>-#define BIT_MASK_DDMACH4_SA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH4_SA(x) (((x) &amp; BIT_MASK_DDMACH4_SA) &lt;&lt; BIT_SHIFT_DDMACH4_SA)</div><div class='del'>-#define BIT_GET_DDMACH4_SA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH4_SA) &amp; BIT_MASK_DDMACH4_SA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH4DA				(Offset 0x1244) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH4_DA 0</div><div class='del'>-#define BIT_MASK_DDMACH4_DA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH4_DA(x) (((x) &amp; BIT_MASK_DDMACH4_DA) &lt;&lt; BIT_SHIFT_DDMACH4_DA)</div><div class='del'>-#define BIT_GET_DDMACH4_DA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH4_DA) &amp; BIT_MASK_DDMACH4_DA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH4CTRL			(Offset 0x1248) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH4_OWN BIT(31)</div><div class='del'>-#define BIT_DDMACH4_CHKSUM_EN BIT(29)</div><div class='del'>-#define BIT_DDMACH4_DA_W_DISABLE BIT(28)</div><div class='del'>-#define BIT_DDMACH4_CHKSUM_STS BIT(27)</div><div class='del'>-#define BIT_DDMACH4_DDMA_MODE BIT(26)</div><div class='del'>-#define BIT_DDMACH4_RESET_CHKSUM_STS BIT(25)</div><div class='del'>-#define BIT_DDMACH4_CHKSUM_CONT BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH4_DLEN 0</div><div class='del'>-#define BIT_MASK_DDMACH4_DLEN 0x3ffff</div><div class='del'>-#define BIT_DDMACH4_DLEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH4_DLEN) &lt;&lt; BIT_SHIFT_DDMACH4_DLEN)</div><div class='del'>-#define BIT_GET_DDMACH4_DLEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH4_DLEN) &amp; BIT_MASK_DDMACH4_DLEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH5SA				(Offset 0x1250) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH5_SA 0</div><div class='del'>-#define BIT_MASK_DDMACH5_SA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH5_SA(x) (((x) &amp; BIT_MASK_DDMACH5_SA) &lt;&lt; BIT_SHIFT_DDMACH5_SA)</div><div class='del'>-#define BIT_GET_DDMACH5_SA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH5_SA) &amp; BIT_MASK_DDMACH5_SA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH5DA				(Offset 0x1254) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH5_OWN BIT(31)</div><div class='del'>-#define BIT_DDMACH5_CHKSUM_EN BIT(29)</div><div class='del'>-#define BIT_DDMACH5_DA_W_DISABLE BIT(28)</div><div class='del'>-#define BIT_DDMACH5_CHKSUM_STS BIT(27)</div><div class='del'>-#define BIT_DDMACH5_DDMA_MODE BIT(26)</div><div class='del'>-#define BIT_DDMACH5_RESET_CHKSUM_STS BIT(25)</div><div class='del'>-#define BIT_DDMACH5_CHKSUM_CONT BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH5_DA 0</div><div class='del'>-#define BIT_MASK_DDMACH5_DA 0xffffffffL</div><div class='del'>-#define BIT_DDMACH5_DA(x) (((x) &amp; BIT_MASK_DDMACH5_DA) &lt;&lt; BIT_SHIFT_DDMACH5_DA)</div><div class='del'>-#define BIT_GET_DDMACH5_DA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH5_DA) &amp; BIT_MASK_DDMACH5_DA)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH5_DLEN 0</div><div class='del'>-#define BIT_MASK_DDMACH5_DLEN 0x3ffff</div><div class='del'>-#define BIT_DDMACH5_DLEN(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH5_DLEN) &lt;&lt; BIT_SHIFT_DDMACH5_DLEN)</div><div class='del'>-#define BIT_GET_DDMACH5_DLEN(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH5_DLEN) &amp; BIT_MASK_DDMACH5_DLEN)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_INT_MSK			(Offset 0x12E0) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH5_MSK BIT(5)</div><div class='del'>-#define BIT_DDMACH4_MSK BIT(4)</div><div class='del'>-#define BIT_DDMACH3_MSK BIT(3)</div><div class='del'>-#define BIT_DDMACH2_MSK BIT(2)</div><div class='del'>-#define BIT_DDMACH1_MSK BIT(1)</div><div class='del'>-#define BIT_DDMACH0_MSK BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CHSTATUS			(Offset 0x12E8) */</div><div class='del'>-</div><div class='del'>-#define BIT_DDMACH5_BUSY BIT(5)</div><div class='del'>-#define BIT_DDMACH4_BUSY BIT(4)</div><div class='del'>-#define BIT_DDMACH3_BUSY BIT(3)</div><div class='del'>-#define BIT_DDMACH2_BUSY BIT(2)</div><div class='del'>-#define BIT_DDMACH1_BUSY BIT(1)</div><div class='del'>-#define BIT_DDMACH0_BUSY BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CHKSUM				(Offset 0x12F0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IDDMA0_CHKSUM 0</div><div class='del'>-#define BIT_MASK_IDDMA0_CHKSUM 0xffff</div><div class='del'>-#define BIT_IDDMA0_CHKSUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_IDDMA0_CHKSUM) &lt;&lt; BIT_SHIFT_IDDMA0_CHKSUM)</div><div class='del'>-#define BIT_GET_IDDMA0_CHKSUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IDDMA0_CHKSUM) &amp; BIT_MASK_IDDMA0_CHKSUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_MONITOR			(Offset 0x12FC) */</div><div class='del'>-</div><div class='del'>-#define BIT_IDDMA0_PERMU_UNDERFLOW BIT(14)</div><div class='del'>-#define BIT_IDDMA0_FIFO_UNDERFLOW BIT(13)</div><div class='del'>-#define BIT_IDDMA0_FIFO_OVERFLOW BIT(12)</div><div class='del'>-#define BIT_ECRC_EN_V1 BIT(7)</div><div class='del'>-#define BIT_MDIO_RFLAG_V1 BIT(6)</div><div class='del'>-#define BIT_CH5_ERR BIT(5)</div><div class='del'>-#define BIT_MDIO_WFLAG_V1 BIT(5)</div><div class='del'>-#define BIT_CH4_ERR BIT(4)</div><div class='del'>-#define BIT_CH3_ERR BIT(3)</div><div class='del'>-#define BIT_CH2_ERR BIT(2)</div><div class='del'>-#define BIT_CH1_ERR BIT(1)</div><div class='del'>-#define BIT_CH0_ERR BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STC_INT_CS				(Offset 0x1300) */</div><div class='del'>-</div><div class='del'>-#define BIT_STC_INT_EN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_FLAG 16</div><div class='del'>-#define BIT_MASK_STC_INT_FLAG 0xff</div><div class='del'>-#define BIT_STC_INT_FLAG(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_FLAG) &lt;&lt; BIT_SHIFT_STC_INT_FLAG)</div><div class='del'>-#define BIT_GET_STC_INT_FLAG(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_FLAG) &amp; BIT_MASK_STC_INT_FLAG)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_IDX 8</div><div class='del'>-#define BIT_MASK_STC_INT_IDX 0x7</div><div class='del'>-#define BIT_STC_INT_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_IDX) &lt;&lt; BIT_SHIFT_STC_INT_IDX)</div><div class='del'>-#define BIT_GET_STC_INT_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_IDX) &amp; BIT_MASK_STC_INT_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_REALTIME_CS 0</div><div class='del'>-#define BIT_MASK_STC_INT_REALTIME_CS 0x3f</div><div class='del'>-#define BIT_STC_INT_REALTIME_CS(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_REALTIME_CS) &lt;&lt; BIT_SHIFT_STC_INT_REALTIME_CS)</div><div class='del'>-#define BIT_GET_STC_INT_REALTIME_CS(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_REALTIME_CS) &amp; BIT_MASK_STC_INT_REALTIME_CS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ST_INT_CFG				(Offset 0x1304) */</div><div class='del'>-</div><div class='del'>-#define BIT_STC_INT_GRP_EN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_EXPECT_LS 8</div><div class='del'>-#define BIT_MASK_STC_INT_EXPECT_LS 0x3f</div><div class='del'>-#define BIT_STC_INT_EXPECT_LS(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_EXPECT_LS) &lt;&lt; BIT_SHIFT_STC_INT_EXPECT_LS)</div><div class='del'>-#define BIT_GET_STC_INT_EXPECT_LS(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_EXPECT_LS) &amp; BIT_MASK_STC_INT_EXPECT_LS)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_EXPECT_CS 0</div><div class='del'>-#define BIT_MASK_STC_INT_EXPECT_CS 0x3f</div><div class='del'>-#define BIT_STC_INT_EXPECT_CS(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_EXPECT_CS) &lt;&lt; BIT_SHIFT_STC_INT_EXPECT_CS)</div><div class='del'>-#define BIT_GET_STC_INT_EXPECT_CS(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_EXPECT_CS) &amp; BIT_MASK_STC_INT_EXPECT_CS)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMU_DLY_CTRL			(Offset 0x1310) */</div><div class='del'>-</div><div class='del'>-#define BIT_CMU_DLY_EN BIT(31)</div><div class='del'>-#define BIT_CMU_DLY_MODE BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_PRE_DIV 0</div><div class='del'>-#define BIT_MASK_CMU_DLY_PRE_DIV 0xff</div><div class='del'>-#define BIT_CMU_DLY_PRE_DIV(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_PRE_DIV) &lt;&lt; BIT_SHIFT_CMU_DLY_PRE_DIV)</div><div class='del'>-#define BIT_GET_CMU_DLY_PRE_DIV(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_PRE_DIV) &amp; BIT_MASK_CMU_DLY_PRE_DIV)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMU_DLY_CFG				(Offset 0x1314) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_A2I 24</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_A2I 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_A2I(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_A2I) &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_A2I)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_A2I(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_A2I) &amp; BIT_MASK_CMU_DLY_LTR_A2I)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_I2A 16</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_I2A 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_I2A(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_I2A) &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_I2A)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_I2A(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_I2A) &amp; BIT_MASK_CMU_DLY_LTR_I2A)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_IDLE 8</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_IDLE 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_IDLE(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_IDLE) &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_IDLE)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_IDLE(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_IDLE) &amp; BIT_MASK_CMU_DLY_LTR_IDLE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_ACT 0</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_ACT 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_ACT(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_ACT) &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_ACT)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_ACT(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_ACT) &amp; BIT_MASK_CMU_DLY_LTR_ACT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_DESA			(Offset 0x1320) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_TXBD_DESA 0</div><div class='del'>-#define BIT_MASK_H2CQ_TXBD_DESA 0xffffffffffffffffL</div><div class='del'>-#define BIT_H2CQ_TXBD_DESA(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_TXBD_DESA) &lt;&lt; BIT_SHIFT_H2CQ_TXBD_DESA)</div><div class='del'>-#define BIT_GET_H2CQ_TXBD_DESA(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_TXBD_DESA) &amp; BIT_MASK_H2CQ_TXBD_DESA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_NUM			(Offset 0x1328) */</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_H2CQ_FLAG BIT(14)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_NUM			(Offset 0x1328) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_DESC_MODE 12</div><div class='del'>-#define BIT_MASK_H2CQ_DESC_MODE 0x3</div><div class='del'>-#define BIT_H2CQ_DESC_MODE(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_DESC_MODE) &lt;&lt; BIT_SHIFT_H2CQ_DESC_MODE)</div><div class='del'>-#define BIT_GET_H2CQ_DESC_MODE(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_DESC_MODE) &amp; BIT_MASK_H2CQ_DESC_MODE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_DESC_NUM 0</div><div class='del'>-#define BIT_MASK_H2CQ_DESC_NUM 0xfff</div><div class='del'>-#define BIT_H2CQ_DESC_NUM(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_DESC_NUM) &lt;&lt; BIT_SHIFT_H2CQ_DESC_NUM)</div><div class='del'>-#define BIT_GET_H2CQ_DESC_NUM(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_DESC_NUM) &amp; BIT_MASK_H2CQ_DESC_NUM)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_IDX			(Offset 0x132C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_HW_IDX 16</div><div class='del'>-#define BIT_MASK_H2CQ_HW_IDX 0xfff</div><div class='del'>-#define BIT_H2CQ_HW_IDX(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_HW_IDX) &lt;&lt; BIT_SHIFT_H2CQ_HW_IDX)</div><div class='del'>-#define BIT_GET_H2CQ_HW_IDX(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_HW_IDX) &amp; BIT_MASK_H2CQ_HW_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_HOST_IDX 0</div><div class='del'>-#define BIT_MASK_H2CQ_HOST_IDX 0xfff</div><div class='del'>-#define BIT_H2CQ_HOST_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_HOST_IDX) &lt;&lt; BIT_SHIFT_H2CQ_HOST_IDX)</div><div class='del'>-#define BIT_GET_H2CQ_HOST_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_HOST_IDX) &amp; BIT_MASK_H2CQ_HOST_IDX)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_CSR				(Offset 0x1330) */</div><div class='del'>-</div><div class='del'>-#define BIT_H2CQ_FULL BIT(31)</div><div class='del'>-#define BIT_CLR_H2CQ_HOST_IDX BIT(16)</div><div class='del'>-#define BIT_CLR_H2CQ_HW_IDX BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CHANGE_PCIE_SPEED			(Offset 0x1350) */</div><div class='del'>-</div><div class='del'>-#define BIT_CHANGE_PCIE_SPEED BIT(18)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CHANGE_PCIE_SPEED			(Offset 0x1350) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GEN1_GEN2 16</div><div class='del'>-#define BIT_MASK_GEN1_GEN2 0x3</div><div class='del'>-#define BIT_GEN1_GEN2(x) (((x) &amp; BIT_MASK_GEN1_GEN2) &lt;&lt; BIT_SHIFT_GEN1_GEN2)</div><div class='del'>-#define BIT_GET_GEN1_GEN2(x) (((x) &gt;&gt; BIT_SHIFT_GEN1_GEN2) &amp; BIT_MASK_GEN1_GEN2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CHANGE_PCIE_SPEED			(Offset 0x1350) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AUTO_HANG_RELEASE 0</div><div class='del'>-#define BIT_MASK_AUTO_HANG_RELEASE 0x7</div><div class='del'>-#define BIT_AUTO_HANG_RELEASE(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_AUTO_HANG_RELEASE) &lt;&lt; BIT_SHIFT_AUTO_HANG_RELEASE)</div><div class='del'>-#define BIT_GET_AUTO_HANG_RELEASE(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AUTO_HANG_RELEASE) &amp; BIT_MASK_AUTO_HANG_RELEASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OLD_DEHANG				(Offset 0x13F4) */</div><div class='del'>-</div><div class='del'>-#define BIT_OLD_DEHANG BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_Q1_INFO				(Offset 0x1400) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC1_PKT_INFO 16</div><div class='del'>-#define BIT_MASK_AC1_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC1_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC1_PKT_INFO) &lt;&lt; BIT_SHIFT_AC1_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC1_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC1_PKT_INFO) &amp; BIT_MASK_AC1_PKT_INFO)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC0_PKT_INFO 0</div><div class='del'>-#define BIT_MASK_AC0_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC0_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC0_PKT_INFO) &lt;&lt; BIT_SHIFT_AC0_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC0_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC0_PKT_INFO) &amp; BIT_MASK_AC0_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_Q3_INFO				(Offset 0x1404) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC3_PKT_INFO 16</div><div class='del'>-#define BIT_MASK_AC3_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC3_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC3_PKT_INFO) &lt;&lt; BIT_SHIFT_AC3_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC3_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC3_PKT_INFO) &amp; BIT_MASK_AC3_PKT_INFO)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC2_PKT_INFO 0</div><div class='del'>-#define BIT_MASK_AC2_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC2_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC2_PKT_INFO) &lt;&lt; BIT_SHIFT_AC2_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC2_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC2_PKT_INFO) &amp; BIT_MASK_AC2_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_Q5_INFO				(Offset 0x1408) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC5_PKT_INFO 16</div><div class='del'>-#define BIT_MASK_AC5_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC5_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC5_PKT_INFO) &lt;&lt; BIT_SHIFT_AC5_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC5_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC5_PKT_INFO) &amp; BIT_MASK_AC5_PKT_INFO)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC4_PKT_INFO 0</div><div class='del'>-#define BIT_MASK_AC4_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC4_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC4_PKT_INFO) &lt;&lt; BIT_SHIFT_AC4_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC4_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC4_PKT_INFO) &amp; BIT_MASK_AC4_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_Q7_INFO				(Offset 0x140C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC7_PKT_INFO 16</div><div class='del'>-#define BIT_MASK_AC7_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC7_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC7_PKT_INFO) &lt;&lt; BIT_SHIFT_AC7_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC7_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC7_PKT_INFO) &amp; BIT_MASK_AC7_PKT_INFO)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC6_PKT_INFO 0</div><div class='del'>-#define BIT_MASK_AC6_PKT_INFO 0xfff</div><div class='del'>-#define BIT_AC6_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC6_PKT_INFO) &lt;&lt; BIT_SHIFT_AC6_PKT_INFO)</div><div class='del'>-#define BIT_GET_AC6_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC6_PKT_INFO) &amp; BIT_MASK_AC6_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_HIQ_INFO			(Offset 0x1410) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIQ_PKT_INFO 16</div><div class='del'>-#define BIT_MASK_HIQ_PKT_INFO 0xfff</div><div class='del'>-#define BIT_HIQ_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIQ_PKT_INFO) &lt;&lt; BIT_SHIFT_HIQ_PKT_INFO)</div><div class='del'>-#define BIT_GET_HIQ_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIQ_PKT_INFO) &amp; BIT_MASK_HIQ_PKT_INFO)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_PKT_INFO 0</div><div class='del'>-#define BIT_MASK_MGQ_PKT_INFO 0xfff</div><div class='del'>-#define BIT_MGQ_PKT_INFO(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_PKT_INFO) &lt;&lt; BIT_SHIFT_MGQ_PKT_INFO)</div><div class='del'>-#define BIT_GET_MGQ_PKT_INFO(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_PKT_INFO) &amp; BIT_MASK_MGQ_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_BCNQ_INFO			(Offset 0x1414) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMDQ_PKT_INFO 16</div><div class='del'>-#define BIT_MASK_CMDQ_PKT_INFO 0xfff</div><div class='del'>-#define BIT_CMDQ_PKT_INFO(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMDQ_PKT_INFO) &lt;&lt; BIT_SHIFT_CMDQ_PKT_INFO)</div><div class='del'>-#define BIT_GET_CMDQ_PKT_INFO(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMDQ_PKT_INFO) &amp; BIT_MASK_CMDQ_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_BCNQ_INFO			(Offset 0x1414) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_PKT_INFO 0</div><div class='del'>-#define BIT_MASK_BCNQ_PKT_INFO 0xfff</div><div class='del'>-#define BIT_BCNQ_PKT_INFO(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_PKT_INFO) &lt;&lt; BIT_SHIFT_BCNQ_PKT_INFO)</div><div class='del'>-#define BIT_GET_BCNQ_PKT_INFO(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_PKT_INFO) &amp; BIT_MASK_BCNQ_PKT_INFO)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USEREG_SETTING			(Offset 0x1420) */</div><div class='del'>-</div><div class='del'>-#define BIT_NDPA_USEREG BIT(21)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RETRY_USEREG 19</div><div class='del'>-#define BIT_MASK_RETRY_USEREG 0x3</div><div class='del'>-#define BIT_RETRY_USEREG(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RETRY_USEREG) &lt;&lt; BIT_SHIFT_RETRY_USEREG)</div><div class='del'>-#define BIT_GET_RETRY_USEREG(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RETRY_USEREG) &amp; BIT_MASK_RETRY_USEREG)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRYPKT_USEREG 17</div><div class='del'>-#define BIT_MASK_TRYPKT_USEREG 0x3</div><div class='del'>-#define BIT_TRYPKT_USEREG(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRYPKT_USEREG) &lt;&lt; BIT_SHIFT_TRYPKT_USEREG)</div><div class='del'>-#define BIT_GET_TRYPKT_USEREG(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRYPKT_USEREG) &amp; BIT_MASK_TRYPKT_USEREG)</div><div class='del'>-</div><div class='del'>-#define BIT_CTLPKT_USEREG BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AESIV_SETTING			(Offset 0x1424) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AESIV_OFFSET 0</div><div class='del'>-#define BIT_MASK_AESIV_OFFSET 0xfff</div><div class='del'>-#define BIT_AESIV_OFFSET(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_AESIV_OFFSET) &lt;&lt; BIT_SHIFT_AESIV_OFFSET)</div><div class='del'>-#define BIT_GET_AESIV_OFFSET(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AESIV_OFFSET) &amp; BIT_MASK_AESIV_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BF0_TIME_SETTING			(Offset 0x1428) */</div><div class='del'>-</div><div class='del'>-#define BIT_BF0_TIMER_SET BIT(31)</div><div class='del'>-#define BIT_BF0_TIMER_CLR BIT(30)</div><div class='del'>-#define BIT_BF0_UPDATE_EN BIT(29)</div><div class='del'>-#define BIT_BF0_TIMER_EN BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF0_PRETIME_OVER 16</div><div class='del'>-#define BIT_MASK_BF0_PRETIME_OVER 0xfff</div><div class='del'>-#define BIT_BF0_PRETIME_OVER(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF0_PRETIME_OVER) &lt;&lt; BIT_SHIFT_BF0_PRETIME_OVER)</div><div class='del'>-#define BIT_GET_BF0_PRETIME_OVER(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF0_PRETIME_OVER) &amp; BIT_MASK_BF0_PRETIME_OVER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF0_LIFETIME 0</div><div class='del'>-#define BIT_MASK_BF0_LIFETIME 0xffff</div><div class='del'>-#define BIT_BF0_LIFETIME(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF0_LIFETIME) &lt;&lt; BIT_SHIFT_BF0_LIFETIME)</div><div class='del'>-#define BIT_GET_BF0_LIFETIME(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF0_LIFETIME) &amp; BIT_MASK_BF0_LIFETIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BF1_TIME_SETTING			(Offset 0x142C) */</div><div class='del'>-</div><div class='del'>-#define BIT_BF1_TIMER_SET BIT(31)</div><div class='del'>-#define BIT_BF1_TIMER_CLR BIT(30)</div><div class='del'>-#define BIT_BF1_UPDATE_EN BIT(29)</div><div class='del'>-#define BIT_BF1_TIMER_EN BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF1_PRETIME_OVER 16</div><div class='del'>-#define BIT_MASK_BF1_PRETIME_OVER 0xfff</div><div class='del'>-#define BIT_BF1_PRETIME_OVER(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF1_PRETIME_OVER) &lt;&lt; BIT_SHIFT_BF1_PRETIME_OVER)</div><div class='del'>-#define BIT_GET_BF1_PRETIME_OVER(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF1_PRETIME_OVER) &amp; BIT_MASK_BF1_PRETIME_OVER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF1_LIFETIME 0</div><div class='del'>-#define BIT_MASK_BF1_LIFETIME 0xffff</div><div class='del'>-#define BIT_BF1_LIFETIME(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF1_LIFETIME) &lt;&lt; BIT_SHIFT_BF1_LIFETIME)</div><div class='del'>-#define BIT_GET_BF1_LIFETIME(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF1_LIFETIME) &amp; BIT_MASK_BF1_LIFETIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BF_TIMEOUT_EN			(Offset 0x1430) */</div><div class='del'>-</div><div class='del'>-#define BIT_EN_VHT_LDPC BIT(9)</div><div class='del'>-#define BIT_EN_HT_LDPC BIT(8)</div><div class='del'>-#define BIT_BF1_TIMEOUT_EN BIT(1)</div><div class='del'>-#define BIT_BF0_TIMEOUT_EN BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE0			(Offset 0x1434) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID31_0_RELEASE 0</div><div class='del'>-#define BIT_MASK_MACID31_0_RELEASE 0xffffffffL</div><div class='del'>-#define BIT_MACID31_0_RELEASE(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID31_0_RELEASE) &lt;&lt; BIT_SHIFT_MACID31_0_RELEASE)</div><div class='del'>-#define BIT_GET_MACID31_0_RELEASE(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID31_0_RELEASE) &amp; BIT_MASK_MACID31_0_RELEASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE1			(Offset 0x1438) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID63_32_RELEASE 0</div><div class='del'>-#define BIT_MASK_MACID63_32_RELEASE 0xffffffffL</div><div class='del'>-#define BIT_MACID63_32_RELEASE(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID63_32_RELEASE) &lt;&lt; BIT_SHIFT_MACID63_32_RELEASE)</div><div class='del'>-#define BIT_GET_MACID63_32_RELEASE(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID63_32_RELEASE) &amp; BIT_MASK_MACID63_32_RELEASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE2			(Offset 0x143C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID95_64_RELEASE 0</div><div class='del'>-#define BIT_MASK_MACID95_64_RELEASE 0xffffffffL</div><div class='del'>-#define BIT_MACID95_64_RELEASE(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID95_64_RELEASE) &lt;&lt; BIT_SHIFT_MACID95_64_RELEASE)</div><div class='del'>-#define BIT_GET_MACID95_64_RELEASE(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID95_64_RELEASE) &amp; BIT_MASK_MACID95_64_RELEASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE3			(Offset 0x1440) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID127_96_RELEASE 0</div><div class='del'>-#define BIT_MASK_MACID127_96_RELEASE 0xffffffffL</div><div class='del'>-#define BIT_MACID127_96_RELEASE(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID127_96_RELEASE) &lt;&lt; BIT_SHIFT_MACID127_96_RELEASE)</div><div class='del'>-#define BIT_GET_MACID127_96_RELEASE(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID127_96_RELEASE) &amp; BIT_MASK_MACID127_96_RELEASE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE_SETTING		(Offset 0x1444) */</div><div class='del'>-</div><div class='del'>-#define BIT_MACID_VALUE BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_OFFSET 0</div><div class='del'>-#define BIT_MASK_MACID_OFFSET 0x7f</div><div class='del'>-#define BIT_MACID_OFFSET(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_OFFSET) &lt;&lt; BIT_SHIFT_MACID_OFFSET)</div><div class='del'>-#define BIT_GET_MACID_OFFSET(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_OFFSET) &amp; BIT_MASK_MACID_OFFSET)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FAST_EDCA_VOVI_SETTING		(Offset 0x1448) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_FAST_EDCA_TO 24</div><div class='del'>-#define BIT_MASK_VI_FAST_EDCA_TO 0xff</div><div class='del'>-#define BIT_VI_FAST_EDCA_TO(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_FAST_EDCA_TO) &lt;&lt; BIT_SHIFT_VI_FAST_EDCA_TO)</div><div class='del'>-#define BIT_GET_VI_FAST_EDCA_TO(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_FAST_EDCA_TO) &amp; BIT_MASK_VI_FAST_EDCA_TO)</div><div class='del'>-</div><div class='del'>-#define BIT_VI_THRESHOLD_SEL BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_FAST_EDCA_PKT_TH 16</div><div class='del'>-#define BIT_MASK_VI_FAST_EDCA_PKT_TH 0x7f</div><div class='del'>-#define BIT_VI_FAST_EDCA_PKT_TH(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_FAST_EDCA_PKT_TH) &lt;&lt; BIT_SHIFT_VI_FAST_EDCA_PKT_TH)</div><div class='del'>-#define BIT_GET_VI_FAST_EDCA_PKT_TH(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_FAST_EDCA_PKT_TH) &amp; BIT_MASK_VI_FAST_EDCA_PKT_TH)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_FAST_EDCA_TO 8</div><div class='del'>-#define BIT_MASK_VO_FAST_EDCA_TO 0xff</div><div class='del'>-#define BIT_VO_FAST_EDCA_TO(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_FAST_EDCA_TO) &lt;&lt; BIT_SHIFT_VO_FAST_EDCA_TO)</div><div class='del'>-#define BIT_GET_VO_FAST_EDCA_TO(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_FAST_EDCA_TO) &amp; BIT_MASK_VO_FAST_EDCA_TO)</div><div class='del'>-</div><div class='del'>-#define BIT_VO_THRESHOLD_SEL BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_FAST_EDCA_PKT_TH 0</div><div class='del'>-#define BIT_MASK_VO_FAST_EDCA_PKT_TH 0x7f</div><div class='del'>-#define BIT_VO_FAST_EDCA_PKT_TH(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_FAST_EDCA_PKT_TH) &lt;&lt; BIT_SHIFT_VO_FAST_EDCA_PKT_TH)</div><div class='del'>-#define BIT_GET_VO_FAST_EDCA_PKT_TH(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_FAST_EDCA_PKT_TH) &amp; BIT_MASK_VO_FAST_EDCA_PKT_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FAST_EDCA_BEBK_SETTING		(Offset 0x144C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_FAST_EDCA_TO 24</div><div class='del'>-#define BIT_MASK_BK_FAST_EDCA_TO 0xff</div><div class='del'>-#define BIT_BK_FAST_EDCA_TO(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_FAST_EDCA_TO) &lt;&lt; BIT_SHIFT_BK_FAST_EDCA_TO)</div><div class='del'>-#define BIT_GET_BK_FAST_EDCA_TO(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_FAST_EDCA_TO) &amp; BIT_MASK_BK_FAST_EDCA_TO)</div><div class='del'>-</div><div class='del'>-#define BIT_BK_THRESHOLD_SEL BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_FAST_EDCA_PKT_TH 16</div><div class='del'>-#define BIT_MASK_BK_FAST_EDCA_PKT_TH 0x7f</div><div class='del'>-#define BIT_BK_FAST_EDCA_PKT_TH(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_FAST_EDCA_PKT_TH) &lt;&lt; BIT_SHIFT_BK_FAST_EDCA_PKT_TH)</div><div class='del'>-#define BIT_GET_BK_FAST_EDCA_PKT_TH(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_FAST_EDCA_PKT_TH) &amp; BIT_MASK_BK_FAST_EDCA_PKT_TH)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_FAST_EDCA_TO 8</div><div class='del'>-#define BIT_MASK_BE_FAST_EDCA_TO 0xff</div><div class='del'>-#define BIT_BE_FAST_EDCA_TO(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_FAST_EDCA_TO) &lt;&lt; BIT_SHIFT_BE_FAST_EDCA_TO)</div><div class='del'>-#define BIT_GET_BE_FAST_EDCA_TO(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_FAST_EDCA_TO) &amp; BIT_MASK_BE_FAST_EDCA_TO)</div><div class='del'>-</div><div class='del'>-#define BIT_BE_THRESHOLD_SEL BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_FAST_EDCA_PKT_TH 0</div><div class='del'>-#define BIT_MASK_BE_FAST_EDCA_PKT_TH 0x7f</div><div class='del'>-#define BIT_BE_FAST_EDCA_PKT_TH(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_FAST_EDCA_PKT_TH) &lt;&lt; BIT_SHIFT_BE_FAST_EDCA_PKT_TH)</div><div class='del'>-#define BIT_GET_BE_FAST_EDCA_PKT_TH(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_FAST_EDCA_PKT_TH) &amp; BIT_MASK_BE_FAST_EDCA_PKT_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP0				(Offset 0x1450) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID31_0_DROP 0</div><div class='del'>-#define BIT_MASK_MACID31_0_DROP 0xffffffffL</div><div class='del'>-#define BIT_MACID31_0_DROP(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID31_0_DROP) &lt;&lt; BIT_SHIFT_MACID31_0_DROP)</div><div class='del'>-#define BIT_GET_MACID31_0_DROP(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID31_0_DROP) &amp; BIT_MASK_MACID31_0_DROP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP1				(Offset 0x1454) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID63_32_DROP 0</div><div class='del'>-#define BIT_MASK_MACID63_32_DROP 0xffffffffL</div><div class='del'>-#define BIT_MACID63_32_DROP(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID63_32_DROP) &lt;&lt; BIT_SHIFT_MACID63_32_DROP)</div><div class='del'>-#define BIT_GET_MACID63_32_DROP(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID63_32_DROP) &amp; BIT_MASK_MACID63_32_DROP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP2				(Offset 0x1458) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID95_64_DROP 0</div><div class='del'>-#define BIT_MASK_MACID95_64_DROP 0xffffffffL</div><div class='del'>-#define BIT_MACID95_64_DROP(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID95_64_DROP) &lt;&lt; BIT_SHIFT_MACID95_64_DROP)</div><div class='del'>-#define BIT_GET_MACID95_64_DROP(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID95_64_DROP) &amp; BIT_MASK_MACID95_64_DROP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP3				(Offset 0x145C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID127_96_DROP 0</div><div class='del'>-#define BIT_MASK_MACID127_96_DROP 0xffffffffL</div><div class='del'>-#define BIT_MACID127_96_DROP(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID127_96_DROP) &lt;&lt; BIT_SHIFT_MACID127_96_DROP)</div><div class='del'>-#define BIT_GET_MACID127_96_DROP(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID127_96_DROP) &amp; BIT_MASK_MACID127_96_DROP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_0		(Offset 0x1460) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_0 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_0 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_0(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_0)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_0)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_0(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_0) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_1		(Offset 0x1464) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_1 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_1 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_1(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_1)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_1)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_1(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_1) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_2		(Offset 0x1468) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_2 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_2 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_2(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_2)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_2)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_2(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_2) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_3		(Offset 0x146C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_3 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_3 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_3(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_3)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_3)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_3(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_3) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGG_FIFO_CRTL			(Offset 0x1470) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_MGG_FIFO_EN BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_PG_SIZE 28</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_PG_SIZE 0x7</div><div class='del'>-#define BIT_R_MGG_FIFO_PG_SIZE(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_PG_SIZE) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_PG_SIZE)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_PG_SIZE(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_PG_SIZE) &amp; BIT_MASK_R_MGG_FIFO_PG_SIZE)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_START_PG 16</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_START_PG 0xfff</div><div class='del'>-#define BIT_R_MGG_FIFO_START_PG(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_START_PG) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_START_PG)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_START_PG(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_START_PG) &amp; BIT_MASK_R_MGG_FIFO_START_PG)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_SIZE 14</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_SIZE 0x3</div><div class='del'>-#define BIT_R_MGG_FIFO_SIZE(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_SIZE) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_SIZE)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_SIZE(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_SIZE) &amp; BIT_MASK_R_MGG_FIFO_SIZE)</div><div class='del'>-</div><div class='del'>-#define BIT_R_MGG_FIFO_PAUSE BIT(13)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_RPTR 8</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_RPTR 0x1f</div><div class='del'>-#define BIT_R_MGG_FIFO_RPTR(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_RPTR) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_RPTR)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_RPTR(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_RPTR) &amp; BIT_MASK_R_MGG_FIFO_RPTR)</div><div class='del'>-</div><div class='del'>-#define BIT_R_MGG_FIFO_OV BIT(7)</div><div class='del'>-#define BIT_R_MGG_FIFO_WPTR_ERROR BIT(6)</div><div class='del'>-#define BIT_R_EN_CPU_LIFETIME BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_WPTR 0</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_WPTR 0x1f</div><div class='del'>-#define BIT_R_MGG_FIFO_WPTR(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_WPTR) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_WPTR)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_WPTR(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_WPTR) &amp; BIT_MASK_R_MGG_FIFO_WPTR)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGG_FIFO_INT			(Offset 0x1474) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_INT_FLAG 16</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_INT_FLAG 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_INT_FLAG(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_INT_FLAG) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_INT_FLAG)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_INT_FLAG(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_INT_FLAG) &amp; BIT_MASK_R_MGG_FIFO_INT_FLAG)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_INT_MASK 0</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_INT_MASK 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_INT_MASK(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_INT_MASK) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_INT_MASK)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_INT_MASK(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_INT_MASK) &amp; BIT_MASK_R_MGG_FIFO_INT_MASK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGG_FIFO_LIFETIME			(Offset 0x1478) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_LIFETIME 16</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_LIFETIME 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_LIFETIME(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_LIFETIME) &lt;&lt; BIT_SHIFT_R_MGG_FIFO_LIFETIME)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_LIFETIME(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_LIFETIME) &amp; BIT_MASK_R_MGG_FIFO_LIFETIME)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_VALID_MAP 0</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_VALID_MAP 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_VALID_MAP(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_VALID_MAP)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_VALID_MAP)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_VALID_MAP(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_VALID_MAP) &amp;                             \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_VALID_MAP)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET (Offset 0x147C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET 0x7f</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET(x)                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET)                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET(x)                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET) &amp;             \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_P2PON_DIS_TXTIME 0</div><div class='del'>-#define BIT_MASK_P2PON_DIS_TXTIME 0xff</div><div class='del'>-#define BIT_P2PON_DIS_TXTIME(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_P2PON_DIS_TXTIME) &lt;&lt; BIT_SHIFT_P2PON_DIS_TXTIME)</div><div class='del'>-#define BIT_GET_P2PON_DIS_TXTIME(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_P2PON_DIS_TXTIME) &amp; BIT_MASK_P2PON_DIS_TXTIME)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SHCUT_OFFSET			(Offset 0x1480) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_SHCUT_OFFSET_V1 0</div><div class='del'>-#define BIT_MASK_MACID_SHCUT_OFFSET_V1 0xff</div><div class='del'>-#define BIT_MACID_SHCUT_OFFSET_V1(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_SHCUT_OFFSET_V1)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID_SHCUT_OFFSET_V1)</div><div class='del'>-#define BIT_GET_MACID_SHCUT_OFFSET_V1(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_SHCUT_OFFSET_V1) &amp;                            \</div><div class='del'>-	 BIT_MASK_MACID_SHCUT_OFFSET_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MU_TX_CTL				(Offset 0x14C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_EN_REVERS_GTAB BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_TABLE_VALID 0</div><div class='del'>-#define BIT_MASK_R_MU_TABLE_VALID 0x3f</div><div class='del'>-#define BIT_R_MU_TABLE_VALID(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_TABLE_VALID) &lt;&lt; BIT_SHIFT_R_MU_TABLE_VALID)</div><div class='del'>-#define BIT_GET_R_MU_TABLE_VALID(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_TABLE_VALID) &amp; BIT_MASK_R_MU_TABLE_VALID)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_STA_GTAB_VALID 0</div><div class='del'>-#define BIT_MASK_R_MU_STA_GTAB_VALID 0xffffffffL</div><div class='del'>-#define BIT_R_MU_STA_GTAB_VALID(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_STA_GTAB_VALID) &lt;&lt; BIT_SHIFT_R_MU_STA_GTAB_VALID)</div><div class='del'>-#define BIT_GET_R_MU_STA_GTAB_VALID(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_STA_GTAB_VALID) &amp; BIT_MASK_R_MU_STA_GTAB_VALID)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_STA_GTAB_POSITION 0</div><div class='del'>-#define BIT_MASK_R_MU_STA_GTAB_POSITION 0xffffffffffffffffL</div><div class='del'>-#define BIT_R_MU_STA_GTAB_POSITION(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_STA_GTAB_POSITION)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MU_STA_GTAB_POSITION)</div><div class='del'>-#define BIT_GET_R_MU_STA_GTAB_POSITION(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_STA_GTAB_POSITION) &amp;                           \</div><div class='del'>-	 BIT_MASK_R_MU_STA_GTAB_POSITION)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MU_TRX_DBG_CNT			(Offset 0x14D0) */</div><div class='del'>-</div><div class='del'>-#define BIT_MU_DNGCNT_RST BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MU_DBGCNT_SEL 16</div><div class='del'>-#define BIT_MASK_MU_DBGCNT_SEL 0xf</div><div class='del'>-#define BIT_MU_DBGCNT_SEL(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MU_DBGCNT_SEL) &lt;&lt; BIT_SHIFT_MU_DBGCNT_SEL)</div><div class='del'>-#define BIT_GET_MU_DBGCNT_SEL(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MU_DBGCNT_SEL) &amp; BIT_MASK_MU_DBGCNT_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MU_DNGCNT 0</div><div class='del'>-#define BIT_MASK_MU_DNGCNT 0xffff</div><div class='del'>-#define BIT_MU_DNGCNT(x) (((x) &amp; BIT_MASK_MU_DNGCNT) &lt;&lt; BIT_SHIFT_MU_DNGCNT)</div><div class='del'>-#define BIT_GET_MU_DNGCNT(x) (((x) &gt;&gt; BIT_SHIFT_MU_DNGCNT) &amp; BIT_MASK_MU_DNGCNT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPUMGQ_TX_TIMER			(Offset 0x1500) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPUMGQ_TX_TIMER_V1 0</div><div class='del'>-#define BIT_MASK_CPUMGQ_TX_TIMER_V1 0xffffffffL</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_V1(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPUMGQ_TX_TIMER_V1) &lt;&lt; BIT_SHIFT_CPUMGQ_TX_TIMER_V1)</div><div class='del'>-#define BIT_GET_CPUMGQ_TX_TIMER_V1(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPUMGQ_TX_TIMER_V1) &amp; BIT_MASK_CPUMGQ_TX_TIMER_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_A				(Offset 0x1504) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_A_V1 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_A_V1 0xffffffffL</div><div class='del'>-#define BIT_PS_TIMER_A_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_A_V1) &lt;&lt; BIT_SHIFT_PS_TIMER_A_V1)</div><div class='del'>-#define BIT_GET_PS_TIMER_A_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_A_V1) &amp; BIT_MASK_PS_TIMER_A_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_B				(Offset 0x1508) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_B_V1 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_B_V1 0xffffffffL</div><div class='del'>-#define BIT_PS_TIMER_B_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_B_V1) &lt;&lt; BIT_SHIFT_PS_TIMER_B_V1)</div><div class='del'>-#define BIT_GET_PS_TIMER_B_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_B_V1) &amp; BIT_MASK_PS_TIMER_B_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_C				(Offset 0x150C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_C_V1 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_C_V1 0xffffffffL</div><div class='del'>-#define BIT_PS_TIMER_C_V1(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_C_V1) &lt;&lt; BIT_SHIFT_PS_TIMER_C_V1)</div><div class='del'>-#define BIT_GET_PS_TIMER_C_V1(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_C_V1) &amp; BIT_MASK_PS_TIMER_C_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_ABC_CPUMGQ_TIMER_CRTL	(Offset 0x1510) */</div><div class='del'>-</div><div class='del'>-#define BIT_CPUMGQ_TIMER_EN BIT(31)</div><div class='del'>-#define BIT_CPUMGQ_TX_EN BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPUMGQ_TIMER_TSF_SEL 24</div><div class='del'>-#define BIT_MASK_CPUMGQ_TIMER_TSF_SEL 0x7</div><div class='del'>-#define BIT_CPUMGQ_TIMER_TSF_SEL(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPUMGQ_TIMER_TSF_SEL)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CPUMGQ_TIMER_TSF_SEL)</div><div class='del'>-#define BIT_GET_CPUMGQ_TIMER_TSF_SEL(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPUMGQ_TIMER_TSF_SEL) &amp;                             \</div><div class='del'>-	 BIT_MASK_CPUMGQ_TIMER_TSF_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_C_EN BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_C_TSF_SEL 16</div><div class='del'>-#define BIT_MASK_PS_TIMER_C_TSF_SEL 0x7</div><div class='del'>-#define BIT_PS_TIMER_C_TSF_SEL(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_C_TSF_SEL) &lt;&lt; BIT_SHIFT_PS_TIMER_C_TSF_SEL)</div><div class='del'>-#define BIT_GET_PS_TIMER_C_TSF_SEL(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_C_TSF_SEL) &amp; BIT_MASK_PS_TIMER_C_TSF_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_B_EN BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_B_TSF_SEL 8</div><div class='del'>-#define BIT_MASK_PS_TIMER_B_TSF_SEL 0x7</div><div class='del'>-#define BIT_PS_TIMER_B_TSF_SEL(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_B_TSF_SEL) &lt;&lt; BIT_SHIFT_PS_TIMER_B_TSF_SEL)</div><div class='del'>-#define BIT_GET_PS_TIMER_B_TSF_SEL(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_B_TSF_SEL) &amp; BIT_MASK_PS_TIMER_B_TSF_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_A_EN BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_A_TSF_SEL 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_A_TSF_SEL 0x7</div><div class='del'>-#define BIT_PS_TIMER_A_TSF_SEL(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_A_TSF_SEL) &lt;&lt; BIT_SHIFT_PS_TIMER_A_TSF_SEL)</div><div class='del'>-#define BIT_GET_PS_TIMER_A_TSF_SEL(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_A_TSF_SEL) &amp; BIT_MASK_PS_TIMER_A_TSF_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPUMGQ_TX_TIMER_EARLY		(Offset 0x1514) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPUMGQ_TX_TIMER_EARLY 0</div><div class='del'>-#define BIT_MASK_CPUMGQ_TX_TIMER_EARLY 0xff</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_EARLY(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPUMGQ_TX_TIMER_EARLY)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CPUMGQ_TX_TIMER_EARLY)</div><div class='del'>-#define BIT_GET_CPUMGQ_TX_TIMER_EARLY(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPUMGQ_TX_TIMER_EARLY) &amp;                            \</div><div class='del'>-	 BIT_MASK_CPUMGQ_TX_TIMER_EARLY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_A_EARLY			(Offset 0x1515) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_A_EARLY 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_A_EARLY 0xff</div><div class='del'>-#define BIT_PS_TIMER_A_EARLY(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_A_EARLY) &lt;&lt; BIT_SHIFT_PS_TIMER_A_EARLY)</div><div class='del'>-#define BIT_GET_PS_TIMER_A_EARLY(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_A_EARLY) &amp; BIT_MASK_PS_TIMER_A_EARLY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_B_EARLY			(Offset 0x1516) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_B_EARLY 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_B_EARLY 0xff</div><div class='del'>-#define BIT_PS_TIMER_B_EARLY(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_B_EARLY) &lt;&lt; BIT_SHIFT_PS_TIMER_B_EARLY)</div><div class='del'>-#define BIT_GET_PS_TIMER_B_EARLY(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_B_EARLY) &amp; BIT_MASK_PS_TIMER_B_EARLY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_C_EARLY			(Offset 0x1517) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_C_EARLY 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_C_EARLY 0xff</div><div class='del'>-#define BIT_PS_TIMER_C_EARLY(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_C_EARLY) &lt;&lt; BIT_SHIFT_PS_TIMER_C_EARLY)</div><div class='del'>-#define BIT_GET_PS_TIMER_C_EARLY(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_C_EARLY) &amp; BIT_MASK_PS_TIMER_C_EARLY)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT2			(Offset 0x1600) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT2 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT2 0xff</div><div class='del'>-#define BIT_DTIM_CNT2(x) (((x) &amp; BIT_MASK_DTIM_CNT2) &lt;&lt; BIT_SHIFT_DTIM_CNT2)</div><div class='del'>-#define BIT_GET_DTIM_CNT2(x) (((x) &gt;&gt; BIT_SHIFT_DTIM_CNT2) &amp; BIT_MASK_DTIM_CNT2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD2 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD2 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD2(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD2) &lt;&lt; BIT_SHIFT_DTIM_PERIOD2)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD2(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD2) &amp; BIT_MASK_DTIM_PERIOD2)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM2 BIT(15)</div><div class='del'>-#define BIT_TIM2 BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_2 0</div><div class='del'>-#define BIT_MASK_PS_AID_2 0x7ff</div><div class='del'>-#define BIT_PS_AID_2(x) (((x) &amp; BIT_MASK_PS_AID_2) &lt;&lt; BIT_SHIFT_PS_AID_2)</div><div class='del'>-#define BIT_GET_PS_AID_2(x) (((x) &gt;&gt; BIT_SHIFT_PS_AID_2) &amp; BIT_MASK_PS_AID_2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT3			(Offset 0x1604) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT3 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT3 0xff</div><div class='del'>-#define BIT_DTIM_CNT3(x) (((x) &amp; BIT_MASK_DTIM_CNT3) &lt;&lt; BIT_SHIFT_DTIM_CNT3)</div><div class='del'>-#define BIT_GET_DTIM_CNT3(x) (((x) &gt;&gt; BIT_SHIFT_DTIM_CNT3) &amp; BIT_MASK_DTIM_CNT3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD3 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD3 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD3(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD3) &lt;&lt; BIT_SHIFT_DTIM_PERIOD3)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD3(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD3) &amp; BIT_MASK_DTIM_PERIOD3)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM3 BIT(15)</div><div class='del'>-#define BIT_TIM3 BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_3 0</div><div class='del'>-#define BIT_MASK_PS_AID_3 0x7ff</div><div class='del'>-#define BIT_PS_AID_3(x) (((x) &amp; BIT_MASK_PS_AID_3) &lt;&lt; BIT_SHIFT_PS_AID_3)</div><div class='del'>-#define BIT_GET_PS_AID_3(x) (((x) &gt;&gt; BIT_SHIFT_PS_AID_3) &amp; BIT_MASK_PS_AID_3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT4			(Offset 0x1608) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT4 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT4 0xff</div><div class='del'>-#define BIT_DTIM_CNT4(x) (((x) &amp; BIT_MASK_DTIM_CNT4) &lt;&lt; BIT_SHIFT_DTIM_CNT4)</div><div class='del'>-#define BIT_GET_DTIM_CNT4(x) (((x) &gt;&gt; BIT_SHIFT_DTIM_CNT4) &amp; BIT_MASK_DTIM_CNT4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD4 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD4 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD4(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD4) &lt;&lt; BIT_SHIFT_DTIM_PERIOD4)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD4(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD4) &amp; BIT_MASK_DTIM_PERIOD4)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM4 BIT(15)</div><div class='del'>-#define BIT_TIM4 BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_4 0</div><div class='del'>-#define BIT_MASK_PS_AID_4 0x7ff</div><div class='del'>-#define BIT_PS_AID_4(x) (((x) &amp; BIT_MASK_PS_AID_4) &lt;&lt; BIT_SHIFT_PS_AID_4)</div><div class='del'>-#define BIT_GET_PS_AID_4(x) (((x) &gt;&gt; BIT_SHIFT_PS_AID_4) &amp; BIT_MASK_PS_AID_4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_A1_ADDR_MASK			(Offset 0x160C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_A1_ADDR_MASK 0</div><div class='del'>-#define BIT_MASK_A1_ADDR_MASK 0xffffffffL</div><div class='del'>-#define BIT_A1_ADDR_MASK(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_A1_ADDR_MASK) &lt;&lt; BIT_SHIFT_A1_ADDR_MASK)</div><div class='del'>-#define BIT_GET_A1_ADDR_MASK(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_A1_ADDR_MASK) &amp; BIT_MASK_A1_ADDR_MASK)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID2				(Offset 0x1620) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID2 0</div><div class='del'>-#define BIT_MASK_MACID2 0xffffffffffffL</div><div class='del'>-#define BIT_MACID2(x) (((x) &amp; BIT_MASK_MACID2) &lt;&lt; BIT_SHIFT_MACID2)</div><div class='del'>-#define BIT_GET_MACID2(x) (((x) &gt;&gt; BIT_SHIFT_MACID2) &amp; BIT_MASK_MACID2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID2				(Offset 0x1628) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID2 0</div><div class='del'>-#define BIT_MASK_BSSID2 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID2(x) (((x) &amp; BIT_MASK_BSSID2) &lt;&lt; BIT_SHIFT_BSSID2)</div><div class='del'>-#define BIT_GET_BSSID2(x) (((x) &gt;&gt; BIT_SHIFT_BSSID2) &amp; BIT_MASK_BSSID2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID3				(Offset 0x1630) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID3 0</div><div class='del'>-#define BIT_MASK_MACID3 0xffffffffffffL</div><div class='del'>-#define BIT_MACID3(x) (((x) &amp; BIT_MASK_MACID3) &lt;&lt; BIT_SHIFT_MACID3)</div><div class='del'>-#define BIT_GET_MACID3(x) (((x) &gt;&gt; BIT_SHIFT_MACID3) &amp; BIT_MASK_MACID3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID3				(Offset 0x1638) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID3 0</div><div class='del'>-#define BIT_MASK_BSSID3 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID3(x) (((x) &amp; BIT_MASK_BSSID3) &lt;&lt; BIT_SHIFT_BSSID3)</div><div class='del'>-#define BIT_GET_BSSID3(x) (((x) &gt;&gt; BIT_SHIFT_BSSID3) &amp; BIT_MASK_BSSID3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID4				(Offset 0x1640) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID4 0</div><div class='del'>-#define BIT_MASK_MACID4 0xffffffffffffL</div><div class='del'>-#define BIT_MACID4(x) (((x) &amp; BIT_MASK_MACID4) &lt;&lt; BIT_SHIFT_MACID4)</div><div class='del'>-#define BIT_GET_MACID4(x) (((x) &gt;&gt; BIT_SHIFT_MACID4) &amp; BIT_MASK_MACID4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID4				(Offset 0x1648) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID4 0</div><div class='del'>-#define BIT_MASK_BSSID4 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID4(x) (((x) &amp; BIT_MASK_BSSID4) &lt;&lt; BIT_SHIFT_BSSID4)</div><div class='del'>-#define BIT_GET_BSSID4(x) (((x) &gt;&gt; BIT_SHIFT_BSSID4) &amp; BIT_MASK_BSSID4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWRBIT_SETTING			(Offset 0x1660) */</div><div class='del'>-</div><div class='del'>-#define BIT_CLI3_PWRBIT_OW_EN BIT(7)</div><div class='del'>-#define BIT_CLI3_PWR_ST BIT(6)</div><div class='del'>-#define BIT_CLI2_PWRBIT_OW_EN BIT(5)</div><div class='del'>-#define BIT_CLI2_PWR_ST BIT(4)</div><div class='del'>-#define BIT_CLI1_PWRBIT_OW_EN BIT(3)</div><div class='del'>-#define BIT_CLI1_PWR_ST BIT(2)</div><div class='del'>-#define BIT_CLI0_PWRBIT_OW_EN BIT(1)</div><div class='del'>-#define BIT_CLI0_PWR_ST BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BF_OPTION			(Offset 0x167C) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_RESP_NONSTA1_DIS BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BF_OPTION			(Offset 0x167C) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIT_WMAC_TXMU_ACKPOLICY_EN BIT(6)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BF_OPTION			(Offset 0x167C) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_TXMU_ACKPOLICY 4</div><div class='del'>-#define BIT_MASK_WMAC_TXMU_ACKPOLICY 0x3</div><div class='del'>-#define BIT_WMAC_TXMU_ACKPOLICY(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_TXMU_ACKPOLICY) &lt;&lt; BIT_SHIFT_WMAC_TXMU_ACKPOLICY)</div><div class='del'>-#define BIT_GET_WMAC_TXMU_ACKPOLICY(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_TXMU_ACKPOLICY) &amp; BIT_MASK_WMAC_TXMU_ACKPOLICY)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE_PORT_SEL 1</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE_PORT_SEL 0x7</div><div class='del'>-#define BIT_WMAC_MU_BFEE_PORT_SEL(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE_PORT_SEL)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE_PORT_SEL)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE_PORT_SEL(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE_PORT_SEL) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE_PORT_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_MU_BFEE_DIS BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PAUSE_BB_CLR_TH		(Offset 0x167D) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PAUSE_BB_CLR_TH 0</div><div class='del'>-#define BIT_MASK_WMAC_PAUSE_BB_CLR_TH 0xff</div><div class='del'>-#define BIT_WMAC_PAUSE_BB_CLR_TH(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PAUSE_BB_CLR_TH)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_PAUSE_BB_CLR_TH)</div><div class='del'>-#define BIT_GET_WMAC_PAUSE_BB_CLR_TH(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PAUSE_BB_CLR_TH) &amp;                             \</div><div class='del'>-	 BIT_MASK_WMAC_PAUSE_BB_CLR_TH)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_ARB				(Offset 0x167E) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_ARB_HW_ADAPT_EN BIT(7)</div><div class='del'>-#define BIT_WMAC_ARB_SW_EN BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ARB_SW_STATE 0</div><div class='del'>-#define BIT_MASK_WMAC_ARB_SW_STATE 0x3f</div><div class='del'>-#define BIT_WMAC_ARB_SW_STATE(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ARB_SW_STATE) &lt;&lt; BIT_SHIFT_WMAC_ARB_SW_STATE)</div><div class='del'>-#define BIT_GET_WMAC_ARB_SW_STATE(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ARB_SW_STATE) &amp; BIT_MASK_WMAC_ARB_SW_STATE)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_OPTION			(Offset 0x167F) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_DBGSEL 5</div><div class='del'>-#define BIT_MASK_WMAC_MU_DBGSEL 0x3</div><div class='del'>-#define BIT_WMAC_MU_DBGSEL(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_DBGSEL) &lt;&lt; BIT_SHIFT_WMAC_MU_DBGSEL)</div><div class='del'>-#define BIT_GET_WMAC_MU_DBGSEL(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_DBGSEL) &amp; BIT_MASK_WMAC_MU_DBGSEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_CPRD_TIMEOUT 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_CPRD_TIMEOUT 0x1f</div><div class='del'>-#define BIT_WMAC_MU_CPRD_TIMEOUT(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_CPRD_TIMEOUT)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_CPRD_TIMEOUT)</div><div class='del'>-#define BIT_GET_WMAC_MU_CPRD_TIMEOUT(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_CPRD_TIMEOUT) &amp;                             \</div><div class='del'>-	 BIT_MASK_WMAC_MU_CPRD_TIMEOUT)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BF_CTL			(Offset 0x1680) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_INVLD_BFPRT_CHK BIT(15)</div><div class='del'>-#define BIT_WMAC_RETXBFRPTSEQ_UPD BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFRPTSEG_SEL 12</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFRPTSEG_SEL 0x3</div><div class='del'>-#define BIT_WMAC_MU_BFRPTSEG_SEL(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFRPTSEG_SEL)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFRPTSEG_SEL)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFRPTSEG_SEL(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFRPTSEG_SEL) &amp;                             \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFRPTSEG_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BF_MYAID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BF_MYAID 0xfff</div><div class='del'>-#define BIT_WMAC_MU_BF_MYAID(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BF_MYAID) &lt;&lt; BIT_SHIFT_WMAC_MU_BF_MYAID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BF_MYAID(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BF_MYAID) &amp; BIT_MASK_WMAC_MU_BF_MYAID)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BFRPT_PARA 0</div><div class='del'>-#define BIT_MASK_BFRPT_PARA 0xfff</div><div class='del'>-#define BIT_BFRPT_PARA(x) (((x) &amp; BIT_MASK_BFRPT_PARA) &lt;&lt; BIT_SHIFT_BFRPT_PARA)</div><div class='del'>-#define BIT_GET_BFRPT_PARA(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BFRPT_PARA) &amp; BIT_MASK_BFRPT_PARA)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BFRPT_PARA			(Offset 0x1682) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BIT_BFRPT_PARA_USERID_SEL 12</div><div class='del'>-#define BIT_MASK_BIT_BFRPT_PARA_USERID_SEL 0x7</div><div class='del'>-#define BIT_BIT_BFRPT_PARA_USERID_SEL(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_BIT_BFRPT_PARA_USERID_SEL)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BIT_BFRPT_PARA_USERID_SEL)</div><div class='del'>-#define BIT_GET_BIT_BFRPT_PARA_USERID_SEL(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BIT_BFRPT_PARA_USERID_SEL) &amp;                        \</div><div class='del'>-	 BIT_MASK_BIT_BFRPT_PARA_USERID_SEL)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE2		(Offset 0x1684) */</div><div class='del'>-</div><div class='del'>-#define BIT_STATUS_BFEE2 BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE2_EN BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE2_AID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE2_AID 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE2_AID(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE2_AID) &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE2_AID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE2_AID(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE2_AID) &amp; BIT_MASK_WMAC_MU_BFEE2_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE3		(Offset 0x1686) */</div><div class='del'>-</div><div class='del'>-#define BIT_STATUS_BFEE3 BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE3_EN BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE3_AID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE3_AID 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE3_AID(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE3_AID) &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE3_AID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE3_AID(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE3_AID) &amp; BIT_MASK_WMAC_MU_BFEE3_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE4		(Offset 0x1688) */</div><div class='del'>-</div><div class='del'>-#define BIT_STATUS_BFEE4 BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE4_EN BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE4_AID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE4_AID 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE4_AID(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE4_AID) &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE4_AID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE4_AID(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE4_AID) &amp; BIT_MASK_WMAC_MU_BFEE4_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE5		(Offset 0x168A) */</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_RX_SYNCFIFO_SYNC BIT(55)</div><div class='del'>-#define BIT_R_WMAC_RXRST_DLY BIT(54)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_REF_DROP BIT(53)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_UA1 BIT(52)</div><div class='del'>-#define BIT_STATUS_BFEE5 BIT(10)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE5		(Offset 0x168A) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_MU_BFEE5_EN BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE5_AID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE5_AID 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE5_AID(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE5_AID) &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE5_AID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE5_AID(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE5_AID) &amp; BIT_MASK_WMAC_MU_BFEE5_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE6		(Offset 0x168C) */</div><div class='del'>-</div><div class='del'>-#define BIT_STATUS_BFEE6 BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE6_EN BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE6_AID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE6_AID 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE6_AID(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE6_AID) &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE6_AID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE6_AID(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE6_AID) &amp; BIT_MASK_WMAC_MU_BFEE6_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE7		(Offset 0x168E) */</div><div class='del'>-</div><div class='del'>-#define BIT_BIT_STATUS_BFEE4 BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE7_EN BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE7_AID 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE7_AID 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE7_AID(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE7_AID) &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE7_AID)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE7_AID(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE7_AID) &amp; BIT_MASK_WMAC_MU_BFEE7_AID)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_BB_STOP_RX_COUNTER		(Offset 0x1690) */</div><div class='del'>-</div><div class='del'>-#define BIT_RST_ALL_COUNTER BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ABORT_RX_VBON_COUNTER 16</div><div class='del'>-#define BIT_MASK_ABORT_RX_VBON_COUNTER 0xff</div><div class='del'>-#define BIT_ABORT_RX_VBON_COUNTER(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_ABORT_RX_VBON_COUNTER)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_ABORT_RX_VBON_COUNTER)</div><div class='del'>-#define BIT_GET_ABORT_RX_VBON_COUNTER(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ABORT_RX_VBON_COUNTER) &amp;                            \</div><div class='del'>-	 BIT_MASK_ABORT_RX_VBON_COUNTER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ABORT_RX_RDRDY_COUNTER 8</div><div class='del'>-#define BIT_MASK_ABORT_RX_RDRDY_COUNTER 0xff</div><div class='del'>-#define BIT_ABORT_RX_RDRDY_COUNTER(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_ABORT_RX_RDRDY_COUNTER)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_ABORT_RX_RDRDY_COUNTER)</div><div class='del'>-#define BIT_GET_ABORT_RX_RDRDY_COUNTER(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ABORT_RX_RDRDY_COUNTER) &amp;                           \</div><div class='del'>-	 BIT_MASK_ABORT_RX_RDRDY_COUNTER)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VBON_EARLY_FALLING_COUNTER 0</div><div class='del'>-#define BIT_MASK_VBON_EARLY_FALLING_COUNTER 0xff</div><div class='del'>-#define BIT_VBON_EARLY_FALLING_COUNTER(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_VBON_EARLY_FALLING_COUNTER)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VBON_EARLY_FALLING_COUNTER)</div><div class='del'>-#define BIT_GET_VBON_EARLY_FALLING_COUNTER(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VBON_EARLY_FALLING_COUNTER) &amp;                       \</div><div class='del'>-	 BIT_MASK_VBON_EARLY_FALLING_COUNTER)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PLCP_MONITOR			(Offset 0x1694) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_PLCP_TRX_SEL BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PLCP_RDSIG_SEL 28</div><div class='del'>-#define BIT_MASK_WMAC_PLCP_RDSIG_SEL 0x7</div><div class='del'>-#define BIT_WMAC_PLCP_RDSIG_SEL(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PLCP_RDSIG_SEL) &lt;&lt; BIT_SHIFT_WMAC_PLCP_RDSIG_SEL)</div><div class='del'>-#define BIT_GET_WMAC_PLCP_RDSIG_SEL(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PLCP_RDSIG_SEL) &amp; BIT_MASK_WMAC_PLCP_RDSIG_SEL)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RATE_IDX 24</div><div class='del'>-#define BIT_MASK_WMAC_RATE_IDX 0xf</div><div class='del'>-#define BIT_WMAC_RATE_IDX(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RATE_IDX) &lt;&lt; BIT_SHIFT_WMAC_RATE_IDX)</div><div class='del'>-#define BIT_GET_WMAC_RATE_IDX(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RATE_IDX) &amp; BIT_MASK_WMAC_RATE_IDX)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PLCP_RDSIG 0</div><div class='del'>-#define BIT_MASK_WMAC_PLCP_RDSIG 0xffffff</div><div class='del'>-#define BIT_WMAC_PLCP_RDSIG(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PLCP_RDSIG) &lt;&lt; BIT_SHIFT_WMAC_PLCP_RDSIG)</div><div class='del'>-#define BIT_GET_WMAC_PLCP_RDSIG(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PLCP_RDSIG) &amp; BIT_MASK_WMAC_PLCP_RDSIG)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PLCP_MONITOR_MUTX		(Offset 0x1698) */</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_MUTX_IDX BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_0			(Offset 0x16A0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA0 0</div><div class='del'>-#define BIT_MASK_TA0 0xffffffffffffL</div><div class='del'>-#define BIT_TA0(x) (((x) &amp; BIT_MASK_TA0) &lt;&lt; BIT_SHIFT_TA0)</div><div class='del'>-#define BIT_GET_TA0(x) (((x) &gt;&gt; BIT_SHIFT_TA0) &amp; BIT_MASK_TA0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_1			(Offset 0x16A8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA1 0</div><div class='del'>-#define BIT_MASK_TA1 0xffffffffffffL</div><div class='del'>-#define BIT_TA1(x) (((x) &amp; BIT_MASK_TA1) &lt;&lt; BIT_SHIFT_TA1)</div><div class='del'>-#define BIT_GET_TA1(x) (((x) &gt;&gt; BIT_SHIFT_TA1) &amp; BIT_MASK_TA1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_2			(Offset 0x16B0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA2 0</div><div class='del'>-#define BIT_MASK_TA2 0xffffffffffffL</div><div class='del'>-#define BIT_TA2(x) (((x) &amp; BIT_MASK_TA2) &lt;&lt; BIT_SHIFT_TA2)</div><div class='del'>-#define BIT_GET_TA2(x) (((x) &gt;&gt; BIT_SHIFT_TA2) &amp; BIT_MASK_TA2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_3			(Offset 0x16B8) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA3 0</div><div class='del'>-#define BIT_MASK_TA3 0xffffffffffffL</div><div class='del'>-#define BIT_TA3(x) (((x) &amp; BIT_MASK_TA3) &lt;&lt; BIT_SHIFT_TA3)</div><div class='del'>-#define BIT_GET_TA3(x) (((x) &gt;&gt; BIT_SHIFT_TA3) &amp; BIT_MASK_TA3)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_4			(Offset 0x16C0) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA4 0</div><div class='del'>-#define BIT_MASK_TA4 0xffffffffffffL</div><div class='del'>-#define BIT_TA4(x) (((x) &amp; BIT_MASK_TA4) &lt;&lt; BIT_SHIFT_TA4)</div><div class='del'>-#define BIT_GET_TA4(x) (((x) &gt;&gt; BIT_SHIFT_TA4) &amp; BIT_MASK_TA4)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL2LTECOEX_INDIRECT_ACCESS_CTRL_V1 (Offset 0x1700) */</div><div class='del'>-</div><div class='del'>-#define BIT_LTECOEX_ACCESS_START_V1 BIT(31)</div><div class='del'>-#define BIT_LTECOEX_WRITE_MODE_V1 BIT(30)</div><div class='del'>-#define BIT_LTECOEX_READY_BIT_V1 BIT(29)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WRITE_BYTE_EN_V1 16</div><div class='del'>-#define BIT_MASK_WRITE_BYTE_EN_V1 0xf</div><div class='del'>-#define BIT_WRITE_BYTE_EN_V1(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_WRITE_BYTE_EN_V1) &lt;&lt; BIT_SHIFT_WRITE_BYTE_EN_V1)</div><div class='del'>-#define BIT_GET_WRITE_BYTE_EN_V1(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WRITE_BYTE_EN_V1) &amp; BIT_MASK_WRITE_BYTE_EN_V1)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTECOEX_REG_ADDR_V1 0</div><div class='del'>-#define BIT_MASK_LTECOEX_REG_ADDR_V1 0xffff</div><div class='del'>-#define BIT_LTECOEX_REG_ADDR_V1(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTECOEX_REG_ADDR_V1) &lt;&lt; BIT_SHIFT_LTECOEX_REG_ADDR_V1)</div><div class='del'>-#define BIT_GET_LTECOEX_REG_ADDR_V1(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTECOEX_REG_ADDR_V1) &amp; BIT_MASK_LTECOEX_REG_ADDR_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL2LTECOEX_INDIRECT_ACCESS_WRITE_DATA_V1 (Offset 0x1704) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTECOEX_W_DATA_V1 0</div><div class='del'>-#define BIT_MASK_LTECOEX_W_DATA_V1 0xffffffffL</div><div class='del'>-#define BIT_LTECOEX_W_DATA_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTECOEX_W_DATA_V1) &lt;&lt; BIT_SHIFT_LTECOEX_W_DATA_V1)</div><div class='del'>-#define BIT_GET_LTECOEX_W_DATA_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTECOEX_W_DATA_V1) &amp; BIT_MASK_LTECOEX_W_DATA_V1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL2LTECOEX_INDIRECT_ACCESS_READ_DATA_V1 (Offset 0x1708) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTECOEX_R_DATA_V1 0</div><div class='del'>-#define BIT_MASK_LTECOEX_R_DATA_V1 0xffffffffL</div><div class='del'>-#define BIT_LTECOEX_R_DATA_V1(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTECOEX_R_DATA_V1) &lt;&lt; BIT_SHIFT_LTECOEX_R_DATA_V1)</div><div class='del'>-#define BIT_GET_LTECOEX_R_DATA_V1(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTECOEX_R_DATA_V1) &amp; BIT_MASK_LTECOEX_R_DATA_V1)</div><div class='del'>-</div><div class='del'>-#endif /* __RTL_WLAN_BITDEF_H__ */</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h b/drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h<br/>deleted file mode 100644<br/>index 481ea6d01ca5..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12092 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef __INC_HALMAC_BIT_8822B_H</div><div class='del'>-#define __INC_HALMAC_BIT_8822B_H</div><div class='del'>-</div><div class='del'>-#define CPU_OPT_WIDTH 0x1F</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_ISO_CTRL_8822B */</div><div class='del'>-#define BIT_PWC_EV12V_8822B BIT(15)</div><div class='del'>-#define BIT_PWC_EV25V_8822B BIT(14)</div><div class='del'>-#define BIT_PA33V_EN_8822B BIT(13)</div><div class='del'>-#define BIT_PA12V_EN_8822B BIT(12)</div><div class='del'>-#define BIT_UA33V_EN_8822B BIT(11)</div><div class='del'>-#define BIT_UA12V_EN_8822B BIT(10)</div><div class='del'>-#define BIT_ISO_RFDIO_8822B BIT(9)</div><div class='del'>-#define BIT_ISO_EB2CORE_8822B BIT(8)</div><div class='del'>-#define BIT_ISO_DIOE_8822B BIT(7)</div><div class='del'>-#define BIT_ISO_WLPON2PP_8822B BIT(6)</div><div class='del'>-#define BIT_ISO_IP2MAC_WA2PP_8822B BIT(5)</div><div class='del'>-#define BIT_ISO_PD2CORE_8822B BIT(4)</div><div class='del'>-#define BIT_ISO_PA2PCIE_8822B BIT(3)</div><div class='del'>-#define BIT_ISO_UD2CORE_8822B BIT(2)</div><div class='del'>-#define BIT_ISO_UA2USB_8822B BIT(1)</div><div class='del'>-#define BIT_ISO_WD2PP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_FUNC_EN_8822B */</div><div class='del'>-#define BIT_FEN_MREGEN_8822B BIT(15)</div><div class='del'>-#define BIT_FEN_HWPDN_8822B BIT(14)</div><div class='del'>-#define BIT_EN_25_1_8822B BIT(13)</div><div class='del'>-#define BIT_FEN_ELDR_8822B BIT(12)</div><div class='del'>-#define BIT_FEN_DCORE_8822B BIT(11)</div><div class='del'>-#define BIT_FEN_CPUEN_8822B BIT(10)</div><div class='del'>-#define BIT_FEN_DIOE_8822B BIT(9)</div><div class='del'>-#define BIT_FEN_PCIED_8822B BIT(8)</div><div class='del'>-#define BIT_FEN_PPLL_8822B BIT(7)</div><div class='del'>-#define BIT_FEN_PCIEA_8822B BIT(6)</div><div class='del'>-#define BIT_FEN_DIO_PCIE_8822B BIT(5)</div><div class='del'>-#define BIT_FEN_USBD_8822B BIT(4)</div><div class='del'>-#define BIT_FEN_UPLL_8822B BIT(3)</div><div class='del'>-#define BIT_FEN_USBA_8822B BIT(2)</div><div class='del'>-#define BIT_FEN_BB_GLB_RSTN_8822B BIT(1)</div><div class='del'>-#define BIT_FEN_BBRSTB_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_PW_CTRL_8822B */</div><div class='del'>-#define BIT_SOP_EABM_8822B BIT(31)</div><div class='del'>-#define BIT_SOP_ACKF_8822B BIT(30)</div><div class='del'>-#define BIT_SOP_ERCK_8822B BIT(29)</div><div class='del'>-#define BIT_SOP_ESWR_8822B BIT(28)</div><div class='del'>-#define BIT_SOP_PWMM_8822B BIT(27)</div><div class='del'>-#define BIT_SOP_EECK_8822B BIT(26)</div><div class='del'>-#define BIT_SOP_EXTL_8822B BIT(24)</div><div class='del'>-#define BIT_SYM_OP_RING_12M_8822B BIT(22)</div><div class='del'>-#define BIT_ROP_SWPR_8822B BIT(21)</div><div class='del'>-#define BIT_DIS_HW_LPLDM_8822B BIT(20)</div><div class='del'>-#define BIT_OPT_SWRST_WLMCU_8822B BIT(19)</div><div class='del'>-#define BIT_RDY_SYSPWR_8822B BIT(17)</div><div class='del'>-#define BIT_EN_WLON_8822B BIT(16)</div><div class='del'>-#define BIT_APDM_HPDN_8822B BIT(15)</div><div class='del'>-#define BIT_AFSM_PCIE_SUS_EN_8822B BIT(12)</div><div class='del'>-#define BIT_AFSM_WLSUS_EN_8822B BIT(11)</div><div class='del'>-#define BIT_APFM_SWLPS_8822B BIT(10)</div><div class='del'>-#define BIT_APFM_OFFMAC_8822B BIT(9)</div><div class='del'>-#define BIT_APFN_ONMAC_8822B BIT(8)</div><div class='del'>-#define BIT_CHIP_PDN_EN_8822B BIT(7)</div><div class='del'>-#define BIT_RDY_MACDIS_8822B BIT(6)</div><div class='del'>-#define BIT_RING_CLK_12M_EN_8822B BIT(4)</div><div class='del'>-#define BIT_PFM_WOWL_8822B BIT(3)</div><div class='del'>-#define BIT_PFM_LDKP_8822B BIT(2)</div><div class='del'>-#define BIT_WL_HCI_ALD_8822B BIT(1)</div><div class='del'>-#define BIT_PFM_LDALL_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CLK_CTRL_8822B */</div><div class='del'>-#define BIT_LDO_DUMMY_8822B BIT(15)</div><div class='del'>-#define BIT_CPU_CLK_EN_8822B BIT(14)</div><div class='del'>-#define BIT_SYMREG_CLK_EN_8822B BIT(13)</div><div class='del'>-#define BIT_HCI_CLK_EN_8822B BIT(12)</div><div class='del'>-#define BIT_MAC_CLK_EN_8822B BIT(11)</div><div class='del'>-#define BIT_SEC_CLK_EN_8822B BIT(10)</div><div class='del'>-#define BIT_PHY_SSC_RSTB_8822B BIT(9)</div><div class='del'>-#define BIT_EXT_32K_EN_8822B BIT(8)</div><div class='del'>-#define BIT_WL_CLK_TEST_8822B BIT(7)</div><div class='del'>-#define BIT_OP_SPS_PWM_EN_8822B BIT(6)</div><div class='del'>-#define BIT_LOADER_CLK_EN_8822B BIT(5)</div><div class='del'>-#define BIT_MACSLP_8822B BIT(4)</div><div class='del'>-#define BIT_WAKEPAD_EN_8822B BIT(3)</div><div class='del'>-#define BIT_ROMD16V_EN_8822B BIT(2)</div><div class='del'>-#define BIT_CKANA12M_EN_8822B BIT(1)</div><div class='del'>-#define BIT_CNTD16V_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_EEPROM_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VPDIDX_8822B 8</div><div class='del'>-#define BIT_MASK_VPDIDX_8822B 0xff</div><div class='del'>-#define BIT_VPDIDX_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_VPDIDX_8822B) &lt;&lt; BIT_SHIFT_VPDIDX_8822B)</div><div class='del'>-#define BIT_GET_VPDIDX_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VPDIDX_8822B) &amp; BIT_MASK_VPDIDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EEM1_0_8822B 6</div><div class='del'>-#define BIT_MASK_EEM1_0_8822B 0x3</div><div class='del'>-#define BIT_EEM1_0_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_EEM1_0_8822B) &lt;&lt; BIT_SHIFT_EEM1_0_8822B)</div><div class='del'>-#define BIT_GET_EEM1_0_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EEM1_0_8822B) &amp; BIT_MASK_EEM1_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_AUTOLOAD_SUS_8822B BIT(5)</div><div class='del'>-#define BIT_EERPOMSEL_8822B BIT(4)</div><div class='del'>-#define BIT_EECS_V1_8822B BIT(3)</div><div class='del'>-#define BIT_EESK_V1_8822B BIT(2)</div><div class='del'>-#define BIT_EEDI_V1_8822B BIT(1)</div><div class='del'>-#define BIT_EEDO_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EE_VPD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VPD_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_VPD_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_VPD_DATA_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_VPD_DATA_8822B) &lt;&lt; BIT_SHIFT_VPD_DATA_8822B)</div><div class='del'>-#define BIT_GET_VPD_DATA_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VPD_DATA_8822B) &amp; BIT_MASK_VPD_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL1_8822B */</div><div class='del'>-#define BIT_C2_L_BIT0_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C1_L_8822B 29</div><div class='del'>-#define BIT_MASK_C1_L_8822B 0x3</div><div class='del'>-#define BIT_C1_L_8822B(x) (((x) &amp; BIT_MASK_C1_L_8822B) &lt;&lt; BIT_SHIFT_C1_L_8822B)</div><div class='del'>-#define BIT_GET_C1_L_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_C1_L_8822B) &amp; BIT_MASK_C1_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_FREQ_L_8822B 25</div><div class='del'>-#define BIT_MASK_REG_FREQ_L_8822B 0x7</div><div class='del'>-#define BIT_REG_FREQ_L_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_FREQ_L_8822B) &lt;&lt; BIT_SHIFT_REG_FREQ_L_8822B)</div><div class='del'>-#define BIT_GET_REG_FREQ_L_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_FREQ_L_8822B) &amp; BIT_MASK_REG_FREQ_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_EN_DUTY_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_MODE_8822B 22</div><div class='del'>-#define BIT_MASK_REG_MODE_8822B 0x3</div><div class='del'>-#define BIT_REG_MODE_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_MODE_8822B) &lt;&lt; BIT_SHIFT_REG_MODE_8822B)</div><div class='del'>-#define BIT_GET_REG_MODE_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_MODE_8822B) &amp; BIT_MASK_REG_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_EN_SP_8822B BIT(21)</div><div class='del'>-#define BIT_REG_AUTO_L_8822B BIT(20)</div><div class='del'>-#define BIT_SW18_SELD_BIT0_8822B BIT(19)</div><div class='del'>-#define BIT_SW18_POWOCP_8822B BIT(18)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OCP_L1_8822B 15</div><div class='del'>-#define BIT_MASK_OCP_L1_8822B 0x7</div><div class='del'>-#define BIT_OCP_L1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_OCP_L1_8822B) &lt;&lt; BIT_SHIFT_OCP_L1_8822B)</div><div class='del'>-#define BIT_GET_OCP_L1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OCP_L1_8822B) &amp; BIT_MASK_OCP_L1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CF_L_8822B 13</div><div class='del'>-#define BIT_MASK_CF_L_8822B 0x3</div><div class='del'>-#define BIT_CF_L_8822B(x) (((x) &amp; BIT_MASK_CF_L_8822B) &lt;&lt; BIT_SHIFT_CF_L_8822B)</div><div class='del'>-#define BIT_GET_CF_L_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CF_L_8822B) &amp; BIT_MASK_CF_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_FPWM_8822B BIT(11)</div><div class='del'>-#define BIT_SW18_SWEN_8822B BIT(9)</div><div class='del'>-#define BIT_SW18_LDEN_8822B BIT(8)</div><div class='del'>-#define BIT_MAC_ID_EN_8822B BIT(7)</div><div class='del'>-#define BIT_AFE_BGEN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL2_8822B */</div><div class='del'>-#define BIT_POW_ZCD_L_8822B BIT(31)</div><div class='del'>-#define BIT_AUTOZCD_L_8822B BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_DELAY_8822B 28</div><div class='del'>-#define BIT_MASK_REG_DELAY_8822B 0x3</div><div class='del'>-#define BIT_REG_DELAY_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_DELAY_8822B) &lt;&lt; BIT_SHIFT_REG_DELAY_8822B)</div><div class='del'>-#define BIT_GET_REG_DELAY_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_DELAY_8822B) &amp; BIT_MASK_REG_DELAY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_V15ADJ_L1_V1_8822B 24</div><div class='del'>-#define BIT_MASK_V15ADJ_L1_V1_8822B 0x7</div><div class='del'>-#define BIT_V15ADJ_L1_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_V15ADJ_L1_V1_8822B) &lt;&lt; BIT_SHIFT_V15ADJ_L1_V1_8822B)</div><div class='del'>-#define BIT_GET_V15ADJ_L1_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_V15ADJ_L1_V1_8822B) &amp; BIT_MASK_V15ADJ_L1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOL_L1_V1_8822B 20</div><div class='del'>-#define BIT_MASK_VOL_L1_V1_8822B 0xf</div><div class='del'>-#define BIT_VOL_L1_V1_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOL_L1_V1_8822B) &lt;&lt; BIT_SHIFT_VOL_L1_V1_8822B)</div><div class='del'>-#define BIT_GET_VOL_L1_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOL_L1_V1_8822B) &amp; BIT_MASK_VOL_L1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IN_L1_V1_8822B 17</div><div class='del'>-#define BIT_MASK_IN_L1_V1_8822B 0x7</div><div class='del'>-#define BIT_IN_L1_V1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_IN_L1_V1_8822B) &lt;&lt; BIT_SHIFT_IN_L1_V1_8822B)</div><div class='del'>-#define BIT_GET_IN_L1_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IN_L1_V1_8822B) &amp; BIT_MASK_IN_L1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBOX_L1_8822B 15</div><div class='del'>-#define BIT_MASK_TBOX_L1_8822B 0x3</div><div class='del'>-#define BIT_TBOX_L1_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBOX_L1_8822B) &lt;&lt; BIT_SHIFT_TBOX_L1_8822B)</div><div class='del'>-#define BIT_GET_TBOX_L1_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBOX_L1_8822B) &amp; BIT_MASK_TBOX_L1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SW18_SEL_8822B BIT(13)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-#define BIT_SW18_SD_8822B BIT(10)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R3_L_8822B 7</div><div class='del'>-#define BIT_MASK_R3_L_8822B 0x3</div><div class='del'>-#define BIT_R3_L_8822B(x) (((x) &amp; BIT_MASK_R3_L_8822B) &lt;&lt; BIT_SHIFT_R3_L_8822B)</div><div class='del'>-#define BIT_GET_R3_L_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R3_L_8822B) &amp; BIT_MASK_R3_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SW18_R2_8822B 5</div><div class='del'>-#define BIT_MASK_SW18_R2_8822B 0x3</div><div class='del'>-#define BIT_SW18_R2_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SW18_R2_8822B) &lt;&lt; BIT_SHIFT_SW18_R2_8822B)</div><div class='del'>-#define BIT_GET_SW18_R2_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SW18_R2_8822B) &amp; BIT_MASK_SW18_R2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SW18_R1_8822B 3</div><div class='del'>-#define BIT_MASK_SW18_R1_8822B 0x3</div><div class='del'>-#define BIT_SW18_R1_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_SW18_R1_8822B) &lt;&lt; BIT_SHIFT_SW18_R1_8822B)</div><div class='del'>-#define BIT_GET_SW18_R1_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SW18_R1_8822B) &amp; BIT_MASK_SW18_R1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C3_L_C3_8822B 1</div><div class='del'>-#define BIT_MASK_C3_L_C3_8822B 0x3</div><div class='del'>-#define BIT_C3_L_C3_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_C3_L_C3_8822B) &lt;&lt; BIT_SHIFT_C3_L_C3_8822B)</div><div class='del'>-#define BIT_GET_C3_L_C3_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_C3_L_C3_8822B) &amp; BIT_MASK_C3_L_C3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_C2_L_BIT1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SWR_CTRL3_8822B */</div><div class='del'>-#define BIT_SPS18_OCP_DIS_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPS18_OCP_TH_8822B 16</div><div class='del'>-#define BIT_MASK_SPS18_OCP_TH_8822B 0x7fff</div><div class='del'>-#define BIT_SPS18_OCP_TH_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPS18_OCP_TH_8822B) &lt;&lt; BIT_SHIFT_SPS18_OCP_TH_8822B)</div><div class='del'>-#define BIT_GET_SPS18_OCP_TH_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPS18_OCP_TH_8822B) &amp; BIT_MASK_SPS18_OCP_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OCP_WINDOW_8822B 0</div><div class='del'>-#define BIT_MASK_OCP_WINDOW_8822B 0xffff</div><div class='del'>-#define BIT_OCP_WINDOW_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_OCP_WINDOW_8822B) &lt;&lt; BIT_SHIFT_OCP_WINDOW_8822B)</div><div class='del'>-#define BIT_GET_OCP_WINDOW_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OCP_WINDOW_8822B) &amp; BIT_MASK_OCP_WINDOW_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSV_CTRL_8822B */</div><div class='del'>-#define BIT_HREG_DBG_8822B BIT(23)</div><div class='del'>-#define BIT_WLMCUIOIF_8822B BIT(8)</div><div class='del'>-#define BIT_LOCK_ALL_EN_8822B BIT(7)</div><div class='del'>-#define BIT_R_DIS_PRST_8822B BIT(6)</div><div class='del'>-#define BIT_WLOCK_1C_B6_8822B BIT(5)</div><div class='del'>-#define BIT_WLOCK_40_8822B BIT(4)</div><div class='del'>-#define BIT_WLOCK_08_8822B BIT(3)</div><div class='del'>-#define BIT_WLOCK_04_8822B BIT(2)</div><div class='del'>-#define BIT_WLOCK_00_8822B BIT(1)</div><div class='del'>-#define BIT_WLOCK_ALL_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RF_CTRL_8822B */</div><div class='del'>-#define BIT_RF_SDMRSTB_8822B BIT(2)</div><div class='del'>-#define BIT_RF_RSTB_8822B BIT(1)</div><div class='del'>-#define BIT_RF_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_LDO_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPLDH12_RSV_8822B 29</div><div class='del'>-#define BIT_MASK_LPLDH12_RSV_8822B 0x7</div><div class='del'>-#define BIT_LPLDH12_RSV_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPLDH12_RSV_8822B) &lt;&lt; BIT_SHIFT_LPLDH12_RSV_8822B)</div><div class='del'>-#define BIT_GET_LPLDH12_RSV_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPLDH12_RSV_8822B) &amp; BIT_MASK_LPLDH12_RSV_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_LPLDH12_SLP_8822B BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPLDH12_VADJ_8822B 24</div><div class='del'>-#define BIT_MASK_LPLDH12_VADJ_8822B 0xf</div><div class='del'>-#define BIT_LPLDH12_VADJ_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPLDH12_VADJ_8822B) &lt;&lt; BIT_SHIFT_LPLDH12_VADJ_8822B)</div><div class='del'>-#define BIT_GET_LPLDH12_VADJ_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPLDH12_VADJ_8822B) &amp; BIT_MASK_LPLDH12_VADJ_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_LDH12_EN_8822B BIT(16)</div><div class='del'>-#define BIT_WLBBOFF_BIG_PWC_EN_8822B BIT(14)</div><div class='del'>-#define BIT_WLBBOFF_SMALL_PWC_EN_8822B BIT(13)</div><div class='del'>-#define BIT_WLMACOFF_BIG_PWC_EN_8822B BIT(12)</div><div class='del'>-#define BIT_WLPON_PWC_EN_8822B BIT(11)</div><div class='del'>-#define BIT_POW_REGU_P1_8822B BIT(10)</div><div class='del'>-#define BIT_LDOV12W_EN_8822B BIT(8)</div><div class='del'>-#define BIT_EX_XTAL_DRV_DIGI_8822B BIT(7)</div><div class='del'>-#define BIT_EX_XTAL_DRV_USB_8822B BIT(6)</div><div class='del'>-#define BIT_EX_XTAL_DRV_AFE_8822B BIT(5)</div><div class='del'>-#define BIT_EX_XTAL_DRV_RF2_8822B BIT(4)</div><div class='del'>-#define BIT_EX_XTAL_DRV_RF1_8822B BIT(3)</div><div class='del'>-#define BIT_POW_REGU_P0_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-#define BIT_POW_PLL_LDO_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL1_8822B */</div><div class='del'>-#define BIT_AGPIO_GPE_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_CAP_XI_8822B 25</div><div class='del'>-#define BIT_MASK_XTAL_CAP_XI_8822B 0x3f</div><div class='del'>-#define BIT_XTAL_CAP_XI_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_CAP_XI_8822B) &lt;&lt; BIT_SHIFT_XTAL_CAP_XI_8822B)</div><div class='del'>-#define BIT_GET_XTAL_CAP_XI_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_CAP_XI_8822B) &amp; BIT_MASK_XTAL_CAP_XI_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_DIGI_8822B 23</div><div class='del'>-#define BIT_MASK_XTAL_DRV_DIGI_8822B 0x3</div><div class='del'>-#define BIT_XTAL_DRV_DIGI_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_DIGI_8822B) &lt;&lt; BIT_SHIFT_XTAL_DRV_DIGI_8822B)</div><div class='del'>-#define BIT_GET_XTAL_DRV_DIGI_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_DIGI_8822B) &amp; BIT_MASK_XTAL_DRV_DIGI_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DRV_USB_BIT1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_CLK_SEL_8822B 20</div><div class='del'>-#define BIT_MASK_MAC_CLK_SEL_8822B 0x3</div><div class='del'>-#define BIT_MAC_CLK_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_CLK_SEL_8822B) &lt;&lt; BIT_SHIFT_MAC_CLK_SEL_8822B)</div><div class='del'>-#define BIT_GET_MAC_CLK_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_CLK_SEL_8822B) &amp; BIT_MASK_MAC_CLK_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DRV_USB_BIT0_8822B BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_AFE_8822B 17</div><div class='del'>-#define BIT_MASK_XTAL_DRV_AFE_8822B 0x3</div><div class='del'>-#define BIT_XTAL_DRV_AFE_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_AFE_8822B) &lt;&lt; BIT_SHIFT_XTAL_DRV_AFE_8822B)</div><div class='del'>-#define BIT_GET_XTAL_DRV_AFE_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_AFE_8822B) &amp; BIT_MASK_XTAL_DRV_AFE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_RF2_8822B 15</div><div class='del'>-#define BIT_MASK_XTAL_DRV_RF2_8822B 0x3</div><div class='del'>-#define BIT_XTAL_DRV_RF2_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_RF2_8822B) &lt;&lt; BIT_SHIFT_XTAL_DRV_RF2_8822B)</div><div class='del'>-#define BIT_GET_XTAL_DRV_RF2_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_RF2_8822B) &amp; BIT_MASK_XTAL_DRV_RF2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_DRV_RF1_8822B 13</div><div class='del'>-#define BIT_MASK_XTAL_DRV_RF1_8822B 0x3</div><div class='del'>-#define BIT_XTAL_DRV_RF1_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_DRV_RF1_8822B) &lt;&lt; BIT_SHIFT_XTAL_DRV_RF1_8822B)</div><div class='del'>-#define BIT_GET_XTAL_DRV_RF1_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_DRV_RF1_8822B) &amp; BIT_MASK_XTAL_DRV_RF1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_DELAY_DIGI_8822B BIT(12)</div><div class='del'>-#define BIT_XTAL_DELAY_USB_8822B BIT(11)</div><div class='del'>-#define BIT_XTAL_DELAY_AFE_8822B BIT(10)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_LDO_VREF_8822B 7</div><div class='del'>-#define BIT_MASK_XTAL_LDO_VREF_8822B 0x7</div><div class='del'>-#define BIT_XTAL_LDO_VREF_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_LDO_VREF_8822B) &lt;&lt; BIT_SHIFT_XTAL_LDO_VREF_8822B)</div><div class='del'>-#define BIT_GET_XTAL_LDO_VREF_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_LDO_VREF_8822B) &amp; BIT_MASK_XTAL_LDO_VREF_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_XQSEL_RF_8822B BIT(6)</div><div class='del'>-#define BIT_XTAL_XQSEL_8822B BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_GMN_V2_8822B 3</div><div class='del'>-#define BIT_MASK_XTAL_GMN_V2_8822B 0x3</div><div class='del'>-#define BIT_XTAL_GMN_V2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_GMN_V2_8822B) &lt;&lt; BIT_SHIFT_XTAL_GMN_V2_8822B)</div><div class='del'>-#define BIT_GET_XTAL_GMN_V2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_GMN_V2_8822B) &amp; BIT_MASK_XTAL_GMN_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_GMP_V2_8822B 1</div><div class='del'>-#define BIT_MASK_XTAL_GMP_V2_8822B 0x3</div><div class='del'>-#define BIT_XTAL_GMP_V2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_GMP_V2_8822B) &lt;&lt; BIT_SHIFT_XTAL_GMP_V2_8822B)</div><div class='del'>-#define BIT_GET_XTAL_GMP_V2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_GMP_V2_8822B) &amp; BIT_MASK_XTAL_GMP_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_XTAL_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_C3_V4_8822B 30</div><div class='del'>-#define BIT_MASK_REG_C3_V4_8822B 0x3</div><div class='del'>-#define BIT_REG_C3_V4_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_C3_V4_8822B) &lt;&lt; BIT_SHIFT_REG_C3_V4_8822B)</div><div class='del'>-#define BIT_GET_REG_C3_V4_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_C3_V4_8822B) &amp; BIT_MASK_REG_C3_V4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_CP_BIT1_8822B BIT(29)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_RS_V4_8822B 26</div><div class='del'>-#define BIT_MASK_REG_RS_V4_8822B 0x7</div><div class='del'>-#define BIT_REG_RS_V4_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_RS_V4_8822B) &lt;&lt; BIT_SHIFT_REG_RS_V4_8822B)</div><div class='del'>-#define BIT_GET_REG_RS_V4_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_RS_V4_8822B) &amp; BIT_MASK_REG_RS_V4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG__CS_8822B 24</div><div class='del'>-#define BIT_MASK_REG__CS_8822B 0x3</div><div class='del'>-#define BIT_REG__CS_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG__CS_8822B) &lt;&lt; BIT_SHIFT_REG__CS_8822B)</div><div class='del'>-#define BIT_GET_REG__CS_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG__CS_8822B) &amp; BIT_MASK_REG__CS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_CP_OFFSET_8822B 21</div><div class='del'>-#define BIT_MASK_REG_CP_OFFSET_8822B 0x7</div><div class='del'>-#define BIT_REG_CP_OFFSET_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_CP_OFFSET_8822B) &lt;&lt; BIT_SHIFT_REG_CP_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_REG_CP_OFFSET_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_CP_OFFSET_8822B) &amp; BIT_MASK_REG_CP_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CP_BIAS_8822B 18</div><div class='del'>-#define BIT_MASK_CP_BIAS_8822B 0x7</div><div class='del'>-#define BIT_CP_BIAS_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_CP_BIAS_8822B) &lt;&lt; BIT_SHIFT_CP_BIAS_8822B)</div><div class='del'>-#define BIT_GET_CP_BIAS_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CP_BIAS_8822B) &amp; BIT_MASK_CP_BIAS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_IDOUBLE_V2_8822B BIT(17)</div><div class='del'>-#define BIT_EN_SYN_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCCO_8822B 14</div><div class='del'>-#define BIT_MASK_MCCO_8822B 0x3</div><div class='del'>-#define BIT_MCCO_8822B(x) (((x) &amp; BIT_MASK_MCCO_8822B) &lt;&lt; BIT_SHIFT_MCCO_8822B)</div><div class='del'>-#define BIT_GET_MCCO_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCCO_8822B) &amp; BIT_MASK_MCCO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_LDO_SEL_8822B 12</div><div class='del'>-#define BIT_MASK_REG_LDO_SEL_8822B 0x3</div><div class='del'>-#define BIT_REG_LDO_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_LDO_SEL_8822B) &lt;&lt; BIT_SHIFT_REG_LDO_SEL_8822B)</div><div class='del'>-#define BIT_GET_REG_LDO_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_LDO_SEL_8822B) &amp; BIT_MASK_REG_LDO_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_KVCO_V2_8822B BIT(10)</div><div class='del'>-#define BIT_AGPIO_GPO_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AGPIO_DRV_8822B 7</div><div class='del'>-#define BIT_MASK_AGPIO_DRV_8822B 0x3</div><div class='del'>-#define BIT_AGPIO_DRV_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_AGPIO_DRV_8822B) &lt;&lt; BIT_SHIFT_AGPIO_DRV_8822B)</div><div class='del'>-#define BIT_GET_AGPIO_DRV_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AGPIO_DRV_8822B) &amp; BIT_MASK_AGPIO_DRV_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_CAP_XO_8822B 1</div><div class='del'>-#define BIT_MASK_XTAL_CAP_XO_8822B 0x3f</div><div class='del'>-#define BIT_XTAL_CAP_XO_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_CAP_XO_8822B) &lt;&lt; BIT_SHIFT_XTAL_CAP_XO_8822B)</div><div class='del'>-#define BIT_GET_XTAL_CAP_XO_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_CAP_XO_8822B) &amp; BIT_MASK_XTAL_CAP_XO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_POW_PLL_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_8822B 7</div><div class='del'>-#define BIT_MASK_PS_8822B 0x7</div><div class='del'>-#define BIT_PS_8822B(x) (((x) &amp; BIT_MASK_PS_8822B) &lt;&lt; BIT_SHIFT_PS_8822B)</div><div class='del'>-#define BIT_GET_PS_8822B(x) (((x) &gt;&gt; BIT_SHIFT_PS_8822B) &amp; BIT_MASK_PS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PSEN_8822B BIT(6)</div><div class='del'>-#define BIT_DOGENB_8822B BIT(5)</div><div class='del'>-#define BIT_REG_MBIAS_8822B BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_R3_V4_8822B 1</div><div class='del'>-#define BIT_MASK_REG_R3_V4_8822B 0x7</div><div class='del'>-#define BIT_REG_R3_V4_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_R3_V4_8822B) &lt;&lt; BIT_SHIFT_REG_R3_V4_8822B)</div><div class='del'>-#define BIT_GET_REG_R3_V4_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_R3_V4_8822B) &amp; BIT_MASK_REG_R3_V4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_CP_BIT0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EFUSE_CTRL_8822B */</div><div class='del'>-#define BIT_EF_FLAG_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_PGPD_8822B 28</div><div class='del'>-#define BIT_MASK_EF_PGPD_8822B 0x7</div><div class='del'>-#define BIT_EF_PGPD_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_PGPD_8822B) &lt;&lt; BIT_SHIFT_EF_PGPD_8822B)</div><div class='del'>-#define BIT_GET_EF_PGPD_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_PGPD_8822B) &amp; BIT_MASK_EF_PGPD_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_RDT_8822B 24</div><div class='del'>-#define BIT_MASK_EF_RDT_8822B 0xf</div><div class='del'>-#define BIT_EF_RDT_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_RDT_8822B) &lt;&lt; BIT_SHIFT_EF_RDT_8822B)</div><div class='del'>-#define BIT_GET_EF_RDT_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_RDT_8822B) &amp; BIT_MASK_EF_RDT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_PGTS_8822B 20</div><div class='del'>-#define BIT_MASK_EF_PGTS_8822B 0xf</div><div class='del'>-#define BIT_EF_PGTS_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_PGTS_8822B) &lt;&lt; BIT_SHIFT_EF_PGTS_8822B)</div><div class='del'>-#define BIT_GET_EF_PGTS_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_PGTS_8822B) &amp; BIT_MASK_EF_PGTS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EF_PDWN_8822B BIT(19)</div><div class='del'>-#define BIT_EF_ALDEN_8822B BIT(18)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_ADDR_8822B 8</div><div class='del'>-#define BIT_MASK_EF_ADDR_8822B 0x3ff</div><div class='del'>-#define BIT_EF_ADDR_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_ADDR_8822B) &lt;&lt; BIT_SHIFT_EF_ADDR_8822B)</div><div class='del'>-#define BIT_GET_EF_ADDR_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_ADDR_8822B) &amp; BIT_MASK_EF_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_EF_DATA_8822B 0xff</div><div class='del'>-#define BIT_EF_DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_DATA_8822B) &lt;&lt; BIT_SHIFT_EF_DATA_8822B)</div><div class='del'>-#define BIT_GET_EF_DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_DATA_8822B) &amp; BIT_MASK_EF_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_EFUSE_CTRL_8822B */</div><div class='del'>-#define BIT_LDOE25_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LDOE25_V12ADJ_L_8822B 27</div><div class='del'>-#define BIT_MASK_LDOE25_V12ADJ_L_8822B 0xf</div><div class='del'>-#define BIT_LDOE25_V12ADJ_L_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_LDOE25_V12ADJ_L_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LDOE25_V12ADJ_L_8822B)</div><div class='del'>-#define BIT_GET_LDOE25_V12ADJ_L_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LDOE25_V12ADJ_L_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_LDOE25_V12ADJ_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EF_CRES_SEL_8822B BIT(26)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_SCAN_START_V1_8822B 16</div><div class='del'>-#define BIT_MASK_EF_SCAN_START_V1_8822B 0x3ff</div><div class='del'>-#define BIT_EF_SCAN_START_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_SCAN_START_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EF_SCAN_START_V1_8822B)</div><div class='del'>-#define BIT_GET_EF_SCAN_START_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_SCAN_START_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_EF_SCAN_START_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_SCAN_END_8822B 12</div><div class='del'>-#define BIT_MASK_EF_SCAN_END_8822B 0xf</div><div class='del'>-#define BIT_EF_SCAN_END_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_SCAN_END_8822B) &lt;&lt; BIT_SHIFT_EF_SCAN_END_8822B)</div><div class='del'>-#define BIT_GET_EF_SCAN_END_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_SCAN_END_8822B) &amp; BIT_MASK_EF_SCAN_END_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EF_PD_DIS_8822B BIT(11)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_CELL_SEL_8822B 8</div><div class='del'>-#define BIT_MASK_EF_CELL_SEL_8822B 0x3</div><div class='del'>-#define BIT_EF_CELL_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_CELL_SEL_8822B) &lt;&lt; BIT_SHIFT_EF_CELL_SEL_8822B)</div><div class='del'>-#define BIT_GET_EF_CELL_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_CELL_SEL_8822B) &amp; BIT_MASK_EF_CELL_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EF_TRPT_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EF_TTHD_8822B 0</div><div class='del'>-#define BIT_MASK_EF_TTHD_8822B 0x7f</div><div class='del'>-#define BIT_EF_TTHD_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_EF_TTHD_8822B) &lt;&lt; BIT_SHIFT_EF_TTHD_8822B)</div><div class='del'>-#define BIT_GET_EF_TTHD_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EF_TTHD_8822B) &amp; BIT_MASK_EF_TTHD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWR_OPTION_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBG_SEL_V1_8822B 16</div><div class='del'>-#define BIT_MASK_DBG_SEL_V1_8822B 0xff</div><div class='del'>-#define BIT_DBG_SEL_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBG_SEL_V1_8822B) &lt;&lt; BIT_SHIFT_DBG_SEL_V1_8822B)</div><div class='del'>-#define BIT_GET_DBG_SEL_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBG_SEL_V1_8822B) &amp; BIT_MASK_DBG_SEL_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBG_SEL_BYTE_8822B 14</div><div class='del'>-#define BIT_MASK_DBG_SEL_BYTE_8822B 0x3</div><div class='del'>-#define BIT_DBG_SEL_BYTE_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBG_SEL_BYTE_8822B) &lt;&lt; BIT_SHIFT_DBG_SEL_BYTE_8822B)</div><div class='del'>-#define BIT_GET_DBG_SEL_BYTE_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBG_SEL_BYTE_8822B) &amp; BIT_MASK_DBG_SEL_BYTE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STD_L1_V1_8822B 12</div><div class='del'>-#define BIT_MASK_STD_L1_V1_8822B 0x3</div><div class='del'>-#define BIT_STD_L1_V1_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STD_L1_V1_8822B) &lt;&lt; BIT_SHIFT_STD_L1_V1_8822B)</div><div class='del'>-#define BIT_GET_STD_L1_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STD_L1_V1_8822B) &amp; BIT_MASK_STD_L1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SYSON_DBG_PAD_E2_8822B BIT(11)</div><div class='del'>-#define BIT_SYSON_LED_PAD_E2_8822B BIT(10)</div><div class='del'>-#define BIT_SYSON_GPEE_PAD_E2_8822B BIT(9)</div><div class='del'>-#define BIT_SYSON_PCI_PAD_E2_8822B BIT(8)</div><div class='del'>-#define BIT_AUTO_SW_LDO_VOL_EN_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_SPS0WWV_WT_8822B 4</div><div class='del'>-#define BIT_MASK_SYSON_SPS0WWV_WT_8822B 0x3</div><div class='del'>-#define BIT_SYSON_SPS0WWV_WT_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_SPS0WWV_WT_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SYSON_SPS0WWV_WT_8822B)</div><div class='del'>-#define BIT_GET_SYSON_SPS0WWV_WT_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_SPS0WWV_WT_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_SYSON_SPS0WWV_WT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_SPS0LDO_WT_8822B 2</div><div class='del'>-#define BIT_MASK_SYSON_SPS0LDO_WT_8822B 0x3</div><div class='del'>-#define BIT_SYSON_SPS0LDO_WT_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_SPS0LDO_WT_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SYSON_SPS0LDO_WT_8822B)</div><div class='del'>-#define BIT_GET_SYSON_SPS0LDO_WT_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_SPS0LDO_WT_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_SYSON_SPS0LDO_WT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_RCLK_SCALE_8822B 0</div><div class='del'>-#define BIT_MASK_SYSON_RCLK_SCALE_8822B 0x3</div><div class='del'>-#define BIT_SYSON_RCLK_SCALE_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_RCLK_SCALE_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SYSON_RCLK_SCALE_8822B)</div><div class='del'>-#define BIT_GET_SYSON_RCLK_SCALE_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_RCLK_SCALE_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_SYSON_RCLK_SCALE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAL_TIMER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MATCH_CNT_8822B 8</div><div class='del'>-#define BIT_MASK_MATCH_CNT_8822B 0xff</div><div class='del'>-#define BIT_MATCH_CNT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MATCH_CNT_8822B) &lt;&lt; BIT_SHIFT_MATCH_CNT_8822B)</div><div class='del'>-#define BIT_GET_MATCH_CNT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MATCH_CNT_8822B) &amp; BIT_MASK_MATCH_CNT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAL_SCAL_8822B 0</div><div class='del'>-#define BIT_MASK_CAL_SCAL_8822B 0xff</div><div class='del'>-#define BIT_CAL_SCAL_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAL_SCAL_8822B) &lt;&lt; BIT_SHIFT_CAL_SCAL_8822B)</div><div class='del'>-#define BIT_GET_CAL_SCAL_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAL_SCAL_8822B) &amp; BIT_MASK_CAL_SCAL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACLK_MON_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RCLK_MON_8822B 5</div><div class='del'>-#define BIT_MASK_RCLK_MON_8822B 0x7ff</div><div class='del'>-#define BIT_RCLK_MON_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RCLK_MON_8822B) &lt;&lt; BIT_SHIFT_RCLK_MON_8822B)</div><div class='del'>-#define BIT_GET_RCLK_MON_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RCLK_MON_8822B) &amp; BIT_MASK_RCLK_MON_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_CAL_EN_8822B BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DPSTU_8822B 2</div><div class='del'>-#define BIT_MASK_DPSTU_8822B 0x3</div><div class='del'>-#define BIT_DPSTU_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_DPSTU_8822B) &lt;&lt; BIT_SHIFT_DPSTU_8822B)</div><div class='del'>-#define BIT_GET_DPSTU_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DPSTU_8822B) &amp; BIT_MASK_DPSTU_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SUS_16X_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_MUXCFG_8822B */</div><div class='del'>-#define BIT_FSPI_EN_8822B BIT(19)</div><div class='del'>-#define BIT_WL_RTS_EXT_32K_SEL_8822B BIT(18)</div><div class='del'>-#define BIT_WLGP_SPI_EN_8822B BIT(16)</div><div class='del'>-#define BIT_SIC_LBK_8822B BIT(15)</div><div class='del'>-#define BIT_ENHTP_8822B BIT(14)</div><div class='del'>-#define BIT_ENSIC_8822B BIT(12)</div><div class='del'>-#define BIT_SIC_SWRST_8822B BIT(11)</div><div class='del'>-#define BIT_PO_WIFI_PTA_PINS_8822B BIT(10)</div><div class='del'>-#define BIT_PO_BT_PTA_PINS_8822B BIT(9)</div><div class='del'>-#define BIT_ENUART_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BTMODE_8822B 6</div><div class='del'>-#define BIT_MASK_BTMODE_8822B 0x3</div><div class='del'>-#define BIT_BTMODE_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BTMODE_8822B) &lt;&lt; BIT_SHIFT_BTMODE_8822B)</div><div class='del'>-#define BIT_GET_BTMODE_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BTMODE_8822B) &amp; BIT_MASK_BTMODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_ENBT_8822B BIT(5)</div><div class='del'>-#define BIT_EROM_EN_8822B BIT(4)</div><div class='del'>-#define BIT_WLRFE_6_7_EN_8822B BIT(3)</div><div class='del'>-#define BIT_WLRFE_4_5_EN_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIOSEL_8822B 0</div><div class='del'>-#define BIT_MASK_GPIOSEL_8822B 0x3</div><div class='del'>-#define BIT_GPIOSEL_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIOSEL_8822B) &lt;&lt; BIT_SHIFT_GPIOSEL_8822B)</div><div class='del'>-#define BIT_GET_GPIOSEL_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIOSEL_8822B) &amp; BIT_MASK_GPIOSEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_PIN_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_MOD_7_TO_0_8822B 24</div><div class='del'>-#define BIT_MASK_GPIO_MOD_7_TO_0_8822B 0xff</div><div class='del'>-#define BIT_GPIO_MOD_7_TO_0_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_MOD_7_TO_0_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_MOD_7_TO_0_8822B)</div><div class='del'>-#define BIT_GET_GPIO_MOD_7_TO_0_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_MOD_7_TO_0_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_GPIO_MOD_7_TO_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IO_SEL_7_TO_0_8822B 16</div><div class='del'>-#define BIT_MASK_GPIO_IO_SEL_7_TO_0_8822B 0xff</div><div class='del'>-#define BIT_GPIO_IO_SEL_7_TO_0_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IO_SEL_7_TO_0_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_IO_SEL_7_TO_0_8822B)</div><div class='del'>-#define BIT_GET_GPIO_IO_SEL_7_TO_0_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IO_SEL_7_TO_0_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_GPIO_IO_SEL_7_TO_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_OUT_7_TO_0_8822B 8</div><div class='del'>-#define BIT_MASK_GPIO_OUT_7_TO_0_8822B 0xff</div><div class='del'>-#define BIT_GPIO_OUT_7_TO_0_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_OUT_7_TO_0_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_OUT_7_TO_0_8822B)</div><div class='del'>-#define BIT_GET_GPIO_OUT_7_TO_0_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_OUT_7_TO_0_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_GPIO_OUT_7_TO_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IN_7_TO_0_8822B 0</div><div class='del'>-#define BIT_MASK_GPIO_IN_7_TO_0_8822B 0xff</div><div class='del'>-#define BIT_GPIO_IN_7_TO_0_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IN_7_TO_0_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_IN_7_TO_0_8822B)</div><div class='del'>-#define BIT_GET_GPIO_IN_7_TO_0_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IN_7_TO_0_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_GPIO_IN_7_TO_0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_INTM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MUXDBG_SEL_8822B 30</div><div class='del'>-#define BIT_MASK_MUXDBG_SEL_8822B 0x3</div><div class='del'>-#define BIT_MUXDBG_SEL_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MUXDBG_SEL_8822B) &lt;&lt; BIT_SHIFT_MUXDBG_SEL_8822B)</div><div class='del'>-#define BIT_GET_MUXDBG_SEL_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MUXDBG_SEL_8822B) &amp; BIT_MASK_MUXDBG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EXTWOL_SEL_8822B BIT(17)</div><div class='del'>-#define BIT_EXTWOL_EN_8822B BIT(16)</div><div class='del'>-#define BIT_GPIOF_INT_MD_8822B BIT(15)</div><div class='del'>-#define BIT_GPIOE_INT_MD_8822B BIT(14)</div><div class='del'>-#define BIT_GPIOD_INT_MD_8822B BIT(13)</div><div class='del'>-#define BIT_GPIOF_INT_MD_8822B BIT(15)</div><div class='del'>-#define BIT_GPIOE_INT_MD_8822B BIT(14)</div><div class='del'>-#define BIT_GPIOD_INT_MD_8822B BIT(13)</div><div class='del'>-#define BIT_GPIOC_INT_MD_8822B BIT(12)</div><div class='del'>-#define BIT_GPIOB_INT_MD_8822B BIT(11)</div><div class='del'>-#define BIT_GPIOA_INT_MD_8822B BIT(10)</div><div class='del'>-#define BIT_GPIO9_INT_MD_8822B BIT(9)</div><div class='del'>-#define BIT_GPIO8_INT_MD_8822B BIT(8)</div><div class='del'>-#define BIT_GPIO7_INT_MD_8822B BIT(7)</div><div class='del'>-#define BIT_GPIO6_INT_MD_8822B BIT(6)</div><div class='del'>-#define BIT_GPIO5_INT_MD_8822B BIT(5)</div><div class='del'>-#define BIT_GPIO4_INT_MD_8822B BIT(4)</div><div class='del'>-#define BIT_GPIO3_INT_MD_8822B BIT(3)</div><div class='del'>-#define BIT_GPIO2_INT_MD_8822B BIT(2)</div><div class='del'>-#define BIT_GPIO1_INT_MD_8822B BIT(1)</div><div class='del'>-#define BIT_GPIO0_INT_MD_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LED_CFG_8822B */</div><div class='del'>-#define BIT_GPIO3_WL_CTRL_EN_8822B BIT(27)</div><div class='del'>-#define BIT_LNAON_SEL_EN_8822B BIT(26)</div><div class='del'>-#define BIT_PAPE_SEL_EN_8822B BIT(25)</div><div class='del'>-#define BIT_DPDT_WLBT_SEL_8822B BIT(24)</div><div class='del'>-#define BIT_DPDT_SEL_EN_8822B BIT(23)</div><div class='del'>-#define BIT_GPIO13_14_WL_CTRL_EN_8822B BIT(22)</div><div class='del'>-#define BIT_GPIO13_14_WL_CTRL_EN_8822B BIT(22)</div><div class='del'>-#define BIT_LED2DIS_8822B BIT(21)</div><div class='del'>-#define BIT_LED2PL_8822B BIT(20)</div><div class='del'>-#define BIT_LED2SV_8822B BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LED2CM_8822B 16</div><div class='del'>-#define BIT_MASK_LED2CM_8822B 0x7</div><div class='del'>-#define BIT_LED2CM_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LED2CM_8822B) &lt;&lt; BIT_SHIFT_LED2CM_8822B)</div><div class='del'>-#define BIT_GET_LED2CM_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LED2CM_8822B) &amp; BIT_MASK_LED2CM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_LED1DIS_8822B BIT(15)</div><div class='del'>-#define BIT_LED1PL_8822B BIT(12)</div><div class='del'>-#define BIT_LED1SV_8822B BIT(11)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LED1CM_8822B 8</div><div class='del'>-#define BIT_MASK_LED1CM_8822B 0x7</div><div class='del'>-#define BIT_LED1CM_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LED1CM_8822B) &lt;&lt; BIT_SHIFT_LED1CM_8822B)</div><div class='del'>-#define BIT_GET_LED1CM_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LED1CM_8822B) &amp; BIT_MASK_LED1CM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_LED0DIS_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AFE_LDO_SWR_CHECK_8822B 5</div><div class='del'>-#define BIT_MASK_AFE_LDO_SWR_CHECK_8822B 0x3</div><div class='del'>-#define BIT_AFE_LDO_SWR_CHECK_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_AFE_LDO_SWR_CHECK_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AFE_LDO_SWR_CHECK_8822B)</div><div class='del'>-#define BIT_GET_AFE_LDO_SWR_CHECK_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AFE_LDO_SWR_CHECK_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_AFE_LDO_SWR_CHECK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_LED0PL_8822B BIT(4)</div><div class='del'>-#define BIT_LED0SV_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LED0CM_8822B 0</div><div class='del'>-#define BIT_MASK_LED0CM_8822B 0x7</div><div class='del'>-#define BIT_LED0CM_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LED0CM_8822B) &lt;&lt; BIT_SHIFT_LED0CM_8822B)</div><div class='del'>-#define BIT_GET_LED0CM_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LED0CM_8822B) &amp; BIT_MASK_LED0CM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSIMR_8822B */</div><div class='del'>-#define BIT_FS_PDNINT_EN_8822B BIT(31)</div><div class='del'>-#define BIT_NFC_INT_PAD_EN_8822B BIT(30)</div><div class='del'>-#define BIT_FS_SPS_OCP_INT_EN_8822B BIT(29)</div><div class='del'>-#define BIT_FS_PWMERR_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_FS_GPIOF_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_FS_GPIOE_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_GPIOD_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_GPIOC_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_GPIOB_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_GPIOA_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_GPIO9_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_GPIO8_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_GPIO7_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_GPIO6_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_GPIO5_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_GPIO4_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_GPIO3_INT_EN_8822B BIT(15)</div><div class='del'>-#define BIT_FS_GPIO2_INT_EN_8822B BIT(14)</div><div class='del'>-#define BIT_FS_GPIO1_INT_EN_8822B BIT(13)</div><div class='del'>-#define BIT_FS_GPIO0_INT_EN_8822B BIT(12)</div><div class='del'>-#define BIT_FS_HCI_SUS_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_HCI_RES_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_HCI_RESET_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_BTON_STS_UPDATE_MSK_EN_8822B BIT(7)</div><div class='del'>-#define BIT_ACT2RECOVERY_INT_EN_V1_8822B BIT(6)</div><div class='del'>-#define BIT_GEN1GEN2_SWITCH_8822B BIT(5)</div><div class='del'>-#define BIT_HCI_TXDMA_REQ_HIMR_8822B BIT(4)</div><div class='del'>-#define BIT_FS_32K_LEAVE_SETTING_MAK_8822B BIT(3)</div><div class='del'>-#define BIT_FS_32K_ENTER_SETTING_MAK_8822B BIT(2)</div><div class='del'>-#define BIT_FS_USB_LPMRSM_MSK_8822B BIT(1)</div><div class='del'>-#define BIT_FS_USB_LPMINT_MSK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FSISR_8822B */</div><div class='del'>-#define BIT_FS_PDNINT_8822B BIT(31)</div><div class='del'>-#define BIT_FS_SPS_OCP_INT_8822B BIT(29)</div><div class='del'>-#define BIT_FS_PWMERR_INT_8822B BIT(28)</div><div class='del'>-#define BIT_FS_GPIOF_INT_8822B BIT(27)</div><div class='del'>-#define BIT_FS_GPIOE_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_GPIOD_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_GPIOC_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_GPIOB_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_GPIOA_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_GPIO9_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_GPIO8_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_GPIO7_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_GPIO6_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_GPIO5_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_GPIO4_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_GPIO3_INT_8822B BIT(15)</div><div class='del'>-#define BIT_FS_GPIO2_INT_8822B BIT(14)</div><div class='del'>-#define BIT_FS_GPIO1_INT_8822B BIT(13)</div><div class='del'>-#define BIT_FS_GPIO0_INT_8822B BIT(12)</div><div class='del'>-#define BIT_FS_HCI_SUS_INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_HCI_RES_INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_HCI_RESET_INT_8822B BIT(9)</div><div class='del'>-#define BIT_ACT2RECOVERY_8822B BIT(6)</div><div class='del'>-#define BIT_GEN1GEN2_SWITCH_8822B BIT(5)</div><div class='del'>-#define BIT_HCI_TXDMA_REQ_HISR_8822B BIT(4)</div><div class='del'>-#define BIT_FS_32K_LEAVE_SETTING_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_32K_ENTER_SETTING_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_USB_LPMRSM_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_USB_LPMINT_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSIMR_8822B */</div><div class='del'>-#define BIT_GPIOF_INT_EN_8822B BIT(31)</div><div class='del'>-#define BIT_GPIOE_INT_EN_8822B BIT(30)</div><div class='del'>-#define BIT_GPIOD_INT_EN_8822B BIT(29)</div><div class='del'>-#define BIT_GPIOC_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_GPIOB_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_GPIOA_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_GPIO9_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_GPIO8_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_GPIO7_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_GPIO6_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_GPIO5_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_GPIO4_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_GPIO3_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_GPIO2_INT_EN_V1_8822B BIT(16)</div><div class='del'>-#define BIT_GPIO1_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_GPIO0_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_PDNINT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_RON_INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_SPS_OCP_INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_GPIO15_0_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HSISR_8822B */</div><div class='del'>-#define BIT_GPIOF_INT_8822B BIT(31)</div><div class='del'>-#define BIT_GPIOE_INT_8822B BIT(30)</div><div class='del'>-#define BIT_GPIOD_INT_8822B BIT(29)</div><div class='del'>-#define BIT_GPIOC_INT_8822B BIT(28)</div><div class='del'>-#define BIT_GPIOB_INT_8822B BIT(27)</div><div class='del'>-#define BIT_GPIOA_INT_8822B BIT(26)</div><div class='del'>-#define BIT_GPIO9_INT_8822B BIT(25)</div><div class='del'>-#define BIT_GPIO8_INT_8822B BIT(24)</div><div class='del'>-#define BIT_GPIO7_INT_8822B BIT(23)</div><div class='del'>-#define BIT_GPIO6_INT_8822B BIT(22)</div><div class='del'>-#define BIT_GPIO5_INT_8822B BIT(21)</div><div class='del'>-#define BIT_GPIO4_INT_8822B BIT(20)</div><div class='del'>-#define BIT_GPIO3_INT_8822B BIT(19)</div><div class='del'>-#define BIT_GPIO2_INT_V1_8822B BIT(16)</div><div class='del'>-#define BIT_GPIO1_INT_8822B BIT(17)</div><div class='del'>-#define BIT_GPIO0_INT_8822B BIT(16)</div><div class='del'>-#define BIT_PDNINT_8822B BIT(7)</div><div class='del'>-#define BIT_RON_INT_8822B BIT(6)</div><div class='del'>-#define BIT_SPS_OCP_INT_8822B BIT(5)</div><div class='del'>-#define BIT_GPIO15_0_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_EXT_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_MOD_15_TO_8_8822B 24</div><div class='del'>-#define BIT_MASK_GPIO_MOD_15_TO_8_8822B 0xff</div><div class='del'>-#define BIT_GPIO_MOD_15_TO_8_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_MOD_15_TO_8_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_MOD_15_TO_8_8822B)</div><div class='del'>-#define BIT_GET_GPIO_MOD_15_TO_8_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_MOD_15_TO_8_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_GPIO_MOD_15_TO_8_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IO_SEL_15_TO_8_8822B 16</div><div class='del'>-#define BIT_MASK_GPIO_IO_SEL_15_TO_8_8822B 0xff</div><div class='del'>-#define BIT_GPIO_IO_SEL_15_TO_8_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IO_SEL_15_TO_8_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_IO_SEL_15_TO_8_8822B)</div><div class='del'>-#define BIT_GET_GPIO_IO_SEL_15_TO_8_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IO_SEL_15_TO_8_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_GPIO_IO_SEL_15_TO_8_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_OUT_15_TO_8_8822B 8</div><div class='del'>-#define BIT_MASK_GPIO_OUT_15_TO_8_8822B 0xff</div><div class='del'>-#define BIT_GPIO_OUT_15_TO_8_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_OUT_15_TO_8_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_OUT_15_TO_8_8822B)</div><div class='del'>-#define BIT_GET_GPIO_OUT_15_TO_8_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_OUT_15_TO_8_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_GPIO_OUT_15_TO_8_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GPIO_IN_15_TO_8_8822B 0</div><div class='del'>-#define BIT_MASK_GPIO_IN_15_TO_8_8822B 0xff</div><div class='del'>-#define BIT_GPIO_IN_15_TO_8_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_GPIO_IN_15_TO_8_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_GPIO_IN_15_TO_8_8822B)</div><div class='del'>-#define BIT_GET_GPIO_IN_15_TO_8_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GPIO_IN_15_TO_8_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_GPIO_IN_15_TO_8_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL1_8822B */</div><div class='del'>-#define BIT_PAPE_WLBT_SEL_8822B BIT(29)</div><div class='del'>-#define BIT_LNAON_WLBT_SEL_8822B BIT(28)</div><div class='del'>-#define BIT_BTGP_GPG3_FEN_8822B BIT(26)</div><div class='del'>-#define BIT_BTGP_GPG2_FEN_8822B BIT(25)</div><div class='del'>-#define BIT_BTGP_JTAG_EN_8822B BIT(24)</div><div class='del'>-#define BIT_XTAL_CLK_EXTARNAL_EN_8822B BIT(23)</div><div class='del'>-#define BIT_BTGP_UART0_EN_8822B BIT(22)</div><div class='del'>-#define BIT_BTGP_UART1_EN_8822B BIT(21)</div><div class='del'>-#define BIT_BTGP_SPI_EN_8822B BIT(20)</div><div class='del'>-#define BIT_BTGP_GPIO_E2_8822B BIT(19)</div><div class='del'>-#define BIT_BTGP_GPIO_EN_8822B BIT(18)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BTGP_GPIO_SL_8822B 16</div><div class='del'>-#define BIT_MASK_BTGP_GPIO_SL_8822B 0x3</div><div class='del'>-#define BIT_BTGP_GPIO_SL_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BTGP_GPIO_SL_8822B) &lt;&lt; BIT_SHIFT_BTGP_GPIO_SL_8822B)</div><div class='del'>-#define BIT_GET_BTGP_GPIO_SL_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BTGP_GPIO_SL_8822B) &amp; BIT_MASK_BTGP_GPIO_SL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PAD_SDIO_SR_8822B BIT(14)</div><div class='del'>-#define BIT_GPIO14_OUTPUT_PL_8822B BIT(13)</div><div class='del'>-#define BIT_HOST_WAKE_PAD_PULL_EN_8822B BIT(12)</div><div class='del'>-#define BIT_HOST_WAKE_PAD_SL_8822B BIT(11)</div><div class='del'>-#define BIT_PAD_LNAON_SR_8822B BIT(10)</div><div class='del'>-#define BIT_PAD_LNAON_E2_8822B BIT(9)</div><div class='del'>-#define BIT_SW_LNAON_G_SEL_DATA_8822B BIT(8)</div><div class='del'>-#define BIT_SW_LNAON_A_SEL_DATA_8822B BIT(7)</div><div class='del'>-#define BIT_PAD_PAPE_SR_8822B BIT(6)</div><div class='del'>-#define BIT_PAD_PAPE_E2_8822B BIT(5)</div><div class='del'>-#define BIT_SW_PAPE_G_SEL_DATA_8822B BIT(4)</div><div class='del'>-#define BIT_SW_PAPE_A_SEL_DATA_8822B BIT(3)</div><div class='del'>-#define BIT_PAD_DPDT_SR_8822B BIT(2)</div><div class='del'>-#define BIT_PAD_DPDT_PAD_E2_8822B BIT(1)</div><div class='del'>-#define BIT_SW_DPDT_SEL_DATA_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL_BT_PWR_CTRL_8822B */</div><div class='del'>-#define BIT_ISO_BD2PP_8822B BIT(31)</div><div class='del'>-#define BIT_LDOV12B_EN_8822B BIT(30)</div><div class='del'>-#define BIT_CKEN_BTGPS_8822B BIT(29)</div><div class='del'>-#define BIT_FEN_BTGPS_8822B BIT(28)</div><div class='del'>-#define BIT_BTCPU_BOOTSEL_8822B BIT(27)</div><div class='del'>-#define BIT_SPI_SPEEDUP_8822B BIT(26)</div><div class='del'>-#define BIT_DEVWAKE_PAD_TYPE_SEL_8822B BIT(24)</div><div class='del'>-#define BIT_CLKREQ_PAD_TYPE_SEL_8822B BIT(23)</div><div class='del'>-#define BIT_ISO_BTPON2PP_8822B BIT(22)</div><div class='del'>-#define BIT_BT_HWROF_EN_8822B BIT(19)</div><div class='del'>-#define BIT_BT_FUNC_EN_8822B BIT(18)</div><div class='del'>-#define BIT_BT_HWPDN_SL_8822B BIT(17)</div><div class='del'>-#define BIT_BT_DISN_EN_8822B BIT(16)</div><div class='del'>-#define BIT_BT_PDN_PULL_EN_8822B BIT(15)</div><div class='del'>-#define BIT_WL_PDN_PULL_EN_8822B BIT(14)</div><div class='del'>-#define BIT_EXTERNAL_REQUEST_PL_8822B BIT(13)</div><div class='del'>-#define BIT_GPIO0_2_3_PULL_LOW_EN_8822B BIT(12)</div><div class='del'>-#define BIT_ISO_BA2PP_8822B BIT(11)</div><div class='del'>-#define BIT_BT_AFE_LDO_EN_8822B BIT(10)</div><div class='del'>-#define BIT_BT_AFE_PLL_EN_8822B BIT(9)</div><div class='del'>-#define BIT_BT_DIG_CLK_EN_8822B BIT(8)</div><div class='del'>-#define BIT_WL_DRV_EXIST_IDX_8822B BIT(5)</div><div class='del'>-#define BIT_DOP_EHPAD_8822B BIT(4)</div><div class='del'>-#define BIT_WL_HWROF_EN_8822B BIT(3)</div><div class='del'>-#define BIT_WL_FUNC_EN_8822B BIT(2)</div><div class='del'>-#define BIT_WL_HWPDN_SL_8822B BIT(1)</div><div class='del'>-#define BIT_WL_HWPDN_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDM_DEBUG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLCLK_PHASE_8822B 0</div><div class='del'>-#define BIT_MASK_WLCLK_PHASE_8822B 0x1f</div><div class='del'>-#define BIT_WLCLK_PHASE_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLCLK_PHASE_8822B) &lt;&lt; BIT_SHIFT_WLCLK_PHASE_8822B)</div><div class='del'>-#define BIT_GET_WLCLK_PHASE_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLCLK_PHASE_8822B) &amp; BIT_MASK_WLCLK_PHASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_SDIO_CTRL_8822B */</div><div class='del'>-#define BIT_DBG_GNT_WL_BT_8822B BIT(27)</div><div class='del'>-#define BIT_LTE_MUX_CTRL_PATH_8822B BIT(26)</div><div class='del'>-#define BIT_LTE_COEX_UART_8822B BIT(25)</div><div class='del'>-#define BIT_3W_LTE_WL_GPIO_8822B BIT(24)</div><div class='del'>-#define BIT_SDIO_INT_POLARITY_8822B BIT(19)</div><div class='del'>-#define BIT_SDIO_INT_8822B BIT(18)</div><div class='del'>-#define BIT_SDIO_OFF_EN_8822B BIT(17)</div><div class='del'>-#define BIT_SDIO_ON_EN_8822B BIT(16)</div><div class='del'>-#define BIT_PCIE_WAIT_TIMEOUT_EVENT_8822B BIT(10)</div><div class='del'>-#define BIT_PCIE_WAIT_TIME_8822B BIT(9)</div><div class='del'>-#define BIT_MPCIE_REFCLK_XTAL_SEL_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_OPT_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT_SEL_8822B 29</div><div class='del'>-#define BIT_MASK_TSFT_SEL_8822B 0x7</div><div class='del'>-#define BIT_TSFT_SEL_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT_SEL_8822B) &lt;&lt; BIT_SHIFT_TSFT_SEL_8822B)</div><div class='del'>-#define BIT_GET_TSFT_SEL_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT_SEL_8822B) &amp; BIT_MASK_TSFT_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_USB_HOST_PWR_OFF_EN_8822B BIT(12)</div><div class='del'>-#define BIT_SYM_LPS_BLOCK_EN_8822B BIT(11)</div><div class='del'>-#define BIT_USB_LPM_ACT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_USB_LPM_NY_8822B BIT(9)</div><div class='del'>-#define BIT_USB_SUS_DIS_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_PAD_E_8822B 5</div><div class='del'>-#define BIT_MASK_SDIO_PAD_E_8822B 0x7</div><div class='del'>-#define BIT_SDIO_PAD_E_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_PAD_E_8822B) &lt;&lt; BIT_SHIFT_SDIO_PAD_E_8822B)</div><div class='del'>-#define BIT_GET_SDIO_PAD_E_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_PAD_E_8822B) &amp; BIT_MASK_SDIO_PAD_E_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_USB_LPPLL_EN_8822B BIT(4)</div><div class='del'>-#define BIT_ROP_SW15_8822B BIT(2)</div><div class='del'>-#define BIT_PCI_CKRDY_OPT_8822B BIT(1)</div><div class='del'>-#define BIT_PCI_VAUX_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL4_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_LDO_SWR_CTRL_8822B */</div><div class='del'>-#define BIT_ZCD_HW_AUTO_EN_8822B BIT(27)</div><div class='del'>-#define BIT_ZCD_REGSEL_8822B BIT(26)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AUTO_ZCD_IN_CODE_8822B 21</div><div class='del'>-#define BIT_MASK_AUTO_ZCD_IN_CODE_8822B 0x1f</div><div class='del'>-#define BIT_AUTO_ZCD_IN_CODE_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_AUTO_ZCD_IN_CODE_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AUTO_ZCD_IN_CODE_8822B)</div><div class='del'>-#define BIT_GET_AUTO_ZCD_IN_CODE_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AUTO_ZCD_IN_CODE_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_AUTO_ZCD_IN_CODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ZCD_CODE_IN_L_8822B 16</div><div class='del'>-#define BIT_MASK_ZCD_CODE_IN_L_8822B 0x1f</div><div class='del'>-#define BIT_ZCD_CODE_IN_L_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_ZCD_CODE_IN_L_8822B) &lt;&lt; BIT_SHIFT_ZCD_CODE_IN_L_8822B)</div><div class='del'>-#define BIT_GET_ZCD_CODE_IN_L_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ZCD_CODE_IN_L_8822B) &amp; BIT_MASK_ZCD_CODE_IN_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LDO_HV5_DUMMY_8822B 14</div><div class='del'>-#define BIT_MASK_LDO_HV5_DUMMY_8822B 0x3</div><div class='del'>-#define BIT_LDO_HV5_DUMMY_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_LDO_HV5_DUMMY_8822B) &lt;&lt; BIT_SHIFT_LDO_HV5_DUMMY_8822B)</div><div class='del'>-#define BIT_GET_LDO_HV5_DUMMY_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LDO_HV5_DUMMY_8822B) &amp; BIT_MASK_LDO_HV5_DUMMY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_VTUNE33_BIT0_TO_BIT1_8822B 12</div><div class='del'>-#define BIT_MASK_REG_VTUNE33_BIT0_TO_BIT1_8822B 0x3</div><div class='del'>-#define BIT_REG_VTUNE33_BIT0_TO_BIT1_8822B(x)                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_VTUNE33_BIT0_TO_BIT1_8822B)                       \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_VTUNE33_BIT0_TO_BIT1_8822B)</div><div class='del'>-#define BIT_GET_REG_VTUNE33_BIT0_TO_BIT1_8822B(x)                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_VTUNE33_BIT0_TO_BIT1_8822B) &amp;                   \</div><div class='del'>-	 BIT_MASK_REG_VTUNE33_BIT0_TO_BIT1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_STANDBY33_BIT0_TO_BIT1_8822B 10</div><div class='del'>-#define BIT_MASK_REG_STANDBY33_BIT0_TO_BIT1_8822B 0x3</div><div class='del'>-#define BIT_REG_STANDBY33_BIT0_TO_BIT1_8822B(x)                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_STANDBY33_BIT0_TO_BIT1_8822B)                     \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_STANDBY33_BIT0_TO_BIT1_8822B)</div><div class='del'>-#define BIT_GET_REG_STANDBY33_BIT0_TO_BIT1_8822B(x)                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_STANDBY33_BIT0_TO_BIT1_8822B) &amp;                 \</div><div class='del'>-	 BIT_MASK_REG_STANDBY33_BIT0_TO_BIT1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_LOAD33_BIT0_TO_BIT1_8822B 8</div><div class='del'>-#define BIT_MASK_REG_LOAD33_BIT0_TO_BIT1_8822B 0x3</div><div class='del'>-#define BIT_REG_LOAD33_BIT0_TO_BIT1_8822B(x)                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_LOAD33_BIT0_TO_BIT1_8822B)                        \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_LOAD33_BIT0_TO_BIT1_8822B)</div><div class='del'>-#define BIT_GET_REG_LOAD33_BIT0_TO_BIT1_8822B(x)                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_LOAD33_BIT0_TO_BIT1_8822B) &amp;                    \</div><div class='del'>-	 BIT_MASK_REG_LOAD33_BIT0_TO_BIT1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_BYPASS_L_8822B BIT(7)</div><div class='del'>-#define BIT_REG_LDOF_L_8822B BIT(6)</div><div class='del'>-#define BIT_REG_TYPE_L_V1_8822B BIT(5)</div><div class='del'>-#define BIT_ARENB_L_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CFC_L_8822B 1</div><div class='del'>-#define BIT_MASK_CFC_L_8822B 0x3</div><div class='del'>-#define BIT_CFC_L_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_CFC_L_8822B) &lt;&lt; BIT_SHIFT_CFC_L_8822B)</div><div class='del'>-#define BIT_GET_CFC_L_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CFC_L_8822B) &amp; BIT_MASK_CFC_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_OCPS_L_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUFW_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RPWM_8822B 24</div><div class='del'>-#define BIT_MASK_RPWM_8822B 0xff</div><div class='del'>-#define BIT_RPWM_8822B(x) (((x) &amp; BIT_MASK_RPWM_8822B) &lt;&lt; BIT_SHIFT_RPWM_8822B)</div><div class='del'>-#define BIT_GET_RPWM_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RPWM_8822B) &amp; BIT_MASK_RPWM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_ANA_PORT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_MAC_PORT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_BOOT_FSPI_EN_8822B BIT(20)</div><div class='del'>-#define BIT_ROM_DLEN_8822B BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ROM_PGE_8822B 16</div><div class='del'>-#define BIT_MASK_ROM_PGE_8822B 0x7</div><div class='del'>-#define BIT_ROM_PGE_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_ROM_PGE_8822B) &lt;&lt; BIT_SHIFT_ROM_PGE_8822B)</div><div class='del'>-#define BIT_GET_ROM_PGE_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ROM_PGE_8822B) &amp; BIT_MASK_ROM_PGE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_FW_INIT_RDY_8822B BIT(15)</div><div class='del'>-#define BIT_FW_DW_RDY_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPU_CLK_SEL_8822B 12</div><div class='del'>-#define BIT_MASK_CPU_CLK_SEL_8822B 0x3</div><div class='del'>-#define BIT_CPU_CLK_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPU_CLK_SEL_8822B) &lt;&lt; BIT_SHIFT_CPU_CLK_SEL_8822B)</div><div class='del'>-#define BIT_GET_CPU_CLK_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPU_CLK_SEL_8822B) &amp; BIT_MASK_CPU_CLK_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_CCLK_CHG_MASK_8822B BIT(11)</div><div class='del'>-#define BIT_EMEM__TXBUF_CHKSUM_OK_8822B BIT(10)</div><div class='del'>-#define BIT_EMEM_TXBUF_DW_RDY_8822B BIT(9)</div><div class='del'>-#define BIT_EMEM_CHKSUM_OK_8822B BIT(8)</div><div class='del'>-#define BIT_EMEM_DW_OK_8822B BIT(7)</div><div class='del'>-#define BIT_DMEM_CHKSUM_OK_8822B BIT(6)</div><div class='del'>-#define BIT_DMEM_DW_OK_8822B BIT(5)</div><div class='del'>-#define BIT_IMEM_CHKSUM_OK_8822B BIT(4)</div><div class='del'>-#define BIT_IMEM_DW_OK_8822B BIT(3)</div><div class='del'>-#define BIT_IMEM_BOOT_LOAD_CHKSUM_OK_8822B BIT(2)</div><div class='del'>-#define BIT_IMEM_BOOT_LOAD_DW_OK_8822B BIT(1)</div><div class='del'>-#define BIT_MCUFWDL_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCU_TST_CFG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LBKTST_8822B 0</div><div class='del'>-#define BIT_MASK_LBKTST_8822B 0xffff</div><div class='del'>-#define BIT_LBKTST_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LBKTST_8822B) &lt;&lt; BIT_SHIFT_LBKTST_8822B)</div><div class='del'>-#define BIT_GET_LBKTST_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LBKTST_8822B) &amp; BIT_MASK_LBKTST_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E0_E1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E1_8822B 16</div><div class='del'>-#define BIT_MASK_HOST_MSG_E1_8822B 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E1_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E1_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_E1_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_E1_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E1_8822B) &amp; BIT_MASK_HOST_MSG_E1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E0_8822B 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_E0_8822B 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E0_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E0_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_E0_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_E0_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E0_8822B) &amp; BIT_MASK_HOST_MSG_E0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E2_E3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E3_8822B 16</div><div class='del'>-#define BIT_MASK_HOST_MSG_E3_8822B 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E3_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E3_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_E3_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_E3_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E3_8822B) &amp; BIT_MASK_HOST_MSG_E3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_E2_8822B 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_E2_8822B 0xffff</div><div class='del'>-#define BIT_HOST_MSG_E2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_E2_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_E2_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_E2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_E2_8822B) &amp; BIT_MASK_HOST_MSG_E2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLLPS_CTRL_8822B */</div><div class='del'>-#define BIT_WLLPSOP_EABM_8822B BIT(31)</div><div class='del'>-#define BIT_WLLPSOP_ACKF_8822B BIT(30)</div><div class='del'>-#define BIT_WLLPSOP_DLDM_8822B BIT(29)</div><div class='del'>-#define BIT_WLLPSOP_ESWR_8822B BIT(28)</div><div class='del'>-#define BIT_WLLPSOP_PWMM_8822B BIT(27)</div><div class='del'>-#define BIT_WLLPSOP_EECK_8822B BIT(26)</div><div class='del'>-#define BIT_WLLPSOP_WLMACOFF_8822B BIT(25)</div><div class='del'>-#define BIT_WLLPSOP_EXTAL_8822B BIT(24)</div><div class='del'>-#define BIT_WL_SYNPON_VOLTSPDN_8822B BIT(23)</div><div class='del'>-#define BIT_WLLPSOP_WLBBOFF_8822B BIT(22)</div><div class='del'>-#define BIT_WLLPSOP_WLMEM_DS_8822B BIT(21)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPLDH12_VADJ_STEP_DN_8822B 12</div><div class='del'>-#define BIT_MASK_LPLDH12_VADJ_STEP_DN_8822B 0xf</div><div class='del'>-#define BIT_LPLDH12_VADJ_STEP_DN_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPLDH12_VADJ_STEP_DN_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LPLDH12_VADJ_STEP_DN_8822B)</div><div class='del'>-#define BIT_GET_LPLDH12_VADJ_STEP_DN_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPLDH12_VADJ_STEP_DN_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_LPLDH12_VADJ_STEP_DN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_V15ADJ_L1_STEP_DN_8822B 8</div><div class='del'>-#define BIT_MASK_V15ADJ_L1_STEP_DN_8822B 0x7</div><div class='del'>-#define BIT_V15ADJ_L1_STEP_DN_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_V15ADJ_L1_STEP_DN_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_V15ADJ_L1_STEP_DN_8822B)</div><div class='del'>-#define BIT_GET_V15ADJ_L1_STEP_DN_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_V15ADJ_L1_STEP_DN_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_V15ADJ_L1_STEP_DN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REGU_32K_CLK_EN_8822B BIT(1)</div><div class='del'>-#define BIT_WL_LPS_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL5_8822B */</div><div class='del'>-#define BIT_BB_DBG_SEL_AFE_SDM_BIT0_8822B BIT(31)</div><div class='del'>-#define BIT_ORDER_SDM_8822B BIT(30)</div><div class='del'>-#define BIT_RFE_SEL_SDM_8822B BIT(29)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REF_SEL_8822B 25</div><div class='del'>-#define BIT_MASK_REF_SEL_8822B 0xf</div><div class='del'>-#define BIT_REF_SEL_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_REF_SEL_8822B) &lt;&lt; BIT_SHIFT_REF_SEL_8822B)</div><div class='del'>-#define BIT_GET_REF_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REF_SEL_8822B) &amp; BIT_MASK_REF_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_F0F_SDM_8822B 12</div><div class='del'>-#define BIT_MASK_F0F_SDM_8822B 0x1fff</div><div class='del'>-#define BIT_F0F_SDM_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_F0F_SDM_8822B) &lt;&lt; BIT_SHIFT_F0F_SDM_8822B)</div><div class='del'>-#define BIT_GET_F0F_SDM_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_F0F_SDM_8822B) &amp; BIT_MASK_F0F_SDM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_F0N_SDM_8822B 9</div><div class='del'>-#define BIT_MASK_F0N_SDM_8822B 0x7</div><div class='del'>-#define BIT_F0N_SDM_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_F0N_SDM_8822B) &lt;&lt; BIT_SHIFT_F0N_SDM_8822B)</div><div class='del'>-#define BIT_GET_F0N_SDM_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_F0N_SDM_8822B) &amp; BIT_MASK_F0N_SDM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DIVN_SDM_8822B 3</div><div class='del'>-#define BIT_MASK_DIVN_SDM_8822B 0x3f</div><div class='del'>-#define BIT_DIVN_SDM_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DIVN_SDM_8822B) &lt;&lt; BIT_SHIFT_DIVN_SDM_8822B)</div><div class='del'>-#define BIT_GET_DIVN_SDM_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DIVN_SDM_8822B) &amp; BIT_MASK_DIVN_SDM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_GPIO_DEBOUNCE_CTRL_8822B */</div><div class='del'>-#define BIT_WLGP_DBC1EN_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLGP_DBC1_8822B 8</div><div class='del'>-#define BIT_MASK_WLGP_DBC1_8822B 0xf</div><div class='del'>-#define BIT_WLGP_DBC1_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLGP_DBC1_8822B) &lt;&lt; BIT_SHIFT_WLGP_DBC1_8822B)</div><div class='del'>-#define BIT_GET_WLGP_DBC1_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLGP_DBC1_8822B) &amp; BIT_MASK_WLGP_DBC1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_WLGP_DBC0EN_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLGP_DBC0_8822B 0</div><div class='del'>-#define BIT_MASK_WLGP_DBC0_8822B 0xf</div><div class='del'>-#define BIT_WLGP_DBC0_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLGP_DBC0_8822B) &lt;&lt; BIT_SHIFT_WLGP_DBC0_8822B)</div><div class='del'>-#define BIT_GET_WLGP_DBC0_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLGP_DBC0_8822B) &amp; BIT_MASK_WLGP_DBC0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RPWM2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RPWM2_8822B 16</div><div class='del'>-#define BIT_MASK_RPWM2_8822B 0xffff</div><div class='del'>-#define BIT_RPWM2_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_RPWM2_8822B) &lt;&lt; BIT_SHIFT_RPWM2_8822B)</div><div class='del'>-#define BIT_GET_RPWM2_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RPWM2_8822B) &amp; BIT_MASK_RPWM2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYSON_FSM_MON_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FSM_MON_SEL_8822B 24</div><div class='del'>-#define BIT_MASK_FSM_MON_SEL_8822B 0x7</div><div class='del'>-#define BIT_FSM_MON_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_FSM_MON_SEL_8822B) &lt;&lt; BIT_SHIFT_FSM_MON_SEL_8822B)</div><div class='del'>-#define BIT_GET_FSM_MON_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FSM_MON_SEL_8822B) &amp; BIT_MASK_FSM_MON_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DOP_ELDO_8822B BIT(23)</div><div class='del'>-#define BIT_FSM_MON_UPD_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FSM_PAR_8822B 0</div><div class='del'>-#define BIT_MASK_FSM_PAR_8822B 0x7fff</div><div class='del'>-#define BIT_FSM_PAR_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FSM_PAR_8822B) &lt;&lt; BIT_SHIFT_FSM_PAR_8822B)</div><div class='del'>-#define BIT_GET_FSM_PAR_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FSM_PAR_8822B) &amp; BIT_MASK_FSM_PAR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL6_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B 0</div><div class='del'>-#define BIT_MASK_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B 0x7</div><div class='del'>-#define BIT_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B(x)                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B)                      \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B)</div><div class='del'>-#define BIT_GET_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B(x)                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B) &amp;                  \</div><div class='del'>-	 BIT_MASK_BB_DBG_SEL_AFE_SDM_BIT3_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL1_8822B */</div><div class='del'>-#define BIT_BT_INT_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RD_WR_WIFI_BT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_RD_WR_WIFI_BT_INFO_8822B 0x7fff</div><div class='del'>-#define BIT_RD_WR_WIFI_BT_INFO_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_RD_WR_WIFI_BT_INFO_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RD_WR_WIFI_BT_INFO_8822B)</div><div class='del'>-#define BIT_GET_RD_WR_WIFI_BT_INFO_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RD_WR_WIFI_BT_INFO_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_RD_WR_WIFI_BT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PMC_WR_OVF_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLPMC_ERRINT_8822B 0</div><div class='del'>-#define BIT_MASK_WLPMC_ERRINT_8822B 0xff</div><div class='del'>-#define BIT_WLPMC_ERRINT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLPMC_ERRINT_8822B) &lt;&lt; BIT_SHIFT_WLPMC_ERRINT_8822B)</div><div class='del'>-#define BIT_GET_WLPMC_ERRINT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLPMC_ERRINT_8822B) &amp; BIT_MASK_WLPMC_ERRINT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL7_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SEL_V_8822B 30</div><div class='del'>-#define BIT_MASK_SEL_V_8822B 0x3</div><div class='del'>-#define BIT_SEL_V_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_SEL_V_8822B) &lt;&lt; BIT_SHIFT_SEL_V_8822B)</div><div class='del'>-#define BIT_GET_SEL_V_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SEL_V_8822B) &amp; BIT_MASK_SEL_V_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SEL_LDO_PC_8822B BIT(29)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CK_MON_SEL_8822B 26</div><div class='del'>-#define BIT_MASK_CK_MON_SEL_8822B 0x7</div><div class='del'>-#define BIT_CK_MON_SEL_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_CK_MON_SEL_8822B) &lt;&lt; BIT_SHIFT_CK_MON_SEL_8822B)</div><div class='del'>-#define BIT_GET_CK_MON_SEL_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CK_MON_SEL_8822B) &amp; BIT_MASK_CK_MON_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_CK_MON_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FREF_EDGE_8822B BIT(24)</div><div class='del'>-#define BIT_CK320M_EN_8822B BIT(23)</div><div class='del'>-#define BIT_CK_5M_EN_8822B BIT(22)</div><div class='del'>-#define BIT_TESTEN_8822B BIT(21)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR0_8822B */</div><div class='del'>-#define BIT_TIMEOUT_INTERRUPT2_MASK_8822B BIT(31)</div><div class='del'>-#define BIT_TIMEOUT_INTERRUTP1_MASK_8822B BIT(30)</div><div class='del'>-#define BIT_PSTIMEOUT_MSK_8822B BIT(29)</div><div class='del'>-#define BIT_GTINT4_MSK_8822B BIT(28)</div><div class='del'>-#define BIT_GTINT3_MSK_8822B BIT(27)</div><div class='del'>-#define BIT_TXBCN0ERR_MSK_8822B BIT(26)</div><div class='del'>-#define BIT_TXBCN0OK_MSK_8822B BIT(25)</div><div class='del'>-#define BIT_TSF_BIT32_TOGGLE_MSK_8822B BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT0_MSK_8822B BIT(20)</div><div class='del'>-#define BIT_BCNDERR0_MSK_8822B BIT(16)</div><div class='del'>-#define BIT_HSISR_IND_ON_INT_MSK_8822B BIT(15)</div><div class='del'>-#define BIT_BCNDMAINT_E_MSK_8822B BIT(14)</div><div class='del'>-#define BIT_CTWEND_MSK_8822B BIT(12)</div><div class='del'>-#define BIT_HISR1_IND_MSK_8822B BIT(11)</div><div class='del'>-#define BIT_C2HCMD_MSK_8822B BIT(10)</div><div class='del'>-#define BIT_CPWM2_MSK_8822B BIT(9)</div><div class='del'>-#define BIT_CPWM_MSK_8822B BIT(8)</div><div class='del'>-#define BIT_HIGHDOK_MSK_8822B BIT(7)</div><div class='del'>-#define BIT_MGTDOK_MSK_8822B BIT(6)</div><div class='del'>-#define BIT_BKDOK_MSK_8822B BIT(5)</div><div class='del'>-#define BIT_BEDOK_MSK_8822B BIT(4)</div><div class='del'>-#define BIT_VIDOK_MSK_8822B BIT(3)</div><div class='del'>-#define BIT_VODOK_MSK_8822B BIT(2)</div><div class='del'>-#define BIT_RDU_MSK_8822B BIT(1)</div><div class='del'>-#define BIT_RXOK_MSK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR0_8822B */</div><div class='del'>-#define BIT_TIMEOUT_INTERRUPT2_8822B BIT(31)</div><div class='del'>-#define BIT_TIMEOUT_INTERRUTP1_8822B BIT(30)</div><div class='del'>-#define BIT_PSTIMEOUT_8822B BIT(29)</div><div class='del'>-#define BIT_GTINT4_8822B BIT(28)</div><div class='del'>-#define BIT_GTINT3_8822B BIT(27)</div><div class='del'>-#define BIT_TXBCN0ERR_8822B BIT(26)</div><div class='del'>-#define BIT_TXBCN0OK_8822B BIT(25)</div><div class='del'>-#define BIT_TSF_BIT32_TOGGLE_8822B BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT0_8822B BIT(20)</div><div class='del'>-#define BIT_BCNDERR0_8822B BIT(16)</div><div class='del'>-#define BIT_HSISR_IND_ON_INT_8822B BIT(15)</div><div class='del'>-#define BIT_BCNDMAINT_E_8822B BIT(14)</div><div class='del'>-#define BIT_CTWEND_8822B BIT(12)</div><div class='del'>-#define BIT_HISR1_IND_INT_8822B BIT(11)</div><div class='del'>-#define BIT_C2HCMD_8822B BIT(10)</div><div class='del'>-#define BIT_CPWM2_8822B BIT(9)</div><div class='del'>-#define BIT_CPWM_8822B BIT(8)</div><div class='del'>-#define BIT_HIGHDOK_8822B BIT(7)</div><div class='del'>-#define BIT_MGTDOK_8822B BIT(6)</div><div class='del'>-#define BIT_BKDOK_8822B BIT(5)</div><div class='del'>-#define BIT_BEDOK_8822B BIT(4)</div><div class='del'>-#define BIT_VIDOK_8822B BIT(3)</div><div class='del'>-#define BIT_VODOK_8822B BIT(2)</div><div class='del'>-#define BIT_RDU_8822B BIT(1)</div><div class='del'>-#define BIT_RXOK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR1_8822B */</div><div class='del'>-#define BIT_TXFIFO_TH_INT_8822B BIT(30)</div><div class='del'>-#define BIT_BTON_STS_UPDATE_MASK_8822B BIT(29)</div><div class='del'>-#define BIT_MCU_ERR_MASK_8822B BIT(28)</div><div class='del'>-#define BIT_BCNDMAINT7__MSK_8822B BIT(27)</div><div class='del'>-#define BIT_BCNDMAINT6__MSK_8822B BIT(26)</div><div class='del'>-#define BIT_BCNDMAINT5__MSK_8822B BIT(25)</div><div class='del'>-#define BIT_BCNDMAINT4__MSK_8822B BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT3_MSK_8822B BIT(23)</div><div class='del'>-#define BIT_BCNDMAINT2_MSK_8822B BIT(22)</div><div class='del'>-#define BIT_BCNDMAINT1_MSK_8822B BIT(21)</div><div class='del'>-#define BIT_BCNDERR7_MSK_8822B BIT(20)</div><div class='del'>-#define BIT_BCNDERR6_MSK_8822B BIT(19)</div><div class='del'>-#define BIT_BCNDERR5_MSK_8822B BIT(18)</div><div class='del'>-#define BIT_BCNDERR4_MSK_8822B BIT(17)</div><div class='del'>-#define BIT_BCNDERR3_MSK_8822B BIT(16)</div><div class='del'>-#define BIT_BCNDERR2_MSK_8822B BIT(15)</div><div class='del'>-#define BIT_BCNDERR1_MSK_8822B BIT(14)</div><div class='del'>-#define BIT_ATIMEND_E_MSK_8822B BIT(13)</div><div class='del'>-#define BIT_ATIMEND__MSK_8822B BIT(12)</div><div class='del'>-#define BIT_TXERR_MSK_8822B BIT(11)</div><div class='del'>-#define BIT_RXERR_MSK_8822B BIT(10)</div><div class='del'>-#define BIT_TXFOVW_MSK_8822B BIT(9)</div><div class='del'>-#define BIT_FOVW_MSK_8822B BIT(8)</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_MSK_8822B BIT(5)</div><div class='del'>-#define BIT_PS_TIMER_C_MSK_8822B BIT(4)</div><div class='del'>-#define BIT_PS_TIMER_B_MSK_8822B BIT(3)</div><div class='del'>-#define BIT_PS_TIMER_A_MSK_8822B BIT(2)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_MSK_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR1_8822B */</div><div class='del'>-#define BIT_TXFIFO_TH_INT_8822B BIT(30)</div><div class='del'>-#define BIT_BTON_STS_UPDATE_INT_8822B BIT(29)</div><div class='del'>-#define BIT_MCU_ERR_8822B BIT(28)</div><div class='del'>-#define BIT_BCNDMAINT7_8822B BIT(27)</div><div class='del'>-#define BIT_BCNDMAINT6_8822B BIT(26)</div><div class='del'>-#define BIT_BCNDMAINT5_8822B BIT(25)</div><div class='del'>-#define BIT_BCNDMAINT4_8822B BIT(24)</div><div class='del'>-#define BIT_BCNDMAINT3_8822B BIT(23)</div><div class='del'>-#define BIT_BCNDMAINT2_8822B BIT(22)</div><div class='del'>-#define BIT_BCNDMAINT1_8822B BIT(21)</div><div class='del'>-#define BIT_BCNDERR7_8822B BIT(20)</div><div class='del'>-#define BIT_BCNDERR6_8822B BIT(19)</div><div class='del'>-#define BIT_BCNDERR5_8822B BIT(18)</div><div class='del'>-#define BIT_BCNDERR4_8822B BIT(17)</div><div class='del'>-#define BIT_BCNDERR3_8822B BIT(16)</div><div class='del'>-#define BIT_BCNDERR2_8822B BIT(15)</div><div class='del'>-#define BIT_BCNDERR1_8822B BIT(14)</div><div class='del'>-#define BIT_ATIMEND_E_8822B BIT(13)</div><div class='del'>-#define BIT_ATIMEND_8822B BIT(12)</div><div class='del'>-#define BIT_TXERR_INT_8822B BIT(11)</div><div class='del'>-#define BIT_RXERR_INT_8822B BIT(10)</div><div class='del'>-#define BIT_TXFOVW_8822B BIT(9)</div><div class='del'>-#define BIT_FOVW_8822B BIT(8)</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_8822B BIT(5)</div><div class='del'>-#define BIT_PS_TIMER_C_8822B BIT(4)</div><div class='del'>-#define BIT_PS_TIMER_B_8822B BIT(3)</div><div class='del'>-#define BIT_PS_TIMER_A_8822B BIT(2)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBG_PORT_SEL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DEBUG_ST_8822B 0</div><div class='del'>-#define BIT_MASK_DEBUG_ST_8822B 0xffffffffL</div><div class='del'>-#define BIT_DEBUG_ST_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DEBUG_ST_8822B) &lt;&lt; BIT_SHIFT_DEBUG_ST_8822B)</div><div class='del'>-#define BIT_GET_DEBUG_ST_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DEBUG_ST_8822B) &amp; BIT_MASK_DEBUG_ST_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAD_CTRL2_8822B */</div><div class='del'>-#define BIT_USB3_USB2_TRANSITION_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB23_SW_MODE_V1_8822B 18</div><div class='del'>-#define BIT_MASK_USB23_SW_MODE_V1_8822B 0x3</div><div class='del'>-#define BIT_USB23_SW_MODE_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB23_SW_MODE_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB23_SW_MODE_V1_8822B)</div><div class='del'>-#define BIT_GET_USB23_SW_MODE_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB23_SW_MODE_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_USB23_SW_MODE_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_NO_PDN_CHIPOFF_V1_8822B BIT(17)</div><div class='del'>-#define BIT_RSM_EN_V1_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MATCH_CNT_8822B 8</div><div class='del'>-#define BIT_MASK_MATCH_CNT_8822B 0xff</div><div class='del'>-#define BIT_MATCH_CNT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MATCH_CNT_8822B) &lt;&lt; BIT_SHIFT_MATCH_CNT_8822B)</div><div class='del'>-#define BIT_GET_MATCH_CNT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MATCH_CNT_8822B) &amp; BIT_MASK_MATCH_CNT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_LD_B12V_EN_8822B BIT(7)</div><div class='del'>-#define BIT_EECS_IOSEL_V1_8822B BIT(6)</div><div class='del'>-#define BIT_EECS_DATA_O_V1_8822B BIT(5)</div><div class='del'>-#define BIT_EECS_DATA_I_V1_8822B BIT(4)</div><div class='del'>-#define BIT_EESK_IOSEL_V1_8822B BIT(2)</div><div class='del'>-#define BIT_EESK_DATA_O_V1_8822B BIT(1)</div><div class='del'>-#define BIT_EESK_DATA_I_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_PMC_DBG_CTRL2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EFUSE_BURN_GNT_8822B 24</div><div class='del'>-#define BIT_MASK_EFUSE_BURN_GNT_8822B 0xff</div><div class='del'>-#define BIT_EFUSE_BURN_GNT_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EFUSE_BURN_GNT_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EFUSE_BURN_GNT_8822B)</div><div class='del'>-#define BIT_GET_EFUSE_BURN_GNT_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EFUSE_BURN_GNT_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_EFUSE_BURN_GNT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_STOP_WL_PMC_8822B BIT(9)</div><div class='del'>-#define BIT_STOP_SYM_PMC_8822B BIT(8)</div><div class='del'>-#define BIT_REG_RST_WLPMC_8822B BIT(5)</div><div class='del'>-#define BIT_REG_RST_PD12N_8822B BIT(4)</div><div class='del'>-#define BIT_SYSON_DIS_WLREG_WRMSK_8822B BIT(3)</div><div class='del'>-#define BIT_SYSON_DIS_PMCREG_WRMSK_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYSON_REG_ARB_8822B 0</div><div class='del'>-#define BIT_MASK_SYSON_REG_ARB_8822B 0x3</div><div class='del'>-#define BIT_SYSON_REG_ARB_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYSON_REG_ARB_8822B) &lt;&lt; BIT_SHIFT_SYSON_REG_ARB_8822B)</div><div class='del'>-#define BIT_GET_SYSON_REG_ARB_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYSON_REG_ARB_8822B) &amp; BIT_MASK_SYSON_REG_ARB_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_CTRL_8822B */</div><div class='del'>-#define BIT_BIST_USB_DIS_8822B BIT(27)</div><div class='del'>-#define BIT_BIST_PCI_DIS_8822B BIT(26)</div><div class='del'>-#define BIT_BIST_BT_DIS_8822B BIT(25)</div><div class='del'>-#define BIT_BIST_WL_DIS_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BIST_RPT_SEL_8822B 16</div><div class='del'>-#define BIT_MASK_BIST_RPT_SEL_8822B 0xf</div><div class='del'>-#define BIT_BIST_RPT_SEL_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BIST_RPT_SEL_8822B) &lt;&lt; BIT_SHIFT_BIST_RPT_SEL_8822B)</div><div class='del'>-#define BIT_GET_BIST_RPT_SEL_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BIST_RPT_SEL_8822B) &amp; BIT_MASK_BIST_RPT_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BIST_RESUME_PS_8822B BIT(4)</div><div class='del'>-#define BIT_BIST_RESUME_8822B BIT(3)</div><div class='del'>-#define BIT_BIST_NORMAL_8822B BIT(2)</div><div class='del'>-#define BIT_BIST_RSTN_8822B BIT(1)</div><div class='del'>-#define BIT_BIST_CLK_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BIST_RPT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIST_REPORT_8822B 0</div><div class='del'>-#define BIT_MASK_MBIST_REPORT_8822B 0xffffffffL</div><div class='del'>-#define BIT_MBIST_REPORT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIST_REPORT_8822B) &lt;&lt; BIT_SHIFT_MBIST_REPORT_8822B)</div><div class='del'>-#define BIT_GET_MBIST_REPORT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIST_REPORT_8822B) &amp; BIT_MASK_MBIST_REPORT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_CTRL_8822B */</div><div class='del'>-#define BIT_UMEM_RME_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_SPRAM_8822B 28</div><div class='del'>-#define BIT_MASK_BT_SPRAM_8822B 0x3</div><div class='del'>-#define BIT_BT_SPRAM_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_SPRAM_8822B) &lt;&lt; BIT_SHIFT_BT_SPRAM_8822B)</div><div class='del'>-#define BIT_GET_BT_SPRAM_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_SPRAM_8822B) &amp; BIT_MASK_BT_SPRAM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_ROM_8822B 24</div><div class='del'>-#define BIT_MASK_BT_ROM_8822B 0xf</div><div class='del'>-#define BIT_BT_ROM_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_ROM_8822B) &lt;&lt; BIT_SHIFT_BT_ROM_8822B)</div><div class='del'>-#define BIT_GET_BT_ROM_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_ROM_8822B) &amp; BIT_MASK_BT_ROM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCI_DPRAM_8822B 10</div><div class='del'>-#define BIT_MASK_PCI_DPRAM_8822B 0x3</div><div class='del'>-#define BIT_PCI_DPRAM_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCI_DPRAM_8822B) &lt;&lt; BIT_SHIFT_PCI_DPRAM_8822B)</div><div class='del'>-#define BIT_GET_PCI_DPRAM_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCI_DPRAM_8822B) &amp; BIT_MASK_PCI_DPRAM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCI_SPRAM_8822B 8</div><div class='del'>-#define BIT_MASK_PCI_SPRAM_8822B 0x3</div><div class='del'>-#define BIT_PCI_SPRAM_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCI_SPRAM_8822B) &lt;&lt; BIT_SHIFT_PCI_SPRAM_8822B)</div><div class='del'>-#define BIT_GET_PCI_SPRAM_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCI_SPRAM_8822B) &amp; BIT_MASK_PCI_SPRAM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SPRAM_8822B 6</div><div class='del'>-#define BIT_MASK_USB_SPRAM_8822B 0x3</div><div class='del'>-#define BIT_USB_SPRAM_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SPRAM_8822B) &lt;&lt; BIT_SHIFT_USB_SPRAM_8822B)</div><div class='del'>-#define BIT_GET_USB_SPRAM_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SPRAM_8822B) &amp; BIT_MASK_USB_SPRAM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SPRF_8822B 4</div><div class='del'>-#define BIT_MASK_USB_SPRF_8822B 0x3</div><div class='del'>-#define BIT_USB_SPRF_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SPRF_8822B) &lt;&lt; BIT_SHIFT_USB_SPRF_8822B)</div><div class='del'>-#define BIT_GET_USB_SPRF_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SPRF_8822B) &amp; BIT_MASK_USB_SPRF_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCU_ROM_8822B 0</div><div class='del'>-#define BIT_MASK_MCU_ROM_8822B 0xf</div><div class='del'>-#define BIT_MCU_ROM_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_MCU_ROM_8822B) &lt;&lt; BIT_SHIFT_MCU_ROM_8822B)</div><div class='del'>-#define BIT_GET_MCU_ROM_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCU_ROM_8822B) &amp; BIT_MASK_MCU_ROM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AFE_CTRL8_8822B */</div><div class='del'>-#define BIT_SYN_AGPIO_8822B BIT(20)</div><div class='del'>-#define BIT_XTAL_LP_8822B BIT(4)</div><div class='del'>-#define BIT_XTAL_GM_SEP_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_XTAL_SEL_TOK_8822B 0</div><div class='del'>-#define BIT_MASK_XTAL_SEL_TOK_8822B 0x7</div><div class='del'>-#define BIT_XTAL_SEL_TOK_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_XTAL_SEL_TOK_8822B) &lt;&lt; BIT_SHIFT_XTAL_SEL_TOK_8822B)</div><div class='del'>-#define BIT_GET_XTAL_SEL_TOK_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_XTAL_SEL_TOK_8822B) &amp; BIT_MASK_XTAL_SEL_TOK_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USB_SIE_INTF_8822B */</div><div class='del'>-#define BIT_RD_SEL_8822B BIT(31)</div><div class='del'>-#define BIT_USB_SIE_INTF_WE_V1_8822B BIT(30)</div><div class='del'>-#define BIT_USB_SIE_INTF_BYIOREG_V1_8822B BIT(29)</div><div class='del'>-#define BIT_USB_SIE_SELECT_8822B BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SIE_INTF_ADDR_V1_8822B 16</div><div class='del'>-#define BIT_MASK_USB_SIE_INTF_ADDR_V1_8822B 0x1ff</div><div class='del'>-#define BIT_USB_SIE_INTF_ADDR_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SIE_INTF_ADDR_V1_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_SIE_INTF_ADDR_V1_8822B)</div><div class='del'>-#define BIT_GET_USB_SIE_INTF_ADDR_V1_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SIE_INTF_ADDR_V1_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_USB_SIE_INTF_ADDR_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SIE_INTF_RD_8822B 8</div><div class='del'>-#define BIT_MASK_USB_SIE_INTF_RD_8822B 0xff</div><div class='del'>-#define BIT_USB_SIE_INTF_RD_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SIE_INTF_RD_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_SIE_INTF_RD_8822B)</div><div class='del'>-#define BIT_GET_USB_SIE_INTF_RD_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SIE_INTF_RD_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_USB_SIE_INTF_RD_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_SIE_INTF_WD_8822B 0</div><div class='del'>-#define BIT_MASK_USB_SIE_INTF_WD_8822B 0xff</div><div class='del'>-#define BIT_USB_SIE_INTF_WD_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_SIE_INTF_WD_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_SIE_INTF_WD_8822B)</div><div class='del'>-#define BIT_GET_USB_SIE_INTF_WD_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_SIE_INTF_WD_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_USB_SIE_INTF_WD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIO_INTF_8822B */</div><div class='del'>-#define BIT_PCIE_MIO_BYIOREG_8822B BIT(13)</div><div class='del'>-#define BIT_PCIE_MIO_RE_8822B BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MIO_WE_8822B 8</div><div class='del'>-#define BIT_MASK_PCIE_MIO_WE_8822B 0xf</div><div class='del'>-#define BIT_PCIE_MIO_WE_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MIO_WE_8822B) &lt;&lt; BIT_SHIFT_PCIE_MIO_WE_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MIO_WE_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MIO_WE_8822B) &amp; BIT_MASK_PCIE_MIO_WE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MIO_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_PCIE_MIO_ADDR_8822B 0xff</div><div class='del'>-#define BIT_PCIE_MIO_ADDR_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MIO_ADDR_8822B) &lt;&lt; BIT_SHIFT_PCIE_MIO_ADDR_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MIO_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MIO_ADDR_8822B) &amp; BIT_MASK_PCIE_MIO_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIO_INTD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MIO_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_PCIE_MIO_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_PCIE_MIO_DATA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MIO_DATA_8822B) &lt;&lt; BIT_SHIFT_PCIE_MIO_DATA_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MIO_DATA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MIO_DATA_8822B) &amp; BIT_MASK_PCIE_MIO_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLRF1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLRF1_CTRL_8822B 24</div><div class='del'>-#define BIT_MASK_WLRF1_CTRL_8822B 0xff</div><div class='del'>-#define BIT_WLRF1_CTRL_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLRF1_CTRL_8822B) &lt;&lt; BIT_SHIFT_WLRF1_CTRL_8822B)</div><div class='del'>-#define BIT_GET_WLRF1_CTRL_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLRF1_CTRL_8822B) &amp; BIT_MASK_WLRF1_CTRL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRP_ICFG_8822B 28</div><div class='del'>-#define BIT_MASK_TRP_ICFG_8822B 0xf</div><div class='del'>-#define BIT_TRP_ICFG_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRP_ICFG_8822B) &lt;&lt; BIT_SHIFT_TRP_ICFG_8822B)</div><div class='del'>-#define BIT_GET_TRP_ICFG_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRP_ICFG_8822B) &amp; BIT_MASK_TRP_ICFG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RF_TYPE_ID_8822B BIT(27)</div><div class='del'>-#define BIT_BD_HCI_SEL_8822B BIT(26)</div><div class='del'>-#define BIT_BD_PKG_SEL_8822B BIT(25)</div><div class='del'>-#define BIT_SPSLDO_SEL_8822B BIT(24)</div><div class='del'>-#define BIT_RTL_ID_8822B BIT(23)</div><div class='del'>-#define BIT_PAD_HWPD_IDN_8822B BIT(22)</div><div class='del'>-#define BIT_TESTMODE_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VENDOR_ID_8822B 16</div><div class='del'>-#define BIT_MASK_VENDOR_ID_8822B 0xf</div><div class='del'>-#define BIT_VENDOR_ID_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_VENDOR_ID_8822B) &lt;&lt; BIT_SHIFT_VENDOR_ID_8822B)</div><div class='del'>-#define BIT_GET_VENDOR_ID_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VENDOR_ID_8822B) &amp; BIT_MASK_VENDOR_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CHIP_VER_8822B 12</div><div class='del'>-#define BIT_MASK_CHIP_VER_8822B 0xf</div><div class='del'>-#define BIT_CHIP_VER_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_CHIP_VER_8822B) &lt;&lt; BIT_SHIFT_CHIP_VER_8822B)</div><div class='del'>-#define BIT_GET_CHIP_VER_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CHIP_VER_8822B) &amp; BIT_MASK_CHIP_VER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BD_MAC3_8822B BIT(11)</div><div class='del'>-#define BIT_BD_MAC1_8822B BIT(10)</div><div class='del'>-#define BIT_BD_MAC2_8822B BIT(9)</div><div class='del'>-#define BIT_SIC_IDLE_8822B BIT(8)</div><div class='del'>-#define BIT_SW_OFFLOAD_EN_8822B BIT(7)</div><div class='del'>-#define BIT_OCP_SHUTDN_8822B BIT(6)</div><div class='del'>-#define BIT_V15_VLD_8822B BIT(5)</div><div class='del'>-#define BIT_PCIRSTB_8822B BIT(4)</div><div class='del'>-#define BIT_PCLK_VLD_8822B BIT(3)</div><div class='del'>-#define BIT_UCLK_VLD_8822B BIT(2)</div><div class='del'>-#define BIT_ACLK_VLD_8822B BIT(1)</div><div class='del'>-#define BIT_XCLK_VLD_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RF_RL_ID_8822B 28</div><div class='del'>-#define BIT_MASK_RF_RL_ID_8822B 0xf</div><div class='del'>-#define BIT_RF_RL_ID_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RF_RL_ID_8822B) &lt;&lt; BIT_SHIFT_RF_RL_ID_8822B)</div><div class='del'>-#define BIT_GET_RF_RL_ID_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RF_RL_ID_8822B) &amp; BIT_MASK_RF_RL_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_HPHY_ICFG_8822B BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SEL_0XC0_8822B 16</div><div class='del'>-#define BIT_MASK_SEL_0XC0_8822B 0x3</div><div class='del'>-#define BIT_SEL_0XC0_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_SEL_0XC0_8822B) &lt;&lt; BIT_SHIFT_SEL_0XC0_8822B)</div><div class='del'>-#define BIT_GET_SEL_0XC0_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SEL_0XC0_8822B) &amp; BIT_MASK_SEL_0XC0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HCI_SEL_V3_8822B 12</div><div class='del'>-#define BIT_MASK_HCI_SEL_V3_8822B 0x7</div><div class='del'>-#define BIT_HCI_SEL_V3_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HCI_SEL_V3_8822B) &lt;&lt; BIT_SHIFT_HCI_SEL_V3_8822B)</div><div class='del'>-#define BIT_GET_HCI_SEL_V3_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HCI_SEL_V3_8822B) &amp; BIT_MASK_HCI_SEL_V3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_USB_OPERATION_MODE_8822B BIT(10)</div><div class='del'>-#define BIT_BT_PDN_8822B BIT(9)</div><div class='del'>-#define BIT_AUTO_WLPON_8822B BIT(8)</div><div class='del'>-#define BIT_WL_MODE_8822B BIT(7)</div><div class='del'>-#define BIT_PKG_SEL_HCI_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PAD_HCI_SEL_V1_8822B 3</div><div class='del'>-#define BIT_MASK_PAD_HCI_SEL_V1_8822B 0x7</div><div class='del'>-#define BIT_PAD_HCI_SEL_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_PAD_HCI_SEL_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PAD_HCI_SEL_V1_8822B)</div><div class='del'>-#define BIT_GET_PAD_HCI_SEL_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PAD_HCI_SEL_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_PAD_HCI_SEL_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EFS_HCI_SEL_V1_8822B 0</div><div class='del'>-#define BIT_MASK_EFS_HCI_SEL_V1_8822B 0x7</div><div class='del'>-#define BIT_EFS_HCI_SEL_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EFS_HCI_SEL_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EFS_HCI_SEL_V1_8822B)</div><div class='del'>-#define BIT_GET_EFS_HCI_SEL_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EFS_HCI_SEL_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_EFS_HCI_SEL_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_STATUS2_8822B */</div><div class='del'>-#define BIT_SIO_ALDN_8822B BIT(19)</div><div class='del'>-#define BIT_USB_ALDN_8822B BIT(18)</div><div class='del'>-#define BIT_PCI_ALDN_8822B BIT(17)</div><div class='del'>-#define BIT_SYS_ALDN_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EPVID1_8822B 8</div><div class='del'>-#define BIT_MASK_EPVID1_8822B 0xff</div><div class='del'>-#define BIT_EPVID1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_EPVID1_8822B) &lt;&lt; BIT_SHIFT_EPVID1_8822B)</div><div class='del'>-#define BIT_GET_EPVID1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EPVID1_8822B) &amp; BIT_MASK_EPVID1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EPVID0_8822B 0</div><div class='del'>-#define BIT_MASK_EPVID0_8822B 0xff</div><div class='del'>-#define BIT_EPVID0_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_EPVID0_8822B) &lt;&lt; BIT_SHIFT_EPVID0_8822B)</div><div class='del'>-#define BIT_GET_EPVID0_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EPVID0_8822B) &amp; BIT_MASK_EPVID0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG2_8822B */</div><div class='del'>-#define BIT_HCI_SEL_EMBEDDED_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_ID_8822B 0</div><div class='del'>-#define BIT_MASK_HW_ID_8822B 0xff</div><div class='del'>-#define BIT_HW_ID_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_ID_8822B) &lt;&lt; BIT_SHIFT_HW_ID_8822B)</div><div class='del'>-#define BIT_GET_HW_ID_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_ID_8822B) &amp; BIT_MASK_HW_ID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG3_8822B */</div><div class='del'>-#define BIT_PWC_MA33V_8822B BIT(15)</div><div class='del'>-#define BIT_PWC_MA12V_8822B BIT(14)</div><div class='del'>-#define BIT_PWC_MD12V_8822B BIT(13)</div><div class='del'>-#define BIT_PWC_PD12V_8822B BIT(12)</div><div class='del'>-#define BIT_PWC_UD12V_8822B BIT(11)</div><div class='del'>-#define BIT_ISO_MA2MD_8822B BIT(1)</div><div class='del'>-#define BIT_ISO_MD2PP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG4_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_SYS_CFG5_8822B */</div><div class='del'>-#define BIT_LPS_STATUS_8822B BIT(3)</div><div class='del'>-#define BIT_HCI_TXDMA_BUSY_8822B BIT(2)</div><div class='del'>-#define BIT_HCI_TXDMA_ALLOW_8822B BIT(1)</div><div class='del'>-#define BIT_FW_CTRL_HCI_TXDMA_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_DMEM_CON_8822B */</div><div class='del'>-#define BIT_WDT_OPT_IOWRAPPER_8822B BIT(19)</div><div class='del'>-#define BIT_ANA_PORT_IDLE_8822B BIT(18)</div><div class='del'>-#define BIT_MAC_PORT_IDLE_8822B BIT(17)</div><div class='del'>-#define BIT_WL_PLATFORM_RST_8822B BIT(16)</div><div class='del'>-#define BIT_WL_SECURITY_CLK_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPU_DMEM_CON_8822B 0</div><div class='del'>-#define BIT_MASK_CPU_DMEM_CON_8822B 0xff</div><div class='del'>-#define BIT_CPU_DMEM_CON_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPU_DMEM_CON_8822B) &lt;&lt; BIT_SHIFT_CPU_DMEM_CON_8822B)</div><div class='del'>-#define BIT_GET_CPU_DMEM_CON_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPU_DMEM_CON_8822B) &amp; BIT_MASK_CPU_DMEM_CON_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BOOT_REASON_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BOOT_REASON_8822B 0</div><div class='del'>-#define BIT_MASK_BOOT_REASON_8822B 0x7</div><div class='del'>-#define BIT_BOOT_REASON_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BOOT_REASON_8822B) &lt;&lt; BIT_SHIFT_BOOT_REASON_8822B)</div><div class='del'>-#define BIT_GET_BOOT_REASON_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BOOT_REASON_8822B) &amp; BIT_MASK_BOOT_REASON_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NFCPAD_CTRL_8822B */</div><div class='del'>-#define BIT_PAD_SHUTDW_8822B BIT(18)</div><div class='del'>-#define BIT_SYSON_NFC_PAD_8822B BIT(17)</div><div class='del'>-#define BIT_NFC_INT_PAD_CTRL_8822B BIT(16)</div><div class='del'>-#define BIT_NFC_RFDIS_PAD_CTRL_8822B BIT(15)</div><div class='del'>-#define BIT_NFC_CLK_PAD_CTRL_8822B BIT(14)</div><div class='del'>-#define BIT_NFC_DATA_PAD_CTRL_8822B BIT(13)</div><div class='del'>-#define BIT_NFC_PAD_PULL_CTRL_8822B BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NFCPAD_IO_SEL_8822B 8</div><div class='del'>-#define BIT_MASK_NFCPAD_IO_SEL_8822B 0xf</div><div class='del'>-#define BIT_NFCPAD_IO_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_NFCPAD_IO_SEL_8822B) &lt;&lt; BIT_SHIFT_NFCPAD_IO_SEL_8822B)</div><div class='del'>-#define BIT_GET_NFCPAD_IO_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NFCPAD_IO_SEL_8822B) &amp; BIT_MASK_NFCPAD_IO_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NFCPAD_OUT_8822B 4</div><div class='del'>-#define BIT_MASK_NFCPAD_OUT_8822B 0xf</div><div class='del'>-#define BIT_NFCPAD_OUT_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_NFCPAD_OUT_8822B) &lt;&lt; BIT_SHIFT_NFCPAD_OUT_8822B)</div><div class='del'>-#define BIT_GET_NFCPAD_OUT_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NFCPAD_OUT_8822B) &amp; BIT_MASK_NFCPAD_OUT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NFCPAD_IN_8822B 0</div><div class='del'>-#define BIT_MASK_NFCPAD_IN_8822B 0xf</div><div class='del'>-#define BIT_NFCPAD_IN_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_NFCPAD_IN_8822B) &lt;&lt; BIT_SHIFT_NFCPAD_IN_8822B)</div><div class='del'>-#define BIT_GET_NFCPAD_IN_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NFCPAD_IN_8822B) &amp; BIT_MASK_NFCPAD_IN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR2_8822B */</div><div class='del'>-#define BIT_BCNDMAINT_P4_MSK_8822B BIT(31)</div><div class='del'>-#define BIT_BCNDMAINT_P3_MSK_8822B BIT(30)</div><div class='del'>-#define BIT_BCNDMAINT_P2_MSK_8822B BIT(29)</div><div class='del'>-#define BIT_BCNDMAINT_P1_MSK_8822B BIT(28)</div><div class='del'>-#define BIT_ATIMEND7_MSK_8822B BIT(22)</div><div class='del'>-#define BIT_ATIMEND6_MSK_8822B BIT(21)</div><div class='del'>-#define BIT_ATIMEND5_MSK_8822B BIT(20)</div><div class='del'>-#define BIT_ATIMEND4_MSK_8822B BIT(19)</div><div class='del'>-#define BIT_ATIMEND3_MSK_8822B BIT(18)</div><div class='del'>-#define BIT_ATIMEND2_MSK_8822B BIT(17)</div><div class='del'>-#define BIT_ATIMEND1_MSK_8822B BIT(16)</div><div class='del'>-#define BIT_TXBCN7OK_MSK_8822B BIT(14)</div><div class='del'>-#define BIT_TXBCN6OK_MSK_8822B BIT(13)</div><div class='del'>-#define BIT_TXBCN5OK_MSK_8822B BIT(12)</div><div class='del'>-#define BIT_TXBCN4OK_MSK_8822B BIT(11)</div><div class='del'>-#define BIT_TXBCN3OK_MSK_8822B BIT(10)</div><div class='del'>-#define BIT_TXBCN2OK_MSK_8822B BIT(9)</div><div class='del'>-#define BIT_TXBCN1OK_MSK_V1_8822B BIT(8)</div><div class='del'>-#define BIT_TXBCN7ERR_MSK_8822B BIT(6)</div><div class='del'>-#define BIT_TXBCN6ERR_MSK_8822B BIT(5)</div><div class='del'>-#define BIT_TXBCN5ERR_MSK_8822B BIT(4)</div><div class='del'>-#define BIT_TXBCN4ERR_MSK_8822B BIT(3)</div><div class='del'>-#define BIT_TXBCN3ERR_MSK_8822B BIT(2)</div><div class='del'>-#define BIT_TXBCN2ERR_MSK_8822B BIT(1)</div><div class='del'>-#define BIT_TXBCN1ERR_MSK_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR2_8822B */</div><div class='del'>-#define BIT_BCNDMAINT_P4_8822B BIT(31)</div><div class='del'>-#define BIT_BCNDMAINT_P3_8822B BIT(30)</div><div class='del'>-#define BIT_BCNDMAINT_P2_8822B BIT(29)</div><div class='del'>-#define BIT_BCNDMAINT_P1_8822B BIT(28)</div><div class='del'>-#define BIT_ATIMEND7_8822B BIT(22)</div><div class='del'>-#define BIT_ATIMEND6_8822B BIT(21)</div><div class='del'>-#define BIT_ATIMEND5_8822B BIT(20)</div><div class='del'>-#define BIT_ATIMEND4_8822B BIT(19)</div><div class='del'>-#define BIT_ATIMEND3_8822B BIT(18)</div><div class='del'>-#define BIT_ATIMEND2_8822B BIT(17)</div><div class='del'>-#define BIT_ATIMEND1_8822B BIT(16)</div><div class='del'>-#define BIT_TXBCN7OK_8822B BIT(14)</div><div class='del'>-#define BIT_TXBCN6OK_8822B BIT(13)</div><div class='del'>-#define BIT_TXBCN5OK_8822B BIT(12)</div><div class='del'>-#define BIT_TXBCN4OK_8822B BIT(11)</div><div class='del'>-#define BIT_TXBCN3OK_8822B BIT(10)</div><div class='del'>-#define BIT_TXBCN2OK_8822B BIT(9)</div><div class='del'>-#define BIT_TXBCN1OK_8822B BIT(8)</div><div class='del'>-#define BIT_TXBCN7ERR_8822B BIT(6)</div><div class='del'>-#define BIT_TXBCN6ERR_8822B BIT(5)</div><div class='del'>-#define BIT_TXBCN5ERR_8822B BIT(4)</div><div class='del'>-#define BIT_TXBCN4ERR_8822B BIT(3)</div><div class='del'>-#define BIT_TXBCN3ERR_8822B BIT(2)</div><div class='del'>-#define BIT_TXBCN2ERR_8822B BIT(1)</div><div class='del'>-#define BIT_TXBCN1ERR_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIMR3_8822B */</div><div class='del'>-#define BIT_WDT_PLATFORM_INT_MSK_8822B BIT(18)</div><div class='del'>-#define BIT_WDT_CPU_INT_MSK_8822B BIT(17)</div><div class='del'>-#define BIT_SETH2CDOK_MASK_8822B BIT(16)</div><div class='del'>-#define BIT_H2C_CMD_FULL_MASK_8822B BIT(15)</div><div class='del'>-#define BIT_PWR_INT_127_MASK_8822B BIT(14)</div><div class='del'>-#define BIT_TXSHORTCUT_TXDESUPDATEOK_MASK_8822B BIT(13)</div><div class='del'>-#define BIT_TXSHORTCUT_BKUPDATEOK_MASK_8822B BIT(12)</div><div class='del'>-#define BIT_TXSHORTCUT_BEUPDATEOK_MASK_8822B BIT(11)</div><div class='del'>-#define BIT_TXSHORTCUT_VIUPDATEOK_MAS_8822B BIT(10)</div><div class='del'>-#define BIT_TXSHORTCUT_VOUPDATEOK_MASK_8822B BIT(9)</div><div class='del'>-#define BIT_PWR_INT_127_MASK_V1_8822B BIT(8)</div><div class='del'>-#define BIT_PWR_INT_126TO96_MASK_8822B BIT(7)</div><div class='del'>-#define BIT_PWR_INT_95TO64_MASK_8822B BIT(6)</div><div class='del'>-#define BIT_PWR_INT_63TO32_MASK_8822B BIT(5)</div><div class='del'>-#define BIT_PWR_INT_31TO0_MASK_8822B BIT(4)</div><div class='del'>-#define BIT_DDMA0_LP_INT_MSK_8822B BIT(1)</div><div class='del'>-#define BIT_DDMA0_HP_INT_MSK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HISR3_8822B */</div><div class='del'>-#define BIT_WDT_PLATFORM_INT_8822B BIT(18)</div><div class='del'>-#define BIT_WDT_CPU_INT_8822B BIT(17)</div><div class='del'>-#define BIT_SETH2CDOK_8822B BIT(16)</div><div class='del'>-#define BIT_H2C_CMD_FULL_8822B BIT(15)</div><div class='del'>-#define BIT_PWR_INT_127_8822B BIT(14)</div><div class='del'>-#define BIT_TXSHORTCUT_TXDESUPDATEOK_8822B BIT(13)</div><div class='del'>-#define BIT_TXSHORTCUT_BKUPDATEOK_8822B BIT(12)</div><div class='del'>-#define BIT_TXSHORTCUT_BEUPDATEOK_8822B BIT(11)</div><div class='del'>-#define BIT_TXSHORTCUT_VIUPDATEOK_8822B BIT(10)</div><div class='del'>-#define BIT_TXSHORTCUT_VOUPDATEOK_8822B BIT(9)</div><div class='del'>-#define BIT_PWR_INT_127_V1_8822B BIT(8)</div><div class='del'>-#define BIT_PWR_INT_126TO96_8822B BIT(7)</div><div class='del'>-#define BIT_PWR_INT_95TO64_8822B BIT(6)</div><div class='del'>-#define BIT_PWR_INT_63TO32_8822B BIT(5)</div><div class='del'>-#define BIT_PWR_INT_31TO0_8822B BIT(4)</div><div class='del'>-#define BIT_DDMA0_LP_INT_8822B BIT(1)</div><div class='del'>-#define BIT_DDMA0_HP_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_MDIO_8822B */</div><div class='del'>-#define BIT_DIS_TIMEOUT_IO_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_FLUSH_8822B */</div><div class='del'>-#define BIT_FLUSH_HOLDN_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FLUSH_WR_EN_8822B BIT(24)</div><div class='del'>-#define BIT_SW_FLASH_CONTROL_8822B BIT(23)</div><div class='del'>-#define BIT_SW_FLASH_WEN_E_8822B BIT(19)</div><div class='del'>-#define BIT_SW_FLASH_HOLDN_E_8822B BIT(18)</div><div class='del'>-#define BIT_SW_FLASH_SO_E_8822B BIT(17)</div><div class='del'>-#define BIT_SW_FLASH_SI_E_8822B BIT(16)</div><div class='del'>-#define BIT_SW_FLASH_SK_O_8822B BIT(13)</div><div class='del'>-#define BIT_SW_FLASH_CEN_O_8822B BIT(12)</div><div class='del'>-#define BIT_SW_FLASH_WEN_O_8822B BIT(11)</div><div class='del'>-#define BIT_SW_FLASH_HOLDN_O_8822B BIT(10)</div><div class='del'>-#define BIT_SW_FLASH_SO_O_8822B BIT(9)</div><div class='del'>-#define BIT_SW_FLASH_SI_O_8822B BIT(8)</div><div class='del'>-#define BIT_SW_FLASH_WEN_I_8822B BIT(3)</div><div class='del'>-#define BIT_SW_FLASH_HOLDN_I_8822B BIT(2)</div><div class='del'>-#define BIT_SW_FLASH_SO_I_8822B BIT(1)</div><div class='del'>-#define BIT_SW_FLASH_SI_I_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_PKT_READADDR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_PKT_READADDR_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_PKT_READADDR_8822B 0x3ffff</div><div class='del'>-#define BIT_H2C_PKT_READADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_PKT_READADDR_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_H2C_PKT_READADDR_8822B)</div><div class='del'>-#define BIT_GET_H2C_PKT_READADDR_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_PKT_READADDR_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_H2C_PKT_READADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_PKT_WRITEADDR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_PKT_WRITEADDR_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_PKT_WRITEADDR_8822B 0x3ffff</div><div class='del'>-#define BIT_H2C_PKT_WRITEADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_PKT_WRITEADDR_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_H2C_PKT_WRITEADDR_8822B)</div><div class='del'>-#define BIT_GET_H2C_PKT_WRITEADDR_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_PKT_WRITEADDR_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_H2C_PKT_WRITEADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MEM_PWR_CRTL_8822B */</div><div class='del'>-#define BIT_MEM_BB_SD_8822B BIT(17)</div><div class='del'>-#define BIT_MEM_BB_DS_8822B BIT(16)</div><div class='del'>-#define BIT_MEM_BT_DS_8822B BIT(10)</div><div class='del'>-#define BIT_MEM_SDIO_LS_8822B BIT(9)</div><div class='del'>-#define BIT_MEM_SDIO_DS_8822B BIT(8)</div><div class='del'>-#define BIT_MEM_USB_LS_8822B BIT(7)</div><div class='del'>-#define BIT_MEM_USB_DS_8822B BIT(6)</div><div class='del'>-#define BIT_MEM_PCI_LS_8822B BIT(5)</div><div class='del'>-#define BIT_MEM_PCI_DS_8822B BIT(4)</div><div class='del'>-#define BIT_MEM_WLMAC_LS_8822B BIT(3)</div><div class='del'>-#define BIT_MEM_WLMAC_DS_8822B BIT(2)</div><div class='del'>-#define BIT_MEM_WLMCU_LS_8822B BIT(1)</div><div class='del'>-#define BIT_MEM_WLMCU_DS_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG0_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG0_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG0_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG0_8822B) &lt;&lt; BIT_SHIFT_FW_DBG0_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG0_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG0_8822B) &amp; BIT_MASK_FW_DBG0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG1_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG1_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG1_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG1_8822B) &lt;&lt; BIT_SHIFT_FW_DBG1_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG1_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG1_8822B) &amp; BIT_MASK_FW_DBG1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG2_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG2_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG2_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG2_8822B) &lt;&lt; BIT_SHIFT_FW_DBG2_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG2_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG2_8822B) &amp; BIT_MASK_FW_DBG2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG3_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG3_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG3_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG3_8822B) &lt;&lt; BIT_SHIFT_FW_DBG3_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG3_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG3_8822B) &amp; BIT_MASK_FW_DBG3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG4_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG4_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG4_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG4_8822B) &lt;&lt; BIT_SHIFT_FW_DBG4_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG4_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG4_8822B) &amp; BIT_MASK_FW_DBG4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG5_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG5_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG5_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG5_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG5_8822B) &lt;&lt; BIT_SHIFT_FW_DBG5_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG5_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG5_8822B) &amp; BIT_MASK_FW_DBG5_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG6_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG6_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG6_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG6_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG6_8822B) &lt;&lt; BIT_SHIFT_FW_DBG6_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG6_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG6_8822B) &amp; BIT_MASK_FW_DBG6_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FW_DBG7_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_DBG7_8822B 0</div><div class='del'>-#define BIT_MASK_FW_DBG7_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_DBG7_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_DBG7_8822B) &lt;&lt; BIT_SHIFT_FW_DBG7_8822B)</div><div class='del'>-#define BIT_GET_FW_DBG7_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_DBG7_8822B) &amp; BIT_MASK_FW_DBG7_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_CR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LBMODE_8822B 24</div><div class='del'>-#define BIT_MASK_LBMODE_8822B 0x1f</div><div class='del'>-#define BIT_LBMODE_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LBMODE_8822B) &lt;&lt; BIT_SHIFT_LBMODE_8822B)</div><div class='del'>-#define BIT_GET_LBMODE_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LBMODE_8822B) &amp; BIT_MASK_LBMODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE1_8822B 18</div><div class='del'>-#define BIT_MASK_NETYPE1_8822B 0x3</div><div class='del'>-#define BIT_NETYPE1_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NETYPE1_8822B) &lt;&lt; BIT_SHIFT_NETYPE1_8822B)</div><div class='del'>-#define BIT_GET_NETYPE1_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NETYPE1_8822B) &amp; BIT_MASK_NETYPE1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE0_8822B 16</div><div class='del'>-#define BIT_MASK_NETYPE0_8822B 0x3</div><div class='del'>-#define BIT_NETYPE0_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NETYPE0_8822B) &lt;&lt; BIT_SHIFT_NETYPE0_8822B)</div><div class='del'>-#define BIT_GET_NETYPE0_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NETYPE0_8822B) &amp; BIT_MASK_NETYPE0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_I2C_MAILBOX_EN_8822B BIT(12)</div><div class='del'>-#define BIT_SHCUT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_32K_CAL_TMR_EN_8822B BIT(10)</div><div class='del'>-#define BIT_MAC_SEC_EN_8822B BIT(9)</div><div class='del'>-#define BIT_ENSWBCN_8822B BIT(8)</div><div class='del'>-#define BIT_MACRXEN_8822B BIT(7)</div><div class='del'>-#define BIT_MACTXEN_8822B BIT(6)</div><div class='del'>-#define BIT_SCHEDULE_EN_8822B BIT(5)</div><div class='del'>-#define BIT_PROTOCOL_EN_8822B BIT(4)</div><div class='del'>-#define BIT_RXDMA_EN_8822B BIT(3)</div><div class='del'>-#define BIT_TXDMA_EN_8822B BIT(2)</div><div class='del'>-#define BIT_HCI_RXDMA_EN_8822B BIT(1)</div><div class='del'>-#define BIT_HCI_TXDMA_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_BUFF_ACCESS_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_BUFF_ACCESS_CTRL_8822B 0</div><div class='del'>-#define BIT_MASK_PKT_BUFF_ACCESS_CTRL_8822B 0xff</div><div class='del'>-#define BIT_PKT_BUFF_ACCESS_CTRL_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_BUFF_ACCESS_CTRL_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKT_BUFF_ACCESS_CTRL_8822B)</div><div class='del'>-#define BIT_GET_PKT_BUFF_ACCESS_CTRL_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_BUFF_ACCESS_CTRL_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_PKT_BUFF_ACCESS_CTRL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSF_CLK_STATE_8822B */</div><div class='del'>-#define BIT_TSF_CLK_STABLE_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_PQ_MAP_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_HIQ_MAP_8822B 14</div><div class='del'>-#define BIT_MASK_TXDMA_HIQ_MAP_8822B 0x3</div><div class='del'>-#define BIT_TXDMA_HIQ_MAP_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_HIQ_MAP_8822B) &lt;&lt; BIT_SHIFT_TXDMA_HIQ_MAP_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_HIQ_MAP_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_HIQ_MAP_8822B) &amp; BIT_MASK_TXDMA_HIQ_MAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_MGQ_MAP_8822B 12</div><div class='del'>-#define BIT_MASK_TXDMA_MGQ_MAP_8822B 0x3</div><div class='del'>-#define BIT_TXDMA_MGQ_MAP_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_MGQ_MAP_8822B) &lt;&lt; BIT_SHIFT_TXDMA_MGQ_MAP_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_MGQ_MAP_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_MGQ_MAP_8822B) &amp; BIT_MASK_TXDMA_MGQ_MAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_BKQ_MAP_8822B 10</div><div class='del'>-#define BIT_MASK_TXDMA_BKQ_MAP_8822B 0x3</div><div class='del'>-#define BIT_TXDMA_BKQ_MAP_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_BKQ_MAP_8822B) &lt;&lt; BIT_SHIFT_TXDMA_BKQ_MAP_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_BKQ_MAP_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_BKQ_MAP_8822B) &amp; BIT_MASK_TXDMA_BKQ_MAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_BEQ_MAP_8822B 8</div><div class='del'>-#define BIT_MASK_TXDMA_BEQ_MAP_8822B 0x3</div><div class='del'>-#define BIT_TXDMA_BEQ_MAP_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_BEQ_MAP_8822B) &lt;&lt; BIT_SHIFT_TXDMA_BEQ_MAP_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_BEQ_MAP_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_BEQ_MAP_8822B) &amp; BIT_MASK_TXDMA_BEQ_MAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_VIQ_MAP_8822B 6</div><div class='del'>-#define BIT_MASK_TXDMA_VIQ_MAP_8822B 0x3</div><div class='del'>-#define BIT_TXDMA_VIQ_MAP_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_VIQ_MAP_8822B) &lt;&lt; BIT_SHIFT_TXDMA_VIQ_MAP_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_VIQ_MAP_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_VIQ_MAP_8822B) &amp; BIT_MASK_TXDMA_VIQ_MAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_VOQ_MAP_8822B 4</div><div class='del'>-#define BIT_MASK_TXDMA_VOQ_MAP_8822B 0x3</div><div class='del'>-#define BIT_TXDMA_VOQ_MAP_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_VOQ_MAP_8822B) &lt;&lt; BIT_SHIFT_TXDMA_VOQ_MAP_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_VOQ_MAP_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_VOQ_MAP_8822B) &amp; BIT_MASK_TXDMA_VOQ_MAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RXDMA_AGG_EN_8822B BIT(2)</div><div class='del'>-#define BIT_RXSHFT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_RXDMA_ARBBW_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRXFF_BNDY_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFFOVFL_RSV_V2_8822B 8</div><div class='del'>-#define BIT_MASK_RXFFOVFL_RSV_V2_8822B 0xf</div><div class='del'>-#define BIT_RXFFOVFL_RSV_V2_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFFOVFL_RSV_V2_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFFOVFL_RSV_V2_8822B)</div><div class='del'>-#define BIT_GET_RXFFOVFL_RSV_V2_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFFOVFL_RSV_V2_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_RXFFOVFL_RSV_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKTBUF_PGBNDY_8822B 0</div><div class='del'>-#define BIT_MASK_TXPKTBUF_PGBNDY_8822B 0xff</div><div class='del'>-#define BIT_TXPKTBUF_PGBNDY_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKTBUF_PGBNDY_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TXPKTBUF_PGBNDY_8822B)</div><div class='del'>-#define BIT_GET_TXPKTBUF_PGBNDY_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKTBUF_PGBNDY_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TXPKTBUF_PGBNDY_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTA_I2C_MBOX_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_I2C_M_STATUS_8822B 8</div><div class='del'>-#define BIT_MASK_I2C_M_STATUS_8822B 0xf</div><div class='del'>-#define BIT_I2C_M_STATUS_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_I2C_M_STATUS_8822B) &lt;&lt; BIT_SHIFT_I2C_M_STATUS_8822B)</div><div class='del'>-#define BIT_GET_I2C_M_STATUS_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_I2C_M_STATUS_8822B) &amp; BIT_MASK_I2C_M_STATUS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_I2C_M_BUS_GNT_FW_8822B 4</div><div class='del'>-#define BIT_MASK_I2C_M_BUS_GNT_FW_8822B 0x7</div><div class='del'>-#define BIT_I2C_M_BUS_GNT_FW_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_I2C_M_BUS_GNT_FW_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_I2C_M_BUS_GNT_FW_8822B)</div><div class='del'>-#define BIT_GET_I2C_M_BUS_GNT_FW_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_I2C_M_BUS_GNT_FW_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_I2C_M_BUS_GNT_FW_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_I2C_M_GNT_FW_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_I2C_M_SPEED_8822B 1</div><div class='del'>-#define BIT_MASK_I2C_M_SPEED_8822B 0x3</div><div class='del'>-#define BIT_I2C_M_SPEED_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_I2C_M_SPEED_8822B) &lt;&lt; BIT_SHIFT_I2C_M_SPEED_8822B)</div><div class='del'>-#define BIT_GET_I2C_M_SPEED_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_I2C_M_SPEED_8822B) &amp; BIT_MASK_I2C_M_SPEED_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_I2C_M_UNLOCK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFF_BNDY_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFF0_BNDY_V2_8822B 0</div><div class='del'>-#define BIT_MASK_RXFF0_BNDY_V2_8822B 0x3ffff</div><div class='del'>-#define BIT_RXFF0_BNDY_V2_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFF0_BNDY_V2_8822B) &lt;&lt; BIT_SHIFT_RXFF0_BNDY_V2_8822B)</div><div class='del'>-#define BIT_GET_RXFF0_BNDY_V2_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFF0_BNDY_V2_8822B) &amp; BIT_MASK_RXFF0_BNDY_V2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1IMR_8822B */</div><div class='del'>-#define BIT_FS_RXDMA2_DONE_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_FS_RXDONE3_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_FS_RXDONE2_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_RX_BCN_P4_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_RX_BCN_P3_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_RX_BCN_P2_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_RX_BCN_P1_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_RX_BCN_P0_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_RX_UMD0_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_RX_UMD1_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_RX_BMD0_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_RX_BMD1_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_RXDONE_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_WWLAN_INT_EN_8822B BIT(15)</div><div class='del'>-#define BIT_FS_SOUND_DONE_INT_EN_8822B BIT(14)</div><div class='del'>-#define BIT_FS_LP_STBY_INT_EN_8822B BIT(13)</div><div class='del'>-#define BIT_FS_TRL_MTR_INT_EN_8822B BIT(12)</div><div class='del'>-#define BIT_FS_BF1_PRETO_INT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_BF0_PRETO_INT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_PTCL_RELEASE_MACID_INT_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_LTE_COEX_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_WLACTOFF_INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_WLACTON_INT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_BTCMD_INT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_REG_MAILBOX_TO_I2C_INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_TRPC_TO_INT_EN_V1_8822B BIT(1)</div><div class='del'>-#define BIT_FS_RPC_O_T_INT_EN_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE1ISR_8822B */</div><div class='del'>-#define BIT_FS_RXDMA2_DONE_INT_8822B BIT(28)</div><div class='del'>-#define BIT_FS_RXDONE3_INT_8822B BIT(27)</div><div class='del'>-#define BIT_FS_RXDONE2_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_RX_BCN_P4_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_RX_BCN_P3_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_RX_BCN_P2_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_RX_BCN_P1_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_RX_BCN_P0_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_RX_UMD0_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_RX_UMD1_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_RX_BMD0_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_RX_BMD1_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_RXDONE_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_WWLAN_INT_8822B BIT(15)</div><div class='del'>-#define BIT_FS_SOUND_DONE_INT_8822B BIT(14)</div><div class='del'>-#define BIT_FS_LP_STBY_INT_8822B BIT(13)</div><div class='del'>-#define BIT_FS_TRL_MTR_INT_8822B BIT(12)</div><div class='del'>-#define BIT_FS_BF1_PRETO_INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_BF0_PRETO_INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_PTCL_RELEASE_MACID_INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_LTE_COEX_INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_WLACTOFF_INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_WLACTON_INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_BCN_RX_INT_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_MAILBOX_TO_I2C_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_TRPC_TO_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_RPC_O_T_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPWM_8822B */</div><div class='del'>-#define BIT_CPWM_TOGGLING_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPWM_MOD_8822B 24</div><div class='del'>-#define BIT_MASK_CPWM_MOD_8822B 0x7f</div><div class='del'>-#define BIT_CPWM_MOD_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPWM_MOD_8822B) &lt;&lt; BIT_SHIFT_CPWM_MOD_8822B)</div><div class='del'>-#define BIT_GET_CPWM_MOD_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPWM_MOD_8822B) &amp; BIT_MASK_CPWM_MOD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWIMR_8822B */</div><div class='del'>-#define BIT_FS_TXBCNOK_MB7_INT_EN_8822B BIT(31)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB6_INT_EN_8822B BIT(30)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB5_INT_EN_8822B BIT(29)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB4_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB3_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB2_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB1_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB0_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB7_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB6_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB5_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB4_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB3_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB2_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB1_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB0_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_INT_EN_8822B BIT(15)</div><div class='del'>-#define BIT_SIFS_OVERSPEC_INT_EN_8822B BIT(14)</div><div class='del'>-#define BIT_FS_MGNTQ_RPTR_RELEASE_INT_EN_8822B BIT(13)</div><div class='del'>-#define BIT_FS_MGNTQFF_TO_INT_EN_8822B BIT(12)</div><div class='del'>-#define BIT_FS_DDMA1_LP_INT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_DDMA1_HP_INT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_DDMA0_LP_INT_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_DDMA0_HP_INT_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_TRXRPT_INT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_C2H_W_READY_INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_HRCV_INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_H2CCMD_INT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_TXPKTIN_INT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_ERRORHDL_INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_TXCCX_INT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_TXCLOSE_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWISR_8822B */</div><div class='del'>-#define BIT_FS_TXBCNOK_MB7_INT_8822B BIT(31)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB6_INT_8822B BIT(30)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB5_INT_8822B BIT(29)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB4_INT_8822B BIT(28)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB3_INT_8822B BIT(27)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB2_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB1_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_TXBCNOK_MB0_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB7_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB6_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB5_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB4_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB3_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB2_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB1_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_TXBCNERR_MB0_INT_8822B BIT(16)</div><div class='del'>-#define BIT_CPU_MGQ_TXDONE_INT_8822B BIT(15)</div><div class='del'>-#define BIT_SIFS_OVERSPEC_INT_8822B BIT(14)</div><div class='del'>-#define BIT_FS_MGNTQ_RPTR_RELEASE_INT_8822B BIT(13)</div><div class='del'>-#define BIT_FS_MGNTQFF_TO_INT_8822B BIT(12)</div><div class='del'>-#define BIT_FS_DDMA1_LP_INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_DDMA1_HP_INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_DDMA0_LP_INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_DDMA0_HP_INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_TRXRPT_INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_C2H_W_READY_INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_HRCV_INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_H2CCMD_INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_TXPKTIN_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_ERRORHDL_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_TXCCX_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_TXCLOSE_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTIMR_8822B */</div><div class='del'>-#define BIT_PS_TIMER_C_EARLY_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_PS_TIMER_B_EARLY_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_PS_TIMER_A_EARLY_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_EARLY_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_PS_TIMER_C_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_PS_TIMER_B_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_PS_TIMER_A_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_PS_TIMEOUT2_EN_8822B BIT(15)</div><div class='del'>-#define BIT_FS_PS_TIMEOUT1_EN_8822B BIT(14)</div><div class='del'>-#define BIT_FS_PS_TIMEOUT0_EN_8822B BIT(13)</div><div class='del'>-#define BIT_FS_GTINT8_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_GTINT7_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_GTINT6_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_GTINT5_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_GTINT4_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_GTINT3_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_GTINT2_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_GTINT1_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_GTINT0_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FTISR_8822B */</div><div class='del'>-#define BIT_PS_TIMER_C_EARLY__INT_8822B BIT(23)</div><div class='del'>-#define BIT_PS_TIMER_B_EARLY__INT_8822B BIT(22)</div><div class='del'>-#define BIT_PS_TIMER_A_EARLY__INT_8822B BIT(21)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_EARLY_INT_8822B BIT(20)</div><div class='del'>-#define BIT_PS_TIMER_C_INT_8822B BIT(19)</div><div class='del'>-#define BIT_PS_TIMER_B_INT_8822B BIT(18)</div><div class='del'>-#define BIT_PS_TIMER_A_INT_8822B BIT(17)</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_PS_TIMEOUT2_INT_8822B BIT(15)</div><div class='del'>-#define BIT_FS_PS_TIMEOUT1_INT_8822B BIT(14)</div><div class='del'>-#define BIT_FS_PS_TIMEOUT0_INT_8822B BIT(13)</div><div class='del'>-#define BIT_FS_GTINT8_INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_GTINT7_INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_GTINT6_INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_GTINT5_INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_GTINT4_INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_GTINT3_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_GTINT2_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_GTINT1_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_GTINT0_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_WRITE_EN_8822B 24</div><div class='del'>-#define BIT_MASK_PKTBUF_WRITE_EN_8822B 0xff</div><div class='del'>-#define BIT_PKTBUF_WRITE_EN_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_WRITE_EN_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKTBUF_WRITE_EN_8822B)</div><div class='del'>-#define BIT_GET_PKTBUF_WRITE_EN_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_WRITE_EN_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_PKTBUF_WRITE_EN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TXRPTBUF_DBG_8822B BIT(23)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-#define BIT_TXPKTBUF_DBG_V2_8822B BIT(20)</div><div class='del'>-#define BIT_RXPKTBUF_DBG_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_DBG_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_PKTBUF_DBG_ADDR_8822B 0x1fff</div><div class='del'>-#define BIT_PKTBUF_DBG_ADDR_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_DBG_ADDR_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKTBUF_DBG_ADDR_8822B)</div><div class='del'>-#define BIT_GET_PKTBUF_DBG_ADDR_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_DBG_ADDR_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_PKTBUF_DBG_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_DATA_L_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_DBG_DATA_L_8822B 0</div><div class='del'>-#define BIT_MASK_PKTBUF_DBG_DATA_L_8822B 0xffffffffL</div><div class='del'>-#define BIT_PKTBUF_DBG_DATA_L_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_DBG_DATA_L_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKTBUF_DBG_DATA_L_8822B)</div><div class='del'>-#define BIT_GET_PKTBUF_DBG_DATA_L_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_DBG_DATA_L_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_PKTBUF_DBG_DATA_L_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKTBUF_DBG_DATA_H_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTBUF_DBG_DATA_H_8822B 0</div><div class='del'>-#define BIT_MASK_PKTBUF_DBG_DATA_H_8822B 0xffffffffL</div><div class='del'>-#define BIT_PKTBUF_DBG_DATA_H_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTBUF_DBG_DATA_H_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKTBUF_DBG_DATA_H_8822B)</div><div class='del'>-#define BIT_GET_PKTBUF_DBG_DATA_H_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTBUF_DBG_DATA_H_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_PKTBUF_DBG_DATA_H_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPWM2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_L0S_TO_RCVY_NUM_8822B 16</div><div class='del'>-#define BIT_MASK_L0S_TO_RCVY_NUM_8822B 0xff</div><div class='del'>-#define BIT_L0S_TO_RCVY_NUM_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_L0S_TO_RCVY_NUM_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_L0S_TO_RCVY_NUM_8822B)</div><div class='del'>-#define BIT_GET_L0S_TO_RCVY_NUM_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_L0S_TO_RCVY_NUM_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_L0S_TO_RCVY_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_CPWM2_TOGGLING_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPWM2_MOD_8822B 0</div><div class='del'>-#define BIT_MASK_CPWM2_MOD_8822B 0x7fff</div><div class='del'>-#define BIT_CPWM2_MOD_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPWM2_MOD_8822B) &lt;&lt; BIT_SHIFT_CPWM2_MOD_8822B)</div><div class='del'>-#define BIT_GET_CPWM2_MOD_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPWM2_MOD_8822B) &amp; BIT_MASK_CPWM2_MOD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC0_CTRL_8822B */</div><div class='del'>-#define BIT_TC0INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC0MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC0EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC0DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC0DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC0DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC0DATA_8822B) &lt;&lt; BIT_SHIFT_TC0DATA_8822B)</div><div class='del'>-#define BIT_GET_TC0DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC0DATA_8822B) &amp; BIT_MASK_TC0DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC1_CTRL_8822B */</div><div class='del'>-#define BIT_TC1INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC1MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC1EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC1DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC1DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC1DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC1DATA_8822B) &lt;&lt; BIT_SHIFT_TC1DATA_8822B)</div><div class='del'>-#define BIT_GET_TC1DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC1DATA_8822B) &amp; BIT_MASK_TC1DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC2_CTRL_8822B */</div><div class='del'>-#define BIT_TC2INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC2MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC2EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC2DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC2DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC2DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC2DATA_8822B) &lt;&lt; BIT_SHIFT_TC2DATA_8822B)</div><div class='del'>-#define BIT_GET_TC2DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC2DATA_8822B) &amp; BIT_MASK_TC2DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC3_CTRL_8822B */</div><div class='del'>-#define BIT_TC3INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC3MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC3EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC3DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC3DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC3DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC3DATA_8822B) &lt;&lt; BIT_SHIFT_TC3DATA_8822B)</div><div class='del'>-#define BIT_GET_TC3DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC3DATA_8822B) &amp; BIT_MASK_TC3DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC4_CTRL_8822B */</div><div class='del'>-#define BIT_TC4INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC4MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC4EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC4DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC4DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC4DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC4DATA_8822B) &lt;&lt; BIT_SHIFT_TC4DATA_8822B)</div><div class='del'>-#define BIT_GET_TC4DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC4DATA_8822B) &amp; BIT_MASK_TC4DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCUNIT_BASE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TCUNIT_BASE_8822B 0</div><div class='del'>-#define BIT_MASK_TCUNIT_BASE_8822B 0x3fff</div><div class='del'>-#define BIT_TCUNIT_BASE_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_TCUNIT_BASE_8822B) &lt;&lt; BIT_SHIFT_TCUNIT_BASE_8822B)</div><div class='del'>-#define BIT_GET_TCUNIT_BASE_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TCUNIT_BASE_8822B) &amp; BIT_MASK_TCUNIT_BASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC5_CTRL_8822B */</div><div class='del'>-#define BIT_TC5INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC5MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC5EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC5DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC5DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC5DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC5DATA_8822B) &lt;&lt; BIT_SHIFT_TC5DATA_8822B)</div><div class='del'>-#define BIT_GET_TC5DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC5DATA_8822B) &amp; BIT_MASK_TC5DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC6_CTRL_8822B */</div><div class='del'>-#define BIT_TC6INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC6MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC6EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC6DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC6DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC6DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC6DATA_8822B) &lt;&lt; BIT_SHIFT_TC6DATA_8822B)</div><div class='del'>-#define BIT_GET_TC6DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC6DATA_8822B) &amp; BIT_MASK_TC6DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_FAIL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_8051_MBIST_FAIL_8822B 26</div><div class='del'>-#define BIT_MASK_8051_MBIST_FAIL_8822B 0x7</div><div class='del'>-#define BIT_8051_MBIST_FAIL_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_8051_MBIST_FAIL_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_8051_MBIST_FAIL_8822B)</div><div class='del'>-#define BIT_GET_8051_MBIST_FAIL_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_8051_MBIST_FAIL_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_8051_MBIST_FAIL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_MBIST_FAIL_8822B 24</div><div class='del'>-#define BIT_MASK_USB_MBIST_FAIL_8822B 0x3</div><div class='del'>-#define BIT_USB_MBIST_FAIL_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_MBIST_FAIL_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_MBIST_FAIL_8822B)</div><div class='del'>-#define BIT_GET_USB_MBIST_FAIL_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_MBIST_FAIL_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_USB_MBIST_FAIL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MBIST_FAIL_8822B 16</div><div class='del'>-#define BIT_MASK_PCIE_MBIST_FAIL_8822B 0x3f</div><div class='del'>-#define BIT_PCIE_MBIST_FAIL_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MBIST_FAIL_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PCIE_MBIST_FAIL_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MBIST_FAIL_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MBIST_FAIL_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_PCIE_MBIST_FAIL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_MBIST_FAIL_8822B 0</div><div class='del'>-#define BIT_MASK_MAC_MBIST_FAIL_8822B 0xfff</div><div class='del'>-#define BIT_MAC_MBIST_FAIL_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_MBIST_FAIL_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MAC_MBIST_FAIL_8822B)</div><div class='del'>-#define BIT_GET_MAC_MBIST_FAIL_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_MBIST_FAIL_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_MAC_MBIST_FAIL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_START_PAUSE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_8051_MBIST_START_PAUSE_8822B 26</div><div class='del'>-#define BIT_MASK_8051_MBIST_START_PAUSE_8822B 0x7</div><div class='del'>-#define BIT_8051_MBIST_START_PAUSE_8822B(x)                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_8051_MBIST_START_PAUSE_8822B)                         \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_8051_MBIST_START_PAUSE_8822B)</div><div class='del'>-#define BIT_GET_8051_MBIST_START_PAUSE_8822B(x)                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_8051_MBIST_START_PAUSE_8822B) &amp;                     \</div><div class='del'>-	 BIT_MASK_8051_MBIST_START_PAUSE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_MBIST_START_PAUSE_8822B 24</div><div class='del'>-#define BIT_MASK_USB_MBIST_START_PAUSE_8822B 0x3</div><div class='del'>-#define BIT_USB_MBIST_START_PAUSE_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_MBIST_START_PAUSE_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_MBIST_START_PAUSE_8822B)</div><div class='del'>-#define BIT_GET_USB_MBIST_START_PAUSE_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_MBIST_START_PAUSE_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_USB_MBIST_START_PAUSE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MBIST_START_PAUSE_8822B 16</div><div class='del'>-#define BIT_MASK_PCIE_MBIST_START_PAUSE_8822B 0x3f</div><div class='del'>-#define BIT_PCIE_MBIST_START_PAUSE_8822B(x)                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MBIST_START_PAUSE_8822B)                         \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PCIE_MBIST_START_PAUSE_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MBIST_START_PAUSE_8822B(x)                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MBIST_START_PAUSE_8822B) &amp;                     \</div><div class='del'>-	 BIT_MASK_PCIE_MBIST_START_PAUSE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_MBIST_START_PAUSE_8822B 0</div><div class='del'>-#define BIT_MASK_MAC_MBIST_START_PAUSE_8822B 0xfff</div><div class='del'>-#define BIT_MAC_MBIST_START_PAUSE_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_MBIST_START_PAUSE_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MAC_MBIST_START_PAUSE_8822B)</div><div class='del'>-#define BIT_GET_MAC_MBIST_START_PAUSE_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_MBIST_START_PAUSE_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_MAC_MBIST_START_PAUSE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_DONE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_8051_MBIST_DONE_8822B 26</div><div class='del'>-#define BIT_MASK_8051_MBIST_DONE_8822B 0x7</div><div class='del'>-#define BIT_8051_MBIST_DONE_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_8051_MBIST_DONE_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_8051_MBIST_DONE_8822B)</div><div class='del'>-#define BIT_GET_8051_MBIST_DONE_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_8051_MBIST_DONE_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_8051_MBIST_DONE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USB_MBIST_DONE_8822B 24</div><div class='del'>-#define BIT_MASK_USB_MBIST_DONE_8822B 0x3</div><div class='del'>-#define BIT_USB_MBIST_DONE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_USB_MBIST_DONE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USB_MBIST_DONE_8822B)</div><div class='del'>-#define BIT_GET_USB_MBIST_DONE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USB_MBIST_DONE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_USB_MBIST_DONE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MBIST_DONE_8822B 16</div><div class='del'>-#define BIT_MASK_PCIE_MBIST_DONE_8822B 0x3f</div><div class='del'>-#define BIT_PCIE_MBIST_DONE_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MBIST_DONE_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PCIE_MBIST_DONE_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MBIST_DONE_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MBIST_DONE_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_PCIE_MBIST_DONE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAC_MBIST_DONE_8822B 0</div><div class='del'>-#define BIT_MASK_MAC_MBIST_DONE_8822B 0xfff</div><div class='del'>-#define BIT_MAC_MBIST_DONE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAC_MBIST_DONE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MAC_MBIST_DONE_8822B)</div><div class='del'>-#define BIT_GET_MAC_MBIST_DONE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAC_MBIST_DONE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_MAC_MBIST_DONE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIST_FAIL_NRML_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIST_FAIL_NRML_8822B 0</div><div class='del'>-#define BIT_MASK_MBIST_FAIL_NRML_8822B 0xffffffffL</div><div class='del'>-#define BIT_MBIST_FAIL_NRML_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIST_FAIL_NRML_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MBIST_FAIL_NRML_8822B)</div><div class='del'>-#define BIT_GET_MBIST_FAIL_NRML_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIST_FAIL_NRML_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_MBIST_FAIL_NRML_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AES_DECRPT_DATA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IPS_CFG_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_IPS_CFG_ADDR_8822B 0xff</div><div class='del'>-#define BIT_IPS_CFG_ADDR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_IPS_CFG_ADDR_8822B) &lt;&lt; BIT_SHIFT_IPS_CFG_ADDR_8822B)</div><div class='del'>-#define BIT_GET_IPS_CFG_ADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IPS_CFG_ADDR_8822B) &amp; BIT_MASK_IPS_CFG_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AES_DECRPT_CFG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IPS_CFG_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_IPS_CFG_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_IPS_CFG_DATA_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_IPS_CFG_DATA_8822B) &lt;&lt; BIT_SHIFT_IPS_CFG_DATA_8822B)</div><div class='del'>-#define BIT_GET_IPS_CFG_DATA_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IPS_CFG_DATA_8822B) &amp; BIT_MASK_IPS_CFG_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_TMETER_8822B */</div><div class='del'>-#define BIT_TEMP_VALID_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TEMP_VALUE_8822B 24</div><div class='del'>-#define BIT_MASK_TEMP_VALUE_8822B 0x3f</div><div class='del'>-#define BIT_TEMP_VALUE_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_TEMP_VALUE_8822B) &lt;&lt; BIT_SHIFT_TEMP_VALUE_8822B)</div><div class='del'>-#define BIT_GET_TEMP_VALUE_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TEMP_VALUE_8822B) &amp; BIT_MASK_TEMP_VALUE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_TMETER_TIMER_8822B 8</div><div class='del'>-#define BIT_MASK_REG_TMETER_TIMER_8822B 0xfff</div><div class='del'>-#define BIT_REG_TMETER_TIMER_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_TMETER_TIMER_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_TMETER_TIMER_8822B)</div><div class='del'>-#define BIT_GET_REG_TMETER_TIMER_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_TMETER_TIMER_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_REG_TMETER_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REG_TEMP_DELTA_8822B 2</div><div class='del'>-#define BIT_MASK_REG_TEMP_DELTA_8822B 0x3f</div><div class='del'>-#define BIT_REG_TEMP_DELTA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_REG_TEMP_DELTA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_REG_TEMP_DELTA_8822B)</div><div class='del'>-#define BIT_GET_REG_TEMP_DELTA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REG_TEMP_DELTA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_REG_TEMP_DELTA_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_REG_TMETER_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OSC_32K_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OSC_32K_CLKGEN_0_8822B 16</div><div class='del'>-#define BIT_MASK_OSC_32K_CLKGEN_0_8822B 0xffff</div><div class='del'>-#define BIT_OSC_32K_CLKGEN_0_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_OSC_32K_CLKGEN_0_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_OSC_32K_CLKGEN_0_8822B)</div><div class='del'>-#define BIT_GET_OSC_32K_CLKGEN_0_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OSC_32K_CLKGEN_0_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_OSC_32K_CLKGEN_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OSC_32K_RES_COMP_8822B 4</div><div class='del'>-#define BIT_MASK_OSC_32K_RES_COMP_8822B 0x3</div><div class='del'>-#define BIT_OSC_32K_RES_COMP_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_OSC_32K_RES_COMP_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_OSC_32K_RES_COMP_8822B)</div><div class='del'>-#define BIT_GET_OSC_32K_RES_COMP_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OSC_32K_RES_COMP_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_OSC_32K_RES_COMP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_OSC_32K_OUT_SEL_8822B BIT(3)</div><div class='del'>-#define BIT_ISO_WL_2_OSC_32K_8822B BIT(1)</div><div class='del'>-#define BIT_POW_CKGEN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_32K_CAL_REG1_8822B */</div><div class='del'>-#define BIT_CAL_32K_REG_WR_8822B BIT(31)</div><div class='del'>-#define BIT_CAL_32K_DBG_SEL_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAL_32K_REG_ADDR_8822B 16</div><div class='del'>-#define BIT_MASK_CAL_32K_REG_ADDR_8822B 0x3f</div><div class='del'>-#define BIT_CAL_32K_REG_ADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAL_32K_REG_ADDR_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CAL_32K_REG_ADDR_8822B)</div><div class='del'>-#define BIT_GET_CAL_32K_REG_ADDR_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAL_32K_REG_ADDR_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_CAL_32K_REG_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAL_32K_REG_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_CAL_32K_REG_DATA_8822B 0xffff</div><div class='del'>-#define BIT_CAL_32K_REG_DATA_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAL_32K_REG_DATA_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CAL_32K_REG_DATA_8822B)</div><div class='del'>-#define BIT_GET_CAL_32K_REG_DATA_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAL_32K_REG_DATA_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_CAL_32K_REG_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_C2HEVT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C2HEVT_MSG_8822B 0</div><div class='del'>-#define BIT_MASK_C2HEVT_MSG_8822B 0xffffffffffffffffffffffffffffffffL</div><div class='del'>-#define BIT_C2HEVT_MSG_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_C2HEVT_MSG_8822B) &lt;&lt; BIT_SHIFT_C2HEVT_MSG_8822B)</div><div class='del'>-#define BIT_GET_C2HEVT_MSG_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_C2HEVT_MSG_8822B) &amp; BIT_MASK_C2HEVT_MSG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_DEFINED_PAGE1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SW_DEFINED_PAGE1_8822B 0</div><div class='del'>-#define BIT_MASK_SW_DEFINED_PAGE1_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_SW_DEFINED_PAGE1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_SW_DEFINED_PAGE1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SW_DEFINED_PAGE1_8822B)</div><div class='del'>-#define BIT_GET_SW_DEFINED_PAGE1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SW_DEFINED_PAGE1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_SW_DEFINED_PAGE1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUTST_I_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCUDMSG_I_8822B 0</div><div class='del'>-#define BIT_MASK_MCUDMSG_I_8822B 0xffffffffL</div><div class='del'>-#define BIT_MCUDMSG_I_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MCUDMSG_I_8822B) &lt;&lt; BIT_SHIFT_MCUDMSG_I_8822B)</div><div class='del'>-#define BIT_GET_MCUDMSG_I_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCUDMSG_I_8822B) &amp; BIT_MASK_MCUDMSG_I_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCUTST_II_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCUDMSG_II_8822B 0</div><div class='del'>-#define BIT_MASK_MCUDMSG_II_8822B 0xffffffffL</div><div class='del'>-#define BIT_MCUDMSG_II_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MCUDMSG_II_8822B) &lt;&lt; BIT_SHIFT_MCUDMSG_II_8822B)</div><div class='del'>-#define BIT_GET_MCUDMSG_II_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCUDMSG_II_8822B) &amp; BIT_MASK_MCUDMSG_II_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FMETHR_8822B */</div><div class='del'>-#define BIT_FMSG_INT_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG_8822B 0</div><div class='del'>-#define BIT_MASK_FW_MSG_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_MSG_8822B) &lt;&lt; BIT_SHIFT_FW_MSG_8822B)</div><div class='del'>-#define BIT_GET_FW_MSG_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_MSG_8822B) &amp; BIT_MASK_FW_MSG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMETFR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HRCV_MSG_8822B 24</div><div class='del'>-#define BIT_MASK_HRCV_MSG_8822B 0xff</div><div class='del'>-#define BIT_HRCV_MSG_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_HRCV_MSG_8822B) &lt;&lt; BIT_SHIFT_HRCV_MSG_8822B)</div><div class='del'>-#define BIT_GET_HRCV_MSG_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HRCV_MSG_8822B) &amp; BIT_MASK_HRCV_MSG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_INT_BOX3_8822B BIT(3)</div><div class='del'>-#define BIT_INT_BOX2_8822B BIT(2)</div><div class='del'>-#define BIT_INT_BOX1_8822B BIT(1)</div><div class='del'>-#define BIT_INT_BOX0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_0_8822B 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_0_8822B 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_0_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_0_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_0_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_0_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_0_8822B) &amp; BIT_MASK_HOST_MSG_0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_1_8822B 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_1_8822B 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_1_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_1_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_1_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_1_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_1_8822B) &amp; BIT_MASK_HOST_MSG_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_2_8822B 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_2_8822B 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_2_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_2_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_2_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_2_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_2_8822B) &amp; BIT_MASK_HOST_MSG_2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HOST_MSG_3_8822B 0</div><div class='del'>-#define BIT_MASK_HOST_MSG_3_8822B 0xffffffffL</div><div class='del'>-#define BIT_HOST_MSG_3_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_HOST_MSG_3_8822B) &lt;&lt; BIT_SHIFT_HOST_MSG_3_8822B)</div><div class='del'>-#define BIT_GET_HOST_MSG_3_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HOST_MSG_3_8822B) &amp; BIT_MASK_HOST_MSG_3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LLT_INIT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTE_RWM_8822B 30</div><div class='del'>-#define BIT_MASK_LLTE_RWM_8822B 0x3</div><div class='del'>-#define BIT_LLTE_RWM_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTE_RWM_8822B) &lt;&lt; BIT_SHIFT_LLTE_RWM_8822B)</div><div class='del'>-#define BIT_GET_LLTE_RWM_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTE_RWM_8822B) &amp; BIT_MASK_LLTE_RWM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTINI_PDATA_V1_8822B 16</div><div class='del'>-#define BIT_MASK_LLTINI_PDATA_V1_8822B 0xfff</div><div class='del'>-#define BIT_LLTINI_PDATA_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTINI_PDATA_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LLTINI_PDATA_V1_8822B)</div><div class='del'>-#define BIT_GET_LLTINI_PDATA_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTINI_PDATA_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_LLTINI_PDATA_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTINI_HDATA_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LLTINI_HDATA_V1_8822B 0xfff</div><div class='del'>-#define BIT_LLTINI_HDATA_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTINI_HDATA_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LLTINI_HDATA_V1_8822B)</div><div class='del'>-#define BIT_GET_LLTINI_HDATA_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTINI_HDATA_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_LLTINI_HDATA_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LLT_INIT_ADDR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLTINI_ADDR_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LLTINI_ADDR_V1_8822B 0xfff</div><div class='del'>-#define BIT_LLTINI_ADDR_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLTINI_ADDR_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LLTINI_ADDR_V1_8822B)</div><div class='del'>-#define BIT_GET_LLTINI_ADDR_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLTINI_ADDR_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_LLTINI_ADDR_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BB_ACCESS_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_WRITE_READ_8822B 30</div><div class='del'>-#define BIT_MASK_BB_WRITE_READ_8822B 0x3</div><div class='del'>-#define BIT_BB_WRITE_READ_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_WRITE_READ_8822B) &lt;&lt; BIT_SHIFT_BB_WRITE_READ_8822B)</div><div class='del'>-#define BIT_GET_BB_WRITE_READ_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_WRITE_READ_8822B) &amp; BIT_MASK_BB_WRITE_READ_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_WRITE_EN_8822B 12</div><div class='del'>-#define BIT_MASK_BB_WRITE_EN_8822B 0xf</div><div class='del'>-#define BIT_BB_WRITE_EN_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_WRITE_EN_8822B) &lt;&lt; BIT_SHIFT_BB_WRITE_EN_8822B)</div><div class='del'>-#define BIT_GET_BB_WRITE_EN_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_WRITE_EN_8822B) &amp; BIT_MASK_BB_WRITE_EN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_ADDR_8822B 2</div><div class='del'>-#define BIT_MASK_BB_ADDR_8822B 0x1ff</div><div class='del'>-#define BIT_BB_ADDR_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_ADDR_8822B) &lt;&lt; BIT_SHIFT_BB_ADDR_8822B)</div><div class='del'>-#define BIT_GET_BB_ADDR_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_ADDR_8822B) &amp; BIT_MASK_BB_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BB_ERRACC_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BB_ACCESS_DATA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BB_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_BB_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_BB_DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BB_DATA_8822B) &lt;&lt; BIT_SHIFT_BB_DATA_8822B)</div><div class='del'>-#define BIT_GET_BB_DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BB_DATA_8822B) &amp; BIT_MASK_BB_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E0_8822B 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E0_8822B 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E0_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_HMEBOX_E0_8822B) &lt;&lt; BIT_SHIFT_HMEBOX_E0_8822B)</div><div class='del'>-#define BIT_GET_HMEBOX_E0_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HMEBOX_E0_8822B) &amp; BIT_MASK_HMEBOX_E0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E1_8822B 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E1_8822B 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E1_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_HMEBOX_E1_8822B) &lt;&lt; BIT_SHIFT_HMEBOX_E1_8822B)</div><div class='del'>-#define BIT_GET_HMEBOX_E1_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HMEBOX_E1_8822B) &amp; BIT_MASK_HMEBOX_E1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E2_8822B 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E2_8822B 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E2_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_HMEBOX_E2_8822B) &lt;&lt; BIT_SHIFT_HMEBOX_E2_8822B)</div><div class='del'>-#define BIT_GET_HMEBOX_E2_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HMEBOX_E2_8822B) &amp; BIT_MASK_HMEBOX_E2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HMEBOX_E3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HMEBOX_E3_8822B 0</div><div class='del'>-#define BIT_MASK_HMEBOX_E3_8822B 0xffffffffL</div><div class='del'>-#define BIT_HMEBOX_E3_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_HMEBOX_E3_8822B) &lt;&lt; BIT_SHIFT_HMEBOX_E3_8822B)</div><div class='del'>-#define BIT_GET_HMEBOX_E3_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HMEBOX_E3_8822B) &amp; BIT_MASK_HMEBOX_E3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_CR_EXT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PHY_REQ_DELAY_8822B 24</div><div class='del'>-#define BIT_MASK_PHY_REQ_DELAY_8822B 0xf</div><div class='del'>-#define BIT_PHY_REQ_DELAY_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PHY_REQ_DELAY_8822B) &lt;&lt; BIT_SHIFT_PHY_REQ_DELAY_8822B)</div><div class='del'>-#define BIT_GET_PHY_REQ_DELAY_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PHY_REQ_DELAY_8822B) &amp; BIT_MASK_PHY_REQ_DELAY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SPD_DOWN_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE4_8822B 4</div><div class='del'>-#define BIT_MASK_NETYPE4_8822B 0x3</div><div class='del'>-#define BIT_NETYPE4_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NETYPE4_8822B) &lt;&lt; BIT_SHIFT_NETYPE4_8822B)</div><div class='del'>-#define BIT_GET_NETYPE4_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NETYPE4_8822B) &amp; BIT_MASK_NETYPE4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE3_8822B 2</div><div class='del'>-#define BIT_MASK_NETYPE3_8822B 0x3</div><div class='del'>-#define BIT_NETYPE3_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NETYPE3_8822B) &lt;&lt; BIT_SHIFT_NETYPE3_8822B)</div><div class='del'>-#define BIT_GET_NETYPE3_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NETYPE3_8822B) &amp; BIT_MASK_NETYPE3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NETYPE2_8822B 0</div><div class='del'>-#define BIT_MASK_NETYPE2_8822B 0x3</div><div class='del'>-#define BIT_NETYPE2_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NETYPE2_8822B) &lt;&lt; BIT_SHIFT_NETYPE2_8822B)</div><div class='del'>-#define BIT_GET_NETYPE2_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NETYPE2_8822B) &amp; BIT_MASK_NETYPE2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTNUM_TH_V1_8822B 24</div><div class='del'>-#define BIT_MASK_PKTNUM_TH_V1_8822B 0xff</div><div class='del'>-#define BIT_PKTNUM_TH_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTNUM_TH_V1_8822B) &lt;&lt; BIT_SHIFT_PKTNUM_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_PKTNUM_TH_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTNUM_TH_V1_8822B) &amp; BIT_MASK_PKTNUM_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TIMER_TH_8822B 16</div><div class='del'>-#define BIT_MASK_TIMER_TH_8822B 0xff</div><div class='del'>-#define BIT_TIMER_TH_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TIMER_TH_8822B) &lt;&lt; BIT_SHIFT_TIMER_TH_8822B)</div><div class='del'>-#define BIT_GET_TIMER_TH_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TIMER_TH_8822B) &amp; BIT_MASK_TIMER_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT1ENADDR_8822B 0</div><div class='del'>-#define BIT_MASK_RXPKT1ENADDR_8822B 0xffff</div><div class='del'>-#define BIT_RXPKT1ENADDR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKT1ENADDR_8822B) &lt;&lt; BIT_SHIFT_RXPKT1ENADDR_8822B)</div><div class='del'>-#define BIT_GET_RXPKT1ENADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT1ENADDR_8822B) &amp; BIT_MASK_RXPKT1ENADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFF_PTR_V1_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFF0_RDPTR_V2_8822B 0</div><div class='del'>-#define BIT_MASK_RXFF0_RDPTR_V2_8822B 0x3ffff</div><div class='del'>-#define BIT_RXFF0_RDPTR_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFF0_RDPTR_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFF0_RDPTR_V2_8822B)</div><div class='del'>-#define BIT_GET_RXFF0_RDPTR_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFF0_RDPTR_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_RXFF0_RDPTR_V2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFF_WTR_V1_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFF0_WTPTR_V2_8822B 0</div><div class='del'>-#define BIT_MASK_RXFF0_WTPTR_V2_8822B 0x3ffff</div><div class='del'>-#define BIT_RXFF0_WTPTR_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFF0_WTPTR_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFF0_WTPTR_V2_8822B)</div><div class='del'>-#define BIT_GET_RXFF0_WTPTR_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFF0_WTPTR_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_RXFF0_WTPTR_V2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2IMR_8822B */</div><div class='del'>-#define BIT__FE4ISR__IND_MSK_8822B BIT(29)</div><div class='del'>-#define BIT_FS_TXSC_DESC_DONE_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_FS_TXSC_BKDONE_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_FS_TXSC_BEDONE_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_TXSC_VIDONE_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_TXSC_VODONE_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_ATIM_MB7_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_ATIM_MB6_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_ATIM_MB5_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_ATIM_MB4_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_ATIM_MB3_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_ATIM_MB2_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_ATIM_MB1_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_ATIM_MB0_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_TBTT4INT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_TBTT3INT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_TBTT2INT_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_TBTT1INT_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_TBTT0_MB7INT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_TBTT0_MB6INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_TBTT0_MB5INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_TBTT0_MB4INT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_TBTT0_MB3INT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_TBTT0_MB2INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_TBTT0_MB1INT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_TBTT0_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE2ISR_8822B */</div><div class='del'>-#define BIT__FE4ISR__IND_INT_8822B BIT(29)</div><div class='del'>-#define BIT_FS_TXSC_DESC_DONE_INT_8822B BIT(28)</div><div class='del'>-#define BIT_FS_TXSC_BKDONE_INT_8822B BIT(27)</div><div class='del'>-#define BIT_FS_TXSC_BEDONE_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_TXSC_VIDONE_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_TXSC_VODONE_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_ATIM_MB7_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_ATIM_MB6_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_ATIM_MB5_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_ATIM_MB4_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_ATIM_MB3_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_ATIM_MB2_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_ATIM_MB1_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_ATIM_MB0_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_TBTT4INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_TBTT3INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_TBTT2INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_TBTT1INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_TBTT0_MB7INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_TBTT0_MB6INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_TBTT0_MB5INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_TBTT0_MB4INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_TBTT0_MB3INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_TBTT0_MB2INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_TBTT0_MB1INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_TBTT0_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3IMR_8822B */</div><div class='del'>-#define BIT_FS_CLI3_MTI_BCNIVLEAR_INT__EN_8822B BIT(31)</div><div class='del'>-#define BIT_FS_CLI2_MTI_BCNIVLEAR_INT__EN_8822B BIT(30)</div><div class='del'>-#define BIT_FS_CLI1_MTI_BCNIVLEAR_INT__EN_8822B BIT(29)</div><div class='del'>-#define BIT_FS_CLI0_MTI_BCNIVLEAR_INT__EN_8822B BIT(28)</div><div class='del'>-#define BIT_FS_BCNDMA4_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_FS_BCNDMA3_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_BCNDMA2_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_BCNDMA1_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB7_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB6_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB5_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB4_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB3_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB2_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB1_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_BCNDMA0_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_MTI_BCNIVLEAR_INT__EN_8822B BIT(15)</div><div class='del'>-#define BIT_FS_BCNERLY4_INT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_BCNERLY3_INT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_BCNERLY2_INT_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_BCNERLY1_INT_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB7INT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB6INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB5INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB4INT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB3INT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB2INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB1INT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_BCNERLY0_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE3ISR_8822B */</div><div class='del'>-#define BIT_FS_CLI3_MTI_BCNIVLEAR_INT_8822B BIT(31)</div><div class='del'>-#define BIT_FS_CLI2_MTI_BCNIVLEAR_INT_8822B BIT(30)</div><div class='del'>-#define BIT_FS_CLI1_MTI_BCNIVLEAR_INT_8822B BIT(29)</div><div class='del'>-#define BIT_FS_CLI0_MTI_BCNIVLEAR_INT_8822B BIT(28)</div><div class='del'>-#define BIT_FS_BCNDMA4_INT_8822B BIT(27)</div><div class='del'>-#define BIT_FS_BCNDMA3_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_BCNDMA2_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_BCNDMA1_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB7_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB6_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB5_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB4_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB3_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB2_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_BCNDMA0_MB1_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_BCNDMA0_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_MTI_BCNIVLEAR_INT_8822B BIT(15)</div><div class='del'>-#define BIT_FS_BCNERLY4_INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_BCNERLY3_INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_BCNERLY2_INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_BCNERLY1_INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB7INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB6INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB5INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB4INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB3INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB2INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_BCNERLY0_MB1INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_BCNERLY0_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4IMR_8822B */</div><div class='del'>-#define BIT_FS_CLI3_TXPKTIN_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_CLI2_TXPKTIN_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_CLI1_TXPKTIN_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_CLI0_TXPKTIN_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD0_INT_EN_8822B BIT(15)</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD1_INT_EN_8822B BIT(14)</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD0_INT_EN_8822B BIT(13)</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD1_INT_EN_8822B BIT(12)</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD0_INT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD1_INT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD0_INT_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD1_INT_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD0_INT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD1_INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD0_INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD1_INT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD0_INT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD1_INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD0_INT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD1_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FE4ISR_8822B */</div><div class='del'>-#define BIT_FS_CLI3_TXPKTIN_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_CLI2_TXPKTIN_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_CLI1_TXPKTIN_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_CLI0_TXPKTIN_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD0_INT_8822B BIT(15)</div><div class='del'>-#define BIT_FS_CLI3_RX_UMD1_INT_8822B BIT(14)</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD0_INT_8822B BIT(13)</div><div class='del'>-#define BIT_FS_CLI3_RX_BMD1_INT_8822B BIT(12)</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD0_INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_CLI2_RX_UMD1_INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD0_INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_CLI2_RX_BMD1_INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD0_INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_CLI1_RX_UMD1_INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD0_INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_CLI1_RX_BMD1_INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD0_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_CLI0_RX_UMD1_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD0_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_CLI0_RX_BMD1_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1IMR_8822B */</div><div class='del'>-#define BIT__FT2ISR__IND_MSK_8822B BIT(30)</div><div class='del'>-#define BIT_FTM_PTT_INT_EN_8822B BIT(29)</div><div class='del'>-#define BIT_RXFTMREQ_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_RXFTM_INT_EN_8822B BIT(27)</div><div class='del'>-#define BIT_TXFTM_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_H2C_CMD_OK_INT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_H2C_CMD_FULL_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE5_INT_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE4_INT_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE3_INT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE2_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE1_INT_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE0_INT_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_CTWEND2_INT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_CTWEND1_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_CTWEND0_INT_EN_8822B BIT(15)</div><div class='del'>-#define BIT_FS_TX_NULL1_INT_EN_8822B BIT(14)</div><div class='del'>-#define BIT_FS_TX_NULL0_INT_EN_8822B BIT(13)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_EN_8822B BIT(12)</div><div class='del'>-#define BIT_FS_P2P_RFON2_INT_EN_8822B BIT(11)</div><div class='del'>-#define BIT_FS_P2P_RFOFF2_INT_EN_8822B BIT(10)</div><div class='del'>-#define BIT_FS_P2P_RFON1_INT_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_P2P_RFOFF1_INT_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_P2P_RFON0_INT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_P2P_RFOFF0_INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD1_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD0_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_TRIGGER_PKT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_EOSP_INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_RPWM2_INT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_RPWM_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT1ISR_8822B */</div><div class='del'>-#define BIT__FT2ISR__IND_INT_8822B BIT(30)</div><div class='del'>-#define BIT_FTM_PTT_INT_8822B BIT(29)</div><div class='del'>-#define BIT_RXFTMREQ_INT_8822B BIT(28)</div><div class='del'>-#define BIT_RXFTM_INT_8822B BIT(27)</div><div class='del'>-#define BIT_TXFTM_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_H2C_CMD_OK_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_H2C_CMD_FULL_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE5_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE4_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE3_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE2_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE1_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_MACID_PWRCHANGE0_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_CTWEND2_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_CTWEND1_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_CTWEND0_INT_8822B BIT(15)</div><div class='del'>-#define BIT_FS_TX_NULL1_INT_8822B BIT(14)</div><div class='del'>-#define BIT_FS_TX_NULL0_INT_8822B BIT(13)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_INT_8822B BIT(12)</div><div class='del'>-#define BIT_FS_P2P_RFON2_INT_8822B BIT(11)</div><div class='del'>-#define BIT_FS_P2P_RFOFF2_INT_8822B BIT(10)</div><div class='del'>-#define BIT_FS_P2P_RFON1_INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_P2P_RFOFF1_INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_P2P_RFON0_INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_P2P_RFOFF0_INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD1_INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_RX_UAPSDMD0_INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_TRIGGER_PKT_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_EOSP_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_RPWM2_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_RPWM_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_31TO0_8822B 0</div><div class='del'>-#define BIT_MASK_MID_31TO0_8822B 0xffffffffL</div><div class='del'>-#define BIT_MID_31TO0_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_31TO0_8822B) &lt;&lt; BIT_SHIFT_MID_31TO0_8822B)</div><div class='del'>-#define BIT_GET_MID_31TO0_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_31TO0_8822B) &amp; BIT_MASK_MID_31TO0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_63TO32_8822B 0</div><div class='del'>-#define BIT_MASK_MID_63TO32_8822B 0xffffffffL</div><div class='del'>-#define BIT_MID_63TO32_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_63TO32_8822B) &lt;&lt; BIT_SHIFT_MID_63TO32_8822B)</div><div class='del'>-#define BIT_GET_MID_63TO32_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_63TO32_8822B) &amp; BIT_MASK_MID_63TO32_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_95O64_8822B 0</div><div class='del'>-#define BIT_MASK_MID_95O64_8822B 0xffffffffL</div><div class='del'>-#define BIT_MID_95O64_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_95O64_8822B) &lt;&lt; BIT_SHIFT_MID_95O64_8822B)</div><div class='del'>-#define BIT_GET_MID_95O64_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_95O64_8822B) &amp; BIT_MASK_MID_95O64_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPWR3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_127TO96_8822B 0</div><div class='del'>-#define BIT_MASK_MID_127TO96_8822B 0xffffffffL</div><div class='del'>-#define BIT_MID_127TO96_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_127TO96_8822B) &lt;&lt; BIT_SHIFT_MID_127TO96_8822B)</div><div class='del'>-#define BIT_GET_MID_127TO96_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_127TO96_8822B) &amp; BIT_MASK_MID_127TO96_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWSEQ_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SEQNUM_MID_8822B 16</div><div class='del'>-#define BIT_MASK_SEQNUM_MID_8822B 0xffff</div><div class='del'>-#define BIT_SEQNUM_MID_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_SEQNUM_MID_8822B) &lt;&lt; BIT_SHIFT_SEQNUM_MID_8822B)</div><div class='del'>-#define BIT_GET_SEQNUM_MID_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SEQNUM_MID_8822B) &amp; BIT_MASK_SEQNUM_MID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_REF_MID_8822B 0</div><div class='del'>-#define BIT_MASK_REF_MID_8822B 0x7f</div><div class='del'>-#define BIT_REF_MID_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_REF_MID_8822B) &lt;&lt; BIT_SHIFT_REF_MID_8822B)</div><div class='del'>-#define BIT_GET_REF_MID_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_REF_MID_8822B) &amp; BIT_MASK_REF_MID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC7_CTRL_V1_8822B */</div><div class='del'>-#define BIT_TC7INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC7MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC7EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC7DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC7DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC7DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC7DATA_8822B) &lt;&lt; BIT_SHIFT_TC7DATA_8822B)</div><div class='del'>-#define BIT_GET_TC7DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC7DATA_8822B) &amp; BIT_MASK_TC7DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TC8_CTRL_V1_8822B */</div><div class='del'>-#define BIT_TC8INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_TC8MODE_8822B BIT(25)</div><div class='del'>-#define BIT_TC8EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TC8DATA_8822B 0</div><div class='del'>-#define BIT_MASK_TC8DATA_8822B 0xffffff</div><div class='del'>-#define BIT_TC8DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TC8DATA_8822B) &lt;&lt; BIT_SHIFT_TC8DATA_8822B)</div><div class='del'>-#define BIT_GET_TC8DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TC8DATA_8822B) &amp; BIT_MASK_TC8DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2IMR_8822B */</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD1_EN_8822B BIT(31)</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD0_EN_8822B BIT(30)</div><div class='del'>-#define BIT_FS_CLI3_TRIGGER_PKT_EN_8822B BIT(29)</div><div class='del'>-#define BIT_FS_CLI3_EOSP_INT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD1_EN_8822B BIT(27)</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD0_EN_8822B BIT(26)</div><div class='del'>-#define BIT_FS_CLI2_TRIGGER_PKT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_FS_CLI2_EOSP_INT_EN_8822B BIT(24)</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD1_EN_8822B BIT(23)</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD0_EN_8822B BIT(22)</div><div class='del'>-#define BIT_FS_CLI1_TRIGGER_PKT_EN_8822B BIT(21)</div><div class='del'>-#define BIT_FS_CLI1_EOSP_INT_EN_8822B BIT(20)</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD1_EN_8822B BIT(19)</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD0_EN_8822B BIT(18)</div><div class='del'>-#define BIT_FS_CLI0_TRIGGER_PKT_EN_8822B BIT(17)</div><div class='del'>-#define BIT_FS_CLI0_EOSP_INT_EN_8822B BIT(16)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P2_EN_8822B BIT(9)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P1_EN_8822B BIT(8)</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL1_INT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL0_INT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL1_INT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL0_INT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL1_INT_EN_8822B BIT(3)</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL0_INT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL1_INT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL0_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FT2ISR_8822B */</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD1_INT_8822B BIT(31)</div><div class='del'>-#define BIT_FS_CLI3_RX_UAPSDMD0_INT_8822B BIT(30)</div><div class='del'>-#define BIT_FS_CLI3_TRIGGER_PKT_INT_8822B BIT(29)</div><div class='del'>-#define BIT_FS_CLI3_EOSP_INT_8822B BIT(28)</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD1_INT_8822B BIT(27)</div><div class='del'>-#define BIT_FS_CLI2_RX_UAPSDMD0_INT_8822B BIT(26)</div><div class='del'>-#define BIT_FS_CLI2_TRIGGER_PKT_INT_8822B BIT(25)</div><div class='del'>-#define BIT_FS_CLI2_EOSP_INT_8822B BIT(24)</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD1_INT_8822B BIT(23)</div><div class='del'>-#define BIT_FS_CLI1_RX_UAPSDMD0_INT_8822B BIT(22)</div><div class='del'>-#define BIT_FS_CLI1_TRIGGER_PKT_INT_8822B BIT(21)</div><div class='del'>-#define BIT_FS_CLI1_EOSP_INT_8822B BIT(20)</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD1_INT_8822B BIT(19)</div><div class='del'>-#define BIT_FS_CLI0_RX_UAPSDMD0_INT_8822B BIT(18)</div><div class='del'>-#define BIT_FS_CLI0_TRIGGER_PKT_INT_8822B BIT(17)</div><div class='del'>-#define BIT_FS_CLI0_EOSP_INT_8822B BIT(16)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P2_INT_8822B BIT(9)</div><div class='del'>-#define BIT_FS_TSF_BIT32_TOGGLE_P2P1_INT_8822B BIT(8)</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL1_INT_8822B BIT(7)</div><div class='del'>-#define BIT_FS_CLI3_TX_NULL0_INT_8822B BIT(6)</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL1_INT_8822B BIT(5)</div><div class='del'>-#define BIT_FS_CLI2_TX_NULL0_INT_8822B BIT(4)</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL1_INT_8822B BIT(3)</div><div class='del'>-#define BIT_FS_CLI1_TX_NULL0_INT_8822B BIT(2)</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL1_INT_8822B BIT(1)</div><div class='del'>-#define BIT_FS_CLI0_TX_NULL0_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG2_8822B 0</div><div class='del'>-#define BIT_MASK_FW_MSG2_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG2_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_MSG2_8822B) &lt;&lt; BIT_SHIFT_FW_MSG2_8822B)</div><div class='del'>-#define BIT_GET_FW_MSG2_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_MSG2_8822B) &amp; BIT_MASK_FW_MSG2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG3_8822B 0</div><div class='del'>-#define BIT_MASK_FW_MSG3_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG3_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_MSG3_8822B) &lt;&lt; BIT_SHIFT_FW_MSG3_8822B)</div><div class='del'>-#define BIT_GET_FW_MSG3_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_MSG3_8822B) &amp; BIT_MASK_FW_MSG3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG4_8822B 0</div><div class='del'>-#define BIT_MASK_FW_MSG4_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG4_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_MSG4_8822B) &lt;&lt; BIT_SHIFT_FW_MSG4_8822B)</div><div class='del'>-#define BIT_GET_FW_MSG4_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_MSG4_8822B) &amp; BIT_MASK_FW_MSG4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MSG5_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_MSG5_8822B 0</div><div class='del'>-#define BIT_MASK_FW_MSG5_8822B 0xffffffffL</div><div class='del'>-#define BIT_FW_MSG5_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_MSG5_8822B) &lt;&lt; BIT_SHIFT_FW_MSG5_8822B)</div><div class='del'>-#define BIT_GET_FW_MSG5_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_MSG5_8822B) &amp; BIT_MASK_FW_MSG5_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TX_OQT_HE_FREE_SPACE_V1_8822B 16</div><div class='del'>-#define BIT_MASK_TX_OQT_HE_FREE_SPACE_V1_8822B 0xff</div><div class='del'>-#define BIT_TX_OQT_HE_FREE_SPACE_V1_8822B(x)                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TX_OQT_HE_FREE_SPACE_V1_8822B)                        \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TX_OQT_HE_FREE_SPACE_V1_8822B)</div><div class='del'>-#define BIT_GET_TX_OQT_HE_FREE_SPACE_V1_8822B(x)                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TX_OQT_HE_FREE_SPACE_V1_8822B) &amp;                    \</div><div class='del'>-	 BIT_MASK_TX_OQT_HE_FREE_SPACE_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TX_OQT_NL_FREE_SPACE_V1_8822B 0</div><div class='del'>-#define BIT_MASK_TX_OQT_NL_FREE_SPACE_V1_8822B 0xff</div><div class='del'>-#define BIT_TX_OQT_NL_FREE_SPACE_V1_8822B(x)                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_TX_OQT_NL_FREE_SPACE_V1_8822B)                        \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TX_OQT_NL_FREE_SPACE_V1_8822B)</div><div class='del'>-#define BIT_GET_TX_OQT_NL_FREE_SPACE_V1_8822B(x)                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TX_OQT_NL_FREE_SPACE_V1_8822B) &amp;                    \</div><div class='del'>-	 BIT_MASK_TX_OQT_NL_FREE_SPACE_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_CTRL_2_8822B */</div><div class='del'>-#define BIT_BCN_VALID_1_V1_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_HEAD_1_V1_8822B 16</div><div class='del'>-#define BIT_MASK_BCN_HEAD_1_V1_8822B 0xfff</div><div class='del'>-#define BIT_BCN_HEAD_1_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_HEAD_1_V1_8822B) &lt;&lt; BIT_SHIFT_BCN_HEAD_1_V1_8822B)</div><div class='del'>-#define BIT_GET_BCN_HEAD_1_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_HEAD_1_V1_8822B) &amp; BIT_MASK_BCN_HEAD_1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BCN_VALID_V1_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_HEAD_V1_8822B 0</div><div class='del'>-#define BIT_MASK_BCN_HEAD_V1_8822B 0xfff</div><div class='del'>-#define BIT_BCN_HEAD_V1_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_HEAD_V1_8822B) &lt;&lt; BIT_SHIFT_BCN_HEAD_V1_8822B)</div><div class='del'>-#define BIT_GET_BCN_HEAD_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_HEAD_V1_8822B) &amp; BIT_MASK_BCN_HEAD_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AUTO_LLT_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B 24</div><div class='del'>-#define BIT_MASK_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B 0xff</div><div class='del'>-#define BIT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B(x)                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B)                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B)</div><div class='del'>-#define BIT_GET_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B(x)                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B) &amp;             \</div><div class='del'>-	 BIT_MASK_MAX_TX_PKT_FOR_USB_AND_SDIO_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LLT_FREE_PAGE_V1_8822B 8</div><div class='del'>-#define BIT_MASK_LLT_FREE_PAGE_V1_8822B 0xffff</div><div class='del'>-#define BIT_LLT_FREE_PAGE_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_LLT_FREE_PAGE_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LLT_FREE_PAGE_V1_8822B)</div><div class='del'>-#define BIT_GET_LLT_FREE_PAGE_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LLT_FREE_PAGE_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_LLT_FREE_PAGE_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BLK_DESC_NUM_8822B 4</div><div class='del'>-#define BIT_MASK_BLK_DESC_NUM_8822B 0xf</div><div class='del'>-#define BIT_BLK_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BLK_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_BLK_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_BLK_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BLK_DESC_NUM_8822B) &amp; BIT_MASK_BLK_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_BCN_HEAD_SEL_8822B BIT(3)</div><div class='del'>-#define BIT_R_EN_BCN_SW_HEAD_SEL_8822B BIT(2)</div><div class='del'>-#define BIT_LLT_DBG_SEL_8822B BIT(1)</div><div class='del'>-#define BIT_AUTO_INIT_LLT_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_OFFSET_CHK_8822B */</div><div class='del'>-#define BIT_EM_CHKSUM_FIN_8822B BIT(31)</div><div class='del'>-#define BIT_EMN_PCIE_DMA_MOD_8822B BIT(30)</div><div class='del'>-#define BIT_EN_TXQUE_CLR_8822B BIT(29)</div><div class='del'>-#define BIT_EN_PCIE_FIFO_MODE_8822B BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PG_UNDER_TH_V1_8822B 16</div><div class='del'>-#define BIT_MASK_PG_UNDER_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_PG_UNDER_TH_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_PG_UNDER_TH_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PG_UNDER_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_PG_UNDER_TH_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PG_UNDER_TH_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_PG_UNDER_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RESTORE_H2C_ADDRESS_8822B BIT(15)</div><div class='del'>-#define BIT_SDIO_TXDESC_CHKSUM_EN_8822B BIT(13)</div><div class='del'>-#define BIT_RST_RDPTR_8822B BIT(12)</div><div class='del'>-#define BIT_RST_WRPTR_8822B BIT(11)</div><div class='del'>-#define BIT_CHK_PG_TH_EN_8822B BIT(10)</div><div class='del'>-#define BIT_DROP_DATA_EN_8822B BIT(9)</div><div class='del'>-#define BIT_CHECK_OFFSET_EN_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CHECK_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_CHECK_OFFSET_8822B 0xff</div><div class='del'>-#define BIT_CHECK_OFFSET_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_CHECK_OFFSET_8822B) &lt;&lt; BIT_SHIFT_CHECK_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_CHECK_OFFSET_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CHECK_OFFSET_8822B) &amp; BIT_MASK_CHECK_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXDMA_STATUS_8822B */</div><div class='del'>-#define BIT_HI_OQT_UDN_8822B BIT(17)</div><div class='del'>-#define BIT_HI_OQT_OVF_8822B BIT(16)</div><div class='del'>-#define BIT_PAYLOAD_CHKSUM_ERR_8822B BIT(15)</div><div class='del'>-#define BIT_PAYLOAD_UDN_8822B BIT(14)</div><div class='del'>-#define BIT_PAYLOAD_OVF_8822B BIT(13)</div><div class='del'>-#define BIT_DSC_CHKSUM_FAIL_8822B BIT(12)</div><div class='del'>-#define BIT_UNKNOWN_QSEL_8822B BIT(11)</div><div class='del'>-#define BIT_EP_QSEL_DIFF_8822B BIT(10)</div><div class='del'>-#define BIT_TX_OFFS_UNMATCH_8822B BIT(9)</div><div class='del'>-#define BIT_TXOQT_UDN_8822B BIT(8)</div><div class='del'>-#define BIT_TXOQT_OVF_8822B BIT(7)</div><div class='del'>-#define BIT_TXDMA_SFF_UDN_8822B BIT(6)</div><div class='del'>-#define BIT_TXDMA_SFF_OVF_8822B BIT(5)</div><div class='del'>-#define BIT_LLT_NULL_PG_8822B BIT(4)</div><div class='del'>-#define BIT_PAGE_UDN_8822B BIT(3)</div><div class='del'>-#define BIT_PAGE_OVF_8822B BIT(2)</div><div class='del'>-#define BIT_TXFF_PG_UDN_8822B BIT(1)</div><div class='del'>-#define BIT_TXFF_PG_OVF_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_DMA_DBG_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_HIGH_TH_V1_8822B 16</div><div class='del'>-#define BIT_MASK_HPQ_HIGH_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_HPQ_HIGH_TH_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_HIGH_TH_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HPQ_HIGH_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_HPQ_HIGH_TH_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_HIGH_TH_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HPQ_HIGH_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_LOW_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HPQ_LOW_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_HPQ_LOW_TH_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_LOW_TH_V1_8822B) &lt;&lt; BIT_SHIFT_HPQ_LOW_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_HPQ_LOW_TH_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_LOW_TH_V1_8822B) &amp; BIT_MASK_HPQ_LOW_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_HIGH_TH_V1_8822B 16</div><div class='del'>-#define BIT_MASK_NPQ_HIGH_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_NPQ_HIGH_TH_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_HIGH_TH_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_NPQ_HIGH_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_NPQ_HIGH_TH_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_HIGH_TH_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_NPQ_HIGH_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_LOW_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_NPQ_LOW_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_NPQ_LOW_TH_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_LOW_TH_V1_8822B) &lt;&lt; BIT_SHIFT_NPQ_LOW_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_NPQ_LOW_TH_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_LOW_TH_V1_8822B) &amp; BIT_MASK_NPQ_LOW_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_HIGH_TH_V1_8822B 16</div><div class='del'>-#define BIT_MASK_LPQ_HIGH_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_LPQ_HIGH_TH_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_HIGH_TH_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LPQ_HIGH_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_LPQ_HIGH_TH_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_HIGH_TH_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_LPQ_HIGH_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_LOW_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LPQ_LOW_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_LPQ_LOW_TH_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_LOW_TH_V1_8822B) &lt;&lt; BIT_SHIFT_LPQ_LOW_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_LPQ_LOW_TH_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_LOW_TH_V1_8822B) &amp; BIT_MASK_LPQ_LOW_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TQPNT4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_HIGH_TH_V1_8822B 16</div><div class='del'>-#define BIT_MASK_EXQ_HIGH_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_EXQ_HIGH_TH_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_HIGH_TH_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EXQ_HIGH_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_EXQ_HIGH_TH_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_HIGH_TH_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_EXQ_HIGH_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_LOW_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_EXQ_LOW_TH_V1_8822B 0xfff</div><div class='del'>-#define BIT_EXQ_LOW_TH_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_LOW_TH_V1_8822B) &lt;&lt; BIT_SHIFT_EXQ_LOW_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_EXQ_LOW_TH_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_LOW_TH_V1_8822B) &amp; BIT_MASK_EXQ_LOW_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RQPN_CTRL_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKTNUM_H_8822B 16</div><div class='del'>-#define BIT_MASK_TXPKTNUM_H_8822B 0xffff</div><div class='del'>-#define BIT_TXPKTNUM_H_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKTNUM_H_8822B) &lt;&lt; BIT_SHIFT_TXPKTNUM_H_8822B)</div><div class='del'>-#define BIT_GET_TXPKTNUM_H_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKTNUM_H_8822B) &amp; BIT_MASK_TXPKTNUM_H_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKTNUM_V2_8822B 0</div><div class='del'>-#define BIT_MASK_TXPKTNUM_V2_8822B 0xffff</div><div class='del'>-#define BIT_TXPKTNUM_V2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKTNUM_V2_8822B) &lt;&lt; BIT_SHIFT_TXPKTNUM_V2_8822B)</div><div class='del'>-#define BIT_GET_TXPKTNUM_V2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKTNUM_V2_8822B) &amp; BIT_MASK_TXPKTNUM_V2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RQPN_CTRL_2_8822B */</div><div class='del'>-#define BIT_LD_RQPN_8822B BIT(31)</div><div class='del'>-#define BIT_EXQ_PUBLIC_DIS_V1_8822B BIT(19)</div><div class='del'>-#define BIT_NPQ_PUBLIC_DIS_V1_8822B BIT(18)</div><div class='del'>-#define BIT_LPQ_PUBLIC_DIS_V1_8822B BIT(17)</div><div class='del'>-#define BIT_HPQ_PUBLIC_DIS_V1_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_AVAL_PG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_HPQ_AVAL_PG_V1_8822B 0xfff</div><div class='del'>-#define BIT_HPQ_AVAL_PG_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_AVAL_PG_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HPQ_AVAL_PG_V1_8822B)</div><div class='del'>-#define BIT_GET_HPQ_AVAL_PG_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_AVAL_PG_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HPQ_AVAL_PG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HPQ_V1_8822B 0xfff</div><div class='del'>-#define BIT_HPQ_V1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPQ_V1_8822B) &lt;&lt; BIT_SHIFT_HPQ_V1_8822B)</div><div class='del'>-#define BIT_GET_HPQ_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPQ_V1_8822B) &amp; BIT_MASK_HPQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_AVAL_PG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_LPQ_AVAL_PG_V1_8822B 0xfff</div><div class='del'>-#define BIT_LPQ_AVAL_PG_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_AVAL_PG_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LPQ_AVAL_PG_V1_8822B)</div><div class='del'>-#define BIT_GET_LPQ_AVAL_PG_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_AVAL_PG_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_LPQ_AVAL_PG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LPQ_V1_8822B 0xfff</div><div class='del'>-#define BIT_LPQ_V1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPQ_V1_8822B) &lt;&lt; BIT_SHIFT_LPQ_V1_8822B)</div><div class='del'>-#define BIT_GET_LPQ_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPQ_V1_8822B) &amp; BIT_MASK_LPQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_AVAL_PG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_NPQ_AVAL_PG_V1_8822B 0xfff</div><div class='del'>-#define BIT_NPQ_AVAL_PG_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_AVAL_PG_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_NPQ_AVAL_PG_V1_8822B)</div><div class='del'>-#define BIT_GET_NPQ_AVAL_PG_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_AVAL_PG_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_NPQ_AVAL_PG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NPQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_NPQ_V1_8822B 0xfff</div><div class='del'>-#define BIT_NPQ_V1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_NPQ_V1_8822B) &lt;&lt; BIT_SHIFT_NPQ_V1_8822B)</div><div class='del'>-#define BIT_GET_NPQ_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NPQ_V1_8822B) &amp; BIT_MASK_NPQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_AVAL_PG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_EXQ_AVAL_PG_V1_8822B 0xfff</div><div class='del'>-#define BIT_EXQ_AVAL_PG_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_AVAL_PG_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EXQ_AVAL_PG_V1_8822B)</div><div class='del'>-#define BIT_GET_EXQ_AVAL_PG_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_AVAL_PG_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_EXQ_AVAL_PG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_EXQ_V1_8822B 0xfff</div><div class='del'>-#define BIT_EXQ_V1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_V1_8822B) &lt;&lt; BIT_SHIFT_EXQ_V1_8822B)</div><div class='del'>-#define BIT_GET_EXQ_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_V1_8822B) &amp; BIT_MASK_EXQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FIFOPAGE_INFO_5_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PUBQ_AVAL_PG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_PUBQ_AVAL_PG_V1_8822B 0xfff</div><div class='del'>-#define BIT_PUBQ_AVAL_PG_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_PUBQ_AVAL_PG_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PUBQ_AVAL_PG_V1_8822B)</div><div class='del'>-#define BIT_GET_PUBQ_AVAL_PG_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PUBQ_AVAL_PG_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_PUBQ_AVAL_PG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PUBQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_PUBQ_V1_8822B 0xfff</div><div class='del'>-#define BIT_PUBQ_V1_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_PUBQ_V1_8822B) &lt;&lt; BIT_SHIFT_PUBQ_V1_8822B)</div><div class='del'>-#define BIT_GET_PUBQ_V1_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PUBQ_V1_8822B) &amp; BIT_MASK_PUBQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_HEAD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_HEAD_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_HEAD_8822B 0x3ffff</div><div class='del'>-#define BIT_H2C_HEAD_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_HEAD_8822B) &lt;&lt; BIT_SHIFT_H2C_HEAD_8822B)</div><div class='del'>-#define BIT_GET_H2C_HEAD_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_HEAD_8822B) &amp; BIT_MASK_H2C_HEAD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_TAIL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_TAIL_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_TAIL_8822B 0x3ffff</div><div class='del'>-#define BIT_H2C_TAIL_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_TAIL_8822B) &lt;&lt; BIT_SHIFT_H2C_TAIL_8822B)</div><div class='del'>-#define BIT_GET_H2C_TAIL_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_TAIL_8822B) &amp; BIT_MASK_H2C_TAIL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_READ_ADDR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_READ_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_READ_ADDR_8822B 0x3ffff</div><div class='del'>-#define BIT_H2C_READ_ADDR_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_READ_ADDR_8822B) &lt;&lt; BIT_SHIFT_H2C_READ_ADDR_8822B)</div><div class='del'>-#define BIT_GET_H2C_READ_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_READ_ADDR_8822B) &amp; BIT_MASK_H2C_READ_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_WR_ADDR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_WR_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_WR_ADDR_8822B 0x3ffff</div><div class='del'>-#define BIT_H2C_WR_ADDR_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_WR_ADDR_8822B) &lt;&lt; BIT_SHIFT_H2C_WR_ADDR_8822B)</div><div class='del'>-#define BIT_GET_H2C_WR_ADDR_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_WR_ADDR_8822B) &amp; BIT_MASK_H2C_WR_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2C_INFO_8822B */</div><div class='del'>-#define BIT_H2C_SPACE_VLD_8822B BIT(3)</div><div class='del'>-#define BIT_H2C_WR_ADDR_RST_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2C_LEN_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_H2C_LEN_SEL_8822B 0x3</div><div class='del'>-#define BIT_H2C_LEN_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2C_LEN_SEL_8822B) &lt;&lt; BIT_SHIFT_H2C_LEN_SEL_8822B)</div><div class='del'>-#define BIT_GET_H2C_LEN_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2C_LEN_SEL_8822B) &amp; BIT_MASK_H2C_LEN_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_AGG_PG_TH_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXDMA_AGG_OLD_MOD_8822B 24</div><div class='del'>-#define BIT_MASK_RXDMA_AGG_OLD_MOD_8822B 0xff</div><div class='del'>-#define BIT_RXDMA_AGG_OLD_MOD_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXDMA_AGG_OLD_MOD_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXDMA_AGG_OLD_MOD_8822B)</div><div class='del'>-#define BIT_GET_RXDMA_AGG_OLD_MOD_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXDMA_AGG_OLD_MOD_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_RXDMA_AGG_OLD_MOD_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_NUM_WOL_8822B 16</div><div class='del'>-#define BIT_MASK_PKT_NUM_WOL_8822B 0xff</div><div class='del'>-#define BIT_PKT_NUM_WOL_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_NUM_WOL_8822B) &lt;&lt; BIT_SHIFT_PKT_NUM_WOL_8822B)</div><div class='del'>-#define BIT_GET_PKT_NUM_WOL_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_NUM_WOL_8822B) &amp; BIT_MASK_PKT_NUM_WOL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DMA_AGG_TO_8822B 8</div><div class='del'>-#define BIT_MASK_DMA_AGG_TO_8822B 0xf</div><div class='del'>-#define BIT_DMA_AGG_TO_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DMA_AGG_TO_8822B) &lt;&lt; BIT_SHIFT_DMA_AGG_TO_8822B)</div><div class='del'>-#define BIT_GET_DMA_AGG_TO_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DMA_AGG_TO_8822B) &amp; BIT_MASK_DMA_AGG_TO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXDMA_AGG_PG_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_RXDMA_AGG_PG_TH_V1_8822B 0xf</div><div class='del'>-#define BIT_RXDMA_AGG_PG_TH_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXDMA_AGG_PG_TH_V1_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXDMA_AGG_PG_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_RXDMA_AGG_PG_TH_V1_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXDMA_AGG_PG_TH_V1_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_RXDMA_AGG_PG_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXPKT_NUM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT_NUM_8822B 24</div><div class='del'>-#define BIT_MASK_RXPKT_NUM_8822B 0xff</div><div class='del'>-#define BIT_RXPKT_NUM_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKT_NUM_8822B) &lt;&lt; BIT_SHIFT_RXPKT_NUM_8822B)</div><div class='del'>-#define BIT_GET_RXPKT_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT_NUM_8822B) &amp; BIT_MASK_RXPKT_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_UPD_RDPTR19_TO_16_8822B 20</div><div class='del'>-#define BIT_MASK_FW_UPD_RDPTR19_TO_16_8822B 0xf</div><div class='del'>-#define BIT_FW_UPD_RDPTR19_TO_16_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_UPD_RDPTR19_TO_16_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_FW_UPD_RDPTR19_TO_16_8822B)</div><div class='del'>-#define BIT_GET_FW_UPD_RDPTR19_TO_16_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_UPD_RDPTR19_TO_16_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_FW_UPD_RDPTR19_TO_16_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RXDMA_REQ_8822B BIT(19)</div><div class='del'>-#define BIT_RW_RELEASE_EN_8822B BIT(18)</div><div class='del'>-#define BIT_RXDMA_IDLE_8822B BIT(17)</div><div class='del'>-#define BIT_RXPKT_RELEASE_POLL_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_UPD_RDPTR_8822B 0</div><div class='del'>-#define BIT_MASK_FW_UPD_RDPTR_8822B 0xffff</div><div class='del'>-#define BIT_FW_UPD_RDPTR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_UPD_RDPTR_8822B) &lt;&lt; BIT_SHIFT_FW_UPD_RDPTR_8822B)</div><div class='del'>-#define BIT_GET_FW_UPD_RDPTR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_UPD_RDPTR_8822B) &amp; BIT_MASK_FW_UPD_RDPTR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_STATUS_8822B */</div><div class='del'>-#define BIT_C2H_PKT_OVF_8822B BIT(7)</div><div class='del'>-#define BIT_AGG_CONFGI_ISSUE_8822B BIT(6)</div><div class='del'>-#define BIT_FW_POLL_ISSUE_8822B BIT(5)</div><div class='del'>-#define BIT_RX_DATA_UDN_8822B BIT(4)</div><div class='del'>-#define BIT_RX_SFF_UDN_8822B BIT(3)</div><div class='del'>-#define BIT_RX_SFF_OVF_8822B BIT(2)</div><div class='del'>-#define BIT_RXPKT_OVF_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_DPR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RDE_DEBUG_8822B 0</div><div class='del'>-#define BIT_MASK_RDE_DEBUG_8822B 0xffffffffL</div><div class='del'>-#define BIT_RDE_DEBUG_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RDE_DEBUG_8822B) &lt;&lt; BIT_SHIFT_RDE_DEBUG_8822B)</div><div class='del'>-#define BIT_GET_RDE_DEBUG_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RDE_DEBUG_8822B) &amp; BIT_MASK_RDE_DEBUG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXDMA_MODE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTNUM_TH_V2_8822B 24</div><div class='del'>-#define BIT_MASK_PKTNUM_TH_V2_8822B 0x1f</div><div class='del'>-#define BIT_PKTNUM_TH_V2_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTNUM_TH_V2_8822B) &lt;&lt; BIT_SHIFT_PKTNUM_TH_V2_8822B)</div><div class='del'>-#define BIT_GET_PKTNUM_TH_V2_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTNUM_TH_V2_8822B) &amp; BIT_MASK_PKTNUM_TH_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TXBA_BREAK_USBAGG_8822B BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTLEN_PARA_8822B 16</div><div class='del'>-#define BIT_MASK_PKTLEN_PARA_8822B 0x7</div><div class='del'>-#define BIT_PKTLEN_PARA_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTLEN_PARA_8822B) &lt;&lt; BIT_SHIFT_PKTLEN_PARA_8822B)</div><div class='del'>-#define BIT_GET_PKTLEN_PARA_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTLEN_PARA_8822B) &amp; BIT_MASK_PKTLEN_PARA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BURST_SIZE_8822B 4</div><div class='del'>-#define BIT_MASK_BURST_SIZE_8822B 0x3</div><div class='del'>-#define BIT_BURST_SIZE_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BURST_SIZE_8822B) &lt;&lt; BIT_SHIFT_BURST_SIZE_8822B)</div><div class='del'>-#define BIT_GET_BURST_SIZE_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BURST_SIZE_8822B) &amp; BIT_MASK_BURST_SIZE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BURST_CNT_8822B 2</div><div class='del'>-#define BIT_MASK_BURST_CNT_8822B 0x3</div><div class='del'>-#define BIT_BURST_CNT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BURST_CNT_8822B) &lt;&lt; BIT_SHIFT_BURST_CNT_8822B)</div><div class='del'>-#define BIT_GET_BURST_CNT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BURST_CNT_8822B) &amp; BIT_MASK_BURST_CNT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DMA_MODE_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_C2H_PKT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_C2H_STR_ADDR_16_TO_19_8822B 24</div><div class='del'>-#define BIT_MASK_R_C2H_STR_ADDR_16_TO_19_8822B 0xf</div><div class='del'>-#define BIT_R_C2H_STR_ADDR_16_TO_19_8822B(x)                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_C2H_STR_ADDR_16_TO_19_8822B)                        \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_C2H_STR_ADDR_16_TO_19_8822B)</div><div class='del'>-#define BIT_GET_R_C2H_STR_ADDR_16_TO_19_8822B(x)                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_C2H_STR_ADDR_16_TO_19_8822B) &amp;                    \</div><div class='del'>-	 BIT_MASK_R_C2H_STR_ADDR_16_TO_19_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_C2H_PKT_REQ_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_C2H_STR_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_R_C2H_STR_ADDR_8822B 0xffff</div><div class='del'>-#define BIT_R_C2H_STR_ADDR_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_C2H_STR_ADDR_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_C2H_STR_ADDR_8822B)</div><div class='del'>-#define BIT_GET_R_C2H_STR_ADDR_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_C2H_STR_ADDR_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_R_C2H_STR_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_C2H_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_C2H_DMA_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_C2H_DMA_ADDR_8822B 0x3ffff</div><div class='del'>-#define BIT_C2H_DMA_ADDR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_C2H_DMA_ADDR_8822B) &lt;&lt; BIT_SHIFT_C2H_DMA_ADDR_8822B)</div><div class='del'>-#define BIT_GET_C2H_DMA_ADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_C2H_DMA_ADDR_8822B) &amp; BIT_MASK_C2H_DMA_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_CTRL_8822B */</div><div class='del'>-#define BIT_FWFF_DMAPKT_REQ_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_DMA_PKT_NUM_8822B 16</div><div class='del'>-#define BIT_MASK_FWFF_DMA_PKT_NUM_8822B 0xff</div><div class='del'>-#define BIT_FWFF_DMA_PKT_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_DMA_PKT_NUM_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_FWFF_DMA_PKT_NUM_8822B)</div><div class='del'>-#define BIT_GET_FWFF_DMA_PKT_NUM_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_DMA_PKT_NUM_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_FWFF_DMA_PKT_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_STR_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_FWFF_STR_ADDR_8822B 0xffff</div><div class='del'>-#define BIT_FWFF_STR_ADDR_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_STR_ADDR_8822B) &lt;&lt; BIT_SHIFT_FWFF_STR_ADDR_8822B)</div><div class='del'>-#define BIT_GET_FWFF_STR_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_STR_ADDR_8822B) &amp; BIT_MASK_FWFF_STR_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWFF_PKT_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_PKT_QUEUED_8822B 16</div><div class='del'>-#define BIT_MASK_FWFF_PKT_QUEUED_8822B 0xff</div><div class='del'>-#define BIT_FWFF_PKT_QUEUED_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_PKT_QUEUED_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_FWFF_PKT_QUEUED_8822B)</div><div class='del'>-#define BIT_GET_FWFF_PKT_QUEUED_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_PKT_QUEUED_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_FWFF_PKT_QUEUED_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FWFF_PKT_STR_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_FWFF_PKT_STR_ADDR_8822B 0xffff</div><div class='del'>-#define BIT_FWFF_PKT_STR_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_FWFF_PKT_STR_ADDR_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_FWFF_PKT_STR_ADDR_8822B)</div><div class='del'>-#define BIT_GET_FWFF_PKT_STR_ADDR_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FWFF_PKT_STR_ADDR_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_FWFF_PKT_STR_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH0SA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH0_SA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH0_SA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH0_SA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH0_SA_8822B) &lt;&lt; BIT_SHIFT_DDMACH0_SA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH0_SA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH0_SA_8822B) &amp; BIT_MASK_DDMACH0_SA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH0DA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH0_DA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH0_DA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH0_DA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH0_DA_8822B) &lt;&lt; BIT_SHIFT_DDMACH0_DA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH0_DA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH0_DA_8822B) &amp; BIT_MASK_DDMACH0_DA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH0CTRL_8822B */</div><div class='del'>-#define BIT_DDMACH0_OWN_8822B BIT(31)</div><div class='del'>-#define BIT_DDMACH0_CHKSUM_EN_8822B BIT(29)</div><div class='del'>-#define BIT_DDMACH0_DA_W_DISABLE_8822B BIT(28)</div><div class='del'>-#define BIT_DDMACH0_CHKSUM_STS_8822B BIT(27)</div><div class='del'>-#define BIT_DDMACH0_DDMA_MODE_8822B BIT(26)</div><div class='del'>-#define BIT_DDMACH0_RESET_CHKSUM_STS_8822B BIT(25)</div><div class='del'>-#define BIT_DDMACH0_CHKSUM_CONT_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH0_DLEN_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH0_DLEN_8822B 0x3ffff</div><div class='del'>-#define BIT_DDMACH0_DLEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH0_DLEN_8822B) &lt;&lt; BIT_SHIFT_DDMACH0_DLEN_8822B)</div><div class='del'>-#define BIT_GET_DDMACH0_DLEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH0_DLEN_8822B) &amp; BIT_MASK_DDMACH0_DLEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH1SA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH1_SA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH1_SA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH1_SA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH1_SA_8822B) &lt;&lt; BIT_SHIFT_DDMACH1_SA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH1_SA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH1_SA_8822B) &amp; BIT_MASK_DDMACH1_SA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH1DA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH1_DA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH1_DA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH1_DA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH1_DA_8822B) &lt;&lt; BIT_SHIFT_DDMACH1_DA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH1_DA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH1_DA_8822B) &amp; BIT_MASK_DDMACH1_DA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH1CTRL_8822B */</div><div class='del'>-#define BIT_DDMACH1_OWN_8822B BIT(31)</div><div class='del'>-#define BIT_DDMACH1_CHKSUM_EN_8822B BIT(29)</div><div class='del'>-#define BIT_DDMACH1_DA_W_DISABLE_8822B BIT(28)</div><div class='del'>-#define BIT_DDMACH1_CHKSUM_STS_8822B BIT(27)</div><div class='del'>-#define BIT_DDMACH1_DDMA_MODE_8822B BIT(26)</div><div class='del'>-#define BIT_DDMACH1_RESET_CHKSUM_STS_8822B BIT(25)</div><div class='del'>-#define BIT_DDMACH1_CHKSUM_CONT_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH1_DLEN_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH1_DLEN_8822B 0x3ffff</div><div class='del'>-#define BIT_DDMACH1_DLEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH1_DLEN_8822B) &lt;&lt; BIT_SHIFT_DDMACH1_DLEN_8822B)</div><div class='del'>-#define BIT_GET_DDMACH1_DLEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH1_DLEN_8822B) &amp; BIT_MASK_DDMACH1_DLEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH2SA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH2_SA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH2_SA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH2_SA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH2_SA_8822B) &lt;&lt; BIT_SHIFT_DDMACH2_SA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH2_SA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH2_SA_8822B) &amp; BIT_MASK_DDMACH2_SA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH2DA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH2_DA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH2_DA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH2_DA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH2_DA_8822B) &lt;&lt; BIT_SHIFT_DDMACH2_DA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH2_DA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH2_DA_8822B) &amp; BIT_MASK_DDMACH2_DA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH2CTRL_8822B */</div><div class='del'>-#define BIT_DDMACH2_OWN_8822B BIT(31)</div><div class='del'>-#define BIT_DDMACH2_CHKSUM_EN_8822B BIT(29)</div><div class='del'>-#define BIT_DDMACH2_DA_W_DISABLE_8822B BIT(28)</div><div class='del'>-#define BIT_DDMACH2_CHKSUM_STS_8822B BIT(27)</div><div class='del'>-#define BIT_DDMACH2_DDMA_MODE_8822B BIT(26)</div><div class='del'>-#define BIT_DDMACH2_RESET_CHKSUM_STS_8822B BIT(25)</div><div class='del'>-#define BIT_DDMACH2_CHKSUM_CONT_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH2_DLEN_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH2_DLEN_8822B 0x3ffff</div><div class='del'>-#define BIT_DDMACH2_DLEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH2_DLEN_8822B) &lt;&lt; BIT_SHIFT_DDMACH2_DLEN_8822B)</div><div class='del'>-#define BIT_GET_DDMACH2_DLEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH2_DLEN_8822B) &amp; BIT_MASK_DDMACH2_DLEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH3SA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH3_SA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH3_SA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH3_SA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH3_SA_8822B) &lt;&lt; BIT_SHIFT_DDMACH3_SA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH3_SA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH3_SA_8822B) &amp; BIT_MASK_DDMACH3_SA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH3DA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH3_DA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH3_DA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH3_DA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH3_DA_8822B) &lt;&lt; BIT_SHIFT_DDMACH3_DA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH3_DA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH3_DA_8822B) &amp; BIT_MASK_DDMACH3_DA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH3CTRL_8822B */</div><div class='del'>-#define BIT_DDMACH3_OWN_8822B BIT(31)</div><div class='del'>-#define BIT_DDMACH3_CHKSUM_EN_8822B BIT(29)</div><div class='del'>-#define BIT_DDMACH3_DA_W_DISABLE_8822B BIT(28)</div><div class='del'>-#define BIT_DDMACH3_CHKSUM_STS_8822B BIT(27)</div><div class='del'>-#define BIT_DDMACH3_DDMA_MODE_8822B BIT(26)</div><div class='del'>-#define BIT_DDMACH3_RESET_CHKSUM_STS_8822B BIT(25)</div><div class='del'>-#define BIT_DDMACH3_CHKSUM_CONT_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH3_DLEN_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH3_DLEN_8822B 0x3ffff</div><div class='del'>-#define BIT_DDMACH3_DLEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH3_DLEN_8822B) &lt;&lt; BIT_SHIFT_DDMACH3_DLEN_8822B)</div><div class='del'>-#define BIT_GET_DDMACH3_DLEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH3_DLEN_8822B) &amp; BIT_MASK_DDMACH3_DLEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH4SA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH4_SA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH4_SA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH4_SA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH4_SA_8822B) &lt;&lt; BIT_SHIFT_DDMACH4_SA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH4_SA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH4_SA_8822B) &amp; BIT_MASK_DDMACH4_SA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH4DA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH4_DA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH4_DA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH4_DA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH4_DA_8822B) &lt;&lt; BIT_SHIFT_DDMACH4_DA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH4_DA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH4_DA_8822B) &amp; BIT_MASK_DDMACH4_DA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH4CTRL_8822B */</div><div class='del'>-#define BIT_DDMACH4_OWN_8822B BIT(31)</div><div class='del'>-#define BIT_DDMACH4_CHKSUM_EN_8822B BIT(29)</div><div class='del'>-#define BIT_DDMACH4_DA_W_DISABLE_8822B BIT(28)</div><div class='del'>-#define BIT_DDMACH4_CHKSUM_STS_8822B BIT(27)</div><div class='del'>-#define BIT_DDMACH4_DDMA_MODE_8822B BIT(26)</div><div class='del'>-#define BIT_DDMACH4_RESET_CHKSUM_STS_8822B BIT(25)</div><div class='del'>-#define BIT_DDMACH4_CHKSUM_CONT_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH4_DLEN_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH4_DLEN_8822B 0x3ffff</div><div class='del'>-#define BIT_DDMACH4_DLEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH4_DLEN_8822B) &lt;&lt; BIT_SHIFT_DDMACH4_DLEN_8822B)</div><div class='del'>-#define BIT_GET_DDMACH4_DLEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH4_DLEN_8822B) &amp; BIT_MASK_DDMACH4_DLEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH5SA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH5_SA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH5_SA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH5_SA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH5_SA_8822B) &lt;&lt; BIT_SHIFT_DDMACH5_SA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH5_SA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH5_SA_8822B) &amp; BIT_MASK_DDMACH5_SA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CH5DA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH5_DA_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH5_DA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DDMACH5_DA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH5_DA_8822B) &lt;&lt; BIT_SHIFT_DDMACH5_DA_8822B)</div><div class='del'>-#define BIT_GET_DDMACH5_DA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH5_DA_8822B) &amp; BIT_MASK_DDMACH5_DA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_REG_DDMA_CH5CTRL_8822B */</div><div class='del'>-#define BIT_DDMACH5_OWN_8822B BIT(31)</div><div class='del'>-#define BIT_DDMACH5_CHKSUM_EN_8822B BIT(29)</div><div class='del'>-#define BIT_DDMACH5_DA_W_DISABLE_8822B BIT(28)</div><div class='del'>-#define BIT_DDMACH5_CHKSUM_STS_8822B BIT(27)</div><div class='del'>-#define BIT_DDMACH5_DDMA_MODE_8822B BIT(26)</div><div class='del'>-#define BIT_DDMACH5_RESET_CHKSUM_STS_8822B BIT(25)</div><div class='del'>-#define BIT_DDMACH5_CHKSUM_CONT_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DDMACH5_DLEN_8822B 0</div><div class='del'>-#define BIT_MASK_DDMACH5_DLEN_8822B 0x3ffff</div><div class='del'>-#define BIT_DDMACH5_DLEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DDMACH5_DLEN_8822B) &lt;&lt; BIT_SHIFT_DDMACH5_DLEN_8822B)</div><div class='del'>-#define BIT_GET_DDMACH5_DLEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DDMACH5_DLEN_8822B) &amp; BIT_MASK_DDMACH5_DLEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_INT_MSK_8822B */</div><div class='del'>-#define BIT_DDMACH5_MSK_8822B BIT(5)</div><div class='del'>-#define BIT_DDMACH4_MSK_8822B BIT(4)</div><div class='del'>-#define BIT_DDMACH3_MSK_8822B BIT(3)</div><div class='del'>-#define BIT_DDMACH2_MSK_8822B BIT(2)</div><div class='del'>-#define BIT_DDMACH1_MSK_8822B BIT(1)</div><div class='del'>-#define BIT_DDMACH0_MSK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CHSTATUS_8822B */</div><div class='del'>-#define BIT_DDMACH5_BUSY_8822B BIT(5)</div><div class='del'>-#define BIT_DDMACH4_BUSY_8822B BIT(4)</div><div class='del'>-#define BIT_DDMACH3_BUSY_8822B BIT(3)</div><div class='del'>-#define BIT_DDMACH2_BUSY_8822B BIT(2)</div><div class='del'>-#define BIT_DDMACH1_BUSY_8822B BIT(1)</div><div class='del'>-#define BIT_DDMACH0_BUSY_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_CHKSUM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_IDDMA0_CHKSUM_8822B 0</div><div class='del'>-#define BIT_MASK_IDDMA0_CHKSUM_8822B 0xffff</div><div class='del'>-#define BIT_IDDMA0_CHKSUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_IDDMA0_CHKSUM_8822B) &lt;&lt; BIT_SHIFT_IDDMA0_CHKSUM_8822B)</div><div class='del'>-#define BIT_GET_IDDMA0_CHKSUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_IDDMA0_CHKSUM_8822B) &amp; BIT_MASK_IDDMA0_CHKSUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DDMA_MONITOR_8822B */</div><div class='del'>-#define BIT_IDDMA0_PERMU_UNDERFLOW_8822B BIT(14)</div><div class='del'>-#define BIT_IDDMA0_FIFO_UNDERFLOW_8822B BIT(13)</div><div class='del'>-#define BIT_IDDMA0_FIFO_OVERFLOW_8822B BIT(12)</div><div class='del'>-#define BIT_CH5_ERR_8822B BIT(5)</div><div class='del'>-#define BIT_CH4_ERR_8822B BIT(4)</div><div class='del'>-#define BIT_CH3_ERR_8822B BIT(3)</div><div class='del'>-#define BIT_CH2_ERR_8822B BIT(2)</div><div class='del'>-#define BIT_CH1_ERR_8822B BIT(1)</div><div class='del'>-#define BIT_CH0_ERR_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL_8822B */</div><div class='del'>-#define BIT_PCIEIO_PERSTB_SEL_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MAX_RXDMA_8822B 28</div><div class='del'>-#define BIT_MASK_PCIE_MAX_RXDMA_8822B 0x7</div><div class='del'>-#define BIT_PCIE_MAX_RXDMA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MAX_RXDMA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PCIE_MAX_RXDMA_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MAX_RXDMA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MAX_RXDMA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_PCIE_MAX_RXDMA_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_MULRW_8822B BIT(27)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_MAX_TXDMA_8822B 24</div><div class='del'>-#define BIT_MASK_PCIE_MAX_TXDMA_8822B 0x7</div><div class='del'>-#define BIT_PCIE_MAX_TXDMA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_MAX_TXDMA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PCIE_MAX_TXDMA_8822B)</div><div class='del'>-#define BIT_GET_PCIE_MAX_TXDMA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_MAX_TXDMA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_PCIE_MAX_TXDMA_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_CPL_TIMEOUT_PS_8822B BIT(22)</div><div class='del'>-#define BIT_REG_TXDMA_FAIL_PS_8822B BIT(21)</div><div class='del'>-#define BIT_PCIE_RST_TRXDMA_INTF_8822B BIT(20)</div><div class='del'>-#define BIT_EN_HWENTR_L1_8822B BIT(19)</div><div class='del'>-#define BIT_EN_ADV_CLKGATE_8822B BIT(18)</div><div class='del'>-#define BIT_PCIE_EN_SWENT_L23_8822B BIT(17)</div><div class='del'>-#define BIT_PCIE_EN_HWEXT_L1_8822B BIT(16)</div><div class='del'>-#define BIT_RX_CLOSE_EN_8822B BIT(15)</div><div class='del'>-#define BIT_STOP_BCNQ_8822B BIT(14)</div><div class='del'>-#define BIT_STOP_MGQ_8822B BIT(13)</div><div class='del'>-#define BIT_STOP_VOQ_8822B BIT(12)</div><div class='del'>-#define BIT_STOP_VIQ_8822B BIT(11)</div><div class='del'>-#define BIT_STOP_BEQ_8822B BIT(10)</div><div class='del'>-#define BIT_STOP_BKQ_8822B BIT(9)</div><div class='del'>-#define BIT_STOP_RXQ_8822B BIT(8)</div><div class='del'>-#define BIT_STOP_HI7Q_8822B BIT(7)</div><div class='del'>-#define BIT_STOP_HI6Q_8822B BIT(6)</div><div class='del'>-#define BIT_STOP_HI5Q_8822B BIT(5)</div><div class='del'>-#define BIT_STOP_HI4Q_8822B BIT(4)</div><div class='del'>-#define BIT_STOP_HI3Q_8822B BIT(3)</div><div class='del'>-#define BIT_STOP_HI2Q_8822B BIT(2)</div><div class='del'>-#define BIT_STOP_HI1Q_8822B BIT(1)</div><div class='del'>-#define BIT_STOP_HI0Q_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_INT_MIG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXTTIMER_MATCH_NUM_8822B 28</div><div class='del'>-#define BIT_MASK_TXTTIMER_MATCH_NUM_8822B 0xf</div><div class='del'>-#define BIT_TXTTIMER_MATCH_NUM_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXTTIMER_MATCH_NUM_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TXTTIMER_MATCH_NUM_8822B)</div><div class='del'>-#define BIT_GET_TXTTIMER_MATCH_NUM_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXTTIMER_MATCH_NUM_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_TXTTIMER_MATCH_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXPKT_NUM_MATCH_8822B 24</div><div class='del'>-#define BIT_MASK_TXPKT_NUM_MATCH_8822B 0xf</div><div class='del'>-#define BIT_TXPKT_NUM_MATCH_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXPKT_NUM_MATCH_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TXPKT_NUM_MATCH_8822B)</div><div class='del'>-#define BIT_GET_TXPKT_NUM_MATCH_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXPKT_NUM_MATCH_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TXPKT_NUM_MATCH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXTTIMER_MATCH_NUM_8822B 20</div><div class='del'>-#define BIT_MASK_RXTTIMER_MATCH_NUM_8822B 0xf</div><div class='del'>-#define BIT_RXTTIMER_MATCH_NUM_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXTTIMER_MATCH_NUM_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXTTIMER_MATCH_NUM_8822B)</div><div class='del'>-#define BIT_GET_RXTTIMER_MATCH_NUM_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXTTIMER_MATCH_NUM_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_RXTTIMER_MATCH_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT_NUM_MATCH_8822B 16</div><div class='del'>-#define BIT_MASK_RXPKT_NUM_MATCH_8822B 0xf</div><div class='del'>-#define BIT_RXPKT_NUM_MATCH_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKT_NUM_MATCH_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXPKT_NUM_MATCH_8822B)</div><div class='del'>-#define BIT_GET_RXPKT_NUM_MATCH_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT_NUM_MATCH_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_RXPKT_NUM_MATCH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MIGRATE_TIMER_8822B 0</div><div class='del'>-#define BIT_MASK_MIGRATE_TIMER_8822B 0xffff</div><div class='del'>-#define BIT_MIGRATE_TIMER_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MIGRATE_TIMER_8822B) &lt;&lt; BIT_SHIFT_MIGRATE_TIMER_8822B)</div><div class='del'>-#define BIT_GET_MIGRATE_TIMER_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MIGRATE_TIMER_8822B) &amp; BIT_MASK_MIGRATE_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_BCNQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_BCNQ_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCNQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_BCNQ_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_BCNQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_MGQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_MGQ_TXBD_DESA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_TXBD_DESA_8822B) &lt;&lt; BIT_SHIFT_MGQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_MGQ_TXBD_DESA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_TXBD_DESA_8822B) &amp; BIT_MASK_MGQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_VOQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_VOQ_TXBD_DESA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_TXBD_DESA_8822B) &lt;&lt; BIT_SHIFT_VOQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_VOQ_TXBD_DESA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_TXBD_DESA_8822B) &amp; BIT_MASK_VOQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_VIQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_VIQ_TXBD_DESA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_TXBD_DESA_8822B) &lt;&lt; BIT_SHIFT_VIQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_VIQ_TXBD_DESA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_TXBD_DESA_8822B) &amp; BIT_MASK_VIQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_BEQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_BEQ_TXBD_DESA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_TXBD_DESA_8822B) &lt;&lt; BIT_SHIFT_BEQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_BEQ_TXBD_DESA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_TXBD_DESA_8822B) &amp; BIT_MASK_BEQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_BKQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_BKQ_TXBD_DESA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_TXBD_DESA_8822B) &lt;&lt; BIT_SHIFT_BKQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_BKQ_TXBD_DESA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_TXBD_DESA_8822B) &amp; BIT_MASK_BKQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXQ_RXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_RXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_RXQ_RXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_RXQ_RXBD_DESA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_RXBD_DESA_8822B) &lt;&lt; BIT_SHIFT_RXQ_RXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_RXQ_RXBD_DESA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_RXBD_DESA_8822B) &amp; BIT_MASK_RXQ_RXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI0Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI0Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI0Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI0Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI0Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI0Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI1Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI1Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI1Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI1Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI1Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI1Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI2Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI2Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI2Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI2Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI2Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI2Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI3Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI3Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI3Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI3Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI3Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI3Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI4Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI4Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI4Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI4Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI4Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI4Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI5Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI5Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI5Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI5Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI5Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI5Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI6Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI6Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI6Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI6Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI6Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI6Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI7Q_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_HI7Q_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_HI7Q_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI7Q_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_HI7Q_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI7Q_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_PCIE_MGQ_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_MGQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_MGQ_DESC_MODE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_DESC_MODE_8822B) &lt;&lt; BIT_SHIFT_MGQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_MGQ_DESC_MODE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_DESC_MODE_8822B) &amp; BIT_MASK_MGQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_MGQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_MGQ_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_MGQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_MGQ_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_DESC_NUM_8822B) &amp; BIT_MASK_MGQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_RXBD_NUM_8822B */</div><div class='del'>-#define BIT_SYS_32_64_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_DESC_MODE_8822B 13</div><div class='del'>-#define BIT_MASK_BCNQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_BCNQ_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCNQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_BCNQ_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_BCNQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_BCNQ_FLAG_8822B BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_RXQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_RXQ_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_RXQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_RXQ_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_DESC_NUM_8822B) &amp; BIT_MASK_RXQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_PCIE_VOQ_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_VOQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_VOQ_DESC_MODE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_DESC_MODE_8822B) &lt;&lt; BIT_SHIFT_VOQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_VOQ_DESC_MODE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_DESC_MODE_8822B) &amp; BIT_MASK_VOQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_VOQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_VOQ_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_VOQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_VOQ_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_DESC_NUM_8822B) &amp; BIT_MASK_VOQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_PCIE_VIQ_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_VIQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_VIQ_DESC_MODE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_DESC_MODE_8822B) &lt;&lt; BIT_SHIFT_VIQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_VIQ_DESC_MODE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_DESC_MODE_8822B) &amp; BIT_MASK_VIQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_VIQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_VIQ_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_VIQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_VIQ_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_DESC_NUM_8822B) &amp; BIT_MASK_VIQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_PCIE_BEQ_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_BEQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_BEQ_DESC_MODE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_DESC_MODE_8822B) &lt;&lt; BIT_SHIFT_BEQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_BEQ_DESC_MODE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_DESC_MODE_8822B) &amp; BIT_MASK_BEQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_BEQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_BEQ_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_BEQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_BEQ_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_DESC_NUM_8822B) &amp; BIT_MASK_BEQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_PCIE_BKQ_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_BKQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_BKQ_DESC_MODE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_DESC_MODE_8822B) &lt;&lt; BIT_SHIFT_BKQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_BKQ_DESC_MODE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_DESC_MODE_8822B) &amp; BIT_MASK_BKQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_BKQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_BKQ_DESC_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_BKQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_BKQ_DESC_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_DESC_NUM_8822B) &amp; BIT_MASK_BKQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI0Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI0Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI0Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI0Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI0Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI0Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI0Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI0Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI0Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI0Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI0Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_DESC_NUM_8822B) &amp; BIT_MASK_HI0Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI1Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI1Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI1Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI1Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI1Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI1Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI1Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI1Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI1Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI1Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI1Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_DESC_NUM_8822B) &amp; BIT_MASK_HI1Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI2Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI2Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI2Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI2Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI2Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI2Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI2Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI2Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI2Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI2Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI2Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_DESC_NUM_8822B) &amp; BIT_MASK_HI2Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI3Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI3Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI3Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI3Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI3Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI3Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI3Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI3Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI3Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI3Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI3Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_DESC_NUM_8822B) &amp; BIT_MASK_HI3Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI4Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI4Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI4Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI4Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI4Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI4Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI4Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI4Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI4Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI4Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI4Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_DESC_NUM_8822B) &amp; BIT_MASK_HI4Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI5Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI5Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI5Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI5Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI5Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI5Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI5Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI5Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI5Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI5Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI5Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_DESC_NUM_8822B) &amp; BIT_MASK_HI5Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI6Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI6Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI6Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI6Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI6Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI6Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI6Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI6Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI6Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI6Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI6Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_DESC_NUM_8822B) &amp; BIT_MASK_HI6Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI7Q_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_HI7Q_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_HI7Q_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_HI7Q_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HI7Q_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_HI7Q_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HI7Q_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_HI7Q_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_HI7Q_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_HI7Q_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_HI7Q_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_DESC_NUM_8822B) &amp; BIT_MASK_HI7Q_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTIMER_HCI_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT2_HCI_8822B 16</div><div class='del'>-#define BIT_MASK_TSFT2_HCI_8822B 0xffff</div><div class='del'>-#define BIT_TSFT2_HCI_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT2_HCI_8822B) &lt;&lt; BIT_SHIFT_TSFT2_HCI_8822B)</div><div class='del'>-#define BIT_GET_TSFT2_HCI_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT2_HCI_8822B) &amp; BIT_MASK_TSFT2_HCI_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT1_HCI_8822B 0</div><div class='del'>-#define BIT_MASK_TSFT1_HCI_8822B 0xffff</div><div class='del'>-#define BIT_TSFT1_HCI_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT1_HCI_8822B) &lt;&lt; BIT_SHIFT_TSFT1_HCI_8822B)</div><div class='del'>-#define BIT_GET_TSFT1_HCI_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT1_HCI_8822B) &amp; BIT_MASK_TSFT1_HCI_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BD_RWPTR_CLR_8822B */</div><div class='del'>-#define BIT_CLR_HI7Q_HW_IDX_8822B BIT(29)</div><div class='del'>-#define BIT_CLR_HI6Q_HW_IDX_8822B BIT(28)</div><div class='del'>-#define BIT_CLR_HI5Q_HW_IDX_8822B BIT(27)</div><div class='del'>-#define BIT_CLR_HI4Q_HW_IDX_8822B BIT(26)</div><div class='del'>-#define BIT_CLR_HI3Q_HW_IDX_8822B BIT(25)</div><div class='del'>-#define BIT_CLR_HI2Q_HW_IDX_8822B BIT(24)</div><div class='del'>-#define BIT_CLR_HI1Q_HW_IDX_8822B BIT(23)</div><div class='del'>-#define BIT_CLR_HI0Q_HW_IDX_8822B BIT(22)</div><div class='del'>-#define BIT_CLR_BKQ_HW_IDX_8822B BIT(21)</div><div class='del'>-#define BIT_CLR_BEQ_HW_IDX_8822B BIT(20)</div><div class='del'>-#define BIT_CLR_VIQ_HW_IDX_8822B BIT(19)</div><div class='del'>-#define BIT_CLR_VOQ_HW_IDX_8822B BIT(18)</div><div class='del'>-#define BIT_CLR_MGQ_HW_IDX_8822B BIT(17)</div><div class='del'>-#define BIT_CLR_RXQ_HW_IDX_8822B BIT(16)</div><div class='del'>-#define BIT_CLR_HI7Q_HOST_IDX_8822B BIT(13)</div><div class='del'>-#define BIT_CLR_HI6Q_HOST_IDX_8822B BIT(12)</div><div class='del'>-#define BIT_CLR_HI5Q_HOST_IDX_8822B BIT(11)</div><div class='del'>-#define BIT_CLR_HI4Q_HOST_IDX_8822B BIT(10)</div><div class='del'>-#define BIT_CLR_HI3Q_HOST_IDX_8822B BIT(9)</div><div class='del'>-#define BIT_CLR_HI2Q_HOST_IDX_8822B BIT(8)</div><div class='del'>-#define BIT_CLR_HI1Q_HOST_IDX_8822B BIT(7)</div><div class='del'>-#define BIT_CLR_HI0Q_HOST_IDX_8822B BIT(6)</div><div class='del'>-#define BIT_CLR_BKQ_HOST_IDX_8822B BIT(5)</div><div class='del'>-#define BIT_CLR_BEQ_HOST_IDX_8822B BIT(4)</div><div class='del'>-#define BIT_CLR_VIQ_HOST_IDX_8822B BIT(3)</div><div class='del'>-#define BIT_CLR_VOQ_HOST_IDX_8822B BIT(2)</div><div class='del'>-#define BIT_CLR_MGQ_HOST_IDX_8822B BIT(1)</div><div class='del'>-#define BIT_CLR_RXQ_HOST_IDX_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VOQ_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_VOQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_VOQ_HW_IDX_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_VOQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_VOQ_HW_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_HW_IDX_8822B) &amp; BIT_MASK_VOQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VOQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_VOQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_VOQ_HOST_IDX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_VOQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_VOQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_VOQ_HOST_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VOQ_HOST_IDX_8822B) &amp; BIT_MASK_VOQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIQ_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_VIQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_VIQ_HW_IDX_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_VIQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_VIQ_HW_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_HW_IDX_8822B) &amp; BIT_MASK_VIQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VIQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_VIQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_VIQ_HOST_IDX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_VIQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_VIQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_VIQ_HOST_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VIQ_HOST_IDX_8822B) &amp; BIT_MASK_VIQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEQ_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_BEQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_BEQ_HW_IDX_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_BEQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_BEQ_HW_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_HW_IDX_8822B) &amp; BIT_MASK_BEQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_BEQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_BEQ_HOST_IDX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_BEQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_BEQ_HOST_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEQ_HOST_IDX_8822B) &amp; BIT_MASK_BEQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BKQ_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_BKQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_BKQ_HW_IDX_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_BKQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_BKQ_HW_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_HW_IDX_8822B) &amp; BIT_MASK_BKQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BKQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_BKQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_BKQ_HOST_IDX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BKQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_BKQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_BKQ_HOST_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BKQ_HOST_IDX_8822B) &amp; BIT_MASK_BKQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_MGQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_MGQ_HW_IDX_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_MGQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_MGQ_HW_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_HW_IDX_8822B) &amp; BIT_MASK_MGQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_MGQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_MGQ_HOST_IDX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_MGQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_MGQ_HOST_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_HOST_IDX_8822B) &amp; BIT_MASK_MGQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXQ_RXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_RXQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_RXQ_HW_IDX_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_RXQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_RXQ_HW_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_HW_IDX_8822B) &amp; BIT_MASK_RXQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_RXQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_RXQ_HOST_IDX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_RXQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_RXQ_HOST_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXQ_HOST_IDX_8822B) &amp; BIT_MASK_RXQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI0Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI0Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI0Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI0Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI0Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_HW_IDX_8822B) &amp; BIT_MASK_HI0Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI0Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI0Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI0Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI0Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI0Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI0Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI0Q_HOST_IDX_8822B) &amp; BIT_MASK_HI0Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI1Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI1Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI1Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI1Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI1Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_HW_IDX_8822B) &amp; BIT_MASK_HI1Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI1Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI1Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI1Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI1Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI1Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI1Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI1Q_HOST_IDX_8822B) &amp; BIT_MASK_HI1Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI2Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI2Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI2Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI2Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI2Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_HW_IDX_8822B) &amp; BIT_MASK_HI2Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI2Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI2Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI2Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI2Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI2Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI2Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI2Q_HOST_IDX_8822B) &amp; BIT_MASK_HI2Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI3Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI3Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI3Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI3Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI3Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_HW_IDX_8822B) &amp; BIT_MASK_HI3Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI3Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI3Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI3Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI3Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI3Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI3Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI3Q_HOST_IDX_8822B) &amp; BIT_MASK_HI3Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI4Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI4Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI4Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI4Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI4Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_HW_IDX_8822B) &amp; BIT_MASK_HI4Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI4Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI4Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI4Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI4Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI4Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI4Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI4Q_HOST_IDX_8822B) &amp; BIT_MASK_HI4Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI5Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI5Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI5Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI5Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI5Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_HW_IDX_8822B) &amp; BIT_MASK_HI5Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI5Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI5Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI5Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI5Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI5Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI5Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI5Q_HOST_IDX_8822B) &amp; BIT_MASK_HI5Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI6Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI6Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI6Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI6Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI6Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_HW_IDX_8822B) &amp; BIT_MASK_HI6Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI6Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI6Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI6Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI6Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI6Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI6Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI6Q_HOST_IDX_8822B) &amp; BIT_MASK_HI6Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HI7Q_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_HI7Q_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI7Q_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_HI7Q_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI7Q_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_HW_IDX_8822B) &amp; BIT_MASK_HI7Q_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HI7Q_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_HI7Q_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_HI7Q_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HI7Q_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_HI7Q_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_HI7Q_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HI7Q_HOST_IDX_8822B) &amp; BIT_MASK_HI7Q_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBG_SEL_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBG_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_DBG_SEL_8822B 0xff</div><div class='del'>-#define BIT_DBG_SEL_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBG_SEL_8822B) &lt;&lt; BIT_SHIFT_DBG_SEL_8822B)</div><div class='del'>-#define BIT_GET_DBG_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBG_SEL_8822B) &amp; BIT_MASK_DBG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HRPWM1_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HRPWM_8822B 0</div><div class='del'>-#define BIT_MASK_PCIE_HRPWM_8822B 0xff</div><div class='del'>-#define BIT_PCIE_HRPWM_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_HRPWM_8822B) &lt;&lt; BIT_SHIFT_PCIE_HRPWM_8822B)</div><div class='del'>-#define BIT_GET_PCIE_HRPWM_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HRPWM_8822B) &amp; BIT_MASK_PCIE_HRPWM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HCPWM1_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HCPWM_8822B 0</div><div class='del'>-#define BIT_MASK_PCIE_HCPWM_8822B 0xff</div><div class='del'>-#define BIT_PCIE_HCPWM_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_HCPWM_8822B) &lt;&lt; BIT_SHIFT_PCIE_HCPWM_8822B)</div><div class='del'>-#define BIT_GET_PCIE_HCPWM_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HCPWM_8822B) &amp; BIT_MASK_PCIE_HCPWM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_CTRL2_8822B */</div><div class='del'>-#define BIT_DIS_TXDMA_PRE_8822B BIT(7)</div><div class='del'>-#define BIT_DIS_RXDMA_PRE_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HPS_CLKR_PCIE_8822B 4</div><div class='del'>-#define BIT_MASK_HPS_CLKR_PCIE_8822B 0x3</div><div class='del'>-#define BIT_HPS_CLKR_PCIE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HPS_CLKR_PCIE_8822B) &lt;&lt; BIT_SHIFT_HPS_CLKR_PCIE_8822B)</div><div class='del'>-#define BIT_GET_HPS_CLKR_PCIE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HPS_CLKR_PCIE_8822B) &amp; BIT_MASK_HPS_CLKR_PCIE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PCIE_INT_8822B BIT(3)</div><div class='del'>-#define BIT_TXFLAG_EXIT_L1_EN_8822B BIT(2)</div><div class='del'>-#define BIT_EN_RXDMA_ALIGN_8822B BIT(1)</div><div class='del'>-#define BIT_EN_TXDMA_ALIGN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HRPWM2_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HRPWM2_8822B 0</div><div class='del'>-#define BIT_MASK_PCIE_HRPWM2_8822B 0xffff</div><div class='del'>-#define BIT_PCIE_HRPWM2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_HRPWM2_8822B) &lt;&lt; BIT_SHIFT_PCIE_HRPWM2_8822B)</div><div class='del'>-#define BIT_GET_PCIE_HRPWM2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HRPWM2_8822B) &amp; BIT_MASK_PCIE_HRPWM2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_HCPWM2_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PCIE_HCPWM2_8822B 0</div><div class='del'>-#define BIT_MASK_PCIE_HCPWM2_8822B 0xffff</div><div class='del'>-#define BIT_PCIE_HCPWM2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_PCIE_HCPWM2_8822B) &lt;&lt; BIT_SHIFT_PCIE_HCPWM2_8822B)</div><div class='del'>-#define BIT_GET_PCIE_HCPWM2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PCIE_HCPWM2_8822B) &amp; BIT_MASK_PCIE_HCPWM2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_H2C_MSG_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DRV2FW_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_DRV2FW_INFO_8822B 0xffffffffL</div><div class='del'>-#define BIT_DRV2FW_INFO_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_DRV2FW_INFO_8822B) &lt;&lt; BIT_SHIFT_DRV2FW_INFO_8822B)</div><div class='del'>-#define BIT_GET_DRV2FW_INFO_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DRV2FW_INFO_8822B) &amp; BIT_MASK_DRV2FW_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_C2H_MSG_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HCI_PCIE_C2H_MSG_8822B 0</div><div class='del'>-#define BIT_MASK_HCI_PCIE_C2H_MSG_8822B 0xffffffffL</div><div class='del'>-#define BIT_HCI_PCIE_C2H_MSG_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_HCI_PCIE_C2H_MSG_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HCI_PCIE_C2H_MSG_8822B)</div><div class='del'>-#define BIT_GET_HCI_PCIE_C2H_MSG_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HCI_PCIE_C2H_MSG_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_HCI_PCIE_C2H_MSG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBI_WDATA_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_WDATA_8822B 0</div><div class='del'>-#define BIT_MASK_DBI_WDATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DBI_WDATA_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBI_WDATA_8822B) &lt;&lt; BIT_SHIFT_DBI_WDATA_8822B)</div><div class='del'>-#define BIT_GET_DBI_WDATA_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBI_WDATA_8822B) &amp; BIT_MASK_DBI_WDATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBI_RDATA_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_RDATA_8822B 0</div><div class='del'>-#define BIT_MASK_DBI_RDATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_DBI_RDATA_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBI_RDATA_8822B) &lt;&lt; BIT_SHIFT_DBI_RDATA_8822B)</div><div class='del'>-#define BIT_GET_DBI_RDATA_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBI_RDATA_8822B) &amp; BIT_MASK_DBI_RDATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DBI_FLAG_V1_8822B */</div><div class='del'>-#define BIT_EN_STUCK_DBG_8822B BIT(26)</div><div class='del'>-#define BIT_RX_STUCK_8822B BIT(25)</div><div class='del'>-#define BIT_TX_STUCK_8822B BIT(24)</div><div class='del'>-#define BIT_DBI_RFLAG_8822B BIT(17)</div><div class='del'>-#define BIT_DBI_WFLAG_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_WREN_8822B 12</div><div class='del'>-#define BIT_MASK_DBI_WREN_8822B 0xf</div><div class='del'>-#define BIT_DBI_WREN_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBI_WREN_8822B) &lt;&lt; BIT_SHIFT_DBI_WREN_8822B)</div><div class='del'>-#define BIT_GET_DBI_WREN_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBI_WREN_8822B) &amp; BIT_MASK_DBI_WREN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DBI_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_DBI_ADDR_8822B 0xfff</div><div class='del'>-#define BIT_DBI_ADDR_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DBI_ADDR_8822B) &lt;&lt; BIT_SHIFT_DBI_ADDR_8822B)</div><div class='del'>-#define BIT_GET_DBI_ADDR_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DBI_ADDR_8822B) &amp; BIT_MASK_DBI_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MDIO_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_RDATA_8822B 16</div><div class='del'>-#define BIT_MASK_MDIO_RDATA_8822B 0xffff</div><div class='del'>-#define BIT_MDIO_RDATA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MDIO_RDATA_8822B) &lt;&lt; BIT_SHIFT_MDIO_RDATA_8822B)</div><div class='del'>-#define BIT_GET_MDIO_RDATA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_RDATA_8822B) &amp; BIT_MASK_MDIO_RDATA_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_WDATA_8822B 0</div><div class='del'>-#define BIT_MASK_MDIO_WDATA_8822B 0xffff</div><div class='del'>-#define BIT_MDIO_WDATA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_MDIO_WDATA_8822B) &lt;&lt; BIT_SHIFT_MDIO_WDATA_8822B)</div><div class='del'>-#define BIT_GET_MDIO_WDATA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_WDATA_8822B) &amp; BIT_MASK_MDIO_WDATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PCIE_MIX_CFG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_PHY_ADDR_8822B 24</div><div class='del'>-#define BIT_MASK_MDIO_PHY_ADDR_8822B 0x1f</div><div class='del'>-#define BIT_MDIO_PHY_ADDR_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MDIO_PHY_ADDR_8822B) &lt;&lt; BIT_SHIFT_MDIO_PHY_ADDR_8822B)</div><div class='del'>-#define BIT_GET_MDIO_PHY_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_PHY_ADDR_8822B) &amp; BIT_MASK_MDIO_PHY_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WATCH_DOG_RECORD_V1_8822B 10</div><div class='del'>-#define BIT_MASK_WATCH_DOG_RECORD_V1_8822B 0x3fff</div><div class='del'>-#define BIT_WATCH_DOG_RECORD_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_WATCH_DOG_RECORD_V1_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WATCH_DOG_RECORD_V1_8822B)</div><div class='del'>-#define BIT_GET_WATCH_DOG_RECORD_V1_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WATCH_DOG_RECORD_V1_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_WATCH_DOG_RECORD_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_IO_TIMEOUT_FLAG_V1_8822B BIT(9)</div><div class='del'>-#define BIT_EN_WATCH_DOG_8822B BIT(8)</div><div class='del'>-#define BIT_ECRC_EN_V1_8822B BIT(7)</div><div class='del'>-#define BIT_MDIO_RFLAG_V1_8822B BIT(6)</div><div class='del'>-#define BIT_MDIO_WFLAG_V1_8822B BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MDIO_REG_ADDR_V1_8822B 0</div><div class='del'>-#define BIT_MASK_MDIO_REG_ADDR_V1_8822B 0x1f</div><div class='del'>-#define BIT_MDIO_REG_ADDR_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_MDIO_REG_ADDR_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MDIO_REG_ADDR_V1_8822B)</div><div class='del'>-#define BIT_GET_MDIO_REG_ADDR_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MDIO_REG_ADDR_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_MDIO_REG_ADDR_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HCI_MIX_CFG_8822B */</div><div class='del'>-#define BIT_HOST_GEN2_SUPPORT_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXDMA_ERR_FLAG_8822B 16</div><div class='del'>-#define BIT_MASK_TXDMA_ERR_FLAG_8822B 0xf</div><div class='del'>-#define BIT_TXDMA_ERR_FLAG_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXDMA_ERR_FLAG_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TXDMA_ERR_FLAG_8822B)</div><div class='del'>-#define BIT_GET_TXDMA_ERR_FLAG_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXDMA_ERR_FLAG_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TXDMA_ERR_FLAG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EARLY_MODE_SEL_8822B 12</div><div class='del'>-#define BIT_MASK_EARLY_MODE_SEL_8822B 0xf</div><div class='del'>-#define BIT_EARLY_MODE_SEL_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EARLY_MODE_SEL_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EARLY_MODE_SEL_8822B)</div><div class='del'>-#define BIT_GET_EARLY_MODE_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EARLY_MODE_SEL_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_EARLY_MODE_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EPHY_RX50_EN_8822B BIT(11)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MSI_TIMEOUT_ID_V1_8822B 8</div><div class='del'>-#define BIT_MASK_MSI_TIMEOUT_ID_V1_8822B 0x7</div><div class='del'>-#define BIT_MSI_TIMEOUT_ID_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_MSI_TIMEOUT_ID_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MSI_TIMEOUT_ID_V1_8822B)</div><div class='del'>-#define BIT_GET_MSI_TIMEOUT_ID_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MSI_TIMEOUT_ID_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_MSI_TIMEOUT_ID_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RADDR_RD_8822B BIT(7)</div><div class='del'>-#define BIT_EN_MUL_TAG_8822B BIT(6)</div><div class='del'>-#define BIT_EN_EARLY_MODE_8822B BIT(5)</div><div class='del'>-#define BIT_L0S_LINK_OFF_8822B BIT(4)</div><div class='del'>-#define BIT_ACT_LINK_OFF_8822B BIT(3)</div><div class='del'>-#define BIT_EN_SLOW_MAC_TX_8822B BIT(2)</div><div class='del'>-#define BIT_EN_SLOW_MAC_RX_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STC_INT_CS_8822B(PCIE STATE CHANGE INTERRUPT CONTROL AND STATUS) */</div><div class='del'>-#define BIT_STC_INT_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_FLAG_8822B 16</div><div class='del'>-#define BIT_MASK_STC_INT_FLAG_8822B 0xff</div><div class='del'>-#define BIT_STC_INT_FLAG_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_FLAG_8822B) &lt;&lt; BIT_SHIFT_STC_INT_FLAG_8822B)</div><div class='del'>-#define BIT_GET_STC_INT_FLAG_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_FLAG_8822B) &amp; BIT_MASK_STC_INT_FLAG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_IDX_8822B 8</div><div class='del'>-#define BIT_MASK_STC_INT_IDX_8822B 0x7</div><div class='del'>-#define BIT_STC_INT_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_IDX_8822B) &lt;&lt; BIT_SHIFT_STC_INT_IDX_8822B)</div><div class='del'>-#define BIT_GET_STC_INT_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_IDX_8822B) &amp; BIT_MASK_STC_INT_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_REALTIME_CS_8822B 0</div><div class='del'>-#define BIT_MASK_STC_INT_REALTIME_CS_8822B 0x3f</div><div class='del'>-#define BIT_STC_INT_REALTIME_CS_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_REALTIME_CS_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STC_INT_REALTIME_CS_8822B)</div><div class='del'>-#define BIT_GET_STC_INT_REALTIME_CS_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_REALTIME_CS_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_STC_INT_REALTIME_CS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ST_INT_CFG_8822B(PCIE STATE CHANGE INTERRUPT CONFIGURATION) */</div><div class='del'>-#define BIT_STC_INT_GRP_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_EXPECT_LS_8822B 8</div><div class='del'>-#define BIT_MASK_STC_INT_EXPECT_LS_8822B 0x3f</div><div class='del'>-#define BIT_STC_INT_EXPECT_LS_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_EXPECT_LS_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STC_INT_EXPECT_LS_8822B)</div><div class='del'>-#define BIT_GET_STC_INT_EXPECT_LS_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_EXPECT_LS_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_STC_INT_EXPECT_LS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STC_INT_EXPECT_CS_8822B 0</div><div class='del'>-#define BIT_MASK_STC_INT_EXPECT_CS_8822B 0x3f</div><div class='del'>-#define BIT_STC_INT_EXPECT_CS_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_STC_INT_EXPECT_CS_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STC_INT_EXPECT_CS_8822B)</div><div class='del'>-#define BIT_GET_STC_INT_EXPECT_CS_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STC_INT_EXPECT_CS_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_STC_INT_EXPECT_CS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMU_DLY_CTRL_8822B(PCIE PHY CLOCK MGT UNIT DELAY CONTROL ) */</div><div class='del'>-#define BIT_CMU_DLY_EN_8822B BIT(31)</div><div class='del'>-#define BIT_CMU_DLY_MODE_8822B BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_PRE_DIV_8822B 0</div><div class='del'>-#define BIT_MASK_CMU_DLY_PRE_DIV_8822B 0xff</div><div class='del'>-#define BIT_CMU_DLY_PRE_DIV_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_PRE_DIV_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMU_DLY_PRE_DIV_8822B)</div><div class='del'>-#define BIT_GET_CMU_DLY_PRE_DIV_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_PRE_DIV_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CMU_DLY_PRE_DIV_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMU_DLY_CFG_8822B(PCIE PHY CLOCK MGT UNIT DELAY CONFIGURATION ) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_A2I_8822B 24</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_A2I_8822B 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_A2I_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_A2I_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_A2I_8822B)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_A2I_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_A2I_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CMU_DLY_LTR_A2I_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_I2A_8822B 16</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_I2A_8822B 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_I2A_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_I2A_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_I2A_8822B)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_I2A_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_I2A_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CMU_DLY_LTR_I2A_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_IDLE_8822B 8</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_IDLE_8822B 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_IDLE_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_IDLE_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_IDLE_8822B)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_IDLE_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_IDLE_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_CMU_DLY_LTR_IDLE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMU_DLY_LTR_ACT_8822B 0</div><div class='del'>-#define BIT_MASK_CMU_DLY_LTR_ACT_8822B 0xff</div><div class='del'>-#define BIT_CMU_DLY_LTR_ACT_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMU_DLY_LTR_ACT_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMU_DLY_LTR_ACT_8822B)</div><div class='del'>-#define BIT_GET_CMU_DLY_LTR_ACT_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMU_DLY_LTR_ACT_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CMU_DLY_LTR_ACT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_DESA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_TXBD_DESA_8822B 0</div><div class='del'>-#define BIT_MASK_H2CQ_TXBD_DESA_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_H2CQ_TXBD_DESA_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_TXBD_DESA_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_H2CQ_TXBD_DESA_8822B)</div><div class='del'>-#define BIT_GET_H2CQ_TXBD_DESA_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_TXBD_DESA_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_H2CQ_TXBD_DESA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_NUM_8822B */</div><div class='del'>-#define BIT_PCIE_H2CQ_FLAG_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_DESC_MODE_8822B 12</div><div class='del'>-#define BIT_MASK_H2CQ_DESC_MODE_8822B 0x3</div><div class='del'>-#define BIT_H2CQ_DESC_MODE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_DESC_MODE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_H2CQ_DESC_MODE_8822B)</div><div class='del'>-#define BIT_GET_H2CQ_DESC_MODE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_DESC_MODE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_H2CQ_DESC_MODE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_DESC_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_H2CQ_DESC_NUM_8822B 0xfff</div><div class='del'>-#define BIT_H2CQ_DESC_NUM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_DESC_NUM_8822B) &lt;&lt; BIT_SHIFT_H2CQ_DESC_NUM_8822B)</div><div class='del'>-#define BIT_GET_H2CQ_DESC_NUM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_DESC_NUM_8822B) &amp; BIT_MASK_H2CQ_DESC_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_TXBD_IDX_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_HW_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_H2CQ_HW_IDX_8822B 0xfff</div><div class='del'>-#define BIT_H2CQ_HW_IDX_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_HW_IDX_8822B) &lt;&lt; BIT_SHIFT_H2CQ_HW_IDX_8822B)</div><div class='del'>-#define BIT_GET_H2CQ_HW_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_HW_IDX_8822B) &amp; BIT_MASK_H2CQ_HW_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_H2CQ_HOST_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_H2CQ_HOST_IDX_8822B 0xfff</div><div class='del'>-#define BIT_H2CQ_HOST_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_H2CQ_HOST_IDX_8822B) &lt;&lt; BIT_SHIFT_H2CQ_HOST_IDX_8822B)</div><div class='del'>-#define BIT_GET_H2CQ_HOST_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_H2CQ_HOST_IDX_8822B) &amp; BIT_MASK_H2CQ_HOST_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_H2CQ_CSR_8822B[31:0] (H2CQ CONTROL AND STATUS) */</div><div class='del'>-#define BIT_H2CQ_FULL_8822B BIT(31)</div><div class='del'>-#define BIT_CLR_H2CQ_HOST_IDX_8822B BIT(16)</div><div class='del'>-#define BIT_CLR_H2CQ_HW_IDX_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CHANGE_PCIE_SPEED_8822B */</div><div class='del'>-#define BIT_CHANGE_PCIE_SPEED_8822B BIT(18)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GEN1_GEN2_8822B 16</div><div class='del'>-#define BIT_MASK_GEN1_GEN2_8822B 0x3</div><div class='del'>-#define BIT_GEN1_GEN2_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_GEN1_GEN2_8822B) &lt;&lt; BIT_SHIFT_GEN1_GEN2_8822B)</div><div class='del'>-#define BIT_GET_GEN1_GEN2_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GEN1_GEN2_8822B) &amp; BIT_MASK_GEN1_GEN2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AUTO_HANG_RELEASE_8822B 0</div><div class='del'>-#define BIT_MASK_AUTO_HANG_RELEASE_8822B 0x7</div><div class='del'>-#define BIT_AUTO_HANG_RELEASE_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_AUTO_HANG_RELEASE_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AUTO_HANG_RELEASE_8822B)</div><div class='del'>-#define BIT_GET_AUTO_HANG_RELEASE_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AUTO_HANG_RELEASE_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_AUTO_HANG_RELEASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OLD_DEHANG_8822B */</div><div class='del'>-#define BIT_OLD_DEHANG_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q0_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q0_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q0_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q0_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q0_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q0_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q0_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q0_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q0_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q0_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q0_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q0_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q0_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q0_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q0_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q0_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q0_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q0_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q0_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q0_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q0_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q0_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q0_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q0_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q0_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q0_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q0_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q0_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q0_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q0_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q0_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q0_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q0_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q1_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q1_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q1_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q1_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q1_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q1_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q1_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q1_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q1_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q1_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q1_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q1_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q1_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q1_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q1_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q1_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q1_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q1_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q1_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q1_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q1_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q1_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q1_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q1_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q1_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q1_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q1_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q1_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q1_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q1_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q1_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q1_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q1_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q2_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q2_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q2_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q2_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q2_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q2_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q2_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q2_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q2_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q2_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q2_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q2_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q2_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q2_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q2_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q2_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q2_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q2_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q2_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q2_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q2_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q2_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q2_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q2_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q2_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q2_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q2_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q2_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q2_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q2_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q2_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q2_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q2_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q3_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q3_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q3_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q3_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q3_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q3_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q3_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q3_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q3_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q3_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q3_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q3_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q3_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q3_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q3_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q3_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q3_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q3_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q3_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q3_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q3_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q3_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q3_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q3_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q3_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q3_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q3_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q3_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q3_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q3_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q3_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q3_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q3_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q3_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_MGQ_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_MGQ_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_MGQ_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_MGQ_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_MGQ_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_MGQ_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_MGQ_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_MGQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_MGQ_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_MGQ_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_MGQ_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_MGQ_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEAC_MGQ_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_MGQ_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_MGQ_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_QUEUEAC_MGQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_MGQ_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_MGQ_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_MGQ_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_MGQ_V2_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_MGQ_V2_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_MGQ_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_MGQ_V2_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_MGQ_V2_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_MGQ_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_MGQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_MGQ_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_MGQ_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_MGQ_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_MGQ_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_MGQ_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_MGQ_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_MGQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_HIQ_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_HIQ_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_HIQ_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_HIQ_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_HIQ_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_HIQ_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_HIQ_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_HIQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_HIQ_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_HIQ_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_HIQ_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_HIQ_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEAC_HIQ_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_HIQ_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_HIQ_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_QUEUEAC_HIQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_HIQ_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_HIQ_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_HIQ_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_HIQ_V2_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_HIQ_V2_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_HIQ_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_HIQ_V2_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_HIQ_V2_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_HIQ_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_HIQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_HIQ_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_HIQ_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_HIQ_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_HIQ_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_HIQ_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_HIQ_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_HIQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_HEAD_PG_V1_8822B 0</div><div class='del'>-#define BIT_MASK_BCNQ_HEAD_PG_V1_8822B 0xfff</div><div class='del'>-#define BIT_BCNQ_HEAD_PG_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_HEAD_PG_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCNQ_HEAD_PG_V1_8822B)</div><div class='del'>-#define BIT_GET_BCNQ_HEAD_PG_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_HEAD_PG_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_BCNQ_HEAD_PG_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXPKT_EMPTY_8822B */</div><div class='del'>-#define BIT_BCNQ_EMPTY_8822B BIT(11)</div><div class='del'>-#define BIT_HQQ_EMPTY_8822B BIT(10)</div><div class='del'>-#define BIT_MQQ_EMPTY_8822B BIT(9)</div><div class='del'>-#define BIT_MGQ_CPU_EMPTY_8822B BIT(8)</div><div class='del'>-#define BIT_AC7Q_EMPTY_8822B BIT(7)</div><div class='del'>-#define BIT_AC6Q_EMPTY_8822B BIT(6)</div><div class='del'>-#define BIT_AC5Q_EMPTY_8822B BIT(5)</div><div class='del'>-#define BIT_AC4Q_EMPTY_8822B BIT(4)</div><div class='del'>-#define BIT_AC3Q_EMPTY_8822B BIT(3)</div><div class='del'>-#define BIT_AC2Q_EMPTY_8822B BIT(2)</div><div class='del'>-#define BIT_AC1Q_EMPTY_8822B BIT(1)</div><div class='del'>-#define BIT_AC0Q_EMPTY_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPU_MGQ_INFO_8822B */</div><div class='del'>-#define BIT_BCN1_POLL_8822B BIT(30)</div><div class='del'>-#define BIT_CPUMGT_POLL_8822B BIT(29)</div><div class='del'>-#define BIT_BCN_POLL_8822B BIT(28)</div><div class='del'>-#define BIT_CPUMGQ_FW_NUM_V1_8822B BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FW_FREE_TAIL_V1_8822B 0</div><div class='del'>-#define BIT_MASK_FW_FREE_TAIL_V1_8822B 0xfff</div><div class='del'>-#define BIT_FW_FREE_TAIL_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_FW_FREE_TAIL_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_FW_FREE_TAIL_V1_8822B)</div><div class='del'>-#define BIT_GET_FW_FREE_TAIL_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FW_FREE_TAIL_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_FW_FREE_TAIL_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FWHW_TXQ_CTRL_8822B */</div><div class='del'>-#define BIT_RTS_LIMIT_IN_OFDM_8822B BIT(23)</div><div class='del'>-#define BIT_EN_BCNQ_DL_8822B BIT(22)</div><div class='del'>-#define BIT_EN_RD_RESP_NAV_BK_8822B BIT(21)</div><div class='del'>-#define BIT_EN_WR_FREE_TAIL_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EN_QUEUE_RPT_8822B 8</div><div class='del'>-#define BIT_MASK_EN_QUEUE_RPT_8822B 0xff</div><div class='del'>-#define BIT_EN_QUEUE_RPT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_EN_QUEUE_RPT_8822B) &lt;&lt; BIT_SHIFT_EN_QUEUE_RPT_8822B)</div><div class='del'>-#define BIT_GET_EN_QUEUE_RPT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EN_QUEUE_RPT_8822B) &amp; BIT_MASK_EN_QUEUE_RPT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_RTY_BK_8822B BIT(7)</div><div class='del'>-#define BIT_EN_USE_INI_RAT_8822B BIT(6)</div><div class='del'>-#define BIT_EN_RTS_NAV_BK_8822B BIT(5)</div><div class='del'>-#define BIT_DIS_SSN_CHECK_8822B BIT(4)</div><div class='del'>-#define BIT_MACID_MATCH_RTS_8822B BIT(3)</div><div class='del'>-#define BIT_EN_BCN_TRXRPT_V1_8822B BIT(2)</div><div class='del'>-#define BIT_EN_FTMACKRPT_8822B BIT(1)</div><div class='del'>-#define BIT_EN_FTMRPT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DATAFB_SEL_8822B */</div><div class='del'>-#define BIT__R_EN_RTY_BK_COD_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT__R_DATA_FALLBACK_SEL_8822B 0</div><div class='del'>-#define BIT_MASK__R_DATA_FALLBACK_SEL_8822B 0x3</div><div class='del'>-#define BIT__R_DATA_FALLBACK_SEL_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK__R_DATA_FALLBACK_SEL_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT__R_DATA_FALLBACK_SEL_8822B)</div><div class='del'>-#define BIT_GET__R_DATA_FALLBACK_SEL_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT__R_DATA_FALLBACK_SEL_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK__R_DATA_FALLBACK_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ_BDNY_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_PGBNDY_V1_8822B 0</div><div class='del'>-#define BIT_MASK_BCNQ_PGBNDY_V1_8822B 0xfff</div><div class='del'>-#define BIT_BCNQ_PGBNDY_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_PGBNDY_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCNQ_PGBNDY_V1_8822B)</div><div class='del'>-#define BIT_GET_BCNQ_PGBNDY_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_PGBNDY_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_BCNQ_PGBNDY_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LIFETIME_EN_8822B */</div><div class='del'>-#define BIT_BT_INT_CPU_8822B BIT(7)</div><div class='del'>-#define BIT_BT_INT_PTA_8822B BIT(6)</div><div class='del'>-#define BIT_EN_CTRL_RTYBIT_8822B BIT(4)</div><div class='del'>-#define BIT_LIFETIME_BK_EN_8822B BIT(3)</div><div class='del'>-#define BIT_LIFETIME_BE_EN_8822B BIT(2)</div><div class='del'>-#define BIT_LIFETIME_VI_EN_8822B BIT(1)</div><div class='del'>-#define BIT_LIFETIME_VO_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SPEC_SIFS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_OFDM_PTCL_8822B 8</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_OFDM_PTCL_8822B 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_OFDM_PTCL_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_OFDM_PTCL_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SPEC_SIFS_OFDM_PTCL_8822B)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_OFDM_PTCL_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_OFDM_PTCL_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_SPEC_SIFS_OFDM_PTCL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_CCK_PTCL_8822B 0</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_CCK_PTCL_8822B 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_CCK_PTCL_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_CCK_PTCL_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SPEC_SIFS_CCK_PTCL_8822B)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_CCK_PTCL_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_CCK_PTCL_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_SPEC_SIFS_CCK_PTCL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RETRY_LIMIT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SRL_8822B 8</div><div class='del'>-#define BIT_MASK_SRL_8822B 0x3f</div><div class='del'>-#define BIT_SRL_8822B(x) (((x) &amp; BIT_MASK_SRL_8822B) &lt;&lt; BIT_SHIFT_SRL_8822B)</div><div class='del'>-#define BIT_GET_SRL_8822B(x) (((x) &gt;&gt; BIT_SHIFT_SRL_8822B) &amp; BIT_MASK_SRL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LRL_8822B 0</div><div class='del'>-#define BIT_MASK_LRL_8822B 0x3f</div><div class='del'>-#define BIT_LRL_8822B(x) (((x) &amp; BIT_MASK_LRL_8822B) &lt;&lt; BIT_SHIFT_LRL_8822B)</div><div class='del'>-#define BIT_GET_LRL_8822B(x) (((x) &gt;&gt; BIT_SHIFT_LRL_8822B) &amp; BIT_MASK_LRL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXBF_CTRL_8822B */</div><div class='del'>-#define BIT_R_ENABLE_NDPA_8822B BIT(31)</div><div class='del'>-#define BIT_USE_NDPA_PARAMETER_8822B BIT(30)</div><div class='del'>-#define BIT_R_PROP_TXBF_8822B BIT(29)</div><div class='del'>-#define BIT_R_EN_NDPA_INT_8822B BIT(28)</div><div class='del'>-#define BIT_R_TXBF1_80M_8822B BIT(27)</div><div class='del'>-#define BIT_R_TXBF1_40M_8822B BIT(26)</div><div class='del'>-#define BIT_R_TXBF1_20M_8822B BIT(25)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TXBF1_AID_8822B 16</div><div class='del'>-#define BIT_MASK_R_TXBF1_AID_8822B 0x1ff</div><div class='del'>-#define BIT_R_TXBF1_AID_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TXBF1_AID_8822B) &lt;&lt; BIT_SHIFT_R_TXBF1_AID_8822B)</div><div class='del'>-#define BIT_GET_R_TXBF1_AID_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TXBF1_AID_8822B) &amp; BIT_MASK_R_TXBF1_AID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_NDP_BFEN_8822B BIT(15)</div><div class='del'>-#define BIT_R_TXBCN_NOBLOCK_NDP_8822B BIT(14)</div><div class='del'>-#define BIT_R_TXBF0_80M_8822B BIT(11)</div><div class='del'>-#define BIT_R_TXBF0_40M_8822B BIT(10)</div><div class='del'>-#define BIT_R_TXBF0_20M_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TXBF0_AID_8822B 0</div><div class='del'>-#define BIT_MASK_R_TXBF0_AID_8822B 0x1ff</div><div class='del'>-#define BIT_R_TXBF0_AID_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TXBF0_AID_8822B) &lt;&lt; BIT_SHIFT_R_TXBF0_AID_8822B)</div><div class='del'>-#define BIT_GET_R_TXBF0_AID_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TXBF0_AID_8822B) &amp; BIT_MASK_R_TXBF0_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DARFRC_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC8_8822B (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC8_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC8_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC8_8822B) &lt;&lt; BIT_SHIFT_DARF_RC8_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC8_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC8_8822B) &amp; BIT_MASK_DARF_RC8_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC7_8822B (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC7_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC7_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC7_8822B) &lt;&lt; BIT_SHIFT_DARF_RC7_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC7_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC7_8822B) &amp; BIT_MASK_DARF_RC7_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC6_8822B (40 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC6_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC6_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC6_8822B) &lt;&lt; BIT_SHIFT_DARF_RC6_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC6_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC6_8822B) &amp; BIT_MASK_DARF_RC6_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC5_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_DARF_RC5_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC5_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC5_8822B) &lt;&lt; BIT_SHIFT_DARF_RC5_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC5_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC5_8822B) &amp; BIT_MASK_DARF_RC5_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC4_8822B 24</div><div class='del'>-#define BIT_MASK_DARF_RC4_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC4_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC4_8822B) &lt;&lt; BIT_SHIFT_DARF_RC4_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC4_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC4_8822B) &amp; BIT_MASK_DARF_RC4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC3_8822B 16</div><div class='del'>-#define BIT_MASK_DARF_RC3_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC3_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC3_8822B) &lt;&lt; BIT_SHIFT_DARF_RC3_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC3_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC3_8822B) &amp; BIT_MASK_DARF_RC3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC2_8822B 8</div><div class='del'>-#define BIT_MASK_DARF_RC2_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC2_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC2_8822B) &lt;&lt; BIT_SHIFT_DARF_RC2_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC2_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC2_8822B) &amp; BIT_MASK_DARF_RC2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DARF_RC1_8822B 0</div><div class='del'>-#define BIT_MASK_DARF_RC1_8822B 0x1f</div><div class='del'>-#define BIT_DARF_RC1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DARF_RC1_8822B) &lt;&lt; BIT_SHIFT_DARF_RC1_8822B)</div><div class='del'>-#define BIT_GET_DARF_RC1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DARF_RC1_8822B) &amp; BIT_MASK_DARF_RC1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RARFRC_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC8_8822B (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC8_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC8_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC8_8822B) &lt;&lt; BIT_SHIFT_RARF_RC8_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC8_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC8_8822B) &amp; BIT_MASK_RARF_RC8_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC7_8822B (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC7_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC7_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC7_8822B) &lt;&lt; BIT_SHIFT_RARF_RC7_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC7_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC7_8822B) &amp; BIT_MASK_RARF_RC7_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC6_8822B (40 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC6_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC6_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC6_8822B) &lt;&lt; BIT_SHIFT_RARF_RC6_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC6_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC6_8822B) &amp; BIT_MASK_RARF_RC6_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC5_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_RARF_RC5_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC5_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC5_8822B) &lt;&lt; BIT_SHIFT_RARF_RC5_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC5_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC5_8822B) &amp; BIT_MASK_RARF_RC5_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC4_8822B 24</div><div class='del'>-#define BIT_MASK_RARF_RC4_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC4_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC4_8822B) &lt;&lt; BIT_SHIFT_RARF_RC4_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC4_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC4_8822B) &amp; BIT_MASK_RARF_RC4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC3_8822B 16</div><div class='del'>-#define BIT_MASK_RARF_RC3_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC3_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC3_8822B) &lt;&lt; BIT_SHIFT_RARF_RC3_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC3_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC3_8822B) &amp; BIT_MASK_RARF_RC3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC2_8822B 8</div><div class='del'>-#define BIT_MASK_RARF_RC2_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC2_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC2_8822B) &lt;&lt; BIT_SHIFT_RARF_RC2_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC2_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC2_8822B) &amp; BIT_MASK_RARF_RC2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RARF_RC1_8822B 0</div><div class='del'>-#define BIT_MASK_RARF_RC1_8822B 0x1f</div><div class='del'>-#define BIT_RARF_RC1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RARF_RC1_8822B) &lt;&lt; BIT_SHIFT_RARF_RC1_8822B)</div><div class='del'>-#define BIT_GET_RARF_RC1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RARF_RC1_8822B) &amp; BIT_MASK_RARF_RC1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RRSR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RRSR_RSC_8822B 21</div><div class='del'>-#define BIT_MASK_RRSR_RSC_8822B 0x3</div><div class='del'>-#define BIT_RRSR_RSC_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RRSR_RSC_8822B) &lt;&lt; BIT_SHIFT_RRSR_RSC_8822B)</div><div class='del'>-#define BIT_GET_RRSR_RSC_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RRSR_RSC_8822B) &amp; BIT_MASK_RRSR_RSC_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RRSR_BW_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RRSC_BITMAP_8822B 0</div><div class='del'>-#define BIT_MASK_RRSC_BITMAP_8822B 0xfffff</div><div class='del'>-#define BIT_RRSC_BITMAP_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RRSC_BITMAP_8822B) &lt;&lt; BIT_SHIFT_RRSC_BITMAP_8822B)</div><div class='del'>-#define BIT_GET_RRSC_BITMAP_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RRSC_BITMAP_8822B) &amp; BIT_MASK_RRSC_BITMAP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR0_V1_8822B 0</div><div class='del'>-#define BIT_MASK_ARFR0_V1_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR0_V1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ARFR0_V1_8822B) &lt;&lt; BIT_SHIFT_ARFR0_V1_8822B)</div><div class='del'>-#define BIT_GET_ARFR0_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ARFR0_V1_8822B) &amp; BIT_MASK_ARFR0_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR1_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR1_V1_8822B 0</div><div class='del'>-#define BIT_MASK_ARFR1_V1_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR1_V1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ARFR1_V1_8822B) &lt;&lt; BIT_SHIFT_ARFR1_V1_8822B)</div><div class='del'>-#define BIT_GET_ARFR1_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ARFR1_V1_8822B) &amp; BIT_MASK_ARFR1_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CCK_CHECK_8822B */</div><div class='del'>-#define BIT_CHECK_CCK_EN_8822B BIT(7)</div><div class='del'>-#define BIT_EN_BCN_PKT_REL_8822B BIT(6)</div><div class='del'>-#define BIT_BCN_PORT_SEL_8822B BIT(5)</div><div class='del'>-#define BIT_MOREDATA_BYPASS_8822B BIT(4)</div><div class='del'>-#define BIT_EN_CLR_CMD_REL_BCN_PKT_8822B BIT(3)</div><div class='del'>-#define BIT_R_EN_SET_MOREDATA_8822B BIT(2)</div><div class='del'>-#define BIT__R_DIS_CLEAR_MACID_RELEASE_8822B BIT(1)</div><div class='del'>-#define BIT__R_MACID_RELEASE_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AMPDU_MAX_TIME_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AMPDU_MAX_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_AMPDU_MAX_TIME_8822B 0xff</div><div class='del'>-#define BIT_AMPDU_MAX_TIME_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_AMPDU_MAX_TIME_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AMPDU_MAX_TIME_8822B)</div><div class='del'>-#define BIT_GET_AMPDU_MAX_TIME_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AMPDU_MAX_TIME_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_AMPDU_MAX_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNQ1_BDNY_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ1_PGBNDY_V1_8822B 0</div><div class='del'>-#define BIT_MASK_BCNQ1_PGBNDY_V1_8822B 0xfff</div><div class='del'>-#define BIT_BCNQ1_PGBNDY_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ1_PGBNDY_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCNQ1_PGBNDY_V1_8822B)</div><div class='del'>-#define BIT_GET_BCNQ1_PGBNDY_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ1_PGBNDY_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_BCNQ1_PGBNDY_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AMPDU_MAX_LENGTH_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AMPDU_MAX_LENGTH_8822B 0</div><div class='del'>-#define BIT_MASK_AMPDU_MAX_LENGTH_8822B 0xffffffffL</div><div class='del'>-#define BIT_AMPDU_MAX_LENGTH_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_AMPDU_MAX_LENGTH_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AMPDU_MAX_LENGTH_8822B)</div><div class='del'>-#define BIT_GET_AMPDU_MAX_LENGTH_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AMPDU_MAX_LENGTH_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_AMPDU_MAX_LENGTH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACQ_STOP_8822B */</div><div class='del'>-#define BIT_AC7Q_STOP_8822B BIT(7)</div><div class='del'>-#define BIT_AC6Q_STOP_8822B BIT(6)</div><div class='del'>-#define BIT_AC5Q_STOP_8822B BIT(5)</div><div class='del'>-#define BIT_AC4Q_STOP_8822B BIT(4)</div><div class='del'>-#define BIT_AC3Q_STOP_8822B BIT(3)</div><div class='del'>-#define BIT_AC2Q_STOP_8822B BIT(2)</div><div class='del'>-#define BIT_AC1Q_STOP_8822B BIT(1)</div><div class='del'>-#define BIT_AC0Q_STOP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_RATE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_NDPA_RATE_V1_8822B 0</div><div class='del'>-#define BIT_MASK_R_NDPA_RATE_V1_8822B 0xff</div><div class='del'>-#define BIT_R_NDPA_RATE_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_NDPA_RATE_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_NDPA_RATE_V1_8822B)</div><div class='del'>-#define BIT_GET_R_NDPA_RATE_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_NDPA_RATE_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_R_NDPA_RATE_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_HANG_CTRL_8822B */</div><div class='del'>-#define BIT_R_EN_GNT_BT_AWAKE_8822B BIT(3)</div><div class='del'>-#define BIT_EN_EOF_V1_8822B BIT(2)</div><div class='del'>-#define BIT_DIS_OQT_BLOCK_8822B BIT(1)</div><div class='del'>-#define BIT_SEARCH_QUEUE_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDPA_OPT_CTRL_8822B */</div><div class='del'>-#define BIT_R_DIS_MACID_RELEASE_RTY_8822B BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BW_SIGTA_8822B 3</div><div class='del'>-#define BIT_MASK_BW_SIGTA_8822B 0x3</div><div class='del'>-#define BIT_BW_SIGTA_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BW_SIGTA_8822B) &lt;&lt; BIT_SHIFT_BW_SIGTA_8822B)</div><div class='del'>-#define BIT_GET_BW_SIGTA_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BW_SIGTA_8822B) &amp; BIT_MASK_BW_SIGTA_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_BAR_SIGTA_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_NDPA_BW_8822B 0</div><div class='del'>-#define BIT_MASK_R_NDPA_BW_8822B 0x3</div><div class='del'>-#define BIT_R_NDPA_BW_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_NDPA_BW_8822B) &lt;&lt; BIT_SHIFT_R_NDPA_BW_8822B)</div><div class='del'>-#define BIT_GET_R_NDPA_BW_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_NDPA_BW_8822B) &amp; BIT_MASK_R_NDPA_BW_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_RESP_PKT_TH_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RD_RESP_PKT_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_RD_RESP_PKT_TH_V1_8822B 0x3f</div><div class='del'>-#define BIT_RD_RESP_PKT_TH_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_RD_RESP_PKT_TH_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RD_RESP_PKT_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_RD_RESP_PKT_TH_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RD_RESP_PKT_TH_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_RD_RESP_PKT_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_CMDQ_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_CMDQ_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_CMDQ_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_CMDQ_V1_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_CMDQ_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_CMDQ_V1_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_CMDQ_V1_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_CMDQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_CMDQ_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_CMDQ_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_CMDQ_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_CMDQ_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEAC_CMDQ_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_CMDQ_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_CMDQ_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_QUEUEAC_CMDQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_CMDQ_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_CMDQ_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_CMDQ_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_CMDQ_V2_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_CMDQ_V2_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_CMDQ_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_CMDQ_V2_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_CMDQ_V2_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_CMDQ_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_CMDQ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_CMDQ_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_CMDQ_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_CMDQ_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_CMDQ_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_CMDQ_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_CMDQ_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_CMDQ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q4_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q4_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q4_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q4_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q4_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q4_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q4_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q4_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q4_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q4_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q4_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q4_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q4_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q4_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q4_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q4_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q4_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q4_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q4_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q4_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q4_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q4_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q4_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q4_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q4_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q4_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q4_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q4_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q4_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q4_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q4_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q4_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q4_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q5_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q5_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q5_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q5_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q5_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q5_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q5_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q5_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q5_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q5_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q5_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q5_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q5_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q5_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q5_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q5_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q5_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q5_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q5_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q5_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q5_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q5_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q5_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q5_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q5_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q5_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q5_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q5_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q5_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q5_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q5_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q5_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q5_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q5_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q6_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q6_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q6_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q6_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q6_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q6_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q6_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q6_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q6_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q6_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q6_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q6_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q6_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q6_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q6_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q6_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q6_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q6_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q6_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q6_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q6_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q6_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q6_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q6_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q6_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q6_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q6_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q6_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q6_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q6_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q6_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q6_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q6_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q7_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEMACID_Q7_V1_8822B 25</div><div class='del'>-#define BIT_MASK_QUEUEMACID_Q7_V1_8822B 0x7f</div><div class='del'>-#define BIT_QUEUEMACID_Q7_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEMACID_Q7_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_QUEUEMACID_Q7_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEMACID_Q7_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEMACID_Q7_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_QUEUEMACID_Q7_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_QUEUEAC_Q7_V1_8822B 23</div><div class='del'>-#define BIT_MASK_QUEUEAC_Q7_V1_8822B 0x3</div><div class='del'>-#define BIT_QUEUEAC_Q7_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_QUEUEAC_Q7_V1_8822B) &lt;&lt; BIT_SHIFT_QUEUEAC_Q7_V1_8822B)</div><div class='del'>-#define BIT_GET_QUEUEAC_Q7_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_QUEUEAC_Q7_V1_8822B) &amp; BIT_MASK_QUEUEAC_Q7_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TIDEMPTY_Q7_V1_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TAIL_PKT_Q7_V2_8822B 11</div><div class='del'>-#define BIT_MASK_TAIL_PKT_Q7_V2_8822B 0x7ff</div><div class='del'>-#define BIT_TAIL_PKT_Q7_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TAIL_PKT_Q7_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TAIL_PKT_Q7_V2_8822B)</div><div class='del'>-#define BIT_GET_TAIL_PKT_Q7_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TAIL_PKT_Q7_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TAIL_PKT_Q7_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HEAD_PKT_Q7_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HEAD_PKT_Q7_V1_8822B 0x7ff</div><div class='del'>-#define BIT_HEAD_PKT_Q7_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_HEAD_PKT_Q7_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HEAD_PKT_Q7_V1_8822B)</div><div class='del'>-#define BIT_GET_HEAD_PKT_Q7_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HEAD_PKT_Q7_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_HEAD_PKT_Q7_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_LBK_BUF_HD_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_LBK_BUF_HEAD_V1_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_LBK_BUF_HEAD_V1_8822B 0xfff</div><div class='del'>-#define BIT_WMAC_LBK_BUF_HEAD_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_LBK_BUF_HEAD_V1_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_LBK_BUF_HEAD_V1_8822B)</div><div class='del'>-#define BIT_GET_WMAC_LBK_BUF_HEAD_V1_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_LBK_BUF_HEAD_V1_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_WMAC_LBK_BUF_HEAD_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_BDNY_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_PGBNDY_V1_8822B 0</div><div class='del'>-#define BIT_MASK_MGQ_PGBNDY_V1_8822B 0xfff</div><div class='del'>-#define BIT_MGQ_PGBNDY_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_PGBNDY_V1_8822B) &lt;&lt; BIT_SHIFT_MGQ_PGBNDY_V1_8822B)</div><div class='del'>-#define BIT_GET_MGQ_PGBNDY_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_PGBNDY_V1_8822B) &amp; BIT_MASK_MGQ_PGBNDY_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_TIMER_TH_8822B 24</div><div class='del'>-#define BIT_MASK_TRXRPT_TIMER_TH_8822B 0xff</div><div class='del'>-#define BIT_TRXRPT_TIMER_TH_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_TIMER_TH_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TRXRPT_TIMER_TH_8822B)</div><div class='del'>-#define BIT_GET_TRXRPT_TIMER_TH_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_TIMER_TH_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TRXRPT_TIMER_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_LEN_TH_8822B 16</div><div class='del'>-#define BIT_MASK_TRXRPT_LEN_TH_8822B 0xff</div><div class='del'>-#define BIT_TRXRPT_LEN_TH_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_LEN_TH_8822B) &lt;&lt; BIT_SHIFT_TRXRPT_LEN_TH_8822B)</div><div class='del'>-#define BIT_GET_TRXRPT_LEN_TH_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_LEN_TH_8822B) &amp; BIT_MASK_TRXRPT_LEN_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_READ_PTR_8822B 8</div><div class='del'>-#define BIT_MASK_TRXRPT_READ_PTR_8822B 0xff</div><div class='del'>-#define BIT_TRXRPT_READ_PTR_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_READ_PTR_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TRXRPT_READ_PTR_8822B)</div><div class='del'>-#define BIT_GET_TRXRPT_READ_PTR_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_READ_PTR_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TRXRPT_READ_PTR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRXRPT_WRITE_PTR_8822B 0</div><div class='del'>-#define BIT_MASK_TRXRPT_WRITE_PTR_8822B 0xff</div><div class='del'>-#define BIT_TRXRPT_WRITE_PTR_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRXRPT_WRITE_PTR_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TRXRPT_WRITE_PTR_8822B)</div><div class='del'>-#define BIT_GET_TRXRPT_WRITE_PTR_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRXRPT_WRITE_PTR_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_TRXRPT_WRITE_PTR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_INIRTS_RATE_SEL_8822B */</div><div class='del'>-#define BIT_LEAG_RTS_BW_DUP_8822B BIT(5)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BASIC_CFEND_RATE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BASIC_CFEND_RATE_8822B 0</div><div class='del'>-#define BIT_MASK_BASIC_CFEND_RATE_8822B 0x1f</div><div class='del'>-#define BIT_BASIC_CFEND_RATE_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BASIC_CFEND_RATE_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BASIC_CFEND_RATE_8822B)</div><div class='del'>-#define BIT_GET_BASIC_CFEND_RATE_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BASIC_CFEND_RATE_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BASIC_CFEND_RATE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STBC_CFEND_RATE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STBC_CFEND_RATE_8822B 0</div><div class='del'>-#define BIT_MASK_STBC_CFEND_RATE_8822B 0x1f</div><div class='del'>-#define BIT_STBC_CFEND_RATE_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_STBC_CFEND_RATE_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STBC_CFEND_RATE_8822B)</div><div class='del'>-#define BIT_GET_STBC_CFEND_RATE_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STBC_CFEND_RATE_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_STBC_CFEND_RATE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DATA_SC_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXSC_40M_8822B 4</div><div class='del'>-#define BIT_MASK_TXSC_40M_8822B 0xf</div><div class='del'>-#define BIT_TXSC_40M_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXSC_40M_8822B) &lt;&lt; BIT_SHIFT_TXSC_40M_8822B)</div><div class='del'>-#define BIT_GET_TXSC_40M_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXSC_40M_8822B) &amp; BIT_MASK_TXSC_40M_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXSC_20M_8822B 0</div><div class='del'>-#define BIT_MASK_TXSC_20M_8822B 0xf</div><div class='del'>-#define BIT_TXSC_20M_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXSC_20M_8822B) &lt;&lt; BIT_SHIFT_TXSC_20M_8822B)</div><div class='del'>-#define BIT_GET_TXSC_20M_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXSC_20M_8822B) &amp; BIT_MASK_TXSC_20M_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID127_96_PKTSLEEP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID127_96_PKTSLEEP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID127_96_PKTSLEEP_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID127_96_PKTSLEEP_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID127_96_PKTSLEEP_8822B)</div><div class='del'>-#define BIT_GET_MACID127_96_PKTSLEEP_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID127_96_PKTSLEEP_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_MACID127_96_PKTSLEEP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID63_32_PKTSLEEP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID63_32_PKTSLEEP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID63_32_PKTSLEEP_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID63_32_PKTSLEEP_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID63_32_PKTSLEEP_8822B)</div><div class='del'>-#define BIT_GET_MACID63_32_PKTSLEEP_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID63_32_PKTSLEEP_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_MACID63_32_PKTSLEEP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR2_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR2_V1_8822B 0</div><div class='del'>-#define BIT_MASK_ARFR2_V1_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR2_V1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ARFR2_V1_8822B) &lt;&lt; BIT_SHIFT_ARFR2_V1_8822B)</div><div class='del'>-#define BIT_GET_ARFR2_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ARFR2_V1_8822B) &amp; BIT_MASK_ARFR2_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR3_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR3_V1_8822B 0</div><div class='del'>-#define BIT_MASK_ARFR3_V1_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR3_V1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ARFR3_V1_8822B) &lt;&lt; BIT_SHIFT_ARFR3_V1_8822B)</div><div class='del'>-#define BIT_GET_ARFR3_V1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ARFR3_V1_8822B) &amp; BIT_MASK_ARFR3_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR4_8822B 0</div><div class='del'>-#define BIT_MASK_ARFR4_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR4_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_ARFR4_8822B) &lt;&lt; BIT_SHIFT_ARFR4_8822B)</div><div class='del'>-#define BIT_GET_ARFR4_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ARFR4_8822B) &amp; BIT_MASK_ARFR4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ARFR5_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ARFR5_8822B 0</div><div class='del'>-#define BIT_MASK_ARFR5_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_ARFR5_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_ARFR5_8822B) &lt;&lt; BIT_SHIFT_ARFR5_8822B)</div><div class='del'>-#define BIT_GET_ARFR5_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ARFR5_8822B) &amp; BIT_MASK_ARFR5_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXRPT_START_OFFSET_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_MURATE_OFFSET_8822B 24</div><div class='del'>-#define BIT_MASK_MACID_MURATE_OFFSET_8822B 0xff</div><div class='del'>-#define BIT_MACID_MURATE_OFFSET_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_MURATE_OFFSET_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID_MURATE_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_MACID_MURATE_OFFSET_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_MURATE_OFFSET_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_MACID_MURATE_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RPTFIFO_SIZE_OPT_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_CTRL_OFFSET_8822B 8</div><div class='del'>-#define BIT_MASK_MACID_CTRL_OFFSET_8822B 0xff</div><div class='del'>-#define BIT_MACID_CTRL_OFFSET_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_CTRL_OFFSET_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID_CTRL_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_MACID_CTRL_OFFSET_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_CTRL_OFFSET_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_MACID_CTRL_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AMPDU_TXRPT_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_AMPDU_TXRPT_OFFSET_8822B 0xff</div><div class='del'>-#define BIT_AMPDU_TXRPT_OFFSET_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_AMPDU_TXRPT_OFFSET_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AMPDU_TXRPT_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_AMPDU_TXRPT_OFFSET_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AMPDU_TXRPT_OFFSET_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_AMPDU_TXRPT_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWER_STAGE1_8822B */</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_CPU_MGQ_8822B BIT(31)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_BCNQ_8822B BIT(30)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_HIQ_8822B BIT(29)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_MGQ_8822B BIT(28)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_BK_8822B BIT(27)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_BE_8822B BIT(26)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_VI_8822B BIT(25)</div><div class='del'>-#define BIT_PTA_WL_PRI_MASK_VO_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_POWER_STAGE1_8822B 0</div><div class='del'>-#define BIT_MASK_POWER_STAGE1_8822B 0xffffff</div><div class='del'>-#define BIT_POWER_STAGE1_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_POWER_STAGE1_8822B) &lt;&lt; BIT_SHIFT_POWER_STAGE1_8822B)</div><div class='del'>-#define BIT_GET_POWER_STAGE1_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_POWER_STAGE1_8822B) &amp; BIT_MASK_POWER_STAGE1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_POWER_STAGE2_8822B */</div><div class='del'>-#define BIT__R_CTRL_PKT_POW_ADJ_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_POWER_STAGE2_8822B 0</div><div class='del'>-#define BIT_MASK_POWER_STAGE2_8822B 0xffffff</div><div class='del'>-#define BIT_POWER_STAGE2_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_POWER_STAGE2_8822B) &lt;&lt; BIT_SHIFT_POWER_STAGE2_8822B)</div><div class='del'>-#define BIT_GET_POWER_STAGE2_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_POWER_STAGE2_8822B) &amp; BIT_MASK_POWER_STAGE2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SW_AMPDU_BURST_MODE_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PAD_NUM_THRES_8822B 24</div><div class='del'>-#define BIT_MASK_PAD_NUM_THRES_8822B 0x3f</div><div class='del'>-#define BIT_PAD_NUM_THRES_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PAD_NUM_THRES_8822B) &lt;&lt; BIT_SHIFT_PAD_NUM_THRES_8822B)</div><div class='del'>-#define BIT_GET_PAD_NUM_THRES_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PAD_NUM_THRES_8822B) &amp; BIT_MASK_PAD_NUM_THRES_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_BK_8822B BIT(23)</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_BE_8822B BIT(22)</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_VI_8822B BIT(21)</div><div class='del'>-#define BIT_R_DMA_THIS_QUEUE_VO_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TOTAL_LEN_TH_8822B 8</div><div class='del'>-#define BIT_MASK_R_TOTAL_LEN_TH_8822B 0xfff</div><div class='del'>-#define BIT_R_TOTAL_LEN_TH_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TOTAL_LEN_TH_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_TOTAL_LEN_TH_8822B)</div><div class='del'>-#define BIT_GET_R_TOTAL_LEN_TH_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TOTAL_LEN_TH_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_R_TOTAL_LEN_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_NEW_EARLY_8822B BIT(7)</div><div class='del'>-#define BIT_PRE_TX_CMD_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NUM_SCL_EN_8822B 4</div><div class='del'>-#define BIT_MASK_NUM_SCL_EN_8822B 0x3</div><div class='del'>-#define BIT_NUM_SCL_EN_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_NUM_SCL_EN_8822B) &lt;&lt; BIT_SHIFT_NUM_SCL_EN_8822B)</div><div class='del'>-#define BIT_GET_NUM_SCL_EN_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NUM_SCL_EN_8822B) &amp; BIT_MASK_NUM_SCL_EN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BK_EN_8822B BIT(3)</div><div class='del'>-#define BIT_BE_EN_8822B BIT(2)</div><div class='del'>-#define BIT_VI_EN_8822B BIT(1)</div><div class='del'>-#define BIT_VO_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_LIFE_TIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_LIFTIME_BEBK_8822B 16</div><div class='del'>-#define BIT_MASK_PKT_LIFTIME_BEBK_8822B 0xffff</div><div class='del'>-#define BIT_PKT_LIFTIME_BEBK_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_LIFTIME_BEBK_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKT_LIFTIME_BEBK_8822B)</div><div class='del'>-#define BIT_GET_PKT_LIFTIME_BEBK_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_LIFTIME_BEBK_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_PKT_LIFTIME_BEBK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKT_LIFTIME_VOVI_8822B 0</div><div class='del'>-#define BIT_MASK_PKT_LIFTIME_VOVI_8822B 0xffff</div><div class='del'>-#define BIT_PKT_LIFTIME_VOVI_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKT_LIFTIME_VOVI_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKT_LIFTIME_VOVI_8822B)</div><div class='del'>-#define BIT_GET_PKT_LIFTIME_VOVI_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKT_LIFTIME_VOVI_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_PKT_LIFTIME_VOVI_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STBC_SETTING_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CDEND_TXTIME_L_8822B 4</div><div class='del'>-#define BIT_MASK_CDEND_TXTIME_L_8822B 0xf</div><div class='del'>-#define BIT_CDEND_TXTIME_L_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_CDEND_TXTIME_L_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CDEND_TXTIME_L_8822B)</div><div class='del'>-#define BIT_GET_CDEND_TXTIME_L_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CDEND_TXTIME_L_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_CDEND_TXTIME_L_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NESS_8822B 2</div><div class='del'>-#define BIT_MASK_NESS_8822B 0x3</div><div class='del'>-#define BIT_NESS_8822B(x) (((x) &amp; BIT_MASK_NESS_8822B) &lt;&lt; BIT_SHIFT_NESS_8822B)</div><div class='del'>-#define BIT_GET_NESS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NESS_8822B) &amp; BIT_MASK_NESS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STBC_CFEND_8822B 0</div><div class='del'>-#define BIT_MASK_STBC_CFEND_8822B 0x3</div><div class='del'>-#define BIT_STBC_CFEND_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_STBC_CFEND_8822B) &lt;&lt; BIT_SHIFT_STBC_CFEND_8822B)</div><div class='del'>-#define BIT_GET_STBC_CFEND_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STBC_CFEND_8822B) &amp; BIT_MASK_STBC_CFEND_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STBC_SETTING2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CDEND_TXTIME_H_8822B 0</div><div class='del'>-#define BIT_MASK_CDEND_TXTIME_H_8822B 0x1f</div><div class='del'>-#define BIT_CDEND_TXTIME_H_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_CDEND_TXTIME_H_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CDEND_TXTIME_H_8822B)</div><div class='del'>-#define BIT_GET_CDEND_TXTIME_H_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CDEND_TXTIME_H_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_CDEND_TXTIME_H_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_CTRL_8822B */</div><div class='del'>-#define BIT_PTA_EDCCA_EN_8822B BIT(5)</div><div class='del'>-#define BIT_PTA_WL_TX_EN_8822B BIT(4)</div><div class='del'>-#define BIT_R_USE_DATA_BW_8822B BIT(3)</div><div class='del'>-#define BIT_TRI_PKT_INT_MODE1_8822B BIT(2)</div><div class='del'>-#define BIT_TRI_PKT_INT_MODE0_8822B BIT(1)</div><div class='del'>-#define BIT_ACQ_MODE_SEL_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SINGLE_AMPDU_CTRL_8822B */</div><div class='del'>-#define BIT_EN_SINGLE_APMDU_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PROT_MODE_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTS_MAX_AGG_NUM_8822B 24</div><div class='del'>-#define BIT_MASK_RTS_MAX_AGG_NUM_8822B 0x3f</div><div class='del'>-#define BIT_RTS_MAX_AGG_NUM_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTS_MAX_AGG_NUM_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RTS_MAX_AGG_NUM_8822B)</div><div class='del'>-#define BIT_GET_RTS_MAX_AGG_NUM_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTS_MAX_AGG_NUM_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_RTS_MAX_AGG_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAX_AGG_NUM_8822B 16</div><div class='del'>-#define BIT_MASK_MAX_AGG_NUM_8822B 0x3f</div><div class='del'>-#define BIT_MAX_AGG_NUM_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_MAX_AGG_NUM_8822B) &lt;&lt; BIT_SHIFT_MAX_AGG_NUM_8822B)</div><div class='del'>-#define BIT_GET_MAX_AGG_NUM_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MAX_AGG_NUM_8822B) &amp; BIT_MASK_MAX_AGG_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTS_TXTIME_TH_8822B 8</div><div class='del'>-#define BIT_MASK_RTS_TXTIME_TH_8822B 0xff</div><div class='del'>-#define BIT_RTS_TXTIME_TH_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTS_TXTIME_TH_8822B) &lt;&lt; BIT_SHIFT_RTS_TXTIME_TH_8822B)</div><div class='del'>-#define BIT_GET_RTS_TXTIME_TH_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTS_TXTIME_TH_8822B) &amp; BIT_MASK_RTS_TXTIME_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTS_LEN_TH_8822B 0</div><div class='del'>-#define BIT_MASK_RTS_LEN_TH_8822B 0xff</div><div class='del'>-#define BIT_RTS_LEN_TH_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTS_LEN_TH_8822B) &lt;&lt; BIT_SHIFT_RTS_LEN_TH_8822B)</div><div class='del'>-#define BIT_GET_RTS_LEN_TH_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTS_LEN_TH_8822B) &amp; BIT_MASK_RTS_LEN_TH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BAR_MODE_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BAR_RTY_LMT_8822B 16</div><div class='del'>-#define BIT_MASK_BAR_RTY_LMT_8822B 0x3</div><div class='del'>-#define BIT_BAR_RTY_LMT_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BAR_RTY_LMT_8822B) &lt;&lt; BIT_SHIFT_BAR_RTY_LMT_8822B)</div><div class='del'>-#define BIT_GET_BAR_RTY_LMT_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BAR_RTY_LMT_8822B) &amp; BIT_MASK_BAR_RTY_LMT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BAR_PKT_TXTIME_TH_8822B 8</div><div class='del'>-#define BIT_MASK_BAR_PKT_TXTIME_TH_8822B 0xff</div><div class='del'>-#define BIT_BAR_PKT_TXTIME_TH_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_BAR_PKT_TXTIME_TH_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BAR_PKT_TXTIME_TH_8822B)</div><div class='del'>-#define BIT_GET_BAR_PKT_TXTIME_TH_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BAR_PKT_TXTIME_TH_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_BAR_PKT_TXTIME_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BAR_EN_V1_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BAR_PKTNUM_TH_V1_8822B 0</div><div class='del'>-#define BIT_MASK_BAR_PKTNUM_TH_V1_8822B 0x3f</div><div class='del'>-#define BIT_BAR_PKTNUM_TH_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BAR_PKTNUM_TH_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BAR_PKTNUM_TH_V1_8822B)</div><div class='del'>-#define BIT_GET_BAR_PKTNUM_TH_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BAR_PKTNUM_TH_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BAR_PKTNUM_TH_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RA_TRY_RATE_AGG_LMT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RA_TRY_RATE_AGG_LMT_V1_8822B 0</div><div class='del'>-#define BIT_MASK_RA_TRY_RATE_AGG_LMT_V1_8822B 0x3f</div><div class='del'>-#define BIT_RA_TRY_RATE_AGG_LMT_V1_8822B(x)                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RA_TRY_RATE_AGG_LMT_V1_8822B)                         \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RA_TRY_RATE_AGG_LMT_V1_8822B)</div><div class='del'>-#define BIT_GET_RA_TRY_RATE_AGG_LMT_V1_8822B(x)                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RA_TRY_RATE_AGG_LMT_V1_8822B) &amp;                     \</div><div class='del'>-	 BIT_MASK_RA_TRY_RATE_AGG_LMT_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID95_64PKTSLEEP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID95_64PKTSLEEP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID95_64PKTSLEEP_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID95_64PKTSLEEP_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID95_64PKTSLEEP_8822B)</div><div class='del'>-#define BIT_GET_MACID95_64PKTSLEEP_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID95_64PKTSLEEP_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_MACID95_64PKTSLEEP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SLEEP_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID31_0_PKTSLEEP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID31_0_PKTSLEEP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID31_0_PKTSLEEP_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID31_0_PKTSLEEP_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID31_0_PKTSLEEP_8822B)</div><div class='del'>-#define BIT_GET_MACID31_0_PKTSLEEP_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID31_0_PKTSLEEP_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_MACID31_0_PKTSLEEP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ0_8822B 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ0_8822B 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ0_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ0_8822B) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ0_8822B)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ0_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ0_8822B) &amp; BIT_MASK_HW_SSN_SEQ0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ1_8822B 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ1_8822B 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ1_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ1_8822B) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ1_8822B)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ1_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ1_8822B) &amp; BIT_MASK_HW_SSN_SEQ1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ2_8822B 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ2_8822B 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ2_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ2_8822B) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ2_8822B)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ2_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ2_8822B) &amp; BIT_MASK_HW_SSN_SEQ2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HW_SEQ3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HW_SSN_SEQ3_8822B 0</div><div class='del'>-#define BIT_MASK_HW_SSN_SEQ3_8822B 0xfff</div><div class='del'>-#define BIT_HW_SSN_SEQ3_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_HW_SSN_SEQ3_8822B) &lt;&lt; BIT_SHIFT_HW_SSN_SEQ3_8822B)</div><div class='del'>-#define BIT_GET_HW_SSN_SEQ3_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HW_SSN_SEQ3_8822B) &amp; BIT_MASK_HW_SSN_SEQ3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NULL_PKT_STATUS_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PTCL_TOTAL_PG_V2_8822B 2</div><div class='del'>-#define BIT_MASK_PTCL_TOTAL_PG_V2_8822B 0x3fff</div><div class='del'>-#define BIT_PTCL_TOTAL_PG_V2_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PTCL_TOTAL_PG_V2_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PTCL_TOTAL_PG_V2_8822B)</div><div class='del'>-#define BIT_GET_PTCL_TOTAL_PG_V2_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PTCL_TOTAL_PG_V2_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_PTCL_TOTAL_PG_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TX_NULL_1_8822B BIT(1)</div><div class='del'>-#define BIT_TX_NULL_0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTCL_ERR_STATUS_8822B */</div><div class='del'>-#define BIT_PTCL_RATE_TABLE_INVALID_8822B BIT(7)</div><div class='del'>-#define BIT_FTM_T2R_ERROR_8822B BIT(6)</div><div class='del'>-#define BIT_PTCL_ERR0_8822B BIT(5)</div><div class='del'>-#define BIT_PTCL_ERR1_8822B BIT(4)</div><div class='del'>-#define BIT_PTCL_ERR2_8822B BIT(3)</div><div class='del'>-#define BIT_PTCL_ERR3_8822B BIT(2)</div><div class='del'>-#define BIT_PTCL_ERR4_8822B BIT(1)</div><div class='del'>-#define BIT_PTCL_ERR5_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NULL_PKT_STATUS_EXTEND_8822B */</div><div class='del'>-#define BIT_CLI3_TX_NULL_1_8822B BIT(7)</div><div class='del'>-#define BIT_CLI3_TX_NULL_0_8822B BIT(6)</div><div class='del'>-#define BIT_CLI2_TX_NULL_1_8822B BIT(5)</div><div class='del'>-#define BIT_CLI2_TX_NULL_0_8822B BIT(4)</div><div class='del'>-#define BIT_CLI1_TX_NULL_1_8822B BIT(3)</div><div class='del'>-#define BIT_CLI1_TX_NULL_0_8822B BIT(2)</div><div class='del'>-#define BIT_CLI0_TX_NULL_1_8822B BIT(1)</div><div class='del'>-#define BIT_CLI0_TX_NULL_0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VIDEO_ENHANCEMENT_FUN_8822B */</div><div class='del'>-#define BIT_VIDEO_JUST_DROP_8822B BIT(1)</div><div class='del'>-#define BIT_VIDEO_ENHANCEMENT_FUN_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_POLLUTE_PKT_CNT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_POLLUTE_PKT_CNT_8822B 0</div><div class='del'>-#define BIT_MASK_BT_POLLUTE_PKT_CNT_8822B 0xffff</div><div class='del'>-#define BIT_BT_POLLUTE_PKT_CNT_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_POLLUTE_PKT_CNT_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BT_POLLUTE_PKT_CNT_8822B)</div><div class='del'>-#define BIT_GET_BT_POLLUTE_PKT_CNT_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_POLLUTE_PKT_CNT_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_BT_POLLUTE_PKT_CNT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_PTCL_DBG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PTCL_DBG_8822B 0</div><div class='del'>-#define BIT_MASK_PTCL_DBG_8822B 0xffffffffL</div><div class='del'>-#define BIT_PTCL_DBG_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PTCL_DBG_8822B) &lt;&lt; BIT_SHIFT_PTCL_DBG_8822B)</div><div class='del'>-#define BIT_GET_PTCL_DBG_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PTCL_DBG_8822B) &amp; BIT_MASK_PTCL_DBG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPUMGQ_TIMER_CTRL2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRI_HEAD_ADDR_8822B 16</div><div class='del'>-#define BIT_MASK_TRI_HEAD_ADDR_8822B 0xfff</div><div class='del'>-#define BIT_TRI_HEAD_ADDR_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRI_HEAD_ADDR_8822B) &lt;&lt; BIT_SHIFT_TRI_HEAD_ADDR_8822B)</div><div class='del'>-#define BIT_GET_TRI_HEAD_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRI_HEAD_ADDR_8822B) &amp; BIT_MASK_TRI_HEAD_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DROP_TH_EN_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DROP_TH_8822B 0</div><div class='del'>-#define BIT_MASK_DROP_TH_8822B 0xff</div><div class='del'>-#define BIT_DROP_TH_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_DROP_TH_8822B) &lt;&lt; BIT_SHIFT_DROP_TH_8822B)</div><div class='del'>-#define BIT_GET_DROP_TH_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DROP_TH_8822B) &amp; BIT_MASK_DROP_TH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUMMY_PAGE4_V1_8822B */</div><div class='del'>-#define BIT_BCN_EN_EXTHWSEQ_8822B BIT(1)</div><div class='del'>-#define BIT_BCN_EN_HWSEQ_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MOREDATA_8822B */</div><div class='del'>-#define BIT_MOREDATA_CTRL2_EN_V1_8822B BIT(3)</div><div class='del'>-#define BIT_MOREDATA_CTRL1_EN_V1_8822B BIT(2)</div><div class='del'>-#define BIT_PKTIN_MOREDATA_REPLACE_ENABLE_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q0_Q1_INFO_8822B */</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_8822B 28</div><div class='del'>-#define BIT_MASK_GTAB_ID_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_8822B) &amp; BIT_MASK_GTAB_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC1_PKT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_AC1_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC1_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC1_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC1_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC1_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC1_PKT_INFO_8822B) &amp; BIT_MASK_AC1_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_V1_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_V1_8822B 12</div><div class='del'>-#define BIT_MASK_GTAB_ID_V1_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_V1_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_V1_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_V1_8822B) &amp; BIT_MASK_GTAB_ID_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC0_PKT_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_AC0_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC0_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC0_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC0_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC0_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC0_PKT_INFO_8822B) &amp; BIT_MASK_AC0_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q2_Q3_INFO_8822B */</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_8822B 28</div><div class='del'>-#define BIT_MASK_GTAB_ID_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_8822B) &amp; BIT_MASK_GTAB_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC3_PKT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_AC3_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC3_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC3_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC3_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC3_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC3_PKT_INFO_8822B) &amp; BIT_MASK_AC3_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_V1_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_V1_8822B 12</div><div class='del'>-#define BIT_MASK_GTAB_ID_V1_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_V1_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_V1_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_V1_8822B) &amp; BIT_MASK_GTAB_ID_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC2_PKT_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_AC2_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC2_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC2_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC2_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC2_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC2_PKT_INFO_8822B) &amp; BIT_MASK_AC2_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q4_Q5_INFO_8822B */</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_8822B 28</div><div class='del'>-#define BIT_MASK_GTAB_ID_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_8822B) &amp; BIT_MASK_GTAB_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC5_PKT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_AC5_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC5_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC5_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC5_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC5_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC5_PKT_INFO_8822B) &amp; BIT_MASK_AC5_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_V1_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_V1_8822B 12</div><div class='del'>-#define BIT_MASK_GTAB_ID_V1_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_V1_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_V1_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_V1_8822B) &amp; BIT_MASK_GTAB_ID_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC4_PKT_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_AC4_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC4_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC4_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC4_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC4_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC4_PKT_INFO_8822B) &amp; BIT_MASK_AC4_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_Q6_Q7_INFO_8822B */</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_8822B 28</div><div class='del'>-#define BIT_MASK_GTAB_ID_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_8822B) &amp; BIT_MASK_GTAB_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC7_PKT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_AC7_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC7_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC7_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC7_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC7_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC7_PKT_INFO_8822B) &amp; BIT_MASK_AC7_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_QUEUE_MACID_AC_NOT_THE_SAME_V1_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_GTAB_ID_V1_8822B 12</div><div class='del'>-#define BIT_MASK_GTAB_ID_V1_8822B 0x7</div><div class='del'>-#define BIT_GTAB_ID_V1_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_GTAB_ID_V1_8822B) &lt;&lt; BIT_SHIFT_GTAB_ID_V1_8822B)</div><div class='del'>-#define BIT_GET_GTAB_ID_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_GTAB_ID_V1_8822B) &amp; BIT_MASK_GTAB_ID_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC6_PKT_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_AC6_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_AC6_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC6_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_AC6_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_AC6_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC6_PKT_INFO_8822B) &amp; BIT_MASK_AC6_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGQ_HIQ_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIQ_PKT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_HIQ_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_HIQ_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIQ_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_HIQ_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_HIQ_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIQ_PKT_INFO_8822B) &amp; BIT_MASK_HIQ_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MGQ_PKT_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_MGQ_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_MGQ_PKT_INFO_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MGQ_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_MGQ_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_MGQ_PKT_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MGQ_PKT_INFO_8822B) &amp; BIT_MASK_MGQ_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CMDQ_BCNQ_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMDQ_PKT_INFO_8822B 16</div><div class='del'>-#define BIT_MASK_CMDQ_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_CMDQ_PKT_INFO_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMDQ_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_CMDQ_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_CMDQ_PKT_INFO_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMDQ_PKT_INFO_8822B) &amp; BIT_MASK_CMDQ_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNQ_PKT_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_BCNQ_PKT_INFO_8822B 0xfff</div><div class='del'>-#define BIT_BCNQ_PKT_INFO_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNQ_PKT_INFO_8822B) &lt;&lt; BIT_SHIFT_BCNQ_PKT_INFO_8822B)</div><div class='del'>-#define BIT_GET_BCNQ_PKT_INFO_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNQ_PKT_INFO_8822B) &amp; BIT_MASK_BCNQ_PKT_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USEREG_SETTING_8822B */</div><div class='del'>-#define BIT_NDPA_USEREG_8822B BIT(21)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RETRY_USEREG_8822B 19</div><div class='del'>-#define BIT_MASK_RETRY_USEREG_8822B 0x3</div><div class='del'>-#define BIT_RETRY_USEREG_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RETRY_USEREG_8822B) &lt;&lt; BIT_SHIFT_RETRY_USEREG_8822B)</div><div class='del'>-#define BIT_GET_RETRY_USEREG_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RETRY_USEREG_8822B) &amp; BIT_MASK_RETRY_USEREG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRYPKT_USEREG_8822B 17</div><div class='del'>-#define BIT_MASK_TRYPKT_USEREG_8822B 0x3</div><div class='del'>-#define BIT_TRYPKT_USEREG_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRYPKT_USEREG_8822B) &lt;&lt; BIT_SHIFT_TRYPKT_USEREG_8822B)</div><div class='del'>-#define BIT_GET_TRYPKT_USEREG_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRYPKT_USEREG_8822B) &amp; BIT_MASK_TRYPKT_USEREG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_CTLPKT_USEREG_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AESIV_SETTING_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AESIV_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_AESIV_OFFSET_8822B 0xfff</div><div class='del'>-#define BIT_AESIV_OFFSET_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AESIV_OFFSET_8822B) &lt;&lt; BIT_SHIFT_AESIV_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_AESIV_OFFSET_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AESIV_OFFSET_8822B) &amp; BIT_MASK_AESIV_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BF0_TIME_SETTING_8822B */</div><div class='del'>-#define BIT_BF0_TIMER_SET_8822B BIT(31)</div><div class='del'>-#define BIT_BF0_TIMER_CLR_8822B BIT(30)</div><div class='del'>-#define BIT_BF0_UPDATE_EN_8822B BIT(29)</div><div class='del'>-#define BIT_BF0_TIMER_EN_8822B BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF0_PRETIME_OVER_8822B 16</div><div class='del'>-#define BIT_MASK_BF0_PRETIME_OVER_8822B 0xfff</div><div class='del'>-#define BIT_BF0_PRETIME_OVER_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF0_PRETIME_OVER_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BF0_PRETIME_OVER_8822B)</div><div class='del'>-#define BIT_GET_BF0_PRETIME_OVER_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF0_PRETIME_OVER_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BF0_PRETIME_OVER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF0_LIFETIME_8822B 0</div><div class='del'>-#define BIT_MASK_BF0_LIFETIME_8822B 0xffff</div><div class='del'>-#define BIT_BF0_LIFETIME_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF0_LIFETIME_8822B) &lt;&lt; BIT_SHIFT_BF0_LIFETIME_8822B)</div><div class='del'>-#define BIT_GET_BF0_LIFETIME_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF0_LIFETIME_8822B) &amp; BIT_MASK_BF0_LIFETIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BF1_TIME_SETTING_8822B */</div><div class='del'>-#define BIT_BF1_TIMER_SET_8822B BIT(31)</div><div class='del'>-#define BIT_BF1_TIMER_CLR_8822B BIT(30)</div><div class='del'>-#define BIT_BF1_UPDATE_EN_8822B BIT(29)</div><div class='del'>-#define BIT_BF1_TIMER_EN_8822B BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF1_PRETIME_OVER_8822B 16</div><div class='del'>-#define BIT_MASK_BF1_PRETIME_OVER_8822B 0xfff</div><div class='del'>-#define BIT_BF1_PRETIME_OVER_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF1_PRETIME_OVER_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BF1_PRETIME_OVER_8822B)</div><div class='del'>-#define BIT_GET_BF1_PRETIME_OVER_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF1_PRETIME_OVER_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BF1_PRETIME_OVER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BF1_LIFETIME_8822B 0</div><div class='del'>-#define BIT_MASK_BF1_LIFETIME_8822B 0xffff</div><div class='del'>-#define BIT_BF1_LIFETIME_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BF1_LIFETIME_8822B) &lt;&lt; BIT_SHIFT_BF1_LIFETIME_8822B)</div><div class='del'>-#define BIT_GET_BF1_LIFETIME_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BF1_LIFETIME_8822B) &amp; BIT_MASK_BF1_LIFETIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BF_TIMEOUT_EN_8822B */</div><div class='del'>-#define BIT_EN_VHT_LDPC_8822B BIT(9)</div><div class='del'>-#define BIT_EN_HT_LDPC_8822B BIT(8)</div><div class='del'>-#define BIT_BF1_TIMEOUT_EN_8822B BIT(1)</div><div class='del'>-#define BIT_BF0_TIMEOUT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID31_0_RELEASE_8822B 0</div><div class='del'>-#define BIT_MASK_MACID31_0_RELEASE_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID31_0_RELEASE_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID31_0_RELEASE_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID31_0_RELEASE_8822B)</div><div class='del'>-#define BIT_GET_MACID31_0_RELEASE_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID31_0_RELEASE_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_MACID31_0_RELEASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID63_32_RELEASE_8822B 0</div><div class='del'>-#define BIT_MASK_MACID63_32_RELEASE_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID63_32_RELEASE_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID63_32_RELEASE_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID63_32_RELEASE_8822B)</div><div class='del'>-#define BIT_GET_MACID63_32_RELEASE_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID63_32_RELEASE_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_MACID63_32_RELEASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID95_64_RELEASE_8822B 0</div><div class='del'>-#define BIT_MASK_MACID95_64_RELEASE_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID95_64_RELEASE_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID95_64_RELEASE_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID95_64_RELEASE_8822B)</div><div class='del'>-#define BIT_GET_MACID95_64_RELEASE_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID95_64_RELEASE_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_MACID95_64_RELEASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID127_96_RELEASE_8822B 0</div><div class='del'>-#define BIT_MASK_MACID127_96_RELEASE_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID127_96_RELEASE_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID127_96_RELEASE_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID127_96_RELEASE_8822B)</div><div class='del'>-#define BIT_GET_MACID127_96_RELEASE_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID127_96_RELEASE_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_MACID127_96_RELEASE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_RELEASE_SETTING_8822B */</div><div class='del'>-#define BIT_MACID_VALUE_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_MACID_OFFSET_8822B 0x7f</div><div class='del'>-#define BIT_MACID_OFFSET_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_OFFSET_8822B) &lt;&lt; BIT_SHIFT_MACID_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_MACID_OFFSET_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_OFFSET_8822B) &amp; BIT_MASK_MACID_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FAST_EDCA_VOVI_SETTING_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_FAST_EDCA_TO_8822B 24</div><div class='del'>-#define BIT_MASK_VI_FAST_EDCA_TO_8822B 0xff</div><div class='del'>-#define BIT_VI_FAST_EDCA_TO_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_FAST_EDCA_TO_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VI_FAST_EDCA_TO_8822B)</div><div class='del'>-#define BIT_GET_VI_FAST_EDCA_TO_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_FAST_EDCA_TO_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_VI_FAST_EDCA_TO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_VI_THRESHOLD_SEL_8822B BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_FAST_EDCA_PKT_TH_8822B 16</div><div class='del'>-#define BIT_MASK_VI_FAST_EDCA_PKT_TH_8822B 0x7f</div><div class='del'>-#define BIT_VI_FAST_EDCA_PKT_TH_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_FAST_EDCA_PKT_TH_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VI_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-#define BIT_GET_VI_FAST_EDCA_PKT_TH_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_FAST_EDCA_PKT_TH_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_VI_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_FAST_EDCA_TO_8822B 8</div><div class='del'>-#define BIT_MASK_VO_FAST_EDCA_TO_8822B 0xff</div><div class='del'>-#define BIT_VO_FAST_EDCA_TO_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_FAST_EDCA_TO_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VO_FAST_EDCA_TO_8822B)</div><div class='del'>-#define BIT_GET_VO_FAST_EDCA_TO_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_FAST_EDCA_TO_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_VO_FAST_EDCA_TO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_VO_THRESHOLD_SEL_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_FAST_EDCA_PKT_TH_8822B 0</div><div class='del'>-#define BIT_MASK_VO_FAST_EDCA_PKT_TH_8822B 0x7f</div><div class='del'>-#define BIT_VO_FAST_EDCA_PKT_TH_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_FAST_EDCA_PKT_TH_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VO_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-#define BIT_GET_VO_FAST_EDCA_PKT_TH_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_FAST_EDCA_PKT_TH_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_VO_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FAST_EDCA_BEBK_SETTING_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_FAST_EDCA_TO_8822B 24</div><div class='del'>-#define BIT_MASK_BK_FAST_EDCA_TO_8822B 0xff</div><div class='del'>-#define BIT_BK_FAST_EDCA_TO_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_FAST_EDCA_TO_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BK_FAST_EDCA_TO_8822B)</div><div class='del'>-#define BIT_GET_BK_FAST_EDCA_TO_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_FAST_EDCA_TO_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_BK_FAST_EDCA_TO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BK_THRESHOLD_SEL_8822B BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_FAST_EDCA_PKT_TH_8822B 16</div><div class='del'>-#define BIT_MASK_BK_FAST_EDCA_PKT_TH_8822B 0x7f</div><div class='del'>-#define BIT_BK_FAST_EDCA_PKT_TH_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_FAST_EDCA_PKT_TH_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BK_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-#define BIT_GET_BK_FAST_EDCA_PKT_TH_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_FAST_EDCA_PKT_TH_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_BK_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_FAST_EDCA_TO_8822B 8</div><div class='del'>-#define BIT_MASK_BE_FAST_EDCA_TO_8822B 0xff</div><div class='del'>-#define BIT_BE_FAST_EDCA_TO_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_FAST_EDCA_TO_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BE_FAST_EDCA_TO_8822B)</div><div class='del'>-#define BIT_GET_BE_FAST_EDCA_TO_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_FAST_EDCA_TO_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_BE_FAST_EDCA_TO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BE_THRESHOLD_SEL_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_FAST_EDCA_PKT_TH_8822B 0</div><div class='del'>-#define BIT_MASK_BE_FAST_EDCA_PKT_TH_8822B 0x7f</div><div class='del'>-#define BIT_BE_FAST_EDCA_PKT_TH_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_FAST_EDCA_PKT_TH_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BE_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-#define BIT_GET_BE_FAST_EDCA_PKT_TH_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_FAST_EDCA_PKT_TH_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_BE_FAST_EDCA_PKT_TH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID31_0_DROP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID31_0_DROP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID31_0_DROP_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID31_0_DROP_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID31_0_DROP_8822B)</div><div class='del'>-#define BIT_GET_MACID31_0_DROP_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID31_0_DROP_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_MACID31_0_DROP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID63_32_DROP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID63_32_DROP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID63_32_DROP_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID63_32_DROP_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID63_32_DROP_8822B)</div><div class='del'>-#define BIT_GET_MACID63_32_DROP_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID63_32_DROP_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_MACID63_32_DROP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID95_64_DROP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID95_64_DROP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID95_64_DROP_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID95_64_DROP_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID95_64_DROP_8822B)</div><div class='del'>-#define BIT_GET_MACID95_64_DROP_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID95_64_DROP_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_MACID95_64_DROP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_DROP3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID127_96_DROP_8822B 0</div><div class='del'>-#define BIT_MASK_MACID127_96_DROP_8822B 0xffffffffL</div><div class='del'>-#define BIT_MACID127_96_DROP_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID127_96_DROP_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID127_96_DROP_8822B)</div><div class='del'>-#define BIT_GET_MACID127_96_DROP_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID127_96_DROP_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_MACID127_96_DROP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_0_8822B 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_0_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_0_8822B(x)                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_0_8822B)                      \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_0_8822B)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_0_8822B(x)                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_0_8822B) &amp;                  \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_1_8822B 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_1_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_1_8822B(x)                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_1_8822B)                      \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_1_8822B)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_1_8822B(x)                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_1_8822B) &amp;                  \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_2_8822B 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_2_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_2_8822B(x)                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_2_8822B)                      \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_2_8822B)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_2_8822B(x)                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_2_8822B) &amp;                  \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_3_8822B 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_3_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_3_8822B(x)                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_3_8822B)                      \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_3_8822B)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_3_8822B(x)                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_3_8822B) &amp;                  \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGG_FIFO_CRTL_8822B */</div><div class='del'>-#define BIT_R_MGG_FIFO_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_PG_SIZE_8822B 28</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_PG_SIZE_8822B 0x7</div><div class='del'>-#define BIT_R_MGG_FIFO_PG_SIZE_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_PG_SIZE_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_PG_SIZE_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_PG_SIZE_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_PG_SIZE_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_PG_SIZE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_START_PG_8822B 16</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_START_PG_8822B 0xfff</div><div class='del'>-#define BIT_R_MGG_FIFO_START_PG_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_START_PG_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_START_PG_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_START_PG_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_START_PG_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_START_PG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_SIZE_8822B 14</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_SIZE_8822B 0x3</div><div class='del'>-#define BIT_R_MGG_FIFO_SIZE_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_SIZE_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_SIZE_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_SIZE_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_SIZE_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_SIZE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_MGG_FIFO_PAUSE_8822B BIT(13)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_RPTR_8822B 8</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_RPTR_8822B 0x1f</div><div class='del'>-#define BIT_R_MGG_FIFO_RPTR_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_RPTR_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_RPTR_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_RPTR_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_RPTR_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_RPTR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_MGG_FIFO_OV_8822B BIT(7)</div><div class='del'>-#define BIT_R_MGG_FIFO_WPTR_ERROR_8822B BIT(6)</div><div class='del'>-#define BIT_R_EN_CPU_LIFETIME_8822B BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_WPTR_8822B 0</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_WPTR_8822B 0x1f</div><div class='del'>-#define BIT_R_MGG_FIFO_WPTR_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_WPTR_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_WPTR_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_WPTR_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_WPTR_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_WPTR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGG_FIFO_INT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_INT_FLAG_8822B 16</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_INT_FLAG_8822B 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_INT_FLAG_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_INT_FLAG_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_INT_FLAG_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_INT_FLAG_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_INT_FLAG_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_INT_FLAG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_INT_MASK_8822B 0</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_INT_MASK_8822B 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_INT_MASK_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_INT_MASK_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_INT_MASK_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_INT_MASK_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_INT_MASK_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_INT_MASK_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MGG_FIFO_LIFETIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_LIFETIME_8822B 16</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_LIFETIME_8822B 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_LIFETIME_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_LIFETIME_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_LIFETIME_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_LIFETIME_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_LIFETIME_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_LIFETIME_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MGG_FIFO_VALID_MAP_8822B 0</div><div class='del'>-#define BIT_MASK_R_MGG_FIFO_VALID_MAP_8822B 0xffff</div><div class='del'>-#define BIT_R_MGG_FIFO_VALID_MAP_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MGG_FIFO_VALID_MAP_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MGG_FIFO_VALID_MAP_8822B)</div><div class='del'>-#define BIT_GET_R_MGG_FIFO_VALID_MAP_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MGG_FIFO_VALID_MAP_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_R_MGG_FIFO_VALID_MAP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B 0x7f</div><div class='del'>-#define BIT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B(x)                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B)           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B(x)                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B) &amp;       \</div><div class='del'>-	 BIT_MASK_R_MACID_RELEASE_SUCCESS_CLEAR_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_SHCUT_OFFSET_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_SHCUT_OFFSET_V1_8822B 0</div><div class='del'>-#define BIT_MASK_MACID_SHCUT_OFFSET_V1_8822B 0xff</div><div class='del'>-#define BIT_MACID_SHCUT_OFFSET_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_SHCUT_OFFSET_V1_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MACID_SHCUT_OFFSET_V1_8822B)</div><div class='del'>-#define BIT_GET_MACID_SHCUT_OFFSET_V1_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_SHCUT_OFFSET_V1_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_MACID_SHCUT_OFFSET_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MU_TX_CTL_8822B */</div><div class='del'>-#define BIT_R_EN_REVERS_GTAB_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_TABLE_VALID_8822B 0</div><div class='del'>-#define BIT_MASK_R_MU_TABLE_VALID_8822B 0x3f</div><div class='del'>-#define BIT_R_MU_TABLE_VALID_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_TABLE_VALID_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MU_TABLE_VALID_8822B)</div><div class='del'>-#define BIT_GET_R_MU_TABLE_VALID_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_TABLE_VALID_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_R_MU_TABLE_VALID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MU_STA_GID_VLD_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_STA_GTAB_VALID_8822B 0</div><div class='del'>-#define BIT_MASK_R_MU_STA_GTAB_VALID_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MU_STA_GTAB_VALID_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_STA_GTAB_VALID_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MU_STA_GTAB_VALID_8822B)</div><div class='del'>-#define BIT_GET_R_MU_STA_GTAB_VALID_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_STA_GTAB_VALID_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MU_STA_GTAB_VALID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_STA_GTAB_VALID_8822B 0</div><div class='del'>-#define BIT_MASK_R_MU_STA_GTAB_VALID_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MU_STA_GTAB_VALID_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_STA_GTAB_VALID_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MU_STA_GTAB_VALID_8822B)</div><div class='del'>-#define BIT_GET_R_MU_STA_GTAB_VALID_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_STA_GTAB_VALID_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_MU_STA_GTAB_VALID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MU_STA_USER_POS_INFO_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_STA_GTAB_POSITION_8822B 0</div><div class='del'>-#define BIT_MASK_R_MU_STA_GTAB_POSITION_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_R_MU_STA_GTAB_POSITION_8822B(x)                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_STA_GTAB_POSITION_8822B)                         \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MU_STA_GTAB_POSITION_8822B)</div><div class='del'>-#define BIT_GET_R_MU_STA_GTAB_POSITION_8822B(x)                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_STA_GTAB_POSITION_8822B) &amp;                     \</div><div class='del'>-	 BIT_MASK_R_MU_STA_GTAB_POSITION_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MU_STA_GTAB_POSITION_8822B 0</div><div class='del'>-#define BIT_MASK_R_MU_STA_GTAB_POSITION_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_R_MU_STA_GTAB_POSITION_8822B(x)                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MU_STA_GTAB_POSITION_8822B)                         \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MU_STA_GTAB_POSITION_8822B)</div><div class='del'>-#define BIT_GET_R_MU_STA_GTAB_POSITION_8822B(x)                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MU_STA_GTAB_POSITION_8822B) &amp;                     \</div><div class='del'>-	 BIT_MASK_R_MU_STA_GTAB_POSITION_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MU_TRX_DBG_CNT_8822B */</div><div class='del'>-#define BIT_MU_DNGCNT_RST_8822B BIT(20)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MU_DBGCNT_SEL_8822B 16</div><div class='del'>-#define BIT_MASK_MU_DBGCNT_SEL_8822B 0xf</div><div class='del'>-#define BIT_MU_DBGCNT_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MU_DBGCNT_SEL_8822B) &lt;&lt; BIT_SHIFT_MU_DBGCNT_SEL_8822B)</div><div class='del'>-#define BIT_GET_MU_DBGCNT_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MU_DBGCNT_SEL_8822B) &amp; BIT_MASK_MU_DBGCNT_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MU_DNGCNT_8822B 0</div><div class='del'>-#define BIT_MASK_MU_DNGCNT_8822B 0xffff</div><div class='del'>-#define BIT_MU_DNGCNT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_MU_DNGCNT_8822B) &lt;&lt; BIT_SHIFT_MU_DNGCNT_8822B)</div><div class='del'>-#define BIT_GET_MU_DNGCNT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MU_DNGCNT_8822B) &amp; BIT_MASK_MU_DNGCNT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_VO_PARAM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOPLIMIT_8822B 16</div><div class='del'>-#define BIT_MASK_TXOPLIMIT_8822B 0x7ff</div><div class='del'>-#define BIT_TXOPLIMIT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXOPLIMIT_8822B) &lt;&lt; BIT_SHIFT_TXOPLIMIT_8822B)</div><div class='del'>-#define BIT_GET_TXOPLIMIT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXOPLIMIT_8822B) &amp; BIT_MASK_TXOPLIMIT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CW_8822B 8</div><div class='del'>-#define BIT_MASK_CW_8822B 0xff</div><div class='del'>-#define BIT_CW_8822B(x) (((x) &amp; BIT_MASK_CW_8822B) &lt;&lt; BIT_SHIFT_CW_8822B)</div><div class='del'>-#define BIT_GET_CW_8822B(x) (((x) &gt;&gt; BIT_SHIFT_CW_8822B) &amp; BIT_MASK_CW_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AIFS_8822B 0</div><div class='del'>-#define BIT_MASK_AIFS_8822B 0xff</div><div class='del'>-#define BIT_AIFS_8822B(x) (((x) &amp; BIT_MASK_AIFS_8822B) &lt;&lt; BIT_SHIFT_AIFS_8822B)</div><div class='del'>-#define BIT_GET_AIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AIFS_8822B) &amp; BIT_MASK_AIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_VI_PARAM_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOPLIMIT_8822B 16</div><div class='del'>-#define BIT_MASK_TXOPLIMIT_8822B 0x7ff</div><div class='del'>-#define BIT_TXOPLIMIT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXOPLIMIT_8822B) &lt;&lt; BIT_SHIFT_TXOPLIMIT_8822B)</div><div class='del'>-#define BIT_GET_TXOPLIMIT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXOPLIMIT_8822B) &amp; BIT_MASK_TXOPLIMIT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CW_8822B 8</div><div class='del'>-#define BIT_MASK_CW_8822B 0xff</div><div class='del'>-#define BIT_CW_8822B(x) (((x) &amp; BIT_MASK_CW_8822B) &lt;&lt; BIT_SHIFT_CW_8822B)</div><div class='del'>-#define BIT_GET_CW_8822B(x) (((x) &gt;&gt; BIT_SHIFT_CW_8822B) &amp; BIT_MASK_CW_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AIFS_8822B 0</div><div class='del'>-#define BIT_MASK_AIFS_8822B 0xff</div><div class='del'>-#define BIT_AIFS_8822B(x) (((x) &amp; BIT_MASK_AIFS_8822B) &lt;&lt; BIT_SHIFT_AIFS_8822B)</div><div class='del'>-#define BIT_GET_AIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AIFS_8822B) &amp; BIT_MASK_AIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_BE_PARAM_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOPLIMIT_8822B 16</div><div class='del'>-#define BIT_MASK_TXOPLIMIT_8822B 0x7ff</div><div class='del'>-#define BIT_TXOPLIMIT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXOPLIMIT_8822B) &lt;&lt; BIT_SHIFT_TXOPLIMIT_8822B)</div><div class='del'>-#define BIT_GET_TXOPLIMIT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXOPLIMIT_8822B) &amp; BIT_MASK_TXOPLIMIT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CW_8822B 8</div><div class='del'>-#define BIT_MASK_CW_8822B 0xff</div><div class='del'>-#define BIT_CW_8822B(x) (((x) &amp; BIT_MASK_CW_8822B) &lt;&lt; BIT_SHIFT_CW_8822B)</div><div class='del'>-#define BIT_GET_CW_8822B(x) (((x) &gt;&gt; BIT_SHIFT_CW_8822B) &amp; BIT_MASK_CW_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AIFS_8822B 0</div><div class='del'>-#define BIT_MASK_AIFS_8822B 0xff</div><div class='del'>-#define BIT_AIFS_8822B(x) (((x) &amp; BIT_MASK_AIFS_8822B) &lt;&lt; BIT_SHIFT_AIFS_8822B)</div><div class='del'>-#define BIT_GET_AIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AIFS_8822B) &amp; BIT_MASK_AIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_BK_PARAM_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOPLIMIT_8822B 16</div><div class='del'>-#define BIT_MASK_TXOPLIMIT_8822B 0x7ff</div><div class='del'>-#define BIT_TXOPLIMIT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXOPLIMIT_8822B) &lt;&lt; BIT_SHIFT_TXOPLIMIT_8822B)</div><div class='del'>-#define BIT_GET_TXOPLIMIT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXOPLIMIT_8822B) &amp; BIT_MASK_TXOPLIMIT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CW_8822B 8</div><div class='del'>-#define BIT_MASK_CW_8822B 0xff</div><div class='del'>-#define BIT_CW_8822B(x) (((x) &amp; BIT_MASK_CW_8822B) &lt;&lt; BIT_SHIFT_CW_8822B)</div><div class='del'>-#define BIT_GET_CW_8822B(x) (((x) &gt;&gt; BIT_SHIFT_CW_8822B) &amp; BIT_MASK_CW_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AIFS_8822B 0</div><div class='del'>-#define BIT_MASK_AIFS_8822B 0xff</div><div class='del'>-#define BIT_AIFS_8822B(x) (((x) &amp; BIT_MASK_AIFS_8822B) &lt;&lt; BIT_SHIFT_AIFS_8822B)</div><div class='del'>-#define BIT_GET_AIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AIFS_8822B) &amp; BIT_MASK_AIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNTCFG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNCW_MAX_8822B 12</div><div class='del'>-#define BIT_MASK_BCNCW_MAX_8822B 0xf</div><div class='del'>-#define BIT_BCNCW_MAX_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNCW_MAX_8822B) &lt;&lt; BIT_SHIFT_BCNCW_MAX_8822B)</div><div class='del'>-#define BIT_GET_BCNCW_MAX_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNCW_MAX_8822B) &amp; BIT_MASK_BCNCW_MAX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNCW_MIN_8822B 8</div><div class='del'>-#define BIT_MASK_BCNCW_MIN_8822B 0xf</div><div class='del'>-#define BIT_BCNCW_MIN_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNCW_MIN_8822B) &lt;&lt; BIT_SHIFT_BCNCW_MIN_8822B)</div><div class='del'>-#define BIT_GET_BCNCW_MIN_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNCW_MIN_8822B) &amp; BIT_MASK_BCNCW_MIN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNIFS_8822B 0</div><div class='del'>-#define BIT_MASK_BCNIFS_8822B 0xff</div><div class='del'>-#define BIT_BCNIFS_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNIFS_8822B) &lt;&lt; BIT_SHIFT_BCNIFS_8822B)</div><div class='del'>-#define BIT_GET_BCNIFS_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNIFS_8822B) &amp; BIT_MASK_BCNIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PIFS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PIFS_8822B 0</div><div class='del'>-#define BIT_MASK_PIFS_8822B 0xff</div><div class='del'>-#define BIT_PIFS_8822B(x) (((x) &amp; BIT_MASK_PIFS_8822B) &lt;&lt; BIT_SHIFT_PIFS_8822B)</div><div class='del'>-#define BIT_GET_PIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PIFS_8822B) &amp; BIT_MASK_PIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RDG_PIFS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RDG_PIFS_8822B 0</div><div class='del'>-#define BIT_MASK_RDG_PIFS_8822B 0xff</div><div class='del'>-#define BIT_RDG_PIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RDG_PIFS_8822B) &lt;&lt; BIT_SHIFT_RDG_PIFS_8822B)</div><div class='del'>-#define BIT_GET_RDG_PIFS_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RDG_PIFS_8822B) &amp; BIT_MASK_RDG_PIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SIFS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_OFDM_TRX_8822B 24</div><div class='del'>-#define BIT_MASK_SIFS_OFDM_TRX_8822B 0xff</div><div class='del'>-#define BIT_SIFS_OFDM_TRX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_OFDM_TRX_8822B) &lt;&lt; BIT_SHIFT_SIFS_OFDM_TRX_8822B)</div><div class='del'>-#define BIT_GET_SIFS_OFDM_TRX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_OFDM_TRX_8822B) &amp; BIT_MASK_SIFS_OFDM_TRX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_CCK_TRX_8822B 16</div><div class='del'>-#define BIT_MASK_SIFS_CCK_TRX_8822B 0xff</div><div class='del'>-#define BIT_SIFS_CCK_TRX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_CCK_TRX_8822B) &lt;&lt; BIT_SHIFT_SIFS_CCK_TRX_8822B)</div><div class='del'>-#define BIT_GET_SIFS_CCK_TRX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_CCK_TRX_8822B) &amp; BIT_MASK_SIFS_CCK_TRX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_OFDM_CTX_8822B 8</div><div class='del'>-#define BIT_MASK_SIFS_OFDM_CTX_8822B 0xff</div><div class='del'>-#define BIT_SIFS_OFDM_CTX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_OFDM_CTX_8822B) &lt;&lt; BIT_SHIFT_SIFS_OFDM_CTX_8822B)</div><div class='del'>-#define BIT_GET_SIFS_OFDM_CTX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_OFDM_CTX_8822B) &amp; BIT_MASK_SIFS_OFDM_CTX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_CCK_CTX_8822B 0</div><div class='del'>-#define BIT_MASK_SIFS_CCK_CTX_8822B 0xff</div><div class='del'>-#define BIT_SIFS_CCK_CTX_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_CCK_CTX_8822B) &lt;&lt; BIT_SHIFT_SIFS_CCK_CTX_8822B)</div><div class='del'>-#define BIT_GET_SIFS_CCK_CTX_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_CCK_CTX_8822B) &amp; BIT_MASK_SIFS_CCK_CTX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTR_SYN_OFFSET_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFTR_SNC_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_TSFTR_SNC_OFFSET_8822B 0xffff</div><div class='del'>-#define BIT_TSFTR_SNC_OFFSET_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFTR_SNC_OFFSET_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TSFTR_SNC_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_TSFTR_SNC_OFFSET_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFTR_SNC_OFFSET_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_TSFTR_SNC_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_AGGR_BREAK_TIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AGGR_BK_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_AGGR_BK_TIME_8822B 0xff</div><div class='del'>-#define BIT_AGGR_BK_TIME_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_AGGR_BK_TIME_8822B) &lt;&lt; BIT_SHIFT_AGGR_BK_TIME_8822B)</div><div class='del'>-#define BIT_GET_AGGR_BK_TIME_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AGGR_BK_TIME_8822B) &amp; BIT_MASK_AGGR_BK_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SLOT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SLOT_8822B 0</div><div class='del'>-#define BIT_MASK_SLOT_8822B 0xff</div><div class='del'>-#define BIT_SLOT_8822B(x) (((x) &amp; BIT_MASK_SLOT_8822B) &lt;&lt; BIT_SHIFT_SLOT_8822B)</div><div class='del'>-#define BIT_GET_SLOT_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SLOT_8822B) &amp; BIT_MASK_SLOT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_PTCL_CTRL_8822B */</div><div class='del'>-#define BIT_DIS_EDCCA_8822B BIT(15)</div><div class='del'>-#define BIT_DIS_CCA_8822B BIT(14)</div><div class='del'>-#define BIT_LSIG_TXOP_TXCMD_NAV_8822B BIT(13)</div><div class='del'>-#define BIT_SIFS_BK_EN_8822B BIT(12)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXQ_NAV_MSK_8822B 8</div><div class='del'>-#define BIT_MASK_TXQ_NAV_MSK_8822B 0xf</div><div class='del'>-#define BIT_TXQ_NAV_MSK_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXQ_NAV_MSK_8822B) &lt;&lt; BIT_SHIFT_TXQ_NAV_MSK_8822B)</div><div class='del'>-#define BIT_GET_TXQ_NAV_MSK_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXQ_NAV_MSK_8822B) &amp; BIT_MASK_TXQ_NAV_MSK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DIS_CW_8822B BIT(7)</div><div class='del'>-#define BIT_NAV_END_TXOP_8822B BIT(6)</div><div class='del'>-#define BIT_RDG_END_TXOP_8822B BIT(5)</div><div class='del'>-#define BIT_AC_INBCN_HOLD_8822B BIT(4)</div><div class='del'>-#define BIT_MGTQ_TXOP_EN_8822B BIT(3)</div><div class='del'>-#define BIT_MGTQ_RTSMF_EN_8822B BIT(2)</div><div class='del'>-#define BIT_HIQ_RTSMF_EN_8822B BIT(1)</div><div class='del'>-#define BIT_BCN_RTSMF_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXPAUSE_8822B */</div><div class='del'>-#define BIT_STOP_BCN_HI_MGT_8822B BIT(7)</div><div class='del'>-#define BIT_MAC_STOPBCNQ_8822B BIT(6)</div><div class='del'>-#define BIT_MAC_STOPHIQ_8822B BIT(5)</div><div class='del'>-#define BIT_MAC_STOPMGQ_8822B BIT(4)</div><div class='del'>-#define BIT_MAC_STOPBK_8822B BIT(3)</div><div class='del'>-#define BIT_MAC_STOPBE_8822B BIT(2)</div><div class='del'>-#define BIT_MAC_STOPVI_8822B BIT(1)</div><div class='del'>-#define BIT_MAC_STOPVO_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DIS_TXREQ_CLR_8822B */</div><div class='del'>-#define BIT_DIS_BT_CCA_8822B BIT(7)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_HI_8822B BIT(5)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_MGQ_8822B BIT(4)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_VO_8822B BIT(3)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_VI_8822B BIT(2)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_BE_8822B BIT(1)</div><div class='del'>-#define BIT_DIS_TXREQ_CLR_BK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_CTRL_8822B */</div><div class='del'>-#define BIT_EN_CLR_TXREQ_INCCA_8822B BIT(15)</div><div class='del'>-#define BIT_DIS_TX_OVER_BCNQ_8822B BIT(14)</div><div class='del'>-#define BIT_EN_BCNERR_INCCCA_8822B BIT(13)</div><div class='del'>-#define BIT_EDCCA_MSK_CNTDOWN_EN_8822B BIT(11)</div><div class='del'>-#define BIT_DIS_TXOP_CFE_8822B BIT(10)</div><div class='del'>-#define BIT_DIS_LSIG_CFE_8822B BIT(9)</div><div class='del'>-#define BIT_DIS_STBC_CFE_8822B BIT(8)</div><div class='del'>-#define BIT_BKQ_RD_INIT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_BEQ_RD_INIT_EN_8822B BIT(6)</div><div class='del'>-#define BIT_VIQ_RD_INIT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_VOQ_RD_INIT_EN_8822B BIT(4)</div><div class='del'>-#define BIT_BKQ_RD_RESP_EN_8822B BIT(3)</div><div class='del'>-#define BIT_BEQ_RD_RESP_EN_8822B BIT(2)</div><div class='del'>-#define BIT_VIQ_RD_RESP_EN_8822B BIT(1)</div><div class='del'>-#define BIT_VOQ_RD_RESP_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_CTRL_8822B */</div><div class='del'>-#define BIT_MBID_BCNQ7_EN_8822B BIT(7)</div><div class='del'>-#define BIT_MBID_BCNQ6_EN_8822B BIT(6)</div><div class='del'>-#define BIT_MBID_BCNQ5_EN_8822B BIT(5)</div><div class='del'>-#define BIT_MBID_BCNQ4_EN_8822B BIT(4)</div><div class='del'>-#define BIT_MBID_BCNQ3_EN_8822B BIT(3)</div><div class='del'>-#define BIT_MBID_BCNQ2_EN_8822B BIT(2)</div><div class='del'>-#define BIT_MBID_BCNQ1_EN_8822B BIT(1)</div><div class='del'>-#define BIT_MBID_BCNQ0_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_CTRL_8822B */</div><div class='del'>-#define BIT_P2P_CTW_ALLSTASLEEP_8822B BIT(7)</div><div class='del'>-#define BIT_P2P_OFF_DISTX_EN_8822B BIT(6)</div><div class='del'>-#define BIT_PWR_MGT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_P2P_NOA1_EN_8822B BIT(2)</div><div class='del'>-#define BIT_P2P_NOA0_EN_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PKT_LIFETIME_CTRL_8822B */</div><div class='del'>-#define BIT_EN_P2P_CTWND1_8822B BIT(23)</div><div class='del'>-#define BIT_EN_BKF_CLR_TXREQ_8822B BIT(22)</div><div class='del'>-#define BIT_EN_TSFBIT32_RST_P2P_8822B BIT(21)</div><div class='del'>-#define BIT_EN_BCN_TX_BTCCA_8822B BIT(20)</div><div class='del'>-#define BIT_DIS_PKT_TX_ATIM_8822B BIT(19)</div><div class='del'>-#define BIT_DIS_BCN_DIS_CTN_8822B BIT(18)</div><div class='del'>-#define BIT_EN_NAVEND_RST_TXOP_8822B BIT(17)</div><div class='del'>-#define BIT_EN_FILTER_CCA_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CCA_FILTER_THRS_8822B 8</div><div class='del'>-#define BIT_MASK_CCA_FILTER_THRS_8822B 0xff</div><div class='del'>-#define BIT_CCA_FILTER_THRS_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CCA_FILTER_THRS_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CCA_FILTER_THRS_8822B)</div><div class='del'>-#define BIT_GET_CCA_FILTER_THRS_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CCA_FILTER_THRS_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CCA_FILTER_THRS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EDCCA_THRS_8822B 0</div><div class='del'>-#define BIT_MASK_EDCCA_THRS_8822B 0xff</div><div class='del'>-#define BIT_EDCCA_THRS_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_EDCCA_THRS_8822B) &lt;&lt; BIT_SHIFT_EDCCA_THRS_8822B)</div><div class='del'>-#define BIT_GET_EDCCA_THRS_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EDCCA_THRS_8822B) &amp; BIT_MASK_EDCCA_THRS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_SPEC_STATE_8822B */</div><div class='del'>-#define BIT_SPEC_POWER_STATE_8822B BIT(7)</div><div class='del'>-#define BIT_SPEC_CTWINDOW_ON_8822B BIT(6)</div><div class='del'>-#define BIT_SPEC_BEACON_AREA_ON_8822B BIT(5)</div><div class='del'>-#define BIT_SPEC_CTWIN_EARLY_DISTX_8822B BIT(4)</div><div class='del'>-#define BIT_SPEC_NOA1_OFF_PERIOD_8822B BIT(3)</div><div class='del'>-#define BIT_SPEC_FORCE_DOZE1_8822B BIT(2)</div><div class='del'>-#define BIT_SPEC_NOA0_OFF_PERIOD_8822B BIT(1)</div><div class='del'>-#define BIT_SPEC_FORCE_DOZE0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BAR_TX_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_P2PON_DIS_TXTIME_8822B 0</div><div class='del'>-#define BIT_MASK_P2PON_DIS_TXTIME_8822B 0xff</div><div class='del'>-#define BIT_P2PON_DIS_TXTIME_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_P2PON_DIS_TXTIME_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_P2PON_DIS_TXTIME_8822B)</div><div class='del'>-#define BIT_GET_P2PON_DIS_TXTIME_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_P2PON_DIS_TXTIME_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_P2PON_DIS_TXTIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_THR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_QUEUE_THR_8822B 24</div><div class='del'>-#define BIT_MASK_BK_QUEUE_THR_8822B 0xff</div><div class='del'>-#define BIT_BK_QUEUE_THR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_QUEUE_THR_8822B) &lt;&lt; BIT_SHIFT_BK_QUEUE_THR_8822B)</div><div class='del'>-#define BIT_GET_BK_QUEUE_THR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_QUEUE_THR_8822B) &amp; BIT_MASK_BK_QUEUE_THR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_QUEUE_THR_8822B 16</div><div class='del'>-#define BIT_MASK_BE_QUEUE_THR_8822B 0xff</div><div class='del'>-#define BIT_BE_QUEUE_THR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_QUEUE_THR_8822B) &lt;&lt; BIT_SHIFT_BE_QUEUE_THR_8822B)</div><div class='del'>-#define BIT_GET_BE_QUEUE_THR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_QUEUE_THR_8822B) &amp; BIT_MASK_BE_QUEUE_THR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_QUEUE_THR_8822B 8</div><div class='del'>-#define BIT_MASK_VI_QUEUE_THR_8822B 0xff</div><div class='del'>-#define BIT_VI_QUEUE_THR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_QUEUE_THR_8822B) &lt;&lt; BIT_SHIFT_VI_QUEUE_THR_8822B)</div><div class='del'>-#define BIT_GET_VI_QUEUE_THR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_QUEUE_THR_8822B) &amp; BIT_MASK_VI_QUEUE_THR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_QUEUE_THR_8822B 0</div><div class='del'>-#define BIT_MASK_VO_QUEUE_THR_8822B 0xff</div><div class='del'>-#define BIT_VO_QUEUE_THR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_QUEUE_THR_8822B) &lt;&lt; BIT_SHIFT_VO_QUEUE_THR_8822B)</div><div class='del'>-#define BIT_GET_VO_QUEUE_THR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_QUEUE_THR_8822B) &amp; BIT_MASK_VO_QUEUE_THR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_QUEUE_INCOL_EN_8822B */</div><div class='del'>-#define BIT_QUEUE_INCOL_EN_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_TRIGGER_NUM_8822B 12</div><div class='del'>-#define BIT_MASK_BE_TRIGGER_NUM_8822B 0xf</div><div class='del'>-#define BIT_BE_TRIGGER_NUM_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_TRIGGER_NUM_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BE_TRIGGER_NUM_8822B)</div><div class='del'>-#define BIT_GET_BE_TRIGGER_NUM_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_TRIGGER_NUM_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_BE_TRIGGER_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BK_TRIGGER_NUM_8822B 8</div><div class='del'>-#define BIT_MASK_BK_TRIGGER_NUM_8822B 0xf</div><div class='del'>-#define BIT_BK_TRIGGER_NUM_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BK_TRIGGER_NUM_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BK_TRIGGER_NUM_8822B)</div><div class='del'>-#define BIT_GET_BK_TRIGGER_NUM_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BK_TRIGGER_NUM_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_BK_TRIGGER_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_TRIGGER_NUM_8822B 4</div><div class='del'>-#define BIT_MASK_VI_TRIGGER_NUM_8822B 0xf</div><div class='del'>-#define BIT_VI_TRIGGER_NUM_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_TRIGGER_NUM_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VI_TRIGGER_NUM_8822B)</div><div class='del'>-#define BIT_GET_VI_TRIGGER_NUM_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_TRIGGER_NUM_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_VI_TRIGGER_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_TRIGGER_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_VO_TRIGGER_NUM_8822B 0xf</div><div class='del'>-#define BIT_VO_TRIGGER_NUM_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_TRIGGER_NUM_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VO_TRIGGER_NUM_8822B)</div><div class='del'>-#define BIT_GET_VO_TRIGGER_NUM_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_TRIGGER_NUM_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_VO_TRIGGER_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_PROHIBIT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_HOLD_TIME_AP_8822B 8</div><div class='del'>-#define BIT_MASK_TBTT_HOLD_TIME_AP_8822B 0xfff</div><div class='del'>-#define BIT_TBTT_HOLD_TIME_AP_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_HOLD_TIME_AP_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TBTT_HOLD_TIME_AP_8822B)</div><div class='del'>-#define BIT_GET_TBTT_HOLD_TIME_AP_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_HOLD_TIME_AP_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_TBTT_HOLD_TIME_AP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_PROHIBIT_SETUP_8822B 0</div><div class='del'>-#define BIT_MASK_TBTT_PROHIBIT_SETUP_8822B 0xf</div><div class='del'>-#define BIT_TBTT_PROHIBIT_SETUP_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_PROHIBIT_SETUP_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TBTT_PROHIBIT_SETUP_8822B)</div><div class='del'>-#define BIT_GET_TBTT_PROHIBIT_SETUP_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_PROHIBIT_SETUP_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_TBTT_PROHIBIT_SETUP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS_STATE_8822B */</div><div class='del'>-#define BIT_POWER_STATE_8822B BIT(7)</div><div class='del'>-#define BIT_CTWINDOW_ON_8822B BIT(6)</div><div class='del'>-#define BIT_BEACON_AREA_ON_8822B BIT(5)</div><div class='del'>-#define BIT_CTWIN_EARLY_DISTX_8822B BIT(4)</div><div class='del'>-#define BIT_NOA1_OFF_PERIOD_8822B BIT(3)</div><div class='del'>-#define BIT_FORCE_DOZE1_8822B BIT(2)</div><div class='del'>-#define BIT_NOA0_OFF_PERIOD_8822B BIT(1)</div><div class='del'>-#define BIT_FORCE_DOZE0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RD_NAV_NXT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RD_NAV_PROT_NXT_8822B 0</div><div class='del'>-#define BIT_MASK_RD_NAV_PROT_NXT_8822B 0xffff</div><div class='del'>-#define BIT_RD_NAV_PROT_NXT_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_RD_NAV_PROT_NXT_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RD_NAV_PROT_NXT_8822B)</div><div class='del'>-#define BIT_GET_RD_NAV_PROT_NXT_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RD_NAV_PROT_NXT_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_RD_NAV_PROT_NXT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NAV_PROT_LEN_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NAV_PROT_LEN_8822B 0</div><div class='del'>-#define BIT_MASK_NAV_PROT_LEN_8822B 0xffff</div><div class='del'>-#define BIT_NAV_PROT_LEN_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_NAV_PROT_LEN_8822B) &lt;&lt; BIT_SHIFT_NAV_PROT_LEN_8822B)</div><div class='del'>-#define BIT_GET_NAV_PROT_LEN_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NAV_PROT_LEN_8822B) &amp; BIT_MASK_NAV_PROT_LEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_8822B */</div><div class='del'>-#define BIT_DIS_RX_BSSID_FIT_8822B BIT(6)</div><div class='del'>-#define BIT_P0_EN_TXBCN_RPT_8822B BIT(5)</div><div class='del'>-#define BIT_DIS_TSF_UDT_8822B BIT(4)</div><div class='del'>-#define BIT_EN_BCN_FUNCTION_8822B BIT(3)</div><div class='del'>-#define BIT_P0_EN_RXBCN_RPT_8822B BIT(2)</div><div class='del'>-#define BIT_EN_P2P_CTWINDOW_8822B BIT(1)</div><div class='del'>-#define BIT_EN_P2P_BCNQ_AREA_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT0_8822B */</div><div class='del'>-#define BIT_CLI0_DIS_RX_BSSID_FIT_8822B BIT(6)</div><div class='del'>-#define BIT_CLI0_DIS_TSF_UDT_8822B BIT(4)</div><div class='del'>-#define BIT_CLI0_EN_BCN_FUNCTION_8822B BIT(3)</div><div class='del'>-#define BIT_CLI0_EN_RXBCN_RPT_8822B BIT(2)</div><div class='del'>-#define BIT_CLI0_ENP2P_CTWINDOW_8822B BIT(1)</div><div class='del'>-#define BIT_CLI0_ENP2P_BCNQ_AREA_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBID_NUM_8822B */</div><div class='del'>-#define BIT_EN_PRE_DL_BEACON_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBID_BCN_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_MBID_BCN_NUM_8822B 0x7</div><div class='del'>-#define BIT_MBID_BCN_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBID_BCN_NUM_8822B) &lt;&lt; BIT_SHIFT_MBID_BCN_NUM_8822B)</div><div class='del'>-#define BIT_GET_MBID_BCN_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBID_BCN_NUM_8822B) &amp; BIT_MASK_MBID_BCN_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DUAL_TSF_RST_8822B */</div><div class='del'>-#define BIT_FREECNT_RST_8822B BIT(5)</div><div class='del'>-#define BIT_TSFTR_CLI3_RST_8822B BIT(4)</div><div class='del'>-#define BIT_TSFTR_CLI2_RST_8822B BIT(3)</div><div class='del'>-#define BIT_TSFTR_CLI1_RST_8822B BIT(2)</div><div class='del'>-#define BIT_TSFTR_CLI0_RST_8822B BIT(1)</div><div class='del'>-#define BIT_TSFTR_RST_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_TIMER_SEL_FWRD_8822B 28</div><div class='del'>-#define BIT_MASK_BCN_TIMER_SEL_FWRD_8822B 0x7</div><div class='del'>-#define BIT_BCN_TIMER_SEL_FWRD_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_TIMER_SEL_FWRD_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCN_TIMER_SEL_FWRD_8822B)</div><div class='del'>-#define BIT_GET_BCN_TIMER_SEL_FWRD_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_TIMER_SEL_FWRD_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_BCN_TIMER_SEL_FWRD_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT0_8822B 16</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT0_8822B 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT0_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT0_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT0_8822B)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT0_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT0_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BCN_SPACE_CLINT0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE0_8822B 0</div><div class='del'>-#define BIT_MASK_BCN_SPACE0_8822B 0xffff</div><div class='del'>-#define BIT_BCN_SPACE0_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE0_8822B) &lt;&lt; BIT_SHIFT_BCN_SPACE0_8822B)</div><div class='del'>-#define BIT_GET_BCN_SPACE0_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE0_8822B) &amp; BIT_MASK_BCN_SPACE0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DRVERLYINT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DRVERLYITV_8822B 0</div><div class='del'>-#define BIT_MASK_DRVERLYITV_8822B 0xff</div><div class='del'>-#define BIT_DRVERLYITV_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_DRVERLYITV_8822B) &lt;&lt; BIT_SHIFT_DRVERLYITV_8822B)</div><div class='del'>-#define BIT_GET_DRVERLYITV_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DRVERLYITV_8822B) &amp; BIT_MASK_DRVERLYITV_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNDMATIM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNDMATIM_8822B 0</div><div class='del'>-#define BIT_MASK_BCNDMATIM_8822B 0xff</div><div class='del'>-#define BIT_BCNDMATIM_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNDMATIM_8822B) &lt;&lt; BIT_SHIFT_BCNDMATIM_8822B)</div><div class='del'>-#define BIT_GET_BCNDMATIM_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNDMATIM_8822B) &amp; BIT_MASK_BCNDMATIM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND0_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND0_8822B 0xffff</div><div class='del'>-#define BIT_ATIMWND0_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND0_8822B) &lt;&lt; BIT_SHIFT_ATIMWND0_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND0_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND0_8822B) &amp; BIT_MASK_ATIMWND0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USTIME_TSF_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USTIME_TSF_V1_8822B 0</div><div class='del'>-#define BIT_MASK_USTIME_TSF_V1_8822B 0xff</div><div class='del'>-#define BIT_USTIME_TSF_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_USTIME_TSF_V1_8822B) &lt;&lt; BIT_SHIFT_USTIME_TSF_V1_8822B)</div><div class='del'>-#define BIT_GET_USTIME_TSF_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USTIME_TSF_V1_8822B) &amp; BIT_MASK_USTIME_TSF_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_MAX_ERR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_MAX_ERR_8822B 0</div><div class='del'>-#define BIT_MASK_BCN_MAX_ERR_8822B 0xff</div><div class='del'>-#define BIT_BCN_MAX_ERR_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_MAX_ERR_8822B) &lt;&lt; BIT_SHIFT_BCN_MAX_ERR_8822B)</div><div class='del'>-#define BIT_GET_BCN_MAX_ERR_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_MAX_ERR_8822B) &amp; BIT_MASK_BCN_MAX_ERR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXTSF_OFFSET_CCK_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CCK_RXTSF_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_CCK_RXTSF_OFFSET_8822B 0xff</div><div class='del'>-#define BIT_CCK_RXTSF_OFFSET_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_CCK_RXTSF_OFFSET_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CCK_RXTSF_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_CCK_RXTSF_OFFSET_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CCK_RXTSF_OFFSET_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_CCK_RXTSF_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXTSF_OFFSET_OFDM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OFDM_RXTSF_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_OFDM_RXTSF_OFFSET_8822B 0xff</div><div class='del'>-#define BIT_OFDM_RXTSF_OFFSET_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_OFDM_RXTSF_OFFSET_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_OFDM_RXTSF_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_OFDM_RXTSF_OFFSET_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OFDM_RXTSF_OFFSET_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_OFDM_RXTSF_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TSFTR_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSF_TIMER_8822B 0</div><div class='del'>-#define BIT_MASK_TSF_TIMER_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_TSF_TIMER_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSF_TIMER_8822B) &lt;&lt; BIT_SHIFT_TSF_TIMER_8822B)</div><div class='del'>-#define BIT_GET_TSF_TIMER_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSF_TIMER_8822B) &amp; BIT_MASK_TSF_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FREERUN_CNT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FREERUN_CNT_8822B 0</div><div class='del'>-#define BIT_MASK_FREERUN_CNT_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_FREERUN_CNT_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_FREERUN_CNT_8822B) &lt;&lt; BIT_SHIFT_FREERUN_CNT_8822B)</div><div class='del'>-#define BIT_GET_FREERUN_CNT_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FREERUN_CNT_8822B) &amp; BIT_MASK_FREERUN_CNT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND1_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND1_V1_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND1_V1_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND1_V1_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND1_V1_8822B) &lt;&lt; BIT_SHIFT_ATIMWND1_V1_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND1_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND1_V1_8822B) &amp; BIT_MASK_ATIMWND1_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_PROHIBIT_INFRA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_PROHIBIT_INFRA_8822B 0</div><div class='del'>-#define BIT_MASK_TBTT_PROHIBIT_INFRA_8822B 0xff</div><div class='del'>-#define BIT_TBTT_PROHIBIT_INFRA_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_PROHIBIT_INFRA_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TBTT_PROHIBIT_INFRA_8822B)</div><div class='del'>-#define BIT_GET_TBTT_PROHIBIT_INFRA_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_PROHIBIT_INFRA_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_TBTT_PROHIBIT_INFRA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CTWND_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CTWND_8822B 0</div><div class='del'>-#define BIT_MASK_CTWND_8822B 0xff</div><div class='del'>-#define BIT_CTWND_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_CTWND_8822B) &lt;&lt; BIT_SHIFT_CTWND_8822B)</div><div class='del'>-#define BIT_GET_CTWND_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CTWND_8822B) &amp; BIT_MASK_CTWND_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNIVLCUNT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCNIVLCUNT_8822B 0</div><div class='del'>-#define BIT_MASK_BCNIVLCUNT_8822B 0x7f</div><div class='del'>-#define BIT_BCNIVLCUNT_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCNIVLCUNT_8822B) &lt;&lt; BIT_SHIFT_BCNIVLCUNT_8822B)</div><div class='del'>-#define BIT_GET_BCNIVLCUNT_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCNIVLCUNT_8822B) &amp; BIT_MASK_BCNIVLCUNT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCNDROPCTRL_8822B */</div><div class='del'>-#define BIT_BEACON_DROP_EN_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEACON_DROP_IVL_8822B 0</div><div class='del'>-#define BIT_MASK_BEACON_DROP_IVL_8822B 0x7f</div><div class='del'>-#define BIT_BEACON_DROP_IVL_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEACON_DROP_IVL_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BEACON_DROP_IVL_8822B)</div><div class='del'>-#define BIT_GET_BEACON_DROP_IVL_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEACON_DROP_IVL_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_BEACON_DROP_IVL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HGQ_TIMEOUT_PERIOD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HGQ_TIMEOUT_PERIOD_8822B 0</div><div class='del'>-#define BIT_MASK_HGQ_TIMEOUT_PERIOD_8822B 0xff</div><div class='del'>-#define BIT_HGQ_TIMEOUT_PERIOD_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_HGQ_TIMEOUT_PERIOD_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HGQ_TIMEOUT_PERIOD_8822B)</div><div class='del'>-#define BIT_GET_HGQ_TIMEOUT_PERIOD_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HGQ_TIMEOUT_PERIOD_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_HGQ_TIMEOUT_PERIOD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_TIMEOUT_PERIOD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXCMD_TIMEOUT_PERIOD_8822B 0</div><div class='del'>-#define BIT_MASK_TXCMD_TIMEOUT_PERIOD_8822B 0xff</div><div class='del'>-#define BIT_TXCMD_TIMEOUT_PERIOD_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXCMD_TIMEOUT_PERIOD_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TXCMD_TIMEOUT_PERIOD_8822B)</div><div class='del'>-#define BIT_GET_TXCMD_TIMEOUT_PERIOD_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXCMD_TIMEOUT_PERIOD_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_TXCMD_TIMEOUT_PERIOD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MISC_CTRL_8822B */</div><div class='del'>-#define BIT_DIS_TRX_CAL_BCN_8822B BIT(5)</div><div class='del'>-#define BIT_DIS_TX_CAL_TBTT_8822B BIT(4)</div><div class='del'>-#define BIT_EN_FREECNT_8822B BIT(3)</div><div class='del'>-#define BIT_BCN_AGGRESSION_8822B BIT(2)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DIS_SECONDARY_CCA_8822B 0</div><div class='del'>-#define BIT_MASK_DIS_SECONDARY_CCA_8822B 0x3</div><div class='del'>-#define BIT_DIS_SECONDARY_CCA_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_DIS_SECONDARY_CCA_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DIS_SECONDARY_CCA_8822B)</div><div class='del'>-#define BIT_GET_DIS_SECONDARY_CCA_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DIS_SECONDARY_CCA_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_DIS_SECONDARY_CCA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT1_8822B */</div><div class='del'>-#define BIT_CLI1_DIS_RX_BSSID_FIT_8822B BIT(6)</div><div class='del'>-#define BIT_CLI1_DIS_TSF_UDT_8822B BIT(4)</div><div class='del'>-#define BIT_CLI1_EN_BCN_FUNCTION_8822B BIT(3)</div><div class='del'>-#define BIT_CLI1_EN_RXBCN_RPT_8822B BIT(2)</div><div class='del'>-#define BIT_CLI1_ENP2P_CTWINDOW_8822B BIT(1)</div><div class='del'>-#define BIT_CLI1_ENP2P_BCNQ_AREA_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT2_8822B */</div><div class='del'>-#define BIT_CLI2_DIS_RX_BSSID_FIT_8822B BIT(6)</div><div class='del'>-#define BIT_CLI2_DIS_TSF_UDT_8822B BIT(4)</div><div class='del'>-#define BIT_CLI2_EN_BCN_FUNCTION_8822B BIT(3)</div><div class='del'>-#define BIT_CLI2_EN_RXBCN_RPT_8822B BIT(2)</div><div class='del'>-#define BIT_CLI2_ENP2P_CTWINDOW_8822B BIT(1)</div><div class='del'>-#define BIT_CLI2_ENP2P_BCNQ_AREA_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_CTRL_CLINT3_8822B */</div><div class='del'>-#define BIT_CLI3_DIS_RX_BSSID_FIT_8822B BIT(6)</div><div class='del'>-#define BIT_CLI3_DIS_TSF_UDT_8822B BIT(4)</div><div class='del'>-#define BIT_CLI3_EN_BCN_FUNCTION_8822B BIT(3)</div><div class='del'>-#define BIT_CLI3_EN_RXBCN_RPT_8822B BIT(2)</div><div class='del'>-#define BIT_CLI3_ENP2P_CTWINDOW_8822B BIT(1)</div><div class='del'>-#define BIT_CLI3_ENP2P_BCNQ_AREA_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EXTEND_CTRL_8822B */</div><div class='del'>-#define BIT_EN_TSFBIT32_RST_P2P2_8822B BIT(5)</div><div class='del'>-#define BIT_EN_TSFBIT32_RST_P2P1_8822B BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PORT_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_PORT_SEL_8822B 0x7</div><div class='del'>-#define BIT_PORT_SEL_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PORT_SEL_8822B) &lt;&lt; BIT_SHIFT_PORT_SEL_8822B)</div><div class='del'>-#define BIT_GET_PORT_SEL_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PORT_SEL_8822B) &amp; BIT_MASK_PORT_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS1_SPEC_STATE_8822B */</div><div class='del'>-#define BIT_P2P1_SPEC_POWER_STATE_8822B BIT(7)</div><div class='del'>-#define BIT_P2P1_SPEC_CTWINDOW_ON_8822B BIT(6)</div><div class='del'>-#define BIT_P2P1_SPEC_BCN_AREA_ON_8822B BIT(5)</div><div class='del'>-#define BIT_P2P1_SPEC_CTWIN_EARLY_DISTX_8822B BIT(4)</div><div class='del'>-#define BIT_P2P1_SPEC_NOA1_OFF_PERIOD_8822B BIT(3)</div><div class='del'>-#define BIT_P2P1_SPEC_FORCE_DOZE1_8822B BIT(2)</div><div class='del'>-#define BIT_P2P1_SPEC_NOA0_OFF_PERIOD_8822B BIT(1)</div><div class='del'>-#define BIT_P2P1_SPEC_FORCE_DOZE0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS1_STATE_8822B */</div><div class='del'>-#define BIT_P2P1_POWER_STATE_8822B BIT(7)</div><div class='del'>-#define BIT_P2P1_CTWINDOW_ON_8822B BIT(6)</div><div class='del'>-#define BIT_P2P1_BEACON_AREA_ON_8822B BIT(5)</div><div class='del'>-#define BIT_P2P1_CTWIN_EARLY_DISTX_8822B BIT(4)</div><div class='del'>-#define BIT_P2P1_NOA1_OFF_PERIOD_8822B BIT(3)</div><div class='del'>-#define BIT_P2P1_FORCE_DOZE1_8822B BIT(2)</div><div class='del'>-#define BIT_P2P1_NOA0_OFF_PERIOD_8822B BIT(1)</div><div class='del'>-#define BIT_P2P1_FORCE_DOZE0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS2_SPEC_STATE_8822B */</div><div class='del'>-#define BIT_P2P2_SPEC_POWER_STATE_8822B BIT(7)</div><div class='del'>-#define BIT_P2P2_SPEC_CTWINDOW_ON_8822B BIT(6)</div><div class='del'>-#define BIT_P2P2_SPEC_BCN_AREA_ON_8822B BIT(5)</div><div class='del'>-#define BIT_P2P2_SPEC_CTWIN_EARLY_DISTX_8822B BIT(4)</div><div class='del'>-#define BIT_P2P2_SPEC_NOA1_OFF_PERIOD_8822B BIT(3)</div><div class='del'>-#define BIT_P2P2_SPEC_FORCE_DOZE1_8822B BIT(2)</div><div class='del'>-#define BIT_P2P2_SPEC_NOA0_OFF_PERIOD_8822B BIT(1)</div><div class='del'>-#define BIT_P2P2_SPEC_FORCE_DOZE0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS2_STATE_8822B */</div><div class='del'>-#define BIT_P2P2_POWER_STATE_8822B BIT(7)</div><div class='del'>-#define BIT_P2P2_CTWINDOW_ON_8822B BIT(6)</div><div class='del'>-#define BIT_P2P2_BEACON_AREA_ON_8822B BIT(5)</div><div class='del'>-#define BIT_P2P2_CTWIN_EARLY_DISTX_8822B BIT(4)</div><div class='del'>-#define BIT_P2P2_NOA1_OFF_PERIOD_8822B BIT(3)</div><div class='del'>-#define BIT_P2P2_FORCE_DOZE1_8822B BIT(2)</div><div class='del'>-#define BIT_P2P2_NOA0_OFF_PERIOD_8822B BIT(1)</div><div class='del'>-#define BIT_P2P2_FORCE_DOZE0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER0_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSTIMER0_INT_8822B 5</div><div class='del'>-#define BIT_MASK_PSTIMER0_INT_8822B 0x7ffffff</div><div class='del'>-#define BIT_PSTIMER0_INT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSTIMER0_INT_8822B) &lt;&lt; BIT_SHIFT_PSTIMER0_INT_8822B)</div><div class='del'>-#define BIT_GET_PSTIMER0_INT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSTIMER0_INT_8822B) &amp; BIT_MASK_PSTIMER0_INT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSTIMER1_INT_8822B 5</div><div class='del'>-#define BIT_MASK_PSTIMER1_INT_8822B 0x7ffffff</div><div class='del'>-#define BIT_PSTIMER1_INT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSTIMER1_INT_8822B) &lt;&lt; BIT_SHIFT_PSTIMER1_INT_8822B)</div><div class='del'>-#define BIT_GET_PSTIMER1_INT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSTIMER1_INT_8822B) &amp; BIT_MASK_PSTIMER1_INT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSTIMER2_INT_8822B 5</div><div class='del'>-#define BIT_MASK_PSTIMER2_INT_8822B 0x7ffffff</div><div class='del'>-#define BIT_PSTIMER2_INT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSTIMER2_INT_8822B) &lt;&lt; BIT_SHIFT_PSTIMER2_INT_8822B)</div><div class='del'>-#define BIT_GET_PSTIMER2_INT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSTIMER2_INT_8822B) &amp; BIT_MASK_PSTIMER2_INT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TBTT_CTN_AREA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TBTT_CTN_AREA_8822B 0</div><div class='del'>-#define BIT_MASK_TBTT_CTN_AREA_8822B 0xff</div><div class='del'>-#define BIT_TBTT_CTN_AREA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TBTT_CTN_AREA_8822B) &lt;&lt; BIT_SHIFT_TBTT_CTN_AREA_8822B)</div><div class='del'>-#define BIT_GET_TBTT_CTN_AREA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TBTT_CTN_AREA_8822B) &amp; BIT_MASK_TBTT_CTN_AREA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FORCE_BCN_IFS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FORCE_BCN_IFS_8822B 0</div><div class='del'>-#define BIT_MASK_FORCE_BCN_IFS_8822B 0xff</div><div class='del'>-#define BIT_FORCE_BCN_IFS_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_FORCE_BCN_IFS_8822B) &lt;&lt; BIT_SHIFT_FORCE_BCN_IFS_8822B)</div><div class='del'>-#define BIT_GET_FORCE_BCN_IFS_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FORCE_BCN_IFS_8822B) &amp; BIT_MASK_FORCE_BCN_IFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXOP_MIN_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXOP_MIN_8822B 0</div><div class='del'>-#define BIT_MASK_TXOP_MIN_8822B 0x3fff</div><div class='del'>-#define BIT_TXOP_MIN_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXOP_MIN_8822B) &lt;&lt; BIT_SHIFT_TXOP_MIN_8822B)</div><div class='del'>-#define BIT_GET_TXOP_MIN_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXOP_MIN_8822B) &amp; BIT_MASK_TXOP_MIN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PRE_BKF_TIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRE_BKF_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_PRE_BKF_TIME_8822B 0xff</div><div class='del'>-#define BIT_PRE_BKF_TIME_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRE_BKF_TIME_8822B) &lt;&lt; BIT_SHIFT_PRE_BKF_TIME_8822B)</div><div class='del'>-#define BIT_GET_PRE_BKF_TIME_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRE_BKF_TIME_8822B) &amp; BIT_MASK_PRE_BKF_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CROSS_TXOP_CTRL_8822B */</div><div class='del'>-#define BIT_DTIM_BYPASS_8822B BIT(2)</div><div class='del'>-#define BIT_RTS_NAV_TXOP_8822B BIT(1)</div><div class='del'>-#define BIT_NOT_CROSS_TXOP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND2_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND2_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND2_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND2_8822B) &lt;&lt; BIT_SHIFT_ATIMWND2_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND2_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND2_8822B) &amp; BIT_MASK_ATIMWND2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND3_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND3_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND3_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND3_8822B) &lt;&lt; BIT_SHIFT_ATIMWND3_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND3_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND3_8822B) &amp; BIT_MASK_ATIMWND3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND4_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND4_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND4_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND4_8822B) &lt;&lt; BIT_SHIFT_ATIMWND4_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND4_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND4_8822B) &amp; BIT_MASK_ATIMWND4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND5_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND5_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND5_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND5_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND5_8822B) &lt;&lt; BIT_SHIFT_ATIMWND5_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND5_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND5_8822B) &amp; BIT_MASK_ATIMWND5_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND6_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND6_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND6_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND6_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND6_8822B) &lt;&lt; BIT_SHIFT_ATIMWND6_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND6_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND6_8822B) &amp; BIT_MASK_ATIMWND6_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMWND7_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIMWND7_8822B 0</div><div class='del'>-#define BIT_MASK_ATIMWND7_8822B 0xff</div><div class='del'>-#define BIT_ATIMWND7_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIMWND7_8822B) &lt;&lt; BIT_SHIFT_ATIMWND7_8822B)</div><div class='del'>-#define BIT_GET_ATIMWND7_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIMWND7_8822B) &amp; BIT_MASK_ATIMWND7_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ATIMUGT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ATIM_URGENT_8822B 0</div><div class='del'>-#define BIT_MASK_ATIM_URGENT_8822B 0xff</div><div class='del'>-#define BIT_ATIM_URGENT_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_ATIM_URGENT_8822B) &lt;&lt; BIT_SHIFT_ATIM_URGENT_8822B)</div><div class='del'>-#define BIT_GET_ATIM_URGENT_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ATIM_URGENT_8822B) &amp; BIT_MASK_ATIM_URGENT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_HIQ_NO_LMT_EN_8822B */</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP7_8822B BIT(7)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP6_8822B BIT(6)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP5_8822B BIT(5)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP4_8822B BIT(4)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP3_8822B BIT(3)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP2_8822B BIT(2)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_VAP1_8822B BIT(1)</div><div class='del'>-#define BIT_HIQ_NO_LMT_EN_ROOT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_ROOT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_ROOT_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_ROOT_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_ROOT_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_ROOT_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_ROOT_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_ROOT_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_ROOT_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_ROOT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP1_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP1_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP1_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP2_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP2_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP2_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP2_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP2_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP2_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP2_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP3_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP3_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP3_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP3_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP3_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP3_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP3_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP4_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP4_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP4_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP4_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP4_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP4_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP4_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP4_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP5_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP5_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP5_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP5_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP5_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP5_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP5_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP5_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP5_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP6_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP6_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP6_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP6_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP6_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP6_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP6_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP6_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP6_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DTIM_COUNTER_VAP7_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_COUNT_VAP7_8822B 0</div><div class='del'>-#define BIT_MASK_DTIM_COUNT_VAP7_8822B 0xff</div><div class='del'>-#define BIT_DTIM_COUNT_VAP7_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_COUNT_VAP7_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DTIM_COUNT_VAP7_8822B)</div><div class='del'>-#define BIT_GET_DTIM_COUNT_VAP7_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_COUNT_VAP7_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_DTIM_COUNT_VAP7_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_DIS_ATIM_8822B */</div><div class='del'>-#define BIT_DIS_ATIM_VAP7_8822B BIT(7)</div><div class='del'>-#define BIT_DIS_ATIM_VAP6_8822B BIT(6)</div><div class='del'>-#define BIT_DIS_ATIM_VAP5_8822B BIT(5)</div><div class='del'>-#define BIT_DIS_ATIM_VAP4_8822B BIT(4)</div><div class='del'>-#define BIT_DIS_ATIM_VAP3_8822B BIT(3)</div><div class='del'>-#define BIT_DIS_ATIM_VAP2_8822B BIT(2)</div><div class='del'>-#define BIT_DIS_ATIM_VAP1_8822B BIT(1)</div><div class='del'>-#define BIT_DIS_ATIM_ROOT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EARLY_128US_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT_SEL_TIMER1_8822B 3</div><div class='del'>-#define BIT_MASK_TSFT_SEL_TIMER1_8822B 0x7</div><div class='del'>-#define BIT_TSFT_SEL_TIMER1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT_SEL_TIMER1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TSFT_SEL_TIMER1_8822B)</div><div class='del'>-#define BIT_GET_TSFT_SEL_TIMER1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT_SEL_TIMER1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TSFT_SEL_TIMER1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EARLY_128US_8822B 0</div><div class='del'>-#define BIT_MASK_EARLY_128US_8822B 0x7</div><div class='del'>-#define BIT_EARLY_128US_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_EARLY_128US_8822B) &lt;&lt; BIT_SHIFT_EARLY_128US_8822B)</div><div class='del'>-#define BIT_GET_EARLY_128US_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EARLY_128US_8822B) &amp; BIT_MASK_EARLY_128US_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS1_CTRL_8822B */</div><div class='del'>-#define BIT_P2P1_CTW_ALLSTASLEEP_8822B BIT(7)</div><div class='del'>-#define BIT_P2P1_OFF_DISTX_EN_8822B BIT(6)</div><div class='del'>-#define BIT_P2P1_PWR_MGT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_P2P1_NOA1_EN_8822B BIT(2)</div><div class='del'>-#define BIT_P2P1_NOA0_EN_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2PPS2_CTRL_8822B */</div><div class='del'>-#define BIT_P2P2_CTW_ALLSTASLEEP_8822B BIT(7)</div><div class='del'>-#define BIT_P2P2_OFF_DISTX_EN_8822B BIT(6)</div><div class='del'>-#define BIT_P2P2_PWR_MGT_EN_8822B BIT(5)</div><div class='del'>-#define BIT_P2P2_NOA1_EN_8822B BIT(2)</div><div class='del'>-#define BIT_P2P2_NOA0_EN_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TIMER0_SRC_SEL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SYNC_CLI_SEL_8822B 4</div><div class='del'>-#define BIT_MASK_SYNC_CLI_SEL_8822B 0x7</div><div class='del'>-#define BIT_SYNC_CLI_SEL_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SYNC_CLI_SEL_8822B) &lt;&lt; BIT_SHIFT_SYNC_CLI_SEL_8822B)</div><div class='del'>-#define BIT_GET_SYNC_CLI_SEL_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SYNC_CLI_SEL_8822B) &amp; BIT_MASK_SYNC_CLI_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TSFT_SEL_TIMER0_8822B 0</div><div class='del'>-#define BIT_MASK_TSFT_SEL_TIMER0_8822B 0x7</div><div class='del'>-#define BIT_TSFT_SEL_TIMER0_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_TSFT_SEL_TIMER0_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TSFT_SEL_TIMER0_8822B)</div><div class='del'>-#define BIT_GET_TSFT_SEL_TIMER0_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TSFT_SEL_TIMER0_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_TSFT_SEL_TIMER0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOA_UNIT_SEL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_UNIT2_SEL_8822B 8</div><div class='del'>-#define BIT_MASK_NOA_UNIT2_SEL_8822B 0x7</div><div class='del'>-#define BIT_NOA_UNIT2_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_UNIT2_SEL_8822B) &lt;&lt; BIT_SHIFT_NOA_UNIT2_SEL_8822B)</div><div class='del'>-#define BIT_GET_NOA_UNIT2_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_UNIT2_SEL_8822B) &amp; BIT_MASK_NOA_UNIT2_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_UNIT1_SEL_8822B 4</div><div class='del'>-#define BIT_MASK_NOA_UNIT1_SEL_8822B 0x7</div><div class='del'>-#define BIT_NOA_UNIT1_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_UNIT1_SEL_8822B) &lt;&lt; BIT_SHIFT_NOA_UNIT1_SEL_8822B)</div><div class='del'>-#define BIT_GET_NOA_UNIT1_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_UNIT1_SEL_8822B) &amp; BIT_MASK_NOA_UNIT1_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_UNIT0_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_NOA_UNIT0_SEL_8822B 0x7</div><div class='del'>-#define BIT_NOA_UNIT0_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_UNIT0_SEL_8822B) &lt;&lt; BIT_SHIFT_NOA_UNIT0_SEL_8822B)</div><div class='del'>-#define BIT_GET_NOA_UNIT0_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_UNIT0_SEL_8822B) &amp; BIT_MASK_NOA_UNIT0_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2POFF_DIS_TXTIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_P2POFF_DIS_TXTIME_8822B 0</div><div class='del'>-#define BIT_MASK_P2POFF_DIS_TXTIME_8822B 0xff</div><div class='del'>-#define BIT_P2POFF_DIS_TXTIME_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_P2POFF_DIS_TXTIME_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_P2POFF_DIS_TXTIME_8822B)</div><div class='del'>-#define BIT_GET_P2POFF_DIS_TXTIME_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_P2POFF_DIS_TXTIME_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_P2POFF_DIS_TXTIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT2_8822B 16</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT2_8822B 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT2_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT2_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT2_8822B)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT2_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT2_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BCN_SPACE_CLINT2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT1_8822B 0</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT1_8822B 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT1_8822B)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BCN_SPACE_CLINT1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBSSID_BCN_SPACE3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SUB_BCN_SPACE_8822B 16</div><div class='del'>-#define BIT_MASK_SUB_BCN_SPACE_8822B 0xff</div><div class='del'>-#define BIT_SUB_BCN_SPACE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SUB_BCN_SPACE_8822B) &lt;&lt; BIT_SHIFT_SUB_BCN_SPACE_8822B)</div><div class='del'>-#define BIT_GET_SUB_BCN_SPACE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SUB_BCN_SPACE_8822B) &amp; BIT_MASK_SUB_BCN_SPACE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BCN_SPACE_CLINT3_8822B 0</div><div class='del'>-#define BIT_MASK_BCN_SPACE_CLINT3_8822B 0xfff</div><div class='del'>-#define BIT_BCN_SPACE_CLINT3_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BCN_SPACE_CLINT3_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BCN_SPACE_CLINT3_8822B)</div><div class='del'>-#define BIT_GET_BCN_SPACE_CLINT3_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BCN_SPACE_CLINT3_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BCN_SPACE_CLINT3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACMHWCTRL_8822B */</div><div class='del'>-#define BIT_BEQ_ACM_STATUS_8822B BIT(7)</div><div class='del'>-#define BIT_VIQ_ACM_STATUS_8822B BIT(6)</div><div class='del'>-#define BIT_VOQ_ACM_STATUS_8822B BIT(5)</div><div class='del'>-#define BIT_BEQ_ACM_EN_8822B BIT(3)</div><div class='del'>-#define BIT_VIQ_ACM_EN_8822B BIT(2)</div><div class='del'>-#define BIT_VOQ_ACM_EN_8822B BIT(1)</div><div class='del'>-#define BIT_ACMHWEN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACMRSTCTRL_8822B */</div><div class='del'>-#define BIT_BE_ACM_RESET_USED_TIME_8822B BIT(2)</div><div class='del'>-#define BIT_VI_ACM_RESET_USED_TIME_8822B BIT(1)</div><div class='del'>-#define BIT_VO_ACM_RESET_USED_TIME_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACMAVG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AVGPERIOD_8822B 0</div><div class='del'>-#define BIT_MASK_AVGPERIOD_8822B 0xffff</div><div class='del'>-#define BIT_AVGPERIOD_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_AVGPERIOD_8822B) &lt;&lt; BIT_SHIFT_AVGPERIOD_8822B)</div><div class='del'>-#define BIT_GET_AVGPERIOD_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AVGPERIOD_8822B) &amp; BIT_MASK_AVGPERIOD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VO_ADMTIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VO_ADMITTED_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_VO_ADMITTED_TIME_8822B 0xffff</div><div class='del'>-#define BIT_VO_ADMITTED_TIME_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_VO_ADMITTED_TIME_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VO_ADMITTED_TIME_8822B)</div><div class='del'>-#define BIT_GET_VO_ADMITTED_TIME_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VO_ADMITTED_TIME_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_VO_ADMITTED_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_VI_ADMTIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VI_ADMITTED_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_VI_ADMITTED_TIME_8822B 0xffff</div><div class='del'>-#define BIT_VI_ADMITTED_TIME_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_VI_ADMITTED_TIME_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VI_ADMITTED_TIME_8822B)</div><div class='del'>-#define BIT_GET_VI_ADMITTED_TIME_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VI_ADMITTED_TIME_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_VI_ADMITTED_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BE_ADMTIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BE_ADMITTED_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_BE_ADMITTED_TIME_8822B 0xffff</div><div class='del'>-#define BIT_BE_ADMITTED_TIME_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BE_ADMITTED_TIME_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BE_ADMITTED_TIME_8822B)</div><div class='del'>-#define BIT_GET_BE_ADMITTED_TIME_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BE_ADMITTED_TIME_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BE_ADMITTED_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EDCA_RANDOM_GEN_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RANDOM_GEN_8822B 0</div><div class='del'>-#define BIT_MASK_RANDOM_GEN_8822B 0xffffff</div><div class='del'>-#define BIT_RANDOM_GEN_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RANDOM_GEN_8822B) &lt;&lt; BIT_SHIFT_RANDOM_GEN_8822B)</div><div class='del'>-#define BIT_GET_RANDOM_GEN_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RANDOM_GEN_8822B) &amp; BIT_MASK_RANDOM_GEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_NOA_SEL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_SEL_8822B 4</div><div class='del'>-#define BIT_MASK_NOA_SEL_8822B 0x7</div><div class='del'>-#define BIT_NOA_SEL_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_SEL_8822B) &lt;&lt; BIT_SHIFT_NOA_SEL_8822B)</div><div class='del'>-#define BIT_GET_NOA_SEL_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_SEL_8822B) &amp; BIT_MASK_NOA_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXCMD_SEG_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_TXCMD_SEG_SEL_8822B 0xf</div><div class='del'>-#define BIT_TXCMD_SEG_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXCMD_SEG_SEL_8822B) &lt;&lt; BIT_SHIFT_TXCMD_SEG_SEL_8822B)</div><div class='del'>-#define BIT_GET_TXCMD_SEG_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXCMD_SEG_SEL_8822B) &amp; BIT_MASK_TXCMD_SEG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOA_PARAM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_COUNT_8822B (96 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_NOA_COUNT_8822B 0xff</div><div class='del'>-#define BIT_NOA_COUNT_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_COUNT_8822B) &lt;&lt; BIT_SHIFT_NOA_COUNT_8822B)</div><div class='del'>-#define BIT_GET_NOA_COUNT_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_COUNT_8822B) &amp; BIT_MASK_NOA_COUNT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_START_TIME_8822B (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_NOA_START_TIME_8822B 0xffffffffL</div><div class='del'>-#define BIT_NOA_START_TIME_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_START_TIME_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_NOA_START_TIME_8822B)</div><div class='del'>-#define BIT_GET_NOA_START_TIME_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_START_TIME_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_NOA_START_TIME_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_INTERVAL_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_NOA_INTERVAL_8822B 0xffffffffL</div><div class='del'>-#define BIT_NOA_INTERVAL_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_INTERVAL_8822B) &lt;&lt; BIT_SHIFT_NOA_INTERVAL_8822B)</div><div class='del'>-#define BIT_GET_NOA_INTERVAL_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_INTERVAL_8822B) &amp; BIT_MASK_NOA_INTERVAL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOA_DURATION_8822B 0</div><div class='del'>-#define BIT_MASK_NOA_DURATION_8822B 0xffffffffL</div><div class='del'>-#define BIT_NOA_DURATION_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOA_DURATION_8822B) &lt;&lt; BIT_SHIFT_NOA_DURATION_8822B)</div><div class='del'>-#define BIT_GET_NOA_DURATION_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOA_DURATION_8822B) &amp; BIT_MASK_NOA_DURATION_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2P_RST_8822B */</div><div class='del'>-#define BIT_P2P2_PWR_RST1_8822B BIT(5)</div><div class='del'>-#define BIT_P2P2_PWR_RST0_8822B BIT(4)</div><div class='del'>-#define BIT_P2P1_PWR_RST1_8822B BIT(3)</div><div class='del'>-#define BIT_P2P1_PWR_RST0_8822B BIT(2)</div><div class='del'>-#define BIT_P2P_PWR_RST1_V1_8822B BIT(1)</div><div class='del'>-#define BIT_P2P_PWR_RST0_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SCHEDULER_RST_8822B */</div><div class='del'>-#define BIT_SYNC_CLI_8822B BIT(1)</div><div class='del'>-#define BIT_SCHEDULER_RST_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SCH_TXCMD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SCH_TXCMD_8822B 0</div><div class='del'>-#define BIT_MASK_SCH_TXCMD_8822B 0xffffffffL</div><div class='del'>-#define BIT_SCH_TXCMD_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_SCH_TXCMD_8822B) &lt;&lt; BIT_SHIFT_SCH_TXCMD_8822B)</div><div class='del'>-#define BIT_GET_SCH_TXCMD_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SCH_TXCMD_8822B) &amp; BIT_MASK_SCH_TXCMD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PAGE5_DUMMY_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPUMGQ_TX_TIMER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPUMGQ_TX_TIMER_V1_8822B 0</div><div class='del'>-#define BIT_MASK_CPUMGQ_TX_TIMER_V1_8822B 0xffffffffL</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPUMGQ_TX_TIMER_V1_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CPUMGQ_TX_TIMER_V1_8822B)</div><div class='del'>-#define BIT_GET_CPUMGQ_TX_TIMER_V1_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPUMGQ_TX_TIMER_V1_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_CPUMGQ_TX_TIMER_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_A_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_A_V1_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_A_V1_8822B 0xffffffffL</div><div class='del'>-#define BIT_PS_TIMER_A_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_A_V1_8822B) &lt;&lt; BIT_SHIFT_PS_TIMER_A_V1_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_A_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_A_V1_8822B) &amp; BIT_MASK_PS_TIMER_A_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_B_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_B_V1_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_B_V1_8822B 0xffffffffL</div><div class='del'>-#define BIT_PS_TIMER_B_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_B_V1_8822B) &lt;&lt; BIT_SHIFT_PS_TIMER_B_V1_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_B_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_B_V1_8822B) &amp; BIT_MASK_PS_TIMER_B_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_C_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_C_V1_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_C_V1_8822B 0xffffffffL</div><div class='del'>-#define BIT_PS_TIMER_C_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_C_V1_8822B) &lt;&lt; BIT_SHIFT_PS_TIMER_C_V1_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_C_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_C_V1_8822B) &amp; BIT_MASK_PS_TIMER_C_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_ABC_CPUMGQ_TIMER_CRTL_8822B */</div><div class='del'>-#define BIT_CPUMGQ_TIMER_EN_8822B BIT(31)</div><div class='del'>-#define BIT_CPUMGQ_TX_EN_8822B BIT(28)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPUMGQ_TIMER_TSF_SEL_8822B 24</div><div class='del'>-#define BIT_MASK_CPUMGQ_TIMER_TSF_SEL_8822B 0x7</div><div class='del'>-#define BIT_CPUMGQ_TIMER_TSF_SEL_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPUMGQ_TIMER_TSF_SEL_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CPUMGQ_TIMER_TSF_SEL_8822B)</div><div class='del'>-#define BIT_GET_CPUMGQ_TIMER_TSF_SEL_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPUMGQ_TIMER_TSF_SEL_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_CPUMGQ_TIMER_TSF_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_C_EN_8822B BIT(23)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_C_TSF_SEL_8822B 16</div><div class='del'>-#define BIT_MASK_PS_TIMER_C_TSF_SEL_8822B 0x7</div><div class='del'>-#define BIT_PS_TIMER_C_TSF_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_C_TSF_SEL_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PS_TIMER_C_TSF_SEL_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_C_TSF_SEL_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_C_TSF_SEL_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_PS_TIMER_C_TSF_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_B_EN_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_B_TSF_SEL_8822B 8</div><div class='del'>-#define BIT_MASK_PS_TIMER_B_TSF_SEL_8822B 0x7</div><div class='del'>-#define BIT_PS_TIMER_B_TSF_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_B_TSF_SEL_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PS_TIMER_B_TSF_SEL_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_B_TSF_SEL_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_B_TSF_SEL_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_PS_TIMER_B_TSF_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PS_TIMER_A_EN_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_A_TSF_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_A_TSF_SEL_8822B 0x7</div><div class='del'>-#define BIT_PS_TIMER_A_TSF_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_A_TSF_SEL_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PS_TIMER_A_TSF_SEL_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_A_TSF_SEL_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_A_TSF_SEL_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_PS_TIMER_A_TSF_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CPUMGQ_TX_TIMER_EARLY_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CPUMGQ_TX_TIMER_EARLY_8822B 0</div><div class='del'>-#define BIT_MASK_CPUMGQ_TX_TIMER_EARLY_8822B 0xff</div><div class='del'>-#define BIT_CPUMGQ_TX_TIMER_EARLY_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_CPUMGQ_TX_TIMER_EARLY_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CPUMGQ_TX_TIMER_EARLY_8822B)</div><div class='del'>-#define BIT_GET_CPUMGQ_TX_TIMER_EARLY_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CPUMGQ_TX_TIMER_EARLY_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_CPUMGQ_TX_TIMER_EARLY_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_A_EARLY_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_A_EARLY_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_A_EARLY_8822B 0xff</div><div class='del'>-#define BIT_PS_TIMER_A_EARLY_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_A_EARLY_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PS_TIMER_A_EARLY_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_A_EARLY_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_A_EARLY_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_PS_TIMER_A_EARLY_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_B_EARLY_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_B_EARLY_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_B_EARLY_8822B 0xff</div><div class='del'>-#define BIT_PS_TIMER_B_EARLY_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_B_EARLY_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PS_TIMER_B_EARLY_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_B_EARLY_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_B_EARLY_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_PS_TIMER_B_EARLY_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_TIMER_C_EARLY_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_TIMER_C_EARLY_8822B 0</div><div class='del'>-#define BIT_MASK_PS_TIMER_C_EARLY_8822B 0xff</div><div class='del'>-#define BIT_PS_TIMER_C_EARLY_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_TIMER_C_EARLY_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PS_TIMER_C_EARLY_8822B)</div><div class='del'>-#define BIT_GET_PS_TIMER_C_EARLY_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_TIMER_C_EARLY_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_PS_TIMER_C_EARLY_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_BWOPMODE_8822B (BW OPERATION MODE REGISTER) */</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_FWPKT_CR_8822B */</div><div class='del'>-#define BIT_FWEN_8822B BIT(7)</div><div class='del'>-#define BIT_PHYSTS_PKT_CTRL_8822B BIT(6)</div><div class='del'>-#define BIT_APPHDR_MIDSRCH_FAIL_8822B BIT(4)</div><div class='del'>-#define BIT_FWPARSING_EN_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_APPEND_MHDR_LEN_8822B 0</div><div class='del'>-#define BIT_MASK_APPEND_MHDR_LEN_8822B 0x7</div><div class='del'>-#define BIT_APPEND_MHDR_LEN_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_APPEND_MHDR_LEN_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_APPEND_MHDR_LEN_8822B)</div><div class='del'>-#define BIT_GET_APPEND_MHDR_LEN_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_APPEND_MHDR_LEN_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_APPEND_MHDR_LEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_CR_8822B (WMAC CR AND APSD CONTROL REGISTER) */</div><div class='del'>-#define BIT_IC_MACPHY_M_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TCR_8822B (TRANSMISSION CONFIGURATION REGISTER) */</div><div class='del'>-#define BIT_WMAC_EN_RTS_ADDR_8822B BIT(31)</div><div class='del'>-#define BIT_WMAC_DISABLE_CCK_8822B BIT(30)</div><div class='del'>-#define BIT_WMAC_RAW_LEN_8822B BIT(29)</div><div class='del'>-#define BIT_WMAC_NOTX_IN_RXNDP_8822B BIT(28)</div><div class='del'>-#define BIT_WMAC_EN_EOF_8822B BIT(27)</div><div class='del'>-#define BIT_WMAC_BF_SEL_8822B BIT(26)</div><div class='del'>-#define BIT_WMAC_ANTMODE_SEL_8822B BIT(25)</div><div class='del'>-#define BIT_WMAC_TCRPWRMGT_HWCTL_8822B BIT(24)</div><div class='del'>-#define BIT_WMAC_SMOOTH_VAL_8822B BIT(23)</div><div class='del'>-#define BIT_FETCH_MPDU_AFTER_WSEC_RDY_8822B BIT(20)</div><div class='del'>-#define BIT_WMAC_TCR_EN_20MST_8822B BIT(19)</div><div class='del'>-#define BIT_WMAC_DIS_SIGTA_8822B BIT(18)</div><div class='del'>-#define BIT_WMAC_DIS_A2B0_8822B BIT(17)</div><div class='del'>-#define BIT_WMAC_MSK_SIGBCRC_8822B BIT(16)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_3_8822B BIT(15)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_2_8822B BIT(14)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_1_8822B BIT(13)</div><div class='del'>-#define BIT_WMAC_TCR_ERRSTEN_0_8822B BIT(12)</div><div class='del'>-#define BIT_WMAC_TCR_TXSK_PERPKT_8822B BIT(11)</div><div class='del'>-#define BIT_ICV_8822B BIT(10)</div><div class='del'>-#define BIT_CFEND_FORMAT_8822B BIT(9)</div><div class='del'>-#define BIT_CRC_8822B BIT(8)</div><div class='del'>-#define BIT_PWRBIT_OW_EN_8822B BIT(7)</div><div class='del'>-#define BIT_PWR_ST_8822B BIT(6)</div><div class='del'>-#define BIT_WMAC_TCR_UPD_TIMIE_8822B BIT(5)</div><div class='del'>-#define BIT_WMAC_TCR_UPD_HGQMD_8822B BIT(4)</div><div class='del'>-#define BIT_VHTSIGA1_TXPS_8822B BIT(3)</div><div class='del'>-#define BIT_PAD_SEL_8822B BIT(2)</div><div class='del'>-#define BIT_DIS_GCLK_8822B BIT(1)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RCR_8822B (RECEIVE CONFIGURATION REGISTER) */</div><div class='del'>-#define BIT_APP_FCS_8822B BIT(31)</div><div class='del'>-#define BIT_APP_MIC_8822B BIT(30)</div><div class='del'>-#define BIT_APP_ICV_8822B BIT(29)</div><div class='del'>-#define BIT_APP_PHYSTS_8822B BIT(28)</div><div class='del'>-#define BIT_APP_BASSN_8822B BIT(27)</div><div class='del'>-#define BIT_VHT_DACK_8822B BIT(26)</div><div class='del'>-#define BIT_TCPOFLD_EN_8822B BIT(25)</div><div class='del'>-#define BIT_ENMBID_8822B BIT(24)</div><div class='del'>-#define BIT_LSIGEN_8822B BIT(23)</div><div class='del'>-#define BIT_MFBEN_8822B BIT(22)</div><div class='del'>-#define BIT_DISCHKPPDLLEN_8822B BIT(21)</div><div class='del'>-#define BIT_PKTCTL_DLEN_8822B BIT(20)</div><div class='del'>-#define BIT_TIM_PARSER_EN_8822B BIT(18)</div><div class='del'>-#define BIT_BC_MD_EN_8822B BIT(17)</div><div class='del'>-#define BIT_UC_MD_EN_8822B BIT(16)</div><div class='del'>-#define BIT_RXSK_PERPKT_8822B BIT(15)</div><div class='del'>-#define BIT_HTC_LOC_CTRL_8822B BIT(14)</div><div class='del'>-#define BIT_RPFM_CAM_ENABLE_8822B BIT(12)</div><div class='del'>-#define BIT_TA_BCN_8822B BIT(11)</div><div class='del'>-#define BIT_DISDECMYPKT_8822B BIT(10)</div><div class='del'>-#define BIT_AICV_8822B BIT(9)</div><div class='del'>-#define BIT_ACRC32_8822B BIT(8)</div><div class='del'>-#define BIT_CBSSID_BCN_8822B BIT(7)</div><div class='del'>-#define BIT_CBSSID_DATA_8822B BIT(6)</div><div class='del'>-#define BIT_APWRMGT_8822B BIT(5)</div><div class='del'>-#define BIT_ADD3_8822B BIT(4)</div><div class='del'>-#define BIT_AB_8822B BIT(3)</div><div class='del'>-#define BIT_AM_8822B BIT(2)</div><div class='del'>-#define BIT_APM_8822B BIT(1)</div><div class='del'>-#define BIT_AAP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DRVINFO_SZ_8822B (RX DRIVER INFO SIZE REGISTER) */</div><div class='del'>-#define BIT_PHYSTS_PER_PKT_MODE_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DRVINFO_SZ_V1_8822B 0</div><div class='del'>-#define BIT_MASK_DRVINFO_SZ_V1_8822B 0xf</div><div class='del'>-#define BIT_DRVINFO_SZ_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_DRVINFO_SZ_V1_8822B) &lt;&lt; BIT_SHIFT_DRVINFO_SZ_V1_8822B)</div><div class='del'>-#define BIT_GET_DRVINFO_SZ_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DRVINFO_SZ_V1_8822B) &amp; BIT_MASK_DRVINFO_SZ_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_DLK_TIME_8822B (RX DEADLOCK TIME REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_DLK_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_RX_DLK_TIME_8822B 0xff</div><div class='del'>-#define BIT_RX_DLK_TIME_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_DLK_TIME_8822B) &lt;&lt; BIT_SHIFT_RX_DLK_TIME_8822B)</div><div class='del'>-#define BIT_GET_RX_DLK_TIME_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_DLK_TIME_8822B) &amp; BIT_MASK_RX_DLK_TIME_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_PKT_LIMIT_8822B (RX PACKET LENGTH LIMIT REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKTLMT_8822B 0</div><div class='del'>-#define BIT_MASK_RXPKTLMT_8822B 0x3f</div><div class='del'>-#define BIT_RXPKTLMT_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKTLMT_8822B) &lt;&lt; BIT_SHIFT_RXPKTLMT_8822B)</div><div class='del'>-#define BIT_GET_RXPKTLMT_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKTLMT_8822B) &amp; BIT_MASK_RXPKTLMT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID_8822B (MAC ID REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID_8822B 0</div><div class='del'>-#define BIT_MASK_MACID_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_MACID_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID_8822B) &lt;&lt; BIT_SHIFT_MACID_8822B)</div><div class='del'>-#define BIT_GET_MACID_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID_8822B) &amp; BIT_MASK_MACID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID_8822B (BSSID REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID_8822B 0</div><div class='del'>-#define BIT_MASK_BSSID_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BSSID_8822B) &lt;&lt; BIT_SHIFT_BSSID_8822B)</div><div class='del'>-#define BIT_GET_BSSID_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BSSID_8822B) &amp; BIT_MASK_BSSID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MAR_8822B (MULTICAST ADDRESS REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MAR_8822B 0</div><div class='del'>-#define BIT_MASK_MAR_8822B 0xffffffffffffffffL</div><div class='del'>-#define BIT_MAR_8822B(x) (((x) &amp; BIT_MASK_MAR_8822B) &lt;&lt; BIT_SHIFT_MAR_8822B)</div><div class='del'>-#define BIT_GET_MAR_8822B(x) (((x) &gt;&gt; BIT_SHIFT_MAR_8822B) &amp; BIT_MASK_MAR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIDCAMCFG_1_8822B (MBSSID CAM CONFIGURATION REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIDCAM_RWDATA_L_8822B 0</div><div class='del'>-#define BIT_MASK_MBIDCAM_RWDATA_L_8822B 0xffffffffL</div><div class='del'>-#define BIT_MBIDCAM_RWDATA_L_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIDCAM_RWDATA_L_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MBIDCAM_RWDATA_L_8822B)</div><div class='del'>-#define BIT_GET_MBIDCAM_RWDATA_L_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIDCAM_RWDATA_L_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_MBIDCAM_RWDATA_L_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MBIDCAMCFG_2_8822B (MBSSID CAM CONFIGURATION REGISTER) */</div><div class='del'>-#define BIT_MBIDCAM_POLL_8822B BIT(31)</div><div class='del'>-#define BIT_MBIDCAM_WT_EN_8822B BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIDCAM_ADDR_8822B 24</div><div class='del'>-#define BIT_MASK_MBIDCAM_ADDR_8822B 0x1f</div><div class='del'>-#define BIT_MBIDCAM_ADDR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIDCAM_ADDR_8822B) &lt;&lt; BIT_SHIFT_MBIDCAM_ADDR_8822B)</div><div class='del'>-#define BIT_GET_MBIDCAM_ADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIDCAM_ADDR_8822B) &amp; BIT_MASK_MBIDCAM_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_MBIDCAM_VALID_8822B BIT(23)</div><div class='del'>-#define BIT_LSIC_TXOP_EN_8822B BIT(17)</div><div class='del'>-#define BIT_CTS_EN_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MBIDCAM_RWDATA_H_8822B 0</div><div class='del'>-#define BIT_MASK_MBIDCAM_RWDATA_H_8822B 0xffff</div><div class='del'>-#define BIT_MBIDCAM_RWDATA_H_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_MBIDCAM_RWDATA_H_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MBIDCAM_RWDATA_H_8822B)</div><div class='del'>-#define BIT_GET_MBIDCAM_RWDATA_H_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MBIDCAM_RWDATA_H_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_MBIDCAM_RWDATA_H_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ZLD_NUM_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ZLD_NUM_8822B 0</div><div class='del'>-#define BIT_MASK_ZLD_NUM_8822B 0xff</div><div class='del'>-#define BIT_ZLD_NUM_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_ZLD_NUM_8822B) &lt;&lt; BIT_SHIFT_ZLD_NUM_8822B)</div><div class='del'>-#define BIT_GET_ZLD_NUM_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ZLD_NUM_8822B) &amp; BIT_MASK_ZLD_NUM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_UDF_THSD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_UDF_THSD_8822B 0</div><div class='del'>-#define BIT_MASK_UDF_THSD_8822B 0xff</div><div class='del'>-#define BIT_UDF_THSD_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_UDF_THSD_8822B) &lt;&lt; BIT_SHIFT_UDF_THSD_8822B)</div><div class='del'>-#define BIT_GET_UDF_THSD_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_UDF_THSD_8822B) &amp; BIT_MASK_UDF_THSD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TCR_TSFT_OFS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_TCR_TSFT_OFS_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_TCR_TSFT_OFS_8822B 0xffff</div><div class='del'>-#define BIT_WMAC_TCR_TSFT_OFS_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_TCR_TSFT_OFS_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_TCR_TSFT_OFS_8822B)</div><div class='del'>-#define BIT_GET_WMAC_TCR_TSFT_OFS_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_TCR_TSFT_OFS_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_TCR_TSFT_OFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MCU_TEST_2_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MCU_RSVD_2_V1_8822B 0</div><div class='del'>-#define BIT_MASK_MCU_RSVD_2_V1_8822B 0xffff</div><div class='del'>-#define BIT_MCU_RSVD_2_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MCU_RSVD_2_V1_8822B) &lt;&lt; BIT_SHIFT_MCU_RSVD_2_V1_8822B)</div><div class='del'>-#define BIT_GET_MCU_RSVD_2_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MCU_RSVD_2_V1_8822B) &amp; BIT_MASK_MCU_RSVD_2_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TXTIMEOUT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_TXTIMEOUT_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_TXTIMEOUT_8822B 0xff</div><div class='del'>-#define BIT_WMAC_TXTIMEOUT_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_TXTIMEOUT_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_TXTIMEOUT_8822B)</div><div class='del'>-#define BIT_GET_WMAC_TXTIMEOUT_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_TXTIMEOUT_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_WMAC_TXTIMEOUT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STMP_THSD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STMP_THSD_8822B 0</div><div class='del'>-#define BIT_MASK_STMP_THSD_8822B 0xff</div><div class='del'>-#define BIT_STMP_THSD_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STMP_THSD_8822B) &lt;&lt; BIT_SHIFT_STMP_THSD_8822B)</div><div class='del'>-#define BIT_GET_STMP_THSD_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STMP_THSD_8822B) &amp; BIT_MASK_STMP_THSD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MAC_SPEC_SIFS_8822B (SPECIFICATION SIFS REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_OFDM_8822B 8</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_OFDM_8822B 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_OFDM_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_OFDM_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SPEC_SIFS_OFDM_8822B)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_OFDM_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_OFDM_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_SPEC_SIFS_OFDM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SPEC_SIFS_CCK_8822B 0</div><div class='del'>-#define BIT_MASK_SPEC_SIFS_CCK_8822B 0xff</div><div class='del'>-#define BIT_SPEC_SIFS_CCK_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SPEC_SIFS_CCK_8822B) &lt;&lt; BIT_SHIFT_SPEC_SIFS_CCK_8822B)</div><div class='del'>-#define BIT_GET_SPEC_SIFS_CCK_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SPEC_SIFS_CCK_8822B) &amp; BIT_MASK_SPEC_SIFS_CCK_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_USTIME_EDCA_8822B (US TIME TUNING FOR EDCA REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_USTIME_EDCA_V1_8822B 0</div><div class='del'>-#define BIT_MASK_USTIME_EDCA_V1_8822B 0x1ff</div><div class='del'>-#define BIT_USTIME_EDCA_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_USTIME_EDCA_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_USTIME_EDCA_V1_8822B)</div><div class='del'>-#define BIT_GET_USTIME_EDCA_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_USTIME_EDCA_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_USTIME_EDCA_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RESP_SIFS_OFDM_8822B (RESPONSE SIFS FOR OFDM REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_R2T_OFDM_8822B 8</div><div class='del'>-#define BIT_MASK_SIFS_R2T_OFDM_8822B 0xff</div><div class='del'>-#define BIT_SIFS_R2T_OFDM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_R2T_OFDM_8822B) &lt;&lt; BIT_SHIFT_SIFS_R2T_OFDM_8822B)</div><div class='del'>-#define BIT_GET_SIFS_R2T_OFDM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_R2T_OFDM_8822B) &amp; BIT_MASK_SIFS_R2T_OFDM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_T2T_OFDM_8822B 0</div><div class='del'>-#define BIT_MASK_SIFS_T2T_OFDM_8822B 0xff</div><div class='del'>-#define BIT_SIFS_T2T_OFDM_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_T2T_OFDM_8822B) &lt;&lt; BIT_SHIFT_SIFS_T2T_OFDM_8822B)</div><div class='del'>-#define BIT_GET_SIFS_T2T_OFDM_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_T2T_OFDM_8822B) &amp; BIT_MASK_SIFS_T2T_OFDM_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RESP_SIFS_CCK_8822B (RESPONSE SIFS FOR CCK REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_R2T_CCK_8822B 8</div><div class='del'>-#define BIT_MASK_SIFS_R2T_CCK_8822B 0xff</div><div class='del'>-#define BIT_SIFS_R2T_CCK_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_R2T_CCK_8822B) &lt;&lt; BIT_SHIFT_SIFS_R2T_CCK_8822B)</div><div class='del'>-#define BIT_GET_SIFS_R2T_CCK_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_R2T_CCK_8822B) &amp; BIT_MASK_SIFS_R2T_CCK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SIFS_T2T_CCK_8822B 0</div><div class='del'>-#define BIT_MASK_SIFS_T2T_CCK_8822B 0xff</div><div class='del'>-#define BIT_SIFS_T2T_CCK_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SIFS_T2T_CCK_8822B) &lt;&lt; BIT_SHIFT_SIFS_T2T_CCK_8822B)</div><div class='del'>-#define BIT_GET_SIFS_T2T_CCK_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SIFS_T2T_CCK_8822B) &amp; BIT_MASK_SIFS_T2T_CCK_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_EIFS_8822B (EIFS REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EIFS_8822B 0</div><div class='del'>-#define BIT_MASK_EIFS_8822B 0xffff</div><div class='del'>-#define BIT_EIFS_8822B(x) (((x) &amp; BIT_MASK_EIFS_8822B) &lt;&lt; BIT_SHIFT_EIFS_8822B)</div><div class='del'>-#define BIT_GET_EIFS_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EIFS_8822B) &amp; BIT_MASK_EIFS_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CTS2TO_8822B (CTS2 TIMEOUT REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CTS2TO_8822B 0</div><div class='del'>-#define BIT_MASK_CTS2TO_8822B 0xff</div><div class='del'>-#define BIT_CTS2TO_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_CTS2TO_8822B) &lt;&lt; BIT_SHIFT_CTS2TO_8822B)</div><div class='del'>-#define BIT_GET_CTS2TO_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CTS2TO_8822B) &amp; BIT_MASK_CTS2TO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ACKTO_8822B (ACK TIMEOUT REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKTO_8822B 0</div><div class='del'>-#define BIT_MASK_ACKTO_8822B 0xff</div><div class='del'>-#define BIT_ACKTO_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKTO_8822B) &lt;&lt; BIT_SHIFT_ACKTO_8822B)</div><div class='del'>-#define BIT_GET_ACKTO_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKTO_8822B) &amp; BIT_MASK_ACKTO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NAV_CTRL_8822B (NAV CONTROL REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NAV_UPPER_8822B 16</div><div class='del'>-#define BIT_MASK_NAV_UPPER_8822B 0xff</div><div class='del'>-#define BIT_NAV_UPPER_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_NAV_UPPER_8822B) &lt;&lt; BIT_SHIFT_NAV_UPPER_8822B)</div><div class='del'>-#define BIT_GET_NAV_UPPER_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NAV_UPPER_8822B) &amp; BIT_MASK_NAV_UPPER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXMYRTS_NAV_8822B 8</div><div class='del'>-#define BIT_MASK_RXMYRTS_NAV_8822B 0xf</div><div class='del'>-#define BIT_RXMYRTS_NAV_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXMYRTS_NAV_8822B) &lt;&lt; BIT_SHIFT_RXMYRTS_NAV_8822B)</div><div class='del'>-#define BIT_GET_RXMYRTS_NAV_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXMYRTS_NAV_8822B) &amp; BIT_MASK_RXMYRTS_NAV_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTSRST_8822B 0</div><div class='del'>-#define BIT_MASK_RTSRST_8822B 0xff</div><div class='del'>-#define BIT_RTSRST_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTSRST_8822B) &lt;&lt; BIT_SHIFT_RTSRST_8822B)</div><div class='del'>-#define BIT_GET_RTSRST_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTSRST_8822B) &amp; BIT_MASK_RTSRST_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BACAMCMD_8822B (BLOCK ACK CAM COMMAND REGISTER) */</div><div class='del'>-#define BIT_BACAM_POLL_8822B BIT(31)</div><div class='del'>-#define BIT_BACAM_RST_8822B BIT(17)</div><div class='del'>-#define BIT_BACAM_RW_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TXSBM_8822B 14</div><div class='del'>-#define BIT_MASK_TXSBM_8822B 0x3</div><div class='del'>-#define BIT_TXSBM_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_TXSBM_8822B) &lt;&lt; BIT_SHIFT_TXSBM_8822B)</div><div class='del'>-#define BIT_GET_TXSBM_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TXSBM_8822B) &amp; BIT_MASK_TXSBM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BACAM_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_BACAM_ADDR_8822B 0x3f</div><div class='del'>-#define BIT_BACAM_ADDR_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BACAM_ADDR_8822B) &lt;&lt; BIT_SHIFT_BACAM_ADDR_8822B)</div><div class='del'>-#define BIT_GET_BACAM_ADDR_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BACAM_ADDR_8822B) &amp; BIT_MASK_BACAM_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BACAMCONTENT_8822B (BLOCK ACK CAM CONTENT REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BA_CONTENT_H_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_BA_CONTENT_H_8822B 0xffffffffL</div><div class='del'>-#define BIT_BA_CONTENT_H_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BA_CONTENT_H_8822B) &lt;&lt; BIT_SHIFT_BA_CONTENT_H_8822B)</div><div class='del'>-#define BIT_GET_BA_CONTENT_H_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BA_CONTENT_H_8822B) &amp; BIT_MASK_BA_CONTENT_H_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BA_CONTENT_L_8822B 0</div><div class='del'>-#define BIT_MASK_BA_CONTENT_L_8822B 0xffffffffL</div><div class='del'>-#define BIT_BA_CONTENT_L_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BA_CONTENT_L_8822B) &lt;&lt; BIT_SHIFT_BA_CONTENT_L_8822B)</div><div class='del'>-#define BIT_GET_BA_CONTENT_L_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BA_CONTENT_L_8822B) &amp; BIT_MASK_BA_CONTENT_L_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_BITMAP_CTL_8822B */</div><div class='del'>-#define BIT_BITMAP_VO_8822B BIT(7)</div><div class='del'>-#define BIT_BITMAP_VI_8822B BIT(6)</div><div class='del'>-#define BIT_BITMAP_BE_8822B BIT(5)</div><div class='del'>-#define BIT_BITMAP_BK_8822B BIT(4)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BITMAP_CONDITION_8822B 2</div><div class='del'>-#define BIT_MASK_BITMAP_CONDITION_8822B 0x3</div><div class='del'>-#define BIT_BITMAP_CONDITION_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BITMAP_CONDITION_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BITMAP_CONDITION_8822B)</div><div class='del'>-#define BIT_GET_BITMAP_CONDITION_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BITMAP_CONDITION_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BITMAP_CONDITION_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BITMAP_SSNBK_COUNTER_CLR_8822B BIT(1)</div><div class='del'>-#define BIT_BITMAP_FORCE_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_RX_8822B STATUS */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXPKT_TYPE_8822B 2</div><div class='del'>-#define BIT_MASK_RXPKT_TYPE_8822B 0x3f</div><div class='del'>-#define BIT_RXPKT_TYPE_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXPKT_TYPE_8822B) &lt;&lt; BIT_SHIFT_RXPKT_TYPE_8822B)</div><div class='del'>-#define BIT_GET_RXPKT_TYPE_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXPKT_TYPE_8822B) &amp; BIT_MASK_RXPKT_TYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TXACT_IND_8822B BIT(1)</div><div class='del'>-#define BIT_RXACT_IND_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_BACAM_RPMEN_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BITMAP_SSNBK_COUNTER_8822B 2</div><div class='del'>-#define BIT_MASK_BITMAP_SSNBK_COUNTER_8822B 0x3f</div><div class='del'>-#define BIT_BITMAP_SSNBK_COUNTER_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_BITMAP_SSNBK_COUNTER_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BITMAP_SSNBK_COUNTER_8822B)</div><div class='del'>-#define BIT_GET_BITMAP_SSNBK_COUNTER_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BITMAP_SSNBK_COUNTER_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_BITMAP_SSNBK_COUNTER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BITMAP_EN_8822B BIT(1)</div><div class='del'>-#define BIT_WMAC_BACAM_RPMEN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LBDLY_8822B (LOOPBACK DELAY REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LBDLY_8822B 0</div><div class='del'>-#define BIT_MASK_LBDLY_8822B 0x1f</div><div class='del'>-#define BIT_LBDLY_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_LBDLY_8822B) &lt;&lt; BIT_SHIFT_LBDLY_8822B)</div><div class='del'>-#define BIT_GET_LBDLY_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LBDLY_8822B) &amp; BIT_MASK_LBDLY_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXERR_RPT_8822B (RX ERROR REPORT REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXERR_RPT_SEL_V1_3_0_8822B 28</div><div class='del'>-#define BIT_MASK_RXERR_RPT_SEL_V1_3_0_8822B 0xf</div><div class='del'>-#define BIT_RXERR_RPT_SEL_V1_3_0_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXERR_RPT_SEL_V1_3_0_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXERR_RPT_SEL_V1_3_0_8822B)</div><div class='del'>-#define BIT_GET_RXERR_RPT_SEL_V1_3_0_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXERR_RPT_SEL_V1_3_0_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_RXERR_RPT_SEL_V1_3_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RXERR_RPT_RST_8822B BIT(27)</div><div class='del'>-#define BIT_RXERR_RPT_SEL_V1_4_8822B BIT(26)</div><div class='del'>-#define BIT_W1S_8822B BIT(23)</div><div class='del'>-#define BIT_UD_SELECT_BSSID_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_UD_SUB_TYPE_8822B 18</div><div class='del'>-#define BIT_MASK_UD_SUB_TYPE_8822B 0xf</div><div class='del'>-#define BIT_UD_SUB_TYPE_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_UD_SUB_TYPE_8822B) &lt;&lt; BIT_SHIFT_UD_SUB_TYPE_8822B)</div><div class='del'>-#define BIT_GET_UD_SUB_TYPE_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_UD_SUB_TYPE_8822B) &amp; BIT_MASK_UD_SUB_TYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_UD_TYPE_8822B 16</div><div class='del'>-#define BIT_MASK_UD_TYPE_8822B 0x3</div><div class='del'>-#define BIT_UD_TYPE_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_UD_TYPE_8822B) &lt;&lt; BIT_SHIFT_UD_TYPE_8822B)</div><div class='del'>-#define BIT_GET_UD_TYPE_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_UD_TYPE_8822B) &amp; BIT_MASK_UD_TYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RPT_COUNTER_8822B 0</div><div class='del'>-#define BIT_MASK_RPT_COUNTER_8822B 0xffff</div><div class='del'>-#define BIT_RPT_COUNTER_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_RPT_COUNTER_8822B) &lt;&lt; BIT_SHIFT_RPT_COUNTER_8822B)</div><div class='del'>-#define BIT_GET_RPT_COUNTER_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RPT_COUNTER_8822B) &amp; BIT_MASK_RPT_COUNTER_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_TRXPTCL_CTL_8822B (WMAC TX/RX PROTOCOL CONTROL REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBA_TYPSEL_8822B (60 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBA_TYPSEL_8822B 0xf</div><div class='del'>-#define BIT_ACKBA_TYPSEL_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBA_TYPSEL_8822B) &lt;&lt; BIT_SHIFT_ACKBA_TYPSEL_8822B)</div><div class='del'>-#define BIT_GET_ACKBA_TYPSEL_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBA_TYPSEL_8822B) &amp; BIT_MASK_ACKBA_TYPSEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBA_ACKPCHK_8822B (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBA_ACKPCHK_8822B 0xf</div><div class='del'>-#define BIT_ACKBA_ACKPCHK_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBA_ACKPCHK_8822B) &lt;&lt; BIT_SHIFT_ACKBA_ACKPCHK_8822B)</div><div class='del'>-#define BIT_GET_ACKBA_ACKPCHK_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBA_ACKPCHK_8822B) &amp; BIT_MASK_ACKBA_ACKPCHK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBAR_TYPESEL_8822B (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBAR_TYPESEL_8822B 0xff</div><div class='del'>-#define BIT_ACKBAR_TYPESEL_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBAR_TYPESEL_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_ACKBAR_TYPESEL_8822B)</div><div class='del'>-#define BIT_GET_ACKBAR_TYPESEL_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBAR_TYPESEL_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_ACKBAR_TYPESEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ACKBAR_ACKPCHK_8822B (44 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_ACKBAR_ACKPCHK_8822B 0xf</div><div class='del'>-#define BIT_ACKBAR_ACKPCHK_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_ACKBAR_ACKPCHK_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_ACKBAR_ACKPCHK_8822B)</div><div class='del'>-#define BIT_GET_ACKBAR_ACKPCHK_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ACKBAR_ACKPCHK_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_ACKBAR_ACKPCHK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RXBA_IGNOREA2_8822B BIT(42)</div><div class='del'>-#define BIT_EN_SAVE_ALL_TXOPADDR_8822B BIT(41)</div><div class='del'>-#define BIT_EN_TXCTS_TO_TXOPOWNER_INRXNAV_8822B BIT(40)</div><div class='del'>-#define BIT_DIS_TXBA_AMPDUFCSERR_8822B BIT(39)</div><div class='del'>-#define BIT_DIS_TXBA_RXBARINFULL_8822B BIT(38)</div><div class='del'>-#define BIT_DIS_TXCFE_INFULL_8822B BIT(37)</div><div class='del'>-#define BIT_DIS_TXCTS_INFULL_8822B BIT(36)</div><div class='del'>-#define BIT_EN_TXACKBA_IN_TX_RDG_8822B BIT(35)</div><div class='del'>-#define BIT_EN_TXACKBA_IN_TXOP_8822B BIT(34)</div><div class='del'>-#define BIT_EN_TXCTS_IN_RXNAV_8822B BIT(33)</div><div class='del'>-#define BIT_EN_TXCTS_INTXOP_8822B BIT(32)</div><div class='del'>-#define BIT_BLK_EDCA_BBSLP_8822B BIT(31)</div><div class='del'>-#define BIT_BLK_EDCA_BBSBY_8822B BIT(30)</div><div class='del'>-#define BIT_ACKTO_BLOCK_SCH_EN_8822B BIT(27)</div><div class='del'>-#define BIT_EIFS_BLOCK_SCH_EN_8822B BIT(26)</div><div class='del'>-#define BIT_PLCPCHK_RST_EIFS_8822B BIT(25)</div><div class='del'>-#define BIT_CCA_RST_EIFS_8822B BIT(24)</div><div class='del'>-#define BIT_DIS_UPD_MYRXPKTNAV_8822B BIT(23)</div><div class='del'>-#define BIT_EARLY_TXBA_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RESP_CHNBUSY_8822B 20</div><div class='del'>-#define BIT_MASK_RESP_CHNBUSY_8822B 0x3</div><div class='del'>-#define BIT_RESP_CHNBUSY_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RESP_CHNBUSY_8822B) &lt;&lt; BIT_SHIFT_RESP_CHNBUSY_8822B)</div><div class='del'>-#define BIT_GET_RESP_CHNBUSY_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RESP_CHNBUSY_8822B) &amp; BIT_MASK_RESP_CHNBUSY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RESP_DCTS_EN_8822B BIT(19)</div><div class='del'>-#define BIT_RESP_DCFE_EN_8822B BIT(18)</div><div class='del'>-#define BIT_RESP_SPLCPEN_8822B BIT(17)</div><div class='del'>-#define BIT_RESP_SGIEN_8822B BIT(16)</div><div class='del'>-#define BIT_RESP_LDPC_EN_8822B BIT(15)</div><div class='del'>-#define BIT_DIS_RESP_ACKINCCA_8822B BIT(14)</div><div class='del'>-#define BIT_DIS_RESP_CTSINCCA_8822B BIT(13)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_SECOND_CCA_TIMER_8822B 10</div><div class='del'>-#define BIT_MASK_R_WMAC_SECOND_CCA_TIMER_8822B 0x7</div><div class='del'>-#define BIT_R_WMAC_SECOND_CCA_TIMER_8822B(x)                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_SECOND_CCA_TIMER_8822B)                        \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_SECOND_CCA_TIMER_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_SECOND_CCA_TIMER_8822B(x)                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_SECOND_CCA_TIMER_8822B) &amp;                    \</div><div class='del'>-	 BIT_MASK_R_WMAC_SECOND_CCA_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RFMOD_8822B 7</div><div class='del'>-#define BIT_MASK_RFMOD_8822B 0x3</div><div class='del'>-#define BIT_RFMOD_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_RFMOD_8822B) &lt;&lt; BIT_SHIFT_RFMOD_8822B)</div><div class='del'>-#define BIT_GET_RFMOD_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RFMOD_8822B) &amp; BIT_MASK_RFMOD_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RESP_CTS_DYNBW_SEL_8822B 5</div><div class='del'>-#define BIT_MASK_RESP_CTS_DYNBW_SEL_8822B 0x3</div><div class='del'>-#define BIT_RESP_CTS_DYNBW_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_RESP_CTS_DYNBW_SEL_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RESP_CTS_DYNBW_SEL_8822B)</div><div class='del'>-#define BIT_GET_RESP_CTS_DYNBW_SEL_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RESP_CTS_DYNBW_SEL_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_RESP_CTS_DYNBW_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DLY_TX_WAIT_RXANTSEL_8822B BIT(4)</div><div class='del'>-#define BIT_TXRESP_BY_RXANTSEL_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ORIG_DCTS_CHK_8822B 0</div><div class='del'>-#define BIT_MASK_ORIG_DCTS_CHK_8822B 0x3</div><div class='del'>-#define BIT_ORIG_DCTS_CHK_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_ORIG_DCTS_CHK_8822B) &lt;&lt; BIT_SHIFT_ORIG_DCTS_CHK_8822B)</div><div class='del'>-#define BIT_GET_ORIG_DCTS_CHK_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ORIG_DCTS_CHK_8822B) &amp; BIT_MASK_ORIG_DCTS_CHK_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMCMD_8822B (CAM COMMAND REGISTER) */</div><div class='del'>-#define BIT_SECCAM_POLLING_8822B BIT(31)</div><div class='del'>-#define BIT_SECCAM_CLR_8822B BIT(30)</div><div class='del'>-#define BIT_MFBCAM_CLR_8822B BIT(29)</div><div class='del'>-#define BIT_SECCAM_WE_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SECCAM_ADDR_V2_8822B 0</div><div class='del'>-#define BIT_MASK_SECCAM_ADDR_V2_8822B 0x3ff</div><div class='del'>-#define BIT_SECCAM_ADDR_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_SECCAM_ADDR_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SECCAM_ADDR_V2_8822B)</div><div class='del'>-#define BIT_GET_SECCAM_ADDR_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SECCAM_ADDR_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_SECCAM_ADDR_V2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMWRITE_8822B (CAM WRITE REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMW_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_CAMW_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_CAMW_DATA_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMW_DATA_8822B) &lt;&lt; BIT_SHIFT_CAMW_DATA_8822B)</div><div class='del'>-#define BIT_GET_CAMW_DATA_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMW_DATA_8822B) &amp; BIT_MASK_CAMW_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMREAD_8822B (CAM READ REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMR_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_CAMR_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_CAMR_DATA_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMR_DATA_8822B) &lt;&lt; BIT_SHIFT_CAMR_DATA_8822B)</div><div class='del'>-#define BIT_GET_CAMR_DATA_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMR_DATA_8822B) &amp; BIT_MASK_CAMR_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_CAMDBG_8822B (CAM DEBUG REGISTER) */</div><div class='del'>-#define BIT_SECCAM_INFO_8822B BIT(31)</div><div class='del'>-#define BIT_SEC_KEYFOUND_8822B BIT(15)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMDBG_SEC_TYPE_8822B 12</div><div class='del'>-#define BIT_MASK_CAMDBG_SEC_TYPE_8822B 0x7</div><div class='del'>-#define BIT_CAMDBG_SEC_TYPE_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMDBG_SEC_TYPE_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CAMDBG_SEC_TYPE_8822B)</div><div class='del'>-#define BIT_GET_CAMDBG_SEC_TYPE_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMDBG_SEC_TYPE_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CAMDBG_SEC_TYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_CAMDBG_EXT_SECTYPE_8822B BIT(11)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMDBG_MIC_KEY_IDX_8822B 5</div><div class='del'>-#define BIT_MASK_CAMDBG_MIC_KEY_IDX_8822B 0x1f</div><div class='del'>-#define BIT_CAMDBG_MIC_KEY_IDX_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMDBG_MIC_KEY_IDX_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CAMDBG_MIC_KEY_IDX_8822B)</div><div class='del'>-#define BIT_GET_CAMDBG_MIC_KEY_IDX_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMDBG_MIC_KEY_IDX_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_CAMDBG_MIC_KEY_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CAMDBG_SEC_KEY_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_CAMDBG_SEC_KEY_IDX_8822B 0x1f</div><div class='del'>-#define BIT_CAMDBG_SEC_KEY_IDX_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_CAMDBG_SEC_KEY_IDX_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CAMDBG_SEC_KEY_IDX_8822B)</div><div class='del'>-#define BIT_GET_CAMDBG_SEC_KEY_IDX_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CAMDBG_SEC_KEY_IDX_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_CAMDBG_SEC_KEY_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_ACTION_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_ACTION_1_8822B 0</div><div class='del'>-#define BIT_MASK_RXFILTER_ACTION_1_8822B 0xff</div><div class='del'>-#define BIT_RXFILTER_ACTION_1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_ACTION_1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFILTER_ACTION_1_8822B)</div><div class='del'>-#define BIT_GET_RXFILTER_ACTION_1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_ACTION_1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_RXFILTER_ACTION_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_CATEGORY_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_CATEGORY_1_8822B 0</div><div class='del'>-#define BIT_MASK_RXFILTER_CATEGORY_1_8822B 0xff</div><div class='del'>-#define BIT_RXFILTER_CATEGORY_1_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_CATEGORY_1_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFILTER_CATEGORY_1_8822B)</div><div class='del'>-#define BIT_GET_RXFILTER_CATEGORY_1_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_CATEGORY_1_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_RXFILTER_CATEGORY_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SECCFG_8822B (SECURITY CONFIGURATION REGISTER) */</div><div class='del'>-#define BIT_DIS_GCLK_WAPI_8822B BIT(15)</div><div class='del'>-#define BIT_DIS_GCLK_AES_8822B BIT(14)</div><div class='del'>-#define BIT_DIS_GCLK_TKIP_8822B BIT(13)</div><div class='del'>-#define BIT_AES_SEL_QC_1_8822B BIT(12)</div><div class='del'>-#define BIT_AES_SEL_QC_0_8822B BIT(11)</div><div class='del'>-#define BIT_CHK_BMC_8822B BIT(9)</div><div class='del'>-#define BIT_CHK_KEYID_8822B BIT(8)</div><div class='del'>-#define BIT_RXBCUSEDK_8822B BIT(7)</div><div class='del'>-#define BIT_TXBCUSEDK_8822B BIT(6)</div><div class='del'>-#define BIT_NOSKMC_8822B BIT(5)</div><div class='del'>-#define BIT_SKBYA2_8822B BIT(4)</div><div class='del'>-#define BIT_RXDEC_8822B BIT(3)</div><div class='del'>-#define BIT_TXENC_8822B BIT(2)</div><div class='del'>-#define BIT_RXUHUSEDK_8822B BIT(1)</div><div class='del'>-#define BIT_TXUHUSEDK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_ACTION_3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_ACTION_3_8822B 0</div><div class='del'>-#define BIT_MASK_RXFILTER_ACTION_3_8822B 0xff</div><div class='del'>-#define BIT_RXFILTER_ACTION_3_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_ACTION_3_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFILTER_ACTION_3_8822B)</div><div class='del'>-#define BIT_GET_RXFILTER_ACTION_3_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_ACTION_3_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_RXFILTER_ACTION_3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_CATEGORY_3_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_CATEGORY_3_8822B 0</div><div class='del'>-#define BIT_MASK_RXFILTER_CATEGORY_3_8822B 0xff</div><div class='del'>-#define BIT_RXFILTER_CATEGORY_3_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_CATEGORY_3_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFILTER_CATEGORY_3_8822B)</div><div class='del'>-#define BIT_GET_RXFILTER_CATEGORY_3_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_CATEGORY_3_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_RXFILTER_CATEGORY_3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_ACTION_2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_ACTION_2_8822B 0</div><div class='del'>-#define BIT_MASK_RXFILTER_ACTION_2_8822B 0xff</div><div class='del'>-#define BIT_RXFILTER_ACTION_2_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_ACTION_2_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFILTER_ACTION_2_8822B)</div><div class='del'>-#define BIT_GET_RXFILTER_ACTION_2_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_ACTION_2_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_RXFILTER_ACTION_2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFILTER_CATEGORY_2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXFILTER_CATEGORY_2_8822B 0</div><div class='del'>-#define BIT_MASK_RXFILTER_CATEGORY_2_8822B 0xff</div><div class='del'>-#define BIT_RXFILTER_CATEGORY_2_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXFILTER_CATEGORY_2_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXFILTER_CATEGORY_2_8822B)</div><div class='del'>-#define BIT_GET_RXFILTER_CATEGORY_2_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXFILTER_CATEGORY_2_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_RXFILTER_CATEGORY_2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP4_8822B (RX FILTER MAP GROUP 4) */</div><div class='del'>-#define BIT_CTRLFLT15EN_FW_8822B BIT(15)</div><div class='del'>-#define BIT_CTRLFLT14EN_FW_8822B BIT(14)</div><div class='del'>-#define BIT_CTRLFLT13EN_FW_8822B BIT(13)</div><div class='del'>-#define BIT_CTRLFLT12EN_FW_8822B BIT(12)</div><div class='del'>-#define BIT_CTRLFLT11EN_FW_8822B BIT(11)</div><div class='del'>-#define BIT_CTRLFLT10EN_FW_8822B BIT(10)</div><div class='del'>-#define BIT_CTRLFLT9EN_FW_8822B BIT(9)</div><div class='del'>-#define BIT_CTRLFLT8EN_FW_8822B BIT(8)</div><div class='del'>-#define BIT_CTRLFLT7EN_FW_8822B BIT(7)</div><div class='del'>-#define BIT_CTRLFLT6EN_FW_8822B BIT(6)</div><div class='del'>-#define BIT_CTRLFLT5EN_FW_8822B BIT(5)</div><div class='del'>-#define BIT_CTRLFLT4EN_FW_8822B BIT(4)</div><div class='del'>-#define BIT_CTRLFLT3EN_FW_8822B BIT(3)</div><div class='del'>-#define BIT_CTRLFLT2EN_FW_8822B BIT(2)</div><div class='del'>-#define BIT_CTRLFLT1EN_FW_8822B BIT(1)</div><div class='del'>-#define BIT_CTRLFLT0EN_FW_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP3_8822B (RX FILTER MAP GROUP 3) */</div><div class='del'>-#define BIT_MGTFLT15EN_FW_8822B BIT(15)</div><div class='del'>-#define BIT_MGTFLT14EN_FW_8822B BIT(14)</div><div class='del'>-#define BIT_MGTFLT13EN_FW_8822B BIT(13)</div><div class='del'>-#define BIT_MGTFLT12EN_FW_8822B BIT(12)</div><div class='del'>-#define BIT_MGTFLT11EN_FW_8822B BIT(11)</div><div class='del'>-#define BIT_MGTFLT10EN_FW_8822B BIT(10)</div><div class='del'>-#define BIT_MGTFLT9EN_FW_8822B BIT(9)</div><div class='del'>-#define BIT_MGTFLT8EN_FW_8822B BIT(8)</div><div class='del'>-#define BIT_MGTFLT7EN_FW_8822B BIT(7)</div><div class='del'>-#define BIT_MGTFLT6EN_FW_8822B BIT(6)</div><div class='del'>-#define BIT_MGTFLT5EN_FW_8822B BIT(5)</div><div class='del'>-#define BIT_MGTFLT4EN_FW_8822B BIT(4)</div><div class='del'>-#define BIT_MGTFLT3EN_FW_8822B BIT(3)</div><div class='del'>-#define BIT_MGTFLT2EN_FW_8822B BIT(2)</div><div class='del'>-#define BIT_MGTFLT1EN_FW_8822B BIT(1)</div><div class='del'>-#define BIT_MGTFLT0EN_FW_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP6_8822B (RX FILTER MAP GROUP 3) */</div><div class='del'>-#define BIT_ACTIONFLT15EN_FW_8822B BIT(15)</div><div class='del'>-#define BIT_ACTIONFLT14EN_FW_8822B BIT(14)</div><div class='del'>-#define BIT_ACTIONFLT13EN_FW_8822B BIT(13)</div><div class='del'>-#define BIT_ACTIONFLT12EN_FW_8822B BIT(12)</div><div class='del'>-#define BIT_ACTIONFLT11EN_FW_8822B BIT(11)</div><div class='del'>-#define BIT_ACTIONFLT10EN_FW_8822B BIT(10)</div><div class='del'>-#define BIT_ACTIONFLT9EN_FW_8822B BIT(9)</div><div class='del'>-#define BIT_ACTIONFLT8EN_FW_8822B BIT(8)</div><div class='del'>-#define BIT_ACTIONFLT7EN_FW_8822B BIT(7)</div><div class='del'>-#define BIT_ACTIONFLT6EN_FW_8822B BIT(6)</div><div class='del'>-#define BIT_ACTIONFLT5EN_FW_8822B BIT(5)</div><div class='del'>-#define BIT_ACTIONFLT4EN_FW_8822B BIT(4)</div><div class='del'>-#define BIT_ACTIONFLT3EN_FW_8822B BIT(3)</div><div class='del'>-#define BIT_ACTIONFLT2EN_FW_8822B BIT(2)</div><div class='del'>-#define BIT_ACTIONFLT1EN_FW_8822B BIT(1)</div><div class='del'>-#define BIT_ACTIONFLT0EN_FW_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP5_8822B (RX FILTER MAP GROUP 3) */</div><div class='del'>-#define BIT_DATAFLT15EN_FW_8822B BIT(15)</div><div class='del'>-#define BIT_DATAFLT14EN_FW_8822B BIT(14)</div><div class='del'>-#define BIT_DATAFLT13EN_FW_8822B BIT(13)</div><div class='del'>-#define BIT_DATAFLT12EN_FW_8822B BIT(12)</div><div class='del'>-#define BIT_DATAFLT11EN_FW_8822B BIT(11)</div><div class='del'>-#define BIT_DATAFLT10EN_FW_8822B BIT(10)</div><div class='del'>-#define BIT_DATAFLT9EN_FW_8822B BIT(9)</div><div class='del'>-#define BIT_DATAFLT8EN_FW_8822B BIT(8)</div><div class='del'>-#define BIT_DATAFLT7EN_FW_8822B BIT(7)</div><div class='del'>-#define BIT_DATAFLT6EN_FW_8822B BIT(6)</div><div class='del'>-#define BIT_DATAFLT5EN_FW_8822B BIT(5)</div><div class='del'>-#define BIT_DATAFLT4EN_FW_8822B BIT(4)</div><div class='del'>-#define BIT_DATAFLT3EN_FW_8822B BIT(3)</div><div class='del'>-#define BIT_DATAFLT2EN_FW_8822B BIT(2)</div><div class='del'>-#define BIT_DATAFLT1EN_FW_8822B BIT(1)</div><div class='del'>-#define BIT_DATAFLT0EN_FW_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMMPS_UAPSD_TID_8822B (WMM POWER SAVE UAPSD TID REGISTER) */</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID7_8822B BIT(7)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID6_8822B BIT(6)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID5_8822B BIT(5)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID4_8822B BIT(4)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID3_8822B BIT(3)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID2_8822B BIT(2)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID1_8822B BIT(1)</div><div class='del'>-#define BIT_WMMPS_UAPSD_TID0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_PS_RX_INFO_8822B (POWER SAVE RX INFORMATION REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PORTSEL__PS_RX_INFO_8822B 5</div><div class='del'>-#define BIT_MASK_PORTSEL__PS_RX_INFO_8822B 0x7</div><div class='del'>-#define BIT_PORTSEL__PS_RX_INFO_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_PORTSEL__PS_RX_INFO_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PORTSEL__PS_RX_INFO_8822B)</div><div class='del'>-#define BIT_GET_PORTSEL__PS_RX_INFO_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PORTSEL__PS_RX_INFO_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_PORTSEL__PS_RX_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RXCTRLIN0_8822B BIT(4)</div><div class='del'>-#define BIT_RXMGTIN0_8822B BIT(3)</div><div class='del'>-#define BIT_RXDATAIN2_8822B BIT(2)</div><div class='del'>-#define BIT_RXDATAIN1_8822B BIT(1)</div><div class='del'>-#define BIT_RXDATAIN0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NAN_RX_TSF_FILTER_8822B(NAN_RX_TSF_ADDRESS_FILTER) */</div><div class='del'>-#define BIT_CHK_TSF_TA_8822B BIT(2)</div><div class='del'>-#define BIT_CHK_TSF_CBSSID_8822B BIT(1)</div><div class='del'>-#define BIT_CHK_TSF_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WOW_CTRL_8822B (WAKE ON WLAN CONTROL REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PSF_BSSIDSEL_B2B1_8822B 6</div><div class='del'>-#define BIT_MASK_PSF_BSSIDSEL_B2B1_8822B 0x3</div><div class='del'>-#define BIT_PSF_BSSIDSEL_B2B1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_PSF_BSSIDSEL_B2B1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PSF_BSSIDSEL_B2B1_8822B)</div><div class='del'>-#define BIT_GET_PSF_BSSIDSEL_B2B1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PSF_BSSIDSEL_B2B1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_PSF_BSSIDSEL_B2B1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_WOWHCI_8822B BIT(5)</div><div class='del'>-#define BIT_PSF_BSSIDSEL_B0_8822B BIT(4)</div><div class='del'>-#define BIT_UWF_8822B BIT(3)</div><div class='del'>-#define BIT_MAGIC_8822B BIT(2)</div><div class='del'>-#define BIT_WOWEN_8822B BIT(1)</div><div class='del'>-#define BIT_FORCE_WAKEUP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LPNAV_CTRL_8822B (LOW POWER NAV CONTROL REGISTER) */</div><div class='del'>-#define BIT_LPNAV_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPNAV_EARLY_8822B 16</div><div class='del'>-#define BIT_MASK_LPNAV_EARLY_8822B 0x7fff</div><div class='del'>-#define BIT_LPNAV_EARLY_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPNAV_EARLY_8822B) &lt;&lt; BIT_SHIFT_LPNAV_EARLY_8822B)</div><div class='del'>-#define BIT_GET_LPNAV_EARLY_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPNAV_EARLY_8822B) &amp; BIT_MASK_LPNAV_EARLY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LPNAV_TH_8822B 0</div><div class='del'>-#define BIT_MASK_LPNAV_TH_8822B 0xffff</div><div class='del'>-#define BIT_LPNAV_TH_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_LPNAV_TH_8822B) &lt;&lt; BIT_SHIFT_LPNAV_TH_8822B)</div><div class='del'>-#define BIT_GET_LPNAV_TH_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LPNAV_TH_8822B) &amp; BIT_MASK_LPNAV_TH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WKFMCAM_CMD_8822B (WAKEUP FRAME CAM COMMAND REGISTER) */</div><div class='del'>-#define BIT_WKFCAM_POLLING_V1_8822B BIT(31)</div><div class='del'>-#define BIT_WKFCAM_CLR_V1_8822B BIT(30)</div><div class='del'>-#define BIT_WKFCAM_WE_8822B BIT(16)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WKFCAM_ADDR_V2_8822B 8</div><div class='del'>-#define BIT_MASK_WKFCAM_ADDR_V2_8822B 0xff</div><div class='del'>-#define BIT_WKFCAM_ADDR_V2_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WKFCAM_ADDR_V2_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WKFCAM_ADDR_V2_8822B)</div><div class='del'>-#define BIT_GET_WKFCAM_ADDR_V2_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WKFCAM_ADDR_V2_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_WKFCAM_ADDR_V2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WKFCAM_CAM_NUM_V1_8822B 0</div><div class='del'>-#define BIT_MASK_WKFCAM_CAM_NUM_V1_8822B 0xff</div><div class='del'>-#define BIT_WKFCAM_CAM_NUM_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WKFCAM_CAM_NUM_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WKFCAM_CAM_NUM_V1_8822B)</div><div class='del'>-#define BIT_GET_WKFCAM_CAM_NUM_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WKFCAM_CAM_NUM_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WKFCAM_CAM_NUM_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WKFMCAM_RWD_8822B (WAKEUP FRAME READ/WRITE DATA) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WKFMCAM_RWD_8822B 0</div><div class='del'>-#define BIT_MASK_WKFMCAM_RWD_8822B 0xffffffffL</div><div class='del'>-#define BIT_WKFMCAM_RWD_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WKFMCAM_RWD_8822B) &lt;&lt; BIT_SHIFT_WKFMCAM_RWD_8822B)</div><div class='del'>-#define BIT_GET_WKFMCAM_RWD_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WKFMCAM_RWD_8822B) &amp; BIT_MASK_WKFMCAM_RWD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP1_8822B (RX FILTER MAP GROUP 1) */</div><div class='del'>-#define BIT_CTRLFLT15EN_8822B BIT(15)</div><div class='del'>-#define BIT_CTRLFLT14EN_8822B BIT(14)</div><div class='del'>-#define BIT_CTRLFLT13EN_8822B BIT(13)</div><div class='del'>-#define BIT_CTRLFLT12EN_8822B BIT(12)</div><div class='del'>-#define BIT_CTRLFLT11EN_8822B BIT(11)</div><div class='del'>-#define BIT_CTRLFLT10EN_8822B BIT(10)</div><div class='del'>-#define BIT_CTRLFLT9EN_8822B BIT(9)</div><div class='del'>-#define BIT_CTRLFLT8EN_8822B BIT(8)</div><div class='del'>-#define BIT_CTRLFLT7EN_8822B BIT(7)</div><div class='del'>-#define BIT_CTRLFLT6EN_8822B BIT(6)</div><div class='del'>-#define BIT_CTRLFLT5EN_8822B BIT(5)</div><div class='del'>-#define BIT_CTRLFLT4EN_8822B BIT(4)</div><div class='del'>-#define BIT_CTRLFLT3EN_8822B BIT(3)</div><div class='del'>-#define BIT_CTRLFLT2EN_8822B BIT(2)</div><div class='del'>-#define BIT_CTRLFLT1EN_8822B BIT(1)</div><div class='del'>-#define BIT_CTRLFLT0EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP0_8822B (RX FILTER MAP GROUP 0) */</div><div class='del'>-#define BIT_MGTFLT15EN_8822B BIT(15)</div><div class='del'>-#define BIT_MGTFLT14EN_8822B BIT(14)</div><div class='del'>-#define BIT_MGTFLT13EN_8822B BIT(13)</div><div class='del'>-#define BIT_MGTFLT12EN_8822B BIT(12)</div><div class='del'>-#define BIT_MGTFLT11EN_8822B BIT(11)</div><div class='del'>-#define BIT_MGTFLT10EN_8822B BIT(10)</div><div class='del'>-#define BIT_MGTFLT9EN_8822B BIT(9)</div><div class='del'>-#define BIT_MGTFLT8EN_8822B BIT(8)</div><div class='del'>-#define BIT_MGTFLT7EN_8822B BIT(7)</div><div class='del'>-#define BIT_MGTFLT6EN_8822B BIT(6)</div><div class='del'>-#define BIT_MGTFLT5EN_8822B BIT(5)</div><div class='del'>-#define BIT_MGTFLT4EN_8822B BIT(4)</div><div class='del'>-#define BIT_MGTFLT3EN_8822B BIT(3)</div><div class='del'>-#define BIT_MGTFLT2EN_8822B BIT(2)</div><div class='del'>-#define BIT_MGTFLT1EN_8822B BIT(1)</div><div class='del'>-#define BIT_MGTFLT0EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXFLTMAP_8822B (RX FILTER MAP GROUP 2) */</div><div class='del'>-#define BIT_DATAFLT15EN_8822B BIT(15)</div><div class='del'>-#define BIT_DATAFLT14EN_8822B BIT(14)</div><div class='del'>-#define BIT_DATAFLT13EN_8822B BIT(13)</div><div class='del'>-#define BIT_DATAFLT12EN_8822B BIT(12)</div><div class='del'>-#define BIT_DATAFLT11EN_8822B BIT(11)</div><div class='del'>-#define BIT_DATAFLT10EN_8822B BIT(10)</div><div class='del'>-#define BIT_DATAFLT9EN_8822B BIT(9)</div><div class='del'>-#define BIT_DATAFLT8EN_8822B BIT(8)</div><div class='del'>-#define BIT_DATAFLT7EN_8822B BIT(7)</div><div class='del'>-#define BIT_DATAFLT6EN_8822B BIT(6)</div><div class='del'>-#define BIT_DATAFLT5EN_8822B BIT(5)</div><div class='del'>-#define BIT_DATAFLT4EN_8822B BIT(4)</div><div class='del'>-#define BIT_DATAFLT3EN_8822B BIT(3)</div><div class='del'>-#define BIT_DATAFLT2EN_8822B BIT(2)</div><div class='del'>-#define BIT_DATAFLT1EN_8822B BIT(1)</div><div class='del'>-#define BIT_DATAFLT0EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT_8822B (BEACON PARSER REPORT REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT_8822B 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT_8822B 0xff</div><div class='del'>-#define BIT_DTIM_CNT_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_CNT_8822B) &lt;&lt; BIT_SHIFT_DTIM_CNT_8822B)</div><div class='del'>-#define BIT_GET_DTIM_CNT_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_CNT_8822B) &amp; BIT_MASK_DTIM_CNT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD_8822B 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD_8822B 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD_8822B) &lt;&lt; BIT_SHIFT_DTIM_PERIOD_8822B)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD_8822B) &amp; BIT_MASK_DTIM_PERIOD_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM_8822B BIT(15)</div><div class='del'>-#define BIT_TIM_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_0_8822B 0</div><div class='del'>-#define BIT_MASK_PS_AID_0_8822B 0x7ff</div><div class='del'>-#define BIT_PS_AID_0_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_AID_0_8822B) &lt;&lt; BIT_SHIFT_PS_AID_0_8822B)</div><div class='del'>-#define BIT_GET_PS_AID_0_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_AID_0_8822B) &amp; BIT_MASK_PS_AID_0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_TRPC_8822B (TIMER OF FLC_RPC) */</div><div class='del'>-#define BIT_FLC_RPCT_V1_8822B BIT(7)</div><div class='del'>-#define BIT_MODE_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRPCD_8822B 0</div><div class='del'>-#define BIT_MASK_TRPCD_8822B 0x3f</div><div class='del'>-#define BIT_TRPCD_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRPCD_8822B) &lt;&lt; BIT_SHIFT_TRPCD_8822B)</div><div class='del'>-#define BIT_GET_TRPCD_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRPCD_8822B) &amp; BIT_MASK_TRPCD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_PTS_8822B (PKT TYPE SELECTION OF FLC_RPC T) */</div><div class='del'>-#define BIT_CMF_8822B BIT(2)</div><div class='del'>-#define BIT_CCF_8822B BIT(1)</div><div class='del'>-#define BIT_CDF_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_RPCT_8822B (FLC_RPC THRESHOLD) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FLC_RPCT_8822B 0</div><div class='del'>-#define BIT_MASK_FLC_RPCT_8822B 0xff</div><div class='del'>-#define BIT_FLC_RPCT_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_FLC_RPCT_8822B) &lt;&lt; BIT_SHIFT_FLC_RPCT_8822B)</div><div class='del'>-#define BIT_GET_FLC_RPCT_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FLC_RPCT_8822B) &amp; BIT_MASK_FLC_RPCT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_FLC_RPC_8822B (FW LPS CONDITION -- RX PKT COUNTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FLC_RPC_8822B 0</div><div class='del'>-#define BIT_MASK_FLC_RPC_8822B 0xff</div><div class='del'>-#define BIT_FLC_RPC_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_FLC_RPC_8822B) &lt;&lt; BIT_SHIFT_FLC_RPC_8822B)</div><div class='del'>-#define BIT_GET_FLC_RPC_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FLC_RPC_8822B) &amp; BIT_MASK_FLC_RPC_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXPKTMON_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXBKQPKT_SEQ_8822B 20</div><div class='del'>-#define BIT_MASK_RXBKQPKT_SEQ_8822B 0xf</div><div class='del'>-#define BIT_RXBKQPKT_SEQ_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXBKQPKT_SEQ_8822B) &lt;&lt; BIT_SHIFT_RXBKQPKT_SEQ_8822B)</div><div class='del'>-#define BIT_GET_RXBKQPKT_SEQ_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXBKQPKT_SEQ_8822B) &amp; BIT_MASK_RXBKQPKT_SEQ_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXBEQPKT_SEQ_8822B 16</div><div class='del'>-#define BIT_MASK_RXBEQPKT_SEQ_8822B 0xf</div><div class='del'>-#define BIT_RXBEQPKT_SEQ_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXBEQPKT_SEQ_8822B) &lt;&lt; BIT_SHIFT_RXBEQPKT_SEQ_8822B)</div><div class='del'>-#define BIT_GET_RXBEQPKT_SEQ_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXBEQPKT_SEQ_8822B) &amp; BIT_MASK_RXBEQPKT_SEQ_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXVIQPKT_SEQ_8822B 12</div><div class='del'>-#define BIT_MASK_RXVIQPKT_SEQ_8822B 0xf</div><div class='del'>-#define BIT_RXVIQPKT_SEQ_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXVIQPKT_SEQ_8822B) &lt;&lt; BIT_SHIFT_RXVIQPKT_SEQ_8822B)</div><div class='del'>-#define BIT_GET_RXVIQPKT_SEQ_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXVIQPKT_SEQ_8822B) &amp; BIT_MASK_RXVIQPKT_SEQ_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXVOQPKT_SEQ_8822B 8</div><div class='del'>-#define BIT_MASK_RXVOQPKT_SEQ_8822B 0xf</div><div class='del'>-#define BIT_RXVOQPKT_SEQ_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXVOQPKT_SEQ_8822B) &lt;&lt; BIT_SHIFT_RXVOQPKT_SEQ_8822B)</div><div class='del'>-#define BIT_GET_RXVOQPKT_SEQ_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXVOQPKT_SEQ_8822B) &amp; BIT_MASK_RXVOQPKT_SEQ_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_RXBKQPKT_ERR_8822B BIT(7)</div><div class='del'>-#define BIT_RXBEQPKT_ERR_8822B BIT(6)</div><div class='del'>-#define BIT_RXVIQPKT_ERR_8822B BIT(5)</div><div class='del'>-#define BIT_RXVOQPKT_ERR_8822B BIT(4)</div><div class='del'>-#define BIT_RXDMA_MON_EN_8822B BIT(2)</div><div class='del'>-#define BIT_RXPKT_MON_RST_8822B BIT(1)</div><div class='del'>-#define BIT_RXPKT_MON_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_STATE_MON_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATE_SEL_8822B 24</div><div class='del'>-#define BIT_MASK_STATE_SEL_8822B 0x1f</div><div class='del'>-#define BIT_STATE_SEL_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATE_SEL_8822B) &lt;&lt; BIT_SHIFT_STATE_SEL_8822B)</div><div class='del'>-#define BIT_GET_STATE_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATE_SEL_8822B) &amp; BIT_MASK_STATE_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATE_INFO_8822B 8</div><div class='del'>-#define BIT_MASK_STATE_INFO_8822B 0xff</div><div class='del'>-#define BIT_STATE_INFO_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATE_INFO_8822B) &lt;&lt; BIT_SHIFT_STATE_INFO_8822B)</div><div class='del'>-#define BIT_GET_STATE_INFO_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATE_INFO_8822B) &amp; BIT_MASK_STATE_INFO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_UPD_NXT_STATE_8822B BIT(7)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CUR_STATE_8822B 0</div><div class='del'>-#define BIT_MASK_CUR_STATE_8822B 0x7f</div><div class='del'>-#define BIT_CUR_STATE_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_CUR_STATE_8822B) &lt;&lt; BIT_SHIFT_CUR_STATE_8822B)</div><div class='del'>-#define BIT_GET_CUR_STATE_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CUR_STATE_8822B) &amp; BIT_MASK_CUR_STATE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ERROR_MON_8822B */</div><div class='del'>-#define BIT_MACRX_ERR_1_8822B BIT(17)</div><div class='del'>-#define BIT_MACRX_ERR_0_8822B BIT(16)</div><div class='del'>-#define BIT_MACTX_ERR_3_8822B BIT(3)</div><div class='del'>-#define BIT_MACTX_ERR_2_8822B BIT(2)</div><div class='del'>-#define BIT_MACTX_ERR_1_8822B BIT(1)</div><div class='del'>-#define BIT_MACTX_ERR_0_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SEARCH_MACID_8822B */</div><div class='del'>-#define BIT_EN_TXRPTBUF_CLK_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INFO_INDEX_OFFSET_8822B 16</div><div class='del'>-#define BIT_MASK_INFO_INDEX_OFFSET_8822B 0x1fff</div><div class='del'>-#define BIT_INFO_INDEX_OFFSET_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_INFO_INDEX_OFFSET_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_INFO_INDEX_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_INFO_INDEX_OFFSET_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INFO_INDEX_OFFSET_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_INFO_INDEX_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_SRCH_FIFOFULL_8822B BIT(15)</div><div class='del'>-#define BIT_DIS_INFOSRCH_8822B BIT(14)</div><div class='del'>-#define BIT_DISABLE_B0_8822B BIT(13)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INFO_ADDR_OFFSET_8822B 0</div><div class='del'>-#define BIT_MASK_INFO_ADDR_OFFSET_8822B 0x1fff</div><div class='del'>-#define BIT_INFO_ADDR_OFFSET_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_INFO_ADDR_OFFSET_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_INFO_ADDR_OFFSET_8822B)</div><div class='del'>-#define BIT_GET_INFO_ADDR_OFFSET_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INFO_ADDR_OFFSET_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_INFO_ADDR_OFFSET_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_TABLE_8822B (BT-COEXISTENCE CONTROL REGISTER) */</div><div class='del'>-#define BIT_PRI_MASK_RX_RESP_8822B BIT(126)</div><div class='del'>-#define BIT_PRI_MASK_RXOFDM_8822B BIT(125)</div><div class='del'>-#define BIT_PRI_MASK_RXCCK_8822B BIT(124)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_TXAC_8822B (117 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_TXAC_8822B 0x7f</div><div class='del'>-#define BIT_PRI_MASK_TXAC_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_TXAC_8822B) &lt;&lt; BIT_SHIFT_PRI_MASK_TXAC_8822B)</div><div class='del'>-#define BIT_GET_PRI_MASK_TXAC_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_TXAC_8822B) &amp; BIT_MASK_PRI_MASK_TXAC_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_NAV_8822B (109 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_NAV_8822B 0xff</div><div class='del'>-#define BIT_PRI_MASK_NAV_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_NAV_8822B) &lt;&lt; BIT_SHIFT_PRI_MASK_NAV_8822B)</div><div class='del'>-#define BIT_GET_PRI_MASK_NAV_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_NAV_8822B) &amp; BIT_MASK_PRI_MASK_NAV_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PRI_MASK_CCK_8822B BIT(108)</div><div class='del'>-#define BIT_PRI_MASK_OFDM_8822B BIT(107)</div><div class='del'>-#define BIT_PRI_MASK_RTY_8822B BIT(106)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_NUM_8822B (102 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_NUM_8822B 0xf</div><div class='del'>-#define BIT_PRI_MASK_NUM_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_NUM_8822B) &lt;&lt; BIT_SHIFT_PRI_MASK_NUM_8822B)</div><div class='del'>-#define BIT_GET_PRI_MASK_NUM_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_NUM_8822B) &amp; BIT_MASK_PRI_MASK_NUM_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PRI_MASK_TYPE_8822B (98 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_PRI_MASK_TYPE_8822B 0xf</div><div class='del'>-#define BIT_PRI_MASK_TYPE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PRI_MASK_TYPE_8822B) &lt;&lt; BIT_SHIFT_PRI_MASK_TYPE_8822B)</div><div class='del'>-#define BIT_GET_PRI_MASK_TYPE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PRI_MASK_TYPE_8822B) &amp; BIT_MASK_PRI_MASK_TYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_OOB_8822B BIT(97)</div><div class='del'>-#define BIT_ANT_SEL_8822B BIT(96)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BREAK_TABLE_2_8822B (80 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_BREAK_TABLE_2_8822B 0xffff</div><div class='del'>-#define BIT_BREAK_TABLE_2_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BREAK_TABLE_2_8822B) &lt;&lt; BIT_SHIFT_BREAK_TABLE_2_8822B)</div><div class='del'>-#define BIT_GET_BREAK_TABLE_2_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BREAK_TABLE_2_8822B) &amp; BIT_MASK_BREAK_TABLE_2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BREAK_TABLE_1_8822B (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_BREAK_TABLE_1_8822B 0xffff</div><div class='del'>-#define BIT_BREAK_TABLE_1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BREAK_TABLE_1_8822B) &lt;&lt; BIT_SHIFT_BREAK_TABLE_1_8822B)</div><div class='del'>-#define BIT_GET_BREAK_TABLE_1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BREAK_TABLE_1_8822B) &amp; BIT_MASK_BREAK_TABLE_1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_COEX_TABLE_2_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_COEX_TABLE_2_8822B 0xffffffffL</div><div class='del'>-#define BIT_COEX_TABLE_2_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_COEX_TABLE_2_8822B) &lt;&lt; BIT_SHIFT_COEX_TABLE_2_8822B)</div><div class='del'>-#define BIT_GET_COEX_TABLE_2_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_COEX_TABLE_2_8822B) &amp; BIT_MASK_COEX_TABLE_2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_COEX_TABLE_1_8822B 0</div><div class='del'>-#define BIT_MASK_COEX_TABLE_1_8822B 0xffffffffL</div><div class='del'>-#define BIT_COEX_TABLE_1_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_COEX_TABLE_1_8822B) &lt;&lt; BIT_SHIFT_COEX_TABLE_1_8822B)</div><div class='del'>-#define BIT_GET_COEX_TABLE_1_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_COEX_TABLE_1_8822B) &amp; BIT_MASK_COEX_TABLE_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXCMD_0_8822B */</div><div class='del'>-#define BIT_RXCMD_EN_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXCMD_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_RXCMD_INFO_8822B 0x7fffffffL</div><div class='del'>-#define BIT_RXCMD_INFO_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXCMD_INFO_8822B) &lt;&lt; BIT_SHIFT_RXCMD_INFO_8822B)</div><div class='del'>-#define BIT_GET_RXCMD_INFO_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXCMD_INFO_8822B) &amp; BIT_MASK_RXCMD_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RXCMD_1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXCMD_PRD_8822B 0</div><div class='del'>-#define BIT_MASK_RXCMD_PRD_8822B 0xffff</div><div class='del'>-#define BIT_RXCMD_PRD_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXCMD_PRD_8822B) &lt;&lt; BIT_SHIFT_RXCMD_PRD_8822B)</div><div class='del'>-#define BIT_GET_RXCMD_PRD_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXCMD_PRD_8822B) &amp; BIT_MASK_RXCMD_PRD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_RESP_TXINFO_8822B (RESPONSE TXINFO REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_MFB_8822B 25</div><div class='del'>-#define BIT_MASK_WMAC_RESP_MFB_8822B 0x7f</div><div class='del'>-#define BIT_WMAC_RESP_MFB_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_MFB_8822B) &lt;&lt; BIT_SHIFT_WMAC_RESP_MFB_8822B)</div><div class='del'>-#define BIT_GET_WMAC_RESP_MFB_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_MFB_8822B) &amp; BIT_MASK_WMAC_RESP_MFB_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ANTINF_SEL_8822B 23</div><div class='del'>-#define BIT_MASK_WMAC_ANTINF_SEL_8822B 0x3</div><div class='del'>-#define BIT_WMAC_ANTINF_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ANTINF_SEL_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_ANTINF_SEL_8822B)</div><div class='del'>-#define BIT_GET_WMAC_ANTINF_SEL_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ANTINF_SEL_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_ANTINF_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ANTSEL_SEL_8822B 21</div><div class='del'>-#define BIT_MASK_WMAC_ANTSEL_SEL_8822B 0x3</div><div class='del'>-#define BIT_WMAC_ANTSEL_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ANTSEL_SEL_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_ANTSEL_SEL_8822B)</div><div class='del'>-#define BIT_GET_WMAC_ANTSEL_SEL_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ANTSEL_SEL_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_ANTSEL_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RESP_TXPOWER_8822B 18</div><div class='del'>-#define BIT_MASK_R_WMAC_RESP_TXPOWER_8822B 0x7</div><div class='del'>-#define BIT_R_WMAC_RESP_TXPOWER_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RESP_TXPOWER_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_RESP_TXPOWER_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_RESP_TXPOWER_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RESP_TXPOWER_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_WMAC_RESP_TXPOWER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_TXANT_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_RESP_TXANT_8822B 0x3ffff</div><div class='del'>-#define BIT_WMAC_RESP_TXANT_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_TXANT_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_RESP_TXANT_8822B)</div><div class='del'>-#define BIT_GET_WMAC_RESP_TXANT_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_TXANT_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_RESP_TXANT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BBPSF_CTRL_8822B */</div><div class='del'>-#define BIT_CTL_IDLE_CLR_CSI_RPT_8822B BIT(31)</div><div class='del'>-#define BIT_WMAC_USE_NDPARATE_8822B BIT(30)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_CSI_RATE_8822B 24</div><div class='del'>-#define BIT_MASK_WMAC_CSI_RATE_8822B 0x3f</div><div class='del'>-#define BIT_WMAC_CSI_RATE_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_CSI_RATE_8822B) &lt;&lt; BIT_SHIFT_WMAC_CSI_RATE_8822B)</div><div class='del'>-#define BIT_GET_WMAC_CSI_RATE_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_CSI_RATE_8822B) &amp; BIT_MASK_WMAC_CSI_RATE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_TXRATE_8822B 16</div><div class='del'>-#define BIT_MASK_WMAC_RESP_TXRATE_8822B 0xff</div><div class='del'>-#define BIT_WMAC_RESP_TXRATE_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_TXRATE_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_RESP_TXRATE_8822B)</div><div class='del'>-#define BIT_GET_WMAC_RESP_TXRATE_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_TXRATE_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_WMAC_RESP_TXRATE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BBPSF_MPDUCHKEN_8822B BIT(5)</div><div class='del'>-#define BIT_BBPSF_MHCHKEN_8822B BIT(4)</div><div class='del'>-#define BIT_BBPSF_ERRCHKEN_8822B BIT(3)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BBPSF_ERRTHR_8822B 0</div><div class='del'>-#define BIT_MASK_BBPSF_ERRTHR_8822B 0x7</div><div class='del'>-#define BIT_BBPSF_ERRTHR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_BBPSF_ERRTHR_8822B) &lt;&lt; BIT_SHIFT_BBPSF_ERRTHR_8822B)</div><div class='del'>-#define BIT_GET_BBPSF_ERRTHR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BBPSF_ERRTHR_8822B) &amp; BIT_MASK_BBPSF_ERRTHR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_P2P_RX_BCN_NOA_8822B (P2P RX BEACON NOA REGISTER) */</div><div class='del'>-#define BIT_NOA_PARSER_EN_8822B BIT(15)</div><div class='del'>-#define BIT_BSSID_SEL_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_P2P_OUI_TYPE_8822B 0</div><div class='del'>-#define BIT_MASK_P2P_OUI_TYPE_8822B 0xff</div><div class='del'>-#define BIT_P2P_OUI_TYPE_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_P2P_OUI_TYPE_8822B) &lt;&lt; BIT_SHIFT_P2P_OUI_TYPE_8822B)</div><div class='del'>-#define BIT_GET_P2P_OUI_TYPE_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_P2P_OUI_TYPE_8822B) &amp; BIT_MASK_P2P_OUI_TYPE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ASSOCIATED_BFMER0_INFO_8822B (ASSOCIATED BEAMFORMER0 INFO REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_TXCSI_AID0_8822B (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_TXCSI_AID0_8822B 0x1ff</div><div class='del'>-#define BIT_R_WMAC_TXCSI_AID0_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_TXCSI_AID0_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_TXCSI_AID0_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_TXCSI_AID0_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_TXCSI_AID0_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_WMAC_TXCSI_AID0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R0_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_SOUNDING_RXADD_R0_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_R_WMAC_SOUNDING_RXADD_R0_8822B(x)                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_SOUNDING_RXADD_R0_8822B)                       \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R0_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_SOUNDING_RXADD_R0_8822B(x)                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R0_8822B) &amp;                   \</div><div class='del'>-	 BIT_MASK_R_WMAC_SOUNDING_RXADD_R0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ASSOCIATED_BFMER1_INFO_8822B (ASSOCIATED BEAMFORMER1 INFO REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_TXCSI_AID1_8822B (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_TXCSI_AID1_8822B 0x1ff</div><div class='del'>-#define BIT_R_WMAC_TXCSI_AID1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_TXCSI_AID1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_TXCSI_AID1_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_TXCSI_AID1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_TXCSI_AID1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_WMAC_TXCSI_AID1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R1_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_SOUNDING_RXADD_R1_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_R_WMAC_SOUNDING_RXADD_R1_8822B(x)                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_SOUNDING_RXADD_R1_8822B)                       \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R1_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_SOUNDING_RXADD_R1_8822B(x)                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_SOUNDING_RXADD_R1_8822B) &amp;                   \</div><div class='del'>-	 BIT_MASK_R_WMAC_SOUNDING_RXADD_R1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_CSI_RPT_PARAM_BW20_8822B (TX CSI REPORT PARAMETER REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_BFINFO_20M_1_8822B 16</div><div class='del'>-#define BIT_MASK_R_WMAC_BFINFO_20M_1_8822B 0xfff</div><div class='del'>-#define BIT_R_WMAC_BFINFO_20M_1_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_BFINFO_20M_1_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_BFINFO_20M_1_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_BFINFO_20M_1_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_BFINFO_20M_1_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_WMAC_BFINFO_20M_1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_BFINFO_20M_0_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_BFINFO_20M_0_8822B 0xfff</div><div class='del'>-#define BIT_R_WMAC_BFINFO_20M_0_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_BFINFO_20M_0_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_BFINFO_20M_0_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_BFINFO_20M_0_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_BFINFO_20M_0_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_WMAC_BFINFO_20M_0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_CSI_RPT_PARAM_BW40_8822B (TX CSI REPORT PARAMETER_BW40 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RESP_ANTCD_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_RESP_ANTCD_8822B 0xf</div><div class='del'>-#define BIT_WMAC_RESP_ANTCD_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RESP_ANTCD_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_RESP_ANTCD_8822B)</div><div class='del'>-#define BIT_GET_WMAC_RESP_ANTCD_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RESP_ANTCD_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_RESP_ANTCD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TX_CSI_RPT_PARAM_BW80_8822B (TX CSI REPORT PARAMETER_BW80 REGISTER) */</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT2_8822B (BEACON PARSER REPORT REGISTER2) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT2_8822B 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT2_8822B 0xff</div><div class='del'>-#define BIT_DTIM_CNT2_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_CNT2_8822B) &lt;&lt; BIT_SHIFT_DTIM_CNT2_8822B)</div><div class='del'>-#define BIT_GET_DTIM_CNT2_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_CNT2_8822B) &amp; BIT_MASK_DTIM_CNT2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD2_8822B 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD2_8822B 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD2_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD2_8822B) &lt;&lt; BIT_SHIFT_DTIM_PERIOD2_8822B)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD2_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD2_8822B) &amp; BIT_MASK_DTIM_PERIOD2_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM2_8822B BIT(15)</div><div class='del'>-#define BIT_TIM2_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_2_8822B 0</div><div class='del'>-#define BIT_MASK_PS_AID_2_8822B 0x7ff</div><div class='del'>-#define BIT_PS_AID_2_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_AID_2_8822B) &lt;&lt; BIT_SHIFT_PS_AID_2_8822B)</div><div class='del'>-#define BIT_GET_PS_AID_2_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_AID_2_8822B) &amp; BIT_MASK_PS_AID_2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT3_8822B (BEACON PARSER REPORT REGISTER3) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT3_8822B 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT3_8822B 0xff</div><div class='del'>-#define BIT_DTIM_CNT3_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_CNT3_8822B) &lt;&lt; BIT_SHIFT_DTIM_CNT3_8822B)</div><div class='del'>-#define BIT_GET_DTIM_CNT3_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_CNT3_8822B) &amp; BIT_MASK_DTIM_CNT3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD3_8822B 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD3_8822B 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD3_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD3_8822B) &lt;&lt; BIT_SHIFT_DTIM_PERIOD3_8822B)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD3_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD3_8822B) &amp; BIT_MASK_DTIM_PERIOD3_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM3_8822B BIT(15)</div><div class='del'>-#define BIT_TIM3_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_3_8822B 0</div><div class='del'>-#define BIT_MASK_PS_AID_3_8822B 0x7ff</div><div class='del'>-#define BIT_PS_AID_3_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_AID_3_8822B) &lt;&lt; BIT_SHIFT_PS_AID_3_8822B)</div><div class='del'>-#define BIT_GET_PS_AID_3_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_AID_3_8822B) &amp; BIT_MASK_PS_AID_3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT4_8822B (BEACON PARSER REPORT REGISTER4) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT4_8822B 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT4_8822B 0xff</div><div class='del'>-#define BIT_DTIM_CNT4_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_CNT4_8822B) &lt;&lt; BIT_SHIFT_DTIM_CNT4_8822B)</div><div class='del'>-#define BIT_GET_DTIM_CNT4_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_CNT4_8822B) &amp; BIT_MASK_DTIM_CNT4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD4_8822B 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD4_8822B 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD4_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD4_8822B) &lt;&lt; BIT_SHIFT_DTIM_PERIOD4_8822B)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD4_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD4_8822B) &amp; BIT_MASK_DTIM_PERIOD4_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM4_8822B BIT(15)</div><div class='del'>-#define BIT_TIM4_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_4_8822B 0</div><div class='del'>-#define BIT_MASK_PS_AID_4_8822B 0x7ff</div><div class='del'>-#define BIT_PS_AID_4_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_AID_4_8822B) &lt;&lt; BIT_SHIFT_PS_AID_4_8822B)</div><div class='del'>-#define BIT_GET_PS_AID_4_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_AID_4_8822B) &amp; BIT_MASK_PS_AID_4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_A1_ADDR_MASK_8822B (A1 ADDR MASK REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_A1_ADDR_MASK_8822B 0</div><div class='del'>-#define BIT_MASK_A1_ADDR_MASK_8822B 0xffffffffL</div><div class='del'>-#define BIT_A1_ADDR_MASK_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_A1_ADDR_MASK_8822B) &lt;&lt; BIT_SHIFT_A1_ADDR_MASK_8822B)</div><div class='del'>-#define BIT_GET_A1_ADDR_MASK_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_A1_ADDR_MASK_8822B) &amp; BIT_MASK_A1_ADDR_MASK_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID2_8822B (MAC ID2 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID2_8822B 0</div><div class='del'>-#define BIT_MASK_MACID2_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_MACID2_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID2_8822B) &lt;&lt; BIT_SHIFT_MACID2_8822B)</div><div class='del'>-#define BIT_GET_MACID2_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID2_8822B) &amp; BIT_MASK_MACID2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID2_8822B (BSSID2 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID2_8822B 0</div><div class='del'>-#define BIT_MASK_BSSID2_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID2_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BSSID2_8822B) &lt;&lt; BIT_SHIFT_BSSID2_8822B)</div><div class='del'>-#define BIT_GET_BSSID2_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BSSID2_8822B) &amp; BIT_MASK_BSSID2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID3_8822B (MAC ID3 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID3_8822B 0</div><div class='del'>-#define BIT_MASK_MACID3_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_MACID3_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID3_8822B) &lt;&lt; BIT_SHIFT_MACID3_8822B)</div><div class='del'>-#define BIT_GET_MACID3_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID3_8822B) &amp; BIT_MASK_MACID3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID3_8822B (BSSID3 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID3_8822B 0</div><div class='del'>-#define BIT_MASK_BSSID3_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID3_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BSSID3_8822B) &lt;&lt; BIT_SHIFT_BSSID3_8822B)</div><div class='del'>-#define BIT_GET_BSSID3_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BSSID3_8822B) &amp; BIT_MASK_BSSID3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID4_8822B (MAC ID4 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID4_8822B 0</div><div class='del'>-#define BIT_MASK_MACID4_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_MACID4_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID4_8822B) &lt;&lt; BIT_SHIFT_MACID4_8822B)</div><div class='del'>-#define BIT_GET_MACID4_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID4_8822B) &amp; BIT_MASK_MACID4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID4_8822B (BSSID4 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID4_8822B 0</div><div class='del'>-#define BIT_MASK_BSSID4_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID4_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BSSID4_8822B) &lt;&lt; BIT_SHIFT_BSSID4_8822B)</div><div class='del'>-#define BIT_GET_BSSID4_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BSSID4_8822B) &amp; BIT_MASK_BSSID4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOA_REPORT_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_PWRBIT_SETTING_8822B */</div><div class='del'>-#define BIT_CLI3_PWRBIT_OW_EN_8822B BIT(7)</div><div class='del'>-#define BIT_CLI3_PWR_ST_8822B BIT(6)</div><div class='del'>-#define BIT_CLI2_PWRBIT_OW_EN_8822B BIT(5)</div><div class='del'>-#define BIT_CLI2_PWR_ST_8822B BIT(4)</div><div class='del'>-#define BIT_CLI1_PWRBIT_OW_EN_8822B BIT(3)</div><div class='del'>-#define BIT_CLI1_PWR_ST_8822B BIT(2)</div><div class='del'>-#define BIT_CLI0_PWRBIT_OW_EN_8822B BIT(1)</div><div class='del'>-#define BIT_CLI0_PWR_ST_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BF_OPTION_8822B */</div><div class='del'>-#define BIT_WMAC_RESP_NONSTA1_DIS_8822B BIT(7)</div><div class='del'>-#define BIT_BIT_WMAC_TXMU_ACKPOLICY_EN_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_TXMU_ACKPOLICY_8822B 4</div><div class='del'>-#define BIT_MASK_WMAC_TXMU_ACKPOLICY_8822B 0x3</div><div class='del'>-#define BIT_WMAC_TXMU_ACKPOLICY_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_TXMU_ACKPOLICY_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_TXMU_ACKPOLICY_8822B)</div><div class='del'>-#define BIT_GET_WMAC_TXMU_ACKPOLICY_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_TXMU_ACKPOLICY_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_WMAC_TXMU_ACKPOLICY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE_PORT_SEL_8822B 1</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE_PORT_SEL_8822B 0x7</div><div class='del'>-#define BIT_WMAC_MU_BFEE_PORT_SEL_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE_PORT_SEL_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE_PORT_SEL_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE_PORT_SEL_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE_PORT_SEL_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE_PORT_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_WMAC_MU_BFEE_DIS_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PAUSE_BB_CLR_TH_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_PAUSE_BB_CLR_TH_8822B 0xff</div><div class='del'>-#define BIT_WMAC_PAUSE_BB_CLR_TH_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PAUSE_BB_CLR_TH_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_PAUSE_BB_CLR_TH_8822B)</div><div class='del'>-#define BIT_GET_WMAC_PAUSE_BB_CLR_TH_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PAUSE_BB_CLR_TH_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_WMAC_PAUSE_BB_CLR_TH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_ARB_8822B */</div><div class='del'>-#define BIT_WMAC_ARB_HW_ADAPT_EN_8822B BIT(7)</div><div class='del'>-#define BIT_WMAC_ARB_SW_EN_8822B BIT(6)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ARB_SW_STATE_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_ARB_SW_STATE_8822B 0x3f</div><div class='del'>-#define BIT_WMAC_ARB_SW_STATE_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ARB_SW_STATE_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_ARB_SW_STATE_8822B)</div><div class='del'>-#define BIT_GET_WMAC_ARB_SW_STATE_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ARB_SW_STATE_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_ARB_SW_STATE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_OPTION_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_DBGSEL_8822B 5</div><div class='del'>-#define BIT_MASK_WMAC_MU_DBGSEL_8822B 0x3</div><div class='del'>-#define BIT_WMAC_MU_DBGSEL_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_DBGSEL_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_DBGSEL_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_DBGSEL_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_DBGSEL_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_WMAC_MU_DBGSEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_CPRD_TIMEOUT_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_CPRD_TIMEOUT_8822B 0x1f</div><div class='del'>-#define BIT_WMAC_MU_CPRD_TIMEOUT_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_CPRD_TIMEOUT_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_CPRD_TIMEOUT_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_CPRD_TIMEOUT_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_CPRD_TIMEOUT_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_WMAC_MU_CPRD_TIMEOUT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BF_CTL_8822B */</div><div class='del'>-#define BIT_WMAC_INVLD_BFPRT_CHK_8822B BIT(15)</div><div class='del'>-#define BIT_WMAC_RETXBFRPTSEQ_UPD_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFRPTSEG_SEL_8822B 12</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFRPTSEG_SEL_8822B 0x3</div><div class='del'>-#define BIT_WMAC_MU_BFRPTSEG_SEL_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFRPTSEG_SEL_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFRPTSEG_SEL_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFRPTSEG_SEL_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFRPTSEG_SEL_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFRPTSEG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BF_MYAID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BF_MYAID_8822B 0xfff</div><div class='del'>-#define BIT_WMAC_MU_BF_MYAID_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BF_MYAID_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BF_MYAID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BF_MYAID_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BF_MYAID_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BF_MYAID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_MU_BFRPT_PARA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BIT_BFRPT_PARA_USERID_SEL_8822B 12</div><div class='del'>-#define BIT_MASK_BIT_BFRPT_PARA_USERID_SEL_8822B 0x7</div><div class='del'>-#define BIT_BIT_BFRPT_PARA_USERID_SEL_8822B(x)                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_BIT_BFRPT_PARA_USERID_SEL_8822B)                      \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BIT_BFRPT_PARA_USERID_SEL_8822B)</div><div class='del'>-#define BIT_GET_BIT_BFRPT_PARA_USERID_SEL_8822B(x)                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BIT_BFRPT_PARA_USERID_SEL_8822B) &amp;                  \</div><div class='del'>-	 BIT_MASK_BIT_BFRPT_PARA_USERID_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BFRPT_PARA_8822B 0</div><div class='del'>-#define BIT_MASK_BFRPT_PARA_8822B 0xfff</div><div class='del'>-#define BIT_BFRPT_PARA_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BFRPT_PARA_8822B) &lt;&lt; BIT_SHIFT_BFRPT_PARA_8822B)</div><div class='del'>-#define BIT_GET_BFRPT_PARA_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BFRPT_PARA_8822B) &amp; BIT_MASK_BFRPT_PARA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE2_8822B */</div><div class='del'>-#define BIT_STATUS_BFEE2_8822B BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE2_EN_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE2_AID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE2_AID_8822B 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE2_AID_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE2_AID_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE2_AID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE2_AID_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE2_AID_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE2_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE3_8822B */</div><div class='del'>-#define BIT_STATUS_BFEE3_8822B BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE3_EN_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE3_AID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE3_AID_8822B 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE3_AID_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE3_AID_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE3_AID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE3_AID_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE3_AID_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE3_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE4_8822B */</div><div class='del'>-#define BIT_STATUS_BFEE4_8822B BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE4_EN_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE4_AID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE4_AID_8822B 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE4_AID_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE4_AID_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE4_AID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE4_AID_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE4_AID_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE4_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE5_8822B */</div><div class='del'>-#define BIT_STATUS_BFEE5_8822B BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE5_EN_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE5_AID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE5_AID_8822B 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE5_AID_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE5_AID_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE5_AID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE5_AID_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE5_AID_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE5_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE6_8822B */</div><div class='del'>-#define BIT_STATUS_BFEE6_8822B BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE6_EN_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE6_AID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE6_AID_8822B 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE6_AID_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE6_AID_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE6_AID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE6_AID_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE6_AID_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE6_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_ASSOCIATED_MU_BFMEE7_8822B */</div><div class='del'>-#define BIT_BIT_STATUS_BFEE4_8822B BIT(10)</div><div class='del'>-#define BIT_WMAC_MU_BFEE7_EN_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_MU_BFEE7_AID_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_MU_BFEE7_AID_8822B 0x1ff</div><div class='del'>-#define BIT_WMAC_MU_BFEE7_AID_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_MU_BFEE7_AID_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_MU_BFEE7_AID_8822B)</div><div class='del'>-#define BIT_GET_WMAC_MU_BFEE7_AID_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_MU_BFEE7_AID_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_MU_BFEE7_AID_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-#define BIT_RST_ALL_COUNTER_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ABORT_RX_VBON_COUNTER_8822B 16</div><div class='del'>-#define BIT_MASK_ABORT_RX_VBON_COUNTER_8822B 0xff</div><div class='del'>-#define BIT_ABORT_RX_VBON_COUNTER_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_ABORT_RX_VBON_COUNTER_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_ABORT_RX_VBON_COUNTER_8822B)</div><div class='del'>-#define BIT_GET_ABORT_RX_VBON_COUNTER_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ABORT_RX_VBON_COUNTER_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_ABORT_RX_VBON_COUNTER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ABORT_RX_RDRDY_COUNTER_8822B 8</div><div class='del'>-#define BIT_MASK_ABORT_RX_RDRDY_COUNTER_8822B 0xff</div><div class='del'>-#define BIT_ABORT_RX_RDRDY_COUNTER_8822B(x)                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_ABORT_RX_RDRDY_COUNTER_8822B)                         \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_ABORT_RX_RDRDY_COUNTER_8822B)</div><div class='del'>-#define BIT_GET_ABORT_RX_RDRDY_COUNTER_8822B(x)                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ABORT_RX_RDRDY_COUNTER_8822B) &amp;                     \</div><div class='del'>-	 BIT_MASK_ABORT_RX_RDRDY_COUNTER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_VBON_EARLY_FALLING_COUNTER_8822B 0</div><div class='del'>-#define BIT_MASK_VBON_EARLY_FALLING_COUNTER_8822B 0xff</div><div class='del'>-#define BIT_VBON_EARLY_FALLING_COUNTER_8822B(x)                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_VBON_EARLY_FALLING_COUNTER_8822B)                     \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_VBON_EARLY_FALLING_COUNTER_8822B)</div><div class='del'>-#define BIT_GET_VBON_EARLY_FALLING_COUNTER_8822B(x)                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_VBON_EARLY_FALLING_COUNTER_8822B) &amp;                 \</div><div class='del'>-	 BIT_MASK_VBON_EARLY_FALLING_COUNTER_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-#define BIT_WMAC_PLCP_TRX_SEL_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PLCP_RDSIG_SEL_8822B 28</div><div class='del'>-#define BIT_MASK_WMAC_PLCP_RDSIG_SEL_8822B 0x7</div><div class='del'>-#define BIT_WMAC_PLCP_RDSIG_SEL_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PLCP_RDSIG_SEL_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_PLCP_RDSIG_SEL_8822B)</div><div class='del'>-#define BIT_GET_WMAC_PLCP_RDSIG_SEL_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PLCP_RDSIG_SEL_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_WMAC_PLCP_RDSIG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_RATE_IDX_8822B 24</div><div class='del'>-#define BIT_MASK_WMAC_RATE_IDX_8822B 0xf</div><div class='del'>-#define BIT_WMAC_RATE_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_RATE_IDX_8822B) &lt;&lt; BIT_SHIFT_WMAC_RATE_IDX_8822B)</div><div class='del'>-#define BIT_GET_WMAC_RATE_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_RATE_IDX_8822B) &amp; BIT_MASK_WMAC_RATE_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PLCP_RDSIG_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_PLCP_RDSIG_8822B 0xffffff</div><div class='del'>-#define BIT_WMAC_PLCP_RDSIG_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PLCP_RDSIG_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_PLCP_RDSIG_8822B)</div><div class='del'>-#define BIT_GET_WMAC_PLCP_RDSIG_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PLCP_RDSIG_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_PLCP_RDSIG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-#define BIT_WMAC_MUTX_IDX_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PLCP_RDSIG_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_PLCP_RDSIG_8822B 0xffffff</div><div class='del'>-#define BIT_WMAC_PLCP_RDSIG_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PLCP_RDSIG_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_PLCP_RDSIG_8822B)</div><div class='del'>-#define BIT_GET_WMAC_PLCP_RDSIG_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PLCP_RDSIG_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_WMAC_PLCP_RDSIG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_0_8822B (TA0 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA0_8822B 0</div><div class='del'>-#define BIT_MASK_TA0_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_TA0_8822B(x) (((x) &amp; BIT_MASK_TA0_8822B) &lt;&lt; BIT_SHIFT_TA0_8822B)</div><div class='del'>-#define BIT_GET_TA0_8822B(x) (((x) &gt;&gt; BIT_SHIFT_TA0_8822B) &amp; BIT_MASK_TA0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_1_8822B (TA1 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA1_8822B 0</div><div class='del'>-#define BIT_MASK_TA1_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_TA1_8822B(x) (((x) &amp; BIT_MASK_TA1_8822B) &lt;&lt; BIT_SHIFT_TA1_8822B)</div><div class='del'>-#define BIT_GET_TA1_8822B(x) (((x) &gt;&gt; BIT_SHIFT_TA1_8822B) &amp; BIT_MASK_TA1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_2_8822B (TA2 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA2_8822B 0</div><div class='del'>-#define BIT_MASK_TA2_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_TA2_8822B(x) (((x) &amp; BIT_MASK_TA2_8822B) &lt;&lt; BIT_SHIFT_TA2_8822B)</div><div class='del'>-#define BIT_GET_TA2_8822B(x) (((x) &gt;&gt; BIT_SHIFT_TA2_8822B) &amp; BIT_MASK_TA2_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_3_8822B (TA3 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA3_8822B 0</div><div class='del'>-#define BIT_MASK_TA3_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_TA3_8822B(x) (((x) &amp; BIT_MASK_TA3_8822B) &lt;&lt; BIT_SHIFT_TA3_8822B)</div><div class='del'>-#define BIT_GET_TA3_8822B(x) (((x) &gt;&gt; BIT_SHIFT_TA3_8822B) &amp; BIT_MASK_TA3_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TRANSMIT_ADDRSS_4_8822B (TA4 REGISTER) */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TA4_8822B 0</div><div class='del'>-#define BIT_MASK_TA4_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_TA4_8822B(x) (((x) &amp; BIT_MASK_TA4_8822B) &lt;&lt; BIT_SHIFT_TA4_8822B)</div><div class='del'>-#define BIT_GET_TA4_8822B(x) (((x) &gt;&gt; BIT_SHIFT_TA4_8822B) &amp; BIT_MASK_TA4_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_MACID1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MACID1_8822B 0</div><div class='del'>-#define BIT_MASK_MACID1_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_MACID1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_MACID1_8822B) &lt;&lt; BIT_SHIFT_MACID1_8822B)</div><div class='del'>-#define BIT_GET_MACID1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MACID1_8822B) &amp; BIT_MASK_MACID1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BSSID1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BSSID1_8822B 0</div><div class='del'>-#define BIT_MASK_BSSID1_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_BSSID1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_BSSID1_8822B) &lt;&lt; BIT_SHIFT_BSSID1_8822B)</div><div class='del'>-#define BIT_GET_BSSID1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BSSID1_8822B) &amp; BIT_MASK_BSSID1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BCN_PSR_RPT1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_CNT1_8822B 24</div><div class='del'>-#define BIT_MASK_DTIM_CNT1_8822B 0xff</div><div class='del'>-#define BIT_DTIM_CNT1_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_CNT1_8822B) &lt;&lt; BIT_SHIFT_DTIM_CNT1_8822B)</div><div class='del'>-#define BIT_GET_DTIM_CNT1_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_CNT1_8822B) &amp; BIT_MASK_DTIM_CNT1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DTIM_PERIOD1_8822B 16</div><div class='del'>-#define BIT_MASK_DTIM_PERIOD1_8822B 0xff</div><div class='del'>-#define BIT_DTIM_PERIOD1_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DTIM_PERIOD1_8822B) &lt;&lt; BIT_SHIFT_DTIM_PERIOD1_8822B)</div><div class='del'>-#define BIT_GET_DTIM_PERIOD1_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DTIM_PERIOD1_8822B) &amp; BIT_MASK_DTIM_PERIOD1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_DTIM1_8822B BIT(15)</div><div class='del'>-#define BIT_TIM1_8822B BIT(14)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PS_AID_1_8822B 0</div><div class='del'>-#define BIT_MASK_PS_AID_1_8822B 0x7ff</div><div class='del'>-#define BIT_PS_AID_1_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_PS_AID_1_8822B) &lt;&lt; BIT_SHIFT_PS_AID_1_8822B)</div><div class='del'>-#define BIT_GET_PS_AID_1_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PS_AID_1_8822B) &amp; BIT_MASK_PS_AID_1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ASSOCIATED_BFMEE_SEL_8822B */</div><div class='del'>-#define BIT_TXUSER_ID1_8822B BIT(25)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AID1_8822B 16</div><div class='del'>-#define BIT_MASK_AID1_8822B 0x1ff</div><div class='del'>-#define BIT_AID1_8822B(x) (((x) &amp; BIT_MASK_AID1_8822B) &lt;&lt; BIT_SHIFT_AID1_8822B)</div><div class='del'>-#define BIT_GET_AID1_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AID1_8822B) &amp; BIT_MASK_AID1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TXUSER_ID0_8822B BIT(9)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AID0_8822B 0</div><div class='del'>-#define BIT_MASK_AID0_8822B 0x1ff</div><div class='del'>-#define BIT_AID0_8822B(x) (((x) &amp; BIT_MASK_AID0_8822B) &lt;&lt; BIT_SHIFT_AID0_8822B)</div><div class='del'>-#define BIT_GET_AID0_8822B(x)                                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AID0_8822B) &amp; BIT_MASK_AID0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SND_PTCL_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NDP_RX_STANDBY_TIMER_8822B 24</div><div class='del'>-#define BIT_MASK_NDP_RX_STANDBY_TIMER_8822B 0xff</div><div class='del'>-#define BIT_NDP_RX_STANDBY_TIMER_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_NDP_RX_STANDBY_TIMER_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_NDP_RX_STANDBY_TIMER_8822B)</div><div class='del'>-#define BIT_GET_NDP_RX_STANDBY_TIMER_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NDP_RX_STANDBY_TIMER_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_NDP_RX_STANDBY_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CSI_RPT_OFFSET_HT_8822B 16</div><div class='del'>-#define BIT_MASK_CSI_RPT_OFFSET_HT_8822B 0xff</div><div class='del'>-#define BIT_CSI_RPT_OFFSET_HT_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_CSI_RPT_OFFSET_HT_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CSI_RPT_OFFSET_HT_8822B)</div><div class='del'>-#define BIT_GET_CSI_RPT_OFFSET_HT_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CSI_RPT_OFFSET_HT_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_CSI_RPT_OFFSET_HT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_VHT_CATEGORY_8822B 8</div><div class='del'>-#define BIT_MASK_R_WMAC_VHT_CATEGORY_8822B 0xff</div><div class='del'>-#define BIT_R_WMAC_VHT_CATEGORY_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_VHT_CATEGORY_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_VHT_CATEGORY_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_VHT_CATEGORY_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_VHT_CATEGORY_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_WMAC_VHT_CATEGORY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_USE_NSTS_8822B BIT(7)</div><div class='del'>-#define BIT_R_DISABLE_CHECK_VHTSIGB_CRC_8822B BIT(6)</div><div class='del'>-#define BIT_R_DISABLE_CHECK_VHTSIGA_CRC_8822B BIT(5)</div><div class='del'>-#define BIT_R_WMAC_BFPARAM_SEL_8822B BIT(4)</div><div class='del'>-#define BIT_R_WMAC_CSISEQ_SEL_8822B BIT(3)</div><div class='del'>-#define BIT_R_WMAC_CSI_WITHHTC_EN_8822B BIT(2)</div><div class='del'>-#define BIT_R_WMAC_HT_NDPA_EN_8822B BIT(1)</div><div class='del'>-#define BIT_R_WMAC_VHT_NDPA_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_CSI_RPT_INFO_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_NS_ARP_CTRL_8822B */</div><div class='del'>-#define BIT_R_WMAC_NSARP_RSPEN_8822B BIT(15)</div><div class='del'>-#define BIT_R_WMAC_NSARP_RARP_8822B BIT(9)</div><div class='del'>-#define BIT_R_WMAC_NSARP_RIPV6_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_NSARP_MODEN_8822B 6</div><div class='del'>-#define BIT_MASK_R_WMAC_NSARP_MODEN_8822B 0x3</div><div class='del'>-#define BIT_R_WMAC_NSARP_MODEN_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_NSARP_MODEN_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_NSARP_MODEN_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_NSARP_MODEN_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_NSARP_MODEN_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_NSARP_MODEN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_NSARP_RSPFTP_8822B 4</div><div class='del'>-#define BIT_MASK_R_WMAC_NSARP_RSPFTP_8822B 0x3</div><div class='del'>-#define BIT_R_WMAC_NSARP_RSPFTP_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_NSARP_RSPFTP_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_NSARP_RSPFTP_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_NSARP_RSPFTP_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_NSARP_RSPFTP_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_WMAC_NSARP_RSPFTP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_NSARP_RSPSEC_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_NSARP_RSPSEC_8822B 0xf</div><div class='del'>-#define BIT_R_WMAC_NSARP_RSPSEC_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_NSARP_RSPSEC_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_NSARP_RSPSEC_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_NSARP_RSPSEC_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_NSARP_RSPSEC_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_R_WMAC_NSARP_RSPSEC_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NS_ARP_INFO_8822B */</div><div class='del'>-#define BIT_REQ_IS_MCNS_8822B BIT(23)</div><div class='del'>-#define BIT_REQ_IS_UCNS_8822B BIT(22)</div><div class='del'>-#define BIT_REQ_IS_USNS_8822B BIT(21)</div><div class='del'>-#define BIT_REQ_IS_ARP_8822B BIT(20)</div><div class='del'>-#define BIT_EXPRSP_MH_WITHQC_8822B BIT(19)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXPRSP_SECTYPE_8822B 16</div><div class='del'>-#define BIT_MASK_EXPRSP_SECTYPE_8822B 0x7</div><div class='del'>-#define BIT_EXPRSP_SECTYPE_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXPRSP_SECTYPE_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EXPRSP_SECTYPE_8822B)</div><div class='del'>-#define BIT_GET_EXPRSP_SECTYPE_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXPRSP_SECTYPE_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_EXPRSP_SECTYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXPRSP_CHKSM_7_TO_0_8822B 8</div><div class='del'>-#define BIT_MASK_EXPRSP_CHKSM_7_TO_0_8822B 0xff</div><div class='del'>-#define BIT_EXPRSP_CHKSM_7_TO_0_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXPRSP_CHKSM_7_TO_0_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EXPRSP_CHKSM_7_TO_0_8822B)</div><div class='del'>-#define BIT_GET_EXPRSP_CHKSM_7_TO_0_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXPRSP_CHKSM_7_TO_0_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_EXPRSP_CHKSM_7_TO_0_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXPRSP_CHKSM_15_TO_8_8822B 0</div><div class='del'>-#define BIT_MASK_EXPRSP_CHKSM_15_TO_8_8822B 0xff</div><div class='del'>-#define BIT_EXPRSP_CHKSM_15_TO_8_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXPRSP_CHKSM_15_TO_8_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_EXPRSP_CHKSM_15_TO_8_8822B)</div><div class='del'>-#define BIT_GET_EXPRSP_CHKSM_15_TO_8_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXPRSP_CHKSM_15_TO_8_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_EXPRSP_CHKSM_15_TO_8_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEAMFORMING_INFO_NSARP_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_ARPIP_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_ARPIP_8822B 0xffffffffL</div><div class='del'>-#define BIT_WMAC_ARPIP_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_ARPIP_8822B) &lt;&lt; BIT_SHIFT_WMAC_ARPIP_8822B)</div><div class='del'>-#define BIT_GET_WMAC_ARPIP_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_ARPIP_8822B) &amp; BIT_MASK_WMAC_ARPIP_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BEAMFORMING_INFO_NSARP_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BEAMFORMING_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_BEAMFORMING_INFO_8822B 0xffffffffL</div><div class='del'>-#define BIT_BEAMFORMING_INFO_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BEAMFORMING_INFO_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BEAMFORMING_INFO_8822B)</div><div class='del'>-#define BIT_GET_BEAMFORMING_INFO_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BEAMFORMING_INFO_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BEAMFORMING_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_IPV6_MYIPAD_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_IPV6_MYIPAD_8822B 0xffffffffffffffffffffffffffffffffL</div><div class='del'>-#define BIT_R_WMAC_IPV6_MYIPAD_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_IPV6_MYIPAD_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_IPV6_MYIPAD_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_IPV6_MYIPAD_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_IPV6_MYIPAD_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_IPV6_MYIPAD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSVD_0X740_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_RTX_CTX_SUBTYPE_CFG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_CTX_SUBTYPE_8822B 4</div><div class='del'>-#define BIT_MASK_R_WMAC_CTX_SUBTYPE_8822B 0xf</div><div class='del'>-#define BIT_R_WMAC_CTX_SUBTYPE_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_CTX_SUBTYPE_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_CTX_SUBTYPE_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_CTX_SUBTYPE_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_CTX_SUBTYPE_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_CTX_SUBTYPE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RTX_SUBTYPE_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_RTX_SUBTYPE_8822B 0xf</div><div class='del'>-#define BIT_R_WMAC_RTX_SUBTYPE_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RTX_SUBTYPE_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_RTX_SUBTYPE_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_RTX_SUBTYPE_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RTX_SUBTYPE_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_RTX_SUBTYPE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_SWAES_CFG_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_V2_8822B */</div><div class='del'>-#define BIT_GNT_BT_POLARITY_8822B BIT(12)</div><div class='del'>-#define BIT_GNT_BT_BYPASS_PRIORITY_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TIMER_8822B 0</div><div class='del'>-#define BIT_MASK_TIMER_8822B 0xff</div><div class='del'>-#define BIT_TIMER_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_TIMER_8822B) &lt;&lt; BIT_SHIFT_TIMER_8822B)</div><div class='del'>-#define BIT_GET_TIMER_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TIMER_8822B) &amp; BIT_MASK_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_8822B */</div><div class='del'>-#define BIT_R_GNT_BT_RFC_SW_8822B BIT(12)</div><div class='del'>-#define BIT_R_GNT_BT_RFC_SW_EN_8822B BIT(11)</div><div class='del'>-#define BIT_R_GNT_BT_BB_SW_8822B BIT(10)</div><div class='del'>-#define BIT_R_GNT_BT_BB_SW_EN_8822B BIT(9)</div><div class='del'>-#define BIT_R_BT_CNT_THREN_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_BT_CNT_THR_8822B 0</div><div class='del'>-#define BIT_MASK_R_BT_CNT_THR_8822B 0xff</div><div class='del'>-#define BIT_R_BT_CNT_THR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_BT_CNT_THR_8822B) &lt;&lt; BIT_SHIFT_R_BT_CNT_THR_8822B)</div><div class='del'>-#define BIT_GET_R_BT_CNT_THR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_BT_CNT_THR_8822B) &amp; BIT_MASK_R_BT_CNT_THR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLAN_ACT_MASK_CTRL_8822B */</div><div class='del'>-#define BIT_WLRX_TER_BY_CTL_8822B BIT(43)</div><div class='del'>-#define BIT_WLRX_TER_BY_AD_8822B BIT(42)</div><div class='del'>-#define BIT_ANT_DIVERSITY_SEL_8822B BIT(41)</div><div class='del'>-#define BIT_ANTSEL_FOR_BT_CTRL_EN_8822B BIT(40)</div><div class='del'>-#define BIT_WLACT_LOW_GNTWL_EN_8822B BIT(34)</div><div class='del'>-#define BIT_WLACT_HIGH_GNTBT_EN_8822B BIT(33)</div><div class='del'>-#define BIT_NAV_UPPER_V1_8822B BIT(32)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RXMYRTS_NAV_V1_8822B 8</div><div class='del'>-#define BIT_MASK_RXMYRTS_NAV_V1_8822B 0xff</div><div class='del'>-#define BIT_RXMYRTS_NAV_V1_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_RXMYRTS_NAV_V1_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RXMYRTS_NAV_V1_8822B)</div><div class='del'>-#define BIT_GET_RXMYRTS_NAV_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RXMYRTS_NAV_V1_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_RXMYRTS_NAV_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RTSRST_V1_8822B 0</div><div class='del'>-#define BIT_MASK_RTSRST_V1_8822B 0xff</div><div class='del'>-#define BIT_RTSRST_V1_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_RTSRST_V1_8822B) &lt;&lt; BIT_SHIFT_RTSRST_V1_8822B)</div><div class='del'>-#define BIT_GET_RTSRST_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RTSRST_V1_8822B) &amp; BIT_MASK_RTSRST_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_COEX_ENHANCED_INTR_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_STAT_DELAY_8822B 12</div><div class='del'>-#define BIT_MASK_BT_STAT_DELAY_8822B 0xf</div><div class='del'>-#define BIT_BT_STAT_DELAY_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_STAT_DELAY_8822B) &lt;&lt; BIT_SHIFT_BT_STAT_DELAY_8822B)</div><div class='del'>-#define BIT_GET_BT_STAT_DELAY_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_STAT_DELAY_8822B) &amp; BIT_MASK_BT_STAT_DELAY_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_TRX_INIT_DETECT_8822B 8</div><div class='del'>-#define BIT_MASK_BT_TRX_INIT_DETECT_8822B 0xf</div><div class='del'>-#define BIT_BT_TRX_INIT_DETECT_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_TRX_INIT_DETECT_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BT_TRX_INIT_DETECT_8822B)</div><div class='del'>-#define BIT_GET_BT_TRX_INIT_DETECT_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_TRX_INIT_DETECT_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_BT_TRX_INIT_DETECT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_PRI_DETECT_TO_8822B 4</div><div class='del'>-#define BIT_MASK_BT_PRI_DETECT_TO_8822B 0xf</div><div class='del'>-#define BIT_BT_PRI_DETECT_TO_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_PRI_DETECT_TO_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BT_PRI_DETECT_TO_8822B)</div><div class='del'>-#define BIT_GET_BT_PRI_DETECT_TO_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_PRI_DETECT_TO_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_BT_PRI_DETECT_TO_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_GRANTALL_WLMASK_8822B BIT(3)</div><div class='del'>-#define BIT_STATIS_BT_EN_8822B BIT(2)</div><div class='del'>-#define BIT_WL_ACT_MASK_ENABLE_8822B BIT(1)</div><div class='del'>-#define BIT_ENHANCED_BT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ACT_STATISTICS_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_LO_RX_8822B (48 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_STATIS_BT_LO_RX_8822B 0xffff</div><div class='del'>-#define BIT_STATIS_BT_LO_RX_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_LO_RX_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STATIS_BT_LO_RX_8822B)</div><div class='del'>-#define BIT_GET_STATIS_BT_LO_RX_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_LO_RX_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_STATIS_BT_LO_RX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_LO_TX_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_STATIS_BT_LO_TX_8822B 0xffff</div><div class='del'>-#define BIT_STATIS_BT_LO_TX_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_LO_TX_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STATIS_BT_LO_TX_8822B)</div><div class='del'>-#define BIT_GET_STATIS_BT_LO_TX_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_LO_TX_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_STATIS_BT_LO_TX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_HI_RX_8822B 16</div><div class='del'>-#define BIT_MASK_STATIS_BT_HI_RX_8822B 0xffff</div><div class='del'>-#define BIT_STATIS_BT_HI_RX_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_HI_RX_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STATIS_BT_HI_RX_8822B)</div><div class='del'>-#define BIT_GET_STATIS_BT_HI_RX_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_HI_RX_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_STATIS_BT_HI_RX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_STATIS_BT_HI_TX_8822B 0</div><div class='del'>-#define BIT_MASK_STATIS_BT_HI_TX_8822B 0xffff</div><div class='del'>-#define BIT_STATIS_BT_HI_TX_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_STATIS_BT_HI_TX_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_STATIS_BT_HI_TX_8822B)</div><div class='del'>-#define BIT_GET_STATIS_BT_HI_TX_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_STATIS_BT_HI_TX_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_STATIS_BT_HI_TX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_STATISTICS_CONTROL_REGISTER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_BT_CMD_RPT_8822B 16</div><div class='del'>-#define BIT_MASK_R_BT_CMD_RPT_8822B 0xffff</div><div class='del'>-#define BIT_R_BT_CMD_RPT_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_BT_CMD_RPT_8822B) &lt;&lt; BIT_SHIFT_R_BT_CMD_RPT_8822B)</div><div class='del'>-#define BIT_GET_R_BT_CMD_RPT_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_BT_CMD_RPT_8822B) &amp; BIT_MASK_R_BT_CMD_RPT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_RPT_FROM_BT_8822B 8</div><div class='del'>-#define BIT_MASK_R_RPT_FROM_BT_8822B 0xff</div><div class='del'>-#define BIT_R_RPT_FROM_BT_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_RPT_FROM_BT_8822B) &lt;&lt; BIT_SHIFT_R_RPT_FROM_BT_8822B)</div><div class='del'>-#define BIT_GET_R_RPT_FROM_BT_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_RPT_FROM_BT_8822B) &amp; BIT_MASK_R_RPT_FROM_BT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_HID_ISR_SET_8822B 6</div><div class='del'>-#define BIT_MASK_BT_HID_ISR_SET_8822B 0x3</div><div class='del'>-#define BIT_BT_HID_ISR_SET_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_HID_ISR_SET_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BT_HID_ISR_SET_8822B)</div><div class='del'>-#define BIT_GET_BT_HID_ISR_SET_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_HID_ISR_SET_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_BT_HID_ISR_SET_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_TDMA_BT_START_NOTIFY_8822B BIT(5)</div><div class='del'>-#define BIT_ENABLE_TDMA_FW_MODE_8822B BIT(4)</div><div class='del'>-#define BIT_ENABLE_PTA_TDMA_MODE_8822B BIT(3)</div><div class='del'>-#define BIT_ENABLE_COEXIST_TAB_IN_TDMA_8822B BIT(2)</div><div class='del'>-#define BIT_GPIO2_GPIO3_EXANGE_OR_NO_BT_CCA_8822B BIT(1)</div><div class='del'>-#define BIT_RTK_BT_ENABLE_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_STATUS_REPORT_REGISTER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_PROFILE_8822B 24</div><div class='del'>-#define BIT_MASK_BT_PROFILE_8822B 0xff</div><div class='del'>-#define BIT_BT_PROFILE_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_PROFILE_8822B) &lt;&lt; BIT_SHIFT_BT_PROFILE_8822B)</div><div class='del'>-#define BIT_GET_BT_PROFILE_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_PROFILE_8822B) &amp; BIT_MASK_BT_PROFILE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_POWER_8822B 16</div><div class='del'>-#define BIT_MASK_BT_POWER_8822B 0xff</div><div class='del'>-#define BIT_BT_POWER_8822B(x)                                                  \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_POWER_8822B) &lt;&lt; BIT_SHIFT_BT_POWER_8822B)</div><div class='del'>-#define BIT_GET_BT_POWER_8822B(x)                                              \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_POWER_8822B) &amp; BIT_MASK_BT_POWER_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_PREDECT_STATUS_8822B 8</div><div class='del'>-#define BIT_MASK_BT_PREDECT_STATUS_8822B 0xff</div><div class='del'>-#define BIT_BT_PREDECT_STATUS_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_PREDECT_STATUS_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BT_PREDECT_STATUS_8822B)</div><div class='del'>-#define BIT_GET_BT_PREDECT_STATUS_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_PREDECT_STATUS_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_BT_PREDECT_STATUS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_CMD_INFO_8822B 0</div><div class='del'>-#define BIT_MASK_BT_CMD_INFO_8822B 0xff</div><div class='del'>-#define BIT_BT_CMD_INFO_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_CMD_INFO_8822B) &lt;&lt; BIT_SHIFT_BT_CMD_INFO_8822B)</div><div class='del'>-#define BIT_GET_BT_CMD_INFO_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_CMD_INFO_8822B) &amp; BIT_MASK_BT_CMD_INFO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_INTERRUPT_CONTROL_REGISTER_8822B */</div><div class='del'>-#define BIT_EN_MAC_NULL_PKT_NOTIFY_8822B BIT(31)</div><div class='del'>-#define BIT_EN_WLAN_RPT_AND_BT_QUERY_8822B BIT(30)</div><div class='del'>-#define BIT_EN_BT_STSTUS_RPT_8822B BIT(29)</div><div class='del'>-#define BIT_EN_BT_POWER_8822B BIT(28)</div><div class='del'>-#define BIT_EN_BT_CHANNEL_8822B BIT(27)</div><div class='del'>-#define BIT_EN_BT_SLOT_CHANGE_8822B BIT(26)</div><div class='del'>-#define BIT_EN_BT_PROFILE_OR_HID_8822B BIT(25)</div><div class='del'>-#define BIT_WLAN_RPT_NOTIFY_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLAN_RPT_DATA_8822B 16</div><div class='del'>-#define BIT_MASK_WLAN_RPT_DATA_8822B 0xff</div><div class='del'>-#define BIT_WLAN_RPT_DATA_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLAN_RPT_DATA_8822B) &lt;&lt; BIT_SHIFT_WLAN_RPT_DATA_8822B)</div><div class='del'>-#define BIT_GET_WLAN_RPT_DATA_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLAN_RPT_DATA_8822B) &amp; BIT_MASK_WLAN_RPT_DATA_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMD_ID_8822B 8</div><div class='del'>-#define BIT_MASK_CMD_ID_8822B 0xff</div><div class='del'>-#define BIT_CMD_ID_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMD_ID_8822B) &lt;&lt; BIT_SHIFT_CMD_ID_8822B)</div><div class='del'>-#define BIT_GET_CMD_ID_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMD_ID_8822B) &amp; BIT_MASK_CMD_ID_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_BT_DATA_8822B 0xff</div><div class='del'>-#define BIT_BT_DATA_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_DATA_8822B) &lt;&lt; BIT_SHIFT_BT_DATA_8822B)</div><div class='del'>-#define BIT_GET_BT_DATA_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_DATA_8822B) &amp; BIT_MASK_BT_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WLAN_REPORT_TIME_OUT_CONTROL_REGISTER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WLAN_RPT_TO_8822B 0</div><div class='del'>-#define BIT_MASK_WLAN_RPT_TO_8822B 0xff</div><div class='del'>-#define BIT_WLAN_RPT_TO_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_WLAN_RPT_TO_8822B) &lt;&lt; BIT_SHIFT_WLAN_RPT_TO_8822B)</div><div class='del'>-#define BIT_GET_WLAN_RPT_TO_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WLAN_RPT_TO_8822B) &amp; BIT_MASK_WLAN_RPT_TO_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ISOLATION_TABLE_REGISTER_REGISTER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_ISOLATION_CHK_8822B 1</div><div class='del'>-#define BIT_MASK_ISOLATION_CHK_8822B 0x7fffffffffffffffffffL</div><div class='del'>-#define BIT_ISOLATION_CHK_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_ISOLATION_CHK_8822B) &lt;&lt; BIT_SHIFT_ISOLATION_CHK_8822B)</div><div class='del'>-#define BIT_GET_ISOLATION_CHK_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_ISOLATION_CHK_8822B) &amp; BIT_MASK_ISOLATION_CHK_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_ISOLATION_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_INTERRUPT_STATUS_REGISTER_8822B */</div><div class='del'>-#define BIT_BT_HID_ISR_8822B BIT(7)</div><div class='del'>-#define BIT_BT_QUERY_ISR_8822B BIT(6)</div><div class='del'>-#define BIT_MAC_NULL_PKT_NOTIFY_ISR_8822B BIT(5)</div><div class='del'>-#define BIT_WLAN_RPT_ISR_8822B BIT(4)</div><div class='del'>-#define BIT_BT_POWER_ISR_8822B BIT(3)</div><div class='del'>-#define BIT_BT_CHANNEL_ISR_8822B BIT(2)</div><div class='del'>-#define BIT_BT_SLOT_CHANGE_ISR_8822B BIT(1)</div><div class='del'>-#define BIT_BT_PROFILE_ISR_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_TDMA_TIME_REGISTER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_TIME_8822B 6</div><div class='del'>-#define BIT_MASK_BT_TIME_8822B 0x3ffffff</div><div class='del'>-#define BIT_BT_TIME_8822B(x)                                                   \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_TIME_8822B) &lt;&lt; BIT_SHIFT_BT_TIME_8822B)</div><div class='del'>-#define BIT_GET_BT_TIME_8822B(x)                                               \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_TIME_8822B) &amp; BIT_MASK_BT_TIME_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_RPT_SAMPLE_RATE_8822B 0</div><div class='del'>-#define BIT_MASK_BT_RPT_SAMPLE_RATE_8822B 0x3f</div><div class='del'>-#define BIT_BT_RPT_SAMPLE_RATE_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_RPT_SAMPLE_RATE_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_BT_RPT_SAMPLE_RATE_8822B)</div><div class='del'>-#define BIT_GET_BT_RPT_SAMPLE_RATE_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_RPT_SAMPLE_RATE_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_BT_RPT_SAMPLE_RATE_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_BT_ACT_REGISTER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_EISR_EN_8822B 16</div><div class='del'>-#define BIT_MASK_BT_EISR_EN_8822B 0xff</div><div class='del'>-#define BIT_BT_EISR_EN_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_EISR_EN_8822B) &lt;&lt; BIT_SHIFT_BT_EISR_EN_8822B)</div><div class='del'>-#define BIT_GET_BT_EISR_EN_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_EISR_EN_8822B) &amp; BIT_MASK_BT_EISR_EN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_BT_ACT_FALLING_ISR_8822B BIT(10)</div><div class='del'>-#define BIT_BT_ACT_RISING_ISR_8822B BIT(9)</div><div class='del'>-#define BIT_TDMA_TO_ISR_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_BT_CH_8822B 0</div><div class='del'>-#define BIT_MASK_BT_CH_8822B 0xff</div><div class='del'>-#define BIT_BT_CH_8822B(x)                                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_BT_CH_8822B) &lt;&lt; BIT_SHIFT_BT_CH_8822B)</div><div class='del'>-#define BIT_GET_BT_CH_8822B(x)                                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_BT_CH_8822B) &amp; BIT_MASK_BT_CH_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OBFF_CTRL_BASIC_8822B */</div><div class='del'>-#define BIT_OBFF_EN_V1_8822B BIT(31)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OBFF_STATE_V1_8822B 28</div><div class='del'>-#define BIT_MASK_OBFF_STATE_V1_8822B 0x3</div><div class='del'>-#define BIT_OBFF_STATE_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_OBFF_STATE_V1_8822B) &lt;&lt; BIT_SHIFT_OBFF_STATE_V1_8822B)</div><div class='del'>-#define BIT_GET_OBFF_STATE_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OBFF_STATE_V1_8822B) &amp; BIT_MASK_OBFF_STATE_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_OBFF_ACT_RXDMA_EN_8822B BIT(27)</div><div class='del'>-#define BIT_OBFF_BLOCK_INT_EN_8822B BIT(26)</div><div class='del'>-#define BIT_OBFF_AUTOACT_EN_8822B BIT(25)</div><div class='del'>-#define BIT_OBFF_AUTOIDLE_EN_8822B BIT(24)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MAX_PLS_8822B 20</div><div class='del'>-#define BIT_MASK_WAKE_MAX_PLS_8822B 0x7</div><div class='del'>-#define BIT_WAKE_MAX_PLS_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MAX_PLS_8822B) &lt;&lt; BIT_SHIFT_WAKE_MAX_PLS_8822B)</div><div class='del'>-#define BIT_GET_WAKE_MAX_PLS_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MAX_PLS_8822B) &amp; BIT_MASK_WAKE_MAX_PLS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MIN_PLS_8822B 16</div><div class='del'>-#define BIT_MASK_WAKE_MIN_PLS_8822B 0x7</div><div class='del'>-#define BIT_WAKE_MIN_PLS_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MIN_PLS_8822B) &lt;&lt; BIT_SHIFT_WAKE_MIN_PLS_8822B)</div><div class='del'>-#define BIT_GET_WAKE_MIN_PLS_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MIN_PLS_8822B) &amp; BIT_MASK_WAKE_MIN_PLS_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MAX_F2F_8822B 12</div><div class='del'>-#define BIT_MASK_WAKE_MAX_F2F_8822B 0x7</div><div class='del'>-#define BIT_WAKE_MAX_F2F_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MAX_F2F_8822B) &lt;&lt; BIT_SHIFT_WAKE_MAX_F2F_8822B)</div><div class='del'>-#define BIT_GET_WAKE_MAX_F2F_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MAX_F2F_8822B) &amp; BIT_MASK_WAKE_MAX_F2F_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WAKE_MIN_F2F_8822B 8</div><div class='del'>-#define BIT_MASK_WAKE_MIN_F2F_8822B 0x7</div><div class='del'>-#define BIT_WAKE_MIN_F2F_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_WAKE_MIN_F2F_8822B) &lt;&lt; BIT_SHIFT_WAKE_MIN_F2F_8822B)</div><div class='del'>-#define BIT_GET_WAKE_MIN_F2F_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WAKE_MIN_F2F_8822B) &amp; BIT_MASK_WAKE_MIN_F2F_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_APP_CPU_ACT_V1_8822B BIT(3)</div><div class='del'>-#define BIT_APP_OBFF_V1_8822B BIT(2)</div><div class='del'>-#define BIT_APP_IDLE_V1_8822B BIT(1)</div><div class='del'>-#define BIT_APP_INIT_V1_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_OBFF_CTRL2_TIMER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_HIGH_TIMER_IDX_8822B 24</div><div class='del'>-#define BIT_MASK_RX_HIGH_TIMER_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_HIGH_TIMER_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_HIGH_TIMER_IDX_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RX_HIGH_TIMER_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_HIGH_TIMER_IDX_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_HIGH_TIMER_IDX_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_RX_HIGH_TIMER_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_MED_TIMER_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_RX_MED_TIMER_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_MED_TIMER_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_MED_TIMER_IDX_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RX_MED_TIMER_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_MED_TIMER_IDX_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_MED_TIMER_IDX_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_RX_MED_TIMER_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_LOW_TIMER_IDX_8822B 8</div><div class='del'>-#define BIT_MASK_RX_LOW_TIMER_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_LOW_TIMER_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_LOW_TIMER_IDX_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RX_LOW_TIMER_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_LOW_TIMER_IDX_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_LOW_TIMER_IDX_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_RX_LOW_TIMER_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_OBFF_INT_TIMER_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_OBFF_INT_TIMER_IDX_8822B 0x7</div><div class='del'>-#define BIT_OBFF_INT_TIMER_IDX_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_OBFF_INT_TIMER_IDX_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_OBFF_INT_TIMER_IDX_8822B)</div><div class='del'>-#define BIT_GET_OBFF_INT_TIMER_IDX_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_OBFF_INT_TIMER_IDX_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_OBFF_INT_TIMER_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_CTRL_BASIC_8822B */</div><div class='del'>-#define BIT_LTR_EN_V1_8822B BIT(31)</div><div class='del'>-#define BIT_LTR_HW_EN_V1_8822B BIT(30)</div><div class='del'>-#define BIT_LRT_ACT_CTS_EN_8822B BIT(29)</div><div class='del'>-#define BIT_LTR_ACT_RXPKT_EN_8822B BIT(28)</div><div class='del'>-#define BIT_LTR_ACT_RXDMA_EN_8822B BIT(27)</div><div class='del'>-#define BIT_LTR_IDLE_NO_SNOOP_8822B BIT(26)</div><div class='del'>-#define BIT_SPDUP_MGTPKT_8822B BIT(25)</div><div class='del'>-#define BIT_RX_AGG_EN_8822B BIT(24)</div><div class='del'>-#define BIT_APP_LTR_ACT_8822B BIT(23)</div><div class='del'>-#define BIT_APP_LTR_IDLE_8822B BIT(22)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIGH_RATE_TRIG_SEL_8822B 20</div><div class='del'>-#define BIT_MASK_HIGH_RATE_TRIG_SEL_8822B 0x3</div><div class='del'>-#define BIT_HIGH_RATE_TRIG_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIGH_RATE_TRIG_SEL_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HIGH_RATE_TRIG_SEL_8822B)</div><div class='del'>-#define BIT_GET_HIGH_RATE_TRIG_SEL_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIGH_RATE_TRIG_SEL_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_HIGH_RATE_TRIG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MED_RATE_TRIG_SEL_8822B 18</div><div class='del'>-#define BIT_MASK_MED_RATE_TRIG_SEL_8822B 0x3</div><div class='del'>-#define BIT_MED_RATE_TRIG_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_MED_RATE_TRIG_SEL_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_MED_RATE_TRIG_SEL_8822B)</div><div class='del'>-#define BIT_GET_MED_RATE_TRIG_SEL_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MED_RATE_TRIG_SEL_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_MED_RATE_TRIG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LOW_RATE_TRIG_SEL_8822B 16</div><div class='del'>-#define BIT_MASK_LOW_RATE_TRIG_SEL_8822B 0x3</div><div class='del'>-#define BIT_LOW_RATE_TRIG_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_LOW_RATE_TRIG_SEL_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LOW_RATE_TRIG_SEL_8822B)</div><div class='del'>-#define BIT_GET_LOW_RATE_TRIG_SEL_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LOW_RATE_TRIG_SEL_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_LOW_RATE_TRIG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIGH_RATE_BD_IDX_8822B 8</div><div class='del'>-#define BIT_MASK_HIGH_RATE_BD_IDX_8822B 0x7f</div><div class='del'>-#define BIT_HIGH_RATE_BD_IDX_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIGH_RATE_BD_IDX_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_HIGH_RATE_BD_IDX_8822B)</div><div class='del'>-#define BIT_GET_HIGH_RATE_BD_IDX_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIGH_RATE_BD_IDX_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_HIGH_RATE_BD_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LOW_RATE_BD_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_LOW_RATE_BD_IDX_8822B 0x7f</div><div class='del'>-#define BIT_LOW_RATE_BD_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_LOW_RATE_BD_IDX_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LOW_RATE_BD_IDX_8822B)</div><div class='del'>-#define BIT_GET_LOW_RATE_BD_IDX_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LOW_RATE_BD_IDX_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_LOW_RATE_BD_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_CTRL2_TIMER_THRESHOLD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_EMPTY_TIMER_IDX_8822B 24</div><div class='del'>-#define BIT_MASK_RX_EMPTY_TIMER_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_EMPTY_TIMER_IDX_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_EMPTY_TIMER_IDX_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RX_EMPTY_TIMER_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_EMPTY_TIMER_IDX_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_EMPTY_TIMER_IDX_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_RX_EMPTY_TIMER_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_AFULL_TH_IDX_8822B 20</div><div class='del'>-#define BIT_MASK_RX_AFULL_TH_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_AFULL_TH_IDX_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_AFULL_TH_IDX_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RX_AFULL_TH_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_AFULL_TH_IDX_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_AFULL_TH_IDX_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_RX_AFULL_TH_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_HIGH_TH_IDX_8822B 16</div><div class='del'>-#define BIT_MASK_RX_HIGH_TH_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_HIGH_TH_IDX_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_HIGH_TH_IDX_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_RX_HIGH_TH_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_HIGH_TH_IDX_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_HIGH_TH_IDX_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_RX_HIGH_TH_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_MED_TH_IDX_8822B 12</div><div class='del'>-#define BIT_MASK_RX_MED_TH_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_MED_TH_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_MED_TH_IDX_8822B) &lt;&lt; BIT_SHIFT_RX_MED_TH_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_MED_TH_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_MED_TH_IDX_8822B) &amp; BIT_MASK_RX_MED_TH_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_LOW_TH_IDX_8822B 8</div><div class='del'>-#define BIT_MASK_RX_LOW_TH_IDX_8822B 0x7</div><div class='del'>-#define BIT_RX_LOW_TH_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_LOW_TH_IDX_8822B) &lt;&lt; BIT_SHIFT_RX_LOW_TH_IDX_8822B)</div><div class='del'>-#define BIT_GET_RX_LOW_TH_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_LOW_TH_IDX_8822B) &amp; BIT_MASK_RX_LOW_TH_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_SPACE_IDX_8822B 4</div><div class='del'>-#define BIT_MASK_LTR_SPACE_IDX_8822B 0x3</div><div class='del'>-#define BIT_LTR_SPACE_IDX_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTR_SPACE_IDX_8822B) &lt;&lt; BIT_SHIFT_LTR_SPACE_IDX_8822B)</div><div class='del'>-#define BIT_GET_LTR_SPACE_IDX_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_SPACE_IDX_8822B) &amp; BIT_MASK_LTR_SPACE_IDX_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_IDLE_TIMER_IDX_8822B 0</div><div class='del'>-#define BIT_MASK_LTR_IDLE_TIMER_IDX_8822B 0x7</div><div class='del'>-#define BIT_LTR_IDLE_TIMER_IDX_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTR_IDLE_TIMER_IDX_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LTR_IDLE_TIMER_IDX_8822B)</div><div class='del'>-#define BIT_GET_LTR_IDLE_TIMER_IDX_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_IDLE_TIMER_IDX_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_LTR_IDLE_TIMER_IDX_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_IDLE_LATENCY_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_IDLE_L_8822B 0</div><div class='del'>-#define BIT_MASK_LTR_IDLE_L_8822B 0xffffffffL</div><div class='del'>-#define BIT_LTR_IDLE_L_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTR_IDLE_L_8822B) &lt;&lt; BIT_SHIFT_LTR_IDLE_L_8822B)</div><div class='del'>-#define BIT_GET_LTR_IDLE_L_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_IDLE_L_8822B) &amp; BIT_MASK_LTR_IDLE_L_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_LTR_ACTIVE_LATENCY_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTR_ACT_L_8822B 0</div><div class='del'>-#define BIT_MASK_LTR_ACT_L_8822B 0xffffffffL</div><div class='del'>-#define BIT_LTR_ACT_L_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTR_ACT_L_8822B) &lt;&lt; BIT_SHIFT_LTR_ACT_L_8822B)</div><div class='del'>-#define BIT_GET_LTR_ACT_L_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTR_ACT_L_8822B) &amp; BIT_MASK_LTR_ACT_L_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_ANTENNA_TRAINING_CONTROL_REGISTER_8822B */</div><div class='del'>-#define BIT_APPEND_MACID_IN_RESP_EN_8822B BIT(50)</div><div class='del'>-#define BIT_ADDR2_MATCH_EN_8822B BIT(49)</div><div class='del'>-#define BIT_ANTTRN_EN_8822B BIT(48)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_TRAIN_STA_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_TRAIN_STA_ADDR_8822B 0xffffffffffffL</div><div class='del'>-#define BIT_TRAIN_STA_ADDR_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_TRAIN_STA_ADDR_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_TRAIN_STA_ADDR_8822B)</div><div class='del'>-#define BIT_GET_TRAIN_STA_ADDR_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_TRAIN_STA_ADDR_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_TRAIN_STA_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RSVD_0X7B4_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PKTCNT_RWD_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PKTCNT_BSSIDMAP_8822B 4</div><div class='del'>-#define BIT_MASK_PKTCNT_BSSIDMAP_8822B 0xf</div><div class='del'>-#define BIT_PKTCNT_BSSIDMAP_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_PKTCNT_BSSIDMAP_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_PKTCNT_BSSIDMAP_8822B)</div><div class='del'>-#define BIT_GET_PKTCNT_BSSIDMAP_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PKTCNT_BSSIDMAP_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_PKTCNT_BSSIDMAP_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_PKTCNT_CNTRST_8822B BIT(1)</div><div class='del'>-#define BIT_PKTCNT_CNTEN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_PKTCNT_CTRL_8822B */</div><div class='del'>-#define BIT_WMAC_PKTCNT_TRST_8822B BIT(9)</div><div class='del'>-#define BIT_WMAC_PKTCNT_FEN_8822B BIT(8)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WMAC_PKTCNT_CFGAD_8822B 0</div><div class='del'>-#define BIT_MASK_WMAC_PKTCNT_CFGAD_8822B 0xff</div><div class='del'>-#define BIT_WMAC_PKTCNT_CFGAD_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_WMAC_PKTCNT_CFGAD_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WMAC_PKTCNT_CFGAD_8822B)</div><div class='del'>-#define BIT_GET_WMAC_PKTCNT_CFGAD_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WMAC_PKTCNT_CFGAD_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_WMAC_PKTCNT_CFGAD_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_IQ_DUMP_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_MATCH_REF_MAC_8822B (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_MATCH_REF_MAC_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_WMAC_MATCH_REF_MAC_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_MATCH_REF_MAC_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_MATCH_REF_MAC_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_MATCH_REF_MAC_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_MATCH_REF_MAC_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_R_WMAC_MATCH_REF_MAC_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_MASK_LA_MAC_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_MASK_LA_MAC_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_WMAC_MASK_LA_MAC_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_MASK_LA_MAC_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_MASK_LA_MAC_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_MASK_LA_MAC_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_MASK_LA_MAC_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_R_WMAC_MASK_LA_MAC_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DUMP_OK_ADDR_8822B 15</div><div class='del'>-#define BIT_MASK_DUMP_OK_ADDR_8822B 0x1ffff</div><div class='del'>-#define BIT_DUMP_OK_ADDR_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_DUMP_OK_ADDR_8822B) &lt;&lt; BIT_SHIFT_DUMP_OK_ADDR_8822B)</div><div class='del'>-#define BIT_GET_DUMP_OK_ADDR_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DUMP_OK_ADDR_8822B) &amp; BIT_MASK_DUMP_OK_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_TRIG_TIME_SEL_8822B 8</div><div class='del'>-#define BIT_MASK_R_TRIG_TIME_SEL_8822B 0x7f</div><div class='del'>-#define BIT_R_TRIG_TIME_SEL_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_TRIG_TIME_SEL_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_TRIG_TIME_SEL_8822B)</div><div class='del'>-#define BIT_GET_R_TRIG_TIME_SEL_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_TRIG_TIME_SEL_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_R_TRIG_TIME_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_TRIG_SEL_8822B 6</div><div class='del'>-#define BIT_MASK_R_MAC_TRIG_SEL_8822B 0x3</div><div class='del'>-#define BIT_R_MAC_TRIG_SEL_8822B(x)                                            \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_TRIG_SEL_8822B)                                 \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MAC_TRIG_SEL_8822B)</div><div class='del'>-#define BIT_GET_R_MAC_TRIG_SEL_8822B(x)                                        \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_TRIG_SEL_8822B) &amp;                             \</div><div class='del'>-	 BIT_MASK_R_MAC_TRIG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_MAC_TRIG_REG_8822B BIT(5)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_LEVEL_PULSE_SEL_8822B 3</div><div class='del'>-#define BIT_MASK_R_LEVEL_PULSE_SEL_8822B 0x3</div><div class='del'>-#define BIT_R_LEVEL_PULSE_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_LEVEL_PULSE_SEL_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_LEVEL_PULSE_SEL_8822B)</div><div class='del'>-#define BIT_GET_R_LEVEL_PULSE_SEL_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_LEVEL_PULSE_SEL_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_LEVEL_PULSE_SEL_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_EN_LA_MAC_8822B BIT(2)</div><div class='del'>-#define BIT_R_EN_IQDUMP_8822B BIT(1)</div><div class='del'>-#define BIT_R_IQDATA_DUMP_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_FTM_CTL_8822B */</div><div class='del'>-#define BIT_RXFTM_TXACK_SC_8822B BIT(6)</div><div class='del'>-#define BIT_RXFTM_TXACK_BW_8822B BIT(5)</div><div class='del'>-#define BIT_RXFTM_EN_8822B BIT(3)</div><div class='del'>-#define BIT_RXFTMREQ_BYDRV_8822B BIT(2)</div><div class='del'>-#define BIT_RXFTMREQ_EN_8822B BIT(1)</div><div class='del'>-#define BIT_FTM_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_IQ_MDPK_FUNC_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_WMAC_OPTION_FUNCTION_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RX_FIL_LEN_8822B (64 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_RX_FIL_LEN_8822B 0xffff</div><div class='del'>-#define BIT_R_WMAC_RX_FIL_LEN_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RX_FIL_LEN_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_RX_FIL_LEN_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_RX_FIL_LEN_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RX_FIL_LEN_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_WMAC_RX_FIL_LEN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_RXFIFO_FULL_TH_8822B (56 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_WMAC_RXFIFO_FULL_TH_8822B 0xff</div><div class='del'>-#define BIT_R_WMAC_RXFIFO_FULL_TH_8822B(x)                                     \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_RXFIFO_FULL_TH_8822B)                          \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_RXFIFO_FULL_TH_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_RXFIFO_FULL_TH_8822B(x)                                 \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_RXFIFO_FULL_TH_8822B) &amp;                      \</div><div class='del'>-	 BIT_MASK_R_WMAC_RXFIFO_FULL_TH_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_R_WMAC_RX_SYNCFIFO_SYNC_8822B BIT(55)</div><div class='del'>-#define BIT_R_WMAC_RXRST_DLY_8822B BIT(54)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_REF_DROP_8822B BIT(53)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_UA1_8822B BIT(52)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_TYPE_8822B BIT(51)</div><div class='del'>-#define BIT_R_WMAC_NDP_RST_8822B BIT(50)</div><div class='del'>-#define BIT_R_WMAC_POWINT_EN_8822B BIT(49)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_PERPKT_8822B BIT(48)</div><div class='del'>-#define BIT_R_WMAC_SRCH_TXRPT_MID_8822B BIT(47)</div><div class='del'>-#define BIT_R_WMAC_PFIN_TOEN_8822B BIT(46)</div><div class='del'>-#define BIT_R_WMAC_FIL_SECERR_8822B BIT(45)</div><div class='del'>-#define BIT_R_WMAC_FIL_CTLPKTLEN_8822B BIT(44)</div><div class='del'>-#define BIT_R_WMAC_FIL_FCTYPE_8822B BIT(43)</div><div class='del'>-#define BIT_R_WMAC_FIL_FCPROVER_8822B BIT(42)</div><div class='del'>-#define BIT_R_WMAC_PHYSTS_SNIF_8822B BIT(41)</div><div class='del'>-#define BIT_R_WMAC_PHYSTS_PLCP_8822B BIT(40)</div><div class='del'>-#define BIT_R_MAC_TCR_VBONF_RD_8822B BIT(39)</div><div class='del'>-#define BIT_R_WMAC_TCR_MPAR_NDP_8822B BIT(38)</div><div class='del'>-#define BIT_R_WMAC_NDP_FILTER_8822B BIT(37)</div><div class='del'>-#define BIT_R_WMAC_RXLEN_SEL_8822B BIT(36)</div><div class='del'>-#define BIT_R_WMAC_RXLEN_SEL1_8822B BIT(35)</div><div class='del'>-#define BIT_R_OFDM_FILTER_8822B BIT(34)</div><div class='del'>-#define BIT_R_WMAC_CHK_OFDM_LEN_8822B BIT(33)</div><div class='del'>-#define BIT_R_WMAC_CHK_CCK_LEN_8822B BIT(32)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_OFDM_LEN_8822B 26</div><div class='del'>-#define BIT_MASK_R_OFDM_LEN_8822B 0x3f</div><div class='del'>-#define BIT_R_OFDM_LEN_8822B(x)                                                \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_OFDM_LEN_8822B) &lt;&lt; BIT_SHIFT_R_OFDM_LEN_8822B)</div><div class='del'>-#define BIT_GET_R_OFDM_LEN_8822B(x)                                            \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_OFDM_LEN_8822B) &amp; BIT_MASK_R_OFDM_LEN_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_CCK_LEN_8822B 0</div><div class='del'>-#define BIT_MASK_R_CCK_LEN_8822B 0xffff</div><div class='del'>-#define BIT_R_CCK_LEN_8822B(x)                                                 \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_CCK_LEN_8822B) &lt;&lt; BIT_SHIFT_R_CCK_LEN_8822B)</div><div class='del'>-#define BIT_GET_R_CCK_LEN_8822B(x)                                             \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_CCK_LEN_8822B) &amp; BIT_MASK_R_CCK_LEN_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RX_FILTER_FUNCTION_8822B */</div><div class='del'>-#define BIT_R_WMAC_MHRDDY_LATCH_8822B BIT(14)</div><div class='del'>-#define BIT_R_WMAC_MHRDDY_CLR_8822B BIT(13)</div><div class='del'>-#define BIT_R_RXPKTCTL_FSM_BASED_MPDURDY1_8822B BIT(12)</div><div class='del'>-#define BIT_WMAC_DIS_VHT_PLCP_CHK_MU_8822B BIT(11)</div><div class='del'>-#define BIT_R_CHK_DELIMIT_LEN_8822B BIT(10)</div><div class='del'>-#define BIT_R_REAPTER_ADDR_MATCH_8822B BIT(9)</div><div class='del'>-#define BIT_R_RXPKTCTL_FSM_BASED_MPDURDY_8822B BIT(8)</div><div class='del'>-#define BIT_R_LATCH_MACHRDY_8822B BIT(7)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_REND_8822B BIT(6)</div><div class='del'>-#define BIT_R_WMAC_MPDURDY_CLR_8822B BIT(5)</div><div class='del'>-#define BIT_R_WMAC_CLRRXSEC_8822B BIT(4)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_RDEL_8822B BIT(3)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_FCSE_8822B BIT(2)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_MESH_DEL_8822B BIT(1)</div><div class='del'>-#define BIT_R_WMAC_RXFIL_MASKM_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NDP_SIG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_WMAC_TXNDP_SIGB_8822B 0</div><div class='del'>-#define BIT_MASK_R_WMAC_TXNDP_SIGB_8822B 0x1fffff</div><div class='del'>-#define BIT_R_WMAC_TXNDP_SIGB_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_WMAC_TXNDP_SIGB_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_WMAC_TXNDP_SIGB_8822B)</div><div class='del'>-#define BIT_GET_R_WMAC_TXNDP_SIGB_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_WMAC_TXNDP_SIGB_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_R_WMAC_TXNDP_SIGB_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_TXCMD_INFO_FOR_RSP_PKT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_DEBUG_8822B (32 &amp; CPU_OPT_WIDTH)</div><div class='del'>-#define BIT_MASK_R_MAC_DEBUG_8822B 0xffffffffL</div><div class='del'>-#define BIT_R_MAC_DEBUG_8822B(x)                                               \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_DEBUG_8822B) &lt;&lt; BIT_SHIFT_R_MAC_DEBUG_8822B)</div><div class='del'>-#define BIT_GET_R_MAC_DEBUG_8822B(x)                                           \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_DEBUG_8822B) &amp; BIT_MASK_R_MAC_DEBUG_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_DBG_SHIFT_8822B 8</div><div class='del'>-#define BIT_MASK_R_MAC_DBG_SHIFT_8822B 0x7</div><div class='del'>-#define BIT_R_MAC_DBG_SHIFT_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_DBG_SHIFT_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_R_MAC_DBG_SHIFT_8822B)</div><div class='del'>-#define BIT_GET_R_MAC_DBG_SHIFT_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_DBG_SHIFT_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_R_MAC_DBG_SHIFT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_R_MAC_DBG_SEL_8822B 0</div><div class='del'>-#define BIT_MASK_R_MAC_DBG_SEL_8822B 0x3</div><div class='del'>-#define BIT_R_MAC_DBG_SEL_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_R_MAC_DBG_SEL_8822B) &lt;&lt; BIT_SHIFT_R_MAC_DBG_SEL_8822B)</div><div class='del'>-#define BIT_GET_R_MAC_DBG_SEL_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_R_MAC_DBG_SEL_8822B) &amp; BIT_MASK_R_MAC_DBG_SEL_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_RTS_ADDRESS_0_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_RTS_ADDRESS_1_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG__RPFM_MAP1_8822B</div><div class='del'>- * (RX PAYLOAD FILTER MAP FRAME TYPE CONTROL REGISTER GROUP 1</div><div class='del'>- */</div><div class='del'>-#define BIT_DATA_RPFM15EN_8822B BIT(15)</div><div class='del'>-#define BIT_DATA_RPFM14EN_8822B BIT(14)</div><div class='del'>-#define BIT_DATA_RPFM13EN_8822B BIT(13)</div><div class='del'>-#define BIT_DATA_RPFM12EN_8822B BIT(12)</div><div class='del'>-#define BIT_DATA_RPFM11EN_8822B BIT(11)</div><div class='del'>-#define BIT_DATA_RPFM10EN_8822B BIT(10)</div><div class='del'>-#define BIT_DATA_RPFM9EN_8822B BIT(9)</div><div class='del'>-#define BIT_DATA_RPFM8EN_8822B BIT(8)</div><div class='del'>-#define BIT_DATA_RPFM7EN_8822B BIT(7)</div><div class='del'>-#define BIT_DATA_RPFM6EN_8822B BIT(6)</div><div class='del'>-#define BIT_DATA_RPFM5EN_8822B BIT(5)</div><div class='del'>-#define BIT_DATA_RPFM4EN_8822B BIT(4)</div><div class='del'>-#define BIT_DATA_RPFM3EN_8822B BIT(3)</div><div class='del'>-#define BIT_DATA_RPFM2EN_8822B BIT(2)</div><div class='del'>-#define BIT_DATA_RPFM1EN_8822B BIT(1)</div><div class='del'>-#define BIT_DATA_RPFM0EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL2LTECOEX_INDIRECT_ACCESS_CTRL_V1_8822B */</div><div class='del'>-#define BIT_LTECOEX_ACCESS_START_V1_8822B BIT(31)</div><div class='del'>-#define BIT_LTECOEX_WRITE_MODE_V1_8822B BIT(30)</div><div class='del'>-#define BIT_LTECOEX_READY_BIT_V1_8822B BIT(29)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_WRITE_BYTE_EN_V1_8822B 16</div><div class='del'>-#define BIT_MASK_WRITE_BYTE_EN_V1_8822B 0xf</div><div class='del'>-#define BIT_WRITE_BYTE_EN_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_WRITE_BYTE_EN_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_WRITE_BYTE_EN_V1_8822B)</div><div class='del'>-#define BIT_GET_WRITE_BYTE_EN_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_WRITE_BYTE_EN_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_WRITE_BYTE_EN_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTECOEX_REG_ADDR_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LTECOEX_REG_ADDR_V1_8822B 0xffff</div><div class='del'>-#define BIT_LTECOEX_REG_ADDR_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTECOEX_REG_ADDR_V1_8822B)                            \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LTECOEX_REG_ADDR_V1_8822B)</div><div class='del'>-#define BIT_GET_LTECOEX_REG_ADDR_V1_8822B(x)                                   \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTECOEX_REG_ADDR_V1_8822B) &amp;                        \</div><div class='del'>-	 BIT_MASK_LTECOEX_REG_ADDR_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL2LTECOEX_INDIRECT_ACCESS_WRITE_DATA_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTECOEX_W_DATA_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LTECOEX_W_DATA_V1_8822B 0xffffffffL</div><div class='del'>-#define BIT_LTECOEX_W_DATA_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTECOEX_W_DATA_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LTECOEX_W_DATA_V1_8822B)</div><div class='del'>-#define BIT_GET_LTECOEX_W_DATA_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTECOEX_W_DATA_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_LTECOEX_W_DATA_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_WL2LTECOEX_INDIRECT_ACCESS_READ_DATA_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LTECOEX_R_DATA_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LTECOEX_R_DATA_V1_8822B 0xffffffffL</div><div class='del'>-#define BIT_LTECOEX_R_DATA_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_LTECOEX_R_DATA_V1_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_LTECOEX_R_DATA_V1_8822B)</div><div class='del'>-#define BIT_GET_LTECOEX_R_DATA_V1_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LTECOEX_R_DATA_V1_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_LTECOEX_R_DATA_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_NOT_VALID_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_TX_CTRL_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_INT_TIMEOUT_8822B 16</div><div class='del'>-#define BIT_MASK_SDIO_INT_TIMEOUT_8822B 0xffff</div><div class='del'>-#define BIT_SDIO_INT_TIMEOUT_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_INT_TIMEOUT_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SDIO_INT_TIMEOUT_8822B)</div><div class='del'>-#define BIT_GET_SDIO_INT_TIMEOUT_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_INT_TIMEOUT_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_SDIO_INT_TIMEOUT_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_IO_ERR_STATUS_8822B BIT(15)</div><div class='del'>-#define BIT_REPLY_ERRCRC_IN_DATA_8822B BIT(9)</div><div class='del'>-#define BIT_EN_CMD53_OVERLAP_8822B BIT(8)</div><div class='del'>-#define BIT_REPLY_ERR_IN_R5_8822B BIT(7)</div><div class='del'>-#define BIT_R18A_EN_8822B BIT(6)</div><div class='del'>-#define BIT_INIT_CMD_EN_8822B BIT(5)</div><div class='del'>-#define BIT_EN_RXDMA_MASK_INT_8822B BIT(2)</div><div class='del'>-#define BIT_EN_MASK_TIMER_8822B BIT(1)</div><div class='del'>-#define BIT_CMD_ERR_STOP_INT_EN_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HIMR_8822B */</div><div class='del'>-#define BIT_SDIO_CRCERR_MSK_8822B BIT(31)</div><div class='del'>-#define BIT_SDIO_HSISR3_IND_MSK_8822B BIT(30)</div><div class='del'>-#define BIT_SDIO_HSISR2_IND_MSK_8822B BIT(29)</div><div class='del'>-#define BIT_SDIO_HEISR_IND_MSK_8822B BIT(28)</div><div class='del'>-#define BIT_SDIO_CTWEND_MSK_8822B BIT(27)</div><div class='del'>-#define BIT_SDIO_ATIMEND_E_MSK_8822B BIT(26)</div><div class='del'>-#define BIT_SDIIO_ATIMEND_MSK_8822B BIT(25)</div><div class='del'>-#define BIT_SDIO_OCPINT_MSK_8822B BIT(24)</div><div class='del'>-#define BIT_SDIO_PSTIMEOUT_MSK_8822B BIT(23)</div><div class='del'>-#define BIT_SDIO_GTINT4_MSK_8822B BIT(22)</div><div class='del'>-#define BIT_SDIO_GTINT3_MSK_8822B BIT(21)</div><div class='del'>-#define BIT_SDIO_HSISR_IND_MSK_8822B BIT(20)</div><div class='del'>-#define BIT_SDIO_CPWM2_MSK_8822B BIT(19)</div><div class='del'>-#define BIT_SDIO_CPWM1_MSK_8822B BIT(18)</div><div class='del'>-#define BIT_SDIO_C2HCMD_INT_MSK_8822B BIT(17)</div><div class='del'>-#define BIT_SDIO_BCNERLY_INT_MSK_8822B BIT(16)</div><div class='del'>-#define BIT_SDIO_TXBCNERR_MSK_8822B BIT(7)</div><div class='del'>-#define BIT_SDIO_TXBCNOK_MSK_8822B BIT(6)</div><div class='del'>-#define BIT_SDIO_RXFOVW_MSK_8822B BIT(5)</div><div class='del'>-#define BIT_SDIO_TXFOVW_MSK_8822B BIT(4)</div><div class='del'>-#define BIT_SDIO_RXERR_MSK_8822B BIT(3)</div><div class='del'>-#define BIT_SDIO_TXERR_MSK_8822B BIT(2)</div><div class='del'>-#define BIT_SDIO_AVAL_MSK_8822B BIT(1)</div><div class='del'>-#define BIT_RX_REQUEST_MSK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HISR_8822B */</div><div class='del'>-#define BIT_SDIO_CRCERR_8822B BIT(31)</div><div class='del'>-#define BIT_SDIO_HSISR3_IND_8822B BIT(30)</div><div class='del'>-#define BIT_SDIO_HSISR2_IND_8822B BIT(29)</div><div class='del'>-#define BIT_SDIO_HEISR_IND_8822B BIT(28)</div><div class='del'>-#define BIT_SDIO_CTWEND_8822B BIT(27)</div><div class='del'>-#define BIT_SDIO_ATIMEND_E_8822B BIT(26)</div><div class='del'>-#define BIT_SDIO_ATIMEND_8822B BIT(25)</div><div class='del'>-#define BIT_SDIO_OCPINT_8822B BIT(24)</div><div class='del'>-#define BIT_SDIO_PSTIMEOUT_8822B BIT(23)</div><div class='del'>-#define BIT_SDIO_GTINT4_8822B BIT(22)</div><div class='del'>-#define BIT_SDIO_GTINT3_8822B BIT(21)</div><div class='del'>-#define BIT_SDIO_HSISR_IND_8822B BIT(20)</div><div class='del'>-#define BIT_SDIO_CPWM2_8822B BIT(19)</div><div class='del'>-#define BIT_SDIO_CPWM1_8822B BIT(18)</div><div class='del'>-#define BIT_SDIO_C2HCMD_INT_8822B BIT(17)</div><div class='del'>-#define BIT_SDIO_BCNERLY_INT_8822B BIT(16)</div><div class='del'>-#define BIT_SDIO_TXBCNERR_8822B BIT(7)</div><div class='del'>-#define BIT_SDIO_TXBCNOK_8822B BIT(6)</div><div class='del'>-#define BIT_SDIO_RXFOVW_8822B BIT(5)</div><div class='del'>-#define BIT_SDIO_TXFOVW_8822B BIT(4)</div><div class='del'>-#define BIT_SDIO_RXERR_8822B BIT(3)</div><div class='del'>-#define BIT_SDIO_TXERR_8822B BIT(2)</div><div class='del'>-#define BIT_SDIO_AVAL_8822B BIT(1)</div><div class='del'>-#define BIT_RX_REQUEST_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_RX_REQ_LEN_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_RX_REQ_LEN_V1_8822B 0</div><div class='del'>-#define BIT_MASK_RX_REQ_LEN_V1_8822B 0x3ffff</div><div class='del'>-#define BIT_RX_REQ_LEN_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_RX_REQ_LEN_V1_8822B) &lt;&lt; BIT_SHIFT_RX_REQ_LEN_V1_8822B)</div><div class='del'>-#define BIT_GET_RX_REQ_LEN_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_RX_REQ_LEN_V1_8822B) &amp; BIT_MASK_RX_REQ_LEN_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG_SEQ_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_FREE_TXPG_SEQ_8822B 0</div><div class='del'>-#define BIT_MASK_FREE_TXPG_SEQ_8822B 0xff</div><div class='del'>-#define BIT_FREE_TXPG_SEQ_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_FREE_TXPG_SEQ_8822B) &lt;&lt; BIT_SHIFT_FREE_TXPG_SEQ_8822B)</div><div class='del'>-#define BIT_GET_FREE_TXPG_SEQ_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_FREE_TXPG_SEQ_8822B) &amp; BIT_MASK_FREE_TXPG_SEQ_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_MID_FREEPG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_MID_FREEPG_V1_8822B 0xfff</div><div class='del'>-#define BIT_MID_FREEPG_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_MID_FREEPG_V1_8822B) &lt;&lt; BIT_SHIFT_MID_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_MID_FREEPG_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_MID_FREEPG_V1_8822B) &amp; BIT_MASK_MID_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HIQ_FREEPG_V1_8822B 0</div><div class='del'>-#define BIT_MASK_HIQ_FREEPG_V1_8822B 0xfff</div><div class='del'>-#define BIT_HIQ_FREEPG_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_HIQ_FREEPG_V1_8822B) &lt;&lt; BIT_SHIFT_HIQ_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_HIQ_FREEPG_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HIQ_FREEPG_V1_8822B) &amp; BIT_MASK_HIQ_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_FREE_TXPG2_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_PUB_FREEPG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_PUB_FREEPG_V1_8822B 0xfff</div><div class='del'>-#define BIT_PUB_FREEPG_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_PUB_FREEPG_V1_8822B) &lt;&lt; BIT_SHIFT_PUB_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_PUB_FREEPG_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_PUB_FREEPG_V1_8822B) &amp; BIT_MASK_PUB_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_LOW_FREEPG_V1_8822B 0</div><div class='del'>-#define BIT_MASK_LOW_FREEPG_V1_8822B 0xfff</div><div class='del'>-#define BIT_LOW_FREEPG_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_LOW_FREEPG_V1_8822B) &lt;&lt; BIT_SHIFT_LOW_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_LOW_FREEPG_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_LOW_FREEPG_V1_8822B) &amp; BIT_MASK_LOW_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_OQT_FREE_TXPG_V1_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_NOAC_OQT_FREEPG_V1_8822B 24</div><div class='del'>-#define BIT_MASK_NOAC_OQT_FREEPG_V1_8822B 0xff</div><div class='del'>-#define BIT_NOAC_OQT_FREEPG_V1_8822B(x)                                        \</div><div class='del'>-	(((x) &amp; BIT_MASK_NOAC_OQT_FREEPG_V1_8822B)                             \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_NOAC_OQT_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_NOAC_OQT_FREEPG_V1_8822B(x)                                    \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_NOAC_OQT_FREEPG_V1_8822B) &amp;                         \</div><div class='del'>-	 BIT_MASK_NOAC_OQT_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_AC_OQT_FREEPG_V1_8822B 16</div><div class='del'>-#define BIT_MASK_AC_OQT_FREEPG_V1_8822B 0xff</div><div class='del'>-#define BIT_AC_OQT_FREEPG_V1_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_AC_OQT_FREEPG_V1_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_AC_OQT_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_AC_OQT_FREEPG_V1_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_AC_OQT_FREEPG_V1_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_AC_OQT_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_EXQ_FREEPG_V1_8822B 0</div><div class='del'>-#define BIT_MASK_EXQ_FREEPG_V1_8822B 0xfff</div><div class='del'>-#define BIT_EXQ_FREEPG_V1_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_EXQ_FREEPG_V1_8822B) &lt;&lt; BIT_SHIFT_EXQ_FREEPG_V1_8822B)</div><div class='del'>-#define BIT_GET_EXQ_FREEPG_V1_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_EXQ_FREEPG_V1_8822B) &amp; BIT_MASK_EXQ_FREEPG_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HTSFR_INFO_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HTSFR1_8822B 16</div><div class='del'>-#define BIT_MASK_HTSFR1_8822B 0xffff</div><div class='del'>-#define BIT_HTSFR1_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_HTSFR1_8822B) &lt;&lt; BIT_SHIFT_HTSFR1_8822B)</div><div class='del'>-#define BIT_GET_HTSFR1_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HTSFR1_8822B) &amp; BIT_MASK_HTSFR1_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_HTSFR0_8822B 0</div><div class='del'>-#define BIT_MASK_HTSFR0_8822B 0xffff</div><div class='del'>-#define BIT_HTSFR0_8822B(x)                                                    \</div><div class='del'>-	(((x) &amp; BIT_MASK_HTSFR0_8822B) &lt;&lt; BIT_SHIFT_HTSFR0_8822B)</div><div class='del'>-#define BIT_GET_HTSFR0_8822B(x)                                                \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_HTSFR0_8822B) &amp; BIT_MASK_HTSFR0_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HCPWM1_V2_8822B */</div><div class='del'>-#define BIT_TOGGLING_8822B BIT(7)</div><div class='del'>-#define BIT_ACK_8822B BIT(6)</div><div class='del'>-#define BIT_SYS_CLK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HCPWM2_V2_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_CFG_8822B */</div><div class='del'>-#define BIT_INDIRECT_REG_RDY_8822B BIT(20)</div><div class='del'>-#define BIT_INDIRECT_REG_R_8822B BIT(19)</div><div class='del'>-#define BIT_INDIRECT_REG_W_8822B BIT(18)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INDIRECT_REG_SIZE_8822B 16</div><div class='del'>-#define BIT_MASK_INDIRECT_REG_SIZE_8822B 0x3</div><div class='del'>-#define BIT_INDIRECT_REG_SIZE_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_INDIRECT_REG_SIZE_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_INDIRECT_REG_SIZE_8822B)</div><div class='del'>-#define BIT_GET_INDIRECT_REG_SIZE_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INDIRECT_REG_SIZE_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_INDIRECT_REG_SIZE_8822B)</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INDIRECT_REG_ADDR_8822B 0</div><div class='del'>-#define BIT_MASK_INDIRECT_REG_ADDR_8822B 0xffff</div><div class='del'>-#define BIT_INDIRECT_REG_ADDR_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_INDIRECT_REG_ADDR_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_INDIRECT_REG_ADDR_8822B)</div><div class='del'>-#define BIT_GET_INDIRECT_REG_ADDR_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INDIRECT_REG_ADDR_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_INDIRECT_REG_ADDR_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_INDIRECT_REG_DATA_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_INDIRECT_REG_DATA_8822B 0</div><div class='del'>-#define BIT_MASK_INDIRECT_REG_DATA_8822B 0xffffffffL</div><div class='del'>-#define BIT_INDIRECT_REG_DATA_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_INDIRECT_REG_DATA_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_INDIRECT_REG_DATA_8822B)</div><div class='del'>-#define BIT_GET_INDIRECT_REG_DATA_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_INDIRECT_REG_DATA_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_INDIRECT_REG_DATA_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_H2C_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_H2C_MSG_8822B 0</div><div class='del'>-#define BIT_MASK_SDIO_H2C_MSG_8822B 0xffffffffL</div><div class='del'>-#define BIT_SDIO_H2C_MSG_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_H2C_MSG_8822B) &lt;&lt; BIT_SHIFT_SDIO_H2C_MSG_8822B)</div><div class='del'>-#define BIT_GET_SDIO_H2C_MSG_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_H2C_MSG_8822B) &amp; BIT_MASK_SDIO_H2C_MSG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_C2H_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_C2H_MSG_8822B 0</div><div class='del'>-#define BIT_MASK_SDIO_C2H_MSG_8822B 0xffffffffL</div><div class='del'>-#define BIT_SDIO_C2H_MSG_8822B(x)                                              \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_C2H_MSG_8822B) &lt;&lt; BIT_SHIFT_SDIO_C2H_MSG_8822B)</div><div class='del'>-#define BIT_GET_SDIO_C2H_MSG_8822B(x)                                          \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_C2H_MSG_8822B) &amp; BIT_MASK_SDIO_C2H_MSG_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HRPWM1_8822B */</div><div class='del'>-#define BIT_TOGGLING_8822B BIT(7)</div><div class='del'>-#define BIT_ACK_8822B BIT(6)</div><div class='del'>-#define BIT_32K_PERMISSION_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HRPWM2_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HPS_CLKR_8822B */</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_BUS_CTRL_8822B */</div><div class='del'>-#define BIT_PAD_CLK_XHGE_EN_8822B BIT(3)</div><div class='del'>-#define BIT_INTER_CLK_EN_8822B BIT(2)</div><div class='del'>-#define BIT_EN_RPT_TXCRC_8822B BIT(1)</div><div class='del'>-#define BIT_DIS_RXDMA_STS_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSUS_CTRL_8822B */</div><div class='del'>-#define BIT_INTR_CTRL_8822B BIT(4)</div><div class='del'>-#define BIT_SDIO_VOLTAGE_8822B BIT(3)</div><div class='del'>-#define BIT_BYPASS_INIT_8822B BIT(2)</div><div class='del'>-#define BIT_HCI_RESUME_RDY_8822B BIT(1)</div><div class='del'>-#define BIT_HCI_SUS_REQ_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_RESPONSE_TIMER_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMDIN_2RESP_TIMER_8822B 0</div><div class='del'>-#define BIT_MASK_CMDIN_2RESP_TIMER_8822B 0xffff</div><div class='del'>-#define BIT_CMDIN_2RESP_TIMER_8822B(x)                                         \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMDIN_2RESP_TIMER_8822B)                              \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMDIN_2RESP_TIMER_8822B)</div><div class='del'>-#define BIT_GET_CMDIN_2RESP_TIMER_8822B(x)                                     \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMDIN_2RESP_TIMER_8822B) &amp;                          \</div><div class='del'>-	 BIT_MASK_CMDIN_2RESP_TIMER_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CMD_CRC_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_CMD_CRC_V1_8822B 0</div><div class='del'>-#define BIT_MASK_SDIO_CMD_CRC_V1_8822B 0xff</div><div class='del'>-#define BIT_SDIO_CMD_CRC_V1_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_CMD_CRC_V1_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SDIO_CMD_CRC_V1_8822B)</div><div class='del'>-#define BIT_GET_SDIO_CMD_CRC_V1_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_CMD_CRC_V1_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_SDIO_CMD_CRC_V1_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSISR_8822B */</div><div class='del'>-#define BIT_DRV_WLAN_INT_CLR_8822B BIT(1)</div><div class='del'>-#define BIT_DRV_WLAN_INT_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_HSIMR_8822B */</div><div class='del'>-#define BIT_HISR_MASK_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_ERR_RPT_8822B */</div><div class='del'>-#define BIT_HR_FF_OVF_8822B BIT(6)</div><div class='del'>-#define BIT_HR_FF_UDN_8822B BIT(5)</div><div class='del'>-#define BIT_TXDMA_BUSY_ERR_8822B BIT(4)</div><div class='del'>-#define BIT_TXDMA_VLD_ERR_8822B BIT(3)</div><div class='del'>-#define BIT_QSEL_UNKNOWN_ERR_8822B BIT(2)</div><div class='del'>-#define BIT_QSEL_MIS_ERR_8822B BIT(1)</div><div class='del'>-#define BIT_SDIO_OVERRD_ERR_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CMD_ERRCNT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_CMD_CRC_ERR_CNT_8822B 0</div><div class='del'>-#define BIT_MASK_CMD_CRC_ERR_CNT_8822B 0xff</div><div class='del'>-#define BIT_CMD_CRC_ERR_CNT_8822B(x)                                           \</div><div class='del'>-	(((x) &amp; BIT_MASK_CMD_CRC_ERR_CNT_8822B)                                \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_CMD_CRC_ERR_CNT_8822B)</div><div class='del'>-#define BIT_GET_CMD_CRC_ERR_CNT_8822B(x)                                       \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_CMD_CRC_ERR_CNT_8822B) &amp;                            \</div><div class='del'>-	 BIT_MASK_CMD_CRC_ERR_CNT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_DATA_ERRCNT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_DATA_CRC_ERR_CNT_8822B 0</div><div class='del'>-#define BIT_MASK_DATA_CRC_ERR_CNT_8822B 0xff</div><div class='del'>-#define BIT_DATA_CRC_ERR_CNT_8822B(x)                                          \</div><div class='del'>-	(((x) &amp; BIT_MASK_DATA_CRC_ERR_CNT_8822B)                               \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_DATA_CRC_ERR_CNT_8822B)</div><div class='del'>-#define BIT_GET_DATA_CRC_ERR_CNT_8822B(x)                                      \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_DATA_CRC_ERR_CNT_8822B) &amp;                           \</div><div class='del'>-	 BIT_MASK_DATA_CRC_ERR_CNT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CMD_ERR_CONTENT_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_CMD_ERR_CONTENT_8822B 0</div><div class='del'>-#define BIT_MASK_SDIO_CMD_ERR_CONTENT_8822B 0xffffffffffL</div><div class='del'>-#define BIT_SDIO_CMD_ERR_CONTENT_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_CMD_ERR_CONTENT_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SDIO_CMD_ERR_CONTENT_8822B)</div><div class='del'>-#define BIT_GET_SDIO_CMD_ERR_CONTENT_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_CMD_ERR_CONTENT_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_SDIO_CMD_ERR_CONTENT_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_CRC_ERR_IDX_8822B */</div><div class='del'>-#define BIT_D3_CRC_ERR_8822B BIT(4)</div><div class='del'>-#define BIT_D2_CRC_ERR_8822B BIT(3)</div><div class='del'>-#define BIT_D1_CRC_ERR_8822B BIT(2)</div><div class='del'>-#define BIT_D0_CRC_ERR_8822B BIT(1)</div><div class='del'>-#define BIT_CMD_CRC_ERR_8822B BIT(0)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_DATA_CRC_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_DATA_CRC_8822B 0</div><div class='del'>-#define BIT_MASK_SDIO_DATA_CRC_8822B 0xff</div><div class='del'>-#define BIT_SDIO_DATA_CRC_8822B(x)                                             \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_DATA_CRC_8822B) &lt;&lt; BIT_SHIFT_SDIO_DATA_CRC_8822B)</div><div class='del'>-#define BIT_GET_SDIO_DATA_CRC_8822B(x)                                         \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_DATA_CRC_8822B) &amp; BIT_MASK_SDIO_DATA_CRC_8822B)</div><div class='del'>-</div><div class='del'>-/* 2 REG_SDIO_DATA_REPLY_TIME_8822B */</div><div class='del'>-</div><div class='del'>-#define BIT_SHIFT_SDIO_DATA_REPLY_TIME_8822B 0</div><div class='del'>-#define BIT_MASK_SDIO_DATA_REPLY_TIME_8822B 0x7</div><div class='del'>-#define BIT_SDIO_DATA_REPLY_TIME_8822B(x)                                      \</div><div class='del'>-	(((x) &amp; BIT_MASK_SDIO_DATA_REPLY_TIME_8822B)                           \</div><div class='del'>-	 &lt;&lt; BIT_SHIFT_SDIO_DATA_REPLY_TIME_8822B)</div><div class='del'>-#define BIT_GET_SDIO_DATA_REPLY_TIME_8822B(x)                                  \</div><div class='del'>-	(((x) &gt;&gt; BIT_SHIFT_SDIO_DATA_REPLY_TIME_8822B) &amp;                       \</div><div class='del'>-	 BIT_MASK_SDIO_DATA_REPLY_TIME_8822B)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_fw_info.h b/drivers/staging/rtlwifi/halmac/halmac_fw_info.h<br/>deleted file mode 100644<br/>index eb4558d0b62c..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_fw_info.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_fw_info.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,111 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HALMAC_FW_INFO_H_</div><div class='del'>-#define _HALMAC_FW_INFO_H_</div><div class='del'>-</div><div class='del'>-#define H2C_FORMAT_VERSION 6</div><div class='del'>-</div><div class='del'>-#define H2C_ACK_HDR_CONTENT_LENGTH 8</div><div class='del'>-#define CFG_PARAMETER_ACK_CONTENT_LENGTH 16</div><div class='del'>-#define SCAN_STATUS_RPT_CONTENT_LENGTH 4</div><div class='del'>-#define C2H_DBG_HEADER_LENGTH 4</div><div class='del'>-#define C2H_DBG_CONTENT_MAX_LENGTH 228</div><div class='del'>-</div><div class='del'>-#define C2H_DBG_CONTENT_SEQ_OFFSET 1</div><div class='del'>-</div><div class='del'>-/* Rename from FW SysHalCom_Debug_RAM.h */</div><div class='del'>-#define FW_REG_H2CPKT_DONE_SEQ 0x1C8</div><div class='del'>-#define fw_reg_wow_reason 0x1C7</div><div class='del'>-</div><div class='del'>-enum halmac_data_type {</div><div class='del'>-	HALMAC_DATA_TYPE_MAC_REG = 0x00,</div><div class='del'>-	HALMAC_DATA_TYPE_BB_REG = 0x01,</div><div class='del'>-	HALMAC_DATA_TYPE_RADIO_A = 0x02,</div><div class='del'>-	HALMAC_DATA_TYPE_RADIO_B = 0x03,</div><div class='del'>-	HALMAC_DATA_TYPE_RADIO_C = 0x04,</div><div class='del'>-	HALMAC_DATA_TYPE_RADIO_D = 0x05,</div><div class='del'>-</div><div class='del'>-	HALMAC_DATA_TYPE_DRV_DEFINE_0 = 0x80,</div><div class='del'>-	HALMAC_DATA_TYPE_DRV_DEFINE_1 = 0x81,</div><div class='del'>-	HALMAC_DATA_TYPE_DRV_DEFINE_2 = 0x82,</div><div class='del'>-	HALMAC_DATA_TYPE_DRV_DEFINE_3 = 0x83,</div><div class='del'>-	HALMAC_DATA_TYPE_UNDEFINE = 0x7FFFFFFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum halmac_packet_id {</div><div class='del'>-	HALMAC_PACKET_PROBE_REQ = 0x00,</div><div class='del'>-	HALMAC_PACKET_SYNC_BCN = 0x01,</div><div class='del'>-	HALMAC_PACKET_DISCOVERY_BCN = 0x02,</div><div class='del'>-</div><div class='del'>-	HALMAC_PACKET_UNDEFINE = 0x7FFFFFFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Channel Switch Action ID */</div><div class='del'>-enum halmac_cs_action_id {</div><div class='del'>-	HALMAC_CS_ACTION_NONE = 0x00,</div><div class='del'>-	HALMAC_CS_ACTIVE_SCAN = 0x01,</div><div class='del'>-	HALMAC_CS_NAN_NONMASTER_DW = 0x02,</div><div class='del'>-	HALMAC_CS_NAN_NONMASTER_NONDW = 0x03,</div><div class='del'>-	HALMAC_CS_NAN_MASTER_NONDW = 0x04,</div><div class='del'>-	HALMAC_CS_NAN_MASTER_DW = 0x05,</div><div class='del'>-</div><div class='del'>-	HALMAC_CS_ACTION_UNDEFINE = 0x7FFFFFFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Channel Switch Extra Action ID */</div><div class='del'>-enum halmac_cs_extra_action_id {</div><div class='del'>-	HALMAC_CS_EXTRA_ACTION_NONE = 0x00,</div><div class='del'>-	HALMAC_CS_EXTRA_UPDATE_PROBE = 0x01,</div><div class='del'>-	HALMAC_CS_EXTRA_UPDATE_BEACON = 0x02,</div><div class='del'>-</div><div class='del'>-	HALMAC_CS_EXTRA_ACTION_UNDEFINE = 0x7FFFFFFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum halmac_h2c_return_code {</div><div class='del'>-	HALMAC_H2C_RETURN_SUCCESS = 0x00,</div><div class='del'>-	HALMAC_H2C_RETURN_CFG_ERR_LEN = 0x01,</div><div class='del'>-	HALMAC_H2C_RETURN_CFG_ERR_CMD = 0x02,</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_EFUSE_ERR_DUMP = 0x03,</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_DATAPACK_ERR_FULL = 0x04, /* DMEM buffer full */</div><div class='del'>-	HALMAC_H2C_RETURN_DATAPACK_ERR_ID = 0x05, /* Invalid pack id */</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_RUN_ERR_EMPTY =</div><div class='del'>-		0x06, /* No data in dedicated buffer */</div><div class='del'>-	HALMAC_H2C_RETURN_RUN_ERR_LEN = 0x07,</div><div class='del'>-	HALMAC_H2C_RETURN_RUN_ERR_CMD = 0x08,</div><div class='del'>-	HALMAC_H2C_RETURN_RUN_ERR_ID = 0x09, /* Invalid pack id */</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_PACKET_ERR_FULL = 0x0A, /* DMEM buffer full */</div><div class='del'>-	HALMAC_H2C_RETURN_PACKET_ERR_ID = 0x0B, /* Invalid packet id */</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_SCAN_ERR_FULL = 0x0C, /* DMEM buffer full */</div><div class='del'>-	HALMAC_H2C_RETURN_SCAN_ERR_PHYDM = 0x0D, /* PHYDM API return fail */</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_ORIG_ERR_ID = 0x0E, /* Invalid original H2C cmd id */</div><div class='del'>-</div><div class='del'>-	HALMAC_H2C_RETURN_UNDEFINE = 0x7FFFFFFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum halmac_scan_report_code {</div><div class='del'>-	HALMAC_SCAN_REPORT_DONE = 0x00,</div><div class='del'>-	HALMAC_SCAN_REPORT_ERR_PHYDM = 0x01, /* PHYDM API return fail */</div><div class='del'>-	HALMAC_SCAN_REPORT_ERR_ID = 0x02, /* Invalid ActionID */</div><div class='del'>-	HALMAC_SCAN_REPORT_ERR_TX = 0x03, /* Tx RsvdPage fail */</div><div class='del'>-</div><div class='del'>-	HALMAC_SCAN_REPORT_UNDEFINE = 0x7FFFFFFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h b/drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h<br/>deleted file mode 100644<br/>index 45b5f8780baf..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HAL_FWOFFLOADC2HFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define _HAL_FWOFFLOADC2HFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_DBG 0X00</div><div class='del'>-#define C2H_SUB_CMD_ID_BT_COEX_INFO 0X02</div><div class='del'>-#define C2H_SUB_CMD_ID_SCAN_STATUS_RPT 0X03</div><div class='del'>-#define C2H_SUB_CMD_ID_H2C_ACK_HDR 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_CFG_PARAMETER_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_BT_COEX_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_DUMP_PHYSICAL_EFUSE_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_UPDATE_PACKET_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_UPDATE_DATAPACK_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_RUN_DATAPACK_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_CHANNEL_SWITCH_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_IQK_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_POWER_TRACKING_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_PSD_ACK 0X01</div><div class='del'>-#define C2H_SUB_CMD_ID_PSD_DATA 0X04</div><div class='del'>-#define C2H_SUB_CMD_ID_EFUSE_DATA 0X05</div><div class='del'>-#define C2H_SUB_CMD_ID_IQK_DATA 0X06</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_PKT_FTM_DBG 0X07</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_PKT_FTM_2_DBG 0X08</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_PKT_FTM_3_DBG 0X09</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_PKT_FTM_4_DBG 0X0A</div><div class='del'>-#define C2H_SUB_CMD_ID_FTMACKRPT_HDL_DBG 0X0B</div><div class='del'>-#define C2H_SUB_CMD_ID_FTMC2H_RPT 0X0C</div><div class='del'>-#define C2H_SUB_CMD_ID_DRVFTMC2H_RPT 0X0D</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_PKT_FTM_5_DBG 0X0E</div><div class='del'>-#define C2H_SUB_CMD_ID_CCX_RPT 0X0F</div><div class='del'>-#define C2H_SUB_CMD_ID_C2H_PKT_NAN_RPT 0X10</div><div class='del'>-#define H2C_SUB_CMD_ID_CFG_PARAMETER_ACK SUB_CMD_ID_CFG_PARAMETER</div><div class='del'>-#define H2C_SUB_CMD_ID_BT_COEX_ACK SUB_CMD_ID_BT_COEX</div><div class='del'>-#define H2C_SUB_CMD_ID_DUMP_PHYSICAL_EFUSE_ACK SUB_CMD_ID_DUMP_PHYSICAL_EFUSE</div><div class='del'>-#define H2C_SUB_CMD_ID_UPDATE_PACKET_ACK SUB_CMD_ID_UPDATE_PACKET</div><div class='del'>-#define H2C_SUB_CMD_ID_UPDATE_DATAPACK_ACK SUB_CMD_ID_UPDATE_DATAPACK</div><div class='del'>-#define H2C_SUB_CMD_ID_RUN_DATAPACK_ACK SUB_CMD_ID_RUN_DATAPACK</div><div class='del'>-#define H2C_SUB_CMD_ID_CHANNEL_SWITCH_ACK SUB_CMD_ID_CHANNEL_SWITCH</div><div class='del'>-#define H2C_SUB_CMD_ID_IQK_ACK SUB_CMD_ID_IQK</div><div class='del'>-#define H2C_SUB_CMD_ID_POWER_TRACKING_ACK SUB_CMD_ID_POWER_TRACKING</div><div class='del'>-#define H2C_SUB_CMD_ID_PSD_ACK SUB_CMD_ID_PSD</div><div class='del'>-#define H2C_SUB_CMD_ID_CCX_RPT SUB_CMD_ID_CCX_RPT</div><div class='del'>-#define H2C_CMD_ID_CFG_PARAMETER_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_BT_COEX_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_DUMP_PHYSICAL_EFUSE_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_UPDATE_PACKET_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_UPDATE_DATAPACK_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_RUN_DATAPACK_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_CHANNEL_SWITCH_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_IQK_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_POWER_TRACKING_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_PSD_ACK 0XFF</div><div class='del'>-#define H2C_CMD_ID_CCX_RPT 0XFF</div><div class='del'>-#define C2H_HDR_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_HDR_SET_CMD_ID(__c2h, __value)                                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_HDR_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_HDR_SET_SEQ(__c2h, __value)                                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_HDR_GET_C2H_SUB_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 8)</div><div class='del'>-#define C2H_HDR_SET_C2H_SUB_CMD_ID(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 8, __value)</div><div class='del'>-#define C2H_HDR_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define C2H_HDR_SET_LEN(__c2h, __value)                                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define C2H_DBG_GET_DBG_MSG(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define C2H_DBG_SET_DBG_MSG(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define BT_COEX_INFO_GET_DATA_START(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define BT_COEX_INFO_SET_DATA_START(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define SCAN_STATUS_RPT_GET_H2C_RETURN_CODE(__c2h)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define SCAN_STATUS_RPT_SET_H2C_RETURN_CODE(__c2h, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define SCAN_STATUS_RPT_GET_H2C_SEQ(__c2h)                                     \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 16)</div><div class='del'>-#define SCAN_STATUS_RPT_SET_H2C_SEQ(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 16, __value)</div><div class='del'>-#define H2C_ACK_HDR_GET_H2C_RETURN_CODE(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define H2C_ACK_HDR_SET_H2C_RETURN_CODE(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define H2C_ACK_HDR_GET_H2C_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define H2C_ACK_HDR_SET_H2C_CMD_ID(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define H2C_ACK_HDR_GET_H2C_SUB_CMD_ID(__c2h)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 16)</div><div class='del'>-#define H2C_ACK_HDR_SET_H2C_SUB_CMD_ID(__c2h, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 16, __value)</div><div class='del'>-#define H2C_ACK_HDR_GET_H2C_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 0, 16)</div><div class='del'>-#define H2C_ACK_HDR_SET_H2C_SEQ(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 0, 16, __value)</div><div class='del'>-#define CFG_PARAMETER_ACK_GET_OFFSET_ACCUMULATION(__c2h)                       \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0XC, 0, 32)</div><div class='del'>-#define CFG_PARAMETER_ACK_SET_OFFSET_ACCUMULATION(__c2h, __value)              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0XC, 0, 32, __value)</div><div class='del'>-#define CFG_PARAMETER_ACK_GET_VALUE_ACCUMULATION(__c2h)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X10, 0, 32)</div><div class='del'>-#define CFG_PARAMETER_ACK_SET_VALUE_ACCUMULATION(__c2h, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X10, 0, 32, __value)</div><div class='del'>-#define BT_COEX_ACK_GET_DATA_START(__c2h) LE_BITS_TO_4BYTE(__c2h + 0XC, 0, 8)</div><div class='del'>-#define BT_COEX_ACK_SET_DATA_START(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0XC, 0, 8, __value)</div><div class='del'>-#define PSD_DATA_GET_SEGMENT_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 7)</div><div class='del'>-#define PSD_DATA_SET_SEGMENT_ID(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 7, __value)</div><div class='del'>-#define PSD_DATA_GET_END_SEGMENT(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 7, 1)</div><div class='del'>-#define PSD_DATA_SET_END_SEGMENT(__c2h, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 7, 1, __value)</div><div class='del'>-#define PSD_DATA_GET_SEGMENT_SIZE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define PSD_DATA_SET_SEGMENT_SIZE(__c2h, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define PSD_DATA_GET_TOTAL_SIZE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 16)</div><div class='del'>-#define PSD_DATA_SET_TOTAL_SIZE(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 16, __value)</div><div class='del'>-#define PSD_DATA_GET_H2C_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X8, 0, 16)</div><div class='del'>-#define PSD_DATA_SET_H2C_SEQ(__c2h, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X8, 0, 16, __value)</div><div class='del'>-#define PSD_DATA_GET_DATA_START(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X8, 16, 8)</div><div class='del'>-#define PSD_DATA_SET_DATA_START(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X8, 16, 8, __value)</div><div class='del'>-#define EFUSE_DATA_GET_SEGMENT_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 7)</div><div class='del'>-#define EFUSE_DATA_SET_SEGMENT_ID(__c2h, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 7, __value)</div><div class='del'>-#define EFUSE_DATA_GET_END_SEGMENT(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 7, 1)</div><div class='del'>-#define EFUSE_DATA_SET_END_SEGMENT(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 7, 1, __value)</div><div class='del'>-#define EFUSE_DATA_GET_SEGMENT_SIZE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define EFUSE_DATA_SET_SEGMENT_SIZE(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define EFUSE_DATA_GET_TOTAL_SIZE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 16)</div><div class='del'>-#define EFUSE_DATA_SET_TOTAL_SIZE(__c2h, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 16, __value)</div><div class='del'>-#define EFUSE_DATA_GET_H2C_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X8, 0, 16)</div><div class='del'>-#define EFUSE_DATA_SET_H2C_SEQ(__c2h, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X8, 0, 16, __value)</div><div class='del'>-#define EFUSE_DATA_GET_DATA_START(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X8, 16, 8)</div><div class='del'>-#define EFUSE_DATA_SET_DATA_START(__c2h, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X8, 16, 8, __value)</div><div class='del'>-#define IQK_DATA_GET_SEGMENT_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 7)</div><div class='del'>-#define IQK_DATA_SET_SEGMENT_ID(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 7, __value)</div><div class='del'>-#define IQK_DATA_GET_END_SEGMENT(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 7, 1)</div><div class='del'>-#define IQK_DATA_SET_END_SEGMENT(__c2h, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 7, 1, __value)</div><div class='del'>-#define IQK_DATA_GET_SEGMENT_SIZE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define IQK_DATA_SET_SEGMENT_SIZE(__c2h, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define IQK_DATA_GET_TOTAL_SIZE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 16)</div><div class='del'>-#define IQK_DATA_SET_TOTAL_SIZE(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 16, __value)</div><div class='del'>-#define IQK_DATA_GET_H2C_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X8, 0, 16)</div><div class='del'>-#define IQK_DATA_SET_H2C_SEQ(__c2h, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X8, 0, 16, __value)</div><div class='del'>-#define IQK_DATA_GET_DATA_START(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X8, 16, 8)</div><div class='del'>-#define IQK_DATA_SET_DATA_START(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X8, 16, 8, __value)</div><div class='del'>-#define CCX_RPT_GET_CCX_RPT(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X4, 0, 129)</div><div class='del'>-#define CCX_RPT_SET_CCX_RPT(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X4, 0, 129, __value)</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.h b/drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.h<br/>deleted file mode 100644<br/>index 58e47584cedc..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,504 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HAL_FWOFFLOADH2CFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define _HAL_FWOFFLOADH2CFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define CMD_ID_FW_OFFLOAD_H2C 0XFF</div><div class='del'>-#define CMD_ID_CHANNEL_SWITCH 0XFF</div><div class='del'>-#define CMD_ID_DUMP_PHYSICAL_EFUSE 0XFF</div><div class='del'>-#define CMD_ID_UPDATE_BEACON_PARSING_INFO 0XFF</div><div class='del'>-#define CMD_ID_CFG_PARAMETER 0XFF</div><div class='del'>-#define CMD_ID_UPDATE_DATAPACK 0XFF</div><div class='del'>-#define CMD_ID_RUN_DATAPACK 0XFF</div><div class='del'>-#define CMD_ID_DOWNLOAD_FLASH 0XFF</div><div class='del'>-#define CMD_ID_UPDATE_PACKET 0XFF</div><div class='del'>-#define CMD_ID_GENERAL_INFO 0XFF</div><div class='del'>-#define CMD_ID_IQK 0XFF</div><div class='del'>-#define CMD_ID_POWER_TRACKING 0XFF</div><div class='del'>-#define CMD_ID_PSD 0XFF</div><div class='del'>-#define CMD_ID_P2PPS 0XFF</div><div class='del'>-#define CMD_ID_BT_COEX 0XFF</div><div class='del'>-#define CMD_ID_NAN_CTRL 0XFF</div><div class='del'>-#define CMD_ID_NAN_CHANNEL_PLAN_0 0XFF</div><div class='del'>-#define CMD_ID_NAN_CHANNEL_PLAN_1 0XFF</div><div class='del'>-#define CATEGORY_H2C_CMD_HEADER 0X00</div><div class='del'>-#define CATEGORY_FW_OFFLOAD_H2C 0X01</div><div class='del'>-#define CATEGORY_CHANNEL_SWITCH 0X01</div><div class='del'>-#define CATEGORY_DUMP_PHYSICAL_EFUSE 0X01</div><div class='del'>-#define CATEGORY_UPDATE_BEACON_PARSING_INFO 0X01</div><div class='del'>-#define CATEGORY_CFG_PARAMETER 0X01</div><div class='del'>-#define CATEGORY_UPDATE_DATAPACK 0X01</div><div class='del'>-#define CATEGORY_RUN_DATAPACK 0X01</div><div class='del'>-#define CATEGORY_DOWNLOAD_FLASH 0X01</div><div class='del'>-#define CATEGORY_UPDATE_PACKET 0X01</div><div class='del'>-#define CATEGORY_GENERAL_INFO 0X01</div><div class='del'>-#define CATEGORY_IQK 0X01</div><div class='del'>-#define CATEGORY_POWER_TRACKING 0X01</div><div class='del'>-#define CATEGORY_PSD 0X01</div><div class='del'>-#define CATEGORY_P2PPS 0X01</div><div class='del'>-#define CATEGORY_BT_COEX 0X01</div><div class='del'>-#define CATEGORY_NAN_CTRL 0X01</div><div class='del'>-#define CATEGORY_NAN_CHANNEL_PLAN_0 0X01</div><div class='del'>-#define CATEGORY_NAN_CHANNEL_PLAN_1 0X01</div><div class='del'>-#define SUB_CMD_ID_CHANNEL_SWITCH 0X02</div><div class='del'>-#define SUB_CMD_ID_DUMP_PHYSICAL_EFUSE 0X03</div><div class='del'>-#define SUB_CMD_ID_UPDATE_BEACON_PARSING_INFO 0X05</div><div class='del'>-#define SUB_CMD_ID_CFG_PARAMETER 0X08</div><div class='del'>-#define SUB_CMD_ID_UPDATE_DATAPACK 0X09</div><div class='del'>-#define SUB_CMD_ID_RUN_DATAPACK 0X0A</div><div class='del'>-#define SUB_CMD_ID_DOWNLOAD_FLASH 0X0B</div><div class='del'>-#define SUB_CMD_ID_UPDATE_PACKET 0X0C</div><div class='del'>-#define SUB_CMD_ID_GENERAL_INFO 0X0D</div><div class='del'>-#define SUB_CMD_ID_IQK 0X0E</div><div class='del'>-#define SUB_CMD_ID_POWER_TRACKING 0X0F</div><div class='del'>-#define SUB_CMD_ID_PSD 0X10</div><div class='del'>-#define SUB_CMD_ID_P2PPS 0X24</div><div class='del'>-#define SUB_CMD_ID_BT_COEX 0X60</div><div class='del'>-#define SUB_CMD_ID_NAN_CTRL 0XB2</div><div class='del'>-#define SUB_CMD_ID_NAN_CHANNEL_PLAN_0 0XB4</div><div class='del'>-#define SUB_CMD_ID_NAN_CHANNEL_PLAN_1 0XB5</div><div class='del'>-#define H2C_CMD_HEADER_GET_CATEGORY(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 7)</div><div class='del'>-#define H2C_CMD_HEADER_SET_CATEGORY(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 7, __value)</div><div class='del'>-#define H2C_CMD_HEADER_GET_ACK(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 7, 1)</div><div class='del'>-#define H2C_CMD_HEADER_SET_ACK(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 7, 1, __value)</div><div class='del'>-#define H2C_CMD_HEADER_GET_TOTAL_LEN(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 16)</div><div class='del'>-#define H2C_CMD_HEADER_SET_TOTAL_LEN(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 16, __value)</div><div class='del'>-#define H2C_CMD_HEADER_GET_SEQ_NUM(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 16)</div><div class='del'>-#define H2C_CMD_HEADER_SET_SEQ_NUM(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 16, __value)</div><div class='del'>-#define FW_OFFLOAD_H2C_GET_CATEGORY(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 7)</div><div class='del'>-#define FW_OFFLOAD_H2C_SET_CATEGORY(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 7, __value)</div><div class='del'>-#define FW_OFFLOAD_H2C_GET_ACK(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 7, 1)</div><div class='del'>-#define FW_OFFLOAD_H2C_SET_ACK(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 7, 1, __value)</div><div class='del'>-#define FW_OFFLOAD_H2C_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define FW_OFFLOAD_H2C_SET_CMD_ID(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define FW_OFFLOAD_H2C_GET_SUB_CMD_ID(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 16)</div><div class='del'>-#define FW_OFFLOAD_H2C_SET_SUB_CMD_ID(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 16, __value)</div><div class='del'>-#define FW_OFFLOAD_H2C_GET_TOTAL_LEN(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 16)</div><div class='del'>-#define FW_OFFLOAD_H2C_SET_TOTAL_LEN(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 16, __value)</div><div class='del'>-#define FW_OFFLOAD_H2C_GET_SEQ_NUM(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 16)</div><div class='del'>-#define FW_OFFLOAD_H2C_SET_SEQ_NUM(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 16, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_SWITCH_START(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 1)</div><div class='del'>-#define CHANNEL_SWITCH_SET_SWITCH_START(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 1, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_DEST_CH_EN(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 1, 1)</div><div class='del'>-#define CHANNEL_SWITCH_SET_DEST_CH_EN(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 1, 1, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_ABSOLUTE_TIME(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 2, 1)</div><div class='del'>-#define CHANNEL_SWITCH_SET_ABSOLUTE_TIME(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 2, 1, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_PERIODIC_OPTION(__h2c)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 3, 2)</div><div class='del'>-#define CHANNEL_SWITCH_SET_PERIODIC_OPTION(__h2c, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 3, 2, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_CHANNEL_INFO_LOC(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 8)</div><div class='del'>-#define CHANNEL_SWITCH_SET_CHANNEL_INFO_LOC(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 8, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_CHANNEL_NUM(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 8)</div><div class='del'>-#define CHANNEL_SWITCH_SET_CHANNEL_NUM(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 8, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_PRI_CH_IDX(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 24, 4)</div><div class='del'>-#define CHANNEL_SWITCH_SET_PRI_CH_IDX(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 24, 4, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_DEST_BW(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 28, 4)</div><div class='del'>-#define CHANNEL_SWITCH_SET_DEST_BW(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 28, 4, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_DEST_CH(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 8)</div><div class='del'>-#define CHANNEL_SWITCH_SET_DEST_CH(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 8, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_NORMAL_PERIOD(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 8, 8)</div><div class='del'>-#define CHANNEL_SWITCH_SET_NORMAL_PERIOD(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 8, 8, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_SLOW_PERIOD(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 16, 8)</div><div class='del'>-#define CHANNEL_SWITCH_SET_SLOW_PERIOD(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 16, 8, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_NORMAL_CYCLE(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 24, 8)</div><div class='del'>-#define CHANNEL_SWITCH_SET_NORMAL_CYCLE(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 24, 8, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_TSF_HIGH(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 32)</div><div class='del'>-#define CHANNEL_SWITCH_SET_TSF_HIGH(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 32, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_TSF_LOW(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X14, 0, 32)</div><div class='del'>-#define CHANNEL_SWITCH_SET_TSF_LOW(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 0, 32, __value)</div><div class='del'>-#define CHANNEL_SWITCH_GET_CHANNEL_INFO_SIZE(__h2c)                            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 0, 16)</div><div class='del'>-#define CHANNEL_SWITCH_SET_CHANNEL_INFO_SIZE(__h2c, __value)                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 0, 16, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_FUNC_EN(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 1)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_FUNC_EN(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 1, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_SIZE_TH(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 4)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_SIZE_TH(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 4, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_TIMEOUT(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 12, 4)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_TIMEOUT(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 12, 4, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_IE_ID_BMP_0(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 32)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_0(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 32, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_IE_ID_BMP_1(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 32)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_1(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 32, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_IE_ID_BMP_2(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 0, 32)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_2(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 0, 32, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_IE_ID_BMP_3(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 0, 32)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_3(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 0, 32, __value)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_GET_IE_ID_BMP_4(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X1C, 0, 32)</div><div class='del'>-#define UPDATE_BEACON_PARSING_INFO_SET_IE_ID_BMP_4(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X1C, 0, 32, __value)</div><div class='del'>-#define CFG_PARAMETER_GET_NUM(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 16)</div><div class='del'>-#define CFG_PARAMETER_SET_NUM(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 16, __value)</div><div class='del'>-#define CFG_PARAMETER_GET_INIT_CASE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 1)</div><div class='del'>-#define CFG_PARAMETER_SET_INIT_CASE(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 1, __value)</div><div class='del'>-#define CFG_PARAMETER_GET_PHY_PARAMETER_LOC(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 24, 8)</div><div class='del'>-#define CFG_PARAMETER_SET_PHY_PARAMETER_LOC(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 24, 8, __value)</div><div class='del'>-#define UPDATE_DATAPACK_GET_SIZE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 16)</div><div class='del'>-#define UPDATE_DATAPACK_SET_SIZE(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 16, __value)</div><div class='del'>-#define UPDATE_DATAPACK_GET_DATAPACK_ID(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 8)</div><div class='del'>-#define UPDATE_DATAPACK_SET_DATAPACK_ID(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 8, __value)</div><div class='del'>-#define UPDATE_DATAPACK_GET_DATAPACK_LOC(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 24, 8)</div><div class='del'>-#define UPDATE_DATAPACK_SET_DATAPACK_LOC(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 24, 8, __value)</div><div class='del'>-#define UPDATE_DATAPACK_GET_DATAPACK_SEGMENT(__h2c)                            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 8)</div><div class='del'>-#define UPDATE_DATAPACK_SET_DATAPACK_SEGMENT(__h2c, __value)                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 8, __value)</div><div class='del'>-#define UPDATE_DATAPACK_GET_END_SEGMENT(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 8, 1)</div><div class='del'>-#define UPDATE_DATAPACK_SET_END_SEGMENT(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 8, 1, __value)</div><div class='del'>-#define RUN_DATAPACK_GET_DATAPACK_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 8)</div><div class='del'>-#define RUN_DATAPACK_SET_DATAPACK_ID(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 8, __value)</div><div class='del'>-#define DOWNLOAD_FLASH_GET_SPI_CMD(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 8)</div><div class='del'>-#define DOWNLOAD_FLASH_SET_SPI_CMD(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 8, __value)</div><div class='del'>-#define DOWNLOAD_FLASH_GET_LOCATION(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 16)</div><div class='del'>-#define DOWNLOAD_FLASH_SET_LOCATION(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 16, __value)</div><div class='del'>-#define DOWNLOAD_FLASH_GET_SIZE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 32)</div><div class='del'>-#define DOWNLOAD_FLASH_SET_SIZE(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 32, __value)</div><div class='del'>-#define DOWNLOAD_FLASH_GET_START_ADDR(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 32)</div><div class='del'>-#define DOWNLOAD_FLASH_SET_START_ADDR(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 32, __value)</div><div class='del'>-#define UPDATE_PACKET_GET_SIZE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 16)</div><div class='del'>-#define UPDATE_PACKET_SET_SIZE(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 16, __value)</div><div class='del'>-#define UPDATE_PACKET_GET_PACKET_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 8)</div><div class='del'>-#define UPDATE_PACKET_SET_PACKET_ID(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 8, __value)</div><div class='del'>-#define UPDATE_PACKET_GET_PACKET_LOC(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 24, 8)</div><div class='del'>-#define UPDATE_PACKET_SET_PACKET_LOC(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 24, 8, __value)</div><div class='del'>-#define GENERAL_INFO_GET_REF_TYPE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 8)</div><div class='del'>-#define GENERAL_INFO_SET_REF_TYPE(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 8, __value)</div><div class='del'>-#define GENERAL_INFO_GET_RF_TYPE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 9)</div><div class='del'>-#define GENERAL_INFO_SET_RF_TYPE(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 9, __value)</div><div class='del'>-#define GENERAL_INFO_GET_FW_TX_BOUNDARY(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 8)</div><div class='del'>-#define GENERAL_INFO_SET_FW_TX_BOUNDARY(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 8, __value)</div><div class='del'>-#define IQK_GET_CLEAR(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 1)</div><div class='del'>-#define IQK_SET_CLEAR(__h2c, __value)                                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 1, __value)</div><div class='del'>-#define IQK_GET_SEGMENT_IQK(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 1, 1)</div><div class='del'>-#define IQK_SET_SEGMENT_IQK(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 1, 1, __value)</div><div class='del'>-#define POWER_TRACKING_GET_ENABLE_A(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 1)</div><div class='del'>-#define POWER_TRACKING_SET_ENABLE_A(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 1, __value)</div><div class='del'>-#define POWER_TRACKING_GET_ENABLE_B(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 1, 1)</div><div class='del'>-#define POWER_TRACKING_SET_ENABLE_B(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 1, 1, __value)</div><div class='del'>-#define POWER_TRACKING_GET_ENABLE_C(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 2, 1)</div><div class='del'>-#define POWER_TRACKING_SET_ENABLE_C(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 2, 1, __value)</div><div class='del'>-#define POWER_TRACKING_GET_ENABLE_D(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 3, 1)</div><div class='del'>-#define POWER_TRACKING_SET_ENABLE_D(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 3, 1, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TYPE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 4, 3)</div><div class='del'>-#define POWER_TRACKING_SET_TYPE(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 4, 3, __value)</div><div class='del'>-#define POWER_TRACKING_GET_BBSWING_INDEX(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 8)</div><div class='del'>-#define POWER_TRACKING_SET_BBSWING_INDEX(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TX_PWR_INDEX_A(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TX_PWR_INDEX_A(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_PWR_TRACKING_OFFSET_VALUE_A(__h2c)                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 8, 8)</div><div class='del'>-#define POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_A(__h2c, __value)         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 8, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TSSI_VALUE_A(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 16, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TSSI_VALUE_A(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 16, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TX_PWR_INDEX_B(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TX_PWR_INDEX_B(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_PWR_TRACKING_OFFSET_VALUE_B(__h2c)                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 8, 8)</div><div class='del'>-#define POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_B(__h2c, __value)         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 8, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TSSI_VALUE_B(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 16, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TSSI_VALUE_B(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 16, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TX_PWR_INDEX_C(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 0, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TX_PWR_INDEX_C(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 0, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_PWR_TRACKING_OFFSET_VALUE_C(__h2c)                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 8, 8)</div><div class='del'>-#define POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_C(__h2c, __value)         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 8, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TSSI_VALUE_C(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 16, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TSSI_VALUE_C(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 16, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TX_PWR_INDEX_D(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 0, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TX_PWR_INDEX_D(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 0, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_PWR_TRACKING_OFFSET_VALUE_D(__h2c)                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 8, 8)</div><div class='del'>-#define POWER_TRACKING_SET_PWR_TRACKING_OFFSET_VALUE_D(__h2c, __value)         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 8, 8, __value)</div><div class='del'>-#define POWER_TRACKING_GET_TSSI_VALUE_D(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 16, 8)</div><div class='del'>-#define POWER_TRACKING_SET_TSSI_VALUE_D(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 16, 8, __value)</div><div class='del'>-#define PSD_GET_START_PSD(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 16)</div><div class='del'>-#define PSD_SET_START_PSD(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 16, __value)</div><div class='del'>-#define PSD_GET_END_PSD(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 16)</div><div class='del'>-#define PSD_SET_END_PSD(__h2c, __value)                                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 16, __value)</div><div class='del'>-#define P2PPS_GET_OFFLOAD_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 1)</div><div class='del'>-#define P2PPS_SET_OFFLOAD_EN(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 1, __value)</div><div class='del'>-#define P2PPS_GET_ROLE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 1, 1)</div><div class='del'>-#define P2PPS_SET_ROLE(__h2c, __value)                                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 1, 1, __value)</div><div class='del'>-#define P2PPS_GET_CTWINDOW_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 2, 1)</div><div class='del'>-#define P2PPS_SET_CTWINDOW_EN(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 2, 1, __value)</div><div class='del'>-#define P2PPS_GET_NOA_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 3, 1)</div><div class='del'>-#define P2PPS_SET_NOA_EN(__h2c, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 3, 1, __value)</div><div class='del'>-#define P2PPS_GET_NOA_SEL(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 4, 1)</div><div class='del'>-#define P2PPS_SET_NOA_SEL(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 4, 1, __value)</div><div class='del'>-#define P2PPS_GET_ALLSTASLEEP(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 5, 1)</div><div class='del'>-#define P2PPS_SET_ALLSTASLEEP(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 5, 1, __value)</div><div class='del'>-#define P2PPS_GET_DISCOVERY(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 6, 1)</div><div class='del'>-#define P2PPS_SET_DISCOVERY(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 6, 1, __value)</div><div class='del'>-#define P2PPS_GET_P2P_PORT_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 8)</div><div class='del'>-#define P2PPS_SET_P2P_PORT_ID(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 8, __value)</div><div class='del'>-#define P2PPS_GET_P2P_GROUP(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 8)</div><div class='del'>-#define P2PPS_SET_P2P_GROUP(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 8, __value)</div><div class='del'>-#define P2PPS_GET_P2P_MACID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 24, 8)</div><div class='del'>-#define P2PPS_SET_P2P_MACID(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 24, 8, __value)</div><div class='del'>-#define P2PPS_GET_CTWINDOW_LENGTH(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 8)</div><div class='del'>-#define P2PPS_SET_CTWINDOW_LENGTH(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 8, __value)</div><div class='del'>-#define P2PPS_GET_NOA_DURATION_PARA(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 32)</div><div class='del'>-#define P2PPS_SET_NOA_DURATION_PARA(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 32, __value)</div><div class='del'>-#define P2PPS_GET_NOA_INTERVAL_PARA(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X14, 0, 32)</div><div class='del'>-#define P2PPS_SET_NOA_INTERVAL_PARA(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 0, 32, __value)</div><div class='del'>-#define P2PPS_GET_NOA_START_TIME_PARA(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 0, 32)</div><div class='del'>-#define P2PPS_SET_NOA_START_TIME_PARA(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 0, 32, __value)</div><div class='del'>-#define P2PPS_GET_NOA_COUNT_PARA(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X1C, 0, 32)</div><div class='del'>-#define P2PPS_SET_NOA_COUNT_PARA(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X1C, 0, 32, __value)</div><div class='del'>-#define BT_COEX_GET_DATA_START(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 8)</div><div class='del'>-#define BT_COEX_SET_DATA_START(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 8, __value)</div><div class='del'>-#define NAN_CTRL_GET_NAN_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 2)</div><div class='del'>-#define NAN_CTRL_SET_NAN_EN(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 2, __value)</div><div class='del'>-#define NAN_CTRL_GET_SUPPORT_BAND(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 2)</div><div class='del'>-#define NAN_CTRL_SET_SUPPORT_BAND(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 2, __value)</div><div class='del'>-#define NAN_CTRL_GET_DISABLE_2G_DISC_BCN(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 10, 1)</div><div class='del'>-#define NAN_CTRL_SET_DISABLE_2G_DISC_BCN(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 10, 1, __value)</div><div class='del'>-#define NAN_CTRL_GET_DISABLE_5G_DISC_BCN(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 11, 1)</div><div class='del'>-#define NAN_CTRL_SET_DISABLE_5G_DISC_BCN(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 11, 1, __value)</div><div class='del'>-#define NAN_CTRL_GET_BCN_RSVD_PAGE_OFFSET(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 16, 8)</div><div class='del'>-#define NAN_CTRL_SET_BCN_RSVD_PAGE_OFFSET(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 16, 8, __value)</div><div class='del'>-#define NAN_CTRL_GET_CHANNEL_2G(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X08, 24, 8)</div><div class='del'>-#define NAN_CTRL_SET_CHANNEL_2G(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 24, 8, __value)</div><div class='del'>-#define NAN_CTRL_GET_CHANNEL_5G(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 8)</div><div class='del'>-#define NAN_CTRL_SET_CHANNEL_5G(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_CHANNEL_NUMBER_0(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_CHANNEL_NUMBER_0(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_UNPAUSE_MACID_0(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_UNPAUSE_MACID_0(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_START_TIME_SLOT_0(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_START_TIME_SLOT_0(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_DURATION_0(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 16, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_DURATION_0(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 16, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_CHANNEL_NUMBER_1(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_CHANNEL_NUMBER_1(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_UNPAUSE_MACID_1(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 8, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_UNPAUSE_MACID_1(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 8, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_START_TIME_SLOT_1(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 0, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_START_TIME_SLOT_1(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 0, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_DURATION_1(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 16, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_DURATION_1(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 16, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_CHANNEL_NUMBER_2(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 0, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_CHANNEL_NUMBER_2(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_UNPAUSE_MACID_2(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 8, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_UNPAUSE_MACID_2(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 8, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_START_TIME_SLOT_2(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X1C, 0, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_START_TIME_SLOT_2(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X1C, 0, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_GET_DURATION_2(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X1C, 16, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_0_SET_DURATION_2(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X1C, 16, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_CHANNEL_NUMBER_3(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 0, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_CHANNEL_NUMBER_3(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_UNPAUSE_MACID_3(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X08, 8, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_UNPAUSE_MACID_3(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X08, 8, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_START_TIME_SLOT_3(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 0, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_START_TIME_SLOT_3(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 0, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_DURATION_3(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X0C, 16, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_DURATION_3(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X0C, 16, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_CHANNEL_NUMBER_4(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 0, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_CHANNEL_NUMBER_4(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_UNPAUSE_MACID_4(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X10, 8, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_UNPAUSE_MACID_4(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X10, 8, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_START_TIME_SLOT_4(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 0, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_START_TIME_SLOT_4(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 0, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_DURATION_4(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X14, 16, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_DURATION_4(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X14, 16, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_CHANNEL_NUMBER_5(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 0, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_CHANNEL_NUMBER_5(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 0, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_UNPAUSE_MACID_5(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X18, 8, 8)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_UNPAUSE_MACID_5(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X18, 8, 8, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_START_TIME_SLOT_5(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X1C, 0, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_START_TIME_SLOT_5(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X1C, 0, 16, __value)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_GET_DURATION_5(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X1C, 16, 16)</div><div class='del'>-#define NAN_CHANNEL_PLAN_1_SET_DURATION_5(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X1C, 16, 16, __value)</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h b/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h<br/>deleted file mode 100644<br/>index 04cee38c33f9..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HAL_H2CEXTRAINFO_H2C_C2H_NIC_H_</div><div class='del'>-#define _HAL_H2CEXTRAINFO_H2C_C2H_NIC_H_</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_LENGTH(__extra_info)                            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 0, 8)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_LENGTH(__extra_info, __value)                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 0, 8, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_IO_CMD(__extra_info)                            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 8, 7)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_IO_CMD(__extra_info, __value)                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 8, 7, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_MSK_EN(__extra_info)                            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 15, 1)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_MSK_EN(__extra_info, __value)                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 15, 1, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_LLT_PG_BNDY(__extra_info)                       \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_LLT_PG_BNDY(__extra_info, __value)              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_EFUSE_RSVDPAGE_LOC(__extra_info)                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_EFUSE_RSVDPAGE_LOC(__extra_info, __value)       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_EFUSE_PATCH_EN(__extra_info)                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_EFUSE_PATCH_EN(__extra_info, __value)           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_RF_ADDR(__extra_info)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_RF_ADDR(__extra_info, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_IO_ADDR(__extra_info)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 16)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_IO_ADDR(__extra_info, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 16, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_DELAY_VALUE(__extra_info)                       \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 16)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_DELAY_VALUE(__extra_info, __value)              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 16, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_RF_PATH(__extra_info)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 24, 8)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_RF_PATH(__extra_info, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 24, 8, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_DATA(__extra_info)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X04, 0, 32)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_DATA(__extra_info, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X04, 0, 32, __value)</div><div class='del'>-#define PHY_PARAMETER_INFO_GET_MASK(__extra_info)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X08, 0, 32)</div><div class='del'>-#define PHY_PARAMETER_INFO_SET_MASK(__extra_info, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X08, 0, 32, __value)</div><div class='del'>-#define CHANNEL_INFO_GET_CHANNEL(__extra_info)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 0, 8)</div><div class='del'>-#define CHANNEL_INFO_SET_CHANNEL(__extra_info, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 0, 8, __value)</div><div class='del'>-#define CHANNEL_INFO_GET_PRI_CH_IDX(__extra_info)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 8, 4)</div><div class='del'>-#define CHANNEL_INFO_SET_PRI_CH_IDX(__extra_info, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 8, 4, __value)</div><div class='del'>-#define CHANNEL_INFO_GET_BANDWIDTH(__extra_info)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 12, 4)</div><div class='del'>-#define CHANNEL_INFO_SET_BANDWIDTH(__extra_info, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 12, 4, __value)</div><div class='del'>-#define CHANNEL_INFO_GET_TIMEOUT(__extra_info)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8)</div><div class='del'>-#define CHANNEL_INFO_SET_TIMEOUT(__extra_info, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value)</div><div class='del'>-#define CHANNEL_INFO_GET_ACTION_ID(__extra_info)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 24, 7)</div><div class='del'>-#define CHANNEL_INFO_SET_ACTION_ID(__extra_info, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 24, 7, __value)</div><div class='del'>-#define CHANNEL_INFO_GET_CH_EXTRA_INFO(__extra_info)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 31, 1)</div><div class='del'>-#define CHANNEL_INFO_SET_CH_EXTRA_INFO(__extra_info, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 31, 1, __value)</div><div class='del'>-#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO_ID(__extra_info)                       \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 0, 7)</div><div class='del'>-#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO_ID(__extra_info, __value)              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 0, 7, __value)</div><div class='del'>-#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO(__extra_info)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 7, 1)</div><div class='del'>-#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO(__extra_info, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 7, 1, __value)</div><div class='del'>-#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO_SIZE(__extra_info)                     \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 8, 8)</div><div class='del'>-#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO_SIZE(__extra_info, __value)            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 8, 8, __value)</div><div class='del'>-#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO_DATA(__extra_info)                     \</div><div class='del'>-	LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 1)</div><div class='del'>-#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO_DATA(__extra_info, __value)            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 1, __value)</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.h b/drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.h<br/>deleted file mode 100644<br/>index bc9fb8e8bf5a..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef HALMAC_INTF_PHY_CMD</div><div class='del'>-#define HALMAC_INTF_PHY_CMD</div><div class='del'>-</div><div class='del'>-/* Cut mask */</div><div class='del'>-enum halmac_intf_phy_cut {</div><div class='del'>-	HALMAC_INTF_PHY_CUT_TESTCHIP = BIT(0),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_A = BIT(1),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_B = BIT(2),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_C = BIT(3),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_D = BIT(4),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_E = BIT(5),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_F = BIT(6),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_G = BIT(7),</div><div class='del'>-	HALMAC_INTF_PHY_CUT_ALL = 0x7FFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* IP selection */</div><div class='del'>-enum halmac_ip_sel {</div><div class='del'>-	HALMAC_IP_SEL_INTF_PHY = 0,</div><div class='del'>-	HALMAC_IP_SEL_MAC = 1,</div><div class='del'>-	HALMAC_IP_SEL_PCIE_DBI = 2,</div><div class='del'>-	HALMAC_IP_SEL_UNDEFINE = 0x7FFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Platform mask */</div><div class='del'>-enum halmac_intf_phy_platform {</div><div class='del'>-	HALMAC_INTF_PHY_PLATFORM_ALL = 0x7FFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h b/drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h<br/>deleted file mode 100644<br/>index f58077539e33..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,392 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HAL_ORIGINALC2HFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define _HAL_ORIGINALC2HFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define CMD_ID_C2H 0X00</div><div class='del'>-#define CMD_ID_DBG 0X00</div><div class='del'>-#define CMD_ID_C2H_LB 0X01</div><div class='del'>-#define CMD_ID_C2H_SND_TXBF 0X02</div><div class='del'>-#define CMD_ID_C2H_CCX_RPT 0X03</div><div class='del'>-#define CMD_ID_C2H_AP_REQ_TXRPT 0X04</div><div class='del'>-#define CMD_ID_C2H_INITIAL_RATE_COLLECTION 0X05</div><div class='del'>-#define CMD_ID_C2H_RA_RPT 0X0C</div><div class='del'>-#define CMD_ID_C2H_SPECIAL_STATISTICS 0X0D</div><div class='del'>-#define CMD_ID_C2H_RA_PARA_RPT 0X0E</div><div class='del'>-#define CMD_ID_C2H_CUR_CHANNEL 0X10</div><div class='del'>-#define CMD_ID_C2H_GPIO_WAKEUP 0X14</div><div class='del'>-#define C2H_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_SET_CMD_ID(__c2h, __value)                                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_SET_SEQ(__c2h, __value)                                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define DBG_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define DBG_SET_CMD_ID(__c2h, __value)                                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define DBG_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define DBG_SET_SEQ(__c2h, __value)                                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR1(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 8)</div><div class='del'>-#define DBG_SET_DBG_STR1(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR2(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define DBG_SET_DBG_STR2(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR3(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define DBG_SET_DBG_STR3(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR4(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define DBG_SET_DBG_STR4(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR5(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 8)</div><div class='del'>-#define DBG_SET_DBG_STR5(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR6(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 24, 8)</div><div class='del'>-#define DBG_SET_DBG_STR6(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 24, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR7(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 0, 8)</div><div class='del'>-#define DBG_SET_DBG_STR7(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 0, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR8(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 8, 8)</div><div class='del'>-#define DBG_SET_DBG_STR8(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 8, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR9(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 16, 8)</div><div class='del'>-#define DBG_SET_DBG_STR9(__c2h, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 16, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR10(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 24, 8)</div><div class='del'>-#define DBG_SET_DBG_STR10(__c2h, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 24, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR11(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 0, 8)</div><div class='del'>-#define DBG_SET_DBG_STR11(__c2h, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 0, 8, __value)</div><div class='del'>-#define DBG_GET_DBG_STR12(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 8, 8)</div><div class='del'>-#define DBG_SET_DBG_STR12(__c2h, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 8, 8, __value)</div><div class='del'>-#define DBG_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define DBG_SET_LEN(__c2h, __value)                                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define DBG_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define DBG_SET_TRIGGER(__c2h, __value)                                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_LB_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_LB_SET_CMD_ID(__c2h, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_LB_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_LB_SET_SEQ(__c2h, __value)                                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_LB_GET_PAYLOAD1(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 16)</div><div class='del'>-#define C2H_LB_SET_PAYLOAD1(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 16, __value)</div><div class='del'>-#define C2H_LB_GET_PAYLOAD2(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 32)</div><div class='del'>-#define C2H_LB_SET_PAYLOAD2(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 32, __value)</div><div class='del'>-#define C2H_LB_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_LB_SET_LEN(__c2h, __value)                                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_LB_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_LB_SET_TRIGGER(__c2h, __value)                                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_SND_TXBF_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_SND_TXBF_SET_CMD_ID(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_SND_TXBF_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_SND_TXBF_SET_SEQ(__c2h, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_SND_TXBF_GET_SND_RESULT(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 1)</div><div class='del'>-#define C2H_SND_TXBF_SET_SND_RESULT(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 1, __value)</div><div class='del'>-#define C2H_SND_TXBF_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_SND_TXBF_SET_LEN(__c2h, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_SND_TXBF_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_SND_TXBF_SET_TRIGGER(__c2h, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_CMD_ID(__c2h, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_SEQ(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_QSEL(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 5)</div><div class='del'>-#define C2H_CCX_RPT_SET_QSEL(__c2h, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 5, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_BMC(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 21, 1)</div><div class='del'>-#define C2H_CCX_RPT_SET_BMC(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 21, 1, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_LIFE_TIME_OVER(__c2h)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 22, 1)</div><div class='del'>-#define C2H_CCX_RPT_SET_LIFE_TIME_OVER(__c2h, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 22, 1, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_RETRY_OVER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 23, 1)</div><div class='del'>-#define C2H_CCX_RPT_SET_RETRY_OVER(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 23, 1, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_MACID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_MACID(__c2h, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_DATA_RETRY_CNT(__c2h)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 6)</div><div class='del'>-#define C2H_CCX_RPT_SET_DATA_RETRY_CNT(__c2h, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 6, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_QUEUE7_0(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_QUEUE7_0(__c2h, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_QUEUE15_8(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_QUEUE15_8(__c2h, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_FINAL_DATA_RATE(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 24, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_FINAL_DATA_RATE(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 24, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_SW_DEFINE_0(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 0, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_SW_DEFINE_0(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 0, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_SW_DEFINE_1(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X08, 8, 4)</div><div class='del'>-#define C2H_CCX_RPT_SET_SW_DEFINE_1(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 8, 4, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_LEN(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_CCX_RPT_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_CCX_RPT_SET_TRIGGER(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_CMD_ID(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_SEQ(__c2h, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_STA1_MACID(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_STA1_MACID(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_OK1_0(__c2h)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_OK1_0(__c2h, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_OK1_1(__c2h)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_OK1_1(__c2h, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_FAIL1_0(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_FAIL1_0(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_FAIL1_1(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_FAIL1_1(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_INITIAL_RATE1(__c2h)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 24, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_INITIAL_RATE1(__c2h, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 24, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_STA2_MACID(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 0, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_STA2_MACID(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 0, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_OK2_0(__c2h)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 8, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_OK2_0(__c2h, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 8, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_OK2_1(__c2h)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 16, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_OK2_1(__c2h, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 16, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_FAIL2_0(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 24, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_FAIL2_0(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 24, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TX_FAIL2_1(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 0, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TX_FAIL2_1(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 0, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_INITIAL_RATE2(__c2h)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 8, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_INITIAL_RATE2(__c2h, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 8, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_LEN(__c2h, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_GET_TRIGGER(__c2h)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_AP_REQ_TXRPT_SET_TRIGGER(__c2h, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_CMD_ID(__c2h)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_CMD_ID(__c2h, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_SEQ(__c2h)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_SEQ(__c2h, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_TRYING_BITMAP(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 7)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_TRYING_BITMAP(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 7, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE1(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE1(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE2(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE2(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE3(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE3(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE4(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE4(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE5(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 24, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE5(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 24, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE6(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 0, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE6(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 0, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_INITIAL_RATE7(__c2h)                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 8, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_INITIAL_RATE7(__c2h, __value)          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 8, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_LEN(__c2h)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_LEN(__c2h, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_GET_TRIGGER(__c2h)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_INITIAL_RATE_COLLECTION_SET_TRIGGER(__c2h, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_CMD_ID(__c2h, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_SEQ(__c2h, __value)                                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_RATE(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_RATE(__c2h, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_MACID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_MACID(__c2h, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_USE_LDPC(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 1)</div><div class='del'>-#define C2H_RA_RPT_SET_USE_LDPC(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 1, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_USE_TXBF(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X04, 1, 1)</div><div class='del'>-#define C2H_RA_RPT_SET_USE_TXBF(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 1, 1, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_COLLISION_STATE(__c2h)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_COLLISION_STATE(__c2h, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_LEN(__c2h, __value)                                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_RA_RPT_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_RA_RPT_SET_TRIGGER(__c2h, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_CMD_ID(__c2h)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_CMD_ID(__c2h, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_SEQ(__c2h)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_SEQ(__c2h, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_STATISTICS_IDX(__c2h)                       \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_STATISTICS_IDX(__c2h, __value)              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA0(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 24, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA0(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 24, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA1(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 0, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA1(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 0, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA2(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 8, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA2(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 8, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA3(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 16, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA3(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 16, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA4(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X04, 24, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA4(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X04, 24, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA5(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 0, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA5(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 0, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA6(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 8, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA6(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 8, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_DATA7(__c2h)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X08, 16, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_DATA7(__c2h, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X08, 16, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_LEN(__c2h)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_LEN(__c2h, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_GET_TRIGGER(__c2h)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_SPECIAL_STATISTICS_SET_TRIGGER(__c2h, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_RA_PARA_RPT_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_RA_PARA_RPT_SET_CMD_ID(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_RA_PARA_RPT_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_RA_PARA_RPT_SET_SEQ(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_RA_PARA_RPT_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_RA_PARA_RPT_SET_LEN(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_RA_PARA_RPT_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_RA_PARA_RPT_SET_TRIGGER(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_CUR_CHANNEL_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_CUR_CHANNEL_SET_CMD_ID(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_CUR_CHANNEL_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_CUR_CHANNEL_SET_SEQ(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_CUR_CHANNEL_GET_CHANNEL_NUM(__c2h)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__c2h + 0X00, 16, 8)</div><div class='del'>-#define C2H_CUR_CHANNEL_SET_CHANNEL_NUM(__c2h, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 16, 8, __value)</div><div class='del'>-#define C2H_CUR_CHANNEL_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_CUR_CHANNEL_SET_LEN(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_CUR_CHANNEL_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_CUR_CHANNEL_SET_TRIGGER(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#define C2H_GPIO_WAKEUP_GET_CMD_ID(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 0, 8)</div><div class='del'>-#define C2H_GPIO_WAKEUP_SET_CMD_ID(__c2h, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 0, 8, __value)</div><div class='del'>-#define C2H_GPIO_WAKEUP_GET_SEQ(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X00, 8, 8)</div><div class='del'>-#define C2H_GPIO_WAKEUP_SET_SEQ(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X00, 8, 8, __value)</div><div class='del'>-#define C2H_GPIO_WAKEUP_GET_LEN(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 16, 8)</div><div class='del'>-#define C2H_GPIO_WAKEUP_SET_LEN(__c2h, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 16, 8, __value)</div><div class='del'>-#define C2H_GPIO_WAKEUP_GET_TRIGGER(__c2h) LE_BITS_TO_4BYTE(__c2h + 0X0C, 24, 8)</div><div class='del'>-#define C2H_GPIO_WAKEUP_SET_TRIGGER(__c2h, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__c2h + 0X0C, 24, 8, __value)</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h b/drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h<br/>deleted file mode 100644<br/>index ce39f0868419..000000000000<br/>--- a/<a href='/openslx/kernel-qcow2-linux.git/tree/drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h?id=3751cbda8f223549d7ea28803cbec8ac87e43ed2'>drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1000 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2016  Realtek Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * wlanfae &lt;wlanfae@realtek.com&gt;</div><div class='del'>- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,</div><div class='del'>- * Hsinchu 300, Taiwan.</div><div class='del'>- *</div><div class='del'>- * Larry Finger &lt;Larry.Finger@lwfinger.net&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef _HAL_ORIGINALH2CFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define _HAL_ORIGINALH2CFORMAT_H2C_C2H_NIC_H_</div><div class='del'>-#define CMD_ID_ORIGINAL_H2C 0X00</div><div class='del'>-#define CMD_ID_H2C2H_LB 0X0</div><div class='del'>-#define CMD_ID_D0_SCAN_OFFLOAD_CTRL 0X06</div><div class='del'>-#define CMD_ID_RSVD_PAGE 0X0</div><div class='del'>-#define CMD_ID_MEDIA_STATUS_RPT 0X01</div><div class='del'>-#define CMD_ID_KEEP_ALIVE 0X03</div><div class='del'>-#define CMD_ID_DISCONNECT_DECISION 0X04</div><div class='del'>-#define CMD_ID_AP_OFFLOAD 0X08</div><div class='del'>-#define CMD_ID_BCN_RSVDPAGE 0X09</div><div class='del'>-#define CMD_ID_PROBE_RSP_RSVDPAGE 0X0A</div><div class='del'>-#define CMD_ID_SET_PWR_MODE 0X00</div><div class='del'>-#define CMD_ID_PS_TUNING_PARA 0X01</div><div class='del'>-#define CMD_ID_PS_TUNING_PARA_II 0X02</div><div class='del'>-#define CMD_ID_PS_LPS_PARA 0X03</div><div class='del'>-#define CMD_ID_P2P_PS_OFFLOAD 0X04</div><div class='del'>-#define CMD_ID_PS_SCAN_EN 0X05</div><div class='del'>-#define CMD_ID_SAP_PS 0X06</div><div class='del'>-#define CMD_ID_INACTIVE_PS 0X07</div><div class='del'>-#define CMD_ID_MACID_CFG 0X00</div><div class='del'>-#define CMD_ID_TXBF 0X01</div><div class='del'>-#define CMD_ID_RSSI_SETTING 0X02</div><div class='del'>-#define CMD_ID_AP_REQ_TXRPT 0X03</div><div class='del'>-#define CMD_ID_INIT_RATE_COLLECTION 0X04</div><div class='del'>-#define CMD_ID_IQK_OFFLOAD 0X05</div><div class='del'>-#define CMD_ID_MACID_CFG_3SS 0X06</div><div class='del'>-#define CMD_ID_RA_PARA_ADJUST 0X07</div><div class='del'>-#define CMD_ID_WWLAN 0X00</div><div class='del'>-#define CMD_ID_REMOTE_WAKE_CTRL 0X01</div><div class='del'>-#define CMD_ID_AOAC_GLOBAL_INFO 0X02</div><div class='del'>-#define CMD_ID_AOAC_RSVD_PAGE 0X03</div><div class='del'>-#define CMD_ID_AOAC_RSVD_PAGE2 0X04</div><div class='del'>-#define CMD_ID_D0_SCAN_OFFLOAD_INFO 0X05</div><div class='del'>-#define CMD_ID_CHANNEL_SWITCH_OFFLOAD 0X07</div><div class='del'>-#define CMD_ID_AOAC_RSVD_PAGE3 0X08</div><div class='del'>-#define CLASS_ORIGINAL_H2C 0X00</div><div class='del'>-#define CLASS_H2C2H_LB 0X07</div><div class='del'>-#define CLASS_D0_SCAN_OFFLOAD_CTRL 0X04</div><div class='del'>-#define CLASS_RSVD_PAGE 0X0</div><div class='del'>-#define CLASS_MEDIA_STATUS_RPT 0X0</div><div class='del'>-#define CLASS_KEEP_ALIVE 0X0</div><div class='del'>-#define CLASS_DISCONNECT_DECISION 0X0</div><div class='del'>-#define CLASS_AP_OFFLOAD 0X0</div><div class='del'>-#define CLASS_BCN_RSVDPAGE 0X0</div><div class='del'>-#define CLASS_PROBE_RSP_RSVDPAGE 0X0</div><div class='del'>-#define CLASS_SET_PWR_MODE 0X01</div><div class='del'>-#define CLASS_PS_TUNING_PARA 0X01</div><div class='del'>-#define CLASS_PS_TUNING_PARA_II 0X01</div><div class='del'>-#define CLASS_PS_LPS_PARA 0X01</div><div class='del'>-#define CLASS_P2P_PS_OFFLOAD 0X01</div><div class='del'>-#define CLASS_PS_SCAN_EN 0X1</div><div class='del'>-#define CLASS_SAP_PS 0X1</div><div class='del'>-#define CLASS_INACTIVE_PS 0X1</div><div class='del'>-#define CLASS_MACID_CFG 0X2</div><div class='del'>-#define CLASS_TXBF 0X2</div><div class='del'>-#define CLASS_RSSI_SETTING 0X2</div><div class='del'>-#define CLASS_AP_REQ_TXRPT 0X2</div><div class='del'>-#define CLASS_INIT_RATE_COLLECTION 0X2</div><div class='del'>-#define CLASS_IQK_OFFLOAD 0X2</div><div class='del'>-#define CLASS_MACID_CFG_3SS 0X2</div><div class='del'>-#define CLASS_RA_PARA_ADJUST 0X02</div><div class='del'>-#define CLASS_WWLAN 0X4</div><div class='del'>-#define CLASS_REMOTE_WAKE_CTRL 0X4</div><div class='del'>-#define CLASS_AOAC_GLOBAL_INFO 0X04</div><div class='del'>-#define CLASS_AOAC_RSVD_PAGE 0X04</div><div class='del'>-#define CLASS_AOAC_RSVD_PAGE2 0X04</div><div class='del'>-#define CLASS_D0_SCAN_OFFLOAD_INFO 0X04</div><div class='del'>-#define CLASS_CHANNEL_SWITCH_OFFLOAD 0X04</div><div class='del'>-#define CLASS_AOAC_RSVD_PAGE3 0X04</div><div class='del'>-#define ORIGINAL_H2C_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define ORIGINAL_H2C_SET_CMD_ID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define ORIGINAL_H2C_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define ORIGINAL_H2C_SET_CLASS(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define H2C2H_LB_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define H2C2H_LB_SET_CMD_ID(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define H2C2H_LB_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define H2C2H_LB_SET_CLASS(__h2c, __value)                                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define H2C2H_LB_GET_SEQ(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define H2C2H_LB_SET_SEQ(__h2c, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define H2C2H_LB_GET_PAYLOAD1(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 16)</div><div class='del'>-#define H2C2H_LB_SET_PAYLOAD1(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 16, __value)</div><div class='del'>-#define H2C2H_LB_GET_PAYLOAD2(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 32)</div><div class='del'>-#define H2C2H_LB_SET_PAYLOAD2(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 32, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_CMD_ID(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_CMD_ID(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_CLASS(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_CLASS(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_D0_SCAN_FUN_EN(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_D0_SCAN_FUN_EN(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_RTD3FUN_EN(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_RTD3FUN_EN(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_U3_SCAN_FUN_EN(__h2c)                         \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_U3_SCAN_FUN_EN(__h2c, __value)                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_NLO_FUN_EN(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_NLO_FUN_EN(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_IPS_DEPENDENT(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 12, 1)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_IPS_DEPENDENT(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 12, 1, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_LOC_PROBE_PACKET(__h2c)                       \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 17)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_LOC_PROBE_PACKET(__h2c, __value)              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 17, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_LOC_SCAN_INFO(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_LOC_SCAN_INFO(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_GET_LOC_SSID_INFO(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define D0_SCAN_OFFLOAD_CTRL_SET_LOC_SSID_INFO(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define RSVD_PAGE_SET_CMD_ID(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define RSVD_PAGE_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define RSVD_PAGE_SET_CLASS(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_PROBE_RSP(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_PROBE_RSP(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_PS_POLL(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_PS_POLL(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_NULL_DATA(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_NULL_DATA(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_QOS_NULL(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_QOS_NULL(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_BT_QOS_NULL(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_BT_QOS_NULL(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_CTS2SELF(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_CTS2SELF(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 8, __value)</div><div class='del'>-#define RSVD_PAGE_GET_LOC_LTECOEX_QOSNULL(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 24, 8)</div><div class='del'>-#define RSVD_PAGE_SET_LOC_LTECOEX_QOSNULL(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 24, 8, __value)</div><div class='del'>-#define MEDIA_STATUS_RPT_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define MEDIA_STATUS_RPT_SET_CMD_ID(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define MEDIA_STATUS_RPT_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define MEDIA_STATUS_RPT_SET_CLASS(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define MEDIA_STATUS_RPT_GET_OP_MODE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define MEDIA_STATUS_RPT_SET_OP_MODE(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define MEDIA_STATUS_RPT_GET_MACID_IN(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define MEDIA_STATUS_RPT_SET_MACID_IN(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define MEDIA_STATUS_RPT_GET_MACID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define MEDIA_STATUS_RPT_SET_MACID(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define MEDIA_STATUS_RPT_GET_MACID_END(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define MEDIA_STATUS_RPT_SET_MACID_END(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define KEEP_ALIVE_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define KEEP_ALIVE_SET_CMD_ID(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define KEEP_ALIVE_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define KEEP_ALIVE_SET_CLASS(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define KEEP_ALIVE_GET_ENABLE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define KEEP_ALIVE_SET_ENABLE(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define KEEP_ALIVE_GET_ADOPT_USER_SETTING(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define KEEP_ALIVE_SET_ADOPT_USER_SETTING(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define KEEP_ALIVE_GET_PKT_TYPE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define KEEP_ALIVE_SET_PKT_TYPE(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define KEEP_ALIVE_GET_KEEP_ALIVE_CHECK_PERIOD(__h2c)                          \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define KEEP_ALIVE_SET_KEEP_ALIVE_CHECK_PERIOD(__h2c, __value)                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_CMD_ID(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define DISCONNECT_DECISION_SET_CMD_ID(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_CLASS(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define DISCONNECT_DECISION_SET_CLASS(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_ENABLE(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define DISCONNECT_DECISION_SET_ENABLE(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_ADOPT_USER_SETTING(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define DISCONNECT_DECISION_SET_ADOPT_USER_SETTING(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_TRY_OK_BCN_FAIL_COUNT_EN(__h2c)                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define DISCONNECT_DECISION_SET_TRY_OK_BCN_FAIL_COUNT_EN(__h2c, __value)       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_DISCONNECT_EN(__h2c)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define DISCONNECT_DECISION_SET_DISCONNECT_EN(__h2c, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_DISCON_DECISION_CHECK_PERIOD(__h2c)            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define DISCONNECT_DECISION_SET_DISCON_DECISION_CHECK_PERIOD(__h2c, __value)   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_TRY_PKT_NUM(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define DISCONNECT_DECISION_SET_TRY_PKT_NUM(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define DISCONNECT_DECISION_GET_TRY_OK_BCN_FAIL_COUNT_LIMIT(__h2c)             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define DISCONNECT_DECISION_SET_TRY_OK_BCN_FAIL_COUNT_LIMIT(__h2c, __value)    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define AP_OFFLOAD_SET_CMD_ID(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define AP_OFFLOAD_SET_CLASS(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_ON(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_ON(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_CFG_MIFI_PLATFORM(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_CFG_MIFI_PLATFORM(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_LINKED(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_LINKED(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_EN_AUTO_WAKE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_EN_AUTO_WAKE(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_WAKE_FLAG(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 12, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_WAKE_FLAG(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 12, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_HIDDEN_ROOT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_HIDDEN_ROOT(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_HIDDEN_VAP1(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 17, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_HIDDEN_VAP1(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 17, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_HIDDEN_VAP2(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 18, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_HIDDEN_VAP2(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 18, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_HIDDEN_VAP3(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 19, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_HIDDEN_VAP3(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 19, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_HIDDEN_VAP4(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 20, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_HIDDEN_VAP4(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 20, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_DENYANY_ROOT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_DENYANY_ROOT(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_DENYANY_VAP1(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 25, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_DENYANY_VAP1(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 25, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_DENYANY_VAP2(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 26, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_DENYANY_VAP2(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 26, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_DENYANY_VAP3(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 27, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_DENYANY_VAP3(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 27, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_DENYANY_VAP4(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 28, 1)</div><div class='del'>-#define AP_OFFLOAD_SET_DENYANY_VAP4(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 28, 1, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_WAIT_TBTT_CNT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define AP_OFFLOAD_SET_WAIT_TBTT_CNT(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_WAKE_TIMEOUT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define AP_OFFLOAD_SET_WAKE_TIMEOUT(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_LEN_IV_PAIR(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 8)</div><div class='del'>-#define AP_OFFLOAD_SET_LEN_IV_PAIR(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 8, __value)</div><div class='del'>-#define AP_OFFLOAD_GET_LEN_IV_GRP(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 24, 8)</div><div class='del'>-#define AP_OFFLOAD_SET_LEN_IV_GRP(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 24, 8, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define BCN_RSVDPAGE_SET_CMD_ID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define BCN_RSVDPAGE_SET_CLASS(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_LOC_ROOT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define BCN_RSVDPAGE_SET_LOC_ROOT(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_LOC_VAP1(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define BCN_RSVDPAGE_SET_LOC_VAP1(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_LOC_VAP2(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define BCN_RSVDPAGE_SET_LOC_VAP2(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_LOC_VAP3(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define BCN_RSVDPAGE_SET_LOC_VAP3(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define BCN_RSVDPAGE_GET_LOC_VAP4(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define BCN_RSVDPAGE_SET_LOC_VAP4(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_CMD_ID(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_CMD_ID(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_CLASS(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_LOC_ROOT(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_LOC_ROOT(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_LOC_VAP1(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_LOC_VAP1(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_LOC_VAP2(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_LOC_VAP2(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_LOC_VAP3(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_LOC_VAP3(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_GET_LOC_VAP4(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define PROBE_RSP_RSVDPAGE_SET_LOC_VAP4(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define SET_PWR_MODE_SET_CMD_ID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define SET_PWR_MODE_SET_CLASS(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_MODE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 7)</div><div class='del'>-#define SET_PWR_MODE_SET_MODE(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 7, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_CLK_REQUEST(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 15, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_CLK_REQUEST(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 15, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_RLBM(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 4)</div><div class='del'>-#define SET_PWR_MODE_SET_RLBM(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 4, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_SMART_PS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 20, 4)</div><div class='del'>-#define SET_PWR_MODE_SET_SMART_PS(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 20, 4, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_AWAKE_INTERVAL(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define SET_PWR_MODE_SET_AWAKE_INTERVAL(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_B_ALL_QUEUE_UAPSD(__h2c)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_B_ALL_QUEUE_UAPSD(__h2c, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_BCN_EARLY_RPT(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 2, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_BCN_EARLY_RPT(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 2, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_PORT_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 5, 3)</div><div class='del'>-#define SET_PWR_MODE_SET_PORT_ID(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 5, 3, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_PWR_STATE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define SET_PWR_MODE_SET_PWR_STATE(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_LOW_POWER_RX_BCN(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_LOW_POWER_RX_BCN(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_ANT_AUTO_SWITCH(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 17, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_ANT_AUTO_SWITCH(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 17, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_PS_ALLOW_BT_HIGH_PRIORITY(__h2c)                      \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 18, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_PS_ALLOW_BT_HIGH_PRIORITY(__h2c, __value)             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 18, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_PROTECT_BCN(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 19, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_PROTECT_BCN(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 19, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_SILENCE_PERIOD(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 20, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_SILENCE_PERIOD(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 20, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_FAST_BT_CONNECT(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 21, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_FAST_BT_CONNECT(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 21, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_TWO_ANTENNA_EN(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 22, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_TWO_ANTENNA_EN(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 22, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_ADOPT_USER_SETTING(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 24, 1)</div><div class='del'>-#define SET_PWR_MODE_SET_ADOPT_USER_SETTING(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 24, 1, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_DRV_BCN_EARLY_SHIFT(__h2c)                            \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 25, 3)</div><div class='del'>-#define SET_PWR_MODE_SET_DRV_BCN_EARLY_SHIFT(__h2c, __value)                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 25, 3, __value)</div><div class='del'>-#define SET_PWR_MODE_GET_DRV_BCN_EARLY_SHIFT2(__h2c)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 28, 4)</div><div class='del'>-#define SET_PWR_MODE_SET_DRV_BCN_EARLY_SHIFT2(__h2c, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 28, 4, __value)</div><div class='del'>-#define PS_TUNING_PARA_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define PS_TUNING_PARA_SET_CMD_ID(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define PS_TUNING_PARA_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define PS_TUNING_PARA_SET_CLASS(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define PS_TUNING_PARA_GET_BCN_TO_LIMIT(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 7)</div><div class='del'>-#define PS_TUNING_PARA_SET_BCN_TO_LIMIT(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 7, __value)</div><div class='del'>-#define PS_TUNING_PARA_GET_DTIM_TIME_OUT(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 15, 1)</div><div class='del'>-#define PS_TUNING_PARA_SET_DTIM_TIME_OUT(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 15, 1, __value)</div><div class='del'>-#define PS_TUNING_PARA_GET_PS_TIME_OUT(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 4)</div><div class='del'>-#define PS_TUNING_PARA_SET_PS_TIME_OUT(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 4, __value)</div><div class='del'>-#define PS_TUNING_PARA_GET_ADOPT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define PS_TUNING_PARA_SET_ADOPT(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define PS_TUNING_PARA_II_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define PS_TUNING_PARA_II_SET_CMD_ID(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define PS_TUNING_PARA_II_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define PS_TUNING_PARA_II_SET_CLASS(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define PS_TUNING_PARA_II_GET_BCN_TO_PERIOD(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 7)</div><div class='del'>-#define PS_TUNING_PARA_II_SET_BCN_TO_PERIOD(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 7, __value)</div><div class='del'>-#define PS_TUNING_PARA_II_GET_ADOPT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 15, 1)</div><div class='del'>-#define PS_TUNING_PARA_II_SET_ADOPT(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 15, 1, __value)</div><div class='del'>-#define PS_TUNING_PARA_II_GET_DRV_EARLY_IVL(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define PS_TUNING_PARA_II_SET_DRV_EARLY_IVL(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define PS_LPS_PARA_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define PS_LPS_PARA_SET_CMD_ID(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define PS_LPS_PARA_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define PS_LPS_PARA_SET_CLASS(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define PS_LPS_PARA_GET_LPS_CONTROL(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define PS_LPS_PARA_SET_LPS_CONTROL(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_CMD_ID(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_CLASS(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_OFFLOAD_EN(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_OFFLOAD_EN(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_ROLE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_ROLE(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_CTWINDOW_EN(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_CTWINDOW_EN(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_NOA0_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_NOA0_EN(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_NOA1_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 12, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_NOA1_EN(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 12, 1, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_ALL_STA_SLEEP(__h2c)                                \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 13, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_ALL_STA_SLEEP(__h2c, __value)                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 13, 1, __value)</div><div class='del'>-#define P2P_PS_OFFLOAD_GET_DISCOVERY(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 14, 1)</div><div class='del'>-#define P2P_PS_OFFLOAD_SET_DISCOVERY(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 14, 1, __value)</div><div class='del'>-#define PS_SCAN_EN_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define PS_SCAN_EN_SET_CMD_ID(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define PS_SCAN_EN_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define PS_SCAN_EN_SET_CLASS(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define PS_SCAN_EN_GET_ENABLE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define PS_SCAN_EN_SET_ENABLE(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define SAP_PS_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define SAP_PS_SET_CMD_ID(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define SAP_PS_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define SAP_PS_SET_CLASS(__h2c, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define SAP_PS_GET_ENABLE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define SAP_PS_SET_ENABLE(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define SAP_PS_GET_EN_PS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define SAP_PS_SET_EN_PS(__h2c, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define SAP_PS_GET_EN_LP_RX(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define SAP_PS_SET_EN_LP_RX(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define SAP_PS_GET_MANUAL_32K(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define SAP_PS_SET_MANUAL_32K(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define SAP_PS_GET_DURATION(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define SAP_PS_SET_DURATION(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define INACTIVE_PS_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define INACTIVE_PS_SET_CMD_ID(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define INACTIVE_PS_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define INACTIVE_PS_SET_CLASS(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define INACTIVE_PS_GET_ENABLE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define INACTIVE_PS_SET_ENABLE(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define INACTIVE_PS_GET_IGNORE_PS_CONDITION(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define INACTIVE_PS_SET_IGNORE_PS_CONDITION(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define INACTIVE_PS_GET_FREQUENCY(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define INACTIVE_PS_SET_FREQUENCY(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define INACTIVE_PS_GET_DURATION(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define INACTIVE_PS_SET_DURATION(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define MACID_CFG_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define MACID_CFG_SET_CMD_ID(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define MACID_CFG_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define MACID_CFG_SET_CLASS(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define MACID_CFG_GET_MAC_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define MACID_CFG_SET_MAC_ID(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define MACID_CFG_GET_RATE_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 5)</div><div class='del'>-#define MACID_CFG_SET_RATE_ID(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 5, __value)</div><div class='del'>-#define MACID_CFG_GET_SGI(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 23, 1)</div><div class='del'>-#define MACID_CFG_SET_SGI(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 23, 1, __value)</div><div class='del'>-#define MACID_CFG_GET_BW(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 2)</div><div class='del'>-#define MACID_CFG_SET_BW(__h2c, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 2, __value)</div><div class='del'>-#define MACID_CFG_GET_LDPC_CAP(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 26, 1)</div><div class='del'>-#define MACID_CFG_SET_LDPC_CAP(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 26, 1, __value)</div><div class='del'>-#define MACID_CFG_GET_NO_UPDATE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 27, 1)</div><div class='del'>-#define MACID_CFG_SET_NO_UPDATE(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 27, 1, __value)</div><div class='del'>-#define MACID_CFG_GET_WHT_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 28, 2)</div><div class='del'>-#define MACID_CFG_SET_WHT_EN(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 28, 2, __value)</div><div class='del'>-#define MACID_CFG_GET_DISPT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 30, 1)</div><div class='del'>-#define MACID_CFG_SET_DISPT(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 30, 1, __value)</div><div class='del'>-#define MACID_CFG_GET_DISRA(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 31, 1)</div><div class='del'>-#define MACID_CFG_SET_DISRA(__h2c, __value)                                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 31, 1, __value)</div><div class='del'>-#define MACID_CFG_GET_RATE_MASK7_0(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define MACID_CFG_SET_RATE_MASK7_0(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define MACID_CFG_GET_RATE_MASK15_8(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define MACID_CFG_SET_RATE_MASK15_8(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define MACID_CFG_GET_RATE_MASK23_16(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 8)</div><div class='del'>-#define MACID_CFG_SET_RATE_MASK23_16(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 8, __value)</div><div class='del'>-#define MACID_CFG_GET_RATE_MASK31_24(__h2c)                                    \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 24, 8)</div><div class='del'>-#define MACID_CFG_SET_RATE_MASK31_24(__h2c, __value)                           \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 24, 8, __value)</div><div class='del'>-#define TXBF_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define TXBF_SET_CMD_ID(__h2c, __value)                                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define TXBF_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define TXBF_SET_CLASS(__h2c, __value)                                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define TXBF_GET_NDPA0_HEAD_PAGE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define TXBF_SET_NDPA0_HEAD_PAGE(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define TXBF_GET_NDPA1_HEAD_PAGE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define TXBF_SET_NDPA1_HEAD_PAGE(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define TXBF_GET_PERIOD_0(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define TXBF_SET_PERIOD_0(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define RSSI_SETTING_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define RSSI_SETTING_SET_CMD_ID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define RSSI_SETTING_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define RSSI_SETTING_SET_CLASS(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define RSSI_SETTING_GET_MAC_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define RSSI_SETTING_SET_MAC_ID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define RSSI_SETTING_GET_RSSI(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 7)</div><div class='del'>-#define RSSI_SETTING_SET_RSSI(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 7, __value)</div><div class='del'>-#define RSSI_SETTING_GET_RA_INFO(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define RSSI_SETTING_SET_RA_INFO(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define AP_REQ_TXRPT_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define AP_REQ_TXRPT_SET_CMD_ID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define AP_REQ_TXRPT_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define AP_REQ_TXRPT_SET_CLASS(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define AP_REQ_TXRPT_GET_STA1_MACID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define AP_REQ_TXRPT_SET_STA1_MACID(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define AP_REQ_TXRPT_GET_STA2_MACID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define AP_REQ_TXRPT_SET_STA2_MACID(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define AP_REQ_TXRPT_GET_RTY_OK_TOTAL(__h2c)                                   \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 1)</div><div class='del'>-#define AP_REQ_TXRPT_SET_RTY_OK_TOTAL(__h2c, __value)                          \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 1, __value)</div><div class='del'>-#define AP_REQ_TXRPT_GET_RTY_CNT_MACID(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 25, 1)</div><div class='del'>-#define AP_REQ_TXRPT_SET_RTY_CNT_MACID(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 25, 1, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_CMD_ID(__h2c)                                 \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_CMD_ID(__h2c, __value)                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_CLASS(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_CLASS(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA1_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA1_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA2_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA2_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA3_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA3_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA4_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA4_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA5_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA5_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA6_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA6_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 8, __value)</div><div class='del'>-#define INIT_RATE_COLLECTION_GET_STA7_MACID(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 24, 8)</div><div class='del'>-#define INIT_RATE_COLLECTION_SET_STA7_MACID(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 24, 8, __value)</div><div class='del'>-#define IQK_OFFLOAD_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define IQK_OFFLOAD_SET_CMD_ID(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define IQK_OFFLOAD_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define IQK_OFFLOAD_SET_CLASS(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define IQK_OFFLOAD_GET_CHANNEL(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define IQK_OFFLOAD_SET_CHANNEL(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define IQK_OFFLOAD_GET_BWBAND(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define IQK_OFFLOAD_SET_BWBAND(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define IQK_OFFLOAD_GET_EXTPALNA(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define IQK_OFFLOAD_SET_EXTPALNA(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define MACID_CFG_3SS_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define MACID_CFG_3SS_SET_CMD_ID(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define MACID_CFG_3SS_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define MACID_CFG_3SS_SET_CLASS(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define MACID_CFG_3SS_GET_MACID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define MACID_CFG_3SS_SET_MACID(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define MACID_CFG_3SS_GET_RATE_MASK_39_32(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define MACID_CFG_3SS_SET_RATE_MASK_39_32(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define MACID_CFG_3SS_GET_RATE_MASK_47_40(__h2c)                               \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define MACID_CFG_3SS_SET_RATE_MASK_47_40(__h2c, __value)                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define RA_PARA_ADJUST_SET_CMD_ID(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define RA_PARA_ADJUST_SET_CLASS(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_MAC_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 8)</div><div class='del'>-#define RA_PARA_ADJUST_SET_MAC_ID(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 8, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_PARAMETER_INDEX(__h2c)                              \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 8)</div><div class='del'>-#define RA_PARA_ADJUST_SET_PARAMETER_INDEX(__h2c, __value)                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 8, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_RATE_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define RA_PARA_ADJUST_SET_RATE_ID(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_VALUE_BYTE0(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 8)</div><div class='del'>-#define RA_PARA_ADJUST_SET_VALUE_BYTE0(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 8, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_VALUE_BYTE1(__h2c)                                  \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 8)</div><div class='del'>-#define RA_PARA_ADJUST_SET_VALUE_BYTE1(__h2c, __value)                         \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 8, __value)</div><div class='del'>-#define RA_PARA_ADJUST_GET_ASK_FW_FOR_FW_PARA(__h2c)                           \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X04, 16, 8)</div><div class='del'>-#define RA_PARA_ADJUST_SET_ASK_FW_FOR_FW_PARA(__h2c, __value)                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 16, 8, __value)</div><div class='del'>-#define WWLAN_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define WWLAN_SET_CMD_ID(__h2c, __value)                                       \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define WWLAN_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define WWLAN_SET_CLASS(__h2c, __value)                                        \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define WWLAN_GET_FUNC_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define WWLAN_SET_FUNC_EN(__h2c, __value)                                      \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define WWLAN_GET_PATTERM_MAT_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define WWLAN_SET_PATTERM_MAT_EN(__h2c, __value)                               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define WWLAN_GET_MAGIC_PKT_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define WWLAN_SET_MAGIC_PKT_EN(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define WWLAN_GET_UNICAST_WAKEUP_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define WWLAN_SET_UNICAST_WAKEUP_EN(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define WWLAN_GET_ALL_PKT_DROP(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 12, 1)</div><div class='del'>-#define WWLAN_SET_ALL_PKT_DROP(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 12, 1, __value)</div><div class='del'>-#define WWLAN_GET_GPIO_ACTIVE(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 13, 1)</div><div class='del'>-#define WWLAN_SET_GPIO_ACTIVE(__h2c, __value)                                  \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 13, 1, __value)</div><div class='del'>-#define WWLAN_GET_REKEY_WAKEUP_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 14, 1)</div><div class='del'>-#define WWLAN_SET_REKEY_WAKEUP_EN(__h2c, __value)                              \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 14, 1, __value)</div><div class='del'>-#define WWLAN_GET_DEAUTH_WAKEUP_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 15, 1)</div><div class='del'>-#define WWLAN_SET_DEAUTH_WAKEUP_EN(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 15, 1, __value)</div><div class='del'>-#define WWLAN_GET_GPIO_NUM(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 16, 7)</div><div class='del'>-#define WWLAN_SET_GPIO_NUM(__h2c, __value)                                     \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 16, 7, __value)</div><div class='del'>-#define WWLAN_GET_DATAPIN_WAKEUP_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 23, 1)</div><div class='del'>-#define WWLAN_SET_DATAPIN_WAKEUP_EN(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 23, 1, __value)</div><div class='del'>-#define WWLAN_GET_GPIO_DURATION(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 24, 8)</div><div class='del'>-#define WWLAN_SET_GPIO_DURATION(__h2c, __value)                                \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 24, 8, __value)</div><div class='del'>-#define WWLAN_GET_GPIO_PLUS_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 0, 1)</div><div class='del'>-#define WWLAN_SET_GPIO_PLUS_EN(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 0, 1, __value)</div><div class='del'>-#define WWLAN_GET_GPIO_PULSE_COUNT(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 1, 7)</div><div class='del'>-#define WWLAN_SET_GPIO_PULSE_COUNT(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 1, 7, __value)</div><div class='del'>-#define WWLAN_GET_DISABLE_UPHY(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 8, 1)</div><div class='del'>-#define WWLAN_SET_DISABLE_UPHY(__h2c, __value)                                 \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 8, 1, __value)</div><div class='del'>-#define WWLAN_GET_HST2DEV_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 9, 1)</div><div class='del'>-#define WWLAN_SET_HST2DEV_EN(__h2c, __value)                                   \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 9, 1, __value)</div><div class='del'>-#define WWLAN_GET_GPIO_DURATION_MS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X04, 10, 1)</div><div class='del'>-#define WWLAN_SET_GPIO_DURATION_MS(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X04, 10, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_CMD_ID(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 0, 5)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_CMD_ID(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 0, 5, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_CLASS(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 5, 3)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_CLASS(__h2c, __value)                             \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 5, 3, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_REMOTE_WAKE_CTRL_EN(__h2c)                        \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 8, 1)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_REMOTE_WAKE_CTRL_EN(__h2c, __value)               \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 8, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_ARP_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 9, 1)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_ARP_EN(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 9, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_NDP_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 10, 1)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_NDP_EN(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 10, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_GTK_EN(__h2c) LE_BITS_TO_4BYTE(__h2c + 0X00, 11, 1)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_GTK_EN(__h2c, __value)                            \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 11, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_NLO_OFFLOAD_EN(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 12, 1)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_NLO_OFFLOAD_EN(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 12, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_REAL_WOW_V1_EN(__h2c)                             \</div><div class='del'>-	LE_BITS_TO_4BYTE(__h2c + 0X00, 13, 1)</div><div class='del'>-#define REMOTE_WAKE_CTRL_SET_REAL_WOW_V1_EN(__h2c, __value)                    \</div><div class='del'>-	SET_BITS_TO_LE_4BYTE(__h2c + 0X00, 13, 1, __value)</div><div class='del'>-#define REMOTE_WAKE_CTRL_GET_REAL_WOW_V2_EN(__h2c)                             \</div><div class='del'>